/*
 * Dynamic queue limits (dql) - Definitions
 *
 * Copyright (c) 2011, Tom Herbert <therbert@google.com>
 *
 * This header file contains the definitions for dynamic queue limits (dql).
 * dql would be used in conjunction with a producer/consumer type queue
 * (possibly a HW queue).  Such a queue would have these general properties:
 *
 *   1) Objects are queued up to some limit specified as number of objects.
 *   2) Periodically a completion process executes which retires consumed
 *      objects.
 *   3) Starvation occurs when limit has been reached, all queued data has
 *      actually been consumed, but completion processing has not yet run
 *      so queuing new data is blocked.
 *   4) Minimizing the amount of queued data is desirable.
 *
 * The goal of dql is to calculate the limit as the minimum number of objects
 * needed to prevent starvation.
 *
 * The primary functions of dql are:
 *    dql_queued - called when objects are enqueued to record number of objects
 *    dql_avail - returns how many objects are available to be queued based
 *      on the object limit and how many objects are already enqueued
 *    dql_completed - called at completion time to indicate how many objects
 *      were retired from the queue
 *
 * The dql implementation does not implement any locking for the dql data
 * structures, the higher layer should provide this.  dql_queued should
 * be serialized to prevent concurrent execution of the function; this
 * is also true for  dql_completed.  However, dql_queued and dlq_completed  can
 * be executed concurrently (i.e. they can be protected by different locks).
 */

#ifndef _LINUX_DQL_H
#define _LINUX_DQL_H

#ifdef __KERNEL__

struct dql {
	/* Fields accessed in enqueue path (dql_queued) */
	unsigned int	num_queued;		/* Total ever queued */
	unsigned int	adj_limit;		/* limit + num_completed */
	unsigned int	last_obj_cnt;		/* Count at last queuing */

	/* Fields accessed only by completion path (dql_completed) */

	unsigned int	limit ____cacheline_aligned_in_smp; /* Current limit */
	unsigned int	num_completed;		/* Total ever completed */

	unsigned int	prev_ovlimit;		/* Previous over limit */
	unsigned int	prev_num_queued;	/* Previous queue total */
	unsigned int	prev_last_obj_cnt;	/* Previous queuing cnt */

	unsigned int	lowest_slack;		/* Lowest slack found */
	unsigned long	slack_start_time;	/* Time slacks seen */

	/* Configuration */
	unsigned int	max_limit;		/* Max limit */
	unsigned int	min_limit;		/* Minimum limit */
	unsigned int	slack_hold_time;	/* Time to measure slack */
};

/* Set some static maximums */
#define DQL_MAX_OBJECT (UINT_MAX / 16)
#define DQL_MAX_LIMIT ((UINT_MAX / 2) - DQL_MAX_OBJECT)

/*
 * Record number of objects queued. Assumes that caller has already checked
 * availability in the queue with dql_avail.
 */
static inline void dql_queued(struct dql *dql, unsigned int count)
{
	BUG_ON(count > DQL_MAX_OBJECT);

	dql->last_obj_cnt = count;

	/* We want to force a write first, so that cpu do not attempt
	 * to get cache line containing last_obj_cnt, num_queued, adj_limit
	 * in Shared state, but directly does a Request For Ownership
	 * It is only a hint, we use barrier() only.
	 */
	barrier();

	dql->num_queued += count;
}

/* Returns how many objects can be queued, < 0 indicates over limit. */
static inline int dql_avail(const struct dql *dql)
{
	return ACCESS_ONCE(dql->adj_limit) - ACCESS_ONCE(dql->num_queued);
}

/* Record number of completed objects and recalculate the limit. */
void dql_completed(struct dql *dql, unsigned int count);

/* Reset dql state */
void dql_reset(struct dql *dql);

/* Initialize dql state */
int dql_init(struct dql *dql, unsigned hold_time);

#endif /* _KERNEL_ */

#endif /* _LINUX_DQL_H */
tion>
<option value='mvpp2'>mvpp2</option>
<option value='net-merged'>net-merged</option>
<option value='net-next'>net-next</option>
<option value='net-queue'>net-queue</option>
<option value='nmi'>nmi</option>
<option value='phy'>phy</option>
<option value='rtc'>rtc</option>
<option value='sa1100'>sa1100</option>
<option value='spectre'>spectre</option>
<option value='to-build'>to-build</option>
<option value='uaccess'>uaccess</option>
<option value='vcpu-rmk'>vcpu-rmk</option>
<option value='wl18xx'>wl18xx</option>
<option value='zii'>zii</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Russell King's ARM Linux kernel tree</td><td class='sub right'>Russell King</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/linux-arm.git/'>summary</a><a href='/cgit/linux-arm.git/refs/'>refs</a><a href='/cgit/linux-arm.git/log/net'>log</a><a href='/cgit/linux-arm.git/tree/net'>tree</a><a href='/cgit/linux-arm.git/commit/net'>commit</a><a class='active' href='/cgit/linux-arm.git/diff/net?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/linux-arm.git/log/net'>
<input type='hidden' name='id2' value='bde74ad10eb55aaa472c37b107934e6b8563c25e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/linux-arm.git/diff/?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>root</a>/<a href='/cgit/linux-arm.git/diff/net?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id2' value='bde74ad10eb55aaa472c37b107934e6b8563c25e'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit/linux-arm.git/diff/?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>Diffstat</a> (limited to 'net')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/6lowpan_i.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/6lowpan_i.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/debugfs.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/iphc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/iphc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/ndisc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/ndisc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_dest.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_dest.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_fragment.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_fragment.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_ext_dest.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_dest.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_ext_frag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_frag.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_ext_hop.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_hop.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_ext_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_route.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_icmpv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_icmpv6.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ghc_udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_udp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_hop.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_hop.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ipv6.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_mobility.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_mobility.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_routing.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_routing.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/6lowpan/nhc_udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_udp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/fc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/fc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/fddi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/fddi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/garp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/garp.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/hippi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/hippi.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/mrp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/mrp.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/802/p8022.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/p8022.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/802/p8023.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/p8023.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/psnap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/psnap.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/802/stp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/stp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_core.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_dev.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan_gvrp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_gvrp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan_mvrp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_mvrp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlan_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_netlink.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/8021q/vlanproc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlanproc.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/client.c</a></td><td class='right'>1629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/error.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/error.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/mod.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/mod.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/protocol.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/protocol.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/protocol.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_common.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_common.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_common.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_fd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_fd.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_rdma.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_rdma.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/9p/trans_usbg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_usbg.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_virtio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_virtio.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/9p/trans_xen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_xen.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/9p/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/util.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/Kconfig</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/Kconfig.debug?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/Kconfig.debug</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/appletalk/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/appletalk/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/appletalk/aarp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/aarp.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/appletalk/atalk_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/atalk_proc.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/appletalk/ddp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/ddp.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/appletalk/dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/dev.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/appletalk/sysctl_net_atalk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/sysctl_net_atalk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/atm_sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/atm_sysfs.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/br2684.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/br2684.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/clip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/clip.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/common.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/common.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/ioctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/ioctl.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/lec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/lec.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/lec_arpc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/lec_arpc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/mpc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/mpoa_caches.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpoa_caches.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/mpoa_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpoa_proc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/pppoatm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/pppoatm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/proc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/pvc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/pvc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/raw.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/resources.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/resources.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/resources.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/resources.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/signaling.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/signaling.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/atm/svc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/svc.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ax25/TODO?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/TODO</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/af_ax25.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/af_ax25.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_addr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_addr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_dev.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_ds_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_in.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_ds_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_subr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_ds_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_timer.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_iface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_iface.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_in.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ip.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_out.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_route.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_std_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_in.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_std_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_subr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_std_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_timer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_subr.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_timer.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/ax25_uid.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_uid.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ax25/sysctl_net_ax25.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/sysctl_net_ax25.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/Kconfig</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_algo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_algo.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_algo.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_algo.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_iv_ogm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_iv_ogm.c</a></td><td class='right'>930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_iv_ogm.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_iv_ogm.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v_elp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_elp.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v_elp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_elp.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v_ogm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_ogm.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bat_v_ogm.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_ogm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bitarray.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bitarray.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bitarray.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bitarray.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bridge_loop_avoidance.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bridge_loop_avoidance.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/bridge_loop_avoidance.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bridge_loop_avoidance.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/debugfs.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/debugfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/debugfs.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/distributed-arp-table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/distributed-arp-table.c</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/distributed-arp-table.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/distributed-arp-table.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/fragmentation.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/fragmentation.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/fragmentation.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/fragmentation.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/gateway_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_client.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/gateway_client.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_client.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/gateway_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_common.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/gateway_common.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_common.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/hard-interface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hard-interface.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/hard-interface.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hard-interface.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hash.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/hash.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hash.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/icmp_socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/icmp_socket.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/icmp_socket.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/icmp_socket.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/log.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/log.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/log.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/log.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/main.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/main.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/main.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/batman-adv/mesh-interface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/mesh-interface.c</a> (renamed from net/batman-adv/soft-interface.c)</td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/batman-adv/mesh-interface.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/mesh-interface.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/multicast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/multicast.c</a></td><td class='right'>1651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/multicast.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/multicast.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/batman-adv/multicast_forw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/multicast_forw.c</a></td><td class='right'>1178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/netlink.c</a></td><td class='right'>1306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/netlink.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/network-coding.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/network-coding.c</a></td><td class='right'>1996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.8%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/network-coding.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/network-coding.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/originator.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/originator.c</a></td><td class='right'>588</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/originator.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/originator.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/routing.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/routing.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/routing.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/routing.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/send.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/send.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/send.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/send.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/soft-interface.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/soft-interface.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/sysfs.c</a></td><td class='right'>1261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/batman-adv/sysfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/sysfs.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/tp_meter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tp_meter.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/tp_meter.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tp_meter.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/batman-adv/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/trace.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/batman-adv/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/trace.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/translation-table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/translation-table.c</a></td><td class='right'>886</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/translation-table.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/translation-table.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/tvlv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tvlv.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/tvlv.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tvlv.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/batman-adv/types.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/types.h</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/6lowpan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/6lowpan.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/Kconfig</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/a2mp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/a2mp.c</a></td><td class='right'>1040</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/a2mp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/a2mp.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/af_bluetooth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/af_bluetooth.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/amp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/amp.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/amp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/amp.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/aosp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/aosp.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/aosp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/aosp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/bnep.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/bnep.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/core.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/netdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/bnep/sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/sock.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/capi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/capi.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/cmtp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/cmtp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/core.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/cmtp/sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/sock.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/coredump.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/coredump.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/ecdh_helper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/ecdh_helper.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/ecdh_helper.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/ecdh_helper.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/eir.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/eir.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/eir.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/eir.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_codec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_codec.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_codec.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_codec.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_conn.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_conn.c</a></td><td class='right'>2607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 75.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_core.c</a></td><td class='right'>3196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.0%;'/><td class='rem' style='width: 16.2%;'/><td class='none' style='width: 69.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_debugfs.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_debugfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_debugfs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_drv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_drv.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_event.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_event.c</a></td><td class='right'>5653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.5%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 46.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_request.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_request.c</a></td><td class='right'>2818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 26.6%;'/><td class='none' style='width: 73.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_request.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_request.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_sock.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_sync.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_sync.c</a></td><td class='right'>7420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 70.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 30.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hci_sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_sysfs.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hidp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hidp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hidp/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/core.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hidp/hidp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/hidp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/hidp/sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/sock.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/iso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/iso.c</a></td><td class='right'>2734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/l2cap_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/l2cap_core.c</a></td><td class='right'>2923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.1%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 72.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/l2cap_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/l2cap_sock.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/leds.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/leds.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/leds.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/leds.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/lib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/lib.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/mgmt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt.c</a></td><td class='right'>5660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.2%;'/><td class='rem' style='width: 14.2%;'/><td class='none' style='width: 46.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/mgmt_config.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_config.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/mgmt_config.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_config.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/mgmt_util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_util.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/mgmt_util.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_util.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/msft.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/msft.c</a></td><td class='right'>1201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bluetooth/msft.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/msft.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/rfcomm/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/rfcomm/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/rfcomm/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/core.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/rfcomm/sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/sock.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/rfcomm/tty.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/tty.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/sco.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/sco.c</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/selftest.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/selftest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/smp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/smp.c</a></td><td class='right'>751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bluetooth/smp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/smp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bpf/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpf/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bpf/bpf_dummy_struct_ops.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpf/bpf_dummy_struct_ops.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bpf/test_run.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpf/test_run.c</a></td><td class='right'>1789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/.gitignore?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/bpfilter_kern.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/bpfilter_kern.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/bpfilter_umh_blob.S?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/bpfilter_umh_blob.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/main.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bpfilter/msgfmt.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/msgfmt.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_arp_nd_proxy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_arp_nd_proxy.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_cfm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_cfm.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_cfm_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_cfm_netlink.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_device.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_device.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_fdb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_fdb.c</a></td><td class='right'>1108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_forward.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_forward.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_if.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_if.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_input.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_ioctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_ioctl.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_mdb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mdb.c</a></td><td class='right'>1793</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_mrp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mrp.c</a></td><td class='right'>1260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_mrp_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mrp_netlink.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_mrp_switchdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mrp_switchdev.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_mst.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mst.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_multicast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_multicast.c</a></td><td class='right'>4561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.8%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 57.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_multicast_eht.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_multicast_eht.c</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_netfilter_hooks.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netfilter_hooks.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_netfilter_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netfilter_ipv6.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netlink.c</a></td><td class='right'>743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_netlink_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netlink_tunnel.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_nf_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_nf_core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private.h</a></td><td class='right'>1561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private_cfm.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_cfm.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private_mcast_eht.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_mcast_eht.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private_mrp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_mrp.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private_stp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_stp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_private_tunnel.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_tunnel.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_stp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_stp_bpdu.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_bpdu.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_stp_if.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_if.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_stp_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_timer.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_switchdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_switchdev.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_sysfs_br.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_sysfs_br.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_sysfs_if.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_sysfs_if.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_vlan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_vlan.c</a></td><td class='right'>1492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 85.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/br_vlan_options.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_vlan_options.c</a></td><td class='right'>740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/br_vlan_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_vlan_tunnel.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_802_3.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_802_3.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_among.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_among.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_arp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_arp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_arpreply.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_arpreply.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_dnat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_dnat.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_ip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_ip6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_ip6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_limit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_limit.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_log.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_log.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_mark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_mark.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_mark_m.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_mark_m.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_nflog.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_nflog.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_pkttype.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_pkttype.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_redirect.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_redirect.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_snat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_snat.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_stp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_stp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebt_vlan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_vlan.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebtable_broute.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_broute.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebtable_filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_filter.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebtable_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_nat.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/ebtables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtables.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/nf_conntrack_bridge.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nf_conntrack_bridge.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/nf_log_bridge.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nf_log_bridge.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/nft_meta_bridge.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nft_meta_bridge.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/bridge/netfilter/nft_reject_bridge.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nft_reject_bridge.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/caif_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_dev.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/caif_socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_socket.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/caif_usb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_usb.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfcnfg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfcnfg.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfctrl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfctrl.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfdbgl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfdbgl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfdgml.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfdgml.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cffrml.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cffrml.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfmuxl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfmuxl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfpkt_skbuff.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfpkt_skbuff.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfrfml.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfrfml.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfserl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfserl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfsrvl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfsrvl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfutill.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfutill.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfveil.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfveil.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/cfvidl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfvidl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/caif/chnl_net.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/chnl_net.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/af_can.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/af_can.c</a></td><td class='right'>517</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/af_can.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/af_can.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/bcm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/bcm.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/gw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/gw.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/isotp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/isotp.c</a></td><td class='right'>1739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/address-claim.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/address-claim.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/bus.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/bus.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/j1939-priv.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/j1939-priv.h</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/main.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/socket.c</a></td><td class='right'>1393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/can/j1939/transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/j1939/transport.c</a></td><td class='right'>2220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/proc.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/can/raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/raw.c</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/auth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/auth_none.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_none.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/auth_none.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_none.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/auth_x.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_x.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/auth_x_protocol.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_x_protocol.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/buffer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/buffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/ceph_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_common.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ceph/ceph_fs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_fs.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/ceph_hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_hash.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/ceph_strings.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_strings.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/cls_lock_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/cls_lock_client.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/crush/crush.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/crush.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/crush/hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/crush/mapper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/mapper.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/crypto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crypto.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/crypto.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crypto.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/debugfs.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ceph/decode.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/decode.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/messenger.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/messenger.c</a></td><td class='right'>2344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 77.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ceph/messenger_v1.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/messenger_v1.c</a></td><td class='right'>1620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ceph/messenger_v2.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/messenger_v2.c</a></td><td class='right'>3804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 64.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/mon_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/mon_client.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/msgpool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/msgpool.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/osd_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/osd_client.c</a></td><td class='right'>1484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/osdmap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/osdmap.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/pagelist.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/pagelist.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/pagevec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/pagevec.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/snapshot.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/snapshot.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ceph/striper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/striper.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/compat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/compat.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/bpf_sk_storage.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/bpf_sk_storage.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/datagram.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/datagram.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev.c</a></td><td class='right'>9128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 60.3%;'/><td class='rem' style='width: 25.8%;'/><td class='none' style='width: 13.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/dev.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev.h</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/dev_addr_lists.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_addr_lists.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/dev_addr_lists_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_addr_lists_test.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/dev_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_api.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/dev_ioctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_ioctl.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/core/devlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/devlink.c</a></td><td class='right'>4805</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 45.3%;'/><td class='none' style='width: 54.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/devmem.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/devmem.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/devmem.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/devmem.h</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/drop_monitor.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/drop_monitor.c</a></td><td class='right'>1577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/dst.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dst.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/dst_cache.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dst_cache.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/failover.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/failover.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/fib_notifier.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/fib_notifier.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/fib_rules.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/fib_rules.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/filter.c</a></td><td class='right'>7960</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 62.3%;'/><td class='rem' style='width: 12.8%;'/><td class='none' style='width: 24.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/flow_dissector.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/flow_dissector.c</a></td><td class='right'>953</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/flow_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/flow_offload.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/gen_estimator.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gen_estimator.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/gen_stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gen_stats.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/gro.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gro.c</a></td><td class='right'>835</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/gro_cells.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gro_cells.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/gso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gso.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/hotdata.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/hotdata.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/hwbm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/hwbm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/ieee8021q_helpers.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/ieee8021q_helpers.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/link_watch.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/link_watch.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/lock_debug.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/lock_debug.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/lwt_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/lwt_bpf.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/lwtunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/lwtunnel.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/mp_dmabuf_devmem.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/mp_dmabuf_devmem.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/neighbour.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/neighbour.c</a></td><td class='right'>2105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 80.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/net-procfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-procfs.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/net-sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-sysfs.c</a></td><td class='right'>1258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/net-sysfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-sysfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/net-traces.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-traces.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/net_namespace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net_namespace.c</a></td><td class='right'>805</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/net_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net_test.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/netclassid_cgroup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netclassid_cgroup.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netdev-genl-gen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netdev-genl-gen.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netdev-genl-gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netdev-genl-gen.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netdev-genl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netdev-genl.c</a></td><td class='right'>1203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netdev_queues.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netdev_queues.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netdev_rx_queue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netdev_rx_queue.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/netevent.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netevent.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/netmem_priv.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netmem_priv.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/netpoll.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netpoll.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/netprio_cgroup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netprio_cgroup.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/of_net.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/of_net.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/page_pool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/page_pool.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/page_pool_priv.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/page_pool_priv.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/page_pool_user.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/page_pool_user.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/pktgen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/pktgen.c</a></td><td class='right'>955</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/ptp_classifier.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/ptp_classifier.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/request_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/request_sock.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/rtnetlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/rtnetlink.c</a></td><td class='right'>4464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 31.7%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 57.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/scm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/scm.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/secure_seq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/secure_seq.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/selftests.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/selftests.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/skb_fault_injection.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/skb_fault_injection.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/skbuff.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/skbuff.c</a></td><td class='right'>3830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.8%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 63.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/skmsg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/skmsg.c</a></td><td class='right'>1289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock.c</a></td><td class='right'>2813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.3%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 73.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/sock_destructor.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_destructor.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/sock_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_diag.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/core/sock_map.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_map.c</a></td><td class='right'>1959</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/sock_reuseport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_reuseport.c</a></td><td class='right'>517</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/stream.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/stream.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/sysctl_net_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sysctl_net_core.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/timestamping.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/timestamping.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/tso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/tso.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/utils.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/utils.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/core/xdp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/xdp.c</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dcb/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dcb/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dcb/dcbevent.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/dcbevent.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dcb/dcbnl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/dcbnl.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ackvec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ackvec.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ackvec.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ackvec.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccid.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccid.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccid.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccid.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/ccid2.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid2.c</a></td><td class='right'>801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/ccid2.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid2.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/ccid3.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid3.c</a></td><td class='right'>873</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/ccid3.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid3.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/loss_interval.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/loss_interval.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/loss_interval.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/loss_interval.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/packet_history.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/packet_history.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/packet_history.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/packet_history.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/tfrc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/tfrc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ccids/lib/tfrc_equation.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc_equation.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/dccp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/dccp.h</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/diag.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/feat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/feat.c</a></td><td class='right'>1564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.7%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/feat.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/feat.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/input.c</a></td><td class='right'>742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv4.c</a></td><td class='right'>1086</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv6.c</a></td><td class='right'>1169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/ipv6.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv6.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/minisocks.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/minisocks.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/options.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/options.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/output.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/proto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/proto.c</a></td><td class='right'>1276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/qpolicy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/qpolicy.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/sysctl.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/timer.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dccp/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/trace.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/README?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/README</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/TODO?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/TODO</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/af_decnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/af_decnet.c</a></td><td class='right'>2411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.7%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_dev.c</a></td><td class='right'>1438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_fib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_fib.c</a></td><td class='right'>799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_neigh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_neigh.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_nsp_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_nsp_in.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_nsp_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_nsp_out.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_route.c</a></td><td class='right'>1927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.2%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_rules.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_rules.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_table.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/dn_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_timer.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/netfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/netfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/netfilter/dn_rtmsg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/dn_rtmsg.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/decnet/sysctl_net_decnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/sysctl_net_decnet.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/core.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/dev.c</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/devl_internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/devl_internal.h</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/dpipe.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/dpipe.c</a></td><td class='right'>915</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/health.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/health.c</a></td><td class='right'>1350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/linecard.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/linecard.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/netlink.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/netlink_gen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/netlink_gen.c</a></td><td class='right'>1287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/netlink_gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/netlink_gen.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/param.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/param.c</a></td><td class='right'>950</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/port.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/port.c</a></td><td class='right'>1604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/rate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/rate.c</a></td><td class='right'>850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/region.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/region.c</a></td><td class='right'>1258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/resource.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/resource.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/sb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/sb.c</a></td><td class='right'>995</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devlink/trap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devlink/trap.c</a></td><td class='right'>1854</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/devres.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/devres.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dns_resolver/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dns_resolver/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dns_resolver/dns_key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/dns_key.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dns_resolver/dns_query.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/dns_query.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/Kconfig</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/Makefile</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/conduit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/conduit.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/conduit.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/conduit.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/devlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/devlink.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/devlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/devlink.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/dsa.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa.c</a></td><td class='right'>1889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/dsa.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/dsa2.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa2.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/dsa_priv.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa_priv.h</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/legacy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/legacy.c</a></td><td class='right'>748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/master.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/master.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/netlink.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/netlink.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/port.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/port.c</a></td><td class='right'>1901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/port.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/port.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/slave.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/slave.c</a></td><td class='right'>1569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.8%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/stubs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/stubs.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/switch.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/switch.c</a></td><td class='right'>1050</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/switch.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/switch.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag.h</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_8021q.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_8021q.c</a></td><td class='right'>588</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_8021q.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_8021q.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_ar9331.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_ar9331.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_brcm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_brcm.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_dsa.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_dsa.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_edsa.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_edsa.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_gswip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_gswip.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_hellcreek.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_hellcreek.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_ksz.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_ksz.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_lan9303.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_lan9303.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_mtk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_mtk.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_mxl-gsw1xx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_mxl-gsw1xx.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_none.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_none.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_ocelot.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_ocelot.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_ocelot_8021q.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_ocelot_8021q.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_qca.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_qca.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_rtl4_a.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_rtl4_a.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_rtl8_4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_rtl8_4.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_rzn1_a5psw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_rzn1_a5psw.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_sja1105.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_sja1105.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_trailer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_trailer.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_vsc73xx_8021q.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_vsc73xx_8021q.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_xrs700x.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_xrs700x.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/tag_yt921x.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_yt921x.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/trace.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/trace.h</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/user.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/user.c</a></td><td class='right'>3877</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/dsa/user.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/user.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ethernet/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethernet/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ethernet/eth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethernet/eth.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/bitset.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/bitset.c</a></td><td class='right'>873</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/bitset.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/bitset.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/cabletest.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/cabletest.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/channels.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/channels.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/cmis.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/cmis.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/cmis_cdb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/cmis_cdb.c</a></td><td class='right'>666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/cmis_fw_update.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/cmis_fw_update.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/coalesce.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/coalesce.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/common.c</a></td><td class='right'>1169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/common.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/common.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/debug.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/debug.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/eee.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/eee.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/eeprom.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/eeprom.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/features.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/features.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/fec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/fec.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/ethtool/ioctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/ioctl.c</a> (renamed from net/core/ethtool.c)</td><td class='right'>2327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/linkinfo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/linkinfo.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/linkmodes.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/linkmodes.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/linkstate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/linkstate.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/mm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/mm.c</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/module.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/module.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/module_fw.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/module_fw.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/mse.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/mse.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/netlink.c</a></td><td class='right'>1583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/netlink.h</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/pause.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/pause.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/phc_vclocks.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/phc_vclocks.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/phy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/phy.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/plca.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/plca.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/privflags.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/privflags.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/pse-pd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/pse-pd.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/rings.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/rings.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/rss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/rss.c</a></td><td class='right'>1205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/stats.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/strset.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/strset.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/ts.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/ts.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/tsconfig.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/tsconfig.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/tsinfo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/tsinfo.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/tunnels.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/tunnels.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ethtool/wol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethtool/wol.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/.kunitconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/.kunitconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/alert.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/alert.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/genl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/genl.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/genl.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/genl.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/handshake-test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/handshake-test.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/handshake.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/handshake.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/netlink.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/request.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/request.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/tlshd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/tlshd.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/handshake/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/handshake/trace.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_debugfs.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_device.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_device.c</a></td><td class='right'>700</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_device.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_device.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_forward.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_forward.c</a></td><td class='right'>632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_forward.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_forward.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_framereg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_framereg.c</a></td><td class='right'>599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_framereg.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_framereg.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_main.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_main.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_main.h</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_netlink.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_netlink.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_slave.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_slave.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/hsr/hsr_slave.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_slave.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/hsr/prp_dup_discard_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/prp_dup_discard_test.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/core.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/reassembly.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/reassembly.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/rx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/rx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/6lowpan/tx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/tx.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/core.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/header_ops.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/header_ops.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/ieee802154.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/ieee802154.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/netlink.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/nl-mac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl-mac.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/nl-phy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl-phy.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/nl802154.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl802154.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/nl802154.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl802154.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/nl_policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl_policy.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ieee802154/pan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/pan.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/rdev-ops.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/rdev-ops.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/socket.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/sysfs.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/sysfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/sysfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ieee802154/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/trace.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ife/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ife/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ife/ife.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/ife.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/Kconfig</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/af_inet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/af_inet.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ah4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ah4.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/arp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/arp.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/bpf_tcp_ca.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/bpf_tcp_ca.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/bpfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/bpfilter/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/bpfilter/sockopt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/bpfilter/sockopt.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/cipso_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/cipso_ipv4.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/datagram.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/datagram.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/devinet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/devinet.c</a></td><td class='right'>1287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/esp4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/esp4.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/esp4_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/esp4_offload.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_frontend.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_frontend.c</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_lookup.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_lookup.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_notifier.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_notifier.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_rules.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_rules.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_semantics.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_semantics.c</a></td><td class='right'>1767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/fib_trie.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_trie.c</a></td><td class='right'>665</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/fou_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fou_bpf.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/ipv4/fou_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fou_core.c</a> (renamed from net/ipv4/fou.c)</td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/fou_nl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fou_nl.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/fou_nl.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fou_nl.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/gre_demux.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/gre_demux.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/gre_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/gre_offload.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/icmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/icmp.c</a></td><td class='right'>950</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/igmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/igmp.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/igmp_internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/igmp_internal.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inet_connection_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_connection_sock.c</a></td><td class='right'>1078</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inet_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_diag.c</a></td><td class='right'>920</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inet_fragment.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_fragment.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inet_hashtables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_hashtables.c</a></td><td class='right'>1139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inet_timewait_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_timewait_sock.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/inetpeer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inetpeer.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_forward.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_forward.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_fragment.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_fragment.c</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_gre.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_gre.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_input.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_options.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_options.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_output.c</a></td><td class='right'>938</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_sockglue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_sockglue.c</a></td><td class='right'>1305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_tunnel.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_tunnel_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_tunnel_core.c</a></td><td class='right'>879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ip_vti.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_vti.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ipcomp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipcomp.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ipconfig.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipconfig.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ipip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipip.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ipmr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipmr.c</a></td><td class='right'>1056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ipmr_base.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipmr_base.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/metrics.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/metrics.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/Kconfig</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/arp_tables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arp_tables.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/arpt_mangle.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arpt_mangle.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/arptable_filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arptable_filter.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ip_tables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ip_tables.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_ECN.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_ECN.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_MASQUERADE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_MASQUERADE.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_REJECT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_REJECT.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_SYNPROXY.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_SYNPROXY.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_ah.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_ah.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/ipt_rpfilter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_rpfilter.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/iptable_filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_filter.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/iptable_mangle.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_mangle.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/iptable_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_nat.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/iptable_raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_raw.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/iptable_security.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_security.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_defrag_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_defrag_ipv4.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_dup_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_dup_ipv4.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_flow_table_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_flow_table_ipv4.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_log_arp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_log_arp.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_log_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_log_ipv4.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_h323.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_h323.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_l3proto_ipv4.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_masquerade_ipv4.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_pptp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_pptp.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_proto_gre.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_proto_gre.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_proto_icmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_proto_icmp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_snmp_basic.asn1?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_snmp_basic.asn1</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_nat_snmp_basic_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_snmp_basic_main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_reject_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_reject_ipv4.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_socket_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_socket_ipv4.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nf_tproxy_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_tproxy_ipv4.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_chain_nat_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_chain_nat_ipv4.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_chain_route_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_chain_route_ipv4.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_dup_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_dup_ipv4.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_fib_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_fib_ipv4.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_masq_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_masq_ipv4.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_redir_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_redir_ipv4.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netfilter/nft_reject_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_reject_ipv4.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netlink.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/nexthop.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/nexthop.c</a></td><td class='right'>4157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 60.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/ping.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ping.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/proc.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/protocol.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/raw.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/raw_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/raw_diag.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/route.c</a></td><td class='right'>1923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/syncookies.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/syncookies.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/sysctl_net_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>1074</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp.c</a></td><td class='right'>3405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.6%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 67.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_ao.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_ao.c</a></td><td class='right'>2442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_bbr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_bbr.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_bic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_bic.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_bpf.c</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_cdg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cdg.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_cong.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cong.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_cubic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cubic.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_dctcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_dctcp.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_dctcp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_dctcp.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_diag.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_fastopen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_fastopen.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_highspeed.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_highspeed.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_htcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_htcp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_hybla.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_hybla.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_illinois.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_illinois.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_input.c</a></td><td class='right'>3196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 69.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_ipv4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>2430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_lp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_lp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_metrics.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_metrics.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_minisocks.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_minisocks.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_nv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_nv.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_offload.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_output.c</a></td><td class='right'>2204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.5%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_plb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_plb.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_rate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_rate.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_recovery.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_recovery.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_scalable.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_scalable.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_sigpool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_sigpool.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_timer.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_ulp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_ulp.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_vegas.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_vegas.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_veno.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_veno.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_westwood.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_westwood.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tcp_yeah.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_yeah.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/tunnel4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tunnel4.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp.c</a></td><td class='right'>2236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.7%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 78.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_bpf.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_diag.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_impl.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_impl.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_offload.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_tunnel_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_tunnel_core.c</a> (renamed from net/ipv4/udp_tunnel.c)</td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_tunnel_nic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_tunnel_nic.c</a></td><td class='right'>1010</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv4/udp_tunnel_stub.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_tunnel_stub.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/udplite.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udplite.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_input.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_mode_beet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_beet.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_mode_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_transport.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_mode_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_tunnel.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_output.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_policy.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_protocol.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_state.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_state.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv4/xfrm4_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_tunnel.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/Kconfig</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/addrconf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrconf.c</a></td><td class='right'>2999</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 71.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/addrconf_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrconf_core.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/addrlabel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrlabel.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/af_inet6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/af_inet6.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ah6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ah6.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/anycast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/anycast.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/calipso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/calipso.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/datagram.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/datagram.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/esp6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/esp6.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/esp6_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/esp6_offload.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/exthdrs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/exthdrs_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/exthdrs_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs_offload.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/fib6_notifier.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fib6_notifier.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/fib6_rules.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fib6_rules.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/fou6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fou6.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/icmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/icmp.c</a></td><td class='right'>697</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/ila.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/ila_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_common.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/ila_lwt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_lwt.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/ila_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ila/ila_xlat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_xlat.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/inet6_connection_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/inet6_connection_sock.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/inet6_hashtables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/inet6_hashtables.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv6/ioam6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ioam6.c</a></td><td class='right'>1040</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv6/ioam6_iptunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ioam6_iptunnel.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_checksum.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_checksum.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_fib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_fib.c</a></td><td class='right'>939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_flowlabel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_flowlabel.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_gre.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_gre.c</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_icmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_icmp.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_input.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_offload.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_offload.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_offload.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_output.c</a></td><td class='right'>1096</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_tunnel.c</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_udp_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_udp_tunnel.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6_vti.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_vti.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ip6mr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6mr.c</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ipcomp6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ipcomp6.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ipv6_sockglue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ipv6_sockglue.c</a></td><td class='right'>1238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/mcast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mcast.c</a></td><td class='right'>1616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/mcast_snoop.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mcast_snoop.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/mip6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mip6.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ndisc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ndisc.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/Kconfig</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6_tables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6_tables.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_MASQUERADE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_MASQUERADE.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_NPT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_NPT.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_REJECT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_REJECT.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_SYNPROXY.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_SYNPROXY.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_ah.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_ah.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_eui64.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_eui64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_frag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_frag.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_hbh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_hbh.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_ipv6header.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_ipv6header.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_mh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_mh.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_rpfilter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_rpfilter.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_rt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_rt.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6t_srh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_srh.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6table_filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_filter.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6table_mangle.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_mangle.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6table_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_nat.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6table_raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_raw.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/ip6table_security.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_security.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_conntrack_reasm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_conntrack_reasm.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_defrag_ipv6_hooks.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_dup_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_dup_ipv6.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_flow_table_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_flow_table_ipv6.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_log_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_log_ipv6.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_l3proto_ipv6.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_masquerade_ipv6.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_nat_proto_icmpv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_proto_icmpv6.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_reject_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_reject_ipv6.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_socket_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_socket_ipv6.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nf_tproxy_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_tproxy_ipv6.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_chain_nat_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_chain_nat_ipv6.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_chain_route_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_chain_route_ipv6.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_dup_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_dup_ipv6.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_fib_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_fib_ipv6.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_masq_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_masq_ipv6.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_redir_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_redir_ipv6.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/netfilter/nft_reject_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_reject_ipv6.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/output_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/output_core.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/ping.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ping.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/proc.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/protocol.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/raw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/raw.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/reassembly.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/reassembly.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/route.c</a></td><td class='right'>4220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 27.0%;'/><td class='rem' style='width: 12.8%;'/><td class='none' style='width: 60.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv6/rpl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/rpl.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv6/rpl_iptunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/rpl_iptunnel.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/seg6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/seg6_hmac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_hmac.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/seg6_iptunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_iptunnel.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/seg6_local.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_local.c</a></td><td class='right'>1894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/sit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/sit.c</a></td><td class='right'>777</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/syncookies.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/syncookies.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/sysctl_net_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/sysctl_net_ipv6.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/ipv6/tcp_ao.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tcp_ao.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/tcp_ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>1360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/tcpv6_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tcpv6_offload.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/tunnel6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tunnel6.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp.c</a></td><td class='right'>1118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/udp_impl.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp_impl.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/udp_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp_offload.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/udplite.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udplite.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_input.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_mode_beet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_beet.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_mode_ro.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_ro.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_mode_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_transport.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_mode_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_tunnel.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_output.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_policy.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_protocol.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_state.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_state.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ipv6/xfrm6_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_tunnel.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/iucv/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/iucv/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/iucv/af_iucv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/af_iucv.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/iucv/iucv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/iucv.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/kcm/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/kcm/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/kcm/kcmproc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/kcmproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/kcm/kcmsock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/kcmsock.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/key/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/key/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/key/af_key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/key/af_key.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_core.c</a></td><td class='right'>1357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_core.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_core.h</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_debugfs.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_eth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_eth.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ip.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_ip6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ip6.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_netlink.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l2tp/l2tp_ppp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ppp.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/l2tp/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/trace.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l3mdev/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l3mdev/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/l3mdev/l3mdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/l3mdev.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/lapb_iface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_iface.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/lapb_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_in.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/lapb_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_out.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/lapb_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_subr.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/lapb/lapb_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_timer.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/af_llc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/af_llc.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_c_ac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_ac.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_c_ev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_ev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_c_st.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_st.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_conn.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_conn.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_core.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_if.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_if.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_input.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_output.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_pdu.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_pdu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_s_ac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_s_ac.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_s_st.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_s_st.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_sap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_sap.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/llc_station.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_station.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/llc/sysctl_net_llc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/sysctl_net_llc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/Kconfig</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aead_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aead_api.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aead_api.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aead_api.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_ccm.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_ccm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_cmac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_cmac.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_cmac.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_cmac.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_gcm.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gcm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_gmac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gmac.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/aes_gmac.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gmac.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/agg-rx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/agg-rx.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/agg-tx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/agg-tx.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/airtime.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/airtime.c</a></td><td class='right'>837</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/cfg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/cfg.c</a></td><td class='right'>3469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.6%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 67.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/chan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/chan.c</a></td><td class='right'>1859</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debug.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debug.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_key.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_key.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_key.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_netdev.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_netdev.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_netdev.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_sta.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_sta.c</a></td><td class='right'>1047</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/debugfs_sta.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_sta.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/driver-ops.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/driver-ops.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/driver-ops.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/driver-ops.h</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/drop.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/drop.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/eht.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/eht.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/ethtool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/ethtool.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/fils_aead.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/fils_aead.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/fils_aead.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/fils_aead.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/he.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/he.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/ht.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/ht.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/ibss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/ibss.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/ieee80211_i.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/ieee80211_i.h</a></td><td class='right'>1591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/iface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/iface.c</a></td><td class='right'>2063</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 80.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/key.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/key.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/key.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/led.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/led.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/led.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/led.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/link.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/link.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/main.c</a></td><td class='right'>1019</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh_hwmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh_hwmp.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh_pathtbl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh_pathtbl.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh_plink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh_plink.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh_ps.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh_ps.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mesh_sync.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mesh_sync.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/michael.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/michael.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/michael.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/michael.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/mlme.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/mlme.c</a></td><td class='right'>9952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 73.3%;'/><td class='rem' style='width: 20.6%;'/><td class='none' style='width: 6.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/ocb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/ocb.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/offchannel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/offchannel.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/parse.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/parse.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/pm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/pm.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rate.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rate.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rate.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel_debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel_debugfs.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel_ht.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel_ht.c</a></td><td class='right'>1544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel_ht.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel_ht.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rc80211_minstrel_ht_debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rc80211_minstrel_ht_debugfs.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/rx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/rx.c</a></td><td class='right'>2934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.7%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 72.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/s1g.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/s1g.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/scan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/scan.c</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/spectmgmt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/spectmgmt.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/sta_info.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/sta_info.c</a></td><td class='right'>1804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 83.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/sta_info.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/sta_info.h</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/status.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/status.c</a></td><td class='right'>758</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/tdls.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tdls.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/chan-mode.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/chan-mode.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/elems.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/elems.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/mfp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/mfp.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/module.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/s1g_tim.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/s1g_tim.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/tpe.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/tpe.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/util.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/tests/util.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tests/util.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/tkip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tkip.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/tkip.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tkip.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/trace.h</a></td><td class='right'>1431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/trace_msg.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/trace_msg.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/tx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/tx.c</a></td><td class='right'>3152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.4%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 70.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/util.c</a></td><td class='right'>3307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 11.4%;'/><td class='none' style='width: 68.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/vht.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/vht.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac80211/wbrf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wbrf.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wep.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wep.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wep.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wep.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wme.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wme.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wme.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wme.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wpa.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wpa.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac80211/wpa.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/wpa.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/cfg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/cfg.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/driver-ops.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/driver-ops.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/ieee802154_i.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/ieee802154_i.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/iface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/iface.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/llsec.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/llsec.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/llsec.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/llsec.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/mac_cmd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/mac_cmd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/main.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/mib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/mib.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/rx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/rx.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mac802154/scan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/scan.c</a></td><td class='right'>917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/trace.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/tx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/tx.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mac802154/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac802154/util.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/af_mctp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/af_mctp.c</a></td><td class='right'>911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/device.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/device.c</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/neigh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/neigh.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/route.c</a></td><td class='right'>1790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/test/route-test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/test/route-test.c</a></td><td class='right'>1598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/test/sock-test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/test/sock-test.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/test/utils.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/test/utils.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mctp/test/utils.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mctp/test/utils.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/af_mpls.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/af_mpls.c</a></td><td class='right'>807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/internal.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/mpls_gso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/mpls_gso.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/mpls/mpls_iptunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mpls/mpls_iptunnel.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/bpf.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/crypto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/crypto.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/crypto_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/crypto_test.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/ctrl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/ctrl.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/diag.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/fastopen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/fastopen.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/mib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/mib.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/mib.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/mib.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/mptcp_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/mptcp_diag.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/mptcp_pm_gen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/mptcp_pm_gen.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/mptcp_pm_gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/mptcp_pm_gen.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/options.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/options.c</a></td><td class='right'>1719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/pm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/pm.c</a></td><td class='right'>1139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/pm_kernel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/pm_kernel.c</a></td><td class='right'>1624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/pm_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/pm_netlink.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/pm_userspace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/pm_userspace.c</a></td><td class='right'>698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/protocol.c</a></td><td class='right'>4462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 42.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 57.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/protocol.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/protocol.h</a></td><td class='right'>1366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/sched.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/sched.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/sockopt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/sockopt.c</a></td><td class='right'>1654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/subflow.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/subflow.c</a></td><td class='right'>2219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/syncookies.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/syncookies.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/token.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/token.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/mptcp/token_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mptcp/token_test.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/internal.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-aen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-aen.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-cmd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-cmd.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-manage.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-manage.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-netlink.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-netlink.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-pkt.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-pkt.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/ncsi/ncsi-rsp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ncsi/ncsi-rsp.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/Kconfig</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/Makefile</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/core.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_bitmap_gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_bitmap_gen.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_bitmap_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_bitmap_ip.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_bitmap_ipmac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_bitmap_ipmac.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_bitmap_port.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_bitmap_port.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_core.c</a></td><td class='right'>955</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_getport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_getport.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_gen.h</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ip.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ipmac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ipmac.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ipmark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ipmark.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ipport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ipport.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ipportip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ipportip.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_ipportnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_ipportnet.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_mac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_mac.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_net.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_net.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_netiface.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_netiface.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_netnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_netnet.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_netport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_netport.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_hash_netportnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_hash_netportnet.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/ip_set_list_set.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/ip_set_list_set.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipset/pfxlen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipset/pfxlen.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/Kconfig</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_app.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_app.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_conn.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_conn.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_core.c</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_ctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_ctl.c</a></td><td class='right'>1001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_dh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_dh.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_est.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_est.c</a></td><td class='right'>893</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_fo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_fo.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_ftp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_ftp.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_lblc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_lblc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_lblcr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_lblcr.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_lc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_lc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_mh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_mh.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_nfct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_nfct.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_nq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_nq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_ovf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_ovf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_pe.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_pe.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_pe_sip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_pe_sip.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_proto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_proto.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_proto_ah_esp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_proto_ah_esp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_proto_sctp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_proto_sctp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_proto_tcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_proto_tcp.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_proto_udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_proto_udp.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_rr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_rr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_sched.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_sched.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_sed.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_sed.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_sh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_sh.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_sync.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_sync.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_twos.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_twos.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_wlc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_wlc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_wrr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_wrr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/ipvs/ip_vs_xmit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/ipvs/ip_vs_xmit.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_bpf_link.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_bpf_link.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conncount.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conncount.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_acct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_acct.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_amanda.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_amanda.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_bpf.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_broadcast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_broadcast.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>1928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_ecache.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_ecache.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_expect.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_expect.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_extend.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_extend.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_ftp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_h323_asn1.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_h323_asn1.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_h323_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_h323_main.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_h323_types.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_h323_types.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_helper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_helper.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_irc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_irc.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_labels.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_labels.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_netbios_ns.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_netbios_ns.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>1625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_ovs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_ovs.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_pptp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_pptp.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto.c</a></td><td class='right'>805</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_dccp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_dccp.c</a></td><td class='right'>911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_generic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_generic.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_gre.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_gre.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_icmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_icmp.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_icmpv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_icmpv6.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_sctp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_sctp.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_tcp.c</a></td><td class='right'>1080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_proto_udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_proto_udp.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_sane.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_sane.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_seqadj.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_seqadj.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_sip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_sip.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_snmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_snmp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_standalone.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_tftp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_tftp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_timeout.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_timeout.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_conntrack_timestamp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_conntrack_timestamp.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_dup_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_dup_netdev.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_bpf.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_core.c</a></td><td class='right'>724</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_inet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_inet.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_ip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_ip.c</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_offload.c</a></td><td class='right'>1241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_path.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_path.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_procfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_procfs.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_flow_table_xdp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_flow_table_xdp.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_hooks_lwtunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_hooks_lwtunnel.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_internals.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_internals.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_log.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_log.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_log_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_log_common.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_log_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_log_netdev.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_log_syslog.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_log_syslog.c</a></td><td class='right'>1085</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_amanda.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_amanda.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_bpf.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_core.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_ftp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_ftp.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_helper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_helper.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_irc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_irc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_masquerade.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_masquerade.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_ovs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_ovs.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto.c</a></td><td class='right'>1119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_common.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_dccp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_dccp.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_sctp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_sctp.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_tcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_tcp.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_udp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_udp.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_proto_unknown.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_proto_unknown.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_redirect.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_redirect.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_sip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_sip.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_nat_tftp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_nat_tftp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_queue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_queue.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_sockopt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_sockopt.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_synproxy_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_synproxy_core.c</a></td><td class='right'>940</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_tables_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_tables_api.c</a></td><td class='right'>9501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 68.2%;'/><td class='rem' style='width: 21.4%;'/><td class='none' style='width: 10.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_tables_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_tables_core.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_tables_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_tables_offload.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_tables_set_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_tables_set_core.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nf_tables_trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nf_tables_trace.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_acct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_acct.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_cthelper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_cthelper.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_cttimeout.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_cttimeout.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_hook.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_hook.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_log.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_log.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_osf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_osf.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nfnetlink_queue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nfnetlink_queue.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_bitwise.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_bitwise.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_byteorder.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_byteorder.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_chain_filter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_chain_filter.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_chain_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_chain_nat.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_chain_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_chain_route.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_cmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_cmp.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_compat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_compat.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_connlimit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_connlimit.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_counter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_counter.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_ct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_ct.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_ct_fast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_ct_fast.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_dup_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_dup_netdev.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_dynset.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_dynset.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_exthdr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_exthdr.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_fib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_fib.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_fib_inet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_fib_inet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_fib_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_fib_netdev.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_flow_offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_flow_offload.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_fwd_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_fwd_netdev.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_hash.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_immediate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_immediate.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_inner.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_inner.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_last.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_last.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_limit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_limit.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_log.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_log.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_lookup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_lookup.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_masq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_masq.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_meta.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_meta.c</a></td><td class='right'>837</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_nat.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_numgen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_numgen.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_objref.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_objref.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_osf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_osf.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_payload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_payload.c</a></td><td class='right'>792</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_queue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_queue.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_quota.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_quota.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_range.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_range.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_redir.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_redir.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_reject.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_reject.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_reject_inet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_reject_inet.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_reject_netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_reject_netdev.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_rt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_rt.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_bitmap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_bitmap.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_hash.c</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_pipapo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_pipapo.c</a></td><td class='right'>2400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_pipapo.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_pipapo.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_pipapo_avx2.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_pipapo_avx2.c</a></td><td class='right'>1302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_pipapo_avx2.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_pipapo_avx2.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_set_rbtree.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_set_rbtree.c</a></td><td class='right'>680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_socket.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_synproxy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_synproxy.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_tproxy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_tproxy.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_tunnel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_tunnel.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/nft_xfrm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/nft_xfrm.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/utils.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/utils.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/x_tables.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/x_tables.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_AUDIT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_AUDIT.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_CHECKSUM.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_CHECKSUM.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_CLASSIFY.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_CLASSIFY.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_CONNSECMARK.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_CONNSECMARK.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_CT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_CT.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_DSCP.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_DSCP.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_HL.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_HL.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_HMARK.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_HMARK.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_IDLETIMER.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_IDLETIMER.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_LED.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_LED.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_LOG.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_LOG.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_MASQUERADE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_MASQUERADE.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_NETMAP.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_NETMAP.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_NFLOG.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_NFLOG.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_NFQUEUE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_NFQUEUE.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_RATEEST.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_RATEEST.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_REDIRECT.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_REDIRECT.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_SECMARK.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_SECMARK.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_TCPMSS.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_TCPMSS.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_TCPOPTSTRIP.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_TCPOPTSTRIP.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_TEE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_TEE.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_TPROXY.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_TPROXY.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_TRACE.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_TRACE.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_addrtype.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_addrtype.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_bpf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_cgroup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_cgroup.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_cluster.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_cluster.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_comment.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_comment.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_connbytes.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_connbytes.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_connlabel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_connlabel.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_connlimit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_connlimit.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_connmark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_connmark.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_conntrack.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_conntrack.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_cpu.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_cpu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_dccp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_dccp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_devgroup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_devgroup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_dscp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_dscp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_ecn.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_ecn.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_esp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_esp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_hashlimit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_hashlimit.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_helper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_helper.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_hl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_hl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_ipcomp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_ipcomp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_iprange.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_iprange.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_ipvs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_ipvs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_l2tp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_l2tp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_length.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_length.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_limit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_limit.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_mac.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_mac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_mark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_mark.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_multiport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_multiport.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_nat.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_nfacct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_nfacct.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_osf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_osf.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_owner.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_owner.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_physdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_physdev.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_pkttype.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_pkttype.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_policy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_quota.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_quota.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_rateest.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_rateest.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_realm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_realm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_recent.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_recent.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_repldata.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_repldata.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_sctp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_sctp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_set.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_set.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_socket.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_state.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_state.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_statistic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_statistic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_string.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_string.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_tcpmss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_tcpmss.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_tcpudp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_tcpudp.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_time.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_time.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netfilter/xt_u32.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netfilter/xt_u32.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_addrlist.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_addrlist.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_addrlist.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_addrlist.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_calipso.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_calipso.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_calipso.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_calipso.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_cipso_v4.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_cipso_v4.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_cipso_v4.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_cipso_v4.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_domainhash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_domainhash.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_domainhash.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_domainhash.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_kapi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_kapi.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_mgmt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_mgmt.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_mgmt.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_mgmt.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_unlabeled.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_unlabeled.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_unlabeled.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_unlabeled.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_user.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_user.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlabel/netlabel_user.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlabel/netlabel_user.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/af_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/af_netlink.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/af_netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/af_netlink.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/diag.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netlink/genetlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/genetlink.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netlink/genetlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/genetlink.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/netlink/policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netlink/policy.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/af_netrom.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/af_netrom.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_dev.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_in.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_loopback.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_loopback.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_out.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_route.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_subr.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/nr_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/nr_timer.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/netrom/sysctl_net_netrom.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/netrom/sysctl_net_netrom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/af_nfc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/af_nfc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/core.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/digital.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/digital.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/digital_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/digital_core.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/digital_dep.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/digital_dep.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/digital_technology.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/digital_technology.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/command.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/command.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/core.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/hci.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/hci.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/hcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/hcp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/llc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/llc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/llc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/llc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/llc_nop.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/llc_nop.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/hci/llc_shdlc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/hci/llc_shdlc.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/llcp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/llcp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/llcp_commands.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/llcp_commands.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/llcp_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/llcp_core.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/llcp_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/llcp_sock.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/core.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/data.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/data.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/hci.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/hci.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/lib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/lib.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/ntf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/ntf.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/rsp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/rsp.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/spi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/spi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nci/uart.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nci/uart.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/netlink.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/nfc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/nfc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nfc/rawsock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nfc/rawsock.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nsh/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nsh/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nsh/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nsh/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/nsh/nsh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/nsh/nsh.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/actions.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/actions.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/conntrack.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/conntrack.c</a></td><td class='right'>735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/conntrack.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/conntrack.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/datapath.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/datapath.c</a></td><td class='right'>797</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/datapath.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/datapath.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/dp_notify.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/dp_notify.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/openvswitch/drop.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/drop.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow_netlink.c</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow_netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow_netlink.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow_table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow_table.c</a></td><td class='right'>790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/flow_table.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/flow_table.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/meter.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/meter.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/meter.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/meter.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/openvswitch/openvswitch_trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/openvswitch_trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/openvswitch/openvswitch_trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/openvswitch_trace.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-geneve.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-geneve.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-gre.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-gre.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-internal_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-internal_dev.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-internal_dev.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-internal_dev.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-netdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-netdev.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-netdev.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-netdev.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport-vxlan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport-vxlan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/openvswitch/vport.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/openvswitch/vport.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/packet/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/packet/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/packet/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/packet/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/packet/af_packet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/packet/af_packet.c</a></td><td class='right'>1405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/packet/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/packet/diag.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/packet/internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/packet/internal.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/af_phonet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/af_phonet.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/datagram.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/datagram.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/pep-gprs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/pep-gprs.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/pep.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/pep.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/pn_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/pn_dev.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/pn_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/pn_netlink.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/socket.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/phonet/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/phonet/sysctl.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/psample/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psample/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/psample/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psample/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/psample/psample.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psample/psample.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp-nl-gen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp-nl-gen.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp-nl-gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp-nl-gen.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp_main.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp_nl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp_nl.c</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/psp/psp_sock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/psp/psp_sock.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/qrtr/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/qrtr/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/qrtr/af_qrtr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/af_qrtr.c</a> (renamed from net/qrtr/qrtr.c)</td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/qrtr/mhi.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/mhi.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/qrtr/ns.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/ns.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/qrtr/qrtr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/qrtr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/qrtr/smd.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/smd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/qrtr/tun.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/qrtr/tun.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/af_rds.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/af_rds.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/bind.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/bind.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/cong.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/cong.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/connection.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/connection.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_cm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_cm.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/rds/ib_fmr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_fmr.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_frmr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_frmr.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_mr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_mr.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_rdma.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_rdma.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_recv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_recv.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_ring.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_ring.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_send.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_send.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_stats.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/ib_sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/ib_sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/info.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/info.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/message.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/message.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/page.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/page.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/rdma.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/rdma.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/rdma_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/rdma_transport.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/rdma_transport.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/rdma_transport.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/rds.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/rds.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/recv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/recv.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/send.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/send.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/stats.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp_connect.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp_connect.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp_listen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp_listen.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp_recv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp_recv.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/tcp_send.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/tcp_send.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/threads.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/threads.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rds/transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rds/transport.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/core.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/input.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/rfkill-gpio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/rfkill-gpio.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rfkill/rfkill.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rfkill/rfkill.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/af_rose.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/af_rose.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_dev.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_in.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_link.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_link.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_loopback.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_loopback.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_out.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_route.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_subr.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/rose_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/rose_timer.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rose/sysctl_net_rose.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rose/sysctl_net_rose.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/af_rxrpc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/af_rxrpc.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/ar-internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/ar-internal.h</a></td><td class='right'>1270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/call_accept.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/call_accept.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/call_event.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/call_event.c</a></td><td class='right'>738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/call_object.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/call_object.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/call_state.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/call_state.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/conn_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/conn_client.c</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/conn_event.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/conn_event.c</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/conn_object.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/conn_object.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/conn_service.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/conn_service.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/input.c</a></td><td class='right'>1959</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/input_rack.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/input_rack.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/insecure.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/insecure.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/io_thread.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/io_thread.c</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/key.c</a></td><td class='right'>835</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/local_event.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/local_event.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/local_object.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/local_object.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/misc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/misc.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/net_ns.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/net_ns.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/oob.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/oob.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/output.c</a></td><td class='right'>1135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/peer_event.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/peer_event.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/peer_object.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/peer_object.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/proc.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/protocol.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/protocol.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/recvmsg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/recvmsg.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rtt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rtt.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxgk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxgk.c</a></td><td class='right'>1373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxgk_app.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxgk_app.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxgk_common.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxgk_common.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxgk_kdf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxgk_kdf.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxkad.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxkad.c</a></td><td class='right'>1213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/rxperf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/rxperf.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/security.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/security.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/sendmsg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/sendmsg.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/server_key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/server_key.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/skbuff.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/skbuff.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/sysctl.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/rxrpc/txbuf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/txbuf.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/rxrpc/utils.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/rxrpc/utils.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/Kconfig</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_api.c</a></td><td class='right'>1680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_bpf.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_connmark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_connmark.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_csum.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_csum.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/act_ct.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_ct.c</a></td><td class='right'>1698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/act_ctinfo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_ctinfo.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_gact.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_gact.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/act_gate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_gate.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_ife.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_ife.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/act_ipt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_ipt.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_meta_mark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_meta_mark.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_meta_skbprio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_meta_skbprio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_meta_skbtcindex.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_meta_skbtcindex.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_mirred.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_mirred.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/act_mpls.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_mpls.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_nat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_nat.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_pedit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_pedit.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_police.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_police.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_sample.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_sample.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_simple.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_simple.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_skbedit.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_skbedit.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_skbmod.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_skbmod.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_tunnel_key.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_tunnel_key.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/act_vlan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/act_vlan.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/bpf_qdisc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/bpf_qdisc.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_api.c</a></td><td class='right'>2966</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.7%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 72.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_basic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_basic.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_bpf.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_cgroup.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_cgroup.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_flow.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_flow.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_flower.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_flower.c</a></td><td class='right'>2584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.2%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 75.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_fw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_fw.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_matchall.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_matchall.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_route.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/cls_rsvp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_rsvp.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/cls_rsvp.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_rsvp.h</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/cls_rsvp6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_rsvp6.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/cls_tcindex.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_tcindex.c</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/cls_u32.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/cls_u32.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_canid.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_canid.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_cmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_cmp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_ipset.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_ipset.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_ipt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_ipt.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_meta.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_meta.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_nbyte.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_nbyte.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_text.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_text.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/em_u32.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/em_u32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/ematch.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/ematch.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_api.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_api.c</a></td><td class='right'>1062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/sch_atm.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_atm.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_blackhole.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_blackhole.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_cake.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_cake.c</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/sch_cbq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_cbq.c</a></td><td class='right'>1807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.0%;'/><td class='none' style='width: 83.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_cbs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_cbs.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_choke.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_choke.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_codel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_codel.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_drr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_drr.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sched/sch_dsmark.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_dsmark.c</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_dualpi2.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_dualpi2.c</a></td><td class='right'>1177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_etf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_etf.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_ets.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_ets.c</a></td><td class='right'>839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_fifo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_fifo.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_fq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_fq.c</a></td><td class='right'>883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_fq_codel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_fq_codel.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_fq_pie.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_fq_pie.c</a></td><td class='right'>595</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_frag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_frag.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_generic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_generic.c</a></td><td class='right'>869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_gred.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_gred.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_hfsc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_hfsc.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_hhf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_hhf.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_htb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_htb.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_ingress.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_ingress.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_mq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_mq.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_mqprio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_mqprio.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_mqprio_lib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_mqprio_lib.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_mqprio_lib.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_mqprio_lib.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_multiq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_multiq.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_netem.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_netem.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_pie.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_pie.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_plug.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_plug.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_prio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_prio.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_qfq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_qfq.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_red.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_red.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_sfb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_sfb.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_sfq.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_sfq.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_skbprio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_skbprio.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sched/sch_taprio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_taprio.c</a></td><td class='right'>2574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_tbf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_tbf.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sched/sch_teql.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sched/sch_teql.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/associola.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/associola.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/auth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/auth.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/bind_addr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/bind_addr.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/chunk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/chunk.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/debug.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/debug.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/diag.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/endpointola.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/endpointola.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/input.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/inqueue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/inqueue.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/ipv6.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/ipv6.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/objcnt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/objcnt.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/offload.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/offload.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/output.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/outqueue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/outqueue.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/primitive.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/primitive.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/proc.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/protocol.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/protocol.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/sm_make_chunk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/sm_make_chunk.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/sm_sideeffect.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/sm_sideeffect.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/sm_statefuns.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/sm_statefuns.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/sm_statetable.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/sm_statetable.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/socket.c</a></td><td class='right'>3556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.9%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 66.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/stream.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/stream_interleave.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream_interleave.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/stream_sched.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream_sched.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sctp/stream_sched_fc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream_sched_fc.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/stream_sched_prio.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream_sched_prio.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/stream_sched_rr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/stream_sched_rr.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/sysctl.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/transport.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/tsnmap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/tsnmap.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/ulpevent.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/ulpevent.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sctp/ulpqueue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sctp/ulpqueue.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/shaper/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/shaper/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/shaper/shaper.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/shaper/shaper.c</a></td><td class='right'>1438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/shaper/shaper_nl_gen.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/shaper/shaper_nl_gen.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/shaper/shaper_nl_gen.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/shaper/shaper_nl_gen.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/af_smc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/af_smc.c</a></td><td class='right'>2938</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.8%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 72.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_cdc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_cdc.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_cdc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_cdc.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_clc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_clc.c</a></td><td class='right'>1265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_clc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_clc.h</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_close.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_close.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_close.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_close.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_core.c</a></td><td class='right'>2580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 75.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_core.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_core.h</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_diag.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_hs_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_hs_bpf.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_hs_bpf.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_hs_bpf.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_ib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_ib.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_ib.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_ib.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_inet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_inet.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_inet.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_inet.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_ism.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_ism.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_ism.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_ism.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_llc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_llc.c</a></td><td class='right'>2203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_llc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_llc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_netlink.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_netlink.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_netns.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_netns.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_pnet.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_pnet.c</a></td><td class='right'>1163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_pnet.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_pnet.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_rx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_rx.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_rx.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_rx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_stats.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_stats.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_stats.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_sysctl.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_sysctl.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_sysctl.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_tracepoint.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_tracepoint.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/smc/smc_tracepoint.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_tracepoint.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_tx.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_tx.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_tx.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_tx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_wr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_wr.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/smc/smc_wr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/smc/smc_wr.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/socket.c</a></td><td class='right'>2438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 77.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/strparser/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/strparser/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/strparser/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/strparser/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/strparser/strparser.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/strparser/strparser.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/.kunitconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/.kunitconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/Kconfig</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/addr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/addr.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_generic.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_generic.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/auth_gss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/auth_gss.c</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/auth_gss_internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/auth_gss_internal.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_generic_token.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_generic_token.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_crypto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_crypto.c</a></td><td class='right'>1094</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_internal.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_keys.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_keys.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_mech.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_mech.c</a></td><td class='right'>996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_seal.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_seal.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_seqnum.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_seqnum.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_test.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_test.c</a></td><td class='right'>1859</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_unseal.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_unseal.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_krb5_wrap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_krb5_wrap.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_mech_switch.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_mech_switch.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_rpc_upcall.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_rpc_upcall.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_rpc_upcall.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_rpc_upcall.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_rpc_xdr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_rpc_xdr.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/gss_rpc_xdr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/gss_rpc_xdr.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/svcauth_gss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/svcauth_gss.c</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_gss/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_gss/trace.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_null.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_null.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_tls.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_tls.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/auth_unix.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/auth_unix.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/backchannel_rqst.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/backchannel_rqst.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/cache.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/cache.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/clnt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/clnt.c</a></td><td class='right'>1875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/debugfs.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/fail.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/fail.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/netns.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/netns.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/rpc_pipe.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/rpc_pipe.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/rpcb_clnt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/rpcb_clnt.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sched.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sched.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/socklib.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/socklib.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/socklib.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/socklib.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/stats.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/stats.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sunrpc.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sunrpc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sunrpc_syms.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sunrpc_syms.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/svc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/svc.c</a></td><td class='right'>1309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/svc_xprt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/svc_xprt.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/svcauth.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/svcauth.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/svcauth_unix.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/svcauth_unix.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/svcsock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/svcsock.c</a></td><td class='right'>1206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sysctl.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sysfs.c</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/sysfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/sysfs.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xdr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xdr.c</a></td><td class='right'>1479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprt.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprt.c</a></td><td class='right'>1580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtmultipath.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtmultipath.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/backchannel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/backchannel.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/fmr_ops.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/fmr_ops.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/frwr_ops.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/frwr_ops.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/ib_client.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/ib_client.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/module.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/module.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/rpc_rdma.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/rpc_rdma.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_backchannel.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_backchannel.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_pcl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_pcl.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_recvfrom.c</a></td><td class='right'>876</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_rw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_rw.c</a></td><td class='right'>1130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_sendto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_sendto.c</a></td><td class='right'>1110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/svc_rdma_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/svc_rdma_transport.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/transport.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/verbs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/verbs.c</a></td><td class='right'>1732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtrdma/xprt_rdma.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtrdma/xprt_rdma.h</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sunrpc/xprtsock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sunrpc/xprtsock.c</a></td><td class='right'>2590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.0%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 75.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/switchdev/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/switchdev/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/switchdev/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/switchdev/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/switchdev/switchdev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/switchdev/switchdev.c</a></td><td class='right'>1057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/sysctl_net.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/sysctl_net.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/addr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/addr.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/addr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/addr.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/bcast.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/bcast.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/bcast.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/bcast.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/bearer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/bearer.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/bearer.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/bearer.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/core.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/core.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/core.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tipc/crypto.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/crypto.c</a></td><td class='right'>2484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tipc/crypto.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/crypto.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/diag.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/discover.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/discover.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/eth_media.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/eth_media.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/group.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/group.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/group.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/group.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/ib_media.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/ib_media.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/link.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/link.c</a></td><td class='right'>1510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/link.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/link.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/monitor.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/monitor.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/monitor.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/monitor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/msg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/msg.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/msg.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/msg.h</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/name_distr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/name_distr.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/name_distr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/name_distr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/name_table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/name_table.c</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/name_table.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/name_table.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/net.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/net.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/net.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/net.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/netlink.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/netlink.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/netlink.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/netlink.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/netlink_compat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/netlink_compat.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/node.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/node.c</a></td><td class='right'>1029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/node.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/node.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/socket.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/socket.c</a></td><td class='right'>1614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/socket.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/socket.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/subscr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/subscr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/subscr.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/subscr.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/sysctl.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/topsrv.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/topsrv.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tipc/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/trace.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tipc/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/trace.h</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tipc/udp_media.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tipc/udp_media.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/tls.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls.h</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/tls_device.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_device.c</a></td><td class='right'>1153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/tls_device_fallback.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_device_fallback.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/tls_main.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_main.c</a></td><td class='right'>1097</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/tls_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_proc.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/tls_strp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_strp.c</a></td><td class='right'>642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/tls/tls_sw.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_sw.c</a></td><td class='right'>3115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 70.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/tls_toe.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/tls_toe.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/trace.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/tls/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/tls/trace.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/af_unix.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/af_unix.c</a></td><td class='right'>3013</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.0%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 71.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/unix/af_unix.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/af_unix.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/diag.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/garbage.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/garbage.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/unix/sysctl_net_unix.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/sysctl_net_unix.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/unix/unix_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/unix/unix_bpf.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/af_vsock.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/af_vsock.c</a></td><td class='right'>1562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/af_vsock_tap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/af_vsock_tap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/diag.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/hyperv_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/hyperv_transport.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/virtio_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/virtio_transport.c</a></td><td class='right'>777</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/virtio_transport_common.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/virtio_transport_common.c</a></td><td class='right'>1361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vmci_transport.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vmci_transport.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vmci_transport.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vmci_transport.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vmci_transport_notify.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vmci_transport_notify.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vmci_transport_notify.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vmci_transport_notify.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vmci_transport_notify_qstate.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vmci_transport_notify_qstate.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vsock_addr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vsock_addr.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vsock_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vsock_bpf.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/vmw_vsock/vsock_loopback.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/vmw_vsock/vsock_loopback.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/debug-levels.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/debug-levels.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/debugfs.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/id-table.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/id-table.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/op-msg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/op-msg.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/op-reset.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/op-reset.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/op-rfkill.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/op-rfkill.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/op-state-get.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/op-state-get.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/stack.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/stack.c</a></td><td class='right'>632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wimax/wimax-internal.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wimax/wimax-internal.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/.gitignore?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/Kconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/ap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/ap.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/certs/wens.hex?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/certs/wens.hex</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/chan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/chan.c</a></td><td class='right'>1539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/core.c</a></td><td class='right'>990</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/core.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/core.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/debugfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/debugfs.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/ethtool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/ethtool.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/ibss.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/ibss.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wireless/lib80211.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/lib80211.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wireless/lib80211_crypt_ccmp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/lib80211_crypt_ccmp.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wireless/lib80211_crypt_tkip.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/lib80211_crypt_tkip.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wireless/lib80211_crypt_wep.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/lib80211_crypt_wep.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/mesh.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/mesh.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/mlme.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/mlme.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/nl80211.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/nl80211.c</a></td><td class='right'>10604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 77.4%;'/><td class='rem' style='width: 22.6%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/nl80211.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/nl80211.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/ocb.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/ocb.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/pmsr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/pmsr.c</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/radiotap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/radiotap.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/rdev-ops.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/rdev-ops.h</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/reg.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/reg.c</a></td><td class='right'>1188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/reg.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/reg.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/scan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/scan.c</a></td><td class='right'>2980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.1%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 71.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/sme.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/sme.c</a></td><td class='right'>765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/sysfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/sysfs.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/chan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/chan.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/fragmentation.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/fragmentation.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/module.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/scan.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/scan.c</a></td><td class='right'>880</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/util.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/wireless/tests/util.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/tests/util.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/trace.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/trace.h</a></td><td class='right'>1853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/util.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/util.c</a></td><td class='right'>1487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/wext-compat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/wext-compat.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/wext-compat.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/wext-compat.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/wext-core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/wext-core.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/wireless/wext-sme.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/wext-sme.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/wireless/wext-spy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/wireless/wext-spy.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/af_x25.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/af_x25.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/sysctl_net_x25.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/sysctl_net_x25.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_dev.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_dev.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_facilities.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_facilities.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_forward.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_forward.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_in.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_in.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_link.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_link.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_out.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_out.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_proc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_route.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_route.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_subr.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_subr.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/x25/x25_timer.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/x25/x25_timer.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/xdp_umem.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xdp_umem.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/xdp_umem.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xdp_umem.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/net/xdp/xdp_umem_props.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xdp_umem_props.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk.c</a></td><td class='right'>1621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk_buff_pool.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk_buff_pool.c</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk_diag.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk_diag.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk_queue.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk_queue.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xdp/xsk_queue.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xsk_queue.h</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xdp/xskmap.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xdp/xskmap.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/Kconfig?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/Kconfig</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/Makefile?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/espintcp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/espintcp.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/trace_iptfs.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/trace_iptfs.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_algo.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_algo.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_compat.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_compat.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_device.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_device.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_hash.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_hash.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_hash.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_inout.h?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_inout.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_input.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_input.c</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_interface_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_interface_bpf.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_interface_core.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_interface_core.c</a> (renamed from net/xfrm/xfrm_interface.c)</td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_ipcomp.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_ipcomp.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_iptfs.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_iptfs.c</a></td><td class='right'>2762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_nat_keepalive.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_nat_keepalive.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_output.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_output.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_policy.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_policy.c</a></td><td class='right'>2207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.3%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_proc.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_proc.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_replay.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_replay.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_state.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_state.c</a></td><td class='right'>1730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_state_bpf.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_state_bpf.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_sysctl.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_sysctl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/net/xfrm/xfrm_user.c?id2=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/xfrm/xfrm_user.c</a></td><td class='right'>1379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>2101 files changed, 507931 insertions, 222324 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/net/6lowpan/6lowpan_i.h b/net/6lowpan/6lowpan_i.h<br/>index 53cf446ce2e3..01853cec0209 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/6lowpan_i.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/6lowpan_i.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/6lowpan_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/6lowpan_i.h</a></div><div class='hunk'>@@ -18,24 +18,16 @@ extern const struct ndisc_ops lowpan_ndisc_ops;</div><div class='ctx'> int addrconf_ifid_802154_6lowpan(u8 *eui, struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_6LOWPAN_DEBUGFS</div><div class='del'>-int lowpan_dev_debugfs_init(struct net_device *dev);</div><div class='add'>+void lowpan_dev_debugfs_init(struct net_device *dev);</div><div class='ctx'> void lowpan_dev_debugfs_exit(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-int __init lowpan_debugfs_init(void);</div><div class='add'>+void __init lowpan_debugfs_init(void);</div><div class='ctx'> void lowpan_debugfs_exit(void);</div><div class='ctx'> #else</div><div class='del'>-static inline int lowpan_dev_debugfs_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+static inline void lowpan_dev_debugfs_init(struct net_device *dev) { }</div><div class='ctx'> static inline void lowpan_dev_debugfs_exit(struct net_device *dev) { }</div><div class='ctx'> </div><div class='del'>-static inline int __init lowpan_debugfs_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+static inline void __init lowpan_debugfs_init(void) { }</div><div class='ctx'> static inline void lowpan_debugfs_exit(void) { }</div><div class='ctx'> #endif /* CONFIG_6LOWPAN_DEBUGFS */</div><div class='ctx'> </div><div class='head'>diff --git a/net/6lowpan/Kconfig b/net/6lowpan/Kconfig<br/>index 9c051512d14f..d8fc459492b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> menuconfig 6LOWPAN</div><div class='ctx'> 	tristate "6LoWPAN Support"</div><div class='ctx'> 	depends on IPV6</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables IPv6 over Low power Wireless Personal Area Network -</div><div class='ctx'> 	  "6LoWPAN" which is supported by IEEE 802.15.4 or Bluetooth stacks.</div><div class='ctx'> </div><div class='hunk'>@@ -9,7 +10,7 @@ config 6LOWPAN_DEBUGFS</div><div class='ctx'> 	bool "6LoWPAN debugfs support"</div><div class='ctx'> 	depends on 6LOWPAN</div><div class='ctx'> 	depends on DEBUG_FS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables 6LoWPAN debugfs support. For example to manipulate</div><div class='ctx'> 	  IPHC context information at runtime.</div><div class='ctx'> </div><div class='hunk'>@@ -17,7 +18,7 @@ menuconfig 6LOWPAN_NHC</div><div class='ctx'> 	tristate "Next Header and Generic Header Compression Support"</div><div class='ctx'> 	depends on 6LOWPAN</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for next header and generic header compression defined in</div><div class='ctx'> 	  RFC6282 and RFC7400.</div><div class='ctx'> </div><div class='hunk'>@@ -26,78 +27,78 @@ if 6LOWPAN_NHC</div><div class='ctx'> config 6LOWPAN_NHC_DEST</div><div class='ctx'> 	tristate "Destination Options Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Destination Options Header compression according to</div><div class='ctx'> 	  RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_FRAGMENT</div><div class='ctx'> 	tristate "Fragment Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Fragment Header compression according to RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_HOP</div><div class='ctx'> 	tristate "Hop-by-Hop Options Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Hop-by-Hop Options Header compression according to</div><div class='ctx'> 	  RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_IPV6</div><div class='ctx'> 	tristate "IPv6 Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Header compression according to RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_MOBILITY</div><div class='ctx'> 	tristate "Mobility Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Mobility Header compression according to RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_ROUTING</div><div class='ctx'> 	tristate "Routing Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Routing Header compression according to RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_NHC_UDP</div><div class='ctx'> 	tristate "UDP Header Support"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 UDP Header compression according to RFC6282.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_EXT_HDR_HOP</div><div class='ctx'> 	tristate "GHC Hop-by-Hop Options Header Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 Hop-by-Hop option generic header compression according</div><div class='ctx'> 	  to RFC7400.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_UDP</div><div class='ctx'> 	tristate "GHC UDP Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 UDP generic header compression according to RFC7400.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_ICMPV6</div><div class='ctx'> 	tristate "GHC ICMPv6 Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 ICMPv6 generic header compression according to RFC7400.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_EXT_HDR_DEST</div><div class='ctx'> 	tristate "GHC Destination Options Header Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 destination option generic header compression according</div><div class='ctx'> 	  to RFC7400.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_EXT_HDR_FRAG</div><div class='ctx'> 	tristate "GHC Fragmentation Options Header Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 fragmentation option generic header compression</div><div class='ctx'> 	  according to RFC7400.</div><div class='ctx'> </div><div class='ctx'> config 6LOWPAN_GHC_EXT_HDR_ROUTE</div><div class='ctx'> 	tristate "GHC Routing Options Header Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  6LoWPAN IPv6 routing option generic header compression according</div><div class='ctx'> 	  to RFC7400.</div><div class='ctx'> </div><div class='head'>diff --git a/net/6lowpan/core.c b/net/6lowpan/core.c<br/>index 40d3d72beb53..850d4a185f55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/core.c</a></div><div class='hunk'>@@ -1,16 +1,11 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * (C) 2015 Pengutronix, Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/6lowpan.h&gt;</div><div class='hunk'>@@ -48,9 +43,7 @@ int lowpan_register_netdevice(struct net_device *dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = lowpan_dev_debugfs_init(dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		unregister_netdevice(dev);</div><div class='add'>+	lowpan_dev_debugfs_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -158,9 +151,7 @@ static int __init lowpan_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = lowpan_debugfs_init();</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	lowpan_debugfs_init();</div><div class='ctx'> </div><div class='ctx'> 	ret = register_netdevice_notifier(&amp;lowpan_notifier);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -188,4 +179,5 @@ static void __exit lowpan_module_exit(void)</div><div class='ctx'> module_init(lowpan_module_init);</div><div class='ctx'> module_exit(lowpan_module_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IPv6 over Low-Power Wireless Personal Area Network core module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c<br/>index 24915e0bb9ea..600b9563bfc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/debugfs.c</a></div><div class='hunk'>@@ -1,11 +1,5 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * (C) 2015 Pengutronix, Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='hunk'>@@ -41,9 +35,9 @@ static int lowpan_ctx_flag_active_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(lowpan_ctx_flag_active_fops,</div><div class='del'>-			lowpan_ctx_flag_active_get,</div><div class='del'>-			lowpan_ctx_flag_active_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(lowpan_ctx_flag_active_fops,</div><div class='add'>+			 lowpan_ctx_flag_active_get,</div><div class='add'>+			 lowpan_ctx_flag_active_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int lowpan_ctx_flag_c_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -66,8 +60,8 @@ static int lowpan_ctx_flag_c_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(lowpan_ctx_flag_c_fops, lowpan_ctx_flag_c_get,</div><div class='del'>-			lowpan_ctx_flag_c_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(lowpan_ctx_flag_c_fops, lowpan_ctx_flag_c_get,</div><div class='add'>+			 lowpan_ctx_flag_c_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int lowpan_ctx_plen_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -97,8 +91,8 @@ static int lowpan_ctx_plen_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(lowpan_ctx_plen_fops, lowpan_ctx_plen_get,</div><div class='del'>-			lowpan_ctx_plen_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(lowpan_ctx_plen_fops, lowpan_ctx_plen_get,</div><div class='add'>+			 lowpan_ctx_plen_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int lowpan_ctx_pfx_show(struct seq_file *file, void *offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -169,46 +163,31 @@ static const struct file_operations lowpan_ctx_pfx_fops = {</div><div class='ctx'> 	.release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int lowpan_dev_debugfs_ctx_init(struct net_device *dev,</div><div class='del'>-				       struct dentry *ctx, u8 id)</div><div class='add'>+static void lowpan_dev_debugfs_ctx_init(struct net_device *dev,</div><div class='add'>+					struct dentry *ctx, u8 id)</div><div class='ctx'> {</div><div class='ctx'> 	struct lowpan_dev *ldev = lowpan_dev(dev);</div><div class='del'>-	struct dentry *dentry, *root;</div><div class='add'>+	struct dentry *root;</div><div class='ctx'> 	char buf[32];</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(id &gt; LOWPAN_IPHC_CTX_TABLE_SIZE);</div><div class='add'>+	if (WARN_ON_ONCE(id &gt;= LOWPAN_IPHC_CTX_TABLE_SIZE))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(buf, "%d", id);</div><div class='ctx'> </div><div class='ctx'> 	root = debugfs_create_dir(buf, ctx);</div><div class='del'>-	if (!root)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dentry = debugfs_create_file("active", 0644, root,</div><div class='del'>-				     &amp;ldev-&gt;ctx.table[id],</div><div class='del'>-				     &amp;lowpan_ctx_flag_active_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dentry = debugfs_create_file("compression", 0644, root,</div><div class='del'>-				     &amp;ldev-&gt;ctx.table[id],</div><div class='del'>-				     &amp;lowpan_ctx_flag_c_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	debugfs_create_file("active", 0644, root, &amp;ldev-&gt;ctx.table[id],</div><div class='add'>+			    &amp;lowpan_ctx_flag_active_fops);</div><div class='ctx'> </div><div class='del'>-	dentry = debugfs_create_file("prefix", 0644, root,</div><div class='del'>-				     &amp;ldev-&gt;ctx.table[id],</div><div class='del'>-				     &amp;lowpan_ctx_pfx_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	debugfs_create_file("compression", 0644, root, &amp;ldev-&gt;ctx.table[id],</div><div class='add'>+			    &amp;lowpan_ctx_flag_c_fops);</div><div class='ctx'> </div><div class='del'>-	dentry = debugfs_create_file("prefix_len", 0644, root,</div><div class='del'>-				     &amp;ldev-&gt;ctx.table[id],</div><div class='del'>-				     &amp;lowpan_ctx_plen_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	debugfs_create_file("prefix", 0644, root, &amp;ldev-&gt;ctx.table[id],</div><div class='add'>+			    &amp;lowpan_ctx_pfx_fops);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	debugfs_create_file("prefix_len", 0644, root, &amp;ldev-&gt;ctx.table[id],</div><div class='add'>+			    &amp;lowpan_ctx_plen_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lowpan_context_show(struct seq_file *file, void *offset)</div><div class='hunk'>@@ -232,18 +211,7 @@ static int lowpan_context_show(struct seq_file *file, void *offset)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int lowpan_context_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, lowpan_context_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations lowpan_context_fops = {</div><div class='del'>-	.open		= lowpan_context_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(lowpan_context);</div><div class='ctx'> </div><div class='ctx'> static int lowpan_short_addr_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='hunk'>@@ -256,67 +224,42 @@ static int lowpan_short_addr_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(lowpan_short_addr_fops, lowpan_short_addr_get,</div><div class='del'>-			NULL, "0x%04llx\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(lowpan_short_addr_fops, lowpan_short_addr_get, NULL,</div><div class='add'>+			 "0x%04llx\n");</div><div class='ctx'> </div><div class='del'>-static int lowpan_dev_debugfs_802154_init(const struct net_device *dev,</div><div class='add'>+static void lowpan_dev_debugfs_802154_init(const struct net_device *dev,</div><div class='ctx'> 					  struct lowpan_dev *ldev)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry, *root;</div><div class='add'>+	struct dentry *root;</div><div class='ctx'> </div><div class='ctx'> 	if (!lowpan_is_ll(dev, LOWPAN_LLTYPE_IEEE802154))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	root = debugfs_create_dir("ieee802154", ldev-&gt;iface_debugfs);</div><div class='del'>-	if (!root)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dentry = debugfs_create_file("short_addr", 0444, root,</div><div class='del'>-				     lowpan_802154_dev(dev)-&gt;wdev-&gt;ieee802154_ptr,</div><div class='del'>-				     &amp;lowpan_short_addr_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	debugfs_create_file("short_addr", 0444, root,</div><div class='add'>+			    lowpan_802154_dev(dev)-&gt;wdev-&gt;ieee802154_ptr,</div><div class='add'>+			    &amp;lowpan_short_addr_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lowpan_dev_debugfs_init(struct net_device *dev)</div><div class='add'>+void lowpan_dev_debugfs_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lowpan_dev *ldev = lowpan_dev(dev);</div><div class='del'>-	struct dentry *contexts, *dentry;</div><div class='del'>-	int ret, i;</div><div class='add'>+	struct dentry *contexts;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* creating the root */</div><div class='ctx'> 	ldev-&gt;iface_debugfs = debugfs_create_dir(dev-&gt;name, lowpan_debugfs);</div><div class='del'>-	if (!ldev-&gt;iface_debugfs)</div><div class='del'>-		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	contexts = debugfs_create_dir("contexts", ldev-&gt;iface_debugfs);</div><div class='del'>-	if (!contexts)</div><div class='del'>-		goto remove_root;</div><div class='del'>-</div><div class='del'>-	dentry = debugfs_create_file("show", 0644, contexts,</div><div class='del'>-				     &amp;lowpan_dev(dev)-&gt;ctx,</div><div class='del'>-				     &amp;lowpan_context_fops);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		goto remove_root;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; LOWPAN_IPHC_CTX_TABLE_SIZE; i++) {</div><div class='del'>-		ret = lowpan_dev_debugfs_ctx_init(dev, contexts, i);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto remove_root;</div><div class='del'>-	}</div><div class='add'>+	debugfs_create_file("show", 0644, contexts, &amp;lowpan_dev(dev)-&gt;ctx,</div><div class='add'>+			    &amp;lowpan_context_fops);</div><div class='ctx'> </div><div class='del'>-	ret = lowpan_dev_debugfs_802154_init(dev, ldev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto remove_root;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	for (i = 0; i &lt; LOWPAN_IPHC_CTX_TABLE_SIZE; i++)</div><div class='add'>+		lowpan_dev_debugfs_ctx_init(dev, contexts, i);</div><div class='ctx'> </div><div class='del'>-remove_root:</div><div class='del'>-	lowpan_dev_debugfs_exit(dev);</div><div class='del'>-fail:</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	lowpan_dev_debugfs_802154_init(dev, ldev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lowpan_dev_debugfs_exit(struct net_device *dev)</div><div class='hunk'>@@ -324,13 +267,9 @@ void lowpan_dev_debugfs_exit(struct net_device *dev)</div><div class='ctx'> 	debugfs_remove_recursive(lowpan_dev(dev)-&gt;iface_debugfs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init lowpan_debugfs_init(void)</div><div class='add'>+void __init lowpan_debugfs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	lowpan_debugfs = debugfs_create_dir("6lowpan", NULL);</div><div class='del'>-	if (!lowpan_debugfs)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lowpan_debugfs_exit(void)</div><div class='head'>diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c<br/>index 52fad5dad9f7..e116d308a8df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/iphc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/iphc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/iphc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/iphc.c</a></div><div class='hunk'>@@ -848,7 +848,7 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct net_device *dev,</div><div class='ctx'> 				   const struct lowpan_iphc_ctx *ctx,</div><div class='ctx'> 				   const unsigned char *lladdr, bool sam)</div><div class='ctx'> {</div><div class='del'>-	struct in6_addr tmp = {};</div><div class='add'>+	struct in6_addr tmp;</div><div class='ctx'> 	u8 dam;</div><div class='ctx'> </div><div class='ctx'> 	switch (lowpan_dev(dev)-&gt;lltype) {</div><div class='head'>diff --git a/net/6lowpan/ndisc.c b/net/6lowpan/ndisc.c<br/>index 941df2fa4448..868d28583c0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/ndisc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/ndisc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/ndisc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/ndisc.c</a></div><div class='hunk'>@@ -1,11 +1,5 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * (C) 2016 Pengutronix, Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='hunk'>@@ -17,11 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "6lowpan_i.h"</div><div class='ctx'> </div><div class='del'>-static int lowpan_ndisc_is_useropt(u8 nd_opt_type)</div><div class='del'>-{</div><div class='del'>-	return nd_opt_type == ND_OPT_6CO;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)</div><div class='ctx'> #define NDISC_802154_SHORT_ADDR_LENGTH	1</div><div class='ctx'> static int lowpan_ndisc_parse_802154_options(const struct net_device *dev,</div><div class='hunk'>@@ -31,9 +20,8 @@ static int lowpan_ndisc_parse_802154_options(const struct net_device *dev,</div><div class='ctx'> 	switch (nd_opt-&gt;nd_opt_len) {</div><div class='ctx'> 	case NDISC_802154_SHORT_ADDR_LENGTH:</div><div class='ctx'> 		if (ndopts-&gt;nd_802154_opt_array[nd_opt-&gt;nd_opt_type])</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "%s: duplicated short addr ND6 option found: type=%d\n",</div><div class='del'>-				  __func__, nd_opt-&gt;nd_opt_type);</div><div class='add'>+			net_dbg_ratelimited("%s: duplicated short addr ND6 option found: type=%d\n",</div><div class='add'>+					    __func__, nd_opt-&gt;nd_opt_type);</div><div class='ctx'> 		else</div><div class='ctx'> 			ndopts-&gt;nd_802154_opt_array[nd_opt-&gt;nd_opt_type] = nd_opt;</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -74,8 +62,7 @@ static void lowpan_ndisc_802154_update(struct neighbour *n, u32 flags,</div><div class='ctx'> 			lladdr_short = __ndisc_opt_addr_data(ndopts-&gt;nd_802154_opts_src_lladdr,</div><div class='ctx'> 							     IEEE802154_SHORT_ADDR_LEN, 0);</div><div class='ctx'> 			if (!lladdr_short) {</div><div class='del'>-				ND_PRINTK(2, warn,</div><div class='del'>-					  "NA: invalid short link-layer address length\n");</div><div class='add'>+				net_dbg_ratelimited("NA: invalid short link-layer address length\n");</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -86,8 +73,7 @@ static void lowpan_ndisc_802154_update(struct neighbour *n, u32 flags,</div><div class='ctx'> 			lladdr_short = __ndisc_opt_addr_data(ndopts-&gt;nd_802154_opts_tgt_lladdr,</div><div class='ctx'> 							     IEEE802154_SHORT_ADDR_LEN, 0);</div><div class='ctx'> 			if (!lladdr_short) {</div><div class='del'>-				ND_PRINTK(2, warn,</div><div class='del'>-					  "NA: invalid short link-layer address length\n");</div><div class='add'>+				net_dbg_ratelimited("NA: invalid short link-layer address length\n");</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -220,15 +206,13 @@ static void lowpan_ndisc_prefix_rcv_add_addr(struct net *net,</div><div class='ctx'> 						   sllao, tokenized, valid_lft,</div><div class='ctx'> 						   prefered_lft);</div><div class='ctx'> 		if (err)</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "RA: could not add a short address based address for prefix: %pI6c\n",</div><div class='del'>-				  &amp;pinfo-&gt;prefix);</div><div class='add'>+			net_dbg_ratelimited("RA: could not add a short address based address for prefix: %pI6c\n",</div><div class='add'>+					    &amp;pinfo-&gt;prefix);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> const struct ndisc_ops lowpan_ndisc_ops = {</div><div class='del'>-	.is_useropt		= lowpan_ndisc_is_useropt,</div><div class='ctx'> #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)</div><div class='ctx'> 	.parse_options		= lowpan_ndisc_parse_options,</div><div class='ctx'> 	.update			= lowpan_ndisc_update,</div><div class='head'>diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c<br/>index 4fa2fdda174d..7b374595328d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN next header compression</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Alexander Aring		&lt;aar@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -17,77 +12,26 @@</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-static struct rb_root rb_root = RB_ROOT;</div><div class='del'>-static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX];</div><div class='add'>+static const struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];</div><div class='ctx'> static DEFINE_SPINLOCK(lowpan_nhc_lock);</div><div class='ctx'> </div><div class='del'>-static int lowpan_nhc_insert(struct lowpan_nhc *nhc)</div><div class='add'>+static const struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **new = &amp;rb_root.rb_node, *parent = NULL;</div><div class='del'>-</div><div class='del'>-	/* Figure out where to put new node */</div><div class='del'>-	while (*new) {</div><div class='del'>-		struct lowpan_nhc *this = rb_entry(*new, struct lowpan_nhc,</div><div class='del'>-						   node);</div><div class='del'>-		int result, len_dif, len;</div><div class='del'>-</div><div class='del'>-		len_dif = nhc-&gt;idlen - this-&gt;idlen;</div><div class='del'>-</div><div class='del'>-		if (nhc-&gt;idlen &lt; this-&gt;idlen)</div><div class='del'>-			len = nhc-&gt;idlen;</div><div class='del'>-		else</div><div class='del'>-			len = this-&gt;idlen;</div><div class='del'>-</div><div class='del'>-		result = memcmp(nhc-&gt;id, this-&gt;id, len);</div><div class='del'>-		if (!result)</div><div class='del'>-			result = len_dif;</div><div class='del'>-</div><div class='del'>-		parent = *new;</div><div class='del'>-		if (result &lt; 0)</div><div class='del'>-			new = &amp;((*new)-&gt;rb_left);</div><div class='del'>-		else if (result &gt; 0)</div><div class='del'>-			new = &amp;((*new)-&gt;rb_right);</div><div class='del'>-		else</div><div class='del'>-			return -EEXIST;</div><div class='del'>-	}</div><div class='add'>+	const struct lowpan_nhc *nhc;</div><div class='add'>+	int i;</div><div class='add'>+	u8 id;</div><div class='ctx'> </div><div class='del'>-	/* Add new node and rebalance tree. */</div><div class='del'>-	rb_link_node(&amp;nhc-&gt;node, parent, new);</div><div class='del'>-	rb_insert_color(&amp;nhc-&gt;node, &amp;rb_root);</div><div class='add'>+	if (!pskb_may_pull(skb, 1))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	id = *skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-static void lowpan_nhc_remove(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	rb_erase(&amp;nhc-&gt;node, &amp;rb_root);</div><div class='del'>-}</div><div class='add'>+	for (i = 0; i &lt; NEXTHDR_MAX + 1; i++) {</div><div class='add'>+		nhc = lowpan_nexthdr_nhcs[i];</div><div class='add'>+		if (!nhc)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-static struct lowpan_nhc *lowpan_nhc_by_nhcid(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *node = rb_root.rb_node;</div><div class='del'>-	const u8 *nhcid_skb_ptr = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	while (node) {</div><div class='del'>-		struct lowpan_nhc *nhc = rb_entry(node, struct lowpan_nhc,</div><div class='del'>-						  node);</div><div class='del'>-		u8 nhcid_skb_ptr_masked[LOWPAN_NHC_MAX_ID_LEN];</div><div class='del'>-		int result, i;</div><div class='del'>-</div><div class='del'>-		if (nhcid_skb_ptr + nhc-&gt;idlen &gt; skb-&gt;data + skb-&gt;len)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		/* copy and mask afterwards the nhid value from skb */</div><div class='del'>-		memcpy(nhcid_skb_ptr_masked, nhcid_skb_ptr, nhc-&gt;idlen);</div><div class='del'>-		for (i = 0; i &lt; nhc-&gt;idlen; i++)</div><div class='del'>-			nhcid_skb_ptr_masked[i] &amp;= nhc-&gt;idmask[i];</div><div class='del'>-</div><div class='del'>-		result = memcmp(nhcid_skb_ptr_masked, nhc-&gt;id, nhc-&gt;idlen);</div><div class='del'>-		if (result &lt; 0)</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		else if (result &gt; 0)</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		else</div><div class='add'>+		if ((id &amp; nhc-&gt;idmask) == nhc-&gt;id)</div><div class='ctx'> 			return nhc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +41,7 @@ static struct lowpan_nhc *lowpan_nhc_by_nhcid(const struct sk_buff *skb)</div><div class='ctx'> int lowpan_nhc_check_compression(struct sk_buff *skb,</div><div class='ctx'> 				 const struct ipv6hdr *hdr, u8 **hc_ptr)</div><div class='ctx'> {</div><div class='del'>-	struct lowpan_nhc *nhc;</div><div class='add'>+	const struct lowpan_nhc *nhc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;lowpan_nhc_lock);</div><div class='hunk'>@@ -115,7 +59,7 @@ int lowpan_nhc_do_compression(struct sk_buff *skb, const struct ipv6hdr *hdr,</div><div class='ctx'> 			      u8 **hc_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct lowpan_nhc *nhc;</div><div class='add'>+	const struct lowpan_nhc *nhc;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;lowpan_nhc_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +102,7 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,</div><div class='ctx'> 				const struct net_device *dev,</div><div class='ctx'> 				struct ipv6hdr *hdr)</div><div class='ctx'> {</div><div class='del'>-	struct lowpan_nhc *nhc;</div><div class='add'>+	const struct lowpan_nhc *nhc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;lowpan_nhc_lock);</div><div class='hunk'>@@ -194,18 +138,9 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lowpan_nhc_add(struct lowpan_nhc *nhc)</div><div class='add'>+int lowpan_nhc_add(const struct lowpan_nhc *nhc)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!nhc-&gt;idlen || !nhc-&gt;idsetup)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	WARN_ONCE(nhc-&gt;idlen &gt; LOWPAN_NHC_MAX_ID_LEN,</div><div class='del'>-		  "LOWPAN_NHC_MAX_ID_LEN should be updated to %zd.\n",</div><div class='del'>-		  nhc-&gt;idlen);</div><div class='del'>-</div><div class='del'>-	nhc-&gt;idsetup(nhc);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;lowpan_nhc_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -214,10 +149,6 @@ int lowpan_nhc_add(struct lowpan_nhc *nhc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = lowpan_nhc_insert(nhc);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	lowpan_nexthdr_nhcs[nhc-&gt;nexthdr] = nhc;</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;lowpan_nhc_lock);</div><div class='hunk'>@@ -225,11 +156,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lowpan_nhc_add);</div><div class='ctx'> </div><div class='del'>-void lowpan_nhc_del(struct lowpan_nhc *nhc)</div><div class='add'>+void lowpan_nhc_del(const struct lowpan_nhc *nhc)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;lowpan_nhc_lock);</div><div class='ctx'> </div><div class='del'>-	lowpan_nhc_remove(nhc);</div><div class='ctx'> 	lowpan_nexthdr_nhcs[nhc-&gt;nexthdr] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;lowpan_nhc_lock);</div><div class='head'>diff --git a/net/6lowpan/nhc.h b/net/6lowpan/nhc.h<br/>index 67951c40734b..ab7b4977c32b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc.h</a></div><div class='hunk'>@@ -16,24 +16,20 @@</div><div class='ctx'>  * @_name: const char * of common header compression name.</div><div class='ctx'>  * @_nexthdr: ipv6 nexthdr field for the header compression.</div><div class='ctx'>  * @_nexthdrlen: ipv6 nexthdr len for the reserved space.</div><div class='del'>- * @_idsetup: callback to setup id and mask values.</div><div class='del'>- * @_idlen: len for the next header id and mask, should be always the same.</div><div class='add'>+ * @_id: one byte nhc id value.</div><div class='add'>+ * @_idmask: one byte nhc id mask value.</div><div class='ctx'>  * @_uncompress: callback for uncompression call.</div><div class='ctx'>  * @_compress: callback for compression call.</div><div class='ctx'>  */</div><div class='ctx'> #define LOWPAN_NHC(__nhc, _name, _nexthdr,	\</div><div class='del'>-		   _hdrlen, _idsetup, _idlen,	\</div><div class='add'>+		   _hdrlen, _id, _idmask,	\</div><div class='ctx'> 		   _uncompress, _compress)	\</div><div class='del'>-static u8 __nhc##_val[_idlen];			\</div><div class='del'>-static u8 __nhc##_mask[_idlen];			\</div><div class='del'>-static struct lowpan_nhc __nhc = {		\</div><div class='add'>+static const struct lowpan_nhc __nhc = {	\</div><div class='ctx'> 	.name		= _name,		\</div><div class='ctx'> 	.nexthdr	= _nexthdr,		\</div><div class='ctx'> 	.nexthdrlen	= _hdrlen,		\</div><div class='del'>-	.id		= __nhc##_val,		\</div><div class='del'>-	.idmask		= __nhc##_mask,		\</div><div class='del'>-	.idlen		= _idlen,		\</div><div class='del'>-	.idsetup	= _idsetup,		\</div><div class='add'>+	.id		= _id,			\</div><div class='add'>+	.idmask		= _idmask,		\</div><div class='ctx'> 	.uncompress	= _uncompress,		\</div><div class='ctx'> 	.compress	= _compress,		\</div><div class='ctx'> }</div><div class='hunk'>@@ -53,27 +49,21 @@ module_exit(__nhc##_exit);</div><div class='ctx'> /**</div><div class='ctx'>  * struct lowpan_nhc - hold 6lowpan next hdr compression ifnformation</div><div class='ctx'>  *</div><div class='del'>- * @node: holder for the rbtree.</div><div class='ctx'>  * @name: name of the specific next header compression</div><div class='ctx'>  * @nexthdr: next header value of the protocol which should be compressed.</div><div class='ctx'>  * @nexthdrlen: ipv6 nexthdr len for the reserved space.</div><div class='del'>- * @id: array for nhc id. Note this need to be in network byteorder.</div><div class='del'>- * @mask: array for nhc id mask. Note this need to be in network byteorder.</div><div class='del'>- * @len: the length of the next header id and mask.</div><div class='del'>- * @setup: callback to setup fill the next header id value and mask.</div><div class='add'>+ * @id: one byte nhc id value.</div><div class='add'>+ * @idmask: one byte nhc id mask value.</div><div class='ctx'>  * @compress: callback to do the header compression.</div><div class='ctx'>  * @uncompress: callback to do the header uncompression.</div><div class='ctx'>  */</div><div class='ctx'> struct lowpan_nhc {</div><div class='del'>-	struct rb_node	node;</div><div class='ctx'> 	const char	*name;</div><div class='del'>-	const u8	nexthdr;</div><div class='del'>-	const size_t	nexthdrlen;</div><div class='del'>-	u8		*id;</div><div class='del'>-	u8		*idmask;</div><div class='del'>-	const size_t	idlen;</div><div class='add'>+	u8		nexthdr;</div><div class='add'>+	size_t		nexthdrlen;</div><div class='add'>+	u8		id;</div><div class='add'>+	u8		idmask;</div><div class='ctx'> </div><div class='del'>-	void		(*idsetup)(struct lowpan_nhc *nhc);</div><div class='ctx'> 	int		(*uncompress)(struct sk_buff *skb, size_t needed);</div><div class='ctx'> 	int		(*compress)(struct sk_buff *skb, u8 **hc_ptr);</div><div class='ctx'> };</div><div class='hunk'>@@ -126,14 +116,14 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,</div><div class='ctx'>  *</div><div class='ctx'>  * @nhc: nhc which should be add.</div><div class='ctx'>  */</div><div class='del'>-int lowpan_nhc_add(struct lowpan_nhc *nhc);</div><div class='add'>+int lowpan_nhc_add(const struct lowpan_nhc *nhc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * lowpan_nhc_del - delete a next header compression from framework</div><div class='ctx'>  *</div><div class='ctx'>  * @nhc: nhc which should be delete.</div><div class='ctx'>  */</div><div class='del'>-void lowpan_nhc_del(struct lowpan_nhc *nhc);</div><div class='add'>+void lowpan_nhc_del(const struct lowpan_nhc *nhc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * lowpan_nhc_init - adding all default nhcs</div><div class='head'>diff --git a/net/6lowpan/nhc_dest.c b/net/6lowpan/nhc_dest.c<br/>index 0b292c9646eb..0cbcc7806469 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_dest.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_dest.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_dest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_dest.c</a></div><div class='hunk'>@@ -1,27 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Destination Options Header compression according to</div><div class='ctx'>  *	RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_DEST_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_DEST_ID_0	0xe6</div><div class='ctx'> #define LOWPAN_NHC_DEST_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void dest_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_DEST_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_DEST_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_dest, "RFC6282 Destination Options", NEXTHDR_DEST, 0,</div><div class='del'>-	   dest_nhid_setup, LOWPAN_NHC_DEST_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_NHC_DEST_ID_0, LOWPAN_NHC_DEST_MASK_0,  NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_dest);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Destination Options compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_fragment.c b/net/6lowpan/nhc_fragment.c<br/>index 473dbc58ef84..9414552df0ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_fragment.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_fragment.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_fragment.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_fragment.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Fragment Header compression according to RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_FRAGMENT_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_FRAGMENT_ID_0	0xe4</div><div class='ctx'> #define LOWPAN_NHC_FRAGMENT_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void fragment_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_FRAGMENT_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_FRAGMENT_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_fragment, "RFC6282 Fragment", NEXTHDR_FRAGMENT, 0,</div><div class='del'>-	   fragment_nhid_setup, LOWPAN_NHC_FRAGMENT_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_NHC_FRAGMENT_ID_0, LOWPAN_NHC_FRAGMENT_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_fragment);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Fragment compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_ext_dest.c b/net/6lowpan/nhc_ghc_ext_dest.c<br/>index 9887b3a15348..e4745ddd10a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_dest.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_dest.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_dest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_ext_dest.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN Extension Header compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_EXT_DEST_IDLEN	1</div><div class='ctx'> #define LOWPAN_GHC_EXT_DEST_ID_0	0xb6</div><div class='ctx'> #define LOWPAN_GHC_EXT_DEST_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void dest_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_EXT_DEST_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_EXT_DEST_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_ext_dest, "RFC7400 Destination Extension Header", NEXTHDR_DEST,</div><div class='del'>-	   0, dest_ghid_setup, LOWPAN_GHC_EXT_DEST_IDLEN, NULL, NULL);</div><div class='add'>+	   0, LOWPAN_GHC_EXT_DEST_ID_0, LOWPAN_GHC_EXT_DEST_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_ext_dest);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header destination extension compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_ext_frag.c b/net/6lowpan/nhc_ghc_ext_frag.c<br/>index 1308b79e939d..220e5abfa946 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_frag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_frag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_frag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_ext_frag.c</a></div><div class='hunk'>@@ -1,27 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN Extension Header compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_EXT_FRAG_IDLEN	1</div><div class='ctx'> #define LOWPAN_GHC_EXT_FRAG_ID_0	0xb4</div><div class='ctx'> #define LOWPAN_GHC_EXT_FRAG_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void frag_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_EXT_FRAG_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_EXT_FRAG_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_ext_frag, "RFC7400 Fragmentation Extension Header",</div><div class='del'>-	   NEXTHDR_FRAGMENT, 0, frag_ghid_setup,</div><div class='del'>-	   LOWPAN_GHC_EXT_FRAG_IDLEN, NULL, NULL);</div><div class='add'>+	   NEXTHDR_FRAGMENT, 0, LOWPAN_GHC_EXT_FRAG_ID_0,</div><div class='add'>+	   LOWPAN_GHC_EXT_FRAG_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_ext_frag);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header fragmentation extension compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_ext_hop.c b/net/6lowpan/nhc_ghc_ext_hop.c<br/>index baec86fd1974..9b0de4da7379 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_hop.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_hop.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_hop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_ext_hop.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN Extension Header compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_EXT_HOP_IDLEN	1</div><div class='ctx'> #define LOWPAN_GHC_EXT_HOP_ID_0		0xb0</div><div class='ctx'> #define LOWPAN_GHC_EXT_HOP_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void hop_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_EXT_HOP_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_EXT_HOP_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_ext_hop, "RFC7400 Hop-by-Hop Extension Header", NEXTHDR_HOP, 0,</div><div class='del'>-	   hop_ghid_setup, LOWPAN_GHC_EXT_HOP_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_GHC_EXT_HOP_ID_0, LOWPAN_GHC_EXT_HOP_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_ext_hop);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header hop-by-hop extension compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_ext_route.c b/net/6lowpan/nhc_ghc_ext_route.c<br/>index d7e5bd791c62..3e86faec59c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_route.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_ext_route.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_ext_route.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_ext_route.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN Extension Header compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_EXT_ROUTE_IDLEN	1</div><div class='ctx'> #define LOWPAN_GHC_EXT_ROUTE_ID_0	0xb2</div><div class='ctx'> #define LOWPAN_GHC_EXT_ROUTE_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void route_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_EXT_ROUTE_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_EXT_ROUTE_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_ext_route, "RFC7400 Routing Extension Header", NEXTHDR_ROUTING,</div><div class='del'>-	   0, route_ghid_setup, LOWPAN_GHC_EXT_ROUTE_IDLEN, NULL, NULL);</div><div class='add'>+	   0, LOWPAN_GHC_EXT_ROUTE_ID_0, LOWPAN_GHC_EXT_ROUTE_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_ext_route);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header routing extension compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_icmpv6.c b/net/6lowpan/nhc_ghc_icmpv6.c<br/>index 32e7c2c66bbc..1634f3eb0be8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_icmpv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_icmpv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_icmpv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_icmpv6.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN ICMPv6 compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_ICMPV6_IDLEN		1</div><div class='ctx'> #define LOWPAN_GHC_ICMPV6_ID_0		0xdf</div><div class='ctx'> #define LOWPAN_GHC_ICMPV6_MASK_0	0xff</div><div class='ctx'> </div><div class='del'>-static void icmpv6_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_ICMPV6_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_ICMPV6_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_icmpv6, "RFC7400 ICMPv6", NEXTHDR_ICMP, 0,</div><div class='del'>-	   icmpv6_ghid_setup, LOWPAN_GHC_ICMPV6_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_GHC_ICMPV6_ID_0, LOWPAN_GHC_ICMPV6_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_icmpv6);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header ICMPv6 compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ghc_udp.c b/net/6lowpan/nhc_ghc_udp.c<br/>index 17beefa52ca8..4ac4813b77ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_udp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ghc_udp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ghc_udp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ghc_udp.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN UDP compression according to RFC7400</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_GHC_UDP_IDLEN	1</div><div class='ctx'> #define LOWPAN_GHC_UDP_ID_0	0xd0</div><div class='ctx'> #define LOWPAN_GHC_UDP_MASK_0	0xf8</div><div class='ctx'> </div><div class='del'>-static void udp_ghid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_GHC_UDP_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_GHC_UDP_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(ghc_udp, "RFC7400 UDP", NEXTHDR_UDP, 0,</div><div class='del'>-	   udp_ghid_setup, LOWPAN_GHC_UDP_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_GHC_UDP_ID_0, LOWPAN_GHC_UDP_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(ghc_udp);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN generic header UDP compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_hop.c b/net/6lowpan/nhc_hop.c<br/>index 1eb66be16f19..182087dfd09d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_hop.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_hop.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_hop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_hop.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Hop-by-Hop Options Header compression according to RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_HOP_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_HOP_ID_0	0xe0</div><div class='ctx'> #define LOWPAN_NHC_HOP_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void hop_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_HOP_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_HOP_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_hop, "RFC6282 Hop-by-Hop Options", NEXTHDR_HOP, 0,</div><div class='del'>-	   hop_nhid_setup, LOWPAN_NHC_HOP_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_NHC_HOP_ID_0, LOWPAN_NHC_HOP_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_hop);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Hop-by-Hop Options compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_ipv6.c b/net/6lowpan/nhc_ipv6.c<br/>index 2313d1600af3..20242360b1d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_ipv6.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Header compression according to RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_IPV6_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_IPV6_ID_0	0xee</div><div class='ctx'> #define LOWPAN_NHC_IPV6_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void ipv6_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_IPV6_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_IPV6_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-LOWPAN_NHC(nhc_ipv6, "RFC6282 IPv6", NEXTHDR_IPV6, 0, ipv6_nhid_setup,</div><div class='del'>-	   LOWPAN_NHC_IPV6_IDLEN, NULL, NULL);</div><div class='add'>+LOWPAN_NHC(nhc_ipv6, "RFC6282 IPv6", NEXTHDR_IPV6, 0, LOWPAN_NHC_IPV6_ID_0,</div><div class='add'>+	   LOWPAN_NHC_IPV6_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_ipv6);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 IPv6 compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_mobility.c b/net/6lowpan/nhc_mobility.c<br/>index 60d3f3886c98..1c31d872c804 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_mobility.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_mobility.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_mobility.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_mobility.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Mobility Header compression according to RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_MOBILITY_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_MOBILITY_ID_0	0xe8</div><div class='ctx'> #define LOWPAN_NHC_MOBILITY_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void mobility_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_MOBILITY_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_MOBILITY_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_mobility, "RFC6282 Mobility", NEXTHDR_MOBILITY, 0,</div><div class='del'>-	   mobility_nhid_setup, LOWPAN_NHC_MOBILITY_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_NHC_MOBILITY_ID_0, LOWPAN_NHC_MOBILITY_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_mobility);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Mobility compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_routing.c b/net/6lowpan/nhc_routing.c<br/>index c393280f11c4..dae03ebf7021 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_routing.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_routing.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_routing.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_routing.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 Routing Header compression according to RFC6282</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='del'>-#define LOWPAN_NHC_ROUTING_IDLEN	1</div><div class='ctx'> #define LOWPAN_NHC_ROUTING_ID_0		0xe2</div><div class='ctx'> #define LOWPAN_NHC_ROUTING_MASK_0	0xfe</div><div class='ctx'> </div><div class='del'>-static void routing_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_ROUTING_ID_0;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_ROUTING_MASK_0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_routing, "RFC6282 Routing", NEXTHDR_ROUTING, 0,</div><div class='del'>-	   routing_nhid_setup, LOWPAN_NHC_ROUTING_IDLEN, NULL, NULL);</div><div class='add'>+	   LOWPAN_NHC_ROUTING_ID_0, LOWPAN_NHC_ROUTING_MASK_0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_routing);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Routing compression");</div><div class='head'>diff --git a/net/6lowpan/nhc_udp.c b/net/6lowpan/nhc_udp.c<br/>index 225d91906dfa..0a506c77283d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_udp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/6lowpan/nhc_udp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/6lowpan/nhc_udp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/6lowpan/nhc_udp.c</a></div><div class='hunk'>@@ -1,25 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	6LoWPAN IPv6 UDP compression according to RFC6282</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Alexander Aring	&lt;aar@pengutronix.de&gt;</div><div class='ctx'>  *</div><div class='del'>- *	Orignal written by:</div><div class='add'>+ *	Original written by:</div><div class='ctx'>  *	Alexander Smirnov &lt;alex.bluesman.smirnov@gmail.com&gt;</div><div class='ctx'>  *	Jon Smirl &lt;jonsmirl@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "nhc.h"</div><div class='ctx'> </div><div class='ctx'> #define LOWPAN_NHC_UDP_MASK		0xF8</div><div class='ctx'> #define LOWPAN_NHC_UDP_ID		0xF0</div><div class='del'>-#define LOWPAN_NHC_UDP_IDLEN		1</div><div class='ctx'> </div><div class='ctx'> #define LOWPAN_NHC_UDP_4BIT_PORT	0xF0B0</div><div class='ctx'> #define LOWPAN_NHC_UDP_4BIT_MASK	0xFFF0</div><div class='hunk'>@@ -87,7 +81,7 @@ static int udp_uncompress(struct sk_buff *skb, size_t needed)</div><div class='ctx'> 	if (fail)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* UDP length needs to be infered from the lower layers</div><div class='add'>+	/* UDP length needs to be inferred from the lower layers</div><div class='ctx'> 	 * here, we obtain the hint from the remaining size of the</div><div class='ctx'> 	 * frame</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -174,14 +168,8 @@ static int udp_compress(struct sk_buff *skb, u8 **hc_ptr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void udp_nhid_setup(struct lowpan_nhc *nhc)</div><div class='del'>-{</div><div class='del'>-	nhc-&gt;id[0] = LOWPAN_NHC_UDP_ID;</div><div class='del'>-	nhc-&gt;idmask[0] = LOWPAN_NHC_UDP_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> LOWPAN_NHC(nhc_udp, "RFC6282 UDP", NEXTHDR_UDP, sizeof(struct udphdr),</div><div class='del'>-	   udp_nhid_setup, LOWPAN_NHC_UDP_IDLEN, udp_uncompress, udp_compress);</div><div class='add'>+	   LOWPAN_NHC_UDP_ID, LOWPAN_NHC_UDP_MASK, udp_uncompress, udp_compress);</div><div class='ctx'> </div><div class='ctx'> module_lowpan_nhc(nhc_udp);</div><div class='ctx'> MODULE_DESCRIPTION("6LoWPAN next header RFC6282 UDP compression");</div><div class='head'>diff --git a/net/802/Kconfig b/net/802/Kconfig<br/>index 80d4bf78905d..aaa83e888240 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config STP</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select LLC</div><div class='head'>diff --git a/net/802/Makefile b/net/802/Makefile<br/>index 19406a87bdaa..99abc29d537c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/Makefile</a></div><div class='hunk'>@@ -3,13 +3,11 @@</div><div class='ctx'> # Makefile for the Linux 802.x protocol layers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-# Check the p8022 selections against net/core/Makefile.</div><div class='del'>-obj-$(CONFIG_LLC)	+= p8022.o psnap.o</div><div class='add'>+obj-$(CONFIG_LLC)	+= psnap.o</div><div class='ctx'> obj-$(CONFIG_NET_FC)	+=                 fc.o</div><div class='ctx'> obj-$(CONFIG_FDDI)	+=                 fddi.o</div><div class='ctx'> obj-$(CONFIG_HIPPI)	+=                 hippi.o</div><div class='del'>-obj-$(CONFIG_IPX)	+= p8022.o psnap.o p8023.o</div><div class='del'>-obj-$(CONFIG_ATALK)	+= p8022.o psnap.o</div><div class='add'>+obj-$(CONFIG_ATALK)	+= psnap.o</div><div class='ctx'> obj-$(CONFIG_STP)	+= stp.o</div><div class='ctx'> obj-$(CONFIG_GARP)	+= garp.o</div><div class='ctx'> obj-$(CONFIG_MRP)	+= mrp.o</div><div class='head'>diff --git a/net/802/fc.c b/net/802/fc.c<br/>index 058a9f708918..afd3d288a41d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/fc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/fc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/fc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/fc.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * NET3:	Fibre Channel device handling subroutines</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *		Vineet Abraham &lt;vma@iol.unh.edu&gt;</div><div class='ctx'>  *		v 1.0 03/22/99</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/802/fddi.c b/net/802/fddi.c<br/>index 90f1416567a1..888379ae35ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/fddi.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/fddi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/fddi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/fddi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the BSD Socket</div><div class='hunk'>@@ -16,11 +17,6 @@</div><div class='ctx'>  *			Florian La Roche, &lt;rzsfl@rz.uni-sb.de&gt;</div><div class='ctx'>  *			Alan Cox, &lt;gw4pts@gw4pts.ampr.org&gt;</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Changes</div><div class='ctx'>  *		Alan Cox		:	New arp/rebuild header</div><div class='ctx'>  *		Maciej W. Rozycki	:	IPv6 support</div><div class='hunk'>@@ -179,4 +175,5 @@ struct net_device *alloc_fddidev(int sizeof_priv)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(alloc_fddidev);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Core routines for FDDI network devices");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/802/garp.c b/net/802/garp.c<br/>index 7f50d47470bd..2d1ffc4d9462 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/garp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/garp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/garp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/garp.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *	IEEE 802.1D Generic Attribute Registration Protocol (GARP)</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -19,11 +16,12 @@</div><div class='ctx'> #include &lt;net/llc.h&gt;</div><div class='ctx'> #include &lt;net/llc_pdu.h&gt;</div><div class='ctx'> #include &lt;net/garp.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int garp_join_time __read_mostly = 200;</div><div class='ctx'> module_param(garp_join_time, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(garp_join_time, "Join time in ms (default 200ms)");</div><div class='add'>+MODULE_DESCRIPTION("IEEE 802.1D Generic Attribute Registration Protocol (GARP)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static const struct garp_state_trans {</div><div class='hunk'>@@ -206,6 +204,19 @@ static void garp_attr_destroy(struct garp_applicant *app, struct garp_attr *attr</div><div class='ctx'> 	kfree(attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void garp_attr_destroy_all(struct garp_applicant *app)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node, *next;</div><div class='add'>+	struct garp_attr *attr;</div><div class='add'>+</div><div class='add'>+	for (node = rb_first(&amp;app-&gt;gid);</div><div class='add'>+	     next = node ? rb_next(node) : NULL, node != NULL;</div><div class='add'>+	     node = next) {</div><div class='add'>+		attr = rb_entry(node, struct garp_attr, node);</div><div class='add'>+		garp_attr_destroy(app, attr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int garp_pdu_init(struct garp_applicant *app)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -397,13 +408,13 @@ static void garp_join_timer_arm(struct garp_applicant *app)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay;</div><div class='ctx'> </div><div class='del'>-	delay = (u64)msecs_to_jiffies(garp_join_time) * prandom_u32() &gt;&gt; 32;</div><div class='add'>+	delay = get_random_u32_below(msecs_to_jiffies(garp_join_time));</div><div class='ctx'> 	mod_timer(&amp;app-&gt;join_timer, jiffies + delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void garp_join_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct garp_applicant *app = from_timer(app, t, join_timer);</div><div class='add'>+	struct garp_applicant *app = timer_container_of(app, t, join_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;app-&gt;lock);</div><div class='ctx'> 	garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU);</div><div class='hunk'>@@ -608,10 +619,11 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl</div><div class='ctx'> </div><div class='ctx'> 	/* Delete timer and generate a final TRANSMIT_PDU event to flush out</div><div class='ctx'> 	 * all pending messages before the applicant is gone. */</div><div class='del'>-	del_timer_sync(&amp;app-&gt;join_timer);</div><div class='add'>+	timer_shutdown_sync(&amp;app-&gt;join_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;app-&gt;lock);</div><div class='ctx'> 	garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU);</div><div class='add'>+	garp_attr_destroy_all(app);</div><div class='ctx'> 	garp_pdu_queue(app);</div><div class='ctx'> 	spin_unlock_bh(&amp;app-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/net/802/hippi.c b/net/802/hippi.c<br/>index 690308b9b94a..1997b7dd265e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/hippi.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/hippi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/hippi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/hippi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -13,11 +14,6 @@</div><div class='ctx'>  *		Florian  La Roche, &lt;rzsfl@rz.uni-sb.de&gt;</div><div class='ctx'>  *		Alan Cox, &lt;gw4pts@gw4pts.ampr.org&gt;</div><div class='ctx'>  *		Jes Sorensen, &lt;Jes.Sorensen@cern.ch&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -69,7 +65,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	hip-&gt;le.src_addr_type	= 2;	/* 12 bit SC address */</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hip-&gt;le.src_switch_addr, dev-&gt;dev_addr + 3, 3);</div><div class='del'>-	memset(&amp;hip-&gt;le.reserved, 0, 16);</div><div class='add'>+	memset_startat(&amp;hip-&gt;le, 0, reserved);</div><div class='ctx'> </div><div class='ctx'> 	hip-&gt;snap.dsap		= HIPPI_EXTENDED_SAP;</div><div class='ctx'> 	hip-&gt;snap.ssap		= HIPPI_EXTENDED_SAP;</div><div class='hunk'>@@ -125,7 +121,7 @@ int hippi_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	dev_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(hippi_mac_addr);</div><div class='head'>diff --git a/net/802/mrp.c b/net/802/mrp.c<br/>index a808dd5bbb27..23a88305f900 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/mrp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/mrp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/mrp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/mrp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *	IEEE 802.1Q Multiple Registration Protocol (MRP)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Adapted from code in net/802/garp.c</div><div class='ctx'>  *	Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -19,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/mrp.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int mrp_join_time __read_mostly = 200;</div><div class='ctx'> module_param(mrp_join_time, uint, 0644);</div><div class='hunk'>@@ -29,6 +26,7 @@ static unsigned int mrp_periodic_time __read_mostly = 1000;</div><div class='ctx'> module_param(mrp_periodic_time, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(mrp_periodic_time, "Periodic time in ms (default 1s)");</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IEEE 802.1Q Multiple Registration Protocol (MRP)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static const u8</div><div class='hunk'>@@ -295,6 +293,19 @@ static void mrp_attr_destroy(struct mrp_applicant *app, struct mrp_attr *attr)</div><div class='ctx'> 	kfree(attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mrp_attr_destroy_all(struct mrp_applicant *app)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node, *next;</div><div class='add'>+	struct mrp_attr *attr;</div><div class='add'>+</div><div class='add'>+	for (node = rb_first(&amp;app-&gt;mad);</div><div class='add'>+	     next = node ? rb_next(node) : NULL, node != NULL;</div><div class='add'>+	     node = next) {</div><div class='add'>+		attr = rb_entry(node, struct mrp_attr, node);</div><div class='add'>+		mrp_attr_destroy(app, attr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mrp_pdu_init(struct mrp_applicant *app)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -526,7 +537,7 @@ int mrp_request_join(const struct net_device *dev,</div><div class='ctx'> 	struct mrp_attr *attr;</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(struct mrp_skb_cb) + len &gt;</div><div class='del'>-	    FIELD_SIZEOF(struct sk_buff, cb))</div><div class='add'>+	    sizeof_field(struct sk_buff, cb))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;app-&gt;lock);</div><div class='hunk'>@@ -551,7 +562,7 @@ void mrp_request_leave(const struct net_device *dev,</div><div class='ctx'> 	struct mrp_attr *attr;</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(struct mrp_skb_cb) + len &gt;</div><div class='del'>-	    FIELD_SIZEOF(struct sk_buff, cb))</div><div class='add'>+	    sizeof_field(struct sk_buff, cb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;app-&gt;lock);</div><div class='hunk'>@@ -582,13 +593,13 @@ static void mrp_join_timer_arm(struct mrp_applicant *app)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay;</div><div class='ctx'> </div><div class='del'>-	delay = (u64)msecs_to_jiffies(mrp_join_time) * prandom_u32() &gt;&gt; 32;</div><div class='add'>+	delay = get_random_u32_below(msecs_to_jiffies(mrp_join_time));</div><div class='ctx'> 	mod_timer(&amp;app-&gt;join_timer, jiffies + delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mrp_join_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mrp_applicant *app = from_timer(app, t, join_timer);</div><div class='add'>+	struct mrp_applicant *app = timer_container_of(app, t, join_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;app-&gt;lock);</div><div class='ctx'> 	mrp_mad_event(app, MRP_EVENT_TX);</div><div class='hunk'>@@ -596,7 +607,10 @@ static void mrp_join_timer(struct timer_list *t)</div><div class='ctx'> 	spin_unlock(&amp;app-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mrp_queue_xmit(app);</div><div class='del'>-	mrp_join_timer_arm(app);</div><div class='add'>+	spin_lock(&amp;app-&gt;lock);</div><div class='add'>+	if (likely(app-&gt;active))</div><div class='add'>+		mrp_join_timer_arm(app);</div><div class='add'>+	spin_unlock(&amp;app-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mrp_periodic_timer_arm(struct mrp_applicant *app)</div><div class='hunk'>@@ -607,14 +621,15 @@ static void mrp_periodic_timer_arm(struct mrp_applicant *app)</div><div class='ctx'> </div><div class='ctx'> static void mrp_periodic_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mrp_applicant *app = from_timer(app, t, periodic_timer);</div><div class='add'>+	struct mrp_applicant *app = timer_container_of(app, t, periodic_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;app-&gt;lock);</div><div class='del'>-	mrp_mad_event(app, MRP_EVENT_PERIODIC);</div><div class='del'>-	mrp_pdu_queue(app);</div><div class='add'>+	if (likely(app-&gt;active)) {</div><div class='add'>+		mrp_mad_event(app, MRP_EVENT_PERIODIC);</div><div class='add'>+		mrp_pdu_queue(app);</div><div class='add'>+		mrp_periodic_timer_arm(app);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;app-&gt;lock);</div><div class='del'>-</div><div class='del'>-	mrp_periodic_timer_arm(app);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mrp_pdu_parse_end_mark(struct sk_buff *skb, int *offset)</div><div class='hunk'>@@ -695,7 +710,7 @@ static int mrp_pdu_parse_vecattr(struct mrp_applicant *app,</div><div class='ctx'> 	 * advance to the next event in its Vector.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sizeof(struct mrp_skb_cb) + mrp_cb(skb)-&gt;mh-&gt;attrlen &gt;</div><div class='del'>-	    FIELD_SIZEOF(struct sk_buff, cb))</div><div class='add'>+	    sizeof_field(struct sk_buff, cb))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (skb_copy_bits(skb, *offset, mrp_cb(skb)-&gt;attrvalue,</div><div class='ctx'> 			  mrp_cb(skb)-&gt;mh-&gt;attrlen) &lt; 0)</div><div class='hunk'>@@ -862,6 +877,7 @@ int mrp_init_applicant(struct net_device *dev, struct mrp_application *appl)</div><div class='ctx'> 	app-&gt;dev = dev;</div><div class='ctx'> 	app-&gt;app = appl;</div><div class='ctx'> 	app-&gt;mad = RB_ROOT;</div><div class='add'>+	app-&gt;active = true;</div><div class='ctx'> 	spin_lock_init(&amp;app-&gt;lock);</div><div class='ctx'> 	skb_queue_head_init(&amp;app-&gt;queue);</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mrp_port-&gt;applicants[appl-&gt;type], app);</div><div class='hunk'>@@ -890,14 +906,18 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)</div><div class='ctx'> </div><div class='ctx'> 	RCU_INIT_POINTER(port-&gt;applicants[appl-&gt;type], NULL);</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;app-&gt;lock);</div><div class='add'>+	app-&gt;active = false;</div><div class='add'>+	spin_unlock_bh(&amp;app-&gt;lock);</div><div class='ctx'> 	/* Delete timer and generate a final TX event to flush out</div><div class='ctx'> 	 * all pending messages before the applicant is gone.</div><div class='ctx'> 	 */</div><div class='del'>-	del_timer_sync(&amp;app-&gt;join_timer);</div><div class='del'>-	del_timer_sync(&amp;app-&gt;periodic_timer);</div><div class='add'>+	timer_shutdown_sync(&amp;app-&gt;join_timer);</div><div class='add'>+	timer_shutdown_sync(&amp;app-&gt;periodic_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;app-&gt;lock);</div><div class='ctx'> 	mrp_mad_event(app, MRP_EVENT_TX);</div><div class='add'>+	mrp_attr_destroy_all(app);</div><div class='ctx'> 	mrp_pdu_queue(app);</div><div class='ctx'> 	spin_unlock_bh(&amp;app-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/net/802/p8022.c b/net/802/p8022.c<br/>deleted file mode 100644<br/>index 0bda8de7df51..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/p8022.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/p8022.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	NET3:	Support for 802.2 demultiplexing off Ethernet</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *		Demultiplex 802.2 encoded protocols. We match the entry by the</div><div class='del'>- *		SSAP/DSAP pair and then deliver to the registered datalink that</div><div class='del'>- *		matches. The control byte is ignored and handling of such items</div><div class='del'>- *		is up to the routine passed the frame.</div><div class='del'>- *</div><div class='del'>- *		Unlike the 802.3 datalink we have a list of 802.2 entries as</div><div class='del'>- *		there are multiple protocols to demux. The list is currently</div><div class='del'>- *		short (3 or 4 entries at most). The current demux assumes this.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/datalink.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;net/llc.h&gt;</div><div class='del'>-#include &lt;net/p8022.h&gt;</div><div class='del'>-</div><div class='del'>-static int p8022_request(struct datalink_proto *dl, struct sk_buff *skb,</div><div class='del'>-			 unsigned char *dest)</div><div class='del'>-{</div><div class='del'>-	llc_build_and_send_ui_pkt(dl-&gt;sap, skb, dest, dl-&gt;sap-&gt;laddr.lsap);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct datalink_proto *register_8022_client(unsigned char type,</div><div class='del'>-					    int (*func)(struct sk_buff *skb,</div><div class='del'>-							struct net_device *dev,</div><div class='del'>-							struct packet_type *pt,</div><div class='del'>-							struct net_device *orig_dev))</div><div class='del'>-{</div><div class='del'>-	struct datalink_proto *proto;</div><div class='del'>-</div><div class='del'>-	proto = kmalloc(sizeof(*proto), GFP_ATOMIC);</div><div class='del'>-	if (proto) {</div><div class='del'>-		proto-&gt;type[0]		= type;</div><div class='del'>-		proto-&gt;header_length	= 3;</div><div class='del'>-		proto-&gt;request		= p8022_request;</div><div class='del'>-		proto-&gt;sap = llc_sap_open(type, func);</div><div class='del'>-		if (!proto-&gt;sap) {</div><div class='del'>-			kfree(proto);</div><div class='del'>-			proto = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return proto;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unregister_8022_client(struct datalink_proto *proto)</div><div class='del'>-{</div><div class='del'>-	llc_sap_put(proto-&gt;sap);</div><div class='del'>-	kfree(proto);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(register_8022_client);</div><div class='del'>-EXPORT_SYMBOL(unregister_8022_client);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/802/p8023.c b/net/802/p8023.c<br/>deleted file mode 100644<br/>index 1256a40da43c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/p8023.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/p8023.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	NET3:	802.3 data link hooks used for IPX 802.3</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *	802.3 isn't really a protocol data link layer. Some old IPX stuff</div><div class='del'>- *	uses it however. Note that there is only one 802.3 protocol layer</div><div class='del'>- *	in the system. We don't currently support different protocols</div><div class='del'>- *	running raw 802.3 on different devices. Thankfully nobody else</div><div class='del'>- *	has done anything like the old IPX.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/datalink.h&gt;</div><div class='del'>-#include &lt;net/p8022.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Place an 802.3 header on a packet. The driver will do the mac</div><div class='del'>- *	addresses, we just need to give it the buffer length.</div><div class='del'>- */</div><div class='del'>-static int p8023_request(struct datalink_proto *dl,</div><div class='del'>-			 struct sk_buff *skb, unsigned char *dest_node)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-</div><div class='del'>-	dev_hard_header(skb, dev, ETH_P_802_3, dest_node, NULL, skb-&gt;len);</div><div class='del'>-	return dev_queue_xmit(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Create an 802.3 client. Note there can be only one 802.3 client</div><div class='del'>- */</div><div class='del'>-struct datalink_proto *make_8023_client(void)</div><div class='del'>-{</div><div class='del'>-	struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (proto) {</div><div class='del'>-		proto-&gt;header_length = 0;</div><div class='del'>-		proto-&gt;request	     = p8023_request;</div><div class='del'>-	}</div><div class='del'>-	return proto;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Destroy the 802.3 client.</div><div class='del'>- */</div><div class='del'>-void destroy_8023_client(struct datalink_proto *dl)</div><div class='del'>-{</div><div class='del'>-	kfree(dl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(destroy_8023_client);</div><div class='del'>-EXPORT_SYMBOL(make_8023_client);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/802/psnap.c b/net/802/psnap.c<br/>index db6baf7cf6e9..389df460c8c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/psnap.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/psnap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/psnap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/psnap.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	SNAP data link layer. Derived from 802.2</div><div class='ctx'>  *</div><div class='ctx'>  *		Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;,</div><div class='ctx'>  *		from the 802.2 layer by Greg Page.</div><div class='ctx'>  *		Merged in additions from Greg Page's psnap.c.</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -34,7 +30,7 @@ static struct datalink_proto *find_snap_client(const unsigned char *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct datalink_proto *proto = NULL, *p;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(p, &amp;snap_list, node) {</div><div class='add'>+	list_for_each_entry_rcu(p, &amp;snap_list, node, lockdep_is_held(&amp;snap_lock)) {</div><div class='ctx'> 		if (!memcmp(p-&gt;type, desc, 5)) {</div><div class='ctx'> 			proto = p;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -59,11 +55,11 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	proto = find_snap_client(skb_transport_header(skb));</div><div class='add'>+	proto = find_snap_client(skb-&gt;data);</div><div class='ctx'> 	if (proto) {</div><div class='ctx'> 		/* Pass the frame on. */</div><div class='del'>-		skb-&gt;transport_header += 5;</div><div class='ctx'> 		skb_pull_rcsum(skb, 5);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='ctx'> 		rc = proto-&gt;rcvfunc(skb, dev, &amp;snap_packet_type, orig_dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -83,7 +79,7 @@ drop:</div><div class='ctx'>  *	Put a SNAP header on a frame and pass to 802.2</div><div class='ctx'>  */</div><div class='ctx'> static int snap_request(struct datalink_proto *dl,</div><div class='del'>-			struct sk_buff *skb, u8 *dest)</div><div class='add'>+			struct sk_buff *skb, const u8 *dest)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(skb_push(skb, 5), dl-&gt;type, 5);</div><div class='ctx'> 	llc_build_and_send_ui_pkt(snap_sap, skb, dest, snap_sap-&gt;laddr.lsap);</div><div class='hunk'>@@ -164,4 +160,5 @@ void unregister_snap_client(struct datalink_proto *proto)</div><div class='ctx'> 	kfree(proto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("SNAP data link layer. Derived from 802.2");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/802/stp.c b/net/802/stp.c<br/>index 2c40ba0ec116..03c9f75e92c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/802/stp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/802/stp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/802/stp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/802/stp.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *	STP SAP demux</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -101,4 +98,5 @@ void stp_proto_unregister(const struct stp_proto *proto)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(stp_proto_unregister);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("SAP demux for IEEE 802.1D Spanning Tree Protocol (STP)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/8021q/Kconfig b/net/8021q/Kconfig<br/>index 42320180967f..8bf7a1765b78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Configuration for 802.1Q VLAN support</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config VLAN_8021Q</div><div class='ctx'> 	tristate "802.1Q/802.1ad VLAN Support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Select this and you will be able to create 802.1Q VLAN interfaces</div><div class='ctx'> 	  on your Ethernet interfaces. 802.1Q VLAN supports almost</div><div class='ctx'> 	  everything a regular Ethernet interface does, including</div><div class='head'>diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c<br/>index 5e9950453955..2b74ed56eb16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		802.1Q VLAN</div><div class='ctx'>  *		Ethernet-type device handling.</div><div class='hunk'>@@ -11,11 +12,6 @@</div><div class='ctx'>  *		Add HW acceleration hooks - David S. Miller &lt;davem@redhat.com&gt;;</div><div class='ctx'>  *		Correct all the locking - David S. Miller &lt;davem@redhat.com&gt;;</div><div class='ctx'>  *		Use hash table for VLAN groups - David S. Miller &lt;davem@redhat.com&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -27,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;net/p8022.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='hunk'>@@ -55,26 +50,41 @@ static int vlan_group_prealloc_vid(struct vlan_group *vg,</div><div class='ctx'> 				   __be16 vlan_proto, u16 vlan_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device **array;</div><div class='del'>-	unsigned int pidx, vidx;</div><div class='add'>+	unsigned int vidx;</div><div class='ctx'> 	unsigned int size;</div><div class='add'>+	int pidx;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	pidx  = vlan_proto_idx(vlan_proto);</div><div class='add'>+	if (pidx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	vidx  = vlan_id / VLAN_GROUP_ARRAY_PART_LEN;</div><div class='ctx'> 	array = vg-&gt;vlan_devices_arrays[pidx][vidx];</div><div class='ctx'> 	if (array != NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct net_device *) * VLAN_GROUP_ARRAY_PART_LEN;</div><div class='del'>-	array = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	array = kzalloc(size, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (array == NULL)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='add'>+	/* paired with smp_rmb() in __vlan_group_get_device() */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='ctx'> 	vg-&gt;vlan_devices_arrays[pidx][vidx] = array;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vlan_stacked_transfer_operstate(const struct net_device *rootdev,</div><div class='add'>+					    struct net_device *dev,</div><div class='add'>+					    struct vlan_dev_priv *vlan)</div><div class='add'>+{</div><div class='add'>+	if (!(vlan-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING))</div><div class='add'>+		netif_stacked_transfer_operstate(rootdev, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void unregister_vlan_dev(struct net_device *dev, struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='hunk'>@@ -112,9 +122,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vlan_vid_del(real_dev, vlan-&gt;vlan_proto, vlan_id);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the vlan's reference to real_dev */</div><div class='del'>-	dev_put(real_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int vlan_check_real_dev(struct net_device *real_dev,</div><div class='hunk'>@@ -123,7 +130,8 @@ int vlan_check_real_dev(struct net_device *real_dev,</div><div class='ctx'> {</div><div class='ctx'> 	const char *name = real_dev-&gt;name;</div><div class='ctx'> </div><div class='del'>-	if (real_dev-&gt;features &amp; NETIF_F_VLAN_CHALLENGED) {</div><div class='add'>+	if (real_dev-&gt;features &amp; NETIF_F_VLAN_CHALLENGED ||</div><div class='add'>+	    real_dev-&gt;type != ARPHRD_ETHER) {</div><div class='ctx'> 		pr_info("VLANs not supported on %s\n", name);</div><div class='ctx'> 		NL_SET_ERR_MSG_MOD(extack, "VLANs not supported on device");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -168,7 +176,6 @@ int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_uninit_mvrp;</div><div class='ctx'> </div><div class='del'>-	vlan-&gt;nest_level = dev_get_nest_level(real_dev) + 1;</div><div class='ctx'> 	err = register_netdevice(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_uninit_mvrp;</div><div class='hunk'>@@ -177,10 +184,7 @@ int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_unregister_netdev;</div><div class='ctx'> </div><div class='del'>-	/* Account for reference in struct vlan_dev_priv */</div><div class='del'>-	dev_hold(real_dev);</div><div class='del'>-</div><div class='del'>-	netif_stacked_transfer_operstate(real_dev, dev);</div><div class='add'>+	vlan_stacked_transfer_operstate(real_dev, dev, vlan);</div><div class='ctx'> 	linkwatch_fire_event(dev); /* _MUST_ call rfc2863_policy() */</div><div class='ctx'> </div><div class='ctx'> 	/* So, got the sucker initialized, now lets place</div><div class='hunk'>@@ -189,6 +193,8 @@ int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> 	vlan_group_set_device(grp, vlan-&gt;vlan_proto, vlan_id, dev);</div><div class='ctx'> 	grp-&gt;nr_vlan_devs++;</div><div class='ctx'> </div><div class='add'>+	netdev_update_features(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_unregister_netdev:</div><div class='hunk'>@@ -277,8 +283,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_free_newdev:</div><div class='del'>-	if (new_dev-&gt;reg_state == NETREG_UNINITIALIZED)</div><div class='del'>-		free_netdev(new_dev);</div><div class='add'>+	free_netdev(new_dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -316,8 +321,7 @@ static void vlan_transfer_features(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);</div><div class='ctx'> </div><div class='del'>-	vlandev-&gt;gso_max_size = dev-&gt;gso_max_size;</div><div class='del'>-	vlandev-&gt;gso_max_segs = dev-&gt;gso_max_segs;</div><div class='add'>+	netif_inherit_tso_max(vlandev, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (vlan_hw_offload_capable(dev-&gt;features, vlan-&gt;vlan_proto))</div><div class='ctx'> 		vlandev-&gt;hard_header_len = dev-&gt;hard_header_len;</div><div class='hunk'>@@ -330,6 +334,7 @@ static void vlan_transfer_features(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	vlandev-&gt;priv_flags &amp;= ~IFF_XMIT_DST_RELEASE;</div><div class='ctx'> 	vlandev-&gt;priv_flags |= (vlan-&gt;real_dev-&gt;priv_flags &amp; IFF_XMIT_DST_RELEASE);</div><div class='add'>+	vlandev-&gt;hw_enc_features = vlan_tnl_features(vlan-&gt;real_dev);</div><div class='ctx'> </div><div class='ctx'> 	netdev_update_features(vlandev);</div><div class='ctx'> }</div><div class='hunk'>@@ -354,9 +359,39 @@ static int __vlan_device_event(struct net_device *dev, unsigned long event)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vlan_vid0_add(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct vlan_info *vlan_info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_info("adding VLAN 0 to HW filter on device %s\n", dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	err = vlan_vid_add(dev, htons(ETH_P_8021Q), 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vlan_info = rtnl_dereference(dev-&gt;vlan_info);</div><div class='add'>+	vlan_info-&gt;auto_vid0 = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vlan_vid0_del(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct vlan_info *vlan_info = rtnl_dereference(dev-&gt;vlan_info);</div><div class='add'>+</div><div class='add'>+	if (!vlan_info || !vlan_info-&gt;auto_vid0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vlan_info-&gt;auto_vid0 = false;</div><div class='add'>+	vlan_vid_del(dev, htons(ETH_P_8021Q), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vlan_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 			     void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct netlink_ext_ack *extack = netdev_notifier_info_to_extack(ptr);</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> 	struct vlan_group *grp;</div><div class='ctx'> 	struct vlan_info *vlan_info;</div><div class='hunk'>@@ -374,15 +409,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 			return notifier_from_errno(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((event == NETDEV_UP) &amp;&amp;</div><div class='del'>-	    (dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER)) {</div><div class='del'>-		pr_info("adding VLAN 0 to HW filter on device %s\n",</div><div class='del'>-			dev-&gt;name);</div><div class='del'>-		vlan_vid_add(dev, htons(ETH_P_8021Q), 0);</div><div class='del'>-	}</div><div class='del'>-	if (event == NETDEV_DOWN &amp;&amp;</div><div class='del'>-	    (dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER))</div><div class='del'>-		vlan_vid_del(dev, htons(ETH_P_8021Q), 0);</div><div class='add'>+	if (event == NETDEV_UP)</div><div class='add'>+		vlan_vid0_add(dev);</div><div class='add'>+	else if (event == NETDEV_DOWN)</div><div class='add'>+		vlan_vid0_del(dev);</div><div class='ctx'> </div><div class='ctx'> 	vlan_info = rtnl_dereference(dev-&gt;vlan_info);</div><div class='ctx'> 	if (!vlan_info)</div><div class='hunk'>@@ -397,7 +427,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='ctx'> 		/* Propagate real device state to vlan devices */</div><div class='ctx'> 		vlan_group_for_each_dev(grp, i, vlandev)</div><div class='del'>-			netif_stacked_transfer_operstate(dev, vlandev);</div><div class='add'>+			vlan_stacked_transfer_operstate(dev, vlandev,</div><div class='add'>+							vlan_dev_priv(vlandev));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='hunk'>@@ -441,10 +472,11 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 				list_add(&amp;vlandev-&gt;close_list, &amp;close_list);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev_close_many(&amp;close_list, false);</div><div class='add'>+		netif_close_many(&amp;close_list, false);</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry_safe(vlandev, tmp, &amp;close_list, close_list) {</div><div class='del'>-			netif_stacked_transfer_operstate(dev, vlandev);</div><div class='add'>+			vlan_stacked_transfer_operstate(dev, vlandev,</div><div class='add'>+							vlan_dev_priv(vlandev));</div><div class='ctx'> 			list_del_init(&amp;vlandev-&gt;close_list);</div><div class='ctx'> 		}</div><div class='ctx'> 		list_del(&amp;close_list);</div><div class='hunk'>@@ -453,14 +485,15 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 	case NETDEV_UP:</div><div class='ctx'> 		/* Put all VLANs for this dev in the up state too.  */</div><div class='ctx'> 		vlan_group_for_each_dev(grp, i, vlandev) {</div><div class='del'>-			flgs = dev_get_flags(vlandev);</div><div class='add'>+			flgs = netif_get_flags(vlandev);</div><div class='ctx'> 			if (flgs &amp; IFF_UP)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			vlan = vlan_dev_priv(vlandev);</div><div class='ctx'> 			if (!(vlan-&gt;flags &amp; VLAN_FLAG_LOOSE_BINDING))</div><div class='del'>-				dev_change_flags(vlandev, flgs | IFF_UP);</div><div class='del'>-			netif_stacked_transfer_operstate(dev, vlandev);</div><div class='add'>+				dev_change_flags(vlandev, flgs | IFF_UP,</div><div class='add'>+						 extack);</div><div class='add'>+			vlan_stacked_transfer_operstate(dev, vlandev, vlan);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -624,7 +657,8 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	case GET_VLAN_REALDEV_NAME_CMD:</div><div class='ctx'> 		err = 0;</div><div class='del'>-		vlan_dev_get_realdev_name(dev, args.u.device2);</div><div class='add'>+		vlan_dev_get_realdev_name(dev, args.u.device2,</div><div class='add'>+					  sizeof(args.u.device2));</div><div class='ctx'> 		if (copy_to_user(arg, &amp;args,</div><div class='ctx'> 				 sizeof(struct vlan_ioctl_args)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='hunk'>@@ -647,93 +681,6 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *vlan_gro_receive(struct list_head *head,</div><div class='del'>-					struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct packet_offload *ptype;</div><div class='del'>-	unsigned int hlen, off_vlan;</div><div class='del'>-	struct sk_buff *pp = NULL;</div><div class='del'>-	struct vlan_hdr *vhdr;</div><div class='del'>-	struct sk_buff *p;</div><div class='del'>-	__be16 type;</div><div class='del'>-	int flush = 1;</div><div class='del'>-</div><div class='del'>-	off_vlan = skb_gro_offset(skb);</div><div class='del'>-	hlen = off_vlan + sizeof(*vhdr);</div><div class='del'>-	vhdr = skb_gro_header_fast(skb, off_vlan);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		vhdr = skb_gro_header_slow(skb, hlen, off_vlan);</div><div class='del'>-		if (unlikely(!vhdr))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	type = vhdr-&gt;h_vlan_encapsulated_proto;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ptype = gro_find_receive_by_type(type);</div><div class='del'>-	if (!ptype)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	flush = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(p, head, list) {</div><div class='del'>-		struct vlan_hdr *vhdr2;</div><div class='del'>-</div><div class='del'>-		if (!NAPI_GRO_CB(p)-&gt;same_flow)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		vhdr2 = (struct vlan_hdr *)(p-&gt;data + off_vlan);</div><div class='del'>-		if (compare_vlan_header(vhdr, vhdr2))</div><div class='del'>-			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_gro_pull(skb, sizeof(*vhdr));</div><div class='del'>-	skb_gro_postpull_rcsum(skb, vhdr, sizeof(*vhdr));</div><div class='del'>-	pp = call_gro_receive(ptype-&gt;callbacks.gro_receive, head, skb);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-out:</div><div class='del'>-	skb_gro_flush_final(skb, pp, flush);</div><div class='del'>-</div><div class='del'>-	return pp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vlan_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='del'>-{</div><div class='del'>-	struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb-&gt;data + nhoff);</div><div class='del'>-	__be16 type = vhdr-&gt;h_vlan_encapsulated_proto;</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-	int err = -ENOENT;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ptype = gro_find_complete_by_type(type);</div><div class='del'>-	if (ptype)</div><div class='del'>-		err = ptype-&gt;callbacks.gro_complete(skb, nhoff + sizeof(*vhdr));</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct packet_offload vlan_packet_offloads[] __read_mostly = {</div><div class='del'>-	{</div><div class='del'>-		.type = cpu_to_be16(ETH_P_8021Q),</div><div class='del'>-		.priority = 10,</div><div class='del'>-		.callbacks = {</div><div class='del'>-			.gro_receive = vlan_gro_receive,</div><div class='del'>-			.gro_complete = vlan_gro_complete,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.type = cpu_to_be16(ETH_P_8021AD),</div><div class='del'>-		.priority = 10,</div><div class='del'>-		.callbacks = {</div><div class='del'>-			.gro_receive = vlan_gro_receive,</div><div class='del'>-			.gro_complete = vlan_gro_complete,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __net_init vlan_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_net *vn = net_generic(net, vlan_net_id);</div><div class='hunk'>@@ -761,7 +708,6 @@ static struct pernet_operations vlan_net_ops = {</div><div class='ctx'> static int __init vlan_proto_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s v%s\n", vlan_fullname, vlan_version);</div><div class='ctx'> </div><div class='hunk'>@@ -785,9 +731,6 @@ static int __init vlan_proto_init(void)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err5;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(vlan_packet_offloads); i++)</div><div class='del'>-		dev_add_offload(&amp;vlan_packet_offloads[i]);</div><div class='del'>-</div><div class='ctx'> 	vlan_ioctl_set(vlan_ioctl_handler);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -805,13 +748,8 @@ err0:</div><div class='ctx'> </div><div class='ctx'> static void __exit vlan_cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='ctx'> 	vlan_ioctl_set(NULL);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(vlan_packet_offloads); i++)</div><div class='del'>-		dev_remove_offload(&amp;vlan_packet_offloads[i]);</div><div class='del'>-</div><div class='ctx'> 	vlan_netlink_fini();</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdevice_notifier(&amp;vlan_notifier_block);</div><div class='hunk'>@@ -826,5 +764,7 @@ static void __exit vlan_cleanup_module(void)</div><div class='ctx'> module_init(vlan_proto_init);</div><div class='ctx'> module_exit(vlan_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("802.1Q/802.1ad VLAN Protocol");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_IMPORT_NS("NETDEV_INTERNAL");</div><div class='head'>diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h<br/>index 44df1c3df02d..c7ffe591d593 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan.h</a></div><div class='hunk'>@@ -33,10 +33,11 @@ struct vlan_info {</div><div class='ctx'> 	struct vlan_group	grp;</div><div class='ctx'> 	struct list_head	vid_list;</div><div class='ctx'> 	unsigned int		nr_vids;</div><div class='add'>+	bool			auto_vid0;</div><div class='ctx'> 	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned int vlan_proto_idx(__be16 proto)</div><div class='add'>+static inline int vlan_proto_idx(__be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	switch (proto) {</div><div class='ctx'> 	case htons(ETH_P_8021Q):</div><div class='hunk'>@@ -44,8 +45,8 @@ static inline unsigned int vlan_proto_idx(__be16 proto)</div><div class='ctx'> 	case htons(ETH_P_8021AD):</div><div class='ctx'> 		return VLAN_PROTO_8021AD;</div><div class='ctx'> 	default:</div><div class='del'>-		BUG();</div><div class='del'>-		return 0;</div><div class='add'>+		WARN(1, "invalid VLAN protocol: 0x%04x\n", ntohs(proto));</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +58,10 @@ static inline struct net_device *__vlan_group_get_device(struct vlan_group *vg,</div><div class='ctx'> </div><div class='ctx'> 	array = vg-&gt;vlan_devices_arrays[pidx]</div><div class='ctx'> 				       [vlan_id / VLAN_GROUP_ARRAY_PART_LEN];</div><div class='add'>+</div><div class='add'>+	/* paired with smp_wmb() in vlan_group_prealloc_vid() */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='ctx'> 	return array ? array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -64,17 +69,24 @@ static inline struct net_device *vlan_group_get_device(struct vlan_group *vg,</div><div class='ctx'> 						       __be16 vlan_proto,</div><div class='ctx'> 						       u16 vlan_id)</div><div class='ctx'> {</div><div class='del'>-	return __vlan_group_get_device(vg, vlan_proto_idx(vlan_proto), vlan_id);</div><div class='add'>+	int pidx = vlan_proto_idx(vlan_proto);</div><div class='add'>+</div><div class='add'>+	if (pidx &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return __vlan_group_get_device(vg, pidx, vlan_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void vlan_group_set_device(struct vlan_group *vg,</div><div class='ctx'> 					 __be16 vlan_proto, u16 vlan_id,</div><div class='ctx'> 					 struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	int pidx = vlan_proto_idx(vlan_proto);</div><div class='ctx'> 	struct net_device **array;</div><div class='del'>-	if (!vg)</div><div class='add'>+</div><div class='add'>+	if (!vg || pidx &lt; 0)</div><div class='ctx'> 		return;</div><div class='del'>-	array = vg-&gt;vlan_devices_arrays[vlan_proto_idx(vlan_proto)]</div><div class='add'>+	array = vg-&gt;vlan_devices_arrays[pidx]</div><div class='ctx'> 				       [vlan_id / VLAN_GROUP_ARRAY_PART_LEN];</div><div class='ctx'> 	array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -92,6 +104,19 @@ static inline struct net_device *vlan_find_dev(struct net_device *real_dev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline netdev_features_t vlan_tnl_features(struct net_device *real_dev)</div><div class='add'>+{</div><div class='add'>+	netdev_features_t ret;</div><div class='add'>+</div><div class='add'>+	ret = real_dev-&gt;hw_enc_features &amp;</div><div class='add'>+	      (NETIF_F_CSUM_MASK | NETIF_F_GSO_SOFTWARE |</div><div class='add'>+	       NETIF_F_GSO_ENCAP_ALL);</div><div class='add'>+</div><div class='add'>+	if ((ret &amp; NETIF_F_GSO_ENCAP_ALL) &amp;&amp; (ret &amp; NETIF_F_CSUM_MASK))</div><div class='add'>+		return (ret &amp; ~NETIF_F_CSUM_MASK) | NETIF_F_HW_CSUM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define vlan_group_for_each_dev(grp, i, dev) \</div><div class='ctx'> 	for ((i) = 0; i &lt; VLAN_PROTO_NUM * VLAN_N_VID; i++) \</div><div class='ctx'> 		if (((dev) = __vlan_group_get_device((grp), (i) / VLAN_N_VID, \</div><div class='hunk'>@@ -105,8 +130,10 @@ void vlan_dev_set_ingress_priority(const struct net_device *dev,</div><div class='ctx'> 				   u32 skb_prio, u16 vlan_prio);</div><div class='ctx'> int vlan_dev_set_egress_priority(const struct net_device *dev,</div><div class='ctx'> 				 u32 skb_prio, u16 vlan_prio);</div><div class='add'>+void vlan_dev_free_egress_priority(const struct net_device *dev);</div><div class='ctx'> int vlan_dev_change_flags(const struct net_device *dev, u32 flag, u32 mask);</div><div class='del'>-void vlan_dev_get_realdev_name(const struct net_device *dev, char *result);</div><div class='add'>+void vlan_dev_get_realdev_name(const struct net_device *dev, char *result,</div><div class='add'>+			       size_t size);</div><div class='ctx'> </div><div class='ctx'> int vlan_check_real_dev(struct net_device *real_dev,</div><div class='ctx'> 			__be16 protocol, u16 vlan_id,</div><div class='head'>diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c<br/>index 4f60e86f4b8d..9404dd551dfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan_core.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/netpoll.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include "vlan.h"</div><div class='ctx'> </div><div class='ctx'> bool vlan_do_receive(struct sk_buff **skbp)</div><div class='hunk'>@@ -57,15 +58,15 @@ bool vlan_do_receive(struct sk_buff **skbp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;priority = vlan_get_ingress_priority(vlan_dev, skb-&gt;vlan_tci);</div><div class='del'>-	skb-&gt;vlan_tci = 0;</div><div class='add'>+	__vlan_hwaccel_clear_tag(skb);</div><div class='ctx'> </div><div class='ctx'> 	rx_stats = this_cpu_ptr(vlan_dev_priv(vlan_dev)-&gt;vlan_pcpu_stats);</div><div class='ctx'> </div><div class='ctx'> 	u64_stats_update_begin(&amp;rx_stats-&gt;syncp);</div><div class='del'>-	rx_stats-&gt;rx_packets++;</div><div class='del'>-	rx_stats-&gt;rx_bytes += skb-&gt;len;</div><div class='add'>+	u64_stats_inc(&amp;rx_stats-&gt;rx_packets);</div><div class='add'>+	u64_stats_add(&amp;rx_stats-&gt;rx_bytes, skb-&gt;len);</div><div class='ctx'> 	if (skb-&gt;pkt_type == PACKET_MULTICAST)</div><div class='del'>-		rx_stats-&gt;rx_multicast++;</div><div class='add'>+		u64_stats_inc(&amp;rx_stats-&gt;rx_multicast);</div><div class='ctx'> 	u64_stats_update_end(&amp;rx_stats-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -223,6 +224,33 @@ static int vlan_kill_rx_filter_info(struct net_device *dev, __be16 proto, u16 vi</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int vlan_for_each(struct net_device *dev,</div><div class='add'>+		  int (*action)(struct net_device *dev, int vid, void *arg),</div><div class='add'>+		  void *arg)</div><div class='add'>+{</div><div class='add'>+	struct vlan_vid_info *vid_info;</div><div class='add'>+	struct vlan_info *vlan_info;</div><div class='add'>+	struct net_device *vdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	vlan_info = rtnl_dereference(dev-&gt;vlan_info);</div><div class='add'>+	if (!vlan_info)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vid_info, &amp;vlan_info-&gt;vid_list, list) {</div><div class='add'>+		vdev = vlan_group_get_device(&amp;vlan_info-&gt;grp, vid_info-&gt;proto,</div><div class='add'>+					     vid_info-&gt;vid);</div><div class='add'>+		ret = action(vdev, vid_info-&gt;vid, arg);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vlan_for_each);</div><div class='add'>+</div><div class='ctx'> int vlan_filter_push_vids(struct vlan_info *vlan_info, __be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *real_dev = vlan_info-&gt;real_dev;</div><div class='hunk'>@@ -332,9 +360,8 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = vlan_kill_rx_filter_info(dev, proto, vid);</div><div class='del'>-	if (err)</div><div class='del'>-		pr_warn("failed to kill vid %04x/%d for device %s\n",</div><div class='del'>-			proto, vid, dev-&gt;name);</div><div class='add'>+	if (err &amp;&amp; dev-&gt;reg_state != NETREG_UNREGISTERING)</div><div class='add'>+		netdev_warn(dev, "failed to kill vid %04x/%d\n", proto, vid);</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;vid_info-&gt;list);</div><div class='ctx'> 	kfree(vid_info);</div><div class='hunk'>@@ -380,6 +407,8 @@ int vlan_vids_add_by_dev(struct net_device *dev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(vid_info, &amp;vlan_info-&gt;vid_list, list) {</div><div class='add'>+		if (!vlan_hw_filter_capable(by_dev, vid_info-&gt;proto))</div><div class='add'>+			continue;</div><div class='ctx'> 		err = vlan_vid_add(dev, vid_info-&gt;proto, vid_info-&gt;vid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unwind;</div><div class='hunk'>@@ -390,6 +419,8 @@ unwind:</div><div class='ctx'> 	list_for_each_entry_continue_reverse(vid_info,</div><div class='ctx'> 					     &amp;vlan_info-&gt;vid_list,</div><div class='ctx'> 					     list) {</div><div class='add'>+		if (!vlan_hw_filter_capable(by_dev, vid_info-&gt;proto))</div><div class='add'>+			continue;</div><div class='ctx'> 		vlan_vid_del(dev, vid_info-&gt;proto, vid_info-&gt;vid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -409,8 +440,11 @@ void vlan_vids_del_by_dev(struct net_device *dev,</div><div class='ctx'> 	if (!vlan_info)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(vid_info, &amp;vlan_info-&gt;vid_list, list)</div><div class='add'>+	list_for_each_entry(vid_info, &amp;vlan_info-&gt;vid_list, list) {</div><div class='add'>+		if (!vlan_hw_filter_capable(by_dev, vid_info-&gt;proto))</div><div class='add'>+			continue;</div><div class='ctx'> 		vlan_vid_del(dev, vid_info-&gt;proto, vid_info-&gt;vid);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vlan_vids_del_by_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -426,3 +460,101 @@ bool vlan_uses_dev(const struct net_device *dev)</div><div class='ctx'> 	return vlan_info-&gt;grp.nr_vlan_devs ? true : false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vlan_uses_dev);</div><div class='add'>+</div><div class='add'>+static struct sk_buff *vlan_gro_receive(struct list_head *head,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct packet_offload *ptype;</div><div class='add'>+	unsigned int hlen, off_vlan;</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	struct vlan_hdr *vhdr;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	__be16 type;</div><div class='add'>+	int flush = 1;</div><div class='add'>+</div><div class='add'>+	off_vlan = skb_gro_offset(skb);</div><div class='add'>+	hlen = off_vlan + sizeof(*vhdr);</div><div class='add'>+	vhdr = skb_gro_header(skb, hlen, off_vlan);</div><div class='add'>+	if (unlikely(!vhdr))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;network_offsets[NAPI_GRO_CB(skb)-&gt;encap_mark] = hlen;</div><div class='add'>+</div><div class='add'>+	type = vhdr-&gt;h_vlan_encapsulated_proto;</div><div class='add'>+</div><div class='add'>+	ptype = gro_find_receive_by_type(type);</div><div class='add'>+	if (!ptype)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	flush = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, head, list) {</div><div class='add'>+		struct vlan_hdr *vhdr2;</div><div class='add'>+</div><div class='add'>+		if (!NAPI_GRO_CB(p)-&gt;same_flow)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		vhdr2 = (struct vlan_hdr *)(p-&gt;data + off_vlan);</div><div class='add'>+		if (compare_vlan_header(vhdr, vhdr2))</div><div class='add'>+			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_gro_pull(skb, sizeof(*vhdr));</div><div class='add'>+	skb_gro_postpull_rcsum(skb, vhdr, sizeof(*vhdr));</div><div class='add'>+</div><div class='add'>+	pp = indirect_call_gro_receive_inet(ptype-&gt;callbacks.gro_receive,</div><div class='add'>+					    ipv6_gro_receive, inet_gro_receive,</div><div class='add'>+					    head, skb);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	skb_gro_flush_final(skb, pp, flush);</div><div class='add'>+</div><div class='add'>+	return pp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='add'>+{</div><div class='add'>+	struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb-&gt;data + nhoff);</div><div class='add'>+	__be16 type = vhdr-&gt;h_vlan_encapsulated_proto;</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	ptype = gro_find_complete_by_type(type);</div><div class='add'>+	if (ptype)</div><div class='add'>+		err = INDIRECT_CALL_INET(ptype-&gt;callbacks.gro_complete,</div><div class='add'>+					 ipv6_gro_complete, inet_gro_complete,</div><div class='add'>+					 skb, nhoff + sizeof(*vhdr));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct packet_offload vlan_packet_offloads[] __read_mostly = {</div><div class='add'>+	{</div><div class='add'>+		.type = cpu_to_be16(ETH_P_8021Q),</div><div class='add'>+		.priority = 10,</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gro_receive = vlan_gro_receive,</div><div class='add'>+			.gro_complete = vlan_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = cpu_to_be16(ETH_P_8021AD),</div><div class='add'>+		.priority = 10,</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gro_receive = vlan_gro_receive,</div><div class='add'>+			.gro_complete = vlan_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init vlan_offload_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vlan_packet_offloads); i++)</div><div class='add'>+		dev_add_offload(&amp;vlan_packet_offloads[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+fs_initcall(vlan_offload_init);</div><div class='head'>diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c<br/>index 546af0e73ac3..fbf296137b09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan_dev.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* -*- linux-c -*-</div><div class='ctx'>  * INET		802.1Q VLAN</div><div class='ctx'>  *		Ethernet-type device handling.</div><div class='hunk'>@@ -12,12 +13,6 @@</div><div class='ctx'>  *              Oct 20, 2001:  Ard van Breeman:</div><div class='ctx'>  *                - Fix MC-list, finally.</div><div class='ctx'>  *                - Flush MC-list on VLAN destroy.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -31,7 +26,8 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='del'>-#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;net/macsec.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vlan.h"</div><div class='ctx'> #include "vlanproc.h"</div><div class='hunk'>@@ -94,12 +90,11 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> static inline netdev_tx_t vlan_netpoll_send_skb(struct vlan_dev_priv *vlan, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	if (vlan-&gt;netpoll)</div><div class='del'>-		netpoll_send_skb(vlan-&gt;netpoll, skb);</div><div class='add'>+	return netpoll_send_skb(vlan-&gt;netpoll, skb);</div><div class='ctx'> #else</div><div class='ctx'> 	BUG();</div><div class='del'>-#endif</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,</div><div class='hunk'>@@ -115,8 +110,8 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING</div><div class='ctx'> 	 * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...</div><div class='ctx'> 	 */</div><div class='del'>-	if (veth-&gt;h_vlan_proto != vlan-&gt;vlan_proto ||</div><div class='del'>-	    vlan-&gt;flags &amp; VLAN_FLAG_REORDER_HDR) {</div><div class='add'>+	if (vlan-&gt;flags &amp; VLAN_FLAG_REORDER_HDR ||</div><div class='add'>+	    veth-&gt;h_vlan_proto != vlan-&gt;vlan_proto) {</div><div class='ctx'> 		u16 vlan_tci;</div><div class='ctx'> 		vlan_tci = vlan-&gt;vlan_id;</div><div class='ctx'> 		vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb-&gt;priority);</div><div class='hunk'>@@ -135,8 +130,8 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		stats = this_cpu_ptr(vlan-&gt;vlan_pcpu_stats);</div><div class='ctx'> 		u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='del'>-		stats-&gt;tx_packets++;</div><div class='del'>-		stats-&gt;tx_bytes += len;</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;tx_packets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;tx_bytes, len);</div><div class='ctx'> 		u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		this_cpu_inc(vlan-&gt;vlan_pcpu_stats-&gt;tx_dropped);</div><div class='hunk'>@@ -155,7 +150,7 @@ static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	if (max_mtu &lt; new_mtu)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -224,7 +219,8 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)</div><div class='ctx'> 	u32 old_flags = vlan-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |</div><div class='del'>-		     VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP))</div><div class='add'>+		     VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP |</div><div class='add'>+		     VLAN_FLAG_BRIDGE_BINDING))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vlan-&gt;flags = (old_flags &amp; ~mask) | (flags &amp; mask);</div><div class='hunk'>@@ -245,9 +241,9 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)</div><div class='add'>+void vlan_dev_get_realdev_name(const struct net_device *dev, char *result, size_t size)</div><div class='ctx'> {</div><div class='del'>-	strncpy(result, vlan_dev_priv(dev)-&gt;real_dev-&gt;name, 23);</div><div class='add'>+	strscpy_pad(result, vlan_dev_priv(dev)-&gt;real_dev-&gt;name, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool vlan_dev_inherit_address(struct net_device *dev,</div><div class='hunk'>@@ -256,7 +252,7 @@ bool vlan_dev_inherit_address(struct net_device *dev,</div><div class='ctx'> 	if (dev-&gt;addr_assign_type != NET_ADDR_STOLEN)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, real_dev-&gt;dev_addr);</div><div class='add'>+	eth_hw_addr_set(dev, real_dev-&gt;dev_addr);</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -278,17 +274,6 @@ static int vlan_dev_open(struct net_device *dev)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='del'>-		err = dev_set_allmulti(real_dev, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto del_unicast;</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='del'>-		err = dev_set_promiscuity(real_dev, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto clear_allmulti;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ether_addr_copy(vlan-&gt;real_dev_addr, real_dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (vlan-&gt;flags &amp; VLAN_FLAG_GVRP)</div><div class='hunk'>@@ -297,16 +282,11 @@ static int vlan_dev_open(struct net_device *dev)</div><div class='ctx'> 	if (vlan-&gt;flags &amp; VLAN_FLAG_MVRP)</div><div class='ctx'> 		vlan_mvrp_request_join(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_carrier_ok(real_dev))</div><div class='add'>+	if (netif_carrier_ok(real_dev) &amp;&amp;</div><div class='add'>+	    !(vlan-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING))</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-clear_allmulti:</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-		dev_set_allmulti(real_dev, -1);</div><div class='del'>-del_unicast:</div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, real_dev-&gt;dev_addr))</div><div class='del'>-		dev_uc_del(real_dev, dev-&gt;dev_addr);</div><div class='ctx'> out:</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -319,15 +299,12 @@ static int vlan_dev_stop(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_mc_unsync(real_dev, dev);</div><div class='ctx'> 	dev_uc_unsync(real_dev, dev);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-		dev_set_allmulti(real_dev, -1);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-		dev_set_promiscuity(real_dev, -1);</div><div class='ctx'> </div><div class='ctx'> 	if (!ether_addr_equal(dev-&gt;dev_addr, real_dev-&gt;dev_addr))</div><div class='ctx'> 		dev_uc_del(real_dev, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	netif_carrier_off(dev);</div><div class='add'>+	if (!(vlan-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING))</div><div class='add'>+		netif_carrier_off(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -353,28 +330,44 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 		dev_uc_del(real_dev, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vlan_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='add'>+</div><div class='add'>+	return generic_hwtstamp_get_lower(real_dev, cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='add'>+</div><div class='add'>+	if (!net_eq(dev_net(dev), dev_net(real_dev)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return generic_hwtstamp_set_lower(real_dev, cfg, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='del'>-	const struct net_device_ops *ops = real_dev-&gt;netdev_ops;</div><div class='ctx'> 	struct ifreq ifrr;</div><div class='ctx'> 	int err = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	strncpy(ifrr.ifr_name, real_dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	strscpy_pad(ifrr.ifr_name, real_dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	ifrr.ifr_ifru = ifr-&gt;ifr_ifru;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 	case SIOCGMIIREG:</div><div class='ctx'> 	case SIOCSMIIREG:</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		if (netif_device_present(real_dev) &amp;&amp; ops-&gt;ndo_do_ioctl)</div><div class='del'>-			err = ops-&gt;ndo_do_ioctl(real_dev, &amp;ifrr, cmd);</div><div class='add'>+		err = dev_eth_ioctl(real_dev, &amp;ifrr, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -444,27 +437,29 @@ static int vlan_dev_fcoe_disable(struct net_device *dev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)</div><div class='add'>+static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid,</div><div class='add'>+				    struct scatterlist *sgl, unsigned int sgc)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='ctx'> 	const struct net_device_ops *ops = real_dev-&gt;netdev_ops;</div><div class='del'>-	int rc = -EINVAL;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_fcoe_ddp_target)</div><div class='add'>+		rc = ops-&gt;ndo_fcoe_ddp_target(real_dev, xid, sgl, sgc);</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;ndo_fcoe_get_wwn)</div><div class='del'>-		rc = ops-&gt;ndo_fcoe_get_wwn(real_dev, wwn, type);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid,</div><div class='del'>-				    struct scatterlist *sgl, unsigned int sgc)</div><div class='add'>+#ifdef NETDEV_FCOE_WWNN</div><div class='add'>+static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='ctx'> 	const struct net_device_ops *ops = real_dev-&gt;netdev_ops;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;ndo_fcoe_ddp_target)</div><div class='del'>-		rc = ops-&gt;ndo_fcoe_ddp_target(real_dev, xid, sgl, sgc);</div><div class='add'>+	int rc = -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (ops-&gt;ndo_fcoe_get_wwn)</div><div class='add'>+		rc = ops-&gt;ndo_fcoe_get_wwn(real_dev, wwn, type);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -473,12 +468,10 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='del'>-		if (change &amp; IFF_ALLMULTI)</div><div class='del'>-			dev_set_allmulti(real_dev, dev-&gt;flags &amp; IFF_ALLMULTI ? 1 : -1);</div><div class='del'>-		if (change &amp; IFF_PROMISC)</div><div class='del'>-			dev_set_promiscuity(real_dev, dev-&gt;flags &amp; IFF_PROMISC ? 1 : -1);</div><div class='del'>-	}</div><div class='add'>+	if (change &amp; IFF_ALLMULTI)</div><div class='add'>+		dev_set_allmulti(real_dev, dev-&gt;flags &amp; IFF_ALLMULTI ? 1 : -1);</div><div class='add'>+	if (change &amp; IFF_PROMISC)</div><div class='add'>+		dev_set_promiscuity(real_dev, dev-&gt;flags &amp; IFF_PROMISC ? 1 : -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)</div><div class='hunk'>@@ -487,39 +480,17 @@ static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)</div><div class='ctx'> 	dev_uc_sync(vlan_dev_priv(vlan_dev)-&gt;real_dev, vlan_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * vlan network devices have devices nesting below it, and are a special</div><div class='del'>- * "super class" of normal network devices; split their locks off into a</div><div class='del'>- * separate class since they always nest.</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key vlan_netdev_xmit_lock_key;</div><div class='del'>-static struct lock_class_key vlan_netdev_addr_lock_key;</div><div class='del'>-</div><div class='del'>-static void vlan_dev_set_lockdep_one(struct net_device *dev,</div><div class='del'>-				     struct netdev_queue *txq,</div><div class='del'>-				     void *_subclass)</div><div class='del'>-{</div><div class='del'>-	lockdep_set_class_and_subclass(&amp;txq-&gt;_xmit_lock,</div><div class='del'>-				       &amp;vlan_netdev_xmit_lock_key,</div><div class='del'>-				       *(int *)_subclass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)</div><div class='add'>+static __be16 vlan_parse_protocol(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	lockdep_set_class_and_subclass(&amp;dev-&gt;addr_list_lock,</div><div class='del'>-				       &amp;vlan_netdev_addr_lock_key,</div><div class='del'>-				       subclass);</div><div class='del'>-	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &amp;subclass);</div><div class='del'>-}</div><div class='add'>+	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb-&gt;data);</div><div class='ctx'> </div><div class='del'>-static int vlan_dev_get_lock_subclass(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return vlan_dev_priv(dev)-&gt;nest_level;</div><div class='add'>+	return __vlan_get_protocol(skb, veth-&gt;h_vlan_proto, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct header_ops vlan_header_ops = {</div><div class='ctx'> 	.create	 = vlan_dev_hard_header,</div><div class='ctx'> 	.parse	 = eth_header_parse,</div><div class='add'>+	.parse_protocol = vlan_parse_protocol,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev,</div><div class='hunk'>@@ -539,9 +510,10 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev</div><div class='ctx'> static const struct header_ops vlan_passthru_header_ops = {</div><div class='ctx'> 	.create	 = vlan_passthru_hard_header,</div><div class='ctx'> 	.parse	 = eth_header_parse,</div><div class='add'>+	.parse_protocol = vlan_parse_protocol,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct device_type vlan_type = {</div><div class='add'>+static const struct device_type vlan_type = {</div><div class='ctx'> 	.name	= "vlan",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +521,8 @@ static const struct net_device_ops vlan_netdev_ops;</div><div class='ctx'> </div><div class='ctx'> static int vlan_dev_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='add'>+	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='add'>+	struct net_device *real_dev = vlan-&gt;real_dev;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -560,24 +533,35 @@ static int vlan_dev_init(struct net_device *dev)</div><div class='ctx'> 					  (1&lt;&lt;__LINK_STATE_DORMANT))) |</div><div class='ctx'> 		      (1&lt;&lt;__LINK_STATE_PRESENT);</div><div class='ctx'> </div><div class='add'>+	if (vlan-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING)</div><div class='add'>+		dev-&gt;state |= (1 &lt;&lt; __LINK_STATE_NOCARRIER);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;hw_features = NETIF_F_HW_CSUM | NETIF_F_SG |</div><div class='ctx'> 			   NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |</div><div class='add'>+			   NETIF_F_GSO_ENCAP_ALL |</div><div class='ctx'> 			   NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |</div><div class='del'>-			   NETIF_F_ALL_FCOE;</div><div class='add'>+			   NETIF_F_FCOE_CRC | NETIF_F_FSO;</div><div class='add'>+</div><div class='add'>+	if (real_dev-&gt;vlan_features &amp; NETIF_F_HW_MACSEC)</div><div class='add'>+		dev-&gt;hw_features |= NETIF_F_HW_MACSEC;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;features |= dev-&gt;hw_features | NETIF_F_LLTX;</div><div class='del'>-	dev-&gt;gso_max_size = real_dev-&gt;gso_max_size;</div><div class='del'>-	dev-&gt;gso_max_segs = real_dev-&gt;gso_max_segs;</div><div class='add'>+	dev-&gt;features |= dev-&gt;hw_features;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	dev-&gt;fcoe_mtu = true;</div><div class='add'>+	netif_inherit_tso_max(dev, real_dev);</div><div class='ctx'> 	if (dev-&gt;features &amp; NETIF_F_VLAN_FEATURES)</div><div class='ctx'> 		netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");</div><div class='ctx'> </div><div class='del'>-	dev-&gt;vlan_features = real_dev-&gt;vlan_features &amp; ~NETIF_F_ALL_FCOE;</div><div class='add'>+	dev-&gt;vlan_features = real_dev-&gt;vlan_features &amp;</div><div class='add'>+			     ~(NETIF_F_FCOE_CRC | NETIF_F_FSO);</div><div class='add'>+	dev-&gt;hw_enc_features = vlan_tnl_features(real_dev);</div><div class='add'>+	dev-&gt;mpls_features = real_dev-&gt;mpls_features;</div><div class='ctx'> </div><div class='ctx'> 	/* ipv6 shared card related stuff */</div><div class='ctx'> 	dev-&gt;dev_id = real_dev-&gt;dev_id;</div><div class='ctx'> </div><div class='ctx'> 	if (is_zero_ether_addr(dev-&gt;dev_addr)) {</div><div class='del'>-		ether_addr_copy(dev-&gt;dev_addr, real_dev-&gt;dev_addr);</div><div class='add'>+		eth_hw_addr_set(dev, real_dev-&gt;dev_addr);</div><div class='ctx'> 		dev-&gt;addr_assign_type = NET_ADDR_STOLEN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (is_zero_ether_addr(dev-&gt;broadcast))</div><div class='hunk'>@@ -588,8 +572,7 @@ static int vlan_dev_init(struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;needed_headroom = real_dev-&gt;needed_headroom;</div><div class='del'>-	if (vlan_hw_offload_capable(real_dev-&gt;features,</div><div class='del'>-				    vlan_dev_priv(dev)-&gt;vlan_proto)) {</div><div class='add'>+	if (vlan_hw_offload_capable(real_dev-&gt;features, vlan-&gt;vlan_proto)) {</div><div class='ctx'> 		dev-&gt;header_ops      = &amp;vlan_passthru_header_ops;</div><div class='ctx'> 		dev-&gt;hard_header_len = real_dev-&gt;hard_header_len;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -601,16 +584,20 @@ static int vlan_dev_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEVTYPE(dev, &amp;vlan_type);</div><div class='ctx'> </div><div class='del'>-	vlan_dev_set_lockdep_class(dev, vlan_dev_get_lock_subclass(dev));</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> </div><div class='del'>-	vlan_dev_priv(dev)-&gt;vlan_pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);</div><div class='del'>-	if (!vlan_dev_priv(dev)-&gt;vlan_pcpu_stats)</div><div class='add'>+	vlan-&gt;vlan_pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);</div><div class='add'>+	if (!vlan-&gt;vlan_pcpu_stats)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	/* Get vlan's reference to real_dev */</div><div class='add'>+	netdev_hold(real_dev, &amp;vlan-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vlan_dev_uninit(struct net_device *dev)</div><div class='add'>+/* Note: this function might be called multiple times for the same device. */</div><div class='add'>+void vlan_dev_free_egress_priority(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_priority_tci_mapping *pm;</div><div class='ctx'> 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='hunk'>@@ -624,6 +611,11 @@ static void vlan_dev_uninit(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vlan_dev_uninit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	vlan_dev_free_egress_priority(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_features_t vlan_dev_fix_features(struct net_device *dev,</div><div class='ctx'> 	netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -642,7 +634,6 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,</div><div class='ctx'> 		lower_features |= NETIF_F_HW_CSUM;</div><div class='ctx'> 	features = netdev_intersect_features(features, lower_features);</div><div class='ctx'> 	features |= old_features &amp; (NETIF_F_SOFT_FEATURES | NETIF_F_GSO_SOFTWARE);</div><div class='del'>-	features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='hunk'>@@ -658,29 +649,16 @@ static int vlan_ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> static void vlan_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				     struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, vlan_fullname, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, vlan_version, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;driver, vlan_fullname, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, vlan_version, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vlan_ethtool_get_ts_info(struct net_device *dev,</div><div class='del'>-				    struct ethtool_ts_info *info)</div><div class='add'>+				    struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='del'>-	const struct ethtool_ops *ops = vlan-&gt;real_dev-&gt;ethtool_ops;</div><div class='del'>-	struct phy_device *phydev = vlan-&gt;real_dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	if (phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;ts_info) {</div><div class='del'>-		 return phydev-&gt;drv-&gt;ts_info(phydev, info);</div><div class='del'>-	} else if (ops-&gt;get_ts_info) {</div><div class='del'>-		return ops-&gt;get_ts_info(vlan-&gt;real_dev, info);</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-			SOF_TIMESTAMPING_SOFTWARE;</div><div class='del'>-		info-&gt;phc_index = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ethtool_get_ts_info_by_layer(vlan-&gt;real_dev, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vlan_dev_get_stats64(struct net_device *dev,</div><div class='hunk'>@@ -696,13 +674,13 @@ static void vlan_dev_get_stats64(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		p = per_cpu_ptr(vlan_dev_priv(dev)-&gt;vlan_pcpu_stats, i);</div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;p-&gt;syncp);</div><div class='del'>-			rxpackets	= p-&gt;rx_packets;</div><div class='del'>-			rxbytes		= p-&gt;rx_bytes;</div><div class='del'>-			rxmulticast	= p-&gt;rx_multicast;</div><div class='del'>-			txpackets	= p-&gt;tx_packets;</div><div class='del'>-			txbytes		= p-&gt;tx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;p-&gt;syncp, start));</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;p-&gt;syncp);</div><div class='add'>+			rxpackets	= u64_stats_read(&amp;p-&gt;rx_packets);</div><div class='add'>+			rxbytes		= u64_stats_read(&amp;p-&gt;rx_bytes);</div><div class='add'>+			rxmulticast	= u64_stats_read(&amp;p-&gt;rx_multicast);</div><div class='add'>+			txpackets	= u64_stats_read(&amp;p-&gt;tx_packets);</div><div class='add'>+			txbytes		= u64_stats_read(&amp;p-&gt;tx_bytes);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;p-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;rx_packets	+= rxpackets;</div><div class='ctx'> 		stats-&gt;rx_bytes		+= rxbytes;</div><div class='hunk'>@@ -710,8 +688,8 @@ static void vlan_dev_get_stats64(struct net_device *dev,</div><div class='ctx'> 		stats-&gt;tx_packets	+= txpackets;</div><div class='ctx'> 		stats-&gt;tx_bytes		+= txbytes;</div><div class='ctx'> 		/* rx_errors &amp; tx_dropped are u32 */</div><div class='del'>-		rx_errors	+= p-&gt;rx_errors;</div><div class='del'>-		tx_dropped	+= p-&gt;tx_dropped;</div><div class='add'>+		rx_errors	+= READ_ONCE(p-&gt;rx_errors);</div><div class='add'>+		tx_dropped	+= READ_ONCE(p-&gt;tx_dropped);</div><div class='ctx'> 	}</div><div class='ctx'> 	stats-&gt;rx_errors  = rx_errors;</div><div class='ctx'> 	stats-&gt;tx_dropped = tx_dropped;</div><div class='hunk'>@@ -723,7 +701,7 @@ static void vlan_dev_poll_controller(struct net_device *dev)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)</div><div class='add'>+static int vlan_dev_netpoll_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='ctx'> 	struct net_device *real_dev = vlan-&gt;real_dev;</div><div class='hunk'>@@ -756,18 +734,272 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	vlan-&gt;netpoll = NULL;</div><div class='del'>-</div><div class='del'>-	__netpoll_free_async(netpoll);</div><div class='add'>+	__netpoll_free(netpoll);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_NET_POLL_CONTROLLER */</div><div class='ctx'> </div><div class='ctx'> static int vlan_dev_get_iflink(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='add'>+	const struct net_device *real_dev = vlan_dev_priv(dev)-&gt;real_dev;</div><div class='add'>+</div><div class='add'>+	return READ_ONCE(real_dev-&gt;ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx,</div><div class='add'>+				      struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct vlan_dev_priv *vlan = vlan_dev_priv(ctx-&gt;dev);</div><div class='add'>+</div><div class='add'>+	path-&gt;type = DEV_PATH_VLAN;</div><div class='add'>+	path-&gt;encap.id = vlan-&gt;vlan_id;</div><div class='add'>+	path-&gt;encap.proto = vlan-&gt;vlan_proto;</div><div class='add'>+	path-&gt;dev = ctx-&gt;dev;</div><div class='add'>+	ctx-&gt;dev = vlan-&gt;real_dev;</div><div class='add'>+	if (ctx-&gt;num_vlans &gt;= ARRAY_SIZE(ctx-&gt;vlan))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;vlan[ctx-&gt;num_vlans].id = vlan-&gt;vlan_id;</div><div class='add'>+	ctx-&gt;vlan[ctx-&gt;num_vlans].proto = vlan-&gt;vlan_proto;</div><div class='add'>+	ctx-&gt;num_vlans++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+</div><div class='add'>+static const struct macsec_ops *vlan_get_macsec_ops(const struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return vlan_dev_priv(ctx-&gt;netdev)-&gt;real_dev-&gt;macsec_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_offload(int (* const func)(struct macsec_context *),</div><div class='add'>+			       struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!func))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (*func)(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_dev_open(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_dev_open, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_dev_stop(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_dev_stop, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_add_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_add_secy, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_upd_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_upd_secy, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_del_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_del_secy, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_add_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_add_rxsc, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_upd_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_upd_rxsc, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_del_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_del_rxsc, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_add_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_add_rxsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_upd_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_upd_rxsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_del_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_del_rxsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_add_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_add_txsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_upd_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_upd_txsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_del_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_del_txsa, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_get_dev_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_get_dev_stats, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_get_tx_sc_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return real_dev-&gt;ifindex;</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_get_tx_sc_stats, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vlan_macsec_get_tx_sa_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_get_tx_sa_stats, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_get_rx_sc_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_get_rx_sc_stats, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_macsec_get_rx_sa_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vlan_macsec_offload(ops-&gt;mdo_get_rx_sa_stats, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct macsec_ops macsec_offload_ops = {</div><div class='add'>+	/* Device wide */</div><div class='add'>+	.mdo_dev_open = vlan_macsec_dev_open,</div><div class='add'>+	.mdo_dev_stop = vlan_macsec_dev_stop,</div><div class='add'>+	/* SecY */</div><div class='add'>+	.mdo_add_secy = vlan_macsec_add_secy,</div><div class='add'>+	.mdo_upd_secy = vlan_macsec_upd_secy,</div><div class='add'>+	.mdo_del_secy = vlan_macsec_del_secy,</div><div class='add'>+	/* Security channels */</div><div class='add'>+	.mdo_add_rxsc = vlan_macsec_add_rxsc,</div><div class='add'>+	.mdo_upd_rxsc = vlan_macsec_upd_rxsc,</div><div class='add'>+	.mdo_del_rxsc = vlan_macsec_del_rxsc,</div><div class='add'>+	/* Security associations */</div><div class='add'>+	.mdo_add_rxsa = vlan_macsec_add_rxsa,</div><div class='add'>+	.mdo_upd_rxsa = vlan_macsec_upd_rxsa,</div><div class='add'>+	.mdo_del_rxsa = vlan_macsec_del_rxsa,</div><div class='add'>+	.mdo_add_txsa = vlan_macsec_add_txsa,</div><div class='add'>+	.mdo_upd_txsa = vlan_macsec_upd_txsa,</div><div class='add'>+	.mdo_del_txsa = vlan_macsec_del_txsa,</div><div class='add'>+	/* Statistics */</div><div class='add'>+	.mdo_get_dev_stats = vlan_macsec_get_dev_stats,</div><div class='add'>+	.mdo_get_tx_sc_stats = vlan_macsec_get_tx_sc_stats,</div><div class='add'>+	.mdo_get_tx_sa_stats = vlan_macsec_get_tx_sa_stats,</div><div class='add'>+	.mdo_get_rx_sc_stats = vlan_macsec_get_rx_sc_stats,</div><div class='add'>+	.mdo_get_rx_sa_stats = vlan_macsec_get_rx_sa_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops vlan_ethtool_ops = {</div><div class='ctx'> 	.get_link_ksettings	= vlan_ethtool_get_link_ksettings,</div><div class='ctx'> 	.get_drvinfo	        = vlan_ethtool_get_drvinfo,</div><div class='hunk'>@@ -786,7 +1018,7 @@ static const struct net_device_ops vlan_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= vlan_dev_set_mac_address,</div><div class='ctx'> 	.ndo_set_rx_mode	= vlan_dev_set_rx_mode,</div><div class='ctx'> 	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,</div><div class='del'>-	.ndo_do_ioctl		= vlan_dev_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= vlan_dev_ioctl,</div><div class='ctx'> 	.ndo_neigh_setup	= vlan_dev_neigh_setup,</div><div class='ctx'> 	.ndo_get_stats64	= vlan_dev_get_stats64,</div><div class='ctx'> #if IS_ENABLED(CONFIG_FCOE)</div><div class='hunk'>@@ -794,17 +1026,21 @@ static const struct net_device_ops vlan_netdev_ops = {</div><div class='ctx'> 	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,</div><div class='ctx'> 	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,</div><div class='ctx'> 	.ndo_fcoe_disable	= vlan_dev_fcoe_disable,</div><div class='del'>-	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,</div><div class='ctx'> 	.ndo_fcoe_ddp_target	= vlan_dev_fcoe_ddp_target,</div><div class='ctx'> #endif</div><div class='add'>+#ifdef NETDEV_FCOE_WWNN</div><div class='add'>+	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= vlan_dev_poll_controller,</div><div class='ctx'> 	.ndo_netpoll_setup	= vlan_dev_netpoll_setup,</div><div class='ctx'> 	.ndo_netpoll_cleanup	= vlan_dev_netpoll_cleanup,</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_fix_features	= vlan_dev_fix_features,</div><div class='del'>-	.ndo_get_lock_subclass  = vlan_dev_get_lock_subclass,</div><div class='ctx'> 	.ndo_get_iflink		= vlan_dev_get_iflink,</div><div class='add'>+	.ndo_fill_forward_path	= vlan_dev_fill_forward_path,</div><div class='add'>+	.ndo_hwtstamp_get	= vlan_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= vlan_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void vlan_dev_free(struct net_device *dev)</div><div class='hunk'>@@ -813,6 +1049,9 @@ static void vlan_dev_free(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	free_percpu(vlan-&gt;vlan_pcpu_stats);</div><div class='ctx'> 	vlan-&gt;vlan_pcpu_stats = NULL;</div><div class='add'>+</div><div class='add'>+	/* Get rid of the vlan's reference to real_dev */</div><div class='add'>+	netdev_put(vlan-&gt;real_dev, &amp;vlan-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vlan_setup(struct net_device *dev)</div><div class='hunk'>@@ -829,6 +1068,9 @@ void vlan_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;priv_destructor	= vlan_dev_free;</div><div class='ctx'> 	dev-&gt;ethtool_ops	= &amp;vlan_ethtool_ops;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	dev-&gt;macsec_ops		= &amp;macsec_offload_ops;</div><div class='add'>+#endif</div><div class='ctx'> 	dev-&gt;min_mtu		= 0;</div><div class='ctx'> 	dev-&gt;max_mtu		= ETH_MAX_MTU;</div><div class='ctx'> </div><div class='head'>diff --git a/net/8021q/vlan_gvrp.c b/net/8021q/vlan_gvrp.c<br/>index 66a80320b032..6b34b72aa466 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_gvrp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_gvrp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_gvrp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan_gvrp.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * 	IEEE 802.1Q GARP VLAN Registration Protocol (GVRP)</div><div class='ctx'>  *</div><div class='ctx'>  * 	Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='head'>diff --git a/net/8021q/vlan_mvrp.c b/net/8021q/vlan_mvrp.c<br/>index e0fe091801b0..689eceeaa360 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_mvrp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_mvrp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_mvrp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan_mvrp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *	IEEE 802.1Q Multiple VLAN Registration Protocol (MVRP)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Adapted from code in net/8021q/vlan_gvrp.c</div><div class='ctx'>  *	Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='head'>diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c<br/>index 9b60c1e399e2..a000b1ef0520 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlan_netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlan_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlan_netlink.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *	VLAN netlink control interface</div><div class='ctx'>  *</div><div class='ctx'>  * 	Copyright (c) 2007 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -35,8 +32,8 @@ static inline int vlan_validate_qos_map(struct nlattr *attr)</div><div class='ctx'> {</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return nla_validate_nested(attr, IFLA_VLAN_QOS_MAX, vlan_map_policy,</div><div class='del'>-				   NULL);</div><div class='add'>+	return nla_validate_nested_deprecated(attr, IFLA_VLAN_QOS_MAX,</div><div class='add'>+					      vlan_map_policy, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vlan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='hunk'>@@ -84,7 +81,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 		flags = nla_data(data[IFLA_VLAN_FLAGS]);</div><div class='ctx'> 		if ((flags-&gt;flags &amp; flags-&gt;mask) &amp;</div><div class='ctx'> 		    ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |</div><div class='del'>-		      VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP)) {</div><div class='add'>+		      VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP |</div><div class='add'>+		      VLAN_FLAG_BRIDGE_BINDING)) {</div><div class='ctx'> 			NL_SET_ERR_MSG_MOD(extack, "Invalid VLAN flags");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -110,32 +108,41 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	struct ifla_vlan_flags *flags;</div><div class='ctx'> 	struct ifla_vlan_qos_mapping *m;</div><div class='ctx'> 	struct nlattr *attr;</div><div class='del'>-	int rem;</div><div class='add'>+	int rem, err;</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_VLAN_FLAGS]) {</div><div class='ctx'> 		flags = nla_data(data[IFLA_VLAN_FLAGS]);</div><div class='del'>-		vlan_dev_change_flags(dev, flags-&gt;flags, flags-&gt;mask);</div><div class='add'>+		err = vlan_dev_change_flags(dev, flags-&gt;flags, flags-&gt;mask);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (data[IFLA_VLAN_INGRESS_QOS]) {</div><div class='del'>-		nla_for_each_nested(attr, data[IFLA_VLAN_INGRESS_QOS], rem) {</div><div class='add'>+		nla_for_each_nested_type(attr, IFLA_VLAN_QOS_MAPPING,</div><div class='add'>+					 data[IFLA_VLAN_INGRESS_QOS], rem) {</div><div class='ctx'> 			m = nla_data(attr);</div><div class='ctx'> 			vlan_dev_set_ingress_priority(dev, m-&gt;to, m-&gt;from);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (data[IFLA_VLAN_EGRESS_QOS]) {</div><div class='del'>-		nla_for_each_nested(attr, data[IFLA_VLAN_EGRESS_QOS], rem) {</div><div class='add'>+		nla_for_each_nested_type(attr, IFLA_VLAN_QOS_MAPPING,</div><div class='add'>+					 data[IFLA_VLAN_EGRESS_QOS], rem) {</div><div class='ctx'> 			m = nla_data(attr);</div><div class='del'>-			vlan_dev_set_egress_priority(dev, m-&gt;from, m-&gt;to);</div><div class='add'>+			err = vlan_dev_set_egress_priority(dev, m-&gt;from, m-&gt;to);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vlan_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int vlan_newlink(struct net_device *dev,</div><div class='add'>+			struct rtnl_newlink_params *params,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct net *link_net = rtnl_newlink_link_net(params);</div><div class='ctx'> 	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct net_device *real_dev;</div><div class='ctx'> 	unsigned int max_mtu;</div><div class='ctx'> 	__be16 proto;</div><div class='hunk'>@@ -151,16 +158,14 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	real_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));</div><div class='add'>+	real_dev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK]));</div><div class='ctx'> 	if (!real_dev) {</div><div class='ctx'> 		NL_SET_ERR_MSG_MOD(extack, "link does not exist");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data[IFLA_VLAN_PROTOCOL])</div><div class='del'>-		proto = nla_get_be16(data[IFLA_VLAN_PROTOCOL]);</div><div class='del'>-	else</div><div class='del'>-		proto = htons(ETH_P_8021Q);</div><div class='add'>+	proto = nla_get_be16_default(data[IFLA_VLAN_PROTOCOL],</div><div class='add'>+				     htons(ETH_P_8021Q));</div><div class='ctx'> </div><div class='ctx'> 	vlan-&gt;vlan_proto = proto;</div><div class='ctx'> 	vlan-&gt;vlan_id	 = nla_get_u16(data[IFLA_VLAN_ID]);</div><div class='hunk'>@@ -180,11 +185,17 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 	else if (dev-&gt;mtu &gt; max_mtu)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Note: If this initial vlan_changelink() fails, we need</div><div class='add'>+	 * to call vlan_dev_free_egress_priority() to free memory.</div><div class='add'>+	 */</div><div class='ctx'> 	err = vlan_changelink(dev, tb, data, extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='del'>-	return register_vlan_dev(dev, extack);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = register_vlan_dev(dev, extack);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		vlan_dev_free_egress_priority(dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline size_t vlan_qos_map_size(unsigned int n)</div><div class='hunk'>@@ -226,7 +237,7 @@ static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (vlan-&gt;nr_ingress_mappings) {</div><div class='del'>-		nest = nla_nest_start(skb, IFLA_VLAN_INGRESS_QOS);</div><div class='add'>+		nest = nla_nest_start_noflag(skb, IFLA_VLAN_INGRESS_QOS);</div><div class='ctx'> 		if (nest == NULL)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +255,7 @@ static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vlan-&gt;nr_egress_mappings) {</div><div class='del'>-		nest = nla_nest_start(skb, IFLA_VLAN_EGRESS_QOS);</div><div class='add'>+		nest = nla_nest_start_noflag(skb, IFLA_VLAN_EGRESS_QOS);</div><div class='ctx'> 		if (nest == NULL)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='head'>diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c<br/>index d36e8c4b7f56..fa67374bda49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/8021q/vlanproc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/8021q/vlanproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/8021q/vlanproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/8021q/vlanproc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * vlanproc.c	VLAN Module. /proc filesystem interface.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,10 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright:	(c) 1998 Ben Greear</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  * ============================================================================</div><div class='ctx'>  * Jan 20, 1998        Ben Greear     Initial Version</div><div class='ctx'>  *****************************************************************************/</div><div class='hunk'>@@ -166,48 +163,34 @@ void vlan_proc_rem_dev(struct net_device *vlandev)</div><div class='ctx'>  * The following few functions build the content of /proc/net/vlan/config</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* start read of /proc/net/vlan/config */</div><div class='del'>-static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-	__acquires(rcu)</div><div class='add'>+static void *vlan_seq_from_index(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='add'>+	unsigned long ifindex = *pos;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='del'>-	loff_t i = 1;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (*pos == 0)</div><div class='del'>-		return SEQ_START_TOKEN;</div><div class='ctx'> </div><div class='del'>-	for_each_netdev_rcu(net, dev) {</div><div class='add'>+	for_each_netdev_dump(seq_file_net(seq), dev, ifindex) {</div><div class='ctx'> 		if (!is_vlan_dev(dev))</div><div class='ctx'> 			continue;</div><div class='del'>-</div><div class='del'>-		if (i++ == *pos)</div><div class='del'>-			return dev;</div><div class='add'>+		*pos = dev-&gt;ifindex;</div><div class='add'>+		return dev;</div><div class='ctx'> 	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+	__acquires(rcu)</div><div class='add'>+{</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (*pos == 0)</div><div class='add'>+		return SEQ_START_TOKEN;</div><div class='ctx'> </div><div class='del'>-	return  NULL;</div><div class='add'>+	return vlan_seq_from_index(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='del'>-</div><div class='ctx'> 	++*pos;</div><div class='del'>-</div><div class='del'>-	dev = v;</div><div class='del'>-	if (v == SEQ_START_TOKEN)</div><div class='del'>-		dev = net_device_entry(&amp;net-&gt;dev_base_head);</div><div class='del'>-</div><div class='del'>-	for_each_netdev_continue_rcu(net, dev) {</div><div class='del'>-		if (!is_vlan_dev(dev))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		return dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+	return vlan_seq_from_index(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vlan_seq_stop(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -255,9 +238,9 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> </div><div class='ctx'> 	stats = dev_get_stats(vlandev, &amp;temp);</div><div class='ctx'> 	seq_printf(seq,</div><div class='del'>-		   "%s  VID: %d	 REORDER_HDR: %i  dev-&gt;priv_flags: %hx\n",</div><div class='add'>+		   "%s  VID: %d	 REORDER_HDR: %i  dev-&gt;priv_flags: %x\n",</div><div class='ctx'> 		   vlandev-&gt;name, vlan-&gt;vlan_id,</div><div class='del'>-		   (int)(vlan-&gt;flags &amp; 1), vlandev-&gt;priv_flags);</div><div class='add'>+		   (int)(vlan-&gt;flags &amp; 1), (u32)vlandev-&gt;priv_flags);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, fmt64, "total frames received", stats-&gt;rx_packets);</div><div class='ctx'> 	seq_printf(seq, fmt64, "total bytes received", stats-&gt;rx_bytes);</div><div class='hunk'>@@ -283,7 +266,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		const struct vlan_priority_tci_mapping *mp</div><div class='ctx'> 			= vlan-&gt;egress_priority_map[i];</div><div class='ctx'> 		while (mp) {</div><div class='del'>-			seq_printf(seq, "%u:%hu ",</div><div class='add'>+			seq_printf(seq, "%u:%d ",</div><div class='ctx'> 				   mp-&gt;priority, ((mp-&gt;vlan_qos &gt;&gt; 13) &amp; 0x7));</div><div class='ctx'> 			mp = mp-&gt;next;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/net/9p/Kconfig b/net/9p/Kconfig<br/>index e6014e0e51f7..22f8c167845d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # 9P protocol configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig NET_9P</div><div class='del'>-	depends on NET</div><div class='ctx'> 	tristate "Plan 9 Resource Sharing Support (9P2000)"</div><div class='add'>+	select NETFS_SUPPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, you will get experimental support for</div><div class='ctx'> 	  Plan 9 resource sharing via the 9P2000 protocol.</div><div class='hunk'>@@ -15,6 +16,15 @@ menuconfig NET_9P</div><div class='ctx'> </div><div class='ctx'> if NET_9P</div><div class='ctx'> </div><div class='add'>+config NET_9P_FD</div><div class='add'>+	default NET_9P</div><div class='add'>+	imply INET</div><div class='add'>+	imply UNIX</div><div class='add'>+	tristate "9P FD Transport"</div><div class='add'>+	help</div><div class='add'>+	  This builds support for transports over TCP, Unix sockets and</div><div class='add'>+	  filedescriptors.</div><div class='add'>+</div><div class='ctx'> config NET_9P_VIRTIO</div><div class='ctx'> 	depends on VIRTIO</div><div class='ctx'> 	tristate "9P Virtio Transport"</div><div class='hunk'>@@ -30,6 +40,14 @@ config NET_9P_XEN</div><div class='ctx'> 	  This builds support for a transport for 9pfs between</div><div class='ctx'> 	  two Xen domains.</div><div class='ctx'> </div><div class='add'>+config NET_9P_USBG</div><div class='add'>+	tristate "9P USB Gadget Transport"</div><div class='add'>+	depends on USB_GADGET</div><div class='add'>+	select CONFIGFS_FS</div><div class='add'>+	select USB_LIBCOMPOSITE</div><div class='add'>+	help</div><div class='add'>+	  This builds support for a transport for 9pfs over</div><div class='add'>+	  usb gadget.</div><div class='ctx'> </div><div class='ctx'> config NET_9P_RDMA</div><div class='ctx'> 	depends on INET &amp;&amp; INFINIBAND &amp;&amp; INFINIBAND_ADDR_TRANS</div><div class='head'>diff --git a/net/9p/Makefile b/net/9p/Makefile<br/>index c0486cfc85d9..22794a451c3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/Makefile</a></div><div class='hunk'>@@ -1,18 +1,21 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_NET_9P) := 9pnet.o</div><div class='add'>+obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o</div><div class='ctx'> obj-$(CONFIG_NET_9P_XEN) += 9pnet_xen.o</div><div class='ctx'> obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o</div><div class='ctx'> obj-$(CONFIG_NET_9P_RDMA) += 9pnet_rdma.o</div><div class='add'>+obj-$(CONFIG_NET_9P_USBG) += 9pnet_usbg.o</div><div class='ctx'> </div><div class='ctx'> 9pnet-objs := \</div><div class='ctx'> 	mod.o \</div><div class='ctx'> 	client.o \</div><div class='ctx'> 	error.o \</div><div class='del'>-	util.o \</div><div class='ctx'> 	protocol.o \</div><div class='del'>-	trans_fd.o \</div><div class='ctx'> 	trans_common.o \</div><div class='ctx'> </div><div class='add'>+9pnet_fd-objs := \</div><div class='add'>+	trans_fd.o \</div><div class='add'>+</div><div class='ctx'> 9pnet_virtio-objs := \</div><div class='ctx'> 	trans_virtio.o \</div><div class='ctx'> </div><div class='hunk'>@@ -21,3 +24,6 @@ obj-$(CONFIG_NET_9P_RDMA) += 9pnet_rdma.o</div><div class='ctx'> </div><div class='ctx'> 9pnet_rdma-objs := \</div><div class='ctx'> 	trans_rdma.o \</div><div class='add'>+</div><div class='add'>+9pnet_usbg-objs := \</div><div class='add'>+	trans_usbg.o \</div><div class='head'>diff --git a/net/9p/client.c b/net/9p/client.c<br/>index deae53a7dffc..f60d1d041adb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/client.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/client.c</a></div><div class='hunk'>@@ -1,26 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * net/9p/clnt.c</div><div class='del'>- *</div><div class='ctx'>  * 9P Client</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *  Copyright (C) 2007 by Latchesar Ionkov &lt;lucho@ionkov.net&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -35,9 +18,10 @@</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/netfs.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> #include &lt;net/9p/transport.h&gt;</div><div class='ctx'> #include "protocol.h"</div><div class='hunk'>@@ -45,26 +29,9 @@</div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/9p.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-  * Client Option Parsing (code inspired by NFS code)</div><div class='del'>-  *  - a little lazy - parse all client options</div><div class='del'>-  */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	Opt_msize,</div><div class='del'>-	Opt_trans,</div><div class='del'>-	Opt_legacy,</div><div class='del'>-	Opt_version,</div><div class='del'>-	Opt_err,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_msize, "msize=%u"},</div><div class='del'>-	{Opt_legacy, "noextend"},</div><div class='del'>-	{Opt_trans, "trans=%s"},</div><div class='del'>-	{Opt_version, "version=%s"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='del'>-};</div><div class='add'>+/* Client Option Parsing (code inspired by NFS code)</div><div class='add'>+ *  - a little lazy - parse all client options</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> inline int p9_is_proto_dotl(struct p9_client *clnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -80,7 +47,7 @@ EXPORT_SYMBOL(p9_is_proto_dotu);</div><div class='ctx'> </div><div class='ctx'> int p9_show_client_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> {</div><div class='del'>-	if (clnt-&gt;msize != 8192)</div><div class='add'>+	if (clnt-&gt;msize != DEFAULT_MSIZE)</div><div class='ctx'> 		seq_printf(m, ",msize=%u", clnt-&gt;msize);</div><div class='ctx'> 	seq_printf(m, ",trans=%s", clnt-&gt;trans_mod-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -102,273 +69,226 @@ int p9_show_client_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_show_client_options);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Some error codes are taken directly from the server replies,</div><div class='add'>+/* Some error codes are taken directly from the server replies,</div><div class='ctx'>  * make sure they are valid.</div><div class='ctx'>  */</div><div class='ctx'> static int safe_errno(int err)</div><div class='ctx'> {</div><div class='del'>-	if ((err &gt; 0) || (err &lt; -MAX_ERRNO)) {</div><div class='add'>+	if (err &gt; 0 || err &lt; -MAX_ERRNO) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "Invalid error code %d\n", err);</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Interpret mount option for protocol version */</div><div class='del'>-static int get_protocol_version(char *s)</div><div class='del'>-{</div><div class='del'>-	int version = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!strcmp(s, "9p2000")) {</div><div class='del'>-		version = p9_proto_legacy;</div><div class='del'>-		p9_debug(P9_DEBUG_9P, "Protocol version: Legacy\n");</div><div class='del'>-	} else if (!strcmp(s, "9p2000.u")) {</div><div class='del'>-		version = p9_proto_2000u;</div><div class='del'>-		p9_debug(P9_DEBUG_9P, "Protocol version: 9P2000.u\n");</div><div class='del'>-	} else if (!strcmp(s, "9p2000.L")) {</div><div class='del'>-		version = p9_proto_2000L;</div><div class='del'>-		p9_debug(P9_DEBUG_9P, "Protocol version: 9P2000.L\n");</div><div class='del'>-	} else</div><div class='del'>-		pr_info("Unknown protocol version %s\n", s);</div><div class='del'>-</div><div class='del'>-	return version;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * parse_options - parse mount options into client structure</div><div class='del'>- * @opts: options string passed from mount</div><div class='del'>- * @clnt: existing v9fs client information</div><div class='del'>- *</div><div class='del'>- * Return 0 upon success, -ERRNO upon failure</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int parse_opts(char *opts, struct p9_client *clnt)</div><div class='add'>+static int apply_client_options(struct p9_client *clnt, struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	char *options, *tmp_options;</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	char *s;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> </div><div class='del'>-	clnt-&gt;proto_version = p9_proto_2000L;</div><div class='del'>-	clnt-&gt;msize = 8192;</div><div class='add'>+	clnt-&gt;msize = ctx-&gt;client_opts.msize;</div><div class='add'>+	clnt-&gt;trans_mod = ctx-&gt;client_opts.trans_mod;</div><div class='add'>+	ctx-&gt;client_opts.trans_mod = NULL;</div><div class='add'>+	clnt-&gt;proto_version = ctx-&gt;client_opts.proto_version;</div><div class='ctx'> </div><div class='del'>-	if (!opts)</div><div class='del'>-		return 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	tmp_options = kstrdup(opts, GFP_KERNEL);</div><div class='del'>-	if (!tmp_options) {</div><div class='del'>-		p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-			 "failed to allocate copy of option string\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	options = tmp_options;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token, r;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_msize:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			clnt-&gt;msize = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_trans:</div><div class='del'>-			s = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!s) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "problem allocating copy of trans arg\n");</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			v9fs_put_trans(clnt-&gt;trans_mod);</div><div class='del'>-			clnt-&gt;trans_mod = v9fs_get_trans_by_name(s);</div><div class='del'>-			if (clnt-&gt;trans_mod == NULL) {</div><div class='del'>-				pr_info("Could not find request transport: %s\n",</div><div class='del'>-					s);</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(s);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_legacy:</div><div class='del'>-			clnt-&gt;proto_version = p9_proto_legacy;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_version:</div><div class='del'>-			s = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!s) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "problem allocating copy of version arg\n");</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='del'>-			r = get_protocol_version(s);</div><div class='del'>-			if (r &lt; 0)</div><div class='del'>-				ret = r;</div><div class='del'>-			else</div><div class='del'>-				clnt-&gt;proto_version = r;</div><div class='del'>-			kfree(s);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			continue;</div><div class='add'>+static int p9_fcall_init(struct p9_client *c, struct p9_fcall *fc,</div><div class='add'>+			 int alloc_msize)</div><div class='add'>+{</div><div class='add'>+	if (likely(c-&gt;fcall_cache) &amp;&amp; alloc_msize == c-&gt;msize) {</div><div class='add'>+		fc-&gt;sdata = kmem_cache_alloc(c-&gt;fcall_cache, GFP_NOFS);</div><div class='add'>+		fc-&gt;cache = c-&gt;fcall_cache;</div><div class='add'>+		if (!fc-&gt;sdata &amp;&amp; c-&gt;trans_mod-&gt;supports_vmalloc) {</div><div class='add'>+			fc-&gt;sdata = kvmalloc(alloc_msize, GFP_NOFS);</div><div class='add'>+			fc-&gt;cache = NULL;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		if (c-&gt;trans_mod-&gt;supports_vmalloc)</div><div class='add'>+			fc-&gt;sdata = kvmalloc(alloc_msize, GFP_NOFS);</div><div class='add'>+		else</div><div class='add'>+			fc-&gt;sdata = kmalloc(alloc_msize, GFP_NOFS);</div><div class='add'>+		fc-&gt;cache = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-free_and_return:</div><div class='del'>-	if (ret)</div><div class='del'>-		v9fs_put_trans(clnt-&gt;trans_mod);</div><div class='del'>-	kfree(tmp_options);</div><div class='del'>-	return ret;</div><div class='add'>+	if (!fc-&gt;sdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	fc-&gt;capacity = alloc_msize;</div><div class='add'>+	fc-&gt;id = 0;</div><div class='add'>+	fc-&gt;tag = P9_NOTAG;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct p9_fcall *p9_fcall_alloc(int alloc_msize)</div><div class='add'>+void p9_fcall_fini(struct p9_fcall *fc)</div><div class='ctx'> {</div><div class='del'>-	struct p9_fcall *fc;</div><div class='del'>-	fc = kmalloc(sizeof(struct p9_fcall) + alloc_msize, GFP_NOFS);</div><div class='del'>-	if (!fc)</div><div class='del'>-		return NULL;</div><div class='del'>-	fc-&gt;capacity = alloc_msize;</div><div class='del'>-	fc-&gt;sdata = (char *) fc + sizeof(struct p9_fcall);</div><div class='del'>-	return fc;</div><div class='add'>+	/* sdata can be NULL for interrupted requests in trans_rdma,</div><div class='add'>+	 * and kmem_cache_free does not do NULL-check for us</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!fc-&gt;sdata))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;cache)</div><div class='add'>+		kmem_cache_free(fc-&gt;cache, fc-&gt;sdata);</div><div class='add'>+	else</div><div class='add'>+		kvfree(fc-&gt;sdata);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(p9_fcall_fini);</div><div class='add'>+</div><div class='add'>+static struct kmem_cache *p9_req_cache;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * p9_tag_alloc - lookup/allocate a request by tag</div><div class='del'>- * @c: client session to lookup tag within</div><div class='del'>- * @tag: numeric id for transaction</div><div class='del'>- *</div><div class='del'>- * this is a simple array lookup, but will grow the</div><div class='del'>- * request_slots as necessary to accommodate transaction</div><div class='del'>- * ids which did not previously have a slot.</div><div class='del'>- *</div><div class='del'>- * this code relies on the client spinlock to manage locks, its</div><div class='del'>- * possible we should switch to something else, but I'd rather</div><div class='del'>- * stick with something low-overhead for the common case.</div><div class='add'>+ * p9_tag_alloc - Allocate a new request.</div><div class='add'>+ * @c: Client session.</div><div class='add'>+ * @type: Transaction type.</div><div class='add'>+ * @t_size: Buffer size for holding this request</div><div class='add'>+ * (automatic calculation by format template if 0).</div><div class='add'>+ * @r_size: Buffer size for holding server's reply on this request</div><div class='add'>+ * (automatic calculation by format template if 0).</div><div class='add'>+ * @fmt: Format template for assembling 9p request message</div><div class='add'>+ * (see p9pdu_vwritef).</div><div class='add'>+ * @ap: Variable arguments to be fed to passed format template</div><div class='add'>+ * (see p9pdu_vwritef).</div><div class='ctx'>  *</div><div class='add'>+ * Context: Process context.</div><div class='add'>+ * Return: Pointer to new request.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static struct p9_req_t *</div><div class='del'>-p9_tag_alloc(struct p9_client *c, u16 tag, unsigned int max_size)</div><div class='add'>+p9_tag_alloc(struct p9_client *c, int8_t type, uint t_size, uint r_size,</div><div class='add'>+	      const char *fmt, va_list ap)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int row, col;</div><div class='del'>-	struct p9_req_t *req;</div><div class='del'>-	int alloc_msize = min(c-&gt;msize, max_size);</div><div class='del'>-</div><div class='del'>-	/* This looks up the original request by tag so we know which</div><div class='del'>-	 * buffer to read the data into */</div><div class='del'>-	tag++;</div><div class='del'>-</div><div class='del'>-	if (tag &gt;= c-&gt;max_tag) {</div><div class='del'>-		spin_lock_irqsave(&amp;c-&gt;lock, flags);</div><div class='del'>-		/* check again since original check was outside of lock */</div><div class='del'>-		while (tag &gt;= c-&gt;max_tag) {</div><div class='del'>-			row = (tag / P9_ROW_MAXTAG);</div><div class='del'>-			c-&gt;reqs[row] = kcalloc(P9_ROW_MAXTAG,</div><div class='del'>-					sizeof(struct p9_req_t), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-			if (!c-&gt;reqs[row]) {</div><div class='del'>-				pr_err("Couldn't grow tag array\n");</div><div class='del'>-				spin_unlock_irqrestore(&amp;c-&gt;lock, flags);</div><div class='del'>-				return ERR_PTR(-ENOMEM);</div><div class='del'>-			}</div><div class='del'>-			for (col = 0; col &lt; P9_ROW_MAXTAG; col++) {</div><div class='del'>-				req = &amp;c-&gt;reqs[row][col];</div><div class='del'>-				req-&gt;status = REQ_STATUS_IDLE;</div><div class='del'>-				init_waitqueue_head(&amp;req-&gt;wq);</div><div class='del'>-			}</div><div class='del'>-			c-&gt;max_tag += P9_ROW_MAXTAG;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;c-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	row = tag / P9_ROW_MAXTAG;</div><div class='del'>-	col = tag % P9_ROW_MAXTAG;</div><div class='add'>+	struct p9_req_t *req = kmem_cache_alloc(p9_req_cache, GFP_NOFS);</div><div class='add'>+	int alloc_tsize;</div><div class='add'>+	int alloc_rsize;</div><div class='add'>+	int tag;</div><div class='add'>+	va_list apc;</div><div class='ctx'> </div><div class='del'>-	req = &amp;c-&gt;reqs[row][col];</div><div class='del'>-	if (!req-&gt;tc)</div><div class='del'>-		req-&gt;tc = p9_fcall_alloc(alloc_msize);</div><div class='del'>-	if (!req-&gt;rc)</div><div class='del'>-		req-&gt;rc = p9_fcall_alloc(alloc_msize);</div><div class='del'>-	if (!req-&gt;tc || !req-&gt;rc)</div><div class='del'>-		goto grow_failed;</div><div class='add'>+	va_copy(apc, ap);</div><div class='add'>+	alloc_tsize = min_t(size_t, c-&gt;msize,</div><div class='add'>+			    t_size ?: p9_msg_buf_size(c, type, fmt, apc));</div><div class='add'>+	va_end(apc);</div><div class='add'>+</div><div class='add'>+	alloc_rsize = min_t(size_t, c-&gt;msize,</div><div class='add'>+			    r_size ?: p9_msg_buf_size(c, type + 1, fmt, ap));</div><div class='add'>+</div><div class='add'>+	if (!req)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	p9pdu_reset(req-&gt;tc);</div><div class='del'>-	p9pdu_reset(req-&gt;rc);</div><div class='add'>+	if (p9_fcall_init(c, &amp;req-&gt;tc, alloc_tsize))</div><div class='add'>+		goto free_req;</div><div class='add'>+	if (p9_fcall_init(c, &amp;req-&gt;rc, alloc_rsize))</div><div class='add'>+		goto free;</div><div class='ctx'> </div><div class='del'>-	req-&gt;tc-&gt;tag = tag-1;</div><div class='add'>+	p9pdu_reset(&amp;req-&gt;tc);</div><div class='add'>+	p9pdu_reset(&amp;req-&gt;rc);</div><div class='add'>+	req-&gt;t_err = 0;</div><div class='ctx'> 	req-&gt;status = REQ_STATUS_ALLOC;</div><div class='add'>+	/* refcount needs to be set to 0 before inserting into the idr</div><div class='add'>+	 * so p9_tag_lookup does not accept a request that is not fully</div><div class='add'>+	 * initialized. refcount_set to 2 below will mark request ready.</div><div class='add'>+	 */</div><div class='add'>+	refcount_set(&amp;req-&gt;refcount, 0);</div><div class='add'>+	init_waitqueue_head(&amp;req-&gt;wq);</div><div class='add'>+	INIT_LIST_HEAD(&amp;req-&gt;req_list);</div><div class='add'>+</div><div class='add'>+	idr_preload(GFP_NOFS);</div><div class='add'>+	spin_lock_irq(&amp;c-&gt;lock);</div><div class='add'>+	if (type == P9_TVERSION)</div><div class='add'>+		tag = idr_alloc(&amp;c-&gt;reqs, req, P9_NOTAG, P9_NOTAG + 1,</div><div class='add'>+				GFP_NOWAIT);</div><div class='add'>+	else</div><div class='add'>+		tag = idr_alloc(&amp;c-&gt;reqs, req, 0, P9_NOTAG, GFP_NOWAIT);</div><div class='add'>+	req-&gt;tc.tag = tag;</div><div class='add'>+	spin_unlock_irq(&amp;c-&gt;lock);</div><div class='add'>+	idr_preload_end();</div><div class='add'>+	if (tag &lt; 0)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	/* Init ref to two because in the general case there is one ref</div><div class='add'>+	 * that is put asynchronously by a writer thread, one ref</div><div class='add'>+	 * temporarily given by p9_tag_lookup and put by p9_client_cb</div><div class='add'>+	 * in the recv thread, and one ref put by p9_req_put in the</div><div class='add'>+	 * main thread. The only exception is virtio that does not use</div><div class='add'>+	 * p9_tag_lookup but does not have a writer thread either</div><div class='add'>+	 * (the write happens synchronously in the request/zc_request</div><div class='add'>+	 * callback), so p9_client_cb eats the second ref there</div><div class='add'>+	 * as the pointer is duplicated directly by virtqueue_add_sgs()</div><div class='add'>+	 */</div><div class='add'>+	refcount_set(&amp;req-&gt;refcount, 2);</div><div class='ctx'> </div><div class='ctx'> 	return req;</div><div class='ctx'> </div><div class='del'>-grow_failed:</div><div class='del'>-	pr_err("Couldn't grow tag array\n");</div><div class='del'>-	kfree(req-&gt;tc);</div><div class='del'>-	kfree(req-&gt;rc);</div><div class='del'>-	req-&gt;tc = req-&gt;rc = NULL;</div><div class='add'>+free:</div><div class='add'>+	p9_fcall_fini(&amp;req-&gt;tc);</div><div class='add'>+	p9_fcall_fini(&amp;req-&gt;rc);</div><div class='add'>+free_req:</div><div class='add'>+	kmem_cache_free(p9_req_cache, req);</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * p9_tag_lookup - lookup a request by tag</div><div class='del'>- * @c: client session to lookup tag within</div><div class='del'>- * @tag: numeric id for transaction</div><div class='add'>+ * p9_tag_lookup - Look up a request by tag.</div><div class='add'>+ * @c: Client session.</div><div class='add'>+ * @tag: Transaction ID.</div><div class='ctx'>  *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ * Return: A request, or %NULL if there is no request with that tag.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)</div><div class='ctx'> {</div><div class='del'>-	int row, col;</div><div class='del'>-</div><div class='del'>-	/* This looks up the original request by tag so we know which</div><div class='del'>-	 * buffer to read the data into */</div><div class='del'>-	tag++;</div><div class='del'>-</div><div class='del'>-	if (tag &gt;= c-&gt;max_tag)</div><div class='del'>-		return NULL;</div><div class='add'>+	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	row = tag / P9_ROW_MAXTAG;</div><div class='del'>-	col = tag % P9_ROW_MAXTAG;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+again:</div><div class='add'>+	req = idr_find(&amp;c-&gt;reqs, tag);</div><div class='add'>+	if (req) {</div><div class='add'>+		/* We have to be careful with the req found under rcu_read_lock</div><div class='add'>+		 * Thanks to SLAB_TYPESAFE_BY_RCU we can safely try to get the</div><div class='add'>+		 * ref again without corrupting other data, then check again</div><div class='add'>+		 * that the tag matches once we have the ref</div><div class='add'>+		 */</div><div class='add'>+		if (!p9_req_try_get(req))</div><div class='add'>+			goto again;</div><div class='add'>+		if (req-&gt;tc.tag != tag) {</div><div class='add'>+			p9_req_put(c, req);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return &amp;c-&gt;reqs[row][col];</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_tag_lookup);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * p9_tag_init - setup tags structure and contents</div><div class='del'>- * @c:  v9fs client struct</div><div class='del'>- *</div><div class='del'>- * This initializes the tags structure for each client instance.</div><div class='add'>+ * p9_tag_remove - Remove a tag.</div><div class='add'>+ * @c: Client session.</div><div class='add'>+ * @r: Request of reference.</div><div class='ctx'>  *</div><div class='add'>+ * Context: Any context.</div><div class='ctx'>  */</div><div class='add'>+static void p9_tag_remove(struct p9_client *c, struct p9_req_t *r)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 tag = r-&gt;tc.tag;</div><div class='ctx'> </div><div class='del'>-static int p9_tag_init(struct p9_client *c)</div><div class='add'>+	p9_debug(P9_DEBUG_MUX, "freeing clnt %p req %p tag: %d\n", c, r, tag);</div><div class='add'>+	spin_lock_irqsave(&amp;c-&gt;lock, flags);</div><div class='add'>+	idr_remove(&amp;c-&gt;reqs, tag);</div><div class='add'>+	spin_unlock_irqrestore(&amp;c-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int p9_req_put(struct p9_client *c, struct p9_req_t *r)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	if (refcount_dec_and_test(&amp;r-&gt;refcount)) {</div><div class='add'>+		p9_tag_remove(c, r);</div><div class='ctx'> </div><div class='del'>-	c-&gt;tagpool = p9_idpool_create();</div><div class='del'>-	if (IS_ERR(c-&gt;tagpool)) {</div><div class='del'>-		err = PTR_ERR(c-&gt;tagpool);</div><div class='del'>-		goto error;</div><div class='add'>+		p9_fcall_fini(&amp;r-&gt;tc);</div><div class='add'>+		p9_fcall_fini(&amp;r-&gt;rc);</div><div class='add'>+		kmem_cache_free(p9_req_cache, r);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	err = p9_idpool_get(c-&gt;tagpool); /* reserve tag 0 */</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		p9_idpool_destroy(c-&gt;tagpool);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	c-&gt;max_tag = 0;</div><div class='del'>-error:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(p9_req_put);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * p9_tag_cleanup - cleans up tags structure and reclaims resources</div><div class='hunk'>@@ -379,73 +299,39 @@ error:</div><div class='ctx'>  */</div><div class='ctx'> static void p9_tag_cleanup(struct p9_client *c)</div><div class='ctx'> {</div><div class='del'>-	int row, col;</div><div class='del'>-</div><div class='del'>-	/* check to insure all requests are idle */</div><div class='del'>-	for (row = 0; row &lt; (c-&gt;max_tag/P9_ROW_MAXTAG); row++) {</div><div class='del'>-		for (col = 0; col &lt; P9_ROW_MAXTAG; col++) {</div><div class='del'>-			if (c-&gt;reqs[row][col].status != REQ_STATUS_IDLE) {</div><div class='del'>-				p9_debug(P9_DEBUG_MUX,</div><div class='del'>-					 "Attempting to cleanup non-free tag %d,%d\n",</div><div class='del'>-					 row, col);</div><div class='del'>-				/* TODO: delay execution of cleanup */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;tagpool) {</div><div class='del'>-		p9_idpool_put(0, c-&gt;tagpool); /* free reserved tag 0 */</div><div class='del'>-		p9_idpool_destroy(c-&gt;tagpool);</div><div class='del'>-	}</div><div class='add'>+	struct p9_req_t *req;</div><div class='add'>+	int id;</div><div class='ctx'> </div><div class='del'>-	/* free requests associated with tags */</div><div class='del'>-	for (row = 0; row &lt; (c-&gt;max_tag/P9_ROW_MAXTAG); row++) {</div><div class='del'>-		for (col = 0; col &lt; P9_ROW_MAXTAG; col++) {</div><div class='del'>-			kfree(c-&gt;reqs[row][col].tc);</div><div class='del'>-			kfree(c-&gt;reqs[row][col].rc);</div><div class='del'>-		}</div><div class='del'>-		kfree(c-&gt;reqs[row]);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	idr_for_each_entry(&amp;c-&gt;reqs, req, id) {</div><div class='add'>+		pr_info("Tag %d still in use\n", id);</div><div class='add'>+		if (p9_req_put(c, req) == 0)</div><div class='add'>+			pr_warn("Packet with tag %d has still references",</div><div class='add'>+				req-&gt;tc.tag);</div><div class='ctx'> 	}</div><div class='del'>-	c-&gt;max_tag = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_free_req - free a request and clean-up as necessary</div><div class='del'>- * c: client state</div><div class='del'>- * r: request to release</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void p9_free_req(struct p9_client *c, struct p9_req_t *r)</div><div class='del'>-{</div><div class='del'>-	int tag = r-&gt;tc-&gt;tag;</div><div class='del'>-	p9_debug(P9_DEBUG_MUX, "clnt %p req %p tag: %d\n", c, r, tag);</div><div class='del'>-</div><div class='del'>-	r-&gt;status = REQ_STATUS_IDLE;</div><div class='del'>-	if (tag != P9_NOTAG &amp;&amp; p9_idpool_check(tag, c-&gt;tagpool))</div><div class='del'>-		p9_idpool_put(tag, c-&gt;tagpool);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * p9_client_cb - call back from transport to client</div><div class='del'>- * c: client state</div><div class='del'>- * req: request received</div><div class='add'>+ * @c: client state</div><div class='add'>+ * @req: request received</div><div class='add'>+ * @status: request status, one of REQ_STATUS_*</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status)</div><div class='ctx'> {</div><div class='del'>-	p9_debug(P9_DEBUG_MUX, " tag %d\n", req-&gt;tc-&gt;tag);</div><div class='add'>+	p9_debug(P9_DEBUG_MUX, " tag %d\n", req-&gt;tc.tag);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This barrier is needed to make sure any change made to req before</div><div class='add'>+	/* This barrier is needed to make sure any change made to req before</div><div class='ctx'> 	 * the status change is visible to another thread</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='del'>-	req-&gt;status = status;</div><div class='add'>+	WRITE_ONCE(req-&gt;status, status);</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;req-&gt;wq);</div><div class='del'>-	p9_debug(P9_DEBUG_MUX, "wakeup: %d\n", req-&gt;tc-&gt;tag);</div><div class='add'>+	p9_debug(P9_DEBUG_MUX, "wakeup: %d\n", req-&gt;tc.tag);</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_cb);</div><div class='ctx'> </div><div class='hunk'>@@ -459,12 +345,12 @@ EXPORT_SYMBOL(p9_client_cb);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-p9_parse_header(struct p9_fcall *pdu, int32_t *size, int8_t *type, int16_t *tag,</div><div class='del'>-								int rewind)</div><div class='add'>+p9_parse_header(struct p9_fcall *pdu, int32_t *size, int8_t *type,</div><div class='add'>+		int16_t *tag, int rewind)</div><div class='ctx'> {</div><div class='del'>-	int8_t r_type;</div><div class='del'>-	int16_t r_tag;</div><div class='del'>-	int32_t r_size;</div><div class='add'>+	s8 r_type;</div><div class='add'>+	s16 r_tag;</div><div class='add'>+	s32 r_size;</div><div class='ctx'> 	int offset = pdu-&gt;offset;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -512,22 +398,20 @@ EXPORT_SYMBOL(p9_parse_header);</div><div class='ctx'> </div><div class='ctx'> static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)</div><div class='ctx'> {</div><div class='del'>-	int8_t type;</div><div class='add'>+	s8 type;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int ecode;</div><div class='ctx'> </div><div class='del'>-	err = p9_parse_header(req-&gt;rc, NULL, &amp;type, NULL, 0);</div><div class='del'>-	if (req-&gt;rc-&gt;size &gt;= c-&gt;msize) {</div><div class='del'>-		p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-			 "requested packet size too big: %d\n",</div><div class='del'>-			 req-&gt;rc-&gt;size);</div><div class='add'>+	err = p9_parse_header(&amp;req-&gt;rc, NULL, &amp;type, NULL, 0);</div><div class='add'>+	if (req-&gt;rc.size &gt; req-&gt;rc.capacity &amp;&amp; !req-&gt;rc.zc) {</div><div class='add'>+		pr_err("requested packet size too big: %d does not fit %zu (type=%d)\n",</div><div class='add'>+		       req-&gt;rc.size, req-&gt;rc.capacity, req-&gt;rc.id);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * dump the response from server</div><div class='add'>+	/* dump the response from server</div><div class='ctx'> 	 * This should be after check errors which poplulate pdu_fcall.</div><div class='ctx'> 	 */</div><div class='del'>-	trace_9p_protocol_dump(c, req-&gt;rc);</div><div class='add'>+	trace_9p_protocol_dump(c, &amp;req-&gt;rc);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "couldn't parse header %d\n", err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -536,11 +420,14 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!p9_is_proto_dotl(c)) {</div><div class='del'>-		char *ename;</div><div class='del'>-		err = p9pdu_readf(req-&gt;rc, c-&gt;proto_version, "s?d",</div><div class='add'>+		char *ename = NULL;</div><div class='add'>+</div><div class='add'>+		err = p9pdu_readf(&amp;req-&gt;rc, c-&gt;proto_version, "s?d",</div><div class='ctx'> 				  &amp;ename, &amp;ecode);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(ename);</div><div class='ctx'> 			goto out_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (p9_is_proto_dotu(c) &amp;&amp; ecode &lt; 512)</div><div class='ctx'> 			err = -ecode;</div><div class='hunk'>@@ -553,101 +440,19 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(ename);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = p9pdu_readf(req-&gt;rc, c-&gt;proto_version, "d", &amp;ecode);</div><div class='del'>-		err = -ecode;</div><div class='del'>-</div><div class='del'>-		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RLERROR (%d)\n", -ecode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	p9_debug(P9_DEBUG_ERROR, "couldn't parse error%d\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_check_zc_errors - check 9p packet for error return and process it</div><div class='del'>- * @c: current client instance</div><div class='del'>- * @req: request to parse and check for error conditions</div><div class='del'>- * @in_hdrlen: Size of response protocol buffer.</div><div class='del'>- *</div><div class='del'>- * returns error code if one is discovered, otherwise returns 0</div><div class='del'>- *</div><div class='del'>- * this will have to be more complicated if we have multiple</div><div class='del'>- * error packet types</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,</div><div class='del'>-			      struct iov_iter *uidata, int in_hdrlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	int ecode;</div><div class='del'>-	int8_t type;</div><div class='del'>-	char *ename = NULL;</div><div class='del'>-</div><div class='del'>-	err = p9_parse_header(req-&gt;rc, NULL, &amp;type, NULL, 0);</div><div class='del'>-	/*</div><div class='del'>-	 * dump the response from server</div><div class='del'>-	 * This should be after parse_header which poplulate pdu_fcall.</div><div class='del'>-	 */</div><div class='del'>-	trace_9p_protocol_dump(c, req-&gt;rc);</div><div class='del'>-	if (err) {</div><div class='del'>-		p9_debug(P9_DEBUG_ERROR, "couldn't parse header %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type != P9_RERROR &amp;&amp; type != P9_RLERROR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!p9_is_proto_dotl(c)) {</div><div class='del'>-		/* Error is reported in string format */</div><div class='del'>-		int len;</div><div class='del'>-		/* 7 = header size for RERROR; */</div><div class='del'>-		int inline_len = in_hdrlen - 7;</div><div class='del'>-</div><div class='del'>-		len =  req-&gt;rc-&gt;size - req-&gt;rc-&gt;offset;</div><div class='del'>-		if (len &gt; (P9_ZC_HDR_SZ - 7)) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ename = &amp;req-&gt;rc-&gt;sdata[req-&gt;rc-&gt;offset];</div><div class='del'>-		if (len &gt; inline_len) {</div><div class='del'>-			/* We have error in external buffer */</div><div class='del'>-			if (!copy_from_iter_full(ename + inline_len,</div><div class='del'>-					     len - inline_len, uidata)) {</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-				goto out_err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ename = NULL;</div><div class='del'>-		err = p9pdu_readf(req-&gt;rc, c-&gt;proto_version, "s?d",</div><div class='del'>-				  &amp;ename, &amp;ecode);</div><div class='add'>+		err = p9pdu_readf(&amp;req-&gt;rc, c-&gt;proto_version, "d", &amp;ecode);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_err;</div><div class='del'>-</div><div class='del'>-		if (p9_is_proto_dotu(c) &amp;&amp; ecode &lt; 512)</div><div class='del'>-			err = -ecode;</div><div class='del'>-</div><div class='del'>-		if (!err) {</div><div class='del'>-			err = p9_errstr2errno(ename, strlen(ename));</div><div class='del'>-</div><div class='del'>-			p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RERROR (%d) %s\n",</div><div class='del'>-				 -ecode, ename);</div><div class='del'>-		}</div><div class='del'>-		kfree(ename);</div><div class='del'>-	} else {</div><div class='del'>-		err = p9pdu_readf(req-&gt;rc, c-&gt;proto_version, "d", &amp;ecode);</div><div class='ctx'> 		err = -ecode;</div><div class='ctx'> </div><div class='ctx'> 		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RLERROR (%d)\n", -ecode);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='ctx'> 	p9_debug(P9_DEBUG_ERROR, "couldn't parse error%d\n", err);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -669,10 +474,10 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...);</div><div class='ctx'> static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='del'>-	int16_t oldtag;</div><div class='add'>+	s16 oldtag;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = p9_parse_header(oldreq-&gt;tc, NULL, NULL, &amp;oldtag, 1);</div><div class='add'>+	err = p9_parse_header(&amp;oldreq-&gt;tc, NULL, NULL, &amp;oldtag, 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -682,24 +487,25 @@ static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq)</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * if we haven't received a response for oldreq,</div><div class='add'>+	/* if we haven't received a response for oldreq,</div><div class='ctx'> 	 * remove it from the list</div><div class='ctx'> 	 */</div><div class='del'>-	if (oldreq-&gt;status == REQ_STATUS_SENT)</div><div class='add'>+	if (READ_ONCE(oldreq-&gt;status) == REQ_STATUS_SENT) {</div><div class='ctx'> 		if (c-&gt;trans_mod-&gt;cancelled)</div><div class='ctx'> 			c-&gt;trans_mod-&gt;cancelled(c, oldreq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	p9_free_req(c, req);</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct p9_req_t *p9_client_prepare_req(struct p9_client *c,</div><div class='del'>-					      int8_t type, int req_size,</div><div class='add'>+					      int8_t type, uint t_size, uint r_size,</div><div class='ctx'> 					      const char *fmt, va_list ap)</div><div class='ctx'> {</div><div class='del'>-	int tag, err;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='add'>+	va_list apc;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_MUX, "client %p op %d\n", c, type);</div><div class='ctx'> </div><div class='hunk'>@@ -708,30 +514,27 @@ static struct p9_req_t *p9_client_prepare_req(struct p9_client *c,</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='ctx'> 	/* if status is begin_disconnected we allow only clunk request */</div><div class='del'>-	if ((c-&gt;status == BeginDisconnect) &amp;&amp; (type != P9_TCLUNK))</div><div class='add'>+	if (c-&gt;status == BeginDisconnect &amp;&amp; type != P9_TCLUNK)</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='del'>-	tag = P9_NOTAG;</div><div class='del'>-	if (type != P9_TVERSION) {</div><div class='del'>-		tag = p9_idpool_get(c-&gt;tagpool);</div><div class='del'>-		if (tag &lt; 0)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = p9_tag_alloc(c, tag, req_size);</div><div class='add'>+	va_copy(apc, ap);</div><div class='add'>+	req = p9_tag_alloc(c, type, t_size, r_size, fmt, apc);</div><div class='add'>+	va_end(apc);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return req;</div><div class='ctx'> </div><div class='ctx'> 	/* marshall the data */</div><div class='del'>-	p9pdu_prepare(req-&gt;tc, tag, type);</div><div class='del'>-	err = p9pdu_vwritef(req-&gt;tc, c-&gt;proto_version, fmt, ap);</div><div class='add'>+	p9pdu_prepare(&amp;req-&gt;tc, req-&gt;tc.tag, type);</div><div class='add'>+	err = p9pdu_vwritef(&amp;req-&gt;tc, c-&gt;proto_version, fmt, ap);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto reterr;</div><div class='del'>-	p9pdu_finalize(c, req-&gt;tc);</div><div class='del'>-	trace_9p_client_req(c, type, tag);</div><div class='add'>+	p9pdu_finalize(c, &amp;req-&gt;tc);</div><div class='add'>+	trace_9p_client_req(c, type, req-&gt;tc.tag);</div><div class='ctx'> 	return req;</div><div class='ctx'> reterr:</div><div class='del'>-	p9_free_req(c, req);</div><div class='add'>+	p9_req_put(c, req);</div><div class='add'>+	/* We have to put also the 2nd reference as it won't be used */</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -741,7 +544,7 @@ reterr:</div><div class='ctx'>  * @type: type of request</div><div class='ctx'>  * @fmt: protocol format string (see protocol.c)</div><div class='ctx'>  *</div><div class='del'>- * Returns request structure (which client must free using p9_free_req)</div><div class='add'>+ * Returns request structure (which client must free using p9_req_put)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct p9_req_t *</div><div class='hunk'>@@ -751,47 +554,62 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)</div><div class='ctx'> 	int sigpending, err;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='add'>+	/* Passing zero for tsize/rsize to p9_client_prepare_req() tells it to</div><div class='add'>+	 * auto determine an appropriate (small) request/response size</div><div class='add'>+	 * according to actual message data being sent. Currently RDMA</div><div class='add'>+	 * transport is excluded from this response message size optimization,</div><div class='add'>+	 * as it would not cope with it, due to its pooled response buffers</div><div class='add'>+	 * (using an optimized request size for RDMA as well though).</div><div class='add'>+	 */</div><div class='add'>+	const uint tsize = 0;</div><div class='add'>+	const uint rsize = c-&gt;trans_mod-&gt;pooled_rbuffers ? c-&gt;msize : 0;</div><div class='ctx'> </div><div class='ctx'> 	va_start(ap, fmt);</div><div class='del'>-	req = p9_client_prepare_req(c, type, c-&gt;msize, fmt, ap);</div><div class='add'>+	req = p9_client_prepare_req(c, type, tsize, rsize, fmt, ap);</div><div class='ctx'> 	va_end(ap);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return req;</div><div class='ctx'> </div><div class='add'>+	req-&gt;tc.zc = false;</div><div class='add'>+	req-&gt;rc.zc = false;</div><div class='add'>+</div><div class='ctx'> 	if (signal_pending(current)) {</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 		clear_thread_flag(TIF_SIGPENDING);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		sigpending = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = c-&gt;trans_mod-&gt;request(c, req);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='add'>+		/* write won't happen */</div><div class='add'>+		p9_req_put(c, req);</div><div class='ctx'> 		if (err != -ERESTARTSYS &amp;&amp; err != -EFAULT)</div><div class='ctx'> 			c-&gt;status = Disconnected;</div><div class='ctx'> 		goto recalc_sigpending;</div><div class='ctx'> 	}</div><div class='ctx'> again:</div><div class='ctx'> 	/* Wait for the response */</div><div class='del'>-	err = wait_event_killable(req-&gt;wq, req-&gt;status &gt;= REQ_STATUS_RCVD);</div><div class='add'>+	err = wait_event_killable(req-&gt;wq,</div><div class='add'>+				  READ_ONCE(req-&gt;status) &gt;= REQ_STATUS_RCVD);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure our req is coherent with regard to updates in other</div><div class='add'>+	/* Make sure our req is coherent with regard to updates in other</div><div class='ctx'> 	 * threads - echoes to wmb() in the callback</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> </div><div class='del'>-	if ((err == -ERESTARTSYS) &amp;&amp; (c-&gt;status == Connected)</div><div class='del'>-				  &amp;&amp; (type == P9_TFLUSH)) {</div><div class='add'>+	if (err == -ERESTARTSYS &amp;&amp; c-&gt;status == Connected &amp;&amp;</div><div class='add'>+	    type == P9_TFLUSH) {</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 		clear_thread_flag(TIF_SIGPENDING);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;status == REQ_STATUS_ERROR) {</div><div class='add'>+	if (READ_ONCE(req-&gt;status) == REQ_STATUS_ERROR) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "req_status error %d\n", req-&gt;t_err);</div><div class='ctx'> 		err = req-&gt;t_err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err == -ERESTARTSYS) &amp;&amp; (c-&gt;status == Connected)) {</div><div class='add'>+	if (err == -ERESTARTSYS &amp;&amp; c-&gt;status == Connected) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_MUX, "flushing\n");</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 		clear_thread_flag(TIF_SIGPENDING);</div><div class='hunk'>@@ -800,7 +618,7 @@ again:</div><div class='ctx'> 			p9_client_flush(c, req);</div><div class='ctx'> </div><div class='ctx'> 		/* if we received the response anyway, don't signal error */</div><div class='del'>-		if (req-&gt;status == REQ_STATUS_RCVD)</div><div class='add'>+		if (READ_ONCE(req-&gt;status) == REQ_STATUS_RCVD)</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> recalc_sigpending:</div><div class='hunk'>@@ -813,11 +631,11 @@ recalc_sigpending:</div><div class='ctx'> 		goto reterr;</div><div class='ctx'> </div><div class='ctx'> 	err = p9_check_errors(c, req);</div><div class='del'>-	trace_9p_client_res(c, type, req-&gt;rc-&gt;tag, err);</div><div class='add'>+	trace_9p_client_res(c, type, req-&gt;rc.tag, err);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return req;</div><div class='ctx'> reterr:</div><div class='del'>-	p9_free_req(c, req);</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> 	return ERR_PTR(safe_errno(err));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -829,10 +647,10 @@ reterr:</div><div class='ctx'>  * @uodata: source for zero copy write</div><div class='ctx'>  * @inlen: read buffer size</div><div class='ctx'>  * @olen: write buffer size</div><div class='del'>- * @hdrlen: reader header size, This is the size of response protocol data</div><div class='add'>+ * @in_hdrlen: reader header size, This is the size of response protocol data</div><div class='ctx'>  * @fmt: protocol format string (see protocol.c)</div><div class='ctx'>  *</div><div class='del'>- * Returns request structure (which client must free using p9_free_req)</div><div class='add'>+ * Returns request structure (which client must free using p9_req_put)</div><div class='ctx'>  */</div><div class='ctx'> static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type,</div><div class='ctx'> 					 struct iov_iter *uidata,</div><div class='hunk'>@@ -846,20 +664,23 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type,</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	va_start(ap, fmt);</div><div class='del'>-	/*</div><div class='del'>-	 * We allocate a inline protocol data of only 4k bytes.</div><div class='add'>+	/* We allocate a inline protocol data of only 4k bytes.</div><div class='ctx'> 	 * The actual content is passed in zero-copy fashion.</div><div class='ctx'> 	 */</div><div class='del'>-	req = p9_client_prepare_req(c, type, P9_ZC_HDR_SZ, fmt, ap);</div><div class='add'>+	req = p9_client_prepare_req(c, type, P9_ZC_HDR_SZ, P9_ZC_HDR_SZ, fmt, ap);</div><div class='ctx'> 	va_end(ap);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return req;</div><div class='ctx'> </div><div class='add'>+	req-&gt;tc.zc = true;</div><div class='add'>+	req-&gt;rc.zc = true;</div><div class='add'>+</div><div class='ctx'> 	if (signal_pending(current)) {</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 		clear_thread_flag(TIF_SIGPENDING);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		sigpending = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = c-&gt;trans_mod-&gt;zc_request(c, req, uidata, uodata,</div><div class='ctx'> 				       inlen, olen, in_hdrlen);</div><div class='hunk'>@@ -869,11 +690,11 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type,</div><div class='ctx'> 		if (err != -ERESTARTSYS)</div><div class='ctx'> 			goto recalc_sigpending;</div><div class='ctx'> 	}</div><div class='del'>-	if (req-&gt;status == REQ_STATUS_ERROR) {</div><div class='add'>+	if (READ_ONCE(req-&gt;status) == REQ_STATUS_ERROR) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "req_status error %d\n", req-&gt;t_err);</div><div class='ctx'> 		err = req-&gt;t_err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err == -ERESTARTSYS) &amp;&amp; (c-&gt;status == Connected)) {</div><div class='add'>+	if (err == -ERESTARTSYS &amp;&amp; c-&gt;status == Connected) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_MUX, "flushing\n");</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 		clear_thread_flag(TIF_SIGPENDING);</div><div class='hunk'>@@ -882,7 +703,7 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type,</div><div class='ctx'> 			p9_client_flush(c, req);</div><div class='ctx'> </div><div class='ctx'> 		/* if we received the response anyway, don't signal error */</div><div class='del'>-		if (req-&gt;status == REQ_STATUS_RCVD)</div><div class='add'>+		if (READ_ONCE(req-&gt;status) == REQ_STATUS_RCVD)</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> recalc_sigpending:</div><div class='hunk'>@@ -894,12 +715,12 @@ recalc_sigpending:</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto reterr;</div><div class='ctx'> </div><div class='del'>-	err = p9_check_zc_errors(c, req, uidata, in_hdrlen);</div><div class='del'>-	trace_9p_client_res(c, type, req-&gt;rc-&gt;tag, err);</div><div class='add'>+	err = p9_check_errors(c, req);</div><div class='add'>+	trace_9p_client_res(c, type, req-&gt;rc.tag, err);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return req;</div><div class='ctx'> reterr:</div><div class='del'>-	p9_free_req(c, req);</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> 	return ERR_PTR(safe_errno(err));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -909,16 +730,14 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt)</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_FID, "clnt %p\n", clnt);</div><div class='del'>-	fid = kmalloc(sizeof(struct p9_fid), GFP_KERNEL);</div><div class='add'>+	fid = kzalloc(sizeof(*fid), GFP_KERNEL);</div><div class='ctx'> 	if (!fid)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;fid-&gt;qid, 0, sizeof(struct p9_qid));</div><div class='ctx'> 	fid-&gt;mode = -1;</div><div class='ctx'> 	fid-&gt;uid = current_fsuid();</div><div class='ctx'> 	fid-&gt;clnt = clnt;</div><div class='del'>-	fid-&gt;rdir = NULL;</div><div class='del'>-	fid-&gt;fid = 0;</div><div class='add'>+	refcount_set(&amp;fid-&gt;count, 1);</div><div class='ctx'> </div><div class='ctx'> 	idr_preload(GFP_KERNEL);</div><div class='ctx'> 	spin_lock_irq(&amp;clnt-&gt;lock);</div><div class='hunk'>@@ -926,9 +745,10 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt)</div><div class='ctx'> 			    GFP_NOWAIT);</div><div class='ctx'> 	spin_unlock_irq(&amp;clnt-&gt;lock);</div><div class='ctx'> 	idr_preload_end();</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='add'>+		trace_9p_fid_ref(fid, P9_FID_REF_CREATE);</div><div class='ctx'> 		return fid;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(fid);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -940,6 +760,7 @@ static void p9_fid_destroy(struct p9_fid *fid)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_FID, "fid %d\n", fid-&gt;fid);</div><div class='add'>+	trace_9p_fid_ref(fid, P9_FID_REF_DESTROY);</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	spin_lock_irqsave(&amp;clnt-&gt;lock, flags);</div><div class='ctx'> 	idr_remove(&amp;clnt-&gt;fids, fid-&gt;fid);</div><div class='hunk'>@@ -948,9 +769,24 @@ static void p9_fid_destroy(struct p9_fid *fid)</div><div class='ctx'> 	kfree(fid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* We also need to export tracepoint symbols for tracepoint_enabled() */</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL(9p_fid_ref);</div><div class='add'>+</div><div class='add'>+void do_trace_9p_fid_get(struct p9_fid *fid)</div><div class='add'>+{</div><div class='add'>+	trace_9p_fid_ref(fid, P9_FID_REF_GET);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(do_trace_9p_fid_get);</div><div class='add'>+</div><div class='add'>+void do_trace_9p_fid_put(struct p9_fid *fid)</div><div class='add'>+{</div><div class='add'>+	trace_9p_fid_ref(fid, P9_FID_REF_PUT);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(do_trace_9p_fid_put);</div><div class='add'>+</div><div class='ctx'> static int p9_client_version(struct p9_client *c)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	char *version = NULL;</div><div class='ctx'> 	int msize;</div><div class='hunk'>@@ -961,15 +797,15 @@ static int p9_client_version(struct p9_client *c)</div><div class='ctx'> 	switch (c-&gt;proto_version) {</div><div class='ctx'> 	case p9_proto_2000L:</div><div class='ctx'> 		req = p9_client_rpc(c, P9_TVERSION, "ds",</div><div class='del'>-					c-&gt;msize, "9P2000.L");</div><div class='add'>+				    c-&gt;msize, "9P2000.L");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case p9_proto_2000u:</div><div class='ctx'> 		req = p9_client_rpc(c, P9_TVERSION, "ds",</div><div class='del'>-					c-&gt;msize, "9P2000.u");</div><div class='add'>+				    c-&gt;msize, "9P2000.u");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case p9_proto_legacy:</div><div class='ctx'> 		req = p9_client_rpc(c, P9_TVERSION, "ds",</div><div class='del'>-					c-&gt;msize, "9P2000");</div><div class='add'>+				    c-&gt;msize, "9P2000");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -978,95 +814,129 @@ static int p9_client_version(struct p9_client *c)</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, c-&gt;proto_version, "ds", &amp;msize, &amp;version);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, c-&gt;proto_version, "ds", &amp;msize, &amp;version);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_9P, "version error %d\n", err);</div><div class='del'>-		trace_9p_protocol_dump(c, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(c, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RVERSION msize %d %s\n", msize, version);</div><div class='del'>-	if (!strncmp(version, "9P2000.L", 8))</div><div class='add'>+	if (!strncmp(version, "9P2000.L", 8)) {</div><div class='ctx'> 		c-&gt;proto_version = p9_proto_2000L;</div><div class='del'>-	else if (!strncmp(version, "9P2000.u", 8))</div><div class='add'>+	} else if (!strncmp(version, "9P2000.u", 8)) {</div><div class='ctx'> 		c-&gt;proto_version = p9_proto_2000u;</div><div class='del'>-	else if (!strncmp(version, "9P2000", 6))</div><div class='add'>+	} else if (!strncmp(version, "9P2000", 6)) {</div><div class='ctx'> 		c-&gt;proto_version = p9_proto_legacy;</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "server returned an unknown version: %s\n", version);</div><div class='ctx'> 		err = -EREMOTEIO;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (msize &lt; 4096) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "server returned a msize &lt; 4096: %d\n", msize);</div><div class='add'>+		err = -EREMOTEIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='ctx'> 	if (msize &lt; c-&gt;msize)</div><div class='ctx'> 		c-&gt;msize = msize;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	kfree(version);</div><div class='del'>-	p9_free_req(c, req);</div><div class='add'>+	p9_req_put(c, req);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct p9_client *p9_client_create(const char *dev_name, char *options)</div><div class='add'>+struct p9_client *p9_client_create(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	static atomic_t seqno = ATOMIC_INIT(0);</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	char *client_id;</div><div class='add'>+	char *cache_name;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL);</div><div class='add'>+	clnt = kmalloc(sizeof(*clnt), GFP_KERNEL);</div><div class='ctx'> 	if (!clnt)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	clnt-&gt;trans_mod = NULL;</div><div class='ctx'> 	clnt-&gt;trans = NULL;</div><div class='add'>+	clnt-&gt;fcall_cache = NULL;</div><div class='ctx'> </div><div class='ctx'> 	client_id = utsname()-&gt;nodename;</div><div class='ctx'> 	memcpy(clnt-&gt;name, client_id, strlen(client_id) + 1);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;clnt-&gt;lock);</div><div class='ctx'> 	idr_init(&amp;clnt-&gt;fids);</div><div class='add'>+	idr_init(&amp;clnt-&gt;reqs);</div><div class='ctx'> </div><div class='del'>-	err = p9_tag_init(clnt);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = apply_client_options(clnt, fc);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto free_client;</div><div class='ctx'> </div><div class='del'>-	err = parse_opts(options, clnt);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto destroy_tagpool;</div><div class='del'>-</div><div class='ctx'> 	if (!clnt-&gt;trans_mod)</div><div class='ctx'> 		clnt-&gt;trans_mod = v9fs_get_default_trans();</div><div class='ctx'> </div><div class='del'>-	if (clnt-&gt;trans_mod == NULL) {</div><div class='add'>+	if (!clnt-&gt;trans_mod) {</div><div class='ctx'> 		err = -EPROTONOSUPPORT;</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR,</div><div class='ctx'> 			 "No transport defined or default transport\n");</div><div class='del'>-		goto destroy_tagpool;</div><div class='add'>+		goto free_client;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_MUX, "clnt %p trans %p msize %d protocol %d\n",</div><div class='ctx'> 		 clnt, clnt-&gt;trans_mod, clnt-&gt;msize, clnt-&gt;proto_version);</div><div class='ctx'> </div><div class='del'>-	err = clnt-&gt;trans_mod-&gt;create(clnt, dev_name, options);</div><div class='add'>+	err = clnt-&gt;trans_mod-&gt;create(clnt, fc);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto put_trans;</div><div class='ctx'> </div><div class='del'>-	if (clnt-&gt;msize &gt; clnt-&gt;trans_mod-&gt;maxsize)</div><div class='add'>+	if (clnt-&gt;msize &gt; clnt-&gt;trans_mod-&gt;maxsize) {</div><div class='ctx'> 		clnt-&gt;msize = clnt-&gt;trans_mod-&gt;maxsize;</div><div class='add'>+		pr_info("Limiting 'msize' to %d as this is the maximum "</div><div class='add'>+			"supported by transport %s\n",</div><div class='add'>+			clnt-&gt;msize, clnt-&gt;trans_mod-&gt;name</div><div class='add'>+		);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clnt-&gt;msize &lt; 4096) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "Please specify a msize of at least 4k\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto close_trans;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = p9_client_version(clnt);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto close_trans;</div><div class='ctx'> </div><div class='add'>+	cache_name = kasprintf(GFP_KERNEL,</div><div class='add'>+		"9p-fcall-cache-%u", atomic_inc_return(&amp;seqno));</div><div class='add'>+	if (!cache_name) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto close_trans;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* P9_HDRSZ + 4 is the smallest packet header we can have that is</div><div class='add'>+	 * followed by data accessed from userspace by read</div><div class='add'>+	 */</div><div class='add'>+	clnt-&gt;fcall_cache =</div><div class='add'>+		kmem_cache_create_usercopy(cache_name, clnt-&gt;msize,</div><div class='add'>+					   0, 0, P9_HDRSZ + 4,</div><div class='add'>+					   clnt-&gt;msize - (P9_HDRSZ + 4),</div><div class='add'>+					   NULL);</div><div class='add'>+</div><div class='add'>+	kfree(cache_name);</div><div class='ctx'> 	return clnt;</div><div class='ctx'> </div><div class='ctx'> close_trans:</div><div class='ctx'> 	clnt-&gt;trans_mod-&gt;close(clnt);</div><div class='ctx'> put_trans:</div><div class='ctx'> 	v9fs_put_trans(clnt-&gt;trans_mod);</div><div class='del'>-destroy_tagpool:</div><div class='del'>-	p9_idpool_destroy(clnt-&gt;tagpool);</div><div class='ctx'> free_client:</div><div class='ctx'> 	kfree(clnt);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='hunk'>@@ -1092,6 +962,7 @@ void p9_client_destroy(struct p9_client *clnt)</div><div class='ctx'> </div><div class='ctx'> 	p9_tag_cleanup(clnt);</div><div class='ctx'> </div><div class='add'>+	kmem_cache_destroy(clnt-&gt;fcall_cache);</div><div class='ctx'> 	kfree(clnt);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_destroy);</div><div class='hunk'>@@ -1111,14 +982,14 @@ void p9_client_begin_disconnect(struct p9_client *clnt)</div><div class='ctx'> EXPORT_SYMBOL(p9_client_begin_disconnect);</div><div class='ctx'> </div><div class='ctx'> struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,</div><div class='del'>-	const char *uname, kuid_t n_uname, const char *aname)</div><div class='add'>+				const char *uname, kuid_t n_uname,</div><div class='add'>+				const char *aname)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	struct p9_qid qid;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TATTACH afid %d uname %s aname %s\n",</div><div class='ctx'> 		 afid ? afid-&gt;fid : -1, uname, aname);</div><div class='ctx'> 	fid = p9_fid_create(clnt);</div><div class='hunk'>@@ -1129,25 +1000,25 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,</div><div class='ctx'> 	fid-&gt;uid = n_uname;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TATTACH, "ddss?u", fid-&gt;fid,</div><div class='del'>-			afid ? afid-&gt;fid : P9_NOFID, uname, aname, n_uname);</div><div class='add'>+			    afid ? afid-&gt;fid : P9_NOFID, uname, aname, n_uname);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Q", &amp;qid);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Q", &amp;qid);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RATTACH qid %x.%llx.%x\n",</div><div class='del'>-		 qid.type, (unsigned long long)qid.path, qid.version);</div><div class='add'>+		 qid.type, qid.path, qid.version);</div><div class='ctx'> </div><div class='ctx'> 	memmove(&amp;fid-&gt;qid, &amp;qid, sizeof(struct p9_qid));</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return fid;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -1158,16 +1029,15 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(p9_client_attach);</div><div class='ctx'> </div><div class='ctx'> struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,</div><div class='del'>-		const unsigned char * const *wnames, int clone)</div><div class='add'>+			      const unsigned char * const *wnames, int clone)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	struct p9_qid *wqids;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='del'>-	uint16_t nwqids, count;</div><div class='add'>+	u16 nwqids, count;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	wqids = NULL;</div><div class='ctx'> 	clnt = oldfid-&gt;clnt;</div><div class='ctx'> 	if (clone) {</div><div class='hunk'>@@ -1178,27 +1048,26 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fid-&gt;uid = oldfid-&gt;uid;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		fid = oldfid;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWALK fids %d,%d nwname %ud wname[0] %s\n",</div><div class='ctx'> 		 oldfid-&gt;fid, fid-&gt;fid, nwname, wnames ? wnames[0] : NULL);</div><div class='del'>-</div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TWALK, "ddT", oldfid-&gt;fid, fid-&gt;fid,</div><div class='del'>-								nwname, wnames);</div><div class='add'>+			    nwname, wnames);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "R", &amp;nwqids, &amp;wqids);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "R", &amp;nwqids, &amp;wqids);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto clunk_fid;</div><div class='ctx'> 	}</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RWALK nwqid %d:\n", nwqids);</div><div class='ctx'> </div><div class='hunk'>@@ -1209,25 +1078,25 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,</div><div class='ctx'> </div><div class='ctx'> 	for (count = 0; count &lt; nwqids; count++)</div><div class='ctx'> 		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt;     [%d] %x.%llx.%x\n",</div><div class='del'>-			count, wqids[count].type,</div><div class='del'>-			(unsigned long long)wqids[count].path,</div><div class='del'>-			wqids[count].version);</div><div class='add'>+			 count, wqids[count].type,</div><div class='add'>+			 wqids[count].path,</div><div class='add'>+			 wqids[count].version);</div><div class='ctx'> </div><div class='ctx'> 	if (nwname)</div><div class='ctx'> 		memmove(&amp;fid-&gt;qid, &amp;wqids[nwqids - 1], sizeof(struct p9_qid));</div><div class='ctx'> 	else</div><div class='del'>-		fid-&gt;qid = oldfid-&gt;qid;</div><div class='add'>+		memmove(&amp;fid-&gt;qid, &amp;oldfid-&gt;qid, sizeof(struct p9_qid));</div><div class='ctx'> </div><div class='ctx'> 	kfree(wqids);</div><div class='ctx'> 	return fid;</div><div class='ctx'> </div><div class='ctx'> clunk_fid:</div><div class='ctx'> 	kfree(wqids);</div><div class='del'>-	p9_client_clunk(fid);</div><div class='add'>+	p9_fid_put(fid);</div><div class='ctx'> 	fid = NULL;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	if (fid &amp;&amp; (fid != oldfid))</div><div class='add'>+	if (fid &amp;&amp; fid != oldfid)</div><div class='ctx'> 		p9_fid_destroy(fid);</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(err);</div><div class='hunk'>@@ -1244,81 +1113,80 @@ int p9_client_open(struct p9_fid *fid, int mode)</div><div class='ctx'> </div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; %s fid %d mode %d\n",</div><div class='del'>-		p9_is_proto_dotl(clnt) ? "TLOPEN" : "TOPEN", fid-&gt;fid, mode);</div><div class='del'>-	err = 0;</div><div class='add'>+		 p9_is_proto_dotl(clnt) ? "TLOPEN" : "TOPEN", fid-&gt;fid, mode);</div><div class='ctx'> </div><div class='ctx'> 	if (fid-&gt;mode != -1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (p9_is_proto_dotl(clnt))</div><div class='del'>-		req = p9_client_rpc(clnt, P9_TLOPEN, "dd", fid-&gt;fid, mode);</div><div class='add'>+		req = p9_client_rpc(clnt, P9_TLOPEN, "dd", fid-&gt;fid, mode &amp; P9L_MODE_MASK);</div><div class='ctx'> 	else</div><div class='del'>-		req = p9_client_rpc(clnt, P9_TOPEN, "db", fid-&gt;fid, mode);</div><div class='add'>+		req = p9_client_rpc(clnt, P9_TOPEN, "db", fid-&gt;fid, mode &amp; P9L_MODE_MASK);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Qd", &amp;qid, &amp;iounit);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Qd", &amp;qid, &amp;iounit);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; %s qid %x.%llx.%x iounit %x\n",</div><div class='del'>-		p9_is_proto_dotl(clnt) ? "RLOPEN" : "ROPEN",  qid.type,</div><div class='del'>-		(unsigned long long)qid.path, qid.version, iounit);</div><div class='add'>+		 p9_is_proto_dotl(clnt) ? "RLOPEN" : "ROPEN",  qid.type,</div><div class='add'>+		 qid.path, qid.version, iounit);</div><div class='ctx'> </div><div class='add'>+	memmove(&amp;fid-&gt;qid, &amp;qid, sizeof(struct p9_qid));</div><div class='ctx'> 	fid-&gt;mode = mode;</div><div class='ctx'> 	fid-&gt;iounit = iounit;</div><div class='ctx'> </div><div class='ctx'> free_and_error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_open);</div><div class='ctx'> </div><div class='del'>-int p9_client_create_dotl(struct p9_fid *ofid, const char *name, u32 flags, u32 mode,</div><div class='del'>-		kgid_t gid, struct p9_qid *qid)</div><div class='add'>+int p9_client_create_dotl(struct p9_fid *ofid, const char *name, u32 flags,</div><div class='add'>+			  u32 mode, kgid_t gid, struct p9_qid *qid)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	int iounit;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P,</div><div class='del'>-			"&gt;&gt;&gt; TLCREATE fid %d name %s flags %d mode %d gid %d\n",</div><div class='del'>-			ofid-&gt;fid, name, flags, mode,</div><div class='del'>-		 	from_kgid(&amp;init_user_ns, gid));</div><div class='add'>+		 "&gt;&gt;&gt; TLCREATE fid %d name %s flags %d mode %d gid %d\n",</div><div class='add'>+		 ofid-&gt;fid, name, flags, mode,</div><div class='add'>+		 from_kgid(&amp;init_user_ns, gid));</div><div class='ctx'> 	clnt = ofid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	if (ofid-&gt;mode != -1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TLCREATE, "dsddg", ofid-&gt;fid, name, flags,</div><div class='del'>-			mode, gid);</div><div class='add'>+			    mode &amp; P9L_MODE_MASK, gid);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Qd", qid, &amp;iounit);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Qd", qid, &amp;iounit);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RLCREATE qid %x.%llx.%x iounit %x\n",</div><div class='del'>-			qid-&gt;type,</div><div class='del'>-			(unsigned long long)qid-&gt;path,</div><div class='del'>-			qid-&gt;version, iounit);</div><div class='add'>+		 qid-&gt;type, qid-&gt;path, qid-&gt;version, iounit);</div><div class='ctx'> </div><div class='del'>-	ofid-&gt;mode = mode;</div><div class='add'>+	memmove(&amp;ofid-&gt;qid, qid, sizeof(struct p9_qid));</div><div class='add'>+	ofid-&gt;mode = flags;</div><div class='ctx'> 	ofid-&gt;iounit = iounit;</div><div class='ctx'> </div><div class='ctx'> free_and_error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1334,70 +1202,68 @@ int p9_client_fcreate(struct p9_fid *fid, const char *name, u32 perm, int mode,</div><div class='ctx'> 	int iounit;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TCREATE fid %d name %s perm %d mode %d\n",</div><div class='del'>-						fid-&gt;fid, name, perm, mode);</div><div class='del'>-	err = 0;</div><div class='add'>+		 fid-&gt;fid, name, perm, mode);</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	if (fid-&gt;mode != -1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TCREATE, "dsdb?s", fid-&gt;fid, name, perm,</div><div class='del'>-				mode, extension);</div><div class='add'>+			    mode &amp; P9L_MODE_MASK, extension);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Qd", &amp;qid, &amp;iounit);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Qd", &amp;qid, &amp;iounit);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RCREATE qid %x.%llx.%x iounit %x\n",</div><div class='del'>-				qid.type,</div><div class='del'>-				(unsigned long long)qid.path,</div><div class='del'>-				qid.version, iounit);</div><div class='add'>+		 qid.type, qid.path, qid.version, iounit);</div><div class='ctx'> </div><div class='add'>+	memmove(&amp;fid-&gt;qid, &amp;qid, sizeof(struct p9_qid));</div><div class='ctx'> 	fid-&gt;mode = mode;</div><div class='ctx'> 	fid-&gt;iounit = iounit;</div><div class='ctx'> </div><div class='ctx'> free_and_error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_fcreate);</div><div class='ctx'> </div><div class='ctx'> int p9_client_symlink(struct p9_fid *dfid, const char *name,</div><div class='del'>-		const char *symtgt, kgid_t gid, struct p9_qid *qid)</div><div class='add'>+		      const char *symtgt, kgid_t gid, struct p9_qid *qid)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TSYMLINK dfid %d name %s  symtgt %s\n",</div><div class='del'>-			dfid-&gt;fid, name, symtgt);</div><div class='add'>+		 dfid-&gt;fid, name, symtgt);</div><div class='ctx'> 	clnt = dfid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TSYMLINK, "dssg", dfid-&gt;fid, name, symtgt,</div><div class='del'>-			gid);</div><div class='add'>+			    gid);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RSYMLINK qid %x.%llx.%x\n",</div><div class='del'>-			qid-&gt;type, (unsigned long long)qid-&gt;path, qid-&gt;version);</div><div class='add'>+		 qid-&gt;type, qid-&gt;path, qid-&gt;version);</div><div class='ctx'> </div><div class='ctx'> free_and_error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1409,28 +1275,27 @@ int p9_client_link(struct p9_fid *dfid, struct p9_fid *oldfid, const char *newna</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TLINK dfid %d oldfid %d newname %s\n",</div><div class='del'>-			dfid-&gt;fid, oldfid-&gt;fid, newname);</div><div class='add'>+		 dfid-&gt;fid, oldfid-&gt;fid, newname);</div><div class='ctx'> 	clnt = dfid-&gt;clnt;</div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TLINK, "dds", dfid-&gt;fid, oldfid-&gt;fid,</div><div class='del'>-			newname);</div><div class='add'>+			    newname);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RLINK\n");</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_link);</div><div class='ctx'> </div><div class='ctx'> int p9_client_fsync(struct p9_fid *fid, int datasync)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TFSYNC fid %d datasync:%d\n",</div><div class='del'>-			fid-&gt;fid, datasync);</div><div class='del'>-	err = 0;</div><div class='add'>+		 fid-&gt;fid, datasync);</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TFSYNC, "dd", fid-&gt;fid, datasync);</div><div class='hunk'>@@ -1441,7 +1306,7 @@ int p9_client_fsync(struct p9_fid *fid, int datasync)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RFSYNC fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1450,22 +1315,14 @@ EXPORT_SYMBOL(p9_client_fsync);</div><div class='ctx'> </div><div class='ctx'> int p9_client_clunk(struct p9_fid *fid)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	int retries = 0;</div><div class='ctx'> </div><div class='del'>-	if (!fid) {</div><div class='del'>-		pr_warn("%s (%d): Trying to clunk with NULL fid\n",</div><div class='del'>-			__func__, task_pid_nr(current));</div><div class='del'>-		dump_stack();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> again:</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TCLUNK fid %d (try %d)\n", fid-&gt;fid,</div><div class='del'>-								retries);</div><div class='del'>-	err = 0;</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TCLUNK fid %d (try %d)\n",</div><div class='add'>+		 fid-&gt;fid, retries);</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TCLUNK, "d", fid-&gt;fid);</div><div class='hunk'>@@ -1476,30 +1333,29 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RCLUNK fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='del'>-	/*</div><div class='del'>-	 * Fid is not valid even after a failed clunk</div><div class='add'>+	/* Fid is not valid even after a failed clunk</div><div class='ctx'> 	 * If interrupted, retry once then give up and</div><div class='ctx'> 	 * leak fid until umount.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err == -ERESTARTSYS) {</div><div class='ctx'> 		if (retries++ == 0)</div><div class='ctx'> 			goto again;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		p9_fid_destroy(fid);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_clunk);</div><div class='ctx'> </div><div class='ctx'> int p9_client_remove(struct p9_fid *fid)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREMOVE fid %d\n", fid-&gt;fid);</div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TREMOVE, "d", fid-&gt;fid);</div><div class='hunk'>@@ -1510,10 +1366,10 @@ int p9_client_remove(struct p9_fid *fid)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREMOVE fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	if (err == -ERESTARTSYS)</div><div class='del'>-		p9_client_clunk(fid);</div><div class='add'>+		p9_fid_put(fid);</div><div class='ctx'> 	else</div><div class='ctx'> 		p9_fid_destroy(fid);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1527,7 +1383,7 @@ int p9_client_unlinkat(struct p9_fid *dfid, const char *name, int flags)</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TUNLINKAT fid %d %s %d\n",</div><div class='del'>-		   dfid-&gt;fid, name, flags);</div><div class='add'>+		 dfid-&gt;fid, name, flags);</div><div class='ctx'> </div><div class='ctx'> 	clnt = dfid-&gt;clnt;</div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TUNLINKAT, "dsd", dfid-&gt;fid, name, flags);</div><div class='hunk'>@@ -1537,7 +1393,7 @@ int p9_client_unlinkat(struct p9_fid *dfid, const char *name, int flags)</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RUNLINKAT fid %d %s\n", dfid-&gt;fid, name);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1546,82 +1402,97 @@ EXPORT_SYMBOL(p9_client_unlinkat);</div><div class='ctx'> int</div><div class='ctx'> p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err)</div><div class='ctx'> {</div><div class='del'>-	struct p9_client *clnt = fid-&gt;clnt;</div><div class='del'>-	struct p9_req_t *req;</div><div class='ctx'> 	int total = 0;</div><div class='ctx'> 	*err = 0;</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREAD fid %d offset %llu %d\n",</div><div class='del'>-		   fid-&gt;fid, (unsigned long long) offset, (int)iov_iter_count(to));</div><div class='del'>-</div><div class='ctx'> 	while (iov_iter_count(to)) {</div><div class='del'>-		int count = iov_iter_count(to);</div><div class='del'>-		int rsize, non_zc = 0;</div><div class='del'>-		char *dataptr;</div><div class='add'>+		int count;</div><div class='ctx'> </div><div class='del'>-		rsize = fid-&gt;iounit;</div><div class='del'>-		if (!rsize || rsize &gt; clnt-&gt;msize-P9_IOHDRSZ)</div><div class='del'>-			rsize = clnt-&gt;msize - P9_IOHDRSZ;</div><div class='add'>+		count = p9_client_read_once(fid, offset, to, err);</div><div class='add'>+		if (!count || *err)</div><div class='add'>+			break;</div><div class='add'>+		offset += count;</div><div class='add'>+		total += count;</div><div class='add'>+	}</div><div class='add'>+	return total;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(p9_client_read);</div><div class='ctx'> </div><div class='del'>-		if (count &lt; rsize)</div><div class='del'>-			rsize = count;</div><div class='add'>+int</div><div class='add'>+p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,</div><div class='add'>+		    int *err)</div><div class='add'>+{</div><div class='add'>+	struct p9_client *clnt = fid-&gt;clnt;</div><div class='add'>+	struct p9_req_t *req;</div><div class='add'>+	int count = iov_iter_count(to);</div><div class='add'>+	u32 rsize, received;</div><div class='add'>+	bool non_zc = false;</div><div class='add'>+	char *dataptr;</div><div class='ctx'> </div><div class='del'>-		/* Don't bother zerocopy for small IO (&lt; 1024) */</div><div class='del'>-		if (clnt-&gt;trans_mod-&gt;zc_request &amp;&amp; rsize &gt; 1024) {</div><div class='del'>-			/*</div><div class='del'>-			 * response header len is 11</div><div class='del'>-			 * PDU Header(7) + IO Size (4)</div><div class='del'>-			 */</div><div class='del'>-			req = p9_client_zc_rpc(clnt, P9_TREAD, to, NULL, rsize,</div><div class='del'>-					       0, 11, "dqd", fid-&gt;fid,</div><div class='del'>-					       offset, rsize);</div><div class='del'>-		} else {</div><div class='del'>-			non_zc = 1;</div><div class='del'>-			req = p9_client_rpc(clnt, P9_TREAD, "dqd", fid-&gt;fid, offset,</div><div class='del'>-					    rsize);</div><div class='del'>-		}</div><div class='del'>-		if (IS_ERR(req)) {</div><div class='del'>-			*err = PTR_ERR(req);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	*err = 0;</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREAD fid %d offset %llu %zu\n",</div><div class='add'>+		 fid-&gt;fid, offset, iov_iter_count(to));</div><div class='ctx'> </div><div class='del'>-		*err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version,</div><div class='del'>-				   "D", &amp;count, &amp;dataptr);</div><div class='del'>-		if (*err) {</div><div class='del'>-			trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-			p9_free_req(clnt, req);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (rsize &lt; count) {</div><div class='del'>-			pr_err("bogus RREAD count (%d &gt; %d)\n", count, rsize);</div><div class='del'>-			count = rsize;</div><div class='del'>-		}</div><div class='add'>+	rsize = fid-&gt;iounit;</div><div class='add'>+	if (!rsize || rsize &gt; clnt-&gt;msize - P9_IOHDRSZ)</div><div class='add'>+		rsize = clnt-&gt;msize - P9_IOHDRSZ;</div><div class='ctx'> </div><div class='del'>-		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREAD count %d\n", count);</div><div class='del'>-		if (!count) {</div><div class='del'>-			p9_free_req(clnt, req);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (count &lt; rsize)</div><div class='add'>+		rsize = count;</div><div class='ctx'> </div><div class='del'>-		if (non_zc) {</div><div class='del'>-			int n = copy_to_iter(dataptr, count, to);</div><div class='del'>-			total += n;</div><div class='del'>-			offset += n;</div><div class='del'>-			if (n != count) {</div><div class='del'>-				*err = -EFAULT;</div><div class='del'>-				p9_free_req(clnt, req);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			iov_iter_advance(to, count);</div><div class='del'>-			total += count;</div><div class='del'>-			offset += count;</div><div class='add'>+	/* Don't bother zerocopy for small IO (&lt; 1024) */</div><div class='add'>+	if (clnt-&gt;trans_mod-&gt;zc_request &amp;&amp; rsize &gt; 1024) {</div><div class='add'>+		/* response header len is 11</div><div class='add'>+		 * PDU Header(7) + IO Size (4)</div><div class='add'>+		 */</div><div class='add'>+		req = p9_client_zc_rpc(clnt, P9_TREAD, to, NULL, rsize,</div><div class='add'>+				       0, 11, "dqd", fid-&gt;fid,</div><div class='add'>+				       offset, rsize);</div><div class='add'>+	} else {</div><div class='add'>+		non_zc = true;</div><div class='add'>+		req = p9_client_rpc(clnt, P9_TREAD, "dqd", fid-&gt;fid, offset,</div><div class='add'>+				    rsize);</div><div class='add'>+	}</div><div class='add'>+	if (IS_ERR(req)) {</div><div class='add'>+		*err = PTR_ERR(req);</div><div class='add'>+		if (!non_zc)</div><div class='add'>+			iov_iter_revert(to, count - iov_iter_count(to));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version,</div><div class='add'>+			   "D", &amp;received, &amp;dataptr);</div><div class='add'>+	if (*err) {</div><div class='add'>+		if (!non_zc)</div><div class='add'>+			iov_iter_revert(to, count - iov_iter_count(to));</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (rsize &lt; received) {</div><div class='add'>+		pr_err("bogus RREAD count (%u &gt; %u)\n", received, rsize);</div><div class='add'>+		*err = -EIO;</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREAD count %u\n", received);</div><div class='add'>+</div><div class='add'>+	if (non_zc) {</div><div class='add'>+		int n = copy_to_iter(dataptr, received, to);</div><div class='add'>+</div><div class='add'>+		if (n != received) {</div><div class='add'>+			*err = -EFAULT;</div><div class='add'>+			p9_req_put(clnt, req);</div><div class='add'>+			return n;</div><div class='ctx'> 		}</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+	} else {</div><div class='add'>+		iov_iter_revert(to, count - received - iov_iter_count(to));</div><div class='ctx'> 	}</div><div class='del'>-	return total;</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='add'>+	return received;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(p9_client_read);</div><div class='add'>+EXPORT_SYMBOL(p9_client_read_once);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)</div><div class='hunk'>@@ -1631,19 +1502,20 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)</div><div class='ctx'> 	int total = 0;</div><div class='ctx'> 	*err = 0;</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWRITE fid %d offset %llu count %zd\n",</div><div class='del'>-				fid-&gt;fid, (unsigned long long) offset,</div><div class='del'>-				iov_iter_count(from));</div><div class='del'>-</div><div class='ctx'> 	while (iov_iter_count(from)) {</div><div class='del'>-		int count = iov_iter_count(from);</div><div class='del'>-		int rsize = fid-&gt;iounit;</div><div class='del'>-		if (!rsize || rsize &gt; clnt-&gt;msize-P9_IOHDRSZ)</div><div class='add'>+		size_t count = iov_iter_count(from);</div><div class='add'>+		u32 rsize = fid-&gt;iounit;</div><div class='add'>+		u32 written;</div><div class='add'>+</div><div class='add'>+		if (!rsize || rsize &gt; clnt-&gt;msize - P9_IOHDRSZ)</div><div class='ctx'> 			rsize = clnt-&gt;msize - P9_IOHDRSZ;</div><div class='ctx'> </div><div class='ctx'> 		if (count &lt; rsize)</div><div class='ctx'> 			rsize = count;</div><div class='ctx'> </div><div class='add'>+		p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWRITE fid %d offset %llu count %u (/%zu)\n",</div><div class='add'>+			 fid-&gt;fid, offset, rsize, count);</div><div class='add'>+</div><div class='ctx'> 		/* Don't bother zerocopy for small IO (&lt; 1024) */</div><div class='ctx'> 		if (clnt-&gt;trans_mod-&gt;zc_request &amp;&amp; rsize &gt; 1024) {</div><div class='ctx'> 			req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, from, 0,</div><div class='hunk'>@@ -1651,49 +1523,102 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)</div><div class='ctx'> 					       fid-&gt;fid, offset, rsize);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			req = p9_client_rpc(clnt, P9_TWRITE, "dqV", fid-&gt;fid,</div><div class='del'>-						    offset, rsize, from);</div><div class='add'>+					    offset, rsize, from);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (IS_ERR(req)) {</div><div class='add'>+			iov_iter_revert(from, count - iov_iter_count(from));</div><div class='ctx'> 			*err = PTR_ERR(req);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "d", &amp;count);</div><div class='add'>+		*err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "d", &amp;written);</div><div class='ctx'> 		if (*err) {</div><div class='del'>-			trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-			p9_free_req(clnt, req);</div><div class='add'>+			iov_iter_revert(from, count - iov_iter_count(from));</div><div class='add'>+			trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+			p9_req_put(clnt, req);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (rsize &lt; count) {</div><div class='del'>-			pr_err("bogus RWRITE count (%d &gt; %d)\n", count, rsize);</div><div class='del'>-			count = rsize;</div><div class='add'>+		if (rsize &lt; written) {</div><div class='add'>+			pr_err("bogus RWRITE count (%u &gt; %u)\n", written, rsize);</div><div class='add'>+			*err = -EIO;</div><div class='add'>+			iov_iter_revert(from, count - iov_iter_count(from));</div><div class='add'>+			p9_req_put(clnt, req);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RWRITE count %d\n", count);</div><div class='add'>+		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RWRITE count %u\n", written);</div><div class='ctx'> </div><div class='del'>-		p9_free_req(clnt, req);</div><div class='del'>-		iov_iter_advance(from, count);</div><div class='del'>-		total += count;</div><div class='del'>-		offset += count;</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='add'>+		iov_iter_revert(from, count - written - iov_iter_count(from));</div><div class='add'>+		total += written;</div><div class='add'>+		offset += written;</div><div class='ctx'> 	}</div><div class='ctx'> 	return total;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_write);</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+p9_client_write_subreq(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='add'>+	struct p9_fid *fid = wreq-&gt;netfs_priv;</div><div class='add'>+	struct p9_client *clnt = fid-&gt;clnt;</div><div class='add'>+	struct p9_req_t *req;</div><div class='add'>+	unsigned long long start = subreq-&gt;start + subreq-&gt;transferred;</div><div class='add'>+	int written, len = subreq-&gt;len - subreq-&gt;transferred;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWRITE fid %d offset %llu len %d\n",</div><div class='add'>+		 fid-&gt;fid, start, len);</div><div class='add'>+</div><div class='add'>+	/* Don't bother zerocopy for small IO (&lt; 1024) */</div><div class='add'>+	if (clnt-&gt;trans_mod-&gt;zc_request &amp;&amp; len &gt; 1024) {</div><div class='add'>+		req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, &amp;subreq-&gt;io_iter,</div><div class='add'>+				       0, wreq-&gt;len, P9_ZC_HDR_SZ, "dqd",</div><div class='add'>+				       fid-&gt;fid, start, len);</div><div class='add'>+	} else {</div><div class='add'>+		req = p9_client_rpc(clnt, P9_TWRITE, "dqV", fid-&gt;fid,</div><div class='add'>+				    start, len, &amp;subreq-&gt;io_iter);</div><div class='add'>+	}</div><div class='add'>+	if (IS_ERR(req)) {</div><div class='add'>+		netfs_write_subrequest_terminated(subreq, PTR_ERR(req));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "d", &amp;written);</div><div class='add'>+	if (err) {</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='add'>+		netfs_write_subrequest_terminated(subreq, err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (written &gt; len) {</div><div class='add'>+		pr_err("bogus RWRITE count (%d &gt; %u)\n", written, len);</div><div class='add'>+		written = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RWRITE count %d\n", len);</div><div class='add'>+</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='add'>+	netfs_write_subrequest_terminated(subreq, written);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(p9_client_write_subreq);</div><div class='add'>+</div><div class='ctx'> struct p9_wstat *p9_client_stat(struct p9_fid *fid)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='del'>-	struct p9_wstat *ret = kmalloc(sizeof(struct p9_wstat), GFP_KERNEL);</div><div class='add'>+	struct p9_wstat *ret;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	u16 ignored;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TSTAT fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='add'>+	ret = kmalloc(sizeof(*ret), GFP_KERNEL);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TSTAT, "d", fid-&gt;fid);</div><div class='hunk'>@@ -1702,27 +1627,27 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "wS", &amp;ignored, ret);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "wS", &amp;ignored, ret);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"&lt;&lt;&lt; RSTAT sz=%x type=%x dev=%x qid=%x.%llx.%x\n"</div><div class='del'>-		"&lt;&lt;&lt;    mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"</div><div class='del'>-		"&lt;&lt;&lt;    name=%s uid=%s gid=%s muid=%s extension=(%s)\n"</div><div class='del'>-		"&lt;&lt;&lt;    uid=%d gid=%d n_muid=%d\n",</div><div class='del'>-		ret-&gt;size, ret-&gt;type, ret-&gt;dev, ret-&gt;qid.type,</div><div class='del'>-		(unsigned long long)ret-&gt;qid.path, ret-&gt;qid.version, ret-&gt;mode,</div><div class='del'>-		ret-&gt;atime, ret-&gt;mtime, (unsigned long long)ret-&gt;length,</div><div class='del'>-		ret-&gt;name, ret-&gt;uid, ret-&gt;gid, ret-&gt;muid, ret-&gt;extension,</div><div class='del'>-		from_kuid(&amp;init_user_ns, ret-&gt;n_uid),</div><div class='del'>-		from_kgid(&amp;init_user_ns, ret-&gt;n_gid),</div><div class='del'>-		from_kuid(&amp;init_user_ns, ret-&gt;n_muid));</div><div class='del'>-</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+		 "&lt;&lt;&lt; RSTAT sz=%x type=%x dev=%x qid=%x.%llx.%x\n"</div><div class='add'>+		 "&lt;&lt;&lt;    mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"</div><div class='add'>+		 "&lt;&lt;&lt;    name=%s uid=%s gid=%s muid=%s extension=(%s)\n"</div><div class='add'>+		 "&lt;&lt;&lt;    uid=%d gid=%d n_muid=%d\n",</div><div class='add'>+		 ret-&gt;size, ret-&gt;type, ret-&gt;dev, ret-&gt;qid.type, ret-&gt;qid.path,</div><div class='add'>+		 ret-&gt;qid.version, ret-&gt;mode,</div><div class='add'>+		 ret-&gt;atime, ret-&gt;mtime, ret-&gt;length,</div><div class='add'>+		 ret-&gt;name, ret-&gt;uid, ret-&gt;gid, ret-&gt;muid, ret-&gt;extension,</div><div class='add'>+		 from_kuid(&amp;init_user_ns, ret-&gt;n_uid),</div><div class='add'>+		 from_kgid(&amp;init_user_ns, ret-&gt;n_gid),</div><div class='add'>+		 from_kuid(&amp;init_user_ns, ret-&gt;n_muid));</div><div class='add'>+</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -1732,21 +1657,20 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(p9_client_stat);</div><div class='ctx'> </div><div class='ctx'> struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,</div><div class='del'>-							u64 request_mask)</div><div class='add'>+					    u64 request_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='del'>-	struct p9_stat_dotl *ret = kmalloc(sizeof(struct p9_stat_dotl),</div><div class='del'>-								GFP_KERNEL);</div><div class='add'>+	struct p9_stat_dotl *ret;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TGETATTR fid %d, request_mask %lld\n",</div><div class='del'>-							fid-&gt;fid, request_mask);</div><div class='add'>+		 fid-&gt;fid, request_mask);</div><div class='ctx'> </div><div class='add'>+	ret = kmalloc(sizeof(*ret), GFP_KERNEL);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TGETATTR, "dq", fid-&gt;fid, request_mask);</div><div class='hunk'>@@ -1755,35 +1679,36 @@ struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "A", ret);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "A", ret);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"&lt;&lt;&lt; RGETATTR st_result_mask=%lld\n"</div><div class='del'>-		"&lt;&lt;&lt; qid=%x.%llx.%x\n"</div><div class='del'>-		"&lt;&lt;&lt; st_mode=%8.8x st_nlink=%llu\n"</div><div class='del'>-		"&lt;&lt;&lt; st_uid=%d st_gid=%d\n"</div><div class='del'>-		"&lt;&lt;&lt; st_rdev=%llx st_size=%llx st_blksize=%llu st_blocks=%llu\n"</div><div class='del'>-		"&lt;&lt;&lt; st_atime_sec=%lld st_atime_nsec=%lld\n"</div><div class='del'>-		"&lt;&lt;&lt; st_mtime_sec=%lld st_mtime_nsec=%lld\n"</div><div class='del'>-		"&lt;&lt;&lt; st_ctime_sec=%lld st_ctime_nsec=%lld\n"</div><div class='del'>-		"&lt;&lt;&lt; st_btime_sec=%lld st_btime_nsec=%lld\n"</div><div class='del'>-		"&lt;&lt;&lt; st_gen=%lld st_data_version=%lld\n",</div><div class='del'>-		ret-&gt;st_result_mask, ret-&gt;qid.type, ret-&gt;qid.path,</div><div class='del'>-		ret-&gt;qid.version, ret-&gt;st_mode, ret-&gt;st_nlink,</div><div class='del'>-		from_kuid(&amp;init_user_ns, ret-&gt;st_uid),</div><div class='del'>-		from_kgid(&amp;init_user_ns, ret-&gt;st_gid),</div><div class='del'>-		ret-&gt;st_rdev, ret-&gt;st_size, ret-&gt;st_blksize,</div><div class='del'>-		ret-&gt;st_blocks, ret-&gt;st_atime_sec, ret-&gt;st_atime_nsec,</div><div class='del'>-		ret-&gt;st_mtime_sec, ret-&gt;st_mtime_nsec, ret-&gt;st_ctime_sec,</div><div class='del'>-		ret-&gt;st_ctime_nsec, ret-&gt;st_btime_sec, ret-&gt;st_btime_nsec,</div><div class='del'>-		ret-&gt;st_gen, ret-&gt;st_data_version);</div><div class='del'>-</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RGETATTR st_result_mask=%lld\n"</div><div class='add'>+		 "&lt;&lt;&lt; qid=%x.%llx.%x\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_mode=%8.8x st_nlink=%llu\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_uid=%d st_gid=%d\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_rdev=%llx st_size=%llx st_blksize=%llu st_blocks=%llu\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_atime_sec=%lld st_atime_nsec=%lld\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_mtime_sec=%lld st_mtime_nsec=%lld\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_ctime_sec=%lld st_ctime_nsec=%lld\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_btime_sec=%lld st_btime_nsec=%lld\n"</div><div class='add'>+		 "&lt;&lt;&lt; st_gen=%lld st_data_version=%lld\n",</div><div class='add'>+		 ret-&gt;st_result_mask,</div><div class='add'>+		 ret-&gt;qid.type, ret-&gt;qid.path, ret-&gt;qid.version,</div><div class='add'>+		 ret-&gt;st_mode, ret-&gt;st_nlink,</div><div class='add'>+		 from_kuid(&amp;init_user_ns, ret-&gt;st_uid),</div><div class='add'>+		 from_kgid(&amp;init_user_ns, ret-&gt;st_gid),</div><div class='add'>+		 ret-&gt;st_rdev, ret-&gt;st_size, ret-&gt;st_blksize, ret-&gt;st_blocks,</div><div class='add'>+		 ret-&gt;st_atime_sec, ret-&gt;st_atime_nsec,</div><div class='add'>+		 ret-&gt;st_mtime_sec, ret-&gt;st_mtime_nsec,</div><div class='add'>+		 ret-&gt;st_ctime_sec, ret-&gt;st_ctime_nsec,</div><div class='add'>+		 ret-&gt;st_btime_sec, ret-&gt;st_btime_nsec,</div><div class='add'>+		 ret-&gt;st_gen, ret-&gt;st_data_version);</div><div class='add'>+</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -1800,7 +1725,7 @@ static int p9_client_statsize(struct p9_wstat *wst, int proto_version)</div><div class='ctx'> 	/* size[2] type[2] dev[4] qid[13] */</div><div class='ctx'> 	/* mode[4] atime[4] mtime[4] length[8]*/</div><div class='ctx'> 	/* name[s] uid[s] gid[s] muid[s] */</div><div class='del'>-	ret = 2+4+13+4+4+4+8+2+2+2+2;</div><div class='add'>+	ret = 2 + 4 + 13 + 4 + 4 + 4 + 8 + 2 + 2 + 2 + 2;</div><div class='ctx'> </div><div class='ctx'> 	if (wst-&gt;name)</div><div class='ctx'> 		ret += strlen(wst-&gt;name);</div><div class='hunk'>@@ -1811,9 +1736,10 @@ static int p9_client_statsize(struct p9_wstat *wst, int proto_version)</div><div class='ctx'> 	if (wst-&gt;muid)</div><div class='ctx'> 		ret += strlen(wst-&gt;muid);</div><div class='ctx'> </div><div class='del'>-	if ((proto_version == p9_proto_2000u) ||</div><div class='del'>-		(proto_version == p9_proto_2000L)) {</div><div class='del'>-		ret += 2+4+4+4;	/* extension[s] n_uid[4] n_gid[4] n_muid[4] */</div><div class='add'>+	if (proto_version == p9_proto_2000u ||</div><div class='add'>+	    proto_version == p9_proto_2000L) {</div><div class='add'>+		/* extension[s] n_uid[4] n_gid[4] n_muid[4] */</div><div class='add'>+		ret += 2 + 4 + 4 + 4;</div><div class='ctx'> 		if (wst-&gt;extension)</div><div class='ctx'> 			ret += strlen(wst-&gt;extension);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1823,28 +1749,29 @@ static int p9_client_statsize(struct p9_wstat *wst, int proto_version)</div><div class='ctx'> </div><div class='ctx'> int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	wst-&gt;size = p9_client_statsize(wst, clnt-&gt;proto_version);</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWSTAT fid %d\n", fid-&gt;fid);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TWSTAT fid %d\n",</div><div class='add'>+		 fid-&gt;fid);</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"     sz=%x type=%x dev=%x qid=%x.%llx.%x\n"</div><div class='del'>-		"     mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"</div><div class='del'>-		"     name=%s uid=%s gid=%s muid=%s extension=(%s)\n"</div><div class='del'>-		"     uid=%d gid=%d n_muid=%d\n",</div><div class='del'>-		wst-&gt;size, wst-&gt;type, wst-&gt;dev, wst-&gt;qid.type,</div><div class='del'>-		(unsigned long long)wst-&gt;qid.path, wst-&gt;qid.version, wst-&gt;mode,</div><div class='del'>-		wst-&gt;atime, wst-&gt;mtime, (unsigned long long)wst-&gt;length,</div><div class='del'>-		wst-&gt;name, wst-&gt;uid, wst-&gt;gid, wst-&gt;muid, wst-&gt;extension,</div><div class='del'>-		from_kuid(&amp;init_user_ns, wst-&gt;n_uid),</div><div class='del'>-		from_kgid(&amp;init_user_ns, wst-&gt;n_gid),</div><div class='del'>-		from_kuid(&amp;init_user_ns, wst-&gt;n_muid));</div><div class='del'>-</div><div class='del'>-	req = p9_client_rpc(clnt, P9_TWSTAT, "dwS", fid-&gt;fid, wst-&gt;size+2, wst);</div><div class='add'>+		 "     sz=%x type=%x dev=%x qid=%x.%llx.%x\n"</div><div class='add'>+		 "     mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"</div><div class='add'>+		 "     name=%s uid=%s gid=%s muid=%s extension=(%s)\n"</div><div class='add'>+		 "     uid=%d gid=%d n_muid=%d\n",</div><div class='add'>+		 wst-&gt;size, wst-&gt;type, wst-&gt;dev, wst-&gt;qid.type,</div><div class='add'>+		 wst-&gt;qid.path, wst-&gt;qid.version,</div><div class='add'>+		 wst-&gt;mode, wst-&gt;atime, wst-&gt;mtime, wst-&gt;length,</div><div class='add'>+		 wst-&gt;name, wst-&gt;uid, wst-&gt;gid, wst-&gt;muid, wst-&gt;extension,</div><div class='add'>+		 from_kuid(&amp;init_user_ns, wst-&gt;n_uid),</div><div class='add'>+		 from_kgid(&amp;init_user_ns, wst-&gt;n_gid),</div><div class='add'>+		 from_kuid(&amp;init_user_ns, wst-&gt;n_muid));</div><div class='add'>+</div><div class='add'>+	req = p9_client_rpc(clnt, P9_TWSTAT, "dwS",</div><div class='add'>+			    fid-&gt;fid, wst-&gt;size + 2, wst);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -1852,7 +1779,7 @@ int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RWSTAT fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1860,22 +1787,21 @@ EXPORT_SYMBOL(p9_client_wstat);</div><div class='ctx'> </div><div class='ctx'> int p9_client_setattr(struct p9_fid *fid, struct p9_iattr_dotl *p9attr)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TSETATTR fid %d\n", fid-&gt;fid);</div><div class='del'>-	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"    valid=%x mode=%x uid=%d gid=%d size=%lld\n"</div><div class='del'>-		"    atime_sec=%lld atime_nsec=%lld\n"</div><div class='del'>-		"    mtime_sec=%lld mtime_nsec=%lld\n",</div><div class='del'>-		p9attr-&gt;valid, p9attr-&gt;mode,</div><div class='del'>-		from_kuid(&amp;init_user_ns, p9attr-&gt;uid),</div><div class='del'>-		from_kgid(&amp;init_user_ns, p9attr-&gt;gid),</div><div class='del'>-		p9attr-&gt;size, p9attr-&gt;atime_sec, p9attr-&gt;atime_nsec,</div><div class='del'>-		p9attr-&gt;mtime_sec, p9attr-&gt;mtime_nsec);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "    valid=%x mode=%x uid=%d gid=%d size=%lld\n",</div><div class='add'>+		 p9attr-&gt;valid, p9attr-&gt;mode,</div><div class='add'>+		 from_kuid(&amp;init_user_ns, p9attr-&gt;uid),</div><div class='add'>+		 from_kgid(&amp;init_user_ns, p9attr-&gt;gid),</div><div class='add'>+		 p9attr-&gt;size);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "    atime_sec=%lld atime_nsec=%lld\n",</div><div class='add'>+		 p9attr-&gt;atime_sec, p9attr-&gt;atime_nsec);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "    mtime_sec=%lld mtime_nsec=%lld\n",</div><div class='add'>+		 p9attr-&gt;mtime_sec, p9attr-&gt;mtime_nsec);</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TSETATTR, "dI", fid-&gt;fid, p9attr);</div><div class='ctx'> </div><div class='hunk'>@@ -1884,7 +1810,7 @@ int p9_client_setattr(struct p9_fid *fid, struct p9_iattr_dotl *p9attr)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RSETATTR fid %d\n", fid-&gt;fid);</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1896,7 +1822,6 @@ int p9_client_statfs(struct p9_fid *fid, struct p9_rstatfs *sb)</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TSTATFS fid %d\n", fid-&gt;fid);</div><div class='hunk'>@@ -1907,23 +1832,21 @@ int p9_client_statfs(struct p9_fid *fid, struct p9_rstatfs *sb)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "ddqqqqqqd", &amp;sb-&gt;type,</div><div class='del'>-		&amp;sb-&gt;bsize, &amp;sb-&gt;blocks, &amp;sb-&gt;bfree, &amp;sb-&gt;bavail,</div><div class='del'>-		&amp;sb-&gt;files, &amp;sb-&gt;ffree, &amp;sb-&gt;fsid, &amp;sb-&gt;namelen);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "ddqqqqqqd", &amp;sb-&gt;type,</div><div class='add'>+			  &amp;sb-&gt;bsize, &amp;sb-&gt;blocks, &amp;sb-&gt;bfree, &amp;sb-&gt;bavail,</div><div class='add'>+			  &amp;sb-&gt;files, &amp;sb-&gt;ffree, &amp;sb-&gt;fsid, &amp;sb-&gt;namelen);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RSTATFS fid %d type 0x%lx bsize %ld "</div><div class='del'>-		"blocks %llu bfree %llu bavail %llu files %llu ffree %llu "</div><div class='del'>-		"fsid %llu namelen %ld\n",</div><div class='del'>-		fid-&gt;fid, (long unsigned int)sb-&gt;type, (long int)sb-&gt;bsize,</div><div class='del'>-		sb-&gt;blocks, sb-&gt;bfree, sb-&gt;bavail, sb-&gt;files,  sb-&gt;ffree,</div><div class='del'>-		sb-&gt;fsid, (long int)sb-&gt;namelen);</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&lt;&lt;&lt; RSTATFS fid %d type 0x%x bsize %u blocks %llu bfree %llu bavail %llu files %llu ffree %llu fsid %llu namelen %u\n",</div><div class='add'>+		 fid-&gt;fid, sb-&gt;type, sb-&gt;bsize, sb-&gt;blocks, sb-&gt;bfree,</div><div class='add'>+		 sb-&gt;bavail, sb-&gt;files, sb-&gt;ffree, sb-&gt;fsid, sb-&gt;namelen);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1932,18 +1855,17 @@ EXPORT_SYMBOL(p9_client_statfs);</div><div class='ctx'> int p9_client_rename(struct p9_fid *fid,</div><div class='ctx'> 		     struct p9_fid *newdirfid, const char *name)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TRENAME fid %d newdirfid %d name %s\n",</div><div class='del'>-			fid-&gt;fid, newdirfid-&gt;fid, name);</div><div class='add'>+		 fid-&gt;fid, newdirfid-&gt;fid, name);</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TRENAME, "dds", fid-&gt;fid,</div><div class='del'>-			newdirfid-&gt;fid, name);</div><div class='add'>+			    newdirfid-&gt;fid, name);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -1951,7 +1873,7 @@ int p9_client_rename(struct p9_fid *fid,</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RRENAME fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1960,16 +1882,15 @@ EXPORT_SYMBOL(p9_client_rename);</div><div class='ctx'> int p9_client_renameat(struct p9_fid *olddirfid, const char *old_name,</div><div class='ctx'> 		       struct p9_fid *newdirfid, const char *new_name)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = olddirfid-&gt;clnt;</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TRENAMEAT olddirfid %d old name %s"</div><div class='del'>-		   " newdirfid %d new name %s\n", olddirfid-&gt;fid, old_name,</div><div class='del'>-		   newdirfid-&gt;fid, new_name);</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&gt;&gt;&gt; TRENAMEAT olddirfid %d old name %s newdirfid %d new name %s\n",</div><div class='add'>+		 olddirfid-&gt;fid, old_name, newdirfid-&gt;fid, new_name);</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TRENAMEAT, "dsds", olddirfid-&gt;fid,</div><div class='ctx'> 			    old_name, newdirfid-&gt;fid, new_name);</div><div class='hunk'>@@ -1979,26 +1900,24 @@ int p9_client_renameat(struct p9_fid *olddirfid, const char *old_name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RRENAMEAT newdirfid %d new name %s\n",</div><div class='del'>-		   newdirfid-&gt;fid, new_name);</div><div class='add'>+		 newdirfid-&gt;fid, new_name);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_renameat);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * An xattrwalk without @attr_name gives the fid for the lisxattr namespace</div><div class='add'>+/* An xattrwalk without @attr_name gives the fid for the lisxattr namespace</div><div class='ctx'>  */</div><div class='ctx'> struct p9_fid *p9_client_xattrwalk(struct p9_fid *file_fid,</div><div class='del'>-				const char *attr_name, u64 *attr_size)</div><div class='add'>+				   const char *attr_name, u64 *attr_size)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_fid *attr_fid;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = file_fid-&gt;clnt;</div><div class='ctx'> 	attr_fid = p9_fid_create(clnt);</div><div class='ctx'> 	if (!attr_fid) {</div><div class='hunk'>@@ -2006,30 +1925,30 @@ struct p9_fid *p9_client_xattrwalk(struct p9_fid *file_fid,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"&gt;&gt;&gt; TXATTRWALK file_fid %d, attr_fid %d name %s\n",</div><div class='del'>-		file_fid-&gt;fid, attr_fid-&gt;fid, attr_name);</div><div class='add'>+		 "&gt;&gt;&gt; TXATTRWALK file_fid %d, attr_fid %d name '%s'\n",</div><div class='add'>+		 file_fid-&gt;fid, attr_fid-&gt;fid, attr_name);</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TXATTRWALK, "dds",</div><div class='del'>-			file_fid-&gt;fid, attr_fid-&gt;fid, attr_name);</div><div class='add'>+			    file_fid-&gt;fid, attr_fid-&gt;fid, attr_name);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "q", attr_size);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "q", attr_size);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='del'>-		p9_free_req(clnt, req);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='add'>+		p9_req_put(clnt, req);</div><div class='ctx'> 		goto clunk_fid;</div><div class='ctx'> 	}</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt;  RXATTRWALK fid %d size %llu\n",</div><div class='del'>-		attr_fid-&gt;fid, *attr_size);</div><div class='add'>+		 attr_fid-&gt;fid, *attr_size);</div><div class='ctx'> 	return attr_fid;</div><div class='ctx'> clunk_fid:</div><div class='del'>-	p9_client_clunk(attr_fid);</div><div class='add'>+	p9_fid_put(attr_fid);</div><div class='ctx'> 	attr_fid = NULL;</div><div class='ctx'> error:</div><div class='del'>-	if (attr_fid &amp;&amp; (attr_fid != file_fid))</div><div class='add'>+	if (attr_fid &amp;&amp; attr_fid != file_fid)</div><div class='ctx'> 		p9_fid_destroy(attr_fid);</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(err);</div><div class='hunk'>@@ -2037,25 +1956,24 @@ error:</div><div class='ctx'> EXPORT_SYMBOL_GPL(p9_client_xattrwalk);</div><div class='ctx'> </div><div class='ctx'> int p9_client_xattrcreate(struct p9_fid *fid, const char *name,</div><div class='del'>-			u64 attr_size, int flags)</div><div class='add'>+			  u64 attr_size, int flags)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_9P,</div><div class='del'>-		"&gt;&gt;&gt; TXATTRCREATE fid %d name  %s size %lld flag %d\n",</div><div class='del'>-		fid-&gt;fid, name, (long long)attr_size, flags);</div><div class='del'>-	err = 0;</div><div class='add'>+		 "&gt;&gt;&gt; TXATTRCREATE fid %d name  %s size %llu flag %d\n",</div><div class='add'>+		 fid-&gt;fid, name, attr_size, flags);</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TXATTRCREATE, "dsqd",</div><div class='del'>-			fid-&gt;fid, name, attr_size, flags);</div><div class='add'>+			    fid-&gt;fid, name, attr_size, flags);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='ctx'> 		err = PTR_ERR(req);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RXATTRCREATE fid %d\n", fid-&gt;fid);</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2063,23 +1981,23 @@ EXPORT_SYMBOL_GPL(p9_client_xattrcreate);</div><div class='ctx'> </div><div class='ctx'> int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)</div><div class='ctx'> {</div><div class='del'>-	int err, rsize, non_zc = 0;</div><div class='add'>+	int err, non_zc = 0;</div><div class='add'>+	u32 rsize;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> 	char *dataptr;</div><div class='ctx'> 	struct kvec kv = {.iov_base = data, .iov_len = count};</div><div class='ctx'> 	struct iov_iter to;</div><div class='ctx'> </div><div class='del'>-	iov_iter_kvec(&amp;to, READ | ITER_KVEC, &amp;kv, 1, count);</div><div class='add'>+	iov_iter_kvec(&amp;to, ITER_DEST, &amp;kv, 1, count);</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREADDIR fid %d offset %llu count %d\n",</div><div class='del'>-				fid-&gt;fid, (unsigned long long) offset, count);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREADDIR fid %d offset %llu count %u\n",</div><div class='add'>+		 fid-&gt;fid, offset, count);</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> </div><div class='ctx'> 	rsize = fid-&gt;iounit;</div><div class='del'>-	if (!rsize || rsize &gt; clnt-&gt;msize-P9_READDIRHDRSZ)</div><div class='add'>+	if (!rsize || rsize &gt; clnt-&gt;msize - P9_READDIRHDRSZ)</div><div class='ctx'> 		rsize = clnt-&gt;msize - P9_READDIRHDRSZ;</div><div class='ctx'> </div><div class='ctx'> 	if (count &lt; rsize)</div><div class='hunk'>@@ -2087,8 +2005,7 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)</div><div class='ctx'> </div><div class='ctx'> 	/* Don't bother zerocopy for small IO (&lt; 1024) */</div><div class='ctx'> 	if (clnt-&gt;trans_mod-&gt;zc_request &amp;&amp; rsize &gt; 1024) {</div><div class='del'>-		/*</div><div class='del'>-		 * response header len is 11</div><div class='add'>+		/* response header len is 11</div><div class='ctx'> 		 * PDU Header(7) + IO Size (4)</div><div class='ctx'> 		 */</div><div class='ctx'> 		req = p9_client_zc_rpc(clnt, P9_TREADDIR, &amp;to, NULL, rsize, 0,</div><div class='hunk'>@@ -2103,90 +2020,88 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "D", &amp;count, &amp;dataptr);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "D", &amp;count, &amp;dataptr);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rsize &lt; count) {</div><div class='del'>-		pr_err("bogus RREADDIR count (%d &gt; %d)\n", count, rsize);</div><div class='del'>-		count = rsize;</div><div class='add'>+		pr_err("bogus RREADDIR count (%u &gt; %u)\n", count, rsize);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto free_and_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREADDIR count %d\n", count);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREADDIR count %u\n", count);</div><div class='ctx'> </div><div class='ctx'> 	if (non_zc)</div><div class='ctx'> 		memmove(data, dataptr, count);</div><div class='ctx'> </div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return count;</div><div class='ctx'> </div><div class='ctx'> free_and_error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_readdir);</div><div class='ctx'> </div><div class='ctx'> int p9_client_mknod_dotl(struct p9_fid *fid, const char *name, int mode,</div><div class='del'>-			dev_t rdev, kgid_t gid, struct p9_qid *qid)</div><div class='add'>+			 dev_t rdev, kgid_t gid, struct p9_qid *qid)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TMKNOD fid %d name %s mode %d major %d "</div><div class='del'>-		"minor %d\n", fid-&gt;fid, name, mode, MAJOR(rdev), MINOR(rdev));</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&gt;&gt;&gt; TMKNOD fid %d name %s mode %d major %d minor %d\n",</div><div class='add'>+		 fid-&gt;fid, name, mode, MAJOR(rdev), MINOR(rdev));</div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TMKNOD, "dsdddg", fid-&gt;fid, name, mode,</div><div class='del'>-		MAJOR(rdev), MINOR(rdev), gid);</div><div class='add'>+			    MAJOR(rdev), MINOR(rdev), gid);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RMKNOD qid %x.%llx.%x\n", qid-&gt;type,</div><div class='del'>-				(unsigned long long)qid-&gt;path, qid-&gt;version);</div><div class='add'>+	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RMKNOD qid %x.%llx.%x\n",</div><div class='add'>+		 qid-&gt;type, qid-&gt;path, qid-&gt;version);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_mknod_dotl);</div><div class='ctx'> </div><div class='ctx'> int p9_client_mkdir_dotl(struct p9_fid *fid, const char *name, int mode,</div><div class='del'>-				kgid_t gid, struct p9_qid *qid)</div><div class='add'>+			 kgid_t gid, struct p9_qid *qid)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TMKDIR fid %d name %s mode %d gid %d\n",</div><div class='ctx'> 		 fid-&gt;fid, name, mode, from_kgid(&amp;init_user_ns, gid));</div><div class='del'>-	req = p9_client_rpc(clnt, P9_TMKDIR, "dsdg", fid-&gt;fid, name, mode,</div><div class='del'>-		gid);</div><div class='add'>+	req = p9_client_rpc(clnt, P9_TMKDIR, "dsdg",</div><div class='add'>+			    fid-&gt;fid, name, mode, gid);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "Q", qid);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RMKDIR qid %x.%llx.%x\n", qid-&gt;type,</div><div class='del'>-				(unsigned long long)qid-&gt;path, qid-&gt;version);</div><div class='add'>+		 qid-&gt;path, qid-&gt;version);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_mkdir_dotl);</div><div class='ctx'> </div><div class='hunk'>@@ -2196,30 +2111,28 @@ int p9_client_lock_dotl(struct p9_fid *fid, struct p9_flock *flock, u8 *status)</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TLOCK fid %d type %i flags %d "</div><div class='del'>-			"start %lld length %lld proc_id %d client_id %s\n",</div><div class='del'>-			fid-&gt;fid, flock-&gt;type, flock-&gt;flags, flock-&gt;start,</div><div class='del'>-			flock-&gt;length, flock-&gt;proc_id, flock-&gt;client_id);</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&gt;&gt;&gt; TLOCK fid %d type %i flags %d start %lld length %lld proc_id %d client_id %s\n",</div><div class='add'>+		 fid-&gt;fid, flock-&gt;type, flock-&gt;flags, flock-&gt;start,</div><div class='add'>+		 flock-&gt;length, flock-&gt;proc_id, flock-&gt;client_id);</div><div class='ctx'> </div><div class='ctx'> 	req = p9_client_rpc(clnt, P9_TLOCK, "dbdqqds", fid-&gt;fid, flock-&gt;type,</div><div class='del'>-				flock-&gt;flags, flock-&gt;start, flock-&gt;length,</div><div class='del'>-					flock-&gt;proc_id, flock-&gt;client_id);</div><div class='add'>+			    flock-&gt;flags, flock-&gt;start, flock-&gt;length,</div><div class='add'>+			    flock-&gt;proc_id, flock-&gt;client_id);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "b", status);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "b", status);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RLOCK status %i\n", *status);</div><div class='ctx'> error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_lock_dotl);</div><div class='ctx'> </div><div class='hunk'>@@ -2229,30 +2142,32 @@ int p9_client_getlock_dotl(struct p9_fid *fid, struct p9_getlock *glock)</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TGETLOCK fid %d, type %i start %lld "</div><div class='del'>-		"length %lld proc_id %d client_id %s\n", fid-&gt;fid, glock-&gt;type,</div><div class='del'>-		glock-&gt;start, glock-&gt;length, glock-&gt;proc_id, glock-&gt;client_id);</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&gt;&gt;&gt; TGETLOCK fid %d, type %i start %lld length %lld proc_id %d client_id %s\n",</div><div class='add'>+		 fid-&gt;fid, glock-&gt;type, glock-&gt;start, glock-&gt;length,</div><div class='add'>+		 glock-&gt;proc_id, glock-&gt;client_id);</div><div class='ctx'> </div><div class='del'>-	req = p9_client_rpc(clnt, P9_TGETLOCK, "dbqqds", fid-&gt;fid,  glock-&gt;type,</div><div class='del'>-		glock-&gt;start, glock-&gt;length, glock-&gt;proc_id, glock-&gt;client_id);</div><div class='add'>+	req = p9_client_rpc(clnt, P9_TGETLOCK, "dbqqds", fid-&gt;fid,</div><div class='add'>+			    glock-&gt;type, glock-&gt;start, glock-&gt;length,</div><div class='add'>+			    glock-&gt;proc_id, glock-&gt;client_id);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "bqqds", &amp;glock-&gt;type,</div><div class='del'>-			&amp;glock-&gt;start, &amp;glock-&gt;length, &amp;glock-&gt;proc_id,</div><div class='del'>-			&amp;glock-&gt;client_id);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "bqqds", &amp;glock-&gt;type,</div><div class='add'>+			  &amp;glock-&gt;start, &amp;glock-&gt;length, &amp;glock-&gt;proc_id,</div><div class='add'>+			  &amp;glock-&gt;client_id);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RGETLOCK type %i start %lld length %lld "</div><div class='del'>-		"proc_id %d client_id %s\n", glock-&gt;type, glock-&gt;start,</div><div class='del'>-		glock-&gt;length, glock-&gt;proc_id, glock-&gt;client_id);</div><div class='add'>+	p9_debug(P9_DEBUG_9P,</div><div class='add'>+		 "&lt;&lt;&lt; RGETLOCK type %i start %lld length %lld proc_id %d client_id %s\n",</div><div class='add'>+		 glock-&gt;type, glock-&gt;start, glock-&gt;length,</div><div class='add'>+		 glock-&gt;proc_id, glock-&gt;client_id);</div><div class='ctx'> error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_getlock_dotl);</div><div class='hunk'>@@ -2263,7 +2178,6 @@ int p9_client_readlink(struct p9_fid *fid, char **target)</div><div class='ctx'> 	struct p9_client *clnt;</div><div class='ctx'> 	struct p9_req_t *req;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	clnt = fid-&gt;clnt;</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&gt;&gt;&gt; TREADLINK fid %d\n", fid-&gt;fid);</div><div class='ctx'> </div><div class='hunk'>@@ -2271,14 +2185,25 @@ int p9_client_readlink(struct p9_fid *fid, char **target)</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='del'>-	err = p9pdu_readf(req-&gt;rc, clnt-&gt;proto_version, "s", target);</div><div class='add'>+	err = p9pdu_readf(&amp;req-&gt;rc, clnt-&gt;proto_version, "s", target);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		trace_9p_protocol_dump(clnt, req-&gt;rc);</div><div class='add'>+		trace_9p_protocol_dump(clnt, &amp;req-&gt;rc);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; RREADLINK target %s\n", *target);</div><div class='ctx'> error:</div><div class='del'>-	p9_free_req(clnt, req);</div><div class='add'>+	p9_req_put(clnt, req);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9_client_readlink);</div><div class='add'>+</div><div class='add'>+int __init p9_client_init(void)</div><div class='add'>+{</div><div class='add'>+	p9_req_cache = KMEM_CACHE(p9_req_t, SLAB_TYPESAFE_BY_RCU);</div><div class='add'>+	return p9_req_cache ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __exit p9_client_exit(void)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_destroy(p9_req_cache);</div><div class='add'>+}</div><div class='head'>diff --git a/net/9p/error.c b/net/9p/error.c<br/>index 126fd0dceea2..8ba8afc91482 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/error.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/error.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/error.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/error.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * linux/fs/9p/error.c</div><div class='del'>- *</div><div class='ctx'>  * Error string handling</div><div class='ctx'>  *</div><div class='ctx'>  * Plan 9 uses error strings, Unix uses error numbers.  These functions</div><div class='hunk'>@@ -9,22 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *  Copyright (C) 2002 by Ron Minnich &lt;rminnich@lanl.gov&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -33,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hashtable.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -50,8 +34,8 @@ struct errormap {</div><div class='ctx'> 	struct hlist_node list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ERRHASHSZ		32</div><div class='del'>-static struct hlist_head hash_errmap[ERRHASHSZ];</div><div class='add'>+#define ERRHASH_BITS 5</div><div class='add'>+static DEFINE_HASHTABLE(hash_errmap, ERRHASH_BITS);</div><div class='ctx'> </div><div class='ctx'> /* FixMe - reduce to a reasonable size */</div><div class='ctx'> static struct errormap errmap[] = {</div><div class='hunk'>@@ -193,18 +177,14 @@ static struct errormap errmap[] = {</div><div class='ctx'> int p9_error_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct errormap *c;</div><div class='del'>-	int bucket;</div><div class='del'>-</div><div class='del'>-	/* initialize hash table */</div><div class='del'>-	for (bucket = 0; bucket &lt; ERRHASHSZ; bucket++)</div><div class='del'>-		INIT_HLIST_HEAD(&amp;hash_errmap[bucket]);</div><div class='add'>+	u32 hash;</div><div class='ctx'> </div><div class='ctx'> 	/* load initial error map into hash table */</div><div class='del'>-	for (c = errmap; c-&gt;name != NULL; c++) {</div><div class='add'>+	for (c = errmap; c-&gt;name; c++) {</div><div class='ctx'> 		c-&gt;namelen = strlen(c-&gt;name);</div><div class='del'>-		bucket = jhash(c-&gt;name, c-&gt;namelen, 0) % ERRHASHSZ;</div><div class='add'>+		hash = jhash(c-&gt;name, c-&gt;namelen, 0);</div><div class='ctx'> 		INIT_HLIST_NODE(&amp;c-&gt;list);</div><div class='del'>-		hlist_add_head(&amp;c-&gt;list, &amp;hash_errmap[bucket]);</div><div class='add'>+		hash_add(hash_errmap, &amp;c-&gt;list, hash);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -212,7 +192,7 @@ int p9_error_init(void)</div><div class='ctx'> EXPORT_SYMBOL(p9_error_init);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * errstr2errno - convert error string to error number</div><div class='add'>+ * p9_errstr2errno - convert error string to error number</div><div class='ctx'>  * @errstr: error string</div><div class='ctx'>  * @len: length of error string</div><div class='ctx'>  *</div><div class='hunk'>@@ -222,12 +202,12 @@ int p9_errstr2errno(char *errstr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int errno;</div><div class='ctx'> 	struct errormap *c;</div><div class='del'>-	int bucket;</div><div class='add'>+	u32 hash;</div><div class='ctx'> </div><div class='ctx'> 	errno = 0;</div><div class='ctx'> 	c = NULL;</div><div class='del'>-	bucket = jhash(errstr, len, 0) % ERRHASHSZ;</div><div class='del'>-	hlist_for_each_entry(c, &amp;hash_errmap[bucket], list) {</div><div class='add'>+	hash = jhash(errstr, len, 0);</div><div class='add'>+	hash_for_each_possible(hash_errmap, c, list, hash) {</div><div class='ctx'> 		if (c-&gt;namelen == len &amp;&amp; !memcmp(c-&gt;name, errstr, len)) {</div><div class='ctx'> 			errno = c-&gt;val;</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/net/9p/mod.c b/net/9p/mod.c<br/>index 253ba824a325..85160b52da55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/mod.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/mod.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/mod.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/mod.c</a></div><div class='hunk'>@@ -1,51 +1,34 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- *  net/9p/9p.c</div><div class='del'>- *</div><div class='ctx'>  *  9P entry point</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007 by Latchesar Ionkov &lt;lucho@ionkov.net&gt;</div><div class='ctx'>  *  Copyright (C) 2004 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *  Copyright (C) 2002 by Ron Minnich &lt;rminnich@lanl.gov&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> #include &lt;net/9p/transport.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_9P_DEBUG</div><div class='del'>-unsigned int p9_debug_level = 0;	/* feature-rific global debug level  */</div><div class='add'>+unsigned int p9_debug_level;	/* feature-rific global debug level  */</div><div class='ctx'> EXPORT_SYMBOL(p9_debug_level);</div><div class='ctx'> module_param_named(debug, p9_debug_level, uint, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug, "9P debugging level");</div><div class='ctx'> </div><div class='ctx'> void _p9_debug(enum p9_debug_flags level, const char *func,</div><div class='del'>-		const char *fmt, ...)</div><div class='add'>+	       const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='hunk'>@@ -68,10 +51,7 @@ void _p9_debug(enum p9_debug_flags level, const char *func,</div><div class='ctx'> EXPORT_SYMBOL(_p9_debug);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Dynamic Transport Registration Routines</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* Dynamic Transport Registration Routines */</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(v9fs_trans_lock);</div><div class='ctx'> static LIST_HEAD(v9fs_trans_list);</div><div class='hunk'>@@ -102,12 +82,7 @@ void v9fs_unregister_trans(struct p9_trans_module *m)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v9fs_unregister_trans);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * v9fs_get_trans_by_name - get transport with the matching name</div><div class='del'>- * @s: string identifying transport</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-struct p9_trans_module *v9fs_get_trans_by_name(char *s)</div><div class='add'>+static struct p9_trans_module *_p9_get_trans_by_name(const char *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_trans_module *t, *found = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -121,10 +96,36 @@ struct p9_trans_module *v9fs_get_trans_by_name(char *s)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;v9fs_trans_lock);</div><div class='add'>+</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * v9fs_get_trans_by_name - get transport with the matching name</div><div class='add'>+ * @s: string identifying transport</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct p9_trans_module *v9fs_get_trans_by_name(const char *s)</div><div class='add'>+{</div><div class='add'>+	struct p9_trans_module *found = NULL;</div><div class='add'>+</div><div class='add'>+	found = _p9_get_trans_by_name(s);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+	if (!found) {</div><div class='add'>+		request_module("9p-%s", s);</div><div class='add'>+		found = _p9_get_trans_by_name(s);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v9fs_get_trans_by_name);</div><div class='ctx'> </div><div class='add'>+static const char * const v9fs_default_transports[] = {</div><div class='add'>+	"virtio", "tcp", "fd", "unix", "xen", "rdma",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * v9fs_get_default_trans - get the default transport</div><div class='ctx'>  *</div><div class='hunk'>@@ -133,6 +134,7 @@ EXPORT_SYMBOL(v9fs_get_trans_by_name);</div><div class='ctx'> struct p9_trans_module *v9fs_get_default_trans(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_trans_module *t, *found = NULL;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;v9fs_trans_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -150,6 +152,10 @@ struct p9_trans_module *v9fs_get_default_trans(void)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;v9fs_trans_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; !found &amp;&amp; i &lt; ARRAY_SIZE(v9fs_default_transports); i++)</div><div class='add'>+		found = v9fs_get_trans_by_name(v9fs_default_transports[i]);</div><div class='add'>+</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v9fs_get_default_trans);</div><div class='hunk'>@@ -164,6 +170,7 @@ void v9fs_put_trans(struct p9_trans_module *m)</div><div class='ctx'> 	if (m)</div><div class='ctx'> 		module_put(m-&gt;owner);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(v9fs_put_trans);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * init_p9 - Initialize module</div><div class='hunk'>@@ -171,11 +178,16 @@ void v9fs_put_trans(struct p9_trans_module *m)</div><div class='ctx'>  */</div><div class='ctx'> static int __init init_p9(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = p9_client_init();</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	p9_error_init();</div><div class='ctx'> 	pr_info("Installing 9P2000 support\n");</div><div class='del'>-	p9_trans_fd_init();</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -187,7 +199,7 @@ static void __exit exit_p9(void)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("Unloading 9P2000 support\n");</div><div class='ctx'> </div><div class='del'>-	p9_trans_fd_exit();</div><div class='add'>+	p9_client_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(init_p9)</div><div class='hunk'>@@ -197,3 +209,4 @@ MODULE_AUTHOR("Latchesar Ionkov &lt;lucho@ionkov.net&gt;");</div><div class='ctx'> MODULE_AUTHOR("Eric Van Hensbergen &lt;ericvh@gmail.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Ron Minnich &lt;rminnich@lanl.gov&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Plan 9 Resource Sharing Support (9P2000)");</div><div class='head'>diff --git a/net/9p/protocol.c b/net/9p/protocol.c<br/>index 4a1e1dd30b52..0e6603b1ec90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/protocol.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/protocol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/protocol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/protocol.c</a></div><div class='hunk'>@@ -1,28 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * net/9p/protocol.c</div><div class='del'>- *</div><div class='ctx'>  * 9P Protocol Support Code</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Base on code from Anthony Liguori &lt;aliguori@us.ibm.com&gt;</div><div class='ctx'>  *  Copyright (C) 2008 by IBM, Corp.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -40,22 +23,195 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/9p.h&gt;</div><div class='ctx'> </div><div class='add'>+/* len[2] text[len] */</div><div class='add'>+#define P9_STRLEN(s) \</div><div class='add'>+	(2 + min_t(size_t, s ? strlen(s) : 0, USHRT_MAX))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * p9_msg_buf_size - Returns a buffer size sufficiently large to hold the</div><div class='add'>+ * intended 9p message.</div><div class='add'>+ * @c: client</div><div class='add'>+ * @type: message type</div><div class='add'>+ * @fmt: format template for assembling request message</div><div class='add'>+ * (see p9pdu_vwritef)</div><div class='add'>+ * @ap: variable arguments to be fed to passed format template</div><div class='add'>+ * (see p9pdu_vwritef)</div><div class='add'>+ *</div><div class='add'>+ * Note: Even for response types (P9_R*) the format template and variable</div><div class='add'>+ * arguments must always be for the originating request type (P9_T*).</div><div class='add'>+ */</div><div class='add'>+size_t p9_msg_buf_size(struct p9_client *c, enum p9_msg_t type,</div><div class='add'>+			const char *fmt, va_list ap)</div><div class='add'>+{</div><div class='add'>+	/* size[4] type[1] tag[2] */</div><div class='add'>+	const int hdr = 4 + 1 + 2;</div><div class='add'>+	/* ename[s] errno[4] */</div><div class='add'>+	const int rerror_size = hdr + P9_ERRMAX + 4;</div><div class='add'>+	/* ecode[4] */</div><div class='add'>+	const int rlerror_size = hdr + 4;</div><div class='add'>+	const int err_size =</div><div class='add'>+		c-&gt;proto_version == p9_proto_2000L ? rlerror_size : rerror_size;</div><div class='add'>+</div><div class='add'>+	static_assert(NAME_MAX &lt;= 4*1024, "p9_msg_buf_size() currently assumes "</div><div class='add'>+				  "a max. allowed directory entry name length of 4k");</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+</div><div class='add'>+	/* message types not used at all */</div><div class='add'>+	case P9_TERROR:</div><div class='add'>+	case P9_TLERROR:</div><div class='add'>+	case P9_TAUTH:</div><div class='add'>+	case P9_RAUTH:</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	/* variable length &amp; potentially large message types */</div><div class='add'>+	case P9_TATTACH:</div><div class='add'>+		BUG_ON(strcmp("ddss?u", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			const char *uname = va_arg(ap, const char *);</div><div class='add'>+			const char *aname = va_arg(ap, const char *);</div><div class='add'>+			/* fid[4] afid[4] uname[s] aname[s] n_uname[4] */</div><div class='add'>+			return hdr + 4 + 4 + P9_STRLEN(uname) + P9_STRLEN(aname) + 4;</div><div class='add'>+		}</div><div class='add'>+	case P9_TWALK:</div><div class='add'>+		BUG_ON(strcmp("ddT", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			uint i, nwname = va_arg(ap, int);</div><div class='add'>+			size_t wname_all;</div><div class='add'>+			const char **wnames = va_arg(ap, const char **);</div><div class='add'>+			for (i = 0, wname_all = 0; i &lt; nwname; ++i) {</div><div class='add'>+				wname_all += P9_STRLEN(wnames[i]);</div><div class='add'>+			}</div><div class='add'>+			/* fid[4] newfid[4] nwname[2] nwname*(wname[s]) */</div><div class='add'>+			return hdr + 4 + 4 + 2 + wname_all;</div><div class='add'>+		}</div><div class='add'>+	case P9_RWALK:</div><div class='add'>+		BUG_ON(strcmp("ddT", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			uint nwname = va_arg(ap, int);</div><div class='add'>+			/* nwqid[2] nwqid*(wqid[13]) */</div><div class='add'>+			return max_t(size_t, hdr + 2 + nwname * 13, err_size);</div><div class='add'>+		}</div><div class='add'>+	case P9_TCREATE:</div><div class='add'>+		BUG_ON(strcmp("dsdb?s", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			const char *name = va_arg(ap, const char *);</div><div class='add'>+			if (c-&gt;proto_version == p9_proto_legacy) {</div><div class='add'>+				/* fid[4] name[s] perm[4] mode[1] */</div><div class='add'>+				return hdr + 4 + P9_STRLEN(name) + 4 + 1;</div><div class='add'>+			} else {</div><div class='add'>+				va_arg(ap, int32_t);</div><div class='add'>+				va_arg(ap, int);</div><div class='add'>+				{</div><div class='add'>+					const char *ext = va_arg(ap, const char *);</div><div class='add'>+					/* fid[4] name[s] perm[4] mode[1] extension[s] */</div><div class='add'>+					return hdr + 4 + P9_STRLEN(name) + 4 + 1 + P9_STRLEN(ext);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	case P9_TLCREATE:</div><div class='add'>+		BUG_ON(strcmp("dsddg", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			const char *name = va_arg(ap, const char *);</div><div class='add'>+			/* fid[4] name[s] flags[4] mode[4] gid[4] */</div><div class='add'>+			return hdr + 4 + P9_STRLEN(name) + 4 + 4 + 4;</div><div class='add'>+		}</div><div class='add'>+	case P9_RREAD:</div><div class='add'>+	case P9_RREADDIR:</div><div class='add'>+		BUG_ON(strcmp("dqd", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		va_arg(ap, int64_t);</div><div class='add'>+		{</div><div class='add'>+			const int32_t count = va_arg(ap, int32_t);</div><div class='add'>+			/* count[4] data[count] */</div><div class='add'>+			return max_t(size_t, hdr + 4 + count, err_size);</div><div class='add'>+		}</div><div class='add'>+	case P9_TWRITE:</div><div class='add'>+		BUG_ON(strcmp("dqV", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		va_arg(ap, int64_t);</div><div class='add'>+		{</div><div class='add'>+			const int32_t count = va_arg(ap, int32_t);</div><div class='add'>+			/* fid[4] offset[8] count[4] data[count] */</div><div class='add'>+			return hdr + 4 + 8 + 4 + count;</div><div class='add'>+		}</div><div class='add'>+	case P9_TRENAMEAT:</div><div class='add'>+		BUG_ON(strcmp("dsds", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			const char *oldname, *newname;</div><div class='add'>+			oldname = va_arg(ap, const char *);</div><div class='add'>+			va_arg(ap, int32_t);</div><div class='add'>+			newname = va_arg(ap, const char *);</div><div class='add'>+			/* olddirfid[4] oldname[s] newdirfid[4] newname[s] */</div><div class='add'>+			return hdr + 4 + P9_STRLEN(oldname) + 4 + P9_STRLEN(newname);</div><div class='add'>+		}</div><div class='add'>+	case P9_TSYMLINK:</div><div class='add'>+		BUG_ON(strcmp("dssg", fmt));</div><div class='add'>+		va_arg(ap, int32_t);</div><div class='add'>+		{</div><div class='add'>+			const char *name = va_arg(ap, const char *);</div><div class='add'>+			const char *symtgt = va_arg(ap, const char *);</div><div class='add'>+			/* fid[4] name[s] symtgt[s] gid[4] */</div><div class='add'>+			return hdr + 4 + P9_STRLEN(name) + P9_STRLEN(symtgt) + 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case P9_RERROR:</div><div class='add'>+		return rerror_size;</div><div class='add'>+	case P9_RLERROR:</div><div class='add'>+		return rlerror_size;</div><div class='add'>+</div><div class='add'>+	/* small message types */</div><div class='add'>+	case P9_TWSTAT:</div><div class='add'>+	case P9_RSTAT:</div><div class='add'>+	case P9_RREADLINK:</div><div class='add'>+	case P9_TXATTRWALK:</div><div class='add'>+	case P9_TXATTRCREATE:</div><div class='add'>+	case P9_TLINK:</div><div class='add'>+	case P9_TMKDIR:</div><div class='add'>+	case P9_TMKNOD:</div><div class='add'>+	case P9_TRENAME:</div><div class='add'>+	case P9_TUNLINKAT:</div><div class='add'>+	case P9_TLOCK:</div><div class='add'>+		return 8 * 1024;</div><div class='add'>+</div><div class='add'>+	/* tiny message types */</div><div class='add'>+	default:</div><div class='add'>+		return 4 * 1024;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> p9pdu_writef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...);</div><div class='ctx'> </div><div class='ctx'> void p9stat_free(struct p9_wstat *stbuf)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(stbuf-&gt;name);</div><div class='add'>+	stbuf-&gt;name = NULL;</div><div class='ctx'> 	kfree(stbuf-&gt;uid);</div><div class='add'>+	stbuf-&gt;uid = NULL;</div><div class='ctx'> 	kfree(stbuf-&gt;gid);</div><div class='add'>+	stbuf-&gt;gid = NULL;</div><div class='ctx'> 	kfree(stbuf-&gt;muid);</div><div class='add'>+	stbuf-&gt;muid = NULL;</div><div class='ctx'> 	kfree(stbuf-&gt;extension);</div><div class='add'>+	stbuf-&gt;extension = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9stat_free);</div><div class='ctx'> </div><div class='ctx'> size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	size_t len = min(pdu-&gt;size - pdu-&gt;offset, size);</div><div class='add'>+</div><div class='ctx'> 	memcpy(data, &amp;pdu-&gt;sdata[pdu-&gt;offset], len);</div><div class='ctx'> 	pdu-&gt;offset += len;</div><div class='ctx'> 	return size - len;</div><div class='hunk'>@@ -64,6 +220,7 @@ size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size)</div><div class='ctx'> static size_t pdu_write(struct p9_fcall *pdu, const void *data, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	size_t len = min(pdu-&gt;capacity - pdu-&gt;size, size);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;pdu-&gt;sdata[pdu-&gt;size], data, len);</div><div class='ctx'> 	pdu-&gt;size += len;</div><div class='ctx'> 	return size - len;</div><div class='hunk'>@@ -73,34 +230,33 @@ static size_t</div><div class='ctx'> pdu_write_u(struct p9_fcall *pdu, struct iov_iter *from, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	size_t len = min(pdu-&gt;capacity - pdu-&gt;size, size);</div><div class='del'>-	struct iov_iter i = *from;</div><div class='del'>-	if (!copy_from_iter_full(&amp;pdu-&gt;sdata[pdu-&gt;size], len, &amp;i))</div><div class='add'>+</div><div class='add'>+	if (!copy_from_iter_full(&amp;pdu-&gt;sdata[pdu-&gt;size], len, from))</div><div class='ctx'> 		len = 0;</div><div class='ctx'> </div><div class='ctx'> 	pdu-&gt;size += len;</div><div class='ctx'> 	return size - len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-	b - int8_t</div><div class='del'>-	w - int16_t</div><div class='del'>-	d - int32_t</div><div class='del'>-	q - int64_t</div><div class='del'>-	s - string</div><div class='del'>-	u - numeric uid</div><div class='del'>-	g - numeric gid</div><div class='del'>-	S - stat</div><div class='del'>-	Q - qid</div><div class='del'>-	D - data blob (int32_t size followed by void *, results are not freed)</div><div class='del'>-	T - array of strings (int16_t count, followed by strings)</div><div class='del'>-	R - array of qids (int16_t count, followed by qids)</div><div class='del'>-	A - stat for 9p2000.L (p9_stat_dotl)</div><div class='del'>-	? - if optional = 1, continue parsing</div><div class='del'>-*/</div><div class='add'>+/*	b - int8_t</div><div class='add'>+ *	w - int16_t</div><div class='add'>+ *	d - int32_t</div><div class='add'>+ *	q - int64_t</div><div class='add'>+ *	s - string</div><div class='add'>+ *	u - numeric uid</div><div class='add'>+ *	g - numeric gid</div><div class='add'>+ *	S - stat</div><div class='add'>+ *	Q - qid</div><div class='add'>+ *	D - data blob (int32_t size followed by void *, results are not freed)</div><div class='add'>+ *	T - array of strings (int16_t count, followed by strings)</div><div class='add'>+ *	R - array of qids (int16_t count, followed by qids)</div><div class='add'>+ *	A - stat for 9p2000.L (p9_stat_dotl)</div><div class='add'>+ *	? - if optional = 1, continue parsing</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='del'>-	va_list ap)</div><div class='add'>+	     va_list ap)</div><div class='ctx'> {</div><div class='ctx'> 	const char *ptr;</div><div class='ctx'> 	int errcode = 0;</div><div class='hunk'>@@ -238,6 +394,8 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='ctx'> 				uint16_t *nwname = va_arg(ap, uint16_t *);</div><div class='ctx'> 				char ***wnames = va_arg(ap, char ***);</div><div class='ctx'> </div><div class='add'>+				*wnames = NULL;</div><div class='add'>+</div><div class='ctx'> 				errcode = p9pdu_readf(pdu, proto_version,</div><div class='ctx'> 								"w", nwname);</div><div class='ctx'> 				if (!errcode) {</div><div class='hunk'>@@ -247,6 +405,8 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='ctx'> 							  GFP_NOFS);</div><div class='ctx'> 					if (!*wnames)</div><div class='ctx'> 						errcode = -ENOMEM;</div><div class='add'>+					else</div><div class='add'>+						(*wnames)[0] = NULL;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (!errcode) {</div><div class='hunk'>@@ -258,8 +418,10 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='ctx'> 								proto_version,</div><div class='ctx'> 								"s",</div><div class='ctx'> 								&amp;(*wnames)[i]);</div><div class='del'>-						if (errcode)</div><div class='add'>+						if (errcode) {</div><div class='add'>+							(*wnames)[i] = NULL;</div><div class='ctx'> 							break;</div><div class='add'>+						}</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -267,11 +429,14 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='ctx'> 					if (*wnames) {</div><div class='ctx'> 						int i;</div><div class='ctx'> </div><div class='del'>-						for (i = 0; i &lt; *nwname; i++)</div><div class='add'>+						for (i = 0; i &lt; *nwname; i++) {</div><div class='add'>+							if (!(*wnames)[i])</div><div class='add'>+								break;</div><div class='ctx'> 							kfree((*wnames)[i]);</div><div class='add'>+						}</div><div class='add'>+						kfree(*wnames);</div><div class='add'>+						*wnames = NULL;</div><div class='ctx'> 					}</div><div class='del'>-					kfree(*wnames);</div><div class='del'>-					*wnames = NULL;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -566,9 +731,10 @@ int p9stat_read(struct p9_client *clnt, char *buf, int len, struct p9_wstat *st)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; p9stat_read failed: %d\n", ret);</div><div class='ctx'> 		trace_9p_protocol_dump(clnt, &amp;fake_pdu);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return fake_pdu.offset;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9stat_read);</div><div class='ctx'> </div><div class='hunk'>@@ -617,13 +783,19 @@ int p9dirent_read(struct p9_client *clnt, char *buf, int len,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_9P, "&lt;&lt;&lt; p9dirent_read failed: %d\n", ret);</div><div class='ctx'> 		trace_9p_protocol_dump(clnt, &amp;fake_pdu);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(dirent-&gt;d_name, nameptr);</div><div class='add'>+	ret = strscpy(dirent-&gt;d_name, nameptr, sizeof(dirent-&gt;d_name));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "On the wire dirent name too long: %s\n",</div><div class='add'>+			 nameptr);</div><div class='add'>+		kfree(nameptr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	kfree(nameptr);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return fake_pdu.offset;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(p9dirent_read);</div><div class='head'>diff --git a/net/9p/protocol.h b/net/9p/protocol.h<br/>index 2cc525fa49fa..ad2283d1f96b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/protocol.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/protocol.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/protocol.h</a></div><div class='hunk'>@@ -1,32 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='del'>- * net/9p/protocol.h</div><div class='del'>- *</div><div class='ctx'>  * 9P Protocol Support Code</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Base on code from Anthony Liguori &lt;aliguori@us.ibm.com&gt;</div><div class='ctx'>  *  Copyright (C) 2008 by IBM, Corp.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+size_t p9_msg_buf_size(struct p9_client *c, enum p9_msg_t type,</div><div class='add'>+			const char *fmt, va_list ap);</div><div class='ctx'> int p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt,</div><div class='del'>-								va_list ap);</div><div class='add'>+		  va_list ap);</div><div class='ctx'> int p9pdu_readf(struct p9_fcall *pdu, int proto_version, const char *fmt, ...);</div><div class='ctx'> int p9pdu_prepare(struct p9_fcall *pdu, int16_t tag, int8_t type);</div><div class='ctx'> int p9pdu_finalize(struct p9_client *clnt, struct p9_fcall *pdu);</div><div class='head'>diff --git a/net/9p/trans_common.c b/net/9p/trans_common.c<br/>index b718db2085b2..c827f694551c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_common.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_common.c</a></div><div class='hunk'>@@ -1,22 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: LGPL-2.1</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright IBM Corporation, 2010</div><div class='ctx'>  * Author Venkateswararao Jujjuri &lt;jvrao@linux.vnet.ibm.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of version 2.1 of the GNU Lesser General Public License</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it would be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include "trans_common.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  p9_release_pages - Release pages after the transaction.</div><div class='add'>+ * p9_release_pages - Release pages after the transaction.</div><div class='add'>+ * @pages: array of pages to be put</div><div class='add'>+ * @nr_pages: size of array</div><div class='ctx'>  */</div><div class='ctx'> void p9_release_pages(struct page **pages, int nr_pages)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/9p/trans_common.h b/net/9p/trans_common.h<br/>index c43babb3f635..32134db6abf3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_common.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_common.h</a></div><div class='hunk'>@@ -1,15 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: LGPL-2.1 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright IBM Corporation, 2010</div><div class='ctx'>  * Author Venkateswararao Jujjuri &lt;jvrao@linux.vnet.ibm.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of version 2.1 of the GNU Lesser General Public License</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it would be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void p9_release_pages(struct page **, int);</div><div class='add'>+void p9_release_pages(struct page **pages, int nr_pages);</div><div class='head'>diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c<br/>index e2ef3c782c53..0e331c1b2112 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_fd.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_fd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_fd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_fd.c</a></div><div class='hunk'>@@ -1,33 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * linux/fs/9p/trans_fd.c</div><div class='del'>- *</div><div class='ctx'>  * Fd transport layer.  Includes deprecated socket layer.</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 by Russ Cox &lt;rsc@swtch.com&gt;</div><div class='ctx'>  *  Copyright (C) 2004-2005 by Latchesar Ionkov &lt;lucho@ionkov.net&gt;</div><div class='ctx'>  *  Copyright (C) 2004-2008 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *  Copyright (C) 1997-2002 by Ron Minnich &lt;rminnich@sarnoff.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='hunk'>@@ -37,9 +21,8 @@</div><div class='ctx'> #include &lt;linux/un.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='hunk'>@@ -48,48 +31,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/syscalls.h&gt; /* killme */</div><div class='ctx'> </div><div class='del'>-#define P9_PORT 564</div><div class='del'>-#define MAX_SOCK_BUF (64*1024)</div><div class='add'>+#define MAX_SOCK_BUF (1024*1024)</div><div class='ctx'> #define MAXPOLLWADDR	2</div><div class='ctx'> </div><div class='ctx'> static struct p9_trans_module p9_tcp_trans;</div><div class='ctx'> static struct p9_trans_module p9_fd_trans;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct p9_fd_opts - per-transport options</div><div class='del'>- * @rfd: file descriptor for reading (trans=fd)</div><div class='del'>- * @wfd: file descriptor for writing (trans=fd)</div><div class='del'>- * @port: port to connect to (trans=tcp)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct p9_fd_opts {</div><div class='del'>-	int rfd;</div><div class='del'>-	int wfd;</div><div class='del'>-	u16 port;</div><div class='del'>-	bool privport;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  * Option Parsing (code inspired by NFS code)</div><div class='del'>-  *  - a little lazy - parse all fd-transport options</div><div class='del'>-  */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	/* Options that take integer arguments */</div><div class='del'>-	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err,</div><div class='del'>-	/* Options that take no arguments */</div><div class='del'>-	Opt_privport,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_port, "port=%u"},</div><div class='del'>-	{Opt_rfdno, "rfdno=%u"},</div><div class='del'>-	{Opt_wfdno, "wfdno=%u"},</div><div class='del'>-	{Opt_privport, "privport"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	Rworksched = 1,		/* read work scheduled or running */</div><div class='ctx'> 	Rpending = 2,		/* can read */</div><div class='hunk'>@@ -108,9 +55,11 @@ struct p9_poll_wait {</div><div class='ctx'>  * @mux_list: list link for mux to manage multiple connections (?)</div><div class='ctx'>  * @client: reference to client instance for this connection</div><div class='ctx'>  * @err: error state</div><div class='add'>+ * @req_lock: lock protecting req_list and requests statuses</div><div class='ctx'>  * @req_list: accounting for requests which have been sent</div><div class='ctx'>  * @unsent_req_list: accounting for requests that haven't been sent</div><div class='del'>- * @req: current request being processed (if any)</div><div class='add'>+ * @rreq: read request</div><div class='add'>+ * @wreq: write request</div><div class='ctx'>  * @tmp_buf: temporary buffer to read in header</div><div class='ctx'>  * @rc: temporary fcall for reading current frame</div><div class='ctx'>  * @wpos: write position for current frame</div><div class='hunk'>@@ -129,10 +78,12 @@ struct p9_conn {</div><div class='ctx'> 	struct list_head mux_list;</div><div class='ctx'> 	struct p9_client *client;</div><div class='ctx'> 	int err;</div><div class='add'>+	spinlock_t req_lock;</div><div class='ctx'> 	struct list_head req_list;</div><div class='ctx'> 	struct list_head unsent_req_list;</div><div class='del'>-	struct p9_req_t *req;</div><div class='del'>-	char tmp_buf[7];</div><div class='add'>+	struct p9_req_t *rreq;</div><div class='add'>+	struct p9_req_t *wreq;</div><div class='add'>+	char tmp_buf[P9_HDRSZ];</div><div class='ctx'> 	struct p9_fcall rc;</div><div class='ctx'> 	int wpos;</div><div class='ctx'> 	int wsize;</div><div class='hunk'>@@ -203,22 +154,27 @@ static void p9_conn_cancel(struct p9_conn *m, int err)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_ERROR, "mux %p err %d\n", m, err);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+	spin_lock(&amp;m-&gt;req_lock);</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;err) {</div><div class='del'>-		spin_unlock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+	if (READ_ONCE(m-&gt;err)) {</div><div class='add'>+		spin_unlock(&amp;m-&gt;req_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	m-&gt;err = err;</div><div class='add'>+	WRITE_ONCE(m-&gt;err, err);</div><div class='add'>+	ASSERT_EXCLUSIVE_WRITER(m-&gt;err);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(req, rtmp, &amp;m-&gt;req_list, req_list) {</div><div class='ctx'> 		list_move(&amp;req-&gt;req_list, &amp;cancel_list);</div><div class='add'>+		WRITE_ONCE(req-&gt;status, REQ_STATUS_ERROR);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_for_each_entry_safe(req, rtmp, &amp;m-&gt;unsent_req_list, req_list) {</div><div class='ctx'> 		list_move(&amp;req-&gt;req_list, &amp;cancel_list);</div><div class='add'>+		WRITE_ONCE(req-&gt;status, REQ_STATUS_ERROR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(req, rtmp, &amp;cancel_list, req_list) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "call back req %p\n", req);</div><div class='ctx'> 		list_del(&amp;req-&gt;req_list);</div><div class='hunk'>@@ -226,7 +182,6 @@ static void p9_conn_cancel(struct p9_conn *m, int err)</div><div class='ctx'> 			req-&gt;t_err = err;</div><div class='ctx'> 		p9_client_cb(m-&gt;client, req, REQ_STATUS_ERROR);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;m-&gt;client-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __poll_t</div><div class='hunk'>@@ -291,11 +246,10 @@ static void p9_read_work(struct work_struct *work)</div><div class='ctx'> 	__poll_t n;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct p9_conn *m;</div><div class='del'>-	int status = REQ_STATUS_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	m = container_of(work, struct p9_conn, rq);</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;err &lt; 0)</div><div class='add'>+	if (READ_ONCE(m-&gt;err) &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "start mux %p pos %zd\n", m, m-&gt;rc.offset);</div><div class='hunk'>@@ -303,7 +257,7 @@ static void p9_read_work(struct work_struct *work)</div><div class='ctx'> 	if (!m-&gt;rc.sdata) {</div><div class='ctx'> 		m-&gt;rc.sdata = m-&gt;tmp_buf;</div><div class='ctx'> 		m-&gt;rc.offset = 0;</div><div class='del'>-		m-&gt;rc.capacity = 7; /* start by reading header */</div><div class='add'>+		m-&gt;rc.capacity = P9_HDRSZ; /* start by reading header */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(Rpending, &amp;m-&gt;wsched);</div><div class='hunk'>@@ -322,11 +276,11 @@ static void p9_read_work(struct work_struct *work)</div><div class='ctx'> 	m-&gt;rc.offset += err;</div><div class='ctx'> </div><div class='ctx'> 	/* header read in */</div><div class='del'>-	if ((!m-&gt;req) &amp;&amp; (m-&gt;rc.offset == m-&gt;rc.capacity)) {</div><div class='add'>+	if ((!m-&gt;rreq) &amp;&amp; (m-&gt;rc.offset == m-&gt;rc.capacity)) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_TRANS, "got new header\n");</div><div class='ctx'> </div><div class='ctx'> 		/* Header size */</div><div class='del'>-		m-&gt;rc.size = 7;</div><div class='add'>+		m-&gt;rc.size = P9_HDRSZ;</div><div class='ctx'> 		err = p9_parse_header(&amp;m-&gt;rc, &amp;m-&gt;rc.size, NULL, NULL, 0);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			p9_debug(P9_DEBUG_ERROR,</div><div class='hunk'>@@ -334,35 +288,36 @@ static void p9_read_work(struct work_struct *work)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (m-&gt;rc.size &gt;= m-&gt;client-&gt;msize) {</div><div class='del'>-			p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-				 "requested packet size too big: %d\n",</div><div class='del'>-				 m-&gt;rc.size);</div><div class='del'>-			err = -EIO;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		p9_debug(P9_DEBUG_TRANS,</div><div class='ctx'> 			 "mux %p pkt: size: %d bytes tag: %d\n",</div><div class='ctx'> 			 m, m-&gt;rc.size, m-&gt;rc.tag);</div><div class='ctx'> </div><div class='del'>-		m-&gt;req = p9_tag_lookup(m-&gt;client, m-&gt;rc.tag);</div><div class='del'>-		if (!m-&gt;req || (m-&gt;req-&gt;status != REQ_STATUS_SENT)) {</div><div class='add'>+		m-&gt;rreq = p9_tag_lookup(m-&gt;client, m-&gt;rc.tag);</div><div class='add'>+		if (!m-&gt;rreq || (m-&gt;rreq-&gt;status != REQ_STATUS_SENT)) {</div><div class='ctx'> 			p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n",</div><div class='ctx'> 				 m-&gt;rc.tag);</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (m-&gt;req-&gt;rc == NULL) {</div><div class='add'>+		if (m-&gt;rc.size &gt; m-&gt;rreq-&gt;rc.capacity) {</div><div class='add'>+			p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+				 "requested packet size too big: %d for tag %d with capacity %zd\n",</div><div class='add'>+				 m-&gt;rc.size, m-&gt;rc.tag, m-&gt;rreq-&gt;rc.capacity);</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!m-&gt;rreq-&gt;rc.sdata) {</div><div class='ctx'> 			p9_debug(P9_DEBUG_ERROR,</div><div class='ctx'> 				 "No recv fcall for tag %d (req %p), disconnecting!\n",</div><div class='del'>-				 m-&gt;rc.tag, m-&gt;req);</div><div class='del'>-			m-&gt;req = NULL;</div><div class='add'>+				 m-&gt;rc.tag, m-&gt;rreq);</div><div class='add'>+			p9_req_put(m-&gt;client, m-&gt;rreq);</div><div class='add'>+			m-&gt;rreq = NULL;</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		m-&gt;rc.sdata = (char *)m-&gt;req-&gt;rc + sizeof(struct p9_fcall);</div><div class='add'>+		m-&gt;rc.sdata = m-&gt;rreq-&gt;rc.sdata;</div><div class='ctx'> 		memcpy(m-&gt;rc.sdata, m-&gt;tmp_buf, m-&gt;rc.capacity);</div><div class='ctx'> 		m-&gt;rc.capacity = m-&gt;rc.size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -370,20 +325,31 @@ static void p9_read_work(struct work_struct *work)</div><div class='ctx'> 	/* packet is read in</div><div class='ctx'> 	 * not an else because some packets (like clunk) have no payload</div><div class='ctx'> 	 */</div><div class='del'>-	if ((m-&gt;req) &amp;&amp; (m-&gt;rc.offset == m-&gt;rc.capacity)) {</div><div class='add'>+	if ((m-&gt;rreq) &amp;&amp; (m-&gt;rc.offset == m-&gt;rc.capacity)) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_TRANS, "got new packet\n");</div><div class='del'>-		m-&gt;req-&gt;rc-&gt;size = m-&gt;rc.offset;</div><div class='del'>-		spin_lock(&amp;m-&gt;client-&gt;lock);</div><div class='del'>-		if (m-&gt;req-&gt;status != REQ_STATUS_ERROR)</div><div class='del'>-			status = REQ_STATUS_RCVD;</div><div class='del'>-		list_del(&amp;m-&gt;req-&gt;req_list);</div><div class='del'>-		/* update req-&gt;status while holding client-&gt;lock  */</div><div class='del'>-		p9_client_cb(m-&gt;client, m-&gt;req, status);</div><div class='del'>-		spin_unlock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+		m-&gt;rreq-&gt;rc.size = m-&gt;rc.offset;</div><div class='add'>+		spin_lock(&amp;m-&gt;req_lock);</div><div class='add'>+		if (m-&gt;rreq-&gt;status == REQ_STATUS_SENT) {</div><div class='add'>+			list_del(&amp;m-&gt;rreq-&gt;req_list);</div><div class='add'>+			p9_client_cb(m-&gt;client, m-&gt;rreq, REQ_STATUS_RCVD);</div><div class='add'>+		} else if (m-&gt;rreq-&gt;status == REQ_STATUS_FLSHD) {</div><div class='add'>+			/* Ignore replies associated with a cancelled request. */</div><div class='add'>+			p9_debug(P9_DEBUG_TRANS,</div><div class='add'>+				 "Ignore replies associated with a cancelled request\n");</div><div class='add'>+		} else {</div><div class='add'>+			spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+			p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+				 "Request tag %d errored out while we were reading the reply\n",</div><div class='add'>+				 m-&gt;rc.tag);</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;m-&gt;req_lock);</div><div class='ctx'> 		m-&gt;rc.sdata = NULL;</div><div class='ctx'> 		m-&gt;rc.offset = 0;</div><div class='ctx'> 		m-&gt;rc.capacity = 0;</div><div class='del'>-		m-&gt;req = NULL;</div><div class='add'>+		p9_req_put(m-&gt;client, m-&gt;rreq);</div><div class='add'>+		m-&gt;rreq = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> end_clear:</div><div class='hunk'>@@ -450,29 +416,31 @@ static void p9_write_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	m = container_of(work, struct p9_conn, wq);</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;err &lt; 0) {</div><div class='add'>+	if (READ_ONCE(m-&gt;err) &lt; 0) {</div><div class='ctx'> 		clear_bit(Wworksched, &amp;m-&gt;wsched);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!m-&gt;wsize) {</div><div class='del'>-		spin_lock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+		spin_lock(&amp;m-&gt;req_lock);</div><div class='ctx'> 		if (list_empty(&amp;m-&gt;unsent_req_list)) {</div><div class='ctx'> 			clear_bit(Wworksched, &amp;m-&gt;wsched);</div><div class='del'>-			spin_unlock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;m-&gt;req_lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		req = list_entry(m-&gt;unsent_req_list.next, struct p9_req_t,</div><div class='ctx'> 			       req_list);</div><div class='del'>-		req-&gt;status = REQ_STATUS_SENT;</div><div class='add'>+		WRITE_ONCE(req-&gt;status, REQ_STATUS_SENT);</div><div class='ctx'> 		p9_debug(P9_DEBUG_TRANS, "move req %p\n", req);</div><div class='ctx'> 		list_move_tail(&amp;req-&gt;req_list, &amp;m-&gt;req_list);</div><div class='ctx'> </div><div class='del'>-		m-&gt;wbuf = req-&gt;tc-&gt;sdata;</div><div class='del'>-		m-&gt;wsize = req-&gt;tc-&gt;size;</div><div class='add'>+		m-&gt;wbuf = req-&gt;tc.sdata;</div><div class='add'>+		m-&gt;wsize = req-&gt;tc.size;</div><div class='ctx'> 		m-&gt;wpos = 0;</div><div class='del'>-		spin_unlock(&amp;m-&gt;client-&gt;lock);</div><div class='add'>+		p9_req_get(req);</div><div class='add'>+		m-&gt;wreq = req;</div><div class='add'>+		spin_unlock(&amp;m-&gt;req_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "mux %p pos %d size %d\n",</div><div class='hunk'>@@ -492,8 +460,11 @@ static void p9_write_work(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	m-&gt;wpos += err;</div><div class='del'>-	if (m-&gt;wpos == m-&gt;wsize)</div><div class='add'>+	if (m-&gt;wpos == m-&gt;wsize) {</div><div class='ctx'> 		m-&gt;wpos = m-&gt;wsize = 0;</div><div class='add'>+		p9_req_put(m-&gt;client, m-&gt;wreq);</div><div class='add'>+		m-&gt;wreq = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> end_clear:</div><div class='ctx'> 	clear_bit(Wworksched, &amp;m-&gt;wsched);</div><div class='hunk'>@@ -586,6 +557,7 @@ static void p9_conn_create(struct p9_client *client)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;m-&gt;mux_list);</div><div class='ctx'> 	m-&gt;client = client;</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;m-&gt;req_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;m-&gt;req_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;m-&gt;unsent_req_list);</div><div class='ctx'> 	INIT_WORK(&amp;m-&gt;rq, p9_read_work);</div><div class='hunk'>@@ -616,7 +588,7 @@ static void p9_poll_mux(struct p9_conn *m)</div><div class='ctx'> 	__poll_t n;</div><div class='ctx'> 	int err = -ECONNRESET;</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;err &lt; 0)</div><div class='add'>+	if (READ_ONCE(m-&gt;err) &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	n = p9_fd_poll(m-&gt;client, NULL, &amp;err);</div><div class='hunk'>@@ -658,59 +630,75 @@ static void p9_poll_mux(struct p9_conn *m)</div><div class='ctx'> </div><div class='ctx'> static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> {</div><div class='del'>-	__poll_t n;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct p9_trans_fd *ts = client-&gt;trans;</div><div class='ctx'> 	struct p9_conn *m = &amp;ts-&gt;conn;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "mux %p task %p tcall %p id %d\n",</div><div class='del'>-		 m, current, req-&gt;tc, req-&gt;tc-&gt;id);</div><div class='del'>-	if (m-&gt;err &lt; 0)</div><div class='del'>-		return m-&gt;err;</div><div class='add'>+		 m, current, &amp;req-&gt;tc, req-&gt;tc.id);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;client-&gt;lock);</div><div class='del'>-	req-&gt;status = REQ_STATUS_UNSENT;</div><div class='del'>-	list_add_tail(&amp;req-&gt;req_list, &amp;m-&gt;unsent_req_list);</div><div class='del'>-	spin_unlock(&amp;client-&gt;lock);</div><div class='add'>+	spin_lock(&amp;m-&gt;req_lock);</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(Wpending, &amp;m-&gt;wsched))</div><div class='del'>-		n = EPOLLOUT;</div><div class='del'>-	else</div><div class='del'>-		n = p9_fd_poll(m-&gt;client, NULL, NULL);</div><div class='add'>+	err = READ_ONCE(m-&gt;err);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (n &amp; EPOLLOUT &amp;&amp; !test_and_set_bit(Wworksched, &amp;m-&gt;wsched))</div><div class='del'>-		schedule_work(&amp;m-&gt;wq);</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_UNSENT);</div><div class='add'>+	list_add_tail(&amp;req-&gt;req_list, &amp;m-&gt;unsent_req_list);</div><div class='add'>+	spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+</div><div class='add'>+	p9_poll_mux(m);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> {</div><div class='add'>+	struct p9_trans_fd *ts = client-&gt;trans;</div><div class='add'>+	struct p9_conn *m = &amp;ts-&gt;conn;</div><div class='ctx'> 	int ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "client %p req %p\n", client, req);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;client-&gt;lock);</div><div class='add'>+	spin_lock(&amp;m-&gt;req_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;status == REQ_STATUS_UNSENT) {</div><div class='ctx'> 		list_del(&amp;req-&gt;req_list);</div><div class='del'>-		req-&gt;status = REQ_STATUS_FLSHD;</div><div class='add'>+		WRITE_ONCE(req-&gt;status, REQ_STATUS_FLSHD);</div><div class='add'>+		p9_req_put(client, req);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;client-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;m-&gt;req_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> {</div><div class='add'>+	struct p9_trans_fd *ts = client-&gt;trans;</div><div class='add'>+	struct p9_conn *m = &amp;ts-&gt;conn;</div><div class='add'>+</div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "client %p req %p\n", client, req);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;m-&gt;req_lock);</div><div class='add'>+	/* Ignore cancelled request if status changed since the request was</div><div class='add'>+	 * processed in p9_client_flush()</div><div class='add'>+	*/</div><div class='add'>+	if (req-&gt;status != REQ_STATUS_SENT) {</div><div class='add'>+		spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* we haven't received a response for oldreq,</div><div class='ctx'> 	 * remove it from the list.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;client-&gt;lock);</div><div class='ctx'> 	list_del(&amp;req-&gt;req_list);</div><div class='del'>-	spin_unlock(&amp;client-&gt;lock);</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_FLSHD);</div><div class='add'>+	spin_unlock(&amp;m-&gt;req_lock);</div><div class='add'>+</div><div class='add'>+	p9_req_put(client, req);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -718,7 +706,7 @@ static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> {</div><div class='ctx'> 	if (clnt-&gt;trans_mod == &amp;p9_tcp_trans) {</div><div class='del'>-		if (clnt-&gt;trans_opts.tcp.port != P9_PORT)</div><div class='add'>+		if (clnt-&gt;trans_opts.tcp.port != P9_FD_PORT)</div><div class='ctx'> 			seq_printf(m, ",port=%u", clnt-&gt;trans_opts.tcp.port);</div><div class='ctx'> 	} else if (clnt-&gt;trans_mod == &amp;p9_fd_trans) {</div><div class='ctx'> 		if (clnt-&gt;trans_opts.fd.rfd != ~0)</div><div class='hunk'>@@ -729,73 +717,6 @@ static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * parse_opts - parse mount options into p9_fd_opts structure</div><div class='del'>- * @params: options string passed from mount</div><div class='del'>- * @opts: fd transport-specific structure to parse options into</div><div class='del'>- *</div><div class='del'>- * Returns 0 upon success, -ERRNO upon failure</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int parse_opts(char *params, struct p9_fd_opts *opts)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	char *options, *tmp_options;</div><div class='del'>-</div><div class='del'>-	opts-&gt;port = P9_PORT;</div><div class='del'>-	opts-&gt;rfd = ~0;</div><div class='del'>-	opts-&gt;wfd = ~0;</div><div class='del'>-	opts-&gt;privport = false;</div><div class='del'>-</div><div class='del'>-	if (!params)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp_options = kstrdup(params, GFP_KERNEL);</div><div class='del'>-	if (!tmp_options) {</div><div class='del'>-		p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-			 "failed to allocate copy of option string\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	options = tmp_options;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		int r;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		if ((token != Opt_err) &amp;&amp; (token != Opt_privport)) {</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_port:</div><div class='del'>-			opts-&gt;port = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_rfdno:</div><div class='del'>-			opts-&gt;rfd = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_wfdno:</div><div class='del'>-			opts-&gt;wfd = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_privport:</div><div class='del'>-			opts-&gt;privport = true;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(tmp_options);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int p9_fd_open(struct p9_client *client, int rfd, int wfd)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_trans_fd *ts = kzalloc(sizeof(struct p9_trans_fd),</div><div class='hunk'>@@ -804,20 +725,38 @@ static int p9_fd_open(struct p9_client *client, int rfd, int wfd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ts-&gt;rd = fget(rfd);</div><div class='add'>+	if (!ts-&gt;rd)</div><div class='add'>+		goto out_free_ts;</div><div class='add'>+	if (!(ts-&gt;rd-&gt;f_mode &amp; FMODE_READ))</div><div class='add'>+		goto out_put_rd;</div><div class='add'>+	/* Prevent workers from hanging on IO when fd is a pipe.</div><div class='add'>+	 * It's technically possible for userspace or concurrent mounts to</div><div class='add'>+	 * modify this flag concurrently, which will likely result in a</div><div class='add'>+	 * broken filesystem. However, just having bad flags here should</div><div class='add'>+	 * not crash the kernel or cause any other sort of bug, so mark this</div><div class='add'>+	 * particular data race as intentional so that tooling (like KCSAN)</div><div class='add'>+	 * can allow it and detect further problems.</div><div class='add'>+	 */</div><div class='add'>+	data_race(ts-&gt;rd-&gt;f_flags |= O_NONBLOCK);</div><div class='ctx'> 	ts-&gt;wr = fget(wfd);</div><div class='del'>-	if (!ts-&gt;rd || !ts-&gt;wr) {</div><div class='del'>-		if (ts-&gt;rd)</div><div class='del'>-			fput(ts-&gt;rd);</div><div class='del'>-		if (ts-&gt;wr)</div><div class='del'>-			fput(ts-&gt;wr);</div><div class='del'>-		kfree(ts);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	if (!ts-&gt;wr)</div><div class='add'>+		goto out_put_rd;</div><div class='add'>+	if (!(ts-&gt;wr-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		goto out_put_wr;</div><div class='add'>+	data_race(ts-&gt;wr-&gt;f_flags |= O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;trans = ts;</div><div class='ctx'> 	client-&gt;status = Connected;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_put_wr:</div><div class='add'>+	fput(ts-&gt;wr);</div><div class='add'>+out_put_rd:</div><div class='add'>+	fput(ts-&gt;rd);</div><div class='add'>+out_free_ts:</div><div class='add'>+	kfree(ts);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p9_socket_open(struct p9_client *client, struct socket *csocket)</div><div class='hunk'>@@ -826,10 +765,13 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> </div><div class='ctx'> 	p = kzalloc(sizeof(struct p9_trans_fd), GFP_KERNEL);</div><div class='del'>-	if (!p)</div><div class='add'>+	if (!p) {</div><div class='add'>+		sock_release(csocket);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	csocket-&gt;sk-&gt;sk_allocation = GFP_NOIO;</div><div class='add'>+	csocket-&gt;sk-&gt;sk_use_task_frag = false;</div><div class='ctx'> 	file = sock_alloc_file(csocket, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(file)) {</div><div class='ctx'> 		pr_err("%s (%d): failed to map fd\n",</div><div class='hunk'>@@ -850,7 +792,7 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * p9_mux_destroy - cancels all pending requests of mux</div><div class='add'>+ * p9_conn_destroy - cancels all pending requests of mux</div><div class='ctx'>  * @m: mux to destroy</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -862,7 +804,15 @@ static void p9_conn_destroy(struct p9_conn *m)</div><div class='ctx'> </div><div class='ctx'> 	p9_mux_poll_stop(m);</div><div class='ctx'> 	cancel_work_sync(&amp;m-&gt;rq);</div><div class='add'>+	if (m-&gt;rreq) {</div><div class='add'>+		p9_req_put(m-&gt;client, m-&gt;rreq);</div><div class='add'>+		m-&gt;rreq = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	cancel_work_sync(&amp;m-&gt;wq);</div><div class='add'>+	if (m-&gt;wreq) {</div><div class='add'>+		p9_req_put(m-&gt;client, m-&gt;wreq);</div><div class='add'>+		m-&gt;wreq = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	p9_conn_cancel(m, -ECONNRESET);</div><div class='ctx'> </div><div class='hunk'>@@ -898,64 +848,56 @@ static void p9_fd_close(struct p9_client *client)</div><div class='ctx'> 	kfree(ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * stolen from NFS - maybe should be made a generic function?</div><div class='del'>- */</div><div class='del'>-static inline int valid_ipaddr4(const char *buf)</div><div class='del'>-{</div><div class='del'>-	int rc, count, in[4];</div><div class='del'>-</div><div class='del'>-	rc = sscanf(buf, "%d.%d.%d.%d", &amp;in[0], &amp;in[1], &amp;in[2], &amp;in[3]);</div><div class='del'>-	if (rc != 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	for (count = 0; count &lt; 4; count++) {</div><div class='del'>-		if (in[count] &gt; 255)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int p9_bind_privport(struct socket *sock)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_in cl;</div><div class='add'>+	struct sockaddr_storage stor = { 0 };</div><div class='ctx'> 	int port, err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cl, 0, sizeof(cl));</div><div class='del'>-	cl.sin_family = AF_INET;</div><div class='del'>-	cl.sin_addr.s_addr = INADDR_ANY;</div><div class='add'>+	stor.ss_family = sock-&gt;ops-&gt;family;</div><div class='add'>+	if (stor.ss_family == AF_INET)</div><div class='add'>+		((struct sockaddr_in *)&amp;stor)-&gt;sin_addr.s_addr = htonl(INADDR_ANY);</div><div class='add'>+	else</div><div class='add'>+		((struct sockaddr_in6 *)&amp;stor)-&gt;sin6_addr = in6addr_any;</div><div class='ctx'> 	for (port = p9_ipport_resv_max; port &gt;= p9_ipport_resv_min; port--) {</div><div class='del'>-		cl.sin_port = htons((ushort)port);</div><div class='del'>-		err = kernel_bind(sock, (struct sockaddr *)&amp;cl, sizeof(cl));</div><div class='add'>+		if (stor.ss_family == AF_INET)</div><div class='add'>+			((struct sockaddr_in *)&amp;stor)-&gt;sin_port = htons((ushort)port);</div><div class='add'>+		else</div><div class='add'>+			((struct sockaddr_in6 *)&amp;stor)-&gt;sin6_port = htons((ushort)port);</div><div class='add'>+		err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;stor, sizeof(stor));</div><div class='ctx'> 		if (err != -EADDRINUSE)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)</div><div class='add'>+p9_fd_create_tcp(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	const char *addr = fc-&gt;source;</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	int err;</div><div class='add'>+	char port_str[6];</div><div class='ctx'> 	struct socket *csocket;</div><div class='del'>-	struct sockaddr_in sin_server;</div><div class='add'>+	struct sockaddr_storage stor = { 0 };</div><div class='ctx'> 	struct p9_fd_opts opts;</div><div class='ctx'> </div><div class='del'>-	err = parse_opts(args, &amp;opts);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	/* opts are already parsed in context */</div><div class='add'>+	opts = ctx-&gt;fd_opts;</div><div class='ctx'> </div><div class='del'>-	if (addr == NULL || valid_ipaddr4(addr) &lt; 0)</div><div class='add'>+	if (!addr)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	sprintf(port_str, "%u", opts.port);</div><div class='add'>+	err = inet_pton_with_scope(current-&gt;nsproxy-&gt;net_ns, AF_UNSPEC, addr,</div><div class='add'>+				   port_str, &amp;stor);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	csocket = NULL;</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;trans_opts.tcp.port = opts.port;</div><div class='ctx'> 	client-&gt;trans_opts.tcp.privport = opts.privport;</div><div class='del'>-	sin_server.sin_family = AF_INET;</div><div class='del'>-	sin_server.sin_addr.s_addr = in_aton(addr);</div><div class='del'>-	sin_server.sin_port = htons(opts.port);</div><div class='del'>-	err = __sock_create(current-&gt;nsproxy-&gt;net_ns, PF_INET,</div><div class='add'>+	err = __sock_create(current-&gt;nsproxy-&gt;net_ns, stor.ss_family,</div><div class='ctx'> 			    SOCK_STREAM, IPPROTO_TCP, &amp;csocket, 1);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_err("%s (%d): problem creating socket\n",</div><div class='hunk'>@@ -973,9 +915,9 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = csocket-&gt;ops-&gt;connect(csocket,</div><div class='del'>-				    (struct sockaddr *)&amp;sin_server,</div><div class='del'>-				    sizeof(struct sockaddr_in), 0);</div><div class='add'>+	err = READ_ONCE(csocket-&gt;ops)-&gt;connect(csocket,</div><div class='add'>+					       (struct sockaddr_unsized *)&amp;stor,</div><div class='add'>+					       sizeof(stor), 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("%s (%d): problem connecting socket to %s\n",</div><div class='ctx'> 		       __func__, task_pid_nr(current), addr);</div><div class='hunk'>@@ -987,15 +929,16 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)</div><div class='add'>+p9_fd_create_unix(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	const char *addr = fc-&gt;source;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct socket *csocket;</div><div class='ctx'> 	struct sockaddr_un sun_server;</div><div class='ctx'> </div><div class='ctx'> 	csocket = NULL;</div><div class='ctx'> </div><div class='del'>-	if (addr == NULL)</div><div class='add'>+	if (!addr || !strlen(addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(addr) &gt;= UNIX_PATH_MAX) {</div><div class='hunk'>@@ -1014,8 +957,8 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	err = csocket-&gt;ops-&gt;connect(csocket, (struct sockaddr *)&amp;sun_server,</div><div class='del'>-			sizeof(struct sockaddr_un) - 1, 0);</div><div class='add'>+	err = READ_ONCE(csocket-&gt;ops)-&gt;connect(csocket, (struct sockaddr_unsized *)&amp;sun_server,</div><div class='add'>+					       sizeof(struct sockaddr_un) - 1, 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("%s (%d): problem connecting socket: %s: %d\n",</div><div class='ctx'> 		       __func__, task_pid_nr(current), addr, err);</div><div class='hunk'>@@ -1027,12 +970,12 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-p9_fd_create(struct p9_client *client, const char *addr, char *args)</div><div class='add'>+p9_fd_create(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct p9_fd_opts opts = ctx-&gt;fd_opts;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct p9_fd_opts opts;</div><div class='ctx'> </div><div class='del'>-	parse_opts(args, &amp;opts);</div><div class='ctx'> 	client-&gt;trans_opts.fd.rfd = opts.rfd;</div><div class='ctx'> 	client-&gt;trans_opts.fd.wfd = opts.wfd;</div><div class='ctx'> </div><div class='hunk'>@@ -1053,7 +996,9 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> static struct p9_trans_module p9_tcp_trans = {</div><div class='ctx'> 	.name = "tcp",</div><div class='ctx'> 	.maxsize = MAX_SOCK_BUF,</div><div class='del'>-	.def = 0,</div><div class='add'>+	.pooled_rbuffers = false,</div><div class='add'>+	.def = false,</div><div class='add'>+	.supports_vmalloc = true,</div><div class='ctx'> 	.create = p9_fd_create_tcp,</div><div class='ctx'> 	.close = p9_fd_close,</div><div class='ctx'> 	.request = p9_fd_request,</div><div class='hunk'>@@ -1062,11 +1007,13 @@ static struct p9_trans_module p9_tcp_trans = {</div><div class='ctx'> 	.show_options = p9_fd_show_options,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='add'>+MODULE_ALIAS_9P("tcp");</div><div class='ctx'> </div><div class='ctx'> static struct p9_trans_module p9_unix_trans = {</div><div class='ctx'> 	.name = "unix",</div><div class='ctx'> 	.maxsize = MAX_SOCK_BUF,</div><div class='del'>-	.def = 0,</div><div class='add'>+	.def = false,</div><div class='add'>+	.supports_vmalloc = true,</div><div class='ctx'> 	.create = p9_fd_create_unix,</div><div class='ctx'> 	.close = p9_fd_close,</div><div class='ctx'> 	.request = p9_fd_request,</div><div class='hunk'>@@ -1075,11 +1022,13 @@ static struct p9_trans_module p9_unix_trans = {</div><div class='ctx'> 	.show_options = p9_fd_show_options,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='add'>+MODULE_ALIAS_9P("unix");</div><div class='ctx'> </div><div class='ctx'> static struct p9_trans_module p9_fd_trans = {</div><div class='ctx'> 	.name = "fd",</div><div class='ctx'> 	.maxsize = MAX_SOCK_BUF,</div><div class='del'>-	.def = 0,</div><div class='add'>+	.def = false,</div><div class='add'>+	.supports_vmalloc = true,</div><div class='ctx'> 	.create = p9_fd_create,</div><div class='ctx'> 	.close = p9_fd_close,</div><div class='ctx'> 	.request = p9_fd_request,</div><div class='hunk'>@@ -1088,6 +1037,7 @@ static struct p9_trans_module p9_fd_trans = {</div><div class='ctx'> 	.show_options = p9_fd_show_options,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='add'>+MODULE_ALIAS_9P("fd");</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * p9_poll_workfn - poll worker thread</div><div class='hunk'>@@ -1121,7 +1071,7 @@ static void p9_poll_workfn(struct work_struct *work)</div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "finish\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int p9_trans_fd_init(void)</div><div class='add'>+static int __init p9_trans_fd_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	v9fs_register_trans(&amp;p9_tcp_trans);</div><div class='ctx'> 	v9fs_register_trans(&amp;p9_unix_trans);</div><div class='hunk'>@@ -1130,10 +1080,17 @@ int p9_trans_fd_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void p9_trans_fd_exit(void)</div><div class='add'>+static void __exit p9_trans_fd_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	flush_work(&amp;p9_poll_work);</div><div class='ctx'> 	v9fs_unregister_trans(&amp;p9_tcp_trans);</div><div class='ctx'> 	v9fs_unregister_trans(&amp;p9_unix_trans);</div><div class='ctx'> 	v9fs_unregister_trans(&amp;p9_fd_trans);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+module_init(p9_trans_fd_init);</div><div class='add'>+module_exit(p9_trans_fd_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eric Van Hensbergen &lt;ericvh@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Filedescriptor Transport for 9P");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c<br/>index b513cffeeb3c..4d406479f83b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_rdma.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_rdma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_rdma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_rdma.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * linux/fs/9p/trans_rdma.c</div><div class='del'>- *</div><div class='ctx'>  * RDMA transport layer based on the trans_fd.c implementation.</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008 by Tom Tucker &lt;tom@opengridcomputing.com&gt;</div><div class='hunk'>@@ -8,22 +7,6 @@</div><div class='ctx'>  *  Copyright (C) 2004-2005 by Latchesar Ionkov &lt;lucho@ionkov.net&gt;</div><div class='ctx'>  *  Copyright (C) 2004-2008 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='ctx'>  *  Copyright (C) 1997-2002 by Ron Minnich &lt;rminnich@sarnoff.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -38,9 +21,8 @@</div><div class='ctx'> #include &lt;linux/un.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -50,14 +32,10 @@</div><div class='ctx'> #include &lt;rdma/ib_verbs.h&gt;</div><div class='ctx'> #include &lt;rdma/rdma_cm.h&gt;</div><div class='ctx'> </div><div class='del'>-#define P9_PORT			5640</div><div class='del'>-#define P9_RDMA_SQ_DEPTH	32</div><div class='del'>-#define P9_RDMA_RQ_DEPTH	32</div><div class='ctx'> #define P9_RDMA_SEND_SGE	4</div><div class='ctx'> #define P9_RDMA_RECV_SGE	4</div><div class='ctx'> #define P9_RDMA_IRD		0</div><div class='ctx'> #define P9_RDMA_ORD		0</div><div class='del'>-#define P9_RDMA_TIMEOUT		30000		/* 30 seconds */</div><div class='ctx'> #define P9_RDMA_MAXSIZE		(1024*1024)	/* 1MB */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -109,64 +87,30 @@ struct p9_trans_rdma {</div><div class='ctx'> 	struct completion cm_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct p9_rdma_req;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * p9_rdma_context - Keeps track of in-process WR</div><div class='add'>+ * struct p9_rdma_context - Keeps track of in-process WR</div><div class='ctx'>  *</div><div class='add'>+ * @cqe: completion queue entry</div><div class='ctx'>  * @busa: Bus address to unmap when the WR completes</div><div class='ctx'>  * @req: Keeps track of requests (send)</div><div class='ctx'>  * @rc: Keepts track of replies (receive)</div><div class='ctx'>  */</div><div class='del'>-struct p9_rdma_req;</div><div class='ctx'> struct p9_rdma_context {</div><div class='ctx'> 	struct ib_cqe cqe;</div><div class='ctx'> 	dma_addr_t busa;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct p9_req_t *req;</div><div class='del'>-		struct p9_fcall *rc;</div><div class='add'>+		struct p9_fcall rc;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * p9_rdma_opts - Collection of mount options</div><div class='del'>- * @port: port of connection</div><div class='del'>- * @sq_depth: The requested depth of the SQ. This really doesn't need</div><div class='del'>- * to be any deeper than the number of threads used in the client</div><div class='del'>- * @rq_depth: The depth of the RQ. Should be greater than or equal to SQ depth</div><div class='del'>- * @timeout: Time to wait in msecs for CM events</div><div class='del'>- */</div><div class='del'>-struct p9_rdma_opts {</div><div class='del'>-	short port;</div><div class='del'>-	bool privport;</div><div class='del'>-	int sq_depth;</div><div class='del'>-	int rq_depth;</div><div class='del'>-	long timeout;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Option Parsing (code inspired by NFS code)</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	/* Options that take integer arguments */</div><div class='del'>-	Opt_port, Opt_rq_depth, Opt_sq_depth, Opt_timeout,</div><div class='del'>-	/* Options that take no argument */</div><div class='del'>-	Opt_privport,</div><div class='del'>-	Opt_err,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static match_table_t tokens = {</div><div class='del'>-	{Opt_port, "port=%u"},</div><div class='del'>-	{Opt_sq_depth, "sq=%u"},</div><div class='del'>-	{Opt_rq_depth, "rq=%u"},</div><div class='del'>-	{Opt_timeout, "timeout=%u"},</div><div class='del'>-	{Opt_privport, "privport"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int p9_rdma_show_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_trans_rdma *rdma = clnt-&gt;trans;</div><div class='ctx'> </div><div class='del'>-	if (rdma-&gt;port != P9_PORT)</div><div class='add'>+	if (rdma-&gt;port != P9_RDMA_PORT)</div><div class='ctx'> 		seq_printf(m, ",port=%u", rdma-&gt;port);</div><div class='ctx'> 	if (rdma-&gt;sq_depth != P9_RDMA_SQ_DEPTH)</div><div class='ctx'> 		seq_printf(m, ",sq=%u", rdma-&gt;sq_depth);</div><div class='hunk'>@@ -179,77 +123,6 @@ static int p9_rdma_show_options(struct seq_file *m, struct p9_client *clnt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * parse_opts - parse mount options into rdma options structure</div><div class='del'>- * @params: options string passed from mount</div><div class='del'>- * @opts: rdma transport-specific structure to parse options into</div><div class='del'>- *</div><div class='del'>- * Returns 0 upon success, -ERRNO upon failure</div><div class='del'>- */</div><div class='del'>-static int parse_opts(char *params, struct p9_rdma_opts *opts)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	char *options, *tmp_options;</div><div class='del'>-</div><div class='del'>-	opts-&gt;port = P9_PORT;</div><div class='del'>-	opts-&gt;sq_depth = P9_RDMA_SQ_DEPTH;</div><div class='del'>-	opts-&gt;rq_depth = P9_RDMA_RQ_DEPTH;</div><div class='del'>-	opts-&gt;timeout = P9_RDMA_TIMEOUT;</div><div class='del'>-	opts-&gt;privport = false;</div><div class='del'>-</div><div class='del'>-	if (!params)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp_options = kstrdup(params, GFP_KERNEL);</div><div class='del'>-	if (!tmp_options) {</div><div class='del'>-		p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-			 "failed to allocate copy of option string\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	options = tmp_options;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		int r;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		if ((token != Opt_err) &amp;&amp; (token != Opt_privport)) {</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_port:</div><div class='del'>-			opts-&gt;port = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_sq_depth:</div><div class='del'>-			opts-&gt;sq_depth = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_rq_depth:</div><div class='del'>-			opts-&gt;rq_depth = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_timeout:</div><div class='del'>-			opts-&gt;timeout = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_privport:</div><div class='del'>-			opts-&gt;privport = true;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* RQ must be at least as large as the SQ */</div><div class='del'>-	opts-&gt;rq_depth = max(opts-&gt;rq_depth, opts-&gt;sq_depth);</div><div class='del'>-	kfree(tmp_options);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> p9_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)</div><div class='ctx'> {</div><div class='hunk'>@@ -274,8 +147,7 @@ p9_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)</div><div class='ctx'> 	case RDMA_CM_EVENT_DISCONNECTED:</div><div class='ctx'> 		if (rdma)</div><div class='ctx'> 			rdma-&gt;state = P9_RDMA_CLOSED;</div><div class='del'>-		if (c)</div><div class='del'>-			c-&gt;status = Disconnected;</div><div class='add'>+		c-&gt;status = Disconnected;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case RDMA_CM_EVENT_TIMEWAIT_EXIT:</div><div class='hunk'>@@ -320,8 +192,8 @@ recv_done(struct ib_cq *cq, struct ib_wc *wc)</div><div class='ctx'> 	if (wc-&gt;status != IB_WC_SUCCESS)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	c-&gt;rc-&gt;size = wc-&gt;byte_len;</div><div class='del'>-	err = p9_parse_header(c-&gt;rc, NULL, NULL, &amp;tag, 1);</div><div class='add'>+	c-&gt;rc.size = wc-&gt;byte_len;</div><div class='add'>+	err = p9_parse_header(&amp;c-&gt;rc, NULL, NULL, &amp;tag, 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -331,12 +203,13 @@ recv_done(struct ib_cq *cq, struct ib_wc *wc)</div><div class='ctx'> </div><div class='ctx'> 	/* Check that we have not yet received a reply for this request.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(req-&gt;rc)) {</div><div class='add'>+	if (unlikely(req-&gt;rc.sdata)) {</div><div class='ctx'> 		pr_err("Duplicate reply for request %d", tag);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;rc = c-&gt;rc;</div><div class='add'>+	req-&gt;rc.size = c-&gt;rc.size;</div><div class='add'>+	req-&gt;rc.sdata = c-&gt;rc.sdata;</div><div class='ctx'> 	p9_client_cb(client, req, REQ_STATUS_RCVD);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -361,9 +234,10 @@ send_done(struct ib_cq *cq, struct ib_wc *wc)</div><div class='ctx'> 		container_of(wc-&gt;wr_cqe, struct p9_rdma_context, cqe);</div><div class='ctx'> </div><div class='ctx'> 	ib_dma_unmap_single(rdma-&gt;cm_id-&gt;device,</div><div class='del'>-			    c-&gt;busa, c-&gt;req-&gt;tc-&gt;size,</div><div class='add'>+			    c-&gt;busa, c-&gt;req-&gt;tc.size,</div><div class='ctx'> 			    DMA_TO_DEVICE);</div><div class='ctx'> 	up(&amp;rdma-&gt;sq_sem);</div><div class='add'>+	p9_req_put(client, c-&gt;req);</div><div class='ctx'> 	kfree(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -399,9 +273,10 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c)</div><div class='ctx'> 	struct p9_trans_rdma *rdma = client-&gt;trans;</div><div class='ctx'> 	struct ib_recv_wr wr;</div><div class='ctx'> 	struct ib_sge sge;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;busa = ib_dma_map_single(rdma-&gt;cm_id-&gt;device,</div><div class='del'>-				    c-&gt;rc-&gt;sdata, client-&gt;msize,</div><div class='add'>+				    c-&gt;rc.sdata, client-&gt;msize,</div><div class='ctx'> 				    DMA_FROM_DEVICE);</div><div class='ctx'> 	if (ib_dma_mapping_error(rdma-&gt;cm_id-&gt;device, c-&gt;busa))</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -416,7 +291,12 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c)</div><div class='ctx'> 	wr.wr_cqe = &amp;c-&gt;cqe;</div><div class='ctx'> 	wr.sg_list = &amp;sge;</div><div class='ctx'> 	wr.num_sge = 1;</div><div class='del'>-	return ib_post_recv(rdma-&gt;qp, &amp;wr, NULL);</div><div class='add'>+</div><div class='add'>+	ret = ib_post_recv(rdma-&gt;qp, &amp;wr, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		ib_dma_unmap_single(rdma-&gt;cm_id-&gt;device, c-&gt;busa,</div><div class='add'>+				    client-&gt;msize, DMA_FROM_DEVICE);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='ctx'> 	p9_debug(P9_DEBUG_ERROR, "EIO\n");</div><div class='hunk'>@@ -443,9 +323,9 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> 	 **/</div><div class='ctx'> 	if (unlikely(atomic_read(&amp;rdma-&gt;excess_rc) &gt; 0)) {</div><div class='ctx'> 		if ((atomic_sub_return(1, &amp;rdma-&gt;excess_rc) &gt;= 0)) {</div><div class='del'>-			/* Got one ! */</div><div class='del'>-			kfree(req-&gt;rc);</div><div class='del'>-			req-&gt;rc = NULL;</div><div class='add'>+			/* Got one! */</div><div class='add'>+			p9_fcall_fini(&amp;req-&gt;rc);</div><div class='add'>+			req-&gt;rc.sdata = NULL;</div><div class='ctx'> 			goto dont_need_post_recv;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* We raced and lost. */</div><div class='hunk'>@@ -459,7 +339,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto recv_error;</div><div class='ctx'> 	}</div><div class='del'>-	rpl_context-&gt;rc = req-&gt;rc;</div><div class='add'>+	rpl_context-&gt;rc.sdata = req-&gt;rc.sdata;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Post a receive buffer for this request. We need to ensure</div><div class='hunk'>@@ -475,11 +355,11 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> </div><div class='ctx'> 	err = post_recv(client, rpl_context);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n");</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR, "POST RECV failed: %d\n", err);</div><div class='ctx'> 		goto recv_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* remove posted receive buffer from request structure */</div><div class='del'>-	req-&gt;rc = NULL;</div><div class='add'>+	req-&gt;rc.sdata = NULL;</div><div class='ctx'> </div><div class='ctx'> dont_need_post_recv:</div><div class='ctx'> 	/* Post the request */</div><div class='hunk'>@@ -491,7 +371,7 @@ dont_need_post_recv:</div><div class='ctx'> 	c-&gt;req = req;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;busa = ib_dma_map_single(rdma-&gt;cm_id-&gt;device,</div><div class='del'>-				    c-&gt;req-&gt;tc-&gt;sdata, c-&gt;req-&gt;tc-&gt;size,</div><div class='add'>+				    c-&gt;req-&gt;tc.sdata, c-&gt;req-&gt;tc.size,</div><div class='ctx'> 				    DMA_TO_DEVICE);</div><div class='ctx'> 	if (ib_dma_mapping_error(rdma-&gt;cm_id-&gt;device, c-&gt;busa)) {</div><div class='ctx'> 		err = -EIO;</div><div class='hunk'>@@ -501,7 +381,7 @@ dont_need_post_recv:</div><div class='ctx'> 	c-&gt;cqe.done = send_done;</div><div class='ctx'> </div><div class='ctx'> 	sge.addr = c-&gt;busa;</div><div class='del'>-	sge.length = c-&gt;req-&gt;tc-&gt;size;</div><div class='add'>+	sge.length = c-&gt;req-&gt;tc.size;</div><div class='ctx'> 	sge.lkey = rdma-&gt;pd-&gt;local_dma_lkey;</div><div class='ctx'> </div><div class='ctx'> 	wr.next = NULL;</div><div class='hunk'>@@ -513,24 +393,27 @@ dont_need_post_recv:</div><div class='ctx'> </div><div class='ctx'> 	if (down_interruptible(&amp;rdma-&gt;sq_sem)) {</div><div class='ctx'> 		err = -EINTR;</div><div class='del'>-		goto send_error;</div><div class='add'>+		goto dma_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mark request as `sent' *before* we actually send it,</div><div class='ctx'> 	 * because doing if after could erase the REQ_STATUS_RCVD</div><div class='ctx'> 	 * status in case of a very fast reply.</div><div class='ctx'> 	 */</div><div class='del'>-	req-&gt;status = REQ_STATUS_SENT;</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_SENT);</div><div class='ctx'> 	err = ib_post_send(rdma-&gt;qp, &amp;wr, NULL);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto send_error;</div><div class='add'>+		goto dma_unmap;</div><div class='ctx'> </div><div class='ctx'> 	/* Success */</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+dma_unmap:</div><div class='add'>+	ib_dma_unmap_single(rdma-&gt;cm_id-&gt;device, c-&gt;busa,</div><div class='add'>+			    c-&gt;req-&gt;tc.size, DMA_TO_DEVICE);</div><div class='ctx'>  /* Handle errors that happened during or while preparing the send: */</div><div class='ctx'>  send_error:</div><div class='del'>-	req-&gt;status = REQ_STATUS_ERROR;</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_ERROR);</div><div class='ctx'> 	kfree(c);</div><div class='ctx'> 	p9_debug(P9_DEBUG_ERROR, "Error %d in rdma_request()\n", err);</div><div class='ctx'> </div><div class='hunk'>@@ -544,7 +427,7 @@ dont_need_post_recv:</div><div class='ctx'>  recv_error:</div><div class='ctx'> 	kfree(rpl_context);</div><div class='ctx'> 	spin_lock_irqsave(&amp;rdma-&gt;req_lock, flags);</div><div class='del'>-	if (rdma-&gt;state &lt; P9_RDMA_CLOSING) {</div><div class='add'>+	if (err != -EINTR &amp;&amp; rdma-&gt;state &lt; P9_RDMA_CLOSING) {</div><div class='ctx'> 		rdma-&gt;state = P9_RDMA_CLOSING;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;rdma-&gt;req_lock, flags);</div><div class='ctx'> 		rdma_disconnect(rdma-&gt;cm_id);</div><div class='hunk'>@@ -633,14 +516,15 @@ static int p9_rdma_bind_privport(struct p9_trans_rdma *rdma)</div><div class='ctx'> /**</div><div class='ctx'>  * rdma_create_trans - Transport method for creating a transport instance</div><div class='ctx'>  * @client: client instance</div><div class='del'>- * @addr: IP address string</div><div class='del'>- * @args: Mount options string</div><div class='add'>+ * @fc: The filesystem context</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-rdma_create_trans(struct p9_client *client, const char *addr, char *args)</div><div class='add'>+rdma_create_trans(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	const char *addr = fc-&gt;source;</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct p9_rdma_opts opts = ctx-&gt;rdma_opts;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct p9_rdma_opts opts;</div><div class='ctx'> 	struct p9_trans_rdma *rdma;</div><div class='ctx'> 	struct rdma_conn_param conn_param;</div><div class='ctx'> 	struct ib_qp_init_attr qp_attr;</div><div class='hunk'>@@ -648,10 +532,8 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> 	if (addr == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Parse the transport specific mount options */</div><div class='del'>-	err = parse_opts(args, &amp;opts);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	/* options are already parsed, in the fs context */</div><div class='add'>+	opts = ctx-&gt;rdma_opts;</div><div class='ctx'> </div><div class='ctx'> 	/* Create and initialize the RDMA transport structure */</div><div class='ctx'> 	rdma = alloc_rdma(&amp;opts);</div><div class='hunk'>@@ -699,9 +581,9 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Create the Completion Queue */</div><div class='del'>-	rdma-&gt;cq = ib_alloc_cq(rdma-&gt;cm_id-&gt;device, client,</div><div class='del'>-			opts.sq_depth + opts.rq_depth + 1,</div><div class='del'>-			0, IB_POLL_SOFTIRQ);</div><div class='add'>+	rdma-&gt;cq = ib_alloc_cq_any(rdma-&gt;cm_id-&gt;device, client,</div><div class='add'>+				   opts.sq_depth + opts.rq_depth + 1,</div><div class='add'>+				   IB_POLL_SOFTIRQ);</div><div class='ctx'> 	if (IS_ERR(rdma-&gt;cq))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -752,7 +634,9 @@ error:</div><div class='ctx'> static struct p9_trans_module p9_rdma_trans = {</div><div class='ctx'> 	.name = "rdma",</div><div class='ctx'> 	.maxsize = P9_RDMA_MAXSIZE,</div><div class='del'>-	.def = 0,</div><div class='add'>+	.pooled_rbuffers = true,</div><div class='add'>+	.def = false,</div><div class='add'>+	.supports_vmalloc = false,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.create = rdma_create_trans,</div><div class='ctx'> 	.close = rdma_close,</div><div class='hunk'>@@ -778,6 +662,7 @@ static void __exit p9_trans_rdma_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(p9_trans_rdma_init);</div><div class='ctx'> module_exit(p9_trans_rdma_exit);</div><div class='add'>+MODULE_ALIAS_9P("rdma");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tom Tucker &lt;tom@opengridcomputing.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("RDMA Transport for 9P");</div><div class='head'>diff --git a/net/9p/trans_usbg.c b/net/9p/trans_usbg.c<br/>new file mode 100644<br/>index 000000000000..93547637deae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_usbg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_usbg.c</a></div><div class='hunk'>@@ -0,0 +1,969 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * trans_usbg.c - USB peripheral usb9pfs configuration driver and transport.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Michael Grzeschik &lt;m.grzeschik@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Gadget usb9pfs only needs two bulk endpoints, and will use the usb9pfs</div><div class='add'>+ * transport to mount host exported filesystem via usb gadget.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*     +--------------------------+    |    +--------------------------+</div><div class='add'>+ *     |  9PFS mounting client    |    |    |  9PFS exporting server   |</div><div class='add'>+ *  SW |                          |    |    |                          |</div><div class='add'>+ *     |   (this:trans_usbg)      |    |    |(e.g. diod or nfs-ganesha)|</div><div class='add'>+ *     +-------------^------------+    |    +-------------^------------+</div><div class='add'>+ *                   |                 |                  |</div><div class='add'>+ * ------------------|------------------------------------|-------------</div><div class='add'>+ *                   |                 |                  |</div><div class='add'>+ *     +-------------v------------+    |    +-------------v------------+</div><div class='add'>+ *     |                          |    |    |                          |</div><div class='add'>+ *  HW |   USB Device Controller  &lt;---------&gt;   USB Host Controller    |</div><div class='add'>+ *     |                          |    |    |                          |</div><div class='add'>+ *     +--------------------------+    |    +--------------------------+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/usb/composite.h&gt;</div><div class='add'>+#include &lt;linux/usb/func_utils.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/9p/9p.h&gt;</div><div class='add'>+#include &lt;net/9p/client.h&gt;</div><div class='add'>+#include &lt;net/9p/transport.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEFAULT_BUFLEN        16384</div><div class='add'>+</div><div class='add'>+struct f_usb9pfs {</div><div class='add'>+	struct p9_client *client;</div><div class='add'>+</div><div class='add'>+	/* 9p request lock for en/dequeue */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	struct usb_request *in_req;</div><div class='add'>+	struct usb_request *out_req;</div><div class='add'>+</div><div class='add'>+	struct usb_ep *in_ep;</div><div class='add'>+	struct usb_ep *out_ep;</div><div class='add'>+</div><div class='add'>+	struct completion send;</div><div class='add'>+	struct completion received;</div><div class='add'>+</div><div class='add'>+	unsigned int buflen;</div><div class='add'>+</div><div class='add'>+	struct usb_function function;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct f_usb9pfs *func_to_usb9pfs(struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	return container_of(f, struct f_usb9pfs, function);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct f_usb9pfs_opts {</div><div class='add'>+	struct usb_function_instance func_inst;</div><div class='add'>+	unsigned int buflen;</div><div class='add'>+</div><div class='add'>+	struct f_usb9pfs_dev *dev;</div><div class='add'>+</div><div class='add'>+	/* Read/write access to configfs attributes is handled by configfs.</div><div class='add'>+	 *</div><div class='add'>+	 * This is to protect the data from concurrent access by read/write</div><div class='add'>+	 * and create symlink/remove symlink.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	int refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct f_usb9pfs_dev {</div><div class='add'>+	struct f_usb9pfs *usb9pfs;</div><div class='add'>+	struct f_usb9pfs_opts *opts;</div><div class='add'>+	char tag[41];</div><div class='add'>+	bool inuse;</div><div class='add'>+</div><div class='add'>+	struct list_head usb9pfs_instance;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(usb9pfs_lock);</div><div class='add'>+static struct list_head usbg_instance_list;</div><div class='add'>+</div><div class='add'>+static int usb9pfs_queue_tx(struct f_usb9pfs *usb9pfs, struct p9_req_t *p9_tx_req,</div><div class='add'>+			    gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev *cdev = usb9pfs-&gt;function.config-&gt;cdev;</div><div class='add'>+	struct usb_request *req = usb9pfs-&gt;in_req;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(p9_tx_req-&gt;tc.size % usb9pfs-&gt;in_ep-&gt;maxpacket))</div><div class='add'>+		req-&gt;zero = 1;</div><div class='add'>+</div><div class='add'>+	req-&gt;buf = p9_tx_req-&gt;tc.sdata;</div><div class='add'>+	req-&gt;length = p9_tx_req-&gt;tc.size;</div><div class='add'>+	req-&gt;context = p9_tx_req;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "%s usb9pfs send --&gt; %d/%d, zero: %d\n",</div><div class='add'>+		usb9pfs-&gt;in_ep-&gt;name, req-&gt;actual, req-&gt;length, req-&gt;zero);</div><div class='add'>+</div><div class='add'>+	ret = usb_ep_queue(usb9pfs-&gt;in_ep, req, gfp_flags);</div><div class='add'>+	if (ret)</div><div class='add'>+		req-&gt;context = NULL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "tx submit --&gt; %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb9pfs_queue_rx(struct f_usb9pfs *usb9pfs, struct usb_request *req,</div><div class='add'>+			    gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev *cdev = usb9pfs-&gt;function.config-&gt;cdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_ep_queue(usb9pfs-&gt;out_ep, req, gfp_flags);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "rx submit --&gt; %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb9pfs_transmit(struct f_usb9pfs *usb9pfs, struct p9_req_t *p9_req)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;usb9pfs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = usb9pfs_queue_tx(usb9pfs, p9_req, GFP_ATOMIC);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;p9_req-&gt;req_list);</div><div class='add'>+</div><div class='add'>+	p9_req_get(p9_req);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_tx_complete(struct usb_ep *ep, struct usb_request *req)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = ep-&gt;driver_data;</div><div class='add'>+	struct usb_composite_dev *cdev = usb9pfs-&gt;function.config-&gt;cdev;</div><div class='add'>+	struct p9_req_t *p9_tx_req = req-&gt;context;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* reset zero packages */</div><div class='add'>+	req-&gt;zero = 0;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;status) {</div><div class='add'>+		dev_err(&amp;cdev-&gt;gadget-&gt;dev, "%s usb9pfs complete --&gt; %d, %d/%d\n",</div><div class='add'>+			ep-&gt;name, req-&gt;status, req-&gt;actual, req-&gt;length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "%s usb9pfs complete --&gt; %d, %d/%d\n",</div><div class='add'>+		ep-&gt;name, req-&gt;status, req-&gt;actual, req-&gt;length);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;usb9pfs-&gt;lock, flags);</div><div class='add'>+	WRITE_ONCE(p9_tx_req-&gt;status, REQ_STATUS_SENT);</div><div class='add'>+</div><div class='add'>+	p9_req_put(usb9pfs-&gt;client, p9_tx_req);</div><div class='add'>+</div><div class='add'>+	req-&gt;context = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;usb9pfs-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	complete(&amp;usb9pfs-&gt;send);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct p9_req_t *usb9pfs_rx_header(struct f_usb9pfs *usb9pfs, void *buf)</div><div class='add'>+{</div><div class='add'>+	struct p9_req_t *p9_rx_req;</div><div class='add'>+	struct p9_fcall	rc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* start by reading header */</div><div class='add'>+	rc.sdata = buf;</div><div class='add'>+	rc.offset = 0;</div><div class='add'>+	rc.capacity = P9_HDRSZ;</div><div class='add'>+	rc.size = P9_HDRSZ;</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_TRANS, "mux %p got %zu bytes\n", usb9pfs,</div><div class='add'>+		 rc.capacity - rc.offset);</div><div class='add'>+</div><div class='add'>+	ret = p9_parse_header(&amp;rc, &amp;rc.size, NULL, NULL, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "error parsing header: %d\n", ret);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_TRANS,</div><div class='add'>+		 "mux %p pkt: size: %d bytes tag: %d\n",</div><div class='add'>+		 usb9pfs, rc.size, rc.tag);</div><div class='add'>+</div><div class='add'>+	p9_rx_req = p9_tag_lookup(usb9pfs-&gt;client, rc.tag);</div><div class='add'>+	if (!p9_rx_req || p9_rx_req-&gt;status != REQ_STATUS_SENT) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", rc.tag);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc.size &gt; p9_rx_req-&gt;rc.capacity) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "requested packet size too big: %d for tag %d with capacity %zd\n",</div><div class='add'>+			 rc.size, rc.tag, p9_rx_req-&gt;rc.capacity);</div><div class='add'>+		p9_req_put(usb9pfs-&gt;client, p9_rx_req);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!p9_rx_req-&gt;rc.sdata) {</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "No recv fcall for tag %d (req %p), disconnecting!\n",</div><div class='add'>+			 rc.tag, p9_rx_req);</div><div class='add'>+		p9_req_put(usb9pfs-&gt;client, p9_rx_req);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return p9_rx_req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_rx_complete(struct usb_ep *ep, struct usb_request *req)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = ep-&gt;driver_data;</div><div class='add'>+	struct usb_composite_dev *cdev = usb9pfs-&gt;function.config-&gt;cdev;</div><div class='add'>+	struct p9_req_t *p9_rx_req;</div><div class='add'>+	unsigned int req_size = req-&gt;actual;</div><div class='add'>+	int status = REQ_STATUS_RCVD;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;status) {</div><div class='add'>+		dev_err(&amp;cdev-&gt;gadget-&gt;dev, "%s usb9pfs complete --&gt; %d, %d/%d\n",</div><div class='add'>+			ep-&gt;name, req-&gt;status, req-&gt;actual, req-&gt;length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p9_rx_req = usb9pfs_rx_header(usb9pfs, req-&gt;buf);</div><div class='add'>+	if (!p9_rx_req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (req_size &gt; p9_rx_req-&gt;rc.capacity) {</div><div class='add'>+		dev_err(&amp;cdev-&gt;gadget-&gt;dev,</div><div class='add'>+			"%s received data size %u exceeds buffer capacity %zu\n",</div><div class='add'>+			ep-&gt;name, req_size, p9_rx_req-&gt;rc.capacity);</div><div class='add'>+		req_size = 0;</div><div class='add'>+		status = REQ_STATUS_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(p9_rx_req-&gt;rc.sdata, req-&gt;buf, req_size);</div><div class='add'>+</div><div class='add'>+	p9_rx_req-&gt;rc.size = req_size;</div><div class='add'>+</div><div class='add'>+	p9_client_cb(usb9pfs-&gt;client, p9_rx_req, status);</div><div class='add'>+	p9_req_put(usb9pfs-&gt;client, p9_rx_req);</div><div class='add'>+</div><div class='add'>+	complete(&amp;usb9pfs-&gt;received);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)</div><div class='add'>+{</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	value = usb_ep_disable(ep);</div><div class='add'>+	if (value &lt; 0)</div><div class='add'>+		dev_info(&amp;cdev-&gt;gadget-&gt;dev,</div><div class='add'>+			 "disable %s --&gt; %d\n", ep-&gt;name, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_usb9pfs(struct f_usb9pfs *usb9pfs)</div><div class='add'>+{</div><div class='add'>+	struct usb_composite_dev *cdev =</div><div class='add'>+		usb9pfs-&gt;function.config-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	if (usb9pfs-&gt;in_req) {</div><div class='add'>+		usb_ep_free_request(usb9pfs-&gt;in_ep, usb9pfs-&gt;in_req);</div><div class='add'>+		usb9pfs-&gt;in_req = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb9pfs-&gt;out_req) {</div><div class='add'>+		usb_ep_free_request(usb9pfs-&gt;out_ep, usb9pfs-&gt;out_req);</div><div class='add'>+		usb9pfs-&gt;out_req = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	disable_ep(cdev, usb9pfs-&gt;in_ep);</div><div class='add'>+	disable_ep(cdev, usb9pfs-&gt;out_ep);</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "%s disabled\n",</div><div class='add'>+		usb9pfs-&gt;function.name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_requests(struct usb_composite_dev *cdev,</div><div class='add'>+			  struct f_usb9pfs *usb9pfs)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;in_req = usb_ep_alloc_request(usb9pfs-&gt;in_ep, GFP_ATOMIC);</div><div class='add'>+	if (!usb9pfs-&gt;in_req) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;out_req = alloc_ep_req(usb9pfs-&gt;out_ep, usb9pfs-&gt;buflen);</div><div class='add'>+	if (!usb9pfs-&gt;out_req) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto fail_in;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;in_req-&gt;complete = usb9pfs_tx_complete;</div><div class='add'>+	usb9pfs-&gt;out_req-&gt;complete = usb9pfs_rx_complete;</div><div class='add'>+</div><div class='add'>+	/* length will be set in complete routine */</div><div class='add'>+	usb9pfs-&gt;in_req-&gt;context = usb9pfs;</div><div class='add'>+	usb9pfs-&gt;out_req-&gt;context = usb9pfs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_in:</div><div class='add'>+	usb_ep_free_request(usb9pfs-&gt;in_ep, usb9pfs-&gt;in_req);</div><div class='add'>+fail:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enable_endpoint(struct usb_composite_dev *cdev,</div><div class='add'>+			   struct f_usb9pfs *usb9pfs, struct usb_ep *ep)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = config_ep_by_speed(cdev-&gt;gadget, &amp;usb9pfs-&gt;function, ep);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_ep_enable(ep);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ep-&gt;driver_data = usb9pfs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+enable_usb9pfs(struct usb_composite_dev *cdev, struct f_usb9pfs *usb9pfs)</div><div class='add'>+{</div><div class='add'>+	struct p9_client *client;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = enable_endpoint(cdev, usb9pfs, usb9pfs-&gt;in_ep);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = enable_endpoint(cdev, usb9pfs, usb9pfs-&gt;out_ep);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto disable_in;</div><div class='add'>+</div><div class='add'>+	ret = alloc_requests(cdev, usb9pfs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto disable_out;</div><div class='add'>+</div><div class='add'>+	client = usb9pfs-&gt;client;</div><div class='add'>+	if (client)</div><div class='add'>+		client-&gt;status = Connected;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "%s enabled\n", usb9pfs-&gt;function.name);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+disable_out:</div><div class='add'>+	usb_ep_disable(usb9pfs-&gt;out_ep);</div><div class='add'>+disable_in:</div><div class='add'>+	usb_ep_disable(usb9pfs-&gt;in_ep);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p9_usbg_create(struct p9_client *client, struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	const char *devname = fc-&gt;source;</div><div class='add'>+	struct f_usb9pfs_dev *dev;</div><div class='add'>+	struct f_usb9pfs *usb9pfs;</div><div class='add'>+	int ret = -ENOENT;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	if (!devname)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;usb9pfs_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;usbg_instance_list, usb9pfs_instance) {</div><div class='add'>+		if (!strncmp(devname, dev-&gt;tag, strlen(devname))) {</div><div class='add'>+			if (!dev-&gt;inuse) {</div><div class='add'>+				dev-&gt;inuse = true;</div><div class='add'>+				found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!found) {</div><div class='add'>+		pr_err("no channels available for device %s\n", devname);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb9pfs = dev-&gt;usb9pfs;</div><div class='add'>+	if (!usb9pfs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	client-&gt;trans = (void *)usb9pfs;</div><div class='add'>+	if (!usb9pfs-&gt;in_req)</div><div class='add'>+		client-&gt;status = Disconnected;</div><div class='add'>+	else</div><div class='add'>+		client-&gt;status = Connected;</div><div class='add'>+	usb9pfs-&gt;client = client;</div><div class='add'>+</div><div class='add'>+	client-&gt;trans_mod-&gt;maxsize = usb9pfs-&gt;buflen;</div><div class='add'>+</div><div class='add'>+	complete(&amp;usb9pfs-&gt;received);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_clear_tx(struct f_usb9pfs *usb9pfs)</div><div class='add'>+{</div><div class='add'>+	struct p9_req_t *req;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;usb9pfs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	req = usb9pfs-&gt;in_req-&gt;context;</div><div class='add'>+	if (!req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;t_err)</div><div class='add'>+		req-&gt;t_err = -ECONNRESET;</div><div class='add'>+</div><div class='add'>+	p9_client_cb(usb9pfs-&gt;client, req, REQ_STATUS_ERROR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void p9_usbg_close(struct p9_client *client)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs;</div><div class='add'>+	struct f_usb9pfs_dev *dev;</div><div class='add'>+	struct f_usb9pfs_opts *opts;</div><div class='add'>+</div><div class='add'>+	if (!client)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	usb9pfs = client-&gt;trans;</div><div class='add'>+	if (!usb9pfs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	client-&gt;status = Disconnected;</div><div class='add'>+</div><div class='add'>+	usb9pfs_clear_tx(usb9pfs);</div><div class='add'>+</div><div class='add'>+	opts = container_of(usb9pfs-&gt;function.fi,</div><div class='add'>+			    struct f_usb9pfs_opts, func_inst);</div><div class='add'>+</div><div class='add'>+	dev = opts-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;usb9pfs_lock);</div><div class='add'>+	dev-&gt;inuse = false;</div><div class='add'>+	mutex_unlock(&amp;usb9pfs_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p9_usbg_request(struct p9_client *client, struct p9_req_t *p9_req)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = client-&gt;trans;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (client-&gt;status != Connected)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_killable(&amp;usb9pfs-&gt;received);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = usb9pfs_transmit(usb9pfs, p9_req);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_killable(&amp;usb9pfs-&gt;send);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return usb9pfs_queue_rx(usb9pfs, usb9pfs-&gt;out_req, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int p9_usbg_cancel(struct p9_client *client, struct p9_req_t *req)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = client-&gt;trans;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	p9_debug(P9_DEBUG_TRANS, "client %p req %p\n", client, req);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;usb9pfs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;status == REQ_STATUS_UNSENT) {</div><div class='add'>+		list_del(&amp;req-&gt;req_list);</div><div class='add'>+		WRITE_ONCE(req-&gt;status, REQ_STATUS_FLSHD);</div><div class='add'>+		p9_req_put(client, req);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct p9_trans_module p9_usbg_trans = {</div><div class='add'>+	.name = "usbg",</div><div class='add'>+	.create = p9_usbg_create,</div><div class='add'>+	.close = p9_usbg_close,</div><div class='add'>+	.request = p9_usbg_request,</div><div class='add'>+	.cancel = p9_usbg_cancel,</div><div class='add'>+	.supports_vmalloc = false,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#define USB_PROTOCOL_9PFS	0x09</div><div class='add'>+</div><div class='add'>+static struct usb_interface_descriptor usb9pfs_intf = {</div><div class='add'>+	.bLength =		sizeof(usb9pfs_intf),</div><div class='add'>+	.bDescriptorType =	USB_DT_INTERFACE,</div><div class='add'>+</div><div class='add'>+	.bNumEndpoints =	2,</div><div class='add'>+	.bInterfaceClass =	USB_CLASS_VENDOR_SPEC,</div><div class='add'>+	.bInterfaceSubClass =	USB_SUBCLASS_VENDOR_SPEC,</div><div class='add'>+	.bInterfaceProtocol =   USB_PROTOCOL_9PFS,</div><div class='add'>+</div><div class='add'>+	/* .iInterface = DYNAMIC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* full speed support: */</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor fs_usb9pfs_source_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress =	USB_DIR_IN,</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor fs_usb9pfs_sink_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bEndpointAddress =	USB_DIR_OUT,</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_descriptor_header *fs_usb9pfs_descs[] = {</div><div class='add'>+	(struct usb_descriptor_header *)&amp;usb9pfs_intf,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;fs_usb9pfs_sink_desc,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;fs_usb9pfs_source_desc,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* high speed support: */</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor hs_usb9pfs_source_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize =	cpu_to_le16(512),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor hs_usb9pfs_sink_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize =	cpu_to_le16(512),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_descriptor_header *hs_usb9pfs_descs[] = {</div><div class='add'>+	(struct usb_descriptor_header *)&amp;usb9pfs_intf,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;hs_usb9pfs_source_desc,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;hs_usb9pfs_sink_desc,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* super speed support: */</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor ss_usb9pfs_source_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize =	cpu_to_le16(1024),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_ss_ep_comp_descriptor ss_usb9pfs_source_comp_desc = {</div><div class='add'>+	.bLength =		USB_DT_SS_EP_COMP_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,</div><div class='add'>+	.bMaxBurst =		0,</div><div class='add'>+	.bmAttributes =		0,</div><div class='add'>+	.wBytesPerInterval =	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_endpoint_descriptor ss_usb9pfs_sink_desc = {</div><div class='add'>+	.bLength =		USB_DT_ENDPOINT_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_ENDPOINT,</div><div class='add'>+</div><div class='add'>+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,</div><div class='add'>+	.wMaxPacketSize =	cpu_to_le16(1024),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_ss_ep_comp_descriptor ss_usb9pfs_sink_comp_desc = {</div><div class='add'>+	.bLength =		USB_DT_SS_EP_COMP_SIZE,</div><div class='add'>+	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,</div><div class='add'>+	.bMaxBurst =		0,</div><div class='add'>+	.bmAttributes =		0,</div><div class='add'>+	.wBytesPerInterval =	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_descriptor_header *ss_usb9pfs_descs[] = {</div><div class='add'>+	(struct usb_descriptor_header *)&amp;usb9pfs_intf,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;ss_usb9pfs_source_desc,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;ss_usb9pfs_source_comp_desc,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;ss_usb9pfs_sink_desc,</div><div class='add'>+	(struct usb_descriptor_header *)&amp;ss_usb9pfs_sink_comp_desc,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* function-specific strings: */</div><div class='add'>+static struct usb_string strings_usb9pfs[] = {</div><div class='add'>+	[0].s = "usb9pfs input to output",</div><div class='add'>+	{  }			/* end of list */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_gadget_strings stringtab_usb9pfs = {</div><div class='add'>+	.language	= 0x0409,	/* en-us */</div><div class='add'>+	.strings	= strings_usb9pfs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_gadget_strings *usb9pfs_strings[] = {</div><div class='add'>+	&amp;stringtab_usb9pfs,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int usb9pfs_func_bind(struct usb_configuration *c,</div><div class='add'>+			     struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);</div><div class='add'>+	struct f_usb9pfs_opts *opts;</div><div class='add'>+	struct usb_composite_dev *cdev = c-&gt;cdev;</div><div class='add'>+	int ret;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	/* allocate interface ID(s) */</div><div class='add'>+	id = usb_interface_id(c, f);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+	usb9pfs_intf.bInterfaceNumber = id;</div><div class='add'>+</div><div class='add'>+	id = usb_string_id(cdev);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+	strings_usb9pfs[0].id = id;</div><div class='add'>+	usb9pfs_intf.iInterface = id;</div><div class='add'>+</div><div class='add'>+	/* allocate endpoints */</div><div class='add'>+	usb9pfs-&gt;in_ep = usb_ep_autoconfig(cdev-&gt;gadget,</div><div class='add'>+					   &amp;fs_usb9pfs_source_desc);</div><div class='add'>+	if (!usb9pfs-&gt;in_ep)</div><div class='add'>+		goto autoconf_fail;</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;out_ep = usb_ep_autoconfig(cdev-&gt;gadget,</div><div class='add'>+					    &amp;fs_usb9pfs_sink_desc);</div><div class='add'>+	if (!usb9pfs-&gt;out_ep)</div><div class='add'>+		goto autoconf_fail;</div><div class='add'>+</div><div class='add'>+	/* support high speed hardware */</div><div class='add'>+	hs_usb9pfs_source_desc.bEndpointAddress =</div><div class='add'>+		fs_usb9pfs_source_desc.bEndpointAddress;</div><div class='add'>+	hs_usb9pfs_sink_desc.bEndpointAddress =</div><div class='add'>+		fs_usb9pfs_sink_desc.bEndpointAddress;</div><div class='add'>+</div><div class='add'>+	/* support super speed hardware */</div><div class='add'>+	ss_usb9pfs_source_desc.bEndpointAddress =</div><div class='add'>+		fs_usb9pfs_source_desc.bEndpointAddress;</div><div class='add'>+	ss_usb9pfs_sink_desc.bEndpointAddress =</div><div class='add'>+		fs_usb9pfs_sink_desc.bEndpointAddress;</div><div class='add'>+</div><div class='add'>+	ret = usb_assign_descriptors(f, fs_usb9pfs_descs, hs_usb9pfs_descs,</div><div class='add'>+				     ss_usb9pfs_descs, ss_usb9pfs_descs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	opts = container_of(f-&gt;fi, struct f_usb9pfs_opts, func_inst);</div><div class='add'>+	opts-&gt;dev-&gt;usb9pfs = usb9pfs;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cdev-&gt;gadget-&gt;dev, "%s speed %s: IN/%s, OUT/%s\n",</div><div class='add'>+		(gadget_is_superspeed(c-&gt;cdev-&gt;gadget) ? "super" :</div><div class='add'>+		(gadget_is_dualspeed(c-&gt;cdev-&gt;gadget) ? "dual" : "full")),</div><div class='add'>+			f-&gt;name, usb9pfs-&gt;in_ep-&gt;name, usb9pfs-&gt;out_ep-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+autoconf_fail:</div><div class='add'>+	ERROR(cdev, "%s: can't autoconfigure on %s\n",</div><div class='add'>+	      f-&gt;name, cdev-&gt;gadget-&gt;name);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_func_unbind(struct usb_configuration *c,</div><div class='add'>+				struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);</div><div class='add'>+</div><div class='add'>+	disable_usb9pfs(usb9pfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_free_func(struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);</div><div class='add'>+	struct f_usb9pfs_opts *opts;</div><div class='add'>+</div><div class='add'>+	kfree(usb9pfs);</div><div class='add'>+</div><div class='add'>+	opts = container_of(f-&gt;fi, struct f_usb9pfs_opts, func_inst);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opts-&gt;lock);</div><div class='add'>+	opts-&gt;refcnt--;</div><div class='add'>+	mutex_unlock(&amp;opts-&gt;lock);</div><div class='add'>+</div><div class='add'>+	usb_free_all_descriptors(f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb9pfs_set_alt(struct usb_function *f,</div><div class='add'>+			   unsigned int intf, unsigned int alt)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);</div><div class='add'>+	struct usb_composite_dev *cdev = f-&gt;config-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	return enable_usb9pfs(cdev, usb9pfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_disable(struct usb_function *f)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs *usb9pfs = func_to_usb9pfs(f);</div><div class='add'>+</div><div class='add'>+	usb9pfs_clear_tx(usb9pfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_function *usb9pfs_alloc(struct usb_function_instance *fi)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *usb9pfs_opts;</div><div class='add'>+	struct f_usb9pfs *usb9pfs;</div><div class='add'>+</div><div class='add'>+	usb9pfs = kzalloc(sizeof(*usb9pfs), GFP_KERNEL);</div><div class='add'>+	if (!usb9pfs)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;usb9pfs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;usb9pfs-&gt;send);</div><div class='add'>+	init_completion(&amp;usb9pfs-&gt;received);</div><div class='add'>+</div><div class='add'>+	usb9pfs_opts = container_of(fi, struct f_usb9pfs_opts, func_inst);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;usb9pfs_opts-&gt;lock);</div><div class='add'>+	usb9pfs_opts-&gt;refcnt++;</div><div class='add'>+	mutex_unlock(&amp;usb9pfs_opts-&gt;lock);</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;buflen = usb9pfs_opts-&gt;buflen;</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;function.name = "usb9pfs";</div><div class='add'>+	usb9pfs-&gt;function.bind = usb9pfs_func_bind;</div><div class='add'>+	usb9pfs-&gt;function.unbind = usb9pfs_func_unbind;</div><div class='add'>+	usb9pfs-&gt;function.set_alt = usb9pfs_set_alt;</div><div class='add'>+	usb9pfs-&gt;function.disable = usb9pfs_disable;</div><div class='add'>+	usb9pfs-&gt;function.strings = usb9pfs_strings;</div><div class='add'>+</div><div class='add'>+	usb9pfs-&gt;function.free_func = usb9pfs_free_func;</div><div class='add'>+</div><div class='add'>+	return &amp;usb9pfs-&gt;function;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct f_usb9pfs_opts *to_f_usb9pfs_opts(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return container_of(to_config_group(item), struct f_usb9pfs_opts,</div><div class='add'>+			    func_inst.group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct f_usb9pfs_opts *fi_to_f_usb9pfs_opts(struct usb_function_instance *fi)</div><div class='add'>+{</div><div class='add'>+	return container_of(fi, struct f_usb9pfs_opts, func_inst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_attr_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *usb9pfs_opts = to_f_usb9pfs_opts(item);</div><div class='add'>+</div><div class='add'>+	usb_put_function_instance(&amp;usb9pfs_opts-&gt;func_inst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations usb9pfs_item_ops = {</div><div class='add'>+	.release		= usb9pfs_attr_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t f_usb9pfs_opts_buflen_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *opts = to_f_usb9pfs_opts(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opts-&gt;lock);</div><div class='add'>+	ret = sysfs_emit(page, "%d\n", opts-&gt;buflen);</div><div class='add'>+	mutex_unlock(&amp;opts-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t f_usb9pfs_opts_buflen_store(struct config_item *item,</div><div class='add'>+					   const char *page, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *opts = to_f_usb9pfs_opts(item);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 num;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;opts-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (opts-&gt;refcnt)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou32(page, 0, &amp;num);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	opts-&gt;buflen = num;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR(f_usb9pfs_opts_, buflen);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *usb9pfs_attrs[] = {</div><div class='add'>+	&amp;f_usb9pfs_opts_attr_buflen,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_item_type usb9pfs_func_type = {</div><div class='add'>+	.ct_item_ops	= &amp;usb9pfs_item_ops,</div><div class='add'>+	.ct_attrs	= usb9pfs_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct f_usb9pfs_dev *_usb9pfs_do_find_dev(const char *tag)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_dev *usb9pfs_dev;</div><div class='add'>+</div><div class='add'>+	if (!tag)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(usb9pfs_dev, &amp;usbg_instance_list, usb9pfs_instance) {</div><div class='add'>+		if (strcmp(usb9pfs_dev-&gt;tag, tag) == 0)</div><div class='add'>+			return usb9pfs_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb9pfs_tag_instance(struct f_usb9pfs_dev *dev, const char *tag)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_dev *existing;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;usb9pfs_lock);</div><div class='add'>+</div><div class='add'>+	existing = _usb9pfs_do_find_dev(tag);</div><div class='add'>+	if (!existing)</div><div class='add'>+		strscpy(dev-&gt;tag, tag, ARRAY_SIZE(dev-&gt;tag));</div><div class='add'>+	else if (existing != dev)</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb9pfs_set_inst_tag(struct usb_function_instance *fi, const char *tag)</div><div class='add'>+{</div><div class='add'>+	if (strlen(tag) &gt;= sizeof_field(struct f_usb9pfs_dev, tag))</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+	return usb9pfs_tag_instance(fi_to_f_usb9pfs_opts(fi)-&gt;dev, tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb9pfs_free_instance(struct usb_function_instance *fi)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *usb9pfs_opts =</div><div class='add'>+		container_of(fi, struct f_usb9pfs_opts, func_inst);</div><div class='add'>+	struct f_usb9pfs_dev *dev = usb9pfs_opts-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;usb9pfs_lock);</div><div class='add'>+	list_del(&amp;dev-&gt;usb9pfs_instance);</div><div class='add'>+	mutex_unlock(&amp;usb9pfs_lock);</div><div class='add'>+</div><div class='add'>+	kfree(usb9pfs_opts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_function_instance *usb9pfs_alloc_instance(void)</div><div class='add'>+{</div><div class='add'>+	struct f_usb9pfs_opts *usb9pfs_opts;</div><div class='add'>+	struct f_usb9pfs_dev *dev;</div><div class='add'>+</div><div class='add'>+	usb9pfs_opts = kzalloc(sizeof(*usb9pfs_opts), GFP_KERNEL);</div><div class='add'>+	if (!usb9pfs_opts)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;usb9pfs_opts-&gt;lock);</div><div class='add'>+</div><div class='add'>+	usb9pfs_opts-&gt;func_inst.set_inst_name = usb9pfs_set_inst_tag;</div><div class='add'>+	usb9pfs_opts-&gt;func_inst.free_func_inst = usb9pfs_free_instance;</div><div class='add'>+</div><div class='add'>+	usb9pfs_opts-&gt;buflen = DEFAULT_BUFLEN;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		kfree(usb9pfs_opts);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb9pfs_opts-&gt;dev = dev;</div><div class='add'>+	dev-&gt;opts = usb9pfs_opts;</div><div class='add'>+</div><div class='add'>+	config_group_init_type_name(&amp;usb9pfs_opts-&gt;func_inst.group, "",</div><div class='add'>+				    &amp;usb9pfs_func_type);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;usb9pfs_lock);</div><div class='add'>+	list_add_tail(&amp;dev-&gt;usb9pfs_instance, &amp;usbg_instance_list);</div><div class='add'>+	mutex_unlock(&amp;usb9pfs_lock);</div><div class='add'>+</div><div class='add'>+	return &amp;usb9pfs_opts-&gt;func_inst;</div><div class='add'>+}</div><div class='add'>+DECLARE_USB_FUNCTION(usb9pfs, usb9pfs_alloc_instance, usb9pfs_alloc);</div><div class='add'>+</div><div class='add'>+static int __init usb9pfs_modinit(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;usbg_instance_list);</div><div class='add'>+</div><div class='add'>+	ret = usb_function_register(&amp;usb9pfsusb_func);</div><div class='add'>+	if (!ret)</div><div class='add'>+		v9fs_register_trans(&amp;p9_usbg_trans);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit usb9pfs_modexit(void)</div><div class='add'>+{</div><div class='add'>+	usb_function_unregister(&amp;usb9pfsusb_func);</div><div class='add'>+	v9fs_unregister_trans(&amp;p9_usbg_trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(usb9pfs_modinit);</div><div class='add'>+module_exit(usb9pfs_modexit);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_9P("usbg");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("USB gadget 9pfs transport");</div><div class='add'>+MODULE_AUTHOR("Michael Grzeschik");</div><div class='head'>diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c<br/>index 7728b0acde09..10c2dd486438 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_virtio.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_virtio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_virtio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_virtio.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * The Virtio 9p transport driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,22 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on virtio console driver</div><div class='ctx'>  *  Copyright (C) 2006, 2007 Rusty Russell, IBM Corporation</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -37,12 +22,11 @@</div><div class='ctx'> #include &lt;linux/un.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> #include &lt;net/9p/transport.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='hunk'>@@ -65,7 +49,11 @@ static atomic_t vp_pinned = ATOMIC_INIT(0);</div><div class='ctx'>  * @client: client instance</div><div class='ctx'>  * @vdev: virtio dev associated with this channel</div><div class='ctx'>  * @vq: virtio queue associated with this channel</div><div class='add'>+ * @ring_bufs_avail: flag to indicate there is some available in the ring buf</div><div class='add'>+ * @vc_wq: wait queue for waiting for thing to be added to ring buf</div><div class='add'>+ * @p9_max_pages: maximum number of pinned pages</div><div class='ctx'>  * @sg: scatter gather list which is used to pack a request (protected?)</div><div class='add'>+ * @chan_list: linked list of channels</div><div class='ctx'>  *</div><div class='ctx'>  * We keep all per-channel information in a structure.</div><div class='ctx'>  * This structure is allocated within the devices dev-&gt;mem space.</div><div class='hunk'>@@ -89,8 +77,8 @@ struct virtio_chan {</div><div class='ctx'> 	unsigned long p9_max_pages;</div><div class='ctx'> 	/* Scatterlist: can be too big for stack. */</div><div class='ctx'> 	struct scatterlist sg[VIRTQUEUE_NUM];</div><div class='del'>-	/*</div><div class='del'>-	 * tag name to identify a mount null terminated</div><div class='add'>+	/**</div><div class='add'>+	 * @tag: name to identify a mount null terminated</div><div class='ctx'> 	 */</div><div class='ctx'> 	char *tag;</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +98,7 @@ static unsigned int rest_of_page(void *data)</div><div class='ctx'>  * @client: client instance</div><div class='ctx'>  *</div><div class='ctx'>  * This reclaims a channel by freeing its resources and</div><div class='del'>- * reseting its inuse flag.</div><div class='add'>+ * resetting its inuse flag.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +143,7 @@ static void req_done(struct virtqueue *vq)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (len) {</div><div class='del'>-			req-&gt;rc-&gt;size = len;</div><div class='add'>+			req-&gt;rc.size = len;</div><div class='ctx'> 			p9_client_cb(chan-&gt;client, req, REQ_STATUS_RCVD);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -207,11 +195,19 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Reply won't come, so drop req ref */</div><div class='add'>+static int p9_virtio_cancelled(struct p9_client *client, struct p9_req_t *req)</div><div class='add'>+{</div><div class='add'>+	p9_req_put(client, req);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pack_sg_list_p - Just like pack_sg_list. Instead of taking a buffer,</div><div class='ctx'>  * this takes a list of pages.</div><div class='ctx'>  * @sg: scatter/gather list to pack into</div><div class='ctx'>  * @start: which segment of the sg_list to start at</div><div class='add'>+ * @limit: maximum number of pages in sg list.</div><div class='ctx'>  * @pdata: a list of pages to add into sg.</div><div class='ctx'>  * @nr_pages: number of pages to pack into the scatter/gather list</div><div class='ctx'>  * @offs: amount of data in the beginning of first page _not_ to pack</div><div class='hunk'>@@ -266,19 +262,19 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "9p debug: virtio request\n");</div><div class='ctx'> </div><div class='del'>-	req-&gt;status = REQ_STATUS_SENT;</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_SENT);</div><div class='ctx'> req_retry:</div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	out_sgs = in_sgs = 0;</div><div class='ctx'> 	/* Handle out VirtIO ring buffers */</div><div class='ctx'> 	out = pack_sg_list(chan-&gt;sg, 0,</div><div class='del'>-			   VIRTQUEUE_NUM, req-&gt;tc-&gt;sdata, req-&gt;tc-&gt;size);</div><div class='add'>+			   VIRTQUEUE_NUM, req-&gt;tc.sdata, req-&gt;tc.size);</div><div class='ctx'> 	if (out)</div><div class='ctx'> 		sgs[out_sgs++] = chan-&gt;sg;</div><div class='ctx'> </div><div class='ctx'> 	in = pack_sg_list(chan-&gt;sg, out,</div><div class='del'>-			  VIRTQUEUE_NUM, req-&gt;rc-&gt;sdata, req-&gt;rc-&gt;capacity);</div><div class='add'>+			  VIRTQUEUE_NUM, req-&gt;rc.sdata, req-&gt;rc.capacity);</div><div class='ctx'> 	if (in)</div><div class='ctx'> 		sgs[out_sgs + in_sgs++] = chan-&gt;sg + out;</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +318,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,</div><div class='ctx'> 	if (!iov_iter_count(data))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!(data-&gt;type &amp; ITER_KVEC)) {</div><div class='add'>+	if (!iov_iter_is_kvec(data)) {</div><div class='ctx'> 		int n;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We allow only p9_max_pages pinned. We wait for the</div><div class='hunk'>@@ -334,7 +330,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,</div><div class='ctx'> 			if (err == -ERESTARTSYS)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='del'>-		n = iov_iter_get_pages_alloc(data, pages, count, offs);</div><div class='add'>+		n = iov_iter_get_pages_alloc2(data, pages, count, offs);</div><div class='ctx'> 		if (n &lt; 0)</div><div class='ctx'> 			return n;</div><div class='ctx'> 		*need_drop = 1;</div><div class='hunk'>@@ -376,10 +372,40 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,</div><div class='ctx'> 				(*pages)[index] = kmap_to_page(p);</div><div class='ctx'> 			p += PAGE_SIZE;</div><div class='ctx'> 		}</div><div class='add'>+		iov_iter_advance(data, len);</div><div class='ctx'> 		return len;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void handle_rerror(struct p9_req_t *req, int in_hdr_len,</div><div class='add'>+			  size_t offs, struct page **pages)</div><div class='add'>+{</div><div class='add'>+	unsigned size, n;</div><div class='add'>+	void *to = req-&gt;rc.sdata + in_hdr_len;</div><div class='add'>+</div><div class='add'>+	// Fits entirely into the static data?  Nothing to do.</div><div class='add'>+	if (req-&gt;rc.size &lt; in_hdr_len || !pages)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	// Really long error message?  Tough, truncate the reply.  Might get</div><div class='add'>+	// rejected (we can't be arsed to adjust the size encoded in header,</div><div class='add'>+	// or string size for that matter), but it wouldn't be anything valid</div><div class='add'>+	// anyway.</div><div class='add'>+	if (unlikely(req-&gt;rc.size &gt; P9_ZC_HDR_SZ))</div><div class='add'>+		req-&gt;rc.size = P9_ZC_HDR_SZ;</div><div class='add'>+</div><div class='add'>+	// data won't span more than two pages</div><div class='add'>+	size = req-&gt;rc.size - in_hdr_len;</div><div class='add'>+	n = PAGE_SIZE - offs;</div><div class='add'>+	if (size &gt; n) {</div><div class='add'>+		memcpy_from_page(to, *pages++, offs, n);</div><div class='add'>+		offs = 0;</div><div class='add'>+		to += n;</div><div class='add'>+		size -= n;</div><div class='add'>+	}</div><div class='add'>+	memcpy_from_page(to, *pages, offs, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * p9_virtio_zc_request - issue a zero copy request</div><div class='ctx'>  * @client: client instance issuing the request</div><div class='hunk'>@@ -402,8 +428,9 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,</div><div class='ctx'> 	struct page **in_pages = NULL, **out_pages = NULL;</div><div class='ctx'> 	struct virtio_chan *chan = client-&gt;trans;</div><div class='ctx'> 	struct scatterlist *sgs[4];</div><div class='del'>-	size_t offs;</div><div class='add'>+	size_t offs = 0;</div><div class='ctx'> 	int need_drop = 0;</div><div class='add'>+	int kicked = 0;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "virtio request\n");</div><div class='ctx'> </div><div class='hunk'>@@ -411,33 +438,37 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,</div><div class='ctx'> 		__le32 sz;</div><div class='ctx'> 		int n = p9_get_mapped_pages(chan, &amp;out_pages, uodata,</div><div class='ctx'> 					    outlen, &amp;offs, &amp;need_drop);</div><div class='del'>-		if (n &lt; 0)</div><div class='del'>-			return n;</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			err = n;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='ctx'> 		out_nr_pages = DIV_ROUND_UP(n + offs, PAGE_SIZE);</div><div class='ctx'> 		if (n != outlen) {</div><div class='ctx'> 			__le32 v = cpu_to_le32(n);</div><div class='del'>-			memcpy(&amp;req-&gt;tc-&gt;sdata[req-&gt;tc-&gt;size - 4], &amp;v, 4);</div><div class='add'>+			memcpy(&amp;req-&gt;tc.sdata[req-&gt;tc.size - 4], &amp;v, 4);</div><div class='ctx'> 			outlen = n;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* The size field of the message must include the length of the</div><div class='ctx'> 		 * header and the length of the data.  We didn't actually know</div><div class='ctx'> 		 * the length of the data until this point so add it in now.</div><div class='ctx'> 		 */</div><div class='del'>-		sz = cpu_to_le32(req-&gt;tc-&gt;size + outlen);</div><div class='del'>-		memcpy(&amp;req-&gt;tc-&gt;sdata[0], &amp;sz, sizeof(sz));</div><div class='add'>+		sz = cpu_to_le32(req-&gt;tc.size + outlen);</div><div class='add'>+		memcpy(&amp;req-&gt;tc.sdata[0], &amp;sz, sizeof(sz));</div><div class='ctx'> 	} else if (uidata) {</div><div class='ctx'> 		int n = p9_get_mapped_pages(chan, &amp;in_pages, uidata,</div><div class='ctx'> 					    inlen, &amp;offs, &amp;need_drop);</div><div class='del'>-		if (n &lt; 0)</div><div class='del'>-			return n;</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			err = n;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='ctx'> 		in_nr_pages = DIV_ROUND_UP(n + offs, PAGE_SIZE);</div><div class='ctx'> 		if (n != inlen) {</div><div class='ctx'> 			__le32 v = cpu_to_le32(n);</div><div class='del'>-			memcpy(&amp;req-&gt;tc-&gt;sdata[req-&gt;tc-&gt;size - 4], &amp;v, 4);</div><div class='add'>+			memcpy(&amp;req-&gt;tc.sdata[req-&gt;tc.size - 4], &amp;v, 4);</div><div class='ctx'> 			inlen = n;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	req-&gt;status = REQ_STATUS_SENT;</div><div class='add'>+	WRITE_ONCE(req-&gt;status, REQ_STATUS_SENT);</div><div class='ctx'> req_retry_pinned:</div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +476,7 @@ req_retry_pinned:</div><div class='ctx'> </div><div class='ctx'> 	/* out data */</div><div class='ctx'> 	out = pack_sg_list(chan-&gt;sg, 0,</div><div class='del'>-			   VIRTQUEUE_NUM, req-&gt;tc-&gt;sdata, req-&gt;tc-&gt;size);</div><div class='add'>+			   VIRTQUEUE_NUM, req-&gt;tc.sdata, req-&gt;tc.size);</div><div class='ctx'> </div><div class='ctx'> 	if (out)</div><div class='ctx'> 		sgs[out_sgs++] = chan-&gt;sg;</div><div class='hunk'>@@ -461,17 +492,17 @@ req_retry_pinned:</div><div class='ctx'> 	 * For example TREAD have 11.</div><div class='ctx'> 	 * 11 is the read/write header = PDU Header(7) + IO Size (4).</div><div class='ctx'> 	 * Arrange in such a way that server places header in the</div><div class='del'>-	 * alloced memory and payload onto the user buffer.</div><div class='add'>+	 * allocated memory and payload onto the user buffer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	in = pack_sg_list(chan-&gt;sg, out,</div><div class='del'>-			  VIRTQUEUE_NUM, req-&gt;rc-&gt;sdata, in_hdr_len);</div><div class='add'>+			  VIRTQUEUE_NUM, req-&gt;rc.sdata, in_hdr_len);</div><div class='ctx'> 	if (in)</div><div class='ctx'> 		sgs[out_sgs + in_sgs++] = chan-&gt;sg + out;</div><div class='ctx'> </div><div class='ctx'> 	if (in_pages) {</div><div class='ctx'> 		sgs[out_sgs + in_sgs++] = chan-&gt;sg + out + in;</div><div class='del'>-		in += pack_sg_list_p(chan-&gt;sg, out + in, VIRTQUEUE_NUM,</div><div class='del'>-				     in_pages, in_nr_pages, offs, inlen);</div><div class='add'>+		pack_sg_list_p(chan-&gt;sg, out + in, VIRTQUEUE_NUM,</div><div class='add'>+			       in_pages, in_nr_pages, offs, inlen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(out_sgs + in_sgs &gt; ARRAY_SIZE(sgs));</div><div class='hunk'>@@ -498,8 +529,15 @@ req_retry_pinned:</div><div class='ctx'> 	}</div><div class='ctx'> 	virtqueue_kick(chan-&gt;vq);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='add'>+	kicked = 1;</div><div class='ctx'> 	p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");</div><div class='del'>-	err = wait_event_killable(req-&gt;wq, req-&gt;status &gt;= REQ_STATUS_RCVD);</div><div class='add'>+	err = wait_event_killable(req-&gt;wq,</div><div class='add'>+			          READ_ONCE(req-&gt;status) &gt;= REQ_STATUS_RCVD);</div><div class='add'>+	// RERROR needs reply (== error string) in static data</div><div class='add'>+	if (READ_ONCE(req-&gt;status) == REQ_STATUS_RCVD &amp;&amp;</div><div class='add'>+	    unlikely(req-&gt;rc.sdata[4] == P9_RERROR))</div><div class='add'>+		handle_rerror(req, in_hdr_len, offs, in_pages);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Non kernel buffers are pinned, unpin them</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -518,6 +556,10 @@ err_out:</div><div class='ctx'> 	}</div><div class='ctx'> 	kvfree(in_pages);</div><div class='ctx'> 	kvfree(out_pages);</div><div class='add'>+	if (!kicked) {</div><div class='add'>+		/* reply won't come */</div><div class='add'>+		p9_req_put(client, req);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -603,7 +645,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)</div><div class='ctx'> 	chan-&gt;vc_wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);</div><div class='ctx'> 	if (!chan-&gt;vc_wq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out_free_tag;</div><div class='add'>+		goto out_remove_file;</div><div class='ctx'> 	}</div><div class='ctx'> 	init_waitqueue_head(chan-&gt;vc_wq);</div><div class='ctx'> 	chan-&gt;ring_bufs_avail = 1;</div><div class='hunk'>@@ -621,6 +663,8 @@ static int p9_virtio_probe(struct virtio_device *vdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_remove_file:</div><div class='add'>+	sysfs_remove_file(&amp;vdev-&gt;dev.kobj, &amp;dev_attr_mount_tag.attr);</div><div class='ctx'> out_free_tag:</div><div class='ctx'> 	kfree(tag);</div><div class='ctx'> out_free_vq:</div><div class='hunk'>@@ -635,11 +679,10 @@ fail:</div><div class='ctx'> /**</div><div class='ctx'>  * p9_virtio_create - allocate a new virtio channel</div><div class='ctx'>  * @client: client instance invoking this transport</div><div class='del'>- * @devname: string identifying the channel to connect to (unused)</div><div class='del'>- * @args: args passed from sys_mount() for per-transport options (unused)</div><div class='add'>+ * @fc: the filesystem context</div><div class='ctx'>  *</div><div class='ctx'>  * This sets up a transport channel for 9p communication.  Right now</div><div class='del'>- * we only match the first available channel, but eventually we couldlook up</div><div class='add'>+ * we only match the first available channel, but eventually we could look up</div><div class='ctx'>  * alternate channels by matching devname versus a virtio_config entry.</div><div class='ctx'>  * We use a simple reference count mechanism to ensure that only a single</div><div class='ctx'>  * mount has a channel open at a time.</div><div class='hunk'>@@ -647,8 +690,9 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-p9_virtio_create(struct p9_client *client, const char *devname, char *args)</div><div class='add'>+p9_virtio_create(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	const char *devname = fc-&gt;source;</div><div class='ctx'> 	struct virtio_chan *chan;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='ctx'> 	int found = 0;</div><div class='hunk'>@@ -712,7 +756,7 @@ static void p9_virtio_remove(struct virtio_device *vdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;virtio_9p_lock);</div><div class='ctx'> </div><div class='del'>-	vdev-&gt;config-&gt;reset(vdev);</div><div class='add'>+	virtio_reset_device(vdev);</div><div class='ctx'> 	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_file(&amp;(vdev-&gt;dev.kobj), &amp;dev_attr_mount_tag.attr);</div><div class='hunk'>@@ -737,7 +781,6 @@ static struct virtio_driver p9_virtio_drv = {</div><div class='ctx'> 	.feature_table  = features,</div><div class='ctx'> 	.feature_table_size = ARRAY_SIZE(features),</div><div class='ctx'> 	.driver.name    = KBUILD_MODNAME,</div><div class='del'>-	.driver.owner	= THIS_MODULE,</div><div class='ctx'> 	.id_table	= id_table,</div><div class='ctx'> 	.probe		= p9_virtio_probe,</div><div class='ctx'> 	.remove		= p9_virtio_remove,</div><div class='hunk'>@@ -750,24 +793,33 @@ static struct p9_trans_module p9_virtio_trans = {</div><div class='ctx'> 	.request = p9_virtio_request,</div><div class='ctx'> 	.zc_request = p9_virtio_zc_request,</div><div class='ctx'> 	.cancel = p9_virtio_cancel,</div><div class='add'>+	.cancelled = p9_virtio_cancelled,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We leave one entry for input and one entry for response</div><div class='del'>-	 * headers. We also skip one more entry to accomodate, address</div><div class='add'>+	 * headers. We also skip one more entry to accommodate, address</div><div class='ctx'> 	 * that are not at page boundary, that can result in an extra</div><div class='ctx'> 	 * page in zero copy.</div><div class='ctx'> 	 */</div><div class='ctx'> 	.maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3),</div><div class='del'>-	.def = 1,</div><div class='add'>+	.pooled_rbuffers = false,</div><div class='add'>+	.def = true,</div><div class='add'>+	.supports_vmalloc = false,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The standard init function */</div><div class='ctx'> static int __init p9_virtio_init(void)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;virtio_chan_list);</div><div class='ctx'> </div><div class='ctx'> 	v9fs_register_trans(&amp;p9_virtio_trans);</div><div class='del'>-	return register_virtio_driver(&amp;p9_virtio_drv);</div><div class='add'>+	rc = register_virtio_driver(&amp;p9_virtio_drv);</div><div class='add'>+	if (rc)</div><div class='add'>+		v9fs_unregister_trans(&amp;p9_virtio_trans);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit p9_virtio_cleanup(void)</div><div class='hunk'>@@ -778,6 +830,7 @@ static void __exit p9_virtio_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(p9_virtio_init);</div><div class='ctx'> module_exit(p9_virtio_cleanup);</div><div class='add'>+MODULE_ALIAS_9P("virtio");</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(virtio, id_table);</div><div class='ctx'> MODULE_AUTHOR("Eric Van Hensbergen &lt;ericvh@gmail.com&gt;");</div><div class='head'>diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c<br/>index c2d54ac76bfd..12f752a92332 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/trans_xen.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/trans_xen.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/9p/trans_xen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/9p/trans_xen.c</a></div><div class='hunk'>@@ -1,33 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * linux/fs/9p/trans_xen</div><div class='ctx'>  *</div><div class='ctx'>  * Xen transport layer.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 by Stefano Stabellini &lt;stefano@aporeto.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation; or, when distributed</div><div class='del'>- * separately from the Linux kernel or incorporated into other</div><div class='del'>- * software packages, subject to the following license:</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining a copy</div><div class='del'>- * of this source file (the "Software"), to deal in the Software without</div><div class='del'>- * restriction, including without limitation the rights to use, copy, modify,</div><div class='del'>- * merge, publish, distribute, sublicense, and/or sell copies of the Software,</div><div class='del'>- * and to permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice shall be included in</div><div class='del'>- * all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE</div><div class='del'>- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='del'>- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='del'>- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='del'>- * IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;xen/events.h&gt;</div><div class='hunk'>@@ -38,13 +15,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> #include &lt;net/9p/transport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define XEN_9PFS_NUM_RINGS 2</div><div class='del'>-#define XEN_9PFS_RING_ORDER 6</div><div class='del'>-#define XEN_9PFS_RING_SIZE  XEN_FLEX_RING_SIZE(XEN_9PFS_RING_ORDER)</div><div class='add'>+#define XEN_9PFS_RING_ORDER 9</div><div class='add'>+#define XEN_9PFS_RING_SIZE(ring)  XEN_FLEX_RING_SIZE(ring-&gt;intf-&gt;ring_order)</div><div class='ctx'> </div><div class='ctx'> struct xen_9pfs_header {</div><div class='ctx'> 	uint32_t size;</div><div class='hunk'>@@ -77,7 +55,6 @@ struct xen_9pfs_front_priv {</div><div class='ctx'> 	char *tag;</div><div class='ctx'> 	struct p9_client *client;</div><div class='ctx'> </div><div class='del'>-	int num_rings;</div><div class='ctx'> 	struct xen_9pfs_dataring *rings;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -90,8 +67,9 @@ static int p9_xen_cancel(struct p9_client *client, struct p9_req_t *req)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p9_xen_create(struct p9_client *client, const char *addr, char *args)</div><div class='add'>+static int p9_xen_create(struct p9_client *client, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	const char *addr = fc-&gt;source;</div><div class='ctx'> 	struct xen_9pfs_front_priv *priv;</div><div class='ctx'> </div><div class='ctx'> 	if (addr == NULL)</div><div class='hunk'>@@ -132,16 +110,16 @@ static bool p9_xen_write_todo(struct xen_9pfs_dataring *ring, RING_IDX size)</div><div class='ctx'> 	prod = ring-&gt;intf-&gt;out_prod;</div><div class='ctx'> 	virt_mb();</div><div class='ctx'> </div><div class='del'>-	return XEN_9PFS_RING_SIZE -</div><div class='del'>-		xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE) &gt;= size;</div><div class='add'>+	return XEN_9PFS_RING_SIZE(ring) -</div><div class='add'>+		xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE(ring)) &gt;= size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req)</div><div class='ctx'> {</div><div class='del'>-	struct xen_9pfs_front_priv *priv = NULL;</div><div class='add'>+	struct xen_9pfs_front_priv *priv;</div><div class='ctx'> 	RING_IDX cons, prod, masked_cons, masked_prod;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u32 size = p9_req-&gt;tc-&gt;size;</div><div class='add'>+	u32 size = p9_req-&gt;tc.size;</div><div class='ctx'> 	struct xen_9pfs_dataring *ring;</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='hunk'>@@ -151,10 +129,10 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;xen_9pfs_lock);</div><div class='del'>-	if (!priv || priv-&gt;client != client)</div><div class='add'>+	if (list_entry_is_head(priv, &amp;xen_9pfs_devs, list))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	num = p9_req-&gt;tc-&gt;tag % priv-&gt;num_rings;</div><div class='add'>+	num = p9_req-&gt;tc.tag % XEN_9PFS_NUM_RINGS;</div><div class='ctx'> 	ring = &amp;priv-&gt;rings[num];</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='hunk'>@@ -167,24 +145,26 @@ again:</div><div class='ctx'> 	prod = ring-&gt;intf-&gt;out_prod;</div><div class='ctx'> 	virt_mb();</div><div class='ctx'> </div><div class='del'>-	if (XEN_9PFS_RING_SIZE - xen_9pfs_queued(prod, cons,</div><div class='del'>-						 XEN_9PFS_RING_SIZE) &lt; size) {</div><div class='add'>+	if (XEN_9PFS_RING_SIZE(ring) -</div><div class='add'>+	    xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE(ring)) &lt; size) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE);</div><div class='del'>-	masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE);</div><div class='add'>+	masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE(ring));</div><div class='add'>+	masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> </div><div class='del'>-	xen_9pfs_write_packet(ring-&gt;data.out, p9_req-&gt;tc-&gt;sdata, size,</div><div class='del'>-			      &amp;masked_prod, masked_cons, XEN_9PFS_RING_SIZE);</div><div class='add'>+	xen_9pfs_write_packet(ring-&gt;data.out, p9_req-&gt;tc.sdata, size,</div><div class='add'>+			      &amp;masked_prod, masked_cons,</div><div class='add'>+			      XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> </div><div class='del'>-	p9_req-&gt;status = REQ_STATUS_SENT;</div><div class='add'>+	WRITE_ONCE(p9_req-&gt;status, REQ_STATUS_SENT);</div><div class='ctx'> 	virt_wmb();			/* write ring before updating pointer */</div><div class='ctx'> 	prod += size;</div><div class='ctx'> 	ring-&gt;intf-&gt;out_prod = prod;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='ctx'> 	notify_remote_via_irq(ring-&gt;irq);</div><div class='add'>+	p9_req_put(client, p9_req);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -206,19 +186,19 @@ static void p9_xen_response(struct work_struct *work)</div><div class='ctx'> 		prod = ring-&gt;intf-&gt;in_prod;</div><div class='ctx'> 		virt_rmb();</div><div class='ctx'> </div><div class='del'>-		if (xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE) &lt;</div><div class='add'>+		if (xen_9pfs_queued(prod, cons, XEN_9PFS_RING_SIZE(ring)) &lt;</div><div class='ctx'> 		    sizeof(h)) {</div><div class='ctx'> 			notify_remote_via_irq(ring-&gt;irq);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE);</div><div class='del'>-		masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE);</div><div class='add'>+		masked_prod = xen_9pfs_mask(prod, XEN_9PFS_RING_SIZE(ring));</div><div class='add'>+		masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> </div><div class='ctx'> 		/* First, read just the header */</div><div class='ctx'> 		xen_9pfs_read_packet(&amp;h, ring-&gt;data.in, sizeof(h),</div><div class='ctx'> 				     masked_prod, &amp;masked_cons,</div><div class='del'>-				     XEN_9PFS_RING_SIZE);</div><div class='add'>+				     XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> </div><div class='ctx'> 		req = p9_tag_lookup(priv-&gt;client, h.tag);</div><div class='ctx'> 		if (!req || req-&gt;status != REQ_STATUS_SENT) {</div><div class='hunk'>@@ -229,15 +209,26 @@ static void p9_xen_response(struct work_struct *work)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memcpy(req-&gt;rc, &amp;h, sizeof(h));</div><div class='del'>-		req-&gt;rc-&gt;offset = 0;</div><div class='add'>+		if (h.size &gt; req-&gt;rc.capacity) {</div><div class='add'>+			dev_warn(&amp;priv-&gt;dev-&gt;dev,</div><div class='add'>+				 "requested packet size too big: %d for tag %d with capacity %zd\n",</div><div class='add'>+				 h.size, h.tag, req-&gt;rc.capacity);</div><div class='add'>+			WRITE_ONCE(req-&gt;status, REQ_STATUS_ERROR);</div><div class='add'>+			goto recv_error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		req-&gt;rc.size = h.size;</div><div class='add'>+		req-&gt;rc.id = h.id;</div><div class='add'>+		req-&gt;rc.tag = h.tag;</div><div class='add'>+		req-&gt;rc.offset = 0;</div><div class='ctx'> </div><div class='del'>-		masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE);</div><div class='add'>+		masked_cons = xen_9pfs_mask(cons, XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> 		/* Then, read the whole packet (including the header) */</div><div class='del'>-		xen_9pfs_read_packet(req-&gt;rc-&gt;sdata, ring-&gt;data.in, h.size,</div><div class='add'>+		xen_9pfs_read_packet(req-&gt;rc.sdata, ring-&gt;data.in, h.size,</div><div class='ctx'> 				     masked_prod, &amp;masked_cons,</div><div class='del'>-				     XEN_9PFS_RING_SIZE);</div><div class='add'>+				     XEN_9PFS_RING_SIZE(ring));</div><div class='ctx'> </div><div class='add'>+recv_error:</div><div class='ctx'> 		virt_mb();</div><div class='ctx'> 		cons += h.size;</div><div class='ctx'> 		ring-&gt;intf-&gt;in_cons = cons;</div><div class='hunk'>@@ -266,8 +257,10 @@ static irqreturn_t xen_9pfs_front_event_handler(int irq, void *r)</div><div class='ctx'> </div><div class='ctx'> static struct p9_trans_module p9_xen_trans = {</div><div class='ctx'> 	.name = "xen",</div><div class='del'>-	.maxsize = 1 &lt;&lt; (XEN_9PFS_RING_ORDER + XEN_PAGE_SHIFT),</div><div class='del'>-	.def = 1,</div><div class='add'>+	.maxsize = 1 &lt;&lt; (XEN_9PFS_RING_ORDER + XEN_PAGE_SHIFT - 2),</div><div class='add'>+	.pooled_rbuffers = false,</div><div class='add'>+	.def = true,</div><div class='add'>+	.supports_vmalloc = false,</div><div class='ctx'> 	.create = p9_xen_create,</div><div class='ctx'> 	.close = p9_xen_close,</div><div class='ctx'> 	.request = p9_xen_request,</div><div class='hunk'>@@ -288,23 +281,29 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)</div><div class='ctx'> 	list_del(&amp;priv-&gt;list);</div><div class='ctx'> 	write_unlock(&amp;xen_9pfs_lock);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_rings; i++) {</div><div class='add'>+	for (i = 0; i &lt; XEN_9PFS_NUM_RINGS; i++) {</div><div class='add'>+		struct xen_9pfs_dataring *ring = &amp;priv-&gt;rings[i];</div><div class='add'>+</div><div class='add'>+		cancel_work_sync(&amp;ring-&gt;work);</div><div class='add'>+</div><div class='ctx'> 		if (!priv-&gt;rings[i].intf)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (priv-&gt;rings[i].irq &gt; 0)</div><div class='del'>-			unbind_from_irqhandler(priv-&gt;rings[i].irq, priv-&gt;dev);</div><div class='add'>+			unbind_from_irqhandler(priv-&gt;rings[i].irq, ring);</div><div class='ctx'> 		if (priv-&gt;rings[i].data.in) {</div><div class='del'>-			for (j = 0; j &lt; (1 &lt;&lt; XEN_9PFS_RING_ORDER); j++) {</div><div class='add'>+			for (j = 0;</div><div class='add'>+			     j &lt; (1 &lt;&lt; priv-&gt;rings[i].intf-&gt;ring_order);</div><div class='add'>+			     j++) {</div><div class='ctx'> 				grant_ref_t ref;</div><div class='ctx'> </div><div class='ctx'> 				ref = priv-&gt;rings[i].intf-&gt;ref[j];</div><div class='del'>-				gnttab_end_foreign_access(ref, 0, 0);</div><div class='add'>+				gnttab_end_foreign_access(ref, NULL);</div><div class='ctx'> 			}</div><div class='del'>-			free_pages((unsigned long)priv-&gt;rings[i].data.in,</div><div class='del'>-				   XEN_9PFS_RING_ORDER -</div><div class='del'>-				   (PAGE_SHIFT - XEN_PAGE_SHIFT));</div><div class='add'>+			free_pages_exact(priv-&gt;rings[i].data.in,</div><div class='add'>+				   1UL &lt;&lt; (priv-&gt;rings[i].intf-&gt;ring_order +</div><div class='add'>+					   XEN_PAGE_SHIFT));</div><div class='ctx'> 		}</div><div class='del'>-		gnttab_end_foreign_access(priv-&gt;rings[i].ref, 0, 0);</div><div class='add'>+		gnttab_end_foreign_access(priv-&gt;rings[i].ref, NULL);</div><div class='ctx'> 		free_page((unsigned long)priv-&gt;rings[i].intf);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(priv-&gt;rings);</div><div class='hunk'>@@ -312,17 +311,17 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xen_9pfs_front_remove(struct xenbus_device *dev)</div><div class='add'>+static void xen_9pfs_front_remove(struct xenbus_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xen_9pfs_front_priv *priv = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> 	xen_9pfs_front_free(priv);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev,</div><div class='del'>-					 struct xen_9pfs_dataring *ring)</div><div class='add'>+					 struct xen_9pfs_dataring *ring,</div><div class='add'>+					 unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='hunk'>@@ -340,22 +339,22 @@ static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ring-&gt;ref = ret;</div><div class='del'>-	bytes = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='del'>-			XEN_9PFS_RING_ORDER - (PAGE_SHIFT - XEN_PAGE_SHIFT));</div><div class='add'>+	bytes = alloc_pages_exact(1UL &lt;&lt; (order + XEN_PAGE_SHIFT),</div><div class='add'>+				  GFP_KERNEL | __GFP_ZERO);</div><div class='ctx'> 	if (!bytes) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	for (; i &lt; (1 &lt;&lt; XEN_9PFS_RING_ORDER); i++) {</div><div class='add'>+	for (; i &lt; (1 &lt;&lt; order); i++) {</div><div class='ctx'> 		ret = gnttab_grant_foreign_access(</div><div class='ctx'> 				dev-&gt;otherend_id, virt_to_gfn(bytes) + i, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		ring-&gt;intf-&gt;ref[i] = ret;</div><div class='ctx'> 	}</div><div class='del'>-	ring-&gt;intf-&gt;ring_order = XEN_9PFS_RING_ORDER;</div><div class='add'>+	ring-&gt;intf-&gt;ring_order = order;</div><div class='ctx'> 	ring-&gt;data.in = bytes;</div><div class='del'>-	ring-&gt;data.out = bytes + XEN_9PFS_RING_SIZE;</div><div class='add'>+	ring-&gt;data.out = bytes + XEN_FLEX_RING_SIZE(order);</div><div class='ctx'> </div><div class='ctx'> 	ret = xenbus_alloc_evtchn(dev, &amp;ring-&gt;evtchn);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -371,29 +370,32 @@ static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev,</div><div class='ctx'> out:</div><div class='ctx'> 	if (bytes) {</div><div class='ctx'> 		for (i--; i &gt;= 0; i--)</div><div class='del'>-			gnttab_end_foreign_access(ring-&gt;intf-&gt;ref[i], 0, 0);</div><div class='del'>-		free_pages((unsigned long)bytes,</div><div class='del'>-			   XEN_9PFS_RING_ORDER -</div><div class='del'>-			   (PAGE_SHIFT - XEN_PAGE_SHIFT));</div><div class='add'>+			gnttab_end_foreign_access(ring-&gt;intf-&gt;ref[i], NULL);</div><div class='add'>+		free_pages_exact(bytes, 1UL &lt;&lt; (order + XEN_PAGE_SHIFT));</div><div class='ctx'> 	}</div><div class='del'>-	gnttab_end_foreign_access(ring-&gt;ref, 0, 0);</div><div class='add'>+	gnttab_end_foreign_access(ring-&gt;ref, NULL);</div><div class='ctx'> 	free_page((unsigned long)ring-&gt;intf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xen_9pfs_front_probe(struct xenbus_device *dev,</div><div class='del'>-				const struct xenbus_device_id *id)</div><div class='add'>+static int xen_9pfs_front_init(struct xenbus_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	struct xenbus_transaction xbt;</div><div class='del'>-	struct xen_9pfs_front_priv *priv = NULL;</div><div class='del'>-	char *versions;</div><div class='add'>+	struct xen_9pfs_front_priv *priv = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	char *versions, *v;</div><div class='ctx'> 	unsigned int max_rings, max_ring_order, len = 0;</div><div class='ctx'> </div><div class='ctx'> 	versions = xenbus_read(XBT_NIL, dev-&gt;otherend, "versions", &amp;len);</div><div class='del'>-	if (!len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (strcmp(versions, "1")) {</div><div class='add'>+	if (IS_ERR(versions))</div><div class='add'>+		return PTR_ERR(versions);</div><div class='add'>+	for (v = versions; *v; v++) {</div><div class='add'>+		if (simple_strtoul(v, &amp;v, 10) == 1) {</div><div class='add'>+			v = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (v) {</div><div class='ctx'> 		kfree(versions);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -403,25 +405,22 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	max_ring_order = xenbus_read_unsigned(dev-&gt;otherend,</div><div class='ctx'> 					      "max-ring-page-order", 0);</div><div class='del'>-	if (max_ring_order &lt; XEN_9PFS_RING_ORDER)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (max_ring_order &gt; XEN_9PFS_RING_ORDER)</div><div class='add'>+		max_ring_order = XEN_9PFS_RING_ORDER;</div><div class='add'>+	if (p9_xen_trans.maxsize &gt; XEN_FLEX_RING_SIZE(max_ring_order))</div><div class='add'>+		p9_xen_trans.maxsize = XEN_FLEX_RING_SIZE(max_ring_order) / 2;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-	priv-&gt;num_rings = XEN_9PFS_NUM_RINGS;</div><div class='del'>-	priv-&gt;rings = kcalloc(priv-&gt;num_rings, sizeof(*priv-&gt;rings),</div><div class='add'>+	priv-&gt;rings = kcalloc(XEN_9PFS_NUM_RINGS, sizeof(*priv-&gt;rings),</div><div class='ctx'> 			      GFP_KERNEL);</div><div class='ctx'> 	if (!priv-&gt;rings) {</div><div class='ctx'> 		kfree(priv);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_rings; i++) {</div><div class='add'>+	for (i = 0; i &lt; XEN_9PFS_NUM_RINGS; i++) {</div><div class='ctx'> 		priv-&gt;rings[i].priv = priv;</div><div class='del'>-		ret = xen_9pfs_front_alloc_dataring(dev, &amp;priv-&gt;rings[i]);</div><div class='add'>+		ret = xen_9pfs_front_alloc_dataring(dev, &amp;priv-&gt;rings[i],</div><div class='add'>+						    max_ring_order);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -436,20 +435,21 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_xenbus;</div><div class='ctx'> 	ret = xenbus_printf(xbt, dev-&gt;nodename, "num-rings", "%u",</div><div class='del'>-			    priv-&gt;num_rings);</div><div class='add'>+			    XEN_9PFS_NUM_RINGS);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_xenbus;</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_rings; i++) {</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; XEN_9PFS_NUM_RINGS; i++) {</div><div class='ctx'> 		char str[16];</div><div class='ctx'> </div><div class='ctx'> 		BUILD_BUG_ON(XEN_9PFS_NUM_RINGS &gt; 9);</div><div class='del'>-		sprintf(str, "ring-ref%u", i);</div><div class='add'>+		sprintf(str, "ring-ref%d", i);</div><div class='ctx'> 		ret = xenbus_printf(xbt, dev-&gt;nodename, str, "%d",</div><div class='ctx'> 				    priv-&gt;rings[i].ref);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error_xenbus;</div><div class='ctx'> </div><div class='del'>-		sprintf(str, "event-channel-%u", i);</div><div class='add'>+		sprintf(str, "event-channel-%d", i);</div><div class='ctx'> 		ret = xenbus_printf(xbt, dev-&gt;nodename, str, "%u",</div><div class='ctx'> 				    priv-&gt;rings[i].evtchn);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -468,23 +468,36 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;xen_9pfs_lock);</div><div class='del'>-	list_add_tail(&amp;priv-&gt;list, &amp;xen_9pfs_devs);</div><div class='del'>-	write_unlock(&amp;xen_9pfs_lock);</div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, priv);</div><div class='ctx'> 	xenbus_switch_state(dev, XenbusStateInitialised);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  error_xenbus:</div><div class='ctx'> 	xenbus_transaction_end(xbt, 1);</div><div class='ctx'> 	xenbus_dev_fatal(dev, ret, "writing xenstore");</div><div class='ctx'>  error:</div><div class='del'>-	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> 	xen_9pfs_front_free(priv);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xen_9pfs_front_probe(struct xenbus_device *dev,</div><div class='add'>+				const struct xenbus_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct xen_9pfs_front_priv *priv = NULL;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, priv);</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;xen_9pfs_lock);</div><div class='add'>+	list_add_tail(&amp;priv-&gt;list, &amp;xen_9pfs_devs);</div><div class='add'>+	write_unlock(&amp;xen_9pfs_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xen_9pfs_front_resume(struct xenbus_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev_warn(&amp;dev-&gt;dev, "suspend/resume unsupported\n");</div><div class='hunk'>@@ -503,6 +516,10 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case XenbusStateInitWait:</div><div class='add'>+		if (dev-&gt;state != XenbusStateInitialising)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		xen_9pfs_front_init(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case XenbusStateConnected:</div><div class='hunk'>@@ -512,7 +529,7 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev,</div><div class='ctx'> 	case XenbusStateClosed:</div><div class='ctx'> 		if (dev-&gt;state == XenbusStateClosed)</div><div class='ctx'> 			break;</div><div class='del'>-		/* Missed the backend's CLOSING state -- fallthrough */</div><div class='add'>+		fallthrough;	/* Missed the backend's CLOSING state */</div><div class='ctx'> 	case XenbusStateClosing:</div><div class='ctx'> 		xenbus_frontend_closed(dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -527,25 +544,33 @@ static struct xenbus_driver xen_9pfs_front_driver = {</div><div class='ctx'> 	.otherend_changed = xen_9pfs_front_changed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int p9_trans_xen_init(void)</div><div class='add'>+static int __init p9_trans_xen_init(void)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Initialising Xen transport for 9pfs\n");</div><div class='ctx'> </div><div class='ctx'> 	v9fs_register_trans(&amp;p9_xen_trans);</div><div class='del'>-	return xenbus_register_frontend(&amp;xen_9pfs_front_driver);</div><div class='add'>+	rc = xenbus_register_frontend(&amp;xen_9pfs_front_driver);</div><div class='add'>+	if (rc)</div><div class='add'>+		v9fs_unregister_trans(&amp;p9_xen_trans);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> module_init(p9_trans_xen_init);</div><div class='add'>+MODULE_ALIAS_9P("xen");</div><div class='ctx'> </div><div class='del'>-static void p9_trans_xen_exit(void)</div><div class='add'>+static void __exit p9_trans_xen_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	v9fs_unregister_trans(&amp;p9_xen_trans);</div><div class='ctx'> 	return xenbus_unregister_driver(&amp;xen_9pfs_front_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(p9_trans_xen_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_ALIAS("xen:9pfs");</div><div class='ctx'> MODULE_AUTHOR("Stefano Stabellini &lt;stefano@aporeto.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Xen Transport for 9P");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/9p/util.c b/net/9p/util.c<br/>deleted file mode 100644<br/>index 55ad98277e85..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/9p/util.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/9p/util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/9p/util.c</div><div class='del'>- *</div><div class='del'>- *  This file contains some helper functions</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2007 by Latchesar Ionkov &lt;lucho@ionkov.net&gt;</div><div class='del'>- *  Copyright (C) 2004 by Eric Van Hensbergen &lt;ericvh@gmail.com&gt;</div><div class='del'>- *  Copyright (C) 2002 by Ron Minnich &lt;rminnich@lanl.gov&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to:</div><div class='del'>- *  Free Software Foundation</div><div class='del'>- *  51 Franklin Street, Fifth Floor</div><div class='del'>- *  Boston, MA  02111-1301  USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/9p/9p.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct p9_idpool - per-connection accounting for tag idpool</div><div class='del'>- * @lock: protects the pool</div><div class='del'>- * @pool: idr to allocate tag id from</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct p9_idpool {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	struct idr pool;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_idpool_create - create a new per-connection id pool</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct p9_idpool *p9_idpool_create(void)</div><div class='del'>-{</div><div class='del'>-	struct p9_idpool *p;</div><div class='del'>-</div><div class='del'>-	p = kmalloc(sizeof(struct p9_idpool), GFP_KERNEL);</div><div class='del'>-	if (!p)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;p-&gt;lock);</div><div class='del'>-	idr_init(&amp;p-&gt;pool);</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(p9_idpool_create);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_idpool_destroy - create a new per-connection id pool</div><div class='del'>- * @p: idpool to destroy</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void p9_idpool_destroy(struct p9_idpool *p)</div><div class='del'>-{</div><div class='del'>-	idr_destroy(&amp;p-&gt;pool);</div><div class='del'>-	kfree(p);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(p9_idpool_destroy);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_idpool_get - allocate numeric id from pool</div><div class='del'>- * @p: pool to allocate from</div><div class='del'>- *</div><div class='del'>- * Bugs: This seems to be an awful generic function, should it be in idr.c with</div><div class='del'>- *            the lock included in struct idr?</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int p9_idpool_get(struct p9_idpool *p)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	idr_preload(GFP_NOFS);</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* no need to store exactly p, we just need something non-null */</div><div class='del'>-	i = idr_alloc(&amp;p-&gt;pool, p, 0, 0, GFP_NOWAIT);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='del'>-	idr_preload_end();</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", i, p);</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(p9_idpool_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_idpool_put - release numeric id from pool</div><div class='del'>- * @id: numeric id which is being released</div><div class='del'>- * @p: pool to release id into</div><div class='del'>- *</div><div class='del'>- * Bugs: This seems to be an awful generic function, should it be in idr.c with</div><div class='del'>- *            the lock included in struct idr?</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void p9_idpool_put(int id, struct p9_idpool *p)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", id, p);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='del'>-	idr_remove(&amp;p-&gt;pool, id);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(p9_idpool_put);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * p9_idpool_check - check if the specified id is available</div><div class='del'>- * @id: id to check</div><div class='del'>- * @p: pool to check</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int p9_idpool_check(int id, struct p9_idpool *p)</div><div class='del'>-{</div><div class='del'>-	return idr_find(&amp;p-&gt;pool, id) != NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(p9_idpool_check);</div><div class='head'>diff --git a/net/Kconfig b/net/Kconfig<br/>index 228dfa382eec..62266eaf0e95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Network configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -7,7 +8,7 @@ menuconfig NET</div><div class='ctx'> 	select NLATTR</div><div class='ctx'> 	select GENERIC_NET_UTILS</div><div class='ctx'> 	select BPF</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Unless you really know what you are doing, you should say Y here.</div><div class='ctx'> 	  The reason is that some programs need kernel networking support even</div><div class='ctx'> 	  when running on a stand-alone machine that isn't connected to any</div><div class='hunk'>@@ -51,21 +52,68 @@ config NET_INGRESS</div><div class='ctx'> config NET_EGRESS</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config NET_XGRESS</div><div class='add'>+	select NET_INGRESS</div><div class='add'>+	select NET_EGRESS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config NET_REDIRECT</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SKB_DECRYPTED</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SKB_EXTENSIONS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config NET_DEVMEM</div><div class='add'>+	def_bool y</div><div class='add'>+	select GENERIC_ALLOCATOR</div><div class='add'>+	depends on DMA_SHARED_BUFFER</div><div class='add'>+	depends on PAGE_POOL</div><div class='add'>+</div><div class='add'>+config NET_SHAPER</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config NET_CRC32C</div><div class='add'>+	bool</div><div class='add'>+	select CRC32</div><div class='add'>+</div><div class='ctx'> menu "Networking options"</div><div class='ctx'> </div><div class='ctx'> source "net/packet/Kconfig"</div><div class='add'>+source "net/psp/Kconfig"</div><div class='ctx'> source "net/unix/Kconfig"</div><div class='ctx'> source "net/tls/Kconfig"</div><div class='ctx'> source "net/xfrm/Kconfig"</div><div class='ctx'> source "net/iucv/Kconfig"</div><div class='ctx'> source "net/smc/Kconfig"</div><div class='add'>+source "drivers/dibs/Kconfig"</div><div class='ctx'> source "net/xdp/Kconfig"</div><div class='ctx'> </div><div class='add'>+config NET_HANDSHAKE</div><div class='add'>+	bool</div><div class='add'>+	depends on SUNRPC || NVME_TARGET_TCP || NVME_TCP</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config NET_HANDSHAKE_KUNIT_TEST</div><div class='add'>+	tristate "KUnit tests for the handshake upcall mechanism" if !KUNIT_ALL_TESTS</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	help</div><div class='add'>+	  This builds the KUnit tests for the handshake upcall mechanism.</div><div class='add'>+</div><div class='add'>+	  KUnit tests run during boot and output the results to the debug</div><div class='add'>+	  log in TAP format (https://testanything.org/). Only useful for</div><div class='add'>+	  kernel devs running KUnit test harness and are not for inclusion</div><div class='add'>+	  into a production build.</div><div class='add'>+</div><div class='add'>+	  For more information on KUnit and unit tests in general, refer</div><div class='add'>+	  to the KUnit documentation in Documentation/dev-tools/kunit/.</div><div class='add'>+</div><div class='ctx'> config INET</div><div class='ctx'> 	bool "TCP/IP networking"</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_AES</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  These are the protocols used on the Internet and on most local</div><div class='ctx'> 	  Ethernets. It is highly recommended to say Y here (this will enlarge</div><div class='ctx'> 	  your kernel by about 400 KB), since some programs (e.g. the X window</div><div class='hunk'>@@ -81,7 +129,7 @@ config INET</div><div class='ctx'> 	  "Sysctl support" below, you can change various aspects of the</div><div class='ctx'> 	  behavior of the TCP/IP code by writing to the (virtual) files in</div><div class='ctx'> 	  /proc/sys/net/ipv4/*; the options are explained in the file</div><div class='del'>-	  &lt;file:Documentation/networking/ip-sysctl.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/ip-sysctl.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  Short answer: say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -89,6 +137,7 @@ if INET</div><div class='ctx'> source "net/ipv4/Kconfig"</div><div class='ctx'> source "net/ipv6/Kconfig"</div><div class='ctx'> source "net/netlabel/Kconfig"</div><div class='add'>+source "net/mptcp/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # if INET</div><div class='ctx'> </div><div class='hunk'>@@ -106,15 +155,16 @@ config NETWORK_PHY_TIMESTAMPING</div><div class='ctx'> 	bool "Timestamping in PHY devices"</div><div class='ctx'> 	select NET_PTP_CLASSIFY</div><div class='ctx'> 	help</div><div class='del'>-	  This allows timestamping of network packets by PHYs with</div><div class='del'>-	  hardware timestamping capabilities. This option adds some</div><div class='del'>-	  overhead in the transmit and receive paths.</div><div class='add'>+	  This allows timestamping of network packets by PHYs (or</div><div class='add'>+	  other MII bus snooping devices) with hardware timestamping</div><div class='add'>+	  capabilities. This option adds some overhead in the transmit</div><div class='add'>+	  and receive paths.</div><div class='ctx'> </div><div class='ctx'> 	  If you are unsure how to answer this question, answer N.</div><div class='ctx'> </div><div class='ctx'> menuconfig NETFILTER</div><div class='ctx'> 	bool "Network packet filtering framework (Netfilter)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Netfilter is a framework for filtering and mangling network packets</div><div class='ctx'> 	  that pass through your Linux box.</div><div class='ctx'> </div><div class='hunk'>@@ -184,8 +234,8 @@ config BRIDGE_NETFILTER</div><div class='ctx'> 	depends on NETFILTER &amp;&amp; INET</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_FAMILY_BRIDGE</div><div class='del'>-	default m</div><div class='del'>-	---help---</div><div class='add'>+	select SKB_EXTENSIONS</div><div class='add'>+	help</div><div class='ctx'> 	  Enabling this option will let arptables resp. iptables see bridged</div><div class='ctx'> 	  ARP resp. IP traffic. If you want a bridging firewall, you probably</div><div class='ctx'> 	  want this option enabled.</div><div class='hunk'>@@ -197,14 +247,10 @@ config BRIDGE_NETFILTER</div><div class='ctx'> source "net/netfilter/Kconfig"</div><div class='ctx'> source "net/ipv4/netfilter/Kconfig"</div><div class='ctx'> source "net/ipv6/netfilter/Kconfig"</div><div class='del'>-source "net/decnet/netfilter/Kconfig"</div><div class='ctx'> source "net/bridge/netfilter/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif</div><div class='add'>+endif # if NETFILTER</div><div class='ctx'> </div><div class='del'>-source "net/bpfilter/Kconfig"</div><div class='del'>-</div><div class='del'>-source "net/dccp/Kconfig"</div><div class='ctx'> source "net/sctp/Kconfig"</div><div class='ctx'> source "net/rds/Kconfig"</div><div class='ctx'> source "net/tipc/Kconfig"</div><div class='hunk'>@@ -214,9 +260,8 @@ source "net/802/Kconfig"</div><div class='ctx'> source "net/bridge/Kconfig"</div><div class='ctx'> source "net/dsa/Kconfig"</div><div class='ctx'> source "net/8021q/Kconfig"</div><div class='del'>-source "net/decnet/Kconfig"</div><div class='ctx'> source "net/llc/Kconfig"</div><div class='del'>-source "drivers/net/appletalk/Kconfig"</div><div class='add'>+source "net/appletalk/Kconfig"</div><div class='ctx'> source "net/x25/Kconfig"</div><div class='ctx'> source "net/lapb/Kconfig"</div><div class='ctx'> source "net/phonet/Kconfig"</div><div class='hunk'>@@ -238,30 +283,60 @@ source "net/l3mdev/Kconfig"</div><div class='ctx'> source "net/qrtr/Kconfig"</div><div class='ctx'> source "net/ncsi/Kconfig"</div><div class='ctx'> </div><div class='add'>+config PCPU_DEV_REFCNT</div><div class='add'>+	bool "Use percpu variables to maintain network device refcount"</div><div class='add'>+	depends on SMP</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  network device refcount are using per cpu variables if this option is set.</div><div class='add'>+	  This can be forced to N to detect underflows (with a performance drop).</div><div class='add'>+</div><div class='add'>+config MAX_SKB_FRAGS</div><div class='add'>+	int "Maximum number of fragments per skb_shared_info"</div><div class='add'>+	range 17 45</div><div class='add'>+	default 17</div><div class='add'>+	help</div><div class='add'>+	  Having more fragments per skb_shared_info can help GRO efficiency.</div><div class='add'>+	  This helps BIG TCP workloads, but might expose bugs in some</div><div class='add'>+	  legacy drivers.</div><div class='add'>+	  This also increases memory overhead of small packets,</div><div class='add'>+	  and in drivers using build_skb().</div><div class='add'>+	  If unsure, say 17.</div><div class='add'>+</div><div class='ctx'> config RPS</div><div class='del'>-	bool</div><div class='add'>+	bool "Receive packet steering"</div><div class='ctx'> 	depends on SMP &amp;&amp; SYSFS</div><div class='ctx'> 	default y</div><div class='add'>+	help</div><div class='add'>+	  Software receive side packet steering (RPS) distributes the</div><div class='add'>+	  load of received packet processing across multiple CPUs.</div><div class='ctx'> </div><div class='ctx'> config RFS_ACCEL</div><div class='del'>-	bool</div><div class='add'>+	bool "Hardware acceleration of RFS"</div><div class='ctx'> 	depends on RPS</div><div class='ctx'> 	select CPU_RMAP</div><div class='ctx'> 	default y</div><div class='add'>+	help</div><div class='add'>+	  Allowing drivers for multiqueue hardware with flow filter tables to</div><div class='add'>+	  accelerate RFS.</div><div class='add'>+</div><div class='add'>+config SOCK_RX_QUEUE_MAPPING</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config XPS</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on SMP</div><div class='add'>+	select SOCK_RX_QUEUE_MAPPING</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config HWBM</div><div class='del'>-       bool</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config CGROUP_NET_PRIO</div><div class='ctx'> 	bool "Network priority cgroup"</div><div class='ctx'> 	depends on CGROUPS</div><div class='ctx'> 	select SOCK_CGROUP_DATA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Cgroup subsystem for use in assigning processes to network priorities on</div><div class='ctx'> 	  a per-interface basis.</div><div class='ctx'> </div><div class='hunk'>@@ -269,52 +344,37 @@ config CGROUP_NET_CLASSID</div><div class='ctx'> 	bool "Network classid cgroup"</div><div class='ctx'> 	depends on CGROUPS</div><div class='ctx'> 	select SOCK_CGROUP_DATA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Cgroup subsystem for use as general purpose socket classid marker that is</div><div class='ctx'> 	  being used in cls_cgroup and for netfilter matching.</div><div class='ctx'> </div><div class='ctx'> config NET_RX_BUSY_POLL</div><div class='ctx'> 	bool</div><div class='del'>-	default y</div><div class='add'>+	default y if !PREEMPT_RT || (PREEMPT_RT &amp;&amp; !NETCONSOLE)</div><div class='ctx'> </div><div class='ctx'> config BQL</div><div class='ctx'> 	bool</div><div class='add'>+	prompt "Enable Byte Queue Limits"</div><div class='ctx'> 	depends on SYSFS</div><div class='ctx'> 	select DQL</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config BPF_JIT</div><div class='del'>-	bool "enable BPF Just In Time compiler"</div><div class='del'>-	depends on HAVE_CBPF_JIT || HAVE_EBPF_JIT</div><div class='del'>-	depends on MODULES</div><div class='del'>-	---help---</div><div class='del'>-	  Berkeley Packet Filter filtering capabilities are normally handled</div><div class='del'>-	  by an interpreter. This option allows kernel to generate a native</div><div class='del'>-	  code when filter is loaded in memory. This should speedup</div><div class='del'>-	  packet sniffing (libpcap/tcpdump).</div><div class='del'>-</div><div class='del'>-	  Note, admin should enable this feature changing:</div><div class='del'>-	  /proc/sys/net/core/bpf_jit_enable</div><div class='del'>-	  /proc/sys/net/core/bpf_jit_harden   (optional)</div><div class='del'>-	  /proc/sys/net/core/bpf_jit_kallsyms (optional)</div><div class='del'>-</div><div class='ctx'> config BPF_STREAM_PARSER</div><div class='ctx'> 	bool "enable BPF STREAM_PARSER"</div><div class='add'>+	depends on INET</div><div class='ctx'> 	depends on BPF_SYSCALL</div><div class='add'>+	depends on CGROUP_BPF</div><div class='ctx'> 	select STREAM_PARSER</div><div class='del'>-	---help---</div><div class='del'>-	 Enabling this allows a stream parser to be used with</div><div class='del'>-	 BPF_MAP_TYPE_SOCKMAP.</div><div class='del'>-</div><div class='del'>-	 BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets.</div><div class='del'>-	 It can be used to enforce socket policy, implement socket redirects,</div><div class='del'>-	 etc.</div><div class='add'>+	select NET_SOCK_MSG</div><div class='add'>+	help</div><div class='add'>+	  Enabling this allows a TCP stream parser to be used with</div><div class='add'>+	  BPF_MAP_TYPE_SOCKMAP.</div><div class='ctx'> </div><div class='ctx'> config NET_FLOW_LIMIT</div><div class='del'>-	bool</div><div class='add'>+	bool "Net flow limit"</div><div class='ctx'> 	depends on RPS</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The network stack has to drop packets when a receive processing CPU's</div><div class='ctx'> 	  backlog reaches netdev_max_backlog. If a few out of many active flows</div><div class='ctx'> 	  generate the vast majority of load, drop their traffic earlier to</div><div class='hunk'>@@ -327,32 +387,32 @@ menu "Network testing"</div><div class='ctx'> config NET_PKTGEN</div><div class='ctx'> 	tristate "Packet Generator (USE WITH CAUTION)"</div><div class='ctx'> 	depends on INET &amp;&amp; PROC_FS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This module will inject preconfigured packets, at a configurable</div><div class='ctx'> 	  rate, out of a given interface.  It is used for network interface</div><div class='ctx'> 	  stress testing and performance analysis.  If you don't understand</div><div class='ctx'> 	  what was just said, you don't need it: say N.</div><div class='ctx'> </div><div class='ctx'> 	  Documentation on how to use the packet generator can be found</div><div class='del'>-	  at &lt;file:Documentation/networking/pktgen.txt&gt;.</div><div class='add'>+	  at &lt;file:Documentation/networking/pktgen.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this code as a module, choose M here: the</div><div class='ctx'> 	  module will be called pktgen.</div><div class='ctx'> </div><div class='ctx'> config NET_DROP_MONITOR</div><div class='del'>-	tristate "Network packet drop alerting service"</div><div class='add'>+	tristate "Legacy network packet drop alerting service"</div><div class='ctx'> 	depends on INET &amp;&amp; TRACEPOINTS</div><div class='del'>-	---help---</div><div class='del'>-	This feature provides an alerting service to userspace in the</div><div class='del'>-	event that packets are discarded in the network stack.  Alerts</div><div class='del'>-	are broadcast via netlink socket to any listening user space</div><div class='del'>-	process.  If you don't need network drop alerts, or if you are ok</div><div class='del'>-	just checking the various proc files and other utilities for</div><div class='del'>-	drop statistics, say N here.</div><div class='add'>+	help</div><div class='add'>+	  This feature provides an alerting service to userspace in the</div><div class='add'>+	  event that packets are discarded in the network stack.  Alerts</div><div class='add'>+	  are broadcast via netlink socket to any listening user space</div><div class='add'>+	  process. This feature is NOT related to "perf" based drop monitoring.</div><div class='add'>+	  Say N here unless you need to support older userspace tools like</div><div class='add'>+	  "dropwatch".</div><div class='ctx'> </div><div class='del'>-endmenu</div><div class='add'>+endmenu # Network testing</div><div class='ctx'> </div><div class='del'>-endmenu</div><div class='add'>+endmenu # Networking options</div><div class='ctx'> </div><div class='ctx'> source "net/ax25/Kconfig"</div><div class='ctx'> source "net/can/Kconfig"</div><div class='hunk'>@@ -360,6 +420,7 @@ source "net/bluetooth/Kconfig"</div><div class='ctx'> source "net/rxrpc/Kconfig"</div><div class='ctx'> source "net/kcm/Kconfig"</div><div class='ctx'> source "net/strparser/Kconfig"</div><div class='add'>+source "net/mctp/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config FIB_RULES</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -376,8 +437,6 @@ source "net/mac80211/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # WIRELESS</div><div class='ctx'> </div><div class='del'>-source "net/wimax/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "net/rfkill/Kconfig"</div><div class='ctx'> source "net/9p/Kconfig"</div><div class='ctx'> source "net/caif/Kconfig"</div><div class='hunk'>@@ -388,7 +447,7 @@ source "net/ife/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config LWTUNNEL</div><div class='ctx'> 	bool "Network light weight tunnels"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This feature provides an infrastructure to support light weight</div><div class='ctx'> 	  tunnels like mpls. There is no netdevice associated with a light</div><div class='ctx'> 	  weight tunnel endpoint. Tunnel encapsulation parameters are stored</div><div class='hunk'>@@ -396,9 +455,9 @@ config LWTUNNEL</div><div class='ctx'> </div><div class='ctx'> config LWTUNNEL_BPF</div><div class='ctx'> 	bool "Execute BPF program as route nexthop action"</div><div class='del'>-	depends on LWTUNNEL</div><div class='add'>+	depends on LWTUNNEL &amp;&amp; INET</div><div class='ctx'> 	default y if LWTUNNEL=y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Allows to run BPF programs as a nexthop action following a route</div><div class='ctx'> 	  lookup for incoming and outgoing packets.</div><div class='ctx'> </div><div class='hunk'>@@ -413,24 +472,40 @@ config GRO_CELLS</div><div class='ctx'> config SOCK_VALIDATE_XMIT</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config NET_DEVLINK</div><div class='del'>-	tristate "Network physical/parent device Netlink interface"</div><div class='del'>-	help</div><div class='del'>-	  Network physical/parent device Netlink interface provides</div><div class='del'>-	  infrastructure to support access to physical chip-wide config and</div><div class='del'>-	  monitoring.</div><div class='del'>-</div><div class='del'>-config MAY_USE_DEVLINK</div><div class='del'>-	tristate</div><div class='del'>-	default m if NET_DEVLINK=m</div><div class='del'>-	default y if NET_DEVLINK=y || NET_DEVLINK=n</div><div class='add'>+config NET_IEEE8021Q_HELPERS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config NET_SELFTESTS</div><div class='add'>+	def_tristate PHYLIB</div><div class='add'>+	depends on PHYLIB &amp;&amp; INET</div><div class='add'>+</div><div class='add'>+config NET_SOCK_MSG</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='del'>-	  Drivers using the devlink infrastructure should have a dependency</div><div class='del'>-	  on MAY_USE_DEVLINK to ensure they do not cause link errors when</div><div class='del'>-	  devlink is a loadable module and the driver using it is built-in.</div><div class='add'>+	  The NET_SOCK_MSG provides a framework for plain sockets (e.g. TCP) or</div><div class='add'>+	  ULPs (upper layer modules, e.g. TLS) to process L7 application data</div><div class='add'>+	  with the help of BPF programs.</div><div class='add'>+</div><div class='add'>+config NET_DEVLINK</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='ctx'> </div><div class='ctx'> config PAGE_POOL</div><div class='del'>-       bool</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config PAGE_POOL_STATS</div><div class='add'>+	default n</div><div class='add'>+	bool "Page pool stats"</div><div class='add'>+	depends on PAGE_POOL</div><div class='add'>+	help</div><div class='add'>+	  Enable page pool statistics to track page allocation and recycling</div><div class='add'>+	  in page pools. This option incurs additional CPU cost in allocation</div><div class='add'>+	  and recycle paths and additional memory cost to store the statistics.</div><div class='add'>+	  These statistics are only available if this option is enabled and if</div><div class='add'>+	  the driver using the page pool supports exporting this data.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config FAILOVER</div><div class='ctx'> 	tristate "Generic failover module"</div><div class='hunk'>@@ -445,16 +520,27 @@ config FAILOVER</div><div class='ctx'> 	  migration of VMs with direct attached VFs by failing over to the</div><div class='ctx'> 	  paravirtual datapath when the VF is unplugged.</div><div class='ctx'> </div><div class='del'>-endif   # if NET</div><div class='del'>-</div><div class='del'>-# Used by archs to tell that they support BPF JIT compiler plus which flavour.</div><div class='del'>-# Only one of the two can be selected for a specific arch since eBPF JIT supersedes</div><div class='del'>-# the cBPF JIT.</div><div class='add'>+config ETHTOOL_NETLINK</div><div class='add'>+	bool "Netlink interface for ethtool"</div><div class='add'>+	select DIMLIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  An alternative userspace interface for ethtool based on generic</div><div class='add'>+	  netlink. It provides better extensibility and some new features,</div><div class='add'>+	  e.g. notification messages.</div><div class='add'>+</div><div class='add'>+config NETDEV_ADDR_LIST_TEST</div><div class='add'>+	tristate "Unit tests for device address list"</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT</div><div class='add'>+</div><div class='add'>+config NET_TEST</div><div class='add'>+	tristate "KUnit tests for networking" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  KUnit tests covering core networking infra, such as sk_buff.</div><div class='ctx'> </div><div class='del'>-# Classic BPF JIT (cBPF)</div><div class='del'>-config HAVE_CBPF_JIT</div><div class='del'>-	bool</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-# Extended BPF JIT (eBPF)</div><div class='del'>-config HAVE_EBPF_JIT</div><div class='del'>-	bool</div><div class='add'>+endif   # if NET</div><div class='head'>diff --git a/net/Kconfig.debug b/net/Kconfig.debug<br/>new file mode 100644<br/>index 000000000000..277fab8c4d77<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/Kconfig.debug?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/Kconfig.debug</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+config NET_DEV_REFCNT_TRACKER</div><div class='add'>+	bool "Enable net device refcount tracking"</div><div class='add'>+	depends on DEBUG_KERNEL &amp;&amp; STACKTRACE_SUPPORT &amp;&amp; NET</div><div class='add'>+	select REF_TRACKER</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Enable debugging feature to track device references.</div><div class='add'>+	  This adds memory and cpu costs.</div><div class='add'>+</div><div class='add'>+config NET_NS_REFCNT_TRACKER</div><div class='add'>+	bool "Enable networking namespace refcount tracking"</div><div class='add'>+	depends on DEBUG_KERNEL &amp;&amp; STACKTRACE_SUPPORT &amp;&amp; NET</div><div class='add'>+	select REF_TRACKER</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Enable debugging feature to track netns references.</div><div class='add'>+	  This adds memory and cpu costs.</div><div class='add'>+</div><div class='add'>+config DEBUG_NET</div><div class='add'>+	bool "Add generic networking debug"</div><div class='add'>+	depends on DEBUG_KERNEL &amp;&amp; NET</div><div class='add'>+	help</div><div class='add'>+	  Enable extra sanity checks in networking.</div><div class='add'>+	  This is mostly used by fuzzers, but is safe to select.</div><div class='add'>+</div><div class='add'>+config DEBUG_NET_SMALL_RTNL</div><div class='add'>+	bool "Add extra per-netns mutex inside RTNL"</div><div class='add'>+	depends on DEBUG_KERNEL &amp;&amp; NET &amp;&amp; LOCK_DEBUGGING_SUPPORT</div><div class='add'>+	select PROVE_LOCKING</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  rtnl_lock() is being replaced with rtnl_net_lock() that</div><div class='add'>+	  acquires the global RTNL and a small per-netns RTNL mutex.</div><div class='add'>+</div><div class='add'>+	  During the conversion, rtnl_net_lock() just adds an extra</div><div class='add'>+	  mutex in every RTNL scope and slows down the operations.</div><div class='add'>+</div><div class='add'>+	  Once the conversion completes, rtnl_lock() will be removed</div><div class='add'>+	  and rtnetlink will gain per-netns scalability.</div><div class='head'>diff --git a/net/Makefile b/net/Makefile<br/>index bdaf53925acd..90e3d72bf58b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/Makefile</a></div><div class='hunk'>@@ -6,25 +6,25 @@</div><div class='ctx'> # Rewritten to use lists instead of if-statements.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_NET)		:= socket.o core/</div><div class='add'>+obj-y				:= devres.o socket.o core/</div><div class='ctx'> </div><div class='del'>-tmp-$(CONFIG_COMPAT) 		:= compat.o</div><div class='del'>-obj-$(CONFIG_NET)		+= $(tmp-y)</div><div class='add'>+obj-$(CONFIG_COMPAT)		+= compat.o</div><div class='ctx'> </div><div class='ctx'> # LLC has to be linked before the files in net/802/</div><div class='ctx'> obj-$(CONFIG_LLC)		+= llc/</div><div class='del'>-obj-$(CONFIG_NET)		+= ethernet/ 802/ sched/ netlink/ bpf/</div><div class='add'>+obj-y				+= ethernet/ 802/ sched/ netlink/ bpf/ ethtool/</div><div class='ctx'> obj-$(CONFIG_NETFILTER)		+= netfilter/</div><div class='ctx'> obj-$(CONFIG_INET)		+= ipv4/</div><div class='ctx'> obj-$(CONFIG_TLS)		+= tls/</div><div class='ctx'> obj-$(CONFIG_XFRM)		+= xfrm/</div><div class='ctx'> obj-$(CONFIG_UNIX)		+= unix/</div><div class='del'>-obj-$(CONFIG_NET)		+= ipv6/</div><div class='del'>-obj-$(CONFIG_BPFILTER)		+= bpfilter/</div><div class='add'>+obj-$(CONFIG_INET_PSP)		+= psp/</div><div class='add'>+obj-y				+= ipv6/</div><div class='ctx'> obj-$(CONFIG_PACKET)		+= packet/</div><div class='ctx'> obj-$(CONFIG_NET_KEY)		+= key/</div><div class='ctx'> obj-$(CONFIG_BRIDGE)		+= bridge/</div><div class='del'>-obj-$(CONFIG_NET_DSA)		+= dsa/</div><div class='add'>+obj-$(CONFIG_NET_DEVLINK)	+= devlink/</div><div class='add'>+obj-y				+= dsa/</div><div class='ctx'> obj-$(CONFIG_ATALK)		+= appletalk/</div><div class='ctx'> obj-$(CONFIG_X25)		+= x25/</div><div class='ctx'> obj-$(CONFIG_LAPB)		+= lapb/</div><div class='hunk'>@@ -39,12 +39,10 @@ obj-$(CONFIG_AF_KCM)		+= kcm/</div><div class='ctx'> obj-$(CONFIG_STREAM_PARSER)	+= strparser/</div><div class='ctx'> obj-$(CONFIG_ATM)		+= atm/</div><div class='ctx'> obj-$(CONFIG_L2TP)		+= l2tp/</div><div class='del'>-obj-$(CONFIG_DECNET)		+= decnet/</div><div class='ctx'> obj-$(CONFIG_PHONET)		+= phonet/</div><div class='ctx'> ifneq ($(CONFIG_VLAN_8021Q),)</div><div class='ctx'> obj-y				+= 8021q/</div><div class='ctx'> endif</div><div class='del'>-obj-$(CONFIG_IP_DCCP)		+= dccp/</div><div class='ctx'> obj-$(CONFIG_IP_SCTP)		+= sctp/</div><div class='ctx'> obj-$(CONFIG_RDS)		+= rds/</div><div class='ctx'> obj-$(CONFIG_WIRELESS)		+= wireless/</div><div class='hunk'>@@ -56,17 +54,12 @@ obj-$(CONFIG_SMC)		+= smc/</div><div class='ctx'> obj-$(CONFIG_RFKILL)		+= rfkill/</div><div class='ctx'> obj-$(CONFIG_NET_9P)		+= 9p/</div><div class='ctx'> obj-$(CONFIG_CAIF)		+= caif/</div><div class='del'>-ifneq ($(CONFIG_DCB),)</div><div class='del'>-obj-y				+= dcb/</div><div class='del'>-endif</div><div class='add'>+obj-$(CONFIG_DCB)		+= dcb/</div><div class='ctx'> obj-$(CONFIG_6LOWPAN)		+= 6lowpan/</div><div class='ctx'> obj-$(CONFIG_IEEE802154)	+= ieee802154/</div><div class='ctx'> obj-$(CONFIG_MAC802154)		+= mac802154/</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_NET),y)</div><div class='ctx'> obj-$(CONFIG_SYSCTL)		+= sysctl_net.o</div><div class='del'>-endif</div><div class='del'>-obj-$(CONFIG_WIMAX)		+= wimax/</div><div class='ctx'> obj-$(CONFIG_DNS_RESOLVER)	+= dns_resolver/</div><div class='ctx'> obj-$(CONFIG_CEPH_LIB)		+= ceph/</div><div class='ctx'> obj-$(CONFIG_BATMAN_ADV)	+= batman-adv/</div><div class='hunk'>@@ -78,12 +71,12 @@ obj-$(CONFIG_VSOCKETS)	+= vmw_vsock/</div><div class='ctx'> obj-$(CONFIG_MPLS)		+= mpls/</div><div class='ctx'> obj-$(CONFIG_NET_NSH)		+= nsh/</div><div class='ctx'> obj-$(CONFIG_HSR)		+= hsr/</div><div class='del'>-ifneq ($(CONFIG_NET_SWITCHDEV),)</div><div class='del'>-obj-y				+= switchdev/</div><div class='del'>-endif</div><div class='del'>-ifneq ($(CONFIG_NET_L3_MASTER_DEV),)</div><div class='del'>-obj-y				+= l3mdev/</div><div class='del'>-endif</div><div class='add'>+obj-$(CONFIG_NET_SWITCHDEV)	+= switchdev/</div><div class='add'>+obj-$(CONFIG_NET_L3_MASTER_DEV)	+= l3mdev/</div><div class='ctx'> obj-$(CONFIG_QRTR)		+= qrtr/</div><div class='ctx'> obj-$(CONFIG_NET_NCSI)		+= ncsi/</div><div class='ctx'> obj-$(CONFIG_XDP_SOCKETS)	+= xdp/</div><div class='add'>+obj-$(CONFIG_MPTCP)		+= mptcp/</div><div class='add'>+obj-$(CONFIG_MCTP)		+= mctp/</div><div class='add'>+obj-$(CONFIG_NET_HANDSHAKE)	+= handshake/</div><div class='add'>+obj-$(CONFIG_NET_SHAPER)	+= shaper/</div><div class='head'>diff --git a/net/appletalk/Kconfig b/net/appletalk/Kconfig<br/>new file mode 100644<br/>index 000000000000..041141abf925<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# Appletalk configuration</div><div class='add'>+#</div><div class='add'>+config ATALK</div><div class='add'>+	tristate "Appletalk protocol support"</div><div class='add'>+	select LLC</div><div class='add'>+	help</div><div class='add'>+	  AppleTalk is the protocol that Apple computers can use to communicate</div><div class='add'>+	  on a network.  If your Linux box is connected to such a network and you</div><div class='add'>+	  wish to connect to it, say Y.  You will need to use the netatalk package</div><div class='add'>+	  so that your Linux box can act as a print and file server for Macs as</div><div class='add'>+	  well as access AppleTalk printers.  Check out</div><div class='add'>+	  &lt;http://www.zettabyte.net/netatalk/&gt; on the WWW for details.</div><div class='add'>+	  EtherTalk is the name used for AppleTalk over Ethernet and the</div><div class='add'>+	  cheaper and slower LocalTalk is AppleTalk over a proprietary Apple</div><div class='add'>+	  network using serial links.  EtherTalk and LocalTalk are fully</div><div class='add'>+	  supported by Linux.</div><div class='add'>+</div><div class='add'>+	  General information about how to connect Linux, Windows machines and</div><div class='add'>+	  Macs is on the WWW at &lt;http://www.eats.com/linux_mac_win.html&gt;.  The</div><div class='add'>+	  NET3-4-HOWTO, available from</div><div class='add'>+	  &lt;http://www.tldp.org/docs.html#howto&gt;, contains valuable</div><div class='add'>+	  information as well.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will be</div><div class='add'>+	  called appletalk. You almost certainly want to compile it as a</div><div class='add'>+	  module so you can restart your AppleTalk stack without rebooting</div><div class='add'>+	  your machine. I hear that the GNU boycott of Apple is over, so</div><div class='add'>+	  even politically correct people are allowed to say Y here.</div><div class='head'>diff --git a/net/appletalk/Makefile b/net/appletalk/Makefile<br/>index 5cda56edef57..152312a15180 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux AppleTalk layer.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATALK) += appletalk.o</div><div class='ctx'> </div><div class='del'>-appletalk-y			:= aarp.o ddp.o dev.o</div><div class='add'>+appletalk-y			:= aarp.o ddp.o</div><div class='ctx'> appletalk-$(CONFIG_PROC_FS)	+= atalk_proc.o</div><div class='ctx'> appletalk-$(CONFIG_SYSCTL)	+= sysctl_net_atalk.o</div><div class='head'>diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c<br/>index 49a16cee2aae..4744e3fd4544 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/aarp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/aarp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/aarp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/aarp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	AARP:		An implementation of the AppleTalk AARP protocol for</div><div class='ctx'>  *			Ethernet 'ELAP'.</div><div class='hunk'>@@ -13,12 +14,6 @@</div><div class='ctx'>  *		Use neighbour discovery code.</div><div class='ctx'>  *		Token Ring Support.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  *	References:</div><div class='ctx'>  *		Inside AppleTalk (2nd Ed).</div><div class='ctx'>  *	Fixes:</div><div class='hunk'>@@ -26,7 +21,6 @@</div><div class='ctx'>  *		Rob Newberry	-	Added proxy AARP and AARP proc fs,</div><div class='ctx'>  *					moved probing from DDP module.</div><div class='ctx'>  *		Arnaldo C. Melo -	don't mangle rx packets</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='hunk'>@@ -41,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='ctx'> </div><div class='ctx'> int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME;</div><div class='ctx'> int sysctl_aarp_tick_time = AARP_TICK_TIME;</div><div class='hunk'>@@ -50,17 +45,19 @@ int sysctl_aarp_resolve_time = AARP_RESOLVE_TIME;</div><div class='ctx'> /* Lists of aarp entries */</div><div class='ctx'> /**</div><div class='ctx'>  *	struct aarp_entry - AARP entry</div><div class='del'>- *	@last_sent - Last time we xmitted the aarp request</div><div class='del'>- *	@packet_queue - Queue of frames wait for resolution</div><div class='del'>- *	@status - Used for proxy AARP</div><div class='del'>- *	expires_at - Entry expiry time</div><div class='del'>- *	target_addr - DDP Address</div><div class='del'>- *	dev - Device to use</div><div class='del'>- *	hwaddr - Physical i/f address of target/router</div><div class='del'>- *	xmit_count - When this hits 10 we give up</div><div class='del'>- *	next - Next entry in chain</div><div class='add'>+ *	@refcnt: Reference count</div><div class='add'>+ *	@last_sent: Last time we xmitted the aarp request</div><div class='add'>+ *	@packet_queue: Queue of frames wait for resolution</div><div class='add'>+ *	@status: Used for proxy AARP</div><div class='add'>+ *	@expires_at: Entry expiry time</div><div class='add'>+ *	@target_addr: DDP Address</div><div class='add'>+ *	@dev:  Device to use</div><div class='add'>+ *	@hwaddr:  Physical i/f address of target/router</div><div class='add'>+ *	@xmit_count:  When this hits 10 we give up</div><div class='add'>+ *	@next: Next entry in chain</div><div class='ctx'>  */</div><div class='ctx'> struct aarp_entry {</div><div class='add'>+	refcount_t			refcnt;</div><div class='ctx'> 	/* These first two are only used for unresolved entries */</div><div class='ctx'> 	unsigned long		last_sent;</div><div class='ctx'> 	struct sk_buff_head	packet_queue;</div><div class='hunk'>@@ -85,6 +82,17 @@ static DEFINE_RWLOCK(aarp_lock);</div><div class='ctx'> /* Used to walk the list and purge/kick entries.  */</div><div class='ctx'> static struct timer_list aarp_timer;</div><div class='ctx'> </div><div class='add'>+static inline void aarp_entry_get(struct aarp_entry *a)</div><div class='add'>+{</div><div class='add'>+	refcount_inc(&amp;a-&gt;refcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aarp_entry_put(struct aarp_entry *a)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;a-&gt;refcnt))</div><div class='add'>+		kfree(a);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Delete an aarp queue</div><div class='ctx'>  *</div><div class='hunk'>@@ -93,7 +101,7 @@ static struct timer_list aarp_timer;</div><div class='ctx'> static void __aarp_expire(struct aarp_entry *a)</div><div class='ctx'> {</div><div class='ctx'> 	skb_queue_purge(&amp;a-&gt;packet_queue);</div><div class='del'>-	kfree(a);</div><div class='add'>+	aarp_entry_put(a);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -386,9 +394,11 @@ static void aarp_purge(void)</div><div class='ctx'> static struct aarp_entry *aarp_alloc(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct aarp_entry *a = kmalloc(sizeof(*a), GFP_ATOMIC);</div><div class='add'>+	if (!a)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (a)</div><div class='del'>-		skb_queue_head_init(&amp;a-&gt;packet_queue);</div><div class='add'>+	refcount_set(&amp;a-&gt;refcnt, 1);</div><div class='add'>+	skb_queue_head_init(&amp;a-&gt;packet_queue);</div><div class='ctx'> 	return a;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -438,49 +448,18 @@ static struct atalk_addr *__aarp_proxy_find(struct net_device *dev,</div><div class='ctx'> 	return a ? sa : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Probe a Phase 1 device or a device that requires its Net:Node to</div><div class='del'>- * be set via an ioctl.</div><div class='del'>- */</div><div class='del'>-static void aarp_send_probe_phase1(struct atalk_iface *iface)</div><div class='del'>-{</div><div class='del'>-	struct ifreq atreq;</div><div class='del'>-	struct sockaddr_at *sa = (struct sockaddr_at *)&amp;atreq.ifr_addr;</div><div class='del'>-	const struct net_device_ops *ops = iface-&gt;dev-&gt;netdev_ops;</div><div class='del'>-</div><div class='del'>-	sa-&gt;sat_addr.s_node = iface-&gt;address.s_node;</div><div class='del'>-	sa-&gt;sat_addr.s_net = ntohs(iface-&gt;address.s_net);</div><div class='del'>-</div><div class='del'>-	/* We pass the Net:Node to the drivers/cards by a Device ioctl. */</div><div class='del'>-	if (!(ops-&gt;ndo_do_ioctl(iface-&gt;dev, &amp;atreq, SIOCSIFADDR))) {</div><div class='del'>-		ops-&gt;ndo_do_ioctl(iface-&gt;dev, &amp;atreq, SIOCGIFADDR);</div><div class='del'>-		if (iface-&gt;address.s_net != htons(sa-&gt;sat_addr.s_net) ||</div><div class='del'>-		    iface-&gt;address.s_node != sa-&gt;sat_addr.s_node)</div><div class='del'>-			iface-&gt;status |= ATIF_PROBE_FAIL;</div><div class='del'>-</div><div class='del'>-		iface-&gt;address.s_net  = htons(sa-&gt;sat_addr.s_net);</div><div class='del'>-		iface-&gt;address.s_node = sa-&gt;sat_addr.s_node;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> void aarp_probe_network(struct atalk_iface *atif)</div><div class='ctx'> {</div><div class='del'>-	if (atif-&gt;dev-&gt;type == ARPHRD_LOCALTLK ||</div><div class='del'>-	    atif-&gt;dev-&gt;type == ARPHRD_PPP)</div><div class='del'>-		aarp_send_probe_phase1(atif);</div><div class='del'>-	else {</div><div class='del'>-		unsigned int count;</div><div class='add'>+	unsigned int count;</div><div class='ctx'> </div><div class='del'>-		for (count = 0; count &lt; AARP_RETRANSMIT_LIMIT; count++) {</div><div class='del'>-			aarp_send_probe(atif-&gt;dev, &amp;atif-&gt;address);</div><div class='add'>+	for (count = 0; count &lt; AARP_RETRANSMIT_LIMIT; count++) {</div><div class='add'>+		aarp_send_probe(atif-&gt;dev, &amp;atif-&gt;address);</div><div class='ctx'> </div><div class='del'>-			/* Defer 1/10th */</div><div class='del'>-			msleep(100);</div><div class='add'>+		/* Defer 1/10th */</div><div class='add'>+		msleep(100);</div><div class='ctx'> </div><div class='del'>-			if (atif-&gt;status &amp; ATIF_PROBE_FAIL)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		if (atif-&gt;status &amp; ATIF_PROBE_FAIL)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -514,6 +493,7 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)</div><div class='ctx'> 	entry-&gt;dev = atif-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;aarp_lock);</div><div class='add'>+	aarp_entry_get(entry);</div><div class='ctx'> </div><div class='ctx'> 	hash = sa-&gt;s_node % (AARP_HASH_SIZE - 1);</div><div class='ctx'> 	entry-&gt;next = proxies[hash];</div><div class='hunk'>@@ -539,6 +519,7 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)</div><div class='ctx'> 		retval = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	aarp_entry_put(entry);</div><div class='ctx'> 	write_unlock_bh(&amp;aarp_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -670,7 +651,7 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> sendit:</div><div class='ctx'> 	if (skb-&gt;sk)</div><div class='del'>-		skb-&gt;priority = skb-&gt;sk-&gt;sk_priority;</div><div class='add'>+		skb-&gt;priority = READ_ONCE(skb-&gt;sk-&gt;sk_priority);</div><div class='ctx'> 	if (dev_queue_xmit(skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> sent:</div><div class='hunk'>@@ -774,7 +755,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	if (a &amp;&amp; a-&gt;status &amp; ATIF_PROBE) {</div><div class='ctx'> 		a-&gt;status |= ATIF_PROBE_FAIL;</div><div class='ctx'> 		/*</div><div class='del'>-		 * we do not respond to probe or request packets for</div><div class='add'>+		 * we do not respond to probe or request packets of</div><div class='ctx'> 		 * this address while we are probing this address</div><div class='ctx'> 		 */</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -879,15 +860,24 @@ static struct notifier_block aarp_notifier = {</div><div class='ctx'> </div><div class='ctx'> static unsigned char aarp_snap_id[] = { 0x00, 0x00, 0x00, 0x80, 0xF3 };</div><div class='ctx'> </div><div class='del'>-void __init aarp_proto_init(void)</div><div class='add'>+int __init aarp_proto_init(void)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	aarp_dl = register_snap_client(aarp_snap_id, aarp_rcv);</div><div class='del'>-	if (!aarp_dl)</div><div class='add'>+	if (!aarp_dl) {</div><div class='ctx'> 		printk(KERN_CRIT "Unable to register AARP with SNAP.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	timer_setup(&amp;aarp_timer, aarp_expire_timeout, 0);</div><div class='ctx'> 	aarp_timer.expires  = jiffies + sysctl_aarp_expiry_time;</div><div class='ctx'> 	add_timer(&amp;aarp_timer);</div><div class='del'>-	register_netdevice_notifier(&amp;aarp_notifier);</div><div class='add'>+	rc = register_netdevice_notifier(&amp;aarp_notifier);</div><div class='add'>+	if (rc) {</div><div class='add'>+		timer_delete_sync(&amp;aarp_timer);</div><div class='add'>+		unregister_snap_client(aarp_dl);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove the AARP entries associated with a device. */</div><div class='hunk'>@@ -1039,7 +1029,7 @@ const struct seq_operations aarp_seq_ops = {</div><div class='ctx'> /* General module cleanup. Called from cleanup_module() in ddp.c. */</div><div class='ctx'> void aarp_cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;aarp_timer);</div><div class='add'>+	timer_delete_sync(&amp;aarp_timer);</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;aarp_notifier);</div><div class='ctx'> 	unregister_snap_client(aarp_dl);</div><div class='ctx'> 	aarp_purge();</div><div class='head'>diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c<br/>index 8006295f8bd7..01787fb6a7bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/atalk_proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/atalk_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/atalk_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/atalk_proc.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * 	atalk_proc.c - proc support for Appletalk</div><div class='ctx'>  *</div><div class='ctx'>  * 	Copyright(c) Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License as published by the</div><div class='del'>- *	Free Software Foundation, version 2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -184,7 +181,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   sk_wmem_alloc_get(s),</div><div class='ctx'> 		   sk_rmem_alloc_get(s),</div><div class='ctx'> 		   s-&gt;sk_state,</div><div class='del'>-		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(s)));</div><div class='add'>+		   from_kuid_munged(seq_user_ns(seq), sk_uid(s)));</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -210,56 +207,36 @@ static const struct seq_operations atalk_seq_socket_ops = {</div><div class='ctx'> 	.show   = atalk_seq_socket_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct proc_dir_entry *atalk_proc_dir;</div><div class='del'>-</div><div class='ctx'> int __init atalk_proc_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct proc_dir_entry *p;</div><div class='del'>-	int rc = -ENOMEM;</div><div class='add'>+	if (!proc_mkdir("atalk", init_net.proc_net))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);</div><div class='del'>-	if (!atalk_proc_dir)</div><div class='add'>+	if (!proc_create_seq("atalk/interface", 0444, init_net.proc_net,</div><div class='add'>+			    &amp;atalk_seq_interface_ops))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	p = proc_create_seq("interface", 0444, atalk_proc_dir,</div><div class='del'>-			&amp;atalk_seq_interface_ops);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto out_interface;</div><div class='add'>+	if (!proc_create_seq("atalk/route", 0444, init_net.proc_net,</div><div class='add'>+			    &amp;atalk_seq_route_ops))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	p = proc_create_seq("route", 0444, atalk_proc_dir,</div><div class='del'>-			&amp;atalk_seq_route_ops);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto out_route;</div><div class='add'>+	if (!proc_create_seq("atalk/socket", 0444, init_net.proc_net,</div><div class='add'>+			    &amp;atalk_seq_socket_ops))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	p = proc_create_seq("socket", 0444, atalk_proc_dir,</div><div class='del'>-			&amp;atalk_seq_socket_ops);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto out_socket;</div><div class='add'>+	if (!proc_create_seq_private("atalk/arp", 0444, init_net.proc_net,</div><div class='add'>+				     &amp;aarp_seq_ops,</div><div class='add'>+				     sizeof(struct aarp_iter_state), NULL))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	p = proc_create_seq_private("arp", 0444, atalk_proc_dir, &amp;aarp_seq_ops,</div><div class='del'>-			sizeof(struct aarp_iter_state), NULL);</div><div class='del'>-	if (!p)</div><div class='del'>-		goto out_arp;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	rc = 0;</div><div class='ctx'> out:</div><div class='del'>-	return rc;</div><div class='del'>-out_arp:</div><div class='del'>-	remove_proc_entry("socket", atalk_proc_dir);</div><div class='del'>-out_socket:</div><div class='del'>-	remove_proc_entry("route", atalk_proc_dir);</div><div class='del'>-out_route:</div><div class='del'>-	remove_proc_entry("interface", atalk_proc_dir);</div><div class='del'>-out_interface:</div><div class='del'>-	remove_proc_entry("atalk", init_net.proc_net);</div><div class='del'>-	goto out;</div><div class='add'>+	remove_proc_subtree("atalk", init_net.proc_net);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit atalk_proc_exit(void)</div><div class='add'>+void atalk_proc_exit(void)</div><div class='ctx'> {</div><div class='del'>-	remove_proc_entry("interface", atalk_proc_dir);</div><div class='del'>-	remove_proc_entry("route", atalk_proc_dir);</div><div class='del'>-	remove_proc_entry("socket", atalk_proc_dir);</div><div class='del'>-	remove_proc_entry("arp", atalk_proc_dir);</div><div class='del'>-	remove_proc_entry("atalk", init_net.proc_net);</div><div class='add'>+	remove_proc_subtree("atalk", init_net.proc_net);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c<br/>index 9b6bc5abe946..2a01fff46c9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/ddp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/ddp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/ddp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/ddp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	DDP:	An implementation of the AppleTalk DDP protocol for</div><div class='ctx'>  *		Ethernet 'ELAP'.</div><div class='hunk'>@@ -43,12 +44,6 @@</div><div class='ctx'>  *						shared skb support 8)</div><div class='ctx'>  *		Arnaldo C. de Melo	:	Move proc stuff to atalk_proc.c,</div><div class='ctx'>  *						use seq_file</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -62,6 +57,7 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='add'>+#include &lt;net/compat.h&gt;</div><div class='ctx'> #include &lt;linux/atalk.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -92,6 +88,7 @@ static inline void atalk_remove_socket(struct sock *sk)</div><div class='ctx'> static struct sock *atalk_search_socket(struct sockaddr_at *to,</div><div class='ctx'> 					struct atalk_iface *atif)</div><div class='ctx'> {</div><div class='add'>+	struct sock *def_socket = NULL;</div><div class='ctx'> 	struct sock *s;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_bh(&amp;atalk_sockets_lock);</div><div class='hunk'>@@ -102,8 +99,20 @@ static struct sock *atalk_search_socket(struct sockaddr_at *to,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (to-&gt;sat_addr.s_net == ATADDR_ANYNET &amp;&amp;</div><div class='del'>-		    to-&gt;sat_addr.s_node == ATADDR_BCAST)</div><div class='del'>-			goto found;</div><div class='add'>+		    to-&gt;sat_addr.s_node == ATADDR_BCAST) {</div><div class='add'>+			if (atif-&gt;address.s_node == at-&gt;src_node &amp;&amp;</div><div class='add'>+			    atif-&gt;address.s_net == at-&gt;src_net) {</div><div class='add'>+				/* This socket's address matches the address of the interface</div><div class='add'>+				 * that received the packet -- use it</div><div class='add'>+				 */</div><div class='add'>+				goto found;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Continue searching for a socket matching the interface address,</div><div class='add'>+			 * but use this socket by default if no other one is found</div><div class='add'>+			 */</div><div class='add'>+			def_socket = s;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (to-&gt;sat_addr.s_net == at-&gt;src_net &amp;&amp;</div><div class='ctx'> 		    (to-&gt;sat_addr.s_node == at-&gt;src_node ||</div><div class='hunk'>@@ -120,7 +129,7 @@ static struct sock *atalk_search_socket(struct sockaddr_at *to,</div><div class='ctx'> 			goto found;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	s = NULL;</div><div class='add'>+	s = def_socket;</div><div class='ctx'> found:</div><div class='ctx'> 	read_unlock_bh(&amp;atalk_sockets_lock);</div><div class='ctx'> 	return s;</div><div class='hunk'>@@ -160,7 +169,7 @@ found:</div><div class='ctx'> </div><div class='ctx'> static void atalk_destroy_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = from_timer(sk, t, sk_timer);</div><div class='add'>+	struct sock *sk = timer_container_of(sk, t, sk_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (sk_has_allocations(sk)) {</div><div class='ctx'> 		sk-&gt;sk_timer.expires = jiffies + SOCK_DESTROY_TIME;</div><div class='hunk'>@@ -567,6 +576,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the routing entry */</div><div class='ctx'> 	rt-&gt;target  = ta-&gt;sat_addr;</div><div class='add'>+	dev_put(rt-&gt;dev); /* Release old device */</div><div class='ctx'> 	dev_hold(devhint);</div><div class='ctx'> 	rt-&gt;dev     = devhint;</div><div class='ctx'> 	rt-&gt;flags   = r-&gt;rt_flags;</div><div class='hunk'>@@ -670,7 +680,7 @@ static int atif_ioctl(int cmd, void __user *arg)</div><div class='ctx'> 	struct rtentry rtdef;</div><div class='ctx'> 	int add_route;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;atreq, arg, sizeof(atreq)))</div><div class='add'>+	if (get_user_ifreq(&amp;atreq, NULL, arg))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	dev = __dev_get_by_name(&amp;init_net, atreq.ifr_name);</div><div class='hunk'>@@ -711,7 +721,7 @@ static int atif_ioctl(int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Phase 1 is fine on LocalTalk but we don't do</div><div class='del'>-		 * EtherTalk phase 1. Anyone wanting to add it go ahead.</div><div class='add'>+		 * EtherTalk phase 1. Anyone wanting to add it, go ahead.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;type == ARPHRD_ETHER &amp;&amp; nr-&gt;nr_phase != 2)</div><div class='ctx'> 			return -EPROTONOSUPPORT;</div><div class='hunk'>@@ -832,7 +842,7 @@ static int atif_ioctl(int cmd, void __user *arg)</div><div class='ctx'> 		nr = (struct atalk_netrange *)&amp;(atif-&gt;nets);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Phase 1 is fine on Localtalk but we don't do</div><div class='del'>-		 * Ethertalk phase 1. Anyone wanting to add it go ahead.</div><div class='add'>+		 * Ethertalk phase 1. Anyone wanting to add it, go ahead.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;type == ARPHRD_ETHER &amp;&amp; nr-&gt;nr_phase != 2)</div><div class='ctx'> 			return -EPROTONOSUPPORT;</div><div class='hunk'>@@ -869,7 +879,25 @@ static int atif_ioctl(int cmd, void __user *arg)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(arg, &amp;atreq, sizeof(atreq)) ? -EFAULT : 0;</div><div class='add'>+	return put_user_ifreq(&amp;atreq, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atrtr_ioctl_addrt(struct rtentry *rt)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;rt_dev) {</div><div class='add'>+		char name[IFNAMSIZ];</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(name, rt-&gt;rt_dev, IFNAMSIZ-1))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		name[IFNAMSIZ-1] = '\0';</div><div class='add'>+</div><div class='add'>+		dev = __dev_get_by_name(&amp;init_net, name);</div><div class='add'>+		if (!dev)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	return atrtr_create(rt, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Routing ioctl() calls */</div><div class='hunk'>@@ -887,19 +915,8 @@ static int atrtr_ioctl(unsigned int cmd, void __user *arg)</div><div class='ctx'> 		return atrtr_delete(&amp;((struct sockaddr_at *)</div><div class='ctx'> 				      &amp;rt.rt_dst)-&gt;sat_addr);</div><div class='ctx'> </div><div class='del'>-	case SIOCADDRT: {</div><div class='del'>-		struct net_device *dev = NULL;</div><div class='del'>-		if (rt.rt_dev) {</div><div class='del'>-			char name[IFNAMSIZ];</div><div class='del'>-			if (copy_from_user(name, rt.rt_dev, IFNAMSIZ-1))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			name[IFNAMSIZ-1] = '\0';</div><div class='del'>-			dev = __dev_get_by_name(&amp;init_net, name);</div><div class='del'>-			if (!dev)</div><div class='del'>-				return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		return atrtr_create(&amp;rt, dev);</div><div class='del'>-	}</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+		return atrtr_ioctl_addrt(&amp;rt);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -958,8 +975,8 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='ctx'> 			vaddr = kmap_atomic(skb_frag_page(frag));</div><div class='del'>-			sum = atalk_sum_partial(vaddr + frag-&gt;page_offset +</div><div class='del'>-						  offset - start, copy, sum);</div><div class='add'>+			sum = atalk_sum_partial(vaddr + skb_frag_off(frag) +</div><div class='add'>+						offset - start, copy, sum);</div><div class='ctx'> 			kunmap_atomic(vaddr);</div><div class='ctx'> </div><div class='ctx'> 			if (!(len -= copy))</div><div class='hunk'>@@ -1028,6 +1045,11 @@ static int atalk_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sock-&gt;type != SOCK_RAW &amp;&amp; sock-&gt;type != SOCK_DGRAM)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='add'>+	rc = -EPERM;</div><div class='add'>+	if (sock-&gt;type == SOCK_RAW &amp;&amp; !kern &amp;&amp; !capable(CAP_NET_RAW))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	rc = -ENOMEM;</div><div class='ctx'> 	sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &amp;ddp_proto, kern);</div><div class='ctx'> 	if (!sk)</div><div class='hunk'>@@ -1127,7 +1149,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the address 'our end' of the connection */</div><div class='del'>-static int atalk_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int atalk_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_at *addr = (struct sockaddr_at *)uaddr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -1182,7 +1204,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the address we talk to */</div><div class='del'>-static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+static int atalk_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			 int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -1276,39 +1298,6 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPDDP)</div><div class='del'>-static __inline__ int is_ip_over_ddp(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return skb-&gt;data[12] == 22;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int handle_ip_over_ddp(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = __dev_get_by_name(&amp;init_net, "ipddp0");</div><div class='del'>-	struct net_device_stats *stats;</div><div class='del'>-</div><div class='del'>-	/* This needs to be able to handle ipddp"N" devices */</div><div class='del'>-	if (!dev) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NET_RX_DROP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='del'>-	skb_pull(skb, 13);</div><div class='del'>-	skb-&gt;dev   = dev;</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	stats = netdev_priv(dev);</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += skb-&gt;len + 13;</div><div class='del'>-	return netif_rx(skb);  /* Send the SKB up to a higher place. */</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-/* make it easy for gcc to optimize this test out, i.e. kill the code */</div><div class='del'>-#define is_ip_over_ddp(skb) 0</div><div class='del'>-#define handle_ip_over_ddp(skb) 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int atalk_route_packet(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			      struct ddpehdr *ddp, __u16 len_hops, int origlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -1399,9 +1388,10 @@ drop:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	atalk_rcv - Receive a packet (in skb) from device dev</div><div class='del'>- *	@skb - packet received</div><div class='del'>- *	@dev - network device where the packet comes from</div><div class='del'>- *	@pt - packet type</div><div class='add'>+ *	@skb: packet received</div><div class='add'>+ *	@dev: network device where the packet comes from</div><div class='add'>+ *	@pt: packet type</div><div class='add'>+ *	@orig_dev: the original receive net device</div><div class='ctx'>  *</div><div class='ctx'>  *	Receive a packet (in skb) from device dev. This has come from the SNAP</div><div class='ctx'>  *	decoder, and on entry skb-&gt;transport_header is the DDP header, skb-&gt;len</div><div class='hunk'>@@ -1471,9 +1461,6 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		return atalk_route_packet(skb, dev, ddp, len_hops, origlen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if IP over DDP is not selected this code will be optimized out */</div><div class='del'>-	if (is_ip_over_ddp(skb))</div><div class='del'>-		return handle_ip_over_ddp(skb);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Which socket - atalk_search_socket() looks for a *full match*</div><div class='ctx'> 	 * of the &lt;net, node, port&gt; tuple.</div><div class='hunk'>@@ -1568,8 +1555,8 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ddpehdr *ddp;</div><div class='del'>-	int size;</div><div class='del'>-	struct atalk_route *rt;</div><div class='add'>+	int size, hard_header_len;</div><div class='add'>+	struct atalk_route *rt, *rt_lo = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~(MSG_DONTWAIT|MSG_CMSG_COMPAT))</div><div class='hunk'>@@ -1608,7 +1595,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Build a packet */</div><div class='del'>-	SOCK_DEBUG(sk, "SK %p: Got address.\n", sk);</div><div class='add'>+	net_dbg_ratelimited("SK %p: Got address.\n", sk);</div><div class='ctx'> </div><div class='ctx'> 	/* For headers */</div><div class='ctx'> 	size = sizeof(struct ddpehdr) + len + ddp_dl-&gt;header_length;</div><div class='hunk'>@@ -1629,10 +1616,25 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	dev = rt-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	SOCK_DEBUG(sk, "SK %p: Size needed %d, device %s\n",</div><div class='add'>+	net_dbg_ratelimited("SK %p: Size needed %d, device %s\n",</div><div class='ctx'> 			sk, size, dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	size += dev-&gt;hard_header_len;</div><div class='add'>+	hard_header_len = dev-&gt;hard_header_len;</div><div class='add'>+	/* Leave room for loopback hardware header if necessary */</div><div class='add'>+	if (usat-&gt;sat_addr.s_node == ATADDR_BCAST &amp;&amp;</div><div class='add'>+	    (dev-&gt;flags &amp; IFF_LOOPBACK || !(rt-&gt;flags &amp; RTF_GATEWAY))) {</div><div class='add'>+		struct atalk_addr at_lo;</div><div class='add'>+</div><div class='add'>+		at_lo.s_node = 0;</div><div class='add'>+		at_lo.s_net  = 0;</div><div class='add'>+</div><div class='add'>+		rt_lo = atrtr_find(&amp;at_lo);</div><div class='add'>+</div><div class='add'>+		if (rt_lo &amp;&amp; rt_lo-&gt;dev-&gt;hard_header_len &gt; hard_header_len)</div><div class='add'>+			hard_header_len = rt_lo-&gt;dev-&gt;hard_header_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size += hard_header_len;</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	skb = sock_alloc_send_skb(sk, size, (flags &amp; MSG_DONTWAIT), &amp;err);</div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -1640,10 +1642,10 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, ddp_dl-&gt;header_length);</div><div class='del'>-	skb_reserve(skb, dev-&gt;hard_header_len);</div><div class='add'>+	skb_reserve(skb, hard_header_len);</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	SOCK_DEBUG(sk, "SK %p: Begin build.\n", sk);</div><div class='add'>+	net_dbg_ratelimited("SK %p: Begin build.\n", sk);</div><div class='ctx'> </div><div class='ctx'> 	ddp = skb_put(skb, sizeof(struct ddpehdr));</div><div class='ctx'> 	ddp-&gt;deh_len_hops  = htons(len + sizeof(*ddp));</div><div class='hunk'>@@ -1654,7 +1656,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 	ddp-&gt;deh_dport = usat-&gt;sat_port;</div><div class='ctx'> 	ddp-&gt;deh_sport = at-&gt;src_port;</div><div class='ctx'> </div><div class='del'>-	SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len);</div><div class='add'>+	net_dbg_ratelimited("SK %p: Copy user data (%zd bytes).\n", sk, len);</div><div class='ctx'> </div><div class='ctx'> 	err = memcpy_from_msg(skb_put(skb, len), msg, len);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1678,7 +1680,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> </div><div class='ctx'> 		if (skb2) {</div><div class='ctx'> 			loopback = 1;</div><div class='del'>-			SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk);</div><div class='add'>+			net_dbg_ratelimited("SK %p: send out(copy).\n", sk);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If it fails it is queued/sent above in the aarp queue</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1687,27 +1689,21 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_LOOPBACK || loopback) {</div><div class='del'>-		SOCK_DEBUG(sk, "SK %p: Loop back.\n", sk);</div><div class='add'>+		net_dbg_ratelimited("SK %p: Loop back.\n", sk);</div><div class='ctx'> 		/* loop back */</div><div class='ctx'> 		skb_orphan(skb);</div><div class='ctx'> 		if (ddp-&gt;deh_dnode == ATADDR_BCAST) {</div><div class='del'>-			struct atalk_addr at_lo;</div><div class='del'>-</div><div class='del'>-			at_lo.s_node = 0;</div><div class='del'>-			at_lo.s_net  = 0;</div><div class='del'>-</div><div class='del'>-			rt = atrtr_find(&amp;at_lo);</div><div class='del'>-			if (!rt) {</div><div class='add'>+			if (!rt_lo) {</div><div class='ctx'> 				kfree_skb(skb);</div><div class='ctx'> 				err = -ENETUNREACH;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			dev = rt-&gt;dev;</div><div class='add'>+			dev = rt_lo-&gt;dev;</div><div class='ctx'> 			skb-&gt;dev = dev;</div><div class='ctx'> 		}</div><div class='ctx'> 		ddp_dl-&gt;request(ddp_dl, skb, dev-&gt;dev_addr);</div><div class='ctx'> 	} else {</div><div class='del'>-		SOCK_DEBUG(sk, "SK %p: send out.\n", sk);</div><div class='add'>+		net_dbg_ratelimited("SK %p: send out.\n", sk);</div><div class='ctx'> 		if (rt-&gt;flags &amp; RTF_GATEWAY) {</div><div class='ctx'> 		    gsat.sat_addr = rt-&gt;gateway;</div><div class='ctx'> 		    usat = &amp;gsat;</div><div class='hunk'>@@ -1718,7 +1714,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 		 */</div><div class='ctx'> 		aarp_send_ddp(dev, skb, &amp;usat-&gt;sat_addr, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len);</div><div class='add'>+	net_dbg_ratelimited("SK %p: Done write (%zd).\n", sk, len);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -1735,8 +1731,7 @@ static int atalk_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags &amp; ~MSG_DONTWAIT,</div><div class='del'>-						flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -1794,24 +1789,17 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case TIOCINQ: {</div><div class='del'>-		/*</div><div class='del'>-		 * These two are safe on a single CPU system as only</div><div class='del'>-		 * user tasks fiddle here</div><div class='del'>-		 */</div><div class='del'>-		struct sk_buff *skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+		struct sk_buff *skb;</div><div class='ctx'> 		long amount = 0;</div><div class='ctx'> </div><div class='add'>+		spin_lock_irq(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='add'>+		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			amount = skb-&gt;len - sizeof(struct ddpehdr);</div><div class='add'>+		spin_unlock_irq(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		rc = put_user(amount, (int __user *)argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		rc = sock_get_timestamp(sk, argp);</div><div class='del'>-		break;</div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		rc = sock_get_timestampns(sk, argp);</div><div class='del'>-		break;</div><div class='ctx'> 	/* Routing */</div><div class='ctx'> 	case SIOCADDRT:</div><div class='ctx'> 	case SIOCDELRT:</div><div class='hunk'>@@ -1838,20 +1826,58 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='add'>+static int atalk_compat_routing_ioctl(struct sock *sk, unsigned int cmd,</div><div class='add'>+		struct compat_rtentry __user *ur)</div><div class='add'>+{</div><div class='add'>+	compat_uptr_t rtdev;</div><div class='add'>+	struct rtentry rt;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;rt.rt_dst, &amp;ur-&gt;rt_dst,</div><div class='add'>+			3 * sizeof(struct sockaddr)) ||</div><div class='add'>+	    get_user(rt.rt_flags, &amp;ur-&gt;rt_flags) ||</div><div class='add'>+	    get_user(rt.rt_metric, &amp;ur-&gt;rt_metric) ||</div><div class='add'>+	    get_user(rt.rt_mtu, &amp;ur-&gt;rt_mtu) ||</div><div class='add'>+	    get_user(rt.rt_window, &amp;ur-&gt;rt_window) ||</div><div class='add'>+	    get_user(rt.rt_irtt, &amp;ur-&gt;rt_irtt) ||</div><div class='add'>+	    get_user(rtdev, &amp;ur-&gt;rt_dev))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCDELRT:</div><div class='add'>+		if (rt.rt_dst.sa_family != AF_APPLETALK)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return atrtr_delete(&amp;((struct sockaddr_at *)</div><div class='add'>+				      &amp;rt.rt_dst)-&gt;sat_addr);</div><div class='add'>+</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+		rt.rt_dev = compat_ptr(rtdev);</div><div class='add'>+		return atrtr_ioctl_addrt(&amp;rt);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> static int atalk_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+	case SIOCDELRT:</div><div class='add'>+		return atalk_compat_routing_ioctl(sk, cmd, argp);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * SIOCATALKDIFADDR is a SIOCPROTOPRIVATE ioctl number, so we</div><div class='ctx'> 	 * cannot handle it in common code. The data we access if ifreq</div><div class='ctx'> 	 * here is compatible, so we can simply call the native</div><div class='ctx'> 	 * handler.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmd == SIOCATALKDIFADDR)</div><div class='del'>-		return atalk_ioctl(sock, cmd, (unsigned long)compat_ptr(arg));</div><div class='del'>-</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='add'>+	case SIOCATALKDIFADDR:</div><div class='add'>+		return atalk_ioctl(sock, cmd, (unsigned long)argp);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_COMPAT */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const struct net_proto_family atalk_family_ops = {</div><div class='hunk'>@@ -1871,17 +1897,15 @@ static const struct proto_ops atalk_dgram_ops = {</div><div class='ctx'> 	.getname	= atalk_getname,</div><div class='ctx'> 	.poll		= datagram_poll,</div><div class='ctx'> 	.ioctl		= atalk_ioctl,</div><div class='add'>+	.gettstamp	= sock_gettstamp,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= atalk_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.listen		= sock_no_listen,</div><div class='ctx'> 	.shutdown	= sock_no_shutdown,</div><div class='del'>-	.setsockopt	= sock_no_setsockopt,</div><div class='del'>-	.getsockopt	= sock_no_getsockopt,</div><div class='ctx'> 	.sendmsg	= atalk_sendmsg,</div><div class='ctx'> 	.recvmsg	= atalk_recvmsg,</div><div class='ctx'> 	.mmap		= sock_no_mmap,</div><div class='del'>-	.sendpage	= sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block ddp_notifier = {</div><div class='hunk'>@@ -1904,31 +1928,61 @@ static unsigned char ddp_snap_id[] = { 0x08, 0x00, 0x07, 0x80, 0x9B };</div><div class='ctx'> EXPORT_SYMBOL(atrtr_get_dev);</div><div class='ctx'> EXPORT_SYMBOL(atalk_find_dev_addr);</div><div class='ctx'> </div><div class='del'>-static const char atalk_err_snap[] __initconst =</div><div class='del'>-	KERN_CRIT "Unable to register DDP with SNAP.\n";</div><div class='del'>-</div><div class='ctx'> /* Called by proto.c on kernel start up */</div><div class='ctx'> static int __init atalk_init(void)</div><div class='ctx'> {</div><div class='del'>-	int rc = proto_register(&amp;ddp_proto, 0);</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (rc != 0)</div><div class='add'>+	rc = proto_register(&amp;ddp_proto, 0);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	(void)sock_register(&amp;atalk_family_ops);</div><div class='add'>+	rc = sock_register(&amp;atalk_family_ops);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_proto;</div><div class='add'>+</div><div class='ctx'> 	ddp_dl = register_snap_client(ddp_snap_id, atalk_rcv);</div><div class='del'>-	if (!ddp_dl)</div><div class='del'>-		printk(atalk_err_snap);</div><div class='add'>+	if (!ddp_dl) {</div><div class='add'>+		pr_crit("Unable to register DDP with SNAP.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_sock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_add_pack(&amp;ltalk_packet_type);</div><div class='ctx'> 	dev_add_pack(&amp;ppptalk_packet_type);</div><div class='ctx'> </div><div class='del'>-	register_netdevice_notifier(&amp;ddp_notifier);</div><div class='del'>-	aarp_proto_init();</div><div class='del'>-	atalk_proc_init();</div><div class='del'>-	atalk_register_sysctl();</div><div class='add'>+	rc = register_netdevice_notifier(&amp;ddp_notifier);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_snap;</div><div class='add'>+</div><div class='add'>+	rc = aarp_proto_init();</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_dev;</div><div class='add'>+</div><div class='add'>+	rc = atalk_proc_init();</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_aarp;</div><div class='add'>+</div><div class='add'>+	rc = atalk_register_sysctl();</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_proc;</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='add'>+out_proc:</div><div class='add'>+	atalk_proc_exit();</div><div class='add'>+out_aarp:</div><div class='add'>+	aarp_cleanup_module();</div><div class='add'>+out_dev:</div><div class='add'>+	unregister_netdevice_notifier(&amp;ddp_notifier);</div><div class='add'>+out_snap:</div><div class='add'>+	dev_remove_pack(&amp;ppptalk_packet_type);</div><div class='add'>+	dev_remove_pack(&amp;ltalk_packet_type);</div><div class='add'>+	unregister_snap_client(ddp_dl);</div><div class='add'>+out_sock:</div><div class='add'>+	sock_unregister(PF_APPLETALK);</div><div class='add'>+out_proto:</div><div class='add'>+	proto_unregister(&amp;ddp_proto);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> module_init(atalk_init);</div><div class='ctx'> </div><div class='hunk'>@@ -1939,7 +1993,7 @@ module_init(atalk_init);</div><div class='ctx'>  * by the network device layer.</div><div class='ctx'>  *</div><div class='ctx'>  * Ergo, before the AppleTalk module can be removed, all AppleTalk</div><div class='del'>- * sockets be closed from user space.</div><div class='add'>+ * sockets should be closed from user space.</div><div class='ctx'>  */</div><div class='ctx'> static void __exit atalk_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c<br/>deleted file mode 100644<br/>index 284c8e585533..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/dev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Moved here from drivers/net/net_init.c, which is:</div><div class='del'>- *	Written 1993,1994,1995 by Donald Becker.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/if_ltalk.h&gt;</div><div class='del'>-</div><div class='del'>-static void ltalk_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* Fill in the fields of the device structure with localtalk-generic values. */</div><div class='del'>-</div><div class='del'>-	dev-&gt;type		= ARPHRD_LOCALTLK;</div><div class='del'>-	dev-&gt;hard_header_len 	= LTALK_HLEN;</div><div class='del'>-	dev-&gt;mtu		= LTALK_MTU;</div><div class='del'>-	dev-&gt;addr_len		= LTALK_ALEN;</div><div class='del'>-	dev-&gt;tx_queue_len	= 10;</div><div class='del'>-</div><div class='del'>-	dev-&gt;broadcast[0]	= 0xFF;</div><div class='del'>-</div><div class='del'>-	dev-&gt;flags		= IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alloc_ltalkdev - Allocates and sets up an localtalk device</div><div class='del'>- * @sizeof_priv: Size of additional driver-private structure to be allocated</div><div class='del'>- *	for this localtalk device</div><div class='del'>- *</div><div class='del'>- * Fill in the fields of the device structure with localtalk-generic</div><div class='del'>- * values. Basically does everything except registering the device.</div><div class='del'>- *</div><div class='del'>- * Constructs a new net device, complete with a private data area of</div><div class='del'>- * size @sizeof_priv.  A 32-byte (not bit) alignment is enforced for</div><div class='del'>- * this private data area.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct net_device *alloc_ltalkdev(int sizeof_priv)</div><div class='del'>-{</div><div class='del'>-	return alloc_netdev(sizeof_priv, "lt%d", NET_NAME_UNKNOWN,</div><div class='del'>-			    ltalk_setup);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(alloc_ltalkdev);</div><div class='head'>diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c<br/>index c744a853fa5f..7aebfe903242 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/appletalk/sysctl_net_atalk.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/appletalk/sysctl_net_atalk.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/appletalk/sysctl_net_atalk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/appletalk/sysctl_net_atalk.c</a></div><div class='hunk'>@@ -40,14 +40,16 @@ static struct ctl_table atalk_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *atalk_table_header;</div><div class='ctx'> </div><div class='del'>-void atalk_register_sysctl(void)</div><div class='add'>+int __init atalk_register_sysctl(void)</div><div class='ctx'> {</div><div class='ctx'> 	atalk_table_header = register_net_sysctl(&amp;init_net, "net/appletalk", atalk_table);</div><div class='add'>+	if (!atalk_table_header)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void atalk_unregister_sysctl(void)</div><div class='head'>diff --git a/net/atm/Kconfig b/net/atm/Kconfig<br/>index 754ea103b378..77343d57ff2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Asynchronous Transfer Mode (ATM)</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config ATM</div><div class='ctx'> 	tristate "Asynchronous Transfer Mode (ATM)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  ATM is a high-speed networking technology for Local Area Networks</div><div class='ctx'> 	  and Wide Area Networks.  It uses a fixed packet size and is</div><div class='ctx'> 	  connection oriented, allowing for the negotiation of minimum</div><div class='hunk'>@@ -15,7 +16,7 @@ config ATM</div><div class='ctx'> 	  of your ATM card below.</div><div class='ctx'> </div><div class='ctx'> 	  Note that you need a set of user-space programs to actually make use</div><div class='del'>-	  of ATM.  See the file &lt;file:Documentation/networking/atm.txt&gt; for</div><div class='add'>+	  of ATM.  See the file &lt;file:Documentation/networking/atm.rst&gt; for</div><div class='ctx'> 	  further details.</div><div class='ctx'> </div><div class='ctx'> config ATM_CLIP</div><div class='head'>diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c<br/>index 39b94ca5f65d..54e7fb1a4ee5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/atm_sysfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/atm_sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/atm_sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/atm_sysfs.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #define to_atm_dev(cldev) container_of(cldev, struct atm_dev, class_dev)</div><div class='ctx'> </div><div class='del'>-static ssize_t show_type(struct device *cdev,</div><div class='add'>+static ssize_t type_show(struct device *cdev,</div><div class='ctx'> 			 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='hunk'>@@ -19,7 +19,7 @@ static ssize_t show_type(struct device *cdev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%s\n", adev-&gt;type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_address(struct device *cdev,</div><div class='add'>+static ssize_t address_show(struct device *cdev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='hunk'>@@ -27,36 +27,30 @@ static ssize_t show_address(struct device *cdev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%pM\n", adev-&gt;esi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_atmaddress(struct device *cdev,</div><div class='add'>+static ssize_t atmaddress_show(struct device *cdev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='ctx'> 	struct atm_dev_addr *aaddr;</div><div class='del'>-	int bin[] = { 1, 2, 10, 6, 1 }, *fmt = bin;</div><div class='del'>-	int i, j, count = 0;</div><div class='add'>+	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;adev-&gt;lock, flags);</div><div class='ctx'> 	list_for_each_entry(aaddr, &amp;adev-&gt;local, entry) {</div><div class='del'>-		for (i = 0, j = 0; i &lt; ATM_ESA_LEN; ++i, ++j) {</div><div class='del'>-			if (j == *fmt) {</div><div class='del'>-				count += scnprintf(buf + count,</div><div class='del'>-						   PAGE_SIZE - count, ".");</div><div class='del'>-				++fmt;</div><div class='del'>-				j = 0;</div><div class='del'>-			}</div><div class='del'>-			count += scnprintf(buf + count,</div><div class='del'>-					   PAGE_SIZE - count, "%02x",</div><div class='del'>-					   aaddr-&gt;addr.sas_addr.prv[i]);</div><div class='del'>-		}</div><div class='del'>-		count += scnprintf(buf + count, PAGE_SIZE - count, "\n");</div><div class='add'>+		count += scnprintf(buf + count, PAGE_SIZE - count,</div><div class='add'>+				   "%1phN.%2phN.%10phN.%6phN.%1phN\n",</div><div class='add'>+				   &amp;aaddr-&gt;addr.sas_addr.prv[0],</div><div class='add'>+				   &amp;aaddr-&gt;addr.sas_addr.prv[1],</div><div class='add'>+				   &amp;aaddr-&gt;addr.sas_addr.prv[3],</div><div class='add'>+				   &amp;aaddr-&gt;addr.sas_addr.prv[13],</div><div class='add'>+				   &amp;aaddr-&gt;addr.sas_addr.prv[19]);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adev-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_atmindex(struct device *cdev,</div><div class='add'>+static ssize_t atmindex_show(struct device *cdev,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='hunk'>@@ -64,7 +58,7 @@ static ssize_t show_atmindex(struct device *cdev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d\n", adev-&gt;number);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_carrier(struct device *cdev,</div><div class='add'>+static ssize_t carrier_show(struct device *cdev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='hunk'>@@ -73,7 +67,7 @@ static ssize_t show_carrier(struct device *cdev,</div><div class='ctx'> 			 adev-&gt;signal == ATM_PHY_SIG_LOST ? 0 : 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_link_rate(struct device *cdev,</div><div class='add'>+static ssize_t link_rate_show(struct device *cdev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *adev = to_atm_dev(cdev);</div><div class='hunk'>@@ -96,12 +90,12 @@ static ssize_t show_link_rate(struct device *cdev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d\n", link_rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(address, 0444, show_address, NULL);</div><div class='del'>-static DEVICE_ATTR(atmaddress, 0444, show_atmaddress, NULL);</div><div class='del'>-static DEVICE_ATTR(atmindex, 0444, show_atmindex, NULL);</div><div class='del'>-static DEVICE_ATTR(carrier, 0444, show_carrier, NULL);</div><div class='del'>-static DEVICE_ATTR(type, 0444, show_type, NULL);</div><div class='del'>-static DEVICE_ATTR(link_rate, 0444, show_link_rate, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(address);</div><div class='add'>+static DEVICE_ATTR_RO(atmaddress);</div><div class='add'>+static DEVICE_ATTR_RO(atmindex);</div><div class='add'>+static DEVICE_ATTR_RO(carrier);</div><div class='add'>+static DEVICE_ATTR_RO(type);</div><div class='add'>+static DEVICE_ATTR_RO(link_rate);</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute *atm_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_atmaddress,</div><div class='hunk'>@@ -114,16 +108,14 @@ static struct device_attribute *atm_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env)</div><div class='add'>+static int atm_uevent(const struct device *cdev, struct kobj_uevent_env *env)</div><div class='ctx'> {</div><div class='del'>-	struct atm_dev *adev;</div><div class='add'>+	const struct atm_dev *adev;</div><div class='ctx'> </div><div class='ctx'> 	if (!cdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	adev = to_atm_dev(cdev);</div><div class='del'>-	if (!adev)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (add_uevent_var(env, "NAME=%s%d", adev-&gt;type, adev-&gt;number))</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/net/atm/br2684.c b/net/atm/br2684.c<br/>index 10462de734ea..f666f2f98ba5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/br2684.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/br2684.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/br2684.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/br2684.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Ethernet netdevice using ATM AAL5 as underlying carrier</div><div class='ctx'>  * (RFC1483 obsoleted by RFC2684) for Linux</div><div class='hunk'>@@ -92,8 +93,8 @@ struct br2684_dev {</div><div class='ctx'>  * This lock should be held for writing any time the list of devices or</div><div class='ctx'>  * their attached vcc's could be altered.  It should be held for reading</div><div class='ctx'>  * any time these are being queried.  Note that we sometimes need to</div><div class='del'>- * do read-locking under interrupt context, so write locking must block</div><div class='del'>- * the current CPU's interrupts</div><div class='add'>+ * do read-locking under interrupting context, so write locking must block</div><div class='add'>+ * the current CPU's interrupts.</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_RWLOCK(devs_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -576,10 +577,12 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)</div><div class='ctx'> 	pr_debug("vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc);</div><div class='ctx'> 	if (list_empty(&amp;brdev-&gt;brvccs) &amp;&amp; !brdev-&gt;mac_was_set) {</div><div class='ctx'> 		unsigned char *esi = atmvcc-&gt;dev-&gt;esi;</div><div class='add'>+		const u8 one = 1;</div><div class='add'>+</div><div class='ctx'> 		if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])</div><div class='del'>-			memcpy(net_dev-&gt;dev_addr, esi, net_dev-&gt;addr_len);</div><div class='add'>+			dev_addr_set(net_dev, esi);</div><div class='ctx'> 		else</div><div class='del'>-			net_dev-&gt;dev_addr[2] = 1;</div><div class='add'>+			dev_addr_mod(net_dev, 2, &amp;one, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_add(&amp;brvcc-&gt;brvccs, &amp;brdev-&gt;brvccs);</div><div class='ctx'> 	write_unlock_irq(&amp;devs_lock);</div><div class='head'>diff --git a/net/atm/clip.c b/net/atm/clip.c<br/>index d795b9c5aea4..8f152e5fa659 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/clip.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/clip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/clip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/clip.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* net/atm/clip.c - RFC1577 Classical IP over ATM */</div><div class='ctx'> </div><div class='ctx'> /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */</div><div class='hunk'>@@ -44,7 +45,8 @@</div><div class='ctx'> #include &lt;net/atmclip.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct net_device *clip_devs;</div><div class='del'>-static struct atm_vcc *atmarpd;</div><div class='add'>+static struct atm_vcc __rcu *atmarpd;</div><div class='add'>+static DEFINE_MUTEX(atmarpd_lock);</div><div class='ctx'> static struct timer_list idle_timer;</div><div class='ctx'> static const struct neigh_ops clip_neigh_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -52,24 +54,35 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct atmarp_ctrl *ctrl;</div><div class='add'>+	struct atm_vcc *vcc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("(%d)\n", type);</div><div class='del'>-	if (!atmarpd)</div><div class='del'>-		return -EUNATCH;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	vcc = rcu_dereference(atmarpd);</div><div class='add'>+	if (!vcc) {</div><div class='add'>+		err = -EUNATCH;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> 	skb = alloc_skb(sizeof(struct atmarp_ctrl), GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> 	ctrl = skb_put(skb, sizeof(struct atmarp_ctrl));</div><div class='ctx'> 	ctrl-&gt;type = type;</div><div class='ctx'> 	ctrl-&gt;itf_num = itf;</div><div class='ctx'> 	ctrl-&gt;ip = ip;</div><div class='del'>-	atm_force_charge(atmarpd, skb-&gt;truesize);</div><div class='add'>+	atm_force_charge(vcc, skb-&gt;truesize);</div><div class='ctx'> </div><div class='del'>-	sk = sk_atm(atmarpd);</div><div class='add'>+	sk = sk_atm(vcc);</div><div class='ctx'> 	skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='ctx'> 	sk-&gt;sk_data_ready(sk);</div><div class='del'>-	return 0;</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry)</div><div class='hunk'>@@ -88,7 +101,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)</div><div class='ctx'> 	struct clip_vcc **walk;</div><div class='ctx'> </div><div class='ctx'> 	if (!entry) {</div><div class='del'>-		pr_crit("!clip_vcc-&gt;entry (clip_vcc %p)\n", clip_vcc);</div><div class='add'>+		pr_err("!clip_vcc-&gt;entry (clip_vcc %p)\n", clip_vcc);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	netif_tx_lock_bh(entry-&gt;neigh-&gt;dev);	/* block clip_start_xmit() */</div><div class='hunk'>@@ -108,10 +121,10 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)</div><div class='ctx'> 			error = neigh_update(entry-&gt;neigh, NULL, NUD_NONE,</div><div class='ctx'> 					     NEIGH_UPDATE_F_ADMIN, 0);</div><div class='ctx'> 			if (error)</div><div class='del'>-				pr_crit("neigh_update failed with %d\n", error);</div><div class='add'>+				pr_err("neigh_update failed with %d\n", error);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);</div><div class='add'>+	pr_err("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);</div><div class='ctx'> out:</div><div class='ctx'> 	netif_tx_unlock_bh(entry-&gt;neigh-&gt;dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -155,10 +168,10 @@ static int neigh_check_cb(struct neighbour *n)</div><div class='ctx'> </div><div class='ctx'> static void idle_timer_check(struct timer_list *unused)</div><div class='ctx'> {</div><div class='del'>-	write_lock(&amp;arp_tbl.lock);</div><div class='add'>+	spin_lock(&amp;arp_tbl.lock);</div><div class='ctx'> 	__neigh_for_each_release(&amp;arp_tbl, neigh_check_cb);</div><div class='ctx'> 	mod_timer(&amp;idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);</div><div class='del'>-	write_unlock(&amp;arp_tbl.lock);</div><div class='add'>+	spin_unlock(&amp;arp_tbl.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clip_arp_rcv(struct sk_buff *skb)</div><div class='hunk'>@@ -192,12 +205,6 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("\n");</div><div class='ctx'> </div><div class='del'>-	if (!clip_devs) {</div><div class='del'>-		atm_return(vcc, skb-&gt;truesize);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		pr_debug("removing VCC %p\n", clip_vcc);</div><div class='ctx'> 		if (clip_vcc-&gt;entry)</div><div class='hunk'>@@ -207,6 +214,11 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	atm_return(vcc, skb-&gt;truesize);</div><div class='add'>+	if (!clip_devs) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;dev = clip_vcc-&gt;entry ? clip_vcc-&gt;entry-&gt;neigh-&gt;dev : clip_devs;</div><div class='ctx'> 	/* clip_vcc-&gt;entry == NULL if we don't have an IP address yet */</div><div class='ctx'> 	if (!skb-&gt;dev) {</div><div class='hunk'>@@ -344,9 +356,9 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='del'>-	rt = (struct rtable *) dst;</div><div class='del'>-	if (rt-&gt;rt_gateway)</div><div class='del'>-		daddr = &amp;rt-&gt;rt_gateway;</div><div class='add'>+	rt = dst_rtable(dst);</div><div class='add'>+	if (rt-&gt;rt_gw_family == AF_INET)</div><div class='add'>+		daddr = &amp;rt-&gt;rt_gw4;</div><div class='ctx'> 	else</div><div class='ctx'> 		daddr = &amp;ip_hdr(skb)-&gt;daddr;</div><div class='ctx'> 	n = dst_neigh_lookup(dst, daddr);</div><div class='hunk'>@@ -417,6 +429,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)</div><div class='ctx'> </div><div class='ctx'> 	if (!vcc-&gt;push)</div><div class='ctx'> 		return -EBADFD;</div><div class='add'>+	if (vcc-&gt;user_back)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	clip_vcc = kmalloc(sizeof(struct clip_vcc), GFP_KERNEL);</div><div class='ctx'> 	if (!clip_vcc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -462,7 +476,7 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)</div><div class='ctx'> 		unlink_clip_vcc(clip_vcc);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	rt = ip_route_output(&amp;init_net, ip, 0, 1, 0);</div><div class='add'>+	rt = ip_route_output(&amp;init_net, ip, 0, 0, 0, RT_SCOPE_LINK);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return PTR_ERR(rt);</div><div class='ctx'> 	neigh = __neigh_lookup(&amp;arp_tbl, &amp;ip, rt-&gt;dst.dev, 1);</div><div class='hunk'>@@ -607,17 +621,27 @@ static void atmarpd_close(struct atm_vcc *vcc)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	atmarpd = NULL;</div><div class='add'>+	mutex_lock(&amp;atmarpd_lock);</div><div class='add'>+	RCU_INIT_POINTER(atmarpd, NULL);</div><div class='add'>+	mutex_unlock(&amp;atmarpd_lock);</div><div class='add'>+</div><div class='add'>+	synchronize_rcu();</div><div class='ctx'> 	skb_queue_purge(&amp;sk_atm(vcc)-&gt;sk_receive_queue);</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("(done)\n");</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int atmarpd_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	atm_return_tx(vcc, skb);</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct atmdev_ops atmarpd_dev_ops = {</div><div class='del'>-	.close = atmarpd_close</div><div class='add'>+	.close = atmarpd_close,</div><div class='add'>+	.send = atmarpd_send</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -631,15 +655,18 @@ static struct atm_dev atmarpd_dev = {</div><div class='ctx'> </div><div class='ctx'> static int atm_init_atmarp(struct atm_vcc *vcc)</div><div class='ctx'> {</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	if (vcc-&gt;push == clip_push)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;atmarpd_lock);</div><div class='ctx'> 	if (atmarpd) {</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		mutex_unlock(&amp;atmarpd_lock);</div><div class='ctx'> 		return -EADDRINUSE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);</div><div class='ctx'> </div><div class='del'>-	atmarpd = vcc;</div><div class='add'>+	rcu_assign_pointer(atmarpd, vcc);</div><div class='ctx'> 	set_bit(ATM_VF_META, &amp;vcc-&gt;flags);</div><div class='ctx'> 	set_bit(ATM_VF_READY, &amp;vcc-&gt;flags);</div><div class='ctx'> 	    /* allow replies and avoid getting closed if signaling dies */</div><div class='hunk'>@@ -648,13 +675,14 @@ static int atm_init_atmarp(struct atm_vcc *vcc)</div><div class='ctx'> 	vcc-&gt;push = NULL;</div><div class='ctx'> 	vcc-&gt;pop = NULL; /* crash */</div><div class='ctx'> 	vcc-&gt;push_oam = NULL; /* crash */</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;atmarpd_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clip_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_vcc *vcc = ATM_SD(sock);</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -675,14 +703,18 @@ static int clip_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		err = clip_create(arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATMARPD_CTRL:</div><div class='add'>+		lock_sock(sk);</div><div class='ctx'> 		err = atm_init_atmarp(vcc);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			sock-&gt;state = SS_CONNECTED;</div><div class='ctx'> 			__module_get(THIS_MODULE);</div><div class='ctx'> 		}</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATMARP_MKIP:</div><div class='add'>+		lock_sock(sk);</div><div class='ctx'> 		err = clip_mkip(vcc, arg);</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATMARP_SETENTRY:</div><div class='ctx'> 		err = clip_setentry(vcc, (__force __be32)arg);</div><div class='hunk'>@@ -903,7 +935,7 @@ static void atm_clip_exit_noproc(void)</div><div class='ctx'> 	/* First, stop the idle timer, so it stops banging</div><div class='ctx'> 	 * on the table.</div><div class='ctx'> 	 */</div><div class='del'>-	del_timer_sync(&amp;idle_timer);</div><div class='add'>+	timer_delete_sync(&amp;idle_timer);</div><div class='ctx'> </div><div class='ctx'> 	dev = clip_devs;</div><div class='ctx'> 	while (dev) {</div><div class='head'>diff --git a/net/atm/common.c b/net/atm/common.c<br/>index 9f8cb0d2e71e..fe77f51f6ce1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/common.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/common.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* net/atm/common.c - ATM sockets (common part for PVC and SVC) */</div><div class='ctx'> </div><div class='ctx'> /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */</div><div class='hunk'>@@ -115,7 +116,7 @@ static void vcc_write_space(struct sock *sk)</div><div class='ctx'> 		if (skwq_has_sleeper(wq))</div><div class='ctx'> 			wake_up_interruptible(&amp;wq-&gt;wait);</div><div class='ctx'> </div><div class='del'>-		sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='add'>+		sk_wake_async_rcu(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -156,7 +157,7 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family, i</div><div class='ctx'> 	memset(&amp;vcc-&gt;local, 0, sizeof(struct sockaddr_atmsvc));</div><div class='ctx'> 	memset(&amp;vcc-&gt;remote, 0, sizeof(struct sockaddr_atmsvc));</div><div class='ctx'> 	vcc-&gt;qos.txtp.max_sdu = 1 &lt;&lt; 16; /* for meta VCs */</div><div class='del'>-	refcount_set(&amp;sk-&gt;sk_wmem_alloc, 1);</div><div class='add'>+	refcount_set(&amp;sk-&gt;sk_wmem_alloc, SK_WMEM_ALLOC_BIAS);</div><div class='ctx'> 	atomic_set(&amp;sk-&gt;sk_rmem_alloc, 0);</div><div class='ctx'> 	vcc-&gt;push = NULL;</div><div class='ctx'> 	vcc-&gt;pop = NULL;</div><div class='hunk'>@@ -176,18 +177,18 @@ static void vcc_destroy_socket(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ATM_VF_CLOSE, &amp;vcc-&gt;flags);</div><div class='ctx'> 	clear_bit(ATM_VF_READY, &amp;vcc-&gt;flags);</div><div class='del'>-	if (vcc-&gt;dev) {</div><div class='del'>-		if (vcc-&gt;dev-&gt;ops-&gt;close)</div><div class='del'>-			vcc-&gt;dev-&gt;ops-&gt;close(vcc);</div><div class='del'>-		if (vcc-&gt;push)</div><div class='del'>-			vcc-&gt;push(vcc, NULL); /* atmarpd has no push */</div><div class='del'>-		module_put(vcc-&gt;owner);</div><div class='del'>-</div><div class='del'>-		while ((skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='del'>-			atm_return(vcc, skb-&gt;truesize);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		}</div><div class='add'>+	if (vcc-&gt;dev &amp;&amp; vcc-&gt;dev-&gt;ops-&gt;close)</div><div class='add'>+		vcc-&gt;dev-&gt;ops-&gt;close(vcc);</div><div class='add'>+	if (vcc-&gt;push)</div><div class='add'>+		vcc-&gt;push(vcc, NULL); /* atmarpd has no push */</div><div class='add'>+	module_put(vcc-&gt;owner);</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='add'>+		atm_return(vcc, skb-&gt;truesize);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (vcc-&gt;dev &amp;&amp; vcc-&gt;dev-&gt;ops-&gt;owner) {</div><div class='ctx'> 		module_put(vcc-&gt;dev-&gt;ops-&gt;owner);</div><div class='ctx'> 		atm_dev_put(vcc-&gt;dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -296,7 +297,7 @@ static int adjust_tp(struct atm_trafprm *tp, unsigned char aal)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_warn("AAL problems ... (%d)\n", aal);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ATM_AAL5:</div><div class='ctx'> 		max_sdu = ATM_MAX_AAL5_PDU;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -416,7 +417,7 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,</div><div class='ctx'> 	case ATM_NO_AAL:</div><div class='ctx'> 		/* ATM_AAL5 is also used in the "0 for default" case */</div><div class='ctx'> 		vcc-&gt;qos.aal = ATM_AAL5;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ATM_AAL5:</div><div class='ctx'> 		error = atm_init_aal5(vcc);</div><div class='ctx'> 		vcc-&gt;stats = &amp;dev-&gt;stats.aal5;</div><div class='hunk'>@@ -539,7 +540,7 @@ int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	    !test_bit(ATM_VF_READY, &amp;vcc-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, flags &amp; MSG_DONTWAIT, &amp;error);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;error);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -552,7 +553,7 @@ int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	error = skb_copy_datagram_msg(skb, 0, msg, copied);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!(flags &amp; MSG_PEEK)) {</div><div class='ctx'> 		pr_debug("%d -= %d\n", atomic_read(&amp;sk-&gt;sk_rmem_alloc),</div><div class='hunk'>@@ -634,17 +635,27 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = NULL; /* for paths shared with net_device interfaces */</div><div class='ctx'> 	if (!copy_from_iter_full(skb_put(skb, size), size, &amp;m-&gt;msg_iter)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='ctx'> 		error = -EFAULT;</div><div class='del'>-		goto out;</div><div class='add'>+		goto free_skb;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (eff != size)</div><div class='ctx'> 		memset(skb-&gt;data + size, 0, eff-size);</div><div class='add'>+</div><div class='add'>+	if (vcc-&gt;dev-&gt;ops-&gt;pre_send) {</div><div class='add'>+		error = vcc-&gt;dev-&gt;ops-&gt;pre_send(vcc, skb);</div><div class='add'>+		if (error)</div><div class='add'>+			goto free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	error = vcc-&gt;dev-&gt;ops-&gt;send(vcc, skb);</div><div class='ctx'> 	error = error ? error : size;</div><div class='ctx'> out:</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	return error;</div><div class='add'>+free_skb:</div><div class='add'>+	atm_return_tx(vcc, skb);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='hunk'>@@ -653,7 +664,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 	struct atm_vcc *vcc;</div><div class='ctx'> 	__poll_t mask;</div><div class='ctx'> </div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='add'>+	sock_poll_wait(file, sock, wait);</div><div class='ctx'> 	mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	vcc = ATM_SD(sock);</div><div class='hunk'>@@ -667,7 +678,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 		mask |= EPOLLHUP;</div><div class='ctx'> </div><div class='ctx'> 	/* readable? */</div><div class='del'>-	if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+	if (!skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue))</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='ctx'> 	/* writable? */</div><div class='hunk'>@@ -744,7 +755,7 @@ static int check_qos(const struct atm_qos *qos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int vcc_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		   char __user *optval, unsigned int optlen)</div><div class='add'>+		   sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_vcc *vcc;</div><div class='ctx'> 	unsigned long value;</div><div class='hunk'>@@ -759,7 +770,7 @@ int vcc_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct atm_qos qos;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;qos, optval, sizeof(qos)))</div><div class='add'>+		if (copy_from_sockptr(&amp;qos, optval, sizeof(qos)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		error = check_qos(&amp;qos);</div><div class='ctx'> 		if (error)</div><div class='hunk'>@@ -773,7 +784,7 @@ int vcc_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SO_SETCLP:</div><div class='del'>-		if (get_user(value, (unsigned long __user *)optval))</div><div class='add'>+		if (copy_from_sockptr(&amp;value, optval, sizeof(value)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (value)</div><div class='ctx'> 			vcc-&gt;atm_options |= ATM_ATMOPT_CLP;</div><div class='hunk'>@@ -781,13 +792,8 @@ int vcc_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			vcc-&gt;atm_options &amp;= ~ATM_ATMOPT_CLP;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		if (level == SOL_SOCKET)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (!vcc-&gt;dev || !vcc-&gt;dev-&gt;ops-&gt;setsockopt)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return vcc-&gt;dev-&gt;ops-&gt;setsockopt(vcc, level, optname, optval, optlen);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int vcc_getsockopt(struct socket *sock, int level, int optname,</div><div class='hunk'>@@ -825,13 +831,8 @@ int vcc_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		return copy_to_user(optval, &amp;pvc, sizeof(pvc)) ? -EFAULT : 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='del'>-		if (level == SOL_SOCKET)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (!vcc-&gt;dev || !vcc-&gt;dev-&gt;ops-&gt;getsockopt)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return vcc-&gt;dev-&gt;ops-&gt;getsockopt(vcc, level, optname, optval, len);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int register_atmdevice_notifier(struct notifier_block *nb)</div><div class='hunk'>@@ -880,7 +881,7 @@ out_atmproc_exit:</div><div class='ctx'> out_atmsvc_exit:</div><div class='ctx'> 	atmsvc_exit();</div><div class='ctx'> out_atmpvc_exit:</div><div class='del'>-	atmsvc_exit();</div><div class='add'>+	atmpvc_exit();</div><div class='ctx'> out_unregister_vcc_proto:</div><div class='ctx'> 	proto_unregister(&amp;vcc_proto);</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -899,6 +900,7 @@ subsys_initcall(atm_init);</div><div class='ctx'> </div><div class='ctx'> module_exit(atm_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Asynchronous Transfer Mode (ATM) networking core");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_NETPROTO(PF_ATMPVC);</div><div class='ctx'> MODULE_ALIAS_NETPROTO(PF_ATMSVC);</div><div class='head'>diff --git a/net/atm/common.h b/net/atm/common.h<br/>index 5850649068bb..a1e56e8de698 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/common.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/common.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait);</div><div class='ctx'> int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);</div><div class='ctx'> int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);</div><div class='ctx'> int vcc_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		   char __user *optval, unsigned int optlen);</div><div class='add'>+		   sockptr_t optval, unsigned int optlen);</div><div class='ctx'> int vcc_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		   char __user *optval, int __user *optlen);</div><div class='ctx'> void vcc_process_recv_queue(struct atm_vcc *vcc);</div><div class='head'>diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c<br/>index 2ff0e5e470e3..0f7a39aeccc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/ioctl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/ioctl.c</a></div><div class='hunk'>@@ -56,6 +56,8 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct list_head *pos;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='add'>+	void __user *buf;</div><div class='add'>+	int __user *len;</div><div class='ctx'> </div><div class='ctx'> 	vcc = ATM_SD(sock);</div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -66,37 +68,24 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		error = put_user(sk-&gt;sk_sndbuf - sk_wmem_alloc_get(sk),</div><div class='del'>-				 (int __user *)argp) ? -EFAULT : 0;</div><div class='add'>+				 (int __user *)argp);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	case SIOCINQ:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='add'>+		int amount;</div><div class='ctx'> </div><div class='ctx'> 		if (sock-&gt;state != SS_CONNECTED) {</div><div class='ctx'> 			error = -EINVAL;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='add'>+		spin_lock_irq(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-		error = put_user(skb ? skb-&gt;len : 0,</div><div class='del'>-				 (int __user *)argp) ? -EFAULT : 0;</div><div class='add'>+		amount = skb ? skb-&gt;len : 0;</div><div class='add'>+		spin_unlock_irq(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='add'>+		error = put_user(amount, (int __user *)argp);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	case SIOCGSTAMP: /* borrowed from IP */</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		if (compat)</div><div class='del'>-			error = compat_sock_get_timestamp(sk, argp);</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-			error = sock_get_timestamp(sk, argp);</div><div class='del'>-		goto done;</div><div class='del'>-	case SIOCGSTAMPNS: /* borrowed from IP */</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		if (compat)</div><div class='del'>-			error = compat_sock_get_timestampns(sk, argp);</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-			error = sock_get_timestampns(sk, argp);</div><div class='del'>-		goto done;</div><div class='ctx'> 	case ATM_SETSC:</div><div class='ctx'> 		net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n",</div><div class='ctx'> 				     current-&gt;comm, task_pid_nr(current));</div><div class='hunk'>@@ -178,7 +167,49 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 	if (error != -ENOIOCTLCMD)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	error = atm_dev_ioctl(cmd, argp, compat);</div><div class='add'>+	if (cmd == ATM_GETNAMES) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_COMPAT) &amp;&amp; compat) {</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+			struct compat_atm_iobuf __user *ciobuf = argp;</div><div class='add'>+			compat_uptr_t cbuf;</div><div class='add'>+			len = &amp;ciobuf-&gt;length;</div><div class='add'>+			if (get_user(cbuf, &amp;ciobuf-&gt;buffer))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			buf = compat_ptr(cbuf);</div><div class='add'>+#endif</div><div class='add'>+		} else {</div><div class='add'>+			struct atm_iobuf __user *iobuf = argp;</div><div class='add'>+			len = &amp;iobuf-&gt;length;</div><div class='add'>+			if (get_user(buf, &amp;iobuf-&gt;buffer))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		error = atm_getnames(buf, len);</div><div class='add'>+	} else {</div><div class='add'>+		int number;</div><div class='add'>+</div><div class='add'>+		if (IS_ENABLED(CONFIG_COMPAT) &amp;&amp; compat) {</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+			struct compat_atmif_sioc __user *csioc = argp;</div><div class='add'>+			compat_uptr_t carg;</div><div class='add'>+</div><div class='add'>+			len = &amp;csioc-&gt;length;</div><div class='add'>+			if (get_user(carg, &amp;csioc-&gt;arg))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			buf = compat_ptr(carg);</div><div class='add'>+			if (get_user(number, &amp;csioc-&gt;number))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+#endif</div><div class='add'>+		} else {</div><div class='add'>+			struct atmif_sioc __user *sioc = argp;</div><div class='add'>+</div><div class='add'>+			len = &amp;sioc-&gt;length;</div><div class='add'>+			if (get_user(buf, &amp;sioc-&gt;arg))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if (get_user(number, &amp;sioc-&gt;number))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		error = atm_dev_ioctl(cmd, buf, len, number, compat);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -246,61 +277,25 @@ static struct {</div><div class='ctx'> static int do_atm_iobuf(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 			unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct atm_iobuf __user *iobuf;</div><div class='del'>-	struct compat_atm_iobuf __user *iobuf32;</div><div class='add'>+	struct compat_atm_iobuf __user *iobuf32 = compat_ptr(arg);</div><div class='ctx'> 	u32 data;</div><div class='del'>-	void __user *datap;</div><div class='del'>-	int len, err;</div><div class='del'>-</div><div class='del'>-	iobuf = compat_alloc_user_space(sizeof(*iobuf));</div><div class='del'>-	iobuf32 = compat_ptr(arg);</div><div class='ctx'> </div><div class='del'>-	if (get_user(len, &amp;iobuf32-&gt;length) ||</div><div class='del'>-	    get_user(data, &amp;iobuf32-&gt;buffer))</div><div class='add'>+	if (get_user(data, &amp;iobuf32-&gt;buffer))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	datap = compat_ptr(data);</div><div class='del'>-	if (put_user(len, &amp;iobuf-&gt;length) ||</div><div class='del'>-	    put_user(datap, &amp;iobuf-&gt;buffer))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	err = do_vcc_ioctl(sock, cmd, (unsigned long) iobuf, 0);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (copy_in_user(&amp;iobuf32-&gt;length, &amp;iobuf-&gt;length,</div><div class='del'>-				 sizeof(int)))</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return atm_getnames(&amp;iobuf32-&gt;length, compat_ptr(data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int do_atmif_sioc(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 			 unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct atmif_sioc __user *sioc;</div><div class='del'>-	struct compat_atmif_sioc __user *sioc32;</div><div class='add'>+	struct compat_atmif_sioc __user *sioc32 = compat_ptr(arg);</div><div class='add'>+	int number;</div><div class='ctx'> 	u32 data;</div><div class='del'>-	void __user *datap;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sioc = compat_alloc_user_space(sizeof(*sioc));</div><div class='del'>-	sioc32 = compat_ptr(arg);</div><div class='ctx'> </div><div class='del'>-	if (copy_in_user(&amp;sioc-&gt;number, &amp;sioc32-&gt;number, 2 * sizeof(int)) ||</div><div class='del'>-	    get_user(data, &amp;sioc32-&gt;arg))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	datap = compat_ptr(data);</div><div class='del'>-	if (put_user(datap, &amp;sioc-&gt;arg))</div><div class='add'>+	if (get_user(data, &amp;sioc32-&gt;arg) || get_user(number, &amp;sioc32-&gt;number))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	err = do_vcc_ioctl(sock, cmd, (unsigned long) sioc, 0);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (copy_in_user(&amp;sioc32-&gt;length, &amp;sioc-&gt;length,</div><div class='del'>-				 sizeof(int)))</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return atm_dev_ioctl(cmd, compat_ptr(data), &amp;sioc32-&gt;length, number, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int do_atm_ioctl(struct socket *sock, unsigned int cmd32,</div><div class='head'>diff --git a/net/atm/lec.c b/net/atm/lec.c<br/>index d7f5cf5b7594..afb8d3eb2185 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/lec.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/lec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/lec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/lec.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * lec.c: Lan Emulation driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -123,6 +124,7 @@ static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='ctx'> </div><div class='ctx'> /* Device structures */</div><div class='ctx'> static struct net_device *dev_lec[MAX_LEC_ITF];</div><div class='add'>+static DEFINE_MUTEX(lec_mutex);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE)</div><div class='ctx'> static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)</div><div class='hunk'>@@ -180,6 +182,7 @@ static void</div><div class='ctx'> lec_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	unsigned int len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	ATM_SKB(skb)-&gt;vcc = vcc;</div><div class='ctx'> 	atm_account_tx(vcc, skb);</div><div class='hunk'>@@ -190,10 +193,10 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;stats.tx_packets++;</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+	dev-&gt;stats.tx_bytes += len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lec_tx_timeout(struct net_device *dev)</div><div class='add'>+static void lec_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("%s\n", dev-&gt;name);</div><div class='ctx'> 	netif_trans_update(dev);</div><div class='hunk'>@@ -339,12 +342,12 @@ static int lec_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	static const u8 zero_addr[ETH_ALEN] = {};</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct net_device *dev = (struct net_device *)vcc-&gt;proto_data;</div><div class='ctx'> 	struct lec_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct atmlec_msg *mesg;</div><div class='ctx'> 	struct lec_arp_table *entry;</div><div class='del'>-	int i;</div><div class='ctx'> 	char *tmp;		/* FIXME */</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(refcount_sub_and_test(skb-&gt;truesize, &amp;sk_atm(vcc)-&gt;sk_wmem_alloc));</div><div class='hunk'>@@ -354,12 +357,10 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 	pr_debug("%s: msg from zeppelin:%d\n", dev-&gt;name, mesg-&gt;type);</div><div class='ctx'> 	switch (mesg-&gt;type) {</div><div class='ctx'> 	case l_set_mac_addr:</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] = mesg-&gt;content.normal.mac_addr[i];</div><div class='add'>+		eth_hw_addr_set(dev, mesg-&gt;content.normal.mac_addr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case l_del_mac_addr:</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] = 0;</div><div class='add'>+		eth_hw_addr_set(dev, zero_addr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case l_addr_delete:</div><div class='ctx'> 		lec_addr_delete(priv, mesg-&gt;content.normal.atm_addr,</div><div class='hunk'>@@ -379,7 +380,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		if (mesg-&gt;content.normal.no_source_le_narp)</div><div class='ctx'> 			break;</div><div class='del'>-		/* FALL THROUGH */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case l_arp_update:</div><div class='ctx'> 		lec_arp_update(priv, mesg-&gt;content.normal.mac_addr,</div><div class='ctx'> 			       mesg-&gt;content.normal.atm_addr,</div><div class='hunk'>@@ -685,6 +686,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)</div><div class='ctx'> 	int bytes_left;</div><div class='ctx'> 	struct atmlec_ioc ioc_data;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;lec_mutex);</div><div class='ctx'> 	/* Lecd must be up in this case */</div><div class='ctx'> 	bytes_left = copy_from_user(&amp;ioc_data, arg, sizeof(struct atmlec_ioc));</div><div class='ctx'> 	if (bytes_left != 0)</div><div class='hunk'>@@ -710,7 +712,11 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> static int lec_mcast_attach(struct atm_vcc *vcc, int arg)</div><div class='ctx'> {</div><div class='del'>-	if (arg &lt; 0 || arg &gt;= MAX_LEC_ITF || !dev_lec[arg])</div><div class='add'>+	lockdep_assert_held(&amp;lec_mutex);</div><div class='add'>+	if (arg &lt; 0 || arg &gt;= MAX_LEC_ITF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	arg = array_index_nospec(arg, MAX_LEC_ITF);</div><div class='add'>+	if (!dev_lec[arg])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	vcc-&gt;proto_data = dev_lec[arg];</div><div class='ctx'> 	return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc);</div><div class='hunk'>@@ -722,12 +728,12 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct lec_priv *priv;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;lec_mutex);</div><div class='ctx'> 	if (arg &lt; 0)</div><div class='del'>-		i = 0;</div><div class='del'>-	else</div><div class='del'>-		i = arg;</div><div class='add'>+		arg = 0;</div><div class='ctx'> 	if (arg &gt;= MAX_LEC_ITF)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	i = array_index_nospec(arg, MAX_LEC_ITF);</div><div class='ctx'> 	if (!dev_lec[i]) {</div><div class='ctx'> 		int size;</div><div class='ctx'> </div><div class='hunk'>@@ -740,6 +746,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)</div><div class='ctx'> 		snprintf(dev_lec[i]-&gt;name, IFNAMSIZ, "lec%d", i);</div><div class='ctx'> 		if (register_netdev(dev_lec[i])) {</div><div class='ctx'> 			free_netdev(dev_lec[i]);</div><div class='add'>+			dev_lec[i] = NULL;</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -796,14 +803,9 @@ static const char *lec_arp_get_status_string(unsigned char status)</div><div class='ctx'> </div><div class='ctx'> static void lec_info(struct seq_file *seq, struct lec_arp_table *entry)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		seq_printf(seq, "%2.2x", entry-&gt;mac_addr[i] &amp; 0xff);</div><div class='del'>-	seq_printf(seq, " ");</div><div class='del'>-	for (i = 0; i &lt; ATM_ESA_LEN; i++)</div><div class='del'>-		seq_printf(seq, "%2.2x", entry-&gt;atm_addr[i] &amp; 0xff);</div><div class='del'>-	seq_printf(seq, " %s %4.4x", lec_arp_get_status_string(entry-&gt;status),</div><div class='add'>+	seq_printf(seq, "%pM ", entry-&gt;mac_addr);</div><div class='add'>+	seq_printf(seq, "%*phN ", ATM_ESA_LEN, entry-&gt;atm_addr);</div><div class='add'>+	seq_printf(seq, "%s %4.4x", lec_arp_get_status_string(entry-&gt;status),</div><div class='ctx'> 		   entry-&gt;flags &amp; 0xffff);</div><div class='ctx'> 	if (entry-&gt;vcc)</div><div class='ctx'> 		seq_printf(seq, "%3d %3d ", entry-&gt;vcc-&gt;vpi, entry-&gt;vcc-&gt;vci);</div><div class='hunk'>@@ -907,7 +909,6 @@ static void *lec_itf_walk(struct lec_state *state, loff_t *l)</div><div class='ctx'> 	v = (dev &amp;&amp; netdev_priv(dev)) ?</div><div class='ctx'> 		lec_priv_walk(state, l, netdev_priv(dev)) : NULL;</div><div class='ctx'> 	if (!v &amp;&amp; dev) {</div><div class='del'>-		dev_put(dev);</div><div class='ctx'> 		/* Partial state reset for the next time we get called */</div><div class='ctx'> 		dev = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -931,6 +932,7 @@ static void *lec_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct lec_state *state = seq-&gt;private;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;lec_mutex);</div><div class='ctx'> 	state-&gt;itf = 0;</div><div class='ctx'> 	state-&gt;dev = NULL;</div><div class='ctx'> 	state-&gt;locked = NULL;</div><div class='hunk'>@@ -948,17 +950,17 @@ static void lec_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	if (state-&gt;dev) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;state-&gt;locked-&gt;lec_arp_lock,</div><div class='ctx'> 				       state-&gt;flags);</div><div class='del'>-		dev_put(state-&gt;dev);</div><div class='add'>+		state-&gt;dev = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;lec_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *lec_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct lec_state *state = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	v = lec_get_idx(state, 1);</div><div class='del'>-	*pos += !!PTR_ERR(v);</div><div class='del'>-	return v;</div><div class='add'>+	++*pos;</div><div class='add'>+	return lec_get_idx(state, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lec_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -1007,6 +1009,7 @@ static int lane_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;lec_mutex);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case ATMLEC_CTRL:</div><div class='ctx'> 		err = lecd_attach(vcc, (int)arg);</div><div class='hunk'>@@ -1021,6 +1024,7 @@ static int lane_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;lec_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1072,7 +1076,7 @@ module_exit(lane_module_cleanup);</div><div class='ctx'> /*</div><div class='ctx'>  * LANE2: 3.1.3, LE_RESOLVE.request</div><div class='ctx'>  * Non force allocates memory and fills in *tlvs, fills in *sizeoftlvs.</div><div class='del'>- * If sizeoftlvs == NULL the default TLVs associated with with this</div><div class='add'>+ * If sizeoftlvs == NULL the default TLVs associated with this</div><div class='ctx'>  * lec will be used.</div><div class='ctx'>  * If dst_mac == NULL, targetless LE_ARP will be sent</div><div class='ctx'>  */</div><div class='hunk'>@@ -1266,6 +1270,12 @@ static void lec_arp_clear_vccs(struct lec_arp_table *entry)</div><div class='ctx'> 		entry-&gt;vcc = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (entry-&gt;recv_vcc) {</div><div class='add'>+		struct atm_vcc *vcc = entry-&gt;recv_vcc;</div><div class='add'>+		struct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc);</div><div class='add'>+</div><div class='add'>+		kfree(vpriv);</div><div class='add'>+		vcc-&gt;user_back = NULL;</div><div class='add'>+</div><div class='ctx'> 		entry-&gt;recv_vcc-&gt;push = entry-&gt;old_recv_push;</div><div class='ctx'> 		vcc_release_async(entry-&gt;recv_vcc, -EPIPE);</div><div class='ctx'> 		entry-&gt;recv_vcc = NULL;</div><div class='hunk'>@@ -1300,7 +1310,7 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	hlist_del(&amp;to_remove-&gt;next);</div><div class='del'>-	del_timer(&amp;to_remove-&gt;timer);</div><div class='add'>+	timer_delete(&amp;to_remove-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this is the only MAC connected to this VCC,</div><div class='hunk'>@@ -1351,7 +1361,7 @@ static void dump_arp_table(struct lec_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct lec_arp_table *rulla;</div><div class='ctx'> 	char buf[256];</div><div class='del'>-	int i, j, offset;</div><div class='add'>+	int i, offset;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Dump %p:\n", priv);</div><div class='ctx'> 	for (i = 0; i &lt; LEC_ARP_TABLE_SIZE; i++) {</div><div class='hunk'>@@ -1359,14 +1369,10 @@ static void dump_arp_table(struct lec_priv *priv)</div><div class='ctx'> 				     &amp;priv-&gt;lec_arp_tables[i], next) {</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 			offset += sprintf(buf, "%d: %p\n", i, rulla);</div><div class='del'>-			offset += sprintf(buf + offset, "Mac: %pM",</div><div class='add'>+			offset += sprintf(buf + offset, "Mac: %pM ",</div><div class='ctx'> 					  rulla-&gt;mac_addr);</div><div class='del'>-			offset += sprintf(buf + offset, " Atm:");</div><div class='del'>-			for (j = 0; j &lt; ATM_ESA_LEN; j++) {</div><div class='del'>-				offset += sprintf(buf + offset,</div><div class='del'>-						  "%2.2x ",</div><div class='del'>-						  rulla-&gt;atm_addr[j] &amp; 0xff);</div><div class='del'>-			}</div><div class='add'>+			offset += sprintf(buf + offset, "Atm: %*ph ", ATM_ESA_LEN,</div><div class='add'>+					  rulla-&gt;atm_addr);</div><div class='ctx'> 			offset += sprintf(buf + offset,</div><div class='ctx'> 					  "Vcc vpi:%d vci:%d, Recv_vcc vpi:%d vci:%d Last_used:%lx, Timestamp:%lx, No_tries:%d ",</div><div class='ctx'> 					  rulla-&gt;vcc ? rulla-&gt;vcc-&gt;vpi : 0,</div><div class='hunk'>@@ -1389,12 +1395,9 @@ static void dump_arp_table(struct lec_priv *priv)</div><div class='ctx'> 		pr_info("No forward\n");</div><div class='ctx'> 	hlist_for_each_entry(rulla, &amp;priv-&gt;lec_no_forward, next) {</div><div class='ctx'> 		offset = 0;</div><div class='del'>-		offset += sprintf(buf + offset, "Mac: %pM", rulla-&gt;mac_addr);</div><div class='del'>-		offset += sprintf(buf + offset, " Atm:");</div><div class='del'>-		for (j = 0; j &lt; ATM_ESA_LEN; j++) {</div><div class='del'>-			offset += sprintf(buf + offset, "%2.2x ",</div><div class='del'>-					  rulla-&gt;atm_addr[j] &amp; 0xff);</div><div class='del'>-		}</div><div class='add'>+		offset += sprintf(buf + offset, "Mac: %pM ", rulla-&gt;mac_addr);</div><div class='add'>+		offset += sprintf(buf + offset, "Atm: %*ph ", ATM_ESA_LEN,</div><div class='add'>+				  rulla-&gt;atm_addr);</div><div class='ctx'> 		offset += sprintf(buf + offset,</div><div class='ctx'> 				  "Vcc vpi:%d vci:%d, Recv_vcc vpi:%d vci:%d Last_used:%lx, Timestamp:%lx, No_tries:%d ",</div><div class='ctx'> 				  rulla-&gt;vcc ? rulla-&gt;vcc-&gt;vpi : 0,</div><div class='hunk'>@@ -1414,12 +1417,9 @@ static void dump_arp_table(struct lec_priv *priv)</div><div class='ctx'> 		pr_info("Empty ones\n");</div><div class='ctx'> 	hlist_for_each_entry(rulla, &amp;priv-&gt;lec_arp_empty_ones, next) {</div><div class='ctx'> 		offset = 0;</div><div class='del'>-		offset += sprintf(buf + offset, "Mac: %pM", rulla-&gt;mac_addr);</div><div class='del'>-		offset += sprintf(buf + offset, " Atm:");</div><div class='del'>-		for (j = 0; j &lt; ATM_ESA_LEN; j++) {</div><div class='del'>-			offset += sprintf(buf + offset, "%2.2x ",</div><div class='del'>-					  rulla-&gt;atm_addr[j] &amp; 0xff);</div><div class='del'>-		}</div><div class='add'>+		offset += sprintf(buf + offset, "Mac: %pM ", rulla-&gt;mac_addr);</div><div class='add'>+		offset += sprintf(buf + offset, "Atm: %*ph ", ATM_ESA_LEN,</div><div class='add'>+				  rulla-&gt;atm_addr);</div><div class='ctx'> 		offset += sprintf(buf + offset,</div><div class='ctx'> 				  "Vcc vpi:%d vci:%d, Recv_vcc vpi:%d vci:%d Last_used:%lx, Timestamp:%lx, No_tries:%d ",</div><div class='ctx'> 				  rulla-&gt;vcc ? rulla-&gt;vcc-&gt;vpi : 0,</div><div class='hunk'>@@ -1439,12 +1439,9 @@ static void dump_arp_table(struct lec_priv *priv)</div><div class='ctx'> 		pr_info("Multicast Forward VCCs\n");</div><div class='ctx'> 	hlist_for_each_entry(rulla, &amp;priv-&gt;mcast_fwds, next) {</div><div class='ctx'> 		offset = 0;</div><div class='del'>-		offset += sprintf(buf + offset, "Mac: %pM", rulla-&gt;mac_addr);</div><div class='del'>-		offset += sprintf(buf + offset, " Atm:");</div><div class='del'>-		for (j = 0; j &lt; ATM_ESA_LEN; j++) {</div><div class='del'>-			offset += sprintf(buf + offset, "%2.2x ",</div><div class='del'>-					  rulla-&gt;atm_addr[j] &amp; 0xff);</div><div class='del'>-		}</div><div class='add'>+		offset += sprintf(buf + offset, "Mac: %pM ", rulla-&gt;mac_addr);</div><div class='add'>+		offset += sprintf(buf + offset, "Atm: %*ph ", ATM_ESA_LEN,</div><div class='add'>+				  rulla-&gt;atm_addr);</div><div class='ctx'> 		offset += sprintf(buf + offset,</div><div class='ctx'> 				  "Vcc vpi:%d vci:%d, Recv_vcc vpi:%d vci:%d Last_used:%lx, Timestamp:%lx, No_tries:%d ",</div><div class='ctx'> 				  rulla-&gt;vcc ? rulla-&gt;vcc-&gt;vpi : 0,</div><div class='hunk'>@@ -1493,7 +1490,7 @@ static void lec_arp_destroy(struct lec_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(entry, next,</div><div class='ctx'> 				  &amp;priv-&gt;lec_arp_empty_ones, next) {</div><div class='del'>-		del_timer_sync(&amp;entry-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;entry-&gt;timer);</div><div class='ctx'> 		lec_arp_clear_vccs(entry);</div><div class='ctx'> 		hlist_del(&amp;entry-&gt;next);</div><div class='ctx'> 		lec_arp_put(entry);</div><div class='hunk'>@@ -1502,7 +1499,7 @@ static void lec_arp_destroy(struct lec_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(entry, next,</div><div class='ctx'> 				  &amp;priv-&gt;lec_no_forward, next) {</div><div class='del'>-		del_timer_sync(&amp;entry-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;entry-&gt;timer);</div><div class='ctx'> 		lec_arp_clear_vccs(entry);</div><div class='ctx'> 		hlist_del(&amp;entry-&gt;next);</div><div class='ctx'> 		lec_arp_put(entry);</div><div class='hunk'>@@ -1545,10 +1542,8 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv,</div><div class='ctx'> 	struct lec_arp_table *to_return;</div><div class='ctx'> </div><div class='ctx'> 	to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);</div><div class='del'>-	if (!to_return) {</div><div class='del'>-		pr_info("LEC: Arp entry kmalloc failed\n");</div><div class='add'>+	if (!to_return)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	ether_addr_copy(to_return-&gt;mac_addr, mac_addr);</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;to_return-&gt;next);</div><div class='ctx'> 	timer_setup(&amp;to_return-&gt;timer, lec_arp_expire_arp, 0);</div><div class='hunk'>@@ -1564,7 +1559,7 @@ static void lec_arp_expire_arp(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct lec_arp_table *entry;</div><div class='ctx'> </div><div class='del'>-	entry = from_timer(entry, t, timer);</div><div class='add'>+	entry = timer_container_of(entry, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("\n");</div><div class='ctx'> 	if (entry-&gt;status == ESI_ARP_PENDING) {</div><div class='hunk'>@@ -1585,10 +1580,11 @@ static void lec_arp_expire_arp(struct timer_list *t)</div><div class='ctx'> static void lec_arp_expire_vcc(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct lec_arp_table *to_remove = from_timer(to_remove, t, timer);</div><div class='add'>+	struct lec_arp_table *to_remove = timer_container_of(to_remove, t,</div><div class='add'>+							     timer);</div><div class='ctx'> 	struct lec_priv *priv = to_remove-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;to_remove-&gt;timer);</div><div class='add'>+	timer_delete(&amp;to_remove-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%p %p: vpi:%d vci:%d\n",</div><div class='ctx'> 		 to_remove, priv,</div><div class='hunk'>@@ -1856,16 +1852,16 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,</div><div class='ctx'> 					  &amp;priv-&gt;lec_arp_empty_ones, next) {</div><div class='ctx'> 			if (memcmp(entry-&gt;atm_addr, atm_addr, ATM_ESA_LEN) == 0) {</div><div class='ctx'> 				hlist_del(&amp;entry-&gt;next);</div><div class='del'>-				del_timer(&amp;entry-&gt;timer);</div><div class='add'>+				timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 				tmp = lec_arp_find(priv, mac_addr);</div><div class='ctx'> 				if (tmp) {</div><div class='del'>-					del_timer(&amp;tmp-&gt;timer);</div><div class='add'>+					timer_delete(&amp;tmp-&gt;timer);</div><div class='ctx'> 					tmp-&gt;status = ESI_FORWARD_DIRECT;</div><div class='ctx'> 					memcpy(tmp-&gt;atm_addr, atm_addr, ATM_ESA_LEN);</div><div class='ctx'> 					tmp-&gt;vcc = entry-&gt;vcc;</div><div class='ctx'> 					tmp-&gt;old_push = entry-&gt;old_push;</div><div class='ctx'> 					tmp-&gt;last_used = jiffies;</div><div class='del'>-					del_timer(&amp;entry-&gt;timer);</div><div class='add'>+					timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 					lec_arp_put(entry);</div><div class='ctx'> 					entry = tmp;</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -1896,7 +1892,7 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,</div><div class='ctx'> 		/* Temporary, changes before end of function */</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(entry-&gt;atm_addr, atm_addr, ATM_ESA_LEN);</div><div class='del'>-	del_timer(&amp;entry-&gt;timer);</div><div class='add'>+	timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 	for (i = 0; i &lt; LEC_ARP_TABLE_SIZE; i++) {</div><div class='ctx'> 		hlist_for_each_entry(tmp,</div><div class='ctx'> 				     &amp;priv-&gt;lec_arp_tables[i], next) {</div><div class='hunk'>@@ -1959,7 +1955,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,</div><div class='ctx'> 		entry = make_entry(priv, bus_mac);</div><div class='ctx'> 		if (entry == NULL)</div><div class='ctx'> 			goto out;</div><div class='del'>-		del_timer(&amp;entry-&gt;timer);</div><div class='add'>+		timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 		memcpy(entry-&gt;atm_addr, ioc_data-&gt;atm_addr, ATM_ESA_LEN);</div><div class='ctx'> 		entry-&gt;recv_vcc = vcc;</div><div class='ctx'> 		entry-&gt;old_recv_push = old_push;</div><div class='hunk'>@@ -1970,17 +1966,8 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,</div><div class='ctx'> 		 * Vcc which we don't want to make default vcc,</div><div class='ctx'> 		 * attach it anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		pr_debug("LEC_ARP:Attaching data direct, not default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",</div><div class='del'>-			 ioc_data-&gt;atm_addr[0], ioc_data-&gt;atm_addr[1],</div><div class='del'>-			 ioc_data-&gt;atm_addr[2], ioc_data-&gt;atm_addr[3],</div><div class='del'>-			 ioc_data-&gt;atm_addr[4], ioc_data-&gt;atm_addr[5],</div><div class='del'>-			 ioc_data-&gt;atm_addr[6], ioc_data-&gt;atm_addr[7],</div><div class='del'>-			 ioc_data-&gt;atm_addr[8], ioc_data-&gt;atm_addr[9],</div><div class='del'>-			 ioc_data-&gt;atm_addr[10], ioc_data-&gt;atm_addr[11],</div><div class='del'>-			 ioc_data-&gt;atm_addr[12], ioc_data-&gt;atm_addr[13],</div><div class='del'>-			 ioc_data-&gt;atm_addr[14], ioc_data-&gt;atm_addr[15],</div><div class='del'>-			 ioc_data-&gt;atm_addr[16], ioc_data-&gt;atm_addr[17],</div><div class='del'>-			 ioc_data-&gt;atm_addr[18], ioc_data-&gt;atm_addr[19]);</div><div class='add'>+		pr_debug("LEC_ARP:Attaching data direct, not default: %*phN\n",</div><div class='add'>+			 ATM_ESA_LEN, ioc_data-&gt;atm_addr);</div><div class='ctx'> 		entry = make_entry(priv, bus_mac);</div><div class='ctx'> 		if (entry == NULL)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1996,17 +1983,8 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,</div><div class='ctx'> 		dump_arp_table(priv);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug("LEC_ARP:Attaching data direct, default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",</div><div class='del'>-		 ioc_data-&gt;atm_addr[0], ioc_data-&gt;atm_addr[1],</div><div class='del'>-		 ioc_data-&gt;atm_addr[2], ioc_data-&gt;atm_addr[3],</div><div class='del'>-		 ioc_data-&gt;atm_addr[4], ioc_data-&gt;atm_addr[5],</div><div class='del'>-		 ioc_data-&gt;atm_addr[6], ioc_data-&gt;atm_addr[7],</div><div class='del'>-		 ioc_data-&gt;atm_addr[8], ioc_data-&gt;atm_addr[9],</div><div class='del'>-		 ioc_data-&gt;atm_addr[10], ioc_data-&gt;atm_addr[11],</div><div class='del'>-		 ioc_data-&gt;atm_addr[12], ioc_data-&gt;atm_addr[13],</div><div class='del'>-		 ioc_data-&gt;atm_addr[14], ioc_data-&gt;atm_addr[15],</div><div class='del'>-		 ioc_data-&gt;atm_addr[16], ioc_data-&gt;atm_addr[17],</div><div class='del'>-		 ioc_data-&gt;atm_addr[18], ioc_data-&gt;atm_addr[19]);</div><div class='add'>+	pr_debug("LEC_ARP:Attaching data direct, default: %*phN\n",</div><div class='add'>+		 ATM_ESA_LEN, ioc_data-&gt;atm_addr);</div><div class='ctx'> 	for (i = 0; i &lt; LEC_ARP_TABLE_SIZE; i++) {</div><div class='ctx'> 		hlist_for_each_entry(entry,</div><div class='ctx'> 				     &amp;priv-&gt;lec_arp_tables[i], next) {</div><div class='hunk'>@@ -2019,7 +1997,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,</div><div class='ctx'> 					 entry-&gt;recv_vcc ? entry-&gt;recv_vcc-&gt;</div><div class='ctx'> 					 vci : 0);</div><div class='ctx'> 				found_entry = 1;</div><div class='del'>-				del_timer(&amp;entry-&gt;timer);</div><div class='add'>+				timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 				entry-&gt;vcc = vcc;</div><div class='ctx'> 				entry-&gt;old_push = old_push;</div><div class='ctx'> 				if (entry-&gt;status == ESI_VC_PENDING) {</div><div class='hunk'>@@ -2203,7 +2181,7 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)</div><div class='ctx'> 				  &amp;priv-&gt;lec_arp_empty_ones, next) {</div><div class='ctx'> 		if (entry-&gt;vcc == vcc) {</div><div class='ctx'> 			lec_arp_clear_vccs(entry);</div><div class='del'>-			del_timer(&amp;entry-&gt;timer);</div><div class='add'>+			timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 			hlist_del(&amp;entry-&gt;next);</div><div class='ctx'> 			lec_arp_put(entry);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2213,7 +2191,7 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)</div><div class='ctx'> 				  &amp;priv-&gt;lec_no_forward, next) {</div><div class='ctx'> 		if (entry-&gt;recv_vcc == vcc) {</div><div class='ctx'> 			lec_arp_clear_vccs(entry);</div><div class='del'>-			del_timer(&amp;entry-&gt;timer);</div><div class='add'>+			timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 			hlist_del(&amp;entry-&gt;next);</div><div class='ctx'> 			lec_arp_put(entry);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2246,7 +2224,7 @@ lec_arp_check_empties(struct lec_priv *priv,</div><div class='ctx'> 	hlist_for_each_entry_safe(entry, next,</div><div class='ctx'> 				  &amp;priv-&gt;lec_arp_empty_ones, next) {</div><div class='ctx'> 		if (vcc == entry-&gt;vcc) {</div><div class='del'>-			del_timer(&amp;entry-&gt;timer);</div><div class='add'>+			timer_delete(&amp;entry-&gt;timer);</div><div class='ctx'> 			ether_addr_copy(entry-&gt;mac_addr, src);</div><div class='ctx'> 			entry-&gt;status = ESI_FORWARD_DIRECT;</div><div class='ctx'> 			entry-&gt;last_used = jiffies;</div><div class='hunk'>@@ -2266,4 +2244,5 @@ out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lec_arp_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ATM LAN Emulation (LANE) support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/atm/lec_arpc.h b/net/atm/lec_arpc.h<br/>index 1205d8792d28..39115fe074c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/lec_arpc.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/lec_arpc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/lec_arpc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/lec_arpc.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ struct lec_arp_table {</div><div class='ctx'> 	u8 *tlvs;</div><div class='ctx'> 	u32 sizeoftlvs;			/*</div><div class='ctx'> 					 * LANE2: Each MAC address can have TLVs</div><div class='del'>-					 * associated with it.  sizeoftlvs tells the</div><div class='add'>+					 * associated with it.  sizeoftlvs tells</div><div class='ctx'> 					 * the length of the tlvs array</div><div class='ctx'> 					 */</div><div class='ctx'> 	struct sk_buff_head tx_wait;	/* wait queue for outgoing packets */</div><div class='head'>diff --git a/net/atm/mpc.c b/net/atm/mpc.c<br/>index 24b53c4c39c6..f6b447bba329 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/mpc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/mpc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/mpc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -803,7 +804,7 @@ static int atm_mpoa_mpoad_attach(struct atm_vcc *vcc, int arg)</div><div class='ctx'> 		/* This lets us now how our LECs are doing */</div><div class='ctx'> 		err = register_netdevice_notifier(&amp;mpoa_notifier);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			del_timer(&amp;mpc_timer);</div><div class='add'>+			timer_delete(&amp;mpc_timer);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1313,6 +1314,8 @@ static void MPOA_cache_impos_rcvd(struct k_message *msg,</div><div class='ctx'> 	holding_time = msg-&gt;content.eg_info.holding_time;</div><div class='ctx'> 	dprintk("(%s) entry = %p, holding_time = %u\n",</div><div class='ctx'> 		mpc-&gt;dev-&gt;name, entry, holding_time);</div><div class='add'>+	if (entry == NULL &amp;&amp; !holding_time)</div><div class='add'>+		return;</div><div class='ctx'> 	if (entry == NULL &amp;&amp; holding_time) {</div><div class='ctx'> 		entry = mpc-&gt;eg_ops-&gt;add_entry(msg, mpc);</div><div class='ctx'> 		mpc-&gt;eg_ops-&gt;put(entry);</div><div class='hunk'>@@ -1492,7 +1495,7 @@ static void __exit atm_mpoa_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> 	mpc_proc_clean();</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;mpc_timer);</div><div class='add'>+	timer_delete_sync(&amp;mpc_timer);</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;mpoa_notifier);</div><div class='ctx'> 	deregister_atm_ioctl(&amp;atm_ioctl_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -1531,4 +1534,5 @@ static void __exit atm_mpoa_cleanup(void)</div><div class='ctx'> module_init(atm_mpoa_init);</div><div class='ctx'> module_exit(atm_mpoa_cleanup);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Multi-Protocol Over ATM (MPOA) driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c<br/>index 4bb418313720..f7a2f0e41105 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/mpoa_caches.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpoa_caches.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/mpoa_caches.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/mpoa_caches.c</a></div><div class='hunk'>@@ -180,8 +180,7 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)</div><div class='ctx'> static void in_cache_put(in_cache_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;entry-&gt;use)) {</div><div class='del'>-		memset(entry, 0, sizeof(in_cache_entry));</div><div class='del'>-		kfree(entry);</div><div class='add'>+		kfree_sensitive(entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -416,8 +415,7 @@ static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr,</div><div class='ctx'> static void eg_cache_put(eg_cache_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;entry-&gt;use)) {</div><div class='del'>-		memset(entry, 0, sizeof(eg_cache_entry));</div><div class='del'>-		kfree(entry);</div><div class='add'>+		kfree_sensitive(entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c<br/>index 46d6cd9a36ae..aaf64b953915 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/mpoa_proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/mpoa_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/mpoa_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/mpoa_proc.c</a></div><div class='hunk'>@@ -53,15 +53,12 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff,</div><div class='ctx'> </div><div class='ctx'> static int parse_qos(const char *buff);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *   Define allowed FILE OPERATIONS</div><div class='del'>- */</div><div class='del'>-static const struct file_operations mpc_file_operations = {</div><div class='del'>-	.open =		proc_mpc_open,</div><div class='del'>-	.read =		seq_read,</div><div class='del'>-	.llseek =	seq_lseek,</div><div class='del'>-	.write =	proc_mpc_write,</div><div class='del'>-	.release =	seq_release,</div><div class='add'>+static const struct proc_ops mpc_proc_ops = {</div><div class='add'>+	.proc_open	= proc_mpc_open,</div><div class='add'>+	.proc_read	= seq_read,</div><div class='add'>+	.proc_lseek	= seq_lseek,</div><div class='add'>+	.proc_write	= proc_mpc_write,</div><div class='add'>+	.proc_release	= seq_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -222,11 +219,12 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff,</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (p = page, len = 0; len &lt; nbytes; p++, len++) {</div><div class='add'>+	for (p = page, len = 0; len &lt; nbytes; p++) {</div><div class='ctx'> 		if (get_user(*p, buff++)) {</div><div class='ctx'> 			free_page((unsigned long)page);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='add'>+		len += 1;</div><div class='ctx'> 		if (*p == '\0' || *p == '\n')</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -290,7 +288,7 @@ int mpc_proc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *p;</div><div class='ctx'> </div><div class='del'>-	p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &amp;mpc_file_operations);</div><div class='add'>+	p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &amp;mpc_proc_ops);</div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		pr_err("Unable to initialize /proc/atm/%s\n", STAT_FILE_NAME);</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c<br/>index d84227d75717..3e4f17d335fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/pppoatm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/pppoatm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/pppoatm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/pppoatm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* net/atm/pppoatm.c - RFC2364 PPP over ATM/AAL5 */</div><div class='ctx'> </div><div class='ctx'> /* Copyright 1999-2000 by Mitchell Blank Jr */</div><div class='hunk'>@@ -6,10 +7,6 @@</div><div class='ctx'> /* And help from Jens Axboe */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver provides the encapsulation and framing for sending</div><div class='ctx'>  * and receiving PPP frames in ATM AAL5 PDUs.</div><div class='hunk'>@@ -104,9 +101,11 @@ static inline struct pppoatm_vcc *chan_to_pvcc(const struct ppp_channel *chan)</div><div class='ctx'>  * doesn't want to be called in interrupt context, so we do it from</div><div class='ctx'>  * a tasklet</div><div class='ctx'>  */</div><div class='del'>-static void pppoatm_wakeup_sender(unsigned long arg)</div><div class='add'>+static void pppoatm_wakeup_sender(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	ppp_output_wakeup((struct ppp_channel *) arg);</div><div class='add'>+	struct pppoatm_vcc *pvcc = from_tasklet(pvcc, t, wakeup_tasklet);</div><div class='add'>+</div><div class='add'>+	ppp_output_wakeup(&amp;pvcc-&gt;chan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pppoatm_release_cb(struct atm_vcc *atmvcc)</div><div class='hunk'>@@ -219,9 +218,7 @@ static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)</div><div class='ctx'> 			pvcc-&gt;chan.mtu += LLC_LEN;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		pr_debug("Couldn't autodetect yet (skb: %02X %02X %02X %02X %02X %02X)\n",</div><div class='del'>-			 skb-&gt;data[0], skb-&gt;data[1], skb-&gt;data[2],</div><div class='del'>-			 skb-&gt;data[3], skb-&gt;data[4], skb-&gt;data[5]);</div><div class='add'>+		pr_debug("Couldn't autodetect yet (skb: %6ph)\n", skb-&gt;data);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	case e_vc:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -394,11 +391,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)</div><div class='ctx'> 	struct atm_backend_ppp be;</div><div class='ctx'> 	struct pppoatm_vcc *pvcc;</div><div class='ctx'> 	int err;</div><div class='del'>-	/*</div><div class='del'>-	 * Each PPPoATM instance has its own tasklet - this is just a</div><div class='del'>-	 * prototypical one used to initialize them</div><div class='del'>-	 */</div><div class='del'>-	static const DECLARE_TASKLET(tasklet_proto, pppoatm_wakeup_sender, 0);</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;be, arg, sizeof be))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &amp;&amp;</div><div class='hunk'>@@ -420,8 +413,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)</div><div class='ctx'> 	pvcc-&gt;chan.ops = &amp;pppoatm_ops;</div><div class='ctx'> 	pvcc-&gt;chan.mtu = atmvcc-&gt;qos.txtp.max_sdu - PPP_HDRLEN -</div><div class='ctx'> 	    (be.encaps == e_vc ? 0 : LLC_LEN);</div><div class='del'>-	pvcc-&gt;wakeup_tasklet = tasklet_proto;</div><div class='del'>-	pvcc-&gt;wakeup_tasklet.data = (unsigned long) &amp;pvcc-&gt;chan;</div><div class='add'>+	tasklet_setup(&amp;pvcc-&gt;wakeup_tasklet, pppoatm_wakeup_sender);</div><div class='ctx'> 	err = ppp_register_channel(&amp;pvcc-&gt;chan);</div><div class='ctx'> 	if (err != 0) {</div><div class='ctx'> 		kfree(pvcc);</div><div class='head'>diff --git a/net/atm/proc.c b/net/atm/proc.c<br/>index 0b0495a41bbe..9bf736290e48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/proc.c</a></div><div class='hunk'>@@ -36,9 +36,9 @@</div><div class='ctx'> static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,</div><div class='ctx'> 				 size_t count, loff_t *pos);</div><div class='ctx'> </div><div class='del'>-static const struct file_operations proc_atm_dev_ops = {</div><div class='del'>-	.read =		proc_dev_atm_read,</div><div class='del'>-	.llseek =	noop_llseek,</div><div class='add'>+static const struct proc_ops atm_dev_proc_ops = {</div><div class='add'>+	.proc_read	= proc_dev_atm_read,</div><div class='add'>+	.proc_lseek	= noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void add_stats(struct seq_file *seq, const char *aal,</div><div class='hunk'>@@ -108,7 +108,7 @@ out:</div><div class='ctx'> static inline void *vcc_walk(struct seq_file *seq, loff_t l)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcc_state *state = seq-&gt;private;</div><div class='del'>-	int family = (uintptr_t)(PDE_DATA(file_inode(seq-&gt;file)));</div><div class='add'>+	int family = (uintptr_t)(pde_data(file_inode(seq-&gt;file)));</div><div class='ctx'> </div><div class='ctx'> 	return __vcc_walk(&amp;state-&gt;sk, family, &amp;state-&gt;bucket, l) ?</div><div class='ctx'> 	       state : NULL;</div><div class='hunk'>@@ -134,7 +134,7 @@ static void vcc_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	v = vcc_walk(seq, 1);</div><div class='del'>-	*pos += !!PTR_ERR(v);</div><div class='add'>+	(*pos)++;</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +324,7 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,</div><div class='ctx'> 	page = get_zeroed_page(GFP_KERNEL);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	dev = PDE_DATA(file_inode(file));</div><div class='add'>+	dev = pde_data(file_inode(file));</div><div class='ctx'> 	if (!dev-&gt;ops-&gt;proc_read)</div><div class='ctx'> 		length = -EINVAL;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -359,7 +359,7 @@ int atm_proc_dev_register(struct atm_dev *dev)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;proc_entry = proc_create_data(dev-&gt;proc_name, 0, atm_proc_root,</div><div class='del'>-					   &amp;proc_atm_dev_ops, dev);</div><div class='add'>+					   &amp;atm_dev_proc_ops, dev);</div><div class='ctx'> 	if (!dev-&gt;proc_entry)</div><div class='ctx'> 		goto err_free_name;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/atm/pvc.c b/net/atm/pvc.c<br/>index 2cb10af16afc..8f5e76f5dd9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/pvc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/pvc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/pvc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/pvc.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@ static int pvc_shutdown(struct socket *sock, int how)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,</div><div class='add'>+static int pvc_bind(struct socket *sock, struct sockaddr_unsized *sockaddr,</div><div class='ctx'> 		    int sockaddr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -56,14 +56,14 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,</div><div class='add'>+static int pvc_connect(struct socket *sock, struct sockaddr_unsized *sockaddr,</div><div class='ctx'> 		       int sockaddr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return pvc_bind(sock, sockaddr, sockaddr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pvc_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -118,6 +118,7 @@ static const struct proto_ops pvc_proto_ops = {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl = vcc_compat_ioctl,</div><div class='ctx'> #endif</div><div class='add'>+	.gettstamp =	sock_gettstamp,</div><div class='ctx'> 	.listen =	sock_no_listen,</div><div class='ctx'> 	.shutdown =	pvc_shutdown,</div><div class='ctx'> 	.setsockopt =	pvc_setsockopt,</div><div class='hunk'>@@ -125,7 +126,6 @@ static const struct proto_ops pvc_proto_ops = {</div><div class='ctx'> 	.sendmsg =	vcc_sendmsg,</div><div class='ctx'> 	.recvmsg =	vcc_recvmsg,</div><div class='ctx'> 	.mmap =		sock_no_mmap,</div><div class='del'>-	.sendpage =	sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/net/atm/raw.c b/net/atm/raw.c<br/>index b3ba44aab0ee..1e6511ec842c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/raw.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static void atm_pop_raw(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("(%d) %d -= %d\n",</div><div class='ctx'> 		 vcc-&gt;vci, sk_wmem_alloc_get(sk), ATM_SKB(skb)-&gt;acct_truesize);</div><div class='del'>-	WARN_ON(refcount_sub_and_test(ATM_SKB(skb)-&gt;acct_truesize, &amp;sk-&gt;sk_wmem_alloc));</div><div class='add'>+	atm_return_tx(vcc, skb);</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> 	sk-&gt;sk_write_space(sk);</div><div class='ctx'> }</div><div class='hunk'>@@ -54,6 +54,8 @@ static int atm_send_aal0(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	}</div><div class='add'>+	if (vcc-&gt;dev-&gt;ops-&gt;send_bh)</div><div class='add'>+		return vcc-&gt;dev-&gt;ops-&gt;send_bh(vcc, skb);</div><div class='ctx'> 	return vcc-&gt;dev-&gt;ops-&gt;send(vcc, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +73,10 @@ int atm_init_aal34(struct atm_vcc *vcc)</div><div class='ctx'> 	vcc-&gt;push = atm_push_raw;</div><div class='ctx'> 	vcc-&gt;pop = atm_pop_raw;</div><div class='ctx'> 	vcc-&gt;push_oam = NULL;</div><div class='del'>-	vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send;</div><div class='add'>+	if (vcc-&gt;dev-&gt;ops-&gt;send_bh)</div><div class='add'>+		vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send_bh;</div><div class='add'>+	else</div><div class='add'>+		vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +85,10 @@ int atm_init_aal5(struct atm_vcc *vcc)</div><div class='ctx'> 	vcc-&gt;push = atm_push_raw;</div><div class='ctx'> 	vcc-&gt;pop = atm_pop_raw;</div><div class='ctx'> 	vcc-&gt;push_oam = NULL;</div><div class='del'>-	vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send;</div><div class='add'>+	if (vcc-&gt;dev-&gt;ops-&gt;send_bh)</div><div class='add'>+		vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send_bh;</div><div class='add'>+	else</div><div class='add'>+		vcc-&gt;send = vcc-&gt;dev-&gt;ops-&gt;send;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(atm_init_aal5);</div><div class='head'>diff --git a/net/atm/resources.c b/net/atm/resources.c<br/>index bada395ecdb1..7c6fdedbcf4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/resources.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/resources.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/resources.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/resources.c</a></div><div class='hunk'>@@ -52,10 +52,8 @@ static struct atm_dev *__alloc_atm_dev(const char *type)</div><div class='ctx'> static struct atm_dev *__atm_dev_lookup(int number)</div><div class='ctx'> {</div><div class='ctx'> 	struct atm_dev *dev;</div><div class='del'>-	struct list_head *p;</div><div class='ctx'> </div><div class='del'>-	list_for_each(p, &amp;atm_devs) {</div><div class='del'>-		dev = list_entry(p, struct atm_dev, dev_list);</div><div class='add'>+	list_for_each_entry(dev, &amp;atm_devs, dev_list) {</div><div class='ctx'> 		if (dev-&gt;number == number) {</div><div class='ctx'> 			atm_dev_hold(dev);</div><div class='ctx'> 			return dev;</div><div class='hunk'>@@ -114,7 +112,9 @@ struct atm_dev *atm_dev_register(const char *type, struct device *parent,</div><div class='ctx'> </div><div class='ctx'> 	if (atm_proc_dev_register(dev) &lt; 0) {</div><div class='ctx'> 		pr_err("atm_proc_dev_register failed for dev %s\n", type);</div><div class='del'>-		goto out_fail;</div><div class='add'>+		mutex_unlock(&amp;atm_dev_mutex);</div><div class='add'>+		kfree(dev);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atm_register_sysfs(dev, parent) &lt; 0) {</div><div class='hunk'>@@ -130,7 +130,7 @@ out:</div><div class='ctx'> 	return dev;</div><div class='ctx'> </div><div class='ctx'> out_fail:</div><div class='del'>-	kfree(dev);</div><div class='add'>+	put_device(&amp;dev-&gt;class_dev);</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='hunk'>@@ -148,11 +148,10 @@ void atm_dev_deregister(struct atm_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;atm_dev_mutex);</div><div class='ctx'> 	list_del(&amp;dev-&gt;dev_list);</div><div class='del'>-	mutex_unlock(&amp;atm_dev_mutex);</div><div class='del'>-</div><div class='ctx'> 	atm_dev_release_vccs(dev);</div><div class='ctx'> 	atm_unregister_sysfs(dev);</div><div class='ctx'> 	atm_proc_dev_deregister(dev);</div><div class='add'>+	mutex_unlock(&amp;atm_dev_mutex);</div><div class='ctx'> </div><div class='ctx'> 	atm_dev_put(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -193,92 +192,47 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg,</div><div class='ctx'> 	return error ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)</div><div class='add'>+int atm_getnames(void __user *buf, int __user *iobuf_len)</div><div class='ctx'> {</div><div class='del'>-	void __user *buf;</div><div class='del'>-	int error, len, number, size = 0;</div><div class='add'>+	int error, len, size = 0;</div><div class='ctx'> 	struct atm_dev *dev;</div><div class='ctx'> 	struct list_head *p;</div><div class='ctx'> 	int *tmp_buf, *tmp_p;</div><div class='del'>-	int __user *sioc_len;</div><div class='del'>-	int __user *iobuf_len;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_COMPAT</div><div class='del'>-	compat = 0; /* Just so the compiler _knows_ */</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case ATM_GETNAMES:</div><div class='del'>-		if (compat) {</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-			struct compat_atm_iobuf __user *ciobuf = arg;</div><div class='del'>-			compat_uptr_t cbuf;</div><div class='del'>-			iobuf_len = &amp;ciobuf-&gt;length;</div><div class='del'>-			if (get_user(cbuf, &amp;ciobuf-&gt;buffer))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			buf = compat_ptr(cbuf);</div><div class='del'>-#endif</div><div class='del'>-		} else {</div><div class='del'>-			struct atm_iobuf __user *iobuf = arg;</div><div class='del'>-			iobuf_len = &amp;iobuf-&gt;length;</div><div class='del'>-			if (get_user(buf, &amp;iobuf-&gt;buffer))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		if (get_user(len, iobuf_len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		mutex_lock(&amp;atm_dev_mutex);</div><div class='del'>-		list_for_each(p, &amp;atm_devs)</div><div class='del'>-			size += sizeof(int);</div><div class='del'>-		if (size &gt; len) {</div><div class='del'>-			mutex_unlock(&amp;atm_dev_mutex);</div><div class='del'>-			return -E2BIG;</div><div class='del'>-		}</div><div class='del'>-		tmp_buf = kmalloc(size, GFP_ATOMIC);</div><div class='del'>-		if (!tmp_buf) {</div><div class='del'>-			mutex_unlock(&amp;atm_dev_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		tmp_p = tmp_buf;</div><div class='del'>-		list_for_each(p, &amp;atm_devs) {</div><div class='del'>-			dev = list_entry(p, struct atm_dev, dev_list);</div><div class='del'>-			*tmp_p++ = dev-&gt;number;</div><div class='del'>-		}</div><div class='add'>+	if (get_user(len, iobuf_len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	mutex_lock(&amp;atm_dev_mutex);</div><div class='add'>+	list_for_each(p, &amp;atm_devs)</div><div class='add'>+		size += sizeof(int);</div><div class='add'>+	if (size &gt; len) {</div><div class='ctx'> 		mutex_unlock(&amp;atm_dev_mutex);</div><div class='del'>-		error = ((copy_to_user(buf, tmp_buf, size)) ||</div><div class='del'>-			 put_user(size, iobuf_len))</div><div class='del'>-			? -EFAULT : 0;</div><div class='del'>-		kfree(tmp_buf);</div><div class='del'>-		return error;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+		return -E2BIG;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (compat) {</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		struct compat_atmif_sioc __user *csioc = arg;</div><div class='del'>-		compat_uptr_t carg;</div><div class='del'>-</div><div class='del'>-		sioc_len = &amp;csioc-&gt;length;</div><div class='del'>-		if (get_user(carg, &amp;csioc-&gt;arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		buf = compat_ptr(carg);</div><div class='del'>-</div><div class='del'>-		if (get_user(len, &amp;csioc-&gt;length))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (get_user(number, &amp;csioc-&gt;number))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		struct atmif_sioc __user *sioc = arg;</div><div class='del'>-</div><div class='del'>-		sioc_len = &amp;sioc-&gt;length;</div><div class='del'>-		if (get_user(buf, &amp;sioc-&gt;arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (get_user(len, &amp;sioc-&gt;length))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (get_user(number, &amp;sioc-&gt;number))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	tmp_buf = kmalloc(size, GFP_ATOMIC);</div><div class='add'>+	if (!tmp_buf) {</div><div class='add'>+		mutex_unlock(&amp;atm_dev_mutex);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	tmp_p = tmp_buf;</div><div class='add'>+	list_for_each_entry(dev, &amp;atm_devs, dev_list) {</div><div class='add'>+		*tmp_p++ = dev-&gt;number;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;atm_dev_mutex);</div><div class='add'>+	error = ((copy_to_user(buf, tmp_buf, size)) ||</div><div class='add'>+		 put_user(size, iobuf_len))</div><div class='add'>+		? -EFAULT : 0;</div><div class='add'>+	kfree(tmp_buf);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int atm_dev_ioctl(unsigned int cmd, void __user *buf, int __user *sioc_len,</div><div class='add'>+		  int number, int compat)</div><div class='add'>+{</div><div class='add'>+	int error, len, size = 0;</div><div class='add'>+	struct atm_dev *dev;</div><div class='add'>+</div><div class='add'>+	if (get_user(len, sioc_len))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	dev = try_then_request_module(atm_dev_lookup(number), "atm-device-%d",</div><div class='ctx'> 				      number);</div><div class='hunk'>@@ -310,7 +264,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='del'>-	/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ATM_SETESIF:</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned char esi[ESI_LEN];</div><div class='hunk'>@@ -332,7 +286,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)</div><div class='ctx'> 			error = -EPERM;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ATM_GETSTAT:</div><div class='ctx'> 		size = sizeof(struct atm_dev_stats);</div><div class='ctx'> 		error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ);</div><div class='hunk'>@@ -405,7 +359,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)</div><div class='ctx'> 			error = -EINVAL;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ATM_SETCIRANGE:</div><div class='ctx'> 	case SONET_GETSTATZ:</div><div class='ctx'> 	case SONET_SETDIAG:</div><div class='hunk'>@@ -415,9 +369,9 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)</div><div class='ctx'> 			error = -EPERM;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		if (compat) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_COMPAT) &amp;&amp; compat) {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 			if (!dev-&gt;ops-&gt;compat_ioctl) {</div><div class='ctx'> 				error = -EINVAL;</div><div class='hunk'>@@ -447,6 +401,7 @@ done:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='ctx'> void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;atm_dev_mutex);</div><div class='hunk'>@@ -462,3 +417,4 @@ void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	return seq_list_next(v, &amp;atm_devs, pos);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/atm/resources.h b/net/atm/resources.h<br/>index 048232e4d4c6..4a0839e92ff3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/resources.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/resources.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/resources.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/resources.h</a></div><div class='hunk'>@@ -14,8 +14,9 @@</div><div class='ctx'> extern struct list_head atm_devs;</div><div class='ctx'> extern struct mutex atm_dev_mutex;</div><div class='ctx'> </div><div class='del'>-int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat);</div><div class='del'>-</div><div class='add'>+int atm_getnames(void __user *buf, int __user *iobuf_len);</div><div class='add'>+int atm_dev_ioctl(unsigned int cmd, void __user *buf, int __user *sioc_len,</div><div class='add'>+		  int number, int compat);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='head'>diff --git a/net/atm/signaling.c b/net/atm/signaling.c<br/>index 6c11cdf4dd4c..e70ae2c113f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/signaling.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/signaling.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/signaling.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/signaling.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static void modify_qos(struct atm_vcc *vcc, struct atmsvc_msg *msg)</div><div class='ctx'> 			msg-&gt;type = as_okay;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * Should probably just turn around the old skb. But the, the buffer</div><div class='add'>+	 * Should probably just turn around the old skb. But then, the buffer</div><div class='ctx'> 	 * space accounting needs to follow the change too. Maybe later.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))</div><div class='hunk'>@@ -109,7 +109,7 @@ static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			goto as_indicate_complete;</div><div class='ctx'> 		}</div><div class='del'>-		sk-&gt;sk_ack_backlog++;</div><div class='add'>+		sk_acceptq_added(sk);</div><div class='ctx'> 		skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='ctx'> 		pr_debug("waking sk_sleep(sk) 0x%p\n", sk_sleep(sk));</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='hunk'>@@ -125,7 +125,7 @@ as_indicate_complete:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case as_addparty:</div><div class='ctx'> 	case as_dropparty:</div><div class='del'>-		sk-&gt;sk_err_soft = -msg-&gt;reply;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, -msg-&gt;reply);</div><div class='ctx'> 					/* &lt; 0 failure, otherwise ep_ref */</div><div class='ctx'> 		clear_bit(ATM_VF_WAITING, &amp;vcc-&gt;flags);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/net/atm/svc.c b/net/atm/svc.c<br/>index 2f91b766ac42..005964250ecd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/atm/svc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/atm/svc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/atm/svc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/atm/svc.c</a></div><div class='hunk'>@@ -28,6 +28,11 @@</div><div class='ctx'> #include "signaling.h"</div><div class='ctx'> #include "addr.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */</div><div class='add'>+#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL + 4, struct compat_atm_iobuf)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int svc_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 		      int kern);</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +97,7 @@ static int svc_release(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,</div><div class='add'>+static int svc_bind(struct socket *sock, struct sockaddr_unsized *sockaddr,</div><div class='ctx'> 		    int sockaddr_len)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='hunk'>@@ -148,7 +153,7 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int svc_connect(struct socket *sock, struct sockaddr *sockaddr,</div><div class='add'>+static int svc_connect(struct socket *sock, struct sockaddr_unsized *sockaddr,</div><div class='ctx'> 		       int sockaddr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='hunk'>@@ -319,8 +324,8 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int svc_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-		      bool kern)</div><div class='add'>+static int svc_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+		      struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -331,7 +336,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	error = svc_create(sock_net(sk), newsock, 0, kern);</div><div class='add'>+	error = svc_create(sock_net(sk), newsock, 0, arg-&gt;kern);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -350,7 +355,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> 				error = -sk-&gt;sk_err;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			if (flags &amp; O_NONBLOCK) {</div><div class='add'>+			if (arg-&gt;flags &amp; O_NONBLOCK) {</div><div class='ctx'> 				error = -EAGAIN;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -381,7 +386,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> 				    msg-&gt;pvc.sap_addr.vpi,</div><div class='ctx'> 				    msg-&gt;pvc.sap_addr.vci);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='del'>-		sk-&gt;sk_ack_backlog--;</div><div class='add'>+		sk_acceptq_removed(sk);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			sigd_enq2(NULL, as_reject, old_vcc, NULL, NULL,</div><div class='ctx'> 				  &amp;old_vcc-&gt;qos, error);</div><div class='hunk'>@@ -451,7 +456,7 @@ int svc_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int svc_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct atm_vcc *vcc = ATM_SD(sock);</div><div class='hunk'>@@ -464,7 +469,7 @@ static int svc_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			error = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;vcc-&gt;sap, optval, optlen)) {</div><div class='add'>+		if (copy_from_sockptr(&amp;vcc-&gt;sap, optval, optlen)) {</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -475,7 +480,7 @@ static int svc_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			error = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (get_user(value, (int __user *)optval)) {</div><div class='add'>+		if (copy_from_sockptr(&amp;value, optval, sizeof(int))) {</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -641,6 +646,7 @@ static const struct proto_ops svc_proto_ops = {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl =	svc_compat_ioctl,</div><div class='ctx'> #endif</div><div class='add'>+	.gettstamp =	sock_gettstamp,</div><div class='ctx'> 	.listen =	svc_listen,</div><div class='ctx'> 	.shutdown =	svc_shutdown,</div><div class='ctx'> 	.setsockopt =	svc_setsockopt,</div><div class='hunk'>@@ -648,7 +654,6 @@ static const struct proto_ops svc_proto_ops = {</div><div class='ctx'> 	.sendmsg =	vcc_sendmsg,</div><div class='ctx'> 	.recvmsg =	vcc_recvmsg,</div><div class='ctx'> 	.mmap =		sock_no_mmap,</div><div class='del'>-	.sendpage =	sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig<br/>index 705e53ef4af0..e23a3dc14b93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/Kconfig</a></div><div class='hunk'>@@ -1,15 +1,16 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Amateur Radio protocols and AX.25 device configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig HAMRADIO</div><div class='del'>-	depends on NET &amp;&amp; !S390</div><div class='add'>+	depends on NET</div><div class='ctx'> 	bool "Amateur Radio support"</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want to connect your Linux box to an amateur radio, answer Y</div><div class='del'>-	  here. You want to read &lt;http://www.tapr.org/&gt;</div><div class='add'>+	  here. You want to read &lt;https://www.tapr.org/&gt;</div><div class='ctx'> 	  and more specifically about AX.25 on Linux</div><div class='del'>-	  &lt;http://www.linux-ax25.org/&gt;.</div><div class='add'>+	  &lt;https://linux-ax25.in-berlin.de&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question won't directly affect the</div><div class='ctx'> 	  kernel: saying N will just cause the configurator to skip all</div><div class='hunk'>@@ -38,11 +39,11 @@ config AX25</div><div class='ctx'> 	  Information about where to get supporting software for Linux amateur</div><div class='ctx'> 	  radio as well as information about how to configure an AX.25 port is</div><div class='ctx'> 	  contained in the AX25-HOWTO, available from</div><div class='del'>-	  &lt;http://www.tldp.org/docs.html#howto&gt;. You might also want to</div><div class='del'>-	  check out the file &lt;file:Documentation/networking/ax25.txt&gt; in the</div><div class='add'>+	  &lt;https://www.tldp.org/docs.html#howto&gt;. You might also want to</div><div class='add'>+	  check out the file &lt;file:Documentation/networking/ax25.rst&gt; in the</div><div class='ctx'> 	  kernel source. More information about digital amateur radio in</div><div class='ctx'> 	  general is on the WWW at</div><div class='del'>-	  &lt;http://www.tapr.org/&gt;.</div><div class='add'>+	  &lt;https://www.tapr.org/&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called ax25.</div><div class='hunk'>@@ -60,7 +61,7 @@ config AX25_DAMA_SLAVE</div><div class='ctx'> 	  configuration. Linux cannot yet act as a DAMA server.  This option</div><div class='ctx'> 	  only compiles DAMA slave support into the kernel.  It still needs to</div><div class='ctx'> 	  be enabled at runtime.  For more about DAMA see</div><div class='del'>-	  &lt;http://www.linux-ax25.org&gt;.  If unsure, say Y.</div><div class='add'>+	  &lt;https://linux-ax25.in-berlin.de&gt;.  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> # placeholder until implemented</div><div class='ctx'> config AX25_DAMA_MASTER</div><div class='hunk'>@@ -86,10 +87,10 @@ config NETROM</div><div class='ctx'> 	  A comprehensive listing of all the software for Linux amateur radio</div><div class='ctx'> 	  users as well as information about how to configure an AX.25 port is</div><div class='ctx'> 	  contained in the Linux Ham Wiki, available from</div><div class='del'>-	  &lt;http://www.linux-ax25.org&gt;. You also might want to check out the</div><div class='del'>-	  file &lt;file:Documentation/networking/ax25.txt&gt;. More information about</div><div class='del'>-	  digital amateur radio in general is on the WWW at</div><div class='del'>-	  &lt;http://www.tapr.org/&gt;.</div><div class='add'>+	  &lt;https://linux-ax25.in-berlin.de&gt;. You also might want to check out</div><div class='add'>+	  the file &lt;file:Documentation/networking/ax25.rst&gt;. More information</div><div class='add'>+	  about digital amateur radio in general is on the WWW at</div><div class='add'>+	  &lt;https://www.tapr.org/&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called netrom.</div><div class='hunk'>@@ -105,10 +106,10 @@ config ROSE</div><div class='ctx'> 	  A comprehensive listing of all the software for Linux amateur radio</div><div class='ctx'> 	  users as well as information about how to configure an AX.25 port is</div><div class='ctx'> 	  contained in the Linux Ham Wiki, available from</div><div class='del'>-	  &lt;http://www.linux-ax25.org&gt;.  You also might want to check out the</div><div class='del'>-	  file &lt;file:Documentation/networking/ax25.txt&gt;. More information about</div><div class='del'>-	  digital amateur radio in general is on the WWW at</div><div class='del'>-	  &lt;http://www.tapr.org/&gt;.</div><div class='add'>+	  &lt;https://linux-ax25.in-berlin.de&gt;.  You also might want to check out</div><div class='add'>+	  the file &lt;file:Documentation/networking/ax25.rst&gt;. More information</div><div class='add'>+	  about digital amateur radio in general is on the WWW at</div><div class='add'>+	  &lt;https://www.tapr.org/&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called rose.</div><div class='head'>diff --git a/net/ax25/TODO b/net/ax25/TODO<br/>deleted file mode 100644<br/>index 69fb4e368d92..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/TODO?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-Do the ax25_list_lock, ax25_dev_lock, linkfail_lockreally, ax25_frag_lock and</div><div class='del'>-listen_lock have to be bh-safe?</div><div class='del'>-</div><div class='del'>-Do the netrom and rose locks have to be bh-safe?</div><div class='del'>-</div><div class='del'>-A device might be deleted after lookup in the SIOCADDRT ioctl but before it's</div><div class='del'>-being used.</div><div class='del'>-</div><div class='del'>-Routes to a device being taken down might be deleted by ax25_rt_device_down</div><div class='del'>-but added by somebody else before the device has been deleted fully.</div><div class='del'>-</div><div class='del'>-The ax25_rt_find_route synopsys is pervert but I somehow had to deal with</div><div class='del'>-the race caused by the static variable in it's previous implementation.</div><div class='del'>-</div><div class='del'>-Implement proper socket locking in netrom and rose.</div><div class='del'>-</div><div class='del'>-Check socket locking when ax25_rcv is sending to raw sockets.  In particular</div><div class='del'>-ax25_send_to_raw() seems fishy.  Heck - ax25_rcv is fishy.</div><div class='del'>-</div><div class='del'>-Handle XID and TEST frames properly.</div><div class='head'>diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c<br/>index c603d33d5410..7ebbff2f0020 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/af_ax25.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/af_ax25.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/af_ax25.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/af_ax25.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -65,12 +62,12 @@ static void ax25_free_sock(struct sock *sk)</div><div class='ctx'>  */</div><div class='ctx'> static void ax25_cb_del(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='add'>+	spin_lock_bh(&amp;ax25_list_lock);</div><div class='ctx'> 	if (!hlist_unhashed(&amp;ax25-&gt;ax25_node)) {</div><div class='del'>-		spin_lock_bh(&amp;ax25_list_lock);</div><div class='ctx'> 		hlist_del_init(&amp;ax25-&gt;ax25_node);</div><div class='del'>-		spin_unlock_bh(&amp;ax25_list_lock);</div><div class='ctx'> 		ax25_cb_put(ax25);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_bh(&amp;ax25_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -80,19 +77,39 @@ static void ax25_kill_by_device(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_dev *ax25_dev;</div><div class='ctx'> 	ax25_cb *s;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='add'>+	ax25_dev-&gt;device_up = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ax25_list_lock);</div><div class='ctx'> again:</div><div class='ctx'> 	ax25_for_each(s, &amp;ax25_list) {</div><div class='ctx'> 		if (s-&gt;ax25_dev == ax25_dev) {</div><div class='del'>-			s-&gt;ax25_dev = NULL;</div><div class='add'>+			sk = s-&gt;sk;</div><div class='add'>+			if (!sk) {</div><div class='add'>+				spin_unlock_bh(&amp;ax25_list_lock);</div><div class='add'>+				ax25_disconnect(s, ENETUNREACH);</div><div class='add'>+				s-&gt;ax25_dev = NULL;</div><div class='add'>+				ax25_cb_del(s);</div><div class='add'>+				spin_lock_bh(&amp;ax25_list_lock);</div><div class='add'>+				goto again;</div><div class='add'>+			}</div><div class='add'>+			sock_hold(sk);</div><div class='ctx'> 			spin_unlock_bh(&amp;ax25_list_lock);</div><div class='add'>+			lock_sock(sk);</div><div class='ctx'> 			ax25_disconnect(s, ENETUNREACH);</div><div class='add'>+			s-&gt;ax25_dev = NULL;</div><div class='add'>+			if (sk-&gt;sk_socket) {</div><div class='add'>+				netdev_put(ax25_dev-&gt;dev,</div><div class='add'>+					   &amp;s-&gt;dev_tracker);</div><div class='add'>+				ax25_dev_put(ax25_dev);</div><div class='add'>+			}</div><div class='add'>+			ax25_cb_del(s);</div><div class='add'>+			release_sock(sk);</div><div class='ctx'> 			spin_lock_bh(&amp;ax25_list_lock);</div><div class='del'>-</div><div class='add'>+			sock_put(sk);</div><div class='ctx'> 			/* The entry could have been deleted from the</div><div class='ctx'> 			 * list meanwhile and thus the next pointer is</div><div class='ctx'> 			 * no longer valid.  Play it safe and restart</div><div class='hunk'>@@ -205,7 +222,7 @@ struct sock *ax25_get_socket(ax25_address *my_addr, ax25_address *dest_addr,</div><div class='ctx'>  *	Find an AX.25 control block given both ends. It will only pick up</div><div class='ctx'>  *	floating AX.25 control blocks or non Raw socket bound control blocks.</div><div class='ctx'>  */</div><div class='del'>-ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr,</div><div class='add'>+ax25_cb *ax25_find_cb(const ax25_address *src_addr, ax25_address *dest_addr,</div><div class='ctx'> 	ax25_digi *digi, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_cb *s;</div><div class='hunk'>@@ -270,7 +287,7 @@ void ax25_destroy_socket(ax25_cb *);</div><div class='ctx'>  */</div><div class='ctx'> static void ax25_destroy_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, dtimer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, dtimer);</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	sk=ax25-&gt;sk;</div><div class='hunk'>@@ -356,21 +373,25 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg)</div><div class='ctx'> 	if (copy_from_user(&amp;ax25_ctl, arg, sizeof(ax25_ctl)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if ((ax25_dev = ax25_addr_ax25dev(&amp;ax25_ctl.port_addr)) == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	if (ax25_ctl.digi_count &gt; AX25_MAX_DIGIS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ax25_ctl.arg &gt; ULONG_MAX / HZ &amp;&amp; ax25_ctl.cmd != AX25_KILL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ax25_dev = ax25_addr_ax25dev(&amp;ax25_ctl.port_addr);</div><div class='add'>+	if (!ax25_dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	digi.ndigi = ax25_ctl.digi_count;</div><div class='ctx'> 	for (k = 0; k &lt; digi.ndigi; k++)</div><div class='ctx'> 		digi.calls[k] = ax25_ctl.digi_addr[k];</div><div class='ctx'> </div><div class='del'>-	if ((ax25 = ax25_find_cb(&amp;ax25_ctl.source_addr, &amp;ax25_ctl.dest_addr, &amp;digi, ax25_dev-&gt;dev)) == NULL)</div><div class='add'>+	ax25 = ax25_find_cb(&amp;ax25_ctl.source_addr, &amp;ax25_ctl.dest_addr, &amp;digi, ax25_dev-&gt;dev);</div><div class='add'>+	if (!ax25) {</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='ctx'> 		return -ENOTCONN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (ax25_ctl.cmd) {</div><div class='ctx'> 	case AX25_KILL:</div><div class='hunk'>@@ -437,6 +458,7 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg)</div><div class='ctx'> 	  }</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='add'>+	ax25_dev_put(ax25_dev);</div><div class='ctx'> 	ax25_cb_put(ax25);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +467,7 @@ einval_put:</div><div class='ctx'> 	goto out_put;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ax25_fillin_cb_from_dev(ax25_cb *ax25, ax25_dev *ax25_dev)</div><div class='add'>+static void ax25_fillin_cb_from_dev(ax25_cb *ax25, const ax25_dev *ax25_dev)</div><div class='ctx'> {</div><div class='ctx'> 	ax25-&gt;rtt     = msecs_to_jiffies(ax25_dev-&gt;values[AX25_VALUES_T1]) / 2;</div><div class='ctx'> 	ax25-&gt;t1      = msecs_to_jiffies(ax25_dev-&gt;values[AX25_VALUES_T1]);</div><div class='hunk'>@@ -531,13 +553,13 @@ ax25_cb *ax25_create_cb(void)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-	char __user *optval, unsigned int optlen)</div><div class='add'>+		sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	ax25_cb *ax25;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	char devname[IFNAMSIZ];</div><div class='del'>-	unsigned long opt;</div><div class='add'>+	unsigned int opt;</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_AX25)</div><div class='hunk'>@@ -546,7 +568,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(unsigned int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(opt, (unsigned int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;opt, optval, sizeof(unsigned int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -569,7 +591,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AX25_T1:</div><div class='del'>-		if (opt &lt; 1 || opt &gt; ULONG_MAX / HZ) {</div><div class='add'>+		if (opt &lt; 1 || opt &gt; UINT_MAX / HZ) {</div><div class='ctx'> 			res = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -578,7 +600,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AX25_T2:</div><div class='del'>-		if (opt &lt; 1 || opt &gt; ULONG_MAX / HZ) {</div><div class='add'>+		if (opt &lt; 1 || opt &gt; UINT_MAX / HZ) {</div><div class='ctx'> 			res = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -594,7 +616,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AX25_T3:</div><div class='del'>-		if (opt &lt; 1 || opt &gt; ULONG_MAX / HZ) {</div><div class='add'>+		if (opt &lt; 1 || opt &gt; UINT_MAX / HZ) {</div><div class='ctx'> 			res = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -602,7 +624,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AX25_IDLE:</div><div class='del'>-		if (opt &gt; ULONG_MAX / (60 * HZ)) {</div><div class='add'>+		if (opt &gt; UINT_MAX / (60 * HZ)) {</div><div class='ctx'> 			res = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -638,10 +660,12 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_BINDTODEVICE:</div><div class='del'>-		if (optlen &gt; IFNAMSIZ)</div><div class='del'>-			optlen = IFNAMSIZ;</div><div class='add'>+		if (optlen &gt; IFNAMSIZ - 1)</div><div class='add'>+			optlen = IFNAMSIZ - 1;</div><div class='add'>+</div><div class='add'>+		memset(devname, 0, sizeof(devname));</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(devname, optval, optlen)) {</div><div class='add'>+		if (copy_from_sockptr(devname, optval, optlen)) {</div><div class='ctx'> 			res = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -653,15 +677,33 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev = dev_get_by_name(&amp;init_net, devname);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = dev_get_by_name_rcu(&amp;init_net, devname);</div><div class='ctx'> 		if (!dev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			res = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (ax25-&gt;ax25_dev) {</div><div class='add'>+			if (dev == ax25-&gt;ax25_dev-&gt;dev) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			netdev_put(ax25-&gt;ax25_dev-&gt;dev, &amp;ax25-&gt;dev_tracker);</div><div class='add'>+			ax25_dev_put(ax25-&gt;ax25_dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ax25-&gt;ax25_dev = ax25_dev_ax25dev(dev);</div><div class='add'>+		if (!ax25-&gt;ax25_dev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			res = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		ax25_fillin_cb(ax25, ax25-&gt;ax25_dev);</div><div class='del'>-		dev_put(dev);</div><div class='add'>+		netdev_hold(dev, &amp;ax25-&gt;dev_tracker, GFP_ATOMIC);</div><div class='add'>+		ax25_dev_hold(ax25-&gt;ax25_dev);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -692,7 +734,7 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (maxlen &lt; 1)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	valptr = (void *) &amp;val;</div><div class='add'>+	valptr = &amp;val;</div><div class='ctx'> 	length = min_t(unsigned int, maxlen, sizeof(int));</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -747,14 +789,14 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		ax25_dev = ax25-&gt;ax25_dev;</div><div class='ctx'> </div><div class='ctx'> 		if (ax25_dev != NULL &amp;&amp; ax25_dev-&gt;dev != NULL) {</div><div class='del'>-			strlcpy(devname, ax25_dev-&gt;dev-&gt;name, sizeof(devname));</div><div class='add'>+			strscpy(devname, ax25_dev-&gt;dev-&gt;name, sizeof(devname));</div><div class='ctx'> 			length = strlen(devname) + 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			*devname = '\0';</div><div class='ctx'> 			length = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		valptr = (void *) devname;</div><div class='add'>+		valptr = devname;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -804,7 +846,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	ax25_cb *ax25;</div><div class='ctx'> </div><div class='del'>-	if (protocol &lt; 0 || protocol &gt; SK_PROTOCOL_MAX)</div><div class='add'>+	if (protocol &lt; 0 || protocol &gt; U8_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(net, &amp;init_net))</div><div class='hunk'>@@ -844,6 +886,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 		case AX25_P_ROSE:</div><div class='ctx'> 			if (ax25_protocol_is_registered(AX25_P_ROSE))</div><div class='ctx'> 				return -ESOCKTNOSUPPORT;</div><div class='add'>+			break;</div><div class='ctx'> #endif</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -851,6 +894,8 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SOCK_RAW:</div><div class='add'>+		if (!capable(CAP_NET_RAW))</div><div class='add'>+			return -EPERM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ESOCKTNOSUPPORT;</div><div class='hunk'>@@ -905,7 +950,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)</div><div class='ctx'> 	sock_init_data(NULL, sk);</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_type     = osk-&gt;sk_type;</div><div class='del'>-	sk-&gt;sk_priority = osk-&gt;sk_priority;</div><div class='add'>+	sk-&gt;sk_priority = READ_ONCE(osk-&gt;sk_priority);</div><div class='ctx'> 	sk-&gt;sk_protocol = osk-&gt;sk_protocol;</div><div class='ctx'> 	sk-&gt;sk_rcvbuf   = osk-&gt;sk_rcvbuf;</div><div class='ctx'> 	sk-&gt;sk_sndbuf   = osk-&gt;sk_sndbuf;</div><div class='hunk'>@@ -951,21 +996,25 @@ static int ax25_release(struct socket *sock)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	ax25_cb *ax25;</div><div class='add'>+	ax25_dev *ax25_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (sk == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	sock_hold(sk);</div><div class='del'>-	sock_orphan(sk);</div><div class='ctx'> 	lock_sock(sk);</div><div class='add'>+	sock_orphan(sk);</div><div class='ctx'> 	ax25 = sk_to_ax25(sk);</div><div class='add'>+	ax25_dev = ax25-&gt;ax25_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type == SOCK_SEQPACKET) {</div><div class='ctx'> 		switch (ax25-&gt;state) {</div><div class='ctx'> 		case AX25_STATE_0:</div><div class='del'>-			release_sock(sk);</div><div class='del'>-			ax25_disconnect(ax25, 0);</div><div class='del'>-			lock_sock(sk);</div><div class='add'>+			if (!sock_flag(ax25-&gt;sk, SOCK_DEAD)) {</div><div class='add'>+				release_sock(sk);</div><div class='add'>+				ax25_disconnect(ax25, 0);</div><div class='add'>+				lock_sock(sk);</div><div class='add'>+			}</div><div class='ctx'> 			ax25_destroy_socket(ax25);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1020,6 +1069,17 @@ static int ax25_release(struct socket *sock)</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		ax25_destroy_socket(ax25);</div><div class='ctx'> 	}</div><div class='add'>+	if (ax25_dev) {</div><div class='add'>+		if (!ax25_dev-&gt;device_up) {</div><div class='add'>+			timer_delete_sync(&amp;ax25-&gt;timer);</div><div class='add'>+			timer_delete_sync(&amp;ax25-&gt;t1timer);</div><div class='add'>+			timer_delete_sync(&amp;ax25-&gt;t2timer);</div><div class='add'>+			timer_delete_sync(&amp;ax25-&gt;t3timer);</div><div class='add'>+			timer_delete_sync(&amp;ax25-&gt;idletimer);</div><div class='add'>+		}</div><div class='add'>+		netdev_put(ax25_dev-&gt;dev, &amp;ax25-&gt;dev_tracker);</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sock-&gt;sk   = NULL;</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -1034,7 +1094,7 @@ static int ax25_release(struct socket *sock)</div><div class='ctx'>  *	that we've implemented support for SO_BINDTODEVICE. It is however small</div><div class='ctx'>  *	and trivially backward compatible.</div><div class='ctx'>  */</div><div class='del'>-static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int ax25_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct full_sockaddr_ax25 *addr = (struct full_sockaddr_ax25 *)uaddr;</div><div class='hunk'>@@ -1096,8 +1156,10 @@ static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ax25_dev != NULL)</div><div class='add'>+	if (ax25_dev) {</div><div class='ctx'> 		ax25_fillin_cb(ax25, ax25_dev);</div><div class='add'>+		netdev_hold(ax25_dev-&gt;dev, &amp;ax25-&gt;dev_tracker, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	ax25_cb_add(ax25);</div><div class='hunk'>@@ -1113,7 +1175,7 @@ out:</div><div class='ctx'>  *	FIXME: nonblock behaviour looks like it may have a bug.</div><div class='ctx'>  */</div><div class='ctx'> static int __must_check ax25_connect(struct socket *sock,</div><div class='del'>-	struct sockaddr *uaddr, int addr_len, int flags)</div><div class='add'>+	struct sockaddr_unsized *uaddr, int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	ax25_cb *ax25 = sk_to_ax25(sk), *ax25t;</div><div class='hunk'>@@ -1179,7 +1241,10 @@ static int __must_check ax25_connect(struct socket *sock,</div><div class='ctx'> 	if (addr_len &gt; sizeof(struct sockaddr_ax25) &amp;&amp;</div><div class='ctx'> 	    fsa-&gt;fsa_ax25.sax25_ndigis != 0) {</div><div class='ctx'> 		/* Valid number of digipeaters ? */</div><div class='del'>-		if (fsa-&gt;fsa_ax25.sax25_ndigis &lt; 1 || fsa-&gt;fsa_ax25.sax25_ndigis &gt; AX25_MAX_DIGIS) {</div><div class='add'>+		if (fsa-&gt;fsa_ax25.sax25_ndigis &lt; 1 ||</div><div class='add'>+		    fsa-&gt;fsa_ax25.sax25_ndigis &gt; AX25_MAX_DIGIS ||</div><div class='add'>+		    addr_len &lt; sizeof(struct sockaddr_ax25) +</div><div class='add'>+		    sizeof(ax25_address) * fsa-&gt;fsa_ax25.sax25_ndigis) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out_release;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1205,28 +1270,18 @@ static int __must_check ax25_connect(struct socket *sock,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Must bind first - autobinding in this may or may not work. If</div><div class='del'>-	 *	the socket is already bound, check to see if the device has</div><div class='del'>-	 *	been filled in, error if it hasn't.</div><div class='del'>-	 */</div><div class='add'>+	/* Must bind first - autobinding does not work. */</div><div class='ctx'> 	if (sock_flag(sk, SOCK_ZAPPED)) {</div><div class='del'>-		/* check if we can remove this feature. It is broken. */</div><div class='del'>-		printk(KERN_WARNING "ax25_connect(): %s uses autobind, please contact jreuter@yaina.de\n",</div><div class='del'>-			current-&gt;comm);</div><div class='del'>-		if ((err = ax25_rt_autobind(ax25, &amp;fsa-&gt;fsa_ax25.sax25_call)) &lt; 0) {</div><div class='del'>-			kfree(digi);</div><div class='del'>-			goto out_release;</div><div class='del'>-		}</div><div class='add'>+		kfree(digi);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_release;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ax25_fillin_cb(ax25, ax25-&gt;ax25_dev);</div><div class='del'>-		ax25_cb_add(ax25);</div><div class='del'>-	} else {</div><div class='del'>-		if (ax25-&gt;ax25_dev == NULL) {</div><div class='del'>-			kfree(digi);</div><div class='del'>-			err = -EHOSTUNREACH;</div><div class='del'>-			goto out_release;</div><div class='del'>-		}</div><div class='add'>+	/* Check to see if the device has been filled in, error if it hasn't. */</div><div class='add'>+	if (ax25-&gt;ax25_dev == NULL) {</div><div class='add'>+		kfree(digi);</div><div class='add'>+		err = -EHOSTUNREACH;</div><div class='add'>+		goto out_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type == SOCK_SEQPACKET &amp;&amp;</div><div class='hunk'>@@ -1319,13 +1374,15 @@ out_release:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ax25_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-		       bool kern)</div><div class='add'>+static int ax25_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+		       struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct sock *newsk;</div><div class='add'>+	ax25_dev *ax25_dev;</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='ctx'> 	struct sock *sk;</div><div class='add'>+	ax25_cb *ax25;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sock-&gt;state != SS_UNCONNECTED)</div><div class='hunk'>@@ -1355,7 +1412,7 @@ static int ax25_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (flags &amp; O_NONBLOCK) {</div><div class='add'>+		if (arg-&gt;flags &amp; O_NONBLOCK) {</div><div class='ctx'> 			err = -EWOULDBLOCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1378,8 +1435,12 @@ static int ax25_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> </div><div class='ctx'> 	/* Now attach up the new socket */</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	sk-&gt;sk_ack_backlog--;</div><div class='add'>+	sk_acceptq_removed(sk);</div><div class='ctx'> 	newsock-&gt;state = SS_CONNECTED;</div><div class='add'>+	ax25 = sk_to_ax25(newsk);</div><div class='add'>+	ax25_dev = ax25-&gt;ax25_dev;</div><div class='add'>+	netdev_hold(ax25_dev-&gt;dev, &amp;ax25-&gt;dev_tracker, GFP_ATOMIC);</div><div class='add'>+	ax25_dev_hold(ax25_dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -1499,7 +1560,10 @@ static int ax25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 			struct full_sockaddr_ax25 *fsa = (struct full_sockaddr_ax25 *)usax;</div><div class='ctx'> </div><div class='ctx'> 			/* Valid number of digipeaters ? */</div><div class='del'>-			if (usax-&gt;sax25_ndigis &lt; 1 || usax-&gt;sax25_ndigis &gt; AX25_MAX_DIGIS) {</div><div class='add'>+			if (usax-&gt;sax25_ndigis &lt; 1 ||</div><div class='add'>+			    usax-&gt;sax25_ndigis &gt; AX25_MAX_DIGIS ||</div><div class='add'>+			    addr_len &lt; sizeof(struct sockaddr_ax25) +</div><div class='add'>+			    sizeof(ax25_address) * usax-&gt;sax25_ndigis) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1605,9 +1669,12 @@ static int ax25_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 			int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb, *last;</div><div class='add'>+	struct sk_buff_head *sk_queue;</div><div class='ctx'> 	int copied;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int off = 0;</div><div class='add'>+	long timeo;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1619,11 +1686,29 @@ static int ax25_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Now we can treat all alike */</div><div class='del'>-	skb = skb_recv_datagram(sk, flags &amp; ~MSG_DONTWAIT,</div><div class='del'>-				flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto out;</div><div class='add'>+	/*  We need support for non-blocking reads. */</div><div class='add'>+	sk_queue = &amp;sk-&gt;sk_receive_queue;</div><div class='add'>+	skb = __skb_try_recv_datagram(sk, sk_queue, flags, &amp;off, &amp;err, &amp;last);</div><div class='add'>+	/* If no packet is available, release_sock(sk) and try again. */</div><div class='add'>+	if (!skb) {</div><div class='add'>+		if (err != -EAGAIN)</div><div class='add'>+			goto out;</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+		while (timeo &amp;&amp; !__skb_wait_for_more_packets(sk, sk_queue, &amp;err,</div><div class='add'>+							     &amp;timeo, last)) {</div><div class='add'>+			skb = __skb_try_recv_datagram(sk, sk_queue, flags, &amp;off,</div><div class='add'>+						      &amp;err, &amp;last);</div><div class='add'>+			if (skb)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (err != -EAGAIN)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto done;</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sk_to_ax25(sk)-&gt;pidincl)</div><div class='ctx'> 		skb_pull(skb, 1);		/* Remove PID */</div><div class='hunk'>@@ -1670,6 +1755,7 @@ static int ax25_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> out:</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='add'>+done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1707,14 +1793,6 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		res = sock_get_timestamp(sk, argp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		res = sock_get_timestampns(sk, argp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case SIOCAX25ADDUID:	/* Add a uid to the uid/call map table */</div><div class='ctx'> 	case SIOCAX25DELUID:	/* Delete a uid from the uid/call map table */</div><div class='ctx'> 	case SIOCAX25GETUID: {</div><div class='hunk'>@@ -1881,8 +1959,8 @@ static int ax25_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	 * magic dev src_addr dest_addr,digi1,digi2,.. st vs vr va t1 t1 t2 t2 t3 t3 idle idle n2 n2 rtt window paclen Snd-Q Rcv-Q inode</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "%8.8lx %s %s%s ",</div><div class='del'>-		   (long) ax25,</div><div class='add'>+	seq_printf(seq, "%p %s %s%s ",</div><div class='add'>+		   ax25,</div><div class='ctx'> 		   ax25-&gt;ax25_dev == NULL? "???" : ax25-&gt;ax25_dev-&gt;dev-&gt;name,</div><div class='ctx'> 		   ax2asc(buf, &amp;ax25-&gt;source_addr),</div><div class='ctx'> 		   ax25-&gt;iamdigi? "*":"");</div><div class='hunk'>@@ -1943,6 +2021,7 @@ static const struct proto_ops ax25_proto_ops = {</div><div class='ctx'> 	.getname	= ax25_getname,</div><div class='ctx'> 	.poll		= datagram_poll,</div><div class='ctx'> 	.ioctl		= ax25_ioctl,</div><div class='add'>+	.gettstamp	= sock_gettstamp,</div><div class='ctx'> 	.listen		= ax25_listen,</div><div class='ctx'> 	.shutdown	= ax25_shutdown,</div><div class='ctx'> 	.setsockopt	= ax25_setsockopt,</div><div class='hunk'>@@ -1950,7 +2029,6 @@ static const struct proto_ops ax25_proto_ops = {</div><div class='ctx'> 	.sendmsg	= ax25_sendmsg,</div><div class='ctx'> 	.recvmsg	= ax25_recvmsg,</div><div class='ctx'> 	.mmap		= sock_no_mmap,</div><div class='del'>-	.sendpage	= sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c<br/>index a14cfa736b63..f68865a4d0ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_addr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_addr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_addr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_addr.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c<br/>index 9a3a301e1e2f..3733c0254a50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_dev.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='hunk'>@@ -25,11 +22,12 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-ax25_dev *ax25_dev_list;</div><div class='add'>+static LIST_HEAD(ax25_dev_list);</div><div class='ctx'> DEFINE_SPINLOCK(ax25_dev_lock);</div><div class='ctx'> </div><div class='ctx'> ax25_dev *ax25_addr_ax25dev(ax25_address *addr)</div><div class='hunk'>@@ -37,9 +35,11 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr)</div><div class='ctx'> 	ax25_dev *ax25_dev, *res = NULL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ax25_dev_lock);</div><div class='del'>-	for (ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev-&gt;next)</div><div class='del'>-		if (ax25cmp(addr, (ax25_address *)ax25_dev-&gt;dev-&gt;dev_addr) == 0) {</div><div class='add'>+	list_for_each_entry(ax25_dev, &amp;ax25_dev_list, list)</div><div class='add'>+		if (ax25cmp(addr, (const ax25_address *)ax25_dev-&gt;dev-&gt;dev_addr) == 0) {</div><div class='ctx'> 			res = ax25_dev;</div><div class='add'>+			ax25_dev_hold(ax25_dev);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -54,15 +54,17 @@ void ax25_dev_device_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_dev *ax25_dev;</div><div class='ctx'> </div><div class='del'>-	if ((ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {</div><div class='add'>+	ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_KERNEL);</div><div class='add'>+	if (!ax25_dev) {</div><div class='ctx'> 		printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ax25_ptr     = ax25_dev;</div><div class='add'>+	refcount_set(&amp;ax25_dev-&gt;refcount, 1);</div><div class='ctx'> 	ax25_dev-&gt;dev     = dev;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;ax25_dev-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 	ax25_dev-&gt;forward = NULL;</div><div class='add'>+	ax25_dev-&gt;device_up = true;</div><div class='ctx'> </div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_IPDEFMODE] = AX25_DEF_IPDEFMODE;</div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_AXDEFMODE] = AX25_DEF_AXDEFMODE;</div><div class='hunk'>@@ -77,15 +79,18 @@ void ax25_dev_device_up(struct net_device *dev)</div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_N2]        = AX25_DEF_N2;</div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_PACLEN]	= AX25_DEF_PACLEN;</div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_PROTOCOL]  = AX25_DEF_PROTOCOL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_AX25_DAMA_SLAVE</div><div class='ctx'> 	ax25_dev-&gt;values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)</div><div class='ctx'> 	ax25_ds_setup_timer(ax25_dev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ax25_dev_lock);</div><div class='del'>-	ax25_dev-&gt;next = ax25_dev_list;</div><div class='del'>-	ax25_dev_list  = ax25_dev;</div><div class='add'>+	list_add(&amp;ax25_dev-&gt;list, &amp;ax25_dev_list);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;ax25_ptr, ax25_dev);</div><div class='ctx'> 	spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='ctx'> </div><div class='ctx'> 	ax25_register_dev_sysctl(ax25_dev);</div><div class='hunk'>@@ -103,37 +108,27 @@ void ax25_dev_device_down(struct net_device *dev)</div><div class='ctx'> 	spin_lock_bh(&amp;ax25_dev_lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AX25_DAMA_SLAVE</div><div class='del'>-	ax25_ds_del_timer(ax25_dev);</div><div class='add'>+	timer_shutdown_sync(&amp;ax25_dev-&gt;dama.slave_timer);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Remove any packet forwarding that points to this device.</div><div class='ctx'> 	 */</div><div class='del'>-	for (s = ax25_dev_list; s != NULL; s = s-&gt;next)</div><div class='add'>+	list_for_each_entry(s, &amp;ax25_dev_list, list)</div><div class='ctx'> 		if (s-&gt;forward == dev)</div><div class='ctx'> 			s-&gt;forward = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((s = ax25_dev_list) == ax25_dev) {</div><div class='del'>-		ax25_dev_list = s-&gt;next;</div><div class='del'>-		spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='del'>-		dev_put(dev);</div><div class='del'>-		kfree(ax25_dev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (s != NULL &amp;&amp; s-&gt;next != NULL) {</div><div class='del'>-		if (s-&gt;next == ax25_dev) {</div><div class='del'>-			s-&gt;next = ax25_dev-&gt;next;</div><div class='del'>-			spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='del'>-			dev_put(dev);</div><div class='del'>-			kfree(ax25_dev);</div><div class='del'>-			return;</div><div class='add'>+	list_for_each_entry(s, &amp;ax25_dev_list, list) {</div><div class='add'>+		if (s == ax25_dev) {</div><div class='add'>+			list_del(&amp;s-&gt;list);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		s = s-&gt;next;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(dev-&gt;ax25_ptr, NULL);</div><div class='ctx'> 	spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='del'>-	dev-&gt;ax25_ptr = NULL;</div><div class='add'>+	netdev_put(dev, &amp;ax25_dev-&gt;dev_tracker);</div><div class='add'>+	ax25_dev_put(ax25_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)</div><div class='hunk'>@@ -145,20 +140,32 @@ int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCAX25ADDFWD:</div><div class='del'>-		if ((fwd_dev = ax25_addr_ax25dev(&amp;fwd-&gt;port_to)) == NULL)</div><div class='add'>+		fwd_dev = ax25_addr_ax25dev(&amp;fwd-&gt;port_to);</div><div class='add'>+		if (!fwd_dev) {</div><div class='add'>+			ax25_dev_put(ax25_dev);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (ax25_dev-&gt;forward != NULL)</div><div class='add'>+		}</div><div class='add'>+		if (ax25_dev-&gt;forward) {</div><div class='add'>+			ax25_dev_put(fwd_dev);</div><div class='add'>+			ax25_dev_put(ax25_dev);</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		ax25_dev-&gt;forward = fwd_dev-&gt;dev;</div><div class='add'>+		ax25_dev_put(fwd_dev);</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCAX25DELFWD:</div><div class='del'>-		if (ax25_dev-&gt;forward == NULL)</div><div class='add'>+		if (!ax25_dev-&gt;forward) {</div><div class='add'>+			ax25_dev_put(ax25_dev);</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		ax25_dev-&gt;forward = NULL;</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -183,16 +190,13 @@ struct net_device *ax25_fwd_dev(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> void __exit ax25_dev_free(void)</div><div class='ctx'> {</div><div class='del'>-	ax25_dev *s, *ax25_dev;</div><div class='add'>+	ax25_dev *s, *n;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ax25_dev_lock);</div><div class='del'>-	ax25_dev = ax25_dev_list;</div><div class='del'>-	while (ax25_dev != NULL) {</div><div class='del'>-		s        = ax25_dev;</div><div class='del'>-		dev_put(ax25_dev-&gt;dev);</div><div class='del'>-		ax25_dev = ax25_dev-&gt;next;</div><div class='del'>-		kfree(s);</div><div class='add'>+	list_for_each_entry_safe(s, n, &amp;ax25_dev_list, list) {</div><div class='add'>+		netdev_put(s-&gt;dev, &amp;s-&gt;dev_tracker);</div><div class='add'>+		list_del(&amp;s-&gt;list);</div><div class='add'>+		ax25_dev_put(s);</div><div class='ctx'> 	}</div><div class='del'>-	ax25_dev_list = NULL;</div><div class='ctx'> 	spin_unlock_bh(&amp;ax25_dev_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c<br/>index 488fc2d7085a..c62f8fb06189 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_in.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_in.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_in.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_ds_in.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)</div><div class='head'>diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c<br/>index bc0329f43013..f00e27df3c76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_subr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_subr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_subr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_ds_subr.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)</div><div class='head'>diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c<br/>index e9d11313d45b..0c9e7775aa54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ds_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ds_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_ds_timer.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)</div><div class='hunk'>@@ -47,7 +44,7 @@ void ax25_ds_setup_timer(ax25_dev *ax25_dev)</div><div class='ctx'> void ax25_ds_del_timer(ax25_dev *ax25_dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (ax25_dev)</div><div class='del'>-		del_timer(&amp;ax25_dev-&gt;dama.slave_timer);</div><div class='add'>+		timer_delete(&amp;ax25_dev-&gt;dama.slave_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_ds_set_timer(ax25_dev *ax25_dev)</div><div class='hunk'>@@ -67,7 +64,7 @@ void ax25_ds_set_timer(ax25_dev *ax25_dev)</div><div class='ctx'> </div><div class='ctx'> static void ax25_ds_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_dev *ax25_dev = from_timer(ax25_dev, t, dama.slave_timer);</div><div class='add'>+	ax25_dev *ax25_dev = timer_container_of(ax25_dev, t, dama.slave_timer);</div><div class='ctx'> 	ax25_cb *ax25;</div><div class='ctx'> </div><div class='ctx'> 	if (ax25_dev == NULL || !ax25_dev-&gt;dama.slave)</div><div class='head'>diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c<br/>index 8c07c28569e4..979bc4b828a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_iface.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_iface.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_iface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_iface.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='hunk'>@@ -101,7 +98,7 @@ void ax25_linkfail_release(struct ax25_linkfail *lf)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ax25_linkfail_release);</div><div class='ctx'> </div><div class='del'>-int ax25_listen_register(ax25_address *callsign, struct net_device *dev)</div><div class='add'>+int ax25_listen_register(const ax25_address *callsign, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct listen_struct *listen;</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +121,7 @@ int ax25_listen_register(ax25_address *callsign, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ax25_listen_register);</div><div class='ctx'> </div><div class='del'>-void ax25_listen_release(ax25_address *callsign, struct net_device *dev)</div><div class='add'>+void ax25_listen_release(const ax25_address *callsign, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct listen_struct *s, *listen;</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +171,7 @@ int (*ax25_protocol_function(unsigned int pid))(struct sk_buff *, ax25_cb *)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ax25_listen_mine(ax25_address *callsign, struct net_device *dev)</div><div class='add'>+int ax25_listen_mine(const ax25_address *callsign, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct listen_struct *listen;</div><div class='ctx'> </div><div class='head'>diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c<br/>index 860752639b1a..f2d66af86359 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_in.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_in.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_in.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_in.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -184,7 +181,7 @@ static int ax25_process_rx_frame(ax25_cb *ax25, struct sk_buff *skb, int type, i</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-	ax25_address *dev_addr, struct packet_type *ptype)</div><div class='add'>+		    const ax25_address *dev_addr, struct packet_type *ptype)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_address src, dest, *next_digi = NULL;</div><div class='ctx'> 	int type = 0, mine = 0, dama;</div><div class='hunk'>@@ -359,7 +356,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		make-&gt;sk_state = TCP_ESTABLISHED;</div><div class='ctx'> </div><div class='del'>-		sk-&gt;sk_ack_backlog++;</div><div class='add'>+		sk_acceptq_added(sk);</div><div class='ctx'> 		bh_unlock_sock(sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!mine)</div><div class='hunk'>@@ -436,6 +433,10 @@ free:</div><div class='ctx'> int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		  struct packet_type *ptype, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='add'>+	skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NET_RX_DROP;</div><div class='add'>+</div><div class='ctx'> 	skb_orphan(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(dev_net(dev), &amp;init_net)) {</div><div class='hunk'>@@ -450,5 +451,5 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, AX25_KISS_HEADER_LEN);	/* Remove the KISS byte */</div><div class='ctx'> </div><div class='del'>-	return ax25_rcv(skb, dev, (ax25_address *)dev-&gt;dev_addr, ptype);</div><div class='add'>+	return ax25_rcv(skb, dev, (const ax25_address *)dev-&gt;dev_addr, ptype);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c<br/>index 70417e9b932d..215d4ccf12b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ip.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_ip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_ip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_ip.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='hunk'>@@ -114,6 +111,7 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)</div><div class='ctx'> 	dst = (ax25_address *)(bp + 1);</div><div class='ctx'> 	src = (ax25_address *)(bp + 8);</div><div class='ctx'> </div><div class='add'>+	ax25_route_lock_use();</div><div class='ctx'> 	route = ax25_get_route(dst, NULL);</div><div class='ctx'> 	if (route) {</div><div class='ctx'> 		digipeat = route-&gt;digipeat;</div><div class='hunk'>@@ -124,6 +122,7 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)</div><div class='ctx'> 	if (dev == NULL)</div><div class='ctx'> 		dev = skb-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		goto put;</div><div class='hunk'>@@ -195,10 +194,8 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)</div><div class='ctx'> 	skb_pull(skb, AX25_KISS_HEADER_LEN);</div><div class='ctx'> </div><div class='ctx'> 	if (digipeat != NULL) {</div><div class='del'>-		if ((ourskb = ax25_rt_build_path(skb, src, dst, route-&gt;digipeat)) == NULL) {</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+		if ((ourskb = ax25_rt_build_path(skb, src, dst, route-&gt;digipeat)) == NULL)</div><div class='ctx'> 			goto put;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		skb = ourskb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -206,9 +203,8 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)</div><div class='ctx'> 	ax25_queue_xmit(skb, dev);</div><div class='ctx'> </div><div class='ctx'> put:</div><div class='del'>-	if (route)</div><div class='del'>-		ax25_put_route(route);</div><div class='del'>-</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	ax25_route_lock_unuse();</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c<br/>index 3e5afc8dc93e..8bca2ace98e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_out.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_out.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_out.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_out.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -32,7 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ax25_frag_lock);</div><div class='ctx'> </div><div class='del'>-ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax25_address *dest, ax25_digi *digi, struct net_device *dev)</div><div class='add'>+ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, const ax25_address *src, ax25_address *dest, ax25_digi *digi, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_dev *ax25_dev;</div><div class='ctx'> 	ax25_cb *ax25;</div><div class='hunk'>@@ -42,10 +39,14 @@ ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax2</div><div class='ctx'> 	 * specified.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (paclen == 0) {</div><div class='del'>-		if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		ax25_dev = ax25_dev_ax25dev(dev);</div><div class='add'>+		if (!ax25_dev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return NULL;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		paclen = ax25_dev-&gt;values[AX25_VALUES_PACLEN];</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -56,13 +57,19 @@ ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax2</div><div class='ctx'> 		return ax25;		/* It already existed */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ax25_dev = ax25_dev_ax25dev(dev);</div><div class='add'>+	if (!ax25_dev) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((ax25 = ax25_create_cb()) == NULL)</div><div class='add'>+	if ((ax25 = ax25_create_cb()) == NULL) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return NULL;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	ax25_fillin_cb(ax25, ax25_dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	ax25-&gt;source_addr = *src;</div><div class='ctx'> 	ax25-&gt;dest_addr   = *dest;</div><div class='hunk'>@@ -328,7 +335,6 @@ void ax25_kick(ax25_cb *ax25)</div><div class='ctx'> </div><div class='ctx'> void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skbn;</div><div class='ctx'> 	unsigned char *ptr;</div><div class='ctx'> 	int headroom;</div><div class='ctx'> </div><div class='hunk'>@@ -339,18 +345,12 @@ void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type)</div><div class='ctx'> </div><div class='ctx'> 	headroom = ax25_addr_size(ax25-&gt;digipeat);</div><div class='ctx'> </div><div class='del'>-	if (skb_headroom(skb) &lt; headroom) {</div><div class='del'>-		if ((skbn = skb_realloc_headroom(skb, headroom)) == NULL) {</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; headroom)) {</div><div class='add'>+		skb = skb_expand_head(skb, headroom);</div><div class='add'>+		if (!skb) {</div><div class='ctx'> 			printk(KERN_CRIT "AX.25: ax25_transmit_buffer - out of memory\n");</div><div class='del'>-			kfree_skb(skb);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk != NULL)</div><div class='del'>-			skb_set_owner_w(skbn, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = skbn;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ptr = skb_push(skb, headroom);</div><div class='hunk'>@@ -368,7 +368,9 @@ void ax25_queue_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *ptr;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	skb-&gt;protocol = ax25_type_trans(skb, ax25_fwd_dev(dev));</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	ptr  = skb_push(skb, 1);</div><div class='ctx'> 	*ptr = 0x00;			/* KISS */</div><div class='head'>diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c<br/>index a0eff323af12..10577434f40b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_route.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_route.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_route.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_route.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -40,7 +37,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> static ax25_route *ax25_route_list;</div><div class='del'>-static DEFINE_RWLOCK(ax25_route_lock);</div><div class='add'>+DEFINE_RWLOCK(ax25_route_lock);</div><div class='ctx'> </div><div class='ctx'> void ax25_rt_device_down(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,11 +75,13 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> 	ax25_dev *ax25_dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if ((ax25_dev = ax25_addr_ax25dev(&amp;route-&gt;port_addr)) == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (route-&gt;digi_count &gt; AX25_MAX_DIGIS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ax25_dev = ax25_addr_ax25dev(&amp;route-&gt;port_addr);</div><div class='add'>+	if (!ax25_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	write_lock_bh(&amp;ax25_route_lock);</div><div class='ctx'> </div><div class='ctx'> 	ax25_rt = ax25_route_list;</div><div class='hunk'>@@ -94,6 +93,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> 			if (route-&gt;digi_count != 0) {</div><div class='ctx'> 				if ((ax25_rt-&gt;digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {</div><div class='ctx'> 					write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+					ax25_dev_put(ax25_dev);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='ctx'> 				ax25_rt-&gt;digipeat-&gt;lastrepeat = -1;</div><div class='hunk'>@@ -104,6 +104,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+			ax25_dev_put(ax25_dev);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		ax25_rt = ax25_rt-&gt;next;</div><div class='hunk'>@@ -111,10 +112,10 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> </div><div class='ctx'> 	if ((ax25_rt = kmalloc(sizeof(ax25_route), GFP_ATOMIC)) == NULL) {</div><div class='ctx'> 		write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+		ax25_dev_put(ax25_dev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	refcount_set(&amp;ax25_rt-&gt;refcount, 1);</div><div class='ctx'> 	ax25_rt-&gt;callsign     = route-&gt;dest_addr;</div><div class='ctx'> 	ax25_rt-&gt;dev          = ax25_dev-&gt;dev;</div><div class='ctx'> 	ax25_rt-&gt;digipeat     = NULL;</div><div class='hunk'>@@ -123,6 +124,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> 		if ((ax25_rt-&gt;digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {</div><div class='ctx'> 			write_unlock_bh(&amp;ax25_route_lock);</div><div class='ctx'> 			kfree(ax25_rt);</div><div class='add'>+			ax25_dev_put(ax25_dev);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		ax25_rt-&gt;digipeat-&gt;lastrepeat = -1;</div><div class='hunk'>@@ -135,6 +137,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)</div><div class='ctx'> 	ax25_rt-&gt;next   = ax25_route_list;</div><div class='ctx'> 	ax25_route_list = ax25_rt;</div><div class='ctx'> 	write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+	ax25_dev_put(ax25_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -163,12 +166,12 @@ static int ax25_rt_del(struct ax25_routes_struct *route)</div><div class='ctx'> 		    ax25cmp(&amp;route-&gt;dest_addr, &amp;s-&gt;callsign) == 0) {</div><div class='ctx'> 			if (ax25_route_list == s) {</div><div class='ctx'> 				ax25_route_list = s-&gt;next;</div><div class='del'>-				ax25_put_route(s);</div><div class='add'>+				__ax25_put_route(s);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				for (t = ax25_route_list; t != NULL; t = t-&gt;next) {</div><div class='ctx'> 					if (t-&gt;next == s) {</div><div class='ctx'> 						t-&gt;next = s-&gt;next;</div><div class='del'>-						ax25_put_route(s);</div><div class='add'>+						__ax25_put_route(s);</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -176,6 +179,7 @@ static int ax25_rt_del(struct ax25_routes_struct *route)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+	ax25_dev_put(ax25_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,6 +222,7 @@ static int ax25_rt_opt(struct ax25_route_opt_struct *rt_option)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	write_unlock_bh(&amp;ax25_route_lock);</div><div class='add'>+	ax25_dev_put(ax25_dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -335,6 +340,7 @@ const struct seq_operations ax25_rt_seqops = {</div><div class='ctx'>  *	Find AX.25 route</div><div class='ctx'>  *</div><div class='ctx'>  *	Only routes with a reference count of zero can be destroyed.</div><div class='add'>+ *	Must be called with ax25_route_lock read locked.</div><div class='ctx'>  */</div><div class='ctx'> ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -342,7 +348,6 @@ ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev)</div><div class='ctx'> 	ax25_route *ax25_def_rt = NULL;</div><div class='ctx'> 	ax25_route *ax25_rt;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;ax25_route_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Bind to the physical interface we heard them on, or the default</div><div class='ctx'> 	 *	route if none is found;</div><div class='hunk'>@@ -365,104 +370,24 @@ ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev)</div><div class='ctx'> 	if (ax25_spe_rt != NULL)</div><div class='ctx'> 		ax25_rt = ax25_spe_rt;</div><div class='ctx'> </div><div class='del'>-	if (ax25_rt != NULL)</div><div class='del'>-		ax25_hold_route(ax25_rt);</div><div class='del'>-</div><div class='del'>-	read_unlock(&amp;ax25_route_lock);</div><div class='del'>-</div><div class='ctx'> 	return ax25_rt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Adjust path: If you specify a default route and want to connect</div><div class='del'>- *      a target on the digipeater path but w/o having a special route</div><div class='del'>- *	set before, the path has to be truncated from your target on.</div><div class='del'>- */</div><div class='del'>-static inline void ax25_adjust_path(ax25_address *addr, ax25_digi *digipeat)</div><div class='del'>-{</div><div class='del'>-	int k;</div><div class='del'>-</div><div class='del'>-	for (k = 0; k &lt; digipeat-&gt;ndigi; k++) {</div><div class='del'>-		if (ax25cmp(addr, &amp;digipeat-&gt;calls[k]) == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	digipeat-&gt;ndigi = k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Find which interface to use.</div><div class='del'>- */</div><div class='del'>-int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr)</div><div class='del'>-{</div><div class='del'>-	ax25_uid_assoc *user;</div><div class='del'>-	ax25_route *ax25_rt;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if ((ax25_rt = ax25_get_route(addr, NULL)) == NULL)</div><div class='del'>-		return -EHOSTUNREACH;</div><div class='del'>-</div><div class='del'>-	if ((ax25-&gt;ax25_dev = ax25_dev_ax25dev(ax25_rt-&gt;dev)) == NULL) {</div><div class='del'>-		err = -EHOSTUNREACH;</div><div class='del'>-		goto put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	user = ax25_findbyuid(current_euid());</div><div class='del'>-	if (user) {</div><div class='del'>-		ax25-&gt;source_addr = user-&gt;call;</div><div class='del'>-		ax25_uid_put(user);</div><div class='del'>-	} else {</div><div class='del'>-		if (ax25_uid_policy &amp;&amp; !capable(CAP_NET_BIND_SERVICE)) {</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			goto put;</div><div class='del'>-		}</div><div class='del'>-		ax25-&gt;source_addr = *(ax25_address *)ax25-&gt;ax25_dev-&gt;dev-&gt;dev_addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ax25_rt-&gt;digipeat != NULL) {</div><div class='del'>-		ax25-&gt;digipeat = kmemdup(ax25_rt-&gt;digipeat, sizeof(ax25_digi),</div><div class='del'>-					 GFP_ATOMIC);</div><div class='del'>-		if (ax25-&gt;digipeat == NULL) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto put;</div><div class='del'>-		}</div><div class='del'>-		ax25_adjust_path(addr, ax25-&gt;digipeat);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ax25-&gt;sk != NULL) {</div><div class='del'>-		bh_lock_sock(ax25-&gt;sk);</div><div class='del'>-		sock_reset_flag(ax25-&gt;sk, SOCK_ZAPPED);</div><div class='del'>-		bh_unlock_sock(ax25-&gt;sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-put:</div><div class='del'>-	ax25_put_route(ax25_rt);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src,</div><div class='ctx'> 	ax25_address *dest, ax25_digi *digi)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skbn;</div><div class='ctx'> 	unsigned char *bp;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	len = digi-&gt;ndigi * AX25_ADDR_LEN;</div><div class='ctx'> </div><div class='del'>-	if (skb_headroom(skb) &lt; len) {</div><div class='del'>-		if ((skbn = skb_realloc_headroom(skb, len)) == NULL) {</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; len)) {</div><div class='add'>+		skb = skb_expand_head(skb, len);</div><div class='add'>+		if (!skb) {</div><div class='ctx'> 			printk(KERN_CRIT "AX.25: ax25_dg_build_path - out of memory\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk != NULL)</div><div class='del'>-			skb_set_owner_w(skbn, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-</div><div class='del'>-		skb = skbn;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp = skb_push(skb, len);</div><div class='head'>diff --git a/net/ax25/ax25_std_in.c b/net/ax25/ax25_std_in.c<br/>index 8632b86e843e..ba176196ae06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_in.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_in.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_in.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_std_in.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='head'>diff --git a/net/ax25/ax25_std_subr.c b/net/ax25/ax25_std_subr.c<br/>index 94bd06396a43..4c36f1342558 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_subr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_subr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_subr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_std_subr.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c<br/>index 30bbc675261d..b17da41210cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_std_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_std_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_std_timer.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='head'>diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c<br/>index 038b109b2be7..bff4b203a893 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_subr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_subr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_subr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_subr.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -264,12 +261,20 @@ void ax25_disconnect(ax25_cb *ax25, int reason)</div><div class='ctx'> {</div><div class='ctx'> 	ax25_clear_queues(ax25);</div><div class='ctx'> </div><div class='del'>-	if (!ax25-&gt;sk || !sock_flag(ax25-&gt;sk, SOCK_DESTROY))</div><div class='del'>-		ax25_stop_heartbeat(ax25);</div><div class='del'>-	ax25_stop_t1timer(ax25);</div><div class='del'>-	ax25_stop_t2timer(ax25);</div><div class='del'>-	ax25_stop_t3timer(ax25);</div><div class='del'>-	ax25_stop_idletimer(ax25);</div><div class='add'>+	if (reason == ENETUNREACH) {</div><div class='add'>+		timer_delete_sync(&amp;ax25-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;ax25-&gt;t1timer);</div><div class='add'>+		timer_delete_sync(&amp;ax25-&gt;t2timer);</div><div class='add'>+		timer_delete_sync(&amp;ax25-&gt;t3timer);</div><div class='add'>+		timer_delete_sync(&amp;ax25-&gt;idletimer);</div><div class='add'>+	} else {</div><div class='add'>+		if (ax25-&gt;sk &amp;&amp; !sock_flag(ax25-&gt;sk, SOCK_DESTROY))</div><div class='add'>+			ax25_stop_heartbeat(ax25);</div><div class='add'>+		ax25_stop_t1timer(ax25);</div><div class='add'>+		ax25_stop_t2timer(ax25);</div><div class='add'>+		ax25_stop_t3timer(ax25);</div><div class='add'>+		ax25_stop_idletimer(ax25);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ax25-&gt;state = AX25_STATE_0;</div><div class='ctx'> </div><div class='head'>diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c<br/>index c47b7ee1e4da..a69bfbc8b679 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_timer.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='hunk'>@@ -68,7 +65,7 @@ void ax25_start_t3timer(ax25_cb *ax25)</div><div class='ctx'> 	if (ax25-&gt;t3 &gt; 0)</div><div class='ctx'> 		mod_timer(&amp;ax25-&gt;t3timer, jiffies + ax25-&gt;t3);</div><div class='ctx'> 	else</div><div class='del'>-		del_timer(&amp;ax25-&gt;t3timer);</div><div class='add'>+		timer_delete(&amp;ax25-&gt;t3timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_start_idletimer(ax25_cb *ax25)</div><div class='hunk'>@@ -76,32 +73,32 @@ void ax25_start_idletimer(ax25_cb *ax25)</div><div class='ctx'> 	if (ax25-&gt;idle &gt; 0)</div><div class='ctx'> 		mod_timer(&amp;ax25-&gt;idletimer, jiffies + ax25-&gt;idle);</div><div class='ctx'> 	else</div><div class='del'>-		del_timer(&amp;ax25-&gt;idletimer);</div><div class='add'>+		timer_delete(&amp;ax25-&gt;idletimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_stop_heartbeat(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ax25-&gt;timer);</div><div class='add'>+	timer_delete(&amp;ax25-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_stop_t1timer(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ax25-&gt;t1timer);</div><div class='add'>+	timer_delete(&amp;ax25-&gt;t1timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_stop_t2timer(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ax25-&gt;t2timer);</div><div class='add'>+	timer_delete(&amp;ax25-&gt;t2timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_stop_t3timer(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ax25-&gt;t3timer);</div><div class='add'>+	timer_delete(&amp;ax25-&gt;t3timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ax25_stop_idletimer(ax25_cb *ax25)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ax25-&gt;idletimer);</div><div class='add'>+	timer_delete(&amp;ax25-&gt;idletimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ax25_t1timer_running(ax25_cb *ax25)</div><div class='hunk'>@@ -111,10 +108,12 @@ int ax25_t1timer_running(ax25_cb *ax25)</div><div class='ctx'> </div><div class='ctx'> unsigned long ax25_display_timer(struct timer_list *timer)</div><div class='ctx'> {</div><div class='add'>+	long delta = timer-&gt;expires - jiffies;</div><div class='add'>+</div><div class='ctx'> 	if (!timer_pending(timer))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return timer-&gt;expires - jiffies;</div><div class='add'>+	return max(0L, delta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ax25_display_timer);</div><div class='hunk'>@@ -122,7 +121,7 @@ EXPORT_SYMBOL(ax25_display_timer);</div><div class='ctx'> static void ax25_heartbeat_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	int proto = AX25_PROTO_STD_SIMPLEX;</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, timer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	if (ax25-&gt;ax25_dev)</div><div class='ctx'> 		proto = ax25-&gt;ax25_dev-&gt;values[AX25_VALUES_PROTOCOL];</div><div class='hunk'>@@ -146,7 +145,7 @@ static void ax25_heartbeat_expiry(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void ax25_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, t1timer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, t1timer);</div><div class='ctx'> </div><div class='ctx'> 	switch (ax25-&gt;ax25_dev-&gt;values[AX25_VALUES_PROTOCOL]) {</div><div class='ctx'> 	case AX25_PROTO_STD_SIMPLEX:</div><div class='hunk'>@@ -165,7 +164,7 @@ static void ax25_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void ax25_t2timer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, t2timer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, t2timer);</div><div class='ctx'> </div><div class='ctx'> 	switch (ax25-&gt;ax25_dev-&gt;values[AX25_VALUES_PROTOCOL]) {</div><div class='ctx'> 	case AX25_PROTO_STD_SIMPLEX:</div><div class='hunk'>@@ -184,7 +183,7 @@ static void ax25_t2timer_expiry(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void ax25_t3timer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, t3timer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, t3timer);</div><div class='ctx'> </div><div class='ctx'> 	switch (ax25-&gt;ax25_dev-&gt;values[AX25_VALUES_PROTOCOL]) {</div><div class='ctx'> 	case AX25_PROTO_STD_SIMPLEX:</div><div class='hunk'>@@ -205,7 +204,7 @@ static void ax25_t3timer_expiry(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void ax25_idletimer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	ax25_cb *ax25 = from_timer(ax25, t, idletimer);</div><div class='add'>+	ax25_cb *ax25 = timer_container_of(ax25, t, idletimer);</div><div class='ctx'> </div><div class='ctx'> 	switch (ax25-&gt;ax25_dev-&gt;values[AX25_VALUES_PROTOCOL]) {</div><div class='ctx'> 	case AX25_PROTO_STD_SIMPLEX:</div><div class='head'>diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c<br/>index 99d02e390e43..241e4680ecb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_uid.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/ax25_uid.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/ax25_uid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/ax25_uid.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c<br/>index 919a5ce47515..68753aa30334 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ax25/sysctl_net_ax25.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ax25/sysctl_net_ax25.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ax25/sysctl_net_ax25.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ax25/sysctl_net_ax25.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 Mike Shaver (shaver@zeroknowledge.com)</div><div class='ctx'>  */</div><div class='hunk'>@@ -144,8 +141,6 @@ static const struct ctl_table ax25_param_table[] = {</div><div class='ctx'> 		.extra2		= &amp;max_ds_timeout</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	{ }	/* that's all, folks! */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ax25_register_dev_sysctl(ax25_dev *ax25_dev)</div><div class='hunk'>@@ -158,11 +153,13 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)</div><div class='ctx'> 	if (!table)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(ax25_param_table) != AX25_MAX_VALUES);</div><div class='ctx'> 	for (k = 0; k &lt; AX25_MAX_VALUES; k++)</div><div class='ctx'> 		table[k].data = &amp;ax25_dev-&gt;values[k];</div><div class='ctx'> </div><div class='ctx'> 	snprintf(path, sizeof(path), "net/ax25/%s", ax25_dev-&gt;dev-&gt;name);</div><div class='del'>-	ax25_dev-&gt;sysheader = register_net_sysctl(&amp;init_net, path, table);</div><div class='add'>+	ax25_dev-&gt;sysheader = register_net_sysctl_sz(&amp;init_net, path, table,</div><div class='add'>+						     ARRAY_SIZE(ax25_param_table));</div><div class='ctx'> 	if (!ax25_dev-&gt;sysheader) {</div><div class='ctx'> 		kfree(table);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -173,7 +170,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)</div><div class='ctx'> void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *header = ax25_dev-&gt;sysheader;</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	if (header) {</div><div class='ctx'> 		ax25_dev-&gt;sysheader = NULL;</div><div class='head'>diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig<br/>index 361116f77cb9..58c408b7a7d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/Kconfig</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+# Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'> #</div><div class='ctx'> # Marek Lindner, Simon Wunderlich</div><div class='del'>-#</div><div class='del'>-# This program is free software; you can redistribute it and/or</div><div class='del'>-# modify it under the terms of version 2 of the GNU General Public</div><div class='del'>-# License as published by the Free Software Foundation.</div><div class='del'>-#</div><div class='del'>-# This program is distributed in the hope that it will be useful, but</div><div class='del'>-# WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>-# General Public License for more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # B.A.T.M.A.N meshing protocol</div><div class='hunk'>@@ -21,15 +9,13 @@</div><div class='ctx'> </div><div class='ctx'> config BATMAN_ADV</div><div class='ctx'> 	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"</div><div class='del'>-	depends on NET</div><div class='del'>-	select CRC16</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	help</div><div class='del'>-          B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is</div><div class='del'>-          a routing protocol for multi-hop ad-hoc mesh networks. The</div><div class='del'>-          networks may be wired or wireless. See</div><div class='del'>-          https://www.open-mesh.org/ for more information and user space</div><div class='del'>-          tools.</div><div class='add'>+	  B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is</div><div class='add'>+	  a routing protocol for multi-hop ad-hoc mesh networks. The</div><div class='add'>+	  networks may be wired or wireless. See</div><div class='add'>+	  https://www.open-mesh.org/ for more information and user space</div><div class='add'>+	  tools.</div><div class='ctx'> </div><div class='ctx'> config BATMAN_ADV_BATMAN_V</div><div class='ctx'> 	bool "B.A.T.M.A.N. V protocol"</div><div class='hunk'>@@ -48,6 +34,8 @@ config BATMAN_ADV_BATMAN_V</div><div class='ctx'> config BATMAN_ADV_BLA</div><div class='ctx'> 	bool "Bridge Loop Avoidance"</div><div class='ctx'> 	depends on BATMAN_ADV &amp;&amp; INET</div><div class='add'>+	select CRC16</div><div class='add'>+	select NET_CRC32C</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables BLA (Bridge Loop Avoidance), a mechanism</div><div class='hunk'>@@ -66,43 +54,31 @@ config BATMAN_ADV_DAT</div><div class='ctx'> 	  mesh networks. If you think that your network does not need</div><div class='ctx'> 	  this option you can safely remove it and save some space.</div><div class='ctx'> </div><div class='del'>-config BATMAN_ADV_NC</div><div class='del'>-	bool "Network Coding"</div><div class='del'>-	depends on BATMAN_ADV</div><div class='del'>-	help</div><div class='del'>-	  This option enables network coding, a mechanism that aims to</div><div class='del'>-	  increase the overall network throughput by fusing multiple</div><div class='del'>-	  packets in one transmission.</div><div class='del'>-	  Note that interfaces controlled by batman-adv must be manually</div><div class='del'>-	  configured to have promiscuous mode enabled in order to make</div><div class='del'>-	  network coding work.</div><div class='del'>-	  If you think that your network does not need this feature you</div><div class='del'>-	  can safely disable it and save some space.</div><div class='del'>-</div><div class='ctx'> config BATMAN_ADV_MCAST</div><div class='ctx'> 	bool "Multicast optimisation"</div><div class='ctx'> 	depends on BATMAN_ADV &amp;&amp; INET &amp;&amp; !(BRIDGE=m &amp;&amp; BATMAN_ADV=y)</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables the multicast optimisation which aims to</div><div class='ctx'> 	  reduce the air overhead while improving the reliability of</div><div class='ctx'> 	  multicast messages.</div><div class='ctx'> </div><div class='del'>-config BATMAN_ADV_DEBUGFS</div><div class='del'>-	bool "batman-adv debugfs entries"</div><div class='del'>-	depends on BATMAN_ADV</div><div class='del'>-	depends on DEBUG_FS</div><div class='del'>-	help</div><div class='del'>-	  Enable this to export routing related debug tables via debugfs.</div><div class='del'>-	  The information for each soft-interface and used hard-interface can be</div><div class='del'>-	  found under batman_adv/</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='del'>-</div><div class='ctx'> config BATMAN_ADV_DEBUG</div><div class='ctx'> 	bool "B.A.T.M.A.N. debugging"</div><div class='del'>-	depends on BATMAN_ADV_DEBUGFS</div><div class='add'>+	depends on BATMAN_ADV</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is an option for use by developers; most people should</div><div class='ctx'> 	  say N here. This enables compilation of support for</div><div class='del'>-	  outputting debugging information to the kernel log. The</div><div class='del'>-	  output is controlled via the module parameter debug.</div><div class='add'>+	  outputting debugging information to the tracing buffer. The output is</div><div class='add'>+	  controlled via the batadv netdev specific log_level setting.</div><div class='add'>+</div><div class='add'>+config BATMAN_ADV_TRACING</div><div class='add'>+	bool "B.A.T.M.A.N. tracing support"</div><div class='add'>+	depends on BATMAN_ADV</div><div class='add'>+	depends on EVENT_TRACING</div><div class='add'>+	help</div><div class='add'>+	  This is an option for use by developers; most people should</div><div class='add'>+	  say N here. Select this option to gather traces like the debug</div><div class='add'>+	  messages using the generic tracing infrastructure of the kernel.</div><div class='add'>+	  BATMAN_ADV_DEBUG must also be selected to get trace events for</div><div class='add'>+	  batadv_dbg.</div><div class='head'>diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile<br/>index b97ba6fb8353..d3c4d4143c14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/Makefile</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+# Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'> #</div><div class='ctx'> # Marek Lindner, Simon Wunderlich</div><div class='del'>-#</div><div class='del'>-# This program is free software; you can redistribute it and/or</div><div class='del'>-# modify it under the terms of version 2 of the GNU General Public</div><div class='del'>-# License as published by the Free Software Foundation.</div><div class='del'>-#</div><div class='del'>-# This program is distributed in the hope that it will be useful, but</div><div class='del'>-# WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>-# General Public License for more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-#</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BATMAN_ADV) += batman-adv.o</div><div class='ctx'> batman-adv-y += bat_algo.o</div><div class='hunk'>@@ -24,24 +11,24 @@ batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_elp.o</div><div class='ctx'> batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_ogm.o</div><div class='ctx'> batman-adv-y += bitarray.o</div><div class='ctx'> batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o</div><div class='del'>-batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += debugfs.o</div><div class='ctx'> batman-adv-$(CONFIG_BATMAN_ADV_DAT) += distributed-arp-table.o</div><div class='ctx'> batman-adv-y += fragmentation.o</div><div class='ctx'> batman-adv-y += gateway_client.o</div><div class='ctx'> batman-adv-y += gateway_common.o</div><div class='ctx'> batman-adv-y += hard-interface.o</div><div class='ctx'> batman-adv-y += hash.o</div><div class='del'>-batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += icmp_socket.o</div><div class='ctx'> batman-adv-$(CONFIG_BATMAN_ADV_DEBUG) += log.o</div><div class='ctx'> batman-adv-y += main.o</div><div class='add'>+batman-adv-y += mesh-interface.o</div><div class='ctx'> batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o</div><div class='add'>+batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast_forw.o</div><div class='ctx'> batman-adv-y += netlink.o</div><div class='del'>-batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o</div><div class='ctx'> batman-adv-y += originator.o</div><div class='ctx'> batman-adv-y += routing.o</div><div class='ctx'> batman-adv-y += send.o</div><div class='del'>-batman-adv-y += soft-interface.o</div><div class='del'>-batman-adv-y += sysfs.o</div><div class='add'>+batman-adv-$(CONFIG_BATMAN_ADV_TRACING) += trace.o</div><div class='ctx'> batman-adv-y += tp_meter.o</div><div class='ctx'> batman-adv-y += translation-table.o</div><div class='ctx'> batman-adv-y += tvlv.o</div><div class='add'>+</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='head'>diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c<br/>index ea309ad06175..49e5861b58ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_algo.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_algo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_algo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_algo.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -23,10 +11,10 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='hunk'>@@ -46,7 +34,13 @@ void batadv_algo_init(void)</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;batadv_algo_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct batadv_algo_ops *batadv_algo_get(char *name)</div><div class='add'>+/**</div><div class='add'>+ * batadv_algo_get() - Search for algorithm with specific name</div><div class='add'>+ * @name: algorithm name to find</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to batadv_algo_ops on success, NULL otherwise</div><div class='add'>+ */</div><div class='add'>+struct batadv_algo_ops *batadv_algo_get(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -97,19 +91,19 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_algo_select() - Select algorithm of soft interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_algo_select() - Select algorithm of mesh interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @name: name of the algorithm to select</div><div class='ctx'>  *</div><div class='del'>- * The algorithm callbacks for the soft interface will be set when the algorithm</div><div class='add'>+ * The algorithm callbacks for the mesh interface will be set when the algorithm</div><div class='ctx'>  * with the correct name was found. Any previous selected algorithm will not be</div><div class='ctx'>  * deinitialized and the new selected algorithm will also not be initialized.</div><div class='ctx'>  * It is therefore not allowed to call batadv_algo_select outside the creation</div><div class='del'>- * function of the soft interface.</div><div class='add'>+ * function of the mesh interface.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='del'>-int batadv_algo_select(struct batadv_priv *bat_priv, char *name)</div><div class='add'>+int batadv_algo_select(struct batadv_priv *bat_priv, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_algo_ops *bat_algo_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -122,29 +116,6 @@ int batadv_algo_select(struct batadv_priv *bat_priv, char *name)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_algo_seq_print_text() - Print the supported algorithms in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct batadv_algo_ops *bat_algo_ops;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq, "Available routing algorithms:\n");</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry(bat_algo_ops, &amp;batadv_algo_list, list) {</div><div class='del'>-		seq_printf(seq, " * %s\n", bat_algo_ops-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int batadv_param_set_ra(const char *val, const struct kernel_param *kp)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_algo_ops *bat_algo_ops;</div><div class='head'>diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h<br/>index 534b790c3753..7ce9abbdb4b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_algo.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_algo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_algo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_algo.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Linus Lüssing</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_</div><div class='hunk'>@@ -21,19 +9,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char batadv_routing_algo[];</div><div class='del'>-extern struct list_head batadv_hardif_list;</div><div class='ctx'> </div><div class='ctx'> void batadv_algo_init(void);</div><div class='add'>+struct batadv_algo_ops *batadv_algo_get(const char *name);</div><div class='ctx'> int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);</div><div class='del'>-int batadv_algo_select(struct batadv_priv *bat_priv, char *name);</div><div class='del'>-int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);</div><div class='add'>+int batadv_algo_select(struct batadv_priv *bat_priv, const char *name);</div><div class='ctx'> int batadv_algo_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */</div><div class='head'>diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c<br/>index 73bf6a93a3cf..b75c2228e69a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_iv_ogm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_iv_ogm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_iv_ogm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_iv_ogm.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bat_iv_ogm.h"</div><div class='hunk'>@@ -25,16 +13,18 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='hunk'>@@ -42,12 +32,12 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='hunk'>@@ -62,7 +52,6 @@</div><div class='ctx'> #include "hash.h"</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "netlink.h"</div><div class='del'>-#include "network-coding.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "routing.h"</div><div class='ctx'> #include "send.h"</div><div class='hunk'>@@ -138,184 +127,20 @@ static u8 batadv_ring_buffer_avg(const u8 lq_recv[])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_iv_ogm_orig_free() - free the private resources allocated for this</div><div class='del'>- *  orig_node</div><div class='del'>- * @orig_node: the orig_node for which the resources have to be free'd</div><div class='del'>- */</div><div class='del'>-static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node)</div><div class='del'>-{</div><div class='del'>-	kfree(orig_node-&gt;bat_iv.bcast_own);</div><div class='del'>-	kfree(orig_node-&gt;bat_iv.bcast_own_sum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_orig_add_if() - change the private structures of the orig_node</div><div class='del'>- *  to include the new hard-interface</div><div class='del'>- * @orig_node: the orig_node that has to be changed</div><div class='del'>- * @max_if_num: the current amount of interfaces</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, a negative error code otherwise.</div><div class='del'>- */</div><div class='del'>-static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node,</div><div class='del'>-				     unsigned int max_if_num)</div><div class='del'>-{</div><div class='del'>-	void *data_ptr;</div><div class='del'>-	size_t old_size;</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS;</div><div class='del'>-	data_ptr = kmalloc_array(max_if_num,</div><div class='del'>-				 BATADV_NUM_WORDS * sizeof(unsigned long),</div><div class='del'>-				 GFP_ATOMIC);</div><div class='del'>-	if (!data_ptr)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	memcpy(data_ptr, orig_node-&gt;bat_iv.bcast_own, old_size);</div><div class='del'>-	kfree(orig_node-&gt;bat_iv.bcast_own);</div><div class='del'>-	orig_node-&gt;bat_iv.bcast_own = data_ptr;</div><div class='del'>-</div><div class='del'>-	data_ptr = kmalloc_array(max_if_num, sizeof(u8), GFP_ATOMIC);</div><div class='del'>-	if (!data_ptr)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	memcpy(data_ptr, orig_node-&gt;bat_iv.bcast_own_sum,</div><div class='del'>-	       (max_if_num - 1) * sizeof(u8));</div><div class='del'>-	kfree(orig_node-&gt;bat_iv.bcast_own_sum);</div><div class='del'>-	orig_node-&gt;bat_iv.bcast_own_sum = data_ptr;</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_drop_bcast_own_entry() - drop section of bcast_own</div><div class='del'>- * @orig_node: the orig_node that has to be changed</div><div class='del'>- * @max_if_num: the current amount of interfaces</div><div class='del'>- * @del_if_num: the index of the interface being removed</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node,</div><div class='del'>-				   unsigned int max_if_num,</div><div class='del'>-				   unsigned int del_if_num)</div><div class='del'>-{</div><div class='del'>-	size_t chunk_size;</div><div class='del'>-	size_t if_offset;</div><div class='del'>-	void *data_ptr;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS;</div><div class='del'>-	data_ptr = kmalloc_array(max_if_num, chunk_size, GFP_ATOMIC);</div><div class='del'>-	if (!data_ptr)</div><div class='del'>-		/* use old buffer when new one could not be allocated */</div><div class='del'>-		data_ptr = orig_node-&gt;bat_iv.bcast_own;</div><div class='del'>-</div><div class='del'>-	/* copy first part */</div><div class='del'>-	memmove(data_ptr, orig_node-&gt;bat_iv.bcast_own, del_if_num * chunk_size);</div><div class='del'>-</div><div class='del'>-	/* copy second part */</div><div class='del'>-	if_offset = (del_if_num + 1) * chunk_size;</div><div class='del'>-	memmove((char *)data_ptr + del_if_num * chunk_size,</div><div class='del'>-		(uint8_t *)orig_node-&gt;bat_iv.bcast_own + if_offset,</div><div class='del'>-		(max_if_num - del_if_num) * chunk_size);</div><div class='del'>-</div><div class='del'>-	/* bcast_own was shrunk down in new buffer; free old one */</div><div class='del'>-	if (orig_node-&gt;bat_iv.bcast_own != data_ptr) {</div><div class='del'>-		kfree(orig_node-&gt;bat_iv.bcast_own);</div><div class='del'>-		orig_node-&gt;bat_iv.bcast_own = data_ptr;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_drop_bcast_own_sum_entry() - drop section of bcast_own_sum</div><div class='del'>- * @orig_node: the orig_node that has to be changed</div><div class='del'>- * @max_if_num: the current amount of interfaces</div><div class='del'>- * @del_if_num: the index of the interface being removed</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node,</div><div class='del'>-				       unsigned int max_if_num,</div><div class='del'>-				       unsigned int del_if_num)</div><div class='del'>-{</div><div class='del'>-	size_t if_offset;</div><div class='del'>-	void *data_ptr;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	data_ptr = kmalloc_array(max_if_num, sizeof(u8), GFP_ATOMIC);</div><div class='del'>-	if (!data_ptr)</div><div class='del'>-		/* use old buffer when new one could not be allocated */</div><div class='del'>-		data_ptr = orig_node-&gt;bat_iv.bcast_own_sum;</div><div class='del'>-</div><div class='del'>-	memmove(data_ptr, orig_node-&gt;bat_iv.bcast_own_sum,</div><div class='del'>-		del_if_num * sizeof(u8));</div><div class='del'>-</div><div class='del'>-	if_offset = (del_if_num + 1) * sizeof(u8);</div><div class='del'>-	memmove((char *)data_ptr + del_if_num * sizeof(u8),</div><div class='del'>-		orig_node-&gt;bat_iv.bcast_own_sum + if_offset,</div><div class='del'>-		(max_if_num - del_if_num) * sizeof(u8));</div><div class='del'>-</div><div class='del'>-	/* bcast_own_sum was shrunk down in new buffer; free old one */</div><div class='del'>-	if (orig_node-&gt;bat_iv.bcast_own_sum != data_ptr) {</div><div class='del'>-		kfree(orig_node-&gt;bat_iv.bcast_own_sum);</div><div class='del'>-		orig_node-&gt;bat_iv.bcast_own_sum = data_ptr;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_orig_del_if() - change the private structures of the orig_node</div><div class='del'>- *  to exclude the removed interface</div><div class='del'>- * @orig_node: the orig_node that has to be changed</div><div class='del'>- * @max_if_num: the current amount of interfaces</div><div class='del'>- * @del_if_num: the index of the interface being removed</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, a negative error code otherwise.</div><div class='del'>- */</div><div class='del'>-static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node,</div><div class='del'>-				     unsigned int max_if_num,</div><div class='del'>-				     unsigned int del_if_num)</div><div class='del'>-{</div><div class='del'>-	spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	if (max_if_num == 0) {</div><div class='del'>-		kfree(orig_node-&gt;bat_iv.bcast_own);</div><div class='del'>-		kfree(orig_node-&gt;bat_iv.bcast_own_sum);</div><div class='del'>-		orig_node-&gt;bat_iv.bcast_own = NULL;</div><div class='del'>-		orig_node-&gt;bat_iv.bcast_own_sum = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		batadv_iv_ogm_drop_bcast_own_entry(orig_node, max_if_num,</div><div class='del'>-						   del_if_num);</div><div class='del'>-		batadv_iv_ogm_drop_bcast_own_sum_entry(orig_node, max_if_num,</div><div class='del'>-						       del_if_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_iv_ogm_orig_get() - retrieve or create (if does not exist) an</div><div class='ctx'>  *  originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: mac address of the originator</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the originator object corresponding to the passed mac address or NULL</div><div class='ctx'>  * on failure.</div><div class='del'>- * If the object does not exists it is created an initialised.</div><div class='add'>+ * If the object does not exist, it is created and initialised.</div><div class='ctx'>  */</div><div class='ctx'> static struct batadv_orig_node *</div><div class='ctx'> batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_orig_node *orig_node;</div><div class='ctx'> 	int hash_added;</div><div class='del'>-	size_t size;</div><div class='ctx'> </div><div class='ctx'> 	orig_node = batadv_orig_hash_find(bat_priv, addr);</div><div class='ctx'> 	if (orig_node)</div><div class='hunk'>@@ -327,16 +152,6 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='ctx'> </div><div class='del'>-	size = bat_priv-&gt;num_ifaces * sizeof(unsigned long) * BATADV_NUM_WORDS;</div><div class='del'>-	orig_node-&gt;bat_iv.bcast_own = kzalloc(size, GFP_ATOMIC);</div><div class='del'>-	if (!orig_node-&gt;bat_iv.bcast_own)</div><div class='del'>-		goto free_orig_node;</div><div class='del'>-</div><div class='del'>-	size = bat_priv-&gt;num_ifaces * sizeof(u8);</div><div class='del'>-	orig_node-&gt;bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC);</div><div class='del'>-	if (!orig_node-&gt;bat_iv.bcast_own_sum)</div><div class='del'>-		goto free_orig_node;</div><div class='del'>-</div><div class='ctx'> 	kref_get(&amp;orig_node-&gt;refcount);</div><div class='ctx'> 	hash_added = batadv_hash_add(bat_priv-&gt;orig_hash, batadv_compare_orig,</div><div class='ctx'> 				     batadv_choose_orig, orig_node,</div><div class='hunk'>@@ -347,8 +162,9 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)</div><div class='ctx'> 	return orig_node;</div><div class='ctx'> </div><div class='ctx'> free_orig_node_hash:</div><div class='add'>+	/* reference for batadv_hash_add */</div><div class='ctx'> 	batadv_orig_node_put(orig_node);</div><div class='del'>-free_orig_node:</div><div class='add'>+	/* reference from batadv_orig_node_new */</div><div class='ctx'> 	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -379,14 +195,18 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	unsigned char *ogm_buff;</div><div class='ctx'> 	u32 random_seqno;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='ctx'> 	/* randomize initial seqno to avoid collision */</div><div class='ctx'> 	get_random_bytes(&amp;random_seqno, sizeof(random_seqno));</div><div class='ctx'> 	atomic_set(&amp;hard_iface-&gt;bat_iv.ogm_seqno, random_seqno);</div><div class='ctx'> </div><div class='ctx'> 	hard_iface-&gt;bat_iv.ogm_buff_len = BATADV_OGM_HLEN;</div><div class='ctx'> 	ogm_buff = kmalloc(hard_iface-&gt;bat_iv.ogm_buff_len, GFP_ATOMIC);</div><div class='del'>-	if (!ogm_buff)</div><div class='add'>+	if (!ogm_buff) {</div><div class='add'>+		mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hard_iface-&gt;bat_iv.ogm_buff = ogm_buff;</div><div class='ctx'> </div><div class='hunk'>@@ -398,35 +218,59 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	batadv_ogm_packet-&gt;reserved = 0;</div><div class='ctx'> 	batadv_ogm_packet-&gt;tq = BATADV_TQ_MAX_VALUE;</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='ctx'> 	kfree(hard_iface-&gt;bat_iv.ogm_buff);</div><div class='ctx'> 	hard_iface-&gt;bat_iv.ogm_buff = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_iv_ogm_iface_update_mac(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_ogm_packet *batadv_ogm_packet;</div><div class='del'>-	unsigned char *ogm_buff = hard_iface-&gt;bat_iv.ogm_buff;</div><div class='add'>+	void *ogm_buff;</div><div class='ctx'> </div><div class='del'>-	batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;</div><div class='add'>+	mutex_lock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='add'>+	ogm_buff = hard_iface-&gt;bat_iv.ogm_buff;</div><div class='add'>+	if (!ogm_buff)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	batadv_ogm_packet = ogm_buff;</div><div class='ctx'> 	ether_addr_copy(batadv_ogm_packet-&gt;orig,</div><div class='ctx'> 			hard_iface-&gt;net_dev-&gt;dev_addr);</div><div class='ctx'> 	ether_addr_copy(batadv_ogm_packet-&gt;prev_sender,</div><div class='ctx'> 			hard_iface-&gt;net_dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_ogm_packet *batadv_ogm_packet;</div><div class='del'>-	unsigned char *ogm_buff = hard_iface-&gt;bat_iv.ogm_buff;</div><div class='add'>+	void *ogm_buff;</div><div class='ctx'> </div><div class='del'>-	batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;</div><div class='add'>+	mutex_lock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='add'>+	ogm_buff = hard_iface-&gt;bat_iv.ogm_buff;</div><div class='add'>+	if (!ogm_buff)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	batadv_ogm_packet = ogm_buff;</div><div class='ctx'> 	batadv_ogm_packet-&gt;ttl = BATADV_TTL;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* when do we schedule our own ogm to be sent */</div><div class='hunk'>@@ -436,7 +280,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)</div><div class='ctx'> 	unsigned int msecs;</div><div class='ctx'> </div><div class='ctx'> 	msecs = atomic_read(&amp;bat_priv-&gt;orig_interval) - BATADV_JITTER;</div><div class='del'>-	msecs += prandom_u32() % (2 * BATADV_JITTER);</div><div class='add'>+	msecs += get_random_u32_below(2 * BATADV_JITTER);</div><div class='ctx'> </div><div class='ctx'> 	return jiffies + msecs_to_jiffies(msecs);</div><div class='ctx'> }</div><div class='hunk'>@@ -444,7 +288,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)</div><div class='ctx'> /* when do we schedule a ogm packet to be sent */</div><div class='ctx'> static unsigned long batadv_iv_ogm_fwd_send_time(void)</div><div class='ctx'> {</div><div class='del'>-	return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2));</div><div class='add'>+	return jiffies + msecs_to_jiffies(get_random_u32_below(BATADV_JITTER / 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* apply hop penalty for a normal link */</div><div class='hunk'>@@ -463,27 +307,32 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)</div><div class='ctx'>  * batadv_iv_ogm_aggr_packet() - checks if there is another OGM attached</div><div class='ctx'>  * @buff_pos: current position in the skb</div><div class='ctx'>  * @packet_len: total length of the skb</div><div class='del'>- * @tvlv_len: tvlv length of the previously considered OGM</div><div class='add'>+ * @ogm_packet: potential OGM in buffer</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if there is enough space for another OGM, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,</div><div class='del'>-				      __be16 tvlv_len)</div><div class='add'>+static bool</div><div class='add'>+batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,</div><div class='add'>+			  const struct batadv_ogm_packet *ogm_packet)</div><div class='ctx'> {</div><div class='ctx'> 	int next_buff_pos = 0;</div><div class='ctx'> </div><div class='del'>-	next_buff_pos += buff_pos + BATADV_OGM_HLEN;</div><div class='del'>-	next_buff_pos += ntohs(tvlv_len);</div><div class='add'>+	/* check if there is enough space for the header */</div><div class='add'>+	next_buff_pos += buff_pos + sizeof(*ogm_packet);</div><div class='add'>+	if (next_buff_pos &gt; packet_len)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return (next_buff_pos &lt;= packet_len) &amp;&amp;</div><div class='del'>-	       (next_buff_pos &lt;= BATADV_MAX_AGGREGATION_BYTES);</div><div class='add'>+	/* check if there is enough space for the optional TVLV */</div><div class='add'>+	next_buff_pos += ntohs(ogm_packet-&gt;tvlv_len);</div><div class='add'>+</div><div class='add'>+	return next_buff_pos &lt;= packet_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* send a batman ogm to a given interface */</div><div class='ctx'> static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> 				     struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	const char *fwd_str;</div><div class='ctx'> 	u8 packet_num;</div><div class='ctx'> 	s16 buff_pos;</div><div class='hunk'>@@ -501,11 +350,11 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> </div><div class='ctx'> 	/* adjust all flags and log packets */</div><div class='ctx'> 	while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet-&gt;packet_len,</div><div class='del'>-					 batadv_ogm_packet-&gt;tvlv_len)) {</div><div class='add'>+					 batadv_ogm_packet)) {</div><div class='ctx'> 		/* we might have aggregated direct link packets with an</div><div class='ctx'> 		 * ordinary base packet</div><div class='ctx'> 		 */</div><div class='del'>-		if (forw_packet-&gt;direct_link_flags &amp; BIT(packet_num) &amp;&amp;</div><div class='add'>+		if (test_bit(packet_num, forw_packet-&gt;direct_link_flags) &amp;&amp;</div><div class='ctx'> 		    forw_packet-&gt;if_incoming == hard_iface)</div><div class='ctx'> 			batadv_ogm_packet-&gt;flags |= BATADV_DIRECTLINK;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -522,8 +371,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> 			   batadv_ogm_packet-&gt;orig,</div><div class='ctx'> 			   ntohl(batadv_ogm_packet-&gt;seqno),</div><div class='ctx'> 			   batadv_ogm_packet-&gt;tq, batadv_ogm_packet-&gt;ttl,</div><div class='del'>-			   ((batadv_ogm_packet-&gt;flags &amp; BATADV_DIRECTLINK) ?</div><div class='del'>-			    "on" : "off"),</div><div class='add'>+			   str_on_off(batadv_ogm_packet-&gt;flags &amp; BATADV_DIRECTLINK),</div><div class='ctx'> 			   hard_iface-&gt;net_dev-&gt;name,</div><div class='ctx'> 			   hard_iface-&gt;net_dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -547,20 +395,22 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> /* send a batman ogm packet */</div><div class='ctx'> static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> </div><div class='ctx'> 	if (!forw_packet-&gt;if_incoming) {</div><div class='ctx'> 		pr_err("Error - can't forward packet: incoming iface not specified\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	soft_iface = forw_packet-&gt;if_incoming-&gt;soft_iface;</div><div class='add'>+	mesh_iface = forw_packet-&gt;if_incoming-&gt;mesh_iface;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!forw_packet-&gt;if_outgoing))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(forw_packet-&gt;if_outgoing-&gt;soft_iface != soft_iface))</div><div class='add'>+	if (forw_packet-&gt;if_outgoing-&gt;mesh_iface != mesh_iface) {</div><div class='add'>+		pr_warn("%s: mesh interface switch for queued OGM\n", __func__);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (forw_packet-&gt;if_incoming-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -573,7 +423,7 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)</div><div class='ctx'>  * batadv_iv_ogm_can_aggregate() - find out if an OGM can be aggregated on an</div><div class='ctx'>  *  existing forward packet</div><div class='ctx'>  * @new_bat_ogm_packet: OGM packet to be aggregated</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @packet_len: (total) length of the OGM</div><div class='ctx'>  * @send_time: timestamp (jiffies) when the packet is to be sent</div><div class='ctx'>  * @directlink: true if this is a direct link packet</div><div class='hunk'>@@ -593,28 +443,37 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,</div><div class='ctx'> 			    const struct batadv_forw_packet *forw_packet)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_ogm_packet *batadv_ogm_packet;</div><div class='del'>-	int aggregated_bytes = forw_packet-&gt;packet_len + packet_len;</div><div class='add'>+	unsigned int aggregated_bytes = forw_packet-&gt;packet_len + packet_len;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='add'>+	u8 packet_num = forw_packet-&gt;num_packets;</div><div class='ctx'> 	bool res = false;</div><div class='ctx'> 	unsigned long aggregation_end_time;</div><div class='add'>+	unsigned int max_bytes;</div><div class='ctx'> </div><div class='ctx'> 	batadv_ogm_packet = (struct batadv_ogm_packet *)forw_packet-&gt;skb-&gt;data;</div><div class='ctx'> 	aggregation_end_time = send_time;</div><div class='ctx'> 	aggregation_end_time += msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);</div><div class='ctx'> </div><div class='add'>+	max_bytes = min_t(unsigned int, if_outgoing-&gt;net_dev-&gt;mtu,</div><div class='add'>+			  BATADV_MAX_AGGREGATION_BYTES);</div><div class='add'>+</div><div class='ctx'> 	/* we can aggregate the current packet to this aggregated packet</div><div class='ctx'> 	 * if:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * - the send time is within our MAX_AGGREGATION_MS time</div><div class='del'>-	 * - the resulting packet wont be bigger than</div><div class='del'>-	 *   MAX_AGGREGATION_BYTES</div><div class='add'>+	 * - the resulting packet won't be bigger than</div><div class='add'>+	 *   MAX_AGGREGATION_BYTES and MTU of the outgoing interface</div><div class='add'>+	 * - the number of packets is lower than MAX_AGGREGATION_PACKETS</div><div class='ctx'> 	 * otherwise aggregation is not possible</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!time_before(send_time, forw_packet-&gt;send_time) ||</div><div class='ctx'> 	    !time_after_eq(aggregation_end_time, forw_packet-&gt;send_time))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (aggregated_bytes &gt; BATADV_MAX_AGGREGATION_BYTES)</div><div class='add'>+	if (aggregated_bytes &gt; max_bytes)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (packet_num &gt;= BATADV_MAX_AGGREGATION_PACKETS)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* packet is not leaving on the same interface. */</div><div class='hunk'>@@ -667,8 +526,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -690,16 +548,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,</div><div class='ctx'> 					struct batadv_hard_iface *if_outgoing,</div><div class='ctx'> 					int own_packet)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_forw_packet *forw_packet_aggr;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned char *skb_buff;</div><div class='ctx'> 	unsigned int skb_size;</div><div class='ctx'> 	atomic_t *queue_left = own_packet ? NULL : &amp;bat_priv-&gt;batman_queue_left;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;aggregated_ogms) &amp;&amp;</div><div class='del'>-	    packet_len &lt; BATADV_MAX_AGGREGATION_BYTES)</div><div class='del'>-		skb_size = BATADV_MAX_AGGREGATION_BYTES;</div><div class='add'>+	if (atomic_read(&amp;bat_priv-&gt;aggregated_ogms))</div><div class='add'>+		skb_size = max_t(unsigned int, BATADV_MAX_AGGREGATION_BYTES,</div><div class='add'>+				 packet_len);</div><div class='ctx'> 	else</div><div class='ctx'> 		skb_size = packet_len;</div><div class='ctx'> </div><div class='hunk'>@@ -724,12 +582,13 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,</div><div class='ctx'> 	memcpy(skb_buff, packet_buff, packet_len);</div><div class='ctx'> </div><div class='ctx'> 	forw_packet_aggr-&gt;own = own_packet;</div><div class='del'>-	forw_packet_aggr-&gt;direct_link_flags = BATADV_NO_FLAGS;</div><div class='add'>+	bitmap_zero(forw_packet_aggr-&gt;direct_link_flags,</div><div class='add'>+		    BATADV_MAX_AGGREGATION_PACKETS);</div><div class='ctx'> 	forw_packet_aggr-&gt;send_time = send_time;</div><div class='ctx'> </div><div class='ctx'> 	/* save packet direct link flag status */</div><div class='ctx'> 	if (direct_link)</div><div class='del'>-		forw_packet_aggr-&gt;direct_link_flags |= 1;</div><div class='add'>+		set_bit(0, forw_packet_aggr-&gt;direct_link_flags);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;forw_packet_aggr-&gt;delayed_work,</div><div class='ctx'> 			  batadv_iv_send_outstanding_bat_ogm_packet);</div><div class='hunk'>@@ -742,22 +601,20 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr,</div><div class='ctx'> 				    const unsigned char *packet_buff,</div><div class='ctx'> 				    int packet_len, bool direct_link)</div><div class='ctx'> {</div><div class='del'>-	unsigned long new_direct_link_flag;</div><div class='del'>-</div><div class='ctx'> 	skb_put_data(forw_packet_aggr-&gt;skb, packet_buff, packet_len);</div><div class='ctx'> 	forw_packet_aggr-&gt;packet_len += packet_len;</div><div class='del'>-	forw_packet_aggr-&gt;num_packets++;</div><div class='ctx'> </div><div class='ctx'> 	/* save packet direct link flag status */</div><div class='del'>-	if (direct_link) {</div><div class='del'>-		new_direct_link_flag = BIT(forw_packet_aggr-&gt;num_packets);</div><div class='del'>-		forw_packet_aggr-&gt;direct_link_flags |= new_direct_link_flag;</div><div class='del'>-	}</div><div class='add'>+	if (direct_link)</div><div class='add'>+		set_bit(forw_packet_aggr-&gt;num_packets,</div><div class='add'>+			forw_packet_aggr-&gt;direct_link_flags);</div><div class='add'>+</div><div class='add'>+	forw_packet_aggr-&gt;num_packets++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_ogm_queue_add() - queue up an OGM for transmission</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @packet_buff: pointer to the OGM</div><div class='ctx'>  * @packet_len: (total) length of the OGM</div><div class='ctx'>  * @if_incoming: interface where the packet was received</div><div class='hunk'>@@ -836,7 +693,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node,</div><div class='ctx'> 				  struct batadv_hard_iface *if_incoming,</div><div class='ctx'> 				  struct batadv_hard_iface *if_outgoing)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	u16 tvlv_len;</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_ogm_packet-&gt;ttl &lt;= 1) {</div><div class='hunk'>@@ -889,48 +746,59 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node,</div><div class='ctx'> static void</div><div class='ctx'> batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='ctx'> 	struct batadv_orig_node *orig_node;</div><div class='add'>+	struct batadv_orig_ifinfo *orig_ifinfo;</div><div class='ctx'> 	unsigned long *word;</div><div class='ctx'> 	u32 i;</div><div class='del'>-	size_t word_index;</div><div class='ctx'> 	u8 *w;</div><div class='del'>-	unsigned int if_num;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='ctx'> 		head = &amp;hash-&gt;table[i];</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-			word_index = hard_iface-&gt;if_num * BATADV_NUM_WORDS;</div><div class='del'>-			word = &amp;orig_node-&gt;bat_iv.bcast_own[word_index];</div><div class='del'>-</div><div class='del'>-			batadv_bit_get_packet(bat_priv, word, 1, 0);</div><div class='del'>-			if_num = hard_iface-&gt;if_num;</div><div class='del'>-			w = &amp;orig_node-&gt;bat_iv.bcast_own_sum[if_num];</div><div class='del'>-			*w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE);</div><div class='del'>-			spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+			hlist_for_each_entry_rcu(orig_ifinfo,</div><div class='add'>+						 &amp;orig_node-&gt;ifinfo_list,</div><div class='add'>+						 list) {</div><div class='add'>+				if (orig_ifinfo-&gt;if_outgoing != hard_iface)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+				word = orig_ifinfo-&gt;bat_iv.bcast_own;</div><div class='add'>+				batadv_bit_get_packet(bat_priv, word, 1, 0);</div><div class='add'>+				w = &amp;orig_ifinfo-&gt;bat_iv.bcast_own_sum;</div><div class='add'>+				*w = bitmap_weight(word,</div><div class='add'>+						   BATADV_TQ_LOCAL_WINDOW_SIZE);</div><div class='add'>+				spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)</div><div class='add'>+/**</div><div class='add'>+ * batadv_iv_ogm_schedule_buff() - schedule submission of hardif ogm buffer</div><div class='add'>+ * @hard_iface: interface whose ogm buffer should be transmitted</div><div class='add'>+ */</div><div class='add'>+static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	unsigned char **ogm_buff = &amp;hard_iface-&gt;bat_iv.ogm_buff;</div><div class='ctx'> 	struct batadv_ogm_packet *batadv_ogm_packet;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if, *tmp_hard_iface;</div><div class='ctx'> 	int *ogm_buff_len = &amp;hard_iface-&gt;bat_iv.ogm_buff_len;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	u32 seqno;</div><div class='ctx'> 	u16 tvlv_len = 0;</div><div class='ctx'> 	unsigned long send_time;</div><div class='ctx'> </div><div class='del'>-	if (hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE ||</div><div class='del'>-	    hard_iface-&gt;if_status == BATADV_IF_TO_BE_REMOVED)</div><div class='add'>+	lockdep_assert_held(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+</div><div class='add'>+	/* interface already disabled by batadv_iv_ogm_iface_disable */</div><div class='add'>+	if (!*ogm_buff)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* the interface gets activated here to avoid race conditions between</div><div class='hunk'>@@ -979,10 +847,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	 * interfaces.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(tmp_hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (tmp_hard_iface-&gt;soft_iface != hard_iface-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='add'>+	netdev_for_each_lower_private_rcu(hard_iface-&gt;mesh_iface, tmp_hard_iface, iter) {</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;tmp_hard_iface-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -995,14 +860,53 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	if (hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE ||</div><div class='add'>+	    hard_iface-&gt;if_status == BATADV_IF_TO_BE_REMOVED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+	batadv_iv_ogm_schedule_buff(hard_iface);</div><div class='add'>+	mutex_unlock(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_iv_orig_ifinfo_sum() - Get bcast_own sum for originator over interface</div><div class='add'>+ * @orig_node: originator which reproadcasted the OGMs directly</div><div class='add'>+ * @if_outgoing: interface which transmitted the original OGM and received the</div><div class='add'>+ *  direct rebroadcast</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of replied (rebroadcasted) OGMs which were transmitted by</div><div class='add'>+ *  an originator and directly (without intermediate hop) received by a specific</div><div class='add'>+ *  interface</div><div class='add'>+ */</div><div class='add'>+static u8 batadv_iv_orig_ifinfo_sum(struct batadv_orig_node *orig_node,</div><div class='add'>+				    struct batadv_hard_iface *if_outgoing)</div><div class='add'>+{</div><div class='add'>+	struct batadv_orig_ifinfo *orig_ifinfo;</div><div class='add'>+	u8 sum;</div><div class='add'>+</div><div class='add'>+	orig_ifinfo = batadv_orig_ifinfo_get(orig_node, if_outgoing);</div><div class='add'>+	if (!orig_ifinfo)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+	sum = orig_ifinfo-&gt;bat_iv.bcast_own_sum;</div><div class='add'>+	spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+</div><div class='add'>+	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_ogm_orig_update() - use OGM to update corresponding data in an</div><div class='ctx'>  *  originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the orig node who originally emitted the ogm packet</div><div class='ctx'>  * @orig_ifinfo: ifinfo for the outgoing interface of the orig_node</div><div class='ctx'>  * @ethhdr: Ethernet header of the OGM</div><div class='hunk'>@@ -1026,8 +930,6 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node = NULL;</div><div class='ctx'> 	struct batadv_neigh_node *tmp_neigh_node = NULL;</div><div class='ctx'> 	struct batadv_neigh_node *router = NULL;</div><div class='del'>-	struct batadv_orig_node *orig_node_tmp;</div><div class='del'>-	unsigned int if_num;</div><div class='ctx'> 	u8 sum_orig, sum_neigh;</div><div class='ctx'> 	u8 *neigh_addr;</div><div class='ctx'> 	u8 tq_avg;</div><div class='hunk'>@@ -1132,18 +1034,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (router_ifinfo &amp;&amp;</div><div class='ctx'> 	    neigh_ifinfo-&gt;bat_iv.tq_avg == router_ifinfo-&gt;bat_iv.tq_avg) {</div><div class='del'>-		orig_node_tmp = router-&gt;orig_node;</div><div class='del'>-		spin_lock_bh(&amp;orig_node_tmp-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-		if_num = router-&gt;if_incoming-&gt;if_num;</div><div class='del'>-		sum_orig = orig_node_tmp-&gt;bat_iv.bcast_own_sum[if_num];</div><div class='del'>-		spin_unlock_bh(&amp;orig_node_tmp-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='del'>-		orig_node_tmp = neigh_node-&gt;orig_node;</div><div class='del'>-		spin_lock_bh(&amp;orig_node_tmp-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-		if_num = neigh_node-&gt;if_incoming-&gt;if_num;</div><div class='del'>-		sum_neigh = orig_node_tmp-&gt;bat_iv.bcast_own_sum[if_num];</div><div class='del'>-		spin_unlock_bh(&amp;orig_node_tmp-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-</div><div class='add'>+		sum_orig = batadv_iv_orig_ifinfo_sum(router-&gt;orig_node,</div><div class='add'>+						     router-&gt;if_incoming);</div><div class='add'>+		sum_neigh = batadv_iv_orig_ifinfo_sum(neigh_node-&gt;orig_node,</div><div class='add'>+						      neigh_node-&gt;if_incoming);</div><div class='ctx'> 		if (sum_orig &gt;= sum_neigh)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1154,14 +1048,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,</div><div class='ctx'> unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='del'>-	if (neigh_node)</div><div class='del'>-		batadv_neigh_node_put(neigh_node);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (neigh_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(neigh_node);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1180,16 +1070,15 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,</div><div class='ctx'> 				  struct batadv_hard_iface *if_incoming,</div><div class='ctx'> 				  struct batadv_hard_iface *if_outgoing)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node;</div><div class='ctx'> 	struct batadv_neigh_ifinfo *neigh_ifinfo;</div><div class='ctx'> 	u8 total_count;</div><div class='ctx'> 	u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;</div><div class='add'>+	unsigned int tq_iface_hop_penalty = BATADV_TQ_MAX_VALUE;</div><div class='ctx'> 	unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;</div><div class='del'>-	unsigned int if_num;</div><div class='ctx'> 	unsigned int tq_asym_penalty, inv_asym_penalty;</div><div class='ctx'> 	unsigned int combined_tq;</div><div class='del'>-	unsigned int tq_iface_penalty;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	/* find corresponding one hop neighbor */</div><div class='hunk'>@@ -1227,9 +1116,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	orig_node-&gt;last_seen = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* find packet count of corresponding one hop neighbor */</div><div class='del'>-	spin_lock_bh(&amp;orig_neigh_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-	if_num = if_incoming-&gt;if_num;</div><div class='del'>-	orig_eq_count = orig_neigh_node-&gt;bat_iv.bcast_own_sum[if_num];</div><div class='add'>+	orig_eq_count = batadv_iv_orig_ifinfo_sum(orig_neigh_node, if_incoming);</div><div class='ctx'> 	neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing);</div><div class='ctx'> 	if (neigh_ifinfo) {</div><div class='ctx'> 		neigh_rq_count = neigh_ifinfo-&gt;bat_iv.real_packet_count;</div><div class='hunk'>@@ -1237,7 +1124,6 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		neigh_rq_count = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;orig_neigh_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* pay attention to not get a value bigger than 100 % */</div><div class='ctx'> 	if (orig_eq_count &gt; neigh_rq_count)</div><div class='hunk'>@@ -1271,31 +1157,32 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	inv_asym_penalty = BATADV_TQ_MAX_VALUE * neigh_rq_inv_cube;</div><div class='ctx'> 	inv_asym_penalty /= neigh_rq_max_cube;</div><div class='ctx'> 	tq_asym_penalty = BATADV_TQ_MAX_VALUE - inv_asym_penalty;</div><div class='add'>+	tq_iface_hop_penalty -= atomic_read(&amp;if_incoming-&gt;hop_penalty);</div><div class='ctx'> </div><div class='ctx'> 	/* penalize if the OGM is forwarded on the same interface. WiFi</div><div class='ctx'> 	 * interfaces and other half duplex devices suffer from throughput</div><div class='ctx'> 	 * drops as they can't send and receive at the same time.</div><div class='ctx'> 	 */</div><div class='del'>-	tq_iface_penalty = BATADV_TQ_MAX_VALUE;</div><div class='ctx'> 	if (if_outgoing &amp;&amp; if_incoming == if_outgoing &amp;&amp;</div><div class='ctx'> 	    batadv_is_wifi_hardif(if_outgoing))</div><div class='del'>-		tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE,</div><div class='del'>-						      bat_priv);</div><div class='add'>+		tq_iface_hop_penalty = batadv_hop_penalty(tq_iface_hop_penalty,</div><div class='add'>+							  bat_priv);</div><div class='ctx'> </div><div class='ctx'> 	combined_tq = batadv_ogm_packet-&gt;tq *</div><div class='ctx'> 		      tq_own *</div><div class='ctx'> 		      tq_asym_penalty *</div><div class='del'>-		      tq_iface_penalty;</div><div class='add'>+		      tq_iface_hop_penalty;</div><div class='ctx'> 	combined_tq /= BATADV_TQ_MAX_VALUE *</div><div class='ctx'> 		       BATADV_TQ_MAX_VALUE *</div><div class='ctx'> 		       BATADV_TQ_MAX_VALUE;</div><div class='ctx'> 	batadv_ogm_packet-&gt;tq = combined_tq;</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-		   "bidirectional: orig = %pM neigh = %pM =&gt; own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, iface_penalty: %3i, total tq: %3i, if_incoming = %s, if_outgoing = %s\n",</div><div class='add'>+		   "bidirectional: orig = %pM neigh = %pM =&gt; own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, iface_hop_penalty: %3i, total tq: %3i, if_incoming = %s, if_outgoing = %s\n",</div><div class='ctx'> 		   orig_node-&gt;orig, orig_neigh_node-&gt;orig, total_count,</div><div class='del'>-		   neigh_rq_count, tq_own, tq_asym_penalty, tq_iface_penalty,</div><div class='del'>-		   batadv_ogm_packet-&gt;tq, if_incoming-&gt;net_dev-&gt;name,</div><div class='add'>+		   neigh_rq_count, tq_own, tq_asym_penalty,</div><div class='add'>+		   tq_iface_hop_penalty, batadv_ogm_packet-&gt;tq,</div><div class='add'>+		   if_incoming-&gt;net_dev-&gt;name,</div><div class='ctx'> 		   if_outgoing ? if_outgoing-&gt;net_dev-&gt;name : "DEFAULT");</div><div class='ctx'> </div><div class='ctx'> 	/* if link has the minimum required transmission quality</div><div class='hunk'>@@ -1305,8 +1192,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,</div><div class='ctx'> 		ret = true;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (neigh_node)</div><div class='del'>-		batadv_neigh_node_put(neigh_node);</div><div class='add'>+	batadv_neigh_node_put(neigh_node);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1326,7 +1212,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,</div><div class='ctx'> 			    const struct batadv_hard_iface *if_incoming,</div><div class='ctx'> 			    struct batadv_hard_iface *if_outgoing)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_orig_node *orig_node;</div><div class='ctx'> 	struct batadv_orig_ifinfo *orig_ifinfo = NULL;</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node;</div><div class='hunk'>@@ -1428,7 +1314,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 				struct batadv_hard_iface *if_incoming,</div><div class='ctx'> 				struct batadv_hard_iface *if_outgoing)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hardif_neigh_node *hardif_neigh = NULL;</div><div class='ctx'> 	struct batadv_neigh_node *router = NULL;</div><div class='ctx'> 	struct batadv_neigh_node *router_router = NULL;</div><div class='hunk'>@@ -1519,10 +1405,6 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 	if (!orig_neigh_node)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Update nc_nodes of the originator */</div><div class='del'>-	batadv_nc_update_nc_node(bat_priv, orig_node, orig_neigh_node,</div><div class='del'>-				 ogm_packet, is_single_hop_neigh);</div><div class='del'>-</div><div class='ctx'> 	orig_neigh_router = batadv_orig_router_get(orig_neigh_node,</div><div class='ctx'> 						   if_outgoing);</div><div class='ctx'> </div><div class='hunk'>@@ -1607,30 +1489,68 @@ out_neigh:</div><div class='ctx'> 	if (orig_neigh_node &amp;&amp; !is_single_hop_neigh)</div><div class='ctx'> 		batadv_orig_node_put(orig_neigh_node);</div><div class='ctx'> out:</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (router_router)</div><div class='del'>-		batadv_neigh_node_put(router_router);</div><div class='del'>-	if (orig_neigh_router)</div><div class='del'>-		batadv_neigh_node_put(orig_neigh_router);</div><div class='del'>-	if (hardif_neigh)</div><div class='del'>-		batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_node_put(router_router);</div><div class='add'>+	batadv_neigh_node_put(orig_neigh_router);</div><div class='add'>+	batadv_hardif_neigh_put(hardif_neigh);</div><div class='ctx'> </div><div class='ctx'> 	consume_skb(skb_priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_iv_ogm_process_reply() - Check OGM for direct reply and process it</div><div class='add'>+ * @ogm_packet: rebroadcast OGM packet to process</div><div class='add'>+ * @if_incoming: the interface where this packet was received</div><div class='add'>+ * @orig_node: originator which reproadcasted the OGMs</div><div class='add'>+ * @if_incoming_seqno: OGM sequence number when rebroadcast was received</div><div class='add'>+ */</div><div class='add'>+static void batadv_iv_ogm_process_reply(struct batadv_ogm_packet *ogm_packet,</div><div class='add'>+					struct batadv_hard_iface *if_incoming,</div><div class='add'>+					struct batadv_orig_node *orig_node,</div><div class='add'>+					u32 if_incoming_seqno)</div><div class='add'>+{</div><div class='add'>+	struct batadv_orig_ifinfo *orig_ifinfo;</div><div class='add'>+	s32 bit_pos;</div><div class='add'>+	u8 *weight;</div><div class='add'>+</div><div class='add'>+	/* neighbor has to indicate direct link and it has to</div><div class='add'>+	 * come via the corresponding interface</div><div class='add'>+	 */</div><div class='add'>+	if (!(ogm_packet-&gt;flags &amp; BATADV_DIRECTLINK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!batadv_compare_eth(if_incoming-&gt;net_dev-&gt;dev_addr,</div><div class='add'>+				ogm_packet-&gt;orig))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	orig_ifinfo = batadv_orig_ifinfo_get(orig_node, if_incoming);</div><div class='add'>+	if (!orig_ifinfo)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* save packet seqno for bidirectional check */</div><div class='add'>+	spin_lock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+	bit_pos = if_incoming_seqno - 2;</div><div class='add'>+	bit_pos -= ntohl(ogm_packet-&gt;seqno);</div><div class='add'>+	batadv_set_bit(orig_ifinfo-&gt;bat_iv.bcast_own, bit_pos);</div><div class='add'>+	weight = &amp;orig_ifinfo-&gt;bat_iv.bcast_own_sum;</div><div class='add'>+	*weight = bitmap_weight(orig_ifinfo-&gt;bat_iv.bcast_own,</div><div class='add'>+				BATADV_TQ_LOCAL_WINDOW_SIZE);</div><div class='add'>+	spin_unlock_bh(&amp;orig_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='add'>+</div><div class='add'>+	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_iv_ogm_process() - process an incoming batman iv OGM</div><div class='ctx'>  * @skb: the skb containing the OGM</div><div class='ctx'>  * @ogm_offset: offset to the OGM which should be processed (for aggregates)</div><div class='del'>- * @if_incoming: the interface where this packet was receved</div><div class='add'>+ * @if_incoming: the interface where this packet was received</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 				  struct batadv_hard_iface *if_incoming)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_orig_node *orig_neigh_node, *orig_node;</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='ctx'> 	struct batadv_ogm_packet *ogm_packet;</div><div class='hunk'>@@ -1640,6 +1560,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 	bool is_my_oldorig = false;</div><div class='ctx'> 	bool is_my_addr = false;</div><div class='ctx'> 	bool is_my_orig = false;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	ogm_packet = (struct batadv_ogm_packet *)(skb-&gt;data + ogm_offset);</div><div class='ctx'> 	ethhdr = eth_hdr(skb);</div><div class='hunk'>@@ -1676,11 +1597,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 		   ogm_packet-&gt;version, has_directlink_flag);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='del'>-			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != if_incoming-&gt;soft_iface)</div><div class='add'>+	netdev_for_each_lower_private_rcu(if_incoming-&gt;mesh_iface, hard_iface, iter) {</div><div class='add'>+		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (batadv_compare_eth(ethhdr-&gt;h_source,</div><div class='hunk'>@@ -1705,37 +1624,13 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_my_orig) {</div><div class='del'>-		unsigned long *word;</div><div class='del'>-		size_t offset;</div><div class='del'>-		s32 bit_pos;</div><div class='del'>-		unsigned int if_num;</div><div class='del'>-		u8 *weight;</div><div class='del'>-</div><div class='ctx'> 		orig_neigh_node = batadv_iv_ogm_orig_get(bat_priv,</div><div class='ctx'> 							 ethhdr-&gt;h_source);</div><div class='ctx'> 		if (!orig_neigh_node)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		/* neighbor has to indicate direct link and it has to</div><div class='del'>-		 * come via the corresponding interface</div><div class='del'>-		 * save packet seqno for bidirectional check</div><div class='del'>-		 */</div><div class='del'>-		if (has_directlink_flag &amp;&amp;</div><div class='del'>-		    batadv_compare_eth(if_incoming-&gt;net_dev-&gt;dev_addr,</div><div class='del'>-				       ogm_packet-&gt;orig)) {</div><div class='del'>-			if_num = if_incoming-&gt;if_num;</div><div class='del'>-			offset = if_num * BATADV_NUM_WORDS;</div><div class='del'>-</div><div class='del'>-			spin_lock_bh(&amp;orig_neigh_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-			word = &amp;orig_neigh_node-&gt;bat_iv.bcast_own[offset];</div><div class='del'>-			bit_pos = if_incoming_seqno - 2;</div><div class='del'>-			bit_pos -= ntohl(ogm_packet-&gt;seqno);</div><div class='del'>-			batadv_set_bit(word, bit_pos);</div><div class='del'>-			weight = &amp;orig_neigh_node-&gt;bat_iv.bcast_own_sum[if_num];</div><div class='del'>-			*weight = bitmap_weight(word,</div><div class='del'>-						BATADV_TQ_LOCAL_WINDOW_SIZE);</div><div class='del'>-			spin_unlock_bh(&amp;orig_neigh_node-&gt;bat_iv.ogm_cnt_lock);</div><div class='del'>-		}</div><div class='add'>+		batadv_iv_ogm_process_reply(ogm_packet, if_incoming,</div><div class='add'>+					    orig_neigh_node, if_incoming_seqno);</div><div class='ctx'> </div><div class='ctx'> 		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='ctx'> 			   "Drop packet: originator packet from myself (via neighbor)\n");</div><div class='hunk'>@@ -1765,13 +1660,10 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 					if_incoming, BATADV_IF_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1795,7 +1687,7 @@ static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work)</div><div class='ctx'> 	delayed_work = to_delayed_work(work);</div><div class='ctx'> 	forw_packet = container_of(delayed_work, struct batadv_forw_packet,</div><div class='ctx'> 				   delayed_work);</div><div class='del'>-	bat_priv = netdev_priv(forw_packet-&gt;if_incoming-&gt;soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(forw_packet-&gt;if_incoming-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_DEACTIVATING) {</div><div class='ctx'> 		dropped = true;</div><div class='hunk'>@@ -1826,7 +1718,7 @@ out:</div><div class='ctx'> static int batadv_iv_ogm_receive(struct sk_buff *skb,</div><div class='ctx'> 				 struct batadv_hard_iface *if_incoming)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_ogm_packet *ogm_packet;</div><div class='ctx'> 	u8 *packet_pos;</div><div class='ctx'> 	int ogm_offset;</div><div class='hunk'>@@ -1852,7 +1744,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* unpack the aggregated packets and process them one by one */</div><div class='ctx'> 	while (batadv_iv_ogm_aggr_packet(ogm_offset, skb_headlen(skb),</div><div class='del'>-					 ogm_packet-&gt;tvlv_len)) {</div><div class='add'>+					 ogm_packet)) {</div><div class='ctx'> 		batadv_iv_ogm_process(skb, ogm_offset, if_incoming);</div><div class='ctx'> </div><div class='ctx'> 		ogm_offset += BATADV_OGM_HLEN;</div><div class='hunk'>@@ -1873,106 +1765,6 @@ free_skb:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_orig_print_neigh() - print neighbors for the originator table</div><div class='del'>- * @orig_node: the orig_node for which the neighbors are printed</div><div class='del'>- * @if_outgoing: outgoing interface for these entries</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- *</div><div class='del'>- * Must be called while holding an rcu lock.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_iv_ogm_orig_print_neigh(struct batadv_orig_node *orig_node,</div><div class='del'>-			       struct batadv_hard_iface *if_outgoing,</div><div class='del'>-			       struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct batadv_neigh_node *neigh_node;</div><div class='del'>-	struct batadv_neigh_ifinfo *n_ifinfo;</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(neigh_node, &amp;orig_node-&gt;neigh_list, list) {</div><div class='del'>-		n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);</div><div class='del'>-		if (!n_ifinfo)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		seq_printf(seq, " %pM (%3i)",</div><div class='del'>-			   neigh_node-&gt;addr,</div><div class='del'>-			   n_ifinfo-&gt;bat_iv.tq_avg);</div><div class='del'>-</div><div class='del'>-		batadv_neigh_ifinfo_put(n_ifinfo);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_orig_print() - print the originator table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- * @if_outgoing: the outgoing interface for which this should be printed</div><div class='del'>- */</div><div class='del'>-static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,</div><div class='del'>-				     struct seq_file *seq,</div><div class='del'>-				     struct batadv_hard_iface *if_outgoing)</div><div class='del'>-{</div><div class='del'>-	struct batadv_neigh_node *neigh_node;</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	int last_seen_msecs, last_seen_secs;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct batadv_neigh_ifinfo *n_ifinfo;</div><div class='del'>-	unsigned long last_seen_jiffies;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	int batman_count = 0;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "  Originator      last-seen (#/255)           Nexthop [outgoingIF]:   Potential nexthops ...\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			neigh_node = batadv_orig_router_get(orig_node,</div><div class='del'>-							    if_outgoing);</div><div class='del'>-			if (!neigh_node)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			n_ifinfo = batadv_neigh_ifinfo_get(neigh_node,</div><div class='del'>-							   if_outgoing);</div><div class='del'>-			if (!n_ifinfo)</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			if (n_ifinfo-&gt;bat_iv.tq_avg == 0)</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			last_seen_jiffies = jiffies - orig_node-&gt;last_seen;</div><div class='del'>-			last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);</div><div class='del'>-			last_seen_secs = last_seen_msecs / 1000;</div><div class='del'>-			last_seen_msecs = last_seen_msecs % 1000;</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, "%pM %4i.%03is   (%3i) %pM [%10s]:",</div><div class='del'>-				   orig_node-&gt;orig, last_seen_secs,</div><div class='del'>-				   last_seen_msecs, n_ifinfo-&gt;bat_iv.tq_avg,</div><div class='del'>-				   neigh_node-&gt;addr,</div><div class='del'>-				   neigh_node-&gt;if_incoming-&gt;net_dev-&gt;name);</div><div class='del'>-</div><div class='del'>-			batadv_iv_ogm_orig_print_neigh(orig_node, if_outgoing,</div><div class='del'>-						       seq);</div><div class='del'>-			seq_putc(seq, '\n');</div><div class='del'>-			batman_count++;</div><div class='del'>-</div><div class='del'>-next:</div><div class='del'>-			batadv_neigh_node_put(neigh_node);</div><div class='del'>-			if (n_ifinfo)</div><div class='del'>-				batadv_neigh_ifinfo_put(n_ifinfo);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (batman_count == 0)</div><div class='del'>-		seq_puts(seq, "No batman nodes in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_ogm_neigh_get_tq_avg() - Get the TQ average for a neighbour on a</div><div class='ctx'>  *  given outgoing interface.</div><div class='hunk'>@@ -2005,7 +1797,7 @@ batadv_iv_ogm_neigh_get_tq_avg(struct batadv_neigh_node *neigh_node,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @orig_node: Originator to dump</div><div class='ctx'>  * @neigh_node: Single hops neighbour</div><div class='hunk'>@@ -2043,6 +1835,8 @@ batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 		    orig_node-&gt;orig) ||</div><div class='ctx'> 	    nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,</div><div class='ctx'> 		    neigh_node-&gt;addr) ||</div><div class='add'>+	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,</div><div class='add'>+			   neigh_node-&gt;if_incoming-&gt;net_dev-&gt;name) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='ctx'> 			neigh_node-&gt;if_incoming-&gt;net_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) ||</div><div class='hunk'>@@ -2066,7 +1860,7 @@ batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @orig_node: Originator to dump</div><div class='ctx'>  * @sub_s: Number of sub entries to skip</div><div class='hunk'>@@ -2116,8 +1910,7 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (neigh_node_best)</div><div class='del'>-		batadv_neigh_node_put(neigh_node_best);</div><div class='add'>+	batadv_neigh_node_put(neigh_node_best);</div><div class='ctx'> </div><div class='ctx'> 	*sub_s = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2129,7 +1922,7 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @head: Bucket to be dumped</div><div class='ctx'>  * @idx_s: Number of entries to be skipped</div><div class='hunk'>@@ -2170,7 +1963,7 @@ batadv_iv_ogm_orig_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * batadv_iv_ogm_orig_dump() - Dump the originators into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -2202,59 +1995,6 @@ batadv_iv_ogm_orig_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 	cb-&gt;args[2] = sub;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_hardif_neigh_print() - print a single hop neighbour node</div><div class='del'>- * @seq: neighbour table seq_file struct</div><div class='del'>- * @hardif_neigh: hardif neighbour information</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_iv_hardif_neigh_print(struct seq_file *seq,</div><div class='del'>-			     struct batadv_hardif_neigh_node *hardif_neigh)</div><div class='del'>-{</div><div class='del'>-	int last_secs, last_msecs;</div><div class='del'>-</div><div class='del'>-	last_secs = jiffies_to_msecs(jiffies - hardif_neigh-&gt;last_seen) / 1000;</div><div class='del'>-	last_msecs = jiffies_to_msecs(jiffies - hardif_neigh-&gt;last_seen) % 1000;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "   %10s   %pM %4i.%03is\n",</div><div class='del'>-		   hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;name,</div><div class='del'>-		   hardif_neigh-&gt;addr, last_secs, last_msecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_iv_ogm_neigh_print() - print the single hop neighbour list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: neighbour table seq_file struct</div><div class='del'>- */</div><div class='del'>-static void batadv_iv_neigh_print(struct batadv_priv *bat_priv,</div><div class='del'>-				  struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	int batman_count = 0;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq, "           IF        Neighbor      last-seen\n");</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != net_dev)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		hlist_for_each_entry_rcu(hardif_neigh,</div><div class='del'>-					 &amp;hard_iface-&gt;neigh_list, list) {</div><div class='del'>-			batadv_iv_hardif_neigh_print(seq, hardif_neigh);</div><div class='del'>-			batman_count++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (batman_count == 0)</div><div class='del'>-		seq_puts(seq, "No batman nodes in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_ogm_neigh_diff() - calculate tq difference of two neighbors</div><div class='ctx'>  * @neigh1: the first neighbor object of the comparison</div><div class='hunk'>@@ -2292,10 +2032,8 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1,</div><div class='ctx'> 	*diff = (int)tq1 - (int)tq2;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (neigh1_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh1_ifinfo);</div><div class='del'>-	if (neigh2_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh2_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh1_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh2_ifinfo);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2325,6 +2063,8 @@ batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,</div><div class='ctx'> 		    hardif_neigh-&gt;addr) ||</div><div class='add'>+	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,</div><div class='add'>+			   hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;name) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='ctx'> 			hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,</div><div class='hunk'>@@ -2345,7 +2085,7 @@ batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @hard_iface: Hard interface to dump the neighbours for</div><div class='ctx'>  * @idx_s: Number of entries to skip</div><div class='ctx'>  *</div><div class='hunk'>@@ -2382,8 +2122,8 @@ batadv_iv_ogm_neigh_dump_hardif(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * batadv_iv_ogm_neigh_dump() - Dump the neighbours into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='del'>- * @single_hardif: Limit dump to this hard interfaace</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='add'>+ * @single_hardif: Limit dump to this hard interface</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='hunk'>@@ -2391,6 +2131,7 @@ batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 			 struct batadv_hard_iface *single_hardif)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int i_hardif = 0;</div><div class='ctx'> 	int i_hardif_s = cb-&gt;args[0];</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='hunk'>@@ -2407,11 +2148,7 @@ batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 				i_hardif++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list,</div><div class='del'>-					list) {</div><div class='del'>-			if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='add'>+		netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 			if (i_hardif++ &lt; i_hardif_s)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2485,7 +2222,7 @@ batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface)</div><div class='add'>+static void batadv_iv_iface_enabled(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='ctx'> 	/* begin scheduling originator messages on that interface */</div><div class='ctx'> 	batadv_iv_ogm_schedule(hard_iface);</div><div class='hunk'>@@ -2493,7 +2230,7 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_init_sel_class() - initialize GW selection class</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_iv_init_sel_class(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -2540,8 +2277,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)</div><div class='ctx'> 			if (tmp_gw_factor &gt; max_gw_factor ||</div><div class='ctx'> 			    (tmp_gw_factor == max_gw_factor &amp;&amp;</div><div class='ctx'> 			     tq_avg &gt; max_tq)) {</div><div class='del'>-				if (curr_gw)</div><div class='del'>-					batadv_gw_node_put(curr_gw);</div><div class='add'>+				batadv_gw_node_put(curr_gw);</div><div class='ctx'> 				curr_gw = gw_node;</div><div class='ctx'> 				kref_get(&amp;curr_gw-&gt;refcount);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2555,8 +2291,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)</div><div class='ctx'> 			  *     $routing_class more tq points)</div><div class='ctx'> 			  */</div><div class='ctx'> 			if (tq_avg &gt; max_tq) {</div><div class='del'>-				if (curr_gw)</div><div class='del'>-					batadv_gw_node_put(curr_gw);</div><div class='add'>+				batadv_gw_node_put(curr_gw);</div><div class='ctx'> 				curr_gw = gw_node;</div><div class='ctx'> 				kref_get(&amp;curr_gw-&gt;refcount);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2573,8 +2308,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='ctx'> 		batadv_neigh_node_put(router);</div><div class='del'>-		if (router_ifinfo)</div><div class='del'>-			batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -2638,95 +2372,26 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (router_gw_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_gw_ifinfo);</div><div class='del'>-	if (router_orig_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_orig_ifinfo);</div><div class='del'>-	if (router_gw)</div><div class='del'>-		batadv_neigh_node_put(router_gw);</div><div class='del'>-	if (router_orig)</div><div class='del'>-		batadv_neigh_node_put(router_orig);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/* fails if orig_node has no router */</div><div class='del'>-static int batadv_iv_gw_write_buffer_text(struct batadv_priv *bat_priv,</div><div class='del'>-					  struct seq_file *seq,</div><div class='del'>-					  const struct batadv_gw_node *gw_node)</div><div class='del'>-{</div><div class='del'>-	struct batadv_gw_node *curr_gw;</div><div class='del'>-	struct batadv_neigh_node *router;</div><div class='del'>-	struct batadv_neigh_ifinfo *router_ifinfo = NULL;</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	router = batadv_orig_router_get(gw_node-&gt;orig_node, BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	router_ifinfo = batadv_neigh_ifinfo_get(router, BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_ifinfo)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_gw_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_orig_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router_gw);</div><div class='add'>+	batadv_neigh_node_put(router_orig);</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n",</div><div class='del'>-		   (curr_gw == gw_node ? "=&gt;" : "  "),</div><div class='del'>-		   gw_node-&gt;orig_node-&gt;orig,</div><div class='del'>-		   router_ifinfo-&gt;bat_iv.tq_avg, router-&gt;addr,</div><div class='del'>-		   router-&gt;if_incoming-&gt;net_dev-&gt;name,</div><div class='del'>-		   gw_node-&gt;bandwidth_down / 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_down % 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_up / 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_up % 10);</div><div class='del'>-	ret = seq_has_overflowed(seq) ? -1 : 0;</div><div class='del'>-</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-out:</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void batadv_iv_gw_print(struct batadv_priv *bat_priv,</div><div class='del'>-			       struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct batadv_gw_node *gw_node;</div><div class='del'>-	int gw_count = 0;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "      Gateway      (#/255)           Nexthop [outgoingIF]: advertised uplink bandwidth\n");</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='del'>-		/* fails if orig_node has no router */</div><div class='del'>-		if (batadv_iv_gw_write_buffer_text(bat_priv, seq, gw_node) &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		gw_count++;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (gw_count == 0)</div><div class='del'>-		seq_puts(seq, "No gateways in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_iv_gw_dump_entry() - Dump a gateway into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @gw_node: Gateway to be dumped</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Error code, or 0 on success</div><div class='ctx'>  */</div><div class='del'>-static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+				   struct netlink_callback *cb,</div><div class='ctx'> 				   struct batadv_priv *bat_priv,</div><div class='ctx'> 				   struct batadv_gw_node *gw_node)</div><div class='ctx'> {</div><div class='hunk'>@@ -2746,13 +2411,16 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_GATEWAYS);</div><div class='ctx'> 	if (!hdr) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	ret = -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (curr_gw == gw_node)</div><div class='hunk'>@@ -2768,6 +2436,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 		    router-&gt;addr) ||</div><div class='ctx'> 	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,</div><div class='ctx'> 			   router-&gt;if_incoming-&gt;net_dev-&gt;name) ||</div><div class='add'>+	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='add'>+			router-&gt;if_incoming-&gt;net_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,</div><div class='ctx'> 			gw_node-&gt;bandwidth_down) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP,</div><div class='hunk'>@@ -2780,12 +2450,9 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='add'>+	batadv_gw_node_put(curr_gw);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2793,7 +2460,7 @@ out:</div><div class='ctx'>  * batadv_iv_gw_dump() - Dump gateways into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 			      struct batadv_priv *bat_priv)</div><div class='hunk'>@@ -2803,13 +2470,15 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 	int idx_skip = cb-&gt;args[0];</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='add'>+	spin_lock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='add'>+	cb-&gt;seq = bat_priv-&gt;gw.generation &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='ctx'> 		if (idx++ &lt; idx_skip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (batadv_iv_gw_dump_entry(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					    bat_priv, gw_node)) {</div><div class='add'>+		if (batadv_iv_gw_dump_entry(msg, portid, cb, bat_priv,</div><div class='add'>+					    gw_node)) {</div><div class='ctx'> 			idx_skip = idx - 1;</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2817,7 +2486,7 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> </div><div class='ctx'> 	idx_skip = idx;</div><div class='ctx'> unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = idx_skip;</div><div class='ctx'> }</div><div class='hunk'>@@ -2825,8 +2494,8 @@ unlock:</div><div class='ctx'> static struct batadv_algo_ops batadv_batman_iv __read_mostly = {</div><div class='ctx'> 	.name = "BATMAN_IV",</div><div class='ctx'> 	.iface = {</div><div class='del'>-		.activate = batadv_iv_iface_activate,</div><div class='ctx'> 		.enable = batadv_iv_ogm_iface_enable,</div><div class='add'>+		.enabled = batadv_iv_iface_enabled,</div><div class='ctx'> 		.disable = batadv_iv_ogm_iface_disable,</div><div class='ctx'> 		.update_mac = batadv_iv_ogm_iface_update_mac,</div><div class='ctx'> 		.primary_set = batadv_iv_ogm_primary_iface_set,</div><div class='hunk'>@@ -2834,27 +2503,16 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = {</div><div class='ctx'> 	.neigh = {</div><div class='ctx'> 		.cmp = batadv_iv_ogm_neigh_cmp,</div><div class='ctx'> 		.is_similar_or_better = batadv_iv_ogm_neigh_is_sob,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_iv_neigh_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_iv_ogm_neigh_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	.orig = {</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_iv_ogm_orig_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_iv_ogm_orig_dump,</div><div class='del'>-		.free = batadv_iv_ogm_orig_free,</div><div class='del'>-		.add_if = batadv_iv_ogm_orig_add_if,</div><div class='del'>-		.del_if = batadv_iv_ogm_orig_del_if,</div><div class='ctx'> 	},</div><div class='ctx'> 	.gw = {</div><div class='ctx'> 		.init_sel_class = batadv_iv_init_sel_class,</div><div class='add'>+		.sel_class_max = BATADV_TQ_MAX_VALUE,</div><div class='ctx'> 		.get_best_gw_node = batadv_iv_gw_get_best_gw_node,</div><div class='ctx'> 		.is_eligible = batadv_iv_gw_is_eligible,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_iv_gw_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_iv_gw_dump,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h<br/>index 3dc6a7a43eb7..04b01bd684e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_iv_ogm.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_iv_ogm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_iv_ogm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_iv_ogm.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BAT_IV_OGM_H_</div><div class='head'>diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c<br/>index 6baec4e68898..de9444714264 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Linus Lüssing, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bat_v.h"</div><div class='hunk'>@@ -25,13 +13,16 @@</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -44,18 +35,15 @@</div><div class='ctx'> #include "bat_v_elp.h"</div><div class='ctx'> #include "bat_v_ogm.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='del'>-#include "gateway_common.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "hash.h"</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hard_iface *primary_if;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -90,6 +78,7 @@ static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> </div><div class='ctx'> static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='add'>+	batadv_v_ogm_iface_disable(hard_iface);</div><div class='ctx'> 	batadv_v_elp_iface_disable(hard_iface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +97,7 @@ static void batadv_v_primary_iface_set(struct batadv_hard_iface *hard_iface)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hard_iface *primary_if;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -117,105 +106,16 @@ static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> </div><div class='ctx'> 	batadv_v_primary_iface_set(hard_iface);</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh)</div><div class='ctx'> {</div><div class='ctx'> 	ewma_throughput_init(&amp;hardif_neigh-&gt;bat_v.throughput);</div><div class='del'>-	INIT_WORK(&amp;hardif_neigh-&gt;bat_v.metric_work,</div><div class='del'>-		  batadv_v_elp_throughput_metric_update);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_v_orig_print_neigh() - print neighbors for the originator table</div><div class='del'>- * @orig_node: the orig_node for which the neighbors are printed</div><div class='del'>- * @if_outgoing: outgoing interface for these entries</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- *</div><div class='del'>- * Must be called while holding an rcu lock.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_v_orig_print_neigh(struct batadv_orig_node *orig_node,</div><div class='del'>-			  struct batadv_hard_iface *if_outgoing,</div><div class='del'>-			  struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct batadv_neigh_node *neigh_node;</div><div class='del'>-	struct batadv_neigh_ifinfo *n_ifinfo;</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(neigh_node, &amp;orig_node-&gt;neigh_list, list) {</div><div class='del'>-		n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);</div><div class='del'>-		if (!n_ifinfo)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		seq_printf(seq, " %pM (%9u.%1u)",</div><div class='del'>-			   neigh_node-&gt;addr,</div><div class='del'>-			   n_ifinfo-&gt;bat_v.throughput / 10,</div><div class='del'>-			   n_ifinfo-&gt;bat_v.throughput % 10);</div><div class='del'>-</div><div class='del'>-		batadv_neigh_ifinfo_put(n_ifinfo);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_v_hardif_neigh_print() - print a single ELP neighbour node</div><div class='del'>- * @seq: neighbour table seq_file struct</div><div class='del'>- * @hardif_neigh: hardif neighbour information</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_v_hardif_neigh_print(struct seq_file *seq,</div><div class='del'>-			    struct batadv_hardif_neigh_node *hardif_neigh)</div><div class='del'>-{</div><div class='del'>-	int last_secs, last_msecs;</div><div class='del'>-	u32 throughput;</div><div class='del'>-</div><div class='del'>-	last_secs = jiffies_to_msecs(jiffies - hardif_neigh-&gt;last_seen) / 1000;</div><div class='del'>-	last_msecs = jiffies_to_msecs(jiffies - hardif_neigh-&gt;last_seen) % 1000;</div><div class='del'>-	throughput = ewma_throughput_read(&amp;hardif_neigh-&gt;bat_v.throughput);</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "%pM %4i.%03is (%9u.%1u) [%10s]\n",</div><div class='del'>-		   hardif_neigh-&gt;addr, last_secs, last_msecs, throughput / 10,</div><div class='del'>-		   throughput % 10, hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_v_neigh_print() - print the single hop neighbour list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: neighbour table seq_file struct</div><div class='del'>- */</div><div class='del'>-static void batadv_v_neigh_print(struct batadv_priv *bat_priv,</div><div class='del'>-				 struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	int batman_count = 0;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "  Neighbor        last-seen ( throughput) [        IF]\n");</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != net_dev)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		hlist_for_each_entry_rcu(hardif_neigh,</div><div class='del'>-					 &amp;hard_iface-&gt;neigh_list, list) {</div><div class='del'>-			batadv_v_hardif_neigh_print(seq, hardif_neigh);</div><div class='del'>-			batman_count++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (batman_count == 0)</div><div class='del'>-		seq_puts(seq, "No batman nodes in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_v_neigh_dump_neigh() - Dump a neighbour into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='hunk'>@@ -243,6 +143,8 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,</div><div class='ctx'> 		    hardif_neigh-&gt;addr) ||</div><div class='add'>+	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,</div><div class='add'>+			   hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;name) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='ctx'> 			hardif_neigh-&gt;if_incoming-&gt;net_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,</div><div class='hunk'>@@ -264,7 +166,7 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @hard_iface: The hard interface to be dumped</div><div class='ctx'>  * @idx_s: Entries to be skipped</div><div class='ctx'>  *</div><div class='hunk'>@@ -301,7 +203,7 @@ batadv_v_neigh_dump_hardif(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  *  message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @single_hardif: Limit dumping to this hard interface</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -310,6 +212,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 		    struct batadv_hard_iface *single_hardif)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int i_hardif = 0;</div><div class='ctx'> 	int i_hardif_s = cb-&gt;args[0];</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='hunk'>@@ -325,10 +228,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 				i_hardif++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-			if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='add'>+		netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 			if (i_hardif++ &lt; i_hardif_s)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -347,81 +247,12 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 	cb-&gt;args[1] = idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_v_orig_print() - print the originator table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- * @if_outgoing: the outgoing interface for which this should be printed</div><div class='del'>- */</div><div class='del'>-static void batadv_v_orig_print(struct batadv_priv *bat_priv,</div><div class='del'>-				struct seq_file *seq,</div><div class='del'>-				struct batadv_hard_iface *if_outgoing)</div><div class='del'>-{</div><div class='del'>-	struct batadv_neigh_node *neigh_node;</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	int last_seen_msecs, last_seen_secs;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct batadv_neigh_ifinfo *n_ifinfo;</div><div class='del'>-	unsigned long last_seen_jiffies;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	int batman_count = 0;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "  Originator      last-seen ( throughput)           Nexthop [outgoingIF]:   Potential nexthops ...\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			neigh_node = batadv_orig_router_get(orig_node,</div><div class='del'>-							    if_outgoing);</div><div class='del'>-			if (!neigh_node)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			n_ifinfo = batadv_neigh_ifinfo_get(neigh_node,</div><div class='del'>-							   if_outgoing);</div><div class='del'>-			if (!n_ifinfo)</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			last_seen_jiffies = jiffies - orig_node-&gt;last_seen;</div><div class='del'>-			last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);</div><div class='del'>-			last_seen_secs = last_seen_msecs / 1000;</div><div class='del'>-			last_seen_msecs = last_seen_msecs % 1000;</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, "%pM %4i.%03is (%9u.%1u) %pM [%10s]:",</div><div class='del'>-				   orig_node-&gt;orig, last_seen_secs,</div><div class='del'>-				   last_seen_msecs,</div><div class='del'>-				   n_ifinfo-&gt;bat_v.throughput / 10,</div><div class='del'>-				   n_ifinfo-&gt;bat_v.throughput % 10,</div><div class='del'>-				   neigh_node-&gt;addr,</div><div class='del'>-				   neigh_node-&gt;if_incoming-&gt;net_dev-&gt;name);</div><div class='del'>-</div><div class='del'>-			batadv_v_orig_print_neigh(orig_node, if_outgoing, seq);</div><div class='del'>-			seq_putc(seq, '\n');</div><div class='del'>-			batman_count++;</div><div class='del'>-</div><div class='del'>-next:</div><div class='del'>-			batadv_neigh_node_put(neigh_node);</div><div class='del'>-			if (n_ifinfo)</div><div class='del'>-				batadv_neigh_ifinfo_put(n_ifinfo);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (batman_count == 0)</div><div class='del'>-		seq_puts(seq, "No batman nodes in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_orig_dump_subentry() - Dump an originator subentry into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @orig_node: Originator to dump</div><div class='ctx'>  * @neigh_node: Single hops neighbour</div><div class='hunk'>@@ -464,6 +295,8 @@ batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node-&gt;orig) ||</div><div class='ctx'> 	    nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,</div><div class='ctx'> 		    neigh_node-&gt;addr) ||</div><div class='add'>+	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,</div><div class='add'>+			   neigh_node-&gt;if_incoming-&gt;net_dev-&gt;name) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='ctx'> 			neigh_node-&gt;if_incoming-&gt;net_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) ||</div><div class='hunk'>@@ -487,7 +320,7 @@ batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @orig_node: Originator to dump</div><div class='ctx'>  * @sub_s: Number of sub entries to skip</div><div class='hunk'>@@ -528,8 +361,7 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (neigh_node_best)</div><div class='del'>-		batadv_neigh_node_put(neigh_node_best);</div><div class='add'>+	batadv_neigh_node_put(neigh_node_best);</div><div class='ctx'> </div><div class='ctx'> 	*sub_s = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -540,7 +372,7 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  * @head: Bucket to be dumped</div><div class='ctx'>  * @idx_s: Number of entries to be skipped</div><div class='hunk'>@@ -580,7 +412,7 @@ batadv_v_orig_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * batadv_v_orig_dump() - Dump the originators into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @if_outgoing: Limit dump to entries with this outgoing interface</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -668,7 +500,7 @@ err_ifinfo1:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_init_sel_class() - initialize GW selection class</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_init_sel_class(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -676,32 +508,6 @@ static void batadv_v_init_sel_class(struct batadv_priv *bat_priv)</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;gw.sel_class, 50);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t batadv_v_store_sel_class(struct batadv_priv *bat_priv,</div><div class='del'>-					char *buff, size_t count)</div><div class='del'>-{</div><div class='del'>-	u32 old_class, class;</div><div class='del'>-</div><div class='del'>-	if (!batadv_parse_throughput(bat_priv-&gt;soft_iface, buff,</div><div class='del'>-				     "B.A.T.M.A.N. V GW selection class",</div><div class='del'>-				     &amp;class))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	old_class = atomic_read(&amp;bat_priv-&gt;gw.sel_class);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;gw.sel_class, class);</div><div class='del'>-</div><div class='del'>-	if (old_class != class)</div><div class='del'>-		batadv_gw_reselect(bat_priv);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_v_show_sel_class(struct batadv_priv *bat_priv, char *buff)</div><div class='del'>-{</div><div class='del'>-	u32 class = atomic_read(&amp;bat_priv-&gt;gw.sel_class);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%u.%u MBit\n", class / 10, class % 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_gw_throughput_get() - retrieve the GW-bandwidth for a given GW</div><div class='ctx'>  * @gw_node: the GW to retrieve the metric for</div><div class='hunk'>@@ -737,17 +543,15 @@ static int batadv_v_gw_throughput_get(struct batadv_gw_node *gw_node, u32 *bw)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_gw_get_best_gw_node() - retrieve the best GW node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the GW node having the best GW-metric, NULL if no GW is known</div><div class='ctx'>  */</div><div class='hunk'>@@ -768,8 +572,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv)</div><div class='ctx'> 		if (curr_gw &amp;&amp; bw &lt;= max_bw)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='del'>-		if (curr_gw)</div><div class='del'>-			batadv_gw_node_put(curr_gw);</div><div class='add'>+		batadv_gw_node_put(curr_gw);</div><div class='ctx'> </div><div class='ctx'> 		curr_gw = gw_node;</div><div class='ctx'> 		kref_get(&amp;curr_gw-&gt;refcount);</div><div class='hunk'>@@ -785,7 +588,7 @@ next:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_gw_is_eligible() - check if a originator would be selected as GW</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @curr_gw_orig: originator representing the currently selected GW</div><div class='ctx'>  * @orig_node: the originator representing the new candidate</div><div class='ctx'>  *</div><div class='hunk'>@@ -831,97 +634,24 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-	if (orig_gw)</div><div class='del'>-		batadv_gw_node_put(orig_gw);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/* fails if orig_node has no router */</div><div class='del'>-static int batadv_v_gw_write_buffer_text(struct batadv_priv *bat_priv,</div><div class='del'>-					 struct seq_file *seq,</div><div class='del'>-					 const struct batadv_gw_node *gw_node)</div><div class='del'>-{</div><div class='del'>-	struct batadv_gw_node *curr_gw;</div><div class='del'>-	struct batadv_neigh_node *router;</div><div class='del'>-	struct batadv_neigh_ifinfo *router_ifinfo = NULL;</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	router = batadv_orig_router_get(gw_node-&gt;orig_node, BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	router_ifinfo = batadv_neigh_ifinfo_get(router, BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_ifinfo)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);</div><div class='add'>+	batadv_gw_node_put(curr_gw);</div><div class='add'>+	batadv_gw_node_put(orig_gw);</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "%s %pM (%9u.%1u) %pM [%10s]: %u.%u/%u.%u MBit\n",</div><div class='del'>-		   (curr_gw == gw_node ? "=&gt;" : "  "),</div><div class='del'>-		   gw_node-&gt;orig_node-&gt;orig,</div><div class='del'>-		   router_ifinfo-&gt;bat_v.throughput / 10,</div><div class='del'>-		   router_ifinfo-&gt;bat_v.throughput % 10, router-&gt;addr,</div><div class='del'>-		   router-&gt;if_incoming-&gt;net_dev-&gt;name,</div><div class='del'>-		   gw_node-&gt;bandwidth_down / 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_down % 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_up / 10,</div><div class='del'>-		   gw_node-&gt;bandwidth_up % 10);</div><div class='del'>-	ret = seq_has_overflowed(seq) ? -1 : 0;</div><div class='del'>-</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-out:</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_v_gw_print() - print the gateway list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: gateway table seq_file struct</div><div class='del'>- */</div><div class='del'>-static void batadv_v_gw_print(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct batadv_gw_node *gw_node;</div><div class='del'>-	int gw_count = 0;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "      Gateway        ( throughput)           Nexthop [outgoingIF]: advertised uplink bandwidth\n");</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='del'>-		/* fails if orig_node has no router */</div><div class='del'>-		if (batadv_v_gw_write_buffer_text(bat_priv, seq, gw_node) &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		gw_count++;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (gw_count == 0)</div><div class='del'>-		seq_puts(seq, "No gateways in range ...\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_v_gw_dump_entry() - Dump a gateway into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @gw_node: Gateway to be dumped</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Error code, or 0 on success</div><div class='ctx'>  */</div><div class='del'>-static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+				  struct netlink_callback *cb,</div><div class='ctx'> 				  struct batadv_priv *bat_priv,</div><div class='ctx'> 				  struct batadv_gw_node *gw_node)</div><div class='ctx'> {</div><div class='hunk'>@@ -941,13 +671,16 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_GATEWAYS);</div><div class='ctx'> 	if (!hdr) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	ret = -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (curr_gw == gw_node) {</div><div class='hunk'>@@ -980,6 +713,12 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='add'>+			router-&gt;if_incoming-&gt;net_dev-&gt;ifindex)) {</div><div class='add'>+		genlmsg_cancel(msg, hdr);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,</div><div class='ctx'> 			gw_node-&gt;bandwidth_down)) {</div><div class='ctx'> 		genlmsg_cancel(msg, hdr);</div><div class='hunk'>@@ -995,12 +734,9 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='add'>+	batadv_gw_node_put(curr_gw);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1008,7 +744,7 @@ out:</div><div class='ctx'>  * batadv_v_gw_dump() - Dump gateways into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Control block containing additional options</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 			     struct batadv_priv *bat_priv)</div><div class='hunk'>@@ -1018,13 +754,15 @@ static void batadv_v_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 	int idx_skip = cb-&gt;args[0];</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='add'>+	spin_lock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='add'>+	cb-&gt;seq = bat_priv-&gt;gw.generation &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(gw_node, &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='ctx'> 		if (idx++ &lt; idx_skip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (batadv_v_gw_dump_entry(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					   bat_priv, gw_node)) {</div><div class='add'>+		if (batadv_v_gw_dump_entry(msg, portid, cb, bat_priv,</div><div class='add'>+					   gw_node)) {</div><div class='ctx'> 			idx_skip = idx - 1;</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1032,7 +770,7 @@ static void batadv_v_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> </div><div class='ctx'> 	idx_skip = idx;</div><div class='ctx'> unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = idx_skip;</div><div class='ctx'> }</div><div class='hunk'>@@ -1050,26 +788,16 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = {</div><div class='ctx'> 		.hardif_init = batadv_v_hardif_neigh_init,</div><div class='ctx'> 		.cmp = batadv_v_neigh_cmp,</div><div class='ctx'> 		.is_similar_or_better = batadv_v_neigh_is_sob,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_v_neigh_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_v_neigh_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	.orig = {</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_v_orig_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_v_orig_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	.gw = {</div><div class='ctx'> 		.init_sel_class = batadv_v_init_sel_class,</div><div class='del'>-		.store_sel_class = batadv_v_store_sel_class,</div><div class='del'>-		.show_sel_class = batadv_v_show_sel_class,</div><div class='add'>+		.sel_class_max = U32_MAX,</div><div class='ctx'> 		.get_best_gw_node = batadv_v_gw_get_best_gw_node,</div><div class='ctx'> 		.is_eligible = batadv_v_gw_is_eligible,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-		.print = batadv_v_gw_print,</div><div class='del'>-#endif</div><div class='ctx'> 		.dump = batadv_v_gw_dump,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -1086,6 +814,11 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_set(&amp;hard_iface-&gt;bat_v.throughput_override, 0);</div><div class='ctx'> 	atomic_set(&amp;hard_iface-&gt;bat_v.elp_interval, 500);</div><div class='add'>+</div><div class='add'>+	hard_iface-&gt;bat_v.aggr_len = 0;</div><div class='add'>+	skb_queue_head_init(&amp;hard_iface-&gt;bat_v.aggr_list);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hard_iface-&gt;bat_v.aggr_wq,</div><div class='add'>+			  batadv_v_ogm_aggr_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h<br/>index ec4a2a569750..964431f4dc8d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Linus Lüssing</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BAT_V_H_</div><div class='head'>diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c<br/>index 9f481cfdf77d..cb16c1ed2a58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_elp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_elp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_elp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v_elp.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Linus Lüssing, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bat_v_elp.h"</div><div class='hunk'>@@ -22,14 +10,16 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/nl80211.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='hunk'>@@ -37,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -44,7 +35,6 @@</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bat_algo.h"</div><div class='ctx'> #include "bat_v_ogm.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "log.h"</div><div class='hunk'>@@ -53,6 +43,18 @@</div><div class='ctx'> #include "send.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct batadv_v_metric_queue_entry - list of hardif neighbors which require</div><div class='add'>+ *  and metric update</div><div class='add'>+ */</div><div class='add'>+struct batadv_v_metric_queue_entry {</div><div class='add'>+	/** @hardif_neigh: hardif neighbor scheduled for metric update */</div><div class='add'>+	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='add'>+</div><div class='add'>+	/** @list: list node for metric_queue */</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_v_elp_start_timer() - restart timer for ELP periodic work</div><div class='ctx'>  * @hard_iface: the interface for which the timer has to be reset</div><div class='ctx'>  */</div><div class='hunk'>@@ -61,7 +63,7 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	unsigned int msecs;</div><div class='ctx'> </div><div class='ctx'> 	msecs = atomic_read(&amp;hard_iface-&gt;bat_v.elp_interval) - BATADV_JITTER;</div><div class='del'>-	msecs += prandom_u32() % (2 * BATADV_JITTER);</div><div class='add'>+	msecs += get_random_u32_below(2 * BATADV_JITTER);</div><div class='ctx'> </div><div class='ctx'> 	queue_delayed_work(batadv_event_workqueue, &amp;hard_iface-&gt;bat_v.elp_wq,</div><div class='ctx'> 			   msecs_to_jiffies(msecs));</div><div class='hunk'>@@ -70,25 +72,36 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_elp_get_throughput() - get the throughput towards a neighbour</div><div class='ctx'>  * @neigh: the neighbour for which the throughput has to be obtained</div><div class='add'>+ * @pthroughput: calculated throughput towards the given neighbour in multiples</div><div class='add'>+ *  of 100kpbs (a value of '1' equals 0.1Mbps, '10' equals 1Mbps, etc).</div><div class='ctx'>  *</div><div class='del'>- * Return: The throughput towards the given neighbour in multiples of 100kpbs</div><div class='del'>- *         (a value of '1' equals to 0.1Mbps, '10' equals 1Mbps, etc).</div><div class='add'>+ * Return: true when value behind @pthroughput was set</div><div class='ctx'>  */</div><div class='del'>-static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)</div><div class='add'>+static bool batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh,</div><div class='add'>+					u32 *pthroughput)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface = neigh-&gt;if_incoming;</div><div class='add'>+	struct net_device *mesh_iface = hard_iface-&gt;mesh_iface;</div><div class='ctx'> 	struct ethtool_link_ksettings link_settings;</div><div class='ctx'> 	struct net_device *real_netdev;</div><div class='ctx'> 	struct station_info sinfo;</div><div class='ctx'> 	u32 throughput;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* don't query throughput when no longer associated with any</div><div class='add'>+	 * batman-adv interface</div><div class='add'>+	 */</div><div class='add'>+	if (!mesh_iface)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* if the user specified a customised value for this interface, then</div><div class='ctx'> 	 * return it directly</div><div class='ctx'> 	 */</div><div class='ctx'> 	throughput =  atomic_read(&amp;hard_iface-&gt;bat_v.throughput_override);</div><div class='del'>-	if (throughput != 0)</div><div class='del'>-		return throughput;</div><div class='add'>+	if (throughput != 0) {</div><div class='add'>+		*pthroughput = throughput;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* if this is a wireless device, then ask its throughput through</div><div class='ctx'> 	 * cfg80211 API</div><div class='hunk'>@@ -104,43 +117,53 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)</div><div class='ctx'> </div><div class='ctx'> 		ret = cfg80211_get_station(real_netdev, neigh-&gt;addr, &amp;sinfo);</div><div class='ctx'> </div><div class='add'>+		if (!ret) {</div><div class='add'>+			/* free the TID stats immediately */</div><div class='add'>+			cfg80211_sinfo_release_content(&amp;sinfo);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		dev_put(real_netdev);</div><div class='ctx'> 		if (ret == -ENOENT) {</div><div class='ctx'> 			/* Node is not associated anymore! It would be</div><div class='ctx'> 			 * possible to delete this neighbor. For now set</div><div class='ctx'> 			 * the throughput metric to 0.</div><div class='ctx'> 			 */</div><div class='del'>-			return 0;</div><div class='add'>+			*pthroughput = 0;</div><div class='add'>+			return true;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto default_throughput;</div><div class='del'>-		if (!(sinfo.filled &amp; BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)))</div><div class='del'>-			goto default_throughput;</div><div class='ctx'> </div><div class='del'>-		return sinfo.expected_throughput / 100;</div><div class='add'>+		if (sinfo.filled &amp; BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) {</div><div class='add'>+			*pthroughput = sinfo.expected_throughput / 100;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* try to estimate the expected throughput based on reported tx</div><div class='add'>+		 * rates</div><div class='add'>+		 */</div><div class='add'>+		if (sinfo.filled &amp; BIT(NL80211_STA_INFO_TX_BITRATE)) {</div><div class='add'>+			*pthroughput = cfg80211_calculate_bitrate(&amp;sinfo.txrate) / 3;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto default_throughput;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* only use rtnl_trylock because the elp worker will be cancelled while</div><div class='add'>+	 * the rntl_lock is held. the cancel_delayed_work_sync() would otherwise</div><div class='add'>+	 * wait forever when the elp work_item was started and it is then also</div><div class='add'>+	 * trying to rtnl_lock</div><div class='add'>+	 */</div><div class='add'>+	if (!rtnl_trylock())</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* if not a wifi interface, check if this device provides data via</div><div class='ctx'> 	 * ethtool (e.g. an Ethernet adapter)</div><div class='ctx'> 	 */</div><div class='del'>-	memset(&amp;link_settings, 0, sizeof(link_settings));</div><div class='del'>-	rtnl_lock();</div><div class='ctx'> 	ret = __ethtool_get_link_ksettings(hard_iface-&gt;net_dev, &amp;link_settings);</div><div class='ctx'> 	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	/* Virtual interface drivers such as tun / tap interfaces, VLAN, etc</div><div class='del'>-	 * tend to initialize the interface throughput with some value for the</div><div class='del'>-	 * sake of having a throughput number to export via ethtool. This</div><div class='del'>-	 * exported throughput leaves batman-adv to conclude the interface</div><div class='del'>-	 * throughput is genuine (reflecting reality), thus no measurements</div><div class='del'>-	 * are necessary.</div><div class='del'>-	 *</div><div class='del'>-	 * Based on the observation that those interface types also tend to set</div><div class='del'>-	 * the link auto-negotiation to 'off', batman-adv shall check this</div><div class='del'>-	 * setting to differentiate between genuine link throughput information</div><div class='del'>-	 * and placeholders installed by virtual interfaces.</div><div class='del'>-	 */</div><div class='del'>-	if (ret == 0 &amp;&amp; link_settings.base.autoneg == AUTONEG_ENABLE) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		/* link characteristics might change over time */</div><div class='ctx'> 		if (link_settings.base.duplex == DUPLEX_FULL)</div><div class='ctx'> 			hard_iface-&gt;bat_v.flags |= BATADV_FULL_DUPLEX;</div><div class='hunk'>@@ -148,13 +171,15 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)</div><div class='ctx'> 			hard_iface-&gt;bat_v.flags &amp;= ~BATADV_FULL_DUPLEX;</div><div class='ctx'> </div><div class='ctx'> 		throughput = link_settings.base.speed;</div><div class='del'>-		if (throughput &amp;&amp; throughput != SPEED_UNKNOWN)</div><div class='del'>-			return throughput * 10;</div><div class='add'>+		if (throughput &amp;&amp; throughput != SPEED_UNKNOWN) {</div><div class='add'>+			*pthroughput = throughput * 10;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> default_throughput:</div><div class='ctx'> 	if (!(hard_iface-&gt;bat_v.flags &amp; BATADV_WARNING_DEFAULT)) {</div><div class='del'>-		batadv_info(hard_iface-&gt;soft_iface,</div><div class='add'>+		batadv_info(mesh_iface,</div><div class='ctx'> 			    "WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps. Consider overriding the throughput manually or checking your driver.\n",</div><div class='ctx'> 			    hard_iface-&gt;net_dev-&gt;name,</div><div class='ctx'> 			    BATADV_THROUGHPUT_DEFAULT_VALUE / 10,</div><div class='hunk'>@@ -163,31 +188,26 @@ default_throughput:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if none of the above cases apply, return the base_throughput */</div><div class='del'>-	return BATADV_THROUGHPUT_DEFAULT_VALUE;</div><div class='add'>+	*pthroughput = BATADV_THROUGHPUT_DEFAULT_VALUE;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_elp_throughput_metric_update() - worker updating the throughput</div><div class='ctx'>  *  metric of a single hop neighbour</div><div class='del'>- * @work: the work queue item</div><div class='add'>+ * @neigh: the neighbour to probe</div><div class='ctx'>  */</div><div class='del'>-void batadv_v_elp_throughput_metric_update(struct work_struct *work)</div><div class='add'>+static void</div><div class='add'>+batadv_v_elp_throughput_metric_update(struct batadv_hardif_neigh_node *neigh)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_hardif_neigh_node_bat_v *neigh_bat_v;</div><div class='del'>-	struct batadv_hardif_neigh_node *neigh;</div><div class='del'>-</div><div class='del'>-	neigh_bat_v = container_of(work, struct batadv_hardif_neigh_node_bat_v,</div><div class='del'>-				   metric_work);</div><div class='del'>-	neigh = container_of(neigh_bat_v, struct batadv_hardif_neigh_node,</div><div class='del'>-			     bat_v);</div><div class='add'>+	u32 throughput;</div><div class='add'>+	bool valid;</div><div class='ctx'> </div><div class='del'>-	ewma_throughput_add(&amp;neigh-&gt;bat_v.throughput,</div><div class='del'>-			    batadv_v_elp_get_throughput(neigh));</div><div class='add'>+	valid = batadv_v_elp_get_throughput(neigh, &amp;throughput);</div><div class='add'>+	if (!valid)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* decrement refcounter to balance increment performed before scheduling</div><div class='del'>-	 * this task</div><div class='del'>-	 */</div><div class='del'>-	batadv_hardif_neigh_put(neigh);</div><div class='add'>+	ewma_throughput_add(&amp;neigh-&gt;bat_v.throughput, throughput);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -196,8 +216,8 @@ void batadv_v_elp_throughput_metric_update(struct work_struct *work)</div><div class='ctx'>  *</div><div class='ctx'>  * Sends a predefined number of unicast wifi packets to a given neighbour in</div><div class='ctx'>  * order to trigger the throughput estimation on this link by the RC algorithm.</div><div class='del'>- * Packets are sent only if there there is not enough payload unicast traffic</div><div class='del'>- * towards this neighbour..</div><div class='add'>+ * Packets are sent only if there is not enough payload unicast traffic towards</div><div class='add'>+ * this neighbour..</div><div class='ctx'>  *</div><div class='ctx'>  * Return: True on success and false in case of error during skb preparation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -205,7 +225,7 @@ static bool</div><div class='ctx'> batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface = neigh-&gt;if_incoming;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	unsigned long last_tx_diff;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int probe_len, i;</div><div class='hunk'>@@ -257,22 +277,24 @@ batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh)</div><div class='ctx'>  * batadv_v_elp_periodic_work() - ELP periodic task per interface</div><div class='ctx'>  * @work: work queue item</div><div class='ctx'>  *</div><div class='del'>- * Emits broadcast ELP message in regular intervals.</div><div class='add'>+ * Emits broadcast ELP messages in regular intervals.</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_elp_periodic_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct batadv_v_metric_queue_entry *metric_entry;</div><div class='add'>+	struct batadv_v_metric_queue_entry *metric_safe;</div><div class='ctx'> 	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='ctx'> 	struct batadv_hard_iface_bat_v *bat_v;</div><div class='ctx'> 	struct batadv_elp_packet *elp_packet;</div><div class='add'>+	struct list_head metric_queue;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u32 elp_interval;</div><div class='del'>-	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	bat_v = container_of(work, struct batadv_hard_iface_bat_v, elp_wq.work);</div><div class='ctx'> 	hard_iface = container_of(bat_v, struct batadv_hard_iface, bat_v);</div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_DEACTIVATING)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -304,6 +326,8 @@ static void batadv_v_elp_periodic_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;hard_iface-&gt;bat_v.elp_seqno);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;metric_queue);</div><div class='add'>+</div><div class='ctx'> 	/* The throughput metric is updated on each sent packet. This way, if a</div><div class='ctx'> 	 * node is dead and no longer sends packets, batman-adv is still able to</div><div class='ctx'> 	 * react timely to its death.</div><div class='hunk'>@@ -328,16 +352,28 @@ static void batadv_v_elp_periodic_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		/* Reading the estimated throughput from cfg80211 is a task that</div><div class='ctx'> 		 * may sleep and that is not allowed in an rcu protected</div><div class='del'>-		 * context. Therefore schedule a task for that.</div><div class='add'>+		 * context. Therefore add it to metric_queue and process it</div><div class='add'>+		 * outside rcu protected context.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = queue_work(batadv_event_workqueue,</div><div class='del'>-				 &amp;hardif_neigh-&gt;bat_v.metric_work);</div><div class='del'>-</div><div class='del'>-		if (!ret)</div><div class='add'>+		metric_entry = kzalloc(sizeof(*metric_entry), GFP_ATOMIC);</div><div class='add'>+		if (!metric_entry) {</div><div class='ctx'> 			batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		metric_entry-&gt;hardif_neigh = hardif_neigh;</div><div class='add'>+		list_add(&amp;metric_entry-&gt;list, &amp;metric_queue);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	list_for_each_entry_safe(metric_entry, metric_safe, &amp;metric_queue, list) {</div><div class='add'>+		batadv_v_elp_throughput_metric_update(metric_entry-&gt;hardif_neigh);</div><div class='add'>+</div><div class='add'>+		batadv_hardif_neigh_put(metric_entry-&gt;hardif_neigh);</div><div class='add'>+		list_del(&amp;metric_entry-&gt;list);</div><div class='add'>+		kfree(metric_entry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> restart_timer:</div><div class='ctx'> 	batadv_v_elp_start_timer(hard_iface);</div><div class='ctx'> out:</div><div class='hunk'>@@ -352,19 +388,21 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='add'>+	static const size_t tvlv_padding = sizeof(__be32);</div><div class='ctx'> 	struct batadv_elp_packet *elp_packet;</div><div class='ctx'> 	unsigned char *elp_buff;</div><div class='ctx'> 	u32 random_seqno;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int res = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	size = ETH_HLEN + NET_IP_ALIGN + BATADV_ELP_HLEN;</div><div class='add'>+	size = ETH_HLEN + NET_IP_ALIGN + BATADV_ELP_HLEN + tvlv_padding;</div><div class='ctx'> 	hard_iface-&gt;bat_v.elp_skb = dev_alloc_skb(size);</div><div class='ctx'> 	if (!hard_iface-&gt;bat_v.elp_skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(hard_iface-&gt;bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN);</div><div class='del'>-	elp_buff = skb_put_zero(hard_iface-&gt;bat_v.elp_skb, BATADV_ELP_HLEN);</div><div class='add'>+	elp_buff = skb_put_zero(hard_iface-&gt;bat_v.elp_skb,</div><div class='add'>+				BATADV_ELP_HLEN + tvlv_padding);</div><div class='ctx'> 	elp_packet = (struct batadv_elp_packet *)elp_buff;</div><div class='ctx'> </div><div class='ctx'> 	elp_packet-&gt;packet_type = BATADV_ELP;</div><div class='hunk'>@@ -433,21 +471,18 @@ void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,</div><div class='ctx'> void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	/* update orig field of every elp iface belonging to this mesh */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (primary_iface-&gt;soft_iface != hard_iface-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='add'>+	netdev_for_each_lower_private_rcu(primary_iface-&gt;mesh_iface, hard_iface, iter)</div><div class='ctx'> 		batadv_v_elp_iface_activate(primary_iface, hard_iface);</div><div class='del'>-	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_elp_neigh_update() - update an ELP neighbour node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @neigh_addr: the neighbour interface address</div><div class='ctx'>  * @if_incoming: the interface the packet was received through</div><div class='ctx'>  * @elp_packet: the received ELP packet</div><div class='hunk'>@@ -495,14 +530,11 @@ static void batadv_v_elp_neigh_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 	hardif_neigh-&gt;bat_v.elp_interval = ntohl(elp_packet-&gt;elp_interval);</div><div class='ctx'> </div><div class='ctx'> hardif_free:</div><div class='del'>-	if (hardif_neigh)</div><div class='del'>-		batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+	batadv_hardif_neigh_put(hardif_neigh);</div><div class='ctx'> neigh_free:</div><div class='del'>-	if (neigh)</div><div class='del'>-		batadv_neigh_node_put(neigh);</div><div class='add'>+	batadv_neigh_node_put(neigh);</div><div class='ctx'> orig_free:</div><div class='del'>-	if (orig_neigh)</div><div class='del'>-		batadv_orig_node_put(orig_neigh);</div><div class='add'>+	batadv_orig_node_put(orig_neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -510,16 +542,16 @@ orig_free:</div><div class='ctx'>  * @skb: the received packet</div><div class='ctx'>  * @if_incoming: the interface this packet was received through</div><div class='ctx'>  *</div><div class='del'>- * Return: NET_RX_SUCCESS and consumes the skb if the packet was peoperly</div><div class='add'>+ * Return: NET_RX_SUCCESS and consumes the skb if the packet was properly</div><div class='ctx'>  * processed or NET_RX_DROP in case of failure.</div><div class='ctx'>  */</div><div class='ctx'> int batadv_v_elp_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *if_incoming)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_elp_packet *elp_packet;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='ctx'> 	bool res;</div><div class='ctx'> 	int ret = NET_RX_DROP;</div><div class='ctx'> </div><div class='hunk'>@@ -527,6 +559,7 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='add'>+	ethhdr = eth_hdr(skb);</div><div class='ctx'> 	if (batadv_is_my_mac(bat_priv, ethhdr-&gt;h_source))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='head'>diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h<br/>index e8c7b7fd290d..c9cb0a307100 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_elp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_elp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_elp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v_elp.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Linus Lüssing, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_</div><div class='hunk'>@@ -21,8 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-struct work_struct;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> </div><div class='ctx'> int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface);</div><div class='ctx'> void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface);</div><div class='hunk'>@@ -31,6 +18,5 @@ void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,</div><div class='ctx'> void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface);</div><div class='ctx'> int batadv_v_elp_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *if_incoming);</div><div class='del'>-void batadv_v_elp_throughput_metric_update(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_BAT_V_ELP_H_ */</div><div class='head'>diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c<br/>index 2948b41b06d4..e3870492dab7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_ogm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_ogm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_ogm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v_ogm.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bat_v_ogm.h"</div><div class='hunk'>@@ -21,27 +9,29 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bat_algo.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "hash.h"</div><div class='ctx'> #include "log.h"</div><div class='hunk'>@@ -53,12 +43,12 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_orig_get() - retrieve and possibly create an originator node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the address of the originator</div><div class='ctx'>  *</div><div class='del'>- * Return: the orig_node corresponding to the specified address. If such object</div><div class='del'>- * does not exist it is allocated here. In case of allocation failure returns</div><div class='del'>- * NULL.</div><div class='add'>+ * Return: the orig_node corresponding to the specified address. If such an</div><div class='add'>+ * object does not exist, it is allocated here. In case of allocation failure</div><div class='add'>+ * returns NULL.</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 					       const u8 *addr)</div><div class='hunk'>@@ -89,8 +79,22 @@ struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_v_ogm_start_queue_timer() - restart the OGM aggregation timer</div><div class='add'>+ * @hard_iface: the interface to use to send the OGM</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000;</div><div class='add'>+</div><div class='add'>+	/* msecs * [0.9, 1.1] */</div><div class='add'>+	msecs += get_random_u32_below(msecs / 5) - (msecs / 10);</div><div class='add'>+	queue_delayed_work(batadv_event_workqueue, &amp;hard_iface-&gt;bat_v.aggr_wq,</div><div class='add'>+			   msecs_to_jiffies(msecs / 1000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_v_ogm_start_timer() - restart the OGM sending timer</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_ogm_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -102,7 +106,7 @@ static void batadv_v_ogm_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	msecs = atomic_read(&amp;bat_priv-&gt;orig_interval) - BATADV_JITTER;</div><div class='del'>-	msecs += prandom_u32() % (2 * BATADV_JITTER);</div><div class='add'>+	msecs += get_random_u32_below(2 * BATADV_JITTER);</div><div class='ctx'> 	queue_delayed_work(batadv_event_workqueue, &amp;bat_priv-&gt;bat_v.ogm_wq,</div><div class='ctx'> 			   msecs_to_jiffies(msecs));</div><div class='ctx'> }</div><div class='hunk'>@@ -115,10 +119,12 @@ static void batadv_v_ogm_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> static void batadv_v_ogm_send_to_if(struct sk_buff *skb,</div><div class='ctx'> 				    struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='del'>-	if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='add'>+	if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);</div><div class='ctx'> 	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,</div><div class='hunk'>@@ -128,23 +134,141 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_v_ogm_send() - periodic worker broadcasting the own OGM</div><div class='del'>- * @work: work queue item</div><div class='add'>+ * batadv_v_ogm_len() - OGMv2 packet length</div><div class='add'>+ * @skb: the OGM to check</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of the given OGMv2 packet, including tvlv length, excluding</div><div class='add'>+ * ethernet header length.</div><div class='ctx'>  */</div><div class='del'>-static void batadv_v_ogm_send(struct work_struct *work)</div><div class='add'>+static unsigned int batadv_v_ogm_len(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct batadv_ogm2_packet *ogm_packet;</div><div class='add'>+</div><div class='add'>+	ogm_packet = (struct batadv_ogm2_packet *)skb-&gt;data;</div><div class='add'>+	return BATADV_OGM2_HLEN + ntohs(ogm_packet-&gt;tvlv_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_queue_left() - check if given OGM still fits aggregation queue</div><div class='add'>+ * @skb: the OGM to check</div><div class='add'>+ * @hard_iface: the interface to use to send the OGM</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold the hard_iface-&gt;bat_v.aggr_list.lock.</div><div class='add'>+ *</div><div class='add'>+ * Return: True, if the given OGMv2 packet still fits, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_v_ogm_queue_left(struct sk_buff *skb,</div><div class='add'>+				    struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	unsigned int max = min_t(unsigned int, hard_iface-&gt;net_dev-&gt;mtu,</div><div class='add'>+				 BATADV_MAX_AGGREGATION_BYTES);</div><div class='add'>+	unsigned int ogm_len = batadv_v_ogm_len(skb);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+</div><div class='add'>+	return hard_iface-&gt;bat_v.aggr_len + ogm_len &lt;= max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_aggr_list_free - free all elements in an aggregation queue</div><div class='add'>+ * @hard_iface: the interface holding the aggregation queue</div><div class='add'>+ *</div><div class='add'>+ * Empties the OGMv2 aggregation queue and frees all the skbs it contains.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold the hard_iface-&gt;bat_v.aggr_list.lock.</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+</div><div class='add'>+	__skb_queue_purge(&amp;hard_iface-&gt;bat_v.aggr_list);</div><div class='add'>+	hard_iface-&gt;bat_v.aggr_len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_aggr_send() - flush &amp; send aggregation queue</div><div class='add'>+ * @hard_iface: the interface with the aggregation queue to flush</div><div class='add'>+ *</div><div class='add'>+ * Aggregates all OGMv2 packets currently in the aggregation queue into a</div><div class='add'>+ * single OGMv2 packet and transmits this aggregate.</div><div class='add'>+ *</div><div class='add'>+ * The aggregation queue is empty after this call.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold the hard_iface-&gt;bat_v.aggr_list.lock.</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	unsigned int aggr_len = hard_iface-&gt;bat_v.aggr_len;</div><div class='add'>+	struct sk_buff *skb_aggr;</div><div class='add'>+	unsigned int ogm_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+</div><div class='add'>+	if (!aggr_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_aggr = dev_alloc_skb(aggr_len + ETH_HLEN + NET_IP_ALIGN);</div><div class='add'>+	if (!skb_aggr) {</div><div class='add'>+		batadv_v_ogm_aggr_list_free(hard_iface);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb_aggr, ETH_HLEN + NET_IP_ALIGN);</div><div class='add'>+	skb_reset_network_header(skb_aggr);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;hard_iface-&gt;bat_v.aggr_list))) {</div><div class='add'>+		hard_iface-&gt;bat_v.aggr_len -= batadv_v_ogm_len(skb);</div><div class='add'>+</div><div class='add'>+		ogm_len = batadv_v_ogm_len(skb);</div><div class='add'>+		skb_put_data(skb_aggr, skb-&gt;data, ogm_len);</div><div class='add'>+</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	batadv_v_ogm_send_to_if(skb_aggr, hard_iface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_queue_on_if() - queue a batman ogm on a given interface</div><div class='add'>+ * @skb: the OGM to queue</div><div class='add'>+ * @hard_iface: the interface to queue the OGM on</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_queue_on_if(struct sk_buff *skb,</div><div class='add'>+				     struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;bat_priv-&gt;aggregated_ogms)) {</div><div class='add'>+		batadv_v_ogm_send_to_if(skb, hard_iface);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+	if (!batadv_v_ogm_queue_left(skb, hard_iface))</div><div class='add'>+		batadv_v_ogm_aggr_send(hard_iface);</div><div class='add'>+</div><div class='add'>+	hard_iface-&gt;bat_v.aggr_len += batadv_v_ogm_len(skb);</div><div class='add'>+	__skb_queue_tail(&amp;hard_iface-&gt;bat_v.aggr_list, skb);</div><div class='add'>+	spin_unlock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_send_meshif() - periodic worker broadcasting the own OGM</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_send_meshif(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	struct batadv_priv_bat_v *bat_v;</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct batadv_ogm2_packet *ogm_packet;</div><div class='ctx'> 	struct sk_buff *skb, *skb_tmp;</div><div class='ctx'> 	unsigned char *ogm_buff;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int ogm_buff_len;</div><div class='ctx'> 	u16 tvlv_len = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	bat_v = container_of(work, struct batadv_priv_bat_v, ogm_wq.work);</div><div class='del'>-	bat_priv = container_of(bat_v, struct batadv_priv, bat_v);</div><div class='add'>+	lockdep_assert_held(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_DEACTIVATING)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -176,10 +300,7 @@ static void batadv_v_ogm_send(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* broadcast on every interface */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -222,7 +343,7 @@ static void batadv_v_ogm_send(struct work_struct *work)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		batadv_v_ogm_send_to_if(skb_tmp, hard_iface);</div><div class='add'>+		batadv_v_ogm_queue_on_if(skb_tmp, hard_iface);</div><div class='ctx'> 		batadv_hardif_put(hard_iface);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -236,56 +357,114 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_v_ogm_send() - periodic worker broadcasting the own OGM</div><div class='add'>+ * @work: work queue item</div><div class='add'>+ */</div><div class='add'>+static void batadv_v_ogm_send(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct batadv_priv_bat_v *bat_v;</div><div class='add'>+	struct batadv_priv *bat_priv;</div><div class='add'>+</div><div class='add'>+	bat_v = container_of(work, struct batadv_priv_bat_v, ogm_wq.work);</div><div class='add'>+	bat_priv = container_of(bat_v, struct batadv_priv, bat_v);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='add'>+	batadv_v_ogm_send_meshif(bat_priv);</div><div class='add'>+	mutex_unlock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_v_ogm_aggr_work() - OGM queue periodic task per interface</div><div class='add'>+ * @work: work queue item</div><div class='add'>+ *</div><div class='add'>+ * Emits aggregated OGM messages in regular intervals.</div><div class='add'>+ */</div><div class='add'>+void batadv_v_ogm_aggr_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface_bat_v *batv;</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+</div><div class='add'>+	batv = container_of(work, struct batadv_hard_iface_bat_v, aggr_wq.work);</div><div class='add'>+	hard_iface = container_of(batv, struct batadv_hard_iface, bat_v);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+	batadv_v_ogm_aggr_send(hard_iface);</div><div class='add'>+	spin_unlock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+</div><div class='add'>+	batadv_v_ogm_start_queue_timer(hard_iface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_v_ogm_iface_enable() - prepare an interface for B.A.T.M.A.N. V</div><div class='ctx'>  * @hard_iface: the interface to prepare</div><div class='ctx'>  *</div><div class='del'>- * Takes care of scheduling own OGM sending routine for this interface.</div><div class='add'>+ * Takes care of scheduling its own OGM sending routine for this interface.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='add'>+	batadv_v_ogm_start_queue_timer(hard_iface);</div><div class='ctx'> 	batadv_v_ogm_start_timer(bat_priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_v_ogm_iface_disable() - release OGM interface private resources</div><div class='add'>+ * @hard_iface: interface for which the resources have to be released</div><div class='add'>+ */</div><div class='add'>+void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;hard_iface-&gt;bat_v.aggr_wq);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+	batadv_v_ogm_aggr_list_free(hard_iface);</div><div class='add'>+	spin_unlock_bh(&amp;hard_iface-&gt;bat_v.aggr_list.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_v_ogm_primary_iface_set() - set a new primary interface</div><div class='ctx'>  * @primary_iface: the new primary interface</div><div class='ctx'>  */</div><div class='ctx'> void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(primary_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(primary_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_ogm2_packet *ogm_packet;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='ctx'> 	if (!bat_priv-&gt;bat_v.ogm_buff)</div><div class='del'>-		return;</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	ogm_packet = (struct batadv_ogm2_packet *)bat_priv-&gt;bat_v.ogm_buff;</div><div class='ctx'> 	ether_addr_copy(ogm_packet-&gt;orig, primary_iface-&gt;net_dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_forward_penalty() - apply a penalty to the throughput metric</div><div class='ctx'>  *  forwarded with B.A.T.M.A.N. V OGMs</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @if_incoming: the interface where the OGM has been received</div><div class='ctx'>  * @if_outgoing: the interface where the OGM has to be forwarded to</div><div class='ctx'>  * @throughput: the current throughput</div><div class='ctx'>  *</div><div class='ctx'>  * Apply a penalty on the current throughput metric value based on the</div><div class='del'>- * characteristic of the interface where the OGM has been received. The return</div><div class='del'>- * value is computed as follows:</div><div class='add'>+ * characteristic of the interface where the OGM has been received.</div><div class='add'>+ *</div><div class='add'>+ * Initially the per hardif hop penalty is applied to the throughput. After</div><div class='add'>+ * that the return value is then computed as follows:</div><div class='ctx'>  * - throughput * 50%          if the incoming and outgoing interface are the</div><div class='ctx'>  *                             same WiFi interface and the throughput is above</div><div class='ctx'>  *                             1MBit/s</div><div class='ctx'>  * - throughput                if the outgoing interface is the default</div><div class='ctx'>  *                             interface (i.e. this OGM is processed for the</div><div class='ctx'>  *                             internal table and not forwarded)</div><div class='del'>- * - throughput * hop penalty  otherwise</div><div class='add'>+ * - throughput * node hop penalty  otherwise</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the penalised throughput metric.</div><div class='ctx'>  */</div><div class='hunk'>@@ -294,9 +473,14 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv,</div><div class='ctx'> 				    struct batadv_hard_iface *if_outgoing,</div><div class='ctx'> 				    u32 throughput)</div><div class='ctx'> {</div><div class='add'>+	int if_hop_penalty = atomic_read(&amp;if_incoming-&gt;hop_penalty);</div><div class='ctx'> 	int hop_penalty = atomic_read(&amp;bat_priv-&gt;hop_penalty);</div><div class='ctx'> 	int hop_penalty_max = BATADV_TQ_MAX_VALUE;</div><div class='ctx'> </div><div class='add'>+	/* Apply per hardif hop penalty */</div><div class='add'>+	throughput = throughput * (hop_penalty_max - if_hop_penalty) /</div><div class='add'>+		     hop_penalty_max;</div><div class='add'>+</div><div class='ctx'> 	/* Don't apply hop penalty in default originator table. */</div><div class='ctx'> 	if (if_outgoing == BATADV_IF_DEFAULT)</div><div class='ctx'> 		return throughput;</div><div class='hunk'>@@ -317,7 +501,7 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_forward() - check conditions and forward an OGM to the given</div><div class='ctx'>  *  outgoing interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ogm_received: previously received OGM to be forwarded</div><div class='ctx'>  * @orig_node: the originator which has been updated</div><div class='ctx'>  * @neigh_node: the neigh_node through with the OGM has been received</div><div class='hunk'>@@ -394,20 +578,17 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv,</div><div class='ctx'> 		   if_outgoing-&gt;net_dev-&gt;name, ntohl(ogm_forward-&gt;throughput),</div><div class='ctx'> 		   ogm_forward-&gt;ttl, if_incoming-&gt;net_dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	batadv_v_ogm_send_to_if(skb, if_outgoing);</div><div class='add'>+	batadv_v_ogm_queue_on_if(skb, if_outgoing);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (orig_ifinfo)</div><div class='del'>-		batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (neigh_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='add'>+	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_metric_update() - update route metric based on OGM</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ogm2: OGM2 structure</div><div class='ctx'>  * @orig_node: Originator structure for which the OGM has been received</div><div class='ctx'>  * @neigh_node: the neigh_node through with the OGM has been received</div><div class='hunk'>@@ -482,17 +663,15 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	if (orig_ifinfo)</div><div class='del'>-		batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='del'>-	if (neigh_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='add'>+	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_route_update() - update routes based on OGM</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ethhdr: the Ethernet header of the OGM2</div><div class='ctx'>  * @ogm2: OGM2 structure</div><div class='ctx'>  * @orig_node: Originator structure for which the OGM has been received</div><div class='hunk'>@@ -576,23 +755,18 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	batadv_update_route(bat_priv, orig_node, if_outgoing, neigh_node);</div><div class='ctx'> out:</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (orig_neigh_router)</div><div class='del'>-		batadv_neigh_node_put(orig_neigh_router);</div><div class='del'>-	if (orig_neigh_node)</div><div class='del'>-		batadv_orig_node_put(orig_neigh_node);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='del'>-	if (neigh_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_node_put(orig_neigh_router);</div><div class='add'>+	batadv_orig_node_put(orig_neigh_node);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_neigh_ifinfo_put(neigh_ifinfo);</div><div class='ctx'> </div><div class='ctx'> 	return forward;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_process_per_outif() - process a batman v OGM for an outgoing if</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ethhdr: the Ethernet header of the OGM2</div><div class='ctx'>  * @ogm2: OGM2 structure</div><div class='ctx'>  * @orig_node: Originator structure for which the OGM has been received</div><div class='hunk'>@@ -623,8 +797,8 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	/* only unknown &amp; newer OGMs contain TVLVs we are interested in */</div><div class='ctx'> 	if (seqno_age &gt; 0 &amp;&amp; if_outgoing == BATADV_IF_DEFAULT)</div><div class='del'>-		batadv_tvlv_containers_process(bat_priv, true, orig_node,</div><div class='del'>-					       NULL, NULL,</div><div class='add'>+		batadv_tvlv_containers_process(bat_priv, BATADV_OGM2, orig_node,</div><div class='add'>+					       NULL,</div><div class='ctx'> 					       (unsigned char *)(ogm2 + 1),</div><div class='ctx'> 					       ntohs(ogm2-&gt;tvlv_len));</div><div class='ctx'> </div><div class='hunk'>@@ -643,32 +817,37 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,</div><div class='ctx'>  * batadv_v_ogm_aggr_packet() - checks if there is another OGM aggregated</div><div class='ctx'>  * @buff_pos: current position in the skb</div><div class='ctx'>  * @packet_len: total length of the skb</div><div class='del'>- * @tvlv_len: tvlv length of the previously considered OGM</div><div class='add'>+ * @ogm2_packet: potential OGM2 in buffer</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if there is enough space for another OGM, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_v_ogm_aggr_packet(int buff_pos, int packet_len,</div><div class='del'>-				     __be16 tvlv_len)</div><div class='add'>+static bool</div><div class='add'>+batadv_v_ogm_aggr_packet(int buff_pos, int packet_len,</div><div class='add'>+			 const struct batadv_ogm2_packet *ogm2_packet)</div><div class='ctx'> {</div><div class='ctx'> 	int next_buff_pos = 0;</div><div class='ctx'> </div><div class='del'>-	next_buff_pos += buff_pos + BATADV_OGM2_HLEN;</div><div class='del'>-	next_buff_pos += ntohs(tvlv_len);</div><div class='add'>+	/* check if there is enough space for the header */</div><div class='add'>+	next_buff_pos += buff_pos + sizeof(*ogm2_packet);</div><div class='add'>+	if (next_buff_pos &gt; packet_len)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return (next_buff_pos &lt;= packet_len) &amp;&amp;</div><div class='del'>-	       (next_buff_pos &lt;= BATADV_MAX_AGGREGATION_BYTES);</div><div class='add'>+	/* check if there is enough space for the optional TVLV */</div><div class='add'>+	next_buff_pos += ntohs(ogm2_packet-&gt;tvlv_len);</div><div class='add'>+</div><div class='add'>+	return next_buff_pos &lt;= packet_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_process() - process an incoming batman v OGM</div><div class='ctx'>  * @skb: the skb containing the OGM</div><div class='ctx'>  * @ogm_offset: offset to the OGM which should be processed (for aggregates)</div><div class='del'>- * @if_incoming: the interface where this packet was receved</div><div class='add'>+ * @if_incoming: the interface where this packet was received</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 				 struct batadv_hard_iface *if_incoming)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	struct batadv_hardif_neigh_node *hardif_neigh = NULL;</div><div class='hunk'>@@ -676,6 +855,7 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='ctx'> 	struct batadv_ogm2_packet *ogm_packet;</div><div class='ctx'> 	u32 ogm_throughput, link_throughput, path_throughput;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ethhdr = eth_hdr(skb);</div><div class='hunk'>@@ -690,6 +870,12 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 		   ntohl(ogm_packet-&gt;seqno), ogm_throughput, ogm_packet-&gt;ttl,</div><div class='ctx'> 		   ogm_packet-&gt;version, ntohs(ogm_packet-&gt;tvlv_len));</div><div class='ctx'> </div><div class='add'>+	if (batadv_is_my_mac(bat_priv, ogm_packet-&gt;orig)) {</div><div class='add'>+		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='add'>+			   "Drop packet: originator packet from ourself\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If the throughput metric is 0, immediately drop the packet. No need</div><div class='ctx'> 	 * to create orig_node / neigh_node for an unusable route.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -709,7 +895,7 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> </div><div class='ctx'> 	orig_node = batadv_v_ogm_orig_get(bat_priv, ogm_packet-&gt;orig);</div><div class='ctx'> 	if (!orig_node)</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	neigh_node = batadv_neigh_node_get_or_create(orig_node, if_incoming,</div><div class='ctx'> 						     ethhdr-&gt;h_source);</div><div class='hunk'>@@ -732,13 +918,10 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 				       BATADV_IF_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -779,12 +962,9 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='del'>-	if (neigh_node)</div><div class='del'>-		batadv_neigh_node_put(neigh_node);</div><div class='del'>-	if (hardif_neigh)</div><div class='del'>-		batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_neigh_node_put(neigh_node);</div><div class='add'>+	batadv_hardif_neigh_put(hardif_neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -798,9 +978,9 @@ out:</div><div class='ctx'> int batadv_v_ogm_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *if_incoming)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(if_incoming-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_ogm2_packet *ogm_packet;</div><div class='del'>-	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='ctx'> 	int ogm_offset;</div><div class='ctx'> 	u8 *packet_pos;</div><div class='ctx'> 	int ret = NET_RX_DROP;</div><div class='hunk'>@@ -814,14 +994,10 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 	if (!batadv_check_management_packet(skb, if_incoming, BATADV_OGM2_HLEN))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='add'>+	ethhdr = eth_hdr(skb);</div><div class='ctx'> 	if (batadv_is_my_mac(bat_priv, ethhdr-&gt;h_source))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='del'>-	ogm_packet = (struct batadv_ogm2_packet *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (batadv_is_my_mac(bat_priv, ogm_packet-&gt;orig))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);</div><div class='ctx'> 	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES,</div><div class='ctx'> 			   skb-&gt;len + ETH_HLEN);</div><div class='hunk'>@@ -830,7 +1006,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb,</div><div class='ctx'> 	ogm_packet = (struct batadv_ogm2_packet *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	while (batadv_v_ogm_aggr_packet(ogm_offset, skb_headlen(skb),</div><div class='del'>-					ogm_packet-&gt;tvlv_len)) {</div><div class='add'>+					ogm_packet)) {</div><div class='ctx'> 		batadv_v_ogm_process(skb, ogm_offset, if_incoming);</div><div class='ctx'> </div><div class='ctx'> 		ogm_offset += BATADV_OGM2_HLEN;</div><div class='hunk'>@@ -853,7 +1029,7 @@ free_skb:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_init() - initialise the OGM2 engine</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or a negative error code in case of failure</div><div class='ctx'>  */</div><div class='hunk'>@@ -881,18 +1057,24 @@ int batadv_v_ogm_init(struct batadv_priv *bat_priv)</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;bat_v.ogm_seqno, random_seqno);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;bat_priv-&gt;bat_v.ogm_wq, batadv_v_ogm_send);</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_v_ogm_free() - free OGM private resources</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_v_ogm_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bat_priv-&gt;bat_v.ogm_wq);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='add'>+</div><div class='ctx'> 	kfree(bat_priv-&gt;bat_v.ogm_buff);</div><div class='ctx'> 	bat_priv-&gt;bat_v.ogm_buff = NULL;</div><div class='ctx'> 	bat_priv-&gt;bat_v.ogm_buff_len = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;bat_priv-&gt;bat_v.ogm_buff_mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h<br/>index e5be14c908c6..edeffedecade 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_ogm.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bat_v_ogm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bat_v_ogm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bat_v_ogm.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BAT_V_OGM_H_</div><div class='hunk'>@@ -21,13 +9,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct sk_buff;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> int batadv_v_ogm_init(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_v_ogm_free(struct batadv_priv *bat_priv);</div><div class='add'>+void batadv_v_ogm_aggr_work(struct work_struct *work);</div><div class='ctx'> int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface);</div><div class='add'>+void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface);</div><div class='ctx'> struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 					       const u8 *addr);</div><div class='ctx'> void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface);</div><div class='head'>diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c<br/>index a296a4d851f5..2c49b2711650 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bitarray.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bitarray.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bitarray.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bitarray.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2006-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bitarray.h"</div><div class='hunk'>@@ -35,7 +23,7 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, s32 n)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bit_get_packet() - receive and process one packet within the sequence</div><div class='ctx'>  *  number window</div><div class='del'>- * @priv: the bat priv with all the soft interface information</div><div class='add'>+ * @priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @seq_bits: pointer to the sequence number receive packet</div><div class='ctx'>  * @seq_num_diff: difference between the current/received sequence number and</div><div class='ctx'>  *  the last sequence number</div><div class='head'>diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h<br/>index 48f683289531..37f7ae413bc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bitarray.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bitarray.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bitarray.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bitarray.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2006-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BITARRAY_H_</div><div class='head'>diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c<br/>index 5f1aeeded0e3..3dc791c15bf7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bridge_loop_avoidance.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bridge_loop_avoidance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bridge_loop_avoidance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bridge_loop_avoidance.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='hunk'>@@ -22,7 +10,9 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/crc16.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -31,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='hunk'>@@ -39,17 +28,17 @@</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sprintf.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +47,6 @@</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "originator.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='del'>-#include "sysfs.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> static const u8 batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};</div><div class='hunk'>@@ -78,7 +65,7 @@ batadv_bla_send_announce(struct batadv_priv *bat_priv,</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 batadv_choose_claim(const void *data, u32 size)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;</div><div class='add'>+	const struct batadv_bla_claim *claim = data;</div><div class='ctx'> 	u32 hash = 0;</div><div class='ctx'> </div><div class='ctx'> 	hash = jhash(&amp;claim-&gt;addr, sizeof(claim-&gt;addr), hash);</div><div class='hunk'>@@ -96,11 +83,12 @@ static inline u32 batadv_choose_claim(const void *data, u32 size)</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 batadv_choose_backbone_gw(const void *data, u32 size)</div><div class='ctx'> {</div><div class='del'>-	const struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;</div><div class='add'>+	const struct batadv_bla_backbone_gw *gw;</div><div class='ctx'> 	u32 hash = 0;</div><div class='ctx'> </div><div class='del'>-	hash = jhash(&amp;claim-&gt;addr, sizeof(claim-&gt;addr), hash);</div><div class='del'>-	hash = jhash(&amp;claim-&gt;vid, sizeof(claim-&gt;vid), hash);</div><div class='add'>+	gw = data;</div><div class='add'>+	hash = jhash(&amp;gw-&gt;orig, sizeof(gw-&gt;orig), hash);</div><div class='add'>+	hash = jhash(&amp;gw-&gt;vid, sizeof(gw-&gt;vid), hash);</div><div class='ctx'> </div><div class='ctx'> 	return hash % size;</div><div class='ctx'> }</div><div class='hunk'>@@ -175,6 +163,9 @@ static void batadv_backbone_gw_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_backbone_gw_put(struct batadv_bla_backbone_gw *backbone_gw)</div><div class='ctx'> {</div><div class='add'>+	if (!backbone_gw)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;backbone_gw-&gt;refcount, batadv_backbone_gw_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -210,12 +201,15 @@ static void batadv_claim_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_claim_put(struct batadv_bla_claim *claim)</div><div class='ctx'> {</div><div class='add'>+	if (!claim)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;claim-&gt;refcount, batadv_claim_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_claim_hash_find() - looks for a claim in the claim hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @data: search data (may be local/static data)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: claim if found or NULL otherwise.</div><div class='hunk'>@@ -254,14 +248,14 @@ batadv_claim_hash_find(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_backbone_hash_find() - looks for a backbone gateway in the hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the address of the originator</div><div class='ctx'>  * @vid: the VLAN ID</div><div class='ctx'>  *</div><div class='ctx'>  * Return: backbone gateway if found or NULL otherwise</div><div class='ctx'>  */</div><div class='ctx'> static struct batadv_bla_backbone_gw *</div><div class='del'>-batadv_backbone_hash_find(struct batadv_priv *bat_priv, u8 *addr,</div><div class='add'>+batadv_backbone_hash_find(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> 			  unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hashtable *hash = bat_priv-&gt;bla.backbone_hash;</div><div class='hunk'>@@ -338,18 +332,18 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_send_claim() - sends a claim frame according to the provided info</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @mac: the mac address to be announced within the claim</div><div class='ctx'>  * @vid: the VLAN ID</div><div class='ctx'>  * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)</div><div class='ctx'>  */</div><div class='del'>-static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,</div><div class='add'>+static void batadv_bla_send_claim(struct batadv_priv *bat_priv, const u8 *mac,</div><div class='ctx'> 				  unsigned short vid, int claimtype)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	u8 *hw_src;</div><div class='ctx'> 	struct batadv_bla_claim_dst local_claim_dest;</div><div class='ctx'> 	__be32 zeroip = 0;</div><div class='hunk'>@@ -362,12 +356,12 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,</div><div class='ctx'> 	       sizeof(local_claim_dest));</div><div class='ctx'> 	local_claim_dest.type = claimtype;</div><div class='ctx'> </div><div class='del'>-	soft_iface = primary_if-&gt;soft_iface;</div><div class='add'>+	mesh_iface = primary_if-&gt;mesh_iface;</div><div class='ctx'> </div><div class='ctx'> 	skb = arp_create(ARPOP_REPLY, ETH_P_ARP,</div><div class='ctx'> 			 /* IP DST: 0.0.0.0 */</div><div class='ctx'> 			 zeroip,</div><div class='del'>-			 primary_if-&gt;soft_iface,</div><div class='add'>+			 primary_if-&gt;mesh_iface,</div><div class='ctx'> 			 /* IP SRC: 0.0.0.0 */</div><div class='ctx'> 			 zeroip,</div><div class='ctx'> 			 /* Ethernet DST: Broadcast */</div><div class='hunk'>@@ -408,7 +402,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BATADV_CLAIM_TYPE_ANNOUNCE:</div><div class='ctx'> 		/* announcement frame</div><div class='del'>-		 * set HW SRC to the special mac containg the crc</div><div class='add'>+		 * set HW SRC to the special mac containing the crc</div><div class='ctx'> 		 */</div><div class='ctx'> 		ether_addr_copy(hw_src, mac);</div><div class='ctx'> 		batadv_dbg(BATADV_DBG_BLA, bat_priv,</div><div class='hunk'>@@ -445,15 +439,14 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, soft_iface);</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, mesh_iface);</div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_RX);</div><div class='ctx'> 	batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,</div><div class='ctx'> 			   skb-&gt;len + ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -473,7 +466,7 @@ static void batadv_bla_loopdetect_report(struct work_struct *work)</div><div class='ctx'> 				   report_work);</div><div class='ctx'> 	bat_priv = backbone_gw-&gt;bat_priv;</div><div class='ctx'> </div><div class='del'>-	batadv_info(bat_priv-&gt;soft_iface,</div><div class='add'>+	batadv_info(bat_priv-&gt;mesh_iface,</div><div class='ctx'> 		    "Possible loop on VLAN %d detected which can't be handled by BLA - please check your network setup!\n",</div><div class='ctx'> 		    batadv_print_vid(backbone_gw-&gt;vid));</div><div class='ctx'> 	snprintf(vid_str, sizeof(vid_str), "%d",</div><div class='hunk'>@@ -488,7 +481,7 @@ static void batadv_bla_loopdetect_report(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_get_backbone_gw() - finds or creates a backbone gateway</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the mac address of the originator</div><div class='ctx'>  * @vid: the VLAN ID</div><div class='ctx'>  * @own_backbone: set if the requested backbone is local</div><div class='hunk'>@@ -496,7 +489,7 @@ static void batadv_bla_loopdetect_report(struct work_struct *work)</div><div class='ctx'>  * Return: the (possibly created) backbone gateway or NULL on error</div><div class='ctx'>  */</div><div class='ctx'> static struct batadv_bla_backbone_gw *</div><div class='del'>-batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,</div><div class='add'>+batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, const u8 *orig,</div><div class='ctx'> 			   unsigned short vid, bool own_backbone)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_backbone_gw *entry;</div><div class='hunk'>@@ -561,7 +554,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_update_own_backbone_gw() - updates the own backbone gw for a VLAN</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: the selected primary interface</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -587,7 +580,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_answer_request() - answer a bla request by sending own claims</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: interface where the request came on</div><div class='ctx'>  * @vid: the vid where the request came on</div><div class='ctx'>  *</div><div class='hunk'>@@ -664,7 +657,7 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_send_announce() - Send an announcement frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @backbone_gw: our backbone gateway which should be announced</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_bla_send_announce(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -685,7 +678,7 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_add_claim() - Adds a claim in the claim hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @mac: the mac address of the claim</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='ctx'>  * @backbone_gw: the backbone gateway which claims it</div><div class='hunk'>@@ -795,7 +788,7 @@ batadv_bla_claim_get_backbone_gw(struct batadv_bla_claim *claim)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_del_claim() - delete a claim from the claim hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @mac: mac address of the claim to be removed</div><div class='ctx'>  * @vid: VLAN id for the claim to be removed</div><div class='ctx'>  */</div><div class='hunk'>@@ -803,6 +796,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,</div><div class='ctx'> 				 const u8 *mac, const unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_claim search_claim, *claim;</div><div class='add'>+	struct batadv_bla_claim *claim_removed_entry;</div><div class='add'>+	struct hlist_node *claim_removed_node;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(search_claim.addr, mac);</div><div class='ctx'> 	search_claim.vid = vid;</div><div class='hunk'>@@ -813,17 +808,25 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__,</div><div class='ctx'> 		   mac, batadv_print_vid(vid));</div><div class='ctx'> </div><div class='del'>-	batadv_hash_remove(bat_priv-&gt;bla.claim_hash, batadv_compare_claim,</div><div class='del'>-			   batadv_choose_claim, claim);</div><div class='del'>-	batadv_claim_put(claim); /* reference from the hash is gone */</div><div class='add'>+	claim_removed_node = batadv_hash_remove(bat_priv-&gt;bla.claim_hash,</div><div class='add'>+						batadv_compare_claim,</div><div class='add'>+						batadv_choose_claim, claim);</div><div class='add'>+	if (!claim_removed_node)</div><div class='add'>+		goto free_claim;</div><div class='add'>+</div><div class='add'>+	/* reference from the hash is gone */</div><div class='add'>+	claim_removed_entry = hlist_entry(claim_removed_node,</div><div class='add'>+					  struct batadv_bla_claim, hash_entry);</div><div class='add'>+	batadv_claim_put(claim_removed_entry);</div><div class='ctx'> </div><div class='add'>+free_claim:</div><div class='ctx'> 	/* don't need the reference from hash_find() anymore */</div><div class='ctx'> 	batadv_claim_put(claim);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_handle_announce() - check for ANNOUNCE frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @an_addr: announcement mac address (ARP Sender HW address)</div><div class='ctx'>  * @backbone_addr: originator address of the sender (Ethernet source MAC)</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='hunk'>@@ -847,7 +850,7 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,</div><div class='ctx'> </div><div class='ctx'> 	/* handle as ANNOUNCE frame */</div><div class='ctx'> 	backbone_gw-&gt;lasttime = jiffies;</div><div class='del'>-	crc = ntohs(*((__be16 *)(&amp;an_addr[4])));</div><div class='add'>+	crc = ntohs(*((__force __be16 *)(&amp;an_addr[4])));</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_BLA, bat_priv,</div><div class='ctx'> 		   "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",</div><div class='hunk'>@@ -881,8 +884,8 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_handle_request() - check for REQUEST frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @primary_if: the primary hard interface of this batman soft interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @primary_if: the primary hard interface of this batman mesh interface</div><div class='ctx'>  * @backbone_addr: backbone address to be requested (ARP sender HW MAC)</div><div class='ctx'>  * @ethhdr: ethernet header of a packet</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='hunk'>@@ -914,8 +917,8 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_handle_unclaim() - check for UNCLAIM frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @primary_if: the primary hard interface of this batman soft interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @primary_if: the primary hard interface of this batman mesh interface</div><div class='ctx'>  * @backbone_addr: originator address of the backbone (Ethernet source)</div><div class='ctx'>  * @claim_addr: Client to be unclaimed (ARP sender HW MAC)</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='hunk'>@@ -924,7 +927,7 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv,</div><div class='ctx'>  */</div><div class='ctx'> static bool batadv_handle_unclaim(struct batadv_priv *bat_priv,</div><div class='ctx'> 				  struct batadv_hard_iface *primary_if,</div><div class='del'>-				  u8 *backbone_addr, u8 *claim_addr,</div><div class='add'>+				  const u8 *backbone_addr, const u8 *claim_addr,</div><div class='ctx'> 				  unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='hunk'>@@ -952,8 +955,8 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_handle_claim() - check for CLAIM frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @primary_if: the primary hard interface of this batman soft interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @primary_if: the primary hard interface of this batman mesh interface</div><div class='ctx'>  * @backbone_addr: originator address of the backbone (Ethernet Source)</div><div class='ctx'>  * @claim_addr: client mac address to be claimed (ARP sender HW MAC)</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='hunk'>@@ -962,7 +965,7 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv,</div><div class='ctx'>  */</div><div class='ctx'> static bool batadv_handle_claim(struct batadv_priv *bat_priv,</div><div class='ctx'> 				struct batadv_hard_iface *primary_if,</div><div class='del'>-				u8 *backbone_addr, u8 *claim_addr,</div><div class='add'>+				const u8 *backbone_addr, const u8 *claim_addr,</div><div class='ctx'> 				unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='hunk'>@@ -989,13 +992,13 @@ static bool batadv_handle_claim(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_check_claim_group() - check for claim group membership</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: the primary interface of this batman interface</div><div class='ctx'>  * @hw_src: the Hardware source in the ARP Header</div><div class='ctx'>  * @hw_dst: the Hardware destination in the ARP Header</div><div class='ctx'>  * @ethhdr: pointer to the Ethernet header of the claim frame</div><div class='ctx'>  *</div><div class='del'>- * checks if it is a claim packet and if its on the same group.</div><div class='add'>+ * checks if it is a claim packet and if it's on the same group.</div><div class='ctx'>  * This function also applies the group ID of the sender</div><div class='ctx'>  * if it is in the same mesh.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1043,7 +1046,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,</div><div class='ctx'> 	/* lets see if this originator is in our mesh */</div><div class='ctx'> 	orig_node = batadv_orig_hash_find(bat_priv, backbone_addr);</div><div class='ctx'> </div><div class='del'>-	/* dont accept claims from gateways which are not in</div><div class='add'>+	/* don't accept claims from gateways which are not in</div><div class='ctx'> 	 * the same mesh or group.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!orig_node)</div><div class='hunk'>@@ -1064,8 +1067,8 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_process_claim() - Check if this is a claim frame, and process it</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @primary_if: the primary hard interface of this batman soft interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @primary_if: the primary hard interface of this batman mesh interface</div><div class='ctx'>  * @skb: the frame to be checked</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if it was a claim frame, otherwise return false to</div><div class='hunk'>@@ -1207,7 +1210,7 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_purge_backbone_gw() - Remove backbone gateways after a timeout or</div><div class='ctx'>  *  immediately</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @now: whether the whole hash shall be wiped now</div><div class='ctx'>  *</div><div class='ctx'>  * Check when we last heard from other nodes, and remove them in case of</div><div class='hunk'>@@ -1259,7 +1262,7 @@ purge_now:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_purge_claims() - Remove claims after a timeout or immediately</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: the selected primary interface, may be NULL if now is set</div><div class='ctx'>  * @now: whether the whole hash shall be wiped now</div><div class='ctx'>  *</div><div class='hunk'>@@ -1318,7 +1321,7 @@ skip:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_update_orig_address() - Update the backbone gateways when the own</div><div class='ctx'>  *  originator address changes</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: the new selected primary_if</div><div class='ctx'>  * @oldif: the old primary interface, may be NULL</div><div class='ctx'>  */</div><div class='hunk'>@@ -1373,7 +1376,7 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_send_loopdetect() - send a loopdetect frame</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @backbone_gw: the backbone gateway for which a loop should be detected</div><div class='ctx'>  *</div><div class='ctx'>  * To detect loops that the bridge loop avoidance can't handle, send a loop</div><div class='hunk'>@@ -1393,7 +1396,7 @@ batadv_bla_send_loopdetect(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_status_update() - purge bla interfaces if necessary</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='add'>+ * @net_dev: the mesh interface net device</div><div class='ctx'>  */</div><div class='ctx'> void batadv_bla_status_update(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1501,8 +1504,7 @@ static void batadv_bla_periodic_work(struct work_struct *work)</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='ctx'> 	queue_delayed_work(batadv_event_workqueue, &amp;bat_priv-&gt;bla.work,</div><div class='ctx'> 			   msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));</div><div class='hunk'>@@ -1518,7 +1520,7 @@ static struct lock_class_key batadv_backbone_hash_lock_class_key;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_init() - initialize all bla structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, &lt; 0 on error.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1559,10 +1561,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	bat_priv-&gt;bla.claim_hash = batadv_hash_new(128);</div><div class='del'>-	bat_priv-&gt;bla.backbone_hash = batadv_hash_new(32);</div><div class='add'>+	if (!bat_priv-&gt;bla.claim_hash)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!bat_priv-&gt;bla.claim_hash || !bat_priv-&gt;bla.backbone_hash)</div><div class='add'>+	bat_priv-&gt;bla.backbone_hash = batadv_hash_new(32);</div><div class='add'>+	if (!bat_priv-&gt;bla.backbone_hash) {</div><div class='add'>+		batadv_hash_destroy(bat_priv-&gt;bla.claim_hash);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	batadv_hash_set_lock_class(bat_priv-&gt;bla.claim_hash,</div><div class='ctx'> 				   &amp;batadv_claim_hash_lock_class_key);</div><div class='hunk'>@@ -1579,13 +1585,15 @@ int batadv_bla_init(struct batadv_priv *bat_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_bla_check_bcast_duplist() - Check if a frame is in the broadcast dup.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: contains the bcast_packet to be checked</div><div class='add'>+ * batadv_bla_check_duplist() - Check if a frame is in the broadcast dup.</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: contains the multicast packet to be checked</div><div class='add'>+ * @payload_offset: offset in the skb, marking the start of the data to be CRC'ed</div><div class='add'>+ * @orig: originator mac address, NULL if unknown</div><div class='ctx'>  *</div><div class='del'>- * check if it is on our broadcast list. Another gateway might</div><div class='del'>- * have sent the same packet because it is connected to the same backbone,</div><div class='del'>- * so we have to remove this duplicate.</div><div class='add'>+ * Check if it is on our broadcast list. Another gateway might have sent the</div><div class='add'>+ * same packet because it is connected to the same backbone, so we have to</div><div class='add'>+ * remove this duplicate.</div><div class='ctx'>  *</div><div class='ctx'>  * This is performed by checking the CRC, which will tell us</div><div class='ctx'>  * with a good chance that it is the same packet. If it is furthermore</div><div class='hunk'>@@ -1594,19 +1602,19 @@ int batadv_bla_init(struct batadv_priv *bat_priv)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if a packet is in the duplicate list, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,</div><div class='del'>-				    struct sk_buff *skb)</div><div class='add'>+static bool batadv_bla_check_duplist(struct batadv_priv *bat_priv,</div><div class='add'>+				     struct sk_buff *skb, int payload_offset,</div><div class='add'>+				     const u8 *orig)</div><div class='ctx'> {</div><div class='del'>-	int i, curr;</div><div class='del'>-	__be32 crc;</div><div class='del'>-	struct batadv_bcast_packet *bcast_packet;</div><div class='ctx'> 	struct batadv_bcast_duplist_entry *entry;</div><div class='ctx'> 	bool ret = false;</div><div class='del'>-</div><div class='del'>-	bcast_packet = (struct batadv_bcast_packet *)skb-&gt;data;</div><div class='add'>+	int payload_len;</div><div class='add'>+	int i, curr;</div><div class='add'>+	u32 crc;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the crc ... */</div><div class='del'>-	crc = batadv_skb_crc32(skb, (u8 *)(bcast_packet + 1));</div><div class='add'>+	payload_len = skb-&gt;len - payload_offset;</div><div class='add'>+	crc = skb_crc32c(skb, payload_offset, payload_len, 0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;bat_priv-&gt;bla.bcast_duplist_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1625,8 +1633,21 @@ bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,</div><div class='ctx'> 		if (entry-&gt;crc != crc)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (batadv_compare_eth(entry-&gt;orig, bcast_packet-&gt;orig))</div><div class='del'>-			continue;</div><div class='add'>+		/* are the originators both known and not anonymous? */</div><div class='add'>+		if (orig &amp;&amp; !is_zero_ether_addr(orig) &amp;&amp;</div><div class='add'>+		    !is_zero_ether_addr(entry-&gt;orig)) {</div><div class='add'>+			/* If known, check if the new frame came from</div><div class='add'>+			 * the same originator:</div><div class='add'>+			 * We are safe to take identical frames from the</div><div class='add'>+			 * same orig, if known, as multiplications in</div><div class='add'>+			 * the mesh are detected via the (orig, seqno) pair.</div><div class='add'>+			 * So we can be a bit more liberal here and allow</div><div class='add'>+			 * identical frames from the same orig which the source</div><div class='add'>+			 * host might have sent multiple times on purpose.</div><div class='add'>+			 */</div><div class='add'>+			if (batadv_compare_eth(entry-&gt;orig, orig))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* this entry seems to match: same crc, not too old,</div><div class='ctx'> 		 * and from another gw. therefore return true to forbid it.</div><div class='hunk'>@@ -1642,7 +1663,14 @@ bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,</div><div class='ctx'> 	entry = &amp;bat_priv-&gt;bla.bcast_duplist[curr];</div><div class='ctx'> 	entry-&gt;crc = crc;</div><div class='ctx'> 	entry-&gt;entrytime = jiffies;</div><div class='del'>-	ether_addr_copy(entry-&gt;orig, bcast_packet-&gt;orig);</div><div class='add'>+</div><div class='add'>+	/* known originator */</div><div class='add'>+	if (orig)</div><div class='add'>+		ether_addr_copy(entry-&gt;orig, orig);</div><div class='add'>+	/* anonymous originator */</div><div class='add'>+	else</div><div class='add'>+		eth_zero_addr(entry-&gt;orig);</div><div class='add'>+</div><div class='ctx'> 	bat_priv-&gt;bla.bcast_duplist_curr = curr;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1652,9 +1680,49 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_bla_check_ucast_duplist() - Check if a frame is in the broadcast dup.</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: contains the multicast packet to be checked, decapsulated from a</div><div class='add'>+ *  unicast_packet</div><div class='add'>+ *</div><div class='add'>+ * Check if it is on our broadcast list. Another gateway might have sent the</div><div class='add'>+ * same packet because it is connected to the same backbone, so we have to</div><div class='add'>+ * remove this duplicate.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if a packet is in the duplicate list, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_bla_check_ucast_duplist(struct batadv_priv *bat_priv,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return batadv_bla_check_duplist(bat_priv, skb, 0, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_bla_check_bcast_duplist() - Check if a frame is in the broadcast dup.</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: contains the bcast_packet to be checked</div><div class='add'>+ *</div><div class='add'>+ * Check if it is on our broadcast list. Another gateway might have sent the</div><div class='add'>+ * same packet because it is connected to the same backbone, so we have to</div><div class='add'>+ * remove this duplicate.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if a packet is in the duplicate list, false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct batadv_bcast_packet *bcast_packet;</div><div class='add'>+</div><div class='add'>+	bcast_packet = (struct batadv_bcast_packet *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	return batadv_bla_check_duplist(bat_priv, skb, sizeof(*bcast_packet),</div><div class='add'>+					bcast_packet-&gt;orig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_bla_is_backbone_gw_orig() - Check if the originator is a gateway for</div><div class='ctx'>  *  the VLAN identified by vid.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: originator mac address</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -1697,7 +1765,7 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig,</div><div class='ctx'>  * @orig_node: the orig_node of the frame</div><div class='ctx'>  * @hdr_size: maximum length of the frame</div><div class='ctx'>  *</div><div class='del'>- * Return: true if the orig_node is also a gateway on the soft interface,</div><div class='add'>+ * Return: true if the orig_node is also a gateway on the mesh interface,</div><div class='ctx'>  * otherwise it returns false.</div><div class='ctx'>  */</div><div class='ctx'> bool batadv_bla_is_backbone_gw(struct sk_buff *skb,</div><div class='hunk'>@@ -1727,9 +1795,9 @@ bool batadv_bla_is_backbone_gw(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_free() - free all bla structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='del'>- * for softinterface free or module unload</div><div class='add'>+ * for meshinterface free or module unload</div><div class='ctx'>  */</div><div class='ctx'> void batadv_bla_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1748,19 +1816,18 @@ void batadv_bla_free(struct batadv_priv *bat_priv)</div><div class='ctx'> 		batadv_hash_destroy(bat_priv-&gt;bla.backbone_hash);</div><div class='ctx'> 		bat_priv-&gt;bla.backbone_hash = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_loopdetect_check() - check and handle a detected loop</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the packet to check</div><div class='ctx'>  * @primary_if: interface where the request came on</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='ctx'>  *</div><div class='ctx'>  * Checks if this packet is a loop detect frame which has been sent by us,</div><div class='del'>- * throw an uevent and log the event if that is the case.</div><div class='add'>+ * throws an uevent and logs the event if that is the case.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if it is a loop detect frame which is to be dropped, false</div><div class='ctx'>  * otherwise.</div><div class='hunk'>@@ -1798,7 +1865,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	ret = queue_work(batadv_event_workqueue, &amp;backbone_gw-&gt;report_work);</div><div class='ctx'> </div><div class='del'>-	/* backbone_gw is unreferenced in the report work function function</div><div class='add'>+	/* backbone_gw is unreferenced in the report work function</div><div class='ctx'> 	 * if queue_work() call was successful</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -1809,22 +1876,22 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_rx() - check packets coming from the mesh.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the frame to be checked</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='del'>- * @is_bcast: the packet came in a broadcast packet type.</div><div class='add'>+ * @packet_type: the batman packet type this frame came in</div><div class='ctx'>  *</div><div class='ctx'>  * batadv_bla_rx avoidance checks if:</div><div class='ctx'>  *  * we have to race for a claim</div><div class='ctx'>  *  * if the frame is allowed on the LAN</div><div class='ctx'>  *</div><div class='del'>- * in these cases, the skb is further handled by this function</div><div class='add'>+ * In these cases, the skb is further handled by this function</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if handled, otherwise it returns false and the caller shall</div><div class='ctx'>  * further process the skb.</div><div class='ctx'>  */</div><div class='ctx'> bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-		   unsigned short vid, bool is_bcast)</div><div class='add'>+		   unsigned short vid, int packet_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='hunk'>@@ -1846,25 +1913,47 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> 		goto handled;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(atomic_read(&amp;bat_priv-&gt;bla.num_requests)))</div><div class='del'>-		/* don't allow broadcasts while requests are in flight */</div><div class='del'>-		if (is_multicast_ether_addr(ethhdr-&gt;h_dest) &amp;&amp; is_bcast)</div><div class='del'>-			goto handled;</div><div class='add'>+		/* don't allow multicast packets while requests are in flight */</div><div class='add'>+		if (is_multicast_ether_addr(ethhdr-&gt;h_dest))</div><div class='add'>+			/* Both broadcast flooding or multicast-via-unicasts</div><div class='add'>+			 * delivery might send to multiple backbone gateways</div><div class='add'>+			 * sharing the same LAN and therefore need to coordinate</div><div class='add'>+			 * which backbone gateway forwards into the LAN,</div><div class='add'>+			 * by claiming the payload source address.</div><div class='add'>+			 *</div><div class='add'>+			 * Broadcast flooding and multicast-via-unicasts</div><div class='add'>+			 * delivery use the following two batman packet types.</div><div class='add'>+			 * Note: explicitly exclude BATADV_UNICAST_4ADDR,</div><div class='add'>+			 * as the DHCP gateway feature will send explicitly</div><div class='add'>+			 * to only one BLA gateway, so the claiming process</div><div class='add'>+			 * should be avoided there.</div><div class='add'>+			 */</div><div class='add'>+			if (packet_type == BATADV_BCAST ||</div><div class='add'>+			    packet_type == BATADV_UNICAST)</div><div class='add'>+				goto handled;</div><div class='add'>+</div><div class='add'>+	/* potential duplicates from foreign BLA backbone gateways via</div><div class='add'>+	 * multicast-in-unicast packets</div><div class='add'>+	 */</div><div class='add'>+	if (is_multicast_ether_addr(ethhdr-&gt;h_dest) &amp;&amp;</div><div class='add'>+	    packet_type == BATADV_UNICAST &amp;&amp;</div><div class='add'>+	    batadv_bla_check_ucast_duplist(bat_priv, skb))</div><div class='add'>+		goto handled;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(search_claim.addr, ethhdr-&gt;h_source);</div><div class='ctx'> 	search_claim.vid = vid;</div><div class='ctx'> 	claim = batadv_claim_hash_find(bat_priv, &amp;search_claim);</div><div class='ctx'> </div><div class='ctx'> 	if (!claim) {</div><div class='add'>+		bool local = batadv_is_my_client(bat_priv, ethhdr-&gt;h_source, vid);</div><div class='add'>+</div><div class='ctx'> 		/* possible optimization: race for a claim */</div><div class='ctx'> 		/* No claim exists yet, claim it for us!</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		batadv_dbg(BATADV_DBG_BLA, bat_priv,</div><div class='ctx'> 			   "%s(): Unclaimed MAC %pM found. Claim it. Local: %s\n",</div><div class='del'>-			   __func__, ethhdr-&gt;h_source,</div><div class='del'>-			   batadv_is_my_client(bat_priv,</div><div class='del'>-					       ethhdr-&gt;h_source, vid) ?</div><div class='del'>-			   "yes" : "no");</div><div class='add'>+			   __func__, ethhdr-&gt;h_source, str_yes_no(local));</div><div class='ctx'> 		batadv_handle_claim(bat_priv, primary_if,</div><div class='ctx'> 				    primary_if-&gt;net_dev-&gt;dev_addr,</div><div class='ctx'> 				    ethhdr-&gt;h_source, vid);</div><div class='hunk'>@@ -1883,13 +1972,14 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> 		goto allow;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if it is a broadcast ... */</div><div class='del'>-	if (is_multicast_ether_addr(ethhdr-&gt;h_dest) &amp;&amp; is_bcast) {</div><div class='add'>+	/* if it is a multicast ... */</div><div class='add'>+	if (is_multicast_ether_addr(ethhdr-&gt;h_dest) &amp;&amp;</div><div class='add'>+	    (packet_type == BATADV_BCAST || packet_type == BATADV_UNICAST)) {</div><div class='ctx'> 		/* ... drop it. the responsible gateway is in charge.</div><div class='ctx'> 		 *</div><div class='del'>-		 * We need to check is_bcast because with the gateway</div><div class='add'>+		 * We need to check packet type because with the gateway</div><div class='ctx'> 		 * feature, broadcasts (like DHCP requests) may be sent</div><div class='del'>-		 * using a unicast packet type.</div><div class='add'>+		 * using a unicast 4 address packet type. See comment above.</div><div class='ctx'> 		 */</div><div class='ctx'> 		goto handled;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1912,16 +2002,14 @@ handled:</div><div class='ctx'> 	ret = true;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (claim)</div><div class='del'>-		batadv_claim_put(claim);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_claim_put(claim);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_tx() - check packets going into the mesh</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the frame to be checked</div><div class='ctx'>  * @vid: the VLAN ID of the frame</div><div class='ctx'>  *</div><div class='hunk'>@@ -2019,105 +2107,44 @@ allow:</div><div class='ctx'> handled:</div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (claim)</div><div class='del'>-		batadv_claim_put(claim);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_claim_put(claim);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_bla_claim_table_seq_print_text() - print the claim table in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;bla.claim_hash;</div><div class='del'>-	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='del'>-	struct batadv_bla_claim *claim;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	u16 backbone_crc;</div><div class='del'>-	u32 i;</div><div class='del'>-	bool is_own;</div><div class='del'>-	u8 *primary_addr;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "Claims announced for the mesh %s (orig %pM, group id %#.4x)\n",</div><div class='del'>-		   net_dev-&gt;name, primary_addr,</div><div class='del'>-		   ntohs(bat_priv-&gt;bla.claim_dest.group));</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "   Client               VID      Originator        [o] (CRC   )\n");</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(claim, head, hash_entry) {</div><div class='del'>-			backbone_gw = batadv_bla_claim_get_backbone_gw(claim);</div><div class='del'>-</div><div class='del'>-			is_own = batadv_compare_eth(backbone_gw-&gt;orig,</div><div class='del'>-						    primary_addr);</div><div class='del'>-</div><div class='del'>-			spin_lock_bh(&amp;backbone_gw-&gt;crc_lock);</div><div class='del'>-			backbone_crc = backbone_gw-&gt;crc;</div><div class='del'>-			spin_unlock_bh(&amp;backbone_gw-&gt;crc_lock);</div><div class='del'>-			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",</div><div class='del'>-				   claim-&gt;addr, batadv_print_vid(claim-&gt;vid),</div><div class='del'>-				   backbone_gw-&gt;orig,</div><div class='del'>-				   (is_own ? 'x' : ' '),</div><div class='del'>-				   backbone_crc);</div><div class='del'>-</div><div class='del'>-			batadv_backbone_gw_put(backbone_gw);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_claim_dump_entry() - dump one entry of the claim table</div><div class='ctx'>  * to a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @primary_if: primary interface</div><div class='ctx'>  * @claim: entry to dump</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+			    struct netlink_callback *cb,</div><div class='ctx'> 			    struct batadv_hard_iface *primary_if,</div><div class='ctx'> 			    struct batadv_bla_claim *claim)</div><div class='ctx'> {</div><div class='del'>-	u8 *primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='add'>+	const u8 *primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='ctx'> 	u16 backbone_crc;</div><div class='ctx'> 	bool is_own;</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_BLA_CLAIM);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_BLA_CLAIM);</div><div class='ctx'> 	if (!hdr) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	is_own = batadv_compare_eth(claim-&gt;backbone_gw-&gt;orig,</div><div class='ctx'> 				    primary_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -2153,28 +2180,33 @@ out:</div><div class='ctx'>  * to a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @primary_if: primary interface</div><div class='del'>- * @head: bucket to dump</div><div class='add'>+ * @hash: hash to dump</div><div class='add'>+ * @bucket: bucket index to dump</div><div class='ctx'>  * @idx_skip: How many entries to skip</div><div class='ctx'>  *</div><div class='ctx'>  * Return: always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid,</div><div class='add'>+			     struct netlink_callback *cb,</div><div class='ctx'> 			     struct batadv_hard_iface *primary_if,</div><div class='del'>-			     struct hlist_head *head, int *idx_skip)</div><div class='add'>+			     struct batadv_hashtable *hash, unsigned int bucket,</div><div class='add'>+			     int *idx_skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_claim *claim;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(claim, head, hash_entry) {</div><div class='add'>+	spin_lock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='add'>+	cb-&gt;seq = atomic_read(&amp;hash-&gt;generation) &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(claim, &amp;hash-&gt;table[bucket], hash_entry) {</div><div class='ctx'> 		if (idx++ &lt; *idx_skip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = batadv_bla_claim_dump_entry(msg, portid, seq,</div><div class='add'>+		ret = batadv_bla_claim_dump_entry(msg, portid, cb,</div><div class='ctx'> 						  primary_if, claim);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			*idx_skip = idx - 1;</div><div class='hunk'>@@ -2184,7 +2216,7 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	*idx_skip = 0;</div><div class='ctx'> unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2199,28 +2231,18 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_hashtable *hash;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	int bucket = cb-&gt;args[0];</div><div class='del'>-	struct hlist_head *head;</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-					     BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	hash = bat_priv-&gt;bla.claim_hash;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -2230,11 +2252,8 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (bucket &lt; hash-&gt;size) {</div><div class='del'>-		head = &amp;hash-&gt;table[bucket];</div><div class='del'>-</div><div class='del'>-		if (batadv_bla_claim_dump_bucket(msg, portid,</div><div class='del'>-						 cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						 primary_if, head, &amp;idx))</div><div class='add'>+		if (batadv_bla_claim_dump_bucket(msg, portid, cb, primary_if,</div><div class='add'>+						 hash, bucket, &amp;idx))</div><div class='ctx'> 			break;</div><div class='ctx'> 		bucket++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2245,111 +2264,47 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_bla_backbone_table_seq_print_text() - print the backbone table in a</div><div class='del'>- *  seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;bla.backbone_hash;</div><div class='del'>-	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	int secs, msecs;</div><div class='del'>-	u16 backbone_crc;</div><div class='del'>-	u32 i;</div><div class='del'>-	bool is_own;</div><div class='del'>-	u8 *primary_addr;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "Backbones announced for the mesh %s (orig %pM, group id %#.4x)\n",</div><div class='del'>-		   net_dev-&gt;name, primary_addr,</div><div class='del'>-		   ntohs(bat_priv-&gt;bla.claim_dest.group));</div><div class='del'>-	seq_puts(seq, "   Originator           VID   last seen (CRC   )\n");</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) {</div><div class='del'>-			msecs = jiffies_to_msecs(jiffies -</div><div class='del'>-						 backbone_gw-&gt;lasttime);</div><div class='del'>-			secs = msecs / 1000;</div><div class='del'>-			msecs = msecs % 1000;</div><div class='del'>-</div><div class='del'>-			is_own = batadv_compare_eth(backbone_gw-&gt;orig,</div><div class='del'>-						    primary_addr);</div><div class='del'>-			if (is_own)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			spin_lock_bh(&amp;backbone_gw-&gt;crc_lock);</div><div class='del'>-			backbone_crc = backbone_gw-&gt;crc;</div><div class='del'>-			spin_unlock_bh(&amp;backbone_gw-&gt;crc_lock);</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n",</div><div class='del'>-				   backbone_gw-&gt;orig,</div><div class='del'>-				   batadv_print_vid(backbone_gw-&gt;vid), secs,</div><div class='del'>-				   msecs, backbone_crc);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_backbone_dump_entry() - dump one entry of the backbone table to a</div><div class='ctx'>  *  netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @primary_if: primary interface</div><div class='ctx'>  * @backbone_gw: entry to dump</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+			       struct netlink_callback *cb,</div><div class='ctx'> 			       struct batadv_hard_iface *primary_if,</div><div class='ctx'> 			       struct batadv_bla_backbone_gw *backbone_gw)</div><div class='ctx'> {</div><div class='del'>-	u8 *primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='add'>+	const u8 *primary_addr = primary_if-&gt;net_dev-&gt;dev_addr;</div><div class='ctx'> 	u16 backbone_crc;</div><div class='ctx'> 	bool is_own;</div><div class='ctx'> 	int msecs;</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_BLA_BACKBONE);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_BLA_BACKBONE);</div><div class='ctx'> 	if (!hdr) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	is_own = batadv_compare_eth(backbone_gw-&gt;orig, primary_addr);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;backbone_gw-&gt;crc_lock);</div><div class='hunk'>@@ -2386,28 +2341,33 @@ out:</div><div class='ctx'>  *  a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @primary_if: primary interface</div><div class='del'>- * @head: bucket to dump</div><div class='add'>+ * @hash: hash to dump</div><div class='add'>+ * @bucket: bucket index to dump</div><div class='ctx'>  * @idx_skip: How many entries to skip</div><div class='ctx'>  *</div><div class='ctx'>  * Return: always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid,</div><div class='add'>+				struct netlink_callback *cb,</div><div class='ctx'> 				struct batadv_hard_iface *primary_if,</div><div class='del'>-				struct hlist_head *head, int *idx_skip)</div><div class='add'>+				struct batadv_hashtable *hash,</div><div class='add'>+				unsigned int bucket, int *idx_skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bla_backbone_gw *backbone_gw;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) {</div><div class='add'>+	spin_lock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='add'>+	cb-&gt;seq = atomic_read(&amp;hash-&gt;generation) &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(backbone_gw, &amp;hash-&gt;table[bucket], hash_entry) {</div><div class='ctx'> 		if (idx++ &lt; *idx_skip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = batadv_bla_backbone_dump_entry(msg, portid, seq,</div><div class='add'>+		ret = batadv_bla_backbone_dump_entry(msg, portid, cb,</div><div class='ctx'> 						     primary_if, backbone_gw);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			*idx_skip = idx - 1;</div><div class='hunk'>@@ -2417,7 +2377,7 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	*idx_skip = 0;</div><div class='ctx'> unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2432,28 +2392,18 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_hashtable *hash;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	int bucket = cb-&gt;args[0];</div><div class='del'>-	struct hlist_head *head;</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-					     BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	hash = bat_priv-&gt;bla.backbone_hash;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -2463,11 +2413,8 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (bucket &lt; hash-&gt;size) {</div><div class='del'>-		head = &amp;hash-&gt;table[bucket];</div><div class='del'>-</div><div class='del'>-		if (batadv_bla_backbone_dump_bucket(msg, portid,</div><div class='del'>-						    cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						    primary_if, head, &amp;idx))</div><div class='add'>+		if (batadv_bla_backbone_dump_bucket(msg, portid, cb, primary_if,</div><div class='add'>+						    hash, bucket, &amp;idx))</div><div class='ctx'> 			break;</div><div class='ctx'> 		bucket++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2478,11 +2425,9 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2491,7 +2436,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_check_claim() - check if address is claimed</div><div class='ctx'>  *</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: mac address of which the claim status is checked</div><div class='ctx'>  * @vid: the VLAN ID</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h<br/>index 71f95a3e4d3f..8673a265995f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bridge_loop_avoidance.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/bridge_loop_avoidance.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/bridge_loop_avoidance.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/bridge_loop_avoidance.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_BLA_H_</div><div class='hunk'>@@ -22,14 +10,12 @@</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct net_device;</div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_bla_is_loopdetect_mac() - check if the mac address is from a loop</div><div class='ctx'>  *  detect frame sent by bridge loop avoidance</div><div class='hunk'>@@ -48,16 +34,13 @@ static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='ctx'> bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-		   unsigned short vid, bool is_bcast);</div><div class='add'>+		   unsigned short vid, int packet_type);</div><div class='ctx'> bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> 		   unsigned short vid);</div><div class='ctx'> bool batadv_bla_is_backbone_gw(struct sk_buff *skb,</div><div class='ctx'> 			       struct batadv_orig_node *orig_node,</div><div class='ctx'> 			       int hdr_size);</div><div class='del'>-int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='del'>-int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq,</div><div class='del'>-					     void *offset);</div><div class='ctx'> int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig,</div><div class='ctx'> 				    unsigned short vid);</div><div class='hunk'>@@ -69,7 +52,6 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,</div><div class='ctx'> void batadv_bla_status_update(struct net_device *net_dev);</div><div class='ctx'> int batadv_bla_init(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_bla_free(struct batadv_priv *bat_priv);</div><div class='del'>-int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_DAT</div><div class='ctx'> bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr,</div><div class='ctx'> 			    unsigned short vid);</div><div class='hunk'>@@ -79,7 +61,7 @@ bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr,</div><div class='ctx'> </div><div class='ctx'> static inline bool batadv_bla_rx(struct batadv_priv *bat_priv,</div><div class='ctx'> 				 struct sk_buff *skb, unsigned short vid,</div><div class='del'>-				 bool is_bcast)</div><div class='add'>+				 int packet_type)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -97,18 +79,6 @@ static inline bool batadv_bla_is_backbone_gw(struct sk_buff *skb,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int batadv_bla_claim_table_seq_print_text(struct seq_file *seq,</div><div class='del'>-							void *offset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq,</div><div class='del'>-							   void *offset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv,</div><div class='ctx'> 						  u8 *orig, unsigned short vid)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c<br/>deleted file mode 100644<br/>index 3cb82378300b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/debugfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,474 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "debugfs.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dcache.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bat_algo.h"</div><div class='del'>-#include "bridge_loop_avoidance.h"</div><div class='del'>-#include "distributed-arp-table.h"</div><div class='del'>-#include "gateway_client.h"</div><div class='del'>-#include "icmp_socket.h"</div><div class='del'>-#include "log.h"</div><div class='del'>-#include "multicast.h"</div><div class='del'>-#include "network-coding.h"</div><div class='del'>-#include "originator.h"</div><div class='del'>-#include "translation-table.h"</div><div class='del'>-</div><div class='del'>-static struct dentry *batadv_debugfs;</div><div class='del'>-</div><div class='del'>-static int batadv_algorithms_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, batadv_algo_seq_print_text, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int neighbors_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_hardif_neigh_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_originators_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_orig_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_originators_hardif_open() - handles debugfs output for the originator</div><div class='del'>- *  table of an hard interface</div><div class='del'>- * @inode: inode pointer to debugfs file</div><div class='del'>- * @file: pointer to the seq_file</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-static int batadv_originators_hardif_open(struct inode *inode,</div><div class='del'>-					  struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_orig_hardif_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_gateways_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_gw_client_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_transtable_global_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_tt_global_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-static int batadv_bla_claim_table_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_bla_claim_table_seq_print_text,</div><div class='del'>-			   net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_bla_backbone_table_open(struct inode *inode,</div><div class='del'>-					  struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_bla_backbone_table_seq_print_text,</div><div class='del'>-			   net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='del'>-/**</div><div class='del'>- * batadv_dat_cache_open() - Prepare file handler for reads from dat_cache</div><div class='del'>- * @inode: inode which was opened</div><div class='del'>- * @file: file handle to be initialized</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-static int batadv_dat_cache_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_dat_cache_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int batadv_transtable_local_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_tt_local_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct batadv_debuginfo {</div><div class='del'>-	struct attribute attr;</div><div class='del'>-	const struct file_operations fops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-static int batadv_nc_nodes_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_nc_nodes_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-/**</div><div class='del'>- * batadv_mcast_flags_open() - prepare file handler for reads from mcast_flags</div><div class='del'>- * @inode: inode which was opened</div><div class='del'>- * @file: file handle to be initialized</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-static int batadv_mcast_flags_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return single_open(file, batadv_mcast_flags_seq_print_text, net_dev);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BATADV_DEBUGINFO(_name, _mode, _open)		\</div><div class='del'>-struct batadv_debuginfo batadv_debuginfo_##_name = {	\</div><div class='del'>-	.attr = {					\</div><div class='del'>-		.name = __stringify(_name),		\</div><div class='del'>-		.mode = _mode,				\</div><div class='del'>-	},						\</div><div class='del'>-	.fops = {					\</div><div class='del'>-		.owner = THIS_MODULE,			\</div><div class='del'>-		.open = _open,				\</div><div class='del'>-		.read	= seq_read,			\</div><div class='del'>-		.llseek = seq_lseek,			\</div><div class='del'>-		.release = single_release,		\</div><div class='del'>-	},						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the following attributes are general and therefore they will be directly</div><div class='del'>- * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs</div><div class='del'>- */</div><div class='del'>-static BATADV_DEBUGINFO(routing_algos, 0444, batadv_algorithms_open);</div><div class='del'>-</div><div class='del'>-static struct batadv_debuginfo *batadv_general_debuginfos[] = {</div><div class='del'>-	&amp;batadv_debuginfo_routing_algos,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The following attributes are per soft interface */</div><div class='del'>-static BATADV_DEBUGINFO(neighbors, 0444, neighbors_open);</div><div class='del'>-static BATADV_DEBUGINFO(originators, 0444, batadv_originators_open);</div><div class='del'>-static BATADV_DEBUGINFO(gateways, 0444, batadv_gateways_open);</div><div class='del'>-static BATADV_DEBUGINFO(transtable_global, 0444, batadv_transtable_global_open);</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-static BATADV_DEBUGINFO(bla_claim_table, 0444, batadv_bla_claim_table_open);</div><div class='del'>-static BATADV_DEBUGINFO(bla_backbone_table, 0444,</div><div class='del'>-			batadv_bla_backbone_table_open);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='del'>-static BATADV_DEBUGINFO(dat_cache, 0444, batadv_dat_cache_open);</div><div class='del'>-#endif</div><div class='del'>-static BATADV_DEBUGINFO(transtable_local, 0444, batadv_transtable_local_open);</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-static BATADV_DEBUGINFO(nc_nodes, 0444, batadv_nc_nodes_open);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-static BATADV_DEBUGINFO(mcast_flags, 0444, batadv_mcast_flags_open);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {</div><div class='del'>-	&amp;batadv_debuginfo_neighbors,</div><div class='del'>-	&amp;batadv_debuginfo_originators,</div><div class='del'>-	&amp;batadv_debuginfo_gateways,</div><div class='del'>-	&amp;batadv_debuginfo_transtable_global,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-	&amp;batadv_debuginfo_bla_claim_table,</div><div class='del'>-	&amp;batadv_debuginfo_bla_backbone_table,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='del'>-	&amp;batadv_debuginfo_dat_cache,</div><div class='del'>-#endif</div><div class='del'>-	&amp;batadv_debuginfo_transtable_local,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	&amp;batadv_debuginfo_nc_nodes,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-	&amp;batadv_debuginfo_mcast_flags,</div><div class='del'>-#endif</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BATADV_HARDIF_DEBUGINFO(_name, _mode, _open)		\</div><div class='del'>-struct batadv_debuginfo batadv_hardif_debuginfo_##_name = {	\</div><div class='del'>-	.attr = {						\</div><div class='del'>-		.name = __stringify(_name),			\</div><div class='del'>-		.mode = _mode,					\</div><div class='del'>-	},							\</div><div class='del'>-	.fops = {						\</div><div class='del'>-		.owner = THIS_MODULE,				\</div><div class='del'>-		.open = _open,					\</div><div class='del'>-		.read	= seq_read,				\</div><div class='del'>-		.llseek = seq_lseek,				\</div><div class='del'>-		.release = single_release,			\</div><div class='del'>-	},							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BATADV_HARDIF_DEBUGINFO(originators, 0444,</div><div class='del'>-			       batadv_originators_hardif_open);</div><div class='del'>-</div><div class='del'>-static struct batadv_debuginfo *batadv_hardif_debuginfos[] = {</div><div class='del'>-	&amp;batadv_hardif_debuginfo_originators,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_init() - Initialize soft interface independent debugfs entries</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_init(void)</div><div class='del'>-{</div><div class='del'>-	struct batadv_debuginfo **bat_debug;</div><div class='del'>-	struct dentry *file;</div><div class='del'>-</div><div class='del'>-	batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);</div><div class='del'>-	if (batadv_debugfs == ERR_PTR(-ENODEV))</div><div class='del'>-		batadv_debugfs = NULL;</div><div class='del'>-</div><div class='del'>-	if (!batadv_debugfs)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (bat_debug = batadv_general_debuginfos; *bat_debug; ++bat_debug) {</div><div class='del'>-		file = debugfs_create_file(((*bat_debug)-&gt;attr).name,</div><div class='del'>-					   S_IFREG | ((*bat_debug)-&gt;attr).mode,</div><div class='del'>-					   batadv_debugfs, NULL,</div><div class='del'>-					   &amp;(*bat_debug)-&gt;fops);</div><div class='del'>-		if (!file) {</div><div class='del'>-			pr_err("Can't add general debugfs file: %s\n",</div><div class='del'>-			       ((*bat_debug)-&gt;attr).name);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	debugfs_remove_recursive(batadv_debugfs);</div><div class='del'>-	batadv_debugfs = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_destroy() - Remove all debugfs entries</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_destroy(void)</div><div class='del'>-{</div><div class='del'>-	debugfs_remove_recursive(batadv_debugfs);</div><div class='del'>-	batadv_debugfs = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_add_hardif() - creates the base directory for a hard interface</div><div class='del'>- *  in debugfs.</div><div class='del'>- * @hard_iface: hard interface which should be added.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(hard_iface-&gt;net_dev);</div><div class='del'>-	struct batadv_debuginfo **bat_debug;</div><div class='del'>-	struct dentry *file;</div><div class='del'>-</div><div class='del'>-	if (!batadv_debugfs)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (net != &amp;init_net)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hard_iface-&gt;debug_dir = debugfs_create_dir(hard_iface-&gt;net_dev-&gt;name,</div><div class='del'>-						   batadv_debugfs);</div><div class='del'>-	if (!hard_iface-&gt;debug_dir)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (bat_debug = batadv_hardif_debuginfos; *bat_debug; ++bat_debug) {</div><div class='del'>-		file = debugfs_create_file(((*bat_debug)-&gt;attr).name,</div><div class='del'>-					   S_IFREG | ((*bat_debug)-&gt;attr).mode,</div><div class='del'>-					   hard_iface-&gt;debug_dir,</div><div class='del'>-					   hard_iface-&gt;net_dev,</div><div class='del'>-					   &amp;(*bat_debug)-&gt;fops);</div><div class='del'>-		if (!file)</div><div class='del'>-			goto rem_attr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-rem_attr:</div><div class='del'>-	debugfs_remove_recursive(hard_iface-&gt;debug_dir);</div><div class='del'>-	hard_iface-&gt;debug_dir = NULL;</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_rename_hardif() - Fix debugfs path for renamed hardif</div><div class='del'>- * @hard_iface: hard interface which was renamed</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-	const char *name = hard_iface-&gt;net_dev-&gt;name;</div><div class='del'>-	struct dentry *dir;</div><div class='del'>-	struct dentry *d;</div><div class='del'>-</div><div class='del'>-	dir = hard_iface-&gt;debug_dir;</div><div class='del'>-	if (!dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	d = debugfs_rename(dir-&gt;d_parent, dir, dir-&gt;d_parent, name);</div><div class='del'>-	if (!d)</div><div class='del'>-		pr_err("Can't rename debugfs dir to %s\n", name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_del_hardif() - delete the base directory for a hard interface</div><div class='del'>- *  in debugfs.</div><div class='del'>- * @hard_iface: hard interface which is deleted.</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(hard_iface-&gt;net_dev);</div><div class='del'>-</div><div class='del'>-	if (net != &amp;init_net)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (batadv_debugfs) {</div><div class='del'>-		debugfs_remove_recursive(hard_iface-&gt;debug_dir);</div><div class='del'>-		hard_iface-&gt;debug_dir = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_add_meshif() - Initialize interface dependent debugfs entries</div><div class='del'>- * @dev: netdev struct of the soft interface</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_debugfs_add_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_debuginfo **bat_debug;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct dentry *file;</div><div class='del'>-</div><div class='del'>-	if (!batadv_debugfs)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (net != &amp;init_net)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;debug_dir = debugfs_create_dir(dev-&gt;name, batadv_debugfs);</div><div class='del'>-	if (!bat_priv-&gt;debug_dir)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (batadv_socket_setup(bat_priv) &lt; 0)</div><div class='del'>-		goto rem_attr;</div><div class='del'>-</div><div class='del'>-	if (batadv_debug_log_setup(bat_priv) &lt; 0)</div><div class='del'>-		goto rem_attr;</div><div class='del'>-</div><div class='del'>-	for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {</div><div class='del'>-		file = debugfs_create_file(((*bat_debug)-&gt;attr).name,</div><div class='del'>-					   S_IFREG | ((*bat_debug)-&gt;attr).mode,</div><div class='del'>-					   bat_priv-&gt;debug_dir,</div><div class='del'>-					   dev, &amp;(*bat_debug)-&gt;fops);</div><div class='del'>-		if (!file) {</div><div class='del'>-			batadv_err(dev, "Can't add debugfs file: %s/%s\n",</div><div class='del'>-				   dev-&gt;name, ((*bat_debug)-&gt;attr).name);</div><div class='del'>-			goto rem_attr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (batadv_nc_init_debugfs(bat_priv) &lt; 0)</div><div class='del'>-		goto rem_attr;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-rem_attr:</div><div class='del'>-	debugfs_remove_recursive(bat_priv-&gt;debug_dir);</div><div class='del'>-	bat_priv-&gt;debug_dir = NULL;</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_rename_meshif() - Fix debugfs path for renamed softif</div><div class='del'>- * @dev: net_device which was renamed</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_rename_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	const char *name = dev-&gt;name;</div><div class='del'>-	struct dentry *dir;</div><div class='del'>-	struct dentry *d;</div><div class='del'>-</div><div class='del'>-	dir = bat_priv-&gt;debug_dir;</div><div class='del'>-	if (!dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	d = debugfs_rename(dir-&gt;d_parent, dir, dir-&gt;d_parent, name);</div><div class='del'>-	if (!d)</div><div class='del'>-		pr_err("Can't rename debugfs dir to %s\n", name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debugfs_del_meshif() - Remove interface dependent debugfs entries</div><div class='del'>- * @dev: netdev struct of the soft interface</div><div class='del'>- */</div><div class='del'>-void batadv_debugfs_del_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	if (net != &amp;init_net)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	batadv_debug_log_cleanup(bat_priv);</div><div class='del'>-</div><div class='del'>-	if (batadv_debugfs) {</div><div class='del'>-		debugfs_remove_recursive(bat_priv-&gt;debug_dir);</div><div class='del'>-		bat_priv-&gt;debug_dir = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h<br/>deleted file mode 100644<br/>index 08a592ffbee5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/debugfs.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/debugfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _NET_BATMAN_ADV_DEBUGFS_H_</div><div class='del'>-#define _NET_BATMAN_ADV_DEBUGFS_H_</div><div class='del'>-</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-struct net_device;</div><div class='del'>-</div><div class='del'>-#define BATADV_DEBUGFS_SUBDIR "batman_adv"</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_BATMAN_ADV_DEBUGFS)</div><div class='del'>-</div><div class='del'>-void batadv_debugfs_init(void);</div><div class='del'>-void batadv_debugfs_destroy(void);</div><div class='del'>-int batadv_debugfs_add_meshif(struct net_device *dev);</div><div class='del'>-void batadv_debugfs_rename_meshif(struct net_device *dev);</div><div class='del'>-void batadv_debugfs_del_meshif(struct net_device *dev);</div><div class='del'>-int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);</div><div class='del'>-void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface);</div><div class='del'>-void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void batadv_debugfs_init(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_debugfs_destroy(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_debugfs_add_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_debugfs_rename_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_debugfs_del_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */</div><div class='head'>diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c<br/>index a60bacf7120b..8b8132eb0a79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/distributed-arp-table.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/distributed-arp-table.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/distributed-arp-table.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/distributed-arp-table.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='hunk'>@@ -22,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -29,24 +19,24 @@</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='hunk'>@@ -56,19 +46,60 @@</div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> #include "tvlv.h"</div><div class='ctx'> </div><div class='add'>+enum batadv_bootpop {</div><div class='add'>+	BATADV_BOOTREPLY	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum batadv_boothtype {</div><div class='add'>+	BATADV_HTYPE_ETHERNET	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum batadv_dhcpoptioncode {</div><div class='add'>+	BATADV_DHCP_OPT_PAD		= 0,</div><div class='add'>+	BATADV_DHCP_OPT_MSG_TYPE	= 53,</div><div class='add'>+	BATADV_DHCP_OPT_END		= 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum batadv_dhcptype {</div><div class='add'>+	BATADV_DHCPACK		= 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* { 99, 130, 83, 99 } */</div><div class='add'>+#define BATADV_DHCP_MAGIC 1669485411</div><div class='add'>+</div><div class='add'>+struct batadv_dhcp_packet {</div><div class='add'>+	__u8 op;</div><div class='add'>+	__u8 htype;</div><div class='add'>+	__u8 hlen;</div><div class='add'>+	__u8 hops;</div><div class='add'>+	__be32 xid;</div><div class='add'>+	__be16 secs;</div><div class='add'>+	__be16 flags;</div><div class='add'>+	__be32 ciaddr;</div><div class='add'>+	__be32 yiaddr;</div><div class='add'>+	__be32 siaddr;</div><div class='add'>+	__be32 giaddr;</div><div class='add'>+	__u8 chaddr[16];</div><div class='add'>+	__u8 sname[64];</div><div class='add'>+	__u8 file[128];</div><div class='add'>+	__be32 magic;</div><div class='add'>+	/* __u8 options[]; */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BATADV_DHCP_YIADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)-&gt;yiaddr)</div><div class='add'>+#define BATADV_DHCP_CHADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)-&gt;chaddr)</div><div class='add'>+</div><div class='ctx'> static void batadv_dat_purge(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_start_timer() - initialise the DAT periodic worker</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_dat_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	INIT_DELAYED_WORK(&amp;bat_priv-&gt;dat.work, batadv_dat_purge);</div><div class='ctx'> 	queue_delayed_work(batadv_event_workqueue, &amp;bat_priv-&gt;dat.work,</div><div class='ctx'> 			   msecs_to_jiffies(10000));</div><div class='ctx'> }</div><div class='hunk'>@@ -94,6 +125,9 @@ static void batadv_dat_entry_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_dat_entry_put(struct batadv_dat_entry *dat_entry)</div><div class='ctx'> {</div><div class='add'>+	if (!dat_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;dat_entry-&gt;refcount, batadv_dat_entry_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +145,7 @@ static bool batadv_dat_to_purge(struct batadv_dat_entry *dat_entry)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __batadv_dat_purge() - delete entries from the DAT local storage</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @to_purge: function in charge to decide whether an entry has to be purged or</div><div class='ctx'>  *	      not. This function takes the dat_entry as argument and has to</div><div class='ctx'>  *	      returns a boolean value: true is the entry has to be deleted,</div><div class='hunk'>@@ -212,7 +246,7 @@ static u8 *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size)</div><div class='ctx'>  */</div><div class='ctx'> static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size)</div><div class='ctx'> {</div><div class='del'>-	return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN);</div><div class='add'>+	return *(__force __be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -236,7 +270,9 @@ static u8 *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size)</div><div class='ctx'>  */</div><div class='ctx'> static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size)</div><div class='ctx'> {</div><div class='del'>-	return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4);</div><div class='add'>+	u8 *dst = batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4;</div><div class='add'>+</div><div class='add'>+	return *(__force __be32 *)dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -251,16 +287,18 @@ static u32 batadv_hash_dat(const void *data, u32 size)</div><div class='ctx'> 	u32 hash = 0;</div><div class='ctx'> 	const struct batadv_dat_entry *dat = data;</div><div class='ctx'> 	const unsigned char *key;</div><div class='add'>+	__be16 vid;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	key = (const unsigned char *)&amp;dat-&gt;ip;</div><div class='add'>+	key = (__force const unsigned char *)&amp;dat-&gt;ip;</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(dat-&gt;ip); i++) {</div><div class='ctx'> 		hash += key[i];</div><div class='ctx'> 		hash += (hash &lt;&lt; 10);</div><div class='ctx'> 		hash ^= (hash &gt;&gt; 6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = (const unsigned char *)&amp;dat-&gt;vid;</div><div class='add'>+	vid = htons(dat-&gt;vid);</div><div class='add'>+	key = (__force const unsigned char *)&amp;vid;</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(dat-&gt;vid); i++) {</div><div class='ctx'> 		hash += key[i];</div><div class='ctx'> 		hash += (hash &lt;&lt; 10);</div><div class='hunk'>@@ -277,7 +315,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_entry_hash_find() - look for a given dat_entry in the local hash</div><div class='ctx'>  * table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ip: search key</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -319,7 +357,7 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_entry_add() - add a new dat entry or update it if already exists</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ip: ipv4 to add/edit</div><div class='ctx'>  * @mac_addr: mac address to assign to the given ipv4</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='hunk'>@@ -368,8 +406,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,</div><div class='ctx'> 		   &amp;dat_entry-&gt;ip, dat_entry-&gt;mac_addr, batadv_print_vid(vid));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (dat_entry)</div><div class='del'>-		batadv_dat_entry_put(dat_entry);</div><div class='add'>+	batadv_dat_entry_put(dat_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='hunk'>@@ -377,7 +414,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dbg_arp() - print a debug message containing all the ARP packet</div><div class='ctx'>  *  details</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: ARP packet</div><div class='ctx'>  * @hdr_size: size of the possible header before the ARP packet</div><div class='ctx'>  * @msg: message to print together with the debugging information</div><div class='hunk'>@@ -512,7 +549,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_choose_next_candidate() - select the next DHT candidate</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @cands: candidates array</div><div class='ctx'>  * @select: number of candidates already present in the array</div><div class='ctx'>  * @ip_key: key to look up in the DHT</div><div class='hunk'>@@ -557,8 +594,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv,</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			max = tmp_max;</div><div class='del'>-			if (max_orig_node)</div><div class='del'>-				batadv_orig_node_put(max_orig_node);</div><div class='add'>+			batadv_orig_node_put(max_orig_node);</div><div class='ctx'> 			max_orig_node = orig_node;</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -577,7 +613,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_select_candidates() - select the nodes which the DHT message has</div><div class='ctx'>  *  to be sent to</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ip_dst: ipv4 to look up in the DHT</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -621,22 +657,22 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_dat_send_data() - send a payload to the selected candidates</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_dat_forward_data() - copy and send payload to the selected candidates</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: payload to send</div><div class='ctx'>  * @ip: the DHT key</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  * @packet_subtype: unicast4addr packet subtype to use</div><div class='ctx'>  *</div><div class='del'>- * This function copies the skb with pskb_copy() and is sent as unicast packet</div><div class='add'>+ * This function copies the skb with pskb_copy() and is sent as a unicast packet</div><div class='ctx'>  * to each of the selected candidates.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the packet is sent to at least one candidate, false</div><div class='ctx'>  * otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_dat_send_data(struct batadv_priv *bat_priv,</div><div class='del'>-				 struct sk_buff *skb, __be32 ip,</div><div class='del'>-				 unsigned short vid, int packet_subtype)</div><div class='add'>+static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,</div><div class='add'>+				    struct sk_buff *skb, __be32 ip,</div><div class='add'>+				    unsigned short vid, int packet_subtype)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	bool ret = false;</div><div class='hunk'>@@ -647,7 +683,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	cand = batadv_dat_select_candidates(bat_priv, ip, vid);</div><div class='ctx'> 	if (!cand)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &amp;ip);</div><div class='ctx'> </div><div class='hunk'>@@ -691,7 +727,6 @@ free_orig:</div><div class='ctx'> 		batadv_orig_node_put(cand[i].orig_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	kfree(cand);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -699,7 +734,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_tvlv_container_update() - update the dat tvlv container after dat</div><div class='ctx'>  *  setting change</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_dat_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -721,7 +756,7 @@ static void batadv_dat_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_status_update() - update the dat tvlv container after dat</div><div class='ctx'>  *  setting change</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='add'>+ * @net_dev: the mesh interface net device</div><div class='ctx'>  */</div><div class='ctx'> void batadv_dat_status_update(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -732,7 +767,7 @@ void batadv_dat_status_update(struct net_device *net_dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_tvlv_ogm_handler_v1() - process incoming dat tvlv container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node of the ogm</div><div class='ctx'>  * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the gateway data</div><div class='hunk'>@@ -751,7 +786,7 @@ static void batadv_dat_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_hash_free() - free the local DAT hash table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_dat_hash_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -767,7 +802,7 @@ static void batadv_dat_hash_free(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_init() - initialise the DAT internals</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 in case of success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -781,10 +816,11 @@ int batadv_dat_init(struct batadv_priv *bat_priv)</div><div class='ctx'> 	if (!bat_priv-&gt;dat.hash)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	INIT_DELAYED_WORK(&amp;bat_priv-&gt;dat.work, batadv_dat_purge);</div><div class='ctx'> 	batadv_dat_start_timer(bat_priv);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1,</div><div class='del'>-				     NULL, BATADV_TVLV_DAT, 1,</div><div class='add'>+				     NULL, NULL, BATADV_TVLV_DAT, 1,</div><div class='ctx'> 				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='ctx'> 	batadv_dat_tvlv_container_update(bat_priv);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -792,7 +828,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_free() - free the DAT internals</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_dat_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -804,82 +840,32 @@ void batadv_dat_free(struct batadv_priv *bat_priv)</div><div class='ctx'> 	batadv_dat_hash_free(bat_priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_dat_cache_seq_print_text() - print the local DAT hash table</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;dat.hash;</div><div class='del'>-	struct batadv_dat_entry *dat_entry;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	unsigned long last_seen_jiffies;</div><div class='del'>-	int last_seen_msecs, last_seen_secs, last_seen_mins;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "Distributed ARP Table (%s):\n", net_dev-&gt;name);</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "          IPv4             MAC        VID   last-seen\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(dat_entry, head, hash_entry) {</div><div class='del'>-			last_seen_jiffies = jiffies - dat_entry-&gt;last_update;</div><div class='del'>-			last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);</div><div class='del'>-			last_seen_mins = last_seen_msecs / 60000;</div><div class='del'>-			last_seen_msecs = last_seen_msecs % 60000;</div><div class='del'>-			last_seen_secs = last_seen_msecs / 1000;</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, " * %15pI4 %pM %4i %6i:%02i\n",</div><div class='del'>-				   &amp;dat_entry-&gt;ip, dat_entry-&gt;mac_addr,</div><div class='del'>-				   batadv_print_vid(dat_entry-&gt;vid),</div><div class='del'>-				   last_seen_mins, last_seen_secs);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_cache_dump_entry() - dump one entry of the DAT cache table to a</div><div class='ctx'>  *  netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @dat_entry: entry to dump</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_dat_cache_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_dat_cache_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+			    struct netlink_callback *cb,</div><div class='ctx'> 			    struct batadv_dat_entry *dat_entry)</div><div class='ctx'> {</div><div class='ctx'> 	int msecs;</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_DAT_CACHE);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_DAT_CACHE);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	msecs = jiffies_to_msecs(jiffies - dat_entry-&gt;last_update);</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_in_addr(msg, BATADV_ATTR_DAT_CACHE_IP4ADDRESS,</div><div class='hunk'>@@ -901,27 +887,31 @@ batadv_dat_cache_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  *  a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @head: bucket to dump</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @hash: hash to dump</div><div class='add'>+ * @bucket: bucket index to dump</div><div class='ctx'>  * @idx_skip: How many entries to skip</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_dat_cache_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='del'>-			     struct hlist_head *head, int *idx_skip)</div><div class='add'>+batadv_dat_cache_dump_bucket(struct sk_buff *msg, u32 portid,</div><div class='add'>+			     struct netlink_callback *cb,</div><div class='add'>+			     struct batadv_hashtable *hash, unsigned int bucket,</div><div class='add'>+			     int *idx_skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_dat_entry *dat_entry;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(dat_entry, head, hash_entry) {</div><div class='add'>+	spin_lock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='add'>+	cb-&gt;seq = atomic_read(&amp;hash-&gt;generation) &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(dat_entry, &amp;hash-&gt;table[bucket], hash_entry) {</div><div class='ctx'> 		if (idx &lt; *idx_skip)</div><div class='ctx'> 			goto skip;</div><div class='ctx'> </div><div class='del'>-		if (batadv_dat_cache_dump_entry(msg, portid, seq,</div><div class='del'>-						dat_entry)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+		if (batadv_dat_cache_dump_entry(msg, portid, cb, dat_entry)) {</div><div class='add'>+			spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> 			*idx_skip = idx;</div><div class='ctx'> </div><div class='ctx'> 			return -EMSGSIZE;</div><div class='hunk'>@@ -930,7 +920,7 @@ batadv_dat_cache_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> skip:</div><div class='ctx'> 		idx++;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -946,28 +936,18 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_hashtable *hash;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	int bucket = cb-&gt;args[0];</div><div class='del'>-	struct hlist_head *head;</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-					     BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	hash = bat_priv-&gt;dat.hash;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -977,10 +957,7 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (bucket &lt; hash-&gt;size) {</div><div class='del'>-		head = &amp;hash-&gt;table[bucket];</div><div class='del'>-</div><div class='del'>-		if (batadv_dat_cache_dump_bucket(msg, portid,</div><div class='del'>-						 cb-&gt;nlh-&gt;nlmsg_seq, head,</div><div class='add'>+		if (batadv_dat_cache_dump_bucket(msg, portid, cb, hash, bucket,</div><div class='ctx'> 						 &amp;idx))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -994,18 +971,16 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_arp_get_type() - parse an ARP packet and gets the type</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to analyse</div><div class='ctx'>  * @hdr_size: size of the possible header before the ARP packet in the skb</div><div class='ctx'>  *</div><div class='hunk'>@@ -1105,7 +1080,7 @@ static unsigned short batadv_dat_get_vid(struct sk_buff *skb, int *hdr_size)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_arp_create_reply() - create an ARP Reply</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ip_src: ARP sender IP</div><div class='ctx'>  * @ip_dst: ARP target IP</div><div class='ctx'>  * @hw_src: Ethernet source and ARP sender MAC</div><div class='hunk'>@@ -1124,7 +1099,7 @@ batadv_dat_arp_create_reply(struct batadv_priv *bat_priv, __be32 ip_src,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	skb = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_dst, bat_priv-&gt;soft_iface,</div><div class='add'>+	skb = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_dst, bat_priv-&gt;mesh_iface,</div><div class='ctx'> 			 ip_src, hw_dst, hw_src, hw_dst);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1141,7 +1116,7 @@ batadv_dat_arp_create_reply(struct batadv_priv *bat_priv, __be32 ip_src,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_snoop_outgoing_arp_request() - snoop the ARP request and try to</div><div class='ctx'>  * answer using DAT</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to check</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the message has been sent to the dht candidates, false</div><div class='hunk'>@@ -1157,7 +1132,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> 	struct batadv_dat_entry *dat_entry = NULL;</div><div class='ctx'> 	struct sk_buff *skb_new;</div><div class='del'>-	struct net_device *soft_iface = bat_priv-&gt;soft_iface;</div><div class='add'>+	struct net_device *mesh_iface = bat_priv-&gt;mesh_iface;</div><div class='ctx'> 	int hdr_size = 0;</div><div class='ctx'> 	unsigned short vid;</div><div class='ctx'> </div><div class='hunk'>@@ -1187,7 +1162,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 		 * client will answer itself. DAT would only generate a</div><div class='ctx'> 		 * duplicate packet.</div><div class='ctx'> 		 *</div><div class='del'>-		 * Moreover, if the soft-interface is enslaved into a bridge, an</div><div class='add'>+		 * Moreover, if the mesh-interface is enslaved into a bridge, an</div><div class='ctx'> 		 * additional DAT answer may trigger kernel warnings about</div><div class='ctx'> 		 * a packet coming from the wrong port.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1216,7 +1191,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 		if (!skb_new)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		skb_new-&gt;protocol = eth_type_trans(skb_new, soft_iface);</div><div class='add'>+		skb_new-&gt;protocol = eth_type_trans(skb_new, mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 		batadv_inc_counter(bat_priv, BATADV_CNT_RX);</div><div class='ctx'> 		batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,</div><div class='hunk'>@@ -1227,19 +1202,18 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Send the request to the DHT */</div><div class='del'>-		ret = batadv_dat_send_data(bat_priv, skb, ip_dst, vid,</div><div class='del'>-					   BATADV_P_DAT_DHT_GET);</div><div class='add'>+		ret = batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,</div><div class='add'>+					      BATADV_P_DAT_DHT_GET);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (dat_entry)</div><div class='del'>-		batadv_dat_entry_put(dat_entry);</div><div class='add'>+	batadv_dat_entry_put(dat_entry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_snoop_incoming_arp_request() - snoop the ARP request and try to</div><div class='ctx'>  * answer using the local DAT storage</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to check</div><div class='ctx'>  * @hdr_size: size of the encapsulation header</div><div class='ctx'>  *</div><div class='hunk'>@@ -1299,8 +1273,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (dat_entry)</div><div class='del'>-		batadv_dat_entry_put(dat_entry);</div><div class='add'>+	batadv_dat_entry_put(dat_entry);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1308,7 +1281,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_snoop_outgoing_arp_reply() - snoop the ARP reply and fill the DHT</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to check</div><div class='ctx'>  */</div><div class='ctx'> void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -1342,14 +1315,16 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 	/* Send the ARP reply to the candidates for both the IP addresses that</div><div class='ctx'> 	 * the node obtained from the ARP reply</div><div class='ctx'> 	 */</div><div class='del'>-	batadv_dat_send_data(bat_priv, skb, ip_src, vid, BATADV_P_DAT_DHT_PUT);</div><div class='del'>-	batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT);</div><div class='add'>+	batadv_dat_forward_data(bat_priv, skb, ip_src, vid,</div><div class='add'>+				BATADV_P_DAT_DHT_PUT);</div><div class='add'>+	batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,</div><div class='add'>+				BATADV_P_DAT_DHT_PUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_snoop_incoming_arp_reply() - snoop the ARP reply and fill the</div><div class='ctx'>  *  local DAT storage only</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to check</div><div class='ctx'>  * @hdr_size: size of the encapsulation header</div><div class='ctx'>  *</div><div class='hunk'>@@ -1394,7 +1369,6 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 			   hw_src, &amp;ip_src, hw_dst, &amp;ip_dst,</div><div class='ctx'> 			   dat_entry-&gt;mac_addr,	&amp;dat_entry-&gt;ip);</div><div class='ctx'> 		dropped = true;</div><div class='del'>-		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update our internal cache with both the IP addresses the node got</div><div class='hunk'>@@ -1403,6 +1377,9 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);</div><div class='ctx'> 	batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid);</div><div class='ctx'> </div><div class='add'>+	if (dropped)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* If BLA is enabled, only forward ARP replies if we have claimed the</div><div class='ctx'> 	 * source of the ARP reply or if no one else of the same backbone has</div><div class='ctx'> 	 * already claimed that client. This prevents that different gateways</div><div class='hunk'>@@ -1429,16 +1406,372 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> out:</div><div class='ctx'> 	if (dropped)</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-	if (dat_entry)</div><div class='del'>-		batadv_dat_entry_put(dat_entry);</div><div class='add'>+	batadv_dat_entry_put(dat_entry);</div><div class='ctx'> 	/* if dropped == false -&gt; deliver to the interface */</div><div class='ctx'> 	return dropped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_dat_check_dhcp_ipudp() - check skb for IP+UDP headers valid for DHCP</div><div class='add'>+ * @skb: the packet to check</div><div class='add'>+ * @ip_src: a buffer to store the IPv4 source address in</div><div class='add'>+ *</div><div class='add'>+ * Checks whether the given skb has an IP and UDP header valid for a DHCP</div><div class='add'>+ * message from a DHCP server. And if so, stores the IPv4 source address in</div><div class='add'>+ * the provided buffer.</div><div class='add'>+ *</div><div class='add'>+ * Return: True if valid, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+batadv_dat_check_dhcp_ipudp(struct sk_buff *skb, __be32 *ip_src)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset = skb_network_offset(skb);</div><div class='add'>+	struct udphdr *udphdr, _udphdr;</div><div class='add'>+	struct iphdr *iphdr, _iphdr;</div><div class='add'>+</div><div class='add'>+	iphdr = skb_header_pointer(skb, offset, sizeof(_iphdr), &amp;_iphdr);</div><div class='add'>+	if (!iphdr || iphdr-&gt;version != 4 || iphdr-&gt;ihl * 4 &lt; sizeof(_iphdr))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (iphdr-&gt;protocol != IPPROTO_UDP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	offset += iphdr-&gt;ihl * 4;</div><div class='add'>+	skb_set_transport_header(skb, offset);</div><div class='add'>+</div><div class='add'>+	udphdr = skb_header_pointer(skb, offset, sizeof(_udphdr), &amp;_udphdr);</div><div class='add'>+	if (!udphdr || udphdr-&gt;source != htons(67))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*ip_src = get_unaligned(&amp;iphdr-&gt;saddr);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_check_dhcp() - examine packet for valid DHCP message</div><div class='add'>+ * @skb: the packet to check</div><div class='add'>+ * @proto: ethernet protocol hint (behind a potential vlan)</div><div class='add'>+ * @ip_src: a buffer to store the IPv4 source address in</div><div class='add'>+ *</div><div class='add'>+ * Checks whether the given skb is a valid DHCP packet. And if so, stores the</div><div class='add'>+ * IPv4 source address in the provided buffer.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the skb network header is set correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: If skb is a valid DHCP packet, then returns its op code</div><div class='add'>+ * (e.g. BOOTREPLY vs. BOOTREQUEST). Otherwise returns -EINVAL.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_dat_check_dhcp(struct sk_buff *skb, __be16 proto, __be32 *ip_src)</div><div class='add'>+{</div><div class='add'>+	__be32 *magic, _magic;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	struct {</div><div class='add'>+		__u8 op;</div><div class='add'>+		__u8 htype;</div><div class='add'>+		__u8 hlen;</div><div class='add'>+		__u8 hops;</div><div class='add'>+	} *dhcp_h, _dhcp_h;</div><div class='add'>+</div><div class='add'>+	if (proto != htons(ETH_P_IP))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!batadv_dat_check_dhcp_ipudp(skb, ip_src))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	offset = skb_transport_offset(skb) + sizeof(struct udphdr);</div><div class='add'>+	if (skb-&gt;len &lt; offset + sizeof(struct batadv_dhcp_packet))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dhcp_h = skb_header_pointer(skb, offset, sizeof(_dhcp_h), &amp;_dhcp_h);</div><div class='add'>+	if (!dhcp_h || dhcp_h-&gt;htype != BATADV_HTYPE_ETHERNET ||</div><div class='add'>+	    dhcp_h-&gt;hlen != ETH_ALEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	offset += offsetof(struct batadv_dhcp_packet, magic);</div><div class='add'>+</div><div class='add'>+	magic = skb_header_pointer(skb, offset, sizeof(_magic), &amp;_magic);</div><div class='add'>+	if (!magic || get_unaligned(magic) != htonl(BATADV_DHCP_MAGIC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return dhcp_h-&gt;op;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_get_dhcp_message_type() - get message type of a DHCP packet</div><div class='add'>+ * @skb: the DHCP packet to parse</div><div class='add'>+ *</div><div class='add'>+ * Iterates over the DHCP options of the given DHCP packet to find a</div><div class='add'>+ * DHCP Message Type option and parse it.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the given skb is a valid DHCP packet and</div><div class='add'>+ * that the skb transport header is set correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: The found DHCP message type value, if found. -EINVAL otherwise.</div><div class='add'>+ */</div><div class='add'>+static int batadv_dat_get_dhcp_message_type(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset = skb_transport_offset(skb) + sizeof(struct udphdr);</div><div class='add'>+	u8 *type, _type;</div><div class='add'>+	struct {</div><div class='add'>+		u8 type;</div><div class='add'>+		u8 len;</div><div class='add'>+	} *tl, _tl;</div><div class='add'>+</div><div class='add'>+	offset += sizeof(struct batadv_dhcp_packet);</div><div class='add'>+</div><div class='add'>+	while ((tl = skb_header_pointer(skb, offset, sizeof(_tl), &amp;_tl))) {</div><div class='add'>+		if (tl-&gt;type == BATADV_DHCP_OPT_MSG_TYPE)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (tl-&gt;type == BATADV_DHCP_OPT_END)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (tl-&gt;type == BATADV_DHCP_OPT_PAD)</div><div class='add'>+			offset++;</div><div class='add'>+		else</div><div class='add'>+			offset += tl-&gt;len + sizeof(_tl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Option Overload Code not supported */</div><div class='add'>+	if (!tl || tl-&gt;type != BATADV_DHCP_OPT_MSG_TYPE ||</div><div class='add'>+	    tl-&gt;len != sizeof(_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	offset += sizeof(_tl);</div><div class='add'>+</div><div class='add'>+	type = skb_header_pointer(skb, offset, sizeof(_type), &amp;_type);</div><div class='add'>+	if (!type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return *type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_dhcp_get_yiaddr() - get yiaddr from a DHCP packet</div><div class='add'>+ * @skb: the DHCP packet to parse</div><div class='add'>+ * @buf: a buffer to store the yiaddr in</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the given skb is a valid DHCP packet and</div><div class='add'>+ * that the skb transport header is set correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: True on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_dat_dhcp_get_yiaddr(struct sk_buff *skb, __be32 *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset = skb_transport_offset(skb) + sizeof(struct udphdr);</div><div class='add'>+	__be32 *yiaddr;</div><div class='add'>+</div><div class='add'>+	offset += offsetof(struct batadv_dhcp_packet, yiaddr);</div><div class='add'>+	yiaddr = skb_header_pointer(skb, offset, BATADV_DHCP_YIADDR_LEN, buf);</div><div class='add'>+</div><div class='add'>+	if (!yiaddr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (yiaddr != buf)</div><div class='add'>+		*buf = get_unaligned(yiaddr);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_get_dhcp_chaddr() - get chaddr from a DHCP packet</div><div class='add'>+ * @skb: the DHCP packet to parse</div><div class='add'>+ * @buf: a buffer to store the chaddr in</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the given skb is a valid DHCP packet and</div><div class='add'>+ * that the skb transport header is set correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: True on success, false otherwise</div><div class='add'>+ */</div><div class='add'>+static bool batadv_dat_get_dhcp_chaddr(struct sk_buff *skb, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset = skb_transport_offset(skb) + sizeof(struct udphdr);</div><div class='add'>+	u8 *chaddr;</div><div class='add'>+</div><div class='add'>+	offset += offsetof(struct batadv_dhcp_packet, chaddr);</div><div class='add'>+	chaddr = skb_header_pointer(skb, offset, BATADV_DHCP_CHADDR_LEN, buf);</div><div class='add'>+</div><div class='add'>+	if (!chaddr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (chaddr != buf)</div><div class='add'>+		memcpy(buf, chaddr, BATADV_DHCP_CHADDR_LEN);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_put_dhcp() - puts addresses from a DHCP packet into the DHT and</div><div class='add'>+ *  DAT cache</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @chaddr: the DHCP client MAC address</div><div class='add'>+ * @yiaddr: the DHCP client IP address</div><div class='add'>+ * @hw_dst: the DHCP server MAC address</div><div class='add'>+ * @ip_dst: the DHCP server IP address</div><div class='add'>+ * @vid: VLAN identifier</div><div class='add'>+ *</div><div class='add'>+ * Adds given MAC/IP pairs to the local DAT cache and propagates them further</div><div class='add'>+ * into the DHT.</div><div class='add'>+ *</div><div class='add'>+ * For the DHT propagation, client MAC + IP will appear as the ARP Reply</div><div class='add'>+ * transmitter (and hw_dst/ip_dst as the target).</div><div class='add'>+ */</div><div class='add'>+static void batadv_dat_put_dhcp(struct batadv_priv *bat_priv, u8 *chaddr,</div><div class='add'>+				__be32 yiaddr, u8 *hw_dst, __be32 ip_dst,</div><div class='add'>+				unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = batadv_dat_arp_create_reply(bat_priv, yiaddr, ip_dst, chaddr,</div><div class='add'>+					  hw_dst, vid);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_set_network_header(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid);</div><div class='add'>+	batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid);</div><div class='add'>+</div><div class='add'>+	batadv_dat_forward_data(bat_priv, skb, yiaddr, vid,</div><div class='add'>+				BATADV_P_DAT_DHT_PUT);</div><div class='add'>+	batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,</div><div class='add'>+				BATADV_P_DAT_DHT_PUT);</div><div class='add'>+</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+</div><div class='add'>+	batadv_dbg(BATADV_DBG_DAT, bat_priv,</div><div class='add'>+		   "Snooped from outgoing DHCPACK (server address): %pI4, %pM (vid: %i)\n",</div><div class='add'>+		   &amp;ip_dst, hw_dst, batadv_print_vid(vid));</div><div class='add'>+	batadv_dbg(BATADV_DBG_DAT, bat_priv,</div><div class='add'>+		   "Snooped from outgoing DHCPACK (client address): %pI4, %pM (vid: %i)\n",</div><div class='add'>+		   &amp;yiaddr, chaddr, batadv_print_vid(vid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_check_dhcp_ack() - examine packet for valid DHCP message</div><div class='add'>+ * @skb: the packet to check</div><div class='add'>+ * @proto: ethernet protocol hint (behind a potential vlan)</div><div class='add'>+ * @ip_src: a buffer to store the IPv4 source address in</div><div class='add'>+ * @chaddr: a buffer to store the DHCP Client Hardware Address in</div><div class='add'>+ * @yiaddr: a buffer to store the DHCP Your IP Address in</div><div class='add'>+ *</div><div class='add'>+ * Checks whether the given skb is a valid DHCPACK. And if so, stores the</div><div class='add'>+ * IPv4 server source address (ip_src), client MAC address (chaddr) and client</div><div class='add'>+ * IPv4 address (yiaddr) in the provided buffers.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the skb network header is set correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: True if the skb is a valid DHCPACK. False otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+batadv_dat_check_dhcp_ack(struct sk_buff *skb, __be16 proto, __be32 *ip_src,</div><div class='add'>+			  u8 *chaddr, __be32 *yiaddr)</div><div class='add'>+{</div><div class='add'>+	int type;</div><div class='add'>+</div><div class='add'>+	type = batadv_dat_check_dhcp(skb, proto, ip_src);</div><div class='add'>+	if (type != BATADV_BOOTREPLY)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	type = batadv_dat_get_dhcp_message_type(skb);</div><div class='add'>+	if (type != BATADV_DHCPACK)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!batadv_dat_dhcp_get_yiaddr(skb, yiaddr))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!batadv_dat_get_dhcp_chaddr(skb, chaddr))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_snoop_outgoing_dhcp_ack() - snoop DHCPACK and fill DAT with it</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the packet to snoop</div><div class='add'>+ * @proto: ethernet protocol hint (behind a potential vlan)</div><div class='add'>+ * @vid: VLAN identifier</div><div class='add'>+ *</div><div class='add'>+ * This function first checks whether the given skb is a valid DHCPACK. If</div><div class='add'>+ * so then its source MAC and IP as well as its DHCP Client Hardware Address</div><div class='add'>+ * field and DHCP Your IP Address field are added to the local DAT cache and</div><div class='add'>+ * propagated into the DHT.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the skb mac and network headers are set</div><div class='add'>+ * correctly.</div><div class='add'>+ */</div><div class='add'>+void batadv_dat_snoop_outgoing_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					__be16 proto,</div><div class='add'>+					unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	u8 chaddr[BATADV_DHCP_CHADDR_LEN];</div><div class='add'>+	__be32 ip_src, yiaddr;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;bat_priv-&gt;distributed_arp_table))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!batadv_dat_check_dhcp_ack(skb, proto, &amp;ip_src, chaddr, &amp;yiaddr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	batadv_dat_put_dhcp(bat_priv, chaddr, yiaddr, eth_hdr(skb)-&gt;h_source,</div><div class='add'>+			    ip_src, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_dat_snoop_incoming_dhcp_ack() - snoop DHCPACK and fill DAT cache</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the packet to snoop</div><div class='add'>+ * @hdr_size: header size, up to the tail of the batman-adv header</div><div class='add'>+ *</div><div class='add'>+ * This function first checks whether the given skb is a valid DHCPACK. If</div><div class='add'>+ * so then its source MAC and IP as well as its DHCP Client Hardware Address</div><div class='add'>+ * field and DHCP Your IP Address field are added to the local DAT cache.</div><div class='add'>+ */</div><div class='add'>+void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+					struct sk_buff *skb, int hdr_size)</div><div class='add'>+{</div><div class='add'>+	u8 chaddr[BATADV_DHCP_CHADDR_LEN];</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='add'>+	__be32 ip_src, yiaddr;</div><div class='add'>+	unsigned short vid;</div><div class='add'>+	__be16 proto;</div><div class='add'>+	u8 *hw_src;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;bat_priv-&gt;distributed_arp_table))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, hdr_size + ETH_HLEN)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ethhdr = (struct ethhdr *)(skb-&gt;data + hdr_size);</div><div class='add'>+	skb_set_network_header(skb, hdr_size + ETH_HLEN);</div><div class='add'>+	proto = ethhdr-&gt;h_proto;</div><div class='add'>+</div><div class='add'>+	if (!batadv_dat_check_dhcp_ack(skb, proto, &amp;ip_src, chaddr, &amp;yiaddr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hw_src = ethhdr-&gt;h_source;</div><div class='add'>+	vid = batadv_dat_get_vid(skb, &amp;hdr_size);</div><div class='add'>+</div><div class='add'>+	batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid);</div><div class='add'>+	batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);</div><div class='add'>+</div><div class='add'>+	batadv_dbg(BATADV_DBG_DAT, bat_priv,</div><div class='add'>+		   "Snooped from incoming DHCPACK (server address): %pI4, %pM (vid: %i)\n",</div><div class='add'>+		   &amp;ip_src, hw_src, batadv_print_vid(vid));</div><div class='add'>+	batadv_dbg(BATADV_DBG_DAT, bat_priv,</div><div class='add'>+		   "Snooped from incoming DHCPACK (client address): %pI4, %pM (vid: %i)\n",</div><div class='add'>+		   &amp;yiaddr, chaddr, batadv_print_vid(vid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_dat_drop_broadcast_packet() - check if an ARP request has to be</div><div class='ctx'>  *  dropped (because the node has already obtained the reply via DAT) or not</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @forw_packet: the broadcast packet</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the node can drop the packet, false otherwise.</div><div class='hunk'>@@ -1482,7 +1815,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,</div><div class='ctx'> 	ret = true;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (dat_entry)</div><div class='del'>-		batadv_dat_entry_put(dat_entry);</div><div class='add'>+	batadv_dat_entry_put(dat_entry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h<br/>index a04596028337..e7b75e82eb1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/distributed-arp-table.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/distributed-arp-table.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/distributed-arp-table.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/distributed-arp-table.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2011-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_</div><div class='hunk'>@@ -23,15 +11,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "originator.h"</div><div class='ctx'> </div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_DAT</div><div class='ctx'> </div><div class='ctx'> /* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */</div><div class='hunk'>@@ -46,6 +32,12 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 					 struct sk_buff *skb);</div><div class='ctx'> bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 					 struct sk_buff *skb, int hdr_size);</div><div class='add'>+void batadv_dat_snoop_outgoing_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					__be16 proto,</div><div class='add'>+					unsigned short vid);</div><div class='add'>+void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+					struct sk_buff *skb, int hdr_size);</div><div class='ctx'> bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,</div><div class='ctx'> 				      struct batadv_forw_packet *forw_packet);</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +56,7 @@ batadv_dat_init_orig_node_addr(struct batadv_orig_node *orig_node)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_init_own_addr() - assign a DAT address to the node itself</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @primary_if: a pointer to the primary interface</div><div class='ctx'>  */</div><div class='ctx'> static inline void</div><div class='hunk'>@@ -81,12 +73,11 @@ batadv_dat_init_own_addr(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> int batadv_dat_init(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_dat_free(struct batadv_priv *bat_priv);</div><div class='del'>-int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_dat_inc_counter() - increment the correct DAT packet counter</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @subtype: the 4addr subtype of the packet to be counted</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the ethtool statistics for the received packet if it is a DAT subtype</div><div class='hunk'>@@ -140,6 +131,19 @@ batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+batadv_dat_snoop_outgoing_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+				   struct sk_buff *skb, __be16 proto,</div><div class='add'>+				   unsigned short vid)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv,</div><div class='add'>+				   struct sk_buff *skb, int hdr_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='ctx'> batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,</div><div class='ctx'> 				 struct batadv_forw_packet *forw_packet)</div><div class='hunk'>@@ -157,11 +161,6 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void batadv_arp_change_timeout(struct net_device *soft_iface,</div><div class='del'>-					     const char *name)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int batadv_dat_init(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c<br/>index 0fddc17106bd..cc14bc41381e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/fragmentation.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/fragmentation.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/fragmentation.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/fragmentation.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Martin Hundebøll &lt;martin@hundeboll.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "fragmentation.h"</div><div class='hunk'>@@ -26,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -37,9 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "originator.h"</div><div class='del'>-#include "routing.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_frag_clear_chain() - delete entries in the fragment buffer chain</div><div class='hunk'>@@ -114,8 +100,8 @@ static int batadv_frag_size_limit(void)</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must hold chain-&gt;lock.</div><div class='ctx'>  *</div><div class='del'>- * Return: true if chain is empty and caller can just insert the new fragment</div><div class='del'>- * without searching for the right position.</div><div class='add'>+ * Return: true if chain is empty and the caller can just insert the new</div><div class='add'>+ * fragment without searching for the right position.</div><div class='ctx'>  */</div><div class='ctx'> static bool batadv_frag_init_chain(struct batadv_frag_table_entry *chain,</div><div class='ctx'> 				   u16 seqno)</div><div class='hunk'>@@ -275,7 +261,7 @@ batadv_frag_merge_packets(struct hlist_head *chain)</div><div class='ctx'> 	kfree(entry);</div><div class='ctx'> </div><div class='ctx'> 	packet = (struct batadv_frag_packet *)skb_out-&gt;data;</div><div class='del'>-	size = ntohs(packet-&gt;total_size);</div><div class='add'>+	size = ntohs(packet-&gt;total_size) + hdr_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Make room for the rest of the fragments. */</div><div class='ctx'> 	if (pskb_expand_head(skb_out, 0, size - skb_out-&gt;len, GFP_ATOMIC) &lt; 0) {</div><div class='hunk'>@@ -318,7 +304,7 @@ free:</div><div class='ctx'>  * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb</div><div class='ctx'>  * to NULL; 3) Error: Return false and free skb.</div><div class='ctx'>  *</div><div class='del'>- * Return: true when packet is merged or buffered, false when skb is not not</div><div class='add'>+ * Return: true when the packet is merged or buffered, false when skb is not</div><div class='ctx'>  * used.</div><div class='ctx'>  */</div><div class='ctx'> bool batadv_frag_skb_buffer(struct sk_buff **skb,</div><div class='hunk'>@@ -363,19 +349,15 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,</div><div class='ctx'> 			 struct batadv_hard_iface *recv_if,</div><div class='ctx'> 			 struct batadv_orig_node *orig_node_src)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='del'>-	struct batadv_orig_node *orig_node_dst;</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node = NULL;</div><div class='ctx'> 	struct batadv_frag_packet *packet;</div><div class='ctx'> 	u16 total_size;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	packet = (struct batadv_frag_packet *)skb-&gt;data;</div><div class='del'>-	orig_node_dst = batadv_orig_hash_find(bat_priv, packet-&gt;dest);</div><div class='del'>-	if (!orig_node_dst)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	neigh_node = batadv_find_router(bat_priv, orig_node_dst, recv_if);</div><div class='add'>+	neigh_node = batadv_orig_to_router(bat_priv, packet-&gt;dest, recv_if);</div><div class='ctx'> 	if (!neigh_node)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -394,15 +376,13 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (orig_node_dst)</div><div class='del'>-		batadv_orig_node_put(orig_node_dst);</div><div class='del'>-	if (neigh_node)</div><div class='del'>-		batadv_neigh_node_put(neigh_node);</div><div class='add'>+	batadv_neigh_node_put(neigh_node);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_frag_create() - create a fragment from skb</div><div class='add'>+ * @net_dev: outgoing device for fragment</div><div class='ctx'>  * @skb: skb to create fragment from</div><div class='ctx'>  * @frag_head: header to use in new fragment</div><div class='ctx'>  * @fragment_size: size of new fragment</div><div class='hunk'>@@ -413,22 +393,25 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the new fragment, NULL on error.</div><div class='ctx'>  */</div><div class='del'>-static struct sk_buff *batadv_frag_create(struct sk_buff *skb,</div><div class='add'>+static struct sk_buff *batadv_frag_create(struct net_device *net_dev,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='ctx'> 					  struct batadv_frag_packet *frag_head,</div><div class='ctx'> 					  unsigned int fragment_size)</div><div class='ctx'> {</div><div class='add'>+	unsigned int ll_reserved = LL_RESERVED_SPACE(net_dev);</div><div class='add'>+	unsigned int tailroom = net_dev-&gt;needed_tailroom;</div><div class='ctx'> 	struct sk_buff *skb_fragment;</div><div class='ctx'> 	unsigned int header_size = sizeof(*frag_head);</div><div class='ctx'> 	unsigned int mtu = fragment_size + header_size;</div><div class='ctx'> </div><div class='del'>-	skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN);</div><div class='add'>+	skb_fragment = dev_alloc_skb(ll_reserved + mtu + tailroom);</div><div class='ctx'> 	if (!skb_fragment)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	skb_fragment-&gt;priority = skb-&gt;priority;</div><div class='ctx'> </div><div class='ctx'> 	/* Eat the last mtu-bytes of the skb */</div><div class='del'>-	skb_reserve(skb_fragment, header_size + ETH_HLEN);</div><div class='add'>+	skb_reserve(skb_fragment, ll_reserved + header_size);</div><div class='ctx'> 	skb_split(skb, skb_fragment, skb-&gt;len - fragment_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Add the header */</div><div class='hunk'>@@ -451,11 +434,12 @@ int batadv_frag_send_packet(struct sk_buff *skb,</div><div class='ctx'> 			    struct batadv_orig_node *orig_node,</div><div class='ctx'> 			    struct batadv_neigh_node *neigh_node)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *net_dev = neigh_node-&gt;if_incoming-&gt;net_dev;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct batadv_frag_packet frag_header;</div><div class='ctx'> 	struct sk_buff *skb_fragment;</div><div class='del'>-	unsigned int mtu = neigh_node-&gt;if_incoming-&gt;net_dev-&gt;mtu;</div><div class='add'>+	unsigned int mtu = net_dev-&gt;mtu;</div><div class='ctx'> 	unsigned int header_size = sizeof(frag_header);</div><div class='ctx'> 	unsigned int max_fragment_size, num_fragments;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -485,6 +469,17 @@ int batadv_frag_send_packet(struct sk_buff *skb,</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* GRO might have added fragments to the fragment list instead of</div><div class='add'>+	 * frags[]. But this is not handled by skb_split and must be</div><div class='add'>+	 * linearized to avoid incorrect length information after all</div><div class='add'>+	 * batman-adv fragments were created and submitted to the</div><div class='add'>+	 * hard-interface</div><div class='add'>+	 */</div><div class='add'>+	if (skb_has_frag_list(skb) &amp;&amp; __skb_linearize(skb)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Create one header to be copied to all fragments */</div><div class='ctx'> 	frag_header.packet_type = BATADV_UNICAST_FRAG;</div><div class='ctx'> 	frag_header.version = BATADV_COMPAT_VERSION;</div><div class='hunk'>@@ -515,7 +510,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,</div><div class='ctx'> 			goto put_primary_if;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_fragment = batadv_frag_create(skb, &amp;frag_header,</div><div class='add'>+		skb_fragment = batadv_frag_create(net_dev, skb, &amp;frag_header,</div><div class='ctx'> 						  max_fragment_size);</div><div class='ctx'> 		if (!skb_fragment) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='hunk'>@@ -534,13 +529,14 @@ int batadv_frag_send_packet(struct sk_buff *skb,</div><div class='ctx'> 		frag_header.no++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Make room for the fragment header. */</div><div class='del'>-	if (batadv_skb_head_push(skb, header_size) &lt; 0 ||</div><div class='del'>-	    pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) &lt; 0) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	/* make sure that there is at least enough head for the fragmentation</div><div class='add'>+	 * and ethernet headers</div><div class='add'>+	 */</div><div class='add'>+	ret = skb_cow_head(skb, ETH_HLEN + header_size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto put_primary_if;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	skb_push(skb, header_size);</div><div class='ctx'> 	memcpy(skb-&gt;data, &amp;frag_header, header_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Send the last fragment */</div><div class='head'>diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h<br/>index 944512e07782..dbf0871f8703 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/fragmentation.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/fragmentation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/fragmentation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/fragmentation.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2013-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Martin Hundebøll &lt;martin@hundeboll.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_FRAGMENTATION_H_</div><div class='hunk'>@@ -23,11 +11,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> void batadv_frag_purge_orig(struct batadv_orig_node *orig,</div><div class='ctx'> 			    bool (*check_cb)(struct batadv_frag_table_entry *));</div><div class='ctx'> bool batadv_frag_skb_fwd(struct sk_buff *skb,</div><div class='head'>diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c<br/>index 140c61a3f1ec..7a11b245e9f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_client.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/gateway_client.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "gateway_client.h"</div><div class='hunk'>@@ -21,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -29,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='hunk'>@@ -37,24 +26,20 @@</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sprintf.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "gateway_common.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "routing.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='del'>-#include "sysfs.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> /* These are the offsets of the "hw type" and "hw address length" in the dhcp</div><div class='hunk'>@@ -74,7 +59,7 @@</div><div class='ctx'>  *  after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the gw_node</div><div class='ctx'>  */</div><div class='del'>-static void batadv_gw_node_release(struct kref *ref)</div><div class='add'>+void batadv_gw_node_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_gw_node *gw_node;</div><div class='ctx'> </div><div class='hunk'>@@ -85,18 +70,8 @@ static void batadv_gw_node_release(struct kref *ref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_gw_node_put() - decrement the gw_node refcounter and possibly release</div><div class='del'>- *  it</div><div class='del'>- * @gw_node: gateway node to free</div><div class='del'>- */</div><div class='del'>-void batadv_gw_node_put(struct batadv_gw_node *gw_node)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;gw_node-&gt;refcount, batadv_gw_node_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_gw_get_selected_gw_node() - Get currently selected gateway</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: selected gateway (with increased refcnt), NULL on errors</div><div class='ctx'>  */</div><div class='hunk'>@@ -120,7 +95,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_get_selected_orig() - Get originator of currently selected gateway</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: orig_node of selected gateway (with increased refcnt), NULL on errors</div><div class='ctx'>  */</div><div class='hunk'>@@ -145,8 +120,7 @@ batadv_gw_get_selected_orig(struct batadv_priv *bat_priv)</div><div class='ctx'> unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='del'>-	if (gw_node)</div><div class='del'>-		batadv_gw_node_put(gw_node);</div><div class='add'>+	batadv_gw_node_put(gw_node);</div><div class='ctx'> 	return orig_node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -160,18 +134,17 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,</div><div class='ctx'> 	if (new_gw_node)</div><div class='ctx'> 		kref_get(&amp;new_gw_node-&gt;refcount);</div><div class='ctx'> </div><div class='del'>-	curr_gw_node = rcu_dereference_protected(bat_priv-&gt;gw.curr_gw, 1);</div><div class='del'>-	rcu_assign_pointer(bat_priv-&gt;gw.curr_gw, new_gw_node);</div><div class='add'>+	curr_gw_node = rcu_replace_pointer(bat_priv-&gt;gw.curr_gw, new_gw_node,</div><div class='add'>+					   true);</div><div class='ctx'> </div><div class='del'>-	if (curr_gw_node)</div><div class='del'>-		batadv_gw_node_put(curr_gw_node);</div><div class='add'>+	batadv_gw_node_put(curr_gw_node);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_reselect() - force a gateway reselection</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Set a flag to remind the GW component to perform a new gateway reselection.</div><div class='ctx'>  * However this function does not ensure that the current gateway is going to be</div><div class='hunk'>@@ -187,7 +160,7 @@ void batadv_gw_reselect(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_check_client_stop() - check if client mode has been switched off</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * This function assumes the caller has checked that the gw state *is actually</div><div class='ctx'>  * changing*. This function is not supposed to be called when there is no state</div><div class='hunk'>@@ -219,7 +192,7 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_election() - Elect the best gateway</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_election(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -299,19 +272,15 @@ void batadv_gw_election(struct batadv_priv *bat_priv)</div><div class='ctx'> 	batadv_gw_select(bat_priv, next_gw);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-	if (next_gw)</div><div class='del'>-		batadv_gw_node_put(next_gw);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='del'>-	if (router_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='add'>+	batadv_gw_node_put(curr_gw);</div><div class='add'>+	batadv_gw_node_put(next_gw);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_ifinfo_put(router_ifinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_check_election() - Elect orig node as best gateway when eligible</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be checked</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_check_election(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -340,13 +309,12 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,</div><div class='ctx'> reselect:</div><div class='ctx'> 	batadv_gw_reselect(bat_priv);</div><div class='ctx'> out:</div><div class='del'>-	if (curr_gw_orig)</div><div class='del'>-		batadv_orig_node_put(curr_gw_orig);</div><div class='add'>+	batadv_orig_node_put(curr_gw_orig);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_node_add() - add gateway node to list of available gateways</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: originator announcing gateway capabilities</div><div class='ctx'>  * @gateway: announced bandwidth information</div><div class='ctx'>  *</div><div class='hunk'>@@ -377,6 +345,7 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;gw_node-&gt;refcount);</div><div class='ctx'> 	hlist_add_head_rcu(&amp;gw_node-&gt;list, &amp;bat_priv-&gt;gw.gateway_list);</div><div class='add'>+	bat_priv-&gt;gw.generation++;</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='ctx'> 		   "Found new gateway %pM -&gt; gw bandwidth: %u.%u/%u.%u MBit\n",</div><div class='hunk'>@@ -392,7 +361,7 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_node_get() - retrieve gateway node from list of available gateways</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: originator announcing gateway capabilities</div><div class='ctx'>  *</div><div class='ctx'>  * Return: gateway node if found or NULL otherwise.</div><div class='hunk'>@@ -422,7 +391,7 @@ struct batadv_gw_node *batadv_gw_node_get(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_node_update() - update list of available gateways with changed</div><div class='ctx'>  *  bandwidth information</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: originator announcing gateway capabilities</div><div class='ctx'>  * @gateway: announced bandwidth information</div><div class='ctx'>  */</div><div class='hunk'>@@ -472,6 +441,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 		if (!hlist_unhashed(&amp;gw_node-&gt;list)) {</div><div class='ctx'> 			hlist_del_init_rcu(&amp;gw_node-&gt;list);</div><div class='ctx'> 			batadv_gw_node_put(gw_node);</div><div class='add'>+			bat_priv-&gt;gw.generation++;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -479,18 +449,16 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,</div><div class='ctx'> 		if (gw_node == curr_gw)</div><div class='ctx'> 			batadv_gw_reselect(bat_priv);</div><div class='ctx'> </div><div class='del'>-		if (curr_gw)</div><div class='del'>-			batadv_gw_node_put(curr_gw);</div><div class='add'>+		batadv_gw_node_put(curr_gw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (gw_node)</div><div class='del'>-		batadv_gw_node_put(gw_node);</div><div class='add'>+	batadv_gw_node_put(gw_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_node_delete() - Remove orig_node from gateway list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is currently in process of being removed</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_node_delete(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -505,8 +473,8 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_gw_node_free() - Free gateway information from soft interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_gw_node_free() - Free gateway information from mesh interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_node_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -518,48 +486,11 @@ void batadv_gw_node_free(struct batadv_priv *bat_priv)</div><div class='ctx'> 				  &amp;bat_priv-&gt;gw.gateway_list, list) {</div><div class='ctx'> 		hlist_del_init_rcu(&amp;gw_node-&gt;list);</div><div class='ctx'> 		batadv_gw_node_put(gw_node);</div><div class='add'>+		bat_priv-&gt;gw.generation++;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_gw_client_seq_print_text() - Print the gateway table in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s %s)]\n",</div><div class='del'>-		   BATADV_SOURCE_VERSION, primary_if-&gt;net_dev-&gt;name,</div><div class='del'>-		   primary_if-&gt;net_dev-&gt;dev_addr, net_dev-&gt;name,</div><div class='del'>-		   bat_priv-&gt;algo_ops-&gt;name);</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='del'>-</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;gw.print) {</div><div class='del'>-		seq_puts(seq,</div><div class='del'>-			 "No printing function for this routing protocol\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;gw.print(bat_priv, seq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_dump() - Dump gateways into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='hunk'>@@ -570,24 +501,15 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset)</div><div class='ctx'> int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-					     BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (!primary_if || primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='hunk'>@@ -605,10 +527,8 @@ int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -714,8 +634,10 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,</div><div class='ctx'> </div><div class='ctx'> 	chaddr_offset = *header_len + BATADV_DHCP_CHADDR_OFFSET;</div><div class='ctx'> 	/* store the client address if the message is going to a client */</div><div class='del'>-	if (ret == BATADV_DHCP_TO_CLIENT &amp;&amp;</div><div class='del'>-	    pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) {</div><div class='add'>+	if (ret == BATADV_DHCP_TO_CLIENT) {</div><div class='add'>+		if (!pskb_may_pull(skb, chaddr_offset + ETH_ALEN))</div><div class='add'>+			return BATADV_DHCP_NO;</div><div class='add'>+</div><div class='ctx'> 		/* check if the DHCP packet carries an Ethernet DHCP */</div><div class='ctx'> 		p = skb-&gt;data + *header_len + BATADV_DHCP_HTYPE_OFFSET;</div><div class='ctx'> 		if (*p != BATADV_DHCP_HTYPE_ETHERNET)</div><div class='hunk'>@@ -735,7 +657,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_out_of_range() - check if the dhcp request destination is the best</div><div class='ctx'>  *  gateway</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the outgoing packet</div><div class='ctx'>  *</div><div class='ctx'>  * Check if the skb is a DHCP request and if it is sent to the current best GW</div><div class='hunk'>@@ -828,15 +750,10 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_neigh_ifinfo_put(old_ifinfo);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (orig_dst_node)</div><div class='del'>-		batadv_orig_node_put(orig_dst_node);</div><div class='del'>-	if (curr_gw)</div><div class='del'>-		batadv_gw_node_put(curr_gw);</div><div class='del'>-	if (gw_node)</div><div class='del'>-		batadv_gw_node_put(gw_node);</div><div class='del'>-	if (neigh_old)</div><div class='del'>-		batadv_neigh_node_put(neigh_old);</div><div class='del'>-	if (neigh_curr)</div><div class='del'>-		batadv_neigh_node_put(neigh_curr);</div><div class='add'>+	batadv_orig_node_put(orig_dst_node);</div><div class='add'>+	batadv_gw_node_put(curr_gw);</div><div class='add'>+	batadv_gw_node_put(gw_node);</div><div class='add'>+	batadv_neigh_node_put(neigh_old);</div><div class='add'>+	batadv_neigh_node_put(neigh_curr);</div><div class='ctx'> 	return out_of_range;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h<br/>index f0b86fcb2493..95c2ccdaa554 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_client.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/gateway_client.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_</div><div class='hunk'>@@ -21,12 +9,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct batadv_tvlv_gateway_data;</div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='add'>+#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='ctx'> void batadv_gw_check_client_stop(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_gw_reselect(struct batadv_priv *bat_priv);</div><div class='hunk'>@@ -41,10 +28,9 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,</div><div class='ctx'> void batadv_gw_node_delete(struct batadv_priv *bat_priv,</div><div class='ctx'> 			   struct batadv_orig_node *orig_node);</div><div class='ctx'> void batadv_gw_node_free(struct batadv_priv *bat_priv);</div><div class='del'>-void batadv_gw_node_put(struct batadv_gw_node *gw_node);</div><div class='add'>+void batadv_gw_node_release(struct kref *ref);</div><div class='ctx'> struct batadv_gw_node *</div><div class='ctx'> batadv_gw_get_selected_gw_node(struct batadv_priv *bat_priv);</div><div class='del'>-int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb);</div><div class='ctx'> enum batadv_dhcp_recipient</div><div class='hunk'>@@ -53,4 +39,17 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,</div><div class='ctx'> struct batadv_gw_node *batadv_gw_node_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 					  struct batadv_orig_node *orig_node);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * batadv_gw_node_put() - decrement the gw_node refcounter and possibly release</div><div class='add'>+ *  it</div><div class='add'>+ * @gw_node: gateway node to free</div><div class='add'>+ */</div><div class='add'>+static inline void batadv_gw_node_put(struct batadv_gw_node *gw_node)</div><div class='add'>+{</div><div class='add'>+	if (!gw_node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;gw_node-&gt;refcount, batadv_gw_node_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */</div><div class='head'>diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c<br/>index 936c107f3199..315fa90f0c94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_common.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/gateway_common.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "gateway_common.h"</div><div class='hunk'>@@ -21,125 +9,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='add'>+#include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gateway_client.h"</div><div class='del'>-#include "log.h"</div><div class='ctx'> #include "tvlv.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_parse_throughput() - parse supplied string buffer to extract</div><div class='del'>- *  throughput information</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='del'>- * @buff: string buffer to parse</div><div class='del'>- * @description: text shown when throughput string cannot be parsed</div><div class='del'>- * @throughput: pointer holding the returned throughput information</div><div class='del'>- *</div><div class='del'>- * Return: false on parse error and true otherwise.</div><div class='del'>- */</div><div class='del'>-bool batadv_parse_throughput(struct net_device *net_dev, char *buff,</div><div class='del'>-			     const char *description, u32 *throughput)</div><div class='del'>-{</div><div class='del'>-	enum batadv_bandwidth_units bw_unit_type = BATADV_BW_UNIT_KBIT;</div><div class='del'>-	u64 lthroughput;</div><div class='del'>-	char *tmp_ptr;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (strlen(buff) &gt; 4) {</div><div class='del'>-		tmp_ptr = buff + strlen(buff) - 4;</div><div class='del'>-</div><div class='del'>-		if (strncasecmp(tmp_ptr, "mbit", 4) == 0)</div><div class='del'>-			bw_unit_type = BATADV_BW_UNIT_MBIT;</div><div class='del'>-</div><div class='del'>-		if (strncasecmp(tmp_ptr, "kbit", 4) == 0 ||</div><div class='del'>-		    bw_unit_type == BATADV_BW_UNIT_MBIT)</div><div class='del'>-			*tmp_ptr = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = kstrtou64(buff, 10, &amp;lthroughput);</div><div class='del'>-	if (ret) {</div><div class='del'>-		batadv_err(net_dev,</div><div class='del'>-			   "Invalid throughput speed for %s: %s\n",</div><div class='del'>-			   description, buff);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (bw_unit_type) {</div><div class='del'>-	case BATADV_BW_UNIT_MBIT:</div><div class='del'>-		/* prevent overflow */</div><div class='del'>-		if (U64_MAX / 10 &lt; lthroughput) {</div><div class='del'>-			batadv_err(net_dev,</div><div class='del'>-				   "Throughput speed for %s too large: %s\n",</div><div class='del'>-				   description, buff);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lthroughput *= 10;</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_BW_UNIT_KBIT:</div><div class='del'>-	default:</div><div class='del'>-		lthroughput = div_u64(lthroughput, 100);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lthroughput &gt; U32_MAX) {</div><div class='del'>-		batadv_err(net_dev,</div><div class='del'>-			   "Throughput speed for %s too large: %s\n",</div><div class='del'>-			   description, buff);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*throughput = lthroughput;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_parse_gw_bandwidth() - parse supplied string buffer to extract</div><div class='del'>- *  download and upload bandwidth information</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='del'>- * @buff: string buffer to parse</div><div class='del'>- * @down: pointer holding the returned download bandwidth information</div><div class='del'>- * @up: pointer holding the returned upload bandwidth information</div><div class='del'>- *</div><div class='del'>- * Return: false on parse error and true otherwise.</div><div class='del'>- */</div><div class='del'>-static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,</div><div class='del'>-				      u32 *down, u32 *up)</div><div class='del'>-{</div><div class='del'>-	char *slash_ptr;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	slash_ptr = strchr(buff, '/');</div><div class='del'>-	if (slash_ptr)</div><div class='del'>-		*slash_ptr = 0;</div><div class='del'>-</div><div class='del'>-	ret = batadv_parse_throughput(net_dev, buff, "download gateway speed",</div><div class='del'>-				      down);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* we also got some upload info */</div><div class='del'>-	if (slash_ptr) {</div><div class='del'>-		ret = batadv_parse_throughput(net_dev, slash_ptr + 1,</div><div class='del'>-					      "upload gateway speed", up);</div><div class='del'>-		if (!ret)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_gw_tvlv_container_update() - update the gw tvlv container after</div><div class='ctx'>  *  gateway setting change</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -166,59 +47,8 @@ void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_gw_bandwidth_set() - Parse and set download/upload gateway bandwidth</div><div class='del'>- *  from supplied string buffer</div><div class='del'>- * @net_dev: netdev struct of the soft interface</div><div class='del'>- * @buff: the buffer containing the user data</div><div class='del'>- * @count: number of bytes in the buffer</div><div class='del'>- *</div><div class='del'>- * Return: 'count' on success or a negative error code in case of failure</div><div class='del'>- */</div><div class='del'>-ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,</div><div class='del'>-				size_t count)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	u32 down_curr;</div><div class='del'>-	u32 up_curr;</div><div class='del'>-	u32 down_new = 0;</div><div class='del'>-	u32 up_new = 0;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	down_curr = (unsigned int)atomic_read(&amp;bat_priv-&gt;gw.bandwidth_down);</div><div class='del'>-	up_curr = (unsigned int)atomic_read(&amp;bat_priv-&gt;gw.bandwidth_up);</div><div class='del'>-</div><div class='del'>-	ret = batadv_parse_gw_bandwidth(net_dev, buff, &amp;down_new, &amp;up_new);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!down_new)</div><div class='del'>-		down_new = 1;</div><div class='del'>-</div><div class='del'>-	if (!up_new)</div><div class='del'>-		up_new = down_new / 5;</div><div class='del'>-</div><div class='del'>-	if (!up_new)</div><div class='del'>-		up_new = 1;</div><div class='del'>-</div><div class='del'>-	if (down_curr == down_new &amp;&amp; up_curr == up_new)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	batadv_gw_reselect(bat_priv);</div><div class='del'>-	batadv_info(net_dev,</div><div class='del'>-		    "Changing gateway bandwidth from: '%u.%u/%u.%u MBit' to: '%u.%u/%u.%u MBit'\n",</div><div class='del'>-		    down_curr / 10, down_curr % 10, up_curr / 10, up_curr % 10,</div><div class='del'>-		    down_new / 10, down_new % 10, up_new / 10, up_new % 10);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;gw.bandwidth_down, down_new);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;gw.bandwidth_up, up_new);</div><div class='del'>-	batadv_gw_tvlv_container_update(bat_priv);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_gw_tvlv_ogm_handler_v1() - process incoming gateway tvlv container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node of the ogm</div><div class='ctx'>  * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the gateway data</div><div class='hunk'>@@ -259,7 +89,7 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_init() - initialise the gateway handling internals</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_init(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -269,13 +99,13 @@ void batadv_gw_init(struct batadv_priv *bat_priv)</div><div class='ctx'> 		atomic_set(&amp;bat_priv-&gt;gw.sel_class, 1);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1,</div><div class='del'>-				     NULL, BATADV_TVLV_GW, 1,</div><div class='add'>+				     NULL, NULL, BATADV_TVLV_GW, 1,</div><div class='ctx'> 				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_gw_free() - free the gateway handling internals</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_gw_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h<br/>index 80afb2793687..5d097d6a1dd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_common.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/gateway_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/gateway_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/gateway_common.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_</div><div class='hunk'>@@ -21,16 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct net_device;</div><div class='del'>-</div><div class='del'>-enum batadv_gw_modes {</div><div class='del'>-	BATADV_GW_MODE_OFF,</div><div class='del'>-	BATADV_GW_MODE_CLIENT,</div><div class='del'>-	BATADV_GW_MODE_SERVER,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * enum batadv_bandwidth_units - bandwidth unit types</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,12 +24,8 @@ enum batadv_bandwidth_units {</div><div class='ctx'> #define BATADV_GW_MODE_CLIENT_NAME	"client"</div><div class='ctx'> #define BATADV_GW_MODE_SERVER_NAME	"server"</div><div class='ctx'> </div><div class='del'>-ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,</div><div class='del'>-				size_t count);</div><div class='ctx'> void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_gw_init(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_gw_free(struct batadv_priv *bat_priv);</div><div class='del'>-bool batadv_parse_throughput(struct net_device *net_dev, char *buff,</div><div class='del'>-			     const char *description, u32 *throughput);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */</div><div class='head'>diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c<br/>index 2f0d42f2f913..5113f879736b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hard-interface.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hard-interface.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hard-interface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/hard-interface.c</a></div><div class='hunk'>@@ -1,36 +1,28 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='hunk'>@@ -42,14 +34,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "bat_v.h"</div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='del'>-#include "debugfs.h"</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='ctx'> #include "log.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='del'>-#include "sysfs.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -62,7 +52,7 @@ void batadv_hardif_release(struct kref *ref)</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = container_of(ref, struct batadv_hard_iface, refcount);</div><div class='del'>-	dev_put(hard_iface-&gt;net_dev);</div><div class='add'>+	netdev_put(hard_iface-&gt;net_dev, &amp;hard_iface-&gt;dev_tracker);</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(hard_iface, rcu);</div><div class='ctx'> }</div><div class='hunk'>@@ -149,10 +139,10 @@ static bool batadv_mutual_parents(const struct net_device *dev1,</div><div class='ctx'>  * @net_dev: the device to check</div><div class='ctx'>  *</div><div class='ctx'>  * If the user creates any virtual device on top of a batman-adv interface, it</div><div class='del'>- * is important to prevent this new interface to be used to create a new mesh</div><div class='del'>- * network (this behaviour would lead to a batman-over-batman configuration).</div><div class='del'>- * This function recursively checks all the fathers of the device passed as</div><div class='del'>- * argument looking for a batman-adv soft interface.</div><div class='add'>+ * is important to prevent this new interface from being used to create a new</div><div class='add'>+ * mesh network (this behaviour would lead to a batman-over-batman</div><div class='add'>+ * configuration). This function recursively checks all the fathers of the</div><div class='add'>+ * device passed as argument looking for a batman-adv mesh interface.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the device is descendant of a batman-adv mesh interface (or</div><div class='ctx'>  * if it is a batman-adv interface itself), false otherwise</div><div class='hunk'>@@ -162,25 +152,30 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)</div><div class='ctx'> 	struct net *net = dev_net(net_dev);</div><div class='ctx'> 	struct net_device *parent_dev;</div><div class='ctx'> 	struct net *parent_net;</div><div class='add'>+	int iflink;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	/* check if this is a batman-adv mesh interface */</div><div class='del'>-	if (batadv_softif_is_valid(net_dev))</div><div class='add'>+	if (batadv_meshif_is_valid(net_dev))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	/* no more parents..stop recursion */</div><div class='del'>-	if (dev_get_iflink(net_dev) == 0 ||</div><div class='del'>-	    dev_get_iflink(net_dev) == net_dev-&gt;ifindex)</div><div class='add'>+	iflink = dev_get_iflink(net_dev);</div><div class='add'>+	if (iflink == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	parent_net = batadv_getlink_net(net_dev, net);</div><div class='ctx'> </div><div class='add'>+	/* iflink to itself, most likely physical device */</div><div class='add'>+	if (net == parent_net &amp;&amp; iflink == net_dev-&gt;ifindex)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* recurse over the parent device */</div><div class='del'>-	parent_dev = __dev_get_by_index((struct net *)parent_net,</div><div class='del'>-					dev_get_iflink(net_dev));</div><div class='del'>-	/* if we got a NULL parent_dev there is something broken.. */</div><div class='del'>-	if (WARN(!parent_dev, "Cannot find parent device"))</div><div class='add'>+	parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);</div><div class='add'>+	if (!parent_dev) {</div><div class='add'>+		pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",</div><div class='add'>+			net_dev-&gt;name);</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_mutual_parents(net_dev, net, parent_dev, parent_net))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -225,30 +220,37 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)</div><div class='ctx'> 	struct net_device *real_netdev = NULL;</div><div class='ctx'> 	struct net *real_net;</div><div class='ctx'> 	struct net *net;</div><div class='del'>-	int ifindex;</div><div class='add'>+	int iflink;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	if (!netdev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (netdev-&gt;ifindex == dev_get_iflink(netdev)) {</div><div class='add'>+	iflink = dev_get_iflink(netdev);</div><div class='add'>+	if (iflink == 0) {</div><div class='ctx'> 		dev_hold(netdev);</div><div class='ctx'> 		return netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = batadv_hardif_get_by_netdev(netdev);</div><div class='del'>-	if (!hard_iface || !hard_iface-&gt;soft_iface)</div><div class='add'>+	if (!hard_iface || !hard_iface-&gt;mesh_iface)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(hard_iface-&gt;soft_iface);</div><div class='del'>-	ifindex = dev_get_iflink(netdev);</div><div class='add'>+	net = dev_net(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	real_net = batadv_getlink_net(netdev, net);</div><div class='del'>-	real_netdev = dev_get_by_index(real_net, ifindex);</div><div class='add'>+</div><div class='add'>+	/* iflink to itself, most likely physical device */</div><div class='add'>+	if (net == real_net &amp;&amp; netdev-&gt;ifindex == iflink) {</div><div class='add'>+		real_netdev = netdev;</div><div class='add'>+		dev_hold(real_netdev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	real_netdev = dev_get_by_index(real_net, iflink);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		batadv_hardif_put(hard_iface);</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='ctx'> 	return real_netdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,9 +310,11 @@ static bool batadv_is_cfg80211_netdev(struct net_device *net_device)</div><div class='ctx'> 	if (!net_device)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_CFG80211)</div><div class='ctx'> 	/* cfg80211 drivers have to set ieee80211_ptr */</div><div class='ctx'> 	if (net_device-&gt;ieee80211_ptr)</div><div class='ctx'> 		return true;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -413,7 +417,7 @@ int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* &gt;1 neighbors -&gt; (re)brodcast */</div><div class='add'>+	/* &gt;1 neighbors -&gt; (re)broadcast */</div><div class='ctx'> 	if (rcu_dereference(hlist_next_rcu(first)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -435,15 +439,13 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct batadv_hard_iface *</div><div class='del'>-batadv_hardif_get_active(const struct net_device *soft_iface)</div><div class='add'>+batadv_hardif_get_active(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='add'>+	netdev_for_each_lower_private_rcu(mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status == BATADV_IF_ACTIVE &amp;&amp;</div><div class='ctx'> 		    kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -468,8 +470,7 @@ static void batadv_primary_if_update_addr(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_dat_init_own_addr(bat_priv, primary_if);</div><div class='ctx'> 	batadv_bla_update_orig_address(bat_priv, primary_if, oldif);</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_primary_if_select(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -482,8 +483,8 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,</div><div class='ctx'> 	if (new_hard_iface)</div><div class='ctx'> 		kref_get(&amp;new_hard_iface-&gt;refcount);</div><div class='ctx'> </div><div class='del'>-	curr_hard_iface = rcu_dereference_protected(bat_priv-&gt;primary_if, 1);</div><div class='del'>-	rcu_assign_pointer(bat_priv-&gt;primary_if, new_hard_iface);</div><div class='add'>+	curr_hard_iface = rcu_replace_pointer(bat_priv-&gt;primary_if,</div><div class='add'>+					      new_hard_iface, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!new_hard_iface)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -492,8 +493,7 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_primary_if_update_addr(bat_priv, curr_hard_iface);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (curr_hard_iface)</div><div class='del'>-		batadv_hardif_put(curr_hard_iface);</div><div class='add'>+	batadv_hardif_put(curr_hard_iface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -505,50 +505,50 @@ batadv_hardif_is_iface_up(const struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void batadv_check_known_mac_addr(const struct net_device *net_dev)</div><div class='add'>+static void batadv_check_known_mac_addr(const struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	const struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct net_device *mesh_iface = hard_iface-&gt;mesh_iface;</div><div class='add'>+	const struct batadv_hard_iface *tmp_hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE &amp;&amp;</div><div class='del'>-		    hard_iface-&gt;if_status != BATADV_IF_TO_BE_ACTIVATED)</div><div class='add'>+	if (!mesh_iface)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_private(mesh_iface, tmp_hard_iface, iter) {</div><div class='add'>+		if (tmp_hard_iface == hard_iface)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;net_dev == net_dev)</div><div class='add'>+		if (tmp_hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!batadv_compare_eth(hard_iface-&gt;net_dev-&gt;dev_addr,</div><div class='del'>-					net_dev-&gt;dev_addr))</div><div class='add'>+		if (!batadv_compare_eth(tmp_hard_iface-&gt;net_dev-&gt;dev_addr,</div><div class='add'>+					hard_iface-&gt;net_dev-&gt;dev_addr))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		pr_warn("The newly added mac address (%pM) already exists on: %s\n",</div><div class='del'>-			net_dev-&gt;dev_addr, hard_iface-&gt;net_dev-&gt;name);</div><div class='add'>+			hard_iface-&gt;net_dev-&gt;dev_addr, tmp_hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> 		pr_warn("It is strongly recommended to keep mac addresses unique to avoid problems!\n");</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_hardif_recalc_extra_skbroom() - Recalculate skbuff extra head/tailroom</div><div class='del'>- * @soft_iface: netdev struct of the mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  */</div><div class='del'>-static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface)</div><div class='add'>+static void batadv_hardif_recalc_extra_skbroom(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='ctx'> 	const struct batadv_hard_iface *hard_iface;</div><div class='ctx'> 	unsigned short lower_header_len = ETH_HLEN;</div><div class='ctx'> 	unsigned short lower_headroom = 0;</div><div class='ctx'> 	unsigned short lower_tailroom = 0;</div><div class='ctx'> 	unsigned short needed_headroom;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		lower_header_len = max_t(unsigned short, lower_header_len,</div><div class='ctx'> 					 hard_iface-&gt;net_dev-&gt;hard_header_len);</div><div class='ctx'> </div><div class='hunk'>@@ -563,32 +563,33 @@ static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface)</div><div class='ctx'> 	needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN);</div><div class='ctx'> 	needed_headroom += batadv_max_header_len();</div><div class='ctx'> </div><div class='del'>-	soft_iface-&gt;needed_headroom = needed_headroom;</div><div class='del'>-	soft_iface-&gt;needed_tailroom = lower_tailroom;</div><div class='add'>+	/* fragmentation headers don't strip the unicast/... header */</div><div class='add'>+	needed_headroom += sizeof(struct batadv_frag_packet);</div><div class='add'>+</div><div class='add'>+	mesh_iface-&gt;needed_headroom = needed_headroom;</div><div class='add'>+	mesh_iface-&gt;needed_tailroom = lower_tailroom;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_hardif_min_mtu() - Calculate maximum MTU for soft interface</div><div class='del'>- * @soft_iface: netdev struct of the soft interface</div><div class='add'>+ * batadv_hardif_min_mtu() - Calculate maximum MTU for mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  *</div><div class='del'>- * Return: MTU for the soft-interface (limited by the minimal MTU of all active</div><div class='add'>+ * Return: MTU for the mesh-interface (limited by the minimal MTU of all active</div><div class='ctx'>  *  slave interfaces)</div><div class='ctx'>  */</div><div class='del'>-int batadv_hardif_min_mtu(struct net_device *soft_iface)</div><div class='add'>+int batadv_hardif_min_mtu(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	const struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int min_mtu = INT_MAX;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE &amp;&amp;</div><div class='ctx'> 		    hard_iface-&gt;if_status != BATADV_IF_TO_BE_ACTIVATED)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		min_mtu = min_t(int, hard_iface-&gt;net_dev-&gt;mtu, min_mtu);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -608,31 +609,41 @@ out:</div><div class='ctx'> 	/* report to the other components the maximum amount of bytes that</div><div class='ctx'> 	 * batman-adv can send over the wire (without considering the payload</div><div class='ctx'> 	 * overhead). For example, this value is used by TT to compute the</div><div class='del'>-	 * maximum local table table size</div><div class='add'>+	 * maximum local table size</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;packet_size_max, min_mtu);</div><div class='ctx'> </div><div class='del'>-	/* the real soft-interface MTU is computed by removing the payload</div><div class='add'>+	/* the real mesh-interface MTU is computed by removing the payload</div><div class='ctx'> 	 * overhead from the maximum amount of bytes that was just computed.</div><div class='del'>-	 *</div><div class='del'>-	 * However batman-adv does not support MTUs bigger than ETH_DATA_LEN</div><div class='ctx'> 	 */</div><div class='del'>-	return min_t(int, min_mtu - batadv_max_header_len(), ETH_DATA_LEN);</div><div class='add'>+	return min_t(int, min_mtu - batadv_max_header_len(), BATADV_MAX_MTU);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_update_min_mtu() - Adjusts the MTU if a new interface with a smaller</div><div class='ctx'>  *  MTU appeared</div><div class='del'>- * @soft_iface: netdev struct of the soft interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  */</div><div class='del'>-void batadv_update_min_mtu(struct net_device *soft_iface)</div><div class='add'>+void batadv_update_min_mtu(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	soft_iface-&gt;mtu = batadv_hardif_min_mtu(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='add'>+	int limit_mtu;</div><div class='add'>+	int mtu;</div><div class='add'>+</div><div class='add'>+	mtu = batadv_hardif_min_mtu(mesh_iface);</div><div class='add'>+</div><div class='add'>+	if (bat_priv-&gt;mtu_set_by_user)</div><div class='add'>+		limit_mtu = bat_priv-&gt;mtu_set_by_user;</div><div class='add'>+	else</div><div class='add'>+		limit_mtu = ETH_DATA_LEN;</div><div class='add'>+</div><div class='add'>+	mtu = min(mtu, limit_mtu);</div><div class='add'>+	dev_set_mtu(mesh_iface, mtu);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the local translate table should be cleaned up to match a</div><div class='ctx'> 	 * new (and smaller) MTU.</div><div class='ctx'> 	 */</div><div class='del'>-	batadv_tt_local_resize_to_mtu(soft_iface);</div><div class='add'>+	batadv_tt_local_resize_to_mtu(mesh_iface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -644,7 +655,7 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_INACTIVE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	bat_priv-&gt;algo_ops-&gt;iface.update_mac(hard_iface);</div><div class='ctx'> 	hard_iface-&gt;if_status = BATADV_IF_TO_BE_ACTIVATED;</div><div class='hunk'>@@ -656,17 +667,16 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> 	if (!primary_if)</div><div class='ctx'> 		batadv_primary_if_select(bat_priv, hard_iface);</div><div class='ctx'> </div><div class='del'>-	batadv_info(hard_iface-&gt;soft_iface, "Interface activated: %s\n",</div><div class='add'>+	batadv_info(hard_iface-&gt;mesh_iface, "Interface activated: %s\n",</div><div class='ctx'> 		    hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	batadv_update_min_mtu(hard_iface-&gt;soft_iface);</div><div class='add'>+	batadv_update_min_mtu(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (bat_priv-&gt;algo_ops-&gt;iface.activate)</div><div class='ctx'> 		bat_priv-&gt;algo_ops-&gt;iface.activate(hard_iface);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -678,98 +688,46 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> </div><div class='ctx'> 	hard_iface-&gt;if_status = BATADV_IF_INACTIVE;</div><div class='ctx'> </div><div class='del'>-	batadv_info(hard_iface-&gt;soft_iface, "Interface deactivated: %s\n",</div><div class='add'>+	batadv_info(hard_iface-&gt;mesh_iface, "Interface deactivated: %s\n",</div><div class='ctx'> 		    hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	batadv_update_min_mtu(hard_iface-&gt;soft_iface);</div><div class='add'>+	batadv_update_min_mtu(hard_iface-&gt;mesh_iface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_master_del_slave() - remove hard_iface from the current master iface</div><div class='del'>- * @slave: the interface enslaved in another master</div><div class='del'>- * @master: the master from which slave has to be removed</div><div class='del'>- *</div><div class='del'>- * Invoke ndo_del_slave on master passing slave as argument. In this way slave</div><div class='del'>- * is free'd and master can correctly change its internal state.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, a negative value representing the error otherwise</div><div class='del'>- */</div><div class='del'>-static int batadv_master_del_slave(struct batadv_hard_iface *slave,</div><div class='del'>-				   struct net_device *master)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!master)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = -EBUSY;</div><div class='del'>-	if (master-&gt;netdev_ops-&gt;ndo_del_slave)</div><div class='del'>-		ret = master-&gt;netdev_ops-&gt;ndo_del_slave(master, slave-&gt;net_dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_hardif_enable_interface() - Enslave hard interface to soft interface</div><div class='del'>- * @hard_iface: hard interface to add to soft interface</div><div class='del'>- * @net: the applicable net namespace</div><div class='del'>- * @iface_name: name of the soft interface</div><div class='add'>+ * batadv_hardif_enable_interface() - Enslave hard interface to mesh interface</div><div class='add'>+ * @hard_iface: hard interface to add to mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='ctx'> int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,</div><div class='del'>-				   struct net *net, const char *iface_name)</div><div class='add'>+				   struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	struct net_device *soft_iface, *master;</div><div class='ctx'> 	__be16 ethertype = htons(ETH_P_BATMAN);</div><div class='ctx'> 	int max_header_len = batadv_max_header_len();</div><div class='add'>+	unsigned int required_mtu;</div><div class='add'>+	unsigned int hardif_mtu;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	hardif_mtu = READ_ONCE(hard_iface-&gt;net_dev-&gt;mtu);</div><div class='add'>+	required_mtu = READ_ONCE(mesh_iface-&gt;mtu) + max_header_len;</div><div class='add'>+</div><div class='add'>+	if (hardif_mtu &lt; ETH_MIN_MTU + max_header_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_NOT_IN_USE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;hard_iface-&gt;refcount);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_name(net, iface_name);</div><div class='del'>-</div><div class='del'>-	if (!soft_iface) {</div><div class='del'>-		soft_iface = batadv_softif_create(net, iface_name);</div><div class='del'>-</div><div class='del'>-		if (!soft_iface) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* dev_get_by_name() increases the reference counter for us */</div><div class='del'>-		dev_hold(soft_iface);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",</div><div class='del'>-		       soft_iface-&gt;name);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if the interface is enslaved in another virtual one and</div><div class='del'>-	 * in that case unlink it first</div><div class='del'>-	 */</div><div class='del'>-	master = netdev_master_upper_dev_get(hard_iface-&gt;net_dev);</div><div class='del'>-	ret = batadv_master_del_slave(hard_iface, master);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_dev;</div><div class='del'>-</div><div class='del'>-	hard_iface-&gt;soft_iface = soft_iface;</div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='del'>-</div><div class='del'>-	if (bat_priv-&gt;num_ifaces &gt;= UINT_MAX) {</div><div class='del'>-		ret = -ENOSPC;</div><div class='del'>-		goto err_dev;</div><div class='del'>-	}</div><div class='add'>+	netdev_hold(mesh_iface, &amp;hard_iface-&gt;meshif_dev_tracker, GFP_ATOMIC);</div><div class='add'>+	hard_iface-&gt;mesh_iface = mesh_iface;</div><div class='add'>+	bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	ret = netdev_master_upper_dev_link(hard_iface-&gt;net_dev,</div><div class='del'>-					   soft_iface, NULL, NULL, NULL);</div><div class='add'>+					   mesh_iface, hard_iface, NULL, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -777,16 +735,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_upper;</div><div class='ctx'> </div><div class='del'>-	hard_iface-&gt;if_num = bat_priv-&gt;num_ifaces;</div><div class='del'>-	bat_priv-&gt;num_ifaces++;</div><div class='ctx'> 	hard_iface-&gt;if_status = BATADV_IF_INACTIVE;</div><div class='del'>-	ret = batadv_orig_hash_add_if(hard_iface, bat_priv-&gt;num_ifaces);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		bat_priv-&gt;algo_ops-&gt;iface.disable(hard_iface);</div><div class='del'>-		bat_priv-&gt;num_ifaces--;</div><div class='del'>-		hard_iface-&gt;if_status = BATADV_IF_NOT_IN_USE;</div><div class='del'>-		goto err_upper;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;hard_iface-&gt;refcount);</div><div class='ctx'> 	hard_iface-&gt;batman_adv_ptype.type = ethertype;</div><div class='hunk'>@@ -794,55 +743,80 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 	hard_iface-&gt;batman_adv_ptype.dev = hard_iface-&gt;net_dev;</div><div class='ctx'> 	dev_add_pack(&amp;hard_iface-&gt;batman_adv_ptype);</div><div class='ctx'> </div><div class='del'>-	batadv_info(hard_iface-&gt;soft_iface, "Adding interface: %s\n",</div><div class='add'>+	batadv_info(hard_iface-&gt;mesh_iface, "Adding interface: %s\n",</div><div class='ctx'> 		    hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;fragmentation) &amp;&amp;</div><div class='del'>-	    hard_iface-&gt;net_dev-&gt;mtu &lt; ETH_DATA_LEN + max_header_len)</div><div class='del'>-		batadv_info(hard_iface-&gt;soft_iface,</div><div class='add'>+	    hardif_mtu &lt; required_mtu)</div><div class='add'>+		batadv_info(hard_iface-&gt;mesh_iface,</div><div class='ctx'> 			    "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %i would solve the problem.\n",</div><div class='del'>-			    hard_iface-&gt;net_dev-&gt;name, hard_iface-&gt;net_dev-&gt;mtu,</div><div class='del'>-			    ETH_DATA_LEN + max_header_len);</div><div class='add'>+			    hard_iface-&gt;net_dev-&gt;name, hardif_mtu,</div><div class='add'>+			    required_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_read(&amp;bat_priv-&gt;fragmentation) &amp;&amp;</div><div class='del'>-	    hard_iface-&gt;net_dev-&gt;mtu &lt; ETH_DATA_LEN + max_header_len)</div><div class='del'>-		batadv_info(hard_iface-&gt;soft_iface,</div><div class='add'>+	    hardif_mtu &lt; required_mtu)</div><div class='add'>+		batadv_info(hard_iface-&gt;mesh_iface,</div><div class='ctx'> 			    "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %i.\n",</div><div class='del'>-			    hard_iface-&gt;net_dev-&gt;name, hard_iface-&gt;net_dev-&gt;mtu,</div><div class='del'>-			    ETH_DATA_LEN + max_header_len);</div><div class='add'>+			    hard_iface-&gt;net_dev-&gt;name, hardif_mtu,</div><div class='add'>+			    required_mtu);</div><div class='add'>+</div><div class='add'>+	batadv_check_known_mac_addr(hard_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_hardif_is_iface_up(hard_iface))</div><div class='ctx'> 		batadv_hardif_activate_interface(hard_iface);</div><div class='ctx'> 	else</div><div class='del'>-		batadv_err(hard_iface-&gt;soft_iface,</div><div class='add'>+		batadv_err(hard_iface-&gt;mesh_iface,</div><div class='ctx'> 			   "Not using interface %s (retrying later): interface not active\n",</div><div class='ctx'> 			   hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	batadv_hardif_recalc_extra_skbroom(soft_iface);</div><div class='add'>+	batadv_hardif_recalc_extra_skbroom(mesh_iface);</div><div class='add'>+</div><div class='add'>+	if (bat_priv-&gt;algo_ops-&gt;iface.enabled)</div><div class='add'>+		bat_priv-&gt;algo_ops-&gt;iface.enabled(hard_iface);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_upper:</div><div class='del'>-	netdev_upper_dev_unlink(hard_iface-&gt;net_dev, soft_iface);</div><div class='add'>+	netdev_upper_dev_unlink(hard_iface-&gt;net_dev, mesh_iface);</div><div class='ctx'> err_dev:</div><div class='del'>-	hard_iface-&gt;soft_iface = NULL;</div><div class='del'>-	dev_put(soft_iface);</div><div class='del'>-err:</div><div class='add'>+	hard_iface-&gt;mesh_iface = NULL;</div><div class='add'>+	netdev_put(mesh_iface, &amp;hard_iface-&gt;meshif_dev_tracker);</div><div class='ctx'> 	batadv_hardif_put(hard_iface);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_hardif_disable_interface() - Remove hard interface from soft interface</div><div class='add'>+ * batadv_hardif_cnt() - get number of interfaces enslaved to mesh interface</div><div class='add'>+ * @mesh_iface: mesh interface to check</div><div class='add'>+ *</div><div class='add'>+ * This function is only using RCU for locking - the result can therefore be</div><div class='add'>+ * off when another function is modifying the list at the same time. The</div><div class='add'>+ * caller can use the rtnl_lock to make sure that the count is accurate.</div><div class='add'>+ *</div><div class='add'>+ * Return: number of connected/enslaved hard interfaces</div><div class='add'>+ */</div><div class='add'>+static size_t batadv_hardif_cnt(struct net_device *mesh_iface)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	size_t count = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev_for_each_lower_private_rcu(mesh_iface, hard_iface, iter)</div><div class='add'>+		count++;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_hardif_disable_interface() - Remove hard interface from mesh interface</div><div class='ctx'>  * @hard_iface: hard interface to be removed</div><div class='del'>- * @autodel: whether to delete soft interface when it doesn't contain any other</div><div class='del'>- *  slave interfaces</div><div class='ctx'>  */</div><div class='del'>-void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,</div><div class='del'>-				     enum batadv_hard_if_cleanup autodel)</div><div class='add'>+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> </div><div class='ctx'> 	batadv_hardif_deactivate_interface(hard_iface);</div><div class='hunk'>@@ -850,23 +824,19 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_INACTIVE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	batadv_info(hard_iface-&gt;soft_iface, "Removing interface: %s\n",</div><div class='add'>+	batadv_info(hard_iface-&gt;mesh_iface, "Removing interface: %s\n",</div><div class='ctx'> 		    hard_iface-&gt;net_dev-&gt;name);</div><div class='ctx'> 	dev_remove_pack(&amp;hard_iface-&gt;batman_adv_ptype);</div><div class='ctx'> 	batadv_hardif_put(hard_iface);</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;num_ifaces--;</div><div class='del'>-	batadv_orig_hash_del_if(hard_iface, bat_priv-&gt;num_ifaces);</div><div class='del'>-</div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (hard_iface == primary_if) {</div><div class='ctx'> 		struct batadv_hard_iface *new_if;</div><div class='ctx'> </div><div class='del'>-		new_if = batadv_hardif_get_active(hard_iface-&gt;soft_iface);</div><div class='add'>+		new_if = batadv_hardif_get_active(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 		batadv_primary_if_select(bat_priv, new_if);</div><div class='ctx'> </div><div class='del'>-		if (new_if)</div><div class='del'>-			batadv_hardif_put(new_if);</div><div class='add'>+		batadv_hardif_put(new_if);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bat_priv-&gt;algo_ops-&gt;iface.disable(hard_iface);</div><div class='hunk'>@@ -875,60 +845,46 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 	/* delete all references to this hard_iface */</div><div class='ctx'> 	batadv_purge_orig_ref(bat_priv);</div><div class='ctx'> 	batadv_purge_outstanding_packets(bat_priv, hard_iface);</div><div class='del'>-	dev_put(hard_iface-&gt;soft_iface);</div><div class='add'>+	netdev_put(hard_iface-&gt;mesh_iface, &amp;hard_iface-&gt;meshif_dev_tracker);</div><div class='ctx'> </div><div class='del'>-	netdev_upper_dev_unlink(hard_iface-&gt;net_dev, hard_iface-&gt;soft_iface);</div><div class='del'>-	batadv_hardif_recalc_extra_skbroom(hard_iface-&gt;soft_iface);</div><div class='add'>+	netdev_upper_dev_unlink(hard_iface-&gt;net_dev, hard_iface-&gt;mesh_iface);</div><div class='add'>+	batadv_hardif_recalc_extra_skbroom(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	/* nobody uses this interface anymore */</div><div class='del'>-	if (bat_priv-&gt;num_ifaces == 0) {</div><div class='add'>+	if (batadv_hardif_cnt(hard_iface-&gt;mesh_iface) &lt;= 1)</div><div class='ctx'> 		batadv_gw_check_client_stop(bat_priv);</div><div class='ctx'> </div><div class='del'>-		if (autodel == BATADV_IF_CLEANUP_AUTO)</div><div class='del'>-			batadv_softif_destroy_sysfs(hard_iface-&gt;soft_iface);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hard_iface-&gt;soft_iface = NULL;</div><div class='add'>+	hard_iface-&gt;mesh_iface = NULL;</div><div class='ctx'> 	batadv_hardif_put(hard_iface);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct batadv_hard_iface *</div><div class='ctx'> batadv_hardif_add_interface(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	if (!batadv_is_valid_iface(net_dev))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dev_hold(net_dev);</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = kzalloc(sizeof(*hard_iface), GFP_ATOMIC);</div><div class='ctx'> 	if (!hard_iface)</div><div class='del'>-		goto release_dev;</div><div class='del'>-</div><div class='del'>-	ret = batadv_sysfs_add_hardif(&amp;hard_iface-&gt;hardif_obj, net_dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto free_if;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	hard_iface-&gt;if_num = 0;</div><div class='add'>+	netdev_hold(net_dev, &amp;hard_iface-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 	hard_iface-&gt;net_dev = net_dev;</div><div class='del'>-	hard_iface-&gt;soft_iface = NULL;</div><div class='del'>-	hard_iface-&gt;if_status = BATADV_IF_NOT_IN_USE;</div><div class='ctx'> </div><div class='del'>-	ret = batadv_debugfs_add_hardif(hard_iface);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto free_sysfs;</div><div class='add'>+	hard_iface-&gt;mesh_iface = NULL;</div><div class='add'>+	hard_iface-&gt;if_status = BATADV_IF_NOT_IN_USE;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hard_iface-&gt;list);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;hard_iface-&gt;neigh_list);</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;hard_iface-&gt;bat_iv.ogm_buff_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;hard_iface-&gt;neigh_list_lock);</div><div class='ctx'> 	kref_init(&amp;hard_iface-&gt;refcount);</div><div class='ctx'> </div><div class='hunk'>@@ -937,22 +893,15 @@ batadv_hardif_add_interface(struct net_device *net_dev)</div><div class='ctx'> 	if (batadv_is_wifi_hardif(hard_iface))</div><div class='ctx'> 		hard_iface-&gt;num_bcasts = BATADV_NUM_BCASTS_WIRELESS;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;hard_iface-&gt;hop_penalty, 0);</div><div class='add'>+</div><div class='ctx'> 	batadv_v_hardif_init(hard_iface);</div><div class='ctx'> </div><div class='del'>-	batadv_check_known_mac_addr(hard_iface-&gt;net_dev);</div><div class='ctx'> 	kref_get(&amp;hard_iface-&gt;refcount);</div><div class='ctx'> 	list_add_tail_rcu(&amp;hard_iface-&gt;list, &amp;batadv_hardif_list);</div><div class='add'>+	batadv_hardif_generation++;</div><div class='ctx'> </div><div class='ctx'> 	return hard_iface;</div><div class='del'>-</div><div class='del'>-free_sysfs:</div><div class='del'>-	batadv_sysfs_del_hardif(&amp;hard_iface-&gt;hardif_obj);</div><div class='del'>-free_if:</div><div class='del'>-	kfree(hard_iface);</div><div class='del'>-release_dev:</div><div class='del'>-	dev_put(net_dev);</div><div class='del'>-out:</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface)</div><div class='hunk'>@@ -961,54 +910,31 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> </div><div class='ctx'> 	/* first deactivate interface */</div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_NOT_IN_USE)</div><div class='del'>-		batadv_hardif_disable_interface(hard_iface,</div><div class='del'>-						BATADV_IF_CLEANUP_KEEP);</div><div class='add'>+		batadv_hardif_disable_interface(hard_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_NOT_IN_USE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	hard_iface-&gt;if_status = BATADV_IF_TO_BE_REMOVED;</div><div class='del'>-	batadv_debugfs_del_hardif(hard_iface);</div><div class='del'>-	batadv_sysfs_del_hardif(&amp;hard_iface-&gt;hardif_obj);</div><div class='ctx'> 	batadv_hardif_put(hard_iface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_hardif_remove_interfaces() - Remove all hard interfaces</div><div class='del'>- */</div><div class='del'>-void batadv_hardif_remove_interfaces(void)</div><div class='del'>-{</div><div class='del'>-	struct batadv_hard_iface *hard_iface, *hard_iface_tmp;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry_safe(hard_iface, hard_iface_tmp,</div><div class='del'>-				 &amp;batadv_hardif_list, list) {</div><div class='del'>-		list_del_rcu(&amp;hard_iface-&gt;list);</div><div class='del'>-		batadv_hardif_remove_interface(hard_iface);</div><div class='del'>-	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_hard_if_event_softif() - Handle events for soft interfaces</div><div class='add'>+ * batadv_hard_if_event_meshif() - Handle events for mesh interfaces</div><div class='ctx'>  * @event: NETDEV_* event to handle</div><div class='ctx'>  * @net_dev: net_device which generated an event</div><div class='ctx'>  *</div><div class='ctx'>  * Return: NOTIFY_* result</div><div class='ctx'>  */</div><div class='del'>-static int batadv_hard_if_event_softif(unsigned long event,</div><div class='add'>+static int batadv_hard_if_event_meshif(unsigned long event,</div><div class='ctx'> 				       struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_REGISTER:</div><div class='del'>-		batadv_sysfs_add_meshif(net_dev);</div><div class='ctx'> 		bat_priv = netdev_priv(net_dev);</div><div class='del'>-		batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS);</div><div class='del'>-		break;</div><div class='del'>-	case NETDEV_CHANGENAME:</div><div class='del'>-		batadv_debugfs_rename_meshif(net_dev);</div><div class='add'>+		batadv_meshif_create_vlan(bat_priv, BATADV_NO_FLAGS);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1023,8 +949,8 @@ static int batadv_hard_if_event(struct notifier_block *this,</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='del'>-	if (batadv_softif_is_valid(net_dev))</div><div class='del'>-		return batadv_hard_if_event_softif(event, net_dev);</div><div class='add'>+	if (batadv_meshif_is_valid(net_dev))</div><div class='add'>+		return batadv_hard_if_event_meshif(event, net_dev);</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='ctx'> 	if (!hard_iface &amp;&amp; (event == NETDEV_REGISTER ||</div><div class='hunk'>@@ -1045,20 +971,21 @@ static int batadv_hard_if_event(struct notifier_block *this,</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='ctx'> 	case NETDEV_PRE_TYPE_CHANGE:</div><div class='ctx'> 		list_del_rcu(&amp;hard_iface-&gt;list);</div><div class='add'>+		batadv_hardif_generation++;</div><div class='ctx'> </div><div class='ctx'> 		batadv_hardif_remove_interface(hard_iface);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_CHANGEMTU:</div><div class='del'>-		if (hard_iface-&gt;soft_iface)</div><div class='del'>-			batadv_update_min_mtu(hard_iface-&gt;soft_iface);</div><div class='add'>+		if (hard_iface-&gt;mesh_iface)</div><div class='add'>+			batadv_update_min_mtu(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='ctx'> 		if (hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE)</div><div class='ctx'> 			goto hardif_put;</div><div class='ctx'> </div><div class='del'>-		batadv_check_known_mac_addr(hard_iface-&gt;net_dev);</div><div class='add'>+		batadv_check_known_mac_addr(hard_iface);</div><div class='ctx'> </div><div class='del'>-		bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+		bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 		bat_priv-&gt;algo_ops-&gt;iface.update_mac(hard_iface);</div><div class='ctx'> </div><div class='ctx'> 		primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -1073,9 +1000,6 @@ static int batadv_hard_if_event(struct notifier_block *this,</div><div class='ctx'> 		if (batadv_is_wifi_hardif(hard_iface))</div><div class='ctx'> 			hard_iface-&gt;num_bcasts = BATADV_NUM_BCASTS_WIRELESS;</div><div class='ctx'> 		break;</div><div class='del'>-	case NETDEV_CHANGENAME:</div><div class='del'>-		batadv_debugfs_rename_hardif(hard_iface);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1083,8 +1007,7 @@ static int batadv_hard_if_event(struct notifier_block *this,</div><div class='ctx'> hardif_put:</div><div class='ctx'> 	batadv_hardif_put(hard_iface);</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h<br/>index d1c0f6189301..9db8a310961e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hard-interface.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hard-interface.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hard-interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/hard-interface.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_</div><div class='hunk'>@@ -23,26 +11,23 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct net_device;</div><div class='del'>-struct net;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * enum batadv_hard_if_state - State of a hard interface</div><div class='ctx'>  */</div><div class='ctx'> enum batadv_hard_if_state {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @BATADV_IF_NOT_IN_USE: interface is not used as slave interface of a</div><div class='del'>-	 * batman-adv soft interface</div><div class='add'>+	 * batman-adv mesh interface</div><div class='ctx'> 	 */</div><div class='ctx'> 	BATADV_IF_NOT_IN_USE,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_IF_TO_BE_REMOVED: interface will be removed from soft</div><div class='add'>+	 * @BATADV_IF_TO_BE_REMOVED: interface will be removed from mesh</div><div class='ctx'> 	 * interface</div><div class='ctx'> 	 */</div><div class='ctx'> 	BATADV_IF_TO_BE_REMOVED,</div><div class='hunk'>@@ -55,12 +40,6 @@ enum batadv_hard_if_state {</div><div class='ctx'> </div><div class='ctx'> 	/** @BATADV_IF_TO_BE_ACTIVATED: interface is getting activated */</div><div class='ctx'> 	BATADV_IF_TO_BE_ACTIVATED,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @BATADV_IF_I_WANT_YOU: interface is queued up (using sysfs) for being</div><div class='del'>-	 * added as slave interface of a batman-adv soft interface</div><div class='del'>-	 */</div><div class='del'>-	BATADV_IF_I_WANT_YOU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -86,22 +65,6 @@ enum batadv_hard_if_bcast {</div><div class='ctx'> 	BATADV_HARDIF_BCAST_DUPORIG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum batadv_hard_if_cleanup - Cleanup modi for soft_iface after slave removal</div><div class='del'>- */</div><div class='del'>-enum batadv_hard_if_cleanup {</div><div class='del'>-	/**</div><div class='del'>-	 * @BATADV_IF_CLEANUP_KEEP: Don't automatically delete soft-interface</div><div class='del'>-	 */</div><div class='del'>-	BATADV_IF_CLEANUP_KEEP,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @BATADV_IF_CLEANUP_AUTO: Delete soft-interface after last slave was</div><div class='del'>-	 *  removed</div><div class='del'>-	 */</div><div class='del'>-	BATADV_IF_CLEANUP_AUTO,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> extern struct notifier_block batadv_hard_if_notifier;</div><div class='ctx'> </div><div class='ctx'> struct net_device *batadv_get_real_netdev(struct net_device *net_device);</div><div class='hunk'>@@ -110,12 +73,10 @@ bool batadv_is_wifi_hardif(struct batadv_hard_iface *hard_iface);</div><div class='ctx'> struct batadv_hard_iface*</div><div class='ctx'> batadv_hardif_get_by_netdev(const struct net_device *net_dev);</div><div class='ctx'> int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,</div><div class='del'>-				   struct net *net, const char *iface_name);</div><div class='del'>-void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,</div><div class='del'>-				     enum batadv_hard_if_cleanup autodel);</div><div class='del'>-void batadv_hardif_remove_interfaces(void);</div><div class='del'>-int batadv_hardif_min_mtu(struct net_device *soft_iface);</div><div class='del'>-void batadv_update_min_mtu(struct net_device *soft_iface);</div><div class='add'>+				   struct net_device *mesh_iface);</div><div class='add'>+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface);</div><div class='add'>+int batadv_hardif_min_mtu(struct net_device *mesh_iface);</div><div class='add'>+void batadv_update_min_mtu(struct net_device *mesh_iface);</div><div class='ctx'> void batadv_hardif_release(struct kref *ref);</div><div class='ctx'> int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing,</div><div class='ctx'> 			       u8 *orig_addr, u8 *orig_neigh);</div><div class='hunk'>@@ -127,12 +88,15 @@ int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing,</div><div class='ctx'>  */</div><div class='ctx'> static inline void batadv_hardif_put(struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='add'>+	if (!hard_iface)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;hard_iface-&gt;refcount, batadv_hardif_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_primary_if_get_selected() - Get reference to primary interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: primary interface (with increased refcnt), otherwise NULL</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c<br/>index 7b49e4001778..8016e619787f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hash.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hash.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/hash.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2006-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hash.h"</div><div class='hunk'>@@ -32,6 +20,8 @@ static void batadv_hash_init(struct batadv_hashtable *hash)</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;hash-&gt;table[i]);</div><div class='ctx'> 		spin_lock_init(&amp;hash-&gt;list_locks[i]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;hash-&gt;generation, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h<br/>index 9490a7ca2ba6..fb251c385a1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hash.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/hash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/hash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/hash.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2006-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Simon Wunderlich, Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_HASH_H_</div><div class='hunk'>@@ -21,16 +9,16 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct lock_class_key;</div><div class='del'>-</div><div class='del'>-/* callback to a compare function.  should compare 2 element datas for their</div><div class='add'>+/* callback to a compare function.  should compare 2 element data for their</div><div class='ctx'>  * keys</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if same and false if not same</div><div class='hunk'>@@ -58,6 +46,9 @@ struct batadv_hashtable {</div><div class='ctx'> </div><div class='ctx'> 	/** @size: size of hashtable */</div><div class='ctx'> 	u32 size;</div><div class='add'>+</div><div class='add'>+	/** @generation: current (generation) sequence number */</div><div class='add'>+	atomic_t generation;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* allocates and clears the hash */</div><div class='hunk'>@@ -112,6 +103,7 @@ static inline int batadv_hash_add(struct batadv_hashtable *hash,</div><div class='ctx'> </div><div class='ctx'> 	/* no duplicate found in list, add new element */</div><div class='ctx'> 	hlist_add_head_rcu(data_node, head);</div><div class='add'>+	atomic_inc(&amp;hash-&gt;generation);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -154,6 +146,7 @@ static inline void *batadv_hash_remove(struct batadv_hashtable *hash,</div><div class='ctx'> </div><div class='ctx'> 		data_save = node;</div><div class='ctx'> 		hlist_del_rcu(node);</div><div class='add'>+		atomic_inc(&amp;hash-&gt;generation);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;hash-&gt;list_locks[index]);</div><div class='head'>diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c<br/>deleted file mode 100644<br/>index 55c358ad3331..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/icmp_socket.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/icmp_socket.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,418 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "icmp_socket.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/eventpoll.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt; /* for linux/wait.h */</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hard-interface.h"</div><div class='del'>-#include "log.h"</div><div class='del'>-#include "originator.h"</div><div class='del'>-#include "send.h"</div><div class='del'>-</div><div class='del'>-static struct batadv_socket_client *batadv_socket_client_hash[256];</div><div class='del'>-</div><div class='del'>-static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,</div><div class='del'>-				     struct batadv_icmp_header *icmph,</div><div class='del'>-				     size_t icmp_len);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_socket_init() - Initialize soft interface independent socket data</div><div class='del'>- */</div><div class='del'>-void batadv_socket_init(void)</div><div class='del'>-{</div><div class='del'>-	memset(batadv_socket_client_hash, 0, sizeof(batadv_socket_client_hash));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_socket_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	struct batadv_socket_client *socket_client;</div><div class='del'>-</div><div class='del'>-	if (!try_module_get(THIS_MODULE))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='del'>-</div><div class='del'>-	socket_client = kmalloc(sizeof(*socket_client), GFP_KERNEL);</div><div class='del'>-	if (!socket_client) {</div><div class='del'>-		module_put(THIS_MODULE);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(batadv_socket_client_hash); i++) {</div><div class='del'>-		if (!batadv_socket_client_hash[i]) {</div><div class='del'>-			batadv_socket_client_hash[i] = socket_client;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == ARRAY_SIZE(batadv_socket_client_hash)) {</div><div class='del'>-		pr_err("Error - can't add another packet client: maximum number of clients reached\n");</div><div class='del'>-		kfree(socket_client);</div><div class='del'>-		module_put(THIS_MODULE);</div><div class='del'>-		return -EXFULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;socket_client-&gt;queue_list);</div><div class='del'>-	socket_client-&gt;queue_len = 0;</div><div class='del'>-	socket_client-&gt;index = i;</div><div class='del'>-	socket_client-&gt;bat_priv = inode-&gt;i_private;</div><div class='del'>-	spin_lock_init(&amp;socket_client-&gt;lock);</div><div class='del'>-	init_waitqueue_head(&amp;socket_client-&gt;queue_wait);</div><div class='del'>-</div><div class='del'>-	file-&gt;private_data = socket_client;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_socket_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_client *client = file-&gt;private_data;</div><div class='del'>-	struct batadv_socket_packet *packet, *tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* for all packets in the queue ... */</div><div class='del'>-	list_for_each_entry_safe(packet, tmp, &amp;client-&gt;queue_list, list) {</div><div class='del'>-		list_del(&amp;packet-&gt;list);</div><div class='del'>-		kfree(packet);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	batadv_socket_client_hash[client-&gt;index] = NULL;</div><div class='del'>-	spin_unlock_bh(&amp;client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	kfree(client);</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_socket_read(struct file *file, char __user *buf,</div><div class='del'>-				  size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_client *socket_client = file-&gt;private_data;</div><div class='del'>-	struct batadv_socket_packet *socket_packet;</div><div class='del'>-	size_t packet_len;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp; socket_client-&gt;queue_len == 0)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (!buf || count &lt; sizeof(struct batadv_icmp_packet))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buf, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	error = wait_event_interruptible(socket_client-&gt;queue_wait,</div><div class='del'>-					 socket_client-&gt;queue_len);</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;socket_client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	socket_packet = list_first_entry(&amp;socket_client-&gt;queue_list,</div><div class='del'>-					 struct batadv_socket_packet, list);</div><div class='del'>-	list_del(&amp;socket_packet-&gt;list);</div><div class='del'>-	socket_client-&gt;queue_len--;</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;socket_client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	packet_len = min(count, socket_packet-&gt;icmp_len);</div><div class='del'>-	error = copy_to_user(buf, &amp;socket_packet-&gt;icmp_packet, packet_len);</div><div class='del'>-</div><div class='del'>-	kfree(socket_packet);</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return packet_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_socket_write(struct file *file, const char __user *buff,</div><div class='del'>-				   size_t len, loff_t *off)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_client *socket_client = file-&gt;private_data;</div><div class='del'>-	struct batadv_priv *bat_priv = socket_client-&gt;bat_priv;</div><div class='del'>-	struct batadv_hard_iface *primary_if = NULL;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct batadv_icmp_packet_rr *icmp_packet_rr;</div><div class='del'>-	struct batadv_icmp_header *icmp_header;</div><div class='del'>-	struct batadv_orig_node *orig_node = NULL;</div><div class='del'>-	struct batadv_neigh_node *neigh_node = NULL;</div><div class='del'>-	size_t packet_len = sizeof(struct batadv_icmp_packet);</div><div class='del'>-	u8 *addr;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(struct batadv_icmp_header)) {</div><div class='del'>-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-			   "Error - can't send packet from char device: invalid packet size\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='del'>-</div><div class='del'>-	if (!primary_if) {</div><div class='del'>-		len = -EFAULT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &gt;= BATADV_ICMP_MAX_PACKET_SIZE)</div><div class='del'>-		packet_len = BATADV_ICMP_MAX_PACKET_SIZE;</div><div class='del'>-	else</div><div class='del'>-		packet_len = len;</div><div class='del'>-</div><div class='del'>-	skb = netdev_alloc_skb_ip_align(NULL, packet_len + ETH_HLEN);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		len = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='del'>-	skb_reserve(skb, ETH_HLEN);</div><div class='del'>-	icmp_header = skb_put(skb, packet_len);</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(icmp_header, buff, packet_len)) {</div><div class='del'>-		len = -EFAULT;</div><div class='del'>-		goto free_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icmp_header-&gt;packet_type != BATADV_ICMP) {</div><div class='del'>-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-			   "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");</div><div class='del'>-		len = -EINVAL;</div><div class='del'>-		goto free_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (icmp_header-&gt;msg_type) {</div><div class='del'>-	case BATADV_ECHO_REQUEST:</div><div class='del'>-		if (len &lt; sizeof(struct batadv_icmp_packet)) {</div><div class='del'>-			batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-				   "Error - can't send packet from char device: invalid packet size\n");</div><div class='del'>-			len = -EINVAL;</div><div class='del'>-			goto free_skb;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='del'>-			goto dst_unreach;</div><div class='del'>-</div><div class='del'>-		orig_node = batadv_orig_hash_find(bat_priv, icmp_header-&gt;dst);</div><div class='del'>-		if (!orig_node)</div><div class='del'>-			goto dst_unreach;</div><div class='del'>-</div><div class='del'>-		neigh_node = batadv_orig_router_get(orig_node,</div><div class='del'>-						    BATADV_IF_DEFAULT);</div><div class='del'>-		if (!neigh_node)</div><div class='del'>-			goto dst_unreach;</div><div class='del'>-</div><div class='del'>-		if (!neigh_node-&gt;if_incoming)</div><div class='del'>-			goto dst_unreach;</div><div class='del'>-</div><div class='del'>-		if (neigh_node-&gt;if_incoming-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='del'>-			goto dst_unreach;</div><div class='del'>-</div><div class='del'>-		icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmp_header;</div><div class='del'>-		if (packet_len == sizeof(*icmp_packet_rr)) {</div><div class='del'>-			addr = neigh_node-&gt;if_incoming-&gt;net_dev-&gt;dev_addr;</div><div class='del'>-			ether_addr_copy(icmp_packet_rr-&gt;rr[0], addr);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-			   "Error - can't send packet from char device: got unknown message type\n");</div><div class='del'>-		len = -EINVAL;</div><div class='del'>-		goto free_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icmp_header-&gt;uid = socket_client-&gt;index;</div><div class='del'>-</div><div class='del'>-	if (icmp_header-&gt;version != BATADV_COMPAT_VERSION) {</div><div class='del'>-		icmp_header-&gt;msg_type = BATADV_PARAMETER_PROBLEM;</div><div class='del'>-		icmp_header-&gt;version = BATADV_COMPAT_VERSION;</div><div class='del'>-		batadv_socket_add_packet(socket_client, icmp_header,</div><div class='del'>-					 packet_len);</div><div class='del'>-		goto free_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ether_addr_copy(icmp_header-&gt;orig, primary_if-&gt;net_dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	batadv_send_unicast_skb(skb, neigh_node);</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-dst_unreach:</div><div class='del'>-	icmp_header-&gt;msg_type = BATADV_DESTINATION_UNREACHABLE;</div><div class='del'>-	batadv_socket_add_packet(socket_client, icmp_header, packet_len);</div><div class='del'>-free_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (neigh_node)</div><div class='del'>-		batadv_neigh_node_put(neigh_node);</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __poll_t batadv_socket_poll(struct file *file, poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_client *socket_client = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;socket_client-&gt;queue_wait, wait);</div><div class='del'>-</div><div class='del'>-	if (socket_client-&gt;queue_len &gt; 0)</div><div class='del'>-		return EPOLLIN | EPOLLRDNORM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations batadv_fops = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.open = batadv_socket_open,</div><div class='del'>-	.release = batadv_socket_release,</div><div class='del'>-	.read = batadv_socket_read,</div><div class='del'>-	.write = batadv_socket_write,</div><div class='del'>-	.poll = batadv_socket_poll,</div><div class='del'>-	.llseek = no_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_socket_setup() - Create debugfs "socket" file</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_socket_setup(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	struct dentry *d;</div><div class='del'>-</div><div class='del'>-	if (!bat_priv-&gt;debug_dir)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	d = debugfs_create_file(BATADV_ICMP_SOCKET, 0600, bat_priv-&gt;debug_dir,</div><div class='del'>-				bat_priv, &amp;batadv_fops);</div><div class='del'>-	if (!d)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_socket_add_packet() - schedule an icmp packet to be sent to</div><div class='del'>- *  userspace on an icmp socket.</div><div class='del'>- * @socket_client: the socket this packet belongs to</div><div class='del'>- * @icmph: pointer to the header of the icmp packet</div><div class='del'>- * @icmp_len: total length of the icmp packet</div><div class='del'>- */</div><div class='del'>-static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,</div><div class='del'>-				     struct batadv_icmp_header *icmph,</div><div class='del'>-				     size_t icmp_len)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_packet *socket_packet;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	socket_packet = kmalloc(sizeof(*socket_packet), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (!socket_packet)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = icmp_len;</div><div class='del'>-	/* check the maximum length before filling the buffer */</div><div class='del'>-	if (len &gt; sizeof(socket_packet-&gt;icmp_packet))</div><div class='del'>-		len = sizeof(socket_packet-&gt;icmp_packet);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;socket_packet-&gt;list);</div><div class='del'>-	memcpy(&amp;socket_packet-&gt;icmp_packet, icmph, len);</div><div class='del'>-	socket_packet-&gt;icmp_len = len;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;socket_client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* while waiting for the lock the socket_client could have been</div><div class='del'>-	 * deleted</div><div class='del'>-	 */</div><div class='del'>-	if (!batadv_socket_client_hash[icmph-&gt;uid]) {</div><div class='del'>-		spin_unlock_bh(&amp;socket_client-&gt;lock);</div><div class='del'>-		kfree(socket_packet);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;socket_packet-&gt;list, &amp;socket_client-&gt;queue_list);</div><div class='del'>-	socket_client-&gt;queue_len++;</div><div class='del'>-</div><div class='del'>-	if (socket_client-&gt;queue_len &gt; 100) {</div><div class='del'>-		socket_packet = list_first_entry(&amp;socket_client-&gt;queue_list,</div><div class='del'>-						 struct batadv_socket_packet,</div><div class='del'>-						 list);</div><div class='del'>-</div><div class='del'>-		list_del(&amp;socket_packet-&gt;list);</div><div class='del'>-		kfree(socket_packet);</div><div class='del'>-		socket_client-&gt;queue_len--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;socket_client-&gt;lock);</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;socket_client-&gt;queue_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_socket_receive_packet() - schedule an icmp packet to be received</div><div class='del'>- *  locally and sent to userspace.</div><div class='del'>- * @icmph: pointer to the header of the icmp packet</div><div class='del'>- * @icmp_len: total length of the icmp packet</div><div class='del'>- */</div><div class='del'>-void batadv_socket_receive_packet(struct batadv_icmp_header *icmph,</div><div class='del'>-				  size_t icmp_len)</div><div class='del'>-{</div><div class='del'>-	struct batadv_socket_client *hash;</div><div class='del'>-</div><div class='del'>-	hash = batadv_socket_client_hash[icmph-&gt;uid];</div><div class='del'>-	if (hash)</div><div class='del'>-		batadv_socket_add_packet(hash, icmph, icmp_len);</div><div class='del'>-}</div><div class='head'>diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h<br/>deleted file mode 100644<br/>index 958be22beda9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/icmp_socket.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/icmp_socket.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_</div><div class='del'>-#define _NET_BATMAN_ADV_ICMP_SOCKET_H_</div><div class='del'>-</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct batadv_icmp_header;</div><div class='del'>-</div><div class='del'>-#define BATADV_ICMP_SOCKET "socket"</div><div class='del'>-</div><div class='del'>-int batadv_socket_setup(struct batadv_priv *bat_priv);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-</div><div class='del'>-void batadv_socket_init(void);</div><div class='del'>-void batadv_socket_receive_packet(struct batadv_icmp_header *icmph,</div><div class='del'>-				  size_t icmp_len);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void batadv_socket_init(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-batadv_socket_receive_packet(struct batadv_icmp_header *icmph, size_t icmp_len)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */</div><div class='head'>diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c<br/>index 853773e45f79..c19d07eeb070 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/log.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/log.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/log.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/log.c</a></div><div class='hunk'>@@ -1,249 +1,36 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/eventpoll.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt; /* for linux/wait.h */</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)</div><div class='del'>-</div><div class='del'>-static const int batadv_log_buff_len = BATADV_LOG_BUF_LEN;</div><div class='del'>-</div><div class='del'>-static char *batadv_log_char_addr(struct batadv_priv_debug_log *debug_log,</div><div class='del'>-				  size_t idx)</div><div class='del'>-{</div><div class='del'>-	return &amp;debug_log-&gt;log_buff[idx &amp; BATADV_LOG_BUFF_MASK];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void batadv_emit_log_char(struct batadv_priv_debug_log *debug_log,</div><div class='del'>-				 char c)</div><div class='del'>-{</div><div class='del'>-	char *char_addr;</div><div class='del'>-</div><div class='del'>-	char_addr = batadv_log_char_addr(debug_log, debug_log-&gt;log_end);</div><div class='del'>-	*char_addr = c;</div><div class='del'>-	debug_log-&gt;log_end++;</div><div class='del'>-</div><div class='del'>-	if (debug_log-&gt;log_end - debug_log-&gt;log_start &gt; batadv_log_buff_len)</div><div class='del'>-		debug_log-&gt;log_start = debug_log-&gt;log_end - batadv_log_buff_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__printf(2, 3)</div><div class='del'>-static int batadv_fdebug_log(struct batadv_priv_debug_log *debug_log,</div><div class='del'>-			     const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	static char debug_log_buf[256];</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (!debug_log)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	for (p = debug_log_buf; *p != 0; p++)</div><div class='del'>-		batadv_emit_log_char(debug_log, *p);</div><div class='add'>+#include &lt;linux/stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;debug_log-&gt;queue_wait);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_debug_log() - Add debug log entry</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @fmt: format string</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='ctx'> int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)</div><div class='ctx'> {</div><div class='add'>+	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='del'>-	char tmp_log_buf[256];</div><div class='ctx'> </div><div class='ctx'> 	va_start(args, fmt);</div><div class='del'>-	vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);</div><div class='del'>-	batadv_fdebug_log(bat_priv-&gt;debug_log, "[%10u] %s",</div><div class='del'>-			  jiffies_to_msecs(jiffies), tmp_log_buf);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_log_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	if (!try_module_get(THIS_MODULE))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='del'>-	file-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_log_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool batadv_log_empty(struct batadv_priv_debug_log *debug_log)</div><div class='del'>-{</div><div class='del'>-	return !(debug_log-&gt;log_start - debug_log-&gt;log_end);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static ssize_t batadv_log_read(struct file *file, char __user *buf,</div><div class='del'>-			       size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = file-&gt;private_data;</div><div class='del'>-	struct batadv_priv_debug_log *debug_log = bat_priv-&gt;debug_log;</div><div class='del'>-	int error, i = 0;</div><div class='del'>-	char *char_addr;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp; batadv_log_empty(debug_log))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buf, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	error = wait_event_interruptible(debug_log-&gt;queue_wait,</div><div class='del'>-					 (!batadv_log_empty(debug_log)));</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-</div><div class='del'>-	while ((!error) &amp;&amp; (i &lt; count) &amp;&amp;</div><div class='del'>-	       (debug_log-&gt;log_start != debug_log-&gt;log_end)) {</div><div class='del'>-		char_addr = batadv_log_char_addr(debug_log,</div><div class='del'>-						 debug_log-&gt;log_start);</div><div class='del'>-		c = *char_addr;</div><div class='del'>-</div><div class='del'>-		debug_log-&gt;log_start++;</div><div class='del'>-</div><div class='del'>-		spin_unlock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-</div><div class='del'>-		error = __put_user(c, buf);</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-</div><div class='del'>-		buf++;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;debug_log-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!error)</div><div class='del'>-		return i;</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __poll_t batadv_log_poll(struct file *file, poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = file-&gt;private_data;</div><div class='del'>-	struct batadv_priv_debug_log *debug_log = bat_priv-&gt;debug_log;</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;debug_log-&gt;queue_wait, wait);</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='del'>-	if (!batadv_log_empty(debug_log))</div><div class='del'>-		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	trace_batadv_dbg(bat_priv, &amp;vaf);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations batadv_log_fops = {</div><div class='del'>-	.open           = batadv_log_open,</div><div class='del'>-	.release        = batadv_log_release,</div><div class='del'>-	.read           = batadv_log_read,</div><div class='del'>-	.poll           = batadv_log_poll,</div><div class='del'>-	.llseek         = no_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debug_log_setup() - Initialize debug log</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_debug_log_setup(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	struct dentry *d;</div><div class='del'>-</div><div class='del'>-	if (!bat_priv-&gt;debug_dir)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;debug_log = kzalloc(sizeof(*bat_priv-&gt;debug_log), GFP_ATOMIC);</div><div class='del'>-	if (!bat_priv-&gt;debug_log)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;bat_priv-&gt;debug_log-&gt;lock);</div><div class='del'>-	init_waitqueue_head(&amp;bat_priv-&gt;debug_log-&gt;queue_wait);</div><div class='del'>-</div><div class='del'>-	d = debugfs_create_file("log", 0400, bat_priv-&gt;debug_dir, bat_priv,</div><div class='del'>-				&amp;batadv_log_fops);</div><div class='del'>-	if (!d)</div><div class='del'>-		goto err;</div><div class='add'>+	va_end(args);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_debug_log_cleanup() - Destroy debug log</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	kfree(bat_priv-&gt;debug_log);</div><div class='del'>-	bat_priv-&gt;debug_log = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h<br/>index 35f4f397ed57..225b747a2048 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/log.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/log.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/log.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/log.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_LOG_H_</div><div class='hunk'>@@ -21,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='hunk'>@@ -62,9 +51,6 @@ enum batadv_dbg_level {</div><div class='ctx'> 	/** @BATADV_DBG_DAT: ARP snooping and DAT related messages */</div><div class='ctx'> 	BATADV_DBG_DAT		= BIT(4),</div><div class='ctx'> </div><div class='del'>-	/** @BATADV_DBG_NC: network coding related messages */</div><div class='del'>-	BATADV_DBG_NC		= BIT(5),</div><div class='del'>-</div><div class='ctx'> 	/** @BATADV_DBG_MCAST: multicast related messages */</div><div class='ctx'> 	BATADV_DBG_MCAST	= BIT(6),</div><div class='ctx'> </div><div class='hunk'>@@ -80,12 +66,12 @@ int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)</div><div class='ctx'> __printf(2, 3);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _batadv_dbg() - Store debug output with(out) ratelimiting</div><div class='add'>+ * _batadv_dbg() - Store debug output with(out) rate limiting</div><div class='ctx'>  * @type: type of debug message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ratelimited: whether output should be rate limited</div><div class='ctx'>  * @fmt: format string</div><div class='del'>- * @arg...: variable arguments</div><div class='add'>+ * @arg: variable arguments</div><div class='ctx'>  */</div><div class='ctx'> #define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...)		\</div><div class='ctx'> 	do {								\</div><div class='hunk'>@@ -106,28 +92,28 @@ static inline void _batadv_dbg(int type __always_unused,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_dbg() - Store debug output without ratelimiting</div><div class='add'>+ * batadv_dbg() - Store debug output without rate limiting</div><div class='ctx'>  * @type: type of debug message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @arg...: format string and variable arguments</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @arg: format string and variable arguments</div><div class='ctx'>  */</div><div class='ctx'> #define batadv_dbg(type, bat_priv, arg...) \</div><div class='ctx'> 	_batadv_dbg(type, bat_priv, 0, ## arg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_dbg_ratelimited() - Store debug output with ratelimiting</div><div class='add'>+ * batadv_dbg_ratelimited() - Store debug output with rate limiting</div><div class='ctx'>  * @type: type of debug message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @arg...: format string and variable arguments</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @arg: format string and variable arguments</div><div class='ctx'>  */</div><div class='ctx'> #define batadv_dbg_ratelimited(type, bat_priv, arg...) \</div><div class='ctx'> 	_batadv_dbg(type, bat_priv, 1, ## arg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_info() - Store message in debug buffer and print it to kmsg buffer</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='add'>+ * @net_dev: the mesh interface net device</div><div class='ctx'>  * @fmt: format string</div><div class='del'>- * @arg...: variable arguments</div><div class='add'>+ * @arg: variable arguments</div><div class='ctx'>  */</div><div class='ctx'> #define batadv_info(net_dev, fmt, arg...)				\</div><div class='ctx'> 	do {								\</div><div class='hunk'>@@ -139,9 +125,9 @@ static inline void _batadv_dbg(int type __always_unused,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_err() - Store error in debug buffer and print it to kmsg buffer</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='add'>+ * @net_dev: the mesh interface net device</div><div class='ctx'>  * @fmt: format string</div><div class='del'>- * @arg...: variable arguments</div><div class='add'>+ * @arg: variable arguments</div><div class='ctx'>  */</div><div class='ctx'> #define batadv_err(net_dev, fmt, arg...)				\</div><div class='ctx'> 	do {								\</div><div class='head'>diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c<br/>index 69c0d85bceb3..3a35aadd8b41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/main.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/main.c</a></div><div class='hunk'>@@ -1,50 +1,41 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/build_bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='del'>-#include &lt;linux/crc32c.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/genetlink.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sprintf.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;net/dsfield.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='hunk'>@@ -53,20 +44,17 @@</div><div class='ctx'> #include "bat_iv_ogm.h"</div><div class='ctx'> #include "bat_v.h"</div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='del'>-#include "debugfs.h"</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='ctx'> #include "gateway_common.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='del'>-#include "icmp_socket.h"</div><div class='ctx'> #include "log.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "multicast.h"</div><div class='ctx'> #include "netlink.h"</div><div class='del'>-#include "network-coding.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "routing.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "tp_meter.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='hunk'>@@ -74,15 +62,30 @@</div><div class='ctx'>  * list traversals just rcu-locked</div><div class='ctx'>  */</div><div class='ctx'> struct list_head batadv_hardif_list;</div><div class='add'>+unsigned int batadv_hardif_generation;</div><div class='ctx'> static int (*batadv_rx_handler[256])(struct sk_buff *skb,</div><div class='ctx'> 				     struct batadv_hard_iface *recv_if);</div><div class='ctx'> </div><div class='del'>-unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='del'>-</div><div class='ctx'> struct workqueue_struct *batadv_event_workqueue;</div><div class='ctx'> </div><div class='ctx'> static void batadv_recv_handler_init(void);</div><div class='ctx'> </div><div class='add'>+#define BATADV_UEV_TYPE_VAR	"BATTYPE="</div><div class='add'>+#define BATADV_UEV_ACTION_VAR	"BATACTION="</div><div class='add'>+#define BATADV_UEV_DATA_VAR	"BATDATA="</div><div class='add'>+</div><div class='add'>+static char *batadv_uev_action_str[] = {</div><div class='add'>+	"add",</div><div class='add'>+	"del",</div><div class='add'>+	"change",</div><div class='add'>+	"loopdetect",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *batadv_uev_type_str[] = {</div><div class='add'>+	"gw",</div><div class='add'>+	"bla",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init batadv_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -98,16 +101,12 @@ static int __init batadv_init(void)</div><div class='ctx'> </div><div class='ctx'> 	batadv_v_init();</div><div class='ctx'> 	batadv_iv_init();</div><div class='del'>-	batadv_nc_init();</div><div class='ctx'> 	batadv_tp_meter_init();</div><div class='ctx'> </div><div class='ctx'> 	batadv_event_workqueue = create_singlethread_workqueue("bat_events");</div><div class='ctx'> 	if (!batadv_event_workqueue)</div><div class='ctx'> 		goto err_create_wq;</div><div class='ctx'> </div><div class='del'>-	batadv_socket_init();</div><div class='del'>-	batadv_debugfs_init();</div><div class='del'>-</div><div class='ctx'> 	register_netdevice_notifier(&amp;batadv_hard_if_notifier);</div><div class='ctx'> 	rtnl_link_register(&amp;batadv_link_ops);</div><div class='ctx'> 	batadv_netlink_register();</div><div class='hunk'>@@ -125,13 +124,10 @@ err_create_wq:</div><div class='ctx'> </div><div class='ctx'> static void __exit batadv_exit(void)</div><div class='ctx'> {</div><div class='del'>-	batadv_debugfs_destroy();</div><div class='ctx'> 	batadv_netlink_unregister();</div><div class='ctx'> 	rtnl_link_unregister(&amp;batadv_link_ops);</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;batadv_hard_if_notifier);</div><div class='del'>-	batadv_hardif_remove_interfaces();</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(batadv_event_workqueue);</div><div class='ctx'> 	destroy_workqueue(batadv_event_workqueue);</div><div class='ctx'> 	batadv_event_workqueue = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -141,14 +137,14 @@ static void __exit batadv_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mesh_init() - Initialize soft interface</div><div class='del'>- * @soft_iface: netdev struct of the soft interface</div><div class='add'>+ * batadv_mesh_init() - Initialize mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='del'>-int batadv_mesh_init(struct net_device *soft_iface)</div><div class='add'>+int batadv_mesh_init(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;forw_bat_list_lock);</div><div class='hunk'>@@ -160,11 +156,12 @@ int batadv_mesh_init(struct net_device *soft_iface)</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;tt.commit_lock);</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;gw.list_lock);</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+	spin_lock_init(&amp;bat_priv-&gt;mcast.mla_lock);</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;tvlv.container_list_lock);</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;tvlv.handler_list_lock);</div><div class='del'>-	spin_lock_init(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+	spin_lock_init(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> 	spin_lock_init(&amp;bat_priv-&gt;tp_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;bat_priv-&gt;forw_bat_list);</div><div class='hunk'>@@ -183,32 +180,40 @@ int batadv_mesh_init(struct net_device *soft_iface)</div><div class='ctx'> #endif</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;bat_priv-&gt;tvlv.container_list);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;bat_priv-&gt;tvlv.handler_list);</div><div class='del'>-	INIT_HLIST_HEAD(&amp;bat_priv-&gt;softif_vlan_list);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;bat_priv-&gt;meshif_vlan_list);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;bat_priv-&gt;tp_list);</div><div class='ctx'> </div><div class='del'>-	ret = batadv_v_mesh_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	bat_priv-&gt;gw.generation = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_originator_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='add'>+		goto err_orig;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_tt_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='add'>+		goto err_tt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = batadv_v_mesh_init(bat_priv);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='add'>+		goto err_v;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_bla_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='add'>+		goto err_bla;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_dat_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = batadv_nc_mesh_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='add'>+		goto err_dat;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	batadv_gw_init(bat_priv);</div><div class='ctx'> 	batadv_mcast_init(bat_priv);</div><div class='hunk'>@@ -218,18 +223,28 @@ int batadv_mesh_init(struct net_device *soft_iface)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err:</div><div class='del'>-	batadv_mesh_free(soft_iface);</div><div class='add'>+err_dat:</div><div class='add'>+	batadv_bla_free(bat_priv);</div><div class='add'>+err_bla:</div><div class='add'>+	batadv_v_mesh_free(bat_priv);</div><div class='add'>+err_v:</div><div class='add'>+	batadv_tt_free(bat_priv);</div><div class='add'>+err_tt:</div><div class='add'>+	batadv_originator_free(bat_priv);</div><div class='add'>+err_orig:</div><div class='add'>+	batadv_purge_outstanding_packets(bat_priv, NULL);</div><div class='add'>+	atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_INACTIVE);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mesh_free() - Deinitialize soft interface</div><div class='del'>- * @soft_iface: netdev struct of the soft interface</div><div class='add'>+ * batadv_mesh_free() - Deinitialize mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  */</div><div class='del'>-void batadv_mesh_free(struct net_device *soft_iface)</div><div class='add'>+void batadv_mesh_free(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_DEACTIVATING);</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +253,6 @@ void batadv_mesh_free(struct net_device *soft_iface)</div><div class='ctx'> 	batadv_gw_node_free(bat_priv);</div><div class='ctx'> </div><div class='ctx'> 	batadv_v_mesh_free(bat_priv);</div><div class='del'>-	batadv_nc_mesh_free(bat_priv);</div><div class='ctx'> 	batadv_dat_free(bat_priv);</div><div class='ctx'> 	batadv_bla_free(bat_priv);</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +282,7 @@ void batadv_mesh_free(struct net_device *soft_iface)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_is_my_mac() - check if the given mac address belongs to any of the</div><div class='ctx'>  *  real interfaces in the current mesh</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the address to check</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 'true' if the mac address was found, false otherwise.</div><div class='hunk'>@@ -276,16 +290,14 @@ void batadv_mesh_free(struct net_device *soft_iface)</div><div class='ctx'> bool batadv_is_my_mac(struct batadv_priv *bat_priv, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	const struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	bool is_my_mac = false;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (batadv_compare_eth(hard_iface-&gt;net_dev-&gt;dev_addr, addr)) {</div><div class='ctx'> 			is_my_mac = true;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -295,44 +307,6 @@ bool batadv_is_my_mac(struct batadv_priv *bat_priv, const u8 *addr)</div><div class='ctx'> 	return is_my_mac;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_seq_print_text_primary_if_get() - called from debugfs table printing</div><div class='del'>- *  function that requires the primary interface</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- *</div><div class='del'>- * Return: primary interface if found or NULL otherwise.</div><div class='del'>- */</div><div class='del'>-struct batadv_hard_iface *</div><div class='del'>-batadv_seq_print_text_primary_if_get(struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='del'>-</div><div class='del'>-	if (!primary_if) {</div><div class='del'>-		seq_printf(seq,</div><div class='del'>-			   "BATMAN mesh %s disabled - please specify interfaces to enable it\n",</div><div class='del'>-			   net_dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (primary_if-&gt;if_status == BATADV_IF_ACTIVE)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "BATMAN mesh %s disabled - primary interface not active\n",</div><div class='del'>-		   net_dev-&gt;name);</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='del'>-	primary_if = NULL;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return primary_if;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_max_header_len() - calculate maximum encapsulation overhead for a</div><div class='ctx'>  *  payload packet</div><div class='hunk'>@@ -350,11 +324,6 @@ int batadv_max_header_len(void)</div><div class='ctx'> 	header_len = max_t(int, header_len,</div><div class='ctx'> 			   sizeof(struct batadv_bcast_packet));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	header_len = max_t(int, header_len,</div><div class='del'>-			   sizeof(struct batadv_coded_packet));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return header_len + ETH_HLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -466,10 +435,10 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	if (unlikely(skb-&gt;mac_len != ETH_HLEN || !skb_mac_header(skb)))</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='del'>-	if (!hard_iface-&gt;soft_iface)</div><div class='add'>+	if (!hard_iface-&gt;mesh_iface)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='ctx'> 		goto err_free;</div><div class='hunk'>@@ -537,11 +506,13 @@ static void batadv_recv_handler_init(void)</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8);</div><div class='ctx'> </div><div class='del'>-	i = FIELD_SIZEOF(struct sk_buff, cb);</div><div class='add'>+	i = sizeof_field(struct sk_buff, cb);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct batadv_skb_cb) &gt; i);</div><div class='ctx'> </div><div class='ctx'> 	/* broadcast packet */</div><div class='ctx'> 	batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;</div><div class='add'>+	/* multicast packet */</div><div class='add'>+	batadv_rx_handler[BATADV_MCAST] = batadv_recv_mcast_packet;</div><div class='ctx'> </div><div class='ctx'> 	/* unicast packets ... */</div><div class='ctx'> 	/* unicast with 4 addresses packet */</div><div class='hunk'>@@ -590,39 +561,6 @@ void batadv_recv_handler_unregister(u8 packet_type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_skb_crc32() - calculate CRC32 of the whole packet and skip bytes in</div><div class='del'>- *  the header</div><div class='del'>- * @skb: skb pointing to fragmented socket buffers</div><div class='del'>- * @payload_ptr: Pointer to position inside the head buffer of the skb</div><div class='del'>- *  marking the start of the data to be CRC'ed</div><div class='del'>- *</div><div class='del'>- * payload_ptr must always point to an address in the skb head buffer and not to</div><div class='del'>- * a fragment.</div><div class='del'>- *</div><div class='del'>- * Return: big endian crc32c of the checksummed data</div><div class='del'>- */</div><div class='del'>-__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr)</div><div class='del'>-{</div><div class='del'>-	u32 crc = 0;</div><div class='del'>-	unsigned int from;</div><div class='del'>-	unsigned int to = skb-&gt;len;</div><div class='del'>-	struct skb_seq_state st;</div><div class='del'>-	const u8 *data;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned int consumed = 0;</div><div class='del'>-</div><div class='del'>-	from = (unsigned int)(payload_ptr - skb-&gt;data);</div><div class='del'>-</div><div class='del'>-	skb_prepare_seq_read(skb, from, to, &amp;st);</div><div class='del'>-	while ((len = skb_seq_read(consumed, &amp;data, &amp;st)) != 0) {</div><div class='del'>-		crc = crc32c(crc, data, len);</div><div class='del'>-		consumed += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return htonl(crc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_get_vid() - extract the VLAN identifier from skb if any</div><div class='ctx'>  * @skb: the buffer containing the packet</div><div class='ctx'>  * @header_len: length of the batman header preceding the ethernet header</div><div class='hunk'>@@ -644,6 +582,13 @@ unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len)</div><div class='ctx'> </div><div class='ctx'> 	vhdr = (struct vlan_ethhdr *)(skb-&gt;data + header_len);</div><div class='ctx'> 	vid = ntohs(vhdr-&gt;h_vlan_TCI) &amp; VLAN_VID_MASK;</div><div class='add'>+</div><div class='add'>+	/* VID 0 is only used to indicate "priority tag" frames which only</div><div class='add'>+	 * contain priority information and no VID.</div><div class='add'>+	 */</div><div class='add'>+	if (vid == 0)</div><div class='add'>+		return BATADV_NO_FLAGS;</div><div class='add'>+</div><div class='ctx'> 	vid |= BATADV_VLAN_HAS_TAG;</div><div class='ctx'> </div><div class='ctx'> 	return vid;</div><div class='hunk'>@@ -651,30 +596,86 @@ unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_vlan_ap_isola_get() - return AP isolation status for the given vlan</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the VLAN identifier for which the AP isolation attributed as to be</div><div class='ctx'>  *  looked up</div><div class='ctx'>  *</div><div class='del'>- * Return: true if AP isolation is on for the VLAN idenfied by vid, false</div><div class='add'>+ * Return: true if AP isolation is on for the VLAN identified by vid, false</div><div class='ctx'>  * otherwise</div><div class='ctx'>  */</div><div class='ctx'> bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	bool ap_isolation_enabled = false;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* if the AP isolation is requested on a VLAN, then check for its</div><div class='ctx'> 	 * setting in the proper VLAN private data structure</div><div class='ctx'> 	 */</div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (vlan) {</div><div class='ctx'> 		ap_isolation_enabled = atomic_read(&amp;vlan-&gt;ap_isolation);</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='add'>+		batadv_meshif_vlan_put(vlan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ap_isolation_enabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * batadv_throw_uevent() - Send an uevent with batman-adv specific env data</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @type: subsystem type of event. Stored in uevent's BATTYPE</div><div class='add'>+ * @action: action type of event. Stored in uevent's BATACTION</div><div class='add'>+ * @data: string with additional information to the event (ignored for</div><div class='add'>+ *  BATADV_UEV_DEL). Stored in uevent's BATDATA</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,</div><div class='add'>+			enum batadv_uev_action action, const char *data)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+	struct kobject *bat_kobj;</div><div class='add'>+	char *uevent_env[4] = { NULL, NULL, NULL, NULL };</div><div class='add'>+</div><div class='add'>+	bat_kobj = &amp;bat_priv-&gt;mesh_iface-&gt;dev.kobj;</div><div class='add'>+</div><div class='add'>+	uevent_env[0] = kasprintf(GFP_ATOMIC,</div><div class='add'>+				  "%s%s", BATADV_UEV_TYPE_VAR,</div><div class='add'>+				  batadv_uev_type_str[type]);</div><div class='add'>+	if (!uevent_env[0])</div><div class='add'>+		goto report_error;</div><div class='add'>+</div><div class='add'>+	uevent_env[1] = kasprintf(GFP_ATOMIC,</div><div class='add'>+				  "%s%s", BATADV_UEV_ACTION_VAR,</div><div class='add'>+				  batadv_uev_action_str[action]);</div><div class='add'>+	if (!uevent_env[1])</div><div class='add'>+		goto free_first_env;</div><div class='add'>+</div><div class='add'>+	/* If the event is DEL, ignore the data field */</div><div class='add'>+	if (action != BATADV_UEV_DEL) {</div><div class='add'>+		uevent_env[2] = kasprintf(GFP_ATOMIC,</div><div class='add'>+					  "%s%s", BATADV_UEV_DATA_VAR, data);</div><div class='add'>+		if (!uevent_env[2])</div><div class='add'>+			goto free_second_env;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);</div><div class='add'>+	kfree(uevent_env[2]);</div><div class='add'>+free_second_env:</div><div class='add'>+	kfree(uevent_env[1]);</div><div class='add'>+free_first_env:</div><div class='add'>+	kfree(uevent_env[0]);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+report_error:</div><div class='add'>+		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='add'>+			   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",</div><div class='add'>+			   batadv_uev_type_str[type],</div><div class='add'>+			   batadv_uev_action_str[action],</div><div class='add'>+			   (action == BATADV_UEV_DEL ? "NULL" : data), ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> module_init(batadv_init);</div><div class='ctx'> module_exit(batadv_exit);</div><div class='ctx'> </div><div class='hunk'>@@ -682,7 +683,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(BATADV_DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(BATADV_DRIVER_DESC);</div><div class='del'>-MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE);</div><div class='ctx'> MODULE_VERSION(BATADV_SOURCE_VERSION);</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("batadv");</div><div class='ctx'> MODULE_ALIAS_GENL_FAMILY(BATADV_NL_NAME);</div><div class='head'>diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h<br/>index 3ccc75ee719c..af230b017bc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/main.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/main.h</a></div><div class='hunk'>@@ -1,31 +1,19 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_MAIN_H_</div><div class='ctx'> #define _NET_BATMAN_ADV_MAIN_H_</div><div class='ctx'> </div><div class='del'>-#define BATADV_DRIVER_AUTHOR "Marek Lindner &lt;mareklindner@neomailbox.ch&gt;, " \</div><div class='add'>+#define BATADV_DRIVER_AUTHOR "Marek Lindner &lt;marek.lindner@mailbox.org&gt;, " \</div><div class='ctx'> 			     "Simon Wunderlich &lt;sw@simonwunderlich.de&gt;"</div><div class='ctx'> #define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"</div><div class='ctx'> #define BATADV_DRIVER_DEVICE "batman-adv"</div><div class='ctx'> </div><div class='ctx'> #ifndef BATADV_SOURCE_VERSION</div><div class='del'>-#define BATADV_SOURCE_VERSION "2018.3"</div><div class='add'>+#define BATADV_SOURCE_VERSION "2025.5"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* B.A.T.M.A.N. parameters */</div><div class='hunk'>@@ -34,6 +22,8 @@</div><div class='ctx'> #define BATADV_THROUGHPUT_MAX_VALUE 0xFFFFFFFF</div><div class='ctx'> #define BATADV_JITTER 20</div><div class='ctx'> </div><div class='add'>+#define BATADV_MAX_MTU (ETH_MAX_MTU - batadv_max_header_len())</div><div class='add'>+</div><div class='ctx'> /* Time To Live of broadcast messages */</div><div class='ctx'> #define BATADV_TTL 50</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +90,6 @@</div><div class='ctx'> /* number of packets to send for broadcasts on different interface types */</div><div class='ctx'> #define BATADV_NUM_BCASTS_DEFAULT 1</div><div class='ctx'> #define BATADV_NUM_BCASTS_WIRELESS 3</div><div class='del'>-#define BATADV_NUM_BCASTS_MAX 3</div><div class='ctx'> </div><div class='ctx'> /* length of the single packet used by the TP meter */</div><div class='ctx'> #define BATADV_TP_PACKET_LEN ETH_DATA_LEN</div><div class='hunk'>@@ -115,9 +104,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define BATADV_TQ_SIMILARITY_THRESHOLD 50</div><div class='ctx'> </div><div class='del'>-/* should not be bigger than 512 bytes or change the size of</div><div class='del'>- * forw_packet-&gt;direct_link_flags</div><div class='del'>- */</div><div class='add'>+#define BATADV_MAX_AGGREGATION_PACKETS 32</div><div class='ctx'> #define BATADV_MAX_AGGREGATION_BYTES 512</div><div class='ctx'> #define BATADV_MAX_AGGREGATION_MS 100</div><div class='ctx'> </div><div class='hunk'>@@ -134,18 +121,16 @@</div><div class='ctx'> #define BATADV_RESET_PROTECTION_MS 30000</div><div class='ctx'> #define BATADV_EXPECTED_SEQNO_RANGE	65536</div><div class='ctx'> </div><div class='del'>-#define BATADV_NC_NODE_TIMEOUT 10000 /* Milliseconds */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * BATADV_TP_MAX_NUM - maximum number of simultaneously active tp sessions</div><div class='ctx'>  */</div><div class='ctx'> #define BATADV_TP_MAX_NUM 5</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum batadv_mesh_state - State of a soft interface</div><div class='add'>+ * enum batadv_mesh_state - State of a mesh interface</div><div class='ctx'>  */</div><div class='ctx'> enum batadv_mesh_state {</div><div class='del'>-	/** @BATADV_MESH_INACTIVE: soft interface is not yet running */</div><div class='add'>+	/** @BATADV_MESH_INACTIVE: mesh interface is not yet running */</div><div class='ctx'> 	BATADV_MESH_INACTIVE,</div><div class='ctx'> </div><div class='ctx'> 	/** @BATADV_MESH_ACTIVE: interface is up and running */</div><div class='hunk'>@@ -217,20 +202,19 @@ enum batadv_uev_type {</div><div class='ctx'> </div><div class='ctx'> /* Kernel headers */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "types.h"</div><div class='del'>-</div><div class='del'>-struct net_device;</div><div class='del'>-struct packet_type;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='add'>+#include "main.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_print_vid() - return printable version of vid information</div><div class='hunk'>@@ -247,15 +231,13 @@ static inline int batadv_print_vid(unsigned short vid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern struct list_head batadv_hardif_list;</div><div class='add'>+extern unsigned int batadv_hardif_generation;</div><div class='ctx'> </div><div class='del'>-extern unsigned char batadv_broadcast_addr[];</div><div class='ctx'> extern struct workqueue_struct *batadv_event_workqueue;</div><div class='ctx'> </div><div class='del'>-int batadv_mesh_init(struct net_device *soft_iface);</div><div class='del'>-void batadv_mesh_free(struct net_device *soft_iface);</div><div class='add'>+int batadv_mesh_init(struct net_device *mesh_iface);</div><div class='add'>+void batadv_mesh_free(struct net_device *mesh_iface);</div><div class='ctx'> bool batadv_is_my_mac(struct batadv_priv *bat_priv, const u8 *addr);</div><div class='del'>-struct batadv_hard_iface *</div><div class='del'>-batadv_seq_print_text_primary_if_get(struct seq_file *seq);</div><div class='ctx'> int batadv_max_header_len(void);</div><div class='ctx'> void batadv_skb_set_priority(struct sk_buff *skb, int offset);</div><div class='ctx'> int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,</div><div class='hunk'>@@ -266,7 +248,6 @@ batadv_recv_handler_register(u8 packet_type,</div><div class='ctx'> 			     int (*recv_handler)(struct sk_buff *,</div><div class='ctx'> 						 struct batadv_hard_iface *));</div><div class='ctx'> void batadv_recv_handler_unregister(u8 packet_type);</div><div class='del'>-__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_compare_eth() - Compare two not u16 aligned Ethernet addresses</div><div class='hunk'>@@ -319,7 +300,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,</div><div class='ctx'>  * @y: value to compare @x against</div><div class='ctx'>  *</div><div class='ctx'>  * It handles overflows/underflows and can correctly check for a predecessor</div><div class='del'>- * unless the variable sequence number has grown by more then</div><div class='add'>+ * unless the variable sequence number has grown by more than</div><div class='ctx'>  * 2**(bitwidth(x)-1)-1.</div><div class='ctx'>  *</div><div class='ctx'>  * This means that for a u8 with the maximum value 255, it would think:</div><div class='hunk'>@@ -341,11 +322,11 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_seq_after() - Checks if a sequence number x is a successor of y</div><div class='del'>- * @x: potential sucessor of @y</div><div class='add'>+ * @x: potential successor of @y</div><div class='ctx'>  * @y: value to compare @x against</div><div class='ctx'>  *</div><div class='ctx'>  * It handles overflows/underflows and can correctly check for a successor</div><div class='del'>- * unless the variable sequence number has grown by more then</div><div class='add'>+ * unless the variable sequence number has grown by more than</div><div class='ctx'>  * 2**(bitwidth(x)-1)-1.</div><div class='ctx'>  *</div><div class='ctx'>  * This means that for a u8 with the maximum value 255, it would think:</div><div class='hunk'>@@ -360,8 +341,8 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,</div><div class='ctx'> #define batadv_seq_after(x, y) batadv_seq_before(y, x)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_add_counter() - Add to per cpu statistics counter of soft interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_add_counter() - Add to per cpu statistics counter of mesh interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @idx: counter index which should be modified</div><div class='ctx'>  * @count: value to increase counter by</div><div class='ctx'>  *</div><div class='hunk'>@@ -374,8 +355,8 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_inc_counter() - Increase per cpu statistics counter of soft interface</div><div class='del'>- * @b: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_inc_counter() - Increase per cpu statistics counter of mesh interface</div><div class='add'>+ * @b: the bat priv with all the mesh interface information</div><div class='ctx'>  * @i: counter index which should be modified</div><div class='ctx'>  */</div><div class='ctx'> #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)</div><div class='hunk'>@@ -393,5 +374,7 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx,</div><div class='ctx'> </div><div class='ctx'> unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len);</div><div class='ctx'> bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid);</div><div class='add'>+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,</div><div class='add'>+			enum batadv_uev_action action, const char *data);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_MAIN_H_ */</div><div class='head'>diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/mesh-interface.c<br/>index 626ddca332db..df7e95811ef5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/soft-interface.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/soft-interface.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/mesh-interface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/mesh-interface.c</a></div><div class='hunk'>@@ -1,28 +1,17 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "soft-interface.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -31,17 +20,15 @@</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -49,20 +36,18 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='add'>+#include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bat_algo.h"</div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='del'>-#include "debugfs.h"</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='del'>-#include "gateway_common.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "multicast.h"</div><div class='del'>-#include "network-coding.h"</div><div class='del'>-#include "originator.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "sysfs.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -91,21 +76,9 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int batadv_interface_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_interface_release(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_sum_counter() - Sum the cpu-local counters for index 'idx'</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @idx: index of counter to sum up</div><div class='ctx'>  *</div><div class='ctx'>  * Return: sum of all cpu-local counters</div><div class='hunk'>@@ -139,7 +112,7 @@ static struct net_device_stats *batadv_interface_stats(struct net_device *dev)</div><div class='ctx'> static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> 	u8 old_addr[ETH_ALEN];</div><div class='ctx'> </div><div class='hunk'>@@ -147,14 +120,14 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(old_addr, dev-&gt;dev_addr);</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	/* only modify transtable if it has been initialized before */</div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		batadv_tt_local_remove(bat_priv, old_addr, vlan-&gt;vid,</div><div class='ctx'> 				       "mac address changed", false);</div><div class='ctx'> 		batadv_tt_local_add(dev, addr-&gt;sa_data, vlan-&gt;vid,</div><div class='hunk'>@@ -167,11 +140,14 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> </div><div class='ctx'> static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	/* check ranges */</div><div class='del'>-	if (new_mtu &lt; 68 || new_mtu &gt; batadv_hardif_min_mtu(dev))</div><div class='add'>+	if (new_mtu &lt; ETH_MIN_MTU || new_mtu &gt; batadv_hardif_min_mtu(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='add'>+	bat_priv-&gt;mtu_set_by_user = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -181,7 +157,7 @@ static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'>  * @dev: registered network device to modify</div><div class='ctx'>  *</div><div class='ctx'>  * We do not actually need to set any rx filters for the virtual batman</div><div class='del'>- * soft interface. However a dummy handler enables a user to set static</div><div class='add'>+ * mesh interface. However a dummy handler enables a user to set static</div><div class='ctx'>  * multicast listeners for instance.</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_interface_set_rx_mode(struct net_device *dev)</div><div class='hunk'>@@ -189,10 +165,10 @@ static void batadv_interface_set_rx_mode(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,</div><div class='del'>-				       struct net_device *soft_iface)</div><div class='add'>+				       struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct batadv_bcast_packet *bcast_packet;</div><div class='ctx'> 	static const u8 stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00,</div><div class='hunk'>@@ -204,14 +180,15 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,</div><div class='ctx'> 	struct vlan_ethhdr *vhdr;</div><div class='ctx'> 	unsigned int header_len = 0;</div><div class='ctx'> 	int data_len = skb-&gt;len, ret;</div><div class='del'>-	unsigned long brd_delay = 1;</div><div class='add'>+	unsigned long brd_delay = 0;</div><div class='ctx'> 	bool do_bcast = false, client_added;</div><div class='ctx'> 	unsigned short vid;</div><div class='ctx'> 	u32 seqno;</div><div class='ctx'> 	int gw_mode;</div><div class='del'>-	enum batadv_forw_mode forw_mode;</div><div class='del'>-	struct batadv_orig_node *mcast_single_orig = NULL;</div><div class='add'>+	enum batadv_forw_mode forw_mode = BATADV_FORW_BCAST;</div><div class='add'>+	int mcast_is_routable = 0;</div><div class='ctx'> 	int network_offset = ETH_HLEN;</div><div class='add'>+	__be16 proto;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='ctx'> 		goto dropped;</div><div class='hunk'>@@ -219,21 +196,28 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,</div><div class='ctx'> 	/* reset control block to avoid left overs from previous users */</div><div class='ctx'> 	memset(skb-&gt;cb, 0, sizeof(struct batadv_skb_cb));</div><div class='ctx'> </div><div class='del'>-	netif_trans_update(soft_iface);</div><div class='add'>+	netif_trans_update(mesh_iface);</div><div class='ctx'> 	vid = batadv_get_vid(skb, 0);</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='ctx'> 	ethhdr = eth_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	switch (ntohs(ethhdr-&gt;h_proto)) {</div><div class='add'>+	proto = ethhdr-&gt;h_proto;</div><div class='add'>+</div><div class='add'>+	switch (ntohs(proto)) {</div><div class='ctx'> 	case ETH_P_8021Q:</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(*vhdr)))</div><div class='add'>+			goto dropped;</div><div class='ctx'> 		vhdr = vlan_eth_hdr(skb);</div><div class='add'>+		proto = vhdr-&gt;h_vlan_encapsulated_proto;</div><div class='ctx'> </div><div class='ctx'> 		/* drop batman-in-batman packets to prevent loops */</div><div class='del'>-		if (vhdr-&gt;h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) {</div><div class='add'>+		if (proto != htons(ETH_P_BATMAN)) {</div><div class='ctx'> 			network_offset += VLAN_HLEN;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ETH_P_BATMAN:</div><div class='ctx'> 		goto dropped;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -249,13 +233,16 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,</div><div class='ctx'> 	/* Register the client MAC in the transtable */</div><div class='ctx'> 	if (!is_multicast_ether_addr(ethhdr-&gt;h_source) &amp;&amp;</div><div class='ctx'> 	    !batadv_bla_is_loopdetect_mac(ethhdr-&gt;h_source)) {</div><div class='del'>-		client_added = batadv_tt_local_add(soft_iface, ethhdr-&gt;h_source,</div><div class='add'>+		client_added = batadv_tt_local_add(mesh_iface, ethhdr-&gt;h_source,</div><div class='ctx'> 						   vid, skb-&gt;skb_iif,</div><div class='ctx'> 						   skb-&gt;mark);</div><div class='ctx'> 		if (!client_added)</div><div class='ctx'> 			goto dropped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Snoop address candidates from DHCPACKs for early DAT filling */</div><div class='add'>+	batadv_dat_snoop_outgoing_dhcp_ack(bat_priv, skb, proto, vid);</div><div class='add'>+</div><div class='ctx'> 	/* don't accept stp packets. STP does not help in meshes.</div><div class='ctx'> 	 * better use the bridge loop avoidance ...</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -301,13 +288,20 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> send:</div><div class='ctx'> 		if (do_bcast &amp;&amp; !is_broadcast_ether_addr(ethhdr-&gt;h_dest)) {</div><div class='del'>-			forw_mode = batadv_mcast_forw_mode(bat_priv, skb,</div><div class='del'>-							   &amp;mcast_single_orig);</div><div class='del'>-			if (forw_mode == BATADV_FORW_NONE)</div><div class='del'>-				goto dropped;</div><div class='del'>-</div><div class='del'>-			if (forw_mode == BATADV_FORW_SINGLE)</div><div class='add'>+			forw_mode = batadv_mcast_forw_mode(bat_priv, skb, vid,</div><div class='add'>+							   &amp;mcast_is_routable);</div><div class='add'>+			switch (forw_mode) {</div><div class='add'>+			case BATADV_FORW_BCAST:</div><div class='add'>+				break;</div><div class='add'>+			case BATADV_FORW_UCASTS:</div><div class='add'>+			case BATADV_FORW_MCAST:</div><div class='ctx'> 				do_bcast = false;</div><div class='add'>+				break;</div><div class='add'>+			case BATADV_FORW_NONE:</div><div class='add'>+				fallthrough;</div><div class='add'>+			default:</div><div class='add'>+				goto dropped;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -331,7 +325,7 @@ send:</div><div class='ctx'> </div><div class='ctx'> 		bcast_packet = (struct batadv_bcast_packet *)skb-&gt;data;</div><div class='ctx'> 		bcast_packet-&gt;version = BATADV_COMPAT_VERSION;</div><div class='del'>-		bcast_packet-&gt;ttl = BATADV_TTL;</div><div class='add'>+		bcast_packet-&gt;ttl = BATADV_TTL - 1;</div><div class='ctx'> </div><div class='ctx'> 		/* batman packet type: broadcast */</div><div class='ctx'> 		bcast_packet-&gt;packet_type = BATADV_BCAST;</div><div class='hunk'>@@ -347,13 +341,7 @@ send:</div><div class='ctx'> 		seqno = atomic_inc_return(&amp;bat_priv-&gt;bcast_seqno);</div><div class='ctx'> 		bcast_packet-&gt;seqno = htonl(seqno);</div><div class='ctx'> </div><div class='del'>-		batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay, true);</div><div class='del'>-</div><div class='del'>-		/* a copy is stored in the bcast list, therefore removing</div><div class='del'>-		 * the original skb.</div><div class='del'>-		 */</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-</div><div class='add'>+		batadv_send_bcast_packet(bat_priv, skb, brd_delay, true);</div><div class='ctx'> 	/* unicast packet */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* DHCP packets going to a server will use the GW feature */</div><div class='hunk'>@@ -362,10 +350,11 @@ send:</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto dropped;</div><div class='ctx'> 			ret = batadv_send_skb_via_gw(bat_priv, skb, vid);</div><div class='del'>-		} else if (mcast_single_orig) {</div><div class='del'>-			ret = batadv_send_skb_unicast(bat_priv, skb,</div><div class='del'>-						      BATADV_UNICAST, 0,</div><div class='del'>-						      mcast_single_orig, vid);</div><div class='add'>+		} else if (forw_mode == BATADV_FORW_UCASTS) {</div><div class='add'>+			ret = batadv_mcast_forw_send(bat_priv, skb, vid,</div><div class='add'>+						     mcast_is_routable);</div><div class='add'>+		} else if (forw_mode == BATADV_FORW_MCAST) {</div><div class='add'>+			ret = batadv_mcast_forw_mcsend(bat_priv, skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (batadv_dat_snoop_outgoing_arp_request(bat_priv,</div><div class='ctx'> 								  skb))</div><div class='hunk'>@@ -389,21 +378,18 @@ dropped:</div><div class='ctx'> dropped_freed:</div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED);</div><div class='ctx'> end:</div><div class='del'>-	if (mcast_single_orig)</div><div class='del'>-		batadv_orig_node_put(mcast_single_orig);</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_interface_rx() - receive ethernet frame on local batman-adv interface</div><div class='del'>- * @soft_iface: local interface which will receive the ethernet frame</div><div class='del'>- * @skb: ethernet frame for @soft_iface</div><div class='add'>+ * @mesh_iface: local interface which will receive the ethernet frame</div><div class='add'>+ * @skb: ethernet frame for @mesh_iface</div><div class='ctx'>  * @hdr_size: size of already parsed batman-adv header</div><div class='ctx'>  * @orig_node: originator from which the batman-adv packet was sent</div><div class='ctx'>  *</div><div class='del'>- * Sends a ethernet frame to the receive path of the local @soft_iface.</div><div class='add'>+ * Sends an ethernet frame to the receive path of the local @mesh_iface.</div><div class='ctx'>  * skb-&gt;data has still point to the batman-adv header with the size @hdr_size.</div><div class='ctx'>  * The caller has to have parsed this header already and made sure that at least</div><div class='ctx'>  * @hdr_size bytes are still available for pull in @skb.</div><div class='hunk'>@@ -413,19 +399,19 @@ end:</div><div class='ctx'>  * unicast packets will be dropped directly when it was sent between two</div><div class='ctx'>  * isolated clients.</div><div class='ctx'>  */</div><div class='del'>-void batadv_interface_rx(struct net_device *soft_iface,</div><div class='add'>+void batadv_interface_rx(struct net_device *mesh_iface,</div><div class='ctx'> 			 struct sk_buff *skb, int hdr_size,</div><div class='ctx'> 			 struct batadv_orig_node *orig_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_bcast_packet *batadv_bcast_packet;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	struct vlan_ethhdr *vhdr;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='ctx'> 	unsigned short vid;</div><div class='del'>-	bool is_bcast;</div><div class='add'>+	int packet_type;</div><div class='ctx'> </div><div class='ctx'> 	batadv_bcast_packet = (struct batadv_bcast_packet *)skb-&gt;data;</div><div class='del'>-	is_bcast = (batadv_bcast_packet-&gt;packet_type == BATADV_BCAST);</div><div class='add'>+	packet_type = batadv_bcast_packet-&gt;packet_type;</div><div class='ctx'> </div><div class='ctx'> 	skb_pull_rcsum(skb, hdr_size);</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='hunk'>@@ -433,7 +419,7 @@ void batadv_interface_rx(struct net_device *soft_iface,</div><div class='ctx'> 	/* clean the netfilter state now that the batman-adv header has been</div><div class='ctx'> 	 * removed</div><div class='ctx'> 	 */</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))</div><div class='ctx'> 		goto dropped;</div><div class='hunk'>@@ -446,19 +432,19 @@ void batadv_interface_rx(struct net_device *soft_iface,</div><div class='ctx'> 		if (!pskb_may_pull(skb, VLAN_ETH_HLEN))</div><div class='ctx'> 			goto dropped;</div><div class='ctx'> </div><div class='del'>-		vhdr = (struct vlan_ethhdr *)skb-&gt;data;</div><div class='add'>+		vhdr = skb_vlan_eth_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		/* drop batman-in-batman packets to prevent loops */</div><div class='ctx'> 		if (vhdr-&gt;h_vlan_encapsulated_proto != htons(ETH_P_BATMAN))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ETH_P_BATMAN:</div><div class='ctx'> 		goto dropped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* skb-&gt;dev &amp; skb-&gt;pkt_type are set here */</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, soft_iface);</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, mesh_iface);</div><div class='ctx'> 	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_RX);</div><div class='hunk'>@@ -468,7 +454,7 @@ void batadv_interface_rx(struct net_device *soft_iface,</div><div class='ctx'> 	/* Let the bridge loop avoidance check the packet. If will</div><div class='ctx'> 	 * not handle it, we can safely push it up.</div><div class='ctx'> 	 */</div><div class='del'>-	if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))</div><div class='add'>+	if (batadv_bla_rx(bat_priv, skb, vid, packet_type))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (orig_node)</div><div class='hunk'>@@ -503,51 +489,38 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_vlan_release() - release vlan from lists and queue for free</div><div class='add'>+ * batadv_meshif_vlan_release() - release vlan from lists and queue for free</div><div class='ctx'>  *  after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the vlan object</div><div class='ctx'>  */</div><div class='del'>-static void batadv_softif_vlan_release(struct kref *ref)</div><div class='add'>+void batadv_meshif_vlan_release(struct kref *ref)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='del'>-	vlan = container_of(ref, struct batadv_softif_vlan, refcount);</div><div class='add'>+	vlan = container_of(ref, struct batadv_meshif_vlan, refcount);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;vlan-&gt;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;vlan-&gt;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> 	hlist_del_rcu(&amp;vlan-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;vlan-&gt;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;vlan-&gt;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(vlan, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_vlan_put() - decrease the vlan object refcounter and</div><div class='del'>- *  possibly release it</div><div class='del'>- * @vlan: the vlan object to release</div><div class='del'>- */</div><div class='del'>-void batadv_softif_vlan_put(struct batadv_softif_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	if (!vlan)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	kref_put(&amp;vlan-&gt;refcount, batadv_softif_vlan_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_softif_vlan_get() - get the vlan object for a specific vid</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_meshif_vlan_get() - get the vlan object for a specific vid</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the identifier of the vlan object to retrieve</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the private data of the vlan matching the vid passed as argument or</div><div class='ctx'>  * NULL otherwise. The refcounter of the returned object is incremented by 1.</div><div class='ctx'>  */</div><div class='del'>-struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv,</div><div class='add'>+struct batadv_meshif_vlan *batadv_meshif_vlan_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 						  unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_softif_vlan *vlan_tmp, *vlan = NULL;</div><div class='add'>+	struct batadv_meshif_vlan *vlan_tmp, *vlan = NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(vlan_tmp, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	hlist_for_each_entry_rcu(vlan_tmp, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		if (vlan_tmp-&gt;vid != vid)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -563,29 +536,28 @@ struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_create_vlan() - allocate the needed resources for a new vlan</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_meshif_create_vlan() - allocate the needed resources for a new vlan</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the VLAN identifier</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, a negative error otherwise.</div><div class='ctx'>  */</div><div class='del'>-int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)</div><div class='add'>+int batadv_meshif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='del'>-	int err;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> </div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (vlan) {</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='del'>-		spin_unlock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+		batadv_meshif_vlan_put(vlan);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vlan = kzalloc(sizeof(*vlan), GFP_ATOMIC);</div><div class='ctx'> 	if (!vlan) {</div><div class='del'>-		spin_unlock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -596,57 +568,43 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)</div><div class='ctx'> 	atomic_set(&amp;vlan-&gt;ap_isolation, 0);</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;vlan-&gt;refcount);</div><div class='del'>-	hlist_add_head_rcu(&amp;vlan-&gt;list, &amp;bat_priv-&gt;softif_vlan_list);</div><div class='del'>-	spin_unlock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='del'>-</div><div class='del'>-	/* batadv_sysfs_add_vlan cannot be in the spinlock section due to the</div><div class='del'>-	 * sleeping behavior of the sysfs functions and the fs_reclaim lock</div><div class='del'>-	 */</div><div class='del'>-	err = batadv_sysfs_add_vlan(bat_priv-&gt;soft_iface, vlan);</div><div class='del'>-	if (err) {</div><div class='del'>-		/* ref for the function */</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='del'>-</div><div class='del'>-		/* ref for the list */</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	hlist_add_head_rcu(&amp;vlan-&gt;list, &amp;bat_priv-&gt;meshif_vlan_list);</div><div class='add'>+	spin_unlock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* add a new TT local entry. This one will be marked with the NOPURGE</div><div class='ctx'> 	 * flag</div><div class='ctx'> 	 */</div><div class='del'>-	batadv_tt_local_add(bat_priv-&gt;soft_iface,</div><div class='del'>-			    bat_priv-&gt;soft_iface-&gt;dev_addr, vid,</div><div class='add'>+	batadv_tt_local_add(bat_priv-&gt;mesh_iface,</div><div class='add'>+			    bat_priv-&gt;mesh_iface-&gt;dev_addr, vid,</div><div class='ctx'> 			    BATADV_NULL_IFINDEX, BATADV_NO_MARK);</div><div class='ctx'> </div><div class='del'>-	/* don't return reference to new softif_vlan */</div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	/* don't return reference to new meshif_vlan */</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_destroy_vlan() - remove and destroy a softif_vlan object</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_meshif_destroy_vlan() - remove and destroy a meshif_vlan object</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vlan: the object to remove</div><div class='ctx'>  */</div><div class='del'>-static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv,</div><div class='del'>-				       struct batadv_softif_vlan *vlan)</div><div class='add'>+static void batadv_meshif_destroy_vlan(struct batadv_priv *bat_priv,</div><div class='add'>+				       struct batadv_meshif_vlan *vlan)</div><div class='ctx'> {</div><div class='ctx'> 	/* explicitly remove the associated TT local entry because it is marked</div><div class='ctx'> 	 * with the NOPURGE flag</div><div class='ctx'> 	 */</div><div class='del'>-	batadv_tt_local_remove(bat_priv, bat_priv-&gt;soft_iface-&gt;dev_addr,</div><div class='add'>+	batadv_tt_local_remove(bat_priv, bat_priv-&gt;mesh_iface-&gt;dev_addr,</div><div class='ctx'> 			       vlan-&gt;vid, "vlan interface destroyed", false);</div><div class='ctx'> </div><div class='del'>-	batadv_sysfs_del_vlan(bat_priv, vlan);</div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_interface_add_vid() - ndo_add_vid API implementation</div><div class='ctx'>  * @dev: the netdev of the mesh interface</div><div class='del'>- * @proto: protocol of the the vlan id</div><div class='add'>+ * @proto: protocol of the vlan id</div><div class='ctx'>  * @vid: identifier of the new vlan</div><div class='ctx'>  *</div><div class='ctx'>  * Set up all the internal structures for handling the new vlan on top of the</div><div class='hunk'>@@ -658,8 +616,7 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto,</div><div class='ctx'> 				    unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='del'>-	int ret;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* only 802.1Q vlans are supported.</div><div class='ctx'> 	 * batman-adv does not know how to handle other types</div><div class='hunk'>@@ -667,35 +624,32 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto,</div><div class='ctx'> 	if (proto != htons(ETH_P_8021Q))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* VID 0 is only used to indicate "priority tag" frames which only</div><div class='add'>+	 * contain priority information and no VID. No management structures</div><div class='add'>+	 * should be created for this VID and it should be handled like an</div><div class='add'>+	 * untagged frame.</div><div class='add'>+	 */</div><div class='add'>+	if (vid == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	vid |= BATADV_VLAN_HAS_TAG;</div><div class='ctx'> </div><div class='ctx'> 	/* if a new vlan is getting created and it already exists, it means that</div><div class='del'>-	 * it was not deleted yet. batadv_softif_vlan_get() increases the</div><div class='add'>+	 * it was not deleted yet. batadv_meshif_vlan_get() increases the</div><div class='ctx'> 	 * refcount in order to revive the object.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * if it does not exist then create it.</div><div class='ctx'> 	 */</div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (!vlan)</div><div class='del'>-		return batadv_softif_create_vlan(bat_priv, vid);</div><div class='del'>-</div><div class='del'>-	/* recreate the sysfs object if it was already destroyed (and it should</div><div class='del'>-	 * be since we received a kill_vid() for this vlan</div><div class='del'>-	 */</div><div class='del'>-	if (!vlan-&gt;kobj) {</div><div class='del'>-		ret = batadv_sysfs_add_vlan(bat_priv-&gt;soft_iface, vlan);</div><div class='del'>-		if (ret) {</div><div class='del'>-			batadv_softif_vlan_put(vlan);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		return batadv_meshif_create_vlan(bat_priv, vid);</div><div class='ctx'> </div><div class='ctx'> 	/* add a new TT local entry. This one will be marked with the NOPURGE</div><div class='ctx'> 	 * flag. This must be added again, even if the vlan object already</div><div class='ctx'> 	 * exists, because the entry was deleted by kill_vid()</div><div class='ctx'> 	 */</div><div class='del'>-	batadv_tt_local_add(bat_priv-&gt;soft_iface,</div><div class='del'>-			    bat_priv-&gt;soft_iface-&gt;dev_addr, vid,</div><div class='add'>+	batadv_tt_local_add(bat_priv-&gt;mesh_iface,</div><div class='add'>+			    bat_priv-&gt;mesh_iface-&gt;dev_addr, vid,</div><div class='ctx'> 			    BATADV_NULL_IFINDEX, BATADV_NO_MARK);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -704,7 +658,7 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_interface_kill_vid() - ndo_kill_vid API implementation</div><div class='ctx'>  * @dev: the netdev of the mesh interface</div><div class='del'>- * @proto: protocol of the the vlan id</div><div class='add'>+ * @proto: protocol of the vlan id</div><div class='ctx'>  * @vid: identifier of the deleted vlan</div><div class='ctx'>  *</div><div class='ctx'>  * Destroy all the internal structures used to handle the vlan identified by vid</div><div class='hunk'>@@ -717,7 +671,7 @@ static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto,</div><div class='ctx'> 				     unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* only 802.1Q vlans are supported. batman-adv does not know how to</div><div class='ctx'> 	 * handle other types</div><div class='hunk'>@@ -725,14 +679,20 @@ static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto,</div><div class='ctx'> 	if (proto != htons(ETH_P_8021Q))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG);</div><div class='add'>+	/* "priority tag" frames are handled like "untagged" frames</div><div class='add'>+	 * and no meshif_vlan needs to be destroyed</div><div class='add'>+	 */</div><div class='add'>+	if (vid == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG);</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	batadv_softif_destroy_vlan(bat_priv, vlan);</div><div class='add'>+	batadv_meshif_destroy_vlan(bat_priv, vlan);</div><div class='ctx'> </div><div class='ctx'> 	/* finally free the vlan object */</div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -768,12 +728,12 @@ static void batadv_set_lockdep_class(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_init_late() - late stage initialization of soft interface</div><div class='add'>+ * batadv_meshif_init_late() - late stage initialization of mesh interface</div><div class='ctx'>  * @dev: registered network device to modify</div><div class='ctx'>  *</div><div class='ctx'>  * Return: error code on failures</div><div class='ctx'>  */</div><div class='del'>-static int batadv_softif_init_late(struct net_device *dev)</div><div class='add'>+static int batadv_meshif_init_late(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	u32 random_seqno;</div><div class='hunk'>@@ -783,7 +743,7 @@ static int batadv_softif_init_late(struct net_device *dev)</div><div class='ctx'> 	batadv_set_lockdep_class(dev);</div><div class='ctx'> </div><div class='ctx'> 	bat_priv = netdev_priv(dev);</div><div class='del'>-	bat_priv-&gt;soft_iface = dev;</div><div class='add'>+	bat_priv-&gt;mesh_iface = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* batadv_interface_stats() needs to be available as soon as</div><div class='ctx'> 	 * register_netdevice() has been called</div><div class='hunk'>@@ -801,15 +761,12 @@ static int batadv_softif_init_late(struct net_device *dev)</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;distributed_arp_table, 1);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv4.exists = false;</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv4.shadowing = false;</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv6.exists = false;</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv6.shadowing = false;</div><div class='del'>-	bat_priv-&gt;mcast.flags = BATADV_NO_FLAGS;</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;multicast_mode, 1);</div><div class='add'>+	atomic_set(&amp;bat_priv-&gt;multicast_fanout, 16);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;mcast.num_want_all_unsnoopables, 0);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;mcast.num_want_all_ipv4, 0);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;mcast.num_want_all_ipv6, 0);</div><div class='add'>+	atomic_set(&amp;bat_priv-&gt;mcast.num_no_mc_ptype_capa, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;gw.mode, BATADV_GW_MODE_OFF);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;gw.bandwidth_down, 100);</div><div class='hunk'>@@ -820,20 +777,20 @@ static int batadv_softif_init_late(struct net_device *dev)</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;log_level, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;fragmentation, 1);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;packet_size_max, ETH_DATA_LEN);</div><div class='add'>+	atomic_set(&amp;bat_priv-&gt;packet_size_max, BATADV_MAX_MTU);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;bcast_queue_left, BATADV_BCAST_QUEUE_LEN);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;batman_queue_left, BATADV_BATMAN_QUEUE_LEN);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;mesh_state, BATADV_MESH_INACTIVE);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;bcast_seqno, 1);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;tt.vn, 0);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;tt.local_changes, 0);</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;tt.ogm_append_cnt, 0);</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;bla.num_requests, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;tp_num, 0);</div><div class='ctx'> </div><div class='add'>+	WRITE_ONCE(bat_priv-&gt;tt.local_changes, 0);</div><div class='ctx'> 	bat_priv-&gt;tt.last_changeset = NULL;</div><div class='ctx'> 	bat_priv-&gt;tt.last_changeset_len = 0;</div><div class='ctx'> 	bat_priv-&gt;isolation_mark = 0;</div><div class='hunk'>@@ -844,26 +801,19 @@ static int batadv_softif_init_late(struct net_device *dev)</div><div class='ctx'> 	atomic_set(&amp;bat_priv-&gt;frag_seqno, random_seqno);</div><div class='ctx'> </div><div class='ctx'> 	bat_priv-&gt;primary_if = NULL;</div><div class='del'>-	bat_priv-&gt;num_ifaces = 0;</div><div class='del'>-</div><div class='del'>-	batadv_nc_init_bat_priv(bat_priv);</div><div class='ctx'> </div><div class='del'>-	ret = batadv_algo_select(bat_priv, batadv_routing_algo);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto free_bat_counters;</div><div class='del'>-</div><div class='del'>-	ret = batadv_debugfs_add_meshif(dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto free_bat_counters;</div><div class='add'>+	if (!bat_priv-&gt;algo_ops) {</div><div class='add'>+		ret = batadv_algo_select(bat_priv, batadv_routing_algo);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto free_bat_counters;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_mesh_init(dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto unreg_debugfs;</div><div class='add'>+		goto free_bat_counters;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-unreg_debugfs:</div><div class='del'>-	batadv_debugfs_del_meshif(dev);</div><div class='ctx'> free_bat_counters:</div><div class='ctx'> 	free_percpu(bat_priv-&gt;bat_counters);</div><div class='ctx'> 	bat_priv-&gt;bat_counters = NULL;</div><div class='hunk'>@@ -872,41 +822,39 @@ free_bat_counters:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_slave_add() - Add a slave interface to a batadv_soft_interface</div><div class='del'>- * @dev: batadv_soft_interface used as master interface</div><div class='add'>+ * batadv_meshif_slave_add() - Add a slave interface to a batadv_mesh_interface</div><div class='add'>+ * @dev: batadv_mesh_interface used as master interface</div><div class='ctx'>  * @slave_dev: net_device which should become the slave interface</div><div class='ctx'>  * @extack: extended ACK report struct</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if successful or error otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int batadv_softif_slave_add(struct net_device *dev,</div><div class='add'>+static int batadv_meshif_slave_add(struct net_device *dev,</div><div class='ctx'> 				   struct net_device *slave_dev,</div><div class='ctx'> 				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = batadv_hardif_get_by_netdev(slave_dev);</div><div class='del'>-	if (!hard_iface || hard_iface-&gt;soft_iface)</div><div class='add'>+	if (!hard_iface || hard_iface-&gt;mesh_iface)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = batadv_hardif_enable_interface(hard_iface, net, dev-&gt;name);</div><div class='add'>+	ret = batadv_hardif_enable_interface(hard_iface, dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		batadv_hardif_put(hard_iface);</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_slave_del() - Delete a slave iface from a batadv_soft_interface</div><div class='del'>- * @dev: batadv_soft_interface used as master interface</div><div class='add'>+ * batadv_meshif_slave_del() - Delete a slave iface from a batadv_mesh_interface</div><div class='add'>+ * @dev: batadv_mesh_interface used as master interface</div><div class='ctx'>  * @slave_dev: net_device which should be removed from the master interface</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if successful or error otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int batadv_softif_slave_del(struct net_device *dev,</div><div class='add'>+static int batadv_meshif_slave_del(struct net_device *dev,</div><div class='ctx'> 				   struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='hunk'>@@ -914,22 +862,19 @@ static int batadv_softif_slave_del(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = batadv_hardif_get_by_netdev(slave_dev);</div><div class='ctx'> </div><div class='del'>-	if (!hard_iface || hard_iface-&gt;soft_iface != dev)</div><div class='add'>+	if (!hard_iface || hard_iface-&gt;mesh_iface != dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	batadv_hardif_disable_interface(hard_iface, BATADV_IF_CLEANUP_KEEP);</div><div class='add'>+	batadv_hardif_disable_interface(hard_iface);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		batadv_hardif_put(hard_iface);</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops batadv_netdev_ops = {</div><div class='del'>-	.ndo_init = batadv_softif_init_late,</div><div class='del'>-	.ndo_open = batadv_interface_open,</div><div class='del'>-	.ndo_stop = batadv_interface_release,</div><div class='add'>+	.ndo_init = batadv_meshif_init_late,</div><div class='ctx'> 	.ndo_get_stats = batadv_interface_stats,</div><div class='ctx'> 	.ndo_vlan_rx_add_vid = batadv_interface_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid = batadv_interface_kill_vid,</div><div class='hunk'>@@ -938,17 +883,17 @@ static const struct net_device_ops batadv_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode = batadv_interface_set_rx_mode,</div><div class='ctx'> 	.ndo_start_xmit = batadv_interface_tx,</div><div class='ctx'> 	.ndo_validate_addr = eth_validate_addr,</div><div class='del'>-	.ndo_add_slave = batadv_softif_slave_add,</div><div class='del'>-	.ndo_del_slave = batadv_softif_slave_del,</div><div class='add'>+	.ndo_add_slave = batadv_meshif_slave_add,</div><div class='add'>+	.ndo_del_slave = batadv_meshif_slave_del,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void batadv_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, "B.A.T.M.A.N. advanced", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, BATADV_SOURCE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "batman", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, "B.A.T.M.A.N. advanced", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, BATADV_SOURCE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, "batman", sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Inspired by drivers/net/ethernet/dlink/sundance.c:1702</div><div class='hunk'>@@ -981,6 +926,18 @@ static const struct {</div><div class='ctx'> 	{ "tt_response_rx" },</div><div class='ctx'> 	{ "tt_roam_adv_tx" },</div><div class='ctx'> 	{ "tt_roam_adv_rx" },</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+	{ "mcast_tx" },</div><div class='add'>+	{ "mcast_tx_bytes" },</div><div class='add'>+	{ "mcast_tx_local" },</div><div class='add'>+	{ "mcast_tx_local_bytes" },</div><div class='add'>+	{ "mcast_rx" },</div><div class='add'>+	{ "mcast_rx_bytes" },</div><div class='add'>+	{ "mcast_rx_local" },</div><div class='add'>+	{ "mcast_rx_local_bytes" },</div><div class='add'>+	{ "mcast_fwd" },</div><div class='add'>+	{ "mcast_fwd_bytes" },</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_DAT</div><div class='ctx'> 	{ "dat_get_tx" },</div><div class='ctx'> 	{ "dat_get_rx" },</div><div class='hunk'>@@ -988,17 +945,6 @@ static const struct {</div><div class='ctx'> 	{ "dat_put_rx" },</div><div class='ctx'> 	{ "dat_cached_reply_tx" },</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	{ "nc_code" },</div><div class='del'>-	{ "nc_code_bytes" },</div><div class='del'>-	{ "nc_recode" },</div><div class='del'>-	{ "nc_recode_bytes" },</div><div class='del'>-	{ "nc_buffer" },</div><div class='del'>-	{ "nc_decode" },</div><div class='del'>-	{ "nc_decode_bytes" },</div><div class='del'>-	{ "nc_decode_failed" },</div><div class='del'>-	{ "nc_sniffed" },</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data)</div><div class='hunk'>@@ -1035,12 +981,11 @@ static const struct ethtool_ops batadv_ethtool_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_free() - Deconstructor of batadv_soft_interface</div><div class='add'>+ * batadv_meshif_free() - Deconstructor of batadv_mesh_interface</div><div class='ctx'>  * @dev: Device to cleanup and remove</div><div class='ctx'>  */</div><div class='del'>-static void batadv_softif_free(struct net_device *dev)</div><div class='add'>+static void batadv_meshif_free(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	batadv_debugfs_del_meshif(dev);</div><div class='ctx'> 	batadv_mesh_free(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* some scheduled RCU callbacks need the bat_priv struct to accomplish</div><div class='hunk'>@@ -1051,23 +996,26 @@ static void batadv_softif_free(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_init_early() - early stage initialization of soft interface</div><div class='add'>+ * batadv_meshif_init_early() - early stage initialization of mesh interface</div><div class='ctx'>  * @dev: registered network device to modify</div><div class='ctx'>  */</div><div class='del'>-static void batadv_softif_init_early(struct net_device *dev)</div><div class='add'>+static void batadv_meshif_init_early(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ether_setup(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;batadv_netdev_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='del'>-	dev-&gt;priv_destructor = batadv_softif_free;</div><div class='del'>-	dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL;</div><div class='add'>+	dev-&gt;priv_destructor = batadv_meshif_free;</div><div class='add'>+	dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='ctx'> 	/* can't call min_mtu, because the needed variables</div><div class='ctx'> 	 * have not been initialized yet</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev-&gt;mtu = ETH_DATA_LEN;</div><div class='add'>+	dev-&gt;max_mtu = BATADV_MAX_MTU;</div><div class='ctx'> </div><div class='ctx'> 	/* generate random address */</div><div class='ctx'> 	eth_hw_addr_random(dev);</div><div class='hunk'>@@ -1076,96 +1024,92 @@ static void batadv_softif_init_early(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_create() - Create and register soft interface</div><div class='del'>- * @net: the applicable net namespace</div><div class='del'>- * @name: name of the new soft interface</div><div class='add'>+ * batadv_meshif_validate() - validate configuration of new batadv link</div><div class='add'>+ * @tb: IFLA_INFO_DATA netlink attributes</div><div class='add'>+ * @data: enum batadv_ifla_attrs attributes</div><div class='add'>+ * @extack: extended ACK report struct</div><div class='ctx'>  *</div><div class='del'>- * Return: newly allocated soft_interface, NULL on errors</div><div class='add'>+ * Return: 0 if successful or error otherwise.</div><div class='ctx'>  */</div><div class='del'>-struct net_device *batadv_softif_create(struct net *net, const char *name)</div><div class='add'>+static int batadv_meshif_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	soft_iface = alloc_netdev(sizeof(struct batadv_priv), name,</div><div class='del'>-				  NET_NAME_UNKNOWN, batadv_softif_init_early);</div><div class='del'>-	if (!soft_iface)</div><div class='del'>-		return NULL;</div><div class='add'>+	struct batadv_algo_ops *algo_ops;</div><div class='ctx'> </div><div class='del'>-	dev_net_set(soft_iface, net);</div><div class='del'>-</div><div class='del'>-	soft_iface-&gt;rtnl_link_ops = &amp;batadv_link_ops;</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = register_netdevice(soft_iface);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("Unable to register the batman interface '%s': %i\n",</div><div class='del'>-		       name, ret);</div><div class='del'>-		free_netdev(soft_iface);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (data[IFLA_BATADV_ALGO_NAME]) {</div><div class='add'>+		algo_ops = batadv_algo_get(nla_data(data[IFLA_BATADV_ALGO_NAME]));</div><div class='add'>+		if (!algo_ops)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return soft_iface;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_destroy_sysfs() - deletion of batadv_soft_interface via sysfs</div><div class='del'>- * @soft_iface: the to-be-removed batman-adv interface</div><div class='add'>+ * batadv_meshif_newlink() - pre-initialize and register new batadv link</div><div class='add'>+ * @dev: network device to register</div><div class='add'>+ * @params: rtnl newlink parameters</div><div class='add'>+ * @extack: extended ACK report struct</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful or error otherwise.</div><div class='ctx'>  */</div><div class='del'>-void batadv_softif_destroy_sysfs(struct net_device *soft_iface)</div><div class='add'>+static int batadv_meshif_newlink(struct net_device *dev,</div><div class='add'>+				 struct rtnl_newlink_params *params,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	const char *algo_name;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* destroy the "untagged" VLAN */</div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS);</div><div class='del'>-	if (vlan) {</div><div class='del'>-		batadv_softif_destroy_vlan(bat_priv, vlan);</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='add'>+	if (data &amp;&amp; data[IFLA_BATADV_ALGO_NAME]) {</div><div class='add'>+		algo_name = nla_data(data[IFLA_BATADV_ALGO_NAME]);</div><div class='add'>+		err = batadv_algo_select(bat_priv, algo_name);</div><div class='add'>+		if (err)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	batadv_sysfs_del_meshif(soft_iface);</div><div class='del'>-	unregister_netdevice(soft_iface);</div><div class='add'>+	return register_netdevice(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_destroy_netlink() - deletion of batadv_soft_interface via</div><div class='add'>+ * batadv_meshif_destroy_netlink() - deletion of batadv_mesh_interface via</div><div class='ctx'>  *  netlink</div><div class='del'>- * @soft_iface: the to-be-removed batman-adv interface</div><div class='add'>+ * @mesh_iface: the to-be-removed batman-adv interface</div><div class='ctx'>  * @head: list pointer</div><div class='ctx'>  */</div><div class='del'>-static void batadv_softif_destroy_netlink(struct net_device *soft_iface,</div><div class='add'>+static void batadv_meshif_destroy_netlink(struct net_device *mesh_iface,</div><div class='ctx'> 					  struct list_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface == soft_iface)</div><div class='del'>-			batadv_hardif_disable_interface(hard_iface,</div><div class='del'>-							BATADV_IF_CLEANUP_KEEP);</div><div class='add'>+	while (!list_empty(&amp;mesh_iface-&gt;adj_list.lower)) {</div><div class='add'>+		hard_iface = netdev_adjacent_get_private(mesh_iface-&gt;adj_list.lower.next);</div><div class='add'>+		batadv_hardif_disable_interface(hard_iface);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* destroy the "untagged" VLAN */</div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, BATADV_NO_FLAGS);</div><div class='ctx'> 	if (vlan) {</div><div class='del'>-		batadv_softif_destroy_vlan(bat_priv, vlan);</div><div class='del'>-		batadv_softif_vlan_put(vlan);</div><div class='add'>+		batadv_meshif_destroy_vlan(bat_priv, vlan);</div><div class='add'>+		batadv_meshif_vlan_put(vlan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	batadv_sysfs_del_meshif(soft_iface);</div><div class='del'>-	unregister_netdevice_queue(soft_iface, head);</div><div class='add'>+	unregister_netdevice_queue(mesh_iface, head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_softif_is_valid() - Check whether device is a batadv soft interface</div><div class='add'>+ * batadv_meshif_is_valid() - Check whether device is a batadv mesh interface</div><div class='ctx'>  * @net_dev: device which should be checked</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true when net_dev is a batman-adv interface, false otherwise</div><div class='ctx'>  */</div><div class='del'>-bool batadv_softif_is_valid(const struct net_device *net_dev)</div><div class='add'>+bool batadv_meshif_is_valid(const struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (net_dev-&gt;netdev_ops-&gt;ndo_start_xmit == batadv_interface_tx)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -1173,9 +1117,17 @@ bool batadv_softif_is_valid(const struct net_device *net_dev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nla_policy batadv_ifla_policy[IFLA_BATADV_MAX + 1] = {</div><div class='add'>+	[IFLA_BATADV_ALGO_NAME]	= { .type = NLA_NUL_STRING },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct rtnl_link_ops batadv_link_ops __read_mostly = {</div><div class='ctx'> 	.kind		= "batadv",</div><div class='ctx'> 	.priv_size	= sizeof(struct batadv_priv),</div><div class='del'>-	.setup		= batadv_softif_init_early,</div><div class='del'>-	.dellink	= batadv_softif_destroy_netlink,</div><div class='add'>+	.setup		= batadv_meshif_init_early,</div><div class='add'>+	.maxtype	= IFLA_BATADV_MAX,</div><div class='add'>+	.policy		= batadv_ifla_policy,</div><div class='add'>+	.validate	= batadv_meshif_validate,</div><div class='add'>+	.newlink	= batadv_meshif_newlink,</div><div class='add'>+	.dellink	= batadv_meshif_destroy_netlink,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/batman-adv/mesh-interface.h b/net/batman-adv/mesh-interface.h<br/>new file mode 100644<br/>index 000000000000..53756c5a45e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/mesh-interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/mesh-interface.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='add'>+ *</div><div class='add'>+ * Marek Lindner</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _NET_BATMAN_ADV_MESH_INTERFACE_H_</div><div class='add'>+#define _NET_BATMAN_ADV_MESH_INTERFACE_H_</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);</div><div class='add'>+void batadv_interface_rx(struct net_device *mesh_iface,</div><div class='add'>+			 struct sk_buff *skb, int hdr_size,</div><div class='add'>+			 struct batadv_orig_node *orig_node);</div><div class='add'>+bool batadv_meshif_is_valid(const struct net_device *net_dev);</div><div class='add'>+extern struct rtnl_link_ops batadv_link_ops;</div><div class='add'>+int batadv_meshif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid);</div><div class='add'>+void batadv_meshif_vlan_release(struct kref *ref);</div><div class='add'>+struct batadv_meshif_vlan *batadv_meshif_vlan_get(struct batadv_priv *bat_priv,</div><div class='add'>+						  unsigned short vid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_meshif_vlan_put() - decrease the vlan object refcounter and</div><div class='add'>+ *  possibly release it</div><div class='add'>+ * @vlan: the vlan object to release</div><div class='add'>+ */</div><div class='add'>+static inline void batadv_meshif_vlan_put(struct batadv_meshif_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	if (!vlan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;vlan-&gt;refcount, batadv_meshif_vlan_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _NET_BATMAN_ADV_MESH_INTERFACE_H_ */</div><div class='head'>diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c<br/>index 86725d792e15..e8c6b0bf670f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/multicast.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/multicast.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/multicast.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/multicast.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2014-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Linus Lüssing</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "multicast.h"</div><div class='hunk'>@@ -23,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -32,11 +22,10 @@</div><div class='ctx'> #include &lt;linux/igmp.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -44,10 +33,10 @@</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sprintf.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -58,15 +47,15 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "bridge_loop_avoidance.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "hash.h"</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "netlink.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='add'>+#include "send.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> #include "tvlv.h"</div><div class='ctx'> </div><div class='hunk'>@@ -74,7 +63,7 @@ static void batadv_mcast_mla_update(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_start_timer() - schedule the multicast periodic worker</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_mcast_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -83,95 +72,331 @@ static void batadv_mcast_start_timer(struct batadv_priv *bat_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_get_bridge() - get the bridge on top of the softif if it exists</div><div class='del'>- * @soft_iface: netdev struct of the mesh interface</div><div class='add'>+ * batadv_mcast_get_bridge() - get the bridge on top of the meshif if it exists</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  *</div><div class='del'>- * If the given soft interface has a bridge on top then the refcount</div><div class='add'>+ * If the given mesh interface has a bridge on top then the refcount</div><div class='ctx'>  * of the according net device is increased.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: NULL if no such bridge exists. Otherwise the net device of the</div><div class='ctx'>  * bridge.</div><div class='ctx'>  */</div><div class='del'>-static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface)</div><div class='add'>+static struct net_device *batadv_mcast_get_bridge(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *upper = soft_iface;</div><div class='add'>+	struct net_device *upper = mesh_iface;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	do {</div><div class='ctx'> 		upper = netdev_master_upper_dev_get_rcu(upper);</div><div class='del'>-	} while (upper &amp;&amp; !(upper-&gt;priv_flags &amp; IFF_EBRIDGE));</div><div class='add'>+	} while (upper &amp;&amp; !netif_is_bridge_master(upper));</div><div class='ctx'> </div><div class='del'>-	if (upper)</div><div class='del'>-		dev_hold(upper);</div><div class='add'>+	dev_hold(upper);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return upper;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_addr_is_ipv4() - check if multicast MAC is IPv4</div><div class='del'>- * @addr: the MAC address to check</div><div class='add'>+ * batadv_mcast_mla_rtr_flags_meshif_get_ipv4() - get mcast router flags from</div><div class='add'>+ *  node for IPv4</div><div class='add'>+ * @dev: the interface to check</div><div class='ctx'>  *</div><div class='del'>- * Return: True, if MAC address is one reserved for IPv4 multicast, false</div><div class='del'>- * otherwise.</div><div class='add'>+ * Checks the presence of an IPv4 multicast router on this node.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold rcu read lock.</div><div class='add'>+ *</div><div class='add'>+ * Return: BATADV_NO_FLAGS if present, BATADV_MCAST_WANT_NO_RTR4 otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_mcast_addr_is_ipv4(const u8 *addr)</div><div class='add'>+static u8 batadv_mcast_mla_rtr_flags_meshif_get_ipv4(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	static const u8 prefix[] = {0x01, 0x00, 0x5E};</div><div class='add'>+	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> </div><div class='del'>-	return memcmp(prefix, addr, sizeof(prefix)) == 0;</div><div class='add'>+	if (in_dev &amp;&amp; IN_DEV_MFORWARD(in_dev))</div><div class='add'>+		return BATADV_NO_FLAGS;</div><div class='add'>+	else</div><div class='add'>+		return BATADV_MCAST_WANT_NO_RTR4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_addr_is_ipv6() - check if multicast MAC is IPv6</div><div class='del'>- * @addr: the MAC address to check</div><div class='add'>+ * batadv_mcast_mla_rtr_flags_meshif_get_ipv6() - get mcast router flags from</div><div class='add'>+ *  node for IPv6</div><div class='add'>+ * @dev: the interface to check</div><div class='ctx'>  *</div><div class='del'>- * Return: True, if MAC address is one reserved for IPv6 multicast, false</div><div class='del'>- * otherwise.</div><div class='add'>+ * Checks the presence of an IPv6 multicast router on this node.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold rcu read lock.</div><div class='add'>+ *</div><div class='add'>+ * Return: BATADV_NO_FLAGS if present, BATADV_MCAST_WANT_NO_RTR6 otherwise.</div><div class='add'>+ */</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MROUTE)</div><div class='add'>+static u8 batadv_mcast_mla_rtr_flags_meshif_get_ipv6(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *in6_dev = __in6_dev_get(dev);</div><div class='add'>+</div><div class='add'>+	if (in6_dev &amp;&amp; atomic_read(&amp;in6_dev-&gt;cnf.mc_forwarding))</div><div class='add'>+		return BATADV_NO_FLAGS;</div><div class='add'>+	else</div><div class='add'>+		return BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline u8</div><div class='add'>+batadv_mcast_mla_rtr_flags_meshif_get_ipv6(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_rtr_flags_meshif_get() - get mcast router flags from node</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @bridge: bridge interface on top of the mesh_iface if present,</div><div class='add'>+ *  otherwise pass NULL</div><div class='add'>+ *</div><div class='add'>+ * Checks the presence of IPv4 and IPv6 multicast routers on this</div><div class='add'>+ * node.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	BATADV_NO_FLAGS: Both an IPv4 and IPv6 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR4: No IPv4 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR6: No IPv6 multicast router is present</div><div class='add'>+ *	The former two OR'd: no multicast router is present</div><div class='add'>+ */</div><div class='add'>+static u8 batadv_mcast_mla_rtr_flags_meshif_get(struct batadv_priv *bat_priv,</div><div class='add'>+						struct net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bridge ? bridge : bat_priv-&gt;mesh_iface;</div><div class='add'>+	u8 flags = BATADV_NO_FLAGS;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	flags |= batadv_mcast_mla_rtr_flags_meshif_get_ipv4(dev);</div><div class='add'>+	flags |= batadv_mcast_mla_rtr_flags_meshif_get_ipv6(dev);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_rtr_flags_bridge_get() - get mcast router flags from bridge</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @bridge: bridge interface on top of the mesh_iface if present,</div><div class='add'>+ *  otherwise pass NULL</div><div class='add'>+ *</div><div class='add'>+ * Checks the presence of IPv4 and IPv6 multicast routers behind a bridge.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	BATADV_NO_FLAGS: Both an IPv4 and IPv6 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR4: No IPv4 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR6: No IPv6 multicast router is present</div><div class='add'>+ *	The former two OR'd: no multicast router is present</div><div class='add'>+ */</div><div class='add'>+static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv,</div><div class='add'>+						struct net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bat_priv-&gt;mesh_iface;</div><div class='add'>+	u8 flags = BATADV_NO_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (!bridge)</div><div class='add'>+		return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+</div><div class='add'>+	if (!br_multicast_has_router_adjacent(dev, ETH_P_IP))</div><div class='add'>+		flags |= BATADV_MCAST_WANT_NO_RTR4;</div><div class='add'>+	if (!br_multicast_has_router_adjacent(dev, ETH_P_IPV6))</div><div class='add'>+		flags |= BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_rtr_flags_get() - get multicast router flags</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @bridge: bridge interface on top of the mesh_iface if present,</div><div class='add'>+ *  otherwise pass NULL</div><div class='add'>+ *</div><div class='add'>+ * Checks the presence of IPv4 and IPv6 multicast routers on this</div><div class='add'>+ * node or behind its bridge.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	BATADV_NO_FLAGS: Both an IPv4 and IPv6 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR4: No IPv4 multicast router is present</div><div class='add'>+ *	BATADV_MCAST_WANT_NO_RTR6: No IPv6 multicast router is present</div><div class='add'>+ *	The former two OR'd: no multicast router is present</div><div class='add'>+ */</div><div class='add'>+static u8 batadv_mcast_mla_rtr_flags_get(struct batadv_priv *bat_priv,</div><div class='add'>+					 struct net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	u8 flags = BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+</div><div class='add'>+	flags &amp;= batadv_mcast_mla_rtr_flags_meshif_get(bat_priv, bridge);</div><div class='add'>+	flags &amp;= batadv_mcast_mla_rtr_flags_bridge_get(bat_priv, bridge);</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_forw_flags_get() - get multicast forwarding flags</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ *</div><div class='add'>+ * Checks if all active hard interfaces have an MTU larger or equal to 1280</div><div class='add'>+ * bytes (IPv6 minimum MTU).</div><div class='add'>+ *</div><div class='add'>+ * Return: BATADV_MCAST_HAVE_MC_PTYPE_CAPA if yes, BATADV_NO_FLAGS otherwise.</div><div class='add'>+ */</div><div class='add'>+static u8 batadv_mcast_mla_forw_flags_get(struct batadv_priv *bat_priv)</div><div class='add'>+{</div><div class='add'>+	const struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='add'>+		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (hard_iface-&gt;net_dev-&gt;mtu &lt; IPV6_MIN_MTU) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return BATADV_NO_FLAGS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return BATADV_MCAST_HAVE_MC_PTYPE_CAPA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_flags_get() - get the new multicast flags</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ *</div><div class='add'>+ * Return: A set of flags for the current/next TVLV, querier and</div><div class='add'>+ * bridge state.</div><div class='add'>+ */</div><div class='add'>+static struct batadv_mcast_mla_flags</div><div class='add'>+batadv_mcast_mla_flags_get(struct batadv_priv *bat_priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bat_priv-&gt;mesh_iface;</div><div class='add'>+	struct batadv_mcast_querier_state *qr4, *qr6;</div><div class='add'>+	struct batadv_mcast_mla_flags mla_flags;</div><div class='add'>+	struct net_device *bridge;</div><div class='add'>+</div><div class='add'>+	bridge = batadv_mcast_get_bridge(dev);</div><div class='add'>+</div><div class='add'>+	memset(&amp;mla_flags, 0, sizeof(mla_flags));</div><div class='add'>+	mla_flags.enabled = 1;</div><div class='add'>+	mla_flags.tvlv_flags |= batadv_mcast_mla_rtr_flags_get(bat_priv,</div><div class='add'>+							       bridge);</div><div class='add'>+	mla_flags.tvlv_flags |= batadv_mcast_mla_forw_flags_get(bat_priv);</div><div class='add'>+</div><div class='add'>+	if (!bridge)</div><div class='add'>+		return mla_flags;</div><div class='add'>+</div><div class='add'>+	dev_put(bridge);</div><div class='add'>+</div><div class='add'>+	mla_flags.bridged = 1;</div><div class='add'>+	qr4 = &amp;mla_flags.querier_ipv4;</div><div class='add'>+	qr6 = &amp;mla_flags.querier_ipv6;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING))</div><div class='add'>+		pr_warn_once("No bridge IGMP snooping compiled - multicast optimizations disabled\n");</div><div class='add'>+</div><div class='add'>+	qr4-&gt;exists = br_multicast_has_querier_anywhere(dev, ETH_P_IP);</div><div class='add'>+	qr4-&gt;shadowing = br_multicast_has_querier_adjacent(dev, ETH_P_IP);</div><div class='add'>+</div><div class='add'>+	qr6-&gt;exists = br_multicast_has_querier_anywhere(dev, ETH_P_IPV6);</div><div class='add'>+	qr6-&gt;shadowing = br_multicast_has_querier_adjacent(dev, ETH_P_IPV6);</div><div class='add'>+</div><div class='add'>+	mla_flags.tvlv_flags |= BATADV_MCAST_WANT_ALL_UNSNOOPABLES;</div><div class='add'>+</div><div class='add'>+	/* 1) If no querier exists at all, then multicast listeners on</div><div class='add'>+	 *    our local TT clients behind the bridge will keep silent.</div><div class='add'>+	 * 2) If the selected querier is on one of our local TT clients,</div><div class='add'>+	 *    behind the bridge, then this querier might shadow multicast</div><div class='add'>+	 *    listeners on our local TT clients, behind this bridge.</div><div class='add'>+	 *</div><div class='add'>+	 * In both cases, we will signalize other batman nodes that</div><div class='add'>+	 * we need all multicast traffic of the according protocol.</div><div class='add'>+	 */</div><div class='add'>+	if (!qr4-&gt;exists || qr4-&gt;shadowing) {</div><div class='add'>+		mla_flags.tvlv_flags |= BATADV_MCAST_WANT_ALL_IPV4;</div><div class='add'>+		mla_flags.tvlv_flags &amp;= ~BATADV_MCAST_WANT_NO_RTR4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!qr6-&gt;exists || qr6-&gt;shadowing) {</div><div class='add'>+		mla_flags.tvlv_flags |= BATADV_MCAST_WANT_ALL_IPV6;</div><div class='add'>+		mla_flags.tvlv_flags &amp;= ~BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mla_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_is_duplicate() - check whether an address is in a list</div><div class='add'>+ * @mcast_addr: the multicast address to check</div><div class='add'>+ * @mcast_list: the list with multicast addresses to search in</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the given address is already in the given list.</div><div class='add'>+ * Otherwise returns false.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_mcast_addr_is_ipv6(const u8 *addr)</div><div class='add'>+static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr,</div><div class='add'>+					  struct hlist_head *mcast_list)</div><div class='ctx'> {</div><div class='del'>-	static const u8 prefix[] = {0x33, 0x33};</div><div class='add'>+	struct batadv_hw_addr *mcast_entry;</div><div class='ctx'> </div><div class='del'>-	return memcmp(prefix, addr, sizeof(prefix)) == 0;</div><div class='add'>+	hlist_for_each_entry(mcast_entry, mcast_list, list)</div><div class='add'>+		if (batadv_compare_eth(mcast_entry-&gt;addr, mcast_addr))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_mla_softif_get() - get softif multicast listeners</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_mcast_mla_meshif_get_ipv4() - get meshif IPv4 multicast listeners</div><div class='ctx'>  * @dev: the device to collect multicast addresses from</div><div class='ctx'>  * @mcast_list: a list to put found addresses into</div><div class='add'>+ * @flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='del'>- * Collects multicast addresses of multicast listeners residing</div><div class='del'>- * on this kernel on the given soft interface, dev, in</div><div class='add'>+ * Collects multicast addresses of IPv4 multicast listeners residing</div><div class='add'>+ * on this kernel on the given mesh interface, dev, in</div><div class='ctx'>  * the given mcast_list. In general, multicast listeners provided by</div><div class='ctx'>  * your multicast receiving applications run directly on this node.</div><div class='ctx'>  *</div><div class='del'>- * If there is a bridge interface on top of dev, collects from that one</div><div class='del'>- * instead. Just like with IP addresses and routes, multicast listeners</div><div class='del'>- * will(/should) register to the bridge interface instead of an</div><div class='del'>- * enslaved bat0.</div><div class='del'>- *</div><div class='ctx'>  * Return: -ENOMEM on memory allocation error or the number of</div><div class='ctx'>  * items added to the mcast_list otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int batadv_mcast_mla_softif_get(struct batadv_priv *bat_priv,</div><div class='del'>-				       struct net_device *dev,</div><div class='del'>-				       struct hlist_head *mcast_list)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_mla_meshif_get_ipv4(struct net_device *dev,</div><div class='add'>+				 struct hlist_head *mcast_list,</div><div class='add'>+				 struct batadv_mcast_mla_flags *flags)</div><div class='ctx'> {</div><div class='del'>-	bool all_ipv4 = bat_priv-&gt;mcast.flags &amp; BATADV_MCAST_WANT_ALL_IPV4;</div><div class='del'>-	bool all_ipv6 = bat_priv-&gt;mcast.flags &amp; BATADV_MCAST_WANT_ALL_IPV6;</div><div class='del'>-	struct net_device *bridge = batadv_mcast_get_bridge(dev);</div><div class='del'>-	struct netdev_hw_addr *mc_list_entry;</div><div class='ctx'> 	struct batadv_hw_addr *new;</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	u8 mcast_addr[ETH_ALEN];</div><div class='add'>+	struct ip_mc_list *pmc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	netif_addr_lock_bh(bridge ? bridge : dev);</div><div class='del'>-	netdev_for_each_mc_addr(mc_list_entry, bridge ? bridge : dev) {</div><div class='del'>-		if (all_ipv4 &amp;&amp; batadv_mcast_addr_is_ipv4(mc_list_entry-&gt;addr))</div><div class='add'>+	if (flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_ALL_IPV4)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	if (!in_dev) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pmc = rcu_dereference(in_dev-&gt;mc_list); pmc;</div><div class='add'>+	     pmc = rcu_dereference(pmc-&gt;next_rcu)) {</div><div class='add'>+		if (flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES &amp;&amp;</div><div class='add'>+		    ipv4_is_local_multicast(pmc-&gt;multiaddr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_NO_RTR4) &amp;&amp;</div><div class='add'>+		    !ipv4_is_local_multicast(pmc-&gt;multiaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (all_ipv6 &amp;&amp; batadv_mcast_addr_is_ipv6(mc_list_entry-&gt;addr))</div><div class='add'>+		ip_eth_mc_map(pmc-&gt;multiaddr, mcast_addr);</div><div class='add'>+</div><div class='add'>+		if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		new = kmalloc(sizeof(*new), GFP_ATOMIC);</div><div class='hunk'>@@ -180,36 +405,141 @@ static int batadv_mcast_mla_softif_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ether_addr_copy(new-&gt;addr, mc_list_entry-&gt;addr);</div><div class='add'>+		ether_addr_copy(new-&gt;addr, mcast_addr);</div><div class='ctx'> 		hlist_add_head(&amp;new-&gt;list, mcast_list);</div><div class='ctx'> 		ret++;</div><div class='ctx'> 	}</div><div class='del'>-	netif_addr_unlock_bh(bridge ? bridge : dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (bridge)</div><div class='del'>-		dev_put(bridge);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_mla_meshif_get_ipv6() - get meshif IPv6 multicast listeners</div><div class='add'>+ * @dev: the device to collect multicast addresses from</div><div class='add'>+ * @mcast_list: a list to put found addresses into</div><div class='add'>+ * @flags: flags indicating the new multicast state</div><div class='add'>+ *</div><div class='add'>+ * Collects multicast addresses of IPv6 multicast listeners residing</div><div class='add'>+ * on this kernel on the given mesh interface, dev, in</div><div class='add'>+ * the given mcast_list. In general, multicast listeners provided by</div><div class='add'>+ * your multicast receiving applications run directly on this node.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM on memory allocation error or the number of</div><div class='add'>+ * items added to the mcast_list otherwise.</div><div class='add'>+ */</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_mla_meshif_get_ipv6(struct net_device *dev,</div><div class='add'>+				 struct hlist_head *mcast_list,</div><div class='add'>+				 struct batadv_mcast_mla_flags *flags)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hw_addr *new;</div><div class='add'>+	struct inet6_dev *in6_dev;</div><div class='add'>+	u8 mcast_addr[ETH_ALEN];</div><div class='add'>+	struct ifmcaddr6 *pmc6;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_ALL_IPV6)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	in6_dev = __in6_dev_get(dev);</div><div class='add'>+	if (!in6_dev) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pmc6 = rcu_dereference(in6_dev-&gt;mc_list);</div><div class='add'>+	     pmc6;</div><div class='add'>+	     pmc6 = rcu_dereference(pmc6-&gt;next)) {</div><div class='add'>+		if (IPV6_ADDR_MC_SCOPE(&amp;pmc6-&gt;mca_addr) &lt;</div><div class='add'>+		    IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES &amp;&amp;</div><div class='add'>+		    ipv6_addr_is_ll_all_nodes(&amp;pmc6-&gt;mca_addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(flags-&gt;tvlv_flags &amp; BATADV_MCAST_WANT_NO_RTR6) &amp;&amp;</div><div class='add'>+		    IPV6_ADDR_MC_SCOPE(&amp;pmc6-&gt;mca_addr) &gt;</div><div class='add'>+		    IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ipv6_eth_mc_map(&amp;pmc6-&gt;mca_addr, mcast_addr);</div><div class='add'>+</div><div class='add'>+		if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		new = kmalloc(sizeof(*new), GFP_ATOMIC);</div><div class='add'>+		if (!new) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(new-&gt;addr, mcast_addr);</div><div class='add'>+		hlist_add_head(&amp;new-&gt;list, mcast_list);</div><div class='add'>+		ret++;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+batadv_mcast_mla_meshif_get_ipv6(struct net_device *dev,</div><div class='add'>+				 struct hlist_head *mcast_list,</div><div class='add'>+				 struct batadv_mcast_mla_flags *flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_mla_is_duplicate() - check whether an address is in a list</div><div class='del'>- * @mcast_addr: the multicast address to check</div><div class='del'>- * @mcast_list: the list with multicast addresses to search in</div><div class='add'>+ * batadv_mcast_mla_meshif_get() - get meshif multicast listeners</div><div class='add'>+ * @dev: the device to collect multicast addresses from</div><div class='add'>+ * @mcast_list: a list to put found addresses into</div><div class='add'>+ * @flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='del'>- * Return: true if the given address is already in the given list.</div><div class='del'>- * Otherwise returns false.</div><div class='add'>+ * Collects multicast addresses of multicast listeners residing</div><div class='add'>+ * on this kernel on the given mesh interface, dev, in</div><div class='add'>+ * the given mcast_list. In general, multicast listeners provided by</div><div class='add'>+ * your multicast receiving applications run directly on this node.</div><div class='add'>+ *</div><div class='add'>+ * If there is a bridge interface on top of dev, collect from that one</div><div class='add'>+ * instead. Just like with IP addresses and routes, multicast listeners</div><div class='add'>+ * will(/should) register to the bridge interface instead of an</div><div class='add'>+ * enslaved bat0.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM on memory allocation error or the number of</div><div class='add'>+ * items added to the mcast_list otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr,</div><div class='del'>-					  struct hlist_head *mcast_list)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_mla_meshif_get(struct net_device *dev,</div><div class='add'>+			    struct hlist_head *mcast_list,</div><div class='add'>+			    struct batadv_mcast_mla_flags *flags)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_hw_addr *mcast_entry;</div><div class='add'>+	struct net_device *bridge = batadv_mcast_get_bridge(dev);</div><div class='add'>+	int ret4, ret6 = 0;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry(mcast_entry, mcast_list, list)</div><div class='del'>-		if (batadv_compare_eth(mcast_entry-&gt;addr, mcast_addr))</div><div class='del'>-			return true;</div><div class='add'>+	if (bridge)</div><div class='add'>+		dev = bridge;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	ret4 = batadv_mcast_mla_meshif_get_ipv4(dev, mcast_list, flags);</div><div class='add'>+	if (ret4 &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret6 = batadv_mcast_mla_meshif_get_ipv6(dev, mcast_list, flags);</div><div class='add'>+	if (ret6 &lt; 0) {</div><div class='add'>+		ret4 = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dev_put(bridge);</div><div class='add'>+</div><div class='add'>+	return ret4 + ret6;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -227,10 +557,10 @@ static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr,</div><div class='ctx'> static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src)</div><div class='ctx'> {</div><div class='ctx'> 	if (src-&gt;proto == htons(ETH_P_IP))</div><div class='del'>-		ip_eth_mc_map(src-&gt;u.ip4, dst);</div><div class='add'>+		ip_eth_mc_map(src-&gt;dst.ip4, dst);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	else if (src-&gt;proto == htons(ETH_P_IPV6))</div><div class='del'>-		ipv6_eth_mc_map(&amp;src-&gt;u.ip6, dst);</div><div class='add'>+		ipv6_eth_mc_map(&amp;src-&gt;dst.ip6, dst);</div><div class='ctx'> #endif</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_zero_addr(dst);</div><div class='hunk'>@@ -238,26 +568,25 @@ static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_mla_bridge_get() - get bridged-in multicast listeners</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='ctx'>  * @dev: a bridge slave whose bridge to collect multicast addresses from</div><div class='ctx'>  * @mcast_list: a list to put found addresses into</div><div class='add'>+ * @flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * Collects multicast addresses of multicast listeners residing</div><div class='ctx'>  * on foreign, non-mesh devices which we gave access to our mesh via</div><div class='del'>- * a bridge on top of the given soft interface, dev, in the given</div><div class='add'>+ * a bridge on top of the given mesh interface, dev, in the given</div><div class='ctx'>  * mcast_list.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -ENOMEM on memory allocation error or the number of</div><div class='ctx'>  * items added to the mcast_list otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int batadv_mcast_mla_bridge_get(struct batadv_priv *bat_priv,</div><div class='del'>-				       struct net_device *dev,</div><div class='del'>-				       struct hlist_head *mcast_list)</div><div class='add'>+static int batadv_mcast_mla_bridge_get(struct net_device *dev,</div><div class='add'>+				       struct hlist_head *mcast_list,</div><div class='add'>+				       struct batadv_mcast_mla_flags *flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list);</div><div class='del'>-	bool all_ipv4 = bat_priv-&gt;mcast.flags &amp; BATADV_MCAST_WANT_ALL_IPV4;</div><div class='del'>-	bool all_ipv6 = bat_priv-&gt;mcast.flags &amp; BATADV_MCAST_WANT_ALL_IPV6;</div><div class='ctx'> 	struct br_ip_list *br_ip_entry, *tmp;</div><div class='add'>+	u8 tvlv_flags = flags-&gt;tvlv_flags;</div><div class='ctx'> 	struct batadv_hw_addr *new;</div><div class='ctx'> 	u8 mcast_addr[ETH_ALEN];</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -270,11 +599,34 @@ static int batadv_mcast_mla_bridge_get(struct batadv_priv *bat_priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(br_ip_entry, &amp;bridge_mcast_list, list) {</div><div class='del'>-		if (all_ipv4 &amp;&amp; br_ip_entry-&gt;addr.proto == htons(ETH_P_IP))</div><div class='del'>-			continue;</div><div class='add'>+		if (br_ip_entry-&gt;addr.proto == htons(ETH_P_IP)) {</div><div class='add'>+			if (tvlv_flags &amp; BATADV_MCAST_WANT_ALL_IPV4)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		if (all_ipv6 &amp;&amp; br_ip_entry-&gt;addr.proto == htons(ETH_P_IPV6))</div><div class='del'>-			continue;</div><div class='add'>+			if (tvlv_flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES &amp;&amp;</div><div class='add'>+			    ipv4_is_local_multicast(br_ip_entry-&gt;addr.dst.ip4))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!(tvlv_flags &amp; BATADV_MCAST_WANT_NO_RTR4) &amp;&amp;</div><div class='add'>+			    !ipv4_is_local_multicast(br_ip_entry-&gt;addr.dst.ip4))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		if (br_ip_entry-&gt;addr.proto == htons(ETH_P_IPV6)) {</div><div class='add'>+			if (tvlv_flags &amp; BATADV_MCAST_WANT_ALL_IPV6)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (tvlv_flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES &amp;&amp;</div><div class='add'>+			    ipv6_addr_is_ll_all_nodes(&amp;br_ip_entry-&gt;addr.dst.ip6))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!(tvlv_flags &amp; BATADV_MCAST_WANT_NO_RTR6) &amp;&amp;</div><div class='add'>+			    IPV6_ADDR_MC_SCOPE(&amp;br_ip_entry-&gt;addr.dst.ip6) &gt;</div><div class='add'>+			    IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 		batadv_mcast_mla_br_addr_cpy(mcast_addr, &amp;br_ip_entry-&gt;addr);</div><div class='ctx'> 		if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list))</div><div class='hunk'>@@ -318,15 +670,13 @@ static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_mla_tt_retract() - clean up multicast listener announcements</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @mcast_list: a list of addresses which should _not_ be removed</div><div class='ctx'>  *</div><div class='ctx'>  * Retracts the announcement of any multicast listener from the</div><div class='ctx'>  * translation table except the ones listed in the given mcast_list.</div><div class='ctx'>  *</div><div class='ctx'>  * If mcast_list is NULL then all are retracted.</div><div class='del'>- *</div><div class='del'>- * Do not call outside of the mcast worker! (or cancel mcast worker first)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,</div><div class='ctx'> 					struct hlist_head *mcast_list)</div><div class='hunk'>@@ -334,8 +684,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_hw_addr *mcast_entry;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(delayed_work_pending(&amp;bat_priv-&gt;mcast.work));</div><div class='del'>-</div><div class='ctx'> 	hlist_for_each_entry_safe(mcast_entry, tmp, &amp;bat_priv-&gt;mcast.mla_list,</div><div class='ctx'> 				  list) {</div><div class='ctx'> 		if (mcast_list &amp;&amp;</div><div class='hunk'>@@ -354,13 +702,11 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_mla_tt_add() - add multicast listener announcements</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @mcast_list: a list of addresses which are going to get added</div><div class='ctx'>  *</div><div class='ctx'>  * Adds multicast listener announcements from the given mcast_list to the</div><div class='ctx'>  * translation table if they have not been added yet.</div><div class='del'>- *</div><div class='del'>- * Do not call outside of the mcast worker! (or cancel mcast worker first)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,</div><div class='ctx'> 				    struct hlist_head *mcast_list)</div><div class='hunk'>@@ -368,8 +714,6 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_hw_addr *mcast_entry;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(delayed_work_pending(&amp;bat_priv-&gt;mcast.work));</div><div class='del'>-</div><div class='ctx'> 	if (!mcast_list)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -378,7 +722,7 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,</div><div class='ctx'> 						  &amp;bat_priv-&gt;mcast.mla_list))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!batadv_tt_local_add(bat_priv-&gt;soft_iface,</div><div class='add'>+		if (!batadv_tt_local_add(bat_priv-&gt;mesh_iface,</div><div class='ctx'> 					 mcast_entry-&gt;addr, BATADV_NO_FLAGS,</div><div class='ctx'> 					 BATADV_NULL_IFINDEX, BATADV_NO_MARK))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -389,30 +733,9 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_has_bridge() - check whether the soft-iface is bridged</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- *</div><div class='del'>- * Checks whether there is a bridge on top of our soft interface.</div><div class='del'>- *</div><div class='del'>- * Return: true if there is a bridge, false otherwise.</div><div class='del'>- */</div><div class='del'>-static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *upper = bat_priv-&gt;soft_iface;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	do {</div><div class='del'>-		upper = netdev_master_upper_dev_get_rcu(upper);</div><div class='del'>-	} while (upper &amp;&amp; !(upper-&gt;priv_flags &amp; IFF_EBRIDGE));</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return upper;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_mcast_querier_log() - debug output regarding the querier status on</div><div class='ctx'>  *  link</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @str_proto: a string for the querier protocol (e.g. "IGMP" or "MLD")</div><div class='ctx'>  * @old_state: the previous querier state on our link</div><div class='ctx'>  * @new_state: the new querier state on our link</div><div class='hunk'>@@ -429,7 +752,7 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv)</div><div class='ctx'>  * potentially shadowing listeners from us then.</div><div class='ctx'>  *</div><div class='ctx'>  * This is only interesting for nodes with a bridge on top of their</div><div class='del'>- * soft interface.</div><div class='add'>+ * mesh interface.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> batadv_mcast_querier_log(struct batadv_priv *bat_priv, char *str_proto,</div><div class='hunk'>@@ -437,14 +760,14 @@ batadv_mcast_querier_log(struct batadv_priv *bat_priv, char *str_proto,</div><div class='ctx'> 			 struct batadv_mcast_querier_state *new_state)</div><div class='ctx'> {</div><div class='ctx'> 	if (!old_state-&gt;exists &amp;&amp; new_state-&gt;exists)</div><div class='del'>-		batadv_info(bat_priv-&gt;soft_iface, "%s Querier appeared\n",</div><div class='add'>+		batadv_info(bat_priv-&gt;mesh_iface, "%s Querier appeared\n",</div><div class='ctx'> 			    str_proto);</div><div class='ctx'> 	else if (old_state-&gt;exists &amp;&amp; !new_state-&gt;exists)</div><div class='del'>-		batadv_info(bat_priv-&gt;soft_iface,</div><div class='add'>+		batadv_info(bat_priv-&gt;mesh_iface,</div><div class='ctx'> 			    "%s Querier disappeared - multicast optimizations disabled\n",</div><div class='ctx'> 			    str_proto);</div><div class='del'>-	else if (!bat_priv-&gt;mcast.bridged &amp;&amp; !new_state-&gt;exists)</div><div class='del'>-		batadv_info(bat_priv-&gt;soft_iface,</div><div class='add'>+	else if (!bat_priv-&gt;mcast.mla_flags.bridged &amp;&amp; !new_state-&gt;exists)</div><div class='add'>+		batadv_info(bat_priv-&gt;mesh_iface,</div><div class='ctx'> 			    "No %s Querier present - multicast optimizations disabled\n",</div><div class='ctx'> 			    str_proto);</div><div class='ctx'> </div><div class='hunk'>@@ -464,10 +787,8 @@ batadv_mcast_querier_log(struct batadv_priv *bat_priv, char *str_proto,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_bridge_log() - debug output for topology changes in bridged</div><div class='ctx'>  *  setups</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @bridged: a flag about whether the soft interface is currently bridged or not</div><div class='del'>- * @querier_ipv4: (maybe) new status of a potential, selected IGMP querier</div><div class='del'>- * @querier_ipv6: (maybe) new status of a potential, selected MLD querier</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @new_flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * If no bridges are ever used on this node, then this function does nothing.</div><div class='ctx'>  *</div><div class='hunk'>@@ -475,136 +796,98 @@ batadv_mcast_querier_log(struct batadv_priv *bat_priv, char *str_proto,</div><div class='ctx'>  * which might be relevant to our multicast optimizations.</div><div class='ctx'>  *</div><div class='ctx'>  * More precisely, it outputs information when a bridge interface is added or</div><div class='del'>- * removed from a soft interface. And when a bridge is present, it further</div><div class='add'>+ * removed from a mesh interface. And when a bridge is present, it further</div><div class='ctx'>  * outputs information about the querier state which is relevant for the</div><div class='ctx'>  * multicast flags this node is going to set.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-batadv_mcast_bridge_log(struct batadv_priv *bat_priv, bool bridged,</div><div class='del'>-			struct batadv_mcast_querier_state *querier_ipv4,</div><div class='del'>-			struct batadv_mcast_querier_state *querier_ipv6)</div><div class='add'>+batadv_mcast_bridge_log(struct batadv_priv *bat_priv,</div><div class='add'>+			struct batadv_mcast_mla_flags *new_flags)</div><div class='ctx'> {</div><div class='del'>-	if (!bat_priv-&gt;mcast.bridged &amp;&amp; bridged)</div><div class='add'>+	struct batadv_mcast_mla_flags *old_flags = &amp;bat_priv-&gt;mcast.mla_flags;</div><div class='add'>+</div><div class='add'>+	if (!old_flags-&gt;bridged &amp;&amp; new_flags-&gt;bridged)</div><div class='ctx'> 		batadv_dbg(BATADV_DBG_MCAST, bat_priv,</div><div class='ctx'> 			   "Bridge added: Setting Unsnoopables(U)-flag\n");</div><div class='del'>-	else if (bat_priv-&gt;mcast.bridged &amp;&amp; !bridged)</div><div class='add'>+	else if (old_flags-&gt;bridged &amp;&amp; !new_flags-&gt;bridged)</div><div class='ctx'> 		batadv_dbg(BATADV_DBG_MCAST, bat_priv,</div><div class='ctx'> 			   "Bridge removed: Unsetting Unsnoopables(U)-flag\n");</div><div class='ctx'> </div><div class='del'>-	if (bridged) {</div><div class='add'>+	if (new_flags-&gt;bridged) {</div><div class='ctx'> 		batadv_mcast_querier_log(bat_priv, "IGMP",</div><div class='del'>-					 &amp;bat_priv-&gt;mcast.querier_ipv4,</div><div class='del'>-					 querier_ipv4);</div><div class='add'>+					 &amp;old_flags-&gt;querier_ipv4,</div><div class='add'>+					 &amp;new_flags-&gt;querier_ipv4);</div><div class='ctx'> 		batadv_mcast_querier_log(bat_priv, "MLD",</div><div class='del'>-					 &amp;bat_priv-&gt;mcast.querier_ipv6,</div><div class='del'>-					 querier_ipv6);</div><div class='add'>+					 &amp;old_flags-&gt;querier_ipv6,</div><div class='add'>+					 &amp;new_flags-&gt;querier_ipv6);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_flags_logs() - output debug information about mcast flag changes</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @flags: flags indicating the new multicast state</div><div class='add'>+ * batadv_mcast_flags_log() - output debug information about mcast flag changes</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @flags: TVLV flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='del'>- * Whenever the multicast flags this nodes announces changes (@mcast_flags vs.</div><div class='del'>- * bat_priv-&gt;mcast.flags), this notifies userspace via the 'mcast' log level.</div><div class='add'>+ * Whenever the multicast TVLV flags this node announces change, this function</div><div class='add'>+ * should be used to notify userspace about the change.</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_mcast_flags_log(struct batadv_priv *bat_priv, u8 flags)</div><div class='ctx'> {</div><div class='del'>-	u8 old_flags = bat_priv-&gt;mcast.flags;</div><div class='del'>-	char str_old_flags[] = "[...]";</div><div class='add'>+	bool old_enabled = bat_priv-&gt;mcast.mla_flags.enabled;</div><div class='add'>+	u8 old_flags = bat_priv-&gt;mcast.mla_flags.tvlv_flags;</div><div class='add'>+	char str_old_flags[] = "[.... . .]";</div><div class='ctx'> </div><div class='del'>-	sprintf(str_old_flags, "[%c%c%c]",</div><div class='add'>+	sprintf(str_old_flags, "[%c%c%c%s%s%c]",</div><div class='ctx'> 		(old_flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES) ? 'U' : '.',</div><div class='ctx'> 		(old_flags &amp; BATADV_MCAST_WANT_ALL_IPV4) ? '4' : '.',</div><div class='del'>-		(old_flags &amp; BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.');</div><div class='add'>+		(old_flags &amp; BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.',</div><div class='add'>+		!(old_flags &amp; BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ",</div><div class='add'>+		!(old_flags &amp; BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ",</div><div class='add'>+		!(old_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.');</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_MCAST, bat_priv,</div><div class='del'>-		   "Changing multicast flags from '%s' to '[%c%c%c]'\n",</div><div class='del'>-		   bat_priv-&gt;mcast.enabled ? str_old_flags : "&lt;undefined&gt;",</div><div class='add'>+		   "Changing multicast flags from '%s' to '[%c%c%c%s%s%c]'\n",</div><div class='add'>+		   old_enabled ? str_old_flags : "&lt;undefined&gt;",</div><div class='ctx'> 		   (flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES) ? 'U' : '.',</div><div class='ctx'> 		   (flags &amp; BATADV_MCAST_WANT_ALL_IPV4) ? '4' : '.',</div><div class='del'>-		   (flags &amp; BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.');</div><div class='add'>+		   (flags &amp; BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.',</div><div class='add'>+		   !(flags &amp; BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ",</div><div class='add'>+		   !(flags &amp; BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ",</div><div class='add'>+		   !(flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_mla_tvlv_update() - update multicast tvlv</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_mcast_mla_flags_update() - update multicast flags</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the own multicast tvlv with our current multicast related settings,</div><div class='ctx'>  * capabilities and inabilities.</div><div class='del'>- *</div><div class='del'>- * Return: false if we want all IPv4 &amp;&amp; IPv6 multicast traffic and true</div><div class='del'>- * otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv)</div><div class='add'>+static void</div><div class='add'>+batadv_mcast_mla_flags_update(struct batadv_priv *bat_priv,</div><div class='add'>+			      struct batadv_mcast_mla_flags *flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tvlv_mcast_data mcast_data;</div><div class='del'>-	struct batadv_mcast_querier_state querier4 = {false, false};</div><div class='del'>-	struct batadv_mcast_querier_state querier6 = {false, false};</div><div class='del'>-	struct net_device *dev = bat_priv-&gt;soft_iface;</div><div class='del'>-	bool bridged;</div><div class='del'>-</div><div class='del'>-	mcast_data.flags = BATADV_NO_FLAGS;</div><div class='del'>-	memset(mcast_data.reserved, 0, sizeof(mcast_data.reserved));</div><div class='del'>-</div><div class='del'>-	bridged = batadv_mcast_has_bridge(bat_priv);</div><div class='del'>-	if (!bridged)</div><div class='del'>-		goto update;</div><div class='del'>-</div><div class='del'>-	if (!IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING))</div><div class='del'>-		pr_warn_once("No bridge IGMP snooping compiled - multicast optimizations disabled\n");</div><div class='del'>-</div><div class='del'>-	querier4.exists = br_multicast_has_querier_anywhere(dev, ETH_P_IP);</div><div class='del'>-	querier4.shadowing = br_multicast_has_querier_adjacent(dev, ETH_P_IP);</div><div class='del'>-</div><div class='del'>-	querier6.exists = br_multicast_has_querier_anywhere(dev, ETH_P_IPV6);</div><div class='del'>-	querier6.shadowing = br_multicast_has_querier_adjacent(dev, ETH_P_IPV6);</div><div class='del'>-</div><div class='del'>-	mcast_data.flags |= BATADV_MCAST_WANT_ALL_UNSNOOPABLES;</div><div class='del'>-</div><div class='del'>-	/* 1) If no querier exists at all, then multicast listeners on</div><div class='del'>-	 *    our local TT clients behind the bridge will keep silent.</div><div class='del'>-	 * 2) If the selected querier is on one of our local TT clients,</div><div class='del'>-	 *    behind the bridge, then this querier might shadow multicast</div><div class='del'>-	 *    listeners on our local TT clients, behind this bridge.</div><div class='del'>-	 *</div><div class='del'>-	 * In both cases, we will signalize other batman nodes that</div><div class='del'>-	 * we need all multicast traffic of the according protocol.</div><div class='del'>-	 */</div><div class='del'>-	if (!querier4.exists || querier4.shadowing)</div><div class='del'>-		mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV4;</div><div class='del'>-</div><div class='del'>-	if (!querier6.exists || querier6.shadowing)</div><div class='del'>-		mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV6;</div><div class='ctx'> </div><div class='del'>-update:</div><div class='del'>-	batadv_mcast_bridge_log(bat_priv, bridged, &amp;querier4, &amp;querier6);</div><div class='add'>+	if (!memcmp(flags, &amp;bat_priv-&gt;mcast.mla_flags, sizeof(*flags)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv4.exists = querier4.exists;</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv4.shadowing = querier4.shadowing;</div><div class='add'>+	batadv_mcast_bridge_log(bat_priv, flags);</div><div class='add'>+	batadv_mcast_flags_log(bat_priv, flags-&gt;tvlv_flags);</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv6.exists = querier6.exists;</div><div class='del'>-	bat_priv-&gt;mcast.querier_ipv6.shadowing = querier6.shadowing;</div><div class='add'>+	mcast_data.flags = flags-&gt;tvlv_flags;</div><div class='add'>+	memset(mcast_data.reserved, 0, sizeof(mcast_data.reserved));</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;mcast.bridged = bridged;</div><div class='add'>+	batadv_tvlv_container_register(bat_priv, BATADV_TVLV_MCAST, 2,</div><div class='add'>+				       &amp;mcast_data, sizeof(mcast_data));</div><div class='ctx'> </div><div class='del'>-	if (!bat_priv-&gt;mcast.enabled ||</div><div class='del'>-	    mcast_data.flags != bat_priv-&gt;mcast.flags) {</div><div class='del'>-		batadv_mcast_flags_log(bat_priv, mcast_data.flags);</div><div class='del'>-		batadv_tvlv_container_register(bat_priv, BATADV_TVLV_MCAST, 2,</div><div class='del'>-					       &amp;mcast_data, sizeof(mcast_data));</div><div class='del'>-		bat_priv-&gt;mcast.flags = mcast_data.flags;</div><div class='del'>-		bat_priv-&gt;mcast.enabled = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return !(mcast_data.flags &amp; BATADV_MCAST_WANT_ALL_IPV4 &amp;&amp;</div><div class='del'>-		 mcast_data.flags &amp; BATADV_MCAST_WANT_ALL_IPV6);</div><div class='add'>+	bat_priv-&gt;mcast.mla_flags = *flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __batadv_mcast_mla_update() - update the own MLAs</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the own multicast listener announcements in the translation</div><div class='ctx'>  * table as well as the own, announced multicast tvlv container.</div><div class='hunk'>@@ -616,24 +899,26 @@ update:</div><div class='ctx'>  */</div><div class='ctx'> static void __batadv_mcast_mla_update(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *soft_iface = bat_priv-&gt;soft_iface;</div><div class='add'>+	struct net_device *mesh_iface = bat_priv-&gt;mesh_iface;</div><div class='ctx'> 	struct hlist_head mcast_list = HLIST_HEAD_INIT;</div><div class='add'>+	struct batadv_mcast_mla_flags flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!batadv_mcast_mla_tvlv_update(bat_priv))</div><div class='del'>-		goto update;</div><div class='add'>+	flags = batadv_mcast_mla_flags_get(bat_priv);</div><div class='ctx'> </div><div class='del'>-	ret = batadv_mcast_mla_softif_get(bat_priv, soft_iface, &amp;mcast_list);</div><div class='add'>+	ret = batadv_mcast_mla_meshif_get(mesh_iface, &amp;mcast_list, &amp;flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = batadv_mcast_mla_bridge_get(bat_priv, soft_iface, &amp;mcast_list);</div><div class='add'>+	ret = batadv_mcast_mla_bridge_get(mesh_iface, &amp;mcast_list, &amp;flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-update:</div><div class='add'>+	spin_lock(&amp;bat_priv-&gt;mcast.mla_lock);</div><div class='ctx'> 	batadv_mcast_mla_tt_retract(bat_priv, &amp;mcast_list);</div><div class='ctx'> 	batadv_mcast_mla_tt_add(bat_priv, &amp;mcast_list);</div><div class='add'>+	batadv_mcast_mla_flags_update(bat_priv, &amp;flags);</div><div class='add'>+	spin_unlock(&amp;bat_priv-&gt;mcast.mla_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	batadv_mcast_mla_list_free(&amp;mcast_list);</div><div class='hunk'>@@ -674,7 +959,7 @@ static void batadv_mcast_mla_update(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static bool batadv_mcast_is_report_ipv4(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (ip_mc_check_igmp(skb, NULL) &lt; 0)</div><div class='add'>+	if (ip_mc_check_igmp(skb) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (igmp_hdr(skb)-&gt;type) {</div><div class='hunk'>@@ -690,9 +975,10 @@ static bool batadv_mcast_is_report_ipv4(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_forw_mode_check_ipv4() - check for optimized forwarding</div><div class='ctx'>  *  potential</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the IPv4 packet to check</div><div class='ctx'>  * @is_unsnoopable: stores whether the destination is snoopable</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether the given IPv4 packet has the potential to be forwarded with a</div><div class='ctx'>  * mode more optimal than classic flooding.</div><div class='hunk'>@@ -702,7 +988,8 @@ static bool batadv_mcast_is_report_ipv4(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static int batadv_mcast_forw_mode_check_ipv4(struct batadv_priv *bat_priv,</div><div class='ctx'> 					     struct sk_buff *skb,</div><div class='del'>-					     bool *is_unsnoopable)</div><div class='add'>+					     bool *is_unsnoopable,</div><div class='add'>+					     int *is_routable)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iphdr;</div><div class='ctx'> </div><div class='hunk'>@@ -715,16 +1002,13 @@ static int batadv_mcast_forw_mode_check_ipv4(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	iphdr = ip_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Implement Multicast Router Discovery (RFC4286),</div><div class='del'>-	 * then allow scope &gt; link local, too</div><div class='del'>-	 */</div><div class='del'>-	if (!ipv4_is_local_multicast(iphdr-&gt;daddr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/* link-local multicast listeners behind a bridge are</div><div class='ctx'> 	 * not snoopable (see RFC4541, section 2.1.2.2)</div><div class='ctx'> 	 */</div><div class='del'>-	*is_unsnoopable = true;</div><div class='add'>+	if (ipv4_is_local_multicast(iphdr-&gt;daddr))</div><div class='add'>+		*is_unsnoopable = true;</div><div class='add'>+	else</div><div class='add'>+		*is_routable = ETH_P_IP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -741,7 +1025,7 @@ static int batadv_mcast_forw_mode_check_ipv4(struct batadv_priv *bat_priv,</div><div class='ctx'>  */</div><div class='ctx'> static bool batadv_mcast_is_report_ipv6(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (ipv6_mc_check_mld(skb, NULL) &lt; 0)</div><div class='add'>+	if (ipv6_mc_check_mld(skb) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (icmp6_hdr(skb)-&gt;icmp6_type) {</div><div class='hunk'>@@ -756,9 +1040,10 @@ static bool batadv_mcast_is_report_ipv6(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_forw_mode_check_ipv6() - check for optimized forwarding</div><div class='ctx'>  *  potential</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the IPv6 packet to check</div><div class='ctx'>  * @is_unsnoopable: stores whether the destination is snoopable</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether the given IPv6 packet has the potential to be forwarded with a</div><div class='ctx'>  * mode more optimal than classic flooding.</div><div class='hunk'>@@ -767,7 +1052,8 @@ static bool batadv_mcast_is_report_ipv6(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv,</div><div class='ctx'> 					     struct sk_buff *skb,</div><div class='del'>-					     bool *is_unsnoopable)</div><div class='add'>+					     bool *is_unsnoopable,</div><div class='add'>+					     int *is_routable)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *ip6hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -780,10 +1066,7 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	ip6hdr = ipv6_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Implement Multicast Router Discovery (RFC4286),</div><div class='del'>-	 * then allow scope &gt; link local, too</div><div class='del'>-	 */</div><div class='del'>-	if (IPV6_ADDR_MC_SCOPE(&amp;ip6hdr-&gt;daddr) != IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='add'>+	if (IPV6_ADDR_MC_SCOPE(&amp;ip6hdr-&gt;daddr) &lt; IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* link-local-all-nodes multicast listeners behind a bridge are</div><div class='hunk'>@@ -791,15 +1074,18 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ipv6_addr_is_ll_all_nodes(&amp;ip6hdr-&gt;daddr))</div><div class='ctx'> 		*is_unsnoopable = true;</div><div class='add'>+	else if (IPV6_ADDR_MC_SCOPE(&amp;ip6hdr-&gt;daddr) &gt; IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='add'>+		*is_routable = ETH_P_IPV6;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_forw_mode_check() - check for optimized forwarding potential</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the multicast frame to check</div><div class='ctx'>  * @is_unsnoopable: stores whether the destination is snoopable</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether the given multicast ethernet frame has the potential to be</div><div class='ctx'>  * forwarded with a mode more optimal than classic flooding.</div><div class='hunk'>@@ -808,7 +1094,8 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv,</div><div class='ctx'>  */</div><div class='ctx'> static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv,</div><div class='ctx'> 					struct sk_buff *skb,</div><div class='del'>-					bool *is_unsnoopable)</div><div class='add'>+					bool *is_unsnoopable,</div><div class='add'>+					int *is_routable)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -818,13 +1105,15 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv,</div><div class='ctx'> 	switch (ntohs(ethhdr-&gt;h_proto)) {</div><div class='ctx'> 	case ETH_P_IP:</div><div class='ctx'> 		return batadv_mcast_forw_mode_check_ipv4(bat_priv, skb,</div><div class='del'>-							 is_unsnoopable);</div><div class='add'>+							 is_unsnoopable,</div><div class='add'>+							 is_routable);</div><div class='ctx'> 	case ETH_P_IPV6:</div><div class='ctx'> 		if (!IS_ENABLED(CONFIG_IPV6))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		return batadv_mcast_forw_mode_check_ipv6(bat_priv, skb,</div><div class='del'>-							 is_unsnoopable);</div><div class='add'>+							 is_unsnoopable,</div><div class='add'>+							 is_routable);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -833,7 +1122,7 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_forw_want_all_ip_count() - count nodes with unspecific mcast</div><div class='ctx'>  *  interest</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @ethhdr: ethernet header of a packet</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the number of nodes which want all IPv4 multicast traffic if the</div><div class='hunk'>@@ -855,188 +1144,457 @@ static int batadv_mcast_forw_want_all_ip_count(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_tt_node_get() - get a multicast tt node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @ethhdr: the ether header containing the multicast destination</div><div class='add'>+ * batadv_mcast_forw_rtr_count() - count nodes with a multicast router</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @protocol: the ethernet protocol type to count multicast routers for</div><div class='ctx'>  *</div><div class='del'>- * Return: an orig_node matching the multicast address provided by ethhdr</div><div class='del'>- * via a translation table lookup. This increases the returned nodes refcount.</div><div class='add'>+ * Return: the number of nodes which want all routable IPv4 multicast traffic</div><div class='add'>+ * if the protocol is ETH_P_IP or the number of nodes which want all routable</div><div class='add'>+ * IPv6 traffic if the protocol is ETH_P_IPV6. Otherwise returns 0.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_orig_node *</div><div class='del'>-batadv_mcast_forw_tt_node_get(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct ethhdr *ethhdr)</div><div class='add'>+</div><div class='add'>+static int batadv_mcast_forw_rtr_count(struct batadv_priv *bat_priv,</div><div class='add'>+				       int protocol)</div><div class='ctx'> {</div><div class='del'>-	return batadv_transtable_search(bat_priv, NULL, ethhdr-&gt;h_dest,</div><div class='del'>-					BATADV_NO_FLAGS);</div><div class='add'>+	switch (protocol) {</div><div class='add'>+	case ETH_P_IP:</div><div class='add'>+		return atomic_read(&amp;bat_priv-&gt;mcast.num_want_all_rtr4);</div><div class='add'>+	case ETH_P_IPV6:</div><div class='add'>+		return atomic_read(&amp;bat_priv-&gt;mcast.num_want_all_rtr6);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_ipv4_node_get() - get a node with an ipv4 flag</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_mcast_forw_mode_by_count() - get forwarding mode by count</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to check</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='add'>+ * @count: the number of originators the multicast packet need to be sent to</div><div class='add'>+ *</div><div class='add'>+ * For a multicast packet with multiple destination originators, checks which</div><div class='add'>+ * mode to use. For BATADV_FORW_MCAST it also encapsulates the packet with a</div><div class='add'>+ * complete batman-adv multicast header.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	BATADV_FORW_MCAST: If all nodes have multicast packet routing</div><div class='add'>+ *	capabilities and an MTU &gt;= 1280 on all hard interfaces (including us)</div><div class='add'>+ *	and the encapsulated multicast packet with all destination addresses</div><div class='add'>+ *	would still fit into an 1280 bytes batman-adv multicast packet</div><div class='add'>+ *	(excluding the outer ethernet frame) and we could successfully push</div><div class='add'>+ *	the full batman-adv multicast packet header.</div><div class='add'>+ *	BATADV_FORW_UCASTS: If the packet cannot be sent in a batman-adv</div><div class='add'>+ *	multicast packet and the amount of batman-adv unicast packets needed</div><div class='add'>+ *	is smaller or equal to the configured multicast fanout.</div><div class='add'>+ *	BATADV_FORW_BCAST: Otherwise.</div><div class='add'>+ */</div><div class='add'>+static enum batadv_forw_mode</div><div class='add'>+batadv_mcast_forw_mode_by_count(struct batadv_priv *bat_priv,</div><div class='add'>+				struct sk_buff *skb, unsigned short vid,</div><div class='add'>+				int is_routable, int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int mcast_hdrlen = batadv_mcast_forw_packet_hdrlen(count);</div><div class='add'>+	u8 own_tvlv_flags = bat_priv-&gt;mcast.mla_flags.tvlv_flags;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;bat_priv-&gt;mcast.num_no_mc_ptype_capa) &amp;&amp;</div><div class='add'>+	    own_tvlv_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA &amp;&amp;</div><div class='add'>+	    skb-&gt;len + mcast_hdrlen &lt;= IPV6_MIN_MTU &amp;&amp;</div><div class='add'>+	    batadv_mcast_forw_push(bat_priv, skb, vid, is_routable, count))</div><div class='add'>+		return BATADV_FORW_MCAST;</div><div class='add'>+</div><div class='add'>+	if (count &lt;= atomic_read(&amp;bat_priv-&gt;multicast_fanout))</div><div class='add'>+		return BATADV_FORW_UCASTS;</div><div class='add'>+</div><div class='add'>+	return BATADV_FORW_BCAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_mode() - check on how to forward a multicast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to check</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='add'>+ *</div><div class='add'>+ * Return: The forwarding mode as enum batadv_forw_mode.</div><div class='add'>+ */</div><div class='add'>+enum batadv_forw_mode</div><div class='add'>+batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+		       unsigned short vid, int *is_routable)</div><div class='add'>+{</div><div class='add'>+	int ret, tt_count, ip_count, unsnoop_count, total_count;</div><div class='add'>+	bool is_unsnoopable = false;</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='add'>+	int rtr_count = 0;</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_mode_check(bat_priv, skb, &amp;is_unsnoopable,</div><div class='add'>+					   is_routable);</div><div class='add'>+	if (ret == -ENOMEM)</div><div class='add'>+		return BATADV_FORW_NONE;</div><div class='add'>+	else if (ret &lt; 0)</div><div class='add'>+		return BATADV_FORW_BCAST;</div><div class='add'>+</div><div class='add'>+	ethhdr = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	tt_count = batadv_tt_global_hash_count(bat_priv, ethhdr-&gt;h_dest,</div><div class='add'>+					       BATADV_NO_FLAGS);</div><div class='add'>+	ip_count = batadv_mcast_forw_want_all_ip_count(bat_priv, ethhdr);</div><div class='add'>+	unsnoop_count = !is_unsnoopable ? 0 :</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;mcast.num_want_all_unsnoopables);</div><div class='add'>+	rtr_count = batadv_mcast_forw_rtr_count(bat_priv, *is_routable);</div><div class='add'>+</div><div class='add'>+	total_count = tt_count + ip_count + unsnoop_count + rtr_count;</div><div class='add'>+</div><div class='add'>+	if (!total_count)</div><div class='add'>+		return BATADV_FORW_NONE;</div><div class='add'>+	else if (unsnoop_count)</div><div class='add'>+		return BATADV_FORW_BCAST;</div><div class='add'>+</div><div class='add'>+	return batadv_mcast_forw_mode_by_count(bat_priv, skb, vid, *is_routable,</div><div class='add'>+					       total_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_send_orig() - send a multicast packet to an originator</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to send</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @orig_node: the originator to send the packet to</div><div class='ctx'>  *</div><div class='del'>- * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set and</div><div class='del'>- * increases its refcount.</div><div class='add'>+ * Return: NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_orig_node *</div><div class='del'>-batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv)</div><div class='add'>+static int batadv_mcast_forw_send_orig(struct batadv_priv *bat_priv,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       unsigned short vid,</div><div class='add'>+				       struct batadv_orig_node *orig_node)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_orig_node *tmp_orig_node, *orig_node = NULL;</div><div class='add'>+	/* Avoid sending multicast-in-unicast packets to other BLA</div><div class='add'>+	 * gateways - they already got the frame from the LAN side</div><div class='add'>+	 * we share with them.</div><div class='add'>+	 * TODO: Refactor to take BLA into account earlier, to avoid</div><div class='add'>+	 * reducing the mcast_fanout count.</div><div class='add'>+	 */</div><div class='add'>+	if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node-&gt;orig, vid)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return NET_XMIT_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,</div><div class='add'>+				       orig_node, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_tt() - forwards a packet to multicast listeners</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any multicast</div><div class='add'>+ * listener registered in the translation table. A transmission is performed</div><div class='add'>+ * via a batman-adv unicast packet for each such destination node.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure, NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_tt(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+		     unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='add'>+</div><div class='add'>+	struct batadv_tt_orig_list_entry *orig_entry;</div><div class='add'>+</div><div class='add'>+	struct batadv_tt_global_entry *tt_global;</div><div class='add'>+	const u8 *addr = eth_hdr(skb)-&gt;h_dest;</div><div class='add'>+</div><div class='add'>+	tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid);</div><div class='add'>+	if (!tt_global)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(tmp_orig_node,</div><div class='add'>+	hlist_for_each_entry_rcu(orig_entry, &amp;tt_global-&gt;orig_list, list) {</div><div class='add'>+		newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb) {</div><div class='add'>+			ret = NET_XMIT_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		batadv_mcast_forw_send_orig(bat_priv, newskb, vid,</div><div class='add'>+					    orig_entry-&gt;orig_node);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	batadv_tt_global_entry_put(tt_global);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_want_all_ipv4() - forward to nodes with want-all-ipv4</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_ALL_IPV4 flag set. A transmission is performed via a</div><div class='add'>+ * batman-adv unicast packet for each such destination node.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure, NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_all_ipv4(struct batadv_priv *bat_priv,</div><div class='add'>+				struct sk_buff *skb, unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(orig_node,</div><div class='ctx'> 				 &amp;bat_priv-&gt;mcast.want_all_ipv4_list,</div><div class='ctx'> 				 mcast_want_all_ipv4_node) {</div><div class='del'>-		if (!kref_get_unless_zero(&amp;tmp_orig_node-&gt;refcount))</div><div class='del'>-			continue;</div><div class='add'>+		newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb) {</div><div class='add'>+			ret = NET_XMIT_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		orig_node = tmp_orig_node;</div><div class='del'>-		break;</div><div class='add'>+		batadv_mcast_forw_send_orig(bat_priv, newskb, vid, orig_node);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return orig_node;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_ipv6_node_get() - get a node with an ipv6 flag</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_mcast_forw_want_all_ipv6() - forward to nodes with want-all-ipv6</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: The multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_ALL_IPV6 flag set. A transmission is performed via a</div><div class='add'>+ * batman-adv unicast packet for each such destination node.</div><div class='ctx'>  *</div><div class='del'>- * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set</div><div class='del'>- * and increases its refcount.</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure, NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_orig_node *</div><div class='del'>-batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_all_ipv6(struct batadv_priv *bat_priv,</div><div class='add'>+				struct sk_buff *skb, unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_orig_node *tmp_orig_node, *orig_node = NULL;</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(tmp_orig_node,</div><div class='add'>+	hlist_for_each_entry_rcu(orig_node,</div><div class='ctx'> 				 &amp;bat_priv-&gt;mcast.want_all_ipv6_list,</div><div class='ctx'> 				 mcast_want_all_ipv6_node) {</div><div class='del'>-		if (!kref_get_unless_zero(&amp;tmp_orig_node-&gt;refcount))</div><div class='del'>-			continue;</div><div class='add'>+		newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb) {</div><div class='add'>+			ret = NET_XMIT_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		orig_node = tmp_orig_node;</div><div class='del'>-		break;</div><div class='add'>+		batadv_mcast_forw_send_orig(bat_priv, newskb, vid, orig_node);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return orig_node;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_ip_node_get() - get a node with an ipv4/ipv6 flag</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @ethhdr: an ethernet header to determine the protocol family from</div><div class='del'>- *</div><div class='del'>- * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or</div><div class='del'>- * BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, set and</div><div class='del'>- * increases its refcount.</div><div class='add'>+ * batadv_mcast_forw_want_all() - forward packet to nodes in a want-all list</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_ALL_IPV4 or BATADV_MCAST_WANT_ALL_IPV6 flag set. A</div><div class='add'>+ * transmission is performed via a batman-adv unicast packet for each such</div><div class='add'>+ * destination node.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure or if the protocol family</div><div class='add'>+ * is neither IPv4 nor IPv6. NET_XMIT_SUCCESS otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_orig_node *</div><div class='del'>-batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct ethhdr *ethhdr)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_all(struct batadv_priv *bat_priv,</div><div class='add'>+			   struct sk_buff *skb, unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	switch (ntohs(ethhdr-&gt;h_proto)) {</div><div class='add'>+	switch (ntohs(eth_hdr(skb)-&gt;h_proto)) {</div><div class='ctx'> 	case ETH_P_IP:</div><div class='del'>-		return batadv_mcast_forw_ipv4_node_get(bat_priv);</div><div class='add'>+		return batadv_mcast_forw_want_all_ipv4(bat_priv, skb, vid);</div><div class='ctx'> 	case ETH_P_IPV6:</div><div class='del'>-		return batadv_mcast_forw_ipv6_node_get(bat_priv);</div><div class='add'>+		return batadv_mcast_forw_want_all_ipv6(bat_priv, skb, vid);</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* we shouldn't be here... */</div><div class='del'>-		return NULL;</div><div class='add'>+		return NET_XMIT_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_unsnoop_node_get() - get a node with an unsnoopable flag</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_mcast_forw_want_all_rtr4() - forward to nodes with want-all-rtr4</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='ctx'>  *</div><div class='del'>- * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag</div><div class='del'>- * set and increases its refcount.</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_NO_RTR4 flag unset. A transmission is performed via a</div><div class='add'>+ * batman-adv unicast packet for each such destination node.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure, NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_orig_node *</div><div class='del'>-batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_all_rtr4(struct batadv_priv *bat_priv,</div><div class='add'>+				struct sk_buff *skb, unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_orig_node *tmp_orig_node, *orig_node = NULL;</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(tmp_orig_node,</div><div class='del'>-				 &amp;bat_priv-&gt;mcast.want_all_unsnoopables_list,</div><div class='del'>-				 mcast_want_all_unsnoopables_node) {</div><div class='del'>-		if (!kref_get_unless_zero(&amp;tmp_orig_node-&gt;refcount))</div><div class='del'>-			continue;</div><div class='add'>+	hlist_for_each_entry_rcu(orig_node,</div><div class='add'>+				 &amp;bat_priv-&gt;mcast.want_all_rtr4_list,</div><div class='add'>+				 mcast_want_all_rtr4_node) {</div><div class='add'>+		newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb) {</div><div class='add'>+			ret = NET_XMIT_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		orig_node = tmp_orig_node;</div><div class='del'>-		break;</div><div class='add'>+		batadv_mcast_forw_send_orig(bat_priv, newskb, vid, orig_node);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return orig_node;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_mcast_forw_mode() - check on how to forward a multicast packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: The multicast packet to check</div><div class='del'>- * @orig: an originator to be set to forward the skb to</div><div class='add'>+ * batadv_mcast_forw_want_all_rtr6() - forward to nodes with want-all-rtr6</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: The multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_NO_RTR6 flag unset. A transmission is performed via a</div><div class='add'>+ * batman-adv unicast packet for each such destination node.</div><div class='ctx'>  *</div><div class='del'>- * Return: the forwarding mode as enum batadv_forw_mode and in case of</div><div class='del'>- * BATADV_FORW_SINGLE set the orig to the single originator the skb</div><div class='del'>- * should be forwarded to.</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure, NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='ctx'>  */</div><div class='del'>-enum batadv_forw_mode</div><div class='del'>-batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-		       struct batadv_orig_node **orig)</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_all_rtr6(struct batadv_priv *bat_priv,</div><div class='add'>+				struct sk_buff *skb, unsigned short vid)</div><div class='ctx'> {</div><div class='del'>-	int ret, tt_count, ip_count, unsnoop_count, total_count;</div><div class='del'>-	bool is_unsnoopable = false;</div><div class='del'>-	struct ethhdr *ethhdr;</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='ctx'> </div><div class='del'>-	ret = batadv_mcast_forw_mode_check(bat_priv, skb, &amp;is_unsnoopable);</div><div class='del'>-	if (ret == -ENOMEM)</div><div class='del'>-		return BATADV_FORW_NONE;</div><div class='del'>-	else if (ret &lt; 0)</div><div class='del'>-		return BATADV_FORW_ALL;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(orig_node,</div><div class='add'>+				 &amp;bat_priv-&gt;mcast.want_all_rtr6_list,</div><div class='add'>+				 mcast_want_all_rtr6_node) {</div><div class='add'>+		newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb) {</div><div class='add'>+			ret = NET_XMIT_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ethhdr = eth_hdr(skb);</div><div class='add'>+		batadv_mcast_forw_send_orig(bat_priv, newskb, vid, orig_node);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	tt_count = batadv_tt_global_hash_count(bat_priv, ethhdr-&gt;h_dest,</div><div class='del'>-					       BATADV_NO_FLAGS);</div><div class='del'>-	ip_count = batadv_mcast_forw_want_all_ip_count(bat_priv, ethhdr);</div><div class='del'>-	unsnoop_count = !is_unsnoopable ? 0 :</div><div class='del'>-			atomic_read(&amp;bat_priv-&gt;mcast.num_want_all_unsnoopables);</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_want_rtr() - forward packet to nodes in a want-all-rtr list</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node with a</div><div class='add'>+ * BATADV_MCAST_WANT_NO_RTR4 or BATADV_MCAST_WANT_NO_RTR6 flag unset. A</div><div class='add'>+ * transmission is performed via a batman-adv unicast packet for each such</div><div class='add'>+ * destination node.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure or if the protocol family</div><div class='add'>+ * is neither IPv4 nor IPv6. NET_XMIT_SUCCESS otherwise.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_want_rtr(struct batadv_priv *bat_priv,</div><div class='add'>+			   struct sk_buff *skb, unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	switch (ntohs(eth_hdr(skb)-&gt;h_proto)) {</div><div class='add'>+	case ETH_P_IP:</div><div class='add'>+		return batadv_mcast_forw_want_all_rtr4(bat_priv, skb, vid);</div><div class='add'>+	case ETH_P_IPV6:</div><div class='add'>+		return batadv_mcast_forw_want_all_rtr6(bat_priv, skb, vid);</div><div class='add'>+	default:</div><div class='add'>+		/* we shouldn't be here... */</div><div class='add'>+		return NET_XMIT_DROP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_send() - send packet to any detected multicast recipient</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to transmit</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: stores whether the destination is routable</div><div class='add'>+ *</div><div class='add'>+ * Sends copies of a frame with multicast destination to any node that signaled</div><div class='add'>+ * interest in it, that is either via the translation table or the according</div><div class='add'>+ * want-all flags. A transmission is performed via a batman-adv unicast packet</div><div class='add'>+ * for each such destination node.</div><div class='add'>+ *</div><div class='add'>+ * The given skb is consumed/freed.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure or if the protocol family</div><div class='add'>+ * is neither IPv4 nor IPv6. NET_XMIT_SUCCESS otherwise.</div><div class='add'>+ */</div><div class='add'>+int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			   unsigned short vid, int is_routable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	total_count = tt_count + ip_count + unsnoop_count;</div><div class='add'>+	ret = batadv_mcast_forw_tt(bat_priv, skb, vid);</div><div class='add'>+	if (ret != NET_XMIT_SUCCESS) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	switch (total_count) {</div><div class='del'>-	case 1:</div><div class='del'>-		if (tt_count)</div><div class='del'>-			*orig = batadv_mcast_forw_tt_node_get(bat_priv, ethhdr);</div><div class='del'>-		else if (ip_count)</div><div class='del'>-			*orig = batadv_mcast_forw_ip_node_get(bat_priv, ethhdr);</div><div class='del'>-		else if (unsnoop_count)</div><div class='del'>-			*orig = batadv_mcast_forw_unsnoop_node_get(bat_priv);</div><div class='add'>+	ret = batadv_mcast_forw_want_all(bat_priv, skb, vid);</div><div class='add'>+	if (ret != NET_XMIT_SUCCESS) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (*orig)</div><div class='del'>-			return BATADV_FORW_SINGLE;</div><div class='add'>+	if (!is_routable)</div><div class='add'>+		goto skip_mc_router;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='del'>-	case 0:</div><div class='del'>-		return BATADV_FORW_NONE;</div><div class='del'>-	default:</div><div class='del'>-		return BATADV_FORW_ALL;</div><div class='add'>+	ret = batadv_mcast_forw_want_rtr(bat_priv, skb, vid);</div><div class='add'>+	if (ret != NET_XMIT_SUCCESS) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+skip_mc_router:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_want_unsnoop_update() - update unsnoop counter and list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node which multicast state might have changed of</div><div class='ctx'>  * @mcast_flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * If the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag of this originator,</div><div class='del'>- * orig, has toggled then this method updates counter and list accordingly.</div><div class='add'>+ * orig, has toggled then this method updates the counter and the list</div><div class='add'>+ * accordingly.</div><div class='ctx'>  *</div><div class='ctx'>  * Caller needs to hold orig-&gt;mcast_handler_lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1076,12 +1634,12 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_want_ipv4_update() - update want-all-ipv4 counter and list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node which multicast state might have changed of</div><div class='ctx'>  * @mcast_flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * If the BATADV_MCAST_WANT_ALL_IPV4 flag of this originator, orig, has</div><div class='del'>- * toggled then this method updates counter and list accordingly.</div><div class='add'>+ * toggled then this method updates the counter and the list accordingly.</div><div class='ctx'>  *</div><div class='ctx'>  * Caller needs to hold orig-&gt;mcast_handler_lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1121,12 +1679,12 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_want_ipv6_update() - update want-all-ipv6 counter and list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node which multicast state might have changed of</div><div class='ctx'>  * @mcast_flags: flags indicating the new multicast state</div><div class='ctx'>  *</div><div class='ctx'>  * If the BATADV_MCAST_WANT_ALL_IPV6 flag of this originator, orig, has</div><div class='del'>- * toggled then this method updates counter and list accordingly.</div><div class='add'>+ * toggled then this method updates the counter and the list accordingly.</div><div class='ctx'>  *</div><div class='ctx'>  * Caller needs to hold orig-&gt;mcast_handler_lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1165,8 +1723,154 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_mcast_want_rtr4_update() - update want-all-rtr4 counter and list</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @orig: the orig_node which multicast state might have changed of</div><div class='add'>+ * @mcast_flags: flags indicating the new multicast state</div><div class='add'>+ *</div><div class='add'>+ * If the BATADV_MCAST_WANT_NO_RTR4 flag of this originator, orig, has</div><div class='add'>+ * toggled then this method updates the counter and the list accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold orig-&gt;mcast_handler_lock.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_want_rtr4_update(struct batadv_priv *bat_priv,</div><div class='add'>+					  struct batadv_orig_node *orig,</div><div class='add'>+					  u8 mcast_flags)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *node = &amp;orig-&gt;mcast_want_all_rtr4_node;</div><div class='add'>+	struct hlist_head *head = &amp;bat_priv-&gt;mcast.want_all_rtr4_list;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;orig-&gt;mcast_handler_lock);</div><div class='add'>+</div><div class='add'>+	/* switched from flag set to unset */</div><div class='add'>+	if (!(mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR4) &amp;&amp;</div><div class='add'>+	    orig-&gt;mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR4) {</div><div class='add'>+		atomic_inc(&amp;bat_priv-&gt;mcast.num_want_all_rtr4);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+		/* flag checks above + mcast_handler_lock prevents this */</div><div class='add'>+		WARN_ON(!hlist_unhashed(node));</div><div class='add'>+</div><div class='add'>+		hlist_add_head_rcu(node, head);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+	/* switched from flag unset to set */</div><div class='add'>+	} else if (mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR4 &amp;&amp;</div><div class='add'>+		   !(orig-&gt;mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR4)) {</div><div class='add'>+		atomic_dec(&amp;bat_priv-&gt;mcast.num_want_all_rtr4);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+		/* flag checks above + mcast_handler_lock prevents this */</div><div class='add'>+		WARN_ON(hlist_unhashed(node));</div><div class='add'>+</div><div class='add'>+		hlist_del_init_rcu(node);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_want_rtr6_update() - update want-all-rtr6 counter and list</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @orig: the orig_node which multicast state might have changed of</div><div class='add'>+ * @mcast_flags: flags indicating the new multicast state</div><div class='add'>+ *</div><div class='add'>+ * If the BATADV_MCAST_WANT_NO_RTR6 flag of this originator, orig, has</div><div class='add'>+ * toggled then this method updates the counter and the list accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold orig-&gt;mcast_handler_lock.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_want_rtr6_update(struct batadv_priv *bat_priv,</div><div class='add'>+					  struct batadv_orig_node *orig,</div><div class='add'>+					  u8 mcast_flags)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *node = &amp;orig-&gt;mcast_want_all_rtr6_node;</div><div class='add'>+	struct hlist_head *head = &amp;bat_priv-&gt;mcast.want_all_rtr6_list;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;orig-&gt;mcast_handler_lock);</div><div class='add'>+</div><div class='add'>+	/* switched from flag set to unset */</div><div class='add'>+	if (!(mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR6) &amp;&amp;</div><div class='add'>+	    orig-&gt;mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR6) {</div><div class='add'>+		atomic_inc(&amp;bat_priv-&gt;mcast.num_want_all_rtr6);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+		/* flag checks above + mcast_handler_lock prevents this */</div><div class='add'>+		WARN_ON(!hlist_unhashed(node));</div><div class='add'>+</div><div class='add'>+		hlist_add_head_rcu(node, head);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+	/* switched from flag unset to set */</div><div class='add'>+	} else if (mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR6 &amp;&amp;</div><div class='add'>+		   !(orig-&gt;mcast_flags &amp; BATADV_MCAST_WANT_NO_RTR6)) {</div><div class='add'>+		atomic_dec(&amp;bat_priv-&gt;mcast.num_want_all_rtr6);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+		/* flag checks above + mcast_handler_lock prevents this */</div><div class='add'>+		WARN_ON(hlist_unhashed(node));</div><div class='add'>+</div><div class='add'>+		hlist_del_init_rcu(node);</div><div class='add'>+		spin_unlock_bh(&amp;bat_priv-&gt;mcast.want_lists_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_have_mc_ptype_update() - update multicast packet type counter</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @orig: the orig_node which multicast state might have changed of</div><div class='add'>+ * @mcast_flags: flags indicating the new multicast state</div><div class='add'>+ *</div><div class='add'>+ * If the BATADV_MCAST_HAVE_MC_PTYPE_CAPA flag of this originator, orig, has</div><div class='add'>+ * toggled then this method updates the counter accordingly.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_have_mc_ptype_update(struct batadv_priv *bat_priv,</div><div class='add'>+					      struct batadv_orig_node *orig,</div><div class='add'>+					      u8 mcast_flags)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;orig-&gt;mcast_handler_lock);</div><div class='add'>+</div><div class='add'>+	/* switched from flag set to unset */</div><div class='add'>+	if (!(mcast_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA) &amp;&amp;</div><div class='add'>+	    orig-&gt;mcast_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA)</div><div class='add'>+		atomic_inc(&amp;bat_priv-&gt;mcast.num_no_mc_ptype_capa);</div><div class='add'>+	/* switched from flag unset to set */</div><div class='add'>+	else if (mcast_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA &amp;&amp;</div><div class='add'>+		 !(orig-&gt;mcast_flags &amp; BATADV_MCAST_HAVE_MC_PTYPE_CAPA))</div><div class='add'>+		atomic_dec(&amp;bat_priv-&gt;mcast.num_no_mc_ptype_capa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_tvlv_flags_get() - get multicast flags from an OGM TVLV</div><div class='add'>+ * @enabled: whether the originator has multicast TVLV support enabled</div><div class='add'>+ * @tvlv_value: tvlv buffer containing the multicast flags</div><div class='add'>+ * @tvlv_value_len: tvlv buffer length</div><div class='add'>+ *</div><div class='add'>+ * Return: multicast flags for the given tvlv buffer</div><div class='add'>+ */</div><div class='add'>+static u8</div><div class='add'>+batadv_mcast_tvlv_flags_get(bool enabled, void *tvlv_value, u16 tvlv_value_len)</div><div class='add'>+{</div><div class='add'>+	u8 mcast_flags = BATADV_NO_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (enabled &amp;&amp; tvlv_value &amp;&amp; tvlv_value_len &gt;= sizeof(mcast_flags))</div><div class='add'>+		mcast_flags = *(u8 *)tvlv_value;</div><div class='add'>+</div><div class='add'>+	if (!enabled) {</div><div class='add'>+		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV4;</div><div class='add'>+		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* remove redundant flags to avoid sending duplicate packets later */</div><div class='add'>+	if (mcast_flags &amp; BATADV_MCAST_WANT_ALL_IPV4)</div><div class='add'>+		mcast_flags |= BATADV_MCAST_WANT_NO_RTR4;</div><div class='add'>+</div><div class='add'>+	if (mcast_flags &amp; BATADV_MCAST_WANT_ALL_IPV6)</div><div class='add'>+		mcast_flags |= BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+</div><div class='add'>+	return mcast_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_mcast_tvlv_ogm_handler() - process incoming multicast tvlv container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node of the ogm</div><div class='ctx'>  * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the multicast data</div><div class='hunk'>@@ -1179,16 +1883,10 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> 					  u16 tvlv_value_len)</div><div class='ctx'> {</div><div class='ctx'> 	bool orig_mcast_enabled = !(flags &amp; BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='del'>-	u8 mcast_flags = BATADV_NO_FLAGS;</div><div class='add'>+	u8 mcast_flags;</div><div class='ctx'> </div><div class='del'>-	if (orig_mcast_enabled &amp;&amp; tvlv_value &amp;&amp;</div><div class='del'>-	    tvlv_value_len &gt;= sizeof(mcast_flags))</div><div class='del'>-		mcast_flags = *(u8 *)tvlv_value;</div><div class='del'>-</div><div class='del'>-	if (!orig_mcast_enabled) {</div><div class='del'>-		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV4;</div><div class='del'>-		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV6;</div><div class='del'>-	}</div><div class='add'>+	mcast_flags = batadv_mcast_tvlv_flags_get(orig_mcast_enabled,</div><div class='add'>+						  tvlv_value, tvlv_value_len);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;orig-&gt;mcast_handler_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1205,6 +1903,9 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> 	batadv_mcast_want_unsnoop_update(bat_priv, orig, mcast_flags);</div><div class='ctx'> 	batadv_mcast_want_ipv4_update(bat_priv, orig, mcast_flags);</div><div class='ctx'> 	batadv_mcast_want_ipv6_update(bat_priv, orig, mcast_flags);</div><div class='add'>+	batadv_mcast_want_rtr4_update(bat_priv, orig, mcast_flags);</div><div class='add'>+	batadv_mcast_want_rtr6_update(bat_priv, orig, mcast_flags);</div><div class='add'>+	batadv_mcast_have_mc_ptype_update(bat_priv, orig, mcast_flags);</div><div class='ctx'> </div><div class='ctx'> 	orig-&gt;mcast_flags = mcast_flags;</div><div class='ctx'> 	spin_unlock_bh(&amp;orig-&gt;mcast_handler_lock);</div><div class='hunk'>@@ -1212,144 +1913,45 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_init() - initialize the multicast optimizations structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_mcast_init(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	batadv_tvlv_handler_register(bat_priv, batadv_mcast_tvlv_ogm_handler,</div><div class='del'>-				     NULL, BATADV_TVLV_MCAST, 2,</div><div class='add'>+				     NULL, NULL, BATADV_TVLV_MCAST, 2,</div><div class='add'>+				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='add'>+	batadv_tvlv_handler_register(bat_priv, NULL, NULL,</div><div class='add'>+				     batadv_mcast_forw_tracker_tvlv_handler,</div><div class='add'>+				     BATADV_TVLV_MCAST_TRACKER, 1,</div><div class='ctx'> 				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;bat_priv-&gt;mcast.work, batadv_mcast_mla_update);</div><div class='ctx'> 	batadv_mcast_start_timer(bat_priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_mcast_flags_print_header() - print own mcast flags to debugfs table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- *</div><div class='del'>- * Prints our own multicast flags including a more specific reason why</div><div class='del'>- * they are set, that is prints the bridge and querier state too, to</div><div class='del'>- * the debugfs table specified via @seq.</div><div class='del'>- */</div><div class='del'>-static void batadv_mcast_flags_print_header(struct batadv_priv *bat_priv,</div><div class='del'>-					    struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	u8 flags = bat_priv-&gt;mcast.flags;</div><div class='del'>-	char querier4, querier6, shadowing4, shadowing6;</div><div class='del'>-	bool bridged = bat_priv-&gt;mcast.bridged;</div><div class='del'>-</div><div class='del'>-	if (bridged) {</div><div class='del'>-		querier4 = bat_priv-&gt;mcast.querier_ipv4.exists ? '.' : '4';</div><div class='del'>-		querier6 = bat_priv-&gt;mcast.querier_ipv6.exists ? '.' : '6';</div><div class='del'>-		shadowing4 = bat_priv-&gt;mcast.querier_ipv4.shadowing ? '4' : '.';</div><div class='del'>-		shadowing6 = bat_priv-&gt;mcast.querier_ipv6.shadowing ? '6' : '.';</div><div class='del'>-	} else {</div><div class='del'>-		querier4 = '?';</div><div class='del'>-		querier6 = '?';</div><div class='del'>-		shadowing4 = '?';</div><div class='del'>-		shadowing6 = '?';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "Multicast flags (own flags: [%c%c%c])\n",</div><div class='del'>-		   (flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES) ? 'U' : '.',</div><div class='del'>-		   (flags &amp; BATADV_MCAST_WANT_ALL_IPV4) ? '4' : '.',</div><div class='del'>-		   (flags &amp; BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.');</div><div class='del'>-	seq_printf(seq, "* Bridged [U]\t\t\t\t%c\n", bridged ? 'U' : '.');</div><div class='del'>-	seq_printf(seq, "* No IGMP/MLD Querier [4/6]:\t\t%c/%c\n",</div><div class='del'>-		   querier4, querier6);</div><div class='del'>-	seq_printf(seq, "* Shadowing IGMP/MLD Querier [4/6]:\t%c/%c\n",</div><div class='del'>-		   shadowing4, shadowing6);</div><div class='del'>-	seq_puts(seq, "-------------------------------------------\n");</div><div class='del'>-	seq_printf(seq, "       %-10s %s\n", "Originator", "Flags");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_mcast_flags_seq_print_text() - print the mcast flags of other nodes</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * This prints a table of (primary) originators and their according</div><div class='del'>- * multicast flags, including (in the header) our own.</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	batadv_mcast_flags_print_header(bat_priv, seq);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST,</div><div class='del'>-				      &amp;orig_node-&gt;capa_initialized))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST,</div><div class='del'>-				      &amp;orig_node-&gt;capabilities)) {</div><div class='del'>-				seq_printf(seq, "%pM -\n", orig_node-&gt;orig);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			flags = orig_node-&gt;mcast_flags;</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, "%pM [%c%c%c]\n", orig_node-&gt;orig,</div><div class='del'>-				   (flags &amp; BATADV_MCAST_WANT_ALL_UNSNOOPABLES)</div><div class='del'>-				   ? 'U' : '.',</div><div class='del'>-				   (flags &amp; BATADV_MCAST_WANT_ALL_IPV4)</div><div class='del'>-				   ? '4' : '.',</div><div class='del'>-				   (flags &amp; BATADV_MCAST_WANT_ALL_IPV6)</div><div class='del'>-				   ? '6' : '.');</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_mesh_info_put() - put multicast info into a netlink message</div><div class='ctx'>  * @msg: buffer for the message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> int batadv_mcast_mesh_info_put(struct sk_buff *msg,</div><div class='ctx'> 			       struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	u32 flags = bat_priv-&gt;mcast.flags;</div><div class='add'>+	u32 flags = bat_priv-&gt;mcast.mla_flags.tvlv_flags;</div><div class='ctx'> 	u32 flags_priv = BATADV_NO_FLAGS;</div><div class='ctx'> </div><div class='del'>-	if (bat_priv-&gt;mcast.bridged) {</div><div class='add'>+	if (bat_priv-&gt;mcast.mla_flags.bridged) {</div><div class='ctx'> 		flags_priv |= BATADV_MCAST_FLAGS_BRIDGED;</div><div class='ctx'> </div><div class='del'>-		if (bat_priv-&gt;mcast.querier_ipv4.exists)</div><div class='add'>+		if (bat_priv-&gt;mcast.mla_flags.querier_ipv4.exists)</div><div class='ctx'> 			flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS;</div><div class='del'>-		if (bat_priv-&gt;mcast.querier_ipv6.exists)</div><div class='add'>+		if (bat_priv-&gt;mcast.mla_flags.querier_ipv6.exists)</div><div class='ctx'> 			flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS;</div><div class='del'>-		if (bat_priv-&gt;mcast.querier_ipv4.shadowing)</div><div class='add'>+		if (bat_priv-&gt;mcast.mla_flags.querier_ipv4.shadowing)</div><div class='ctx'> 			flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING;</div><div class='del'>-		if (bat_priv-&gt;mcast.querier_ipv6.shadowing)</div><div class='add'>+		if (bat_priv-&gt;mcast.mla_flags.querier_ipv6.shadowing)</div><div class='ctx'> 			flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1365,22 +1967,26 @@ int batadv_mcast_mesh_info_put(struct sk_buff *msg,</div><div class='ctx'>  *  to a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  * @orig_node: originator to dump the multicast flags of</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_mcast_flags_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_mcast_flags_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+			      struct netlink_callback *cb,</div><div class='ctx'> 			      struct batadv_orig_node *orig_node)</div><div class='ctx'> {</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI, BATADV_CMD_GET_MCAST_FLAGS);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='add'>+			  BATADV_CMD_GET_MCAST_FLAGS);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN,</div><div class='ctx'> 		    orig_node-&gt;orig)) {</div><div class='ctx'> 		genlmsg_cancel(msg, hdr);</div><div class='hunk'>@@ -1405,21 +2011,26 @@ batadv_mcast_flags_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  *  table to a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @head: bucket to dump</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @hash: hash to dump</div><div class='add'>+ * @bucket: bucket index to dump</div><div class='ctx'>  * @idx_skip: How many entries to skip</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_mcast_flags_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='del'>-			       struct hlist_head *head, long *idx_skip)</div><div class='add'>+batadv_mcast_flags_dump_bucket(struct sk_buff *msg, u32 portid,</div><div class='add'>+			       struct netlink_callback *cb,</div><div class='add'>+			       struct batadv_hashtable *hash,</div><div class='add'>+			       unsigned int bucket, long *idx_skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_orig_node *orig_node;</div><div class='ctx'> 	long idx = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='add'>+	spin_lock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='add'>+	cb-&gt;seq = atomic_read(&amp;hash-&gt;generation) &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(orig_node, &amp;hash-&gt;table[bucket], hash_entry) {</div><div class='ctx'> 		if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST,</div><div class='ctx'> 			      &amp;orig_node-&gt;capa_initialized))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1427,9 +2038,8 @@ batadv_mcast_flags_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 		if (idx &lt; *idx_skip)</div><div class='ctx'> 			goto skip;</div><div class='ctx'> </div><div class='del'>-		if (batadv_mcast_flags_dump_entry(msg, portid, seq,</div><div class='del'>-						  orig_node)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+		if (batadv_mcast_flags_dump_entry(msg, portid, cb, orig_node)) {</div><div class='add'>+			spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> 			*idx_skip = idx;</div><div class='ctx'> </div><div class='ctx'> 			return -EMSGSIZE;</div><div class='hunk'>@@ -1438,7 +2048,7 @@ batadv_mcast_flags_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> skip:</div><div class='ctx'> 		idx++;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1447,27 +2057,25 @@ skip:</div><div class='ctx'>  * __batadv_mcast_flags_dump() - dump multicast flags table to a netlink socket</div><div class='ctx'>  * @msg: buffer for the message</div><div class='ctx'>  * @portid: netlink port</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @bucket: current bucket to dump</div><div class='ctx'>  * @idx: index in current bucket to the next entry to dump</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-__batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+__batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid,</div><div class='add'>+			  struct netlink_callback *cb,</div><div class='ctx'> 			  struct batadv_priv *bat_priv, long *bucket, long *idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='ctx'> 	long bucket_tmp = *bucket;</div><div class='del'>-	struct hlist_head *head;</div><div class='ctx'> 	long idx_tmp = *idx;</div><div class='ctx'> </div><div class='ctx'> 	while (bucket_tmp &lt; hash-&gt;size) {</div><div class='del'>-		head = &amp;hash-&gt;table[bucket_tmp];</div><div class='del'>-</div><div class='del'>-		if (batadv_mcast_flags_dump_bucket(msg, portid, seq, head,</div><div class='del'>-						   &amp;idx_tmp))</div><div class='add'>+		if (batadv_mcast_flags_dump_bucket(msg, portid, cb, hash,</div><div class='add'>+						   bucket_tmp, &amp;idx_tmp))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		bucket_tmp++;</div><div class='hunk'>@@ -1493,23 +2101,15 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb,</div><div class='ctx'> 				 struct batadv_hard_iface **primary_if)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface = NULL;</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh, BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	hard_iface = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (!hard_iface || hard_iface-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='hunk'>@@ -1518,12 +2118,11 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; primary_if)</div><div class='ctx'> 		*primary_if = hard_iface;</div><div class='del'>-	else if (hard_iface)</div><div class='add'>+	else</div><div class='ctx'> 		batadv_hardif_put(hard_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1549,9 +2148,8 @@ int batadv_mcast_flags_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(primary_if-&gt;soft_iface);</div><div class='del'>-	ret = __batadv_mcast_flags_dump(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					bat_priv, bucket, idx);</div><div class='add'>+	bat_priv = netdev_priv(primary_if-&gt;mesh_iface);</div><div class='add'>+	ret = __batadv_mcast_flags_dump(msg, portid, cb, bat_priv, bucket, idx);</div><div class='ctx'> </div><div class='ctx'> 	batadv_hardif_put(primary_if);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1559,13 +2157,14 @@ int batadv_mcast_flags_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_mcast_free() - free the multicast optimizations structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_mcast_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bat_priv-&gt;mcast.work);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_MCAST, 2);</div><div class='add'>+	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST_TRACKER, 1);</div><div class='ctx'> 	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST, 2);</div><div class='ctx'> </div><div class='ctx'> 	/* safely calling outside of worker, as worker was canceled above */</div><div class='hunk'>@@ -1585,6 +2184,12 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)</div><div class='ctx'> 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);</div><div class='ctx'> 	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);</div><div class='ctx'> 	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);</div><div class='add'>+	batadv_mcast_want_rtr4_update(bat_priv, orig,</div><div class='add'>+				      BATADV_MCAST_WANT_NO_RTR4);</div><div class='add'>+	batadv_mcast_want_rtr6_update(bat_priv, orig,</div><div class='add'>+				      BATADV_MCAST_WANT_NO_RTR6);</div><div class='add'>+	batadv_mcast_have_mc_ptype_update(bat_priv, orig,</div><div class='add'>+					  BATADV_MCAST_HAVE_MC_PTYPE_CAPA);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;orig-&gt;mcast_handler_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h<br/>index 3b04ab13f0eb..d97ee51d26f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/multicast.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/multicast.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/multicast.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/multicast.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2014-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Linus Lüssing</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_MULTICAST_H_</div><div class='hunk'>@@ -21,25 +9,31 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum batadv_forw_mode - the way a packet should be forwarded as</div><div class='ctx'>  */</div><div class='ctx'> enum batadv_forw_mode {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_FORW_ALL: forward the packet to all nodes (currently via</div><div class='del'>-	 *  classic flooding)</div><div class='add'>+	 * @BATADV_FORW_BCAST: forward the packet to all nodes via a batman-adv</div><div class='add'>+	 *  broadcast packet</div><div class='add'>+	 */</div><div class='add'>+	BATADV_FORW_BCAST,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @BATADV_FORW_UCASTS: forward the packet to some nodes via one</div><div class='add'>+	 *  or more batman-adv unicast packets</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_FORW_ALL,</div><div class='add'>+	BATADV_FORW_UCASTS,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_FORW_SINGLE: forward the packet to a single node (currently</div><div class='del'>-	 *  via the BATMAN unicast routing protocol)</div><div class='add'>+	 * @BATADV_FORW_MCAST: forward the packet to some nodes via a</div><div class='add'>+	 *  batman-adv multicast packet</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_FORW_SINGLE,</div><div class='add'>+	BATADV_FORW_MCAST,</div><div class='ctx'> </div><div class='ctx'> 	/** @BATADV_FORW_NONE: don't forward, drop it */</div><div class='ctx'> 	BATADV_FORW_NONE,</div><div class='hunk'>@@ -49,11 +43,12 @@ enum batadv_forw_mode {</div><div class='ctx'> </div><div class='ctx'> enum batadv_forw_mode</div><div class='ctx'> batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-		       struct batadv_orig_node **mcast_single_orig);</div><div class='add'>+		       unsigned short vid, int *is_routable);</div><div class='ctx'> </div><div class='del'>-void batadv_mcast_init(struct batadv_priv *bat_priv);</div><div class='add'>+int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			   unsigned short vid, int is_routable);</div><div class='ctx'> </div><div class='del'>-int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset);</div><div class='add'>+void batadv_mcast_init(struct batadv_priv *bat_priv);</div><div class='ctx'> </div><div class='ctx'> int batadv_mcast_mesh_info_put(struct sk_buff *msg,</div><div class='ctx'> 			       struct batadv_priv *bat_priv);</div><div class='hunk'>@@ -64,13 +59,33 @@ void batadv_mcast_free(struct batadv_priv *bat_priv);</div><div class='ctx'> </div><div class='ctx'> void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);</div><div class='ctx'> </div><div class='add'>+/* multicast_forw.c */</div><div class='add'>+</div><div class='add'>+int batadv_mcast_forw_tracker_tvlv_handler(struct batadv_priv *bat_priv,</div><div class='add'>+					   struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+unsigned int batadv_mcast_forw_packet_hdrlen(unsigned int num_dests);</div><div class='add'>+</div><div class='add'>+bool batadv_mcast_forw_push(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			    unsigned short vid, int is_routable, int count);</div><div class='add'>+</div><div class='add'>+int batadv_mcast_forw_mcsend(struct batadv_priv *bat_priv, struct sk_buff *skb);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline enum batadv_forw_mode</div><div class='ctx'> batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-		       struct batadv_orig_node **mcast_single_orig)</div><div class='add'>+		       unsigned short vid, int *is_routable)</div><div class='add'>+{</div><div class='add'>+	return BATADV_FORW_BCAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+		       unsigned short vid, int is_routable)</div><div class='ctx'> {</div><div class='del'>-	return BATADV_FORW_ALL;</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int batadv_mcast_init(struct batadv_priv *bat_priv)</div><div class='hunk'>@@ -98,6 +113,13 @@ static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int batadv_mcast_forw_mcsend(struct batadv_priv *bat_priv,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_BATMAN_ADV_MCAST */</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_MULTICAST_H_ */</div><div class='head'>diff --git a/net/batman-adv/multicast_forw.c b/net/batman-adv/multicast_forw.c<br/>new file mode 100644<br/>index 000000000000..b8668a80b94a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/multicast_forw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/multicast_forw.c</a></div><div class='hunk'>@@ -0,0 +1,1178 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='add'>+ *</div><div class='add'>+ * Linus Lüssing</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "multicast.h"</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bridge_loop_avoidance.h"</div><div class='add'>+#include "originator.h"</div><div class='add'>+#include "send.h"</div><div class='add'>+#include "translation-table.h"</div><div class='add'>+</div><div class='add'>+#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \</div><div class='add'>+	for (; num_dests; num_dests--, (dest) += ETH_ALEN)</div><div class='add'>+</div><div class='add'>+#define batadv_mcast_forw_tracker_for_each_dest2(dest1, dest2, num_dests) \</div><div class='add'>+	for (; num_dests; num_dests--, (dest1) += ETH_ALEN, (dest2) += ETH_ALEN)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_skb_push() - skb_push and memorize amount of pushed bytes</div><div class='add'>+ * @skb: the skb to push onto</div><div class='add'>+ * @size: the amount of bytes to push</div><div class='add'>+ * @len: stores the total amount of bytes pushed</div><div class='add'>+ *</div><div class='add'>+ * Performs an skb_push() onto the given skb and adds the amount of pushed bytes</div><div class='add'>+ * to the given len pointer.</div><div class='add'>+ *</div><div class='add'>+ * Return: the return value of the skb_push() call.</div><div class='add'>+ */</div><div class='add'>+static void *batadv_mcast_forw_skb_push(struct sk_buff *skb, size_t size,</div><div class='add'>+					unsigned short *len)</div><div class='add'>+{</div><div class='add'>+	*len += size;</div><div class='add'>+	return skb_push(skb, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_padding() - push 2 padding bytes to skb's front</div><div class='add'>+ * @skb: the skb to push onto</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Pushes two padding bytes to the front of the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: On success a pointer to the first byte of the two pushed padding</div><div class='add'>+ * bytes within the skb. NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+static char *</div><div class='add'>+batadv_mcast_forw_push_padding(struct sk_buff *skb, unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	const int pad_len = 2;</div><div class='add'>+	char *padding;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; pad_len)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	padding = batadv_mcast_forw_skb_push(skb, pad_len, tvlv_len);</div><div class='add'>+	memset(padding, 0, pad_len);</div><div class='add'>+</div><div class='add'>+	return padding;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_est_padding() - push padding bytes if necessary</div><div class='add'>+ * @skb: the skb to potentially push the padding onto</div><div class='add'>+ * @count: the (estimated) number of originators the multicast packet needs to</div><div class='add'>+ *  be sent to</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * If the number of destination entries is even then this adds two</div><div class='add'>+ * padding bytes to the end of the tracker TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success or if no padding is needed, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+batadv_mcast_forw_push_est_padding(struct sk_buff *skb, int count,</div><div class='add'>+				   unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	if (!(count % 2) &amp;&amp; !batadv_mcast_forw_push_padding(skb, tvlv_len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_orig_entry() - get orig_node from an hlist node</div><div class='add'>+ * @node: the hlist node to get the orig_node from</div><div class='add'>+ * @entry_offset: the offset of the hlist node within the orig_node struct</div><div class='add'>+ *</div><div class='add'>+ * Return: The orig_node containing the hlist node on success, NULL on error.</div><div class='add'>+ */</div><div class='add'>+static struct batadv_orig_node *</div><div class='add'>+batadv_mcast_forw_orig_entry(struct hlist_node *node,</div><div class='add'>+			     size_t entry_offset)</div><div class='add'>+{</div><div class='add'>+	/* sanity check */</div><div class='add'>+	switch (entry_offset) {</div><div class='add'>+	case offsetof(struct batadv_orig_node, mcast_want_all_ipv4_node):</div><div class='add'>+	case offsetof(struct batadv_orig_node, mcast_want_all_ipv6_node):</div><div class='add'>+	case offsetof(struct batadv_orig_node, mcast_want_all_rtr4_node):</div><div class='add'>+	case offsetof(struct batadv_orig_node, mcast_want_all_rtr6_node):</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (struct batadv_orig_node *)((void *)node - entry_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_dest() - push an originator MAC address onto an skb</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination address onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @orig_node: the originator node to get the MAC address from</div><div class='add'>+ * @num_dests: a pointer to store the number of pushed addresses in</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * If the orig_node is a BLA backbone gateway, if there is not enough skb</div><div class='add'>+ * headroom available or if num_dests is already at its maximum (65535) then</div><div class='add'>+ * neither the skb nor num_dests is changed. Otherwise the originator's MAC</div><div class='add'>+ * address is pushed onto the given skb and num_dests incremented by one.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the orig_node is a backbone gateway or if an orig address</div><div class='add'>+ *  was pushed successfully, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_mcast_forw_push_dest(struct batadv_priv *bat_priv,</div><div class='add'>+					struct sk_buff *skb, unsigned short vid,</div><div class='add'>+					struct batadv_orig_node *orig_node,</div><div class='add'>+					unsigned short *num_dests,</div><div class='add'>+					unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof_field(struct batadv_tvlv_mcast_tracker, num_dests)</div><div class='add'>+		     != sizeof(__be16));</div><div class='add'>+</div><div class='add'>+	/* Avoid sending to other BLA gateways - they already got the frame from</div><div class='add'>+	 * the LAN side we share with them.</div><div class='add'>+	 * TODO: Refactor to take BLA into account earlier in mode check.</div><div class='add'>+	 */</div><div class='add'>+	if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node-&gt;orig, vid))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; ETH_ALEN || *num_dests == U16_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_skb_push(skb, ETH_ALEN, tvlv_len);</div><div class='add'>+	ether_addr_copy(skb-&gt;data, orig_node-&gt;orig);</div><div class='add'>+	(*num_dests)++;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_dests_list() - push originators from list onto an skb</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination addresses onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @head: the list to gather originators from</div><div class='add'>+ * @entry_offset: offset of an hlist node in an orig_node structure</div><div class='add'>+ * @num_dests: a pointer to store the number of pushed addresses in</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Push the MAC addresses of all originators in the given list onto the given</div><div class='add'>+ * skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static int batadv_mcast_forw_push_dests_list(struct batadv_priv *bat_priv,</div><div class='add'>+					     struct sk_buff *skb,</div><div class='add'>+					     unsigned short vid,</div><div class='add'>+					     struct hlist_head *head,</div><div class='add'>+					     size_t entry_offset,</div><div class='add'>+					     unsigned short *num_dests,</div><div class='add'>+					     unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	__hlist_for_each_rcu(node, head) {</div><div class='add'>+		orig_node = batadv_mcast_forw_orig_entry(node, entry_offset);</div><div class='add'>+		if (!orig_node ||</div><div class='add'>+		    !batadv_mcast_forw_push_dest(bat_priv, skb, vid, orig_node,</div><div class='add'>+						 num_dests, tvlv_len)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_tt() - push originators with interest through TT</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination addresses onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @num_dests: a pointer to store the number of pushed addresses in</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Push the MAC addresses of all originators which have indicated interest in</div><div class='add'>+ * this multicast packet through the translation table onto the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+batadv_mcast_forw_push_tt(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			  unsigned short vid, unsigned short *num_dests,</div><div class='add'>+			  unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tt_orig_list_entry *orig_entry;</div><div class='add'>+</div><div class='add'>+	struct batadv_tt_global_entry *tt_global;</div><div class='add'>+	const u8 *addr = eth_hdr(skb)-&gt;h_dest;</div><div class='add'>+</div><div class='add'>+	/* ok */</div><div class='add'>+	int ret = true;</div><div class='add'>+</div><div class='add'>+	tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid);</div><div class='add'>+	if (!tt_global)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(orig_entry, &amp;tt_global-&gt;orig_list, list) {</div><div class='add'>+		if (!batadv_mcast_forw_push_dest(bat_priv, skb, vid,</div><div class='add'>+						 orig_entry-&gt;orig_node,</div><div class='add'>+						 num_dests, tvlv_len)) {</div><div class='add'>+			ret = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	batadv_tt_global_entry_put(tt_global);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_want_all() - push originators with want-all flag</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination addresses onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @num_dests: a pointer to store the number of pushed addresses in</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Push the MAC addresses of all originators which have indicated interest in</div><div class='add'>+ * this multicast packet through the want-all flag onto the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_mcast_forw_push_want_all(struct batadv_priv *bat_priv,</div><div class='add'>+					    struct sk_buff *skb,</div><div class='add'>+					    unsigned short vid,</div><div class='add'>+					    unsigned short *num_dests,</div><div class='add'>+					    unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = NULL;</div><div class='add'>+	size_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (eth_hdr(skb)-&gt;h_proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		head = &amp;bat_priv-&gt;mcast.want_all_ipv4_list;</div><div class='add'>+		offset = offsetof(struct batadv_orig_node,</div><div class='add'>+				  mcast_want_all_ipv4_node);</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		head = &amp;bat_priv-&gt;mcast.want_all_ipv6_list;</div><div class='add'>+		offset = offsetof(struct batadv_orig_node,</div><div class='add'>+				  mcast_want_all_ipv6_node);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_dests_list(bat_priv, skb, vid, head,</div><div class='add'>+						offset, num_dests, tvlv_len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_want_rtr() - push originators with want-router flag</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination addresses onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @num_dests: a pointer to store the number of pushed addresses in</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Push the MAC addresses of all originators which have indicated interest in</div><div class='add'>+ * this multicast packet through the want-all-rtr flag onto the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_mcast_forw_push_want_rtr(struct batadv_priv *bat_priv,</div><div class='add'>+					    struct sk_buff *skb,</div><div class='add'>+					    unsigned short vid,</div><div class='add'>+					    unsigned short *num_dests,</div><div class='add'>+					    unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = NULL;</div><div class='add'>+	size_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (eth_hdr(skb)-&gt;h_proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		head = &amp;bat_priv-&gt;mcast.want_all_rtr4_list;</div><div class='add'>+		offset = offsetof(struct batadv_orig_node,</div><div class='add'>+				  mcast_want_all_rtr4_node);</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		head = &amp;bat_priv-&gt;mcast.want_all_rtr6_list;</div><div class='add'>+		offset = offsetof(struct batadv_orig_node,</div><div class='add'>+				  mcast_want_all_rtr6_node);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_dests_list(bat_priv, skb, vid, head,</div><div class='add'>+						offset, num_dests, tvlv_len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_scrape() - remove bytes within skb data</div><div class='add'>+ * @skb: the skb to remove bytes from</div><div class='add'>+ * @offset: the offset from the skb data from which to scrape</div><div class='add'>+ * @len: the amount of bytes to scrape starting from the offset</div><div class='add'>+ *</div><div class='add'>+ * Scrapes/removes len bytes from the given skb at the given offset from the</div><div class='add'>+ * skb data.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the region from the skb data's start up</div><div class='add'>+ * to/including the to be removed bytes are linearized.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_forw_scrape(struct sk_buff *skb,</div><div class='add'>+				     unsigned short offset,</div><div class='add'>+				     unsigned short len)</div><div class='add'>+{</div><div class='add'>+	char *to, *from;</div><div class='add'>+</div><div class='add'>+	SKB_LINEAR_ASSERT(skb);</div><div class='add'>+</div><div class='add'>+	to = skb_pull(skb, len);</div><div class='add'>+	from = to - len;</div><div class='add'>+</div><div class='add'>+	memmove(to, from, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_scrape_padding() - remove TVLV padding</div><div class='add'>+ * @skb: the skb to potentially adjust the TVLV's padding on</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Remove two padding bytes from the end of the multicast tracker TVLV,</div><div class='add'>+ * from before the payload data.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure that the TVLV bytes are linearized.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_forw_push_scrape_padding(struct sk_buff *skb,</div><div class='add'>+						  unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	const int pad_len = 2;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_scrape(skb, *tvlv_len - pad_len, pad_len);</div><div class='add'>+	*tvlv_len -= pad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_insert_padding() - insert TVLV padding</div><div class='add'>+ * @skb: the skb to potentially adjust the TVLV's padding on</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Inserts two padding bytes at the end of the multicast tracker TVLV,</div><div class='add'>+ * before the payload data in the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_mcast_forw_push_insert_padding(struct sk_buff *skb,</div><div class='add'>+						  unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	unsigned short offset =	*tvlv_len;</div><div class='add'>+	char *to, *from = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	to = batadv_mcast_forw_push_padding(skb, tvlv_len);</div><div class='add'>+	if (!to)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memmove(to, from, offset);</div><div class='add'>+	memset(to + offset, 0, *tvlv_len - offset);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_adjust_padding() - adjust padding if necessary</div><div class='add'>+ * @skb: the skb to potentially adjust the TVLV's padding on</div><div class='add'>+ * @count: the estimated number of originators the multicast packet needs to</div><div class='add'>+ *  be sent to</div><div class='add'>+ * @num_dests_pushed: the number of originators that were actually added to the</div><div class='add'>+ *  multicast packet's tracker TVLV</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Adjusts the padding in the multicast packet's tracker TVLV depending on the</div><div class='add'>+ * initially estimated amount of destinations versus the amount of destinations</div><div class='add'>+ * that were actually added to the tracker TVLV.</div><div class='add'>+ *</div><div class='add'>+ * If the initial estimate was correct or at least the oddness was the same then</div><div class='add'>+ * no padding adjustment is performed.</div><div class='add'>+ * If the initially estimated number was even, so padding was initially added,</div><div class='add'>+ * but it turned out to be odd then padding is removed.</div><div class='add'>+ * If the initially estimated number was odd, so no padding was initially added,</div><div class='add'>+ * but it turned out to be even then padding is added.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if no padding adjustment is needed or the adjustment was</div><div class='add'>+ * successful, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+batadv_mcast_forw_push_adjust_padding(struct sk_buff *skb, int *count,</div><div class='add'>+				      unsigned short num_dests_pushed,</div><div class='add'>+				      unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	int ret = true;</div><div class='add'>+</div><div class='add'>+	if (likely((num_dests_pushed % 2) == (*count % 2)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * estimated even number of destinations, but turned out to be odd</div><div class='add'>+	 * -&gt; remove padding</div><div class='add'>+	 */</div><div class='add'>+	if (!(*count % 2) &amp;&amp; (num_dests_pushed % 2))</div><div class='add'>+		batadv_mcast_forw_push_scrape_padding(skb, tvlv_len);</div><div class='add'>+	/**</div><div class='add'>+	 * estimated odd number of destinations, but turned out to be even</div><div class='add'>+	 * -&gt; add padding</div><div class='add'>+	 */</div><div class='add'>+	else if ((*count % 2) &amp;&amp; (!(num_dests_pushed % 2)))</div><div class='add'>+		ret = batadv_mcast_forw_push_insert_padding(skb, tvlv_len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	*count = num_dests_pushed;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_dests() - push originator addresses onto an skb</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the destination addresses onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: indicates whether the destination is routable</div><div class='add'>+ * @count: the number of originators the multicast packet needs to be sent to</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Push the MAC addresses of all originators which have indicated interest in</div><div class='add'>+ * this multicast packet onto the given skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM if there is not enough skb headroom available. Otherwise, on</div><div class='add'>+ * success 0.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_push_dests(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			     unsigned short vid, int is_routable, int *count,</div><div class='add'>+			     unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	unsigned short num_dests = 0;</div><div class='add'>+</div><div class='add'>+	if (!batadv_mcast_forw_push_est_padding(skb, *count, tvlv_len))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!batadv_mcast_forw_push_tt(bat_priv, skb, vid, &amp;num_dests,</div><div class='add'>+				       tvlv_len))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!batadv_mcast_forw_push_want_all(bat_priv, skb, vid, &amp;num_dests,</div><div class='add'>+					     tvlv_len))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (is_routable &amp;&amp;</div><div class='add'>+	    !batadv_mcast_forw_push_want_rtr(bat_priv, skb, vid, &amp;num_dests,</div><div class='add'>+					     tvlv_len))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!batadv_mcast_forw_push_adjust_padding(skb, count, num_dests,</div><div class='add'>+						   tvlv_len))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_tracker() - push a multicast tracker TVLV header</div><div class='add'>+ * @skb: the skb to push the tracker TVLV onto</div><div class='add'>+ * @num_dests: the number of destination addresses to set in the header</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Pushes a multicast tracker TVLV header onto the given skb, including the</div><div class='add'>+ * generic TVLV header but excluding the destination MAC addresses.</div><div class='add'>+ *</div><div class='add'>+ * The provided num_dests value is taken into consideration to set the</div><div class='add'>+ * num_dests field in the tracker header and to set the appropriate TVLV length</div><div class='add'>+ * value fields.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM if there is not enough skb headroom available. Otherwise, on</div><div class='add'>+ * success 0.</div><div class='add'>+ */</div><div class='add'>+static int batadv_mcast_forw_push_tracker(struct sk_buff *skb, int num_dests,</div><div class='add'>+					  unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tvlv_mcast_tracker *mcast_tracker;</div><div class='add'>+	struct batadv_tvlv_hdr *tvlv_hdr;</div><div class='add'>+	unsigned int tvlv_value_len;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; sizeof(*mcast_tracker) + sizeof(*tvlv_hdr))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tvlv_value_len = sizeof(*mcast_tracker) + *tvlv_len;</div><div class='add'>+	if (tvlv_value_len + sizeof(*tvlv_hdr) &gt; U16_MAX)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_skb_push(skb, sizeof(*mcast_tracker), tvlv_len);</div><div class='add'>+	mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb-&gt;data;</div><div class='add'>+	mcast_tracker-&gt;num_dests = htons(num_dests);</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_skb_push(skb, sizeof(*tvlv_hdr), tvlv_len);</div><div class='add'>+	tvlv_hdr = (struct batadv_tvlv_hdr *)skb-&gt;data;</div><div class='add'>+	tvlv_hdr-&gt;type = BATADV_TVLV_MCAST_TRACKER;</div><div class='add'>+	tvlv_hdr-&gt;version = 1;</div><div class='add'>+	tvlv_hdr-&gt;len = htons(tvlv_value_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_tvlvs() - push a multicast tracker TVLV onto an skb</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the skb to push the tracker TVLV onto</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: indicates whether the destination is routable</div><div class='add'>+ * @count: the number of originators the multicast packet needs to be sent to</div><div class='add'>+ * @tvlv_len: stores the amount of currently pushed TVLV bytes</div><div class='add'>+ *</div><div class='add'>+ * Pushes a multicast tracker TVLV onto the given skb, including the collected</div><div class='add'>+ * destination MAC addresses and the generic TVLV header.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM if there is not enough skb headroom available. Otherwise, on</div><div class='add'>+ * success 0.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_push_tvlvs(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			     unsigned short vid, int is_routable, int count,</div><div class='add'>+			     unsigned short *tvlv_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_dests(bat_priv, skb, vid, is_routable,</div><div class='add'>+					   &amp;count, tvlv_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_tracker(skb, count, tvlv_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push_hdr() - push a multicast packet header onto an skb</div><div class='add'>+ * @skb: the skb to push the header onto</div><div class='add'>+ * @tvlv_len: the total TVLV length value to set in the header</div><div class='add'>+ *</div><div class='add'>+ * Pushes a batman-adv multicast packet header onto the given skb and sets</div><div class='add'>+ * the provided total TVLV length value in it.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to ensure enough skb headroom is available.</div><div class='add'>+ *</div><div class='add'>+ * Return: -ENOMEM if there is not enough skb headroom available. Otherwise, on</div><div class='add'>+ * success 0.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+batadv_mcast_forw_push_hdr(struct sk_buff *skb, unsigned short tvlv_len)</div><div class='add'>+{</div><div class='add'>+	struct batadv_mcast_packet *mcast_packet;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; sizeof(*mcast_packet))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*mcast_packet));</div><div class='add'>+</div><div class='add'>+	mcast_packet = (struct batadv_mcast_packet *)skb-&gt;data;</div><div class='add'>+	mcast_packet-&gt;version = BATADV_COMPAT_VERSION;</div><div class='add'>+	mcast_packet-&gt;ttl = BATADV_TTL;</div><div class='add'>+	mcast_packet-&gt;packet_type = BATADV_MCAST;</div><div class='add'>+	mcast_packet-&gt;reserved = 0;</div><div class='add'>+	mcast_packet-&gt;tvlv_len = htons(tvlv_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_scrub_dests() - scrub destinations in a tracker TVLV</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @comp_neigh: next hop neighbor to scrub+collect destinations for</div><div class='add'>+ * @dest: start MAC entry in original skb's tracker TVLV</div><div class='add'>+ * @next_dest: start MAC entry in to be sent skb's tracker TVLV</div><div class='add'>+ * @num_dests: number of remaining destination MAC entries to iterate over</div><div class='add'>+ *</div><div class='add'>+ * This sorts destination entries into either the original batman-adv</div><div class='add'>+ * multicast packet or the skb (copy) that is going to be sent to comp_neigh</div><div class='add'>+ * next.</div><div class='add'>+ *</div><div class='add'>+ * In preparation for the next, to be (unicast) transmitted batman-adv multicast</div><div class='add'>+ * packet skb to be sent to the given neighbor node, tries to collect all</div><div class='add'>+ * originator MAC addresses that have the given neighbor node as their next hop</div><div class='add'>+ * in the to be transmitted skb (copy), which next_dest points into. That is we</div><div class='add'>+ * zero all destination entries in next_dest which do not have comp_neigh as</div><div class='add'>+ * their next hop. And zero all destination entries in the original skb that</div><div class='add'>+ * would have comp_neigh as their next hop (to avoid redundant transmissions and</div><div class='add'>+ * duplicated payload later).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+batadv_mcast_forw_scrub_dests(struct batadv_priv *bat_priv,</div><div class='add'>+			      struct batadv_neigh_node *comp_neigh, u8 *dest,</div><div class='add'>+			      u8 *next_dest, u16 num_dests)</div><div class='add'>+{</div><div class='add'>+	struct batadv_neigh_node *next_neigh;</div><div class='add'>+</div><div class='add'>+	/* skip first entry, this is what we are comparing with */</div><div class='add'>+	eth_zero_addr(dest);</div><div class='add'>+	dest += ETH_ALEN;</div><div class='add'>+	next_dest += ETH_ALEN;</div><div class='add'>+	num_dests--;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_tracker_for_each_dest2(dest, next_dest, num_dests) {</div><div class='add'>+		if (is_zero_ether_addr(next_dest))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* sanity check, we expect unicast destinations */</div><div class='add'>+		if (is_multicast_ether_addr(next_dest)) {</div><div class='add'>+			eth_zero_addr(dest);</div><div class='add'>+			eth_zero_addr(next_dest);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next_neigh = batadv_orig_to_router(bat_priv, next_dest, NULL);</div><div class='add'>+		if (!next_neigh) {</div><div class='add'>+			eth_zero_addr(next_dest);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!batadv_compare_eth(next_neigh-&gt;addr, comp_neigh-&gt;addr)) {</div><div class='add'>+			eth_zero_addr(next_dest);</div><div class='add'>+			batadv_neigh_node_put(next_neigh);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* found an entry for our next packet to transmit, so remove it</div><div class='add'>+		 * from the original packet</div><div class='add'>+		 */</div><div class='add'>+		eth_zero_addr(dest);</div><div class='add'>+		batadv_neigh_node_put(next_neigh);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_fill() - swap slot with next non-zero destination</div><div class='add'>+ * @slot: the to be filled zero-MAC destination entry in a tracker TVLV</div><div class='add'>+ * @num_dests_slot: remaining entries in tracker TVLV from/including slot</div><div class='add'>+ *</div><div class='add'>+ * Searches for the next non-zero-MAC destination entry in a tracker TVLV after</div><div class='add'>+ * the given slot pointer. And if found, swaps it with the zero-MAC destination</div><div class='add'>+ * entry which the slot points to.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if slot was swapped/filled successfully, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_mcast_forw_shrink_fill(u8 *slot, u16 num_dests_slot)</div><div class='add'>+{</div><div class='add'>+	u16 num_dests_filler;</div><div class='add'>+	u8 *filler;</div><div class='add'>+</div><div class='add'>+	/* sanity check, should not happen */</div><div class='add'>+	if (!num_dests_slot)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	num_dests_filler = num_dests_slot - 1;</div><div class='add'>+	filler = slot + ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	/* find a candidate to fill the empty slot */</div><div class='add'>+	batadv_mcast_forw_tracker_for_each_dest(filler, num_dests_filler) {</div><div class='add'>+		if (is_zero_ether_addr(filler))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(slot, filler);</div><div class='add'>+		eth_zero_addr(filler);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_pack_dests() - pack destinations of a tracker TVLV</div><div class='add'>+ * @skb: the batman-adv multicast packet to compact destinations in</div><div class='add'>+ *</div><div class='add'>+ * Compacts the originator destination MAC addresses in the multicast tracker</div><div class='add'>+ * TVLV of the given multicast packet. This is done by moving all non-zero</div><div class='add'>+ * MAC addresses in direction of the skb head and all zero MAC addresses in skb</div><div class='add'>+ * tail direction, within the multicast tracker TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Return: The number of consecutive zero MAC address destinations which are</div><div class='add'>+ * now at the end of the multicast tracker TVLV.</div><div class='add'>+ */</div><div class='add'>+static int batadv_mcast_forw_shrink_pack_dests(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tvlv_mcast_tracker *mcast_tracker;</div><div class='add'>+	unsigned char *skb_net_hdr;</div><div class='add'>+	u16 num_dests_slot;</div><div class='add'>+	u8 *slot;</div><div class='add'>+</div><div class='add'>+	skb_net_hdr = skb_network_header(skb);</div><div class='add'>+	mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr;</div><div class='add'>+	num_dests_slot = ntohs(mcast_tracker-&gt;num_dests);</div><div class='add'>+</div><div class='add'>+	slot = (u8 *)mcast_tracker + sizeof(*mcast_tracker);</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_tracker_for_each_dest(slot, num_dests_slot) {</div><div class='add'>+		/* find an empty slot */</div><div class='add'>+		if (!is_zero_ether_addr(slot))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!batadv_mcast_forw_shrink_fill(slot, num_dests_slot))</div><div class='add'>+			/* could not find a filler, so we successfully packed</div><div class='add'>+			 * and can stop - and must not reduce num_dests_slot!</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* num_dests_slot is now the amount of reduced, zeroed</div><div class='add'>+	 * destinations at the end of the tracker TVLV</div><div class='add'>+	 */</div><div class='add'>+	return num_dests_slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_align_offset() - get new alignment offset</div><div class='add'>+ * @num_dests_old: the old, to be updated amount of destination nodes</div><div class='add'>+ * @num_dests_reduce: the number of destinations that were removed</div><div class='add'>+ *</div><div class='add'>+ * Calculates the amount of potential extra alignment offset that is needed to</div><div class='add'>+ * adjust the TVLV padding after the change in destination nodes.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	0: If no change to padding is needed.</div><div class='add'>+ *	2: If padding needs to be removed.</div><div class='add'>+ *	-2: If padding needs to be added.</div><div class='add'>+ */</div><div class='add'>+static short</div><div class='add'>+batadv_mcast_forw_shrink_align_offset(unsigned int num_dests_old,</div><div class='add'>+				      unsigned int num_dests_reduce)</div><div class='add'>+{</div><div class='add'>+	/* even amount of removed destinations -&gt; no alignment change */</div><div class='add'>+	if (!(num_dests_reduce % 2))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* even to odd amount of destinations -&gt; remove padding */</div><div class='add'>+	if (!(num_dests_old % 2))</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	/* odd to even amount of destinations -&gt; add padding */</div><div class='add'>+	return -2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_update_headers() - update shrunk mc packet headers</div><div class='add'>+ * @skb: the batman-adv multicast packet to update headers of</div><div class='add'>+ * @num_dests_reduce: the number of destinations that were removed</div><div class='add'>+ *</div><div class='add'>+ * This updates any fields of a batman-adv multicast packet that are affected</div><div class='add'>+ * by the reduced number of destinations in the multicast tracket TVLV. In</div><div class='add'>+ * particular this updates:</div><div class='add'>+ *</div><div class='add'>+ * The num_dest field of the multicast tracker TVLV.</div><div class='add'>+ * The TVLV length field of the according generic TVLV header.</div><div class='add'>+ * The batman-adv multicast packet's total TVLV length field.</div><div class='add'>+ *</div><div class='add'>+ * Return: The offset in skb's tail direction at which the new batman-adv</div><div class='add'>+ * multicast packet header needs to start.</div><div class='add'>+ */</div><div class='add'>+static unsigned int</div><div class='add'>+batadv_mcast_forw_shrink_update_headers(struct sk_buff *skb,</div><div class='add'>+					unsigned int num_dests_reduce)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tvlv_mcast_tracker *mcast_tracker;</div><div class='add'>+	struct batadv_mcast_packet *mcast_packet;</div><div class='add'>+	struct batadv_tvlv_hdr *tvlv_hdr;</div><div class='add'>+	unsigned char *skb_net_hdr;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	short align_offset;</div><div class='add'>+	u16 num_dests;</div><div class='add'>+</div><div class='add'>+	skb_net_hdr = skb_network_header(skb);</div><div class='add'>+	mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr;</div><div class='add'>+	num_dests = ntohs(mcast_tracker-&gt;num_dests);</div><div class='add'>+</div><div class='add'>+	align_offset = batadv_mcast_forw_shrink_align_offset(num_dests,</div><div class='add'>+							     num_dests_reduce);</div><div class='add'>+	offset = ETH_ALEN * num_dests_reduce + align_offset;</div><div class='add'>+	num_dests -= num_dests_reduce;</div><div class='add'>+</div><div class='add'>+	/* update tracker header */</div><div class='add'>+	mcast_tracker-&gt;num_dests = htons(num_dests);</div><div class='add'>+</div><div class='add'>+	/* update tracker's tvlv header's length field */</div><div class='add'>+	tvlv_hdr = (struct batadv_tvlv_hdr *)(skb_network_header(skb) -</div><div class='add'>+					      sizeof(*tvlv_hdr));</div><div class='add'>+	tvlv_hdr-&gt;len = htons(ntohs(tvlv_hdr-&gt;len) - offset);</div><div class='add'>+</div><div class='add'>+	/* update multicast packet header's tvlv length field */</div><div class='add'>+	mcast_packet = (struct batadv_mcast_packet *)skb-&gt;data;</div><div class='add'>+	mcast_packet-&gt;tvlv_len = htons(ntohs(mcast_packet-&gt;tvlv_len) - offset);</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_move_headers() - move multicast headers by offset</div><div class='add'>+ * @skb: the batman-adv multicast packet to move headers for</div><div class='add'>+ * @offset: a non-negative offset to move headers by, towards the skb tail</div><div class='add'>+ *</div><div class='add'>+ * Moves the batman-adv multicast packet header, its multicast tracker TVLV and</div><div class='add'>+ * any TVLVs in between by the given offset in direction towards the tail.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+batadv_mcast_forw_shrink_move_headers(struct sk_buff *skb, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tvlv_mcast_tracker *mcast_tracker;</div><div class='add'>+	unsigned char *skb_net_hdr;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	u16 num_dests;</div><div class='add'>+</div><div class='add'>+	skb_net_hdr = skb_network_header(skb);</div><div class='add'>+	mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr;</div><div class='add'>+	num_dests = ntohs(mcast_tracker-&gt;num_dests);</div><div class='add'>+	len = skb_network_offset(skb) + sizeof(*mcast_tracker);</div><div class='add'>+	len += num_dests * ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_scrape(skb, len, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_shrink_tracker() - remove zero addresses in a tracker tvlv</div><div class='add'>+ * @skb: the batman-adv multicast packet to (potentially) shrink</div><div class='add'>+ *</div><div class='add'>+ * Removes all destinations with a zero MAC addresses (00:00:00:00:00:00) from</div><div class='add'>+ * the given batman-adv multicast packet's tracker TVLV and updates headers</div><div class='add'>+ * accordingly to maintain a valid batman-adv multicast packet.</div><div class='add'>+ */</div><div class='add'>+static void batadv_mcast_forw_shrink_tracker(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	u16 dests_reduced;</div><div class='add'>+</div><div class='add'>+	dests_reduced = batadv_mcast_forw_shrink_pack_dests(skb);</div><div class='add'>+	if (!dests_reduced)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	offset = batadv_mcast_forw_shrink_update_headers(skb, dests_reduced);</div><div class='add'>+	batadv_mcast_forw_shrink_move_headers(skb, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_packet() - forward a batman-adv multicast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the received or locally generated batman-adv multicast packet</div><div class='add'>+ * @local_xmit: indicates that the packet was locally generated and not received</div><div class='add'>+ *</div><div class='add'>+ * Parses the tracker TVLV of a batman-adv multicast packet and forwards the</div><div class='add'>+ * packet as indicated in this TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to set the skb network header to the start of the multicast</div><div class='add'>+ * tracker TVLV (excluding the generic TVLV header) and the skb transport header</div><div class='add'>+ * to the next byte after this multicast tracker TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to free the skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_RX_SUCCESS or NET_RX_DROP on success or a negative error</div><div class='add'>+ * code on failure. NET_RX_SUCCESS if the received packet is supposed to be</div><div class='add'>+ * decapsulated and forwarded to the own mesh interface, NET_RX_DROP otherwise.</div><div class='add'>+ */</div><div class='add'>+static int batadv_mcast_forw_packet(struct batadv_priv *bat_priv,</div><div class='add'>+				    struct sk_buff *skb, bool local_xmit)</div><div class='add'>+{</div><div class='add'>+	struct batadv_tvlv_mcast_tracker *mcast_tracker;</div><div class='add'>+	struct batadv_neigh_node *neigh_node;</div><div class='add'>+	unsigned long offset, num_dests_off;</div><div class='add'>+	struct sk_buff *nexthop_skb;</div><div class='add'>+	unsigned char *skb_net_hdr;</div><div class='add'>+	bool local_recv = false;</div><div class='add'>+	unsigned int tvlv_len;</div><div class='add'>+	bool xmitted = false;</div><div class='add'>+	u8 *dest, *next_dest;</div><div class='add'>+	u16 num_dests;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* (at least) TVLV part needs to be linearized */</div><div class='add'>+	SKB_LINEAR_ASSERT(skb);</div><div class='add'>+</div><div class='add'>+	/* check if num_dests is within skb length */</div><div class='add'>+	num_dests_off = offsetof(struct batadv_tvlv_mcast_tracker, num_dests);</div><div class='add'>+	if (num_dests_off &gt; skb_network_header_len(skb))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	skb_net_hdr = skb_network_header(skb);</div><div class='add'>+	mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr;</div><div class='add'>+	num_dests = ntohs(mcast_tracker-&gt;num_dests);</div><div class='add'>+</div><div class='add'>+	dest = (u8 *)mcast_tracker + sizeof(*mcast_tracker);</div><div class='add'>+</div><div class='add'>+	/* check if full tracker tvlv is within skb length */</div><div class='add'>+	tvlv_len = sizeof(*mcast_tracker) + ETH_ALEN * num_dests;</div><div class='add'>+	if (tvlv_len &gt; skb_network_header_len(skb))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* invalidate checksum: */</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) {</div><div class='add'>+		if (is_zero_ether_addr(dest))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* only unicast originator addresses supported */</div><div class='add'>+		if (is_multicast_ether_addr(dest)) {</div><div class='add'>+			eth_zero_addr(dest);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (batadv_is_my_mac(bat_priv, dest)) {</div><div class='add'>+			eth_zero_addr(dest);</div><div class='add'>+			local_recv = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		neigh_node = batadv_orig_to_router(bat_priv, dest, NULL);</div><div class='add'>+		if (!neigh_node) {</div><div class='add'>+			eth_zero_addr(dest);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nexthop_skb = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+		if (!nexthop_skb) {</div><div class='add'>+			batadv_neigh_node_put(neigh_node);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset = dest - skb-&gt;data;</div><div class='add'>+		next_dest = nexthop_skb-&gt;data + offset;</div><div class='add'>+</div><div class='add'>+		batadv_mcast_forw_scrub_dests(bat_priv, neigh_node, dest,</div><div class='add'>+					      next_dest, num_dests);</div><div class='add'>+		batadv_mcast_forw_shrink_tracker(nexthop_skb);</div><div class='add'>+</div><div class='add'>+		batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_TX);</div><div class='add'>+		batadv_add_counter(bat_priv, BATADV_CNT_MCAST_TX_BYTES,</div><div class='add'>+				   nexthop_skb-&gt;len + ETH_HLEN);</div><div class='add'>+		xmitted = true;</div><div class='add'>+		ret = batadv_send_unicast_skb(nexthop_skb, neigh_node);</div><div class='add'>+</div><div class='add'>+		batadv_neigh_node_put(neigh_node);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xmitted) {</div><div class='add'>+		if (local_xmit) {</div><div class='add'>+			batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_TX_LOCAL);</div><div class='add'>+			batadv_add_counter(bat_priv,</div><div class='add'>+					   BATADV_CNT_MCAST_TX_LOCAL_BYTES,</div><div class='add'>+					   skb-&gt;len -</div><div class='add'>+					   skb_transport_offset(skb));</div><div class='add'>+		} else {</div><div class='add'>+			batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_FWD);</div><div class='add'>+			batadv_add_counter(bat_priv, BATADV_CNT_MCAST_FWD_BYTES,</div><div class='add'>+					   skb-&gt;len + ETH_HLEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (local_recv)</div><div class='add'>+		return NET_RX_SUCCESS;</div><div class='add'>+	else</div><div class='add'>+		return NET_RX_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_tracker_tvlv_handler() - handle an mcast tracker tvlv</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the received batman-adv multicast packet</div><div class='add'>+ *</div><div class='add'>+ * Parses the tracker TVLV of an incoming batman-adv multicast packet and</div><div class='add'>+ * forwards the packet as indicated in this TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to set the skb network header to the start of the multicast</div><div class='add'>+ * tracker TVLV (excluding the generic TVLV header) and the skb transport header</div><div class='add'>+ * to the next byte after this multicast tracker TVLV.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to free the skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_RX_SUCCESS or NET_RX_DROP on success or a negative error</div><div class='add'>+ * code on failure. NET_RX_SUCCESS if the received packet is supposed to be</div><div class='add'>+ * decapsulated and forwarded to the own mesh interface, NET_RX_DROP otherwise.</div><div class='add'>+ */</div><div class='add'>+int batadv_mcast_forw_tracker_tvlv_handler(struct batadv_priv *bat_priv,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return batadv_mcast_forw_packet(bat_priv, skb, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_packet_hdrlen() - multicast packet header length</div><div class='add'>+ * @num_dests: number of destination nodes</div><div class='add'>+ *</div><div class='add'>+ * Calculates the total batman-adv multicast packet header length for a given</div><div class='add'>+ * number of destination nodes (excluding the outer ethernet frame).</div><div class='add'>+ *</div><div class='add'>+ * Return: The calculated total batman-adv multicast packet header length.</div><div class='add'>+ */</div><div class='add'>+unsigned int batadv_mcast_forw_packet_hdrlen(unsigned int num_dests)</div><div class='add'>+{</div><div class='add'>+	/**</div><div class='add'>+	 * If the number of destination entries is even then we need to add</div><div class='add'>+	 * two byte padding to the tracker TVLV.</div><div class='add'>+	 */</div><div class='add'>+	int padding = (!(num_dests % 2)) ? 2 : 0;</div><div class='add'>+</div><div class='add'>+	return padding + num_dests * ETH_ALEN +</div><div class='add'>+	       sizeof(struct batadv_tvlv_mcast_tracker) +</div><div class='add'>+	       sizeof(struct batadv_tvlv_hdr) +</div><div class='add'>+	       sizeof(struct batadv_mcast_packet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_expand_head() - expand headroom for an mcast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to send</div><div class='add'>+ *</div><div class='add'>+ * Tries to expand an skb's headroom so that its head to tail is 1298</div><div class='add'>+ * bytes (minimum IPv6 MTU + vlan ethernet header size) large.</div><div class='add'>+ *</div><div class='add'>+ * Return: -EINVAL if the given skb's length is too large or -ENOMEM on memory</div><div class='add'>+ * allocation failure. Otherwise, on success, zero is returned.</div><div class='add'>+ */</div><div class='add'>+static int batadv_mcast_forw_expand_head(struct batadv_priv *bat_priv,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int hdr_size = VLAN_ETH_HLEN + IPV6_MIN_MTU - skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	 /* TODO: Could be tightened to actual number of destination nodes?</div><div class='add'>+	  * But it's tricky, number of destinations might have increased since</div><div class='add'>+	  * we last checked.</div><div class='add'>+	  */</div><div class='add'>+	if (hdr_size &lt; 0) {</div><div class='add'>+		/* batadv_mcast_forw_mode_check_count() should ensure we do not</div><div class='add'>+		 * end up here</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; hdr_size &amp;&amp;</div><div class='add'>+	    pskb_expand_head(skb, hdr_size, 0, GFP_ATOMIC) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_push() - encapsulate skb in a batman-adv multicast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to encapsulate and send</div><div class='add'>+ * @vid: the vlan identifier</div><div class='add'>+ * @is_routable: indicates whether the destination is routable</div><div class='add'>+ * @count: the number of originators the multicast packet needs to be sent to</div><div class='add'>+ *</div><div class='add'>+ * Encapsulates the given multicast packet in a batman-adv multicast packet.</div><div class='add'>+ * A multicast tracker TVLV with destination originator addresses for any node</div><div class='add'>+ * that signaled interest in it, that is either via the translation table or the</div><div class='add'>+ * according want-all flags, is attached accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool batadv_mcast_forw_push(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='add'>+			    unsigned short vid, int is_routable, int count)</div><div class='add'>+{</div><div class='add'>+	unsigned short tvlv_len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (batadv_mcast_forw_expand_head(bat_priv, skb) &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_tvlvs(bat_priv, skb, vid, is_routable,</div><div class='add'>+					   count, &amp;tvlv_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = batadv_mcast_forw_push_hdr(skb, tvlv_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (tvlv_len)</div><div class='add'>+		skb_pull(skb, tvlv_len);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_mcast_forw_mcsend() - send a self prepared batman-adv multicast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: the multicast packet to encapsulate and send</div><div class='add'>+ *</div><div class='add'>+ * Transmits a batman-adv multicast packet that was locally prepared and</div><div class='add'>+ * consumes/frees it.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_XMIT_DROP on memory allocation failure. NET_XMIT_SUCCESS</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+int batadv_mcast_forw_mcsend(struct batadv_priv *bat_priv,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret = batadv_mcast_forw_packet(bat_priv, skb, true);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NET_XMIT_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return NET_XMIT_SUCCESS;</div><div class='add'>+}</div><div class='head'>diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c<br/>index 0d9459b69bdb..78c651f634cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/netlink.c</a></div><div class='hunk'>@@ -1,43 +1,35 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2016-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Matthias Schiffer</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/genetlink.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='hunk'>@@ -47,10 +39,12 @@</div><div class='ctx'> #include "bridge_loop_avoidance.h"</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='add'>+#include "gateway_common.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='add'>+#include "log.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "multicast.h"</div><div class='ctx'> #include "originator.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "tp_meter.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='hunk'>@@ -58,10 +52,38 @@ struct genl_family batadv_netlink_family;</div><div class='ctx'> </div><div class='ctx'> /* multicast groups */</div><div class='ctx'> enum batadv_netlink_multicast_groups {</div><div class='add'>+	BATADV_NL_MCGRP_CONFIG,</div><div class='ctx'> 	BATADV_NL_MCGRP_TPMETER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum batadv_genl_ops_flags - flags for genl_ops's internal_flags</div><div class='add'>+ */</div><div class='add'>+enum batadv_genl_ops_flags {</div><div class='add'>+	/**</div><div class='add'>+	 * @BATADV_FLAG_NEED_MESH: request requires valid mesh interface in</div><div class='add'>+	 *  attribute BATADV_ATTR_MESH_IFINDEX and expects a pointer to it to be</div><div class='add'>+	 *  saved in info-&gt;user_ptr[0]</div><div class='add'>+	 */</div><div class='add'>+	BATADV_FLAG_NEED_MESH = BIT(0),</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @BATADV_FLAG_NEED_HARDIF: request requires valid hard interface in</div><div class='add'>+	 *  attribute BATADV_ATTR_HARD_IFINDEX and expects a pointer to it to be</div><div class='add'>+	 *  saved in info-&gt;user_ptr[1]</div><div class='add'>+	 */</div><div class='add'>+	BATADV_FLAG_NEED_HARDIF = BIT(1),</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @BATADV_FLAG_NEED_VLAN: request requires valid vlan in</div><div class='add'>+	 *  attribute BATADV_ATTR_VLANID and expects a pointer to it to be</div><div class='add'>+	 *  saved in info-&gt;user_ptr[1]</div><div class='add'>+	 */</div><div class='add'>+	BATADV_FLAG_NEED_VLAN = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct genl_multicast_group batadv_netlink_mcgrps[] = {</div><div class='add'>+	[BATADV_NL_MCGRP_CONFIG] = { .name = BATADV_NL_MCAST_GROUP_CONFIG },</div><div class='ctx'> 	[BATADV_NL_MCGRP_TPMETER] = { .name = BATADV_NL_MCAST_GROUP_TPMETER },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +126,26 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {</div><div class='ctx'> 	[BATADV_ATTR_DAT_CACHE_VID]		= { .type = NLA_U16 },</div><div class='ctx'> 	[BATADV_ATTR_MCAST_FLAGS]		= { .type = NLA_U32 },</div><div class='ctx'> 	[BATADV_ATTR_MCAST_FLAGS_PRIV]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_VLANID]			= { .type = NLA_U16 },</div><div class='add'>+	[BATADV_ATTR_AGGREGATED_OGMS_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_AP_ISOLATION_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_ISOLATION_MARK]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_ISOLATION_MASK]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_BONDING_ENABLED]		= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_FRAGMENTATION_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_GW_BANDWIDTH_DOWN]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_GW_BANDWIDTH_UP]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_GW_MODE]			= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_GW_SEL_CLASS]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_HOP_PENALTY]		= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_LOG_LEVEL]			= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[BATADV_ATTR_MULTICAST_FANOUT]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_ORIG_INTERVAL]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_ELP_INTERVAL]		= { .type = NLA_U32 },</div><div class='add'>+	[BATADV_ATTR_THROUGHPUT_OVERRIDE]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -113,49 +155,103 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {</div><div class='ctx'>  *</div><div class='ctx'>  * Return: interface index, or 0.</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='del'>-batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype)</div><div class='add'>+static int batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *attr = nlmsg_find_attr(nlh, GENL_HDRLEN, attrtype);</div><div class='ctx'> </div><div class='del'>-	return attr ? nla_get_u32(attr) : 0;</div><div class='add'>+	return (attr &amp;&amp; nla_len(attr) == sizeof(u32)) ? nla_get_u32(attr) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_netlink_mesh_info_put() - fill in generic information about mesh</div><div class='del'>- *  interface</div><div class='del'>- * @msg: netlink message to be sent back</div><div class='del'>- * @soft_iface: interface for which the data should be taken</div><div class='add'>+ * batadv_netlink_mesh_fill_ap_isolation() - Add ap_isolation meshif attribute</div><div class='add'>+ * @msg: Netlink message to dump into</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 on success, &lt; 0 on error</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-batadv_netlink_mesh_info_put(struct sk_buff *msg, struct net_device *soft_iface)</div><div class='add'>+static int batadv_netlink_mesh_fill_ap_isolation(struct sk_buff *msg,</div><div class='add'>+						 struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='add'>+	u8 ap_isolation;</div><div class='add'>+</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, BATADV_NO_FLAGS);</div><div class='add'>+	if (!vlan)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ap_isolation = atomic_read(&amp;vlan-&gt;ap_isolation);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='add'>+</div><div class='add'>+	return nla_put_u8(msg, BATADV_ATTR_AP_ISOLATION_ENABLED,</div><div class='add'>+			  !!ap_isolation);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_set_mesh_ap_isolation() - Set ap_isolation from genl msg</div><div class='add'>+ * @attr: parsed BATADV_ATTR_AP_ISOLATION_ENABLED attribute</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_set_mesh_ap_isolation(struct nlattr *attr,</div><div class='add'>+						struct batadv_priv *bat_priv)</div><div class='add'>+{</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, BATADV_NO_FLAGS);</div><div class='add'>+	if (!vlan)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;vlan-&gt;ap_isolation, !!nla_get_u8(attr));</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_mesh_fill() - Fill message with mesh attributes</div><div class='add'>+ * @msg: Netlink message to dump into</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @cmd: type of message to generate</div><div class='add'>+ * @portid: Port making netlink request</div><div class='add'>+ * @seq: sequence number for message</div><div class='add'>+ * @flags: Additional flags for message</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_mesh_fill(struct sk_buff *msg,</div><div class='add'>+				    struct batadv_priv *bat_priv,</div><div class='add'>+				    enum batadv_nl_commands cmd,</div><div class='add'>+				    u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *mesh_iface = bat_priv-&gt;mesh_iface;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct net_device *hard_iface;</div><div class='del'>-	int ret = -ENOBUFS;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(msg, BATADV_ATTR_VERSION, BATADV_SOURCE_VERSION) ||</div><div class='ctx'> 	    nla_put_string(msg, BATADV_ATTR_ALGO_NAME,</div><div class='ctx'> 			   bat_priv-&gt;algo_ops-&gt;name) ||</div><div class='del'>-	    nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, soft_iface-&gt;ifindex) ||</div><div class='del'>-	    nla_put_string(msg, BATADV_ATTR_MESH_IFNAME, soft_iface-&gt;name) ||</div><div class='add'>+	    nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, mesh_iface-&gt;ifindex) ||</div><div class='add'>+	    nla_put_string(msg, BATADV_ATTR_MESH_IFNAME, mesh_iface-&gt;name) ||</div><div class='ctx'> 	    nla_put(msg, BATADV_ATTR_MESH_ADDRESS, ETH_ALEN,</div><div class='del'>-		    soft_iface-&gt;dev_addr) ||</div><div class='add'>+		    mesh_iface-&gt;dev_addr) ||</div><div class='ctx'> 	    nla_put_u8(msg, BATADV_ATTR_TT_TTVN,</div><div class='ctx'> 		       (u8)atomic_read(&amp;bat_priv-&gt;tt.vn)))</div><div class='del'>-		goto out;</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='ctx'> 	if (nla_put_u16(msg, BATADV_ATTR_BLA_CRC,</div><div class='ctx'> 			ntohs(bat_priv-&gt;bla.claim_dest.group)))</div><div class='del'>-		goto out;</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_mcast_mesh_info_put(msg, bat_priv))</div><div class='del'>-		goto out;</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (primary_if &amp;&amp; primary_if-&gt;if_status == BATADV_IF_ACTIVE) {</div><div class='hunk'>@@ -167,77 +263,338 @@ batadv_netlink_mesh_info_put(struct sk_buff *msg, struct net_device *soft_iface)</div><div class='ctx'> 				   hard_iface-&gt;name) ||</div><div class='ctx'> 		    nla_put(msg, BATADV_ATTR_HARD_ADDRESS, ETH_ALEN,</div><div class='ctx'> 			    hard_iface-&gt;dev_addr))</div><div class='del'>-			goto out;</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_AGGREGATED_OGMS_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;bat_priv-&gt;aggregated_ogms)))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	if (batadv_netlink_mesh_fill_ap_isolation(msg, bat_priv))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_ISOLATION_MARK,</div><div class='add'>+			bat_priv-&gt;isolation_mark))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_ISOLATION_MASK,</div><div class='add'>+			bat_priv-&gt;isolation_mark_mask))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_BONDING_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;bat_priv-&gt;bonding)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;bat_priv-&gt;bridge_loop_avoidance)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_BLA */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;bat_priv-&gt;distributed_arp_table)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_DAT */</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_FRAGMENTATION_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;bat_priv-&gt;fragmentation)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_GW_BANDWIDTH_DOWN,</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;gw.bandwidth_down)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_GW_BANDWIDTH_UP,</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;gw.bandwidth_up)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_GW_MODE,</div><div class='add'>+		       atomic_read(&amp;bat_priv-&gt;gw.mode)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node &amp;&amp;</div><div class='add'>+	    bat_priv-&gt;algo_ops-&gt;gw.is_eligible) {</div><div class='add'>+		/* GW selection class is not available if the routing algorithm</div><div class='add'>+		 * in use does not implement the GW API</div><div class='add'>+		 */</div><div class='add'>+		if (nla_put_u32(msg, BATADV_ATTR_GW_SEL_CLASS,</div><div class='add'>+				atomic_read(&amp;bat_priv-&gt;gw.sel_class)))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_HOP_PENALTY,</div><div class='add'>+		       atomic_read(&amp;bat_priv-&gt;hop_penalty)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_LOG_LEVEL,</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;log_level)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_DEBUG */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED,</div><div class='add'>+		       !atomic_read(&amp;bat_priv-&gt;multicast_mode)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT,</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;multicast_fanout)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_MCAST */</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_ORIG_INTERVAL,</div><div class='add'>+			atomic_read(&amp;bat_priv-&gt;orig_interval)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_netlink_get_mesh_info() - handle incoming BATADV_CMD_GET_MESH_INFO</div><div class='del'>- *  netlink request</div><div class='del'>- * @skb: received netlink message</div><div class='del'>- * @info: receiver information</div><div class='add'>+ * batadv_netlink_notify_mesh() - send meshif attributes to listener</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, &lt; 0 on error</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-batadv_netlink_get_mesh_info(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+static int batadv_netlink_notify_mesh(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = genl_info_net(info);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	struct sk_buff *msg = NULL;</div><div class='del'>-	void *msg_head;</div><div class='del'>-	int ifindex;</div><div class='add'>+	struct sk_buff *msg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ifindex = nla_get_u32(info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX]);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='add'>+	ret = batadv_netlink_mesh_fill(msg, bat_priv, BATADV_CMD_SET_MESH,</div><div class='add'>+				       0, 0, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genlmsg_multicast_netns(&amp;batadv_netlink_family,</div><div class='add'>+				dev_net(bat_priv-&gt;mesh_iface), msg, 0,</div><div class='add'>+				BATADV_NL_MCGRP_CONFIG, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_mesh() - Get meshif attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_get_mesh(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = batadv_netlink_mesh_fill(msg, bat_priv, BATADV_CMD_GET_MESH,</div><div class='add'>+				       info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	msg_head = genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			       &amp;batadv_netlink_family, 0,</div><div class='del'>-			       BATADV_CMD_GET_MESH_INFO);</div><div class='del'>-	if (!msg_head) {</div><div class='del'>-		ret = -ENOBUFS;</div><div class='del'>-		goto out;</div><div class='add'>+	ret = genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_set_mesh() - Set meshif attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_AGGREGATED_OGMS_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_AGGREGATED_OGMS_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;aggregated_ogms, !!nla_get_u8(attr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = batadv_netlink_mesh_info_put(msg, soft_iface);</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_AP_ISOLATION_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_AP_ISOLATION_ENABLED];</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+		batadv_netlink_set_mesh_ap_isolation(attr, bat_priv);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		if (msg)</div><div class='del'>-			nlmsg_free(msg);</div><div class='del'>-		return ret;</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_ISOLATION_MARK]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_ISOLATION_MARK];</div><div class='add'>+</div><div class='add'>+		bat_priv-&gt;isolation_mark = nla_get_u32(attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	genlmsg_end(msg, msg_head);</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_ISOLATION_MASK]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_ISOLATION_MASK];</div><div class='add'>+</div><div class='add'>+		bat_priv-&gt;isolation_mark_mask = nla_get_u32(attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_BONDING_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_BONDING_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;bonding, !!nla_get_u8(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;bridge_loop_avoidance,</div><div class='add'>+			   !!nla_get_u8(attr));</div><div class='add'>+		batadv_bla_status_update(bat_priv-&gt;mesh_iface);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_BLA */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;distributed_arp_table,</div><div class='add'>+			   !!nla_get_u8(attr));</div><div class='add'>+		batadv_dat_status_update(bat_priv-&gt;mesh_iface);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_DAT */</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_FRAGMENTATION_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_FRAGMENTATION_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;fragmentation, !!nla_get_u8(attr));</div><div class='add'>+</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		batadv_update_min_mtu(bat_priv-&gt;mesh_iface);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;gw.bandwidth_down, nla_get_u32(attr));</div><div class='add'>+		batadv_gw_tvlv_container_update(bat_priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_GW_BANDWIDTH_UP]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_GW_BANDWIDTH_UP];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;gw.bandwidth_up, nla_get_u32(attr));</div><div class='add'>+		batadv_gw_tvlv_container_update(bat_priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_GW_MODE]) {</div><div class='add'>+		u8 gw_mode;</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_GW_MODE];</div><div class='add'>+		gw_mode = nla_get_u8(attr);</div><div class='add'>+</div><div class='add'>+		if (gw_mode &lt;= BATADV_GW_MODE_SERVER) {</div><div class='add'>+			/* Invoking batadv_gw_reselect() is not enough to really</div><div class='add'>+			 * de-select the current GW. It will only instruct the</div><div class='add'>+			 * gateway client code to perform a re-election the next</div><div class='add'>+			 * time that this is needed.</div><div class='add'>+			 *</div><div class='add'>+			 * When gw client mode is being switched off the current</div><div class='add'>+			 * GW must be de-selected explicitly otherwise no GW_ADD</div><div class='add'>+			 * uevent is thrown on client mode re-activation. This</div><div class='add'>+			 * is operation is performed in</div><div class='add'>+			 * batadv_gw_check_client_stop().</div><div class='add'>+			 */</div><div class='add'>+			batadv_gw_reselect(bat_priv);</div><div class='add'>+</div><div class='add'>+			/* always call batadv_gw_check_client_stop() before</div><div class='add'>+			 * changing the gateway state</div><div class='add'>+			 */</div><div class='add'>+			batadv_gw_check_client_stop(bat_priv);</div><div class='add'>+			atomic_set(&amp;bat_priv-&gt;gw.mode, gw_mode);</div><div class='add'>+			batadv_gw_tvlv_container_update(bat_priv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_GW_SEL_CLASS] &amp;&amp;</div><div class='add'>+	    bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node &amp;&amp;</div><div class='add'>+	    bat_priv-&gt;algo_ops-&gt;gw.is_eligible) {</div><div class='add'>+		/* setting the GW selection class is allowed only if the routing</div><div class='add'>+		 * algorithm in use implements the GW API</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		u32 sel_class_max = bat_priv-&gt;algo_ops-&gt;gw.sel_class_max;</div><div class='add'>+		u32 sel_class;</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_GW_SEL_CLASS];</div><div class='add'>+		sel_class = nla_get_u32(attr);</div><div class='add'>+</div><div class='add'>+		if (sel_class &gt;= 1 &amp;&amp; sel_class &lt;= sel_class_max) {</div><div class='add'>+			atomic_set(&amp;bat_priv-&gt;gw.sel_class, sel_class);</div><div class='add'>+			batadv_gw_reselect(bat_priv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_HOP_PENALTY]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_HOP_PENALTY];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;hop_penalty, nla_get_u8(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_LOG_LEVEL]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_LOG_LEVEL];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;log_level,</div><div class='add'>+			   nla_get_u32(attr) &amp; BATADV_DBG_ALL);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_DEBUG */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;multicast_mode, !nla_get_u8(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_MULTICAST_FANOUT]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_MULTICAST_FANOUT];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;multicast_fanout, nla_get_u32(attr));</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_MCAST */</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_ORIG_INTERVAL]) {</div><div class='add'>+		u32 orig_interval;</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_ORIG_INTERVAL];</div><div class='add'>+		orig_interval = nla_get_u32(attr);</div><div class='add'>+</div><div class='add'>+		orig_interval = min_t(u32, orig_interval, INT_MAX);</div><div class='add'>+		orig_interval = max_t(u32, orig_interval, 2 * BATADV_JITTER);</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;bat_priv-&gt;orig_interval, orig_interval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	batadv_netlink_notify_mesh(bat_priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -258,10 +615,10 @@ batadv_netlink_tp_meter_put(struct sk_buff *msg, u32 cookie)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_netlink_tpmeter_notify() - send tp_meter result via netlink to client</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: destination of tp_meter session</div><div class='ctx'>  * @result: reason for tp meter session stop</div><div class='del'>- * @test_time: total time ot the tp_meter session</div><div class='add'>+ * @test_time: total time of the tp_meter session</div><div class='ctx'>  * @total_bytes: bytes acked to the receiver</div><div class='ctx'>  * @cookie: cookie of tp_meter session</div><div class='ctx'>  *</div><div class='hunk'>@@ -305,7 +662,7 @@ int batadv_netlink_tpmeter_notify(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> 	genlmsg_end(msg, hdr);</div><div class='ctx'> </div><div class='ctx'> 	genlmsg_multicast_netns(&amp;batadv_netlink_family,</div><div class='del'>-				dev_net(bat_priv-&gt;soft_iface), msg, 0,</div><div class='add'>+				dev_net(bat_priv-&gt;mesh_iface), msg, 0,</div><div class='ctx'> 				BATADV_NL_MCGRP_TPMETER, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -329,40 +686,24 @@ err_genlmsg:</div><div class='ctx'> static int</div><div class='ctx'> batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = genl_info_net(info);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='ctx'> 	struct sk_buff *msg = NULL;</div><div class='ctx'> 	u32 test_length;</div><div class='ctx'> 	void *msg_head;</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	u32 cookie;</div><div class='ctx'> 	u8 *dst;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (!info-&gt;attrs[BATADV_ATTR_ORIG_ADDRESS])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!info-&gt;attrs[BATADV_ATTR_TPMETER_TEST_TIME])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ifindex = nla_get_u32(info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX]);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	dst = nla_data(info-&gt;attrs[BATADV_ATTR_ORIG_ADDRESS]);</div><div class='ctx'> </div><div class='ctx'> 	test_length = nla_get_u32(info-&gt;attrs[BATADV_ATTR_TPMETER_TEST_TIME]);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!msg) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -377,15 +718,11 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='ctx'> 	batadv_tp_start(bat_priv, dst, test_length, &amp;cookie);</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_netlink_tp_meter_put(msg, cookie);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='del'>-</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (msg)</div><div class='ctx'> 			nlmsg_free(msg);</div><div class='hunk'>@@ -397,7 +734,7 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_netlink_tp_meter_start() - Cancel a running tp_meter session</div><div class='add'>+ * batadv_netlink_tp_meter_cancel() - Cancel a running tp_meter session</div><div class='ctx'>  * @skb: received netlink message</div><div class='ctx'>  * @info: receiver information</div><div class='ctx'>  *</div><div class='hunk'>@@ -406,61 +743,57 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> static int</div><div class='ctx'> batadv_netlink_tp_meter_cancel(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = genl_info_net(info);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='del'>-	int ifindex;</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='ctx'> 	u8 *dst;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (!info-&gt;attrs[BATADV_ATTR_ORIG_ADDRESS])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ifindex = nla_get_u32(info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX]);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	dst = nla_data(info-&gt;attrs[BATADV_ATTR_ORIG_ADDRESS]);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='ctx'> 	batadv_tp_stop(bat_priv, dst, BATADV_TP_REASON_CANCEL);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_netlink_dump_hardif_entry() - Dump one hard interface into a message</div><div class='add'>+ * batadv_netlink_hardif_fill() - Fill message with hardif attributes</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @hard_iface: hard interface which was modified</div><div class='add'>+ * @cmd: type of message to generate</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @hard_iface: Hard interface to dump</div><div class='add'>+ * @seq: sequence number for message</div><div class='add'>+ * @flags: Additional flags for message</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='ctx'>  *</div><div class='del'>- * Return: error code, or 0 on success</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-batadv_netlink_dump_hardif_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='del'>-				 struct batadv_hard_iface *hard_iface)</div><div class='add'>+static int batadv_netlink_hardif_fill(struct sk_buff *msg,</div><div class='add'>+				      struct batadv_priv *bat_priv,</div><div class='add'>+				      struct batadv_hard_iface *hard_iface,</div><div class='add'>+				      enum batadv_nl_commands cmd,</div><div class='add'>+				      u32 portid, u32 seq, int flags,</div><div class='add'>+				      struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = hard_iface-&gt;net_dev;</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family, NLM_F_MULTI,</div><div class='del'>-			  BATADV_CMD_GET_HARDIFS);</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (cb)</div><div class='add'>+		genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX,</div><div class='add'>+			bat_priv-&gt;mesh_iface-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME,</div><div class='add'>+			   bat_priv-&gt;mesh_iface-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,</div><div class='ctx'> 			net_dev-&gt;ifindex) ||</div><div class='hunk'>@@ -475,158 +808,717 @@ batadv_netlink_dump_hardif_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_HOP_PENALTY,</div><div class='add'>+		       atomic_read(&amp;hard_iface-&gt;hop_penalty)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_ELP_INTERVAL,</div><div class='add'>+			atomic_read(&amp;hard_iface-&gt;bat_v.elp_interval)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_THROUGHPUT_OVERRIDE,</div><div class='add'>+			atomic_read(&amp;hard_iface-&gt;bat_v.throughput_override)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_BATMAN_V */</div><div class='add'>+</div><div class='ctx'> 	genlmsg_end(msg, hdr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- nla_put_failure:</div><div class='add'>+nla_put_failure:</div><div class='ctx'> 	genlmsg_cancel(msg, hdr);</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_netlink_dump_hardifs() - Dump all hard interface into a messages</div><div class='add'>+ * batadv_netlink_notify_hardif() - send hardif attributes to listener</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @hard_iface: hard interface which was modified</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt; 0 on error</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_notify_hardif(struct batadv_priv *bat_priv,</div><div class='add'>+					struct batadv_hard_iface *hard_iface)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = batadv_netlink_hardif_fill(msg, bat_priv, hard_iface,</div><div class='add'>+					 BATADV_CMD_SET_HARDIF, 0, 0, 0, NULL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast_netns(&amp;batadv_netlink_family,</div><div class='add'>+				dev_net(bat_priv-&gt;mesh_iface), msg, 0,</div><div class='add'>+				BATADV_NL_MCGRP_CONFIG, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_cmd_get_hardif() - Get hardif attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_cmd_get_hardif(struct sk_buff *skb,</div><div class='add'>+					 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface = info-&gt;user_ptr[1];</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = batadv_netlink_hardif_fill(msg, bat_priv, hard_iface,</div><div class='add'>+					 BATADV_CMD_GET_HARDIF,</div><div class='add'>+					 info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+					 NULL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_set_hardif() - Set hardif attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_set_hardif(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface = info-&gt;user_ptr[1];</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_HOP_PENALTY]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_HOP_PENALTY];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;hard_iface-&gt;hop_penalty, nla_get_u8(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_ELP_INTERVAL]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_ELP_INTERVAL];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;hard_iface-&gt;bat_v.elp_interval, nla_get_u32(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;hard_iface-&gt;bat_v.throughput_override,</div><div class='add'>+			   nla_get_u32(attr));</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_BATMAN_V */</div><div class='add'>+</div><div class='add'>+	batadv_netlink_notify_hardif(bat_priv, hard_iface);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_dump_hardif() - Dump all hard interface into a messages</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @cb: Parameters from query</div><div class='ctx'>  *</div><div class='ctx'>  * Return: error code, or length of reply message on success</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_netlink_dump_hardifs(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='add'>+batadv_netlink_dump_hardif(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	int ifindex;</div><div class='add'>+	struct batadv_priv *bat_priv;</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='del'>-	int seq = cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='ctx'> 	int skip = cb-&gt;args[0];</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-					     BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		dev_put(soft_iface);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != soft_iface)</div><div class='del'>-			continue;</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	cb-&gt;seq = batadv_hardif_generation &lt;&lt; 1 | 1;</div><div class='ctx'> </div><div class='add'>+	netdev_for_each_lower_private(mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (i++ &lt; skip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (batadv_netlink_dump_hardif_entry(msg, portid, seq,</div><div class='del'>-						     hard_iface)) {</div><div class='add'>+		if (batadv_netlink_hardif_fill(msg, bat_priv, hard_iface,</div><div class='add'>+					       BATADV_CMD_GET_HARDIF,</div><div class='add'>+					       portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					       NLM_F_MULTI, cb)) {</div><div class='ctx'> 			i--;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	dev_put(soft_iface);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = i;</div><div class='ctx'> </div><div class='ctx'> 	return msg-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops batadv_netlink_ops[] = {</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_vlan_fill() - Fill message with vlan attributes</div><div class='add'>+ * @msg: Netlink message to dump into</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @vlan: vlan which was modified</div><div class='add'>+ * @cmd: type of message to generate</div><div class='add'>+ * @portid: Port making netlink request</div><div class='add'>+ * @seq: sequence number for message</div><div class='add'>+ * @flags: Additional flags for message</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_vlan_fill(struct sk_buff *msg,</div><div class='add'>+				    struct batadv_priv *bat_priv,</div><div class='add'>+				    struct batadv_meshif_vlan *vlan,</div><div class='add'>+				    enum batadv_nl_commands cmd,</div><div class='add'>+				    u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX,</div><div class='add'>+			bat_priv-&gt;mesh_iface-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME,</div><div class='add'>+			   bat_priv-&gt;mesh_iface-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, BATADV_ATTR_VLANID, vlan-&gt;vid &amp; VLAN_VID_MASK))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, BATADV_ATTR_AP_ISOLATION_ENABLED,</div><div class='add'>+		       !!atomic_read(&amp;vlan-&gt;ap_isolation)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_notify_vlan() - send vlan attributes to listener</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @vlan: vlan which was modified</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt; 0 on error</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv,</div><div class='add'>+				      struct batadv_meshif_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = batadv_netlink_vlan_fill(msg, bat_priv, vlan,</div><div class='add'>+				       BATADV_CMD_SET_VLAN, 0, 0, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast_netns(&amp;batadv_netlink_family,</div><div class='add'>+				dev_net(bat_priv-&gt;mesh_iface), msg, 0,</div><div class='add'>+				BATADV_NL_MCGRP_CONFIG, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_vlan() - Get vlan attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_get_vlan(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_meshif_vlan *vlan = info-&gt;user_ptr[1];</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = batadv_netlink_vlan_fill(msg, bat_priv, vlan, BATADV_CMD_GET_VLAN,</div><div class='add'>+				       info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_set_vlan() - Get vlan attributes</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_netlink_set_vlan(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_meshif_vlan *vlan = info-&gt;user_ptr[1];</div><div class='add'>+	struct batadv_priv *bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[BATADV_ATTR_AP_ISOLATION_ENABLED]) {</div><div class='add'>+		attr = info-&gt;attrs[BATADV_ATTR_AP_ISOLATION_ENABLED];</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;vlan-&gt;ap_isolation, !!nla_get_u8(attr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	batadv_netlink_notify_vlan(bat_priv, vlan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_meshif_from_ifindex() - Get mesh-iface from ifindex</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @ifindex: index of the mesh interface</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to mesh interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+static struct net_device *</div><div class='add'>+batadv_netlink_get_meshif_from_ifindex(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='add'>+</div><div class='add'>+	mesh_iface = dev_get_by_index(net, ifindex);</div><div class='add'>+	if (!mesh_iface)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	if (!batadv_meshif_is_valid(mesh_iface))</div><div class='add'>+		goto err_put_meshif;</div><div class='add'>+</div><div class='add'>+	return mesh_iface;</div><div class='add'>+</div><div class='add'>+err_put_meshif:</div><div class='add'>+	dev_put(mesh_iface);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_meshif_from_info() - Get mesh-iface from genl attributes</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to mesh interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+static struct net_device *</div><div class='add'>+batadv_netlink_get_meshif_from_info(struct net *net, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int ifindex;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[BATADV_ATTR_MESH_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	return batadv_netlink_get_meshif_from_ifindex(net, ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_meshif() - Retrieve mesh interface from netlink callback</div><div class='add'>+ * @cb: callback structure containing arguments</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to mesh interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+struct net_device *batadv_netlink_get_meshif(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	int ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='add'>+						 BATADV_ATTR_MESH_IFINDEX);</div><div class='add'>+	if (!ifindex)</div><div class='add'>+		return ERR_PTR(-ENONET);</div><div class='add'>+</div><div class='add'>+	return batadv_netlink_get_meshif_from_ifindex(sock_net(cb-&gt;skb-&gt;sk),</div><div class='add'>+						      ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_hardif_from_ifindex() - Get hard-iface from ifindex</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @ifindex: index of the hard interface</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to hard interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+static struct batadv_hard_iface *</div><div class='add'>+batadv_netlink_get_hardif_from_ifindex(struct batadv_priv *bat_priv,</div><div class='add'>+				       struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct net_device *hard_dev;</div><div class='add'>+</div><div class='add'>+	hard_dev = dev_get_by_index(net, ifindex);</div><div class='add'>+	if (!hard_dev)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	hard_iface = batadv_hardif_get_by_netdev(hard_dev);</div><div class='add'>+	if (!hard_iface)</div><div class='add'>+		goto err_put_harddev;</div><div class='add'>+</div><div class='add'>+	if (hard_iface-&gt;mesh_iface != bat_priv-&gt;mesh_iface)</div><div class='add'>+		goto err_put_hardif;</div><div class='add'>+</div><div class='add'>+	/* hard_dev is referenced by hard_iface and not needed here */</div><div class='add'>+	dev_put(hard_dev);</div><div class='add'>+</div><div class='add'>+	return hard_iface;</div><div class='add'>+</div><div class='add'>+err_put_hardif:</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='add'>+err_put_harddev:</div><div class='add'>+	dev_put(hard_dev);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_hardif_from_info() - Get hard-iface from genl attributes</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to hard interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+static struct batadv_hard_iface *</div><div class='add'>+batadv_netlink_get_hardif_from_info(struct batadv_priv *bat_priv,</div><div class='add'>+				    struct net *net, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int ifindex;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[BATADV_ATTR_HARD_IFINDEX])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[BATADV_ATTR_HARD_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	return batadv_netlink_get_hardif_from_ifindex(bat_priv, net, ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_netlink_get_hardif() - Retrieve hard interface from netlink callback</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @cb: callback structure containing arguments</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to hard interface (with increased refcnt) on success, error</div><div class='add'>+ *  pointer on error</div><div class='add'>+ */</div><div class='add'>+struct batadv_hard_iface *</div><div class='add'>+batadv_netlink_get_hardif(struct batadv_priv *bat_priv,</div><div class='add'>+			  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	int ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='add'>+						 BATADV_ATTR_HARD_IFINDEX);</div><div class='add'>+	if (!ifindex)</div><div class='add'>+		return ERR_PTR(-ENONET);</div><div class='add'>+</div><div class='add'>+	return batadv_netlink_get_hardif_from_ifindex(bat_priv,</div><div class='add'>+						      sock_net(cb-&gt;skb-&gt;sk),</div><div class='add'>+						      ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_get_vlan_from_info() - Retrieve vlan from genl attributes</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to vlan on success (with increased refcnt), error pointer</div><div class='add'>+ *  on error</div><div class='add'>+ */</div><div class='add'>+static struct batadv_meshif_vlan *</div><div class='add'>+batadv_get_vlan_from_info(struct batadv_priv *bat_priv, struct net *net,</div><div class='add'>+			  struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='add'>+	u16 vid;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[BATADV_ATTR_VLANID])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	vid = nla_get_u16(info-&gt;attrs[BATADV_ATTR_VLANID]);</div><div class='add'>+</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG);</div><div class='add'>+	if (!vlan)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	return vlan;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_pre_doit() - Prepare batman-adv genl doit request</div><div class='add'>+ * @ops: requested netlink operation</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error number in case of failure</div><div class='add'>+ */</div><div class='add'>+static int batadv_pre_doit(const struct genl_split_ops *ops,</div><div class='add'>+			   struct sk_buff *skb,</div><div class='add'>+			   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct batadv_priv *bat_priv = NULL;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='add'>+	u8 user_ptr1_flags;</div><div class='add'>+	u8 mesh_dep_flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	user_ptr1_flags = BATADV_FLAG_NEED_HARDIF | BATADV_FLAG_NEED_VLAN;</div><div class='add'>+	if (WARN_ON(hweight8(ops-&gt;internal_flags &amp; user_ptr1_flags) &gt; 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mesh_dep_flags = BATADV_FLAG_NEED_HARDIF | BATADV_FLAG_NEED_VLAN;</div><div class='add'>+	if (WARN_ON((ops-&gt;internal_flags &amp; mesh_dep_flags) &amp;&amp;</div><div class='add'>+		    (~ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_MESH)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_MESH) {</div><div class='add'>+		mesh_iface = batadv_netlink_get_meshif_from_info(net, info);</div><div class='add'>+		if (IS_ERR(mesh_iface))</div><div class='add'>+			return PTR_ERR(mesh_iface);</div><div class='add'>+</div><div class='add'>+		bat_priv = netdev_priv(mesh_iface);</div><div class='add'>+		info-&gt;user_ptr[0] = bat_priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_HARDIF) {</div><div class='add'>+		hard_iface = batadv_netlink_get_hardif_from_info(bat_priv, net,</div><div class='add'>+								 info);</div><div class='add'>+		if (IS_ERR(hard_iface)) {</div><div class='add'>+			ret = PTR_ERR(hard_iface);</div><div class='add'>+			goto err_put_meshif;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;user_ptr[1] = hard_iface;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_VLAN) {</div><div class='add'>+		vlan = batadv_get_vlan_from_info(bat_priv, net, info);</div><div class='add'>+		if (IS_ERR(vlan)) {</div><div class='add'>+			ret = PTR_ERR(vlan);</div><div class='add'>+			goto err_put_meshif;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;user_ptr[1] = vlan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_put_meshif:</div><div class='add'>+	if (bat_priv)</div><div class='add'>+		dev_put(bat_priv-&gt;mesh_iface);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_post_doit() - End batman-adv genl doit request</div><div class='add'>+ * @ops: requested netlink operation</div><div class='add'>+ * @skb: Netlink message with request data</div><div class='add'>+ * @info: receiver information</div><div class='add'>+ */</div><div class='add'>+static void batadv_post_doit(const struct genl_split_ops *ops,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='add'>+	struct batadv_priv *bat_priv;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_HARDIF &amp;&amp;</div><div class='add'>+	    info-&gt;user_ptr[1]) {</div><div class='add'>+		hard_iface = info-&gt;user_ptr[1];</div><div class='add'>+</div><div class='add'>+		batadv_hardif_put(hard_iface);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_VLAN &amp;&amp; info-&gt;user_ptr[1]) {</div><div class='add'>+		vlan = info-&gt;user_ptr[1];</div><div class='add'>+		batadv_meshif_vlan_put(vlan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;internal_flags &amp; BATADV_FLAG_NEED_MESH &amp;&amp; info-&gt;user_ptr[0]) {</div><div class='add'>+		bat_priv = info-&gt;user_ptr[0];</div><div class='add'>+		dev_put(bat_priv-&gt;mesh_iface);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct genl_small_ops batadv_netlink_ops[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.cmd = BATADV_CMD_GET_MESH_INFO,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='del'>-		.doit = batadv_netlink_get_mesh_info,</div><div class='add'>+		.cmd = BATADV_CMD_GET_MESH,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		/* can be retrieved by unprivileged users */</div><div class='add'>+		.doit = batadv_netlink_get_mesh,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_TP_METER,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.doit = batadv_netlink_tp_meter_start,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_TP_METER_CANCEL,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.doit = batadv_netlink_tp_meter_cancel,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_ROUTING_ALGOS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_algo_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.cmd = BATADV_CMD_GET_HARDIFS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='del'>-		.dumpit = batadv_netlink_dump_hardifs,</div><div class='add'>+		.cmd = BATADV_CMD_GET_HARDIF,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		/* can be retrieved by unprivileged users */</div><div class='add'>+		.dumpit = batadv_netlink_dump_hardif,</div><div class='add'>+		.doit = batadv_netlink_cmd_get_hardif,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH |</div><div class='add'>+				  BATADV_FLAG_NEED_HARDIF,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_tt_local_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_tt_global_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_ORIGINATORS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_orig_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_NEIGHBORS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_hardif_neigh_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_GATEWAYS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_gw_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_BLA_CLAIM,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_bla_claim_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_BLA_BACKBONE,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_bla_backbone_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_DAT_CACHE,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_dat_cache_dump,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = BATADV_CMD_GET_MCAST_FLAGS,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.policy = batadv_netlink_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 		.dumpit = batadv_mcast_flags_dump,</div><div class='ctx'> 	},</div><div class='del'>-</div><div class='add'>+	{</div><div class='add'>+		.cmd = BATADV_CMD_SET_MESH,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit = batadv_netlink_set_mesh,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = BATADV_CMD_SET_HARDIF,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit = batadv_netlink_set_hardif,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH |</div><div class='add'>+				  BATADV_FLAG_NEED_HARDIF,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = BATADV_CMD_GET_VLAN,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		/* can be retrieved by unprivileged users */</div><div class='add'>+		.doit = batadv_netlink_get_vlan,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH |</div><div class='add'>+				  BATADV_FLAG_NEED_VLAN,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = BATADV_CMD_SET_VLAN,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit = batadv_netlink_set_vlan,</div><div class='add'>+		.internal_flags = BATADV_FLAG_NEED_MESH |</div><div class='add'>+				  BATADV_FLAG_NEED_VLAN,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct genl_family batadv_netlink_family __ro_after_init = {</div><div class='hunk'>@@ -634,10 +1526,14 @@ struct genl_family batadv_netlink_family __ro_after_init = {</div><div class='ctx'> 	.name = BATADV_NL_NAME,</div><div class='ctx'> 	.version = 1,</div><div class='ctx'> 	.maxattr = BATADV_ATTR_MAX,</div><div class='add'>+	.policy = batadv_netlink_policy,</div><div class='ctx'> 	.netnsok = true,</div><div class='add'>+	.pre_doit = batadv_pre_doit,</div><div class='add'>+	.post_doit = batadv_post_doit,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='del'>-	.ops = batadv_netlink_ops,</div><div class='del'>-	.n_ops = ARRAY_SIZE(batadv_netlink_ops),</div><div class='add'>+	.small_ops = batadv_netlink_ops,</div><div class='add'>+	.n_small_ops = ARRAY_SIZE(batadv_netlink_ops),</div><div class='add'>+	.resv_start_op = BATADV_CMD_SET_VLAN + 1,</div><div class='ctx'> 	.mcgrps = batadv_netlink_mcgrps,</div><div class='ctx'> 	.n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps),</div><div class='ctx'> };</div><div class='hunk'>@@ -651,7 +1547,7 @@ void __init batadv_netlink_register(void)</div><div class='ctx'> </div><div class='ctx'> 	ret = genl_register_family(&amp;batadv_netlink_family);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		pr_warn("unable to register netlink family");</div><div class='add'>+		pr_warn("unable to register netlink family\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h<br/>index 571d9a5ae7aa..4eae9e5ff135 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/netlink.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/netlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/netlink.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2016-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Matthias Schiffer</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_NETLINK_H_</div><div class='hunk'>@@ -21,14 +9,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;net/genetlink.h&gt;</div><div class='del'>-</div><div class='del'>-struct nlmsghdr;</div><div class='ctx'> </div><div class='ctx'> void batadv_netlink_register(void);</div><div class='ctx'> void batadv_netlink_unregister(void);</div><div class='del'>-int batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype);</div><div class='add'>+struct net_device *batadv_netlink_get_meshif(struct netlink_callback *cb);</div><div class='add'>+struct batadv_hard_iface *</div><div class='add'>+batadv_netlink_get_hardif(struct batadv_priv *bat_priv,</div><div class='add'>+			  struct netlink_callback *cb);</div><div class='ctx'> </div><div class='ctx'> int batadv_netlink_tpmeter_notify(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> 				  u8 result, u32 test_time, u64 total_bytes,</div><div class='head'>diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c<br/>deleted file mode 100644<br/>index 34caf129a9bf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/network-coding.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/network-coding.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1996 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Martin Hundebøll, Jeppe Ledet-Pedersen</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "network-coding.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/byteorder/generic.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/if_packet.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/jhash.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/kref.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/lockdep.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hard-interface.h"</div><div class='del'>-#include "hash.h"</div><div class='del'>-#include "log.h"</div><div class='del'>-#include "originator.h"</div><div class='del'>-#include "routing.h"</div><div class='del'>-#include "send.h"</div><div class='del'>-#include "tvlv.h"</div><div class='del'>-</div><div class='del'>-static struct lock_class_key batadv_nc_coding_hash_lock_class_key;</div><div class='del'>-static struct lock_class_key batadv_nc_decoding_hash_lock_class_key;</div><div class='del'>-</div><div class='del'>-static void batadv_nc_worker(struct work_struct *work);</div><div class='del'>-static int batadv_nc_recv_coded_packet(struct sk_buff *skb,</div><div class='del'>-				       struct batadv_hard_iface *recv_if);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_init() - one-time initialization for network coding</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int __init batadv_nc_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Register our packet type */</div><div class='del'>-	ret = batadv_recv_handler_register(BATADV_CODED,</div><div class='del'>-					   batadv_nc_recv_coded_packet);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_start_timer() - initialise the nc periodic worker</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_start_timer(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	queue_delayed_work(batadv_event_workqueue, &amp;bat_priv-&gt;nc.work,</div><div class='del'>-			   msecs_to_jiffies(10));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_tvlv_container_update() - update the network coding tvlv container</div><div class='del'>- *  after network coding setting change</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	char nc_mode;</div><div class='del'>-</div><div class='del'>-	nc_mode = atomic_read(&amp;bat_priv-&gt;network_coding);</div><div class='del'>-</div><div class='del'>-	switch (nc_mode) {</div><div class='del'>-	case 0:</div><div class='del'>-		batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_NC, 1);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		batadv_tvlv_container_register(bat_priv, BATADV_TVLV_NC, 1,</div><div class='del'>-					       NULL, 0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_status_update() - update the network coding tvlv container after</div><div class='del'>- *  network coding setting change</div><div class='del'>- * @net_dev: the soft interface net device</div><div class='del'>- */</div><div class='del'>-void batadv_nc_status_update(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-</div><div class='del'>-	batadv_nc_tvlv_container_update(bat_priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_tvlv_ogm_handler_v1() - process incoming nc tvlv container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @orig: the orig_node of the ogm</div><div class='del'>- * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)</div><div class='del'>- * @tvlv_value: tvlv buffer containing the gateway data</div><div class='del'>- * @tvlv_value_len: tvlv buffer length</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,</div><div class='del'>-					  struct batadv_orig_node *orig,</div><div class='del'>-					  u8 flags,</div><div class='del'>-					  void *tvlv_value, u16 tvlv_value_len)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; BATADV_TVLV_HANDLER_OGM_CIFNOTFND)</div><div class='del'>-		clear_bit(BATADV_ORIG_CAPA_HAS_NC, &amp;orig-&gt;capabilities);</div><div class='del'>-	else</div><div class='del'>-		set_bit(BATADV_ORIG_CAPA_HAS_NC, &amp;orig-&gt;capabilities);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_mesh_init() - initialise coding hash table and start house keeping</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_nc_mesh_init(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	bat_priv-&gt;nc.timestamp_fwd_flush = jiffies;</div><div class='del'>-	bat_priv-&gt;nc.timestamp_sniffed_purge = jiffies;</div><div class='del'>-</div><div class='del'>-	if (bat_priv-&gt;nc.coding_hash || bat_priv-&gt;nc.decoding_hash)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;nc.coding_hash = batadv_hash_new(128);</div><div class='del'>-	if (!bat_priv-&gt;nc.coding_hash)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	batadv_hash_set_lock_class(bat_priv-&gt;nc.coding_hash,</div><div class='del'>-				   &amp;batadv_nc_coding_hash_lock_class_key);</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;nc.decoding_hash = batadv_hash_new(128);</div><div class='del'>-	if (!bat_priv-&gt;nc.decoding_hash)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	batadv_hash_set_lock_class(bat_priv-&gt;nc.decoding_hash,</div><div class='del'>-				   &amp;batadv_nc_decoding_hash_lock_class_key);</div><div class='del'>-</div><div class='del'>-	INIT_DELAYED_WORK(&amp;bat_priv-&gt;nc.work, batadv_nc_worker);</div><div class='del'>-	batadv_nc_start_timer(bat_priv);</div><div class='del'>-</div><div class='del'>-	batadv_tvlv_handler_register(bat_priv, batadv_nc_tvlv_ogm_handler_v1,</div><div class='del'>-				     NULL, BATADV_TVLV_NC, 1,</div><div class='del'>-				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);</div><div class='del'>-	batadv_nc_tvlv_container_update(bat_priv);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_init_bat_priv() - initialise the nc specific bat_priv variables</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;network_coding, 0);</div><div class='del'>-	bat_priv-&gt;nc.min_tq = 200;</div><div class='del'>-	bat_priv-&gt;nc.max_fwd_delay = 10;</div><div class='del'>-	bat_priv-&gt;nc.max_buffer_time = 200;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_init_orig() - initialise the nc fields of an orig_node</div><div class='del'>- * @orig_node: the orig_node which is going to be initialised</div><div class='del'>- */</div><div class='del'>-void batadv_nc_init_orig(struct batadv_orig_node *orig_node)</div><div class='del'>-{</div><div class='del'>-	INIT_LIST_HEAD(&amp;orig_node-&gt;in_coding_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;orig_node-&gt;out_coding_list);</div><div class='del'>-	spin_lock_init(&amp;orig_node-&gt;in_coding_list_lock);</div><div class='del'>-	spin_lock_init(&amp;orig_node-&gt;out_coding_list_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_node_release() - release nc_node from lists and queue for free</div><div class='del'>- *  after rcu grace period</div><div class='del'>- * @ref: kref pointer of the nc_node</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_node_release(struct kref *ref)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_node *nc_node;</div><div class='del'>-</div><div class='del'>-	nc_node = container_of(ref, struct batadv_nc_node, refcount);</div><div class='del'>-</div><div class='del'>-	batadv_orig_node_put(nc_node-&gt;orig_node);</div><div class='del'>-	kfree_rcu(nc_node, rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_node_put() - decrement the nc_node refcounter and possibly</div><div class='del'>- *  release it</div><div class='del'>- * @nc_node: nc_node to be free'd</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_node_put(struct batadv_nc_node *nc_node)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;nc_node-&gt;refcount, batadv_nc_node_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_path_release() - release nc_path from lists and queue for free</div><div class='del'>- *  after rcu grace period</div><div class='del'>- * @ref: kref pointer of the nc_path</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_path_release(struct kref *ref)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-</div><div class='del'>-	nc_path = container_of(ref, struct batadv_nc_path, refcount);</div><div class='del'>-</div><div class='del'>-	kfree_rcu(nc_path, rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_path_put() - decrement the nc_path refcounter and possibly</div><div class='del'>- *  release it</div><div class='del'>- * @nc_path: nc_path to be free'd</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_path_put(struct batadv_nc_path *nc_path)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;nc_path-&gt;refcount, batadv_nc_path_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_packet_free() - frees nc packet</div><div class='del'>- * @nc_packet: the nc packet to free</div><div class='del'>- * @dropped: whether the packet is freed because is is dropped</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet,</div><div class='del'>-				  bool dropped)</div><div class='del'>-{</div><div class='del'>-	if (dropped)</div><div class='del'>-		kfree_skb(nc_packet-&gt;skb);</div><div class='del'>-	else</div><div class='del'>-		consume_skb(nc_packet-&gt;skb);</div><div class='del'>-</div><div class='del'>-	batadv_nc_path_put(nc_packet-&gt;nc_path);</div><div class='del'>-	kfree(nc_packet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_to_purge_nc_node() - checks whether an nc node has to be purged</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @nc_node: the nc node to check</div><div class='del'>- *</div><div class='del'>- * Return: true if the entry has to be purged now, false otherwise</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_to_purge_nc_node(struct batadv_priv *bat_priv,</div><div class='del'>-				       struct batadv_nc_node *nc_node)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return batadv_has_timed_out(nc_node-&gt;last_seen, BATADV_NC_NODE_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_to_purge_nc_path_coding() - checks whether an nc path has timed out</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @nc_path: the nc path to check</div><div class='del'>- *</div><div class='del'>- * Return: true if the entry has to be purged now, false otherwise</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_to_purge_nc_path_coding(struct batadv_priv *bat_priv,</div><div class='del'>-					      struct batadv_nc_path *nc_path)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* purge the path when no packets has been added for 10 times the</div><div class='del'>-	 * max_fwd_delay time</div><div class='del'>-	 */</div><div class='del'>-	return batadv_has_timed_out(nc_path-&gt;last_valid,</div><div class='del'>-				    bat_priv-&gt;nc.max_fwd_delay * 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_to_purge_nc_path_decoding() - checks whether an nc path has timed</div><div class='del'>- *  out</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @nc_path: the nc path to check</div><div class='del'>- *</div><div class='del'>- * Return: true if the entry has to be purged now, false otherwise</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_to_purge_nc_path_decoding(struct batadv_priv *bat_priv,</div><div class='del'>-						struct batadv_nc_path *nc_path)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;mesh_state) != BATADV_MESH_ACTIVE)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* purge the path when no packets has been added for 10 times the</div><div class='del'>-	 * max_buffer time</div><div class='del'>-	 */</div><div class='del'>-	return batadv_has_timed_out(nc_path-&gt;last_valid,</div><div class='del'>-				    bat_priv-&gt;nc.max_buffer_time * 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_purge_orig_nc_nodes() - go through list of nc nodes and purge stale</div><div class='del'>- *  entries</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @list: list of nc nodes</div><div class='del'>- * @lock: nc node list lock</div><div class='del'>- * @to_purge: function in charge to decide whether an entry has to be purged or</div><div class='del'>- *	      not. This function takes the nc node as argument and has to return</div><div class='del'>- *	      a boolean value: true if the entry has to be deleted, false</div><div class='del'>- *	      otherwise</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_nc_purge_orig_nc_nodes(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct list_head *list,</div><div class='del'>-			      spinlock_t *lock,</div><div class='del'>-			      bool (*to_purge)(struct batadv_priv *,</div><div class='del'>-					       struct batadv_nc_node *))</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_node *nc_node, *nc_node_tmp;</div><div class='del'>-</div><div class='del'>-	/* For each nc_node in list */</div><div class='del'>-	spin_lock_bh(lock);</div><div class='del'>-	list_for_each_entry_safe(nc_node, nc_node_tmp, list, list) {</div><div class='del'>-		/* if an helper function has been passed as parameter,</div><div class='del'>-		 * ask it if the entry has to be purged or not</div><div class='del'>-		 */</div><div class='del'>-		if (to_purge &amp;&amp; !to_purge(bat_priv, nc_node))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		batadv_dbg(BATADV_DBG_NC, bat_priv,</div><div class='del'>-			   "Removing nc_node %pM -&gt; %pM\n",</div><div class='del'>-			   nc_node-&gt;addr, nc_node-&gt;orig_node-&gt;orig);</div><div class='del'>-		list_del_rcu(&amp;nc_node-&gt;list);</div><div class='del'>-		batadv_nc_node_put(nc_node);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_purge_orig() - purges all nc node data attached of the given</div><div class='del'>- *  originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @orig_node: orig_node with the nc node entries to be purged</div><div class='del'>- * @to_purge: function in charge to decide whether an entry has to be purged or</div><div class='del'>- *	      not. This function takes the nc node as argument and has to return</div><div class='del'>- *	      a boolean value: true is the entry has to be deleted, false</div><div class='del'>- *	      otherwise</div><div class='del'>- */</div><div class='del'>-void batadv_nc_purge_orig(struct batadv_priv *bat_priv,</div><div class='del'>-			  struct batadv_orig_node *orig_node,</div><div class='del'>-			  bool (*to_purge)(struct batadv_priv *,</div><div class='del'>-					   struct batadv_nc_node *))</div><div class='del'>-{</div><div class='del'>-	/* Check ingoing nc_node's of this orig_node */</div><div class='del'>-	batadv_nc_purge_orig_nc_nodes(bat_priv, &amp;orig_node-&gt;in_coding_list,</div><div class='del'>-				      &amp;orig_node-&gt;in_coding_list_lock,</div><div class='del'>-				      to_purge);</div><div class='del'>-</div><div class='del'>-	/* Check outgoing nc_node's of this orig_node */</div><div class='del'>-	batadv_nc_purge_orig_nc_nodes(bat_priv, &amp;orig_node-&gt;out_coding_list,</div><div class='del'>-				      &amp;orig_node-&gt;out_coding_list_lock,</div><div class='del'>-				      to_purge);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_purge_orig_hash() - traverse entire originator hash to check if</div><div class='del'>- *  they have timed out nc nodes</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_purge_orig_hash(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	if (!hash)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* For each orig_node */</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry)</div><div class='del'>-			batadv_nc_purge_orig(bat_priv, orig_node,</div><div class='del'>-					     batadv_nc_to_purge_nc_node);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_purge_paths() - traverse all nc paths part of the hash and remove</div><div class='del'>- *  unused ones</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @hash: hash table containing the nc paths to check</div><div class='del'>- * @to_purge: function in charge to decide whether an entry has to be purged or</div><div class='del'>- *	      not. This function takes the nc node as argument and has to return</div><div class='del'>- *	      a boolean value: true is the entry has to be deleted, false</div><div class='del'>- *	      otherwise</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_purge_paths(struct batadv_priv *bat_priv,</div><div class='del'>-				  struct batadv_hashtable *hash,</div><div class='del'>-				  bool (*to_purge)(struct batadv_priv *,</div><div class='del'>-						   struct batadv_nc_path *))</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct hlist_node *node_tmp;</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-	spinlock_t *lock; /* Protects lists in hash */</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-		lock = &amp;hash-&gt;list_locks[i];</div><div class='del'>-</div><div class='del'>-		/* For each nc_path in this bin */</div><div class='del'>-		spin_lock_bh(lock);</div><div class='del'>-		hlist_for_each_entry_safe(nc_path, node_tmp, head, hash_entry) {</div><div class='del'>-			/* if an helper function has been passed as parameter,</div><div class='del'>-			 * ask it if the entry has to be purged or not</div><div class='del'>-			 */</div><div class='del'>-			if (to_purge &amp;&amp; !to_purge(bat_priv, nc_path))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* purging an non-empty nc_path should never happen, but</div><div class='del'>-			 * is observed under high CPU load. Delay the purging</div><div class='del'>-			 * until next iteration to allow the packet_list to be</div><div class='del'>-			 * emptied first.</div><div class='del'>-			 */</div><div class='del'>-			if (!unlikely(list_empty(&amp;nc_path-&gt;packet_list))) {</div><div class='del'>-				net_ratelimited_function(printk,</div><div class='del'>-							 KERN_WARNING</div><div class='del'>-							 "Skipping free of non-empty nc_path (%pM -&gt; %pM)!\n",</div><div class='del'>-							 nc_path-&gt;prev_hop,</div><div class='del'>-							 nc_path-&gt;next_hop);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* nc_path is unused, so remove it */</div><div class='del'>-			batadv_dbg(BATADV_DBG_NC, bat_priv,</div><div class='del'>-				   "Remove nc_path %pM -&gt; %pM\n",</div><div class='del'>-				   nc_path-&gt;prev_hop, nc_path-&gt;next_hop);</div><div class='del'>-			hlist_del_rcu(&amp;nc_path-&gt;hash_entry);</div><div class='del'>-			batadv_nc_path_put(nc_path);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_hash_key_gen() - computes the nc_path hash key</div><div class='del'>- * @key: buffer to hold the final hash key</div><div class='del'>- * @src: source ethernet mac address going into the hash key</div><div class='del'>- * @dst: destination ethernet mac address going into the hash key</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_hash_key_gen(struct batadv_nc_path *key, const char *src,</div><div class='del'>-				   const char *dst)</div><div class='del'>-{</div><div class='del'>-	memcpy(key-&gt;prev_hop, src, sizeof(key-&gt;prev_hop));</div><div class='del'>-	memcpy(key-&gt;next_hop, dst, sizeof(key-&gt;next_hop));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_hash_choose() - compute the hash value for an nc path</div><div class='del'>- * @data: data to hash</div><div class='del'>- * @size: size of the hash table</div><div class='del'>- *</div><div class='del'>- * Return: the selected index in the hash table for the given data.</div><div class='del'>- */</div><div class='del'>-static u32 batadv_nc_hash_choose(const void *data, u32 size)</div><div class='del'>-{</div><div class='del'>-	const struct batadv_nc_path *nc_path = data;</div><div class='del'>-	u32 hash = 0;</div><div class='del'>-</div><div class='del'>-	hash = jhash(&amp;nc_path-&gt;prev_hop, sizeof(nc_path-&gt;prev_hop), hash);</div><div class='del'>-	hash = jhash(&amp;nc_path-&gt;next_hop, sizeof(nc_path-&gt;next_hop), hash);</div><div class='del'>-</div><div class='del'>-	return hash % size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_hash_compare() - comparing function used in the network coding hash</div><div class='del'>- *  tables</div><div class='del'>- * @node: node in the local table</div><div class='del'>- * @data2: second object to compare the node to</div><div class='del'>- *</div><div class='del'>- * Return: true if the two entry are the same, false otherwise</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_hash_compare(const struct hlist_node *node,</div><div class='del'>-				   const void *data2)</div><div class='del'>-{</div><div class='del'>-	const struct batadv_nc_path *nc_path1, *nc_path2;</div><div class='del'>-</div><div class='del'>-	nc_path1 = container_of(node, struct batadv_nc_path, hash_entry);</div><div class='del'>-	nc_path2 = data2;</div><div class='del'>-</div><div class='del'>-	/* Return 1 if the two keys are identical */</div><div class='del'>-	if (!batadv_compare_eth(nc_path1-&gt;prev_hop, nc_path2-&gt;prev_hop))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!batadv_compare_eth(nc_path1-&gt;next_hop, nc_path2-&gt;next_hop))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_hash_find() - search for an existing nc path and return it</div><div class='del'>- * @hash: hash table containing the nc path</div><div class='del'>- * @data: search key</div><div class='del'>- *</div><div class='del'>- * Return: the nc_path if found, NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_path *</div><div class='del'>-batadv_nc_hash_find(struct batadv_hashtable *hash,</div><div class='del'>-		    void *data)</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_nc_path *nc_path, *nc_path_tmp = NULL;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	if (!hash)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	index = batadv_nc_hash_choose(data, hash-&gt;size);</div><div class='del'>-	head = &amp;hash-&gt;table[index];</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(nc_path, head, hash_entry) {</div><div class='del'>-		if (!batadv_nc_hash_compare(&amp;nc_path-&gt;hash_entry, data))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!kref_get_unless_zero(&amp;nc_path-&gt;refcount))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nc_path_tmp = nc_path;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return nc_path_tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_send_packet() - send non-coded packet and free nc_packet struct</div><div class='del'>- * @nc_packet: the nc packet to send</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_send_packet(struct batadv_nc_packet *nc_packet)</div><div class='del'>-{</div><div class='del'>-	batadv_send_unicast_skb(nc_packet-&gt;skb, nc_packet-&gt;neigh_node);</div><div class='del'>-	nc_packet-&gt;skb = NULL;</div><div class='del'>-	batadv_nc_packet_free(nc_packet, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_sniffed_purge() - Checks timestamp of given sniffed nc_packet.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @nc_path: the nc path the packet belongs to</div><div class='del'>- * @nc_packet: the nc packet to be checked</div><div class='del'>- *</div><div class='del'>- * Checks whether the given sniffed (overheard) nc_packet has hit its buffering</div><div class='del'>- * timeout. If so, the packet is no longer kept and the entry deleted from the</div><div class='del'>- * queue. Has to be called with the appropriate locks.</div><div class='del'>- *</div><div class='del'>- * Return: false as soon as the entry in the fifo queue has not been timed out</div><div class='del'>- * yet and true otherwise.</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_sniffed_purge(struct batadv_priv *bat_priv,</div><div class='del'>-				    struct batadv_nc_path *nc_path,</div><div class='del'>-				    struct batadv_nc_packet *nc_packet)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout = bat_priv-&gt;nc.max_buffer_time;</div><div class='del'>-	bool res = false;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-</div><div class='del'>-	/* Packets are added to tail, so the remaining packets did not time</div><div class='del'>-	 * out and we can stop processing the current queue</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_ACTIVE &amp;&amp;</div><div class='del'>-	    !batadv_has_timed_out(nc_packet-&gt;timestamp, timeout))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* purge nc packet */</div><div class='del'>-	list_del(&amp;nc_packet-&gt;list);</div><div class='del'>-	batadv_nc_packet_free(nc_packet, true);</div><div class='del'>-</div><div class='del'>-	res = true;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_fwd_flush() - Checks the timestamp of the given nc packet.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @nc_path: the nc path the packet belongs to</div><div class='del'>- * @nc_packet: the nc packet to be checked</div><div class='del'>- *</div><div class='del'>- * Checks whether the given nc packet has hit its forward timeout. If so, the</div><div class='del'>- * packet is no longer delayed, immediately sent and the entry deleted from the</div><div class='del'>- * queue. Has to be called with the appropriate locks.</div><div class='del'>- *</div><div class='del'>- * Return: false as soon as the entry in the fifo queue has not been timed out</div><div class='del'>- * yet and true otherwise.</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_fwd_flush(struct batadv_priv *bat_priv,</div><div class='del'>-				struct batadv_nc_path *nc_path,</div><div class='del'>-				struct batadv_nc_packet *nc_packet)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout = bat_priv-&gt;nc.max_fwd_delay;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-</div><div class='del'>-	/* Packets are added to tail, so the remaining packets did not time</div><div class='del'>-	 * out and we can stop processing the current queue</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_ACTIVE &amp;&amp;</div><div class='del'>-	    !batadv_has_timed_out(nc_packet-&gt;timestamp, timeout))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Send packet */</div><div class='del'>-	batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);</div><div class='del'>-	batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,</div><div class='del'>-			   nc_packet-&gt;skb-&gt;len + ETH_HLEN);</div><div class='del'>-	list_del(&amp;nc_packet-&gt;list);</div><div class='del'>-	batadv_nc_send_packet(nc_packet);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_process_nc_paths() - traverse given nc packet pool and free timed</div><div class='del'>- *  out nc packets</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @hash: to be processed hash table</div><div class='del'>- * @process_fn: Function called to process given nc packet. Should return true</div><div class='del'>- *	        to encourage this function to proceed with the next packet.</div><div class='del'>- *	        Otherwise the rest of the current queue is skipped.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_nc_process_nc_paths(struct batadv_priv *bat_priv,</div><div class='del'>-			   struct batadv_hashtable *hash,</div><div class='del'>-			   bool (*process_fn)(struct batadv_priv *,</div><div class='del'>-					      struct batadv_nc_path *,</div><div class='del'>-					      struct batadv_nc_packet *))</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_nc_packet *nc_packet, *nc_packet_tmp;</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-	bool ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!hash)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Loop hash table bins */</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		/* Loop coding paths */</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(nc_path, head, hash_entry) {</div><div class='del'>-			/* Loop packets */</div><div class='del'>-			spin_lock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-			list_for_each_entry_safe(nc_packet, nc_packet_tmp,</div><div class='del'>-						 &amp;nc_path-&gt;packet_list, list) {</div><div class='del'>-				ret = process_fn(bat_priv, nc_path, nc_packet);</div><div class='del'>-				if (!ret)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_worker() - periodic task for house keeping related to network</div><div class='del'>- *  coding</div><div class='del'>- * @work: kernel work struct</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_worker(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct delayed_work *delayed_work;</div><div class='del'>-	struct batadv_priv_nc *priv_nc;</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	delayed_work = to_delayed_work(work);</div><div class='del'>-	priv_nc = container_of(delayed_work, struct batadv_priv_nc, work);</div><div class='del'>-	bat_priv = container_of(priv_nc, struct batadv_priv, nc);</div><div class='del'>-</div><div class='del'>-	batadv_nc_purge_orig_hash(bat_priv);</div><div class='del'>-	batadv_nc_purge_paths(bat_priv, bat_priv-&gt;nc.coding_hash,</div><div class='del'>-			      batadv_nc_to_purge_nc_path_coding);</div><div class='del'>-	batadv_nc_purge_paths(bat_priv, bat_priv-&gt;nc.decoding_hash,</div><div class='del'>-			      batadv_nc_to_purge_nc_path_decoding);</div><div class='del'>-</div><div class='del'>-	timeout = bat_priv-&gt;nc.max_fwd_delay;</div><div class='del'>-</div><div class='del'>-	if (batadv_has_timed_out(bat_priv-&gt;nc.timestamp_fwd_flush, timeout)) {</div><div class='del'>-		batadv_nc_process_nc_paths(bat_priv, bat_priv-&gt;nc.coding_hash,</div><div class='del'>-					   batadv_nc_fwd_flush);</div><div class='del'>-		bat_priv-&gt;nc.timestamp_fwd_flush = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (batadv_has_timed_out(bat_priv-&gt;nc.timestamp_sniffed_purge,</div><div class='del'>-				 bat_priv-&gt;nc.max_buffer_time)) {</div><div class='del'>-		batadv_nc_process_nc_paths(bat_priv, bat_priv-&gt;nc.decoding_hash,</div><div class='del'>-					   batadv_nc_sniffed_purge);</div><div class='del'>-		bat_priv-&gt;nc.timestamp_sniffed_purge = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Schedule a new check */</div><div class='del'>-	batadv_nc_start_timer(bat_priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_can_nc_with_orig() - checks whether the given orig node is suitable</div><div class='del'>- *  for coding or not</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @orig_node: neighboring orig node which may be used as nc candidate</div><div class='del'>- * @ogm_packet: incoming ogm packet also used for the checks</div><div class='del'>- *</div><div class='del'>- * Return: true if:</div><div class='del'>- *  1) The OGM must have the most recent sequence number.</div><div class='del'>- *  2) The TTL must be decremented by one and only one.</div><div class='del'>- *  3) The OGM must be received from the first hop from orig_node.</div><div class='del'>- *  4) The TQ value of the OGM must be above bat_priv-&gt;nc.min_tq.</div><div class='del'>- */</div><div class='del'>-static bool batadv_can_nc_with_orig(struct batadv_priv *bat_priv,</div><div class='del'>-				    struct batadv_orig_node *orig_node,</div><div class='del'>-				    struct batadv_ogm_packet *ogm_packet)</div><div class='del'>-{</div><div class='del'>-	struct batadv_orig_ifinfo *orig_ifinfo;</div><div class='del'>-	u32 last_real_seqno;</div><div class='del'>-	u8 last_ttl;</div><div class='del'>-</div><div class='del'>-	orig_ifinfo = batadv_orig_ifinfo_get(orig_node, BATADV_IF_DEFAULT);</div><div class='del'>-	if (!orig_ifinfo)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	last_ttl = orig_ifinfo-&gt;last_ttl;</div><div class='del'>-	last_real_seqno = orig_ifinfo-&gt;last_real_seqno;</div><div class='del'>-	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='del'>-</div><div class='del'>-	if (last_real_seqno != ntohl(ogm_packet-&gt;seqno))</div><div class='del'>-		return false;</div><div class='del'>-	if (last_ttl != ogm_packet-&gt;ttl + 1)</div><div class='del'>-		return false;</div><div class='del'>-	if (!batadv_compare_eth(ogm_packet-&gt;orig, ogm_packet-&gt;prev_sender))</div><div class='del'>-		return false;</div><div class='del'>-	if (ogm_packet-&gt;tq &lt; bat_priv-&gt;nc.min_tq)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_find_nc_node() - search for an existing nc node and return it</div><div class='del'>- * @orig_node: orig node originating the ogm packet</div><div class='del'>- * @orig_neigh_node: neighboring orig node from which we received the ogm packet</div><div class='del'>- *  (can be equal to orig_node)</div><div class='del'>- * @in_coding: traverse incoming or outgoing network coding list</div><div class='del'>- *</div><div class='del'>- * Return: the nc_node if found, NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_node *</div><div class='del'>-batadv_nc_find_nc_node(struct batadv_orig_node *orig_node,</div><div class='del'>-		       struct batadv_orig_node *orig_neigh_node,</div><div class='del'>-		       bool in_coding)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_node *nc_node, *nc_node_out = NULL;</div><div class='del'>-	struct list_head *list;</div><div class='del'>-</div><div class='del'>-	if (in_coding)</div><div class='del'>-		list = &amp;orig_neigh_node-&gt;in_coding_list;</div><div class='del'>-	else</div><div class='del'>-		list = &amp;orig_neigh_node-&gt;out_coding_list;</div><div class='del'>-</div><div class='del'>-	/* Traverse list of nc_nodes to orig_node */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(nc_node, list, list) {</div><div class='del'>-		if (!batadv_compare_eth(nc_node-&gt;addr, orig_node-&gt;orig))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!kref_get_unless_zero(&amp;nc_node-&gt;refcount))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Found a match */</div><div class='del'>-		nc_node_out = nc_node;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return nc_node_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_get_nc_node() - retrieves an nc node or creates the entry if it was</div><div class='del'>- *  not found</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @orig_node: orig node originating the ogm packet</div><div class='del'>- * @orig_neigh_node: neighboring orig node from which we received the ogm packet</div><div class='del'>- *  (can be equal to orig_node)</div><div class='del'>- * @in_coding: traverse incoming or outgoing network coding list</div><div class='del'>- *</div><div class='del'>- * Return: the nc_node if found or created, NULL in case of an error.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_node *</div><div class='del'>-batadv_nc_get_nc_node(struct batadv_priv *bat_priv,</div><div class='del'>-		      struct batadv_orig_node *orig_node,</div><div class='del'>-		      struct batadv_orig_node *orig_neigh_node,</div><div class='del'>-		      bool in_coding)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_node *nc_node;</div><div class='del'>-	spinlock_t *lock; /* Used to lock list selected by "int in_coding" */</div><div class='del'>-	struct list_head *list;</div><div class='del'>-</div><div class='del'>-	/* Select ingoing or outgoing coding node */</div><div class='del'>-	if (in_coding) {</div><div class='del'>-		lock = &amp;orig_neigh_node-&gt;in_coding_list_lock;</div><div class='del'>-		list = &amp;orig_neigh_node-&gt;in_coding_list;</div><div class='del'>-	} else {</div><div class='del'>-		lock = &amp;orig_neigh_node-&gt;out_coding_list_lock;</div><div class='del'>-		list = &amp;orig_neigh_node-&gt;out_coding_list;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(lock);</div><div class='del'>-</div><div class='del'>-	/* Check if nc_node is already added */</div><div class='del'>-	nc_node = batadv_nc_find_nc_node(orig_node, orig_neigh_node, in_coding);</div><div class='del'>-</div><div class='del'>-	/* Node found */</div><div class='del'>-	if (nc_node)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	nc_node = kzalloc(sizeof(*nc_node), GFP_ATOMIC);</div><div class='del'>-	if (!nc_node)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* Initialize nc_node */</div><div class='del'>-	INIT_LIST_HEAD(&amp;nc_node-&gt;list);</div><div class='del'>-	kref_init(&amp;nc_node-&gt;refcount);</div><div class='del'>-	ether_addr_copy(nc_node-&gt;addr, orig_node-&gt;orig);</div><div class='del'>-	kref_get(&amp;orig_neigh_node-&gt;refcount);</div><div class='del'>-	nc_node-&gt;orig_node = orig_neigh_node;</div><div class='del'>-</div><div class='del'>-	batadv_dbg(BATADV_DBG_NC, bat_priv, "Adding nc_node %pM -&gt; %pM\n",</div><div class='del'>-		   nc_node-&gt;addr, nc_node-&gt;orig_node-&gt;orig);</div><div class='del'>-</div><div class='del'>-	/* Add nc_node to orig_node */</div><div class='del'>-	kref_get(&amp;nc_node-&gt;refcount);</div><div class='del'>-	list_add_tail_rcu(&amp;nc_node-&gt;list, list);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_bh(lock);</div><div class='del'>-</div><div class='del'>-	return nc_node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_update_nc_node() - updates stored incoming and outgoing nc node</div><div class='del'>- *  structs (best called on incoming OGMs)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @orig_node: orig node originating the ogm packet</div><div class='del'>- * @orig_neigh_node: neighboring orig node from which we received the ogm packet</div><div class='del'>- *  (can be equal to orig_node)</div><div class='del'>- * @ogm_packet: incoming ogm packet</div><div class='del'>- * @is_single_hop_neigh: orig_node is a single hop neighbor</div><div class='del'>- */</div><div class='del'>-void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct batadv_orig_node *orig_node,</div><div class='del'>-			      struct batadv_orig_node *orig_neigh_node,</div><div class='del'>-			      struct batadv_ogm_packet *ogm_packet,</div><div class='del'>-			      int is_single_hop_neigh)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_node *in_nc_node = NULL;</div><div class='del'>-	struct batadv_nc_node *out_nc_node = NULL;</div><div class='del'>-</div><div class='del'>-	/* Check if network coding is enabled */</div><div class='del'>-	if (!atomic_read(&amp;bat_priv-&gt;network_coding))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* check if orig node is network coding enabled */</div><div class='del'>-	if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &amp;orig_node-&gt;capabilities))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* accept ogms from 'good' neighbors and single hop neighbors */</div><div class='del'>-	if (!batadv_can_nc_with_orig(bat_priv, orig_node, ogm_packet) &amp;&amp;</div><div class='del'>-	    !is_single_hop_neigh)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Add orig_node as in_nc_node on hop */</div><div class='del'>-	in_nc_node = batadv_nc_get_nc_node(bat_priv, orig_node,</div><div class='del'>-					   orig_neigh_node, true);</div><div class='del'>-	if (!in_nc_node)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	in_nc_node-&gt;last_seen = jiffies;</div><div class='del'>-</div><div class='del'>-	/* Add hop as out_nc_node on orig_node */</div><div class='del'>-	out_nc_node = batadv_nc_get_nc_node(bat_priv, orig_neigh_node,</div><div class='del'>-					    orig_node, false);</div><div class='del'>-	if (!out_nc_node)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	out_nc_node-&gt;last_seen = jiffies;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (in_nc_node)</div><div class='del'>-		batadv_nc_node_put(in_nc_node);</div><div class='del'>-	if (out_nc_node)</div><div class='del'>-		batadv_nc_node_put(out_nc_node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_get_path() - get existing nc_path or allocate a new one</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @hash: hash table containing the nc path</div><div class='del'>- * @src: ethernet source address - first half of the nc path search key</div><div class='del'>- * @dst: ethernet destination address - second half of the nc path search key</div><div class='del'>- *</div><div class='del'>- * Return: pointer to nc_path if the path was found or created, returns NULL</div><div class='del'>- * on error.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv,</div><div class='del'>-						 struct batadv_hashtable *hash,</div><div class='del'>-						 u8 *src,</div><div class='del'>-						 u8 *dst)</div><div class='del'>-{</div><div class='del'>-	int hash_added;</div><div class='del'>-	struct batadv_nc_path *nc_path, nc_path_key;</div><div class='del'>-</div><div class='del'>-	batadv_nc_hash_key_gen(&amp;nc_path_key, src, dst);</div><div class='del'>-</div><div class='del'>-	/* Search for existing nc_path */</div><div class='del'>-	nc_path = batadv_nc_hash_find(hash, (void *)&amp;nc_path_key);</div><div class='del'>-</div><div class='del'>-	if (nc_path) {</div><div class='del'>-		/* Set timestamp to delay removal of nc_path */</div><div class='del'>-		nc_path-&gt;last_valid = jiffies;</div><div class='del'>-		return nc_path;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No existing nc_path was found; create a new */</div><div class='del'>-	nc_path = kzalloc(sizeof(*nc_path), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (!nc_path)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Initialize nc_path */</div><div class='del'>-	INIT_LIST_HEAD(&amp;nc_path-&gt;packet_list);</div><div class='del'>-	spin_lock_init(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-	kref_init(&amp;nc_path-&gt;refcount);</div><div class='del'>-	nc_path-&gt;last_valid = jiffies;</div><div class='del'>-	ether_addr_copy(nc_path-&gt;next_hop, dst);</div><div class='del'>-	ether_addr_copy(nc_path-&gt;prev_hop, src);</div><div class='del'>-</div><div class='del'>-	batadv_dbg(BATADV_DBG_NC, bat_priv, "Adding nc_path %pM -&gt; %pM\n",</div><div class='del'>-		   nc_path-&gt;prev_hop,</div><div class='del'>-		   nc_path-&gt;next_hop);</div><div class='del'>-</div><div class='del'>-	/* Add nc_path to hash table */</div><div class='del'>-	kref_get(&amp;nc_path-&gt;refcount);</div><div class='del'>-	hash_added = batadv_hash_add(hash, batadv_nc_hash_compare,</div><div class='del'>-				     batadv_nc_hash_choose, &amp;nc_path_key,</div><div class='del'>-				     &amp;nc_path-&gt;hash_entry);</div><div class='del'>-</div><div class='del'>-	if (hash_added &lt; 0) {</div><div class='del'>-		kfree(nc_path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nc_path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_random_weight_tq() - scale the receivers TQ-value to avoid unfair</div><div class='del'>- *  selection of a receiver with slightly lower TQ than the other</div><div class='del'>- * @tq: to be weighted tq value</div><div class='del'>- *</div><div class='del'>- * Return: scaled tq value</div><div class='del'>- */</div><div class='del'>-static u8 batadv_nc_random_weight_tq(u8 tq)</div><div class='del'>-{</div><div class='del'>-	u8 rand_val, rand_tq;</div><div class='del'>-</div><div class='del'>-	get_random_bytes(&amp;rand_val, sizeof(rand_val));</div><div class='del'>-</div><div class='del'>-	/* randomize the estimated packet loss (max TQ - estimated TQ) */</div><div class='del'>-	rand_tq = rand_val * (BATADV_TQ_MAX_VALUE - tq);</div><div class='del'>-</div><div class='del'>-	/* normalize the randomized packet loss */</div><div class='del'>-	rand_tq /= BATADV_TQ_MAX_VALUE;</div><div class='del'>-</div><div class='del'>-	/* convert to (randomized) estimated tq again */</div><div class='del'>-	return BATADV_TQ_MAX_VALUE - rand_tq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_memxor() - XOR destination with source</div><div class='del'>- * @dst: byte array to XOR into</div><div class='del'>- * @src: byte array to XOR from</div><div class='del'>- * @len: length of destination array</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_memxor(char *dst, const char *src, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; ++i)</div><div class='del'>-		dst[i] ^= src[i];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_code_packets() - code a received unicast_packet with an nc packet</div><div class='del'>- *  into a coded_packet and send it</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @ethhdr: pointer to the ethernet header inside the skb</div><div class='del'>- * @nc_packet: structure containing the packet to the skb can be coded with</div><div class='del'>- * @neigh_node: next hop to forward packet to</div><div class='del'>- *</div><div class='del'>- * Return: true if both packets are consumed, false otherwise.</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,</div><div class='del'>-				   struct sk_buff *skb,</div><div class='del'>-				   struct ethhdr *ethhdr,</div><div class='del'>-				   struct batadv_nc_packet *nc_packet,</div><div class='del'>-				   struct batadv_neigh_node *neigh_node)</div><div class='del'>-{</div><div class='del'>-	u8 tq_weighted_neigh, tq_weighted_coding, tq_tmp;</div><div class='del'>-	struct sk_buff *skb_dest, *skb_src;</div><div class='del'>-	struct batadv_unicast_packet *packet1;</div><div class='del'>-	struct batadv_unicast_packet *packet2;</div><div class='del'>-	struct batadv_coded_packet *coded_packet;</div><div class='del'>-	struct batadv_neigh_node *neigh_tmp, *router_neigh, *first_dest;</div><div class='del'>-	struct batadv_neigh_node *router_coding = NULL, *second_dest;</div><div class='del'>-	struct batadv_neigh_ifinfo *router_neigh_ifinfo = NULL;</div><div class='del'>-	struct batadv_neigh_ifinfo *router_coding_ifinfo = NULL;</div><div class='del'>-	u8 *first_source, *second_source;</div><div class='del'>-	__be32 packet_id1, packet_id2;</div><div class='del'>-	size_t count;</div><div class='del'>-	bool res = false;</div><div class='del'>-	int coding_len;</div><div class='del'>-	int unicast_size = sizeof(*packet1);</div><div class='del'>-	int coded_size = sizeof(*coded_packet);</div><div class='del'>-	int header_add = coded_size - unicast_size;</div><div class='del'>-</div><div class='del'>-	/* TODO: do we need to consider the outgoing interface for</div><div class='del'>-	 * coded packets?</div><div class='del'>-	 */</div><div class='del'>-	router_neigh = batadv_orig_router_get(neigh_node-&gt;orig_node,</div><div class='del'>-					      BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_neigh)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	router_neigh_ifinfo = batadv_neigh_ifinfo_get(router_neigh,</div><div class='del'>-						      BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_neigh_ifinfo)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	neigh_tmp = nc_packet-&gt;neigh_node;</div><div class='del'>-	router_coding = batadv_orig_router_get(neigh_tmp-&gt;orig_node,</div><div class='del'>-					       BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_coding)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	router_coding_ifinfo = batadv_neigh_ifinfo_get(router_coding,</div><div class='del'>-						       BATADV_IF_DEFAULT);</div><div class='del'>-	if (!router_coding_ifinfo)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	tq_tmp = router_neigh_ifinfo-&gt;bat_iv.tq_avg;</div><div class='del'>-	tq_weighted_neigh = batadv_nc_random_weight_tq(tq_tmp);</div><div class='del'>-	tq_tmp = router_coding_ifinfo-&gt;bat_iv.tq_avg;</div><div class='del'>-	tq_weighted_coding = batadv_nc_random_weight_tq(tq_tmp);</div><div class='del'>-</div><div class='del'>-	/* Select one destination for the MAC-header dst-field based on</div><div class='del'>-	 * weighted TQ-values.</div><div class='del'>-	 */</div><div class='del'>-	if (tq_weighted_neigh &gt;= tq_weighted_coding) {</div><div class='del'>-		/* Destination from nc_packet is selected for MAC-header */</div><div class='del'>-		first_dest = nc_packet-&gt;neigh_node;</div><div class='del'>-		first_source = nc_packet-&gt;nc_path-&gt;prev_hop;</div><div class='del'>-		second_dest = neigh_node;</div><div class='del'>-		second_source = ethhdr-&gt;h_source;</div><div class='del'>-		packet1 = (struct batadv_unicast_packet *)nc_packet-&gt;skb-&gt;data;</div><div class='del'>-		packet2 = (struct batadv_unicast_packet *)skb-&gt;data;</div><div class='del'>-		packet_id1 = nc_packet-&gt;packet_id;</div><div class='del'>-		packet_id2 = batadv_skb_crc32(skb,</div><div class='del'>-					      skb-&gt;data + sizeof(*packet2));</div><div class='del'>-	} else {</div><div class='del'>-		/* Destination for skb is selected for MAC-header */</div><div class='del'>-		first_dest = neigh_node;</div><div class='del'>-		first_source = ethhdr-&gt;h_source;</div><div class='del'>-		second_dest = nc_packet-&gt;neigh_node;</div><div class='del'>-		second_source = nc_packet-&gt;nc_path-&gt;prev_hop;</div><div class='del'>-		packet1 = (struct batadv_unicast_packet *)skb-&gt;data;</div><div class='del'>-		packet2 = (struct batadv_unicast_packet *)nc_packet-&gt;skb-&gt;data;</div><div class='del'>-		packet_id1 = batadv_skb_crc32(skb,</div><div class='del'>-					      skb-&gt;data + sizeof(*packet1));</div><div class='del'>-		packet_id2 = nc_packet-&gt;packet_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Instead of zero padding the smallest data buffer, we</div><div class='del'>-	 * code into the largest.</div><div class='del'>-	 */</div><div class='del'>-	if (skb-&gt;len &lt;= nc_packet-&gt;skb-&gt;len) {</div><div class='del'>-		skb_dest = nc_packet-&gt;skb;</div><div class='del'>-		skb_src = skb;</div><div class='del'>-	} else {</div><div class='del'>-		skb_dest = skb;</div><div class='del'>-		skb_src = nc_packet-&gt;skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* coding_len is used when decoding the packet shorter packet */</div><div class='del'>-	coding_len = skb_src-&gt;len - unicast_size;</div><div class='del'>-</div><div class='del'>-	if (skb_linearize(skb_dest) &lt; 0 || skb_linearize(skb_src) &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	skb_push(skb_dest, header_add);</div><div class='del'>-</div><div class='del'>-	coded_packet = (struct batadv_coded_packet *)skb_dest-&gt;data;</div><div class='del'>-	skb_reset_mac_header(skb_dest);</div><div class='del'>-</div><div class='del'>-	coded_packet-&gt;packet_type = BATADV_CODED;</div><div class='del'>-	coded_packet-&gt;version = BATADV_COMPAT_VERSION;</div><div class='del'>-	coded_packet-&gt;ttl = packet1-&gt;ttl;</div><div class='del'>-</div><div class='del'>-	/* Info about first unicast packet */</div><div class='del'>-	ether_addr_copy(coded_packet-&gt;first_source, first_source);</div><div class='del'>-	ether_addr_copy(coded_packet-&gt;first_orig_dest, packet1-&gt;dest);</div><div class='del'>-	coded_packet-&gt;first_crc = packet_id1;</div><div class='del'>-	coded_packet-&gt;first_ttvn = packet1-&gt;ttvn;</div><div class='del'>-</div><div class='del'>-	/* Info about second unicast packet */</div><div class='del'>-	ether_addr_copy(coded_packet-&gt;second_dest, second_dest-&gt;addr);</div><div class='del'>-	ether_addr_copy(coded_packet-&gt;second_source, second_source);</div><div class='del'>-	ether_addr_copy(coded_packet-&gt;second_orig_dest, packet2-&gt;dest);</div><div class='del'>-	coded_packet-&gt;second_crc = packet_id2;</div><div class='del'>-	coded_packet-&gt;second_ttl = packet2-&gt;ttl;</div><div class='del'>-	coded_packet-&gt;second_ttvn = packet2-&gt;ttvn;</div><div class='del'>-	coded_packet-&gt;coded_len = htons(coding_len);</div><div class='del'>-</div><div class='del'>-	/* This is where the magic happens: Code skb_src into skb_dest */</div><div class='del'>-	batadv_nc_memxor(skb_dest-&gt;data + coded_size,</div><div class='del'>-			 skb_src-&gt;data + unicast_size, coding_len);</div><div class='del'>-</div><div class='del'>-	/* Update counters accordingly */</div><div class='del'>-	if (BATADV_SKB_CB(skb_src)-&gt;decoded &amp;&amp;</div><div class='del'>-	    BATADV_SKB_CB(skb_dest)-&gt;decoded) {</div><div class='del'>-		/* Both packets are recoded */</div><div class='del'>-		count = skb_src-&gt;len + ETH_HLEN;</div><div class='del'>-		count += skb_dest-&gt;len + ETH_HLEN;</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_RECODE, 2);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_RECODE_BYTES, count);</div><div class='del'>-	} else if (!BATADV_SKB_CB(skb_src)-&gt;decoded &amp;&amp;</div><div class='del'>-		   !BATADV_SKB_CB(skb_dest)-&gt;decoded) {</div><div class='del'>-		/* Both packets are newly coded */</div><div class='del'>-		count = skb_src-&gt;len + ETH_HLEN;</div><div class='del'>-		count += skb_dest-&gt;len + ETH_HLEN;</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_CODE, 2);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_CODE_BYTES, count);</div><div class='del'>-	} else if (BATADV_SKB_CB(skb_src)-&gt;decoded &amp;&amp;</div><div class='del'>-		   !BATADV_SKB_CB(skb_dest)-&gt;decoded) {</div><div class='del'>-		/* skb_src recoded and skb_dest is newly coded */</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_RECODE);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_RECODE_BYTES,</div><div class='del'>-				   skb_src-&gt;len + ETH_HLEN);</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_CODE);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_CODE_BYTES,</div><div class='del'>-				   skb_dest-&gt;len + ETH_HLEN);</div><div class='del'>-	} else if (!BATADV_SKB_CB(skb_src)-&gt;decoded &amp;&amp;</div><div class='del'>-		   BATADV_SKB_CB(skb_dest)-&gt;decoded) {</div><div class='del'>-		/* skb_src is newly coded and skb_dest is recoded */</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_CODE);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_CODE_BYTES,</div><div class='del'>-				   skb_src-&gt;len + ETH_HLEN);</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_RECODE);</div><div class='del'>-		batadv_add_counter(bat_priv, BATADV_CNT_NC_RECODE_BYTES,</div><div class='del'>-				   skb_dest-&gt;len + ETH_HLEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skb_src is now coded into skb_dest, so free it */</div><div class='del'>-	consume_skb(skb_src);</div><div class='del'>-</div><div class='del'>-	/* avoid duplicate free of skb from nc_packet */</div><div class='del'>-	nc_packet-&gt;skb = NULL;</div><div class='del'>-	batadv_nc_packet_free(nc_packet, false);</div><div class='del'>-</div><div class='del'>-	/* Send the coded packet and return true */</div><div class='del'>-	batadv_send_unicast_skb(skb_dest, first_dest);</div><div class='del'>-	res = true;</div><div class='del'>-out:</div><div class='del'>-	if (router_neigh)</div><div class='del'>-		batadv_neigh_node_put(router_neigh);</div><div class='del'>-	if (router_coding)</div><div class='del'>-		batadv_neigh_node_put(router_coding);</div><div class='del'>-	if (router_neigh_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_neigh_ifinfo);</div><div class='del'>-	if (router_coding_ifinfo)</div><div class='del'>-		batadv_neigh_ifinfo_put(router_coding_ifinfo);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_coding_possible() - true if a decoded skb is available at dst.</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @dst: destination mac address of the other skb to code with</div><div class='del'>- * @src: source mac address of skb</div><div class='del'>- *</div><div class='del'>- * Whenever we network code a packet we have to check whether we received it in</div><div class='del'>- * a network coded form. If so, we may not be able to use it for coding because</div><div class='del'>- * some neighbors may also have received (overheard) the packet in the network</div><div class='del'>- * coded form without being able to decode it. It is hard to know which of the</div><div class='del'>- * neighboring nodes was able to decode the packet, therefore we can only</div><div class='del'>- * re-code the packet if the source of the previous encoded packet is involved.</div><div class='del'>- * Since the source encoded the packet we can be certain it has all necessary</div><div class='del'>- * decode information.</div><div class='del'>- *</div><div class='del'>- * Return: true if coding of a decoded packet is allowed.</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_skb_coding_possible(struct sk_buff *skb, u8 *dst, u8 *src)</div><div class='del'>-{</div><div class='del'>-	if (BATADV_SKB_CB(skb)-&gt;decoded &amp;&amp; !batadv_compare_eth(dst, src))</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_path_search() - Find the coding path matching in_nc_node and</div><div class='del'>- *  out_nc_node to retrieve a buffered packet that can be used for coding.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @in_nc_node: pointer to skb next hop's neighbor nc node</div><div class='del'>- * @out_nc_node: pointer to skb source's neighbor nc node</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @eth_dst: next hop mac address of skb</div><div class='del'>- *</div><div class='del'>- * Return: true if coding of a decoded skb is allowed.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_packet *</div><div class='del'>-batadv_nc_path_search(struct batadv_priv *bat_priv,</div><div class='del'>-		      struct batadv_nc_node *in_nc_node,</div><div class='del'>-		      struct batadv_nc_node *out_nc_node,</div><div class='del'>-		      struct sk_buff *skb,</div><div class='del'>-		      u8 *eth_dst)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_path *nc_path, nc_path_key;</div><div class='del'>-	struct batadv_nc_packet *nc_packet_out = NULL;</div><div class='del'>-	struct batadv_nc_packet *nc_packet, *nc_packet_tmp;</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;nc.coding_hash;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	if (!hash)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Create almost path key */</div><div class='del'>-	batadv_nc_hash_key_gen(&amp;nc_path_key, in_nc_node-&gt;addr,</div><div class='del'>-			       out_nc_node-&gt;addr);</div><div class='del'>-	idx = batadv_nc_hash_choose(&amp;nc_path_key, hash-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* Check for coding opportunities in this nc_path */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(nc_path, &amp;hash-&gt;table[idx], hash_entry) {</div><div class='del'>-		if (!batadv_compare_eth(nc_path-&gt;prev_hop, in_nc_node-&gt;addr))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!batadv_compare_eth(nc_path-&gt;next_hop, out_nc_node-&gt;addr))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-		if (list_empty(&amp;nc_path-&gt;packet_list)) {</div><div class='del'>-			spin_unlock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list_for_each_entry_safe(nc_packet, nc_packet_tmp,</div><div class='del'>-					 &amp;nc_path-&gt;packet_list, list) {</div><div class='del'>-			if (!batadv_nc_skb_coding_possible(nc_packet-&gt;skb,</div><div class='del'>-							   eth_dst,</div><div class='del'>-							   in_nc_node-&gt;addr))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* Coding opportunity is found! */</div><div class='del'>-			list_del(&amp;nc_packet-&gt;list);</div><div class='del'>-			nc_packet_out = nc_packet;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return nc_packet_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_src_search() - Loops through the list of neighoring nodes of</div><div class='del'>- *  the skb's sender (may be equal to the originator).</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @eth_dst: next hop mac address of skb</div><div class='del'>- * @eth_src: source mac address of skb</div><div class='del'>- * @in_nc_node: pointer to skb next hop's neighbor nc node</div><div class='del'>- *</div><div class='del'>- * Return: an nc packet if a suitable coding packet was found, NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_packet *</div><div class='del'>-batadv_nc_skb_src_search(struct batadv_priv *bat_priv,</div><div class='del'>-			 struct sk_buff *skb,</div><div class='del'>-			 u8 *eth_dst,</div><div class='del'>-			 u8 *eth_src,</div><div class='del'>-			 struct batadv_nc_node *in_nc_node)</div><div class='del'>-{</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct batadv_nc_node *out_nc_node;</div><div class='del'>-	struct batadv_nc_packet *nc_packet = NULL;</div><div class='del'>-</div><div class='del'>-	orig_node = batadv_orig_hash_find(bat_priv, eth_src);</div><div class='del'>-	if (!orig_node)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(out_nc_node,</div><div class='del'>-				&amp;orig_node-&gt;out_coding_list, list) {</div><div class='del'>-		/* Check if the skb is decoded and if recoding is possible */</div><div class='del'>-		if (!batadv_nc_skb_coding_possible(skb,</div><div class='del'>-						   out_nc_node-&gt;addr, eth_src))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Search for an opportunity in this nc_path */</div><div class='del'>-		nc_packet = batadv_nc_path_search(bat_priv, in_nc_node,</div><div class='del'>-						  out_nc_node, skb, eth_dst);</div><div class='del'>-		if (nc_packet)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	batadv_orig_node_put(orig_node);</div><div class='del'>-	return nc_packet;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_store_before_coding() - set the ethernet src and dst of the</div><div class='del'>- *  unicast skb before it is stored for use in later decoding</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: data skb to store</div><div class='del'>- * @eth_dst_new: new destination mac address of skb</div><div class='del'>- */</div><div class='del'>-static void batadv_nc_skb_store_before_coding(struct batadv_priv *bat_priv,</div><div class='del'>-					      struct sk_buff *skb,</div><div class='del'>-					      u8 *eth_dst_new)</div><div class='del'>-{</div><div class='del'>-	struct ethhdr *ethhdr;</div><div class='del'>-</div><div class='del'>-	/* Copy skb header to change the mac header */</div><div class='del'>-	skb = pskb_copy_for_clone(skb, GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set the mac header as if we actually sent the packet uncoded */</div><div class='del'>-	ethhdr = eth_hdr(skb);</div><div class='del'>-	ether_addr_copy(ethhdr-&gt;h_source, ethhdr-&gt;h_dest);</div><div class='del'>-	ether_addr_copy(ethhdr-&gt;h_dest, eth_dst_new);</div><div class='del'>-</div><div class='del'>-	/* Set data pointer to MAC header to mimic packets from our tx path */</div><div class='del'>-	skb_push(skb, ETH_HLEN);</div><div class='del'>-</div><div class='del'>-	/* Add the packet to the decoding packet pool */</div><div class='del'>-	batadv_nc_skb_store_for_decoding(bat_priv, skb);</div><div class='del'>-</div><div class='del'>-	/* batadv_nc_skb_store_for_decoding() clones the skb, so we must free</div><div class='del'>-	 * our ref</div><div class='del'>-	 */</div><div class='del'>-	consume_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_dst_search() - Loops through list of neighboring nodes to dst.</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @neigh_node: next hop to forward packet to</div><div class='del'>- * @ethhdr: pointer to the ethernet header inside the skb</div><div class='del'>- *</div><div class='del'>- * Loops through list of neighboring nodes the next hop has a good connection to</div><div class='del'>- * (receives OGMs with a sufficient quality). We need to find a neighbor of our</div><div class='del'>- * next hop that potentially sent a packet which our next hop also received</div><div class='del'>- * (overheard) and has stored for later decoding.</div><div class='del'>- *</div><div class='del'>- * Return: true if the skb was consumed (encoded packet sent) or false otherwise</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_skb_dst_search(struct sk_buff *skb,</div><div class='del'>-				     struct batadv_neigh_node *neigh_node,</div><div class='del'>-				     struct ethhdr *ethhdr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = neigh_node-&gt;if_incoming-&gt;soft_iface;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(netdev);</div><div class='del'>-	struct batadv_orig_node *orig_node = neigh_node-&gt;orig_node;</div><div class='del'>-	struct batadv_nc_node *nc_node;</div><div class='del'>-	struct batadv_nc_packet *nc_packet = NULL;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(nc_node, &amp;orig_node-&gt;in_coding_list, list) {</div><div class='del'>-		/* Search for coding opportunity with this in_nc_node */</div><div class='del'>-		nc_packet = batadv_nc_skb_src_search(bat_priv, skb,</div><div class='del'>-						     neigh_node-&gt;addr,</div><div class='del'>-						     ethhdr-&gt;h_source, nc_node);</div><div class='del'>-</div><div class='del'>-		/* Opportunity was found, so stop searching */</div><div class='del'>-		if (nc_packet)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (!nc_packet)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Save packets for later decoding */</div><div class='del'>-	batadv_nc_skb_store_before_coding(bat_priv, skb,</div><div class='del'>-					  neigh_node-&gt;addr);</div><div class='del'>-	batadv_nc_skb_store_before_coding(bat_priv, nc_packet-&gt;skb,</div><div class='del'>-					  nc_packet-&gt;neigh_node-&gt;addr);</div><div class='del'>-</div><div class='del'>-	/* Code and send packets */</div><div class='del'>-	if (batadv_nc_code_packets(bat_priv, skb, ethhdr, nc_packet,</div><div class='del'>-				   neigh_node))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* out of mem ? Coding failed - we have to free the buffered packet</div><div class='del'>-	 * to avoid memleaks. The skb passed as argument will be dealt with</div><div class='del'>-	 * by the calling function.</div><div class='del'>-	 */</div><div class='del'>-	batadv_nc_send_packet(nc_packet);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_add_to_path() - buffer skb for later encoding / decoding</div><div class='del'>- * @skb: skb to add to path</div><div class='del'>- * @nc_path: path to add skb to</div><div class='del'>- * @neigh_node: next hop to forward packet to</div><div class='del'>- * @packet_id: checksum to identify packet</div><div class='del'>- *</div><div class='del'>- * Return: true if the packet was buffered or false in case of an error.</div><div class='del'>- */</div><div class='del'>-static bool batadv_nc_skb_add_to_path(struct sk_buff *skb,</div><div class='del'>-				      struct batadv_nc_path *nc_path,</div><div class='del'>-				      struct batadv_neigh_node *neigh_node,</div><div class='del'>-				      __be32 packet_id)</div><div class='del'>-{</div><div class='del'>-	struct batadv_nc_packet *nc_packet;</div><div class='del'>-</div><div class='del'>-	nc_packet = kzalloc(sizeof(*nc_packet), GFP_ATOMIC);</div><div class='del'>-	if (!nc_packet)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Initialize nc_packet */</div><div class='del'>-	nc_packet-&gt;timestamp = jiffies;</div><div class='del'>-	nc_packet-&gt;packet_id = packet_id;</div><div class='del'>-	nc_packet-&gt;skb = skb;</div><div class='del'>-	nc_packet-&gt;neigh_node = neigh_node;</div><div class='del'>-	nc_packet-&gt;nc_path = nc_path;</div><div class='del'>-</div><div class='del'>-	/* Add coding packet to list */</div><div class='del'>-	spin_lock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-	list_add_tail(&amp;nc_packet-&gt;list, &amp;nc_path-&gt;packet_list);</div><div class='del'>-	spin_unlock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_forward() - try to code a packet or add it to the coding packet</div><div class='del'>- *  buffer</div><div class='del'>- * @skb: data skb to forward</div><div class='del'>- * @neigh_node: next hop to forward packet to</div><div class='del'>- *</div><div class='del'>- * Return: true if the skb was consumed (encoded packet sent) or false otherwise</div><div class='del'>- */</div><div class='del'>-bool batadv_nc_skb_forward(struct sk_buff *skb,</div><div class='del'>-			   struct batadv_neigh_node *neigh_node)</div><div class='del'>-{</div><div class='del'>-	const struct net_device *netdev = neigh_node-&gt;if_incoming-&gt;soft_iface;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(netdev);</div><div class='del'>-	struct batadv_unicast_packet *packet;</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='del'>-	__be32 packet_id;</div><div class='del'>-	u8 *payload;</div><div class='del'>-</div><div class='del'>-	/* Check if network coding is enabled */</div><div class='del'>-	if (!atomic_read(&amp;bat_priv-&gt;network_coding))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* We only handle unicast packets */</div><div class='del'>-	payload = skb_network_header(skb);</div><div class='del'>-	packet = (struct batadv_unicast_packet *)payload;</div><div class='del'>-	if (packet-&gt;packet_type != BATADV_UNICAST)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Try to find a coding opportunity and send the skb if one is found */</div><div class='del'>-	if (batadv_nc_skb_dst_search(skb, neigh_node, ethhdr))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* Find or create a nc_path for this src-dst pair */</div><div class='del'>-	nc_path = batadv_nc_get_path(bat_priv,</div><div class='del'>-				     bat_priv-&gt;nc.coding_hash,</div><div class='del'>-				     ethhdr-&gt;h_source,</div><div class='del'>-				     neigh_node-&gt;addr);</div><div class='del'>-</div><div class='del'>-	if (!nc_path)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Add skb to nc_path */</div><div class='del'>-	packet_id = batadv_skb_crc32(skb, payload + sizeof(*packet));</div><div class='del'>-	if (!batadv_nc_skb_add_to_path(skb, nc_path, neigh_node, packet_id))</div><div class='del'>-		goto free_nc_path;</div><div class='del'>-</div><div class='del'>-	/* Packet is consumed */</div><div class='del'>-	return true;</div><div class='del'>-</div><div class='del'>-free_nc_path:</div><div class='del'>-	batadv_nc_path_put(nc_path);</div><div class='del'>-out:</div><div class='del'>-	/* Packet is not consumed */</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_store_for_decoding() - save a clone of the skb which can be</div><div class='del'>- *  used when decoding coded packets</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: data skb to store</div><div class='del'>- */</div><div class='del'>-void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct batadv_unicast_packet *packet;</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='del'>-	__be32 packet_id;</div><div class='del'>-	u8 *payload;</div><div class='del'>-</div><div class='del'>-	/* Check if network coding is enabled */</div><div class='del'>-	if (!atomic_read(&amp;bat_priv-&gt;network_coding))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Check for supported packet type */</div><div class='del'>-	payload = skb_network_header(skb);</div><div class='del'>-	packet = (struct batadv_unicast_packet *)payload;</div><div class='del'>-	if (packet-&gt;packet_type != BATADV_UNICAST)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Find existing nc_path or create a new */</div><div class='del'>-	nc_path = batadv_nc_get_path(bat_priv,</div><div class='del'>-				     bat_priv-&gt;nc.decoding_hash,</div><div class='del'>-				     ethhdr-&gt;h_source,</div><div class='del'>-				     ethhdr-&gt;h_dest);</div><div class='del'>-</div><div class='del'>-	if (!nc_path)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Clone skb and adjust skb-&gt;data to point at batman header */</div><div class='del'>-	skb = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		goto free_nc_path;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!skb_pull_rcsum(skb, ETH_HLEN)))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	/* Add skb to nc_path */</div><div class='del'>-	packet_id = batadv_skb_crc32(skb, payload + sizeof(*packet));</div><div class='del'>-	if (!batadv_nc_skb_add_to_path(skb, nc_path, NULL, packet_id))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	batadv_inc_counter(bat_priv, BATADV_CNT_NC_BUFFER);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-free_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-free_nc_path:</div><div class='del'>-	batadv_nc_path_put(nc_path);</div><div class='del'>-out:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_store_sniffed_unicast() - check if a received unicast packet</div><div class='del'>- *  should be saved in the decoding buffer and, if so, store it there</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: unicast skb to store</div><div class='del'>- */</div><div class='del'>-void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (batadv_is_my_mac(bat_priv, ethhdr-&gt;h_dest))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set data pointer to MAC header to mimic packets from our tx path */</div><div class='del'>-	skb_push(skb, ETH_HLEN);</div><div class='del'>-</div><div class='del'>-	batadv_nc_skb_store_for_decoding(bat_priv, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_skb_decode_packet() - decode given skb using the decode data stored</div><div class='del'>- *  in nc_packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @skb: unicast skb to decode</div><div class='del'>- * @nc_packet: decode data needed to decode the skb</div><div class='del'>- *</div><div class='del'>- * Return: pointer to decoded unicast packet if the packet was decoded or NULL</div><div class='del'>- * in case of an error.</div><div class='del'>- */</div><div class='del'>-static struct batadv_unicast_packet *</div><div class='del'>-batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='del'>-			    struct batadv_nc_packet *nc_packet)</div><div class='del'>-{</div><div class='del'>-	const int h_size = sizeof(struct batadv_unicast_packet);</div><div class='del'>-	const int h_diff = sizeof(struct batadv_coded_packet) - h_size;</div><div class='del'>-	struct batadv_unicast_packet *unicast_packet;</div><div class='del'>-	struct batadv_coded_packet coded_packet_tmp;</div><div class='del'>-	struct ethhdr *ethhdr, ethhdr_tmp;</div><div class='del'>-	u8 *orig_dest, ttl, ttvn;</div><div class='del'>-	unsigned int coding_len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Save headers temporarily */</div><div class='del'>-	memcpy(&amp;coded_packet_tmp, skb-&gt;data, sizeof(coded_packet_tmp));</div><div class='del'>-	memcpy(&amp;ethhdr_tmp, skb_mac_header(skb), sizeof(ethhdr_tmp));</div><div class='del'>-</div><div class='del'>-	if (skb_cow(skb, 0) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!skb_pull_rcsum(skb, h_diff)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Data points to batman header, so set mac header 14 bytes before</div><div class='del'>-	 * and network to data</div><div class='del'>-	 */</div><div class='del'>-	skb_set_mac_header(skb, -ETH_HLEN);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	/* Reconstruct original mac header */</div><div class='del'>-	ethhdr = eth_hdr(skb);</div><div class='del'>-	*ethhdr = ethhdr_tmp;</div><div class='del'>-</div><div class='del'>-	/* Select the correct unicast header information based on the location</div><div class='del'>-	 * of our mac address in the coded_packet header</div><div class='del'>-	 */</div><div class='del'>-	if (batadv_is_my_mac(bat_priv, coded_packet_tmp.second_dest)) {</div><div class='del'>-		/* If we are the second destination the packet was overheard,</div><div class='del'>-		 * so the Ethernet address must be copied to h_dest and</div><div class='del'>-		 * pkt_type changed from PACKET_OTHERHOST to PACKET_HOST</div><div class='del'>-		 */</div><div class='del'>-		ether_addr_copy(ethhdr-&gt;h_dest, coded_packet_tmp.second_dest);</div><div class='del'>-		skb-&gt;pkt_type = PACKET_HOST;</div><div class='del'>-</div><div class='del'>-		orig_dest = coded_packet_tmp.second_orig_dest;</div><div class='del'>-		ttl = coded_packet_tmp.second_ttl;</div><div class='del'>-		ttvn = coded_packet_tmp.second_ttvn;</div><div class='del'>-	} else {</div><div class='del'>-		orig_dest = coded_packet_tmp.first_orig_dest;</div><div class='del'>-		ttl = coded_packet_tmp.ttl;</div><div class='del'>-		ttvn = coded_packet_tmp.first_ttvn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coding_len = ntohs(coded_packet_tmp.coded_len);</div><div class='del'>-</div><div class='del'>-	if (coding_len &gt; skb-&gt;len)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Here the magic is reversed:</div><div class='del'>-	 *   extract the missing packet from the received coded packet</div><div class='del'>-	 */</div><div class='del'>-	batadv_nc_memxor(skb-&gt;data + h_size,</div><div class='del'>-			 nc_packet-&gt;skb-&gt;data + h_size,</div><div class='del'>-			 coding_len);</div><div class='del'>-</div><div class='del'>-	/* Resize decoded skb if decoded with larger packet */</div><div class='del'>-	if (nc_packet-&gt;skb-&gt;len &gt; coding_len + h_size) {</div><div class='del'>-		err = pskb_trim_rcsum(skb, coding_len + h_size);</div><div class='del'>-		if (err)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create decoded unicast packet */</div><div class='del'>-	unicast_packet = (struct batadv_unicast_packet *)skb-&gt;data;</div><div class='del'>-	unicast_packet-&gt;packet_type = BATADV_UNICAST;</div><div class='del'>-	unicast_packet-&gt;version = BATADV_COMPAT_VERSION;</div><div class='del'>-	unicast_packet-&gt;ttl = ttl;</div><div class='del'>-	ether_addr_copy(unicast_packet-&gt;dest, orig_dest);</div><div class='del'>-	unicast_packet-&gt;ttvn = ttvn;</div><div class='del'>-</div><div class='del'>-	batadv_nc_packet_free(nc_packet, false);</div><div class='del'>-	return unicast_packet;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_find_decoding_packet() - search through buffered decoding data to</div><div class='del'>- *  find the data needed to decode the coded packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @ethhdr: pointer to the ethernet header inside the coded packet</div><div class='del'>- * @coded: coded packet we try to find decode data for</div><div class='del'>- *</div><div class='del'>- * Return: pointer to nc packet if the needed data was found or NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static struct batadv_nc_packet *</div><div class='del'>-batadv_nc_find_decoding_packet(struct batadv_priv *bat_priv,</div><div class='del'>-			       struct ethhdr *ethhdr,</div><div class='del'>-			       struct batadv_coded_packet *coded)</div><div class='del'>-{</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;nc.decoding_hash;</div><div class='del'>-	struct batadv_nc_packet *tmp_nc_packet, *nc_packet = NULL;</div><div class='del'>-	struct batadv_nc_path *nc_path, nc_path_key;</div><div class='del'>-	u8 *dest, *source;</div><div class='del'>-	__be32 packet_id;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	if (!hash)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Select the correct packet id based on the location of our mac-addr */</div><div class='del'>-	dest = ethhdr-&gt;h_source;</div><div class='del'>-	if (!batadv_is_my_mac(bat_priv, coded-&gt;second_dest)) {</div><div class='del'>-		source = coded-&gt;second_source;</div><div class='del'>-		packet_id = coded-&gt;second_crc;</div><div class='del'>-	} else {</div><div class='del'>-		source = coded-&gt;first_source;</div><div class='del'>-		packet_id = coded-&gt;first_crc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	batadv_nc_hash_key_gen(&amp;nc_path_key, source, dest);</div><div class='del'>-	index = batadv_nc_hash_choose(&amp;nc_path_key, hash-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* Search for matching coding path */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(nc_path, &amp;hash-&gt;table[index], hash_entry) {</div><div class='del'>-		/* Find matching nc_packet */</div><div class='del'>-		spin_lock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-		list_for_each_entry(tmp_nc_packet,</div><div class='del'>-				    &amp;nc_path-&gt;packet_list, list) {</div><div class='del'>-			if (packet_id == tmp_nc_packet-&gt;packet_id) {</div><div class='del'>-				list_del(&amp;tmp_nc_packet-&gt;list);</div><div class='del'>-</div><div class='del'>-				nc_packet = tmp_nc_packet;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;nc_path-&gt;packet_list_lock);</div><div class='del'>-</div><div class='del'>-		if (nc_packet)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (!nc_packet)</div><div class='del'>-		batadv_dbg(BATADV_DBG_NC, bat_priv,</div><div class='del'>-			   "No decoding packet found for %u\n", packet_id);</div><div class='del'>-</div><div class='del'>-	return nc_packet;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_recv_coded_packet() - try to decode coded packet and enqueue the</div><div class='del'>- *  resulting unicast packet</div><div class='del'>- * @skb: incoming coded packet</div><div class='del'>- * @recv_if: pointer to interface this packet was received on</div><div class='del'>- *</div><div class='del'>- * Return: NET_RX_SUCCESS if the packet has been consumed or NET_RX_DROP</div><div class='del'>- * otherwise.</div><div class='del'>- */</div><div class='del'>-static int batadv_nc_recv_coded_packet(struct sk_buff *skb,</div><div class='del'>-				       struct batadv_hard_iface *recv_if)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='del'>-	struct batadv_unicast_packet *unicast_packet;</div><div class='del'>-	struct batadv_coded_packet *coded_packet;</div><div class='del'>-	struct batadv_nc_packet *nc_packet;</div><div class='del'>-	struct ethhdr *ethhdr;</div><div class='del'>-	int hdr_size = sizeof(*coded_packet);</div><div class='del'>-</div><div class='del'>-	/* Check if network coding is enabled */</div><div class='del'>-	if (!atomic_read(&amp;bat_priv-&gt;network_coding))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	/* Make sure we can access (and remove) header */</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, hdr_size)))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	coded_packet = (struct batadv_coded_packet *)skb-&gt;data;</div><div class='del'>-	ethhdr = eth_hdr(skb);</div><div class='del'>-</div><div class='del'>-	/* Verify frame is destined for us */</div><div class='del'>-	if (!batadv_is_my_mac(bat_priv, ethhdr-&gt;h_dest) &amp;&amp;</div><div class='del'>-	    !batadv_is_my_mac(bat_priv, coded_packet-&gt;second_dest))</div><div class='del'>-		goto free_skb;</div><div class='del'>-</div><div class='del'>-	/* Update stat counter */</div><div class='del'>-	if (batadv_is_my_mac(bat_priv, coded_packet-&gt;second_dest))</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_SNIFFED);</div><div class='del'>-</div><div class='del'>-	nc_packet = batadv_nc_find_decoding_packet(bat_priv, ethhdr,</div><div class='del'>-						   coded_packet);</div><div class='del'>-	if (!nc_packet) {</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_DECODE_FAILED);</div><div class='del'>-		goto free_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make skb's linear, because decoding accesses the entire buffer */</div><div class='del'>-	if (skb_linearize(skb) &lt; 0)</div><div class='del'>-		goto free_nc_packet;</div><div class='del'>-</div><div class='del'>-	if (skb_linearize(nc_packet-&gt;skb) &lt; 0)</div><div class='del'>-		goto free_nc_packet;</div><div class='del'>-</div><div class='del'>-	/* Decode the packet */</div><div class='del'>-	unicast_packet = batadv_nc_skb_decode_packet(bat_priv, skb, nc_packet);</div><div class='del'>-	if (!unicast_packet) {</div><div class='del'>-		batadv_inc_counter(bat_priv, BATADV_CNT_NC_DECODE_FAILED);</div><div class='del'>-		goto free_nc_packet;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Mark packet as decoded to do correct recoding when forwarding */</div><div class='del'>-	BATADV_SKB_CB(skb)-&gt;decoded = true;</div><div class='del'>-	batadv_inc_counter(bat_priv, BATADV_CNT_NC_DECODE);</div><div class='del'>-	batadv_add_counter(bat_priv, BATADV_CNT_NC_DECODE_BYTES,</div><div class='del'>-			   skb-&gt;len + ETH_HLEN);</div><div class='del'>-	return batadv_recv_unicast_packet(skb, recv_if);</div><div class='del'>-</div><div class='del'>-free_nc_packet:</div><div class='del'>-	batadv_nc_packet_free(nc_packet, true);</div><div class='del'>-free_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_mesh_free() - clean up network coding memory</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- */</div><div class='del'>-void batadv_nc_mesh_free(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_NC, 1);</div><div class='del'>-	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_NC, 1);</div><div class='del'>-	cancel_delayed_work_sync(&amp;bat_priv-&gt;nc.work);</div><div class='del'>-</div><div class='del'>-	batadv_nc_purge_paths(bat_priv, bat_priv-&gt;nc.coding_hash, NULL);</div><div class='del'>-	batadv_hash_destroy(bat_priv-&gt;nc.coding_hash);</div><div class='del'>-	batadv_nc_purge_paths(bat_priv, bat_priv-&gt;nc.decoding_hash, NULL);</div><div class='del'>-	batadv_hash_destroy(bat_priv-&gt;nc.decoding_hash);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_nodes_seq_print_text() - print the nc node information</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct batadv_nc_node *nc_node;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Traverse list of originators */</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		/* For each orig_node in this bin */</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			/* no need to print the orig node if it does not have</div><div class='del'>-			 * network coding neighbors</div><div class='del'>-			 */</div><div class='del'>-			if (list_empty(&amp;orig_node-&gt;in_coding_list) &amp;&amp;</div><div class='del'>-			    list_empty(&amp;orig_node-&gt;out_coding_list))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			seq_printf(seq, "Node:      %pM\n", orig_node-&gt;orig);</div><div class='del'>-</div><div class='del'>-			seq_puts(seq, " Ingoing:  ");</div><div class='del'>-			/* For each in_nc_node to this orig_node */</div><div class='del'>-			list_for_each_entry_rcu(nc_node,</div><div class='del'>-						&amp;orig_node-&gt;in_coding_list,</div><div class='del'>-						list)</div><div class='del'>-				seq_printf(seq, "%pM ",</div><div class='del'>-					   nc_node-&gt;addr);</div><div class='del'>-			seq_puts(seq, "\n Outgoing: ");</div><div class='del'>-			/* For out_nc_node to this orig_node */</div><div class='del'>-			list_for_each_entry_rcu(nc_node,</div><div class='del'>-						&amp;orig_node-&gt;out_coding_list,</div><div class='del'>-						list)</div><div class='del'>-				seq_printf(seq, "%pM ",</div><div class='del'>-					   nc_node-&gt;addr);</div><div class='del'>-			seq_puts(seq, "\n\n");</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_nc_init_debugfs() - create nc folder and related files in debugfs</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_nc_init_debugfs(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	struct dentry *nc_dir, *file;</div><div class='del'>-</div><div class='del'>-	nc_dir = debugfs_create_dir("nc", bat_priv-&gt;debug_dir);</div><div class='del'>-	if (!nc_dir)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	file = debugfs_create_u8("min_tq", 0644, nc_dir, &amp;bat_priv-&gt;nc.min_tq);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	file = debugfs_create_u32("max_fwd_delay", 0644, nc_dir,</div><div class='del'>-				  &amp;bat_priv-&gt;nc.max_fwd_delay);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	file = debugfs_create_u32("max_buffer_time", 0644, nc_dir,</div><div class='del'>-				  &amp;bat_priv-&gt;nc.max_buffer_time);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h<br/>deleted file mode 100644<br/>index 65c346812bc1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/network-coding.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/network-coding.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Martin Hundebøll, Jeppe Ledet-Pedersen</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_</div><div class='del'>-#define _NET_BATMAN_ADV_NETWORK_CODING_H_</div><div class='del'>-</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct batadv_ogm_packet;</div><div class='del'>-struct net_device;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-</div><div class='del'>-void batadv_nc_status_update(struct net_device *net_dev);</div><div class='del'>-int batadv_nc_init(void);</div><div class='del'>-int batadv_nc_mesh_init(struct batadv_priv *bat_priv);</div><div class='del'>-void batadv_nc_mesh_free(struct batadv_priv *bat_priv);</div><div class='del'>-void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,</div><div class='del'>-			      struct batadv_orig_node *orig_node,</div><div class='del'>-			      struct batadv_orig_node *orig_neigh_node,</div><div class='del'>-			      struct batadv_ogm_packet *ogm_packet,</div><div class='del'>-			      int is_single_hop_neigh);</div><div class='del'>-void batadv_nc_purge_orig(struct batadv_priv *bat_priv,</div><div class='del'>-			  struct batadv_orig_node *orig_node,</div><div class='del'>-			  bool (*to_purge)(struct batadv_priv *,</div><div class='del'>-					   struct batadv_nc_node *));</div><div class='del'>-void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv);</div><div class='del'>-void batadv_nc_init_orig(struct batadv_orig_node *orig_node);</div><div class='del'>-bool batadv_nc_skb_forward(struct sk_buff *skb,</div><div class='del'>-			   struct batadv_neigh_node *neigh_node);</div><div class='del'>-void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,</div><div class='del'>-				      struct sk_buff *skb);</div><div class='del'>-void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,</div><div class='del'>-					 struct sk_buff *skb);</div><div class='del'>-int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset);</div><div class='del'>-int batadv_nc_init_debugfs(struct batadv_priv *bat_priv);</div><div class='del'>-</div><div class='del'>-#else /* ifdef CONFIG_BATMAN_ADV_NC */</div><div class='del'>-</div><div class='del'>-static inline void batadv_nc_status_update(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_nc_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-batadv_nc_update_nc_node(struct batadv_priv *bat_priv,</div><div class='del'>-			 struct batadv_orig_node *orig_node,</div><div class='del'>-			 struct batadv_orig_node *orig_neigh_node,</div><div class='del'>-			 struct batadv_ogm_packet *ogm_packet,</div><div class='del'>-			 int is_single_hop_neigh)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-batadv_nc_purge_orig(struct batadv_priv *bat_priv,</div><div class='del'>-		     struct batadv_orig_node *orig_node,</div><div class='del'>-		     bool (*to_purge)(struct batadv_priv *,</div><div class='del'>-				      struct batadv_nc_node *))</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void batadv_nc_init_orig(struct batadv_orig_node *orig_node)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool batadv_nc_skb_forward(struct sk_buff *skb,</div><div class='del'>-					 struct batadv_neigh_node *neigh_node)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,</div><div class='del'>-				 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,</div><div class='del'>-				    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_nc_nodes_seq_print_text(struct seq_file *seq,</div><div class='del'>-						 void *offset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int batadv_nc_init_debugfs(struct batadv_priv *bat_priv)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* ifdef CONFIG_BATMAN_ADV_NC */</div><div class='del'>-</div><div class='del'>-#endif /* _NET_BATMAN_ADV_NETWORK_CODING_H_ */</div><div class='head'>diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c<br/>index 1d295da3e342..a662408ad867 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/originator.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/originator.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/originator.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/originator.c</a></div><div class='hunk'>@@ -1,30 +1,20 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='hunk'>@@ -32,16 +22,13 @@</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;uapi/linux/batman_adv.h&gt;</div><div class='add'>+#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bat_algo.h"</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "fragmentation.h"</div><div class='ctx'> #include "gateway_client.h"</div><div class='hunk'>@@ -50,9 +37,7 @@</div><div class='ctx'> #include "log.h"</div><div class='ctx'> #include "multicast.h"</div><div class='ctx'> #include "netlink.h"</div><div class='del'>-#include "network-coding.h"</div><div class='ctx'> #include "routing.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> /* hash class keys */</div><div class='hunk'>@@ -60,7 +45,7 @@ static struct lock_class_key batadv_orig_hash_lock_class_key;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_orig_hash_find() - Find and return originator from orig_hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @data: mac address of the originator</div><div class='ctx'>  *</div><div class='ctx'>  * Return: orig_node (with increased refcnt), NULL on errors</div><div class='hunk'>@@ -144,6 +129,29 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_vlan_id_valid() - check if vlan id is in valid batman-adv encoding</div><div class='add'>+ * @vid: the VLAN identifier</div><div class='add'>+ *</div><div class='add'>+ * Return: true when either no vlan is set or if VLAN is in correct range,</div><div class='add'>+ *  false otherwise</div><div class='add'>+ */</div><div class='add'>+static bool batadv_vlan_id_valid(unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	unsigned short non_vlan = vid &amp; ~(BATADV_VLAN_HAS_TAG | VLAN_VID_MASK);</div><div class='add'>+</div><div class='add'>+	if (vid == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!(vid &amp; BATADV_VLAN_HAS_TAG))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (non_vlan)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_orig_node_vlan_new() - search and possibly create an orig_node_vlan</div><div class='ctx'>  *  object</div><div class='ctx'>  * @orig_node: the originator serving the VLAN</div><div class='hunk'>@@ -161,6 +169,9 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_orig_node_vlan *vlan;</div><div class='ctx'> </div><div class='add'>+	if (!batadv_vlan_id_valid(vid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;orig_node-&gt;vlan_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* first look if an object for this vid already exists */</div><div class='hunk'>@@ -189,7 +200,7 @@ out:</div><div class='ctx'>  *  and queue for free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the originator-vlan object</div><div class='ctx'>  */</div><div class='del'>-static void batadv_orig_node_vlan_release(struct kref *ref)</div><div class='add'>+void batadv_orig_node_vlan_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_orig_node_vlan *orig_vlan;</div><div class='ctx'> </div><div class='hunk'>@@ -199,18 +210,8 @@ static void batadv_orig_node_vlan_release(struct kref *ref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_orig_node_vlan_put() - decrement the refcounter and possibly release</div><div class='del'>- *  the originator-vlan object</div><div class='del'>- * @orig_vlan: the originator-vlan object to release</div><div class='del'>- */</div><div class='del'>-void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;orig_vlan-&gt;refcount, batadv_orig_node_vlan_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_originator_init() - Initialize all originator structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure</div><div class='ctx'>  */</div><div class='hunk'>@@ -243,7 +244,7 @@ err:</div><div class='ctx'>  *  free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the neigh_ifinfo</div><div class='ctx'>  */</div><div class='del'>-static void batadv_neigh_ifinfo_release(struct kref *ref)</div><div class='add'>+void batadv_neigh_ifinfo_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_neigh_ifinfo *neigh_ifinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -256,21 +257,11 @@ static void batadv_neigh_ifinfo_release(struct kref *ref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_neigh_ifinfo_put() - decrement the refcounter and possibly release</div><div class='del'>- *  the neigh_ifinfo</div><div class='del'>- * @neigh_ifinfo: the neigh_ifinfo object to release</div><div class='del'>- */</div><div class='del'>-void batadv_neigh_ifinfo_put(struct batadv_neigh_ifinfo *neigh_ifinfo)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;neigh_ifinfo-&gt;refcount, batadv_neigh_ifinfo_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_hardif_neigh_release() - release hardif neigh node from lists and</div><div class='ctx'>  *  queue for free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the neigh_node</div><div class='ctx'>  */</div><div class='del'>-static void batadv_hardif_neigh_release(struct kref *ref)</div><div class='add'>+void batadv_hardif_neigh_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='ctx'> </div><div class='hunk'>@@ -286,21 +277,11 @@ static void batadv_hardif_neigh_release(struct kref *ref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_hardif_neigh_put() - decrement the hardif neighbors refcounter</div><div class='del'>- *  and possibly release it</div><div class='del'>- * @hardif_neigh: hardif neigh neighbor to free</div><div class='del'>- */</div><div class='del'>-void batadv_hardif_neigh_put(struct batadv_hardif_neigh_node *hardif_neigh)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;hardif_neigh-&gt;refcount, batadv_hardif_neigh_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_neigh_node_release() - release neigh_node from lists and queue for</div><div class='ctx'>  *  free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the neigh_node</div><div class='ctx'>  */</div><div class='del'>-static void batadv_neigh_node_release(struct kref *ref)</div><div class='add'>+void batadv_neigh_node_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_node *node_tmp;</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node;</div><div class='hunk'>@@ -321,22 +302,12 @@ static void batadv_neigh_node_release(struct kref *ref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_neigh_node_put() - decrement the neighbors refcounter and possibly</div><div class='del'>- *  release it</div><div class='del'>- * @neigh_node: neigh neighbor to free</div><div class='del'>- */</div><div class='del'>-void batadv_neigh_node_put(struct batadv_neigh_node *neigh_node)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;neigh_node-&gt;refcount, batadv_neigh_node_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_orig_router_get() - router to the originator depending on iface</div><div class='ctx'>  * @orig_node: the orig node for the router</div><div class='ctx'>  * @if_outgoing: the interface where the payload packet has been received or</div><div class='ctx'>  *  the OGM should be sent to</div><div class='ctx'>  *</div><div class='del'>- * Return: the neighbor which should be router for this orig_node/iface.</div><div class='add'>+ * Return: the neighbor which should be the router for this orig_node/iface.</div><div class='ctx'>  *</div><div class='ctx'>  * The object is returned with refcounter increased by 1.</div><div class='ctx'>  */</div><div class='hunk'>@@ -364,6 +335,33 @@ batadv_orig_router_get(struct batadv_orig_node *orig_node,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_orig_to_router() - get next hop neighbor to an orig address</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @orig_addr: the originator MAC address to search the best next hop router for</div><div class='add'>+ * @if_outgoing: the interface where the payload packet has been received or</div><div class='add'>+ *  the OGM should be sent to</div><div class='add'>+ *</div><div class='add'>+ * Return: A neighbor node which is the best router towards the given originator</div><div class='add'>+ * address.</div><div class='add'>+ */</div><div class='add'>+struct batadv_neigh_node *</div><div class='add'>+batadv_orig_to_router(struct batadv_priv *bat_priv, u8 *orig_addr,</div><div class='add'>+		      struct batadv_hard_iface *if_outgoing)</div><div class='add'>+{</div><div class='add'>+	struct batadv_neigh_node *neigh_node;</div><div class='add'>+	struct batadv_orig_node *orig_node;</div><div class='add'>+</div><div class='add'>+	orig_node = batadv_orig_hash_find(bat_priv, orig_addr);</div><div class='add'>+	if (!orig_node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	neigh_node = batadv_find_router(bat_priv, orig_node, if_outgoing);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+</div><div class='add'>+	return neigh_node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_orig_ifinfo_get() - find the ifinfo from an orig_node</div><div class='ctx'>  * @orig_node: the orig node to be queried</div><div class='ctx'>  * @if_outgoing: the interface for which the ifinfo should be acquired</div><div class='hunk'>@@ -526,7 +524,7 @@ out:</div><div class='ctx'>  * Looks for and possibly returns a neighbour belonging to this originator list</div><div class='ctx'>  * which is connected through the provided hard interface.</div><div class='ctx'>  *</div><div class='del'>- * Return: neighbor when found. Othwerwise NULL</div><div class='add'>+ * Return: neighbor when found. Otherwise NULL</div><div class='ctx'>  */</div><div class='ctx'> static struct batadv_neigh_node *</div><div class='ctx'> batadv_neigh_node_get(const struct batadv_orig_node *orig_node,</div><div class='hunk'>@@ -567,7 +565,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 			   const u8 *neigh_addr,</div><div class='ctx'> 			   struct batadv_orig_node *orig_node)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_hardif_neigh_node *hardif_neigh;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;hard_iface-&gt;neigh_list_lock);</div><div class='hunk'>@@ -631,7 +629,7 @@ batadv_hardif_neigh_get_or_create(struct batadv_hard_iface *hard_iface,</div><div class='ctx'>  *</div><div class='ctx'>  * Looks for and possibly returns a neighbour belonging to this hard interface.</div><div class='ctx'>  *</div><div class='del'>- * Return: neighbor when found. Othwerwise NULL</div><div class='add'>+ * Return: neighbor when found. Otherwise NULL</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_hardif_neigh_node *</div><div class='ctx'> batadv_hardif_neigh_get(const struct batadv_hard_iface *hard_iface,</div><div class='hunk'>@@ -716,8 +714,7 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node,</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;neigh_list_lock);</div><div class='ctx'> </div><div class='del'>-	if (hardif_neigh)</div><div class='del'>-		batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+	batadv_hardif_neigh_put(hardif_neigh);</div><div class='ctx'> 	return neigh_node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -744,42 +741,6 @@ batadv_neigh_node_get_or_create(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	return batadv_neigh_node_create(orig_node, hard_iface, neigh_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_hardif_neigh_seq_print_text() - print the single hop neighbour list</div><div class='del'>- * @seq: neighbour table seq_file struct</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_hardif_neigh_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s %s)]\n",</div><div class='del'>-		   BATADV_SOURCE_VERSION, primary_if-&gt;net_dev-&gt;name,</div><div class='del'>-		   primary_if-&gt;net_dev-&gt;dev_addr, net_dev-&gt;name,</div><div class='del'>-		   bat_priv-&gt;algo_ops-&gt;name);</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='del'>-</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;neigh.print) {</div><div class='del'>-		seq_puts(seq,</div><div class='del'>-			 "No printing function for this routing protocol\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;neigh.print(bat_priv, seq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_hardif_neigh_dump() - Dump to netlink the neighbor infos for a</div><div class='ctx'>  *  specific outgoing interface</div><div class='hunk'>@@ -790,69 +751,54 @@ int batadv_hardif_neigh_seq_print_text(struct seq_file *seq, void *offset)</div><div class='ctx'>  */</div><div class='ctx'> int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	struct net_device *hard_iface = NULL;</div><div class='del'>-	struct batadv_hard_iface *hardif = BATADV_IF_DEFAULT;</div><div class='add'>+	struct batadv_hard_iface *primary_if, *hard_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int ifindex, hard_ifindex;</div><div class='del'>-</div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh, BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='del'>-	if (!primary_if || primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='add'>+	if (!primary_if) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put_mesh_iface;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hard_ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-						  BATADV_ATTR_HARD_IFINDEX);</div><div class='del'>-	if (hard_ifindex) {</div><div class='del'>-		hard_iface = dev_get_by_index(net, hard_ifindex);</div><div class='del'>-		if (hard_iface)</div><div class='del'>-			hardif = batadv_hardif_get_by_netdev(hard_iface);</div><div class='del'>-</div><div class='del'>-		if (!hardif) {</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	if (primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_put_primary_if;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (hardif-&gt;soft_iface != soft_iface) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	hard_iface = batadv_netlink_get_hardif(bat_priv, cb);</div><div class='add'>+	if (IS_ERR(hard_iface) &amp;&amp; PTR_ERR(hard_iface) != -ENONET) {</div><div class='add'>+		ret = PTR_ERR(hard_iface);</div><div class='add'>+		goto out_put_primary_if;</div><div class='add'>+	} else if (IS_ERR(hard_iface)) {</div><div class='add'>+		/* =&gt; PTR_ERR(hard_iface) == -ENONET</div><div class='add'>+		 * =&gt; no hard-iface given, ok</div><div class='add'>+		 */</div><div class='add'>+		hard_iface = BATADV_IF_DEFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!bat_priv-&gt;algo_ops-&gt;neigh.dump) {</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put_hard_iface;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;neigh.dump(msg, cb, bat_priv, hardif);</div><div class='add'>+	bat_priv-&gt;algo_ops-&gt;neigh.dump(msg, cb, bat_priv, hard_iface);</div><div class='ctx'> </div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	if (hardif)</div><div class='del'>-		batadv_hardif_put(hardif);</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		dev_put(hard_iface);</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+out_put_hard_iface:</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='add'>+out_put_primary_if:</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+out_put_mesh_iface:</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -862,7 +808,7 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'>  *  free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the orig_ifinfo</div><div class='ctx'>  */</div><div class='del'>-static void batadv_orig_ifinfo_release(struct kref *ref)</div><div class='add'>+void batadv_orig_ifinfo_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_orig_ifinfo *orig_ifinfo;</div><div class='ctx'> 	struct batadv_neigh_node *router;</div><div class='hunk'>@@ -874,23 +820,12 @@ static void batadv_orig_ifinfo_release(struct kref *ref)</div><div class='ctx'> </div><div class='ctx'> 	/* this is the last reference to this object */</div><div class='ctx'> 	router = rcu_dereference_protected(orig_ifinfo-&gt;router, true);</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(orig_ifinfo, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_orig_ifinfo_put() - decrement the refcounter and possibly release</div><div class='del'>- *  the orig_ifinfo</div><div class='del'>- * @orig_ifinfo: the orig_ifinfo object to release</div><div class='del'>- */</div><div class='del'>-void batadv_orig_ifinfo_put(struct batadv_orig_ifinfo *orig_ifinfo)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;orig_ifinfo-&gt;refcount, batadv_orig_ifinfo_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_orig_node_free_rcu() - free the orig_node</div><div class='ctx'>  * @rcu: rcu pointer of the orig_node</div><div class='ctx'>  */</div><div class='hunk'>@@ -904,9 +839,6 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu)</div><div class='ctx'> </div><div class='ctx'> 	batadv_frag_purge_orig(orig_node, NULL);</div><div class='ctx'> </div><div class='del'>-	if (orig_node-&gt;bat_priv-&gt;algo_ops-&gt;orig.free)</div><div class='del'>-		orig_node-&gt;bat_priv-&gt;algo_ops-&gt;orig.free(orig_node);</div><div class='del'>-</div><div class='ctx'> 	kfree(orig_node-&gt;tt_buff);</div><div class='ctx'> 	kfree(orig_node);</div><div class='ctx'> }</div><div class='hunk'>@@ -916,7 +848,7 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu)</div><div class='ctx'>  *  free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the orig_node</div><div class='ctx'>  */</div><div class='del'>-static void batadv_orig_node_release(struct kref *ref)</div><div class='add'>+void batadv_orig_node_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_node *node_tmp;</div><div class='ctx'> 	struct batadv_neigh_node *neigh_node;</div><div class='hunk'>@@ -946,8 +878,7 @@ static void batadv_orig_node_release(struct kref *ref)</div><div class='ctx'> 	orig_node-&gt;last_bonding_candidate = NULL;</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;neigh_list_lock);</div><div class='ctx'> </div><div class='del'>-	if (last_candidate)</div><div class='del'>-		batadv_orig_ifinfo_put(last_candidate);</div><div class='add'>+	batadv_orig_ifinfo_put(last_candidate);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;orig_node-&gt;vlan_list_lock);</div><div class='ctx'> 	hlist_for_each_entry_safe(vlan, node_tmp, &amp;orig_node-&gt;vlan_list, list) {</div><div class='hunk'>@@ -956,25 +887,12 @@ static void batadv_orig_node_release(struct kref *ref)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;vlan_list_lock);</div><div class='ctx'> </div><div class='del'>-	/* Free nc_nodes */</div><div class='del'>-	batadv_nc_purge_orig(orig_node-&gt;bat_priv, orig_node, NULL);</div><div class='del'>-</div><div class='ctx'> 	call_rcu(&amp;orig_node-&gt;rcu, batadv_orig_node_free_rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_orig_node_put() - decrement the orig node refcounter and possibly</div><div class='del'>- *  release it</div><div class='del'>- * @orig_node: the orig node to free</div><div class='del'>- */</div><div class='del'>-void batadv_orig_node_put(struct batadv_orig_node *orig_node)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;orig_node-&gt;refcount, batadv_orig_node_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_originator_free() - Free all originator structures</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_originator_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1010,10 +928,10 @@ void batadv_originator_free(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_orig_node_new() - creates a new orig_node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the originator</div><div class='ctx'>  *</div><div class='del'>- * Creates a new originator object and initialise all the generic fields.</div><div class='add'>+ * Creates a new originator object and initialises all the generic fields.</div><div class='ctx'>  * The new object is not added to the originator list.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the newly created object or NULL on failure.</div><div class='hunk'>@@ -1042,8 +960,6 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,</div><div class='ctx'> 	spin_lock_init(&amp;orig_node-&gt;tt_lock);</div><div class='ctx'> 	spin_lock_init(&amp;orig_node-&gt;vlan_list_lock);</div><div class='ctx'> </div><div class='del'>-	batadv_nc_init_orig(orig_node);</div><div class='del'>-</div><div class='ctx'> 	/* extra reference for return */</div><div class='ctx'> 	kref_init(&amp;orig_node-&gt;refcount);</div><div class='ctx'> </div><div class='hunk'>@@ -1058,7 +974,9 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,</div><div class='ctx'> 	orig_node-&gt;bcast_seqno_reset = reset_time;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-	orig_node-&gt;mcast_flags = BATADV_NO_FLAGS;</div><div class='add'>+	orig_node-&gt;mcast_flags = BATADV_MCAST_WANT_NO_RTR4;</div><div class='add'>+	orig_node-&gt;mcast_flags |= BATADV_MCAST_WANT_NO_RTR6;</div><div class='add'>+	orig_node-&gt;mcast_flags |= BATADV_MCAST_HAVE_MC_PTYPE_CAPA;</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;orig_node-&gt;mcast_want_all_unsnoopables_node);</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;orig_node-&gt;mcast_want_all_ipv4_node);</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;orig_node-&gt;mcast_want_all_ipv6_node);</div><div class='hunk'>@@ -1089,7 +1007,7 @@ free_orig_node:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_neigh_ifinfo() - purge obsolete ifinfo entries from neighbor</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @neigh: orig node which is to be checked</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -1130,7 +1048,7 @@ batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_orig_ifinfo() - purge obsolete ifinfo entries from originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be checked</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if any ifinfo entry was purged, false otherwise.</div><div class='hunk'>@@ -1182,7 +1100,7 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_orig_neighbors() - purges neighbors from originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be checked</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if any neighbor was purged, false otherwise</div><div class='hunk'>@@ -1240,7 +1158,7 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_find_best_neighbor() - finds the best neighbor after purging</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be checked</div><div class='ctx'>  * @if_outgoing: the interface for which the metric should be compared</div><div class='ctx'>  *</div><div class='hunk'>@@ -1263,8 +1181,7 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv,</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;neigh-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (best)</div><div class='del'>-			batadv_neigh_node_put(best);</div><div class='add'>+		batadv_neigh_node_put(best);</div><div class='ctx'> </div><div class='ctx'> 		best = neigh;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1275,7 +1192,7 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_orig_node() - purges obsolete information from an orig_node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be checked</div><div class='ctx'>  *</div><div class='ctx'>  * This function checks if the orig_node or substructures of it have become</div><div class='hunk'>@@ -1289,6 +1206,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_neigh_node *best_neigh_node;</div><div class='ctx'> 	struct batadv_hard_iface *hard_iface;</div><div class='ctx'> 	bool changed_ifinfo, changed_neigh;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_has_timed_out(orig_node-&gt;last_seen,</div><div class='ctx'> 				 2 * BATADV_PURGE_TIMEOUT)) {</div><div class='hunk'>@@ -1309,18 +1227,14 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,</div><div class='ctx'> 						    BATADV_IF_DEFAULT);</div><div class='ctx'> 	batadv_update_route(bat_priv, orig_node, BATADV_IF_DEFAULT,</div><div class='ctx'> 			    best_neigh_node);</div><div class='del'>-	if (best_neigh_node)</div><div class='del'>-		batadv_neigh_node_put(best_neigh_node);</div><div class='add'>+	batadv_neigh_node_put(best_neigh_node);</div><div class='ctx'> </div><div class='ctx'> 	/* ... then for all other interfaces. */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='ctx'> 		if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (hard_iface-&gt;soft_iface != bat_priv-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1329,8 +1243,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,</div><div class='ctx'> 							    hard_iface);</div><div class='ctx'> 		batadv_update_route(bat_priv, orig_node, hard_iface,</div><div class='ctx'> 				    best_neigh_node);</div><div class='del'>-		if (best_neigh_node)</div><div class='del'>-			batadv_neigh_node_put(best_neigh_node);</div><div class='add'>+		batadv_neigh_node_put(best_neigh_node);</div><div class='ctx'> </div><div class='ctx'> 		batadv_hardif_put(hard_iface);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1341,7 +1254,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_orig_ref() - Purge all outdated originators</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_purge_orig_ref(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1358,6 +1271,8 @@ void batadv_purge_orig_ref(struct batadv_priv *bat_priv)</div><div class='ctx'> 	/* for all origins... */</div><div class='ctx'> 	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='ctx'> 		head = &amp;hash-&gt;table[i];</div><div class='add'>+		if (hlist_empty(head))</div><div class='add'>+			continue;</div><div class='ctx'> 		list_lock = &amp;hash-&gt;list_locks[i];</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(list_lock);</div><div class='hunk'>@@ -1395,90 +1310,6 @@ static void batadv_purge_orig(struct work_struct *work)</div><div class='ctx'> 			   msecs_to_jiffies(BATADV_ORIG_WORK_PERIOD));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_orig_seq_print_text() - Print the originator table in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_orig_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s %s)]\n",</div><div class='del'>-		   BATADV_SOURCE_VERSION, primary_if-&gt;net_dev-&gt;name,</div><div class='del'>-		   primary_if-&gt;net_dev-&gt;dev_addr, net_dev-&gt;name,</div><div class='del'>-		   bat_priv-&gt;algo_ops-&gt;name);</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='del'>-</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;orig.print) {</div><div class='del'>-		seq_puts(seq,</div><div class='del'>-			 "No printing function for this routing protocol\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;orig.print(bat_priv, seq, BATADV_IF_DEFAULT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_orig_hardif_seq_print_text() - writes originator infos for a specific</div><div class='del'>- *  outgoing interface</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: 0</div><div class='del'>- */</div><div class='del'>-int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-</div><div class='del'>-	if (!hard_iface || !hard_iface-&gt;soft_iface) {</div><div class='del'>-		seq_puts(seq, "Interface not known to B.A.T.M.A.N.\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;orig.print) {</div><div class='del'>-		seq_puts(seq,</div><div class='del'>-			 "No printing function for this routing protocol\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='del'>-		seq_puts(seq, "Interface not active\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "[B.A.T.M.A.N. adv %s, IF/MAC: %s/%pM (%s %s)]\n",</div><div class='del'>-		   BATADV_SOURCE_VERSION, hard_iface-&gt;net_dev-&gt;name,</div><div class='del'>-		   hard_iface-&gt;net_dev-&gt;dev_addr,</div><div class='del'>-		   hard_iface-&gt;soft_iface-&gt;name, bat_priv-&gt;algo_ops-&gt;name);</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;orig.print(bat_priv, seq, hard_iface);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		batadv_hardif_put(hard_iface);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_orig_dump() - Dump to netlink the originator infos for a specific</div><div class='ctx'>  *  outgoing interface</div><div class='hunk'>@@ -1489,173 +1320,54 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='del'>-	struct net_device *hard_iface = NULL;</div><div class='del'>-	struct batadv_hard_iface *hardif = BATADV_IF_DEFAULT;</div><div class='add'>+	struct batadv_hard_iface *primary_if, *hard_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int ifindex, hard_ifindex;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh, BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='del'>-	if (!primary_if || primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='add'>+	if (!primary_if) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put_mesh_iface;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hard_ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh,</div><div class='del'>-						  BATADV_ATTR_HARD_IFINDEX);</div><div class='del'>-	if (hard_ifindex) {</div><div class='del'>-		hard_iface = dev_get_by_index(net, hard_ifindex);</div><div class='del'>-		if (hard_iface)</div><div class='del'>-			hardif = batadv_hardif_get_by_netdev(hard_iface);</div><div class='del'>-</div><div class='del'>-		if (!hardif) {</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	if (primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_put_primary_if;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (hardif-&gt;soft_iface != soft_iface) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	hard_iface = batadv_netlink_get_hardif(bat_priv, cb);</div><div class='add'>+	if (IS_ERR(hard_iface) &amp;&amp; PTR_ERR(hard_iface) != -ENONET) {</div><div class='add'>+		ret = PTR_ERR(hard_iface);</div><div class='add'>+		goto out_put_primary_if;</div><div class='add'>+	} else if (IS_ERR(hard_iface)) {</div><div class='add'>+		/* =&gt; PTR_ERR(hard_iface) == -ENONET</div><div class='add'>+		 * =&gt; no hard-iface given, ok</div><div class='add'>+		 */</div><div class='add'>+		hard_iface = BATADV_IF_DEFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!bat_priv-&gt;algo_ops-&gt;orig.dump) {</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put_hard_iface;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bat_priv-&gt;algo_ops-&gt;orig.dump(msg, cb, bat_priv, hardif);</div><div class='add'>+	bat_priv-&gt;algo_ops-&gt;orig.dump(msg, cb, bat_priv, hard_iface);</div><div class='ctx'> </div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	if (hardif)</div><div class='del'>-		batadv_hardif_put(hardif);</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		dev_put(hard_iface);</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+out_put_hard_iface:</div><div class='add'>+	batadv_hardif_put(hard_iface);</div><div class='add'>+out_put_primary_if:</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+out_put_mesh_iface:</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_orig_hash_add_if() - Add interface to originators in orig_hash</div><div class='del'>- * @hard_iface: hard interface to add (already slave of the soft interface)</div><div class='del'>- * @max_if_num: new number of interfaces</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,</div><div class='del'>-			    unsigned int max_if_num)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='del'>-	struct batadv_algo_ops *bao = bat_priv-&gt;algo_ops;</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	u32 i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* resize all orig nodes because orig_node-&gt;bcast_own(_sum) depend on</div><div class='del'>-	 * if_num</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (bao-&gt;orig.add_if)</div><div class='del'>-				ret = bao-&gt;orig.add_if(orig_node, max_if_num);</div><div class='del'>-			if (ret == -ENOMEM)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_orig_hash_del_if() - Remove interface from originators in orig_hash</div><div class='del'>- * @hard_iface: hard interface to remove (still slave of the soft interface)</div><div class='del'>- * @max_if_num: new number of interfaces</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,</div><div class='del'>-			    unsigned int max_if_num)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;orig_hash;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct batadv_hard_iface *hard_iface_tmp;</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-	struct batadv_algo_ops *bao = bat_priv-&gt;algo_ops;</div><div class='del'>-	u32 i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* resize all orig nodes because orig_node-&gt;bcast_own(_sum) depend on</div><div class='del'>-	 * if_num</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (bao-&gt;orig.del_if)</div><div class='del'>-				ret = bao-&gt;orig.del_if(orig_node, max_if_num,</div><div class='del'>-						       hard_iface-&gt;if_num);</div><div class='del'>-			if (ret == -ENOMEM)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* renumber remaining batman interfaces _inside_ of orig_hash_lock */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface_tmp, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface_tmp-&gt;if_status == BATADV_IF_NOT_IN_USE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (hard_iface == hard_iface_tmp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (hard_iface-&gt;soft_iface != hard_iface_tmp-&gt;soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (hard_iface_tmp-&gt;if_num &gt; hard_iface-&gt;if_num)</div><div class='del'>-			hard_iface_tmp-&gt;if_num--;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	hard_iface-&gt;if_num = -1;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='head'>diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h<br/>index 3b3f59b881e1..db0c55128170 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/originator.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/originator.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/originator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/originator.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_ORIGINATOR_H_</div><div class='hunk'>@@ -24,42 +12,42 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> bool batadv_compare_orig(const struct hlist_node *node, const void *data2);</div><div class='ctx'> int batadv_originator_init(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_originator_free(struct batadv_priv *bat_priv);</div><div class='ctx'> void batadv_purge_orig_ref(struct batadv_priv *bat_priv);</div><div class='del'>-void batadv_orig_node_put(struct batadv_orig_node *orig_node);</div><div class='add'>+void batadv_orig_node_release(struct kref *ref);</div><div class='ctx'> struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,</div><div class='ctx'> 					      const u8 *addr);</div><div class='ctx'> struct batadv_hardif_neigh_node *</div><div class='ctx'> batadv_hardif_neigh_get(const struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 			const u8 *neigh_addr);</div><div class='del'>-void</div><div class='del'>-batadv_hardif_neigh_put(struct batadv_hardif_neigh_node *hardif_neigh);</div><div class='add'>+void batadv_hardif_neigh_release(struct kref *ref);</div><div class='ctx'> struct batadv_neigh_node *</div><div class='ctx'> batadv_neigh_node_get_or_create(struct batadv_orig_node *orig_node,</div><div class='ctx'> 				struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 				const u8 *neigh_addr);</div><div class='del'>-void batadv_neigh_node_put(struct batadv_neigh_node *neigh_node);</div><div class='add'>+void batadv_neigh_node_release(struct kref *ref);</div><div class='ctx'> struct batadv_neigh_node *</div><div class='ctx'> batadv_orig_router_get(struct batadv_orig_node *orig_node,</div><div class='ctx'> 		       const struct batadv_hard_iface *if_outgoing);</div><div class='add'>+struct batadv_neigh_node *</div><div class='add'>+batadv_orig_to_router(struct batadv_priv *bat_priv, u8 *orig_addr,</div><div class='add'>+		      struct batadv_hard_iface *if_outgoing);</div><div class='ctx'> struct batadv_neigh_ifinfo *</div><div class='ctx'> batadv_neigh_ifinfo_new(struct batadv_neigh_node *neigh,</div><div class='ctx'> 			struct batadv_hard_iface *if_outgoing);</div><div class='ctx'> struct batadv_neigh_ifinfo *</div><div class='ctx'> batadv_neigh_ifinfo_get(struct batadv_neigh_node *neigh,</div><div class='ctx'> 			struct batadv_hard_iface *if_outgoing);</div><div class='del'>-void batadv_neigh_ifinfo_put(struct batadv_neigh_ifinfo *neigh_ifinfo);</div><div class='add'>+void batadv_neigh_ifinfo_release(struct kref *ref);</div><div class='ctx'> </div><div class='ctx'> int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='del'>-int batadv_hardif_neigh_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> </div><div class='ctx'> struct batadv_orig_ifinfo *</div><div class='ctx'> batadv_orig_ifinfo_get(struct batadv_orig_node *orig_node,</div><div class='hunk'>@@ -67,22 +55,16 @@ batadv_orig_ifinfo_get(struct batadv_orig_node *orig_node,</div><div class='ctx'> struct batadv_orig_ifinfo *</div><div class='ctx'> batadv_orig_ifinfo_new(struct batadv_orig_node *orig_node,</div><div class='ctx'> 		       struct batadv_hard_iface *if_outgoing);</div><div class='del'>-void batadv_orig_ifinfo_put(struct batadv_orig_ifinfo *orig_ifinfo);</div><div class='add'>+void batadv_orig_ifinfo_release(struct kref *ref);</div><div class='ctx'> </div><div class='del'>-int batadv_orig_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='del'>-int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset);</div><div class='del'>-int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,</div><div class='del'>-			    unsigned int max_if_num);</div><div class='del'>-int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,</div><div class='del'>-			    unsigned int max_if_num);</div><div class='ctx'> struct batadv_orig_node_vlan *</div><div class='ctx'> batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,</div><div class='ctx'> 			  unsigned short vid);</div><div class='ctx'> struct batadv_orig_node_vlan *</div><div class='ctx'> batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,</div><div class='ctx'> 			  unsigned short vid);</div><div class='del'>-void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan);</div><div class='add'>+void batadv_orig_node_vlan_release(struct kref *ref);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_choose_orig() - Return the index of the orig entry in the hash table</div><div class='hunk'>@@ -103,4 +85,86 @@ static inline u32 batadv_choose_orig(const void *data, u32 size)</div><div class='ctx'> struct batadv_orig_node *</div><div class='ctx'> batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * batadv_orig_node_vlan_put() - decrement the refcounter and possibly release</div><div class='add'>+ *  the originator-vlan object</div><div class='add'>+ * @orig_vlan: the originator-vlan object to release</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan)</div><div class='add'>+{</div><div class='add'>+	if (!orig_vlan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;orig_vlan-&gt;refcount, batadv_orig_node_vlan_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_neigh_ifinfo_put() - decrement the refcounter and possibly release</div><div class='add'>+ *  the neigh_ifinfo</div><div class='add'>+ * @neigh_ifinfo: the neigh_ifinfo object to release</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+batadv_neigh_ifinfo_put(struct batadv_neigh_ifinfo *neigh_ifinfo)</div><div class='add'>+{</div><div class='add'>+	if (!neigh_ifinfo)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;neigh_ifinfo-&gt;refcount, batadv_neigh_ifinfo_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_hardif_neigh_put() - decrement the hardif neighbors refcounter</div><div class='add'>+ *  and possibly release it</div><div class='add'>+ * @hardif_neigh: hardif neigh neighbor to free</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+batadv_hardif_neigh_put(struct batadv_hardif_neigh_node *hardif_neigh)</div><div class='add'>+{</div><div class='add'>+	if (!hardif_neigh)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;hardif_neigh-&gt;refcount, batadv_hardif_neigh_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_neigh_node_put() - decrement the neighbors refcounter and possibly</div><div class='add'>+ *  release it</div><div class='add'>+ * @neigh_node: neigh neighbor to free</div><div class='add'>+ */</div><div class='add'>+static inline void batadv_neigh_node_put(struct batadv_neigh_node *neigh_node)</div><div class='add'>+{</div><div class='add'>+	if (!neigh_node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;neigh_node-&gt;refcount, batadv_neigh_node_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_orig_ifinfo_put() - decrement the refcounter and possibly release</div><div class='add'>+ *  the orig_ifinfo</div><div class='add'>+ * @orig_ifinfo: the orig_ifinfo object to release</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+batadv_orig_ifinfo_put(struct batadv_orig_ifinfo *orig_ifinfo)</div><div class='add'>+{</div><div class='add'>+	if (!orig_ifinfo)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;orig_ifinfo-&gt;refcount, batadv_orig_ifinfo_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_orig_node_put() - decrement the orig node refcounter and possibly</div><div class='add'>+ *  release it</div><div class='add'>+ * @orig_node: the orig node to free</div><div class='add'>+ */</div><div class='add'>+static inline void batadv_orig_node_put(struct batadv_orig_node *orig_node)</div><div class='add'>+{</div><div class='add'>+	if (!orig_node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;orig_node-&gt;refcount, batadv_orig_node_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */</div><div class='head'>diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c<br/>index cc3ed93a6d51..12c16f81cc51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/routing.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/routing.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/routing.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/routing.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "routing.h"</div><div class='hunk'>@@ -41,12 +29,10 @@</div><div class='ctx'> #include "distributed-arp-table.h"</div><div class='ctx'> #include "fragmentation.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='del'>-#include "icmp_socket.h"</div><div class='ctx'> #include "log.h"</div><div class='del'>-#include "network-coding.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "send.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "tp_meter.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> #include "tvlv.h"</div><div class='hunk'>@@ -56,7 +42,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * _batadv_update_route() - set the router for this originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be configured</div><div class='ctx'>  * @recv_if: the receive interface for which this route is set</div><div class='ctx'>  * @neigh_node: neighbor which should be the next router</div><div class='hunk'>@@ -83,13 +69,13 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,</div><div class='ctx'> 	 * the code needs to ensure the curr_router variable contains a pointer</div><div class='ctx'> 	 * to the replaced best neighbor.</div><div class='ctx'> 	 */</div><div class='del'>-	curr_router = rcu_dereference_protected(orig_ifinfo-&gt;router, true);</div><div class='ctx'> </div><div class='ctx'> 	/* increase refcount of new best neighbor */</div><div class='ctx'> 	if (neigh_node)</div><div class='ctx'> 		kref_get(&amp;neigh_node-&gt;refcount);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(orig_ifinfo-&gt;router, neigh_node);</div><div class='add'>+	curr_router = rcu_replace_pointer(orig_ifinfo-&gt;router, neigh_node,</div><div class='add'>+					  true);</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;neigh_list_lock);</div><div class='ctx'> 	batadv_orig_ifinfo_put(orig_ifinfo);</div><div class='ctx'> </div><div class='hunk'>@@ -114,13 +100,12 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* decrease refcount of previous best neighbor */</div><div class='del'>-	if (curr_router)</div><div class='del'>-		batadv_neigh_node_put(curr_router);</div><div class='add'>+	batadv_neigh_node_put(curr_router);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_update_route() - set the router for this originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which is to be configured</div><div class='ctx'>  * @recv_if: the receive interface for which this route is set</div><div class='ctx'>  * @neigh_node: neighbor which should be the next router</div><div class='hunk'>@@ -141,14 +126,13 @@ void batadv_update_route(struct batadv_priv *bat_priv,</div><div class='ctx'> 		_batadv_update_route(bat_priv, orig_node, recv_if, neigh_node);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (router)</div><div class='del'>-		batadv_neigh_node_put(router);</div><div class='add'>+	batadv_neigh_node_put(router);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_window_protected() - checks whether the host restarted and is in the</div><div class='ctx'>  *  protection time.</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @seq_num_diff: difference between the current/received sequence number and</div><div class='ctx'>  *  the last sequence number</div><div class='ctx'>  * @seq_old_max_diff: maximum age of sequence number not considered as restart</div><div class='hunk'>@@ -222,7 +206,7 @@ bool batadv_check_management_packet(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_recv_my_icmp_packet() - receive an icmp packet locally</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: icmp packet to process</div><div class='ctx'>  *</div><div class='ctx'>  * Return: NET_RX_SUCCESS if the packet has been consumed or NET_RX_DROP</div><div class='hunk'>@@ -239,15 +223,6 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,</div><div class='ctx'> 	icmph = (struct batadv_icmp_header *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	switch (icmph-&gt;msg_type) {</div><div class='del'>-	case BATADV_ECHO_REPLY:</div><div class='del'>-	case BATADV_DESTINATION_UNREACHABLE:</div><div class='del'>-	case BATADV_TTL_EXCEEDED:</div><div class='del'>-		/* receive the packet */</div><div class='del'>-		if (skb_linearize(skb) &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		batadv_socket_receive_packet(icmph, skb-&gt;len);</div><div class='del'>-		break;</div><div class='ctx'> 	case BATADV_ECHO_REQUEST:</div><div class='ctx'> 		/* answer echo request (ping) */</div><div class='ctx'> 		primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -291,10 +266,8 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -346,10 +319,8 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,</div><div class='ctx'> 	skb = NULL;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +337,7 @@ out:</div><div class='ctx'> int batadv_recv_icmp_packet(struct sk_buff *skb,</div><div class='ctx'> 			    struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_icmp_header *icmph;</div><div class='ctx'> 	struct batadv_icmp_packet_rr *icmp_packet_rr;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='hunk'>@@ -447,8 +418,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,</div><div class='ctx'> 	skb = NULL;</div><div class='ctx'> </div><div class='ctx'> put_orig_node:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -457,11 +427,11 @@ free_skb:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_check_unicast_packet() - Check for malformed unicast packets</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: packet to check</div><div class='ctx'>  * @hdr_size: size of header to pull</div><div class='ctx'>  *</div><div class='del'>- * Check for short header and bad addresses in given packet.</div><div class='add'>+ * Checks for short header and bad addresses in the given packet.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: negative value when check fails and 0 otherwise. The negative value</div><div class='ctx'>  * depends on the reason: -ENODATA for bad header, -EBADR for broadcast</div><div class='hunk'>@@ -535,13 +505,12 @@ batadv_last_bonding_replace(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	orig_node-&gt;last_bonding_candidate = new_candidate;</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;neigh_list_lock);</div><div class='ctx'> </div><div class='del'>-	if (old_candidate)</div><div class='del'>-		batadv_orig_ifinfo_put(old_candidate);</div><div class='add'>+	batadv_orig_ifinfo_put(old_candidate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_find_router() - find a suitable router for this originator</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the destination node</div><div class='ctx'>  * @recv_if: pointer to interface this packet was received on</div><div class='ctx'>  *</div><div class='hunk'>@@ -678,8 +647,7 @@ next:</div><div class='ctx'> 		batadv_orig_ifinfo_put(next_candidate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (last_candidate)</div><div class='del'>-		batadv_orig_ifinfo_put(last_candidate);</div><div class='add'>+	batadv_orig_ifinfo_put(last_candidate);</div><div class='ctx'> </div><div class='ctx'> 	return router;</div><div class='ctx'> }</div><div class='hunk'>@@ -687,7 +655,7 @@ next:</div><div class='ctx'> static int batadv_route_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> 				       struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	struct batadv_unicast_packet *unicast_packet;</div><div class='ctx'> 	struct ethhdr *ethhdr = eth_hdr(skb);</div><div class='hunk'>@@ -758,7 +726,7 @@ free_skb:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_reroute_unicast_packet() - update the unicast header for re-routing</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: unicast packet to process</div><div class='ctx'>  * @unicast_packet: the unicast header to be updated</div><div class='ctx'>  * @dst_addr: the payload destination</div><div class='hunk'>@@ -778,7 +746,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	bool ret = false;</div><div class='del'>-	u8 *orig_addr, orig_ttvn;</div><div class='add'>+	const u8 *orig_addr;</div><div class='add'>+	u8 orig_ttvn;</div><div class='ctx'> </div><div class='ctx'> 	if (batadv_is_my_client(bat_priv, dst_addr, vid)) {</div><div class='ctx'> 		primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='hunk'>@@ -807,10 +776,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -838,6 +805,10 @@ static bool batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,</div><div class='ctx'> 	vid = batadv_get_vid(skb, hdr_len);</div><div class='ctx'> 	ethhdr = (struct ethhdr *)(skb-&gt;data + hdr_len);</div><div class='ctx'> </div><div class='add'>+	/* do not reroute multicast frames in a unicast header */</div><div class='add'>+	if (is_multicast_ether_addr(ethhdr-&gt;h_dest))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	/* check if the destination client was served by this node and it is now</div><div class='ctx'> 	 * roaming. In this case, it means that the node has got a ROAM_ADV</div><div class='ctx'> 	 * message and that it knows the new destination in the mesh to re-route</div><div class='hunk'>@@ -907,7 +878,7 @@ static bool batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* update the header in order to let the packet be delivered to this</div><div class='del'>-	 * node's soft interface</div><div class='add'>+	 * node's mesh interface</div><div class='ctx'> 	 */</div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (!primary_if)</div><div class='hunk'>@@ -937,7 +908,7 @@ int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> 					 struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_unicast_packet *unicast_packet;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	int check, hdr_size = sizeof(*unicast_packet);</div><div class='ctx'> </div><div class='ctx'> 	check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);</div><div class='hunk'>@@ -966,7 +937,7 @@ free_skb:</div><div class='ctx'> int batadv_recv_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> 			       struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_unicast_packet *unicast_packet;</div><div class='ctx'> 	struct batadv_unicast_4addr_packet *unicast_4addr_packet;</div><div class='ctx'> 	u8 *orig_addr, *orig_addr_gw;</div><div class='hunk'>@@ -984,15 +955,9 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* function returns -EREMOTE for promiscuous packets */</div><div class='ctx'> 	check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);</div><div class='del'>-</div><div class='del'>-	/* Even though the packet is not for us, we might save it to use for</div><div class='del'>-	 * decoding a later received coded packet</div><div class='del'>-	 */</div><div class='del'>-	if (check == -EREMOTE)</div><div class='del'>-		batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);</div><div class='del'>-</div><div class='ctx'> 	if (check &lt; 0)</div><div class='ctx'> 		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='hunk'>@@ -1043,12 +1008,13 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,</div><div class='ctx'> 							hdr_size))</div><div class='ctx'> 			goto rx_success;</div><div class='ctx'> </div><div class='del'>-		batadv_interface_rx(recv_if-&gt;soft_iface, skb, hdr_size,</div><div class='add'>+		batadv_dat_snoop_incoming_dhcp_ack(bat_priv, skb, hdr_size);</div><div class='add'>+</div><div class='add'>+		batadv_interface_rx(recv_if-&gt;mesh_iface, skb, hdr_size,</div><div class='ctx'> 				    orig_node);</div><div class='ctx'> </div><div class='ctx'> rx_success:</div><div class='del'>-		if (orig_node)</div><div class='del'>-			batadv_orig_node_put(orig_node);</div><div class='add'>+		batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1074,7 +1040,7 @@ free_skb:</div><div class='ctx'> int batadv_recv_unicast_tvlv(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;</div><div class='ctx'> 	unsigned char *tvlv_buff;</div><div class='ctx'> 	u16 tvlv_buff_len;</div><div class='hunk'>@@ -1100,10 +1066,9 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,</div><div class='ctx'> 	if (tvlv_buff_len &gt; skb-&gt;len - hdr_size)</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='del'>-	ret = batadv_tvlv_containers_process(bat_priv, false, NULL,</div><div class='del'>-					     unicast_tvlv_packet-&gt;src,</div><div class='del'>-					     unicast_tvlv_packet-&gt;dst,</div><div class='del'>-					     tvlv_buff, tvlv_buff_len);</div><div class='add'>+	ret = batadv_tvlv_containers_process(bat_priv, BATADV_UNICAST_TVLV,</div><div class='add'>+					     NULL, skb, tvlv_buff,</div><div class='add'>+					     tvlv_buff_len);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != NET_RX_SUCCESS) {</div><div class='ctx'> 		ret = batadv_route_unicast_packet(skb, recv_if);</div><div class='hunk'>@@ -1123,7 +1088,7 @@ free_skb:</div><div class='ctx'>  * @recv_if: interface that the skb is received on</div><div class='ctx'>  *</div><div class='ctx'>  * This function does one of the three following things: 1) Forward fragment, if</div><div class='del'>- * the assembled packet will exceed our MTU; 2) Buffer fragment, if we till</div><div class='add'>+ * the assembled packet will exceed our MTU; 2) Buffer fragment, if we still</div><div class='ctx'>  * lack further fragments; 3) Merge fragments, if we have all needed parts.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: NET_RX_DROP if the skb is not consumed, NET_RX_SUCCESS otherwise.</div><div class='hunk'>@@ -1131,7 +1096,7 @@ free_skb:</div><div class='ctx'> int batadv_recv_frag_packet(struct sk_buff *skb,</div><div class='ctx'> 			    struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_orig_node *orig_node_src = NULL;</div><div class='ctx'> 	struct batadv_frag_packet *frag_packet;</div><div class='ctx'> 	int ret = NET_RX_DROP;</div><div class='hunk'>@@ -1193,14 +1158,14 @@ free_skb:</div><div class='ctx'> int batadv_recv_bcast_packet(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *recv_if)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	struct batadv_bcast_packet *bcast_packet;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='ctx'> 	int hdr_size = sizeof(*bcast_packet);</div><div class='del'>-	int ret = NET_RX_DROP;</div><div class='ctx'> 	s32 seq_diff;</div><div class='ctx'> 	u32 seqno;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* drop packet if it has not necessary minimum size */</div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, hdr_size)))</div><div class='hunk'>@@ -1226,7 +1191,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,</div><div class='ctx'> 	if (batadv_is_my_mac(bat_priv, bcast_packet-&gt;orig))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='del'>-	if (bcast_packet-&gt;ttl &lt; 2)</div><div class='add'>+	if (bcast_packet-&gt;ttl-- &lt; 2)</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	orig_node = batadv_orig_hash_find(bat_priv, bcast_packet-&gt;orig);</div><div class='hunk'>@@ -1265,7 +1230,9 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,</div><div class='ctx'> 	batadv_skb_set_priority(skb, sizeof(struct batadv_bcast_packet));</div><div class='ctx'> </div><div class='ctx'> 	/* rebroadcast packet */</div><div class='del'>-	batadv_add_bcast_packet_to_list(bat_priv, skb, 1, false);</div><div class='add'>+	ret = batadv_forw_bcast_packet(bat_priv, skb, 0, false);</div><div class='add'>+	if (ret == NETDEV_TX_BUSY)</div><div class='add'>+		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	/* don't hand the broadcast up if it is from an originator</div><div class='ctx'> 	 * from the same backbone.</div><div class='hunk'>@@ -1278,8 +1245,10 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,</div><div class='ctx'> 	if (batadv_dat_snoop_incoming_arp_reply(bat_priv, skb, hdr_size))</div><div class='ctx'> 		goto rx_success;</div><div class='ctx'> </div><div class='add'>+	batadv_dat_snoop_incoming_dhcp_ack(bat_priv, skb, hdr_size);</div><div class='add'>+</div><div class='ctx'> 	/* broadcast for me */</div><div class='del'>-	batadv_interface_rx(recv_if-&gt;soft_iface, skb, hdr_size, orig_node);</div><div class='add'>+	batadv_interface_rx(recv_if-&gt;mesh_iface, skb, hdr_size, orig_node);</div><div class='ctx'> </div><div class='ctx'> rx_success:</div><div class='ctx'> 	ret = NET_RX_SUCCESS;</div><div class='hunk'>@@ -1289,8 +1258,78 @@ spin_unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;orig_node-&gt;bcast_seqno_lock);</div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='add'>+	ret = NET_RX_DROP;</div><div class='ctx'> out:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+/**</div><div class='add'>+ * batadv_recv_mcast_packet() - process received batman-adv multicast packet</div><div class='add'>+ * @skb: the received batman-adv multicast packet</div><div class='add'>+ * @recv_if: interface that the skb is received on</div><div class='add'>+ *</div><div class='add'>+ * Parses the given, received batman-adv multicast packet. Depending on the</div><div class='add'>+ * contents of its TVLV forwards it and/or decapsulates it to hand it to the</div><div class='add'>+ * mesh interface.</div><div class='add'>+ *</div><div class='add'>+ * Return: NET_RX_DROP if the skb is not consumed, NET_RX_SUCCESS otherwise.</div><div class='add'>+ */</div><div class='add'>+int batadv_recv_mcast_packet(struct sk_buff *skb,</div><div class='add'>+			     struct batadv_hard_iface *recv_if)</div><div class='add'>+{</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(recv_if-&gt;mesh_iface);</div><div class='add'>+	struct batadv_mcast_packet *mcast_packet;</div><div class='add'>+	int hdr_size = sizeof(*mcast_packet);</div><div class='add'>+	unsigned char *tvlv_buff;</div><div class='add'>+	int ret = NET_RX_DROP;</div><div class='add'>+	u16 tvlv_buff_len;</div><div class='add'>+</div><div class='add'>+	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) &lt; 0)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	/* create a copy of the skb, if needed, to modify it. */</div><div class='add'>+	if (skb_cow(skb, ETH_HLEN) &lt; 0)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	/* packet needs to be linearized to access the tvlv content */</div><div class='add'>+	if (skb_linearize(skb) &lt; 0)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	mcast_packet = (struct batadv_mcast_packet *)skb-&gt;data;</div><div class='add'>+	if (mcast_packet-&gt;ttl-- &lt; 2)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	tvlv_buff = (unsigned char *)(skb-&gt;data + hdr_size);</div><div class='add'>+	tvlv_buff_len = ntohs(mcast_packet-&gt;tvlv_len);</div><div class='add'>+</div><div class='add'>+	if (tvlv_buff_len &gt; skb-&gt;len - hdr_size)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ret = batadv_tvlv_containers_process(bat_priv, BATADV_MCAST, NULL, skb,</div><div class='add'>+					     tvlv_buff, tvlv_buff_len);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_RX);</div><div class='add'>+		batadv_add_counter(bat_priv, BATADV_CNT_MCAST_RX_BYTES,</div><div class='add'>+				   skb-&gt;len + ETH_HLEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr_size += tvlv_buff_len;</div><div class='add'>+</div><div class='add'>+	if (ret == NET_RX_SUCCESS &amp;&amp; (skb-&gt;len - hdr_size &gt;= ETH_HLEN)) {</div><div class='add'>+		batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_RX_LOCAL);</div><div class='add'>+		batadv_add_counter(bat_priv, BATADV_CNT_MCAST_RX_LOCAL_BYTES,</div><div class='add'>+				   skb-&gt;len - hdr_size);</div><div class='add'>+</div><div class='add'>+		batadv_interface_rx(bat_priv-&gt;mesh_iface, skb, hdr_size, NULL);</div><div class='add'>+		/* skb was consumed */</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_MCAST */</div><div class='head'>diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h<br/>index db54c2d9b8bf..e9849f032a24 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/routing.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/routing.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/routing.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/routing.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_ROUTING_H_</div><div class='hunk'>@@ -21,10 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> bool batadv_check_management_packet(struct sk_buff *skb,</div><div class='ctx'> 				    struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 				    int header_len);</div><div class='hunk'>@@ -40,10 +27,17 @@ int batadv_recv_frag_packet(struct sk_buff *skb,</div><div class='ctx'> 			    struct batadv_hard_iface *iface);</div><div class='ctx'> int batadv_recv_bcast_packet(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *recv_if);</div><div class='del'>-int batadv_recv_tt_query(struct sk_buff *skb,</div><div class='del'>-			 struct batadv_hard_iface *recv_if);</div><div class='del'>-int batadv_recv_roam_adv(struct sk_buff *skb,</div><div class='del'>-			 struct batadv_hard_iface *recv_if);</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='add'>+int batadv_recv_mcast_packet(struct sk_buff *skb,</div><div class='add'>+			     struct batadv_hard_iface *recv_if);</div><div class='add'>+#else</div><div class='add'>+static inline int batadv_recv_mcast_packet(struct sk_buff *skb,</div><div class='add'>+					   struct batadv_hard_iface *recv_if)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NET_RX_DROP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> int batadv_recv_unicast_tvlv(struct sk_buff *skb,</div><div class='ctx'> 			     struct batadv_hard_iface *recv_if);</div><div class='ctx'> int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb,</div><div class='head'>diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c<br/>index 4a35f5c2f52b..20d85c681064 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/send.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/send.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/send.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/send.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "send.h"</div><div class='hunk'>@@ -22,18 +10,17 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -46,10 +33,9 @@</div><div class='ctx'> #include "gateway_client.h"</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "log.h"</div><div class='del'>-#include "network-coding.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "originator.h"</div><div class='ctx'> #include "routing.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "translation-table.h"</div><div class='ctx'> </div><div class='ctx'> static void batadv_send_outstanding_bcast_packet(struct work_struct *work);</div><div class='hunk'>@@ -76,12 +62,9 @@ int batadv_send_skb_packet(struct sk_buff *skb,</div><div class='ctx'> 			   struct batadv_hard_iface *hard_iface,</div><div class='ctx'> 			   const u8 *dst_addr)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(hard_iface-&gt;soft_iface);</div><div class='del'>-</div><div class='ctx'> 	if (hard_iface-&gt;if_status != BATADV_IF_ACTIVE)</div><div class='ctx'> 		goto send_skb_err;</div><div class='ctx'> </div><div class='hunk'>@@ -110,9 +93,6 @@ int batadv_send_skb_packet(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = hard_iface-&gt;net_dev;</div><div class='ctx'> </div><div class='del'>-	/* Save a clone of the skb to use when decoding coded packets */</div><div class='del'>-	batadv_nc_skb_store_for_decoding(bat_priv, skb);</div><div class='del'>-</div><div class='ctx'> 	/* dev_queue_xmit() returns a negative result on error.	 However on</div><div class='ctx'> 	 * congestion and traffic shaping, it drops and returns NET_XMIT_DROP</div><div class='ctx'> 	 * (which is &gt; 0). This will not be treated as an error.</div><div class='hunk'>@@ -136,7 +116,9 @@ send_skb_err:</div><div class='ctx'> int batadv_send_broadcast_skb(struct sk_buff *skb,</div><div class='ctx'> 			      struct batadv_hard_iface *hard_iface)</div><div class='ctx'> {</div><div class='del'>-	return batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);</div><div class='add'>+	static const u8 broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+</div><div class='add'>+	return batadv_send_skb_packet(skb, hard_iface, broadcast_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -164,8 +146,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb,</div><div class='ctx'> 	if (hardif_neigh &amp;&amp; ret != NET_XMIT_DROP)</div><div class='ctx'> 		hardif_neigh-&gt;bat_v.last_unicast_tx = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (hardif_neigh)</div><div class='del'>-		batadv_hardif_neigh_put(hardif_neigh);</div><div class='add'>+	batadv_hardif_neigh_put(hardif_neigh);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -214,14 +195,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb,</div><div class='ctx'> 		goto put_neigh_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* try to network code the packet, if it is received on an interface</div><div class='del'>-	 * (i.e. being forwarded). If the packet originates from this node or if</div><div class='del'>-	 * network coding fails, then send the packet as usual.</div><div class='del'>-	 */</div><div class='del'>-	if (recv_if &amp;&amp; batadv_nc_skb_forward(skb, neigh_node))</div><div class='del'>-		ret = -EINPROGRESS;</div><div class='del'>-	else</div><div class='del'>-		ret = batadv_send_unicast_skb(skb, neigh_node);</div><div class='add'>+	ret = batadv_send_unicast_skb(skb, neigh_node);</div><div class='ctx'> </div><div class='ctx'> 	/* skb was consumed */</div><div class='ctx'> 	skb = NULL;</div><div class='hunk'>@@ -285,7 +259,7 @@ static bool batadv_send_skb_prepare_unicast(struct sk_buff *skb,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_prepare_unicast_4addr() - encapsulate an skb with a</div><div class='ctx'>  *  unicast 4addr header</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the skb containing the payload to encapsulate</div><div class='ctx'>  * @orig: the destination node</div><div class='ctx'>  * @packet_subtype: the unicast 4addr packet subtype to use</div><div class='hunk'>@@ -321,14 +295,13 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_unicast() - encapsulate and send an skb via unicast</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: payload to send</div><div class='ctx'>  * @packet_type: the batman unicast packet type to use</div><div class='ctx'>  * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast</div><div class='hunk'>@@ -398,7 +371,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_via_tt_generic() - send an skb via TT lookup</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: payload to send</div><div class='ctx'>  * @packet_type: the batman unicast packet type to use</div><div class='ctx'>  * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast</div><div class='hunk'>@@ -437,15 +410,14 @@ int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv,</div><div class='ctx'> 	ret = batadv_send_skb_unicast(bat_priv, skb, packet_type,</div><div class='ctx'> 				      packet_subtype, orig_node, vid);</div><div class='ctx'> </div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_via_gw() - send an skb via gateway lookup</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: payload to send</div><div class='ctx'>  * @vid: the vid to be used to search the translation table</div><div class='ctx'>  *</div><div class='hunk'>@@ -464,8 +436,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> 	ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,</div><div class='ctx'> 				      BATADV_P_DATA, orig_node, vid);</div><div class='ctx'> </div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -473,7 +444,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_forw_packet_free() - free a forwarding packet</div><div class='ctx'>  * @forw_packet: The packet to free</div><div class='del'>- * @dropped: whether the packet is freed because is is dropped</div><div class='add'>+ * @dropped: whether the packet is freed because is dropped</div><div class='ctx'>  *</div><div class='ctx'>  * This frees a forwarding packet and releases any resources it might</div><div class='ctx'>  * have claimed.</div><div class='hunk'>@@ -486,10 +457,8 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> 	else</div><div class='ctx'> 		consume_skb(forw_packet-&gt;skb);</div><div class='ctx'> </div><div class='del'>-	if (forw_packet-&gt;if_incoming)</div><div class='del'>-		batadv_hardif_put(forw_packet-&gt;if_incoming);</div><div class='del'>-	if (forw_packet-&gt;if_outgoing)</div><div class='del'>-		batadv_hardif_put(forw_packet-&gt;if_outgoing);</div><div class='add'>+	batadv_hardif_put(forw_packet-&gt;if_incoming);</div><div class='add'>+	batadv_hardif_put(forw_packet-&gt;if_outgoing);</div><div class='ctx'> 	if (forw_packet-&gt;queue_left)</div><div class='ctx'> 		atomic_inc(forw_packet-&gt;queue_left);</div><div class='ctx'> 	kfree(forw_packet);</div><div class='hunk'>@@ -550,7 +519,7 @@ batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming,</div><div class='ctx'> 	forw_packet-&gt;queue_left = queue_left;</div><div class='ctx'> 	forw_packet-&gt;if_incoming = if_incoming;</div><div class='ctx'> 	forw_packet-&gt;if_outgoing = if_outgoing;</div><div class='del'>-	forw_packet-&gt;num_packets = 0;</div><div class='add'>+	forw_packet-&gt;num_packets = 1;</div><div class='ctx'> </div><div class='ctx'> 	return forw_packet;</div><div class='ctx'> </div><div class='hunk'>@@ -617,8 +586,8 @@ bool batadv_forw_packet_steal(struct batadv_forw_packet *forw_packet,</div><div class='ctx'>  * given hard_iface. If hard_iface is NULL forwarding packets on all hard</div><div class='ctx'>  * interfaces will be claimed.</div><div class='ctx'>  *</div><div class='del'>- * The packets are being moved from the forw_list to the cleanup_list and</div><div class='del'>- * by that allows already running threads to notice the claiming.</div><div class='add'>+ * The packets are being moved from the forw_list to the cleanup_list. This</div><div class='add'>+ * makes it possible for already running threads to notice the claim.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> batadv_forw_packet_list_steal(struct hlist_head *forw_list,</div><div class='hunk'>@@ -713,7 +682,7 @@ static void batadv_forw_packet_queue(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_forw_packet_bcast_queue() - try to queue a broadcast packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @forw_packet: the forwarding packet to queue</div><div class='ctx'>  * @send_time: timestamp (jiffies) when the packet is to be sent</div><div class='ctx'>  *</div><div class='hunk'>@@ -732,7 +701,7 @@ batadv_forw_packet_bcast_queue(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_forw_packet_ogmv1_queue() - try to queue an OGMv1 packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @forw_packet: the forwarding packet to queue</div><div class='ctx'>  * @send_time: timestamp (jiffies) when the packet is to be sent</div><div class='ctx'>  *</div><div class='hunk'>@@ -749,57 +718,52 @@ void batadv_forw_packet_ogmv1_queue(struct batadv_priv *bat_priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_add_bcast_packet_to_list() - queue broadcast packet for multiple sends</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_forw_bcast_packet_to_list() - queue broadcast packet for transmissions</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: broadcast packet to add</div><div class='ctx'>  * @delay: number of jiffies to wait before sending</div><div class='ctx'>  * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ * @if_in: the interface where the packet was received on</div><div class='add'>+ * @if_out: the outgoing interface to queue on</div><div class='ctx'>  *</div><div class='del'>- * add a broadcast packet to the queue and setup timers. broadcast packets</div><div class='add'>+ * Adds a broadcast packet to the queue and sets up timers. Broadcast packets</div><div class='ctx'>  * are sent multiple times to increase probability for being received.</div><div class='ctx'>  *</div><div class='del'>- * The skb is not consumed, so the caller should make sure that the</div><div class='del'>- * skb is freed.</div><div class='add'>+ * This call clones the given skb, hence the caller needs to take into</div><div class='add'>+ * account that the data segment of the original skb might not be</div><div class='add'>+ * modifiable anymore.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.</div><div class='ctx'>  */</div><div class='del'>-int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,</div><div class='del'>-				    const struct sk_buff *skb,</div><div class='del'>-				    unsigned long delay,</div><div class='del'>-				    bool own_packet)</div><div class='add'>+static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,</div><div class='add'>+					    struct sk_buff *skb,</div><div class='add'>+					    unsigned long delay,</div><div class='add'>+					    bool own_packet,</div><div class='add'>+					    struct batadv_hard_iface *if_in,</div><div class='add'>+					    struct batadv_hard_iface *if_out)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='ctx'> 	struct batadv_forw_packet *forw_packet;</div><div class='del'>-	struct batadv_bcast_packet *bcast_packet;</div><div class='add'>+	unsigned long send_time = jiffies;</div><div class='ctx'> 	struct sk_buff *newskb;</div><div class='ctx'> </div><div class='del'>-	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	newskb = skb_copy(skb, GFP_ATOMIC);</div><div class='del'>-	if (!newskb) {</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	newskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (!newskb)</div><div class='ctx'> 		goto err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	forw_packet = batadv_forw_packet_alloc(primary_if, NULL,</div><div class='add'>+	forw_packet = batadv_forw_packet_alloc(if_in, if_out,</div><div class='ctx'> 					       &amp;bat_priv-&gt;bcast_queue_left,</div><div class='ctx'> 					       bat_priv, newskb);</div><div class='del'>-	batadv_hardif_put(primary_if);</div><div class='ctx'> 	if (!forw_packet)</div><div class='ctx'> 		goto err_packet_free;</div><div class='ctx'> </div><div class='del'>-	/* as we have a copy now, it is safe to decrease the TTL */</div><div class='del'>-	bcast_packet = (struct batadv_bcast_packet *)newskb-&gt;data;</div><div class='del'>-	bcast_packet-&gt;ttl--;</div><div class='del'>-</div><div class='ctx'> 	forw_packet-&gt;own = own_packet;</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;forw_packet-&gt;delayed_work,</div><div class='ctx'> 			  batadv_send_outstanding_bcast_packet);</div><div class='ctx'> </div><div class='del'>-	batadv_forw_packet_bcast_queue(bat_priv, forw_packet, jiffies + delay);</div><div class='add'>+	send_time += delay ? delay : msecs_to_jiffies(5);</div><div class='add'>+</div><div class='add'>+	batadv_forw_packet_bcast_queue(bat_priv, forw_packet, send_time);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> err_packet_free:</div><div class='hunk'>@@ -809,9 +773,220 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * batadv_forw_bcast_packet_if() - forward and queue a broadcast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: broadcast packet to add</div><div class='add'>+ * @delay: number of jiffies to wait before sending</div><div class='add'>+ * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ * @if_in: the interface where the packet was received on</div><div class='add'>+ * @if_out: the outgoing interface to forward to</div><div class='add'>+ *</div><div class='add'>+ * Transmits a broadcast packet on the specified interface either immediately</div><div class='add'>+ * or if a delay is given after that. Furthermore, queues additional</div><div class='add'>+ * retransmissions if this interface is a wireless one.</div><div class='add'>+ *</div><div class='add'>+ * This call clones the given skb, hence the caller needs to take into</div><div class='add'>+ * account that the data segment of the original skb might not be</div><div class='add'>+ * modifiable anymore.</div><div class='add'>+ *</div><div class='add'>+ * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.</div><div class='add'>+ */</div><div class='add'>+static int batadv_forw_bcast_packet_if(struct batadv_priv *bat_priv,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       unsigned long delay,</div><div class='add'>+				       bool own_packet,</div><div class='add'>+				       struct batadv_hard_iface *if_in,</div><div class='add'>+				       struct batadv_hard_iface *if_out)</div><div class='add'>+{</div><div class='add'>+	unsigned int num_bcasts = if_out-&gt;num_bcasts;</div><div class='add'>+	struct sk_buff *newskb;</div><div class='add'>+	int ret = NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if (!delay) {</div><div class='add'>+		newskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+		if (!newskb)</div><div class='add'>+			return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+		batadv_send_broadcast_skb(newskb, if_out);</div><div class='add'>+		num_bcasts--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* delayed broadcast or rebroadcasts? */</div><div class='add'>+	if (num_bcasts &gt;= 1) {</div><div class='add'>+		BATADV_SKB_CB(skb)-&gt;num_bcasts = num_bcasts;</div><div class='add'>+</div><div class='add'>+		ret = batadv_forw_bcast_packet_to_list(bat_priv, skb, delay,</div><div class='add'>+						       own_packet, if_in,</div><div class='add'>+						       if_out);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_send_no_broadcast() - check whether (re)broadcast is necessary</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: broadcast packet to check</div><div class='add'>+ * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ * @if_out: the outgoing interface checked and considered for (re)broadcast</div><div class='add'>+ *</div><div class='add'>+ * Return: False if a packet needs to be (re)broadcasted on the given interface,</div><div class='add'>+ * true otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool batadv_send_no_broadcast(struct batadv_priv *bat_priv,</div><div class='add'>+				     struct sk_buff *skb, bool own_packet,</div><div class='add'>+				     struct batadv_hard_iface *if_out)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hardif_neigh_node *neigh_node = NULL;</div><div class='add'>+	struct batadv_bcast_packet *bcast_packet;</div><div class='add'>+	u8 *orig_neigh;</div><div class='add'>+	u8 *neigh_addr;</div><div class='add'>+	char *type;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!own_packet) {</div><div class='add'>+		neigh_addr = eth_hdr(skb)-&gt;h_source;</div><div class='add'>+		neigh_node = batadv_hardif_neigh_get(if_out,</div><div class='add'>+						     neigh_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcast_packet = (struct batadv_bcast_packet *)skb-&gt;data;</div><div class='add'>+	orig_neigh = neigh_node ? neigh_node-&gt;orig : NULL;</div><div class='add'>+</div><div class='add'>+	ret = batadv_hardif_no_broadcast(if_out, bcast_packet-&gt;orig,</div><div class='add'>+					 orig_neigh);</div><div class='add'>+</div><div class='add'>+	batadv_hardif_neigh_put(neigh_node);</div><div class='add'>+</div><div class='add'>+	/* ok, may broadcast */</div><div class='add'>+	if (!ret)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* no broadcast */</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case BATADV_HARDIF_BCAST_NORECIPIENT:</div><div class='add'>+		type = "no neighbor";</div><div class='add'>+		break;</div><div class='add'>+	case BATADV_HARDIF_BCAST_DUPFWD:</div><div class='add'>+		type = "single neighbor is source";</div><div class='add'>+		break;</div><div class='add'>+	case BATADV_HARDIF_BCAST_DUPORIG:</div><div class='add'>+		type = "single neighbor is originator";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		type = "unknown";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='add'>+		   "BCAST packet from orig %pM on %s suppressed: %s\n",</div><div class='add'>+		   bcast_packet-&gt;orig,</div><div class='add'>+		   if_out-&gt;net_dev-&gt;name, type);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __batadv_forw_bcast_packet() - forward and queue a broadcast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: broadcast packet to add</div><div class='add'>+ * @delay: number of jiffies to wait before sending</div><div class='add'>+ * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ *</div><div class='add'>+ * Transmits a broadcast packet either immediately or if a delay is given</div><div class='add'>+ * after that. Furthermore, queues additional retransmissions on wireless</div><div class='add'>+ * interfaces.</div><div class='add'>+ *</div><div class='add'>+ * This call clones the given skb, hence the caller needs to take into</div><div class='add'>+ * account that the data segment of the given skb might not be</div><div class='add'>+ * modifiable anymore.</div><div class='add'>+ *</div><div class='add'>+ * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.</div><div class='add'>+ */</div><div class='add'>+static int __batadv_forw_bcast_packet(struct batadv_priv *bat_priv,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      unsigned long delay,</div><div class='add'>+				      bool own_packet)</div><div class='add'>+{</div><div class='add'>+	struct batadv_hard_iface *hard_iface;</div><div class='add'>+	struct batadv_hard_iface *primary_if;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int ret = NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='add'>+	if (!primary_if)</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev_for_each_lower_private_rcu(bat_priv-&gt;mesh_iface, hard_iface, iter) {</div><div class='add'>+		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (batadv_send_no_broadcast(bat_priv, skb, own_packet,</div><div class='add'>+					     hard_iface)) {</div><div class='add'>+			batadv_hardif_put(hard_iface);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = batadv_forw_bcast_packet_if(bat_priv, skb, delay,</div><div class='add'>+						  own_packet, primary_if,</div><div class='add'>+						  hard_iface);</div><div class='add'>+		batadv_hardif_put(hard_iface);</div><div class='add'>+</div><div class='add'>+		if (ret == NETDEV_TX_BUSY)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_forw_bcast_packet() - forward and queue a broadcast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: broadcast packet to add</div><div class='add'>+ * @delay: number of jiffies to wait before sending</div><div class='add'>+ * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ *</div><div class='add'>+ * Transmits a broadcast packet either immediately or if a delay is given</div><div class='add'>+ * after that. Furthermore, queues additional retransmissions on wireless</div><div class='add'>+ * interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.</div><div class='add'>+ */</div><div class='add'>+int batadv_forw_bcast_packet(struct batadv_priv *bat_priv,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     unsigned long delay,</div><div class='add'>+			     bool own_packet)</div><div class='add'>+{</div><div class='add'>+	return __batadv_forw_bcast_packet(bat_priv, skb, delay, own_packet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * batadv_send_bcast_packet() - send and queue a broadcast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @skb: broadcast packet to add</div><div class='add'>+ * @delay: number of jiffies to wait before sending</div><div class='add'>+ * @own_packet: true if it is a self-generated broadcast packet</div><div class='add'>+ *</div><div class='add'>+ * Transmits a broadcast packet either immediately or if a delay is given</div><div class='add'>+ * after that. Furthermore, queues additional retransmissions on wireless</div><div class='add'>+ * interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Consumes the provided skb.</div><div class='add'>+ */</div><div class='add'>+void batadv_send_bcast_packet(struct batadv_priv *bat_priv,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      unsigned long delay,</div><div class='add'>+			      bool own_packet)</div><div class='add'>+{</div><div class='add'>+	__batadv_forw_bcast_packet(bat_priv, skb, delay, own_packet);</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * batadv_forw_packet_bcasts_left() - check if a retransmission is necessary</div><div class='ctx'>  * @forw_packet: the forwarding packet to check</div><div class='del'>- * @hard_iface: the interface to check on</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether a given packet has any (re)transmissions left on the provided</div><div class='ctx'>  * interface.</div><div class='hunk'>@@ -823,28 +998,20 @@ err:</div><div class='ctx'>  * Return: True if (re)transmissions are left, false otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static bool</div><div class='del'>-batadv_forw_packet_bcasts_left(struct batadv_forw_packet *forw_packet,</div><div class='del'>-			       struct batadv_hard_iface *hard_iface)</div><div class='add'>+batadv_forw_packet_bcasts_left(struct batadv_forw_packet *forw_packet)</div><div class='ctx'> {</div><div class='del'>-	unsigned int max;</div><div class='del'>-</div><div class='del'>-	if (hard_iface)</div><div class='del'>-		max = hard_iface-&gt;num_bcasts;</div><div class='del'>-	else</div><div class='del'>-		max = BATADV_NUM_BCASTS_MAX;</div><div class='del'>-</div><div class='del'>-	return BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts &lt; max;</div><div class='add'>+	return BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_forw_packet_bcasts_inc() - increment retransmission counter of a</div><div class='add'>+ * batadv_forw_packet_bcasts_dec() - decrement retransmission counter of a</div><div class='ctx'>  *  packet</div><div class='del'>- * @forw_packet: the packet to increase the counter for</div><div class='add'>+ * @forw_packet: the packet to decrease the counter for</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-batadv_forw_packet_bcasts_inc(struct batadv_forw_packet *forw_packet)</div><div class='add'>+batadv_forw_packet_bcasts_dec(struct batadv_forw_packet *forw_packet)</div><div class='ctx'> {</div><div class='del'>-	BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts++;</div><div class='add'>+	BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -855,30 +1022,30 @@ batadv_forw_packet_bcasts_inc(struct batadv_forw_packet *forw_packet)</div><div class='ctx'>  */</div><div class='ctx'> bool batadv_forw_packet_is_rebroadcast(struct batadv_forw_packet *forw_packet)</div><div class='ctx'> {</div><div class='del'>-	return BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts &gt; 0;</div><div class='add'>+	unsigned char num_bcasts = BATADV_SKB_CB(forw_packet-&gt;skb)-&gt;num_bcasts;</div><div class='add'>+</div><div class='add'>+	return num_bcasts != forw_packet-&gt;if_outgoing-&gt;num_bcasts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * batadv_send_outstanding_bcast_packet() - transmit a queued broadcast packet</div><div class='add'>+ * @work: work queue item</div><div class='add'>+ *</div><div class='add'>+ * Transmits a queued broadcast packet and if necessary reschedules it.</div><div class='add'>+ */</div><div class='ctx'> static void batadv_send_outstanding_bcast_packet(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	struct batadv_hardif_neigh_node *neigh_node;</div><div class='del'>-	struct delayed_work *delayed_work;</div><div class='add'>+	unsigned long send_time = jiffies + msecs_to_jiffies(5);</div><div class='ctx'> 	struct batadv_forw_packet *forw_packet;</div><div class='del'>-	struct batadv_bcast_packet *bcast_packet;</div><div class='del'>-	struct sk_buff *skb1;</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct delayed_work *delayed_work;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='del'>-	unsigned long send_time = jiffies + msecs_to_jiffies(5);</div><div class='add'>+	struct sk_buff *skb1;</div><div class='ctx'> 	bool dropped = false;</div><div class='del'>-	u8 *neigh_addr;</div><div class='del'>-	u8 *orig_neigh;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	delayed_work = to_delayed_work(work);</div><div class='ctx'> 	forw_packet = container_of(delayed_work, struct batadv_forw_packet,</div><div class='ctx'> 				   delayed_work);</div><div class='del'>-	soft_iface = forw_packet-&gt;if_incoming-&gt;soft_iface;</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(forw_packet-&gt;if_incoming-&gt;mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bat_priv-&gt;mesh_state) == BATADV_MESH_DEACTIVATING) {</div><div class='ctx'> 		dropped = true;</div><div class='hunk'>@@ -890,76 +1057,15 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bcast_packet = (struct batadv_bcast_packet *)forw_packet-&gt;skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* rebroadcast packet */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hard_iface, &amp;batadv_hardif_list, list) {</div><div class='del'>-		if (hard_iface-&gt;soft_iface != soft_iface)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!batadv_forw_packet_bcasts_left(forw_packet, hard_iface))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (forw_packet-&gt;own) {</div><div class='del'>-			neigh_node = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			neigh_addr = eth_hdr(forw_packet-&gt;skb)-&gt;h_source;</div><div class='del'>-			neigh_node = batadv_hardif_neigh_get(hard_iface,</div><div class='del'>-							     neigh_addr);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		orig_neigh = neigh_node ? neigh_node-&gt;orig : NULL;</div><div class='del'>-</div><div class='del'>-		ret = batadv_hardif_no_broadcast(hard_iface, bcast_packet-&gt;orig,</div><div class='del'>-						 orig_neigh);</div><div class='del'>-</div><div class='del'>-		if (ret) {</div><div class='del'>-			char *type;</div><div class='del'>-</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case BATADV_HARDIF_BCAST_NORECIPIENT:</div><div class='del'>-				type = "no neighbor";</div><div class='del'>-				break;</div><div class='del'>-			case BATADV_HARDIF_BCAST_DUPFWD:</div><div class='del'>-				type = "single neighbor is source";</div><div class='del'>-				break;</div><div class='del'>-			case BATADV_HARDIF_BCAST_DUPORIG:</div><div class='del'>-				type = "single neighbor is originator";</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				type = "unknown";</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "BCAST packet from orig %pM on %s suppressed: %s\n",</div><div class='del'>-				   bcast_packet-&gt;orig,</div><div class='del'>-				   hard_iface-&gt;net_dev-&gt;name, type);</div><div class='del'>-</div><div class='del'>-			if (neigh_node)</div><div class='del'>-				batadv_hardif_neigh_put(neigh_node);</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (neigh_node)</div><div class='del'>-			batadv_hardif_neigh_put(neigh_node);</div><div class='del'>-</div><div class='del'>-		if (!kref_get_unless_zero(&amp;hard_iface-&gt;refcount))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* send a copy of the saved skb */</div><div class='del'>-		skb1 = skb_clone(forw_packet-&gt;skb, GFP_ATOMIC);</div><div class='del'>-		if (skb1)</div><div class='del'>-			batadv_send_broadcast_skb(skb1, hard_iface);</div><div class='del'>-</div><div class='del'>-		batadv_hardif_put(hard_iface);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	/* send a copy of the saved skb */</div><div class='add'>+	skb1 = skb_clone(forw_packet-&gt;skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb1)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	batadv_forw_packet_bcasts_inc(forw_packet);</div><div class='add'>+	batadv_send_broadcast_skb(skb1, forw_packet-&gt;if_outgoing);</div><div class='add'>+	batadv_forw_packet_bcasts_dec(forw_packet);</div><div class='ctx'> </div><div class='del'>-	/* if we still have some more bcasts to send */</div><div class='del'>-	if (batadv_forw_packet_bcasts_left(forw_packet, NULL)) {</div><div class='add'>+	if (batadv_forw_packet_bcasts_left(forw_packet)) {</div><div class='ctx'> 		batadv_forw_packet_bcast_queue(bat_priv, forw_packet,</div><div class='ctx'> 					       send_time);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -974,7 +1080,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_purge_outstanding_packets() - stop/purge scheduled bcast/OGMv1 packets</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @hard_iface: the hard interface to cancel and purge bcast/ogm packets on</div><div class='ctx'>  *</div><div class='ctx'>  * This method cancels and purges any broadcast and OGMv1 packet on the given</div><div class='head'>diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h<br/>index 64cce07b8fe6..3415afec4a0c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/send.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/send.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/send.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/send.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_SEND_H_</div><div class='hunk'>@@ -22,12 +10,11 @@</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet,</div><div class='ctx'> 			     bool dropped);</div><div class='ctx'> struct batadv_forw_packet *</div><div class='hunk'>@@ -52,10 +39,14 @@ int batadv_send_broadcast_skb(struct sk_buff *skb,</div><div class='ctx'> 			      struct batadv_hard_iface *hard_iface);</div><div class='ctx'> int batadv_send_unicast_skb(struct sk_buff *skb,</div><div class='ctx'> 			    struct batadv_neigh_node *neigh_node);</div><div class='del'>-int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,</div><div class='del'>-				    const struct sk_buff *skb,</div><div class='del'>-				    unsigned long delay,</div><div class='del'>-				    bool own_packet);</div><div class='add'>+int batadv_forw_bcast_packet(struct batadv_priv *bat_priv,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     unsigned long delay,</div><div class='add'>+			     bool own_packet);</div><div class='add'>+void batadv_send_bcast_packet(struct batadv_priv *bat_priv,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      unsigned long delay,</div><div class='add'>+			      bool own_packet);</div><div class='ctx'> void</div><div class='ctx'> batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,</div><div class='ctx'> 				 const struct batadv_hard_iface *hard_iface);</div><div class='hunk'>@@ -77,7 +68,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_via_tt() - send an skb via TT lookup</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the payload to send</div><div class='ctx'>  * @dst_hint: can be used to override the destination contained in the skb</div><div class='ctx'>  * @vid: the vid to be used to search the translation table</div><div class='hunk'>@@ -98,7 +89,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_skb_via_tt_4addr() - send an skb via TT lookup</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the payload to send</div><div class='ctx'>  * @packet_subtype: the unicast 4addr packet subtype to use</div><div class='ctx'>  * @dst_hint: can be used to override the destination contained in the skb</div><div class='head'>diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h<br/>deleted file mode 100644<br/>index daf87f07fadd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/soft-interface.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/soft-interface.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_</div><div class='del'>-#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_</div><div class='del'>-</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;net/rtnetlink.h&gt;</div><div class='del'>-</div><div class='del'>-struct net_device;</div><div class='del'>-struct net;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='del'>-int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);</div><div class='del'>-void batadv_interface_rx(struct net_device *soft_iface,</div><div class='del'>-			 struct sk_buff *skb, int hdr_size,</div><div class='del'>-			 struct batadv_orig_node *orig_node);</div><div class='del'>-struct net_device *batadv_softif_create(struct net *net, const char *name);</div><div class='del'>-void batadv_softif_destroy_sysfs(struct net_device *soft_iface);</div><div class='del'>-bool batadv_softif_is_valid(const struct net_device *net_dev);</div><div class='del'>-extern struct rtnl_link_ops batadv_link_ops;</div><div class='del'>-int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid);</div><div class='del'>-void batadv_softif_vlan_put(struct batadv_softif_vlan *softif_vlan);</div><div class='del'>-struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv,</div><div class='del'>-						  unsigned short vid);</div><div class='del'>-</div><div class='del'>-#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */</div><div class='head'>diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c<br/>deleted file mode 100644<br/>index 09427fc6494a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/sysfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/sysfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1261 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "sysfs.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/if.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;linux/kref.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bridge_loop_avoidance.h"</div><div class='del'>-#include "distributed-arp-table.h"</div><div class='del'>-#include "gateway_client.h"</div><div class='del'>-#include "gateway_common.h"</div><div class='del'>-#include "hard-interface.h"</div><div class='del'>-#include "log.h"</div><div class='del'>-#include "network-coding.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='del'>-</div><div class='del'>-static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = container_of(obj-&gt;parent, struct device, kobj);</div><div class='del'>-</div><div class='del'>-	return to_net_dev(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(obj);</div><div class='del'>-</div><div class='del'>-	return netdev_priv(net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_vlan_kobj_to_batpriv() - convert a vlan kobj in the associated batpriv</div><div class='del'>- * @obj: kobject to covert</div><div class='del'>- *</div><div class='del'>- * Return: the associated batadv_priv struct.</div><div class='del'>- */</div><div class='del'>-static struct batadv_priv *batadv_vlan_kobj_to_batpriv(struct kobject *obj)</div><div class='del'>-{</div><div class='del'>-	/* VLAN specific attributes are located in the root sysfs folder if they</div><div class='del'>-	 * refer to the untagged VLAN..</div><div class='del'>-	 */</div><div class='del'>-	if (!strcmp(BATADV_SYSFS_IF_MESH_SUBDIR, obj-&gt;name))</div><div class='del'>-		return batadv_kobj_to_batpriv(obj);</div><div class='del'>-</div><div class='del'>-	/* ..while the attributes for the tagged vlans are located in</div><div class='del'>-	 * the in the corresponding "vlan%VID" subfolder</div><div class='del'>-	 */</div><div class='del'>-	return batadv_kobj_to_batpriv(obj-&gt;parent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_kobj_to_vlan() - convert a kobj in the associated softif_vlan struct</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @obj: kobject to covert</div><div class='del'>- *</div><div class='del'>- * Return: the associated softif_vlan struct if found, NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static struct batadv_softif_vlan *</div><div class='del'>-batadv_kobj_to_vlan(struct batadv_priv *bat_priv, struct kobject *obj)</div><div class='del'>-{</div><div class='del'>-	struct batadv_softif_vlan *vlan_tmp, *vlan = NULL;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(vlan_tmp, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='del'>-		if (vlan_tmp-&gt;kobj != obj)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!kref_get_unless_zero(&amp;vlan_tmp-&gt;refcount))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		vlan = vlan_tmp;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return vlan;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_UEV_TYPE_VAR	"BATTYPE="</div><div class='del'>-#define BATADV_UEV_ACTION_VAR	"BATACTION="</div><div class='del'>-#define BATADV_UEV_DATA_VAR	"BATDATA="</div><div class='del'>-</div><div class='del'>-static char *batadv_uev_action_str[] = {</div><div class='del'>-	"add",</div><div class='del'>-	"del",</div><div class='del'>-	"change",</div><div class='del'>-	"loopdetect",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *batadv_uev_type_str[] = {</div><div class='del'>-	"gw",</div><div class='del'>-	"bla",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Use this, if you have customized show and store functions for vlan attrs */</div><div class='del'>-#define BATADV_ATTR_VLAN(_name, _mode, _show, _store)	\</div><div class='del'>-struct batadv_attribute batadv_attr_vlan_##_name = {	\</div><div class='del'>-	.attr = {.name = __stringify(_name),		\</div><div class='del'>-		 .mode = _mode },			\</div><div class='del'>-	.show   = _show,				\</div><div class='del'>-	.store  = _store,				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Use this, if you have customized show and store functions */</div><div class='del'>-#define BATADV_ATTR(_name, _mode, _show, _store)	\</div><div class='del'>-struct batadv_attribute batadv_attr_##_name = {		\</div><div class='del'>-	.attr = {.name = __stringify(_name),		\</div><div class='del'>-		 .mode = _mode },			\</div><div class='del'>-	.show   = _show,				\</div><div class='del'>-	.store  = _store,				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)			\</div><div class='del'>-ssize_t batadv_store_##_name(struct kobject *kobj,			\</div><div class='del'>-			     struct attribute *attr, char *buff,	\</div><div class='del'>-			     size_t count)				\</div><div class='del'>-{									\</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);		\</div><div class='del'>-									\</div><div class='del'>-	return __batadv_store_bool_attr(buff, count, _post_func, attr,	\</div><div class='del'>-					&amp;bat_priv-&gt;_name, net_dev);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_SIF_SHOW_BOOL(_name)				\</div><div class='del'>-ssize_t batadv_show_##_name(struct kobject *kobj,			\</div><div class='del'>-			    struct attribute *attr, char *buff)		\</div><div class='del'>-{									\</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);	\</div><div class='del'>-									\</div><div class='del'>-	return sprintf(buff, "%s\n",					\</div><div class='del'>-		       atomic_read(&amp;bat_priv-&gt;_name) == 0 ?		\</div><div class='del'>-		       "disabled" : "enabled");				\</div><div class='del'>-}									\</div><div class='del'>-</div><div class='del'>-/* Use this, if you are going to turn a [name] in the soft-interface</div><div class='del'>- * (bat_priv) on or off</div><div class='del'>- */</div><div class='del'>-#define BATADV_ATTR_SIF_BOOL(_name, _mode, _post_func)			\</div><div class='del'>-	static BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)		\</div><div class='del'>-	static BATADV_ATTR_SIF_SHOW_BOOL(_name)				\</div><div class='del'>-	static BATADV_ATTR(_name, _mode, batadv_show_##_name,		\</div><div class='del'>-			   batadv_store_##_name)</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_SIF_STORE_UINT(_name, _var, _min, _max, _post_func)	\</div><div class='del'>-ssize_t batadv_store_##_name(struct kobject *kobj,			\</div><div class='del'>-			     struct attribute *attr, char *buff,	\</div><div class='del'>-			     size_t count)				\</div><div class='del'>-{									\</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);		\</div><div class='del'>-									\</div><div class='del'>-	return __batadv_store_uint_attr(buff, count, _min, _max,	\</div><div class='del'>-					_post_func, attr,		\</div><div class='del'>-					&amp;bat_priv-&gt;_var, net_dev,	\</div><div class='del'>-					NULL);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_SIF_SHOW_UINT(_name, _var)				\</div><div class='del'>-ssize_t batadv_show_##_name(struct kobject *kobj,			\</div><div class='del'>-			    struct attribute *attr, char *buff)		\</div><div class='del'>-{									\</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);	\</div><div class='del'>-									\</div><div class='del'>-	return sprintf(buff, "%i\n", atomic_read(&amp;bat_priv-&gt;_var));	\</div><div class='del'>-}									\</div><div class='del'>-</div><div class='del'>-/* Use this, if you are going to set [name] in the soft-interface</div><div class='del'>- * (bat_priv) to an unsigned integer value</div><div class='del'>- */</div><div class='del'>-#define BATADV_ATTR_SIF_UINT(_name, _var, _mode, _min, _max, _post_func)\</div><div class='del'>-	static BATADV_ATTR_SIF_STORE_UINT(_name, _var, _min, _max, _post_func)\</div><div class='del'>-	static BATADV_ATTR_SIF_SHOW_UINT(_name, _var)			\</div><div class='del'>-	static BATADV_ATTR(_name, _mode, batadv_show_##_name,		\</div><div class='del'>-			   batadv_store_##_name)</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_VLAN_STORE_BOOL(_name, _post_func)			\</div><div class='del'>-ssize_t batadv_store_vlan_##_name(struct kobject *kobj,			\</div><div class='del'>-				  struct attribute *attr, char *buff,	\</div><div class='del'>-				  size_t count)				\</div><div class='del'>-{									\</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_vlan_kobj_to_batpriv(kobj);\</div><div class='del'>-	struct batadv_softif_vlan *vlan = batadv_kobj_to_vlan(bat_priv,	\</div><div class='del'>-							      kobj);	\</div><div class='del'>-	size_t res = __batadv_store_bool_attr(buff, count, _post_func,	\</div><div class='del'>-					      attr, &amp;vlan-&gt;_name,	\</div><div class='del'>-					      bat_priv-&gt;soft_iface);	\</div><div class='del'>-									\</div><div class='del'>-	batadv_softif_vlan_put(vlan);					\</div><div class='del'>-	return res;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_VLAN_SHOW_BOOL(_name)				\</div><div class='del'>-ssize_t batadv_show_vlan_##_name(struct kobject *kobj,			\</div><div class='del'>-				 struct attribute *attr, char *buff)	\</div><div class='del'>-{									\</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_vlan_kobj_to_batpriv(kobj);\</div><div class='del'>-	struct batadv_softif_vlan *vlan = batadv_kobj_to_vlan(bat_priv,	\</div><div class='del'>-							      kobj);	\</div><div class='del'>-	size_t res = sprintf(buff, "%s\n",				\</div><div class='del'>-			     atomic_read(&amp;vlan-&gt;_name) == 0 ?		\</div><div class='del'>-			     "disabled" : "enabled");			\</div><div class='del'>-									\</div><div class='del'>-	batadv_softif_vlan_put(vlan);					\</div><div class='del'>-	return res;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Use this, if you are going to turn a [name] in the vlan struct on or off */</div><div class='del'>-#define BATADV_ATTR_VLAN_BOOL(_name, _mode, _post_func)			\</div><div class='del'>-	static BATADV_ATTR_VLAN_STORE_BOOL(_name, _post_func)		\</div><div class='del'>-	static BATADV_ATTR_VLAN_SHOW_BOOL(_name)			\</div><div class='del'>-	static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name,	\</div><div class='del'>-				batadv_store_vlan_##_name)</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min, _max, _post_func)	\</div><div class='del'>-ssize_t batadv_store_##_name(struct kobject *kobj,			\</div><div class='del'>-			     struct attribute *attr, char *buff,	\</div><div class='del'>-			     size_t count)				\</div><div class='del'>-{									\</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\</div><div class='del'>-	struct batadv_hard_iface *hard_iface;				\</div><div class='del'>-	ssize_t length;							\</div><div class='del'>-									\</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\</div><div class='del'>-	if (!hard_iface)						\</div><div class='del'>-		return 0;						\</div><div class='del'>-									\</div><div class='del'>-	length = __batadv_store_uint_attr(buff, count, _min, _max,	\</div><div class='del'>-					  _post_func, attr,		\</div><div class='del'>-					  &amp;hard_iface-&gt;_var,		\</div><div class='del'>-					  hard_iface-&gt;soft_iface,	\</div><div class='del'>-					  net_dev);			\</div><div class='del'>-									\</div><div class='del'>-	batadv_hardif_put(hard_iface);				\</div><div class='del'>-	return length;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BATADV_ATTR_HIF_SHOW_UINT(_name, _var)				\</div><div class='del'>-ssize_t batadv_show_##_name(struct kobject *kobj,			\</div><div class='del'>-			    struct attribute *attr, char *buff)		\</div><div class='del'>-{									\</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\</div><div class='del'>-	struct batadv_hard_iface *hard_iface;				\</div><div class='del'>-	ssize_t length;							\</div><div class='del'>-									\</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\</div><div class='del'>-	if (!hard_iface)						\</div><div class='del'>-		return 0;						\</div><div class='del'>-									\</div><div class='del'>-	length = sprintf(buff, "%i\n", atomic_read(&amp;hard_iface-&gt;_var));	\</div><div class='del'>-									\</div><div class='del'>-	batadv_hardif_put(hard_iface);				\</div><div class='del'>-	return length;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Use this, if you are going to set [name] in hard_iface to an</div><div class='del'>- * unsigned integer value</div><div class='del'>- */</div><div class='del'>-#define BATADV_ATTR_HIF_UINT(_name, _var, _mode, _min, _max, _post_func)\</div><div class='del'>-	static BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min,		\</div><div class='del'>-					  _max, _post_func)		\</div><div class='del'>-	static BATADV_ATTR_HIF_SHOW_UINT(_name, _var)			\</div><div class='del'>-	static BATADV_ATTR(_name, _mode, batadv_show_##_name,		\</div><div class='del'>-			   batadv_store_##_name)</div><div class='del'>-</div><div class='del'>-static int batadv_store_bool_attr(char *buff, size_t count,</div><div class='del'>-				  struct net_device *net_dev,</div><div class='del'>-				  const char *attr_name, atomic_t *attr,</div><div class='del'>-				  bool *changed)</div><div class='del'>-{</div><div class='del'>-	int enabled = -1;</div><div class='del'>-</div><div class='del'>-	*changed = false;</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	if ((strncmp(buff, "1", 2) == 0) ||</div><div class='del'>-	    (strncmp(buff, "enable", 7) == 0) ||</div><div class='del'>-	    (strncmp(buff, "enabled", 8) == 0))</div><div class='del'>-		enabled = 1;</div><div class='del'>-</div><div class='del'>-	if ((strncmp(buff, "0", 2) == 0) ||</div><div class='del'>-	    (strncmp(buff, "disable", 8) == 0) ||</div><div class='del'>-	    (strncmp(buff, "disabled", 9) == 0))</div><div class='del'>-		enabled = 0;</div><div class='del'>-</div><div class='del'>-	if (enabled &lt; 0) {</div><div class='del'>-		batadv_info(net_dev, "%s: Invalid parameter received: %s\n",</div><div class='del'>-			    attr_name, buff);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(attr) == enabled)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,</div><div class='del'>-		    atomic_read(attr) == 1 ? "enabled" : "disabled",</div><div class='del'>-		    enabled == 1 ? "enabled" : "disabled");</div><div class='del'>-</div><div class='del'>-	*changed = true;</div><div class='del'>-</div><div class='del'>-	atomic_set(attr, (unsigned int)enabled);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ssize_t</div><div class='del'>-__batadv_store_bool_attr(char *buff, size_t count,</div><div class='del'>-			 void (*post_func)(struct net_device *),</div><div class='del'>-			 struct attribute *attr,</div><div class='del'>-			 atomic_t *attr_store, struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	bool changed;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = batadv_store_bool_attr(buff, count, net_dev, attr-&gt;name,</div><div class='del'>-				     attr_store, &amp;changed);</div><div class='del'>-	if (post_func &amp;&amp; changed)</div><div class='del'>-		post_func(net_dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int batadv_store_uint_attr(const char *buff, size_t count,</div><div class='del'>-				  struct net_device *net_dev,</div><div class='del'>-				  struct net_device *slave_dev,</div><div class='del'>-				  const char *attr_name,</div><div class='del'>-				  unsigned int min, unsigned int max,</div><div class='del'>-				  atomic_t *attr)</div><div class='del'>-{</div><div class='del'>-	char ifname[IFNAMSIZ + 3] = "";</div><div class='del'>-	unsigned long uint_val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = kstrtoul(buff, 10, &amp;uint_val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		batadv_info(net_dev, "%s: Invalid parameter received: %s\n",</div><div class='del'>-			    attr_name, buff);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uint_val &lt; min) {</div><div class='del'>-		batadv_info(net_dev, "%s: Value is too small: %lu min: %u\n",</div><div class='del'>-			    attr_name, uint_val, min);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uint_val &gt; max) {</div><div class='del'>-		batadv_info(net_dev, "%s: Value is too big: %lu max: %u\n",</div><div class='del'>-			    attr_name, uint_val, max);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(attr) == uint_val)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	if (slave_dev)</div><div class='del'>-		snprintf(ifname, sizeof(ifname), "%s: ", slave_dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	batadv_info(net_dev, "%s: %sChanging from: %i to: %lu\n",</div><div class='del'>-		    attr_name, ifname, atomic_read(attr), uint_val);</div><div class='del'>-</div><div class='del'>-	atomic_set(attr, uint_val);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t __batadv_store_uint_attr(const char *buff, size_t count,</div><div class='del'>-					int min, int max,</div><div class='del'>-					void (*post_func)(struct net_device *),</div><div class='del'>-					const struct attribute *attr,</div><div class='del'>-					atomic_t *attr_store,</div><div class='del'>-					struct net_device *net_dev,</div><div class='del'>-					struct net_device *slave_dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = batadv_store_uint_attr(buff, count, net_dev, slave_dev,</div><div class='del'>-				     attr-&gt;name, min, max, attr_store);</div><div class='del'>-	if (post_func &amp;&amp; ret)</div><div class='del'>-		post_func(net_dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_bat_algo(struct kobject *kobj,</div><div class='del'>-				    struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%s\n", bat_priv-&gt;algo_ops-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void batadv_post_gw_reselect(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-</div><div class='del'>-	batadv_gw_reselect(bat_priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-				   char *buff)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-	int bytes_written;</div><div class='del'>-</div><div class='del'>-	/* GW mode is not available if the routing algorithm in use does not</div><div class='del'>-	 * implement the GW API</div><div class='del'>-	 */</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node ||</div><div class='del'>-	    !bat_priv-&gt;algo_ops-&gt;gw.is_eligible)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	switch (atomic_read(&amp;bat_priv-&gt;gw.mode)) {</div><div class='del'>-	case BATADV_GW_MODE_CLIENT:</div><div class='del'>-		bytes_written = sprintf(buff, "%s\n",</div><div class='del'>-					BATADV_GW_MODE_CLIENT_NAME);</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_GW_MODE_SERVER:</div><div class='del'>-		bytes_written = sprintf(buff, "%s\n",</div><div class='del'>-					BATADV_GW_MODE_SERVER_NAME);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bytes_written = sprintf(buff, "%s\n",</div><div class='del'>-					BATADV_GW_MODE_OFF_NAME);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bytes_written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_store_gw_mode(struct kobject *kobj,</div><div class='del'>-				    struct attribute *attr, char *buff,</div><div class='del'>-				    size_t count)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	char *curr_gw_mode_str;</div><div class='del'>-	int gw_mode_tmp = -1;</div><div class='del'>-</div><div class='del'>-	/* toggling GW mode is allowed only if the routing algorithm in use</div><div class='del'>-	 * provides the GW API</div><div class='del'>-	 */</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node ||</div><div class='del'>-	    !bat_priv-&gt;algo_ops-&gt;gw.is_eligible)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	if (strncmp(buff, BATADV_GW_MODE_OFF_NAME,</div><div class='del'>-		    strlen(BATADV_GW_MODE_OFF_NAME)) == 0)</div><div class='del'>-		gw_mode_tmp = BATADV_GW_MODE_OFF;</div><div class='del'>-</div><div class='del'>-	if (strncmp(buff, BATADV_GW_MODE_CLIENT_NAME,</div><div class='del'>-		    strlen(BATADV_GW_MODE_CLIENT_NAME)) == 0)</div><div class='del'>-		gw_mode_tmp = BATADV_GW_MODE_CLIENT;</div><div class='del'>-</div><div class='del'>-	if (strncmp(buff, BATADV_GW_MODE_SERVER_NAME,</div><div class='del'>-		    strlen(BATADV_GW_MODE_SERVER_NAME)) == 0)</div><div class='del'>-		gw_mode_tmp = BATADV_GW_MODE_SERVER;</div><div class='del'>-</div><div class='del'>-	if (gw_mode_tmp &lt; 0) {</div><div class='del'>-		batadv_info(net_dev,</div><div class='del'>-			    "Invalid parameter for 'gw mode' setting received: %s\n",</div><div class='del'>-			    buff);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;gw.mode) == gw_mode_tmp)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	switch (atomic_read(&amp;bat_priv-&gt;gw.mode)) {</div><div class='del'>-	case BATADV_GW_MODE_CLIENT:</div><div class='del'>-		curr_gw_mode_str = BATADV_GW_MODE_CLIENT_NAME;</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_GW_MODE_SERVER:</div><div class='del'>-		curr_gw_mode_str = BATADV_GW_MODE_SERVER_NAME;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		curr_gw_mode_str = BATADV_GW_MODE_OFF_NAME;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",</div><div class='del'>-		    curr_gw_mode_str, buff);</div><div class='del'>-</div><div class='del'>-	/* Invoking batadv_gw_reselect() is not enough to really de-select the</div><div class='del'>-	 * current GW. It will only instruct the gateway client code to perform</div><div class='del'>-	 * a re-election the next time that this is needed.</div><div class='del'>-	 *</div><div class='del'>-	 * When gw client mode is being switched off the current GW must be</div><div class='del'>-	 * de-selected explicitly otherwise no GW_ADD uevent is thrown on</div><div class='del'>-	 * client mode re-activation. This is operation is performed in</div><div class='del'>-	 * batadv_gw_check_client_stop().</div><div class='del'>-	 */</div><div class='del'>-	batadv_gw_reselect(bat_priv);</div><div class='del'>-	/* always call batadv_gw_check_client_stop() before changing the gateway</div><div class='del'>-	 * state</div><div class='del'>-	 */</div><div class='del'>-	batadv_gw_check_client_stop(bat_priv);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;gw.mode, (unsigned int)gw_mode_tmp);</div><div class='del'>-	batadv_gw_tvlv_container_update(bat_priv);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_gw_sel_class(struct kobject *kobj,</div><div class='del'>-					struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-</div><div class='del'>-	/* GW selection class is not available if the routing algorithm in use</div><div class='del'>-	 * does not implement the GW API</div><div class='del'>-	 */</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node ||</div><div class='del'>-	    !bat_priv-&gt;algo_ops-&gt;gw.is_eligible)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	if (bat_priv-&gt;algo_ops-&gt;gw.show_sel_class)</div><div class='del'>-		return bat_priv-&gt;algo_ops-&gt;gw.show_sel_class(bat_priv, buff);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%i\n", atomic_read(&amp;bat_priv-&gt;gw.sel_class));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_store_gw_sel_class(struct kobject *kobj,</div><div class='del'>-					 struct attribute *attr, char *buff,</div><div class='del'>-					 size_t count)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-</div><div class='del'>-	/* setting the GW selection class is allowed only if the routing</div><div class='del'>-	 * algorithm in use implements the GW API</div><div class='del'>-	 */</div><div class='del'>-	if (!bat_priv-&gt;algo_ops-&gt;gw.get_best_gw_node ||</div><div class='del'>-	    !bat_priv-&gt;algo_ops-&gt;gw.is_eligible)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	if (bat_priv-&gt;algo_ops-&gt;gw.store_sel_class)</div><div class='del'>-		return bat_priv-&gt;algo_ops-&gt;gw.store_sel_class(bat_priv, buff,</div><div class='del'>-							      count);</div><div class='del'>-</div><div class='del'>-	return __batadv_store_uint_attr(buff, count, 1, BATADV_TQ_MAX_VALUE,</div><div class='del'>-					batadv_post_gw_reselect, attr,</div><div class='del'>-					&amp;bat_priv-&gt;gw.sel_class,</div><div class='del'>-					bat_priv-&gt;soft_iface, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,</div><div class='del'>-				     struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-	u32 down, up;</div><div class='del'>-</div><div class='del'>-	down = atomic_read(&amp;bat_priv-&gt;gw.bandwidth_down);</div><div class='del'>-	up = atomic_read(&amp;bat_priv-&gt;gw.bandwidth_up);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%u.%u/%u.%u MBit\n", down / 10,</div><div class='del'>-		       down % 10, up / 10, up % 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_store_gw_bwidth(struct kobject *kobj,</div><div class='del'>-				      struct attribute *attr, char *buff,</div><div class='del'>-				      size_t count)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	return batadv_gw_bandwidth_set(net_dev, buff, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_show_isolation_mark() - print the current isolation mark/mask</div><div class='del'>- * @kobj: kobject representing the private mesh sysfs directory</div><div class='del'>- * @attr: the batman-adv attribute the user is interacting with</div><div class='del'>- * @buff: the buffer that will contain the data to send back to the user</div><div class='del'>- *</div><div class='del'>- * Return: the number of bytes written into 'buff' on success or a negative</div><div class='del'>- * error code in case of failure</div><div class='del'>- */</div><div class='del'>-static ssize_t batadv_show_isolation_mark(struct kobject *kobj,</div><div class='del'>-					  struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%#.8x/%#.8x\n", bat_priv-&gt;isolation_mark,</div><div class='del'>-		       bat_priv-&gt;isolation_mark_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_store_isolation_mark() - parse and store the isolation mark/mask</div><div class='del'>- *  entered by the user</div><div class='del'>- * @kobj: kobject representing the private mesh sysfs directory</div><div class='del'>- * @attr: the batman-adv attribute the user is interacting with</div><div class='del'>- * @buff: the buffer containing the user data</div><div class='del'>- * @count: number of bytes in the buffer</div><div class='del'>- *</div><div class='del'>- * Return: 'count' on success or a negative error code in case of failure</div><div class='del'>- */</div><div class='del'>-static ssize_t batadv_store_isolation_mark(struct kobject *kobj,</div><div class='del'>-					   struct attribute *attr, char *buff,</div><div class='del'>-					   size_t count)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	u32 mark, mask;</div><div class='del'>-	char *mask_ptr;</div><div class='del'>-</div><div class='del'>-	/* parse the mask if it has been specified, otherwise assume the mask is</div><div class='del'>-	 * the biggest possible</div><div class='del'>-	 */</div><div class='del'>-	mask = 0xFFFFFFFF;</div><div class='del'>-	mask_ptr = strchr(buff, '/');</div><div class='del'>-	if (mask_ptr) {</div><div class='del'>-		*mask_ptr = '\0';</div><div class='del'>-		mask_ptr++;</div><div class='del'>-</div><div class='del'>-		/* the mask must be entered in hex base as it is going to be a</div><div class='del'>-		 * bitmask and not a prefix length</div><div class='del'>-		 */</div><div class='del'>-		if (kstrtou32(mask_ptr, 16, &amp;mask) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the mark can be entered in any base */</div><div class='del'>-	if (kstrtou32(buff, 0, &amp;mark) &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;isolation_mark_mask = mask;</div><div class='del'>-	/* erase bits not covered by the mask */</div><div class='del'>-	bat_priv-&gt;isolation_mark = mark &amp; bat_priv-&gt;isolation_mark_mask;</div><div class='del'>-</div><div class='del'>-	batadv_info(net_dev,</div><div class='del'>-		    "New skb mark for extended isolation: %#.8x/%#.8x\n",</div><div class='del'>-		    bat_priv-&gt;isolation_mark, bat_priv-&gt;isolation_mark_mask);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BATADV_ATTR_SIF_BOOL(aggregated_ogms, 0644, NULL);</div><div class='del'>-BATADV_ATTR_SIF_BOOL(bonding, 0644, NULL);</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, 0644, batadv_bla_status_update);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='del'>-BATADV_ATTR_SIF_BOOL(distributed_arp_table, 0644, batadv_dat_status_update);</div><div class='del'>-#endif</div><div class='del'>-BATADV_ATTR_SIF_BOOL(fragmentation, 0644, batadv_update_min_mtu);</div><div class='del'>-static BATADV_ATTR(routing_algo, 0444, batadv_show_bat_algo, NULL);</div><div class='del'>-static BATADV_ATTR(gw_mode, 0644, batadv_show_gw_mode, batadv_store_gw_mode);</div><div class='del'>-BATADV_ATTR_SIF_UINT(orig_interval, orig_interval, 0644, 2 * BATADV_JITTER,</div><div class='del'>-		     INT_MAX, NULL);</div><div class='del'>-BATADV_ATTR_SIF_UINT(hop_penalty, hop_penalty, 0644, 0, BATADV_TQ_MAX_VALUE,</div><div class='del'>-		     NULL);</div><div class='del'>-static BATADV_ATTR(gw_sel_class, 0644, batadv_show_gw_sel_class,</div><div class='del'>-		   batadv_store_gw_sel_class);</div><div class='del'>-static BATADV_ATTR(gw_bandwidth, 0644, batadv_show_gw_bwidth,</div><div class='del'>-		   batadv_store_gw_bwidth);</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-BATADV_ATTR_SIF_BOOL(multicast_mode, 0644, NULL);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='del'>-BATADV_ATTR_SIF_UINT(log_level, log_level, 0644, 0, BATADV_DBG_ALL, NULL);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-BATADV_ATTR_SIF_BOOL(network_coding, 0644, batadv_nc_status_update);</div><div class='del'>-#endif</div><div class='del'>-static BATADV_ATTR(isolation_mark, 0644, batadv_show_isolation_mark,</div><div class='del'>-		   batadv_store_isolation_mark);</div><div class='del'>-</div><div class='del'>-static struct batadv_attribute *batadv_mesh_attrs[] = {</div><div class='del'>-	&amp;batadv_attr_aggregated_ogms,</div><div class='del'>-	&amp;batadv_attr_bonding,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-	&amp;batadv_attr_bridge_loop_avoidance,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='del'>-	&amp;batadv_attr_distributed_arp_table,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='del'>-	&amp;batadv_attr_multicast_mode,</div><div class='del'>-#endif</div><div class='del'>-	&amp;batadv_attr_fragmentation,</div><div class='del'>-	&amp;batadv_attr_routing_algo,</div><div class='del'>-	&amp;batadv_attr_gw_mode,</div><div class='del'>-	&amp;batadv_attr_orig_interval,</div><div class='del'>-	&amp;batadv_attr_hop_penalty,</div><div class='del'>-	&amp;batadv_attr_gw_sel_class,</div><div class='del'>-	&amp;batadv_attr_gw_bandwidth,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='del'>-	&amp;batadv_attr_log_level,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	&amp;batadv_attr_network_coding,</div><div class='del'>-#endif</div><div class='del'>-	&amp;batadv_attr_isolation_mark,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-BATADV_ATTR_VLAN_BOOL(ap_isolation, 0644, NULL);</div><div class='del'>-</div><div class='del'>-/* array of vlan specific sysfs attributes */</div><div class='del'>-static struct batadv_attribute *batadv_vlan_attrs[] = {</div><div class='del'>-	&amp;batadv_attr_vlan_ap_isolation,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_add_meshif() - Add soft interface specific sysfs entries</div><div class='del'>- * @dev: netdev struct of the soft interface</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_sysfs_add_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct kobject *batif_kobject = &amp;dev-&gt;dev.kobj;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_attribute **bat_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	bat_priv-&gt;mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,</div><div class='del'>-						    batif_kobject);</div><div class='del'>-	if (!bat_priv-&gt;mesh_obj) {</div><div class='del'>-		batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev-&gt;name,</div><div class='del'>-			   BATADV_SYSFS_IF_MESH_SUBDIR);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr) {</div><div class='del'>-		err = sysfs_create_file(bat_priv-&gt;mesh_obj,</div><div class='del'>-					&amp;((*bat_attr)-&gt;attr));</div><div class='del'>-		if (err) {</div><div class='del'>-			batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",</div><div class='del'>-				   dev-&gt;name, BATADV_SYSFS_IF_MESH_SUBDIR,</div><div class='del'>-				   ((*bat_attr)-&gt;attr).name);</div><div class='del'>-			goto rem_attr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-rem_attr:</div><div class='del'>-	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)</div><div class='del'>-		sysfs_remove_file(bat_priv-&gt;mesh_obj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-</div><div class='del'>-	kobject_uevent(bat_priv-&gt;mesh_obj, KOBJ_REMOVE);</div><div class='del'>-	kobject_del(bat_priv-&gt;mesh_obj);</div><div class='del'>-	kobject_put(bat_priv-&gt;mesh_obj);</div><div class='del'>-	bat_priv-&gt;mesh_obj = NULL;</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_del_meshif() - Remove soft interface specific sysfs entries</div><div class='del'>- * @dev: netdev struct of the soft interface</div><div class='del'>- */</div><div class='del'>-void batadv_sysfs_del_meshif(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_attribute **bat_attr;</div><div class='del'>-</div><div class='del'>-	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)</div><div class='del'>-		sysfs_remove_file(bat_priv-&gt;mesh_obj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-</div><div class='del'>-	kobject_uevent(bat_priv-&gt;mesh_obj, KOBJ_REMOVE);</div><div class='del'>-	kobject_del(bat_priv-&gt;mesh_obj);</div><div class='del'>-	kobject_put(bat_priv-&gt;mesh_obj);</div><div class='del'>-	bat_priv-&gt;mesh_obj = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_add_vlan() - add all the needed sysfs objects for the new vlan</div><div class='del'>- * @dev: netdev of the mesh interface</div><div class='del'>- * @vlan: private data of the newly added VLAN interface</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success and -ENOMEM if any of the structure allocations fails.</div><div class='del'>- */</div><div class='del'>-int batadv_sysfs_add_vlan(struct net_device *dev,</div><div class='del'>-			  struct batadv_softif_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	char vlan_subdir[sizeof(BATADV_SYSFS_VLAN_SUBDIR_PREFIX) + 5];</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(dev);</div><div class='del'>-	struct batadv_attribute **bat_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (vlan-&gt;vid &amp; BATADV_VLAN_HAS_TAG) {</div><div class='del'>-		sprintf(vlan_subdir, BATADV_SYSFS_VLAN_SUBDIR_PREFIX "%hu",</div><div class='del'>-			vlan-&gt;vid &amp; VLAN_VID_MASK);</div><div class='del'>-</div><div class='del'>-		vlan-&gt;kobj = kobject_create_and_add(vlan_subdir,</div><div class='del'>-						    bat_priv-&gt;mesh_obj);</div><div class='del'>-		if (!vlan-&gt;kobj) {</div><div class='del'>-			batadv_err(dev, "Can't add sysfs directory: %s/%s\n",</div><div class='del'>-				   dev-&gt;name, vlan_subdir);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* the untagged LAN uses the root folder to store its "VLAN</div><div class='del'>-		 * specific attributes"</div><div class='del'>-		 */</div><div class='del'>-		vlan-&gt;kobj = bat_priv-&gt;mesh_obj;</div><div class='del'>-		kobject_get(bat_priv-&gt;mesh_obj);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (bat_attr = batadv_vlan_attrs; *bat_attr; ++bat_attr) {</div><div class='del'>-		err = sysfs_create_file(vlan-&gt;kobj,</div><div class='del'>-					&amp;((*bat_attr)-&gt;attr));</div><div class='del'>-		if (err) {</div><div class='del'>-			batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",</div><div class='del'>-				   dev-&gt;name, vlan_subdir,</div><div class='del'>-				   ((*bat_attr)-&gt;attr).name);</div><div class='del'>-			goto rem_attr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-rem_attr:</div><div class='del'>-	for (bat_attr = batadv_vlan_attrs; *bat_attr; ++bat_attr)</div><div class='del'>-		sysfs_remove_file(vlan-&gt;kobj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-</div><div class='del'>-	if (vlan-&gt;kobj != bat_priv-&gt;mesh_obj) {</div><div class='del'>-		kobject_uevent(vlan-&gt;kobj, KOBJ_REMOVE);</div><div class='del'>-		kobject_del(vlan-&gt;kobj);</div><div class='del'>-	}</div><div class='del'>-	kobject_put(vlan-&gt;kobj);</div><div class='del'>-	vlan-&gt;kobj = NULL;</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_del_vlan() - remove all the sysfs objects for a given VLAN</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @vlan: the private data of the VLAN to destroy</div><div class='del'>- */</div><div class='del'>-void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv,</div><div class='del'>-			   struct batadv_softif_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct batadv_attribute **bat_attr;</div><div class='del'>-</div><div class='del'>-	for (bat_attr = batadv_vlan_attrs; *bat_attr; ++bat_attr)</div><div class='del'>-		sysfs_remove_file(vlan-&gt;kobj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-</div><div class='del'>-	if (vlan-&gt;kobj != bat_priv-&gt;mesh_obj) {</div><div class='del'>-		kobject_uevent(vlan-&gt;kobj, KOBJ_REMOVE);</div><div class='del'>-		kobject_del(vlan-&gt;kobj);</div><div class='del'>-	}</div><div class='del'>-	kobject_put(vlan-&gt;kobj);</div><div class='del'>-	vlan-&gt;kobj = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_mesh_iface(struct kobject *kobj,</div><div class='del'>-				      struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	ssize_t length;</div><div class='del'>-	const char *ifname;</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-	if (!hard_iface)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (hard_iface-&gt;if_status == BATADV_IF_NOT_IN_USE)</div><div class='del'>-		ifname =  "none";</div><div class='del'>-	else</div><div class='del'>-		ifname = hard_iface-&gt;soft_iface-&gt;name;</div><div class='del'>-</div><div class='del'>-	length = sprintf(buff, "%s\n", ifname);</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(hard_iface);</div><div class='del'>-</div><div class='del'>-	return length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_store_mesh_iface_finish() - store new hardif mesh_iface state</div><div class='del'>- * @net_dev: netdevice to add/remove to/from batman-adv soft-interface</div><div class='del'>- * @ifname: name of soft-interface to modify</div><div class='del'>- *</div><div class='del'>- * Changes the parts of the hard+soft interface which can not be modified under</div><div class='del'>- * sysfs lock (to prevent deadlock situations).</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, 0 &lt; on failure</div><div class='del'>- */</div><div class='del'>-static int batadv_store_mesh_iface_finish(struct net_device *net_dev,</div><div class='del'>-					  char ifname[IFNAMSIZ])</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(net_dev);</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	int status_tmp;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-	if (!hard_iface)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (strncmp(ifname, "none", 4) == 0)</div><div class='del'>-		status_tmp = BATADV_IF_NOT_IN_USE;</div><div class='del'>-	else</div><div class='del'>-		status_tmp = BATADV_IF_I_WANT_YOU;</div><div class='del'>-</div><div class='del'>-	if (hard_iface-&gt;if_status == status_tmp)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (hard_iface-&gt;soft_iface &amp;&amp;</div><div class='del'>-	    strncmp(hard_iface-&gt;soft_iface-&gt;name, ifname, IFNAMSIZ) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (status_tmp == BATADV_IF_NOT_IN_USE) {</div><div class='del'>-		batadv_hardif_disable_interface(hard_iface,</div><div class='del'>-						BATADV_IF_CLEANUP_AUTO);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if the interface already is in use */</div><div class='del'>-	if (hard_iface-&gt;if_status != BATADV_IF_NOT_IN_USE)</div><div class='del'>-		batadv_hardif_disable_interface(hard_iface,</div><div class='del'>-						BATADV_IF_CLEANUP_AUTO);</div><div class='del'>-</div><div class='del'>-	ret = batadv_hardif_enable_interface(hard_iface, net, ifname);</div><div class='del'>-out:</div><div class='del'>-	batadv_hardif_put(hard_iface);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_store_mesh_iface_work() - store new hardif mesh_iface state</div><div class='del'>- * @work: work queue item</div><div class='del'>- *</div><div class='del'>- * Changes the parts of the hard+soft interface which can not be modified under</div><div class='del'>- * sysfs lock (to prevent deadlock situations).</div><div class='del'>- */</div><div class='del'>-static void batadv_store_mesh_iface_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct batadv_store_mesh_work *store_work;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	store_work = container_of(work, struct batadv_store_mesh_work, work);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	ret = batadv_store_mesh_iface_finish(store_work-&gt;net_dev,</div><div class='del'>-					     store_work-&gt;soft_iface_name);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		pr_err("Failed to store new mesh_iface state %s for %s: %d\n",</div><div class='del'>-		       store_work-&gt;soft_iface_name, store_work-&gt;net_dev-&gt;name,</div><div class='del'>-		       ret);</div><div class='del'>-</div><div class='del'>-	dev_put(store_work-&gt;net_dev);</div><div class='del'>-	kfree(store_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_store_mesh_iface(struct kobject *kobj,</div><div class='del'>-				       struct attribute *attr, char *buff,</div><div class='del'>-				       size_t count)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_store_mesh_work *store_work;</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	if (strlen(buff) &gt;= IFNAMSIZ) {</div><div class='del'>-		pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",</div><div class='del'>-		       buff);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	store_work = kmalloc(sizeof(*store_work), GFP_KERNEL);</div><div class='del'>-	if (!store_work)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dev_hold(net_dev);</div><div class='del'>-	INIT_WORK(&amp;store_work-&gt;work, batadv_store_mesh_iface_work);</div><div class='del'>-	store_work-&gt;net_dev = net_dev;</div><div class='del'>-	strlcpy(store_work-&gt;soft_iface_name, buff,</div><div class='del'>-		sizeof(store_work-&gt;soft_iface_name));</div><div class='del'>-</div><div class='del'>-	queue_work(batadv_event_workqueue, &amp;store_work-&gt;work);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_iface_status(struct kobject *kobj,</div><div class='del'>-					struct attribute *attr, char *buff)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	ssize_t length;</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-	if (!hard_iface)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (hard_iface-&gt;if_status) {</div><div class='del'>-	case BATADV_IF_TO_BE_REMOVED:</div><div class='del'>-		length = sprintf(buff, "disabling\n");</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_IF_INACTIVE:</div><div class='del'>-		length = sprintf(buff, "inactive\n");</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_IF_ACTIVE:</div><div class='del'>-		length = sprintf(buff, "active\n");</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_IF_TO_BE_ACTIVATED:</div><div class='del'>-		length = sprintf(buff, "enabling\n");</div><div class='del'>-		break;</div><div class='del'>-	case BATADV_IF_NOT_IN_USE:</div><div class='del'>-	default:</div><div class='del'>-		length = sprintf(buff, "not in use\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	batadv_hardif_put(hard_iface);</div><div class='del'>-</div><div class='del'>-	return length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_store_throughput_override() - parse and store throughput override</div><div class='del'>- *  entered by the user</div><div class='del'>- * @kobj: kobject representing the private mesh sysfs directory</div><div class='del'>- * @attr: the batman-adv attribute the user is interacting with</div><div class='del'>- * @buff: the buffer containing the user data</div><div class='del'>- * @count: number of bytes in the buffer</div><div class='del'>- *</div><div class='del'>- * Return: 'count' on success or a negative error code in case of failure</div><div class='del'>- */</div><div class='del'>-static ssize_t batadv_store_throughput_override(struct kobject *kobj,</div><div class='del'>-						struct attribute *attr,</div><div class='del'>-						char *buff, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	u32 tp_override;</div><div class='del'>-	u32 old_tp_override;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-	if (!hard_iface)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (buff[count - 1] == '\n')</div><div class='del'>-		buff[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	ret = batadv_parse_throughput(net_dev, buff, "throughput_override",</div><div class='del'>-				      &amp;tp_override);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	old_tp_override = atomic_read(&amp;hard_iface-&gt;bat_v.throughput_override);</div><div class='del'>-	if (old_tp_override == tp_override)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	batadv_info(hard_iface-&gt;soft_iface,</div><div class='del'>-		    "%s: %s: Changing from: %u.%u MBit to: %u.%u MBit\n",</div><div class='del'>-		    "throughput_override", net_dev-&gt;name,</div><div class='del'>-		    old_tp_override / 10, old_tp_override % 10,</div><div class='del'>-		    tp_override / 10, tp_override % 10);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;hard_iface-&gt;bat_v.throughput_override, tp_override);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	batadv_hardif_put(hard_iface);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t batadv_show_throughput_override(struct kobject *kobj,</div><div class='del'>-					       struct attribute *attr,</div><div class='del'>-					       char *buff)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);</div><div class='del'>-	struct batadv_hard_iface *hard_iface;</div><div class='del'>-	u32 tp_override;</div><div class='del'>-</div><div class='del'>-	hard_iface = batadv_hardif_get_by_netdev(net_dev);</div><div class='del'>-	if (!hard_iface)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tp_override = atomic_read(&amp;hard_iface-&gt;bat_v.throughput_override);</div><div class='del'>-</div><div class='del'>-	return sprintf(buff, "%u.%u MBit\n", tp_override / 10,</div><div class='del'>-		       tp_override % 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static BATADV_ATTR(mesh_iface, 0644, batadv_show_mesh_iface,</div><div class='del'>-		   batadv_store_mesh_iface);</div><div class='del'>-static BATADV_ATTR(iface_status, 0444, batadv_show_iface_status, NULL);</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='del'>-BATADV_ATTR_HIF_UINT(elp_interval, bat_v.elp_interval, 0644,</div><div class='del'>-		     2 * BATADV_JITTER, INT_MAX, NULL);</div><div class='del'>-static BATADV_ATTR(throughput_override, 0644, batadv_show_throughput_override,</div><div class='del'>-		   batadv_store_throughput_override);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct batadv_attribute *batadv_batman_attrs[] = {</div><div class='del'>-	&amp;batadv_attr_mesh_iface,</div><div class='del'>-	&amp;batadv_attr_iface_status,</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='del'>-	&amp;batadv_attr_elp_interval,</div><div class='del'>-	&amp;batadv_attr_throughput_override,</div><div class='del'>-#endif</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_add_hardif() - Add hard interface specific sysfs entries</div><div class='del'>- * @hardif_obj: address where to store the pointer to new sysfs folder</div><div class='del'>- * @dev: netdev struct of the hard interface</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct kobject *hardif_kobject = &amp;dev-&gt;dev.kobj;</div><div class='del'>-	struct batadv_attribute **bat_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	*hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,</div><div class='del'>-					     hardif_kobject);</div><div class='del'>-</div><div class='del'>-	if (!*hardif_obj) {</div><div class='del'>-		batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev-&gt;name,</div><div class='del'>-			   BATADV_SYSFS_IF_BAT_SUBDIR);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {</div><div class='del'>-		err = sysfs_create_file(*hardif_obj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-		if (err) {</div><div class='del'>-			batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",</div><div class='del'>-				   dev-&gt;name, BATADV_SYSFS_IF_BAT_SUBDIR,</div><div class='del'>-				   ((*bat_attr)-&gt;attr).name);</div><div class='del'>-			goto rem_attr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-rem_attr:</div><div class='del'>-	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr)</div><div class='del'>-		sysfs_remove_file(*hardif_obj, &amp;((*bat_attr)-&gt;attr));</div><div class='del'>-out:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_sysfs_del_hardif() - Remove hard interface specific sysfs entries</div><div class='del'>- * @hardif_obj: address to the pointer to which stores batman-adv sysfs folder</div><div class='del'>- *  of the hard interface</div><div class='del'>- */</div><div class='del'>-void batadv_sysfs_del_hardif(struct kobject **hardif_obj)</div><div class='del'>-{</div><div class='del'>-	kobject_uevent(*hardif_obj, KOBJ_REMOVE);</div><div class='del'>-	kobject_del(*hardif_obj);</div><div class='del'>-	kobject_put(*hardif_obj);</div><div class='del'>-	*hardif_obj = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_throw_uevent() - Send an uevent with batman-adv specific env data</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @type: subsystem type of event. Stored in uevent's BATTYPE</div><div class='del'>- * @action: action type of event. Stored in uevent's BATACTION</div><div class='del'>- * @data: string with additional information to the event (ignored for</div><div class='del'>- *  BATADV_UEV_DEL). Stored in uevent's BATDATA</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success or negative error number in case of failure</div><div class='del'>- */</div><div class='del'>-int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,</div><div class='del'>-			enum batadv_uev_action action, const char *data)</div><div class='del'>-{</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-	struct kobject *bat_kobj;</div><div class='del'>-	char *uevent_env[4] = { NULL, NULL, NULL, NULL };</div><div class='del'>-</div><div class='del'>-	bat_kobj = &amp;bat_priv-&gt;soft_iface-&gt;dev.kobj;</div><div class='del'>-</div><div class='del'>-	uevent_env[0] = kasprintf(GFP_ATOMIC,</div><div class='del'>-				  "%s%s", BATADV_UEV_TYPE_VAR,</div><div class='del'>-				  batadv_uev_type_str[type]);</div><div class='del'>-	if (!uevent_env[0])</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	uevent_env[1] = kasprintf(GFP_ATOMIC,</div><div class='del'>-				  "%s%s", BATADV_UEV_ACTION_VAR,</div><div class='del'>-				  batadv_uev_action_str[action]);</div><div class='del'>-	if (!uevent_env[1])</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* If the event is DEL, ignore the data field */</div><div class='del'>-	if (action != BATADV_UEV_DEL) {</div><div class='del'>-		uevent_env[2] = kasprintf(GFP_ATOMIC,</div><div class='del'>-					  "%s%s", BATADV_UEV_DATA_VAR, data);</div><div class='del'>-		if (!uevent_env[2])</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);</div><div class='del'>-out:</div><div class='del'>-	kfree(uevent_env[0]);</div><div class='del'>-	kfree(uevent_env[1]);</div><div class='del'>-	kfree(uevent_env[2]);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,</div><div class='del'>-			   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",</div><div class='del'>-			   batadv_uev_type_str[type],</div><div class='del'>-			   batadv_uev_action_str[action],</div><div class='del'>-			   (action == BATADV_UEV_DEL ? "NULL" : data), ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h<br/>deleted file mode 100644<br/>index c1e3fb69952d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/sysfs.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/sysfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:</div><div class='del'>- *</div><div class='del'>- * Marek Lindner</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _NET_BATMAN_ADV_SYSFS_H_</div><div class='del'>-#define _NET_BATMAN_ADV_SYSFS_H_</div><div class='del'>-</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct kobject;</div><div class='del'>-struct net_device;</div><div class='del'>-</div><div class='del'>-#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"</div><div class='del'>-#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"</div><div class='del'>-/**</div><div class='del'>- * BATADV_SYSFS_VLAN_SUBDIR_PREFIX - prefix of the subfolder that will be</div><div class='del'>- *  created in the sysfs hierarchy for each VLAN interface. The subfolder will</div><div class='del'>- *  be named "BATADV_SYSFS_VLAN_SUBDIR_PREFIX%vid".</div><div class='del'>- */</div><div class='del'>-#define BATADV_SYSFS_VLAN_SUBDIR_PREFIX "vlan"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct batadv_attribute - sysfs export helper for batman-adv attributes</div><div class='del'>- */</div><div class='del'>-struct batadv_attribute {</div><div class='del'>-	/** @attr: sysfs attribute file */</div><div class='del'>-	struct attribute attr;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @show: function to export the current attribute's content to sysfs</div><div class='del'>-	 */</div><div class='del'>-	ssize_t (*show)(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-			char *buf);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @store: function to load new value from character buffer and save it</div><div class='del'>-	 * in batman-adv attribute</div><div class='del'>-	 */</div><div class='del'>-	ssize_t (*store)(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-			 char *buf, size_t count);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int batadv_sysfs_add_meshif(struct net_device *dev);</div><div class='del'>-void batadv_sysfs_del_meshif(struct net_device *dev);</div><div class='del'>-int batadv_sysfs_add_hardif(struct kobject **hardif_obj,</div><div class='del'>-			    struct net_device *dev);</div><div class='del'>-void batadv_sysfs_del_hardif(struct kobject **hardif_obj);</div><div class='del'>-int batadv_sysfs_add_vlan(struct net_device *dev,</div><div class='del'>-			  struct batadv_softif_vlan *vlan);</div><div class='del'>-void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv,</div><div class='del'>-			   struct batadv_softif_vlan *vlan);</div><div class='del'>-int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,</div><div class='del'>-			enum batadv_uev_action action, const char *data);</div><div class='del'>-</div><div class='del'>-#endif /* _NET_BATMAN_ADV_SYSFS_H_ */</div><div class='head'>diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c<br/>index 11520de96ccb..350b149e48be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tp_meter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tp_meter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tp_meter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/tp_meter.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Edo Monticelli, Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "tp_meter.h"</div><div class='hunk'>@@ -24,16 +12,18 @@</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='hunk'>@@ -77,7 +67,7 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * BATADV_TP_MAX_RTO - Maximum sender timeout. If the sender RTO gets beyond</div><div class='del'>- * such amound of milliseconds, the receiver is considered unreachable and the</div><div class='add'>+ * such amount of milliseconds, the receiver is considered unreachable and the</div><div class='ctx'>  * connection is killed</div><div class='ctx'>  */</div><div class='ctx'> #define BATADV_TP_MAX_RTO 30000</div><div class='hunk'>@@ -119,10 +109,10 @@ static u32 batadv_tp_session_cookie(const u8 session[2], u8 icmp_uid)</div><div class='ctx'>  * batadv_tp_cwnd() - compute the new cwnd size</div><div class='ctx'>  * @base: base cwnd size value</div><div class='ctx'>  * @increment: the value to add to base to get the new size</div><div class='del'>- * @min: minumim cwnd value (usually MSS)</div><div class='add'>+ * @min: minimum cwnd value (usually MSS)</div><div class='ctx'>  *</div><div class='del'>- * Return the new cwnd size and ensures it does not exceed the Advertised</div><div class='del'>- * Receiver Window size. It is wrap around safe.</div><div class='add'>+ * Return the new cwnd size and ensure it does not exceed the Advertised</div><div class='add'>+ * Receiver Window size. It is wrapped around safely.</div><div class='ctx'>  * For details refer to Section 3.1 of RFC5681</div><div class='ctx'>  *</div><div class='ctx'>  * Return: new congestion window size in bytes</div><div class='hunk'>@@ -141,7 +131,7 @@ static u32 batadv_tp_cwnd(u32 base, u32 increment, u32 min)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_tp_updated_cwnd() - update the Congestion Windows</div><div class='add'>+ * batadv_tp_update_cwnd() - update the Congestion Windows</div><div class='ctx'>  * @tp_vars: the private data of the current TP meter session</div><div class='ctx'>  * @mss: maximum segment size of transmission</div><div class='ctx'>  *</div><div class='hunk'>@@ -216,7 +206,7 @@ static void batadv_tp_update_rto(struct batadv_tp_vars *tp_vars,</div><div class='ctx'>  * batadv_tp_batctl_notify() - send client status result to client</div><div class='ctx'>  * @reason: reason for tp meter session stop</div><div class='ctx'>  * @dst: destination of tp_meter session</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @start_time: start of transmission in jiffies</div><div class='ctx'>  * @total_sent: bytes acked to the receiver</div><div class='ctx'>  * @cookie: cookie of tp_meter session</div><div class='hunk'>@@ -248,7 +238,7 @@ static void batadv_tp_batctl_notify(enum batadv_tp_meter_reason reason,</div><div class='ctx'>  * batadv_tp_batctl_error_notify() - send client error result to client</div><div class='ctx'>  * @reason: reason for tp meter session stop</div><div class='ctx'>  * @dst: destination of tp_meter session</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @cookie: cookie of tp_meter session</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_batctl_error_notify(enum batadv_tp_meter_reason reason,</div><div class='hunk'>@@ -261,11 +251,11 @@ static void batadv_tp_batctl_error_notify(enum batadv_tp_meter_reason reason,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_list_find() - find a tp_vars object in the global list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: the other endpoint MAC address to look for</div><div class='ctx'>  *</div><div class='ctx'>  * Look for a tp_vars object matching dst as end_point and return it after</div><div class='del'>- * having incremented the refcounter. Return NULL is not found</div><div class='add'>+ * having increment the refcounter. Return NULL is not found</div><div class='ctx'>  *</div><div class='ctx'>  * Return: matching tp_vars or NULL when no tp_vars with @dst was found</div><div class='ctx'>  */</div><div class='hunk'>@@ -297,12 +287,12 @@ static struct batadv_tp_vars *batadv_tp_list_find(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_list_find_session() - find tp_vars session object in the global</div><div class='ctx'>  *  list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: the other endpoint MAC address to look for</div><div class='ctx'>  * @session: session identifier</div><div class='ctx'>  *</div><div class='ctx'>  * Look for a tp_vars object matching dst as end_point, session as tp meter</div><div class='del'>- * session and return it after having incremented the refcounter. Return NULL</div><div class='add'>+ * session and return it after having increment the refcounter. Return NULL</div><div class='ctx'>  * is not found</div><div class='ctx'>  *</div><div class='ctx'>  * Return: matching tp_vars or NULL when no tp_vars was found</div><div class='hunk'>@@ -368,12 +358,15 @@ static void batadv_tp_vars_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_vars_put(struct batadv_tp_vars *tp_vars)</div><div class='ctx'> {</div><div class='add'>+	if (!tp_vars)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;tp_vars-&gt;refcount, batadv_tp_vars_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_sender_cleanup() - cleanup sender data and drop and timer</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tp_vars: the private data of the current TP meter session to cleanup</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_sender_cleanup(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -391,19 +384,19 @@ static void batadv_tp_sender_cleanup(struct batadv_priv *bat_priv,</div><div class='ctx'> 	atomic_dec(&amp;tp_vars-&gt;bat_priv-&gt;tp_num);</div><div class='ctx'> </div><div class='ctx'> 	/* kill the timer and remove its reference */</div><div class='del'>-	del_timer_sync(&amp;tp_vars-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;tp_vars-&gt;timer);</div><div class='ctx'> 	/* the worker might have rearmed itself therefore we kill it again. Note</div><div class='ctx'> 	 * that if the worker should run again before invoking the following</div><div class='del'>-	 * del_timer(), it would not re-arm itself once again because the status</div><div class='add'>+	 * timer_delete(), it would not re-arm itself once again because the status</div><div class='ctx'> 	 * is OFF now</div><div class='ctx'> 	 */</div><div class='del'>-	del_timer(&amp;tp_vars-&gt;timer);</div><div class='add'>+	timer_delete(&amp;tp_vars-&gt;timer);</div><div class='ctx'> 	batadv_tp_vars_put(tp_vars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_sender_end() - print info about ended session and inform client</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tp_vars: the private data of the current TP meter session</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_sender_end(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -492,7 +485,7 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_sender_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer);</div><div class='add'>+	struct batadv_tp_vars *tp_vars = timer_container_of(tp_vars, t, timer);</div><div class='ctx'> 	struct batadv_priv *bat_priv = tp_vars-&gt;bat_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;tp_vars-&gt;sending) == 0)</div><div class='hunk'>@@ -626,7 +619,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_recv_ack() - ACK receiving function</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the buffer containing the received packet</div><div class='ctx'>  *</div><div class='ctx'>  * Process a received TP ACK packet</div><div class='hunk'>@@ -638,9 +631,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	const struct batadv_icmp_tp_packet *icmp;</div><div class='ctx'> 	struct batadv_tp_vars *tp_vars;</div><div class='add'>+	const unsigned char *dev_addr;</div><div class='ctx'> 	size_t packet_len, mss;</div><div class='ctx'> 	u32 rtt, recv_ack, cwnd;</div><div class='del'>-	unsigned char *dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	packet_len = BATADV_TP_PLEN;</div><div class='ctx'> 	mss = BATADV_TP_PLEN;</div><div class='hunk'>@@ -758,12 +751,9 @@ move_twnd:</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;tp_vars-&gt;more_bytes);</div><div class='ctx'> out:</div><div class='del'>-	if (likely(primary_if))</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (likely(orig_node))</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='del'>-	if (likely(tp_vars))</div><div class='del'>-		batadv_tp_vars_put(tp_vars);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_tp_vars_put(tp_vars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -842,7 +832,7 @@ static int batadv_tp_send(void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* assume that all the hard_interfaces have a correctly</div><div class='del'>-	 * configured MTU, so use the soft_iface MTU as MSS.</div><div class='add'>+	 * configured MTU, so use the mesh_iface MTU as MSS.</div><div class='ctx'> 	 * This might not be true and in that case the fragmentation</div><div class='ctx'> 	 * should be used.</div><div class='ctx'> 	 * Now, try to send the packet as it is</div><div class='hunk'>@@ -892,17 +882,15 @@ static int batadv_tp_send(void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (likely(primary_if))</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (likely(orig_node))</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tp_sender_end(bat_priv, tp_vars);</div><div class='ctx'> 	batadv_tp_sender_cleanup(bat_priv, tp_vars);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tp_vars_put(tp_vars);</div><div class='ctx'> </div><div class='del'>-	do_exit(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -939,7 +927,7 @@ static void batadv_tp_start_kthread(struct batadv_tp_vars *tp_vars)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_start() - start a new tp meter session</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: the receiver MAC address</div><div class='ctx'>  * @test_length: test length in milliseconds</div><div class='ctx'>  * @cookie: session cookie</div><div class='hunk'>@@ -1005,7 +993,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> </div><div class='ctx'> 	/* initialise the CWND to 3*MSS (Section 3.1 in RFC5681).</div><div class='ctx'> 	 * For batman-adv the MSS is the size of the payload received by the</div><div class='del'>-	 * soft_interface, hence its MTU</div><div class='add'>+	 * mesh_interface, hence its MTU</div><div class='ctx'> 	 */</div><div class='ctx'> 	tp_vars-&gt;cwnd = BATADV_TP_PLEN * 3;</div><div class='ctx'> 	/* at the beginning initialise the SS threshold to the biggest possible</div><div class='hunk'>@@ -1064,7 +1052,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_stop() - stop currently running tp meter session</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: the receiver MAC address</div><div class='ctx'>  * @return_value: reason for tp meter session stop</div><div class='ctx'>  */</div><div class='hunk'>@@ -1113,7 +1101,7 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tp_receiver_shutdown(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer);</div><div class='add'>+	struct batadv_tp_vars *tp_vars = timer_container_of(tp_vars, t, timer);</div><div class='ctx'> 	struct batadv_tp_unacked *un, *safe;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1153,7 +1141,7 @@ static void batadv_tp_receiver_shutdown(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_send_ack() - send an ACK packet</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst: the mac address of the destination originator</div><div class='ctx'>  * @seq: the sequence number to ACK</div><div class='ctx'>  * @timestamp: the timestamp to echo back in the ACK</div><div class='hunk'>@@ -1215,10 +1203,8 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (likely(orig_node))</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='del'>-	if (likely(primary_if))</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1334,7 +1320,7 @@ static void batadv_tp_ack_unordered(struct batadv_tp_vars *tp_vars)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_init_recv() - return matching or create new receiver tp_vars</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @icmp: received icmp tp msg</div><div class='ctx'>  *</div><div class='ctx'>  * Return: corresponding tp_vars or NULL on errors</div><div class='hunk'>@@ -1387,7 +1373,7 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_recv_msg() - process a single data message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the buffer containing the received packet</div><div class='ctx'>  *</div><div class='ctx'>  * Process a received TP MSG packet</div><div class='hunk'>@@ -1466,13 +1452,12 @@ send_ack:</div><div class='ctx'> 	batadv_tp_send_ack(bat_priv, icmp-&gt;orig, tp_vars-&gt;last_recv,</div><div class='ctx'> 			   icmp-&gt;timestamp, icmp-&gt;session, icmp-&gt;uid);</div><div class='ctx'> out:</div><div class='del'>-	if (likely(tp_vars))</div><div class='del'>-		batadv_tp_vars_put(tp_vars);</div><div class='add'>+	batadv_tp_vars_put(tp_vars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tp_meter_recv() - main TP Meter receiving function</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @skb: the buffer containing the received packet</div><div class='ctx'>  */</div><div class='ctx'> void batadv_tp_meter_recv(struct batadv_priv *bat_priv, struct sk_buff *skb)</div><div class='head'>diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h<br/>index 68e600974759..f0046d366eac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tp_meter.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tp_meter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tp_meter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/tp_meter.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Edo Monticelli, Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_TP_METER_H_</div><div class='hunk'>@@ -21,10 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> void batadv_tp_meter_init(void);</div><div class='ctx'> void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,</div><div class='ctx'> 		     u32 test_length, u32 *cookie);</div><div class='head'>diff --git a/net/batman-adv/trace.c b/net/batman-adv/trace.c<br/>new file mode 100644<br/>index 000000000000..ec8b9519076b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/trace.c</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='add'>+ *</div><div class='add'>+ * Sven Eckelmann</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='head'>diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h<br/>new file mode 100644<br/>index 000000000000..7da692ec38e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/trace.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='add'>+ *</div><div class='add'>+ * Sven Eckelmann</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if !defined(_NET_BATMAN_ADV_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _NET_BATMAN_ADV_TRACE_H_</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM batadv</div><div class='add'>+</div><div class='add'>+/* provide dummy function when tracing is disabled */</div><div class='add'>+#if !defined(CONFIG_BATMAN_ADV_TRACING)</div><div class='add'>+</div><div class='add'>+#undef TRACE_EVENT</div><div class='add'>+#define TRACE_EVENT(name, proto, ...) \</div><div class='add'>+	static inline void trace_ ## name(proto) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_BATMAN_ADV_TRACING */</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(batadv_dbg,</div><div class='add'>+</div><div class='add'>+	    TP_PROTO(struct batadv_priv *bat_priv,</div><div class='add'>+		     struct va_format *vaf),</div><div class='add'>+</div><div class='add'>+	    TP_ARGS(bat_priv, vaf),</div><div class='add'>+</div><div class='add'>+	    TP_STRUCT__entry(</div><div class='add'>+		    __string(device, bat_priv-&gt;mesh_iface-&gt;name)</div><div class='add'>+		    __string(driver, KBUILD_MODNAME)</div><div class='add'>+		    __vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='add'>+	    ),</div><div class='add'>+</div><div class='add'>+	    TP_fast_assign(</div><div class='add'>+		    __assign_str(device);</div><div class='add'>+		    __assign_str(driver);</div><div class='add'>+		    __assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='add'>+	    ),</div><div class='add'>+</div><div class='add'>+	    TP_printk(</div><div class='add'>+		    "%s %s %s",</div><div class='add'>+		    __get_str(driver),</div><div class='add'>+		    __get_str(device),</div><div class='add'>+		    __get_str(msg)</div><div class='add'>+	    )</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _NET_BATMAN_ADV_TRACE_H_ || TRACE_HEADER_MULTI_READ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c<br/>index d21624c44665..6e95e883c2bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/translation-table.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/translation-table.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/translation-table.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/translation-table.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich, Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "translation-table.h"</div><div class='hunk'>@@ -25,7 +13,9 @@</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/crc32c.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -33,16 +23,15 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -51,7 +40,6 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -59,9 +47,9 @@</div><div class='ctx'> #include "hard-interface.h"</div><div class='ctx'> #include "hash.h"</div><div class='ctx'> #include "log.h"</div><div class='add'>+#include "mesh-interface.h"</div><div class='ctx'> #include "netlink.h"</div><div class='ctx'> #include "originator.h"</div><div class='del'>-#include "soft-interface.h"</div><div class='ctx'> #include "tvlv.h"</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *batadv_tl_cache __read_mostly;</div><div class='hunk'>@@ -116,10 +104,10 @@ static bool batadv_compare_tt(const struct hlist_node *node, const void *data2)</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 batadv_choose_tt(const void *data, u32 size)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_tt_common_entry *tt;</div><div class='add'>+	const struct batadv_tt_common_entry *tt;</div><div class='ctx'> 	u32 hash = 0;</div><div class='ctx'> </div><div class='del'>-	tt = (struct batadv_tt_common_entry *)data;</div><div class='add'>+	tt = data;</div><div class='ctx'> 	hash = jhash(&amp;tt-&gt;addr, ETH_ALEN, hash);</div><div class='ctx'> 	hash = jhash(&amp;tt-&gt;vid, sizeof(tt-&gt;vid), hash);</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +161,7 @@ batadv_tt_hash_find(struct batadv_hashtable *hash, const u8 *addr,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_hash_find() - search the local table for a given client</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client to look for</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -198,14 +186,14 @@ batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_hash_find() - search the global table for a given client</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client to look for</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='ctx'>  * Return: a pointer to the corresponding tt_global_entry struct if the client</div><div class='ctx'>  * is found, NULL otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct batadv_tt_global_entry *</div><div class='add'>+struct batadv_tt_global_entry *</div><div class='ctx'> batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> 			   unsigned short vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -222,23 +210,9 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_tt_local_entry_free_rcu() - free the tt_local_entry</div><div class='del'>- * @rcu: rcu pointer of the tt_local_entry</div><div class='del'>- */</div><div class='del'>-static void batadv_tt_local_entry_free_rcu(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct batadv_tt_local_entry *tt_local_entry;</div><div class='del'>-</div><div class='del'>-	tt_local_entry = container_of(rcu, struct batadv_tt_local_entry,</div><div class='del'>-				      common.rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(batadv_tl_cache, tt_local_entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_tt_local_entry_release() - release tt_local_entry from lists and queue</div><div class='ctx'>  *  for free after rcu grace period</div><div class='del'>- * @ref: kref pointer of the nc_node</div><div class='add'>+ * @ref: kref pointer of the batadv_tt_local_entry</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_local_entry_release(struct kref *ref)</div><div class='ctx'> {</div><div class='hunk'>@@ -247,9 +221,9 @@ static void batadv_tt_local_entry_release(struct kref *ref)</div><div class='ctx'> 	tt_local_entry = container_of(ref, struct batadv_tt_local_entry,</div><div class='ctx'> 				      common.refcount);</div><div class='ctx'> </div><div class='del'>-	batadv_softif_vlan_put(tt_local_entry-&gt;vlan);</div><div class='add'>+	batadv_meshif_vlan_put(tt_local_entry-&gt;vlan);</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;tt_local_entry-&gt;common.rcu, batadv_tt_local_entry_free_rcu);</div><div class='add'>+	kfree_rcu(tt_local_entry, common.rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -260,30 +234,19 @@ static void batadv_tt_local_entry_release(struct kref *ref)</div><div class='ctx'> static void</div><div class='ctx'> batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry)</div><div class='ctx'> {</div><div class='add'>+	if (!tt_local_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;tt_local_entry-&gt;common.refcount,</div><div class='ctx'> 		 batadv_tt_local_entry_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_tt_global_entry_free_rcu() - free the tt_global_entry</div><div class='del'>- * @rcu: rcu pointer of the tt_global_entry</div><div class='del'>- */</div><div class='del'>-static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct batadv_tt_global_entry *tt_global_entry;</div><div class='del'>-</div><div class='del'>-	tt_global_entry = container_of(rcu, struct batadv_tt_global_entry,</div><div class='del'>-				       common.rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(batadv_tg_cache, tt_global_entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_tt_global_entry_release() - release tt_global_entry from lists and</div><div class='ctx'>  *  queue for free after rcu grace period</div><div class='del'>- * @ref: kref pointer of the nc_node</div><div class='add'>+ * @ref: kref pointer of the batadv_tt_global_entry</div><div class='ctx'>  */</div><div class='del'>-static void batadv_tt_global_entry_release(struct kref *ref)</div><div class='add'>+void batadv_tt_global_entry_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tt_global_entry *tt_global_entry;</div><div class='ctx'> </div><div class='hunk'>@@ -292,29 +255,17 @@ static void batadv_tt_global_entry_release(struct kref *ref)</div><div class='ctx'> </div><div class='ctx'> 	batadv_tt_global_del_orig_list(tt_global_entry);</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;tt_global_entry-&gt;common.rcu, batadv_tt_global_entry_free_rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_tt_global_entry_put() - decrement the tt_global_entry refcounter and</div><div class='del'>- *  possibly release it</div><div class='del'>- * @tt_global_entry: tt_global_entry to be free'd</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry)</div><div class='del'>-{</div><div class='del'>-	kref_put(&amp;tt_global_entry-&gt;common.refcount,</div><div class='del'>-		 batadv_tt_global_entry_release);</div><div class='add'>+	kfree_rcu(tt_global_entry, common.rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_hash_count() - count the number of orig entries</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client to count entries for</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the number of originators advertising the given address/data</div><div class='del'>- * (excluding ourself).</div><div class='add'>+ * (excluding our self).</div><div class='ctx'>  */</div><div class='ctx'> int batadv_tt_global_hash_count(struct batadv_priv *bat_priv,</div><div class='ctx'> 				const u8 *addr, unsigned short vid)</div><div class='hunk'>@@ -335,28 +286,28 @@ int batadv_tt_global_hash_count(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_size_mod() - change the size by v of the local table</div><div class='ctx'>  *  identified by vid</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the VLAN identifier of the sub-table to change</div><div class='ctx'>  * @v: the amount to sum to the local table size</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_local_size_mod(struct batadv_priv *bat_priv,</div><div class='ctx'> 				     unsigned short vid, int v)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	atomic_add(v, &amp;vlan-&gt;tt.num_entries);</div><div class='ctx'> </div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_size_inc() - increase by one the local table size for the</div><div class='ctx'>  *  given vid</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the VLAN identifier</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_local_size_inc(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -368,7 +319,7 @@ static void batadv_tt_local_size_inc(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_size_dec() - decrease by one the local table size for the</div><div class='ctx'>  *  given vid</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: the VLAN identifier</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_local_size_dec(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -430,19 +381,6 @@ static void batadv_tt_global_size_dec(struct batadv_orig_node *orig_node,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_tt_orig_list_entry_free_rcu() - free the orig_entry</div><div class='del'>- * @rcu: rcu pointer of the orig_entry</div><div class='del'>- */</div><div class='del'>-static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct batadv_tt_orig_list_entry *orig_entry;</div><div class='del'>-</div><div class='del'>-	orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(batadv_tt_orig_cache, orig_entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * batadv_tt_orig_list_entry_release() - release tt orig entry from lists and</div><div class='ctx'>  *  queue for free after rcu grace period</div><div class='ctx'>  * @ref: kref pointer of the tt orig entry</div><div class='hunk'>@@ -455,7 +393,7 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref)</div><div class='ctx'> 				  refcount);</div><div class='ctx'> </div><div class='ctx'> 	batadv_orig_node_put(orig_entry-&gt;orig_node);</div><div class='del'>-	call_rcu(&amp;orig_entry-&gt;rcu, batadv_tt_orig_list_entry_free_rcu);</div><div class='add'>+	kfree_rcu(orig_entry, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -466,12 +404,15 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref)</div><div class='ctx'> static void</div><div class='ctx'> batadv_tt_orig_list_entry_put(struct batadv_tt_orig_list_entry *orig_entry)</div><div class='ctx'> {</div><div class='add'>+	if (!orig_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;orig_entry-&gt;refcount, batadv_tt_orig_list_entry_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_event() - store a local TT event (ADD/DEL)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_local_entry: the TT entry involved in the event</div><div class='ctx'>  * @event_flags: flags to store in the event structure</div><div class='ctx'>  */</div><div class='hunk'>@@ -482,8 +423,8 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_tt_change_node *tt_change_node, *entry, *safe;</div><div class='ctx'> 	struct batadv_tt_common_entry *common = &amp;tt_local_entry-&gt;common;</div><div class='ctx'> 	u8 flags = common-&gt;flags | event_flags;</div><div class='del'>-	bool event_removed = false;</div><div class='ctx'> 	bool del_op_requested, del_op_entry;</div><div class='add'>+	size_t changes;</div><div class='ctx'> </div><div class='ctx'> 	tt_change_node = kmem_cache_alloc(batadv_tt_change_cache, GFP_ATOMIC);</div><div class='ctx'> 	if (!tt_change_node)</div><div class='hunk'>@@ -497,51 +438,45 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	del_op_requested = flags &amp; BATADV_TT_CLIENT_DEL;</div><div class='ctx'> </div><div class='del'>-	/* check for ADD+DEL or DEL+ADD events */</div><div class='add'>+	/* check for ADD+DEL, DEL+ADD, ADD+ADD or DEL+DEL events */</div><div class='ctx'> 	spin_lock_bh(&amp;bat_priv-&gt;tt.changes_list_lock);</div><div class='add'>+	changes = READ_ONCE(bat_priv-&gt;tt.local_changes);</div><div class='ctx'> 	list_for_each_entry_safe(entry, safe, &amp;bat_priv-&gt;tt.changes_list,</div><div class='ctx'> 				 list) {</div><div class='ctx'> 		if (!batadv_compare_eth(entry-&gt;change.addr, common-&gt;addr))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* DEL+ADD in the same orig interval have no effect and can be</div><div class='del'>-		 * removed to avoid silly behaviour on the receiver side. The</div><div class='del'>-		 * other way around (ADD+DEL) can happen in case of roaming of</div><div class='del'>-		 * a client still in the NEW state. Roaming of NEW clients is</div><div class='del'>-		 * now possible due to automatically recognition of "temporary"</div><div class='del'>-		 * clients</div><div class='del'>-		 */</div><div class='ctx'> 		del_op_entry = entry-&gt;change.flags &amp; BATADV_TT_CLIENT_DEL;</div><div class='del'>-		if (!del_op_requested &amp;&amp; del_op_entry)</div><div class='del'>-			goto del;</div><div class='del'>-		if (del_op_requested &amp;&amp; !del_op_entry)</div><div class='del'>-			goto del;</div><div class='del'>-</div><div class='del'>-		/* this is a second add in the same originator interval. It</div><div class='del'>-		 * means that flags have been changed: update them!</div><div class='del'>-		 */</div><div class='del'>-		if (!del_op_requested &amp;&amp; !del_op_entry)</div><div class='add'>+		if (del_op_requested != del_op_entry) {</div><div class='add'>+			/* DEL+ADD in the same orig interval have no effect and</div><div class='add'>+			 * can be removed to avoid silly behaviour on the</div><div class='add'>+			 * receiver side. The  other way around (ADD+DEL) can</div><div class='add'>+			 * happen in case of roaming of  a client still in the</div><div class='add'>+			 * NEW state. Roaming of NEW clients is now possible due</div><div class='add'>+			 * to automatically recognition of "temporary" clients</div><div class='add'>+			 */</div><div class='add'>+			list_del(&amp;entry-&gt;list);</div><div class='add'>+			kmem_cache_free(batadv_tt_change_cache, entry);</div><div class='add'>+			changes--;</div><div class='add'>+		} else {</div><div class='add'>+			/* this is a second add or del in the same originator</div><div class='add'>+			 * interval. It could mean that flags have been changed</div><div class='add'>+			 * (e.g. double add): update them</div><div class='add'>+			 */</div><div class='ctx'> 			entry-&gt;change.flags = flags;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		continue;</div><div class='del'>-del:</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		kmem_cache_free(batadv_tt_change_cache, entry);</div><div class='ctx'> 		kmem_cache_free(batadv_tt_change_cache, tt_change_node);</div><div class='del'>-		event_removed = true;</div><div class='del'>-		goto unlock;</div><div class='add'>+		goto update_changes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* track the change in the OGMinterval list */</div><div class='ctx'> 	list_add_tail(&amp;tt_change_node-&gt;list, &amp;bat_priv-&gt;tt.changes_list);</div><div class='add'>+	changes++;</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='add'>+update_changes:</div><div class='add'>+	WRITE_ONCE(bat_priv-&gt;tt.local_changes, changes);</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.changes_list_lock);</div><div class='del'>-</div><div class='del'>-	if (event_removed)</div><div class='del'>-		atomic_dec(&amp;bat_priv-&gt;tt.local_changes);</div><div class='del'>-	else</div><div class='del'>-		atomic_inc(&amp;bat_priv-&gt;tt.local_changes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -569,7 +504,7 @@ static u16 batadv_tt_entries(u16 tt_len)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_table_transmit_size() - calculates the local translation</div><div class='ctx'>  *  table size when transmitted over the air</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: local translation table size in bytes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -577,11 +512,11 @@ static int batadv_tt_local_table_transmit_size(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	u16 num_vlan = 0;</div><div class='ctx'> 	u16 tt_local_entries = 0;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	int hdr_size;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		num_vlan++;</div><div class='ctx'> 		tt_local_entries += atomic_read(&amp;vlan-&gt;tt.num_entries);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -616,20 +551,32 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,</div><div class='ctx'> 				  struct batadv_tt_global_entry *tt_global,</div><div class='ctx'> 				  const char *message)</div><div class='ctx'> {</div><div class='add'>+	struct batadv_tt_global_entry *tt_removed_entry;</div><div class='add'>+	struct hlist_node *tt_removed_node;</div><div class='add'>+</div><div class='ctx'> 	batadv_dbg(BATADV_DBG_TT, bat_priv,</div><div class='ctx'> 		   "Deleting global tt entry %pM (vid: %d): %s\n",</div><div class='ctx'> 		   tt_global-&gt;common.addr,</div><div class='ctx'> 		   batadv_print_vid(tt_global-&gt;common.vid), message);</div><div class='ctx'> </div><div class='del'>-	batadv_hash_remove(bat_priv-&gt;tt.global_hash, batadv_compare_tt,</div><div class='del'>-			   batadv_choose_tt, &amp;tt_global-&gt;common);</div><div class='del'>-	batadv_tt_global_entry_put(tt_global);</div><div class='add'>+	tt_removed_node = batadv_hash_remove(bat_priv-&gt;tt.global_hash,</div><div class='add'>+					     batadv_compare_tt,</div><div class='add'>+					     batadv_choose_tt,</div><div class='add'>+					     &amp;tt_global-&gt;common);</div><div class='add'>+	if (!tt_removed_node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* drop reference of remove hash entry */</div><div class='add'>+	tt_removed_entry = hlist_entry(tt_removed_node,</div><div class='add'>+				       struct batadv_tt_global_entry,</div><div class='add'>+				       common.hash_entry);</div><div class='add'>+	batadv_tt_global_entry_put(tt_removed_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_add() - add a new client to the local table or update an</div><div class='ctx'>  *  existing client</div><div class='del'>- * @soft_iface: netdev struct of the mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  * @addr: the mac address of the client to add</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  * @ifindex: index of the interface where the client is connected to (useful to</div><div class='hunk'>@@ -639,14 +586,14 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the client was successfully added, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,</div><div class='add'>+bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr,</div><div class='ctx'> 			 unsigned short vid, int ifindex, u32 mark)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	struct batadv_tt_local_entry *tt_local;</div><div class='ctx'> 	struct batadv_tt_global_entry *tt_global = NULL;</div><div class='del'>-	struct net *net = dev_net(soft_iface);</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct net *net = dev_net(mesh_iface);</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	struct net_device *in_dev = NULL;</div><div class='ctx'> 	struct batadv_hard_iface *in_hardif = NULL;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='hunk'>@@ -703,7 +650,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,</div><div class='ctx'> 	table_size += batadv_tt_len(1);</div><div class='ctx'> 	packet_size_max = atomic_read(&amp;bat_priv-&gt;packet_size_max);</div><div class='ctx'> 	if (table_size &gt; packet_size_max) {</div><div class='del'>-		net_ratelimited_function(batadv_info, soft_iface,</div><div class='add'>+		net_ratelimited_function(batadv_info, mesh_iface,</div><div class='ctx'> 					 "Local translation table size (%i) exceeds maximum packet size (%i); Ignoring new local tt entry: %pM\n",</div><div class='ctx'> 					 table_size, packet_size_max, addr);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -714,9 +661,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* increase the refcounter of the related vlan */</div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (!vlan) {</div><div class='del'>-		net_ratelimited_function(batadv_info, soft_iface,</div><div class='add'>+		net_ratelimited_function(batadv_info, mesh_iface,</div><div class='ctx'> 					 "adding TT local entry %pM to non-existent VLAN %d\n",</div><div class='ctx'> 					 addr, batadv_print_vid(vid));</div><div class='ctx'> 		kmem_cache_free(batadv_tl_cache, tt_local);</div><div class='hunk'>@@ -746,7 +693,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,</div><div class='ctx'> 	/* the batman interface mac and multicast addresses should never be</div><div class='ctx'> 	 * purged</div><div class='ctx'> 	 */</div><div class='del'>-	if (batadv_compare_eth(addr, soft_iface-&gt;dev_addr) ||</div><div class='add'>+	if (batadv_compare_eth(addr, mesh_iface-&gt;dev_addr) ||</div><div class='ctx'> 	    is_multicast_ether_addr(addr))</div><div class='ctx'> 		tt_local-&gt;common.flags |= BATADV_TT_CLIENT_NOPURGE;</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +728,6 @@ check_roaming:</div><div class='ctx'> 		if (roamed_back) {</div><div class='ctx'> 			batadv_tt_global_free(bat_priv, tt_global,</div><div class='ctx'> 					      "Roaming canceled");</div><div class='del'>-			tt_global = NULL;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* The global entry has to be marked as ROAMING and</div><div class='ctx'> 			 * has to be kept for consistency purpose</div><div class='hunk'>@@ -820,14 +766,10 @@ check_roaming:</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (in_hardif)</div><div class='del'>-		batadv_hardif_put(in_hardif);</div><div class='del'>-	if (in_dev)</div><div class='del'>-		dev_put(in_dev);</div><div class='del'>-	if (tt_local)</div><div class='del'>-		batadv_tt_local_entry_put(tt_local);</div><div class='del'>-	if (tt_global)</div><div class='del'>-		batadv_tt_global_entry_put(tt_global);</div><div class='add'>+	batadv_hardif_put(in_hardif);</div><div class='add'>+	dev_put(in_dev);</div><div class='add'>+	batadv_tt_local_entry_put(tt_local);</div><div class='add'>+	batadv_tt_global_entry_put(tt_global);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -843,7 +785,7 @@ out:</div><div class='ctx'>  *  table. In case of success the value is updated with the real amount of</div><div class='ctx'>  *  reserved bytes</div><div class='ctx'>  * Allocate the needed amount of memory for the entire TT TVLV and write its</div><div class='del'>- * header made up by one tvlv_tt_data object and a series of tvlv_tt_vlan_data</div><div class='add'>+ * header made up of one tvlv_tt_data object and a series of tvlv_tt_vlan_data</div><div class='ctx'>  * objects, one per active VLAN served by the originator node.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the size of the allocated buffer or 0 in case of failure.</div><div class='hunk'>@@ -863,13 +805,12 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	u8 *tt_change_ptr;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;orig_node-&gt;vlan_list_lock);</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;orig_node-&gt;vlan_list, list) {</div><div class='add'>+	hlist_for_each_entry(vlan, &amp;orig_node-&gt;vlan_list, list) {</div><div class='ctx'> 		num_vlan++;</div><div class='ctx'> 		num_entries += atomic_read(&amp;vlan-&gt;tt.num_entries);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	change_offset = sizeof(**tt_data);</div><div class='del'>-	change_offset += num_vlan * sizeof(*tt_vlan);</div><div class='add'>+	change_offset = struct_size(*tt_data, vlan_data, num_vlan);</div><div class='ctx'> </div><div class='ctx'> 	/* if tt_len is negative, allocate the space needed by the full table */</div><div class='ctx'> 	if (*tt_len &lt; 0)</div><div class='hunk'>@@ -888,10 +829,11 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,</div><div class='ctx'> 	(*tt_data)-&gt;ttvn = atomic_read(&amp;orig_node-&gt;last_ttvn);</div><div class='ctx'> 	(*tt_data)-&gt;num_vlan = htons(num_vlan);</div><div class='ctx'> </div><div class='del'>-	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;orig_node-&gt;vlan_list, list) {</div><div class='add'>+	tt_vlan = (*tt_data)-&gt;vlan_data;</div><div class='add'>+	hlist_for_each_entry(vlan, &amp;orig_node-&gt;vlan_list, list) {</div><div class='ctx'> 		tt_vlan-&gt;vid = htons(vlan-&gt;vid);</div><div class='ctx'> 		tt_vlan-&gt;crc = htonl(vlan-&gt;tt.crc);</div><div class='add'>+		tt_vlan-&gt;reserved = 0;</div><div class='ctx'> </div><div class='ctx'> 		tt_vlan++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -907,7 +849,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_prepare_tvlv_local_data() - allocate and prepare the TT TVLV for</div><div class='ctx'>  *  this node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_data: uninitialised pointer to the address of the TVLV buffer</div><div class='ctx'>  * @tt_change: uninitialised pointer to the address of the area where the TT</div><div class='ctx'>  *  changes can be stored</div><div class='hunk'>@@ -929,7 +871,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,</div><div class='ctx'> 				  s32 *tt_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tvlv_tt_vlan_data *tt_vlan;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	u16 num_vlan = 0;</div><div class='ctx'> 	u16 vlan_entries = 0;</div><div class='ctx'> 	u16 total_entries = 0;</div><div class='hunk'>@@ -937,8 +879,8 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,</div><div class='ctx'> 	u8 *tt_change_ptr;</div><div class='ctx'> 	int change_offset;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	spin_lock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='add'>+	hlist_for_each_entry(vlan, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		vlan_entries = atomic_read(&amp;vlan-&gt;tt.num_entries);</div><div class='ctx'> 		if (vlan_entries &lt; 1)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -947,8 +889,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,</div><div class='ctx'> 		total_entries += vlan_entries;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	change_offset = sizeof(**tt_data);</div><div class='del'>-	change_offset += num_vlan * sizeof(*tt_vlan);</div><div class='add'>+	change_offset = struct_size(*tt_data, vlan_data, num_vlan);</div><div class='ctx'> </div><div class='ctx'> 	/* if tt_len is negative, allocate the space needed by the full table */</div><div class='ctx'> 	if (*tt_len &lt; 0)</div><div class='hunk'>@@ -967,14 +908,15 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,</div><div class='ctx'> 	(*tt_data)-&gt;ttvn = atomic_read(&amp;bat_priv-&gt;tt.vn);</div><div class='ctx'> 	(*tt_data)-&gt;num_vlan = htons(num_vlan);</div><div class='ctx'> </div><div class='del'>-	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	tt_vlan = (*tt_data)-&gt;vlan_data;</div><div class='add'>+	hlist_for_each_entry(vlan, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		vlan_entries = atomic_read(&amp;vlan-&gt;tt.num_entries);</div><div class='ctx'> 		if (vlan_entries &lt; 1)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		tt_vlan-&gt;vid = htons(vlan-&gt;vid);</div><div class='ctx'> 		tt_vlan-&gt;crc = htonl(vlan-&gt;tt.crc);</div><div class='add'>+		tt_vlan-&gt;reserved = 0;</div><div class='ctx'> </div><div class='ctx'> 		tt_vlan++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -983,14 +925,14 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,</div><div class='ctx'> 	*tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_bh(&amp;bat_priv-&gt;softif_vlan_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;bat_priv-&gt;meshif_vlan_list_lock);</div><div class='ctx'> 	return tvlv_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_tvlv_container_update() - update the translation table tvlv</div><div class='ctx'>  *  container after local tt changes have been committed</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1000,16 +942,25 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> 	int tt_diff_len, tt_change_len = 0;</div><div class='ctx'> 	int tt_diff_entries_num = 0;</div><div class='ctx'> 	int tt_diff_entries_count = 0;</div><div class='add'>+	bool drop_changes = false;</div><div class='add'>+	size_t tt_extra_len = 0;</div><div class='ctx'> 	u16 tvlv_len;</div><div class='ctx'> </div><div class='del'>-	tt_diff_entries_num = atomic_read(&amp;bat_priv-&gt;tt.local_changes);</div><div class='add'>+	tt_diff_entries_num = READ_ONCE(bat_priv-&gt;tt.local_changes);</div><div class='ctx'> 	tt_diff_len = batadv_tt_len(tt_diff_entries_num);</div><div class='ctx'> </div><div class='ctx'> 	/* if we have too many changes for one packet don't send any</div><div class='del'>-	 * and wait for the tt table request which will be fragmented</div><div class='add'>+	 * and wait for the tt table request so we can reply with the full</div><div class='add'>+	 * (fragmented) table.</div><div class='add'>+	 *</div><div class='add'>+	 * The local change history should still be cleaned up so the next</div><div class='add'>+	 * TT round can start again with a clean state.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tt_diff_len &gt; bat_priv-&gt;soft_iface-&gt;mtu)</div><div class='add'>+	if (tt_diff_len &gt; bat_priv-&gt;mesh_iface-&gt;mtu) {</div><div class='ctx'> 		tt_diff_len = 0;</div><div class='add'>+		tt_diff_entries_num = 0;</div><div class='add'>+		drop_changes = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &amp;tt_data,</div><div class='ctx'> 						     &amp;tt_change, &amp;tt_diff_len);</div><div class='hunk'>@@ -1018,11 +969,11 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> 	tt_data-&gt;flags = BATADV_TT_OGM_DIFF;</div><div class='ctx'> </div><div class='del'>-	if (tt_diff_len == 0)</div><div class='add'>+	if (!drop_changes &amp;&amp; tt_diff_len == 0)</div><div class='ctx'> 		goto container_register;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;bat_priv-&gt;tt.changes_list_lock);</div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;tt.local_changes, 0);</div><div class='add'>+	WRITE_ONCE(bat_priv-&gt;tt.local_changes, 0);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(entry, safe, &amp;bat_priv-&gt;tt.changes_list,</div><div class='ctx'> 				 list) {</div><div class='hunk'>@@ -1037,6 +988,9 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.changes_list_lock);</div><div class='ctx'> </div><div class='add'>+	tt_extra_len = batadv_tt_len(tt_diff_entries_num -</div><div class='add'>+				     tt_diff_entries_count);</div><div class='add'>+</div><div class='ctx'> 	/* Keep the buffer for possible tt_request */</div><div class='ctx'> 	spin_lock_bh(&amp;bat_priv-&gt;tt.last_changeset_lock);</div><div class='ctx'> 	kfree(bat_priv-&gt;tt.last_changeset);</div><div class='hunk'>@@ -1045,6 +999,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> 	tt_change_len = batadv_tt_len(tt_diff_entries_count);</div><div class='ctx'> 	/* check whether this new OGM has no changes due to size problems */</div><div class='ctx'> 	if (tt_diff_entries_count &gt; 0) {</div><div class='add'>+		tt_diff_len -= tt_extra_len;</div><div class='ctx'> 		/* if kmalloc() fails we will reply with the full table</div><div class='ctx'> 		 * instead of providing the diff</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1057,107 +1012,32 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.last_changeset_lock);</div><div class='ctx'> </div><div class='add'>+	/* Remove extra packet space for OGM */</div><div class='add'>+	tvlv_len -= tt_extra_len;</div><div class='ctx'> container_register:</div><div class='ctx'> 	batadv_tvlv_container_register(bat_priv, BATADV_TVLV_TT, 1, tt_data,</div><div class='ctx'> 				       tvlv_len);</div><div class='ctx'> 	kfree(tt_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_tt_local_seq_print_text() - Print the local tt table in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;tt.local_hash;</div><div class='del'>-	struct batadv_tt_common_entry *tt_common_entry;</div><div class='del'>-	struct batadv_tt_local_entry *tt_local;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	u32 i;</div><div class='del'>-	int last_seen_secs;</div><div class='del'>-	int last_seen_msecs;</div><div class='del'>-	unsigned long last_seen_jiffies;</div><div class='del'>-	bool no_purge;</div><div class='del'>-	u16 np_flag = BATADV_TT_CLIENT_NOPURGE;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n",</div><div class='del'>-		   net_dev-&gt;name, (u8)atomic_read(&amp;bat_priv-&gt;tt.vn));</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "       Client         VID Flags    Last seen (CRC       )\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(tt_common_entry,</div><div class='del'>-					 head, hash_entry) {</div><div class='del'>-			tt_local = container_of(tt_common_entry,</div><div class='del'>-						struct batadv_tt_local_entry,</div><div class='del'>-						common);</div><div class='del'>-			last_seen_jiffies = jiffies - tt_local-&gt;last_seen;</div><div class='del'>-			last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);</div><div class='del'>-			last_seen_secs = last_seen_msecs / 1000;</div><div class='del'>-			last_seen_msecs = last_seen_msecs % 1000;</div><div class='del'>-</div><div class='del'>-			no_purge = tt_common_entry-&gt;flags &amp; np_flag;</div><div class='del'>-			seq_printf(seq,</div><div class='del'>-				   " * %pM %4i [%c%c%c%c%c%c] %3u.%03u   (%#.8x)\n",</div><div class='del'>-				   tt_common_entry-&gt;addr,</div><div class='del'>-				   batadv_print_vid(tt_common_entry-&gt;vid),</div><div class='del'>-				   ((tt_common_entry-&gt;flags &amp;</div><div class='del'>-				     BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),</div><div class='del'>-				   no_purge ? 'P' : '.',</div><div class='del'>-				   ((tt_common_entry-&gt;flags &amp;</div><div class='del'>-				     BATADV_TT_CLIENT_NEW) ? 'N' : '.'),</div><div class='del'>-				   ((tt_common_entry-&gt;flags &amp;</div><div class='del'>-				     BATADV_TT_CLIENT_PENDING) ? 'X' : '.'),</div><div class='del'>-				   ((tt_common_entry-&gt;flags &amp;</div><div class='del'>-				     BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),</div><div class='del'>-				   ((tt_common_entry-&gt;flags &amp;</div><div class='del'>-				     BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),</div><div class='del'>-				   no_purge ? 0 : last_seen_secs,</div><div class='del'>-				   no_purge ? 0 : last_seen_msecs,</div><div class='del'>-				   tt_local-&gt;vlan-&gt;tt.crc);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_dump_entry() - Dump one TT local entry into a message</div><div class='ctx'>  * @msg :Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @common: tt local &amp; tt global common data</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Error code, or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_tt_local_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_tt_local_dump_entry(struct sk_buff *msg, u32 portid,</div><div class='add'>+			   struct netlink_callback *cb,</div><div class='ctx'> 			   struct batadv_priv *bat_priv,</div><div class='ctx'> 			   struct batadv_tt_common_entry *common)</div><div class='ctx'> {</div><div class='ctx'> 	void *hdr;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	struct batadv_tt_local_entry *local;</div><div class='ctx'> 	unsigned int last_seen_msecs;</div><div class='ctx'> 	u32 crc;</div><div class='hunk'>@@ -1165,20 +1045,22 @@ batadv_tt_local_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'> 	local = container_of(common, struct batadv_tt_local_entry, common);</div><div class='ctx'> 	last_seen_msecs = jiffies_to_msecs(jiffies - local-&gt;last_seen);</div><div class='ctx'> </div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, common-&gt;vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, common-&gt;vid);</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	crc = vlan-&gt;tt.crc;</div><div class='ctx'> </div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> </div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;batadv_netlink_family,</div><div class='del'>-			  NLM_F_MULTI,</div><div class='add'>+	hdr = genlmsg_put(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;batadv_netlink_family,  NLM_F_MULTI,</div><div class='ctx'> 			  BATADV_CMD_GET_TRANSTABLE_LOCAL);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='ctx'> 	if (nla_put(msg, BATADV_ATTR_TT_ADDRESS, ETH_ALEN, common-&gt;addr) ||</div><div class='ctx'> 	    nla_put_u32(msg, BATADV_ATTR_TT_CRC32, crc) ||</div><div class='ctx'> 	    nla_put_u16(msg, BATADV_ATTR_TT_VID, common-&gt;vid) ||</div><div class='hunk'>@@ -1201,34 +1083,39 @@ batadv_tt_local_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * batadv_tt_local_dump_bucket() - Dump one TT local bucket into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='del'>- * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='del'>- * @head: Pointer to the list containing the local tt entries</div><div class='add'>+ * @cb: Control block containing additional options</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='add'>+ * @hash: hash to dump</div><div class='add'>+ * @bucket: bucket index to dump</div><div class='ctx'>  * @idx_s: Number of entries to skip</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Error code, or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-batadv_tt_local_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='add'>+batadv_tt_local_dump_bucket(struct sk_buff *msg, u32 portid,</div><div class='add'>+			    struct netlink_callback *cb,</div><div class='ctx'> 			    struct batadv_priv *bat_priv,</div><div class='del'>-			    struct hlist_head *head, int *idx_s)</div><div class='add'>+			    struct batadv_hashtable *hash, unsigned int bucket,</div><div class='add'>+			    int *idx_s)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tt_common_entry *common;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(common, head, hash_entry) {</div><div class='add'>+	spin_lock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='add'>+	cb-&gt;seq = atomic_read(&amp;hash-&gt;generation) &lt;&lt; 1 | 1;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(common, &amp;hash-&gt;table[bucket], hash_entry) {</div><div class='ctx'> 		if (idx++ &lt; *idx_s)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (batadv_tt_local_dump_entry(msg, portid, seq, bat_priv,</div><div class='add'>+		if (batadv_tt_local_dump_entry(msg, portid, cb, bat_priv,</div><div class='ctx'> 					       common)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+			spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> 			*idx_s = idx - 1;</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hash-&gt;list_locks[bucket]);</div><div class='ctx'> </div><div class='ctx'> 	*idx_s = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1243,29 +1130,20 @@ batadv_tt_local_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  */</div><div class='ctx'> int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct batadv_hashtable *hash;</div><div class='del'>-	struct hlist_head *head;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int bucket = cb-&gt;args[0];</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh, BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (!primary_if || primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='hunk'>@@ -1276,10 +1154,8 @@ int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	hash = bat_priv-&gt;tt.local_hash;</div><div class='ctx'> </div><div class='ctx'> 	while (bucket &lt; hash-&gt;size) {</div><div class='del'>-		head = &amp;hash-&gt;table[bucket];</div><div class='del'>-</div><div class='del'>-		if (batadv_tt_local_dump_bucket(msg, portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						bat_priv, head, &amp;idx))</div><div class='add'>+		if (batadv_tt_local_dump_bucket(msg, portid, cb, bat_priv,</div><div class='add'>+						hash, bucket, &amp;idx))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		bucket++;</div><div class='hunk'>@@ -1288,10 +1164,8 @@ int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = bucket;</div><div class='ctx'> 	cb-&gt;args[1] = idx;</div><div class='hunk'>@@ -1320,7 +1194,7 @@ batadv_tt_local_set_pending(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_remove() - logically remove an entry from the local table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the MAC address of the client to remove</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  * @message: message to append to the log on deletion</div><div class='hunk'>@@ -1332,9 +1206,10 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> 			   unsigned short vid, const char *message,</div><div class='ctx'> 			   bool roaming)</div><div class='ctx'> {</div><div class='add'>+	struct batadv_tt_local_entry *tt_removed_entry;</div><div class='ctx'> 	struct batadv_tt_local_entry *tt_local_entry;</div><div class='ctx'> 	u16 flags, curr_flags = BATADV_NO_FLAGS;</div><div class='del'>-	void *tt_entry_exists;</div><div class='add'>+	struct hlist_node *tt_removed_node;</div><div class='ctx'> </div><div class='ctx'> 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);</div><div class='ctx'> 	if (!tt_local_entry)</div><div class='hunk'>@@ -1363,26 +1238,28 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);</div><div class='ctx'> </div><div class='del'>-	tt_entry_exists = batadv_hash_remove(bat_priv-&gt;tt.local_hash,</div><div class='add'>+	tt_removed_node = batadv_hash_remove(bat_priv-&gt;tt.local_hash,</div><div class='ctx'> 					     batadv_compare_tt,</div><div class='ctx'> 					     batadv_choose_tt,</div><div class='ctx'> 					     &amp;tt_local_entry-&gt;common);</div><div class='del'>-	if (!tt_entry_exists)</div><div class='add'>+	if (!tt_removed_node)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* extra call to free the local tt entry */</div><div class='del'>-	batadv_tt_local_entry_put(tt_local_entry);</div><div class='add'>+	/* drop reference of remove hash entry */</div><div class='add'>+	tt_removed_entry = hlist_entry(tt_removed_node,</div><div class='add'>+				       struct batadv_tt_local_entry,</div><div class='add'>+				       common.hash_entry);</div><div class='add'>+	batadv_tt_local_entry_put(tt_removed_entry);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (tt_local_entry)</div><div class='del'>-		batadv_tt_local_entry_put(tt_local_entry);</div><div class='add'>+	batadv_tt_local_entry_put(tt_local_entry);</div><div class='ctx'> </div><div class='ctx'> 	return curr_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_purge_list() - purge inactive tt local entries</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @head: pointer to the list containing the local tt entries</div><div class='ctx'>  * @timeout: parameter deciding whether a given tt local entry is considered</div><div class='ctx'>  *  inactive or not</div><div class='hunk'>@@ -1417,7 +1294,7 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_purge() - purge inactive tt local entries</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @timeout: parameter deciding whether a given tt local entry is considered</div><div class='ctx'>  *  inactive or not</div><div class='ctx'>  */</div><div class='hunk'>@@ -1504,7 +1381,7 @@ static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv)</div><div class='ctx'> 		kmem_cache_free(batadv_tt_change_cache, entry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;bat_priv-&gt;tt.local_changes, 0);</div><div class='add'>+	WRITE_ONCE(bat_priv-&gt;tt.local_changes, 0);</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.changes_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1645,15 +1522,14 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global,</div><div class='ctx'> sync_flags:</div><div class='ctx'> 	batadv_tt_global_sync_flags(tt_global);</div><div class='ctx'> out:</div><div class='del'>-	if (orig_entry)</div><div class='del'>-		batadv_tt_orig_list_entry_put(orig_entry);</div><div class='add'>+	batadv_tt_orig_list_entry_put(orig_entry);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;tt_global-&gt;list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_add() - add a new TT global entry or update an existing one</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the originator announcing the client</div><div class='ctx'>  * @tt_addr: the mac address of the non-mesh client</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='hunk'>@@ -1666,7 +1542,7 @@ out:</div><div class='ctx'>  * the function argument.</div><div class='ctx'>  * If a TT local entry exists for this non-mesh client remove it.</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold orig_node refcount.</div><div class='add'>+ * The caller must hold the orig_node refcount.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the new entry has been added, false otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -1819,19 +1695,17 @@ out_remove:</div><div class='ctx'> 		tt_global_entry-&gt;common.flags &amp;= ~BATADV_TT_CLIENT_ROAM;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (tt_global_entry)</div><div class='del'>-		batadv_tt_global_entry_put(tt_global_entry);</div><div class='del'>-	if (tt_local_entry)</div><div class='del'>-		batadv_tt_local_entry_put(tt_local_entry);</div><div class='add'>+	batadv_tt_global_entry_put(tt_global_entry);</div><div class='add'>+	batadv_tt_local_entry_put(tt_local_entry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_transtable_best_orig() - Get best originator list entry from tt entry</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_global_entry: global translation table entry to be analyzed</div><div class='ctx'>  *</div><div class='del'>- * This functon assumes the caller holds rcu_read_lock().</div><div class='add'>+ * This function assumes the caller holds rcu_read_lock().</div><div class='ctx'>  * Return: best originator list entry or NULL on errors.</div><div class='ctx'>  */</div><div class='ctx'> static struct batadv_tt_orig_list_entry *</div><div class='hunk'>@@ -1858,152 +1732,17 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* release the refcount for the "old" best */</div><div class='del'>-		if (best_router)</div><div class='del'>-			batadv_neigh_node_put(best_router);</div><div class='add'>+		batadv_neigh_node_put(best_router);</div><div class='ctx'> </div><div class='ctx'> 		best_entry = orig_entry;</div><div class='ctx'> 		best_router = router;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (best_router)</div><div class='del'>-		batadv_neigh_node_put(best_router);</div><div class='add'>+	batadv_neigh_node_put(best_router);</div><div class='ctx'> </div><div class='ctx'> 	return best_entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-/**</div><div class='del'>- * batadv_tt_global_print_entry() - print all orig nodes who announce the</div><div class='del'>- *  address for this global entry</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @tt_global_entry: global translation table entry to be printed</div><div class='del'>- * @seq: debugfs table seq_file struct</div><div class='del'>- *</div><div class='del'>- * This functon assumes the caller holds rcu_read_lock().</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-batadv_tt_global_print_entry(struct batadv_priv *bat_priv,</div><div class='del'>-			     struct batadv_tt_global_entry *tt_global_entry,</div><div class='del'>-			     struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct batadv_tt_orig_list_entry *orig_entry, *best_entry;</div><div class='del'>-	struct batadv_tt_common_entry *tt_common_entry;</div><div class='del'>-	struct batadv_orig_node_vlan *vlan;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	u8 last_ttvn;</div><div class='del'>-	u16 flags;</div><div class='del'>-</div><div class='del'>-	tt_common_entry = &amp;tt_global_entry-&gt;common;</div><div class='del'>-	flags = tt_common_entry-&gt;flags;</div><div class='del'>-</div><div class='del'>-	best_entry = batadv_transtable_best_orig(bat_priv, tt_global_entry);</div><div class='del'>-	if (best_entry) {</div><div class='del'>-		vlan = batadv_orig_node_vlan_get(best_entry-&gt;orig_node,</div><div class='del'>-						 tt_common_entry-&gt;vid);</div><div class='del'>-		if (!vlan) {</div><div class='del'>-			seq_printf(seq,</div><div class='del'>-				   " * Cannot retrieve VLAN %d for originator %pM\n",</div><div class='del'>-				   batadv_print_vid(tt_common_entry-&gt;vid),</div><div class='del'>-				   best_entry-&gt;orig_node-&gt;orig);</div><div class='del'>-			goto print_list;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		last_ttvn = atomic_read(&amp;best_entry-&gt;orig_node-&gt;last_ttvn);</div><div class='del'>-		seq_printf(seq,</div><div class='del'>-			   " %c %pM %4i   (%3u) via %pM     (%3u)   (%#.8x) [%c%c%c%c]\n",</div><div class='del'>-			   '*', tt_global_entry-&gt;common.addr,</div><div class='del'>-			   batadv_print_vid(tt_global_entry-&gt;common.vid),</div><div class='del'>-			   best_entry-&gt;ttvn, best_entry-&gt;orig_node-&gt;orig,</div><div class='del'>-			   last_ttvn, vlan-&gt;tt.crc,</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));</div><div class='del'>-</div><div class='del'>-		batadv_orig_node_vlan_put(vlan);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-print_list:</div><div class='del'>-	head = &amp;tt_global_entry-&gt;orig_list;</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(orig_entry, head, list) {</div><div class='del'>-		if (best_entry == orig_entry)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		vlan = batadv_orig_node_vlan_get(orig_entry-&gt;orig_node,</div><div class='del'>-						 tt_common_entry-&gt;vid);</div><div class='del'>-		if (!vlan) {</div><div class='del'>-			seq_printf(seq,</div><div class='del'>-				   " + Cannot retrieve VLAN %d for originator %pM\n",</div><div class='del'>-				   batadv_print_vid(tt_common_entry-&gt;vid),</div><div class='del'>-				   orig_entry-&gt;orig_node-&gt;orig);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		last_ttvn = atomic_read(&amp;orig_entry-&gt;orig_node-&gt;last_ttvn);</div><div class='del'>-		seq_printf(seq,</div><div class='del'>-			   " %c %pM %4d   (%3u) via %pM     (%3u)   (%#.8x) [%c%c%c%c]\n",</div><div class='del'>-			   '+', tt_global_entry-&gt;common.addr,</div><div class='del'>-			   batadv_print_vid(tt_global_entry-&gt;common.vid),</div><div class='del'>-			   orig_entry-&gt;ttvn, orig_entry-&gt;orig_node-&gt;orig,</div><div class='del'>-			   last_ttvn, vlan-&gt;tt.crc,</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),</div><div class='del'>-			   ((flags &amp; BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));</div><div class='del'>-</div><div class='del'>-		batadv_orig_node_vlan_put(vlan);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * batadv_tt_global_seq_print_text() - Print the global tt table in a seq file</div><div class='del'>- * @seq: seq file to print on</div><div class='del'>- * @offset: not used</div><div class='del'>- *</div><div class='del'>- * Return: always 0</div><div class='del'>- */</div><div class='del'>-int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	struct net_device *net_dev = (struct net_device *)seq-&gt;private;</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(net_dev);</div><div class='del'>-	struct batadv_hashtable *hash = bat_priv-&gt;tt.global_hash;</div><div class='del'>-	struct batadv_tt_common_entry *tt_common_entry;</div><div class='del'>-	struct batadv_tt_global_entry *tt_global;</div><div class='del'>-	struct batadv_hard_iface *primary_if;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	primary_if = batadv_seq_print_text_primary_if_get(seq);</div><div class='del'>-	if (!primary_if)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "Globally announced TT entries received via the mesh %s\n",</div><div class='del'>-		   net_dev-&gt;name);</div><div class='del'>-	seq_puts(seq,</div><div class='del'>-		 "       Client         VID  (TTVN)       Originator      (Curr TTVN) (CRC       ) Flags\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='del'>-		head = &amp;hash-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(tt_common_entry,</div><div class='del'>-					 head, hash_entry) {</div><div class='del'>-			tt_global = container_of(tt_common_entry,</div><div class='del'>-						 struct batadv_tt_global_entry,</div><div class='del'>-						 common);</div><div class='del'>-			batadv_tt_global_print_entry(bat_priv, tt_global, seq);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_dump_subentry() - Dump all TT local entries into a message</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='hunk'>@@ -2070,7 +1809,7 @@ batadv_tt_global_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @common: tt local &amp; tt global common data</div><div class='ctx'>  * @sub_s: Number of entries to skip</div><div class='ctx'>  *</div><div class='hunk'>@@ -2115,7 +1854,7 @@ batadv_tt_global_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  * @msg: Netlink message to dump into</div><div class='ctx'>  * @portid: Port making netlink request</div><div class='ctx'>  * @seq: Sequence number of netlink message</div><div class='del'>- * @bat_priv: The bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: The bat priv with all the mesh interface information</div><div class='ctx'>  * @head: Pointer to the list containing the global tt entries</div><div class='ctx'>  * @idx_s: Number of entries to skip</div><div class='ctx'>  * @sub: Number of entries to skip</div><div class='hunk'>@@ -2158,30 +1897,22 @@ batadv_tt_global_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,</div><div class='ctx'>  */</div><div class='ctx'> int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if = NULL;</div><div class='ctx'> 	struct batadv_hashtable *hash;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int ifindex;</div><div class='ctx'> 	int bucket = cb-&gt;args[0];</div><div class='ctx'> 	int idx = cb-&gt;args[1];</div><div class='ctx'> 	int sub = cb-&gt;args[2];</div><div class='ctx'> 	int portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='ctx'> </div><div class='del'>-	ifindex = batadv_netlink_get_ifindex(cb-&gt;nlh, BATADV_ATTR_MESH_IFINDEX);</div><div class='del'>-	if (!ifindex)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mesh_iface = batadv_netlink_get_meshif(cb);</div><div class='add'>+	if (IS_ERR(mesh_iface))</div><div class='add'>+		return PTR_ERR(mesh_iface);</div><div class='ctx'> </div><div class='del'>-	soft_iface = dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	primary_if = batadv_primary_if_get_selected(bat_priv);</div><div class='ctx'> 	if (!primary_if || primary_if-&gt;if_status != BATADV_IF_ACTIVE) {</div><div class='hunk'>@@ -2205,10 +1936,8 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='ctx'> 	ret = msg-&gt;len;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='del'>-	if (soft_iface)</div><div class='del'>-		dev_put(soft_iface);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='add'>+	dev_put(mesh_iface);</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = bucket;</div><div class='ctx'> 	cb-&gt;args[1] = idx;</div><div class='hunk'>@@ -2261,7 +1990,7 @@ batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_del_orig_node() - remove orig_node from a global tt entry</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_global_entry: the global entry to remove the orig_node from</div><div class='ctx'>  * @orig_node: the originator announcing the client</div><div class='ctx'>  * @message: message to append to the log on deletion</div><div class='hunk'>@@ -2340,7 +2069,7 @@ batadv_tt_global_del_roaming(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_del() - remove a client from the global table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: an originator serving this client</div><div class='ctx'>  * @addr: the mac address of the client</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='hunk'>@@ -2398,16 +2127,14 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (tt_global_entry)</div><div class='del'>-		batadv_tt_global_entry_put(tt_global_entry);</div><div class='del'>-	if (local_entry)</div><div class='del'>-		batadv_tt_local_entry_put(local_entry);</div><div class='add'>+	batadv_tt_global_entry_put(tt_global_entry);</div><div class='add'>+	batadv_tt_local_entry_put(local_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_del_orig() - remove all the TT global entries belonging to</div><div class='ctx'>  *  the given originator matching the provided vid</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the originator owning the entries to remove</div><div class='ctx'>  * @match_vid: the VLAN identifier to match. If negative all the entries will be</div><div class='ctx'>  *  removed</div><div class='hunk'>@@ -2578,7 +2305,7 @@ _batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_transtable_search() - get the mesh destination for a given client</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @src: mac address of the source client</div><div class='ctx'>  * @addr: mac address of the destination client</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='hunk'>@@ -2628,10 +2355,8 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (tt_global_entry)</div><div class='del'>-		batadv_tt_global_entry_put(tt_global_entry);</div><div class='del'>-	if (tt_local_entry)</div><div class='del'>-		batadv_tt_local_entry_put(tt_local_entry);</div><div class='add'>+	batadv_tt_global_entry_put(tt_global_entry);</div><div class='add'>+	batadv_tt_local_entry_put(tt_local_entry);</div><div class='ctx'> </div><div class='ctx'> 	return orig_node;</div><div class='ctx'> }</div><div class='hunk'>@@ -2639,7 +2364,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_crc() - calculates the checksum of the local table belonging</div><div class='ctx'>  *  to the given orig_node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: originator for which the CRC should be computed</div><div class='ctx'>  * @vid: VLAN identifier for which the CRC32 has to be computed</div><div class='ctx'>  *</div><div class='hunk'>@@ -2733,7 +2458,7 @@ static u32 batadv_tt_global_crc(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_crc() - calculates the checksum of the local table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @vid: VLAN identifier for which the CRC32 has to be computed</div><div class='ctx'>  *</div><div class='ctx'>  * For details about the computation, please refer to the documentation for</div><div class='hunk'>@@ -2808,6 +2533,9 @@ static void batadv_tt_req_node_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_req_node_put(struct batadv_tt_req_node *tt_req_node)</div><div class='ctx'> {</div><div class='add'>+	if (!tt_req_node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;tt_req_node-&gt;refcount, batadv_tt_req_node_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2865,7 +2593,7 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_req_node_new() - search and possibly create a tt_req_node object</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node this request is being issued for</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the pointer to the new tt_req_node struct if no request</div><div class='hunk'>@@ -2961,7 +2689,7 @@ static bool batadv_tt_global_valid(const void *entry_ptr,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_tvlv_generate() - fill the tvlv buff with the tt entries from the</div><div class='ctx'>  *  specified tt hash</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @hash: hash table containing the tt entries</div><div class='ctx'>  * @tt_len: expected tvlv tt data buffer length in number of bytes</div><div class='ctx'>  * @tvlv_buff: pointer to the buffer to fill with the TT data</div><div class='hunk'>@@ -2970,14 +2698,16 @@ static bool batadv_tt_global_valid(const void *entry_ptr,</div><div class='ctx'>  *</div><div class='ctx'>  * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb</div><div class='ctx'>  * is not provided then this becomes a no-op.</div><div class='add'>+ *</div><div class='add'>+ * Return: Remaining unused length in tvlv_buff.</div><div class='ctx'>  */</div><div class='del'>-static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,</div><div class='del'>-				    struct batadv_hashtable *hash,</div><div class='del'>-				    void *tvlv_buff, u16 tt_len,</div><div class='del'>-				    bool (*valid_cb)(const void *,</div><div class='del'>-						     const void *,</div><div class='del'>-						     u8 *flags),</div><div class='del'>-				    void *cb_data)</div><div class='add'>+static u16 batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,</div><div class='add'>+				   struct batadv_hashtable *hash,</div><div class='add'>+				   void *tvlv_buff, u16 tt_len,</div><div class='add'>+				   bool (*valid_cb)(const void *,</div><div class='add'>+						    const void *,</div><div class='add'>+						    u8 *flags),</div><div class='add'>+				   void *cb_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tt_common_entry *tt_common_entry;</div><div class='ctx'> 	struct batadv_tvlv_tt_change *tt_change;</div><div class='hunk'>@@ -2988,10 +2718,10 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	tt_tot = batadv_tt_entries(tt_len);</div><div class='del'>-	tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff;</div><div class='add'>+	tt_change = tvlv_buff;</div><div class='ctx'> </div><div class='ctx'> 	if (!valid_cb)</div><div class='del'>-		return;</div><div class='add'>+		return tt_len;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for (i = 0; i &lt; hash-&gt;size; i++) {</div><div class='hunk'>@@ -3017,6 +2747,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return batadv_tt_len(tt_tot - tt_num_entries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3078,15 +2810,15 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_update_crc() - update all the local CRCs</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_local_update_crc(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* recompute the global CRC for each VLAN */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;softif_vlan_list, list) {</div><div class='add'>+	hlist_for_each_entry_rcu(vlan, &amp;bat_priv-&gt;meshif_vlan_list, list) {</div><div class='ctx'> 		vlan-&gt;tt.crc = batadv_tt_local_crc(bat_priv, vlan-&gt;vid);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -3094,7 +2826,7 @@ static void batadv_tt_local_update_crc(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_update_crc() - update all the global CRCs for this orig_node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the orig_node for which the CRCs have to be updated</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -3121,7 +2853,7 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_tt_request() - send a TT Request message to a given node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @dst_orig_node: the destination of the message</div><div class='ctx'>  * @ttvn: the version number that the source of the message is looking for</div><div class='ctx'>  * @tt_vlan: pointer to the first tvlv VLAN object to request</div><div class='hunk'>@@ -3139,7 +2871,6 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;</div><div class='ctx'> 	struct batadv_tt_req_node *tt_req_node = NULL;</div><div class='del'>-	struct batadv_tvlv_tt_vlan_data *tt_vlan_req;</div><div class='ctx'> 	struct batadv_hard_iface *primary_if;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> 	int i, size;</div><div class='hunk'>@@ -3155,7 +2886,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 	if (!tt_req_node)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(*tvlv_tt_data) + sizeof(*tt_vlan_req) * num_vlan;</div><div class='add'>+	size = struct_size(tvlv_tt_data, vlan_data, num_vlan);</div><div class='ctx'> 	tvlv_tt_data = kzalloc(size, GFP_ATOMIC);</div><div class='ctx'> 	if (!tvlv_tt_data)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3167,12 +2898,10 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 	/* send all the CRCs within the request. This is needed by intermediate</div><div class='ctx'> 	 * nodes to ensure they have the correct table before replying</div><div class='ctx'> 	 */</div><div class='del'>-	tt_vlan_req = (struct batadv_tvlv_tt_vlan_data *)(tvlv_tt_data + 1);</div><div class='ctx'> 	for (i = 0; i &lt; num_vlan; i++) {</div><div class='del'>-		tt_vlan_req-&gt;vid = tt_vlan-&gt;vid;</div><div class='del'>-		tt_vlan_req-&gt;crc = tt_vlan-&gt;crc;</div><div class='add'>+		tvlv_tt_data-&gt;vlan_data[i].vid = tt_vlan-&gt;vid;</div><div class='add'>+		tvlv_tt_data-&gt;vlan_data[i].crc = tt_vlan-&gt;crc;</div><div class='ctx'> </div><div class='del'>-		tt_vlan_req++;</div><div class='ctx'> 		tt_vlan++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3189,8 +2918,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,</div><div class='ctx'> 	ret = true;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &amp;&amp; tt_req_node) {</div><div class='ctx'> 		spin_lock_bh(&amp;bat_priv-&gt;tt.req_list_lock);</div><div class='hunk'>@@ -3201,8 +2929,7 @@ out:</div><div class='ctx'> 		spin_unlock_bh(&amp;bat_priv-&gt;tt.req_list_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tt_req_node)</div><div class='del'>-		batadv_tt_req_node_put(tt_req_node);</div><div class='add'>+	batadv_tt_req_node_put(tt_req_node);</div><div class='ctx'> </div><div class='ctx'> 	kfree(tvlv_tt_data);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3211,7 +2938,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_other_tt_response() - send reply to tt request concerning another</div><div class='ctx'>  *  node's translation table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_data: tt data containing the tt request information</div><div class='ctx'>  * @req_src: mac address of tt request sender</div><div class='ctx'>  * @req_dst: mac address of tt request recipient</div><div class='hunk'>@@ -3226,7 +2953,6 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_orig_node *res_dst_orig_node = NULL;</div><div class='ctx'> 	struct batadv_tvlv_tt_change *tt_change;</div><div class='ctx'> 	struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;</div><div class='del'>-	struct batadv_tvlv_tt_vlan_data *tt_vlan;</div><div class='ctx'> 	bool ret = false, full_table;</div><div class='ctx'> 	u8 orig_ttvn, req_ttvn;</div><div class='ctx'> 	u16 tvlv_len;</div><div class='hunk'>@@ -3249,10 +2975,9 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> 	orig_ttvn = (u8)atomic_read(&amp;req_dst_orig_node-&gt;last_ttvn);</div><div class='ctx'> 	req_ttvn = tt_data-&gt;ttvn;</div><div class='ctx'> </div><div class='del'>-	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(tt_data + 1);</div><div class='ctx'> 	/* this node doesn't have the requested data */</div><div class='ctx'> 	if (orig_ttvn != req_ttvn ||</div><div class='del'>-	    !batadv_tt_global_check_crc(req_dst_orig_node, tt_vlan,</div><div class='add'>+	    !batadv_tt_global_check_crc(req_dst_orig_node, tt_data-&gt;vlan_data,</div><div class='ctx'> 					ntohs(tt_data-&gt;num_vlan)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3294,16 +3019,17 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* fill the rest of the tvlv with the real TT entries */</div><div class='del'>-		batadv_tt_tvlv_generate(bat_priv, bat_priv-&gt;tt.global_hash,</div><div class='del'>-					tt_change, tt_len,</div><div class='del'>-					batadv_tt_global_valid,</div><div class='del'>-					req_dst_orig_node);</div><div class='add'>+		tvlv_len -= batadv_tt_tvlv_generate(bat_priv,</div><div class='add'>+						    bat_priv-&gt;tt.global_hash,</div><div class='add'>+						    tt_change, tt_len,</div><div class='add'>+						    batadv_tt_global_valid,</div><div class='add'>+						    req_dst_orig_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't send the response, if larger than fragmented packet. */</div><div class='ctx'> 	tt_len = sizeof(struct batadv_unicast_tvlv_packet) + tvlv_len;</div><div class='ctx'> 	if (tt_len &gt; atomic_read(&amp;bat_priv-&gt;packet_size_max)) {</div><div class='del'>-		net_ratelimited_function(batadv_info, bat_priv-&gt;soft_iface,</div><div class='add'>+		net_ratelimited_function(batadv_info, bat_priv-&gt;mesh_iface,</div><div class='ctx'> 					 "Ignoring TT_REQUEST from %pM; Response size exceeds max packet size.\n",</div><div class='ctx'> 					 res_dst_orig_node-&gt;orig);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3333,10 +3059,8 @@ unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;req_dst_orig_node-&gt;tt_buff_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (res_dst_orig_node)</div><div class='del'>-		batadv_orig_node_put(res_dst_orig_node);</div><div class='del'>-	if (req_dst_orig_node)</div><div class='del'>-		batadv_orig_node_put(req_dst_orig_node);</div><div class='add'>+	batadv_orig_node_put(res_dst_orig_node);</div><div class='add'>+	batadv_orig_node_put(req_dst_orig_node);</div><div class='ctx'> 	kfree(tvlv_tt_data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3344,7 +3068,7 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_my_tt_response() - send reply to tt request concerning this</div><div class='ctx'>  *  node's translation table</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_data: tt data containing the tt request information</div><div class='ctx'>  * @req_src: mac address of tt request sender</div><div class='ctx'>  *</div><div class='hunk'>@@ -3423,9 +3147,11 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* fill the rest of the tvlv with the real TT entries */</div><div class='del'>-		batadv_tt_tvlv_generate(bat_priv, bat_priv-&gt;tt.local_hash,</div><div class='del'>-					tt_change, tt_len,</div><div class='del'>-					batadv_tt_local_valid, NULL);</div><div class='add'>+		tvlv_len -= batadv_tt_tvlv_generate(bat_priv,</div><div class='add'>+						    bat_priv-&gt;tt.local_hash,</div><div class='add'>+						    tt_change, tt_len,</div><div class='add'>+						    batadv_tt_local_valid,</div><div class='add'>+						    NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tvlv_tt_data-&gt;flags = BATADV_TT_RESPONSE;</div><div class='hunk'>@@ -3450,10 +3176,8 @@ unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.last_changeset_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.commit_lock);</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> 	kfree(tvlv_tt_data);</div><div class='ctx'> 	/* The packet was for this host, so it doesn't need to be re-routed */</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -3461,7 +3185,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_tt_response() - send reply to tt request</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_data: tt data containing the tt request information</div><div class='ctx'>  * @req_src: mac address of tt request sender</div><div class='ctx'>  * @req_dst: mac address of tt request recipient</div><div class='hunk'>@@ -3538,8 +3262,7 @@ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,</div><div class='ctx'> 	atomic_set(&amp;orig_node-&gt;last_ttvn, ttvn);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_tt_update_changes(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -3557,7 +3280,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_is_my_client() - check if a client is served by the local node</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client to check</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -3580,14 +3303,13 @@ bool batadv_is_my_client(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	if (tt_local_entry)</div><div class='del'>-		batadv_tt_local_entry_put(tt_local_entry);</div><div class='add'>+	batadv_tt_local_entry_put(tt_local_entry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_handle_tt_response() - process incoming tt reply</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tt_data: tt data containing the tt request information</div><div class='ctx'>  * @resp_src: mac address of tt reply sender</div><div class='ctx'>  * @num_entries: number of tt change entries appended to the tt data</div><div class='hunk'>@@ -3601,7 +3323,6 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> 	struct batadv_orig_node *orig_node = NULL;</div><div class='ctx'> 	struct batadv_tvlv_tt_change *tt_change;</div><div class='ctx'> 	u8 *tvlv_ptr = (u8 *)tt_data;</div><div class='del'>-	u16 change_offset;</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_TT, bat_priv,</div><div class='ctx'> 		   "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n",</div><div class='hunk'>@@ -3614,10 +3335,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;orig_node-&gt;tt_lock);</div><div class='ctx'> </div><div class='del'>-	change_offset = sizeof(struct batadv_tvlv_tt_vlan_data);</div><div class='del'>-	change_offset *= ntohs(tt_data-&gt;num_vlan);</div><div class='del'>-	change_offset += sizeof(*tt_data);</div><div class='del'>-	tvlv_ptr += change_offset;</div><div class='add'>+	tvlv_ptr += struct_size(tt_data, vlan_data, ntohs(tt_data-&gt;num_vlan));</div><div class='ctx'> </div><div class='ctx'> 	tt_change = (struct batadv_tvlv_tt_change *)tvlv_ptr;</div><div class='ctx'> 	if (tt_data-&gt;flags &amp; BATADV_TT_FULL_TABLE) {</div><div class='hunk'>@@ -3644,8 +3362,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;bat_priv-&gt;tt.req_list_lock);</div><div class='ctx'> out:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv)</div><div class='hunk'>@@ -3680,7 +3397,7 @@ static void batadv_tt_roam_purge(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_check_roam_count() - check if a client has roamed too frequently</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @client: mac address of the roaming client</div><div class='ctx'>  *</div><div class='ctx'>  * This function checks whether the client already reached the</div><div class='hunk'>@@ -3735,7 +3452,7 @@ unlock:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_send_roam_adv() - send a roaming advertisement message</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @client: mac address of the roaming client</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  * @orig_node: message destination</div><div class='hunk'>@@ -3776,8 +3493,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, u8 *client,</div><div class='ctx'> 				 &amp;tvlv_roam, sizeof(tvlv_roam));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (primary_if)</div><div class='del'>-		batadv_hardif_put(primary_if);</div><div class='add'>+	batadv_hardif_put(primary_if);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void batadv_tt_purge(struct work_struct *work)</div><div class='hunk'>@@ -3800,11 +3516,13 @@ static void batadv_tt_purge(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * batadv_tt_free() - Free translation table of soft interface</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * batadv_tt_free() - Free translation table of mesh interface</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_tt_free(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='add'>+	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_ROAM, 1);</div><div class='add'>+</div><div class='ctx'> 	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_TT, 1);</div><div class='ctx'> 	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_TT, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -3822,7 +3540,7 @@ void batadv_tt_free(struct batadv_priv *bat_priv)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_set_flags() - set or unset the specified flags on the local</div><div class='ctx'>  *  table and possibly count them in the TT size</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @flags: the flag to switch</div><div class='ctx'>  * @enable: whether to set or unset the flag</div><div class='ctx'>  * @count: whether to increase the TT size by the number of changed entries</div><div class='hunk'>@@ -3908,7 +3626,7 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_commit_changes_nolock() - commit all pending local tt changes</div><div class='ctx'>  *  which have been queued in the time since the last commit</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must hold tt-&gt;commit_lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3916,7 +3634,7 @@ static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;bat_priv-&gt;tt.commit_lock);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;bat_priv-&gt;tt.local_changes) &lt; 1) {</div><div class='add'>+	if (READ_ONCE(bat_priv-&gt;tt.local_changes) == 0) {</div><div class='ctx'> 		if (!batadv_atomic_dec_not_zero(&amp;bat_priv-&gt;tt.ogm_append_cnt))</div><div class='ctx'> 			batadv_tt_tvlv_container_update(bat_priv);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3941,7 +3659,7 @@ static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_commit_changes() - commit all pending local tt changes which</div><div class='ctx'>  *  have been queued in the time since the last commit</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  */</div><div class='ctx'> void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -3952,7 +3670,7 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_is_ap_isolated() - Check if packet from upper layer should be dropped</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @src: source mac address of packet</div><div class='ctx'>  * @dst: destination mac address of packet</div><div class='ctx'>  * @vid: vlan id of packet</div><div class='hunk'>@@ -3964,10 +3682,10 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, u8 *src, u8 *dst,</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tt_local_entry *tt_local_entry;</div><div class='ctx'> 	struct batadv_tt_global_entry *tt_global_entry;</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='del'>-	vlan = batadv_softif_vlan_get(bat_priv, vid);</div><div class='add'>+	vlan = batadv_meshif_vlan_get(bat_priv, vid);</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -3989,14 +3707,14 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, u8 *src, u8 *dst,</div><div class='ctx'> local_entry_put:</div><div class='ctx'> 	batadv_tt_local_entry_put(tt_local_entry);</div><div class='ctx'> vlan_put:</div><div class='del'>-	batadv_softif_vlan_put(vlan);</div><div class='add'>+	batadv_meshif_vlan_put(vlan);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_update_orig() - update global translation table with new tt</div><div class='ctx'>  *  information received via ogms</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: the orig_node of the ogm</div><div class='ctx'>  * @tt_buff: pointer to the first tvlv VLAN entry</div><div class='ctx'>  * @tt_num_vlan: number of tvlv VLAN entries</div><div class='hunk'>@@ -4080,7 +3798,7 @@ request_table:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_client_is_roaming() - check if a client is marked as roaming</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client to check</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -4106,7 +3824,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_client_is_roaming() - tells whether the client is roaming</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the local client to query</div><div class='ctx'>  * @vid: VLAN identifier</div><div class='ctx'>  *</div><div class='hunk'>@@ -4132,7 +3850,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_add_temporary_global_entry() - Add temporary entry to global TT</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig_node: orig node which the temporary entry should be associated with</div><div class='ctx'>  * @addr: mac address of the client</div><div class='ctx'>  * @vid: VLAN id of the new temporary global translation table</div><div class='hunk'>@@ -4165,21 +3883,21 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_local_resize_to_mtu() - resize the local translation table fit the</div><div class='ctx'>  *  maximum packet size that can be transported through the mesh</div><div class='del'>- * @soft_iface: netdev struct of the mesh interface</div><div class='add'>+ * @mesh_iface: netdev struct of the mesh interface</div><div class='ctx'>  *</div><div class='ctx'>  * Remove entries older than 'timeout' and half timeout if more entries need</div><div class='ctx'>  * to be removed.</div><div class='ctx'>  */</div><div class='del'>-void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface)</div><div class='add'>+void batadv_tt_local_resize_to_mtu(struct net_device *mesh_iface)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_priv *bat_priv = netdev_priv(soft_iface);</div><div class='add'>+	struct batadv_priv *bat_priv = netdev_priv(mesh_iface);</div><div class='ctx'> 	int packet_size_max = atomic_read(&amp;bat_priv-&gt;packet_size_max);</div><div class='ctx'> 	int table_size, timeout = BATADV_TT_LOCAL_TIMEOUT / 2;</div><div class='ctx'> 	bool reduced = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;bat_priv-&gt;tt.commit_lock);</div><div class='ctx'> </div><div class='del'>-	while (true) {</div><div class='add'>+	while (timeout) {</div><div class='ctx'> 		table_size = batadv_tt_local_table_transmit_size(bat_priv);</div><div class='ctx'> 		if (packet_size_max &gt;= table_size)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4189,7 +3907,7 @@ void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface)</div><div class='ctx'> </div><div class='ctx'> 		timeout /= 2;</div><div class='ctx'> 		reduced = true;</div><div class='del'>-		net_ratelimited_function(batadv_info, soft_iface,</div><div class='add'>+		net_ratelimited_function(batadv_info, mesh_iface,</div><div class='ctx'> 					 "Forced to purge local tt entries to fit new maximum fragment MTU (%i)\n",</div><div class='ctx'> 					 packet_size_max);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4205,7 +3923,7 @@ void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_tvlv_ogm_handler_v1() - process incoming tt tvlv container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @orig: the orig_node of the ogm</div><div class='ctx'>  * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the gateway data</div><div class='hunk'>@@ -4216,36 +3934,35 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> 					  u8 flags, void *tvlv_value,</div><div class='ctx'> 					  u16 tvlv_value_len)</div><div class='ctx'> {</div><div class='del'>-	struct batadv_tvlv_tt_vlan_data *tt_vlan;</div><div class='ctx'> 	struct batadv_tvlv_tt_change *tt_change;</div><div class='ctx'> 	struct batadv_tvlv_tt_data *tt_data;</div><div class='ctx'> 	u16 num_entries, num_vlan;</div><div class='add'>+	size_t tt_data_sz;</div><div class='ctx'> </div><div class='ctx'> 	if (tvlv_value_len &lt; sizeof(*tt_data))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;</div><div class='del'>-	tvlv_value_len -= sizeof(*tt_data);</div><div class='del'>-</div><div class='add'>+	tt_data = tvlv_value;</div><div class='ctx'> 	num_vlan = ntohs(tt_data-&gt;num_vlan);</div><div class='ctx'> </div><div class='del'>-	if (tvlv_value_len &lt; sizeof(*tt_vlan) * num_vlan)</div><div class='add'>+	tt_data_sz = struct_size(tt_data, vlan_data, num_vlan);</div><div class='add'>+	if (tvlv_value_len &lt; tt_data_sz)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(tt_data + 1);</div><div class='del'>-	tt_change = (struct batadv_tvlv_tt_change *)(tt_vlan + num_vlan);</div><div class='del'>-	tvlv_value_len -= sizeof(*tt_vlan) * num_vlan;</div><div class='add'>+	tt_change = (struct batadv_tvlv_tt_change *)((void *)tt_data</div><div class='add'>+						     + tt_data_sz);</div><div class='add'>+	tvlv_value_len -= tt_data_sz;</div><div class='ctx'> </div><div class='ctx'> 	num_entries = batadv_tt_entries(tvlv_value_len);</div><div class='ctx'> </div><div class='del'>-	batadv_tt_update_orig(bat_priv, orig, tt_vlan, num_vlan, tt_change,</div><div class='del'>-			      num_entries, tt_data-&gt;ttvn);</div><div class='add'>+	batadv_tt_update_orig(bat_priv, orig, tt_data-&gt;vlan_data, num_vlan,</div><div class='add'>+			      tt_change, num_entries, tt_data-&gt;ttvn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_tvlv_unicast_handler_v1() - process incoming (unicast) tt tvlv</div><div class='ctx'>  *  container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @src: mac address of tt tvlv sender</div><div class='ctx'>  * @dst: mac address of tt tvlv recipient</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the tt data</div><div class='hunk'>@@ -4267,11 +3984,11 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> 	if (tvlv_value_len &lt; sizeof(*tt_data))</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;</div><div class='add'>+	tt_data = tvlv_value;</div><div class='ctx'> 	tvlv_value_len -= sizeof(*tt_data);</div><div class='ctx'> </div><div class='del'>-	tt_vlan_len = sizeof(struct batadv_tvlv_tt_vlan_data);</div><div class='del'>-	tt_vlan_len *= ntohs(tt_data-&gt;num_vlan);</div><div class='add'>+	tt_vlan_len = flex_array_size(tt_data, vlan_data,</div><div class='add'>+				      ntohs(tt_data-&gt;num_vlan));</div><div class='ctx'> </div><div class='ctx'> 	if (tvlv_value_len &lt; tt_vlan_len)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='hunk'>@@ -4327,7 +4044,7 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_roam_tvlv_unicast_handler_v1() - process incoming tt roam tvlv</div><div class='ctx'>  *  container</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @src: mac address of tt tvlv sender</div><div class='ctx'>  * @dst: mac address of tt tvlv recipient</div><div class='ctx'>  * @tvlv_value: tvlv buffer containing the tt data</div><div class='hunk'>@@ -4359,7 +4076,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);</div><div class='del'>-	roaming_adv = (struct batadv_tvlv_roam_adv *)tvlv_value;</div><div class='add'>+	roaming_adv = tvlv_value;</div><div class='ctx'> </div><div class='ctx'> 	batadv_dbg(BATADV_DBG_TT, bat_priv,</div><div class='ctx'> 		   "Received ROAMING_ADV from %pM (client %pM)\n",</div><div class='hunk'>@@ -4370,14 +4087,13 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,</div><div class='ctx'> 			     atomic_read(&amp;orig_node-&gt;last_ttvn) + 1);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (orig_node)</div><div class='del'>-		batadv_orig_node_put(orig_node);</div><div class='add'>+	batadv_orig_node_put(orig_node);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_init() - initialise the translation table internals</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success or negative error number in case of failure.</div><div class='ctx'>  */</div><div class='hunk'>@@ -4393,15 +4109,17 @@ int batadv_tt_init(struct batadv_priv *bat_priv)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = batadv_tt_global_init(bat_priv);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		batadv_tt_local_table_free(bat_priv);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	batadv_tvlv_handler_register(bat_priv, batadv_tt_tvlv_ogm_handler_v1,</div><div class='del'>-				     batadv_tt_tvlv_unicast_handler_v1,</div><div class='add'>+				     batadv_tt_tvlv_unicast_handler_v1, NULL,</div><div class='ctx'> 				     BATADV_TVLV_TT, 1, BATADV_NO_FLAGS);</div><div class='ctx'> </div><div class='ctx'> 	batadv_tvlv_handler_register(bat_priv, NULL,</div><div class='del'>-				     batadv_roam_tvlv_unicast_handler_v1,</div><div class='add'>+				     batadv_roam_tvlv_unicast_handler_v1, NULL,</div><div class='ctx'> 				     BATADV_TVLV_ROAM, 1, BATADV_NO_FLAGS);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;bat_priv-&gt;tt.work, batadv_tt_purge);</div><div class='hunk'>@@ -4413,7 +4131,7 @@ int batadv_tt_init(struct batadv_priv *bat_priv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tt_global_is_isolated() - check if a client is marked as isolated</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @addr: the mac address of the client</div><div class='ctx'>  * @vid: the identifier of the VLAN where this client is connected</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h<br/>index 01b6c8eafaf9..618d9dbca5ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/translation-table.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/translation-table.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/translation-table.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/translation-table.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich, Antonio Quartulli</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_</div><div class='hunk'>@@ -21,26 +9,27 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct netlink_callback;</div><div class='del'>-struct net_device;</div><div class='del'>-struct seq_file;</div><div class='del'>-struct sk_buff;</div><div class='del'>-</div><div class='ctx'> int batadv_tt_init(struct batadv_priv *bat_priv);</div><div class='del'>-bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,</div><div class='add'>+bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr,</div><div class='ctx'> 			 unsigned short vid, int ifindex, u32 mark);</div><div class='ctx'> u16 batadv_tt_local_remove(struct batadv_priv *bat_priv,</div><div class='ctx'> 			   const u8 *addr, unsigned short vid,</div><div class='ctx'> 			   const char *message, bool roaming);</div><div class='del'>-int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset);</div><div class='del'>-int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);</div><div class='ctx'> int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb);</div><div class='ctx'> void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,</div><div class='ctx'> 			       struct batadv_orig_node *orig_node,</div><div class='ctx'> 			       s32 match_vid, const char *message);</div><div class='add'>+struct batadv_tt_global_entry *</div><div class='add'>+batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr,</div><div class='add'>+			   unsigned short vid);</div><div class='add'>+void batadv_tt_global_entry_release(struct kref *ref);</div><div class='ctx'> int batadv_tt_global_hash_count(struct batadv_priv *bat_priv,</div><div class='ctx'> 				const u8 *addr, unsigned short vid);</div><div class='ctx'> struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,</div><div class='hunk'>@@ -56,7 +45,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv,</div><div class='ctx'> 					u8 *addr, unsigned short vid);</div><div class='ctx'> bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv,</div><div class='ctx'> 				       u8 *addr, unsigned short vid);</div><div class='del'>-void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface);</div><div class='add'>+void batadv_tt_local_resize_to_mtu(struct net_device *mesh_iface);</div><div class='ctx'> bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,</div><div class='ctx'> 					  struct batadv_orig_node *orig_node,</div><div class='ctx'> 					  const unsigned char *addr,</div><div class='hunk'>@@ -67,4 +56,19 @@ bool batadv_tt_global_is_isolated(struct batadv_priv *bat_priv,</div><div class='ctx'> int batadv_tt_cache_init(void);</div><div class='ctx'> void batadv_tt_cache_destroy(void);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * batadv_tt_global_entry_put() - decrement the tt_global_entry refcounter and</div><div class='add'>+ *  possibly release it</div><div class='add'>+ * @tt_global_entry: tt_global_entry to be free'd</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry)</div><div class='add'>+{</div><div class='add'>+	if (!tt_global_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;tt_global_entry-&gt;common.refcount,</div><div class='add'>+		 batadv_tt_global_entry_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */</div><div class='head'>diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c<br/>index 40e69c9346d2..76dff1f9c559 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tvlv.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tvlv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tvlv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/tvlv.c</a></div><div class='hunk'>@@ -1,28 +1,16 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='hunk'>@@ -62,13 +50,16 @@ static void batadv_tvlv_handler_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tvlv_handler_put(struct batadv_tvlv_handler *tvlv_handler)</div><div class='ctx'> {</div><div class='add'>+	if (!tvlv_handler)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;tvlv_handler-&gt;refcount, batadv_tvlv_handler_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_handler_get() - retrieve tvlv handler from the tvlv handler list</div><div class='ctx'>  *  based on the provided type and version (both need to match)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @type: tvlv handler type to look for</div><div class='ctx'>  * @version: tvlv handler version to look for</div><div class='ctx'>  *</div><div class='hunk'>@@ -118,13 +109,16 @@ static void batadv_tvlv_container_release(struct kref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static void batadv_tvlv_container_put(struct batadv_tvlv_container *tvlv)</div><div class='ctx'> {</div><div class='add'>+	if (!tvlv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	kref_put(&amp;tvlv-&gt;refcount, batadv_tvlv_container_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_get() - retrieve tvlv container from the tvlv container</div><div class='ctx'>  *  list based on the provided type and version (both need to match)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @type: tvlv container type to look for</div><div class='ctx'>  * @version: tvlv container version to look for</div><div class='ctx'>  *</div><div class='hunk'>@@ -158,7 +152,7 @@ batadv_tvlv_container_get(struct batadv_priv *bat_priv, u8 type, u8 version)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_list_size() - calculate the size of the tvlv container</div><div class='ctx'>  *  list entries</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  *</div><div class='ctx'>  * Has to be called with the appropriate locks being acquired</div><div class='ctx'>  * (tvlv.container_list_lock).</div><div class='hunk'>@@ -183,7 +177,7 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_remove() - remove tvlv container from the tvlv</div><div class='ctx'>  *  container list</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tvlv: the to be removed tvlv container</div><div class='ctx'>  *</div><div class='ctx'>  * Has to be called with the appropriate locks being acquired</div><div class='hunk'>@@ -207,7 +201,7 @@ static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_unregister() - unregister tvlv container based on the</div><div class='ctx'>  *  provided type and version (both need to match)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @type: tvlv container type to unregister</div><div class='ctx'>  * @version: tvlv container type to unregister</div><div class='ctx'>  */</div><div class='hunk'>@@ -225,7 +219,7 @@ void batadv_tvlv_container_unregister(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_register() - register tvlv type, version and content</div><div class='ctx'>  *  to be propagated with each (primary interface) OGM</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @type: tvlv container type</div><div class='ctx'>  * @version: tvlv container version</div><div class='ctx'>  * @tvlv_value: tvlv container content</div><div class='hunk'>@@ -303,7 +297,7 @@ static bool batadv_tvlv_realloc_packet_buff(unsigned char **packet_buff,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_container_ogm_append() - append tvlv container content to given</div><div class='ctx'>  *  OGM packet buffer</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @packet_buff: ogm packet buffer</div><div class='ctx'>  * @packet_buff_len: ogm packet buffer size including ogm header and tvlv</div><div class='ctx'>  *  content</div><div class='hunk'>@@ -356,29 +350,33 @@ end:</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_call_handler() - parse the given tvlv buffer to call the</div><div class='ctx'>  *  appropriate handlers</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @tvlv_handler: tvlv callback function handling the tvlv content</div><div class='del'>- * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet</div><div class='add'>+ * @packet_type: indicates for which packet type the TVLV handler is called</div><div class='ctx'>  * @orig_node: orig node emitting the ogm packet</div><div class='del'>- * @src: source mac address of the unicast packet</div><div class='del'>- * @dst: destination mac address of the unicast packet</div><div class='add'>+ * @skb: the skb the TVLV handler is called for</div><div class='ctx'>  * @tvlv_value: tvlv content</div><div class='ctx'>  * @tvlv_value_len: tvlv content length</div><div class='ctx'>  *</div><div class='del'>- * Return: success if handler was not found or the return value of the handler</div><div class='del'>- * callback.</div><div class='add'>+ * Return: success if the handler was not found or the return value of the</div><div class='add'>+ * handler callback.</div><div class='ctx'>  */</div><div class='ctx'> static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> 				    struct batadv_tvlv_handler *tvlv_handler,</div><div class='del'>-				    bool ogm_source,</div><div class='add'>+				    u8 packet_type,</div><div class='ctx'> 				    struct batadv_orig_node *orig_node,</div><div class='del'>-				    u8 *src, u8 *dst,</div><div class='del'>-				    void *tvlv_value, u16 tvlv_value_len)</div><div class='add'>+				    struct sk_buff *skb, void *tvlv_value,</div><div class='add'>+				    u16 tvlv_value_len)</div><div class='ctx'> {</div><div class='add'>+	unsigned int tvlv_offset;</div><div class='add'>+	u8 *src, *dst;</div><div class='add'>+</div><div class='ctx'> 	if (!tvlv_handler)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	if (ogm_source) {</div><div class='add'>+	switch (packet_type) {</div><div class='add'>+	case BATADV_IV_OGM:</div><div class='add'>+	case BATADV_OGM2:</div><div class='ctx'> 		if (!tvlv_handler-&gt;ogm_handler)</div><div class='ctx'> 			return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='hunk'>@@ -389,19 +387,32 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> 					  BATADV_NO_FLAGS,</div><div class='ctx'> 					  tvlv_value, tvlv_value_len);</div><div class='ctx'> 		tvlv_handler-&gt;flags |= BATADV_TVLV_HANDLER_OGM_CALLED;</div><div class='del'>-	} else {</div><div class='del'>-		if (!src)</div><div class='del'>-			return NET_RX_SUCCESS;</div><div class='del'>-</div><div class='del'>-		if (!dst)</div><div class='add'>+		break;</div><div class='add'>+	case BATADV_UNICAST_TVLV:</div><div class='add'>+		if (!skb)</div><div class='ctx'> 			return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 		if (!tvlv_handler-&gt;unicast_handler)</div><div class='ctx'> 			return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='add'>+		src = ((struct batadv_unicast_tvlv_packet *)skb-&gt;data)-&gt;src;</div><div class='add'>+		dst = ((struct batadv_unicast_tvlv_packet *)skb-&gt;data)-&gt;dst;</div><div class='add'>+</div><div class='ctx'> 		return tvlv_handler-&gt;unicast_handler(bat_priv, src,</div><div class='ctx'> 						     dst, tvlv_value,</div><div class='ctx'> 						     tvlv_value_len);</div><div class='add'>+	case BATADV_MCAST:</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NET_RX_SUCCESS;</div><div class='add'>+</div><div class='add'>+		if (!tvlv_handler-&gt;mcast_handler)</div><div class='add'>+			return NET_RX_SUCCESS;</div><div class='add'>+</div><div class='add'>+		tvlv_offset = (unsigned char *)tvlv_value - skb-&gt;data;</div><div class='add'>+		skb_set_network_header(skb, tvlv_offset);</div><div class='add'>+		skb_set_transport_header(skb, tvlv_offset + tvlv_value_len);</div><div class='add'>+</div><div class='add'>+		return tvlv_handler-&gt;mcast_handler(bat_priv, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='hunk'>@@ -410,11 +421,10 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_containers_process() - parse the given tvlv buffer to call the</div><div class='ctx'>  *  appropriate handlers</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='del'>- * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='add'>+ * @packet_type: indicates for which packet type the TVLV handler is called</div><div class='ctx'>  * @orig_node: orig node emitting the ogm packet</div><div class='del'>- * @src: source mac address of the unicast packet</div><div class='del'>- * @dst: destination mac address of the unicast packet</div><div class='add'>+ * @skb: the skb the TVLV handler is called for</div><div class='ctx'>  * @tvlv_value: tvlv content</div><div class='ctx'>  * @tvlv_value_len: tvlv content length</div><div class='ctx'>  *</div><div class='hunk'>@@ -422,10 +432,10 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv,</div><div class='ctx'>  * handler callbacks.</div><div class='ctx'>  */</div><div class='ctx'> int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,</div><div class='del'>-				   bool ogm_source,</div><div class='add'>+				   u8 packet_type,</div><div class='ctx'> 				   struct batadv_orig_node *orig_node,</div><div class='del'>-				   u8 *src, u8 *dst,</div><div class='del'>-				   void *tvlv_value, u16 tvlv_value_len)</div><div class='add'>+				   struct sk_buff *skb, void *tvlv_value,</div><div class='add'>+				   u16 tvlv_value_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tvlv_handler *tvlv_handler;</div><div class='ctx'> 	struct batadv_tvlv_hdr *tvlv_hdr;</div><div class='hunk'>@@ -447,21 +457,24 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,</div><div class='ctx'> 						       tvlv_hdr-&gt;version);</div><div class='ctx'> </div><div class='ctx'> 		ret |= batadv_tvlv_call_handler(bat_priv, tvlv_handler,</div><div class='del'>-						ogm_source, orig_node,</div><div class='del'>-						src, dst, tvlv_value,</div><div class='add'>+						packet_type, orig_node, skb,</div><div class='add'>+						tvlv_value,</div><div class='ctx'> 						tvlv_value_cont_len);</div><div class='del'>-		if (tvlv_handler)</div><div class='del'>-			batadv_tvlv_handler_put(tvlv_handler);</div><div class='add'>+		batadv_tvlv_handler_put(tvlv_handler);</div><div class='ctx'> 		tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len;</div><div class='ctx'> 		tvlv_value_len -= tvlv_value_cont_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ogm_source)</div><div class='add'>+	if (packet_type != BATADV_IV_OGM &amp;&amp;</div><div class='add'>+	    packet_type != BATADV_OGM2)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(tvlv_handler,</div><div class='ctx'> 				 &amp;bat_priv-&gt;tvlv.handler_list, list) {</div><div class='add'>+		if (!tvlv_handler-&gt;ogm_handler)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if ((tvlv_handler-&gt;flags &amp; BATADV_TVLV_HANDLER_OGM_CIFNOTFND) &amp;&amp;</div><div class='ctx'> 		    !(tvlv_handler-&gt;flags &amp; BATADV_TVLV_HANDLER_OGM_CALLED))</div><div class='ctx'> 			tvlv_handler-&gt;ogm_handler(bat_priv, orig_node,</div><div class='hunk'>@@ -477,7 +490,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_ogm_receive() - process an incoming ogm and call the appropriate</div><div class='ctx'>  *  handlers</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @batadv_ogm_packet: ogm packet containing the tvlv containers</div><div class='ctx'>  * @orig_node: orig node emitting the ogm packet</div><div class='ctx'>  */</div><div class='hunk'>@@ -497,7 +510,7 @@ void batadv_tvlv_ogm_receive(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	tvlv_value = batadv_ogm_packet + 1;</div><div class='ctx'> </div><div class='del'>-	batadv_tvlv_containers_process(bat_priv, true, orig_node, NULL, NULL,</div><div class='add'>+	batadv_tvlv_containers_process(bat_priv, BATADV_IV_OGM, orig_node, NULL,</div><div class='ctx'> 				       tvlv_value, tvlv_value_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -505,12 +518,16 @@ void batadv_tvlv_ogm_receive(struct batadv_priv *bat_priv,</div><div class='ctx'>  * batadv_tvlv_handler_register() - register tvlv handler based on the provided</div><div class='ctx'>  *  type and version (both need to match) for ogm tvlv payload and/or unicast</div><div class='ctx'>  *  payload</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @optr: ogm tvlv handler callback function. This function receives the orig</div><div class='ctx'>  *  node, flags and the tvlv content as argument to process.</div><div class='ctx'>  * @uptr: unicast tvlv handler callback function. This function receives the</div><div class='ctx'>  *  source &amp; destination of the unicast packet as well as the tvlv content</div><div class='ctx'>  *  to process.</div><div class='add'>+ * @mptr: multicast packet tvlv handler callback function. This function</div><div class='add'>+ *  receives the full skb to process, with the skb network header pointing</div><div class='add'>+ *  to the current tvlv and the skb transport header pointing to the first</div><div class='add'>+ *  byte after the current tvlv.</div><div class='ctx'>  * @type: tvlv handler type to be registered</div><div class='ctx'>  * @version: tvlv handler version to be registered</div><div class='ctx'>  * @flags: flags to enable or disable TVLV API behavior</div><div class='hunk'>@@ -525,6 +542,8 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv,</div><div class='ctx'> 					      u8 *src, u8 *dst,</div><div class='ctx'> 					      void *tvlv_value,</div><div class='ctx'> 					      u16 tvlv_value_len),</div><div class='add'>+				  int (*mptr)(struct batadv_priv *bat_priv,</div><div class='add'>+					      struct sk_buff *skb),</div><div class='ctx'> 				  u8 type, u8 version, u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_tvlv_handler *tvlv_handler;</div><div class='hunk'>@@ -546,6 +565,7 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv,</div><div class='ctx'> </div><div class='ctx'> 	tvlv_handler-&gt;ogm_handler = optr;</div><div class='ctx'> 	tvlv_handler-&gt;unicast_handler = uptr;</div><div class='add'>+	tvlv_handler-&gt;mcast_handler = mptr;</div><div class='ctx'> 	tvlv_handler-&gt;type = type;</div><div class='ctx'> 	tvlv_handler-&gt;version = version;</div><div class='ctx'> 	tvlv_handler-&gt;flags = flags;</div><div class='hunk'>@@ -563,7 +583,7 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_handler_unregister() - unregister tvlv handler based on the</div><div class='ctx'>  *  provided type and version (both need to match)</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @type: tvlv handler type to be unregistered</div><div class='ctx'>  * @version: tvlv handler version to be unregistered</div><div class='ctx'>  */</div><div class='hunk'>@@ -586,7 +606,7 @@ void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv,</div><div class='ctx'> /**</div><div class='ctx'>  * batadv_tvlv_unicast_send() - send a unicast packet with tvlv payload to the</div><div class='ctx'>  *  specified host</div><div class='del'>- * @bat_priv: the bat priv with all the soft interface information</div><div class='add'>+ * @bat_priv: the bat priv with all the mesh interface information</div><div class='ctx'>  * @src: source mac address of the unicast packet</div><div class='ctx'>  * @dst: destination mac address of the unicast packet</div><div class='ctx'>  * @type: tvlv type</div><div class='hunk'>@@ -594,8 +614,8 @@ void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv,</div><div class='ctx'>  * @tvlv_value: tvlv content</div><div class='ctx'>  * @tvlv_value_len: tvlv content length</div><div class='ctx'>  */</div><div class='del'>-void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,</div><div class='del'>-			      u8 *dst, u8 type, u8 version,</div><div class='add'>+void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, const u8 *src,</div><div class='add'>+			      const u8 *dst, u8 type, u8 version,</div><div class='ctx'> 			      void *tvlv_value, u16 tvlv_value_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;</div><div class='head'>diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h<br/>index ef5867f49824..e5697230d991 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tvlv.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/tvlv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/tvlv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/tvlv.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_TVLV_H_</div><div class='hunk'>@@ -21,9 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct batadv_ogm_packet;</div><div class='add'>+#include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> </div><div class='ctx'> void batadv_tvlv_container_register(struct batadv_priv *bat_priv,</div><div class='ctx'> 				    u8 type, u8 version,</div><div class='hunk'>@@ -47,16 +35,18 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv,</div><div class='ctx'> 					      u8 *src, u8 *dst,</div><div class='ctx'> 					      void *tvlv_value,</div><div class='ctx'> 					      u16 tvlv_value_len),</div><div class='add'>+				  int (*mptr)(struct batadv_priv *bat_priv,</div><div class='add'>+					      struct sk_buff *skb),</div><div class='ctx'> 				  u8 type, u8 version, u8 flags);</div><div class='ctx'> void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv,</div><div class='ctx'> 				    u8 type, u8 version);</div><div class='ctx'> int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,</div><div class='del'>-				   bool ogm_source,</div><div class='add'>+				   u8 packet_type,</div><div class='ctx'> 				   struct batadv_orig_node *orig_node,</div><div class='del'>-				   u8 *src, u8 *dst,</div><div class='del'>-				   void *tvlv_buff, u16 tvlv_buff_len);</div><div class='del'>-void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,</div><div class='del'>-			      u8 *dst, u8 type, u8 version,</div><div class='add'>+				   struct sk_buff *skb, void *tvlv_buff,</div><div class='add'>+				   u16 tvlv_buff_len);</div><div class='add'>+void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, const u8 *src,</div><div class='add'>+			      const u8 *dst, u8 type, u8 version,</div><div class='ctx'> 			      void *tvlv_value, u16 tvlv_value_len);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NET_BATMAN_ADV_TVLV_H_ */</div><div class='head'>diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h<br/>index 343d304851a5..8fc5fe0e9b05 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/batman-adv/types.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/batman-adv/types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/batman-adv/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/batman-adv/types.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:</div><div class='add'>+/* Copyright (C) B.A.T.M.A.N. contributors:</div><div class='ctx'>  *</div><div class='ctx'>  * Marek Lindner, Simon Wunderlich</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NET_BATMAN_ADV_TYPES_H_</div><div class='hunk'>@@ -26,20 +14,22 @@</div><div class='ctx'> #include &lt;linux/average.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/if.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt; /* for linux/wait.h */</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batman_adv.h&gt;</div><div class='ctx'> </div><div class='del'>-struct seq_file;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_DAT</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -91,6 +81,9 @@ struct batadv_hard_iface_bat_iv {</div><div class='ctx'> </div><div class='ctx'> 	/** @ogm_seqno: OGM sequence number - used to identify each OGM */</div><div class='ctx'> 	atomic_t ogm_seqno;</div><div class='add'>+</div><div class='add'>+	/** @ogm_buff_mutex: lock protecting ogm_buff and ogm_buff_len */</div><div class='add'>+	struct mutex ogm_buff_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -127,6 +120,15 @@ struct batadv_hard_iface_bat_v {</div><div class='ctx'> 	/** @elp_wq: workqueue used to schedule ELP transmissions */</div><div class='ctx'> 	struct delayed_work elp_wq;</div><div class='ctx'> </div><div class='add'>+	/** @aggr_wq: workqueue used to transmit queued OGM packets */</div><div class='add'>+	struct delayed_work aggr_wq;</div><div class='add'>+</div><div class='add'>+	/** @aggr_list: queue for to be aggregated OGM packets */</div><div class='add'>+	struct sk_buff_head aggr_list;</div><div class='add'>+</div><div class='add'>+	/** @aggr_len: size of the OGM aggregate (excluding ethernet header) */</div><div class='add'>+	unsigned int aggr_len;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @throughput_override: throughput override to disable link</div><div class='ctx'> 	 *  auto-detection</div><div class='hunk'>@@ -167,9 +169,6 @@ struct batadv_hard_iface {</div><div class='ctx'> 	/** @list: list node for batadv_hardif_list */</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='del'>-	/** @if_num: identificator of the interface */</div><div class='del'>-	unsigned int if_num;</div><div class='del'>-</div><div class='ctx'> 	/** @if_status: status of the interface for batman-adv */</div><div class='ctx'> 	char if_status;</div><div class='ctx'> </div><div class='hunk'>@@ -187,8 +186,8 @@ struct batadv_hard_iface {</div><div class='ctx'> 	/** @net_dev: pointer to the net_device */</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> </div><div class='del'>-	/** @hardif_obj: kobject of the per interface sysfs "mesh" directory */</div><div class='del'>-	struct kobject *hardif_obj;</div><div class='add'>+	/** @dev_tracker: device tracker for @net_dev */</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> </div><div class='ctx'> 	/** @refcount: number of contexts the object is used */</div><div class='ctx'> 	struct kref refcount;</div><div class='hunk'>@@ -200,14 +199,23 @@ struct batadv_hard_iface {</div><div class='ctx'> 	struct packet_type batman_adv_ptype;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @soft_iface: the batman-adv interface which uses this network</div><div class='add'>+	 * @mesh_iface: the batman-adv interface which uses this network</div><div class='ctx'> 	 *  interface</div><div class='ctx'> 	 */</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='add'>+</div><div class='add'>+	/** @meshif_dev_tracker: device tracker for @mesh_iface */</div><div class='add'>+	netdevice_tracker meshif_dev_tracker;</div><div class='ctx'> </div><div class='ctx'> 	/** @rcu: struct used for freeing in an RCU-safe manner */</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @hop_penalty: penalty which will be applied to the tq-field</div><div class='add'>+	 * of an OGM received via this interface</div><div class='add'>+	 */</div><div class='add'>+	atomic_t hop_penalty;</div><div class='add'>+</div><div class='ctx'> 	/** @bat_iv: per hard-interface B.A.T.M.A.N. IV data */</div><div class='ctx'> 	struct batadv_hard_iface_bat_iv bat_iv;</div><div class='ctx'> </div><div class='hunk'>@@ -216,13 +224,6 @@ struct batadv_hard_iface {</div><div class='ctx'> 	struct batadv_hard_iface_bat_v bat_v;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/**</div><div class='del'>-	 * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs</div><div class='del'>-	 */</div><div class='del'>-	struct dentry *debug_dir;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @neigh_list: list of unique single hop neighbors via this interface</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -233,6 +234,21 @@ struct batadv_hard_iface {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct batadv_orig_ifinfo_bat_iv - B.A.T.M.A.N. IV private orig_ifinfo</div><div class='add'>+ *  members</div><div class='add'>+ */</div><div class='add'>+struct batadv_orig_ifinfo_bat_iv {</div><div class='add'>+	/**</div><div class='add'>+	 * @bcast_own: bitfield which counts the number of our OGMs this</div><div class='add'>+	 * orig_node rebroadcasted "back" to us  (relative to last_real_seqno)</div><div class='add'>+	 */</div><div class='add'>+	DECLARE_BITMAP(bcast_own, BATADV_TQ_LOCAL_WINDOW_SIZE);</div><div class='add'>+</div><div class='add'>+	/** @bcast_own_sum: sum of bcast_own */</div><div class='add'>+	u8 bcast_own_sum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct batadv_orig_ifinfo - originator info per outgoing interface</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_orig_ifinfo {</div><div class='hunk'>@@ -257,6 +273,9 @@ struct batadv_orig_ifinfo {</div><div class='ctx'> 	/** @batman_seqno_reset: time when the batman seqno window was reset */</div><div class='ctx'> 	unsigned long batman_seqno_reset;</div><div class='ctx'> </div><div class='add'>+	/** @bat_iv: B.A.T.M.A.N. IV private structure */</div><div class='add'>+	struct batadv_orig_ifinfo_bat_iv bat_iv;</div><div class='add'>+</div><div class='ctx'> 	/** @refcount: number of contexts the object is used */</div><div class='ctx'> 	struct kref refcount;</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +293,7 @@ struct batadv_frag_table_entry {</div><div class='ctx'> 	/** @lock: lock to protect the list of fragments */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='del'>-	/** @timestamp: time (jiffie) of last received fragment */</div><div class='add'>+	/** @timestamp: time (jiffy) of last received fragment */</div><div class='ctx'> 	unsigned long timestamp;</div><div class='ctx'> </div><div class='ctx'> 	/** @seqno: sequence number of the fragments in the list */</div><div class='hunk'>@@ -339,19 +358,10 @@ struct batadv_orig_node_vlan {</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_orig_bat_iv {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @bcast_own: set of bitfields (one per hard-interface) where each one</div><div class='del'>-	 * counts the number of our OGMs this orig_node rebroadcasted "back" to</div><div class='del'>-	 * us  (relative to last_real_seqno). Every bitfield is</div><div class='del'>-	 * BATADV_TQ_LOCAL_WINDOW_SIZE bits long.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long *bcast_own;</div><div class='del'>-</div><div class='del'>-	/** @bcast_own_sum: sum of bcast_own */</div><div class='del'>-	u8 *bcast_own_sum;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @ogm_cnt_lock: lock protecting bcast_own, bcast_own_sum,</div><div class='del'>-	 * neigh_node-&gt;bat_iv.real_bits &amp; neigh_node-&gt;bat_iv.real_packet_count</div><div class='add'>+	 * @ogm_cnt_lock: lock protecting &amp;batadv_orig_ifinfo_bat_iv.bcast_own,</div><div class='add'>+	 * &amp;batadv_orig_ifinfo_bat_iv.bcast_own_sum,</div><div class='add'>+	 * &amp;batadv_neigh_ifinfo_bat_iv.bat_iv.real_bits and</div><div class='add'>+	 * &amp;batadv_neigh_ifinfo_bat_iv.real_packet_count</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t ogm_cnt_lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -409,6 +419,17 @@ struct batadv_orig_node {</div><div class='ctx'> 	 *  list</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct hlist_node mcast_want_all_ipv6_node;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @mcast_want_all_rtr4_node: a list node for the mcast.want_all_rtr4</div><div class='add'>+	 *  list</div><div class='add'>+	 */</div><div class='add'>+	struct hlist_node mcast_want_all_rtr4_node;</div><div class='add'>+	/**</div><div class='add'>+	 * @mcast_want_all_rtr6_node: a list node for the mcast.want_all_rtr6</div><div class='add'>+	 *  list</div><div class='add'>+	 */</div><div class='add'>+	struct hlist_node mcast_want_all_rtr6_node;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/** @capabilities: announced capabilities of this originator */</div><div class='hunk'>@@ -436,9 +457,9 @@ struct batadv_orig_node {</div><div class='ctx'> 	spinlock_t tt_buff_lock;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @tt_lock: prevents from updating the table while reading it. Table</div><div class='del'>-	 *  update is made up by two operations (data structure update and</div><div class='del'>-	 *  metdata -CRC/TTVN-recalculation) and they have to be executed</div><div class='add'>+	 * @tt_lock: avoids concurrent read from and write to the table. Table</div><div class='add'>+	 *  update is made up of two operations (data structure update and</div><div class='add'>+	 *  metadata -CRC/TTVN-recalculation) and they have to be executed</div><div class='ctx'> 	 *  atomically in order to avoid another thread to read the</div><div class='ctx'> 	 *  table/metadata between those.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -472,7 +493,7 @@ struct batadv_orig_node {</div><div class='ctx'> 	/** @hash_entry: hlist node for &amp;batadv_priv.orig_hash */</div><div class='ctx'> 	struct hlist_node hash_entry;</div><div class='ctx'> </div><div class='del'>-	/** @bat_priv: pointer to soft_iface this orig node belongs to */</div><div class='add'>+	/** @bat_priv: pointer to mesh_iface this orig node belongs to */</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='ctx'> 	/** @bcast_seqno_lock: lock protecting bcast_bits &amp; last_bcast_seqno */</div><div class='hunk'>@@ -484,20 +505,6 @@ struct batadv_orig_node {</div><div class='ctx'> 	/** @rcu: struct used for freeing in an RCU-safe manner */</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	/** @in_coding_list: list of nodes this orig can hear */</div><div class='del'>-	struct list_head in_coding_list;</div><div class='del'>-</div><div class='del'>-	/** @out_coding_list: list of nodes that can hear this orig */</div><div class='del'>-	struct list_head out_coding_list;</div><div class='del'>-</div><div class='del'>-	/** @in_coding_list_lock: protects in_coding_list */</div><div class='del'>-	spinlock_t in_coding_list_lock;</div><div class='del'>-</div><div class='del'>-	/** @out_coding_list_lock: protects out_coding_list */</div><div class='del'>-	spinlock_t out_coding_list_lock;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @fragments: array with heads for fragment chains */</div><div class='ctx'> 	struct batadv_frag_table_entry fragments[BATADV_FRAG_BUFFER_COUNT];</div><div class='ctx'> </div><div class='hunk'>@@ -524,9 +531,6 @@ enum batadv_orig_capabilities {</div><div class='ctx'> 	 */</div><div class='ctx'> 	BATADV_ORIG_CAPA_HAS_DAT,</div><div class='ctx'> </div><div class='del'>-	/** @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled */</div><div class='del'>-	BATADV_ORIG_CAPA_HAS_NC,</div><div class='del'>-</div><div class='ctx'> 	/** @BATADV_ORIG_CAPA_HAS_TT: orig node has tt capability */</div><div class='ctx'> 	BATADV_ORIG_CAPA_HAS_TT,</div><div class='ctx'> </div><div class='hunk'>@@ -581,9 +585,6 @@ struct batadv_hardif_neigh_node_bat_v {</div><div class='ctx'> 	 *  neighbor</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long last_unicast_tx;</div><div class='del'>-</div><div class='del'>-	/** @metric_work: work queue callback item for metric update */</div><div class='del'>-	struct work_struct metric_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -729,11 +730,11 @@ struct batadv_neigh_ifinfo {</div><div class='ctx'>  * struct batadv_bcast_duplist_entry - structure for LAN broadcast suppression</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_bcast_duplist_entry {</div><div class='del'>-	/** @orig: mac address of orig node orginating the broadcast */</div><div class='add'>+	/** @orig: mac address of orig node originating the broadcast */</div><div class='ctx'> 	u8 orig[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	/** @crc: crc32 checksum of broadcast payload */</div><div class='del'>-	__be32 crc;</div><div class='add'>+	u32 crc;</div><div class='ctx'> </div><div class='ctx'> 	/** @entrytime: time when the broadcast packet was received */</div><div class='ctx'> 	unsigned long entrytime;</div><div class='hunk'>@@ -847,82 +848,92 @@ enum batadv_counters {</div><div class='ctx'> 	 */</div><div class='ctx'> 	BATADV_CNT_TT_ROAM_ADV_RX,</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_MCAST</div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_DAT_GET_TX: transmitted dht GET traffic packet counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_TX: transmitted batman-adv multicast packets</div><div class='add'>+	 *  counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_DAT_GET_TX,</div><div class='del'>-</div><div class='del'>-	/** @BATADV_CNT_DAT_GET_RX: received dht GET traffic packet counter */</div><div class='del'>-	BATADV_CNT_DAT_GET_RX,</div><div class='add'>+	BATADV_CNT_MCAST_TX,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_DAT_PUT_TX: transmitted dht PUT traffic packet counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_TX_BYTES: transmitted batman-adv multicast packets</div><div class='add'>+	 *  bytes counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_DAT_PUT_TX,</div><div class='add'>+	BATADV_CNT_MCAST_TX_BYTES,</div><div class='ctx'> </div><div class='del'>-	/** @BATADV_CNT_DAT_PUT_RX: received dht PUT traffic packet counter */</div><div class='del'>-	BATADV_CNT_DAT_PUT_RX,</div><div class='add'>+	/**</div><div class='add'>+	 * @BATADV_CNT_MCAST_TX_LOCAL: counter for multicast packets which</div><div class='add'>+	 *  were locally encapsulated and transmitted as batman-adv multicast</div><div class='add'>+	 *  packets</div><div class='add'>+	 */</div><div class='add'>+	BATADV_CNT_MCAST_TX_LOCAL,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_DAT_CACHED_REPLY_TX: transmitted dat cache reply traffic</div><div class='del'>-	 *  packet counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_TX_LOCAL_BYTES: bytes counter for multicast packets</div><div class='add'>+	 *  which were locally encapsulated and transmitted as batman-adv</div><div class='add'>+	 *  multicast packets</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_DAT_CACHED_REPLY_TX,</div><div class='del'>-#endif</div><div class='add'>+	BATADV_CNT_MCAST_TX_LOCAL_BYTES,</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_CODE: transmitted nc-combined traffic packet counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_RX: received batman-adv multicast packet counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_CODE,</div><div class='add'>+	BATADV_CNT_MCAST_RX,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_CODE_BYTES: transmitted nc-combined traffic bytes</div><div class='del'>-	 *  counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_RX_BYTES: received batman-adv multicast packet</div><div class='add'>+	 *  bytes counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_CODE_BYTES,</div><div class='add'>+	BATADV_CNT_MCAST_RX_BYTES,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_RECODE: transmitted nc-recombined traffic packet</div><div class='del'>-	 *  counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_RX_LOCAL: counter for received batman-adv multicast</div><div class='add'>+	 *  packets which were forwarded to the local mesh interface</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_RECODE,</div><div class='add'>+	BATADV_CNT_MCAST_RX_LOCAL,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_RECODE_BYTES: transmitted nc-recombined traffic bytes</div><div class='del'>-	 *  counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_RX_LOCAL_BYTES: bytes counter for received</div><div class='add'>+	 *  batman-adv multicast packets which were forwarded to the local mesh</div><div class='add'>+	 *  interface</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_RECODE_BYTES,</div><div class='add'>+	BATADV_CNT_MCAST_RX_LOCAL_BYTES,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_BUFFER: counter for packets buffered for later nc</div><div class='del'>-	 *  decoding</div><div class='add'>+	 * @BATADV_CNT_MCAST_FWD: counter for received batman-adv multicast</div><div class='add'>+	 *  packets which were forwarded to other, neighboring nodes</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_BUFFER,</div><div class='add'>+	BATADV_CNT_MCAST_FWD,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_DECODE: received and nc-decoded traffic packet counter</div><div class='add'>+	 * @BATADV_CNT_MCAST_FWD_BYTES: bytes counter for received batman-adv</div><div class='add'>+	 *  multicast packets which were forwarded to other, neighboring nodes</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_DECODE,</div><div class='add'>+	BATADV_CNT_MCAST_FWD_BYTES,</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BATMAN_ADV_DAT</div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_DECODE_BYTES: received and nc-decoded traffic bytes</div><div class='del'>-	 *  counter</div><div class='add'>+	 * @BATADV_CNT_DAT_GET_TX: transmitted dht GET traffic packet counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_DECODE_BYTES,</div><div class='add'>+	BATADV_CNT_DAT_GET_TX,</div><div class='add'>+</div><div class='add'>+	/** @BATADV_CNT_DAT_GET_RX: received dht GET traffic packet counter */</div><div class='add'>+	BATADV_CNT_DAT_GET_RX,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_DECODE_FAILED: received and decode-failed traffic</div><div class='del'>-	 *  packet counter</div><div class='add'>+	 * @BATADV_CNT_DAT_PUT_TX: transmitted dht PUT traffic packet counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_DECODE_FAILED,</div><div class='add'>+	BATADV_CNT_DAT_PUT_TX,</div><div class='add'>+</div><div class='add'>+	/** @BATADV_CNT_DAT_PUT_RX: received dht PUT traffic packet counter */</div><div class='add'>+	BATADV_CNT_DAT_PUT_RX,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BATADV_CNT_NC_SNIFFED: counter for nc-decoded packets received in</div><div class='del'>-	 *  promisc mode.</div><div class='add'>+	 * @BATADV_CNT_DAT_CACHED_REPLY_TX: transmitted dat cache reply traffic</div><div class='add'>+	 *  packet counter</div><div class='ctx'> 	 */</div><div class='del'>-	BATADV_CNT_NC_SNIFFED,</div><div class='add'>+	BATADV_CNT_DAT_CACHED_REPLY_TX,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/** @BATADV_CNT_NUM: number of traffic counters */</div><div class='hunk'>@@ -943,7 +954,7 @@ struct batadv_priv_tt {</div><div class='ctx'> 	atomic_t ogm_append_cnt;</div><div class='ctx'> </div><div class='ctx'> 	/** @local_changes: changes registered in an originator interval */</div><div class='del'>-	atomic_t local_changes;</div><div class='add'>+	size_t local_changes;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @changes_list: tracks tt local changes within an originator interval</div><div class='hunk'>@@ -965,7 +976,7 @@ struct batadv_priv_tt {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head roam_list;</div><div class='ctx'> </div><div class='del'>-	/** @changes_list_lock: lock protecting changes_list */</div><div class='add'>+	/** @changes_list_lock: lock protecting changes_list &amp; local_changes */</div><div class='ctx'> 	spinlock_t changes_list_lock;</div><div class='ctx'> </div><div class='ctx'> 	/** @req_list_lock: lock protecting req_list */</div><div class='hunk'>@@ -991,8 +1002,8 @@ struct batadv_priv_tt {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @commit_lock: prevents from executing a local TT commit while reading</div><div class='del'>-	 *  the local table. The local TT commit is made up by two operations</div><div class='del'>-	 *  (data structure update and metdata -CRC/TTVN- recalculation) and</div><div class='add'>+	 *  the local table. The local TT commit is made up of two operations</div><div class='add'>+	 *  (data structure update and metadata -CRC/TTVN- recalculation) and</div><div class='ctx'> 	 *  they have to be executed atomically in order to avoid another thread</div><div class='ctx'> 	 *  to read the table/metadata between those.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1005,7 +1016,7 @@ struct batadv_priv_tt {</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct batadv_priv_bla - per mesh interface bridge loope avoidance data</div><div class='add'>+ * struct batadv_priv_bla - per mesh interface bridge loop avoidance data</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_priv_bla {</div><div class='ctx'> 	/** @num_requests: number of bla requests in flight */</div><div class='hunk'>@@ -1061,29 +1072,6 @@ struct batadv_priv_bla {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct batadv_priv_debug_log - debug logging data</div><div class='del'>- */</div><div class='del'>-struct batadv_priv_debug_log {</div><div class='del'>-	/** @log_buff: buffer holding the logs (ring bufer) */</div><div class='del'>-	char log_buff[BATADV_LOG_BUF_LEN];</div><div class='del'>-</div><div class='del'>-	/** @log_start: index of next character to read */</div><div class='del'>-	unsigned long log_start;</div><div class='del'>-</div><div class='del'>-	/** @log_end: index of next character to write */</div><div class='del'>-	unsigned long log_end;</div><div class='del'>-</div><div class='del'>-	/** @lock: lock protecting log_buff, log_start &amp; log_end */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-</div><div class='del'>-	/** @queue_wait: log reader's wait queue */</div><div class='del'>-	wait_queue_head_t queue_wait;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct batadv_priv_gw - per mesh interface gateway data</div><div class='ctx'>  */</div><div class='hunk'>@@ -1091,12 +1079,15 @@ struct batadv_priv_gw {</div><div class='ctx'> 	/** @gateway_list: list of available gateway nodes */</div><div class='ctx'> 	struct hlist_head gateway_list;</div><div class='ctx'> </div><div class='del'>-	/** @list_lock: lock protecting gateway_list &amp; curr_gw */</div><div class='add'>+	/** @list_lock: lock protecting gateway_list, curr_gw, generation */</div><div class='ctx'> 	spinlock_t list_lock;</div><div class='ctx'> </div><div class='ctx'> 	/** @curr_gw: pointer to currently selected gateway node */</div><div class='ctx'> 	struct batadv_gw_node __rcu *curr_gw;</div><div class='ctx'> </div><div class='add'>+	/** @generation: current (generation) sequence number */</div><div class='add'>+	unsigned int generation;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @mode: gateway operation: off, client or server (see batadv_gw_modes)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1173,6 +1164,26 @@ struct batadv_mcast_querier_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct batadv_mcast_mla_flags - flags for the querier, bridge and tvlv state</div><div class='add'>+ */</div><div class='add'>+struct batadv_mcast_mla_flags {</div><div class='add'>+	/** @querier_ipv4: the current state of an IGMP querier in the mesh */</div><div class='add'>+	struct batadv_mcast_querier_state querier_ipv4;</div><div class='add'>+</div><div class='add'>+	/** @querier_ipv6: the current state of an MLD querier in the mesh */</div><div class='add'>+	struct batadv_mcast_querier_state querier_ipv6;</div><div class='add'>+</div><div class='add'>+	/** @enabled: whether the multicast tvlv is currently enabled */</div><div class='add'>+	unsigned char enabled:1;</div><div class='add'>+</div><div class='add'>+	/** @bridged: whether the mesh interface has a bridge on top */</div><div class='add'>+	unsigned char bridged:1;</div><div class='add'>+</div><div class='add'>+	/** @tvlv_flags: the flags we have last sent in our mcast tvlv */</div><div class='add'>+	u8 tvlv_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct batadv_priv_mcast - per mesh interface mcast data</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_priv_mcast {</div><div class='hunk'>@@ -1200,20 +1211,27 @@ struct batadv_priv_mcast {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct hlist_head want_all_ipv6_list;</div><div class='ctx'> </div><div class='del'>-	/** @querier_ipv4: the current state of an IGMP querier in the mesh */</div><div class='del'>-	struct batadv_mcast_querier_state querier_ipv4;</div><div class='del'>-</div><div class='del'>-	/** @querier_ipv6: the current state of an MLD querier in the mesh */</div><div class='del'>-	struct batadv_mcast_querier_state querier_ipv6;</div><div class='add'>+	/**</div><div class='add'>+	 * @want_all_rtr4_list: a list of orig_nodes wanting all routable IPv4</div><div class='add'>+	 *  multicast traffic</div><div class='add'>+	 */</div><div class='add'>+	struct hlist_head want_all_rtr4_list;</div><div class='ctx'> </div><div class='del'>-	/** @flags: the flags we have last sent in our mcast tvlv */</div><div class='del'>-	u8 flags;</div><div class='add'>+	/**</div><div class='add'>+	 * @want_all_rtr6_list: a list of orig_nodes wanting all routable IPv6</div><div class='add'>+	 *  multicast traffic</div><div class='add'>+	 */</div><div class='add'>+	struct hlist_head want_all_rtr6_list;</div><div class='ctx'> </div><div class='del'>-	/** @enabled: whether the multicast tvlv is currently enabled */</div><div class='del'>-	unsigned char enabled:1;</div><div class='add'>+	/**</div><div class='add'>+	 * @mla_flags: flags for the querier, bridge and tvlv state</div><div class='add'>+	 */</div><div class='add'>+	struct batadv_mcast_mla_flags mla_flags;</div><div class='ctx'> </div><div class='del'>-	/** @bridged: whether the soft interface has a bridge on top */</div><div class='del'>-	unsigned char bridged:1;</div><div class='add'>+	/**</div><div class='add'>+	 * @mla_lock: a lock protecting mla_list and mla_flags</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t mla_lock;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP</div><div class='hunk'>@@ -1227,6 +1245,18 @@ struct batadv_priv_mcast {</div><div class='ctx'> 	/** @num_want_all_ipv6: counter for items in want_all_ipv6_list */</div><div class='ctx'> 	atomic_t num_want_all_ipv6;</div><div class='ctx'> </div><div class='add'>+	/** @num_want_all_rtr4: counter for items in want_all_rtr4_list */</div><div class='add'>+	atomic_t num_want_all_rtr4;</div><div class='add'>+</div><div class='add'>+	/** @num_want_all_rtr6: counter for items in want_all_rtr6_list */</div><div class='add'>+	atomic_t num_want_all_rtr6;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @num_no_mc_ptype_capa: counter for number of nodes without the</div><div class='add'>+	 *  BATADV_MCAST_HAVE_MC_PTYPE_CAPA flag</div><div class='add'>+	 */</div><div class='add'>+	atomic_t num_no_mc_ptype_capa;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @want_lists_lock: lock for protecting modifications to mcasts</div><div class='ctx'> 	 *  want_all_{unsnoopables,ipv4,ipv6}_list (traversals are rcu-locked)</div><div class='hunk'>@@ -1239,63 +1269,6 @@ struct batadv_priv_mcast {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct batadv_priv_nc - per mesh interface network coding private data</div><div class='del'>- */</div><div class='del'>-struct batadv_priv_nc {</div><div class='del'>-	/** @work: work queue callback item for cleanup */</div><div class='del'>-	struct delayed_work work;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/**</div><div class='del'>-	 * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs</div><div class='del'>-	 */</div><div class='del'>-	struct dentry *debug_dir;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @min_tq: only consider neighbors for encoding if neigh_tq &gt; min_tq</div><div class='del'>-	 */</div><div class='del'>-	u8 min_tq;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @max_fwd_delay: maximum packet forward delay to allow coding of</div><div class='del'>-	 *  packets</div><div class='del'>-	 */</div><div class='del'>-	u32 max_fwd_delay;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @max_buffer_time: buffer time for sniffed packets used to decoding</div><div class='del'>-	 */</div><div class='del'>-	u32 max_buffer_time;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @timestamp_fwd_flush: timestamp of last forward packet queue flush</div><div class='del'>-	 */</div><div class='del'>-	unsigned long timestamp_fwd_flush;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @timestamp_sniffed_purge: timestamp of last sniffed packet queue</div><div class='del'>-	 *  purge</div><div class='del'>-	 */</div><div class='del'>-	unsigned long timestamp_sniffed_purge;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @coding_hash: Hash table used to buffer skbs while waiting for</div><div class='del'>-	 *  another incoming skb to code it with. Skbs are added to the buffer</div><div class='del'>-	 *  just before being forwarded in routing.c</div><div class='del'>-	 */</div><div class='del'>-	struct batadv_hashtable *coding_hash;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @decoding_hash: Hash table used to buffer skbs that might be needed</div><div class='del'>-	 *  to decode a received coded skb. The buffer is used for 1) skbs</div><div class='del'>-	 *  arriving on the soft-interface; 2) skbs overheard on the</div><div class='del'>-	 *  hard-interface; and 3) skbs forwarded by batman-adv.</div><div class='del'>-	 */</div><div class='del'>-	struct batadv_hashtable *decoding_hash;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct batadv_tp_unacked - unacked packet meta-information</div><div class='ctx'>  *</div><div class='ctx'>  * This struct is supposed to represent a buffer unacked packet. However, since</div><div class='hunk'>@@ -1431,7 +1404,7 @@ struct batadv_tp_vars {</div><div class='ctx'> 	/** @unacked_lock: protect unacked_list */</div><div class='ctx'> 	spinlock_t unacked_lock;</div><div class='ctx'> </div><div class='del'>-	/** @last_recv_time: time time (jiffies) a msg was received */</div><div class='add'>+	/** @last_recv_time: time (jiffies) a msg was received */</div><div class='ctx'> 	unsigned long last_recv_time;</div><div class='ctx'> </div><div class='ctx'> 	/** @refcount: number of context where the object is used */</div><div class='hunk'>@@ -1442,25 +1415,22 @@ struct batadv_tp_vars {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct batadv_softif_vlan - per VLAN attributes set</div><div class='add'>+ * struct batadv_meshif_vlan - per VLAN attributes set</div><div class='ctx'>  */</div><div class='del'>-struct batadv_softif_vlan {</div><div class='add'>+struct batadv_meshif_vlan {</div><div class='ctx'> 	/** @bat_priv: pointer to the mesh object */</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='ctx'> 	/** @vid: VLAN identifier */</div><div class='ctx'> 	unsigned short vid;</div><div class='ctx'> </div><div class='del'>-	/** @kobj: kobject for sysfs vlan subdirectory */</div><div class='del'>-	struct kobject *kobj;</div><div class='del'>-</div><div class='ctx'> 	/** @ap_isolation: AP isolation state */</div><div class='ctx'> 	atomic_t ap_isolation;		/* boolean */</div><div class='ctx'> </div><div class='ctx'> 	/** @tt: TT private attributes (VLAN specific) */</div><div class='ctx'> 	struct batadv_vlan_tt tt;</div><div class='ctx'> </div><div class='del'>-	/** @list: list node for &amp;bat_priv.softif_vlan_list */</div><div class='add'>+	/** @list: list node for &amp;bat_priv.meshif_vlan_list */</div><div class='ctx'> 	struct hlist_node list;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -1473,7 +1443,7 @@ struct batadv_softif_vlan {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct batadv_priv_bat_v - B.A.T.M.A.N. V per soft-interface private data</div><div class='add'>+ * struct batadv_priv_bat_v - B.A.T.M.A.N. V per mesh-interface private data</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_priv_bat_v {</div><div class='ctx'> 	/** @ogm_buff: buffer holding the OGM packet */</div><div class='hunk'>@@ -1485,6 +1455,9 @@ struct batadv_priv_bat_v {</div><div class='ctx'> 	/** @ogm_seqno: OGM sequence number - used to identify each OGM */</div><div class='ctx'> 	atomic_t ogm_seqno;</div><div class='ctx'> </div><div class='add'>+	/** @ogm_buff_mutex: lock protecting ogm_buff and ogm_buff_len */</div><div class='add'>+	struct mutex ogm_buff_mutex;</div><div class='add'>+</div><div class='ctx'> 	/** @ogm_wq: workqueue used to schedule OGM transmissions */</div><div class='ctx'> 	struct delayed_work ogm_wq;</div><div class='ctx'> };</div><div class='hunk'>@@ -1499,8 +1472,14 @@ struct batadv_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_t mesh_state;</div><div class='ctx'> </div><div class='del'>-	/** @soft_iface: net device which holds this struct as private data */</div><div class='del'>-	struct net_device *soft_iface;</div><div class='add'>+	/** @mesh_iface: net device which holds this struct as private data */</div><div class='add'>+	struct net_device *mesh_iface;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @mtu_set_by_user: MTU was set once by user</div><div class='add'>+	 * protected by rtnl_lock</div><div class='add'>+	 */</div><div class='add'>+	int mtu_set_by_user;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @bat_counters: mesh internal traffic statistic counters (see</div><div class='hunk'>@@ -1557,6 +1536,12 @@ struct batadv_priv {</div><div class='ctx'> 	 *  node's sender/originating side</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_t multicast_mode;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @multicast_fanout: Maximum number of packet copies to generate for a</div><div class='add'>+	 *  multicast-to-unicast conversion</div><div class='add'>+	 */</div><div class='add'>+	atomic_t multicast_fanout;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/** @orig_interval: OGM broadcast interval in milliseconds */</div><div class='hunk'>@@ -1597,17 +1582,6 @@ struct batadv_priv {</div><div class='ctx'> 	/** @batman_queue_left: number of remaining OGM packet slots */</div><div class='ctx'> 	atomic_t batman_queue_left;</div><div class='ctx'> </div><div class='del'>-	/** @num_ifaces: number of interfaces assigned to this mesh interface */</div><div class='del'>-	unsigned int num_ifaces;</div><div class='del'>-</div><div class='del'>-	/** @mesh_obj: kobject for sysfs mesh subdirectory */</div><div class='del'>-	struct kobject *mesh_obj;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/** @debug_dir: dentry for debugfs batman-adv subdirectory */</div><div class='del'>-	struct dentry *debug_dir;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @forw_bat_list: list of aggregated OGMs that will be forwarded */</div><div class='ctx'> 	struct hlist_head forw_bat_list;</div><div class='ctx'> </div><div class='hunk'>@@ -1620,19 +1594,19 @@ struct batadv_priv {</div><div class='ctx'> 	/** @tp_list: list of tp sessions */</div><div class='ctx'> 	struct hlist_head tp_list;</div><div class='ctx'> </div><div class='del'>-	/** @tp_num: number of currently active tp sessions */</div><div class='add'>+	/** @orig_hash: hash table containing mesh participants (orig nodes) */</div><div class='ctx'> 	struct batadv_hashtable *orig_hash;</div><div class='ctx'> </div><div class='del'>-	/** @orig_hash: hash table containing mesh participants (orig nodes) */</div><div class='add'>+	/** @forw_bat_list_lock: lock protecting forw_bat_list */</div><div class='ctx'> 	spinlock_t forw_bat_list_lock;</div><div class='ctx'> </div><div class='del'>-	/** @forw_bat_list_lock: lock protecting forw_bat_list */</div><div class='add'>+	/** @forw_bcast_list_lock: lock protecting forw_bcast_list */</div><div class='ctx'> 	spinlock_t forw_bcast_list_lock;</div><div class='ctx'> </div><div class='del'>-	/** @forw_bcast_list_lock: lock protecting forw_bcast_list */</div><div class='add'>+	/** @tp_list_lock: spinlock protecting @tp_list */</div><div class='ctx'> 	spinlock_t tp_list_lock;</div><div class='ctx'> </div><div class='del'>-	/** @tp_list_lock: spinlock protecting @tp_list */</div><div class='add'>+	/** @tp_num: number of currently active tp sessions */</div><div class='ctx'> 	atomic_t tp_num;</div><div class='ctx'> </div><div class='ctx'> 	/** @orig_work: work queue callback item for orig node purging */</div><div class='hunk'>@@ -1648,24 +1622,19 @@ struct batadv_priv {</div><div class='ctx'> 	struct batadv_algo_ops *algo_ops;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @softif_vlan_list: a list of softif_vlan structs, one per VLAN</div><div class='add'>+	 * @meshif_vlan_list: a list of meshif_vlan structs, one per VLAN</div><div class='ctx'> 	 *  created on top of the mesh interface represented by this object</div><div class='ctx'> 	 */</div><div class='del'>-	struct hlist_head softif_vlan_list;</div><div class='add'>+	struct hlist_head meshif_vlan_list;</div><div class='ctx'> </div><div class='del'>-	/** @softif_vlan_list_lock: lock protecting softif_vlan_list */</div><div class='del'>-	spinlock_t softif_vlan_list_lock;</div><div class='add'>+	/** @meshif_vlan_list_lock: lock protecting meshif_vlan_list */</div><div class='add'>+	spinlock_t meshif_vlan_list_lock;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='del'>-	/** @bla: bridge loope avoidance data */</div><div class='add'>+	/** @bla: bridge loop avoidance data */</div><div class='ctx'> 	struct batadv_priv_bla bla;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUG</div><div class='del'>-	/** @debug_log: holding debug logging relevant data */</div><div class='del'>-	struct batadv_priv_debug_log *debug_log;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @gw: gateway data */</div><div class='ctx'> 	struct batadv_priv_gw gw;</div><div class='ctx'> </div><div class='hunk'>@@ -1685,61 +1654,12 @@ struct batadv_priv {</div><div class='ctx'> 	struct batadv_priv_mcast mcast;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_NC</div><div class='del'>-	/**</div><div class='del'>-	 * @network_coding: bool indicating whether network coding is enabled</div><div class='del'>-	 */</div><div class='del'>-	atomic_t network_coding;</div><div class='del'>-</div><div class='del'>-	/** @nc: network coding data */</div><div class='del'>-	struct batadv_priv_nc nc;</div><div class='del'>-#endif /* CONFIG_BATMAN_ADV_NC */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BATMAN_V</div><div class='del'>-	/** @bat_v: B.A.T.M.A.N. V per soft-interface private data */</div><div class='add'>+	/** @bat_v: B.A.T.M.A.N. V per mesh-interface private data */</div><div class='ctx'> 	struct batadv_priv_bat_v bat_v;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct batadv_socket_client - layer2 icmp socket client data</div><div class='del'>- */</div><div class='del'>-struct batadv_socket_client {</div><div class='del'>-	/**</div><div class='del'>-	 * @queue_list: packet queue for packets destined for this socket client</div><div class='del'>-	 */</div><div class='del'>-	struct list_head queue_list;</div><div class='del'>-</div><div class='del'>-	/** @queue_len: number of packets in the packet queue (queue_list) */</div><div class='del'>-	unsigned int queue_len;</div><div class='del'>-</div><div class='del'>-	/** @index: socket client's index in the batadv_socket_client_hash */</div><div class='del'>-	unsigned char index;</div><div class='del'>-</div><div class='del'>-	/** @lock: lock protecting queue_list, queue_len &amp; index */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-</div><div class='del'>-	/** @queue_wait: socket client's wait queue */</div><div class='del'>-	wait_queue_head_t queue_wait;</div><div class='del'>-</div><div class='del'>-	/** @bat_priv: pointer to soft_iface this client belongs to */</div><div class='del'>-	struct batadv_priv *bat_priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct batadv_socket_packet - layer2 icmp packet for socket client</div><div class='del'>- */</div><div class='del'>-struct batadv_socket_packet {</div><div class='del'>-	/** @list: list node for &amp;batadv_socket_client.queue_list */</div><div class='del'>-	struct list_head list;</div><div class='del'>-</div><div class='del'>-	/** @icmp_len: size of the layer2 icmp packet */</div><div class='del'>-	size_t icmp_len;</div><div class='del'>-</div><div class='del'>-	/** @icmp_packet: layer2 icmp packet */</div><div class='del'>-	u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BATMAN_ADV_BLA</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1758,7 +1678,7 @@ struct batadv_bla_backbone_gw {</div><div class='ctx'> 	/** @hash_entry: hlist node for &amp;batadv_priv_bla.backbone_hash */</div><div class='ctx'> 	struct hlist_node hash_entry;</div><div class='ctx'> </div><div class='del'>-	/** @bat_priv: pointer to soft_iface this backbone gateway belongs to */</div><div class='add'>+	/** @bat_priv: pointer to mesh_iface this backbone gateway belongs to */</div><div class='ctx'> 	struct batadv_priv *bat_priv;</div><div class='ctx'> </div><div class='ctx'> 	/** @lasttime: last time we heard of this backbone gw */</div><div class='hunk'>@@ -1863,8 +1783,8 @@ struct batadv_tt_local_entry {</div><div class='ctx'> 	/** @last_seen: timestamp used for purging stale tt local entries */</div><div class='ctx'> 	unsigned long last_seen;</div><div class='ctx'> </div><div class='del'>-	/** @vlan: soft-interface vlan of the entry */</div><div class='del'>-	struct batadv_softif_vlan *vlan;</div><div class='add'>+	/** @vlan: mesh-interface vlan of the entry */</div><div class='add'>+	struct batadv_meshif_vlan *vlan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1929,7 +1849,7 @@ struct batadv_tt_change_node {</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_tt_req_node {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @addr: mac address address of the originator this request was sent to</div><div class='add'>+	 * @addr: mac address of the originator this request was sent to</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='hunk'>@@ -1966,95 +1886,10 @@ struct batadv_tt_roam_node {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct batadv_nc_node - network coding node</div><div class='del'>- */</div><div class='del'>-struct batadv_nc_node {</div><div class='del'>-	/** @list: next and prev pointer for the list handling */</div><div class='del'>-	struct list_head list;</div><div class='del'>-</div><div class='del'>-	/** @addr: the node's mac address */</div><div class='del'>-	u8 addr[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	/** @refcount: number of contexts the object is used by */</div><div class='del'>-	struct kref refcount;</div><div class='del'>-</div><div class='del'>-	/** @rcu: struct used for freeing in an RCU-safe manner */</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-</div><div class='del'>-	/** @orig_node: pointer to corresponding orig node struct */</div><div class='del'>-	struct batadv_orig_node *orig_node;</div><div class='del'>-</div><div class='del'>-	/** @last_seen: timestamp of last ogm received from this node */</div><div class='del'>-	unsigned long last_seen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct batadv_nc_path - network coding path</div><div class='del'>- */</div><div class='del'>-struct batadv_nc_path {</div><div class='del'>-	/** @hash_entry: next and prev pointer for the list handling */</div><div class='del'>-	struct hlist_node hash_entry;</div><div class='del'>-</div><div class='del'>-	/** @rcu: struct used for freeing in an RCU-safe manner */</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-</div><div class='del'>-	/** @refcount: number of contexts the object is used by */</div><div class='del'>-	struct kref refcount;</div><div class='del'>-</div><div class='del'>-	/** @packet_list: list of buffered packets for this path */</div><div class='del'>-	struct list_head packet_list;</div><div class='del'>-</div><div class='del'>-	/** @packet_list_lock: access lock for packet list */</div><div class='del'>-	spinlock_t packet_list_lock;</div><div class='del'>-</div><div class='del'>-	/** @next_hop: next hop (destination) of path */</div><div class='del'>-	u8 next_hop[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	/** @prev_hop: previous hop (source) of path */</div><div class='del'>-	u8 prev_hop[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	/** @last_valid: timestamp for last validation of path */</div><div class='del'>-	unsigned long last_valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct batadv_nc_packet - network coding packet used when coding and</div><div class='del'>- *  decoding packets</div><div class='del'>- */</div><div class='del'>-struct batadv_nc_packet {</div><div class='del'>-	/** @list: next and prev pointer for the list handling */</div><div class='del'>-	struct list_head list;</div><div class='del'>-</div><div class='del'>-	/** @packet_id: crc32 checksum of skb data */</div><div class='del'>-	__be32 packet_id;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @timestamp: field containing the info when the packet was added to</div><div class='del'>-	 *  path</div><div class='del'>-	 */</div><div class='del'>-	unsigned long timestamp;</div><div class='del'>-</div><div class='del'>-	/** @neigh_node: pointer to original next hop neighbor of skb */</div><div class='del'>-	struct batadv_neigh_node *neigh_node;</div><div class='del'>-</div><div class='del'>-	/** @skb: skb which can be encoded or used for decoding */</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	/** @nc_path: pointer to path this nc packet is attached to */</div><div class='del'>-	struct batadv_nc_path *nc_path;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct batadv_skb_cb - control buffer structure used to store private data</div><div class='ctx'>  *  relevant to batman-adv in the skb-&gt;cb buffer in skbs.</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_skb_cb {</div><div class='del'>-	/**</div><div class='del'>-	 * @decoded: Marks a skb as decoded, which is checked when searching for</div><div class='del'>-	 *  coding opportunities in network-coding.c</div><div class='del'>-	 */</div><div class='del'>-	unsigned char decoded:1;</div><div class='del'>-</div><div class='ctx'> 	/** @num_bcasts: Counter for broadcast packet retransmissions */</div><div class='ctx'> 	unsigned char num_bcasts;</div><div class='ctx'> };</div><div class='hunk'>@@ -2088,7 +1923,7 @@ struct batadv_forw_packet {</div><div class='ctx'> 	u16 packet_len;</div><div class='ctx'> </div><div class='ctx'> 	/** @direct_link_flags: direct link flags for aggregated OGM packets */</div><div class='del'>-	u32 direct_link_flags;</div><div class='add'>+	DECLARE_BITMAP(direct_link_flags, BATADV_MAX_AGGREGATION_PACKETS);</div><div class='ctx'> </div><div class='ctx'> 	/** @num_packets: counter for aggregated OGMv1 packets */</div><div class='ctx'> 	u8 num_packets;</div><div class='hunk'>@@ -2125,6 +1960,9 @@ struct batadv_algo_iface_ops {</div><div class='ctx'> 	/** @enable: init routing info when hard-interface is enabled */</div><div class='ctx'> 	int (*enable)(struct batadv_hard_iface *hard_iface);</div><div class='ctx'> </div><div class='add'>+	/** @enabled: notification when hard-interface was enabled (optional) */</div><div class='add'>+	void (*enabled)(struct batadv_hard_iface *hard_iface);</div><div class='add'>+</div><div class='ctx'> 	/** @disable: de-init routing info when hard-interface is disabled */</div><div class='ctx'> 	void (*disable)(struct batadv_hard_iface *hard_iface);</div><div class='ctx'> </div><div class='hunk'>@@ -2164,11 +2002,6 @@ struct batadv_algo_neigh_ops {</div><div class='ctx'> 				     struct batadv_neigh_node *neigh2,</div><div class='ctx'> 				     struct batadv_hard_iface *if_outgoing2);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/** @print: print the single hop neighbor list (optional) */</div><div class='del'>-	void (*print)(struct batadv_priv *priv, struct seq_file *seq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @dump: dump neighbors to a netlink socket (optional) */</div><div class='ctx'> 	void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 		     struct batadv_priv *priv,</div><div class='hunk'>@@ -2179,34 +2012,6 @@ struct batadv_algo_neigh_ops {</div><div class='ctx'>  * struct batadv_algo_orig_ops - mesh algorithm callbacks (originator specific)</div><div class='ctx'>  */</div><div class='ctx'> struct batadv_algo_orig_ops {</div><div class='del'>-	/**</div><div class='del'>-	 * @free: free the resources allocated by the routing algorithm for an</div><div class='del'>-	 *  orig_node object (optional)</div><div class='del'>-	 */</div><div class='del'>-	void (*free)(struct batadv_orig_node *orig_node);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @add_if: ask the routing algorithm to apply the needed changes to the</div><div class='del'>-	 *  orig_node due to a new hard-interface being added into the mesh</div><div class='del'>-	 *  (optional)</div><div class='del'>-	 */</div><div class='del'>-	int (*add_if)(struct batadv_orig_node *orig_node,</div><div class='del'>-		      unsigned int max_if_num);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @del_if: ask the routing algorithm to apply the needed changes to the</div><div class='del'>-	 *  orig_node due to an hard-interface being removed from the mesh</div><div class='del'>-	 *  (optional)</div><div class='del'>-	 */</div><div class='del'>-	int (*del_if)(struct batadv_orig_node *orig_node,</div><div class='del'>-		      unsigned int max_if_num, unsigned int del_if_num);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/** @print: print the originator table (optional) */</div><div class='del'>-	void (*print)(struct batadv_priv *priv, struct seq_file *seq,</div><div class='del'>-		      struct batadv_hard_iface *hard_iface);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @dump: dump originators to a netlink socket (optional) */</div><div class='ctx'> 	void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 		     struct batadv_priv *priv,</div><div class='hunk'>@@ -2221,14 +2026,9 @@ struct batadv_algo_gw_ops {</div><div class='ctx'> 	void (*init_sel_class)(struct batadv_priv *bat_priv);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @store_sel_class: parse and stores a new GW selection class</div><div class='del'>-	 *  (optional)</div><div class='add'>+	 * @sel_class_max: maximum allowed GW selection class</div><div class='ctx'> 	 */</div><div class='del'>-	ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff,</div><div class='del'>-				   size_t count);</div><div class='del'>-</div><div class='del'>-	/** @show_sel_class: prints the current GW selection class (optional) */</div><div class='del'>-	ssize_t (*show_sel_class)(struct batadv_priv *bat_priv, char *buff);</div><div class='add'>+	u32 sel_class_max;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @get_best_gw_node: select the best GW from the list of available</div><div class='hunk'>@@ -2245,11 +2045,6 @@ struct batadv_algo_gw_ops {</div><div class='ctx'> 			    struct batadv_orig_node *curr_gw_orig,</div><div class='ctx'> 			    struct batadv_orig_node *orig_node);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BATMAN_ADV_DEBUGFS</div><div class='del'>-	/** @print: print the gateway table (optional) */</div><div class='del'>-	void (*print)(struct batadv_priv *bat_priv, struct seq_file *seq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/** @dump: dump gateways to a netlink socket (optional) */</div><div class='ctx'> 	void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='ctx'> 		     struct batadv_priv *priv);</div><div class='hunk'>@@ -2374,6 +2169,12 @@ struct batadv_tvlv_handler {</div><div class='ctx'> 			       u8 *src, u8 *dst,</div><div class='ctx'> 			       void *tvlv_value, u16 tvlv_value_len);</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @mcast_handler: handler callback which is given the tvlv payload to</div><div class='add'>+	 *  process on incoming mcast packet</div><div class='add'>+	 */</div><div class='add'>+	int (*mcast_handler)(struct batadv_priv *bat_priv, struct sk_buff *skb);</div><div class='add'>+</div><div class='ctx'> 	/** @type: tvlv type this handler feels responsible for */</div><div class='ctx'> 	u8 type;</div><div class='ctx'> </div><div class='hunk'>@@ -2408,21 +2209,4 @@ enum batadv_tvlv_handler_flags {</div><div class='ctx'> 	BATADV_TVLV_HANDLER_OGM_CALLED = BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct batadv_store_mesh_work - Work queue item to detach add/del interface</div><div class='del'>- *  from sysfs locks</div><div class='del'>- */</div><div class='del'>-struct batadv_store_mesh_work {</div><div class='del'>-	/**</div><div class='del'>-	 * @net_dev: netdevice to add/remove to/from batman-adv soft-interface</div><div class='del'>-	 */</div><div class='del'>-	struct net_device *net_dev;</div><div class='del'>-</div><div class='del'>-	/** @soft_iface_name: name of soft-interface to modify */</div><div class='del'>-	char soft_iface_name[IFNAMSIZ];</div><div class='del'>-</div><div class='del'>-	/** @work: work queue item */</div><div class='del'>-	struct work_struct work;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #endif /* _NET_BATMAN_ADV_TYPES_H_ */</div><div class='head'>diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c<br/>index 4e2576fc0c59..2c21ae8abadc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/6lowpan.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/6lowpan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/6lowpan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/6lowpan.c</a></div><div class='hunk'>@@ -1,14 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>    Copyright (c) 2013-2014 Intel Corp.</div><div class='ctx'> </div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 and</div><div class='del'>-   only version 2 as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='hunk'>@@ -20,6 +13,7 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='hunk'>@@ -57,6 +51,12 @@ static bool enable_6lowpan;</div><div class='ctx'> /* We are listening incoming connections via this channel</div><div class='ctx'>  */</div><div class='ctx'> static struct l2cap_chan *listen_chan;</div><div class='add'>+static DEFINE_MUTEX(set_lock);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	LOWPAN_PEER_CLOSING,</div><div class='add'>+	LOWPAN_PEER_MAXBITS</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct lowpan_peer {</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -66,6 +66,8 @@ struct lowpan_peer {</div><div class='ctx'> 	/* peer addresses in various formats */</div><div class='ctx'> 	unsigned char lladdr[ETH_ALEN];</div><div class='ctx'> 	struct in6_addr peer_addr;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(flags, LOWPAN_PEER_MAXBITS);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct lowpan_btle_dev {</div><div class='hunk'>@@ -109,34 +111,6 @@ static inline bool peer_del(struct lowpan_btle_dev *dev,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct lowpan_peer *peer_lookup_ba(struct lowpan_btle_dev *dev,</div><div class='del'>-						 bdaddr_t *ba, __u8 type)</div><div class='del'>-{</div><div class='del'>-	struct lowpan_peer *peer;</div><div class='del'>-</div><div class='del'>-	BT_DBG("peers %d addr %pMR type %d", atomic_read(&amp;dev-&gt;peer_count),</div><div class='del'>-	       ba, type);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(peer, &amp;dev-&gt;peers, list) {</div><div class='del'>-		BT_DBG("dst addr %pMR dst type %d",</div><div class='del'>-		       &amp;peer-&gt;chan-&gt;dst, peer-&gt;chan-&gt;dst_type);</div><div class='del'>-</div><div class='del'>-		if (bacmp(&amp;peer-&gt;chan-&gt;dst, ba))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (type == peer-&gt;chan-&gt;dst_type) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return peer;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct lowpan_peer *</div><div class='ctx'> __peer_lookup_chan(struct lowpan_btle_dev *dev, struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -167,30 +141,25 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,</div><div class='ctx'> 						  struct in6_addr *daddr,</div><div class='ctx'> 						  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct lowpan_peer *peer;</div><div class='del'>-	struct in6_addr *nexthop;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(skb_dst(skb));</div><div class='ctx'> 	int count = atomic_read(&amp;dev-&gt;peer_count);</div><div class='add'>+	const struct in6_addr *nexthop;</div><div class='add'>+	struct lowpan_peer *peer;</div><div class='add'>+	struct neighbour *neigh;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("peers %d addr %pI6c rt %p", count, daddr, rt);</div><div class='ctx'> </div><div class='del'>-	/* If we have multiple 6lowpan peers, then check where we should</div><div class='del'>-	 * send the packet. If only one peer exists, then we can send the</div><div class='del'>-	 * packet right away.</div><div class='del'>-	 */</div><div class='del'>-	if (count == 1) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		peer = list_first_or_null_rcu(&amp;dev-&gt;peers, struct lowpan_peer,</div><div class='del'>-					      list);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return peer;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!rt) {</div><div class='del'>-		nexthop = &amp;lowpan_cb(skb)-&gt;gw;</div><div class='del'>-</div><div class='del'>-		if (ipv6_addr_any(nexthop))</div><div class='del'>-			return NULL;</div><div class='add'>+		if (ipv6_addr_any(&amp;lowpan_cb(skb)-&gt;gw)) {</div><div class='add'>+			/* There is neither route nor gateway,</div><div class='add'>+			 * probably the destination is a direct peer.</div><div class='add'>+			 */</div><div class='add'>+			nexthop = daddr;</div><div class='add'>+		} else {</div><div class='add'>+			/* There is a known gateway</div><div class='add'>+			 */</div><div class='add'>+			nexthop = &amp;lowpan_cb(skb)-&gt;gw;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		nexthop = rt6_nexthop(rt, daddr);</div><div class='ctx'> </div><div class='hunk'>@@ -206,7 +175,7 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(peer, &amp;dev-&gt;peers, list) {</div><div class='del'>-		BT_DBG("dst addr %pMR dst type %d ip %pI6c",</div><div class='add'>+		BT_DBG("dst addr %pMR dst type %u ip %pI6c",</div><div class='ctx'> 		       &amp;peer-&gt;chan-&gt;dst, peer-&gt;chan-&gt;dst_type,</div><div class='ctx'> 		       &amp;peer-&gt;peer_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +185,19 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* use the neighbour cache for matching addresses assigned by SLAAC */</div><div class='add'>+	neigh = __ipv6_neigh_lookup(dev-&gt;netdev, nexthop);</div><div class='add'>+	if (neigh) {</div><div class='add'>+		list_for_each_entry_rcu(peer, &amp;dev-&gt;peers, list) {</div><div class='add'>+			if (!memcmp(neigh-&gt;ha, peer-&gt;lladdr, ETH_ALEN)) {</div><div class='add'>+				neigh_release(neigh);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return peer;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		neigh_release(neigh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -266,7 +248,7 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (!skb_cp)</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> </div><div class='del'>-	return netif_rx_ni(skb_cp);</div><div class='add'>+	return netif_rx(skb_cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,</div><div class='hunk'>@@ -314,6 +296,7 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		local_skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> 		local_skb-&gt;dev = dev;</div><div class='ctx'> </div><div class='add'>+		skb_reset_mac_header(local_skb);</div><div class='ctx'> 		skb_set_transport_header(local_skb, sizeof(struct ipv6hdr));</div><div class='ctx'> </div><div class='ctx'> 		if (give_skb_to_upper(local_skb, dev) != NET_RX_SUCCESS) {</div><div class='hunk'>@@ -467,9 +450,9 @@ static int send_pkt(struct l2cap_chan *chan, struct sk_buff *skb,</div><div class='ctx'> 	iv.iov_len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;msg, 0, sizeof(msg));</div><div class='del'>-	iov_iter_kvec(&amp;msg.msg_iter, WRITE | ITER_KVEC, &amp;iv, 1, skb-&gt;len);</div><div class='add'>+	iov_iter_kvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;iv, 1, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	err = l2cap_chan_send(chan, &amp;msg, skb-&gt;len);</div><div class='add'>+	err = l2cap_chan_send(chan, &amp;msg, skb-&gt;len, NULL);</div><div class='ctx'> 	if (err &gt; 0) {</div><div class='ctx'> 		netdev-&gt;stats.tx_bytes += err;</div><div class='ctx'> 		netdev-&gt;stats.tx_packets++;</div><div class='hunk'>@@ -504,7 +487,7 @@ static int send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 			local_skb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-			BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",</div><div class='add'>+			BT_DBG("xmit %s to %pMR type %u IP %pI6c chan %p",</div><div class='ctx'> 			       netdev-&gt;name,</div><div class='ctx'> 			       &amp;pentry-&gt;chan-&gt;dst, pentry-&gt;chan-&gt;dst_type,</div><div class='ctx'> 			       &amp;pentry-&gt;peer_addr, pentry-&gt;chan);</div><div class='hunk'>@@ -547,7 +530,7 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (lowpan_cb(skb)-&gt;chan) {</div><div class='del'>-			BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",</div><div class='add'>+			BT_DBG("xmit %s to %pMR type %u IP %pI6c chan %p",</div><div class='ctx'> 			       netdev-&gt;name, &amp;addr, addr_type,</div><div class='ctx'> 			       &amp;lowpan_cb(skb)-&gt;addr, lowpan_cb(skb)-&gt;chan);</div><div class='ctx'> 			err = send_pkt(lowpan_cb(skb)-&gt;chan, skb, netdev);</div><div class='hunk'>@@ -581,7 +564,7 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= bt_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct header_ops header_ops = {</div><div class='add'>+static const struct header_ops header_ops = {</div><div class='ctx'> 	.create	= header_create,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -598,7 +581,7 @@ static void netdev_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_type bt_type = {</div><div class='add'>+static const struct device_type bt_type = {</div><div class='ctx'> 	.name	= "bluetooth",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +590,7 @@ static void ifup(struct net_device *netdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	err = dev_open(netdev);</div><div class='add'>+	err = dev_open(netdev, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		BT_INFO("iface %s cannot be opened (%d)", netdev-&gt;name, err);</div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -667,7 +650,6 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	peer-&gt;chan = chan;</div><div class='del'>-	memset(&amp;peer-&gt;peer_addr, 0, sizeof(struct in6_addr));</div><div class='ctx'> </div><div class='ctx'> 	baswap((void *)peer-&gt;lladdr, &amp;chan-&gt;dst);</div><div class='ctx'> </div><div class='hunk'>@@ -689,7 +671,8 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,</div><div class='ctx'> static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='del'>-	int err = 0;</div><div class='add'>+	bdaddr_t addr;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	netdev = alloc_netdev(LOWPAN_PRIV_SIZE(sizeof(struct lowpan_btle_dev)),</div><div class='ctx'> 			      IFACE_NAME_TEMPLATE, NET_NAME_UNKNOWN,</div><div class='hunk'>@@ -698,7 +681,8 @@ static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;addr_assign_type = NET_ADDR_PERM;</div><div class='del'>-	baswap((void *)netdev-&gt;dev_addr, &amp;chan-&gt;src);</div><div class='add'>+	baswap(&amp;addr, &amp;chan-&gt;src);</div><div class='add'>+	__dev_addr_set(netdev, &amp;addr, sizeof(addr));</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;netdev_ops;</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;chan-&gt;conn-&gt;hcon-&gt;hdev-&gt;dev);</div><div class='hunk'>@@ -816,7 +800,7 @@ static void chan_close_cb(struct l2cap_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 			BT_DBG("dev %p removing %speer %p", dev,</div><div class='ctx'> 			       last ? "last " : "1 ", peer);</div><div class='del'>-			BT_DBG("chan %p orig refcnt %d", chan,</div><div class='add'>+			BT_DBG("chan %p orig refcnt %u", chan,</div><div class='ctx'> 			       kref_read(&amp;chan-&gt;kref));</div><div class='ctx'> </div><div class='ctx'> 			l2cap_chan_put(chan);</div><div class='hunk'>@@ -838,8 +822,6 @@ static void chan_close_cb(struct l2cap_chan *chan)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock(&amp;devices_lock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void chan_state_change_cb(struct l2cap_chan *chan, int state, int err)</div><div class='hunk'>@@ -852,11 +834,16 @@ static struct sk_buff *chan_alloc_skb_cb(struct l2cap_chan *chan,</div><div class='ctx'> 					 unsigned long hdr_len,</div><div class='ctx'> 					 unsigned long len, int nb)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='ctx'> 	/* Note that we must allocate using GFP_ATOMIC here as</div><div class='ctx'> 	 * this function is called originally from netdev hard xmit</div><div class='ctx'> 	 * function in atomic context.</div><div class='ctx'> 	 */</div><div class='del'>-	return bt_skb_alloc(hdr_len + len, GFP_ATOMIC);</div><div class='add'>+	skb = bt_skb_alloc(hdr_len + len, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void chan_suspend_cb(struct l2cap_chan *chan)</div><div class='hunk'>@@ -907,14 +894,6 @@ static const struct l2cap_ops bt_6lowpan_chan_ops = {</div><div class='ctx'> 	.set_shutdown		= l2cap_chan_no_set_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline __u8 bdaddr_type(__u8 type)</div><div class='del'>-{</div><div class='del'>-	if (type == ADDR_LE_DEV_PUBLIC)</div><div class='del'>-		return BDADDR_LE_PUBLIC;</div><div class='del'>-	else</div><div class='del'>-		return BDADDR_LE_RANDOM;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bt_6lowpan_connect(bdaddr_t *addr, u8 dst_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan;</div><div class='hunk'>@@ -927,7 +906,7 @@ static int bt_6lowpan_connect(bdaddr_t *addr, u8 dst_type)</div><div class='ctx'> 	chan-&gt;ops = &amp;bt_6lowpan_chan_ops;</div><div class='ctx'> </div><div class='ctx'> 	err = l2cap_chan_connect(chan, cpu_to_le16(L2CAP_PSM_IPSP), 0,</div><div class='del'>-				 addr, dst_type);</div><div class='add'>+				 addr, dst_type, L2CAP_CONN_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p err %d", chan, err);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -940,7 +919,7 @@ static int bt_6lowpan_disconnect(struct l2cap_conn *conn, u8 dst_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct lowpan_peer *peer;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p dst type %d", conn, dst_type);</div><div class='add'>+	BT_DBG("conn %p dst type %u", conn, dst_type);</div><div class='ctx'> </div><div class='ctx'> 	peer = lookup_peer(conn);</div><div class='ctx'> 	if (!peer)</div><div class='hunk'>@@ -948,7 +927,9 @@ static int bt_6lowpan_disconnect(struct l2cap_conn *conn, u8 dst_type)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("peer %p chan %p", peer, peer-&gt;chan);</div><div class='ctx'> </div><div class='add'>+	l2cap_chan_lock(peer-&gt;chan);</div><div class='ctx'> 	l2cap_chan_close(peer-&gt;chan, ENOENT);</div><div class='add'>+	l2cap_chan_unlock(peer-&gt;chan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -972,7 +953,7 @@ static struct l2cap_chan *bt_6lowpan_listen(void)</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;chan-&gt;nesting, L2CAP_NESTING_PARENT);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p src type %d", chan, chan-&gt;src_type);</div><div class='add'>+	BT_DBG("chan %p src type %u", chan, chan-&gt;src_type);</div><div class='ctx'> </div><div class='ctx'> 	err = l2cap_add_psm(chan, addr, cpu_to_le16(L2CAP_PSM_IPSP));</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -985,10 +966,11 @@ static struct l2cap_chan *bt_6lowpan_listen(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,</div><div class='del'>-			  struct l2cap_conn **conn)</div><div class='add'>+			  struct l2cap_conn **conn, bool disconnect)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *hcon;</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='add'>+	int le_addr_type;</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='ctx'> 	n = sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %hhu",</div><div class='hunk'>@@ -999,21 +981,41 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,</div><div class='ctx'> 	if (n &lt; 7)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (disconnect) {</div><div class='add'>+		/* The "disconnect" debugfs command has used different address</div><div class='add'>+		 * type constants than "connect" since 2015. Let's retain that</div><div class='add'>+		 * for now even though it's obviously buggy...</div><div class='add'>+		 */</div><div class='add'>+		*addr_type += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (*addr_type) {</div><div class='add'>+	case BDADDR_LE_PUBLIC:</div><div class='add'>+		le_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='add'>+		break;</div><div class='add'>+	case BDADDR_LE_RANDOM:</div><div class='add'>+		le_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* The LE_PUBLIC address type is ignored because of BDADDR_ANY */</div><div class='ctx'> 	hdev = hci_get_route(addr, BDADDR_ANY, BDADDR_LE_PUBLIC);</div><div class='ctx'> 	if (!hdev)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='del'>-	hcon = hci_conn_hash_lookup_le(hdev, addr, *addr_type);</div><div class='add'>+	hcon = hci_conn_hash_lookup_le(hdev, addr, le_addr_type);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!hcon)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	*conn = (struct l2cap_conn *)hcon-&gt;l2cap_data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p dst %pMR type %d", *conn, &amp;hcon-&gt;dst, hcon-&gt;dst_type);</div><div class='add'>+	BT_DBG("conn %p dst %pMR type %u", *conn, &amp;hcon-&gt;dst, hcon-&gt;dst_type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1021,41 +1023,52 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,</div><div class='ctx'> static void disconnect_all_peers(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct lowpan_btle_dev *entry;</div><div class='del'>-	struct lowpan_peer *peer, *tmp_peer, *new_peer;</div><div class='del'>-	struct list_head peers;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;peers);</div><div class='add'>+	struct lowpan_peer *peer;</div><div class='add'>+	int nchans;</div><div class='ctx'> </div><div class='del'>-	/* We make a separate list of peers as the close_cb() will</div><div class='del'>-	 * modify the device peers list so it is better not to mess</div><div class='del'>-	 * with the same list at the same time.</div><div class='add'>+	/* l2cap_chan_close() cannot be called from RCU, and lock ordering</div><div class='add'>+	 * chan-&gt;lock &gt; devices_lock prevents taking write side lock, so copy</div><div class='add'>+	 * then close.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(entry, &amp;bt_6lowpan_devices, list)</div><div class='add'>+		list_for_each_entry_rcu(peer, &amp;entry-&gt;peers, list)</div><div class='add'>+			clear_bit(LOWPAN_PEER_CLOSING, peer-&gt;flags);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(entry, &amp;bt_6lowpan_devices, list) {</div><div class='del'>-		list_for_each_entry_rcu(peer, &amp;entry-&gt;peers, list) {</div><div class='del'>-			new_peer = kmalloc(sizeof(*new_peer), GFP_ATOMIC);</div><div class='del'>-			if (!new_peer)</div><div class='del'>-				break;</div><div class='add'>+	do {</div><div class='add'>+		struct l2cap_chan *chans[32];</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-			new_peer-&gt;chan = peer-&gt;chan;</div><div class='del'>-			INIT_LIST_HEAD(&amp;new_peer-&gt;list);</div><div class='add'>+		nchans = 0;</div><div class='ctx'> </div><div class='del'>-			list_add(&amp;new_peer-&gt;list, &amp;peers);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		spin_lock(&amp;devices_lock);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		list_for_each_entry_rcu(entry, &amp;bt_6lowpan_devices, list) {</div><div class='add'>+			list_for_each_entry_rcu(peer, &amp;entry-&gt;peers, list) {</div><div class='add'>+				if (test_and_set_bit(LOWPAN_PEER_CLOSING,</div><div class='add'>+						     peer-&gt;flags))</div><div class='add'>+					continue;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;devices_lock);</div><div class='del'>-	list_for_each_entry_safe(peer, tmp_peer, &amp;peers, list) {</div><div class='del'>-		l2cap_chan_close(peer-&gt;chan, ENOENT);</div><div class='add'>+				l2cap_chan_hold(peer-&gt;chan);</div><div class='add'>+				chans[nchans++] = peer-&gt;chan;</div><div class='ctx'> </div><div class='del'>-		list_del_rcu(&amp;peer-&gt;list);</div><div class='del'>-		kfree_rcu(peer, rcu);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;devices_lock);</div><div class='add'>+				if (nchans &gt;= ARRAY_SIZE(chans))</div><div class='add'>+					goto done;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+		spin_unlock(&amp;devices_lock);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nchans; ++i) {</div><div class='add'>+			l2cap_chan_lock(chans[i]);</div><div class='add'>+			l2cap_chan_close(chans[i], ENOENT);</div><div class='add'>+			l2cap_chan_unlock(chans[i]);</div><div class='add'>+			l2cap_chan_put(chans[i]);</div><div class='add'>+		}</div><div class='add'>+	} while (nchans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct set_enable {</div><div class='hunk'>@@ -1076,12 +1089,16 @@ static void do_enable_set(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	enable_6lowpan = set_enable-&gt;flag;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;set_lock);</div><div class='ctx'> 	if (listen_chan) {</div><div class='add'>+		l2cap_chan_lock(listen_chan);</div><div class='ctx'> 		l2cap_chan_close(listen_chan, 0);</div><div class='add'>+		l2cap_chan_unlock(listen_chan);</div><div class='ctx'> 		l2cap_chan_put(listen_chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	listen_chan = bt_6lowpan_listen();</div><div class='add'>+	mutex_unlock(&amp;set_lock);</div><div class='ctx'> </div><div class='ctx'> 	kfree(set_enable);</div><div class='ctx'> }</div><div class='hunk'>@@ -1108,8 +1125,8 @@ static int lowpan_enable_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(lowpan_enable_fops, lowpan_enable_get,</div><div class='del'>-			lowpan_enable_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(lowpan_enable_fops, lowpan_enable_get,</div><div class='add'>+			 lowpan_enable_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static ssize_t lowpan_control_write(struct file *fp,</div><div class='ctx'> 				    const char __user *user_buffer,</div><div class='hunk'>@@ -1129,15 +1146,19 @@ static ssize_t lowpan_control_write(struct file *fp,</div><div class='ctx'> 	buf[buf_size] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(buf, "connect ", 8) == 0) {</div><div class='del'>-		ret = get_l2cap_conn(&amp;buf[8], &amp;addr, &amp;addr_type, &amp;conn);</div><div class='add'>+		ret = get_l2cap_conn(&amp;buf[8], &amp;addr, &amp;addr_type, &amp;conn, false);</div><div class='ctx'> 		if (ret == -EINVAL)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='add'>+		mutex_lock(&amp;set_lock);</div><div class='ctx'> 		if (listen_chan) {</div><div class='add'>+			l2cap_chan_lock(listen_chan);</div><div class='ctx'> 			l2cap_chan_close(listen_chan, 0);</div><div class='add'>+			l2cap_chan_unlock(listen_chan);</div><div class='ctx'> 			l2cap_chan_put(listen_chan);</div><div class='ctx'> 			listen_chan = NULL;</div><div class='ctx'> 		}</div><div class='add'>+		mutex_unlock(&amp;set_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (conn) {</div><div class='ctx'> 			struct lowpan_peer *peer;</div><div class='hunk'>@@ -1151,7 +1172,7 @@ static ssize_t lowpan_control_write(struct file *fp,</div><div class='ctx'> 				return -EALREADY;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			BT_DBG("conn %p dst %pMR type %d user %d", conn,</div><div class='add'>+			BT_DBG("conn %p dst %pMR type %d user %u", conn,</div><div class='ctx'> 			       &amp;conn-&gt;hcon-&gt;dst, conn-&gt;hcon-&gt;dst_type,</div><div class='ctx'> 			       addr_type);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1164,7 +1185,7 @@ static ssize_t lowpan_control_write(struct file *fp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(buf, "disconnect ", 11) == 0) {</div><div class='del'>-		ret = get_l2cap_conn(&amp;buf[11], &amp;addr, &amp;addr_type, &amp;conn);</div><div class='add'>+		ret = get_l2cap_conn(&amp;buf[11], &amp;addr, &amp;addr_type, &amp;conn, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1278,9 +1299,10 @@ static struct notifier_block bt_6lowpan_dev_notifier = {</div><div class='ctx'> </div><div class='ctx'> static int __init bt_6lowpan_init(void)</div><div class='ctx'> {</div><div class='del'>-	lowpan_enable_debugfs = debugfs_create_file("6lowpan_enable", 0644,</div><div class='del'>-						    bt_debugfs, NULL,</div><div class='del'>-						    &amp;lowpan_enable_fops);</div><div class='add'>+	lowpan_enable_debugfs = debugfs_create_file_unsafe("6lowpan_enable",</div><div class='add'>+							   0644, bt_debugfs,</div><div class='add'>+							   NULL,</div><div class='add'>+							   &amp;lowpan_enable_fops);</div><div class='ctx'> 	lowpan_control_debugfs = debugfs_create_file("6lowpan_control", 0644,</div><div class='ctx'> 						     bt_debugfs, NULL,</div><div class='ctx'> 						     &amp;lowpan_control_fops);</div><div class='hunk'>@@ -1294,7 +1316,9 @@ static void __exit bt_6lowpan_exit(void)</div><div class='ctx'> 	debugfs_remove(lowpan_control_debugfs);</div><div class='ctx'> </div><div class='ctx'> 	if (listen_chan) {</div><div class='add'>+		l2cap_chan_lock(listen_chan);</div><div class='ctx'> 		l2cap_chan_close(listen_chan, 0);</div><div class='add'>+		l2cap_chan_unlock(listen_chan);</div><div class='ctx'> 		l2cap_chan_put(listen_chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig<br/>index db82a40875e8..6b2b65a66700 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/Kconfig</a></div><div class='hunk'>@@ -1,15 +1,17 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Bluetooth subsystem configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig BT</div><div class='ctx'> 	tristate "Bluetooth subsystem support"</div><div class='del'>-	depends on NET &amp;&amp; !S390</div><div class='add'>+	depends on !S390</div><div class='ctx'> 	depends on RFKILL || !RFKILL</div><div class='ctx'> 	select CRC16</div><div class='ctx'> 	select CRYPTO</div><div class='del'>-	select CRYPTO_BLKCIPHER</div><div class='del'>-	select CRYPTO_AES</div><div class='add'>+	select CRYPTO_SKCIPHER</div><div class='add'>+	select CRYPTO_LIB_AES</div><div class='add'>+	imply CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_CMAC</div><div class='ctx'> 	select CRYPTO_ECB</div><div class='ctx'> 	select CRYPTO_SHA256</div><div class='hunk'>@@ -19,7 +21,7 @@ menuconfig BT</div><div class='ctx'> 	  It was designed as a replacement for cables and other short-range</div><div class='ctx'> 	  technologies like IrDA.  Bluetooth operates in personal area range</div><div class='ctx'> 	  that typically extends up to 10 meters.  More information about</div><div class='del'>-	  Bluetooth can be found at &lt;http://www.bluetooth.com/&gt;.</div><div class='add'>+	  Bluetooth can be found at &lt;https://www.bluetooth.com/&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  Linux Bluetooth subsystem consist of several layers:</div><div class='ctx'> 	     Bluetooth Core</div><div class='hunk'>@@ -27,6 +29,7 @@ menuconfig BT</div><div class='ctx'> 		SCO audio links</div><div class='ctx'> 		L2CAP (Logical Link Control and Adaptation Protocol)</div><div class='ctx'> 		SMP (Security Manager Protocol) on LE (Low Energy) links</div><div class='add'>+		ISO isochronous links</div><div class='ctx'> 	     HCI Device drivers (Interface to the hardware)</div><div class='ctx'> 	     RFCOMM Module (RFCOMM Protocol)  </div><div class='ctx'> 	     BNEP Module (Bluetooth Network Encapsulation Protocol)</div><div class='hunk'>@@ -59,15 +62,6 @@ source "net/bluetooth/cmtp/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "net/bluetooth/hidp/Kconfig"</div><div class='ctx'> </div><div class='del'>-config BT_HS</div><div class='del'>-	bool "Bluetooth High Speed (HS) features"</div><div class='del'>-	depends on BT_BREDR</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Bluetooth High Speed includes support for off-loading</div><div class='del'>-	  Bluetooth connections via 802.11 (wifi) physical layer</div><div class='del'>-	  available with Bluetooth version 3.0 or later.</div><div class='del'>-</div><div class='ctx'> config BT_LE</div><div class='ctx'> 	bool "Bluetooth Low Energy (LE) features"</div><div class='ctx'> 	depends on BT</div><div class='hunk'>@@ -76,6 +70,17 @@ config BT_LE</div><div class='ctx'> 	  Bluetooth Low Energy includes support low-energy physical</div><div class='ctx'> 	  layer available with Bluetooth version 4.0 or later.</div><div class='ctx'> </div><div class='add'>+config BT_LE_L2CAP_ECRED</div><div class='add'>+	bool "Bluetooth L2CAP Enhanced Credit Flow Control"</div><div class='add'>+	depends on BT_LE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Bluetooth Low Energy L2CAP Enhanced Credit Flow Control available with</div><div class='add'>+	  Bluetooth version 5.2 or later.</div><div class='add'>+</div><div class='add'>+	  This can be overridden by passing bluetooth.enable_ecred=[1|0]</div><div class='add'>+	  on the kernel commandline.</div><div class='add'>+</div><div class='ctx'> config BT_6LOWPAN</div><div class='ctx'> 	tristate "Bluetooth 6LoWPAN support"</div><div class='ctx'> 	depends on BT_LE &amp;&amp; 6LOWPAN</div><div class='hunk'>@@ -91,6 +96,28 @@ config BT_LEDS</div><div class='ctx'> 	  This option selects a few LED triggers for different</div><div class='ctx'> 	  Bluetooth events.</div><div class='ctx'> </div><div class='add'>+config BT_MSFTEXT</div><div class='add'>+	bool "Enable Microsoft extensions"</div><div class='add'>+	depends on BT</div><div class='add'>+	help</div><div class='add'>+	  This options enables support for the Microsoft defined HCI</div><div class='add'>+	  vendor extensions.</div><div class='add'>+</div><div class='add'>+config BT_AOSPEXT</div><div class='add'>+	bool "Enable Android Open Source Project extensions"</div><div class='add'>+	depends on BT</div><div class='add'>+	help</div><div class='add'>+	  This options enables support for the Android Open Source</div><div class='add'>+	  Project defined HCI vendor extensions.</div><div class='add'>+</div><div class='add'>+config BT_DEBUGFS</div><div class='add'>+	bool "Export Bluetooth internals in debugfs"</div><div class='add'>+	depends on BT &amp;&amp; DEBUG_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Provide extensive information about internal Bluetooth states</div><div class='add'>+	  in debugfs.</div><div class='add'>+</div><div class='ctx'> config BT_SELFTEST</div><div class='ctx'> 	bool "Bluetooth self testing support"</div><div class='ctx'> 	depends on BT &amp;&amp; DEBUG_KERNEL</div><div class='hunk'>@@ -118,12 +145,11 @@ config BT_SELFTEST_SMP</div><div class='ctx'> 	  Run test cases for SMP cryptographic functionality, including both</div><div class='ctx'> 	  legacy SMP as well as the Secure Connections features.</div><div class='ctx'> </div><div class='del'>-config BT_DEBUGFS</div><div class='del'>-	bool "Export Bluetooth internals in debugfs"</div><div class='del'>-	depends on BT &amp;&amp; DEBUG_FS</div><div class='del'>-	default y</div><div class='add'>+config BT_FEATURE_DEBUG</div><div class='add'>+	bool "Enable runtime option for debugging statements"</div><div class='add'>+	depends on BT &amp;&amp; !DYNAMIC_DEBUG</div><div class='ctx'> 	help</div><div class='del'>-	  Provide extensive information about internal Bluetooth states</div><div class='del'>-	  in debugfs.</div><div class='add'>+	  This provides an option to enable/disable debugging statements</div><div class='add'>+	  at runtime via the experimental features interface.</div><div class='ctx'> </div><div class='ctx'> source "drivers/bluetooth/Kconfig"</div><div class='head'>diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile<br/>index fda41c0b4781..a7eede7616d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/Makefile</a></div><div class='hunk'>@@ -14,10 +14,15 @@ bluetooth_6lowpan-y := 6lowpan.o</div><div class='ctx'> </div><div class='ctx'> bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \</div><div class='ctx'> 	hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o lib.o \</div><div class='del'>-	ecdh_helper.o hci_request.o mgmt_util.o</div><div class='add'>+	ecdh_helper.o mgmt_util.o mgmt_config.o hci_codec.o eir.o hci_sync.o \</div><div class='add'>+	hci_drv.o</div><div class='add'>+</div><div class='add'>+bluetooth-$(CONFIG_DEV_COREDUMP) += coredump.o</div><div class='ctx'> </div><div class='ctx'> bluetooth-$(CONFIG_BT_BREDR) += sco.o</div><div class='del'>-bluetooth-$(CONFIG_BT_HS) += a2mp.o amp.o</div><div class='add'>+bluetooth-$(CONFIG_BT_LE) += iso.o</div><div class='ctx'> bluetooth-$(CONFIG_BT_LEDS) += leds.o</div><div class='add'>+bluetooth-$(CONFIG_BT_MSFTEXT) += msft.o</div><div class='add'>+bluetooth-$(CONFIG_BT_AOSPEXT) += aosp.o</div><div class='ctx'> bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o</div><div class='ctx'> bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o</div><div class='head'>diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c<br/>deleted file mode 100644<br/>index 51c2cf2d8923..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/a2mp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/a2mp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1040 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   Copyright (c) 2010,2011 Code Aurora Forum.  All rights reserved.</div><div class='del'>-   Copyright (c) 2011,2012 Intel Corp.</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 and</div><div class='del'>-   only version 2 as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/l2cap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hci_request.h"</div><div class='del'>-#include "a2mp.h"</div><div class='del'>-#include "amp.h"</div><div class='del'>-</div><div class='del'>-#define A2MP_FEAT_EXT	0x8000</div><div class='del'>-</div><div class='del'>-/* Global AMP Manager list */</div><div class='del'>-static LIST_HEAD(amp_mgr_list);</div><div class='del'>-static DEFINE_MUTEX(amp_mgr_list_lock);</div><div class='del'>-</div><div class='del'>-/* A2MP build &amp; send command helper functions */</div><div class='del'>-static struct a2mp_cmd *__a2mp_build(u8 code, u8 ident, u16 len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_cmd *cmd;</div><div class='del'>-	int plen;</div><div class='del'>-</div><div class='del'>-	plen = sizeof(*cmd) + len;</div><div class='del'>-	cmd = kzalloc(plen, GFP_KERNEL);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;code = code;</div><div class='del'>-	cmd-&gt;ident = ident;</div><div class='del'>-	cmd-&gt;len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	memcpy(cmd-&gt;data, data, len);</div><div class='del'>-</div><div class='del'>-	return cmd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_chan *chan = mgr-&gt;a2mp_chan;</div><div class='del'>-	struct a2mp_cmd *cmd;</div><div class='del'>-	u16 total_len = len + sizeof(*cmd);</div><div class='del'>-	struct kvec iv;</div><div class='del'>-	struct msghdr msg;</div><div class='del'>-</div><div class='del'>-	cmd = __a2mp_build(code, ident, len, data);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iv.iov_base = cmd;</div><div class='del'>-	iv.iov_len = total_len;</div><div class='del'>-</div><div class='del'>-	memset(&amp;msg, 0, sizeof(msg));</div><div class='del'>-</div><div class='del'>-	iov_iter_kvec(&amp;msg.msg_iter, WRITE | ITER_KVEC, &amp;iv, 1, total_len);</div><div class='del'>-</div><div class='del'>-	l2cap_chan_send(chan, &amp;msg, total_len);</div><div class='del'>-</div><div class='del'>-	kfree(cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 __next_ident(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	if (++mgr-&gt;ident == 0)</div><div class='del'>-		mgr-&gt;ident = 1;</div><div class='del'>-</div><div class='del'>-	return mgr-&gt;ident;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct amp_mgr *amp_mgr_lookup_by_state(u8 state)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;amp_mgr_list_lock);</div><div class='del'>-	list_for_each_entry(mgr, &amp;amp_mgr_list, list) {</div><div class='del'>-		if (test_and_clear_bit(state, &amp;mgr-&gt;state)) {</div><div class='del'>-			amp_mgr_get(mgr);</div><div class='del'>-			mutex_unlock(&amp;amp_mgr_list_lock);</div><div class='del'>-			return mgr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;amp_mgr_list_lock);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hci_dev_list shall be locked */</div><div class='del'>-static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	int i = 1;</div><div class='del'>-</div><div class='del'>-	cl[0].id = AMP_ID_BREDR;</div><div class='del'>-	cl[0].type = AMP_TYPE_BREDR;</div><div class='del'>-	cl[0].status = AMP_STATUS_BLUETOOTH_ONLY;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(hdev, &amp;hci_dev_list, list) {</div><div class='del'>-		if (hdev-&gt;dev_type == HCI_AMP) {</div><div class='del'>-			cl[i].id = hdev-&gt;id;</div><div class='del'>-			cl[i].type = hdev-&gt;amp_type;</div><div class='del'>-			if (test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='del'>-				cl[i].status = hdev-&gt;amp_status;</div><div class='del'>-			else</div><div class='del'>-				cl[i].status = AMP_STATUS_POWERED_DOWN;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Processing A2MP messages */</div><div class='del'>-static int a2mp_command_rej(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			    struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_cmd_rej *rej = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*rej))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("ident %d reason %d", hdr-&gt;ident, le16_to_cpu(rej-&gt;reason));</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*rej));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			     struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_discov_req *req = (void *) skb-&gt;data;</div><div class='del'>-	u16 len = le16_to_cpu(hdr-&gt;len);</div><div class='del'>-	struct a2mp_discov_rsp *rsp;</div><div class='del'>-	u16 ext_feat;</div><div class='del'>-	u8 num_ctrl;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*req))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*req));</div><div class='del'>-</div><div class='del'>-	ext_feat = le16_to_cpu(req-&gt;ext_feat);</div><div class='del'>-</div><div class='del'>-	BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(req-&gt;mtu), ext_feat);</div><div class='del'>-</div><div class='del'>-	/* check that packet is not broken for now */</div><div class='del'>-	while (ext_feat &amp; A2MP_FEAT_EXT) {</div><div class='del'>-		if (len &lt; sizeof(ext_feat))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ext_feat = get_unaligned_le16(skb-&gt;data);</div><div class='del'>-		BT_DBG("efm 0x%4.4x", ext_feat);</div><div class='del'>-		len -= sizeof(ext_feat);</div><div class='del'>-		skb_pull(skb, sizeof(ext_feat));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;hci_dev_list_lock);</div><div class='del'>-</div><div class='del'>-	/* at minimum the BR/EDR needs to be listed */</div><div class='del'>-	num_ctrl = 1;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(hdev, &amp;hci_dev_list, list) {</div><div class='del'>-		if (hdev-&gt;dev_type == HCI_AMP)</div><div class='del'>-			num_ctrl++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = num_ctrl * sizeof(struct a2mp_cl) + sizeof(*rsp);</div><div class='del'>-	rsp = kmalloc(len, GFP_ATOMIC);</div><div class='del'>-	if (!rsp) {</div><div class='del'>-		read_unlock(&amp;hci_dev_list_lock);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rsp-&gt;mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);</div><div class='del'>-	rsp-&gt;ext_feat = 0;</div><div class='del'>-</div><div class='del'>-	__a2mp_add_cl(mgr, rsp-&gt;cl);</div><div class='del'>-</div><div class='del'>-	read_unlock(&amp;hci_dev_list_lock);</div><div class='del'>-</div><div class='del'>-	a2mp_send(mgr, A2MP_DISCOVER_RSP, hdr-&gt;ident, len, rsp);</div><div class='del'>-</div><div class='del'>-	kfree(rsp);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			     struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_discov_rsp *rsp = (void *) skb-&gt;data;</div><div class='del'>-	u16 len = le16_to_cpu(hdr-&gt;len);</div><div class='del'>-	struct a2mp_cl *cl;</div><div class='del'>-	u16 ext_feat;</div><div class='del'>-	bool found = false;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*rsp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	len -= sizeof(*rsp);</div><div class='del'>-	skb_pull(skb, sizeof(*rsp));</div><div class='del'>-</div><div class='del'>-	ext_feat = le16_to_cpu(rsp-&gt;ext_feat);</div><div class='del'>-</div><div class='del'>-	BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(rsp-&gt;mtu), ext_feat);</div><div class='del'>-</div><div class='del'>-	/* check that packet is not broken for now */</div><div class='del'>-	while (ext_feat &amp; A2MP_FEAT_EXT) {</div><div class='del'>-		if (len &lt; sizeof(ext_feat))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ext_feat = get_unaligned_le16(skb-&gt;data);</div><div class='del'>-		BT_DBG("efm 0x%4.4x", ext_feat);</div><div class='del'>-		len -= sizeof(ext_feat);</div><div class='del'>-		skb_pull(skb, sizeof(ext_feat));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cl = (void *) skb-&gt;data;</div><div class='del'>-	while (len &gt;= sizeof(*cl)) {</div><div class='del'>-		BT_DBG("Remote AMP id %d type %d status %d", cl-&gt;id, cl-&gt;type,</div><div class='del'>-		       cl-&gt;status);</div><div class='del'>-</div><div class='del'>-		if (cl-&gt;id != AMP_ID_BREDR &amp;&amp; cl-&gt;type != AMP_TYPE_BREDR) {</div><div class='del'>-			struct a2mp_info_req req;</div><div class='del'>-</div><div class='del'>-			found = true;</div><div class='del'>-			req.id = cl-&gt;id;</div><div class='del'>-			a2mp_send(mgr, A2MP_GETINFO_REQ, __next_ident(mgr),</div><div class='del'>-				  sizeof(req), &amp;req);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len -= sizeof(*cl);</div><div class='del'>-		cl = skb_pull(skb, sizeof(*cl));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fall back to L2CAP init sequence */</div><div class='del'>-	if (!found) {</div><div class='del'>-		struct l2cap_conn *conn = mgr-&gt;l2cap_conn;</div><div class='del'>-		struct l2cap_chan *chan;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='del'>-</div><div class='del'>-			BT_DBG("chan %p state %s", chan,</div><div class='del'>-			       state_to_string(chan-&gt;state));</div><div class='del'>-</div><div class='del'>-			if (chan-&gt;scid == L2CAP_CID_A2MP)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			l2cap_chan_lock(chan);</div><div class='del'>-</div><div class='del'>-			if (chan-&gt;state == BT_CONNECT)</div><div class='del'>-				l2cap_send_conn_req(chan);</div><div class='del'>-</div><div class='del'>-			l2cap_chan_unlock(chan);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_change_notify(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			      struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_cl *cl = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	while (skb-&gt;len &gt;= sizeof(*cl)) {</div><div class='del'>-		BT_DBG("Controller id %d type %d status %d", cl-&gt;id, cl-&gt;type,</div><div class='del'>-		       cl-&gt;status);</div><div class='del'>-		cl = skb_pull(skb, sizeof(*cl));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO send A2MP_CHANGE_RSP */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void read_local_amp_info_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-					 u16 opcode)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	a2mp_send_getinfo_rsp(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_getinfo_req(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			    struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_info_req *req  = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	struct hci_request hreq;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*req))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("id %d", req-&gt;id);</div><div class='del'>-</div><div class='del'>-	hdev = hci_dev_get(req-&gt;id);</div><div class='del'>-	if (!hdev || hdev-&gt;dev_type != HCI_AMP) {</div><div class='del'>-		struct a2mp_info_rsp rsp;</div><div class='del'>-</div><div class='del'>-		rsp.id = req-&gt;id;</div><div class='del'>-		rsp.status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-</div><div class='del'>-		a2mp_send(mgr, A2MP_GETINFO_RSP, hdr-&gt;ident, sizeof(rsp),</div><div class='del'>-			  &amp;rsp);</div><div class='del'>-</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(READ_LOC_AMP_INFO, &amp;mgr-&gt;state);</div><div class='del'>-	hci_req_init(&amp;hreq, hdev);</div><div class='del'>-	hci_req_add(&amp;hreq, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL);</div><div class='del'>-	err = hci_req_run(&amp;hreq, read_local_amp_info_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		a2mp_send_getinfo_rsp(hdev);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (hdev)</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*req));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_getinfo_rsp(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			    struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_info_rsp *rsp = (struct a2mp_info_rsp *) skb-&gt;data;</div><div class='del'>-	struct a2mp_amp_assoc_req req;</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*rsp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("id %d status 0x%2.2x", rsp-&gt;id, rsp-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (rsp-&gt;status)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ctrl = amp_ctrl_add(mgr, rsp-&gt;id);</div><div class='del'>-	if (!ctrl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	req.id = rsp-&gt;id;</div><div class='del'>-	a2mp_send(mgr, A2MP_GETAMPASSOC_REQ, __next_ident(mgr), sizeof(req),</div><div class='del'>-		  &amp;req);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*rsp));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-				struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_amp_assoc_req *req = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	struct amp_mgr *tmp;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*req))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("id %d", req-&gt;id);</div><div class='del'>-</div><div class='del'>-	/* Make sure that other request is not processed */</div><div class='del'>-	tmp = amp_mgr_lookup_by_state(READ_LOC_AMP_ASSOC);</div><div class='del'>-</div><div class='del'>-	hdev = hci_dev_get(req-&gt;id);</div><div class='del'>-	if (!hdev || hdev-&gt;amp_type == AMP_TYPE_BREDR || tmp) {</div><div class='del'>-		struct a2mp_amp_assoc_rsp rsp;</div><div class='del'>-		rsp.id = req-&gt;id;</div><div class='del'>-</div><div class='del'>-		if (tmp) {</div><div class='del'>-			rsp.status = A2MP_STATUS_COLLISION_OCCURED;</div><div class='del'>-			amp_mgr_put(tmp);</div><div class='del'>-		} else {</div><div class='del'>-			rsp.status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, hdr-&gt;ident, sizeof(rsp),</div><div class='del'>-			  &amp;rsp);</div><div class='del'>-</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	amp_read_loc_assoc(hdev, mgr);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (hdev)</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*req));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-				struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_amp_assoc_rsp *rsp = (void *) skb-&gt;data;</div><div class='del'>-	u16 len = le16_to_cpu(hdr-&gt;len);</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-	size_t assoc_len;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*rsp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	assoc_len = len - sizeof(*rsp);</div><div class='del'>-</div><div class='del'>-	BT_DBG("id %d status 0x%2.2x assoc len %zu", rsp-&gt;id, rsp-&gt;status,</div><div class='del'>-	       assoc_len);</div><div class='del'>-</div><div class='del'>-	if (rsp-&gt;status)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Save remote ASSOC data */</div><div class='del'>-	ctrl = amp_ctrl_lookup(mgr, rsp-&gt;id);</div><div class='del'>-	if (ctrl) {</div><div class='del'>-		u8 *assoc;</div><div class='del'>-</div><div class='del'>-		assoc = kmemdup(rsp-&gt;amp_assoc, assoc_len, GFP_KERNEL);</div><div class='del'>-		if (!assoc) {</div><div class='del'>-			amp_ctrl_put(ctrl);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ctrl-&gt;assoc = assoc;</div><div class='del'>-		ctrl-&gt;assoc_len = assoc_len;</div><div class='del'>-		ctrl-&gt;assoc_rem_len = assoc_len;</div><div class='del'>-		ctrl-&gt;assoc_len_so_far = 0;</div><div class='del'>-</div><div class='del'>-		amp_ctrl_put(ctrl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create Phys Link */</div><div class='del'>-	hdev = hci_dev_get(rsp-&gt;id);</div><div class='del'>-	if (!hdev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	hcon = phylink_add(hdev, mgr, rsp-&gt;id, true);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	BT_DBG("Created hcon %p: loc:%d -&gt; rem:%d", hcon, hdev-&gt;id, rsp-&gt;id);</div><div class='del'>-</div><div class='del'>-	mgr-&gt;bredr_chan-&gt;remote_amp_id = rsp-&gt;id;</div><div class='del'>-</div><div class='del'>-	amp_create_phylink(hdev, mgr, hcon);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-	skb_pull(skb, len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-				   struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_physlink_req *req = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	struct a2mp_physlink_rsp rsp;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*req))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("local_id %d, remote_id %d", req-&gt;local_id, req-&gt;remote_id);</div><div class='del'>-</div><div class='del'>-	rsp.local_id = req-&gt;remote_id;</div><div class='del'>-	rsp.remote_id = req-&gt;local_id;</div><div class='del'>-</div><div class='del'>-	hdev = hci_dev_get(req-&gt;remote_id);</div><div class='del'>-	if (!hdev || hdev-&gt;amp_type == AMP_TYPE_BREDR) {</div><div class='del'>-		rsp.status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-		goto send_rsp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctrl = amp_ctrl_lookup(mgr, rsp.remote_id);</div><div class='del'>-	if (!ctrl) {</div><div class='del'>-		ctrl = amp_ctrl_add(mgr, rsp.remote_id);</div><div class='del'>-		if (ctrl) {</div><div class='del'>-			amp_ctrl_get(ctrl);</div><div class='del'>-		} else {</div><div class='del'>-			rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION;</div><div class='del'>-			goto send_rsp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctrl) {</div><div class='del'>-		size_t assoc_len = le16_to_cpu(hdr-&gt;len) - sizeof(*req);</div><div class='del'>-		u8 *assoc;</div><div class='del'>-</div><div class='del'>-		assoc = kmemdup(req-&gt;amp_assoc, assoc_len, GFP_KERNEL);</div><div class='del'>-		if (!assoc) {</div><div class='del'>-			amp_ctrl_put(ctrl);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ctrl-&gt;assoc = assoc;</div><div class='del'>-		ctrl-&gt;assoc_len = assoc_len;</div><div class='del'>-		ctrl-&gt;assoc_rem_len = assoc_len;</div><div class='del'>-		ctrl-&gt;assoc_len_so_far = 0;</div><div class='del'>-</div><div class='del'>-		amp_ctrl_put(ctrl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hcon = phylink_add(hdev, mgr, req-&gt;local_id, false);</div><div class='del'>-	if (hcon) {</div><div class='del'>-		amp_accept_phylink(hdev, mgr, hcon);</div><div class='del'>-		rsp.status = A2MP_STATUS_SUCCESS;</div><div class='del'>-	} else {</div><div class='del'>-		rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-send_rsp:</div><div class='del'>-	if (hdev)</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-	/* Reply error now and success after HCI Write Remote AMP Assoc</div><div class='del'>-	   command complete with success status</div><div class='del'>-	 */</div><div class='del'>-	if (rsp.status != A2MP_STATUS_SUCCESS) {</div><div class='del'>-		a2mp_send(mgr, A2MP_CREATEPHYSLINK_RSP, hdr-&gt;ident,</div><div class='del'>-			  sizeof(rsp), &amp;rsp);</div><div class='del'>-	} else {</div><div class='del'>-		set_bit(WRITE_REMOTE_AMP_ASSOC, &amp;mgr-&gt;state);</div><div class='del'>-		mgr-&gt;ident = hdr-&gt;ident;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, le16_to_cpu(hdr-&gt;len));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a2mp_discphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-				 struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_physlink_req *req = (void *) skb-&gt;data;</div><div class='del'>-	struct a2mp_physlink_rsp rsp;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(hdr-&gt;len) &lt; sizeof(*req))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("local_id %d remote_id %d", req-&gt;local_id, req-&gt;remote_id);</div><div class='del'>-</div><div class='del'>-	rsp.local_id = req-&gt;remote_id;</div><div class='del'>-	rsp.remote_id = req-&gt;local_id;</div><div class='del'>-	rsp.status = A2MP_STATUS_SUCCESS;</div><div class='del'>-</div><div class='del'>-	hdev = hci_dev_get(req-&gt;remote_id);</div><div class='del'>-	if (!hdev) {</div><div class='del'>-		rsp.status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-		goto send_rsp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_ba(hdev, AMP_LINK,</div><div class='del'>-				       &amp;mgr-&gt;l2cap_conn-&gt;hcon-&gt;dst);</div><div class='del'>-	if (!hcon) {</div><div class='del'>-		bt_dev_err(hdev, "no phys link exist");</div><div class='del'>-		rsp.status = A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS;</div><div class='del'>-		goto clean;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO Disconnect Phys Link here */</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-send_rsp:</div><div class='del'>-	a2mp_send(mgr, A2MP_DISCONNPHYSLINK_RSP, hdr-&gt;ident, sizeof(rsp), &amp;rsp);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*req));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int a2mp_cmd_rsp(struct amp_mgr *mgr, struct sk_buff *skb,</div><div class='del'>-			       struct a2mp_cmd *hdr)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("ident %d code 0x%2.2x", hdr-&gt;ident, hdr-&gt;code);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, le16_to_cpu(hdr-&gt;len));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle A2MP signalling */</div><div class='del'>-static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct a2mp_cmd *hdr;</div><div class='del'>-	struct amp_mgr *mgr = chan-&gt;data;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	amp_mgr_get(mgr);</div><div class='del'>-</div><div class='del'>-	while (skb-&gt;len &gt;= sizeof(*hdr)) {</div><div class='del'>-		u16 len;</div><div class='del'>-</div><div class='del'>-		hdr = (void *) skb-&gt;data;</div><div class='del'>-		len = le16_to_cpu(hdr-&gt;len);</div><div class='del'>-</div><div class='del'>-		BT_DBG("code 0x%2.2x id %d len %u", hdr-&gt;code, hdr-&gt;ident, len);</div><div class='del'>-</div><div class='del'>-		skb_pull(skb, sizeof(*hdr));</div><div class='del'>-</div><div class='del'>-		if (len &gt; skb-&gt;len || !hdr-&gt;ident) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mgr-&gt;ident = hdr-&gt;ident;</div><div class='del'>-</div><div class='del'>-		switch (hdr-&gt;code) {</div><div class='del'>-		case A2MP_COMMAND_REJ:</div><div class='del'>-			a2mp_command_rej(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_DISCOVER_REQ:</div><div class='del'>-			err = a2mp_discover_req(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_CHANGE_NOTIFY:</div><div class='del'>-			err = a2mp_change_notify(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_GETINFO_REQ:</div><div class='del'>-			err = a2mp_getinfo_req(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_GETAMPASSOC_REQ:</div><div class='del'>-			err = a2mp_getampassoc_req(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_CREATEPHYSLINK_REQ:</div><div class='del'>-			err = a2mp_createphyslink_req(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_DISCONNPHYSLINK_REQ:</div><div class='del'>-			err = a2mp_discphyslink_req(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_DISCOVER_RSP:</div><div class='del'>-			err = a2mp_discover_rsp(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_GETINFO_RSP:</div><div class='del'>-			err = a2mp_getinfo_rsp(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_GETAMPASSOC_RSP:</div><div class='del'>-			err = a2mp_getampassoc_rsp(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case A2MP_CHANGE_RSP:</div><div class='del'>-		case A2MP_CREATEPHYSLINK_RSP:</div><div class='del'>-		case A2MP_DISCONNPHYSLINK_RSP:</div><div class='del'>-			err = a2mp_cmd_rsp(mgr, skb, hdr);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			BT_ERR("Unknown A2MP sig cmd 0x%2.2x", hdr-&gt;code);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		struct a2mp_cmd_rej rej;</div><div class='del'>-</div><div class='del'>-		rej.reason = cpu_to_le16(0);</div><div class='del'>-		hdr = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-		BT_DBG("Send A2MP Rej: cmd 0x%2.2x err %d", hdr-&gt;code, err);</div><div class='del'>-</div><div class='del'>-		a2mp_send(mgr, A2MP_COMMAND_REJ, hdr-&gt;ident, sizeof(rej),</div><div class='del'>-			  &amp;rej);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Always free skb and return success error code to prevent</div><div class='del'>-	   from sending L2CAP Disconnect over A2MP channel */</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	amp_mgr_put(mgr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void a2mp_chan_close_cb(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	l2cap_chan_put(chan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void a2mp_chan_state_change_cb(struct l2cap_chan *chan, int state,</div><div class='del'>-				      int err)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr = chan-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p state %s", chan, state_to_string(state));</div><div class='del'>-</div><div class='del'>-	chan-&gt;state = state;</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case BT_CLOSED:</div><div class='del'>-		if (mgr)</div><div class='del'>-			amp_mgr_put(mgr);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *a2mp_chan_alloc_skb_cb(struct l2cap_chan *chan,</div><div class='del'>-					      unsigned long hdr_len,</div><div class='del'>-					      unsigned long len, int nb)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = bt_skb_alloc(hdr_len + len, GFP_KERNEL);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct l2cap_ops a2mp_chan_ops = {</div><div class='del'>-	.name = "L2CAP A2MP channel",</div><div class='del'>-	.recv = a2mp_chan_recv_cb,</div><div class='del'>-	.close = a2mp_chan_close_cb,</div><div class='del'>-	.state_change = a2mp_chan_state_change_cb,</div><div class='del'>-	.alloc_skb = a2mp_chan_alloc_skb_cb,</div><div class='del'>-</div><div class='del'>-	/* Not implemented for A2MP */</div><div class='del'>-	.new_connection = l2cap_chan_no_new_connection,</div><div class='del'>-	.teardown = l2cap_chan_no_teardown,</div><div class='del'>-	.ready = l2cap_chan_no_ready,</div><div class='del'>-	.defer = l2cap_chan_no_defer,</div><div class='del'>-	.resume = l2cap_chan_no_resume,</div><div class='del'>-	.set_shutdown = l2cap_chan_no_set_shutdown,</div><div class='del'>-	.get_sndtimeo = l2cap_chan_no_get_sndtimeo,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	chan = l2cap_chan_create();</div><div class='del'>-	if (!chan)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='del'>-</div><div class='del'>-	chan-&gt;chan_type = L2CAP_CHAN_FIXED;</div><div class='del'>-	chan-&gt;scid = L2CAP_CID_A2MP;</div><div class='del'>-	chan-&gt;dcid = L2CAP_CID_A2MP;</div><div class='del'>-	chan-&gt;omtu = L2CAP_A2MP_DEFAULT_MTU;</div><div class='del'>-	chan-&gt;imtu = L2CAP_A2MP_DEFAULT_MTU;</div><div class='del'>-	chan-&gt;flush_to = L2CAP_DEFAULT_FLUSH_TO;</div><div class='del'>-</div><div class='del'>-	chan-&gt;ops = &amp;a2mp_chan_ops;</div><div class='del'>-</div><div class='del'>-	l2cap_chan_set_defaults(chan);</div><div class='del'>-	chan-&gt;remote_max_tx = chan-&gt;max_tx;</div><div class='del'>-	chan-&gt;remote_tx_win = chan-&gt;tx_win;</div><div class='del'>-</div><div class='del'>-	chan-&gt;retrans_timeout = L2CAP_DEFAULT_RETRANS_TO;</div><div class='del'>-	chan-&gt;monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;</div><div class='del'>-</div><div class='del'>-	skb_queue_head_init(&amp;chan-&gt;tx_q);</div><div class='del'>-</div><div class='del'>-	chan-&gt;mode = L2CAP_MODE_ERTM;</div><div class='del'>-</div><div class='del'>-	err = l2cap_ertm_init(chan);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		l2cap_chan_del(chan, 0);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan-&gt;conf_state = 0;</div><div class='del'>-</div><div class='del'>-	if (locked)</div><div class='del'>-		__l2cap_chan_add(conn, chan);</div><div class='del'>-	else</div><div class='del'>-		l2cap_chan_add(conn, chan);</div><div class='del'>-</div><div class='del'>-	chan-&gt;remote_mps = chan-&gt;omtu;</div><div class='del'>-	chan-&gt;mps = chan-&gt;omtu;</div><div class='del'>-</div><div class='del'>-	chan-&gt;state = BT_CONNECTED;</div><div class='del'>-</div><div class='del'>-	return chan;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* AMP Manager functions */</div><div class='del'>-struct amp_mgr *amp_mgr_get(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("mgr %p orig refcnt %d", mgr, kref_read(&amp;mgr-&gt;kref));</div><div class='del'>-</div><div class='del'>-	kref_get(&amp;mgr-&gt;kref);</div><div class='del'>-</div><div class='del'>-	return mgr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void amp_mgr_destroy(struct kref *kref)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr = container_of(kref, struct amp_mgr, kref);</div><div class='del'>-</div><div class='del'>-	BT_DBG("mgr %p", mgr);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;amp_mgr_list_lock);</div><div class='del'>-	list_del(&amp;mgr-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;amp_mgr_list_lock);</div><div class='del'>-</div><div class='del'>-	amp_ctrl_list_flush(mgr);</div><div class='del'>-	kfree(mgr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int amp_mgr_put(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("mgr %p orig refcnt %d", mgr, kref_read(&amp;mgr-&gt;kref));</div><div class='del'>-</div><div class='del'>-	return kref_put(&amp;mgr-&gt;kref, &amp;amp_mgr_destroy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct amp_mgr *amp_mgr_create(struct l2cap_conn *conn, bool locked)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-</div><div class='del'>-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("conn %p mgr %p", conn, mgr);</div><div class='del'>-</div><div class='del'>-	mgr-&gt;l2cap_conn = conn;</div><div class='del'>-</div><div class='del'>-	chan = a2mp_chan_open(conn, locked);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		kfree(mgr);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mgr-&gt;a2mp_chan = chan;</div><div class='del'>-	chan-&gt;data = mgr;</div><div class='del'>-</div><div class='del'>-	conn-&gt;hcon-&gt;amp_mgr = mgr;</div><div class='del'>-</div><div class='del'>-	kref_init(&amp;mgr-&gt;kref);</div><div class='del'>-</div><div class='del'>-	/* Remote AMP ctrl list initialization */</div><div class='del'>-	INIT_LIST_HEAD(&amp;mgr-&gt;amp_ctrls);</div><div class='del'>-	mutex_init(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;amp_mgr_list_lock);</div><div class='del'>-	list_add(&amp;mgr-&gt;list, &amp;amp_mgr_list);</div><div class='del'>-	mutex_unlock(&amp;amp_mgr_list_lock);</div><div class='del'>-</div><div class='del'>-	return mgr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;hcon-&gt;type != ACL_LINK)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	mgr = amp_mgr_create(conn, false);</div><div class='del'>-	if (!mgr) {</div><div class='del'>-		BT_ERR("Could not create AMP manager");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BT_DBG("mgr: %p chan %p", mgr, mgr-&gt;a2mp_chan);</div><div class='del'>-</div><div class='del'>-	return mgr-&gt;a2mp_chan;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void a2mp_send_getinfo_rsp(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-	struct a2mp_info_rsp rsp;</div><div class='del'>-</div><div class='del'>-	mgr = amp_mgr_lookup_by_state(READ_LOC_AMP_INFO);</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s mgr %p", hdev-&gt;name, mgr);</div><div class='del'>-</div><div class='del'>-	rsp.id = hdev-&gt;id;</div><div class='del'>-	rsp.status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;amp_type != AMP_TYPE_BREDR) {</div><div class='del'>-		rsp.status = 0;</div><div class='del'>-		rsp.total_bw = cpu_to_le32(hdev-&gt;amp_total_bw);</div><div class='del'>-		rsp.max_bw = cpu_to_le32(hdev-&gt;amp_max_bw);</div><div class='del'>-		rsp.min_latency = cpu_to_le32(hdev-&gt;amp_min_latency);</div><div class='del'>-		rsp.pal_cap = cpu_to_le16(hdev-&gt;amp_pal_cap);</div><div class='del'>-		rsp.assoc_size = cpu_to_le16(hdev-&gt;amp_assoc_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a2mp_send(mgr, A2MP_GETINFO_RSP, mgr-&gt;ident, sizeof(rsp), &amp;rsp);</div><div class='del'>-	amp_mgr_put(mgr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-	struct amp_assoc *loc_assoc = &amp;hdev-&gt;loc_assoc;</div><div class='del'>-	struct a2mp_amp_assoc_rsp *rsp;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	mgr = amp_mgr_lookup_by_state(READ_LOC_AMP_ASSOC);</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s mgr %p", hdev-&gt;name, mgr);</div><div class='del'>-</div><div class='del'>-	len = sizeof(struct a2mp_amp_assoc_rsp) + loc_assoc-&gt;len;</div><div class='del'>-	rsp = kzalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!rsp) {</div><div class='del'>-		amp_mgr_put(mgr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rsp-&gt;id = hdev-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		rsp-&gt;status = A2MP_STATUS_INVALID_CTRL_ID;</div><div class='del'>-	} else {</div><div class='del'>-		rsp-&gt;status = A2MP_STATUS_SUCCESS;</div><div class='del'>-		memcpy(rsp-&gt;amp_assoc, loc_assoc-&gt;data, loc_assoc-&gt;len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, mgr-&gt;ident, len, rsp);</div><div class='del'>-	amp_mgr_put(mgr);</div><div class='del'>-	kfree(rsp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-	struct amp_assoc *loc_assoc = &amp;hdev-&gt;loc_assoc;</div><div class='del'>-	struct a2mp_physlink_req *req;</div><div class='del'>-	struct l2cap_chan *bredr_chan;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	mgr = amp_mgr_lookup_by_state(READ_LOC_AMP_ASSOC_FINAL);</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = sizeof(*req) + loc_assoc-&gt;len;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s mgr %p assoc_len %zu", hdev-&gt;name, mgr, len);</div><div class='del'>-</div><div class='del'>-	req = kzalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		amp_mgr_put(mgr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bredr_chan = mgr-&gt;bredr_chan;</div><div class='del'>-	if (!bredr_chan)</div><div class='del'>-		goto clean;</div><div class='del'>-</div><div class='del'>-	req-&gt;local_id = hdev-&gt;id;</div><div class='del'>-	req-&gt;remote_id = bredr_chan-&gt;remote_amp_id;</div><div class='del'>-	memcpy(req-&gt;amp_assoc, loc_assoc-&gt;data, loc_assoc-&gt;len);</div><div class='del'>-</div><div class='del'>-	a2mp_send(mgr, A2MP_CREATEPHYSLINK_REQ, __next_ident(mgr), len, req);</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	amp_mgr_put(mgr);</div><div class='del'>-	kfree(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void a2mp_send_create_phy_link_rsp(struct hci_dev *hdev, u8 status)</div><div class='del'>-{</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-	struct a2mp_physlink_rsp rsp;</div><div class='del'>-	struct hci_conn *hs_hcon;</div><div class='del'>-</div><div class='del'>-	mgr = amp_mgr_lookup_by_state(WRITE_REMOTE_AMP_ASSOC);</div><div class='del'>-	if (!mgr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hs_hcon = hci_conn_hash_lookup_state(hdev, AMP_LINK, BT_CONNECT);</div><div class='del'>-	if (!hs_hcon) {</div><div class='del'>-		rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION;</div><div class='del'>-	} else {</div><div class='del'>-		rsp.remote_id = hs_hcon-&gt;remote_id;</div><div class='del'>-		rsp.status = A2MP_STATUS_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s mgr %p hs_hcon %p status %u", hdev-&gt;name, mgr, hs_hcon,</div><div class='del'>-	       status);</div><div class='del'>-</div><div class='del'>-	rsp.local_id = hdev-&gt;id;</div><div class='del'>-	a2mp_send(mgr, A2MP_CREATEPHYSLINK_RSP, mgr-&gt;ident, sizeof(rsp), &amp;rsp);</div><div class='del'>-	amp_mgr_put(mgr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void a2mp_discover_amp(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='del'>-	struct amp_mgr *mgr = conn-&gt;hcon-&gt;amp_mgr;</div><div class='del'>-	struct a2mp_discov_req req;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p conn %p mgr %p", chan, conn, mgr);</div><div class='del'>-</div><div class='del'>-	if (!mgr) {</div><div class='del'>-		mgr = amp_mgr_create(conn, true);</div><div class='del'>-		if (!mgr)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mgr-&gt;bredr_chan = chan;</div><div class='del'>-</div><div class='del'>-	req.mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);</div><div class='del'>-	req.ext_feat = 0;</div><div class='del'>-	a2mp_send(mgr, A2MP_DISCOVER_REQ, 1, sizeof(req), &amp;req);</div><div class='del'>-}</div><div class='head'>diff --git a/net/bluetooth/a2mp.h b/net/bluetooth/a2mp.h<br/>deleted file mode 100644<br/>index a4ff3ea9b38a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/a2mp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/a2mp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   Copyright (c) 2010,2011 Code Aurora Forum.  All rights reserved.</div><div class='del'>-   Copyright (c) 2011,2012 Intel Corp.</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 and</div><div class='del'>-   only version 2 as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __A2MP_H</div><div class='del'>-#define __A2MP_H</div><div class='del'>-</div><div class='del'>-#include &lt;net/bluetooth/l2cap.h&gt;</div><div class='del'>-</div><div class='del'>-enum amp_mgr_state {</div><div class='del'>-	READ_LOC_AMP_INFO,</div><div class='del'>-	READ_LOC_AMP_ASSOC,</div><div class='del'>-	READ_LOC_AMP_ASSOC_FINAL,</div><div class='del'>-	WRITE_REMOTE_AMP_ASSOC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct amp_mgr {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct l2cap_conn	*l2cap_conn;</div><div class='del'>-	struct l2cap_chan	*a2mp_chan;</div><div class='del'>-	struct l2cap_chan	*bredr_chan;</div><div class='del'>-	struct kref		kref;</div><div class='del'>-	__u8			ident;</div><div class='del'>-	__u8			handle;</div><div class='del'>-	unsigned long		state;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	struct list_head	amp_ctrls;</div><div class='del'>-	struct mutex		amp_ctrls_lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct a2mp_cmd {</div><div class='del'>-	__u8	code;</div><div class='del'>-	__u8	ident;</div><div class='del'>-	__le16	len;</div><div class='del'>-	__u8	data[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* A2MP command codes */</div><div class='del'>-#define A2MP_COMMAND_REJ         0x01</div><div class='del'>-struct a2mp_cmd_rej {</div><div class='del'>-	__le16	reason;</div><div class='del'>-	__u8	data[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_DISCOVER_REQ        0x02</div><div class='del'>-struct a2mp_discov_req {</div><div class='del'>-	__le16	mtu;</div><div class='del'>-	__le16	ext_feat;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct a2mp_cl {</div><div class='del'>-	__u8	id;</div><div class='del'>-	__u8	type;</div><div class='del'>-	__u8	status;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_DISCOVER_RSP        0x03</div><div class='del'>-struct a2mp_discov_rsp {</div><div class='del'>-	__le16     mtu;</div><div class='del'>-	__le16     ext_feat;</div><div class='del'>-	struct a2mp_cl cl[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_CHANGE_NOTIFY       0x04</div><div class='del'>-#define A2MP_CHANGE_RSP          0x05</div><div class='del'>-</div><div class='del'>-#define A2MP_GETINFO_REQ         0x06</div><div class='del'>-struct a2mp_info_req {</div><div class='del'>-	__u8       id;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_GETINFO_RSP         0x07</div><div class='del'>-struct a2mp_info_rsp {</div><div class='del'>-	__u8	id;</div><div class='del'>-	__u8	status;</div><div class='del'>-	__le32	total_bw;</div><div class='del'>-	__le32	max_bw;</div><div class='del'>-	__le32	min_latency;</div><div class='del'>-	__le16	pal_cap;</div><div class='del'>-	__le16	assoc_size;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_GETAMPASSOC_REQ     0x08</div><div class='del'>-struct a2mp_amp_assoc_req {</div><div class='del'>-	__u8	id;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_GETAMPASSOC_RSP     0x09</div><div class='del'>-struct a2mp_amp_assoc_rsp {</div><div class='del'>-	__u8	id;</div><div class='del'>-	__u8	status;</div><div class='del'>-	__u8	amp_assoc[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_CREATEPHYSLINK_REQ  0x0A</div><div class='del'>-#define A2MP_DISCONNPHYSLINK_REQ 0x0C</div><div class='del'>-struct a2mp_physlink_req {</div><div class='del'>-	__u8	local_id;</div><div class='del'>-	__u8	remote_id;</div><div class='del'>-	__u8	amp_assoc[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define A2MP_CREATEPHYSLINK_RSP  0x0B</div><div class='del'>-#define A2MP_DISCONNPHYSLINK_RSP 0x0D</div><div class='del'>-struct a2mp_physlink_rsp {</div><div class='del'>-	__u8	local_id;</div><div class='del'>-	__u8	remote_id;</div><div class='del'>-	__u8	status;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* A2MP response status */</div><div class='del'>-#define A2MP_STATUS_SUCCESS			0x00</div><div class='del'>-#define A2MP_STATUS_INVALID_CTRL_ID		0x01</div><div class='del'>-#define A2MP_STATUS_UNABLE_START_LINK_CREATION	0x02</div><div class='del'>-#define A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS	0x02</div><div class='del'>-#define A2MP_STATUS_COLLISION_OCCURED		0x03</div><div class='del'>-#define A2MP_STATUS_DISCONN_REQ_RECVD		0x04</div><div class='del'>-#define A2MP_STATUS_PHYS_LINK_EXISTS		0x05</div><div class='del'>-#define A2MP_STATUS_SECURITY_VIOLATION		0x06</div><div class='del'>-</div><div class='del'>-struct amp_mgr *amp_mgr_get(struct amp_mgr *mgr);</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_BT_HS)</div><div class='del'>-int amp_mgr_put(struct amp_mgr *mgr);</div><div class='del'>-struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,</div><div class='del'>-				       struct sk_buff *skb);</div><div class='del'>-void a2mp_discover_amp(struct l2cap_chan *chan);</div><div class='del'>-#else</div><div class='del'>-static inline int amp_mgr_put(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,</div><div class='del'>-						     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void a2mp_discover_amp(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void a2mp_send_getinfo_rsp(struct hci_dev *hdev);</div><div class='del'>-void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status);</div><div class='del'>-void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status);</div><div class='del'>-void a2mp_send_create_phy_link_rsp(struct hci_dev *hdev, u8 status);</div><div class='del'>-</div><div class='del'>-#endif /* __A2MP_H */</div><div class='head'>diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c<br/>index deacc52d7ff1..2b94e2077203 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/af_bluetooth.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/af_bluetooth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/af_bluetooth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/af_bluetooth.c</a></div><div class='hunk'>@@ -34,11 +34,14 @@</div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/sockios.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "leds.h"</div><div class='ctx'> #include "selftest.h"</div><div class='ctx'> </div><div class='ctx'> /* Bluetooth sockets */</div><div class='del'>-#define BT_MAX_PROTO	8</div><div class='add'>+#define BT_MAX_PROTO	(BTPROTO_LAST + 1)</div><div class='ctx'> static const struct net_proto_family *bt_proto[BT_MAX_PROTO];</div><div class='ctx'> static DEFINE_RWLOCK(bt_proto_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +55,7 @@ static const char *const bt_key_strings[BT_MAX_PROTO] = {</div><div class='ctx'> 	"sk_lock-AF_BLUETOOTH-BTPROTO_CMTP",</div><div class='ctx'> 	"sk_lock-AF_BLUETOOTH-BTPROTO_HIDP",</div><div class='ctx'> 	"sk_lock-AF_BLUETOOTH-BTPROTO_AVDTP",</div><div class='add'>+	"sk_lock-AF_BLUETOOTH-BTPROTO_ISO",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct lock_class_key bt_slock_key[BT_MAX_PROTO];</div><div class='hunk'>@@ -64,6 +68,7 @@ static const char *const bt_slock_key_strings[BT_MAX_PROTO] = {</div><div class='ctx'> 	"slock-AF_BLUETOOTH-BTPROTO_CMTP",</div><div class='ctx'> 	"slock-AF_BLUETOOTH-BTPROTO_HIDP",</div><div class='ctx'> 	"slock-AF_BLUETOOTH-BTPROTO_AVDTP",</div><div class='add'>+	"slock-AF_BLUETOOTH-BTPROTO_ISO",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void bt_sock_reclassify_lock(struct sock *sk, int proto)</div><div class='hunk'>@@ -72,8 +77,8 @@ void bt_sock_reclassify_lock(struct sock *sk, int proto)</div><div class='ctx'> 	BUG_ON(!sock_allow_reclassification(sk));</div><div class='ctx'> </div><div class='ctx'> 	sock_lock_init_class_and_name(sk,</div><div class='del'>-			bt_slock_key_strings[proto], &amp;bt_slock_key[proto],</div><div class='del'>-				bt_key_strings[proto], &amp;bt_lock_key[proto]);</div><div class='add'>+				      bt_slock_key_strings[proto], &amp;bt_slock_key[proto],</div><div class='add'>+				      bt_key_strings[proto], &amp;bt_lock_key[proto]);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_sock_reclassify_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -138,6 +143,35 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sock *bt_sock_alloc(struct net *net, struct socket *sock,</div><div class='add'>+			   struct proto *prot, int proto, gfp_t prio, int kern)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = sk_alloc(net, PF_BLUETOOTH, prio, prot, kern);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sock_init_data(sock, sk);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bt_sk(sk)-&gt;accept_q);</div><div class='add'>+</div><div class='add'>+	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_protocol = proto;</div><div class='add'>+	sk-&gt;sk_state    = BT_OPEN;</div><div class='add'>+</div><div class='add'>+	/* Init peer information so it can be properly monitored */</div><div class='add'>+	if (!kern) {</div><div class='add'>+		spin_lock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+		sk-&gt;sk_peer_pid  = get_pid(task_tgid(current));</div><div class='add'>+		sk-&gt;sk_peer_cred = get_current_cred();</div><div class='add'>+		spin_unlock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bt_sock_alloc);</div><div class='add'>+</div><div class='ctx'> void bt_sock_link(struct bt_sock_list *l, struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	write_lock(&amp;l-&gt;lock);</div><div class='hunk'>@@ -154,16 +188,64 @@ void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_sock_unlink);</div><div class='ctx'> </div><div class='del'>-void bt_accept_enqueue(struct sock *parent, struct sock *sk)</div><div class='add'>+bool bt_sock_linked(struct bt_sock_list *l, struct sock *s)</div><div class='ctx'> {</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (!l || !s)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;l-&gt;lock);</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;l-&gt;head) {</div><div class='add'>+		if (s == sk) {</div><div class='add'>+			read_unlock(&amp;l-&gt;lock);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_unlock(&amp;l-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bt_sock_linked);</div><div class='add'>+</div><div class='add'>+void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)</div><div class='add'>+{</div><div class='add'>+	const struct cred *old_cred;</div><div class='add'>+	struct pid *old_pid;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("parent %p, sk %p", parent, sk);</div><div class='ctx'> </div><div class='ctx'> 	sock_hold(sk);</div><div class='del'>-	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);</div><div class='add'>+</div><div class='add'>+	if (bh)</div><div class='add'>+		bh_lock_sock_nested(sk);</div><div class='add'>+	else</div><div class='add'>+		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);</div><div class='add'>+</div><div class='ctx'> 	list_add_tail(&amp;bt_sk(sk)-&gt;accept_q, &amp;bt_sk(parent)-&gt;accept_q);</div><div class='ctx'> 	bt_sk(sk)-&gt;parent = parent;</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	parent-&gt;sk_ack_backlog++;</div><div class='add'>+</div><div class='add'>+	/* Copy credentials from parent since for incoming connections the</div><div class='add'>+	 * socket is allocated by the kernel.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+	old_pid = sk-&gt;sk_peer_pid;</div><div class='add'>+	old_cred = sk-&gt;sk_peer_cred;</div><div class='add'>+	sk-&gt;sk_peer_pid = get_pid(parent-&gt;sk_peer_pid);</div><div class='add'>+	sk-&gt;sk_peer_cred = get_cred(parent-&gt;sk_peer_cred);</div><div class='add'>+	spin_unlock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+</div><div class='add'>+	put_pid(old_pid);</div><div class='add'>+	put_cred(old_cred);</div><div class='add'>+</div><div class='add'>+	if (bh)</div><div class='add'>+		bh_unlock_sock(sk);</div><div class='add'>+	else</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+	sk_acceptq_added(parent);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_accept_enqueue);</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +257,7 @@ void bt_accept_unlink(struct sock *sk)</div><div class='ctx'> 	BT_DBG("sk %p state %d", sk, sk-&gt;sk_state);</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;bt_sk(sk)-&gt;accept_q);</div><div class='del'>-	bt_sk(sk)-&gt;parent-&gt;sk_ack_backlog--;</div><div class='add'>+	sk_acceptq_removed(bt_sk(sk)-&gt;parent);</div><div class='ctx'> 	bt_sk(sk)-&gt;parent = NULL;</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='hunk'>@@ -241,7 +323,6 @@ EXPORT_SYMBOL(bt_accept_dequeue);</div><div class='ctx'> int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 		    int flags)</div><div class='ctx'> {</div><div class='del'>-	int noblock = flags &amp; MSG_DONTWAIT;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	size_t copied;</div><div class='hunk'>@@ -253,10 +334,10 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (flags &amp; MSG_OOB)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='del'>-			return 0;</div><div class='add'>+			err = 0;</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -271,11 +352,25 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='ctx'> 	err = skb_copy_datagram_msg(skb, 0, msg, copied);</div><div class='ctx'> 	if (err == 0) {</div><div class='del'>-		sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+		sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 		if (msg-&gt;msg_name &amp;&amp; bt_sk(sk)-&gt;skb_msg_name)</div><div class='ctx'> 			bt_sk(sk)-&gt;skb_msg_name(skb, msg-&gt;msg_name,</div><div class='ctx'> 						&amp;msg-&gt;msg_namelen);</div><div class='add'>+</div><div class='add'>+		if (test_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+			u8 pkt_status = hci_skb_pkt_status(skb);</div><div class='add'>+</div><div class='add'>+			put_cmsg(msg, SOL_BLUETOOTH, BT_SCM_PKT_STATUS,</div><div class='add'>+				 sizeof(pkt_status), &amp;pkt_status);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(BT_SK_PKT_SEQNUM, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+			u16 pkt_seqnum = hci_skb_pkt_seqnum(skb);</div><div class='add'>+</div><div class='add'>+			put_cmsg(msg, SOL_BLUETOOTH, BT_SCM_PKT_SEQNUM,</div><div class='add'>+				 sizeof(pkt_seqnum), &amp;pkt_seqnum);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_free_datagram(sk, skb);</div><div class='hunk'>@@ -372,7 +467,7 @@ int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		copied += chunk;</div><div class='ctx'> 		size   -= chunk;</div><div class='ctx'> </div><div class='del'>-		sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+		sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!(flags &amp; MSG_PEEK)) {</div><div class='ctx'> 			int skb_len = skb_headlen(skb);</div><div class='hunk'>@@ -438,19 +533,17 @@ static inline __poll_t bt_accept_poll(struct sock *parent)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __poll_t bt_sock_poll(struct file *file, struct socket *sock,</div><div class='del'>-			  poll_table *wait)</div><div class='add'>+		      poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	__poll_t mask = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='del'>-</div><div class='ctx'> 	poll_wait(file, sk_sleep(sk), wait);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_LISTEN)</div><div class='ctx'> 		return bt_accept_poll(sk);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_err || !skb_queue_empty(&amp;sk-&gt;sk_error_queue))</div><div class='add'>+	if (sk-&gt;sk_err || !skb_queue_empty_lockless(&amp;sk-&gt;sk_error_queue))</div><div class='ctx'> 		mask |= EPOLLERR |</div><div class='ctx'> 			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);</div><div class='ctx'> </div><div class='hunk'>@@ -460,15 +553,15 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,</div><div class='ctx'> 	if (sk-&gt;sk_shutdown == SHUTDOWN_MASK)</div><div class='ctx'> 		mask |= EPOLLHUP;</div><div class='ctx'> </div><div class='del'>-	if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+	if (!skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue))</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CLOSED)</div><div class='ctx'> 		mask |= EPOLLHUP;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CONNECT ||</div><div class='del'>-			sk-&gt;sk_state == BT_CONNECT2 ||</div><div class='del'>-			sk-&gt;sk_state == BT_CONFIG)</div><div class='add'>+	    sk-&gt;sk_state == BT_CONNECT2 ||</div><div class='add'>+	    sk-&gt;sk_state == BT_CONFIG)</div><div class='ctx'> 		return mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(BT_SK_SUSPEND, &amp;bt_sk(sk)-&gt;flags) &amp;&amp; sock_writeable(sk))</div><div class='hunk'>@@ -480,6 +573,86 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_sock_poll);</div><div class='ctx'> </div><div class='add'>+static int bt_ethtool_get_ts_info(struct sock *sk, unsigned int index,</div><div class='add'>+				  void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_ts_info info;</div><div class='add'>+	struct kernel_ethtool_ts_info ts_info = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hci_ethtool_ts_info(index, sk-&gt;sk_protocol, &amp;ts_info);</div><div class='add'>+	if (ret == -ENODEV)</div><div class='add'>+		return ret;</div><div class='add'>+	else if (ret &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+</div><div class='add'>+	info.cmd = ETHTOOL_GET_TS_INFO;</div><div class='add'>+	info.so_timestamping = ts_info.so_timestamping;</div><div class='add'>+	info.phc_index = ts_info.phc_index;</div><div class='add'>+	info.tx_types = ts_info.tx_types;</div><div class='add'>+	info.rx_filters = ts_info.rx_filters;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(useraddr, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt_ethtool(struct sock *sk, const struct ifreq *ifr,</div><div class='add'>+		      void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	unsigned int index;</div><div class='add'>+	u32 ethcmd;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;ethcmd, useraddr, sizeof(ethcmd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (sscanf(ifr-&gt;ifr_name, "hci%u%n", &amp;index, &amp;n) != 1 ||</div><div class='add'>+	    n != strlen(ifr-&gt;ifr_name))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	switch (ethcmd) {</div><div class='add'>+	case ETHTOOL_GET_TS_INFO:</div><div class='add'>+		return bt_ethtool_get_ts_info(sk, index, useraddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct ifreq ifr = {};</div><div class='add'>+	void __user *data;</div><div class='add'>+	char *colon;</div><div class='add'>+	int ret = -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	if (get_user_ifreq(&amp;ifr, &amp;data, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	ifr.ifr_name[IFNAMSIZ - 1] = 0;</div><div class='add'>+	colon = strchr(ifr.ifr_name, ':');</div><div class='add'>+	if (colon)</div><div class='add'>+		*colon = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCETHTOOL:</div><div class='add'>+		ret = bt_ethtool(sk, &amp;ifr, data);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (colon)</div><div class='add'>+		*colon = ':';</div><div class='add'>+</div><div class='add'>+	if (put_user_ifreq(&amp;ifr, arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -497,26 +670,23 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		amount = sk-&gt;sk_sndbuf - sk_wmem_alloc_get(sk);</div><div class='ctx'> 		if (amount &lt; 0)</div><div class='ctx'> 			amount = 0;</div><div class='del'>-		err = put_user(amount, (int __user *) arg);</div><div class='add'>+		err = put_user(amount, (int __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TIOCINQ:</div><div class='ctx'> 		if (sk-&gt;sk_state == BT_LISTEN)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='add'>+		spin_lock(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		amount = skb ? skb-&gt;len : 0;</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		err = put_user(amount, (int __user *) arg);</div><div class='del'>-		break;</div><div class='add'>+		spin_unlock(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> </div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		err = sock_get_timestamp(sk, (struct timeval __user *) arg);</div><div class='add'>+		err = put_user(amount, (int __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		err = sock_get_timestampns(sk, (struct timespec __user *) arg);</div><div class='add'>+	case SIOCETHTOOL:</div><div class='add'>+		err = bt_dev_ioctl(sock, cmd, (void __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -565,7 +735,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)</div><div class='ctx'> EXPORT_SYMBOL(bt_sock_wait_state);</div><div class='ctx'> </div><div class='ctx'> /* This function expects the sk lock to be held when called */</div><div class='del'>-int bt_sock_wait_ready(struct sock *sk, unsigned long flags)</div><div class='add'>+int bt_sock_wait_ready(struct sock *sk, unsigned int msg_flags)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	unsigned long timeo;</div><div class='hunk'>@@ -573,7 +743,7 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='del'>-	timeo = sock_sndtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+	timeo = sock_sndtimeo(sk, !!(msg_flags &amp; MSG_DONTWAIT));</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='hunk'>@@ -608,7 +778,7 @@ EXPORT_SYMBOL(bt_sock_wait_ready);</div><div class='ctx'> static void *bt_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	__acquires(seq-&gt;private-&gt;l-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	struct bt_sock_list *l = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bt_sock_list *l = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;l-&gt;lock);</div><div class='ctx'> 	return seq_hlist_start_head(&amp;l-&gt;head, *pos);</div><div class='hunk'>@@ -616,7 +786,7 @@ static void *bt_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct bt_sock_list *l = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bt_sock_list *l = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='ctx'> 	return seq_hlist_next(v, &amp;l-&gt;head, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -624,17 +794,17 @@ static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> static void bt_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	__releases(seq-&gt;private-&gt;l-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	struct bt_sock_list *l = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bt_sock_list *l = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='ctx'> 	read_unlock(&amp;l-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bt_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct bt_sock_list *l = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bt_sock_list *l = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_puts(seq ,"sk               RefCnt Rmem   Wmem   User   Inode  Parent");</div><div class='add'>+		seq_puts(seq, "sk               RefCnt Rmem   Wmem   User   Inode  Parent");</div><div class='ctx'> </div><div class='ctx'> 		if (l-&gt;custom_seq_show) {</div><div class='ctx'> 			seq_putc(seq, ' ');</div><div class='hunk'>@@ -652,9 +822,9 @@ static int bt_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			   refcount_read(&amp;sk-&gt;sk_refcnt),</div><div class='ctx'> 			   sk_rmem_alloc_get(sk),</div><div class='ctx'> 			   sk_wmem_alloc_get(sk),</div><div class='del'>-			   from_kuid(seq_user_ns(seq), sock_i_uid(sk)),</div><div class='add'>+			   from_kuid(seq_user_ns(seq), sk_uid(sk)),</div><div class='ctx'> 			   sock_i_ino(sk),</div><div class='del'>-			   bt-&gt;parent? sock_i_ino(bt-&gt;parent): 0LU);</div><div class='add'>+			   bt-&gt;parent ? sock_i_ino(bt-&gt;parent) : 0LU);</div><div class='ctx'> </div><div class='ctx'> 		if (l-&gt;custom_seq_show) {</div><div class='ctx'> 			seq_putc(seq, ' ');</div><div class='hunk'>@@ -675,7 +845,7 @@ static const struct seq_operations bt_seq_ops = {</div><div class='ctx'> </div><div class='ctx'> int bt_procfs_init(struct net *net, const char *name,</div><div class='ctx'> 		   struct bt_sock_list *sk_list,</div><div class='del'>-		   int (* seq_show)(struct seq_file *, void *))</div><div class='add'>+		   int (*seq_show)(struct seq_file *, void *))</div><div class='ctx'> {</div><div class='ctx'> 	sk_list-&gt;custom_seq_show = seq_show;</div><div class='ctx'> </div><div class='hunk'>@@ -691,7 +861,7 @@ void bt_procfs_cleanup(struct net *net, const char *name)</div><div class='ctx'> #else</div><div class='ctx'> int bt_procfs_init(struct net *net, const char *name,</div><div class='ctx'> 		   struct bt_sock_list *sk_list,</div><div class='del'>-		   int (* seq_show)(struct seq_file *, void *))</div><div class='add'>+		   int (*seq_show)(struct seq_file *, void *))</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -733,7 +903,7 @@ static int __init bt_init(void)</div><div class='ctx'> </div><div class='ctx'> 	err = bt_sysfs_init();</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto cleanup_led;</div><div class='ctx'> </div><div class='ctx'> 	err = sock_register(&amp;bt_sock_family_ops);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -769,11 +939,16 @@ unregister_socket:</div><div class='ctx'> 	sock_unregister(PF_BLUETOOTH);</div><div class='ctx'> cleanup_sysfs:</div><div class='ctx'> 	bt_sysfs_cleanup();</div><div class='add'>+cleanup_led:</div><div class='add'>+	bt_leds_cleanup();</div><div class='add'>+	debugfs_remove_recursive(bt_debugfs);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit bt_exit(void)</div><div class='ctx'> {</div><div class='add'>+	iso_exit();</div><div class='add'>+</div><div class='ctx'> 	mgmt_exit();</div><div class='ctx'> </div><div class='ctx'> 	sco_exit();</div><div class='head'>diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c<br/>deleted file mode 100644<br/>index 78bec8df8525..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/amp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/amp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,596 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   Copyright (c) 2011,2012 Intel Corp.</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 and</div><div class='del'>-   only version 2 as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/hci.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hci_request.h"</div><div class='del'>-#include "a2mp.h"</div><div class='del'>-#include "amp.h"</div><div class='del'>-</div><div class='del'>-/* Remote AMP Controllers interface */</div><div class='del'>-void amp_ctrl_get(struct amp_ctrl *ctrl)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("ctrl %p orig refcnt %d", ctrl,</div><div class='del'>-	       kref_read(&amp;ctrl-&gt;kref));</div><div class='del'>-</div><div class='del'>-	kref_get(&amp;ctrl-&gt;kref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void amp_ctrl_destroy(struct kref *kref)</div><div class='del'>-{</div><div class='del'>-	struct amp_ctrl *ctrl = container_of(kref, struct amp_ctrl, kref);</div><div class='del'>-</div><div class='del'>-	BT_DBG("ctrl %p", ctrl);</div><div class='del'>-</div><div class='del'>-	kfree(ctrl-&gt;assoc);</div><div class='del'>-	kfree(ctrl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int amp_ctrl_put(struct amp_ctrl *ctrl)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("ctrl %p orig refcnt %d", ctrl,</div><div class='del'>-	       kref_read(&amp;ctrl-&gt;kref));</div><div class='del'>-</div><div class='del'>-	return kref_put(&amp;ctrl-&gt;kref, &amp;amp_ctrl_destroy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr, u8 id)</div><div class='del'>-{</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-</div><div class='del'>-	ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);</div><div class='del'>-	if (!ctrl)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	kref_init(&amp;ctrl-&gt;kref);</div><div class='del'>-	ctrl-&gt;id = id;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-	list_add(&amp;ctrl-&gt;list, &amp;mgr-&gt;amp_ctrls);</div><div class='del'>-	mutex_unlock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-</div><div class='del'>-	BT_DBG("mgr %p ctrl %p", mgr, ctrl);</div><div class='del'>-</div><div class='del'>-	return ctrl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_ctrl_list_flush(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	struct amp_ctrl *ctrl, *n;</div><div class='del'>-</div><div class='del'>-	BT_DBG("mgr %p", mgr);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-	list_for_each_entry_safe(ctrl, n, &amp;mgr-&gt;amp_ctrls, list) {</div><div class='del'>-		list_del(&amp;ctrl-&gt;list);</div><div class='del'>-		amp_ctrl_put(ctrl);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct amp_ctrl *amp_ctrl_lookup(struct amp_mgr *mgr, u8 id)</div><div class='del'>-{</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-</div><div class='del'>-	BT_DBG("mgr %p id %d", mgr, id);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-	list_for_each_entry(ctrl, &amp;mgr-&gt;amp_ctrls, list) {</div><div class='del'>-		if (ctrl-&gt;id == id) {</div><div class='del'>-			amp_ctrl_get(ctrl);</div><div class='del'>-			mutex_unlock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-			return ctrl;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;mgr-&gt;amp_ctrls_lock);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Physical Link interface */</div><div class='del'>-static u8 __next_handle(struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	if (++mgr-&gt;handle == 0)</div><div class='del'>-		mgr-&gt;handle = 1;</div><div class='del'>-</div><div class='del'>-	return mgr-&gt;handle;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			     u8 remote_id, bool out)</div><div class='del'>-{</div><div class='del'>-	bdaddr_t *dst = &amp;mgr-&gt;l2cap_conn-&gt;hcon-&gt;dst;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-	u8 role = out ? HCI_ROLE_MASTER : HCI_ROLE_SLAVE;</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_add(hdev, AMP_LINK, dst, role);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("hcon %p dst %pMR", hcon, dst);</div><div class='del'>-</div><div class='del'>-	hcon-&gt;state = BT_CONNECT;</div><div class='del'>-	hcon-&gt;attempt++;</div><div class='del'>-	hcon-&gt;handle = __next_handle(mgr);</div><div class='del'>-	hcon-&gt;remote_id = remote_id;</div><div class='del'>-	hcon-&gt;amp_mgr = amp_mgr_get(mgr);</div><div class='del'>-</div><div class='del'>-	return hcon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* AMP crypto key generation interface */</div><div class='del'>-static int hmac_sha256(u8 *key, u8 ksize, char *plaintext, u8 psize, u8 *output)</div><div class='del'>-{</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='del'>-	struct shash_desc *shash;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ksize)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tfm = crypto_alloc_shash("hmac(sha256)", 0, 0);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		BT_DBG("crypto_alloc_ahash failed: err %ld", PTR_ERR(tfm));</div><div class='del'>-		return PTR_ERR(tfm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_shash_setkey(tfm, key, ksize);</div><div class='del'>-	if (ret) {</div><div class='del'>-		BT_DBG("crypto_ahash_setkey failed: err %d", ret);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shash = kzalloc(sizeof(*shash) + crypto_shash_descsize(tfm),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!shash) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shash-&gt;tfm = tfm;</div><div class='del'>-	shash-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	ret = crypto_shash_digest(shash, plaintext, psize, output);</div><div class='del'>-</div><div class='del'>-	kfree(shash);</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	crypto_free_shash(tfm);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int phylink_gen_key(struct hci_conn *conn, u8 *data, u8 *len, u8 *type)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	struct link_key *key;</div><div class='del'>-	u8 keybuf[HCI_AMP_LINK_KEY_SIZE];</div><div class='del'>-	u8 gamp_key[HCI_AMP_LINK_KEY_SIZE];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!hci_conn_check_link_mode(conn))</div><div class='del'>-		return -EACCES;</div><div class='del'>-</div><div class='del'>-	BT_DBG("conn %p key_type %d", conn, conn-&gt;key_type);</div><div class='del'>-</div><div class='del'>-	/* Legacy key */</div><div class='del'>-	if (conn-&gt;key_type &lt; 3) {</div><div class='del'>-		bt_dev_err(hdev, "legacy key type %d", conn-&gt;key_type);</div><div class='del'>-		return -EACCES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*type = conn-&gt;key_type;</div><div class='del'>-	*len = HCI_AMP_LINK_KEY_SIZE;</div><div class='del'>-</div><div class='del'>-	key = hci_find_link_key(hdev, &amp;conn-&gt;dst);</div><div class='del'>-	if (!key) {</div><div class='del'>-		BT_DBG("No Link key for conn %p dst %pMR", conn, &amp;conn-&gt;dst);</div><div class='del'>-		return -EACCES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* BR/EDR Link Key concatenated together with itself */</div><div class='del'>-	memcpy(&amp;keybuf[0], key-&gt;val, HCI_LINK_KEY_SIZE);</div><div class='del'>-	memcpy(&amp;keybuf[HCI_LINK_KEY_SIZE], key-&gt;val, HCI_LINK_KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Derive Generic AMP Link Key (gamp) */</div><div class='del'>-	err = hmac_sha256(keybuf, HCI_AMP_LINK_KEY_SIZE, "gamp", 4, gamp_key);</div><div class='del'>-	if (err) {</div><div class='del'>-		bt_dev_err(hdev, "could not derive Generic AMP Key: err %d", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;key_type == HCI_LK_DEBUG_COMBINATION) {</div><div class='del'>-		BT_DBG("Use Generic AMP Key (gamp)");</div><div class='del'>-		memcpy(data, gamp_key, HCI_AMP_LINK_KEY_SIZE);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Derive Dedicated AMP Link Key: "802b" is 802.11 PAL keyID */</div><div class='del'>-	return hmac_sha256(gamp_key, HCI_AMP_LINK_KEY_SIZE, "802b", 4, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void read_local_amp_assoc_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-					  u16 opcode, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_rp_read_local_amp_assoc *rp = (void *)skb-&gt;data;</div><div class='del'>-	struct amp_assoc *assoc = &amp;hdev-&gt;loc_assoc;</div><div class='del'>-	size_t rem_len, frag_len;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (rp-&gt;status)</div><div class='del'>-		goto send_rsp;</div><div class='del'>-</div><div class='del'>-	frag_len = skb-&gt;len - sizeof(*rp);</div><div class='del'>-	rem_len = __le16_to_cpu(rp-&gt;rem_len);</div><div class='del'>-</div><div class='del'>-	if (rem_len &gt; frag_len) {</div><div class='del'>-		BT_DBG("frag_len %zu rem_len %zu", frag_len, rem_len);</div><div class='del'>-</div><div class='del'>-		memcpy(assoc-&gt;data + assoc-&gt;offset, rp-&gt;frag, frag_len);</div><div class='del'>-		assoc-&gt;offset += frag_len;</div><div class='del'>-</div><div class='del'>-		/* Read other fragments */</div><div class='del'>-		amp_read_loc_assoc_frag(hdev, rp-&gt;phy_handle);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(assoc-&gt;data + assoc-&gt;offset, rp-&gt;frag, rem_len);</div><div class='del'>-	assoc-&gt;len = assoc-&gt;offset + rem_len;</div><div class='del'>-	assoc-&gt;offset = 0;</div><div class='del'>-</div><div class='del'>-send_rsp:</div><div class='del'>-	/* Send A2MP Rsp when all fragments are received */</div><div class='del'>-	a2mp_send_getampassoc_rsp(hdev, rp-&gt;status);</div><div class='del'>-	a2mp_send_create_phy_link_req(hdev, rp-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_read_local_amp_assoc cp;</div><div class='del'>-	struct amp_assoc *loc_assoc = &amp;hdev-&gt;loc_assoc;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s handle %d", hdev-&gt;name, phy_handle);</div><div class='del'>-</div><div class='del'>-	cp.phy_handle = phy_handle;</div><div class='del'>-	cp.max_len = cpu_to_le16(hdev-&gt;amp_assoc_size);</div><div class='del'>-	cp.len_so_far = cpu_to_le16(loc_assoc-&gt;offset);</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &amp;cp);</div><div class='del'>-	err = hci_req_run_skb(&amp;req, read_local_amp_assoc_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		a2mp_send_getampassoc_rsp(hdev, A2MP_STATUS_INVALID_CTRL_ID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_read_local_amp_assoc cp;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;hdev-&gt;loc_assoc, 0, sizeof(struct amp_assoc));</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	cp.max_len = cpu_to_le16(hdev-&gt;amp_assoc_size);</div><div class='del'>-</div><div class='del'>-	set_bit(READ_LOC_AMP_ASSOC, &amp;mgr-&gt;state);</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &amp;cp);</div><div class='del'>-	err = hci_req_run_skb(&amp;req, read_local_amp_assoc_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		a2mp_send_getampassoc_rsp(hdev, A2MP_STATUS_INVALID_CTRL_ID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_read_loc_assoc_final_data(struct hci_dev *hdev,</div><div class='del'>-				   struct hci_conn *hcon)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_read_local_amp_assoc cp;</div><div class='del'>-	struct amp_mgr *mgr = hcon-&gt;amp_mgr;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	cp.phy_handle = hcon-&gt;handle;</div><div class='del'>-	cp.len_so_far = cpu_to_le16(0);</div><div class='del'>-	cp.max_len = cpu_to_le16(hdev-&gt;amp_assoc_size);</div><div class='del'>-</div><div class='del'>-	set_bit(READ_LOC_AMP_ASSOC_FINAL, &amp;mgr-&gt;state);</div><div class='del'>-</div><div class='del'>-	/* Read Local AMP Assoc final link information data */</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &amp;cp);</div><div class='del'>-	err = hci_req_run_skb(&amp;req, read_local_amp_assoc_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		a2mp_send_getampassoc_rsp(hdev, A2MP_STATUS_INVALID_CTRL_ID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void write_remote_amp_assoc_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-					    u16 opcode, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_rp_write_remote_amp_assoc *rp = (void *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x phy_handle 0x%2.2x",</div><div class='del'>-	       hdev-&gt;name, rp-&gt;status, rp-&gt;phy_handle);</div><div class='del'>-</div><div class='del'>-	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	amp_write_rem_assoc_continue(hdev, rp-&gt;phy_handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Write AMP Assoc data fragments, returns true with last fragment written*/</div><div class='del'>-static bool amp_write_rem_assoc_frag(struct hci_dev *hdev,</div><div class='del'>-				     struct hci_conn *hcon)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_write_remote_amp_assoc *cp;</div><div class='del'>-	struct amp_mgr *mgr = hcon-&gt;amp_mgr;</div><div class='del'>-	struct amp_ctrl *ctrl;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	u16 frag_len, len;</div><div class='del'>-</div><div class='del'>-	ctrl = amp_ctrl_lookup(mgr, hcon-&gt;remote_id);</div><div class='del'>-	if (!ctrl)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!ctrl-&gt;assoc_rem_len) {</div><div class='del'>-		BT_DBG("all fragments are written");</div><div class='del'>-		ctrl-&gt;assoc_rem_len = ctrl-&gt;assoc_len;</div><div class='del'>-		ctrl-&gt;assoc_len_so_far = 0;</div><div class='del'>-</div><div class='del'>-		amp_ctrl_put(ctrl);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	frag_len = min_t(u16, 248, ctrl-&gt;assoc_rem_len);</div><div class='del'>-	len = frag_len + sizeof(*cp);</div><div class='del'>-</div><div class='del'>-	cp = kzalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!cp) {</div><div class='del'>-		amp_ctrl_put(ctrl);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BT_DBG("hcon %p ctrl %p frag_len %u assoc_len %u rem_len %u",</div><div class='del'>-	       hcon, ctrl, frag_len, ctrl-&gt;assoc_len, ctrl-&gt;assoc_rem_len);</div><div class='del'>-</div><div class='del'>-	cp-&gt;phy_handle = hcon-&gt;handle;</div><div class='del'>-	cp-&gt;len_so_far = cpu_to_le16(ctrl-&gt;assoc_len_so_far);</div><div class='del'>-	cp-&gt;rem_len = cpu_to_le16(ctrl-&gt;assoc_rem_len);</div><div class='del'>-	memcpy(cp-&gt;frag, ctrl-&gt;assoc, frag_len);</div><div class='del'>-</div><div class='del'>-	ctrl-&gt;assoc_len_so_far += frag_len;</div><div class='del'>-	ctrl-&gt;assoc_rem_len -= frag_len;</div><div class='del'>-</div><div class='del'>-	amp_ctrl_put(ctrl);</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_WRITE_REMOTE_AMP_ASSOC, len, cp);</div><div class='del'>-	hci_req_run_skb(&amp;req, write_remote_amp_assoc_complete);</div><div class='del'>-</div><div class='del'>-	kfree(cp);</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s phy handle 0x%2.2x", hdev-&gt;name, handle);</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Send A2MP create phylink rsp when all fragments are written */</div><div class='del'>-	if (amp_write_rem_assoc_frag(hdev, hcon))</div><div class='del'>-		a2mp_send_create_phy_link_rsp(hdev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s phy handle 0x%2.2x", hdev-&gt;name, handle);</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s phy handle 0x%2.2x hcon %p", hdev-&gt;name, handle, hcon);</div><div class='del'>-</div><div class='del'>-	amp_write_rem_assoc_frag(hdev, hcon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void create_phylink_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				    u16 opcode)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_create_phy_link *cp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_PHY_LINK);</div><div class='del'>-	if (!cp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-		hcon = hci_conn_hash_lookup_handle(hdev, cp-&gt;phy_handle);</div><div class='del'>-		if (hcon)</div><div class='del'>-			hci_conn_del(hcon);</div><div class='del'>-	} else {</div><div class='del'>-		amp_write_remote_assoc(hdev, cp-&gt;phy_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			struct hci_conn *hcon)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_create_phy_link cp;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-</div><div class='del'>-	cp.phy_handle = hcon-&gt;handle;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s hcon %p phy handle 0x%2.2x", hdev-&gt;name, hcon,</div><div class='del'>-	       hcon-&gt;handle);</div><div class='del'>-</div><div class='del'>-	if (phylink_gen_key(mgr-&gt;l2cap_conn-&gt;hcon, cp.key, &amp;cp.key_len,</div><div class='del'>-			    &amp;cp.key_type)) {</div><div class='del'>-		BT_DBG("Cannot create link key");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_CREATE_PHY_LINK, sizeof(cp), &amp;cp);</div><div class='del'>-	hci_req_run(&amp;req, create_phylink_complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void accept_phylink_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				    u16 opcode)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_accept_phy_link *cp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cp = hci_sent_cmd_data(hdev, HCI_OP_ACCEPT_PHY_LINK);</div><div class='del'>-	if (!cp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	amp_write_remote_assoc(hdev, cp-&gt;phy_handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			struct hci_conn *hcon)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_accept_phy_link cp;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-</div><div class='del'>-	cp.phy_handle = hcon-&gt;handle;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s hcon %p phy handle 0x%2.2x", hdev-&gt;name, hcon,</div><div class='del'>-	       hcon-&gt;handle);</div><div class='del'>-</div><div class='del'>-	if (phylink_gen_key(mgr-&gt;l2cap_conn-&gt;hcon, cp.key, &amp;cp.key_len,</div><div class='del'>-			    &amp;cp.key_type)) {</div><div class='del'>-		BT_DBG("Cannot create link key");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_ACCEPT_PHY_LINK, sizeof(cp), &amp;cp);</div><div class='del'>-	hci_req_run(&amp;req, accept_phylink_complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *bredr_hdev = hci_dev_hold(bredr_hcon-&gt;hdev);</div><div class='del'>-	struct amp_mgr *mgr = hs_hcon-&gt;amp_mgr;</div><div class='del'>-	struct l2cap_chan *bredr_chan;</div><div class='del'>-</div><div class='del'>-	BT_DBG("bredr_hcon %p hs_hcon %p mgr %p", bredr_hcon, hs_hcon, mgr);</div><div class='del'>-</div><div class='del'>-	if (!bredr_hdev || !mgr || !mgr-&gt;bredr_chan)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bredr_chan = mgr-&gt;bredr_chan;</div><div class='del'>-</div><div class='del'>-	l2cap_chan_lock(bredr_chan);</div><div class='del'>-</div><div class='del'>-	set_bit(FLAG_EFS_ENABLE, &amp;bredr_chan-&gt;flags);</div><div class='del'>-	bredr_chan-&gt;remote_amp_id = hs_hcon-&gt;remote_id;</div><div class='del'>-	bredr_chan-&gt;local_amp_id = hs_hcon-&gt;hdev-&gt;id;</div><div class='del'>-	bredr_chan-&gt;hs_hcon = hs_hcon;</div><div class='del'>-	bredr_chan-&gt;conn-&gt;mtu = hs_hcon-&gt;hdev-&gt;block_mtu;</div><div class='del'>-</div><div class='del'>-	__l2cap_physical_cfm(bredr_chan, 0);</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(bredr_chan);</div><div class='del'>-</div><div class='del'>-	hci_dev_put(bredr_hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_create_logical_link(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *hs_hcon = chan-&gt;hs_hcon;</div><div class='del'>-	struct hci_cp_create_accept_logical_link cp;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p hs_hcon %p dst %pMR", chan, hs_hcon,</div><div class='del'>-	       &amp;chan-&gt;conn-&gt;hcon-&gt;dst);</div><div class='del'>-</div><div class='del'>-	if (!hs_hcon)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hdev = hci_dev_hold(chan-&gt;hs_hcon-&gt;hdev);</div><div class='del'>-	if (!hdev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cp.phy_handle = hs_hcon-&gt;handle;</div><div class='del'>-</div><div class='del'>-	cp.tx_flow_spec.id = chan-&gt;local_id;</div><div class='del'>-	cp.tx_flow_spec.stype = chan-&gt;local_stype;</div><div class='del'>-	cp.tx_flow_spec.msdu = cpu_to_le16(chan-&gt;local_msdu);</div><div class='del'>-	cp.tx_flow_spec.sdu_itime = cpu_to_le32(chan-&gt;local_sdu_itime);</div><div class='del'>-	cp.tx_flow_spec.acc_lat = cpu_to_le32(chan-&gt;local_acc_lat);</div><div class='del'>-	cp.tx_flow_spec.flush_to = cpu_to_le32(chan-&gt;local_flush_to);</div><div class='del'>-</div><div class='del'>-	cp.rx_flow_spec.id = chan-&gt;remote_id;</div><div class='del'>-	cp.rx_flow_spec.stype = chan-&gt;remote_stype;</div><div class='del'>-	cp.rx_flow_spec.msdu = cpu_to_le16(chan-&gt;remote_msdu);</div><div class='del'>-	cp.rx_flow_spec.sdu_itime = cpu_to_le32(chan-&gt;remote_sdu_itime);</div><div class='del'>-	cp.rx_flow_spec.acc_lat = cpu_to_le32(chan-&gt;remote_acc_lat);</div><div class='del'>-	cp.rx_flow_spec.flush_to = cpu_to_le32(chan-&gt;remote_flush_to);</div><div class='del'>-</div><div class='del'>-	if (hs_hcon-&gt;out)</div><div class='del'>-		hci_send_cmd(hdev, HCI_OP_CREATE_LOGICAL_LINK, sizeof(cp),</div><div class='del'>-			     &amp;cp);</div><div class='del'>-	else</div><div class='del'>-		hci_send_cmd(hdev, HCI_OP_ACCEPT_LOGICAL_LINK, sizeof(cp),</div><div class='del'>-			     &amp;cp);</div><div class='del'>-</div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_disconnect_logical_link(struct hci_chan *hchan)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *hcon = hchan-&gt;conn;</div><div class='del'>-	struct hci_cp_disconn_logical_link cp;</div><div class='del'>-</div><div class='del'>-	if (hcon-&gt;state != BT_CONNECTED) {</div><div class='del'>-		BT_DBG("hchan %p not connected", hchan);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cp.log_handle = cpu_to_le16(hchan-&gt;handle);</div><div class='del'>-	hci_send_cmd(hcon-&gt;hdev, HCI_OP_DISCONN_LOGICAL_LINK, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("hchan %p", hchan);</div><div class='del'>-</div><div class='del'>-	hci_chan_del(hchan);</div><div class='del'>-}</div><div class='head'>diff --git a/net/bluetooth/amp.h b/net/bluetooth/amp.h<br/>deleted file mode 100644<br/>index 8848f8158ae4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/amp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/amp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   Copyright (c) 2011,2012 Intel Corp.</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 and</div><div class='del'>-   only version 2 as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __AMP_H</div><div class='del'>-#define __AMP_H</div><div class='del'>-</div><div class='del'>-struct amp_ctrl {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct kref		kref;</div><div class='del'>-	__u8			id;</div><div class='del'>-	__u16			assoc_len_so_far;</div><div class='del'>-	__u16			assoc_rem_len;</div><div class='del'>-	__u16			assoc_len;</div><div class='del'>-	__u8			*assoc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int amp_ctrl_put(struct amp_ctrl *ctrl);</div><div class='del'>-void amp_ctrl_get(struct amp_ctrl *ctrl);</div><div class='del'>-struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr, u8 id);</div><div class='del'>-struct amp_ctrl *amp_ctrl_lookup(struct amp_mgr *mgr, u8 id);</div><div class='del'>-void amp_ctrl_list_flush(struct amp_mgr *mgr);</div><div class='del'>-</div><div class='del'>-struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			     u8 remote_id, bool out);</div><div class='del'>-</div><div class='del'>-int phylink_gen_key(struct hci_conn *hcon, u8 *data, u8 *len, u8 *type);</div><div class='del'>-</div><div class='del'>-void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);</div><div class='del'>-void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);</div><div class='del'>-void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);</div><div class='del'>-void amp_read_loc_assoc_final_data(struct hci_dev *hdev,</div><div class='del'>-				   struct hci_conn *hcon);</div><div class='del'>-void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			struct hci_conn *hcon);</div><div class='del'>-void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,</div><div class='del'>-			struct hci_conn *hcon);</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_BT_HS)</div><div class='del'>-void amp_create_logical_link(struct l2cap_chan *chan);</div><div class='del'>-void amp_disconnect_logical_link(struct hci_chan *hchan);</div><div class='del'>-#else</div><div class='del'>-static inline void amp_create_logical_link(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void amp_disconnect_logical_link(struct hci_chan *hchan)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);</div><div class='del'>-void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle);</div><div class='del'>-void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon);</div><div class='del'>-void amp_create_logical_link(struct l2cap_chan *chan);</div><div class='del'>-void amp_disconnect_logical_link(struct hci_chan *hchan);</div><div class='del'>-void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason);</div><div class='del'>-</div><div class='del'>-#endif /* __AMP_H */</div><div class='head'>diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c<br/>new file mode 100644<br/>index 000000000000..59025771af53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/aosp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/aosp.c</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aosp.h"</div><div class='add'>+</div><div class='add'>+/* Command complete parameters of LE_Get_Vendor_Capabilities_Command</div><div class='add'>+ * The parameters grow over time. The base version that declares the</div><div class='add'>+ * version_supported field is v0.95. Refer to</div><div class='add'>+ * https://cs.android.com/android/platform/superproject/+/master:system/</div><div class='add'>+ *         bt/gd/hci/controller.cc;l=452?q=le_get_vendor_capabilities_handler</div><div class='add'>+ */</div><div class='add'>+struct aosp_rp_le_get_vendor_capa {</div><div class='add'>+	/* v0.95: 15 octets */</div><div class='add'>+	__u8	status;</div><div class='add'>+	__u8	max_advt_instances;</div><div class='add'>+	__u8	offloaded_resolution_of_private_address;</div><div class='add'>+	__le16	total_scan_results_storage;</div><div class='add'>+	__u8	max_irk_list_sz;</div><div class='add'>+	__u8	filtering_support;</div><div class='add'>+	__u8	max_filter;</div><div class='add'>+	__u8	activity_energy_info_support;</div><div class='add'>+	__le16	version_supported;</div><div class='add'>+	__le16	total_num_of_advt_tracked;</div><div class='add'>+	__u8	extended_scan_support;</div><div class='add'>+	__u8	debug_logging_supported;</div><div class='add'>+	/* v0.96: 16 octets */</div><div class='add'>+	__u8	le_address_generation_offloading_support;</div><div class='add'>+	/* v0.98: 21 octets */</div><div class='add'>+	__le32	a2dp_source_offload_capability_mask;</div><div class='add'>+	__u8	bluetooth_quality_report_support;</div><div class='add'>+	/* v1.00: 25 octets */</div><div class='add'>+	__le32	dynamic_audio_buffer_support;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define VENDOR_CAPA_BASE_SIZE		15</div><div class='add'>+#define VENDOR_CAPA_0_98_SIZE		21</div><div class='add'>+</div><div class='add'>+void aosp_do_open(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct aosp_rp_le_get_vendor_capa *rp;</div><div class='add'>+	u16 version_supported;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;aosp_capable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Initialize AOSP extension");</div><div class='add'>+</div><div class='add'>+	/* LE Get Vendor Capabilities Command */</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hci_opcode_pack(0x3f, 0x153), 0, NULL,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR_OR_NULL(skb)) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			skb = ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+		bt_dev_err(hdev, "AOSP get vendor capabilities (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* A basic length check */</div><div class='add'>+	if (skb-&gt;len &lt; VENDOR_CAPA_BASE_SIZE)</div><div class='add'>+		goto length_error;</div><div class='add'>+</div><div class='add'>+	rp = (struct aosp_rp_le_get_vendor_capa *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	version_supported = le16_to_cpu(rp-&gt;version_supported);</div><div class='add'>+	/* AOSP displays the version number like v0.98, v1.00, etc. */</div><div class='add'>+	bt_dev_info(hdev, "AOSP extensions version v%u.%02u",</div><div class='add'>+		    version_supported &gt;&gt; 8, version_supported &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* Do not support very old versions. */</div><div class='add'>+	if (version_supported &lt; 95) {</div><div class='add'>+		bt_dev_warn(hdev, "AOSP capabilities version %u too old",</div><div class='add'>+			    version_supported);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (version_supported &lt; 98) {</div><div class='add'>+		bt_dev_warn(hdev, "AOSP quality report is not supported");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; VENDOR_CAPA_0_98_SIZE)</div><div class='add'>+		goto length_error;</div><div class='add'>+</div><div class='add'>+	/* The bluetooth_quality_report_support is defined at version</div><div class='add'>+	 * v0.98. Refer to</div><div class='add'>+	 * https://cs.android.com/android/platform/superproject/+/</div><div class='add'>+	 *         master:system/bt/gd/hci/controller.cc;l=477</div><div class='add'>+	 */</div><div class='add'>+	if (rp-&gt;bluetooth_quality_report_support) {</div><div class='add'>+		hdev-&gt;aosp_quality_report = true;</div><div class='add'>+		bt_dev_info(hdev, "AOSP quality report is supported");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+length_error:</div><div class='add'>+	bt_dev_err(hdev, "AOSP capabilities length %d too short", skb-&gt;len);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aosp_do_close(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!hdev-&gt;aosp_capable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Cleanup of AOSP extension");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* BQR command */</div><div class='add'>+#define BQR_OPCODE			hci_opcode_pack(0x3f, 0x015e)</div><div class='add'>+</div><div class='add'>+/* BQR report action */</div><div class='add'>+#define REPORT_ACTION_ADD		0x00</div><div class='add'>+#define REPORT_ACTION_DELETE		0x01</div><div class='add'>+#define REPORT_ACTION_CLEAR		0x02</div><div class='add'>+</div><div class='add'>+/* BQR event masks */</div><div class='add'>+#define QUALITY_MONITORING		BIT(0)</div><div class='add'>+#define APPRAOCHING_LSTO		BIT(1)</div><div class='add'>+#define A2DP_AUDIO_CHOPPY		BIT(2)</div><div class='add'>+#define SCO_VOICE_CHOPPY		BIT(3)</div><div class='add'>+</div><div class='add'>+#define DEFAULT_BQR_EVENT_MASK	(QUALITY_MONITORING | APPRAOCHING_LSTO | \</div><div class='add'>+				 A2DP_AUDIO_CHOPPY | SCO_VOICE_CHOPPY)</div><div class='add'>+</div><div class='add'>+/* Reporting at milliseconds so as not to stress the controller too much.</div><div class='add'>+ * Range: 0 ~ 65535 ms</div><div class='add'>+ */</div><div class='add'>+#define DEFALUT_REPORT_INTERVAL_MS	5000</div><div class='add'>+</div><div class='add'>+struct aosp_bqr_cp {</div><div class='add'>+	__u8	report_action;</div><div class='add'>+	__u32	event_mask;</div><div class='add'>+	__u16	min_report_interval;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static int enable_quality_report(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct aosp_bqr_cp cp;</div><div class='add'>+</div><div class='add'>+	cp.report_action = REPORT_ACTION_ADD;</div><div class='add'>+	cp.event_mask = DEFAULT_BQR_EVENT_MASK;</div><div class='add'>+	cp.min_report_interval = DEFALUT_REPORT_INTERVAL_MS;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &amp;cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR_OR_NULL(skb)) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			skb = ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+		bt_dev_err(hdev, "Enabling Android BQR failed (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int disable_quality_report(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct aosp_bqr_cp cp = { 0 };</div><div class='add'>+</div><div class='add'>+	cp.report_action = REPORT_ACTION_CLEAR;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &amp;cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR_OR_NULL(skb)) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			skb = ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+		bt_dev_err(hdev, "Disabling Android BQR failed (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool aosp_has_quality_report(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hdev-&gt;aosp_quality_report;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aosp_set_quality_report(struct hci_dev *hdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (!aosp_has_quality_report(hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "quality report enable %d", enable);</div><div class='add'>+</div><div class='add'>+	/* Enable or disable the quality report feature. */</div><div class='add'>+	if (enable)</div><div class='add'>+		return enable_quality_report(hdev);</div><div class='add'>+	else</div><div class='add'>+		return disable_quality_report(hdev);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h<br/>new file mode 100644<br/>index 000000000000..2fd8886d51b2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/aosp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/aosp.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BT_AOSPEXT)</div><div class='add'>+</div><div class='add'>+void aosp_do_open(struct hci_dev *hdev);</div><div class='add'>+void aosp_do_close(struct hci_dev *hdev);</div><div class='add'>+</div><div class='add'>+bool aosp_has_quality_report(struct hci_dev *hdev);</div><div class='add'>+int aosp_set_quality_report(struct hci_dev *hdev, bool enable);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void aosp_do_open(struct hci_dev *hdev) {}</div><div class='add'>+static inline void aosp_do_close(struct hci_dev *hdev) {}</div><div class='add'>+</div><div class='add'>+static inline bool aosp_has_quality_report(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int aosp_set_quality_report(struct hci_dev *hdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/bluetooth/bnep/Kconfig b/net/bluetooth/bnep/Kconfig<br/>index 9b70317c49dc..aac02b5b0d17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config BT_BNEP</div><div class='ctx'> 	tristate "BNEP protocol support"</div><div class='ctx'> 	depends on BT_BREDR</div><div class='head'>diff --git a/net/bluetooth/bnep/Makefile b/net/bluetooth/bnep/Makefile<br/>index c7821e76ca56..8af9d56bb012 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux Bluetooth BNEP layer.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h<br/>index 40854c99bc1e..9680473ed7ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/bnep.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/bnep.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/bnep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/bnep.h</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>   BNEP protocol definition for Linux Bluetooth stack (BlueZ).</div><div class='ctx'>   Copyright (C) 2002 Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;</div><div class='ctx'> </div><div class='del'>-  This program is free software; you can redistribute it and/or modify</div><div class='del'>-  it under the terms of the GNU General Public License, version 2, as</div><div class='del'>-  published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-  This program is distributed in the hope that it will be useful,</div><div class='del'>-  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-  GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-  You should have received a copy of the GNU General Public License</div><div class='del'>-  along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifndef _BNEP_H</div><div class='hunk'>@@ -84,14 +74,14 @@ struct bnep_setup_conn_req {</div><div class='ctx'> 	__u8 type;</div><div class='ctx'> 	__u8 ctrl;</div><div class='ctx'> 	__u8 uuid_size;</div><div class='del'>-	__u8 service[0];</div><div class='add'>+	__u8 service[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct bnep_set_filter_req {</div><div class='ctx'> 	__u8 type;</div><div class='ctx'> 	__u8 ctrl;</div><div class='ctx'> 	__be16 len;</div><div class='del'>-	__u8 list[0];</div><div class='add'>+	__u8 list[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct bnep_control_rsp {</div><div class='hunk'>@@ -103,7 +93,7 @@ struct bnep_control_rsp {</div><div class='ctx'> struct bnep_ext_hdr {</div><div class='ctx'> 	__u8 type;</div><div class='ctx'> 	__u8 len;</div><div class='del'>-	__u8 data[0];</div><div class='add'>+	__u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* BNEP ioctl defines */</div><div class='head'>diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c<br/>index 7b3965861013..d44987d4515c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/core.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='hunk'>@@ -126,8 +126,8 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len</div><div class='ctx'> 			f[i].start = get_unaligned_be16(data++);</div><div class='ctx'> 			f[i].end   = get_unaligned_be16(data++);</div><div class='ctx'> </div><div class='del'>-			BT_DBG("proto filter start %d end %d",</div><div class='del'>-				f[i].start, f[i].end);</div><div class='add'>+			BT_DBG("proto filter start %u end %u",</div><div class='add'>+			       f[i].start, f[i].end);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt; BNEP_MAX_PROTO_FILTERS)</div><div class='hunk'>@@ -266,7 +266,7 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BT_DBG("type 0x%x len %d", h-&gt;type, h-&gt;len);</div><div class='add'>+		BT_DBG("type 0x%x len %u", h-&gt;type, h-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		switch (h-&gt;type &amp; BNEP_TYPE_MASK) {</div><div class='ctx'> 		case BNEP_EXT_CONTROL:</div><div class='hunk'>@@ -385,7 +385,8 @@ static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	case BNEP_COMPRESSED_DST_ONLY:</div><div class='ctx'> 		__skb_put_data(nskb, skb_mac_header(skb), ETH_ALEN);</div><div class='del'>-		__skb_put_data(nskb, s-&gt;eh.h_source, ETH_ALEN + 2);</div><div class='add'>+		__skb_put_data(nskb, s-&gt;eh.h_source, ETH_ALEN);</div><div class='add'>+		put_unaligned(s-&gt;eh.h_proto, (__be16 *)__skb_put(nskb, 2));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BNEP_GENERAL:</div><div class='hunk'>@@ -400,7 +401,7 @@ static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)</div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='ctx'> 	nskb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 	nskb-&gt;protocol  = eth_type_trans(nskb, dev);</div><div class='del'>-	netif_rx_ni(nskb);</div><div class='add'>+	netif_rx(nskb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> badframe:</div><div class='hunk'>@@ -424,7 +425,7 @@ static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)</div><div class='ctx'> 	int len = 0, il = 0;</div><div class='ctx'> 	u8 type = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("skb %p dev %p type %d", skb, skb-&gt;dev, skb-&gt;pkt_type);</div><div class='add'>+	BT_DBG("skb %p dev %p type %u", skb, skb-&gt;dev, skb-&gt;pkt_type);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb-&gt;dev) {</div><div class='ctx'> 		/* Control frame sent by us */</div><div class='hunk'>@@ -489,9 +490,6 @@ static int bnep_session(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		/* Ensure session-&gt;terminate is updated */</div><div class='del'>-		smp_mb__before_atomic();</div><div class='del'>-</div><div class='ctx'> 		if (atomic_read(&amp;s-&gt;terminate))</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* RX */</div><div class='hunk'>@@ -512,6 +510,10 @@ static int bnep_session(void *arg)</div><div class='ctx'> 				break;</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * wait_woken() performs the necessary memory barriers</div><div class='add'>+		 * for us; see the header comment for this primitive.</div><div class='add'>+		 */</div><div class='ctx'> 		wait_woken(&amp;wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> 	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='hunk'>@@ -534,7 +536,7 @@ static int bnep_session(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;bnep_session_sem);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	module_put_and_exit(0);</div><div class='add'>+	module_put_and_kthread_exit(0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -548,7 +550,7 @@ static struct device *bnep_get_device(struct bnep_session *session)</div><div class='ctx'> 	return &amp;conn-&gt;hcon-&gt;dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_type bnep_type = {</div><div class='add'>+static const struct device_type bnep_type = {</div><div class='ctx'> 	.name	= "bluetooth",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -593,7 +595,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)</div><div class='ctx'> 	 * ie. eh.h_dest is our local address. */</div><div class='ctx'> 	memcpy(s-&gt;eh.h_dest,   &amp;src, ETH_ALEN);</div><div class='ctx'> 	memcpy(s-&gt;eh.h_source, &amp;dst, ETH_ALEN);</div><div class='del'>-	memcpy(dev-&gt;dev_addr, s-&gt;eh.h_dest, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, s-&gt;eh.h_dest);</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;dev   = dev;</div><div class='ctx'> 	s-&gt;sock  = sock;</div><div class='hunk'>@@ -743,8 +745,7 @@ static int __init bnep_init(void)</div><div class='ctx'> 	if (flt[0])</div><div class='ctx'> 		BT_INFO("BNEP filters: %s", flt);</div><div class='ctx'> </div><div class='del'>-	bnep_sock_init();</div><div class='del'>-	return 0;</div><div class='add'>+	return bnep_sock_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit bnep_exit(void)</div><div class='head'>diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c<br/>index 1d4d7d415730..cc1cff63194f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/netdev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/netdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/netdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/netdev.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static int bnep_net_set_mac_addr(struct net_device *dev, void *arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnep_net_timeout(struct net_device *dev)</div><div class='add'>+static void bnep_net_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("net_timeout");</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='head'>diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c<br/>index 00deacdcb51c..00d47bcf4d7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/bnep/sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/bnep/sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/bnep/sock.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'>    SOFTWARE IS DISCLAIMED.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -49,18 +50,17 @@ static int bnep_sock_release(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int do_bnep_sock_ioctl(struct socket *sock, unsigned int cmd, void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnep_connlist_req cl;</div><div class='ctx'> 	struct bnep_connadd_req  ca;</div><div class='ctx'> 	struct bnep_conndel_req  cd;</div><div class='ctx'> 	struct bnep_conninfo ci;</div><div class='ctx'> 	struct socket *nsock;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	__u32 supp_feat = BIT(BNEP_SETUP_RESPONSE);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("cmd %x arg %lx", cmd, arg);</div><div class='add'>+	BT_DBG("cmd %x arg %p", cmd, argp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case BNEPCONNADD:</div><div class='hunk'>@@ -134,16 +134,22 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return do_bnep_sock_ioctl(sock, cmd, (void __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='ctx'> 	if (cmd == BNEPGETCONNLIST) {</div><div class='ctx'> 		struct bnep_connlist_req cl;</div><div class='add'>+		unsigned __user *p = argp;</div><div class='ctx'> 		u32 uci;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		if (get_user(cl.cnum, (u32 __user *) arg) ||</div><div class='del'>-				get_user(uci, (u32 __user *) (arg + 4)))</div><div class='add'>+		if (get_user(cl.cnum, p) || get_user(uci, p + 1))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		cl.ci = compat_ptr(uci);</div><div class='hunk'>@@ -153,13 +159,13 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne</div><div class='ctx'> </div><div class='ctx'> 		err = bnep_get_connlist(&amp;cl);</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; put_user(cl.cnum, (u32 __user *) arg))</div><div class='add'>+		if (!err &amp;&amp; put_user(cl.cnum, p))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return bnep_sock_ioctl(sock, cmd, arg);</div><div class='add'>+	return do_bnep_sock_ioctl(sock, cmd, argp);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -177,8 +183,6 @@ static const struct proto_ops bnep_sock_ops = {</div><div class='ctx'> 	.recvmsg	= sock_no_recvmsg,</div><div class='ctx'> 	.listen		= sock_no_listen,</div><div class='ctx'> 	.shutdown	= sock_no_shutdown,</div><div class='del'>-	.setsockopt	= sock_no_setsockopt,</div><div class='del'>-	.getsockopt	= sock_no_getsockopt,</div><div class='ctx'> 	.connect	= sock_no_connect,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='ctx'> 	.accept		= sock_no_accept,</div><div class='hunk'>@@ -201,21 +205,13 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	if (sock-&gt;type != SOCK_RAW)</div><div class='ctx'> 		return -ESOCKTNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, GFP_ATOMIC, &amp;bnep_proto, kern);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;bnep_proto, protocol, GFP_ATOMIC, kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-</div><div class='ctx'> 	sock-&gt;ops = &amp;bnep_sock_ops;</div><div class='del'>-</div><div class='ctx'> 	sock-&gt;state = SS_UNCONNECTED;</div><div class='ctx'> </div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = protocol;</div><div class='del'>-	sk-&gt;sk_state	= BT_OPEN;</div><div class='del'>-</div><div class='ctx'> 	bt_sock_link(&amp;bnep_sk_list, sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bluetooth/cmtp/Kconfig b/net/bluetooth/cmtp/Kconfig<br/>index 939da0fbdd88..34e923466236 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config BT_CMTP</div><div class='del'>-	tristate "CMTP protocol support"</div><div class='del'>-	depends on BT_BREDR &amp;&amp; ISDN_CAPI</div><div class='add'>+	tristate "CMTP protocol support (DEPRECATED)"</div><div class='add'>+	depends on BT_BREDR &amp;&amp; ISDN_CAPI &amp;&amp; DEPRECATED</div><div class='ctx'> 	help</div><div class='ctx'> 	  CMTP (CAPI Message Transport Protocol) is a transport layer</div><div class='ctx'> 	  for CAPI messages.  CMTP is required for the Bluetooth Common</div><div class='head'>diff --git a/net/bluetooth/cmtp/Makefile b/net/bluetooth/cmtp/Makefile<br/>index 890a9a5a6861..b2262ca97499 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux Bluetooth CMTP layer</div><div class='ctx'> #</div><div class='head'>diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c<br/>index eb41556002e3..884703fda979 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/capi.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/capi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/capi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/capi.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static struct cmtp_application *cmtp_application_add(struct cmtp_session *sessio</div><div class='ctx'> {</div><div class='ctx'> 	struct cmtp_application *app = kzalloc(sizeof(*app), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p application %p appl %d", session, app, appl);</div><div class='add'>+	BT_DBG("session %p application %p appl %u", session, app, appl);</div><div class='ctx'> </div><div class='ctx'> 	if (!app)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -135,7 +135,7 @@ static void cmtp_send_capimsg(struct cmtp_session *session, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmtp_scb *scb = (void *) skb-&gt;cb;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p skb %p len %d", session, skb, skb-&gt;len);</div><div class='add'>+	BT_DBG("session %p skb %p len %u", session, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	scb-&gt;id = -1;</div><div class='ctx'> 	scb-&gt;data = (CAPIMSG_COMMAND(skb-&gt;data) == CAPI_DATA_B3);</div><div class='hunk'>@@ -152,7 +152,7 @@ static void cmtp_send_interopmsg(struct cmtp_session *session,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned char *s;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p subcmd 0x%02x appl %d msgnum %d", session, subcmd, appl, msgnum);</div><div class='add'>+	BT_DBG("session %p subcmd 0x%02x appl %u msgnum %u", session, subcmd, appl, msgnum);</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(CAPI_MSG_BASELEN + 6 + len, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -188,7 +188,7 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s</div><div class='ctx'> 	__u16 appl, msgnum, func, info;</div><div class='ctx'> 	__u32 controller;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p skb %p len %d", session, skb, skb-&gt;len);</div><div class='add'>+	BT_DBG("session %p skb %p len %u", session, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	switch (CAPIMSG_SUBCOMMAND(skb-&gt;data)) {</div><div class='ctx'> 	case CAPI_CONF:</div><div class='hunk'>@@ -248,18 +248,10 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case CAPI_FUNCTION_GET_MANUFACTURER:</div><div class='del'>-			if (skb-&gt;len &lt; CAPI_MSG_BASELEN + 15)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (!info &amp;&amp; ctrl) {</div><div class='del'>-				int len = min_t(uint, CAPI_MANUFACTURER_LEN,</div><div class='del'>-						skb-&gt;data[CAPI_MSG_BASELEN + 14]);</div><div class='del'>-</div><div class='del'>-				memset(ctrl-&gt;manu, 0, CAPI_MANUFACTURER_LEN);</div><div class='del'>-				strncpy(ctrl-&gt;manu,</div><div class='del'>-					skb-&gt;data + CAPI_MSG_BASELEN + 15, len);</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+			if (!info &amp;&amp; ctrl &amp;&amp; skb-&gt;len &gt; CAPI_MSG_BASELEN + 14)</div><div class='add'>+				strscpy_pad(ctrl-&gt;manu,</div><div class='add'>+					    skb-&gt;data + CAPI_MSG_BASELEN + 15,</div><div class='add'>+					    skb-&gt;data[CAPI_MSG_BASELEN + 14]);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case CAPI_FUNCTION_GET_VERSION:</div><div class='hunk'>@@ -276,18 +268,10 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case CAPI_FUNCTION_GET_SERIAL_NUMBER:</div><div class='del'>-			if (skb-&gt;len &lt; CAPI_MSG_BASELEN + 17)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (!info &amp;&amp; ctrl) {</div><div class='del'>-				int len = min_t(uint, CAPI_SERIAL_LEN,</div><div class='del'>-						skb-&gt;data[CAPI_MSG_BASELEN + 16]);</div><div class='del'>-</div><div class='del'>-				memset(ctrl-&gt;serial, 0, CAPI_SERIAL_LEN);</div><div class='del'>-				strncpy(ctrl-&gt;serial,</div><div class='del'>-					skb-&gt;data + CAPI_MSG_BASELEN + 17, len);</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+			if (!info &amp;&amp; ctrl &amp;&amp; skb-&gt;len &gt; CAPI_MSG_BASELEN + 16)</div><div class='add'>+				strscpy_pad(ctrl-&gt;serial,</div><div class='add'>+					    skb-&gt;data + CAPI_MSG_BASELEN + 17,</div><div class='add'>+					    skb-&gt;data[CAPI_MSG_BASELEN + 16]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -321,7 +305,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)</div><div class='ctx'> 	__u16 appl;</div><div class='ctx'> 	__u32 contr;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p skb %p len %d", session, skb, skb-&gt;len);</div><div class='add'>+	BT_DBG("session %p skb %p len %u", session, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; CAPI_MSG_BASELEN)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -344,7 +328,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)</div><div class='ctx'> 		appl = application-&gt;appl;</div><div class='ctx'> 		CAPIMSG_SETAPPID(skb-&gt;data, appl);</div><div class='ctx'> 	} else {</div><div class='del'>-		BT_ERR("Can't find application with id %d", appl);</div><div class='add'>+		BT_ERR("Can't find application with id %u", appl);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -385,8 +369,8 @@ static void cmtp_register_appl(struct capi_ctr *ctrl, __u16 appl, capi_register_</div><div class='ctx'> 	unsigned char buf[8];</div><div class='ctx'> 	int err = 0, nconn, want = rp-&gt;level3cnt;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("ctrl %p appl %d level3cnt %d datablkcnt %d datablklen %d",</div><div class='del'>-		ctrl, appl, rp-&gt;level3cnt, rp-&gt;datablkcnt, rp-&gt;datablklen);</div><div class='add'>+	BT_DBG("ctrl %p appl %u level3cnt %u datablkcnt %u datablklen %u",</div><div class='add'>+	       ctrl, appl, rp-&gt;level3cnt, rp-&gt;datablkcnt, rp-&gt;datablklen);</div><div class='ctx'> </div><div class='ctx'> 	application = cmtp_application_add(session, appl);</div><div class='ctx'> 	if (!application) {</div><div class='hunk'>@@ -450,7 +434,7 @@ static void cmtp_release_appl(struct capi_ctr *ctrl, __u16 appl)</div><div class='ctx'> 	struct cmtp_session *session = ctrl-&gt;driverdata;</div><div class='ctx'> 	struct cmtp_application *application;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("ctrl %p appl %d", ctrl, appl);</div><div class='add'>+	BT_DBG("ctrl %p appl %u", ctrl, appl);</div><div class='ctx'> </div><div class='ctx'> 	application = cmtp_application_get(session, CMTP_APPLID, appl);</div><div class='ctx'> 	if (!application) {</div><div class='hunk'>@@ -483,7 +467,7 @@ static u16 cmtp_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	application = cmtp_application_get(session, CMTP_APPLID, appl);</div><div class='ctx'> 	if ((!application) || (application-&gt;state != BT_CONNECTED)) {</div><div class='del'>-		BT_ERR("Can't find application with id %d", appl);</div><div class='add'>+		BT_ERR("Can't find application with id %u", appl);</div><div class='ctx'> 		return CAPI_ILLAPPNR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +499,7 @@ static int cmtp_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, "ctrl %d\n", session-&gt;num);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(app, &amp;session-&gt;applications, list) {</div><div class='del'>-		seq_printf(m, "appl %d -&gt; %d\n", app-&gt;appl, app-&gt;mapping);</div><div class='add'>+		seq_printf(m, "appl %u -&gt; %u\n", app-&gt;appl, app-&gt;mapping);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/bluetooth/cmtp/cmtp.h b/net/bluetooth/cmtp/cmtp.h<br/>index c32638dddbf9..f6b9dc4e408f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/cmtp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/cmtp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/cmtp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/cmtp.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> </div><div class='del'>-#define BTNAMSIZ 18</div><div class='add'>+#define BTNAMSIZ 21</div><div class='ctx'> </div><div class='ctx'> /* CMTP ioctl defines */</div><div class='ctx'> #define CMTPCONNADD	_IOW('C', 200, int)</div><div class='head'>diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c<br/>index 7f26a5a19ff6..90d130588a3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/core.c</a></div><div class='hunk'>@@ -288,9 +288,6 @@ static int cmtp_session(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		/* Ensure session-&gt;terminate is updated */</div><div class='del'>-		smp_mb__before_atomic();</div><div class='del'>-</div><div class='ctx'> 		if (atomic_read(&amp;session-&gt;terminate))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (sk-&gt;sk_state != BT_CONNECTED)</div><div class='hunk'>@@ -306,6 +303,10 @@ static int cmtp_session(void *arg)</div><div class='ctx'> </div><div class='ctx'> 		cmtp_process_transmit(session);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * wait_woken() performs the necessary memory barriers</div><div class='add'>+		 * for us; see the header comment for this primitive.</div><div class='add'>+		 */</div><div class='ctx'> 		wait_woken(&amp;wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> 	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='hunk'>@@ -322,7 +323,7 @@ static int cmtp_session(void *arg)</div><div class='ctx'> 	up_write(&amp;cmtp_session_sem);</div><div class='ctx'> </div><div class='ctx'> 	kfree(session);</div><div class='del'>-	module_put_and_exit(0);</div><div class='add'>+	module_put_and_kthread_exit(0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -391,6 +392,11 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)</div><div class='ctx'> 	if (!(session-&gt;flags &amp; BIT(CMTP_LOOPBACK))) {</div><div class='ctx'> 		err = cmtp_attach_device(session);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='add'>+			/* Caller will call fput in case of failure, and so</div><div class='add'>+			 * will cmtp_session kthread.</div><div class='add'>+			 */</div><div class='add'>+			get_file(session-&gt;sock-&gt;file);</div><div class='add'>+</div><div class='ctx'> 			atomic_inc(&amp;session-&gt;terminate);</div><div class='ctx'> 			wake_up_interruptible(sk_sleep(session-&gt;sock-&gt;sk));</div><div class='ctx'> 			up_write(&amp;cmtp_session_sem);</div><div class='hunk'>@@ -431,9 +437,10 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)</div><div class='ctx'> 		/* Stop session thread */</div><div class='ctx'> 		atomic_inc(&amp;session-&gt;terminate);</div><div class='ctx'> </div><div class='del'>-		/* Ensure session-&gt;terminate is updated */</div><div class='del'>-		smp_mb__after_atomic();</div><div class='del'>-</div><div class='add'>+		/*</div><div class='add'>+		 * See the comment preceding the call to wait_woken()</div><div class='add'>+		 * in cmtp_session().</div><div class='add'>+		 */</div><div class='ctx'> 		wake_up_interruptible(sk_sleep(session-&gt;sock-&gt;sk));</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = -ENOENT;</div><div class='hunk'>@@ -494,9 +501,7 @@ static int __init cmtp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION);</div><div class='ctx'> </div><div class='del'>-	cmtp_init_sockets();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return cmtp_init_sockets();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cmtp_exit(void)</div><div class='head'>diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c<br/>index e08f28fadd65..96d49d9fae96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/cmtp/sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/cmtp/sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/cmtp/sock.c</a></div><div class='hunk'>@@ -63,17 +63,16 @@ static int cmtp_sock_release(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int do_cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmtp_connadd_req ca;</div><div class='ctx'> 	struct cmtp_conndel_req cd;</div><div class='ctx'> 	struct cmtp_connlist_req cl;</div><div class='ctx'> 	struct cmtp_conninfo ci;</div><div class='ctx'> 	struct socket *nsock;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("cmd %x arg %lx", cmd, arg);</div><div class='add'>+	BT_DBG("cmd %x arg %p", cmd, argp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case CMTPCONNADD:</div><div class='hunk'>@@ -137,16 +136,22 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return do_cmtp_sock_ioctl(sock, cmd, (void __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='ctx'> 	if (cmd == CMTPGETCONNLIST) {</div><div class='ctx'> 		struct cmtp_connlist_req cl;</div><div class='add'>+		u32 __user *p = argp;</div><div class='ctx'> 		u32 uci;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		if (get_user(cl.cnum, (u32 __user *) arg) ||</div><div class='del'>-				get_user(uci, (u32 __user *) (arg + 4)))</div><div class='add'>+		if (get_user(cl.cnum, p) || get_user(uci, p + 1))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		cl.ci = compat_ptr(uci);</div><div class='hunk'>@@ -156,13 +161,13 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne</div><div class='ctx'> </div><div class='ctx'> 		err = cmtp_get_connlist(&amp;cl);</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; put_user(cl.cnum, (u32 __user *) arg))</div><div class='add'>+		if (!err &amp;&amp; put_user(cl.cnum, p))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return cmtp_sock_ioctl(sock, cmd, arg);</div><div class='add'>+	return do_cmtp_sock_ioctl(sock, cmd, argp);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -180,8 +185,6 @@ static const struct proto_ops cmtp_sock_ops = {</div><div class='ctx'> 	.recvmsg	= sock_no_recvmsg,</div><div class='ctx'> 	.listen		= sock_no_listen,</div><div class='ctx'> 	.shutdown	= sock_no_shutdown,</div><div class='del'>-	.setsockopt	= sock_no_setsockopt,</div><div class='del'>-	.getsockopt	= sock_no_getsockopt,</div><div class='ctx'> 	.connect	= sock_no_connect,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='ctx'> 	.accept		= sock_no_accept,</div><div class='head'>diff --git a/net/bluetooth/coredump.c b/net/bluetooth/coredump.c<br/>new file mode 100644<br/>index 000000000000..720cb79adf96<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/coredump.c</a></div><div class='hunk'>@@ -0,0 +1,553 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+</div><div class='add'>+enum hci_devcoredump_pkt_type {</div><div class='add'>+	HCI_DEVCOREDUMP_PKT_INIT,</div><div class='add'>+	HCI_DEVCOREDUMP_PKT_SKB,</div><div class='add'>+	HCI_DEVCOREDUMP_PKT_PATTERN,</div><div class='add'>+	HCI_DEVCOREDUMP_PKT_COMPLETE,</div><div class='add'>+	HCI_DEVCOREDUMP_PKT_ABORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hci_devcoredump_skb_cb {</div><div class='add'>+	u16 pkt_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hci_devcoredump_skb_pattern {</div><div class='add'>+	u8 pattern;</div><div class='add'>+	u32 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define hci_dmp_cb(skb)	((struct hci_devcoredump_skb_cb *)((skb)-&gt;cb))</div><div class='add'>+</div><div class='add'>+#define DBG_UNEXPECTED_STATE() \</div><div class='add'>+	bt_dev_dbg(hdev, \</div><div class='add'>+		   "Unexpected packet (%d) for state (%d). ", \</div><div class='add'>+		   hci_dmp_cb(skb)-&gt;pkt_type, hdev-&gt;dump.state)</div><div class='add'>+</div><div class='add'>+#define MAX_DEVCOREDUMP_HDR_SIZE	512	/* bytes */</div><div class='add'>+</div><div class='add'>+static int hci_devcd_update_hdr_state(char *buf, size_t size, int state)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, size, "Bluetooth devcoredump\nState: %d\n", state);</div><div class='add'>+</div><div class='add'>+	return len + 1; /* scnprintf adds \0 at the end upon state rewrite */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static int hci_devcd_update_state(struct hci_dev *hdev, int state)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "Updating devcoredump state from %d to %d.",</div><div class='add'>+		   hdev-&gt;dump.state, state);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;dump.state = state;</div><div class='add'>+</div><div class='add'>+	return hci_devcd_update_hdr_state(hdev-&gt;dump.head,</div><div class='add'>+					  hdev-&gt;dump.alloc_size, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_devcd_mkheader(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	char dump_start[] = "--- Start dump ---\n";</div><div class='add'>+	char hdr[80];</div><div class='add'>+	int hdr_len;</div><div class='add'>+</div><div class='add'>+	hdr_len = hci_devcd_update_hdr_state(hdr, sizeof(hdr),</div><div class='add'>+					     HCI_DEVCOREDUMP_IDLE);</div><div class='add'>+	skb_put_data(skb, hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;dump.dmp_hdr)</div><div class='add'>+		hdev-&gt;dump.dmp_hdr(hdev, skb);</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, dump_start, strlen(dump_start));</div><div class='add'>+</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do not call with hci_dev_lock since this calls driver code. */</div><div class='add'>+static void hci_devcd_notify(struct hci_dev *hdev, int state)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;dump.notify_change)</div><div class='add'>+		hdev-&gt;dump.notify_change(hdev, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+void hci_devcd_reset(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	hdev-&gt;dump.head = NULL;</div><div class='add'>+	hdev-&gt;dump.tail = NULL;</div><div class='add'>+	hdev-&gt;dump.alloc_size = 0;</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_IDLE);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;hdev-&gt;dump.dump_timeout);</div><div class='add'>+	skb_queue_purge(&amp;hdev-&gt;dump.dump_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static void hci_devcd_free(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	vfree(hdev-&gt;dump.head);</div><div class='add'>+</div><div class='add'>+	hci_devcd_reset(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static int hci_devcd_alloc(struct hci_dev *hdev, u32 size)</div><div class='add'>+{</div><div class='add'>+	hdev-&gt;dump.head = vmalloc(size);</div><div class='add'>+	if (!hdev-&gt;dump.head)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;dump.alloc_size = size;</div><div class='add'>+	hdev-&gt;dump.tail = hdev-&gt;dump.head;</div><div class='add'>+	hdev-&gt;dump.end = hdev-&gt;dump.head + size;</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_IDLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static bool hci_devcd_copy(struct hci_dev *hdev, char *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;dump.tail + size &gt; hdev-&gt;dump.end)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memcpy(hdev-&gt;dump.tail, buf, size);</div><div class='add'>+	hdev-&gt;dump.tail += size;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static bool hci_devcd_memset(struct hci_dev *hdev, u8 pattern, u32 len)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;dump.tail + len &gt; hdev-&gt;dump.end)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memset(hdev-&gt;dump.tail, pattern, len);</div><div class='add'>+	hdev-&gt;dump.tail += len;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with hci_dev_lock only. */</div><div class='add'>+static int hci_devcd_prepare(struct hci_dev *hdev, u32 dump_size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int dump_hdr_size;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(MAX_DEVCOREDUMP_HDR_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dump_hdr_size = hci_devcd_mkheader(hdev, skb);</div><div class='add'>+</div><div class='add'>+	if (hci_devcd_alloc(hdev, dump_hdr_size + dump_size)) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto hdr_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Insert the device header */</div><div class='add'>+	if (!hci_devcd_copy(hdev, skb-&gt;data, skb-&gt;len)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to insert header");</div><div class='add'>+		hci_devcd_free(hdev);</div><div class='add'>+</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto hdr_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+hdr_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_handle_pkt_init(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 dump_size;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;dump.state != HCI_DEVCOREDUMP_IDLE) {</div><div class='add'>+		DBG_UNEXPECTED_STATE();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len != sizeof(dump_size)) {</div><div class='add'>+		bt_dev_dbg(hdev, "Invalid dump init pkt");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dump_size = get_unaligned_le32(skb_pull_data(skb, 4));</div><div class='add'>+	if (!dump_size) {</div><div class='add'>+		bt_dev_err(hdev, "Zero size dump init pkt");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_devcd_prepare(hdev, dump_size)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to prepare for dump");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_ACTIVE);</div><div class='add'>+	queue_delayed_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_timeout,</div><div class='add'>+			   hdev-&gt;dump.timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_handle_pkt_skb(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;dump.state != HCI_DEVCOREDUMP_ACTIVE) {</div><div class='add'>+		DBG_UNEXPECTED_STATE();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_copy(hdev, skb-&gt;data, skb-&gt;len))</div><div class='add'>+		bt_dev_dbg(hdev, "Failed to insert skb");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_handle_pkt_pattern(struct hci_dev *hdev,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_devcoredump_skb_pattern *pattern;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;dump.state != HCI_DEVCOREDUMP_ACTIVE) {</div><div class='add'>+		DBG_UNEXPECTED_STATE();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len != sizeof(*pattern)) {</div><div class='add'>+		bt_dev_dbg(hdev, "Invalid pattern skb");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pattern = skb_pull_data(skb, sizeof(*pattern));</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_memset(hdev, pattern-&gt;pattern, pattern-&gt;len))</div><div class='add'>+		bt_dev_dbg(hdev, "Failed to set pattern");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_dump(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 size;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "state %d", hdev-&gt;dump.state);</div><div class='add'>+</div><div class='add'>+	size = hdev-&gt;dump.tail - hdev-&gt;dump.head;</div><div class='add'>+</div><div class='add'>+	/* Send a copy to monitor as a diagnostic packet */</div><div class='add'>+	skb = bt_skb_alloc(size, GFP_ATOMIC);</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_put_data(skb, hdev-&gt;dump.head, size);</div><div class='add'>+		hci_recv_diag(hdev, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Emit a devcoredump with the available data */</div><div class='add'>+	dev_coredumpv(&amp;hdev-&gt;dev, hdev-&gt;dump.head, size, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_handle_pkt_complete(struct hci_dev *hdev,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 dump_size;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;dump.state != HCI_DEVCOREDUMP_ACTIVE) {</div><div class='add'>+		DBG_UNEXPECTED_STATE();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_DONE);</div><div class='add'>+	dump_size = hdev-&gt;dump.tail - hdev-&gt;dump.head;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "complete with size %u (expect %zu)", dump_size,</div><div class='add'>+		   hdev-&gt;dump.alloc_size);</div><div class='add'>+</div><div class='add'>+	hci_devcd_dump(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_devcd_handle_pkt_abort(struct hci_dev *hdev,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 dump_size;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;dump.state != HCI_DEVCOREDUMP_ACTIVE) {</div><div class='add'>+		DBG_UNEXPECTED_STATE();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_ABORT);</div><div class='add'>+	dump_size = hdev-&gt;dump.tail - hdev-&gt;dump.head;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "aborted with size %u (expect %zu)", dump_size,</div><div class='add'>+		   hdev-&gt;dump.alloc_size);</div><div class='add'>+</div><div class='add'>+	hci_devcd_dump(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Bluetooth devcoredump state machine.</div><div class='add'>+ *</div><div class='add'>+ * Devcoredump states:</div><div class='add'>+ *</div><div class='add'>+ *      HCI_DEVCOREDUMP_IDLE: The default state.</div><div class='add'>+ *</div><div class='add'>+ *      HCI_DEVCOREDUMP_ACTIVE: A devcoredump will be in this state once it has</div><div class='add'>+ *              been initialized using hci_devcd_init(). Once active, the driver</div><div class='add'>+ *              can append data using hci_devcd_append() or insert a pattern</div><div class='add'>+ *              using hci_devcd_append_pattern().</div><div class='add'>+ *</div><div class='add'>+ *      HCI_DEVCOREDUMP_DONE: Once the dump collection is complete, the drive</div><div class='add'>+ *              can signal the completion using hci_devcd_complete(). A</div><div class='add'>+ *              devcoredump is generated indicating the completion event and</div><div class='add'>+ *              then the state machine is reset to the default state.</div><div class='add'>+ *</div><div class='add'>+ *      HCI_DEVCOREDUMP_ABORT: The driver can cancel ongoing dump collection in</div><div class='add'>+ *              case of any error using hci_devcd_abort(). A devcoredump is</div><div class='add'>+ *              still generated with the available data indicating the abort</div><div class='add'>+ *              event and then the state machine is reset to the default state.</div><div class='add'>+ *</div><div class='add'>+ *      HCI_DEVCOREDUMP_TIMEOUT: A timeout timer for HCI_DEVCOREDUMP_TIMEOUT sec</div><div class='add'>+ *              is started during devcoredump initialization. Once the timeout</div><div class='add'>+ *              occurs, the driver is notified, a devcoredump is generated with</div><div class='add'>+ *              the available data indicating the timeout event and then the</div><div class='add'>+ *              state machine is reset to the default state.</div><div class='add'>+ *</div><div class='add'>+ * The driver must register using hci_devcd_register() before using the hci</div><div class='add'>+ * devcoredump APIs.</div><div class='add'>+ */</div><div class='add'>+void hci_devcd_rx(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev, dump.dump_rx);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int start_state;</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;hdev-&gt;dump.dump_q))) {</div><div class='add'>+		/* Return if timeout occurs. The timeout handler function</div><div class='add'>+		 * hci_devcd_timeout() will report the available dump data.</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;dump.state == HCI_DEVCOREDUMP_TIMEOUT) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		start_state = hdev-&gt;dump.state;</div><div class='add'>+</div><div class='add'>+		switch (hci_dmp_cb(skb)-&gt;pkt_type) {</div><div class='add'>+		case HCI_DEVCOREDUMP_PKT_INIT:</div><div class='add'>+			hci_devcd_handle_pkt_init(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case HCI_DEVCOREDUMP_PKT_SKB:</div><div class='add'>+			hci_devcd_handle_pkt_skb(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case HCI_DEVCOREDUMP_PKT_PATTERN:</div><div class='add'>+			hci_devcd_handle_pkt_pattern(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case HCI_DEVCOREDUMP_PKT_COMPLETE:</div><div class='add'>+			hci_devcd_handle_pkt_complete(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case HCI_DEVCOREDUMP_PKT_ABORT:</div><div class='add'>+			hci_devcd_handle_pkt_abort(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			bt_dev_dbg(hdev, "Unknown packet (%d) for state (%d). ",</div><div class='add'>+				   hci_dmp_cb(skb)-&gt;pkt_type, hdev-&gt;dump.state);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+		/* Notify the driver about any state changes before resetting</div><div class='add'>+		 * the state machine</div><div class='add'>+		 */</div><div class='add'>+		if (start_state != hdev-&gt;dump.state)</div><div class='add'>+			hci_devcd_notify(hdev, hdev-&gt;dump.state);</div><div class='add'>+</div><div class='add'>+		/* Reset the state machine if the devcoredump is complete */</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		if (hdev-&gt;dump.state == HCI_DEVCOREDUMP_DONE ||</div><div class='add'>+		    hdev-&gt;dump.state == HCI_DEVCOREDUMP_ABORT)</div><div class='add'>+			hci_devcd_reset(hdev);</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_rx);</div><div class='add'>+</div><div class='add'>+void hci_devcd_timeout(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    dump.dump_timeout.work);</div><div class='add'>+	u32 dump_size;</div><div class='add'>+</div><div class='add'>+	hci_devcd_notify(hdev, HCI_DEVCOREDUMP_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	cancel_work(&amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	hci_devcd_update_state(hdev, HCI_DEVCOREDUMP_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	dump_size = hdev-&gt;dump.tail - hdev-&gt;dump.head;</div><div class='add'>+	bt_dev_dbg(hdev, "timeout with size %u (expect %zu)", dump_size,</div><div class='add'>+		   hdev-&gt;dump.alloc_size);</div><div class='add'>+</div><div class='add'>+	hci_devcd_dump(hdev);</div><div class='add'>+</div><div class='add'>+	hci_devcd_reset(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_timeout);</div><div class='add'>+</div><div class='add'>+int hci_devcd_register(struct hci_dev *hdev, coredump_t coredump,</div><div class='add'>+		       dmp_hdr_t dmp_hdr, notify_change_t notify_change)</div><div class='add'>+{</div><div class='add'>+	/* Driver must implement coredump() and dmp_hdr() functions for</div><div class='add'>+	 * bluetooth devcoredump. The coredump() should trigger a coredump</div><div class='add'>+	 * event on the controller when the device's coredump sysfs entry is</div><div class='add'>+	 * written to. The dmp_hdr() should create a dump header to identify</div><div class='add'>+	 * the controller/fw/driver info.</div><div class='add'>+	 */</div><div class='add'>+	if (!coredump || !dmp_hdr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hdev-&gt;dump.coredump = coredump;</div><div class='add'>+	hdev-&gt;dump.dmp_hdr = dmp_hdr;</div><div class='add'>+	hdev-&gt;dump.notify_change = notify_change;</div><div class='add'>+	hdev-&gt;dump.supported = true;</div><div class='add'>+	hdev-&gt;dump.timeout = DEVCOREDUMP_TIMEOUT;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_register);</div><div class='add'>+</div><div class='add'>+static inline bool hci_devcd_enabled(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hdev-&gt;dump.supported;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_devcd_init(struct hci_dev *hdev, u32 dump_size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_enabled(hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(sizeof(dump_size), GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hci_dmp_cb(skb)-&gt;pkt_type = HCI_DEVCOREDUMP_PKT_INIT;</div><div class='add'>+	put_unaligned_le32(dump_size, skb_put(skb, 4));</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;hdev-&gt;dump.dump_q, skb);</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_init);</div><div class='add'>+</div><div class='add'>+int hci_devcd_append(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_enabled(hdev)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dmp_cb(skb)-&gt;pkt_type = HCI_DEVCOREDUMP_PKT_SKB;</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;hdev-&gt;dump.dump_q, skb);</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_append);</div><div class='add'>+</div><div class='add'>+int hci_devcd_append_pattern(struct hci_dev *hdev, u8 pattern, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct hci_devcoredump_skb_pattern p;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_enabled(hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(sizeof(p), GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p.pattern = pattern;</div><div class='add'>+	p.len = len;</div><div class='add'>+</div><div class='add'>+	hci_dmp_cb(skb)-&gt;pkt_type = HCI_DEVCOREDUMP_PKT_PATTERN;</div><div class='add'>+	skb_put_data(skb, &amp;p, sizeof(p));</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;hdev-&gt;dump.dump_q, skb);</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_append_pattern);</div><div class='add'>+</div><div class='add'>+int hci_devcd_complete(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_enabled(hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hci_dmp_cb(skb)-&gt;pkt_type = HCI_DEVCOREDUMP_PKT_COMPLETE;</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;hdev-&gt;dump.dump_q, skb);</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_complete);</div><div class='add'>+</div><div class='add'>+int hci_devcd_abort(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!hci_devcd_enabled(hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hci_dmp_cb(skb)-&gt;pkt_type = HCI_DEVCOREDUMP_PKT_ABORT;</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;hdev-&gt;dump.dump_q, skb);</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;dump.dump_rx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_devcd_abort);</div><div class='head'>diff --git a/net/bluetooth/ecdh_helper.c b/net/bluetooth/ecdh_helper.c<br/>index 2155ce802877..0efc93fdae8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/ecdh_helper.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/ecdh_helper.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/ecdh_helper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/ecdh_helper.c</a></div><div class='hunk'>@@ -25,22 +25,6 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;crypto/ecdh.h&gt;</div><div class='ctx'> </div><div class='del'>-struct ecdh_completion {</div><div class='del'>-	struct completion completion;</div><div class='del'>-	int err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ecdh_complete(struct crypto_async_request *req, int err)</div><div class='del'>-{</div><div class='del'>-	struct ecdh_completion *res = req-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (err == -EINPROGRESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	res-&gt;err = err;</div><div class='del'>-	complete(&amp;res-&gt;completion);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void swap_digits(u64 *in, u64 *out, unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -60,9 +44,9 @@ static inline void swap_digits(u64 *in, u64 *out, unsigned int ndigits)</div><div class='ctx'> int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],</div><div class='ctx'> 			u8 secret[32])</div><div class='ctx'> {</div><div class='add'>+	DECLARE_CRYPTO_WAIT(result);</div><div class='ctx'> 	struct kpp_request *req;</div><div class='ctx'> 	u8 *tmp;</div><div class='del'>-	struct ecdh_completion result;</div><div class='ctx'> 	struct scatterlist src, dst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -76,8 +60,6 @@ int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],</div><div class='ctx'> 		goto free_tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;result.completion);</div><div class='del'>-</div><div class='ctx'> 	swap_digits((u64 *)public_key, (u64 *)tmp, 4); /* x */</div><div class='ctx'> 	swap_digits((u64 *)&amp;public_key[32], (u64 *)&amp;tmp[32], 4); /* y */</div><div class='ctx'> </div><div class='hunk'>@@ -86,12 +68,9 @@ int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],</div><div class='ctx'> 	kpp_request_set_input(req, &amp;src, 64);</div><div class='ctx'> 	kpp_request_set_output(req, &amp;dst, 32);</div><div class='ctx'> 	kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-				 ecdh_complete, &amp;result);</div><div class='add'>+				 crypto_req_done, &amp;result);</div><div class='ctx'> 	err = crypto_kpp_compute_shared_secret(req);</div><div class='del'>-	if (err == -EINPROGRESS) {</div><div class='del'>-		wait_for_completion(&amp;result.completion);</div><div class='del'>-		err = result.err;</div><div class='del'>-	}</div><div class='add'>+	err = crypto_wait_req(err, &amp;result);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("alg: ecdh: compute shared secret failed. err %d\n",</div><div class='ctx'> 		       err);</div><div class='hunk'>@@ -104,7 +83,7 @@ int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],</div><div class='ctx'> free_all:</div><div class='ctx'> 	kpp_request_free(req);</div><div class='ctx'> free_tmp:</div><div class='del'>-	kzfree(tmp);</div><div class='add'>+	kfree_sensitive(tmp);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -126,8 +105,6 @@ int set_ecdh_privkey(struct crypto_kpp *tfm, const u8 private_key[32])</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ecdh p = {0};</div><div class='ctx'> </div><div class='del'>-	p.curve_id = ECC_CURVE_NIST_P256;</div><div class='del'>-</div><div class='ctx'> 	if (private_key) {</div><div class='ctx'> 		tmp = kmalloc(32, GFP_KERNEL);</div><div class='ctx'> 		if (!tmp)</div><div class='hunk'>@@ -151,9 +128,9 @@ int set_ecdh_privkey(struct crypto_kpp *tfm, const u8 private_key[32])</div><div class='ctx'> 	err = crypto_kpp_set_secret(tfm, buf, buf_len);</div><div class='ctx'> 	/* fall through */</div><div class='ctx'> free_all:</div><div class='del'>-	kzfree(buf);</div><div class='add'>+	kfree_sensitive(buf);</div><div class='ctx'> free_tmp:</div><div class='del'>-	kzfree(tmp);</div><div class='add'>+	kfree_sensitive(tmp);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,9 +144,9 @@ free_tmp:</div><div class='ctx'>  */</div><div class='ctx'> int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64])</div><div class='ctx'> {</div><div class='add'>+	DECLARE_CRYPTO_WAIT(result);</div><div class='ctx'> 	struct kpp_request *req;</div><div class='ctx'> 	u8 *tmp;</div><div class='del'>-	struct ecdh_completion result;</div><div class='ctx'> 	struct scatterlist dst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -183,18 +160,14 @@ int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64])</div><div class='ctx'> 		goto free_tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;result.completion);</div><div class='ctx'> 	sg_init_one(&amp;dst, tmp, 64);</div><div class='ctx'> 	kpp_request_set_input(req, NULL, 0);</div><div class='ctx'> 	kpp_request_set_output(req, &amp;dst, 64);</div><div class='ctx'> 	kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-				 ecdh_complete, &amp;result);</div><div class='add'>+				 crypto_req_done, &amp;result);</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_kpp_generate_public_key(req);</div><div class='del'>-	if (err == -EINPROGRESS) {</div><div class='del'>-		wait_for_completion(&amp;result.completion);</div><div class='del'>-		err = result.err;</div><div class='del'>-	}</div><div class='add'>+	err = crypto_wait_req(err, &amp;result);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto free_all;</div><div class='ctx'> </div><div class='head'>diff --git a/net/bluetooth/ecdh_helper.h b/net/bluetooth/ecdh_helper.h<br/>index a6f8d03d4aaf..830723971cf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/ecdh_helper.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/ecdh_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/ecdh_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/ecdh_helper.h</a></div><div class='hunk'>@@ -25,6 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 pair_public_key[64],</div><div class='ctx'> 			u8 secret[32]);</div><div class='del'>-int set_ecdh_privkey(struct crypto_kpp *tfm, const u8 *private_key);</div><div class='add'>+int set_ecdh_privkey(struct crypto_kpp *tfm, const u8 private_key[32]);</div><div class='ctx'> int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64]);</div><div class='ctx'> int generate_ecdh_keys(struct crypto_kpp *tfm, u8 public_key[64]);</div><div class='head'>diff --git a/net/bluetooth/eir.c b/net/bluetooth/eir.c<br/>new file mode 100644<br/>index 000000000000..3f72111ba651<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/eir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/eir.c</a></div><div class='hunk'>@@ -0,0 +1,386 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * BlueZ - Bluetooth protocol stack for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='add'>+</div><div class='add'>+#include "eir.h"</div><div class='add'>+</div><div class='add'>+#define PNP_INFO_SVCLASS_ID		0x1200</div><div class='add'>+</div><div class='add'>+u8 eir_append_local_name(struct hci_dev *hdev, u8 *ptr, u8 ad_len)</div><div class='add'>+{</div><div class='add'>+	size_t short_len;</div><div class='add'>+	size_t complete_len;</div><div class='add'>+</div><div class='add'>+	/* no space left for name (+ type + len) */</div><div class='add'>+	if ((max_adv_len(hdev) - ad_len) &lt; HCI_MAX_SHORT_NAME_LENGTH + 2)</div><div class='add'>+		return ad_len;</div><div class='add'>+</div><div class='add'>+	/* use complete name if present and fits */</div><div class='add'>+	complete_len = strnlen(hdev-&gt;dev_name, sizeof(hdev-&gt;dev_name));</div><div class='add'>+	if (complete_len &amp;&amp; complete_len &lt;= HCI_MAX_SHORT_NAME_LENGTH)</div><div class='add'>+		return eir_append_data(ptr, ad_len, EIR_NAME_COMPLETE,</div><div class='add'>+				       hdev-&gt;dev_name, complete_len);</div><div class='add'>+</div><div class='add'>+	/* use short name if present */</div><div class='add'>+	short_len = strnlen(hdev-&gt;short_name, sizeof(hdev-&gt;short_name));</div><div class='add'>+	if (short_len)</div><div class='add'>+		return eir_append_data(ptr, ad_len, EIR_NAME_SHORT,</div><div class='add'>+				       hdev-&gt;short_name,</div><div class='add'>+				       short_len);</div><div class='add'>+</div><div class='add'>+	/* use shortened full name if present, we already know that name</div><div class='add'>+	 * is longer then HCI_MAX_SHORT_NAME_LENGTH</div><div class='add'>+	 */</div><div class='add'>+	if (complete_len)</div><div class='add'>+		return eir_append_data(ptr, ad_len, EIR_NAME_SHORT,</div><div class='add'>+				       hdev-&gt;dev_name,</div><div class='add'>+				       HCI_MAX_SHORT_NAME_LENGTH);</div><div class='add'>+</div><div class='add'>+	return ad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 eir_append_appearance(struct hci_dev *hdev, u8 *ptr, u8 ad_len)</div><div class='add'>+{</div><div class='add'>+	return eir_append_le16(ptr, ad_len, EIR_APPEARANCE, hdev-&gt;appearance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 eir_append_service_data(u8 *eir, u16 eir_len, u16 uuid, u8 *data,</div><div class='add'>+			   u8 data_len)</div><div class='add'>+{</div><div class='add'>+	eir[eir_len++] = sizeof(u8) + sizeof(uuid) + data_len;</div><div class='add'>+	eir[eir_len++] = EIR_SERVICE_DATA;</div><div class='add'>+	put_unaligned_le16(uuid, &amp;eir[eir_len]);</div><div class='add'>+	eir_len += sizeof(uuid);</div><div class='add'>+	memcpy(&amp;eir[eir_len], data, data_len);</div><div class='add'>+	eir_len += data_len;</div><div class='add'>+</div><div class='add'>+	return eir_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *create_uuid16_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = data, *uuids_start = NULL;</div><div class='add'>+	struct bt_uuid *uuid;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 4)</div><div class='add'>+		return ptr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='add'>+		u16 uuid16;</div><div class='add'>+</div><div class='add'>+		if (uuid-&gt;size != 16)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		uuid16 = get_unaligned_le16(&amp;uuid-&gt;uuid[12]);</div><div class='add'>+		if (uuid16 &lt; 0x1100)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (uuid16 == PNP_INFO_SVCLASS_ID)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!uuids_start) {</div><div class='add'>+			uuids_start = ptr;</div><div class='add'>+			uuids_start[0] = 1;</div><div class='add'>+			uuids_start[1] = EIR_UUID16_ALL;</div><div class='add'>+			ptr += 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop if not enough space to put next UUID */</div><div class='add'>+		if ((ptr - data) + sizeof(u16) &gt; len) {</div><div class='add'>+			uuids_start[1] = EIR_UUID16_SOME;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*ptr++ = (uuid16 &amp; 0x00ff);</div><div class='add'>+		*ptr++ = (uuid16 &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+		uuids_start[0] += sizeof(uuid16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *create_uuid32_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = data, *uuids_start = NULL;</div><div class='add'>+	struct bt_uuid *uuid;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 6)</div><div class='add'>+		return ptr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='add'>+		if (uuid-&gt;size != 32)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!uuids_start) {</div><div class='add'>+			uuids_start = ptr;</div><div class='add'>+			uuids_start[0] = 1;</div><div class='add'>+			uuids_start[1] = EIR_UUID32_ALL;</div><div class='add'>+			ptr += 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop if not enough space to put next UUID */</div><div class='add'>+		if ((ptr - data) + sizeof(u32) &gt; len) {</div><div class='add'>+			uuids_start[1] = EIR_UUID32_SOME;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(ptr, &amp;uuid-&gt;uuid[12], sizeof(u32));</div><div class='add'>+		ptr += sizeof(u32);</div><div class='add'>+		uuids_start[0] += sizeof(u32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *create_uuid128_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = data, *uuids_start = NULL;</div><div class='add'>+	struct bt_uuid *uuid;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 18)</div><div class='add'>+		return ptr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='add'>+		if (uuid-&gt;size != 128)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!uuids_start) {</div><div class='add'>+			uuids_start = ptr;</div><div class='add'>+			uuids_start[0] = 1;</div><div class='add'>+			uuids_start[1] = EIR_UUID128_ALL;</div><div class='add'>+			ptr += 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stop if not enough space to put next UUID */</div><div class='add'>+		if ((ptr - data) + 16 &gt; len) {</div><div class='add'>+			uuids_start[1] = EIR_UUID128_SOME;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(ptr, uuid-&gt;uuid, 16);</div><div class='add'>+		ptr += 16;</div><div class='add'>+		uuids_start[0] += 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void eir_create(struct hci_dev *hdev, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = data;</div><div class='add'>+	size_t name_len;</div><div class='add'>+</div><div class='add'>+	name_len = strnlen(hdev-&gt;dev_name, sizeof(hdev-&gt;dev_name));</div><div class='add'>+</div><div class='add'>+	if (name_len &gt; 0) {</div><div class='add'>+		/* EIR Data type */</div><div class='add'>+		if (name_len &gt; 48) {</div><div class='add'>+			name_len = 48;</div><div class='add'>+			ptr[1] = EIR_NAME_SHORT;</div><div class='add'>+		} else {</div><div class='add'>+			ptr[1] = EIR_NAME_COMPLETE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* EIR Data length */</div><div class='add'>+		ptr[0] = name_len + 1;</div><div class='add'>+</div><div class='add'>+		memcpy(ptr + 2, hdev-&gt;dev_name, name_len);</div><div class='add'>+</div><div class='add'>+		ptr += (name_len + 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;inq_tx_power != HCI_TX_POWER_INVALID) {</div><div class='add'>+		ptr[0] = 2;</div><div class='add'>+		ptr[1] = EIR_TX_POWER;</div><div class='add'>+		ptr[2] = (u8)hdev-&gt;inq_tx_power;</div><div class='add'>+</div><div class='add'>+		ptr += 3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;devid_source &gt; 0) {</div><div class='add'>+		ptr[0] = 9;</div><div class='add'>+		ptr[1] = EIR_DEVICE_ID;</div><div class='add'>+</div><div class='add'>+		put_unaligned_le16(hdev-&gt;devid_source, ptr + 2);</div><div class='add'>+		put_unaligned_le16(hdev-&gt;devid_vendor, ptr + 4);</div><div class='add'>+		put_unaligned_le16(hdev-&gt;devid_product, ptr + 6);</div><div class='add'>+		put_unaligned_le16(hdev-&gt;devid_version, ptr + 8);</div><div class='add'>+</div><div class='add'>+		ptr += 10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = create_uuid16_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='add'>+	ptr = create_uuid32_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='add'>+	ptr = create_uuid128_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 eir_create_per_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	u8 ad_len = 0;</div><div class='add'>+</div><div class='add'>+	/* Return 0 when the current instance identifier is invalid. */</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adv) {</div><div class='add'>+		memcpy(ptr, adv-&gt;per_adv_data, adv-&gt;per_adv_data_len);</div><div class='add'>+		ad_len += adv-&gt;per_adv_data_len;</div><div class='add'>+		ptr += adv-&gt;per_adv_data_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr, u8 size)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	u8 ad_len = 0, flags = 0;</div><div class='add'>+	u32 instance_flags;</div><div class='add'>+</div><div class='add'>+	/* Return 0 when the current instance identifier is invalid. */</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	instance_flags = hci_adv_instance_flags(hdev, instance);</div><div class='add'>+</div><div class='add'>+	/* If instance already has the flags set skip adding it once</div><div class='add'>+	 * again.</div><div class='add'>+	 */</div><div class='add'>+	if (adv &amp;&amp; eir_get_data(adv-&gt;adv_data, adv-&gt;adv_data_len, EIR_FLAGS,</div><div class='add'>+				NULL))</div><div class='add'>+		goto skip_flags;</div><div class='add'>+</div><div class='add'>+	/* The Add Advertising command allows userspace to set both the general</div><div class='add'>+	 * and limited discoverable flags.</div><div class='add'>+	 */</div><div class='add'>+	if (instance_flags &amp; MGMT_ADV_FLAG_DISCOV)</div><div class='add'>+		flags |= LE_AD_GENERAL;</div><div class='add'>+</div><div class='add'>+	if (instance_flags &amp; MGMT_ADV_FLAG_LIMITED_DISCOV)</div><div class='add'>+		flags |= LE_AD_LIMITED;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		flags |= LE_AD_NO_BREDR;</div><div class='add'>+</div><div class='add'>+	if (flags || (instance_flags &amp; MGMT_ADV_FLAG_MANAGED_FLAGS)) {</div><div class='add'>+		/* If a discovery flag wasn't provided, simply use the global</div><div class='add'>+		 * settings.</div><div class='add'>+		 */</div><div class='add'>+		if (!flags)</div><div class='add'>+			flags |= mgmt_get_adv_discov_flags(hdev);</div><div class='add'>+</div><div class='add'>+		/* If flags would still be empty, then there is no need to</div><div class='add'>+		 * include the "Flags" AD field".</div><div class='add'>+		 */</div><div class='add'>+		if (flags &amp;&amp; (ad_len + eir_precalc_len(1) &lt;= size)) {</div><div class='add'>+			ptr[0] = 0x02;</div><div class='add'>+			ptr[1] = EIR_FLAGS;</div><div class='add'>+			ptr[2] = flags;</div><div class='add'>+</div><div class='add'>+			ad_len += 3;</div><div class='add'>+			ptr += 3;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_flags:</div><div class='add'>+	if (adv) {</div><div class='add'>+		memcpy(ptr, adv-&gt;adv_data, adv-&gt;adv_data_len);</div><div class='add'>+		ad_len += adv-&gt;adv_data_len;</div><div class='add'>+		ptr += adv-&gt;adv_data_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (instance_flags &amp; MGMT_ADV_FLAG_TX_POWER) {</div><div class='add'>+		s8 adv_tx_power;</div><div class='add'>+</div><div class='add'>+		if (ext_adv_capable(hdev)) {</div><div class='add'>+			if (adv)</div><div class='add'>+				adv_tx_power = adv-&gt;tx_power;</div><div class='add'>+			else</div><div class='add'>+				adv_tx_power = hdev-&gt;adv_tx_power;</div><div class='add'>+		} else {</div><div class='add'>+			adv_tx_power = hdev-&gt;adv_tx_power;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Provide Tx Power only if we can provide a valid value for it */</div><div class='add'>+		if (adv_tx_power != HCI_TX_POWER_INVALID &amp;&amp;</div><div class='add'>+		    (ad_len + eir_precalc_len(1) &lt;= size)) {</div><div class='add'>+			ptr[0] = 0x02;</div><div class='add'>+			ptr[1] = EIR_TX_POWER;</div><div class='add'>+			ptr[2] = (u8)adv_tx_power;</div><div class='add'>+</div><div class='add'>+			ad_len += 3;</div><div class='add'>+			ptr += 3;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 create_default_scan_rsp(struct hci_dev *hdev, u8 *ptr)</div><div class='add'>+{</div><div class='add'>+	u8 scan_rsp_len = 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;appearance)</div><div class='add'>+		scan_rsp_len = eir_append_appearance(hdev, ptr, scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	return eir_append_local_name(hdev, ptr, scan_rsp_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 eir_create_scan_rsp(struct hci_dev *hdev, u8 instance, u8 *ptr)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+	u8 scan_rsp_len = 0;</div><div class='add'>+</div><div class='add'>+	if (!instance)</div><div class='add'>+		return create_default_scan_rsp(hdev, ptr);</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (!adv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((adv-&gt;flags &amp; MGMT_ADV_FLAG_APPEARANCE) &amp;&amp; hdev-&gt;appearance)</div><div class='add'>+		scan_rsp_len = eir_append_appearance(hdev, ptr, scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ptr[scan_rsp_len], adv-&gt;scan_rsp_data, adv-&gt;scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	scan_rsp_len += adv-&gt;scan_rsp_len;</div><div class='add'>+</div><div class='add'>+	if (adv-&gt;flags &amp; MGMT_ADV_FLAG_LOCAL_NAME)</div><div class='add'>+		scan_rsp_len = eir_append_local_name(hdev, ptr, scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	return scan_rsp_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *eir_get_service_data(u8 *eir, size_t eir_len, u16 uuid, size_t *len)</div><div class='add'>+{</div><div class='add'>+	size_t dlen;</div><div class='add'>+</div><div class='add'>+	while ((eir = eir_get_data(eir, eir_len, EIR_SERVICE_DATA, &amp;dlen))) {</div><div class='add'>+		u16 value = get_unaligned_le16(eir);</div><div class='add'>+</div><div class='add'>+		if (uuid == value) {</div><div class='add'>+			if (len)</div><div class='add'>+				*len = dlen - 2;</div><div class='add'>+			return &amp;eir[2];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		eir += dlen;</div><div class='add'>+		eir_len -= dlen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/eir.h b/net/bluetooth/eir.h<br/>new file mode 100644<br/>index 000000000000..9372db83f912<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/eir.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/eir.h</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * BlueZ - Bluetooth protocol stack for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+void eir_create(struct hci_dev *hdev, u8 *data);</div><div class='add'>+</div><div class='add'>+u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr, u8 size);</div><div class='add'>+u8 eir_create_scan_rsp(struct hci_dev *hdev, u8 instance, u8 *ptr);</div><div class='add'>+u8 eir_create_per_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr);</div><div class='add'>+</div><div class='add'>+u8 eir_append_local_name(struct hci_dev *hdev, u8 *eir, u8 ad_len);</div><div class='add'>+u8 eir_append_appearance(struct hci_dev *hdev, u8 *ptr, u8 ad_len);</div><div class='add'>+u8 eir_append_service_data(u8 *eir, u16 eir_len, u16 uuid, u8 *data,</div><div class='add'>+			   u8 data_len);</div><div class='add'>+</div><div class='add'>+static inline u16 eir_precalc_len(u8 data_len)</div><div class='add'>+{</div><div class='add'>+	return sizeof(u8) * 2 + data_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type,</div><div class='add'>+				  u8 *data, u8 data_len)</div><div class='add'>+{</div><div class='add'>+	eir[eir_len++] = sizeof(type) + data_len;</div><div class='add'>+	eir[eir_len++] = type;</div><div class='add'>+	memcpy(&amp;eir[eir_len], data, data_len);</div><div class='add'>+	eir_len += data_len;</div><div class='add'>+</div><div class='add'>+	return eir_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data)</div><div class='add'>+{</div><div class='add'>+	eir[eir_len++] = sizeof(type) + sizeof(data);</div><div class='add'>+	eir[eir_len++] = type;</div><div class='add'>+	put_unaligned_le16(data, &amp;eir[eir_len]);</div><div class='add'>+	eir_len += sizeof(data);</div><div class='add'>+</div><div class='add'>+	return eir_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 eir_skb_put_data(struct sk_buff *skb, u8 type, u8 *data, u8 data_len)</div><div class='add'>+{</div><div class='add'>+	u8 *eir;</div><div class='add'>+	u16 eir_len;</div><div class='add'>+</div><div class='add'>+	eir_len	= eir_precalc_len(data_len);</div><div class='add'>+	eir = skb_put(skb, eir_len);</div><div class='add'>+	WARN_ON(sizeof(type) + data_len &gt; U8_MAX);</div><div class='add'>+	eir[0] = sizeof(type) + data_len;</div><div class='add'>+	eir[1] = type;</div><div class='add'>+	memcpy(&amp;eir[2], data, data_len);</div><div class='add'>+</div><div class='add'>+	return eir_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *eir_get_data(u8 *eir, size_t eir_len, u8 type,</div><div class='add'>+				 size_t *data_len)</div><div class='add'>+{</div><div class='add'>+	size_t parsed = 0;</div><div class='add'>+</div><div class='add'>+	if (eir_len &lt; 2)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	while (parsed &lt; eir_len - 1) {</div><div class='add'>+		u8 field_len = eir[0];</div><div class='add'>+</div><div class='add'>+		if (field_len == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		parsed += field_len + 1;</div><div class='add'>+</div><div class='add'>+		if (parsed &gt; eir_len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (eir[1] != type) {</div><div class='add'>+			eir += field_len + 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Zero length data */</div><div class='add'>+		if (field_len == 1)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		if (data_len)</div><div class='add'>+			*data_len = field_len - 1;</div><div class='add'>+</div><div class='add'>+		return &amp;eir[2];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *eir_get_service_data(u8 *eir, size_t eir_len, u16 uuid, size_t *len);</div><div class='head'>diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c<br/>new file mode 100644<br/>index 000000000000..3cc135bb1d30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_codec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_codec.c</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Copyright (C) 2021 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include "hci_codec.h"</div><div class='add'>+</div><div class='add'>+static int hci_codec_list_add(struct list_head *list,</div><div class='add'>+			      struct hci_op_read_local_codec_caps *sent,</div><div class='add'>+			      struct hci_rp_read_local_codec_caps *rp,</div><div class='add'>+			      void *caps,</div><div class='add'>+			      __u32 len)</div><div class='add'>+{</div><div class='add'>+	struct codec_list *entry;</div><div class='add'>+</div><div class='add'>+	entry = kzalloc(sizeof(*entry) + len, GFP_KERNEL);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry-&gt;id = sent-&gt;id;</div><div class='add'>+	if (sent-&gt;id == 0xFF) {</div><div class='add'>+		entry-&gt;cid = __le16_to_cpu(sent-&gt;cid);</div><div class='add'>+		entry-&gt;vid = __le16_to_cpu(sent-&gt;vid);</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;transport = sent-&gt;transport;</div><div class='add'>+	entry-&gt;len = len;</div><div class='add'>+	entry-&gt;num_caps = 0;</div><div class='add'>+	if (rp) {</div><div class='add'>+		entry-&gt;num_caps = rp-&gt;num_caps;</div><div class='add'>+		memcpy(entry-&gt;caps, caps, len);</div><div class='add'>+	}</div><div class='add'>+	list_add(&amp;entry-&gt;list, list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_codec_list_clear(struct list_head *codec_list)</div><div class='add'>+{</div><div class='add'>+	struct codec_list *c, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(c, n, codec_list, list) {</div><div class='add'>+		list_del(&amp;c-&gt;list);</div><div class='add'>+		kfree(c);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport,</div><div class='add'>+					struct hci_op_read_local_codec_caps</div><div class='add'>+					*cmd)</div><div class='add'>+{</div><div class='add'>+	__u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TRANSPORT_TYPE_MAX; i++) {</div><div class='add'>+		if (transport &amp; BIT(i)) {</div><div class='add'>+			struct hci_rp_read_local_codec_caps *rp;</div><div class='add'>+			struct hci_codec_caps *caps;</div><div class='add'>+			struct sk_buff *skb;</div><div class='add'>+			__u8 j;</div><div class='add'>+			__u32 len;</div><div class='add'>+</div><div class='add'>+			cmd-&gt;transport = i;</div><div class='add'>+</div><div class='add'>+			/* If Read_Codec_Capabilities command is not supported</div><div class='add'>+			 * then just add codec to the list without caps</div><div class='add'>+			 */</div><div class='add'>+			if (!(hdev-&gt;commands[45] &amp; 0x08)) {</div><div class='add'>+				hci_dev_lock(hdev);</div><div class='add'>+				hci_codec_list_add(&amp;hdev-&gt;local_codecs, cmd,</div><div class='add'>+						   NULL, NULL, 0);</div><div class='add'>+				hci_dev_unlock(hdev);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS,</div><div class='add'>+						sizeof(*cmd), cmd, 0, HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+			if (IS_ERR(skb)) {</div><div class='add'>+				bt_dev_err(hdev, "Failed to read codec capabilities (%ld)",</div><div class='add'>+					   PTR_ERR(skb));</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (skb-&gt;len &lt; sizeof(*rp))</div><div class='add'>+				goto error;</div><div class='add'>+</div><div class='add'>+			rp = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+			if (rp-&gt;status)</div><div class='add'>+				goto error;</div><div class='add'>+</div><div class='add'>+			if (!rp-&gt;num_caps) {</div><div class='add'>+				len = 0;</div><div class='add'>+				/* this codec doesn't have capabilities */</div><div class='add'>+				goto skip_caps_parse;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			skb_pull(skb, sizeof(*rp));</div><div class='add'>+</div><div class='add'>+			for (j = 0, len = 0; j &lt; rp-&gt;num_caps; j++) {</div><div class='add'>+				caps = (void *)skb-&gt;data;</div><div class='add'>+				if (skb-&gt;len &lt; sizeof(*caps))</div><div class='add'>+					goto error;</div><div class='add'>+				if (skb-&gt;len &lt; caps-&gt;len)</div><div class='add'>+					goto error;</div><div class='add'>+				len += sizeof(caps-&gt;len) + caps-&gt;len;</div><div class='add'>+				skb_pull(skb,  sizeof(caps-&gt;len) + caps-&gt;len);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+skip_caps_parse:</div><div class='add'>+			hci_dev_lock(hdev);</div><div class='add'>+			hci_codec_list_add(&amp;hdev-&gt;local_codecs, cmd, rp,</div><div class='add'>+					   (__u8 *)rp + sizeof(*rp), len);</div><div class='add'>+			hci_dev_unlock(hdev);</div><div class='add'>+error:</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_read_supported_codecs(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct hci_rp_read_local_supported_codecs *rp;</div><div class='add'>+	struct hci_std_codecs *std_codecs;</div><div class='add'>+	struct hci_vnd_codecs *vnd_codecs;</div><div class='add'>+	struct hci_op_read_local_codec_caps caps;</div><div class='add'>+	__u8 i;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS, 0, NULL,</div><div class='add'>+				0, HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rp = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(rp-&gt;status));</div><div class='add'>+</div><div class='add'>+	std_codecs = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* validate codecs length before accessing */</div><div class='add'>+	if (skb-&gt;len &lt; flex_array_size(std_codecs, codec, std_codecs-&gt;num)</div><div class='add'>+	    + sizeof(std_codecs-&gt;num))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* enumerate codec capabilities of standard codecs */</div><div class='add'>+	memset(&amp;caps, 0, sizeof(caps));</div><div class='add'>+	for (i = 0; i &lt; std_codecs-&gt;num; i++) {</div><div class='add'>+		caps.id = std_codecs-&gt;codec[i];</div><div class='add'>+		caps.direction = 0x00;</div><div class='add'>+		hci_read_codec_capabilities(hdev,</div><div class='add'>+					    LOCAL_CODEC_ACL_MASK | LOCAL_CODEC_SCO_MASK, &amp;caps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs-&gt;num)</div><div class='add'>+		 + sizeof(std_codecs-&gt;num));</div><div class='add'>+</div><div class='add'>+	vnd_codecs = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* validate vendor codecs length before accessing */</div><div class='add'>+	if (skb-&gt;len &lt;</div><div class='add'>+	    flex_array_size(vnd_codecs, codec, vnd_codecs-&gt;num)</div><div class='add'>+	    + sizeof(vnd_codecs-&gt;num))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* enumerate vendor codec capabilities */</div><div class='add'>+	for (i = 0; i &lt; vnd_codecs-&gt;num; i++) {</div><div class='add'>+		caps.id = 0xFF;</div><div class='add'>+		caps.cid = vnd_codecs-&gt;codec[i].cid;</div><div class='add'>+		caps.vid = vnd_codecs-&gt;codec[i].vid;</div><div class='add'>+		caps.direction = 0x00;</div><div class='add'>+		hci_read_codec_capabilities(hdev,</div><div class='add'>+					    LOCAL_CODEC_ACL_MASK | LOCAL_CODEC_SCO_MASK, &amp;caps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_read_supported_codecs_v2(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct hci_rp_read_local_supported_codecs_v2 *rp;</div><div class='add'>+	struct hci_std_codecs_v2 *std_codecs;</div><div class='add'>+	struct hci_vnd_codecs_v2 *vnd_codecs;</div><div class='add'>+	struct hci_op_read_local_codec_caps caps;</div><div class='add'>+	__u8 i;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL,</div><div class='add'>+				0, HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rp = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(rp-&gt;status));</div><div class='add'>+</div><div class='add'>+	std_codecs = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* check for payload data length before accessing */</div><div class='add'>+	if (skb-&gt;len &lt; flex_array_size(std_codecs, codec, std_codecs-&gt;num)</div><div class='add'>+	    + sizeof(std_codecs-&gt;num))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	memset(&amp;caps, 0, sizeof(caps));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; std_codecs-&gt;num; i++) {</div><div class='add'>+		caps.id = std_codecs-&gt;codec[i].id;</div><div class='add'>+		hci_read_codec_capabilities(hdev, std_codecs-&gt;codec[i].transport,</div><div class='add'>+					    &amp;caps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs-&gt;num)</div><div class='add'>+		 + sizeof(std_codecs-&gt;num));</div><div class='add'>+</div><div class='add'>+	vnd_codecs = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* check for payload data length before accessing */</div><div class='add'>+	if (skb-&gt;len &lt;</div><div class='add'>+	    flex_array_size(vnd_codecs, codec, vnd_codecs-&gt;num)</div><div class='add'>+	    + sizeof(vnd_codecs-&gt;num))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; vnd_codecs-&gt;num; i++) {</div><div class='add'>+		caps.id = 0xFF;</div><div class='add'>+		caps.cid = vnd_codecs-&gt;codec[i].cid;</div><div class='add'>+		caps.vid = vnd_codecs-&gt;codec[i].vid;</div><div class='add'>+		hci_read_codec_capabilities(hdev, vnd_codecs-&gt;codec[i].transport,</div><div class='add'>+					    &amp;caps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/hci_codec.h b/net/bluetooth/hci_codec.h<br/>new file mode 100644<br/>index 000000000000..a2751930f123<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_codec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_codec.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/* Copyright (C) 2014 Intel Corporation */</div><div class='add'>+</div><div class='add'>+void hci_read_supported_codecs(struct hci_dev *hdev);</div><div class='add'>+void hci_read_supported_codecs_v2(struct hci_dev *hdev);</div><div class='add'>+void hci_codec_list_clear(struct list_head *codec_list);</div><div class='head'>diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c<br/>index bd4978ce8c45..c3f7828bf9d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_conn.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_conn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_conn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_conn.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>    BlueZ - Bluetooth protocol stack for Linux</div><div class='ctx'>    Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.</div><div class='add'>+   Copyright 2023-2024 NXP</div><div class='ctx'> </div><div class='ctx'>    Written 2000,2001 by Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,14 +27,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/iso.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hci_request.h"</div><div class='ctx'> #include "smp.h"</div><div class='del'>-#include "a2mp.h"</div><div class='add'>+#include "eir.h"</div><div class='ctx'> </div><div class='ctx'> struct sco_param {</div><div class='ctx'> 	u16 pkt_type;</div><div class='hunk'>@@ -41,6 +44,11 @@ struct sco_param {</div><div class='ctx'> 	u8  retrans_effort;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct conn_handle_t {</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	__u16 handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct sco_param esco_param_cvsd[] = {</div><div class='ctx'> 	{ EDR_ESCO_MASK &amp; ~ESCO_2EV3, 0x000a,	0x01 }, /* S3 */</div><div class='ctx'> 	{ EDR_ESCO_MASK &amp; ~ESCO_2EV3, 0x0007,	0x01 }, /* S2 */</div><div class='hunk'>@@ -60,7 +68,7 @@ static const struct sco_param esco_param_msbc[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-static void hci_connect_le_scan_cleanup(struct hci_conn *conn)</div><div class='add'>+void hci_connect_le_scan_cleanup(struct hci_conn *conn, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn_params *params;</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='hunk'>@@ -80,9 +88,27 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn)</div><div class='ctx'> </div><div class='ctx'> 	params = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns, bdaddr,</div><div class='ctx'> 					   bdaddr_type);</div><div class='del'>-	if (!params || !params-&gt;explicit_connect)</div><div class='add'>+	if (!params)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;conn) {</div><div class='add'>+		hci_conn_drop(params-&gt;conn);</div><div class='add'>+		hci_conn_put(params-&gt;conn);</div><div class='add'>+		params-&gt;conn = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;explicit_connect)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* If the status indicates successful cancellation of</div><div class='add'>+	 * the attempt (i.e. Unknown Connection Id) there's no point of</div><div class='add'>+	 * notifying failure since we'll go back to keep trying to</div><div class='add'>+	 * connect. The only exception is explicit connect requests</div><div class='add'>+	 * where a timeout + cancel does indicate an actual failure.</div><div class='add'>+	 */</div><div class='add'>+	if (status &amp;&amp; status != HCI_ERROR_UNKNOWN_CONN_ID)</div><div class='add'>+		mgmt_connect_failed(hdev, conn, status);</div><div class='add'>+</div><div class='ctx'> 	/* The connection attempt was doing scan for new RPA, and is</div><div class='ctx'> 	 * in scan phase. If params are not associated with any other</div><div class='ctx'> 	 * autoconnect action, remove them completely. If they are, just unmark</div><div class='hunk'>@@ -90,7 +116,7 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn)</div><div class='ctx'> 	 */</div><div class='ctx'> 	params-&gt;explicit_connect = false;</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;params-&gt;action);</div><div class='add'>+	hci_pend_le_list_del_init(params);</div><div class='ctx'> </div><div class='ctx'> 	switch (params-&gt;auto_connect) {</div><div class='ctx'> 	case HCI_AUTO_CONN_EXPLICIT:</div><div class='hunk'>@@ -99,16 +125,16 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn)</div><div class='ctx'> 		return;</div><div class='ctx'> 	case HCI_AUTO_CONN_DIRECT:</div><div class='ctx'> 	case HCI_AUTO_CONN_ALWAYS:</div><div class='del'>-		list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+		hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HCI_AUTO_CONN_REPORT:</div><div class='del'>-		list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_reports);</div><div class='add'>+		hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_reports);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='add'>+	hci_update_passive_scan(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_conn_cleanup(struct hci_conn *conn)</div><div class='hunk'>@@ -118,163 +144,273 @@ static void hci_conn_cleanup(struct hci_conn *conn)</div><div class='ctx'> 	if (test_bit(HCI_CONN_PARAM_REMOVAL_PEND, &amp;conn-&gt;flags))</div><div class='ctx'> 		hci_conn_params_del(conn-&gt;hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='ctx'> </div><div class='del'>-	hci_chan_list_flush(conn);</div><div class='del'>-</div><div class='del'>-	hci_conn_hash_del(hdev, conn);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;notify)</div><div class='del'>-		hdev-&gt;notify(hdev, HCI_NOTIFY_CONN_DEL);</div><div class='del'>-</div><div class='del'>-	hci_conn_del_sysfs(conn);</div><div class='del'>-</div><div class='del'>-	debugfs_remove_recursive(conn-&gt;debugfs);</div><div class='add'>+	if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &amp;conn-&gt;flags))</div><div class='add'>+		hci_remove_link_key(hdev, &amp;conn-&gt;dst);</div><div class='ctx'> </div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-	hci_conn_put(conn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void le_scan_cleanup(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *conn = container_of(work, struct hci_conn,</div><div class='del'>-					     le_scan_cleanup);</div><div class='del'>-	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	struct hci_conn *c = NULL;</div><div class='add'>+	hci_chan_list_flush(conn);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s hcon %p", hdev-&gt;name, conn);</div><div class='add'>+	if (HCI_CONN_HANDLE_UNSET(conn-&gt;handle))</div><div class='add'>+		ida_free(&amp;hdev-&gt;unset_handle_ida, conn-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	if (conn-&gt;cleanup)</div><div class='add'>+		conn-&gt;cleanup(conn);</div><div class='ctx'> </div><div class='del'>-	/* Check that the hci_conn is still around */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(c, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='del'>-		if (c == conn)</div><div class='add'>+	if (conn-&gt;type == SCO_LINK || conn-&gt;type == ESCO_LINK) {</div><div class='add'>+		switch (conn-&gt;setting &amp; SCO_AIRMODE_MASK) {</div><div class='add'>+		case SCO_AIRMODE_CVSD:</div><div class='add'>+		case SCO_AIRMODE_TRANSP:</div><div class='add'>+			if (hdev-&gt;notify)</div><div class='add'>+				hdev-&gt;notify(hdev, HCI_NOTIFY_DISABLE_SCO);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (hdev-&gt;notify)</div><div class='add'>+			hdev-&gt;notify(hdev, HCI_NOTIFY_CONN_DEL);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (c == conn) {</div><div class='del'>-		hci_connect_le_scan_cleanup(conn);</div><div class='del'>-		hci_conn_cleanup(conn);</div><div class='del'>-	}</div><div class='add'>+	debugfs_remove_recursive(conn-&gt;debugfs);</div><div class='add'>+</div><div class='add'>+	hci_conn_del_sysfs(conn);</div><div class='ctx'> </div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='ctx'> 	hci_dev_put(hdev);</div><div class='del'>-	hci_conn_put(conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_connect_le_scan_remove(struct hci_conn *conn)</div><div class='add'>+int hci_disconnect(struct hci_conn *conn, __u8 reason)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("%s hcon %p", conn-&gt;hdev-&gt;name, conn);</div><div class='add'>+	BT_DBG("hcon %p", conn);</div><div class='ctx'> </div><div class='del'>-	/* We can't call hci_conn_del/hci_conn_cleanup here since that</div><div class='del'>-	 * could deadlock with another hci_conn_del() call that's holding</div><div class='del'>-	 * hci_dev_lock and doing cancel_delayed_work_sync(&amp;conn-&gt;disc_work).</div><div class='del'>-	 * Instead, grab temporary extra references to the hci_dev and</div><div class='del'>-	 * hci_conn and perform the necessary cleanup in a separate work</div><div class='del'>-	 * callback.</div><div class='add'>+	/* When we are central of an established connection and it enters</div><div class='add'>+	 * the disconnect timeout, then go ahead and try to read the</div><div class='add'>+	 * current clock offset.  Processing of the result is done</div><div class='add'>+	 * within the event handling and hci_clock_offset_evt function.</div><div class='ctx'> 	 */</div><div class='add'>+	if (conn-&gt;type == ACL_LINK &amp;&amp; conn-&gt;role == HCI_ROLE_MASTER &amp;&amp;</div><div class='add'>+	    (conn-&gt;state == BT_CONNECTED || conn-&gt;state == BT_CONFIG)) {</div><div class='add'>+		struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+		struct hci_cp_read_clock_offset clkoff_cp;</div><div class='ctx'> </div><div class='del'>-	hci_dev_hold(conn-&gt;hdev);</div><div class='del'>-	hci_conn_get(conn);</div><div class='add'>+		clkoff_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+		hci_send_cmd(hdev, HCI_OP_READ_CLOCK_OFFSET, sizeof(clkoff_cp),</div><div class='add'>+			     &amp;clkoff_cp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Even though we hold a reference to the hdev, many other</div><div class='del'>-	 * things might get cleaned up meanwhile, including the hdev's</div><div class='del'>-	 * own workqueue, so we can't use that for scheduling.</div><div class='del'>-	 */</div><div class='del'>-	schedule_work(&amp;conn-&gt;le_scan_cleanup);</div><div class='add'>+	return hci_abort_conn(conn, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_acl_create_connection(struct hci_conn *conn)</div><div class='add'>+static void hci_add_sco(struct hci_conn *conn, __u16 handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	struct inquiry_entry *ie;</div><div class='del'>-	struct hci_cp_create_conn cp;</div><div class='add'>+	struct hci_cp_add_sco cp;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hcon %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;state = BT_CONNECT;</div><div class='ctx'> 	conn-&gt;out = true;</div><div class='del'>-	conn-&gt;role = HCI_ROLE_MASTER;</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;attempt++;</div><div class='ctx'> </div><div class='del'>-	conn-&gt;link_policy = hdev-&gt;link_policy;</div><div class='add'>+	cp.handle   = cpu_to_le16(handle);</div><div class='add'>+	cp.pkt_type = cpu_to_le16(conn-&gt;pkt_type);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-	bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='del'>-	cp.pscan_rep_mode = 0x02;</div><div class='del'>-</div><div class='del'>-	ie = hci_inquiry_cache_lookup(hdev, &amp;conn-&gt;dst);</div><div class='del'>-	if (ie) {</div><div class='del'>-		if (inquiry_entry_age(ie) &lt;= INQUIRY_ENTRY_AGE_MAX) {</div><div class='del'>-			cp.pscan_rep_mode = ie-&gt;data.pscan_rep_mode;</div><div class='del'>-			cp.pscan_mode     = ie-&gt;data.pscan_mode;</div><div class='del'>-			cp.clock_offset   = ie-&gt;data.clock_offset |</div><div class='del'>-					    cpu_to_le16(0x8000);</div><div class='del'>-		}</div><div class='add'>+	hci_send_cmd(hdev, HCI_OP_ADD_SCO, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		memcpy(conn-&gt;dev_class, ie-&gt;data.dev_class, 3);</div><div class='del'>-		if (ie-&gt;data.ssp_mode &gt; 0)</div><div class='del'>-			set_bit(HCI_CONN_SSP_ENABLED, &amp;conn-&gt;flags);</div><div class='del'>-	}</div><div class='add'>+static bool find_next_esco_param(struct hci_conn *conn,</div><div class='add'>+				 const struct sco_param *esco_param, int size)</div><div class='add'>+{</div><div class='add'>+	if (!conn-&gt;parent)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	cp.pkt_type = cpu_to_le16(conn-&gt;pkt_type);</div><div class='del'>-	if (lmp_rswitch_capable(hdev) &amp;&amp; !(hdev-&gt;link_mode &amp; HCI_LM_MASTER))</div><div class='del'>-		cp.role_switch = 0x01;</div><div class='del'>-	else</div><div class='del'>-		cp.role_switch = 0x00;</div><div class='add'>+	for (; conn-&gt;attempt &lt;= size; conn-&gt;attempt++) {</div><div class='add'>+		if (lmp_esco_2m_capable(conn-&gt;parent) ||</div><div class='add'>+		    (esco_param[conn-&gt;attempt - 1].pkt_type &amp; ESCO_2EV3))</div><div class='add'>+			break;</div><div class='add'>+		BT_DBG("hcon %p skipped attempt %d, eSCO 2M not supported",</div><div class='add'>+		       conn, conn-&gt;attempt);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_send_cmd(hdev, HCI_OP_CREATE_CONN, sizeof(cp), &amp;cp);</div><div class='add'>+	return conn-&gt;attempt &lt;= size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hci_disconnect(struct hci_conn *conn, __u8 reason)</div><div class='add'>+static int configure_datapath_sync(struct hci_dev *hdev, struct bt_codec *codec)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("hcon %p", conn);</div><div class='add'>+	int err;</div><div class='add'>+	__u8 vnd_len, *vnd_data = NULL;</div><div class='add'>+	struct hci_op_configure_data_path *cmd = NULL;</div><div class='ctx'> </div><div class='del'>-	/* When we are master of an established connection and it enters</div><div class='del'>-	 * the disconnect timeout, then go ahead and try to read the</div><div class='del'>-	 * current clock offset.  Processing of the result is done</div><div class='del'>-	 * within the event handling and hci_clock_offset_evt function.</div><div class='add'>+	/* Do not take below 2 checks as error since the 1st means user do not</div><div class='add'>+	 * want to use HFP offload mode and the 2nd means the vendor controller</div><div class='add'>+	 * do not need to send below HCI command for offload mode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (conn-&gt;type == ACL_LINK &amp;&amp; conn-&gt;role == HCI_ROLE_MASTER &amp;&amp;</div><div class='del'>-	    (conn-&gt;state == BT_CONNECTED || conn-&gt;state == BT_CONFIG)) {</div><div class='del'>-		struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-		struct hci_cp_read_clock_offset clkoff_cp;</div><div class='add'>+	if (!codec-&gt;data_path || !hdev-&gt;get_codec_config_data)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		clkoff_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-		hci_send_cmd(hdev, HCI_OP_READ_CLOCK_OFFSET, sizeof(clkoff_cp),</div><div class='del'>-			     &amp;clkoff_cp);</div><div class='add'>+	err = hdev-&gt;get_codec_config_data(hdev, ESCO_LINK, codec, &amp;vnd_len,</div><div class='add'>+					  &amp;vnd_data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd) + vnd_len, GFP_KERNEL);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return hci_abort_conn(conn, reason);</div><div class='add'>+	err = hdev-&gt;get_data_path_id(hdev, &amp;cmd-&gt;data_path_id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vnd_len = vnd_len;</div><div class='add'>+	memcpy(cmd-&gt;vnd_data, vnd_data, vnd_len);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;direction = 0x00;</div><div class='add'>+	__hci_cmd_sync_status(hdev, HCI_CONFIGURE_DATA_PATH,</div><div class='add'>+			      sizeof(*cmd) + vnd_len, cmd, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;direction = 0x01;</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_CONFIGURE_DATA_PATH,</div><div class='add'>+				    sizeof(*cmd) + vnd_len, cmd,</div><div class='add'>+				    HCI_CMD_TIMEOUT);</div><div class='add'>+error:</div><div class='add'>+</div><div class='add'>+	kfree(cmd);</div><div class='add'>+	kfree(vnd_data);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_add_sco(struct hci_conn *conn, __u16 handle)</div><div class='add'>+static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	struct hci_cp_add_sco cp;</div><div class='add'>+	struct conn_handle_t *conn_handle = data;</div><div class='add'>+	struct hci_conn *conn = conn_handle-&gt;conn;</div><div class='add'>+	__u16 handle = conn_handle-&gt;handle;</div><div class='add'>+	struct hci_cp_enhanced_setup_sync_conn cp;</div><div class='add'>+	const struct sco_param *param;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("hcon %p", conn);</div><div class='add'>+	kfree(conn_handle);</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p", conn);</div><div class='add'>+</div><div class='add'>+	configure_datapath_sync(hdev, &amp;conn-&gt;codec);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;state = BT_CONNECT;</div><div class='ctx'> 	conn-&gt;out = true;</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;attempt++;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cp, 0x00, sizeof(cp));</div><div class='add'>+</div><div class='ctx'> 	cp.handle   = cpu_to_le16(handle);</div><div class='del'>-	cp.pkt_type = cpu_to_le16(conn-&gt;pkt_type);</div><div class='ctx'> </div><div class='del'>-	hci_send_cmd(hdev, HCI_OP_ADD_SCO, sizeof(cp), &amp;cp);</div><div class='add'>+	cp.tx_bandwidth   = cpu_to_le32(0x00001f40);</div><div class='add'>+	cp.rx_bandwidth   = cpu_to_le32(0x00001f40);</div><div class='add'>+</div><div class='add'>+	switch (conn-&gt;codec.id) {</div><div class='add'>+	case BT_CODEC_MSBC:</div><div class='add'>+		if (!find_next_esco_param(conn, esco_param_msbc,</div><div class='add'>+					  ARRAY_SIZE(esco_param_msbc)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		param = &amp;esco_param_msbc[conn-&gt;attempt - 1];</div><div class='add'>+		cp.tx_coding_format.id = 0x05;</div><div class='add'>+		cp.rx_coding_format.id = 0x05;</div><div class='add'>+		cp.tx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.rx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.in_bandwidth = __cpu_to_le32(32000);</div><div class='add'>+		cp.out_bandwidth = __cpu_to_le32(32000);</div><div class='add'>+		cp.in_coding_format.id = 0x04;</div><div class='add'>+		cp.out_coding_format.id = 0x04;</div><div class='add'>+		cp.in_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.out_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.in_pcm_data_format = 2;</div><div class='add'>+		cp.out_pcm_data_format = 2;</div><div class='add'>+		cp.in_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.out_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.in_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.out_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.in_transport_unit_size = 1;</div><div class='add'>+		cp.out_transport_unit_size = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CODEC_TRANSPARENT:</div><div class='add'>+		if (!find_next_esco_param(conn, esco_param_msbc,</div><div class='add'>+					  ARRAY_SIZE(esco_param_msbc)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		param = &amp;esco_param_msbc[conn-&gt;attempt - 1];</div><div class='add'>+		cp.tx_coding_format.id = 0x03;</div><div class='add'>+		cp.rx_coding_format.id = 0x03;</div><div class='add'>+		cp.tx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.rx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.in_bandwidth = __cpu_to_le32(0x1f40);</div><div class='add'>+		cp.out_bandwidth = __cpu_to_le32(0x1f40);</div><div class='add'>+		cp.in_coding_format.id = 0x03;</div><div class='add'>+		cp.out_coding_format.id = 0x03;</div><div class='add'>+		cp.in_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.out_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.in_pcm_data_format = 2;</div><div class='add'>+		cp.out_pcm_data_format = 2;</div><div class='add'>+		cp.in_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.out_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.in_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.out_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.in_transport_unit_size = 1;</div><div class='add'>+		cp.out_transport_unit_size = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CODEC_CVSD:</div><div class='add'>+		if (conn-&gt;parent &amp;&amp; lmp_esco_capable(conn-&gt;parent)) {</div><div class='add'>+			if (!find_next_esco_param(conn, esco_param_cvsd,</div><div class='add'>+						  ARRAY_SIZE(esco_param_cvsd)))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			param = &amp;esco_param_cvsd[conn-&gt;attempt - 1];</div><div class='add'>+		} else {</div><div class='add'>+			if (conn-&gt;attempt &gt; ARRAY_SIZE(sco_param_cvsd))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			param = &amp;sco_param_cvsd[conn-&gt;attempt - 1];</div><div class='add'>+		}</div><div class='add'>+		cp.tx_coding_format.id = 2;</div><div class='add'>+		cp.rx_coding_format.id = 2;</div><div class='add'>+		cp.tx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.rx_codec_frame_size = __cpu_to_le16(60);</div><div class='add'>+		cp.in_bandwidth = __cpu_to_le32(16000);</div><div class='add'>+		cp.out_bandwidth = __cpu_to_le32(16000);</div><div class='add'>+		cp.in_coding_format.id = 4;</div><div class='add'>+		cp.out_coding_format.id = 4;</div><div class='add'>+		cp.in_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.out_coded_data_size = __cpu_to_le16(16);</div><div class='add'>+		cp.in_pcm_data_format = 2;</div><div class='add'>+		cp.out_pcm_data_format = 2;</div><div class='add'>+		cp.in_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.out_pcm_sample_payload_msb_pos = 0;</div><div class='add'>+		cp.in_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.out_data_path = conn-&gt;codec.data_path;</div><div class='add'>+		cp.in_transport_unit_size = 16;</div><div class='add'>+		cp.out_transport_unit_size = 16;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp.retrans_effort = param-&gt;retrans_effort;</div><div class='add'>+	cp.pkt_type = __cpu_to_le16(param-&gt;pkt_type);</div><div class='add'>+	cp.max_latency = __cpu_to_le16(param-&gt;max_latency);</div><div class='add'>+</div><div class='add'>+	if (hci_send_cmd(hdev, HCI_OP_ENHANCED_SETUP_SYNC_CONN, sizeof(cp), &amp;cp) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool hci_setup_sync(struct hci_conn *conn, __u16 handle)</div><div class='add'>+static bool hci_setup_sync_conn(struct hci_conn *conn, __u16 handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> 	struct hci_cp_setup_sync_conn cp;</div><div class='ctx'> 	const struct sco_param *param;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("hcon %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;state = BT_CONNECT;</div><div class='ctx'> 	conn-&gt;out = true;</div><div class='hunk'>@@ -289,13 +425,15 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)</div><div class='ctx'> </div><div class='ctx'> 	switch (conn-&gt;setting &amp; SCO_AIRMODE_MASK) {</div><div class='ctx'> 	case SCO_AIRMODE_TRANSP:</div><div class='del'>-		if (conn-&gt;attempt &gt; ARRAY_SIZE(esco_param_msbc))</div><div class='add'>+		if (!find_next_esco_param(conn, esco_param_msbc,</div><div class='add'>+					  ARRAY_SIZE(esco_param_msbc)))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		param = &amp;esco_param_msbc[conn-&gt;attempt - 1];</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SCO_AIRMODE_CVSD:</div><div class='del'>-		if (lmp_esco_capable(conn-&gt;link)) {</div><div class='del'>-			if (conn-&gt;attempt &gt; ARRAY_SIZE(esco_param_cvsd))</div><div class='add'>+		if (conn-&gt;parent &amp;&amp; lmp_esco_capable(conn-&gt;parent)) {</div><div class='add'>+			if (!find_next_esco_param(conn, esco_param_cvsd,</div><div class='add'>+						  ARRAY_SIZE(esco_param_cvsd)))</div><div class='ctx'> 				return false;</div><div class='ctx'> 			param = &amp;esco_param_cvsd[conn-&gt;attempt - 1];</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -318,6 +456,30 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool hci_setup_sync(struct hci_conn *conn, __u16 handle)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	struct conn_handle_t *conn_handle;</div><div class='add'>+</div><div class='add'>+	if (enhanced_sync_conn_capable(conn-&gt;hdev)) {</div><div class='add'>+		conn_handle = kzalloc(sizeof(*conn_handle), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!conn_handle)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		conn_handle-&gt;conn = conn;</div><div class='add'>+		conn_handle-&gt;handle = handle;</div><div class='add'>+		result = hci_cmd_sync_queue(conn-&gt;hdev, hci_enhanced_setup_sync,</div><div class='add'>+					    conn_handle, NULL);</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			kfree(conn_handle);</div><div class='add'>+</div><div class='add'>+		return result == 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_setup_sync_conn(conn, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,</div><div class='ctx'> 		      u16 to_multiplier)</div><div class='ctx'> {</div><div class='hunk'>@@ -375,21 +537,22 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,</div><div class='ctx'> /* Device _must_ be locked */</div><div class='ctx'> void hci_sco_setup(struct hci_conn *conn, __u8 status)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn *sco = conn-&gt;link;</div><div class='add'>+	struct hci_link *link;</div><div class='ctx'> </div><div class='del'>-	if (!sco)</div><div class='add'>+	link = list_first_entry_or_null(&amp;conn-&gt;link_list, struct hci_link, list);</div><div class='add'>+	if (!link || !link-&gt;conn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hcon %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		if (lmp_esco_capable(conn-&gt;hdev))</div><div class='del'>-			hci_setup_sync(sco, conn-&gt;handle);</div><div class='add'>+			hci_setup_sync(link-&gt;conn, conn-&gt;handle);</div><div class='ctx'> 		else</div><div class='del'>-			hci_add_sco(sco, conn-&gt;handle);</div><div class='add'>+			hci_add_sco(link-&gt;conn, conn-&gt;handle);</div><div class='ctx'> 	} else {</div><div class='del'>-		hci_connect_cfm(sco, status);</div><div class='del'>-		hci_conn_del(sco);</div><div class='add'>+		hci_connect_cfm(link-&gt;conn, status);</div><div class='add'>+		hci_conn_del(link-&gt;conn);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -413,13 +576,6 @@ static void hci_conn_timeout(struct work_struct *work)</div><div class='ctx'> 	if (refcnt &gt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* LE connections in scanning state need special handling */</div><div class='del'>-	if (conn-&gt;state == BT_CONNECT &amp;&amp; conn-&gt;type == LE_LINK &amp;&amp;</div><div class='del'>-	    test_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags)) {</div><div class='del'>-		hci_connect_le_scan_remove(conn);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	hci_abort_conn(conn, hci_proto_disconn_ind(conn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -467,6 +623,23 @@ static void hci_conn_auto_accept(struct work_struct *work)</div><div class='ctx'> 		     &amp;conn-&gt;dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void le_disable_advertising(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (ext_adv_capable(hdev)) {</div><div class='add'>+		struct hci_cp_le_set_ext_adv_enable cp;</div><div class='add'>+</div><div class='add'>+		cp.enable = 0x00;</div><div class='add'>+		cp.num_of_sets = 0x00;</div><div class='add'>+</div><div class='add'>+		hci_send_cmd(hdev, HCI_OP_LE_SET_EXT_ADV_ENABLE, sizeof(cp),</div><div class='add'>+			     &amp;cp);</div><div class='add'>+	} else {</div><div class='add'>+		u8 enable = 0x00;</div><div class='add'>+		hci_send_cmd(hdev, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),</div><div class='add'>+			     &amp;enable);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void le_conn_timeout(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *conn = container_of(work, struct hci_conn,</div><div class='hunk'>@@ -481,29 +654,327 @@ static void le_conn_timeout(struct work_struct *work)</div><div class='ctx'> 	 * (which doesn't have a timeout of its own).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (conn-&gt;role == HCI_ROLE_SLAVE) {</div><div class='del'>-		u8 enable = 0x00;</div><div class='del'>-		hci_send_cmd(hdev, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),</div><div class='del'>-			     &amp;enable);</div><div class='del'>-		hci_le_conn_failed(conn, HCI_ERROR_ADVERTISING_TIMEOUT);</div><div class='add'>+		/* Disable LE Advertising */</div><div class='add'>+		le_disable_advertising(hdev);</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		hci_conn_failed(conn, HCI_ERROR_ADVERTISING_TIMEOUT);</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='del'>-			      u8 role)</div><div class='add'>+struct iso_list_data {</div><div class='add'>+	union {</div><div class='add'>+		u8  cig;</div><div class='add'>+		u8  big;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		u8  cis;</div><div class='add'>+		u8  bis;</div><div class='add'>+		u16 sync_handle;</div><div class='add'>+	};</div><div class='add'>+	int count;</div><div class='add'>+	bool big_term;</div><div class='add'>+	bool pa_sync_term;</div><div class='add'>+	bool big_sync_term;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bis_list(struct hci_conn *conn, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	/* Skip if not broadcast/ANY address */</div><div class='add'>+	if (bacmp(&amp;conn-&gt;dst, BDADDR_ANY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (d-&gt;big != conn-&gt;iso_qos.bcast.big || d-&gt;bis == BT_ISO_QOS_BIS_UNSET ||</div><div class='add'>+	    d-&gt;bis != conn-&gt;iso_qos.bcast.bis)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d-&gt;count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int terminate_big_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "big 0x%2.2x bis 0x%2.2x", d-&gt;big, d-&gt;bis);</div><div class='add'>+</div><div class='add'>+	hci_disable_per_advertising_sync(hdev, d-&gt;bis);</div><div class='add'>+	hci_remove_ext_adv_instance_sync(hdev, d-&gt;bis, NULL);</div><div class='add'>+</div><div class='add'>+	/* Only terminate BIG if it has been created */</div><div class='add'>+	if (!d-&gt;big_term)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_le_terminate_big_sync(hdev, d-&gt;big,</div><div class='add'>+					 HCI_ERROR_LOCAL_HOST_TERM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void terminate_big_destroy(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_terminate_big(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "big 0x%2.2x bis 0x%2.2x", conn-&gt;iso_qos.bcast.big,</div><div class='add'>+		   conn-&gt;iso_qos.bcast.bis);</div><div class='add'>+</div><div class='add'>+	d = kzalloc(sizeof(*d), GFP_KERNEL);</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d-&gt;big = conn-&gt;iso_qos.bcast.big;</div><div class='add'>+	d-&gt;bis = conn-&gt;iso_qos.bcast.bis;</div><div class='add'>+	d-&gt;big_term = test_and_clear_bit(HCI_CONN_BIG_CREATED, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ret = hci_cmd_sync_queue(hdev, terminate_big_sync, d,</div><div class='add'>+				 terminate_big_destroy);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(d);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int big_terminate_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "big 0x%2.2x sync_handle 0x%4.4x", d-&gt;big,</div><div class='add'>+		   d-&gt;sync_handle);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;big_sync_term)</div><div class='add'>+		hci_le_big_terminate_sync(hdev, d-&gt;big);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;pa_sync_term)</div><div class='add'>+		return hci_le_pa_terminate_sync(hdev, d-&gt;sync_handle);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void find_bis(struct hci_conn *conn, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	/* Ignore if BIG doesn't match */</div><div class='add'>+	if (d-&gt;big != conn-&gt;iso_qos.bcast.big)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d-&gt;count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_big_terminate(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p big 0x%2.2x sync_handle 0x%4.4x", conn,</div><div class='add'>+		   conn-&gt;iso_qos.bcast.big, conn-&gt;sync_handle);</div><div class='add'>+</div><div class='add'>+	d = kzalloc(sizeof(*d), GFP_KERNEL);</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d-&gt;big = conn-&gt;iso_qos.bcast.big;</div><div class='add'>+	d-&gt;sync_handle = conn-&gt;sync_handle;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == PA_LINK &amp;&amp;</div><div class='add'>+	    test_and_clear_bit(HCI_CONN_PA_SYNC, &amp;conn-&gt;flags)) {</div><div class='add'>+		hci_conn_hash_list_flag(hdev, find_bis, PA_LINK,</div><div class='add'>+					HCI_CONN_PA_SYNC, d);</div><div class='add'>+</div><div class='add'>+		if (!d-&gt;count)</div><div class='add'>+			d-&gt;pa_sync_term = true;</div><div class='add'>+</div><div class='add'>+		d-&gt;count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(HCI_CONN_BIG_SYNC, &amp;conn-&gt;flags)) {</div><div class='add'>+		hci_conn_hash_list_flag(hdev, find_bis, BIS_LINK,</div><div class='add'>+					HCI_CONN_BIG_SYNC, d);</div><div class='add'>+</div><div class='add'>+		if (!d-&gt;count)</div><div class='add'>+			d-&gt;big_sync_term = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!d-&gt;pa_sync_term &amp;&amp; !d-&gt;big_sync_term)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = hci_cmd_sync_queue(hdev, big_terminate_sync, d,</div><div class='add'>+				 terminate_big_destroy);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(d);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cleanup BIS connection</div><div class='add'>+ *</div><div class='add'>+ * Detects if there any BIS left connected in a BIG</div><div class='add'>+ * broadcaster: Remove advertising instance and terminate BIG.</div><div class='add'>+ * broadcaster receiver: Terminate BIG sync and terminate PA sync.</div><div class='add'>+ */</div><div class='add'>+static void bis_cleanup(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct hci_conn *bis;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;role == HCI_ROLE_MASTER) {</div><div class='add'>+		if (!test_and_clear_bit(HCI_CONN_PER_ADV, &amp;conn-&gt;flags))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Check if ISO connection is a BIS and terminate advertising</div><div class='add'>+		 * set and BIG if there are no other connections using it.</div><div class='add'>+		 */</div><div class='add'>+		bis = hci_conn_hash_lookup_big_state(hdev,</div><div class='add'>+						     conn-&gt;iso_qos.bcast.big,</div><div class='add'>+						     BT_CONNECTED,</div><div class='add'>+						     HCI_ROLE_MASTER);</div><div class='add'>+		if (bis)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		bis = hci_conn_hash_lookup_big_state(hdev,</div><div class='add'>+						     conn-&gt;iso_qos.bcast.big,</div><div class='add'>+						     BT_CONNECT,</div><div class='add'>+						     HCI_ROLE_MASTER);</div><div class='add'>+		if (bis)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		bis = hci_conn_hash_lookup_big_state(hdev,</div><div class='add'>+						     conn-&gt;iso_qos.bcast.big,</div><div class='add'>+						     BT_OPEN,</div><div class='add'>+						     HCI_ROLE_MASTER);</div><div class='add'>+		if (bis)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		hci_le_terminate_big(hdev, conn);</div><div class='add'>+	} else {</div><div class='add'>+		hci_le_big_terminate(hdev, conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_cig_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 handle = PTR_UINT(data);</div><div class='add'>+</div><div class='add'>+	return hci_le_remove_cig_sync(hdev, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_remove_cig(struct hci_dev *hdev, u8 handle)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%2.2x", handle);</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_queue(hdev, remove_cig_sync, UINT_PTR(handle),</div><div class='add'>+				  NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void find_cis(struct hci_conn *conn, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	/* Ignore broadcast or if CIG don't match */</div><div class='add'>+	if (!bacmp(&amp;conn-&gt;dst, BDADDR_ANY) || d-&gt;cig != conn-&gt;iso_qos.ucast.cig)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d-&gt;count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cleanup CIS connection:</div><div class='add'>+ *</div><div class='add'>+ * Detects if there any CIS left connected in a CIG and remove it.</div><div class='add'>+ */</div><div class='add'>+static void cis_cleanup(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct iso_list_data d;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;iso_qos.ucast.cig == BT_ISO_QOS_CIG_UNSET)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;d, 0, sizeof(d));</div><div class='add'>+	d.cig = conn-&gt;iso_qos.ucast.cig;</div><div class='add'>+</div><div class='add'>+	/* Check if ISO connection is a CIS and remove CIG if there are</div><div class='add'>+	 * no other connections using it.</div><div class='add'>+	 */</div><div class='add'>+	hci_conn_hash_list_state(hdev, find_cis, CIS_LINK, BT_BOUND, &amp;d);</div><div class='add'>+	hci_conn_hash_list_state(hdev, find_cis, CIS_LINK, BT_CONNECT,</div><div class='add'>+				 &amp;d);</div><div class='add'>+	hci_conn_hash_list_state(hdev, find_cis, CIS_LINK, BT_CONNECTED,</div><div class='add'>+				 &amp;d);</div><div class='add'>+	if (d.count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_le_remove_cig(hdev, conn-&gt;iso_qos.ucast.cig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_conn_hash_alloc_unset(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return ida_alloc_range(&amp;hdev-&gt;unset_handle_ida, HCI_CONN_HANDLE_MAX + 1,</div><div class='add'>+			       U16_MAX, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,</div><div class='add'>+				       bdaddr_t *dst, u8 dst_type,</div><div class='add'>+				       u8 role, u16 handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='add'>+	struct smp_irk *irk = NULL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		if (!hdev-&gt;acl_mtu)</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+		if (!hdev-&gt;iso_mtu)</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		irk = hci_get_irk(hdev, dst, dst_type);</div><div class='add'>+		break;</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		if (hdev-&gt;le_mtu &amp;&amp; hdev-&gt;le_mtu &lt; HCI_MIN_LE_MTU)</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		if (!hdev-&gt;le_mtu &amp;&amp; hdev-&gt;acl_mtu &lt; HCI_MIN_LE_MTU)</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		irk = hci_get_irk(hdev, dst, dst_type);</div><div class='add'>+		break;</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		if (!hdev-&gt;sco_pkts)</div><div class='add'>+			/* Controller does not support SCO or eSCO over HCI */</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s dst %pMR", hdev-&gt;name, dst);</div><div class='add'>+	bt_dev_dbg(hdev, "dst %pMR handle 0x%4.4x", dst, handle);</div><div class='ctx'> </div><div class='ctx'> 	conn = kzalloc(sizeof(*conn), GFP_KERNEL);</div><div class='ctx'> 	if (!conn)</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/* If and IRK exists use its identity address */</div><div class='add'>+	if (!irk) {</div><div class='add'>+		bacpy(&amp;conn-&gt;dst, dst);</div><div class='add'>+		conn-&gt;dst_type = dst_type;</div><div class='add'>+	} else {</div><div class='add'>+		bacpy(&amp;conn-&gt;dst, &amp;irk-&gt;bdaddr);</div><div class='add'>+		conn-&gt;dst_type = irk-&gt;addr_type;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bacpy(&amp;conn-&gt;dst, dst);</div><div class='ctx'> 	bacpy(&amp;conn-&gt;src, &amp;hdev-&gt;bdaddr);</div><div class='add'>+	conn-&gt;handle = handle;</div><div class='ctx'> 	conn-&gt;hdev  = hdev;</div><div class='ctx'> 	conn-&gt;type  = type;</div><div class='ctx'> 	conn-&gt;role  = role;</div><div class='hunk'>@@ -516,20 +987,43 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='ctx'> 	conn-&gt;rssi = HCI_RSSI_INVALID;</div><div class='ctx'> 	conn-&gt;tx_power = HCI_TX_POWER_INVALID;</div><div class='ctx'> 	conn-&gt;max_tx_power = HCI_TX_POWER_INVALID;</div><div class='add'>+	conn-&gt;sync_handle = HCI_SYNC_HANDLE_INVALID;</div><div class='add'>+	conn-&gt;sid = HCI_SID_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HCI_CONN_POWER_SAVE, &amp;conn-&gt;flags);</div><div class='ctx'> 	conn-&gt;disc_timeout = HCI_DISCONN_TIMEOUT;</div><div class='ctx'> </div><div class='add'>+	/* Set Default Authenticated payload timeout to 30s */</div><div class='add'>+	conn-&gt;auth_payload_timeout = DEFAULT_AUTH_PAYLOAD_TIMEOUT;</div><div class='add'>+</div><div class='ctx'> 	if (conn-&gt;role == HCI_ROLE_MASTER)</div><div class='ctx'> 		conn-&gt;out = true;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ACL_LINK:</div><div class='ctx'> 		conn-&gt;pkt_type = hdev-&gt;pkt_type &amp; ACL_PTYPE_MASK;</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;acl_mtu;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LE_LINK:</div><div class='ctx'> 		/* conn-&gt;src should reflect the local identity address */</div><div class='ctx'> 		hci_copy_identity_address(hdev, &amp;conn-&gt;src, &amp;conn-&gt;src_type);</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;le_mtu ? hdev-&gt;le_mtu : hdev-&gt;acl_mtu;</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+		/* conn-&gt;src should reflect the local identity address */</div><div class='add'>+		hci_copy_identity_address(hdev, &amp;conn-&gt;src, &amp;conn-&gt;src_type);</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;role == HCI_ROLE_MASTER)</div><div class='add'>+			conn-&gt;cleanup = cis_cleanup;</div><div class='add'>+</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;iso_mtu;</div><div class='add'>+		break;</div><div class='add'>+	case PA_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+		/* conn-&gt;src should reflect the local identity address */</div><div class='add'>+		hci_copy_identity_address(hdev, &amp;conn-&gt;src, &amp;conn-&gt;src_type);</div><div class='add'>+		conn-&gt;cleanup = bis_cleanup;</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;iso_mtu;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SCO_LINK:</div><div class='ctx'> 		if (lmp_esco_capable(hdev))</div><div class='hunk'>@@ -537,71 +1031,200 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='ctx'> 					(hdev-&gt;esco_type &amp; EDR_ESCO_MASK);</div><div class='ctx'> 		else</div><div class='ctx'> 			conn-&gt;pkt_type = hdev-&gt;pkt_type &amp; SCO_PTYPE_MASK;</div><div class='add'>+</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;sco_mtu;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ESCO_LINK:</div><div class='ctx'> 		conn-&gt;pkt_type = hdev-&gt;esco_type &amp; ~EDR_ESCO_MASK;</div><div class='add'>+		conn-&gt;mtu = hdev-&gt;sco_mtu;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;conn-&gt;data_q);</div><div class='add'>+	skb_queue_head_init(&amp;conn-&gt;tx_q.queue);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;conn-&gt;chan_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;conn-&gt;link_list);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;conn-&gt;disc_work, hci_conn_timeout);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;conn-&gt;auto_accept_work, hci_conn_auto_accept);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;conn-&gt;idle_work, hci_conn_idle);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;conn-&gt;le_conn_timeout, le_conn_timeout);</div><div class='del'>-	INIT_WORK(&amp;conn-&gt;le_scan_cleanup, le_scan_cleanup);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;conn-&gt;refcnt, 0);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_hold(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_conn_hash_add(hdev, conn);</div><div class='del'>-	if (hdev-&gt;notify)</div><div class='del'>-		hdev-&gt;notify(hdev, HCI_NOTIFY_CONN_ADD);</div><div class='ctx'> </div><div class='del'>-	hci_conn_init_sysfs(conn);</div><div class='add'>+	/* The SCO and eSCO connections will only be notified when their</div><div class='add'>+	 * setup has been completed. This is different to ACL links which</div><div class='add'>+	 * can be notified right away.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;type != SCO_LINK &amp;&amp; conn-&gt;type != ESCO_LINK) {</div><div class='add'>+		if (hdev-&gt;notify)</div><div class='add'>+			hdev-&gt;notify(hdev, HCI_NOTIFY_CONN_ADD);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	hci_conn_init_sysfs(conn);</div><div class='ctx'> 	return conn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hci_conn_del(struct hci_conn *conn)</div><div class='add'>+struct hci_conn *hci_conn_add_unset(struct hci_dev *hdev, int type,</div><div class='add'>+				    bdaddr_t *dst, u8 dst_type, u8 role)</div><div class='add'>+{</div><div class='add'>+	int handle;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "dst %pMR", dst);</div><div class='add'>+</div><div class='add'>+	handle = hci_conn_hash_alloc_unset(hdev);</div><div class='add'>+	if (unlikely(handle &lt; 0))</div><div class='add'>+		return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+</div><div class='add'>+	return __hci_conn_add(hdev, type, dst, dst_type, role, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='add'>+			      u8 dst_type, u8 role, u16 handle)</div><div class='add'>+{</div><div class='add'>+	if (handle &gt; HCI_CONN_HANDLE_MAX)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return __hci_conn_add(hdev, type, dst, dst_type, role, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_conn_cleanup_child(struct hci_conn *conn, u8 reason)</div><div class='add'>+{</div><div class='add'>+	if (!reason)</div><div class='add'>+		reason = HCI_ERROR_REMOTE_USER_TERM;</div><div class='add'>+</div><div class='add'>+	/* Due to race, SCO/ISO conn might be not established yet at this point,</div><div class='add'>+	 * and nothing else will clean it up. In other cases it is done via HCI</div><div class='add'>+	 * events.</div><div class='add'>+	 */</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		if (HCI_CONN_HANDLE_UNSET(conn-&gt;handle))</div><div class='add'>+			hci_conn_failed(conn, reason);</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+		if ((conn-&gt;state != BT_CONNECTED &amp;&amp;</div><div class='add'>+		    !test_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags)) ||</div><div class='add'>+		    test_bit(HCI_CONN_BIG_CREATED, &amp;conn-&gt;flags))</div><div class='add'>+			hci_conn_failed(conn, reason);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_conn_unlink(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p", conn);</div><div class='add'>+</div><div class='add'>+	if (!conn-&gt;parent) {</div><div class='add'>+		struct hci_link *link, *t;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(link, t, &amp;conn-&gt;link_list, list) {</div><div class='add'>+			struct hci_conn *child = link-&gt;conn;</div><div class='add'>+</div><div class='add'>+			hci_conn_unlink(child);</div><div class='add'>+</div><div class='add'>+			/* If hdev is down it means</div><div class='add'>+			 * hci_dev_close_sync/hci_conn_hash_flush is in progress</div><div class='add'>+			 * and links don't need to be cleanup as all connections</div><div class='add'>+			 * would be cleanup.</div><div class='add'>+			 */</div><div class='add'>+			if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			hci_conn_cleanup_child(child, conn-&gt;abort_reason);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!conn-&gt;link)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del_rcu(&amp;conn-&gt;link-&gt;list);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	hci_conn_drop(conn-&gt;parent);</div><div class='add'>+	hci_conn_put(conn-&gt;parent);</div><div class='add'>+	conn-&gt;parent = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(conn-&gt;link);</div><div class='add'>+	conn-&gt;link = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_conn_del(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s hcon %p handle %d", hdev-&gt;name, conn, conn-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;conn-&gt;disc_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;conn-&gt;auto_accept_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;conn-&gt;idle_work);</div><div class='add'>+	hci_conn_unlink(conn);</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;type == ACL_LINK) {</div><div class='del'>-		struct hci_conn *sco = conn-&gt;link;</div><div class='del'>-		if (sco)</div><div class='del'>-			sco-&gt;link = NULL;</div><div class='add'>+	disable_delayed_work_sync(&amp;conn-&gt;disc_work);</div><div class='add'>+	disable_delayed_work_sync(&amp;conn-&gt;auto_accept_work);</div><div class='add'>+	disable_delayed_work_sync(&amp;conn-&gt;idle_work);</div><div class='ctx'> </div><div class='del'>-		/* Unacked frames */</div><div class='del'>-		hdev-&gt;acl_cnt += conn-&gt;sent;</div><div class='del'>-	} else if (conn-&gt;type == LE_LINK) {</div><div class='del'>-		cancel_delayed_work(&amp;conn-&gt;le_conn_timeout);</div><div class='add'>+	/* Remove the connection from the list so unacked logic can detect when</div><div class='add'>+	 * a certain pool is not being utilized.</div><div class='add'>+	 */</div><div class='add'>+	hci_conn_hash_del(hdev, conn);</div><div class='ctx'> </div><div class='del'>-		if (hdev-&gt;le_pkts)</div><div class='del'>-			hdev-&gt;le_cnt += conn-&gt;sent;</div><div class='add'>+	/* Handle unacked frames:</div><div class='add'>+	 *</div><div class='add'>+	 * - In case there are no connection, or if restoring the buffers</div><div class='add'>+	 *   considered in transist would overflow, restore all buffers to the</div><div class='add'>+	 *   pool.</div><div class='add'>+	 * - Otherwise restore just the buffers considered in transit for the</div><div class='add'>+	 *   hci_conn</div><div class='add'>+	 */</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		if (!hci_conn_num(hdev, ACL_LINK) ||</div><div class='add'>+		    hdev-&gt;acl_cnt + conn-&gt;sent &gt; hdev-&gt;acl_pkts)</div><div class='add'>+			hdev-&gt;acl_cnt = hdev-&gt;acl_pkts;</div><div class='ctx'> 		else</div><div class='ctx'> 			hdev-&gt;acl_cnt += conn-&gt;sent;</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_conn *acl = conn-&gt;link;</div><div class='del'>-		if (acl) {</div><div class='del'>-			acl-&gt;link = NULL;</div><div class='del'>-			hci_conn_drop(acl);</div><div class='add'>+		break;</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		cancel_delayed_work(&amp;conn-&gt;le_conn_timeout);</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;le_pkts) {</div><div class='add'>+			if (!hci_conn_num(hdev, LE_LINK) ||</div><div class='add'>+			    hdev-&gt;le_cnt + conn-&gt;sent &gt; hdev-&gt;le_pkts)</div><div class='add'>+				hdev-&gt;le_cnt = hdev-&gt;le_pkts;</div><div class='add'>+			else</div><div class='add'>+				hdev-&gt;le_cnt += conn-&gt;sent;</div><div class='add'>+		} else {</div><div class='add'>+			if ((!hci_conn_num(hdev, LE_LINK) &amp;&amp;</div><div class='add'>+			     !hci_conn_num(hdev, ACL_LINK)) ||</div><div class='add'>+			    hdev-&gt;acl_cnt + conn-&gt;sent &gt; hdev-&gt;acl_pkts)</div><div class='add'>+				hdev-&gt;acl_cnt = hdev-&gt;acl_pkts;</div><div class='add'>+			else</div><div class='add'>+				hdev-&gt;acl_cnt += conn-&gt;sent;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+		if (!hci_iso_count(hdev) ||</div><div class='add'>+		    hdev-&gt;iso_cnt + conn-&gt;sent &gt; hdev-&gt;iso_pkts)</div><div class='add'>+			hdev-&gt;iso_cnt = hdev-&gt;iso_pkts;</div><div class='add'>+		else</div><div class='add'>+			hdev-&gt;iso_cnt += conn-&gt;sent;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;amp_mgr)</div><div class='del'>-		amp_mgr_put(conn-&gt;amp_mgr);</div><div class='del'>-</div><div class='ctx'> 	skb_queue_purge(&amp;conn-&gt;data_q);</div><div class='add'>+	skb_queue_purge(&amp;conn-&gt;tx_q.queue);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove the connection from the list and cleanup its remaining</div><div class='ctx'> 	 * state. This is a separate function since for some cases like</div><div class='hunk'>@@ -610,7 +1233,8 @@ int hci_conn_del(struct hci_conn *conn)</div><div class='ctx'> 	 */</div><div class='ctx'> 	hci_conn_cleanup(conn);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Dequeue callbacks using connection pointer as data */</div><div class='add'>+	hci_cmd_sync_dequeue(hdev, NULL, conn, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)</div><div class='hunk'>@@ -624,8 +1248,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(d, &amp;hci_dev_list, list) {</div><div class='ctx'> 		if (!test_bit(HCI_UP, &amp;d-&gt;flags) ||</div><div class='del'>-		    hci_dev_test_flag(d, HCI_USER_CHANNEL) ||</div><div class='del'>-		    d-&gt;dev_type != HCI_PRIMARY)</div><div class='add'>+		    hci_dev_test_flag(d, HCI_USER_CHANNEL))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Simple routing:</div><div class='hunk'>@@ -675,286 +1298,81 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)</div><div class='ctx'> EXPORT_SYMBOL(hci_get_route);</div><div class='ctx'> </div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-void hci_le_conn_failed(struct hci_conn *conn, u8 status)</div><div class='add'>+static void hci_le_conn_failed(struct hci_conn *conn, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	struct hci_conn_params *params;</div><div class='del'>-</div><div class='del'>-	params = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns, &amp;conn-&gt;dst,</div><div class='del'>-					   conn-&gt;dst_type);</div><div class='del'>-	if (params &amp;&amp; params-&gt;conn) {</div><div class='del'>-		hci_conn_drop(params-&gt;conn);</div><div class='del'>-		hci_conn_put(params-&gt;conn);</div><div class='del'>-		params-&gt;conn = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conn-&gt;state = BT_CLOSED;</div><div class='del'>-</div><div class='del'>-	/* If the status indicates successful cancellation of</div><div class='del'>-	 * the attempt (i.e. Unkown Connection Id) there's no point of</div><div class='del'>-	 * notifying failure since we'll go back to keep trying to</div><div class='del'>-	 * connect. The only exception is explicit connect requests</div><div class='del'>-	 * where a timeout + cancel does indicate an actual failure.</div><div class='del'>-	 */</div><div class='del'>-	if (status != HCI_ERROR_UNKNOWN_CONN_ID ||</div><div class='del'>-	    (params &amp;&amp; params-&gt;explicit_connect))</div><div class='del'>-		mgmt_connect_failed(hdev, &amp;conn-&gt;dst, conn-&gt;type,</div><div class='del'>-				    conn-&gt;dst_type, status);</div><div class='ctx'> </div><div class='del'>-	hci_connect_cfm(conn, status);</div><div class='add'>+	hci_connect_le_scan_cleanup(conn, status);</div><div class='ctx'> </div><div class='del'>-	hci_conn_del(conn);</div><div class='del'>-</div><div class='del'>-	/* Since we may have temporarily stopped the background scanning in</div><div class='del'>-	 * favor of connection establishment, we should restart it.</div><div class='del'>-	 */</div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='del'>-</div><div class='del'>-	/* Re-enable advertising in case this was a failed connection</div><div class='add'>+	/* Enable advertising in case this was a failed connection</div><div class='ctx'> 	 * attempt as a peripheral.</div><div class='ctx'> 	 */</div><div class='del'>-	hci_req_reenable_advertising(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	conn = hci_lookup_le_connect(hdev);</div><div class='del'>-</div><div class='del'>-	if (!status) {</div><div class='del'>-		hci_connect_le_scan_cleanup(conn);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bt_dev_err(hdev, "request failed to create LE connection: "</div><div class='del'>-		   "status 0x%2.2x", status);</div><div class='del'>-</div><div class='del'>-	if (!conn)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	hci_le_conn_failed(conn, status);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	hci_enable_advertising(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool conn_use_rpa(struct hci_conn *conn)</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+void hci_conn_failed(struct hci_conn *conn, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	return hci_dev_test_flag(hdev, HCI_PRIVACY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_ext_conn_params(struct hci_conn *conn,</div><div class='del'>-				struct hci_cp_le_ext_conn_param *p)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='del'>-	memset(p, 0, sizeof(*p));</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		hci_le_conn_failed(conn, status);</div><div class='add'>+		break;</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		mgmt_connect_failed(hdev, conn, status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Set window to be the same value as the interval to</div><div class='del'>-	 * enable continuous scanning.</div><div class='add'>+	/* In case of BIG/PA sync failed, clear conn flags so that</div><div class='add'>+	 * the conns will be correctly cleaned up by ISO layer</div><div class='ctx'> 	 */</div><div class='del'>-	p-&gt;scan_interval = cpu_to_le16(hdev-&gt;le_scan_interval);</div><div class='del'>-	p-&gt;scan_window = p-&gt;scan_interval;</div><div class='del'>-	p-&gt;conn_interval_min = cpu_to_le16(conn-&gt;le_conn_min_interval);</div><div class='del'>-	p-&gt;conn_interval_max = cpu_to_le16(conn-&gt;le_conn_max_interval);</div><div class='del'>-	p-&gt;conn_latency = cpu_to_le16(conn-&gt;le_conn_latency);</div><div class='del'>-	p-&gt;supervision_timeout = cpu_to_le16(conn-&gt;le_supv_timeout);</div><div class='del'>-	p-&gt;min_ce_len = cpu_to_le16(0x0000);</div><div class='del'>-	p-&gt;max_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+	test_and_clear_bit(HCI_CONN_BIG_SYNC_FAILED, &amp;conn-&gt;flags);</div><div class='add'>+	test_and_clear_bit(HCI_CONN_PA_SYNC_FAILED, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	conn-&gt;state = BT_CLOSED;</div><div class='add'>+	hci_connect_cfm(conn, status);</div><div class='add'>+	hci_conn_del(conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_req_add_le_create_conn(struct hci_request *req,</div><div class='del'>-				       struct hci_conn *conn,</div><div class='del'>-				       bdaddr_t *direct_rpa)</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+u8 hci_conn_set_handle(struct hci_conn *conn, u16 handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='del'>-	u8 own_addr_type;</div><div class='del'>-</div><div class='del'>-	/* If direct address was provided we use it instead of current</div><div class='del'>-	 * address.</div><div class='del'>-	 */</div><div class='del'>-	if (direct_rpa) {</div><div class='del'>-		if (bacmp(&amp;req-&gt;hdev-&gt;random_addr, direct_rpa))</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6,</div><div class='del'>-								direct_rpa);</div><div class='del'>-</div><div class='del'>-		/* direct address is always RPA */</div><div class='del'>-		own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-	} else {</div><div class='del'>-		/* Update random address, but set require_privacy to false so</div><div class='del'>-		 * that we never connect with an non-resolvable address.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_update_random_address(req, false, conn_use_rpa(conn),</div><div class='del'>-					      &amp;own_addr_type))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (use_ext_conn(hdev)) {</div><div class='del'>-		struct hci_cp_le_ext_create_conn *cp;</div><div class='del'>-		struct hci_cp_le_ext_conn_param *p;</div><div class='del'>-		u8 data[sizeof(*cp) + sizeof(*p) * 3];</div><div class='del'>-		u32 plen;</div><div class='ctx'> </div><div class='del'>-		cp = (void *) data;</div><div class='del'>-		p = (void *) cp-&gt;data;</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p handle 0x%4.4x", conn, handle);</div><div class='ctx'> </div><div class='del'>-		memset(cp, 0, sizeof(*cp));</div><div class='del'>-</div><div class='del'>-		bacpy(&amp;cp-&gt;peer_addr, &amp;conn-&gt;dst);</div><div class='del'>-		cp-&gt;peer_addr_type = conn-&gt;dst_type;</div><div class='del'>-		cp-&gt;own_addr_type = own_addr_type;</div><div class='del'>-</div><div class='del'>-		plen = sizeof(*cp);</div><div class='del'>-</div><div class='del'>-		if (scan_1m(hdev)) {</div><div class='del'>-			cp-&gt;phys |= LE_SCAN_PHY_1M;</div><div class='del'>-			set_ext_conn_params(conn, p);</div><div class='del'>-</div><div class='del'>-			p++;</div><div class='del'>-			plen += sizeof(*p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (scan_2m(hdev)) {</div><div class='del'>-			cp-&gt;phys |= LE_SCAN_PHY_2M;</div><div class='del'>-			set_ext_conn_params(conn, p);</div><div class='del'>-</div><div class='del'>-			p++;</div><div class='del'>-			plen += sizeof(*p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (scan_coded(hdev)) {</div><div class='del'>-			cp-&gt;phys |= LE_SCAN_PHY_CODED;</div><div class='del'>-			set_ext_conn_params(conn, p);</div><div class='del'>-</div><div class='del'>-			plen += sizeof(*p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_EXT_CREATE_CONN, plen, data);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_create_conn cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		/* Set window to be the same value as the interval to enable</div><div class='del'>-		 * continuous scanning.</div><div class='del'>-		 */</div><div class='del'>-		cp.scan_interval = cpu_to_le16(hdev-&gt;le_scan_interval);</div><div class='del'>-		cp.scan_window = cp.scan_interval;</div><div class='del'>-</div><div class='del'>-		bacpy(&amp;cp.peer_addr, &amp;conn-&gt;dst);</div><div class='del'>-		cp.peer_addr_type = conn-&gt;dst_type;</div><div class='del'>-		cp.own_address_type = own_addr_type;</div><div class='del'>-		cp.conn_interval_min = cpu_to_le16(conn-&gt;le_conn_min_interval);</div><div class='del'>-		cp.conn_interval_max = cpu_to_le16(conn-&gt;le_conn_max_interval);</div><div class='del'>-		cp.conn_latency = cpu_to_le16(conn-&gt;le_conn_latency);</div><div class='del'>-		cp.supervision_timeout = cpu_to_le16(conn-&gt;le_supv_timeout);</div><div class='del'>-		cp.min_ce_len = cpu_to_le16(0x0000);</div><div class='del'>-		cp.max_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+	if (conn-&gt;handle == handle)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &amp;cp);</div><div class='add'>+	if (handle &gt; HCI_CONN_HANDLE_MAX) {</div><div class='add'>+		bt_dev_err(hdev, "Invalid handle: 0x%4.4x &gt; 0x%4.4x",</div><div class='add'>+			   handle, HCI_CONN_HANDLE_MAX);</div><div class='add'>+		return HCI_ERROR_INVALID_PARAMETERS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	conn-&gt;state = BT_CONNECT;</div><div class='del'>-	clear_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_req_directed_advertising(struct hci_request *req,</div><div class='del'>-					 struct hci_conn *conn)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 own_addr_type;</div><div class='del'>-	u8 enable;</div><div class='del'>-</div><div class='del'>-	if (ext_adv_capable(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_adv_params cp;</div><div class='del'>-		bdaddr_t random_addr;</div><div class='del'>-</div><div class='del'>-		/* Set require_privacy to false so that the remote device has a</div><div class='del'>-		 * chance of identifying us.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_get_random_address(hdev, false, conn_use_rpa(conn), NULL,</div><div class='del'>-					   &amp;own_addr_type, &amp;random_addr) &lt; 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_DIRECT_IND);</div><div class='del'>-		cp.own_addr_type = own_addr_type;</div><div class='del'>-		cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='del'>-		cp.tx_power = HCI_TX_POWER_INVALID;</div><div class='del'>-		cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='del'>-		cp.secondary_phy = HCI_ADV_PHY_1M;</div><div class='del'>-		cp.handle = 0; /* Use instance 0 for directed adv */</div><div class='del'>-		cp.own_addr_type = own_addr_type;</div><div class='del'>-		cp.peer_addr_type = conn-&gt;dst_type;</div><div class='del'>-		bacpy(&amp;cp.peer_addr, &amp;conn-&gt;dst);</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_PARAMS, sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-		if (own_addr_type == ADDR_LE_DEV_RANDOM &amp;&amp;</div><div class='del'>-		    bacmp(&amp;random_addr, BDADDR_ANY) &amp;&amp;</div><div class='del'>-		    bacmp(&amp;random_addr, &amp;hdev-&gt;random_addr)) {</div><div class='del'>-			struct hci_cp_le_set_adv_set_rand_addr cp;</div><div class='del'>-</div><div class='del'>-			memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-			cp.handle = 0;</div><div class='del'>-			bacpy(&amp;cp.bdaddr, &amp;random_addr);</div><div class='del'>-</div><div class='del'>-			hci_req_add(req,</div><div class='del'>-				    HCI_OP_LE_SET_ADV_SET_RAND_ADDR,</div><div class='del'>-				    sizeof(cp), &amp;cp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__hci_req_enable_ext_advertising(req);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_adv_param cp;</div><div class='del'>-</div><div class='del'>-		/* Clear the HCI_LE_ADV bit temporarily so that the</div><div class='del'>-		 * hci_update_random_address knows that it's safe to go ahead</div><div class='del'>-		 * and write a new random address. The flag will be set back on</div><div class='del'>-		 * as soon as the SET_ADV_ENABLE HCI command completes.</div><div class='del'>-		 */</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='del'>-</div><div class='del'>-		/* Set require_privacy to false so that the remote device has a</div><div class='del'>-		 * chance of identifying us.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_update_random_address(req, false, conn_use_rpa(conn),</div><div class='del'>-					      &amp;own_addr_type) &lt; 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-		cp.type = LE_ADV_DIRECT_IND;</div><div class='del'>-		cp.own_address_type = own_addr_type;</div><div class='del'>-		cp.direct_addr_type = conn-&gt;dst_type;</div><div class='del'>-		bacpy(&amp;cp.direct_addr, &amp;conn-&gt;dst);</div><div class='del'>-		cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='add'>+	/* If abort_reason has been sent it means the connection is being</div><div class='add'>+	 * aborted and the handle shall not be changed.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;abort_reason)</div><div class='add'>+		return conn-&gt;abort_reason;</div><div class='ctx'> </div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &amp;cp);</div><div class='add'>+	if (HCI_CONN_HANDLE_UNSET(conn-&gt;handle))</div><div class='add'>+		ida_free(&amp;hdev-&gt;unset_handle_ida, conn-&gt;handle);</div><div class='ctx'> </div><div class='del'>-		enable = 0x01;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),</div><div class='del'>-			    &amp;enable);</div><div class='del'>-	}</div><div class='add'>+	conn-&gt;handle = handle;</div><div class='ctx'> </div><div class='del'>-	conn-&gt;state = BT_CONNECT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='del'>-				u8 dst_type, u8 sec_level, u16 conn_timeout,</div><div class='del'>-				u8 role, bdaddr_t *direct_rpa)</div><div class='add'>+				u8 dst_type, bool dst_resolved, u8 sec_level,</div><div class='add'>+				u16 conn_timeout, u8 role, u8 phy, u8 sec_phy)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn_params *params;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct smp_irk *irk;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Let's make sure that le is enabled.*/</div><div class='hunk'>@@ -981,93 +1399,42 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='ctx'> 		return ERR_PTR(-EBUSY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* When given an identity address with existing identity</div><div class='del'>-	 * resolving key, the connection needs to be established</div><div class='del'>-	 * to a resolvable random address.</div><div class='del'>-	 *</div><div class='del'>-	 * Storing the resolvable random address is required here</div><div class='del'>-	 * to handle connection failures. The address will later</div><div class='del'>-	 * be resolved back into the original identity address</div><div class='del'>-	 * from the connect request.</div><div class='add'>+	/* Check if the destination address has been resolved by the controller</div><div class='add'>+	 * since if it did then the identity address shall be used.</div><div class='ctx'> 	 */</div><div class='del'>-	irk = hci_find_irk_by_addr(hdev, dst, dst_type);</div><div class='del'>-	if (irk &amp;&amp; bacmp(&amp;irk-&gt;rpa, BDADDR_ANY)) {</div><div class='del'>-		dst = &amp;irk-&gt;rpa;</div><div class='del'>-		dst_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+	if (!dst_resolved) {</div><div class='add'>+		/* When given an identity address with existing identity</div><div class='add'>+		 * resolving key, the connection needs to be established</div><div class='add'>+		 * to a resolvable random address.</div><div class='add'>+		 *</div><div class='add'>+		 * Storing the resolvable random address is required here</div><div class='add'>+		 * to handle connection failures. The address will later</div><div class='add'>+		 * be resolved back into the original identity address</div><div class='add'>+		 * from the connect request.</div><div class='add'>+		 */</div><div class='add'>+		irk = hci_find_irk_by_addr(hdev, dst, dst_type);</div><div class='add'>+		if (irk &amp;&amp; bacmp(&amp;irk-&gt;rpa, BDADDR_ANY)) {</div><div class='add'>+			dst = &amp;irk-&gt;rpa;</div><div class='add'>+			dst_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conn) {</div><div class='ctx'> 		bacpy(&amp;conn-&gt;dst, dst);</div><div class='ctx'> 	} else {</div><div class='del'>-		conn = hci_conn_add(hdev, LE_LINK, dst, role);</div><div class='del'>-		if (!conn)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='add'>+		conn = hci_conn_add_unset(hdev, LE_LINK, dst, dst_type, role);</div><div class='add'>+		if (IS_ERR(conn))</div><div class='add'>+			return conn;</div><div class='ctx'> 		hci_conn_hold(conn);</div><div class='ctx'> 		conn-&gt;pending_sec_level = sec_level;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	conn-&gt;dst_type = dst_type;</div><div class='ctx'> 	conn-&gt;sec_level = BT_SECURITY_LOW;</div><div class='ctx'> 	conn-&gt;conn_timeout = conn_timeout;</div><div class='add'>+	conn-&gt;le_adv_phy = phy;</div><div class='add'>+	conn-&gt;le_adv_sec_phy = sec_phy;</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	/* Disable advertising if we're active. For master role</div><div class='del'>-	 * connections most controllers will refuse to connect if</div><div class='del'>-	 * advertising is enabled, and for slave role connections we</div><div class='del'>-	 * anyway have to disable it in order to start directed</div><div class='del'>-	 * advertising.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV)) {</div><div class='del'>-		u8 enable = 0x00;</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),</div><div class='del'>-			    &amp;enable);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If requested to connect as slave use directed advertising */</div><div class='del'>-	if (conn-&gt;role == HCI_ROLE_SLAVE) {</div><div class='del'>-		/* If we're active scanning most controllers are unable</div><div class='del'>-		 * to initiate advertising. Simply reject the attempt.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LE_SCAN) &amp;&amp;</div><div class='del'>-		    hdev-&gt;le_scan_type == LE_SCAN_ACTIVE) {</div><div class='del'>-			hci_req_purge(&amp;req);</div><div class='del'>-			hci_conn_del(conn);</div><div class='del'>-			return ERR_PTR(-EBUSY);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hci_req_directed_advertising(&amp;req, conn);</div><div class='del'>-		goto create_conn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	params = hci_conn_params_lookup(hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='del'>-	if (params) {</div><div class='del'>-		conn-&gt;le_conn_min_interval = params-&gt;conn_min_interval;</div><div class='del'>-		conn-&gt;le_conn_max_interval = params-&gt;conn_max_interval;</div><div class='del'>-		conn-&gt;le_conn_latency = params-&gt;conn_latency;</div><div class='del'>-		conn-&gt;le_supv_timeout = params-&gt;supervision_timeout;</div><div class='del'>-	} else {</div><div class='del'>-		conn-&gt;le_conn_min_interval = hdev-&gt;le_conn_min_interval;</div><div class='del'>-		conn-&gt;le_conn_max_interval = hdev-&gt;le_conn_max_interval;</div><div class='del'>-		conn-&gt;le_conn_latency = hdev-&gt;le_conn_latency;</div><div class='del'>-		conn-&gt;le_supv_timeout = hdev-&gt;le_supv_timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If controller is scanning, we stop it since some controllers are</div><div class='del'>-	 * not able to scan and connect at the same time. Also set the</div><div class='del'>-	 * HCI_LE_SCAN_INTERRUPTED flag so that the command complete</div><div class='del'>-	 * handler for scan disabling knows to set the correct discovery</div><div class='del'>-	 * state.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='del'>-		hci_req_add_le_scan_disable(&amp;req);</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_add_le_create_conn(&amp;req, conn, direct_rpa);</div><div class='del'>-</div><div class='del'>-create_conn:</div><div class='del'>-	err = hci_req_run(&amp;req, create_le_conn_complete);</div><div class='add'>+	err = hci_connect_le_sync(hdev, conn);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		hci_conn_del(conn);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='hunk'>@@ -1116,8 +1483,8 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev,</div><div class='ctx'> 	if (params-&gt;auto_connect == HCI_AUTO_CONN_DISABLED ||</div><div class='ctx'> 	    params-&gt;auto_connect == HCI_AUTO_CONN_REPORT ||</div><div class='ctx'> 	    params-&gt;auto_connect == HCI_AUTO_CONN_EXPLICIT) {</div><div class='del'>-		list_del_init(&amp;params-&gt;action);</div><div class='del'>-		list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+		hci_pend_le_list_del_init(params);</div><div class='add'>+		hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;explicit_connect = true;</div><div class='hunk'>@@ -1128,10 +1495,126 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	u8  big;</div><div class='add'>+</div><div class='add'>+	/* Allocate a BIG if not set */</div><div class='add'>+	if (qos-&gt;bcast.big == BT_ISO_QOS_BIG_UNSET) {</div><div class='add'>+		for (big = 0x00; big &lt; 0xef; big++) {</div><div class='add'>+</div><div class='add'>+			conn = hci_conn_hash_lookup_big(hdev, big);</div><div class='add'>+			if (!conn)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (big == 0xef)</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+		/* Update BIG */</div><div class='add'>+		qos-&gt;bcast.big = big;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	u8  bis;</div><div class='add'>+</div><div class='add'>+	/* Allocate BIS if not set */</div><div class='add'>+	if (qos-&gt;bcast.bis == BT_ISO_QOS_BIS_UNSET) {</div><div class='add'>+		if (qos-&gt;bcast.big != BT_ISO_QOS_BIG_UNSET) {</div><div class='add'>+			conn = hci_conn_hash_lookup_big(hdev, qos-&gt;bcast.big);</div><div class='add'>+</div><div class='add'>+			if (conn) {</div><div class='add'>+				/* If the BIG handle is already matched to an advertising</div><div class='add'>+				 * handle, do not allocate a new one.</div><div class='add'>+				 */</div><div class='add'>+				qos-&gt;bcast.bis = conn-&gt;iso_qos.bcast.bis;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Find an unused adv set to advertise BIS, skip instance 0x00</div><div class='add'>+		 * since it is reserved as general purpose set.</div><div class='add'>+		 */</div><div class='add'>+		for (bis = 0x01; bis &lt; hdev-&gt;le_num_of_adv_sets;</div><div class='add'>+		     bis++) {</div><div class='add'>+</div><div class='add'>+			conn = hci_conn_hash_lookup_bis(hdev, BDADDR_ANY, bis);</div><div class='add'>+			if (!conn)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bis == hdev-&gt;le_num_of_adv_sets)</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+		/* Update BIS */</div><div class='add'>+		qos-&gt;bcast.bis = bis;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='add'>+				    __u8 sid, struct bt_iso_qos *qos,</div><div class='add'>+				    __u8 base_len, __u8 *base, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Let's make sure that le is enabled.*/</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='add'>+		if (lmp_le_capable(hdev))</div><div class='add'>+			return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = qos_set_big(hdev, qos);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	err = qos_set_bis(hdev, qos);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	/* Check if the LE Create BIG command has already been sent */</div><div class='add'>+	conn = hci_conn_hash_lookup_per_adv_bis(hdev, dst, qos-&gt;bcast.big,</div><div class='add'>+						qos-&gt;bcast.big);</div><div class='add'>+	if (conn)</div><div class='add'>+		return ERR_PTR(-EADDRINUSE);</div><div class='add'>+</div><div class='add'>+	/* Check BIS settings against other bound BISes, since all</div><div class='add'>+	 * BISes in a BIG must have the same value for all parameters</div><div class='add'>+	 */</div><div class='add'>+	conn = hci_conn_hash_lookup_big(hdev, qos-&gt;bcast.big);</div><div class='add'>+</div><div class='add'>+	if (conn &amp;&amp; (memcmp(qos, &amp;conn-&gt;iso_qos, sizeof(*qos)) ||</div><div class='add'>+		     base_len != conn-&gt;le_per_adv_data_len ||</div><div class='add'>+		     memcmp(conn-&gt;le_per_adv_data, base, base_len)))</div><div class='add'>+		return ERR_PTR(-EADDRINUSE);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_add_unset(hdev, BIS_LINK, dst, 0, HCI_ROLE_MASTER);</div><div class='add'>+	if (IS_ERR(conn))</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	conn-&gt;state = BT_CONNECT;</div><div class='add'>+	conn-&gt;sid = sid;</div><div class='add'>+	conn-&gt;conn_timeout = timeout;</div><div class='add'>+</div><div class='add'>+	hci_conn_hold(conn);</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='ctx'> struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='ctx'> 				     u8 dst_type, u8 sec_level,</div><div class='del'>-				     u16 conn_timeout)</div><div class='add'>+				     u16 conn_timeout,</div><div class='add'>+				     enum conn_reasons conn_reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='hunk'>@@ -1161,21 +1644,24 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("requesting refresh of dst_addr");</div><div class='ctx'> </div><div class='del'>-	conn = hci_conn_add(hdev, LE_LINK, dst, HCI_ROLE_MASTER);</div><div class='del'>-	if (!conn)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	conn = hci_conn_add_unset(hdev, LE_LINK, dst, dst_type,</div><div class='add'>+				  HCI_ROLE_MASTER);</div><div class='add'>+	if (IS_ERR(conn))</div><div class='add'>+		return conn;</div><div class='ctx'> </div><div class='del'>-	if (hci_explicit_conn_params_set(hdev, dst, dst_type) &lt; 0)</div><div class='add'>+	if (hci_explicit_conn_params_set(hdev, dst, dst_type) &lt; 0) {</div><div class='add'>+		hci_conn_del(conn);</div><div class='ctx'> 		return ERR_PTR(-EBUSY);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;state = BT_CONNECT;</div><div class='ctx'> 	set_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags);</div><div class='del'>-	conn-&gt;dst_type = dst_type;</div><div class='ctx'> 	conn-&gt;sec_level = BT_SECURITY_LOW;</div><div class='ctx'> 	conn-&gt;pending_sec_level = sec_level;</div><div class='ctx'> 	conn-&gt;conn_timeout = conn_timeout;</div><div class='add'>+	conn-&gt;conn_reason = conn_reason;</div><div class='ctx'> </div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='add'>+	hci_update_passive_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	hci_conn_hold(conn);</div><div class='hunk'>@@ -1183,7 +1669,8 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='del'>-				 u8 sec_level, u8 auth_type)</div><div class='add'>+				 u8 sec_level, u8 auth_type,</div><div class='add'>+				 enum conn_reasons conn_reason, u16 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *acl;</div><div class='ctx'> </div><div class='hunk'>@@ -1194,50 +1681,103 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='ctx'> 		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Reject outgoing connection to device with same BD ADDR against</div><div class='add'>+	 * CVE-2020-26555</div><div class='add'>+	 */</div><div class='add'>+	if (!bacmp(&amp;hdev-&gt;bdaddr, dst)) {</div><div class='add'>+		bt_dev_dbg(hdev, "Reject connection with same BD_ADDR %pMR\n",</div><div class='add'>+			   dst);</div><div class='add'>+		return ERR_PTR(-ECONNREFUSED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);</div><div class='ctx'> 	if (!acl) {</div><div class='del'>-		acl = hci_conn_add(hdev, ACL_LINK, dst, HCI_ROLE_MASTER);</div><div class='del'>-		if (!acl)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='add'>+		acl = hci_conn_add_unset(hdev, ACL_LINK, dst, 0,</div><div class='add'>+					 HCI_ROLE_MASTER);</div><div class='add'>+		if (IS_ERR(acl))</div><div class='add'>+			return acl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_conn_hold(acl);</div><div class='ctx'> </div><div class='add'>+	acl-&gt;conn_reason = conn_reason;</div><div class='ctx'> 	if (acl-&gt;state == BT_OPEN || acl-&gt;state == BT_CLOSED) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='ctx'> 		acl-&gt;sec_level = BT_SECURITY_LOW;</div><div class='ctx'> 		acl-&gt;pending_sec_level = sec_level;</div><div class='ctx'> 		acl-&gt;auth_type = auth_type;</div><div class='del'>-		hci_acl_create_connection(acl);</div><div class='add'>+		acl-&gt;conn_timeout = timeout;</div><div class='add'>+</div><div class='add'>+		err = hci_connect_acl_sync(hdev, acl);</div><div class='add'>+		if (err) {</div><div class='add'>+			hci_conn_del(acl);</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return acl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct hci_link *hci_conn_link(struct hci_conn *parent,</div><div class='add'>+				      struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = parent-&gt;hdev;</div><div class='add'>+	struct hci_link *link;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "parent %p hcon %p", parent, conn);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;link)</div><div class='add'>+		return conn-&gt;link;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;parent)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+	if (!link)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	link-&gt;conn = hci_conn_hold(conn);</div><div class='add'>+	conn-&gt;link = link;</div><div class='add'>+	conn-&gt;parent = hci_conn_get(parent);</div><div class='add'>+</div><div class='add'>+	/* Use list_add_tail_rcu append to the list */</div><div class='add'>+	list_add_tail_rcu(&amp;link-&gt;list, &amp;parent-&gt;link_list);</div><div class='add'>+</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='del'>-				 __u16 setting)</div><div class='add'>+				 __u16 setting, struct bt_codec *codec,</div><div class='add'>+				 u16 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *acl;</div><div class='ctx'> 	struct hci_conn *sco;</div><div class='add'>+	struct hci_link *link;</div><div class='ctx'> </div><div class='del'>-	acl = hci_connect_acl(hdev, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);</div><div class='add'>+	acl = hci_connect_acl(hdev, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING,</div><div class='add'>+			      CONN_REASON_SCO_CONNECT, timeout);</div><div class='ctx'> 	if (IS_ERR(acl))</div><div class='ctx'> 		return acl;</div><div class='ctx'> </div><div class='ctx'> 	sco = hci_conn_hash_lookup_ba(hdev, type, dst);</div><div class='ctx'> 	if (!sco) {</div><div class='del'>-		sco = hci_conn_add(hdev, type, dst, HCI_ROLE_MASTER);</div><div class='del'>-		if (!sco) {</div><div class='add'>+		sco = hci_conn_add_unset(hdev, type, dst, 0, HCI_ROLE_MASTER);</div><div class='add'>+		if (IS_ERR(sco)) {</div><div class='ctx'> 			hci_conn_drop(acl);</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='add'>+			return sco;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acl-&gt;link = sco;</div><div class='del'>-	sco-&gt;link = acl;</div><div class='del'>-</div><div class='del'>-	hci_conn_hold(sco);</div><div class='add'>+	link = hci_conn_link(acl, sco);</div><div class='add'>+	if (!link) {</div><div class='add'>+		hci_conn_drop(acl);</div><div class='add'>+		hci_conn_drop(sco);</div><div class='add'>+		return ERR_PTR(-ENOLINK);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sco-&gt;setting = setting;</div><div class='add'>+	sco-&gt;codec = *codec;</div><div class='ctx'> </div><div class='ctx'> 	if (acl-&gt;state == BT_CONNECTED &amp;&amp;</div><div class='ctx'> 	    (sco-&gt;state == BT_OPEN || sco-&gt;state == BT_CLOSED)) {</div><div class='hunk'>@@ -1256,6 +1796,591 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,</div><div class='ctx'> 	return sco;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct hci_cp_le_create_big cp;</div><div class='add'>+	struct iso_list_data data;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	data.big = qos-&gt;bcast.big;</div><div class='add'>+	data.bis = qos-&gt;bcast.bis;</div><div class='add'>+	data.count = 0;</div><div class='add'>+</div><div class='add'>+	/* Create a BIS for each bound connection */</div><div class='add'>+	hci_conn_hash_list_state(hdev, bis_list, BIS_LINK,</div><div class='add'>+				 BT_BOUND, &amp;data);</div><div class='add'>+</div><div class='add'>+	cp.handle = qos-&gt;bcast.big;</div><div class='add'>+	cp.adv_handle = qos-&gt;bcast.bis;</div><div class='add'>+	cp.num_bis  = data.count;</div><div class='add'>+	hci_cpu_to_le24(qos-&gt;bcast.out.interval, cp.bis.sdu_interval);</div><div class='add'>+	cp.bis.sdu = cpu_to_le16(qos-&gt;bcast.out.sdu);</div><div class='add'>+	cp.bis.latency =  cpu_to_le16(qos-&gt;bcast.out.latency);</div><div class='add'>+	cp.bis.rtn  = qos-&gt;bcast.out.rtn;</div><div class='add'>+	cp.bis.phy  = qos-&gt;bcast.out.phy;</div><div class='add'>+	cp.bis.packing = qos-&gt;bcast.packing;</div><div class='add'>+	cp.bis.framing = qos-&gt;bcast.framing;</div><div class='add'>+	cp.bis.encryption = qos-&gt;bcast.encryption;</div><div class='add'>+	memcpy(cp.bis.bcode, qos-&gt;bcast.bcode, sizeof(cp.bis.bcode));</div><div class='add'>+</div><div class='add'>+	return hci_send_cmd(hdev, HCI_OP_LE_CREATE_BIG, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cig_params_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_set_cig_params, pdu, cis, num_cis, 0x1f);</div><div class='add'>+	u8 cig_id = PTR_UINT(data);</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct bt_iso_qos *qos;</div><div class='add'>+	u8 aux_num_cis = 0;</div><div class='add'>+	u8 cis_id;</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_cig(hdev, cig_id);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+	pdu-&gt;cig_id = cig_id;</div><div class='add'>+	hci_cpu_to_le24(qos-&gt;ucast.out.interval, pdu-&gt;c_interval);</div><div class='add'>+	hci_cpu_to_le24(qos-&gt;ucast.in.interval, pdu-&gt;p_interval);</div><div class='add'>+	pdu-&gt;sca = qos-&gt;ucast.sca;</div><div class='add'>+	pdu-&gt;packing = qos-&gt;ucast.packing;</div><div class='add'>+	pdu-&gt;framing = qos-&gt;ucast.framing;</div><div class='add'>+	pdu-&gt;c_latency = cpu_to_le16(qos-&gt;ucast.out.latency);</div><div class='add'>+	pdu-&gt;p_latency = cpu_to_le16(qos-&gt;ucast.in.latency);</div><div class='add'>+</div><div class='add'>+	/* Reprogram all CIS(s) with the same CIG, valid range are:</div><div class='add'>+	 * num_cis: 0x00 to 0x1F</div><div class='add'>+	 * cis_id: 0x00 to 0xEF</div><div class='add'>+	 */</div><div class='add'>+	for (cis_id = 0x00; cis_id &lt; 0xf0 &amp;&amp;</div><div class='add'>+	     aux_num_cis &lt; pdu-&gt;num_cis; cis_id++) {</div><div class='add'>+		struct hci_cis_params *cis;</div><div class='add'>+</div><div class='add'>+		conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, cig_id, cis_id);</div><div class='add'>+		if (!conn)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+</div><div class='add'>+		cis = &amp;pdu-&gt;cis[aux_num_cis++];</div><div class='add'>+		cis-&gt;cis_id = cis_id;</div><div class='add'>+		cis-&gt;c_sdu  = cpu_to_le16(conn-&gt;iso_qos.ucast.out.sdu);</div><div class='add'>+		cis-&gt;p_sdu  = cpu_to_le16(conn-&gt;iso_qos.ucast.in.sdu);</div><div class='add'>+		cis-&gt;c_phy  = qos-&gt;ucast.out.phy ? qos-&gt;ucast.out.phy :</div><div class='add'>+			      qos-&gt;ucast.in.phy;</div><div class='add'>+		cis-&gt;p_phy  = qos-&gt;ucast.in.phy ? qos-&gt;ucast.in.phy :</div><div class='add'>+			      qos-&gt;ucast.out.phy;</div><div class='add'>+		cis-&gt;c_rtn  = qos-&gt;ucast.out.rtn;</div><div class='add'>+		cis-&gt;p_rtn  = qos-&gt;ucast.in.rtn;</div><div class='add'>+	}</div><div class='add'>+	pdu-&gt;num_cis = aux_num_cis;</div><div class='add'>+</div><div class='add'>+	if (!pdu-&gt;num_cis)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_CIG_PARAMS,</div><div class='add'>+				     struct_size(pdu, cis, pdu-&gt;num_cis),</div><div class='add'>+				     pdu, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct iso_list_data data;</div><div class='add'>+</div><div class='add'>+	memset(&amp;data, 0, sizeof(data));</div><div class='add'>+</div><div class='add'>+	/* Allocate first still reconfigurable CIG if not set */</div><div class='add'>+	if (qos-&gt;ucast.cig == BT_ISO_QOS_CIG_UNSET) {</div><div class='add'>+		for (data.cig = 0x00; data.cig &lt; 0xf0; data.cig++) {</div><div class='add'>+			data.count = 0;</div><div class='add'>+</div><div class='add'>+			hci_conn_hash_list_state(hdev, find_cis, CIS_LINK,</div><div class='add'>+						 BT_CONNECT, &amp;data);</div><div class='add'>+			if (data.count)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			hci_conn_hash_list_state(hdev, find_cis, CIS_LINK,</div><div class='add'>+						 BT_CONNECTED, &amp;data);</div><div class='add'>+			if (!data.count)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (data.cig == 0xf0)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* Update CIG */</div><div class='add'>+		qos-&gt;ucast.cig = data.cig;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.cis != BT_ISO_QOS_CIS_UNSET) {</div><div class='add'>+		if (hci_conn_hash_lookup_cis(hdev, NULL, 0, qos-&gt;ucast.cig,</div><div class='add'>+					     qos-&gt;ucast.cis))</div><div class='add'>+			return false;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate first available CIS if not set */</div><div class='add'>+	for (data.cig = qos-&gt;ucast.cig, data.cis = 0x00; data.cis &lt; 0xf0;</div><div class='add'>+	     data.cis++) {</div><div class='add'>+		if (!hci_conn_hash_lookup_cis(hdev, NULL, 0, data.cig,</div><div class='add'>+					      data.cis)) {</div><div class='add'>+			/* Update CIS */</div><div class='add'>+			qos-&gt;ucast.cis = data.cis;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.cis == BT_ISO_QOS_CIS_UNSET)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (hci_cmd_sync_queue(hdev, set_cig_params_sync,</div><div class='add'>+			       UINT_PTR(qos-&gt;ucast.cig), NULL) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='add'>+			      __u8 dst_type, struct bt_iso_qos *qos,</div><div class='add'>+			      u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *cis;</div><div class='add'>+</div><div class='add'>+	cis = hci_conn_hash_lookup_cis(hdev, dst, dst_type, qos-&gt;ucast.cig,</div><div class='add'>+				       qos-&gt;ucast.cis);</div><div class='add'>+	if (!cis) {</div><div class='add'>+		cis = hci_conn_add_unset(hdev, CIS_LINK, dst, dst_type,</div><div class='add'>+					 HCI_ROLE_MASTER);</div><div class='add'>+		if (IS_ERR(cis))</div><div class='add'>+			return cis;</div><div class='add'>+		cis-&gt;cleanup = cis_cleanup;</div><div class='add'>+		cis-&gt;dst_type = dst_type;</div><div class='add'>+		cis-&gt;iso_qos.ucast.cig = BT_ISO_QOS_CIG_UNSET;</div><div class='add'>+		cis-&gt;iso_qos.ucast.cis = BT_ISO_QOS_CIS_UNSET;</div><div class='add'>+		cis-&gt;conn_timeout = timeout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cis-&gt;state == BT_CONNECTED)</div><div class='add'>+		return cis;</div><div class='add'>+</div><div class='add'>+	/* Check if CIS has been set and the settings matches */</div><div class='add'>+	if (cis-&gt;state == BT_BOUND &amp;&amp;</div><div class='add'>+	    !memcmp(&amp;cis-&gt;iso_qos, qos, sizeof(*qos)))</div><div class='add'>+		return cis;</div><div class='add'>+</div><div class='add'>+	/* Update LINK PHYs according to QoS preference */</div><div class='add'>+	cis-&gt;le_tx_phy = qos-&gt;ucast.out.phy;</div><div class='add'>+	cis-&gt;le_rx_phy = qos-&gt;ucast.in.phy;</div><div class='add'>+</div><div class='add'>+	/* If output interval is not set use the input interval as it cannot be</div><div class='add'>+	 * 0x000000.</div><div class='add'>+	 */</div><div class='add'>+	if (!qos-&gt;ucast.out.interval)</div><div class='add'>+		qos-&gt;ucast.out.interval = qos-&gt;ucast.in.interval;</div><div class='add'>+</div><div class='add'>+	/* If input interval is not set use the output interval as it cannot be</div><div class='add'>+	 * 0x000000.</div><div class='add'>+	 */</div><div class='add'>+	if (!qos-&gt;ucast.in.interval)</div><div class='add'>+		qos-&gt;ucast.in.interval = qos-&gt;ucast.out.interval;</div><div class='add'>+</div><div class='add'>+	/* If output latency is not set use the input latency as it cannot be</div><div class='add'>+	 * 0x0000.</div><div class='add'>+	 */</div><div class='add'>+	if (!qos-&gt;ucast.out.latency)</div><div class='add'>+		qos-&gt;ucast.out.latency = qos-&gt;ucast.in.latency;</div><div class='add'>+</div><div class='add'>+	/* If input latency is not set use the output latency as it cannot be</div><div class='add'>+	 * 0x0000.</div><div class='add'>+	 */</div><div class='add'>+	if (!qos-&gt;ucast.in.latency)</div><div class='add'>+		qos-&gt;ucast.in.latency = qos-&gt;ucast.out.latency;</div><div class='add'>+</div><div class='add'>+	if (!hci_le_set_cig_params(cis, qos)) {</div><div class='add'>+		hci_conn_drop(cis);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_conn_hold(cis);</div><div class='add'>+</div><div class='add'>+	cis-&gt;iso_qos = *qos;</div><div class='add'>+	cis-&gt;state = BT_BOUND;</div><div class='add'>+</div><div class='add'>+	return cis;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hci_iso_setup_path(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct hci_cp_le_setup_iso_path cmd;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;iso_qos.ucast.out.sdu) {</div><div class='add'>+		cmd.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+		cmd.direction = 0x00; /* Input (Host to Controller) */</div><div class='add'>+		cmd.path = 0x00; /* HCI path if enabled */</div><div class='add'>+		cmd.codec = 0x03; /* Transparent Data */</div><div class='add'>+</div><div class='add'>+		if (hci_send_cmd(hdev, HCI_OP_LE_SETUP_ISO_PATH, sizeof(cmd),</div><div class='add'>+				 &amp;cmd) &lt; 0)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;iso_qos.ucast.in.sdu) {</div><div class='add'>+		cmd.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+		cmd.direction = 0x01; /* Output (Controller to Host) */</div><div class='add'>+		cmd.path = 0x00; /* HCI path if enabled */</div><div class='add'>+		cmd.codec = 0x03; /* Transparent Data */</div><div class='add'>+</div><div class='add'>+		if (hci_send_cmd(hdev, HCI_OP_LE_SETUP_ISO_PATH, sizeof(cmd),</div><div class='add'>+				 &amp;cmd) &lt; 0)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_conn_check_create_cis(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;type != CIS_LINK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!conn-&gt;parent || conn-&gt;parent-&gt;state != BT_CONNECTED ||</div><div class='add'>+	    conn-&gt;state != BT_CONNECT || HCI_CONN_HANDLE_UNSET(conn-&gt;handle))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_create_cis_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_le_create_cis_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_create_cis_pending(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	bool pending = false;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(conn, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+		if (test_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!hci_conn_check_create_cis(conn))</div><div class='add'>+			pending = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (!pending)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Queue Create CIS */</div><div class='add'>+	return hci_cmd_sync_queue(hdev, hci_create_cis_sync, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+			      struct bt_iso_io_qos *qos, __u8 phy)</div><div class='add'>+{</div><div class='add'>+	/* Only set MTU if PHY is enabled */</div><div class='add'>+	if (!qos-&gt;sdu &amp;&amp; qos-&gt;phy)</div><div class='add'>+		qos-&gt;sdu = conn-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	/* Use the same PHY as ACL if set to any */</div><div class='add'>+	if (qos-&gt;phy == BT_ISO_PHY_ANY)</div><div class='add'>+		qos-&gt;phy = phy;</div><div class='add'>+</div><div class='add'>+	/* Use LE ACL connection interval if not set */</div><div class='add'>+	if (!qos-&gt;interval)</div><div class='add'>+		/* ACL interval unit in 1.25 ms to us */</div><div class='add'>+		qos-&gt;interval = conn-&gt;le_conn_interval * 1250;</div><div class='add'>+</div><div class='add'>+	/* Use LE ACL connection latency if not set */</div><div class='add'>+	if (!qos-&gt;latency)</div><div class='add'>+		qos-&gt;latency = conn-&gt;le_conn_latency;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_big_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct bt_iso_qos *qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+	u16 interval, sync_interval = 0;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.out.phy == 0x02)</div><div class='add'>+		flags |= MGMT_ADV_FLAG_SEC_2M;</div><div class='add'>+</div><div class='add'>+	/* Align intervals */</div><div class='add'>+	interval = (qos-&gt;bcast.out.interval / 1250) * qos-&gt;bcast.sync_factor;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.bis)</div><div class='add'>+		sync_interval = interval * 4;</div><div class='add'>+</div><div class='add'>+	err = hci_start_per_adv_sync(hdev, qos-&gt;bcast.bis, conn-&gt;sid,</div><div class='add'>+				     conn-&gt;le_per_adv_data_len,</div><div class='add'>+				     conn-&gt;le_per_adv_data, flags, interval,</div><div class='add'>+				     interval, sync_interval);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_le_create_big(conn, &amp;conn-&gt;iso_qos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='add'>+				    __u8 dst_type, __u8 sid,</div><div class='add'>+				    struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "dst %pMR type %d sid %d", dst, dst_type, sid);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_add_unset(hdev, PA_LINK, dst, dst_type, HCI_ROLE_SLAVE);</div><div class='add'>+	if (IS_ERR(conn))</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	conn-&gt;iso_qos = *qos;</div><div class='add'>+	conn-&gt;sid = sid;</div><div class='add'>+	conn-&gt;state = BT_LISTEN;</div><div class='add'>+	conn-&gt;conn_timeout = msecs_to_jiffies(qos-&gt;bcast.sync_timeout * 10);</div><div class='add'>+</div><div class='add'>+	hci_conn_hold(conn);</div><div class='add'>+</div><div class='add'>+	hci_connect_pa_sync(hdev, conn);</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_conn_big_create_sync(struct hci_dev *hdev, struct hci_conn *hcon,</div><div class='add'>+			     struct bt_iso_qos *qos, __u16 sync_handle,</div><div class='add'>+			     __u8 num_bis, __u8 bis[])</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (num_bis &lt; 0x01 || num_bis &gt; ISO_MAX_NUM_BIS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = qos_set_big(hdev, qos);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (hcon) {</div><div class='add'>+		/* Update hcon QoS */</div><div class='add'>+		hcon-&gt;iso_qos = *qos;</div><div class='add'>+</div><div class='add'>+		hcon-&gt;num_bis = num_bis;</div><div class='add'>+		memcpy(hcon-&gt;bis, bis, num_bis);</div><div class='add'>+		hcon-&gt;conn_timeout = msecs_to_jiffies(qos-&gt;bcast.timeout * 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_connect_big_sync(hdev, hcon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_big_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to create BIG: %d", err);</div><div class='add'>+		hci_connect_cfm(conn, err);</div><div class='add'>+		hci_conn_del(conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst, __u8 sid,</div><div class='add'>+			      struct bt_iso_qos *qos,</div><div class='add'>+			      __u8 base_len, __u8 *base, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct hci_conn *parent;</div><div class='add'>+	__u8 eir[HCI_MAX_PER_AD_LENGTH];</div><div class='add'>+	struct hci_link *link;</div><div class='add'>+</div><div class='add'>+	/* Look for any BIS that is open for rebinding */</div><div class='add'>+	conn = hci_conn_hash_lookup_big_state(hdev, qos-&gt;bcast.big, BT_OPEN,</div><div class='add'>+					      HCI_ROLE_MASTER);</div><div class='add'>+	if (conn) {</div><div class='add'>+		memcpy(qos, &amp;conn-&gt;iso_qos, sizeof(*qos));</div><div class='add'>+		conn-&gt;state = BT_CONNECTED;</div><div class='add'>+		return conn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (base_len &amp;&amp; base)</div><div class='add'>+		base_len = eir_append_service_data(eir, 0,  0x1851,</div><div class='add'>+						   base, base_len);</div><div class='add'>+</div><div class='add'>+	/* We need hci_conn object using the BDADDR_ANY as dst */</div><div class='add'>+	conn = hci_add_bis(hdev, dst, sid, qos, base_len, eir, timeout);</div><div class='add'>+	if (IS_ERR(conn))</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	/* Update LINK PHYs according to QoS preference */</div><div class='add'>+	conn-&gt;le_tx_phy = qos-&gt;bcast.out.phy;</div><div class='add'>+	conn-&gt;le_tx_phy = qos-&gt;bcast.out.phy;</div><div class='add'>+</div><div class='add'>+	/* Add Basic Announcement into Peridic Adv Data if BASE is set */</div><div class='add'>+	if (base_len &amp;&amp; base) {</div><div class='add'>+		memcpy(conn-&gt;le_per_adv_data,  eir, sizeof(eir));</div><div class='add'>+		conn-&gt;le_per_adv_data_len = base_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_iso_qos_setup(hdev, conn, &amp;qos-&gt;bcast.out,</div><div class='add'>+			  conn-&gt;le_tx_phy ? conn-&gt;le_tx_phy :</div><div class='add'>+			  hdev-&gt;le_tx_def_phys);</div><div class='add'>+</div><div class='add'>+	conn-&gt;iso_qos = *qos;</div><div class='add'>+	conn-&gt;state = BT_BOUND;</div><div class='add'>+</div><div class='add'>+	/* Link BISes together */</div><div class='add'>+	parent = hci_conn_hash_lookup_big(hdev,</div><div class='add'>+					  conn-&gt;iso_qos.bcast.big);</div><div class='add'>+	if (parent &amp;&amp; parent != conn) {</div><div class='add'>+		link = hci_conn_link(parent, conn);</div><div class='add'>+		hci_conn_drop(conn);</div><div class='add'>+		if (!link)</div><div class='add'>+			return ERR_PTR(-ENOLINK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_past_bis(struct hci_conn *conn, bdaddr_t *dst, __u8 dst_type)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *le;</div><div class='add'>+</div><div class='add'>+	/* Lookup existing LE connection to rebind to */</div><div class='add'>+	le = hci_conn_hash_lookup_le(conn-&gt;hdev, dst, dst_type);</div><div class='add'>+	if (!le)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return hci_past_sync(conn, le);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bis_mark_per_adv(struct hci_conn *conn, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iso_list_data *d = data;</div><div class='add'>+</div><div class='add'>+	/* Skip if not broadcast/ANY address */</div><div class='add'>+	if (bacmp(&amp;conn-&gt;dst, BDADDR_ANY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (d-&gt;big != conn-&gt;iso_qos.bcast.big ||</div><div class='add'>+	    d-&gt;bis == BT_ISO_QOS_BIS_UNSET ||</div><div class='add'>+	    d-&gt;bis != conn-&gt;iso_qos.bcast.bis)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_bit(HCI_CONN_PER_ADV, &amp;conn-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='add'>+				 __u8 dst_type, __u8 sid,</div><div class='add'>+				 struct bt_iso_qos *qos,</div><div class='add'>+				 __u8 base_len, __u8 *base, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	int err;</div><div class='add'>+	struct iso_list_data data;</div><div class='add'>+</div><div class='add'>+	conn = hci_bind_bis(hdev, dst, sid, qos, base_len, base, timeout);</div><div class='add'>+	if (IS_ERR(conn))</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;state == BT_CONNECTED)</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	/* Check if SID needs to be allocated then search for the first</div><div class='add'>+	 * available.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;sid == HCI_SID_INVALID) {</div><div class='add'>+		u8 sid;</div><div class='add'>+</div><div class='add'>+		for (sid = 0; sid &lt;= 0x0f; sid++) {</div><div class='add'>+			if (!hci_find_adv_sid(hdev, sid)) {</div><div class='add'>+				conn-&gt;sid = sid;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data.big = qos-&gt;bcast.big;</div><div class='add'>+	data.bis = qos-&gt;bcast.bis;</div><div class='add'>+</div><div class='add'>+	/* Set HCI_CONN_PER_ADV for all bound connections, to mark that</div><div class='add'>+	 * the start periodic advertising and create BIG commands have</div><div class='add'>+	 * been queued</div><div class='add'>+	 */</div><div class='add'>+	hci_conn_hash_list_state(hdev, bis_mark_per_adv, BIS_LINK,</div><div class='add'>+				 BT_BOUND, &amp;data);</div><div class='add'>+</div><div class='add'>+	/* Queue start periodic advertising and create BIG */</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, create_big_sync, conn,</div><div class='add'>+				 create_big_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		hci_conn_drop(conn);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst,</div><div class='add'>+				 __u8 dst_type, struct bt_iso_qos *qos,</div><div class='add'>+				 u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *le;</div><div class='add'>+	struct hci_conn *cis;</div><div class='add'>+	struct hci_link *link;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='add'>+		le = hci_connect_le(hdev, dst, dst_type, false,</div><div class='add'>+				    BT_SECURITY_LOW,</div><div class='add'>+				    HCI_LE_CONN_TIMEOUT,</div><div class='add'>+				    HCI_ROLE_SLAVE, 0, 0);</div><div class='add'>+	else</div><div class='add'>+		le = hci_connect_le_scan(hdev, dst, dst_type,</div><div class='add'>+					 BT_SECURITY_LOW,</div><div class='add'>+					 HCI_LE_CONN_TIMEOUT,</div><div class='add'>+					 CONN_REASON_ISO_CONNECT);</div><div class='add'>+	if (IS_ERR(le))</div><div class='add'>+		return le;</div><div class='add'>+</div><div class='add'>+	hci_iso_qos_setup(hdev, le, &amp;qos-&gt;ucast.out,</div><div class='add'>+			  le-&gt;le_tx_phy ? le-&gt;le_tx_phy : hdev-&gt;le_tx_def_phys);</div><div class='add'>+	hci_iso_qos_setup(hdev, le, &amp;qos-&gt;ucast.in,</div><div class='add'>+			  le-&gt;le_rx_phy ? le-&gt;le_rx_phy : hdev-&gt;le_rx_def_phys);</div><div class='add'>+</div><div class='add'>+	cis = hci_bind_cis(hdev, dst, dst_type, qos, timeout);</div><div class='add'>+	if (IS_ERR(cis)) {</div><div class='add'>+		hci_conn_drop(le);</div><div class='add'>+		return cis;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = hci_conn_link(le, cis);</div><div class='add'>+	hci_conn_drop(cis);</div><div class='add'>+	if (!link) {</div><div class='add'>+		hci_conn_drop(le);</div><div class='add'>+		return ERR_PTR(-ENOLINK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cis-&gt;state = BT_CONNECT;</div><div class='add'>+</div><div class='add'>+	hci_le_create_cis_pending(hdev);</div><div class='add'>+</div><div class='add'>+	return cis;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Check link security requirement */</div><div class='ctx'> int hci_conn_check_link_mode(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='hunk'>@@ -1272,6 +2397,23 @@ int hci_conn_check_link_mode(struct hci_conn *conn)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	 /* AES encryption is required for Level 4:</div><div class='add'>+	  *</div><div class='add'>+	  * BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 3, Part C</div><div class='add'>+	  * page 1319:</div><div class='add'>+	  *</div><div class='add'>+	  * 128-bit equivalent strength for link and encryption keys</div><div class='add'>+	  * required using FIPS approved algorithms (E0 not allowed,</div><div class='add'>+	  * SAFER+ not allowed, and P-192 not allowed; encryption key</div><div class='add'>+	  * not shortened)</div><div class='add'>+	  */</div><div class='add'>+	if (conn-&gt;sec_level == BT_SECURITY_FIPS &amp;&amp;</div><div class='add'>+	    !test_bit(HCI_CONN_AES_CCM, &amp;conn-&gt;flags)) {</div><div class='add'>+		bt_dev_err(conn-&gt;hdev,</div><div class='add'>+			   "Invalid security: Missing AES-CCM usage");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (hci_conn_ssp_enabled(conn) &amp;&amp;</div><div class='ctx'> 	    !test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1304,19 +2446,17 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)</div><div class='ctx'> 		hci_send_cmd(conn-&gt;hdev, HCI_OP_AUTH_REQUESTED,</div><div class='ctx'> 			     sizeof(cp), &amp;cp);</div><div class='ctx'> </div><div class='del'>-		/* If we're already encrypted set the REAUTH_PEND flag,</div><div class='del'>-		 * otherwise set the ENCRYPT_PEND.</div><div class='add'>+		/* Set the ENCRYPT_PEND to trigger encryption after</div><div class='add'>+		 * authentication.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags))</div><div class='del'>-			set_bit(HCI_CONN_REAUTH_PEND, &amp;conn-&gt;flags);</div><div class='del'>-		else</div><div class='add'>+		if (!test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags))</div><div class='ctx'> 			set_bit(HCI_CONN_ENCRYPT_PEND, &amp;conn-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Encrypt the the link */</div><div class='add'>+/* Encrypt the link */</div><div class='ctx'> static void hci_conn_encrypt(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("hcon %p", conn);</div><div class='hunk'>@@ -1352,34 +2492,41 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type,</div><div class='ctx'> 	if (!test_bit(HCI_CONN_AUTH, &amp;conn-&gt;flags))</div><div class='ctx'> 		goto auth;</div><div class='ctx'> </div><div class='del'>-	/* An authenticated FIPS approved combination key has sufficient</div><div class='del'>-	 * security for security level 4. */</div><div class='del'>-	if (conn-&gt;key_type == HCI_LK_AUTH_COMBINATION_P256 &amp;&amp;</div><div class='del'>-	    sec_level == BT_SECURITY_FIPS)</div><div class='del'>-		goto encrypt;</div><div class='del'>-</div><div class='del'>-	/* An authenticated combination key has sufficient security for</div><div class='del'>-	   security level 3. */</div><div class='del'>-	if ((conn-&gt;key_type == HCI_LK_AUTH_COMBINATION_P192 ||</div><div class='del'>-	     conn-&gt;key_type == HCI_LK_AUTH_COMBINATION_P256) &amp;&amp;</div><div class='del'>-	    sec_level == BT_SECURITY_HIGH)</div><div class='del'>-		goto encrypt;</div><div class='del'>-</div><div class='del'>-	/* An unauthenticated combination key has sufficient security for</div><div class='del'>-	   security level 1 and 2. */</div><div class='del'>-	if ((conn-&gt;key_type == HCI_LK_UNAUTH_COMBINATION_P192 ||</div><div class='del'>-	     conn-&gt;key_type == HCI_LK_UNAUTH_COMBINATION_P256) &amp;&amp;</div><div class='del'>-	    (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW))</div><div class='del'>-		goto encrypt;</div><div class='del'>-</div><div class='del'>-	/* A combination key has always sufficient security for the security</div><div class='del'>-	   levels 1 or 2. High security level requires the combination key</div><div class='del'>-	   is generated using maximum PIN code length (16).</div><div class='del'>-	   For pre 2.1 units. */</div><div class='del'>-	if (conn-&gt;key_type == HCI_LK_COMBINATION &amp;&amp;</div><div class='del'>-	    (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW ||</div><div class='del'>-	     conn-&gt;pin_length == 16))</div><div class='del'>-		goto encrypt;</div><div class='add'>+	switch (conn-&gt;key_type) {</div><div class='add'>+	case HCI_LK_AUTH_COMBINATION_P256:</div><div class='add'>+		/* An authenticated FIPS approved combination key has</div><div class='add'>+		 * sufficient security for security level 4 or lower.</div><div class='add'>+		 */</div><div class='add'>+		if (sec_level &lt;= BT_SECURITY_FIPS)</div><div class='add'>+			goto encrypt;</div><div class='add'>+		break;</div><div class='add'>+	case HCI_LK_AUTH_COMBINATION_P192:</div><div class='add'>+		/* An authenticated combination key has sufficient security for</div><div class='add'>+		 * security level 3 or lower.</div><div class='add'>+		 */</div><div class='add'>+		if (sec_level &lt;= BT_SECURITY_HIGH)</div><div class='add'>+			goto encrypt;</div><div class='add'>+		break;</div><div class='add'>+	case HCI_LK_UNAUTH_COMBINATION_P192:</div><div class='add'>+	case HCI_LK_UNAUTH_COMBINATION_P256:</div><div class='add'>+		/* An unauthenticated combination key has sufficient security</div><div class='add'>+		 * for security level 2 or lower.</div><div class='add'>+		 */</div><div class='add'>+		if (sec_level &lt;= BT_SECURITY_MEDIUM)</div><div class='add'>+			goto encrypt;</div><div class='add'>+		break;</div><div class='add'>+	case HCI_LK_COMBINATION:</div><div class='add'>+		/* A combination key has always sufficient security for the</div><div class='add'>+		 * security levels 2 or lower. High security level requires the</div><div class='add'>+		 * combination key is generated using maximum PIN code length</div><div class='add'>+		 * (16). For pre 2.1 units.</div><div class='add'>+		 */</div><div class='add'>+		if (sec_level &lt;= BT_SECURITY_MEDIUM || conn-&gt;pin_length == 16)</div><div class='add'>+			goto encrypt;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> auth:</div><div class='ctx'> 	if (test_bit(HCI_CONN_ENCRYPT_PEND, &amp;conn-&gt;flags))</div><div class='hunk'>@@ -1392,8 +2539,16 @@ auth:</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> encrypt:</div><div class='del'>-	if (test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags))</div><div class='add'>+	if (test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags)) {</div><div class='add'>+		/* Ensure that the encryption key size has been read,</div><div class='add'>+		 * otherwise stall the upper layer responses.</div><div class='add'>+		 */</div><div class='add'>+		if (!conn-&gt;enc_key_size)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Nothing else needed, all requirements are met */</div><div class='ctx'> 		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hci_conn_encrypt(conn);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1466,33 +2621,22 @@ timer:</div><div class='ctx'> /* Drop all connection on the device */</div><div class='ctx'> void hci_conn_hash_flush(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn_hash *h = &amp;hdev-&gt;conn_hash;</div><div class='del'>-	struct hci_conn *c, *n;</div><div class='del'>-</div><div class='del'>-	BT_DBG("hdev %s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(c, n, &amp;h-&gt;list, list) {</div><div class='del'>-		c-&gt;state = BT_CLOSED;</div><div class='del'>-</div><div class='del'>-		hci_disconn_cfm(c, HCI_ERROR_LOCAL_HOST_TERM);</div><div class='del'>-		hci_conn_del(c);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Check pending connect attempts */</div><div class='del'>-void hci_conn_check_pending(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='add'>+	struct list_head *head = &amp;hdev-&gt;conn_hash.list;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hdev %s", hdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	conn = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);</div><div class='del'>-	if (conn)</div><div class='del'>-		hci_acl_create_connection(conn);</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	/* We should not traverse the list here, because hci_conn_del</div><div class='add'>+	 * can remove extra links, which may cause the list traversal</div><div class='add'>+	 * to hit items that have already been released.</div><div class='add'>+	 */</div><div class='add'>+	while ((conn = list_first_entry_or_null(head,</div><div class='add'>+						struct hci_conn,</div><div class='add'>+						list)) != NULL) {</div><div class='add'>+		conn-&gt;state = BT_CLOSED;</div><div class='add'>+		hci_disconn_cfm(conn, HCI_ERROR_LOCAL_HOST_TERM);</div><div class='add'>+		hci_conn_del(conn);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 get_link_mode(struct hci_conn *conn)</div><div class='hunk'>@@ -1704,3 +2848,340 @@ struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle)</div><div class='ctx'> </div><div class='ctx'> 	return hchan;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+u32 hci_conn_get_phy(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	u32 phys = 0;</div><div class='add'>+</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471:</div><div class='add'>+	 * Table 6.2: Packets defined for synchronous, asynchronous, and</div><div class='add'>+	 * CPB logical transport types.</div><div class='add'>+	 */</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+		/* SCO logical transport (1 Mb/s):</div><div class='add'>+		 * HV1, HV2, HV3 and DV.</div><div class='add'>+		 */</div><div class='add'>+		phys |= BT_PHY_BR_1M_1SLOT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		/* ACL logical transport (1 Mb/s) ptt=0:</div><div class='add'>+		 * DH1, DM3, DH3, DM5 and DH5.</div><div class='add'>+		 */</div><div class='add'>+		phys |= BT_PHY_BR_1M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;pkt_type &amp; (HCI_DM3 | HCI_DH3))</div><div class='add'>+			phys |= BT_PHY_BR_1M_3SLOT;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;pkt_type &amp; (HCI_DM5 | HCI_DH5))</div><div class='add'>+			phys |= BT_PHY_BR_1M_5SLOT;</div><div class='add'>+</div><div class='add'>+		/* ACL logical transport (2 Mb/s) ptt=1:</div><div class='add'>+		 * 2-DH1, 2-DH3 and 2-DH5.</div><div class='add'>+		 */</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_2DH1))</div><div class='add'>+			phys |= BT_PHY_EDR_2M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_2DH3))</div><div class='add'>+			phys |= BT_PHY_EDR_2M_3SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_2DH5))</div><div class='add'>+			phys |= BT_PHY_EDR_2M_5SLOT;</div><div class='add'>+</div><div class='add'>+		/* ACL logical transport (3 Mb/s) ptt=1:</div><div class='add'>+		 * 3-DH1, 3-DH3 and 3-DH5.</div><div class='add'>+		 */</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_3DH1))</div><div class='add'>+			phys |= BT_PHY_EDR_3M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_3DH3))</div><div class='add'>+			phys |= BT_PHY_EDR_3M_3SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; HCI_3DH5))</div><div class='add'>+			phys |= BT_PHY_EDR_3M_5SLOT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		/* eSCO logical transport (1 Mb/s): EV3, EV4 and EV5 */</div><div class='add'>+		phys |= BT_PHY_BR_1M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; (ESCO_EV4 | ESCO_EV5)))</div><div class='add'>+			phys |= BT_PHY_BR_1M_3SLOT;</div><div class='add'>+</div><div class='add'>+		/* eSCO logical transport (2 Mb/s): 2-EV3, 2-EV5 */</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; ESCO_2EV3))</div><div class='add'>+			phys |= BT_PHY_EDR_2M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; ESCO_2EV5))</div><div class='add'>+			phys |= BT_PHY_EDR_2M_3SLOT;</div><div class='add'>+</div><div class='add'>+		/* eSCO logical transport (3 Mb/s): 3-EV3, 3-EV5 */</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; ESCO_3EV3))</div><div class='add'>+			phys |= BT_PHY_EDR_3M_1SLOT;</div><div class='add'>+</div><div class='add'>+		if (!(conn-&gt;pkt_type &amp; ESCO_3EV5))</div><div class='add'>+			phys |= BT_PHY_EDR_3M_3SLOT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		if (conn-&gt;le_tx_phy &amp; HCI_LE_SET_PHY_1M)</div><div class='add'>+			phys |= BT_PHY_LE_1M_TX;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;le_rx_phy &amp; HCI_LE_SET_PHY_1M)</div><div class='add'>+			phys |= BT_PHY_LE_1M_RX;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;le_tx_phy &amp; HCI_LE_SET_PHY_2M)</div><div class='add'>+			phys |= BT_PHY_LE_2M_TX;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;le_rx_phy &amp; HCI_LE_SET_PHY_2M)</div><div class='add'>+			phys |= BT_PHY_LE_2M_RX;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;le_tx_phy &amp; HCI_LE_SET_PHY_CODED)</div><div class='add'>+			phys |= BT_PHY_LE_CODED_TX;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;le_rx_phy &amp; HCI_LE_SET_PHY_CODED)</div><div class='add'>+			phys |= BT_PHY_LE_CODED_RX;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return phys;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int abort_conn_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	return hci_abort_conn_sync(hdev, conn, conn-&gt;abort_reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_abort_conn(struct hci_conn *conn, u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	/* If abort_reason has already been set it means the connection is</div><div class='add'>+	 * already being aborted so don't attempt to overwrite it.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;abort_reason)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%2.2x reason 0x%2.2x", conn-&gt;handle, reason);</div><div class='add'>+</div><div class='add'>+	conn-&gt;abort_reason = reason;</div><div class='add'>+</div><div class='add'>+	/* If the connection is pending check the command opcode since that</div><div class='add'>+	 * might be blocking on hci_cmd_sync_work while waiting its respective</div><div class='add'>+	 * event so we need to hci_cmd_sync_cancel to cancel it.</div><div class='add'>+	 *</div><div class='add'>+	 * hci_connect_le serializes the connection attempts so only one</div><div class='add'>+	 * connection can be in BT_CONNECT at time.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;state == BT_CONNECT &amp;&amp; hdev-&gt;req_status == HCI_REQ_PEND) {</div><div class='add'>+		switch (hci_skb_event(hdev-&gt;sent_cmd)) {</div><div class='add'>+		case HCI_EV_CONN_COMPLETE:</div><div class='add'>+		case HCI_EV_LE_CONN_COMPLETE:</div><div class='add'>+		case HCI_EV_LE_ENHANCED_CONN_COMPLETE:</div><div class='add'>+		case HCI_EVT_LE_CIS_ESTABLISHED:</div><div class='add'>+			hci_cmd_sync_cancel(hdev, ECANCELED);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	/* Cancel connect attempt if still queued/pending */</div><div class='add'>+	} else if (!hci_cancel_connect_sync(hdev, conn)) {</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Run immediately if on cmd_sync_work since this may be called</div><div class='add'>+	 * as a result to MGMT_OP_DISCONNECT/MGMT_OP_UNPAIR which does</div><div class='add'>+	 * already queue its callback on cmd_sync_work.</div><div class='add'>+	 */</div><div class='add'>+	return hci_cmd_sync_run_once(hdev, abort_conn_sync, conn, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_setup_tx_timestamp(struct sk_buff *skb, size_t key_offset,</div><div class='add'>+			    const struct sockcm_cookie *sockc)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = skb ? skb-&gt;sk : NULL;</div><div class='add'>+	int key;</div><div class='add'>+</div><div class='add'>+	/* This shall be called on a single skb of those generated by user</div><div class='add'>+	 * sendmsg(), and only when the sendmsg() does not return error to</div><div class='add'>+	 * user. This is required for keeping the tskey that increments here in</div><div class='add'>+	 * sync with possible sendmsg() counting by user.</div><div class='add'>+	 *</div><div class='add'>+	 * Stream sockets shall set key_offset to sendmsg() length in bytes</div><div class='add'>+	 * and call with the last fragment, others to 1 and first fragment.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!skb || !sockc || !sk || !key_offset)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sock_tx_timestamp(sk, sockc, &amp;skb_shinfo(skb)-&gt;tx_flags);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+		key = atomic_add_return(key_offset, &amp;sk-&gt;sk_tskey);</div><div class='add'>+</div><div class='add'>+	if (sockc-&gt;tsflags &amp; SOF_TIMESTAMPING_OPT_ID &amp;&amp;</div><div class='add'>+	    sockc-&gt;tsflags &amp; SOF_TIMESTAMPING_TX_RECORD_MASK) {</div><div class='add'>+		if (sockc-&gt;tsflags &amp; SOCKCM_FLAG_TS_OPT_ID) {</div><div class='add'>+			skb_shinfo(skb)-&gt;tskey = sockc-&gt;ts_opt_id;</div><div class='add'>+		} else {</div><div class='add'>+			if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='add'>+				key = atomic_inc_return(&amp;sk-&gt;sk_tskey);</div><div class='add'>+			skb_shinfo(skb)-&gt;tskey = key - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_conn_tx_queue(struct hci_conn *conn, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tx_queue *comp = &amp;conn-&gt;tx_q;</div><div class='add'>+	bool track = false;</div><div class='add'>+</div><div class='add'>+	/* Emit SND now, ie. just before sending to driver */</div><div class='add'>+	if (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_SW_TSTAMP)</div><div class='add'>+		__skb_tstamp_tx(skb, NULL, NULL, skb-&gt;sk, SCM_TSTAMP_SND);</div><div class='add'>+</div><div class='add'>+	/* COMPLETION tstamp is emitted for tracked skb later in Number of</div><div class='add'>+	 * Completed Packets event. Available only for flow controlled cases.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: SCO support without flowctl (needs to be done in drivers)</div><div class='add'>+	 */</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		break;</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		if (!hci_dev_test_flag(conn-&gt;hdev, HCI_SCO_FLOWCTL))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;sk &amp;&amp; (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_COMPLETION_TSTAMP))</div><div class='add'>+		track = true;</div><div class='add'>+</div><div class='add'>+	/* If nothing is tracked, just count extra skbs at the queue head */</div><div class='add'>+	if (!track &amp;&amp; !comp-&gt;tracked) {</div><div class='add'>+		comp-&gt;extra++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (track) {</div><div class='add'>+		skb = skb_clone_sk(skb);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto count_only;</div><div class='add'>+</div><div class='add'>+		comp-&gt;tracked++;</div><div class='add'>+	} else {</div><div class='add'>+		skb = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto count_only;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;comp-&gt;queue, skb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+count_only:</div><div class='add'>+	/* Stop tracking skbs, and only count. This will not emit timestamps for</div><div class='add'>+	 * the packets, but if we get here something is more seriously wrong.</div><div class='add'>+	 */</div><div class='add'>+	comp-&gt;tracked = 0;</div><div class='add'>+	comp-&gt;extra += skb_queue_len(&amp;comp-&gt;queue) + 1;</div><div class='add'>+	skb_queue_purge(&amp;comp-&gt;queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_conn_tx_dequeue(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct tx_queue *comp = &amp;conn-&gt;tx_q;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* If there are tracked skbs, the counted extra go before dequeuing real</div><div class='add'>+	 * skbs, to keep ordering. When nothing is tracked, the ordering doesn't</div><div class='add'>+	 * matter so dequeue real skbs first to get rid of them ASAP.</div><div class='add'>+	 */</div><div class='add'>+	if (comp-&gt;extra &amp;&amp; (comp-&gt;tracked || skb_queue_empty(&amp;comp-&gt;queue))) {</div><div class='add'>+		comp-&gt;extra--;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = skb_dequeue(&amp;comp-&gt;queue);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;sk) {</div><div class='add'>+		comp-&gt;tracked--;</div><div class='add'>+		__skb_tstamp_tx(skb, NULL, NULL, skb-&gt;sk,</div><div class='add'>+				SCM_TSTAMP_COMPLETION);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 *hci_conn_key_enc_size(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;type == ACL_LINK) {</div><div class='add'>+		struct link_key *key;</div><div class='add'>+</div><div class='add'>+		key = hci_find_link_key(conn-&gt;hdev, &amp;conn-&gt;dst);</div><div class='add'>+		if (!key)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		return &amp;key-&gt;pin_len;</div><div class='add'>+	} else if (conn-&gt;type == LE_LINK) {</div><div class='add'>+		struct smp_ltk *ltk;</div><div class='add'>+</div><div class='add'>+		ltk = hci_find_ltk(conn-&gt;hdev, &amp;conn-&gt;dst, conn-&gt;dst_type,</div><div class='add'>+				   conn-&gt;role);</div><div class='add'>+		if (!ltk)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		return &amp;ltk-&gt;enc_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_ethtool_ts_info(unsigned int index, int sk_proto,</div><div class='add'>+			struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+</div><div class='add'>+	hdev = hci_dev_get(index);</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping =</div><div class='add'>+		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+	info-&gt;phc_index = -1;</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_OFF);</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_NONE);</div><div class='add'>+</div><div class='add'>+	switch (sk_proto) {</div><div class='add'>+	case BTPROTO_ISO:</div><div class='add'>+	case BTPROTO_L2CAP:</div><div class='add'>+		info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='add'>+		info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_COMPLETION;</div><div class='add'>+		break;</div><div class='add'>+	case BTPROTO_SCO:</div><div class='add'>+		info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_SCO_FLOWCTL))</div><div class='add'>+			info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_COMPLETION;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c<br/>index 74b29c7d841c..8ccec73dce45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_core.c</a></div><div class='hunk'>@@ -26,21 +26,26 @@</div><div class='ctx'> /* Bluetooth HCI core. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/rfkill.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/kcov.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/mgmt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hci_request.h"</div><div class='ctx'> #include "hci_debugfs.h"</div><div class='ctx'> #include "smp.h"</div><div class='ctx'> #include "leds.h"</div><div class='add'>+#include "msft.h"</div><div class='add'>+#include "aosp.h"</div><div class='add'>+#include "hci_codec.h"</div><div class='ctx'> </div><div class='ctx'> static void hci_rx_work(struct work_struct *work);</div><div class='ctx'> static void hci_cmd_work(struct work_struct *work);</div><div class='hunk'>@@ -57,950 +62,9 @@ DEFINE_MUTEX(hci_cb_list_lock);</div><div class='ctx'> /* HCI ID Numbering */</div><div class='ctx'> static DEFINE_IDA(hci_index_ida);</div><div class='ctx'> </div><div class='del'>-/* ---- HCI debugfs entries ---- */</div><div class='del'>-</div><div class='del'>-static ssize_t dut_mode_read(struct file *file, char __user *user_buf,</div><div class='del'>-			     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[3];</div><div class='del'>-</div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_DUT_MODE) ? 'Y' : 'N';</div><div class='del'>-	buf[1] = '\n';</div><div class='del'>-	buf[2] = '\0';</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dut_mode_write(struct file *file, const char __user *user_buf,</div><div class='del'>-			      size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	bool enable;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='del'>-		return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (enable == hci_dev_test_flag(hdev, HCI_DUT_MODE))</div><div class='del'>-		return -EALREADY;</div><div class='del'>-</div><div class='del'>-	hci_req_sync_lock(hdev);</div><div class='del'>-	if (enable)</div><div class='del'>-		skb = __hci_cmd_sync(hdev, HCI_OP_ENABLE_DUT_MODE, 0, NULL,</div><div class='del'>-				     HCI_CMD_TIMEOUT);</div><div class='del'>-	else</div><div class='del'>-		skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL,</div><div class='del'>-				     HCI_CMD_TIMEOUT);</div><div class='del'>-	hci_req_sync_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	hci_dev_change_flag(hdev, HCI_DUT_MODE);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dut_mode_fops = {</div><div class='del'>-	.open		= simple_open,</div><div class='del'>-	.read		= dut_mode_read,</div><div class='del'>-	.write		= dut_mode_write,</div><div class='del'>-	.llseek		= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t vendor_diag_read(struct file *file, char __user *user_buf,</div><div class='del'>-				size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[3];</div><div class='del'>-</div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_VENDOR_DIAG) ? 'Y' : 'N';</div><div class='del'>-	buf[1] = '\n';</div><div class='del'>-	buf[2] = '\0';</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t vendor_diag_write(struct file *file, const char __user *user_buf,</div><div class='del'>-				 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	bool enable;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* When the diagnostic flags are not persistent and the transport</div><div class='del'>-	 * is not active or in user channel operation, then there is no need</div><div class='del'>-	 * for the vendor callback. Instead just store the desired value and</div><div class='del'>-	 * the setting will be programmed when the controller gets powered on.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='del'>-	    (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags) ||</div><div class='del'>-	     hci_dev_test_flag(hdev, HCI_USER_CHANNEL)))</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	hci_req_sync_lock(hdev);</div><div class='del'>-	err = hdev-&gt;set_diag(hdev, enable);</div><div class='del'>-	hci_req_sync_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (enable)</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_VENDOR_DIAG);</div><div class='del'>-	else</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_VENDOR_DIAG);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations vendor_diag_fops = {</div><div class='del'>-	.open		= simple_open,</div><div class='del'>-	.read		= vendor_diag_read,</div><div class='del'>-	.write		= vendor_diag_write,</div><div class='del'>-	.llseek		= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void hci_debugfs_create_basic(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	debugfs_create_file("dut_mode", 0644, hdev-&gt;debugfs, hdev,</div><div class='del'>-			    &amp;dut_mode_fops);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;set_diag)</div><div class='del'>-		debugfs_create_file("vendor_diag", 0644, hdev-&gt;debugfs, hdev,</div><div class='del'>-				    &amp;vendor_diag_fops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_reset_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s %ld", req-&gt;hdev-&gt;name, opt);</div><div class='del'>-</div><div class='del'>-	/* Reset device */</div><div class='del'>-	set_bit(HCI_RESET, &amp;req-&gt;hdev-&gt;flags);</div><div class='del'>-	hci_req_add(req, HCI_OP_RESET, 0, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bredr_init(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	req-&gt;hdev-&gt;flow_ctl_mode = HCI_FLOW_CTL_MODE_PACKET_BASED;</div><div class='del'>-</div><div class='del'>-	/* Read Local Supported Features */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_FEATURES, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Local Version */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_VERSION, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read BD Address */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_BD_ADDR, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void amp_init1(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	req-&gt;hdev-&gt;flow_ctl_mode = HCI_FLOW_CTL_MODE_BLOCK_BASED;</div><div class='del'>-</div><div class='del'>-	/* Read Local Version */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_VERSION, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Local Supported Commands */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Local AMP Info */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Data Blk size */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_DATA_BLOCK_SIZE, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Flow Control Mode */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_FLOW_CONTROL_MODE, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Location Data */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCATION_DATA, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int amp_init2(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	/* Read Local Supported Features. Not all AMP controllers</div><div class='del'>-	 * support this so it's placed conditionally in the second</div><div class='del'>-	 * stage init.</div><div class='del'>-	 */</div><div class='del'>-	if (req-&gt;hdev-&gt;commands[14] &amp; 0x20)</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_LOCAL_FEATURES, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_init1_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %ld", hdev-&gt;name, opt);</div><div class='del'>-</div><div class='del'>-	/* Reset */</div><div class='del'>-	if (!test_bit(HCI_QUIRK_RESET_ON_CLOSE, &amp;hdev-&gt;quirks))</div><div class='del'>-		hci_reset_req(req, 0);</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		bredr_init(req);</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		amp_init1(req);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bt_dev_err(hdev, "Unknown device type %d", hdev-&gt;dev_type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bredr_setup(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	__le16 param;</div><div class='del'>-	__u8 flt_type;</div><div class='del'>-</div><div class='del'>-	/* Read Buffer Size (ACL mtu, max pkt, etc.) */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_BUFFER_SIZE, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Class of Device */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_CLASS_OF_DEV, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Local Name */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_NAME, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Voice Setting */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_VOICE_SETTING, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Number of Supported IAC */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_NUM_SUPPORTED_IAC, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read Current IAC LAP */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_CURRENT_IAC_LAP, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Clear Event Filters */</div><div class='del'>-	flt_type = HCI_FLT_CLEAR_ALL;</div><div class='del'>-	hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &amp;flt_type);</div><div class='del'>-</div><div class='del'>-	/* Connection accept timeout ~20 secs */</div><div class='del'>-	param = cpu_to_le16(0x7d00);</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_CA_TIMEOUT, 2, &amp;param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void le_setup(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* Read LE Buffer Size */</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_READ_BUFFER_SIZE, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read LE Local Supported Features */</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_READ_LOCAL_FEATURES, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read LE Supported States */</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_READ_SUPPORTED_STATES, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* LE-only controllers have LE implicitly enabled */</div><div class='del'>-	if (!lmp_bredr_capable(hdev))</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_LE_ENABLED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_setup_event_mask(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* The second byte is 0xff instead of 0x9f (two reserved bits</div><div class='del'>-	 * disabled) since a Broadcom 1.2 dongle doesn't respond to the</div><div class='del'>-	 * command otherwise.</div><div class='del'>-	 */</div><div class='del'>-	u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };</div><div class='del'>-</div><div class='del'>-	/* CSR 1.1 dongles does not accept any bitfield so don't try to set</div><div class='del'>-	 * any event mask for pre 1.2 devices.</div><div class='del'>-	 */</div><div class='del'>-	if (hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (lmp_bredr_capable(hdev)) {</div><div class='del'>-		events[4] |= 0x01; /* Flow Specification Complete */</div><div class='del'>-	} else {</div><div class='del'>-		/* Use a different default for LE-only devices */</div><div class='del'>-		memset(events, 0, sizeof(events));</div><div class='del'>-		events[1] |= 0x20; /* Command Complete */</div><div class='del'>-		events[1] |= 0x40; /* Command Status */</div><div class='del'>-		events[1] |= 0x80; /* Hardware Error */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the Disconnect command, enable</div><div class='del'>-		 * the corresponding event. In addition enable packet flow</div><div class='del'>-		 * control related events.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[0] &amp; 0x20) {</div><div class='del'>-			events[0] |= 0x10; /* Disconnection Complete */</div><div class='del'>-			events[2] |= 0x04; /* Number of Completed Packets */</div><div class='del'>-			events[3] |= 0x02; /* Data Buffer Overflow */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the Read Remote Version</div><div class='del'>-		 * Information command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[2] &amp; 0x80)</div><div class='del'>-			events[1] |= 0x08; /* Read Remote Version Information</div><div class='del'>-					    * Complete</div><div class='del'>-					    */</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_ENCRYPTION) {</div><div class='del'>-			events[0] |= 0x80; /* Encryption Change */</div><div class='del'>-			events[5] |= 0x80; /* Encryption Key Refresh Complete */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lmp_inq_rssi_capable(hdev) ||</div><div class='del'>-	    test_bit(HCI_QUIRK_FIXUP_INQUIRY_MODE, &amp;hdev-&gt;quirks))</div><div class='del'>-		events[4] |= 0x02; /* Inquiry Result with RSSI */</div><div class='del'>-</div><div class='del'>-	if (lmp_ext_feat_capable(hdev))</div><div class='del'>-		events[4] |= 0x04; /* Read Remote Extended Features Complete */</div><div class='del'>-</div><div class='del'>-	if (lmp_esco_capable(hdev)) {</div><div class='del'>-		events[5] |= 0x08; /* Synchronous Connection Complete */</div><div class='del'>-		events[5] |= 0x10; /* Synchronous Connection Changed */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lmp_sniffsubr_capable(hdev))</div><div class='del'>-		events[5] |= 0x20; /* Sniff Subrating */</div><div class='del'>-</div><div class='del'>-	if (lmp_pause_enc_capable(hdev))</div><div class='del'>-		events[5] |= 0x80; /* Encryption Key Refresh Complete */</div><div class='del'>-</div><div class='del'>-	if (lmp_ext_inq_capable(hdev))</div><div class='del'>-		events[5] |= 0x40; /* Extended Inquiry Result */</div><div class='del'>-</div><div class='del'>-	if (lmp_no_flush_capable(hdev))</div><div class='del'>-		events[7] |= 0x01; /* Enhanced Flush Complete */</div><div class='del'>-</div><div class='del'>-	if (lmp_lsto_capable(hdev))</div><div class='del'>-		events[6] |= 0x80; /* Link Supervision Timeout Changed */</div><div class='del'>-</div><div class='del'>-	if (lmp_ssp_capable(hdev)) {</div><div class='del'>-		events[6] |= 0x01;	/* IO Capability Request */</div><div class='del'>-		events[6] |= 0x02;	/* IO Capability Response */</div><div class='del'>-		events[6] |= 0x04;	/* User Confirmation Request */</div><div class='del'>-		events[6] |= 0x08;	/* User Passkey Request */</div><div class='del'>-		events[6] |= 0x10;	/* Remote OOB Data Request */</div><div class='del'>-		events[6] |= 0x20;	/* Simple Pairing Complete */</div><div class='del'>-		events[7] |= 0x04;	/* User Passkey Notification */</div><div class='del'>-		events[7] |= 0x08;	/* Keypress Notification */</div><div class='del'>-		events[7] |= 0x10;	/* Remote Host Supported</div><div class='del'>-					 * Features Notification</div><div class='del'>-					 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lmp_le_capable(hdev))</div><div class='del'>-		events[7] |= 0x20;	/* LE Meta-Event */</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_SET_EVENT_MASK, sizeof(events), events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_init2_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;dev_type == HCI_AMP)</div><div class='del'>-		return amp_init2(req);</div><div class='del'>-</div><div class='del'>-	if (lmp_bredr_capable(hdev))</div><div class='del'>-		bredr_setup(req);</div><div class='del'>-	else</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_BREDR_ENABLED);</div><div class='del'>-</div><div class='del'>-	if (lmp_le_capable(hdev))</div><div class='del'>-		le_setup(req);</div><div class='del'>-</div><div class='del'>-	/* All Bluetooth 1.2 and later controllers should support the</div><div class='del'>-	 * HCI command for reading the local supported commands.</div><div class='del'>-	 *</div><div class='del'>-	 * Unfortunately some controllers indicate Bluetooth 1.2 support,</div><div class='del'>-	 * but do not have support for this command. If that is the case,</div><div class='del'>-	 * the driver can quirk the behavior and skip reading the local</div><div class='del'>-	 * supported commands.</div><div class='del'>-	 */</div><div class='del'>-	if (hdev-&gt;hci_ver &gt; BLUETOOTH_VER_1_1 &amp;&amp;</div><div class='del'>-	    !test_bit(HCI_QUIRK_BROKEN_LOCAL_COMMANDS, &amp;hdev-&gt;quirks))</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);</div><div class='del'>-</div><div class='del'>-	if (lmp_ssp_capable(hdev)) {</div><div class='del'>-		/* When SSP is available, then the host features page</div><div class='del'>-		 * should also be available as well. However some</div><div class='del'>-		 * controllers list the max_page as 0 as long as SSP</div><div class='del'>-		 * has not been enabled. To achieve proper debugging</div><div class='del'>-		 * output, force the minimum max_page to 1 at least.</div><div class='del'>-		 */</div><div class='del'>-		hdev-&gt;max_page = 0x01;</div><div class='del'>-</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED)) {</div><div class='del'>-			u8 mode = 0x01;</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_WRITE_SSP_MODE,</div><div class='del'>-				    sizeof(mode), &amp;mode);</div><div class='del'>-		} else {</div><div class='del'>-			struct hci_cp_write_eir cp;</div><div class='del'>-</div><div class='del'>-			memset(hdev-&gt;eir, 0, sizeof(hdev-&gt;eir));</div><div class='del'>-			memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &amp;cp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lmp_inq_rssi_capable(hdev) ||</div><div class='del'>-	    test_bit(HCI_QUIRK_FIXUP_INQUIRY_MODE, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		u8 mode;</div><div class='del'>-</div><div class='del'>-		/* If Extended Inquiry Result events are supported, then</div><div class='del'>-		 * they are clearly preferred over Inquiry Result with RSSI</div><div class='del'>-		 * events.</div><div class='del'>-		 */</div><div class='del'>-		mode = lmp_ext_inq_capable(hdev) ? 0x02 : 0x01;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_INQUIRY_MODE, 1, &amp;mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lmp_inq_tx_pwr_capable(hdev))</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_INQ_RSP_TX_POWER, 0, NULL);</div><div class='del'>-</div><div class='del'>-	if (lmp_ext_feat_capable(hdev)) {</div><div class='del'>-		struct hci_cp_read_local_ext_features cp;</div><div class='del'>-</div><div class='del'>-		cp.page = 0x01;</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_LOCAL_EXT_FEATURES,</div><div class='del'>-			    sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LINK_SECURITY)) {</div><div class='del'>-		u8 enable = 1;</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_AUTH_ENABLE, sizeof(enable),</div><div class='del'>-			    &amp;enable);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_setup_link_policy(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_def_link_policy cp;</div><div class='del'>-	u16 link_policy = 0;</div><div class='del'>-</div><div class='del'>-	if (lmp_rswitch_capable(hdev))</div><div class='del'>-		link_policy |= HCI_LP_RSWITCH;</div><div class='del'>-	if (lmp_hold_capable(hdev))</div><div class='del'>-		link_policy |= HCI_LP_HOLD;</div><div class='del'>-	if (lmp_sniff_capable(hdev))</div><div class='del'>-		link_policy |= HCI_LP_SNIFF;</div><div class='del'>-	if (lmp_park_capable(hdev))</div><div class='del'>-		link_policy |= HCI_LP_PARK;</div><div class='del'>-</div><div class='del'>-	cp.policy = cpu_to_le16(link_policy);</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_DEF_LINK_POLICY, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_set_le_support(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_le_host_supported cp;</div><div class='del'>-</div><div class='del'>-	/* LE-only devices do not support explicit enablement */</div><div class='del'>-	if (!lmp_bredr_capable(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='del'>-		cp.le = 0x01;</div><div class='del'>-		cp.simul = 0x00;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cp.le != lmp_host_le_capable(hdev))</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(cp),</div><div class='del'>-			    &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_set_event_mask_page_2(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='del'>-	bool changed = false;</div><div class='del'>-</div><div class='del'>-	/* If Connectionless Slave Broadcast master role is supported</div><div class='del'>-	 * enable all necessary events for it.</div><div class='del'>-	 */</div><div class='del'>-	if (lmp_csb_master_capable(hdev)) {</div><div class='del'>-		events[1] |= 0x40;	/* Triggered Clock Capture */</div><div class='del'>-		events[1] |= 0x80;	/* Synchronization Train Complete */</div><div class='del'>-		events[2] |= 0x10;	/* Slave Page Response Timeout */</div><div class='del'>-		events[2] |= 0x20;	/* CSB Channel Map Change */</div><div class='del'>-		changed = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If Connectionless Slave Broadcast slave role is supported</div><div class='del'>-	 * enable all necessary events for it.</div><div class='del'>-	 */</div><div class='del'>-	if (lmp_csb_slave_capable(hdev)) {</div><div class='del'>-		events[2] |= 0x01;	/* Synchronization Train Received */</div><div class='del'>-		events[2] |= 0x02;	/* CSB Receive */</div><div class='del'>-		events[2] |= 0x04;	/* CSB Timeout */</div><div class='del'>-		events[2] |= 0x08;	/* Truncated Page Complete */</div><div class='del'>-		changed = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable Authenticated Payload Timeout Expired event if supported */</div><div class='del'>-	if (lmp_ping_capable(hdev) || hdev-&gt;le_features[0] &amp; HCI_LE_PING) {</div><div class='del'>-		events[2] |= 0x80;</div><div class='del'>-		changed = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Some Broadcom based controllers indicate support for Set Event</div><div class='del'>-	 * Mask Page 2 command, but then actually do not support it. Since</div><div class='del'>-	 * the default value is all bits set to zero, the command is only</div><div class='del'>-	 * required if the event mask has to be changed. In case no change</div><div class='del'>-	 * to the event mask is needed, skip this command.</div><div class='del'>-	 */</div><div class='del'>-	if (changed)</div><div class='del'>-		hci_req_add(req, HCI_OP_SET_EVENT_MASK_PAGE_2,</div><div class='del'>-			    sizeof(events), events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_init3_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 p;</div><div class='del'>-</div><div class='del'>-	hci_setup_event_mask(req);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;commands[6] &amp; 0x20 &amp;&amp;</div><div class='del'>-	    !test_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		struct hci_cp_read_stored_link_key cp;</div><div class='del'>-</div><div class='del'>-		bacpy(&amp;cp.bdaddr, BDADDR_ANY);</div><div class='del'>-		cp.read_all = 0x01;</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_STORED_LINK_KEY, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;commands[5] &amp; 0x10)</div><div class='del'>-		hci_setup_link_policy(req);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;commands[8] &amp; 0x01)</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_PAGE_SCAN_ACTIVITY, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Some older Broadcom based Bluetooth 1.2 controllers do not</div><div class='del'>-	 * support the Read Page Scan Type command. Check support for</div><div class='del'>-	 * this command in the bit mask of supported commands.</div><div class='del'>-	 */</div><div class='del'>-	if (hdev-&gt;commands[13] &amp; 0x01)</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_PAGE_SCAN_TYPE, 0, NULL);</div><div class='del'>-</div><div class='del'>-	if (lmp_le_capable(hdev)) {</div><div class='del'>-		u8 events[8];</div><div class='del'>-</div><div class='del'>-		memset(events, 0, sizeof(events));</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_ENCRYPTION)</div><div class='del'>-			events[0] |= 0x10;	/* LE Long Term Key Request */</div><div class='del'>-</div><div class='del'>-		/* If controller supports the Connection Parameters Request</div><div class='del'>-		 * Link Layer Procedure, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_CONN_PARAM_REQ_PROC)</div><div class='del'>-			events[0] |= 0x20;	/* LE Remote Connection</div><div class='del'>-						 * Parameter Request</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the Data Length Extension</div><div class='del'>-		 * feature, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT)</div><div class='del'>-			events[0] |= 0x40;	/* LE Data Length Change */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports Extended Scanner Filter</div><div class='del'>-		 * Policies, enable the correspondig event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_EXT_SCAN_POLICY)</div><div class='del'>-			events[1] |= 0x04;	/* LE Direct Advertising</div><div class='del'>-						 * Report</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports Channel Selection Algorithm #2</div><div class='del'>-		 * feature, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;le_features[1] &amp; HCI_LE_CHAN_SEL_ALG2)</div><div class='del'>-			events[2] |= 0x08;	/* LE Channel Selection</div><div class='del'>-						 * Algorithm</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Set Scan Enable command,</div><div class='del'>-		 * enable the corresponding advertising report event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[26] &amp; 0x08)</div><div class='del'>-			events[0] |= 0x02;	/* LE Advertising Report */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Create Connection</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[26] &amp; 0x10)</div><div class='del'>-			events[0] |= 0x01;	/* LE Connection Complete */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Connection Update</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[27] &amp; 0x04)</div><div class='del'>-			events[0] |= 0x04;	/* LE Connection Update</div><div class='del'>-						 * Complete</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Read Remote Used Features</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[27] &amp; 0x20)</div><div class='del'>-			events[0] |= 0x08;	/* LE Read Remote Used</div><div class='del'>-						 * Features Complete</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Read Local P-256</div><div class='del'>-		 * Public Key command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[34] &amp; 0x02)</div><div class='del'>-			events[0] |= 0x80;	/* LE Read Local P-256</div><div class='del'>-						 * Public Key Complete</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Generate DHKey</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[34] &amp; 0x04)</div><div class='del'>-			events[1] |= 0x01;	/* LE Generate DHKey Complete */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Set Default PHY or</div><div class='del'>-		 * LE Set PHY commands, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (hdev-&gt;commands[35] &amp; (0x20 | 0x40))</div><div class='del'>-			events[1] |= 0x08;        /* LE PHY Update Complete */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports LE Set Extended Scan Parameters</div><div class='del'>-		 * and LE Set Extended Scan Enable commands, enable the</div><div class='del'>-		 * corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (use_ext_scan(hdev))</div><div class='del'>-			events[1] |= 0x10;	/* LE Extended Advertising</div><div class='del'>-						 * Report</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Extended Create Connection</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (use_ext_conn(hdev))</div><div class='del'>-			events[1] |= 0x02;      /* LE Enhanced Connection</div><div class='del'>-						 * Complete</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		/* If the controller supports the LE Extended Advertising</div><div class='del'>-		 * command, enable the corresponding event.</div><div class='del'>-		 */</div><div class='del'>-		if (ext_adv_capable(hdev))</div><div class='del'>-			events[2] |= 0x02;	/* LE Advertising Set</div><div class='del'>-						 * Terminated</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EVENT_MASK, sizeof(events),</div><div class='del'>-			    events);</div><div class='del'>-</div><div class='del'>-		/* Read LE Advertising Channel TX Power */</div><div class='del'>-		if ((hdev-&gt;commands[25] &amp; 0x40) &amp;&amp; !ext_adv_capable(hdev)) {</div><div class='del'>-			/* HCI TS spec forbids mixing of legacy and extended</div><div class='del'>-			 * advertising commands wherein READ_ADV_TX_POWER is</div><div class='del'>-			 * also included. So do not call it if extended adv</div><div class='del'>-			 * is supported otherwise controller will return</div><div class='del'>-			 * COMMAND_DISALLOWED for extended commands.</div><div class='del'>-			 */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_ADV_TX_POWER, 0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;commands[26] &amp; 0x40) {</div><div class='del'>-			/* Read LE White List Size */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE,</div><div class='del'>-				    0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;commands[26] &amp; 0x80) {</div><div class='del'>-			/* Clear LE White List */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;commands[34] &amp; 0x40) {</div><div class='del'>-			/* Read LE Resolving List Size */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_RESOLV_LIST_SIZE,</div><div class='del'>-				    0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;commands[34] &amp; 0x20) {</div><div class='del'>-			/* Clear LE Resolving List */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_CLEAR_RESOLV_LIST, 0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT) {</div><div class='del'>-			/* Read LE Maximum Data Length */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_MAX_DATA_LEN, 0, NULL);</div><div class='del'>-</div><div class='del'>-			/* Read LE Suggested Default Data Length */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_DEF_DATA_LEN, 0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ext_adv_capable(hdev)) {</div><div class='del'>-			/* Read LE Number of Supported Advertising Sets */</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS,</div><div class='del'>-				    0, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hci_set_le_support(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read features beyond page 1 if available */</div><div class='del'>-	for (p = 2; p &lt; HCI_MAX_PAGES &amp;&amp; p &lt;= hdev-&gt;max_page; p++) {</div><div class='del'>-		struct hci_cp_read_local_ext_features cp;</div><div class='del'>-</div><div class='del'>-		cp.page = p;</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_LOCAL_EXT_FEATURES,</div><div class='del'>-			    sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_init4_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* Some Broadcom based Bluetooth controllers do not support the</div><div class='del'>-	 * Delete Stored Link Key command. They are clearly indicating its</div><div class='del'>-	 * absence in the bit mask of supported commands.</div><div class='del'>-	 *</div><div class='del'>-	 * Check the supported commands and only if the the command is marked</div><div class='del'>-	 * as supported send it. If not supported assume that the controller</div><div class='del'>-	 * does not have actual support for stored link keys which makes this</div><div class='del'>-	 * command redundant anyway.</div><div class='del'>-	 *</div><div class='del'>-	 * Some controllers indicate that they support handling deleting</div><div class='del'>-	 * stored link keys, but they don't. The quirk lets a driver</div><div class='del'>-	 * just disable this command.</div><div class='del'>-	 */</div><div class='del'>-	if (hdev-&gt;commands[6] &amp; 0x80 &amp;&amp;</div><div class='del'>-	    !test_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		struct hci_cp_delete_stored_link_key cp;</div><div class='del'>-</div><div class='del'>-		bacpy(&amp;cp.bdaddr, BDADDR_ANY);</div><div class='del'>-		cp.delete_all = 0x01;</div><div class='del'>-		hci_req_add(req, HCI_OP_DELETE_STORED_LINK_KEY,</div><div class='del'>-			    sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set event mask page 2 if the HCI command for it is supported */</div><div class='del'>-	if (hdev-&gt;commands[22] &amp; 0x04)</div><div class='del'>-		hci_set_event_mask_page_2(req);</div><div class='del'>-</div><div class='del'>-	/* Read local codec list if the HCI command is supported */</div><div class='del'>-	if (hdev-&gt;commands[29] &amp; 0x20)</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_LOCAL_CODECS, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Get MWS transport configuration if the HCI command is supported */</div><div class='del'>-	if (hdev-&gt;commands[30] &amp; 0x08)</div><div class='del'>-		hci_req_add(req, HCI_OP_GET_MWS_TRANSPORT_CONFIG, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Check for Synchronization Train support */</div><div class='del'>-	if (lmp_sync_train_capable(hdev))</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_SYNC_TRAIN_PARAMS, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Enable Secure Connections if supported and configured */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &amp;&amp;</div><div class='del'>-	    bredr_sc_enabled(hdev)) {</div><div class='del'>-		u8 support = 0x01;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_SC_SUPPORT,</div><div class='del'>-			    sizeof(support), &amp;support);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set Suggested Default Data Length to maximum if supported */</div><div class='del'>-	if (hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT) {</div><div class='del'>-		struct hci_cp_le_write_def_data_len cp;</div><div class='del'>-</div><div class='del'>-		cp.tx_len = hdev-&gt;le_max_tx_len;</div><div class='del'>-		cp.tx_time = hdev-&gt;le_max_tx_time;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_WRITE_DEF_DATA_LEN, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set Default PHY parameters if command is supported */</div><div class='del'>-	if (hdev-&gt;commands[35] &amp; 0x20) {</div><div class='del'>-		struct hci_cp_le_set_default_phy cp;</div><div class='del'>-</div><div class='del'>-		cp.all_phys = 0x00;</div><div class='del'>-		cp.tx_phys = hdev-&gt;le_tx_def_phys;</div><div class='del'>-		cp.rx_phys = hdev-&gt;le_rx_def_phys;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_DEFAULT_PHY, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __hci_init(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = __hci_req_sync(hdev, hci_init1_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SETUP))</div><div class='del'>-		hci_debugfs_create_basic(hdev);</div><div class='del'>-</div><div class='del'>-	err = __hci_req_sync(hdev, hci_init2_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* HCI_PRIMARY covers both single-mode LE, BR/EDR and dual-mode</div><div class='del'>-	 * BR/EDR/LE type controllers. AMP controllers only need the</div><div class='del'>-	 * first two stages of init.</div><div class='del'>-	 */</div><div class='del'>-	if (hdev-&gt;dev_type != HCI_PRIMARY)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = __hci_req_sync(hdev, hci_init3_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = __hci_req_sync(hdev, hci_init4_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* This function is only called when the controller is actually in</div><div class='del'>-	 * configured state. When the controller is marked as unconfigured,</div><div class='del'>-	 * this initialization procedure is not run.</div><div class='del'>-	 *</div><div class='del'>-	 * It means that it is possible that a controller runs through its</div><div class='del'>-	 * setup phase and then discovers missing settings. If that is the</div><div class='del'>-	 * case, then this function will not be called. It then will only</div><div class='del'>-	 * be called during the config phase.</div><div class='del'>-	 *</div><div class='del'>-	 * So only when in setup phase or config phase, create the debugfs</div><div class='del'>-	 * entries and register the SMP channels.</div><div class='del'>-	 */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='del'>-	    !hci_dev_test_flag(hdev, HCI_CONFIG))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hci_debugfs_create_common(hdev);</div><div class='del'>-</div><div class='del'>-	if (lmp_bredr_capable(hdev))</div><div class='del'>-		hci_debugfs_create_bredr(hdev);</div><div class='del'>-</div><div class='del'>-	if (lmp_le_capable(hdev))</div><div class='del'>-		hci_debugfs_create_le(hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_init0_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %ld", hdev-&gt;name, opt);</div><div class='del'>-</div><div class='del'>-	/* Reset */</div><div class='del'>-	if (!test_bit(HCI_QUIRK_RESET_ON_CLOSE, &amp;hdev-&gt;quirks))</div><div class='del'>-		hci_reset_req(req, 0);</div><div class='del'>-</div><div class='del'>-	/* Read Local Version */</div><div class='del'>-	hci_req_add(req, HCI_OP_READ_LOCAL_VERSION, 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Read BD Address */</div><div class='del'>-	if (hdev-&gt;set_bdaddr)</div><div class='del'>-		hci_req_add(req, HCI_OP_READ_BD_ADDR, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __hci_unconf_init(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = __hci_req_sync(hdev, hci_init0_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SETUP))</div><div class='del'>-		hci_debugfs_create_basic(hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_scan_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	__u8 scan = opt;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %x", req-&gt;hdev-&gt;name, scan);</div><div class='del'>-</div><div class='del'>-	/* Inquiry and Page scans */</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &amp;scan);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_auth_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	__u8 auth = opt;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %x", req-&gt;hdev-&gt;name, auth);</div><div class='del'>-</div><div class='del'>-	/* Authentication */</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_AUTH_ENABLE, 1, &amp;auth);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_encrypt_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	__u8 encrypt = opt;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %x", req-&gt;hdev-&gt;name, encrypt);</div><div class='del'>-</div><div class='del'>-	/* Encryption */</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_ENCRYPT_MODE, 1, &amp;encrypt);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hci_linkpol_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	__le16 policy = cpu_to_le16(opt);</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s %x", req-&gt;hdev-&gt;name, policy);</div><div class='del'>-</div><div class='del'>-	/* Default link policy */</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_DEF_LINK_POLICY, 2, &amp;policy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Get HCI device by index.</div><div class='ctx'>  * Device is held on return. */</div><div class='del'>-struct hci_dev *hci_dev_get(int index)</div><div class='add'>+static struct hci_dev *__hci_dev_get(int index, int *srcu_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = NULL, *d;</div><div class='ctx'> </div><div class='hunk'>@@ -1013,6 +77,8 @@ struct hci_dev *hci_dev_get(int index)</div><div class='ctx'> 	list_for_each_entry(d, &amp;hci_dev_list, list) {</div><div class='ctx'> 		if (d-&gt;id == index) {</div><div class='ctx'> 			hdev = hci_dev_hold(d);</div><div class='add'>+			if (srcu_index)</div><div class='add'>+				*srcu_index = srcu_read_lock(&amp;d-&gt;srcu);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1020,6 +86,22 @@ struct hci_dev *hci_dev_get(int index)</div><div class='ctx'> 	return hdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct hci_dev *hci_dev_get(int index)</div><div class='add'>+{</div><div class='add'>+	return __hci_dev_get(index, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hci_dev *hci_dev_get_srcu(int index, int *srcu_index)</div><div class='add'>+{</div><div class='add'>+	return __hci_dev_get(index, srcu_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_dev_put_srcu(struct hci_dev *hdev, int srcu_index)</div><div class='add'>+{</div><div class='add'>+	srcu_read_unlock(&amp;hdev-&gt;srcu, srcu_index);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ---- Inquiry support ---- */</div><div class='ctx'> </div><div class='ctx'> bool hci_discovery_active(struct hci_dev *hdev)</div><div class='hunk'>@@ -1040,8 +122,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)</div><div class='ctx'> {</div><div class='ctx'> 	int old_state = hdev-&gt;discovery.state;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s state %u -&gt; %u", hdev-&gt;name, hdev-&gt;discovery.state, state);</div><div class='del'>-</div><div class='ctx'> 	if (old_state == state)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,7 +129,7 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case DISCOVERY_STOPPED:</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 		if (old_state != DISCOVERY_STARTING)</div><div class='ctx'> 			mgmt_discovering(hdev, 0);</div><div class='hunk'>@@ -1064,6 +144,8 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)</div><div class='ctx'> 	case DISCOVERY_STOPPING:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "state %u -&gt; %u", old_state, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hci_inquiry_cache_flush(struct hci_dev *hdev)</div><div class='hunk'>@@ -1240,33 +322,12 @@ static int inquiry_cache_dump(struct hci_dev *hdev, int num, __u8 *buf)</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_inq_req(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_inquiry_req *ir = (struct hci_inquiry_req *) opt;</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_inquiry cp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Start Inquiry */</div><div class='del'>-	memcpy(&amp;cp.lap, &amp;ir-&gt;lap, 3);</div><div class='del'>-	cp.length  = ir-&gt;length;</div><div class='del'>-	cp.num_rsp = ir-&gt;num_rsp;</div><div class='del'>-	hci_req_add(req, HCI_OP_INQUIRY, sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int hci_inquiry(void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 __user *ptr = arg;</div><div class='ctx'> 	struct hci_inquiry_req ir;</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	int err = 0, do_inquiry = 0, max_rsp;</div><div class='del'>-	long timeo;</div><div class='ctx'> 	__u8 *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;ir, ptr, sizeof(ir)))</div><div class='hunk'>@@ -1286,13 +347,14 @@ int hci_inquiry(void __user *arg)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dev_type != HCI_PRIMARY) {</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='add'>+	/* Restrict maximum inquiry length to 60 seconds */</div><div class='add'>+	if (ir.length &gt; 60) {</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1304,11 +366,11 @@ int hci_inquiry(void __user *arg)</div><div class='ctx'> 	}</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	timeo = ir.length * msecs_to_jiffies(2000);</div><div class='del'>-</div><div class='ctx'> 	if (do_inquiry) {</div><div class='del'>-		err = hci_req_sync(hdev, hci_inq_req, (unsigned long) &amp;ir,</div><div class='del'>-				   timeo, NULL);</div><div class='add'>+		hci_req_sync_lock(hdev);</div><div class='add'>+		err = hci_inquiry_sync(hdev, ir.length, ir.num_rsp);</div><div class='add'>+		hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='hunk'>@@ -1316,8 +378,10 @@ int hci_inquiry(void __user *arg)</div><div class='ctx'> 		 * cleared). If it is interrupted by a signal, return -EINTR.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (wait_on_bit(&amp;hdev-&gt;flags, HCI_INQUIRY,</div><div class='del'>-				TASK_INTERRUPTIBLE))</div><div class='del'>-			return -EINTR;</div><div class='add'>+				TASK_INTERRUPTIBLE)) {</div><div class='add'>+			err = -EINTR;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* for unlimited number of responses we will use buffer with</div><div class='hunk'>@@ -1363,161 +427,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hci_req_sync_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='del'>-	    !hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='del'>-		/* Check for rfkill but allow the HCI setup stage to</div><div class='del'>-		 * proceed (which in itself doesn't cause any RF activity).</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_RFKILLED)) {</div><div class='del'>-			ret = -ERFKILL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check for valid public address or a configured static</div><div class='del'>-		 * random adddress, but let the HCI setup proceed to</div><div class='del'>-		 * be able to determine if there is a public address</div><div class='del'>-		 * or not.</div><div class='del'>-		 *</div><div class='del'>-		 * In case of user channel usage, it is not important</div><div class='del'>-		 * if a public address or static random address is</div><div class='del'>-		 * available.</div><div class='del'>-		 *</div><div class='del'>-		 * This check is only valid for BR/EDR controllers</div><div class='del'>-		 * since AMP controllers do not have an address.</div><div class='del'>-		 */</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='del'>-		    hdev-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-		    !bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='del'>-		    !bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY)) {</div><div class='del'>-			ret = -EADDRNOTAVAIL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-		ret = -EALREADY;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;open(hdev)) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='del'>-	hci_sock_dev_event(hdev, HCI_DEV_OPEN);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='del'>-	set_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='add'>+	ret = hci_dev_open_sync(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='del'>-	    test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		hci_sock_dev_event(hdev, HCI_DEV_SETUP);</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;setup)</div><div class='del'>-			ret = hdev-&gt;setup(hdev);</div><div class='del'>-</div><div class='del'>-		/* The transport driver can set these quirks before</div><div class='del'>-		 * creating the HCI device or in its setup callback.</div><div class='del'>-		 *</div><div class='del'>-		 * In case any of them is set, the controller has to</div><div class='del'>-		 * start up as unconfigured.</div><div class='del'>-		 */</div><div class='del'>-		if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks) ||</div><div class='del'>-		    test_bit(HCI_QUIRK_INVALID_BDADDR, &amp;hdev-&gt;quirks))</div><div class='del'>-			hci_dev_set_flag(hdev, HCI_UNCONFIGURED);</div><div class='del'>-</div><div class='del'>-		/* For an unconfigured controller it is required to</div><div class='del'>-		 * read at least the version information provided by</div><div class='del'>-		 * the Read Local Version Information command.</div><div class='del'>-		 *</div><div class='del'>-		 * If the set_bdaddr driver callback is provided, then</div><div class='del'>-		 * also the original Bluetooth public device address</div><div class='del'>-		 * will be read using the Read BD Address command.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='del'>-			ret = __hci_unconf_init(hdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='del'>-		/* If public address change is configured, ensure that</div><div class='del'>-		 * the address gets programmed. If the driver does not</div><div class='del'>-		 * support changing the public address, fail the power</div><div class='del'>-		 * on procedure.</div><div class='del'>-		 */</div><div class='del'>-		if (bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY) &amp;&amp;</div><div class='del'>-		    hdev-&gt;set_bdaddr)</div><div class='del'>-			ret = hdev-&gt;set_bdaddr(hdev, &amp;hdev-&gt;public_addr);</div><div class='del'>-		else</div><div class='del'>-			ret = -EADDRNOTAVAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED) &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='del'>-			ret = __hci_init(hdev);</div><div class='del'>-			if (!ret &amp;&amp; hdev-&gt;post_init)</div><div class='del'>-				ret = hdev-&gt;post_init(hdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the HCI Reset command is clearing all diagnostic settings,</div><div class='del'>-	 * then they need to be reprogrammed after the init procedure</div><div class='del'>-	 * completed.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='del'>-	    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_VENDOR_DIAG) &amp;&amp; hdev-&gt;set_diag)</div><div class='del'>-		ret = hdev-&gt;set_diag(hdev, true);</div><div class='del'>-</div><div class='del'>-	clear_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		hci_dev_hold(hdev);</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);</div><div class='del'>-		hci_adv_instances_set_rpa_expired(hdev, true);</div><div class='del'>-		set_bit(HCI_UP, &amp;hdev-&gt;flags);</div><div class='del'>-		hci_sock_dev_event(hdev, HCI_DEV_UP);</div><div class='del'>-		hci_leds_update_powered(hdev, true);</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(hdev, HCI_CONFIG) &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(hdev, HCI_UNCONFIGURED) &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp;</div><div class='del'>-		    hdev-&gt;dev_type == HCI_PRIMARY) {</div><div class='del'>-			ret = __hci_req_hci_power_on(hdev);</div><div class='del'>-			mgmt_power_on(hdev, ret);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Init failed, cleanup */</div><div class='del'>-		flush_work(&amp;hdev-&gt;tx_work);</div><div class='del'>-		flush_work(&amp;hdev-&gt;cmd_work);</div><div class='del'>-		flush_work(&amp;hdev-&gt;rx_work);</div><div class='del'>-</div><div class='del'>-		skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='del'>-		skb_queue_purge(&amp;hdev-&gt;rx_q);</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;flush)</div><div class='del'>-			hdev-&gt;flush(hdev);</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;sent_cmd) {</div><div class='del'>-			kfree_skb(hdev-&gt;sent_cmd);</div><div class='del'>-			hdev-&gt;sent_cmd = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clear_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='del'>-		hci_sock_dev_event(hdev, HCI_DEV_CLOSE);</div><div class='del'>-</div><div class='del'>-		hdev-&gt;close(hdev);</div><div class='del'>-		hdev-&gt;flags &amp;= BIT(HCI_RAW);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='ctx'> 	hci_req_sync_unlock(hdev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1579,147 +490,19 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-static void hci_pend_le_actions_clear(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn_params *p;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(p, &amp;hdev-&gt;le_conn_params, list) {</div><div class='del'>-		if (p-&gt;conn) {</div><div class='del'>-			hci_conn_drop(p-&gt;conn);</div><div class='del'>-			hci_conn_put(p-&gt;conn);</div><div class='del'>-			p-&gt;conn = NULL;</div><div class='del'>-		}</div><div class='del'>-		list_del_init(&amp;p-&gt;action);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BT_DBG("All LE pending actions cleared");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int hci_dev_do_close(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	bool auto_off;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s %p", hdev-&gt;name, hdev);</div><div class='ctx'> </div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &amp;&amp;</div><div class='del'>-	    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='del'>-	    test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-		/* Execute vendor specific shutdown routine */</div><div class='del'>-		if (hdev-&gt;shutdown)</div><div class='del'>-			hdev-&gt;shutdown(hdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-</div><div class='del'>-	hci_request_cancel_all(hdev);</div><div class='ctx'> 	hci_req_sync_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!test_and_clear_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-		cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='del'>-		hci_req_sync_unlock(hdev);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_leds_update_powered(hdev, false);</div><div class='del'>-</div><div class='del'>-	/* Flush RX and TX works */</div><div class='del'>-	flush_work(&amp;hdev-&gt;tx_work);</div><div class='del'>-	flush_work(&amp;hdev-&gt;rx_work);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;discov_timeout &gt; 0) {</div><div class='del'>-		hdev-&gt;discov_timeout = 0;</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_and_clear_flag(hdev, HCI_SERVICE_CACHE))</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;service_cache);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_MGMT)) {</div><div class='del'>-		struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-		cancel_delayed_work_sync(&amp;hdev-&gt;rpa_expired);</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(adv_instance, &amp;hdev-&gt;adv_instances, list)</div><div class='del'>-			cancel_delayed_work_sync(&amp;adv_instance-&gt;rpa_expired_cb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Avoid potential lockdep warnings from the *_flush() calls by</div><div class='del'>-	 * ensuring the workqueue is empty up front.</div><div class='del'>-	 */</div><div class='del'>-	drain_workqueue(hdev-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='del'>-</div><div class='del'>-	auto_off = hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF);</div><div class='del'>-</div><div class='del'>-	if (!auto_off &amp;&amp; hdev-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-	    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='del'>-		__mgmt_power_off(hdev);</div><div class='del'>-</div><div class='del'>-	hci_inquiry_cache_flush(hdev);</div><div class='del'>-	hci_pend_le_actions_clear(hdev);</div><div class='del'>-	hci_conn_hash_flush(hdev);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	smp_unregister(hdev);</div><div class='del'>-</div><div class='del'>-	hci_sock_dev_event(hdev, HCI_DEV_DOWN);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;flush)</div><div class='del'>-		hdev-&gt;flush(hdev);</div><div class='del'>-</div><div class='del'>-	/* Reset device */</div><div class='del'>-	skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='del'>-	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='del'>-	if (test_bit(HCI_QUIRK_RESET_ON_CLOSE, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='del'>-	    !auto_off &amp;&amp; !hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='del'>-		set_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='del'>-		__hci_req_sync(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT, NULL);</div><div class='del'>-		clear_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* flush cmd  work */</div><div class='del'>-	flush_work(&amp;hdev-&gt;cmd_work);</div><div class='del'>-</div><div class='del'>-	/* Drop queues */</div><div class='del'>-	skb_queue_purge(&amp;hdev-&gt;rx_q);</div><div class='del'>-	skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='del'>-	skb_queue_purge(&amp;hdev-&gt;raw_q);</div><div class='del'>-</div><div class='del'>-	/* Drop last sent command */</div><div class='del'>-	if (hdev-&gt;sent_cmd) {</div><div class='del'>-		cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='del'>-		kfree_skb(hdev-&gt;sent_cmd);</div><div class='del'>-		hdev-&gt;sent_cmd = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='del'>-	hci_sock_dev_event(hdev, HCI_DEV_CLOSE);</div><div class='del'>-</div><div class='del'>-	/* After this point our queues are empty</div><div class='del'>-	 * and no tasks are scheduled. */</div><div class='del'>-	hdev-&gt;close(hdev);</div><div class='del'>-</div><div class='del'>-	/* Clear flags */</div><div class='del'>-	hdev-&gt;flags &amp;= BIT(HCI_RAW);</div><div class='del'>-	hci_dev_clear_volatile_flags(hdev);</div><div class='del'>-</div><div class='del'>-	/* Controller radio is available but is currently powered down */</div><div class='del'>-	hdev-&gt;amp_status = AMP_STATUS_POWERED_DOWN;</div><div class='del'>-</div><div class='del'>-	memset(hdev-&gt;eir, 0, sizeof(hdev-&gt;eir));</div><div class='del'>-	memset(hdev-&gt;dev_class, 0, sizeof(hdev-&gt;dev_class));</div><div class='del'>-	bacpy(&amp;hdev-&gt;random_addr, BDADDR_ANY);</div><div class='add'>+	err = hci_dev_close_sync(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_req_sync_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hci_dev_close(__u16 dev)</div><div class='hunk'>@@ -1736,6 +519,7 @@ int hci_dev_close(__u16 dev)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;hdev-&gt;power_on);</div><div class='ctx'> 	if (hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF))</div><div class='ctx'> 		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='ctx'> </div><div class='hunk'>@@ -1758,6 +542,20 @@ static int hci_dev_do_reset(struct hci_dev *hdev)</div><div class='ctx'> 	skb_queue_purge(&amp;hdev-&gt;rx_q);</div><div class='ctx'> 	skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='ctx'> </div><div class='add'>+	/* Cancel these to avoid queueing non-chained pending work */</div><div class='add'>+	hci_dev_set_flag(hdev, HCI_CMD_DRAIN_WORKQUEUE);</div><div class='add'>+	/* Wait for</div><div class='add'>+	 *</div><div class='add'>+	 *    if (!hci_dev_test_flag(hdev, HCI_CMD_DRAIN_WORKQUEUE))</div><div class='add'>+	 *        queue_delayed_work(&amp;hdev-&gt;{cmd,ncmd}_timer)</div><div class='add'>+	 *</div><div class='add'>+	 * inside RCU section to see the flag or complete scheduling.</div><div class='add'>+	 */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	/* Explicitly cancel works in case scheduled after setting the flag. */</div><div class='add'>+	cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+	cancel_delayed_work(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+</div><div class='ctx'> 	/* Avoid potential lockdep warnings from the *_flush() calls by</div><div class='ctx'> 	 * ensuring the workqueue is empty up front.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1771,10 +569,15 @@ static int hci_dev_do_reset(struct hci_dev *hdev)</div><div class='ctx'> 	if (hdev-&gt;flush)</div><div class='ctx'> 		hdev-&gt;flush(hdev);</div><div class='ctx'> </div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_CMD_DRAIN_WORKQUEUE);</div><div class='add'>+</div><div class='ctx'> 	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='del'>-	hdev-&gt;acl_cnt = 0; hdev-&gt;sco_cnt = 0; hdev-&gt;le_cnt = 0;</div><div class='add'>+	hdev-&gt;acl_cnt = 0;</div><div class='add'>+	hdev-&gt;sco_cnt = 0;</div><div class='add'>+	hdev-&gt;le_cnt = 0;</div><div class='add'>+	hdev-&gt;iso_cnt = 0;</div><div class='ctx'> </div><div class='del'>-	ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+	ret = hci_reset_sync(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_req_sync_unlock(hdev);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1783,9 +586,9 @@ static int hci_dev_do_reset(struct hci_dev *hdev)</div><div class='ctx'> int hci_dev_reset(__u16 dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='del'>-	int err;</div><div class='add'>+	int err, srcu_index;</div><div class='ctx'> </div><div class='del'>-	hdev = hci_dev_get(dev);</div><div class='add'>+	hdev = hci_dev_get_srcu(dev, &amp;srcu_index);</div><div class='ctx'> 	if (!hdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -1807,7 +610,7 @@ int hci_dev_reset(__u16 dev)</div><div class='ctx'> 	err = hci_dev_do_reset(hdev);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	hci_dev_put(hdev);</div><div class='add'>+	hci_dev_put_srcu(hdev, srcu_index);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1837,7 +640,7 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_update_scan_state(struct hci_dev *hdev, u8 scan)</div><div class='add'>+static void hci_update_passive_scan_state(struct hci_dev *hdev, u8 scan)</div><div class='ctx'> {</div><div class='ctx'> 	bool conn_changed, discov_changed;</div><div class='ctx'> </div><div class='hunk'>@@ -1867,7 +670,7 @@ static void hci_update_scan_state(struct hci_dev *hdev, u8 scan)</div><div class='ctx'> 		hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 		if (hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='del'>-			hci_req_update_adv_data(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+			hci_update_adv_data(hdev, hdev-&gt;cur_adv_instance);</div><div class='ctx'> </div><div class='ctx'> 		mgmt_new_settings(hdev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1877,6 +680,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	struct hci_dev_req dr;</div><div class='add'>+	__le16 policy;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;dr, arg, sizeof(dr)))</div><div class='hunk'>@@ -1896,11 +700,6 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dev_type != HCI_PRIMARY) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -1908,8 +707,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case HCISETAUTH:</div><div class='del'>-		err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,</div><div class='del'>-				   HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,</div><div class='add'>+					  1, &amp;dr.dev_opt, HCI_CMD_TIMEOUT);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCISETENCRYPT:</div><div class='hunk'>@@ -1920,30 +719,34 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 		if (!test_bit(HCI_AUTH, &amp;hdev-&gt;flags)) {</div><div class='ctx'> 			/* Auth must be enabled first */</div><div class='del'>-			err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,</div><div class='del'>-					   HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+			err = hci_cmd_sync_status(hdev,</div><div class='add'>+						  HCI_OP_WRITE_AUTH_ENABLE,</div><div class='add'>+						  1, &amp;dr.dev_opt,</div><div class='add'>+						  HCI_CMD_TIMEOUT);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = hci_req_sync(hdev, hci_encrypt_req, dr.dev_opt,</div><div class='del'>-				   HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_ENCRYPT_MODE,</div><div class='add'>+					  1, &amp;dr.dev_opt, HCI_CMD_TIMEOUT);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCISETSCAN:</div><div class='del'>-		err = hci_req_sync(hdev, hci_scan_req, dr.dev_opt,</div><div class='del'>-				   HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,</div><div class='add'>+					  1, &amp;dr.dev_opt, HCI_CMD_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 		/* Ensure that the connectable and discoverable states</div><div class='ctx'> 		 * get correctly modified as this was a non-mgmt change.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!err)</div><div class='del'>-			hci_update_scan_state(hdev, dr.dev_opt);</div><div class='add'>+			hci_update_passive_scan_state(hdev, dr.dev_opt);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCISETLINKPOL:</div><div class='del'>-		err = hci_req_sync(hdev, hci_linkpol_req, dr.dev_opt,</div><div class='del'>-				   HCI_INIT_TIMEOUT, NULL);</div><div class='add'>+		policy = cpu_to_le16(dr.dev_opt);</div><div class='add'>+</div><div class='add'>+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,</div><div class='add'>+					  2, &amp;policy, HCI_CMD_TIMEOUT);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCISETLINKMODE:</div><div class='hunk'>@@ -1984,7 +787,7 @@ int hci_get_dev_list(void __user *arg)</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	struct hci_dev_list_req *dl;</div><div class='ctx'> 	struct hci_dev_req *dr;</div><div class='del'>-	int n = 0, size, err;</div><div class='add'>+	int n = 0, err;</div><div class='ctx'> 	__u16 dev_num;</div><div class='ctx'> </div><div class='ctx'> 	if (get_user(dev_num, (__u16 __user *) arg))</div><div class='hunk'>@@ -1993,12 +796,11 @@ int hci_get_dev_list(void __user *arg)</div><div class='ctx'> 	if (!dev_num || dev_num &gt; (PAGE_SIZE * 2) / sizeof(*dr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(*dl) + dev_num * sizeof(*dr);</div><div class='del'>-</div><div class='del'>-	dl = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	dl = kzalloc(struct_size(dl, dev_req, dev_num), GFP_KERNEL);</div><div class='ctx'> 	if (!dl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dl-&gt;dev_num = dev_num;</div><div class='ctx'> 	dr = dl-&gt;dev_req;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;hci_dev_list_lock);</div><div class='hunk'>@@ -2012,8 +814,8 @@ int hci_get_dev_list(void __user *arg)</div><div class='ctx'> 		if (hci_dev_test_flag(hdev, HCI_AUTO_OFF))</div><div class='ctx'> 			flags &amp;= ~BIT(HCI_UP);</div><div class='ctx'> </div><div class='del'>-		(dr + n)-&gt;dev_id  = hdev-&gt;id;</div><div class='del'>-		(dr + n)-&gt;dev_opt = flags;</div><div class='add'>+		dr[n].dev_id  = hdev-&gt;id;</div><div class='add'>+		dr[n].dev_opt = flags;</div><div class='ctx'> </div><div class='ctx'> 		if (++n &gt;= dev_num)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2021,9 +823,7 @@ int hci_get_dev_list(void __user *arg)</div><div class='ctx'> 	read_unlock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	dl-&gt;dev_num = n;</div><div class='del'>-	size = sizeof(*dl) + n * sizeof(*dr);</div><div class='del'>-</div><div class='del'>-	err = copy_to_user(arg, dl, size);</div><div class='add'>+	err = copy_to_user(arg, dl, struct_size(dl, dev_req, n));</div><div class='ctx'> 	kfree(dl);</div><div class='ctx'> </div><div class='ctx'> 	return err ? -EFAULT : 0;</div><div class='hunk'>@@ -2052,9 +852,9 @@ int hci_get_dev_info(void __user *arg)</div><div class='ctx'> 	else</div><div class='ctx'> 		flags = hdev-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	strcpy(di.name, hdev-&gt;name);</div><div class='add'>+	strscpy(di.name, hdev-&gt;name, sizeof(di.name));</div><div class='ctx'> 	di.bdaddr   = hdev-&gt;bdaddr;</div><div class='del'>-	di.type     = (hdev-&gt;bus &amp; 0x0f) | ((hdev-&gt;dev_type &amp; 0x03) &lt;&lt; 4);</div><div class='add'>+	di.type     = (hdev-&gt;bus &amp; 0x0f);</div><div class='ctx'> 	di.flags    = flags;</div><div class='ctx'> 	di.pkt_type = hdev-&gt;pkt_type;</div><div class='ctx'> 	if (lmp_bredr_capable(hdev)) {</div><div class='hunk'>@@ -2084,20 +884,51 @@ int hci_get_dev_info(void __user *arg)</div><div class='ctx'> </div><div class='ctx'> /* ---- Interface to HCI drivers ---- */</div><div class='ctx'> </div><div class='add'>+static int hci_dev_do_poweroff(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s %p", hdev-&gt;name, hdev);</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+</div><div class='add'>+	err = hci_set_powered_sync(hdev, false);</div><div class='add'>+</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hci_rfkill_set_block(void *data, bool blocked)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%p name %s blocked %d", hdev, hdev-&gt;name, blocked);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='add'>+	if (blocked == hci_dev_test_flag(hdev, HCI_RFKILLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (blocked) {</div><div class='ctx'> 		hci_dev_set_flag(hdev, HCI_RFKILLED);</div><div class='add'>+</div><div class='ctx'> 		if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(hdev, HCI_CONFIG))</div><div class='del'>-			hci_dev_do_close(hdev);</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='add'>+			err = hci_dev_do_poweroff(hdev);</div><div class='add'>+			if (err) {</div><div class='add'>+				bt_dev_err(hdev, "Error when powering off device on rfkill (%d)",</div><div class='add'>+					   err);</div><div class='add'>+</div><div class='add'>+				/* Make sure the device is still closed even if</div><div class='add'>+				 * anything during power off sequence (eg.</div><div class='add'>+				 * disconnecting devices) failed.</div><div class='add'>+				 */</div><div class='add'>+				hci_dev_do_close(hdev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_RFKILLED);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2120,9 +951,7 @@ static void hci_power_on(struct work_struct *work)</div><div class='ctx'> 	    hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp;</div><div class='ctx'> 	    hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF)) {</div><div class='ctx'> 		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-		hci_req_sync_lock(hdev);</div><div class='del'>-		err = __hci_req_hci_power_on(hdev);</div><div class='del'>-		hci_req_sync_unlock(hdev);</div><div class='add'>+		err = hci_powered_update_sync(hdev);</div><div class='ctx'> 		mgmt_power_on(hdev, err);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2141,8 +970,7 @@ static void hci_power_on(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_RFKILLED) ||</div><div class='ctx'> 	    hci_dev_test_flag(hdev, HCI_UNCONFIGURED) ||</div><div class='del'>-	    (hdev-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-	     !bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+	    (!bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='ctx'> 	     !bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY))) {</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_AUTO_OFF);</div><div class='ctx'> 		hci_dev_do_close(hdev);</div><div class='hunk'>@@ -2195,6 +1023,7 @@ static void hci_error_reset(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev, error_reset);</div><div class='ctx'> </div><div class='add'>+	hci_dev_hold(hdev);</div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;hw_error)</div><div class='hunk'>@@ -2202,10 +1031,10 @@ static void hci_error_reset(struct work_struct *work)</div><div class='ctx'> 	else</div><div class='ctx'> 		bt_dev_err(hdev, "hardware error 0x%2.2x", hdev-&gt;hw_error_code);</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_do_close(hdev))</div><div class='del'>-		return;</div><div class='add'>+	if (!hci_dev_do_close(hdev))</div><div class='add'>+		hci_dev_do_open(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_dev_do_open(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hci_uuids_clear(struct hci_dev *hdev)</div><div class='hunk'>@@ -2220,9 +1049,9 @@ void hci_uuids_clear(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> void hci_link_keys_clear(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct link_key *key;</div><div class='add'>+	struct link_key *key, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(key, &amp;hdev-&gt;link_keys, list) {</div><div class='add'>+	list_for_each_entry_safe(key, tmp, &amp;hdev-&gt;link_keys, list) {</div><div class='ctx'> 		list_del_rcu(&amp;key-&gt;list);</div><div class='ctx'> 		kfree_rcu(key, rcu);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2230,9 +1059,9 @@ void hci_link_keys_clear(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> void hci_smp_ltks_clear(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct smp_ltk *k;</div><div class='add'>+	struct smp_ltk *k, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(k, &amp;hdev-&gt;long_term_keys, list) {</div><div class='add'>+	list_for_each_entry_safe(k, tmp, &amp;hdev-&gt;long_term_keys, list) {</div><div class='ctx'> 		list_del_rcu(&amp;k-&gt;list);</div><div class='ctx'> 		kfree_rcu(k, rcu);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2240,14 +1069,41 @@ void hci_smp_ltks_clear(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> void hci_smp_irks_clear(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct smp_irk *k;</div><div class='add'>+	struct smp_irk *k, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(k, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='add'>+	list_for_each_entry_safe(k, tmp, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='ctx'> 		list_del_rcu(&amp;k-&gt;list);</div><div class='ctx'> 		kfree_rcu(k, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hci_blocked_keys_clear(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct blocked_key *b, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(b, tmp, &amp;hdev-&gt;blocked_keys, list) {</div><div class='add'>+		list_del_rcu(&amp;b-&gt;list);</div><div class='add'>+		kfree_rcu(b, rcu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hci_is_blocked_key(struct hci_dev *hdev, u8 type, u8 val[16])</div><div class='add'>+{</div><div class='add'>+	bool blocked = false;</div><div class='add'>+	struct blocked_key *b;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(b, &amp;hdev-&gt;blocked_keys, list) {</div><div class='add'>+		if (b-&gt;type == type &amp;&amp; !memcmp(b-&gt;val, val, sizeof(b-&gt;val))) {</div><div class='add'>+			blocked = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return blocked;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct link_key *k;</div><div class='hunk'>@@ -2256,6 +1112,16 @@ struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='ctx'> 	list_for_each_entry_rcu(k, &amp;hdev-&gt;link_keys, list) {</div><div class='ctx'> 		if (bacmp(bdaddr, &amp;k-&gt;bdaddr) == 0) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+			if (hci_is_blocked_key(hdev,</div><div class='add'>+					       HCI_BLOCKED_KEY_TYPE_LINKKEY,</div><div class='add'>+					       k-&gt;val)) {</div><div class='add'>+				bt_dev_warn_ratelimited(hdev,</div><div class='add'>+							"Link key blocked for %pMR",</div><div class='add'>+							&amp;k-&gt;bdaddr);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			return k;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2324,6 +1190,15 @@ struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> </div><div class='ctx'> 		if (smp_ltk_is_sc(k) || ltk_role(k-&gt;type) == role) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+			if (hci_is_blocked_key(hdev, HCI_BLOCKED_KEY_TYPE_LTK,</div><div class='add'>+					       k-&gt;val)) {</div><div class='add'>+				bt_dev_warn_ratelimited(hdev,</div><div class='add'>+							"LTK blocked for %pMR",</div><div class='add'>+							&amp;k-&gt;bdaddr);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			return k;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2334,31 +1209,42 @@ struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> </div><div class='ctx'> struct smp_irk *hci_find_irk_by_rpa(struct hci_dev *hdev, bdaddr_t *rpa)</div><div class='ctx'> {</div><div class='add'>+	struct smp_irk *irk_to_return = NULL;</div><div class='ctx'> 	struct smp_irk *irk;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(irk, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='ctx'> 		if (!bacmp(&amp;irk-&gt;rpa, rpa)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return irk;</div><div class='add'>+			irk_to_return = irk;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(irk, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='ctx'> 		if (smp_irk_matches(hdev, irk-&gt;val, rpa)) {</div><div class='ctx'> 			bacpy(&amp;irk-&gt;rpa, rpa);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return irk;</div><div class='add'>+			irk_to_return = irk;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (irk_to_return &amp;&amp; hci_is_blocked_key(hdev, HCI_BLOCKED_KEY_TYPE_IRK,</div><div class='add'>+						irk_to_return-&gt;val)) {</div><div class='add'>+		bt_dev_warn_ratelimited(hdev, "Identity key blocked for %pMR",</div><div class='add'>+					&amp;irk_to_return-&gt;bdaddr);</div><div class='add'>+		irk_to_return = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return irk_to_return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct smp_irk *hci_find_irk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 				     u8 addr_type)</div><div class='ctx'> {</div><div class='add'>+	struct smp_irk *irk_to_return = NULL;</div><div class='ctx'> 	struct smp_irk *irk;</div><div class='ctx'> </div><div class='ctx'> 	/* Identity Address must be public or static random */</div><div class='hunk'>@@ -2369,13 +1255,21 @@ struct smp_irk *hci_find_irk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 	list_for_each_entry_rcu(irk, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='ctx'> 		if (addr_type == irk-&gt;addr_type &amp;&amp;</div><div class='ctx'> 		    bacmp(bdaddr, &amp;irk-&gt;bdaddr) == 0) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return irk;</div><div class='add'>+			irk_to_return = irk;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (irk_to_return &amp;&amp; hci_is_blocked_key(hdev, HCI_BLOCKED_KEY_TYPE_IRK,</div><div class='add'>+						irk_to_return-&gt;val)) {</div><div class='add'>+		bt_dev_warn_ratelimited(hdev, "Identity key blocked for %pMR",</div><div class='add'>+					&amp;irk_to_return-&gt;bdaddr);</div><div class='add'>+		irk_to_return = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return irk_to_return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='hunk'>@@ -2495,10 +1389,10 @@ int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='ctx'> </div><div class='ctx'> int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type)</div><div class='ctx'> {</div><div class='del'>-	struct smp_ltk *k;</div><div class='add'>+	struct smp_ltk *k, *tmp;</div><div class='ctx'> 	int removed = 0;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(k, &amp;hdev-&gt;long_term_keys, list) {</div><div class='add'>+	list_for_each_entry_safe(k, tmp, &amp;hdev-&gt;long_term_keys, list) {</div><div class='ctx'> 		if (bacmp(bdaddr, &amp;k-&gt;bdaddr) || k-&gt;bdaddr_type != bdaddr_type)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2514,9 +1408,9 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type)</div><div class='ctx'> </div><div class='ctx'> void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type)</div><div class='ctx'> {</div><div class='del'>-	struct smp_irk *k;</div><div class='add'>+	struct smp_irk *k, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(k, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='add'>+	list_for_each_entry_safe(k, tmp, &amp;hdev-&gt;identity_resolving_keys, list) {</div><div class='ctx'> 		if (bacmp(bdaddr, &amp;k-&gt;bdaddr) || k-&gt;addr_type != addr_type)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2569,19 +1463,41 @@ static void hci_cmd_timeout(struct work_struct *work)</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='ctx'> 					    cmd_timer.work);</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;sent_cmd) {</div><div class='del'>-		struct hci_command_hdr *sent = (void *) hdev-&gt;sent_cmd-&gt;data;</div><div class='del'>-		u16 opcode = __le16_to_cpu(sent-&gt;opcode);</div><div class='add'>+	if (hdev-&gt;req_skb) {</div><div class='add'>+		u16 opcode = hci_skb_opcode(hdev-&gt;req_skb);</div><div class='ctx'> </div><div class='ctx'> 		bt_dev_err(hdev, "command 0x%4.4x tx timeout", opcode);</div><div class='add'>+</div><div class='add'>+		hci_cmd_sync_cancel_sync(hdev, ETIMEDOUT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bt_dev_err(hdev, "command tx timeout");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;reset)</div><div class='add'>+		hdev-&gt;reset(hdev);</div><div class='add'>+</div><div class='ctx'> 	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='ctx'> 	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* HCI ncmd timer function */</div><div class='add'>+static void hci_ncmd_timeout(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    ncmd_timer.work);</div><div class='add'>+</div><div class='add'>+	bt_dev_err(hdev, "Controller not accepting commands anymore: ncmd = 0");</div><div class='add'>+</div><div class='add'>+	/* During HCI_INIT phase no events can be injected if the ncmd timer</div><div class='add'>+	 * triggers since the procedure has its own timeout handling.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(HCI_INIT, &amp;hdev-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This is an irrecoverable state, inject hardware error event */</div><div class='add'>+	hci_reset_dev(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,</div><div class='ctx'> 					  bdaddr_t *bdaddr, u8 bdaddr_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -2685,6 +1601,19 @@ struct adv_info *hci_find_adv_instance(struct hci_dev *hdev, u8 instance)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+struct adv_info *hci_find_adv_sid(struct hci_dev *hdev, u8 sid)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(adv, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+		if (adv-&gt;sid == sid)</div><div class='add'>+			return adv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='ctx'> struct adv_info *hci_get_next_instance(struct hci_dev *hdev, u8 instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct adv_info *cur_instance;</div><div class='hunk'>@@ -2744,12 +1673,12 @@ void hci_adv_instances_clear(struct hci_dev *hdev)</div><div class='ctx'> 	struct adv_info *adv_instance, *n;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;adv_instance_timeout) {</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;adv_instance_expire);</div><div class='add'>+		disable_delayed_work(&amp;hdev-&gt;adv_instance_expire);</div><div class='ctx'> 		hdev-&gt;adv_instance_timeout = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(adv_instance, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='del'>-		cancel_delayed_work_sync(&amp;adv_instance-&gt;rpa_expired_cb);</div><div class='add'>+		disable_delayed_work_sync(&amp;adv_instance-&gt;rpa_expired_cb);</div><div class='ctx'> 		list_del(&amp;adv_instance-&gt;list);</div><div class='ctx'> 		kfree(adv_instance);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2769,63 +1698,353 @@ static void adv_instance_rpa_expired(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,</div><div class='del'>-			 u16 adv_data_len, u8 *adv_data,</div><div class='del'>-			 u16 scan_rsp_len, u8 *scan_rsp_data,</div><div class='del'>-			 u16 timeout, u16 duration)</div><div class='del'>-{</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-	if (adv_instance) {</div><div class='del'>-		memset(adv_instance-&gt;adv_data, 0,</div><div class='del'>-		       sizeof(adv_instance-&gt;adv_data));</div><div class='del'>-		memset(adv_instance-&gt;scan_rsp_data, 0,</div><div class='del'>-		       sizeof(adv_instance-&gt;scan_rsp_data));</div><div class='add'>+struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance,</div><div class='add'>+				      u32 flags, u16 adv_data_len, u8 *adv_data,</div><div class='add'>+				      u16 scan_rsp_len, u8 *scan_rsp_data,</div><div class='add'>+				      u16 timeout, u16 duration, s8 tx_power,</div><div class='add'>+				      u32 min_interval, u32 max_interval,</div><div class='add'>+				      u8 mesh_handle)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (adv) {</div><div class='add'>+		memset(adv-&gt;adv_data, 0, sizeof(adv-&gt;adv_data));</div><div class='add'>+		memset(adv-&gt;scan_rsp_data, 0, sizeof(adv-&gt;scan_rsp_data));</div><div class='add'>+		memset(adv-&gt;per_adv_data, 0, sizeof(adv-&gt;per_adv_data));</div><div class='ctx'> 	} else {</div><div class='del'>-		if (hdev-&gt;adv_instance_cnt &gt;= HCI_MAX_ADV_INSTANCES ||</div><div class='del'>-		    instance &lt; 1 || instance &gt; HCI_MAX_ADV_INSTANCES)</div><div class='del'>-			return -EOVERFLOW;</div><div class='add'>+		if (hdev-&gt;adv_instance_cnt &gt;= hdev-&gt;le_num_of_adv_sets ||</div><div class='add'>+		    instance &lt; 1 || instance &gt; hdev-&gt;le_num_of_adv_sets + 1)</div><div class='add'>+			return ERR_PTR(-EOVERFLOW);</div><div class='ctx'> </div><div class='del'>-		adv_instance = kzalloc(sizeof(*adv_instance), GFP_KERNEL);</div><div class='del'>-		if (!adv_instance)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		adv = kzalloc(sizeof(*adv), GFP_KERNEL);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+		adv-&gt;pending = true;</div><div class='add'>+		adv-&gt;instance = instance;</div><div class='add'>+</div><div class='add'>+		/* If controller support only one set and the instance is set to</div><div class='add'>+		 * 1 then there is no option other than using handle 0x00.</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;le_num_of_adv_sets == 1 &amp;&amp; instance == 1)</div><div class='add'>+			adv-&gt;handle = 0x00;</div><div class='add'>+		else</div><div class='add'>+			adv-&gt;handle = instance;</div><div class='ctx'> </div><div class='del'>-		adv_instance-&gt;pending = true;</div><div class='del'>-		adv_instance-&gt;instance = instance;</div><div class='del'>-		list_add(&amp;adv_instance-&gt;list, &amp;hdev-&gt;adv_instances);</div><div class='add'>+		list_add(&amp;adv-&gt;list, &amp;hdev-&gt;adv_instances);</div><div class='ctx'> 		hdev-&gt;adv_instance_cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adv_instance-&gt;flags = flags;</div><div class='del'>-	adv_instance-&gt;adv_data_len = adv_data_len;</div><div class='del'>-	adv_instance-&gt;scan_rsp_len = scan_rsp_len;</div><div class='del'>-</div><div class='del'>-	if (adv_data_len)</div><div class='del'>-		memcpy(adv_instance-&gt;adv_data, adv_data, adv_data_len);</div><div class='add'>+	adv-&gt;flags = flags;</div><div class='add'>+	adv-&gt;min_interval = min_interval;</div><div class='add'>+	adv-&gt;max_interval = max_interval;</div><div class='add'>+	adv-&gt;tx_power = tx_power;</div><div class='add'>+	/* Defining a mesh_handle changes the timing units to ms,</div><div class='add'>+	 * rather than seconds, and ties the instance to the requested</div><div class='add'>+	 * mesh_tx queue.</div><div class='add'>+	 */</div><div class='add'>+	adv-&gt;mesh = mesh_handle;</div><div class='ctx'> </div><div class='del'>-	if (scan_rsp_len)</div><div class='del'>-		memcpy(adv_instance-&gt;scan_rsp_data,</div><div class='del'>-		       scan_rsp_data, scan_rsp_len);</div><div class='add'>+	hci_set_adv_instance_data(hdev, instance, adv_data_len, adv_data,</div><div class='add'>+				  scan_rsp_len, scan_rsp_data);</div><div class='ctx'> </div><div class='del'>-	adv_instance-&gt;timeout = timeout;</div><div class='del'>-	adv_instance-&gt;remaining_time = timeout;</div><div class='add'>+	adv-&gt;timeout = timeout;</div><div class='add'>+	adv-&gt;remaining_time = timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (duration == 0)</div><div class='del'>-		adv_instance-&gt;duration = HCI_DEFAULT_ADV_DURATION;</div><div class='add'>+		adv-&gt;duration = hdev-&gt;def_multi_adv_rotation_duration;</div><div class='ctx'> 	else</div><div class='del'>-		adv_instance-&gt;duration = duration;</div><div class='del'>-</div><div class='del'>-	adv_instance-&gt;tx_power = HCI_TX_POWER_INVALID;</div><div class='add'>+		adv-&gt;duration = duration;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;adv_instance-&gt;rpa_expired_cb,</div><div class='del'>-			  adv_instance_rpa_expired);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;adv-&gt;rpa_expired_cb, adv_instance_rpa_expired);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s for %dMR", hdev-&gt;name, instance);</div><div class='ctx'> </div><div class='add'>+	return adv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+struct adv_info *hci_add_per_instance(struct hci_dev *hdev, u8 instance, u8 sid,</div><div class='add'>+				      u32 flags, u8 data_len, u8 *data,</div><div class='add'>+				      u32 min_interval, u32 max_interval)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	adv = hci_add_adv_instance(hdev, instance, flags, 0, NULL, 0, NULL,</div><div class='add'>+				   0, 0, HCI_ADV_TX_POWER_NO_PREFERENCE,</div><div class='add'>+				   min_interval, max_interval, 0);</div><div class='add'>+	if (IS_ERR(adv))</div><div class='add'>+		return adv;</div><div class='add'>+</div><div class='add'>+	adv-&gt;sid = sid;</div><div class='add'>+	adv-&gt;periodic = true;</div><div class='add'>+	adv-&gt;per_adv_data_len = data_len;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		memcpy(adv-&gt;per_adv_data, data, data_len);</div><div class='add'>+</div><div class='add'>+	return adv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+int hci_set_adv_instance_data(struct hci_dev *hdev, u8 instance,</div><div class='add'>+			      u16 adv_data_len, u8 *adv_data,</div><div class='add'>+			      u16 scan_rsp_len, u8 *scan_rsp_data)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+	/* If advertisement doesn't exist, we can't modify its data */</div><div class='add'>+	if (!adv)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (adv_data_len &amp;&amp; ADV_DATA_CMP(adv, adv_data, adv_data_len)) {</div><div class='add'>+		memset(adv-&gt;adv_data, 0, sizeof(adv-&gt;adv_data));</div><div class='add'>+		memcpy(adv-&gt;adv_data, adv_data, adv_data_len);</div><div class='add'>+		adv-&gt;adv_data_len = adv_data_len;</div><div class='add'>+		adv-&gt;adv_data_changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_rsp_len &amp;&amp; SCAN_RSP_CMP(adv, scan_rsp_data, scan_rsp_len)) {</div><div class='add'>+		memset(adv-&gt;scan_rsp_data, 0, sizeof(adv-&gt;scan_rsp_data));</div><div class='add'>+		memcpy(adv-&gt;scan_rsp_data, scan_rsp_data, scan_rsp_len);</div><div class='add'>+		adv-&gt;scan_rsp_len = scan_rsp_len;</div><div class='add'>+		adv-&gt;scan_rsp_changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark as changed if there are flags which would affect it */</div><div class='add'>+	if (((adv-&gt;flags &amp; MGMT_ADV_FLAG_APPEARANCE) &amp;&amp; hdev-&gt;appearance) ||</div><div class='add'>+	    adv-&gt;flags &amp; MGMT_ADV_FLAG_LOCAL_NAME)</div><div class='add'>+		adv-&gt;scan_rsp_changed = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+u32 hci_adv_instance_flags(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	u32 flags;</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	if (instance == 0x00) {</div><div class='add'>+		/* Instance 0 always manages the "Tx Power" and "Flags"</div><div class='add'>+		 * fields</div><div class='add'>+		 */</div><div class='add'>+		flags = MGMT_ADV_FLAG_TX_POWER | MGMT_ADV_FLAG_MANAGED_FLAGS;</div><div class='add'>+</div><div class='add'>+		/* For instance 0, the HCI_ADVERTISING_CONNECTABLE setting</div><div class='add'>+		 * corresponds to the "connectable" instance flag.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_ADVERTISING_CONNECTABLE))</div><div class='add'>+			flags |= MGMT_ADV_FLAG_CONNECTABLE;</div><div class='add'>+</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE))</div><div class='add'>+			flags |= MGMT_ADV_FLAG_LIMITED_DISCOV;</div><div class='add'>+		else if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='add'>+			flags |= MGMT_ADV_FLAG_DISCOV;</div><div class='add'>+</div><div class='add'>+		return flags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+	/* Return 0 when we got an invalid instance identifier. */</div><div class='add'>+	if (!adv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return adv-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hci_adv_instance_is_scannable(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	/* Instance 0x00 always set local name */</div><div class='add'>+	if (instance == 0x00)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (!adv)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (adv-&gt;flags &amp; MGMT_ADV_FLAG_APPEARANCE ||</div><div class='add'>+	    adv-&gt;flags &amp; MGMT_ADV_FLAG_LOCAL_NAME)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return adv-&gt;scan_rsp_len ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+void hci_adv_monitors_clear(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+	int handle;</div><div class='add'>+</div><div class='add'>+	idr_for_each_entry(&amp;hdev-&gt;adv_monitors_idr, monitor, handle)</div><div class='add'>+		hci_free_adv_monitor(hdev, monitor);</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;hdev-&gt;adv_monitors_idr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Frees the monitor structure and do some bookkeepings.</div><div class='add'>+ * This function requires the caller holds hdev-&gt;lock.</div><div class='add'>+ */</div><div class='add'>+void hci_free_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct adv_pattern *pattern;</div><div class='add'>+	struct adv_pattern *tmp;</div><div class='add'>+</div><div class='add'>+	if (!monitor)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(pattern, tmp, &amp;monitor-&gt;patterns, list) {</div><div class='add'>+		list_del(&amp;pattern-&gt;list);</div><div class='add'>+		kfree(pattern);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (monitor-&gt;handle)</div><div class='add'>+		idr_remove(&amp;hdev-&gt;adv_monitors_idr, monitor-&gt;handle);</div><div class='add'>+</div><div class='add'>+	if (monitor-&gt;state != ADV_MONITOR_STATE_NOT_REGISTERED)</div><div class='add'>+		hdev-&gt;adv_monitors_cnt--;</div><div class='add'>+</div><div class='add'>+	kfree(monitor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assigns handle to a monitor, and if offloading is supported and power is on,</div><div class='add'>+ * also attempts to forward the request to the controller.</div><div class='add'>+ * This function requires the caller holds hci_req_sync_lock.</div><div class='add'>+ */</div><div class='add'>+int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	int min, max, handle;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (!monitor)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	min = HCI_MIN_ADV_MONITOR_HANDLE;</div><div class='add'>+	max = HCI_MIN_ADV_MONITOR_HANDLE + HCI_MAX_ADV_MONITOR_NUM_HANDLES;</div><div class='add'>+	handle = idr_alloc(&amp;hdev-&gt;adv_monitors_idr, monitor, min, max,</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (handle &lt; 0)</div><div class='add'>+		return handle;</div><div class='add'>+</div><div class='add'>+	monitor-&gt;handle = handle;</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	switch (hci_get_adv_monitor_offload_ext(hdev)) {</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_NONE:</div><div class='add'>+		bt_dev_dbg(hdev, "add monitor %d status %d",</div><div class='add'>+			   monitor-&gt;handle, status);</div><div class='add'>+		/* Message was not forwarded to controller - not an error */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_MSFT:</div><div class='add'>+		status = msft_add_monitor_pattern(hdev, monitor);</div><div class='add'>+		bt_dev_dbg(hdev, "add monitor %d msft status %d",</div><div class='add'>+			   handle, status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Attempts to tell the controller and free the monitor. If somehow the</div><div class='add'>+ * controller doesn't have a corresponding handle, remove anyway.</div><div class='add'>+ * This function requires the caller holds hci_req_sync_lock.</div><div class='add'>+ */</div><div class='add'>+static int hci_remove_adv_monitor(struct hci_dev *hdev,</div><div class='add'>+				  struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	int handle;</div><div class='add'>+</div><div class='add'>+	switch (hci_get_adv_monitor_offload_ext(hdev)) {</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_NONE: /* also goes here when powered off */</div><div class='add'>+		bt_dev_dbg(hdev, "remove monitor %d status %d",</div><div class='add'>+			   monitor-&gt;handle, status);</div><div class='add'>+		goto free_monitor;</div><div class='add'>+</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_MSFT:</div><div class='add'>+		handle = monitor-&gt;handle;</div><div class='add'>+		status = msft_remove_monitor(hdev, monitor);</div><div class='add'>+		bt_dev_dbg(hdev, "remove monitor %d msft status %d",</div><div class='add'>+			   handle, status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case no matching handle registered, just free the monitor */</div><div class='add'>+	if (status == -ENOENT)</div><div class='add'>+		goto free_monitor;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='add'>+free_monitor:</div><div class='add'>+	if (status == -ENOENT)</div><div class='add'>+		bt_dev_warn(hdev, "Removing monitor with no matching handle %d",</div><div class='add'>+			    monitor-&gt;handle);</div><div class='add'>+	hci_free_adv_monitor(hdev, monitor);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int hci_remove_single_adv_monitor(struct hci_dev *hdev, u16 handle)</div><div class='add'>+{</div><div class='add'>+	struct adv_monitor *monitor = idr_find(&amp;hdev-&gt;adv_monitors_idr, handle);</div><div class='add'>+</div><div class='add'>+	if (!monitor)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return hci_remove_adv_monitor(hdev, monitor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int hci_remove_all_adv_monitor(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+	int idr_next_id = 0;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		monitor = idr_get_next(&amp;hdev-&gt;adv_monitors_idr, &amp;idr_next_id);</div><div class='add'>+		if (!monitor)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		status = hci_remove_adv_monitor(hdev, monitor);</div><div class='add'>+		if (status)</div><div class='add'>+			return status;</div><div class='add'>+</div><div class='add'>+		idr_next_id++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+bool hci_is_adv_monitoring(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return !idr_is_empty(&amp;hdev-&gt;adv_monitors_idr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_get_adv_monitor_offload_ext(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (msft_monitor_supported(hdev))</div><div class='add'>+		return HCI_ADV_MONITOR_EXT_MSFT;</div><div class='add'>+</div><div class='add'>+	return HCI_ADV_MONITOR_EXT_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bdaddr_list *hci_bdaddr_list_lookup(struct list_head *bdaddr_list,</div><div class='ctx'> 					 bdaddr_t *bdaddr, u8 type)</div><div class='ctx'> {</div><div class='hunk'>@@ -2839,6 +2058,34 @@ struct bdaddr_list *hci_bdaddr_list_lookup(struct list_head *bdaddr_list,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct bdaddr_list_with_irk *hci_bdaddr_list_lookup_with_irk(</div><div class='add'>+				struct list_head *bdaddr_list, bdaddr_t *bdaddr,</div><div class='add'>+				u8 type)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_irk *b;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(b, bdaddr_list, list) {</div><div class='add'>+		if (!bacmp(&amp;b-&gt;bdaddr, bdaddr) &amp;&amp; b-&gt;bdaddr_type == type)</div><div class='add'>+			return b;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bdaddr_list_with_flags *</div><div class='add'>+hci_bdaddr_list_lookup_with_flags(struct list_head *bdaddr_list,</div><div class='add'>+				  bdaddr_t *bdaddr, u8 type)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_flags *b;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(b, bdaddr_list, list) {</div><div class='add'>+		if (!bacmp(&amp;b-&gt;bdaddr, bdaddr) &amp;&amp; b-&gt;bdaddr_type == type)</div><div class='add'>+			return b;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hci_bdaddr_list_clear(struct list_head *bdaddr_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct bdaddr_list *b, *n;</div><div class='hunk'>@@ -2871,6 +2118,59 @@ int hci_bdaddr_list_add(struct list_head *list, bdaddr_t *bdaddr, u8 type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hci_bdaddr_list_add_with_irk(struct list_head *list, bdaddr_t *bdaddr,</div><div class='add'>+					u8 type, u8 *peer_irk, u8 *local_irk)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_irk *entry;</div><div class='add'>+</div><div class='add'>+	if (!bacmp(bdaddr, BDADDR_ANY))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	if (hci_bdaddr_list_lookup(list, bdaddr, type))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;entry-&gt;bdaddr, bdaddr);</div><div class='add'>+	entry-&gt;bdaddr_type = type;</div><div class='add'>+</div><div class='add'>+	if (peer_irk)</div><div class='add'>+		memcpy(entry-&gt;peer_irk, peer_irk, 16);</div><div class='add'>+</div><div class='add'>+	if (local_irk)</div><div class='add'>+		memcpy(entry-&gt;local_irk, local_irk, 16);</div><div class='add'>+</div><div class='add'>+	list_add(&amp;entry-&gt;list, list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_bdaddr_list_add_with_flags(struct list_head *list, bdaddr_t *bdaddr,</div><div class='add'>+				   u8 type, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_flags *entry;</div><div class='add'>+</div><div class='add'>+	if (!bacmp(bdaddr, BDADDR_ANY))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	if (hci_bdaddr_list_lookup(list, bdaddr, type))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;entry-&gt;bdaddr, bdaddr);</div><div class='add'>+	entry-&gt;bdaddr_type = type;</div><div class='add'>+	entry-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;entry-&gt;list, list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct bdaddr_list *entry;</div><div class='hunk'>@@ -2890,6 +2190,26 @@ int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hci_bdaddr_list_del_with_irk(struct list_head *list, bdaddr_t *bdaddr,</div><div class='add'>+							u8 type)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_irk *entry;</div><div class='add'>+</div><div class='add'>+	if (!bacmp(bdaddr, BDADDR_ANY)) {</div><div class='add'>+		hci_bdaddr_list_clear(list);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = hci_bdaddr_list_lookup_with_irk(list, bdaddr, type);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+	kfree(entry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='ctx'> struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,</div><div class='ctx'> 					       bdaddr_t *addr, u8 addr_type)</div><div class='hunk'>@@ -2906,22 +2226,46 @@ struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock or rcu_read_lock */</div><div class='ctx'> struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,</div><div class='ctx'> 						  bdaddr_t *addr, u8 addr_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn_params *param;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(param, list, action) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(param, list, action) {</div><div class='ctx'> 		if (bacmp(&amp;param-&gt;addr, addr) == 0 &amp;&amp;</div><div class='del'>-		    param-&gt;addr_type == addr_type)</div><div class='add'>+		    param-&gt;addr_type == addr_type) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return param;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+void hci_pend_le_list_del_init(struct hci_conn_params *param)</div><div class='add'>+{</div><div class='add'>+	if (list_empty(&amp;param-&gt;action))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del_rcu(&amp;param-&gt;action);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	INIT_LIST_HEAD(&amp;param-&gt;action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+void hci_pend_le_list_add(struct hci_conn_params *param,</div><div class='add'>+			  struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	list_add_rcu(&amp;param-&gt;action, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='ctx'> struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,</div><div class='ctx'> 					    bdaddr_t *addr, u8 addr_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -2954,14 +2298,15 @@ struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,</div><div class='ctx'> 	return params;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_conn_params_free(struct hci_conn_params *params)</div><div class='add'>+void hci_conn_params_free(struct hci_conn_params *params)</div><div class='ctx'> {</div><div class='add'>+	hci_pend_le_list_del_init(params);</div><div class='add'>+</div><div class='ctx'> 	if (params-&gt;conn) {</div><div class='ctx'> 		hci_conn_drop(params-&gt;conn);</div><div class='ctx'> 		hci_conn_put(params-&gt;conn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;params-&gt;action);</div><div class='ctx'> 	list_del(&amp;params-&gt;list);</div><div class='ctx'> 	kfree(params);</div><div class='ctx'> }</div><div class='hunk'>@@ -2977,7 +2322,7 @@ void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type)</div><div class='ctx'> </div><div class='ctx'> 	hci_conn_params_free(params);</div><div class='ctx'> </div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='add'>+	hci_update_passive_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("addr %pMR (type %u)", addr, addr_type);</div><div class='ctx'> }</div><div class='hunk'>@@ -2991,7 +2336,7 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev)</div><div class='ctx'> 		if (params-&gt;auto_connect != HCI_AUTO_CONN_DISABLED)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* If trying to estabilish one time connection to disabled</div><div class='add'>+		/* If trying to establish one time connection to disabled</div><div class='ctx'> 		 * device, leave the params, but mark them as just once.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (params-&gt;explicit_connect) {</div><div class='hunk'>@@ -2999,8 +2344,7 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;params-&gt;list);</div><div class='del'>-		kfree(params);</div><div class='add'>+		hci_conn_params_free(params);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("All LE disabled connection parameters were removed");</div><div class='hunk'>@@ -3045,15 +2389,71 @@ void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hci_clear_wake_reason(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;wake_reason = 0;</div><div class='add'>+	bacpy(&amp;hdev-&gt;wake_addr, BDADDR_ANY);</div><div class='add'>+	hdev-&gt;wake_addr_type = 0;</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,</div><div class='add'>+				void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev =</div><div class='add'>+		container_of(nb, struct hci_dev, suspend_notifier);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Userspace has full control of this device. Do nothing. */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/* To avoid a potential race with hci_unregister_dev. */</div><div class='add'>+	hci_dev_hold(hdev);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case PM_HIBERNATION_PREPARE:</div><div class='add'>+	case PM_SUSPEND_PREPARE:</div><div class='add'>+		ret = hci_suspend_dev(hdev);</div><div class='add'>+		break;</div><div class='add'>+	case PM_POST_HIBERNATION:</div><div class='add'>+	case PM_POST_SUSPEND:</div><div class='add'>+		ret = hci_resume_dev(hdev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		bt_dev_err(hdev, "Suspend notifier action (%lu) failed: %d",</div><div class='add'>+			   action, ret);</div><div class='add'>+</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Alloc HCI device */</div><div class='del'>-struct hci_dev *hci_alloc_dev(void)</div><div class='add'>+struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='add'>+	unsigned int alloc_size;</div><div class='ctx'> </div><div class='del'>-	hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);</div><div class='add'>+	alloc_size = sizeof(*hdev);</div><div class='add'>+	if (sizeof_priv) {</div><div class='add'>+		/* Fixme: May need ALIGN-ment? */</div><div class='add'>+		alloc_size += sizeof_priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev = kzalloc(alloc_size, GFP_KERNEL);</div><div class='ctx'> 	if (!hdev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (init_srcu_struct(&amp;hdev-&gt;srcu)) {</div><div class='add'>+		kfree(hdev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hdev-&gt;pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);</div><div class='ctx'> 	hdev-&gt;esco_type = (ESCO_HV1);</div><div class='ctx'> 	hdev-&gt;link_mode = (HCI_LM_ACCEPT);</div><div class='hunk'>@@ -3066,14 +2466,26 @@ struct hci_dev *hci_alloc_dev(void)</div><div class='ctx'> 	hdev-&gt;cur_adv_instance = 0x00;</div><div class='ctx'> 	hdev-&gt;adv_instance_timeout = 0;</div><div class='ctx'> </div><div class='add'>+	hdev-&gt;advmon_allowlist_duration = 300;</div><div class='add'>+	hdev-&gt;advmon_no_filter_duration = 500;</div><div class='add'>+	hdev-&gt;enable_advmon_interleave_scan = 0x00;	/* Default to disable */</div><div class='add'>+</div><div class='ctx'> 	hdev-&gt;sniff_max_interval = 800;</div><div class='ctx'> 	hdev-&gt;sniff_min_interval = 80;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_adv_channel_map = 0x07;</div><div class='ctx'> 	hdev-&gt;le_adv_min_interval = 0x0800;</div><div class='ctx'> 	hdev-&gt;le_adv_max_interval = 0x0800;</div><div class='del'>-	hdev-&gt;le_scan_interval = 0x0060;</div><div class='del'>-	hdev-&gt;le_scan_window = 0x0030;</div><div class='add'>+	hdev-&gt;le_scan_interval = DISCOV_LE_SCAN_INT_FAST;</div><div class='add'>+	hdev-&gt;le_scan_window = DISCOV_LE_SCAN_WIN_FAST;</div><div class='add'>+	hdev-&gt;le_scan_int_suspend = DISCOV_LE_SCAN_INT_SLOW1;</div><div class='add'>+	hdev-&gt;le_scan_window_suspend = DISCOV_LE_SCAN_WIN_SLOW1;</div><div class='add'>+	hdev-&gt;le_scan_int_discovery = DISCOV_LE_SCAN_INT;</div><div class='add'>+	hdev-&gt;le_scan_window_discovery = DISCOV_LE_SCAN_WIN;</div><div class='add'>+	hdev-&gt;le_scan_int_adv_monitor = DISCOV_LE_SCAN_INT_FAST;</div><div class='add'>+	hdev-&gt;le_scan_window_adv_monitor = DISCOV_LE_SCAN_WIN_FAST;</div><div class='add'>+	hdev-&gt;le_scan_int_connect = DISCOV_LE_SCAN_INT_CONN;</div><div class='add'>+	hdev-&gt;le_scan_window_connect = DISCOV_LE_SCAN_WIN_CONN;</div><div class='ctx'> 	hdev-&gt;le_conn_min_interval = 0x0018;</div><div class='ctx'> 	hdev-&gt;le_conn_max_interval = 0x0028;</div><div class='ctx'> 	hdev-&gt;le_conn_latency = 0x0000;</div><div class='hunk'>@@ -3084,39 +2496,62 @@ struct hci_dev *hci_alloc_dev(void)</div><div class='ctx'> 	hdev-&gt;le_max_tx_time = 0x0148;</div><div class='ctx'> 	hdev-&gt;le_max_rx_len = 0x001b;</div><div class='ctx'> 	hdev-&gt;le_max_rx_time = 0x0148;</div><div class='add'>+	hdev-&gt;le_max_key_size = SMP_MAX_ENC_KEY_SIZE;</div><div class='add'>+	hdev-&gt;le_min_key_size = SMP_MIN_ENC_KEY_SIZE;</div><div class='ctx'> 	hdev-&gt;le_tx_def_phys = HCI_LE_SET_PHY_1M;</div><div class='ctx'> 	hdev-&gt;le_rx_def_phys = HCI_LE_SET_PHY_1M;</div><div class='add'>+	hdev-&gt;le_num_of_adv_sets = HCI_MAX_ADV_INSTANCES;</div><div class='add'>+	hdev-&gt;def_multi_adv_rotation_duration = HCI_DEFAULT_ADV_DURATION;</div><div class='add'>+	hdev-&gt;def_le_autoconnect_timeout = HCI_LE_CONN_TIMEOUT;</div><div class='add'>+	hdev-&gt;min_le_tx_power = HCI_TX_POWER_INVALID;</div><div class='add'>+	hdev-&gt;max_le_tx_power = HCI_TX_POWER_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;rpa_timeout = HCI_DEFAULT_RPA_TIMEOUT;</div><div class='ctx'> 	hdev-&gt;discov_interleaved_timeout = DISCOV_INTERLEAVED_TIMEOUT;</div><div class='ctx'> 	hdev-&gt;conn_info_min_age = DEFAULT_CONN_INFO_MIN_AGE;</div><div class='ctx'> 	hdev-&gt;conn_info_max_age = DEFAULT_CONN_INFO_MAX_AGE;</div><div class='add'>+	hdev-&gt;auth_payload_timeout = DEFAULT_AUTH_PAYLOAD_TIMEOUT;</div><div class='add'>+	hdev-&gt;min_enc_key_size = HCI_MIN_ENC_KEY_SIZE;</div><div class='add'>+</div><div class='add'>+	/* default 1.28 sec page scan */</div><div class='add'>+	hdev-&gt;def_page_scan_type = PAGE_SCAN_TYPE_STANDARD;</div><div class='add'>+	hdev-&gt;def_page_scan_int = 0x0800;</div><div class='add'>+	hdev-&gt;def_page_scan_window = 0x0012;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;hdev-&gt;lock);</div><div class='ctx'> 	mutex_init(&amp;hdev-&gt;req_lock);</div><div class='add'>+	mutex_init(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	ida_init(&amp;hdev-&gt;unset_handle_ida);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;mesh_pending);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;mgmt_pending);</div><div class='del'>-	INIT_LIST_HEAD(&amp;hdev-&gt;blacklist);</div><div class='del'>-	INIT_LIST_HEAD(&amp;hdev-&gt;whitelist);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;reject_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;accept_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;uuids);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;link_keys);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;long_term_keys);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;identity_resolving_keys);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;remote_oob_data);</div><div class='del'>-	INIT_LIST_HEAD(&amp;hdev-&gt;le_white_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;le_accept_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;le_resolv_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;le_conn_params);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;pend_le_conns);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;pend_le_reports);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;conn_hash.list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdev-&gt;adv_instances);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;blocked_keys);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;monitored_devices);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;local_codecs);</div><div class='ctx'> 	INIT_WORK(&amp;hdev-&gt;rx_work, hci_rx_work);</div><div class='ctx'> 	INIT_WORK(&amp;hdev-&gt;cmd_work, hci_cmd_work);</div><div class='ctx'> 	INIT_WORK(&amp;hdev-&gt;tx_work, hci_tx_work);</div><div class='ctx'> 	INIT_WORK(&amp;hdev-&gt;power_on, hci_power_on);</div><div class='ctx'> 	INIT_WORK(&amp;hdev-&gt;error_reset, hci_error_reset);</div><div class='ctx'> </div><div class='add'>+	hci_cmd_sync_init(hdev);</div><div class='add'>+</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hdev-&gt;power_off, hci_power_off);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;hdev-&gt;rx_q);</div><div class='hunk'>@@ -3126,15 +2561,16 @@ struct hci_dev *hci_alloc_dev(void)</div><div class='ctx'> 	init_waitqueue_head(&amp;hdev-&gt;req_wait_q);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hdev-&gt;cmd_timer, hci_cmd_timeout);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;ncmd_timer, hci_ncmd_timeout);</div><div class='ctx'> </div><div class='del'>-	hci_request_setup(hdev);</div><div class='add'>+	hci_devcd_setup(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_init_sysfs(hdev);</div><div class='ctx'> 	discovery_init(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return hdev;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(hci_alloc_dev);</div><div class='add'>+EXPORT_SYMBOL(hci_alloc_dev_priv);</div><div class='ctx'> </div><div class='ctx'> /* Free HCI device */</div><div class='ctx'> void hci_free_dev(struct hci_dev *hdev)</div><div class='hunk'>@@ -3152,24 +2588,15 @@ int hci_register_dev(struct hci_dev *hdev)</div><div class='ctx'> 	if (!hdev-&gt;open || !hdev-&gt;close || !hdev-&gt;send)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Do not allow HCI_AMP devices to register at index 0,</div><div class='del'>-	 * so the index can be used as the AMP controller ID.</div><div class='del'>-	 */</div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		id = ida_simple_get(&amp;hci_index_ida, 0, 0, GFP_KERNEL);</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		id = ida_simple_get(&amp;hci_index_ida, 1, 0, GFP_KERNEL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	id = ida_alloc_max(&amp;hci_index_ida, HCI_MAX_ID - 1, GFP_KERNEL);</div><div class='ctx'> 	if (id &lt; 0)</div><div class='ctx'> 		return id;</div><div class='ctx'> </div><div class='del'>-	sprintf(hdev-&gt;name, "hci%d", id);</div><div class='add'>+	error = dev_set_name(&amp;hdev-&gt;dev, "hci%u", id);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;name = dev_name(&amp;hdev-&gt;dev);</div><div class='ctx'> 	hdev-&gt;id = id;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%p name %s bus %d", hdev, hdev-&gt;name, hdev-&gt;bus);</div><div class='hunk'>@@ -3191,8 +2618,6 @@ int hci_register_dev(struct hci_dev *hdev)</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(bt_debugfs))</div><div class='ctx'> 		hdev-&gt;debugfs = debugfs_create_dir(hdev-&gt;name, bt_debugfs);</div><div class='ctx'> </div><div class='del'>-	dev_set_name(&amp;hdev-&gt;dev, "%s", hdev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	error = device_add(&amp;hdev-&gt;dev);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto err_wqueue;</div><div class='hunk'>@@ -3215,12 +2640,10 @@ int hci_register_dev(struct hci_dev *hdev)</div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_SETUP);</div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_AUTO_OFF);</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dev_type == HCI_PRIMARY) {</div><div class='del'>-		/* Assume BR/EDR support until proven otherwise (such as</div><div class='del'>-		 * through reading supported features during init.</div><div class='del'>-		 */</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);</div><div class='del'>-	}</div><div class='add'>+	/* Assume BR/EDR support until proven otherwise (such as</div><div class='add'>+	 * through reading supported features during init.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;hci_dev_list_lock);</div><div class='ctx'> 	list_add(&amp;hdev-&gt;list, &amp;hci_dev_list);</div><div class='hunk'>@@ -3229,21 +2652,35 @@ int hci_register_dev(struct hci_dev *hdev)</div><div class='ctx'> 	/* Devices that are marked for raw-only usage are unconfigured</div><div class='ctx'> 	 * and should not be included in normal operation.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks))</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 		hci_dev_set_flag(hdev, HCI_UNCONFIGURED);</div><div class='ctx'> </div><div class='add'>+	/* Mark Remote Wakeup connection flag as supported if driver has wakeup</div><div class='add'>+	 * callback.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;wakeup)</div><div class='add'>+		hdev-&gt;conn_flags |= HCI_CONN_FLAG_REMOTE_WAKEUP;</div><div class='add'>+</div><div class='ctx'> 	hci_sock_dev_event(hdev, HCI_DEV_REG);</div><div class='ctx'> 	hci_dev_hold(hdev);</div><div class='ctx'> </div><div class='add'>+	error = hci_register_suspend_notifier(hdev);</div><div class='add'>+	if (error)</div><div class='add'>+		BT_WARN("register suspend notifier failed error:%d\n", error);</div><div class='add'>+</div><div class='ctx'> 	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_on);</div><div class='ctx'> </div><div class='add'>+	idr_init(&amp;hdev-&gt;adv_monitors_idr);</div><div class='add'>+	msft_register(hdev);</div><div class='add'>+</div><div class='ctx'> 	return id;</div><div class='ctx'> </div><div class='ctx'> err_wqueue:</div><div class='add'>+	debugfs_remove_recursive(hdev-&gt;debugfs);</div><div class='ctx'> 	destroy_workqueue(hdev-&gt;workqueue);</div><div class='ctx'> 	destroy_workqueue(hdev-&gt;req_workqueue);</div><div class='ctx'> err:</div><div class='del'>-	ida_simple_remove(&amp;hci_index_ida, hdev-&gt;id);</div><div class='add'>+	ida_free(&amp;hci_index_ida, hdev-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -3252,19 +2689,28 @@ EXPORT_SYMBOL(hci_register_dev);</div><div class='ctx'> /* Unregister HCI device */</div><div class='ctx'> void hci_unregister_dev(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='ctx'> 	BT_DBG("%p name %s bus %d", hdev, hdev-&gt;name, hdev-&gt;bus);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;hdev-&gt;unregister_lock);</div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_UNREGISTER);</div><div class='del'>-</div><div class='del'>-	id = hdev-&gt;id;</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;unregister_lock);</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;hci_dev_list_lock);</div><div class='ctx'> 	list_del(&amp;hdev-&gt;list);</div><div class='ctx'> 	write_unlock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;power_on);</div><div class='add'>+	synchronize_srcu(&amp;hdev-&gt;srcu);</div><div class='add'>+	cleanup_srcu_struct(&amp;hdev-&gt;srcu);</div><div class='add'>+</div><div class='add'>+	disable_work_sync(&amp;hdev-&gt;rx_work);</div><div class='add'>+	disable_work_sync(&amp;hdev-&gt;cmd_work);</div><div class='add'>+	disable_work_sync(&amp;hdev-&gt;tx_work);</div><div class='add'>+	disable_work_sync(&amp;hdev-&gt;power_on);</div><div class='add'>+	disable_work_sync(&amp;hdev-&gt;error_reset);</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_clear(hdev);</div><div class='add'>+</div><div class='add'>+	hci_unregister_suspend_notifier(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_do_close(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3288,7 +2734,14 @@ void hci_unregister_dev(struct hci_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device_del(&amp;hdev-&gt;dev);</div><div class='add'>+	/* Actual cleanup is deferred until hci_release_dev(). */</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_unregister_dev);</div><div class='ctx'> </div><div class='add'>+/* Release HCI device */</div><div class='add'>+void hci_release_dev(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='ctx'> 	debugfs_remove_recursive(hdev-&gt;debugfs);</div><div class='ctx'> 	kfree_const(hdev-&gt;hw_info);</div><div class='ctx'> 	kfree_const(hdev-&gt;fw_info);</div><div class='hunk'>@@ -3297,46 +2750,145 @@ void hci_unregister_dev(struct hci_dev *hdev)</div><div class='ctx'> 	destroy_workqueue(hdev-&gt;req_workqueue);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='del'>-	hci_bdaddr_list_clear(&amp;hdev-&gt;blacklist);</div><div class='del'>-	hci_bdaddr_list_clear(&amp;hdev-&gt;whitelist);</div><div class='add'>+	hci_bdaddr_list_clear(&amp;hdev-&gt;reject_list);</div><div class='add'>+	hci_bdaddr_list_clear(&amp;hdev-&gt;accept_list);</div><div class='ctx'> 	hci_uuids_clear(hdev);</div><div class='ctx'> 	hci_link_keys_clear(hdev);</div><div class='ctx'> 	hci_smp_ltks_clear(hdev);</div><div class='ctx'> 	hci_smp_irks_clear(hdev);</div><div class='ctx'> 	hci_remote_oob_data_clear(hdev);</div><div class='ctx'> 	hci_adv_instances_clear(hdev);</div><div class='del'>-	hci_bdaddr_list_clear(&amp;hdev-&gt;le_white_list);</div><div class='add'>+	hci_adv_monitors_clear(hdev);</div><div class='add'>+	hci_bdaddr_list_clear(&amp;hdev-&gt;le_accept_list);</div><div class='ctx'> 	hci_bdaddr_list_clear(&amp;hdev-&gt;le_resolv_list);</div><div class='ctx'> 	hci_conn_params_clear_all(hdev);</div><div class='ctx'> 	hci_discovery_filter_clear(hdev);</div><div class='add'>+	hci_blocked_keys_clear(hdev);</div><div class='add'>+	hci_codec_list_clear(&amp;hdev-&gt;local_codecs);</div><div class='add'>+	msft_release(hdev);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_dev_put(hdev);</div><div class='add'>+	ida_destroy(&amp;hdev-&gt;unset_handle_ida);</div><div class='add'>+	ida_free(&amp;hci_index_ida, hdev-&gt;id);</div><div class='add'>+	kfree_skb(hdev-&gt;sent_cmd);</div><div class='add'>+	kfree_skb(hdev-&gt;req_skb);</div><div class='add'>+	kfree_skb(hdev-&gt;recv_event);</div><div class='add'>+	kfree(hdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_release_dev);</div><div class='add'>+</div><div class='add'>+int hci_register_suspend_notifier(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;suspend_notifier.notifier_call &amp;&amp;</div><div class='add'>+	    !hci_test_quirk(hdev, HCI_QUIRK_NO_SUSPEND_NOTIFIER)) {</div><div class='add'>+		hdev-&gt;suspend_notifier.notifier_call = hci_suspend_notifier;</div><div class='add'>+		ret = register_pm_notifier(&amp;hdev-&gt;suspend_notifier);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ida_simple_remove(&amp;hci_index_ida, id);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_unregister_suspend_notifier(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;suspend_notifier.notifier_call) {</div><div class='add'>+		ret = unregister_pm_notifier(&amp;hdev-&gt;suspend_notifier);</div><div class='add'>+		if (!ret)</div><div class='add'>+			hdev-&gt;suspend_notifier.notifier_call = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cancel ongoing command synchronously:</div><div class='add'>+ *</div><div class='add'>+ * - Cancel command timer</div><div class='add'>+ * - Reset command counter</div><div class='add'>+ * - Cancel command request</div><div class='add'>+ */</div><div class='add'>+static void hci_cancel_cmd_sync(struct hci_dev *hdev, int err)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "err 0x%2.2x", err);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='add'>+		disable_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+		disable_delayed_work_sync(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+	} else  {</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_cancel_sync(hdev, err);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(hci_unregister_dev);</div><div class='ctx'> </div><div class='ctx'> /* Suspend HCI device */</div><div class='ctx'> int hci_suspend_dev(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* Suspend should only act on when powered. */</div><div class='add'>+	if (!hdev_is_powered(hdev) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If powering down don't attempt to suspend */</div><div class='add'>+	if (mgmt_powering_down(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Cancel potentially blocking sync operation before suspend */</div><div class='add'>+	hci_cancel_cmd_sync(hdev, EHOSTDOWN);</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	ret = hci_suspend_sync(hdev);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	hci_clear_wake_reason(hdev);</div><div class='add'>+	mgmt_suspending(hdev, hdev-&gt;suspend_state);</div><div class='add'>+</div><div class='ctx'> 	hci_sock_dev_event(hdev, HCI_DEV_SUSPEND);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(hci_suspend_dev);</div><div class='ctx'> </div><div class='ctx'> /* Resume HCI device */</div><div class='ctx'> int hci_resume_dev(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* Resume should only act on when powered. */</div><div class='add'>+	if (!hdev_is_powered(hdev) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If powering down don't attempt to resume */</div><div class='add'>+	if (mgmt_powering_down(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	ret = hci_resume_sync(hdev);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	mgmt_resuming(hdev, hdev-&gt;wake_reason, &amp;hdev-&gt;wake_addr,</div><div class='add'>+		      hdev-&gt;wake_addr_type);</div><div class='add'>+</div><div class='ctx'> 	hci_sock_dev_event(hdev, HCI_DEV_RESUME);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(hci_resume_dev);</div><div class='ctx'> </div><div class='ctx'> /* Reset HCI device */</div><div class='ctx'> int hci_reset_dev(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	const u8 hw_err[] = { HCI_EV_HARDWARE_ERROR, 0x01, 0x00 };</div><div class='add'>+	static const u8 hw_err[] = { HCI_EV_HARDWARE_ERROR, 0x01, 0x00 };</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	skb = bt_skb_alloc(3, GFP_ATOMIC);</div><div class='hunk'>@@ -3346,23 +2898,62 @@ int hci_reset_dev(struct hci_dev *hdev)</div><div class='ctx'> 	hci_skb_pkt_type(skb) = HCI_EVENT_PKT;</div><div class='ctx'> 	skb_put_data(skb, hw_err, 3);</div><div class='ctx'> </div><div class='add'>+	bt_dev_err(hdev, "Injecting HCI hardware error event");</div><div class='add'>+</div><div class='ctx'> 	/* Send Hardware Error to upper stack */</div><div class='ctx'> 	return hci_recv_frame(hdev, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(hci_reset_dev);</div><div class='ctx'> </div><div class='add'>+static u8 hci_dev_classify_pkt_type(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;classify_pkt_type)</div><div class='add'>+		return hdev-&gt;classify_pkt_type(hdev, skb);</div><div class='add'>+</div><div class='add'>+	return hci_skb_pkt_type(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Receive frame from HCI drivers */</div><div class='ctx'> int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	u8 dev_pkt_type;</div><div class='add'>+</div><div class='ctx'> 	if (!hdev || (!test_bit(HCI_UP, &amp;hdev-&gt;flags)</div><div class='ctx'> 		      &amp;&amp; !test_bit(HCI_INIT, &amp;hdev-&gt;flags))) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hci_skb_pkt_type(skb) != HCI_EVENT_PKT &amp;&amp;</div><div class='del'>-	    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &amp;&amp;</div><div class='del'>-	    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {</div><div class='add'>+	/* Check if the driver agree with packet type classification */</div><div class='add'>+	dev_pkt_type = hci_dev_classify_pkt_type(hdev, skb);</div><div class='add'>+	if (hci_skb_pkt_type(skb) != dev_pkt_type) {</div><div class='add'>+		hci_skb_pkt_type(skb) = dev_pkt_type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (hci_skb_pkt_type(skb)) {</div><div class='add'>+	case HCI_EVENT_PKT:</div><div class='add'>+		break;</div><div class='add'>+	case HCI_ACLDATA_PKT:</div><div class='add'>+		/* Detect if ISO packet has been sent as ACL */</div><div class='add'>+		if (hci_conn_num(hdev, CIS_LINK) ||</div><div class='add'>+		    hci_conn_num(hdev, BIS_LINK) ||</div><div class='add'>+			hci_conn_num(hdev, PA_LINK)) {</div><div class='add'>+			__u16 handle = __le16_to_cpu(hci_acl_hdr(skb)-&gt;handle);</div><div class='add'>+			__u8 type;</div><div class='add'>+</div><div class='add'>+			type = hci_conn_lookup_type(hdev, hci_handle(handle));</div><div class='add'>+			if (type == CIS_LINK || type == BIS_LINK ||</div><div class='add'>+			    type == PA_LINK)</div><div class='add'>+				hci_skb_pkt_type(skb) = HCI_ISODATA_PKT;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HCI_SCODATA_PKT:</div><div class='add'>+		break;</div><div class='add'>+	case HCI_ISODATA_PKT:</div><div class='add'>+		break;</div><div class='add'>+	case HCI_DRV_PKT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3444,7 +3035,7 @@ int hci_unregister_cb(struct hci_cb *cb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(hci_unregister_cb);</div><div class='ctx'> </div><div class='del'>-static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static int hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -3467,14 +3058,33 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_skb_pkt_type(skb) == HCI_DRV_PKT) {</div><div class='add'>+		/* Intercept HCI Drv packet here and don't go with hdev-&gt;send</div><div class='add'>+		 * callback.</div><div class='add'>+		 */</div><div class='add'>+		err = hci_drv_process_cmd(hdev, skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = hdev-&gt;send(hdev, skb);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		bt_dev_err(hdev, "sending frame failed (%d)", err);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_send_conn_frame(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	hci_conn_tx_queue(conn, skb);</div><div class='add'>+	return hci_send_frame(hdev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send HCI command */</div><div class='hunk'>@@ -3485,7 +3095,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s opcode 0x%4.4x plen %d", hdev-&gt;name, opcode, plen);</div><div class='ctx'> </div><div class='del'>-	skb = hci_prepare_cmd(hdev, opcode, plen, param);</div><div class='add'>+	skb = hci_cmd_sync_alloc(hdev, opcode, plen, param, NULL);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		bt_dev_err(hdev, "no memory for command");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3520,7 +3130,7 @@ int __hci_cmd_send(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = hci_prepare_cmd(hdev, opcode, plen, param);</div><div class='add'>+	skb = hci_cmd_sync_alloc(hdev, opcode, plen, param, NULL);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		bt_dev_err(hdev, "no memory for command (opcode 0x%4.4x)",</div><div class='ctx'> 			   opcode);</div><div class='hunk'>@@ -3534,41 +3144,65 @@ int __hci_cmd_send(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='ctx'> EXPORT_SYMBOL(__hci_cmd_send);</div><div class='ctx'> </div><div class='ctx'> /* Get data from the previously sent command */</div><div class='del'>-void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode)</div><div class='add'>+static void *hci_cmd_data(struct sk_buff *skb, __u16 opcode)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_command_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	if (!hdev-&gt;sent_cmd)</div><div class='add'>+	if (!skb || skb-&gt;len &lt; HCI_COMMAND_HDR_SIZE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	hdr = (void *) hdev-&gt;sent_cmd-&gt;data;</div><div class='add'>+	hdr = (void *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;opcode != cpu_to_le16(opcode))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s opcode 0x%4.4x", hdev-&gt;name, opcode);</div><div class='add'>+	return skb-&gt;data + HCI_COMMAND_HDR_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get data from the previously sent command */</div><div class='add'>+void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='ctx'> </div><div class='del'>-	return hdev-&gt;sent_cmd-&gt;data + HCI_COMMAND_HDR_SIZE;</div><div class='add'>+	/* Check if opcode matches last sent command */</div><div class='add'>+	data = hci_cmd_data(hdev-&gt;sent_cmd, opcode);</div><div class='add'>+	if (!data)</div><div class='add'>+		/* Check if opcode matches last request */</div><div class='add'>+		data = hci_cmd_data(hdev-&gt;req_skb, opcode);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Send HCI command and wait for command commplete event */</div><div class='del'>-struct sk_buff *hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='del'>-			     const void *param, u32 timeout)</div><div class='add'>+/* Get data from last received event */</div><div class='add'>+void *hci_recv_event_data(struct hci_dev *hdev, __u8 event)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct hci_event_hdr *hdr;</div><div class='add'>+	int offset;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='del'>-		return ERR_PTR(-ENETDOWN);</div><div class='add'>+	if (!hdev-&gt;recv_event)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen);</div><div class='add'>+	hdr = (void *)hdev-&gt;recv_event-&gt;data;</div><div class='add'>+	offset = sizeof(*hdr);</div><div class='ctx'> </div><div class='del'>-	hci_req_sync_lock(hdev);</div><div class='del'>-	skb = __hci_cmd_sync(hdev, opcode, plen, param, timeout);</div><div class='del'>-	hci_req_sync_unlock(hdev);</div><div class='add'>+	if (hdr-&gt;evt != event) {</div><div class='add'>+		/* In case of LE metaevent check the subevent match */</div><div class='add'>+		if (hdr-&gt;evt == HCI_EV_LE_META) {</div><div class='add'>+			struct hci_ev_le_meta *ev;</div><div class='add'>+</div><div class='add'>+			ev = (void *)hdev-&gt;recv_event-&gt;data + offset;</div><div class='add'>+			offset += sizeof(*ev);</div><div class='add'>+			if (ev-&gt;subevent == event)</div><div class='add'>+				goto found;</div><div class='add'>+		}</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+	bt_dev_dbg(hdev, "event 0x%2.2x", event);</div><div class='ctx'> </div><div class='del'>-	return skb;</div><div class='add'>+	return hdev-&gt;recv_event-&gt;data + offset;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(hci_cmd_sync);</div><div class='ctx'> </div><div class='ctx'> /* Send ACL data */</div><div class='ctx'> static void hci_add_acl_hdr(struct sk_buff *skb, __u16 handle, __u16 flags)</div><div class='hunk'>@@ -3595,17 +3229,7 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue,</div><div class='ctx'> </div><div class='ctx'> 	hci_skb_pkt_type(skb) = HCI_ACLDATA_PKT;</div><div class='ctx'> </div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		hci_add_acl_hdr(skb, conn-&gt;handle, flags);</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		hci_add_acl_hdr(skb, chan-&gt;handle, flags);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bt_dev_err(hdev, "unknown dev_type %d", hdev-&gt;dev_type);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	hci_add_acl_hdr(skb, conn-&gt;handle, flags);</div><div class='ctx'> </div><div class='ctx'> 	list = skb_shinfo(skb)-&gt;frag_list;</div><div class='ctx'> 	if (!list) {</div><div class='hunk'>@@ -3643,6 +3267,8 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue,</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;queue-&gt;lock);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "chan %p queued %d", chan, skb_queue_len(queue));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags)</div><div class='hunk'>@@ -3674,12 +3300,124 @@ void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	hci_skb_pkt_type(skb) = HCI_SCODATA_PKT;</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_tail(&amp;conn-&gt;data_q, skb);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p queued %d", conn,</div><div class='add'>+		   skb_queue_len(&amp;conn-&gt;data_q));</div><div class='add'>+</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send ISO data */</div><div class='add'>+static void hci_add_iso_hdr(struct sk_buff *skb, __u16 handle, __u8 flags)</div><div class='add'>+{</div><div class='add'>+	struct hci_iso_hdr *hdr;</div><div class='add'>+	int len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, HCI_ISO_HDR_SIZE);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	hdr = (struct hci_iso_hdr *)skb_transport_header(skb);</div><div class='add'>+	hdr-&gt;handle = cpu_to_le16(hci_handle_pack(handle, flags));</div><div class='add'>+	hdr-&gt;dlen   = cpu_to_le16(len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_queue_iso(struct hci_conn *conn, struct sk_buff_head *queue,</div><div class='add'>+			  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	struct sk_buff *list;</div><div class='add'>+	__u16 flags;</div><div class='add'>+</div><div class='add'>+	skb-&gt;len = skb_headlen(skb);</div><div class='add'>+	skb-&gt;data_len = 0;</div><div class='add'>+</div><div class='add'>+	hci_skb_pkt_type(skb) = HCI_ISODATA_PKT;</div><div class='add'>+</div><div class='add'>+	list = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+</div><div class='add'>+	flags = hci_iso_flags_pack(list ? ISO_START : ISO_SINGLE, 0x00);</div><div class='add'>+	hci_add_iso_hdr(skb, conn-&gt;handle, flags);</div><div class='add'>+</div><div class='add'>+	if (!list) {</div><div class='add'>+		/* Non fragmented */</div><div class='add'>+		BT_DBG("%s nonfrag skb %p len %d", hdev-&gt;name, skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+		skb_queue_tail(queue, skb);</div><div class='add'>+	} else {</div><div class='add'>+		/* Fragmented */</div><div class='add'>+		BT_DBG("%s frag %p len %d", hdev-&gt;name, skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+		skb_shinfo(skb)-&gt;frag_list = NULL;</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(queue, skb);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			skb = list; list = list-&gt;next;</div><div class='add'>+</div><div class='add'>+			hci_skb_pkt_type(skb) = HCI_ISODATA_PKT;</div><div class='add'>+			flags = hci_iso_flags_pack(list ? ISO_CONT : ISO_END,</div><div class='add'>+						   0x00);</div><div class='add'>+			hci_add_iso_hdr(skb, conn-&gt;handle, flags);</div><div class='add'>+</div><div class='add'>+			BT_DBG("%s frag %p len %d", hdev-&gt;name, skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+			__skb_queue_tail(queue, skb);</div><div class='add'>+		} while (list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p queued %d", conn, skb_queue_len(queue));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_send_iso(struct hci_conn *conn, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s len %d", hdev-&gt;name, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	hci_queue_iso(conn, &amp;conn-&gt;data_q, skb);</div><div class='add'>+</div><div class='ctx'> 	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;tx_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---- HCI TX task (outgoing data) ---- */</div><div class='ctx'> </div><div class='ctx'> /* HCI Connection scheduler */</div><div class='add'>+static inline void hci_quote_sent(struct hci_conn *conn, int num, int *quote)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	int cnt, q;</div><div class='add'>+</div><div class='add'>+	if (!conn) {</div><div class='add'>+		*quote = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		cnt = hdev-&gt;acl_cnt;</div><div class='add'>+		break;</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		cnt = hdev-&gt;sco_cnt;</div><div class='add'>+		break;</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		cnt = hdev-&gt;le_mtu ? hdev-&gt;le_cnt : hdev-&gt;acl_cnt;</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+		cnt = hdev-&gt;iso_cnt;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cnt = 0;</div><div class='add'>+		bt_dev_err(hdev, "unknown link type %d", conn-&gt;type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q = cnt / num;</div><div class='add'>+	*quote = q ? q : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,</div><div class='ctx'> 				     int *quote)</div><div class='ctx'> {</div><div class='hunk'>@@ -3693,9 +3431,14 @@ static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(c, &amp;h-&gt;list, list) {</div><div class='del'>-		if (c-&gt;type != type || skb_queue_empty(&amp;c-&gt;data_q))</div><div class='add'>+		if (c-&gt;type != type ||</div><div class='add'>+		    skb_queue_empty(&amp;c-&gt;data_q))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		bt_dev_dbg(hdev, "hcon %p state %s queued %d", c,</div><div class='add'>+			   state_to_string(c-&gt;state),</div><div class='add'>+			   skb_queue_len(&amp;c-&gt;data_q));</div><div class='add'>+</div><div class='ctx'> 		if (c-&gt;state != BT_CONNECTED &amp;&amp; c-&gt;state != BT_CONFIG)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3712,29 +3455,7 @@ static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (conn) {</div><div class='del'>-		int cnt, q;</div><div class='del'>-</div><div class='del'>-		switch (conn-&gt;type) {</div><div class='del'>-		case ACL_LINK:</div><div class='del'>-			cnt = hdev-&gt;acl_cnt;</div><div class='del'>-			break;</div><div class='del'>-		case SCO_LINK:</div><div class='del'>-		case ESCO_LINK:</div><div class='del'>-			cnt = hdev-&gt;sco_cnt;</div><div class='del'>-			break;</div><div class='del'>-		case LE_LINK:</div><div class='del'>-			cnt = hdev-&gt;le_mtu ? hdev-&gt;le_cnt : hdev-&gt;acl_cnt;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			cnt = 0;</div><div class='del'>-			bt_dev_err(hdev, "unknown link type %d", conn-&gt;type);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		q = cnt / num;</div><div class='del'>-		*quote = q ? q : 1;</div><div class='del'>-	} else</div><div class='del'>-		*quote = 0;</div><div class='add'>+	hci_quote_sent(conn, num, quote);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("conn %p quote %d", conn, *quote);</div><div class='ctx'> 	return conn;</div><div class='hunk'>@@ -3747,10 +3468,10 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)</div><div class='ctx'> </div><div class='ctx'> 	bt_dev_err(hdev, "link tx timeout");</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Kill stalled connections */</div><div class='del'>-	list_for_each_entry_rcu(c, &amp;h-&gt;list, list) {</div><div class='add'>+	list_for_each_entry(c, &amp;h-&gt;list, list) {</div><div class='ctx'> 		if (c-&gt;type == type &amp;&amp; c-&gt;sent) {</div><div class='ctx'> 			bt_dev_err(hdev, "killing stalled connection %pMR",</div><div class='ctx'> 				   &amp;c-&gt;dst);</div><div class='hunk'>@@ -3758,7 +3479,7 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,</div><div class='hunk'>@@ -3768,7 +3489,7 @@ static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,</div><div class='ctx'> 	struct hci_chan *chan = NULL;</div><div class='ctx'> 	unsigned int num = 0, min = ~0, cur_prio = 0;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='del'>-	int cnt, q, conn_num = 0;</div><div class='add'>+	int conn_num = 0;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -3818,27 +3539,8 @@ static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	switch (chan-&gt;conn-&gt;type) {</div><div class='del'>-	case ACL_LINK:</div><div class='del'>-		cnt = hdev-&gt;acl_cnt;</div><div class='del'>-		break;</div><div class='del'>-	case AMP_LINK:</div><div class='del'>-		cnt = hdev-&gt;block_cnt;</div><div class='del'>-		break;</div><div class='del'>-	case SCO_LINK:</div><div class='del'>-	case ESCO_LINK:</div><div class='del'>-		cnt = hdev-&gt;sco_cnt;</div><div class='del'>-		break;</div><div class='del'>-	case LE_LINK:</div><div class='del'>-		cnt = hdev-&gt;le_mtu ? hdev-&gt;le_cnt : hdev-&gt;acl_cnt;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		cnt = 0;</div><div class='del'>-		bt_dev_err(hdev, "unknown link type %d", chan-&gt;conn-&gt;type);</div><div class='del'>-	}</div><div class='add'>+	hci_quote_sent(chan-&gt;conn, num, quote);</div><div class='ctx'> </div><div class='del'>-	q = cnt / num;</div><div class='del'>-	*quote = q ? q : 1;</div><div class='ctx'> 	BT_DBG("chan %p quote %d", chan, *quote);</div><div class='ctx'> 	return chan;</div><div class='ctx'> }</div><div class='hunk'>@@ -3893,21 +3595,82 @@ static void hci_prio_recalculate(struct hci_dev *hdev, __u8 type)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void __check_timeout(struct hci_dev *hdev, unsigned int cnt, u8 type)</div><div class='ctx'> {</div><div class='del'>-	/* Calculate count of blocks used by this packet */</div><div class='del'>-	return DIV_ROUND_UP(skb-&gt;len - HCI_ACL_HDR_SIZE, hdev-&gt;block_len);</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		/* tx timeout must be longer than maximum link supervision</div><div class='add'>+		 * timeout (40.9 seconds)</div><div class='add'>+		 */</div><div class='add'>+		timeout = hdev-&gt;acl_last_tx + HCI_ACL_TX_TIMEOUT;</div><div class='add'>+		break;</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		/* tx timeout must be longer than maximum link supervision</div><div class='add'>+		 * timeout (40.9 seconds)</div><div class='add'>+		 */</div><div class='add'>+		timeout = hdev-&gt;le_last_tx + HCI_ACL_TX_TIMEOUT;</div><div class='add'>+		break;</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='add'>+		/* tx timeout must be longer than the maximum transport latency</div><div class='add'>+		 * (8.388607 seconds)</div><div class='add'>+		 */</div><div class='add'>+		timeout = hdev-&gt;iso_last_tx + HCI_ISO_TX_TIMEOUT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cnt &amp;&amp; time_after(jiffies, timeout))</div><div class='add'>+		hci_link_tx_to(hdev, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __check_timeout(struct hci_dev *hdev, unsigned int cnt)</div><div class='add'>+/* Schedule SCO */</div><div class='add'>+static void hci_sched_sco(struct hci_dev *hdev, __u8 type)</div><div class='ctx'> {</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='del'>-		/* ACL tx timeout must be longer than maximum</div><div class='del'>-		 * link supervision timeout (40.9 seconds) */</div><div class='del'>-		if (!cnt &amp;&amp; time_after(jiffies, hdev-&gt;acl_last_tx +</div><div class='del'>-				       HCI_ACL_TX_TIMEOUT))</div><div class='del'>-			hci_link_tx_to(hdev, ACL_LINK);</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int quote, *cnt;</div><div class='add'>+	unsigned int pkts = hdev-&gt;sco_pkts;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "type %u", type);</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_num(hdev, type) || !pkts)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Use sco_pkts if flow control has not been enabled which will limit</div><div class='add'>+	 * the amount of buffer sent in a row.</div><div class='add'>+	 */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SCO_FLOWCTL))</div><div class='add'>+		cnt = &amp;pkts;</div><div class='add'>+	else</div><div class='add'>+		cnt = &amp;hdev-&gt;sco_cnt;</div><div class='add'>+</div><div class='add'>+	while (*cnt &amp;&amp; (conn = hci_low_sent(hdev, type, &amp;quote))) {</div><div class='add'>+		while (quote-- &amp;&amp; (skb = skb_dequeue(&amp;conn-&gt;data_q))) {</div><div class='add'>+			BT_DBG("skb %p len %d", skb, skb-&gt;len);</div><div class='add'>+			hci_send_conn_frame(hdev, conn, skb);</div><div class='add'>+</div><div class='add'>+			conn-&gt;sent++;</div><div class='add'>+			if (conn-&gt;sent == ~0)</div><div class='add'>+				conn-&gt;sent = 0;</div><div class='add'>+			(*cnt)--;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Rescheduled if all packets were sent and flow control is not enabled</div><div class='add'>+	 * as there could be more packets queued that could not be sent and</div><div class='add'>+	 * since no HCI_EV_NUM_COMP_PKTS event will be generated the reschedule</div><div class='add'>+	 * needs to be forced.</div><div class='add'>+	 */</div><div class='add'>+	if (!pkts &amp;&amp; !hci_dev_test_flag(hdev, HCI_SCO_FLOWCTL))</div><div class='add'>+		queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;tx_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_sched_acl_pkt(struct hci_dev *hdev)</div><div class='hunk'>@@ -3917,7 +3680,7 @@ static void hci_sched_acl_pkt(struct hci_dev *hdev)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int quote;</div><div class='ctx'> </div><div class='del'>-	__check_timeout(hdev, cnt);</div><div class='add'>+	__check_timeout(hdev, cnt, ACL_LINK);</div><div class='ctx'> </div><div class='ctx'> 	while (hdev-&gt;acl_cnt &amp;&amp;</div><div class='ctx'> 	       (chan = hci_chan_sent(hdev, ACL_LINK, &amp;quote))) {</div><div class='hunk'>@@ -3935,12 +3698,16 @@ static void hci_sched_acl_pkt(struct hci_dev *hdev)</div><div class='ctx'> 			hci_conn_enter_active_mode(chan-&gt;conn,</div><div class='ctx'> 						   bt_cb(skb)-&gt;force_active);</div><div class='ctx'> </div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='add'>+			hci_send_conn_frame(hdev, chan-&gt;conn, skb);</div><div class='ctx'> 			hdev-&gt;acl_last_tx = jiffies;</div><div class='ctx'> </div><div class='ctx'> 			hdev-&gt;acl_cnt--;</div><div class='ctx'> 			chan-&gt;sent++;</div><div class='ctx'> 			chan-&gt;conn-&gt;sent++;</div><div class='add'>+</div><div class='add'>+			/* Send pending SCO packets right away */</div><div class='add'>+			hci_sched_sco(hdev, SCO_LINK);</div><div class='add'>+			hci_sched_sco(hdev, ESCO_LINK);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3948,29 +3715,36 @@ static void hci_sched_acl_pkt(struct hci_dev *hdev)</div><div class='ctx'> 		hci_prio_recalculate(hdev, ACL_LINK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_sched_acl_blk(struct hci_dev *hdev)</div><div class='add'>+static void hci_sched_acl(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* No ACL link over BR/EDR controller */</div><div class='add'>+	if (!hci_conn_num(hdev, ACL_LINK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_sched_acl_pkt(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_sched_le(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cnt = hdev-&gt;block_cnt;</div><div class='ctx'> 	struct hci_chan *chan;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int quote;</div><div class='del'>-	u8 type;</div><div class='del'>-</div><div class='del'>-	__check_timeout(hdev, cnt);</div><div class='add'>+	int quote, *cnt, tmp;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dev_type == HCI_AMP)</div><div class='del'>-		type = AMP_LINK;</div><div class='del'>-	else</div><div class='del'>-		type = ACL_LINK;</div><div class='add'>+	if (!hci_conn_num(hdev, LE_LINK))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	while (hdev-&gt;block_cnt &gt; 0 &amp;&amp;</div><div class='del'>-	       (chan = hci_chan_sent(hdev, type, &amp;quote))) {</div><div class='del'>-		u32 priority = (skb_peek(&amp;chan-&gt;data_q))-&gt;priority;</div><div class='del'>-		while (quote &gt; 0 &amp;&amp; (skb = skb_peek(&amp;chan-&gt;data_q))) {</div><div class='del'>-			int blocks;</div><div class='add'>+	cnt = hdev-&gt;le_pkts ? &amp;hdev-&gt;le_cnt : &amp;hdev-&gt;acl_cnt;</div><div class='add'>+</div><div class='add'>+	__check_timeout(hdev, *cnt, LE_LINK);</div><div class='ctx'> </div><div class='add'>+	tmp = *cnt;</div><div class='add'>+	while (*cnt &amp;&amp; (chan = hci_chan_sent(hdev, LE_LINK, &amp;quote))) {</div><div class='add'>+		u32 priority = (skb_peek(&amp;chan-&gt;data_q))-&gt;priority;</div><div class='add'>+		while (quote-- &amp;&amp; (skb = skb_peek(&amp;chan-&gt;data_q))) {</div><div class='ctx'> 			BT_DBG("chan %p skb %p len %d priority %u", chan, skb,</div><div class='ctx'> 			       skb-&gt;len, skb-&gt;priority);</div><div class='ctx'> </div><div class='hunk'>@@ -3980,163 +3754,70 @@ static void hci_sched_acl_blk(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 			skb = skb_dequeue(&amp;chan-&gt;data_q);</div><div class='ctx'> </div><div class='del'>-			blocks = __get_blocks(hdev, skb);</div><div class='del'>-			if (blocks &gt; hdev-&gt;block_cnt)</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			hci_conn_enter_active_mode(chan-&gt;conn,</div><div class='del'>-						   bt_cb(skb)-&gt;force_active);</div><div class='del'>-</div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='del'>-			hdev-&gt;acl_last_tx = jiffies;</div><div class='add'>+			hci_send_conn_frame(hdev, chan-&gt;conn, skb);</div><div class='add'>+			hdev-&gt;le_last_tx = jiffies;</div><div class='ctx'> </div><div class='del'>-			hdev-&gt;block_cnt -= blocks;</div><div class='del'>-			quote -= blocks;</div><div class='add'>+			(*cnt)--;</div><div class='add'>+			chan-&gt;sent++;</div><div class='add'>+			chan-&gt;conn-&gt;sent++;</div><div class='ctx'> </div><div class='del'>-			chan-&gt;sent += blocks;</div><div class='del'>-			chan-&gt;conn-&gt;sent += blocks;</div><div class='add'>+			/* Send pending SCO packets right away */</div><div class='add'>+			hci_sched_sco(hdev, SCO_LINK);</div><div class='add'>+			hci_sched_sco(hdev, ESCO_LINK);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cnt != hdev-&gt;block_cnt)</div><div class='del'>-		hci_prio_recalculate(hdev, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_sched_acl(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* No ACL link over BR/EDR controller */</div><div class='del'>-	if (!hci_conn_num(hdev, ACL_LINK) &amp;&amp; hdev-&gt;dev_type == HCI_PRIMARY)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* No AMP link over AMP controller */</div><div class='del'>-	if (!hci_conn_num(hdev, AMP_LINK) &amp;&amp; hdev-&gt;dev_type == HCI_AMP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;flow_ctl_mode) {</div><div class='del'>-	case HCI_FLOW_CTL_MODE_PACKET_BASED:</div><div class='del'>-		hci_sched_acl_pkt(hdev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_FLOW_CTL_MODE_BLOCK_BASED:</div><div class='del'>-		hci_sched_acl_blk(hdev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (*cnt != tmp)</div><div class='add'>+		hci_prio_recalculate(hdev, LE_LINK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Schedule SCO */</div><div class='del'>-static void hci_sched_sco(struct hci_dev *hdev)</div><div class='add'>+/* Schedule iso */</div><div class='add'>+static void hci_sched_iso(struct hci_dev *hdev, __u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int quote;</div><div class='add'>+	int quote, *cnt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (!hci_conn_num(hdev, SCO_LINK))</div><div class='add'>+	if (!hci_conn_num(hdev, type))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	while (hdev-&gt;sco_cnt &amp;&amp; (conn = hci_low_sent(hdev, SCO_LINK, &amp;quote))) {</div><div class='del'>-		while (quote-- &amp;&amp; (skb = skb_dequeue(&amp;conn-&gt;data_q))) {</div><div class='del'>-			BT_DBG("skb %p len %d", skb, skb-&gt;len);</div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='add'>+	cnt = &amp;hdev-&gt;iso_cnt;</div><div class='ctx'> </div><div class='del'>-			conn-&gt;sent++;</div><div class='del'>-			if (conn-&gt;sent == ~0)</div><div class='del'>-				conn-&gt;sent = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	__check_timeout(hdev, *cnt, type);</div><div class='ctx'> </div><div class='del'>-static void hci_sched_esco(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int quote;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (!hci_conn_num(hdev, ESCO_LINK))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (hdev-&gt;sco_cnt &amp;&amp; (conn = hci_low_sent(hdev, ESCO_LINK,</div><div class='del'>-						     &amp;quote))) {</div><div class='add'>+	while (*cnt &amp;&amp; (conn = hci_low_sent(hdev, type, &amp;quote))) {</div><div class='ctx'> 		while (quote-- &amp;&amp; (skb = skb_dequeue(&amp;conn-&gt;data_q))) {</div><div class='ctx'> 			BT_DBG("skb %p len %d", skb, skb-&gt;len);</div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='add'>+</div><div class='add'>+			hci_send_conn_frame(hdev, conn, skb);</div><div class='add'>+			hdev-&gt;iso_last_tx = jiffies;</div><div class='ctx'> </div><div class='ctx'> 			conn-&gt;sent++;</div><div class='ctx'> 			if (conn-&gt;sent == ~0)</div><div class='ctx'> 				conn-&gt;sent = 0;</div><div class='add'>+			(*cnt)--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_sched_le(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hci_chan *chan;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int quote, cnt, tmp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (!hci_conn_num(hdev, LE_LINK))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='del'>-		/* LE tx timeout must be longer than maximum</div><div class='del'>-		 * link supervision timeout (40.9 seconds) */</div><div class='del'>-		if (!hdev-&gt;le_cnt &amp;&amp; hdev-&gt;le_pkts &amp;&amp;</div><div class='del'>-		    time_after(jiffies, hdev-&gt;le_last_tx + HZ * 45))</div><div class='del'>-			hci_link_tx_to(hdev, LE_LINK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cnt = hdev-&gt;le_pkts ? hdev-&gt;le_cnt : hdev-&gt;acl_cnt;</div><div class='del'>-	tmp = cnt;</div><div class='del'>-	while (cnt &amp;&amp; (chan = hci_chan_sent(hdev, LE_LINK, &amp;quote))) {</div><div class='del'>-		u32 priority = (skb_peek(&amp;chan-&gt;data_q))-&gt;priority;</div><div class='del'>-		while (quote-- &amp;&amp; (skb = skb_peek(&amp;chan-&gt;data_q))) {</div><div class='del'>-			BT_DBG("chan %p skb %p len %d priority %u", chan, skb,</div><div class='del'>-			       skb-&gt;len, skb-&gt;priority);</div><div class='del'>-</div><div class='del'>-			/* Stop if priority has changed */</div><div class='del'>-			if (skb-&gt;priority &lt; priority)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			skb = skb_dequeue(&amp;chan-&gt;data_q);</div><div class='del'>-</div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='del'>-			hdev-&gt;le_last_tx = jiffies;</div><div class='del'>-</div><div class='del'>-			cnt--;</div><div class='del'>-			chan-&gt;sent++;</div><div class='del'>-			chan-&gt;conn-&gt;sent++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;le_pkts)</div><div class='del'>-		hdev-&gt;le_cnt = cnt;</div><div class='del'>-	else</div><div class='del'>-		hdev-&gt;acl_cnt = cnt;</div><div class='del'>-</div><div class='del'>-	if (cnt != tmp)</div><div class='del'>-		hci_prio_recalculate(hdev, LE_LINK);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void hci_tx_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev, tx_work);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s acl %d sco %d le %d", hdev-&gt;name, hdev-&gt;acl_cnt,</div><div class='del'>-	       hdev-&gt;sco_cnt, hdev-&gt;le_cnt);</div><div class='add'>+	BT_DBG("%s acl %d sco %d le %d iso %d", hdev-&gt;name, hdev-&gt;acl_cnt,</div><div class='add'>+	       hdev-&gt;sco_cnt, hdev-&gt;le_cnt, hdev-&gt;iso_cnt);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='ctx'> 		/* Schedule queues and send stuff to HCI driver */</div><div class='add'>+		hci_sched_sco(hdev, SCO_LINK);</div><div class='add'>+		hci_sched_sco(hdev, ESCO_LINK);</div><div class='add'>+		hci_sched_iso(hdev, CIS_LINK);</div><div class='add'>+		hci_sched_iso(hdev, BIS_LINK);</div><div class='add'>+		hci_sched_iso(hdev, PA_LINK);</div><div class='ctx'> 		hci_sched_acl(hdev);</div><div class='del'>-		hci_sched_sco(hdev);</div><div class='del'>-		hci_sched_esco(hdev);</div><div class='ctx'> 		hci_sched_le(hdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4150,68 +3831,96 @@ static void hci_tx_work(struct work_struct *work)</div><div class='ctx'> /* ACL data packet */</div><div class='ctx'> static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_acl_hdr *hdr = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_conn *conn;</div><div class='add'>+	struct hci_acl_hdr *hdr;</div><div class='ctx'> 	__u16 handle, flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, HCI_ACL_HDR_SIZE);</div><div class='add'>+	hdr = skb_pull_data(skb, sizeof(*hdr));</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		bt_dev_err(hdev, "ACL packet too small");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	handle = __le16_to_cpu(hdr-&gt;handle);</div><div class='ctx'> 	flags  = hci_flags(handle);</div><div class='ctx'> 	handle = hci_handle(handle);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev-&gt;name, skb-&gt;len,</div><div class='del'>-	       handle, flags);</div><div class='add'>+	bt_dev_dbg(hdev, "len %d handle 0x%4.4x flags 0x%4.4x", skb-&gt;len,</div><div class='add'>+		   handle, flags);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;stat.acl_rx++;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	if (conn) {</div><div class='del'>-		hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);</div><div class='del'>-</div><div class='del'>-		/* Send to upper protocol */</div><div class='del'>-		l2cap_recv_acldata(conn, skb, flags);</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='add'>+	err = l2cap_recv_acldata(hdev, handle, skb, flags);</div><div class='add'>+	if (err == -ENOENT)</div><div class='ctx'> 		bt_dev_err(hdev, "ACL packet for unknown connection handle %d",</div><div class='ctx'> 			   handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	else if (err)</div><div class='add'>+		bt_dev_dbg(hdev, "ACL packet recv for handle %d failed: %d",</div><div class='add'>+			   handle, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SCO data packet */</div><div class='ctx'> static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_sco_hdr *hdr = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-	__u16 handle;</div><div class='add'>+	struct hci_sco_hdr *hdr;</div><div class='add'>+	__u16 handle, flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, HCI_SCO_HDR_SIZE);</div><div class='add'>+	hdr = skb_pull_data(skb, sizeof(*hdr));</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		bt_dev_err(hdev, "SCO packet too small");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	handle = __le16_to_cpu(hdr-&gt;handle);</div><div class='add'>+	flags  = hci_flags(handle);</div><div class='add'>+	handle = hci_handle(handle);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s len %d handle 0x%4.4x", hdev-&gt;name, skb-&gt;len, handle);</div><div class='add'>+	bt_dev_dbg(hdev, "len %d handle 0x%4.4x flags 0x%4.4x", skb-&gt;len,</div><div class='add'>+		   handle, flags);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;stat.sco_rx++;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	hci_skb_pkt_status(skb) = flags &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	err = sco_recv_scodata(hdev, handle, skb);</div><div class='add'>+	if (err == -ENOENT)</div><div class='add'>+		bt_dev_err_ratelimited(hdev, "SCO packet for unknown connection handle %d",</div><div class='add'>+				       handle);</div><div class='add'>+	else if (err)</div><div class='add'>+		bt_dev_dbg(hdev, "SCO packet recv for handle %d failed: %d",</div><div class='add'>+			   handle, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_isodata_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_iso_hdr *hdr;</div><div class='add'>+	__u16 handle, flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (conn) {</div><div class='del'>-		/* Send to upper protocol */</div><div class='del'>-		sco_recv_scodata(conn, skb);</div><div class='add'>+	hdr = skb_pull_data(skb, sizeof(*hdr));</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		bt_dev_err(hdev, "ISO packet too small");</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='del'>-	} else {</div><div class='del'>-		bt_dev_err(hdev, "SCO packet for unknown connection handle %d",</div><div class='del'>-			   handle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	handle = __le16_to_cpu(hdr-&gt;handle);</div><div class='add'>+	flags  = hci_flags(handle);</div><div class='add'>+	handle = hci_handle(handle);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "len %d handle 0x%4.4x flags 0x%4.4x", skb-&gt;len,</div><div class='add'>+		   handle, flags);</div><div class='add'>+</div><div class='add'>+	err = iso_recv(hdev, handle, skb, flags);</div><div class='add'>+	if (err == -ENOENT)</div><div class='add'>+		bt_dev_err(hdev, "ISO packet for unknown connection handle %d",</div><div class='add'>+			   handle);</div><div class='add'>+	else if (err)</div><div class='add'>+		bt_dev_dbg(hdev, "ISO packet recv for handle %d failed: %d",</div><div class='add'>+			   handle, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool hci_req_is_complete(struct hci_dev *hdev)</div><div class='hunk'>@@ -4272,23 +3981,28 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If we reach this point this event matches the last command sent */</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_CMD_PENDING);</div><div class='add'>+</div><div class='ctx'> 	/* If the command succeeded and there's still more commands in</div><div class='ctx'> 	 * this request the request is not yet complete.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!status &amp;&amp; !hci_req_is_complete(hdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	skb = hdev-&gt;req_skb;</div><div class='add'>+</div><div class='ctx'> 	/* If this was the last command in a request the complete</div><div class='del'>-	 * callback would be found in hdev-&gt;sent_cmd instead of the</div><div class='add'>+	 * callback would be found in hdev-&gt;req_skb instead of the</div><div class='ctx'> 	 * command queue (hdev-&gt;cmd_q).</div><div class='ctx'> 	 */</div><div class='del'>-	if (bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_flags &amp; HCI_REQ_SKB) {</div><div class='del'>-		*req_complete_skb = bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_complete_skb;</div><div class='add'>+	if (skb &amp;&amp; bt_cb(skb)-&gt;hci.req_flags &amp; HCI_REQ_SKB) {</div><div class='add'>+		*req_complete_skb = bt_cb(skb)-&gt;hci.req_complete_skb;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_complete) {</div><div class='del'>-		*req_complete = bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_complete;</div><div class='add'>+	if (skb &amp;&amp; bt_cb(skb)-&gt;hci.req_complete) {</div><div class='add'>+		*req_complete = bt_cb(skb)-&gt;hci.req_complete;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4304,7 +4018,7 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status,</div><div class='ctx'> 			*req_complete_skb = bt_cb(skb)-&gt;hci.req_complete_skb;</div><div class='ctx'> 		else</div><div class='ctx'> 			*req_complete = bt_cb(skb)-&gt;hci.req_complete;</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		dev_kfree_skb_irq(skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;hdev-&gt;cmd_q.lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -4316,7 +4030,14 @@ static void hci_rx_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	while ((skb = skb_dequeue(&amp;hdev-&gt;rx_q))) {</div><div class='add'>+	/* The kcov_remote functions used for collecting packet parsing</div><div class='add'>+	 * coverage information from this background thread and associate</div><div class='add'>+	 * the coverage with the syscall's thread which originally injected</div><div class='add'>+	 * the packet. This helps fuzzing the kernel.</div><div class='add'>+	 */</div><div class='add'>+	for (; (skb = skb_dequeue(&amp;hdev-&gt;rx_q)); kcov_remote_stop()) {</div><div class='add'>+		kcov_remote_start_common(skb_get_kcov_handle(skb));</div><div class='add'>+</div><div class='ctx'> 		/* Send copy to monitor */</div><div class='ctx'> 		hci_send_to_monitor(hdev, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -4325,7 +4046,14 @@ static void hci_rx_work(struct work_struct *work)</div><div class='ctx'> 			hci_send_to_sock(hdev, skb);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='add'>+		/* If the device has been opened in HCI_USER_CHANNEL,</div><div class='add'>+		 * the userspace has exclusive access to device.</div><div class='add'>+		 * When device is HCI_INIT, we still need to process</div><div class='add'>+		 * the data packets to the driver in order</div><div class='add'>+		 * to complete its setup().</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='add'>+		    !test_bit(HCI_INIT, &amp;hdev-&gt;flags)) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4335,6 +4063,7 @@ static void hci_rx_work(struct work_struct *work)</div><div class='ctx'> 			switch (hci_skb_pkt_type(skb)) {</div><div class='ctx'> 			case HCI_ACLDATA_PKT:</div><div class='ctx'> 			case HCI_SCODATA_PKT:</div><div class='add'>+			case HCI_ISODATA_PKT:</div><div class='ctx'> 				kfree_skb(skb);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4357,6 +4086,11 @@ static void hci_rx_work(struct work_struct *work)</div><div class='ctx'> 			hci_scodata_packet(hdev, skb);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case HCI_ISODATA_PKT:</div><div class='add'>+			BT_DBG("%s ISO data packet", hdev-&gt;name);</div><div class='add'>+			hci_isodata_packet(hdev, skb);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4364,10 +4098,47 @@ static void hci_rx_work(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hci_send_cmd_sync(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "skb %p", skb);</div><div class='add'>+</div><div class='add'>+	kfree_skb(hdev-&gt;sent_cmd);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;sent_cmd = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+	if (!hdev-&gt;sent_cmd) {</div><div class='add'>+		skb_queue_head(&amp;hdev-&gt;cmd_q, skb);</div><div class='add'>+		queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_skb_opcode(skb) != HCI_OP_NOP) {</div><div class='add'>+		err = hci_send_frame(hdev, skb);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			hci_cmd_sync_cancel_sync(hdev, -err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		atomic_dec(&amp;hdev-&gt;cmd_cnt);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENODATA;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;req_status == HCI_REQ_PEND &amp;&amp;</div><div class='add'>+	    !hci_dev_test_and_set_flag(hdev, HCI_CMD_PENDING)) {</div><div class='add'>+		kfree_skb(hdev-&gt;req_skb);</div><div class='add'>+		hdev-&gt;req_skb = skb_clone(hdev-&gt;sent_cmd, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hci_cmd_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev, cmd_work);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s cmd_cnt %d cmd queued %d", hdev-&gt;name,</div><div class='ctx'> 	       atomic_read(&amp;hdev-&gt;cmd_cnt), skb_queue_len(&amp;hdev-&gt;cmd_q));</div><div class='hunk'>@@ -4378,20 +4149,17 @@ static void hci_cmd_work(struct work_struct *work)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		kfree_skb(hdev-&gt;sent_cmd);</div><div class='del'>-</div><div class='del'>-		hdev-&gt;sent_cmd = skb_clone(skb, GFP_KERNEL);</div><div class='del'>-		if (hdev-&gt;sent_cmd) {</div><div class='del'>-			atomic_dec(&amp;hdev-&gt;cmd_cnt);</div><div class='del'>-			hci_send_frame(hdev, skb);</div><div class='del'>-			if (test_bit(HCI_RESET, &amp;hdev-&gt;flags))</div><div class='del'>-				cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='del'>-			else</div><div class='del'>-				schedule_delayed_work(&amp;hdev-&gt;cmd_timer,</div><div class='del'>-						      HCI_CMD_TIMEOUT);</div><div class='del'>-		} else {</div><div class='del'>-			skb_queue_head(&amp;hdev-&gt;cmd_q, skb);</div><div class='del'>-			queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='del'>-		}</div><div class='add'>+		err = hci_send_cmd_sync(hdev, skb);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (test_bit(HCI_RESET, &amp;hdev-&gt;flags) ||</div><div class='add'>+		    hci_dev_test_flag(hdev, HCI_CMD_DRAIN_WORKQUEUE))</div><div class='add'>+			cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+		else</div><div class='add'>+			queue_delayed_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_timer,</div><div class='add'>+					   HCI_CMD_TIMEOUT);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c<br/>index 51f5b1efc3a5..99e2e9fc70e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_debugfs.c</a></div><div class='hunk'>@@ -22,10 +22,12 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/kstrtox.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "smp.h"</div><div class='ctx'> #include "hci_debugfs.h"</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_QUIRK_ATTRIBUTE(__name, __quirk)				      \</div><div class='hunk'>@@ -36,7 +38,7 @@ static ssize_t __name ## _read(struct file *file,			      \</div><div class='ctx'> 	struct hci_dev *hdev = file-&gt;private_data;			      \</div><div class='ctx'> 	char buf[3];							      \</div><div class='ctx'> 									      \</div><div class='del'>-	buf[0] = test_bit(__quirk, &amp;hdev-&gt;quirks) ? 'Y' : 'N';		      \</div><div class='add'>+	buf[0] = test_bit(__quirk, hdev-&gt;quirk_flags) ? 'Y' : 'N';	      \</div><div class='ctx'> 	buf[1] = '\n';							      \</div><div class='ctx'> 	buf[2] = '\0';							      \</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);	      \</div><div class='hunk'>@@ -57,10 +59,10 @@ static ssize_t __name ## _write(struct file *file,			      \</div><div class='ctx'> 	if (err)							      \</div><div class='ctx'> 		return err;						      \</div><div class='ctx'> 									      \</div><div class='del'>-	if (enable == test_bit(__quirk, &amp;hdev-&gt;quirks))			      \</div><div class='add'>+	if (enable == test_bit(__quirk, hdev-&gt;quirk_flags))		      \</div><div class='ctx'> 		return -EALREADY;					      \</div><div class='ctx'> 									      \</div><div class='del'>-	change_bit(__quirk, &amp;hdev-&gt;quirks);				      \</div><div class='add'>+	change_bit(__quirk, hdev-&gt;quirk_flags);				      \</div><div class='ctx'> 									      \</div><div class='ctx'> 	return count;							      \</div><div class='ctx'> }									      \</div><div class='hunk'>@@ -124,7 +126,7 @@ static int device_list_show(struct seq_file *f, void *ptr)</div><div class='ctx'> 	struct bdaddr_list *b;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='del'>-	list_for_each_entry(b, &amp;hdev-&gt;whitelist, list)</div><div class='add'>+	list_for_each_entry(b, &amp;hdev-&gt;accept_list, list)</div><div class='ctx'> 		seq_printf(f, "%pMR (type %u)\n", &amp;b-&gt;bdaddr, b-&gt;bdaddr_type);</div><div class='ctx'> 	list_for_each_entry(p, &amp;hdev-&gt;le_conn_params, list) {</div><div class='ctx'> 		seq_printf(f, "%pMR (type %u) %u\n", &amp;p-&gt;addr, p-&gt;addr_type,</div><div class='hunk'>@@ -143,7 +145,7 @@ static int blacklist_show(struct seq_file *f, void *p)</div><div class='ctx'> 	struct bdaddr_list *b;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='del'>-	list_for_each_entry(b, &amp;hdev-&gt;blacklist, list)</div><div class='add'>+	list_for_each_entry(b, &amp;hdev-&gt;reject_list, list)</div><div class='ctx'> 		seq_printf(f, "%pMR (type %u)\n", &amp;b-&gt;bdaddr, b-&gt;bdaddr_type);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +154,21 @@ static int blacklist_show(struct seq_file *f, void *p)</div><div class='ctx'> </div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(blacklist);</div><div class='ctx'> </div><div class='add'>+static int blocked_keys_show(struct seq_file *f, void *p)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = f-&gt;private;</div><div class='add'>+	struct blocked_key *key;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(key, &amp;hdev-&gt;blocked_keys, list)</div><div class='add'>+		seq_printf(f, "%u %*phN\n", key-&gt;type, 16, key-&gt;val);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(blocked_keys);</div><div class='add'>+</div><div class='ctx'> static int uuids_show(struct seq_file *f, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = f-&gt;private;</div><div class='hunk'>@@ -172,7 +189,7 @@ static int uuids_show(struct seq_file *f, void *p)</div><div class='ctx'> 	}</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-       return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(uuids);</div><div class='hunk'>@@ -200,10 +217,12 @@ static int conn_info_min_age_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val == 0 || val &gt; hdev-&gt;conn_info_max_age)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val == 0 || val &gt; hdev-&gt;conn_info_max_age) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;conn_info_min_age = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -221,17 +240,19 @@ static int conn_info_min_age_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(conn_info_min_age_fops, conn_info_min_age_get,</div><div class='del'>-			conn_info_min_age_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(conn_info_min_age_fops, conn_info_min_age_get,</div><div class='add'>+			  conn_info_min_age_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int conn_info_max_age_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val == 0 || val &lt; hdev-&gt;conn_info_min_age)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val == 0 || val &lt; hdev-&gt;conn_info_min_age) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;conn_info_max_age = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -249,8 +270,8 @@ static int conn_info_max_age_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(conn_info_max_age_fops, conn_info_max_age_get,</div><div class='del'>-			conn_info_max_age_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(conn_info_max_age_fops, conn_info_max_age_get,</div><div class='add'>+			  conn_info_max_age_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static ssize_t use_debug_keys_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='hunk'>@@ -258,7 +279,7 @@ static ssize_t use_debug_keys_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	struct hci_dev *hdev = file-&gt;private_data;</div><div class='ctx'> 	char buf[3];</div><div class='ctx'> </div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS) ? 'Y': 'N';</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS) ? 'Y' : 'N';</div><div class='ctx'> 	buf[1] = '\n';</div><div class='ctx'> 	buf[2] = '\0';</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='hunk'>@@ -276,7 +297,7 @@ static ssize_t sc_only_mode_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	struct hci_dev *hdev = file-&gt;private_data;</div><div class='ctx'> 	char buf[3];</div><div class='ctx'> </div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_SC_ONLY) ? 'Y': 'N';</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_SC_ONLY) ? 'Y' : 'N';</div><div class='ctx'> 	buf[1] = '\n';</div><div class='ctx'> 	buf[2] = '\0';</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='hunk'>@@ -308,6 +329,8 @@ void hci_debugfs_create_common(struct hci_dev *hdev)</div><div class='ctx'> 			    &amp;device_list_fops);</div><div class='ctx'> 	debugfs_create_file("blacklist", 0444, hdev-&gt;debugfs, hdev,</div><div class='ctx'> 			    &amp;blacklist_fops);</div><div class='add'>+	debugfs_create_file("blocked_keys", 0444, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;blocked_keys_fops);</div><div class='ctx'> 	debugfs_create_file("uuids", 0444, hdev-&gt;debugfs, hdev, &amp;uuids_fops);</div><div class='ctx'> 	debugfs_create_file("remote_oob", 0400, hdev-&gt;debugfs, hdev,</div><div class='ctx'> 			    &amp;remote_oob_fops);</div><div class='hunk'>@@ -401,8 +424,8 @@ static int voice_setting_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(voice_setting_fops, voice_setting_get,</div><div class='del'>-			NULL, "0x%4.4llx\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(voice_setting_fops, voice_setting_get,</div><div class='add'>+			  NULL, "0x%4.4llx\n");</div><div class='ctx'> </div><div class='ctx'> static ssize_t ssp_debug_mode_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='hunk'>@@ -410,7 +433,7 @@ static ssize_t ssp_debug_mode_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	struct hci_dev *hdev = file-&gt;private_data;</div><div class='ctx'> 	char buf[3];</div><div class='ctx'> </div><div class='del'>-	buf[0] = hdev-&gt;ssp_debug_mode ? 'Y': 'N';</div><div class='add'>+	buf[0] = hdev-&gt;ssp_debug_mode ? 'Y' : 'N';</div><div class='ctx'> 	buf[1] = '\n';</div><div class='ctx'> 	buf[2] = '\0';</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='hunk'>@@ -433,6 +456,35 @@ static int auto_accept_delay_set(void *data, u64 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int min_encrypt_key_size_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	if (val &lt; 1 || val &gt; 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hdev-&gt;min_enc_key_size = val;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int min_encrypt_key_size_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	*val = hdev-&gt;min_enc_key_size;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(min_encrypt_key_size_fops,</div><div class='add'>+			  min_encrypt_key_size_get,</div><div class='add'>+			  min_encrypt_key_size_set, "%llu\n");</div><div class='add'>+</div><div class='ctx'> static int auto_accept_delay_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='hunk'>@@ -444,8 +496,47 @@ static int auto_accept_delay_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(auto_accept_delay_fops, auto_accept_delay_get,</div><div class='del'>-			auto_accept_delay_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(auto_accept_delay_fops, auto_accept_delay_get,</div><div class='add'>+			  auto_accept_delay_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static ssize_t force_bredr_smp_read(struct file *file,</div><div class='add'>+				    char __user *user_buf,</div><div class='add'>+				    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP) ? 'Y' : 'N';</div><div class='add'>+	buf[1] = '\n';</div><div class='add'>+	buf[2] = '\0';</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t force_bredr_smp_write(struct file *file,</div><div class='add'>+				     const char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	bool enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = smp_force_bredr(hdev, enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations force_bredr_smp_fops = {</div><div class='add'>+	.open		= simple_open,</div><div class='add'>+	.read		= force_bredr_smp_read,</div><div class='add'>+	.write		= force_bredr_smp_write,</div><div class='add'>+	.llseek		= default_llseek,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int idle_timeout_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -472,17 +563,19 @@ static int idle_timeout_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(idle_timeout_fops, idle_timeout_get,</div><div class='del'>-			idle_timeout_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(idle_timeout_fops, idle_timeout_get,</div><div class='add'>+			  idle_timeout_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int sniff_min_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val == 0 || val % 2 || val &gt; hdev-&gt;sniff_max_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val == 0 || val % 2 || val &gt; hdev-&gt;sniff_max_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;sniff_min_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -500,17 +593,19 @@ static int sniff_min_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(sniff_min_interval_fops, sniff_min_interval_get,</div><div class='del'>-			sniff_min_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(sniff_min_interval_fops, sniff_min_interval_get,</div><div class='add'>+			  sniff_min_interval_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int sniff_max_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val == 0 || val % 2 || val &lt; hdev-&gt;sniff_min_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val == 0 || val % 2 || val &lt; hdev-&gt;sniff_min_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;sniff_max_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -528,8 +623,8 @@ static int sniff_max_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(sniff_max_interval_fops, sniff_max_interval_get,</div><div class='del'>-			sniff_max_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(sniff_max_interval_fops, sniff_max_interval_get,</div><div class='add'>+			  sniff_max_interval_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> void hci_debugfs_create_bredr(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -542,9 +637,22 @@ void hci_debugfs_create_bredr(struct hci_dev *hdev)</div><div class='ctx'> 	debugfs_create_file("voice_setting", 0444, hdev-&gt;debugfs, hdev,</div><div class='ctx'> 			    &amp;voice_setting_fops);</div><div class='ctx'> </div><div class='add'>+	/* If the controller does not support BR/EDR Secure Connections</div><div class='add'>+	 * feature, then the BR/EDR SMP channel shall not be present.</div><div class='add'>+	 *</div><div class='add'>+	 * To test this with Bluetooth 4.0 controllers, create a debugfs</div><div class='add'>+	 * switch that allows forcing BR/EDR SMP support and accepting</div><div class='add'>+	 * cross-transport pairing on non-AES encrypted connections.</div><div class='add'>+	 */</div><div class='add'>+	if (!lmp_sc_capable(hdev))</div><div class='add'>+		debugfs_create_file("force_bredr_smp", 0644, hdev-&gt;debugfs,</div><div class='add'>+				    hdev, &amp;force_bredr_smp_fops);</div><div class='add'>+</div><div class='ctx'> 	if (lmp_ssp_capable(hdev)) {</div><div class='ctx'> 		debugfs_create_file("ssp_debug_mode", 0444, hdev-&gt;debugfs,</div><div class='ctx'> 				    hdev, &amp;ssp_debug_mode_fops);</div><div class='add'>+		debugfs_create_file("min_encrypt_key_size", 0644, hdev-&gt;debugfs,</div><div class='add'>+				    hdev, &amp;min_encrypt_key_size_fops);</div><div class='ctx'> 		debugfs_create_file("auto_accept_delay", 0644, hdev-&gt;debugfs,</div><div class='ctx'> 				    hdev, &amp;auto_accept_delay_fops);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -607,8 +715,8 @@ static int rpa_timeout_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(rpa_timeout_fops, rpa_timeout_get,</div><div class='del'>-			rpa_timeout_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(rpa_timeout_fops, rpa_timeout_get,</div><div class='add'>+			  rpa_timeout_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int random_address_show(struct seq_file *f, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -643,7 +751,7 @@ static ssize_t force_static_address_read(struct file *file,</div><div class='ctx'> 	struct hci_dev *hdev = file-&gt;private_data;</div><div class='ctx'> 	char buf[3];</div><div class='ctx'> </div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ? 'Y': 'N';</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ? 'Y' : 'N';</div><div class='ctx'> 	buf[1] = '\n';</div><div class='ctx'> 	buf[2] = '\0';</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='hunk'>@@ -657,7 +765,7 @@ static ssize_t force_static_address_write(struct file *file,</div><div class='ctx'> 	bool enable;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+	if (hdev_is_powered(hdev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='hunk'>@@ -685,7 +793,7 @@ static int white_list_show(struct seq_file *f, void *ptr)</div><div class='ctx'> 	struct bdaddr_list *b;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='del'>-	list_for_each_entry(b, &amp;hdev-&gt;le_white_list, list)</div><div class='add'>+	list_for_each_entry(b, &amp;hdev-&gt;le_accept_list, list)</div><div class='ctx'> 		seq_printf(f, "%pMR (type %u)\n", &amp;b-&gt;bdaddr, b-&gt;bdaddr_type);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -749,10 +857,12 @@ static int conn_min_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; 0x0006 || val &gt; 0x0c80 || val &gt; hdev-&gt;le_conn_max_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &lt; 0x0006 || val &gt; 0x0c80 || val &gt; hdev-&gt;le_conn_max_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;le_conn_min_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -770,17 +880,19 @@ static int conn_min_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(conn_min_interval_fops, conn_min_interval_get,</div><div class='del'>-			conn_min_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(conn_min_interval_fops, conn_min_interval_get,</div><div class='add'>+			  conn_min_interval_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int conn_max_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; 0x0006 || val &gt; 0x0c80 || val &lt; hdev-&gt;le_conn_min_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &lt; 0x0006 || val &gt; 0x0c80 || val &lt; hdev-&gt;le_conn_min_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;le_conn_max_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -798,8 +910,8 @@ static int conn_max_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(conn_max_interval_fops, conn_max_interval_get,</div><div class='del'>-			conn_max_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(conn_max_interval_fops, conn_max_interval_get,</div><div class='add'>+			  conn_max_interval_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int conn_latency_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -826,8 +938,8 @@ static int conn_latency_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(conn_latency_fops, conn_latency_get,</div><div class='del'>-			conn_latency_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(conn_latency_fops, conn_latency_get,</div><div class='add'>+			  conn_latency_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int supervision_timeout_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -854,8 +966,8 @@ static int supervision_timeout_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(supervision_timeout_fops, supervision_timeout_get,</div><div class='del'>-			supervision_timeout_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(supervision_timeout_fops, supervision_timeout_get,</div><div class='add'>+			  supervision_timeout_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int adv_channel_map_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -882,17 +994,19 @@ static int adv_channel_map_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(adv_channel_map_fops, adv_channel_map_get,</div><div class='del'>-			adv_channel_map_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(adv_channel_map_fops, adv_channel_map_get,</div><div class='add'>+			  adv_channel_map_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int adv_min_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; 0x0020 || val &gt; 0x4000 || val &gt; hdev-&gt;le_adv_max_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &lt; 0x0020 || val &gt; 0x4000 || val &gt; hdev-&gt;le_adv_max_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;le_adv_min_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -910,17 +1024,19 @@ static int adv_min_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(adv_min_interval_fops, adv_min_interval_get,</div><div class='del'>-			adv_min_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(adv_min_interval_fops, adv_min_interval_get,</div><div class='add'>+			  adv_min_interval_set, "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int adv_max_interval_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = data;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; 0x0020 || val &gt; 0x4000 || val &lt; hdev-&gt;le_adv_min_interval)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &lt; 0x0020 || val &gt; 0x4000 || val &lt; hdev-&gt;le_adv_min_interval) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;le_adv_max_interval = val;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -938,8 +1054,141 @@ static int adv_max_interval_get(void *data, u64 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(adv_max_interval_fops, adv_max_interval_get,</div><div class='del'>-			adv_max_interval_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(adv_max_interval_fops, adv_max_interval_get,</div><div class='add'>+			  adv_max_interval_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static int min_key_size_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &gt; hdev-&gt;le_max_key_size || val &lt; SMP_MIN_ENC_KEY_SIZE) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;le_min_key_size = val;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int min_key_size_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	*val = hdev-&gt;le_min_key_size;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(min_key_size_fops, min_key_size_get,</div><div class='add'>+			  min_key_size_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static int max_key_size_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	if (val &gt; SMP_MAX_ENC_KEY_SIZE || val &lt; hdev-&gt;le_min_key_size) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;le_max_key_size = val;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max_key_size_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	*val = hdev-&gt;le_max_key_size;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(max_key_size_fops, max_key_size_get,</div><div class='add'>+			  max_key_size_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static int auth_payload_timeout_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	if (val &lt; 0x0001 || val &gt; 0xffff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hdev-&gt;auth_payload_timeout = val;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int auth_payload_timeout_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	*val = hdev-&gt;auth_payload_timeout;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(auth_payload_timeout_fops,</div><div class='add'>+			  auth_payload_timeout_get,</div><div class='add'>+			  auth_payload_timeout_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static ssize_t force_no_mitm_read(struct file *file,</div><div class='add'>+				  char __user *user_buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_NO_MITM) ? 'Y' : 'N';</div><div class='add'>+	buf[1] = '\n';</div><div class='add'>+	buf[2] = '\0';</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t force_no_mitm_write(struct file *file,</div><div class='add'>+				   const char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	char buf[32];</div><div class='add'>+	size_t buf_size = min(count, (sizeof(buf) - 1));</div><div class='add'>+	bool enable;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[buf_size] = '\0';</div><div class='add'>+	if (kstrtobool(buf, &amp;enable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (enable == hci_dev_test_flag(hdev, HCI_FORCE_NO_MITM))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	hci_dev_change_flag(hdev, HCI_FORCE_NO_MITM);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations force_no_mitm_fops = {</div><div class='add'>+	.open		= simple_open,</div><div class='add'>+	.read		= force_no_mitm_read,</div><div class='add'>+	.write		= force_no_mitm_write,</div><div class='add'>+	.llseek		= default_llseek,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> DEFINE_QUIRK_ATTRIBUTE(quirk_strict_duplicate_filter,</div><div class='ctx'> 		       HCI_QUIRK_STRICT_DUPLICATE_FILTER);</div><div class='hunk'>@@ -967,7 +1216,7 @@ void hci_debugfs_create_le(struct hci_dev *hdev)</div><div class='ctx'> 				    &amp;force_static_address_fops);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_u8("white_list_size", 0444, hdev-&gt;debugfs,</div><div class='del'>-			  &amp;hdev-&gt;le_white_list_size);</div><div class='add'>+			  &amp;hdev-&gt;le_accept_list_size);</div><div class='ctx'> 	debugfs_create_file("white_list", 0444, hdev-&gt;debugfs, hdev,</div><div class='ctx'> 			    &amp;white_list_fops);</div><div class='ctx'> 	debugfs_create_u8("resolv_list_size", 0444, hdev-&gt;debugfs,</div><div class='hunk'>@@ -994,6 +1243,14 @@ void hci_debugfs_create_le(struct hci_dev *hdev)</div><div class='ctx'> 			    &amp;adv_max_interval_fops);</div><div class='ctx'> 	debugfs_create_u16("discov_interleaved_timeout", 0644, hdev-&gt;debugfs,</div><div class='ctx'> 			   &amp;hdev-&gt;discov_interleaved_timeout);</div><div class='add'>+	debugfs_create_file("min_key_size", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;min_key_size_fops);</div><div class='add'>+	debugfs_create_file("max_key_size", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;max_key_size_fops);</div><div class='add'>+	debugfs_create_file("auth_payload_timeout", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;auth_payload_timeout_fops);</div><div class='add'>+	debugfs_create_file("force_no_mitm", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;force_no_mitm_fops);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_file("quirk_strict_duplicate_filter", 0644,</div><div class='ctx'> 			    hdev-&gt;debugfs, hdev,</div><div class='hunk'>@@ -1008,9 +1265,131 @@ void hci_debugfs_create_conn(struct hci_conn *conn)</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> 	char name[6];</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(hdev-&gt;debugfs))</div><div class='add'>+	if (IS_ERR_OR_NULL(hdev-&gt;debugfs) || conn-&gt;debugfs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, sizeof(name), "%u", conn-&gt;handle);</div><div class='ctx'> 	conn-&gt;debugfs = debugfs_create_dir(name, hdev-&gt;debugfs);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static ssize_t dut_mode_read(struct file *file, char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_DUT_MODE) ? 'Y' : 'N';</div><div class='add'>+	buf[1] = '\n';</div><div class='add'>+	buf[2] = '\0';</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dut_mode_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (enable == hci_dev_test_flag(hdev, HCI_DUT_MODE))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	if (enable)</div><div class='add'>+		skb = __hci_cmd_sync(hdev, HCI_OP_ENABLE_DUT_MODE, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+	else</div><div class='add'>+		skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	hci_dev_change_flag(hdev, HCI_DUT_MODE);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations dut_mode_fops = {</div><div class='add'>+	.open		= simple_open,</div><div class='add'>+	.read		= dut_mode_read,</div><div class='add'>+	.write		= dut_mode_write,</div><div class='add'>+	.llseek		= default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t vendor_diag_read(struct file *file, char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = hci_dev_test_flag(hdev, HCI_VENDOR_DIAG) ? 'Y' : 'N';</div><div class='add'>+	buf[1] = '\n';</div><div class='add'>+	buf[2] = '\0';</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vendor_diag_write(struct file *file, const char __user *user_buf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = file-&gt;private_data;</div><div class='add'>+	bool enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* When the diagnostic flags are not persistent and the transport</div><div class='add'>+	 * is not active or in user channel operation, then there is no need</div><div class='add'>+	 * for the vendor callback. Instead just store the desired value and</div><div class='add'>+	 * the setting will be programmed when the controller gets powered on.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_NON_PERSISTENT_DIAG) &amp;&amp;</div><div class='add'>+	    (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags) ||</div><div class='add'>+	     hci_dev_test_flag(hdev, HCI_USER_CHANNEL)))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	err = hdev-&gt;set_diag(hdev, enable);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (enable)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_VENDOR_DIAG);</div><div class='add'>+	else</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_VENDOR_DIAG);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations vendor_diag_fops = {</div><div class='add'>+	.open		= simple_open,</div><div class='add'>+	.read		= vendor_diag_read,</div><div class='add'>+	.write		= vendor_diag_write,</div><div class='add'>+	.llseek		= default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void hci_debugfs_create_basic(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("dut_mode", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+			    &amp;dut_mode_fops);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;set_diag)</div><div class='add'>+		debugfs_create_file("vendor_diag", 0644, hdev-&gt;debugfs, hdev,</div><div class='add'>+				    &amp;vendor_diag_fops);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/hci_debugfs.h b/net/bluetooth/hci_debugfs.h<br/>index 4444dc8cedc2..9a8a7c93bb12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_debugfs.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_debugfs.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@ void hci_debugfs_create_common(struct hci_dev *hdev);</div><div class='ctx'> void hci_debugfs_create_bredr(struct hci_dev *hdev);</div><div class='ctx'> void hci_debugfs_create_le(struct hci_dev *hdev);</div><div class='ctx'> void hci_debugfs_create_conn(struct hci_conn *conn);</div><div class='add'>+void hci_debugfs_create_basic(struct hci_dev *hdev);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -45,4 +46,8 @@ static inline void hci_debugfs_create_conn(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void hci_debugfs_create_basic(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/bluetooth/hci_drv.c b/net/bluetooth/hci_drv.c<br/>new file mode 100644<br/>index 000000000000..3dd2d8a006b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_drv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_drv.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_drv.h&gt;</div><div class='add'>+</div><div class='add'>+int hci_drv_cmd_status(struct hci_dev *hdev, u16 cmd, u8 status)</div><div class='add'>+{</div><div class='add'>+	struct hci_drv_ev_hdr *hdr;</div><div class='add'>+	struct hci_drv_ev_cmd_status *ev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_alloc(sizeof(*hdr) + sizeof(*ev), GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;opcode = __cpu_to_le16(HCI_DRV_EV_CMD_STATUS);</div><div class='add'>+	hdr-&gt;len = __cpu_to_le16(sizeof(*ev));</div><div class='add'>+</div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='add'>+	ev-&gt;opcode = __cpu_to_le16(cmd);</div><div class='add'>+	ev-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	hci_skb_pkt_type(skb) = HCI_DRV_PKT;</div><div class='add'>+</div><div class='add'>+	return hci_recv_frame(hdev, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_drv_cmd_status);</div><div class='add'>+</div><div class='add'>+int hci_drv_cmd_complete(struct hci_dev *hdev, u16 cmd, u8 status, void *rp,</div><div class='add'>+			 size_t rp_len)</div><div class='add'>+{</div><div class='add'>+	struct hci_drv_ev_hdr *hdr;</div><div class='add'>+	struct hci_drv_ev_cmd_complete *ev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_alloc(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;opcode = __cpu_to_le16(HCI_DRV_EV_CMD_COMPLETE);</div><div class='add'>+	hdr-&gt;len = __cpu_to_le16(sizeof(*ev) + rp_len);</div><div class='add'>+</div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='add'>+	ev-&gt;opcode = __cpu_to_le16(cmd);</div><div class='add'>+	ev-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, rp, rp_len);</div><div class='add'>+</div><div class='add'>+	hci_skb_pkt_type(skb) = HCI_DRV_PKT;</div><div class='add'>+</div><div class='add'>+	return hci_recv_frame(hdev, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_drv_cmd_complete);</div><div class='add'>+</div><div class='add'>+int hci_drv_process_cmd(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_drv_cmd_hdr *hdr;</div><div class='add'>+	const struct hci_drv_handler *handler = NULL;</div><div class='add'>+	u16 opcode, len, ogf, ocf;</div><div class='add'>+</div><div class='add'>+	hdr = skb_pull_data(skb, sizeof(*hdr));</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+</div><div class='add'>+	opcode = __le16_to_cpu(hdr-&gt;opcode);</div><div class='add'>+	len = __le16_to_cpu(hdr-&gt;len);</div><div class='add'>+	if (len != skb-&gt;len)</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+</div><div class='add'>+	ogf = hci_opcode_ogf(opcode);</div><div class='add'>+	ocf = hci_opcode_ocf(opcode);</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;hci_drv)</div><div class='add'>+		return hci_drv_cmd_status(hdev, opcode,</div><div class='add'>+					  HCI_DRV_STATUS_UNKNOWN_COMMAND);</div><div class='add'>+</div><div class='add'>+	if (ogf != HCI_DRV_OGF_DRIVER_SPECIFIC) {</div><div class='add'>+		if (opcode &lt; hdev-&gt;hci_drv-&gt;common_handler_count)</div><div class='add'>+			handler = &amp;hdev-&gt;hci_drv-&gt;common_handlers[opcode];</div><div class='add'>+	} else {</div><div class='add'>+		if (ocf &lt; hdev-&gt;hci_drv-&gt;specific_handler_count)</div><div class='add'>+			handler = &amp;hdev-&gt;hci_drv-&gt;specific_handlers[ocf];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!handler || !handler-&gt;func)</div><div class='add'>+		return hci_drv_cmd_status(hdev, opcode,</div><div class='add'>+					  HCI_DRV_STATUS_UNKNOWN_COMMAND);</div><div class='add'>+</div><div class='add'>+	if (len != handler-&gt;data_len)</div><div class='add'>+		return hci_drv_cmd_status(hdev, opcode,</div><div class='add'>+					  HCI_DRV_STATUS_INVALID_PARAMETERS);</div><div class='add'>+</div><div class='add'>+	return handler-&gt;func(hdev, skb-&gt;data, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_drv_process_cmd);</div><div class='head'>diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c<br/>index f12555f23a49..a9868f17ef40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_event.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_event.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>    BlueZ - Bluetooth protocol stack for Linux</div><div class='ctx'>    Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.</div><div class='add'>+   Copyright 2023-2024 NXP</div><div class='ctx'> </div><div class='ctx'>    Written 2000,2001 by Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,31 +25,82 @@</div><div class='ctx'> </div><div class='ctx'> /* Bluetooth HCI event handling. */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/mgmt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hci_request.h"</div><div class='ctx'> #include "hci_debugfs.h"</div><div class='del'>-#include "a2mp.h"</div><div class='del'>-#include "amp.h"</div><div class='add'>+#include "hci_codec.h"</div><div class='ctx'> #include "smp.h"</div><div class='add'>+#include "msft.h"</div><div class='add'>+#include "eir.h"</div><div class='ctx'> </div><div class='ctx'> #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \</div><div class='ctx'> 		 "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='ctx'> </div><div class='ctx'> /* Handle HCI Event packets */</div><div class='ctx'> </div><div class='del'>-static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void *hci_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='add'>+			     u8 ev, size_t len)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	void *data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	data = skb_pull_data(skb, len);</div><div class='add'>+	if (!data)</div><div class='add'>+		bt_dev_err(hdev, "Malformed Event: 0x%2.2x", ev);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hci_cc_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='add'>+			     u16 op, size_t len)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	data = skb_pull_data(skb, len);</div><div class='add'>+	if (!data)</div><div class='add'>+		bt_dev_err(hdev, "Malformed Command Complete: 0x%4.4x", op);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hci_le_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='add'>+				u8 ev, size_t len)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	data = skb_pull_data(skb, len);</div><div class='add'>+	if (!data)</div><div class='add'>+		bt_dev_err(hdev, "Malformed LE Event: 0x%2.2x", ev);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_inquiry_cancel(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* It is possible that we receive Inquiry Complete event right</div><div class='add'>+	 * before we receive Inquiry Cancel Command Complete event, in</div><div class='add'>+	 * which case the latter event should have status of Command</div><div class='add'>+	 * Disallowed. This should not be treated as error, since</div><div class='add'>+	 * we actually achieve what Inquiry Cancel wants to achieve,</div><div class='add'>+	 * which is to end the last Inquiry session.</div><div class='add'>+	 */</div><div class='add'>+	if (rp-&gt;status == HCI_ERROR_COMMAND_DISALLOWED &amp;&amp; !test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags)) {</div><div class='add'>+		bt_dev_warn(hdev, "Ignoring error of Inquiry Cancel command");</div><div class='add'>+		rp-&gt;status = 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCI_INQUIRY, &amp;hdev-&gt;flags);</div><div class='ctx'> 	smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */</div><div class='hunk'>@@ -63,50 +115,59 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_conn_check_pending(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_periodic_inq(struct hci_dev *hdev, void *data,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_PERIODIC_INQ);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_exit_periodic_inq(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);</div><div class='ctx'> </div><div class='del'>-	hci_conn_check_pending(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_remote_name_req_cancel(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	struct hci_rp_remote_name_req_cancel *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_role_discovery(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_role_discovery *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_role_discovery *rp = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -115,17 +176,20 @@ static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		conn-&gt;role = rp-&gt;role;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_link_policy(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_link_policy *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_link_policy *rp = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -134,22 +198,25 @@ static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		conn-&gt;link_policy = __le16_to_cpu(rp-&gt;policy);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_link_policy(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_write_link_policy *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_write_link_policy *rp = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LINK_POLICY);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -158,49 +225,55 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		conn-&gt;link_policy = get_unaligned_le16(sent + 2);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_def_link_policy(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_def_link_policy(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_def_link_policy *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_def_link_policy *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;link_policy = __le16_to_cpu(rp-&gt;policy);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_def_link_policy(struct hci_dev *hdev,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_def_link_policy(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;link_policy = get_unaligned_le16(sent);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_reset(struct hci_dev *hdev, void *data, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCI_RESET, &amp;hdev-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset all non-persistent flags */</div><div class='ctx'> 	hci_dev_clear_volatile_flags(hdev);</div><div class='hunk'>@@ -220,93 +293,109 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;ssp_debug_mode = 0;</div><div class='ctx'> </div><div class='del'>-	hci_bdaddr_list_clear(&amp;hdev-&gt;le_white_list);</div><div class='add'>+	hci_bdaddr_list_clear(&amp;hdev-&gt;le_accept_list);</div><div class='ctx'> 	hci_bdaddr_list_clear(&amp;hdev-&gt;le_resolv_list);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_stored_link_key(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_stored_link_key(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_stored_link_key *rp = (void *)skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_stored_link_key *rp = data;</div><div class='ctx'> 	struct hci_cp_read_stored_link_key *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_READ_STORED_LINK_KEY);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (!rp-&gt;status &amp;&amp; sent-&gt;read_all == 0x01) {</div><div class='del'>-		hdev-&gt;stored_max_keys = rp-&gt;max_keys;</div><div class='del'>-		hdev-&gt;stored_num_keys = rp-&gt;num_keys;</div><div class='add'>+		hdev-&gt;stored_max_keys = le16_to_cpu(rp-&gt;max_keys);</div><div class='add'>+		hdev-&gt;stored_num_keys = le16_to_cpu(rp-&gt;num_keys);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_delete_stored_link_key(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_delete_stored_link_key *rp = (void *)skb-&gt;data;</div><div class='add'>+	struct hci_rp_delete_stored_link_key *rp = data;</div><div class='add'>+	u16 num_keys;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	if (rp-&gt;num_keys &lt;= hdev-&gt;stored_num_keys)</div><div class='del'>-		hdev-&gt;stored_num_keys -= rp-&gt;num_keys;</div><div class='add'>+	num_keys = le16_to_cpu(rp-&gt;num_keys);</div><div class='add'>+</div><div class='add'>+	if (num_keys &lt;= hdev-&gt;stored_num_keys)</div><div class='add'>+		hdev-&gt;stored_num_keys -= num_keys;</div><div class='ctx'> 	else</div><div class='ctx'> 		hdev-&gt;stored_num_keys = 0;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_local_name(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='del'>-		mgmt_set_local_name_complete(hdev, sent, status);</div><div class='del'>-	else if (!status)</div><div class='add'>+		mgmt_set_local_name_complete(hdev, sent, rp-&gt;status);</div><div class='add'>+	else if (!rp-&gt;status)</div><div class='ctx'> 		memcpy(hdev-&gt;dev_name, sent, HCI_MAX_NAME_LENGTH);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_name(struct hci_dev *hdev, void *data,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_name *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_name *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='ctx'> 	    hci_dev_test_flag(hdev, HCI_CONFIG))</div><div class='ctx'> 		memcpy(hdev-&gt;dev_name, rp-&gt;name, HCI_MAX_NAME_LENGTH);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_auth_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!status) {</div><div class='add'>+	if (!rp-&gt;status) {</div><div class='ctx'> 		__u8 param = *((__u8 *) sent);</div><div class='ctx'> </div><div class='ctx'> 		if (param == AUTH_ENABLED)</div><div class='hunk'>@@ -316,25 +405,28 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='del'>-		mgmt_auth_enable_complete(hdev, status);</div><div class='add'>+		mgmt_auth_enable_complete(hdev, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_encrypt_mode(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	__u8 param;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	param = *((__u8 *) sent);</div><div class='ctx'> </div><div class='hunk'>@@ -342,25 +434,28 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		set_bit(HCI_ENCRYPT, &amp;hdev-&gt;flags);</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(HCI_ENCRYPT, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_scan_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	__u8 param;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	param = *((__u8 *) sent);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='add'>+	if (rp-&gt;status) {</div><div class='ctx'> 		hdev-&gt;discov_timeout = 0;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -377,135 +472,178 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_set_event_filter(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_class_of_dev *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct hci_cp_set_event_filter *cp;</div><div class='add'>+	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_SET_EVENT_FLT);</div><div class='add'>+	if (!sent)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	cp = (struct hci_cp_set_event_filter *)sent;</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;flt_type == HCI_FLT_CLEAR_ALL)</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_EVENT_FILTER_CONFIGURED);</div><div class='add'>+	else</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_EVENT_FILTER_CONFIGURED);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_read_class_of_dev(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_read_class_of_dev *rp = data;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!hdev))</div><div class='add'>+		return HCI_ERROR_UNSPECIFIED;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hdev-&gt;dev_class, rp-&gt;dev_class, 3);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s class 0x%.2x%.2x%.2x", hdev-&gt;name,</div><div class='del'>-	       hdev-&gt;dev_class[2], hdev-&gt;dev_class[1], hdev-&gt;dev_class[0]);</div><div class='add'>+	bt_dev_dbg(hdev, "class 0x%.2x%.2x%.2x", hdev-&gt;dev_class[2],</div><div class='add'>+		   hdev-&gt;dev_class[1], hdev-&gt;dev_class[0]);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_class_of_dev(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (status == 0)</div><div class='add'>+	if (!rp-&gt;status)</div><div class='ctx'> 		memcpy(hdev-&gt;dev_class, sent, 3);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='del'>-		mgmt_set_class_of_dev_complete(hdev, sent, status);</div><div class='add'>+		mgmt_set_class_of_dev_complete(hdev, sent, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_voice_setting(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_voice_setting *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_voice_setting *rp = data;</div><div class='ctx'> 	__u16 setting;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	setting = __le16_to_cpu(rp-&gt;voice_setting);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;voice_setting == setting)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;voice_setting = setting;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s voice setting 0x%4.4x", hdev-&gt;name, setting);</div><div class='add'>+	bt_dev_dbg(hdev, "voice setting 0x%4.4x", setting);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;notify)</div><div class='ctx'> 		hdev-&gt;notify(hdev, HCI_NOTIFY_VOICE_SETTING);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_voice_setting(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_voice_setting(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	__u16 setting;</div><div class='ctx'> 	void *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_VOICE_SETTING);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	setting = get_unaligned_le16(sent);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;voice_setting == setting)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;voice_setting = setting;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s voice setting 0x%4.4x", hdev-&gt;name, setting);</div><div class='add'>+	bt_dev_dbg(hdev, "voice setting 0x%4.4x", setting);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;notify)</div><div class='ctx'> 		hdev-&gt;notify(hdev, HCI_NOTIFY_VOICE_SETTING);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_num_supported_iac(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_num_supported_iac(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_num_supported_iac *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_num_supported_iac *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;num_iac = rp-&gt;num_iac;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s num iac %d", hdev-&gt;name, hdev-&gt;num_iac);</div><div class='add'>+	bt_dev_dbg(hdev, "num iac %d", hdev-&gt;num_iac);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_ssp_mode(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_write_ssp_mode *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!status) {</div><div class='add'>+	if (!rp-&gt;status) {</div><div class='ctx'> 		if (sent-&gt;mode)</div><div class='ctx'> 			hdev-&gt;features[1][0] |= LMP_HOST_SSP;</div><div class='ctx'> 		else</div><div class='ctx'> 			hdev-&gt;features[1][0] &amp;= ~LMP_HOST_SSP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='del'>-		mgmt_ssp_enable_complete(hdev, sent-&gt;mode, status);</div><div class='del'>-	else if (!status) {</div><div class='add'>+	if (!rp-&gt;status) {</div><div class='ctx'> 		if (sent-&gt;mode)</div><div class='ctx'> 			hci_dev_set_flag(hdev, HCI_SSP_ENABLED);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -513,29 +651,32 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_sc_support(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_sc_support(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 status = *((u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_write_sc_support *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SC_SUPPORT);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!status) {</div><div class='add'>+	if (!rp-&gt;status) {</div><div class='ctx'> 		if (sent-&gt;support)</div><div class='ctx'> 			hdev-&gt;features[1][0] |= LMP_HOST_SC;</div><div class='ctx'> 		else</div><div class='ctx'> 			hdev-&gt;features[1][0] &amp;= ~LMP_HOST_SC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp; !status) {</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp; !rp-&gt;status) {</div><div class='ctx'> 		if (sent-&gt;support)</div><div class='ctx'> 			hci_dev_set_flag(hdev, HCI_SC_ENABLED);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -543,16 +684,19 @@ static void hci_cc_write_sc_support(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_version(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_version *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_version *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='ctx'> 	    hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='hunk'>@@ -562,32 +706,154 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		hdev-&gt;manufacturer = __le16_to_cpu(rp-&gt;manufacturer);</div><div class='ctx'> 		hdev-&gt;lmp_subver = __le16_to_cpu(rp-&gt;lmp_subver);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_commands(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_enc_key_size(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_commands *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_enc_key_size *rp = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	u16 handle;</div><div class='add'>+	u8 status = rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='add'>+</div><div class='add'>+	handle = le16_to_cpu(rp-&gt;handle);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		status = 0xFF;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* While unexpected, the read_enc_key_size command may fail. The most</div><div class='add'>+	 * secure approach is to then assume the key size is 0 to force a</div><div class='add'>+	 * disconnection.</div><div class='add'>+	 */</div><div class='add'>+	if (status) {</div><div class='add'>+		bt_dev_err(hdev, "failed to read key size for handle %u",</div><div class='add'>+			   handle);</div><div class='add'>+		conn-&gt;enc_key_size = 0;</div><div class='add'>+	} else {</div><div class='add'>+		u8 *key_enc_size = hci_conn_key_enc_size(conn);</div><div class='add'>+</div><div class='add'>+		conn-&gt;enc_key_size = rp-&gt;key_size;</div><div class='add'>+		status = 0;</div><div class='add'>+</div><div class='add'>+		/* Attempt to check if the key size is too small or if it has</div><div class='add'>+		 * been downgraded from the last time it was stored as part of</div><div class='add'>+		 * the link_key.</div><div class='add'>+		 */</div><div class='add'>+		if (conn-&gt;enc_key_size &lt; hdev-&gt;min_enc_key_size ||</div><div class='add'>+		    (key_enc_size &amp;&amp; conn-&gt;enc_key_size &lt; *key_enc_size)) {</div><div class='add'>+			/* As slave role, the conn-&gt;state has been set to</div><div class='add'>+			 * BT_CONNECTED and l2cap conn req might not be received</div><div class='add'>+			 * yet, at this moment the l2cap layer almost does</div><div class='add'>+			 * nothing with the non-zero status.</div><div class='add'>+			 * So we also clear encrypt related bits, and then the</div><div class='add'>+			 * handler of l2cap conn req will get the right secure</div><div class='add'>+			 * state at a later time.</div><div class='add'>+			 */</div><div class='add'>+			status = HCI_ERROR_AUTH_FAILURE;</div><div class='add'>+			clear_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags);</div><div class='add'>+			clear_bit(HCI_CONN_AES_CCM, &amp;conn-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the key encryption size with the connection one */</div><div class='add'>+		if (key_enc_size &amp;&amp; *key_enc_size != conn-&gt;enc_key_size)</div><div class='add'>+			*key_enc_size = conn-&gt;enc_key_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_encrypt_cfm(conn, status);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_read_local_commands(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_read_local_commands *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='ctx'> 	    hci_dev_test_flag(hdev, HCI_CONFIG))</div><div class='ctx'> 		memcpy(hdev-&gt;commands, rp-&gt;commands, sizeof(hdev-&gt;commands));</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_features(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_auth_payload_timeout(struct hci_dev *hdev, void *data,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_features *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_auth_payload_to *rp = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp-&gt;handle));</div><div class='add'>+	if (conn)</div><div class='add'>+		conn-&gt;auth_payload_timeout = __le16_to_cpu(rp-&gt;timeout);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_write_auth_payload_timeout(struct hci_dev *hdev, void *data,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_write_auth_payload_to *rp = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	void *sent;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_PAYLOAD_TO);</div><div class='add'>+	if (!sent)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp-&gt;handle));</div><div class='add'>+	if (!conn) {</div><div class='add'>+		rp-&gt;status = 0xff;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rp-&gt;status)</div><div class='add'>+		conn-&gt;auth_payload_timeout = get_unaligned_le16(sent + 2);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_read_local_features(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_read_local_features *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hdev-&gt;features, rp-&gt;features, 8);</div><div class='ctx'> </div><div class='hunk'>@@ -627,178 +893,191 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;features[0][5] &amp; LMP_EDR_3S_ESCO)</div><div class='ctx'> 		hdev-&gt;esco_type |= (ESCO_2EV5 | ESCO_3EV5);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_ext_features(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_ext_features(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_ext_features *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_ext_features *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;max_page &lt; rp-&gt;max_page)</div><div class='del'>-		hdev-&gt;max_page = rp-&gt;max_page;</div><div class='add'>+	if (hdev-&gt;max_page &lt; rp-&gt;max_page) {</div><div class='add'>+		if (hci_test_quirk(hdev,</div><div class='add'>+				   HCI_QUIRK_BROKEN_LOCAL_EXT_FEATURES_PAGE_2))</div><div class='add'>+			bt_dev_warn(hdev, "broken local ext features page 2");</div><div class='add'>+		else</div><div class='add'>+			hdev-&gt;max_page = rp-&gt;max_page;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;page &lt; HCI_MAX_PAGES)</div><div class='ctx'> 		memcpy(hdev-&gt;features[rp-&gt;page], rp-&gt;features, 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_rp_read_flow_control_mode *rp = (void *) skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hdev-&gt;flow_ctl_mode = rp-&gt;mode;</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_buffer_size(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_buffer_size *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_buffer_size *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;acl_mtu  = __le16_to_cpu(rp-&gt;acl_mtu);</div><div class='ctx'> 	hdev-&gt;sco_mtu  = rp-&gt;sco_mtu;</div><div class='ctx'> 	hdev-&gt;acl_pkts = __le16_to_cpu(rp-&gt;acl_max_pkt);</div><div class='ctx'> 	hdev-&gt;sco_pkts = __le16_to_cpu(rp-&gt;sco_max_pkt);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &amp;hdev-&gt;quirks)) {</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_FIXUP_BUFFER_SIZE)) {</div><div class='ctx'> 		hdev-&gt;sco_mtu  = 64;</div><div class='ctx'> 		hdev-&gt;sco_pkts = 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!read_voice_setting_capable(hdev))</div><div class='add'>+		hdev-&gt;sco_pkts = 0;</div><div class='add'>+</div><div class='ctx'> 	hdev-&gt;acl_cnt = hdev-&gt;acl_pkts;</div><div class='ctx'> 	hdev-&gt;sco_cnt = hdev-&gt;sco_pkts;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev-&gt;name, hdev-&gt;acl_mtu,</div><div class='ctx'> 	       hdev-&gt;acl_pkts, hdev-&gt;sco_mtu, hdev-&gt;sco_pkts);</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;acl_mtu || !hdev-&gt;acl_pkts)</div><div class='add'>+		return HCI_ERROR_INVALID_PARAMETERS;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_bd_addr(struct hci_dev *hdev, void *data,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_bd_addr *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_bd_addr *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HCI_INIT, &amp;hdev-&gt;flags))</div><div class='ctx'> 		bacpy(&amp;hdev-&gt;bdaddr, &amp;rp-&gt;bdaddr);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SETUP))</div><div class='ctx'> 		bacpy(&amp;hdev-&gt;setup_addr, &amp;rp-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_page_scan_activity(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_pairing_opts(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_page_scan_activity *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_pairing_opts *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='add'>+		hdev-&gt;pairing_opts = rp-&gt;pairing_opts;</div><div class='add'>+		hdev-&gt;max_enc_key_size = rp-&gt;max_key_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_read_page_scan_activity(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_read_page_scan_activity *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HCI_INIT, &amp;hdev-&gt;flags)) {</div><div class='ctx'> 		hdev-&gt;page_scan_interval = __le16_to_cpu(rp-&gt;interval);</div><div class='ctx'> 		hdev-&gt;page_scan_window = __le16_to_cpu(rp-&gt;window);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_page_scan_activity(struct hci_dev *hdev,</div><div class='del'>-					    struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_page_scan_activity(struct hci_dev *hdev, void *data,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 status = *((u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_write_page_scan_activity *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;page_scan_interval = __le16_to_cpu(sent-&gt;interval);</div><div class='ctx'> 	hdev-&gt;page_scan_window = __le16_to_cpu(sent-&gt;window);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_page_scan_type(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_page_scan_type(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_page_scan_type *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_page_scan_type *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HCI_INIT, &amp;hdev-&gt;flags))</div><div class='ctx'> 		hdev-&gt;page_scan_type = rp-&gt;type;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_page_scan_type(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_page_scan_type(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 status = *((u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	u8 *type;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	type = hci_sent_cmd_data(hdev, HCI_OP_WRITE_PAGE_SCAN_TYPE);</div><div class='ctx'> 	if (type)</div><div class='ctx'> 		hdev-&gt;page_scan_type = *type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_cc_read_data_block_size(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_rp_read_data_block_size *rp = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hdev-&gt;block_mtu = __le16_to_cpu(rp-&gt;max_acl_len);</div><div class='del'>-	hdev-&gt;block_len = __le16_to_cpu(rp-&gt;block_len);</div><div class='del'>-	hdev-&gt;num_blocks = __le16_to_cpu(rp-&gt;num_blocks);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;block_cnt = hdev-&gt;num_blocks;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s blk mtu %d cnt %d len %d", hdev-&gt;name, hdev-&gt;block_mtu,</div><div class='del'>-	       hdev-&gt;block_cnt, hdev-&gt;block_len);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_clock(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_clock(struct hci_dev *hdev, void *data,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_clock *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_clock *rp = data;</div><div class='ctx'> 	struct hci_cp_read_clock *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='del'>-		return;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -819,50 +1098,67 @@ static void hci_cc_read_clock(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_amp_info(struct hci_dev *hdev,</div><div class='add'>+static u8 hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_amp_info *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_inq_rsp_tx_power *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;inq_tx_power = rp-&gt;tx_power;</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;amp_status = rp-&gt;amp_status;</div><div class='del'>-	hdev-&gt;amp_total_bw = __le32_to_cpu(rp-&gt;total_bw);</div><div class='del'>-	hdev-&gt;amp_max_bw = __le32_to_cpu(rp-&gt;max_bw);</div><div class='del'>-	hdev-&gt;amp_min_latency = __le32_to_cpu(rp-&gt;min_latency);</div><div class='del'>-	hdev-&gt;amp_max_pdu = __le32_to_cpu(rp-&gt;max_pdu);</div><div class='del'>-	hdev-&gt;amp_type = rp-&gt;amp_type;</div><div class='del'>-	hdev-&gt;amp_pal_cap = __le16_to_cpu(rp-&gt;pal_cap);</div><div class='del'>-	hdev-&gt;amp_assoc_size = __le16_to_cpu(rp-&gt;max_assoc_size);</div><div class='del'>-	hdev-&gt;amp_be_flush_to = __le32_to_cpu(rp-&gt;be_flush_to);</div><div class='del'>-	hdev-&gt;amp_max_flush_to = __le32_to_cpu(rp-&gt;max_flush_to);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_def_err_data_reporting(struct hci_dev *hdev, void *data,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_def_err_data_reporting *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;inq_tx_power = rp-&gt;tx_power;</div><div class='add'>+	hdev-&gt;err_data_reporting = rp-&gt;err_data_reporting;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_write_def_err_data_reporting(struct hci_dev *hdev, void *data,</div><div class='add'>+					      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct hci_cp_write_def_err_data_reporting *cp;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_ERR_DATA_REPORTING);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;err_data_reporting = cp-&gt;err_data_reporting;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_pin_code_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_pin_code_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_pin_code_reply *rp = data;</div><div class='ctx'> 	struct hci_cp_pin_code_reply *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -882,13 +1178,15 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_pin_code_neg_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_pin_code_neg_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_pin_code_neg_reply *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -897,17 +1195,19 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 						 rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_buffer_size(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_buffer_size(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_buffer_size *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_buffer_size *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_mtu = __le16_to_cpu(rp-&gt;le_mtu);</div><div class='ctx'> 	hdev-&gt;le_pkts = rp-&gt;le_max_pkt;</div><div class='hunk'>@@ -915,39 +1215,49 @@ static void hci_cc_le_read_buffer_size(struct hci_dev *hdev,</div><div class='ctx'> 	hdev-&gt;le_cnt = hdev-&gt;le_pkts;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s le mtu %d:%d", hdev-&gt;name, hdev-&gt;le_mtu, hdev-&gt;le_pkts);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;le_mtu &amp;&amp; hdev-&gt;le_mtu &lt; HCI_MIN_LE_MTU)</div><div class='add'>+		return HCI_ERROR_INVALID_PARAMETERS;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_local_features(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_local_features(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_local_features *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_local_features *rp = data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hdev-&gt;le_features, rp-&gt;features, 8);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_adv_tx_power(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_adv_tx_power(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_adv_tx_power *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_adv_tx_power *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;adv_tx_power = rp-&gt;tx_power;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_user_confirm_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_user_confirm_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_user_confirm_reply *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -956,14 +1266,16 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 						 rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_user_confirm_neg_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_user_confirm_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_user_confirm_reply *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -972,13 +1284,16 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,</div><div class='ctx'> 						     ACL_LINK, 0, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_user_passkey_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_user_confirm_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_user_confirm_reply *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -987,14 +1302,16 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 						 0, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_user_passkey_neg_reply(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_user_confirm_reply *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_user_confirm_reply *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1003,58 +1320,74 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,</div><div class='ctx'> 						     ACL_LINK, 0, rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_oob_data(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_oob_data(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_oob_data *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_oob_data *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_local_oob_ext_data(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_local_oob_ext_data(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_local_oob_ext_data *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_local_oob_ext_data *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_random_addr(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_random_addr(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	bdaddr_t *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_RANDOM_ADDR);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	bacpy(&amp;hdev-&gt;random_addr, sent);</div><div class='ctx'> </div><div class='add'>+	if (!bacmp(&amp;hdev-&gt;rpa, sent)) {</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_RPA_EXPIRED);</div><div class='add'>+		queue_delayed_work(hdev-&gt;workqueue, &amp;hdev-&gt;rpa_expired,</div><div class='add'>+				   secs_to_jiffies(hdev-&gt;rpa_timeout));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_default_phy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_default_phy(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_le_set_default_phy *cp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_DEFAULT_PHY);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1062,49 +1395,164 @@ static void hci_cc_le_set_default_phy(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hdev-&gt;le_rx_def_phys = cp-&gt;rx_phys;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_adv_set_random_addr(struct hci_dev *hdev,</div><div class='del'>-                                              struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_adv_set_random_addr(struct hci_dev *hdev, void *data,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_le_set_adv_set_rand_addr *cp;</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='add'>+	struct adv_info *adv;</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_ADV_SET_RAND_ADDR);</div><div class='del'>-	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+	/* Update only in case the adv instance since handle 0x00 shall be using</div><div class='add'>+	 * HCI_OP_LE_SET_RANDOM_ADDR since that allows both extended and</div><div class='add'>+	 * non-extended adverting.</div><div class='add'>+	 */</div><div class='add'>+	if (!cp || !cp-&gt;handle)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!hdev-&gt;cur_adv_instance) {</div><div class='del'>-		/* Store in hdev for instance 0 (Set adv and Directed advs) */</div><div class='del'>-		bacpy(&amp;hdev-&gt;random_addr, &amp;cp-&gt;bdaddr);</div><div class='del'>-	} else {</div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev,</div><div class='del'>-						     hdev-&gt;cur_adv_instance);</div><div class='del'>-		if (adv_instance)</div><div class='del'>-			bacpy(&amp;adv_instance-&gt;random_addr, &amp;cp-&gt;bdaddr);</div><div class='add'>+	adv = hci_find_adv_instance(hdev, cp-&gt;handle);</div><div class='add'>+	if (adv) {</div><div class='add'>+		bacpy(&amp;adv-&gt;random_addr, &amp;cp-&gt;bdaddr);</div><div class='add'>+		if (!bacmp(&amp;hdev-&gt;rpa, &amp;cp-&gt;bdaddr)) {</div><div class='add'>+			adv-&gt;rpa_expired = false;</div><div class='add'>+			queue_delayed_work(hdev-&gt;workqueue,</div><div class='add'>+					   &amp;adv-&gt;rpa_expired_cb,</div><div class='add'>+					   secs_to_jiffies(hdev-&gt;rpa_timeout));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_remove_adv_set(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 *sent, status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	u8 *instance;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	instance = hci_sent_cmd_data(hdev, HCI_OP_LE_REMOVE_ADV_SET);</div><div class='add'>+	if (!instance)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	err = hci_remove_adv_instance(hdev, *instance);</div><div class='add'>+	if (!err)</div><div class='add'>+		mgmt_advertising_removed(hci_skb_sk(hdev-&gt;sent_cmd), hdev,</div><div class='add'>+					 *instance);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_clear_adv_sets(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct adv_info *adv, *n;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	if (!hci_sent_cmd_data(hdev, HCI_OP_LE_CLEAR_ADV_SETS))</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+		u8 instance = adv-&gt;instance;</div><div class='add'>+</div><div class='add'>+		err = hci_remove_adv_instance(hdev, instance);</div><div class='add'>+		if (!err)</div><div class='add'>+			mgmt_advertising_removed(hci_skb_sk(hdev-&gt;sent_cmd),</div><div class='add'>+						 hdev, instance);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_read_transmit_power(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_le_read_transmit_power *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;min_le_tx_power = rp-&gt;min_le_tx_power;</div><div class='add'>+	hdev-&gt;max_le_tx_power = rp-&gt;max_le_tx_power;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_set_privacy_mode(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct hci_cp_le_set_privacy_mode *cp;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_PRIVACY_MODE);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	params = hci_conn_params_lookup(hdev, &amp;cp-&gt;bdaddr, cp-&gt;bdaddr_type);</div><div class='add'>+	if (params)</div><div class='add'>+		WRITE_ONCE(params-&gt;privacy_mode, cp-&gt;mode);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_set_adv_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	__u8 *sent;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_ADV_ENABLE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1126,78 +1574,118 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_ext_adv_enable *cp;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_cp_ext_adv_set *set;</div><div class='add'>+	struct adv_info *adv = NULL, *n;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_EXT_ADV_ENABLE);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	set = (void *)cp-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='add'>+	if (cp-&gt;num_of_sets)</div><div class='add'>+		adv = hci_find_adv_instance(hdev, set-&gt;handle);</div><div class='add'>+</div><div class='ctx'> 	if (cp-&gt;enable) {</div><div class='ctx'> 		struct hci_conn *conn;</div><div class='ctx'> </div><div class='ctx'> 		hci_dev_set_flag(hdev, HCI_LE_ADV);</div><div class='ctx'> </div><div class='add'>+		if (adv)</div><div class='add'>+			adv-&gt;enabled = true;</div><div class='add'>+		else if (!set-&gt;handle)</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_LE_ADV_0);</div><div class='add'>+</div><div class='ctx'> 		conn = hci_lookup_le_connect(hdev);</div><div class='ctx'> 		if (conn)</div><div class='ctx'> 			queue_delayed_work(hdev-&gt;workqueue,</div><div class='ctx'> 					   &amp;conn-&gt;le_conn_timeout,</div><div class='ctx'> 					   conn-&gt;conn_timeout);</div><div class='ctx'> 	} else {</div><div class='add'>+		if (cp-&gt;num_of_sets) {</div><div class='add'>+			if (adv)</div><div class='add'>+				adv-&gt;enabled = false;</div><div class='add'>+			else if (!set-&gt;handle)</div><div class='add'>+				hci_dev_clear_flag(hdev, HCI_LE_ADV_0);</div><div class='add'>+</div><div class='add'>+			/* If just one instance was disabled check if there are</div><div class='add'>+			 * any other instance enabled before clearing HCI_LE_ADV</div><div class='add'>+			 */</div><div class='add'>+			list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances,</div><div class='add'>+						 list) {</div><div class='add'>+				if (adv-&gt;enabled)</div><div class='add'>+					goto unlock;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* All instances shall be considered disabled */</div><div class='add'>+			list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances,</div><div class='add'>+						 list)</div><div class='add'>+				adv-&gt;enabled = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_scan_param(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_scan_param *cp;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_PARAM);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_scan_type = cp-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_ext_scan_param(struct hci_dev *hdev,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_ext_scan_param(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_ext_scan_params *cp;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	struct hci_cp_le_scan_phy_params *phy_param;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_EXT_SCAN_PARAMS);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	phy_param = (void *)cp-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -1206,6 +1694,8 @@ static void hci_cc_le_set_ext_scan_param(struct hci_dev *hdev,</div><div class='ctx'> 	hdev-&gt;le_scan_type = phy_param-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool has_pending_adv_report(struct hci_dev *hdev)</div><div class='hunk'>@@ -1229,6 +1719,9 @@ static void store_pending_adv_report(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct discovery_state *d = &amp;hdev-&gt;discovery;</div><div class='ctx'> </div><div class='add'>+	if (len &gt; max_adv_len(hdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	bacpy(&amp;d-&gt;last_adv_addr, bdaddr);</div><div class='ctx'> 	d-&gt;last_adv_addr_type = bdaddr_type;</div><div class='ctx'> 	d-&gt;last_adv_rssi = rssi;</div><div class='hunk'>@@ -1244,8 +1737,10 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)</div><div class='ctx'> 	switch (enable) {</div><div class='ctx'> 	case LE_SCAN_ENABLE:</div><div class='ctx'> 		hci_dev_set_flag(hdev, HCI_LE_SCAN);</div><div class='del'>-		if (hdev-&gt;le_scan_type == LE_SCAN_ACTIVE)</div><div class='add'>+		if (hdev-&gt;le_scan_type == LE_SCAN_ACTIVE) {</div><div class='ctx'> 			clear_pending_adv_report(hdev);</div><div class='add'>+			hci_discovery_set_state(hdev, DISCOVERY_FINDING);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case LE_SCAN_DISABLE:</div><div class='hunk'>@@ -1260,7 +1755,7 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)</div><div class='ctx'> 					  d-&gt;last_adv_addr_type, NULL,</div><div class='ctx'> 					  d-&gt;last_adv_rssi, d-&gt;last_adv_flags,</div><div class='ctx'> 					  d-&gt;last_adv_data,</div><div class='del'>-					  d-&gt;last_adv_data_len, NULL, 0);</div><div class='add'>+					  d-&gt;last_adv_data_len, NULL, 0, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Cancel this timer so that we don't try to disable scanning</div><div class='hunk'>@@ -1272,16 +1767,13 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)</div><div class='ctx'> </div><div class='ctx'> 		/* The HCI_LE_SCAN_INTERRUPTED flag indicates that we</div><div class='ctx'> 		 * interrupted scanning due to a connect request. Mark</div><div class='del'>-		 * therefore discovery as stopped. If this was not</div><div class='del'>-		 * because of a connect request advertising might have</div><div class='del'>-		 * been disabled because of active scanning, so</div><div class='del'>-		 * re-enable it again if necessary.</div><div class='add'>+		 * therefore discovery as stopped.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (hci_dev_test_and_clear_flag(hdev, HCI_LE_SCAN_INTERRUPTED))</div><div class='ctx'> 			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='ctx'> 		else if (!hci_dev_test_flag(hdev, HCI_LE_ADV) &amp;&amp;</div><div class='ctx'> 			 hdev-&gt;discovery.state == DISCOVERY_FINDING)</div><div class='del'>-			hci_req_reenable_advertising(hdev);</div><div class='add'>+			queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;reenable_adv_work);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1294,205 +1786,285 @@ static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_scan_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_scan_enable *cp;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	le_set_scan_enable_complete(hdev, cp-&gt;enable);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_ext_scan_enable(struct hci_dev *hdev,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_ext_scan_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_ext_scan_enable *cp;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_EXT_SCAN_ENABLE);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	le_set_scan_enable_complete(hdev, cp-&gt;enable);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_num_adv_sets(struct hci_dev *hdev,</div><div class='add'>+static u8 hci_cc_le_read_num_adv_sets(struct hci_dev *hdev, void *data,</div><div class='ctx'> 				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_num_supported_adv_sets *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_num_supported_adv_sets *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x No of Adv sets %u", hdev-&gt;name, rp-&gt;status,</div><div class='del'>-	       rp-&gt;num_of_sets);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x No of Adv sets %u", rp-&gt;status,</div><div class='add'>+		   rp-&gt;num_of_sets);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_num_of_adv_sets = rp-&gt;num_of_sets;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_white_list_size(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_accept_list_size(struct hci_dev *hdev, void *data,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_white_list_size *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_accept_list_size *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x size %u", hdev-&gt;name, rp-&gt;status, rp-&gt;size);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x size %u", rp-&gt;status, rp-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;le_white_list_size = rp-&gt;size;</div><div class='add'>+	hdev-&gt;le_accept_list_size = rp-&gt;size;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_clear_white_list(struct hci_dev *hdev,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_clear_accept_list(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_bdaddr_list_clear(&amp;hdev-&gt;le_accept_list);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_bdaddr_list_clear(&amp;hdev-&gt;le_white_list);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_add_to_accept_list(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_cp_le_add_to_white_list *sent;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_cp_le_add_to_accept_list *sent;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_WHITE_LIST);</div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_bdaddr_list_add(&amp;hdev-&gt;le_accept_list, &amp;sent-&gt;bdaddr,</div><div class='add'>+			    sent-&gt;bdaddr_type);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_bdaddr_list_add(&amp;hdev-&gt;le_white_list, &amp;sent-&gt;bdaddr,</div><div class='del'>-			   sent-&gt;bdaddr_type);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_del_from_accept_list(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_cp_le_del_from_white_list *sent;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_cp_le_del_from_accept_list *sent;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_WHITE_LIST);</div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_ACCEPT_LIST);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	hci_bdaddr_list_del(&amp;hdev-&gt;le_white_list, &amp;sent-&gt;bdaddr,</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_bdaddr_list_del(&amp;hdev-&gt;le_accept_list, &amp;sent-&gt;bdaddr,</div><div class='ctx'> 			    sent-&gt;bdaddr_type);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_supported_states(struct hci_dev *hdev,</div><div class='del'>-					    struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_supported_states(struct hci_dev *hdev, void *data,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_supported_states *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_supported_states *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hdev-&gt;le_states, rp-&gt;le_states, 8);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_def_data_len(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_def_data_len(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_def_data_len *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_def_data_len *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_def_tx_len = le16_to_cpu(rp-&gt;tx_len);</div><div class='ctx'> 	hdev-&gt;le_def_tx_time = le16_to_cpu(rp-&gt;tx_time);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_write_def_data_len(struct hci_dev *hdev,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_write_def_data_len(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_write_def_data_len *sent;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_WRITE_DEF_DATA_LEN);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_def_tx_len = le16_to_cpu(sent-&gt;tx_len);</div><div class='ctx'> 	hdev-&gt;le_def_tx_time = le16_to_cpu(sent-&gt;tx_time);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_clear_resolv_list(struct hci_dev *hdev,</div><div class='add'>+static u8 hci_cc_le_add_to_resolv_list(struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_cp_le_add_to_resolv_list *sent;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_RESOLV_LIST);</div><div class='add'>+	if (!sent)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_bdaddr_list_add_with_irk(&amp;hdev-&gt;le_resolv_list, &amp;sent-&gt;bdaddr,</div><div class='add'>+				sent-&gt;bdaddr_type, sent-&gt;peer_irk,</div><div class='add'>+				sent-&gt;local_irk);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_del_from_resolv_list(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_del_from_resolv_list *sent;</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_RESOLV_LIST);</div><div class='add'>+	if (!sent)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_bdaddr_list_del_with_irk(&amp;hdev-&gt;le_resolv_list, &amp;sent-&gt;bdaddr,</div><div class='add'>+			    sent-&gt;bdaddr_type);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_le_clear_resolv_list(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> 	hci_bdaddr_list_clear(&amp;hdev-&gt;le_resolv_list);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_resolv_list_size(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_resolv_list_size(struct hci_dev *hdev, void *data,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_resolv_list_size *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_resolv_list_size *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x size %u", hdev-&gt;name, rp-&gt;status, rp-&gt;size);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x size %u", rp-&gt;status, rp-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_resolv_list_size = rp-&gt;size;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_set_addr_resolution_enable(struct hci_dev *hdev,</div><div class='del'>-						struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_set_addr_resolution_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+					       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 *sent, status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	__u8 *sent;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_ADDR_RESOLV_ENABLE);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1502,38 +2074,42 @@ static void hci_cc_le_set_addr_resolution_enable(struct hci_dev *hdev,</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_LL_RPA_RESOLUTION);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_le_read_max_data_len(struct hci_dev *hdev,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_le_read_max_data_len(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_le_read_max_data_len *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_le_read_max_data_len *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;le_max_tx_len = le16_to_cpu(rp-&gt;tx_len);</div><div class='ctx'> 	hdev-&gt;le_max_tx_time = le16_to_cpu(rp-&gt;tx_time);</div><div class='ctx'> 	hdev-&gt;le_max_rx_len = le16_to_cpu(rp-&gt;rx_len);</div><div class='ctx'> 	hdev-&gt;le_max_rx_time = le16_to_cpu(rp-&gt;rx_time);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_le_host_supported(struct hci_dev *hdev,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_le_host_supported(struct hci_dev *hdev, void *data,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_write_le_host_supported *sent;</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1552,67 +2128,42 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,</div><div class='ctx'> 		hdev-&gt;features[1][0] &amp;= ~LMP_HOST_LE_BREDR;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_set_adv_param(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_set_adv_param(struct hci_dev *hdev, void *data,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_set_adv_param *cp;</div><div class='del'>-	u8 status = *((u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_ADV_PARAM);</div><div class='ctx'> 	if (!cp)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> 	hdev-&gt;adv_addr_type = cp-&gt;own_address_type;</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_cc_set_ext_adv_param(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_rp_le_set_ext_adv_params *rp = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_cp_le_set_ext_adv_params *cp;</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='del'>-	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_EXT_ADV_PARAMS);</div><div class='del'>-	if (!cp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-	hdev-&gt;adv_addr_type = cp-&gt;own_addr_type;</div><div class='del'>-	if (!hdev-&gt;cur_adv_instance) {</div><div class='del'>-		/* Store in hdev for instance 0 */</div><div class='del'>-		hdev-&gt;adv_tx_power = rp-&gt;tx_power;</div><div class='del'>-	} else {</div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev,</div><div class='del'>-						     hdev-&gt;cur_adv_instance);</div><div class='del'>-		if (adv_instance)</div><div class='del'>-			adv_instance-&gt;tx_power = rp-&gt;tx_power;</div><div class='del'>-	}</div><div class='del'>-	/* Update adv data as tx power is known now */</div><div class='del'>-	hci_req_update_adv_data(hdev, hdev-&gt;cur_adv_instance);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_rssi(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_rssi(struct hci_dev *hdev, void *data,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_rp_read_rssi *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_rssi *rp = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1621,22 +2172,25 @@ static void hci_cc_read_rssi(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		conn-&gt;rssi = rp-&gt;rssi;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_read_tx_power(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_read_tx_power(struct hci_dev *hdev, void *data,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_read_tx_power *sent;</div><div class='del'>-	struct hci_rp_read_tx_power *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_rp_read_tx_power *rp = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, rp-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	sent = hci_sent_cmd_data(hdev, HCI_OP_READ_TX_POWER);</div><div class='ctx'> 	if (!sent)</div><div class='del'>-		return;</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1655,33 +2209,36 @@ static void hci_cc_read_tx_power(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cc_write_ssp_debug_mode(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static u8 hci_cc_write_ssp_debug_mode(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 status = *((u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='ctx'> 	u8 *mode;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		return;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 	mode = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_DEBUG_MODE);</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		hdev-&gt;ssp_debug_mode = *mode;</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		hci_conn_check_pending(hdev);</div><div class='add'>+	if (status)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	set_bit(HCI_INQUIRY, &amp;hdev-&gt;flags);</div><div class='add'>+	if (hci_sent_cmd_data(hdev, HCI_OP_INQUIRY))</div><div class='add'>+		set_bit(HCI_INQUIRY, &amp;hdev-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)</div><div class='hunk'>@@ -1689,7 +2246,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_create_conn *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN);</div><div class='ctx'> 	if (!cp)</div><div class='hunk'>@@ -1699,23 +2256,20 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;cp-&gt;bdaddr);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s bdaddr %pMR hcon %p", hdev-&gt;name, &amp;cp-&gt;bdaddr, conn);</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR hcon %p", &amp;cp-&gt;bdaddr, conn);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		if (conn &amp;&amp; conn-&gt;state == BT_CONNECT) {</div><div class='del'>-			if (status != 0x0c || conn-&gt;attempt &gt; 2) {</div><div class='del'>-				conn-&gt;state = BT_CLOSED;</div><div class='del'>-				hci_connect_cfm(conn, status);</div><div class='del'>-				hci_conn_del(conn);</div><div class='del'>-			} else</div><div class='del'>-				conn-&gt;state = BT_CONNECT2;</div><div class='add'>+			conn-&gt;state = BT_CLOSED;</div><div class='add'>+			hci_connect_cfm(conn, status);</div><div class='add'>+			hci_conn_del(conn);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!conn) {</div><div class='del'>-			conn = hci_conn_add(hdev, ACL_LINK, &amp;cp-&gt;bdaddr,</div><div class='del'>-					    HCI_ROLE_MASTER);</div><div class='del'>-			if (!conn)</div><div class='del'>-				bt_dev_err(hdev, "no memory for new connection");</div><div class='add'>+			conn = hci_conn_add_unset(hdev, ACL_LINK, &amp;cp-&gt;bdaddr,</div><div class='add'>+						  0, HCI_ROLE_MASTER);</div><div class='add'>+			if (IS_ERR(conn))</div><div class='add'>+				bt_dev_err(hdev, "connection err: %ld", PTR_ERR(conn));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1725,10 +2279,11 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_add_sco *cp;</div><div class='del'>-	struct hci_conn *acl, *sco;</div><div class='add'>+	struct hci_conn *acl;</div><div class='add'>+	struct hci_link *link;</div><div class='ctx'> 	__u16 handle;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1739,18 +2294,19 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> </div><div class='ctx'> 	handle = __le16_to_cpu(cp-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s handle 0x%4.4x", hdev-&gt;name, handle);</div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%4.4x", handle);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	acl = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='ctx'> 	if (acl) {</div><div class='del'>-		sco = acl-&gt;link;</div><div class='del'>-		if (sco) {</div><div class='del'>-			sco-&gt;state = BT_CLOSED;</div><div class='add'>+		link = list_first_entry_or_null(&amp;acl-&gt;link_list,</div><div class='add'>+						struct hci_link, list);</div><div class='add'>+		if (link &amp;&amp; link-&gt;conn) {</div><div class='add'>+			link-&gt;conn-&gt;state = BT_CLOSED;</div><div class='ctx'> </div><div class='del'>-			hci_connect_cfm(sco, status);</div><div class='del'>-			hci_conn_del(sco);</div><div class='add'>+			hci_connect_cfm(link-&gt;conn, status);</div><div class='add'>+			hci_conn_del(link-&gt;conn);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1762,7 +2318,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_auth_requested *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1789,7 +2345,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_set_conn_encrypt *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1856,6 +2412,12 @@ static bool hci_resolve_next_name(struct hci_dev *hdev)</div><div class='ctx'> 	if (list_empty(&amp;discov-&gt;resolve))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/* We should stop if we already spent too much time resolving names. */</div><div class='add'>+	if (time_after(jiffies, discov-&gt;name_resolve_timeout)) {</div><div class='add'>+		bt_dev_warn_ratelimited(hdev, "Name resolve takes too long.");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1879,10 +2441,8 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='ctx'> 	 * Only those in BT_CONFIG or BT_CONNECTED states can be</div><div class='ctx'> 	 * considered connected.</div><div class='ctx'> 	 */</div><div class='del'>-	if (conn &amp;&amp;</div><div class='del'>-	    (conn-&gt;state == BT_CONFIG || conn-&gt;state == BT_CONNECTED) &amp;&amp;</div><div class='del'>-	    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags))</div><div class='del'>-		mgmt_device_connected(hdev, conn, 0, name, name_len);</div><div class='add'>+	if (conn &amp;&amp; (conn-&gt;state == BT_CONFIG || conn-&gt;state == BT_CONNECTED))</div><div class='add'>+		mgmt_device_connected(hdev, conn, name, name_len);</div><div class='ctx'> </div><div class='ctx'> 	if (discov-&gt;state == DISCOVERY_STOPPED)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1902,13 +2462,10 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;e-&gt;list);</div><div class='del'>-	if (name) {</div><div class='del'>-		e-&gt;name_state = NAME_KNOWN;</div><div class='del'>-		mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00,</div><div class='del'>-				 e-&gt;data.rssi, name, name_len);</div><div class='del'>-	} else {</div><div class='del'>-		e-&gt;name_state = NAME_NOT_KNOWN;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	e-&gt;name_state = name ? NAME_KNOWN : NAME_NOT_KNOWN;</div><div class='add'>+	mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, e-&gt;data.rssi,</div><div class='add'>+			 name, name_len);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_resolve_next_name(hdev))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1922,7 +2479,7 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_remote_name_req *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	/* If successful wait for the name req complete event before</div><div class='ctx'> 	 * checking for the need to do authentication */</div><div class='hunk'>@@ -1965,7 +2522,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_read_remote_features *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1992,7 +2549,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_read_remote_ext_features *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2014,13 +2571,36 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hci_setup_sync_conn_status(struct hci_dev *hdev, __u16 handle,</div><div class='add'>+				       __u8 status)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *acl;</div><div class='add'>+	struct hci_link *link;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%4.4x status 0x%2.2x", handle, status);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	acl = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (acl) {</div><div class='add'>+		link = list_first_entry_or_null(&amp;acl-&gt;link_list,</div><div class='add'>+						struct hci_link, list);</div><div class='add'>+		if (link &amp;&amp; link-&gt;conn) {</div><div class='add'>+			link-&gt;conn-&gt;state = BT_CLOSED;</div><div class='add'>+</div><div class='add'>+			hci_connect_cfm(link-&gt;conn, status);</div><div class='add'>+			hci_conn_del(link-&gt;conn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_setup_sync_conn *cp;</div><div class='del'>-	struct hci_conn *acl, *sco;</div><div class='del'>-	__u16 handle;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2029,24 +2609,23 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	if (!cp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	handle = __le16_to_cpu(cp-&gt;handle);</div><div class='add'>+	hci_setup_sync_conn_status(hdev, __le16_to_cpu(cp-&gt;handle), status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s handle 0x%4.4x", hdev-&gt;name, handle);</div><div class='add'>+static void hci_cs_enhanced_setup_sync_conn(struct hci_dev *hdev, __u8 status)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_enhanced_setup_sync_conn *cp;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='del'>-	acl = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	if (acl) {</div><div class='del'>-		sco = acl-&gt;link;</div><div class='del'>-		if (sco) {</div><div class='del'>-			sco-&gt;state = BT_CLOSED;</div><div class='add'>+	if (!status)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			hci_connect_cfm(sco, status);</div><div class='del'>-			hci_conn_del(sco);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_ENHANCED_SETUP_SYNC_CONN);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	hci_setup_sync_conn_status(hdev, __le16_to_cpu(cp-&gt;handle), status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)</div><div class='hunk'>@@ -2054,7 +2633,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_sniff_mode *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2081,7 +2660,7 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> 	struct hci_cp_exit_sniff_mode *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2106,9 +2685,16 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)</div><div class='ctx'> static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_disconnect *cp;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='add'>+	bool mgmt_conn;</div><div class='ctx'> </div><div class='del'>-	if (!status)</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EV_DISCONN_COMPLETE if status 0x00 and not suspended</div><div class='add'>+	 * otherwise cleanup the connection immediately.</div><div class='add'>+	 */</div><div class='add'>+	if (!status &amp;&amp; !hdev-&gt;suspended)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cp = hci_sent_cmd_data(hdev, HCI_OP_DISCONNECT);</div><div class='hunk'>@@ -2118,13 +2704,94 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp-&gt;handle));</div><div class='del'>-	if (conn)</div><div class='add'>+	if (!conn)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (status &amp;&amp; status != HCI_ERROR_UNKNOWN_CONN_ID) {</div><div class='ctx'> 		mgmt_disconnect_failed(hdev, &amp;conn-&gt;dst, conn-&gt;type,</div><div class='ctx'> 				       conn-&gt;dst_type, status);</div><div class='ctx'> </div><div class='add'>+		if (conn-&gt;type == LE_LINK &amp;&amp; conn-&gt;role == HCI_ROLE_SLAVE) {</div><div class='add'>+			hdev-&gt;cur_adv_instance = conn-&gt;adv_instance;</div><div class='add'>+			hci_enable_advertising(hdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Inform sockets conn is gone before we delete it */</div><div class='add'>+		hci_disconn_cfm(conn, HCI_ERROR_UNSPECIFIED);</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* During suspend, mark connection as closed immediately</div><div class='add'>+	 * since we might not receive HCI_EV_DISCONN_COMPLETE</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;suspended)</div><div class='add'>+		conn-&gt;state = BT_CLOSED;</div><div class='add'>+</div><div class='add'>+	mgmt_conn = test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == ACL_LINK) {</div><div class='add'>+		if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &amp;conn-&gt;flags))</div><div class='add'>+			hci_remove_link_key(hdev, &amp;conn-&gt;dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params = hci_conn_params_lookup(hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='add'>+	if (params) {</div><div class='add'>+		switch (params-&gt;auto_connect) {</div><div class='add'>+		case HCI_AUTO_CONN_LINK_LOSS:</div><div class='add'>+			if (cp-&gt;reason != HCI_ERROR_CONNECTION_TIMEOUT)</div><div class='add'>+				break;</div><div class='add'>+			fallthrough;</div><div class='add'>+</div><div class='add'>+		case HCI_AUTO_CONN_DIRECT:</div><div class='add'>+		case HCI_AUTO_CONN_ALWAYS:</div><div class='add'>+			hci_pend_le_list_del_init(params);</div><div class='add'>+			hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt_device_disconnected(hdev, &amp;conn-&gt;dst, conn-&gt;type, conn-&gt;dst_type,</div><div class='add'>+				 cp-&gt;reason, mgmt_conn);</div><div class='add'>+</div><div class='add'>+	hci_disconn_cfm(conn, cp-&gt;reason);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	/* If the disconnection failed for any reason, the upper layer</div><div class='add'>+	 * does not retry to disconnect in current implementation.</div><div class='add'>+	 * Hence, we need to do some basic cleanup here and re-enable</div><div class='add'>+	 * advertising if necessary.</div><div class='add'>+	 */</div><div class='add'>+	hci_conn_del(conn);</div><div class='add'>+unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 ev_bdaddr_type(struct hci_dev *hdev, u8 type, bool *resolved)</div><div class='add'>+{</div><div class='add'>+	/* When using controller based address resolution, then the new</div><div class='add'>+	 * address types 0x02 and 0x03 are used. These types need to be</div><div class='add'>+	 * converted back into either public address or random address type</div><div class='add'>+	 */</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ADDR_LE_DEV_PUBLIC_RESOLVED:</div><div class='add'>+		if (resolved)</div><div class='add'>+			*resolved = true;</div><div class='add'>+		return ADDR_LE_DEV_PUBLIC;</div><div class='add'>+	case ADDR_LE_DEV_RANDOM_RESOLVED:</div><div class='add'>+		if (resolved)</div><div class='add'>+			*resolved = true;</div><div class='add'>+		return ADDR_LE_DEV_RANDOM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resolved)</div><div class='add'>+		*resolved = false;</div><div class='add'>+	return type;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,</div><div class='ctx'> 			      u8 peer_addr_type, u8 own_address_type,</div><div class='ctx'> 			      u8 filter_policy)</div><div class='hunk'>@@ -2136,6 +2803,8 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	own_address_type = ev_bdaddr_type(hdev, own_address_type, NULL);</div><div class='add'>+</div><div class='ctx'> 	/* Store the initiator and responder address information which</div><div class='ctx'> 	 * is needed for SMP. These values will not change during the</div><div class='ctx'> 	 * lifetime of the connection.</div><div class='hunk'>@@ -2148,26 +2817,16 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;resp_addr_type = peer_addr_type;</div><div class='ctx'> 	bacpy(&amp;conn-&gt;resp_addr, peer_addr);</div><div class='del'>-</div><div class='del'>-	/* We don't want the connection attempt to stick around</div><div class='del'>-	 * indefinitely since LE doesn't have a page timeout concept</div><div class='del'>-	 * like BR/EDR. Set a timer for any connection that doesn't use</div><div class='del'>-	 * the white list for connecting.</div><div class='del'>-	 */</div><div class='del'>-	if (filter_policy == HCI_LE_USE_PEER_ADDR)</div><div class='del'>-		queue_delayed_work(conn-&gt;hdev-&gt;workqueue,</div><div class='del'>-				   &amp;conn-&gt;le_conn_timeout,</div><div class='del'>-				   conn-&gt;conn_timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_cs_le_create_conn(struct hci_dev *hdev, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_create_conn *cp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	/* All connection failure handling is taken care of by the</div><div class='del'>-	 * hci_le_conn_failed function which is triggered by the HCI</div><div class='add'>+	 * hci_conn_failed function which is triggered by the HCI</div><div class='ctx'> 	 * request completion callbacks used for connecting.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -2189,10 +2848,10 @@ static void hci_cs_le_ext_create_conn(struct hci_dev *hdev, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_cp_le_ext_create_conn *cp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	/* All connection failure handling is taken care of by the</div><div class='del'>-	 * hci_le_conn_failed function which is triggered by the HCI</div><div class='add'>+	 * hci_conn_failed function which is triggered by the HCI</div><div class='ctx'> 	 * request completion callbacks used for connecting.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -2215,7 +2874,7 @@ static void hci_cs_le_read_remote_features(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	struct hci_cp_le_read_remote_features *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2227,12 +2886,8 @@ static void hci_cs_le_read_remote_features(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp-&gt;handle));</div><div class='del'>-	if (conn) {</div><div class='del'>-		if (conn-&gt;state == BT_CONFIG) {</div><div class='del'>-			hci_connect_cfm(conn, status);</div><div class='del'>-			hci_conn_drop(conn);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (conn &amp;&amp; conn-&gt;state == BT_CONFIG)</div><div class='add'>+		hci_connect_cfm(conn, status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='hunk'>@@ -2242,7 +2897,7 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	struct hci_cp_le_start_enc *cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2290,15 +2945,14 @@ static void hci_cs_switch_role(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_inquiry_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 status = *((__u8 *) skb-&gt;data);</div><div class='add'>+	struct hci_ev_status *ev = data;</div><div class='ctx'> 	struct discovery_state *discov = &amp;hdev-&gt;discovery;</div><div class='ctx'> 	struct inquiry_entry *e;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	hci_conn_check_pending(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_clear_bit(HCI_INQUIRY, &amp;hdev-&gt;flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2323,7 +2977,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		 * state to indicate completion.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN) ||</div><div class='del'>-		    !test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &amp;hdev-&gt;quirks))</div><div class='add'>+		    !hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY))</div><div class='ctx'> 			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2332,6 +2986,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	if (e &amp;&amp; hci_resolve_name(hdev, e) == 0) {</div><div class='ctx'> 		e-&gt;name_state = NAME_PENDING;</div><div class='ctx'> 		hci_discovery_set_state(hdev, DISCOVERY_RESOLVING);</div><div class='add'>+		discov-&gt;name_resolve_timeout = jiffies + NAME_RESOLVE_DURATION;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* When BR/EDR inquiry is active and no LE scanning is in</div><div class='ctx'> 		 * progress, then change discovery state to indicate completion.</div><div class='hunk'>@@ -2341,7 +2996,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		 * state to indicate completion.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN) ||</div><div class='del'>-		    !test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &amp;hdev-&gt;quirks))</div><div class='add'>+		    !hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY))</div><div class='ctx'> 			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2349,15 +3004,20 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_inquiry_result_evt(struct hci_dev *hdev, void *edata,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct hci_ev_inquiry_result *ev = edata;</div><div class='ctx'> 	struct inquiry_data data;</div><div class='del'>-	struct inquiry_info *info = (void *) (skb-&gt;data + 1);</div><div class='del'>-	int num_rsp = *((__u8 *) skb-&gt;data);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!hci_ev_skb_pull(hdev, skb, HCI_EV_INQUIRY_RESULT,</div><div class='add'>+			     flex_array_size(ev, info, ev-&gt;num)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s num_rsp %d", hdev-&gt;name, num_rsp);</div><div class='add'>+	bt_dev_dbg(hdev, "num %d", ev-&gt;num);</div><div class='ctx'> </div><div class='del'>-	if (!num_rsp)</div><div class='add'>+	if (!ev-&gt;num)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))</div><div class='hunk'>@@ -2365,7 +3025,8 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	for (; num_rsp; num_rsp--, info++) {</div><div class='add'>+	for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='add'>+		struct inquiry_info *info = &amp;ev-&gt;info[i];</div><div class='ctx'> 		u32 flags;</div><div class='ctx'> </div><div class='ctx'> 		bacpy(&amp;data.bdaddr, &amp;info-&gt;bdaddr);</div><div class='hunk'>@@ -2381,35 +3042,117 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		mgmt_device_found(hdev, &amp;info-&gt;bdaddr, ACL_LINK, 0x00,</div><div class='ctx'> 				  info-&gt;dev_class, HCI_RSSI_INVALID,</div><div class='del'>-				  flags, NULL, 0, NULL, 0);</div><div class='add'>+				  flags, NULL, 0, NULL, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static int hci_read_enc_key_size(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_conn_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_cp_read_enc_key_size cp;</div><div class='add'>+	u8 *key_enc_size = hci_conn_key_enc_size(conn);</div><div class='add'>+</div><div class='add'>+	if (!read_key_size_capable(hdev)) {</div><div class='add'>+		conn-&gt;enc_key_size = HCI_LINK_KEY_SIZE;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "hcon %p", conn);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+</div><div class='add'>+	/* If the key enc_size is already known, use it as conn-&gt;enc_key_size,</div><div class='add'>+	 * otherwise use hdev-&gt;min_enc_key_size so the likes of</div><div class='add'>+	 * l2cap_check_enc_key_size don't fail while waiting for</div><div class='add'>+	 * HCI_OP_READ_ENC_KEY_SIZE response.</div><div class='add'>+	 */</div><div class='add'>+	if (key_enc_size &amp;&amp; *key_enc_size)</div><div class='add'>+		conn-&gt;enc_key_size = *key_enc_size;</div><div class='add'>+	else</div><div class='add'>+		conn-&gt;enc_key_size = hdev-&gt;min_enc_key_size;</div><div class='add'>+</div><div class='add'>+	return hci_send_cmd(hdev, HCI_OP_READ_ENC_KEY_SIZE, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_conn_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_conn_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='add'>+	u8 status = ev-&gt;status;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='add'>+	/* Check for existing connection:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. If it doesn't exist then it must be receiver/slave role.</div><div class='add'>+	 * 2. If it does exist confirm that it is connecting/BT_CONNECT in case</div><div class='add'>+	 *    of initiator/master role since there could be a collision where</div><div class='add'>+	 *    either side is attempting to connect or something like a fuzzing</div><div class='add'>+	 *    testing is trying to play tricks to destroy the hcon object before</div><div class='add'>+	 *    it even attempts to connect (e.g. hcon-&gt;state == BT_OPEN).</div><div class='add'>+	 */</div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ev-&gt;link_type, &amp;ev-&gt;bdaddr);</div><div class='del'>-	if (!conn) {</div><div class='del'>-		if (ev-&gt;link_type != SCO_LINK)</div><div class='add'>+	if (!conn ||</div><div class='add'>+	    (conn-&gt;role == HCI_ROLE_MASTER &amp;&amp; conn-&gt;state != BT_CONNECT)) {</div><div class='add'>+		/* In case of error status and there is no connection pending</div><div class='add'>+		 * just unlock as there is nothing to cleanup.</div><div class='add'>+		 */</div><div class='add'>+		if (ev-&gt;status)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> </div><div class='del'>-		conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &amp;ev-&gt;bdaddr);</div><div class='del'>-		if (!conn)</div><div class='del'>-			goto unlock;</div><div class='add'>+		/* Connection may not exist if auto-connected. Check the bredr</div><div class='add'>+		 * allowlist to see if this device is allowed to auto connect.</div><div class='add'>+		 * If link is an ACL type, create a connection class</div><div class='add'>+		 * automatically.</div><div class='add'>+		 *</div><div class='add'>+		 * Auto-connect will only occur if the event filter is</div><div class='add'>+		 * programmed with a given address. Right now, event filter is</div><div class='add'>+		 * only used during suspend.</div><div class='add'>+		 */</div><div class='add'>+		if (ev-&gt;link_type == ACL_LINK &amp;&amp;</div><div class='add'>+		    hci_bdaddr_list_lookup_with_flags(&amp;hdev-&gt;accept_list,</div><div class='add'>+						      &amp;ev-&gt;bdaddr,</div><div class='add'>+						      BDADDR_BREDR)) {</div><div class='add'>+			conn = hci_conn_add_unset(hdev, ev-&gt;link_type,</div><div class='add'>+						  &amp;ev-&gt;bdaddr, 0,</div><div class='add'>+						  HCI_ROLE_SLAVE);</div><div class='add'>+			if (IS_ERR(conn)) {</div><div class='add'>+				bt_dev_err(hdev, "connection err: %ld", PTR_ERR(conn));</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (ev-&gt;link_type != SCO_LINK)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='add'>+			conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK,</div><div class='add'>+						       &amp;ev-&gt;bdaddr);</div><div class='add'>+			if (!conn)</div><div class='add'>+				goto unlock;</div><div class='ctx'> </div><div class='del'>-		conn-&gt;type = SCO_LINK;</div><div class='add'>+			conn-&gt;type = SCO_LINK;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ev-&gt;status) {</div><div class='del'>-		conn-&gt;handle = __le16_to_cpu(ev-&gt;handle);</div><div class='add'>+	/* The HCI_Connection_Complete event is only sent once per connection.</div><div class='add'>+	 * Processing it more than once per connection can corrupt kernel memory.</div><div class='add'>+	 *</div><div class='add'>+	 * As the connection handle is set here for the first time, it indicates</div><div class='add'>+	 * whether the connection is already set up.</div><div class='add'>+	 */</div><div class='add'>+	if (!HCI_CONN_HANDLE_UNSET(conn-&gt;handle)) {</div><div class='add'>+		bt_dev_err(hdev, "Ignoring HCI_Connection_Complete for existing connection");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		status = hci_conn_set_handle(conn, __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+		if (status)</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='ctx'> 		if (conn-&gt;type == ACL_LINK) {</div><div class='ctx'> 			conn-&gt;state = BT_CONFIG;</div><div class='hunk'>@@ -2432,6 +3175,19 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		if (test_bit(HCI_ENCRYPT, &amp;hdev-&gt;flags))</div><div class='ctx'> 			set_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags);</div><div class='ctx'> </div><div class='add'>+		/* "Link key request" completed ahead of "connect request" completes */</div><div class='add'>+		if (ev-&gt;encr_mode == 1 &amp;&amp; !test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags) &amp;&amp;</div><div class='add'>+		    ev-&gt;link_type == ACL_LINK) {</div><div class='add'>+			struct link_key *key;</div><div class='add'>+</div><div class='add'>+			key = hci_find_link_key(hdev, &amp;ev-&gt;bdaddr);</div><div class='add'>+			if (key) {</div><div class='add'>+				set_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags);</div><div class='add'>+				hci_read_enc_key_size(hdev, conn);</div><div class='add'>+				hci_encrypt_cfm(conn, ev-&gt;status);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Get remote features */</div><div class='ctx'> 		if (conn-&gt;type == ACL_LINK) {</div><div class='ctx'> 			struct hci_cp_read_remote_features cp;</div><div class='hunk'>@@ -2439,7 +3195,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 			hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES,</div><div class='ctx'> 				     sizeof(cp), &amp;cp);</div><div class='ctx'> </div><div class='del'>-			hci_req_update_scan(hdev);</div><div class='add'>+			hci_update_scan(hdev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Set packet type for incoming connection */</div><div class='hunk'>@@ -2450,26 +3206,27 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 			hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE, sizeof(cp),</div><div class='ctx'> 				     &amp;cp);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		conn-&gt;state = BT_CLOSED;</div><div class='del'>-		if (conn-&gt;type == ACL_LINK)</div><div class='del'>-			mgmt_connect_failed(hdev, &amp;conn-&gt;dst, conn-&gt;type,</div><div class='del'>-					    conn-&gt;dst_type, ev-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;type == ACL_LINK)</div><div class='ctx'> 		hci_sco_setup(conn, ev-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (ev-&gt;status) {</div><div class='del'>-		hci_connect_cfm(conn, ev-&gt;status);</div><div class='del'>-		hci_conn_del(conn);</div><div class='del'>-	} else if (ev-&gt;link_type != ACL_LINK)</div><div class='del'>-		hci_connect_cfm(conn, ev-&gt;status);</div><div class='add'>+done:</div><div class='add'>+	if (status) {</div><div class='add'>+		hci_conn_failed(conn, status);</div><div class='add'>+	} else if (ev-&gt;link_type == SCO_LINK) {</div><div class='add'>+		switch (conn-&gt;setting &amp; SCO_AIRMODE_MASK) {</div><div class='add'>+		case SCO_AIRMODE_CVSD:</div><div class='add'>+			if (hdev-&gt;notify)</div><div class='add'>+				hdev-&gt;notify(hdev, HCI_NOTIFY_ENABLE_SCO_CVSD);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_connect_cfm(conn, status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	hci_conn_check_pending(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hci_reject_conn(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='hunk'>@@ -2481,16 +3238,26 @@ static void hci_reject_conn(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='ctx'> 	hci_send_cmd(hdev, HCI_OP_REJECT_CONN_REQ, sizeof(cp), &amp;cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_conn_request_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_conn_request *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_conn_request *ev = data;</div><div class='ctx'> 	int mask = hdev-&gt;link_mode;</div><div class='ctx'> 	struct inquiry_entry *ie;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	__u8 flags = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s bdaddr %pMR type 0x%x", hdev-&gt;name, &amp;ev-&gt;bdaddr,</div><div class='del'>-	       ev-&gt;link_type);</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR type 0x%x", &amp;ev-&gt;bdaddr, ev-&gt;link_type);</div><div class='add'>+</div><div class='add'>+	/* Reject incoming connection from device with same BD ADDR against</div><div class='add'>+	 * CVE-2020-26555</div><div class='add'>+	 */</div><div class='add'>+	if (hdev &amp;&amp; !bacmp(&amp;hdev-&gt;bdaddr, &amp;ev-&gt;bdaddr)) {</div><div class='add'>+		bt_dev_dbg(hdev, "Reject connection with same BD_ADDR %pMR\n",</div><div class='add'>+			   &amp;ev-&gt;bdaddr);</div><div class='add'>+		hci_reject_conn(hdev, &amp;ev-&gt;bdaddr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mask |= hci_proto_connect_ind(hdev, &amp;ev-&gt;bdaddr, ev-&gt;link_type,</div><div class='ctx'> 				      &amp;flags);</div><div class='hunk'>@@ -2500,28 +3267,28 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;blacklist, &amp;ev-&gt;bdaddr,</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;reject_list, &amp;ev-&gt;bdaddr,</div><div class='ctx'> 				   BDADDR_BREDR)) {</div><div class='ctx'> 		hci_reject_conn(hdev, &amp;ev-&gt;bdaddr);</div><div class='del'>-		return;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Require HCI_CONNECTABLE or a whitelist entry to accept the</div><div class='add'>+	/* Require HCI_CONNECTABLE or an accept list entry to accept the</div><div class='ctx'> 	 * connection. These features are only touched through mgmt so</div><div class='ctx'> 	 * only do the checks if HCI_MGMT is set.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_CONNECTABLE) &amp;&amp;</div><div class='del'>-	    !hci_bdaddr_list_lookup(&amp;hdev-&gt;whitelist, &amp;ev-&gt;bdaddr,</div><div class='del'>-				    BDADDR_BREDR)) {</div><div class='del'>-		    hci_reject_conn(hdev, &amp;ev-&gt;bdaddr);</div><div class='del'>-		    return;</div><div class='add'>+	    !hci_bdaddr_list_lookup_with_flags(&amp;hdev-&gt;accept_list, &amp;ev-&gt;bdaddr,</div><div class='add'>+					       BDADDR_BREDR)) {</div><div class='add'>+		hci_reject_conn(hdev, &amp;ev-&gt;bdaddr);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Connection accepted */</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='ctx'> 	ie = hci_inquiry_cache_lookup(hdev, &amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (ie)</div><div class='ctx'> 		memcpy(ie-&gt;data.dev_class, ev-&gt;dev_class, 3);</div><div class='hunk'>@@ -2529,12 +3296,11 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ev-&gt;link_type,</div><div class='ctx'> 			&amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (!conn) {</div><div class='del'>-		conn = hci_conn_add(hdev, ev-&gt;link_type, &amp;ev-&gt;bdaddr,</div><div class='del'>-				    HCI_ROLE_SLAVE);</div><div class='del'>-		if (!conn) {</div><div class='del'>-			bt_dev_err(hdev, "no memory for new connection");</div><div class='del'>-			hci_dev_unlock(hdev);</div><div class='del'>-			return;</div><div class='add'>+		conn = hci_conn_add_unset(hdev, ev-&gt;link_type, &amp;ev-&gt;bdaddr, 0,</div><div class='add'>+					  HCI_ROLE_SLAVE);</div><div class='add'>+		if (IS_ERR(conn)) {</div><div class='add'>+			bt_dev_err(hdev, "connection err: %ld", PTR_ERR(conn));</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2550,9 +3316,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		bacpy(&amp;cp.bdaddr, &amp;ev-&gt;bdaddr);</div><div class='ctx'> </div><div class='ctx'> 		if (lmp_rswitch_capable(hdev) &amp;&amp; (mask &amp; HCI_LM_MASTER))</div><div class='del'>-			cp.role = 0x00; /* Become master */</div><div class='add'>+			cp.role = 0x00; /* Become central */</div><div class='ctx'> 		else</div><div class='del'>-			cp.role = 0x01; /* Remain slave */</div><div class='add'>+			cp.role = 0x01; /* Remain peripheral */</div><div class='ctx'> </div><div class='ctx'> 		hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &amp;cp);</div><div class='ctx'> 	} else if (!(flags &amp; HCI_PROTO_DEFER)) {</div><div class='hunk'>@@ -2574,6 +3340,10 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		conn-&gt;state = BT_CONNECT2;</div><div class='ctx'> 		hci_connect_cfm(conn, 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 hci_to_mgmt_reason(u8 err)</div><div class='hunk'>@@ -2592,16 +3362,16 @@ static u8 hci_to_mgmt_reason(u8 err)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_disconn_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_disconn_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_disconn_complete *ev = data;</div><div class='ctx'> 	u8 reason;</div><div class='ctx'> 	struct hci_conn_params *params;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	bool mgmt_connected;</div><div class='del'>-	u8 type;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2628,36 +3398,40 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 				reason, mgmt_connected);</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;type == ACL_LINK) {</div><div class='del'>-		if (test_bit(HCI_CONN_FLUSH_KEY, &amp;conn-&gt;flags))</div><div class='add'>+		if (test_and_clear_bit(HCI_CONN_FLUSH_KEY, &amp;conn-&gt;flags))</div><div class='ctx'> 			hci_remove_link_key(hdev, &amp;conn-&gt;dst);</div><div class='ctx'> </div><div class='del'>-		hci_req_update_scan(hdev);</div><div class='add'>+		hci_update_scan(hdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	params = hci_conn_params_lookup(hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='del'>-	if (params) {</div><div class='del'>-		switch (params-&gt;auto_connect) {</div><div class='del'>-		case HCI_AUTO_CONN_LINK_LOSS:</div><div class='del'>-			if (ev-&gt;reason != HCI_ERROR_CONNECTION_TIMEOUT)</div><div class='add'>+	/* Re-enable passive scanning if disconnected device is marked</div><div class='add'>+	 * as auto-connectable.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;type == LE_LINK) {</div><div class='add'>+		params = hci_conn_params_lookup(hdev, &amp;conn-&gt;dst,</div><div class='add'>+						conn-&gt;dst_type);</div><div class='add'>+		if (params) {</div><div class='add'>+			switch (params-&gt;auto_connect) {</div><div class='add'>+			case HCI_AUTO_CONN_LINK_LOSS:</div><div class='add'>+				if (ev-&gt;reason != HCI_ERROR_CONNECTION_TIMEOUT)</div><div class='add'>+					break;</div><div class='add'>+				fallthrough;</div><div class='add'>+</div><div class='add'>+			case HCI_AUTO_CONN_DIRECT:</div><div class='add'>+			case HCI_AUTO_CONN_ALWAYS:</div><div class='add'>+				hci_pend_le_list_del_init(params);</div><div class='add'>+				hci_pend_le_list_add(params,</div><div class='add'>+						     &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+				hci_update_passive_scan(hdev);</div><div class='ctx'> 				break;</div><div class='del'>-			/* Fall through */</div><div class='del'>-</div><div class='del'>-		case HCI_AUTO_CONN_DIRECT:</div><div class='del'>-		case HCI_AUTO_CONN_ALWAYS:</div><div class='del'>-			list_del_init(&amp;params-&gt;action);</div><div class='del'>-			list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='del'>-			hci_update_background_scan(hdev);</div><div class='del'>-			break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	type = conn-&gt;type;</div><div class='del'>-</div><div class='ctx'> 	hci_disconn_cfm(conn, ev-&gt;reason);</div><div class='del'>-	hci_conn_del(conn);</div><div class='ctx'> </div><div class='ctx'> 	/* Re-enable advertising if necessary, since it might</div><div class='ctx'> 	 * have been disabled by the connection. From the</div><div class='hunk'>@@ -2669,19 +3443,24 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	 * or until a connection is created or until the Advertising</div><div class='ctx'> 	 * is timed out due to Directed Advertising."</div><div class='ctx'> 	 */</div><div class='del'>-	if (type == LE_LINK)</div><div class='del'>-		hci_req_reenable_advertising(hdev);</div><div class='add'>+	if (conn-&gt;type == LE_LINK &amp;&amp; conn-&gt;role == HCI_ROLE_SLAVE) {</div><div class='add'>+		hdev-&gt;cur_adv_instance = conn-&gt;adv_instance;</div><div class='add'>+		hci_enable_advertising(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_conn_del(conn);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_auth_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_auth_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_auth_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2691,14 +3470,8 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!ev-&gt;status) {</div><div class='ctx'> 		clear_bit(HCI_CONN_AUTH_FAILURE, &amp;conn-&gt;flags);</div><div class='del'>-</div><div class='del'>-		if (!hci_conn_ssp_enabled(conn) &amp;&amp;</div><div class='del'>-		    test_bit(HCI_CONN_REAUTH_PEND, &amp;conn-&gt;flags)) {</div><div class='del'>-			bt_dev_info(hdev, "re-auth of legacy device is not possible.");</div><div class='del'>-		} else {</div><div class='del'>-			set_bit(HCI_CONN_AUTH, &amp;conn-&gt;flags);</div><div class='del'>-			conn-&gt;sec_level = conn-&gt;pending_sec_level;</div><div class='del'>-		}</div><div class='add'>+		set_bit(HCI_CONN_AUTH, &amp;conn-&gt;flags);</div><div class='add'>+		conn-&gt;sec_level = conn-&gt;pending_sec_level;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ev-&gt;status == HCI_ERROR_PIN_OR_KEY_MISSING)</div><div class='ctx'> 			set_bit(HCI_CONN_AUTH_FAILURE, &amp;conn-&gt;flags);</div><div class='hunk'>@@ -2707,7 +3480,6 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCI_CONN_AUTH_PEND, &amp;conn-&gt;flags);</div><div class='del'>-	clear_bit(HCI_CONN_REAUTH_PEND, &amp;conn-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;state == BT_CONFIG) {</div><div class='ctx'> 		if (!ev-&gt;status &amp;&amp; hci_conn_ssp_enabled(conn)) {</div><div class='hunk'>@@ -2738,7 +3510,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 				     &amp;cp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			clear_bit(HCI_CONN_ENCRYPT_PEND, &amp;conn-&gt;flags);</div><div class='del'>-			hci_encrypt_cfm(conn, ev-&gt;status, 0x00);</div><div class='add'>+			hci_encrypt_cfm(conn, ev-&gt;status);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2746,14 +3518,13 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_remote_name_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_remote_name *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_remote_name *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_conn_check_pending(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2788,68 +3559,13 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				       u16 opcode, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct hci_rp_read_enc_key_size *rp;</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-	u16 handle;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%02x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	if (!skb || skb-&gt;len &lt; sizeof(*rp)) {</div><div class='del'>-		bt_dev_err(hdev, "invalid read key size response");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rp = (void *)skb-&gt;data;</div><div class='del'>-	handle = le16_to_cpu(rp-&gt;handle);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	if (!conn)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* If we fail to read the encryption key size, assume maximum</div><div class='del'>-	 * (which is the same we do also when this HCI command isn't</div><div class='del'>-	 * supported.</div><div class='del'>-	 */</div><div class='del'>-	if (rp-&gt;status) {</div><div class='del'>-		bt_dev_err(hdev, "failed to read key size for handle %u",</div><div class='del'>-			   handle);</div><div class='del'>-		conn-&gt;enc_key_size = HCI_LINK_KEY_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		conn-&gt;enc_key_size = rp-&gt;key_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;state == BT_CONFIG) {</div><div class='del'>-		conn-&gt;state = BT_CONNECTED;</div><div class='del'>-		hci_connect_cfm(conn, 0);</div><div class='del'>-		hci_conn_drop(conn);</div><div class='del'>-	} else {</div><div class='del'>-		u8 encrypt;</div><div class='del'>-</div><div class='del'>-		if (!test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags))</div><div class='del'>-			encrypt = 0x00;</div><div class='del'>-		else if (test_bit(HCI_CONN_AES_CCM, &amp;conn-&gt;flags))</div><div class='del'>-			encrypt = 0x02;</div><div class='del'>-		else</div><div class='del'>-			encrypt = 0x01;</div><div class='del'>-</div><div class='del'>-		hci_encrypt_cfm(conn, 0, encrypt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_encrypt_change *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_encrypt_change *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2887,76 +3603,71 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCI_CONN_ENCRYPT_PEND, &amp;conn-&gt;flags);</div><div class='ctx'> </div><div class='add'>+	/* Check link security requirements are met */</div><div class='add'>+	if (!hci_conn_check_link_mode(conn))</div><div class='add'>+		ev-&gt;status = HCI_ERROR_AUTH_FAILURE;</div><div class='add'>+</div><div class='ctx'> 	if (ev-&gt;status &amp;&amp; conn-&gt;state == BT_CONNECTED) {</div><div class='ctx'> 		if (ev-&gt;status == HCI_ERROR_PIN_OR_KEY_MISSING)</div><div class='ctx'> 			set_bit(HCI_CONN_AUTH_FAILURE, &amp;conn-&gt;flags);</div><div class='ctx'> </div><div class='add'>+		/* Notify upper layers so they can cleanup before</div><div class='add'>+		 * disconnecting.</div><div class='add'>+		 */</div><div class='add'>+		hci_encrypt_cfm(conn, ev-&gt;status);</div><div class='ctx'> 		hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);</div><div class='ctx'> 		hci_conn_drop(conn);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* In Secure Connections Only mode, do not allow any connections</div><div class='del'>-	 * that are not encrypted with AES-CCM using a P-256 authenticated</div><div class='del'>-	 * combination key.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SC_ONLY) &amp;&amp;</div><div class='del'>-	    (!test_bit(HCI_CONN_AES_CCM, &amp;conn-&gt;flags) ||</div><div class='del'>-	     conn-&gt;key_type != HCI_LK_AUTH_COMBINATION_P256)) {</div><div class='del'>-		hci_connect_cfm(conn, HCI_ERROR_AUTH_FAILURE);</div><div class='del'>-		hci_conn_drop(conn);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Try reading the encryption key size for encrypted ACL links */</div><div class='ctx'> 	if (!ev-&gt;status &amp;&amp; ev-&gt;encrypt &amp;&amp; conn-&gt;type == ACL_LINK) {</div><div class='del'>-		struct hci_cp_read_enc_key_size cp;</div><div class='del'>-		struct hci_request req;</div><div class='del'>-</div><div class='del'>-		/* Only send HCI_Read_Encryption_Key_Size if the</div><div class='del'>-		 * controller really supports it. If it doesn't, assume</div><div class='del'>-		 * the default size (16).</div><div class='del'>-		 */</div><div class='del'>-		if (!(hdev-&gt;commands[20] &amp; 0x10)) {</div><div class='del'>-			conn-&gt;enc_key_size = HCI_LINK_KEY_SIZE;</div><div class='add'>+		if (hci_read_enc_key_size(hdev, conn))</div><div class='ctx'> 			goto notify;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-		cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_ENC_KEY_SIZE, sizeof(cp), &amp;cp);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (hci_req_run_skb(&amp;req, read_enc_key_size_complete)) {</div><div class='del'>-			bt_dev_err(hdev, "sending read key size failed");</div><div class='del'>-			conn-&gt;enc_key_size = HCI_LINK_KEY_SIZE;</div><div class='del'>-			goto notify;</div><div class='del'>-		}</div><div class='add'>+	/* We skip the WRITE_AUTH_PAYLOAD_TIMEOUT for ATS2851 based controllers</div><div class='add'>+	 * to avoid unexpected SMP command errors when pairing.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_BROKEN_WRITE_AUTH_PAYLOAD_TIMEOUT))</div><div class='add'>+		goto notify;</div><div class='add'>+</div><div class='add'>+	/* Set the default Authenticated Payload Timeout after</div><div class='add'>+	 * an LE Link is established. As per Core Spec v5.0, Vol 2, Part B</div><div class='add'>+	 * Section 3.3, the HCI command WRITE_AUTH_PAYLOAD_TIMEOUT should be</div><div class='add'>+	 * sent when the link is active and Encryption is enabled, the conn</div><div class='add'>+	 * type can be either LE or ACL and controller must support LMP Ping.</div><div class='add'>+	 * Ensure for AES-CCM encryption as well.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(HCI_CONN_ENCRYPT, &amp;conn-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(HCI_CONN_AES_CCM, &amp;conn-&gt;flags) &amp;&amp;</div><div class='add'>+	    ((conn-&gt;type == ACL_LINK &amp;&amp; lmp_ping_capable(hdev)) ||</div><div class='add'>+	     (conn-&gt;type == LE_LINK &amp;&amp; (hdev-&gt;le_features[0] &amp; HCI_LE_PING)))) {</div><div class='add'>+		struct hci_cp_write_auth_payload_to cp;</div><div class='ctx'> </div><div class='del'>-		goto unlock;</div><div class='add'>+		cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+		cp.timeout = cpu_to_le16(hdev-&gt;auth_payload_timeout);</div><div class='add'>+		if (hci_send_cmd(conn-&gt;hdev, HCI_OP_WRITE_AUTH_PAYLOAD_TO,</div><div class='add'>+				 sizeof(cp), &amp;cp))</div><div class='add'>+			bt_dev_err(hdev, "write auth payload timeout failed");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> notify:</div><div class='del'>-	if (conn-&gt;state == BT_CONFIG) {</div><div class='del'>-		if (!ev-&gt;status)</div><div class='del'>-			conn-&gt;state = BT_CONNECTED;</div><div class='del'>-</div><div class='del'>-		hci_connect_cfm(conn, ev-&gt;status);</div><div class='del'>-		hci_conn_drop(conn);</div><div class='del'>-	} else</div><div class='del'>-		hci_encrypt_cfm(conn, ev-&gt;status, ev-&gt;encrypt);</div><div class='add'>+	hci_encrypt_cfm(conn, ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_change_link_key_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_change_link_key_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_change_link_key_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_change_link_key_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2973,13 +3684,13 @@ static void hci_change_link_key_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_remote_features_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_remote_features_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_remote_features *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_remote_features *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3003,14 +3714,15 @@ static void hci_remote_features_evt(struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ev-&gt;status &amp;&amp; !test_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags)) {</div><div class='add'>+	if (!ev-&gt;status) {</div><div class='ctx'> 		struct hci_cp_remote_name_req cp;</div><div class='ctx'> 		memset(&amp;cp, 0, sizeof(cp));</div><div class='ctx'> 		bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='ctx'> 		cp.pscan_rep_mode = 0x02;</div><div class='ctx'> 		hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &amp;cp);</div><div class='del'>-	} else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags))</div><div class='del'>-		mgmt_device_connected(hdev, conn, 0, NULL, 0);</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_device_connected(hdev, conn, NULL, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_outgoing_auth_needed(hdev, conn)) {</div><div class='ctx'> 		conn-&gt;state = BT_CONNECTED;</div><div class='hunk'>@@ -3022,436 +3734,659 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='del'>-				 u16 *opcode, u8 *status,</div><div class='del'>-				 hci_req_complete_t *req_complete,</div><div class='del'>-				 hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+static inline void handle_cmd_cnt_and_timer(struct hci_dev *hdev, u8 ncmd)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_cmd_complete *ev = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	*opcode = __le16_to_cpu(ev-&gt;opcode);</div><div class='del'>-	*status = skb-&gt;data[sizeof(*ev)];</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*ev));</div><div class='del'>-</div><div class='del'>-	switch (*opcode) {</div><div class='del'>-	case HCI_OP_INQUIRY_CANCEL:</div><div class='del'>-		hci_cc_inquiry_cancel(hdev, skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_PERIODIC_INQ:</div><div class='del'>-		hci_cc_periodic_inq(hdev, skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_EXIT_PERIODIC_INQ:</div><div class='del'>-		hci_cc_exit_periodic_inq(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_REMOTE_NAME_REQ_CANCEL:</div><div class='del'>-		hci_cc_remote_name_req_cancel(hdev, skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_ROLE_DISCOVERY:</div><div class='del'>-		hci_cc_role_discovery(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!test_bit(HCI_RESET, &amp;hdev-&gt;flags)) {</div><div class='add'>+		if (ncmd) {</div><div class='add'>+			cancel_delayed_work(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+			atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+		} else {</div><div class='add'>+			if (!hci_dev_test_flag(hdev, HCI_CMD_DRAIN_WORKQUEUE))</div><div class='add'>+				queue_delayed_work(hdev-&gt;workqueue, &amp;hdev-&gt;ncmd_timer,</div><div class='add'>+						   HCI_NCMD_TIMEOUT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LINK_POLICY:</div><div class='del'>-		hci_cc_read_link_policy(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_le_read_buffer_size_v2(struct hci_dev *hdev, void *data,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_le_read_buffer_size_v2 *rp = data;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_LINK_POLICY:</div><div class='del'>-		hci_cc_write_link_policy(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_DEF_LINK_POLICY:</div><div class='del'>-		hci_cc_read_def_link_policy(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_DEF_LINK_POLICY:</div><div class='del'>-		hci_cc_write_def_link_policy(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hdev-&gt;le_mtu   = __le16_to_cpu(rp-&gt;acl_mtu);</div><div class='add'>+	hdev-&gt;le_pkts  = rp-&gt;acl_max_pkt;</div><div class='add'>+	hdev-&gt;iso_mtu  = __le16_to_cpu(rp-&gt;iso_mtu);</div><div class='add'>+	hdev-&gt;iso_pkts = rp-&gt;iso_max_pkt;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_RESET:</div><div class='del'>-		hci_cc_reset(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hdev-&gt;le_cnt  = hdev-&gt;le_pkts;</div><div class='add'>+	hdev-&gt;iso_cnt = hdev-&gt;iso_pkts;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_STORED_LINK_KEY:</div><div class='del'>-		hci_cc_read_stored_link_key(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	BT_DBG("%s acl mtu %d:%d iso mtu %d:%d", hdev-&gt;name, hdev-&gt;acl_mtu,</div><div class='add'>+	       hdev-&gt;acl_pkts, hdev-&gt;iso_mtu, hdev-&gt;iso_pkts);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_DELETE_STORED_LINK_KEY:</div><div class='del'>-		hci_cc_delete_stored_link_key(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (hdev-&gt;le_mtu &amp;&amp; hdev-&gt;le_mtu &lt; HCI_MIN_LE_MTU)</div><div class='add'>+		return HCI_ERROR_INVALID_PARAMETERS;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_LOCAL_NAME:</div><div class='del'>-		hci_cc_write_local_name(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_NAME:</div><div class='del'>-		hci_cc_read_local_name(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_unbound_cis_failed(struct hci_dev *hdev, u8 cig, u8 status)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn, *tmp;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_AUTH_ENABLE:</div><div class='del'>-		hci_cc_write_auth_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	lockdep_assert_held(&amp;hdev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_ENCRYPT_MODE:</div><div class='del'>-		hci_cc_write_encrypt_mode(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	list_for_each_entry_safe(conn, tmp, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+		if (conn-&gt;type != CIS_LINK ||</div><div class='add'>+		    conn-&gt;state == BT_OPEN || conn-&gt;iso_qos.ucast.cig != cig)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_SCAN_ENABLE:</div><div class='del'>-		hci_cc_write_scan_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (HCI_CONN_HANDLE_UNSET(conn-&gt;handle))</div><div class='add'>+			hci_conn_failed(conn, status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_CLASS_OF_DEV:</div><div class='del'>-		hci_cc_read_class_of_dev(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_le_set_cig_params *rp = data;</div><div class='add'>+	struct hci_cp_le_set_cig_params *cp;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	u8 status = rp-&gt;status;</div><div class='add'>+	bool pending = false;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_CLASS_OF_DEV:</div><div class='del'>-		hci_cc_write_class_of_dev(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_VOICE_SETTING:</div><div class='del'>-		hci_cc_read_voice_setting(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_CIG_PARAMS);</div><div class='add'>+	if (!rp-&gt;status &amp;&amp; (!cp || rp-&gt;num_handles != cp-&gt;num_cis ||</div><div class='add'>+			    rp-&gt;cig_id != cp-&gt;cig_id)) {</div><div class='add'>+		bt_dev_err(hdev, "unexpected Set CIG Parameters response data");</div><div class='add'>+		status = HCI_ERROR_UNSPECIFIED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_VOICE_SETTING:</div><div class='del'>-		hci_cc_write_voice_setting(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_NUM_SUPPORTED_IAC:</div><div class='del'>-		hci_cc_read_num_supported_iac(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E page 2554</div><div class='add'>+	 *</div><div class='add'>+	 * If the Status return parameter is non-zero, then the state of the CIG</div><div class='add'>+	 * and its CIS configurations shall not be changed by the command. If</div><div class='add'>+	 * the CIG did not already exist, it shall not be created.</div><div class='add'>+	 */</div><div class='add'>+	if (status) {</div><div class='add'>+		/* Keep current configuration, fail only the unbound CIS */</div><div class='add'>+		hci_unbound_cis_failed(hdev, rp-&gt;cig_id, status);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_SSP_MODE:</div><div class='del'>-		hci_cc_write_ssp_mode(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2553</div><div class='add'>+	 *</div><div class='add'>+	 * If the Status return parameter is zero, then the Controller shall</div><div class='add'>+	 * set the Connection_Handle arrayed return parameter to the connection</div><div class='add'>+	 * handle(s) corresponding to the CIS configurations specified in</div><div class='add'>+	 * the CIS_IDs command parameter, in the same order.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; rp-&gt;num_handles; ++i) {</div><div class='add'>+		conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, rp-&gt;cig_id,</div><div class='add'>+						cp-&gt;cis[i].cis_id);</div><div class='add'>+		if (!conn || !bacmp(&amp;conn-&gt;dst, BDADDR_ANY))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_SC_SUPPORT:</div><div class='del'>-		hci_cc_write_sc_support(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (conn-&gt;state != BT_BOUND &amp;&amp; conn-&gt;state != BT_CONNECT)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_VERSION:</div><div class='del'>-		hci_cc_read_local_version(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (hci_conn_set_handle(conn, __le16_to_cpu(rp-&gt;handle[i])))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_COMMANDS:</div><div class='del'>-		hci_cc_read_local_commands(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (conn-&gt;state == BT_CONNECT)</div><div class='add'>+			pending = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_FEATURES:</div><div class='del'>-		hci_cc_read_local_features(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	if (pending)</div><div class='add'>+		hci_le_create_cis_pending(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_EXT_FEATURES:</div><div class='del'>-		hci_cc_read_local_ext_features(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_BUFFER_SIZE:</div><div class='del'>-		hci_cc_read_buffer_size(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_BD_ADDR:</div><div class='del'>-		hci_cc_read_bd_addr(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_le_setup_iso_path *rp = data;</div><div class='add'>+	struct hci_cp_le_setup_iso_path *cp;</div><div class='add'>+	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_PAGE_SCAN_ACTIVITY:</div><div class='del'>-		hci_cc_read_page_scan_activity(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_PAGE_SCAN_ACTIVITY:</div><div class='del'>-		hci_cc_write_page_scan_activity(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SETUP_ISO_PATH);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_PAGE_SCAN_TYPE:</div><div class='del'>-		hci_cc_read_page_scan_type(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_PAGE_SCAN_TYPE:</div><div class='del'>-		hci_cc_write_page_scan_type(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp-&gt;handle));</div><div class='add'>+	if (!conn)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_DATA_BLOCK_SIZE:</div><div class='del'>-		hci_cc_read_data_block_size(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (rp-&gt;status) {</div><div class='add'>+		hci_connect_cfm(conn, rp-&gt;status);</div><div class='add'>+		hci_conn_del(conn);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_FLOW_CONTROL_MODE:</div><div class='del'>-		hci_cc_read_flow_control_mode(hdev, skb);</div><div class='add'>+	switch (cp-&gt;direction) {</div><div class='add'>+	/* Input (Host to Controller) */</div><div class='add'>+	case 0x00:</div><div class='add'>+		/* Only confirm connection if output only */</div><div class='add'>+		if (conn-&gt;iso_qos.ucast.out.sdu &amp;&amp; !conn-&gt;iso_qos.ucast.in.sdu)</div><div class='add'>+			hci_connect_cfm(conn, rp-&gt;status);</div><div class='ctx'> 		break;</div><div class='add'>+	/* Output (Controller to Host) */</div><div class='add'>+	case 0x01:</div><div class='add'>+		/* Confirm connection since conn-&gt;iso_qos is always configured</div><div class='add'>+		 * last.</div><div class='add'>+		 */</div><div class='add'>+		hci_connect_cfm(conn, rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_AMP_INFO:</div><div class='del'>-		hci_cc_read_local_amp_info(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		/* Notify device connected in case it is a BIG Sync */</div><div class='add'>+		if (!rp-&gt;status &amp;&amp; test_bit(HCI_CONN_BIG_SYNC, &amp;conn-&gt;flags))</div><div class='add'>+			mgmt_device_connected(hdev, conn, NULL, 0);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_CLOCK:</div><div class='del'>-		hci_cc_read_clock(hdev, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_INQ_RSP_TX_POWER:</div><div class='del'>-		hci_cc_read_inq_rsp_tx_power(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_PIN_CODE_REPLY:</div><div class='del'>-		hci_cc_pin_code_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_le_read_all_local_features(struct hci_dev *hdev, void *data,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_rp_le_read_all_local_features *rp = data;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_PIN_CODE_NEG_REPLY:</div><div class='del'>-		hci_cc_pin_code_neg_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_OOB_DATA:</div><div class='del'>-		hci_cc_read_local_oob_data(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_LOCAL_OOB_EXT_DATA:</div><div class='del'>-		hci_cc_read_local_oob_ext_data(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	memcpy(hdev-&gt;le_features, rp-&gt;features, 248);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_BUFFER_SIZE:</div><div class='del'>-		hci_cc_le_read_buffer_size(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_LOCAL_FEATURES:</div><div class='del'>-		hci_cc_le_read_local_features(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_cs_le_create_big(struct hci_dev *hdev, u8 status)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_ADV_TX_POWER:</div><div class='del'>-		hci_cc_le_read_adv_tx_power(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_cs_le_read_all_remote_features(struct hci_dev *hdev, u8 status)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_read_remote_features *cp;</div><div class='add'>+	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_USER_CONFIRM_REPLY:</div><div class='del'>-		hci_cc_user_confirm_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_USER_CONFIRM_NEG_REPLY:</div><div class='del'>-		hci_cc_user_confirm_neg_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (!status)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_USER_PASSKEY_REPLY:</div><div class='del'>-		hci_cc_user_passkey_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_READ_ALL_REMOTE_FEATURES);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_USER_PASSKEY_NEG_REPLY:</div><div class='del'>-		hci_cc_user_passkey_neg_reply(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_RANDOM_ADDR:</div><div class='del'>-		hci_cc_le_set_random_addr(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp-&gt;handle));</div><div class='add'>+	if (conn &amp;&amp; conn-&gt;state == BT_CONFIG)</div><div class='add'>+		hci_connect_cfm(conn, status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_ADV_ENABLE:</div><div class='del'>-		hci_cc_le_set_adv_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_SCAN_PARAM:</div><div class='del'>-		hci_cc_le_set_scan_param(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_set_per_adv_param(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct hci_cp_le_set_per_adv_params *cp;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_SCAN_ENABLE:</div><div class='del'>-		hci_cc_le_set_scan_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_WHITE_LIST_SIZE:</div><div class='del'>-		hci_cc_le_read_white_list_size(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_CLEAR_WHITE_LIST:</div><div class='del'>-		hci_cc_le_clear_white_list(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_PER_ADV_PARAMS);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_ADD_TO_WHITE_LIST:</div><div class='del'>-		hci_cc_le_add_to_white_list(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* TODO: set the conn state */</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_DEL_FROM_WHITE_LIST:</div><div class='del'>-		hci_cc_le_del_from_white_list(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static u8 hci_cc_le_set_per_adv_enable(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_status *rp = data;</div><div class='add'>+	struct hci_cp_le_set_per_adv_enable *cp;</div><div class='add'>+	struct adv_info *adv = NULL, *n;</div><div class='add'>+	u8 per_adv_cnt = 0;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_SUPPORTED_STATES:</div><div class='del'>-		hci_cc_le_read_supported_states(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", rp-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_DEF_DATA_LEN:</div><div class='del'>-		hci_cc_le_read_def_data_len(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (rp-&gt;status)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_WRITE_DEF_DATA_LEN:</div><div class='del'>-		hci_cc_le_write_def_data_len(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_PER_ADV_ENABLE);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return rp-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_CLEAR_RESOLV_LIST:</div><div class='del'>-		hci_cc_le_clear_resolv_list(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_RESOLV_LIST_SIZE:</div><div class='del'>-		hci_cc_le_read_resolv_list_size(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	adv = hci_find_adv_instance(hdev, cp-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_ADDR_RESOLV_ENABLE:</div><div class='del'>-		hci_cc_le_set_addr_resolution_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (cp-&gt;enable) {</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_LE_PER_ADV);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_MAX_DATA_LEN:</div><div class='del'>-		hci_cc_le_read_max_data_len(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (adv)</div><div class='add'>+			adv-&gt;periodic_enabled = true;</div><div class='add'>+	} else {</div><div class='add'>+		if (adv)</div><div class='add'>+			adv-&gt;periodic_enabled = false;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_LE_HOST_SUPPORTED:</div><div class='del'>-		hci_cc_write_le_host_supported(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		/* If just one instance was disabled check if there are</div><div class='add'>+		 * any other instance enabled before clearing HCI_LE_PER_ADV.</div><div class='add'>+		 * The current periodic adv instance will be marked as</div><div class='add'>+		 * disabled once extended advertising is also disabled.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances,</div><div class='add'>+					 list) {</div><div class='add'>+			if (adv-&gt;periodic &amp;&amp; adv-&gt;enabled)</div><div class='add'>+				per_adv_cnt++;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_ADV_PARAM:</div><div class='del'>-		hci_cc_set_adv_param(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		if (per_adv_cnt &gt; 1)</div><div class='add'>+			goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_RSSI:</div><div class='del'>-		hci_cc_read_rssi(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_LE_PER_ADV);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_TX_POWER:</div><div class='del'>-		hci_cc_read_tx_power(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_WRITE_SSP_DEBUG_MODE:</div><div class='del'>-		hci_cc_write_ssp_debug_mode(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_CC_VL(_op, _func, _min, _max) \</div><div class='add'>+{ \</div><div class='add'>+	.op = _op, \</div><div class='add'>+	.func = _func, \</div><div class='add'>+	.min_len = _min, \</div><div class='add'>+	.max_len = _max, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_CC(_op, _func, _len) \</div><div class='add'>+	HCI_CC_VL(_op, _func, _len, _len)</div><div class='add'>+</div><div class='add'>+#define HCI_CC_STATUS(_op, _func) \</div><div class='add'>+	HCI_CC(_op, _func, sizeof(struct hci_ev_status))</div><div class='add'>+</div><div class='add'>+static const struct hci_cc {</div><div class='add'>+	u16  op;</div><div class='add'>+	u8 (*func)(struct hci_dev *hdev, void *data, struct sk_buff *skb);</div><div class='add'>+	u16  min_len;</div><div class='add'>+	u16  max_len;</div><div class='add'>+} hci_cc_table[] = {</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_INQUIRY_CANCEL, hci_cc_inquiry_cancel),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_PERIODIC_INQ, hci_cc_periodic_inq),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_EXIT_PERIODIC_INQ, hci_cc_exit_periodic_inq),</div><div class='add'>+	HCI_CC(HCI_OP_REMOTE_NAME_REQ_CANCEL, hci_cc_remote_name_req_cancel,</div><div class='add'>+	       sizeof(struct hci_rp_remote_name_req_cancel)),</div><div class='add'>+	HCI_CC(HCI_OP_ROLE_DISCOVERY, hci_cc_role_discovery,</div><div class='add'>+	       sizeof(struct hci_rp_role_discovery)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LINK_POLICY, hci_cc_read_link_policy,</div><div class='add'>+	       sizeof(struct hci_rp_read_link_policy)),</div><div class='add'>+	HCI_CC(HCI_OP_WRITE_LINK_POLICY, hci_cc_write_link_policy,</div><div class='add'>+	       sizeof(struct hci_rp_write_link_policy)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_DEF_LINK_POLICY, hci_cc_read_def_link_policy,</div><div class='add'>+	       sizeof(struct hci_rp_read_def_link_policy)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_DEF_LINK_POLICY,</div><div class='add'>+		      hci_cc_write_def_link_policy),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_RESET, hci_cc_reset),</div><div class='add'>+	HCI_CC(HCI_OP_READ_STORED_LINK_KEY, hci_cc_read_stored_link_key,</div><div class='add'>+	       sizeof(struct hci_rp_read_stored_link_key)),</div><div class='add'>+	HCI_CC(HCI_OP_DELETE_STORED_LINK_KEY, hci_cc_delete_stored_link_key,</div><div class='add'>+	       sizeof(struct hci_rp_delete_stored_link_key)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_LOCAL_NAME, hci_cc_write_local_name),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_NAME, hci_cc_read_local_name,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_name)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_AUTH_ENABLE, hci_cc_write_auth_enable),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_ENCRYPT_MODE, hci_cc_write_encrypt_mode),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_SCAN_ENABLE, hci_cc_write_scan_enable),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_SET_EVENT_FLT, hci_cc_set_event_filter),</div><div class='add'>+	HCI_CC(HCI_OP_READ_CLASS_OF_DEV, hci_cc_read_class_of_dev,</div><div class='add'>+	       sizeof(struct hci_rp_read_class_of_dev)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_CLASS_OF_DEV, hci_cc_write_class_of_dev),</div><div class='add'>+	HCI_CC(HCI_OP_READ_VOICE_SETTING, hci_cc_read_voice_setting,</div><div class='add'>+	       sizeof(struct hci_rp_read_voice_setting)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_VOICE_SETTING, hci_cc_write_voice_setting),</div><div class='add'>+	HCI_CC(HCI_OP_READ_NUM_SUPPORTED_IAC, hci_cc_read_num_supported_iac,</div><div class='add'>+	       sizeof(struct hci_rp_read_num_supported_iac)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_SSP_MODE, hci_cc_write_ssp_mode),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_SC_SUPPORT, hci_cc_write_sc_support),</div><div class='add'>+	HCI_CC(HCI_OP_READ_AUTH_PAYLOAD_TO, hci_cc_read_auth_payload_timeout,</div><div class='add'>+	       sizeof(struct hci_rp_read_auth_payload_to)),</div><div class='add'>+	HCI_CC(HCI_OP_WRITE_AUTH_PAYLOAD_TO, hci_cc_write_auth_payload_timeout,</div><div class='add'>+	       sizeof(struct hci_rp_write_auth_payload_to)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_VERSION, hci_cc_read_local_version,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_version)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_COMMANDS, hci_cc_read_local_commands,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_commands)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_FEATURES, hci_cc_read_local_features,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_features)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_EXT_FEATURES, hci_cc_read_local_ext_features,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_ext_features)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_BUFFER_SIZE, hci_cc_read_buffer_size,</div><div class='add'>+	       sizeof(struct hci_rp_read_buffer_size)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_BD_ADDR, hci_cc_read_bd_addr,</div><div class='add'>+	       sizeof(struct hci_rp_read_bd_addr)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_PAIRING_OPTS, hci_cc_read_local_pairing_opts,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_pairing_opts)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_PAGE_SCAN_ACTIVITY, hci_cc_read_page_scan_activity,</div><div class='add'>+	       sizeof(struct hci_rp_read_page_scan_activity)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,</div><div class='add'>+		      hci_cc_write_page_scan_activity),</div><div class='add'>+	HCI_CC(HCI_OP_READ_PAGE_SCAN_TYPE, hci_cc_read_page_scan_type,</div><div class='add'>+	       sizeof(struct hci_rp_read_page_scan_type)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_PAGE_SCAN_TYPE, hci_cc_write_page_scan_type),</div><div class='add'>+	HCI_CC(HCI_OP_READ_CLOCK, hci_cc_read_clock,</div><div class='add'>+	       sizeof(struct hci_rp_read_clock)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_ENC_KEY_SIZE, hci_cc_read_enc_key_size,</div><div class='add'>+	       sizeof(struct hci_rp_read_enc_key_size)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_INQ_RSP_TX_POWER, hci_cc_read_inq_rsp_tx_power,</div><div class='add'>+	       sizeof(struct hci_rp_read_inq_rsp_tx_power)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_DEF_ERR_DATA_REPORTING,</div><div class='add'>+	       hci_cc_read_def_err_data_reporting,</div><div class='add'>+	       sizeof(struct hci_rp_read_def_err_data_reporting)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_DEF_ERR_DATA_REPORTING,</div><div class='add'>+		      hci_cc_write_def_err_data_reporting),</div><div class='add'>+	HCI_CC(HCI_OP_PIN_CODE_REPLY, hci_cc_pin_code_reply,</div><div class='add'>+	       sizeof(struct hci_rp_pin_code_reply)),</div><div class='add'>+	HCI_CC(HCI_OP_PIN_CODE_NEG_REPLY, hci_cc_pin_code_neg_reply,</div><div class='add'>+	       sizeof(struct hci_rp_pin_code_neg_reply)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_OOB_DATA, hci_cc_read_local_oob_data,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_oob_data)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_LOCAL_OOB_EXT_DATA, hci_cc_read_local_oob_ext_data,</div><div class='add'>+	       sizeof(struct hci_rp_read_local_oob_ext_data)),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_BUFFER_SIZE, hci_cc_le_read_buffer_size,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_buffer_size)),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_LOCAL_FEATURES, hci_cc_le_read_local_features,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_local_features)),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_ADV_TX_POWER, hci_cc_le_read_adv_tx_power,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_adv_tx_power)),</div><div class='add'>+	HCI_CC(HCI_OP_USER_CONFIRM_REPLY, hci_cc_user_confirm_reply,</div><div class='add'>+	       sizeof(struct hci_rp_user_confirm_reply)),</div><div class='add'>+	HCI_CC(HCI_OP_USER_CONFIRM_NEG_REPLY, hci_cc_user_confirm_neg_reply,</div><div class='add'>+	       sizeof(struct hci_rp_user_confirm_reply)),</div><div class='add'>+	HCI_CC(HCI_OP_USER_PASSKEY_REPLY, hci_cc_user_passkey_reply,</div><div class='add'>+	       sizeof(struct hci_rp_user_confirm_reply)),</div><div class='add'>+	HCI_CC(HCI_OP_USER_PASSKEY_NEG_REPLY, hci_cc_user_passkey_neg_reply,</div><div class='add'>+	       sizeof(struct hci_rp_user_confirm_reply)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_RANDOM_ADDR, hci_cc_le_set_random_addr),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_ADV_ENABLE, hci_cc_le_set_adv_enable),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_SCAN_PARAM, hci_cc_le_set_scan_param),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_SCAN_ENABLE, hci_cc_le_set_scan_enable),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_ACCEPT_LIST_SIZE,</div><div class='add'>+	       hci_cc_le_read_accept_list_size,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_accept_list_size)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_CLEAR_ACCEPT_LIST, hci_cc_le_clear_accept_list),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_ADD_TO_ACCEPT_LIST,</div><div class='add'>+		      hci_cc_le_add_to_accept_list),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_DEL_FROM_ACCEPT_LIST,</div><div class='add'>+		      hci_cc_le_del_from_accept_list),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_SUPPORTED_STATES, hci_cc_le_read_supported_states,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_supported_states)),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_DEF_DATA_LEN, hci_cc_le_read_def_data_len,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_def_data_len)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_WRITE_DEF_DATA_LEN,</div><div class='add'>+		      hci_cc_le_write_def_data_len),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_ADD_TO_RESOLV_LIST,</div><div class='add'>+		      hci_cc_le_add_to_resolv_list),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_DEL_FROM_RESOLV_LIST,</div><div class='add'>+		      hci_cc_le_del_from_resolv_list),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_CLEAR_RESOLV_LIST,</div><div class='add'>+		      hci_cc_le_clear_resolv_list),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_RESOLV_LIST_SIZE, hci_cc_le_read_resolv_list_size,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_resolv_list_size)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_ADDR_RESOLV_ENABLE,</div><div class='add'>+		      hci_cc_le_set_addr_resolution_enable),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_MAX_DATA_LEN, hci_cc_le_read_max_data_len,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_max_data_len)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_LE_HOST_SUPPORTED,</div><div class='add'>+		      hci_cc_write_le_host_supported),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_ADV_PARAM, hci_cc_set_adv_param),</div><div class='add'>+	HCI_CC(HCI_OP_READ_RSSI, hci_cc_read_rssi,</div><div class='add'>+	       sizeof(struct hci_rp_read_rssi)),</div><div class='add'>+	HCI_CC(HCI_OP_READ_TX_POWER, hci_cc_read_tx_power,</div><div class='add'>+	       sizeof(struct hci_rp_read_tx_power)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_WRITE_SSP_DEBUG_MODE, hci_cc_write_ssp_debug_mode),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_EXT_SCAN_PARAMS,</div><div class='add'>+		      hci_cc_le_set_ext_scan_param),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_EXT_SCAN_ENABLE,</div><div class='add'>+		      hci_cc_le_set_ext_scan_enable),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_DEFAULT_PHY, hci_cc_le_set_default_phy),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS,</div><div class='add'>+	       hci_cc_le_read_num_adv_sets,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_num_supported_adv_sets)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_EXT_ADV_ENABLE,</div><div class='add'>+		      hci_cc_le_set_ext_adv_enable),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_ADV_SET_RAND_ADDR,</div><div class='add'>+		      hci_cc_le_set_adv_set_random_addr),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_REMOVE_ADV_SET, hci_cc_le_remove_adv_set),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_CLEAR_ADV_SETS, hci_cc_le_clear_adv_sets),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_PER_ADV_PARAMS, hci_cc_set_per_adv_param),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_PER_ADV_ENABLE,</div><div class='add'>+		      hci_cc_le_set_per_adv_enable),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_TRANSMIT_POWER, hci_cc_le_read_transmit_power,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_transmit_power)),</div><div class='add'>+	HCI_CC_STATUS(HCI_OP_LE_SET_PRIVACY_MODE, hci_cc_le_set_privacy_mode),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_BUFFER_SIZE_V2, hci_cc_le_read_buffer_size_v2,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_buffer_size_v2)),</div><div class='add'>+	HCI_CC_VL(HCI_OP_LE_SET_CIG_PARAMS, hci_cc_le_set_cig_params,</div><div class='add'>+		  sizeof(struct hci_rp_le_set_cig_params), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	HCI_CC(HCI_OP_LE_SETUP_ISO_PATH, hci_cc_le_setup_iso_path,</div><div class='add'>+	       sizeof(struct hci_rp_le_setup_iso_path)),</div><div class='add'>+	HCI_CC(HCI_OP_LE_READ_ALL_LOCAL_FEATURES,</div><div class='add'>+	       hci_cc_le_read_all_local_features,</div><div class='add'>+	       sizeof(struct hci_rp_le_read_all_local_features)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 hci_cc_func(struct hci_dev *hdev, const struct hci_cc *cc,</div><div class='add'>+		      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; cc-&gt;min_len) {</div><div class='add'>+		bt_dev_err(hdev, "unexpected cc 0x%4.4x length: %u &lt; %u",</div><div class='add'>+			   cc-&gt;op, skb-&gt;len, cc-&gt;min_len);</div><div class='add'>+		return HCI_ERROR_UNSPECIFIED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Just warn if the length is over max_len size it still be possible to</div><div class='add'>+	 * partially parse the cc so leave to callback to decide if that is</div><div class='add'>+	 * acceptable.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len &gt; cc-&gt;max_len)</div><div class='add'>+		bt_dev_warn(hdev, "unexpected cc 0x%4.4x length: %u &gt; %u",</div><div class='add'>+			    cc-&gt;op, skb-&gt;len, cc-&gt;max_len);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_EXT_SCAN_PARAMS:</div><div class='del'>-		hci_cc_le_set_ext_scan_param(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	data = hci_cc_skb_pull(hdev, skb, cc-&gt;op, cc-&gt;min_len);</div><div class='add'>+	if (!data)</div><div class='add'>+		return HCI_ERROR_UNSPECIFIED;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_EXT_SCAN_ENABLE:</div><div class='del'>-		hci_cc_le_set_ext_scan_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return cc-&gt;func(hdev, data, skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_DEFAULT_PHY:</div><div class='del'>-		hci_cc_le_set_default_phy(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				 struct sk_buff *skb, u16 *opcode, u8 *status,</div><div class='add'>+				 hci_req_complete_t *req_complete,</div><div class='add'>+				 hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_cmd_complete *ev = data;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS:</div><div class='del'>-		hci_cc_le_read_num_adv_sets(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	*opcode = __le16_to_cpu(ev-&gt;opcode);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_EXT_ADV_PARAMS:</div><div class='del'>-		hci_cc_set_ext_adv_param(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "opcode 0x%4.4x", *opcode);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_EXT_ADV_ENABLE:</div><div class='del'>-		hci_cc_le_set_ext_adv_enable(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hci_cc_table); i++) {</div><div class='add'>+		if (hci_cc_table[i].op == *opcode) {</div><div class='add'>+			*status = hci_cc_func(hdev, &amp;hci_cc_table[i], skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_SET_ADV_SET_RAND_ADDR:</div><div class='del'>-		hci_cc_le_set_adv_set_random_addr(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (i == ARRAY_SIZE(hci_cc_table)) {</div><div class='add'>+		if (!skb-&gt;len) {</div><div class='add'>+			bt_dev_err(hdev, "Unexpected cc 0x%4.4x with no status",</div><div class='add'>+				   *opcode);</div><div class='add'>+			*status = HCI_ERROR_UNSPECIFIED;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		BT_DBG("%s opcode 0x%4.4x", hdev-&gt;name, *opcode);</div><div class='del'>-		break;</div><div class='add'>+		/* Unknown opcode, assume byte 0 contains the status, so</div><div class='add'>+		 * that e.g. __hci_cmd_sync() properly returns errors</div><div class='add'>+		 * for vendor specific commands send by HCI drivers.</div><div class='add'>+		 * If a vendor doesn't actually follow this convention we may</div><div class='add'>+		 * need to introduce a vendor CC table in order to properly set</div><div class='add'>+		 * the status.</div><div class='add'>+		 */</div><div class='add'>+		*status = skb-&gt;data[0];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*opcode != HCI_OP_NOP)</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;ncmd &amp;&amp; !test_bit(HCI_RESET, &amp;hdev-&gt;flags))</div><div class='del'>-		atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+	handle_cmd_cnt_and_timer(hdev, ev-&gt;ncmd);</div><div class='ctx'> </div><div class='ctx'> 	hci_req_cmd_complete(hdev, *opcode, *status, req_complete,</div><div class='ctx'> 			     req_complete_skb);</div><div class='ctx'> </div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_CMD_PENDING)) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "unexpected event for opcode 0x%4.4x", *opcode);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (atomic_read(&amp;hdev-&gt;cmd_cnt) &amp;&amp; !skb_queue_empty(&amp;hdev-&gt;cmd_q))</div><div class='ctx'> 		queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='del'>-			       u16 *opcode, u8 *status,</div><div class='del'>-			       hci_req_complete_t *req_complete,</div><div class='del'>-			       hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+static void hci_cs_le_create_cis(struct hci_dev *hdev, u8 status)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_cmd_status *ev = (void *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*ev));</div><div class='del'>-</div><div class='del'>-	*opcode = __le16_to_cpu(ev-&gt;opcode);</div><div class='del'>-	*status = ev-&gt;status;</div><div class='del'>-</div><div class='del'>-	switch (*opcode) {</div><div class='del'>-	case HCI_OP_INQUIRY:</div><div class='del'>-		hci_cs_inquiry(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_CREATE_CONN:</div><div class='del'>-		hci_cs_create_conn(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_DISCONNECT:</div><div class='del'>-		hci_cs_disconnect(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_ADD_SCO:</div><div class='del'>-		hci_cs_add_sco(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_OP_AUTH_REQUESTED:</div><div class='del'>-		hci_cs_auth_requested(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	struct hci_cp_le_create_cis *cp;</div><div class='add'>+	bool pending = false;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_SET_CONN_ENCRYPT:</div><div class='del'>-		hci_cs_set_conn_encrypt(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_REMOTE_NAME_REQ:</div><div class='del'>-		hci_cs_remote_name_req(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	if (!status)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_REMOTE_FEATURES:</div><div class='del'>-		hci_cs_read_remote_features(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CIS);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_READ_REMOTE_EXT_FEATURES:</div><div class='del'>-		hci_cs_read_remote_ext_features(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_SETUP_SYNC_CONN:</div><div class='del'>-		hci_cs_setup_sync_conn(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	/* Remove connection if command failed */</div><div class='add'>+	for (i = 0; i &lt; cp-&gt;num_cis; i++) {</div><div class='add'>+		struct hci_conn *conn;</div><div class='add'>+		u16 handle;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_SNIFF_MODE:</div><div class='del'>-		hci_cs_sniff_mode(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+		handle = __le16_to_cpu(cp-&gt;cis[i].cis_handle);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_EXIT_SNIFF_MODE:</div><div class='del'>-		hci_cs_exit_sniff_mode(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+		conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+		if (conn) {</div><div class='add'>+			if (test_and_clear_bit(HCI_CONN_CREATE_CIS,</div><div class='add'>+					       &amp;conn-&gt;flags))</div><div class='add'>+				pending = true;</div><div class='add'>+			conn-&gt;state = BT_CLOSED;</div><div class='add'>+			hci_connect_cfm(conn, status);</div><div class='add'>+			hci_conn_del(conn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cp-&gt;num_cis = 0;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_SWITCH_ROLE:</div><div class='del'>-		hci_cs_switch_role(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	if (pending)</div><div class='add'>+		hci_le_create_cis_pending(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_CREATE_CONN:</div><div class='del'>-		hci_cs_le_create_conn(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_READ_REMOTE_FEATURES:</div><div class='del'>-		hci_cs_le_read_remote_features(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+#define HCI_CS(_op, _func) \</div><div class='add'>+{ \</div><div class='add'>+	.op = _op, \</div><div class='add'>+	.func = _func, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hci_cs {</div><div class='add'>+	u16  op;</div><div class='add'>+	void (*func)(struct hci_dev *hdev, __u8 status);</div><div class='add'>+} hci_cs_table[] = {</div><div class='add'>+	HCI_CS(HCI_OP_INQUIRY, hci_cs_inquiry),</div><div class='add'>+	HCI_CS(HCI_OP_CREATE_CONN, hci_cs_create_conn),</div><div class='add'>+	HCI_CS(HCI_OP_DISCONNECT, hci_cs_disconnect),</div><div class='add'>+	HCI_CS(HCI_OP_ADD_SCO, hci_cs_add_sco),</div><div class='add'>+	HCI_CS(HCI_OP_AUTH_REQUESTED, hci_cs_auth_requested),</div><div class='add'>+	HCI_CS(HCI_OP_SET_CONN_ENCRYPT, hci_cs_set_conn_encrypt),</div><div class='add'>+	HCI_CS(HCI_OP_REMOTE_NAME_REQ, hci_cs_remote_name_req),</div><div class='add'>+	HCI_CS(HCI_OP_READ_REMOTE_FEATURES, hci_cs_read_remote_features),</div><div class='add'>+	HCI_CS(HCI_OP_READ_REMOTE_EXT_FEATURES,</div><div class='add'>+	       hci_cs_read_remote_ext_features),</div><div class='add'>+	HCI_CS(HCI_OP_SETUP_SYNC_CONN, hci_cs_setup_sync_conn),</div><div class='add'>+	HCI_CS(HCI_OP_ENHANCED_SETUP_SYNC_CONN,</div><div class='add'>+	       hci_cs_enhanced_setup_sync_conn),</div><div class='add'>+	HCI_CS(HCI_OP_SNIFF_MODE, hci_cs_sniff_mode),</div><div class='add'>+	HCI_CS(HCI_OP_EXIT_SNIFF_MODE, hci_cs_exit_sniff_mode),</div><div class='add'>+	HCI_CS(HCI_OP_SWITCH_ROLE, hci_cs_switch_role),</div><div class='add'>+	HCI_CS(HCI_OP_LE_CREATE_CONN, hci_cs_le_create_conn),</div><div class='add'>+	HCI_CS(HCI_OP_LE_READ_REMOTE_FEATURES, hci_cs_le_read_remote_features),</div><div class='add'>+	HCI_CS(HCI_OP_LE_START_ENC, hci_cs_le_start_enc),</div><div class='add'>+	HCI_CS(HCI_OP_LE_EXT_CREATE_CONN, hci_cs_le_ext_create_conn),</div><div class='add'>+	HCI_CS(HCI_OP_LE_CREATE_CIS, hci_cs_le_create_cis),</div><div class='add'>+	HCI_CS(HCI_OP_LE_CREATE_BIG, hci_cs_le_create_big),</div><div class='add'>+	HCI_CS(HCI_OP_LE_READ_ALL_REMOTE_FEATURES,</div><div class='add'>+	       hci_cs_le_read_all_remote_features),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hci_cmd_status_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+			       struct sk_buff *skb, u16 *opcode, u8 *status,</div><div class='add'>+			       hci_req_complete_t *req_complete,</div><div class='add'>+			       hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_cmd_status *ev = data;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_START_ENC:</div><div class='del'>-		hci_cs_le_start_enc(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	*opcode = __le16_to_cpu(ev-&gt;opcode);</div><div class='add'>+	*status = ev-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_OP_LE_EXT_CREATE_CONN:</div><div class='del'>-		hci_cs_le_ext_create_conn(hdev, ev-&gt;status);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "opcode 0x%4.4x", *opcode);</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		BT_DBG("%s opcode 0x%4.4x", hdev-&gt;name, *opcode);</div><div class='del'>-		break;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hci_cs_table); i++) {</div><div class='add'>+		if (hci_cs_table[i].op == *opcode) {</div><div class='add'>+			hci_cs_table[i].func(hdev, ev-&gt;status);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*opcode != HCI_OP_NOP)</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;cmd_timer);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;ncmd &amp;&amp; !test_bit(HCI_RESET, &amp;hdev-&gt;flags))</div><div class='del'>-		atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+	handle_cmd_cnt_and_timer(hdev, ev-&gt;ncmd);</div><div class='ctx'> </div><div class='ctx'> 	/* Indicate request completion if the command failed. Also, if</div><div class='ctx'> 	 * we're not waiting for a special event and we get a success</div><div class='hunk'>@@ -3459,30 +4394,39 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='ctx'> 	 * (since for this kind of commands there will not be a command</div><div class='ctx'> 	 * complete event).</div><div class='ctx'> 	 */</div><div class='del'>-	if (ev-&gt;status ||</div><div class='del'>-	    (hdev-&gt;sent_cmd &amp;&amp; !bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_event))</div><div class='add'>+	if (ev-&gt;status || (hdev-&gt;req_skb &amp;&amp; !hci_skb_event(hdev-&gt;req_skb))) {</div><div class='ctx'> 		hci_req_cmd_complete(hdev, *opcode, ev-&gt;status, req_complete,</div><div class='ctx'> 				     req_complete_skb);</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_CMD_PENDING)) {</div><div class='add'>+			bt_dev_err(hdev, "unexpected event for opcode 0x%4.4x",</div><div class='add'>+				   *opcode);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;hdev-&gt;cmd_cnt) &amp;&amp; !skb_queue_empty(&amp;hdev-&gt;cmd_q))</div><div class='ctx'> 		queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_hardware_error_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_hardware_error_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_hardware_error *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_hardware_error *ev = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "code 0x%2.2x", ev-&gt;code);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;hw_error_code = ev-&gt;code;</div><div class='ctx'> </div><div class='ctx'> 	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;error_reset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_role_change_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_role_change *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_role_change *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3499,28 +4443,25 @@ static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_num_comp_pkts_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_num_comp_pkts *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_num_comp_pkts *ev = data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;flow_ctl_mode != HCI_FLOW_CTL_MODE_PACKET_BASED) {</div><div class='del'>-		bt_dev_err(hdev, "wrong event for mode %d", hdev-&gt;flow_ctl_mode);</div><div class='add'>+	if (!hci_ev_skb_pull(hdev, skb, HCI_EV_NUM_COMP_PKTS,</div><div class='add'>+			     flex_array_size(ev, handles, ev-&gt;num)))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*ev) || skb-&gt;len &lt; sizeof(*ev) +</div><div class='del'>-	    ev-&gt;num_hndl * sizeof(struct hci_comp_pkts_info)) {</div><div class='del'>-		BT_DBG("%s bad parameters", hdev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	bt_dev_dbg(hdev, "num %d", ev-&gt;num);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s num_hndl %d", hdev-&gt;name, ev-&gt;num_hndl);</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ev-&gt;num_hndl; i++) {</div><div class='add'>+	for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='ctx'> 		struct hci_comp_pkts_info *info = &amp;ev-&gt;handles[i];</div><div class='ctx'> 		struct hci_conn *conn;</div><div class='ctx'> 		__u16  handle, count;</div><div class='add'>+		unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 		handle = __le16_to_cpu(info-&gt;handle);</div><div class='ctx'> 		count  = __le16_to_cpu(info-&gt;count);</div><div class='hunk'>@@ -3529,7 +4470,20 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		if (!conn)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		conn-&gt;sent -= count;</div><div class='add'>+		/* Check if there is really enough packets outstanding before</div><div class='add'>+		 * attempting to decrease the sent counter otherwise it could</div><div class='add'>+		 * underflow..</div><div class='add'>+		 */</div><div class='add'>+		if (conn-&gt;sent &gt;= count) {</div><div class='add'>+			conn-&gt;sent -= count;</div><div class='add'>+		} else {</div><div class='add'>+			bt_dev_warn(hdev, "hcon %p sent %u &lt; count %u",</div><div class='add'>+				    conn, conn-&gt;sent, count);</div><div class='add'>+			conn-&gt;sent = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; count; ++i)</div><div class='add'>+			hci_conn_tx_dequeue(conn);</div><div class='ctx'> </div><div class='ctx'> 		switch (conn-&gt;type) {</div><div class='ctx'> 		case ACL_LINK:</div><div class='hunk'>@@ -3551,81 +4505,19 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SCO_LINK:</div><div class='add'>+		case ESCO_LINK:</div><div class='ctx'> 			hdev-&gt;sco_cnt += count;</div><div class='ctx'> 			if (hdev-&gt;sco_cnt &gt; hdev-&gt;sco_pkts)</div><div class='ctx'> 				hdev-&gt;sco_cnt = hdev-&gt;sco_pkts;</div><div class='del'>-			break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			bt_dev_err(hdev, "unknown type %d conn %p",</div><div class='del'>-				   conn-&gt;type, conn);</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;tx_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hci_conn *__hci_conn_lookup_handle(struct hci_dev *hdev,</div><div class='del'>-						 __u16 handle)</div><div class='del'>-{</div><div class='del'>-	struct hci_chan *chan;</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		return hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		chan = hci_chan_lookup_handle(hdev, handle);</div><div class='del'>-		if (chan)</div><div class='del'>-			return chan-&gt;conn;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bt_dev_err(hdev, "unknown dev_type %d", hdev-&gt;dev_type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_ev_num_comp_blocks *ev = (void *) skb-&gt;data;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;flow_ctl_mode != HCI_FLOW_CTL_MODE_BLOCK_BASED) {</div><div class='del'>-		bt_dev_err(hdev, "wrong event for mode %d", hdev-&gt;flow_ctl_mode);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*ev) || skb-&gt;len &lt; sizeof(*ev) +</div><div class='del'>-	    ev-&gt;num_hndl * sizeof(struct hci_comp_blocks_info)) {</div><div class='del'>-		BT_DBG("%s bad parameters", hdev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s num_blocks %d num_hndl %d", hdev-&gt;name, ev-&gt;num_blocks,</div><div class='del'>-	       ev-&gt;num_hndl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ev-&gt;num_hndl; i++) {</div><div class='del'>-		struct hci_comp_blocks_info *info = &amp;ev-&gt;handles[i];</div><div class='del'>-		struct hci_conn *conn = NULL;</div><div class='del'>-		__u16  handle, block_count;</div><div class='del'>-</div><div class='del'>-		handle = __le16_to_cpu(info-&gt;handle);</div><div class='del'>-		block_count = __le16_to_cpu(info-&gt;blocks);</div><div class='del'>-</div><div class='del'>-		conn = __hci_conn_lookup_handle(hdev, handle);</div><div class='del'>-		if (!conn)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		conn-&gt;sent -= block_count;</div><div class='del'>-</div><div class='del'>-		switch (conn-&gt;type) {</div><div class='del'>-		case ACL_LINK:</div><div class='del'>-		case AMP_LINK:</div><div class='del'>-			hdev-&gt;block_cnt += block_count;</div><div class='del'>-			if (hdev-&gt;block_cnt &gt; hdev-&gt;num_blocks)</div><div class='del'>-				hdev-&gt;block_cnt = hdev-&gt;num_blocks;</div><div class='add'>+		case CIS_LINK:</div><div class='add'>+		case BIS_LINK:</div><div class='add'>+		case PA_LINK:</div><div class='add'>+			hdev-&gt;iso_cnt += count;</div><div class='add'>+			if (hdev-&gt;iso_cnt &gt; hdev-&gt;iso_pkts)</div><div class='add'>+				hdev-&gt;iso_cnt = hdev-&gt;iso_pkts;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='hunk'>@@ -3636,14 +4528,17 @@ static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_mode_change_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_mode_change *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_mode_change *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3666,12 +4561,13 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_pin_code_request_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_pin_code_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_pin_code_req *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3736,14 +4632,15 @@ static void conn_set_key(struct hci_conn *conn, u8 key_type, u8 pin_len)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_link_key_request_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_link_key_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_link_key_req *ev = data;</div><div class='ctx'> 	struct hci_cp_link_key_reply cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct link_key *key;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3752,13 +4649,11 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	key = hci_find_link_key(hdev, &amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (!key) {</div><div class='del'>-		BT_DBG("%s link key not found for %pMR", hdev-&gt;name,</div><div class='del'>-		       &amp;ev-&gt;bdaddr);</div><div class='add'>+		bt_dev_dbg(hdev, "link key not found for %pMR", &amp;ev-&gt;bdaddr);</div><div class='ctx'> 		goto not_found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s found key type %u for %pMR", hdev-&gt;name, key-&gt;type,</div><div class='del'>-	       &amp;ev-&gt;bdaddr);</div><div class='add'>+	bt_dev_dbg(hdev, "found key type %u for %pMR", key-&gt;type, &amp;ev-&gt;bdaddr);</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (conn) {</div><div class='hunk'>@@ -3767,15 +4662,14 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		if ((key-&gt;type == HCI_LK_UNAUTH_COMBINATION_P192 ||</div><div class='ctx'> 		     key-&gt;type == HCI_LK_UNAUTH_COMBINATION_P256) &amp;&amp;</div><div class='ctx'> 		    conn-&gt;auth_type != 0xff &amp;&amp; (conn-&gt;auth_type &amp; 0x01)) {</div><div class='del'>-			BT_DBG("%s ignoring unauthenticated key", hdev-&gt;name);</div><div class='add'>+			bt_dev_dbg(hdev, "ignoring unauthenticated key");</div><div class='ctx'> 			goto not_found;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (key-&gt;type == HCI_LK_COMBINATION &amp;&amp; key-&gt;pin_len &lt; 16 &amp;&amp;</div><div class='ctx'> 		    (conn-&gt;pending_sec_level == BT_SECURITY_HIGH ||</div><div class='ctx'> 		     conn-&gt;pending_sec_level == BT_SECURITY_FIPS)) {</div><div class='del'>-			BT_DBG("%s ignoring key unauthenticated for high security",</div><div class='del'>-			       hdev-&gt;name);</div><div class='add'>+			bt_dev_dbg(hdev, "ignoring key unauthenticated for high security");</div><div class='ctx'> 			goto not_found;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3796,15 +4690,16 @@ not_found:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_link_key_notify_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_link_key_notify *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_link_key_notify *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct link_key *key;</div><div class='ctx'> 	bool persistent;</div><div class='ctx'> 	u8 pin_len = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3812,6 +4707,15 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='add'>+	/* Ignore NULL link key against CVE-2020-26555 */</div><div class='add'>+	if (!crypto_memneq(ev-&gt;link_key, ZERO_KEY, HCI_LINK_KEY_SIZE)) {</div><div class='add'>+		bt_dev_dbg(hdev, "Ignore NULL link key (ZERO KEY) for %pMR",</div><div class='add'>+			   &amp;ev-&gt;bdaddr);</div><div class='add'>+		hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);</div><div class='add'>+		hci_conn_drop(conn);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hci_conn_hold(conn);</div><div class='ctx'> 	conn-&gt;disc_timeout = HCI_DISCONN_TIMEOUT;</div><div class='ctx'> 	hci_conn_drop(conn);</div><div class='hunk'>@@ -3856,12 +4760,13 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_clock_offset_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_clock_offset *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_clock_offset *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3879,12 +4784,13 @@ static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_pkt_type_change_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_pkt_type_change *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_pkt_type_change *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3895,12 +4801,13 @@ static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_pscan_rep_mode *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_pscan_rep_mode *ev = data;</div><div class='ctx'> 	struct inquiry_entry *ie;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3913,15 +4820,16 @@ static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,</div><div class='ctx'> 					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct hci_ev_inquiry_result_rssi *ev = edata;</div><div class='ctx'> 	struct inquiry_data data;</div><div class='del'>-	int num_rsp = *((__u8 *) skb-&gt;data);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s num_rsp %d", hdev-&gt;name, num_rsp);</div><div class='add'>+	bt_dev_dbg(hdev, "num_rsp %d", ev-&gt;num);</div><div class='ctx'> </div><div class='del'>-	if (!num_rsp)</div><div class='add'>+	if (!ev-&gt;num)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))</div><div class='hunk'>@@ -3929,13 +4837,22 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if ((skb-&gt;len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {</div><div class='del'>-		struct inquiry_info_with_rssi_and_pscan_mode *info;</div><div class='del'>-		info = (void *) (skb-&gt;data + 1);</div><div class='add'>+	if (skb-&gt;len == array_size(ev-&gt;num,</div><div class='add'>+				   sizeof(struct inquiry_info_rssi_pscan))) {</div><div class='add'>+		struct inquiry_info_rssi_pscan *info;</div><div class='ctx'> </div><div class='del'>-		for (; num_rsp; num_rsp--, info++) {</div><div class='add'>+		for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='ctx'> 			u32 flags;</div><div class='ctx'> </div><div class='add'>+			info = hci_ev_skb_pull(hdev, skb,</div><div class='add'>+					       HCI_EV_INQUIRY_RESULT_WITH_RSSI,</div><div class='add'>+					       sizeof(*info));</div><div class='add'>+			if (!info) {</div><div class='add'>+				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",</div><div class='add'>+					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			bacpy(&amp;data.bdaddr, &amp;info-&gt;bdaddr);</div><div class='ctx'> 			data.pscan_rep_mode	= info-&gt;pscan_rep_mode;</div><div class='ctx'> 			data.pscan_period_mode	= info-&gt;pscan_period_mode;</div><div class='hunk'>@@ -3949,14 +4866,24 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 			mgmt_device_found(hdev, &amp;info-&gt;bdaddr, ACL_LINK, 0x00,</div><div class='ctx'> 					  info-&gt;dev_class, info-&gt;rssi,</div><div class='del'>-					  flags, NULL, 0, NULL, 0);</div><div class='add'>+					  flags, NULL, 0, NULL, 0, 0);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		struct inquiry_info_with_rssi *info = (void *) (skb-&gt;data + 1);</div><div class='add'>+	} else if (skb-&gt;len == array_size(ev-&gt;num,</div><div class='add'>+					  sizeof(struct inquiry_info_rssi))) {</div><div class='add'>+		struct inquiry_info_rssi *info;</div><div class='ctx'> </div><div class='del'>-		for (; num_rsp; num_rsp--, info++) {</div><div class='add'>+		for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='ctx'> 			u32 flags;</div><div class='ctx'> </div><div class='add'>+			info = hci_ev_skb_pull(hdev, skb,</div><div class='add'>+					       HCI_EV_INQUIRY_RESULT_WITH_RSSI,</div><div class='add'>+					       sizeof(*info));</div><div class='add'>+			if (!info) {</div><div class='add'>+				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",</div><div class='add'>+					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			bacpy(&amp;data.bdaddr, &amp;info-&gt;bdaddr);</div><div class='ctx'> 			data.pscan_rep_mode	= info-&gt;pscan_rep_mode;</div><div class='ctx'> 			data.pscan_period_mode	= info-&gt;pscan_period_mode;</div><div class='hunk'>@@ -3970,20 +4897,23 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 			mgmt_device_found(hdev, &amp;info-&gt;bdaddr, ACL_LINK, 0x00,</div><div class='ctx'> 					  info-&gt;dev_class, info-&gt;rssi,</div><div class='del'>-					  flags, NULL, 0, NULL, 0);</div><div class='add'>+					  flags, NULL, 0, NULL, 0, 0);</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",</div><div class='add'>+			   HCI_EV_INQUIRY_RESULT_WITH_RSSI);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_remote_ext_features_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_remote_ext_features_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_remote_ext_features *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_remote_ext_features *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4028,8 +4958,9 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev,</div><div class='ctx'> 		bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='ctx'> 		cp.pscan_rep_mode = 0x02;</div><div class='ctx'> 		hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &amp;cp);</div><div class='del'>-	} else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags))</div><div class='del'>-		mgmt_device_connected(hdev, conn, 0, NULL, 0);</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_device_connected(hdev, conn, NULL, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_outgoing_auth_needed(hdev, conn)) {</div><div class='ctx'> 		conn-&gt;state = BT_CONNECTED;</div><div class='hunk'>@@ -4041,13 +4972,27 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_sync_conn_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_sync_conn_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_sync_conn_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_sync_conn_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='add'>+	u8 status = ev-&gt;status;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	switch (ev-&gt;link_type) {</div><div class='add'>+	case SCO_LINK:</div><div class='add'>+	case ESCO_LINK:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* As per Core 5.3 Vol 4 Part E 7.7.35 (p.2219), Link_Type</div><div class='add'>+		 * for HCI_Synchronous_Connection_Complete is limited to</div><div class='add'>+		 * either SCO or eSCO</div><div class='add'>+		 */</div><div class='add'>+		bt_dev_err(hdev, "Ignoring connect complete event for invalid link type");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4070,9 +5015,25 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ev-&gt;status) {</div><div class='add'>+	/* The HCI_Synchronous_Connection_Complete event is only sent once per connection.</div><div class='add'>+	 * Processing it more than once per connection can corrupt kernel memory.</div><div class='add'>+	 *</div><div class='add'>+	 * As the connection handle is set here for the first time, it indicates</div><div class='add'>+	 * whether the connection is already set up.</div><div class='add'>+	 */</div><div class='add'>+	if (!HCI_CONN_HANDLE_UNSET(conn-&gt;handle)) {</div><div class='add'>+		bt_dev_err(hdev, "Ignoring HCI_Sync_Conn_Complete event for existing connection");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (status) {</div><div class='ctx'> 	case 0x00:</div><div class='del'>-		conn-&gt;handle = __le16_to_cpu(ev-&gt;handle);</div><div class='add'>+		status = hci_conn_set_handle(conn, __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+		if (status) {</div><div class='add'>+			conn-&gt;state = BT_CLOSED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		conn-&gt;state  = BT_CONNECTED;</div><div class='ctx'> 		conn-&gt;type   = ev-&gt;link_type;</div><div class='ctx'> </div><div class='hunk'>@@ -4085,23 +5046,39 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> 	case 0x11:	/* Unsupported Feature or Parameter Value */</div><div class='ctx'> 	case 0x1c:	/* SCO interval rejected */</div><div class='ctx'> 	case 0x1a:	/* Unsupported Remote Feature */</div><div class='add'>+	case 0x1e:	/* Invalid LMP Parameters */</div><div class='ctx'> 	case 0x1f:	/* Unspecified error */</div><div class='ctx'> 	case 0x20:	/* Unsupported LMP Parameter value */</div><div class='ctx'> 		if (conn-&gt;out) {</div><div class='ctx'> 			conn-&gt;pkt_type = (hdev-&gt;esco_type &amp; SCO_ESCO_MASK) |</div><div class='ctx'> 					(hdev-&gt;esco_type &amp; EDR_ESCO_MASK);</div><div class='del'>-			if (hci_setup_sync(conn, conn-&gt;link-&gt;handle))</div><div class='add'>+			if (hci_setup_sync(conn, conn-&gt;parent-&gt;handle))</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		conn-&gt;state = BT_CLOSED;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_connect_cfm(conn, ev-&gt;status);</div><div class='del'>-	if (ev-&gt;status)</div><div class='add'>+	bt_dev_dbg(hdev, "SCO connected with air mode: %02x", ev-&gt;air_mode);</div><div class='add'>+	/* Notify only in case of SCO over HCI transport data path which</div><div class='add'>+	 * is zero and non-zero value shall be non-HCI transport data path</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;codec.data_path == 0 &amp;&amp; hdev-&gt;notify) {</div><div class='add'>+		switch (ev-&gt;air_mode) {</div><div class='add'>+		case 0x02:</div><div class='add'>+			hdev-&gt;notify(hdev, HCI_NOTIFY_ENABLE_SCO_CVSD);</div><div class='add'>+			break;</div><div class='add'>+		case 0x03:</div><div class='add'>+			hdev-&gt;notify(hdev, HCI_NOTIFY_ENABLE_SCO_TRANSP);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_connect_cfm(conn, status);</div><div class='add'>+	if (status)</div><div class='ctx'> 		hci_conn_del(conn);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -4125,17 +5102,21 @@ static inline size_t eir_get_length(u8 *eir, size_t eir_len)</div><div class='ctx'> 	return eir_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, void *edata,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct hci_ev_ext_inquiry_result *ev = edata;</div><div class='ctx'> 	struct inquiry_data data;</div><div class='del'>-	struct extended_inquiry_info *info = (void *) (skb-&gt;data + 1);</div><div class='del'>-	int num_rsp = *((__u8 *) skb-&gt;data);</div><div class='ctx'> 	size_t eir_len;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s num_rsp %d", hdev-&gt;name, num_rsp);</div><div class='add'>+	if (!hci_ev_skb_pull(hdev, skb, HCI_EV_EXTENDED_INQUIRY_RESULT,</div><div class='add'>+			     flex_array_size(ev, info, ev-&gt;num)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "num %d", ev-&gt;num);</div><div class='ctx'> </div><div class='del'>-	if (!num_rsp)</div><div class='add'>+	if (!ev-&gt;num)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))</div><div class='hunk'>@@ -4143,7 +5124,8 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	for (; num_rsp; num_rsp--, info++) {</div><div class='add'>+	for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='add'>+		struct extended_inquiry_info *info = &amp;ev-&gt;info[i];</div><div class='ctx'> 		u32 flags;</div><div class='ctx'> 		bool name_known;</div><div class='ctx'> </div><div class='hunk'>@@ -4169,20 +5151,20 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 		mgmt_device_found(hdev, &amp;info-&gt;bdaddr, ACL_LINK, 0x00,</div><div class='ctx'> 				  info-&gt;dev_class, info-&gt;rssi,</div><div class='del'>-				  flags, info-&gt;data, eir_len, NULL, 0);</div><div class='add'>+				  flags, info-&gt;data, eir_len, NULL, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_key_refresh_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_key_refresh_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_key_refresh_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_key_refresh_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x handle 0x%4.4x", hdev-&gt;name, ev-&gt;status,</div><div class='del'>-	       __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x handle 0x%4.4x", ev-&gt;status,</div><div class='add'>+		   __le16_to_cpu(ev-&gt;handle));</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4267,8 +5249,8 @@ static u8 bredr_oob_data_present(struct hci_conn *conn)</div><div class='ctx'> 		 * available, then do not declare that OOB data is</div><div class='ctx'> 		 * present.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!memcmp(data-&gt;rand256, ZERO_KEY, 16) ||</div><div class='del'>-		    !memcmp(data-&gt;hash256, ZERO_KEY, 16))</div><div class='add'>+		if (!crypto_memneq(data-&gt;rand256, ZERO_KEY, 16) ||</div><div class='add'>+		    !crypto_memneq(data-&gt;hash256, ZERO_KEY, 16))</div><div class='ctx'> 			return 0x00;</div><div class='ctx'> </div><div class='ctx'> 		return 0x02;</div><div class='hunk'>@@ -4278,26 +5260,30 @@ static u8 bredr_oob_data_present(struct hci_conn *conn)</div><div class='ctx'> 	 * not supported by the hardware, then check that if</div><div class='ctx'> 	 * P-192 data values are present.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!memcmp(data-&gt;rand192, ZERO_KEY, 16) ||</div><div class='del'>-	    !memcmp(data-&gt;hash192, ZERO_KEY, 16))</div><div class='add'>+	if (!crypto_memneq(data-&gt;rand192, ZERO_KEY, 16) ||</div><div class='add'>+	    !crypto_memneq(data-&gt;hash192, ZERO_KEY, 16))</div><div class='ctx'> 		return 0x00;</div><div class='ctx'> </div><div class='ctx'> 	return 0x01;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_io_capa_request_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_io_capa_request *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_io_capa_request *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;ev-&gt;bdaddr);</div><div class='del'>-	if (!conn)</div><div class='add'>+	if (!conn || !hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='add'>+	/* Assume remote supports SSP since it has triggered this event */</div><div class='add'>+	set_bit(HCI_CONN_SSP_ENABLED, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	hci_conn_hold(conn);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='hunk'>@@ -4354,12 +5340,13 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_io_capa_reply_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_io_capa_reply *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_io_capa_reply *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4374,14 +5361,14 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_user_confirm_request_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_user_confirm_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_user_confirm_req *ev = data;</div><div class='ctx'> 	int loc_mitm, rem_mitm, confirm_hint = 0;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4402,26 +5389,33 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (conn-&gt;pending_sec_level &gt; BT_SECURITY_MEDIUM &amp;&amp;</div><div class='ctx'> 	    conn-&gt;remote_cap == HCI_IO_NO_INPUT_OUTPUT) {</div><div class='del'>-		BT_DBG("Rejecting request: remote device can't provide MITM");</div><div class='add'>+		bt_dev_dbg(hdev, "Rejecting request: remote device can't provide MITM");</div><div class='ctx'> 		hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_NEG_REPLY,</div><div class='ctx'> 			     sizeof(ev-&gt;bdaddr), &amp;ev-&gt;bdaddr);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If no side requires MITM protection; auto-accept */</div><div class='add'>+	/* If no side requires MITM protection; use JUST_CFM method */</div><div class='ctx'> 	if ((!loc_mitm || conn-&gt;remote_cap == HCI_IO_NO_INPUT_OUTPUT) &amp;&amp;</div><div class='ctx'> 	    (!rem_mitm || conn-&gt;io_capability == HCI_IO_NO_INPUT_OUTPUT)) {</div><div class='ctx'> </div><div class='del'>-		/* If we're not the initiators request authorization to</div><div class='del'>-		 * proceed from user space (mgmt_user_confirm with</div><div class='del'>-		 * confirm_hint set to 1). The exception is if neither</div><div class='del'>-		 * side had MITM or if the local IO capability is</div><div class='del'>-		 * NoInputNoOutput, in which case we do auto-accept</div><div class='add'>+		/* If we're not the initiator of request authorization and the</div><div class='add'>+		 * local IO capability is not NoInputNoOutput, use JUST_WORKS</div><div class='add'>+		 * method (mgmt_user_confirm with confirm_hint set to 1).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!test_bit(HCI_CONN_AUTH_PEND, &amp;conn-&gt;flags) &amp;&amp;</div><div class='del'>-		    conn-&gt;io_capability != HCI_IO_NO_INPUT_OUTPUT &amp;&amp;</div><div class='del'>-		    (loc_mitm || rem_mitm)) {</div><div class='del'>-			BT_DBG("Confirming auto-accept as acceptor");</div><div class='add'>+		    conn-&gt;io_capability != HCI_IO_NO_INPUT_OUTPUT) {</div><div class='add'>+			bt_dev_dbg(hdev, "Confirming auto-accept as acceptor");</div><div class='add'>+			confirm_hint = 1;</div><div class='add'>+			goto confirm;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If there already exists link key in local host, leave the</div><div class='add'>+		 * decision to user space since the remote device could be</div><div class='add'>+		 * legitimate or malicious.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_find_link_key(hdev, &amp;ev-&gt;bdaddr)) {</div><div class='add'>+			bt_dev_dbg(hdev, "Local host already has link key");</div><div class='ctx'> 			confirm_hint = 1;</div><div class='ctx'> 			goto confirm;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4449,24 +5443,24 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_user_passkey_request_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_user_passkey_request_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_user_passkey_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_user_passkey_req *ev = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='ctx'> 		mgmt_user_passkey_request(hdev, &amp;ev-&gt;bdaddr, ACL_LINK, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_user_passkey_notify_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_user_passkey_notify_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_user_passkey_notify *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_user_passkey_notify *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (!conn)</div><div class='hunk'>@@ -4481,12 +5475,13 @@ static void hci_user_passkey_notify_evt(struct hci_dev *hdev,</div><div class='ctx'> 					 conn-&gt;passkey_entered);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_keypress_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_keypress_notify *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_keypress_notify *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;ev-&gt;bdaddr);</div><div class='ctx'> 	if (!conn)</div><div class='hunk'>@@ -4519,18 +5514,18 @@ static void hci_keypress_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 					 conn-&gt;passkey_entered);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_simple_pair_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_simple_pair_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_simple_pair_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_simple_pair_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;ev-&gt;bdaddr);</div><div class='del'>-	if (!conn)</div><div class='add'>+	if (!conn || !hci_conn_ssp_enabled(conn))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the authentication requirement to unknown */</div><div class='hunk'>@@ -4550,14 +5545,14 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_remote_host_features_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_remote_host_features_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_remote_host_features *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_remote_host_features *ev = data;</div><div class='ctx'> 	struct inquiry_entry *ie;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4572,13 +5567,13 @@ static void hci_remote_host_features_evt(struct hci_dev *hdev,</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_remote_oob_data_request_evt(struct hci_dev *hdev, void *edata,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_remote_oob_data_request *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_remote_oob_data_request *ev = edata;</div><div class='ctx'> 	struct oob_data *data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4626,156 +5621,70 @@ unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_BT_HS)</div><div class='del'>-static void hci_chan_selected_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_ev_channel_selected *ev = (void *)skb-&gt;data;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s handle 0x%2.2x", hdev-&gt;name, ev-&gt;phy_handle);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*ev));</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, ev-&gt;phy_handle);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	amp_read_loc_assoc_final_data(hdev, hcon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_phy_link_complete_evt(struct hci_dev *hdev,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_ev_phy_link_complete *ev = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_conn *hcon, *bredr_hcon;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s handle 0x%2.2x status 0x%2.2x", hdev-&gt;name, ev-&gt;phy_handle,</div><div class='del'>-	       ev-&gt;status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, ev-&gt;phy_handle);</div><div class='del'>-	if (!hcon) {</div><div class='del'>-		hci_dev_unlock(hdev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;status) {</div><div class='del'>-		hci_conn_del(hcon);</div><div class='del'>-		hci_dev_unlock(hdev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bredr_hcon = hcon-&gt;amp_mgr-&gt;l2cap_conn-&gt;hcon;</div><div class='del'>-</div><div class='del'>-	hcon-&gt;state = BT_CONNECTED;</div><div class='del'>-	bacpy(&amp;hcon-&gt;dst, &amp;bredr_hcon-&gt;dst);</div><div class='del'>-</div><div class='del'>-	hci_conn_hold(hcon);</div><div class='del'>-	hcon-&gt;disc_timeout = HCI_DISCONN_TIMEOUT;</div><div class='del'>-	hci_conn_drop(hcon);</div><div class='del'>-</div><div class='del'>-	hci_debugfs_create_conn(hcon);</div><div class='del'>-	hci_conn_add_sysfs(hcon);</div><div class='del'>-</div><div class='del'>-	amp_physical_cfm(bredr_hcon, hcon);</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_loglink_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_ev_logical_link_complete *ev = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-	struct hci_chan *hchan;</div><div class='del'>-	struct amp_mgr *mgr;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s log_handle 0x%4.4x phy_handle 0x%2.2x status 0x%2.2x",</div><div class='del'>-	       hdev-&gt;name, le16_to_cpu(ev-&gt;handle), ev-&gt;phy_handle,</div><div class='del'>-	       ev-&gt;status);</div><div class='del'>-</div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, ev-&gt;phy_handle);</div><div class='del'>-	if (!hcon)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Create AMP hchan */</div><div class='del'>-	hchan = hci_chan_create(hcon);</div><div class='del'>-	if (!hchan)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hchan-&gt;handle = le16_to_cpu(ev-&gt;handle);</div><div class='del'>-</div><div class='del'>-	BT_DBG("hcon %p mgr %p hchan %p", hcon, hcon-&gt;amp_mgr, hchan);</div><div class='del'>-</div><div class='del'>-	mgr = hcon-&gt;amp_mgr;</div><div class='del'>-	if (mgr &amp;&amp; mgr-&gt;bredr_chan) {</div><div class='del'>-		struct l2cap_chan *bredr_chan = mgr-&gt;bredr_chan;</div><div class='del'>-</div><div class='del'>-		l2cap_chan_lock(bredr_chan);</div><div class='del'>-</div><div class='del'>-		bredr_chan-&gt;conn-&gt;mtu = hdev-&gt;block_mtu;</div><div class='del'>-		l2cap_logical_cfm(bredr_chan, hchan, 0);</div><div class='del'>-		hci_conn_hold(hcon);</div><div class='del'>-</div><div class='del'>-		l2cap_chan_unlock(bredr_chan);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_disconn_loglink_complete_evt(struct hci_dev *hdev,</div><div class='del'>-					     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_ev_disconn_logical_link_complete *ev = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_chan *hchan;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s log handle 0x%4.4x status 0x%2.2x", hdev-&gt;name,</div><div class='del'>-	       le16_to_cpu(ev-&gt;handle), ev-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	hchan = hci_chan_lookup_handle(hdev, le16_to_cpu(ev-&gt;handle));</div><div class='del'>-	if (!hchan)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	amp_destroy_logical_link(hchan, ev-&gt;reason);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_disconn_phylink_complete_evt(struct hci_dev *hdev,</div><div class='del'>-					     struct sk_buff *skb)</div><div class='add'>+static void le_conn_update_addr(struct hci_conn *conn, bdaddr_t *bdaddr,</div><div class='add'>+				u8 bdaddr_type, bdaddr_t *local_rpa)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_disconn_phy_link_complete *ev = (void *) skb-&gt;data;</div><div class='del'>-	struct hci_conn *hcon;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	if (conn-&gt;out) {</div><div class='add'>+		conn-&gt;dst_type = bdaddr_type;</div><div class='add'>+		conn-&gt;resp_addr_type = bdaddr_type;</div><div class='add'>+		bacpy(&amp;conn-&gt;resp_addr, bdaddr);</div><div class='ctx'> </div><div class='del'>-	if (ev-&gt;status)</div><div class='del'>-		return;</div><div class='add'>+		/* Check if the controller has set a Local RPA then it must be</div><div class='add'>+		 * used instead or hdev-&gt;rpa.</div><div class='add'>+		 */</div><div class='add'>+		if (local_rpa &amp;&amp; bacmp(local_rpa, BDADDR_ANY)) {</div><div class='add'>+			conn-&gt;init_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+			bacpy(&amp;conn-&gt;init_addr, local_rpa);</div><div class='add'>+		} else if (hci_dev_test_flag(conn-&gt;hdev, HCI_PRIVACY)) {</div><div class='add'>+			conn-&gt;init_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+			bacpy(&amp;conn-&gt;init_addr, &amp;conn-&gt;hdev-&gt;rpa);</div><div class='add'>+		} else {</div><div class='add'>+			hci_copy_identity_address(conn-&gt;hdev, &amp;conn-&gt;init_addr,</div><div class='add'>+						  &amp;conn-&gt;init_addr_type);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		conn-&gt;resp_addr_type = conn-&gt;hdev-&gt;adv_addr_type;</div><div class='add'>+		/* Check if the controller has set a Local RPA then it must be</div><div class='add'>+		 * used instead or hdev-&gt;rpa.</div><div class='add'>+		 */</div><div class='add'>+		if (local_rpa &amp;&amp; bacmp(local_rpa, BDADDR_ANY)) {</div><div class='add'>+			conn-&gt;resp_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+			bacpy(&amp;conn-&gt;resp_addr, local_rpa);</div><div class='add'>+		} else if (conn-&gt;hdev-&gt;adv_addr_type == ADDR_LE_DEV_RANDOM) {</div><div class='add'>+			/* In case of ext adv, resp_addr will be updated in</div><div class='add'>+			 * Adv Terminated event.</div><div class='add'>+			 */</div><div class='add'>+			if (!ext_adv_capable(conn-&gt;hdev))</div><div class='add'>+				bacpy(&amp;conn-&gt;resp_addr,</div><div class='add'>+				      &amp;conn-&gt;hdev-&gt;random_addr);</div><div class='add'>+		} else {</div><div class='add'>+			bacpy(&amp;conn-&gt;resp_addr, &amp;conn-&gt;hdev-&gt;bdaddr);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+		conn-&gt;init_addr_type = bdaddr_type;</div><div class='add'>+		bacpy(&amp;conn-&gt;init_addr, bdaddr);</div><div class='ctx'> </div><div class='del'>-	hcon = hci_conn_hash_lookup_handle(hdev, ev-&gt;phy_handle);</div><div class='del'>-	if (hcon) {</div><div class='del'>-		hcon-&gt;state = BT_CLOSED;</div><div class='del'>-		hci_conn_del(hcon);</div><div class='add'>+		/* For incoming connections, set the default minimum</div><div class='add'>+		 * and maximum connection interval. They will be used</div><div class='add'>+		 * to check if the parameters are in range and if not</div><div class='add'>+		 * trigger the connection update procedure.</div><div class='add'>+		 */</div><div class='add'>+		conn-&gt;le_conn_min_interval = conn-&gt;hdev-&gt;le_conn_min_interval;</div><div class='add'>+		conn-&gt;le_conn_max_interval = conn-&gt;hdev-&gt;le_conn_max_interval;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='del'>-			bdaddr_t *bdaddr, u8 bdaddr_type, u8 role, u16 handle,</div><div class='del'>-			u16 interval, u16 latency, u16 supervision_timeout)</div><div class='add'>+				 bdaddr_t *bdaddr, u8 bdaddr_type,</div><div class='add'>+				 bdaddr_t *local_rpa, u8 role, u16 handle,</div><div class='add'>+				 u16 interval, u16 latency,</div><div class='add'>+				 u16 supervision_timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn_params *params;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct smp_irk *irk;</div><div class='ctx'> 	u8 addr_type;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4784,19 +5693,34 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	 */</div><div class='ctx'> 	hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='ctx'> </div><div class='del'>-	conn = hci_lookup_le_connect(hdev);</div><div class='del'>-	if (!conn) {</div><div class='del'>-		conn = hci_conn_add(hdev, LE_LINK, bdaddr, role);</div><div class='del'>-		if (!conn) {</div><div class='del'>-			bt_dev_err(hdev, "no memory for new connection");</div><div class='add'>+	/* Check for existing connection:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. If it doesn't exist then use the role to create a new object.</div><div class='add'>+	 * 2. If it does exist confirm that it is connecting/BT_CONNECT in case</div><div class='add'>+	 *    of initiator/master role since there could be a collision where</div><div class='add'>+	 *    either side is attempting to connect or something like a fuzzing</div><div class='add'>+	 *    testing is trying to play tricks to destroy the hcon object before</div><div class='add'>+	 *    it even attempts to connect (e.g. hcon-&gt;state == BT_OPEN).</div><div class='add'>+	 */</div><div class='add'>+	conn = hci_conn_hash_lookup_role(hdev, LE_LINK, role, bdaddr);</div><div class='add'>+	if (!conn ||</div><div class='add'>+	    (conn-&gt;role == HCI_ROLE_MASTER &amp;&amp; conn-&gt;state != BT_CONNECT)) {</div><div class='add'>+		/* In case of error status and there is no connection pending</div><div class='add'>+		 * just unlock as there is nothing to cleanup.</div><div class='add'>+		 */</div><div class='add'>+		if (status)</div><div class='ctx'> 			goto unlock;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		conn-&gt;dst_type = bdaddr_type;</div><div class='add'>+		conn = hci_conn_add_unset(hdev, LE_LINK, bdaddr, bdaddr_type,</div><div class='add'>+					  role);</div><div class='add'>+		if (IS_ERR(conn)) {</div><div class='add'>+			bt_dev_err(hdev, "connection err: %ld", PTR_ERR(conn));</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* If we didn't have a hci_conn object previously</div><div class='del'>-		 * but we're in master role this must be something</div><div class='del'>-		 * initiated using a white list. Since white list based</div><div class='add'>+		 * but we're in central role this must be something</div><div class='add'>+		 * initiated using an accept list. Since accept list based</div><div class='ctx'> 		 * connections are not "first class citizens" we don't</div><div class='ctx'> 		 * have full tracking of them. Therefore, we go ahead</div><div class='ctx'> 		 * with a "best effort" approach of determining the</div><div class='hunk'>@@ -4818,33 +5742,19 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		cancel_delayed_work(&amp;conn-&gt;le_conn_timeout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!conn-&gt;out) {</div><div class='del'>-		/* Set the responder (our side) address type based on</div><div class='del'>-		 * the advertising address type.</div><div class='del'>-		 */</div><div class='del'>-		conn-&gt;resp_addr_type = hdev-&gt;adv_addr_type;</div><div class='del'>-		if (hdev-&gt;adv_addr_type == ADDR_LE_DEV_RANDOM) {</div><div class='del'>-			/* In case of ext adv, resp_addr will be updated in</div><div class='del'>-			 * Adv Terminated event.</div><div class='del'>-			 */</div><div class='del'>-			if (!ext_adv_capable(hdev))</div><div class='del'>-				bacpy(&amp;conn-&gt;resp_addr, &amp;hdev-&gt;random_addr);</div><div class='del'>-		} else {</div><div class='del'>-			bacpy(&amp;conn-&gt;resp_addr, &amp;hdev-&gt;bdaddr);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		conn-&gt;init_addr_type = bdaddr_type;</div><div class='del'>-		bacpy(&amp;conn-&gt;init_addr, bdaddr);</div><div class='del'>-</div><div class='del'>-		/* For incoming connections, set the default minimum</div><div class='del'>-		 * and maximum connection interval. They will be used</div><div class='del'>-		 * to check if the parameters are in range and if not</div><div class='del'>-		 * trigger the connection update procedure.</div><div class='del'>-		 */</div><div class='del'>-		conn-&gt;le_conn_min_interval = hdev-&gt;le_conn_min_interval;</div><div class='del'>-		conn-&gt;le_conn_max_interval = hdev-&gt;le_conn_max_interval;</div><div class='add'>+	/* The HCI_LE_Connection_Complete event is only sent once per connection.</div><div class='add'>+	 * Processing it more than once per connection can corrupt kernel memory.</div><div class='add'>+	 *</div><div class='add'>+	 * As the connection handle is set here for the first time, it indicates</div><div class='add'>+	 * whether the connection is already set up.</div><div class='add'>+	 */</div><div class='add'>+	if (!HCI_CONN_HANDLE_UNSET(conn-&gt;handle)) {</div><div class='add'>+		bt_dev_err(hdev, "Ignoring HCI_Connection_Complete for existing connection");</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	le_conn_update_addr(conn, bdaddr, bdaddr_type, local_rpa);</div><div class='add'>+</div><div class='ctx'> 	/* Lookup the identity address from the stored connection</div><div class='ctx'> 	 * address and address type.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -4860,8 +5770,18 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		conn-&gt;dst_type = irk-&gt;addr_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		hci_le_conn_failed(conn, status);</div><div class='add'>+	conn-&gt;dst_type = ev_bdaddr_type(hdev, conn-&gt;dst_type, NULL);</div><div class='add'>+</div><div class='add'>+	/* All connection failure handling is taken care of by the</div><div class='add'>+	 * hci_conn_failed function which is triggered by the HCI</div><div class='add'>+	 * request completion callbacks used for connecting.</div><div class='add'>+	 */</div><div class='add'>+	if (status || hci_conn_set_handle(conn, handle))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Drop the connection if it has been aborted */</div><div class='add'>+	if (test_bit(HCI_CONN_CANCEL, &amp;conn-&gt;flags)) {</div><div class='add'>+		hci_conn_drop(conn);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4871,18 +5791,23 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		addr_type = BDADDR_LE_RANDOM;</div><div class='ctx'> </div><div class='ctx'> 	/* Drop the connection if the device is blocked */</div><div class='del'>-	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;blacklist, &amp;conn-&gt;dst, addr_type)) {</div><div class='add'>+	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;reject_list, &amp;conn-&gt;dst, addr_type)) {</div><div class='ctx'> 		hci_conn_drop(conn);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags))</div><div class='del'>-		mgmt_device_connected(hdev, conn, 0, NULL, 0);</div><div class='add'>+	mgmt_device_connected(hdev, conn, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;sec_level = BT_SECURITY_LOW;</div><div class='del'>-	conn-&gt;handle = handle;</div><div class='ctx'> 	conn-&gt;state = BT_CONFIG;</div><div class='ctx'> </div><div class='add'>+	/* Store current advertising instance as connection advertising instance</div><div class='add'>+	 * when software rotation is in use so it can be re-enabled when</div><div class='add'>+	 * disconnected.</div><div class='add'>+	 */</div><div class='add'>+	if (!ext_adv_capable(hdev))</div><div class='add'>+		conn-&gt;adv_instance = hdev-&gt;cur_adv_instance;</div><div class='add'>+</div><div class='ctx'> 	conn-&gt;le_conn_interval = interval;</div><div class='ctx'> 	conn-&gt;le_conn_latency = latency;</div><div class='ctx'> 	conn-&gt;le_supv_timeout = supervision_timeout;</div><div class='hunk'>@@ -4890,38 +5815,16 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	hci_debugfs_create_conn(conn);</div><div class='ctx'> 	hci_conn_add_sysfs(conn);</div><div class='ctx'> </div><div class='del'>-	if (!status) {</div><div class='del'>-		/* The remote features procedure is defined for master</div><div class='del'>-		 * role only. So only in case of an initiated connection</div><div class='del'>-		 * request the remote features.</div><div class='del'>-		 *</div><div class='del'>-		 * If the local controller supports slave-initiated features</div><div class='del'>-		 * exchange, then requesting the remote features in slave</div><div class='del'>-		 * role is possible. Otherwise just transition into the</div><div class='del'>-		 * connected state without requesting the remote features.</div><div class='del'>-		 */</div><div class='del'>-		if (conn-&gt;out ||</div><div class='del'>-		    (hdev-&gt;le_features[0] &amp; HCI_LE_SLAVE_FEATURES)) {</div><div class='del'>-			struct hci_cp_le_read_remote_features cp;</div><div class='del'>-</div><div class='del'>-			cp.handle = __cpu_to_le16(conn-&gt;handle);</div><div class='del'>-</div><div class='del'>-			hci_send_cmd(hdev, HCI_OP_LE_READ_REMOTE_FEATURES,</div><div class='del'>-				     sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-			hci_conn_hold(conn);</div><div class='del'>-		} else {</div><div class='del'>-			conn-&gt;state = BT_CONNECTED;</div><div class='del'>-			hci_connect_cfm(conn, status);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='add'>+	err = hci_le_read_remote_features(conn);</div><div class='add'>+	if (err) {</div><div class='add'>+		conn-&gt;state = BT_CONNECTED;</div><div class='ctx'> 		hci_connect_cfm(conn, status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	params = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns, &amp;conn-&gt;dst,</div><div class='ctx'> 					   conn-&gt;dst_type);</div><div class='ctx'> 	if (params) {</div><div class='del'>-		list_del_init(&amp;params-&gt;action);</div><div class='add'>+		hci_pend_le_list_del_init(params);</div><div class='ctx'> 		if (params-&gt;conn) {</div><div class='ctx'> 			hci_conn_drop(params-&gt;conn);</div><div class='ctx'> 			hci_conn_put(params-&gt;conn);</div><div class='hunk'>@@ -4930,72 +5833,203 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='add'>+	hci_update_passive_scan(hdev);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_conn_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_conn_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_conn_complete *ev = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	le_conn_complete_evt(hdev, ev-&gt;status, &amp;ev-&gt;bdaddr, ev-&gt;bdaddr_type,</div><div class='del'>-			     ev-&gt;role, le16_to_cpu(ev-&gt;handle),</div><div class='add'>+			     NULL, ev-&gt;role, le16_to_cpu(ev-&gt;handle),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;interval),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;latency),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;supervision_timeout));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_enh_conn_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_le_enh_conn_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_enh_conn_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_enh_conn_complete *ev = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	le_conn_complete_evt(hdev, ev-&gt;status, &amp;ev-&gt;bdaddr, ev-&gt;bdaddr_type,</div><div class='del'>-			     ev-&gt;role, le16_to_cpu(ev-&gt;handle),</div><div class='add'>+			     &amp;ev-&gt;local_rpa, ev-&gt;role, le16_to_cpu(ev-&gt;handle),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;interval),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;latency),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;supervision_timeout));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_ext_adv_term_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_pa_sync_lost_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_evt_le_ext_adv_set_term *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_pa_sync_lost *ev = data;</div><div class='add'>+	u16 handle = le16_to_cpu(ev-&gt;handle);</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "sync handle 0x%4.4x", handle);</div><div class='ctx'> </div><div class='del'>-	if (ev-&gt;status)</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Delete the pa sync connection */</div><div class='add'>+	conn = hci_conn_hash_lookup_pa_sync_handle(hdev, handle);</div><div class='add'>+	if (conn) {</div><div class='add'>+		clear_bit(HCI_CONN_BIG_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+		clear_bit(HCI_CONN_PA_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+		hci_disconn_cfm(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+		hci_conn_del(conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_ext_adv_term_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_ext_adv_set_term *ev = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct adv_info *adv, *n;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* The Bluetooth Core 5.3 specification clearly states that this event</div><div class='add'>+	 * shall not be sent when the Host disables the advertising set. So in</div><div class='add'>+	 * case of HCI_ERROR_CANCELLED_BY_HOST, just ignore the event.</div><div class='add'>+	 *</div><div class='add'>+	 * When the Host disables an advertising set, all cleanup is done via</div><div class='add'>+	 * its command callback and not needed to be duplicated here.</div><div class='add'>+	 */</div><div class='add'>+	if (ev-&gt;status == HCI_ERROR_CANCELLED_BY_HOST) {</div><div class='add'>+		bt_dev_warn_ratelimited(hdev, "Unexpected advertising set terminated event");</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, ev-&gt;handle);</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;status) {</div><div class='add'>+		if (!adv)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		/* Remove advertising as it has been terminated */</div><div class='add'>+		hci_remove_adv_instance(hdev, ev-&gt;handle);</div><div class='add'>+		mgmt_advertising_removed(NULL, hdev, ev-&gt;handle);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+			if (adv-&gt;enabled)</div><div class='add'>+				goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We are no longer advertising, clear HCI_LE_ADV */</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adv)</div><div class='add'>+		adv-&gt;enabled = false;</div><div class='ctx'> </div><div class='ctx'> 	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev-&gt;conn_handle));</div><div class='ctx'> 	if (conn) {</div><div class='del'>-		struct adv_info *adv_instance;</div><div class='add'>+		/* Store handle in the connection so the correct advertising</div><div class='add'>+		 * instance can be re-enabled when disconnected.</div><div class='add'>+		 */</div><div class='add'>+		conn-&gt;adv_instance = ev-&gt;handle;</div><div class='ctx'> </div><div class='del'>-		if (hdev-&gt;adv_addr_type != ADDR_LE_DEV_RANDOM)</div><div class='del'>-			return;</div><div class='add'>+		if (hdev-&gt;adv_addr_type != ADDR_LE_DEV_RANDOM ||</div><div class='add'>+		    bacmp(&amp;conn-&gt;resp_addr, BDADDR_ANY))</div><div class='add'>+			goto unlock;</div><div class='ctx'> </div><div class='del'>-		if (!hdev-&gt;cur_adv_instance) {</div><div class='add'>+		if (!ev-&gt;handle) {</div><div class='ctx'> 			bacpy(&amp;conn-&gt;resp_addr, &amp;hdev-&gt;random_addr);</div><div class='del'>-			return;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev, hdev-&gt;cur_adv_instance);</div><div class='del'>-		if (adv_instance)</div><div class='del'>-			bacpy(&amp;conn-&gt;resp_addr, &amp;adv_instance-&gt;random_addr);</div><div class='add'>+		if (adv)</div><div class='add'>+			bacpy(&amp;conn-&gt;resp_addr, &amp;adv-&gt;random_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_pa_term_sync(struct hci_dev *hdev, __le16 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_pa_term_sync cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+</div><div class='add'>+	return hci_send_cmd(hdev, HCI_OP_LE_PA_TERM_SYNC, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_past_received_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_past_received *ev = data;</div><div class='add'>+	int mask = hdev-&gt;link_mode;</div><div class='add'>+	__u8 flags = 0;</div><div class='add'>+	struct hci_conn *pa_sync, *conn;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_PA_SYNC);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_create_pa_sync(hdev);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "Unable to find connection for dst %pMR sid 0x%2.2x",</div><div class='add'>+			   &amp;ev-&gt;bdaddr, ev-&gt;sid);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;sync_handle = le16_to_cpu(ev-&gt;sync_handle);</div><div class='add'>+	conn-&gt;sid = HCI_SID_INVALID;</div><div class='add'>+</div><div class='add'>+	mask |= hci_proto_connect_ind(hdev, &amp;ev-&gt;bdaddr, PA_LINK,</div><div class='add'>+				      &amp;flags);</div><div class='add'>+	if (!(mask &amp; HCI_LM_ACCEPT)) {</div><div class='add'>+		hci_le_pa_term_sync(hdev, ev-&gt;sync_handle);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; HCI_PROTO_DEFER))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Add connection to indicate PA sync event */</div><div class='add'>+	pa_sync = hci_conn_add_unset(hdev, PA_LINK, BDADDR_ANY, 0,</div><div class='add'>+				     HCI_ROLE_SLAVE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(pa_sync))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	pa_sync-&gt;sync_handle = le16_to_cpu(ev-&gt;sync_handle);</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;status) {</div><div class='add'>+		set_bit(HCI_CONN_PA_SYNC_FAILED, &amp;pa_sync-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Notify iso layer */</div><div class='add'>+		hci_connect_cfm(pa_sync, ev-&gt;status);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_le_conn_update_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_conn_update_complete *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_conn_update_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (ev-&gt;status)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -5015,8 +6049,8 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> /* This function requires the caller holds hdev-&gt;lock */</div><div class='ctx'> static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> 					      bdaddr_t *addr,</div><div class='del'>-					      u8 addr_type, u8 adv_type,</div><div class='del'>-					      bdaddr_t *direct_rpa)</div><div class='add'>+					      u8 addr_type, bool addr_resolved,</div><div class='add'>+					      u8 adv_type, u8 phy, u8 sec_phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct hci_conn_params *params;</div><div class='hunk'>@@ -5025,14 +6059,17 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> 	if (adv_type != LE_ADV_IND &amp;&amp; adv_type != LE_ADV_DIRECT_IND)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* Ignore if the device is blocked */</div><div class='del'>-	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;blacklist, addr, addr_type))</div><div class='add'>+	/* Ignore if the device is blocked or hdev is suspended */</div><div class='add'>+	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;reject_list, addr, addr_type) ||</div><div class='add'>+	    hdev-&gt;suspended)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Most controller will fail if we try to create new connections</div><div class='del'>-	 * while we have an existing one in slave role.</div><div class='add'>+	 * while we have an existing one in peripheral role.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hdev-&gt;conn_hash.le_num_slave &gt; 0)</div><div class='add'>+	if (hdev-&gt;conn_hash.le_num_peripheral &gt; 0 &amp;&amp;</div><div class='add'>+	    (hci_test_quirk(hdev, HCI_QUIRK_BROKEN_LE_STATES) ||</div><div class='add'>+	     !(hdev-&gt;le_states[3] &amp; 0x10)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* If we're not connectable only connect devices that we have in</div><div class='hunk'>@@ -5048,7 +6085,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> 		case HCI_AUTO_CONN_DIRECT:</div><div class='ctx'> 			/* Only devices advertising with ADV_DIRECT_IND are</div><div class='ctx'> 			 * triggering a connection attempt. This is allowing</div><div class='del'>-			 * incoming connections from slave devices.</div><div class='add'>+			 * incoming connections from peripheral devices.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (adv_type != LE_ADV_DIRECT_IND)</div><div class='ctx'> 				return NULL;</div><div class='hunk'>@@ -5056,8 +6093,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> 		case HCI_AUTO_CONN_ALWAYS:</div><div class='ctx'> 			/* Devices advertising with ADV_IND or ADV_DIRECT_IND</div><div class='ctx'> 			 * are triggering a connection attempt. This means</div><div class='del'>-			 * that incoming connectioms from slave device are</div><div class='del'>-			 * accepted and also outgoing connections to slave</div><div class='add'>+			 * that incoming connections from peripheral device are</div><div class='add'>+			 * accepted and also outgoing connections to peripheral</div><div class='ctx'> 			 * devices are established when found.</div><div class='ctx'> 			 */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5066,9 +6103,9 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,</div><div class='del'>-			      HCI_LE_AUTOCONN_TIMEOUT, HCI_ROLE_MASTER,</div><div class='del'>-			      direct_rpa);</div><div class='add'>+	conn = hci_connect_le(hdev, addr, addr_type, addr_resolved,</div><div class='add'>+			      BT_SECURITY_LOW, hdev-&gt;def_le_autoconnect_timeout,</div><div class='add'>+			      HCI_ROLE_MASTER, phy, sec_phy);</div><div class='ctx'> 	if (!IS_ERR(conn)) {</div><div class='ctx'> 		/* If HCI_AUTO_CONN_EXPLICIT is set, conn is already owned</div><div class='ctx'> 		 * by higher layer that tried to connect, if no then</div><div class='hunk'>@@ -5103,14 +6140,16 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 			       u8 bdaddr_type, bdaddr_t *direct_addr,</div><div class='del'>-			       u8 direct_addr_type, s8 rssi, u8 *data, u8 len)</div><div class='add'>+			       u8 direct_addr_type, u8 phy, u8 sec_phy, s8 rssi,</div><div class='add'>+			       u8 *data, u8 len, bool ext_adv, bool ctl_time,</div><div class='add'>+			       u64 instant)</div><div class='ctx'> {</div><div class='ctx'> 	struct discovery_state *d = &amp;hdev-&gt;discovery;</div><div class='ctx'> 	struct smp_irk *irk;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='del'>-	bool match;</div><div class='add'>+	bool match, bdaddr_resolved;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	u8 *ptr, real_len;</div><div class='add'>+	u8 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case LE_ADV_IND:</div><div class='hunk'>@@ -5125,6 +6164,12 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (len &gt; max_adv_len(hdev)) {</div><div class='add'>+		bt_dev_err_ratelimited(hdev,</div><div class='add'>+				       "adv larger than maximum supported");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Find the end of the data in case the report contains padded zero</div><div class='ctx'> 	 * bytes at the end causing an invalid length value.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -5136,32 +6181,35 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	real_len = ptr - data;</div><div class='del'>-</div><div class='del'>-	/* Adjust for actual length */</div><div class='del'>-	if (len != real_len) {</div><div class='del'>-		bt_dev_err_ratelimited(hdev, "advertising data len corrected");</div><div class='del'>-		len = real_len;</div><div class='del'>-	}</div><div class='add'>+	/* Adjust for actual length. This handles the case when remote</div><div class='add'>+	 * device is advertising with incorrect data length.</div><div class='add'>+	 */</div><div class='add'>+	len = ptr - data;</div><div class='ctx'> </div><div class='ctx'> 	/* If the direct address is present, then this report is from</div><div class='ctx'> 	 * a LE Direct Advertising Report event. In that case it is</div><div class='ctx'> 	 * important to see if the address is matching the local</div><div class='ctx'> 	 * controller address.</div><div class='add'>+	 *</div><div class='add'>+	 * If local privacy is not enable the controller shall not be</div><div class='add'>+	 * generating such event since according to its documentation it is only</div><div class='add'>+	 * valid for filter_policy 0x02 and 0x03, but the fact that it did</div><div class='add'>+	 * generate LE Direct Advertising Report means it is probably broken and</div><div class='add'>+	 * won't generate any other event which can potentially break</div><div class='add'>+	 * auto-connect logic so in case local privacy is not enable this</div><div class='add'>+	 * ignores the direct_addr so it works as a regular report.</div><div class='ctx'> 	 */</div><div class='del'>-	if (direct_addr) {</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_MESH) &amp;&amp; direct_addr &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_PRIVACY)) {</div><div class='add'>+		direct_addr_type = ev_bdaddr_type(hdev, direct_addr_type,</div><div class='add'>+						  &amp;bdaddr_resolved);</div><div class='add'>+</div><div class='ctx'> 		/* Only resolvable random addresses are valid for these</div><div class='ctx'> 		 * kind of reports and others can be ignored.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!hci_bdaddr_is_rpa(direct_addr, direct_addr_type))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		/* If the controller is not using resolvable random</div><div class='del'>-		 * addresses, then this report can be ignored.</div><div class='del'>-		 */</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_PRIVACY))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='ctx'> 		/* If the local IRK of the controller does not match</div><div class='ctx'> 		 * with the resolvable random address provided, then</div><div class='ctx'> 		 * this report can be ignored.</div><div class='hunk'>@@ -5177,14 +6225,17 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 		bdaddr_type = irk-&gt;addr_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bdaddr_type = ev_bdaddr_type(hdev, bdaddr_type, &amp;bdaddr_resolved);</div><div class='add'>+</div><div class='ctx'> 	/* Check if we have been requested to connect to this device.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * direct_addr is set only for directed advertising reports (it is NULL</div><div class='ctx'> 	 * for advertising reports) and is already verified to be RPA above.</div><div class='ctx'> 	 */</div><div class='del'>-	conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type,</div><div class='del'>-								direct_addr);</div><div class='del'>-	if (conn &amp;&amp; type == LE_ADV_IND) {</div><div class='add'>+	conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, bdaddr_resolved,</div><div class='add'>+				     type, phy, sec_phy);</div><div class='add'>+	if (!ext_adv &amp;&amp; conn &amp;&amp; type == LE_ADV_IND &amp;&amp;</div><div class='add'>+	    len &lt;= max_adv_len(hdev)) {</div><div class='ctx'> 		/* Store report for later inclusion by</div><div class='ctx'> 		 * mgmt_device_connected</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -5192,47 +6243,48 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 		conn-&gt;le_adv_data_len = len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (type == LE_ADV_NONCONN_IND || type == LE_ADV_SCAN_IND)</div><div class='add'>+		flags = MGMT_DEV_FOUND_NOT_CONNECTABLE;</div><div class='add'>+	else</div><div class='add'>+		flags = 0;</div><div class='add'>+</div><div class='add'>+	/* All scan results should be sent up for Mesh systems */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MESH)) {</div><div class='add'>+		mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,</div><div class='add'>+				  rssi, flags, data, len, NULL, 0, instant);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Passive scanning shouldn't trigger any device found events,</div><div class='ctx'> 	 * except for devices marked as CONN_REPORT for which we do send</div><div class='del'>-	 * device found events.</div><div class='add'>+	 * device found events, or advertisement monitoring requested.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hdev-&gt;le_scan_type == LE_SCAN_PASSIVE) {</div><div class='ctx'> 		if (type == LE_ADV_DIRECT_IND)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (!hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_reports,</div><div class='del'>-					       bdaddr, bdaddr_type))</div><div class='add'>+					       bdaddr, bdaddr_type) &amp;&amp;</div><div class='add'>+		    idr_is_empty(&amp;hdev-&gt;adv_monitors_idr))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		if (type == LE_ADV_NONCONN_IND || type == LE_ADV_SCAN_IND)</div><div class='del'>-			flags = MGMT_DEV_FOUND_NOT_CONNECTABLE;</div><div class='del'>-		else</div><div class='del'>-			flags = 0;</div><div class='ctx'> 		mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,</div><div class='del'>-				  rssi, flags, data, len, NULL, 0);</div><div class='add'>+				  rssi, flags, data, len, NULL, 0, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* When receiving non-connectable or scannable undirected</div><div class='del'>-	 * advertising reports, this means that the remote device is</div><div class='del'>-	 * not connectable and then clearly indicate this in the</div><div class='del'>-	 * device found event.</div><div class='del'>-	 *</div><div class='del'>-	 * When receiving a scan response, then there is no way to</div><div class='add'>+	/* When receiving a scan response, then there is no way to</div><div class='ctx'> 	 * know if the remote device is connectable or not. However</div><div class='ctx'> 	 * since scan responses are merged with a previously seen</div><div class='ctx'> 	 * advertising report, the flags field from that report</div><div class='ctx'> 	 * will be used.</div><div class='ctx'> 	 *</div><div class='del'>-	 * In the really unlikely case that a controller get confused</div><div class='del'>-	 * and just sends a scan response event, then it is marked as</div><div class='del'>-	 * not connectable as well.</div><div class='add'>+	 * In the unlikely case that a controller just sends a scan</div><div class='add'>+	 * response event that doesn't match the pending report, then</div><div class='add'>+	 * it is marked as a standalone SCAN_RSP.</div><div class='ctx'> 	 */</div><div class='del'>-	if (type == LE_ADV_NONCONN_IND || type == LE_ADV_SCAN_IND ||</div><div class='del'>-	    type == LE_ADV_SCAN_RSP)</div><div class='del'>-		flags = MGMT_DEV_FOUND_NOT_CONNECTABLE;</div><div class='del'>-	else</div><div class='del'>-		flags = 0;</div><div class='add'>+	if (type == LE_ADV_SCAN_RSP)</div><div class='add'>+		flags = MGMT_DEV_FOUND_SCAN_RSP;</div><div class='ctx'> </div><div class='ctx'> 	/* If there's nothing pending either store the data from this</div><div class='ctx'> 	 * event or send an immediate device found event if the data</div><div class='hunk'>@@ -5242,14 +6294,15 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 		/* If the report will trigger a SCAN_REQ store it for</div><div class='ctx'> 		 * later merging.</div><div class='ctx'> 		 */</div><div class='del'>-		if (type == LE_ADV_IND || type == LE_ADV_SCAN_IND) {</div><div class='add'>+		if (!ext_adv &amp;&amp; (type == LE_ADV_IND ||</div><div class='add'>+				 type == LE_ADV_SCAN_IND)) {</div><div class='ctx'> 			store_pending_adv_report(hdev, bdaddr, bdaddr_type,</div><div class='ctx'> 						 rssi, flags, data, len);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,</div><div class='del'>-				  rssi, flags, data, len, NULL, 0);</div><div class='add'>+				  rssi, flags, data, len, NULL, 0, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5268,12 +6321,13 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 					  d-&gt;last_adv_addr_type, NULL,</div><div class='ctx'> 					  d-&gt;last_adv_rssi, d-&gt;last_adv_flags,</div><div class='ctx'> 					  d-&gt;last_adv_data,</div><div class='del'>-					  d-&gt;last_adv_data_len, NULL, 0);</div><div class='add'>+					  d-&gt;last_adv_data_len, NULL, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* If the new report will trigger a SCAN_REQ store it for</div><div class='ctx'> 		 * later merging.</div><div class='ctx'> 		 */</div><div class='del'>-		if (type == LE_ADV_IND || type == LE_ADV_SCAN_IND) {</div><div class='add'>+		if (!ext_adv &amp;&amp; (type == LE_ADV_IND ||</div><div class='add'>+				 type == LE_ADV_SCAN_IND)) {</div><div class='ctx'> 			store_pending_adv_report(hdev, bdaddr, bdaddr_type,</div><div class='ctx'> 						 rssi, flags, data, len);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -5284,7 +6338,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 		 */</div><div class='ctx'> 		clear_pending_adv_report(hdev);</div><div class='ctx'> 		mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,</div><div class='del'>-				  rssi, flags, data, len, NULL, 0);</div><div class='add'>+				  rssi, flags, data, len, NULL, 0, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5294,38 +6348,57 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	mgmt_device_found(hdev, &amp;d-&gt;last_adv_addr, LE_LINK,</div><div class='ctx'> 			  d-&gt;last_adv_addr_type, NULL, rssi, d-&gt;last_adv_flags,</div><div class='del'>-			  d-&gt;last_adv_data, d-&gt;last_adv_data_len, data, len);</div><div class='add'>+			  d-&gt;last_adv_data, d-&gt;last_adv_data_len, data, len, 0);</div><div class='ctx'> 	clear_pending_adv_report(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_adv_report_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 num_reports = skb-&gt;data[0];</div><div class='del'>-	void *ptr = &amp;skb-&gt;data[1];</div><div class='add'>+	struct hci_ev_le_advertising_report *ev = data;</div><div class='add'>+	u64 instant = jiffies;</div><div class='add'>+</div><div class='add'>+	if (!ev-&gt;num)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	while (num_reports--) {</div><div class='del'>-		struct hci_ev_le_advertising_info *ev = ptr;</div><div class='add'>+	while (ev-&gt;num--) {</div><div class='add'>+		struct hci_ev_le_advertising_info *info;</div><div class='ctx'> 		s8 rssi;</div><div class='ctx'> </div><div class='del'>-		if (ev-&gt;length &lt;= HCI_MAX_AD_LENGTH) {</div><div class='del'>-			rssi = ev-&gt;data[ev-&gt;length];</div><div class='del'>-			process_adv_report(hdev, ev-&gt;evt_type, &amp;ev-&gt;bdaddr,</div><div class='del'>-					   ev-&gt;bdaddr_type, NULL, 0, rssi,</div><div class='del'>-					   ev-&gt;data, ev-&gt;length);</div><div class='add'>+		info = hci_le_ev_skb_pull(hdev, skb,</div><div class='add'>+					  HCI_EV_LE_ADVERTISING_REPORT,</div><div class='add'>+					  sizeof(*info));</div><div class='add'>+		if (!info)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!hci_le_ev_skb_pull(hdev, skb, HCI_EV_LE_ADVERTISING_REPORT,</div><div class='add'>+					info-&gt;length + 1))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;length &lt;= max_adv_len(hdev)) {</div><div class='add'>+			rssi = info-&gt;data[info-&gt;length];</div><div class='add'>+			process_adv_report(hdev, info-&gt;type, &amp;info-&gt;bdaddr,</div><div class='add'>+					   info-&gt;bdaddr_type, NULL, 0,</div><div class='add'>+					   HCI_ADV_PHY_1M, 0, rssi,</div><div class='add'>+					   info-&gt;data, info-&gt;length, false,</div><div class='add'>+					   false, instant);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bt_dev_err(hdev, "Dropping invalid advertising data");</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		ptr += sizeof(*ev) + ev-&gt;length + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ext_evt_type_to_legacy(u16 evt_type)</div><div class='add'>+static u8 ext_evt_type_to_legacy(struct hci_dev *hdev, u16 evt_type)</div><div class='ctx'> {</div><div class='add'>+	u16 pdu_type = evt_type &amp; ~LE_EXT_ADV_DATA_STATUS_MASK;</div><div class='add'>+</div><div class='add'>+	if (!pdu_type)</div><div class='add'>+		return LE_ADV_NONCONN_IND;</div><div class='add'>+</div><div class='ctx'> 	if (evt_type &amp; LE_EXT_ADV_LEGACY_PDU) {</div><div class='ctx'> 		switch (evt_type) {</div><div class='ctx'> 		case LE_LEGACY_ADV_IND:</div><div class='hunk'>@@ -5341,10 +6414,7 @@ static u8 ext_evt_type_to_legacy(u16 evt_type)</div><div class='ctx'> 			return LE_ADV_SCAN_RSP;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BT_ERR_RATELIMITED("Unknown advertising packet type: 0x%02x",</div><div class='del'>-				   evt_type);</div><div class='del'>-</div><div class='del'>-		return LE_ADV_INVALID;</div><div class='add'>+		goto invalid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (evt_type &amp; LE_EXT_ADV_CONN_IND) {</div><div class='hunk'>@@ -5360,49 +6430,178 @@ static u8 ext_evt_type_to_legacy(u16 evt_type)</div><div class='ctx'> 	if (evt_type &amp; LE_EXT_ADV_SCAN_IND)</div><div class='ctx'> 		return LE_ADV_SCAN_IND;</div><div class='ctx'> </div><div class='del'>-	if (evt_type == LE_EXT_ADV_NON_CONN_IND ||</div><div class='del'>-	    evt_type &amp; LE_EXT_ADV_DIRECT_IND)</div><div class='add'>+	if (evt_type &amp; LE_EXT_ADV_DIRECT_IND)</div><div class='ctx'> 		return LE_ADV_NONCONN_IND;</div><div class='ctx'> </div><div class='del'>-	BT_ERR_RATELIMITED("Unknown advertising packet type: 0x%02x",</div><div class='del'>-				   evt_type);</div><div class='add'>+invalid:</div><div class='add'>+	bt_dev_err_ratelimited(hdev, "Unknown advertising packet type: 0x%02x",</div><div class='add'>+			       evt_type);</div><div class='ctx'> </div><div class='ctx'> 	return LE_ADV_INVALID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 num_reports = skb-&gt;data[0];</div><div class='del'>-	void *ptr = &amp;skb-&gt;data[1];</div><div class='add'>+	struct hci_ev_le_ext_adv_report *ev = data;</div><div class='add'>+	u64 instant = jiffies;</div><div class='add'>+</div><div class='add'>+	if (!ev-&gt;num)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	while (num_reports--) {</div><div class='del'>-		struct hci_ev_le_ext_adv_report *ev = ptr;</div><div class='add'>+	while (ev-&gt;num--) {</div><div class='add'>+		struct hci_ev_le_ext_adv_info *info;</div><div class='ctx'> 		u8 legacy_evt_type;</div><div class='ctx'> 		u16 evt_type;</div><div class='ctx'> </div><div class='del'>-		evt_type = __le16_to_cpu(ev-&gt;evt_type);</div><div class='del'>-		legacy_evt_type = ext_evt_type_to_legacy(evt_type);</div><div class='add'>+		info = hci_le_ev_skb_pull(hdev, skb, HCI_EV_LE_EXT_ADV_REPORT,</div><div class='add'>+					  sizeof(*info));</div><div class='add'>+		if (!info)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!hci_le_ev_skb_pull(hdev, skb, HCI_EV_LE_EXT_ADV_REPORT,</div><div class='add'>+					info-&gt;length))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		evt_type = __le16_to_cpu(info-&gt;type) &amp; LE_EXT_ADV_EVT_TYPE_MASK;</div><div class='add'>+		legacy_evt_type = ext_evt_type_to_legacy(hdev, evt_type);</div><div class='add'>+</div><div class='add'>+		if (hci_test_quirk(hdev,</div><div class='add'>+				   HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY)) {</div><div class='add'>+			info-&gt;primary_phy &amp;= 0x1f;</div><div class='add'>+			info-&gt;secondary_phy &amp;= 0x1f;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if PA Sync is pending and if the hci_conn SID has not</div><div class='add'>+		 * been set update it.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_PA_SYNC)) {</div><div class='add'>+			struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+			conn = hci_conn_hash_lookup_create_pa_sync(hdev);</div><div class='add'>+			if (conn &amp;&amp; conn-&gt;sid == HCI_SID_INVALID)</div><div class='add'>+				conn-&gt;sid = info-&gt;sid;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (legacy_evt_type != LE_ADV_INVALID) {</div><div class='del'>-			process_adv_report(hdev, legacy_evt_type, &amp;ev-&gt;bdaddr,</div><div class='del'>-					   ev-&gt;bdaddr_type, NULL, 0, ev-&gt;rssi,</div><div class='del'>-					   ev-&gt;data, ev-&gt;length);</div><div class='add'>+			process_adv_report(hdev, legacy_evt_type, &amp;info-&gt;bdaddr,</div><div class='add'>+					   info-&gt;bdaddr_type, NULL, 0,</div><div class='add'>+					   info-&gt;primary_phy,</div><div class='add'>+					   info-&gt;secondary_phy,</div><div class='add'>+					   info-&gt;rssi, info-&gt;data, info-&gt;length,</div><div class='add'>+					   !(evt_type &amp; LE_EXT_ADV_LEGACY_PDU),</div><div class='add'>+					   false, instant);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_pa_sync_established_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_pa_sync_established *ev = data;</div><div class='add'>+	int mask = hdev-&gt;link_mode;</div><div class='add'>+	__u8 flags = 0;</div><div class='add'>+	struct hci_conn *pa_sync, *conn;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_PA_SYNC);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_create_pa_sync(hdev);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "Unable to find connection for dst %pMR sid 0x%2.2x",</div><div class='add'>+			   &amp;ev-&gt;bdaddr, ev-&gt;sid);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(HCI_CONN_CREATE_PA_SYNC, &amp;conn-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		ptr += sizeof(*ev) + ev-&gt;length + 1;</div><div class='add'>+	conn-&gt;sync_handle = le16_to_cpu(ev-&gt;handle);</div><div class='add'>+	conn-&gt;sid = HCI_SID_INVALID;</div><div class='add'>+</div><div class='add'>+	mask |= hci_proto_connect_ind(hdev, &amp;ev-&gt;bdaddr, PA_LINK,</div><div class='add'>+				      &amp;flags);</div><div class='add'>+	if (!(mask &amp; HCI_LM_ACCEPT)) {</div><div class='add'>+		hci_le_pa_term_sync(hdev, ev-&gt;handle);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; HCI_PROTO_DEFER))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Add connection to indicate PA sync event */</div><div class='add'>+	pa_sync = hci_conn_add_unset(hdev, PA_LINK, BDADDR_ANY, 0,</div><div class='add'>+				     HCI_ROLE_SLAVE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(pa_sync))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	pa_sync-&gt;sync_handle = le16_to_cpu(ev-&gt;handle);</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;status) {</div><div class='add'>+		set_bit(HCI_CONN_PA_SYNC_FAILED, &amp;pa_sync-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Notify iso layer */</div><div class='add'>+		hci_connect_cfm(pa_sync, ev-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_le_per_adv_report_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_per_adv_report *ev = data;</div><div class='add'>+	int mask = hdev-&gt;link_mode;</div><div class='add'>+	__u8 flags = 0;</div><div class='add'>+	struct hci_conn *pa_sync;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sync_handle 0x%4.4x", le16_to_cpu(ev-&gt;sync_handle));</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	mask |= hci_proto_connect_ind(hdev, BDADDR_ANY, PA_LINK, &amp;flags);</div><div class='add'>+	if (!(mask &amp; HCI_LM_ACCEPT))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; HCI_PROTO_DEFER))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	pa_sync = hci_conn_hash_lookup_pa_sync_handle</div><div class='add'>+			(hdev,</div><div class='add'>+			le16_to_cpu(ev-&gt;sync_handle));</div><div class='add'>+</div><div class='add'>+	if (!pa_sync)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;data_status == LE_PA_DATA_COMPLETE &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(HCI_CONN_PA_SYNC, &amp;pa_sync-&gt;flags)) {</div><div class='add'>+		/* Notify iso layer */</div><div class='add'>+		hci_connect_cfm(pa_sync, 0);</div><div class='add'>+</div><div class='add'>+		/* Notify MGMT layer */</div><div class='add'>+		mgmt_device_connected(hdev, pa_sync, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_remote_feat_complete *ev = (void *)skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_remote_feat_complete *ev = data;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -5414,7 +6613,7 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> 		if (conn-&gt;state == BT_CONFIG) {</div><div class='ctx'> 			__u8 status;</div><div class='ctx'> </div><div class='del'>-			/* If the local controller supports slave-initiated</div><div class='add'>+			/* If the local controller supports peripheral-initiated</div><div class='ctx'> 			 * features exchange, but the remote controller does</div><div class='ctx'> 			 * not, then it is possible that the error code 0x1a</div><div class='ctx'> 			 * for unsupported remote feature gets returned.</div><div class='hunk'>@@ -5423,30 +6622,30 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev,</div><div class='ctx'> 			 * transition into connected state and mark it as</div><div class='ctx'> 			 * successful.</div><div class='ctx'> 			 */</div><div class='del'>-			if ((hdev-&gt;le_features[0] &amp; HCI_LE_SLAVE_FEATURES) &amp;&amp;</div><div class='del'>-			    !conn-&gt;out &amp;&amp; ev-&gt;status == 0x1a)</div><div class='add'>+			if (!conn-&gt;out &amp;&amp; ev-&gt;status == HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE &amp;&amp;</div><div class='add'>+			    (hdev-&gt;le_features[0] &amp; HCI_LE_PERIPHERAL_FEATURES))</div><div class='ctx'> 				status = 0x00;</div><div class='ctx'> 			else</div><div class='ctx'> 				status = ev-&gt;status;</div><div class='ctx'> </div><div class='ctx'> 			conn-&gt;state = BT_CONNECTED;</div><div class='ctx'> 			hci_connect_cfm(conn, status);</div><div class='del'>-			hci_conn_drop(conn);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_ltk_request_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_ltk_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_ltk_req *ev = data;</div><div class='ctx'> 	struct hci_cp_le_ltk_reply cp;</div><div class='ctx'> 	struct hci_cp_le_ltk_neg_reply neg;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	struct smp_ltk *ltk;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s handle 0x%4.4x", hdev-&gt;name, __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%4.4x", __le16_to_cpu(ev-&gt;handle));</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -5514,14 +6713,16 @@ static void send_conn_param_neg_reply(struct hci_dev *hdev, u16 handle,</div><div class='ctx'> 		     &amp;cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_remote_conn_param_req *ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_remote_conn_param_req *ev = data;</div><div class='ctx'> 	struct hci_cp_le_conn_param_req_reply cp;</div><div class='ctx'> 	struct hci_conn *hcon;</div><div class='ctx'> 	u16 handle, min, max, latency, timeout;</div><div class='ctx'> </div><div class='add'>+	bt_dev_dbg(hdev, "handle 0x%4.4x", __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+</div><div class='ctx'> 	handle = le16_to_cpu(ev-&gt;handle);</div><div class='ctx'> 	min = le16_to_cpu(ev-&gt;interval_min);</div><div class='ctx'> 	max = le16_to_cpu(ev-&gt;interval_max);</div><div class='hunk'>@@ -5533,6 +6734,10 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,</div><div class='ctx'> 		return send_conn_param_neg_reply(hdev, handle,</div><div class='ctx'> 						 HCI_ERROR_UNKNOWN_CONN_ID);</div><div class='ctx'> </div><div class='add'>+	if (max &gt; hcon-&gt;le_conn_max_interval)</div><div class='add'>+		return send_conn_param_neg_reply(hdev, handle,</div><div class='add'>+						 HCI_ERROR_INVALID_LL_PARAMS);</div><div class='add'>+</div><div class='ctx'> 	if (hci_check_conn_params(min, max, latency, timeout))</div><div class='ctx'> 		return send_conn_param_neg_reply(hdev, handle,</div><div class='ctx'> 						 HCI_ERROR_INVALID_LL_PARAMS);</div><div class='hunk'>@@ -5551,7 +6756,7 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,</div><div class='ctx'> 			params-&gt;conn_latency = latency;</div><div class='ctx'> 			params-&gt;supervision_timeout = timeout;</div><div class='ctx'> 			store_hint = 0x01;</div><div class='del'>-		} else{</div><div class='add'>+		} else {</div><div class='ctx'> 			store_hint = 0x00;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5572,335 +6777,1002 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,</div><div class='ctx'> 	hci_send_cmd(hdev, HCI_OP_LE_CONN_PARAM_REQ_REPLY, sizeof(cp), &amp;cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_direct_adv_report_evt(struct hci_dev *hdev,</div><div class='add'>+static void hci_le_direct_adv_report_evt(struct hci_dev *hdev, void *data,</div><div class='ctx'> 					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 num_reports = skb-&gt;data[0];</div><div class='del'>-	void *ptr = &amp;skb-&gt;data[1];</div><div class='add'>+	struct hci_ev_le_direct_adv_report *ev = data;</div><div class='add'>+	u64 instant = jiffies;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	if (!hci_le_ev_skb_pull(hdev, skb, HCI_EV_LE_DIRECT_ADV_REPORT,</div><div class='add'>+				flex_array_size(ev, info, ev-&gt;num)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	while (num_reports--) {</div><div class='del'>-		struct hci_ev_le_direct_adv_info *ev = ptr;</div><div class='add'>+	if (!ev-&gt;num)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-		process_adv_report(hdev, ev-&gt;evt_type, &amp;ev-&gt;bdaddr,</div><div class='del'>-				   ev-&gt;bdaddr_type, &amp;ev-&gt;direct_addr,</div><div class='del'>-				   ev-&gt;direct_addr_type, ev-&gt;rssi, NULL, 0);</div><div class='add'>+	for (i = 0; i &lt; ev-&gt;num; i++) {</div><div class='add'>+		struct hci_ev_le_direct_adv_info *info = &amp;ev-&gt;info[i];</div><div class='ctx'> </div><div class='del'>-		ptr += sizeof(*ev);</div><div class='add'>+		process_adv_report(hdev, info-&gt;type, &amp;info-&gt;bdaddr,</div><div class='add'>+				   info-&gt;bdaddr_type, &amp;info-&gt;direct_addr,</div><div class='add'>+				   info-&gt;direct_addr_type, HCI_ADV_PHY_1M, 0,</div><div class='add'>+				   info-&gt;rssi, NULL, 0, false, false, instant);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hci_le_meta_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_phy_update_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_le_meta *le_ev = (void *) skb-&gt;data;</div><div class='add'>+	struct hci_ev_le_phy_update_complete *ev = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(*le_ev));</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='del'>-	switch (le_ev-&gt;subevent) {</div><div class='del'>-	case HCI_EV_LE_CONN_COMPLETE:</div><div class='del'>-		hci_le_conn_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (ev-&gt;status)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_CONN_UPDATE_COMPLETE:</div><div class='del'>-		hci_le_conn_update_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_ADVERTISING_REPORT:</div><div class='del'>-		hci_le_adv_report_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+	if (!conn)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_REMOTE_FEAT_COMPLETE:</div><div class='del'>-		hci_le_remote_feat_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn-&gt;le_tx_phy = ev-&gt;tx_phy;</div><div class='add'>+	conn-&gt;le_rx_phy = ev-&gt;rx_phy;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_LTK_REQ:</div><div class='del'>-		hci_le_ltk_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_REMOTE_CONN_PARAM_REQ:</div><div class='del'>-		hci_le_remote_conn_param_req_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_le_cis_established_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_cis_established *ev = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct bt_iso_qos *qos;</div><div class='add'>+	bool pending = false;</div><div class='add'>+	u16 handle = __le16_to_cpu(ev-&gt;handle);</div><div class='add'>+	u32 c_sdu_interval, p_sdu_interval;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_DIRECT_ADV_REPORT:</div><div class='del'>-		hci_le_direct_adv_report_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_EXT_ADV_REPORT:</div><div class='del'>-		hci_le_ext_adv_report_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_ENHANCED_CONN_COMPLETE:</div><div class='del'>-		hci_le_enh_conn_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "Unable to find connection with handle 0x%4.4x",</div><div class='add'>+			   handle);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_EXT_ADV_SET_TERM:</div><div class='del'>-		hci_le_ext_adv_term_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (conn-&gt;type != CIS_LINK) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "Invalid connection link type handle 0x%4.4x",</div><div class='add'>+			   handle);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='add'>+	qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+</div><div class='add'>+	pending = test_and_clear_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 6, Part G</div><div class='add'>+	 * page 3075:</div><div class='add'>+	 * Transport_Latency_C_To_P = CIG_Sync_Delay + (FT_C_To_P) ×</div><div class='add'>+	 * ISO_Interval + SDU_Interval_C_To_P</div><div class='add'>+	 * ...</div><div class='add'>+	 * SDU_Interval = (CIG_Sync_Delay + (FT) x ISO_Interval) -</div><div class='add'>+	 *					Transport_Latency</div><div class='add'>+	 */</div><div class='add'>+	c_sdu_interval = (get_unaligned_le24(ev-&gt;cig_sync_delay) +</div><div class='add'>+			 (ev-&gt;c_ft * le16_to_cpu(ev-&gt;interval) * 1250)) -</div><div class='add'>+			get_unaligned_le24(ev-&gt;c_latency);</div><div class='add'>+	p_sdu_interval = (get_unaligned_le24(ev-&gt;cig_sync_delay) +</div><div class='add'>+			 (ev-&gt;p_ft * le16_to_cpu(ev-&gt;interval) * 1250)) -</div><div class='add'>+			get_unaligned_le24(ev-&gt;p_latency);</div><div class='add'>+</div><div class='add'>+	switch (conn-&gt;role) {</div><div class='add'>+	case HCI_ROLE_SLAVE:</div><div class='add'>+		qos-&gt;ucast.in.interval = c_sdu_interval;</div><div class='add'>+		qos-&gt;ucast.out.interval = p_sdu_interval;</div><div class='add'>+		/* Convert Transport Latency (us) to Latency (msec) */</div><div class='add'>+		qos-&gt;ucast.in.latency =</div><div class='add'>+			DIV_ROUND_CLOSEST(get_unaligned_le24(ev-&gt;c_latency),</div><div class='add'>+					  1000);</div><div class='add'>+		qos-&gt;ucast.out.latency =</div><div class='add'>+			DIV_ROUND_CLOSEST(get_unaligned_le24(ev-&gt;p_latency),</div><div class='add'>+					  1000);</div><div class='add'>+		qos-&gt;ucast.in.sdu = ev-&gt;c_bn ? le16_to_cpu(ev-&gt;c_mtu) : 0;</div><div class='add'>+		qos-&gt;ucast.out.sdu = ev-&gt;p_bn ? le16_to_cpu(ev-&gt;p_mtu) : 0;</div><div class='add'>+		qos-&gt;ucast.in.phy = ev-&gt;c_phy;</div><div class='add'>+		qos-&gt;ucast.out.phy = ev-&gt;p_phy;</div><div class='add'>+		break;</div><div class='add'>+	case HCI_ROLE_MASTER:</div><div class='add'>+		qos-&gt;ucast.in.interval = p_sdu_interval;</div><div class='add'>+		qos-&gt;ucast.out.interval = c_sdu_interval;</div><div class='add'>+		/* Convert Transport Latency (us) to Latency (msec) */</div><div class='add'>+		qos-&gt;ucast.out.latency =</div><div class='add'>+			DIV_ROUND_CLOSEST(get_unaligned_le24(ev-&gt;c_latency),</div><div class='add'>+					  1000);</div><div class='add'>+		qos-&gt;ucast.in.latency =</div><div class='add'>+			DIV_ROUND_CLOSEST(get_unaligned_le24(ev-&gt;p_latency),</div><div class='add'>+					  1000);</div><div class='add'>+		qos-&gt;ucast.out.sdu = ev-&gt;c_bn ? le16_to_cpu(ev-&gt;c_mtu) : 0;</div><div class='add'>+		qos-&gt;ucast.in.sdu = ev-&gt;p_bn ? le16_to_cpu(ev-&gt;p_mtu) : 0;</div><div class='add'>+		qos-&gt;ucast.out.phy = ev-&gt;c_phy;</div><div class='add'>+		qos-&gt;ucast.in.phy = ev-&gt;p_phy;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!ev-&gt;status) {</div><div class='add'>+		conn-&gt;state = BT_CONNECTED;</div><div class='add'>+		hci_debugfs_create_conn(conn);</div><div class='add'>+		hci_conn_add_sysfs(conn);</div><div class='add'>+		hci_iso_setup_path(conn);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;state = BT_CLOSED;</div><div class='add'>+	hci_connect_cfm(conn, ev-&gt;status);</div><div class='add'>+	hci_conn_del(conn);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	if (pending)</div><div class='add'>+		hci_le_create_cis_pending(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode,</div><div class='del'>-				 u8 event, struct sk_buff *skb)</div><div class='add'>+static void hci_le_reject_cis(struct hci_dev *hdev, __le16 handle)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ev_cmd_complete *ev;</div><div class='del'>-	struct hci_event_hdr *hdr;</div><div class='add'>+	struct hci_cp_le_reject_cis cp;</div><div class='ctx'> </div><div class='del'>-	if (!skb)</div><div class='del'>-		return false;</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+	cp.reason = HCI_ERROR_REJ_BAD_ADDR;</div><div class='add'>+	hci_send_cmd(hdev, HCI_OP_LE_REJECT_CIS, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*hdr)) {</div><div class='del'>-		bt_dev_err(hdev, "too short HCI event");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='add'>+static void hci_le_accept_cis(struct hci_dev *hdev, __le16 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_accept_cis cp;</div><div class='ctx'> </div><div class='del'>-	hdr = (void *) skb-&gt;data;</div><div class='del'>-	skb_pull(skb, HCI_EVENT_HDR_SIZE);</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+	hci_send_cmd(hdev, HCI_OP_LE_ACCEPT_CIS, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (event) {</div><div class='del'>-		if (hdr-&gt;evt != event)</div><div class='del'>-			return false;</div><div class='del'>-		return true;</div><div class='add'>+static void hci_le_cis_req_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_cis_req *ev = data;</div><div class='add'>+	u16 acl_handle, cis_handle;</div><div class='add'>+	struct hci_conn *acl, *cis;</div><div class='add'>+	int mask;</div><div class='add'>+	__u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	acl_handle = __le16_to_cpu(ev-&gt;acl_handle);</div><div class='add'>+	cis_handle = __le16_to_cpu(ev-&gt;cis_handle);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "acl 0x%4.4x handle 0x%4.4x cig 0x%2.2x cis 0x%2.2x",</div><div class='add'>+		   acl_handle, cis_handle, ev-&gt;cig_id, ev-&gt;cis_id);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	acl = hci_conn_hash_lookup_handle(hdev, acl_handle);</div><div class='add'>+	if (!acl)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	mask = hci_proto_connect_ind(hdev, &amp;acl-&gt;dst, CIS_LINK, &amp;flags);</div><div class='add'>+	if (!(mask &amp; HCI_LM_ACCEPT)) {</div><div class='add'>+		hci_le_reject_cis(hdev, ev-&gt;cis_handle);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hdr-&gt;evt != HCI_EV_CMD_COMPLETE) {</div><div class='del'>-		bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",</div><div class='del'>-			   hdr-&gt;evt);</div><div class='del'>-		return false;</div><div class='add'>+	cis = hci_conn_hash_lookup_handle(hdev, cis_handle);</div><div class='add'>+	if (!cis) {</div><div class='add'>+		cis = hci_conn_add(hdev, CIS_LINK, &amp;acl-&gt;dst, acl-&gt;dst_type,</div><div class='add'>+				   HCI_ROLE_SLAVE, cis_handle);</div><div class='add'>+		if (IS_ERR(cis)) {</div><div class='add'>+			hci_le_reject_cis(hdev, ev-&gt;cis_handle);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*ev)) {</div><div class='del'>-		bt_dev_err(hdev, "too short cmd_complete event");</div><div class='del'>-		return false;</div><div class='add'>+	cis-&gt;iso_qos.ucast.cig = ev-&gt;cig_id;</div><div class='add'>+	cis-&gt;iso_qos.ucast.cis = ev-&gt;cis_id;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; HCI_PROTO_DEFER)) {</div><div class='add'>+		hci_le_accept_cis(hdev, ev-&gt;cis_handle);</div><div class='add'>+	} else {</div><div class='add'>+		cis-&gt;state = BT_CONNECT2;</div><div class='add'>+		hci_connect_cfm(cis, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ev = (void *) skb-&gt;data;</div><div class='del'>-	skb_pull(skb, sizeof(*ev));</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (opcode != __le16_to_cpu(ev-&gt;opcode)) {</div><div class='del'>-		BT_DBG("opcode doesn't match (0x%2.2x != 0x%2.2x)", opcode,</div><div class='del'>-		       __le16_to_cpu(ev-&gt;opcode));</div><div class='del'>-		return false;</div><div class='add'>+static int hci_iso_term_big_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 handle = PTR_UINT(data);</div><div class='add'>+</div><div class='add'>+	return hci_le_terminate_big_sync(hdev, handle,</div><div class='add'>+					 HCI_ERROR_LOCAL_HOST_TERM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_create_big_complete *ev = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	__u8 i = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s status 0x%2.2x", hdev-&gt;name, ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!hci_le_ev_skb_pull(hdev, skb, HCI_EVT_LE_CREATE_BIG_COMPLETE,</div><div class='add'>+				flex_array_size(ev, bis_handle, ev-&gt;num_bis)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Connect all BISes that are bound to the BIG */</div><div class='add'>+	while ((conn = hci_conn_hash_lookup_big_state(hdev, ev-&gt;handle,</div><div class='add'>+						      BT_BOUND,</div><div class='add'>+						      HCI_ROLE_MASTER))) {</div><div class='add'>+		if (ev-&gt;status) {</div><div class='add'>+			hci_connect_cfm(conn, ev-&gt;status);</div><div class='add'>+			hci_conn_del(conn);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hci_conn_set_handle(conn,</div><div class='add'>+					__le16_to_cpu(ev-&gt;bis_handle[i++])))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		conn-&gt;state = BT_CONNECTED;</div><div class='add'>+		set_bit(HCI_CONN_BIG_CREATED, &amp;conn-&gt;flags);</div><div class='add'>+		hci_debugfs_create_conn(conn);</div><div class='add'>+		hci_conn_add_sysfs(conn);</div><div class='add'>+		hci_iso_setup_path(conn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	if (!ev-&gt;status &amp;&amp; !i)</div><div class='add'>+		/* If no BISes have been connected for the BIG,</div><div class='add'>+		 * terminate. This is in case all bound connections</div><div class='add'>+		 * have been closed before the BIG creation</div><div class='add'>+		 * has completed.</div><div class='add'>+		 */</div><div class='add'>+		hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,</div><div class='add'>+				   UINT_PTR(ev-&gt;handle), NULL);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct hci_event_hdr *hdr = (void *) skb-&gt;data;</div><div class='del'>-	hci_req_complete_t req_complete = NULL;</div><div class='del'>-	hci_req_complete_skb_t req_complete_skb = NULL;</div><div class='del'>-	struct sk_buff *orig_skb = NULL;</div><div class='del'>-	u8 status = 0, event = hdr-&gt;evt, req_evt = 0;</div><div class='del'>-	u16 opcode = HCI_OP_NOP;</div><div class='add'>+	struct hci_evt_le_big_sync_established *ev = data;</div><div class='add'>+	struct hci_conn *bis, *conn;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;sent_cmd &amp;&amp; bt_cb(hdev-&gt;sent_cmd)-&gt;hci.req_event == event) {</div><div class='del'>-		struct hci_command_hdr *cmd_hdr = (void *) hdev-&gt;sent_cmd-&gt;data;</div><div class='del'>-		opcode = __le16_to_cpu(cmd_hdr-&gt;opcode);</div><div class='del'>-		hci_req_cmd_complete(hdev, opcode, status, &amp;req_complete,</div><div class='del'>-				     &amp;req_complete_skb);</div><div class='del'>-		req_evt = event;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!hci_le_ev_skb_pull(hdev, skb, HCI_EVT_LE_BIG_SYNC_ESTABLISHED,</div><div class='add'>+				flex_array_size(ev, bis, ev-&gt;num_bis)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_big_sync_pend(hdev, ev-&gt;handle,</div><div class='add'>+						  ev-&gt;num_bis);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "Unable to find connection for big 0x%2.2x",</div><div class='add'>+			   ev-&gt;handle);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If it looks like we might end up having to call</div><div class='del'>-	 * req_complete_skb, store a pristine copy of the skb since the</div><div class='del'>-	 * various handlers may modify the original one through</div><div class='del'>-	 * skb_pull() calls, etc.</div><div class='add'>+	clear_bit(HCI_CONN_CREATE_BIG_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	conn-&gt;num_bis = 0;</div><div class='add'>+	memset(conn-&gt;bis, 0, sizeof(conn-&gt;num_bis));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ev-&gt;num_bis; i++) {</div><div class='add'>+		u16 handle = le16_to_cpu(ev-&gt;bis[i]);</div><div class='add'>+		__le32 interval;</div><div class='add'>+</div><div class='add'>+		bis = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+		if (!bis) {</div><div class='add'>+			if (handle &gt; HCI_CONN_HANDLE_MAX) {</div><div class='add'>+				bt_dev_dbg(hdev, "ignore too large handle %u", handle);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			bis = hci_conn_add(hdev, BIS_LINK, BDADDR_ANY, 0,</div><div class='add'>+					   HCI_ROLE_SLAVE, handle);</div><div class='add'>+			if (IS_ERR(bis))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ev-&gt;status != 0x42)</div><div class='add'>+			/* Mark PA sync as established */</div><div class='add'>+			set_bit(HCI_CONN_PA_SYNC, &amp;bis-&gt;flags);</div><div class='add'>+</div><div class='add'>+		bis-&gt;sync_handle = conn-&gt;sync_handle;</div><div class='add'>+		bis-&gt;iso_qos.bcast.big = ev-&gt;handle;</div><div class='add'>+		memset(&amp;interval, 0, sizeof(interval));</div><div class='add'>+		memcpy(&amp;interval, ev-&gt;latency, sizeof(ev-&gt;latency));</div><div class='add'>+		bis-&gt;iso_qos.bcast.in.interval = le32_to_cpu(interval);</div><div class='add'>+		/* Convert ISO Interval (1.25 ms slots) to latency (ms) */</div><div class='add'>+		bis-&gt;iso_qos.bcast.in.latency = le16_to_cpu(ev-&gt;interval) * 125 / 100;</div><div class='add'>+		bis-&gt;iso_qos.bcast.in.sdu = le16_to_cpu(ev-&gt;max_pdu);</div><div class='add'>+</div><div class='add'>+		if (!ev-&gt;status) {</div><div class='add'>+			bis-&gt;state = BT_CONNECTED;</div><div class='add'>+			set_bit(HCI_CONN_BIG_SYNC, &amp;bis-&gt;flags);</div><div class='add'>+			hci_debugfs_create_conn(bis);</div><div class='add'>+			hci_conn_add_sysfs(bis);</div><div class='add'>+			hci_iso_setup_path(bis);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case BIG sync failed, notify each failed connection to</div><div class='add'>+	 * the user after all hci connections have been added</div><div class='ctx'> 	 */</div><div class='del'>-	if (req_complete_skb || event == HCI_EV_CMD_STATUS ||</div><div class='del'>-	    event == HCI_EV_CMD_COMPLETE)</div><div class='del'>-		orig_skb = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+	if (ev-&gt;status)</div><div class='add'>+		for (i = 0; i &lt; ev-&gt;num_bis; i++) {</div><div class='add'>+			u16 handle = le16_to_cpu(ev-&gt;bis[i]);</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, HCI_EVENT_HDR_SIZE);</div><div class='add'>+			bis = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+			if (!bis)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-	switch (event) {</div><div class='del'>-	case HCI_EV_INQUIRY_COMPLETE:</div><div class='del'>-		hci_inquiry_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+			set_bit(HCI_CONN_BIG_SYNC_FAILED, &amp;bis-&gt;flags);</div><div class='add'>+			hci_connect_cfm(bis, ev-&gt;status);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_INQUIRY_RESULT:</div><div class='del'>-		hci_inquiry_result_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CONN_COMPLETE:</div><div class='del'>-		hci_conn_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_le_big_sync_lost_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_big_sync_lost *ev = data;</div><div class='add'>+	struct hci_conn *bis;</div><div class='add'>+	bool mgmt_conn = false;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CONN_REQUEST:</div><div class='del'>-		hci_conn_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "big handle 0x%2.2x", ev-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_DISCONN_COMPLETE:</div><div class='del'>-		hci_disconn_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_AUTH_COMPLETE:</div><div class='del'>-		hci_auth_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* Delete each bis connection */</div><div class='add'>+	while ((bis = hci_conn_hash_lookup_big_state(hdev, ev-&gt;handle,</div><div class='add'>+						     BT_CONNECTED,</div><div class='add'>+						     HCI_ROLE_SLAVE))) {</div><div class='add'>+		if (!mgmt_conn) {</div><div class='add'>+			mgmt_conn = test_and_clear_bit(HCI_CONN_MGMT_CONNECTED,</div><div class='add'>+						       &amp;bis-&gt;flags);</div><div class='add'>+			mgmt_device_disconnected(hdev, &amp;bis-&gt;dst, bis-&gt;type,</div><div class='add'>+						 bis-&gt;dst_type, ev-&gt;reason,</div><div class='add'>+						 mgmt_conn);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_REMOTE_NAME:</div><div class='del'>-		hci_remote_name_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		clear_bit(HCI_CONN_BIG_SYNC, &amp;bis-&gt;flags);</div><div class='add'>+		hci_disconn_cfm(bis, ev-&gt;reason);</div><div class='add'>+		hci_conn_del(bis);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_ENCRYPT_CHANGE:</div><div class='del'>-		hci_encrypt_change_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CHANGE_LINK_KEY_COMPLETE:</div><div class='del'>-		hci_change_link_key_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_le_big_info_adv_report_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_big_info_adv_report *ev = data;</div><div class='add'>+	int mask = hdev-&gt;link_mode;</div><div class='add'>+	__u8 flags = 0;</div><div class='add'>+	struct hci_conn *pa_sync;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_REMOTE_FEATURES:</div><div class='del'>-		hci_remote_features_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "sync_handle 0x%4.4x", le16_to_cpu(ev-&gt;sync_handle));</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CMD_COMPLETE:</div><div class='del'>-		hci_cmd_complete_evt(hdev, skb, &amp;opcode, &amp;status,</div><div class='del'>-				     &amp;req_complete, &amp;req_complete_skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CMD_STATUS:</div><div class='del'>-		hci_cmd_status_evt(hdev, skb, &amp;opcode, &amp;status, &amp;req_complete,</div><div class='del'>-				   &amp;req_complete_skb);</div><div class='del'>-		break;</div><div class='add'>+	mask |= hci_proto_connect_ind(hdev, BDADDR_ANY, BIS_LINK, &amp;flags);</div><div class='add'>+	if (!(mask &amp; HCI_LM_ACCEPT))</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_HARDWARE_ERROR:</div><div class='del'>-		hci_hardware_error_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (!(flags &amp; HCI_PROTO_DEFER))</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_ROLE_CHANGE:</div><div class='del'>-		hci_role_change_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	pa_sync = hci_conn_hash_lookup_pa_sync_handle</div><div class='add'>+			(hdev,</div><div class='add'>+			le16_to_cpu(ev-&gt;sync_handle));</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_NUM_COMP_PKTS:</div><div class='del'>-		hci_num_comp_pkts_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (!pa_sync)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_MODE_CHANGE:</div><div class='del'>-		hci_mode_change_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	pa_sync-&gt;iso_qos.bcast.encryption = ev-&gt;encryption;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_PIN_CODE_REQ:</div><div class='del'>-		hci_pin_code_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* Notify iso layer */</div><div class='add'>+	hci_connect_cfm(pa_sync, 0);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LINK_KEY_REQ:</div><div class='del'>-		hci_link_key_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LINK_KEY_NOTIFY:</div><div class='del'>-		hci_link_key_notify_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static void hci_le_read_all_remote_features_evt(struct hci_dev *hdev,</div><div class='add'>+						void *data, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_read_all_remote_features_complete *ev = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_CLOCK_OFFSET:</div><div class='del'>-		hci_clock_offset_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	bt_dev_dbg(hdev, "status 0x%2.2x", ev-&gt;status);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_PKT_TYPE_CHANGE:</div><div class='del'>-		hci_pkt_type_change_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_PSCAN_REP_MODE:</div><div class='del'>-		hci_pscan_rep_mode_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev-&gt;handle));</div><div class='add'>+	if (!conn)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_INQUIRY_RESULT_WITH_RSSI:</div><div class='del'>-		hci_inquiry_result_with_rssi_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (!ev-&gt;status)</div><div class='add'>+		memcpy(conn-&gt;le_features, ev-&gt;features, 248);</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_REMOTE_EXT_FEATURES:</div><div class='del'>-		hci_remote_ext_features_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (conn-&gt;state == BT_CONFIG) {</div><div class='add'>+		__u8 status;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_SYNC_CONN_COMPLETE:</div><div class='del'>-		hci_sync_conn_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		/* If the local controller supports peripheral-initiated</div><div class='add'>+		 * features exchange, but the remote controller does</div><div class='add'>+		 * not, then it is possible that the error code 0x1a</div><div class='add'>+		 * for unsupported remote feature gets returned.</div><div class='add'>+		 *</div><div class='add'>+		 * In this specific case, allow the connection to</div><div class='add'>+		 * transition into connected state and mark it as</div><div class='add'>+		 * successful.</div><div class='add'>+		 */</div><div class='add'>+		if (!conn-&gt;out &amp;&amp;</div><div class='add'>+		    ev-&gt;status == HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE &amp;&amp;</div><div class='add'>+		    (hdev-&gt;le_features[0] &amp; HCI_LE_PERIPHERAL_FEATURES))</div><div class='add'>+			status = 0x00;</div><div class='add'>+		else</div><div class='add'>+			status = ev-&gt;status;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_EXTENDED_INQUIRY_RESULT:</div><div class='del'>-		hci_extended_inquiry_result_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+		conn-&gt;state = BT_CONNECTED;</div><div class='add'>+		hci_connect_cfm(conn, status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_KEY_REFRESH_COMPLETE:</div><div class='del'>-		hci_key_refresh_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_IO_CAPA_REQUEST:</div><div class='del'>-		hci_io_capa_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+#define HCI_LE_EV_VL(_op, _func, _min_len, _max_len) \</div><div class='add'>+[_op] = { \</div><div class='add'>+	.func = _func, \</div><div class='add'>+	.min_len = _min_len, \</div><div class='add'>+	.max_len = _max_len, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_LE_EV(_op, _func, _len) \</div><div class='add'>+	HCI_LE_EV_VL(_op, _func, _len, _len)</div><div class='add'>+</div><div class='add'>+#define HCI_LE_EV_STATUS(_op, _func) \</div><div class='add'>+	HCI_LE_EV(_op, _func, sizeof(struct hci_ev_status))</div><div class='add'>+</div><div class='add'>+/* Entries in this table shall have their position according to the subevent</div><div class='add'>+ * opcode they handle so the use of the macros above is recommend since it does</div><div class='add'>+ * attempt to initialize at its proper index using Designated Initializers that</div><div class='add'>+ * way events without a callback function can be omitted.</div><div class='add'>+ */</div><div class='add'>+static const struct hci_le_ev {</div><div class='add'>+	void (*func)(struct hci_dev *hdev, void *data, struct sk_buff *skb);</div><div class='add'>+	u16  min_len;</div><div class='add'>+	u16  max_len;</div><div class='add'>+} hci_le_ev_table[U8_MAX + 1] = {</div><div class='add'>+	/* [0x01 = HCI_EV_LE_CONN_COMPLETE] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_CONN_COMPLETE, hci_le_conn_complete_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_conn_complete)),</div><div class='add'>+	/* [0x02 = HCI_EV_LE_ADVERTISING_REPORT] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EV_LE_ADVERTISING_REPORT, hci_le_adv_report_evt,</div><div class='add'>+		     sizeof(struct hci_ev_le_advertising_report),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x03 = HCI_EV_LE_CONN_UPDATE_COMPLETE] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_CONN_UPDATE_COMPLETE,</div><div class='add'>+		  hci_le_conn_update_complete_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_conn_update_complete)),</div><div class='add'>+	/* [0x04 = HCI_EV_LE_REMOTE_FEAT_COMPLETE] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_REMOTE_FEAT_COMPLETE,</div><div class='add'>+		  hci_le_remote_feat_complete_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_remote_feat_complete)),</div><div class='add'>+	/* [0x05 = HCI_EV_LE_LTK_REQ] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_LTK_REQ, hci_le_ltk_request_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_ltk_req)),</div><div class='add'>+	/* [0x06 = HCI_EV_LE_REMOTE_CONN_PARAM_REQ] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_REMOTE_CONN_PARAM_REQ,</div><div class='add'>+		  hci_le_remote_conn_param_req_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_remote_conn_param_req)),</div><div class='add'>+	/* [0x0a = HCI_EV_LE_ENHANCED_CONN_COMPLETE] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_ENHANCED_CONN_COMPLETE,</div><div class='add'>+		  hci_le_enh_conn_complete_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_enh_conn_complete)),</div><div class='add'>+	/* [0x0b = HCI_EV_LE_DIRECT_ADV_REPORT] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EV_LE_DIRECT_ADV_REPORT, hci_le_direct_adv_report_evt,</div><div class='add'>+		     sizeof(struct hci_ev_le_direct_adv_report),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x0c = HCI_EV_LE_PHY_UPDATE_COMPLETE] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_PHY_UPDATE_COMPLETE, hci_le_phy_update_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_phy_update_complete)),</div><div class='add'>+	/* [0x0d = HCI_EV_LE_EXT_ADV_REPORT] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EV_LE_EXT_ADV_REPORT, hci_le_ext_adv_report_evt,</div><div class='add'>+		     sizeof(struct hci_ev_le_ext_adv_report),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x0e = HCI_EV_LE_PA_SYNC_ESTABLISHED] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_PA_SYNC_ESTABLISHED,</div><div class='add'>+		  hci_le_pa_sync_established_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_pa_sync_established)),</div><div class='add'>+	/* [0x0f = HCI_EV_LE_PER_ADV_REPORT] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EV_LE_PER_ADV_REPORT,</div><div class='add'>+				 hci_le_per_adv_report_evt,</div><div class='add'>+				 sizeof(struct hci_ev_le_per_adv_report),</div><div class='add'>+				 HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x10 = HCI_EV_LE_PA_SYNC_LOST] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_PA_SYNC_LOST, hci_le_pa_sync_lost_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_pa_sync_lost)),</div><div class='add'>+	/* [0x12 = HCI_EV_LE_EXT_ADV_SET_TERM] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_EXT_ADV_SET_TERM, hci_le_ext_adv_term_evt,</div><div class='add'>+		  sizeof(struct hci_evt_le_ext_adv_set_term)),</div><div class='add'>+	/* [0x18 = HCI_EVT_LE_PAST_RECEIVED] */</div><div class='add'>+	HCI_LE_EV(HCI_EV_LE_PAST_RECEIVED,</div><div class='add'>+		  hci_le_past_received_evt,</div><div class='add'>+		  sizeof(struct hci_ev_le_past_received)),</div><div class='add'>+	/* [0x19 = HCI_EVT_LE_CIS_ESTABLISHED] */</div><div class='add'>+	HCI_LE_EV(HCI_EVT_LE_CIS_ESTABLISHED, hci_le_cis_established_evt,</div><div class='add'>+		  sizeof(struct hci_evt_le_cis_established)),</div><div class='add'>+	/* [0x1a = HCI_EVT_LE_CIS_REQ] */</div><div class='add'>+	HCI_LE_EV(HCI_EVT_LE_CIS_REQ, hci_le_cis_req_evt,</div><div class='add'>+		  sizeof(struct hci_evt_le_cis_req)),</div><div class='add'>+	/* [0x1b = HCI_EVT_LE_CREATE_BIG_COMPLETE] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EVT_LE_CREATE_BIG_COMPLETE,</div><div class='add'>+		     hci_le_create_big_complete_evt,</div><div class='add'>+		     sizeof(struct hci_evt_le_create_big_complete),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x1d = HCI_EV_LE_BIG_SYNC_ESTABLISHED] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EVT_LE_BIG_SYNC_ESTABLISHED,</div><div class='add'>+		     hci_le_big_sync_established_evt,</div><div class='add'>+		     sizeof(struct hci_evt_le_big_sync_established),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x1e = HCI_EVT_LE_BIG_SYNC_LOST] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EVT_LE_BIG_SYNC_LOST,</div><div class='add'>+		     hci_le_big_sync_lost_evt,</div><div class='add'>+		     sizeof(struct hci_evt_le_big_sync_lost),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x22 = HCI_EVT_LE_BIG_INFO_ADV_REPORT] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EVT_LE_BIG_INFO_ADV_REPORT,</div><div class='add'>+		     hci_le_big_info_adv_report_evt,</div><div class='add'>+		     sizeof(struct hci_evt_le_big_info_adv_report),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x2b = HCI_EVT_LE_ALL_REMOTE_FEATURES_COMPLETE] */</div><div class='add'>+	HCI_LE_EV_VL(HCI_EVT_LE_ALL_REMOTE_FEATURES_COMPLETE,</div><div class='add'>+		     hci_le_read_all_remote_features_evt,</div><div class='add'>+		     sizeof(struct</div><div class='add'>+			    hci_evt_le_read_all_remote_features_complete),</div><div class='add'>+		     HCI_MAX_EVENT_SIZE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hci_le_meta_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+			    struct sk_buff *skb, u16 *opcode, u8 *status,</div><div class='add'>+			    hci_req_complete_t *req_complete,</div><div class='add'>+			    hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_meta *ev = data;</div><div class='add'>+	const struct hci_le_ev *subev;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "subevent 0x%2.2x", ev-&gt;subevent);</div><div class='add'>+</div><div class='add'>+	/* Only match event if command OGF is for LE */</div><div class='add'>+	if (hdev-&gt;req_skb &amp;&amp;</div><div class='add'>+	   (hci_opcode_ogf(hci_skb_opcode(hdev-&gt;req_skb)) == 0x08 ||</div><div class='add'>+	    hci_skb_opcode(hdev-&gt;req_skb) == HCI_OP_NOP) &amp;&amp;</div><div class='add'>+	    hci_skb_event(hdev-&gt;req_skb) == ev-&gt;subevent) {</div><div class='add'>+		*opcode = hci_skb_opcode(hdev-&gt;req_skb);</div><div class='add'>+		hci_req_cmd_complete(hdev, *opcode, 0x00, req_complete,</div><div class='add'>+				     req_complete_skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_IO_CAPA_REPLY:</div><div class='del'>-		hci_io_capa_reply_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	subev = &amp;hci_le_ev_table[ev-&gt;subevent];</div><div class='add'>+	if (!subev-&gt;func)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_USER_CONFIRM_REQUEST:</div><div class='del'>-		hci_user_confirm_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (skb-&gt;len &lt; subev-&gt;min_len) {</div><div class='add'>+		bt_dev_err(hdev, "unexpected subevent 0x%2.2x length: %u &lt; %u",</div><div class='add'>+			   ev-&gt;subevent, skb-&gt;len, subev-&gt;min_len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_USER_PASSKEY_REQUEST:</div><div class='del'>-		hci_user_passkey_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* Just warn if the length is over max_len size it still be</div><div class='add'>+	 * possible to partially parse the event so leave to callback to</div><div class='add'>+	 * decide if that is acceptable.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len &gt; subev-&gt;max_len)</div><div class='add'>+		bt_dev_warn(hdev, "unexpected subevent 0x%2.2x length: %u &gt; %u",</div><div class='add'>+			    ev-&gt;subevent, skb-&gt;len, subev-&gt;max_len);</div><div class='add'>+	data = hci_le_ev_skb_pull(hdev, skb, ev-&gt;subevent, subev-&gt;min_len);</div><div class='add'>+	if (!data)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_USER_PASSKEY_NOTIFY:</div><div class='del'>-		hci_user_passkey_notify_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	subev-&gt;func(hdev, data, skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_KEYPRESS_NOTIFY:</div><div class='del'>-		hci_keypress_notify_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode,</div><div class='add'>+				 u8 event, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_cmd_complete *ev;</div><div class='add'>+	struct hci_event_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_SIMPLE_PAIR_COMPLETE:</div><div class='del'>-		hci_simple_pair_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (!skb)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_REMOTE_HOST_FEATURES:</div><div class='del'>-		hci_remote_host_features_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hdr = hci_ev_skb_pull(hdev, skb, event, sizeof(*hdr));</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LE_META:</div><div class='del'>-		hci_le_meta_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (event) {</div><div class='add'>+		if (hdr-&gt;evt != event)</div><div class='add'>+			return false;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_REMOTE_OOB_DATA_REQUEST:</div><div class='del'>-		hci_remote_oob_data_request_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	/* Check if request ended in Command Status - no way to retrieve</div><div class='add'>+	 * any extra parameters in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (hdr-&gt;evt == HCI_EV_CMD_STATUS)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_BT_HS)</div><div class='del'>-	case HCI_EV_CHANNEL_SELECTED:</div><div class='del'>-		hci_chan_selected_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (hdr-&gt;evt != HCI_EV_CMD_COMPLETE) {</div><div class='add'>+		bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",</div><div class='add'>+			   hdr-&gt;evt);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_PHY_LINK_COMPLETE:</div><div class='del'>-		hci_phy_link_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	ev = hci_cc_skb_pull(hdev, skb, opcode, sizeof(*ev));</div><div class='add'>+	if (!ev)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_LOGICAL_LINK_COMPLETE:</div><div class='del'>-		hci_loglink_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	if (opcode != __le16_to_cpu(ev-&gt;opcode)) {</div><div class='add'>+		BT_DBG("opcode doesn't match (0x%2.2x != 0x%2.2x)", opcode,</div><div class='add'>+		       __le16_to_cpu(ev-&gt;opcode));</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_DISCONN_LOGICAL_LINK_COMPLETE:</div><div class='del'>-		hci_disconn_loglink_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_DISCONN_PHY_LINK_COMPLETE:</div><div class='del'>-		hci_disconn_phylink_complete_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='add'>+static void hci_store_wake_reason(struct hci_dev *hdev, u8 event,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_advertising_info *adv;</div><div class='add'>+	struct hci_ev_le_direct_adv_info *direct_adv;</div><div class='add'>+	struct hci_ev_le_ext_adv_info *ext_adv;</div><div class='add'>+	const struct hci_ev_conn_complete *conn_complete = (void *)skb-&gt;data;</div><div class='add'>+	const struct hci_ev_conn_request *conn_request = (void *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	case HCI_EV_NUM_COMP_BLOCKS:</div><div class='del'>-		hci_num_comp_blocks_evt(hdev, skb);</div><div class='del'>-		break;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		BT_DBG("%s event 0x%2.2x", hdev-&gt;name, event);</div><div class='del'>-		break;</div><div class='add'>+	/* If we are currently suspended and this is the first BT event seen,</div><div class='add'>+	 * save the wake reason associated with the event.</div><div class='add'>+	 */</div><div class='add'>+	if (!hdev-&gt;suspended || hdev-&gt;wake_reason)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Default to remote wake. Values for wake_reason are documented in the</div><div class='add'>+	 * Bluez mgmt api docs.</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;wake_reason = MGMT_WAKE_REASON_REMOTE_WAKE;</div><div class='add'>+</div><div class='add'>+	/* Once configured for remote wakeup, we should only wake up for</div><div class='add'>+	 * reconnections. It's useful to see which device is waking us up so</div><div class='add'>+	 * keep track of the bdaddr of the connection event that woke us up.</div><div class='add'>+	 */</div><div class='add'>+	if (event == HCI_EV_CONN_REQUEST) {</div><div class='add'>+		bacpy(&amp;hdev-&gt;wake_addr, &amp;conn_request-&gt;bdaddr);</div><div class='add'>+		hdev-&gt;wake_addr_type = BDADDR_BREDR;</div><div class='add'>+	} else if (event == HCI_EV_CONN_COMPLETE) {</div><div class='add'>+		bacpy(&amp;hdev-&gt;wake_addr, &amp;conn_complete-&gt;bdaddr);</div><div class='add'>+		hdev-&gt;wake_addr_type = BDADDR_BREDR;</div><div class='add'>+	} else if (event == HCI_EV_LE_META) {</div><div class='add'>+		struct hci_ev_le_meta *le_ev = (void *)skb-&gt;data;</div><div class='add'>+		u8 subevent = le_ev-&gt;subevent;</div><div class='add'>+		u8 *ptr = &amp;skb-&gt;data[sizeof(*le_ev)];</div><div class='add'>+		u8 num_reports = *ptr;</div><div class='add'>+</div><div class='add'>+		if ((subevent == HCI_EV_LE_ADVERTISING_REPORT ||</div><div class='add'>+		     subevent == HCI_EV_LE_DIRECT_ADV_REPORT ||</div><div class='add'>+		     subevent == HCI_EV_LE_EXT_ADV_REPORT) &amp;&amp;</div><div class='add'>+		    num_reports) {</div><div class='add'>+			adv = (void *)(ptr + 1);</div><div class='add'>+			direct_adv = (void *)(ptr + 1);</div><div class='add'>+			ext_adv = (void *)(ptr + 1);</div><div class='add'>+</div><div class='add'>+			switch (subevent) {</div><div class='add'>+			case HCI_EV_LE_ADVERTISING_REPORT:</div><div class='add'>+				bacpy(&amp;hdev-&gt;wake_addr, &amp;adv-&gt;bdaddr);</div><div class='add'>+				hdev-&gt;wake_addr_type = adv-&gt;bdaddr_type;</div><div class='add'>+				break;</div><div class='add'>+			case HCI_EV_LE_DIRECT_ADV_REPORT:</div><div class='add'>+				bacpy(&amp;hdev-&gt;wake_addr, &amp;direct_adv-&gt;bdaddr);</div><div class='add'>+				hdev-&gt;wake_addr_type = direct_adv-&gt;bdaddr_type;</div><div class='add'>+				break;</div><div class='add'>+			case HCI_EV_LE_EXT_ADV_REPORT:</div><div class='add'>+				bacpy(&amp;hdev-&gt;wake_addr, &amp;ext_adv-&gt;bdaddr);</div><div class='add'>+				hdev-&gt;wake_addr_type = ext_adv-&gt;bdaddr_type;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hdev-&gt;wake_reason = MGMT_WAKE_REASON_UNEXPECTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_EV_VL(_op, _func, _min_len, _max_len) \</div><div class='add'>+[_op] = { \</div><div class='add'>+	.req = false, \</div><div class='add'>+	.func = _func, \</div><div class='add'>+	.min_len = _min_len, \</div><div class='add'>+	.max_len = _max_len, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_EV(_op, _func, _len) \</div><div class='add'>+	HCI_EV_VL(_op, _func, _len, _len)</div><div class='add'>+</div><div class='add'>+#define HCI_EV_STATUS(_op, _func) \</div><div class='add'>+	HCI_EV(_op, _func, sizeof(struct hci_ev_status))</div><div class='add'>+</div><div class='add'>+#define HCI_EV_REQ_VL(_op, _func, _min_len, _max_len) \</div><div class='add'>+[_op] = { \</div><div class='add'>+	.req = true, \</div><div class='add'>+	.func_req = _func, \</div><div class='add'>+	.min_len = _min_len, \</div><div class='add'>+	.max_len = _max_len, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_EV_REQ(_op, _func, _len) \</div><div class='add'>+	HCI_EV_REQ_VL(_op, _func, _len, _len)</div><div class='add'>+</div><div class='add'>+/* Entries in this table shall have their position according to the event opcode</div><div class='add'>+ * they handle so the use of the macros above is recommend since it does attempt</div><div class='add'>+ * to initialize at its proper index using Designated Initializers that way</div><div class='add'>+ * events without a callback function don't have entered.</div><div class='add'>+ */</div><div class='add'>+static const struct hci_ev {</div><div class='add'>+	bool req;</div><div class='add'>+	union {</div><div class='add'>+		void (*func)(struct hci_dev *hdev, void *data,</div><div class='add'>+			     struct sk_buff *skb);</div><div class='add'>+		void (*func_req)(struct hci_dev *hdev, void *data,</div><div class='add'>+				 struct sk_buff *skb, u16 *opcode, u8 *status,</div><div class='add'>+				 hci_req_complete_t *req_complete,</div><div class='add'>+				 hci_req_complete_skb_t *req_complete_skb);</div><div class='add'>+	};</div><div class='add'>+	u16  min_len;</div><div class='add'>+	u16  max_len;</div><div class='add'>+} hci_ev_table[U8_MAX + 1] = {</div><div class='add'>+	/* [0x01 = HCI_EV_INQUIRY_COMPLETE] */</div><div class='add'>+	HCI_EV_STATUS(HCI_EV_INQUIRY_COMPLETE, hci_inquiry_complete_evt),</div><div class='add'>+	/* [0x02 = HCI_EV_INQUIRY_RESULT] */</div><div class='add'>+	HCI_EV_VL(HCI_EV_INQUIRY_RESULT, hci_inquiry_result_evt,</div><div class='add'>+		  sizeof(struct hci_ev_inquiry_result), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x03 = HCI_EV_CONN_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_CONN_COMPLETE, hci_conn_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_conn_complete)),</div><div class='add'>+	/* [0x04 = HCI_EV_CONN_REQUEST] */</div><div class='add'>+	HCI_EV(HCI_EV_CONN_REQUEST, hci_conn_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_conn_request)),</div><div class='add'>+	/* [0x05 = HCI_EV_DISCONN_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_DISCONN_COMPLETE, hci_disconn_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_disconn_complete)),</div><div class='add'>+	/* [0x06 = HCI_EV_AUTH_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_AUTH_COMPLETE, hci_auth_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_auth_complete)),</div><div class='add'>+	/* [0x07 = HCI_EV_REMOTE_NAME] */</div><div class='add'>+	HCI_EV(HCI_EV_REMOTE_NAME, hci_remote_name_evt,</div><div class='add'>+	       sizeof(struct hci_ev_remote_name)),</div><div class='add'>+	/* [0x08 = HCI_EV_ENCRYPT_CHANGE] */</div><div class='add'>+	HCI_EV(HCI_EV_ENCRYPT_CHANGE, hci_encrypt_change_evt,</div><div class='add'>+	       sizeof(struct hci_ev_encrypt_change)),</div><div class='add'>+	/* [0x09 = HCI_EV_CHANGE_LINK_KEY_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_CHANGE_LINK_KEY_COMPLETE,</div><div class='add'>+	       hci_change_link_key_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_change_link_key_complete)),</div><div class='add'>+	/* [0x0b = HCI_EV_REMOTE_FEATURES] */</div><div class='add'>+	HCI_EV(HCI_EV_REMOTE_FEATURES, hci_remote_features_evt,</div><div class='add'>+	       sizeof(struct hci_ev_remote_features)),</div><div class='add'>+	/* [0x0e = HCI_EV_CMD_COMPLETE] */</div><div class='add'>+	HCI_EV_REQ_VL(HCI_EV_CMD_COMPLETE, hci_cmd_complete_evt,</div><div class='add'>+		      sizeof(struct hci_ev_cmd_complete), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x0f = HCI_EV_CMD_STATUS] */</div><div class='add'>+	HCI_EV_REQ(HCI_EV_CMD_STATUS, hci_cmd_status_evt,</div><div class='add'>+		   sizeof(struct hci_ev_cmd_status)),</div><div class='add'>+	/* [0x10 = HCI_EV_CMD_STATUS] */</div><div class='add'>+	HCI_EV(HCI_EV_HARDWARE_ERROR, hci_hardware_error_evt,</div><div class='add'>+	       sizeof(struct hci_ev_hardware_error)),</div><div class='add'>+	/* [0x12 = HCI_EV_ROLE_CHANGE] */</div><div class='add'>+	HCI_EV(HCI_EV_ROLE_CHANGE, hci_role_change_evt,</div><div class='add'>+	       sizeof(struct hci_ev_role_change)),</div><div class='add'>+	/* [0x13 = HCI_EV_NUM_COMP_PKTS] */</div><div class='add'>+	HCI_EV_VL(HCI_EV_NUM_COMP_PKTS, hci_num_comp_pkts_evt,</div><div class='add'>+		  sizeof(struct hci_ev_num_comp_pkts), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x14 = HCI_EV_MODE_CHANGE] */</div><div class='add'>+	HCI_EV(HCI_EV_MODE_CHANGE, hci_mode_change_evt,</div><div class='add'>+	       sizeof(struct hci_ev_mode_change)),</div><div class='add'>+	/* [0x16 = HCI_EV_PIN_CODE_REQ] */</div><div class='add'>+	HCI_EV(HCI_EV_PIN_CODE_REQ, hci_pin_code_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_pin_code_req)),</div><div class='add'>+	/* [0x17 = HCI_EV_LINK_KEY_REQ] */</div><div class='add'>+	HCI_EV(HCI_EV_LINK_KEY_REQ, hci_link_key_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_link_key_req)),</div><div class='add'>+	/* [0x18 = HCI_EV_LINK_KEY_NOTIFY] */</div><div class='add'>+	HCI_EV(HCI_EV_LINK_KEY_NOTIFY, hci_link_key_notify_evt,</div><div class='add'>+	       sizeof(struct hci_ev_link_key_notify)),</div><div class='add'>+	/* [0x1c = HCI_EV_CLOCK_OFFSET] */</div><div class='add'>+	HCI_EV(HCI_EV_CLOCK_OFFSET, hci_clock_offset_evt,</div><div class='add'>+	       sizeof(struct hci_ev_clock_offset)),</div><div class='add'>+	/* [0x1d = HCI_EV_PKT_TYPE_CHANGE] */</div><div class='add'>+	HCI_EV(HCI_EV_PKT_TYPE_CHANGE, hci_pkt_type_change_evt,</div><div class='add'>+	       sizeof(struct hci_ev_pkt_type_change)),</div><div class='add'>+	/* [0x20 = HCI_EV_PSCAN_REP_MODE] */</div><div class='add'>+	HCI_EV(HCI_EV_PSCAN_REP_MODE, hci_pscan_rep_mode_evt,</div><div class='add'>+	       sizeof(struct hci_ev_pscan_rep_mode)),</div><div class='add'>+	/* [0x22 = HCI_EV_INQUIRY_RESULT_WITH_RSSI] */</div><div class='add'>+	HCI_EV_VL(HCI_EV_INQUIRY_RESULT_WITH_RSSI,</div><div class='add'>+		  hci_inquiry_result_with_rssi_evt,</div><div class='add'>+		  sizeof(struct hci_ev_inquiry_result_rssi),</div><div class='add'>+		  HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x23 = HCI_EV_REMOTE_EXT_FEATURES] */</div><div class='add'>+	HCI_EV(HCI_EV_REMOTE_EXT_FEATURES, hci_remote_ext_features_evt,</div><div class='add'>+	       sizeof(struct hci_ev_remote_ext_features)),</div><div class='add'>+	/* [0x2c = HCI_EV_SYNC_CONN_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_SYNC_CONN_COMPLETE, hci_sync_conn_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_sync_conn_complete)),</div><div class='add'>+	/* [0x2f = HCI_EV_EXTENDED_INQUIRY_RESULT] */</div><div class='add'>+	HCI_EV_VL(HCI_EV_EXTENDED_INQUIRY_RESULT,</div><div class='add'>+		  hci_extended_inquiry_result_evt,</div><div class='add'>+		  sizeof(struct hci_ev_ext_inquiry_result), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0x30 = HCI_EV_KEY_REFRESH_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_KEY_REFRESH_COMPLETE, hci_key_refresh_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_key_refresh_complete)),</div><div class='add'>+	/* [0x31 = HCI_EV_IO_CAPA_REQUEST] */</div><div class='add'>+	HCI_EV(HCI_EV_IO_CAPA_REQUEST, hci_io_capa_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_io_capa_request)),</div><div class='add'>+	/* [0x32 = HCI_EV_IO_CAPA_REPLY] */</div><div class='add'>+	HCI_EV(HCI_EV_IO_CAPA_REPLY, hci_io_capa_reply_evt,</div><div class='add'>+	       sizeof(struct hci_ev_io_capa_reply)),</div><div class='add'>+	/* [0x33 = HCI_EV_USER_CONFIRM_REQUEST] */</div><div class='add'>+	HCI_EV(HCI_EV_USER_CONFIRM_REQUEST, hci_user_confirm_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_user_confirm_req)),</div><div class='add'>+	/* [0x34 = HCI_EV_USER_PASSKEY_REQUEST] */</div><div class='add'>+	HCI_EV(HCI_EV_USER_PASSKEY_REQUEST, hci_user_passkey_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_user_passkey_req)),</div><div class='add'>+	/* [0x35 = HCI_EV_REMOTE_OOB_DATA_REQUEST] */</div><div class='add'>+	HCI_EV(HCI_EV_REMOTE_OOB_DATA_REQUEST, hci_remote_oob_data_request_evt,</div><div class='add'>+	       sizeof(struct hci_ev_remote_oob_data_request)),</div><div class='add'>+	/* [0x36 = HCI_EV_SIMPLE_PAIR_COMPLETE] */</div><div class='add'>+	HCI_EV(HCI_EV_SIMPLE_PAIR_COMPLETE, hci_simple_pair_complete_evt,</div><div class='add'>+	       sizeof(struct hci_ev_simple_pair_complete)),</div><div class='add'>+	/* [0x3b = HCI_EV_USER_PASSKEY_NOTIFY] */</div><div class='add'>+	HCI_EV(HCI_EV_USER_PASSKEY_NOTIFY, hci_user_passkey_notify_evt,</div><div class='add'>+	       sizeof(struct hci_ev_user_passkey_notify)),</div><div class='add'>+	/* [0x3c = HCI_EV_KEYPRESS_NOTIFY] */</div><div class='add'>+	HCI_EV(HCI_EV_KEYPRESS_NOTIFY, hci_keypress_notify_evt,</div><div class='add'>+	       sizeof(struct hci_ev_keypress_notify)),</div><div class='add'>+	/* [0x3d = HCI_EV_REMOTE_HOST_FEATURES] */</div><div class='add'>+	HCI_EV(HCI_EV_REMOTE_HOST_FEATURES, hci_remote_host_features_evt,</div><div class='add'>+	       sizeof(struct hci_ev_remote_host_features)),</div><div class='add'>+	/* [0x3e = HCI_EV_LE_META] */</div><div class='add'>+	HCI_EV_REQ_VL(HCI_EV_LE_META, hci_le_meta_evt,</div><div class='add'>+		      sizeof(struct hci_ev_le_meta), HCI_MAX_EVENT_SIZE),</div><div class='add'>+	/* [0xff = HCI_EV_VENDOR] */</div><div class='add'>+	HCI_EV_VL(HCI_EV_VENDOR, msft_vendor_evt, 0, HCI_MAX_EVENT_SIZE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk_buff *skb,</div><div class='add'>+			   u16 *opcode, u8 *status,</div><div class='add'>+			   hci_req_complete_t *req_complete,</div><div class='add'>+			   hci_req_complete_skb_t *req_complete_skb)</div><div class='add'>+{</div><div class='add'>+	const struct hci_ev *ev = &amp;hci_ev_table[event];</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (!ev-&gt;func)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; ev-&gt;min_len) {</div><div class='add'>+		bt_dev_err(hdev, "unexpected event 0x%2.2x length: %u &lt; %u",</div><div class='add'>+			   event, skb-&gt;len, ev-&gt;min_len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Just warn if the length is over max_len size it still be</div><div class='add'>+	 * possible to partially parse the event so leave to callback to</div><div class='add'>+	 * decide if that is acceptable.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len &gt; ev-&gt;max_len)</div><div class='add'>+		bt_dev_warn_ratelimited(hdev,</div><div class='add'>+					"unexpected event 0x%2.2x length: %u &gt; %u",</div><div class='add'>+					event, skb-&gt;len, ev-&gt;max_len);</div><div class='add'>+</div><div class='add'>+	data = hci_ev_skb_pull(hdev, skb, event, ev-&gt;min_len);</div><div class='add'>+	if (!data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;req)</div><div class='add'>+		ev-&gt;func_req(hdev, data, skb, opcode, status, req_complete,</div><div class='add'>+			     req_complete_skb);</div><div class='add'>+	else</div><div class='add'>+		ev-&gt;func(hdev, data, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hci_event_hdr *hdr = (void *) skb-&gt;data;</div><div class='add'>+	hci_req_complete_t req_complete = NULL;</div><div class='add'>+	hci_req_complete_skb_t req_complete_skb = NULL;</div><div class='add'>+	struct sk_buff *orig_skb = NULL;</div><div class='add'>+	u8 status = 0, event, req_evt = 0;</div><div class='add'>+	u16 opcode = HCI_OP_NOP;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*hdr)) {</div><div class='add'>+		bt_dev_err(hdev, "Malformed HCI Event");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	kfree_skb(hdev-&gt;recv_event);</div><div class='add'>+	hdev-&gt;recv_event = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	event = hdr-&gt;evt;</div><div class='add'>+	if (!event) {</div><div class='add'>+		bt_dev_warn(hdev, "Received unexpected HCI Event 0x%2.2x",</div><div class='add'>+			    event);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only match event if command OGF is not for LE */</div><div class='add'>+	if (hdev-&gt;req_skb &amp;&amp;</div><div class='add'>+	    hci_opcode_ogf(hci_skb_opcode(hdev-&gt;req_skb)) != 0x08 &amp;&amp;</div><div class='add'>+	    hci_skb_event(hdev-&gt;req_skb) == event) {</div><div class='add'>+		hci_req_cmd_complete(hdev, hci_skb_opcode(hdev-&gt;req_skb),</div><div class='add'>+				     status, &amp;req_complete, &amp;req_complete_skb);</div><div class='add'>+		req_evt = event;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If it looks like we might end up having to call</div><div class='add'>+	 * req_complete_skb, store a pristine copy of the skb since the</div><div class='add'>+	 * various handlers may modify the original one through</div><div class='add'>+	 * skb_pull() calls, etc.</div><div class='add'>+	 */</div><div class='add'>+	if (req_complete_skb || event == HCI_EV_CMD_STATUS ||</div><div class='add'>+	    event == HCI_EV_CMD_COMPLETE)</div><div class='add'>+		orig_skb = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, HCI_EVENT_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Store wake reason if we're suspended */</div><div class='add'>+	hci_store_wake_reason(hdev, event, skb);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "event 0x%2.2x", event);</div><div class='add'>+</div><div class='add'>+	hci_event_func(hdev, event, skb, &amp;opcode, &amp;status, &amp;req_complete,</div><div class='add'>+		       &amp;req_complete_skb);</div><div class='add'>+</div><div class='ctx'> 	if (req_complete) {</div><div class='ctx'> 		req_complete(hdev, status, opcode);</div><div class='ctx'> 	} else if (req_complete_skb) {</div><div class='hunk'>@@ -5911,6 +7783,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		req_complete_skb(hdev, status, opcode, orig_skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+done:</div><div class='ctx'> 	kfree_skb(orig_skb);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	hdev-&gt;stat.evt_rx++;</div><div class='head'>diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c<br/>deleted file mode 100644<br/>index e8c9ef1e1922..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_request.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_request.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2818 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   BlueZ - Bluetooth protocol stack for Linux</div><div class='del'>-</div><div class='del'>-   Copyright (C) 2014 Intel Corporation</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 as</div><div class='del'>-   published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</div><div class='del'>-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.</div><div class='del'>-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY</div><div class='del'>-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES</div><div class='del'>-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='del'>-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='del'>-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>-</div><div class='del'>-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,</div><div class='del'>-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS</div><div class='del'>-   SOFTWARE IS DISCLAIMED.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='del'>-#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='del'>-</div><div class='del'>-#include "smp.h"</div><div class='del'>-#include "hci_request.h"</div><div class='del'>-</div><div class='del'>-#define HCI_REQ_DONE	  0</div><div class='del'>-#define HCI_REQ_PEND	  1</div><div class='del'>-#define HCI_REQ_CANCELED  2</div><div class='del'>-</div><div class='del'>-void hci_req_init(struct hci_request *req, struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	skb_queue_head_init(&amp;req-&gt;cmd_q);</div><div class='del'>-	req-&gt;hdev = hdev;</div><div class='del'>-	req-&gt;err = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_purge(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	skb_queue_purge(&amp;req-&gt;cmd_q);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int req_run(struct hci_request *req, hci_req_complete_t complete,</div><div class='del'>-		   hci_req_complete_skb_t complete_skb)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	BT_DBG("length %u", skb_queue_len(&amp;req-&gt;cmd_q));</div><div class='del'>-</div><div class='del'>-	/* If an error occurred during request building, remove all HCI</div><div class='del'>-	 * commands queued on the HCI request queue.</div><div class='del'>-	 */</div><div class='del'>-	if (req-&gt;err) {</div><div class='del'>-		skb_queue_purge(&amp;req-&gt;cmd_q);</div><div class='del'>-		return req-&gt;err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do not allow empty requests */</div><div class='del'>-	if (skb_queue_empty(&amp;req-&gt;cmd_q))</div><div class='del'>-		return -ENODATA;</div><div class='del'>-</div><div class='del'>-	skb = skb_peek_tail(&amp;req-&gt;cmd_q);</div><div class='del'>-	if (complete) {</div><div class='del'>-		bt_cb(skb)-&gt;hci.req_complete = complete;</div><div class='del'>-	} else if (complete_skb) {</div><div class='del'>-		bt_cb(skb)-&gt;hci.req_complete_skb = complete_skb;</div><div class='del'>-		bt_cb(skb)-&gt;hci.req_flags |= HCI_REQ_SKB;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;hdev-&gt;cmd_q.lock, flags);</div><div class='del'>-	skb_queue_splice_tail(&amp;req-&gt;cmd_q, &amp;hdev-&gt;cmd_q);</div><div class='del'>-	spin_unlock_irqrestore(&amp;hdev-&gt;cmd_q.lock, flags);</div><div class='del'>-</div><div class='del'>-	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_req_run(struct hci_request *req, hci_req_complete_t complete)</div><div class='del'>-{</div><div class='del'>-	return req_run(req, complete, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_req_run_skb(struct hci_request *req, hci_req_complete_skb_t complete)</div><div class='del'>-{</div><div class='del'>-	return req_run(req, NULL, complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,</div><div class='del'>-				  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s result 0x%2.2x", hdev-&gt;name, result);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;req_status == HCI_REQ_PEND) {</div><div class='del'>-		hdev-&gt;req_result = result;</div><div class='del'>-		hdev-&gt;req_status = HCI_REQ_DONE;</div><div class='del'>-		if (skb)</div><div class='del'>-			hdev-&gt;req_skb = skb_get(skb);</div><div class='del'>-		wake_up_interruptible(&amp;hdev-&gt;req_wait_q);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_sync_cancel(struct hci_dev *hdev, int err)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s err 0x%2.2x", hdev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;req_status == HCI_REQ_PEND) {</div><div class='del'>-		hdev-&gt;req_result = err;</div><div class='del'>-		hdev-&gt;req_status = HCI_REQ_CANCELED;</div><div class='del'>-		wake_up_interruptible(&amp;hdev-&gt;req_wait_q);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='del'>-				  const void *param, u8 event, u32 timeout)</div><div class='del'>-{</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	hci_req_add_ev(&amp;req, opcode, plen, param, event);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;req_status = HCI_REQ_PEND;</div><div class='del'>-</div><div class='del'>-	err = hci_req_run_skb(&amp;req, hci_req_sync_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-</div><div class='del'>-	err = wait_event_interruptible_timeout(hdev-&gt;req_wait_q,</div><div class='del'>-			hdev-&gt;req_status != HCI_REQ_PEND, timeout);</div><div class='del'>-</div><div class='del'>-	if (err == -ERESTARTSYS)</div><div class='del'>-		return ERR_PTR(-EINTR);</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;req_status) {</div><div class='del'>-	case HCI_REQ_DONE:</div><div class='del'>-		err = -bt_to_errno(hdev-&gt;req_result);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_REQ_CANCELED:</div><div class='del'>-		err = -hdev-&gt;req_result;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdev-&gt;req_status = hdev-&gt;req_result = 0;</div><div class='del'>-	skb = hdev-&gt;req_skb;</div><div class='del'>-	hdev-&gt;req_skb = NULL;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s end: err %d", hdev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!skb)</div><div class='del'>-		return ERR_PTR(-ENODATA);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__hci_cmd_sync_ev);</div><div class='del'>-</div><div class='del'>-struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='del'>-			       const void *param, u32 timeout)</div><div class='del'>-{</div><div class='del'>-	return __hci_cmd_sync_ev(hdev, opcode, plen, param, 0, timeout);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__hci_cmd_sync);</div><div class='del'>-</div><div class='del'>-/* Execute request and wait for completion. */</div><div class='del'>-int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,</div><div class='del'>-						     unsigned long opt),</div><div class='del'>-		   unsigned long opt, u32 timeout, u8 *hci_status)</div><div class='del'>-{</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s start", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;req_status = HCI_REQ_PEND;</div><div class='del'>-</div><div class='del'>-	err = func(&amp;req, opt);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (hci_status)</div><div class='del'>-			*hci_status = HCI_ERROR_UNSPECIFIED;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hci_req_run_skb(&amp;req, hci_req_sync_complete);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		hdev-&gt;req_status = 0;</div><div class='del'>-</div><div class='del'>-		/* ENODATA means the HCI request command queue is empty.</div><div class='del'>-		 * This can happen when a request with conditionals doesn't</div><div class='del'>-		 * trigger any commands to be sent. This is normal behavior</div><div class='del'>-		 * and should not trigger an error return.</div><div class='del'>-		 */</div><div class='del'>-		if (err == -ENODATA) {</div><div class='del'>-			if (hci_status)</div><div class='del'>-				*hci_status = 0;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hci_status)</div><div class='del'>-			*hci_status = HCI_ERROR_UNSPECIFIED;</div><div class='del'>-</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = wait_event_interruptible_timeout(hdev-&gt;req_wait_q,</div><div class='del'>-			hdev-&gt;req_status != HCI_REQ_PEND, timeout);</div><div class='del'>-</div><div class='del'>-	if (err == -ERESTARTSYS)</div><div class='del'>-		return -EINTR;</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;req_status) {</div><div class='del'>-	case HCI_REQ_DONE:</div><div class='del'>-		err = -bt_to_errno(hdev-&gt;req_result);</div><div class='del'>-		if (hci_status)</div><div class='del'>-			*hci_status = hdev-&gt;req_result;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HCI_REQ_CANCELED:</div><div class='del'>-		err = -hdev-&gt;req_result;</div><div class='del'>-		if (hci_status)</div><div class='del'>-			*hci_status = HCI_ERROR_UNSPECIFIED;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		if (hci_status)</div><div class='del'>-			*hci_status = HCI_ERROR_UNSPECIFIED;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(hdev-&gt;req_skb);</div><div class='del'>-	hdev-&gt;req_skb = NULL;</div><div class='del'>-	hdev-&gt;req_status = hdev-&gt;req_result = 0;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s end: err %d", hdev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_req_sync(struct hci_dev *hdev, int (*req)(struct hci_request *req,</div><div class='del'>-						  unsigned long opt),</div><div class='del'>-		 unsigned long opt, u32 timeout, u8 *hci_status)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='del'>-		return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	/* Serialize all requests */</div><div class='del'>-	hci_req_sync_lock(hdev);</div><div class='del'>-	ret = __hci_req_sync(hdev, req, opt, timeout, hci_status);</div><div class='del'>-	hci_req_sync_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='del'>-				const void *param)</div><div class='del'>-{</div><div class='del'>-	int len = HCI_COMMAND_HDR_SIZE + plen;</div><div class='del'>-	struct hci_command_hdr *hdr;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = bt_skb_alloc(len, GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	hdr = skb_put(skb, HCI_COMMAND_HDR_SIZE);</div><div class='del'>-	hdr-&gt;opcode = cpu_to_le16(opcode);</div><div class='del'>-	hdr-&gt;plen   = plen;</div><div class='del'>-</div><div class='del'>-	if (plen)</div><div class='del'>-		skb_put_data(skb, param, plen);</div><div class='del'>-</div><div class='del'>-	BT_DBG("skb len %d", skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;</div><div class='del'>-	hci_skb_opcode(skb) = opcode;</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Queue a command to an asynchronous HCI request */</div><div class='del'>-void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,</div><div class='del'>-		    const void *param, u8 event)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s opcode 0x%4.4x plen %d", hdev-&gt;name, opcode, plen);</div><div class='del'>-</div><div class='del'>-	/* If an error occurred during request building, there is no point in</div><div class='del'>-	 * queueing the HCI command. We can simply return.</div><div class='del'>-	 */</div><div class='del'>-	if (req-&gt;err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = hci_prepare_cmd(hdev, opcode, plen, param);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		bt_dev_err(hdev, "no memory for command (opcode 0x%4.4x)",</div><div class='del'>-			   opcode);</div><div class='del'>-		req-&gt;err = -ENOMEM;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb_queue_empty(&amp;req-&gt;cmd_q))</div><div class='del'>-		bt_cb(skb)-&gt;hci.req_flags |= HCI_REQ_START;</div><div class='del'>-</div><div class='del'>-	bt_cb(skb)-&gt;hci.req_event = event;</div><div class='del'>-</div><div class='del'>-	skb_queue_tail(&amp;req-&gt;cmd_q, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,</div><div class='del'>-		 const void *param)</div><div class='del'>-{</div><div class='del'>-	hci_req_add_ev(req, opcode, plen, param, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_write_fast_connectable(struct hci_request *req, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_page_scan_activity acp;</div><div class='del'>-	u8 type;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		type = PAGE_SCAN_TYPE_INTERLACED;</div><div class='del'>-</div><div class='del'>-		/* 160 msec page scan interval */</div><div class='del'>-		acp.interval = cpu_to_le16(0x0100);</div><div class='del'>-	} else {</div><div class='del'>-		type = PAGE_SCAN_TYPE_STANDARD;	/* default */</div><div class='del'>-</div><div class='del'>-		/* default 1.28 sec page scan */</div><div class='del'>-		acp.interval = cpu_to_le16(0x0800);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	acp.window = cpu_to_le16(0x0012);</div><div class='del'>-</div><div class='del'>-	if (__cpu_to_le16(hdev-&gt;page_scan_interval) != acp.interval ||</div><div class='del'>-	    __cpu_to_le16(hdev-&gt;page_scan_window) != acp.window)</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,</div><div class='del'>-			    sizeof(acp), &amp;acp);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;page_scan_type != type)</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &amp;type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function controls the background scanning based on hdev-&gt;pend_le_conns</div><div class='del'>- * list. If there are pending LE connection we start the background scanning,</div><div class='del'>- * otherwise we stop it.</div><div class='del'>- *</div><div class='del'>- * This function requires the caller holds hdev-&gt;lock.</div><div class='del'>- */</div><div class='del'>-static void __hci_update_background_scan(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags) ||</div><div class='del'>-	    test_bit(HCI_INIT, &amp;hdev-&gt;flags) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_CONFIG) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* No point in doing scanning if LE support hasn't been enabled */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If discovery is active don't interfere with it */</div><div class='del'>-	if (hdev-&gt;discovery.state != DISCOVERY_STOPPED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Reset RSSI and UUID filters when starting background scanning</div><div class='del'>-	 * since these filters are meant for service discovery only.</div><div class='del'>-	 *</div><div class='del'>-	 * The Start Discovery and Start Service Discovery operations</div><div class='del'>-	 * ensure to set proper values for RSSI threshold and UUID</div><div class='del'>-	 * filter list. So it is safe to just reset them here.</div><div class='del'>-	 */</div><div class='del'>-	hci_discovery_filter_clear(hdev);</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;hdev-&gt;pend_le_conns) &amp;&amp;</div><div class='del'>-	    list_empty(&amp;hdev-&gt;pend_le_reports)) {</div><div class='del'>-		/* If there is no pending LE connections or devices</div><div class='del'>-		 * to be scanned for, we should stop the background</div><div class='del'>-		 * scanning.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* If controller is not scanning we are done. */</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		hci_req_add_le_scan_disable(req);</div><div class='del'>-</div><div class='del'>-		BT_DBG("%s stopping background scanning", hdev-&gt;name);</div><div class='del'>-	} else {</div><div class='del'>-		/* If there is at least one pending LE connection, we should</div><div class='del'>-		 * keep the background scan running.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* If controller is connecting, we should not start scanning</div><div class='del'>-		 * since some controllers are not able to scan and connect at</div><div class='del'>-		 * the same time.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_lookup_le_connect(hdev))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* If controller is currently scanning, we stop it to ensure we</div><div class='del'>-		 * don't miss any advertising (due to duplicates filter).</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-			hci_req_add_le_scan_disable(req);</div><div class='del'>-</div><div class='del'>-		hci_req_add_le_passive_scan(req);</div><div class='del'>-</div><div class='del'>-		BT_DBG("%s starting background scanning", hdev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_name(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_local_name cp;</div><div class='del'>-</div><div class='del'>-	memcpy(cp.name, hdev-&gt;dev_name, sizeof(cp.name));</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_LOCAL_NAME, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PNP_INFO_SVCLASS_ID		0x1200</div><div class='del'>-</div><div class='del'>-static u8 *create_uuid16_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *ptr = data, *uuids_start = NULL;</div><div class='del'>-	struct bt_uuid *uuid;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 4)</div><div class='del'>-		return ptr;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='del'>-		u16 uuid16;</div><div class='del'>-</div><div class='del'>-		if (uuid-&gt;size != 16)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		uuid16 = get_unaligned_le16(&amp;uuid-&gt;uuid[12]);</div><div class='del'>-		if (uuid16 &lt; 0x1100)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (uuid16 == PNP_INFO_SVCLASS_ID)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!uuids_start) {</div><div class='del'>-			uuids_start = ptr;</div><div class='del'>-			uuids_start[0] = 1;</div><div class='del'>-			uuids_start[1] = EIR_UUID16_ALL;</div><div class='del'>-			ptr += 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Stop if not enough space to put next UUID */</div><div class='del'>-		if ((ptr - data) + sizeof(u16) &gt; len) {</div><div class='del'>-			uuids_start[1] = EIR_UUID16_SOME;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*ptr++ = (uuid16 &amp; 0x00ff);</div><div class='del'>-		*ptr++ = (uuid16 &amp; 0xff00) &gt;&gt; 8;</div><div class='del'>-		uuids_start[0] += sizeof(uuid16);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 *create_uuid32_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *ptr = data, *uuids_start = NULL;</div><div class='del'>-	struct bt_uuid *uuid;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 6)</div><div class='del'>-		return ptr;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='del'>-		if (uuid-&gt;size != 32)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!uuids_start) {</div><div class='del'>-			uuids_start = ptr;</div><div class='del'>-			uuids_start[0] = 1;</div><div class='del'>-			uuids_start[1] = EIR_UUID32_ALL;</div><div class='del'>-			ptr += 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Stop if not enough space to put next UUID */</div><div class='del'>-		if ((ptr - data) + sizeof(u32) &gt; len) {</div><div class='del'>-			uuids_start[1] = EIR_UUID32_SOME;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(ptr, &amp;uuid-&gt;uuid[12], sizeof(u32));</div><div class='del'>-		ptr += sizeof(u32);</div><div class='del'>-		uuids_start[0] += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 *create_uuid128_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *ptr = data, *uuids_start = NULL;</div><div class='del'>-	struct bt_uuid *uuid;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 18)</div><div class='del'>-		return ptr;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list) {</div><div class='del'>-		if (uuid-&gt;size != 128)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!uuids_start) {</div><div class='del'>-			uuids_start = ptr;</div><div class='del'>-			uuids_start[0] = 1;</div><div class='del'>-			uuids_start[1] = EIR_UUID128_ALL;</div><div class='del'>-			ptr += 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Stop if not enough space to put next UUID */</div><div class='del'>-		if ((ptr - data) + 16 &gt; len) {</div><div class='del'>-			uuids_start[1] = EIR_UUID128_SOME;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(ptr, uuid-&gt;uuid, 16);</div><div class='del'>-		ptr += 16;</div><div class='del'>-		uuids_start[0] += 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void create_eir(struct hci_dev *hdev, u8 *data)</div><div class='del'>-{</div><div class='del'>-	u8 *ptr = data;</div><div class='del'>-	size_t name_len;</div><div class='del'>-</div><div class='del'>-	name_len = strlen(hdev-&gt;dev_name);</div><div class='del'>-</div><div class='del'>-	if (name_len &gt; 0) {</div><div class='del'>-		/* EIR Data type */</div><div class='del'>-		if (name_len &gt; 48) {</div><div class='del'>-			name_len = 48;</div><div class='del'>-			ptr[1] = EIR_NAME_SHORT;</div><div class='del'>-		} else</div><div class='del'>-			ptr[1] = EIR_NAME_COMPLETE;</div><div class='del'>-</div><div class='del'>-		/* EIR Data length */</div><div class='del'>-		ptr[0] = name_len + 1;</div><div class='del'>-</div><div class='del'>-		memcpy(ptr + 2, hdev-&gt;dev_name, name_len);</div><div class='del'>-</div><div class='del'>-		ptr += (name_len + 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;inq_tx_power != HCI_TX_POWER_INVALID) {</div><div class='del'>-		ptr[0] = 2;</div><div class='del'>-		ptr[1] = EIR_TX_POWER;</div><div class='del'>-		ptr[2] = (u8) hdev-&gt;inq_tx_power;</div><div class='del'>-</div><div class='del'>-		ptr += 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;devid_source &gt; 0) {</div><div class='del'>-		ptr[0] = 9;</div><div class='del'>-		ptr[1] = EIR_DEVICE_ID;</div><div class='del'>-</div><div class='del'>-		put_unaligned_le16(hdev-&gt;devid_source, ptr + 2);</div><div class='del'>-		put_unaligned_le16(hdev-&gt;devid_vendor, ptr + 4);</div><div class='del'>-		put_unaligned_le16(hdev-&gt;devid_product, ptr + 6);</div><div class='del'>-		put_unaligned_le16(hdev-&gt;devid_version, ptr + 8);</div><div class='del'>-</div><div class='del'>-		ptr += 10;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ptr = create_uuid16_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='del'>-	ptr = create_uuid32_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='del'>-	ptr = create_uuid128_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_eir(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_eir cp;</div><div class='del'>-</div><div class='del'>-	if (!hdev_is_powered(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!lmp_ext_inq_capable(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	create_eir(hdev, cp.data);</div><div class='del'>-</div><div class='del'>-	if (memcmp(cp.data, hdev-&gt;eir, sizeof(cp.data)) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memcpy(hdev-&gt;eir, cp.data, sizeof(cp.data));</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_add_le_scan_disable(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	if (use_ext_scan(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_scan_enable cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-		cp.enable = LE_SCAN_DISABLE;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_ENABLE, sizeof(cp),</div><div class='del'>-			    &amp;cp);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_scan_enable cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-		cp.enable = LE_SCAN_DISABLE;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void add_to_white_list(struct hci_request *req,</div><div class='del'>-			      struct hci_conn_params *params)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_le_add_to_white_list cp;</div><div class='del'>-</div><div class='del'>-	cp.bdaddr_type = params-&gt;addr_type;</div><div class='del'>-	bacpy(&amp;cp.bdaddr, &amp;params-&gt;addr);</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 update_white_list(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_conn_params *params;</div><div class='del'>-	struct bdaddr_list *b;</div><div class='del'>-	uint8_t white_list_entries = 0;</div><div class='del'>-</div><div class='del'>-	/* Go through the current white list programmed into the</div><div class='del'>-	 * controller one by one and check if that address is still</div><div class='del'>-	 * in the list of pending connections or list of devices to</div><div class='del'>-	 * report. If not present in either list, then queue the</div><div class='del'>-	 * command to remove it from the controller.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(b, &amp;hdev-&gt;le_white_list, list) {</div><div class='del'>-		/* If the device is neither in pend_le_conns nor</div><div class='del'>-		 * pend_le_reports then remove it from the whitelist.</div><div class='del'>-		 */</div><div class='del'>-		if (!hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns,</div><div class='del'>-					       &amp;b-&gt;bdaddr, b-&gt;bdaddr_type) &amp;&amp;</div><div class='del'>-		    !hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_reports,</div><div class='del'>-					       &amp;b-&gt;bdaddr, b-&gt;bdaddr_type)) {</div><div class='del'>-			struct hci_cp_le_del_from_white_list cp;</div><div class='del'>-</div><div class='del'>-			cp.bdaddr_type = b-&gt;bdaddr_type;</div><div class='del'>-			bacpy(&amp;cp.bdaddr, &amp;b-&gt;bdaddr);</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST,</div><div class='del'>-				    sizeof(cp), &amp;cp);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hci_find_irk_by_addr(hdev, &amp;b-&gt;bdaddr, b-&gt;bdaddr_type)) {</div><div class='del'>-			/* White list can not be used with RPAs */</div><div class='del'>-			return 0x00;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		white_list_entries++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Since all no longer valid white list entries have been</div><div class='del'>-	 * removed, walk through the list of pending connections</div><div class='del'>-	 * and ensure that any new device gets programmed into</div><div class='del'>-	 * the controller.</div><div class='del'>-	 *</div><div class='del'>-	 * If the list of the devices is larger than the list of</div><div class='del'>-	 * available white list entries in the controller, then</div><div class='del'>-	 * just abort and return filer policy value to not use the</div><div class='del'>-	 * white list.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(params, &amp;hdev-&gt;pend_le_conns, action) {</div><div class='del'>-		if (hci_bdaddr_list_lookup(&amp;hdev-&gt;le_white_list,</div><div class='del'>-					   &amp;params-&gt;addr, params-&gt;addr_type))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (white_list_entries &gt;= hdev-&gt;le_white_list_size) {</div><div class='del'>-			/* Select filter policy to accept all advertising */</div><div class='del'>-			return 0x00;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hci_find_irk_by_addr(hdev, &amp;params-&gt;addr,</div><div class='del'>-					 params-&gt;addr_type)) {</div><div class='del'>-			/* White list can not be used with RPAs */</div><div class='del'>-			return 0x00;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		white_list_entries++;</div><div class='del'>-		add_to_white_list(req, params);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* After adding all new pending connections, walk through</div><div class='del'>-	 * the list of pending reports and also add these to the</div><div class='del'>-	 * white list if there is still space.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(params, &amp;hdev-&gt;pend_le_reports, action) {</div><div class='del'>-		if (hci_bdaddr_list_lookup(&amp;hdev-&gt;le_white_list,</div><div class='del'>-					   &amp;params-&gt;addr, params-&gt;addr_type))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (white_list_entries &gt;= hdev-&gt;le_white_list_size) {</div><div class='del'>-			/* Select filter policy to accept all advertising */</div><div class='del'>-			return 0x00;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hci_find_irk_by_addr(hdev, &amp;params-&gt;addr,</div><div class='del'>-					 params-&gt;addr_type)) {</div><div class='del'>-			/* White list can not be used with RPAs */</div><div class='del'>-			return 0x00;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		white_list_entries++;</div><div class='del'>-		add_to_white_list(req, params);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Select filter policy to use white list */</div><div class='del'>-	return 0x01;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool scan_use_rpa(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	return hci_dev_test_flag(hdev, HCI_PRIVACY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hci_req_start_scan(struct hci_request *req, u8 type, u16 interval,</div><div class='del'>-			       u16 window, u8 own_addr_type, u8 filter_policy)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* Use ext scanning if set ext scan param and ext scan enable is</div><div class='del'>-	 * supported</div><div class='del'>-	 */</div><div class='del'>-	if (use_ext_scan(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_scan_params *ext_param_cp;</div><div class='del'>-		struct hci_cp_le_set_ext_scan_enable ext_enable_cp;</div><div class='del'>-		struct hci_cp_le_scan_phy_params *phy_params;</div><div class='del'>-		u8 data[sizeof(*ext_param_cp) + sizeof(*phy_params) * 2];</div><div class='del'>-		u32 plen;</div><div class='del'>-</div><div class='del'>-		ext_param_cp = (void *)data;</div><div class='del'>-		phy_params = (void *)ext_param_cp-&gt;data;</div><div class='del'>-</div><div class='del'>-		memset(ext_param_cp, 0, sizeof(*ext_param_cp));</div><div class='del'>-		ext_param_cp-&gt;own_addr_type = own_addr_type;</div><div class='del'>-		ext_param_cp-&gt;filter_policy = filter_policy;</div><div class='del'>-</div><div class='del'>-		plen = sizeof(*ext_param_cp);</div><div class='del'>-</div><div class='del'>-		if (scan_1m(hdev) || scan_2m(hdev)) {</div><div class='del'>-			ext_param_cp-&gt;scanning_phys |= LE_SCAN_PHY_1M;</div><div class='del'>-</div><div class='del'>-			memset(phy_params, 0, sizeof(*phy_params));</div><div class='del'>-			phy_params-&gt;type = type;</div><div class='del'>-			phy_params-&gt;interval = cpu_to_le16(interval);</div><div class='del'>-			phy_params-&gt;window = cpu_to_le16(window);</div><div class='del'>-</div><div class='del'>-			plen += sizeof(*phy_params);</div><div class='del'>-			phy_params++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (scan_coded(hdev)) {</div><div class='del'>-			ext_param_cp-&gt;scanning_phys |= LE_SCAN_PHY_CODED;</div><div class='del'>-</div><div class='del'>-			memset(phy_params, 0, sizeof(*phy_params));</div><div class='del'>-			phy_params-&gt;type = type;</div><div class='del'>-			phy_params-&gt;interval = cpu_to_le16(interval);</div><div class='del'>-			phy_params-&gt;window = cpu_to_le16(window);</div><div class='del'>-</div><div class='del'>-			plen += sizeof(*phy_params);</div><div class='del'>-			phy_params++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_PARAMS,</div><div class='del'>-			    plen, ext_param_cp);</div><div class='del'>-</div><div class='del'>-		memset(&amp;ext_enable_cp, 0, sizeof(ext_enable_cp));</div><div class='del'>-		ext_enable_cp.enable = LE_SCAN_ENABLE;</div><div class='del'>-		ext_enable_cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_ENABLE,</div><div class='del'>-			    sizeof(ext_enable_cp), &amp;ext_enable_cp);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_scan_param param_cp;</div><div class='del'>-		struct hci_cp_le_set_scan_enable enable_cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;param_cp, 0, sizeof(param_cp));</div><div class='del'>-		param_cp.type = type;</div><div class='del'>-		param_cp.interval = cpu_to_le16(interval);</div><div class='del'>-		param_cp.window = cpu_to_le16(window);</div><div class='del'>-		param_cp.own_address_type = own_addr_type;</div><div class='del'>-		param_cp.filter_policy = filter_policy;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_SCAN_PARAM, sizeof(param_cp),</div><div class='del'>-			    &amp;param_cp);</div><div class='del'>-</div><div class='del'>-		memset(&amp;enable_cp, 0, sizeof(enable_cp));</div><div class='del'>-		enable_cp.enable = LE_SCAN_ENABLE;</div><div class='del'>-		enable_cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(enable_cp),</div><div class='del'>-			    &amp;enable_cp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_add_le_passive_scan(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 own_addr_type;</div><div class='del'>-	u8 filter_policy;</div><div class='del'>-</div><div class='del'>-	/* Set require_privacy to false since no SCAN_REQ are send</div><div class='del'>-	 * during passive scanning. Not using an non-resolvable address</div><div class='del'>-	 * here is important so that peer devices using direct</div><div class='del'>-	 * advertising with our address will be correctly reported</div><div class='del'>-	 * by the controller.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_update_random_address(req, false, scan_use_rpa(hdev),</div><div class='del'>-				      &amp;own_addr_type))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Adding or removing entries from the white list must</div><div class='del'>-	 * happen before enabling scanning. The controller does</div><div class='del'>-	 * not allow white list modification while scanning.</div><div class='del'>-	 */</div><div class='del'>-	filter_policy = update_white_list(req);</div><div class='del'>-</div><div class='del'>-	/* When the controller is using random resolvable addresses and</div><div class='del'>-	 * with that having LE privacy enabled, then controllers with</div><div class='del'>-	 * Extended Scanner Filter Policies support can now enable support</div><div class='del'>-	 * for handling directed advertising.</div><div class='del'>-	 *</div><div class='del'>-	 * So instead of using filter polices 0x00 (no whitelist)</div><div class='del'>-	 * and 0x01 (whitelist enabled) use the new filter policies</div><div class='del'>-	 * 0x02 (no whitelist) and 0x03 (whitelist enabled).</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_PRIVACY) &amp;&amp;</div><div class='del'>-	    (hdev-&gt;le_features[0] &amp; HCI_LE_EXT_SCAN_POLICY))</div><div class='del'>-		filter_policy |= 0x02;</div><div class='del'>-</div><div class='del'>-	hci_req_start_scan(req, LE_SCAN_PASSIVE, hdev-&gt;le_scan_interval,</div><div class='del'>-			   hdev-&gt;le_scan_window, own_addr_type, filter_policy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 get_adv_instance_scan_rsp_len(struct hci_dev *hdev, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-	/* Ignore instance 0 */</div><div class='del'>-	if (instance == 0x00)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-	if (!adv_instance)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* TODO: Take into account the "appearance" and "local-name" flags here.</div><div class='del'>-	 * These are currently being ignored as they are not supported.</div><div class='del'>-	 */</div><div class='del'>-	return adv_instance-&gt;scan_rsp_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 get_cur_adv_instance_scan_rsp_len(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	u8 instance = hdev-&gt;cur_adv_instance;</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-	/* Ignore instance 0 */</div><div class='del'>-	if (instance == 0x00)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-	if (!adv_instance)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* TODO: Take into account the "appearance" and "local-name" flags here.</div><div class='del'>-	 * These are currently being ignored as they are not supported.</div><div class='del'>-	 */</div><div class='del'>-	return adv_instance-&gt;scan_rsp_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_disable_advertising(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	if (ext_adv_capable(req-&gt;hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_adv_enable cp;</div><div class='del'>-</div><div class='del'>-		cp.enable = 0x00;</div><div class='del'>-		/* Disable all sets since we only support one set at the moment */</div><div class='del'>-		cp.num_of_sets = 0x00;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_ENABLE, sizeof(cp), &amp;cp);</div><div class='del'>-	} else {</div><div class='del'>-		u8 enable = 0x00;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &amp;enable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 get_adv_instance_flags(struct hci_dev *hdev, u8 instance)</div><div class='del'>-{</div><div class='del'>-	u32 flags;</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-	if (instance == 0x00) {</div><div class='del'>-		/* Instance 0 always manages the "Tx Power" and "Flags"</div><div class='del'>-		 * fields</div><div class='del'>-		 */</div><div class='del'>-		flags = MGMT_ADV_FLAG_TX_POWER | MGMT_ADV_FLAG_MANAGED_FLAGS;</div><div class='del'>-</div><div class='del'>-		/* For instance 0, the HCI_ADVERTISING_CONNECTABLE setting</div><div class='del'>-		 * corresponds to the "connectable" instance flag.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_ADVERTISING_CONNECTABLE))</div><div class='del'>-			flags |= MGMT_ADV_FLAG_CONNECTABLE;</div><div class='del'>-</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE))</div><div class='del'>-			flags |= MGMT_ADV_FLAG_LIMITED_DISCOV;</div><div class='del'>-		else if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='del'>-			flags |= MGMT_ADV_FLAG_DISCOV;</div><div class='del'>-</div><div class='del'>-		return flags;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-</div><div class='del'>-	/* Return 0 when we got an invalid instance identifier. */</div><div class='del'>-	if (!adv_instance)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return adv_instance-&gt;flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool adv_use_rpa(struct hci_dev *hdev, uint32_t flags)</div><div class='del'>-{</div><div class='del'>-	/* If privacy is not enabled don't use RPA */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_PRIVACY))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* If basic privacy mode is enabled use RPA */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* If limited privacy mode is enabled don't use RPA if we're</div><div class='del'>-	 * both discoverable and bondable.</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; MGMT_ADV_FLAG_DISCOV) &amp;&amp;</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_BONDABLE))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* We're neither bondable nor discoverable in the limited</div><div class='del'>-	 * privacy mode, therefore use RPA.</div><div class='del'>-	 */</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)</div><div class='del'>-{</div><div class='del'>-	/* If there is no connection we are OK to advertise. */</div><div class='del'>-	if (hci_conn_num(hdev, LE_LINK) == 0)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* Check le_states if there is any connection in slave role. */</div><div class='del'>-	if (hdev-&gt;conn_hash.le_num_slave &gt; 0) {</div><div class='del'>-		/* Slave connection state and non connectable mode bit 20. */</div><div class='del'>-		if (!connectable &amp;&amp; !(hdev-&gt;le_states[2] &amp; 0x10))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		/* Slave connection state and connectable mode bit 38</div><div class='del'>-		 * and scannable bit 21.</div><div class='del'>-		 */</div><div class='del'>-		if (connectable &amp;&amp; (!(hdev-&gt;le_states[4] &amp; 0x40) ||</div><div class='del'>-				    !(hdev-&gt;le_states[2] &amp; 0x20)))</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check le_states if there is any connection in master role. */</div><div class='del'>-	if (hci_conn_num(hdev, LE_LINK) != hdev-&gt;conn_hash.le_num_slave) {</div><div class='del'>-		/* Master connection state and non connectable mode bit 18. */</div><div class='del'>-		if (!connectable &amp;&amp; !(hdev-&gt;le_states[2] &amp; 0x02))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		/* Master connection state and connectable mode bit 35 and</div><div class='del'>-		 * scannable 19.</div><div class='del'>-		 */</div><div class='del'>-		if (connectable &amp;&amp; (!(hdev-&gt;le_states[4] &amp; 0x08) ||</div><div class='del'>-				    !(hdev-&gt;le_states[2] &amp; 0x08)))</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_enable_advertising(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_le_set_adv_param cp;</div><div class='del'>-	u8 own_addr_type, enable = 0x01;</div><div class='del'>-	bool connectable;</div><div class='del'>-	u32 flags;</div><div class='del'>-</div><div class='del'>-	flags = get_adv_instance_flags(hdev, hdev-&gt;cur_adv_instance);</div><div class='del'>-</div><div class='del'>-	/* If the "connectable" instance flag was not set, then choose between</div><div class='del'>-	 * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.</div><div class='del'>-	 */</div><div class='del'>-	connectable = (flags &amp; MGMT_ADV_FLAG_CONNECTABLE) ||</div><div class='del'>-		      mgmt_get_connectable(hdev);</div><div class='del'>-</div><div class='del'>-	if (!is_advertising_allowed(hdev, connectable))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-		__hci_req_disable_advertising(req);</div><div class='del'>-</div><div class='del'>-	/* Clear the HCI_LE_ADV bit temporarily so that the</div><div class='del'>-	 * hci_update_random_address knows that it's safe to go ahead</div><div class='del'>-	 * and write a new random address. The flag will be set back on</div><div class='del'>-	 * as soon as the SET_ADV_ENABLE HCI command completes.</div><div class='del'>-	 */</div><div class='del'>-	hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='del'>-</div><div class='del'>-	/* Set require_privacy to true only when non-connectable</div><div class='del'>-	 * advertising is used. In that case it is fine to use a</div><div class='del'>-	 * non-resolvable private address.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_update_random_address(req, !connectable,</div><div class='del'>-				      adv_use_rpa(hdev, flags),</div><div class='del'>-				      &amp;own_addr_type) &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-	cp.min_interval = cpu_to_le16(hdev-&gt;le_adv_min_interval);</div><div class='del'>-	cp.max_interval = cpu_to_le16(hdev-&gt;le_adv_max_interval);</div><div class='del'>-</div><div class='del'>-	if (connectable)</div><div class='del'>-		cp.type = LE_ADV_IND;</div><div class='del'>-	else if (get_cur_adv_instance_scan_rsp_len(hdev))</div><div class='del'>-		cp.type = LE_ADV_SCAN_IND;</div><div class='del'>-	else</div><div class='del'>-		cp.type = LE_ADV_NONCONN_IND;</div><div class='del'>-</div><div class='del'>-	cp.own_address_type = own_addr_type;</div><div class='del'>-	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &amp;enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 append_local_name(struct hci_dev *hdev, u8 *ptr, u8 ad_len)</div><div class='del'>-{</div><div class='del'>-	size_t short_len;</div><div class='del'>-	size_t complete_len;</div><div class='del'>-</div><div class='del'>-	/* no space left for name (+ NULL + type + len) */</div><div class='del'>-	if ((HCI_MAX_AD_LENGTH - ad_len) &lt; HCI_MAX_SHORT_NAME_LENGTH + 3)</div><div class='del'>-		return ad_len;</div><div class='del'>-</div><div class='del'>-	/* use complete name if present and fits */</div><div class='del'>-	complete_len = strlen(hdev-&gt;dev_name);</div><div class='del'>-	if (complete_len &amp;&amp; complete_len &lt;= HCI_MAX_SHORT_NAME_LENGTH)</div><div class='del'>-		return eir_append_data(ptr, ad_len, EIR_NAME_COMPLETE,</div><div class='del'>-				       hdev-&gt;dev_name, complete_len + 1);</div><div class='del'>-</div><div class='del'>-	/* use short name if present */</div><div class='del'>-	short_len = strlen(hdev-&gt;short_name);</div><div class='del'>-	if (short_len)</div><div class='del'>-		return eir_append_data(ptr, ad_len, EIR_NAME_SHORT,</div><div class='del'>-				       hdev-&gt;short_name, short_len + 1);</div><div class='del'>-</div><div class='del'>-	/* use shortened full name if present, we already know that name</div><div class='del'>-	 * is longer then HCI_MAX_SHORT_NAME_LENGTH</div><div class='del'>-	 */</div><div class='del'>-	if (complete_len) {</div><div class='del'>-		u8 name[HCI_MAX_SHORT_NAME_LENGTH + 1];</div><div class='del'>-</div><div class='del'>-		memcpy(name, hdev-&gt;dev_name, HCI_MAX_SHORT_NAME_LENGTH);</div><div class='del'>-		name[HCI_MAX_SHORT_NAME_LENGTH] = '\0';</div><div class='del'>-</div><div class='del'>-		return eir_append_data(ptr, ad_len, EIR_NAME_SHORT, name,</div><div class='del'>-				       sizeof(name));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ad_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 append_appearance(struct hci_dev *hdev, u8 *ptr, u8 ad_len)</div><div class='del'>-{</div><div class='del'>-	return eir_append_le16(ptr, ad_len, EIR_APPEARANCE, hdev-&gt;appearance);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)</div><div class='del'>-{</div><div class='del'>-	u8 scan_rsp_len = 0;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;appearance) {</div><div class='del'>-		scan_rsp_len = append_appearance(hdev, ptr, scan_rsp_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return append_local_name(hdev, ptr, scan_rsp_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 create_instance_scan_rsp_data(struct hci_dev *hdev, u8 instance,</div><div class='del'>-					u8 *ptr)</div><div class='del'>-{</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-	u32 instance_flags;</div><div class='del'>-	u8 scan_rsp_len = 0;</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-	if (!adv_instance)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	instance_flags = adv_instance-&gt;flags;</div><div class='del'>-</div><div class='del'>-	if ((instance_flags &amp; MGMT_ADV_FLAG_APPEARANCE) &amp;&amp; hdev-&gt;appearance) {</div><div class='del'>-		scan_rsp_len = append_appearance(hdev, ptr, scan_rsp_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;ptr[scan_rsp_len], adv_instance-&gt;scan_rsp_data,</div><div class='del'>-	       adv_instance-&gt;scan_rsp_len);</div><div class='del'>-</div><div class='del'>-	scan_rsp_len += adv_instance-&gt;scan_rsp_len;</div><div class='del'>-</div><div class='del'>-	if (instance_flags &amp; MGMT_ADV_FLAG_LOCAL_NAME)</div><div class='del'>-		scan_rsp_len = append_local_name(hdev, ptr, scan_rsp_len);</div><div class='del'>-</div><div class='del'>-	return scan_rsp_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_scan_rsp_data(struct hci_request *req, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 len;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ext_adv_capable(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_scan_rsp_data cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		if (instance)</div><div class='del'>-			len = create_instance_scan_rsp_data(hdev, instance,</div><div class='del'>-							    cp.data);</div><div class='del'>-		else</div><div class='del'>-			len = create_default_scan_rsp_data(hdev, cp.data);</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;scan_rsp_data_len == len &amp;&amp;</div><div class='del'>-		    !memcmp(cp.data, hdev-&gt;scan_rsp_data, len))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memcpy(hdev-&gt;scan_rsp_data, cp.data, sizeof(cp.data));</div><div class='del'>-		hdev-&gt;scan_rsp_data_len = len;</div><div class='del'>-</div><div class='del'>-		cp.handle = 0;</div><div class='del'>-		cp.length = len;</div><div class='del'>-		cp.operation = LE_SET_ADV_DATA_OP_COMPLETE;</div><div class='del'>-		cp.frag_pref = LE_SET_ADV_DATA_NO_FRAG;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_RSP_DATA, sizeof(cp),</div><div class='del'>-			    &amp;cp);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_scan_rsp_data cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		if (instance)</div><div class='del'>-			len = create_instance_scan_rsp_data(hdev, instance,</div><div class='del'>-							    cp.data);</div><div class='del'>-		else</div><div class='del'>-			len = create_default_scan_rsp_data(hdev, cp.data);</div><div class='del'>-</div><div class='del'>-		if (hdev-&gt;scan_rsp_data_len == len &amp;&amp;</div><div class='del'>-		    !memcmp(cp.data, hdev-&gt;scan_rsp_data, len))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memcpy(hdev-&gt;scan_rsp_data, cp.data, sizeof(cp.data));</div><div class='del'>-		hdev-&gt;scan_rsp_data_len = len;</div><div class='del'>-</div><div class='del'>-		cp.length = len;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_SCAN_RSP_DATA, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)</div><div class='del'>-{</div><div class='del'>-	struct adv_info *adv_instance = NULL;</div><div class='del'>-	u8 ad_len = 0, flags = 0;</div><div class='del'>-	u32 instance_flags;</div><div class='del'>-</div><div class='del'>-	/* Return 0 when the current instance identifier is invalid. */</div><div class='del'>-	if (instance) {</div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-		if (!adv_instance)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	instance_flags = get_adv_instance_flags(hdev, instance);</div><div class='del'>-</div><div class='del'>-	/* The Add Advertising command allows userspace to set both the general</div><div class='del'>-	 * and limited discoverable flags.</div><div class='del'>-	 */</div><div class='del'>-	if (instance_flags &amp; MGMT_ADV_FLAG_DISCOV)</div><div class='del'>-		flags |= LE_AD_GENERAL;</div><div class='del'>-</div><div class='del'>-	if (instance_flags &amp; MGMT_ADV_FLAG_LIMITED_DISCOV)</div><div class='del'>-		flags |= LE_AD_LIMITED;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='del'>-		flags |= LE_AD_NO_BREDR;</div><div class='del'>-</div><div class='del'>-	if (flags || (instance_flags &amp; MGMT_ADV_FLAG_MANAGED_FLAGS)) {</div><div class='del'>-		/* If a discovery flag wasn't provided, simply use the global</div><div class='del'>-		 * settings.</div><div class='del'>-		 */</div><div class='del'>-		if (!flags)</div><div class='del'>-			flags |= mgmt_get_adv_discov_flags(hdev);</div><div class='del'>-</div><div class='del'>-		/* If flags would still be empty, then there is no need to</div><div class='del'>-		 * include the "Flags" AD field".</div><div class='del'>-		 */</div><div class='del'>-		if (flags) {</div><div class='del'>-			ptr[0] = 0x02;</div><div class='del'>-			ptr[1] = EIR_FLAGS;</div><div class='del'>-			ptr[2] = flags;</div><div class='del'>-</div><div class='del'>-			ad_len += 3;</div><div class='del'>-			ptr += 3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (adv_instance) {</div><div class='del'>-		memcpy(ptr, adv_instance-&gt;adv_data,</div><div class='del'>-		       adv_instance-&gt;adv_data_len);</div><div class='del'>-		ad_len += adv_instance-&gt;adv_data_len;</div><div class='del'>-		ptr += adv_instance-&gt;adv_data_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (instance_flags &amp; MGMT_ADV_FLAG_TX_POWER) {</div><div class='del'>-		s8 adv_tx_power;</div><div class='del'>-</div><div class='del'>-		if (ext_adv_capable(hdev)) {</div><div class='del'>-			if (adv_instance)</div><div class='del'>-				adv_tx_power = adv_instance-&gt;tx_power;</div><div class='del'>-			else</div><div class='del'>-				adv_tx_power = hdev-&gt;adv_tx_power;</div><div class='del'>-		} else {</div><div class='del'>-			adv_tx_power = hdev-&gt;adv_tx_power;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Provide Tx Power only if we can provide a valid value for it */</div><div class='del'>-		if (adv_tx_power != HCI_TX_POWER_INVALID) {</div><div class='del'>-			ptr[0] = 0x02;</div><div class='del'>-			ptr[1] = EIR_TX_POWER;</div><div class='del'>-			ptr[2] = (u8)adv_tx_power;</div><div class='del'>-</div><div class='del'>-			ad_len += 3;</div><div class='del'>-			ptr += 3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ad_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_adv_data(struct hci_request *req, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 len;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ext_adv_capable(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_adv_data cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		len = create_instance_adv_data(hdev, instance, cp.data);</div><div class='del'>-</div><div class='del'>-		/* There's nothing to do if the data hasn't changed */</div><div class='del'>-		if (hdev-&gt;adv_data_len == len &amp;&amp;</div><div class='del'>-		    memcmp(cp.data, hdev-&gt;adv_data, len) == 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memcpy(hdev-&gt;adv_data, cp.data, sizeof(cp.data));</div><div class='del'>-		hdev-&gt;adv_data_len = len;</div><div class='del'>-</div><div class='del'>-		cp.length = len;</div><div class='del'>-		cp.handle = 0;</div><div class='del'>-		cp.operation = LE_SET_ADV_DATA_OP_COMPLETE;</div><div class='del'>-		cp.frag_pref = LE_SET_ADV_DATA_NO_FRAG;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_DATA, sizeof(cp), &amp;cp);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_adv_data cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		len = create_instance_adv_data(hdev, instance, cp.data);</div><div class='del'>-</div><div class='del'>-		/* There's nothing to do if the data hasn't changed */</div><div class='del'>-		if (hdev-&gt;adv_data_len == len &amp;&amp;</div><div class='del'>-		    memcmp(cp.data, hdev-&gt;adv_data, len) == 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		memcpy(hdev-&gt;adv_data, cp.data, sizeof(cp.data));</div><div class='del'>-		hdev-&gt;adv_data_len = len;</div><div class='del'>-</div><div class='del'>-		cp.length = len;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_ADV_DATA, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_req_update_adv_data(struct hci_dev *hdev, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct hci_request req;</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	__hci_req_update_adv_data(&amp;req, instance);</div><div class='del'>-</div><div class='del'>-	return hci_req_run(&amp;req, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void adv_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s status %u", hdev-&gt;name, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_req_reenable_advertising(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hci_request req;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='del'>-	    list_empty(&amp;hdev-&gt;adv_instances))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;cur_adv_instance) {</div><div class='del'>-		__hci_req_schedule_adv_instance(&amp;req, hdev-&gt;cur_adv_instance,</div><div class='del'>-						true);</div><div class='del'>-	} else {</div><div class='del'>-		if (ext_adv_capable(hdev)) {</div><div class='del'>-			__hci_req_start_ext_adv(&amp;req, 0x00);</div><div class='del'>-		} else {</div><div class='del'>-			__hci_req_update_adv_data(&amp;req, 0x00);</div><div class='del'>-			__hci_req_update_scan_rsp_data(&amp;req, 0x00);</div><div class='del'>-			__hci_req_enable_advertising(&amp;req);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_run(&amp;req, adv_enable_complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void adv_timeout_expire(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    adv_instance_expire.work);</div><div class='del'>-</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	u8 instance;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;adv_instance_timeout = 0;</div><div class='del'>-</div><div class='del'>-	instance = hdev-&gt;cur_adv_instance;</div><div class='del'>-	if (instance == 0x00)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	hci_req_clear_adv_instance(hdev, NULL, &amp;req, instance, false);</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;hdev-&gt;adv_instances))</div><div class='del'>-		__hci_req_disable_advertising(&amp;req);</div><div class='del'>-</div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,</div><div class='del'>-			   bool use_rpa, struct adv_info *adv_instance,</div><div class='del'>-			   u8 *own_addr_type, bdaddr_t *rand_addr)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	bacpy(rand_addr, BDADDR_ANY);</div><div class='del'>-</div><div class='del'>-	/* If privacy is enabled use a resolvable private address. If</div><div class='del'>-	 * current RPA has expired then generate a new one.</div><div class='del'>-	 */</div><div class='del'>-	if (use_rpa) {</div><div class='del'>-		int to;</div><div class='del'>-</div><div class='del'>-		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-</div><div class='del'>-		if (adv_instance) {</div><div class='del'>-			if (!adv_instance-&gt;rpa_expired &amp;&amp;</div><div class='del'>-			    !bacmp(&amp;adv_instance-&gt;random_addr, &amp;hdev-&gt;rpa))</div><div class='del'>-				return 0;</div><div class='del'>-</div><div class='del'>-			adv_instance-&gt;rpa_expired = false;</div><div class='del'>-		} else {</div><div class='del'>-			if (!hci_dev_test_and_clear_flag(hdev, HCI_RPA_EXPIRED) &amp;&amp;</div><div class='del'>-			    !bacmp(&amp;hdev-&gt;random_addr, &amp;hdev-&gt;rpa))</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = smp_generate_rpa(hdev, hdev-&gt;irk, &amp;hdev-&gt;rpa);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			BT_ERR("%s failed to generate new RPA", hdev-&gt;name);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bacpy(rand_addr, &amp;hdev-&gt;rpa);</div><div class='del'>-</div><div class='del'>-		to = msecs_to_jiffies(hdev-&gt;rpa_timeout * 1000);</div><div class='del'>-		if (adv_instance)</div><div class='del'>-			queue_delayed_work(hdev-&gt;workqueue,</div><div class='del'>-					   &amp;adv_instance-&gt;rpa_expired_cb, to);</div><div class='del'>-		else</div><div class='del'>-			queue_delayed_work(hdev-&gt;workqueue,</div><div class='del'>-					   &amp;hdev-&gt;rpa_expired, to);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In case of required privacy without resolvable private address,</div><div class='del'>-	 * use an non-resolvable private address. This is useful for</div><div class='del'>-	 * non-connectable advertising.</div><div class='del'>-	 */</div><div class='del'>-	if (require_privacy) {</div><div class='del'>-		bdaddr_t nrpa;</div><div class='del'>-</div><div class='del'>-		while (true) {</div><div class='del'>-			/* The non-resolvable private address is generated</div><div class='del'>-			 * from random six bytes with the two most significant</div><div class='del'>-			 * bits cleared.</div><div class='del'>-			 */</div><div class='del'>-			get_random_bytes(&amp;nrpa, 6);</div><div class='del'>-			nrpa.b[5] &amp;= 0x3f;</div><div class='del'>-</div><div class='del'>-			/* The non-resolvable private address shall not be</div><div class='del'>-			 * equal to the public address.</div><div class='del'>-			 */</div><div class='del'>-			if (bacmp(&amp;hdev-&gt;bdaddr, &amp;nrpa))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-		bacpy(rand_addr, &amp;nrpa);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No privacy so use a public address. */</div><div class='del'>-	*own_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_clear_ext_adv_sets(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_CLEAR_ADV_SETS, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_le_set_ext_adv_params cp;</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	bool connectable;</div><div class='del'>-	u32 flags;</div><div class='del'>-	bdaddr_t random_addr;</div><div class='del'>-	u8 own_addr_type;</div><div class='del'>-	int err;</div><div class='del'>-	struct adv_info *adv_instance;</div><div class='del'>-	bool secondary_adv;</div><div class='del'>-	/* In ext adv set param interval is 3 octets */</div><div class='del'>-	const u8 adv_interval[3] = { 0x00, 0x08, 0x00 };</div><div class='del'>-</div><div class='del'>-	if (instance &gt; 0) {</div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-		if (!adv_instance)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		adv_instance = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	flags = get_adv_instance_flags(hdev, instance);</div><div class='del'>-</div><div class='del'>-	/* If the "connectable" instance flag was not set, then choose between</div><div class='del'>-	 * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.</div><div class='del'>-	 */</div><div class='del'>-	connectable = (flags &amp; MGMT_ADV_FLAG_CONNECTABLE) ||</div><div class='del'>-		      mgmt_get_connectable(hdev);</div><div class='del'>-</div><div class='del'>-	 if (!is_advertising_allowed(hdev, connectable))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	/* Set require_privacy to true only when non-connectable</div><div class='del'>-	 * advertising is used. In that case it is fine to use a</div><div class='del'>-	 * non-resolvable private address.</div><div class='del'>-	 */</div><div class='del'>-	err = hci_get_random_address(hdev, !connectable,</div><div class='del'>-				     adv_use_rpa(hdev, flags), adv_instance,</div><div class='del'>-				     &amp;own_addr_type, &amp;random_addr);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	memcpy(cp.min_interval, adv_interval, sizeof(cp.min_interval));</div><div class='del'>-	memcpy(cp.max_interval, adv_interval, sizeof(cp.max_interval));</div><div class='del'>-</div><div class='del'>-	secondary_adv = (flags &amp; MGMT_ADV_FLAG_SEC_MASK);</div><div class='del'>-</div><div class='del'>-	if (connectable) {</div><div class='del'>-		if (secondary_adv)</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_CONN_IND);</div><div class='del'>-		else</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_IND);</div><div class='del'>-	} else if (get_adv_instance_scan_rsp_len(hdev, instance)) {</div><div class='del'>-		if (secondary_adv)</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_SCAN_IND);</div><div class='del'>-		else</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_SCAN_IND);</div><div class='del'>-	} else {</div><div class='del'>-		if (secondary_adv)</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_NON_CONN_IND);</div><div class='del'>-		else</div><div class='del'>-			cp.evt_properties = cpu_to_le16(LE_LEGACY_NONCONN_IND);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cp.own_addr_type = own_addr_type;</div><div class='del'>-	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='del'>-	cp.tx_power = 127;</div><div class='del'>-	cp.handle = 0;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MGMT_ADV_FLAG_SEC_2M) {</div><div class='del'>-		cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='del'>-		cp.secondary_phy = HCI_ADV_PHY_2M;</div><div class='del'>-	} else if (flags &amp; MGMT_ADV_FLAG_SEC_CODED) {</div><div class='del'>-		cp.primary_phy = HCI_ADV_PHY_CODED;</div><div class='del'>-		cp.secondary_phy = HCI_ADV_PHY_CODED;</div><div class='del'>-	} else {</div><div class='del'>-		/* In all other cases use 1M */</div><div class='del'>-		cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='del'>-		cp.secondary_phy = HCI_ADV_PHY_1M;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_PARAMS, sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-	if (own_addr_type == ADDR_LE_DEV_RANDOM &amp;&amp;</div><div class='del'>-	    bacmp(&amp;random_addr, BDADDR_ANY)) {</div><div class='del'>-		struct hci_cp_le_set_adv_set_rand_addr cp;</div><div class='del'>-</div><div class='del'>-		/* Check if random address need to be updated */</div><div class='del'>-		if (adv_instance) {</div><div class='del'>-			if (!bacmp(&amp;random_addr, &amp;adv_instance-&gt;random_addr))</div><div class='del'>-				return 0;</div><div class='del'>-		} else {</div><div class='del'>-			if (!bacmp(&amp;random_addr, &amp;hdev-&gt;random_addr))</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		cp.handle = 0;</div><div class='del'>-		bacpy(&amp;cp.bdaddr, &amp;random_addr);</div><div class='del'>-</div><div class='del'>-		hci_req_add(req,</div><div class='del'>-			    HCI_OP_LE_SET_ADV_SET_RAND_ADDR,</div><div class='del'>-			    sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_enable_ext_advertising(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_cp_le_set_ext_adv_enable *cp;</div><div class='del'>-	struct hci_cp_ext_adv_set *adv_set;</div><div class='del'>-	u8 data[sizeof(*cp) + sizeof(*adv_set) * 1];</div><div class='del'>-</div><div class='del'>-	cp = (void *) data;</div><div class='del'>-	adv_set = (void *) cp-&gt;data;</div><div class='del'>-</div><div class='del'>-	memset(cp, 0, sizeof(*cp));</div><div class='del'>-</div><div class='del'>-	cp-&gt;enable = 0x01;</div><div class='del'>-	cp-&gt;num_of_sets = 0x01;</div><div class='del'>-</div><div class='del'>-	memset(adv_set, 0, sizeof(*adv_set));</div><div class='del'>-</div><div class='del'>-	adv_set-&gt;handle = 0;</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_ENABLE,</div><div class='del'>-		    sizeof(*cp) + sizeof(*adv_set) * cp-&gt;num_of_sets,</div><div class='del'>-		    data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __hci_req_start_ext_adv(struct hci_request *req, u8 instance)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-		__hci_req_disable_advertising(req);</div><div class='del'>-</div><div class='del'>-	err = __hci_req_setup_ext_adv_instance(req, instance);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	__hci_req_update_scan_rsp_data(req, instance);</div><div class='del'>-	__hci_req_enable_ext_advertising(req);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __hci_req_schedule_adv_instance(struct hci_request *req, u8 instance,</div><div class='del'>-				    bool force)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct adv_info *adv_instance = NULL;</div><div class='del'>-	u16 timeout;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||</div><div class='del'>-	    list_empty(&amp;hdev-&gt;adv_instances))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;adv_instance_timeout)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-	if (!adv_instance)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	/* A zero timeout means unlimited advertising. As long as there is</div><div class='del'>-	 * only one instance, duration should be ignored. We still set a timeout</div><div class='del'>-	 * in case further instances are being added later on.</div><div class='del'>-	 *</div><div class='del'>-	 * If the remaining lifetime of the instance is more than the duration</div><div class='del'>-	 * then the timeout corresponds to the duration, otherwise it will be</div><div class='del'>-	 * reduced to the remaining instance lifetime.</div><div class='del'>-	 */</div><div class='del'>-	if (adv_instance-&gt;timeout == 0 ||</div><div class='del'>-	    adv_instance-&gt;duration &lt;= adv_instance-&gt;remaining_time)</div><div class='del'>-		timeout = adv_instance-&gt;duration;</div><div class='del'>-	else</div><div class='del'>-		timeout = adv_instance-&gt;remaining_time;</div><div class='del'>-</div><div class='del'>-	/* The remaining time is being reduced unless the instance is being</div><div class='del'>-	 * advertised without time limit.</div><div class='del'>-	 */</div><div class='del'>-	if (adv_instance-&gt;timeout)</div><div class='del'>-		adv_instance-&gt;remaining_time =</div><div class='del'>-				adv_instance-&gt;remaining_time - timeout;</div><div class='del'>-</div><div class='del'>-	hdev-&gt;adv_instance_timeout = timeout;</div><div class='del'>-	queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='del'>-			   &amp;hdev-&gt;adv_instance_expire,</div><div class='del'>-			   msecs_to_jiffies(timeout * 1000));</div><div class='del'>-</div><div class='del'>-	/* If we're just re-scheduling the same instance again then do not</div><div class='del'>-	 * execute any HCI commands. This happens when a single instance is</div><div class='del'>-	 * being advertised.</div><div class='del'>-	 */</div><div class='del'>-	if (!force &amp;&amp; hdev-&gt;cur_adv_instance == instance &amp;&amp;</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hdev-&gt;cur_adv_instance = instance;</div><div class='del'>-	if (ext_adv_capable(hdev)) {</div><div class='del'>-		__hci_req_start_ext_adv(req, instance);</div><div class='del'>-	} else {</div><div class='del'>-		__hci_req_update_adv_data(req, instance);</div><div class='del'>-		__hci_req_update_scan_rsp_data(req, instance);</div><div class='del'>-		__hci_req_enable_advertising(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cancel_adv_timeout(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	if (hdev-&gt;adv_instance_timeout) {</div><div class='del'>-		hdev-&gt;adv_instance_timeout = 0;</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;adv_instance_expire);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* For a single instance:</div><div class='del'>- * - force == true: The instance will be removed even when its remaining</div><div class='del'>- *   lifetime is not zero.</div><div class='del'>- * - force == false: the instance will be deactivated but kept stored unless</div><div class='del'>- *   the remaining lifetime is zero.</div><div class='del'>- *</div><div class='del'>- * For instance == 0x00:</div><div class='del'>- * - force == true: All instances will be removed regardless of their timeout</div><div class='del'>- *   setting.</div><div class='del'>- * - force == false: Only instances that have a timeout will be removed.</div><div class='del'>- */</div><div class='del'>-void hci_req_clear_adv_instance(struct hci_dev *hdev, struct sock *sk,</div><div class='del'>-				struct hci_request *req, u8 instance,</div><div class='del'>-				bool force)</div><div class='del'>-{</div><div class='del'>-	struct adv_info *adv_instance, *n, *next_instance = NULL;</div><div class='del'>-	int err;</div><div class='del'>-	u8 rem_inst;</div><div class='del'>-</div><div class='del'>-	/* Cancel any timeout concerning the removed instance(s). */</div><div class='del'>-	if (!instance || hdev-&gt;cur_adv_instance == instance)</div><div class='del'>-		cancel_adv_timeout(hdev);</div><div class='del'>-</div><div class='del'>-	/* Get the next instance to advertise BEFORE we remove</div><div class='del'>-	 * the current one. This can be the same instance again</div><div class='del'>-	 * if there is only one instance.</div><div class='del'>-	 */</div><div class='del'>-	if (instance &amp;&amp; hdev-&gt;cur_adv_instance == instance)</div><div class='del'>-		next_instance = hci_get_next_instance(hdev, instance);</div><div class='del'>-</div><div class='del'>-	if (instance == 0x00) {</div><div class='del'>-		list_for_each_entry_safe(adv_instance, n, &amp;hdev-&gt;adv_instances,</div><div class='del'>-					 list) {</div><div class='del'>-			if (!(force || adv_instance-&gt;timeout))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			rem_inst = adv_instance-&gt;instance;</div><div class='del'>-			err = hci_remove_adv_instance(hdev, rem_inst);</div><div class='del'>-			if (!err)</div><div class='del'>-				mgmt_advertising_removed(sk, hdev, rem_inst);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='del'>-</div><div class='del'>-		if (force || (adv_instance &amp;&amp; adv_instance-&gt;timeout &amp;&amp;</div><div class='del'>-			      !adv_instance-&gt;remaining_time)) {</div><div class='del'>-			/* Don't advertise a removed instance. */</div><div class='del'>-			if (next_instance &amp;&amp;</div><div class='del'>-			    next_instance-&gt;instance == instance)</div><div class='del'>-				next_instance = NULL;</div><div class='del'>-</div><div class='del'>-			err = hci_remove_adv_instance(hdev, instance);</div><div class='del'>-			if (!err)</div><div class='del'>-				mgmt_advertising_removed(sk, hdev, instance);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!req || !hdev_is_powered(hdev) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (next_instance)</div><div class='del'>-		__hci_req_schedule_adv_instance(req, next_instance-&gt;instance,</div><div class='del'>-						false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_random_addr(struct hci_request *req, bdaddr_t *rpa)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* If we're advertising or initiating an LE connection we can't</div><div class='del'>-	 * go ahead and change the random address at this time. This is</div><div class='del'>-	 * because the eventual initiator address used for the</div><div class='del'>-	 * subsequently created connection will be undefined (some</div><div class='del'>-	 * controllers use the new address and others the one we had</div><div class='del'>-	 * when the operation started).</div><div class='del'>-	 *</div><div class='del'>-	 * In this kind of scenario skip the update and let the random</div><div class='del'>-	 * address be updated at the next cycle.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV) ||</div><div class='del'>-	    hci_lookup_le_connect(hdev)) {</div><div class='del'>-		BT_DBG("Deferring random address update");</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, rpa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_update_random_address(struct hci_request *req, bool require_privacy,</div><div class='del'>-			      bool use_rpa, u8 *own_addr_type)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* If privacy is enabled use a resolvable private address. If</div><div class='del'>-	 * current RPA has expired or there is something else than</div><div class='del'>-	 * the current RPA in use, then generate a new one.</div><div class='del'>-	 */</div><div class='del'>-	if (use_rpa) {</div><div class='del'>-		int to;</div><div class='del'>-</div><div class='del'>-		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-</div><div class='del'>-		if (!hci_dev_test_and_clear_flag(hdev, HCI_RPA_EXPIRED) &amp;&amp;</div><div class='del'>-		    !bacmp(&amp;hdev-&gt;random_addr, &amp;hdev-&gt;rpa))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		err = smp_generate_rpa(hdev, hdev-&gt;irk, &amp;hdev-&gt;rpa);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			bt_dev_err(hdev, "failed to generate new RPA");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_random_addr(req, &amp;hdev-&gt;rpa);</div><div class='del'>-</div><div class='del'>-		to = msecs_to_jiffies(hdev-&gt;rpa_timeout * 1000);</div><div class='del'>-		queue_delayed_work(hdev-&gt;workqueue, &amp;hdev-&gt;rpa_expired, to);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In case of required privacy without resolvable private address,</div><div class='del'>-	 * use an non-resolvable private address. This is useful for active</div><div class='del'>-	 * scanning and non-connectable advertising.</div><div class='del'>-	 */</div><div class='del'>-	if (require_privacy) {</div><div class='del'>-		bdaddr_t nrpa;</div><div class='del'>-</div><div class='del'>-		while (true) {</div><div class='del'>-			/* The non-resolvable private address is generated</div><div class='del'>-			 * from random six bytes with the two most significant</div><div class='del'>-			 * bits cleared.</div><div class='del'>-			 */</div><div class='del'>-			get_random_bytes(&amp;nrpa, 6);</div><div class='del'>-			nrpa.b[5] &amp;= 0x3f;</div><div class='del'>-</div><div class='del'>-			/* The non-resolvable private address shall not be</div><div class='del'>-			 * equal to the public address.</div><div class='del'>-			 */</div><div class='del'>-			if (bacmp(&amp;hdev-&gt;bdaddr, &amp;nrpa))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-		set_random_addr(req, &amp;nrpa);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If forcing static address is in use or there is no public</div><div class='del'>-	 * address use the static address as random address (but skip</div><div class='del'>-	 * the HCI command if the current random address is already the</div><div class='del'>-	 * static one.</div><div class='del'>-	 *</div><div class='del'>-	 * In case BR/EDR has been disabled on a dual-mode controller</div><div class='del'>-	 * and a static address has been configured, then use that</div><div class='del'>-	 * address instead of the public BR/EDR address.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ||</div><div class='del'>-	    !bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) ||</div><div class='del'>-	    (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED) &amp;&amp;</div><div class='del'>-	     bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY))) {</div><div class='del'>-		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='del'>-		if (bacmp(&amp;hdev-&gt;static_addr, &amp;hdev-&gt;random_addr))</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6,</div><div class='del'>-				    &amp;hdev-&gt;static_addr);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Neither privacy nor static address is being used so use a</div><div class='del'>-	 * public address.</div><div class='del'>-	 */</div><div class='del'>-	*own_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool disconnected_whitelist_entries(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct bdaddr_list *b;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(b, &amp;hdev-&gt;whitelist, list) {</div><div class='del'>-		struct hci_conn *conn;</div><div class='del'>-</div><div class='del'>-		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;b-&gt;bdaddr);</div><div class='del'>-		if (!conn)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		if (conn-&gt;state != BT_CONNECTED &amp;&amp; conn-&gt;state != BT_CONFIG)</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_scan(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 scan;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!hdev_is_powered(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (mgmt_powering_down(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_CONNECTABLE) ||</div><div class='del'>-	    disconnected_whitelist_entries(hdev))</div><div class='del'>-		scan = SCAN_PAGE;</div><div class='del'>-	else</div><div class='del'>-		scan = SCAN_DISABLED;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='del'>-		scan |= SCAN_INQUIRY;</div><div class='del'>-</div><div class='del'>-	if (test_bit(HCI_PSCAN, &amp;hdev-&gt;flags) == !!(scan &amp; SCAN_PAGE) &amp;&amp;</div><div class='del'>-	    test_bit(HCI_ISCAN, &amp;hdev-&gt;flags) == !!(scan &amp; SCAN_INQUIRY))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &amp;scan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int update_scan(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	hci_dev_lock(req-&gt;hdev);</div><div class='del'>-	__hci_req_update_scan(req);</div><div class='del'>-	hci_dev_unlock(req-&gt;hdev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void scan_update_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev, scan_update);</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, update_scan, 0, HCI_CMD_TIMEOUT, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int connectable_update(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_update_scan(req);</div><div class='del'>-</div><div class='del'>-	/* If BR/EDR is not enabled and we disable advertising as a</div><div class='del'>-	 * by-product of disabling connectable, we need to update the</div><div class='del'>-	 * advertising flags.</div><div class='del'>-	 */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='del'>-		__hci_req_update_adv_data(req, hdev-&gt;cur_adv_instance);</div><div class='del'>-</div><div class='del'>-	/* Update the advertising parameters if necessary */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||</div><div class='del'>-	    !list_empty(&amp;hdev-&gt;adv_instances)) {</div><div class='del'>-		if (ext_adv_capable(hdev))</div><div class='del'>-			__hci_req_start_ext_adv(req, hdev-&gt;cur_adv_instance);</div><div class='del'>-		else</div><div class='del'>-			__hci_req_enable_advertising(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__hci_update_background_scan(req);</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void connectable_update_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    connectable_update);</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, connectable_update, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	mgmt_set_connectable_complete(hdev, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 get_service_classes(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct bt_uuid *uuid;</div><div class='del'>-	u8 val = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list)</div><div class='del'>-		val |= uuid-&gt;svc_hint;</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_class(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 cod[3];</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (!hdev_is_powered(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cod[0] = hdev-&gt;minor_class;</div><div class='del'>-	cod[1] = hdev-&gt;major_class;</div><div class='del'>-	cod[2] = get_service_classes(hdev);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE))</div><div class='del'>-		cod[1] |= 0x20;</div><div class='del'>-</div><div class='del'>-	if (memcmp(cod, hdev-&gt;dev_class, 3) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_CLASS_OF_DEV, sizeof(cod), cod);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void write_iac(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_current_iac_lap cp;</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {</div><div class='del'>-		/* Limited discoverable mode */</div><div class='del'>-		cp.num_iac = min_t(u8, hdev-&gt;num_iac, 2);</div><div class='del'>-		cp.iac_lap[0] = 0x00;	/* LIAC */</div><div class='del'>-		cp.iac_lap[1] = 0x8b;</div><div class='del'>-		cp.iac_lap[2] = 0x9e;</div><div class='del'>-		cp.iac_lap[3] = 0x33;	/* GIAC */</div><div class='del'>-		cp.iac_lap[4] = 0x8b;</div><div class='del'>-		cp.iac_lap[5] = 0x9e;</div><div class='del'>-	} else {</div><div class='del'>-		/* General discoverable mode */</div><div class='del'>-		cp.num_iac = 1;</div><div class='del'>-		cp.iac_lap[0] = 0x33;	/* GIAC */</div><div class='del'>-		cp.iac_lap[1] = 0x8b;</div><div class='del'>-		cp.iac_lap[2] = 0x9e;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_CURRENT_IAC_LAP,</div><div class='del'>-		    (cp.num_iac * 3) + 1, &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int discoverable_update(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {</div><div class='del'>-		write_iac(req);</div><div class='del'>-		__hci_req_update_scan(req);</div><div class='del'>-		__hci_req_update_class(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Advertising instances don't use the global discoverable setting, so</div><div class='del'>-	 * only update AD if advertising was enabled using Set Advertising.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_ADVERTISING)) {</div><div class='del'>-		__hci_req_update_adv_data(req, 0x00);</div><div class='del'>-</div><div class='del'>-		/* Discoverable mode affects the local advertising</div><div class='del'>-		 * address in limited privacy mode.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY)) {</div><div class='del'>-			if (ext_adv_capable(hdev))</div><div class='del'>-				__hci_req_start_ext_adv(req, 0x00);</div><div class='del'>-			else</div><div class='del'>-				__hci_req_enable_advertising(req);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void discoverable_update_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    discoverable_update);</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, discoverable_update, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	mgmt_set_discoverable_complete(hdev, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,</div><div class='del'>-		      u8 reason)</div><div class='del'>-{</div><div class='del'>-	switch (conn-&gt;state) {</div><div class='del'>-	case BT_CONNECTED:</div><div class='del'>-	case BT_CONFIG:</div><div class='del'>-		if (conn-&gt;type == AMP_LINK) {</div><div class='del'>-			struct hci_cp_disconn_phy_link cp;</div><div class='del'>-</div><div class='del'>-			cp.phy_handle = HCI_PHY_HANDLE(conn-&gt;handle);</div><div class='del'>-			cp.reason = reason;</div><div class='del'>-			hci_req_add(req, HCI_OP_DISCONN_PHY_LINK, sizeof(cp),</div><div class='del'>-				    &amp;cp);</div><div class='del'>-		} else {</div><div class='del'>-			struct hci_cp_disconnect dc;</div><div class='del'>-</div><div class='del'>-			dc.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-			dc.reason = reason;</div><div class='del'>-			hci_req_add(req, HCI_OP_DISCONNECT, sizeof(dc), &amp;dc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		conn-&gt;state = BT_DISCONN;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_CONNECT:</div><div class='del'>-		if (conn-&gt;type == LE_LINK) {</div><div class='del'>-			if (test_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags))</div><div class='del'>-				break;</div><div class='del'>-			hci_req_add(req, HCI_OP_LE_CREATE_CONN_CANCEL,</div><div class='del'>-				    0, NULL);</div><div class='del'>-		} else if (conn-&gt;type == ACL_LINK) {</div><div class='del'>-			if (req-&gt;hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='del'>-				break;</div><div class='del'>-			hci_req_add(req, HCI_OP_CREATE_CONN_CANCEL,</div><div class='del'>-				    6, &amp;conn-&gt;dst);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case BT_CONNECT2:</div><div class='del'>-		if (conn-&gt;type == ACL_LINK) {</div><div class='del'>-			struct hci_cp_reject_conn_req rej;</div><div class='del'>-</div><div class='del'>-			bacpy(&amp;rej.bdaddr, &amp;conn-&gt;dst);</div><div class='del'>-			rej.reason = reason;</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_REJECT_CONN_REQ,</div><div class='del'>-				    sizeof(rej), &amp;rej);</div><div class='del'>-		} else if (conn-&gt;type == SCO_LINK || conn-&gt;type == ESCO_LINK) {</div><div class='del'>-			struct hci_cp_reject_sync_conn_req rej;</div><div class='del'>-</div><div class='del'>-			bacpy(&amp;rej.bdaddr, &amp;conn-&gt;dst);</div><div class='del'>-</div><div class='del'>-			/* SCO rejection has its own limited set of</div><div class='del'>-			 * allowed error values (0x0D-0x0F) which isn't</div><div class='del'>-			 * compatible with most values passed to this</div><div class='del'>-			 * function. To be safe hard-code one of the</div><div class='del'>-			 * values that's suitable for SCO.</div><div class='del'>-			 */</div><div class='del'>-			rej.reason = HCI_ERROR_REJ_LIMITED_RESOURCES;</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_REJECT_SYNC_CONN_REQ,</div><div class='del'>-				    sizeof(rej), &amp;rej);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		conn-&gt;state = BT_CLOSED;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void abort_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='del'>-{</div><div class='del'>-	if (status)</div><div class='del'>-		BT_DBG("Failed to abort connection: status 0x%2.2x", status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hci_abort_conn(struct hci_conn *conn, u8 reason)</div><div class='del'>-{</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, conn-&gt;hdev);</div><div class='del'>-</div><div class='del'>-	__hci_abort_conn(&amp;req, conn, reason);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, abort_conn_complete);</div><div class='del'>-	if (err &amp;&amp; err != -ENODATA) {</div><div class='del'>-		bt_dev_err(conn-&gt;hdev, "failed to run HCI request: err %d", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int update_bg_scan(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	hci_dev_lock(req-&gt;hdev);</div><div class='del'>-	__hci_update_background_scan(req);</div><div class='del'>-	hci_dev_unlock(req-&gt;hdev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bg_scan_update(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    bg_scan_update);</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-	u8 status;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hci_req_sync(hdev, update_bg_scan, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	if (!err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);</div><div class='del'>-	if (conn)</div><div class='del'>-		hci_le_conn_failed(conn, status);</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int le_scan_disable(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	hci_req_add_le_scan_disable(req);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bredr_inquiry(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	u8 length = opt;</div><div class='del'>-	const u8 giac[3] = { 0x33, 0x8b, 0x9e };</div><div class='del'>-	const u8 liac[3] = { 0x00, 0x8b, 0x9e };</div><div class='del'>-	struct hci_cp_inquiry cp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", req-&gt;hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(req-&gt;hdev);</div><div class='del'>-	hci_inquiry_cache_flush(req-&gt;hdev);</div><div class='del'>-	hci_dev_unlock(req-&gt;hdev);</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	if (req-&gt;hdev-&gt;discovery.limited)</div><div class='del'>-		memcpy(&amp;cp.lap, liac, sizeof(cp.lap));</div><div class='del'>-	else</div><div class='del'>-		memcpy(&amp;cp.lap, giac, sizeof(cp.lap));</div><div class='del'>-</div><div class='del'>-	cp.length = length;</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_INQUIRY, sizeof(cp), &amp;cp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void le_scan_disable_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    le_scan_disable.work);</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;hdev-&gt;le_scan_restart);</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, le_scan_disable, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	if (status) {</div><div class='del'>-		bt_dev_err(hdev, "failed to disable LE scan: status 0x%02x",</div><div class='del'>-			   status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdev-&gt;discovery.scan_start = 0;</div><div class='del'>-</div><div class='del'>-	/* If we were running LE only scan, change discovery state. If</div><div class='del'>-	 * we were running both LE and BR/EDR inquiry simultaneously,</div><div class='del'>-	 * and BR/EDR inquiry is already finished, stop discovery,</div><div class='del'>-	 * otherwise BR/EDR inquiry will stop discovery when finished.</div><div class='del'>-	 * If we will resolve remote device name, do not change</div><div class='del'>-	 * discovery state.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;discovery.type == DISCOV_TYPE_LE)</div><div class='del'>-		goto discov_stopped;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;discovery.type != DISCOV_TYPE_INTERLEAVED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		if (!test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags) &amp;&amp;</div><div class='del'>-		    hdev-&gt;discovery.state != DISCOVERY_RESOLVING)</div><div class='del'>-			goto discov_stopped;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, bredr_inquiry, DISCOV_INTERLEAVED_INQUIRY_LEN,</div><div class='del'>-		     HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	if (status) {</div><div class='del'>-		bt_dev_err(hdev, "inquiry failed: status 0x%02x", status);</div><div class='del'>-		goto discov_stopped;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-discov_stopped:</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int le_scan_restart(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-</div><div class='del'>-	/* If controller is not scanning we are done. */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hci_req_add_le_scan_disable(req);</div><div class='del'>-</div><div class='del'>-	if (use_ext_scan(hdev)) {</div><div class='del'>-		struct hci_cp_le_set_ext_scan_enable ext_enable_cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;ext_enable_cp, 0, sizeof(ext_enable_cp));</div><div class='del'>-		ext_enable_cp.enable = LE_SCAN_ENABLE;</div><div class='del'>-		ext_enable_cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_ENABLE,</div><div class='del'>-			    sizeof(ext_enable_cp), &amp;ext_enable_cp);</div><div class='del'>-	} else {</div><div class='del'>-		struct hci_cp_le_set_scan_enable cp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-		cp.enable = LE_SCAN_ENABLE;</div><div class='del'>-		cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='del'>-		hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void le_scan_restart_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    le_scan_restart.work);</div><div class='del'>-	unsigned long timeout, duration, scan_start, now;</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-	if (status) {</div><div class='del'>-		bt_dev_err(hdev, "failed to restart LE scan: status %d",</div><div class='del'>-			   status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &amp;hdev-&gt;quirks) ||</div><div class='del'>-	    !hdev-&gt;discovery.scan_start)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* When the scan was started, hdev-&gt;le_scan_disable has been queued</div><div class='del'>-	 * after duration from scan_start. During scan restart this job</div><div class='del'>-	 * has been canceled, and we need to queue it again after proper</div><div class='del'>-	 * timeout, to make sure that scan does not run indefinitely.</div><div class='del'>-	 */</div><div class='del'>-	duration = hdev-&gt;discovery.scan_duration;</div><div class='del'>-	scan_start = hdev-&gt;discovery.scan_start;</div><div class='del'>-	now = jiffies;</div><div class='del'>-	if (now - scan_start &lt;= duration) {</div><div class='del'>-		int elapsed;</div><div class='del'>-</div><div class='del'>-		if (now &gt;= scan_start)</div><div class='del'>-			elapsed = now - scan_start;</div><div class='del'>-		else</div><div class='del'>-			elapsed = ULONG_MAX - scan_start + now;</div><div class='del'>-</div><div class='del'>-		timeout = duration - elapsed;</div><div class='del'>-	} else {</div><div class='del'>-		timeout = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='del'>-			   &amp;hdev-&gt;le_scan_disable, timeout);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int active_scan(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	uint16_t interval = opt;</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 own_addr_type;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV)) {</div><div class='del'>-		hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-		/* Don't let discovery abort an outgoing connection attempt</div><div class='del'>-		 * that's using directed advertising.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_lookup_le_connect(hdev)) {</div><div class='del'>-			hci_dev_unlock(hdev);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cancel_adv_timeout(hdev);</div><div class='del'>-		hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-		__hci_req_disable_advertising(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If controller is scanning, it means the background scanning is</div><div class='del'>-	 * running. Thus, we should temporarily stop it in order to set the</div><div class='del'>-	 * discovery scanning parameters.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-		hci_req_add_le_scan_disable(req);</div><div class='del'>-</div><div class='del'>-	/* All active scans will be done with either a resolvable private</div><div class='del'>-	 * address (when privacy feature has been enabled) or non-resolvable</div><div class='del'>-	 * private address.</div><div class='del'>-	 */</div><div class='del'>-	err = hci_update_random_address(req, true, scan_use_rpa(hdev),</div><div class='del'>-					&amp;own_addr_type);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		own_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='del'>-</div><div class='del'>-	hci_req_start_scan(req, LE_SCAN_ACTIVE, interval, DISCOV_LE_SCAN_WIN,</div><div class='del'>-			   own_addr_type, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int interleaved_discov(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", req-&gt;hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	err = active_scan(req, opt);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return bredr_inquiry(req, DISCOV_BREDR_INQUIRY_LEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void start_discovery(struct hci_dev *hdev, u8 *status)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s type %u", hdev-&gt;name, hdev-&gt;discovery.type);</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;discovery.type) {</div><div class='del'>-	case DISCOV_TYPE_BREDR:</div><div class='del'>-		if (!hci_dev_test_flag(hdev, HCI_INQUIRY))</div><div class='del'>-			hci_req_sync(hdev, bredr_inquiry,</div><div class='del'>-				     DISCOV_BREDR_INQUIRY_LEN, HCI_CMD_TIMEOUT,</div><div class='del'>-				     status);</div><div class='del'>-		return;</div><div class='del'>-	case DISCOV_TYPE_INTERLEAVED:</div><div class='del'>-		/* When running simultaneous discovery, the LE scanning time</div><div class='del'>-		 * should occupy the whole discovery time sine BR/EDR inquiry</div><div class='del'>-		 * and LE scanning are scheduled by the controller.</div><div class='del'>-		 *</div><div class='del'>-		 * For interleaving discovery in comparison, BR/EDR inquiry</div><div class='del'>-		 * and LE scanning are done sequentially with separate</div><div class='del'>-		 * timeouts.</div><div class='del'>-		 */</div><div class='del'>-		if (test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY,</div><div class='del'>-			     &amp;hdev-&gt;quirks)) {</div><div class='del'>-			timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);</div><div class='del'>-			/* During simultaneous discovery, we double LE scan</div><div class='del'>-			 * interval. We must leave some time for the controller</div><div class='del'>-			 * to do BR/EDR inquiry.</div><div class='del'>-			 */</div><div class='del'>-			hci_req_sync(hdev, interleaved_discov,</div><div class='del'>-				     DISCOV_LE_SCAN_INT * 2, HCI_CMD_TIMEOUT,</div><div class='del'>-				     status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		timeout = msecs_to_jiffies(hdev-&gt;discov_interleaved_timeout);</div><div class='del'>-		hci_req_sync(hdev, active_scan, DISCOV_LE_SCAN_INT,</div><div class='del'>-			     HCI_CMD_TIMEOUT, status);</div><div class='del'>-		break;</div><div class='del'>-	case DISCOV_TYPE_LE:</div><div class='del'>-		timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);</div><div class='del'>-		hci_req_sync(hdev, active_scan, DISCOV_LE_SCAN_INT,</div><div class='del'>-			     HCI_CMD_TIMEOUT, status);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*status = HCI_ERROR_UNSPECIFIED;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s timeout %u ms", hdev-&gt;name, jiffies_to_msecs(timeout));</div><div class='del'>-</div><div class='del'>-	/* When service discovery is used and the controller has a</div><div class='del'>-	 * strict duplicate filter, it is important to remember the</div><div class='del'>-	 * start and duration of the scan. This is required for</div><div class='del'>-	 * restarting scanning during the discovery phase.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='del'>-		     hdev-&gt;discovery.result_filtering) {</div><div class='del'>-		hdev-&gt;discovery.scan_start = jiffies;</div><div class='del'>-		hdev-&gt;discovery.scan_duration = timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;le_scan_disable,</div><div class='del'>-			   timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool hci_req_stop_discovery(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct discovery_state *d = &amp;hdev-&gt;discovery;</div><div class='del'>-	struct hci_cp_remote_name_req_cancel cp;</div><div class='del'>-	struct inquiry_entry *e;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s state %u", hdev-&gt;name, hdev-&gt;discovery.state);</div><div class='del'>-</div><div class='del'>-	if (d-&gt;state == DISCOVERY_FINDING || d-&gt;state == DISCOVERY_STOPPING) {</div><div class='del'>-		if (test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags))</div><div class='del'>-			hci_req_add(req, HCI_OP_INQUIRY_CANCEL, 0, NULL);</div><div class='del'>-</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='del'>-			cancel_delayed_work(&amp;hdev-&gt;le_scan_disable);</div><div class='del'>-			hci_req_add_le_scan_disable(req);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = true;</div><div class='del'>-	} else {</div><div class='del'>-		/* Passive scanning */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='del'>-			hci_req_add_le_scan_disable(req);</div><div class='del'>-			ret = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No further actions needed for LE-only discovery */</div><div class='del'>-	if (d-&gt;type == DISCOV_TYPE_LE)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (d-&gt;state == DISCOVERY_RESOLVING || d-&gt;state == DISCOVERY_STOPPING) {</div><div class='del'>-		e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,</div><div class='del'>-						     NAME_PENDING);</div><div class='del'>-		if (!e)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bacpy(&amp;cp.bdaddr, &amp;e-&gt;data.bdaddr);</div><div class='del'>-		hci_req_add(req, HCI_OP_REMOTE_NAME_REQ_CANCEL, sizeof(cp),</div><div class='del'>-			    &amp;cp);</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stop_discovery(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	hci_dev_lock(req-&gt;hdev);</div><div class='del'>-	hci_req_stop_discovery(req);</div><div class='del'>-	hci_dev_unlock(req-&gt;hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void discov_update(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    discov_update);</div><div class='del'>-	u8 status = 0;</div><div class='del'>-</div><div class='del'>-	switch (hdev-&gt;discovery.state) {</div><div class='del'>-	case DISCOVERY_STARTING:</div><div class='del'>-		start_discovery(hdev, &amp;status);</div><div class='del'>-		mgmt_start_discovery_complete(hdev, status);</div><div class='del'>-		if (status)</div><div class='del'>-			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='del'>-		else</div><div class='del'>-			hci_discovery_set_state(hdev, DISCOVERY_FINDING);</div><div class='del'>-		break;</div><div class='del'>-	case DISCOVERY_STOPPING:</div><div class='del'>-		hci_req_sync(hdev, stop_discovery, 0, HCI_CMD_TIMEOUT, &amp;status);</div><div class='del'>-		mgmt_stop_discovery_complete(hdev, status);</div><div class='del'>-		if (!status)</div><div class='del'>-			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='del'>-		break;</div><div class='del'>-	case DISCOVERY_STOPPED:</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void discov_off(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='del'>-					    discov_off.work);</div><div class='del'>-</div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	/* When discoverable timeout triggers, then just make sure</div><div class='del'>-	 * the limited discoverable flag is cleared. Even in the case</div><div class='del'>-	 * of a timeout triggered from general discoverable, it is</div><div class='del'>-	 * safe to unconditionally clear the flag.</div><div class='del'>-	 */</div><div class='del'>-	hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='del'>-	hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);</div><div class='del'>-	hdev-&gt;discov_timeout = 0;</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	hci_req_sync(hdev, discoverable_update, 0, HCI_CMD_TIMEOUT, NULL);</div><div class='del'>-	mgmt_new_settings(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int powered_update_hci(struct hci_request *req, unsigned long opt)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	u8 link_sec;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &amp;&amp;</div><div class='del'>-	    !lmp_host_ssp_capable(hdev)) {</div><div class='del'>-		u8 mode = 0x01;</div><div class='del'>-</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_SSP_MODE, sizeof(mode), &amp;mode);</div><div class='del'>-</div><div class='del'>-		if (bredr_sc_enabled(hdev) &amp;&amp; !lmp_host_sc_capable(hdev)) {</div><div class='del'>-			u8 support = 0x01;</div><div class='del'>-</div><div class='del'>-			hci_req_add(req, HCI_OP_WRITE_SC_SUPPORT,</div><div class='del'>-				    sizeof(support), &amp;support);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED) &amp;&amp;</div><div class='del'>-	    lmp_bredr_capable(hdev)) {</div><div class='del'>-		struct hci_cp_write_le_host_supported cp;</div><div class='del'>-</div><div class='del'>-		cp.le = 0x01;</div><div class='del'>-		cp.simul = 0x00;</div><div class='del'>-</div><div class='del'>-		/* Check first if we already have the right</div><div class='del'>-		 * host state (host features set)</div><div class='del'>-		 */</div><div class='del'>-		if (cp.le != lmp_host_le_capable(hdev) ||</div><div class='del'>-		    cp.simul != lmp_host_le_br_capable(hdev))</div><div class='del'>-			hci_req_add(req, HCI_OP_WRITE_LE_HOST_SUPPORTED,</div><div class='del'>-				    sizeof(cp), &amp;cp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='del'>-		/* Make sure the controller has a good default for</div><div class='del'>-		 * advertising data. This also applies to the case</div><div class='del'>-		 * where BR/EDR was toggled during the AUTO_OFF phase.</div><div class='del'>-		 */</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||</div><div class='del'>-		    list_empty(&amp;hdev-&gt;adv_instances)) {</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			if (ext_adv_capable(hdev)) {</div><div class='del'>-				err = __hci_req_setup_ext_adv_instance(req,</div><div class='del'>-								       0x00);</div><div class='del'>-				if (!err)</div><div class='del'>-					__hci_req_update_scan_rsp_data(req,</div><div class='del'>-								       0x00);</div><div class='del'>-			} else {</div><div class='del'>-				err = 0;</div><div class='del'>-				__hci_req_update_adv_data(req, 0x00);</div><div class='del'>-				__hci_req_update_scan_rsp_data(req, 0x00);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (hci_dev_test_flag(hdev, HCI_ADVERTISING)) {</div><div class='del'>-				if (!ext_adv_capable(hdev))</div><div class='del'>-					__hci_req_enable_advertising(req);</div><div class='del'>-				else if (!err)</div><div class='del'>-					__hci_req_enable_ext_advertising(req);</div><div class='del'>-			}</div><div class='del'>-		} else if (!list_empty(&amp;hdev-&gt;adv_instances)) {</div><div class='del'>-			struct adv_info *adv_instance;</div><div class='del'>-</div><div class='del'>-			adv_instance = list_first_entry(&amp;hdev-&gt;adv_instances,</div><div class='del'>-							struct adv_info, list);</div><div class='del'>-			__hci_req_schedule_adv_instance(req,</div><div class='del'>-							adv_instance-&gt;instance,</div><div class='del'>-							true);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	link_sec = hci_dev_test_flag(hdev, HCI_LINK_SECURITY);</div><div class='del'>-	if (link_sec != test_bit(HCI_AUTH, &amp;hdev-&gt;flags))</div><div class='del'>-		hci_req_add(req, HCI_OP_WRITE_AUTH_ENABLE,</div><div class='del'>-			    sizeof(link_sec), &amp;link_sec);</div><div class='del'>-</div><div class='del'>-	if (lmp_bredr_capable(hdev)) {</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_FAST_CONNECTABLE))</div><div class='del'>-			__hci_req_write_fast_connectable(req, true);</div><div class='del'>-		else</div><div class='del'>-			__hci_req_write_fast_connectable(req, false);</div><div class='del'>-		__hci_req_update_scan(req);</div><div class='del'>-		__hci_req_update_class(req);</div><div class='del'>-		__hci_req_update_name(req);</div><div class='del'>-		__hci_req_update_eir(req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __hci_req_hci_power_on(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	/* Register the available SMP channels (BR/EDR and LE) only when</div><div class='del'>-	 * successfully powering on the controller. This late</div><div class='del'>-	 * registration is required so that LE SMP can clearly decide if</div><div class='del'>-	 * the public address or static address is used.</div><div class='del'>-	 */</div><div class='del'>-	smp_register(hdev);</div><div class='del'>-</div><div class='del'>-	return __hci_req_sync(hdev, powered_update_hci, 0, HCI_CMD_TIMEOUT,</div><div class='del'>-			      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_request_setup(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	INIT_WORK(&amp;hdev-&gt;discov_update, discov_update);</div><div class='del'>-	INIT_WORK(&amp;hdev-&gt;bg_scan_update, bg_scan_update);</div><div class='del'>-	INIT_WORK(&amp;hdev-&gt;scan_update, scan_update_work);</div><div class='del'>-	INIT_WORK(&amp;hdev-&gt;connectable_update, connectable_update_work);</div><div class='del'>-	INIT_WORK(&amp;hdev-&gt;discoverable_update, discoverable_update_work);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;hdev-&gt;discov_off, discov_off);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;hdev-&gt;le_scan_disable, le_scan_disable_work);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;hdev-&gt;le_scan_restart, le_scan_restart_work);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;hdev-&gt;adv_instance_expire, adv_timeout_expire);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_request_cancel_all(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	hci_req_sync_cancel(hdev, ENODEV);</div><div class='del'>-</div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;discov_update);</div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;bg_scan_update);</div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;scan_update);</div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;connectable_update);</div><div class='del'>-	cancel_work_sync(&amp;hdev-&gt;discoverable_update);</div><div class='del'>-	cancel_delayed_work_sync(&amp;hdev-&gt;discov_off);</div><div class='del'>-	cancel_delayed_work_sync(&amp;hdev-&gt;le_scan_disable);</div><div class='del'>-	cancel_delayed_work_sync(&amp;hdev-&gt;le_scan_restart);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;adv_instance_timeout) {</div><div class='del'>-		cancel_delayed_work_sync(&amp;hdev-&gt;adv_instance_expire);</div><div class='del'>-		hdev-&gt;adv_instance_timeout = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/net/bluetooth/hci_request.h b/net/bluetooth/hci_request.h<br/>deleted file mode 100644<br/>index 692cc8b13368..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_request.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_request.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,139 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   BlueZ - Bluetooth protocol stack for Linux</div><div class='del'>-   Copyright (C) 2014 Intel Corporation</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License version 2 as</div><div class='del'>-   published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</div><div class='del'>-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.</div><div class='del'>-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY</div><div class='del'>-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES</div><div class='del'>-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='del'>-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='del'>-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>-</div><div class='del'>-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,</div><div class='del'>-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS</div><div class='del'>-   SOFTWARE IS DISCLAIMED.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#define hci_req_sync_lock(hdev)   mutex_lock(&amp;hdev-&gt;req_lock)</div><div class='del'>-#define hci_req_sync_unlock(hdev) mutex_unlock(&amp;hdev-&gt;req_lock)</div><div class='del'>-</div><div class='del'>-struct hci_request {</div><div class='del'>-	struct hci_dev		*hdev;</div><div class='del'>-	struct sk_buff_head	cmd_q;</div><div class='del'>-</div><div class='del'>-	/* If something goes wrong when building the HCI request, the error</div><div class='del'>-	 * value is stored in this field.</div><div class='del'>-	 */</div><div class='del'>-	int			err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void hci_req_init(struct hci_request *req, struct hci_dev *hdev);</div><div class='del'>-void hci_req_purge(struct hci_request *req);</div><div class='del'>-int hci_req_run(struct hci_request *req, hci_req_complete_t complete);</div><div class='del'>-int hci_req_run_skb(struct hci_request *req, hci_req_complete_skb_t complete);</div><div class='del'>-void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,</div><div class='del'>-		 const void *param);</div><div class='del'>-void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,</div><div class='del'>-		    const void *param, u8 event);</div><div class='del'>-void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status,</div><div class='del'>-			  hci_req_complete_t *req_complete,</div><div class='del'>-			  hci_req_complete_skb_t *req_complete_skb);</div><div class='del'>-</div><div class='del'>-int hci_req_sync(struct hci_dev *hdev, int (*req)(struct hci_request *req,</div><div class='del'>-						  unsigned long opt),</div><div class='del'>-		 unsigned long opt, u32 timeout, u8 *hci_status);</div><div class='del'>-int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,</div><div class='del'>-						     unsigned long opt),</div><div class='del'>-		   unsigned long opt, u32 timeout, u8 *hci_status);</div><div class='del'>-void hci_req_sync_cancel(struct hci_dev *hdev, int err);</div><div class='del'>-</div><div class='del'>-struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='del'>-				const void *param);</div><div class='del'>-</div><div class='del'>-int __hci_req_hci_power_on(struct hci_dev *hdev);</div><div class='del'>-</div><div class='del'>-void __hci_req_write_fast_connectable(struct hci_request *req, bool enable);</div><div class='del'>-void __hci_req_update_name(struct hci_request *req);</div><div class='del'>-void __hci_req_update_eir(struct hci_request *req);</div><div class='del'>-</div><div class='del'>-void hci_req_add_le_scan_disable(struct hci_request *req);</div><div class='del'>-void hci_req_add_le_passive_scan(struct hci_request *req);</div><div class='del'>-</div><div class='del'>-void hci_req_reenable_advertising(struct hci_dev *hdev);</div><div class='del'>-void __hci_req_enable_advertising(struct hci_request *req);</div><div class='del'>-void __hci_req_disable_advertising(struct hci_request *req);</div><div class='del'>-void __hci_req_update_adv_data(struct hci_request *req, u8 instance);</div><div class='del'>-int hci_req_update_adv_data(struct hci_dev *hdev, u8 instance);</div><div class='del'>-void __hci_req_update_scan_rsp_data(struct hci_request *req, u8 instance);</div><div class='del'>-</div><div class='del'>-int __hci_req_schedule_adv_instance(struct hci_request *req, u8 instance,</div><div class='del'>-				    bool force);</div><div class='del'>-void hci_req_clear_adv_instance(struct hci_dev *hdev, struct sock *sk,</div><div class='del'>-				struct hci_request *req, u8 instance,</div><div class='del'>-				bool force);</div><div class='del'>-</div><div class='del'>-int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance);</div><div class='del'>-int __hci_req_start_ext_adv(struct hci_request *req, u8 instance);</div><div class='del'>-void __hci_req_enable_ext_advertising(struct hci_request *req);</div><div class='del'>-void __hci_req_clear_ext_adv_sets(struct hci_request *req);</div><div class='del'>-int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,</div><div class='del'>-			   bool use_rpa, struct adv_info *adv_instance,</div><div class='del'>-			   u8 *own_addr_type, bdaddr_t *rand_addr);</div><div class='del'>-</div><div class='del'>-void __hci_req_update_class(struct hci_request *req);</div><div class='del'>-</div><div class='del'>-/* Returns true if HCI commands were queued */</div><div class='del'>-bool hci_req_stop_discovery(struct hci_request *req);</div><div class='del'>-</div><div class='del'>-static inline void hci_req_update_scan(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;scan_update);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __hci_req_update_scan(struct hci_request *req);</div><div class='del'>-</div><div class='del'>-int hci_update_random_address(struct hci_request *req, bool require_privacy,</div><div class='del'>-			      bool use_rpa, u8 *own_addr_type);</div><div class='del'>-</div><div class='del'>-int hci_abort_conn(struct hci_conn *conn, u8 reason);</div><div class='del'>-void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,</div><div class='del'>-		      u8 reason);</div><div class='del'>-</div><div class='del'>-static inline void hci_update_background_scan(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;bg_scan_update);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hci_request_setup(struct hci_dev *hdev);</div><div class='del'>-void hci_request_cancel_all(struct hci_dev *hdev);</div><div class='del'>-</div><div class='del'>-u8 append_local_name(struct hci_dev *hdev, u8 *ptr, u8 ad_len);</div><div class='del'>-</div><div class='del'>-static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type,</div><div class='del'>-				  u8 *data, u8 data_len)</div><div class='del'>-{</div><div class='del'>-	eir[eir_len++] = sizeof(type) + data_len;</div><div class='del'>-	eir[eir_len++] = type;</div><div class='del'>-	memcpy(&amp;eir[eir_len], data, data_len);</div><div class='del'>-	eir_len += data_len;</div><div class='del'>-</div><div class='del'>-	return eir_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data)</div><div class='del'>-{</div><div class='del'>-	eir[eir_len++] = sizeof(type) + sizeof(data);</div><div class='del'>-	eir[eir_len++] = type;</div><div class='del'>-	put_unaligned_le16(data, &amp;eir[eir_len]);</div><div class='del'>-	eir_len += sizeof(data);</div><div class='del'>-</div><div class='del'>-	return eir_len;</div><div class='del'>-}</div><div class='head'>diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c<br/>index 1506e1632394..4e7bf63af9c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_sock.c</a></div><div class='hunk'>@@ -23,11 +23,11 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /* Bluetooth HCI sockets. */</div><div class='del'>-</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='hunk'>@@ -52,13 +52,25 @@ struct hci_pinfo {</div><div class='ctx'> 	struct bt_sock    bt;</div><div class='ctx'> 	struct hci_dev    *hdev;</div><div class='ctx'> 	struct hci_filter filter;</div><div class='del'>-	__u32             cmsg_mask;</div><div class='add'>+	__u8              cmsg_mask;</div><div class='ctx'> 	unsigned short    channel;</div><div class='ctx'> 	unsigned long     flags;</div><div class='ctx'> 	__u32             cookie;</div><div class='ctx'> 	char              comm[TASK_COMM_LEN];</div><div class='add'>+	__u16             mtu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct hci_dev *hci_hdev_from_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = hci_pi(sk)-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return ERR_PTR(-EBADFD);</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		return ERR_PTR(-EPIPE);</div><div class='add'>+	return hdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hci_sock_set_flag(struct sock *sk, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	set_bit(nr, &amp;hci_pi(sk)-&gt;flags);</div><div class='hunk'>@@ -89,7 +101,7 @@ static bool hci_sock_gen_cookie(struct sock *sk)</div><div class='ctx'> 	int id = hci_pi(sk)-&gt;cookie;</div><div class='ctx'> </div><div class='ctx'> 	if (!id) {</div><div class='del'>-		id = ida_simple_get(&amp;sock_cookie_ida, 1, 0, GFP_KERNEL);</div><div class='add'>+		id = ida_alloc_min(&amp;sock_cookie_ida, 1, GFP_KERNEL);</div><div class='ctx'> 		if (id &lt; 0)</div><div class='ctx'> 			id = 0xffffffff;</div><div class='ctx'> </div><div class='hunk'>@@ -106,8 +118,8 @@ static void hci_sock_free_cookie(struct sock *sk)</div><div class='ctx'> 	int id = hci_pi(sk)-&gt;cookie;</div><div class='ctx'> </div><div class='ctx'> 	if (id) {</div><div class='del'>-		hci_pi(sk)-&gt;cookie = 0xffffffff;</div><div class='del'>-		ida_simple_remove(&amp;sock_cookie_ida, id);</div><div class='add'>+		hci_pi(sk)-&gt;cookie = 0;</div><div class='add'>+		ida_free(&amp;sock_cookie_ida, id);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +223,8 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 			if (hci_skb_pkt_type(skb) != HCI_COMMAND_PKT &amp;&amp;</div><div class='ctx'> 			    hci_skb_pkt_type(skb) != HCI_EVENT_PKT &amp;&amp;</div><div class='ctx'> 			    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &amp;&amp;</div><div class='del'>-			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT)</div><div class='add'>+			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &amp;&amp;</div><div class='add'>+			    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (is_filtered_packet(sk, skb))</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -220,7 +233,9 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (hci_skb_pkt_type(skb) != HCI_EVENT_PKT &amp;&amp;</div><div class='ctx'> 			    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &amp;&amp;</div><div class='del'>-			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT)</div><div class='add'>+			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &amp;&amp;</div><div class='add'>+			    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT &amp;&amp;</div><div class='add'>+			    hci_skb_pkt_type(skb) != HCI_DRV_PKT)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Don't send frame to other channel types */</div><div class='hunk'>@@ -250,6 +265,53 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	kfree_skb(skb_copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hci_sock_copy_creds(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct scm_creds *creds;</div><div class='add'>+</div><div class='add'>+	if (!sk || WARN_ON(!skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	creds = &amp;bt_cb(skb)-&gt;creds;</div><div class='add'>+</div><div class='add'>+	/* Check if peer credentials is set */</div><div class='add'>+	if (!sk-&gt;sk_peer_pid) {</div><div class='add'>+		/* Check if parent peer credentials is set */</div><div class='add'>+		if (bt_sk(sk)-&gt;parent &amp;&amp; bt_sk(sk)-&gt;parent-&gt;sk_peer_pid)</div><div class='add'>+			sk = bt_sk(sk)-&gt;parent;</div><div class='add'>+		else</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if scm_creds already set */</div><div class='add'>+	if (creds-&gt;pid == pid_vnr(sk-&gt;sk_peer_pid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(creds, 0, sizeof(*creds));</div><div class='add'>+</div><div class='add'>+	creds-&gt;pid = pid_vnr(sk-&gt;sk_peer_pid);</div><div class='add'>+	if (sk-&gt;sk_peer_cred) {</div><div class='add'>+		creds-&gt;uid = sk-&gt;sk_peer_cred-&gt;uid;</div><div class='add'>+		creds-&gt;gid = sk-&gt;sk_peer_cred-&gt;gid;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *hci_skb_clone(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hci_sock_copy_creds(skb-&gt;sk, nskb);</div><div class='add'>+</div><div class='add'>+	return nskb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Send frame to sockets with specific channel */</div><div class='ctx'> static void __hci_send_to_channel(unsigned short channel, struct sk_buff *skb,</div><div class='ctx'> 				  int flag, struct sock *skip_sk)</div><div class='hunk'>@@ -275,7 +337,7 @@ static void __hci_send_to_channel(unsigned short channel, struct sk_buff *skb,</div><div class='ctx'> 		if (hci_pi(sk)-&gt;channel != channel)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+		nskb = hci_skb_clone(skb);</div><div class='ctx'> 		if (!nskb)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -324,6 +386,18 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 		else</div><div class='ctx'> 			opcode = cpu_to_le16(HCI_MON_SCO_TX_PKT);</div><div class='ctx'> 		break;</div><div class='add'>+	case HCI_ISODATA_PKT:</div><div class='add'>+		if (bt_cb(skb)-&gt;incoming)</div><div class='add'>+			opcode = cpu_to_le16(HCI_MON_ISO_RX_PKT);</div><div class='add'>+		else</div><div class='add'>+			opcode = cpu_to_le16(HCI_MON_ISO_TX_PKT);</div><div class='add'>+		break;</div><div class='add'>+	case HCI_DRV_PKT:</div><div class='add'>+		if (bt_cb(skb)-&gt;incoming)</div><div class='add'>+			opcode = cpu_to_le16(HCI_MON_DRV_RX_PKT);</div><div class='add'>+		else</div><div class='add'>+			opcode = cpu_to_le16(HCI_MON_DRV_TX_PKT);</div><div class='add'>+		break;</div><div class='ctx'> 	case HCI_DIAG_PKT:</div><div class='ctx'> 		opcode = cpu_to_le16(HCI_MON_VENDOR_DIAG);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -336,6 +410,8 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='ctx'> 	if (!skb_copy)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	hci_sock_copy_creds(skb-&gt;sk, skb_copy);</div><div class='add'>+</div><div class='ctx'> 	/* Put header before the data */</div><div class='ctx'> 	hdr = skb_push(skb_copy, HCI_MON_HDR_SIZE);</div><div class='ctx'> 	hdr-&gt;opcode = opcode;</div><div class='hunk'>@@ -416,10 +492,11 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		ni = skb_put(skb, HCI_MON_NEW_INDEX_SIZE);</div><div class='del'>-		ni-&gt;type = hdev-&gt;dev_type;</div><div class='add'>+		ni-&gt;type = 0x00; /* Old hdev-&gt;dev_type */</div><div class='ctx'> 		ni-&gt;bus = hdev-&gt;bus;</div><div class='ctx'> 		bacpy(&amp;ni-&gt;bdaddr, &amp;hdev-&gt;bdaddr);</div><div class='del'>-		memcpy(ni-&gt;name, hdev-&gt;name, 8);</div><div class='add'>+		memcpy_and_pad(ni-&gt;name, sizeof(ni-&gt;name), hdev-&gt;name,</div><div class='add'>+			       strnlen(hdev-&gt;name, sizeof(ni-&gt;name)), '\0');</div><div class='ctx'> </div><div class='ctx'> 		opcode = cpu_to_le16(HCI_MON_NEW_INDEX);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -435,8 +512,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)</div><div class='ctx'> 	case HCI_DEV_SETUP:</div><div class='ctx'> 		if (hdev-&gt;manufacturer == 0xffff)</div><div class='ctx'> 			return NULL;</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case HCI_DEV_UP:</div><div class='ctx'> 		skb = bt_skb_alloc(HCI_MON_INDEX_INFO_SIZE, GFP_ATOMIC);</div><div class='hunk'>@@ -512,10 +588,12 @@ static struct sk_buff *create_monitor_ctrl_open(struct sock *sk)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = bt_skb_alloc(14 + TASK_COMM_LEN , GFP_ATOMIC);</div><div class='add'>+	skb = bt_skb_alloc(14 + TASK_COMM_LEN, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	hci_sock_copy_creds(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	flags = hci_sock_test_flag(sk, HCI_SOCK_TRUSTED) ? 0x1 : 0x0;</div><div class='ctx'> </div><div class='ctx'> 	put_unaligned_le32(hci_pi(sk)-&gt;cookie, skb_put(skb, 4));</div><div class='hunk'>@@ -561,6 +639,8 @@ static struct sk_buff *create_monitor_ctrl_close(struct sock *sk)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	hci_sock_copy_creds(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	put_unaligned_le32(hci_pi(sk)-&gt;cookie, skb_put(skb, 4));</div><div class='ctx'> </div><div class='ctx'> 	__net_timestamp(skb);</div><div class='hunk'>@@ -587,6 +667,8 @@ static struct sk_buff *create_monitor_ctrl_command(struct sock *sk, u16 index,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	hci_sock_copy_creds(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	put_unaligned_le32(hci_pi(sk)-&gt;cookie, skb_put(skb, 4));</div><div class='ctx'> 	put_unaligned_le16(opcode, skb_put(skb, 2));</div><div class='ctx'> </div><div class='hunk'>@@ -619,6 +701,8 @@ send_monitor_note(struct sock *sk, const char *fmt, ...)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	hci_sock_copy_creds(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	va_start(args, fmt);</div><div class='ctx'> 	vsprintf(skb_put(skb, len), fmt, args);</div><div class='ctx'> 	*(u8 *)skb_put(skb, 1) = 0;</div><div class='hunk'>@@ -752,19 +836,13 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event)</div><div class='ctx'> 	if (event == HCI_DEV_UNREG) {</div><div class='ctx'> 		struct sock *sk;</div><div class='ctx'> </div><div class='del'>-		/* Detach sockets from device */</div><div class='add'>+		/* Wake up sockets using this dead device */</div><div class='ctx'> 		read_lock(&amp;hci_sk_list.lock);</div><div class='ctx'> 		sk_for_each(sk, &amp;hci_sk_list.head) {</div><div class='del'>-			bh_lock_sock_nested(sk);</div><div class='ctx'> 			if (hci_pi(sk)-&gt;hdev == hdev) {</div><div class='del'>-				hci_pi(sk)-&gt;hdev = NULL;</div><div class='ctx'> 				sk-&gt;sk_err = EPIPE;</div><div class='del'>-				sk-&gt;sk_state = BT_OPEN;</div><div class='ctx'> 				sk-&gt;sk_state_change(sk);</div><div class='del'>-</div><div class='del'>-				hci_dev_put(hdev);</div><div class='ctx'> 			}</div><div class='del'>-			bh_unlock_sock(sk);</div><div class='ctx'> 		}</div><div class='ctx'> 		read_unlock(&amp;hci_sk_list.lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -831,7 +909,7 @@ static int hci_sock_release(struct socket *sock)</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hdev = hci_pi(sk)-&gt;hdev;</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	switch (hci_pi(sk)-&gt;channel) {</div><div class='ctx'> 	case HCI_CHANNEL_MONITOR:</div><div class='hunk'>@@ -854,8 +932,10 @@ static int hci_sock_release(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> 	bt_sock_unlink(&amp;hci_sk_list, sk);</div><div class='ctx'> </div><div class='add'>+	hdev = hci_pi(sk)-&gt;hdev;</div><div class='ctx'> 	if (hdev) {</div><div class='del'>-		if (hci_pi(sk)-&gt;channel == HCI_CHANNEL_USER) {</div><div class='add'>+		if (hci_pi(sk)-&gt;channel == HCI_CHANNEL_USER &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='ctx'> 			/* When releasing a user channel exclusive access,</div><div class='ctx'> 			 * call hci_dev_do_close directly instead of calling</div><div class='ctx'> 			 * hci_dev_close to ensure the exclusive access will</div><div class='hunk'>@@ -864,6 +944,11 @@ static int hci_sock_release(struct socket *sock)</div><div class='ctx'> 			 * The checking of HCI_AUTO_OFF is not needed in this</div><div class='ctx'> 			 * case since it will have been cleared already when</div><div class='ctx'> 			 * opening the user channel.</div><div class='add'>+			 *</div><div class='add'>+			 * Make sure to also check that we haven't already</div><div class='add'>+			 * unregistered since all the cleanup will have already</div><div class='add'>+			 * been complete and hdev will get released when we put</div><div class='add'>+			 * below.</div><div class='ctx'> 			 */</div><div class='ctx'> 			hci_dev_do_close(hdev);</div><div class='ctx'> 			hci_dev_clear_flag(hdev, HCI_USER_CHANNEL);</div><div class='hunk'>@@ -875,15 +960,12 @@ static int hci_sock_release(struct socket *sock)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sock_orphan(sk);</div><div class='del'>-</div><div class='del'>-	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-	skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)</div><div class='add'>+static int hci_sock_reject_list_add(struct hci_dev *hdev, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	bdaddr_t bdaddr;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -893,14 +975,14 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	err = hci_bdaddr_list_add(&amp;hdev-&gt;blacklist, &amp;bdaddr, BDADDR_BREDR);</div><div class='add'>+	err = hci_bdaddr_list_add(&amp;hdev-&gt;reject_list, &amp;bdaddr, BDADDR_BREDR);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)</div><div class='add'>+static int hci_sock_reject_list_del(struct hci_dev *hdev, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	bdaddr_t bdaddr;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -910,7 +992,7 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	err = hci_bdaddr_list_del(&amp;hdev-&gt;blacklist, &amp;bdaddr, BDADDR_BREDR);</div><div class='add'>+	err = hci_bdaddr_list_del(&amp;hdev-&gt;reject_list, &amp;bdaddr, BDADDR_BREDR);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -921,10 +1003,10 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)</div><div class='ctx'> static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,</div><div class='ctx'> 				unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct hci_dev *hdev = hci_pi(sk)-&gt;hdev;</div><div class='add'>+	struct hci_dev *hdev = hci_hdev_from_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (!hdev)</div><div class='del'>-		return -EBADFD;</div><div class='add'>+	if (IS_ERR(hdev))</div><div class='add'>+		return PTR_ERR(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL))</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -932,9 +1014,6 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dev_type != HCI_PRIMARY)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case HCISETRAW:</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='hunk'>@@ -950,12 +1029,12 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,</div><div class='ctx'> 	case HCIBLOCKADDR:</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		return hci_sock_blacklist_add(hdev, (void __user *)arg);</div><div class='add'>+		return hci_sock_reject_list_add(hdev, (void __user *)arg);</div><div class='ctx'> </div><div class='ctx'> 	case HCIUNBLOCKADDR:</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		return hci_sock_blacklist_del(hdev, (void __user *)arg);</div><div class='add'>+		return hci_sock_reject_list_del(hdev, (void __user *)arg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='hunk'>@@ -970,6 +1049,34 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("cmd %x arg %lx", cmd, arg);</div><div class='ctx'> </div><div class='add'>+	/* Make sure the cmd is valid before doing anything */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case HCIGETDEVLIST:</div><div class='add'>+	case HCIGETDEVINFO:</div><div class='add'>+	case HCIGETCONNLIST:</div><div class='add'>+	case HCIDEVUP:</div><div class='add'>+	case HCIDEVDOWN:</div><div class='add'>+	case HCIDEVRESET:</div><div class='add'>+	case HCIDEVRESTAT:</div><div class='add'>+	case HCISETSCAN:</div><div class='add'>+	case HCISETAUTH:</div><div class='add'>+	case HCISETENCRYPT:</div><div class='add'>+	case HCISETPTYPE:</div><div class='add'>+	case HCISETLINKPOL:</div><div class='add'>+	case HCISETLINKMODE:</div><div class='add'>+	case HCISETACLMTU:</div><div class='add'>+	case HCISETSCOMTU:</div><div class='add'>+	case HCIINQUIRY:</div><div class='add'>+	case HCISETRAW:</div><div class='add'>+	case HCIGETCONNINFO:</div><div class='add'>+	case HCIGETAUTHINFO:</div><div class='add'>+	case HCIBLOCKADDR:</div><div class='add'>+	case HCIUNBLOCKADDR:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_pi(sk)-&gt;channel != HCI_CHANNEL_RAW) {</div><div class='hunk'>@@ -986,7 +1093,14 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 	if (hci_sock_gen_cookie(sk)) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-		if (capable(CAP_NET_ADMIN))</div><div class='add'>+		/* Perform careful checks before setting the HCI_SOCK_TRUSTED</div><div class='add'>+		 * flag. Make sure that not only the current task but also</div><div class='add'>+		 * the socket opener has the required capability, since</div><div class='add'>+		 * privileged programs can be tricked into making ioctl calls</div><div class='add'>+		 * on HCI sockets, and the socket should not be marked as</div><div class='add'>+		 * trusted simply because the ioctl caller is privileged.</div><div class='add'>+		 */</div><div class='add'>+		if (sk_capable(sk, CAP_NET_ADMIN))</div><div class='ctx'> 			hci_sock_set_flag(sk, HCI_SOCK_TRUSTED);</div><div class='ctx'> </div><div class='ctx'> 		/* Send event to monitor */</div><div class='hunk'>@@ -1055,7 +1169,23 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hci_sock_compat_ioctl(struct socket *sock, unsigned int cmd,</div><div class='add'>+				 unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case HCIDEVUP:</div><div class='add'>+	case HCIDEVDOWN:</div><div class='add'>+	case HCIDEVRESET:</div><div class='add'>+	case HCIDEVRESTAT:</div><div class='add'>+		return hci_sock_ioctl(sock, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_sock_ioctl(sock, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int hci_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='ctx'> 			 int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_hci haddr;</div><div class='hunk'>@@ -1078,6 +1208,18 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='add'>+	/* Allow detaching from dead device and attaching to alive device, if</div><div class='add'>+	 * the caller wants to re-bind (instead of close) this socket in</div><div class='add'>+	 * response to hci_sock_dev_event(HCI_DEV_UNREG) notification.</div><div class='add'>+	 */</div><div class='add'>+	hdev = hci_pi(sk)-&gt;hdev;</div><div class='add'>+	if (hdev &amp;&amp; hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='add'>+		hci_pi(sk)-&gt;hdev = NULL;</div><div class='add'>+		sk-&gt;sk_state = BT_OPEN;</div><div class='add'>+		hci_dev_put(hdev);</div><div class='add'>+	}</div><div class='add'>+	hdev = NULL;</div><div class='add'>+</div><div class='ctx'> 	if (sk-&gt;sk_state == BT_BOUND) {</div><div class='ctx'> 		err = -EALREADY;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -1105,7 +1247,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 		if (!hci_sock_gen_cookie(sk)) {</div><div class='ctx'> 			/* In the case when a cookie has already been assigned,</div><div class='ctx'> 			 * then there has been already an ioctl issued against</div><div class='del'>-			 * an unbound socket and with that triggerd an open</div><div class='add'>+			 * an unbound socket and with that triggered an open</div><div class='ctx'> 			 * notification. Send a close notification first to</div><div class='ctx'> 			 * allow the state transition to bounded.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1169,7 +1311,9 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		hci_dev_lock(hdev);</div><div class='ctx'> 		mgmt_index_removed(hdev);</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='ctx'> 		err = hci_dev_open(hdev-&gt;id);</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -1301,9 +1445,9 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 		if (hci_pi(sk)-&gt;channel == HCI_CHANNEL_CONTROL) {</div><div class='ctx'> 			if (!hci_sock_gen_cookie(sk)) {</div><div class='ctx'> 				/* In the case when a cookie has already been</div><div class='del'>-				 * assigned, this socket will transtion from</div><div class='add'>+				 * assigned, this socket will transition from</div><div class='ctx'> 				 * a raw socket into a control socket. To</div><div class='del'>-				 * allow for a clean transtion, send the</div><div class='add'>+				 * allow for a clean transition, send the</div><div class='ctx'> 				 * close notification first.</div><div class='ctx'> 				 */</div><div class='ctx'> 				skb = create_monitor_ctrl_close(sk);</div><div class='hunk'>@@ -1332,6 +1476,10 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Default MTU to HCI_MAX_FRAME_SIZE if not set */</div><div class='add'>+	if (!hci_pi(sk)-&gt;mtu)</div><div class='add'>+		hci_pi(sk)-&gt;mtu = HCI_MAX_FRAME_SIZE;</div><div class='add'>+</div><div class='ctx'> 	sk-&gt;sk_state = BT_BOUND;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -1354,9 +1502,9 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	hdev = hci_pi(sk)-&gt;hdev;</div><div class='del'>-	if (!hdev) {</div><div class='del'>-		err = -EBADFD;</div><div class='add'>+	hdev = hci_hdev_from_sock(sk);</div><div class='add'>+	if (IS_ERR(hdev)) {</div><div class='add'>+		err = PTR_ERR(hdev);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1373,7 +1521,7 @@ done:</div><div class='ctx'> static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 			  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u32 mask = hci_pi(sk)-&gt;cmsg_mask;</div><div class='add'>+	__u8 mask = hci_pi(sk)-&gt;cmsg_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; HCI_CMSG_DIR) {</div><div class='ctx'> 		int incoming = bt_cb(skb)-&gt;incoming;</div><div class='hunk'>@@ -1383,9 +1531,9 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; HCI_CMSG_TSTAMP) {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-		struct compat_timeval ctv;</div><div class='add'>+		struct old_timeval32 ctv;</div><div class='ctx'> #endif</div><div class='del'>-		struct timeval tv;</div><div class='add'>+		struct __kernel_old_timeval tv;</div><div class='ctx'> 		void *data;</div><div class='ctx'> 		int len;</div><div class='ctx'> </div><div class='hunk'>@@ -1410,7 +1558,7 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> static int hci_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			    size_t len, int flags)</div><div class='ctx'> {</div><div class='del'>-	int noblock = flags &amp; MSG_DONTWAIT;</div><div class='add'>+	struct scm_cookie scm;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int copied, err;</div><div class='hunk'>@@ -1427,7 +1575,7 @@ static int hci_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CLOSED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1455,18 +1603,22 @@ static int hci_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(&amp;scm, 0, sizeof(scm));</div><div class='add'>+	scm.creds = bt_cb(skb)-&gt;creds;</div><div class='add'>+</div><div class='ctx'> 	skb_free_datagram(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_TRUNC)</div><div class='ctx'> 		copied = skblen;</div><div class='ctx'> </div><div class='add'>+	scm_recv(sock, msg, &amp;scm, flags);</div><div class='add'>+</div><div class='ctx'> 	return err ? : copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hci_mgmt_cmd(struct hci_mgmt_chan *chan, struct sock *sk,</div><div class='del'>-			struct msghdr *msg, size_t msglen)</div><div class='add'>+			struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	void *buf;</div><div class='ctx'> 	u8 *cp;</div><div class='ctx'> 	struct mgmt_hdr *hdr;</div><div class='ctx'> 	u16 opcode, index, len;</div><div class='hunk'>@@ -1475,40 +1627,31 @@ static int hci_mgmt_cmd(struct hci_mgmt_chan *chan, struct sock *sk,</div><div class='ctx'> 	bool var_len, no_hdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("got %zu bytes", msglen);</div><div class='add'>+	BT_DBG("got %d bytes", skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	if (msglen &lt; sizeof(*hdr))</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*hdr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(msglen, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (memcpy_from_msg(buf, msg, msglen)) {</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = buf;</div><div class='add'>+	hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	opcode = __le16_to_cpu(hdr-&gt;opcode);</div><div class='ctx'> 	index = __le16_to_cpu(hdr-&gt;index);</div><div class='ctx'> 	len = __le16_to_cpu(hdr-&gt;len);</div><div class='ctx'> </div><div class='del'>-	if (len != msglen - sizeof(*hdr)) {</div><div class='add'>+	if (len != skb-&gt;len - sizeof(*hdr)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;channel == HCI_CHANNEL_CONTROL) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='add'>+		struct sk_buff *cmd;</div><div class='ctx'> </div><div class='ctx'> 		/* Send event to monitor */</div><div class='del'>-		skb = create_monitor_ctrl_command(sk, index, opcode, len,</div><div class='del'>-						  buf + sizeof(*hdr));</div><div class='del'>-		if (skb) {</div><div class='del'>-			hci_send_to_channel(HCI_CHANNEL_MONITOR, skb,</div><div class='add'>+		cmd = create_monitor_ctrl_command(sk, index, opcode, len,</div><div class='add'>+						  skb-&gt;data + sizeof(*hdr));</div><div class='add'>+		if (cmd) {</div><div class='add'>+			hci_send_to_channel(HCI_CHANNEL_MONITOR, cmd,</div><div class='ctx'> 					    HCI_SOCK_TRUSTED, NULL);</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			kfree_skb(cmd);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1553,11 +1696,13 @@ static int hci_mgmt_cmd(struct hci_mgmt_chan *chan, struct sock *sk,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	no_hdev = (handler-&gt;flags &amp; HCI_MGMT_NO_HDEV);</div><div class='del'>-	if (no_hdev != !hdev) {</div><div class='del'>-		err = mgmt_cmd_status(sk, index, opcode,</div><div class='del'>-				      MGMT_STATUS_INVALID_INDEX);</div><div class='del'>-		goto done;</div><div class='add'>+	if (!(handler-&gt;flags &amp; HCI_MGMT_HDEV_OPTIONAL)) {</div><div class='add'>+		no_hdev = (handler-&gt;flags &amp; HCI_MGMT_NO_HDEV);</div><div class='add'>+		if (no_hdev != !hdev) {</div><div class='add'>+			err = mgmt_cmd_status(sk, index, opcode,</div><div class='add'>+					      MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	var_len = (handler-&gt;flags &amp; HCI_MGMT_VAR_LEN);</div><div class='hunk'>@@ -1571,26 +1716,25 @@ static int hci_mgmt_cmd(struct hci_mgmt_chan *chan, struct sock *sk,</div><div class='ctx'> 	if (hdev &amp;&amp; chan-&gt;hdev_init)</div><div class='ctx'> 		chan-&gt;hdev_init(sk, hdev);</div><div class='ctx'> </div><div class='del'>-	cp = buf + sizeof(*hdr);</div><div class='add'>+	cp = skb-&gt;data + sizeof(*hdr);</div><div class='ctx'> </div><div class='ctx'> 	err = handler-&gt;func(sk, hdev, cp, len);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	err = msglen;</div><div class='add'>+	err = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (hdev)</div><div class='ctx'> 		hci_dev_put(hdev);</div><div class='ctx'> </div><div class='del'>-	kfree(buf);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_logging_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='add'>+static int hci_logging_frame(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			     unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_mon_hdr *hdr;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	u16 index;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1599,24 +1743,13 @@ static int hci_logging_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'> 	 * the priority byte, the ident length byte and at least one string</div><div class='ctx'> 	 * terminator NUL byte. Anything shorter are invalid packets.</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &lt; sizeof(*hdr) + 3)</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*hdr) + 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	skb = bt_skb_send_alloc(sk, len, msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (memcpy_from_msg(skb_put(skb, len), msg, len)) {</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	hdr = (void *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (__le16_to_cpu(hdr-&gt;len) != len - sizeof(*hdr)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='add'>+	if (__le16_to_cpu(hdr-&gt;len) != skb-&gt;len - sizeof(*hdr))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (__le16_to_cpu(hdr-&gt;opcode) == 0x0000) {</div><div class='ctx'> 		__u8 priority = skb-&gt;data[sizeof(*hdr)];</div><div class='hunk'>@@ -1635,25 +1768,20 @@ static int hci_logging_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'> 		 * The message follows the ident string (if present) and</div><div class='ctx'> 		 * must be NUL terminated. Otherwise it is not a valid packet.</div><div class='ctx'> 		 */</div><div class='del'>-		if (priority &gt; 7 || skb-&gt;data[len - 1] != 0x00 ||</div><div class='del'>-		    ident_len &gt; len - sizeof(*hdr) - 3 ||</div><div class='del'>-		    skb-&gt;data[sizeof(*hdr) + ident_len + 1] != 0x00) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='add'>+		if (priority &gt; 7 || skb-&gt;data[skb-&gt;len - 1] != 0x00 ||</div><div class='add'>+		    ident_len &gt; skb-&gt;len - sizeof(*hdr) - 3 ||</div><div class='add'>+		    skb-&gt;data[sizeof(*hdr) + ident_len + 1] != 0x00)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto drop;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index = __le16_to_cpu(hdr-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	if (index != MGMT_INDEX_NONE) {</div><div class='ctx'> 		hdev = hci_dev_get(index);</div><div class='del'>-		if (!hdev) {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='add'>+		if (!hdev)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hdev = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1661,13 +1789,11 @@ static int hci_logging_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'> 	hdr-&gt;opcode = cpu_to_le16(HCI_MON_USER_LOGGING);</div><div class='ctx'> </div><div class='ctx'> 	hci_send_to_channel(HCI_CHANNEL_MONITOR, skb, HCI_SOCK_TRUSTED, NULL);</div><div class='del'>-	err = len;</div><div class='add'>+	err = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev)</div><div class='ctx'> 		hci_dev_put(hdev);</div><div class='ctx'> </div><div class='del'>-drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1679,19 +1805,23 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err;</div><div class='add'>+	const unsigned int flags = msg-&gt;msg_flags;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sock %p sk %p", sock, sk);</div><div class='ctx'> </div><div class='del'>-	if (msg-&gt;msg_flags &amp; MSG_OOB)</div><div class='add'>+	if (flags &amp; MSG_OOB)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (msg-&gt;msg_flags &amp; ~(MSG_DONTWAIT|MSG_NOSIGNAL|MSG_ERRQUEUE|</div><div class='del'>-			       MSG_CMSG_COMPAT))</div><div class='add'>+	if (flags &amp; ~(MSG_DONTWAIT | MSG_NOSIGNAL | MSG_ERRQUEUE | MSG_CMSG_COMPAT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; 4 || len &gt; HCI_MAX_FRAME_SIZE)</div><div class='add'>+	if (len &lt; 4 || len &gt; hci_pi(sk)-&gt;mtu)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	switch (hci_pi(sk)-&gt;channel) {</div><div class='hunk'>@@ -1700,39 +1830,30 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HCI_CHANNEL_MONITOR:</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='del'>-		goto done;</div><div class='add'>+		goto drop;</div><div class='ctx'> 	case HCI_CHANNEL_LOGGING:</div><div class='del'>-		err = hci_logging_frame(sk, msg, len);</div><div class='del'>-		goto done;</div><div class='add'>+		err = hci_logging_frame(sk, skb, flags);</div><div class='add'>+		goto drop;</div><div class='ctx'> 	default:</div><div class='ctx'> 		mutex_lock(&amp;mgmt_chan_list_lock);</div><div class='ctx'> 		chan = __hci_mgmt_chan_find(hci_pi(sk)-&gt;channel);</div><div class='ctx'> 		if (chan)</div><div class='del'>-			err = hci_mgmt_cmd(chan, sk, msg, len);</div><div class='add'>+			err = hci_mgmt_cmd(chan, sk, skb);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;mgmt_chan_list_lock);</div><div class='del'>-		goto done;</div><div class='add'>+		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdev = hci_pi(sk)-&gt;hdev;</div><div class='del'>-	if (!hdev) {</div><div class='del'>-		err = -EBADFD;</div><div class='del'>-		goto done;</div><div class='add'>+	hdev = hci_hdev_from_sock(sk);</div><div class='add'>+	if (IS_ERR(hdev)) {</div><div class='add'>+		err = PTR_ERR(hdev);</div><div class='add'>+		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='ctx'> 		err = -ENETDOWN;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = bt_skb_send_alloc(sk, len, msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-	if (!skb)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	if (memcpy_from_msg(skb_put(skb, len), msg, len)) {</div><div class='del'>-		err = -EFAULT;</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1747,7 +1868,9 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (hci_skb_pkt_type(skb) != HCI_COMMAND_PKT &amp;&amp;</div><div class='ctx'> 		    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &amp;&amp;</div><div class='del'>-		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {</div><div class='add'>+		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &amp;&amp;</div><div class='add'>+		    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT &amp;&amp;</div><div class='add'>+		    hci_skb_pkt_type(skb) != HCI_DRV_PKT) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1791,7 +1914,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &amp;&amp;</div><div class='del'>-		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {</div><div class='add'>+		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &amp;&amp;</div><div class='add'>+		    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1811,8 +1935,8 @@ drop:</div><div class='ctx'> 	goto done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			       char __user *optval, unsigned int len)</div><div class='add'>+static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,</div><div class='add'>+				   sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_ufilter uf = { .opcode = 0 };</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -1820,9 +1944,6 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p, opt %d", sk, optname);</div><div class='ctx'> </div><div class='del'>-	if (level != SOL_HCI)</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_pi(sk)-&gt;channel != HCI_CHANNEL_RAW) {</div><div class='hunk'>@@ -1832,10 +1953,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case HCI_DATA_DIR:</div><div class='del'>-		if (get_user(opt, (int __user *)optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt)</div><div class='ctx'> 			hci_pi(sk)-&gt;cmsg_mask |= HCI_CMSG_DIR;</div><div class='hunk'>@@ -1844,10 +1964,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCI_TIME_STAMP:</div><div class='del'>-		if (get_user(opt, (int __user *)optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt)</div><div class='ctx'> 			hci_pi(sk)-&gt;cmsg_mask |= HCI_CMSG_TSTAMP;</div><div class='hunk'>@@ -1865,11 +1984,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			uf.event_mask[1] = *((u32 *) f-&gt;event_mask + 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(uf));</div><div class='del'>-		if (copy_from_user(&amp;uf, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;uf, sizeof(uf), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (!capable(CAP_NET_RAW)) {</div><div class='ctx'> 			uf.type_mask &amp;= hci_sec_filter.type_mask;</div><div class='hunk'>@@ -1897,18 +2014,63 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hci_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			       char __user *optval, int __user *optlen)</div><div class='add'>+static int hci_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='del'>-	struct hci_ufilter uf;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int len, opt, err = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 opt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p, opt %d", sk, optname);</div><div class='ctx'> </div><div class='del'>-	if (level != SOL_HCI)</div><div class='add'>+	if (level == SOL_HCI)</div><div class='add'>+		return hci_sock_setsockopt_old(sock, level, optname, optval,</div><div class='add'>+					       optlen);</div><div class='add'>+</div><div class='add'>+	if (level != SOL_BLUETOOTH)</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> </div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case BT_SNDMTU:</div><div class='add'>+	case BT_RCVMTU:</div><div class='add'>+		switch (hci_pi(sk)-&gt;channel) {</div><div class='add'>+		/* Don't allow changing MTU for channels that are meant for HCI</div><div class='add'>+		 * traffic only.</div><div class='add'>+		 */</div><div class='add'>+		case HCI_CHANNEL_RAW:</div><div class='add'>+		case HCI_CHANNEL_USER:</div><div class='add'>+			err = -ENOPROTOOPT;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		hci_pi(sk)-&gt;mtu = opt;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -ENOPROTOOPT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_sock_getsockopt_old(struct socket *sock, int level, int optname,</div><div class='add'>+				   char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct hci_ufilter uf;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int len, opt, err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p, opt %d", sk, optname);</div><div class='add'>+</div><div class='ctx'> 	if (get_user(len, optlen))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1966,6 +2128,46 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hci_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p, opt %d", sk, optname);</div><div class='add'>+</div><div class='add'>+	if (level == SOL_HCI)</div><div class='add'>+		return hci_sock_getsockopt_old(sock, level, optname, optval,</div><div class='add'>+					       optlen);</div><div class='add'>+</div><div class='add'>+	if (level != SOL_BLUETOOTH)</div><div class='add'>+		return -ENOPROTOOPT;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case BT_SNDMTU:</div><div class='add'>+	case BT_RCVMTU:</div><div class='add'>+		if (put_user(hci_pi(sk)-&gt;mtu, (u16 __user *)optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -ENOPROTOOPT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_sock_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	mgmt_cleanup(sk);</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct proto_ops hci_sock_ops = {</div><div class='ctx'> 	.family		= PF_BLUETOOTH,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='hunk'>@@ -1975,6 +2177,9 @@ static const struct proto_ops hci_sock_ops = {</div><div class='ctx'> 	.sendmsg	= hci_sock_sendmsg,</div><div class='ctx'> 	.recvmsg	= hci_sock_recvmsg,</div><div class='ctx'> 	.ioctl		= hci_sock_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl	= hci_sock_compat_ioctl,</div><div class='add'>+#endif</div><div class='ctx'> 	.poll		= datagram_poll,</div><div class='ctx'> 	.listen		= sock_no_listen,</div><div class='ctx'> 	.shutdown	= sock_no_shutdown,</div><div class='hunk'>@@ -2004,18 +2209,13 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> </div><div class='ctx'> 	sock-&gt;ops = &amp;hci_sock_ops;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, GFP_ATOMIC, &amp;hci_sk_proto, kern);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;hci_sk_proto, protocol, GFP_ATOMIC,</div><div class='add'>+			   kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-</div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = protocol;</div><div class='del'>-</div><div class='ctx'> 	sock-&gt;state = SS_UNCONNECTED;</div><div class='del'>-	sk-&gt;sk_state = BT_OPEN;</div><div class='add'>+	sk-&gt;sk_destruct = hci_sock_destruct;</div><div class='ctx'> </div><div class='ctx'> 	bt_sock_link(&amp;hci_sk_list, sk);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c<br/>new file mode 100644<br/>index 000000000000..a9f5b1a68356<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_sync.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_sync.c</a></div><div class='hunk'>@@ -0,0 +1,7420 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * BlueZ - Bluetooth protocol stack for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ * Copyright 2023 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hci_codec.h"</div><div class='add'>+#include "hci_debugfs.h"</div><div class='add'>+#include "smp.h"</div><div class='add'>+#include "eir.h"</div><div class='add'>+#include "msft.h"</div><div class='add'>+#include "aosp.h"</div><div class='add'>+#include "leds.h"</div><div class='add'>+</div><div class='add'>+static void hci_cmd_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "result 0x%2.2x", result);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;req_status != HCI_REQ_PEND)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;req_result = result;</div><div class='add'>+	hdev-&gt;req_status = HCI_REQ_DONE;</div><div class='add'>+</div><div class='add'>+	/* Free the request command so it is not used as response */</div><div class='add'>+	kfree_skb(hdev-&gt;req_skb);</div><div class='add'>+	hdev-&gt;req_skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		struct sock *sk = hci_skb_sk(skb);</div><div class='add'>+</div><div class='add'>+		/* Drop sk reference if set */</div><div class='add'>+		if (sk)</div><div class='add'>+			sock_put(sk);</div><div class='add'>+</div><div class='add'>+		hdev-&gt;req_rsp = skb_get(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;hdev-&gt;req_wait_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *hci_cmd_sync_alloc(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+				   const void *param, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int len = HCI_COMMAND_HDR_SIZE + plen;</div><div class='add'>+	struct hci_command_hdr *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_alloc(len, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hdr = skb_put(skb, HCI_COMMAND_HDR_SIZE);</div><div class='add'>+	hdr-&gt;opcode = cpu_to_le16(opcode);</div><div class='add'>+	hdr-&gt;plen   = plen;</div><div class='add'>+</div><div class='add'>+	if (plen)</div><div class='add'>+		skb_put_data(skb, param, plen);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "skb len %d", skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;</div><div class='add'>+	hci_skb_opcode(skb) = opcode;</div><div class='add'>+</div><div class='add'>+	/* Grab a reference if command needs to be associated with a sock (e.g.</div><div class='add'>+	 * likely mgmt socket that initiated the command).</div><div class='add'>+	 */</div><div class='add'>+	if (sk) {</div><div class='add'>+		hci_skb_sk(skb) = sk;</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_cmd_sync_add(struct hci_request *req, u16 opcode, u32 plen,</div><div class='add'>+			     const void *param, u8 event, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = req-&gt;hdev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen);</div><div class='add'>+</div><div class='add'>+	/* If an error occurred during request building, there is no point in</div><div class='add'>+	 * queueing the HCI command. We can simply return.</div><div class='add'>+	 */</div><div class='add'>+	if (req-&gt;err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = hci_cmd_sync_alloc(hdev, opcode, plen, param, sk);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		bt_dev_err(hdev, "no memory for command (opcode 0x%4.4x)",</div><div class='add'>+			   opcode);</div><div class='add'>+		req-&gt;err = -ENOMEM;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty(&amp;req-&gt;cmd_q))</div><div class='add'>+		bt_cb(skb)-&gt;hci.req_flags |= HCI_REQ_START;</div><div class='add'>+</div><div class='add'>+	hci_skb_event(skb) = event;</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;req-&gt;cmd_q, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_req_sync_run(struct hci_request *req)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = req-&gt;hdev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "length %u", skb_queue_len(&amp;req-&gt;cmd_q));</div><div class='add'>+</div><div class='add'>+	/* If an error occurred during request building, remove all HCI</div><div class='add'>+	 * commands queued on the HCI request queue.</div><div class='add'>+	 */</div><div class='add'>+	if (req-&gt;err) {</div><div class='add'>+		skb_queue_purge(&amp;req-&gt;cmd_q);</div><div class='add'>+		return req-&gt;err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not allow empty requests */</div><div class='add'>+	if (skb_queue_empty(&amp;req-&gt;cmd_q))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	skb = skb_peek_tail(&amp;req-&gt;cmd_q);</div><div class='add'>+	bt_cb(skb)-&gt;hci.req_complete_skb = hci_cmd_sync_complete;</div><div class='add'>+	bt_cb(skb)-&gt;hci.req_flags |= HCI_REQ_SKB;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hdev-&gt;cmd_q.lock, flags);</div><div class='add'>+	skb_queue_splice_tail(&amp;req-&gt;cmd_q, &amp;hdev-&gt;cmd_q);</div><div class='add'>+	spin_unlock_irqrestore(&amp;hdev-&gt;cmd_q.lock, flags);</div><div class='add'>+</div><div class='add'>+	queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_request_init(struct hci_request *req, struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	skb_queue_head_init(&amp;req-&gt;cmd_q);</div><div class='add'>+	req-&gt;hdev = hdev;</div><div class='add'>+	req-&gt;err = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;req_lock. */</div><div class='add'>+struct sk_buff *__hci_cmd_sync_sk(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+				  const void *param, u8 event, u32 timeout,</div><div class='add'>+				  struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct hci_request req;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Opcode 0x%4.4x", opcode);</div><div class='add'>+</div><div class='add'>+	hci_request_init(&amp;req, hdev);</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_add(&amp;req, opcode, plen, param, event, sk);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;req_status = HCI_REQ_PEND;</div><div class='add'>+</div><div class='add'>+	err = hci_req_sync_run(&amp;req);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	err = wait_event_interruptible_timeout(hdev-&gt;req_wait_q,</div><div class='add'>+					       hdev-&gt;req_status != HCI_REQ_PEND,</div><div class='add'>+					       timeout);</div><div class='add'>+</div><div class='add'>+	if (err == -ERESTARTSYS)</div><div class='add'>+		return ERR_PTR(-EINTR);</div><div class='add'>+</div><div class='add'>+	switch (hdev-&gt;req_status) {</div><div class='add'>+	case HCI_REQ_DONE:</div><div class='add'>+		err = -bt_to_errno(hdev-&gt;req_result);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HCI_REQ_CANCELED:</div><div class='add'>+		err = -hdev-&gt;req_result;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;req_status = 0;</div><div class='add'>+	hdev-&gt;req_result = 0;</div><div class='add'>+	skb = hdev-&gt;req_rsp;</div><div class='add'>+	hdev-&gt;req_rsp = NULL;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "end: err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If command return a status event skb will be set to NULL as there are</div><div class='add'>+	 * no parameters.</div><div class='add'>+	 */</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENODATA);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hci_cmd_sync_sk);</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;req_lock. */</div><div class='add'>+struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+			       const void *param, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_sk(hdev, opcode, plen, param, 0, timeout, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hci_cmd_sync);</div><div class='add'>+</div><div class='add'>+/* Send HCI command and wait for command complete event */</div><div class='add'>+struct sk_buff *hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+			     const void *param, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+		return ERR_PTR(-ENETDOWN);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen);</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	skb = __hci_cmd_sync(hdev, opcode, plen, param, timeout);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync);</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;req_lock. */</div><div class='add'>+struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+				  const void *param, u8 event, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_sk(hdev, opcode, plen, param, event, timeout,</div><div class='add'>+				 NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hci_cmd_sync_ev);</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;req_lock. */</div><div class='add'>+int __hci_cmd_sync_status_sk(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+			     const void *param, u8 event, u32 timeout,</div><div class='add'>+			     struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync_sk(hdev, opcode, plen, param, event, timeout, sk);</div><div class='add'>+</div><div class='add'>+	/* If command return a status event, skb will be set to -ENODATA */</div><div class='add'>+	if (skb == ERR_PTR(-ENODATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		if (!event)</div><div class='add'>+			bt_dev_err(hdev, "Opcode 0x%4.4x failed: %ld", opcode,</div><div class='add'>+				   PTR_ERR(skb));</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = skb-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hci_cmd_sync_status_sk);</div><div class='add'>+</div><div class='add'>+int __hci_cmd_sync_status(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+			  const void *param, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, opcode, plen, param, 0, timeout,</div><div class='add'>+					NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hci_cmd_sync_status);</div><div class='add'>+</div><div class='add'>+int hci_cmd_sync_status(struct hci_dev *hdev, u16 opcode, u32 plen,</div><div class='add'>+			const void *param, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, opcode, plen, param, timeout);</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_status);</div><div class='add'>+</div><div class='add'>+static void hci_cmd_sync_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev, cmd_sync_work);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* Dequeue all entries and run them */</div><div class='add'>+	while (1) {</div><div class='add'>+		struct hci_cmd_sync_work_entry *entry;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+		entry = list_first_entry_or_null(&amp;hdev-&gt;cmd_sync_work_list,</div><div class='add'>+						 struct hci_cmd_sync_work_entry,</div><div class='add'>+						 list);</div><div class='add'>+		if (entry)</div><div class='add'>+			list_del(&amp;entry-&gt;list);</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+		if (!entry)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		bt_dev_dbg(hdev, "entry %p", entry);</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;func) {</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			hci_req_sync_lock(hdev);</div><div class='add'>+			err = entry-&gt;func(hdev, entry-&gt;data);</div><div class='add'>+			if (entry-&gt;destroy)</div><div class='add'>+				entry-&gt;destroy(hdev, entry-&gt;data, err);</div><div class='add'>+			hci_req_sync_unlock(hdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_cmd_sync_cancel_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev, cmd_sync_cancel_work);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;hdev-&gt;req_wait_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_scan_disable_sync(struct hci_dev *hdev);</div><div class='add'>+static int scan_disable_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_scan_disable_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int interleaved_inquiry_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_inquiry_sync(hdev, DISCOV_INTERLEAVED_INQUIRY_LEN, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void le_scan_disable(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    le_scan_disable.work);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='add'>+		goto _return;</div><div class='add'>+</div><div class='add'>+	status = hci_cmd_sync_queue(hdev, scan_disable_sync, NULL, NULL);</div><div class='add'>+	if (status) {</div><div class='add'>+		bt_dev_err(hdev, "failed to disable LE scan: %d", status);</div><div class='add'>+		goto _return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we were running LE only scan, change discovery state. If</div><div class='add'>+	 * we were running both LE and BR/EDR inquiry simultaneously,</div><div class='add'>+	 * and BR/EDR inquiry is already finished, stop discovery,</div><div class='add'>+	 * otherwise BR/EDR inquiry will stop discovery when finished.</div><div class='add'>+	 * If we will resolve remote device name, do not change</div><div class='add'>+	 * discovery state.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;discovery.type == DISCOV_TYPE_LE)</div><div class='add'>+		goto discov_stopped;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;discovery.type != DISCOV_TYPE_INTERLEAVED)</div><div class='add'>+		goto _return;</div><div class='add'>+</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY)) {</div><div class='add'>+		if (!test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    hdev-&gt;discovery.state != DISCOVERY_RESOLVING)</div><div class='add'>+			goto discov_stopped;</div><div class='add'>+</div><div class='add'>+		goto _return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = hci_cmd_sync_queue(hdev, interleaved_inquiry_sync, NULL, NULL);</div><div class='add'>+	if (status) {</div><div class='add'>+		bt_dev_err(hdev, "inquiry failed: status %d", status);</div><div class='add'>+		goto discov_stopped;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto _return;</div><div class='add'>+</div><div class='add'>+discov_stopped:</div><div class='add'>+	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='add'>+</div><div class='add'>+_return:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_scan_enable_sync(struct hci_dev *hdev, u8 val,</div><div class='add'>+				       u8 filter_dup);</div><div class='add'>+</div><div class='add'>+static int reenable_adv_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;hdev-&gt;adv_instances))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;cur_adv_instance) {</div><div class='add'>+		return hci_schedule_adv_instance_sync(hdev,</div><div class='add'>+						      hdev-&gt;cur_adv_instance,</div><div class='add'>+						      true);</div><div class='add'>+	} else {</div><div class='add'>+		if (ext_adv_capable(hdev)) {</div><div class='add'>+			hci_start_ext_adv_sync(hdev, 0x00);</div><div class='add'>+		} else {</div><div class='add'>+			hci_update_adv_data_sync(hdev, 0x00);</div><div class='add'>+			hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+			hci_enable_advertising_sync(hdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reenable_adv(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    reenable_adv_work);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	status = hci_cmd_sync_queue(hdev, reenable_adv_sync, NULL, NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		bt_dev_err(hdev, "failed to reenable ADV: %d", status);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cancel_adv_timeout(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;adv_instance_timeout) {</div><div class='add'>+		hdev-&gt;adv_instance_timeout = 0;</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;adv_instance_expire);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For a single instance:</div><div class='add'>+ * - force == true: The instance will be removed even when its remaining</div><div class='add'>+ *   lifetime is not zero.</div><div class='add'>+ * - force == false: the instance will be deactivated but kept stored unless</div><div class='add'>+ *   the remaining lifetime is zero.</div><div class='add'>+ *</div><div class='add'>+ * For instance == 0x00:</div><div class='add'>+ * - force == true: All instances will be removed regardless of their timeout</div><div class='add'>+ *   setting.</div><div class='add'>+ * - force == false: Only instances that have a timeout will be removed.</div><div class='add'>+ */</div><div class='add'>+int hci_clear_adv_instance_sync(struct hci_dev *hdev, struct sock *sk,</div><div class='add'>+				u8 instance, bool force)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv_instance, *n, *next_instance = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	u8 rem_inst;</div><div class='add'>+</div><div class='add'>+	/* Cancel any timeout concerning the removed instance(s). */</div><div class='add'>+	if (!instance || hdev-&gt;cur_adv_instance == instance)</div><div class='add'>+		cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+	/* Get the next instance to advertise BEFORE we remove</div><div class='add'>+	 * the current one. This can be the same instance again</div><div class='add'>+	 * if there is only one instance.</div><div class='add'>+	 */</div><div class='add'>+	if (instance &amp;&amp; hdev-&gt;cur_adv_instance == instance)</div><div class='add'>+		next_instance = hci_get_next_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+	if (instance == 0x00) {</div><div class='add'>+		list_for_each_entry_safe(adv_instance, n, &amp;hdev-&gt;adv_instances,</div><div class='add'>+					 list) {</div><div class='add'>+			if (!(force || adv_instance-&gt;timeout))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rem_inst = adv_instance-&gt;instance;</div><div class='add'>+			err = hci_remove_adv_instance(hdev, rem_inst);</div><div class='add'>+			if (!err)</div><div class='add'>+				mgmt_advertising_removed(sk, hdev, rem_inst);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		adv_instance = hci_find_adv_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+		if (force || (adv_instance &amp;&amp; adv_instance-&gt;timeout &amp;&amp;</div><div class='add'>+			      !adv_instance-&gt;remaining_time)) {</div><div class='add'>+			/* Don't advertise a removed instance. */</div><div class='add'>+			if (next_instance &amp;&amp;</div><div class='add'>+			    next_instance-&gt;instance == instance)</div><div class='add'>+				next_instance = NULL;</div><div class='add'>+</div><div class='add'>+			err = hci_remove_adv_instance(hdev, instance);</div><div class='add'>+			if (!err)</div><div class='add'>+				mgmt_advertising_removed(sk, hdev, instance);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev) || hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (next_instance &amp;&amp; !ext_adv_capable(hdev))</div><div class='add'>+		return hci_schedule_adv_instance_sync(hdev,</div><div class='add'>+						      next_instance-&gt;instance,</div><div class='add'>+						      false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adv_timeout_expire_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 instance = *(u8 *)data;</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	hci_clear_adv_instance_sync(hdev, NULL, instance, false);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;hdev-&gt;adv_instances))</div><div class='add'>+		return hci_disable_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adv_timeout_expire(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	u8 *inst_ptr;</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    adv_instance_expire.work);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;adv_instance_timeout = 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;cur_adv_instance == 0x00)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	inst_ptr = kmalloc(1, GFP_KERNEL);</div><div class='add'>+	if (!inst_ptr)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	*inst_ptr = hdev-&gt;cur_adv_instance;</div><div class='add'>+	hci_cmd_sync_queue(hdev, adv_timeout_expire_sync, inst_ptr, NULL);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_interleave_scanning(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hdev-&gt;interleave_scan_state != INTERLEAVE_SCAN_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_passive_scan_sync(struct hci_dev *hdev);</div><div class='add'>+</div><div class='add'>+static void interleave_scan_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    interleave_scan.work);</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;interleave_scan_state == INTERLEAVE_SCAN_ALLOWLIST) {</div><div class='add'>+		timeout = msecs_to_jiffies(hdev-&gt;advmon_allowlist_duration);</div><div class='add'>+	} else if (hdev-&gt;interleave_scan_state == INTERLEAVE_SCAN_NO_FILTER) {</div><div class='add'>+		timeout = msecs_to_jiffies(hdev-&gt;advmon_no_filter_duration);</div><div class='add'>+	} else {</div><div class='add'>+		bt_dev_err(hdev, "unexpected error");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_passive_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	switch (hdev-&gt;interleave_scan_state) {</div><div class='add'>+	case INTERLEAVE_SCAN_ALLOWLIST:</div><div class='add'>+		bt_dev_dbg(hdev, "next state: allowlist");</div><div class='add'>+		hdev-&gt;interleave_scan_state = INTERLEAVE_SCAN_NO_FILTER;</div><div class='add'>+		break;</div><div class='add'>+	case INTERLEAVE_SCAN_NO_FILTER:</div><div class='add'>+		bt_dev_dbg(hdev, "next state: no filter");</div><div class='add'>+		hdev-&gt;interleave_scan_state = INTERLEAVE_SCAN_ALLOWLIST;</div><div class='add'>+		break;</div><div class='add'>+	case INTERLEAVE_SCAN_NONE:</div><div class='add'>+		bt_dev_err(hdev, "unexpected error");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Don't continue interleaving if it was canceled */</div><div class='add'>+	if (is_interleave_scanning(hdev))</div><div class='add'>+		queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='add'>+				   &amp;hdev-&gt;interleave_scan, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_cmd_sync_init(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	INIT_WORK(&amp;hdev-&gt;cmd_sync_work, hci_cmd_sync_work);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdev-&gt;cmd_sync_work_list);</div><div class='add'>+	mutex_init(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	mutex_init(&amp;hdev-&gt;unregister_lock);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;hdev-&gt;cmd_sync_cancel_work, hci_cmd_sync_cancel_work);</div><div class='add'>+	INIT_WORK(&amp;hdev-&gt;reenable_adv_work, reenable_adv);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;le_scan_disable, le_scan_disable);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;adv_instance_expire, adv_timeout_expire);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;interleave_scan, interleave_scan_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _hci_cmd_sync_cancel_entry(struct hci_dev *hdev,</div><div class='add'>+				       struct hci_cmd_sync_work_entry *entry,</div><div class='add'>+				       int err)</div><div class='add'>+{</div><div class='add'>+	if (entry-&gt;destroy)</div><div class='add'>+		entry-&gt;destroy(hdev, entry-&gt;data, err);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+	kfree(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_cmd_sync_clear(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry, *tmp;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;hdev-&gt;cmd_sync_work);</div><div class='add'>+	cancel_work_sync(&amp;hdev-&gt;reenable_adv_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;hdev-&gt;cmd_sync_work_list, list)</div><div class='add'>+		_hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hci_cmd_sync_cancel(struct hci_dev *hdev, int err)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "err 0x%2.2x", err);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;req_status == HCI_REQ_PEND) {</div><div class='add'>+		hdev-&gt;req_result = err;</div><div class='add'>+		hdev-&gt;req_status = HCI_REQ_CANCELED;</div><div class='add'>+</div><div class='add'>+		queue_work(hdev-&gt;workqueue, &amp;hdev-&gt;cmd_sync_cancel_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_cancel);</div><div class='add'>+</div><div class='add'>+/* Cancel ongoing command request synchronously:</div><div class='add'>+ *</div><div class='add'>+ * - Set result and mark status to HCI_REQ_CANCELED</div><div class='add'>+ * - Wakeup command sync thread</div><div class='add'>+ */</div><div class='add'>+void hci_cmd_sync_cancel_sync(struct hci_dev *hdev, int err)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "err 0x%2.2x", err);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;req_status == HCI_REQ_PEND) {</div><div class='add'>+		/* req_result is __u32 so error must be positive to be properly</div><div class='add'>+		 * propagated.</div><div class='add'>+		 */</div><div class='add'>+		hdev-&gt;req_result = err &lt; 0 ? -err : err;</div><div class='add'>+		hdev-&gt;req_status = HCI_REQ_CANCELED;</div><div class='add'>+</div><div class='add'>+		wake_up_interruptible(&amp;hdev-&gt;req_wait_q);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_cancel_sync);</div><div class='add'>+</div><div class='add'>+/* Submit HCI command to be run in as cmd_sync_work:</div><div class='add'>+ *</div><div class='add'>+ * - hdev must _not_ be unregistered</div><div class='add'>+ */</div><div class='add'>+int hci_cmd_sync_submit(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;unregister_lock);</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = kmalloc(sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!entry) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;func = func;</div><div class='add'>+	entry-&gt;data = data;</div><div class='add'>+	entry-&gt;destroy = destroy;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	list_add_tail(&amp;entry-&gt;list, &amp;hdev-&gt;cmd_sync_work_list);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;cmd_sync_work);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;unregister_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_submit);</div><div class='add'>+</div><div class='add'>+/* Queue HCI command:</div><div class='add'>+ *</div><div class='add'>+ * - hdev must be running</div><div class='add'>+ */</div><div class='add'>+int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+		       void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	/* Only queue command if hdev is running which means it had been opened</div><div class='add'>+	 * and is either on init phase or is already up.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_submit(hdev, func, data, destroy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_queue);</div><div class='add'>+</div><div class='add'>+static struct hci_cmd_sync_work_entry *</div><div class='add'>+_hci_cmd_sync_lookup_entry(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			   void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;hdev-&gt;cmd_sync_work_list, list) {</div><div class='add'>+		if (func &amp;&amp; entry-&gt;func != func)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (data &amp;&amp; entry-&gt;data != data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (destroy &amp;&amp; entry-&gt;destroy != destroy)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return entry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Queue HCI command entry once:</div><div class='add'>+ *</div><div class='add'>+ * - Lookup if an entry already exist and only if it doesn't creates a new entry</div><div class='add'>+ *   and queue it.</div><div class='add'>+ */</div><div class='add'>+int hci_cmd_sync_queue_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			    void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	if (hci_cmd_sync_lookup_entry(hdev, func, data, destroy))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_queue(hdev, func, data, destroy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_queue_once);</div><div class='add'>+</div><div class='add'>+/* Run HCI command:</div><div class='add'>+ *</div><div class='add'>+ * - hdev must be running</div><div class='add'>+ * - if on cmd_sync_work then run immediately otherwise queue</div><div class='add'>+ */</div><div class='add'>+int hci_cmd_sync_run(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+		     void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	/* Only queue command if hdev is running which means it had been opened</div><div class='add'>+	 * and is either on init phase or is already up.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	/* If on cmd_sync_work then run immediately otherwise queue */</div><div class='add'>+	if (current_work() == &amp;hdev-&gt;cmd_sync_work)</div><div class='add'>+		return func(hdev, data);</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_submit(hdev, func, data, destroy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_run);</div><div class='add'>+</div><div class='add'>+/* Run HCI command entry once:</div><div class='add'>+ *</div><div class='add'>+ * - Lookup if an entry already exist and only if it doesn't creates a new entry</div><div class='add'>+ *   and run it.</div><div class='add'>+ * - if on cmd_sync_work then run immediately otherwise queue</div><div class='add'>+ */</div><div class='add'>+int hci_cmd_sync_run_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			  void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	if (hci_cmd_sync_lookup_entry(hdev, func, data, destroy))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_run(hdev, func, data, destroy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_run_once);</div><div class='add'>+</div><div class='add'>+/* Lookup HCI command entry:</div><div class='add'>+ *</div><div class='add'>+ * - Return first entry that matches by function callback or data or</div><div class='add'>+ *   destroy callback.</div><div class='add'>+ */</div><div class='add'>+struct hci_cmd_sync_work_entry *</div><div class='add'>+hci_cmd_sync_lookup_entry(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			  void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	entry = _hci_cmd_sync_lookup_entry(hdev, func, data, destroy);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_lookup_entry);</div><div class='add'>+</div><div class='add'>+/* Cancel HCI command entry */</div><div class='add'>+void hci_cmd_sync_cancel_entry(struct hci_dev *hdev,</div><div class='add'>+			       struct hci_cmd_sync_work_entry *entry)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	_hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_cancel_entry);</div><div class='add'>+</div><div class='add'>+/* Dequeue one HCI command entry:</div><div class='add'>+ *</div><div class='add'>+ * - Lookup and cancel first entry that matches.</div><div class='add'>+ */</div><div class='add'>+bool hci_cmd_sync_dequeue_once(struct hci_dev *hdev,</div><div class='add'>+			       hci_cmd_sync_work_func_t func,</div><div class='add'>+			       void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+	entry = _hci_cmd_sync_lookup_entry(hdev, func, data, destroy);</div><div class='add'>+	if (!entry) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_dequeue_once);</div><div class='add'>+</div><div class='add'>+/* Dequeue HCI command entry:</div><div class='add'>+ *</div><div class='add'>+ * - Lookup and cancel any entry that matches by function callback or data or</div><div class='add'>+ *   destroy callback.</div><div class='add'>+ */</div><div class='add'>+bool hci_cmd_sync_dequeue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,</div><div class='add'>+			  void *data, hci_cmd_sync_work_destroy_t destroy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cmd_sync_work_entry *entry;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+	while ((entry = _hci_cmd_sync_lookup_entry(hdev, func, data,</div><div class='add'>+						   destroy))) {</div><div class='add'>+		_hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;cmd_sync_work_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hci_cmd_sync_dequeue);</div><div class='add'>+</div><div class='add'>+int hci_update_eir_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_eir cp;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!lmp_ext_inq_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	eir_create(hdev, cp.data);</div><div class='add'>+</div><div class='add'>+	if (memcmp(cp.data, hdev-&gt;eir, sizeof(cp.data)) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(hdev-&gt;eir, cp.data, sizeof(cp.data));</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_EIR, sizeof(cp), &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_service_classes(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct bt_uuid *uuid;</div><div class='add'>+	u8 val = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(uuid, &amp;hdev-&gt;uuids, list)</div><div class='add'>+		val |= uuid-&gt;svc_hint;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_class_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 cod[3];</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cod[0] = hdev-&gt;minor_class;</div><div class='add'>+	cod[1] = hdev-&gt;major_class;</div><div class='add'>+	cod[2] = get_service_classes(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE))</div><div class='add'>+		cod[1] |= 0x20;</div><div class='add'>+</div><div class='add'>+	if (memcmp(cod, hdev-&gt;dev_class, 3) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_CLASS_OF_DEV,</div><div class='add'>+				     sizeof(cod), cod, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)</div><div class='add'>+{</div><div class='add'>+	/* If there is no connection we are OK to advertise. */</div><div class='add'>+	if (hci_conn_num(hdev, LE_LINK) == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Check le_states if there is any connection in peripheral role. */</div><div class='add'>+	if (hdev-&gt;conn_hash.le_num_peripheral &gt; 0) {</div><div class='add'>+		/* Peripheral connection state and non connectable mode</div><div class='add'>+		 * bit 20.</div><div class='add'>+		 */</div><div class='add'>+		if (!connectable &amp;&amp; !(hdev-&gt;le_states[2] &amp; 0x10))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* Peripheral connection state and connectable mode bit 38</div><div class='add'>+		 * and scannable bit 21.</div><div class='add'>+		 */</div><div class='add'>+		if (connectable &amp;&amp; (!(hdev-&gt;le_states[4] &amp; 0x40) ||</div><div class='add'>+				    !(hdev-&gt;le_states[2] &amp; 0x20)))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check le_states if there is any connection in central role. */</div><div class='add'>+	if (hci_conn_num(hdev, LE_LINK) != hdev-&gt;conn_hash.le_num_peripheral) {</div><div class='add'>+		/* Central connection state and non connectable mode bit 18. */</div><div class='add'>+		if (!connectable &amp;&amp; !(hdev-&gt;le_states[2] &amp; 0x02))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* Central connection state and connectable mode bit 35 and</div><div class='add'>+		 * scannable 19.</div><div class='add'>+		 */</div><div class='add'>+		if (connectable &amp;&amp; (!(hdev-&gt;le_states[4] &amp; 0x08) ||</div><div class='add'>+				    !(hdev-&gt;le_states[2] &amp; 0x08)))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool adv_use_rpa(struct hci_dev *hdev, uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	/* If privacy is not enabled don't use RPA */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_PRIVACY))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* If basic privacy mode is enabled use RPA */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* If limited privacy mode is enabled don't use RPA if we're</div><div class='add'>+	 * both discoverable and bondable.</div><div class='add'>+	 */</div><div class='add'>+	if ((flags &amp; MGMT_ADV_FLAG_DISCOV) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_BONDABLE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We're neither bondable nor discoverable in the limited</div><div class='add'>+	 * privacy mode, therefore use RPA.</div><div class='add'>+	 */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_random_addr_sync(struct hci_dev *hdev, bdaddr_t *rpa)</div><div class='add'>+{</div><div class='add'>+	/* If a random_addr has been set we're advertising or initiating an LE</div><div class='add'>+	 * connection we can't go ahead and change the random address at this</div><div class='add'>+	 * time. This is because the eventual initiator address used for the</div><div class='add'>+	 * subsequently created connection will be undefined (some</div><div class='add'>+	 * controllers use the new address and others the one we had</div><div class='add'>+	 * when the operation started).</div><div class='add'>+	 *</div><div class='add'>+	 * In this kind of scenario skip the update and let the random</div><div class='add'>+	 * address be updated at the next cycle.</div><div class='add'>+	 */</div><div class='add'>+	if (bacmp(&amp;hdev-&gt;random_addr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+	    (hci_dev_test_flag(hdev, HCI_LE_ADV) ||</div><div class='add'>+	    hci_lookup_le_connect(hdev))) {</div><div class='add'>+		bt_dev_dbg(hdev, "Deferring random address update");</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_RANDOM_ADDR,</div><div class='add'>+				     6, rpa, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_random_address_sync(struct hci_dev *hdev, bool require_privacy,</div><div class='add'>+				   bool rpa, u8 *own_addr_type)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If privacy is enabled use a resolvable private address. If</div><div class='add'>+	 * current RPA has expired or there is something else than</div><div class='add'>+	 * the current RPA in use, then generate a new one.</div><div class='add'>+	 */</div><div class='add'>+	if (rpa) {</div><div class='add'>+		/* If Controller supports LL Privacy use own address type is</div><div class='add'>+		 * 0x03</div><div class='add'>+		 */</div><div class='add'>+		if (ll_privacy_capable(hdev))</div><div class='add'>+			*own_addr_type = ADDR_LE_DEV_RANDOM_RESOLVED;</div><div class='add'>+		else</div><div class='add'>+			*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+</div><div class='add'>+		/* Check if RPA is valid */</div><div class='add'>+		if (rpa_valid(hdev))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		err = smp_generate_rpa(hdev, hdev-&gt;irk, &amp;hdev-&gt;rpa);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			bt_dev_err(hdev, "failed to generate new RPA");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = hci_set_random_addr_sync(hdev, &amp;hdev-&gt;rpa);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case of required privacy without resolvable private address,</div><div class='add'>+	 * use an non-resolvable private address. This is useful for active</div><div class='add'>+	 * scanning and non-connectable advertising.</div><div class='add'>+	 */</div><div class='add'>+	if (require_privacy) {</div><div class='add'>+		bdaddr_t nrpa;</div><div class='add'>+</div><div class='add'>+		while (true) {</div><div class='add'>+			/* The non-resolvable private address is generated</div><div class='add'>+			 * from random six bytes with the two most significant</div><div class='add'>+			 * bits cleared.</div><div class='add'>+			 */</div><div class='add'>+			get_random_bytes(&amp;nrpa, 6);</div><div class='add'>+			nrpa.b[5] &amp;= 0x3f;</div><div class='add'>+</div><div class='add'>+			/* The non-resolvable private address shall not be</div><div class='add'>+			 * equal to the public address.</div><div class='add'>+			 */</div><div class='add'>+			if (bacmp(&amp;hdev-&gt;bdaddr, &amp;nrpa))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+</div><div class='add'>+		return hci_set_random_addr_sync(hdev, &amp;nrpa);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If forcing static address is in use or there is no public</div><div class='add'>+	 * address use the static address as random address (but skip</div><div class='add'>+	 * the HCI command if the current random address is already the</div><div class='add'>+	 * static one.</div><div class='add'>+	 *</div><div class='add'>+	 * In case BR/EDR has been disabled on a dual-mode controller</div><div class='add'>+	 * and a static address has been configured, then use that</div><div class='add'>+	 * address instead of the public BR/EDR address.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ||</div><div class='add'>+	    !bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) ||</div><div class='add'>+	    (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED) &amp;&amp;</div><div class='add'>+	     bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY))) {</div><div class='add'>+		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+		if (bacmp(&amp;hdev-&gt;static_addr, &amp;hdev-&gt;random_addr))</div><div class='add'>+			return hci_set_random_addr_sync(hdev,</div><div class='add'>+							&amp;hdev-&gt;static_addr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Neither privacy nor static address is being used so use a</div><div class='add'>+	 * public address.</div><div class='add'>+	 */</div><div class='add'>+	*own_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_disable_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_adv_enable *cp;</div><div class='add'>+	struct hci_cp_ext_adv_set *set;</div><div class='add'>+	u8 data[sizeof(*cp) + sizeof(*set) * 1];</div><div class='add'>+	u8 size;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+</div><div class='add'>+	/* If request specifies an instance that doesn't exist, fail */</div><div class='add'>+	if (instance &gt; 0) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* If not enabled there is nothing to do */</div><div class='add'>+		if (!adv-&gt;enabled)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(data, 0, sizeof(data));</div><div class='add'>+</div><div class='add'>+	cp = (void *)data;</div><div class='add'>+	set = (void *)cp-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* Instance 0x00 indicates all advertising instances will be disabled */</div><div class='add'>+	cp-&gt;num_of_sets = !!instance;</div><div class='add'>+	cp-&gt;enable = 0x00;</div><div class='add'>+</div><div class='add'>+	set-&gt;handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+</div><div class='add'>+	size = sizeof(*cp) + sizeof(*set) * cp-&gt;num_of_sets;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_ADV_ENABLE,</div><div class='add'>+				     size, data, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_adv_set_random_addr_sync(struct hci_dev *hdev, u8 instance,</div><div class='add'>+					    bdaddr_t *random_addr)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_adv_set_rand_addr cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!instance) {</div><div class='add'>+		/* Instance 0x00 doesn't have an adv_info, instead it uses</div><div class='add'>+		 * hdev-&gt;random_addr to track its address so whenever it needs</div><div class='add'>+		 * to be updated this also set the random address since</div><div class='add'>+		 * hdev-&gt;random_addr is shared with scan state machine.</div><div class='add'>+		 */</div><div class='add'>+		err = hci_set_random_addr_sync(hdev, random_addr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.handle = instance;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, random_addr);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_SET_RAND_ADDR,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hci_set_ext_adv_params_sync(struct hci_dev *hdev, struct adv_info *adv,</div><div class='add'>+			    const struct hci_cp_le_set_ext_adv_params *cp,</div><div class='add'>+			    struct hci_rp_le_set_ext_adv_params *rp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, HCI_OP_LE_SET_EXT_ADV_PARAMS, sizeof(*cp),</div><div class='add'>+			     cp, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	/* If command return a status event, skb will be set to -ENODATA */</div><div class='add'>+	if (skb == ERR_PTR(-ENODATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "Opcode 0x%4.4x failed: %ld",</div><div class='add'>+			   HCI_OP_LE_SET_EXT_ADV_PARAMS, PTR_ERR(skb));</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len != sizeof(*rp)) {</div><div class='add'>+		bt_dev_err(hdev, "Invalid response length for 0x%4.4x: %u",</div><div class='add'>+			   HCI_OP_LE_SET_EXT_ADV_PARAMS, skb-&gt;len);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(rp, skb-&gt;data, sizeof(*rp));</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (!rp-&gt;status) {</div><div class='add'>+		hdev-&gt;adv_addr_type = cp-&gt;own_addr_type;</div><div class='add'>+		if (!cp-&gt;handle) {</div><div class='add'>+			/* Store in hdev for instance 0 */</div><div class='add'>+			hdev-&gt;adv_tx_power = rp-&gt;tx_power;</div><div class='add'>+		} else if (adv) {</div><div class='add'>+			adv-&gt;tx_power = rp-&gt;tx_power;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_ext_adv_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_set_ext_adv_data, pdu, data, length,</div><div class='add'>+		    HCI_MAX_EXT_AD_LENGTH);</div><div class='add'>+	u8 len;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv || !adv-&gt;adv_data_changed)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = eir_create_adv_data(hdev, instance, pdu-&gt;data,</div><div class='add'>+				  HCI_MAX_EXT_AD_LENGTH);</div><div class='add'>+</div><div class='add'>+	pdu-&gt;length = len;</div><div class='add'>+	pdu-&gt;handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+	pdu-&gt;operation = LE_SET_ADV_DATA_OP_COMPLETE;</div><div class='add'>+	pdu-&gt;frag_pref = LE_SET_ADV_DATA_NO_FRAG;</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_ADV_DATA,</div><div class='add'>+				    struct_size(pdu, data, len), pdu,</div><div class='add'>+				    HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Update data if the command succeed */</div><div class='add'>+	if (adv) {</div><div class='add'>+		adv-&gt;adv_data_changed = false;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(hdev-&gt;adv_data, pdu-&gt;data, len);</div><div class='add'>+		hdev-&gt;adv_data_len = len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_adv_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_adv_data cp;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	len = eir_create_adv_data(hdev, instance, cp.data, sizeof(cp.data));</div><div class='add'>+</div><div class='add'>+	/* There's nothing to do if the data hasn't changed */</div><div class='add'>+	if (hdev-&gt;adv_data_len == len &amp;&amp;</div><div class='add'>+	    memcmp(cp.data, hdev-&gt;adv_data, len) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(hdev-&gt;adv_data, cp.data, sizeof(cp.data));</div><div class='add'>+	hdev-&gt;adv_data_len = len;</div><div class='add'>+</div><div class='add'>+	cp.length = len;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_DATA,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_adv_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_set_ext_adv_data_sync(hdev, instance);</div><div class='add'>+</div><div class='add'>+	return hci_set_adv_data_sync(hdev, instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_setup_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_adv_params cp;</div><div class='add'>+	struct hci_rp_le_set_ext_adv_params rp;</div><div class='add'>+	bool connectable, require_privacy;</div><div class='add'>+	u32 flags;</div><div class='add'>+	bdaddr_t random_addr;</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+	int err;</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+	bool secondary_adv;</div><div class='add'>+</div><div class='add'>+	if (instance &gt; 0) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		adv = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Updating parameters of an active instance will return a</div><div class='add'>+	 * Command Disallowed error, so we must first disable the</div><div class='add'>+	 * instance if it is active.</div><div class='add'>+	 */</div><div class='add'>+	if (adv) {</div><div class='add'>+		err = hci_disable_ext_adv_instance_sync(hdev, instance);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flags = hci_adv_instance_flags(hdev, instance);</div><div class='add'>+</div><div class='add'>+	/* If the "connectable" instance flag was not set, then choose between</div><div class='add'>+	 * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.</div><div class='add'>+	 */</div><div class='add'>+	connectable = (flags &amp; MGMT_ADV_FLAG_CONNECTABLE) ||</div><div class='add'>+		      mgmt_get_connectable(hdev);</div><div class='add'>+</div><div class='add'>+	if (!is_advertising_allowed(hdev, connectable))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* Set require_privacy to true only when non-connectable</div><div class='add'>+	 * advertising is used and it is not periodic.</div><div class='add'>+	 * In that case it is fine to use a non-resolvable private address.</div><div class='add'>+	 */</div><div class='add'>+	require_privacy = !connectable &amp;&amp; !(adv &amp;&amp; adv-&gt;periodic);</div><div class='add'>+</div><div class='add'>+	err = hci_get_random_address(hdev, require_privacy,</div><div class='add'>+				     adv_use_rpa(hdev, flags), adv,</div><div class='add'>+				     &amp;own_addr_type, &amp;random_addr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (adv) {</div><div class='add'>+		hci_cpu_to_le24(adv-&gt;min_interval, cp.min_interval);</div><div class='add'>+		hci_cpu_to_le24(adv-&gt;max_interval, cp.max_interval);</div><div class='add'>+		cp.tx_power = adv-&gt;tx_power;</div><div class='add'>+		cp.sid = adv-&gt;sid;</div><div class='add'>+	} else {</div><div class='add'>+		hci_cpu_to_le24(hdev-&gt;le_adv_min_interval, cp.min_interval);</div><div class='add'>+		hci_cpu_to_le24(hdev-&gt;le_adv_max_interval, cp.max_interval);</div><div class='add'>+		cp.tx_power = HCI_ADV_TX_POWER_NO_PREFERENCE;</div><div class='add'>+		cp.sid = 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	secondary_adv = (flags &amp; MGMT_ADV_FLAG_SEC_MASK);</div><div class='add'>+</div><div class='add'>+	if (connectable) {</div><div class='add'>+		if (secondary_adv)</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_CONN_IND);</div><div class='add'>+		else</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_IND);</div><div class='add'>+	} else if (hci_adv_instance_is_scannable(hdev, instance) ||</div><div class='add'>+		   (flags &amp; MGMT_ADV_PARAM_SCAN_RSP)) {</div><div class='add'>+		if (secondary_adv)</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_SCAN_IND);</div><div class='add'>+		else</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_SCAN_IND);</div><div class='add'>+	} else {</div><div class='add'>+		if (secondary_adv)</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_EXT_ADV_NON_CONN_IND);</div><div class='add'>+		else</div><div class='add'>+			cp.evt_properties = cpu_to_le16(LE_LEGACY_NONCONN_IND);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If Own_Address_Type equals 0x02 or 0x03, the Peer_Address parameter</div><div class='add'>+	 * contains the peer’s Identity Address and the Peer_Address_Type</div><div class='add'>+	 * parameter contains the peer’s Identity Type (i.e., 0x00 or 0x01).</div><div class='add'>+	 * These parameters are used to locate the corresponding local IRK in</div><div class='add'>+	 * the resolving list; this IRK is used to generate their own address</div><div class='add'>+	 * used in the advertisement.</div><div class='add'>+	 */</div><div class='add'>+	if (own_addr_type == ADDR_LE_DEV_RANDOM_RESOLVED)</div><div class='add'>+		hci_copy_identity_address(hdev, &amp;cp.peer_addr,</div><div class='add'>+					  &amp;cp.peer_addr_type);</div><div class='add'>+</div><div class='add'>+	cp.own_addr_type = own_addr_type;</div><div class='add'>+	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='add'>+	cp.handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MGMT_ADV_FLAG_SEC_2M) {</div><div class='add'>+		cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='add'>+		cp.secondary_phy = HCI_ADV_PHY_2M;</div><div class='add'>+	} else if (flags &amp; MGMT_ADV_FLAG_SEC_CODED) {</div><div class='add'>+		cp.primary_phy = HCI_ADV_PHY_CODED;</div><div class='add'>+		cp.secondary_phy = HCI_ADV_PHY_CODED;</div><div class='add'>+	} else {</div><div class='add'>+		/* In all other cases use 1M */</div><div class='add'>+		cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='add'>+		cp.secondary_phy = HCI_ADV_PHY_1M;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_set_ext_adv_params_sync(hdev, adv, &amp;cp, &amp;rp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Update adv data as tx power is known now */</div><div class='add'>+	err = hci_set_ext_adv_data_sync(hdev, cp.handle);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((own_addr_type == ADDR_LE_DEV_RANDOM ||</div><div class='add'>+	     own_addr_type == ADDR_LE_DEV_RANDOM_RESOLVED) &amp;&amp;</div><div class='add'>+	    bacmp(&amp;random_addr, BDADDR_ANY)) {</div><div class='add'>+		/* Check if random address need to be updated */</div><div class='add'>+		if (adv) {</div><div class='add'>+			if (!bacmp(&amp;random_addr, &amp;adv-&gt;random_addr))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (!bacmp(&amp;random_addr, &amp;hdev-&gt;random_addr))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return hci_set_adv_set_random_addr_sync(hdev, instance,</div><div class='add'>+							&amp;random_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_ext_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_set_ext_scan_rsp_data, pdu, data, length,</div><div class='add'>+		    HCI_MAX_EXT_AD_LENGTH);</div><div class='add'>+	u8 len;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv || !adv-&gt;scan_rsp_changed)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = eir_create_scan_rsp(hdev, instance, pdu-&gt;data);</div><div class='add'>+</div><div class='add'>+	pdu-&gt;handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+	pdu-&gt;length = len;</div><div class='add'>+	pdu-&gt;operation = LE_SET_ADV_DATA_OP_COMPLETE;</div><div class='add'>+	pdu-&gt;frag_pref = LE_SET_ADV_DATA_NO_FRAG;</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_RSP_DATA,</div><div class='add'>+				    struct_size(pdu, data, len), pdu,</div><div class='add'>+				    HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (adv) {</div><div class='add'>+		adv-&gt;scan_rsp_changed = false;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(hdev-&gt;scan_rsp_data, pdu-&gt;data, len);</div><div class='add'>+		hdev-&gt;scan_rsp_data_len = len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hci_set_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_scan_rsp_data cp;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	len = eir_create_scan_rsp(hdev, instance, cp.data);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;scan_rsp_data_len == len &amp;&amp;</div><div class='add'>+	    !memcmp(cp.data, hdev-&gt;scan_rsp_data, len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(hdev-&gt;scan_rsp_data, cp.data, sizeof(cp.data));</div><div class='add'>+	hdev-&gt;scan_rsp_data_len = len;</div><div class='add'>+</div><div class='add'>+	cp.length = len;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_SCAN_RSP_DATA,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_set_ext_scan_rsp_data_sync(hdev, instance);</div><div class='add'>+</div><div class='add'>+	return __hci_set_scan_rsp_data_sync(hdev, instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_enable_ext_advertising_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_adv_enable *cp;</div><div class='add'>+	struct hci_cp_ext_adv_set *set;</div><div class='add'>+	u8 data[sizeof(*cp) + sizeof(*set) * 1];</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+	if (instance &gt; 0) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* If already enabled there is nothing to do */</div><div class='add'>+		if (adv-&gt;enabled)</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		adv = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp = (void *)data;</div><div class='add'>+	set = (void *)cp-&gt;data;</div><div class='add'>+</div><div class='add'>+	memset(cp, 0, sizeof(*cp));</div><div class='add'>+</div><div class='add'>+	cp-&gt;enable = 0x01;</div><div class='add'>+	cp-&gt;num_of_sets = 0x01;</div><div class='add'>+</div><div class='add'>+	memset(set, 0, sizeof(*set));</div><div class='add'>+</div><div class='add'>+	set-&gt;handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+</div><div class='add'>+	/* Set duration per instance since controller is responsible for</div><div class='add'>+	 * scheduling it.</div><div class='add'>+	 */</div><div class='add'>+	if (adv &amp;&amp; adv-&gt;timeout) {</div><div class='add'>+		u16 duration = adv-&gt;timeout * MSEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+		/* Time = N * 10 ms */</div><div class='add'>+		set-&gt;duration = cpu_to_le16(duration / 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_ADV_ENABLE,</div><div class='add'>+				     sizeof(*cp) +</div><div class='add'>+				     sizeof(*set) * cp-&gt;num_of_sets,</div><div class='add'>+				     data, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_start_ext_adv_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hci_setup_ext_adv_instance_sync(hdev, instance);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_set_ext_scan_rsp_data_sync(hdev, instance);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_enable_ext_advertising_sync(hdev, instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_disable_per_advertising_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_per_adv_enable cp;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+</div><div class='add'>+	/* If periodic advertising already disabled there is nothing to do. */</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (!adv || !adv-&gt;periodic_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.enable = 0x00;</div><div class='add'>+	cp.handle = instance;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_PER_ADV_ENABLE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_per_adv_params_sync(struct hci_dev *hdev, u8 instance,</div><div class='add'>+				       u16 min_interval, u16 max_interval)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_per_adv_params cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (!min_interval)</div><div class='add'>+		min_interval = DISCOV_LE_PER_ADV_INT_MIN;</div><div class='add'>+</div><div class='add'>+	if (!max_interval)</div><div class='add'>+		max_interval = DISCOV_LE_PER_ADV_INT_MAX;</div><div class='add'>+</div><div class='add'>+	cp.handle = instance;</div><div class='add'>+	cp.min_interval = cpu_to_le16(min_interval);</div><div class='add'>+	cp.max_interval = cpu_to_le16(max_interval);</div><div class='add'>+	cp.periodic_properties = 0x0000;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_PER_ADV_PARAMS,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_per_adv_data_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_set_per_adv_data, pdu, data, length,</div><div class='add'>+		    HCI_MAX_PER_AD_LENGTH);</div><div class='add'>+	u8 len;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (!adv || !adv-&gt;periodic)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = eir_create_per_adv_data(hdev, instance, pdu-&gt;data);</div><div class='add'>+</div><div class='add'>+	pdu-&gt;length = len;</div><div class='add'>+	pdu-&gt;handle = adv ? adv-&gt;handle : instance;</div><div class='add'>+	pdu-&gt;operation = LE_SET_ADV_DATA_OP_COMPLETE;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_PER_ADV_DATA,</div><div class='add'>+				     struct_size(pdu, data, len), pdu,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_enable_per_advertising_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_per_adv_enable cp;</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+</div><div class='add'>+	/* If periodic advertising already enabled there is nothing to do. */</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (adv &amp;&amp; adv-&gt;periodic_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.enable = 0x01;</div><div class='add'>+	cp.handle = instance;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_PER_ADV_ENABLE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Checks if periodic advertising data contains a Basic Announcement and if it</div><div class='add'>+ * does generates a Broadcast ID and add Broadcast Announcement.</div><div class='add'>+ */</div><div class='add'>+static int hci_adv_bcast_annoucement(struct hci_dev *hdev, struct adv_info *adv)</div><div class='add'>+{</div><div class='add'>+	u8 bid[3];</div><div class='add'>+	u8 ad[HCI_MAX_EXT_AD_LENGTH];</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	/* Skip if NULL adv as instance 0x00 is used for general purpose</div><div class='add'>+	 * advertising so it cannot used for the likes of Broadcast Announcement</div><div class='add'>+	 * as it can be overwritten at any point.</div><div class='add'>+	 */</div><div class='add'>+	if (!adv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if PA data doesn't contains a Basic Audio Announcement then</div><div class='add'>+	 * there is nothing to do.</div><div class='add'>+	 */</div><div class='add'>+	if (!eir_get_service_data(adv-&gt;per_adv_data, adv-&gt;per_adv_data_len,</div><div class='add'>+				  0x1851, NULL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if advertising data already has a Broadcast Announcement since</div><div class='add'>+	 * the process may want to control the Broadcast ID directly and in that</div><div class='add'>+	 * case the kernel shall no interfere.</div><div class='add'>+	 */</div><div class='add'>+	if (eir_get_service_data(adv-&gt;adv_data, adv-&gt;adv_data_len, 0x1852,</div><div class='add'>+				 NULL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Generate Broadcast ID */</div><div class='add'>+	get_random_bytes(bid, sizeof(bid));</div><div class='add'>+	len = eir_append_service_data(ad, 0, 0x1852, bid, sizeof(bid));</div><div class='add'>+	memcpy(ad + len, adv-&gt;adv_data, adv-&gt;adv_data_len);</div><div class='add'>+	hci_set_adv_instance_data(hdev, adv-&gt;instance, len + adv-&gt;adv_data_len,</div><div class='add'>+				  ad, 0, NULL);</div><div class='add'>+</div><div class='add'>+	return hci_update_adv_data_sync(hdev, adv-&gt;instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_start_per_adv_sync(struct hci_dev *hdev, u8 instance, u8 sid,</div><div class='add'>+			   u8 data_len, u8 *data, u32 flags, u16 min_interval,</div><div class='add'>+			   u16 max_interval, u16 sync_interval)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	bool added = false;</div><div class='add'>+</div><div class='add'>+	hci_disable_per_advertising_sync(hdev, instance);</div><div class='add'>+</div><div class='add'>+	if (instance) {</div><div class='add'>+		adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+		if (adv) {</div><div class='add'>+			if (sid != HCI_SID_INVALID &amp;&amp; adv-&gt;sid != sid) {</div><div class='add'>+				/* If the SID don't match attempt to find by</div><div class='add'>+				 * SID.</div><div class='add'>+				 */</div><div class='add'>+				adv = hci_find_adv_sid(hdev, sid);</div><div class='add'>+				if (!adv) {</div><div class='add'>+					bt_dev_err(hdev,</div><div class='add'>+						   "Unable to find adv_info");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Turn it into periodic advertising */</div><div class='add'>+			adv-&gt;periodic = true;</div><div class='add'>+			adv-&gt;per_adv_data_len = data_len;</div><div class='add'>+			if (data)</div><div class='add'>+				memcpy(adv-&gt;per_adv_data, data, data_len);</div><div class='add'>+			adv-&gt;flags = flags;</div><div class='add'>+		} else if (!adv) {</div><div class='add'>+			/* Create an instance if that could not be found */</div><div class='add'>+			adv = hci_add_per_instance(hdev, instance, sid, flags,</div><div class='add'>+						   data_len, data,</div><div class='add'>+						   sync_interval,</div><div class='add'>+						   sync_interval);</div><div class='add'>+			if (IS_ERR(adv))</div><div class='add'>+				return PTR_ERR(adv);</div><div class='add'>+			adv-&gt;pending = false;</div><div class='add'>+			added = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start advertising */</div><div class='add'>+	err = hci_start_ext_adv_sync(hdev, instance);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = hci_adv_bcast_annoucement(hdev, adv);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = hci_set_per_adv_params_sync(hdev, instance, min_interval,</div><div class='add'>+					  max_interval);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = hci_set_per_adv_data_sync(hdev, instance);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = hci_enable_per_advertising_sync(hdev, instance);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	if (added)</div><div class='add'>+		hci_remove_adv_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_start_adv_sync(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_start_ext_adv_sync(hdev, instance);</div><div class='add'>+</div><div class='add'>+	err = hci_update_adv_data_sync(hdev, instance);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_update_scan_rsp_data_sync(hdev, instance);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_enable_advertising_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_enable_advertising_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv_instance;</div><div class='add'>+	struct hci_cp_le_set_adv_param cp;</div><div class='add'>+	u8 own_addr_type, enable = 0x01;</div><div class='add'>+	bool connectable;</div><div class='add'>+	u16 adv_min_interval, adv_max_interval;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_enable_ext_advertising_sync(hdev,</div><div class='add'>+						       hdev-&gt;cur_adv_instance);</div><div class='add'>+</div><div class='add'>+	flags = hci_adv_instance_flags(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+	adv_instance = hci_find_adv_instance(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+</div><div class='add'>+	/* If the "connectable" instance flag was not set, then choose between</div><div class='add'>+	 * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.</div><div class='add'>+	 */</div><div class='add'>+	connectable = (flags &amp; MGMT_ADV_FLAG_CONNECTABLE) ||</div><div class='add'>+		      mgmt_get_connectable(hdev);</div><div class='add'>+</div><div class='add'>+	if (!is_advertising_allowed(hdev, connectable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	status = hci_disable_advertising_sync(hdev);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* Clear the HCI_LE_ADV bit temporarily so that the</div><div class='add'>+	 * hci_update_random_address knows that it's safe to go ahead</div><div class='add'>+	 * and write a new random address. The flag will be set back on</div><div class='add'>+	 * as soon as the SET_ADV_ENABLE HCI command completes.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='add'>+</div><div class='add'>+	/* Set require_privacy to true only when non-connectable</div><div class='add'>+	 * advertising is used. In that case it is fine to use a</div><div class='add'>+	 * non-resolvable private address.</div><div class='add'>+	 */</div><div class='add'>+	status = hci_update_random_address_sync(hdev, !connectable,</div><div class='add'>+						adv_use_rpa(hdev, flags),</div><div class='add'>+						&amp;own_addr_type);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (adv_instance) {</div><div class='add'>+		adv_min_interval = adv_instance-&gt;min_interval;</div><div class='add'>+		adv_max_interval = adv_instance-&gt;max_interval;</div><div class='add'>+	} else {</div><div class='add'>+		adv_min_interval = hdev-&gt;le_adv_min_interval;</div><div class='add'>+		adv_max_interval = hdev-&gt;le_adv_max_interval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (connectable) {</div><div class='add'>+		cp.type = LE_ADV_IND;</div><div class='add'>+	} else {</div><div class='add'>+		if (hci_adv_instance_is_scannable(hdev, hdev-&gt;cur_adv_instance))</div><div class='add'>+			cp.type = LE_ADV_SCAN_IND;</div><div class='add'>+		else</div><div class='add'>+			cp.type = LE_ADV_NONCONN_IND;</div><div class='add'>+</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE) ||</div><div class='add'>+		    hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {</div><div class='add'>+			adv_min_interval = DISCOV_LE_FAST_ADV_INT_MIN;</div><div class='add'>+			adv_max_interval = DISCOV_LE_FAST_ADV_INT_MAX;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp.min_interval = cpu_to_le16(adv_min_interval);</div><div class='add'>+	cp.max_interval = cpu_to_le16(adv_max_interval);</div><div class='add'>+	cp.own_address_type = own_addr_type;</div><div class='add'>+	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='add'>+</div><div class='add'>+	status = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_PARAM,</div><div class='add'>+				       sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_ENABLE,</div><div class='add'>+				     sizeof(enable), &amp;enable, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enable_advertising_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_enable_advertising_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_enable_advertising(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;hdev-&gt;adv_instances))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_queue(hdev, enable_advertising_sync, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_remove_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance,</div><div class='add'>+				     struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ext_adv_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = hci_disable_ext_adv_instance_sync(hdev, instance);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If request specifies an instance that doesn't exist, fail */</div><div class='add'>+	if (instance &gt; 0 &amp;&amp; !hci_find_adv_instance(hdev, instance))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_REMOVE_ADV_SET,</div><div class='add'>+					sizeof(instance), &amp;instance, 0,</div><div class='add'>+					HCI_CMD_TIMEOUT, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_terminate_big_sync(struct hci_dev *hdev, u8 handle, u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_term_big cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+	cp.reason = reason;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_TERM_BIG,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_schedule_adv_instance_sync(struct hci_dev *hdev, u8 instance,</div><div class='add'>+				   bool force)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv = NULL;</div><div class='add'>+	u16 timeout;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp; !ext_adv_capable(hdev))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;adv_instance_timeout)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+	if (!adv)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* A zero timeout means unlimited advertising. As long as there is</div><div class='add'>+	 * only one instance, duration should be ignored. We still set a timeout</div><div class='add'>+	 * in case further instances are being added later on.</div><div class='add'>+	 *</div><div class='add'>+	 * If the remaining lifetime of the instance is more than the duration</div><div class='add'>+	 * then the timeout corresponds to the duration, otherwise it will be</div><div class='add'>+	 * reduced to the remaining instance lifetime.</div><div class='add'>+	 */</div><div class='add'>+	if (adv-&gt;timeout == 0 || adv-&gt;duration &lt;= adv-&gt;remaining_time)</div><div class='add'>+		timeout = adv-&gt;duration;</div><div class='add'>+	else</div><div class='add'>+		timeout = adv-&gt;remaining_time;</div><div class='add'>+</div><div class='add'>+	/* The remaining time is being reduced unless the instance is being</div><div class='add'>+	 * advertised without time limit.</div><div class='add'>+	 */</div><div class='add'>+	if (adv-&gt;timeout)</div><div class='add'>+		adv-&gt;remaining_time = adv-&gt;remaining_time - timeout;</div><div class='add'>+</div><div class='add'>+	/* Only use work for scheduling instances with legacy advertising */</div><div class='add'>+	if (!ext_adv_capable(hdev)) {</div><div class='add'>+		hdev-&gt;adv_instance_timeout = timeout;</div><div class='add'>+		queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='add'>+				   &amp;hdev-&gt;adv_instance_expire,</div><div class='add'>+				   secs_to_jiffies(timeout));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we're just re-scheduling the same instance again then do not</div><div class='add'>+	 * execute any HCI commands. This happens when a single instance is</div><div class='add'>+	 * being advertised.</div><div class='add'>+	 */</div><div class='add'>+	if (!force &amp;&amp; hdev-&gt;cur_adv_instance == instance &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;cur_adv_instance = instance;</div><div class='add'>+</div><div class='add'>+	return hci_start_adv_sync(hdev, instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_clear_adv_sets_sync(struct hci_dev *hdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ext_adv_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Disable instance 0x00 to disable all instances */</div><div class='add'>+	err = hci_disable_ext_adv_instance_sync(hdev, 0x00);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_CLEAR_ADV_SETS,</div><div class='add'>+					0, NULL, 0, HCI_CMD_TIMEOUT, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_clear_adv_sync(struct hci_dev *hdev, struct sock *sk, bool force)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv, *n;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		/* Remove all existing sets */</div><div class='add'>+		return hci_clear_adv_sets_sync(hdev, sk);</div><div class='add'>+</div><div class='add'>+	/* This is safe as long as there is no command send while the lock is</div><div class='add'>+	 * held.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Cleanup non-ext instances */</div><div class='add'>+	list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+		u8 instance = adv-&gt;instance;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(force || adv-&gt;timeout))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = hci_remove_adv_instance(hdev, instance);</div><div class='add'>+		if (!err)</div><div class='add'>+			mgmt_advertising_removed(sk, hdev, instance);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_remove_adv_sync(struct hci_dev *hdev, u8 instance,</div><div class='add'>+			       struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If we use extended advertising, instance has to be removed first. */</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_remove_ext_adv_instance_sync(hdev, instance, sk);</div><div class='add'>+</div><div class='add'>+	/* This is safe as long as there is no command send while the lock is</div><div class='add'>+	 * held.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	err = hci_remove_adv_instance(hdev, instance);</div><div class='add'>+	if (!err)</div><div class='add'>+		mgmt_advertising_removed(sk, hdev, instance);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For a single instance:</div><div class='add'>+ * - force == true: The instance will be removed even when its remaining</div><div class='add'>+ *   lifetime is not zero.</div><div class='add'>+ * - force == false: the instance will be deactivated but kept stored unless</div><div class='add'>+ *   the remaining lifetime is zero.</div><div class='add'>+ *</div><div class='add'>+ * For instance == 0x00:</div><div class='add'>+ * - force == true: All instances will be removed regardless of their timeout</div><div class='add'>+ *   setting.</div><div class='add'>+ * - force == false: Only instances that have a timeout will be removed.</div><div class='add'>+ */</div><div class='add'>+int hci_remove_advertising_sync(struct hci_dev *hdev, struct sock *sk,</div><div class='add'>+				u8 instance, bool force)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *next = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Cancel any timeout concerning the removed instance(s). */</div><div class='add'>+	if (!instance || hdev-&gt;cur_adv_instance == instance)</div><div class='add'>+		cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+	/* Get the next instance to advertise BEFORE we remove</div><div class='add'>+	 * the current one. This can be the same instance again</div><div class='add'>+	 * if there is only one instance.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;cur_adv_instance == instance)</div><div class='add'>+		next = hci_get_next_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+	if (!instance) {</div><div class='add'>+		err = hci_clear_adv_sync(hdev, sk, force);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		struct adv_info *adv = hci_find_adv_instance(hdev, instance);</div><div class='add'>+</div><div class='add'>+		if (force || (adv &amp;&amp; adv-&gt;timeout &amp;&amp; !adv-&gt;remaining_time)) {</div><div class='add'>+			/* Don't advertise a removed instance. */</div><div class='add'>+			if (next &amp;&amp; next-&gt;instance == instance)</div><div class='add'>+				next = NULL;</div><div class='add'>+</div><div class='add'>+			err = hci_remove_adv_sync(hdev, instance, sk);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev) || hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (next &amp;&amp; !ext_adv_capable(hdev))</div><div class='add'>+		hci_schedule_adv_instance_sync(hdev, next-&gt;instance, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_read_rssi_sync(struct hci_dev *hdev, __le16 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_read_rssi cp;</div><div class='add'>+</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_RSSI,</div><div class='add'>+					sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_read_clock_sync(struct hci_dev *hdev, struct hci_cp_read_clock *cp)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_CLOCK,</div><div class='add'>+					sizeof(*cp), cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_read_tx_power_sync(struct hci_dev *hdev, __le16 handle, u8 type)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_read_tx_power cp;</div><div class='add'>+</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+	cp.type = type;</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_TX_POWER,</div><div class='add'>+					sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_disable_advertising_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 enable = 0x00;</div><div class='add'>+</div><div class='add'>+	/* If controller is not advertising we are done. */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_disable_ext_adv_instance_sync(hdev, 0x00);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_ENABLE,</div><div class='add'>+				     sizeof(enable), &amp;enable, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_ext_scan_enable_sync(struct hci_dev *hdev, u8 val,</div><div class='add'>+					   u8 filter_dup)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_scan_enable cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.enable = val;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MESH))</div><div class='add'>+		cp.filter_dup = LE_SCAN_FILTER_DUP_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		cp.filter_dup = filter_dup;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_ENABLE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_scan_enable_sync(struct hci_dev *hdev, u8 val,</div><div class='add'>+				       u8 filter_dup)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_scan_enable cp;</div><div class='add'>+</div><div class='add'>+	if (use_ext_scan(hdev))</div><div class='add'>+		return hci_le_set_ext_scan_enable_sync(hdev, val, filter_dup);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.enable = val;</div><div class='add'>+</div><div class='add'>+	if (val &amp;&amp; hci_dev_test_flag(hdev, HCI_MESH))</div><div class='add'>+		cp.filter_dup = LE_SCAN_FILTER_DUP_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		cp.filter_dup = filter_dup;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_SCAN_ENABLE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_addr_resolution_enable_sync(struct hci_dev *hdev, u8 val)</div><div class='add'>+{</div><div class='add'>+	if (!ll_privacy_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If controller is not/already resolving we are done. */</div><div class='add'>+	if (val == hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADDR_RESOLV_ENABLE,</div><div class='add'>+				     sizeof(val), &amp;val, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_scan_disable_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If controller is not scanning we are done. */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;scanning_paused) {</div><div class='add'>+		bt_dev_dbg(hdev, "Scanning is paused for suspend");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_le_set_scan_enable_sync(hdev, LE_SCAN_DISABLE, 0x00);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to disable scanning: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool scan_use_rpa(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hci_dev_test_flag(hdev, HCI_PRIVACY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_start_interleave_scan(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	hdev-&gt;interleave_scan_state = INTERLEAVE_SCAN_NO_FILTER;</div><div class='add'>+	queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='add'>+			   &amp;hdev-&gt;interleave_scan, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cancel_interleave_scan(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "cancelling interleave scan");</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;interleave_scan);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;interleave_scan_state = INTERLEAVE_SCAN_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return true if interleave_scan wasn't started until exiting this function,</div><div class='add'>+ * otherwise, return false</div><div class='add'>+ */</div><div class='add'>+static bool hci_update_interleaved_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* Do interleaved scan only if all of the following are true:</div><div class='add'>+	 * - There is at least one ADV monitor</div><div class='add'>+	 * - At least one pending LE connection or one device to be scanned for</div><div class='add'>+	 * - Monitor offloading is not supported</div><div class='add'>+	 * If so, we should alternate between allowlist scan and one without</div><div class='add'>+	 * any filters to save power.</div><div class='add'>+	 */</div><div class='add'>+	bool use_interleaving = hci_is_adv_monitoring(hdev) &amp;&amp;</div><div class='add'>+				!(list_empty(&amp;hdev-&gt;pend_le_conns) &amp;&amp;</div><div class='add'>+				  list_empty(&amp;hdev-&gt;pend_le_reports)) &amp;&amp;</div><div class='add'>+				hci_get_adv_monitor_offload_ext(hdev) ==</div><div class='add'>+				    HCI_ADV_MONITOR_EXT_NONE;</div><div class='add'>+	bool is_interleaving = is_interleave_scanning(hdev);</div><div class='add'>+</div><div class='add'>+	if (use_interleaving &amp;&amp; !is_interleaving) {</div><div class='add'>+		hci_start_interleave_scan(hdev);</div><div class='add'>+		bt_dev_dbg(hdev, "starting interleave scan");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!use_interleaving &amp;&amp; is_interleaving)</div><div class='add'>+		cancel_interleave_scan(hdev);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Removes connection to resolve list if needed.*/</div><div class='add'>+static int hci_le_del_resolve_list_sync(struct hci_dev *hdev,</div><div class='add'>+					bdaddr_t *bdaddr, u8 bdaddr_type)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_del_from_resolv_list cp;</div><div class='add'>+	struct bdaddr_list_with_irk *entry;</div><div class='add'>+</div><div class='add'>+	if (!ll_privacy_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the IRK has been programmed */</div><div class='add'>+	entry = hci_bdaddr_list_lookup_with_irk(&amp;hdev-&gt;le_resolv_list, bdaddr,</div><div class='add'>+						bdaddr_type);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cp.bdaddr_type = bdaddr_type;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, bdaddr);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_DEL_FROM_RESOLV_LIST,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_del_accept_list_sync(struct hci_dev *hdev,</div><div class='add'>+				       bdaddr_t *bdaddr, u8 bdaddr_type)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_del_from_accept_list cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check if device is on accept list before removing it */</div><div class='add'>+	if (!hci_bdaddr_list_lookup(&amp;hdev-&gt;le_accept_list, bdaddr, bdaddr_type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cp.bdaddr_type = bdaddr_type;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, bdaddr);</div><div class='add'>+</div><div class='add'>+	/* Ignore errors when removing from resolving list as that is likely</div><div class='add'>+	 * that the device was never added.</div><div class='add'>+	 */</div><div class='add'>+	hci_le_del_resolve_list_sync(hdev, &amp;cp.bdaddr, cp.bdaddr_type);</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_DEL_FROM_ACCEPT_LIST,</div><div class='add'>+				    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to remove from allow list: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Remove %pMR (0x%x) from allow list", &amp;cp.bdaddr,</div><div class='add'>+		   cp.bdaddr_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct conn_params {</div><div class='add'>+	bdaddr_t addr;</div><div class='add'>+	u8 addr_type;</div><div class='add'>+	hci_conn_flags_t flags;</div><div class='add'>+	u8 privacy_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Adds connection to resolve list if needed.</div><div class='add'>+ * Setting params to NULL programs local hdev-&gt;irk</div><div class='add'>+ */</div><div class='add'>+static int hci_le_add_resolve_list_sync(struct hci_dev *hdev,</div><div class='add'>+					struct conn_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_add_to_resolv_list cp;</div><div class='add'>+	struct smp_irk *irk;</div><div class='add'>+	struct bdaddr_list_with_irk *entry;</div><div class='add'>+	struct hci_conn_params *p;</div><div class='add'>+</div><div class='add'>+	if (!ll_privacy_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Attempt to program local identity address, type and irk if params is</div><div class='add'>+	 * NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (!params) {</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_PRIVACY))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		hci_copy_identity_address(hdev, &amp;cp.bdaddr, &amp;cp.bdaddr_type);</div><div class='add'>+		memcpy(cp.peer_irk, hdev-&gt;irk, 16);</div><div class='add'>+		goto done;</div><div class='add'>+	} else if (!(params-&gt;flags &amp; HCI_CONN_FLAG_ADDRESS_RESOLUTION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	irk = hci_find_irk_by_addr(hdev, &amp;params-&gt;addr, params-&gt;addr_type);</div><div class='add'>+	if (!irk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the IK has _not_ been programmed yet. */</div><div class='add'>+	entry = hci_bdaddr_list_lookup_with_irk(&amp;hdev-&gt;le_resolv_list,</div><div class='add'>+						&amp;params-&gt;addr,</div><div class='add'>+						params-&gt;addr_type);</div><div class='add'>+	if (entry)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cp.bdaddr_type = params-&gt;addr_type;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;params-&gt;addr);</div><div class='add'>+	memcpy(cp.peer_irk, irk-&gt;val, 16);</div><div class='add'>+</div><div class='add'>+	/* Default privacy mode is always Network */</div><div class='add'>+	params-&gt;privacy_mode = HCI_NETWORK_PRIVACY;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	p = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns,</div><div class='add'>+				      &amp;params-&gt;addr, params-&gt;addr_type);</div><div class='add'>+	if (!p)</div><div class='add'>+		p = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_reports,</div><div class='add'>+					      &amp;params-&gt;addr, params-&gt;addr_type);</div><div class='add'>+	if (p)</div><div class='add'>+		WRITE_ONCE(p-&gt;privacy_mode, HCI_NETWORK_PRIVACY);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_PRIVACY))</div><div class='add'>+		memcpy(cp.local_irk, hdev-&gt;irk, 16);</div><div class='add'>+	else</div><div class='add'>+		memset(cp.local_irk, 0, 16);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_ADD_TO_RESOLV_LIST,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set Device Privacy Mode. */</div><div class='add'>+static int hci_le_set_privacy_mode_sync(struct hci_dev *hdev,</div><div class='add'>+					struct conn_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_privacy_mode cp;</div><div class='add'>+	struct smp_irk *irk;</div><div class='add'>+</div><div class='add'>+	if (!ll_privacy_capable(hdev) ||</div><div class='add'>+	    !(params-&gt;flags &amp; HCI_CONN_FLAG_ADDRESS_RESOLUTION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If device privacy mode has already been set there is nothing to do */</div><div class='add'>+	if (params-&gt;privacy_mode == HCI_DEVICE_PRIVACY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if HCI_CONN_FLAG_DEVICE_PRIVACY has been set as it also</div><div class='add'>+	 * indicates that LL Privacy has been enabled and</div><div class='add'>+	 * HCI_OP_LE_SET_PRIVACY_MODE is supported.</div><div class='add'>+	 */</div><div class='add'>+	if (!(params-&gt;flags &amp; HCI_CONN_FLAG_DEVICE_PRIVACY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	irk = hci_find_irk_by_addr(hdev, &amp;params-&gt;addr, params-&gt;addr_type);</div><div class='add'>+	if (!irk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.bdaddr_type = irk-&gt;addr_type;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;irk-&gt;bdaddr);</div><div class='add'>+	cp.mode = HCI_DEVICE_PRIVACY;</div><div class='add'>+</div><div class='add'>+	/* Note: params-&gt;privacy_mode is not updated since it is a copy */</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_PRIVACY_MODE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Adds connection to allow list if needed, if the device uses RPA (has IRK)</div><div class='add'>+ * this attempts to program the device in the resolving list as well and</div><div class='add'>+ * properly set the privacy mode.</div><div class='add'>+ */</div><div class='add'>+static int hci_le_add_accept_list_sync(struct hci_dev *hdev,</div><div class='add'>+				       struct conn_params *params,</div><div class='add'>+				       u8 *num_entries)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_add_to_accept_list cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* During suspend, only wakeable devices can be in acceptlist */</div><div class='add'>+	if (hdev-&gt;suspended &amp;&amp;</div><div class='add'>+	    !(params-&gt;flags &amp; HCI_CONN_FLAG_REMOTE_WAKEUP)) {</div><div class='add'>+		hci_le_del_accept_list_sync(hdev, &amp;params-&gt;addr,</div><div class='add'>+					    params-&gt;addr_type);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select filter policy to accept all advertising */</div><div class='add'>+	if (*num_entries &gt;= hdev-&gt;le_accept_list_size)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* Attempt to program the device in the resolving list first to avoid</div><div class='add'>+	 * having to rollback in case it fails since the resolving list is</div><div class='add'>+	 * dynamic it can probably be smaller than the accept list.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_le_add_resolve_list_sync(hdev, params);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to add to resolve list: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set Privacy Mode */</div><div class='add'>+	err = hci_le_set_privacy_mode_sync(hdev, params);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to set privacy mode: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if already in accept list */</div><div class='add'>+	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;le_accept_list, &amp;params-&gt;addr,</div><div class='add'>+				   params-&gt;addr_type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*num_entries += 1;</div><div class='add'>+	cp.bdaddr_type = params-&gt;addr_type;</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;params-&gt;addr);</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST,</div><div class='add'>+				    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to add to allow list: %d", err);</div><div class='add'>+		/* Rollback the device from the resolving list */</div><div class='add'>+		hci_le_del_resolve_list_sync(hdev, &amp;cp.bdaddr, cp.bdaddr_type);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Add %pMR (0x%x) to allow list", &amp;cp.bdaddr,</div><div class='add'>+		   cp.bdaddr_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function disables/pause all advertising instances */</div><div class='add'>+static int hci_pause_advertising_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int old_state;</div><div class='add'>+</div><div class='add'>+	/* If controller is not advertising we are done. */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If already been paused there is nothing to do. */</div><div class='add'>+	if (hdev-&gt;advertising_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Pausing directed advertising");</div><div class='add'>+</div><div class='add'>+	/* Stop directed advertising */</div><div class='add'>+	old_state = hci_dev_test_flag(hdev, HCI_ADVERTISING);</div><div class='add'>+	if (old_state) {</div><div class='add'>+		/* When discoverable timeout triggers, then just make sure</div><div class='add'>+		 * the limited discoverable flag is cleared. Even in the case</div><div class='add'>+		 * of a timeout triggered from general discoverable, it is</div><div class='add'>+		 * safe to unconditionally clear the flag.</div><div class='add'>+		 */</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);</div><div class='add'>+		hdev-&gt;discov_timeout = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Pausing advertising instances");</div><div class='add'>+</div><div class='add'>+	/* Call to disable any advertisements active on the controller.</div><div class='add'>+	 * This will succeed even if no advertisements are configured.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_disable_advertising_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If we are using software rotation, pause the loop */</div><div class='add'>+	if (!ext_adv_capable(hdev))</div><div class='add'>+		cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;advertising_paused = true;</div><div class='add'>+	hdev-&gt;advertising_old_state = old_state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function enables all user advertising instances */</div><div class='add'>+static int hci_resume_advertising_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv, *tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If advertising has not been paused there is nothing  to do. */</div><div class='add'>+	if (!hdev-&gt;advertising_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Resume directed advertising */</div><div class='add'>+	hdev-&gt;advertising_paused = false;</div><div class='add'>+	if (hdev-&gt;advertising_old_state) {</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_ADVERTISING);</div><div class='add'>+		hdev-&gt;advertising_old_state = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Resuming advertising instances");</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev)) {</div><div class='add'>+		/* Call for each tracked instance to be re-enabled */</div><div class='add'>+		list_for_each_entry_safe(adv, tmp, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+			err = hci_enable_ext_advertising_sync(hdev,</div><div class='add'>+							      adv-&gt;instance);</div><div class='add'>+			if (!err)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* If the instance cannot be resumed remove it */</div><div class='add'>+			hci_remove_ext_adv_instance_sync(hdev, adv-&gt;instance,</div><div class='add'>+							 NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If current advertising instance is set to instance 0x00</div><div class='add'>+		 * then we need to re-enable it.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_and_clear_flag(hdev, HCI_LE_ADV_0))</div><div class='add'>+			err = hci_enable_ext_advertising_sync(hdev, 0x00);</div><div class='add'>+	} else {</div><div class='add'>+		/* Schedule for most recent instance to be restarted and begin</div><div class='add'>+		 * the software rotation loop</div><div class='add'>+		 */</div><div class='add'>+		err = hci_schedule_adv_instance_sync(hdev,</div><div class='add'>+						     hdev-&gt;cur_adv_instance,</div><div class='add'>+						     true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;advertising_paused = false;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_pause_addr_resolution(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ll_privacy_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Cannot disable addr resolution if scanning is enabled or</div><div class='add'>+	 * when initiating an LE connection.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LE_SCAN) ||</div><div class='add'>+	    hci_lookup_le_connect(hdev)) {</div><div class='add'>+		bt_dev_err(hdev, "Command not allowed when scan/LE connect");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cannot disable addr resolution if advertising is enabled. */</div><div class='add'>+	err = hci_pause_advertising_sync(hdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Pause advertising failed: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_le_set_addr_resolution_enable_sync(hdev, 0x00);</div><div class='add'>+	if (err)</div><div class='add'>+		bt_dev_err(hdev, "Unable to disable Address Resolution: %d",</div><div class='add'>+			   err);</div><div class='add'>+</div><div class='add'>+	/* Return if address resolution is disabled and RPA is not used. */</div><div class='add'>+	if (!err &amp;&amp; scan_use_rpa(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_resume_advertising_sync(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *hci_read_local_oob_data_sync(struct hci_dev *hdev,</div><div class='add'>+					     bool extended, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	u16 opcode = extended ? HCI_OP_READ_LOCAL_OOB_EXT_DATA :</div><div class='add'>+					HCI_OP_READ_LOCAL_OOB_DATA;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_sk(hdev, opcode, 0, NULL, 0, HCI_CMD_TIMEOUT, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct conn_params *conn_params_copy(struct list_head *list, size_t *n)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+	struct conn_params *p;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	list_for_each_entry_rcu(params, list, action)</div><div class='add'>+		++i;</div><div class='add'>+	*n = i;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	p = kvcalloc(*n, sizeof(struct conn_params), GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	list_for_each_entry_rcu(params, list, action) {</div><div class='add'>+		/* Racing adds are handled in next scan update */</div><div class='add'>+		if (i &gt;= *n)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* No hdev-&gt;lock, but: addr, addr_type are immutable.</div><div class='add'>+		 * privacy_mode is only written by us or in</div><div class='add'>+		 * hci_cc_le_set_privacy_mode that we wait for.</div><div class='add'>+		 * We should be idempotent so MGMT updating flags</div><div class='add'>+		 * while we are processing is OK.</div><div class='add'>+		 */</div><div class='add'>+		bacpy(&amp;p[i].addr, &amp;params-&gt;addr);</div><div class='add'>+		p[i].addr_type = params-&gt;addr_type;</div><div class='add'>+		p[i].flags = READ_ONCE(params-&gt;flags);</div><div class='add'>+		p[i].privacy_mode = READ_ONCE(params-&gt;privacy_mode);</div><div class='add'>+		++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	*n = i;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Clear LE Accept List */</div><div class='add'>+static int hci_le_clear_accept_list_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[26] &amp; 0x80))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Device must not be scanning when updating the accept list.</div><div class='add'>+ *</div><div class='add'>+ * Update is done using the following sequence:</div><div class='add'>+ *</div><div class='add'>+ * ll_privacy_capable((Disable Advertising) -&gt; Disable Resolving List) -&gt;</div><div class='add'>+ * Remove Devices From Accept List -&gt;</div><div class='add'>+ * (has IRK &amp;&amp; ll_privacy_capable(Remove Devices From Resolving List))-&gt;</div><div class='add'>+ * Add Devices to Accept List -&gt;</div><div class='add'>+ * (has IRK &amp;&amp; ll_privacy_capable(Remove Devices From Resolving List)) -&gt;</div><div class='add'>+ * ll_privacy_capable(Enable Resolving List -&gt; (Enable Advertising)) -&gt;</div><div class='add'>+ * Enable Scanning</div><div class='add'>+ *</div><div class='add'>+ * In case of failure advertising shall be restored to its original state and</div><div class='add'>+ * return would disable accept list since either accept or resolving list could</div><div class='add'>+ * not be programmed.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static u8 hci_update_accept_list_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct conn_params *params;</div><div class='add'>+	struct bdaddr_list *b, *t;</div><div class='add'>+	u8 num_entries = 0;</div><div class='add'>+	bool pend_conn, pend_report;</div><div class='add'>+	u8 filter_policy;</div><div class='add'>+	size_t i, n;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Pause advertising if resolving list can be used as controllers</div><div class='add'>+	 * cannot accept resolving list modifications while advertising.</div><div class='add'>+	 */</div><div class='add'>+	if (ll_privacy_capable(hdev)) {</div><div class='add'>+		err = hci_pause_advertising_sync(hdev);</div><div class='add'>+		if (err) {</div><div class='add'>+			bt_dev_err(hdev, "pause advertising failed: %d", err);</div><div class='add'>+			return 0x00;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable address resolution while reprogramming accept list since</div><div class='add'>+	 * devices that do have an IRK will be programmed in the resolving list</div><div class='add'>+	 * when LL Privacy is enabled.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_le_set_addr_resolution_enable_sync(hdev, 0x00);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to disable LL privacy: %d", err);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Force address filtering if PA Sync is in progress */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_PA_SYNC)) {</div><div class='add'>+		struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+		conn = hci_conn_hash_lookup_create_pa_sync(hdev);</div><div class='add'>+		if (conn) {</div><div class='add'>+			struct conn_params pa;</div><div class='add'>+</div><div class='add'>+			memset(&amp;pa, 0, sizeof(pa));</div><div class='add'>+</div><div class='add'>+			bacpy(&amp;pa.addr, &amp;conn-&gt;dst);</div><div class='add'>+			pa.addr_type = conn-&gt;dst_type;</div><div class='add'>+</div><div class='add'>+			/* Clear first since there could be addresses left</div><div class='add'>+			 * behind.</div><div class='add'>+			 */</div><div class='add'>+			hci_le_clear_accept_list_sync(hdev);</div><div class='add'>+</div><div class='add'>+			num_entries = 1;</div><div class='add'>+			err = hci_le_add_accept_list_sync(hdev, &amp;pa,</div><div class='add'>+							  &amp;num_entries);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Go through the current accept list programmed into the</div><div class='add'>+	 * controller one by one and check if that address is connected or is</div><div class='add'>+	 * still in the list of pending connections or list of devices to</div><div class='add'>+	 * report. If not present in either list, then remove it from</div><div class='add'>+	 * the controller.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(b, t, &amp;hdev-&gt;le_accept_list, list) {</div><div class='add'>+		if (hci_conn_hash_lookup_le(hdev, &amp;b-&gt;bdaddr, b-&gt;bdaddr_type))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Pointers not dereferenced, no locks needed */</div><div class='add'>+		pend_conn = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_conns,</div><div class='add'>+						      &amp;b-&gt;bdaddr,</div><div class='add'>+						      b-&gt;bdaddr_type);</div><div class='add'>+		pend_report = hci_pend_le_action_lookup(&amp;hdev-&gt;pend_le_reports,</div><div class='add'>+							&amp;b-&gt;bdaddr,</div><div class='add'>+							b-&gt;bdaddr_type);</div><div class='add'>+</div><div class='add'>+		/* If the device is not likely to connect or report,</div><div class='add'>+		 * remove it from the acceptlist.</div><div class='add'>+		 */</div><div class='add'>+		if (!pend_conn &amp;&amp; !pend_report) {</div><div class='add'>+			hci_le_del_accept_list_sync(hdev, &amp;b-&gt;bdaddr,</div><div class='add'>+						    b-&gt;bdaddr_type);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_entries++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Since all no longer valid accept list entries have been</div><div class='add'>+	 * removed, walk through the list of pending connections</div><div class='add'>+	 * and ensure that any new device gets programmed into</div><div class='add'>+	 * the controller.</div><div class='add'>+	 *</div><div class='add'>+	 * If the list of the devices is larger than the list of</div><div class='add'>+	 * available accept list entries in the controller, then</div><div class='add'>+	 * just abort and return filer policy value to not use the</div><div class='add'>+	 * accept list.</div><div class='add'>+	 *</div><div class='add'>+	 * The list and params may be mutated while we wait for events,</div><div class='add'>+	 * so make a copy and iterate it.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	params = conn_params_copy(&amp;hdev-&gt;pend_le_conns, &amp;n);</div><div class='add'>+	if (!params) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; ++i) {</div><div class='add'>+		err = hci_le_add_accept_list_sync(hdev, &amp;params[i],</div><div class='add'>+						  &amp;num_entries);</div><div class='add'>+		if (err) {</div><div class='add'>+			kvfree(params);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvfree(params);</div><div class='add'>+</div><div class='add'>+	/* After adding all new pending connections, walk through</div><div class='add'>+	 * the list of pending reports and also add these to the</div><div class='add'>+	 * accept list if there is still space. Abort if space runs out.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	params = conn_params_copy(&amp;hdev-&gt;pend_le_reports, &amp;n);</div><div class='add'>+	if (!params) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; ++i) {</div><div class='add'>+		err = hci_le_add_accept_list_sync(hdev, &amp;params[i],</div><div class='add'>+						  &amp;num_entries);</div><div class='add'>+		if (err) {</div><div class='add'>+			kvfree(params);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvfree(params);</div><div class='add'>+</div><div class='add'>+	/* Use the allowlist unless the following conditions are all true:</div><div class='add'>+	 * - We are not currently suspending</div><div class='add'>+	 * - There are 1 or more ADV monitors registered and it's not offloaded</div><div class='add'>+	 * - Interleaved scanning is not currently using the allowlist</div><div class='add'>+	 */</div><div class='add'>+	if (!idr_is_empty(&amp;hdev-&gt;adv_monitors_idr) &amp;&amp; !hdev-&gt;suspended &amp;&amp;</div><div class='add'>+	    hci_get_adv_monitor_offload_ext(hdev) == HCI_ADV_MONITOR_EXT_NONE &amp;&amp;</div><div class='add'>+	    hdev-&gt;interleave_scan_state != INTERLEAVE_SCAN_ALLOWLIST)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	filter_policy = err ? 0x00 : 0x01;</div><div class='add'>+</div><div class='add'>+	/* Enable address resolution when LL Privacy is enabled. */</div><div class='add'>+	err = hci_le_set_addr_resolution_enable_sync(hdev, 0x01);</div><div class='add'>+	if (err)</div><div class='add'>+		bt_dev_err(hdev, "Unable to enable LL privacy: %d", err);</div><div class='add'>+</div><div class='add'>+	/* Resume advertising if it was paused */</div><div class='add'>+	if (ll_privacy_capable(hdev))</div><div class='add'>+		hci_resume_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Select filter policy to use accept list */</div><div class='add'>+	return filter_policy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_le_scan_phy_params(struct hci_cp_le_scan_phy_params *cp,</div><div class='add'>+				   u8 type, u16 interval, u16 window)</div><div class='add'>+{</div><div class='add'>+	cp-&gt;type = type;</div><div class='add'>+	cp-&gt;interval = cpu_to_le16(interval);</div><div class='add'>+	cp-&gt;window = cpu_to_le16(window);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,</div><div class='add'>+					  u16 interval, u16 window,</div><div class='add'>+					  u8 own_addr_type, u8 filter_policy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_scan_params *cp;</div><div class='add'>+	struct hci_cp_le_scan_phy_params *phy;</div><div class='add'>+	u8 data[sizeof(*cp) + sizeof(*phy) * 2];</div><div class='add'>+	u8 num_phy = 0x00;</div><div class='add'>+</div><div class='add'>+	cp = (void *)data;</div><div class='add'>+	phy = (void *)cp-&gt;data;</div><div class='add'>+</div><div class='add'>+	memset(data, 0, sizeof(data));</div><div class='add'>+</div><div class='add'>+	cp-&gt;own_addr_type = own_addr_type;</div><div class='add'>+	cp-&gt;filter_policy = filter_policy;</div><div class='add'>+</div><div class='add'>+	/* Check if PA Sync is in progress then select the PHY based on the</div><div class='add'>+	 * hci_conn.iso_qos.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_PA_SYNC)) {</div><div class='add'>+		struct hci_cp_le_add_to_accept_list *sent;</div><div class='add'>+</div><div class='add'>+		sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);</div><div class='add'>+		if (sent) {</div><div class='add'>+			struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+			conn = hci_conn_hash_lookup_ba(hdev, PA_LINK,</div><div class='add'>+						       &amp;sent-&gt;bdaddr);</div><div class='add'>+			if (conn) {</div><div class='add'>+				struct bt_iso_qos *qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+</div><div class='add'>+				if (qos-&gt;bcast.in.phy &amp; BT_ISO_PHY_1M ||</div><div class='add'>+				    qos-&gt;bcast.in.phy &amp; BT_ISO_PHY_2M) {</div><div class='add'>+					cp-&gt;scanning_phys |= LE_SCAN_PHY_1M;</div><div class='add'>+					hci_le_scan_phy_params(phy, type,</div><div class='add'>+							       interval,</div><div class='add'>+							       window);</div><div class='add'>+					num_phy++;</div><div class='add'>+					phy++;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (qos-&gt;bcast.in.phy &amp; BT_ISO_PHY_CODED) {</div><div class='add'>+					cp-&gt;scanning_phys |= LE_SCAN_PHY_CODED;</div><div class='add'>+					hci_le_scan_phy_params(phy, type,</div><div class='add'>+							       interval * 3,</div><div class='add'>+							       window * 3);</div><div class='add'>+					num_phy++;</div><div class='add'>+					phy++;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (num_phy)</div><div class='add'>+					goto done;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_1m(hdev) || scan_2m(hdev)) {</div><div class='add'>+		cp-&gt;scanning_phys |= LE_SCAN_PHY_1M;</div><div class='add'>+		hci_le_scan_phy_params(phy, type, interval, window);</div><div class='add'>+		num_phy++;</div><div class='add'>+		phy++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_coded(hdev)) {</div><div class='add'>+		cp-&gt;scanning_phys |= LE_SCAN_PHY_CODED;</div><div class='add'>+		hci_le_scan_phy_params(phy, type, interval * 3, window * 3);</div><div class='add'>+		num_phy++;</div><div class='add'>+		phy++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (!num_phy)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_PARAMS,</div><div class='add'>+				     sizeof(*cp) + sizeof(*phy) * num_phy,</div><div class='add'>+				     data, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_set_scan_param_sync(struct hci_dev *hdev, u8 type,</div><div class='add'>+				      u16 interval, u16 window,</div><div class='add'>+				      u8 own_addr_type, u8 filter_policy)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_scan_param cp;</div><div class='add'>+</div><div class='add'>+	if (use_ext_scan(hdev))</div><div class='add'>+		return hci_le_set_ext_scan_param_sync(hdev, type, interval,</div><div class='add'>+						      window, own_addr_type,</div><div class='add'>+						      filter_policy);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.type = type;</div><div class='add'>+	cp.interval = cpu_to_le16(interval);</div><div class='add'>+	cp.window = cpu_to_le16(window);</div><div class='add'>+	cp.own_address_type = own_addr_type;</div><div class='add'>+	cp.filter_policy = filter_policy;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_SCAN_PARAM,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_start_scan_sync(struct hci_dev *hdev, u8 type, u16 interval,</div><div class='add'>+			       u16 window, u8 own_addr_type, u8 filter_policy,</div><div class='add'>+			       u8 filter_dup)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;scanning_paused) {</div><div class='add'>+		bt_dev_dbg(hdev, "Scanning is paused for suspend");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_le_set_scan_param_sync(hdev, type, interval, window,</div><div class='add'>+					 own_addr_type, filter_policy);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_le_set_scan_enable_sync(hdev, LE_SCAN_ENABLE, filter_dup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_passive_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+	u8 filter_policy;</div><div class='add'>+	u16 window, interval;</div><div class='add'>+	u8 filter_dups = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;scanning_paused) {</div><div class='add'>+		bt_dev_dbg(hdev, "Scanning is paused for suspend");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_scan_disable_sync(hdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "disable scanning failed: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set require_privacy to false since no SCAN_REQ are send</div><div class='add'>+	 * during passive scanning. Not using an non-resolvable address</div><div class='add'>+	 * here is important so that peer devices using direct</div><div class='add'>+	 * advertising with our address will be correctly reported</div><div class='add'>+	 * by the controller.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_update_random_address_sync(hdev, false, scan_use_rpa(hdev),</div><div class='add'>+					   &amp;own_addr_type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;enable_advmon_interleave_scan &amp;&amp;</div><div class='add'>+	    hci_update_interleaved_scan_sync(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "interleave state %d", hdev-&gt;interleave_scan_state);</div><div class='add'>+</div><div class='add'>+	/* Adding or removing entries from the accept list must</div><div class='add'>+	 * happen before enabling scanning. The controller does</div><div class='add'>+	 * not allow accept list modification while scanning.</div><div class='add'>+	 */</div><div class='add'>+	filter_policy = hci_update_accept_list_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* If suspended and filter_policy set to 0x00 (no acceptlist) then</div><div class='add'>+	 * passive scanning cannot be started since that would require the host</div><div class='add'>+	 * to be woken up to process the reports.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;suspended &amp;&amp; !filter_policy) {</div><div class='add'>+		/* Check if accept list is empty then there is no need to scan</div><div class='add'>+		 * while suspended.</div><div class='add'>+		 */</div><div class='add'>+		if (list_empty(&amp;hdev-&gt;le_accept_list))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* If there are devices is the accept_list that means some</div><div class='add'>+		 * devices could not be programmed which in non-suspended case</div><div class='add'>+		 * means filter_policy needs to be set to 0x00 so the host needs</div><div class='add'>+		 * to filter, but since this is treating suspended case we</div><div class='add'>+		 * can ignore device needing host to filter to allow devices in</div><div class='add'>+		 * the acceptlist to be able to wakeup the system.</div><div class='add'>+		 */</div><div class='add'>+		filter_policy = 0x01;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When the controller is using random resolvable addresses and</div><div class='add'>+	 * with that having LE privacy enabled, then controllers with</div><div class='add'>+	 * Extended Scanner Filter Policies support can now enable support</div><div class='add'>+	 * for handling directed advertising.</div><div class='add'>+	 *</div><div class='add'>+	 * So instead of using filter polices 0x00 (no acceptlist)</div><div class='add'>+	 * and 0x01 (acceptlist enabled) use the new filter policies</div><div class='add'>+	 * 0x02 (no acceptlist) and 0x03 (acceptlist enabled).</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_PRIVACY) &amp;&amp;</div><div class='add'>+	    (hdev-&gt;le_features[0] &amp; HCI_LE_EXT_SCAN_POLICY))</div><div class='add'>+		filter_policy |= 0x02;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;suspended) {</div><div class='add'>+		window = hdev-&gt;le_scan_window_suspend;</div><div class='add'>+		interval = hdev-&gt;le_scan_int_suspend;</div><div class='add'>+	} else if (hci_is_le_conn_scanning(hdev)) {</div><div class='add'>+		window = hdev-&gt;le_scan_window_connect;</div><div class='add'>+		interval = hdev-&gt;le_scan_int_connect;</div><div class='add'>+	} else if (hci_is_adv_monitoring(hdev)) {</div><div class='add'>+		window = hdev-&gt;le_scan_window_adv_monitor;</div><div class='add'>+		interval = hdev-&gt;le_scan_int_adv_monitor;</div><div class='add'>+</div><div class='add'>+		/* Disable duplicates filter when scanning for advertisement</div><div class='add'>+		 * monitor for the following reasons.</div><div class='add'>+		 *</div><div class='add'>+		 * For HW pattern filtering (ex. MSFT), Realtek and Qualcomm</div><div class='add'>+		 * controllers ignore RSSI_Sampling_Period when the duplicates</div><div class='add'>+		 * filter is enabled.</div><div class='add'>+		 *</div><div class='add'>+		 * For SW pattern filtering, when we're not doing interleaved</div><div class='add'>+		 * scanning, it is necessary to disable duplicates filter,</div><div class='add'>+		 * otherwise hosts can only receive one advertisement and it's</div><div class='add'>+		 * impossible to know if a peer is still in range.</div><div class='add'>+		 */</div><div class='add'>+		filter_dups = LE_SCAN_FILTER_DUP_DISABLE;</div><div class='add'>+	} else {</div><div class='add'>+		window = hdev-&gt;le_scan_window;</div><div class='add'>+		interval = hdev-&gt;le_scan_interval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable all filtering for Mesh */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MESH)) {</div><div class='add'>+		filter_policy = 0;</div><div class='add'>+		filter_dups = LE_SCAN_FILTER_DUP_DISABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "LE passive scan with acceptlist = %d", filter_policy);</div><div class='add'>+</div><div class='add'>+	return hci_start_scan_sync(hdev, LE_SCAN_PASSIVE, interval, window,</div><div class='add'>+				   own_addr_type, filter_policy, filter_dups);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function controls the passive scanning based on hdev-&gt;pend_le_conns</div><div class='add'>+ * list. If there are pending LE connection we start the background scanning,</div><div class='add'>+ * otherwise we stop it in the following sequence:</div><div class='add'>+ *</div><div class='add'>+ * If there are devices to scan:</div><div class='add'>+ *</div><div class='add'>+ * Disable Scanning -&gt; Update Accept List -&gt;</div><div class='add'>+ * ll_privacy_capable((Disable Advertising) -&gt; Disable Resolving List -&gt;</div><div class='add'>+ * Update Resolving List -&gt; Enable Resolving List -&gt; (Enable Advertising)) -&gt;</div><div class='add'>+ * Enable Scanning</div><div class='add'>+ *</div><div class='add'>+ * Otherwise:</div><div class='add'>+ *</div><div class='add'>+ * Disable Scanning</div><div class='add'>+ */</div><div class='add'>+int hci_update_passive_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags) ||</div><div class='add'>+	    test_bit(HCI_INIT, &amp;hdev-&gt;flags) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_CONFIG) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* No point in doing scanning if LE support hasn't been enabled */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If discovery is active don't interfere with it */</div><div class='add'>+	if (hdev-&gt;discovery.state != DISCOVERY_STOPPED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Reset RSSI and UUID filters when starting background scanning</div><div class='add'>+	 * since these filters are meant for service discovery only.</div><div class='add'>+	 *</div><div class='add'>+	 * The Start Discovery and Start Service Discovery operations</div><div class='add'>+	 * ensure to set proper values for RSSI threshold and UUID</div><div class='add'>+	 * filter list. So it is safe to just reset them here.</div><div class='add'>+	 */</div><div class='add'>+	hci_discovery_filter_clear(hdev);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "ADV monitoring is %s",</div><div class='add'>+		   hci_is_adv_monitoring(hdev) ? "on" : "off");</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_MESH) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;hdev-&gt;pend_le_conns) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;hdev-&gt;pend_le_reports) &amp;&amp;</div><div class='add'>+	    !hci_is_adv_monitoring(hdev) &amp;&amp;</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_PA_SYNC)) {</div><div class='add'>+		/* If there is no pending LE connections or devices</div><div class='add'>+		 * to be scanned for or no ADV monitors, we should stop the</div><div class='add'>+		 * background scanning.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		bt_dev_dbg(hdev, "stopping background scanning");</div><div class='add'>+</div><div class='add'>+		err = hci_scan_disable_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			bt_dev_err(hdev, "stop background scanning failed: %d",</div><div class='add'>+				   err);</div><div class='add'>+	} else {</div><div class='add'>+		/* If there is at least one pending LE connection, we should</div><div class='add'>+		 * keep the background scan running.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* If controller is connecting, we should not start scanning</div><div class='add'>+		 * since some controllers are not able to scan and connect at</div><div class='add'>+		 * the same time.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_lookup_le_connect(hdev))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		bt_dev_dbg(hdev, "start background scanning");</div><div class='add'>+</div><div class='add'>+		err = hci_passive_scan_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			bt_dev_err(hdev, "start background scanning failed: %d",</div><div class='add'>+				   err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_scan_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_update_scan_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_scan(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue(hdev, update_scan_sync, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_passive_scan_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_update_passive_scan_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_passive_scan(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* Only queue if it would have any effect */</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags) ||</div><div class='add'>+	    test_bit(HCI_INIT, &amp;hdev-&gt;flags) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_SETUP) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_CONFIG) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_cmd_sync_queue_once(hdev, update_passive_scan_sync, NULL,</div><div class='add'>+				       NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_write_sc_support_sync(struct hci_dev *hdev, u8 val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!bredr_sc_enabled(hdev) || lmp_host_sc_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SC_SUPPORT,</div><div class='add'>+				    sizeof(val), &amp;val, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (val) {</div><div class='add'>+			hdev-&gt;features[1][0] |= LMP_HOST_SC;</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_SC_ENABLED);</div><div class='add'>+		} else {</div><div class='add'>+			hdev-&gt;features[1][0] &amp;= ~LMP_HOST_SC;</div><div class='add'>+			hci_dev_clear_flag(hdev, HCI_SC_ENABLED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_write_ssp_mode_sync(struct hci_dev *hdev, u8 mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED) ||</div><div class='add'>+	    lmp_host_ssp_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!mode &amp;&amp; hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS)) {</div><div class='add'>+		__hci_cmd_sync_status(hdev, HCI_OP_WRITE_SSP_DEBUG_MODE,</div><div class='add'>+				      sizeof(mode), &amp;mode, HCI_CMD_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SSP_MODE,</div><div class='add'>+				    sizeof(mode), &amp;mode, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_write_sc_support_sync(hdev, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_write_le_host_supported_sync(struct hci_dev *hdev, u8 le, u8 simul)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_le_host_supported cp;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED) ||</div><div class='add'>+	    !lmp_bredr_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check first if we already have the right host state</div><div class='add'>+	 * (host features set)</div><div class='add'>+	 */</div><div class='add'>+	if (le == lmp_host_le_capable(hdev) &amp;&amp;</div><div class='add'>+	    simul == lmp_host_le_br_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.le = le;</div><div class='add'>+	cp.simul = simul;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_powered_update_adv_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv, *tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If RPA Resolution has not been enable yet it means the</div><div class='add'>+	 * resolving list is empty and we should attempt to program the</div><div class='add'>+	 * local IRK in order to support using own_addr_type</div><div class='add'>+	 * ADDR_LE_DEV_RANDOM_RESOLVED (0x03).</div><div class='add'>+	 */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION)) {</div><div class='add'>+		hci_le_add_resolve_list_sync(hdev, NULL);</div><div class='add'>+		hci_le_set_addr_resolution_enable_sync(hdev, 0x01);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure the controller has a good default for</div><div class='add'>+	 * advertising data. This also applies to the case</div><div class='add'>+	 * where BR/EDR was toggled during the AUTO_OFF phase.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;hdev-&gt;adv_instances)) {</div><div class='add'>+		if (ext_adv_capable(hdev)) {</div><div class='add'>+			err = hci_setup_ext_adv_instance_sync(hdev, 0x00);</div><div class='add'>+			if (!err)</div><div class='add'>+				hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+		} else {</div><div class='add'>+			err = hci_update_adv_data_sync(hdev, 0x00);</div><div class='add'>+			if (!err)</div><div class='add'>+				hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='add'>+			hci_enable_advertising_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Call for each tracked instance to be scheduled */</div><div class='add'>+	list_for_each_entry_safe(adv, tmp, &amp;hdev-&gt;adv_instances, list)</div><div class='add'>+		hci_schedule_adv_instance_sync(hdev, adv-&gt;instance, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_write_auth_enable_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 link_sec;</div><div class='add'>+</div><div class='add'>+	link_sec = hci_dev_test_flag(hdev, HCI_LINK_SECURITY);</div><div class='add'>+	if (link_sec == test_bit(HCI_AUTH, &amp;hdev-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,</div><div class='add'>+				     sizeof(link_sec), &amp;link_sec,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_write_fast_connectable_sync(struct hci_dev *hdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_page_scan_activity cp;</div><div class='add'>+	u8 type;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		type = PAGE_SCAN_TYPE_INTERLACED;</div><div class='add'>+</div><div class='add'>+		/* 160 msec page scan interval */</div><div class='add'>+		cp.interval = cpu_to_le16(0x0100);</div><div class='add'>+	} else {</div><div class='add'>+		type = hdev-&gt;def_page_scan_type;</div><div class='add'>+		cp.interval = cpu_to_le16(hdev-&gt;def_page_scan_int);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp.window = cpu_to_le16(hdev-&gt;def_page_scan_window);</div><div class='add'>+</div><div class='add'>+	if (__cpu_to_le16(hdev-&gt;page_scan_interval) != cp.interval ||</div><div class='add'>+	    __cpu_to_le16(hdev-&gt;page_scan_window) != cp.window) {</div><div class='add'>+		err = __hci_cmd_sync_status(hdev,</div><div class='add'>+					    HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,</div><div class='add'>+					    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;page_scan_type != type)</div><div class='add'>+		err = __hci_cmd_sync_status(hdev,</div><div class='add'>+					    HCI_OP_WRITE_PAGE_SCAN_TYPE,</div><div class='add'>+					    sizeof(type), &amp;type,</div><div class='add'>+					    HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool disconnected_accept_list_entries(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list *b;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(b, &amp;hdev-&gt;accept_list, list) {</div><div class='add'>+		struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;b-&gt;bdaddr);</div><div class='add'>+		if (!conn)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		if (conn-&gt;state != BT_CONNECTED &amp;&amp; conn-&gt;state != BT_CONFIG)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_write_scan_enable_sync(struct hci_dev *hdev, u8 val)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,</div><div class='add'>+					    sizeof(val), &amp;val,</div><div class='add'>+					    HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 scan;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!hdev_is_powered(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mgmt_powering_down(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;scanning_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_CONNECTABLE) ||</div><div class='add'>+	    disconnected_accept_list_entries(hdev))</div><div class='add'>+		scan = SCAN_PAGE;</div><div class='add'>+	else</div><div class='add'>+		scan = SCAN_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='add'>+		scan |= SCAN_INQUIRY;</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_PSCAN, &amp;hdev-&gt;flags) == !!(scan &amp; SCAN_PAGE) &amp;&amp;</div><div class='add'>+	    test_bit(HCI_ISCAN, &amp;hdev-&gt;flags) == !!(scan &amp; SCAN_INQUIRY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_write_scan_enable_sync(hdev, scan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_name_sync(struct hci_dev *hdev, const u8 *name)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_local_name cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	memcpy(cp.name, name, sizeof(cp.name));</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_LOCAL_NAME,</div><div class='add'>+					    sizeof(cp), &amp;cp,</div><div class='add'>+					    HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function perform powered update HCI command sequence after the HCI init</div><div class='add'>+ * sequence which end up resetting all states, the sequence is as follows:</div><div class='add'>+ *</div><div class='add'>+ * HCI_SSP_ENABLED(Enable SSP)</div><div class='add'>+ * HCI_LE_ENABLED(Enable LE)</div><div class='add'>+ * HCI_LE_ENABLED(ll_privacy_capable(Add local IRK to Resolving List) -&gt;</div><div class='add'>+ * Update adv data)</div><div class='add'>+ * Enable Authentication</div><div class='add'>+ * lmp_bredr_capable(Set Fast Connectable -&gt; Set Scan Type -&gt; Set Class -&gt;</div><div class='add'>+ * Set Name -&gt; Set EIR)</div><div class='add'>+ * HCI_FORCE_STATIC_ADDR | BDADDR_ANY &amp;&amp; !HCI_BREDR_ENABLED (Set Static Address)</div><div class='add'>+ */</div><div class='add'>+int hci_powered_update_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Register the available SMP channels (BR/EDR and LE) only when</div><div class='add'>+	 * successfully powering on the controller. This late</div><div class='add'>+	 * registration is required so that LE SMP can clearly decide if</div><div class='add'>+	 * the public address or static address is used.</div><div class='add'>+	 */</div><div class='add'>+	smp_register(hdev);</div><div class='add'>+</div><div class='add'>+	err = hci_write_ssp_mode_sync(hdev, 0x01);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_write_le_host_supported_sync(hdev, 0x01, 0x00);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_powered_update_adv_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_write_auth_enable_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (lmp_bredr_capable(hdev)) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_FAST_CONNECTABLE))</div><div class='add'>+			hci_write_fast_connectable_sync(hdev, true);</div><div class='add'>+		else</div><div class='add'>+			hci_write_fast_connectable_sync(hdev, false);</div><div class='add'>+		hci_update_scan_sync(hdev);</div><div class='add'>+		hci_update_class_sync(hdev);</div><div class='add'>+		hci_update_name_sync(hdev, hdev-&gt;dev_name);</div><div class='add'>+		hci_update_eir_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If forcing static address is in use or there is no public</div><div class='add'>+	 * address use the static address as random address (but skip</div><div class='add'>+	 * the HCI command if the current random address is already the</div><div class='add'>+	 * static one.</div><div class='add'>+	 *</div><div class='add'>+	 * In case BR/EDR has been disabled on a dual-mode controller</div><div class='add'>+	 * and a static address has been configured, then use that</div><div class='add'>+	 * address instead of the public BR/EDR address.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ||</div><div class='add'>+	    (!bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))) {</div><div class='add'>+		if (bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY))</div><div class='add'>+			return hci_set_random_addr_sync(hdev,</div><div class='add'>+							&amp;hdev-&gt;static_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hci_dev_get_bd_addr_from_property - Get the Bluetooth Device Address</div><div class='add'>+ *				       (BD_ADDR) for a HCI device from</div><div class='add'>+ *				       a firmware node property.</div><div class='add'>+ * @hdev:	The HCI device</div><div class='add'>+ *</div><div class='add'>+ * Search the firmware node for 'local-bd-address'.</div><div class='add'>+ *</div><div class='add'>+ * All-zero BD addresses are rejected, because those could be properties</div><div class='add'>+ * that exist in the firmware tables, but were not updated by the firmware. For</div><div class='add'>+ * example, the DTS could define 'local-bd-address', with zero BD addresses.</div><div class='add'>+ */</div><div class='add'>+static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *fwnode = dev_fwnode(hdev-&gt;dev.parent);</div><div class='add'>+	bdaddr_t ba;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fwnode_property_read_u8_array(fwnode, "local-bd-address",</div><div class='add'>+					    (u8 *)&amp;ba, sizeof(ba));</div><div class='add'>+	if (ret &lt; 0 || !bacmp(&amp;ba, BDADDR_ANY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_BDADDR_PROPERTY_BROKEN))</div><div class='add'>+		baswap(&amp;hdev-&gt;public_addr, &amp;ba);</div><div class='add'>+	else</div><div class='add'>+		bacpy(&amp;hdev-&gt;public_addr, &amp;ba);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hci_init_stage {</div><div class='add'>+	int (*func)(struct hci_dev *hdev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Run init stage NULL terminated function table */</div><div class='add'>+static int hci_init_stage_sync(struct hci_dev *hdev,</div><div class='add'>+			       const struct hci_init_stage *stage)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; stage[i].func; i++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = stage[i].func(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Local Version */</div><div class='add'>+static int hci_read_local_version_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_VERSION,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read BD Address */</div><div class='add'>+static int hci_read_bd_addr_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_BD_ADDR,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_INIT(_func) \</div><div class='add'>+{ \</div><div class='add'>+	.func = _func, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hci_init_stage hci_init0[] = {</div><div class='add'>+	/* HCI_OP_READ_LOCAL_VERSION */</div><div class='add'>+	HCI_INIT(hci_read_local_version_sync),</div><div class='add'>+	/* HCI_OP_READ_BD_ADDR */</div><div class='add'>+	HCI_INIT(hci_read_bd_addr_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int hci_reset_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	set_bit(HCI_RESET, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_RESET, 0, NULL,</div><div class='add'>+				    HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_init0_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* Reset */</div><div class='add'>+	if (!hci_test_quirk(hdev, HCI_QUIRK_RESET_ON_CLOSE)) {</div><div class='add'>+		err = hci_reset_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_init_stage_sync(hdev, hci_init0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_unconf_init_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_RAW_DEVICE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = hci_init0_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_SETUP))</div><div class='add'>+		hci_debugfs_create_basic(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Local Supported Features. */</div><div class='add'>+static int hci_read_local_features_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_FEATURES,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* BR Controller init stage 1 command sequence */</div><div class='add'>+static const struct hci_init_stage br_init1[] = {</div><div class='add'>+	/* HCI_OP_READ_LOCAL_FEATURES */</div><div class='add'>+	HCI_INIT(hci_read_local_features_sync),</div><div class='add'>+	/* HCI_OP_READ_LOCAL_VERSION */</div><div class='add'>+	HCI_INIT(hci_read_local_version_sync),</div><div class='add'>+	/* HCI_OP_READ_BD_ADDR */</div><div class='add'>+	HCI_INIT(hci_read_bd_addr_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Read Local Commands */</div><div class='add'>+static int hci_read_local_cmds_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* All Bluetooth 1.2 and later controllers should support the</div><div class='add'>+	 * HCI command for reading the local supported commands.</div><div class='add'>+	 *</div><div class='add'>+	 * Unfortunately some controllers indicate Bluetooth 1.2 support,</div><div class='add'>+	 * but do not have support for this command. If that is the case,</div><div class='add'>+	 * the driver can quirk the behavior and skip reading the local</div><div class='add'>+	 * supported commands.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;hci_ver &gt; BLUETOOTH_VER_1_1 &amp;&amp;</div><div class='add'>+	    !hci_test_quirk(hdev, HCI_QUIRK_BROKEN_LOCAL_COMMANDS))</div><div class='add'>+		return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_COMMANDS,</div><div class='add'>+					     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_init1_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* Reset */</div><div class='add'>+	if (!hci_test_quirk(hdev, HCI_QUIRK_RESET_ON_CLOSE)) {</div><div class='add'>+		err = hci_reset_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_init_stage_sync(hdev, br_init1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Buffer Size (ACL mtu, max pkt, etc.) */</div><div class='add'>+static int hci_read_buffer_size_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_BUFFER_SIZE,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Class of Device */</div><div class='add'>+static int hci_read_dev_class_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_CLASS_OF_DEV,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Local Name */</div><div class='add'>+static int hci_read_local_name_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_NAME,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Voice Setting */</div><div class='add'>+static int hci_read_voice_setting_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!read_voice_setting_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Number of Supported IAC */</div><div class='add'>+static int hci_read_num_supported_iac_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_NUM_SUPPORTED_IAC,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read Current IAC LAP */</div><div class='add'>+static int hci_read_current_iac_lap_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_CURRENT_IAC_LAP,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_event_filter_sync(struct hci_dev *hdev, u8 flt_type,</div><div class='add'>+				     u8 cond_type, bdaddr_t *bdaddr,</div><div class='add'>+				     u8 auto_accept)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_set_event_filter cp;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.flt_type = flt_type;</div><div class='add'>+</div><div class='add'>+	if (flt_type != HCI_FLT_CLEAR_ALL) {</div><div class='add'>+		cp.cond_type = cond_type;</div><div class='add'>+		bacpy(&amp;cp.addr_conn_flt.bdaddr, bdaddr);</div><div class='add'>+		cp.addr_conn_flt.auto_accept = auto_accept;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_SET_EVENT_FLT,</div><div class='add'>+				     flt_type == HCI_FLT_CLEAR_ALL ?</div><div class='add'>+				     sizeof(cp.flt_type) : sizeof(cp), &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_clear_event_filter_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_EVENT_FILTER_CONFIGURED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* In theory the state machine should not reach here unless</div><div class='add'>+	 * a hci_set_event_filter_sync() call succeeds, but we do</div><div class='add'>+	 * the check both for parity and as a future reminder.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hci_set_event_filter_sync(hdev, HCI_FLT_CLEAR_ALL, 0x00,</div><div class='add'>+					 BDADDR_ANY, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Connection accept timeout ~20 secs */</div><div class='add'>+static int hci_write_ca_timeout_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	__le16 param = cpu_to_le16(0x7d00);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_CA_TIMEOUT,</div><div class='add'>+				     sizeof(param), &amp;param, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable SCO flow control if supported */</div><div class='add'>+static int hci_write_sync_flowctl_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_sync_flowctl cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check if the controller supports SCO and HCI_OP_WRITE_SYNC_FLOWCTL */</div><div class='add'>+	if (!lmp_sco_capable(hdev) || !(hdev-&gt;commands[10] &amp; BIT(4)) ||</div><div class='add'>+	    !hci_test_quirk(hdev, HCI_QUIRK_SYNC_FLOWCTL_SUPPORTED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.enable = 0x01;</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SYNC_FLOWCTL,</div><div class='add'>+				    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (!err)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_SCO_FLOWCTL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* BR Controller init stage 2 command sequence */</div><div class='add'>+static const struct hci_init_stage br_init2[] = {</div><div class='add'>+	/* HCI_OP_READ_BUFFER_SIZE */</div><div class='add'>+	HCI_INIT(hci_read_buffer_size_sync),</div><div class='add'>+	/* HCI_OP_READ_CLASS_OF_DEV */</div><div class='add'>+	HCI_INIT(hci_read_dev_class_sync),</div><div class='add'>+	/* HCI_OP_READ_LOCAL_NAME */</div><div class='add'>+	HCI_INIT(hci_read_local_name_sync),</div><div class='add'>+	/* HCI_OP_READ_VOICE_SETTING */</div><div class='add'>+	HCI_INIT(hci_read_voice_setting_sync),</div><div class='add'>+	/* HCI_OP_READ_NUM_SUPPORTED_IAC */</div><div class='add'>+	HCI_INIT(hci_read_num_supported_iac_sync),</div><div class='add'>+	/* HCI_OP_READ_CURRENT_IAC_LAP */</div><div class='add'>+	HCI_INIT(hci_read_current_iac_lap_sync),</div><div class='add'>+	/* HCI_OP_SET_EVENT_FLT */</div><div class='add'>+	HCI_INIT(hci_clear_event_filter_sync),</div><div class='add'>+	/* HCI_OP_WRITE_CA_TIMEOUT */</div><div class='add'>+	HCI_INIT(hci_write_ca_timeout_sync),</div><div class='add'>+	/* HCI_OP_WRITE_SYNC_FLOWCTL */</div><div class='add'>+	HCI_INIT(hci_write_sync_flowctl_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hci_write_ssp_mode_1_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 mode = 0x01;</div><div class='add'>+</div><div class='add'>+	if (!lmp_ssp_capable(hdev) || !hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* When SSP is available, then the host features page</div><div class='add'>+	 * should also be available as well. However some</div><div class='add'>+	 * controllers list the max_page as 0 as long as SSP</div><div class='add'>+	 * has not been enabled. To achieve proper debugging</div><div class='add'>+	 * output, force the minimum max_page to 1 at least.</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;max_page = 0x01;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SSP_MODE,</div><div class='add'>+				     sizeof(mode), &amp;mode, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_write_eir_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_eir cp;</div><div class='add'>+</div><div class='add'>+	if (!lmp_ssp_capable(hdev) || hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(hdev-&gt;eir, 0, sizeof(hdev-&gt;eir));</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_EIR, sizeof(cp), &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_write_inquiry_mode_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 mode;</div><div class='add'>+</div><div class='add'>+	if (!lmp_inq_rssi_capable(hdev) &amp;&amp;</div><div class='add'>+	    !hci_test_quirk(hdev, HCI_QUIRK_FIXUP_INQUIRY_MODE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If Extended Inquiry Result events are supported, then</div><div class='add'>+	 * they are clearly preferred over Inquiry Result with RSSI</div><div class='add'>+	 * events.</div><div class='add'>+	 */</div><div class='add'>+	mode = lmp_ext_inq_capable(hdev) ? 0x02 : 0x01;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_INQUIRY_MODE,</div><div class='add'>+				     sizeof(mode), &amp;mode, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_inq_rsp_tx_power_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!lmp_inq_tx_pwr_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_INQ_RSP_TX_POWER,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_local_ext_features_sync(struct hci_dev *hdev, u8 page)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_read_local_ext_features cp;</div><div class='add'>+</div><div class='add'>+	if (!lmp_ext_feat_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.page = page;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_local_ext_features_1_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hci_read_local_ext_features_sync(hdev, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HCI Controller init stage 2 command sequence */</div><div class='add'>+static const struct hci_init_stage hci_init2[] = {</div><div class='add'>+	/* HCI_OP_READ_LOCAL_COMMANDS */</div><div class='add'>+	HCI_INIT(hci_read_local_cmds_sync),</div><div class='add'>+	/* HCI_OP_WRITE_SSP_MODE */</div><div class='add'>+	HCI_INIT(hci_write_ssp_mode_1_sync),</div><div class='add'>+	/* HCI_OP_WRITE_EIR */</div><div class='add'>+	HCI_INIT(hci_write_eir_sync),</div><div class='add'>+	/* HCI_OP_WRITE_INQUIRY_MODE */</div><div class='add'>+	HCI_INIT(hci_write_inquiry_mode_sync),</div><div class='add'>+	/* HCI_OP_READ_INQ_RSP_TX_POWER */</div><div class='add'>+	HCI_INIT(hci_read_inq_rsp_tx_power_sync),</div><div class='add'>+	/* HCI_OP_READ_LOCAL_EXT_FEATURES */</div><div class='add'>+	HCI_INIT(hci_read_local_ext_features_1_sync),</div><div class='add'>+	/* HCI_OP_WRITE_AUTH_ENABLE */</div><div class='add'>+	HCI_INIT(hci_write_auth_enable_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Read LE Buffer Size */</div><div class='add'>+static int hci_le_read_buffer_size_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* Use Read LE Buffer Size V2 if supported */</div><div class='add'>+	if (iso_capable(hdev) &amp;&amp; hdev-&gt;commands[41] &amp; 0x20)</div><div class='add'>+		return __hci_cmd_sync_status(hdev,</div><div class='add'>+					     HCI_OP_LE_READ_BUFFER_SIZE_V2,</div><div class='add'>+					     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_BUFFER_SIZE,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Local Supported Features */</div><div class='add'>+static int hci_le_read_local_features_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_LOCAL_FEATURES,</div><div class='add'>+				    0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ll_ext_feature_capable(hdev) &amp;&amp; hdev-&gt;commands[47] &amp; BIT(2))</div><div class='add'>+		return __hci_cmd_sync_status(hdev,</div><div class='add'>+					     HCI_OP_LE_READ_ALL_LOCAL_FEATURES,</div><div class='add'>+					     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Supported States */</div><div class='add'>+static int hci_le_read_supported_states_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_SUPPORTED_STATES,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LE Controller init stage 2 command sequence */</div><div class='add'>+static const struct hci_init_stage le_init2[] = {</div><div class='add'>+	/* HCI_OP_LE_READ_LOCAL_FEATURES */</div><div class='add'>+	HCI_INIT(hci_le_read_local_features_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_BUFFER_SIZE */</div><div class='add'>+	HCI_INIT(hci_le_read_buffer_size_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_SUPPORTED_STATES */</div><div class='add'>+	HCI_INIT(hci_le_read_supported_states_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hci_init2_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	err = hci_init_stage_sync(hdev, hci_init2);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (lmp_bredr_capable(hdev)) {</div><div class='add'>+		err = hci_init_stage_sync(hdev, br_init2);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_BREDR_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmp_le_capable(hdev)) {</div><div class='add'>+		err = hci_init_stage_sync(hdev, le_init2);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		/* LE-only controllers have LE implicitly enabled */</div><div class='add'>+		if (!lmp_bredr_capable(hdev))</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_LE_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_event_mask_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* The second byte is 0xff instead of 0x9f (two reserved bits</div><div class='add'>+	 * disabled) since a Broadcom 1.2 dongle doesn't respond to the</div><div class='add'>+	 * command otherwise.</div><div class='add'>+	 */</div><div class='add'>+	u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+	/* CSR 1.1 dongles does not accept any bitfield so don't try to set</div><div class='add'>+	 * any event mask for pre 1.2 devices.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (lmp_bredr_capable(hdev)) {</div><div class='add'>+		events[4] |= 0x01; /* Flow Specification Complete */</div><div class='add'>+</div><div class='add'>+		/* Don't set Disconnect Complete and mode change when</div><div class='add'>+		 * suspended as that would wakeup the host when disconnecting</div><div class='add'>+		 * due to suspend.</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;suspended) {</div><div class='add'>+			events[0] &amp;= 0xef;</div><div class='add'>+			events[2] &amp;= 0xf7;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Use a different default for LE-only devices */</div><div class='add'>+		memset(events, 0, sizeof(events));</div><div class='add'>+		events[1] |= 0x20; /* Command Complete */</div><div class='add'>+		events[1] |= 0x40; /* Command Status */</div><div class='add'>+		events[1] |= 0x80; /* Hardware Error */</div><div class='add'>+</div><div class='add'>+		/* If the controller supports the Disconnect command, enable</div><div class='add'>+		 * the corresponding event. In addition enable packet flow</div><div class='add'>+		 * control related events.</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;commands[0] &amp; 0x20) {</div><div class='add'>+			/* Don't set Disconnect Complete when suspended as that</div><div class='add'>+			 * would wakeup the host when disconnecting due to</div><div class='add'>+			 * suspend.</div><div class='add'>+			 */</div><div class='add'>+			if (!hdev-&gt;suspended)</div><div class='add'>+				events[0] |= 0x10; /* Disconnection Complete */</div><div class='add'>+			events[2] |= 0x04; /* Number of Completed Packets */</div><div class='add'>+			events[3] |= 0x02; /* Data Buffer Overflow */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If the controller supports the Read Remote Version</div><div class='add'>+		 * Information command, enable the corresponding event.</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;commands[2] &amp; 0x80)</div><div class='add'>+			events[1] |= 0x08; /* Read Remote Version Information</div><div class='add'>+					    * Complete</div><div class='add'>+					    */</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;le_features[0] &amp; HCI_LE_ENCRYPTION) {</div><div class='add'>+			events[0] |= 0x80; /* Encryption Change */</div><div class='add'>+			events[5] |= 0x80; /* Encryption Key Refresh Complete */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmp_inq_rssi_capable(hdev) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_FIXUP_INQUIRY_MODE))</div><div class='add'>+		events[4] |= 0x02; /* Inquiry Result with RSSI */</div><div class='add'>+</div><div class='add'>+	if (lmp_ext_feat_capable(hdev))</div><div class='add'>+		events[4] |= 0x04; /* Read Remote Extended Features Complete */</div><div class='add'>+</div><div class='add'>+	if (lmp_esco_capable(hdev)) {</div><div class='add'>+		events[5] |= 0x08; /* Synchronous Connection Complete */</div><div class='add'>+		events[5] |= 0x10; /* Synchronous Connection Changed */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmp_sniffsubr_capable(hdev))</div><div class='add'>+		events[5] |= 0x20; /* Sniff Subrating */</div><div class='add'>+</div><div class='add'>+	if (lmp_pause_enc_capable(hdev))</div><div class='add'>+		events[5] |= 0x80; /* Encryption Key Refresh Complete */</div><div class='add'>+</div><div class='add'>+	if (lmp_ext_inq_capable(hdev))</div><div class='add'>+		events[5] |= 0x40; /* Extended Inquiry Result */</div><div class='add'>+</div><div class='add'>+	if (lmp_no_flush_capable(hdev))</div><div class='add'>+		events[7] |= 0x01; /* Enhanced Flush Complete */</div><div class='add'>+</div><div class='add'>+	if (lmp_lsto_capable(hdev))</div><div class='add'>+		events[6] |= 0x80; /* Link Supervision Timeout Changed */</div><div class='add'>+</div><div class='add'>+	if (lmp_ssp_capable(hdev)) {</div><div class='add'>+		events[6] |= 0x01;	/* IO Capability Request */</div><div class='add'>+		events[6] |= 0x02;	/* IO Capability Response */</div><div class='add'>+		events[6] |= 0x04;	/* User Confirmation Request */</div><div class='add'>+		events[6] |= 0x08;	/* User Passkey Request */</div><div class='add'>+		events[6] |= 0x10;	/* Remote OOB Data Request */</div><div class='add'>+		events[6] |= 0x20;	/* Simple Pairing Complete */</div><div class='add'>+		events[7] |= 0x04;	/* User Passkey Notification */</div><div class='add'>+		events[7] |= 0x08;	/* Keypress Notification */</div><div class='add'>+		events[7] |= 0x10;	/* Remote Host Supported</div><div class='add'>+					 * Features Notification</div><div class='add'>+					 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmp_le_capable(hdev))</div><div class='add'>+		events[7] |= 0x20;	/* LE Meta-Event */</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_SET_EVENT_MASK,</div><div class='add'>+				     sizeof(events), events, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_stored_link_key_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_read_stored_link_key cp;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;commands[6] &amp; 0x20) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_STORED_LINK_KEY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, BDADDR_ANY);</div><div class='add'>+	cp.read_all = 0x01;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_STORED_LINK_KEY,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_setup_link_policy_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_def_link_policy cp;</div><div class='add'>+	u16 link_policy = 0;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;commands[5] &amp; 0x10))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (lmp_rswitch_capable(hdev))</div><div class='add'>+		link_policy |= HCI_LP_RSWITCH;</div><div class='add'>+	if (lmp_hold_capable(hdev))</div><div class='add'>+		link_policy |= HCI_LP_HOLD;</div><div class='add'>+	if (lmp_sniff_capable(hdev))</div><div class='add'>+		link_policy |= HCI_LP_SNIFF;</div><div class='add'>+	if (lmp_park_capable(hdev))</div><div class='add'>+		link_policy |= HCI_LP_PARK;</div><div class='add'>+</div><div class='add'>+	cp.policy = cpu_to_le16(link_policy);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_page_scan_activity_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[8] &amp; 0x01))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_ACTIVITY,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_def_err_data_reporting_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[18] &amp; 0x04) ||</div><div class='add'>+	    !(hdev-&gt;features[0][6] &amp; LMP_ERR_DATA_REPORTING) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_ERR_DATA_REPORTING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_DEF_ERR_DATA_REPORTING,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_read_page_scan_type_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* Some older Broadcom based Bluetooth 1.2 controllers do not</div><div class='add'>+	 * support the Read Page Scan Type command. Check support for</div><div class='add'>+	 * this command in the bit mask of supported commands.</div><div class='add'>+	 */</div><div class='add'>+	if (!(hdev-&gt;commands[13] &amp; 0x01) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read features beyond page 1 if available */</div><div class='add'>+static int hci_read_local_ext_features_all_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 page;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!lmp_ext_feat_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (page = 2; page &lt; HCI_MAX_PAGES &amp;&amp; page &lt;= hdev-&gt;max_page;</div><div class='add'>+	     page++) {</div><div class='add'>+		err = hci_read_local_ext_features_sync(hdev, page);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HCI Controller init stage 3 command sequence */</div><div class='add'>+static const struct hci_init_stage hci_init3[] = {</div><div class='add'>+	/* HCI_OP_SET_EVENT_MASK */</div><div class='add'>+	HCI_INIT(hci_set_event_mask_sync),</div><div class='add'>+	/* HCI_OP_READ_STORED_LINK_KEY */</div><div class='add'>+	HCI_INIT(hci_read_stored_link_key_sync),</div><div class='add'>+	/* HCI_OP_WRITE_DEF_LINK_POLICY */</div><div class='add'>+	HCI_INIT(hci_setup_link_policy_sync),</div><div class='add'>+	/* HCI_OP_READ_PAGE_SCAN_ACTIVITY */</div><div class='add'>+	HCI_INIT(hci_read_page_scan_activity_sync),</div><div class='add'>+	/* HCI_OP_READ_DEF_ERR_DATA_REPORTING */</div><div class='add'>+	HCI_INIT(hci_read_def_err_data_reporting_sync),</div><div class='add'>+	/* HCI_OP_READ_PAGE_SCAN_TYPE */</div><div class='add'>+	HCI_INIT(hci_read_page_scan_type_sync),</div><div class='add'>+	/* HCI_OP_READ_LOCAL_EXT_FEATURES */</div><div class='add'>+	HCI_INIT(hci_read_local_ext_features_all_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hci_le_set_event_mask_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 events[8];</div><div class='add'>+</div><div class='add'>+	if (!lmp_le_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(events, 0, sizeof(events));</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;le_features[0] &amp; HCI_LE_ENCRYPTION)</div><div class='add'>+		events[0] |= 0x10;	/* LE Long Term Key Request */</div><div class='add'>+</div><div class='add'>+	/* If controller supports the Connection Parameters Request</div><div class='add'>+	 * Link Layer Procedure, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;le_features[0] &amp; HCI_LE_CONN_PARAM_REQ_PROC)</div><div class='add'>+		/* LE Remote Connection Parameter Request */</div><div class='add'>+		events[0] |= 0x20;</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the Data Length Extension</div><div class='add'>+	 * feature, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT)</div><div class='add'>+		events[0] |= 0x40;	/* LE Data Length Change */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports LL Privacy feature or LE Extended Adv,</div><div class='add'>+	 * enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (use_enhanced_conn_complete(hdev))</div><div class='add'>+		events[1] |= 0x02;	/* LE Enhanced Connection Complete */</div><div class='add'>+</div><div class='add'>+	/* Mark Device Privacy if Privacy Mode is supported */</div><div class='add'>+	if (privacy_mode_capable(hdev))</div><div class='add'>+		hdev-&gt;conn_flags |= HCI_CONN_FLAG_DEVICE_PRIVACY;</div><div class='add'>+</div><div class='add'>+	/* Mark Address Resolution if LL Privacy is supported */</div><div class='add'>+	if (ll_privacy_capable(hdev))</div><div class='add'>+		hdev-&gt;conn_flags |= HCI_CONN_FLAG_ADDRESS_RESOLUTION;</div><div class='add'>+</div><div class='add'>+	/* Mark PAST if supported */</div><div class='add'>+	if (past_capable(hdev))</div><div class='add'>+		hdev-&gt;conn_flags |= HCI_CONN_FLAG_PAST;</div><div class='add'>+</div><div class='add'>+	/* If the controller supports Extended Scanner Filter</div><div class='add'>+	 * Policies, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;le_features[0] &amp; HCI_LE_EXT_SCAN_POLICY)</div><div class='add'>+		events[1] |= 0x04;	/* LE Direct Advertising Report */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports Channel Selection Algorithm #2</div><div class='add'>+	 * feature, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;le_features[1] &amp; HCI_LE_CHAN_SEL_ALG2)</div><div class='add'>+		events[2] |= 0x08;	/* LE Channel Selection Algorithm */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Set Scan Enable command,</div><div class='add'>+	 * enable the corresponding advertising report event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[26] &amp; 0x08)</div><div class='add'>+		events[0] |= 0x02;	/* LE Advertising Report */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Create Connection</div><div class='add'>+	 * command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[26] &amp; 0x10)</div><div class='add'>+		events[0] |= 0x01;	/* LE Connection Complete */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Connection Update</div><div class='add'>+	 * command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[27] &amp; 0x04)</div><div class='add'>+		events[0] |= 0x04;	/* LE Connection Update Complete */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Read Remote Used Features</div><div class='add'>+	 * command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[27] &amp; 0x20)</div><div class='add'>+		/* LE Read Remote Used Features Complete */</div><div class='add'>+		events[0] |= 0x08;</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Read Local P-256</div><div class='add'>+	 * Public Key command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[34] &amp; 0x02)</div><div class='add'>+		/* LE Read Local P-256 Public Key Complete */</div><div class='add'>+		events[0] |= 0x80;</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Generate DHKey</div><div class='add'>+	 * command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[34] &amp; 0x04)</div><div class='add'>+		events[1] |= 0x01;	/* LE Generate DHKey Complete */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Set Default PHY or</div><div class='add'>+	 * LE Set PHY commands, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[35] &amp; (0x20 | 0x40))</div><div class='add'>+		events[1] |= 0x08;        /* LE PHY Update Complete */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports LE Set Extended Scan Parameters</div><div class='add'>+	 * and LE Set Extended Scan Enable commands, enable the</div><div class='add'>+	 * corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (use_ext_scan(hdev))</div><div class='add'>+		events[1] |= 0x10;	/* LE Extended Advertising Report */</div><div class='add'>+</div><div class='add'>+	/* If the controller supports the LE Extended Advertising</div><div class='add'>+	 * command, enable the corresponding event.</div><div class='add'>+	 */</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		events[2] |= 0x02;	/* LE Advertising Set Terminated */</div><div class='add'>+</div><div class='add'>+	if (past_receiver_capable(hdev))</div><div class='add'>+		events[2] |= 0x80;	/* LE PAST Received */</div><div class='add'>+</div><div class='add'>+	if (cis_capable(hdev)) {</div><div class='add'>+		events[3] |= 0x01;	/* LE CIS Established */</div><div class='add'>+		if (cis_peripheral_capable(hdev))</div><div class='add'>+			events[3] |= 0x02; /* LE CIS Request */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bis_capable(hdev)) {</div><div class='add'>+		events[1] |= 0x20;	/* LE PA Report */</div><div class='add'>+		events[1] |= 0x40;	/* LE PA Sync Established */</div><div class='add'>+		events[3] |= 0x04;	/* LE Create BIG Complete */</div><div class='add'>+		events[3] |= 0x08;	/* LE Terminate BIG Complete */</div><div class='add'>+		events[3] |= 0x10;	/* LE BIG Sync Established */</div><div class='add'>+		events[3] |= 0x20;	/* LE BIG Sync Loss */</div><div class='add'>+		events[4] |= 0x02;	/* LE BIG Info Advertising Report */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EVENT_MASK,</div><div class='add'>+				     sizeof(events), events, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Advertising Channel TX Power */</div><div class='add'>+static int hci_le_read_adv_tx_power_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if ((hdev-&gt;commands[25] &amp; 0x40) &amp;&amp; !ext_adv_capable(hdev)) {</div><div class='add'>+		/* HCI TS spec forbids mixing of legacy and extended</div><div class='add'>+		 * advertising commands wherein READ_ADV_TX_POWER is</div><div class='add'>+		 * also included. So do not call it if extended adv</div><div class='add'>+		 * is supported otherwise controller will return</div><div class='add'>+		 * COMMAND_DISALLOWED for extended commands.</div><div class='add'>+		 */</div><div class='add'>+		return __hci_cmd_sync_status(hdev,</div><div class='add'>+					       HCI_OP_LE_READ_ADV_TX_POWER,</div><div class='add'>+					       0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Min/Max Tx Power*/</div><div class='add'>+static int hci_le_read_tx_power_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[38] &amp; 0x80) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_TRANSMIT_POWER,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Accept List Size */</div><div class='add'>+static int hci_le_read_accept_list_size_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[26] &amp; 0x40))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_ACCEPT_LIST_SIZE,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Resolving List Size */</div><div class='add'>+static int hci_le_read_resolv_list_size_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[34] &amp; 0x40))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_RESOLV_LIST_SIZE,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Clear LE Resolving List */</div><div class='add'>+static int hci_le_clear_resolv_list_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[34] &amp; 0x20))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_CLEAR_RESOLV_LIST, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set RPA timeout */</div><div class='add'>+static int hci_le_set_rpa_timeout_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	__le16 timeout = cpu_to_le16(hdev-&gt;rpa_timeout);</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;commands[35] &amp; 0x04) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_SET_RPA_TIMEOUT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_RPA_TIMEOUT,</div><div class='add'>+				     sizeof(timeout), &amp;timeout,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Maximum Data Length */</div><div class='add'>+static int hci_le_read_max_data_len_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_MAX_DATA_LEN, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Suggested Default Data Length */</div><div class='add'>+static int hci_le_read_def_data_len_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_DEF_DATA_LEN, 0, NULL,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read LE Number of Supported Advertising Sets */</div><div class='add'>+static int hci_le_read_num_support_adv_sets_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!ext_adv_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev,</div><div class='add'>+				     HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write LE Host Supported */</div><div class='add'>+static int hci_set_le_support_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_le_host_supported cp;</div><div class='add'>+</div><div class='add'>+	/* LE-only devices do not support explicit enablement */</div><div class='add'>+	if (!lmp_bredr_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='add'>+		cp.le = 0x01;</div><div class='add'>+		cp.simul = 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cp.le == lmp_host_le_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LE Set Host Feature */</div><div class='add'>+static int hci_le_set_host_feature_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_host_feature cp;</div><div class='add'>+</div><div class='add'>+	if (!iso_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	/* Connected Isochronous Channels (Host Support) */</div><div class='add'>+	cp.bit_number = 32;</div><div class='add'>+	cp.bit_value = iso_enabled(hdev) ? 0x01 : 0x00;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_HOST_FEATURE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LE Controller init stage 3 command sequence */</div><div class='add'>+static const struct hci_init_stage le_init3[] = {</div><div class='add'>+	/* HCI_OP_LE_SET_EVENT_MASK */</div><div class='add'>+	HCI_INIT(hci_le_set_event_mask_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_ADV_TX_POWER */</div><div class='add'>+	HCI_INIT(hci_le_read_adv_tx_power_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_TRANSMIT_POWER */</div><div class='add'>+	HCI_INIT(hci_le_read_tx_power_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_ACCEPT_LIST_SIZE */</div><div class='add'>+	HCI_INIT(hci_le_read_accept_list_size_sync),</div><div class='add'>+	/* HCI_OP_LE_CLEAR_ACCEPT_LIST */</div><div class='add'>+	HCI_INIT(hci_le_clear_accept_list_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_RESOLV_LIST_SIZE */</div><div class='add'>+	HCI_INIT(hci_le_read_resolv_list_size_sync),</div><div class='add'>+	/* HCI_OP_LE_CLEAR_RESOLV_LIST */</div><div class='add'>+	HCI_INIT(hci_le_clear_resolv_list_sync),</div><div class='add'>+	/* HCI_OP_LE_SET_RPA_TIMEOUT */</div><div class='add'>+	HCI_INIT(hci_le_set_rpa_timeout_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_MAX_DATA_LEN */</div><div class='add'>+	HCI_INIT(hci_le_read_max_data_len_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_DEF_DATA_LEN */</div><div class='add'>+	HCI_INIT(hci_le_read_def_data_len_sync),</div><div class='add'>+	/* HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS */</div><div class='add'>+	HCI_INIT(hci_le_read_num_support_adv_sets_sync),</div><div class='add'>+	/* HCI_OP_WRITE_LE_HOST_SUPPORTED */</div><div class='add'>+	HCI_INIT(hci_set_le_support_sync),</div><div class='add'>+	/* HCI_OP_LE_SET_HOST_FEATURE */</div><div class='add'>+	HCI_INIT(hci_le_set_host_feature_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hci_init3_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	err = hci_init_stage_sync(hdev, hci_init3);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (lmp_le_capable(hdev))</div><div class='add'>+		return hci_init_stage_sync(hdev, le_init3);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_delete_stored_link_key_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_delete_stored_link_key cp;</div><div class='add'>+</div><div class='add'>+	/* Some Broadcom based Bluetooth controllers do not support the</div><div class='add'>+	 * Delete Stored Link Key command. They are clearly indicating its</div><div class='add'>+	 * absence in the bit mask of supported commands.</div><div class='add'>+	 *</div><div class='add'>+	 * Check the supported commands and only if the command is marked</div><div class='add'>+	 * as supported send it. If not supported assume that the controller</div><div class='add'>+	 * does not have actual support for stored link keys which makes this</div><div class='add'>+	 * command redundant anyway.</div><div class='add'>+	 *</div><div class='add'>+	 * Some controllers indicate that they support handling deleting</div><div class='add'>+	 * stored link keys, but they don't. The quirk lets a driver</div><div class='add'>+	 * just disable this command.</div><div class='add'>+	 */</div><div class='add'>+	if (!(hdev-&gt;commands[6] &amp; 0x80) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_STORED_LINK_KEY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, BDADDR_ANY);</div><div class='add'>+	cp.delete_all = 0x01;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_DELETE_STORED_LINK_KEY,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_set_event_mask_page_2_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	/* Set event mask page 2 if the HCI command for it is supported */</div><div class='add'>+	if (!(hdev-&gt;commands[22] &amp; 0x04))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If Connectionless Peripheral Broadcast central role is supported</div><div class='add'>+	 * enable all necessary events for it.</div><div class='add'>+	 */</div><div class='add'>+	if (lmp_cpb_central_capable(hdev)) {</div><div class='add'>+		events[1] |= 0x40;	/* Triggered Clock Capture */</div><div class='add'>+		events[1] |= 0x80;	/* Synchronization Train Complete */</div><div class='add'>+		events[2] |= 0x08;	/* Truncated Page Complete */</div><div class='add'>+		events[2] |= 0x20;	/* CPB Channel Map Change */</div><div class='add'>+		changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If Connectionless Peripheral Broadcast peripheral role is supported</div><div class='add'>+	 * enable all necessary events for it.</div><div class='add'>+	 */</div><div class='add'>+	if (lmp_cpb_peripheral_capable(hdev)) {</div><div class='add'>+		events[2] |= 0x01;	/* Synchronization Train Received */</div><div class='add'>+		events[2] |= 0x02;	/* CPB Receive */</div><div class='add'>+		events[2] |= 0x04;	/* CPB Timeout */</div><div class='add'>+		events[2] |= 0x10;	/* Peripheral Page Response Timeout */</div><div class='add'>+		changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable Authenticated Payload Timeout Expired event if supported */</div><div class='add'>+	if (lmp_ping_capable(hdev) || hdev-&gt;le_features[0] &amp; HCI_LE_PING) {</div><div class='add'>+		events[2] |= 0x80;</div><div class='add'>+		changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Some Broadcom based controllers indicate support for Set Event</div><div class='add'>+	 * Mask Page 2 command, but then actually do not support it. Since</div><div class='add'>+	 * the default value is all bits set to zero, the command is only</div><div class='add'>+	 * required if the event mask has to be changed. In case no change</div><div class='add'>+	 * to the event mask is needed, skip this command.</div><div class='add'>+	 */</div><div class='add'>+	if (!changed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_SET_EVENT_MASK_PAGE_2,</div><div class='add'>+				     sizeof(events), events, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read local codec list if the HCI command is supported */</div><div class='add'>+static int hci_read_local_codecs_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;commands[45] &amp; 0x04)</div><div class='add'>+		hci_read_supported_codecs_v2(hdev);</div><div class='add'>+	else if (hdev-&gt;commands[29] &amp; 0x20)</div><div class='add'>+		hci_read_supported_codecs(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read local pairing options if the HCI command is supported */</div><div class='add'>+static int hci_read_local_pairing_opts_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!(hdev-&gt;commands[41] &amp; 0x08))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_PAIRING_OPTS,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get MWS transport configuration if the HCI command is supported */</div><div class='add'>+static int hci_get_mws_transport_config_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!mws_transport_config_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_GET_MWS_TRANSPORT_CONFIG,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check for Synchronization Train support */</div><div class='add'>+static int hci_read_sync_train_params_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!lmp_sync_train_capable(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_READ_SYNC_TRAIN_PARAMS,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable Secure Connections if supported and configured */</div><div class='add'>+static int hci_write_sc_support_1_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 support = 0x01;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED) ||</div><div class='add'>+	    !bredr_sc_enabled(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SC_SUPPORT,</div><div class='add'>+				     sizeof(support), &amp;support,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set erroneous data reporting if supported to the wideband speech</div><div class='add'>+ * setting value</div><div class='add'>+ */</div><div class='add'>+static int hci_set_err_data_report_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_def_err_data_reporting cp;</div><div class='add'>+	bool enabled = hci_dev_test_flag(hdev, HCI_WIDEBAND_SPEECH_ENABLED);</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;commands[18] &amp; 0x08) ||</div><div class='add'>+	    !(hdev-&gt;features[0][6] &amp; LMP_ERR_DATA_REPORTING) ||</div><div class='add'>+	    hci_test_quirk(hdev, HCI_QUIRK_BROKEN_ERR_DATA_REPORTING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (enabled == hdev-&gt;err_data_reporting)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.err_data_reporting = enabled ? ERR_DATA_REPORTING_ENABLED :</div><div class='add'>+				ERR_DATA_REPORTING_DISABLED;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_ERR_DATA_REPORTING,</div><div class='add'>+				    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hci_init_stage hci_init4[] = {</div><div class='add'>+	 /* HCI_OP_DELETE_STORED_LINK_KEY */</div><div class='add'>+	HCI_INIT(hci_delete_stored_link_key_sync),</div><div class='add'>+	/* HCI_OP_SET_EVENT_MASK_PAGE_2 */</div><div class='add'>+	HCI_INIT(hci_set_event_mask_page_2_sync),</div><div class='add'>+	/* HCI_OP_READ_LOCAL_CODECS */</div><div class='add'>+	HCI_INIT(hci_read_local_codecs_sync),</div><div class='add'>+	 /* HCI_OP_READ_LOCAL_PAIRING_OPTS */</div><div class='add'>+	HCI_INIT(hci_read_local_pairing_opts_sync),</div><div class='add'>+	 /* HCI_OP_GET_MWS_TRANSPORT_CONFIG */</div><div class='add'>+	HCI_INIT(hci_get_mws_transport_config_sync),</div><div class='add'>+	 /* HCI_OP_READ_SYNC_TRAIN_PARAMS */</div><div class='add'>+	HCI_INIT(hci_read_sync_train_params_sync),</div><div class='add'>+	/* HCI_OP_WRITE_SC_SUPPORT */</div><div class='add'>+	HCI_INIT(hci_write_sc_support_1_sync),</div><div class='add'>+	/* HCI_OP_WRITE_DEF_ERR_DATA_REPORTING */</div><div class='add'>+	HCI_INIT(hci_set_err_data_report_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set Suggested Default Data Length to maximum if supported */</div><div class='add'>+static int hci_le_set_write_def_data_len_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_write_def_data_len cp;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;le_features[0] &amp; HCI_LE_DATA_LEN_EXT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.tx_len = cpu_to_le16(hdev-&gt;le_max_tx_len);</div><div class='add'>+	cp.tx_time = cpu_to_le16(hdev-&gt;le_max_tx_time);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_WRITE_DEF_DATA_LEN,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set Default PHY parameters if command is supported, enables all supported</div><div class='add'>+ * PHYs according to the LE Features bits.</div><div class='add'>+ */</div><div class='add'>+static int hci_le_set_default_phy_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_default_phy cp;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;commands[35] &amp; 0x20)) {</div><div class='add'>+		/* If the command is not supported it means only 1M PHY is</div><div class='add'>+		 * supported.</div><div class='add'>+		 */</div><div class='add'>+		hdev-&gt;le_tx_def_phys = HCI_LE_SET_PHY_1M;</div><div class='add'>+		hdev-&gt;le_rx_def_phys = HCI_LE_SET_PHY_1M;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.all_phys = 0x00;</div><div class='add'>+	cp.tx_phys = HCI_LE_SET_PHY_1M;</div><div class='add'>+	cp.rx_phys = HCI_LE_SET_PHY_1M;</div><div class='add'>+</div><div class='add'>+	/* Enables 2M PHY if supported */</div><div class='add'>+	if (le_2m_capable(hdev)) {</div><div class='add'>+		cp.tx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+		cp.rx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enables Coded PHY if supported */</div><div class='add'>+	if (le_coded_capable(hdev)) {</div><div class='add'>+		cp.tx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+		cp.rx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_DEFAULT_PHY,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hci_init_stage le_init4[] = {</div><div class='add'>+	/* HCI_OP_LE_WRITE_DEF_DATA_LEN */</div><div class='add'>+	HCI_INIT(hci_le_set_write_def_data_len_sync),</div><div class='add'>+	/* HCI_OP_LE_SET_DEFAULT_PHY */</div><div class='add'>+	HCI_INIT(hci_le_set_default_phy_sync),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hci_init4_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	err = hci_init_stage_sync(hdev, hci_init4);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (lmp_le_capable(hdev))</div><div class='add'>+		return hci_init_stage_sync(hdev, le_init4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_init_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hci_init1_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_SETUP))</div><div class='add'>+		hci_debugfs_create_basic(hdev);</div><div class='add'>+</div><div class='add'>+	err = hci_init2_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_init3_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_init4_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* This function is only called when the controller is actually in</div><div class='add'>+	 * configured state. When the controller is marked as unconfigured,</div><div class='add'>+	 * this initialization procedure is not run.</div><div class='add'>+	 *</div><div class='add'>+	 * It means that it is possible that a controller runs through its</div><div class='add'>+	 * setup phase and then discovers missing settings. If that is the</div><div class='add'>+	 * case, then this function will not be called. It then will only</div><div class='add'>+	 * be called during the config phase.</div><div class='add'>+	 *</div><div class='add'>+	 * So only when in setup phase or config phase, create the debugfs</div><div class='add'>+	 * entries and register the SMP channels.</div><div class='add'>+	 */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_CONFIG))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_and_set_flag(hdev, HCI_DEBUGFS_CREATED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_debugfs_create_common(hdev);</div><div class='add'>+</div><div class='add'>+	if (lmp_bredr_capable(hdev))</div><div class='add'>+		hci_debugfs_create_bredr(hdev);</div><div class='add'>+</div><div class='add'>+	if (lmp_le_capable(hdev))</div><div class='add'>+		hci_debugfs_create_le(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HCI_QUIRK_BROKEN(_quirk, _desc) { HCI_QUIRK_BROKEN_##_quirk, _desc }</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	unsigned long quirk;</div><div class='add'>+	const char *desc;</div><div class='add'>+} hci_broken_table[] = {</div><div class='add'>+	HCI_QUIRK_BROKEN(LOCAL_COMMANDS,</div><div class='add'>+			 "HCI Read Local Supported Commands not supported"),</div><div class='add'>+	HCI_QUIRK_BROKEN(STORED_LINK_KEY,</div><div class='add'>+			 "HCI Delete Stored Link Key command is advertised, "</div><div class='add'>+			 "but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,</div><div class='add'>+			 "HCI Read Default Erroneous Data Reporting command is "</div><div class='add'>+			 "advertised, but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,</div><div class='add'>+			 "HCI Read Transmit Power Level command is advertised, "</div><div class='add'>+			 "but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(FILTER_CLEAR_ALL,</div><div class='add'>+			 "HCI Set Event Filter command not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(ENHANCED_SETUP_SYNC_CONN,</div><div class='add'>+			 "HCI Enhanced Setup Synchronous Connection command is "</div><div class='add'>+			 "advertised, but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(SET_RPA_TIMEOUT,</div><div class='add'>+			 "HCI LE Set Random Private Address Timeout command is "</div><div class='add'>+			 "advertised, but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(EXT_CREATE_CONN,</div><div class='add'>+			 "HCI LE Extended Create Connection command is "</div><div class='add'>+			 "advertised, but not supported."),</div><div class='add'>+	HCI_QUIRK_BROKEN(WRITE_AUTH_PAYLOAD_TIMEOUT,</div><div class='add'>+			 "HCI WRITE AUTH PAYLOAD TIMEOUT command leads "</div><div class='add'>+			 "to unexpected SMP errors when pairing "</div><div class='add'>+			 "and will not be used."),</div><div class='add'>+	HCI_QUIRK_BROKEN(LE_CODED,</div><div class='add'>+			 "HCI LE Coded PHY feature bit is set, "</div><div class='add'>+			 "but its usage is not supported.")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This function handles hdev setup stage:</div><div class='add'>+ *</div><div class='add'>+ * Calls hdev-&gt;setup</div><div class='add'>+ * Setup address if HCI_QUIRK_USE_BDADDR_PROPERTY is set.</div><div class='add'>+ */</div><div class='add'>+static int hci_dev_setup_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool invalid_bdaddr;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='add'>+	    !hci_test_quirk(hdev, HCI_QUIRK_NON_PERSISTENT_SETUP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	hci_sock_dev_event(hdev, HCI_DEV_SETUP);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;setup)</div><div class='add'>+		ret = hdev-&gt;setup(hdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hci_broken_table); i++) {</div><div class='add'>+		if (hci_test_quirk(hdev, hci_broken_table[i].quirk))</div><div class='add'>+			bt_dev_warn(hdev, "%s", hci_broken_table[i].desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The transport driver can set the quirk to mark the</div><div class='add'>+	 * BD_ADDR invalid before creating the HCI device or in</div><div class='add'>+	 * its setup callback.</div><div class='add'>+	 */</div><div class='add'>+	invalid_bdaddr = hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) ||</div><div class='add'>+			 hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) &amp;&amp;</div><div class='add'>+		    !bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY))</div><div class='add'>+			hci_dev_get_bd_addr_from_property(hdev);</div><div class='add'>+</div><div class='add'>+		if (invalid_bdaddr &amp;&amp; bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+		    hdev-&gt;set_bdaddr) {</div><div class='add'>+			ret = hdev-&gt;set_bdaddr(hdev, &amp;hdev-&gt;public_addr);</div><div class='add'>+			if (!ret)</div><div class='add'>+				invalid_bdaddr = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The transport driver can set these quirks before</div><div class='add'>+	 * creating the HCI device or in its setup callback.</div><div class='add'>+	 *</div><div class='add'>+	 * For the invalid BD_ADDR quirk it is possible that</div><div class='add'>+	 * it becomes a valid address if the bootloader does</div><div class='add'>+	 * provide it (see above).</div><div class='add'>+	 *</div><div class='add'>+	 * In case any of them is set, the controller has to</div><div class='add'>+	 * start up as unconfigured.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG) ||</div><div class='add'>+	    invalid_bdaddr)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_UNCONFIGURED);</div><div class='add'>+</div><div class='add'>+	/* For an unconfigured controller it is required to</div><div class='add'>+	 * read at least the version information provided by</div><div class='add'>+	 * the Read Local Version Information command.</div><div class='add'>+	 *</div><div class='add'>+	 * If the set_bdaddr driver callback is provided, then</div><div class='add'>+	 * also the original Bluetooth public device address</div><div class='add'>+	 * will be read using the Read BD Address command.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='add'>+		return hci_unconf_init_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function handles hdev init stage:</div><div class='add'>+ *</div><div class='add'>+ * Calls hci_dev_setup_sync to perform setup stage</div><div class='add'>+ * Calls hci_init_sync to perform HCI command init sequence</div><div class='add'>+ */</div><div class='add'>+static int hci_dev_init_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+	set_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ret = hci_dev_setup_sync(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='add'>+		/* If public address change is configured, ensure that</div><div class='add'>+		 * the address gets programmed. If the driver does not</div><div class='add'>+		 * support changing the public address, fail the power</div><div class='add'>+		 * on procedure.</div><div class='add'>+		 */</div><div class='add'>+		if (bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+		    hdev-&gt;set_bdaddr)</div><div class='add'>+			ret = hdev-&gt;set_bdaddr(hdev, &amp;hdev-&gt;public_addr);</div><div class='add'>+		else</div><div class='add'>+			ret = -EADDRNOTAVAIL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED) &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='add'>+			ret = hci_init_sync(hdev);</div><div class='add'>+			if (!ret &amp;&amp; hdev-&gt;post_init)</div><div class='add'>+				ret = hdev-&gt;post_init(hdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the HCI Reset command is clearing all diagnostic settings,</div><div class='add'>+	 * then they need to be reprogrammed after the init procedure</div><div class='add'>+	 * completed.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_NON_PERSISTENT_DIAG) &amp;&amp;</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_VENDOR_DIAG) &amp;&amp; hdev-&gt;set_diag)</div><div class='add'>+		ret = hdev-&gt;set_diag(hdev, true);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='add'>+		msft_do_open(hdev);</div><div class='add'>+		aosp_do_open(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_dev_open_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_CONFIG)) {</div><div class='add'>+		/* Check for rfkill but allow the HCI setup stage to</div><div class='add'>+		 * proceed (which in itself doesn't cause any RF activity).</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_RFKILLED)) {</div><div class='add'>+			ret = -ERFKILL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for valid public address or a configured static</div><div class='add'>+		 * random address, but let the HCI setup proceed to</div><div class='add'>+		 * be able to determine if there is a public address</div><div class='add'>+		 * or not.</div><div class='add'>+		 *</div><div class='add'>+		 * In case of user channel usage, it is not important</div><div class='add'>+		 * if a public address or static random address is</div><div class='add'>+		 * available.</div><div class='add'>+		 */</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='add'>+		    !bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+		    !bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY)) {</div><div class='add'>+			ret = -EADDRNOTAVAIL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='add'>+		ret = -EALREADY;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;open(hdev)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_devcd_reset(hdev);</div><div class='add'>+</div><div class='add'>+	set_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='add'>+	hci_sock_dev_event(hdev, HCI_DEV_OPEN);</div><div class='add'>+</div><div class='add'>+	ret = hci_dev_init_sync(hdev);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		hci_dev_hold(hdev);</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);</div><div class='add'>+		hci_adv_instances_set_rpa_expired(hdev, true);</div><div class='add'>+		set_bit(HCI_UP, &amp;hdev-&gt;flags);</div><div class='add'>+		hci_sock_dev_event(hdev, HCI_DEV_UP);</div><div class='add'>+		hci_leds_update_powered(hdev, true);</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_SETUP) &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_CONFIG) &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_UNCONFIGURED) &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='add'>+		    hci_dev_test_flag(hdev, HCI_MGMT)) {</div><div class='add'>+			ret = hci_powered_update_sync(hdev);</div><div class='add'>+			mgmt_power_on(hdev, ret);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Init failed, cleanup */</div><div class='add'>+		flush_work(&amp;hdev-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+		/* Since hci_rx_work() is possible to awake new cmd_work</div><div class='add'>+		 * it should be flushed first to avoid unexpected call of</div><div class='add'>+		 * hci_cmd_work()</div><div class='add'>+		 */</div><div class='add'>+		flush_work(&amp;hdev-&gt;rx_work);</div><div class='add'>+		flush_work(&amp;hdev-&gt;cmd_work);</div><div class='add'>+</div><div class='add'>+		skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='add'>+		skb_queue_purge(&amp;hdev-&gt;rx_q);</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;flush)</div><div class='add'>+			hdev-&gt;flush(hdev);</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;sent_cmd) {</div><div class='add'>+			cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+			kfree_skb(hdev-&gt;sent_cmd);</div><div class='add'>+			hdev-&gt;sent_cmd = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;req_skb) {</div><div class='add'>+			kfree_skb(hdev-&gt;req_skb);</div><div class='add'>+			hdev-&gt;req_skb = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		clear_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='add'>+		hci_sock_dev_event(hdev, HCI_DEV_CLOSE);</div><div class='add'>+</div><div class='add'>+		hdev-&gt;close(hdev);</div><div class='add'>+		hdev-&gt;flags &amp;= BIT(HCI_RAW);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static void hci_pend_le_actions_clear(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn_params *p;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;hdev-&gt;le_conn_params, list) {</div><div class='add'>+		hci_pend_le_list_del_init(p);</div><div class='add'>+		if (p-&gt;conn) {</div><div class='add'>+			hci_conn_drop(p-&gt;conn);</div><div class='add'>+			hci_conn_put(p-&gt;conn);</div><div class='add'>+			p-&gt;conn = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BT_DBG("All LE pending actions cleared");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_dev_shutdown(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	/* Similar to how we first do setup and then set the exclusive access</div><div class='add'>+	 * bit for userspace, we must first unset userchannel and then clean up.</div><div class='add'>+	 * Otherwise, the kernel can't properly use the hci channel to clean up</div><div class='add'>+	 * the controller (some shutdown routines require sending additional</div><div class='add'>+	 * commands to the controller for example).</div><div class='add'>+	 */</div><div class='add'>+	bool was_userchannel =</div><div class='add'>+		hci_dev_test_and_clear_flag(hdev, HCI_USER_CHANNEL);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &amp;&amp;</div><div class='add'>+	    test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='add'>+		/* Execute vendor specific shutdown routine */</div><div class='add'>+		if (hdev-&gt;shutdown)</div><div class='add'>+			err = hdev-&gt;shutdown(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (was_userchannel)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_USER_CHANNEL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_dev_close_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	bool auto_off;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {</div><div class='add'>+		disable_delayed_work(&amp;hdev-&gt;power_off);</div><div class='add'>+		disable_delayed_work(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+		disable_delayed_work(&amp;hdev-&gt;le_scan_disable);</div><div class='add'>+	} else {</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;ncmd_timer);</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;le_scan_disable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_cancel_sync(hdev, ENODEV);</div><div class='add'>+</div><div class='add'>+	cancel_interleave_scan(hdev);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;adv_instance_timeout) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;adv_instance_expire);</div><div class='add'>+		hdev-&gt;adv_instance_timeout = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_dev_shutdown(hdev);</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_leds_update_powered(hdev, false);</div><div class='add'>+</div><div class='add'>+	/* Flush RX and TX works */</div><div class='add'>+	flush_work(&amp;hdev-&gt;tx_work);</div><div class='add'>+	flush_work(&amp;hdev-&gt;rx_work);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;discov_timeout &gt; 0) {</div><div class='add'>+		hdev-&gt;discov_timeout = 0;</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_and_clear_flag(hdev, HCI_SERVICE_CACHE))</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;service_cache);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MGMT)) {</div><div class='add'>+		struct adv_info *adv_instance;</div><div class='add'>+</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;rpa_expired);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(adv_instance, &amp;hdev-&gt;adv_instances, list)</div><div class='add'>+			cancel_delayed_work_sync(&amp;adv_instance-&gt;rpa_expired_cb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid potential lockdep warnings from the *_flush() calls by</div><div class='add'>+	 * ensuring the workqueue is empty up front.</div><div class='add'>+	 */</div><div class='add'>+	drain_workqueue(hdev-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='add'>+</div><div class='add'>+	auto_off = hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF);</div><div class='add'>+</div><div class='add'>+	if (!auto_off &amp;&amp; !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='add'>+		__mgmt_power_off(hdev);</div><div class='add'>+</div><div class='add'>+	hci_inquiry_cache_flush(hdev);</div><div class='add'>+	hci_pend_le_actions_clear(hdev);</div><div class='add'>+	hci_conn_hash_flush(hdev);</div><div class='add'>+	/* Prevent data races on hdev-&gt;smp_data or hdev-&gt;smp_bredr_data */</div><div class='add'>+	smp_unregister(hdev);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	hci_sock_dev_event(hdev, HCI_DEV_DOWN);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {</div><div class='add'>+		aosp_do_close(hdev);</div><div class='add'>+		msft_do_close(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;flush)</div><div class='add'>+		hdev-&gt;flush(hdev);</div><div class='add'>+</div><div class='add'>+	/* Reset device */</div><div class='add'>+	skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='add'>+	atomic_set(&amp;hdev-&gt;cmd_cnt, 1);</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_RESET_ON_CLOSE) &amp;&amp;</div><div class='add'>+	    !auto_off &amp;&amp; !hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='add'>+		set_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='add'>+		hci_reset_sync(hdev);</div><div class='add'>+		clear_bit(HCI_INIT, &amp;hdev-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush cmd  work */</div><div class='add'>+	flush_work(&amp;hdev-&gt;cmd_work);</div><div class='add'>+</div><div class='add'>+	/* Drop queues */</div><div class='add'>+	skb_queue_purge(&amp;hdev-&gt;rx_q);</div><div class='add'>+	skb_queue_purge(&amp;hdev-&gt;cmd_q);</div><div class='add'>+	skb_queue_purge(&amp;hdev-&gt;raw_q);</div><div class='add'>+</div><div class='add'>+	/* Drop last sent command */</div><div class='add'>+	if (hdev-&gt;sent_cmd) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;cmd_timer);</div><div class='add'>+		kfree_skb(hdev-&gt;sent_cmd);</div><div class='add'>+		hdev-&gt;sent_cmd = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Drop last request */</div><div class='add'>+	if (hdev-&gt;req_skb) {</div><div class='add'>+		kfree_skb(hdev-&gt;req_skb);</div><div class='add'>+		hdev-&gt;req_skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(HCI_RUNNING, &amp;hdev-&gt;flags);</div><div class='add'>+	hci_sock_dev_event(hdev, HCI_DEV_CLOSE);</div><div class='add'>+</div><div class='add'>+	/* After this point our queues are empty and no tasks are scheduled. */</div><div class='add'>+	hdev-&gt;close(hdev);</div><div class='add'>+</div><div class='add'>+	/* Clear flags */</div><div class='add'>+	hdev-&gt;flags &amp;= BIT(HCI_RAW);</div><div class='add'>+	hci_dev_clear_volatile_flags(hdev);</div><div class='add'>+</div><div class='add'>+	memset(hdev-&gt;eir, 0, sizeof(hdev-&gt;eir));</div><div class='add'>+	memset(hdev-&gt;dev_class, 0, sizeof(hdev-&gt;dev_class));</div><div class='add'>+	bacpy(&amp;hdev-&gt;random_addr, BDADDR_ANY);</div><div class='add'>+	hci_codec_list_clear(&amp;hdev-&gt;local_codecs);</div><div class='add'>+</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function perform power on HCI command sequence as follows:</div><div class='add'>+ *</div><div class='add'>+ * If controller is already up (HCI_UP) performs hci_powered_update_sync</div><div class='add'>+ * sequence otherwise run hci_dev_open_sync which will follow with</div><div class='add'>+ * hci_powered_update_sync after the init sequence is completed.</div><div class='add'>+ */</div><div class='add'>+static int hci_power_on_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_UP, &amp;hdev-&gt;flags) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp;</div><div class='add'>+	    hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF)) {</div><div class='add'>+		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='add'>+		return hci_powered_update_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_dev_open_sync(hdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* During the HCI setup phase, a few error conditions are</div><div class='add'>+	 * ignored and they need to be checked now. If they are still</div><div class='add'>+	 * valid, it is important to return the device back off.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_RFKILLED) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_UNCONFIGURED) ||</div><div class='add'>+	    (!bacmp(&amp;hdev-&gt;bdaddr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+	     !bacmp(&amp;hdev-&gt;static_addr, BDADDR_ANY))) {</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_AUTO_OFF);</div><div class='add'>+		hci_dev_close_sync(hdev);</div><div class='add'>+	} else if (hci_dev_test_flag(hdev, HCI_AUTO_OFF)) {</div><div class='add'>+		queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off,</div><div class='add'>+				   HCI_AUTO_OFF_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_and_clear_flag(hdev, HCI_SETUP)) {</div><div class='add'>+		/* For unconfigured devices, set the HCI_RAW flag</div><div class='add'>+		 * so that userspace can easily identify them.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='add'>+			set_bit(HCI_RAW, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* For fully configured devices, this will send</div><div class='add'>+		 * the Index Added event. For unconfigured devices,</div><div class='add'>+		 * it will send Unconfigued Index Added event.</div><div class='add'>+		 *</div><div class='add'>+		 * Devices with HCI_QUIRK_RAW_DEVICE are ignored</div><div class='add'>+		 * and no event will be send.</div><div class='add'>+		 */</div><div class='add'>+		mgmt_index_added(hdev);</div><div class='add'>+	} else if (hci_dev_test_and_clear_flag(hdev, HCI_CONFIG)) {</div><div class='add'>+		/* When the controller is now configured, then it</div><div class='add'>+		 * is important to clear the HCI_RAW flag.</div><div class='add'>+		 */</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED))</div><div class='add'>+			clear_bit(HCI_RAW, &amp;hdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Powering on the controller with HCI_CONFIG set only</div><div class='add'>+		 * happens with the transition from unconfigured to</div><div class='add'>+		 * configured. This will send the Index Added event.</div><div class='add'>+		 */</div><div class='add'>+		mgmt_index_added(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_remote_name_cancel_sync(struct hci_dev *hdev, bdaddr_t *addr)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_remote_name_req_cancel cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, addr);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_stop_discovery_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct discovery_state *d = &amp;hdev-&gt;discovery;</div><div class='add'>+	struct inquiry_entry *e;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "state %u", hdev-&gt;discovery.state);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;state == DISCOVERY_FINDING || d-&gt;state == DISCOVERY_STOPPING) {</div><div class='add'>+		if (test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags)) {</div><div class='add'>+			err = __hci_cmd_sync_status(hdev, HCI_OP_INQUIRY_CANCEL,</div><div class='add'>+						    0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='add'>+			cancel_delayed_work(&amp;hdev-&gt;le_scan_disable);</div><div class='add'>+</div><div class='add'>+			err = hci_scan_disable_sync(hdev);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		err = hci_scan_disable_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Resume advertising if it was paused */</div><div class='add'>+	if (ll_privacy_capable(hdev))</div><div class='add'>+		hci_resume_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* No further actions needed for LE-only discovery */</div><div class='add'>+	if (d-&gt;type == DISCOV_TYPE_LE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (d-&gt;state == DISCOVERY_RESOLVING || d-&gt;state == DISCOVERY_STOPPING) {</div><div class='add'>+		e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,</div><div class='add'>+						     NAME_PENDING);</div><div class='add'>+		if (!e)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Ignore cancel errors since it should interfere with stopping</div><div class='add'>+		 * of the discovery.</div><div class='add'>+		 */</div><div class='add'>+		hci_remote_name_cancel_sync(hdev, &amp;e-&gt;data.bdaddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_disconnect_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+			       u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_disconnect cp;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == BIS_LINK || conn-&gt;type == PA_LINK) {</div><div class='add'>+		/* This is a BIS connection, hci_conn_del will</div><div class='add'>+		 * do the necessary cleanup.</div><div class='add'>+		 */</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		hci_conn_failed(conn, reason);</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+	cp.reason = reason;</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EV_DISCONN_COMPLETE, not HCI_EV_CMD_STATUS, when the</div><div class='add'>+	 * reason is anything but HCI_ERROR_REMOTE_POWER_OFF. This reason is</div><div class='add'>+	 * used when suspending or powering off, where we don't want to wait</div><div class='add'>+	 * for the peer's response.</div><div class='add'>+	 */</div><div class='add'>+	if (reason != HCI_ERROR_REMOTE_POWER_OFF)</div><div class='add'>+		return __hci_cmd_sync_status_sk(hdev, HCI_OP_DISCONNECT,</div><div class='add'>+						sizeof(cp), &amp;cp,</div><div class='add'>+						HCI_EV_DISCONN_COMPLETE,</div><div class='add'>+						HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_DISCONNECT, sizeof(cp), &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_connect_cancel_sync(struct hci_dev *hdev,</div><div class='add'>+				      struct hci_conn *conn, u8 reason)</div><div class='add'>+{</div><div class='add'>+	/* Return reason if scanning since the connection shall probably be</div><div class='add'>+	 * cleanup directly.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags))</div><div class='add'>+		return reason;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;role == HCI_ROLE_SLAVE ||</div><div class='add'>+	    test_and_set_bit(HCI_CONN_CANCEL, &amp;conn-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_CONN_CANCEL,</div><div class='add'>+				     0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_connect_cancel_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+				   u8 reason)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;type == LE_LINK)</div><div class='add'>+		return hci_le_connect_cancel_sync(hdev, conn, reason);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == CIS_LINK) {</div><div class='add'>+		/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E</div><div class='add'>+		 * page 1857:</div><div class='add'>+		 *</div><div class='add'>+		 * If this command is issued for a CIS on the Central and the</div><div class='add'>+		 * CIS is successfully terminated before being established,</div><div class='add'>+		 * then an HCI_LE_CIS_Established event shall also be sent for</div><div class='add'>+		 * this CIS with the Status Operation Cancelled by Host (0x44).</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags))</div><div class='add'>+			return hci_disconnect_sync(hdev, conn, reason);</div><div class='add'>+</div><div class='add'>+		/* CIS with no Create CIS sent have nothing to cancel */</div><div class='add'>+		return HCI_ERROR_LOCAL_HOST_TERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == BIS_LINK || conn-&gt;type == PA_LINK) {</div><div class='add'>+		/* There is no way to cancel a BIS without terminating the BIG</div><div class='add'>+		 * which is done later on connection cleanup.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EV_CONN_COMPLETE, not HCI_EV_CMD_STATUS, when the</div><div class='add'>+	 * reason is anything but HCI_ERROR_REMOTE_POWER_OFF. This reason is</div><div class='add'>+	 * used when suspending or powering off, where we don't want to wait</div><div class='add'>+	 * for the peer's response.</div><div class='add'>+	 */</div><div class='add'>+	if (reason != HCI_ERROR_REMOTE_POWER_OFF)</div><div class='add'>+		return __hci_cmd_sync_status_sk(hdev, HCI_OP_CREATE_CONN_CANCEL,</div><div class='add'>+						6, &amp;conn-&gt;dst,</div><div class='add'>+						HCI_EV_CONN_COMPLETE,</div><div class='add'>+						HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_CREATE_CONN_CANCEL,</div><div class='add'>+				     6, &amp;conn-&gt;dst, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_reject_sco_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+			       u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_reject_sync_conn_req cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.reason = reason;</div><div class='add'>+</div><div class='add'>+	/* SCO rejection has its own limited set of</div><div class='add'>+	 * allowed error values (0x0D-0x0F).</div><div class='add'>+	 */</div><div class='add'>+	if (reason &lt; 0x0d || reason &gt; 0x0f)</div><div class='add'>+		cp.reason = HCI_ERROR_REJ_LIMITED_RESOURCES;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_REJECT_SYNC_CONN_REQ,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_reject_cis_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+				  u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_reject_cis cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+	cp.reason = reason;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_REJECT_CIS,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_reject_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+				u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_reject_conn_req cp;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == CIS_LINK)</div><div class='add'>+		return hci_le_reject_cis_sync(hdev, conn, reason);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == BIS_LINK || conn-&gt;type == PA_LINK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type == SCO_LINK || conn-&gt;type == ESCO_LINK)</div><div class='add'>+		return hci_reject_sco_sync(hdev, conn, reason);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.reason = reason;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_REJECT_CONN_REQ,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 handle = conn-&gt;handle;</div><div class='add'>+	bool disconnect = false;</div><div class='add'>+	struct hci_conn *c;</div><div class='add'>+</div><div class='add'>+	switch (conn-&gt;state) {</div><div class='add'>+	case BT_CONNECTED:</div><div class='add'>+	case BT_CONFIG:</div><div class='add'>+		err = hci_disconnect_sync(hdev, conn, reason);</div><div class='add'>+		break;</div><div class='add'>+	case BT_CONNECT:</div><div class='add'>+		err = hci_connect_cancel_sync(hdev, conn, reason);</div><div class='add'>+		break;</div><div class='add'>+	case BT_CONNECT2:</div><div class='add'>+		err = hci_reject_conn_sync(hdev, conn, reason);</div><div class='add'>+		break;</div><div class='add'>+	case BT_OPEN:</div><div class='add'>+	case BT_BOUND:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		disconnect = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Check if the connection has been cleaned up concurrently */</div><div class='add'>+	c = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!c || c != conn) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup hci_conn object if it cannot be cancelled as it</div><div class='add'>+	 * likely means the controller and host stack are out of sync</div><div class='add'>+	 * or in case of LE it was still scanning so it can be cleanup</div><div class='add'>+	 * safely.</div><div class='add'>+	 */</div><div class='add'>+	if (disconnect) {</div><div class='add'>+		conn-&gt;state = BT_CLOSED;</div><div class='add'>+		hci_disconn_cfm(conn, reason);</div><div class='add'>+		hci_conn_del(conn);</div><div class='add'>+	} else {</div><div class='add'>+		hci_conn_failed(conn, reason);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_disconnect_all_sync(struct hci_dev *hdev, u8 reason)</div><div class='add'>+{</div><div class='add'>+	struct list_head *head = &amp;hdev-&gt;conn_hash.list;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	while ((conn = list_first_or_null_rcu(head, struct hci_conn, list))) {</div><div class='add'>+		/* Make sure the connection is not freed while unlocking */</div><div class='add'>+		conn = hci_conn_get(conn);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		/* Disregard possible errors since hci_conn_del shall have been</div><div class='add'>+		 * called even in case of errors had occurred since it would</div><div class='add'>+		 * then cause hci_conn_failed to be called which calls</div><div class='add'>+		 * hci_conn_del internally.</div><div class='add'>+		 */</div><div class='add'>+		hci_abort_conn_sync(hdev, conn, reason);</div><div class='add'>+		hci_conn_put(conn);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function perform power off HCI command sequence as follows:</div><div class='add'>+ *</div><div class='add'>+ * Clear Advertising</div><div class='add'>+ * Stop Discovery</div><div class='add'>+ * Disconnect all connections</div><div class='add'>+ * hci_dev_close_sync</div><div class='add'>+ */</div><div class='add'>+static int hci_power_off_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If controller is already down there is nothing to do */</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_dev_set_flag(hdev, HCI_POWERING_DOWN);</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_ISCAN, &amp;hdev-&gt;flags) ||</div><div class='add'>+	    test_bit(HCI_PSCAN, &amp;hdev-&gt;flags)) {</div><div class='add'>+		err = hci_write_scan_enable_sync(hdev, 0x00);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_clear_adv_sync(hdev, NULL, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = hci_stop_discovery_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Terminated due to Power Off */</div><div class='add'>+	err = hci_disconnect_all_sync(hdev, HCI_ERROR_REMOTE_POWER_OFF);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = hci_dev_close_sync(hdev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_POWERING_DOWN);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_set_powered_sync(struct hci_dev *hdev, u8 val)</div><div class='add'>+{</div><div class='add'>+	if (val)</div><div class='add'>+		return hci_power_on_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return hci_power_off_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_write_iac_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_write_current_iac_lap cp;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {</div><div class='add'>+		/* Limited discoverable mode */</div><div class='add'>+		cp.num_iac = min_t(u8, hdev-&gt;num_iac, 2);</div><div class='add'>+		cp.iac_lap[0] = 0x00;	/* LIAC */</div><div class='add'>+		cp.iac_lap[1] = 0x8b;</div><div class='add'>+		cp.iac_lap[2] = 0x9e;</div><div class='add'>+		cp.iac_lap[3] = 0x33;	/* GIAC */</div><div class='add'>+		cp.iac_lap[4] = 0x8b;</div><div class='add'>+		cp.iac_lap[5] = 0x9e;</div><div class='add'>+	} else {</div><div class='add'>+		/* General discoverable mode */</div><div class='add'>+		cp.num_iac = 1;</div><div class='add'>+		cp.iac_lap[0] = 0x33;	/* GIAC */</div><div class='add'>+		cp.iac_lap[1] = 0x8b;</div><div class='add'>+		cp.iac_lap[2] = 0x9e;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_CURRENT_IAC_LAP,</div><div class='add'>+				     (cp.num_iac * 3) + 1, &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_discoverable_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {</div><div class='add'>+		err = hci_write_iac_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = hci_update_scan_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = hci_update_class_sync(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Advertising instances don't use the global discoverable setting, so</div><div class='add'>+	 * only update AD if advertising was enabled using Set Advertising.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING)) {</div><div class='add'>+		err = hci_update_adv_data_sync(hdev, 0x00);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Discoverable mode affects the local advertising</div><div class='add'>+		 * address in limited privacy mode.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY)) {</div><div class='add'>+			if (ext_adv_capable(hdev))</div><div class='add'>+				err = hci_start_ext_adv_sync(hdev, 0x00);</div><div class='add'>+			else</div><div class='add'>+				err = hci_enable_advertising_sync(hdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_discoverable_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_update_discoverable_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_discoverable(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* Only queue if it would have any effect */</div><div class='add'>+	if (hdev_is_powered(hdev) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_DISCOVERABLE) &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY))</div><div class='add'>+		return hci_cmd_sync_queue(hdev, update_discoverable_sync, NULL,</div><div class='add'>+					  NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_connectable_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hci_update_scan_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If BR/EDR is not enabled and we disable advertising as a</div><div class='add'>+	 * by-product of disabling connectable, we need to update the</div><div class='add'>+	 * advertising flags.</div><div class='add'>+	 */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		err = hci_update_adv_data_sync(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+</div><div class='add'>+	/* Update the advertising parameters if necessary */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||</div><div class='add'>+	    !list_empty(&amp;hdev-&gt;adv_instances)) {</div><div class='add'>+		if (ext_adv_capable(hdev))</div><div class='add'>+			err = hci_start_ext_adv_sync(hdev,</div><div class='add'>+						     hdev-&gt;cur_adv_instance);</div><div class='add'>+		else</div><div class='add'>+			err = hci_enable_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_update_passive_scan_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_inquiry_sync(struct hci_dev *hdev, u8 length, u8 num_rsp)</div><div class='add'>+{</div><div class='add'>+	const u8 giac[3] = { 0x33, 0x8b, 0x9e };</div><div class='add'>+	const u8 liac[3] = { 0x00, 0x8b, 0x9e };</div><div class='add'>+	struct hci_cp_inquiry cp;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	hci_inquiry_cache_flush(hdev);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;discovery.limited)</div><div class='add'>+		memcpy(&amp;cp.lap, liac, sizeof(cp.lap));</div><div class='add'>+	else</div><div class='add'>+		memcpy(&amp;cp.lap, giac, sizeof(cp.lap));</div><div class='add'>+</div><div class='add'>+	cp.length = length;</div><div class='add'>+	cp.num_rsp = num_rsp;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_INQUIRY,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_active_scan_sync(struct hci_dev *hdev, uint16_t interval)</div><div class='add'>+{</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+	/* Accept list is not used for discovery */</div><div class='add'>+	u8 filter_policy = 0x00;</div><div class='add'>+	/* Default is to enable duplicates filter */</div><div class='add'>+	u8 filter_dup = LE_SCAN_FILTER_DUP_ENABLE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	/* If controller is scanning, it means the passive scanning is</div><div class='add'>+	 * running. Thus, we should temporarily stop it in order to set the</div><div class='add'>+	 * discovery scanning parameters.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_scan_disable_sync(hdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Unable to disable scanning: %d", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cancel_interleave_scan(hdev);</div><div class='add'>+</div><div class='add'>+	/* Pause address resolution for active scan and stop advertising if</div><div class='add'>+	 * privacy is enabled.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_pause_addr_resolution(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* All active scans will be done with either a resolvable private</div><div class='add'>+	 * address (when privacy feature has been enabled) or non-resolvable</div><div class='add'>+	 * private address.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_update_random_address_sync(hdev, true, scan_use_rpa(hdev),</div><div class='add'>+					     &amp;own_addr_type);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		own_addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='add'>+</div><div class='add'>+	if (hci_is_adv_monitoring(hdev) ||</div><div class='add'>+	    (hci_test_quirk(hdev, HCI_QUIRK_STRICT_DUPLICATE_FILTER) &amp;&amp;</div><div class='add'>+	    hdev-&gt;discovery.result_filtering)) {</div><div class='add'>+		/* Duplicate filter should be disabled when some advertisement</div><div class='add'>+		 * monitor is activated, otherwise AdvMon can only receive one</div><div class='add'>+		 * advertisement for one peer(*) during active scanning, and</div><div class='add'>+		 * might report loss to these peers.</div><div class='add'>+		 *</div><div class='add'>+		 * If controller does strict duplicate filtering and the</div><div class='add'>+		 * discovery requires result filtering disables controller based</div><div class='add'>+		 * filtering since that can cause reports that would match the</div><div class='add'>+		 * host filter to not be reported.</div><div class='add'>+		 */</div><div class='add'>+		filter_dup = LE_SCAN_FILTER_DUP_DISABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_start_scan_sync(hdev, LE_SCAN_ACTIVE, interval,</div><div class='add'>+				  hdev-&gt;le_scan_window_discovery,</div><div class='add'>+				  own_addr_type, filter_policy, filter_dup);</div><div class='add'>+	if (!err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	/* Resume advertising if it was paused */</div><div class='add'>+	if (ll_privacy_capable(hdev))</div><div class='add'>+		hci_resume_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Resume passive scanning */</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_start_interleaved_discovery_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	err = hci_active_scan_sync(hdev, hdev-&gt;le_scan_int_discovery * 2);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_inquiry_sync(hdev, DISCOV_BREDR_INQUIRY_LEN, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_start_discovery_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "type %u", hdev-&gt;discovery.type);</div><div class='add'>+</div><div class='add'>+	switch (hdev-&gt;discovery.type) {</div><div class='add'>+	case DISCOV_TYPE_BREDR:</div><div class='add'>+		return hci_inquiry_sync(hdev, DISCOV_BREDR_INQUIRY_LEN, 0);</div><div class='add'>+	case DISCOV_TYPE_INTERLEAVED:</div><div class='add'>+		/* When running simultaneous discovery, the LE scanning time</div><div class='add'>+		 * should occupy the whole discovery time sine BR/EDR inquiry</div><div class='add'>+		 * and LE scanning are scheduled by the controller.</div><div class='add'>+		 *</div><div class='add'>+		 * For interleaving discovery in comparison, BR/EDR inquiry</div><div class='add'>+		 * and LE scanning are done sequentially with separate</div><div class='add'>+		 * timeouts.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY)) {</div><div class='add'>+			timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);</div><div class='add'>+			/* During simultaneous discovery, we double LE scan</div><div class='add'>+			 * interval. We must leave some time for the controller</div><div class='add'>+			 * to do BR/EDR inquiry.</div><div class='add'>+			 */</div><div class='add'>+			err = hci_start_interleaved_discovery_sync(hdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeout = msecs_to_jiffies(hdev-&gt;discov_interleaved_timeout);</div><div class='add'>+		err = hci_active_scan_sync(hdev, hdev-&gt;le_scan_int_discovery);</div><div class='add'>+		break;</div><div class='add'>+	case DISCOV_TYPE_LE:</div><div class='add'>+		timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);</div><div class='add'>+		err = hci_active_scan_sync(hdev, hdev-&gt;le_scan_int_discovery);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "timeout %u ms", jiffies_to_msecs(timeout));</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;le_scan_disable,</div><div class='add'>+			   timeout);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_suspend_monitor_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	switch (hci_get_adv_monitor_offload_ext(hdev)) {</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_MSFT:</div><div class='add'>+		msft_suspend_sync(hdev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function disables discovery and mark it as paused */</div><div class='add'>+static int hci_pause_discovery_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int old_state = hdev-&gt;discovery.state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If discovery already stopped/stopping/paused there nothing to do */</div><div class='add'>+	if (old_state == DISCOVERY_STOPPED || old_state == DISCOVERY_STOPPING ||</div><div class='add'>+	    hdev-&gt;discovery_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_discovery_set_state(hdev, DISCOVERY_STOPPING);</div><div class='add'>+	err = hci_stop_discovery_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;discovery_paused = true;</div><div class='add'>+	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_update_event_filter_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct bdaddr_list_with_flags *b;</div><div class='add'>+	u8 scan = SCAN_DISABLED;</div><div class='add'>+	bool scanning = test_bit(HCI_PSCAN, &amp;hdev-&gt;flags);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Some fake CSR controllers lock up after setting this type of</div><div class='add'>+	 * filter, so avoid sending the request altogether.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Always clear event filter when starting */</div><div class='add'>+	hci_clear_event_filter_sync(hdev);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(b, &amp;hdev-&gt;accept_list, list) {</div><div class='add'>+		if (!(b-&gt;flags &amp; HCI_CONN_FLAG_REMOTE_WAKEUP))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bt_dev_dbg(hdev, "Adding event filters for %pMR", &amp;b-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+		err =  hci_set_event_filter_sync(hdev, HCI_FLT_CONN_SETUP,</div><div class='add'>+						 HCI_CONN_SETUP_ALLOW_BDADDR,</div><div class='add'>+						 &amp;b-&gt;bdaddr,</div><div class='add'>+						 HCI_CONN_SETUP_AUTO_ON);</div><div class='add'>+		if (err)</div><div class='add'>+			bt_dev_err(hdev, "Failed to set event filter for %pMR",</div><div class='add'>+				   &amp;b-&gt;bdaddr);</div><div class='add'>+		else</div><div class='add'>+			scan = SCAN_PAGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan &amp;&amp; !scanning)</div><div class='add'>+		hci_write_scan_enable_sync(hdev, scan);</div><div class='add'>+	else if (!scan &amp;&amp; scanning)</div><div class='add'>+		hci_write_scan_enable_sync(hdev, scan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function disables scan (BR and LE) and mark it as paused */</div><div class='add'>+static int hci_pause_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (hdev-&gt;scanning_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Disable page scan if enabled */</div><div class='add'>+	if (test_bit(HCI_PSCAN, &amp;hdev-&gt;flags))</div><div class='add'>+		hci_write_scan_enable_sync(hdev, SCAN_DISABLED);</div><div class='add'>+</div><div class='add'>+	hci_scan_disable_sync(hdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;scanning_paused = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function performs the HCI suspend procedures in the follow order:</div><div class='add'>+ *</div><div class='add'>+ * Pause discovery (active scanning/inquiry)</div><div class='add'>+ * Pause Directed Advertising/Advertising</div><div class='add'>+ * Pause Scanning (passive scanning in case discovery was not active)</div><div class='add'>+ * Disconnect all connections</div><div class='add'>+ * Set suspend_status to BT_SUSPEND_DISCONNECT if hdev cannot wakeup</div><div class='add'>+ * otherwise:</div><div class='add'>+ * Update event mask (only set events that are allowed to wake up the host)</div><div class='add'>+ * Update event filter (with devices marked with HCI_CONN_FLAG_REMOTE_WAKEUP)</div><div class='add'>+ * Update passive scanning (lower duty cycle)</div><div class='add'>+ * Set suspend_status to BT_SUSPEND_CONFIGURE_WAKE</div><div class='add'>+ */</div><div class='add'>+int hci_suspend_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If marked as suspended there nothing to do */</div><div class='add'>+	if (hdev-&gt;suspended)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Mark device as suspended */</div><div class='add'>+	hdev-&gt;suspended = true;</div><div class='add'>+</div><div class='add'>+	/* Pause discovery if not already stopped */</div><div class='add'>+	hci_pause_discovery_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Pause other advertisements */</div><div class='add'>+	hci_pause_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Suspend monitor filters */</div><div class='add'>+	hci_suspend_monitor_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Prevent disconnects from causing scanning to be re-enabled */</div><div class='add'>+	hci_pause_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_conn_count(hdev)) {</div><div class='add'>+		/* Soft disconnect everything (power off) */</div><div class='add'>+		err = hci_disconnect_all_sync(hdev, HCI_ERROR_REMOTE_POWER_OFF);</div><div class='add'>+		if (err) {</div><div class='add'>+			/* Set state to BT_RUNNING so resume doesn't notify */</div><div class='add'>+			hdev-&gt;suspend_state = BT_RUNNING;</div><div class='add'>+			hci_resume_sync(hdev);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update event mask so only the allowed event can wakeup the</div><div class='add'>+		 * host.</div><div class='add'>+		 */</div><div class='add'>+		hci_set_event_mask_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only configure accept list if disconnect succeeded and wake</div><div class='add'>+	 * isn't being prevented.</div><div class='add'>+	 */</div><div class='add'>+	if (!hdev-&gt;wakeup || !hdev-&gt;wakeup(hdev)) {</div><div class='add'>+		hdev-&gt;suspend_state = BT_SUSPEND_DISCONNECT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unpause to take care of updating scanning params */</div><div class='add'>+	hdev-&gt;scanning_paused = false;</div><div class='add'>+</div><div class='add'>+	/* Enable event filter for paired devices */</div><div class='add'>+	hci_update_event_filter_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Update LE passive scan if enabled */</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Pause scan changes again. */</div><div class='add'>+	hdev-&gt;scanning_paused = true;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;suspend_state = BT_SUSPEND_CONFIGURE_WAKE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function resumes discovery */</div><div class='add'>+static int hci_resume_discovery_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If discovery not paused there nothing to do */</div><div class='add'>+	if (!hdev-&gt;discovery_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;discovery_paused = false;</div><div class='add'>+</div><div class='add'>+	hci_discovery_set_state(hdev, DISCOVERY_STARTING);</div><div class='add'>+</div><div class='add'>+	err = hci_start_discovery_sync(hdev);</div><div class='add'>+</div><div class='add'>+	hci_discovery_set_state(hdev, err ? DISCOVERY_STOPPED :</div><div class='add'>+				DISCOVERY_FINDING);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hci_resume_monitor_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	switch (hci_get_adv_monitor_offload_ext(hdev)) {</div><div class='add'>+	case HCI_ADV_MONITOR_EXT_MSFT:</div><div class='add'>+		msft_resume_sync(hdev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function resume scan and reset paused flag */</div><div class='add'>+static int hci_resume_scan_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!hdev-&gt;scanning_paused)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;scanning_paused = false;</div><div class='add'>+</div><div class='add'>+	hci_update_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Reset passive scanning to normal */</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function performs the HCI suspend procedures in the follow order:</div><div class='add'>+ *</div><div class='add'>+ * Restore event mask</div><div class='add'>+ * Clear event filter</div><div class='add'>+ * Update passive scanning (normal duty cycle)</div><div class='add'>+ * Resume Directed Advertising/Advertising</div><div class='add'>+ * Resume discovery (active scanning/inquiry)</div><div class='add'>+ */</div><div class='add'>+int hci_resume_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	/* If not marked as suspended there nothing to do */</div><div class='add'>+	if (!hdev-&gt;suspended)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	/* Restore event mask */</div><div class='add'>+	hci_set_event_mask_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Clear any event filters and restore scan state */</div><div class='add'>+	hci_clear_event_filter_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Resume scanning */</div><div class='add'>+	hci_resume_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Resume monitor filters */</div><div class='add'>+	hci_resume_monitor_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Resume other advertisements */</div><div class='add'>+	hci_resume_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Resume discovery */</div><div class='add'>+	hci_resume_discovery_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool conn_use_rpa(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	return hci_dev_test_flag(hdev, HCI_PRIVACY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_ext_directed_advertising_sync(struct hci_dev *hdev,</div><div class='add'>+						struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_ext_adv_params cp;</div><div class='add'>+	struct hci_rp_le_set_ext_adv_params rp;</div><div class='add'>+	int err;</div><div class='add'>+	bdaddr_t random_addr;</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+</div><div class='add'>+	err = hci_update_random_address_sync(hdev, false, conn_use_rpa(conn),</div><div class='add'>+					     &amp;own_addr_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Set require_privacy to false so that the remote device has a</div><div class='add'>+	 * chance of identifying us.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_get_random_address(hdev, false, conn_use_rpa(conn), NULL,</div><div class='add'>+				     &amp;own_addr_type, &amp;random_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_DIRECT_IND);</div><div class='add'>+	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='add'>+	cp.tx_power = HCI_TX_POWER_INVALID;</div><div class='add'>+	cp.primary_phy = HCI_ADV_PHY_1M;</div><div class='add'>+	cp.secondary_phy = HCI_ADV_PHY_1M;</div><div class='add'>+	cp.handle = 0x00; /* Use instance 0 for directed adv */</div><div class='add'>+	cp.own_addr_type = own_addr_type;</div><div class='add'>+	cp.peer_addr_type = conn-&gt;dst_type;</div><div class='add'>+	bacpy(&amp;cp.peer_addr, &amp;conn-&gt;dst);</div><div class='add'>+</div><div class='add'>+	/* As per Core Spec 5.2 Vol 2, PART E, Sec 7.8.53, for</div><div class='add'>+	 * advertising_event_property LE_LEGACY_ADV_DIRECT_IND</div><div class='add'>+	 * does not supports advertising data when the advertising set already</div><div class='add'>+	 * contains some, the controller shall return erroc code 'Invalid</div><div class='add'>+	 * HCI Command Parameters(0x12).</div><div class='add'>+	 * So it is required to remove adv set for handle 0x00. since we use</div><div class='add'>+	 * instance 0 for directed adv.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_remove_ext_adv_instance_sync(hdev, cp.handle, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hci_set_ext_adv_params_sync(hdev, NULL, &amp;cp, &amp;rp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Update adv data as tx power is known now */</div><div class='add'>+	err = hci_set_ext_adv_data_sync(hdev, cp.handle);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Check if random address need to be updated */</div><div class='add'>+	if (own_addr_type == ADDR_LE_DEV_RANDOM &amp;&amp;</div><div class='add'>+	    bacmp(&amp;random_addr, BDADDR_ANY) &amp;&amp;</div><div class='add'>+	    bacmp(&amp;random_addr, &amp;hdev-&gt;random_addr)) {</div><div class='add'>+		err = hci_set_adv_set_random_addr_sync(hdev, 0x00,</div><div class='add'>+						       &amp;random_addr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_enable_ext_advertising_sync(hdev, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_directed_advertising_sync(struct hci_dev *hdev,</div><div class='add'>+					    struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_set_adv_param cp;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+	u8 enable;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_le_ext_directed_advertising_sync(hdev, conn);</div><div class='add'>+</div><div class='add'>+	/* Clear the HCI_LE_ADV bit temporarily so that the</div><div class='add'>+	 * hci_update_random_address knows that it's safe to go ahead</div><div class='add'>+	 * and write a new random address. The flag will be set back on</div><div class='add'>+	 * as soon as the SET_ADV_ENABLE HCI command completes.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_LE_ADV);</div><div class='add'>+</div><div class='add'>+	/* Set require_privacy to false so that the remote device has a</div><div class='add'>+	 * chance of identifying us.</div><div class='add'>+	 */</div><div class='add'>+	status = hci_update_random_address_sync(hdev, false, conn_use_rpa(conn),</div><div class='add'>+						&amp;own_addr_type);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	/* Some controllers might reject command if intervals are not</div><div class='add'>+	 * within range for undirected advertising.</div><div class='add'>+	 * BCM20702A0 is known to be affected by this.</div><div class='add'>+	 */</div><div class='add'>+	cp.min_interval = cpu_to_le16(0x0020);</div><div class='add'>+	cp.max_interval = cpu_to_le16(0x0020);</div><div class='add'>+</div><div class='add'>+	cp.type = LE_ADV_DIRECT_IND;</div><div class='add'>+	cp.own_address_type = own_addr_type;</div><div class='add'>+	cp.direct_addr_type = conn-&gt;dst_type;</div><div class='add'>+	bacpy(&amp;cp.direct_addr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.channel_map = hdev-&gt;le_adv_channel_map;</div><div class='add'>+</div><div class='add'>+	status = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_PARAM,</div><div class='add'>+				       sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	enable = 0x01;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_ENABLE,</div><div class='add'>+				     sizeof(enable), &amp;enable, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_ext_conn_params(struct hci_conn *conn,</div><div class='add'>+				struct hci_cp_le_ext_conn_param *p)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, sizeof(*p));</div><div class='add'>+</div><div class='add'>+	p-&gt;scan_interval = cpu_to_le16(hdev-&gt;le_scan_int_connect);</div><div class='add'>+	p-&gt;scan_window = cpu_to_le16(hdev-&gt;le_scan_window_connect);</div><div class='add'>+	p-&gt;conn_interval_min = cpu_to_le16(conn-&gt;le_conn_min_interval);</div><div class='add'>+	p-&gt;conn_interval_max = cpu_to_le16(conn-&gt;le_conn_max_interval);</div><div class='add'>+	p-&gt;conn_latency = cpu_to_le16(conn-&gt;le_conn_latency);</div><div class='add'>+	p-&gt;supervision_timeout = cpu_to_le16(conn-&gt;le_supv_timeout);</div><div class='add'>+	p-&gt;min_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+	p-&gt;max_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_ext_create_conn_sync(struct hci_dev *hdev,</div><div class='add'>+				       struct hci_conn *conn, u8 own_addr_type)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_ext_create_conn *cp;</div><div class='add'>+	struct hci_cp_le_ext_conn_param *p;</div><div class='add'>+	u8 data[sizeof(*cp) + sizeof(*p) * 3];</div><div class='add'>+	u32 plen;</div><div class='add'>+</div><div class='add'>+	cp = (void *)data;</div><div class='add'>+	p = (void *)cp-&gt;data;</div><div class='add'>+</div><div class='add'>+	memset(cp, 0, sizeof(*cp));</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;cp-&gt;peer_addr, &amp;conn-&gt;dst);</div><div class='add'>+	cp-&gt;peer_addr_type = conn-&gt;dst_type;</div><div class='add'>+	cp-&gt;own_addr_type = own_addr_type;</div><div class='add'>+</div><div class='add'>+	plen = sizeof(*cp);</div><div class='add'>+</div><div class='add'>+	if (scan_1m(hdev) &amp;&amp; (conn-&gt;le_adv_phy == HCI_ADV_PHY_1M ||</div><div class='add'>+			      conn-&gt;le_adv_sec_phy == HCI_ADV_PHY_1M)) {</div><div class='add'>+		cp-&gt;phys |= LE_SCAN_PHY_1M;</div><div class='add'>+		set_ext_conn_params(conn, p);</div><div class='add'>+</div><div class='add'>+		p++;</div><div class='add'>+		plen += sizeof(*p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_2m(hdev) &amp;&amp; (conn-&gt;le_adv_phy == HCI_ADV_PHY_2M ||</div><div class='add'>+			      conn-&gt;le_adv_sec_phy == HCI_ADV_PHY_2M)) {</div><div class='add'>+		cp-&gt;phys |= LE_SCAN_PHY_2M;</div><div class='add'>+		set_ext_conn_params(conn, p);</div><div class='add'>+</div><div class='add'>+		p++;</div><div class='add'>+		plen += sizeof(*p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_coded(hdev) &amp;&amp; (conn-&gt;le_adv_phy == HCI_ADV_PHY_CODED ||</div><div class='add'>+				 conn-&gt;le_adv_sec_phy == HCI_ADV_PHY_CODED)) {</div><div class='add'>+		cp-&gt;phys |= LE_SCAN_PHY_CODED;</div><div class='add'>+		set_ext_conn_params(conn, p);</div><div class='add'>+</div><div class='add'>+		plen += sizeof(*p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_EXT_CREATE_CONN,</div><div class='add'>+					plen, data,</div><div class='add'>+					HCI_EV_LE_ENHANCED_CONN_COMPLETE,</div><div class='add'>+					conn-&gt;conn_timeout, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_create_conn_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_create_conn cp;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+	u8 own_addr_type;</div><div class='add'>+	int err;</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='add'>+</div><div class='add'>+	clear_bit(HCI_CONN_SCANNING, &amp;conn-&gt;flags);</div><div class='add'>+	conn-&gt;state = BT_CONNECT;</div><div class='add'>+</div><div class='add'>+	/* If requested to connect as peripheral use directed advertising */</div><div class='add'>+	if (conn-&gt;role == HCI_ROLE_SLAVE) {</div><div class='add'>+		/* If we're active scanning and simultaneous roles is not</div><div class='add'>+		 * enabled simply reject the attempt.</div><div class='add'>+		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LE_SCAN) &amp;&amp;</div><div class='add'>+		    hdev-&gt;le_scan_type == LE_SCAN_ACTIVE &amp;&amp;</div><div class='add'>+		    !hci_dev_test_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES)) {</div><div class='add'>+			hci_conn_del(conn);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Pause advertising while doing directed advertising. */</div><div class='add'>+		hci_pause_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+		err = hci_le_directed_advertising_sync(hdev, conn);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable advertising if simultaneous roles is not in use. */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES))</div><div class='add'>+		hci_pause_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	params = hci_conn_params_lookup(hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='add'>+	if (params) {</div><div class='add'>+		conn-&gt;le_conn_min_interval = params-&gt;conn_min_interval;</div><div class='add'>+		conn-&gt;le_conn_max_interval = params-&gt;conn_max_interval;</div><div class='add'>+		conn-&gt;le_conn_latency = params-&gt;conn_latency;</div><div class='add'>+		conn-&gt;le_supv_timeout = params-&gt;supervision_timeout;</div><div class='add'>+	} else {</div><div class='add'>+		conn-&gt;le_conn_min_interval = hdev-&gt;le_conn_min_interval;</div><div class='add'>+		conn-&gt;le_conn_max_interval = hdev-&gt;le_conn_max_interval;</div><div class='add'>+		conn-&gt;le_conn_latency = hdev-&gt;le_conn_latency;</div><div class='add'>+		conn-&gt;le_supv_timeout = hdev-&gt;le_supv_timeout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If controller is scanning, we stop it since some controllers are</div><div class='add'>+	 * not able to scan and connect at the same time. Also set the</div><div class='add'>+	 * HCI_LE_SCAN_INTERRUPTED flag so that the command complete</div><div class='add'>+	 * handler for scan disabling knows to set the correct discovery</div><div class='add'>+	 * state.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='add'>+		hci_scan_disable_sync(hdev);</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update random address, but set require_privacy to false so</div><div class='add'>+	 * that we never connect with an non-resolvable address.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_update_random_address_sync(hdev, false, conn_use_rpa(conn),</div><div class='add'>+					     &amp;own_addr_type);</div><div class='add'>+	if (err)</div><div class='add'>+		goto done;</div><div class='add'>+	/* Send command LE Extended Create Connection if supported */</div><div class='add'>+	if (use_ext_conn(hdev)) {</div><div class='add'>+		err = hci_le_ext_create_conn_sync(hdev, conn, own_addr_type);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	cp.scan_interval = cpu_to_le16(hdev-&gt;le_scan_int_connect);</div><div class='add'>+	cp.scan_window = cpu_to_le16(hdev-&gt;le_scan_window_connect);</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;cp.peer_addr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.peer_addr_type = conn-&gt;dst_type;</div><div class='add'>+	cp.own_address_type = own_addr_type;</div><div class='add'>+	cp.conn_interval_min = cpu_to_le16(conn-&gt;le_conn_min_interval);</div><div class='add'>+	cp.conn_interval_max = cpu_to_le16(conn-&gt;le_conn_max_interval);</div><div class='add'>+	cp.conn_latency = cpu_to_le16(conn-&gt;le_conn_latency);</div><div class='add'>+	cp.supervision_timeout = cpu_to_le16(conn-&gt;le_supv_timeout);</div><div class='add'>+	cp.min_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+	cp.max_ce_len = cpu_to_le16(0x0000);</div><div class='add'>+</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2261:</div><div class='add'>+	 *</div><div class='add'>+	 * If this event is unmasked and the HCI_LE_Connection_Complete event</div><div class='add'>+	 * is unmasked, only the HCI_LE_Enhanced_Connection_Complete event is</div><div class='add'>+	 * sent when a new connection has been created.</div><div class='add'>+	 */</div><div class='add'>+	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_CREATE_CONN,</div><div class='add'>+				       sizeof(cp), &amp;cp,</div><div class='add'>+				       use_enhanced_conn_complete(hdev) ?</div><div class='add'>+				       HCI_EV_LE_ENHANCED_CONN_COMPLETE :</div><div class='add'>+				       HCI_EV_LE_CONN_COMPLETE,</div><div class='add'>+				       conn-&gt;conn_timeout, NULL);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (err == -ETIMEDOUT)</div><div class='add'>+		hci_le_connect_cancel_sync(hdev, conn, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Re-enable advertising after the connection attempt is finished. */</div><div class='add'>+	hci_resume_advertising_sync(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_create_cis_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_create_cis, cmd, cis, num_cis, 0x1f);</div><div class='add'>+	size_t aux_num_cis = 0;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	u8 cig = BT_ISO_QOS_CIG_UNSET;</div><div class='add'>+</div><div class='add'>+	/* The spec allows only one pending LE Create CIS command at a time. If</div><div class='add'>+	 * the command is pending now, don't do anything. We check for pending</div><div class='add'>+	 * connections after each CIS Established event.</div><div class='add'>+	 *</div><div class='add'>+	 * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E</div><div class='add'>+	 * page 2566:</div><div class='add'>+	 *</div><div class='add'>+	 * If the Host issues this command before all the</div><div class='add'>+	 * HCI_LE_CIS_Established events from the previous use of the</div><div class='add'>+	 * command have been generated, the Controller shall return the</div><div class='add'>+	 * error code Command Disallowed (0x0C).</div><div class='add'>+	 *</div><div class='add'>+	 * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E</div><div class='add'>+	 * page 2567:</div><div class='add'>+	 *</div><div class='add'>+	 * When the Controller receives the HCI_LE_Create_CIS command, the</div><div class='add'>+	 * Controller sends the HCI_Command_Status event to the Host. An</div><div class='add'>+	 * HCI_LE_CIS_Established event will be generated for each CIS when it</div><div class='add'>+	 * is established or if it is disconnected or considered lost before</div><div class='add'>+	 * being established; until all the events are generated, the command</div><div class='add'>+	 * remains pending.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* Wait until previous Create CIS has completed */</div><div class='add'>+	list_for_each_entry_rcu(conn, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+		if (test_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags))</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find CIG with all CIS ready */</div><div class='add'>+	list_for_each_entry_rcu(conn, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+		struct hci_conn *link;</div><div class='add'>+</div><div class='add'>+		if (hci_conn_check_create_cis(conn))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cig = conn-&gt;iso_qos.ucast.cig;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_rcu(link, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+			if (hci_conn_check_create_cis(link) &gt; 0 &amp;&amp;</div><div class='add'>+			    link-&gt;iso_qos.ucast.cig == cig &amp;&amp;</div><div class='add'>+			    link-&gt;state != BT_CONNECTED) {</div><div class='add'>+				cig = BT_ISO_QOS_CIG_UNSET;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cig != BT_ISO_QOS_CIG_UNSET)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cig == BT_ISO_QOS_CIG_UNSET)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(conn, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='add'>+		struct hci_cis *cis = &amp;cmd-&gt;cis[aux_num_cis];</div><div class='add'>+</div><div class='add'>+		if (hci_conn_check_create_cis(conn) ||</div><div class='add'>+		    conn-&gt;iso_qos.ucast.cig != cig)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		set_bit(HCI_CONN_CREATE_CIS, &amp;conn-&gt;flags);</div><div class='add'>+		cis-&gt;acl_handle = cpu_to_le16(conn-&gt;parent-&gt;handle);</div><div class='add'>+		cis-&gt;cis_handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+		aux_num_cis++;</div><div class='add'>+</div><div class='add'>+		if (aux_num_cis &gt;= cmd-&gt;num_cis)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;num_cis = aux_num_cis;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!aux_num_cis)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_LE_CIS_Established */</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_CREATE_CIS,</div><div class='add'>+					struct_size(cmd, cis, cmd-&gt;num_cis),</div><div class='add'>+					cmd, HCI_EVT_LE_CIS_ESTABLISHED,</div><div class='add'>+					conn-&gt;conn_timeout, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_remove_cig_sync(struct hci_dev *hdev, u8 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_remove_cig cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.cig_id = handle;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_REMOVE_CIG, sizeof(cp),</div><div class='add'>+				     &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_big_terminate_sync(struct hci_dev *hdev, u8 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_big_term_sync cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = handle;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_BIG_TERM_SYNC,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_pa_terminate_sync(struct hci_dev *hdev, u16 handle)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_pa_term_sync cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(handle);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_PA_TERM_SYNC,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,</div><div class='add'>+			   bool use_rpa, struct adv_info *adv_instance,</div><div class='add'>+			   u8 *own_addr_type, bdaddr_t *rand_addr)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bacpy(rand_addr, BDADDR_ANY);</div><div class='add'>+</div><div class='add'>+	/* If privacy is enabled use a resolvable private address. If</div><div class='add'>+	 * current RPA has expired then generate a new one.</div><div class='add'>+	 */</div><div class='add'>+	if (use_rpa) {</div><div class='add'>+		/* If Controller supports LL Privacy use own address type is</div><div class='add'>+		 * 0x03</div><div class='add'>+		 */</div><div class='add'>+		if (ll_privacy_capable(hdev))</div><div class='add'>+			*own_addr_type = ADDR_LE_DEV_RANDOM_RESOLVED;</div><div class='add'>+		else</div><div class='add'>+			*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+</div><div class='add'>+		if (adv_instance) {</div><div class='add'>+			if (adv_rpa_valid(adv_instance))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (rpa_valid(hdev))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = smp_generate_rpa(hdev, hdev-&gt;irk, &amp;hdev-&gt;rpa);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			bt_dev_err(hdev, "failed to generate new RPA");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bacpy(rand_addr, &amp;hdev-&gt;rpa);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case of required privacy without resolvable private address,</div><div class='add'>+	 * use an non-resolvable private address. This is useful for</div><div class='add'>+	 * non-connectable advertising.</div><div class='add'>+	 */</div><div class='add'>+	if (require_privacy) {</div><div class='add'>+		bdaddr_t nrpa;</div><div class='add'>+</div><div class='add'>+		while (true) {</div><div class='add'>+			/* The non-resolvable private address is generated</div><div class='add'>+			 * from random six bytes with the two most significant</div><div class='add'>+			 * bits cleared.</div><div class='add'>+			 */</div><div class='add'>+			get_random_bytes(&amp;nrpa, 6);</div><div class='add'>+			nrpa.b[5] &amp;= 0x3f;</div><div class='add'>+</div><div class='add'>+			/* The non-resolvable private address shall not be</div><div class='add'>+			 * equal to the public address.</div><div class='add'>+			 */</div><div class='add'>+			if (bacmp(&amp;hdev-&gt;bdaddr, &amp;nrpa))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*own_addr_type = ADDR_LE_DEV_RANDOM;</div><div class='add'>+		bacpy(rand_addr, &amp;nrpa);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No privacy, use the current address */</div><div class='add'>+	hci_copy_identity_address(hdev, rand_addr, own_addr_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _update_adv_data_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 instance = PTR_UINT(data);</div><div class='add'>+</div><div class='add'>+	return hci_update_adv_data_sync(hdev, instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_update_adv_data(struct hci_dev *hdev, u8 instance)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue(hdev, _update_adv_data_sync,</div><div class='add'>+				  UINT_PTR(instance), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_acl_create_conn_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct inquiry_entry *ie;</div><div class='add'>+	struct hci_cp_create_conn cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	/* Many controllers disallow HCI Create Connection while it is doing</div><div class='add'>+	 * HCI Inquiry. So we cancel the Inquiry first before issuing HCI Create</div><div class='add'>+	 * Connection. This may cause the MGMT discovering state to become false</div><div class='add'>+	 * without user space's request but it is okay since the MGMT Discovery</div><div class='add'>+	 * APIs do not promise that discovery should be done forever. Instead,</div><div class='add'>+	 * the user space monitors the status of MGMT discovering and it may</div><div class='add'>+	 * request for discovery again when this flag becomes false.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(HCI_INQUIRY, &amp;hdev-&gt;flags)) {</div><div class='add'>+		err = __hci_cmd_sync_status(hdev, HCI_OP_INQUIRY_CANCEL, 0,</div><div class='add'>+					    NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+		if (err)</div><div class='add'>+			bt_dev_warn(hdev, "Failed to cancel inquiry %d", err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;state = BT_CONNECT;</div><div class='add'>+	conn-&gt;out = true;</div><div class='add'>+	conn-&gt;role = HCI_ROLE_MASTER;</div><div class='add'>+</div><div class='add'>+	conn-&gt;attempt++;</div><div class='add'>+</div><div class='add'>+	conn-&gt;link_policy = hdev-&gt;link_policy;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	bacpy(&amp;cp.bdaddr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.pscan_rep_mode = 0x02;</div><div class='add'>+</div><div class='add'>+	ie = hci_inquiry_cache_lookup(hdev, &amp;conn-&gt;dst);</div><div class='add'>+	if (ie) {</div><div class='add'>+		if (inquiry_entry_age(ie) &lt;= INQUIRY_ENTRY_AGE_MAX) {</div><div class='add'>+			cp.pscan_rep_mode = ie-&gt;data.pscan_rep_mode;</div><div class='add'>+			cp.pscan_mode     = ie-&gt;data.pscan_mode;</div><div class='add'>+			cp.clock_offset   = ie-&gt;data.clock_offset |</div><div class='add'>+					    cpu_to_le16(0x8000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(conn-&gt;dev_class, ie-&gt;data.dev_class, 3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp.pkt_type = cpu_to_le16(conn-&gt;pkt_type);</div><div class='add'>+	if (lmp_rswitch_capable(hdev) &amp;&amp; !(hdev-&gt;link_mode &amp; HCI_LM_MASTER))</div><div class='add'>+		cp.role_switch = 0x01;</div><div class='add'>+	else</div><div class='add'>+		cp.role_switch = 0x00;</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_CREATE_CONN,</div><div class='add'>+					sizeof(cp), &amp;cp,</div><div class='add'>+					HCI_EV_CONN_COMPLETE,</div><div class='add'>+					conn-&gt;conn_timeout, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_connect_acl_sync(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue_once(hdev, hci_acl_create_conn_sync, conn,</div><div class='add'>+				       NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		hci_connect_le_scan_cleanup(conn, 0x00);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if connection is still pending */</div><div class='add'>+	if (conn != hci_lookup_le_connect(hdev))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Flush to make sure we send create conn cancel command if needed */</div><div class='add'>+	flush_delayed_work(&amp;conn-&gt;le_conn_timeout);</div><div class='add'>+	hci_conn_failed(conn, bt_status(err));</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_connect_le_sync(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue_once(hdev, hci_le_create_conn_sync, conn,</div><div class='add'>+				       create_le_conn_complete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_cancel_connect_sync(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;state != BT_OPEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (conn-&gt;type) {</div><div class='add'>+	case ACL_LINK:</div><div class='add'>+		return !hci_cmd_sync_dequeue_once(hdev,</div><div class='add'>+						  hci_acl_create_conn_sync,</div><div class='add'>+						  conn, NULL);</div><div class='add'>+	case LE_LINK:</div><div class='add'>+		return !hci_cmd_sync_dequeue_once(hdev, hci_le_create_conn_sync,</div><div class='add'>+						  conn, create_le_conn_complete);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_conn_update_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+			    struct hci_conn_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_conn_update cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle		= cpu_to_le16(conn-&gt;handle);</div><div class='add'>+	cp.conn_interval_min	= cpu_to_le16(params-&gt;conn_min_interval);</div><div class='add'>+	cp.conn_interval_max	= cpu_to_le16(params-&gt;conn_max_interval);</div><div class='add'>+	cp.conn_latency		= cpu_to_le16(params-&gt;conn_latency);</div><div class='add'>+	cp.supervision_timeout	= cpu_to_le16(params-&gt;supervision_timeout);</div><div class='add'>+	cp.min_ce_len		= cpu_to_le16(0x0000);</div><div class='add'>+	cp.max_ce_len		= cpu_to_le16(0x0000);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_CONN_UPDATE,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_pa_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct hci_conn *pa_sync;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_conn_valid(hdev, conn))</div><div class='add'>+		clear_bit(HCI_CONN_CREATE_PA_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Add connection to indicate PA sync error */</div><div class='add'>+	pa_sync = hci_conn_add_unset(hdev, PA_LINK, BDADDR_ANY, 0,</div><div class='add'>+				     HCI_ROLE_SLAVE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(pa_sync))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	set_bit(HCI_CONN_PA_SYNC_FAILED, &amp;pa_sync-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* Notify iso layer */</div><div class='add'>+	hci_connect_cfm(pa_sync, bt_status(err));</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_past_params_sync(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='add'>+				   struct hci_conn *acl, struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_past_params cp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(acl-&gt;handle);</div><div class='add'>+	/* An HCI_LE_Periodic_Advertising_Sync_Transfer_Received event is sent</div><div class='add'>+	 * to the Host. HCI_LE_Periodic_Advertising_Report events will be</div><div class='add'>+	 * enabled with duplicate filtering enabled.</div><div class='add'>+	 */</div><div class='add'>+	cp.mode = 0x03;</div><div class='add'>+	cp.skip = cpu_to_le16(qos-&gt;bcast.skip);</div><div class='add'>+	cp.sync_timeout = cpu_to_le16(qos-&gt;bcast.sync_timeout);</div><div class='add'>+	cp.cte_type = qos-&gt;bcast.sync_cte_type;</div><div class='add'>+</div><div class='add'>+	/* HCI_LE_PAST_PARAMS command returns a command complete event so it</div><div class='add'>+	 * cannot wait for HCI_EV_LE_PAST_RECEIVED.</div><div class='add'>+	 */</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_PAST_PARAMS,</div><div class='add'>+				    sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EV_LE_PAST_RECEIVED event */</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_NOP, 0, NULL,</div><div class='add'>+					HCI_EV_LE_PAST_RECEIVED,</div><div class='add'>+					conn-&gt;conn_timeout, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_pa_create_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_pa_create_sync cp;</div><div class='add'>+	struct hci_conn *conn = data, *le;</div><div class='add'>+	struct bt_iso_qos *qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;sync_handle != HCI_SYNC_HANDLE_INVALID)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_and_set_flag(hdev, HCI_PA_SYNC))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Stop scanning if SID has not been set and active scanning is enabled</div><div class='add'>+	 * so we use passive scanning which will be scanning using the allow</div><div class='add'>+	 * list programmed to contain only the connection address.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;sid == HCI_SID_INVALID &amp;&amp;</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_LE_SCAN)) {</div><div class='add'>+		hci_scan_disable_sync(hdev);</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED);</div><div class='add'>+		hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark HCI_CONN_CREATE_PA_SYNC so hci_update_passive_scan_sync can</div><div class='add'>+	 * program the address in the allow list so PA advertisements can be</div><div class='add'>+	 * received.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(HCI_CONN_CREATE_PA_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Check if PAST is possible:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. Check if an ACL connection with the destination address exists</div><div class='add'>+	 * 2. Check if that HCI_CONN_FLAG_PAST has been set which indicates that</div><div class='add'>+	 *    user really intended to use PAST.</div><div class='add'>+	 */</div><div class='add'>+	le = hci_conn_hash_lookup_le(hdev, &amp;conn-&gt;dst, conn-&gt;dst_type);</div><div class='add'>+	if (le) {</div><div class='add'>+		struct hci_conn_params *params;</div><div class='add'>+</div><div class='add'>+		params = hci_conn_params_lookup(hdev, &amp;le-&gt;dst, le-&gt;dst_type);</div><div class='add'>+		if (params &amp;&amp; params-&gt;flags &amp; HCI_CONN_FLAG_PAST) {</div><div class='add'>+			err = hci_le_past_params_sync(hdev, conn, le, qos);</div><div class='add'>+			if (!err)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* SID has not been set listen for HCI_EV_LE_EXT_ADV_REPORT to update</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;sid == HCI_SID_INVALID) {</div><div class='add'>+		err = __hci_cmd_sync_status_sk(hdev, HCI_OP_NOP, 0, NULL,</div><div class='add'>+					       HCI_EV_LE_EXT_ADV_REPORT,</div><div class='add'>+					       conn-&gt;conn_timeout, NULL);</div><div class='add'>+		if (err == -ETIMEDOUT)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.options = qos-&gt;bcast.options;</div><div class='add'>+	cp.sid = conn-&gt;sid;</div><div class='add'>+	cp.addr_type = conn-&gt;dst_type;</div><div class='add'>+	bacpy(&amp;cp.addr, &amp;conn-&gt;dst);</div><div class='add'>+	cp.skip = cpu_to_le16(qos-&gt;bcast.skip);</div><div class='add'>+	cp.sync_timeout = cpu_to_le16(qos-&gt;bcast.sync_timeout);</div><div class='add'>+	cp.sync_cte_type = qos-&gt;bcast.sync_cte_type;</div><div class='add'>+</div><div class='add'>+	/* The spec allows only one pending LE Periodic Advertising Create</div><div class='add'>+	 * Sync command at a time so we forcefully wait for PA Sync Established</div><div class='add'>+	 * event since cmd_work can only schedule one command at a time.</div><div class='add'>+	 *</div><div class='add'>+	 * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E</div><div class='add'>+	 * page 2493:</div><div class='add'>+	 *</div><div class='add'>+	 * If the Host issues this command when another HCI_LE_Periodic_</div><div class='add'>+	 * Advertising_Create_Sync command is pending, the Controller shall</div><div class='add'>+	 * return the error code Command Disallowed (0x0C).</div><div class='add'>+	 */</div><div class='add'>+	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_PA_CREATE_SYNC,</div><div class='add'>+				       sizeof(cp), &amp;cp,</div><div class='add'>+				       HCI_EV_LE_PA_SYNC_ESTABLISHED,</div><div class='add'>+				       conn-&gt;conn_timeout, NULL);</div><div class='add'>+	if (err == -ETIMEDOUT)</div><div class='add'>+		__hci_cmd_sync_status(hdev, HCI_OP_LE_PA_CREATE_SYNC_CANCEL,</div><div class='add'>+				      0, NULL, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_PA_SYNC);</div><div class='add'>+</div><div class='add'>+	/* Update passive scan since HCI_PA_SYNC flag has been cleared */</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_connect_pa_sync(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue_once(hdev, hci_le_pa_create_sync, conn,</div><div class='add'>+				       create_pa_complete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_big_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hci_conn_valid(hdev, conn))</div><div class='add'>+		clear_bit(HCI_CONN_CREATE_BIG_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_big_create_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	DEFINE_FLEX(struct hci_cp_le_big_create_sync, cp, bis, num_bis, 0x11);</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct bt_iso_qos *qos = &amp;conn-&gt;iso_qos;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	set_bit(HCI_CONN_CREATE_BIG_SYNC, &amp;conn-&gt;flags);</div><div class='add'>+</div><div class='add'>+	memset(cp, 0, sizeof(*cp));</div><div class='add'>+	cp-&gt;handle = qos-&gt;bcast.big;</div><div class='add'>+	cp-&gt;sync_handle = cpu_to_le16(conn-&gt;sync_handle);</div><div class='add'>+	cp-&gt;encryption = qos-&gt;bcast.encryption;</div><div class='add'>+	memcpy(cp-&gt;bcode, qos-&gt;bcast.bcode, sizeof(cp-&gt;bcode));</div><div class='add'>+	cp-&gt;mse = qos-&gt;bcast.mse;</div><div class='add'>+	cp-&gt;timeout = cpu_to_le16(qos-&gt;bcast.timeout);</div><div class='add'>+	cp-&gt;num_bis = conn-&gt;num_bis;</div><div class='add'>+	memcpy(cp-&gt;bis, conn-&gt;bis, conn-&gt;num_bis);</div><div class='add'>+</div><div class='add'>+	/* The spec allows only one pending LE BIG Create Sync command at</div><div class='add'>+	 * a time, so we forcefully wait for BIG Sync Established event since</div><div class='add'>+	 * cmd_work can only schedule one command at a time.</div><div class='add'>+	 *</div><div class='add'>+	 * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E</div><div class='add'>+	 * page 2586:</div><div class='add'>+	 *</div><div class='add'>+	 * If the Host sends this command when the Controller is in the</div><div class='add'>+	 * process of synchronizing to any BIG, i.e. the HCI_LE_BIG_Sync_</div><div class='add'>+	 * Established event has not been generated, the Controller shall</div><div class='add'>+	 * return the error code Command Disallowed (0x0C).</div><div class='add'>+	 */</div><div class='add'>+	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_BIG_CREATE_SYNC,</div><div class='add'>+				       struct_size(cp, bis, cp-&gt;num_bis), cp,</div><div class='add'>+				       HCI_EVT_LE_BIG_SYNC_ESTABLISHED,</div><div class='add'>+				       conn-&gt;conn_timeout, NULL);</div><div class='add'>+	if (err == -ETIMEDOUT)</div><div class='add'>+		hci_le_big_terminate_sync(hdev, cp-&gt;handle);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_connect_big_sync(struct hci_dev *hdev, struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	return hci_cmd_sync_queue_once(hdev, hci_le_big_create_sync, conn,</div><div class='add'>+				       create_big_complete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct past_data {</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+	struct hci_conn *le;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void past_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct past_data *past = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	kfree(past);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_past_set_info_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct past_data *past = data;</div><div class='add'>+	struct hci_cp_le_past_set_info cp;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, past-&gt;conn) ||</div><div class='add'>+	    !hci_conn_valid(hdev, past-&gt;le)) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(past-&gt;le-&gt;handle);</div><div class='add'>+	cp.adv_handle = past-&gt;conn-&gt;iso_qos.bcast.bis;</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_PAST_SET_INFO,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_past_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct past_data *past = data;</div><div class='add'>+	struct hci_cp_le_past cp;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, past-&gt;conn) ||</div><div class='add'>+	    !hci_conn_valid(hdev, past-&gt;le)) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(past-&gt;le-&gt;handle);</div><div class='add'>+	cp.sync_handle = cpu_to_le16(past-&gt;conn-&gt;sync_handle);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_PAST,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_past_sync(struct hci_conn *conn, struct hci_conn *le)</div><div class='add'>+{</div><div class='add'>+	struct past_data *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;type != BIS_LINK &amp;&amp; conn-&gt;type != PA_LINK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!past_sender_capable(conn-&gt;hdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data-&gt;conn = conn;</div><div class='add'>+	data-&gt;le = le;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;role == HCI_ROLE_MASTER)</div><div class='add'>+		err = hci_cmd_sync_queue_once(conn-&gt;hdev,</div><div class='add'>+					      hci_le_past_set_info_sync, data,</div><div class='add'>+					      past_complete);</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue_once(conn-&gt;hdev, hci_le_past_sync,</div><div class='add'>+					      data, past_complete);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		kfree(data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void le_read_features_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_conn_drop(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_read_all_remote_features_sync(struct hci_dev *hdev,</div><div class='add'>+						void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct hci_cp_le_read_all_remote_features cp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+	cp.pages = 10; /* Attempt to read all pages */</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EVT_LE_ALL_REMOTE_FEATURES_COMPLETE event otherwise</div><div class='add'>+	 * hci_conn_drop may run prematurely causing a disconnection.</div><div class='add'>+	 */</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev,</div><div class='add'>+					HCI_OP_LE_READ_ALL_REMOTE_FEATURES,</div><div class='add'>+					sizeof(cp), &amp;cp,</div><div class='add'>+					HCI_EVT_LE_ALL_REMOTE_FEATURES_COMPLETE,</div><div class='add'>+					HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+</div><div class='add'>+	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_ALL_REMOTE_FEATURES,</div><div class='add'>+				     sizeof(cp), &amp;cp, HCI_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_le_read_remote_features_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = data;</div><div class='add'>+	struct hci_cp_le_read_remote_features cp;</div><div class='add'>+</div><div class='add'>+	if (!hci_conn_valid(hdev, conn))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	/* Check if LL Extended Feature Set is supported and</div><div class='add'>+	 * HCI_OP_LE_READ_ALL_REMOTE_FEATURES is supported then use that to read</div><div class='add'>+	 * all features.</div><div class='add'>+	 */</div><div class='add'>+	if (ll_ext_feature_capable(hdev) &amp;&amp; hdev-&gt;commands[47] &amp; BIT(3))</div><div class='add'>+		return hci_le_read_all_remote_features_sync(hdev, data);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp, 0, sizeof(cp));</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+</div><div class='add'>+	/* Wait for HCI_EV_LE_REMOTE_FEAT_COMPLETE event otherwise</div><div class='add'>+	 * hci_conn_drop may run prematurely causing a disconnection.</div><div class='add'>+	 */</div><div class='add'>+	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_READ_REMOTE_FEATURES,</div><div class='add'>+					sizeof(cp), &amp;cp,</div><div class='add'>+					HCI_EV_LE_REMOTE_FEAT_COMPLETE,</div><div class='add'>+					HCI_CMD_TIMEOUT, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hci_le_read_remote_features(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The remote features procedure is defined for central</div><div class='add'>+	 * role only. So only in case of an initiated connection</div><div class='add'>+	 * request the remote features.</div><div class='add'>+	 *</div><div class='add'>+	 * If the local controller supports peripheral-initiated features</div><div class='add'>+	 * exchange, then requesting the remote features in peripheral</div><div class='add'>+	 * role is possible. Otherwise just transition into the</div><div class='add'>+	 * connected state without requesting the remote features.</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;out || (hdev-&gt;le_features[0] &amp; HCI_LE_PERIPHERAL_FEATURES))</div><div class='add'>+		err = hci_cmd_sync_queue_once(hdev,</div><div class='add'>+					      hci_le_read_remote_features_sync,</div><div class='add'>+					      hci_conn_hold(conn),</div><div class='add'>+					      le_read_features_complete);</div><div class='add'>+	else</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c<br/>index 9874844a95a9..041ce9adc378 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_sysfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hci_sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hci_sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hci_sysfs.c</a></div><div class='hunk'>@@ -6,7 +6,9 @@</div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct class *bt_class;</div><div class='add'>+static const struct class bt_class = {</div><div class='add'>+	.name = "bluetooth",</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void bt_link_release(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -19,24 +21,14 @@ static const struct device_type bt_link = {</div><div class='ctx'> 	.release = bt_link_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The rfcomm tty device will possibly retain even when conn</div><div class='del'>- * is down, and sysfs doesn't support move zombie device,</div><div class='del'>- * so we should move the device before conn device is destroyed.</div><div class='del'>- */</div><div class='del'>-static int __match_tty(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	return !strncmp(dev_name(dev), "rfcomm", 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void hci_conn_init_sysfs(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;dev.type = &amp;bt_link;</div><div class='del'>-	conn-&gt;dev.class = bt_class;</div><div class='add'>+	conn-&gt;dev.class = &amp;bt_class;</div><div class='ctx'> 	conn-&gt;dev.parent = &amp;hdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	device_initialize(&amp;conn-&gt;dev);</div><div class='hunk'>@@ -46,50 +38,80 @@ void hci_conn_add_sysfs(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (device_is_registered(&amp;conn-&gt;dev))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_name(&amp;conn-&gt;dev, "%s:%d", hdev-&gt;name, conn-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	if (device_add(&amp;conn-&gt;dev) &lt; 0) {</div><div class='add'>+	if (device_add(&amp;conn-&gt;dev) &lt; 0)</div><div class='ctx'> 		bt_dev_err(hdev, "failed to register connection device");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_hold(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hci_conn_del_sysfs(struct hci_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	if (!device_is_registered(&amp;conn-&gt;dev))</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (!device_is_registered(&amp;conn-&gt;dev)) {</div><div class='add'>+		/* If device_add() has *not* succeeded, use *only* put_device()</div><div class='add'>+		 * to drop the reference count.</div><div class='add'>+		 */</div><div class='add'>+		put_device(&amp;conn-&gt;dev);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* If there are devices using the connection as parent reset it to NULL</div><div class='add'>+	 * before unregistering the device.</div><div class='add'>+	 */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct device *dev;</div><div class='ctx'> </div><div class='del'>-		dev = device_find_child(&amp;conn-&gt;dev, NULL, __match_tty);</div><div class='add'>+		dev = device_find_any_child(&amp;conn-&gt;dev);</div><div class='ctx'> 		if (!dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		device_move(dev, NULL, DPM_ORDER_DEV_LAST);</div><div class='ctx'> 		put_device(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_del(&amp;conn-&gt;dev);</div><div class='del'>-</div><div class='del'>-	hci_dev_put(hdev);</div><div class='add'>+	device_unregister(&amp;conn-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bt_host_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = to_hci_dev(dev);</div><div class='del'>-	kfree(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='add'>+		hci_release_dev(hdev);</div><div class='add'>+	else</div><div class='add'>+		kfree(hdev);</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t reset_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = to_hci_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;reset)</div><div class='add'>+		hdev-&gt;reset(hdev);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_WO(reset);</div><div class='add'>+</div><div class='add'>+static struct attribute *bt_host_attrs[] = {</div><div class='add'>+	&amp;dev_attr_reset.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(bt_host);</div><div class='add'>+</div><div class='ctx'> static const struct device_type bt_host = {</div><div class='ctx'> 	.name    = "host",</div><div class='ctx'> 	.release = bt_host_release,</div><div class='add'>+	.groups = bt_host_groups,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void hci_init_sysfs(struct hci_dev *hdev)</div><div class='hunk'>@@ -97,7 +119,7 @@ void hci_init_sysfs(struct hci_dev *hdev)</div><div class='ctx'> 	struct device *dev = &amp;hdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;type = &amp;bt_host;</div><div class='del'>-	dev-&gt;class = bt_class;</div><div class='add'>+	dev-&gt;class = &amp;bt_class;</div><div class='ctx'> </div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='ctx'> 	device_initialize(dev);</div><div class='hunk'>@@ -105,12 +127,10 @@ void hci_init_sysfs(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> int __init bt_sysfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	bt_class = class_create(THIS_MODULE, "bluetooth");</div><div class='del'>-</div><div class='del'>-	return PTR_ERR_OR_ZERO(bt_class);</div><div class='add'>+	return class_register(&amp;bt_class);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bt_sysfs_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	class_destroy(bt_class);</div><div class='add'>+	class_unregister(&amp;bt_class);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bluetooth/hidp/Kconfig b/net/bluetooth/hidp/Kconfig<br/>index bc8610b24077..e08aae35351a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hidp/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config BT_HIDP</div><div class='ctx'> 	tristate "HIDP protocol support"</div><div class='del'>-	depends on BT_BREDR &amp;&amp; INPUT</div><div class='del'>-	select HID</div><div class='add'>+	depends on BT_BREDR &amp;&amp; HID</div><div class='ctx'> 	help</div><div class='ctx'> 	  HIDP (Human Interface Device Protocol) is a transport layer</div><div class='ctx'> 	  for HID reports.  HIDP is required for the Bluetooth Human</div><div class='head'>diff --git a/net/bluetooth/hidp/Makefile b/net/bluetooth/hidp/Makefile<br/>index a9ee115696ae..f41b0aa02b23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hidp/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux Bluetooth HIDP layer</div><div class='ctx'> #</div><div class='head'>diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c<br/>index 253975cce943..6724adce615b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hidp/core.c</a></div><div class='hunk'>@@ -83,14 +83,14 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo</div><div class='ctx'> 		ci-&gt;product = session-&gt;input-&gt;id.product;</div><div class='ctx'> 		ci-&gt;version = session-&gt;input-&gt;id.version;</div><div class='ctx'> 		if (session-&gt;input-&gt;name)</div><div class='del'>-			strlcpy(ci-&gt;name, session-&gt;input-&gt;name, 128);</div><div class='add'>+			strscpy(ci-&gt;name, session-&gt;input-&gt;name, 128);</div><div class='ctx'> 		else</div><div class='del'>-			strlcpy(ci-&gt;name, "HID Boot Device", 128);</div><div class='add'>+			strscpy(ci-&gt;name, "HID Boot Device", 128);</div><div class='ctx'> 	} else if (session-&gt;hid) {</div><div class='ctx'> 		ci-&gt;vendor  = session-&gt;hid-&gt;vendor;</div><div class='ctx'> 		ci-&gt;product = session-&gt;hid-&gt;product;</div><div class='ctx'> 		ci-&gt;version = session-&gt;hid-&gt;version;</div><div class='del'>-		strlcpy(ci-&gt;name, session-&gt;hid-&gt;name, 128);</div><div class='add'>+		strscpy(ci-&gt;name, session-&gt;hid-&gt;name, 128);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +101,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("session %p data %p size %d", session, data, size);</div><div class='ctx'> </div><div class='hunk'>@@ -114,13 +115,17 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_put_u8(skb, hdr);</div><div class='del'>-	if (data &amp;&amp; size &gt; 0)</div><div class='add'>+	if (data &amp;&amp; size &gt; 0) {</div><div class='ctx'> 		skb_put_data(skb, data, size);</div><div class='add'>+		ret = size;</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_tail(transmit, skb);</div><div class='ctx'> 	wake_up_interruptible(sk_sleep(sk));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hidp_send_ctrl_message(struct hidp_session *session,</div><div class='hunk'>@@ -262,7 +267,7 @@ static int hidp_get_raw_report(struct hid_device *hid,</div><div class='ctx'> 	set_bit(HIDP_WAITING_FOR_RETURN, &amp;session-&gt;flags);</div><div class='ctx'> 	data[0] = report_number;</div><div class='ctx'> 	ret = hidp_send_ctrl_message(session, report_type, data, 1);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the return of the report. The returned report</div><div class='hunk'>@@ -338,7 +343,7 @@ static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum,</div><div class='ctx'> 	data[0] = reportnum;</div><div class='ctx'> 	set_bit(HIDP_WAITING_FOR_SEND_ACK, &amp;session-&gt;flags);</div><div class='ctx'> 	ret = hidp_send_ctrl_message(session, report_type, data, count);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the ACK from the device. */</div><div class='hunk'>@@ -400,7 +405,7 @@ static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum,</div><div class='ctx'> </div><div class='ctx'> static void hidp_idle_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct hidp_session *session = from_timer(session, t, timer);</div><div class='add'>+	struct hidp_session *session = timer_container_of(session, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	/* The HIDP user-space API only contains calls to add and remove</div><div class='ctx'> 	 * devices. There is no way to forward events of any kind. Therefore,</div><div class='hunk'>@@ -428,7 +433,7 @@ static void hidp_set_timer(struct hidp_session *session)</div><div class='ctx'> static void hidp_del_timer(struct hidp_session *session)</div><div class='ctx'> {</div><div class='ctx'> 	if (session-&gt;idle_to &gt; 0)</div><div class='del'>-		del_timer(&amp;session-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;session-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hidp_process_report(struct hidp_session *session, int type,</div><div class='hunk'>@@ -503,7 +508,7 @@ static int hidp_process_data(struct hidp_session *session, struct sk_buff *skb,</div><div class='ctx'> 				unsigned char param)</div><div class='ctx'> {</div><div class='ctx'> 	int done_with_skb = 1;</div><div class='del'>-	BT_DBG("session %p skb %p len %d param 0x%02x", session, skb, skb-&gt;len, param);</div><div class='add'>+	BT_DBG("session %p skb %p len %u param 0x%02x", session, skb, skb-&gt;len, param);</div><div class='ctx'> </div><div class='ctx'> 	switch (param) {</div><div class='ctx'> 	case HIDP_DATA_RTYPE_INPUT:</div><div class='hunk'>@@ -548,7 +553,7 @@ static void hidp_recv_ctrl_frame(struct hidp_session *session,</div><div class='ctx'> 	unsigned char hdr, type, param;</div><div class='ctx'> 	int free_skb = 1;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p skb %p len %d", session, skb, skb-&gt;len);</div><div class='add'>+	BT_DBG("session %p skb %p len %u", session, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	hdr = skb-&gt;data[0];</div><div class='ctx'> 	skb_pull(skb, 1);</div><div class='hunk'>@@ -584,7 +589,7 @@ static void hidp_recv_intr_frame(struct hidp_session *session,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char hdr;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("session %p skb %p len %d", session, skb, skb-&gt;len);</div><div class='add'>+	BT_DBG("session %p skb %p len %u", session, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	hdr = skb-&gt;data[0];</div><div class='ctx'> 	skb_pull(skb, 1);</div><div class='hunk'>@@ -649,7 +654,7 @@ static void hidp_process_transmit(struct hidp_session *session,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hidp_setup_input(struct hidp_session *session,</div><div class='del'>-				struct hidp_connadd_req *req)</div><div class='add'>+				const struct hidp_connadd_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *input;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -734,7 +739,7 @@ static void hidp_stop(struct hid_device *hid)</div><div class='ctx'> 	hid-&gt;claimed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct hid_ll_driver hidp_hid_driver = {</div><div class='add'>+static const struct hid_ll_driver hidp_hid_driver = {</div><div class='ctx'> 	.parse = hidp_parse,</div><div class='ctx'> 	.start = hidp_start,</div><div class='ctx'> 	.stop = hidp_stop,</div><div class='hunk'>@@ -743,12 +748,11 @@ struct hid_ll_driver hidp_hid_driver = {</div><div class='ctx'> 	.raw_request = hidp_raw_request,</div><div class='ctx'> 	.output_report = hidp_output_report,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL_GPL(hidp_hid_driver);</div><div class='ctx'> </div><div class='ctx'> /* This function sets up the hid device. It does not add it</div><div class='ctx'>    to the HID system. That is done in hidp_add_connection(). */</div><div class='ctx'> static int hidp_setup_hid(struct hidp_session *session,</div><div class='del'>-				struct hidp_connadd_req *req)</div><div class='add'>+				const struct hidp_connadd_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -775,7 +779,7 @@ static int hidp_setup_hid(struct hidp_session *session,</div><div class='ctx'> 	hid-&gt;version = req-&gt;version;</div><div class='ctx'> 	hid-&gt;country = req-&gt;country;</div><div class='ctx'> </div><div class='del'>-	strncpy(hid-&gt;name, req-&gt;name, sizeof(hid-&gt;name));</div><div class='add'>+	strscpy(hid-&gt;name, req-&gt;name, sizeof(hid-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	snprintf(hid-&gt;phys, sizeof(hid-&gt;phys), "%pMR",</div><div class='ctx'> 		 &amp;l2cap_pi(session-&gt;ctrl_sock-&gt;sk)-&gt;chan-&gt;src);</div><div class='hunk'>@@ -789,7 +793,7 @@ static int hidp_setup_hid(struct hidp_session *session,</div><div class='ctx'> 	hid-&gt;dev.parent = &amp;session-&gt;conn-&gt;hcon-&gt;dev;</div><div class='ctx'> 	hid-&gt;ll_driver = &amp;hidp_hid_driver;</div><div class='ctx'> </div><div class='del'>-	/* True if device is blacklisted in drivers/hid/hid-quirks.c */</div><div class='add'>+	/* True if device is blocked in drivers/hid/hid-quirks.c */</div><div class='ctx'> 	if (hid_ignore(hid)) {</div><div class='ctx'> 		hid_destroy_device(session-&gt;hid);</div><div class='ctx'> 		session-&gt;hid = NULL;</div><div class='hunk'>@@ -807,7 +811,7 @@ fault:</div><div class='ctx'> </div><div class='ctx'> /* initialize session devices */</div><div class='ctx'> static int hidp_session_dev_init(struct hidp_session *session,</div><div class='del'>-				 struct hidp_connadd_req *req)</div><div class='add'>+				 const struct hidp_connadd_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -906,7 +910,7 @@ static void hidp_session_dev_work(struct work_struct *work)</div><div class='ctx'> static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,</div><div class='ctx'> 			    struct socket *ctrl_sock,</div><div class='ctx'> 			    struct socket *intr_sock,</div><div class='del'>-			    struct hidp_connadd_req *req,</div><div class='add'>+			    const struct hidp_connadd_req *req,</div><div class='ctx'> 			    struct l2cap_conn *conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidp_session *session;</div><div class='hunk'>@@ -1074,6 +1078,10 @@ static int hidp_session_start_sync(struct hidp_session *session)</div><div class='ctx'> static void hidp_session_terminate(struct hidp_session *session)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;session-&gt;terminate);</div><div class='add'>+	/*</div><div class='add'>+	 * See the comment preceding the call to wait_woken()</div><div class='add'>+	 * in hidp_session_run().</div><div class='add'>+	 */</div><div class='ctx'> 	wake_up_interruptible(&amp;hidp_session_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1193,8 +1201,6 @@ static void hidp_session_run(struct hidp_session *session)</div><div class='ctx'> 		 *    thread is woken up by -&gt;sk_state_changed().</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		/* Ensure session-&gt;terminate is updated */</div><div class='del'>-		smp_mb__before_atomic();</div><div class='ctx'> 		if (atomic_read(&amp;session-&gt;terminate))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1228,14 +1234,15 @@ static void hidp_session_run(struct hidp_session *session)</div><div class='ctx'> 		hidp_process_transmit(session, &amp;session-&gt;ctrl_transmit,</div><div class='ctx'> 				      session-&gt;ctrl_sock);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * wait_woken() performs the necessary memory barriers</div><div class='add'>+		 * for us; see the header comment for this primitive.</div><div class='add'>+		 */</div><div class='ctx'> 		wait_woken(&amp;wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> 	remove_wait_queue(&amp;hidp_session_wq, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;session-&gt;terminate);</div><div class='del'>-</div><div class='del'>-	/* Ensure session-&gt;terminate is updated */</div><div class='del'>-	smp_mb__after_atomic();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hidp_session_wake_function(wait_queue_entry_t *wait,</div><div class='hunk'>@@ -1271,7 +1278,7 @@ static int hidp_session_thread(void *arg)</div><div class='ctx'> 	add_wait_queue(sk_sleep(session-&gt;intr_sock-&gt;sk), &amp;intr_wait);</div><div class='ctx'> 	/* This memory barrier is paired with wq_has_sleeper(). See</div><div class='ctx'> 	 * sock_poll_wait() for more information why this is needed. */</div><div class='del'>-	smp_mb();</div><div class='add'>+	smp_mb__before_atomic();</div><div class='ctx'> </div><div class='ctx'> 	/* notify synchronous startup that we're ready */</div><div class='ctx'> 	atomic_inc(&amp;session-&gt;state);</div><div class='hunk'>@@ -1282,7 +1289,7 @@ static int hidp_session_thread(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	/* cleanup runtime environment */</div><div class='ctx'> 	remove_wait_queue(sk_sleep(session-&gt;intr_sock-&gt;sk), &amp;intr_wait);</div><div class='del'>-	remove_wait_queue(sk_sleep(session-&gt;intr_sock-&gt;sk), &amp;ctrl_wait);</div><div class='add'>+	remove_wait_queue(sk_sleep(session-&gt;ctrl_sock-&gt;sk), &amp;ctrl_wait);</div><div class='ctx'> 	wake_up_interruptible(&amp;session-&gt;report_queue);</div><div class='ctx'> 	hidp_del_timer(session);</div><div class='ctx'> </div><div class='hunk'>@@ -1297,7 +1304,7 @@ static int hidp_session_thread(void *arg)</div><div class='ctx'> 	l2cap_unregister_user(session-&gt;conn, &amp;session-&gt;user);</div><div class='ctx'> 	hidp_session_put(session);</div><div class='ctx'> </div><div class='del'>-	module_put_and_exit(0);</div><div class='add'>+	module_put_and_kthread_exit(0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1335,7 +1342,7 @@ static int hidp_verify_sockets(struct socket *ctrl_sock,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hidp_connection_add(struct hidp_connadd_req *req,</div><div class='add'>+int hidp_connection_add(const struct hidp_connadd_req *req,</div><div class='ctx'> 			struct socket *ctrl_sock,</div><div class='ctx'> 			struct socket *intr_sock)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h<br/>index 8798492a6e99..6ef88d0a1919 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/hidp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/hidp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/hidp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hidp/hidp.h</a></div><div class='hunk'>@@ -122,7 +122,7 @@ struct hidp_connlist_req {</div><div class='ctx'> 	struct hidp_conninfo __user *ci;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int hidp_connection_add(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);</div><div class='add'>+int hidp_connection_add(const struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);</div><div class='ctx'> int hidp_connection_del(struct hidp_conndel_req *req);</div><div class='ctx'> int hidp_get_connlist(struct hidp_connlist_req *req);</div><div class='ctx'> int hidp_get_conninfo(struct hidp_conninfo *ci);</div><div class='head'>diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c<br/>index 1eaac01f85de..c93aaeb3a3fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/hidp/sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/hidp/sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/hidp/sock.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>    SOFTWARE IS DISCLAIMED.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,9 +47,8 @@ static int hidp_sock_release(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int do_hidp_sock_ioctl(struct socket *sock, unsigned int cmd, void __user *argp)</div><div class='ctx'> {</div><div class='del'>-	void __user *argp = (void __user *) arg;</div><div class='ctx'> 	struct hidp_connadd_req ca;</div><div class='ctx'> 	struct hidp_conndel_req cd;</div><div class='ctx'> 	struct hidp_connlist_req cl;</div><div class='hunk'>@@ -57,7 +57,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long</div><div class='ctx'> 	struct socket *isock;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("cmd %x arg %lx", cmd, arg);</div><div class='add'>+	BT_DBG("cmd %x arg %p", cmd, argp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case HIDPCONNADD:</div><div class='hunk'>@@ -76,6 +76,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long</div><div class='ctx'> 			sockfd_put(csock);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='add'>+		ca.name[sizeof(ca.name)-1] = 0;</div><div class='ctx'> </div><div class='ctx'> 		err = hidp_connection_add(&amp;ca, csock, isock);</div><div class='ctx'> 		if (!err &amp;&amp; copy_to_user(argp, &amp;ca, sizeof(ca)))</div><div class='hunk'>@@ -122,6 +123,11 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return do_hidp_sock_ioctl(sock, cmd, (void __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> struct compat_hidp_connadd_req {</div><div class='ctx'> 	int   ctrl_sock;	/* Connected control socket */</div><div class='hunk'>@@ -141,13 +147,15 @@ struct compat_hidp_connadd_req {</div><div class='ctx'> </div><div class='ctx'> static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (cmd == HIDPGETCONNLIST) {</div><div class='ctx'> 		struct hidp_connlist_req cl;</div><div class='add'>+		u32 __user *p = argp;</div><div class='ctx'> 		u32 uci;</div><div class='del'>-		int err;</div><div class='ctx'> </div><div class='del'>-		if (get_user(cl.cnum, (u32 __user *) arg) ||</div><div class='del'>-				get_user(uci, (u32 __user *) (arg + 4)))</div><div class='add'>+		if (get_user(cl.cnum, p) || get_user(uci, p + 1))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		cl.ci = compat_ptr(uci);</div><div class='hunk'>@@ -157,39 +165,55 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne</div><div class='ctx'> </div><div class='ctx'> 		err = hidp_get_connlist(&amp;cl);</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; put_user(cl.cnum, (u32 __user *) arg))</div><div class='add'>+		if (!err &amp;&amp; put_user(cl.cnum, p))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	} else if (cmd == HIDPCONNADD) {</div><div class='del'>-		struct compat_hidp_connadd_req ca;</div><div class='del'>-		struct hidp_connadd_req __user *uca;</div><div class='add'>+		struct compat_hidp_connadd_req ca32;</div><div class='add'>+		struct hidp_connadd_req ca;</div><div class='add'>+		struct socket *csock;</div><div class='add'>+		struct socket *isock;</div><div class='ctx'> </div><div class='del'>-		uca = compat_alloc_user_space(sizeof(*uca));</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ca, (void __user *) arg, sizeof(ca)))</div><div class='add'>+		if (copy_from_user(&amp;ca32, (void __user *) arg, sizeof(ca32)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (put_user(ca.ctrl_sock, &amp;uca-&gt;ctrl_sock) ||</div><div class='del'>-				put_user(ca.intr_sock, &amp;uca-&gt;intr_sock) ||</div><div class='del'>-				put_user(ca.parser, &amp;uca-&gt;parser) ||</div><div class='del'>-				put_user(ca.rd_size, &amp;uca-&gt;rd_size) ||</div><div class='del'>-				put_user(compat_ptr(ca.rd_data), &amp;uca-&gt;rd_data) ||</div><div class='del'>-				put_user(ca.country, &amp;uca-&gt;country) ||</div><div class='del'>-				put_user(ca.subclass, &amp;uca-&gt;subclass) ||</div><div class='del'>-				put_user(ca.vendor, &amp;uca-&gt;vendor) ||</div><div class='del'>-				put_user(ca.product, &amp;uca-&gt;product) ||</div><div class='del'>-				put_user(ca.version, &amp;uca-&gt;version) ||</div><div class='del'>-				put_user(ca.flags, &amp;uca-&gt;flags) ||</div><div class='del'>-				put_user(ca.idle_to, &amp;uca-&gt;idle_to) ||</div><div class='del'>-				copy_to_user(&amp;uca-&gt;name[0], &amp;ca.name[0], 128))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		ca.ctrl_sock = ca32.ctrl_sock;</div><div class='add'>+		ca.intr_sock = ca32.intr_sock;</div><div class='add'>+		ca.parser = ca32.parser;</div><div class='add'>+		ca.rd_size = ca32.rd_size;</div><div class='add'>+		ca.rd_data = compat_ptr(ca32.rd_data);</div><div class='add'>+		ca.country = ca32.country;</div><div class='add'>+		ca.subclass = ca32.subclass;</div><div class='add'>+		ca.vendor = ca32.vendor;</div><div class='add'>+		ca.product = ca32.product;</div><div class='add'>+		ca.version = ca32.version;</div><div class='add'>+		ca.flags = ca32.flags;</div><div class='add'>+		ca.idle_to = ca32.idle_to;</div><div class='add'>+		ca32.name[sizeof(ca32.name) - 1] = '\0';</div><div class='add'>+		memcpy(ca.name, ca32.name, 128);</div><div class='add'>+</div><div class='add'>+		csock = sockfd_lookup(ca.ctrl_sock, &amp;err);</div><div class='add'>+		if (!csock)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		isock = sockfd_lookup(ca.intr_sock, &amp;err);</div><div class='add'>+		if (!isock) {</div><div class='add'>+			sockfd_put(csock);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		arg = (unsigned long) uca;</div><div class='add'>+		err = hidp_connection_add(&amp;ca, csock, isock);</div><div class='add'>+		if (!err &amp;&amp; copy_to_user(argp, &amp;ca32, sizeof(ca32)))</div><div class='add'>+			err = -EFAULT;</div><div class='ctx'> </div><div class='del'>-		/* Fall through. We don't actually write back any _changes_</div><div class='del'>-		   to the structure anyway, so there's no need to copy back</div><div class='del'>-		   into the original compat version */</div><div class='add'>+		sockfd_put(csock);</div><div class='add'>+		sockfd_put(isock);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return hidp_sock_ioctl(sock, cmd, arg);</div><div class='hunk'>@@ -210,8 +234,6 @@ static const struct proto_ops hidp_sock_ops = {</div><div class='ctx'> 	.recvmsg	= sock_no_recvmsg,</div><div class='ctx'> 	.listen		= sock_no_listen,</div><div class='ctx'> 	.shutdown	= sock_no_shutdown,</div><div class='del'>-	.setsockopt	= sock_no_setsockopt,</div><div class='del'>-	.getsockopt	= sock_no_getsockopt,</div><div class='ctx'> 	.connect	= sock_no_connect,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='ctx'> 	.accept		= sock_no_accept,</div><div class='hunk'>@@ -234,21 +256,13 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	if (sock-&gt;type != SOCK_RAW)</div><div class='ctx'> 		return -ESOCKTNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, GFP_ATOMIC, &amp;hidp_proto, kern);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;hidp_proto, protocol, GFP_ATOMIC, kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-</div><div class='ctx'> 	sock-&gt;ops = &amp;hidp_sock_ops;</div><div class='del'>-</div><div class='ctx'> 	sock-&gt;state = SS_UNCONNECTED;</div><div class='ctx'> </div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = protocol;</div><div class='del'>-	sk-&gt;sk_state	= BT_OPEN;</div><div class='del'>-</div><div class='ctx'> 	bt_sock_link(&amp;hidp_sk_list, sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c<br/>new file mode 100644<br/>index 000000000000..e36d24a9098b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/iso.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/iso.c</a></div><div class='hunk'>@@ -0,0 +1,2734 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * BlueZ - Bluetooth protocol stack for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2022 Intel Corporation</div><div class='add'>+ * Copyright 2023-2024 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/iso.h&gt;</div><div class='add'>+#include "eir.h"</div><div class='add'>+</div><div class='add'>+static const struct proto_ops iso_sock_ops;</div><div class='add'>+</div><div class='add'>+static struct bt_sock_list iso_sk_list = {</div><div class='add'>+	.lock = __RW_LOCK_UNLOCKED(iso_sk_list.lock)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ---- ISO connections ---- */</div><div class='add'>+struct iso_conn {</div><div class='add'>+	struct hci_conn	*hcon;</div><div class='add'>+</div><div class='add'>+	/* @lock: spinlock protecting changes to iso_conn fields */</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+	struct sock	*sk;</div><div class='add'>+</div><div class='add'>+	struct delayed_work	timeout_work;</div><div class='add'>+</div><div class='add'>+	struct sk_buff	*rx_skb;</div><div class='add'>+	__u32		rx_len;</div><div class='add'>+	__u16		tx_sn;</div><div class='add'>+	struct kref	ref;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define iso_conn_lock(c)	spin_lock(&amp;(c)-&gt;lock)</div><div class='add'>+#define iso_conn_unlock(c)	spin_unlock(&amp;(c)-&gt;lock)</div><div class='add'>+</div><div class='add'>+static void iso_sock_close(struct sock *sk);</div><div class='add'>+static void iso_sock_kill(struct sock *sk);</div><div class='add'>+</div><div class='add'>+/* ----- ISO socket info ----- */</div><div class='add'>+#define iso_pi(sk) ((struct iso_pinfo *)sk)</div><div class='add'>+</div><div class='add'>+#define EIR_SERVICE_DATA_LENGTH 4</div><div class='add'>+#define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH)</div><div class='add'>+#define EIR_BAA_SERVICE_UUID	0x1851</div><div class='add'>+</div><div class='add'>+/* iso_pinfo flags values */</div><div class='add'>+enum {</div><div class='add'>+	BT_SK_BIG_SYNC,</div><div class='add'>+	BT_SK_PA_SYNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iso_pinfo {</div><div class='add'>+	struct bt_sock		bt;</div><div class='add'>+	bdaddr_t		src;</div><div class='add'>+	__u8			src_type;</div><div class='add'>+	bdaddr_t		dst;</div><div class='add'>+	__u8			dst_type;</div><div class='add'>+	__u8			bc_sid;</div><div class='add'>+	__u8			bc_num_bis;</div><div class='add'>+	__u8			bc_bis[ISO_MAX_NUM_BIS];</div><div class='add'>+	__u16			sync_handle;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	struct bt_iso_qos	qos;</div><div class='add'>+	bool			qos_user_set;</div><div class='add'>+	__u8			base_len;</div><div class='add'>+	__u8			base[BASE_MAX_LENGTH];</div><div class='add'>+	struct iso_conn		*conn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bt_iso_qos default_qos;</div><div class='add'>+</div><div class='add'>+static bool check_ucast_qos(struct bt_iso_qos *qos);</div><div class='add'>+static bool check_bcast_qos(struct bt_iso_qos *qos);</div><div class='add'>+static bool iso_match_sid(struct sock *sk, void *data);</div><div class='add'>+static bool iso_match_sid_past(struct sock *sk, void *data);</div><div class='add'>+static bool iso_match_sync_handle(struct sock *sk, void *data);</div><div class='add'>+static bool iso_match_sync_handle_pa_report(struct sock *sk, void *data);</div><div class='add'>+static void iso_sock_disconn(struct sock *sk);</div><div class='add'>+</div><div class='add'>+typedef bool (*iso_sock_match_t)(struct sock *sk, void *data);</div><div class='add'>+</div><div class='add'>+static struct sock *iso_get_sock(struct hci_dev *hdev, bdaddr_t *src,</div><div class='add'>+				 bdaddr_t *dst, enum bt_sock_state state,</div><div class='add'>+				 iso_sock_match_t match, void *data);</div><div class='add'>+</div><div class='add'>+/* ---- ISO timers ---- */</div><div class='add'>+#define ISO_CONN_TIMEOUT	secs_to_jiffies(20)</div><div class='add'>+#define ISO_DISCONN_TIMEOUT	secs_to_jiffies(2)</div><div class='add'>+</div><div class='add'>+static void iso_conn_free(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn = container_of(ref, struct iso_conn, ref);</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;sk)</div><div class='add'>+		iso_pi(conn-&gt;sk)-&gt;conn = NULL;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;hcon) {</div><div class='add'>+		conn-&gt;hcon-&gt;iso_data = NULL;</div><div class='add'>+		hci_conn_drop(conn-&gt;hcon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure no more work items will run since hci_conn has been dropped */</div><div class='add'>+	disable_delayed_work_sync(&amp;conn-&gt;timeout_work);</div><div class='add'>+</div><div class='add'>+	kfree_skb(conn-&gt;rx_skb);</div><div class='add'>+</div><div class='add'>+	kfree(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_conn_put(struct iso_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p refcnt %d", conn, kref_read(&amp;conn-&gt;ref));</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;conn-&gt;ref, iso_conn_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iso_conn *iso_conn_hold_unless_zero(struct iso_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (!conn)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p refcnt %u", conn, kref_read(&amp;conn-&gt;ref));</div><div class='add'>+</div><div class='add'>+	if (!kref_get_unless_zero(&amp;conn-&gt;ref))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *iso_sock_hold(struct iso_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (!conn || !bt_sock_linked(&amp;iso_sk_list, conn-&gt;sk))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sock_hold(conn-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return conn-&gt;sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_timeout(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn = container_of(work, struct iso_conn,</div><div class='add'>+					     timeout_work.work);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_hold_unless_zero(conn);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iso_conn_lock(conn);</div><div class='add'>+	sk = iso_sock_hold(conn);</div><div class='add'>+	iso_conn_unlock(conn);</div><div class='add'>+	iso_conn_put(conn);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p state %d", sk, sk-&gt;sk_state);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	sk-&gt;sk_err = ETIMEDOUT;</div><div class='add'>+	sk-&gt;sk_state_change(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_set_timer(struct sock *sk, long timeout)</div><div class='add'>+{</div><div class='add'>+	if (!iso_pi(sk)-&gt;conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p state %d timeout %ld", sk, sk-&gt;sk_state, timeout);</div><div class='add'>+	cancel_delayed_work(&amp;iso_pi(sk)-&gt;conn-&gt;timeout_work);</div><div class='add'>+	schedule_delayed_work(&amp;iso_pi(sk)-&gt;conn-&gt;timeout_work, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_clear_timer(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (!iso_pi(sk)-&gt;conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p state %d", sk, sk-&gt;sk_state);</div><div class='add'>+	cancel_delayed_work(&amp;iso_pi(sk)-&gt;conn-&gt;timeout_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ---- ISO connections ---- */</div><div class='add'>+static struct iso_conn *iso_conn_add(struct hci_conn *hcon)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn = hcon-&gt;iso_data;</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_hold_unless_zero(conn);</div><div class='add'>+	if (conn) {</div><div class='add'>+		if (!conn-&gt;hcon) {</div><div class='add'>+			iso_conn_lock(conn);</div><div class='add'>+			conn-&gt;hcon = hcon;</div><div class='add'>+			iso_conn_unlock(conn);</div><div class='add'>+		}</div><div class='add'>+		iso_conn_put(conn);</div><div class='add'>+		return conn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = kzalloc(sizeof(*conn), GFP_KERNEL);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;conn-&gt;ref);</div><div class='add'>+	spin_lock_init(&amp;conn-&gt;lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;conn-&gt;timeout_work, iso_sock_timeout);</div><div class='add'>+</div><div class='add'>+	hcon-&gt;iso_data = conn;</div><div class='add'>+	conn-&gt;hcon = hcon;</div><div class='add'>+	conn-&gt;tx_sn = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("hcon %p conn %p", hcon, conn);</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Delete channel. Must be called on the locked socket. */</div><div class='add'>+static void iso_chan_del(struct sock *sk, int err)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn;</div><div class='add'>+	struct sock *parent;</div><div class='add'>+</div><div class='add'>+	conn = iso_pi(sk)-&gt;conn;</div><div class='add'>+	iso_pi(sk)-&gt;conn = NULL;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p, conn %p, err %d", sk, conn, err);</div><div class='add'>+</div><div class='add'>+	if (conn) {</div><div class='add'>+		iso_conn_lock(conn);</div><div class='add'>+		conn-&gt;sk = NULL;</div><div class='add'>+		iso_conn_unlock(conn);</div><div class='add'>+		iso_conn_put(conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_state = BT_CLOSED;</div><div class='add'>+	sk-&gt;sk_err   = err;</div><div class='add'>+</div><div class='add'>+	parent = bt_sk(sk)-&gt;parent;</div><div class='add'>+	if (parent) {</div><div class='add'>+		bt_accept_unlink(sk);</div><div class='add'>+		parent-&gt;sk_data_ready(parent);</div><div class='add'>+	} else {</div><div class='add'>+		sk-&gt;sk_state_change(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_set_flag(sk, SOCK_ZAPPED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_conn_del(struct hci_conn *hcon, int err)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn = hcon-&gt;iso_data;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_hold_unless_zero(conn);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);</div><div class='add'>+</div><div class='add'>+	/* Kill socket */</div><div class='add'>+	iso_conn_lock(conn);</div><div class='add'>+	sk = iso_sock_hold(conn);</div><div class='add'>+	iso_conn_unlock(conn);</div><div class='add'>+	iso_conn_put(conn);</div><div class='add'>+</div><div class='add'>+	if (!sk) {</div><div class='add'>+		iso_conn_put(conn);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	iso_sock_clear_timer(sk);</div><div class='add'>+	iso_chan_del(sk, err);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iso_chan_add(struct iso_conn *conn, struct sock *sk,</div><div class='add'>+			  struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (iso_pi(sk)-&gt;conn == conn &amp;&amp; conn-&gt;sk == sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;sk) {</div><div class='add'>+		BT_ERR("conn-&gt;sk already set");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;conn = conn;</div><div class='add'>+	conn-&gt;sk = sk;</div><div class='add'>+</div><div class='add'>+	if (parent)</div><div class='add'>+		bt_accept_enqueue(parent, sk, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_chan_add(struct iso_conn *conn, struct sock *sk,</div><div class='add'>+			struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iso_conn_lock(conn);</div><div class='add'>+	err = __iso_chan_add(conn, sk, parent);</div><div class='add'>+	iso_conn_unlock(conn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 le_addr_type(u8 bdaddr_type)</div><div class='add'>+{</div><div class='add'>+	if (bdaddr_type == BDADDR_LE_PUBLIC)</div><div class='add'>+		return ADDR_LE_DEV_PUBLIC;</div><div class='add'>+	else</div><div class='add'>+		return ADDR_LE_DEV_RANDOM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_connect_bis(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn;</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct hci_dev  *hdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%pMR (SID 0x%2.2x)", &amp;iso_pi(sk)-&gt;src, iso_pi(sk)-&gt;bc_sid);</div><div class='add'>+</div><div class='add'>+	hdev = hci_get_route(&amp;iso_pi(sk)-&gt;dst, &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+			     iso_pi(sk)-&gt;src_type);</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return -EHOSTUNREACH;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!bis_capable(hdev)) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fail if user set invalid QoS */</div><div class='add'>+	if (iso_pi(sk)-&gt;qos_user_set &amp;&amp; !check_bcast_qos(&amp;iso_pi(sk)-&gt;qos)) {</div><div class='add'>+		iso_pi(sk)-&gt;qos = default_qos;</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fail if out PHYs are marked as disabled */</div><div class='add'>+	if (!iso_pi(sk)-&gt;qos.bcast.out.phy) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Just bind if DEFER_SETUP has been set */</div><div class='add'>+	if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		hcon = hci_bind_bis(hdev, &amp;iso_pi(sk)-&gt;dst, iso_pi(sk)-&gt;bc_sid,</div><div class='add'>+				    &amp;iso_pi(sk)-&gt;qos, iso_pi(sk)-&gt;base_len,</div><div class='add'>+				    iso_pi(sk)-&gt;base,</div><div class='add'>+				    READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+		if (IS_ERR(hcon)) {</div><div class='add'>+			err = PTR_ERR(hcon);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hcon = hci_connect_bis(hdev, &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+				       le_addr_type(iso_pi(sk)-&gt;dst_type),</div><div class='add'>+				       iso_pi(sk)-&gt;bc_sid, &amp;iso_pi(sk)-&gt;qos,</div><div class='add'>+				       iso_pi(sk)-&gt;base_len, iso_pi(sk)-&gt;base,</div><div class='add'>+				       READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+		if (IS_ERR(hcon)) {</div><div class='add'>+			err = PTR_ERR(hcon);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update SID if it was not set */</div><div class='add'>+		if (iso_pi(sk)-&gt;bc_sid == HCI_SID_INVALID)</div><div class='add'>+			iso_pi(sk)-&gt;bc_sid = hcon-&gt;sid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_add(hcon);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		hci_conn_drop(hcon);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	err = iso_chan_add(conn, sk, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update source addr of the socket */</div><div class='add'>+	bacpy(&amp;iso_pi(sk)-&gt;src, &amp;hcon-&gt;src);</div><div class='add'>+</div><div class='add'>+	if (hcon-&gt;state == BT_CONNECTED) {</div><div class='add'>+		iso_sock_clear_timer(sk);</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+	} else if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		iso_sock_clear_timer(sk);</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECT;</div><div class='add'>+	} else {</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECT;</div><div class='add'>+		iso_sock_set_timer(sk, READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_connect_cis(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn;</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct hci_dev  *hdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%pMR -&gt; %pMR", &amp;iso_pi(sk)-&gt;src, &amp;iso_pi(sk)-&gt;dst);</div><div class='add'>+</div><div class='add'>+	hdev = hci_get_route(&amp;iso_pi(sk)-&gt;dst, &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+			     iso_pi(sk)-&gt;src_type);</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return -EHOSTUNREACH;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!cis_central_capable(hdev)) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fail if user set invalid QoS */</div><div class='add'>+	if (iso_pi(sk)-&gt;qos_user_set &amp;&amp; !check_ucast_qos(&amp;iso_pi(sk)-&gt;qos)) {</div><div class='add'>+		iso_pi(sk)-&gt;qos = default_qos;</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fail if either PHYs are marked as disabled */</div><div class='add'>+	if (!iso_pi(sk)-&gt;qos.ucast.in.phy &amp;&amp; !iso_pi(sk)-&gt;qos.ucast.out.phy) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if there are available buffers for output/TX. */</div><div class='add'>+	if (iso_pi(sk)-&gt;qos.ucast.out.sdu &amp;&amp; !hci_iso_count(hdev) &amp;&amp;</div><div class='add'>+	    (hdev-&gt;iso_pkts &amp;&amp; !hdev-&gt;iso_cnt)) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Just bind if DEFER_SETUP has been set */</div><div class='add'>+	if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		hcon = hci_bind_cis(hdev, &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+				    le_addr_type(iso_pi(sk)-&gt;dst_type),</div><div class='add'>+				    &amp;iso_pi(sk)-&gt;qos,</div><div class='add'>+				    READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+		if (IS_ERR(hcon)) {</div><div class='add'>+			err = PTR_ERR(hcon);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hcon = hci_connect_cis(hdev, &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+				       le_addr_type(iso_pi(sk)-&gt;dst_type),</div><div class='add'>+				       &amp;iso_pi(sk)-&gt;qos,</div><div class='add'>+				       READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+		if (IS_ERR(hcon)) {</div><div class='add'>+			err = PTR_ERR(hcon);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_add(hcon);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		hci_conn_drop(hcon);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	err = iso_chan_add(conn, sk, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update source addr of the socket */</div><div class='add'>+	bacpy(&amp;iso_pi(sk)-&gt;src, &amp;hcon-&gt;src);</div><div class='add'>+</div><div class='add'>+	if (hcon-&gt;state == BT_CONNECTED) {</div><div class='add'>+		iso_sock_clear_timer(sk);</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+	} else if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		iso_sock_clear_timer(sk);</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECT;</div><div class='add'>+	} else {</div><div class='add'>+		sk-&gt;sk_state = BT_CONNECT;</div><div class='add'>+		iso_sock_set_timer(sk, READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_state == BT_CONNECTED || sk-&gt;sk_state == BT_CONNECT2)</div><div class='add'>+		return &amp;iso_pi(sk)-&gt;conn-&gt;hcon-&gt;iso_qos;</div><div class='add'>+</div><div class='add'>+	return &amp;iso_pi(sk)-&gt;qos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_send_frame(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			  const struct sockcm_cookie *sockc)</div><div class='add'>+{</div><div class='add'>+	struct iso_conn *conn = iso_pi(sk)-&gt;conn;</div><div class='add'>+	struct bt_iso_qos *qos = iso_sock_get_qos(sk);</div><div class='add'>+	struct hci_iso_data_hdr *hdr;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p len %d", sk, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; qos-&gt;ucast.out.sdu)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* Push ISO data header */</div><div class='add'>+	hdr = skb_push(skb, HCI_ISO_DATA_HDR_SIZE);</div><div class='add'>+	hdr-&gt;sn = cpu_to_le16(conn-&gt;tx_sn++);</div><div class='add'>+	hdr-&gt;slen = cpu_to_le16(hci_iso_data_len_pack(len,</div><div class='add'>+						      HCI_ISO_STATUS_VALID));</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == BT_CONNECTED) {</div><div class='add'>+		hci_setup_tx_timestamp(skb, 1, sockc);</div><div class='add'>+		hci_send_iso(conn-&gt;hcon, skb);</div><div class='add'>+	} else {</div><div class='add'>+		len = -ENOTCONN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_recv_frame(struct iso_conn *conn, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	iso_conn_lock(conn);</div><div class='add'>+	sk = conn-&gt;sk;</div><div class='add'>+	iso_conn_unlock(conn);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p len %d", sk, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != BT_CONNECTED)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (!sock_queue_rcv_skb(sk, skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------- Socket interface ---------- */</div><div class='add'>+static struct sock *__iso_get_sock_listen_by_addr(bdaddr_t *src, bdaddr_t *dst)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;iso_sk_list.head) {</div><div class='add'>+		if (sk-&gt;sk_state != BT_LISTEN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (bacmp(&amp;iso_pi(sk)-&gt;dst, dst))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!bacmp(&amp;iso_pi(sk)-&gt;src, src))</div><div class='add'>+			return sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *__iso_get_sock_listen_by_sid(bdaddr_t *ba, bdaddr_t *bc,</div><div class='add'>+						 __u8 sid)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;iso_sk_list.head) {</div><div class='add'>+		if (sk-&gt;sk_state != BT_LISTEN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (bacmp(&amp;iso_pi(sk)-&gt;src, ba))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (bacmp(&amp;iso_pi(sk)-&gt;dst, bc))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (iso_pi(sk)-&gt;bc_sid == sid)</div><div class='add'>+			return sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find socket in given state:</div><div class='add'>+ * source bdaddr (Unicast)</div><div class='add'>+ * destination bdaddr (Broadcast only)</div><div class='add'>+ * match func - pass NULL to ignore</div><div class='add'>+ * match func data - pass -1 to ignore</div><div class='add'>+ * Returns closest match.</div><div class='add'>+ */</div><div class='add'>+static struct sock *iso_get_sock(struct hci_dev *hdev, bdaddr_t *src,</div><div class='add'>+				 bdaddr_t *dst, enum bt_sock_state state,</div><div class='add'>+				 iso_sock_match_t match, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = NULL, *sk1 = NULL;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;iso_sk_list.head) {</div><div class='add'>+		if (sk-&gt;sk_state != state)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Match Broadcast destination */</div><div class='add'>+		if (bacmp(dst, BDADDR_ANY) &amp;&amp; bacmp(&amp;iso_pi(sk)-&gt;dst, dst)) {</div><div class='add'>+			struct smp_irk *irk1, *irk2;</div><div class='add'>+</div><div class='add'>+			/* Check if destination is an RPA that we can resolve */</div><div class='add'>+			irk1 = hci_find_irk_by_rpa(hdev, dst);</div><div class='add'>+			if (!irk1)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Match with identity address */</div><div class='add'>+			if (bacmp(&amp;iso_pi(sk)-&gt;dst, &amp;irk1-&gt;bdaddr)) {</div><div class='add'>+				/* Check if socket destination address is also</div><div class='add'>+				 * an RPA and if the IRK matches.</div><div class='add'>+				 */</div><div class='add'>+				irk2 = hci_find_irk_by_rpa(hdev,</div><div class='add'>+							   &amp;iso_pi(sk)-&gt;dst);</div><div class='add'>+				if (!irk2 || irk1 != irk2)</div><div class='add'>+					continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Use Match function if provided */</div><div class='add'>+		if (match &amp;&amp; !match(sk, data))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Exact match. */</div><div class='add'>+		if (!bacmp(&amp;iso_pi(sk)-&gt;src, src)) {</div><div class='add'>+			sock_hold(sk);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Closest match */</div><div class='add'>+		if (!bacmp(&amp;iso_pi(sk)-&gt;src, BDADDR_ANY)) {</div><div class='add'>+			if (sk1)</div><div class='add'>+				sock_put(sk1);</div><div class='add'>+</div><div class='add'>+			sk1 = sk;</div><div class='add'>+			sock_hold(sk1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; sk1)</div><div class='add'>+		sock_put(sk1);</div><div class='add'>+</div><div class='add'>+	read_unlock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	return sk ? sk : sk1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *iso_get_sock_big(struct sock *match_sk, bdaddr_t *src,</div><div class='add'>+				     bdaddr_t *dst, uint8_t big)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;iso_sk_list.head) {</div><div class='add'>+		if (match_sk == sk)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Look for sockets that have already been</div><div class='add'>+		 * connected to the BIG</div><div class='add'>+		 */</div><div class='add'>+		if (sk-&gt;sk_state != BT_CONNECTED &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state != BT_CONNECT)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Match Broadcast destination */</div><div class='add'>+		if (bacmp(&amp;iso_pi(sk)-&gt;dst, dst))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Match BIG handle */</div><div class='add'>+		if (iso_pi(sk)-&gt;qos.bcast.big != big)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Match source address */</div><div class='add'>+		if (bacmp(&amp;iso_pi(sk)-&gt;src, src))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_unlock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	iso_conn_put(iso_pi(sk)-&gt;conn);</div><div class='add'>+</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_cleanup_listen(struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	BT_DBG("parent %p", parent);</div><div class='add'>+</div><div class='add'>+	/* Close not yet accepted channels */</div><div class='add'>+	while ((sk = bt_accept_dequeue(parent, NULL))) {</div><div class='add'>+		iso_sock_close(sk);</div><div class='add'>+		iso_sock_kill(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If listening socket has a hcon, properly disconnect it */</div><div class='add'>+	if (iso_pi(parent)-&gt;conn &amp;&amp; iso_pi(parent)-&gt;conn-&gt;hcon) {</div><div class='add'>+		iso_sock_disconn(parent);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parent-&gt;sk_state  = BT_CLOSED;</div><div class='add'>+	sock_set_flag(parent, SOCK_ZAPPED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Kill socket (only if zapped and orphan)</div><div class='add'>+ * Must be called on unlocked socket.</div><div class='add'>+ */</div><div class='add'>+static void iso_sock_kill(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (!sock_flag(sk, SOCK_ZAPPED) || sk-&gt;sk_socket ||</div><div class='add'>+	    sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p state %d", sk, sk-&gt;sk_state);</div><div class='add'>+</div><div class='add'>+	/* Sock is dead, so set conn-&gt;sk to NULL to avoid possible UAF */</div><div class='add'>+	if (iso_pi(sk)-&gt;conn) {</div><div class='add'>+		iso_conn_lock(iso_pi(sk)-&gt;conn);</div><div class='add'>+		iso_pi(sk)-&gt;conn-&gt;sk = NULL;</div><div class='add'>+		iso_conn_unlock(iso_pi(sk)-&gt;conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Kill poor orphan */</div><div class='add'>+	bt_sock_unlink(&amp;iso_sk_list, sk);</div><div class='add'>+	sock_set_flag(sk, SOCK_DEAD);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_disconn(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sock *bis_sk;</div><div class='add'>+	struct hci_conn *hcon = iso_pi(sk)-&gt;conn-&gt;hcon;</div><div class='add'>+</div><div class='add'>+	if (test_bit(HCI_CONN_BIG_CREATED, &amp;hcon-&gt;flags)) {</div><div class='add'>+		bis_sk = iso_get_sock_big(sk, &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+					  &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+					  iso_pi(sk)-&gt;qos.bcast.big);</div><div class='add'>+</div><div class='add'>+		/* If there are any other connected sockets for the</div><div class='add'>+		 * same BIG, just delete the sk and leave the bis</div><div class='add'>+		 * hcon active, in case later rebinding is needed.</div><div class='add'>+		 */</div><div class='add'>+		if (bis_sk) {</div><div class='add'>+			hcon-&gt;state = BT_OPEN;</div><div class='add'>+			hcon-&gt;iso_data = NULL;</div><div class='add'>+			iso_pi(sk)-&gt;conn-&gt;hcon = NULL;</div><div class='add'>+			iso_sock_clear_timer(sk);</div><div class='add'>+			iso_chan_del(sk, bt_to_errno(hcon-&gt;abort_reason));</div><div class='add'>+			sock_put(bis_sk);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_state = BT_DISCONN;</div><div class='add'>+	iso_conn_lock(iso_pi(sk)-&gt;conn);</div><div class='add'>+	hci_conn_drop(iso_pi(sk)-&gt;conn-&gt;hcon);</div><div class='add'>+	iso_pi(sk)-&gt;conn-&gt;hcon = NULL;</div><div class='add'>+	iso_conn_unlock(iso_pi(sk)-&gt;conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iso_sock_close(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("sk %p state %d socket %p", sk, sk-&gt;sk_state, sk-&gt;sk_socket);</div><div class='add'>+</div><div class='add'>+	switch (sk-&gt;sk_state) {</div><div class='add'>+	case BT_LISTEN:</div><div class='add'>+		iso_sock_cleanup_listen(sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CONNECT:</div><div class='add'>+	case BT_CONNECTED:</div><div class='add'>+	case BT_CONFIG:</div><div class='add'>+		if (iso_pi(sk)-&gt;conn-&gt;hcon)</div><div class='add'>+			iso_sock_disconn(sk);</div><div class='add'>+		else</div><div class='add'>+			iso_chan_del(sk, ECONNRESET);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CONNECT2:</div><div class='add'>+		if (iso_pi(sk)-&gt;conn-&gt;hcon &amp;&amp;</div><div class='add'>+		    (test_bit(HCI_CONN_PA_SYNC, &amp;iso_pi(sk)-&gt;conn-&gt;hcon-&gt;flags) ||</div><div class='add'>+		    test_bit(HCI_CONN_PA_SYNC_FAILED, &amp;iso_pi(sk)-&gt;conn-&gt;hcon-&gt;flags)))</div><div class='add'>+			iso_sock_disconn(sk);</div><div class='add'>+		else</div><div class='add'>+			iso_chan_del(sk, ECONNRESET);</div><div class='add'>+		break;</div><div class='add'>+	case BT_DISCONN:</div><div class='add'>+		iso_chan_del(sk, ECONNRESET);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		sock_set_flag(sk, SOCK_ZAPPED);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called on unlocked socket. */</div><div class='add'>+static void iso_sock_close(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	iso_sock_clear_timer(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__iso_sock_close(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	iso_sock_kill(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_init(struct sock *sk, struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	if (parent) {</div><div class='add'>+		sk-&gt;sk_type = parent-&gt;sk_type;</div><div class='add'>+		bt_sk(sk)-&gt;flags = bt_sk(parent)-&gt;flags;</div><div class='add'>+		security_sk_clone(parent, sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct proto iso_proto = {</div><div class='add'>+	.name		= "ISO",</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.obj_size	= sizeof(struct iso_pinfo)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEFAULT_IO_QOS \</div><div class='add'>+{ \</div><div class='add'>+	.interval	= 10000u, \</div><div class='add'>+	.latency	= 10u, \</div><div class='add'>+	.sdu		= 40u, \</div><div class='add'>+	.phy		= BT_ISO_PHY_2M, \</div><div class='add'>+	.rtn		= 2u, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bt_iso_qos default_qos = {</div><div class='add'>+	.bcast = {</div><div class='add'>+		.big			= BT_ISO_QOS_BIG_UNSET,</div><div class='add'>+		.bis			= BT_ISO_QOS_BIS_UNSET,</div><div class='add'>+		.sync_factor		= 0x01,</div><div class='add'>+		.packing		= 0x00,</div><div class='add'>+		.framing		= 0x00,</div><div class='add'>+		.in			= DEFAULT_IO_QOS,</div><div class='add'>+		.out			= DEFAULT_IO_QOS,</div><div class='add'>+		.encryption		= 0x00,</div><div class='add'>+		.bcode			= {0x00},</div><div class='add'>+		.options		= 0x00,</div><div class='add'>+		.skip			= 0x0000,</div><div class='add'>+		.sync_timeout		= BT_ISO_SYNC_TIMEOUT,</div><div class='add'>+		.sync_cte_type		= 0x00,</div><div class='add'>+		.mse			= 0x00,</div><div class='add'>+		.timeout		= BT_ISO_SYNC_TIMEOUT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sock *iso_sock_alloc(struct net *net, struct socket *sock,</div><div class='add'>+				   int proto, gfp_t prio, int kern)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;iso_proto, proto, prio, kern);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_destruct = iso_sock_destruct;</div><div class='add'>+	sk-&gt;sk_sndtimeo = ISO_CONN_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	/* Set address type as public as default src address is BDADDR_ANY */</div><div class='add'>+	iso_pi(sk)-&gt;src_type = BDADDR_LE_PUBLIC;</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;qos = default_qos;</div><div class='add'>+	iso_pi(sk)-&gt;sync_handle = -1;</div><div class='add'>+</div><div class='add'>+	bt_sock_link(&amp;iso_sk_list, sk);</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='add'>+			   int kern)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p", sock);</div><div class='add'>+</div><div class='add'>+	sock-&gt;state = SS_UNCONNECTED;</div><div class='add'>+</div><div class='add'>+	if (sock-&gt;type != SOCK_SEQPACKET)</div><div class='add'>+		return -ESOCKTNOSUPPORT;</div><div class='add'>+</div><div class='add'>+	sock-&gt;ops = &amp;iso_sock_ops;</div><div class='add'>+</div><div class='add'>+	sk = iso_sock_alloc(net, sock, protocol, GFP_ATOMIC, kern);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iso_sock_init(sk, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_bind_bc(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='add'>+			    int addr_len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p bc_sid %u bc_num_bis %u", sk, sa-&gt;iso_bc-&gt;bc_sid,</div><div class='add'>+	       sa-&gt;iso_bc-&gt;bc_num_bis);</div><div class='add'>+</div><div class='add'>+	if (addr_len != sizeof(*sa) + sizeof(*sa-&gt;iso_bc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;iso_pi(sk)-&gt;dst, &amp;sa-&gt;iso_bc-&gt;bc_bdaddr);</div><div class='add'>+</div><div class='add'>+	/* Check if the address type is of LE type */</div><div class='add'>+	if (!bdaddr_type_is_le(sa-&gt;iso_bc-&gt;bc_bdaddr_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;dst_type = sa-&gt;iso_bc-&gt;bc_bdaddr_type;</div><div class='add'>+</div><div class='add'>+	if (sa-&gt;iso_bc-&gt;bc_sid &gt; 0x0f &amp;&amp; sa-&gt;iso_bc-&gt;bc_sid != HCI_SID_INVALID)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;bc_sid = sa-&gt;iso_bc-&gt;bc_sid;</div><div class='add'>+</div><div class='add'>+	if (sa-&gt;iso_bc-&gt;bc_num_bis &gt; ISO_MAX_NUM_BIS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;bc_num_bis = sa-&gt;iso_bc-&gt;bc_num_bis;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iso_pi(sk)-&gt;bc_num_bis; i++)</div><div class='add'>+		if (sa-&gt;iso_bc-&gt;bc_bis[i] &lt; 0x01 ||</div><div class='add'>+		    sa-&gt;iso_bc-&gt;bc_bis[i] &gt; 0x1f)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(iso_pi(sk)-&gt;bc_bis, sa-&gt;iso_bc-&gt;bc_bis,</div><div class='add'>+	       iso_pi(sk)-&gt;bc_num_bis);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called on the locked socket. */</div><div class='add'>+static int iso_sock_rebind_bis(struct sock *sk, struct sockaddr_iso *sa,</div><div class='add'>+			       int addr_len)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags))</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	if (sa-&gt;iso_bc-&gt;bc_num_bis &gt; ISO_MAX_NUM_BIS) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iso_pi(sk)-&gt;bc_num_bis = sa-&gt;iso_bc-&gt;bc_num_bis;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; iso_pi(sk)-&gt;bc_num_bis; i++)</div><div class='add'>+		if (sa-&gt;iso_bc-&gt;bc_bis[i] &lt; 0x01 ||</div><div class='add'>+		    sa-&gt;iso_bc-&gt;bc_bis[i] &gt; 0x1f) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	memcpy(iso_pi(sk)-&gt;bc_bis, sa-&gt;iso_bc-&gt;bc_bis,</div><div class='add'>+	       iso_pi(sk)-&gt;bc_num_bis);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hci_dev *iso_conn_get_hdev(struct iso_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = NULL;</div><div class='add'>+</div><div class='add'>+	iso_conn_lock(conn);</div><div class='add'>+	if (conn-&gt;hcon)</div><div class='add'>+		hdev = hci_dev_hold(conn-&gt;hcon-&gt;hdev);</div><div class='add'>+	iso_conn_unlock(conn);</div><div class='add'>+</div><div class='add'>+	return hdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called on the locked socket. */</div><div class='add'>+static int iso_sock_rebind_bc(struct sock *sk, struct sockaddr_iso *sa,</div><div class='add'>+			      int addr_len)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	struct hci_conn *bis;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type != SOCK_SEQPACKET || !iso_pi(sk)-&gt;conn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check if it is really a Broadcast address being requested */</div><div class='add'>+	if (addr_len != sizeof(*sa) + sizeof(*sa-&gt;iso_bc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check if the address hasn't changed then perhaps only the number of</div><div class='add'>+	 * bis has changed.</div><div class='add'>+	 */</div><div class='add'>+	if (!bacmp(&amp;iso_pi(sk)-&gt;dst, &amp;sa-&gt;iso_bc-&gt;bc_bdaddr) ||</div><div class='add'>+	    !bacmp(&amp;sa-&gt;iso_bc-&gt;bc_bdaddr, BDADDR_ANY))</div><div class='add'>+		return iso_sock_rebind_bis(sk, sa, addr_len);</div><div class='add'>+</div><div class='add'>+	/* Check if the address type is of LE type */</div><div class='add'>+	if (!bdaddr_type_is_le(sa-&gt;iso_bc-&gt;bc_bdaddr_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hdev = iso_conn_get_hdev(iso_pi(sk)-&gt;conn);</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bis = iso_pi(sk)-&gt;conn-&gt;hcon;</div><div class='add'>+</div><div class='add'>+	/* Release the socket before lookups since that requires hci_dev_lock</div><div class='add'>+	 * which shall not be acquired while holding sock_lock for proper</div><div class='add'>+	 * ordering.</div><div class='add'>+	 */</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	hci_dev_lock(bis-&gt;hdev);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (!iso_pi(sk)-&gt;conn || iso_pi(sk)-&gt;conn-&gt;hcon != bis) {</div><div class='add'>+		/* raced with iso_conn_del() or iso_disconn_sock() */</div><div class='add'>+		err = -ENOTCONN;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p %pMR type %u", sk, &amp;sa-&gt;iso_bc-&gt;bc_bdaddr,</div><div class='add'>+	       sa-&gt;iso_bc-&gt;bc_bdaddr_type);</div><div class='add'>+</div><div class='add'>+	err = hci_past_bis(bis, &amp;sa-&gt;iso_bc-&gt;bc_bdaddr,</div><div class='add'>+			   le_addr_type(sa-&gt;iso_bc-&gt;bc_bdaddr_type));</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='add'>+			 int addr_len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p %pMR type %u", sk, &amp;sa-&gt;iso_bdaddr, sa-&gt;iso_bdaddr_type);</div><div class='add'>+</div><div class='add'>+	if (!addr || addr_len &lt; sizeof(struct sockaddr_iso) ||</div><div class='add'>+	    addr-&gt;sa_family != AF_BLUETOOTH)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if ((sk-&gt;sk_state == BT_CONNECT2 || sk-&gt;sk_state == BT_CONNECTED) &amp;&amp;</div><div class='add'>+	    addr_len &gt; sizeof(*sa)) {</div><div class='add'>+		/* Allow the user to rebind to a different address using</div><div class='add'>+		 * PAST procedures.</div><div class='add'>+		 */</div><div class='add'>+		err = iso_sock_rebind_bc(sk, sa, addr_len);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != BT_OPEN) {</div><div class='add'>+		err = -EBADFD;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type != SOCK_SEQPACKET) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if the address type is of LE type */</div><div class='add'>+	if (!bdaddr_type_is_le(sa-&gt;iso_bdaddr_type)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;iso_pi(sk)-&gt;src, &amp;sa-&gt;iso_bdaddr);</div><div class='add'>+	iso_pi(sk)-&gt;src_type = sa-&gt;iso_bdaddr_type;</div><div class='add'>+</div><div class='add'>+	/* Check for Broadcast address */</div><div class='add'>+	if (addr_len &gt; sizeof(*sa)) {</div><div class='add'>+		err = iso_sock_bind_bc(sock, addr, addr_len);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_state = BT_BOUND;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='add'>+			    int alen, int flags)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	if (alen &lt; sizeof(struct sockaddr_iso) ||</div><div class='add'>+	    addr-&gt;sa_family != AF_BLUETOOTH)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != BT_OPEN &amp;&amp; sk-&gt;sk_state != BT_BOUND)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type != SOCK_SEQPACKET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check if the address type is of LE type */</div><div class='add'>+	if (!bdaddr_type_is_le(sa-&gt;iso_bdaddr_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;iso_pi(sk)-&gt;dst, &amp;sa-&gt;iso_bdaddr);</div><div class='add'>+	iso_pi(sk)-&gt;dst_type = sa-&gt;iso_bdaddr_type;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (bacmp(&amp;iso_pi(sk)-&gt;dst, BDADDR_ANY))</div><div class='add'>+		err = iso_connect_cis(sk);</div><div class='add'>+	else</div><div class='add'>+		err = iso_connect_bis(sk);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		err = bt_sock_wait_state(sk, BT_CONNECTED,</div><div class='add'>+					 sock_sndtimeo(sk, flags &amp; O_NONBLOCK));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_listen_bis(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct iso_conn *conn;</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%pMR -&gt; %pMR (SID 0x%2.2x)", &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+	       &amp;iso_pi(sk)-&gt;dst, iso_pi(sk)-&gt;bc_sid);</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	if (__iso_get_sock_listen_by_sid(&amp;iso_pi(sk)-&gt;src, &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+					 iso_pi(sk)-&gt;bc_sid))</div><div class='add'>+		err = -EADDRINUSE;</div><div class='add'>+</div><div class='add'>+	write_unlock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdev = hci_get_route(&amp;iso_pi(sk)-&gt;dst, &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+			     iso_pi(sk)-&gt;src_type);</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return -EHOSTUNREACH;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* Fail if user set invalid QoS */</div><div class='add'>+	if (iso_pi(sk)-&gt;qos_user_set &amp;&amp; !check_bcast_qos(&amp;iso_pi(sk)-&gt;qos)) {</div><div class='add'>+		iso_pi(sk)-&gt;qos = default_qos;</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hcon = hci_pa_create_sync(hdev, &amp;iso_pi(sk)-&gt;dst,</div><div class='add'>+				  le_addr_type(iso_pi(sk)-&gt;dst_type),</div><div class='add'>+				  iso_pi(sk)-&gt;bc_sid, &amp;iso_pi(sk)-&gt;qos);</div><div class='add'>+	if (IS_ERR(hcon)) {</div><div class='add'>+		err = PTR_ERR(hcon);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_add(hcon);</div><div class='add'>+	if (!conn) {</div><div class='add'>+		hci_conn_drop(hcon);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = iso_chan_add(conn, sk, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		hci_conn_drop(hcon);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	hci_dev_put(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_listen_cis(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%pMR", &amp;iso_pi(sk)-&gt;src);</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	if (__iso_get_sock_listen_by_addr(&amp;iso_pi(sk)-&gt;src, &amp;iso_pi(sk)-&gt;dst))</div><div class='add'>+		err = -EADDRINUSE;</div><div class='add'>+</div><div class='add'>+	write_unlock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_listen(struct socket *sock, int backlog)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p backlog %d", sk, backlog);</div><div class='add'>+</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != BT_BOUND) {</div><div class='add'>+		err = -EBADFD;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type != SOCK_SEQPACKET) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bacmp(&amp;iso_pi(sk)-&gt;dst, BDADDR_ANY)) {</div><div class='add'>+		err = iso_listen_cis(sk);</div><div class='add'>+	} else {</div><div class='add'>+		/* Drop sock lock to avoid potential</div><div class='add'>+		 * deadlock with the hdev lock.</div><div class='add'>+		 */</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		err = iso_listen_bis(sk);</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_max_ack_backlog = backlog;</div><div class='add'>+	sk-&gt;sk_ack_backlog = 0;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_state = BT_LISTEN;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+			   struct proto_accept_arg *arg)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='add'>+	struct sock *sk = sock-&gt;sk, *ch;</div><div class='add'>+	long timeo;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Use explicit nested locking to avoid lockdep warnings generated</div><div class='add'>+	 * because the parent socket and the child socket are locked on the</div><div class='add'>+	 * same thread.</div><div class='add'>+	 */</div><div class='add'>+	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);</div><div class='add'>+</div><div class='add'>+	timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p timeo %ld", sk, timeo);</div><div class='add'>+</div><div class='add'>+	/* Wait for an incoming connection. (wake-one). */</div><div class='add'>+	add_wait_queue_exclusive(sk_sleep(sk), &amp;wait);</div><div class='add'>+	while (1) {</div><div class='add'>+		if (sk-&gt;sk_state != BT_LISTEN) {</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ch = bt_accept_dequeue(sk, newsock);</div><div class='add'>+		if (ch)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!timeo) {</div><div class='add'>+			err = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			err = sock_intr_errno(timeo);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+		timeo = wait_woken(&amp;wait, TASK_INTERRUPTIBLE, timeo);</div><div class='add'>+		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);</div><div class='add'>+	}</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	newsock-&gt;state = SS_CONNECTED;</div><div class='add'>+</div><div class='add'>+	BT_DBG("new socket %p", ch);</div><div class='add'>+</div><div class='add'>+	/* A Broadcast Sink might require BIG sync to be terminated</div><div class='add'>+	 * and re-established multiple times, while keeping the same</div><div class='add'>+	 * PA sync handle active. To allow this, once all BIS</div><div class='add'>+	 * connections have been accepted on a PA sync parent socket,</div><div class='add'>+	 * "reset" socket state, to allow future BIG re-sync procedures.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags)) {</div><div class='add'>+		/* Iterate through the list of bound BIS indices</div><div class='add'>+		 * and clear each BIS as they are accepted by the</div><div class='add'>+		 * user space, one by one.</div><div class='add'>+		 */</div><div class='add'>+		for (int i = 0; i &lt; iso_pi(sk)-&gt;bc_num_bis; i++) {</div><div class='add'>+			if (iso_pi(sk)-&gt;bc_bis[i] &gt; 0) {</div><div class='add'>+				iso_pi(sk)-&gt;bc_bis[i] = 0;</div><div class='add'>+				iso_pi(sk)-&gt;bc_num_bis--;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iso_pi(sk)-&gt;bc_num_bis == 0) {</div><div class='add'>+			/* Once the last BIS was accepted, reset parent</div><div class='add'>+			 * socket parameters to mark that the listening</div><div class='add'>+			 * process for BIS connections has been completed:</div><div class='add'>+			 *</div><div class='add'>+			 * 1. Reset the DEFER setup flag on the parent sk.</div><div class='add'>+			 * 2. Clear the flag marking that the BIG create</div><div class='add'>+			 *    sync command is pending.</div><div class='add'>+			 * 3. Transition socket state from BT_LISTEN to</div><div class='add'>+			 *    BT_CONNECTED.</div><div class='add'>+			 */</div><div class='add'>+			set_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+			clear_bit(BT_SK_BIG_SYNC, &amp;iso_pi(sk)-&gt;flags);</div><div class='add'>+			sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_getname(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+			    int peer)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int len = sizeof(struct sockaddr_iso);</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='add'>+</div><div class='add'>+	addr-&gt;sa_family = AF_BLUETOOTH;</div><div class='add'>+</div><div class='add'>+	if (peer) {</div><div class='add'>+		struct hci_conn *hcon = iso_pi(sk)-&gt;conn ?</div><div class='add'>+					iso_pi(sk)-&gt;conn-&gt;hcon : NULL;</div><div class='add'>+</div><div class='add'>+		bacpy(&amp;sa-&gt;iso_bdaddr, &amp;iso_pi(sk)-&gt;dst);</div><div class='add'>+		sa-&gt;iso_bdaddr_type = iso_pi(sk)-&gt;dst_type;</div><div class='add'>+</div><div class='add'>+		if (hcon &amp;&amp; (hcon-&gt;type == BIS_LINK || hcon-&gt;type == PA_LINK)) {</div><div class='add'>+			sa-&gt;iso_bc-&gt;bc_sid = iso_pi(sk)-&gt;bc_sid;</div><div class='add'>+			sa-&gt;iso_bc-&gt;bc_num_bis = iso_pi(sk)-&gt;bc_num_bis;</div><div class='add'>+			memcpy(sa-&gt;iso_bc-&gt;bc_bis, iso_pi(sk)-&gt;bc_bis,</div><div class='add'>+			       ISO_MAX_NUM_BIS);</div><div class='add'>+			len += sizeof(struct sockaddr_iso_bc);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		bacpy(&amp;sa-&gt;iso_bdaddr, &amp;iso_pi(sk)-&gt;src);</div><div class='add'>+		sa-&gt;iso_bdaddr_type = iso_pi(sk)-&gt;src_type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='add'>+			    size_t len)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct sk_buff *skb, **frag;</div><div class='add'>+	struct sockcm_cookie sockc;</div><div class='add'>+	size_t mtu;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='add'>+</div><div class='add'>+	err = sock_error(sk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_flags &amp; MSG_OOB)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	hci_sockcm_init(&amp;sockc, sk);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != BT_CONNECTED) {</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtu = iso_pi(sk)-&gt;conn-&gt;hcon-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_sendmsg(sk, msg, len, mtu, HCI_ISO_DATA_HDR_SIZE, 0);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	len -= skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	BT_DBG("skb %p len %d", sk, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Continuation fragments */</div><div class='add'>+	frag = &amp;skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+	while (len) {</div><div class='add'>+		struct sk_buff *tmp;</div><div class='add'>+</div><div class='add'>+		tmp = bt_skb_sendmsg(sk, msg, len, mtu, 0, 0);</div><div class='add'>+		if (IS_ERR(tmp)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return PTR_ERR(tmp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*frag = tmp;</div><div class='add'>+</div><div class='add'>+		len  -= tmp-&gt;len;</div><div class='add'>+</div><div class='add'>+		skb-&gt;len += tmp-&gt;len;</div><div class='add'>+		skb-&gt;data_len += tmp-&gt;len;</div><div class='add'>+</div><div class='add'>+		BT_DBG("frag %p len %d", *frag, tmp-&gt;len);</div><div class='add'>+</div><div class='add'>+		frag = &amp;(*frag)-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == BT_CONNECTED)</div><div class='add'>+		err = iso_send_frame(sk, skb, &amp;sockc);</div><div class='add'>+	else</div><div class='add'>+		err = -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_conn_defer_accept(struct hci_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct hci_cp_le_accept_cis cp;</div><div class='add'>+	struct hci_dev *hdev = conn-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p", conn);</div><div class='add'>+</div><div class='add'>+	conn-&gt;state = BT_CONFIG;</div><div class='add'>+</div><div class='add'>+	cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+</div><div class='add'>+	hci_send_cmd(hdev, HCI_OP_LE_ACCEPT_CIS, sizeof(cp), &amp;cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_conn_big_sync(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+</div><div class='add'>+	hdev = hci_get_route(&amp;iso_pi(sk)-&gt;dst, &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+			     iso_pi(sk)-&gt;src_type);</div><div class='add'>+</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* hci_le_big_create_sync requires hdev lock to be held, since</div><div class='add'>+	 * it enqueues the HCI LE BIG Create Sync command via</div><div class='add'>+	 * hci_cmd_sync_queue_once, which checks hdev flags that might</div><div class='add'>+	 * change.</div><div class='add'>+	 */</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(BT_SK_BIG_SYNC, &amp;iso_pi(sk)-&gt;flags)) {</div><div class='add'>+		err = hci_conn_big_create_sync(hdev, iso_pi(sk)-&gt;conn-&gt;hcon,</div><div class='add'>+					       &amp;iso_pi(sk)-&gt;qos,</div><div class='add'>+					       iso_pi(sk)-&gt;sync_handle,</div><div class='add'>+					       iso_pi(sk)-&gt;bc_num_bis,</div><div class='add'>+					       iso_pi(sk)-&gt;bc_bis);</div><div class='add'>+		if (err)</div><div class='add'>+			bt_dev_err(hdev, "hci_big_create_sync: %d", err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='add'>+			    size_t len, int flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct iso_pinfo *pi = iso_pi(sk);</div><div class='add'>+	bool early_ret = false;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return sock_recv_errqueue(sk, msg, len, SOL_BLUETOOTH,</div><div class='add'>+					  BT_SCM_ERROR);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags)) {</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+</div><div class='add'>+		switch (sk-&gt;sk_state) {</div><div class='add'>+		case BT_CONNECT2:</div><div class='add'>+			if (test_bit(BT_SK_PA_SYNC, &amp;pi-&gt;flags)) {</div><div class='add'>+				release_sock(sk);</div><div class='add'>+				iso_conn_big_sync(sk);</div><div class='add'>+				lock_sock(sk);</div><div class='add'>+</div><div class='add'>+				sk-&gt;sk_state = BT_LISTEN;</div><div class='add'>+			} else {</div><div class='add'>+				iso_conn_defer_accept(pi-&gt;conn-&gt;hcon);</div><div class='add'>+				sk-&gt;sk_state = BT_CONFIG;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			early_ret = true;</div><div class='add'>+			break;</div><div class='add'>+		case BT_CONNECTED:</div><div class='add'>+			if (test_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags)) {</div><div class='add'>+				release_sock(sk);</div><div class='add'>+				iso_conn_big_sync(sk);</div><div class='add'>+				lock_sock(sk);</div><div class='add'>+</div><div class='add'>+				sk-&gt;sk_state = BT_LISTEN;</div><div class='add'>+				early_ret = true;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case BT_CONNECT:</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			err = iso_connect_cis(sk);</div><div class='add'>+			lock_sock(sk);</div><div class='add'>+</div><div class='add'>+			early_ret = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		sock_put(sk);</div><div class='add'>+</div><div class='add'>+		if (early_ret)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bt_sock_recvmsg(sock, msg, len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_io_qos(struct bt_iso_io_qos *qos)</div><div class='add'>+{</div><div class='add'>+	/* If no PHY is enable SDU must be 0 */</div><div class='add'>+	if (!qos-&gt;phy &amp;&amp; qos-&gt;sdu)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;interval &amp;&amp; (qos-&gt;interval &lt; 0xff || qos-&gt;interval &gt; 0xfffff))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;latency &amp;&amp; (qos-&gt;latency &lt; 0x05 || qos-&gt;latency &gt; 0xfa0))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;phy &gt; BT_ISO_PHY_ANY)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_ucast_qos(struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	if (qos-&gt;ucast.cig &gt; 0xef &amp;&amp; qos-&gt;ucast.cig != BT_ISO_QOS_CIG_UNSET)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.cis &gt; 0xef &amp;&amp; qos-&gt;ucast.cis != BT_ISO_QOS_CIS_UNSET)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.sca &gt; 0x07)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.packing &gt; 0x01)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;ucast.framing &gt; 0x01)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_io_qos(&amp;qos-&gt;ucast.in))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_io_qos(&amp;qos-&gt;ucast.out))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_bcast_qos(struct bt_iso_qos *qos)</div><div class='add'>+{</div><div class='add'>+	if (!qos-&gt;bcast.sync_factor)</div><div class='add'>+		qos-&gt;bcast.sync_factor = 0x01;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.packing &gt; 0x01)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.framing &gt; 0x01)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_io_qos(&amp;qos-&gt;bcast.in))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_io_qos(&amp;qos-&gt;bcast.out))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.encryption &gt; 0x01)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.options &gt; 0x07)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.skip &gt; 0x01f3)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!qos-&gt;bcast.sync_timeout)</div><div class='add'>+		qos-&gt;bcast.sync_timeout = BT_ISO_SYNC_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.sync_timeout &lt; 0x000a || qos-&gt;bcast.sync_timeout &gt; 0x4000)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.sync_cte_type &gt; 0x1f)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.mse &gt; 0x1f)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!qos-&gt;bcast.timeout)</div><div class='add'>+		qos-&gt;bcast.sync_timeout = BT_ISO_SYNC_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;bcast.timeout &lt; 0x000a || qos-&gt;bcast.timeout &gt; 0x4000)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct bt_iso_qos qos = default_qos;</div><div class='add'>+	u32 opt;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case BT_DEFER_SETUP:</div><div class='add'>+		if (sk-&gt;sk_state != BT_BOUND &amp;&amp; sk-&gt;sk_state != BT_LISTEN) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (opt)</div><div class='add'>+			set_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_PKT_STATUS:</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (opt)</div><div class='add'>+			set_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_PKT_SEQNUM:</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (opt)</div><div class='add'>+			set_bit(BT_SK_PKT_SEQNUM, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(BT_SK_PKT_SEQNUM, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_ISO_QOS:</div><div class='add'>+		if (sk-&gt;sk_state != BT_OPEN &amp;&amp; sk-&gt;sk_state != BT_BOUND &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state != BT_CONNECT2 &amp;&amp;</div><div class='add'>+		    (!test_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags) ||</div><div class='add'>+		    sk-&gt;sk_state != BT_CONNECTED)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;qos, sizeof(qos), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		iso_pi(sk)-&gt;qos = qos;</div><div class='add'>+		iso_pi(sk)-&gt;qos_user_set = true;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_ISO_BASE:</div><div class='add'>+		if (sk-&gt;sk_state != BT_OPEN &amp;&amp; sk-&gt;sk_state != BT_BOUND &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state != BT_CONNECT2) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (optlen &gt; sizeof(iso_pi(sk)-&gt;base)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = copy_safe_from_sockptr(iso_pi(sk)-&gt;base, optlen, optval,</div><div class='add'>+					     optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		iso_pi(sk)-&gt;base_len = optlen;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -ENOPROTOOPT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int len, err = 0;</div><div class='add'>+	struct bt_iso_qos *qos;</div><div class='add'>+	u8 base_len;</div><div class='add'>+	u8 *base;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	if (get_user(len, optlen))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case BT_DEFER_SETUP:</div><div class='add'>+		if (sk-&gt;sk_state == BT_CONNECTED) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (put_user(test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags),</div><div class='add'>+			     (u32 __user *)optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_PKT_STATUS:</div><div class='add'>+		if (put_user(test_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags),</div><div class='add'>+			     (int __user *)optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_ISO_QOS:</div><div class='add'>+		qos = iso_sock_get_qos(sk);</div><div class='add'>+</div><div class='add'>+		len = min_t(unsigned int, len, sizeof(*qos));</div><div class='add'>+		if (copy_to_user(optval, qos, len))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_ISO_BASE:</div><div class='add'>+		if (sk-&gt;sk_state == BT_CONNECTED &amp;&amp;</div><div class='add'>+		    !bacmp(&amp;iso_pi(sk)-&gt;dst, BDADDR_ANY)) {</div><div class='add'>+			base_len = iso_pi(sk)-&gt;conn-&gt;hcon-&gt;le_per_adv_data_len;</div><div class='add'>+			base = iso_pi(sk)-&gt;conn-&gt;hcon-&gt;le_per_adv_data;</div><div class='add'>+		} else {</div><div class='add'>+			base_len = iso_pi(sk)-&gt;base_len;</div><div class='add'>+			base = iso_pi(sk)-&gt;base;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = min_t(unsigned int, len, base_len);</div><div class='add'>+		if (copy_to_user(optval, base, len))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		if (put_user(len, optlen))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -ENOPROTOOPT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_shutdown(struct socket *sock, int how)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p, sk %p, how %d", sock, sk, how);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (how) {</div><div class='add'>+	case SHUT_RD:</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+			goto unlock;</div><div class='add'>+		sk-&gt;sk_shutdown |= RCV_SHUTDOWN;</div><div class='add'>+		break;</div><div class='add'>+	case SHUT_WR:</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)</div><div class='add'>+			goto unlock;</div><div class='add'>+		sk-&gt;sk_shutdown |= SEND_SHUTDOWN;</div><div class='add'>+		break;</div><div class='add'>+	case SHUT_RDWR:</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; SHUTDOWN_MASK)</div><div class='add'>+			goto unlock;</div><div class='add'>+		sk-&gt;sk_shutdown |= SHUTDOWN_MASK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iso_sock_clear_timer(sk);</div><div class='add'>+	__iso_sock_close(sk);</div><div class='add'>+</div><div class='add'>+	if (sock_flag(sk, SOCK_LINGER) &amp;&amp; sk-&gt;sk_lingertime &amp;&amp;</div><div class='add'>+	    !(current-&gt;flags &amp; PF_EXITING))</div><div class='add'>+		err = bt_sock_wait_state(sk, BT_CLOSED, sk-&gt;sk_lingertime);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iso_sock_release(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iso_sock_close(sk);</div><div class='add'>+</div><div class='add'>+	if (sock_flag(sk, SOCK_LINGER) &amp;&amp; READ_ONCE(sk-&gt;sk_lingertime) &amp;&amp;</div><div class='add'>+	    !(current-&gt;flags &amp; PF_EXITING)) {</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+		err = bt_sock_wait_state(sk, BT_CLOSED, sk-&gt;sk_lingertime);</div><div class='add'>+		release_sock(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_orphan(sk);</div><div class='add'>+	iso_sock_kill(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_sock_ready(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("sk %p", sk);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	iso_sock_clear_timer(sk);</div><div class='add'>+	sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+	sk-&gt;sk_state_change(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_big(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_big_sync_established *ev = data;</div><div class='add'>+</div><div class='add'>+	return ev-&gt;handle == iso_pi(sk)-&gt;qos.bcast.big;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_big_hcon(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *hcon = data;</div><div class='add'>+</div><div class='add'>+	return hcon-&gt;iso_qos.bcast.big == iso_pi(sk)-&gt;qos.bcast.big;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_pa_sync_flag(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	return test_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_dst(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	return !bacmp(&amp;iso_pi(sk)-&gt;dst, (bdaddr_t *)data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_conn_ready(struct iso_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct sock *parent = NULL;</div><div class='add'>+	struct sock *sk = conn-&gt;sk;</div><div class='add'>+	struct hci_ev_le_big_sync_established *ev = NULL;</div><div class='add'>+	struct hci_ev_le_pa_sync_established *ev2 = NULL;</div><div class='add'>+	struct hci_ev_le_per_adv_report *ev3 = NULL;</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		/* Attempt to update source address in case of BIS Sender if</div><div class='add'>+		 * the advertisement is using a random address.</div><div class='add'>+		 */</div><div class='add'>+		if (conn-&gt;hcon-&gt;type == BIS_LINK &amp;&amp;</div><div class='add'>+		    conn-&gt;hcon-&gt;role == HCI_ROLE_MASTER &amp;&amp;</div><div class='add'>+		    !bacmp(&amp;conn-&gt;hcon-&gt;dst, BDADDR_ANY)) {</div><div class='add'>+			struct hci_conn *bis = conn-&gt;hcon;</div><div class='add'>+			struct adv_info *adv;</div><div class='add'>+</div><div class='add'>+			adv = hci_find_adv_instance(bis-&gt;hdev,</div><div class='add'>+						    bis-&gt;iso_qos.bcast.bis);</div><div class='add'>+			if (adv &amp;&amp; bacmp(&amp;adv-&gt;random_addr, BDADDR_ANY)) {</div><div class='add'>+				lock_sock(sk);</div><div class='add'>+				iso_pi(sk)-&gt;src_type = BDADDR_LE_RANDOM;</div><div class='add'>+				bacpy(&amp;iso_pi(sk)-&gt;src, &amp;adv-&gt;random_addr);</div><div class='add'>+				release_sock(sk);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iso_sock_ready(conn-&gt;sk);</div><div class='add'>+	} else {</div><div class='add'>+		hcon = conn-&gt;hcon;</div><div class='add'>+		if (!hcon)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		hdev = hcon-&gt;hdev;</div><div class='add'>+</div><div class='add'>+		if (test_bit(HCI_CONN_BIG_SYNC, &amp;hcon-&gt;flags)) {</div><div class='add'>+			/* A BIS slave hcon is notified to the ISO layer</div><div class='add'>+			 * after the Command Complete for the LE Setup</div><div class='add'>+			 * ISO Data Path command is received. Get the</div><div class='add'>+			 * parent socket that matches the hcon BIG handle.</div><div class='add'>+			 */</div><div class='add'>+			parent = iso_get_sock(hdev, &amp;hcon-&gt;src, &amp;hcon-&gt;dst,</div><div class='add'>+					      BT_LISTEN, iso_match_big_hcon,</div><div class='add'>+					      hcon);</div><div class='add'>+		} else if (test_bit(HCI_CONN_BIG_SYNC_FAILED, &amp;hcon-&gt;flags)) {</div><div class='add'>+			ev = hci_recv_event_data(hcon-&gt;hdev,</div><div class='add'>+						 HCI_EVT_LE_BIG_SYNC_ESTABLISHED);</div><div class='add'>+</div><div class='add'>+			/* Get reference to PA sync parent socket, if it exists */</div><div class='add'>+			parent = iso_get_sock(hdev, &amp;hcon-&gt;src, &amp;hcon-&gt;dst,</div><div class='add'>+					      BT_LISTEN,</div><div class='add'>+					      iso_match_pa_sync_flag,</div><div class='add'>+					      NULL);</div><div class='add'>+			if (!parent &amp;&amp; ev)</div><div class='add'>+				parent = iso_get_sock(hdev, &amp;hcon-&gt;src,</div><div class='add'>+						      &amp;hcon-&gt;dst,</div><div class='add'>+						      BT_LISTEN,</div><div class='add'>+						      iso_match_big, ev);</div><div class='add'>+		} else if (test_bit(HCI_CONN_PA_SYNC_FAILED, &amp;hcon-&gt;flags)) {</div><div class='add'>+			ev2 = hci_recv_event_data(hcon-&gt;hdev,</div><div class='add'>+						  HCI_EV_LE_PA_SYNC_ESTABLISHED);</div><div class='add'>+			if (ev2)</div><div class='add'>+				parent = iso_get_sock(hdev, &amp;hcon-&gt;src,</div><div class='add'>+						      &amp;hcon-&gt;dst,</div><div class='add'>+						      BT_LISTEN,</div><div class='add'>+						      iso_match_sid, ev2);</div><div class='add'>+		} else if (test_bit(HCI_CONN_PA_SYNC, &amp;hcon-&gt;flags)) {</div><div class='add'>+			ev3 = hci_recv_event_data(hcon-&gt;hdev,</div><div class='add'>+						  HCI_EV_LE_PER_ADV_REPORT);</div><div class='add'>+			if (ev3)</div><div class='add'>+				parent = iso_get_sock(hdev, &amp;hcon-&gt;src,</div><div class='add'>+						      &amp;hcon-&gt;dst,</div><div class='add'>+						      BT_LISTEN,</div><div class='add'>+						      iso_match_sync_handle_pa_report,</div><div class='add'>+						      ev3);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!parent)</div><div class='add'>+			parent = iso_get_sock(hdev, &amp;hcon-&gt;src, BDADDR_ANY,</div><div class='add'>+					      BT_LISTEN, iso_match_dst, BDADDR_ANY);</div><div class='add'>+</div><div class='add'>+		if (!parent)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		lock_sock(parent);</div><div class='add'>+</div><div class='add'>+		sk = iso_sock_alloc(sock_net(parent), NULL,</div><div class='add'>+				    BTPROTO_ISO, GFP_ATOMIC, 0);</div><div class='add'>+		if (!sk) {</div><div class='add'>+			release_sock(parent);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iso_sock_init(sk, parent);</div><div class='add'>+</div><div class='add'>+		bacpy(&amp;iso_pi(sk)-&gt;src, &amp;hcon-&gt;src);</div><div class='add'>+</div><div class='add'>+		/* Convert from HCI to three-value type */</div><div class='add'>+		if (hcon-&gt;src_type == ADDR_LE_DEV_PUBLIC)</div><div class='add'>+			iso_pi(sk)-&gt;src_type = BDADDR_LE_PUBLIC;</div><div class='add'>+		else</div><div class='add'>+			iso_pi(sk)-&gt;src_type = BDADDR_LE_RANDOM;</div><div class='add'>+</div><div class='add'>+		/* If hcon has no destination address (BDADDR_ANY) it means it</div><div class='add'>+		 * was created by HCI_EV_LE_BIG_SYNC_ESTABILISHED or</div><div class='add'>+		 * HCI_EV_LE_PA_SYNC_ESTABLISHED so we need to initialize using</div><div class='add'>+		 * the parent socket destination address.</div><div class='add'>+		 */</div><div class='add'>+		if (!bacmp(&amp;hcon-&gt;dst, BDADDR_ANY)) {</div><div class='add'>+			bacpy(&amp;hcon-&gt;dst, &amp;iso_pi(parent)-&gt;dst);</div><div class='add'>+			hcon-&gt;dst_type = le_addr_type(iso_pi(parent)-&gt;dst_type);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(HCI_CONN_PA_SYNC, &amp;hcon-&gt;flags)) {</div><div class='add'>+			iso_pi(sk)-&gt;qos = iso_pi(parent)-&gt;qos;</div><div class='add'>+			hcon-&gt;iso_qos = iso_pi(sk)-&gt;qos;</div><div class='add'>+			iso_pi(sk)-&gt;bc_sid = iso_pi(parent)-&gt;bc_sid;</div><div class='add'>+			iso_pi(sk)-&gt;bc_num_bis = iso_pi(parent)-&gt;bc_num_bis;</div><div class='add'>+			memcpy(iso_pi(sk)-&gt;bc_bis, iso_pi(parent)-&gt;bc_bis,</div><div class='add'>+			       ISO_MAX_NUM_BIS);</div><div class='add'>+			set_bit(BT_SK_PA_SYNC, &amp;iso_pi(sk)-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bacpy(&amp;iso_pi(sk)-&gt;dst, &amp;hcon-&gt;dst);</div><div class='add'>+</div><div class='add'>+		/* Convert from HCI to three-value type */</div><div class='add'>+		if (hcon-&gt;dst_type == ADDR_LE_DEV_PUBLIC)</div><div class='add'>+			iso_pi(sk)-&gt;dst_type = BDADDR_LE_PUBLIC;</div><div class='add'>+		else</div><div class='add'>+			iso_pi(sk)-&gt;dst_type = BDADDR_LE_RANDOM;</div><div class='add'>+</div><div class='add'>+		iso_pi(sk)-&gt;sync_handle = iso_pi(parent)-&gt;sync_handle;</div><div class='add'>+		memcpy(iso_pi(sk)-&gt;base, iso_pi(parent)-&gt;base, iso_pi(parent)-&gt;base_len);</div><div class='add'>+		iso_pi(sk)-&gt;base_len = iso_pi(parent)-&gt;base_len;</div><div class='add'>+</div><div class='add'>+		hci_conn_hold(hcon);</div><div class='add'>+		iso_chan_add(conn, sk, parent);</div><div class='add'>+</div><div class='add'>+		if ((ev &amp;&amp; ((struct hci_evt_le_big_sync_established *)ev)-&gt;status) ||</div><div class='add'>+		    (ev2 &amp;&amp; ev2-&gt;status)) {</div><div class='add'>+			/* Trigger error signal on child socket */</div><div class='add'>+			sk-&gt;sk_err = ECONNREFUSED;</div><div class='add'>+			sk-&gt;sk_error_report(sk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(parent)-&gt;flags))</div><div class='add'>+			sk-&gt;sk_state = BT_CONNECT2;</div><div class='add'>+		else</div><div class='add'>+			sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+</div><div class='add'>+		/* Wake up parent */</div><div class='add'>+		parent-&gt;sk_data_ready(parent);</div><div class='add'>+</div><div class='add'>+		release_sock(parent);</div><div class='add'>+		sock_put(parent);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_sid(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_pa_sync_established *ev = data;</div><div class='add'>+</div><div class='add'>+	if (iso_pi(sk)-&gt;bc_sid == HCI_SID_INVALID)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return ev-&gt;sid == iso_pi(sk)-&gt;bc_sid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_sid_past(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_past_received *ev = data;</div><div class='add'>+</div><div class='add'>+	if (iso_pi(sk)-&gt;bc_sid == HCI_SID_INVALID)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return ev-&gt;sid == iso_pi(sk)-&gt;bc_sid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_sync_handle(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_evt_le_big_info_adv_report *ev = data;</div><div class='add'>+</div><div class='add'>+	return le16_to_cpu(ev-&gt;sync_handle) == iso_pi(sk)-&gt;sync_handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iso_match_sync_handle_pa_report(struct sock *sk, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_per_adv_report *ev = data;</div><div class='add'>+</div><div class='add'>+	return le16_to_cpu(ev-&gt;sync_handle) == iso_pi(sk)-&gt;sync_handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----- ISO interface with lower layer (HCI) ----- */</div><div class='add'>+</div><div class='add'>+int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)</div><div class='add'>+{</div><div class='add'>+	struct hci_ev_le_pa_sync_established *ev1;</div><div class='add'>+	struct hci_ev_le_past_received *ev1a;</div><div class='add'>+	struct hci_evt_le_big_info_adv_report *ev2;</div><div class='add'>+	struct hci_ev_le_per_adv_report *ev3;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);</div><div class='add'>+</div><div class='add'>+	/* Broadcast receiver requires handling of some events before it can</div><div class='add'>+	 * proceed to establishing a BIG sync:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. HCI_EV_LE_PA_SYNC_ESTABLISHED: The socket may specify a specific</div><div class='add'>+	 * SID to listen to and once sync is established its handle needs to</div><div class='add'>+	 * be stored in iso_pi(sk)-&gt;sync_handle so it can be matched once</div><div class='add'>+	 * receiving the BIG Info.</div><div class='add'>+	 * 1a. HCI_EV_LE_PAST_RECEIVED: alternative to 1.</div><div class='add'>+	 * 2. HCI_EVT_LE_BIG_INFO_ADV_REPORT: When connect_ind is triggered by a</div><div class='add'>+	 * a BIG Info it attempts to check if there any listening socket with</div><div class='add'>+	 * the same sync_handle and if it does then attempt to create a sync.</div><div class='add'>+	 * 3. HCI_EV_LE_PER_ADV_REPORT: When a PA report is received, it is stored</div><div class='add'>+	 * in iso_pi(sk)-&gt;base so it can be passed up to user, in the case of a</div><div class='add'>+	 * broadcast sink.</div><div class='add'>+	 */</div><div class='add'>+	ev1 = hci_recv_event_data(hdev, HCI_EV_LE_PA_SYNC_ESTABLISHED);</div><div class='add'>+	if (ev1) {</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr, BT_LISTEN,</div><div class='add'>+				  iso_match_sid, ev1);</div><div class='add'>+		if (sk &amp;&amp; !ev1-&gt;status) {</div><div class='add'>+			iso_pi(sk)-&gt;sync_handle = le16_to_cpu(ev1-&gt;handle);</div><div class='add'>+			iso_pi(sk)-&gt;bc_sid = ev1-&gt;sid;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev1a = hci_recv_event_data(hdev, HCI_EV_LE_PAST_RECEIVED);</div><div class='add'>+	if (ev1a) {</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr, BT_LISTEN,</div><div class='add'>+				  iso_match_sid_past, ev1a);</div><div class='add'>+		if (sk &amp;&amp; !ev1a-&gt;status) {</div><div class='add'>+			iso_pi(sk)-&gt;sync_handle = le16_to_cpu(ev1a-&gt;sync_handle);</div><div class='add'>+			iso_pi(sk)-&gt;bc_sid = ev1a-&gt;sid;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev2 = hci_recv_event_data(hdev, HCI_EVT_LE_BIG_INFO_ADV_REPORT);</div><div class='add'>+	if (ev2) {</div><div class='add'>+		/* Check if BIGInfo report has already been handled */</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr, BT_CONNECTED,</div><div class='add'>+				  iso_match_sync_handle, ev2);</div><div class='add'>+		if (sk) {</div><div class='add'>+			sock_put(sk);</div><div class='add'>+			sk = NULL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Try to get PA sync socket, if it exists */</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr, BT_CONNECT2,</div><div class='add'>+				  iso_match_sync_handle, ev2);</div><div class='add'>+		if (!sk)</div><div class='add'>+			sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr,</div><div class='add'>+					  BT_LISTEN,</div><div class='add'>+					  iso_match_sync_handle,</div><div class='add'>+					  ev2);</div><div class='add'>+</div><div class='add'>+		if (sk) {</div><div class='add'>+			int err;</div><div class='add'>+			struct hci_conn	*hcon = iso_pi(sk)-&gt;conn-&gt;hcon;</div><div class='add'>+</div><div class='add'>+			iso_pi(sk)-&gt;qos.bcast.encryption = ev2-&gt;encryption;</div><div class='add'>+</div><div class='add'>+			if (ev2-&gt;num_bis &lt; iso_pi(sk)-&gt;bc_num_bis)</div><div class='add'>+				iso_pi(sk)-&gt;bc_num_bis = ev2-&gt;num_bis;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags) &amp;&amp;</div><div class='add'>+			    !test_and_set_bit(BT_SK_BIG_SYNC, &amp;iso_pi(sk)-&gt;flags)) {</div><div class='add'>+				err = hci_conn_big_create_sync(hdev, hcon,</div><div class='add'>+							       &amp;iso_pi(sk)-&gt;qos,</div><div class='add'>+							       iso_pi(sk)-&gt;sync_handle,</div><div class='add'>+							       iso_pi(sk)-&gt;bc_num_bis,</div><div class='add'>+							       iso_pi(sk)-&gt;bc_bis);</div><div class='add'>+				if (err) {</div><div class='add'>+					bt_dev_err(hdev, "hci_le_big_create_sync: %d",</div><div class='add'>+						   err);</div><div class='add'>+					sock_put(sk);</div><div class='add'>+					sk = NULL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev3 = hci_recv_event_data(hdev, HCI_EV_LE_PER_ADV_REPORT);</div><div class='add'>+	if (ev3) {</div><div class='add'>+		size_t base_len = 0;</div><div class='add'>+		u8 *base;</div><div class='add'>+		struct hci_conn *hcon;</div><div class='add'>+</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, bdaddr, BT_LISTEN,</div><div class='add'>+				  iso_match_sync_handle_pa_report, ev3);</div><div class='add'>+		if (!sk)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		hcon = iso_pi(sk)-&gt;conn-&gt;hcon;</div><div class='add'>+		if (!hcon)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		if (ev3-&gt;data_status == LE_PA_DATA_TRUNCATED) {</div><div class='add'>+			/* The controller was unable to retrieve PA data. */</div><div class='add'>+			memset(hcon-&gt;le_per_adv_data, 0,</div><div class='add'>+			       HCI_MAX_PER_AD_TOT_LEN);</div><div class='add'>+			hcon-&gt;le_per_adv_data_len = 0;</div><div class='add'>+			hcon-&gt;le_per_adv_data_offset = 0;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hcon-&gt;le_per_adv_data_offset + ev3-&gt;length &gt;</div><div class='add'>+		    HCI_MAX_PER_AD_TOT_LEN)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		memcpy(hcon-&gt;le_per_adv_data + hcon-&gt;le_per_adv_data_offset,</div><div class='add'>+		       ev3-&gt;data, ev3-&gt;length);</div><div class='add'>+		hcon-&gt;le_per_adv_data_offset += ev3-&gt;length;</div><div class='add'>+</div><div class='add'>+		if (ev3-&gt;data_status == LE_PA_DATA_COMPLETE) {</div><div class='add'>+			/* All PA data has been received. */</div><div class='add'>+			hcon-&gt;le_per_adv_data_len =</div><div class='add'>+				hcon-&gt;le_per_adv_data_offset;</div><div class='add'>+			hcon-&gt;le_per_adv_data_offset = 0;</div><div class='add'>+</div><div class='add'>+			/* Extract BASE */</div><div class='add'>+			base = eir_get_service_data(hcon-&gt;le_per_adv_data,</div><div class='add'>+						    hcon-&gt;le_per_adv_data_len,</div><div class='add'>+						    EIR_BAA_SERVICE_UUID,</div><div class='add'>+						    &amp;base_len);</div><div class='add'>+</div><div class='add'>+			if (!base || base_len &gt; BASE_MAX_LENGTH)</div><div class='add'>+				goto done;</div><div class='add'>+</div><div class='add'>+			memcpy(iso_pi(sk)-&gt;base, base, base_len);</div><div class='add'>+			iso_pi(sk)-&gt;base_len = base_len;</div><div class='add'>+		} else {</div><div class='add'>+			/* This is a PA data fragment. Keep pa_data_len set to 0</div><div class='add'>+			 * until all data has been reassembled.</div><div class='add'>+			 */</div><div class='add'>+			hcon-&gt;le_per_adv_data_len = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sk = iso_get_sock(hdev, &amp;hdev-&gt;bdaddr, BDADDR_ANY,</div><div class='add'>+				  BT_LISTEN, iso_match_dst, BDADDR_ANY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags))</div><div class='add'>+		*flags |= HCI_PROTO_DEFER;</div><div class='add'>+</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	return HCI_LM_ACCEPT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_connect_cfm(struct hci_conn *hcon, __u8 status)</div><div class='add'>+{</div><div class='add'>+	if (hcon-&gt;type != CIS_LINK &amp;&amp; hcon-&gt;type != BIS_LINK &amp;&amp;</div><div class='add'>+	    hcon-&gt;type != PA_LINK) {</div><div class='add'>+		if (hcon-&gt;type != LE_LINK)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Check if LE link has failed */</div><div class='add'>+		if (status) {</div><div class='add'>+			struct hci_link *link, *t;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry_safe(link, t, &amp;hcon-&gt;link_list,</div><div class='add'>+						 list)</div><div class='add'>+				iso_conn_del(link-&gt;conn, bt_to_errno(status));</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Create CIS if pending */</div><div class='add'>+		hci_le_create_cis_pending(hcon-&gt;hdev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &amp;hcon-&gt;dst, status);</div><div class='add'>+</div><div class='add'>+	/* Similar to the success case, if HCI_CONN_BIG_SYNC_FAILED or</div><div class='add'>+	 * HCI_CONN_PA_SYNC_FAILED is set, queue the failed connection</div><div class='add'>+	 * into the accept queue of the listening socket and wake up</div><div class='add'>+	 * userspace, to inform the user about the event.</div><div class='add'>+	 */</div><div class='add'>+	if (!status || test_bit(HCI_CONN_BIG_SYNC_FAILED, &amp;hcon-&gt;flags) ||</div><div class='add'>+	    test_bit(HCI_CONN_PA_SYNC_FAILED, &amp;hcon-&gt;flags)) {</div><div class='add'>+		struct iso_conn *conn;</div><div class='add'>+</div><div class='add'>+		conn = iso_conn_add(hcon);</div><div class='add'>+		if (conn)</div><div class='add'>+			iso_conn_ready(conn);</div><div class='add'>+	} else {</div><div class='add'>+		iso_conn_del(hcon, bt_to_errno(status));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iso_disconn_cfm(struct hci_conn *hcon, __u8 reason)</div><div class='add'>+{</div><div class='add'>+	if (hcon-&gt;type != CIS_LINK &amp;&amp; hcon-&gt;type !=  BIS_LINK &amp;&amp;</div><div class='add'>+	    hcon-&gt;type != PA_LINK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("hcon %p reason %d", hcon, reason);</div><div class='add'>+</div><div class='add'>+	iso_conn_del(hcon, bt_to_errno(reason));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iso_recv(struct hci_dev *hdev, u16 handle, struct sk_buff *skb, u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct iso_conn *conn;</div><div class='add'>+	struct skb_shared_hwtstamps *hwts;</div><div class='add'>+	__u16 pb, ts, len, sn;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hcon = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!hcon) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = iso_conn_hold_unless_zero(hcon-&gt;iso_data);</div><div class='add'>+	hcon = NULL;</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!conn) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pb     = hci_iso_flags_pb(flags);</div><div class='add'>+	ts     = hci_iso_flags_ts(flags);</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p len %d pb 0x%x ts 0x%x", conn, skb-&gt;len, pb, ts);</div><div class='add'>+</div><div class='add'>+	switch (pb) {</div><div class='add'>+	case ISO_START:</div><div class='add'>+	case ISO_SINGLE:</div><div class='add'>+		if (conn-&gt;rx_len) {</div><div class='add'>+			BT_ERR("Unexpected start frame (len %d)", skb-&gt;len);</div><div class='add'>+			kfree_skb(conn-&gt;rx_skb);</div><div class='add'>+			conn-&gt;rx_skb = NULL;</div><div class='add'>+			conn-&gt;rx_len = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ts) {</div><div class='add'>+			struct hci_iso_ts_data_hdr *hdr;</div><div class='add'>+</div><div class='add'>+			hdr = skb_pull_data(skb, HCI_ISO_TS_DATA_HDR_SIZE);</div><div class='add'>+			if (!hdr) {</div><div class='add'>+				BT_ERR("Frame is too short (len %d)", skb-&gt;len);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*  Record the timestamp to skb */</div><div class='add'>+			hwts = skb_hwtstamps(skb);</div><div class='add'>+			hwts-&gt;hwtstamp = us_to_ktime(le32_to_cpu(hdr-&gt;ts));</div><div class='add'>+</div><div class='add'>+			sn = __le16_to_cpu(hdr-&gt;sn);</div><div class='add'>+			len = __le16_to_cpu(hdr-&gt;slen);</div><div class='add'>+		} else {</div><div class='add'>+			struct hci_iso_data_hdr *hdr;</div><div class='add'>+</div><div class='add'>+			hdr = skb_pull_data(skb, HCI_ISO_DATA_HDR_SIZE);</div><div class='add'>+			if (!hdr) {</div><div class='add'>+				BT_ERR("Frame is too short (len %d)", skb-&gt;len);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sn = __le16_to_cpu(hdr-&gt;sn);</div><div class='add'>+			len = __le16_to_cpu(hdr-&gt;slen);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flags  = hci_iso_data_flags(len);</div><div class='add'>+		len    = hci_iso_data_len(len);</div><div class='add'>+</div><div class='add'>+		BT_DBG("Start: total len %d, frag len %d flags 0x%4.4x sn %d",</div><div class='add'>+		       len, skb-&gt;len, flags, sn);</div><div class='add'>+</div><div class='add'>+		if (len == skb-&gt;len) {</div><div class='add'>+			/* Complete frame received */</div><div class='add'>+			hci_skb_pkt_status(skb) = flags &amp; 0x03;</div><div class='add'>+			hci_skb_pkt_seqnum(skb) = sn;</div><div class='add'>+			iso_recv_frame(conn, skb);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pb == ISO_SINGLE) {</div><div class='add'>+			BT_ERR("Frame malformed (len %d, expected len %d)",</div><div class='add'>+			       skb-&gt;len, len);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;len &gt; len) {</div><div class='add'>+			BT_ERR("Frame is too long (len %d, expected len %d)",</div><div class='add'>+			       skb-&gt;len, len);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate skb for the complete frame (with header) */</div><div class='add'>+		conn-&gt;rx_skb = bt_skb_alloc(len, GFP_KERNEL);</div><div class='add'>+		if (!conn-&gt;rx_skb)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		hci_skb_pkt_status(conn-&gt;rx_skb) = flags &amp; 0x03;</div><div class='add'>+		hci_skb_pkt_seqnum(conn-&gt;rx_skb) = sn;</div><div class='add'>+		skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, skb-&gt;len),</div><div class='add'>+					  skb-&gt;len);</div><div class='add'>+		conn-&gt;rx_len = len - skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		/* Copy hw timestamp from skb to rx_skb if present */</div><div class='add'>+		if (ts) {</div><div class='add'>+			hwts = skb_hwtstamps(conn-&gt;rx_skb);</div><div class='add'>+			hwts-&gt;hwtstamp = skb_hwtstamps(skb)-&gt;hwtstamp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ISO_CONT:</div><div class='add'>+		BT_DBG("Cont: frag len %d (expecting %d)", skb-&gt;len,</div><div class='add'>+		       conn-&gt;rx_len);</div><div class='add'>+</div><div class='add'>+		if (!conn-&gt;rx_len) {</div><div class='add'>+			BT_ERR("Unexpected continuation frame (len %d)",</div><div class='add'>+			       skb-&gt;len);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;len &gt; conn-&gt;rx_len) {</div><div class='add'>+			BT_ERR("Fragment is too long (len %d, expected %d)",</div><div class='add'>+			       skb-&gt;len, conn-&gt;rx_len);</div><div class='add'>+			kfree_skb(conn-&gt;rx_skb);</div><div class='add'>+			conn-&gt;rx_skb = NULL;</div><div class='add'>+			conn-&gt;rx_len = 0;</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, skb-&gt;len),</div><div class='add'>+					  skb-&gt;len);</div><div class='add'>+		conn-&gt;rx_len -= skb-&gt;len;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ISO_END:</div><div class='add'>+		skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, skb-&gt;len),</div><div class='add'>+					  skb-&gt;len);</div><div class='add'>+		conn-&gt;rx_len -= skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		if (!conn-&gt;rx_len) {</div><div class='add'>+			struct sk_buff *rx_skb = conn-&gt;rx_skb;</div><div class='add'>+</div><div class='add'>+			/* Complete frame received. iso_recv_frame</div><div class='add'>+			 * takes ownership of the skb so set the global</div><div class='add'>+			 * rx_skb pointer to NULL first.</div><div class='add'>+			 */</div><div class='add'>+			conn-&gt;rx_skb = NULL;</div><div class='add'>+			iso_recv_frame(conn, rx_skb);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+done:</div><div class='add'>+	iso_conn_put(conn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hci_cb iso_cb = {</div><div class='add'>+	.name		= "ISO",</div><div class='add'>+	.connect_cfm	= iso_connect_cfm,</div><div class='add'>+	.disconn_cfm	= iso_disconn_cfm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iso_debugfs_show(struct seq_file *f, void *p)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	sk_for_each(sk, &amp;iso_sk_list.head) {</div><div class='add'>+		seq_printf(f, "%pMR %pMR %d\n", &amp;iso_pi(sk)-&gt;src,</div><div class='add'>+			   &amp;iso_pi(sk)-&gt;dst, sk-&gt;sk_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_unlock(&amp;iso_sk_list.lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(iso_debugfs);</div><div class='add'>+</div><div class='add'>+static struct dentry *iso_debugfs;</div><div class='add'>+</div><div class='add'>+static const struct proto_ops iso_sock_ops = {</div><div class='add'>+	.family		= PF_BLUETOOTH,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.release	= iso_sock_release,</div><div class='add'>+	.bind		= iso_sock_bind,</div><div class='add'>+	.connect	= iso_sock_connect,</div><div class='add'>+	.listen		= iso_sock_listen,</div><div class='add'>+	.accept		= iso_sock_accept,</div><div class='add'>+	.getname	= iso_sock_getname,</div><div class='add'>+	.sendmsg	= iso_sock_sendmsg,</div><div class='add'>+	.recvmsg	= iso_sock_recvmsg,</div><div class='add'>+	.poll		= bt_sock_poll,</div><div class='add'>+	.ioctl		= bt_sock_ioctl,</div><div class='add'>+	.mmap		= sock_no_mmap,</div><div class='add'>+	.socketpair	= sock_no_socketpair,</div><div class='add'>+	.shutdown	= iso_sock_shutdown,</div><div class='add'>+	.setsockopt	= iso_sock_setsockopt,</div><div class='add'>+	.getsockopt	= iso_sock_getsockopt</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct net_proto_family iso_sock_family_ops = {</div><div class='add'>+	.family	= PF_BLUETOOTH,</div><div class='add'>+	.owner	= THIS_MODULE,</div><div class='add'>+	.create	= iso_sock_create,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool inited;</div><div class='add'>+</div><div class='add'>+bool iso_inited(void)</div><div class='add'>+{</div><div class='add'>+	return inited;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iso_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct sockaddr_iso) &gt; sizeof(struct sockaddr));</div><div class='add'>+</div><div class='add'>+	if (inited)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	err = proto_register(&amp;iso_proto, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bt_sock_register(BTPROTO_ISO, &amp;iso_sock_family_ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		BT_ERR("ISO socket registration failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bt_procfs_init(&amp;init_net, "iso", &amp;iso_sk_list, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		BT_ERR("Failed to create ISO proc file");</div><div class='add'>+		bt_sock_unregister(BTPROTO_ISO);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BT_INFO("ISO socket layer initialized");</div><div class='add'>+</div><div class='add'>+	hci_register_cb(&amp;iso_cb);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR_OR_NULL(bt_debugfs))</div><div class='add'>+		iso_debugfs = debugfs_create_file("iso", 0444, bt_debugfs,</div><div class='add'>+						  NULL, &amp;iso_debugfs_fops);</div><div class='add'>+</div><div class='add'>+	inited = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	proto_unregister(&amp;iso_proto);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iso_exit(void)</div><div class='add'>+{</div><div class='add'>+	if (!inited)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	bt_procfs_cleanup(&amp;init_net, "iso");</div><div class='add'>+</div><div class='add'>+	debugfs_remove(iso_debugfs);</div><div class='add'>+	iso_debugfs = NULL;</div><div class='add'>+</div><div class='add'>+	hci_unregister_cb(&amp;iso_cb);</div><div class='add'>+</div><div class='add'>+	bt_sock_unregister(BTPROTO_ISO);</div><div class='add'>+</div><div class='add'>+	proto_unregister(&amp;iso_proto);</div><div class='add'>+</div><div class='add'>+	inited = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c<br/>index d17a4736e47c..07b493331fd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/l2cap_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/l2cap_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/l2cap_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/l2cap_core.c</a></div><div class='hunk'>@@ -39,21 +39,17 @@</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "smp.h"</div><div class='del'>-#include "a2mp.h"</div><div class='del'>-#include "amp.h"</div><div class='ctx'> </div><div class='ctx'> #define LE_FLOWCTL_MAX_CREDITS 65535</div><div class='ctx'> </div><div class='ctx'> bool disable_ertm;</div><div class='add'>+bool enable_ecred = IS_ENABLED(CONFIG_BT_LE_L2CAP_ECRED);</div><div class='ctx'> </div><div class='ctx'> static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN | L2CAP_FEAT_UCD;</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(chan_list);</div><div class='ctx'> static DEFINE_RWLOCK(chan_list_lock);</div><div class='ctx'> </div><div class='del'>-static u16 le_max_credits = L2CAP_LE_MAX_CREDITS;</div><div class='del'>-static u16 le_default_mps = L2CAP_LE_DEFAULT_MPS;</div><div class='del'>-</div><div class='ctx'> static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn,</div><div class='ctx'> 				       u8 code, u8 ident, u16 dlen, void *data);</div><div class='ctx'> static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len,</div><div class='hunk'>@@ -63,6 +59,9 @@ static void l2cap_send_disconn_req(struct l2cap_chan *chan, int err);</div><div class='ctx'> </div><div class='ctx'> static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,</div><div class='ctx'> 		     struct sk_buff_head *skbs, u8 event);</div><div class='add'>+static void l2cap_retrans_timeout(struct work_struct *work);</div><div class='add'>+static void l2cap_monitor_timeout(struct work_struct *work);</div><div class='add'>+static void l2cap_ack_timeout(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> static inline u8 bdaddr_type(u8 link_type, u8 bdaddr_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -113,34 +112,39 @@ static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Find channel with given SCID.</div><div class='del'>- * Returns locked channel. */</div><div class='add'>+ * Returns a reference locked channel.</div><div class='add'>+ */</div><div class='ctx'> static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn,</div><div class='ctx'> 						 u16 cid)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *c;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	c = __l2cap_get_chan_by_scid(conn, cid);</div><div class='del'>-	if (c)</div><div class='del'>-		l2cap_chan_lock(c);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	if (c) {</div><div class='add'>+		/* Only lock if chan reference is not 0 */</div><div class='add'>+		c = l2cap_chan_hold_unless_zero(c);</div><div class='add'>+		if (c)</div><div class='add'>+			l2cap_chan_lock(c);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Find channel with given DCID.</div><div class='del'>- * Returns locked channel.</div><div class='add'>+ * Returns a reference locked channel.</div><div class='ctx'>  */</div><div class='ctx'> static struct l2cap_chan *l2cap_get_chan_by_dcid(struct l2cap_conn *conn,</div><div class='ctx'> 						 u16 cid)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *c;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	c = __l2cap_get_chan_by_dcid(conn, cid);</div><div class='del'>-	if (c)</div><div class='del'>-		l2cap_chan_lock(c);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	if (c) {</div><div class='add'>+		/* Only lock if chan reference is not 0 */</div><div class='add'>+		c = l2cap_chan_hold_unless_zero(c);</div><div class='add'>+		if (c)</div><div class='add'>+			l2cap_chan_lock(c);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='hunk'>@@ -157,25 +161,18 @@ static struct l2cap_chan *__l2cap_get_chan_by_ident(struct l2cap_conn *conn,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn,</div><div class='del'>-						  u8 ident)</div><div class='add'>+static struct l2cap_chan *__l2cap_global_chan_by_addr(__le16 psm, bdaddr_t *src,</div><div class='add'>+						      u8 src_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *c;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-	c = __l2cap_get_chan_by_ident(conn, ident);</div><div class='del'>-	if (c)</div><div class='del'>-		l2cap_chan_lock(c);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='add'>+	list_for_each_entry(c, &amp;chan_list, global_l) {</div><div class='add'>+		if (src_type == BDADDR_BREDR &amp;&amp; c-&gt;src_type != BDADDR_BREDR)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-static struct l2cap_chan *__l2cap_global_chan_by_addr(__le16 psm, bdaddr_t *src)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_chan *c;</div><div class='add'>+		if (src_type != BDADDR_BREDR &amp;&amp; c-&gt;src_type == BDADDR_BREDR)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(c, &amp;chan_list, global_l) {</div><div class='ctx'> 		if (c-&gt;sport == psm &amp;&amp; !bacmp(&amp;c-&gt;src, src))</div><div class='ctx'> 			return c;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -188,7 +185,7 @@ int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm)</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;chan_list_lock);</div><div class='ctx'> </div><div class='del'>-	if (psm &amp;&amp; __l2cap_global_chan_by_addr(psm, src)) {</div><div class='add'>+	if (psm &amp;&amp; __l2cap_global_chan_by_addr(psm, src, chan-&gt;src_type)) {</div><div class='ctx'> 		err = -EADDRINUSE;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -212,7 +209,8 @@ int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm)</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		for (p = start; p &lt;= end; p += incr)</div><div class='del'>-			if (!__l2cap_global_chan_by_addr(cpu_to_le16(p), src)) {</div><div class='add'>+			if (!__l2cap_global_chan_by_addr(cpu_to_le16(p), src,</div><div class='add'>+							 chan-&gt;src_type)) {</div><div class='ctx'> 				chan-&gt;psm   = cpu_to_le16(p);</div><div class='ctx'> 				chan-&gt;sport = cpu_to_le16(p);</div><div class='ctx'> 				err = 0;</div><div class='hunk'>@@ -413,7 +411,13 @@ static void l2cap_chan_timeout(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p state %s", chan, state_to_string(chan-&gt;state));</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='add'>+	/* __set_chan_timer() calls l2cap_chan_hold(chan) while scheduling</div><div class='add'>+	 * this work. No need to call l2cap_chan_hold(chan) here again.</div><div class='add'>+	 */</div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;state == BT_CONNECTED || chan-&gt;state == BT_CONFIG)</div><div class='hunk'>@@ -426,12 +430,12 @@ static void l2cap_chan_timeout(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_close(chan, reason);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='ctx'> 	chan-&gt;ops-&gt;close(chan);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> </div><div class='add'>+	l2cap_chan_unlock(chan);</div><div class='ctx'> 	l2cap_chan_put(chan);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct l2cap_chan *l2cap_chan_create(void)</div><div class='hunk'>@@ -442,16 +446,24 @@ struct l2cap_chan *l2cap_chan_create(void)</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	skb_queue_head_init(&amp;chan-&gt;tx_q);</div><div class='add'>+	skb_queue_head_init(&amp;chan-&gt;srej_q);</div><div class='ctx'> 	mutex_init(&amp;chan-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set default lock nesting level */</div><div class='ctx'> 	atomic_set(&amp;chan-&gt;nesting, L2CAP_NESTING_NORMAL);</div><div class='ctx'> </div><div class='add'>+	/* Available receive buffer space is initially unknown */</div><div class='add'>+	chan-&gt;rx_avail = -1;</div><div class='add'>+</div><div class='ctx'> 	write_lock(&amp;chan_list_lock);</div><div class='ctx'> 	list_add(&amp;chan-&gt;global_l, &amp;chan_list);</div><div class='ctx'> 	write_unlock(&amp;chan_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;chan-&gt;chan_timer, l2cap_chan_timeout);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;chan-&gt;retrans_timer, l2cap_retrans_timeout);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;chan-&gt;monitor_timer, l2cap_monitor_timeout);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;chan-&gt;ack_timer, l2cap_ack_timeout);</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;state = BT_OPEN;</div><div class='ctx'> </div><div class='hunk'>@@ -481,14 +493,25 @@ static void l2cap_chan_destroy(struct kref *kref)</div><div class='ctx'> </div><div class='ctx'> void l2cap_chan_hold(struct l2cap_chan *c)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("chan %p orig refcnt %d", c, kref_read(&amp;c-&gt;kref));</div><div class='add'>+	BT_DBG("chan %p orig refcnt %u", c, kref_read(&amp;c-&gt;kref));</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;c-&gt;kref);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(l2cap_chan_hold);</div><div class='add'>+</div><div class='add'>+struct l2cap_chan *l2cap_chan_hold_unless_zero(struct l2cap_chan *c)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("chan %p orig refcnt %u", c, kref_read(&amp;c-&gt;kref));</div><div class='add'>+</div><div class='add'>+	if (!kref_get_unless_zero(&amp;c-&gt;kref))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void l2cap_chan_put(struct l2cap_chan *c)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("chan %p orig refcnt %d", c, kref_read(&amp;c-&gt;kref));</div><div class='add'>+	BT_DBG("chan %p orig refcnt %u", c, kref_read(&amp;c-&gt;kref));</div><div class='ctx'> </div><div class='ctx'> 	kref_put(&amp;c-&gt;kref, l2cap_chan_destroy);</div><div class='ctx'> }</div><div class='hunk'>@@ -507,24 +530,60 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan)</div><div class='ctx'> 	chan-&gt;flush_to = L2CAP_DEFAULT_FLUSH_TO;</div><div class='ctx'> 	chan-&gt;retrans_timeout = L2CAP_DEFAULT_RETRANS_TO;</div><div class='ctx'> 	chan-&gt;monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;</div><div class='add'>+</div><div class='ctx'> 	chan-&gt;conf_state = 0;</div><div class='add'>+	set_bit(CONF_NOT_COMPLETE, &amp;chan-&gt;conf_state);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(FLAG_FORCE_ACTIVE, &amp;chan-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2cap_chan_set_defaults);</div><div class='ctx'> </div><div class='del'>-static void l2cap_le_flowctl_init(struct l2cap_chan *chan)</div><div class='add'>+static __u16 l2cap_le_rx_credits(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	size_t sdu_len = chan-&gt;sdu ? chan-&gt;sdu-&gt;len : 0;</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;mps == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If we don't know the available space in the receiver buffer, give</div><div class='add'>+	 * enough credits for a full packet.</div><div class='add'>+	 */</div><div class='add'>+	if (chan-&gt;rx_avail == -1)</div><div class='add'>+		return (chan-&gt;imtu / chan-&gt;mps) + 1;</div><div class='add'>+</div><div class='add'>+	/* If we know how much space is available in the receive buffer, give</div><div class='add'>+	 * out as many credits as would fill the buffer.</div><div class='add'>+	 */</div><div class='add'>+	if (chan-&gt;rx_avail &lt;= sdu_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_UP(chan-&gt;rx_avail - sdu_len, chan-&gt;mps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2cap_le_flowctl_init(struct l2cap_chan *chan, u16 tx_credits)</div><div class='ctx'> {</div><div class='ctx'> 	chan-&gt;sdu = NULL;</div><div class='ctx'> 	chan-&gt;sdu_last_frag = NULL;</div><div class='ctx'> 	chan-&gt;sdu_len = 0;</div><div class='del'>-	chan-&gt;tx_credits = 0;</div><div class='del'>-	chan-&gt;rx_credits = le_max_credits;</div><div class='del'>-	chan-&gt;mps = min_t(u16, chan-&gt;imtu, le_default_mps);</div><div class='add'>+	chan-&gt;tx_credits = tx_credits;</div><div class='add'>+	/* Derive MPS from connection MTU to stop HCI fragmentation */</div><div class='add'>+	chan-&gt;mps = min_t(u16, chan-&gt;imtu, chan-&gt;conn-&gt;mtu - L2CAP_HDR_SIZE);</div><div class='add'>+	chan-&gt;rx_credits = l2cap_le_rx_credits(chan);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;chan-&gt;tx_q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_ecred_init(struct l2cap_chan *chan, u16 tx_credits)</div><div class='add'>+{</div><div class='add'>+	l2cap_le_flowctl_init(chan, tx_credits);</div><div class='add'>+</div><div class='add'>+	/* L2CAP implementations shall support a minimum MPS of 64 octets */</div><div class='add'>+	if (chan-&gt;mps &lt; L2CAP_ECRED_MIN_MPS) {</div><div class='add'>+		chan-&gt;mps = L2CAP_ECRED_MIN_MPS;</div><div class='add'>+		chan-&gt;rx_credits = l2cap_le_rx_credits(chan);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,</div><div class='hunk'>@@ -574,14 +633,15 @@ void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)</div><div class='ctx'> 	    test_bit(FLAG_HOLD_HCI_CONN, &amp;chan-&gt;flags))</div><div class='ctx'> 		hci_conn_hold(conn-&gt;hcon);</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;chan-&gt;list, &amp;conn-&gt;chan_l);</div><div class='add'>+	/* Append to the list since the order matters for ECRED */</div><div class='add'>+	list_add_tail(&amp;chan-&gt;list, &amp;conn-&gt;chan_l);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> 	__l2cap_chan_add(conn, chan);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void l2cap_chan_del(struct l2cap_chan *chan, int err)</div><div class='hunk'>@@ -596,7 +656,6 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)</div><div class='ctx'> 	chan-&gt;ops-&gt;teardown(chan, err);</div><div class='ctx'> </div><div class='ctx'> 	if (conn) {</div><div class='del'>-		struct amp_mgr *mgr = conn-&gt;hcon-&gt;amp_mgr;</div><div class='ctx'> 		/* Delete from channel list */</div><div class='ctx'> 		list_del(&amp;chan-&gt;list);</div><div class='ctx'> </div><div class='hunk'>@@ -611,26 +670,17 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)</div><div class='ctx'> 		if (chan-&gt;chan_type != L2CAP_CHAN_FIXED ||</div><div class='ctx'> 		    test_bit(FLAG_HOLD_HCI_CONN, &amp;chan-&gt;flags))</div><div class='ctx'> 			hci_conn_drop(conn-&gt;hcon);</div><div class='del'>-</div><div class='del'>-		if (mgr &amp;&amp; mgr-&gt;bredr_chan == chan)</div><div class='del'>-			mgr-&gt;bredr_chan = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;hs_hchan) {</div><div class='del'>-		struct hci_chan *hs_hchan = chan-&gt;hs_hchan;</div><div class='del'>-</div><div class='del'>-		BT_DBG("chan %p disconnect hs_hchan %p", chan, hs_hchan);</div><div class='del'>-		amp_disconnect_logical_link(hs_hchan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(CONF_NOT_COMPLETE, &amp;chan-&gt;conf_state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	switch(chan-&gt;mode) {</div><div class='add'>+	switch (chan-&gt;mode) {</div><div class='ctx'> 	case L2CAP_MODE_BASIC:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case L2CAP_MODE_LE_FLOWCTL:</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='ctx'> 		skb_queue_purge(&amp;chan-&gt;tx_q);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -643,26 +693,57 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)</div><div class='ctx'> </div><div class='ctx'> 		l2cap_seq_list_free(&amp;chan-&gt;srej_list);</div><div class='ctx'> 		l2cap_seq_list_free(&amp;chan-&gt;retrans_list);</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case L2CAP_MODE_STREAMING:</div><div class='ctx'> 		skb_queue_purge(&amp;chan-&gt;tx_q);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2cap_chan_del);</div><div class='ctx'> </div><div class='add'>+static void __l2cap_chan_list_id(struct l2cap_conn *conn, u16 id,</div><div class='add'>+				 l2cap_chan_func_t func, void *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_chan *chan, *l;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(chan, l, &amp;conn-&gt;chan_l, list) {</div><div class='add'>+		if (chan-&gt;ident == id)</div><div class='add'>+			func(chan, data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func,</div><div class='add'>+			      void *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_chan *chan;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='add'>+		func(chan, data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func,</div><div class='add'>+		     void *data)</div><div class='add'>+{</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='add'>+	__l2cap_chan_list(conn, func, data);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(l2cap_chan_list);</div><div class='add'>+</div><div class='ctx'> static void l2cap_conn_update_id_addr(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = container_of(work, struct l2cap_conn,</div><div class='del'>-					       id_addr_update_work);</div><div class='add'>+					       id_addr_timer.work);</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	struct l2cap_chan *chan;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		l2cap_chan_lock(chan);</div><div class='hunk'>@@ -671,7 +752,7 @@ static void l2cap_conn_update_id_addr(struct work_struct *work)</div><div class='ctx'> 		l2cap_chan_unlock(chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_chan_le_connect_reject(struct l2cap_chan *chan)</div><div class='hunk'>@@ -681,9 +762,9 @@ static void l2cap_chan_le_connect_reject(struct l2cap_chan *chan)</div><div class='ctx'> 	u16 result;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags))</div><div class='del'>-		result = L2CAP_CR_AUTHORIZATION;</div><div class='add'>+		result = L2CAP_CR_LE_AUTHORIZATION;</div><div class='ctx'> 	else</div><div class='del'>-		result = L2CAP_CR_BAD_PSM;</div><div class='add'>+		result = L2CAP_CR_LE_BAD_PSM;</div><div class='ctx'> </div><div class='ctx'> 	l2cap_state_change(chan, BT_DISCONN);</div><div class='ctx'> </div><div class='hunk'>@@ -697,6 +778,13 @@ static void l2cap_chan_le_connect_reject(struct l2cap_chan *chan)</div><div class='ctx'> 		       &amp;rsp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_chan_ecred_connect_reject(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	l2cap_state_change(chan, BT_DISCONN);</div><div class='add'>+</div><div class='add'>+	__l2cap_ecred_conn_rsp_defer(chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void l2cap_chan_connect_reject(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='hunk'>@@ -742,8 +830,16 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)</div><div class='ctx'> 		if (chan-&gt;chan_type == L2CAP_CHAN_CONN_ORIENTED) {</div><div class='ctx'> 			if (conn-&gt;hcon-&gt;type == ACL_LINK)</div><div class='ctx'> 				l2cap_chan_connect_reject(chan);</div><div class='del'>-			else if (conn-&gt;hcon-&gt;type == LE_LINK)</div><div class='del'>-				l2cap_chan_le_connect_reject(chan);</div><div class='add'>+			else if (conn-&gt;hcon-&gt;type == LE_LINK) {</div><div class='add'>+				switch (chan-&gt;mode) {</div><div class='add'>+				case L2CAP_MODE_LE_FLOWCTL:</div><div class='add'>+					l2cap_chan_le_connect_reject(chan);</div><div class='add'>+					break;</div><div class='add'>+				case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+					l2cap_chan_ecred_connect_reject(chan);</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		l2cap_chan_del(chan, reason);</div><div class='hunk'>@@ -797,7 +893,8 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)</div><div class='ctx'> 			else</div><div class='ctx'> 				return HCI_AT_NO_BONDING;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		switch (chan-&gt;sec_level) {</div><div class='ctx'> 		case BT_SECURITY_HIGH:</div><div class='hunk'>@@ -849,6 +946,16 @@ static u8 l2cap_get_ident(struct l2cap_conn *conn)</div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_send_acl(struct l2cap_conn *conn, struct sk_buff *skb,</div><div class='add'>+			   u8 flags)</div><div class='add'>+{</div><div class='add'>+	/* Check if the hcon still valid before attempting to send */</div><div class='add'>+	if (hci_conn_valid(conn-&gt;hcon-&gt;hdev, conn-&gt;hcon))</div><div class='add'>+		hci_send_acl(conn-&gt;hchan, skb, flags);</div><div class='add'>+	else</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len,</div><div class='ctx'> 			   void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -871,13 +978,7 @@ static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len,</div><div class='ctx'> 	bt_cb(skb)-&gt;force_active = BT_POWER_FORCE_ACTIVE_ON;</div><div class='ctx'> 	skb-&gt;priority = HCI_PRIO_MAX;</div><div class='ctx'> </div><div class='del'>-	hci_send_acl(conn-&gt;hchan, skb, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool __chan_is_moving(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	return chan-&gt;move_state != L2CAP_MOVE_STABLE &amp;&amp;</div><div class='del'>-	       chan-&gt;move_state != L2CAP_MOVE_WAIT_PREPARE;</div><div class='add'>+	l2cap_send_acl(conn, skb, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='hunk'>@@ -888,15 +989,6 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 	BT_DBG("chan %p, skb %p len %d priority %u", chan, skb, skb-&gt;len,</div><div class='ctx'> 	       skb-&gt;priority);</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;hs_hcon &amp;&amp; !__chan_is_moving(chan)) {</div><div class='del'>-		if (chan-&gt;hs_hchan)</div><div class='del'>-			hci_send_acl(chan-&gt;hs_hchan, skb, ACL_COMPLETE);</div><div class='del'>-		else</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Use NO_FLUSH for LE links (where this is the only option) or</div><div class='ctx'> 	 * if the BR/EDR link supports it and flushing has not been</div><div class='ctx'> 	 * explicitly requested (through FLAG_FLUSHABLE).</div><div class='hunk'>@@ -1077,9 +1169,6 @@ static void l2cap_send_sframe(struct l2cap_chan *chan,</div><div class='ctx'> 	if (!control-&gt;sframe)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (__chan_is_moving(chan))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (test_and_clear_bit(CONN_SEND_FBIT, &amp;chan-&gt;conn_state) &amp;&amp;</div><div class='ctx'> 	    !control-&gt;poll)</div><div class='ctx'> 		control-&gt;final = 1;</div><div class='hunk'>@@ -1134,40 +1223,6 @@ static inline int __l2cap_no_conn_pending(struct l2cap_chan *chan)</div><div class='ctx'> 	return !test_bit(CONF_CONNECT_PEND, &amp;chan-&gt;conf_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __amp_capable(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	bool amp_available = false;</div><div class='del'>-</div><div class='del'>-	if (!(conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!(conn-&gt;remote_fixed_chan &amp; L2CAP_FC_A2MP))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;hci_dev_list_lock);</div><div class='del'>-	list_for_each_entry(hdev, &amp;hci_dev_list, list) {</div><div class='del'>-		if (hdev-&gt;amp_type != AMP_TYPE_BREDR &amp;&amp;</div><div class='del'>-		    test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-			amp_available = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;hci_dev_list_lock);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;chan_policy == BT_CHANNEL_POLICY_AMP_PREFERRED)</div><div class='del'>-		return amp_available;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool l2cap_check_efs(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	/* Check EFS parameters */</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void l2cap_send_conn_req(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='hunk'>@@ -1183,76 +1238,6 @@ void l2cap_send_conn_req(struct l2cap_chan *chan)</div><div class='ctx'> 	l2cap_send_cmd(conn, chan-&gt;ident, L2CAP_CONN_REQ, sizeof(req), &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void l2cap_send_create_chan_req(struct l2cap_chan *chan, u8 amp_id)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_create_chan_req req;</div><div class='del'>-	req.scid = cpu_to_le16(chan-&gt;scid);</div><div class='del'>-	req.psm  = chan-&gt;psm;</div><div class='del'>-	req.amp_id = amp_id;</div><div class='del'>-</div><div class='del'>-	chan-&gt;ident = l2cap_get_ident(chan-&gt;conn);</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(chan-&gt;conn, chan-&gt;ident, L2CAP_CREATE_CHAN_REQ,</div><div class='del'>-		       sizeof(req), &amp;req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_move_setup(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;mode != L2CAP_MODE_ERTM)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__clear_retrans_timer(chan);</div><div class='del'>-	__clear_monitor_timer(chan);</div><div class='del'>-	__clear_ack_timer(chan);</div><div class='del'>-</div><div class='del'>-	chan-&gt;retry_count = 0;</div><div class='del'>-	skb_queue_walk(&amp;chan-&gt;tx_q, skb) {</div><div class='del'>-		if (bt_cb(skb)-&gt;l2cap.retries)</div><div class='del'>-			bt_cb(skb)-&gt;l2cap.retries = 1;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan-&gt;expected_tx_seq = chan-&gt;buffer_seq;</div><div class='del'>-</div><div class='del'>-	clear_bit(CONN_REJ_ACT, &amp;chan-&gt;conn_state);</div><div class='del'>-	clear_bit(CONN_SREJ_ACT, &amp;chan-&gt;conn_state);</div><div class='del'>-	l2cap_seq_list_clear(&amp;chan-&gt;retrans_list);</div><div class='del'>-	l2cap_seq_list_clear(&amp;chan-&gt;srej_list);</div><div class='del'>-	skb_queue_purge(&amp;chan-&gt;srej_q);</div><div class='del'>-</div><div class='del'>-	chan-&gt;tx_state = L2CAP_TX_STATE_XMIT;</div><div class='del'>-	chan-&gt;rx_state = L2CAP_RX_STATE_MOVE;</div><div class='del'>-</div><div class='del'>-	set_bit(CONN_REMOTE_BUSY, &amp;chan-&gt;conn_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_move_done(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	u8 move_role = chan-&gt;move_role;</div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='del'>-</div><div class='del'>-	chan-&gt;move_state = L2CAP_MOVE_STABLE;</div><div class='del'>-	chan-&gt;move_role = L2CAP_MOVE_ROLE_NONE;</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;mode != L2CAP_MODE_ERTM)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (move_role) {</div><div class='del'>-	case L2CAP_MOVE_ROLE_INITIATOR:</div><div class='del'>-		l2cap_tx(chan, NULL, NULL, L2CAP_EV_EXPLICIT_POLL);</div><div class='del'>-		chan-&gt;rx_state = L2CAP_RX_STATE_WAIT_F;</div><div class='del'>-		break;</div><div class='del'>-	case L2CAP_MOVE_ROLE_RESPONDER:</div><div class='del'>-		chan-&gt;rx_state = L2CAP_RX_STATE_WAIT_P;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void l2cap_chan_ready(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	/* The channel may have already been flagged as connected in</div><div class='hunk'>@@ -1266,8 +1251,13 @@ static void l2cap_chan_ready(struct l2cap_chan *chan)</div><div class='ctx'> 	chan-&gt;conf_state = 0;</div><div class='ctx'> 	__clear_chan_timer(chan);</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;mode == L2CAP_MODE_LE_FLOWCTL &amp;&amp; !chan-&gt;tx_credits)</div><div class='del'>-		chan-&gt;ops-&gt;suspend(chan);</div><div class='add'>+	switch (chan-&gt;mode) {</div><div class='add'>+	case L2CAP_MODE_LE_FLOWCTL:</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+		if (!chan-&gt;tx_credits)</div><div class='add'>+			chan-&gt;ops-&gt;suspend(chan);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;state = BT_CONNECTED;</div><div class='ctx'> </div><div class='hunk'>@@ -1282,6 +1272,12 @@ static void l2cap_le_connect(struct l2cap_chan *chan)</div><div class='ctx'> 	if (test_and_set_bit(FLAG_LE_CONN_REQ_SENT, &amp;chan-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!chan-&gt;imtu)</div><div class='add'>+		chan-&gt;imtu = chan-&gt;conn-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	l2cap_le_flowctl_init(chan, 0);</div><div class='add'>+</div><div class='add'>+	memset(&amp;req, 0, sizeof(req));</div><div class='ctx'> 	req.psm     = chan-&gt;psm;</div><div class='ctx'> 	req.scid    = cpu_to_le16(chan-&gt;scid);</div><div class='ctx'> 	req.mtu     = cpu_to_le16(chan-&gt;imtu);</div><div class='hunk'>@@ -1294,6 +1290,81 @@ static void l2cap_le_connect(struct l2cap_chan *chan)</div><div class='ctx'> 		       sizeof(req), &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct l2cap_ecred_conn_data {</div><div class='add'>+	struct {</div><div class='add'>+		struct l2cap_ecred_conn_req_hdr req;</div><div class='add'>+		__le16 scid[5];</div><div class='add'>+	} __packed pdu;</div><div class='add'>+	struct l2cap_chan *chan;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_ecred_conn_data *conn = data;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+</div><div class='add'>+	if (chan == conn-&gt;chan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pid = chan-&gt;ops-&gt;get_peer_pid(chan);</div><div class='add'>+</div><div class='add'>+	/* Only add deferred channels with the same PID/PSM */</div><div class='add'>+	if (conn-&gt;pid != pid || chan-&gt;psm != conn-&gt;chan-&gt;psm || chan-&gt;ident ||</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL || chan-&gt;state != BT_CONNECT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	l2cap_ecred_init(chan, 0);</div><div class='add'>+</div><div class='add'>+	/* Set the same ident so we can match on the rsp */</div><div class='add'>+	chan-&gt;ident = conn-&gt;chan-&gt;ident;</div><div class='add'>+</div><div class='add'>+	/* Include all channels deferred */</div><div class='add'>+	conn-&gt;pdu.scid[conn-&gt;count] = cpu_to_le16(chan-&gt;scid);</div><div class='add'>+</div><div class='add'>+	conn-&gt;count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2cap_ecred_connect(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='add'>+	struct l2cap_ecred_conn_data data;</div><div class='add'>+</div><div class='add'>+	if (test_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	l2cap_ecred_init(chan, 0);</div><div class='add'>+</div><div class='add'>+	memset(&amp;data, 0, sizeof(data));</div><div class='add'>+	data.pdu.req.psm     = chan-&gt;psm;</div><div class='add'>+	data.pdu.req.mtu     = cpu_to_le16(chan-&gt;imtu);</div><div class='add'>+	data.pdu.req.mps     = cpu_to_le16(chan-&gt;mps);</div><div class='add'>+	data.pdu.req.credits = cpu_to_le16(chan-&gt;rx_credits);</div><div class='add'>+	data.pdu.scid[0]     = cpu_to_le16(chan-&gt;scid);</div><div class='add'>+</div><div class='add'>+	chan-&gt;ident = l2cap_get_ident(conn);</div><div class='add'>+</div><div class='add'>+	data.count = 1;</div><div class='add'>+	data.chan = chan;</div><div class='add'>+	data.pid = chan-&gt;ops-&gt;get_peer_pid(chan);</div><div class='add'>+</div><div class='add'>+	__l2cap_chan_list(conn, l2cap_ecred_defer_connect, &amp;data);</div><div class='add'>+</div><div class='add'>+	l2cap_send_cmd(conn, chan-&gt;ident, L2CAP_ECRED_CONN_REQ,</div><div class='add'>+		       sizeof(data.pdu.req) + data.count * sizeof(__le16),</div><div class='add'>+		       &amp;data.pdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void l2cap_le_start(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='hunk'>@@ -1306,16 +1377,17 @@ static void l2cap_le_start(struct l2cap_chan *chan)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;state == BT_CONNECT)</div><div class='del'>-		l2cap_le_connect(chan);</div><div class='add'>+	if (chan-&gt;state == BT_CONNECT) {</div><div class='add'>+		if (chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL)</div><div class='add'>+			l2cap_ecred_connect(chan);</div><div class='add'>+		else</div><div class='add'>+			l2cap_le_connect(chan);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_start_connection(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='del'>-	if (__amp_capable(chan)) {</div><div class='del'>-		BT_DBG("chan %p AMP capable: discover AMPs", chan);</div><div class='del'>-		a2mp_discover_amp(chan);</div><div class='del'>-	} else if (chan-&gt;conn-&gt;hcon-&gt;type == LE_LINK) {</div><div class='add'>+	if (chan-&gt;conn-&gt;hcon-&gt;type == LE_LINK) {</div><div class='ctx'> 		l2cap_le_start(chan);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		l2cap_send_conn_req(chan);</div><div class='hunk'>@@ -1340,6 +1412,28 @@ static void l2cap_request_info(struct l2cap_conn *conn)</div><div class='ctx'> 		       sizeof(req), &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool l2cap_check_enc_key_size(struct hci_conn *hcon,</div><div class='add'>+				     struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	/* The minimum encryption key size needs to be enforced by the</div><div class='add'>+	 * host stack before establishing any L2CAP connections. The</div><div class='add'>+	 * specification in theory allows a minimum of 1, but to align</div><div class='add'>+	 * BR/EDR and LE transports, a minimum of 7 is chosen.</div><div class='add'>+	 *</div><div class='add'>+	 * This check might also be called for unencrypted connections</div><div class='add'>+	 * that have no key size requirements. Ensure that the link is</div><div class='add'>+	 * actually encrypted before enforcing a key size.</div><div class='add'>+	 */</div><div class='add'>+	int min_key_size = hcon-&gt;hdev-&gt;min_enc_key_size;</div><div class='add'>+</div><div class='add'>+	/* On FIPS security level, key size must be 16 bytes */</div><div class='add'>+	if (chan-&gt;sec_level == BT_SECURITY_FIPS)</div><div class='add'>+		min_key_size = 16;</div><div class='add'>+</div><div class='add'>+	return (!test_bit(HCI_CONN_ENCRYPT, &amp;hcon-&gt;flags) ||</div><div class='add'>+		hcon-&gt;enc_key_size &gt;= min_key_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void l2cap_do_start(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='hunk'>@@ -1357,9 +1451,14 @@ static void l2cap_do_start(struct l2cap_chan *chan)</div><div class='ctx'> 	if (!(conn-&gt;info_state &amp; L2CAP_INFO_FEAT_MASK_REQ_DONE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (l2cap_chan_check_security(chan, true) &amp;&amp;</div><div class='del'>-	    __l2cap_no_conn_pending(chan))</div><div class='add'>+	if (!l2cap_chan_check_security(chan, true) ||</div><div class='add'>+	    !__l2cap_no_conn_pending(chan))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (l2cap_check_enc_key_size(conn-&gt;hcon, chan))</div><div class='ctx'> 		l2cap_start_connection(chan);</div><div class='add'>+	else</div><div class='add'>+		__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int l2cap_mode_supported(__u8 mode, __u32 feat_mask)</div><div class='hunk'>@@ -1392,11 +1491,6 @@ static void l2cap_send_disconn_req(struct l2cap_chan *chan, int err)</div><div class='ctx'> 		__clear_ack_timer(chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;scid == L2CAP_CID_A2MP) {</div><div class='del'>-		l2cap_state_change(chan, BT_DISCONN);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	req.dcid = cpu_to_le16(chan-&gt;dcid);</div><div class='ctx'> 	req.scid = cpu_to_le16(chan-&gt;scid);</div><div class='ctx'> 	l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_DISCONN_REQ,</div><div class='hunk'>@@ -1412,8 +1506,6 @@ static void l2cap_conn_start(struct l2cap_conn *conn)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("conn %p", conn);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(chan, tmp, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='hunk'>@@ -1438,7 +1530,10 @@ static void l2cap_conn_start(struct l2cap_conn *conn)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			l2cap_start_connection(chan);</div><div class='add'>+			if (l2cap_check_enc_key_size(conn-&gt;hcon, chan))</div><div class='add'>+				l2cap_start_connection(chan);</div><div class='add'>+			else</div><div class='add'>+				l2cap_chan_close(chan, ECONNREFUSED);</div><div class='ctx'> </div><div class='ctx'> 		} else if (chan-&gt;state == BT_CONNECT2) {</div><div class='ctx'> 			struct l2cap_conn_rsp rsp;</div><div class='hunk'>@@ -1479,8 +1574,6 @@ static void l2cap_conn_start(struct l2cap_conn *conn)</div><div class='ctx'> </div><div class='ctx'> 		l2cap_chan_unlock(chan);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_le_conn_ready(struct l2cap_conn *conn)</div><div class='hunk'>@@ -1496,8 +1589,8 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)</div><div class='ctx'> 	if (hcon-&gt;out)</div><div class='ctx'> 		smp_conn_security(hcon, hcon-&gt;pending_sec_level);</div><div class='ctx'> </div><div class='del'>-	/* For LE slave connections, make sure the connection interval</div><div class='del'>-	 * is in the range of the minium and maximum interval that has</div><div class='add'>+	/* For LE peripheral connections, make sure the connection interval</div><div class='add'>+	 * is in the range of the minimum and maximum interval that has</div><div class='ctx'> 	 * been configured for this connection. If not, then trigger</div><div class='ctx'> 	 * the connection update procedure.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1526,17 +1619,12 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)</div><div class='ctx'> 	if (hcon-&gt;type == ACL_LINK)</div><div class='ctx'> 		l2cap_request_info(conn);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> </div><div class='ctx'> 		l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='del'>-		if (chan-&gt;scid == L2CAP_CID_A2MP) {</div><div class='del'>-			l2cap_chan_unlock(chan);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (hcon-&gt;type == LE_LINK) {</div><div class='ctx'> 			l2cap_le_start(chan);</div><div class='ctx'> 		} else if (chan-&gt;chan_type != L2CAP_CHAN_CONN_ORIENTED) {</div><div class='hunk'>@@ -1549,7 +1637,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)</div><div class='ctx'> 		l2cap_chan_unlock(chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (hcon-&gt;type == LE_LINK)</div><div class='ctx'> 		l2cap_le_conn_ready(conn);</div><div class='hunk'>@@ -1564,14 +1652,10 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("conn %p", conn);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		if (test_bit(FLAG_FORCE_RELIABLE, &amp;chan-&gt;flags))</div><div class='ctx'> 			l2cap_chan_set_err(chan, err);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_info_timeout(struct work_struct *work)</div><div class='hunk'>@@ -1582,7 +1666,9 @@ static void l2cap_info_timeout(struct work_struct *work)</div><div class='ctx'> 	conn-&gt;info_state |= L2CAP_INFO_FEAT_MASK_REQ_DONE;</div><div class='ctx'> 	conn-&gt;info_ident = 0;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> 	l2cap_conn_start(conn);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1674,6 +1760,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	kfree_skb(conn-&gt;rx_skb);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_purge(&amp;conn-&gt;pending_rx);</div><div class='hunk'>@@ -1685,16 +1773,13 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)</div><div class='ctx'> 	if (work_pending(&amp;conn-&gt;pending_rx_work))</div><div class='ctx'> 		cancel_work_sync(&amp;conn-&gt;pending_rx_work);</div><div class='ctx'> </div><div class='del'>-	if (work_pending(&amp;conn-&gt;id_addr_update_work))</div><div class='del'>-		cancel_work_sync(&amp;conn-&gt;id_addr_update_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;conn-&gt;id_addr_timer);</div><div class='ctx'> </div><div class='ctx'> 	l2cap_unregister_all_users(conn);</div><div class='ctx'> </div><div class='ctx'> 	/* Force the connection to be immediately dropped */</div><div class='ctx'> 	hcon-&gt;disc_timeout = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	/* Kill channels */</div><div class='ctx'> 	list_for_each_entry_safe(chan, l, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		l2cap_chan_hold(chan);</div><div class='hunk'>@@ -1702,21 +1787,20 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)</div><div class='ctx'> </div><div class='ctx'> 		l2cap_chan_del(chan, err);</div><div class='ctx'> </div><div class='del'>-		l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='ctx'> 		chan-&gt;ops-&gt;close(chan);</div><div class='add'>+</div><div class='add'>+		l2cap_chan_unlock(chan);</div><div class='ctx'> 		l2cap_chan_put(chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='del'>-	hci_chan_del(conn-&gt;hchan);</div><div class='del'>-</div><div class='ctx'> 	if (conn-&gt;info_state &amp; L2CAP_INFO_FEAT_MASK_REQ_SENT)</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;conn-&gt;info_timer);</div><div class='ctx'> </div><div class='del'>-	hcon-&gt;l2cap_data = NULL;</div><div class='add'>+	hci_chan_del(conn-&gt;hchan);</div><div class='ctx'> 	conn-&gt;hchan = NULL;</div><div class='add'>+</div><div class='add'>+	hcon-&gt;l2cap_data = NULL;</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> 	l2cap_conn_put(conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1751,11 +1835,11 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,</div><div class='ctx'> 						   bdaddr_t *dst,</div><div class='ctx'> 						   u8 link_type)</div><div class='ctx'> {</div><div class='del'>-	struct l2cap_chan *c, *c1 = NULL;</div><div class='add'>+	struct l2cap_chan *c, *tmp, *c1 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;chan_list_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(c, &amp;chan_list, global_l) {</div><div class='add'>+	list_for_each_entry_safe(c, tmp, &amp;chan_list, global_l) {</div><div class='ctx'> 		if (state &amp;&amp; c-&gt;state != state)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1765,7 +1849,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,</div><div class='ctx'> 		if (link_type == LE_LINK &amp;&amp; c-&gt;src_type == BDADDR_BREDR)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (c-&gt;psm == psm) {</div><div class='add'>+		if (c-&gt;chan_type != L2CAP_CHAN_FIXED &amp;&amp; c-&gt;psm == psm) {</div><div class='ctx'> 			int src_match, dst_match;</div><div class='ctx'> 			int src_any, dst_any;</div><div class='ctx'> </div><div class='hunk'>@@ -1773,7 +1857,9 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,</div><div class='ctx'> 			src_match = !bacmp(&amp;c-&gt;src, src);</div><div class='ctx'> 			dst_match = !bacmp(&amp;c-&gt;dst, dst);</div><div class='ctx'> 			if (src_match &amp;&amp; dst_match) {</div><div class='del'>-				l2cap_chan_hold(c);</div><div class='add'>+				if (!l2cap_chan_hold_unless_zero(c))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='ctx'> 				read_unlock(&amp;chan_list_lock);</div><div class='ctx'> 				return c;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1788,7 +1874,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (c1)</div><div class='del'>-		l2cap_chan_hold(c1);</div><div class='add'>+		c1 = l2cap_chan_hold_unless_zero(c1);</div><div class='ctx'> </div><div class='ctx'> 	read_unlock(&amp;chan_list_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1844,9 +1930,6 @@ static void l2cap_streaming_send(struct l2cap_chan *chan,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p, skbs %p", chan, skbs);</div><div class='ctx'> </div><div class='del'>-	if (__chan_is_moving(chan))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	skb_queue_splice_tail_init(skbs, &amp;chan-&gt;tx_q);</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;chan-&gt;tx_q)) {</div><div class='hunk'>@@ -1889,9 +1972,6 @@ static int l2cap_ertm_send(struct l2cap_chan *chan)</div><div class='ctx'> 	if (test_bit(CONN_REMOTE_BUSY, &amp;chan-&gt;conn_state))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (__chan_is_moving(chan))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	while (chan-&gt;tx_send_head &amp;&amp;</div><div class='ctx'> 	       chan-&gt;unacked_frames &lt; chan-&gt;remote_tx_win &amp;&amp;</div><div class='ctx'> 	       chan-&gt;tx_state == L2CAP_TX_STATE_XMIT) {</div><div class='hunk'>@@ -1957,9 +2037,6 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan)</div><div class='ctx'> 	if (test_bit(CONN_REMOTE_BUSY, &amp;chan-&gt;conn_state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (__chan_is_moving(chan))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	while (chan-&gt;retrans_list.head != L2CAP_SEQ_LIST_CLEAR) {</div><div class='ctx'> 		seq = l2cap_seq_list_pop(&amp;chan-&gt;retrans_list);</div><div class='ctx'> </div><div class='hunk'>@@ -2299,8 +2376,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,</div><div class='ctx'> 	pdu_len = chan-&gt;conn-&gt;mtu;</div><div class='ctx'> </div><div class='ctx'> 	/* Constrain PDU size for BR/EDR connections */</div><div class='del'>-	if (!chan-&gt;hs_hcon)</div><div class='del'>-		pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);</div><div class='add'>+	pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust for largest possible L2CAP overhead. */</div><div class='ctx'> 	if (chan-&gt;fcs)</div><div class='hunk'>@@ -2441,7 +2517,33 @@ static void l2cap_le_flowctl_send(struct l2cap_chan *chan)</div><div class='ctx'> 	       skb_queue_len(&amp;chan-&gt;tx_q));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='add'>+static void l2cap_tx_timestamp(struct sk_buff *skb,</div><div class='add'>+			       const struct sockcm_cookie *sockc,</div><div class='add'>+			       size_t len)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = skb ? skb-&gt;sk : NULL;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+		hci_setup_tx_timestamp(skb, len, sockc);</div><div class='add'>+	else</div><div class='add'>+		hci_setup_tx_timestamp(skb, 1, sockc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2cap_tx_timestamp_seg(struct sk_buff_head *queue,</div><div class='add'>+				   const struct sockcm_cookie *sockc,</div><div class='add'>+				   size_t len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = skb_peek(queue);</div><div class='add'>+	struct sock *sk = skb ? skb-&gt;sk : NULL;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+		l2cap_tx_timestamp(skb_peek_tail(queue), sockc, len);</div><div class='add'>+	else</div><div class='add'>+		l2cap_tx_timestamp(skb, sockc, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,</div><div class='add'>+		    const struct sockcm_cookie *sockc)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2456,13 +2558,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='ctx'> 		if (IS_ERR(skb))</div><div class='ctx'> 			return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-		/* Channel lock is released before requesting new skb and then</div><div class='del'>-		 * reacquired thus we need to recheck channel state.</div><div class='del'>-		 */</div><div class='del'>-		if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENOTCONN;</div><div class='del'>-		}</div><div class='add'>+		l2cap_tx_timestamp(skb, sockc, len);</div><div class='ctx'> </div><div class='ctx'> 		l2cap_do_send(chan, skb);</div><div class='ctx'> 		return len;</div><div class='hunk'>@@ -2470,6 +2566,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	switch (chan-&gt;mode) {</div><div class='ctx'> 	case L2CAP_MODE_LE_FLOWCTL:</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='ctx'> 		/* Check outgoing MTU */</div><div class='ctx'> 		if (len &gt; chan-&gt;omtu)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='hunk'>@@ -2486,6 +2583,8 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='add'>+		l2cap_tx_timestamp_seg(&amp;seg_queue, sockc, len);</div><div class='add'>+</div><div class='ctx'> 		skb_queue_splice_tail_init(&amp;seg_queue, &amp;chan-&gt;tx_q);</div><div class='ctx'> </div><div class='ctx'> 		l2cap_le_flowctl_send(chan);</div><div class='hunk'>@@ -2507,13 +2606,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='ctx'> 		if (IS_ERR(skb))</div><div class='ctx'> 			return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-		/* Channel lock is released before requesting new skb and then</div><div class='del'>-		 * reacquired thus we need to recheck channel state.</div><div class='del'>-		 */</div><div class='del'>-		if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENOTCONN;</div><div class='del'>-		}</div><div class='add'>+		l2cap_tx_timestamp(skb, sockc, len);</div><div class='ctx'> </div><div class='ctx'> 		l2cap_do_send(chan, skb);</div><div class='ctx'> 		err = len;</div><div class='hunk'>@@ -2535,21 +2628,16 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = l2cap_segment_sdu(chan, &amp;seg_queue, msg, len);</div><div class='ctx'> </div><div class='del'>-		/* The channel could have been closed while segmenting,</div><div class='del'>-		 * check that it is still connected.</div><div class='del'>-		 */</div><div class='del'>-		if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-			__skb_queue_purge(&amp;seg_queue);</div><div class='del'>-			err = -ENOTCONN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (chan-&gt;mode == L2CAP_MODE_ERTM)</div><div class='add'>+		if (chan-&gt;mode == L2CAP_MODE_ERTM) {</div><div class='add'>+			/* TODO: ERTM mode timestamping */</div><div class='ctx'> 			l2cap_tx(chan, NULL, &amp;seg_queue, L2CAP_EV_DATA_REQUEST);</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='add'>+			l2cap_tx_timestamp_seg(&amp;seg_queue, sockc, len);</div><div class='ctx'> 			l2cap_streaming_send(chan, &amp;seg_queue);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		err = len;</div><div class='ctx'> </div><div class='hunk'>@@ -2795,8 +2883,7 @@ static void l2cap_tx_state_wait_f(struct l2cap_chan *chan,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case L2CAP_EV_RECV_REQSEQ_AND_FBIT:</div><div class='ctx'> 		l2cap_process_reqseq(chan, control-&gt;reqseq);</div><div class='del'>-</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case L2CAP_EV_RECV_FBIT:</div><div class='ctx'> 		if (control &amp;&amp; control-&gt;final) {</div><div class='hunk'>@@ -2866,8 +2953,6 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("conn %p", conn);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		if (chan-&gt;chan_type != L2CAP_CHAN_RAW)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2882,8 +2967,6 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 		if (chan-&gt;ops-&gt;recv(chan, nskb))</div><div class='ctx'> 			kfree_skb(nskb);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---- L2CAP signalling commands ---- */</div><div class='hunk'>@@ -3088,21 +3171,12 @@ int l2cap_ertm_init(struct l2cap_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;chan-&gt;tx_q);</div><div class='ctx'> </div><div class='del'>-	chan-&gt;local_amp_id = AMP_ID_BREDR;</div><div class='del'>-	chan-&gt;move_id = AMP_ID_BREDR;</div><div class='del'>-	chan-&gt;move_state = L2CAP_MOVE_STABLE;</div><div class='del'>-	chan-&gt;move_role = L2CAP_MOVE_ROLE_NONE;</div><div class='del'>-</div><div class='ctx'> 	if (chan-&gt;mode != L2CAP_MODE_ERTM)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;rx_state = L2CAP_RX_STATE_RECV;</div><div class='ctx'> 	chan-&gt;tx_state = L2CAP_TX_STATE_XMIT;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;chan-&gt;retrans_timer, l2cap_retrans_timeout);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;chan-&gt;monitor_timer, l2cap_monitor_timeout);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;chan-&gt;ack_timer, l2cap_ack_timeout);</div><div class='del'>-</div><div class='ctx'> 	skb_queue_head_init(&amp;chan-&gt;srej_q);</div><div class='ctx'> </div><div class='ctx'> 	err = l2cap_seq_list_init(&amp;chan-&gt;srej_list, chan-&gt;tx_win);</div><div class='hunk'>@@ -3123,7 +3197,7 @@ static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)</div><div class='ctx'> 	case L2CAP_MODE_ERTM:</div><div class='ctx'> 		if (l2cap_mode_supported(mode, remote_feat_mask))</div><div class='ctx'> 			return mode;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return L2CAP_MODE_BASIC;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3131,52 +3205,19 @@ static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)</div><div class='ctx'> </div><div class='ctx'> static inline bool __l2cap_ews_supported(struct l2cap_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	return ((conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP) &amp;&amp;</div><div class='del'>-		(conn-&gt;feat_mask &amp; L2CAP_FEAT_EXT_WINDOW));</div><div class='add'>+	return (conn-&gt;feat_mask &amp; L2CAP_FEAT_EXT_WINDOW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool __l2cap_efs_supported(struct l2cap_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	return ((conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP) &amp;&amp;</div><div class='del'>-		(conn-&gt;feat_mask &amp; L2CAP_FEAT_EXT_FLOW));</div><div class='add'>+	return (conn-&gt;feat_mask &amp; L2CAP_FEAT_EXT_FLOW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __l2cap_set_ertm_timeouts(struct l2cap_chan *chan,</div><div class='ctx'> 				      struct l2cap_conf_rfc *rfc)</div><div class='ctx'> {</div><div class='del'>-	if (chan-&gt;local_amp_id != AMP_ID_BREDR &amp;&amp; chan-&gt;hs_hcon) {</div><div class='del'>-		u64 ertm_to = chan-&gt;hs_hcon-&gt;hdev-&gt;amp_be_flush_to;</div><div class='del'>-</div><div class='del'>-		/* Class 1 devices have must have ERTM timeouts</div><div class='del'>-		 * exceeding the Link Supervision Timeout.  The</div><div class='del'>-		 * default Link Supervision Timeout for AMP</div><div class='del'>-		 * controllers is 10 seconds.</div><div class='del'>-		 *</div><div class='del'>-		 * Class 1 devices use 0xffffffff for their</div><div class='del'>-		 * best-effort flush timeout, so the clamping logic</div><div class='del'>-		 * will result in a timeout that meets the above</div><div class='del'>-		 * requirement.  ERTM timeouts are 16-bit values, so</div><div class='del'>-		 * the maximum timeout is 65.535 seconds.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* Convert timeout to milliseconds and round */</div><div class='del'>-		ertm_to = DIV_ROUND_UP_ULL(ertm_to, 1000);</div><div class='del'>-</div><div class='del'>-		/* This is the recommended formula for class 2 devices</div><div class='del'>-		 * that start ERTM timers when packets are sent to the</div><div class='del'>-		 * controller.</div><div class='del'>-		 */</div><div class='del'>-		ertm_to = 3 * ertm_to + 500;</div><div class='del'>-</div><div class='del'>-		if (ertm_to &gt; 0xffff)</div><div class='del'>-			ertm_to = 0xffff;</div><div class='del'>-</div><div class='del'>-		rfc-&gt;retrans_timeout = cpu_to_le16((u16) ertm_to);</div><div class='del'>-		rfc-&gt;monitor_timeout = rfc-&gt;retrans_timeout;</div><div class='del'>-	} else {</div><div class='del'>-		rfc-&gt;retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);</div><div class='del'>-		rfc-&gt;monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);</div><div class='del'>-	}</div><div class='add'>+	rfc-&gt;retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);</div><div class='add'>+	rfc-&gt;monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void l2cap_txwin_setup(struct l2cap_chan *chan)</div><div class='hunk'>@@ -3194,6 +3235,49 @@ static inline void l2cap_txwin_setup(struct l2cap_chan *chan)</div><div class='ctx'> 	chan-&gt;ack_win = chan-&gt;tx_win;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_mtu_auto(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn = chan-&gt;conn-&gt;hcon;</div><div class='add'>+</div><div class='add'>+	chan-&gt;imtu = L2CAP_DEFAULT_MIN_MTU;</div><div class='add'>+</div><div class='add'>+	/* The 2-DH1 packet has between 2 and 56 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_2DH1))</div><div class='add'>+		chan-&gt;imtu = 54;</div><div class='add'>+</div><div class='add'>+	/* The 3-DH1 packet has between 2 and 85 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_3DH1))</div><div class='add'>+		chan-&gt;imtu = 83;</div><div class='add'>+</div><div class='add'>+	/* The 2-DH3 packet has between 2 and 369 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_2DH3))</div><div class='add'>+		chan-&gt;imtu = 367;</div><div class='add'>+</div><div class='add'>+	/* The 3-DH3 packet has between 2 and 554 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_3DH3))</div><div class='add'>+		chan-&gt;imtu = 552;</div><div class='add'>+</div><div class='add'>+	/* The 2-DH5 packet has between 2 and 681 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_2DH5))</div><div class='add'>+		chan-&gt;imtu = 679;</div><div class='add'>+</div><div class='add'>+	/* The 3-DH5 packet has between 2 and 1023 information bytes</div><div class='add'>+	 * (including the 2-byte payload header)</div><div class='add'>+	 */</div><div class='add'>+	if (!(conn-&gt;pkt_type &amp; HCI_3DH5))</div><div class='add'>+		chan-&gt;imtu = 1021;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conf_req *req = data;</div><div class='hunk'>@@ -3216,15 +3300,19 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data</div><div class='ctx'> 		if (__l2cap_efs_supported(chan-&gt;conn))</div><div class='ctx'> 			set_bit(FLAG_EFS_ENABLE, &amp;chan-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		chan-&gt;mode = l2cap_select_mode(rfc.mode, chan-&gt;conn-&gt;feat_mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	if (chan-&gt;imtu != L2CAP_DEFAULT_MTU)</div><div class='del'>-		l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_MTU, 2, chan-&gt;imtu, endptr - ptr);</div><div class='add'>+	if (chan-&gt;imtu != L2CAP_DEFAULT_MTU) {</div><div class='add'>+		if (!chan-&gt;imtu)</div><div class='add'>+			l2cap_mtu_auto(chan);</div><div class='add'>+		l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_MTU, 2, chan-&gt;imtu,</div><div class='add'>+				   endptr - ptr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (chan-&gt;mode) {</div><div class='ctx'> 	case L2CAP_MODE_BASIC:</div><div class='hunk'>@@ -3328,7 +3416,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data</div><div class='ctx'> 	struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };</div><div class='ctx'> 	struct l2cap_conf_efs efs;</div><div class='ctx'> 	u8 remote_efs = 0;</div><div class='del'>-	u16 mtu = L2CAP_DEFAULT_MTU;</div><div class='add'>+	u16 mtu = 0;</div><div class='ctx'> 	u16 result = L2CAP_CONF_SUCCESS;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> </div><div class='hunk'>@@ -3336,16 +3424,22 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= L2CAP_CONF_OPT_SIZE) {</div><div class='ctx'> 		len -= l2cap_get_conf_opt(&amp;req, &amp;type, &amp;olen, &amp;val);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		hint  = type &amp; L2CAP_CONF_HINT;</div><div class='ctx'> 		type &amp;= L2CAP_CONF_MASK;</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case L2CAP_CONF_MTU:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			mtu = val;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_FLUSH_TO:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			chan-&gt;flush_to = val;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -3353,38 +3447,35 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_RFC:</div><div class='del'>-			if (olen == sizeof(rfc))</div><div class='del'>-				memcpy(&amp;rfc, (void *) val, olen);</div><div class='add'>+			if (olen != sizeof(rfc))</div><div class='add'>+				break;</div><div class='add'>+			memcpy(&amp;rfc, (void *) val, olen);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_FCS:</div><div class='add'>+			if (olen != 1)</div><div class='add'>+				break;</div><div class='ctx'> 			if (val == L2CAP_FCS_NONE)</div><div class='ctx'> 				set_bit(CONF_RECV_NO_FCS, &amp;chan-&gt;conf_state);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_EFS:</div><div class='del'>-			if (olen == sizeof(efs)) {</div><div class='del'>-				remote_efs = 1;</div><div class='del'>-				memcpy(&amp;efs, (void *) val, olen);</div><div class='del'>-			}</div><div class='add'>+			if (olen != sizeof(efs))</div><div class='add'>+				break;</div><div class='add'>+			remote_efs = 1;</div><div class='add'>+			memcpy(&amp;efs, (void *) val, olen);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_EWS:</div><div class='del'>-			if (!(chan-&gt;conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP))</div><div class='del'>-				return -ECONNREFUSED;</div><div class='del'>-</div><div class='del'>-			set_bit(FLAG_EXT_CTRL, &amp;chan-&gt;flags);</div><div class='del'>-			set_bit(CONF_EWS_RECV, &amp;chan-&gt;conf_state);</div><div class='del'>-			chan-&gt;tx_win_max = L2CAP_DEFAULT_EXT_WINDOW;</div><div class='del'>-			chan-&gt;remote_tx_win = val;</div><div class='del'>-			break;</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='add'>+			return -ECONNREFUSED;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			if (hint)</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='ctx'> 			result = L2CAP_CONF_UNKNOWN;</div><div class='del'>-			*((u8 *) ptr++) = type;</div><div class='add'>+			l2cap_add_conf_opt(&amp;ptr, (u8)type, sizeof(u8), type, endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3430,6 +3521,29 @@ done:</div><div class='ctx'> 		/* Configure output options and let the other side know</div><div class='ctx'> 		 * which ones we don't like. */</div><div class='ctx'> </div><div class='add'>+		/* If MTU is not provided in configure request, try adjusting it</div><div class='add'>+		 * to the current output MTU if it has been set</div><div class='add'>+		 *</div><div class='add'>+		 * Bluetooth Core 6.1, Vol 3, Part A, Section 4.5</div><div class='add'>+		 *</div><div class='add'>+		 * Each configuration parameter value (if any is present) in an</div><div class='add'>+		 * L2CAP_CONFIGURATION_RSP packet reflects an ‘adjustment’ to a</div><div class='add'>+		 * configuration parameter value that has been sent (or, in case</div><div class='add'>+		 * of default values, implied) in the corresponding</div><div class='add'>+		 * L2CAP_CONFIGURATION_REQ packet.</div><div class='add'>+		 */</div><div class='add'>+		if (!mtu) {</div><div class='add'>+			/* Only adjust for ERTM channels as for older modes the</div><div class='add'>+			 * remote stack may not be able to detect that the</div><div class='add'>+			 * adjustment causing it to silently drop packets.</div><div class='add'>+			 */</div><div class='add'>+			if (chan-&gt;mode == L2CAP_MODE_ERTM &amp;&amp;</div><div class='add'>+			    chan-&gt;omtu &amp;&amp; chan-&gt;omtu != L2CAP_DEFAULT_MTU)</div><div class='add'>+				mtu = chan-&gt;omtu;</div><div class='add'>+			else</div><div class='add'>+				mtu = L2CAP_DEFAULT_MTU;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (mtu &lt; L2CAP_DEFAULT_MIN_MTU)</div><div class='ctx'> 			result = L2CAP_CONF_UNACCEPT;</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -3485,7 +3599,8 @@ done:</div><div class='ctx'> 			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_RFC,</div><div class='ctx'> 					   sizeof(rfc), (unsigned long) &amp;rfc, endptr - ptr);</div><div class='ctx'> </div><div class='del'>-			if (test_bit(FLAG_EFS_ENABLE, &amp;chan-&gt;flags)) {</div><div class='add'>+			if (remote_efs &amp;&amp;</div><div class='add'>+			    test_bit(FLAG_EFS_ENABLE, &amp;chan-&gt;flags)) {</div><div class='ctx'> 				chan-&gt;remote_id = efs.id;</div><div class='ctx'> 				chan-&gt;remote_stype = efs.stype;</div><div class='ctx'> 				chan-&gt;remote_msdu = le16_to_cpu(efs.msdu);</div><div class='hunk'>@@ -3547,58 +3662,65 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= L2CAP_CONF_OPT_SIZE) {</div><div class='ctx'> 		len -= l2cap_get_conf_opt(&amp;rsp, &amp;type, &amp;olen, &amp;val);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case L2CAP_CONF_MTU:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			if (val &lt; L2CAP_DEFAULT_MIN_MTU) {</div><div class='ctx'> 				*result = L2CAP_CONF_UNACCEPT;</div><div class='ctx'> 				chan-&gt;imtu = L2CAP_DEFAULT_MIN_MTU;</div><div class='ctx'> 			} else</div><div class='ctx'> 				chan-&gt;imtu = val;</div><div class='del'>-			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_MTU, 2, chan-&gt;imtu, endptr - ptr);</div><div class='add'>+			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_MTU, 2, chan-&gt;imtu,</div><div class='add'>+					   endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_FLUSH_TO:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			chan-&gt;flush_to = val;</div><div class='del'>-			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_FLUSH_TO,</div><div class='del'>-					   2, chan-&gt;flush_to, endptr - ptr);</div><div class='add'>+			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_FLUSH_TO, 2,</div><div class='add'>+					   chan-&gt;flush_to, endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_RFC:</div><div class='del'>-			if (olen == sizeof(rfc))</div><div class='del'>-				memcpy(&amp;rfc, (void *)val, olen);</div><div class='del'>-</div><div class='add'>+			if (olen != sizeof(rfc))</div><div class='add'>+				break;</div><div class='add'>+			memcpy(&amp;rfc, (void *)val, olen);</div><div class='ctx'> 			if (test_bit(CONF_STATE2_DEVICE, &amp;chan-&gt;conf_state) &amp;&amp;</div><div class='ctx'> 			    rfc.mode != chan-&gt;mode)</div><div class='ctx'> 				return -ECONNREFUSED;</div><div class='del'>-</div><div class='ctx'> 			chan-&gt;fcs = 0;</div><div class='del'>-</div><div class='del'>-			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_RFC,</div><div class='del'>-					   sizeof(rfc), (unsigned long) &amp;rfc, endptr - ptr);</div><div class='add'>+			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_RFC, sizeof(rfc),</div><div class='add'>+					   (unsigned long) &amp;rfc, endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_EWS:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			chan-&gt;ack_win = min_t(u16, val, chan-&gt;ack_win);</div><div class='ctx'> 			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_EWS, 2,</div><div class='ctx'> 					   chan-&gt;tx_win, endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_EFS:</div><div class='del'>-			if (olen == sizeof(efs)) {</div><div class='del'>-				memcpy(&amp;efs, (void *)val, olen);</div><div class='del'>-</div><div class='del'>-				if (chan-&gt;local_stype != L2CAP_SERV_NOTRAFIC &amp;&amp;</div><div class='del'>-				    efs.stype != L2CAP_SERV_NOTRAFIC &amp;&amp;</div><div class='del'>-				    efs.stype != chan-&gt;local_stype)</div><div class='del'>-					return -ECONNREFUSED;</div><div class='del'>-</div><div class='del'>-				l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_EFS, sizeof(efs),</div><div class='del'>-						   (unsigned long) &amp;efs, endptr - ptr);</div><div class='del'>-			}</div><div class='add'>+			if (olen != sizeof(efs))</div><div class='add'>+				break;</div><div class='add'>+			memcpy(&amp;efs, (void *)val, olen);</div><div class='add'>+			if (chan-&gt;local_stype != L2CAP_SERV_NOTRAFIC &amp;&amp;</div><div class='add'>+			    efs.stype != L2CAP_SERV_NOTRAFIC &amp;&amp;</div><div class='add'>+			    efs.stype != chan-&gt;local_stype)</div><div class='add'>+				return -ECONNREFUSED;</div><div class='add'>+			l2cap_add_conf_opt(&amp;ptr, L2CAP_CONF_EFS, sizeof(efs),</div><div class='add'>+					   (unsigned long) &amp;efs, endptr - ptr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case L2CAP_CONF_FCS:</div><div class='add'>+			if (olen != 1)</div><div class='add'>+				break;</div><div class='ctx'> 			if (*result == L2CAP_CONF_PENDING)</div><div class='ctx'> 				if (val == L2CAP_FCS_NONE)</div><div class='ctx'> 					set_bit(CONF_RECV_NO_FCS,</div><div class='hunk'>@@ -3669,12 +3791,100 @@ void __l2cap_le_connect_rsp_defer(struct l2cap_chan *chan)</div><div class='ctx'> 	rsp.mtu     = cpu_to_le16(chan-&gt;imtu);</div><div class='ctx'> 	rsp.mps     = cpu_to_le16(chan-&gt;mps);</div><div class='ctx'> 	rsp.credits = cpu_to_le16(chan-&gt;rx_credits);</div><div class='del'>-	rsp.result  = cpu_to_le16(L2CAP_CR_SUCCESS);</div><div class='add'>+	rsp.result  = cpu_to_le16(L2CAP_CR_LE_SUCCESS);</div><div class='ctx'> </div><div class='ctx'> 	l2cap_send_cmd(conn, chan-&gt;ident, L2CAP_LE_CONN_RSP, sizeof(rsp),</div><div class='ctx'> 		       &amp;rsp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_ecred_list_defer(struct l2cap_chan *chan, void *data)</div><div class='add'>+{</div><div class='add'>+	int *result = data;</div><div class='add'>+</div><div class='add'>+	if (*result || test_bit(FLAG_ECRED_CONN_REQ_SENT, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;state) {</div><div class='add'>+	case BT_CONNECT2:</div><div class='add'>+		/* If channel still pending accept add to result */</div><div class='add'>+		(*result)++;</div><div class='add'>+		return;</div><div class='add'>+	case BT_CONNECTED:</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		/* If not connected or pending accept it has been refused */</div><div class='add'>+		*result = -ECONNREFUSED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct l2cap_ecred_rsp_data {</div><div class='add'>+	struct {</div><div class='add'>+		struct l2cap_ecred_conn_rsp_hdr rsp;</div><div class='add'>+		__le16 scid[L2CAP_ECRED_MAX_CID];</div><div class='add'>+	} __packed pdu;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void l2cap_ecred_rsp_defer(struct l2cap_chan *chan, void *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_ecred_rsp_data *rsp = data;</div><div class='add'>+	struct l2cap_ecred_conn_rsp *rsp_flex =</div><div class='add'>+		container_of(&amp;rsp-&gt;pdu.rsp, struct l2cap_ecred_conn_rsp, hdr);</div><div class='add'>+</div><div class='add'>+	/* Check if channel for outgoing connection or if it wasn't deferred</div><div class='add'>+	 * since in those cases it must be skipped.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(FLAG_ECRED_CONN_REQ_SENT, &amp;chan-&gt;flags) ||</div><div class='add'>+	    !test_and_clear_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Reset ident so only one response is sent */</div><div class='add'>+	chan-&gt;ident = 0;</div><div class='add'>+</div><div class='add'>+	/* Include all channels pending with the same ident */</div><div class='add'>+	if (!rsp-&gt;pdu.rsp.result)</div><div class='add'>+		rsp_flex-&gt;dcid[rsp-&gt;count++] = cpu_to_le16(chan-&gt;scid);</div><div class='add'>+	else</div><div class='add'>+		l2cap_chan_del(chan, ECONNRESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __l2cap_ecred_conn_rsp_defer(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='add'>+	struct l2cap_ecred_rsp_data data;</div><div class='add'>+	u16 id = chan-&gt;ident;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	if (!id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("chan %p id %d", chan, id);</div><div class='add'>+</div><div class='add'>+	memset(&amp;data, 0, sizeof(data));</div><div class='add'>+</div><div class='add'>+	data.pdu.rsp.mtu     = cpu_to_le16(chan-&gt;imtu);</div><div class='add'>+	data.pdu.rsp.mps     = cpu_to_le16(chan-&gt;mps);</div><div class='add'>+	data.pdu.rsp.credits = cpu_to_le16(chan-&gt;rx_credits);</div><div class='add'>+	data.pdu.rsp.result  = cpu_to_le16(L2CAP_CR_LE_SUCCESS);</div><div class='add'>+</div><div class='add'>+	/* Verify that all channels are ready */</div><div class='add'>+	__l2cap_chan_list_id(conn, id, l2cap_ecred_list_defer, &amp;result);</div><div class='add'>+</div><div class='add'>+	if (result &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		data.pdu.rsp.result = cpu_to_le16(L2CAP_CR_LE_AUTHORIZATION);</div><div class='add'>+</div><div class='add'>+	/* Build response */</div><div class='add'>+	__l2cap_chan_list_id(conn, id, l2cap_ecred_rsp_defer, &amp;data);</div><div class='add'>+</div><div class='add'>+	l2cap_send_cmd(conn, id, L2CAP_ECRED_CONN_RSP,</div><div class='add'>+		       sizeof(data.pdu.rsp) + (data.count * sizeof(__le16)),</div><div class='add'>+		       &amp;data.pdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __l2cap_connect_rsp_defer(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn_rsp rsp;</div><div class='hunk'>@@ -3686,11 +3896,7 @@ void __l2cap_connect_rsp_defer(struct l2cap_chan *chan)</div><div class='ctx'> 	rsp.dcid   = cpu_to_le16(chan-&gt;scid);</div><div class='ctx'> 	rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);</div><div class='ctx'> 	rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;hs_hcon)</div><div class='del'>-		rsp_code = L2CAP_CREATE_CHAN_RSP;</div><div class='del'>-	else</div><div class='del'>-		rsp_code = L2CAP_CONN_RSP;</div><div class='add'>+	rsp_code = L2CAP_CONN_RSP;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p rsp_code %u", chan, rsp_code);</div><div class='ctx'> </div><div class='hunk'>@@ -3727,13 +3933,18 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= L2CAP_CONF_OPT_SIZE) {</div><div class='ctx'> 		len -= l2cap_get_conf_opt(&amp;rsp, &amp;type, &amp;olen, &amp;val);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case L2CAP_CONF_RFC:</div><div class='del'>-			if (olen == sizeof(rfc))</div><div class='del'>-				memcpy(&amp;rfc, (void *)val, olen);</div><div class='add'>+			if (olen != sizeof(rfc))</div><div class='add'>+				break;</div><div class='add'>+			memcpy(&amp;rfc, (void *)val, olen);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case L2CAP_CONF_EWS:</div><div class='add'>+			if (olen != 2)</div><div class='add'>+				break;</div><div class='ctx'> 			txwin_ext = val;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3780,13 +3991,12 @@ static inline int l2cap_command_rej(struct l2cap_conn *conn,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='del'>-					struct l2cap_cmd_hdr *cmd,</div><div class='del'>-					u8 *data, u8 rsp_code, u8 amp_id)</div><div class='add'>+static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,</div><div class='add'>+			  u8 *data, u8 rsp_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;</div><div class='ctx'> 	struct l2cap_conn_rsp rsp;</div><div class='del'>-	struct l2cap_chan *chan = NULL, *pchan;</div><div class='add'>+	struct l2cap_chan *chan = NULL, *pchan = NULL;</div><div class='ctx'> 	int result, status = L2CAP_CS_NO_INFO;</div><div class='ctx'> </div><div class='ctx'> 	u16 dcid = 0, scid = __le16_to_cpu(req-&gt;scid);</div><div class='hunk'>@@ -3799,15 +4009,15 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='ctx'> 					 &amp;conn-&gt;hcon-&gt;dst, ACL_LINK);</div><div class='ctx'> 	if (!pchan) {</div><div class='ctx'> 		result = L2CAP_CR_BAD_PSM;</div><div class='del'>-		goto sendresp;</div><div class='add'>+		goto response;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	l2cap_chan_lock(pchan);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the ACL is secure enough (if not SDP) */</div><div class='ctx'> 	if (psm != cpu_to_le16(L2CAP_PSM_SDP) &amp;&amp;</div><div class='del'>-	    !hci_conn_check_link_mode(conn-&gt;hcon)) {</div><div class='add'>+	    (!hci_conn_check_link_mode(conn-&gt;hcon) ||</div><div class='add'>+	    !l2cap_check_enc_key_size(conn-&gt;hcon, pchan))) {</div><div class='ctx'> 		conn-&gt;disc_reason = HCI_ERROR_AUTH_FAILURE;</div><div class='ctx'> 		result = L2CAP_CR_SEC_BLOCK;</div><div class='ctx'> 		goto response;</div><div class='hunk'>@@ -3815,9 +4025,17 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	result = L2CAP_CR_NO_MEM;</div><div class='ctx'> </div><div class='add'>+	/* Check for valid dynamic CID range (as per Erratum 3253) */</div><div class='add'>+	if (scid &lt; L2CAP_CID_DYN_START || scid &gt; L2CAP_CID_DYN_END) {</div><div class='add'>+		result = L2CAP_CR_INVALID_SCID;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check if we already have channel with that dcid */</div><div class='del'>-	if (__l2cap_get_chan_by_dcid(conn, scid))</div><div class='add'>+	if (__l2cap_get_chan_by_dcid(conn, scid)) {</div><div class='add'>+		result = L2CAP_CR_SCID_IN_USE;</div><div class='ctx'> 		goto response;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	chan = pchan-&gt;ops-&gt;new_connection(pchan);</div><div class='ctx'> 	if (!chan)</div><div class='hunk'>@@ -3836,7 +4054,6 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='ctx'> 	chan-&gt;dst_type = bdaddr_dst_type(conn-&gt;hcon);</div><div class='ctx'> 	chan-&gt;psm  = psm;</div><div class='ctx'> 	chan-&gt;dcid = scid;</div><div class='del'>-	chan-&gt;local_amp_id = amp_id;</div><div class='ctx'> </div><div class='ctx'> 	__l2cap_chan_add(conn, chan);</div><div class='ctx'> </div><div class='hunk'>@@ -3854,17 +4071,8 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='ctx'> 				status = L2CAP_CS_AUTHOR_PEND;</div><div class='ctx'> 				chan-&gt;ops-&gt;defer(chan);</div><div class='ctx'> 			} else {</div><div class='del'>-				/* Force pending result for AMP controllers.</div><div class='del'>-				 * The connection will succeed after the</div><div class='del'>-				 * physical link is up.</div><div class='del'>-				 */</div><div class='del'>-				if (amp_id == AMP_ID_BREDR) {</div><div class='del'>-					l2cap_state_change(chan, BT_CONFIG);</div><div class='del'>-					result = L2CAP_CR_SUCCESS;</div><div class='del'>-				} else {</div><div class='del'>-					l2cap_state_change(chan, BT_CONNECT2);</div><div class='del'>-					result = L2CAP_CR_PEND;</div><div class='del'>-				}</div><div class='add'>+				l2cap_state_change(chan, BT_CONFIG);</div><div class='add'>+				result = L2CAP_CR_SUCCESS;</div><div class='ctx'> 				status = L2CAP_CS_NO_INFO;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -3879,17 +4087,15 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> response:</div><div class='del'>-	l2cap_chan_unlock(pchan);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='del'>-	l2cap_chan_put(pchan);</div><div class='del'>-</div><div class='del'>-sendresp:</div><div class='ctx'> 	rsp.scid   = cpu_to_le16(scid);</div><div class='ctx'> 	rsp.dcid   = cpu_to_le16(dcid);</div><div class='ctx'> 	rsp.result = cpu_to_le16(result);</div><div class='ctx'> 	rsp.status = cpu_to_le16(status);</div><div class='ctx'> 	l2cap_send_cmd(conn, cmd-&gt;ident, rsp_code, sizeof(rsp), &amp;rsp);</div><div class='ctx'> </div><div class='add'>+	if (!pchan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (result == L2CAP_CR_PEND &amp;&amp; status == L2CAP_CS_NO_INFO) {</div><div class='ctx'> 		struct l2cap_info_req info;</div><div class='ctx'> 		info.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);</div><div class='hunk'>@@ -3912,25 +4118,17 @@ sendresp:</div><div class='ctx'> 		chan-&gt;num_conf_req++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return chan;</div><div class='add'>+	l2cap_chan_unlock(pchan);</div><div class='add'>+	l2cap_chan_put(pchan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2cap_connect_req(struct l2cap_conn *conn,</div><div class='ctx'> 			     struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)</div><div class='ctx'> {</div><div class='del'>-	struct hci_dev *hdev = conn-&gt;hcon-&gt;hdev;</div><div class='del'>-	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='del'>-</div><div class='ctx'> 	if (cmd_len &lt; sizeof(struct l2cap_conn_req))</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_MGMT) &amp;&amp;</div><div class='del'>-	    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;hcon-&gt;flags))</div><div class='del'>-		mgmt_device_connected(hdev, hcon, 0, NULL, 0);</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-</div><div class='del'>-	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);</div><div class='add'>+	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3952,31 +4150,38 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 	result = __le16_to_cpu(rsp-&gt;result);</div><div class='ctx'> 	status = __le16_to_cpu(rsp-&gt;status);</div><div class='ctx'> </div><div class='add'>+	if (result == L2CAP_CR_SUCCESS &amp;&amp; (dcid &lt; L2CAP_CID_DYN_START ||</div><div class='add'>+					   dcid &gt; L2CAP_CID_DYN_END))</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("dcid 0x%4.4x scid 0x%4.4x result 0x%2.2x status 0x%2.2x",</div><div class='ctx'> 	       dcid, scid, result, status);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	if (scid) {</div><div class='ctx'> 		chan = __l2cap_get_chan_by_scid(conn, scid);</div><div class='del'>-		if (!chan) {</div><div class='del'>-			err = -EBADSLT;</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!chan)</div><div class='add'>+			return -EBADSLT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		chan = __l2cap_get_chan_by_ident(conn, cmd-&gt;ident);</div><div class='del'>-		if (!chan) {</div><div class='del'>-			err = -EBADSLT;</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!chan)</div><div class='add'>+			return -EBADSLT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	chan = l2cap_chan_hold_unless_zero(chan);</div><div class='add'>+	if (!chan)</div><div class='add'>+		return -EBADSLT;</div><div class='add'>+</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='ctx'> 	switch (result) {</div><div class='ctx'> 	case L2CAP_CR_SUCCESS:</div><div class='add'>+		if (__l2cap_get_chan_by_dcid(conn, dcid)) {</div><div class='add'>+			err = -EBADSLT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		l2cap_state_change(chan, BT_CONFIG);</div><div class='ctx'> 		chan-&gt;ident = 0;</div><div class='ctx'> 		chan-&gt;dcid = dcid;</div><div class='hunk'>@@ -4000,9 +4205,7 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -4070,7 +4273,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;state != BT_CONFIG &amp;&amp; chan-&gt;state != BT_CONNECT2) {</div><div class='add'>+	if (chan-&gt;state != BT_CONFIG &amp;&amp; chan-&gt;state != BT_CONNECT2 &amp;&amp;</div><div class='add'>+	    chan-&gt;state != BT_CONNECTED) {</div><div class='ctx'> 		cmd_reject_invalid_cid(conn, cmd-&gt;ident, chan-&gt;scid,</div><div class='ctx'> 				       chan-&gt;dcid);</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -4106,7 +4310,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;ident = cmd-&gt;ident;</div><div class='ctx'> 	l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_CONF_RSP, len, rsp);</div><div class='del'>-	chan-&gt;num_conf_rsp++;</div><div class='add'>+	if (chan-&gt;num_conf_rsp &lt; L2CAP_CONF_MAX_CONF_RSP)</div><div class='add'>+		chan-&gt;num_conf_rsp++;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset config buffer. */</div><div class='ctx'> 	chan-&gt;conf_len = 0;</div><div class='hunk'>@@ -4144,14 +4349,12 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,</div><div class='ctx'> 		/* check compatibility */</div><div class='ctx'> </div><div class='ctx'> 		/* Send rsp for BR/EDR channel */</div><div class='del'>-		if (!chan-&gt;hs_hcon)</div><div class='del'>-			l2cap_send_efs_conf_rsp(chan, rsp, cmd-&gt;ident, flags);</div><div class='del'>-		else</div><div class='del'>-			chan-&gt;ident = cmd-&gt;ident;</div><div class='add'>+		l2cap_send_efs_conf_rsp(chan, rsp, cmd-&gt;ident, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4198,18 +4401,11 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!chan-&gt;hs_hcon) {</div><div class='del'>-				l2cap_send_efs_conf_rsp(chan, buf, cmd-&gt;ident,</div><div class='del'>-							0);</div><div class='del'>-			} else {</div><div class='del'>-				if (l2cap_check_efs(chan)) {</div><div class='del'>-					amp_create_logical_link(chan);</div><div class='del'>-					chan-&gt;ident = cmd-&gt;ident;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			l2cap_send_efs_conf_rsp(chan, buf, cmd-&gt;ident, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	case L2CAP_CONF_UNKNOWN:</div><div class='ctx'> 	case L2CAP_CONF_UNACCEPT:</div><div class='ctx'> 		if (chan-&gt;num_conf_rsp &lt;= L2CAP_CONF_MAX_CONF_RSP) {</div><div class='ctx'> 			char req[64];</div><div class='hunk'>@@ -4235,6 +4431,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		l2cap_chan_set_err(chan, ECONNRESET);</div><div class='hunk'>@@ -4264,6 +4461,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4284,32 +4482,24 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("scid 0x%4.4x dcid 0x%4.4x", scid, dcid);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='del'>-	chan = __l2cap_get_chan_by_scid(conn, dcid);</div><div class='add'>+	chan = l2cap_get_chan_by_scid(conn, dcid);</div><div class='ctx'> 	if (!chan) {</div><div class='del'>-		mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 		cmd_reject_invalid_cid(conn, cmd-&gt;ident, dcid, scid);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_lock(chan);</div><div class='del'>-</div><div class='ctx'> 	rsp.dcid = cpu_to_le16(chan-&gt;scid);</div><div class='ctx'> 	rsp.scid = cpu_to_le16(chan-&gt;dcid);</div><div class='ctx'> 	l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_DISCONN_RSP, sizeof(rsp), &amp;rsp);</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;ops-&gt;set_shutdown(chan);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_hold(chan);</div><div class='ctx'> 	l2cap_chan_del(chan, ECONNRESET);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='ctx'> 	chan-&gt;ops-&gt;close(chan);</div><div class='del'>-	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4330,25 +4520,23 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("dcid 0x%4.4x scid 0x%4.4x", dcid, scid);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='del'>-	chan = __l2cap_get_chan_by_scid(conn, scid);</div><div class='add'>+	chan = l2cap_get_chan_by_scid(conn, scid);</div><div class='ctx'> 	if (!chan) {</div><div class='del'>-		mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_lock(chan);</div><div class='add'>+	if (chan-&gt;state != BT_DISCONN) {</div><div class='add'>+		l2cap_chan_unlock(chan);</div><div class='add'>+		l2cap_chan_put(chan);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_hold(chan);</div><div class='ctx'> 	l2cap_chan_del(chan, 0);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='ctx'> 	chan-&gt;ops-&gt;close(chan);</div><div class='del'>-	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4376,9 +4564,6 @@ static inline int l2cap_information_req(struct l2cap_conn *conn,</div><div class='ctx'> 		if (!disable_ertm)</div><div class='ctx'> 			feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING</div><div class='ctx'> 				| L2CAP_FEAT_FCS;</div><div class='del'>-		if (conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP)</div><div class='del'>-			feat_mask |= L2CAP_FEAT_EXT_FLOW</div><div class='del'>-				| L2CAP_FEAT_EXT_WINDOW;</div><div class='ctx'> </div><div class='ctx'> 		put_unaligned_le32(feat_mask, rsp-&gt;data);</div><div class='ctx'> 		l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_INFO_RSP, sizeof(buf),</div><div class='hunk'>@@ -4467,749 +4652,6 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2cap_create_channel_req(struct l2cap_conn *conn,</div><div class='del'>-				    struct l2cap_cmd_hdr *cmd,</div><div class='del'>-				    u16 cmd_len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_create_chan_req *req = data;</div><div class='del'>-	struct l2cap_create_chan_rsp rsp;</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	u16 psm, scid;</div><div class='del'>-</div><div class='del'>-	if (cmd_len != sizeof(*req))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	if (!(conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	psm = le16_to_cpu(req-&gt;psm);</div><div class='del'>-	scid = le16_to_cpu(req-&gt;scid);</div><div class='del'>-</div><div class='del'>-	BT_DBG("psm 0x%2.2x, scid 0x%4.4x, amp_id %d", psm, scid, req-&gt;amp_id);</div><div class='del'>-</div><div class='del'>-	/* For controller id 0 make BR/EDR connection */</div><div class='del'>-	if (req-&gt;amp_id == AMP_ID_BREDR) {</div><div class='del'>-		l2cap_connect(conn, cmd, data, L2CAP_CREATE_CHAN_RSP,</div><div class='del'>-			      req-&gt;amp_id);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Validate AMP controller id */</div><div class='del'>-	hdev = hci_dev_get(req-&gt;amp_id);</div><div class='del'>-	if (!hdev)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;dev_type != HCI_AMP || !test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan = l2cap_connect(conn, cmd, data, L2CAP_CREATE_CHAN_RSP,</div><div class='del'>-			     req-&gt;amp_id);</div><div class='del'>-	if (chan) {</div><div class='del'>-		struct amp_mgr *mgr = conn-&gt;hcon-&gt;amp_mgr;</div><div class='del'>-		struct hci_conn *hs_hcon;</div><div class='del'>-</div><div class='del'>-		hs_hcon = hci_conn_hash_lookup_ba(hdev, AMP_LINK,</div><div class='del'>-						  &amp;conn-&gt;hcon-&gt;dst);</div><div class='del'>-		if (!hs_hcon) {</div><div class='del'>-			hci_dev_put(hdev);</div><div class='del'>-			cmd_reject_invalid_cid(conn, cmd-&gt;ident, chan-&gt;scid,</div><div class='del'>-					       chan-&gt;dcid);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		BT_DBG("mgr %p bredr_chan %p hs_hcon %p", mgr, chan, hs_hcon);</div><div class='del'>-</div><div class='del'>-		mgr-&gt;bredr_chan = chan;</div><div class='del'>-		chan-&gt;hs_hcon = hs_hcon;</div><div class='del'>-		chan-&gt;fcs = L2CAP_FCS_NONE;</div><div class='del'>-		conn-&gt;mtu = hdev-&gt;block_mtu;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	rsp.dcid = 0;</div><div class='del'>-	rsp.scid = cpu_to_le16(scid);</div><div class='del'>-	rsp.result = cpu_to_le16(L2CAP_CR_BAD_AMP);</div><div class='del'>-	rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_CREATE_CHAN_RSP,</div><div class='del'>-		       sizeof(rsp), &amp;rsp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_send_move_chan_req(struct l2cap_chan *chan, u8 dest_amp_id)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_req req;</div><div class='del'>-	u8 ident;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p, dest_amp_id %d", chan, dest_amp_id);</div><div class='del'>-</div><div class='del'>-	ident = l2cap_get_ident(chan-&gt;conn);</div><div class='del'>-	chan-&gt;ident = ident;</div><div class='del'>-</div><div class='del'>-	req.icid = cpu_to_le16(chan-&gt;scid);</div><div class='del'>-	req.dest_amp_id = dest_amp_id;</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(chan-&gt;conn, ident, L2CAP_MOVE_CHAN_REQ, sizeof(req),</div><div class='del'>-		       &amp;req);</div><div class='del'>-</div><div class='del'>-	__set_chan_timer(chan, L2CAP_MOVE_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_send_move_chan_rsp(struct l2cap_chan *chan, u16 result)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_rsp rsp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p, result 0x%4.4x", chan, result);</div><div class='del'>-</div><div class='del'>-	rsp.icid = cpu_to_le16(chan-&gt;dcid);</div><div class='del'>-	rsp.result = cpu_to_le16(result);</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(chan-&gt;conn, chan-&gt;ident, L2CAP_MOVE_CHAN_RSP,</div><div class='del'>-		       sizeof(rsp), &amp;rsp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_send_move_chan_cfm(struct l2cap_chan *chan, u16 result)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_cfm cfm;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p, result 0x%4.4x", chan, result);</div><div class='del'>-</div><div class='del'>-	chan-&gt;ident = l2cap_get_ident(chan-&gt;conn);</div><div class='del'>-</div><div class='del'>-	cfm.icid = cpu_to_le16(chan-&gt;scid);</div><div class='del'>-	cfm.result = cpu_to_le16(result);</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(chan-&gt;conn, chan-&gt;ident, L2CAP_MOVE_CHAN_CFM,</div><div class='del'>-		       sizeof(cfm), &amp;cfm);</div><div class='del'>-</div><div class='del'>-	__set_chan_timer(chan, L2CAP_MOVE_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_send_move_chan_cfm_icid(struct l2cap_conn *conn, u16 icid)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_cfm cfm;</div><div class='del'>-</div><div class='del'>-	BT_DBG("conn %p, icid 0x%4.4x", conn, icid);</div><div class='del'>-</div><div class='del'>-	cfm.icid = cpu_to_le16(icid);</div><div class='del'>-	cfm.result = cpu_to_le16(L2CAP_MC_UNCONFIRMED);</div><div class='del'>-</div><div class='del'>-	l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_MOVE_CHAN_CFM,</div><div class='del'>-		       sizeof(cfm), &amp;cfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_send_move_chan_cfm_rsp(struct l2cap_conn *conn, u8 ident,</div><div class='del'>-					 u16 icid)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_cfm_rsp rsp;</div><div class='del'>-</div><div class='del'>-	BT_DBG("icid 0x%4.4x", icid);</div><div class='del'>-</div><div class='del'>-	rsp.icid = cpu_to_le16(icid);</div><div class='del'>-	l2cap_send_cmd(conn, ident, L2CAP_MOVE_CHAN_CFM_RSP, sizeof(rsp), &amp;rsp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __release_logical_link(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	chan-&gt;hs_hchan = NULL;</div><div class='del'>-	chan-&gt;hs_hcon = NULL;</div><div class='del'>-</div><div class='del'>-	/* Placeholder - release the logical link */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_logical_fail(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	/* Logical link setup failed */</div><div class='del'>-	if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-		/* Create channel failure, disconnect */</div><div class='del'>-		l2cap_send_disconn_req(chan, ECONNRESET);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (chan-&gt;move_role) {</div><div class='del'>-	case L2CAP_MOVE_ROLE_RESPONDER:</div><div class='del'>-		l2cap_move_done(chan);</div><div class='del'>-		l2cap_send_move_chan_rsp(chan, L2CAP_MR_NOT_SUPP);</div><div class='del'>-		break;</div><div class='del'>-	case L2CAP_MOVE_ROLE_INITIATOR:</div><div class='del'>-		if (chan-&gt;move_state == L2CAP_MOVE_WAIT_LOGICAL_COMP ||</div><div class='del'>-		    chan-&gt;move_state == L2CAP_MOVE_WAIT_LOGICAL_CFM) {</div><div class='del'>-			/* Remote has only sent pending or</div><div class='del'>-			 * success responses, clean up</div><div class='del'>-			 */</div><div class='del'>-			l2cap_move_done(chan);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Other amp move states imply that the move</div><div class='del'>-		 * has already aborted</div><div class='del'>-		 */</div><div class='del'>-		l2cap_send_move_chan_cfm(chan, L2CAP_MC_UNCONFIRMED);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_logical_finish_create(struct l2cap_chan *chan,</div><div class='del'>-					struct hci_chan *hchan)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_conf_rsp rsp;</div><div class='del'>-</div><div class='del'>-	chan-&gt;hs_hchan = hchan;</div><div class='del'>-	chan-&gt;hs_hcon-&gt;l2cap_data = chan-&gt;conn;</div><div class='del'>-</div><div class='del'>-	l2cap_send_efs_conf_rsp(chan, &amp;rsp, chan-&gt;ident, 0);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CONF_INPUT_DONE, &amp;chan-&gt;conf_state)) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		set_default_fcs(chan);</div><div class='del'>-</div><div class='del'>-		err = l2cap_ertm_init(chan);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			l2cap_send_disconn_req(chan, -err);</div><div class='del'>-		else</div><div class='del'>-			l2cap_chan_ready(chan);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_logical_finish_move(struct l2cap_chan *chan,</div><div class='del'>-				      struct hci_chan *hchan)</div><div class='del'>-{</div><div class='del'>-	chan-&gt;hs_hcon = hchan-&gt;conn;</div><div class='del'>-	chan-&gt;hs_hcon-&gt;l2cap_data = chan-&gt;conn;</div><div class='del'>-</div><div class='del'>-	BT_DBG("move_state %d", chan-&gt;move_state);</div><div class='del'>-</div><div class='del'>-	switch (chan-&gt;move_state) {</div><div class='del'>-	case L2CAP_MOVE_WAIT_LOGICAL_COMP:</div><div class='del'>-		/* Move confirm will be sent after a success</div><div class='del'>-		 * response is received</div><div class='del'>-		 */</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_WAIT_RSP_SUCCESS;</div><div class='del'>-		break;</div><div class='del'>-	case L2CAP_MOVE_WAIT_LOGICAL_CFM:</div><div class='del'>-		if (test_bit(CONN_LOCAL_BUSY, &amp;chan-&gt;conn_state)) {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOCAL_BUSY;</div><div class='del'>-		} else if (chan-&gt;move_role == L2CAP_MOVE_ROLE_INITIATOR) {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_CONFIRM_RSP;</div><div class='del'>-			l2cap_send_move_chan_cfm(chan, L2CAP_MC_CONFIRMED);</div><div class='del'>-		} else if (chan-&gt;move_role == L2CAP_MOVE_ROLE_RESPONDER) {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_CONFIRM;</div><div class='del'>-			l2cap_send_move_chan_rsp(chan, L2CAP_MR_SUCCESS);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Move was not in expected state, free the channel */</div><div class='del'>-		__release_logical_link(chan);</div><div class='del'>-</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_STABLE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Call with chan locked */</div><div class='del'>-void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,</div><div class='del'>-		       u8 status)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("chan %p, hchan %p, status %d", chan, hchan, status);</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		l2cap_logical_fail(chan);</div><div class='del'>-		__release_logical_link(chan);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-		/* Ignore logical link if channel is on BR/EDR */</div><div class='del'>-		if (chan-&gt;local_amp_id != AMP_ID_BREDR)</div><div class='del'>-			l2cap_logical_finish_create(chan, hchan);</div><div class='del'>-	} else {</div><div class='del'>-		l2cap_logical_finish_move(chan, hchan);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void l2cap_move_start(struct l2cap_chan *chan)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;local_amp_id == AMP_ID_BREDR) {</div><div class='del'>-		if (chan-&gt;chan_policy != BT_CHANNEL_POLICY_AMP_PREFERRED)</div><div class='del'>-			return;</div><div class='del'>-		chan-&gt;move_role = L2CAP_MOVE_ROLE_INITIATOR;</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_WAIT_PREPARE;</div><div class='del'>-		/* Placeholder - start physical link setup */</div><div class='del'>-	} else {</div><div class='del'>-		chan-&gt;move_role = L2CAP_MOVE_ROLE_INITIATOR;</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_WAIT_RSP_SUCCESS;</div><div class='del'>-		chan-&gt;move_id = 0;</div><div class='del'>-		l2cap_move_setup(chan);</div><div class='del'>-		l2cap_send_move_chan_req(chan, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_do_create(struct l2cap_chan *chan, int result,</div><div class='del'>-			    u8 local_amp_id, u8 remote_amp_id)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("chan %p state %s %u -&gt; %u", chan, state_to_string(chan-&gt;state),</div><div class='del'>-	       local_amp_id, remote_amp_id);</div><div class='del'>-</div><div class='del'>-	chan-&gt;fcs = L2CAP_FCS_NONE;</div><div class='del'>-</div><div class='del'>-	/* Outgoing channel on AMP */</div><div class='del'>-	if (chan-&gt;state == BT_CONNECT) {</div><div class='del'>-		if (result == L2CAP_CR_SUCCESS) {</div><div class='del'>-			chan-&gt;local_amp_id = local_amp_id;</div><div class='del'>-			l2cap_send_create_chan_req(chan, remote_amp_id);</div><div class='del'>-		} else {</div><div class='del'>-			/* Revert to BR/EDR connect */</div><div class='del'>-			l2cap_send_conn_req(chan);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Incoming channel on AMP */</div><div class='del'>-	if (__l2cap_no_conn_pending(chan)) {</div><div class='del'>-		struct l2cap_conn_rsp rsp;</div><div class='del'>-		char buf[128];</div><div class='del'>-		rsp.scid = cpu_to_le16(chan-&gt;dcid);</div><div class='del'>-		rsp.dcid = cpu_to_le16(chan-&gt;scid);</div><div class='del'>-</div><div class='del'>-		if (result == L2CAP_CR_SUCCESS) {</div><div class='del'>-			/* Send successful response */</div><div class='del'>-			rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);</div><div class='del'>-			rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);</div><div class='del'>-		} else {</div><div class='del'>-			/* Send negative response */</div><div class='del'>-			rsp.result = cpu_to_le16(L2CAP_CR_NO_MEM);</div><div class='del'>-			rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		l2cap_send_cmd(chan-&gt;conn, chan-&gt;ident, L2CAP_CREATE_CHAN_RSP,</div><div class='del'>-			       sizeof(rsp), &amp;rsp);</div><div class='del'>-</div><div class='del'>-		if (result == L2CAP_CR_SUCCESS) {</div><div class='del'>-			l2cap_state_change(chan, BT_CONFIG);</div><div class='del'>-			set_bit(CONF_REQ_SENT, &amp;chan-&gt;conf_state);</div><div class='del'>-			l2cap_send_cmd(chan-&gt;conn, l2cap_get_ident(chan-&gt;conn),</div><div class='del'>-				       L2CAP_CONF_REQ,</div><div class='del'>-				       l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);</div><div class='del'>-			chan-&gt;num_conf_req++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_do_move_initiate(struct l2cap_chan *chan, u8 local_amp_id,</div><div class='del'>-				   u8 remote_amp_id)</div><div class='del'>-{</div><div class='del'>-	l2cap_move_setup(chan);</div><div class='del'>-	chan-&gt;move_id = local_amp_id;</div><div class='del'>-	chan-&gt;move_state = L2CAP_MOVE_WAIT_RSP;</div><div class='del'>-</div><div class='del'>-	l2cap_send_move_chan_req(chan, remote_amp_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_do_move_respond(struct l2cap_chan *chan, int result)</div><div class='del'>-{</div><div class='del'>-	struct hci_chan *hchan = NULL;</div><div class='del'>-</div><div class='del'>-	/* Placeholder - get hci_chan for logical link */</div><div class='del'>-</div><div class='del'>-	if (hchan) {</div><div class='del'>-		if (hchan-&gt;state == BT_CONNECTED) {</div><div class='del'>-			/* Logical link is ready to go */</div><div class='del'>-			chan-&gt;hs_hcon = hchan-&gt;conn;</div><div class='del'>-			chan-&gt;hs_hcon-&gt;l2cap_data = chan-&gt;conn;</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_CONFIRM;</div><div class='del'>-			l2cap_send_move_chan_rsp(chan, L2CAP_MR_SUCCESS);</div><div class='del'>-</div><div class='del'>-			l2cap_logical_cfm(chan, hchan, L2CAP_MR_SUCCESS);</div><div class='del'>-		} else {</div><div class='del'>-			/* Wait for logical link to be ready */</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOGICAL_CFM;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Logical link not available */</div><div class='del'>-		l2cap_send_move_chan_rsp(chan, L2CAP_MR_NOT_ALLOWED);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_do_move_cancel(struct l2cap_chan *chan, int result)</div><div class='del'>-{</div><div class='del'>-	if (chan-&gt;move_role == L2CAP_MOVE_ROLE_RESPONDER) {</div><div class='del'>-		u8 rsp_result;</div><div class='del'>-		if (result == -EINVAL)</div><div class='del'>-			rsp_result = L2CAP_MR_BAD_ID;</div><div class='del'>-		else</div><div class='del'>-			rsp_result = L2CAP_MR_NOT_ALLOWED;</div><div class='del'>-</div><div class='del'>-		l2cap_send_move_chan_rsp(chan, rsp_result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan-&gt;move_role = L2CAP_MOVE_ROLE_NONE;</div><div class='del'>-	chan-&gt;move_state = L2CAP_MOVE_STABLE;</div><div class='del'>-</div><div class='del'>-	/* Restart data transmission */</div><div class='del'>-	l2cap_ertm_send(chan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Invoke with locked chan */</div><div class='del'>-void __l2cap_physical_cfm(struct l2cap_chan *chan, int result)</div><div class='del'>-{</div><div class='del'>-	u8 local_amp_id = chan-&gt;local_amp_id;</div><div class='del'>-	u8 remote_amp_id = chan-&gt;remote_amp_id;</div><div class='del'>-</div><div class='del'>-	BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d",</div><div class='del'>-	       chan, result, local_amp_id, remote_amp_id);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;state == BT_DISCONN || chan-&gt;state == BT_CLOSED) {</div><div class='del'>-		l2cap_chan_unlock(chan);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;state != BT_CONNECTED) {</div><div class='del'>-		l2cap_do_create(chan, result, local_amp_id, remote_amp_id);</div><div class='del'>-	} else if (result != L2CAP_MR_SUCCESS) {</div><div class='del'>-		l2cap_do_move_cancel(chan, result);</div><div class='del'>-	} else {</div><div class='del'>-		switch (chan-&gt;move_role) {</div><div class='del'>-		case L2CAP_MOVE_ROLE_INITIATOR:</div><div class='del'>-			l2cap_do_move_initiate(chan, local_amp_id,</div><div class='del'>-					       remote_amp_id);</div><div class='del'>-			break;</div><div class='del'>-		case L2CAP_MOVE_ROLE_RESPONDER:</div><div class='del'>-			l2cap_do_move_respond(chan, result);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			l2cap_do_move_cancel(chan, result);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int l2cap_move_channel_req(struct l2cap_conn *conn,</div><div class='del'>-					 struct l2cap_cmd_hdr *cmd,</div><div class='del'>-					 u16 cmd_len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_req *req = data;</div><div class='del'>-	struct l2cap_move_chan_rsp rsp;</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	u16 icid = 0;</div><div class='del'>-	u16 result = L2CAP_MR_NOT_ALLOWED;</div><div class='del'>-</div><div class='del'>-	if (cmd_len != sizeof(*req))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	icid = le16_to_cpu(req-&gt;icid);</div><div class='del'>-</div><div class='del'>-	BT_DBG("icid 0x%4.4x, dest_amp_id %d", icid, req-&gt;dest_amp_id);</div><div class='del'>-</div><div class='del'>-	if (!(conn-&gt;local_fixed_chan &amp; L2CAP_FC_A2MP))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	chan = l2cap_get_chan_by_dcid(conn, icid);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		rsp.icid = cpu_to_le16(icid);</div><div class='del'>-		rsp.result = cpu_to_le16(L2CAP_MR_NOT_ALLOWED);</div><div class='del'>-		l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_MOVE_CHAN_RSP,</div><div class='del'>-			       sizeof(rsp), &amp;rsp);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan-&gt;ident = cmd-&gt;ident;</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;scid &lt; L2CAP_CID_DYN_START ||</div><div class='del'>-	    chan-&gt;chan_policy == BT_CHANNEL_POLICY_BREDR_ONLY ||</div><div class='del'>-	    (chan-&gt;mode != L2CAP_MODE_ERTM &amp;&amp;</div><div class='del'>-	     chan-&gt;mode != L2CAP_MODE_STREAMING)) {</div><div class='del'>-		result = L2CAP_MR_NOT_ALLOWED;</div><div class='del'>-		goto send_move_response;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;local_amp_id == req-&gt;dest_amp_id) {</div><div class='del'>-		result = L2CAP_MR_SAME_ID;</div><div class='del'>-		goto send_move_response;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (req-&gt;dest_amp_id != AMP_ID_BREDR) {</div><div class='del'>-		struct hci_dev *hdev;</div><div class='del'>-		hdev = hci_dev_get(req-&gt;dest_amp_id);</div><div class='del'>-		if (!hdev || hdev-&gt;dev_type != HCI_AMP ||</div><div class='del'>-		    !test_bit(HCI_UP, &amp;hdev-&gt;flags)) {</div><div class='del'>-			if (hdev)</div><div class='del'>-				hci_dev_put(hdev);</div><div class='del'>-</div><div class='del'>-			result = L2CAP_MR_BAD_ID;</div><div class='del'>-			goto send_move_response;</div><div class='del'>-		}</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Detect a move collision.  Only send a collision response</div><div class='del'>-	 * if this side has "lost", otherwise proceed with the move.</div><div class='del'>-	 * The winner has the larger bd_addr.</div><div class='del'>-	 */</div><div class='del'>-	if ((__chan_is_moving(chan) ||</div><div class='del'>-	     chan-&gt;move_role != L2CAP_MOVE_ROLE_NONE) &amp;&amp;</div><div class='del'>-	    bacmp(&amp;conn-&gt;hcon-&gt;src, &amp;conn-&gt;hcon-&gt;dst) &gt; 0) {</div><div class='del'>-		result = L2CAP_MR_COLLISION;</div><div class='del'>-		goto send_move_response;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chan-&gt;move_role = L2CAP_MOVE_ROLE_RESPONDER;</div><div class='del'>-	l2cap_move_setup(chan);</div><div class='del'>-	chan-&gt;move_id = req-&gt;dest_amp_id;</div><div class='del'>-	icid = chan-&gt;dcid;</div><div class='del'>-</div><div class='del'>-	if (req-&gt;dest_amp_id == AMP_ID_BREDR) {</div><div class='del'>-		/* Moving to BR/EDR */</div><div class='del'>-		if (test_bit(CONN_LOCAL_BUSY, &amp;chan-&gt;conn_state)) {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOCAL_BUSY;</div><div class='del'>-			result = L2CAP_MR_PEND;</div><div class='del'>-		} else {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_CONFIRM;</div><div class='del'>-			result = L2CAP_MR_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_WAIT_PREPARE;</div><div class='del'>-		/* Placeholder - uncomment when amp functions are available */</div><div class='del'>-		/*amp_accept_physical(chan, req-&gt;dest_amp_id);*/</div><div class='del'>-		result = L2CAP_MR_PEND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-send_move_response:</div><div class='del'>-	l2cap_send_move_chan_rsp(chan, result);</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_move_continue(struct l2cap_conn *conn, u16 icid, u16 result)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	struct hci_chan *hchan = NULL;</div><div class='del'>-</div><div class='del'>-	chan = l2cap_get_chan_by_scid(conn, icid);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		l2cap_send_move_chan_cfm_icid(conn, icid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__clear_chan_timer(chan);</div><div class='del'>-	if (result == L2CAP_MR_PEND)</div><div class='del'>-		__set_chan_timer(chan, L2CAP_MOVE_ERTX_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	switch (chan-&gt;move_state) {</div><div class='del'>-	case L2CAP_MOVE_WAIT_LOGICAL_COMP:</div><div class='del'>-		/* Move confirm will be sent when logical link</div><div class='del'>-		 * is complete.</div><div class='del'>-		 */</div><div class='del'>-		chan-&gt;move_state = L2CAP_MOVE_WAIT_LOGICAL_CFM;</div><div class='del'>-		break;</div><div class='del'>-	case L2CAP_MOVE_WAIT_RSP_SUCCESS:</div><div class='del'>-		if (result == L2CAP_MR_PEND) {</div><div class='del'>-			break;</div><div class='del'>-		} else if (test_bit(CONN_LOCAL_BUSY,</div><div class='del'>-				    &amp;chan-&gt;conn_state)) {</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOCAL_BUSY;</div><div class='del'>-		} else {</div><div class='del'>-			/* Logical link is up or moving to BR/EDR,</div><div class='del'>-			 * proceed with move</div><div class='del'>-			 */</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_CONFIRM_RSP;</div><div class='del'>-			l2cap_send_move_chan_cfm(chan, L2CAP_MC_CONFIRMED);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case L2CAP_MOVE_WAIT_RSP:</div><div class='del'>-		/* Moving to AMP */</div><div class='del'>-		if (result == L2CAP_MR_SUCCESS) {</div><div class='del'>-			/* Remote is ready, send confirm immediately</div><div class='del'>-			 * after logical link is ready</div><div class='del'>-			 */</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOGICAL_CFM;</div><div class='del'>-		} else {</div><div class='del'>-			/* Both logical link and move success</div><div class='del'>-			 * are required to confirm</div><div class='del'>-			 */</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_LOGICAL_COMP;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Placeholder - get hci_chan for logical link */</div><div class='del'>-		if (!hchan) {</div><div class='del'>-			/* Logical link not available */</div><div class='del'>-			l2cap_send_move_chan_cfm(chan, L2CAP_MC_UNCONFIRMED);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If the logical link is not yet connected, do not</div><div class='del'>-		 * send confirmation.</div><div class='del'>-		 */</div><div class='del'>-		if (hchan-&gt;state != BT_CONNECTED)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Logical link is already ready to go */</div><div class='del'>-</div><div class='del'>-		chan-&gt;hs_hcon = hchan-&gt;conn;</div><div class='del'>-		chan-&gt;hs_hcon-&gt;l2cap_data = chan-&gt;conn;</div><div class='del'>-</div><div class='del'>-		if (result == L2CAP_MR_SUCCESS) {</div><div class='del'>-			/* Can confirm now */</div><div class='del'>-			l2cap_send_move_chan_cfm(chan, L2CAP_MC_CONFIRMED);</div><div class='del'>-		} else {</div><div class='del'>-			/* Now only need move success</div><div class='del'>-			 * to confirm</div><div class='del'>-			 */</div><div class='del'>-			chan-&gt;move_state = L2CAP_MOVE_WAIT_RSP_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		l2cap_logical_cfm(chan, hchan, L2CAP_MR_SUCCESS);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Any other amp move state means the move failed. */</div><div class='del'>-		chan-&gt;move_id = chan-&gt;local_amp_id;</div><div class='del'>-		l2cap_move_done(chan);</div><div class='del'>-		l2cap_send_move_chan_cfm(chan, L2CAP_MC_UNCONFIRMED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void l2cap_move_fail(struct l2cap_conn *conn, u8 ident, u16 icid,</div><div class='del'>-			    u16 result)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-</div><div class='del'>-	chan = l2cap_get_chan_by_ident(conn, ident);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		/* Could not locate channel, icid is best guess */</div><div class='del'>-		l2cap_send_move_chan_cfm_icid(conn, icid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__clear_chan_timer(chan);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;move_role == L2CAP_MOVE_ROLE_INITIATOR) {</div><div class='del'>-		if (result == L2CAP_MR_COLLISION) {</div><div class='del'>-			chan-&gt;move_role = L2CAP_MOVE_ROLE_RESPONDER;</div><div class='del'>-		} else {</div><div class='del'>-			/* Cleanup - cancel move */</div><div class='del'>-			chan-&gt;move_id = chan-&gt;local_amp_id;</div><div class='del'>-			l2cap_move_done(chan);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l2cap_send_move_chan_cfm(chan, L2CAP_MC_UNCONFIRMED);</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int l2cap_move_channel_rsp(struct l2cap_conn *conn,</div><div class='del'>-				  struct l2cap_cmd_hdr *cmd,</div><div class='del'>-				  u16 cmd_len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_rsp *rsp = data;</div><div class='del'>-	u16 icid, result;</div><div class='del'>-</div><div class='del'>-	if (cmd_len != sizeof(*rsp))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	icid = le16_to_cpu(rsp-&gt;icid);</div><div class='del'>-	result = le16_to_cpu(rsp-&gt;result);</div><div class='del'>-</div><div class='del'>-	BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);</div><div class='del'>-</div><div class='del'>-	if (result == L2CAP_MR_SUCCESS || result == L2CAP_MR_PEND)</div><div class='del'>-		l2cap_move_continue(conn, icid, result);</div><div class='del'>-	else</div><div class='del'>-		l2cap_move_fail(conn, cmd-&gt;ident, icid, result);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int l2cap_move_channel_confirm(struct l2cap_conn *conn,</div><div class='del'>-				      struct l2cap_cmd_hdr *cmd,</div><div class='del'>-				      u16 cmd_len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_cfm *cfm = data;</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	u16 icid, result;</div><div class='del'>-</div><div class='del'>-	if (cmd_len != sizeof(*cfm))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	icid = le16_to_cpu(cfm-&gt;icid);</div><div class='del'>-	result = le16_to_cpu(cfm-&gt;result);</div><div class='del'>-</div><div class='del'>-	BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);</div><div class='del'>-</div><div class='del'>-	chan = l2cap_get_chan_by_dcid(conn, icid);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		/* Spec requires a response even if the icid was not found */</div><div class='del'>-		l2cap_send_move_chan_cfm_rsp(conn, cmd-&gt;ident, icid);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;move_state == L2CAP_MOVE_WAIT_CONFIRM) {</div><div class='del'>-		if (result == L2CAP_MC_CONFIRMED) {</div><div class='del'>-			chan-&gt;local_amp_id = chan-&gt;move_id;</div><div class='del'>-			if (chan-&gt;local_amp_id == AMP_ID_BREDR)</div><div class='del'>-				__release_logical_link(chan);</div><div class='del'>-		} else {</div><div class='del'>-			chan-&gt;move_id = chan-&gt;local_amp_id;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		l2cap_move_done(chan);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l2cap_send_move_chan_cfm_rsp(conn, cmd-&gt;ident, icid);</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn,</div><div class='del'>-						 struct l2cap_cmd_hdr *cmd,</div><div class='del'>-						 u16 cmd_len, void *data)</div><div class='del'>-{</div><div class='del'>-	struct l2cap_move_chan_cfm_rsp *rsp = data;</div><div class='del'>-	struct l2cap_chan *chan;</div><div class='del'>-	u16 icid;</div><div class='del'>-</div><div class='del'>-	if (cmd_len != sizeof(*rsp))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	icid = le16_to_cpu(rsp-&gt;icid);</div><div class='del'>-</div><div class='del'>-	BT_DBG("icid 0x%4.4x", icid);</div><div class='del'>-</div><div class='del'>-	chan = l2cap_get_chan_by_scid(conn, icid);</div><div class='del'>-	if (!chan)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	__clear_chan_timer(chan);</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;move_state == L2CAP_MOVE_WAIT_CONFIRM_RSP) {</div><div class='del'>-		chan-&gt;local_amp_id = chan-&gt;move_id;</div><div class='del'>-</div><div class='del'>-		if (chan-&gt;local_amp_id == AMP_ID_BREDR &amp;&amp; chan-&gt;hs_hchan)</div><div class='del'>-			__release_logical_link(chan);</div><div class='del'>-</div><div class='del'>-		l2cap_move_done(chan);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,</div><div class='ctx'> 					      struct l2cap_cmd_hdr *cmd,</div><div class='ctx'> 					      u16 cmd_len, u8 *data)</div><div class='hunk'>@@ -5279,7 +4721,7 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 	credits = __le16_to_cpu(rsp-&gt;credits);</div><div class='ctx'> 	result  = __le16_to_cpu(rsp-&gt;result);</div><div class='ctx'> </div><div class='del'>-	if (result == L2CAP_CR_SUCCESS &amp;&amp; (mtu &lt; 23 || mps &lt; 23 ||</div><div class='add'>+	if (result == L2CAP_CR_LE_SUCCESS &amp;&amp; (mtu &lt; 23 || mps &lt; 23 ||</div><div class='ctx'> 					   dcid &lt; L2CAP_CID_DYN_START ||</div><div class='ctx'> 					   dcid &gt; L2CAP_CID_LE_DYN_END))</div><div class='ctx'> 		return -EPROTO;</div><div class='hunk'>@@ -5287,20 +4729,16 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 	BT_DBG("dcid 0x%4.4x mtu %u mps %u credits %u result 0x%2.2x",</div><div class='ctx'> 	       dcid, mtu, mps, credits, result);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	chan = __l2cap_get_chan_by_ident(conn, cmd-&gt;ident);</div><div class='del'>-	if (!chan) {</div><div class='del'>-		err = -EBADSLT;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!chan)</div><div class='add'>+		return -EBADSLT;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='ctx'> 	switch (result) {</div><div class='del'>-	case L2CAP_CR_SUCCESS:</div><div class='add'>+	case L2CAP_CR_LE_SUCCESS:</div><div class='ctx'> 		if (__l2cap_get_chan_by_dcid(conn, dcid)) {</div><div class='ctx'> 			err = -EBADSLT;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5314,8 +4752,8 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn,</div><div class='ctx'> 		l2cap_chan_ready(chan);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case L2CAP_CR_AUTHENTICATION:</div><div class='del'>-	case L2CAP_CR_ENCRYPTION:</div><div class='add'>+	case L2CAP_CR_LE_AUTHENTICATION:</div><div class='add'>+	case L2CAP_CR_LE_ENCRYPTION:</div><div class='ctx'> 		/* If we already have MITM protection we can't do</div><div class='ctx'> 		 * anything.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -5341,9 +4779,6 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5363,7 +4798,6 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case L2CAP_CONN_RSP:</div><div class='del'>-	case L2CAP_CREATE_CHAN_RSP:</div><div class='ctx'> 		l2cap_connect_create_rsp(conn, cmd, cmd_len, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -5398,26 +4832,6 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,</div><div class='ctx'> 		l2cap_information_rsp(conn, cmd, cmd_len, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case L2CAP_CREATE_CHAN_REQ:</div><div class='del'>-		err = l2cap_create_channel_req(conn, cmd, cmd_len, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case L2CAP_MOVE_CHAN_REQ:</div><div class='del'>-		err = l2cap_move_channel_req(conn, cmd, cmd_len, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case L2CAP_MOVE_CHAN_RSP:</div><div class='del'>-		l2cap_move_channel_rsp(conn, cmd, cmd_len, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case L2CAP_MOVE_CHAN_CFM:</div><div class='del'>-		err = l2cap_move_channel_confirm(conn, cmd, cmd_len, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case L2CAP_MOVE_CHAN_CFM_RSP:</div><div class='del'>-		l2cap_move_channel_confirm_rsp(conn, cmd, cmd_len, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		BT_ERR("Unknown BR/EDR signaling command 0x%2.2x", cmd-&gt;code);</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -5454,47 +4868,58 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,</div><div class='ctx'> 	BT_DBG("psm 0x%2.2x scid 0x%4.4x mtu %u mps %u", __le16_to_cpu(psm),</div><div class='ctx'> 	       scid, mtu, mps);</div><div class='ctx'> </div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A</div><div class='add'>+	 * page 1059:</div><div class='add'>+	 *</div><div class='add'>+	 * Valid range: 0x0001-0x00ff</div><div class='add'>+	 *</div><div class='add'>+	 * Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges</div><div class='add'>+	 */</div><div class='add'>+	if (!psm || __le16_to_cpu(psm) &gt; L2CAP_PSM_LE_DYN_END) {</div><div class='add'>+		result = L2CAP_CR_LE_BAD_PSM;</div><div class='add'>+		chan = NULL;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check if we have socket listening on psm */</div><div class='ctx'> 	pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, &amp;conn-&gt;hcon-&gt;src,</div><div class='ctx'> 					 &amp;conn-&gt;hcon-&gt;dst, LE_LINK);</div><div class='ctx'> 	if (!pchan) {</div><div class='del'>-		result = L2CAP_CR_BAD_PSM;</div><div class='add'>+		result = L2CAP_CR_LE_BAD_PSM;</div><div class='ctx'> 		chan = NULL;</div><div class='ctx'> 		goto response;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	l2cap_chan_lock(pchan);</div><div class='ctx'> </div><div class='ctx'> 	if (!smp_sufficient_security(conn-&gt;hcon, pchan-&gt;sec_level,</div><div class='ctx'> 				     SMP_ALLOW_STK)) {</div><div class='del'>-		result = L2CAP_CR_AUTHENTICATION;</div><div class='add'>+		result = pchan-&gt;sec_level == BT_SECURITY_MEDIUM ?</div><div class='add'>+			L2CAP_CR_LE_ENCRYPTION : L2CAP_CR_LE_AUTHENTICATION;</div><div class='ctx'> 		chan = NULL;</div><div class='ctx'> 		goto response_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for valid dynamic CID range */</div><div class='ctx'> 	if (scid &lt; L2CAP_CID_DYN_START || scid &gt; L2CAP_CID_LE_DYN_END) {</div><div class='del'>-		result = L2CAP_CR_INVALID_SCID;</div><div class='add'>+		result = L2CAP_CR_LE_INVALID_SCID;</div><div class='ctx'> 		chan = NULL;</div><div class='ctx'> 		goto response_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we already have channel with that dcid */</div><div class='ctx'> 	if (__l2cap_get_chan_by_dcid(conn, scid)) {</div><div class='del'>-		result = L2CAP_CR_SCID_IN_USE;</div><div class='add'>+		result = L2CAP_CR_LE_SCID_IN_USE;</div><div class='ctx'> 		chan = NULL;</div><div class='ctx'> 		goto response_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chan = pchan-&gt;ops-&gt;new_connection(pchan);</div><div class='ctx'> 	if (!chan) {</div><div class='del'>-		result = L2CAP_CR_NO_MEM;</div><div class='add'>+		result = L2CAP_CR_LE_NO_MEM;</div><div class='ctx'> 		goto response_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l2cap_le_flowctl_init(chan);</div><div class='del'>-</div><div class='ctx'> 	bacpy(&amp;chan-&gt;src, &amp;conn-&gt;hcon-&gt;src);</div><div class='ctx'> 	bacpy(&amp;chan-&gt;dst, &amp;conn-&gt;hcon-&gt;dst);</div><div class='ctx'> 	chan-&gt;src_type = bdaddr_src_type(conn-&gt;hcon);</div><div class='hunk'>@@ -5503,9 +4928,11 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,</div><div class='ctx'> 	chan-&gt;dcid = scid;</div><div class='ctx'> 	chan-&gt;omtu = mtu;</div><div class='ctx'> 	chan-&gt;remote_mps = mps;</div><div class='del'>-	chan-&gt;tx_credits = __le16_to_cpu(req-&gt;credits);</div><div class='ctx'> </div><div class='ctx'> 	__l2cap_chan_add(conn, chan);</div><div class='add'>+</div><div class='add'>+	l2cap_le_flowctl_init(chan, __le16_to_cpu(req-&gt;credits));</div><div class='add'>+</div><div class='ctx'> 	dcid = chan-&gt;scid;</div><div class='ctx'> 	credits = chan-&gt;rx_credits;</div><div class='ctx'> </div><div class='hunk'>@@ -5524,12 +4951,11 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,</div><div class='ctx'> 		chan-&gt;ops-&gt;defer(chan);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		l2cap_chan_ready(chan);</div><div class='del'>-		result = L2CAP_CR_SUCCESS;</div><div class='add'>+		result = L2CAP_CR_LE_SUCCESS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> response_unlock:</div><div class='ctx'> 	l2cap_chan_unlock(pchan);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	l2cap_chan_put(pchan);</div><div class='ctx'> </div><div class='ctx'> 	if (result == L2CAP_CR_PEND)</div><div class='hunk'>@@ -5578,12 +5004,11 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn,</div><div class='ctx'> 	if (credits &gt; max_credits) {</div><div class='ctx'> 		BT_ERR("LE credits overflow");</div><div class='ctx'> 		l2cap_send_disconn_req(chan, ECONNRESET);</div><div class='del'>-		l2cap_chan_unlock(chan);</div><div class='ctx'> </div><div class='ctx'> 		/* Return 0 so that we don't trigger an unnecessary</div><div class='ctx'> 		 * command reject packet.</div><div class='ctx'> 		 */</div><div class='del'>-		return 0;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;tx_credits += credits;</div><div class='hunk'>@@ -5594,7 +5019,369 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn,</div><div class='ctx'> 	if (chan-&gt;tx_credits)</div><div class='ctx'> 		chan-&gt;ops-&gt;resume(chan);</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,</div><div class='add'>+				       struct l2cap_cmd_hdr *cmd, u16 cmd_len,</div><div class='add'>+				       u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_ecred_conn_req *req = (void *) data;</div><div class='add'>+	DEFINE_RAW_FLEX(struct l2cap_ecred_conn_rsp, pdu, dcid, L2CAP_ECRED_MAX_CID);</div><div class='add'>+	struct l2cap_chan *chan, *pchan;</div><div class='add'>+	u16 mtu, mps;</div><div class='add'>+	__le16 psm;</div><div class='add'>+	u8 result, len = 0;</div><div class='add'>+	int i, num_scid;</div><div class='add'>+	bool defer = false;</div><div class='add'>+</div><div class='add'>+	if (!enable_ecred)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd_len &lt; sizeof(*req) || (cmd_len - sizeof(*req)) % sizeof(u16)) {</div><div class='add'>+		result = L2CAP_CR_LE_INVALID_PARAMS;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_len -= sizeof(*req);</div><div class='add'>+	num_scid = cmd_len / sizeof(u16);</div><div class='add'>+</div><div class='add'>+	if (num_scid &gt; L2CAP_ECRED_MAX_CID) {</div><div class='add'>+		result = L2CAP_CR_LE_INVALID_PARAMS;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtu  = __le16_to_cpu(req-&gt;mtu);</div><div class='add'>+	mps  = __le16_to_cpu(req-&gt;mps);</div><div class='add'>+</div><div class='add'>+	if (mtu &lt; L2CAP_ECRED_MIN_MTU || mps &lt; L2CAP_ECRED_MIN_MPS) {</div><div class='add'>+		result = L2CAP_CR_LE_UNACCEPT_PARAMS;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psm  = req-&gt;psm;</div><div class='add'>+</div><div class='add'>+	/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A</div><div class='add'>+	 * page 1059:</div><div class='add'>+	 *</div><div class='add'>+	 * Valid range: 0x0001-0x00ff</div><div class='add'>+	 *</div><div class='add'>+	 * Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges</div><div class='add'>+	 */</div><div class='add'>+	if (!psm || __le16_to_cpu(psm) &gt; L2CAP_PSM_LE_DYN_END) {</div><div class='add'>+		result = L2CAP_CR_LE_BAD_PSM;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BT_DBG("psm 0x%2.2x mtu %u mps %u", __le16_to_cpu(psm), mtu, mps);</div><div class='add'>+</div><div class='add'>+	memset(pdu, 0, sizeof(*pdu));</div><div class='add'>+</div><div class='add'>+	/* Check if we have socket listening on psm */</div><div class='add'>+	pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, &amp;conn-&gt;hcon-&gt;src,</div><div class='add'>+					 &amp;conn-&gt;hcon-&gt;dst, LE_LINK);</div><div class='add'>+	if (!pchan) {</div><div class='add'>+		result = L2CAP_CR_LE_BAD_PSM;</div><div class='add'>+		goto response;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	l2cap_chan_lock(pchan);</div><div class='add'>+</div><div class='add'>+	if (!smp_sufficient_security(conn-&gt;hcon, pchan-&gt;sec_level,</div><div class='add'>+				     SMP_ALLOW_STK)) {</div><div class='add'>+		result = L2CAP_CR_LE_AUTHENTICATION;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = L2CAP_CR_LE_SUCCESS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_scid; i++) {</div><div class='add'>+		u16 scid = __le16_to_cpu(req-&gt;scid[i]);</div><div class='add'>+</div><div class='add'>+		BT_DBG("scid[%d] 0x%4.4x", i, scid);</div><div class='add'>+</div><div class='add'>+		pdu-&gt;dcid[i] = 0x0000;</div><div class='add'>+		len += sizeof(*pdu-&gt;dcid);</div><div class='add'>+</div><div class='add'>+		/* Check for valid dynamic CID range */</div><div class='add'>+		if (scid &lt; L2CAP_CID_DYN_START || scid &gt; L2CAP_CID_LE_DYN_END) {</div><div class='add'>+			result = L2CAP_CR_LE_INVALID_SCID;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if we already have channel with that dcid */</div><div class='add'>+		if (__l2cap_get_chan_by_dcid(conn, scid)) {</div><div class='add'>+			result = L2CAP_CR_LE_SCID_IN_USE;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chan = pchan-&gt;ops-&gt;new_connection(pchan);</div><div class='add'>+		if (!chan) {</div><div class='add'>+			result = L2CAP_CR_LE_NO_MEM;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bacpy(&amp;chan-&gt;src, &amp;conn-&gt;hcon-&gt;src);</div><div class='add'>+		bacpy(&amp;chan-&gt;dst, &amp;conn-&gt;hcon-&gt;dst);</div><div class='add'>+		chan-&gt;src_type = bdaddr_src_type(conn-&gt;hcon);</div><div class='add'>+		chan-&gt;dst_type = bdaddr_dst_type(conn-&gt;hcon);</div><div class='add'>+		chan-&gt;psm  = psm;</div><div class='add'>+		chan-&gt;dcid = scid;</div><div class='add'>+		chan-&gt;omtu = mtu;</div><div class='add'>+		chan-&gt;remote_mps = mps;</div><div class='add'>+</div><div class='add'>+		__l2cap_chan_add(conn, chan);</div><div class='add'>+</div><div class='add'>+		l2cap_ecred_init(chan, __le16_to_cpu(req-&gt;credits));</div><div class='add'>+</div><div class='add'>+		/* Init response */</div><div class='add'>+		if (!pdu-&gt;credits) {</div><div class='add'>+			pdu-&gt;mtu = cpu_to_le16(chan-&gt;imtu);</div><div class='add'>+			pdu-&gt;mps = cpu_to_le16(chan-&gt;mps);</div><div class='add'>+			pdu-&gt;credits = cpu_to_le16(chan-&gt;rx_credits);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdu-&gt;dcid[i] = cpu_to_le16(chan-&gt;scid);</div><div class='add'>+</div><div class='add'>+		__set_chan_timer(chan, chan-&gt;ops-&gt;get_sndtimeo(chan));</div><div class='add'>+</div><div class='add'>+		chan-&gt;ident = cmd-&gt;ident;</div><div class='add'>+		chan-&gt;mode = L2CAP_MODE_EXT_FLOWCTL;</div><div class='add'>+</div><div class='add'>+		if (test_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags)) {</div><div class='add'>+			l2cap_state_change(chan, BT_CONNECT2);</div><div class='add'>+			defer = true;</div><div class='add'>+			chan-&gt;ops-&gt;defer(chan);</div><div class='add'>+		} else {</div><div class='add'>+			l2cap_chan_ready(chan);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	l2cap_chan_unlock(pchan);</div><div class='add'>+	l2cap_chan_put(pchan);</div><div class='add'>+</div><div class='add'>+response:</div><div class='add'>+	pdu-&gt;result = cpu_to_le16(result);</div><div class='add'>+</div><div class='add'>+	if (defer)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_ECRED_CONN_RSP,</div><div class='add'>+		       sizeof(*pdu) + len, pdu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,</div><div class='add'>+				       struct l2cap_cmd_hdr *cmd, u16 cmd_len,</div><div class='add'>+				       u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_ecred_conn_rsp *rsp = (void *) data;</div><div class='add'>+	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='add'>+	u16 mtu, mps, credits, result;</div><div class='add'>+	struct l2cap_chan *chan, *tmp;</div><div class='add'>+	int err = 0, sec_level;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (cmd_len &lt; sizeof(*rsp))</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	mtu     = __le16_to_cpu(rsp-&gt;mtu);</div><div class='add'>+	mps     = __le16_to_cpu(rsp-&gt;mps);</div><div class='add'>+	credits = __le16_to_cpu(rsp-&gt;credits);</div><div class='add'>+	result  = __le16_to_cpu(rsp-&gt;result);</div><div class='add'>+</div><div class='add'>+	BT_DBG("mtu %u mps %u credits %u result 0x%4.4x", mtu, mps, credits,</div><div class='add'>+	       result);</div><div class='add'>+</div><div class='add'>+	cmd_len -= sizeof(*rsp);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(chan, tmp, &amp;conn-&gt;chan_l, list) {</div><div class='add'>+		u16 dcid;</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;ident != cmd-&gt;ident ||</div><div class='add'>+		    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL ||</div><div class='add'>+		    chan-&gt;state == BT_CONNECTED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		l2cap_chan_lock(chan);</div><div class='add'>+</div><div class='add'>+		/* Check that there is a dcid for each pending channel */</div><div class='add'>+		if (cmd_len &lt; sizeof(dcid)) {</div><div class='add'>+			l2cap_chan_del(chan, ECONNREFUSED);</div><div class='add'>+			l2cap_chan_unlock(chan);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dcid = __le16_to_cpu(rsp-&gt;dcid[i++]);</div><div class='add'>+		cmd_len -= sizeof(u16);</div><div class='add'>+</div><div class='add'>+		BT_DBG("dcid[%d] 0x%4.4x", i, dcid);</div><div class='add'>+</div><div class='add'>+		/* Check if dcid is already in use */</div><div class='add'>+		if (dcid &amp;&amp; __l2cap_get_chan_by_dcid(conn, dcid)) {</div><div class='add'>+			/* If a device receives a</div><div class='add'>+			 * L2CAP_CREDIT_BASED_CONNECTION_RSP packet with an</div><div class='add'>+			 * already-assigned Destination CID, then both the</div><div class='add'>+			 * original channel and the new channel shall be</div><div class='add'>+			 * immediately discarded and not used.</div><div class='add'>+			 */</div><div class='add'>+			l2cap_chan_del(chan, ECONNREFUSED);</div><div class='add'>+			l2cap_chan_unlock(chan);</div><div class='add'>+			chan = __l2cap_get_chan_by_dcid(conn, dcid);</div><div class='add'>+			l2cap_chan_lock(chan);</div><div class='add'>+			l2cap_chan_del(chan, ECONNRESET);</div><div class='add'>+			l2cap_chan_unlock(chan);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (result) {</div><div class='add'>+		case L2CAP_CR_LE_AUTHENTICATION:</div><div class='add'>+		case L2CAP_CR_LE_ENCRYPTION:</div><div class='add'>+			/* If we already have MITM protection we can't do</div><div class='add'>+			 * anything.</div><div class='add'>+			 */</div><div class='add'>+			if (hcon-&gt;sec_level &gt; BT_SECURITY_MEDIUM) {</div><div class='add'>+				l2cap_chan_del(chan, ECONNREFUSED);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sec_level = hcon-&gt;sec_level + 1;</div><div class='add'>+			if (chan-&gt;sec_level &lt; sec_level)</div><div class='add'>+				chan-&gt;sec_level = sec_level;</div><div class='add'>+</div><div class='add'>+			/* We'll need to send a new Connect Request */</div><div class='add'>+			clear_bit(FLAG_ECRED_CONN_REQ_SENT, &amp;chan-&gt;flags);</div><div class='add'>+</div><div class='add'>+			smp_conn_security(hcon, chan-&gt;sec_level);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case L2CAP_CR_LE_BAD_PSM:</div><div class='add'>+			l2cap_chan_del(chan, ECONNREFUSED);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			/* If dcid was not set it means channels was refused */</div><div class='add'>+			if (!dcid) {</div><div class='add'>+				l2cap_chan_del(chan, ECONNREFUSED);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			chan-&gt;ident = 0;</div><div class='add'>+			chan-&gt;dcid = dcid;</div><div class='add'>+			chan-&gt;omtu = mtu;</div><div class='add'>+			chan-&gt;remote_mps = mps;</div><div class='add'>+			chan-&gt;tx_credits = credits;</div><div class='add'>+			l2cap_chan_ready(chan);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		l2cap_chan_unlock(chan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int l2cap_ecred_reconf_req(struct l2cap_conn *conn,</div><div class='add'>+					 struct l2cap_cmd_hdr *cmd, u16 cmd_len,</div><div class='add'>+					 u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_ecred_reconf_req *req = (void *) data;</div><div class='add'>+	struct l2cap_ecred_reconf_rsp rsp;</div><div class='add'>+	u16 mtu, mps, result;</div><div class='add'>+	struct l2cap_chan *chan;</div><div class='add'>+	int i, num_scid;</div><div class='add'>+</div><div class='add'>+	if (!enable_ecred)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd_len &lt; sizeof(*req) || cmd_len - sizeof(*req) % sizeof(u16)) {</div><div class='add'>+		result = L2CAP_CR_LE_INVALID_PARAMS;</div><div class='add'>+		goto respond;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtu = __le16_to_cpu(req-&gt;mtu);</div><div class='add'>+	mps = __le16_to_cpu(req-&gt;mps);</div><div class='add'>+</div><div class='add'>+	BT_DBG("mtu %u mps %u", mtu, mps);</div><div class='add'>+</div><div class='add'>+	if (mtu &lt; L2CAP_ECRED_MIN_MTU) {</div><div class='add'>+		result = L2CAP_RECONF_INVALID_MTU;</div><div class='add'>+		goto respond;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mps &lt; L2CAP_ECRED_MIN_MPS) {</div><div class='add'>+		result = L2CAP_RECONF_INVALID_MPS;</div><div class='add'>+		goto respond;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_len -= sizeof(*req);</div><div class='add'>+	num_scid = cmd_len / sizeof(u16);</div><div class='add'>+	result = L2CAP_RECONF_SUCCESS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_scid; i++) {</div><div class='add'>+		u16 scid;</div><div class='add'>+</div><div class='add'>+		scid = __le16_to_cpu(req-&gt;scid[i]);</div><div class='add'>+		if (!scid)</div><div class='add'>+			return -EPROTO;</div><div class='add'>+</div><div class='add'>+		chan = __l2cap_get_chan_by_dcid(conn, scid);</div><div class='add'>+		if (!chan)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* If the MTU value is decreased for any of the included</div><div class='add'>+		 * channels, then the receiver shall disconnect all</div><div class='add'>+		 * included channels.</div><div class='add'>+		 */</div><div class='add'>+		if (chan-&gt;omtu &gt; mtu) {</div><div class='add'>+			BT_ERR("chan %p decreased MTU %u -&gt; %u", chan,</div><div class='add'>+			       chan-&gt;omtu, mtu);</div><div class='add'>+			result = L2CAP_RECONF_INVALID_MTU;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chan-&gt;omtu = mtu;</div><div class='add'>+		chan-&gt;remote_mps = mps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+respond:</div><div class='add'>+	rsp.result = cpu_to_le16(result);</div><div class='add'>+</div><div class='add'>+	l2cap_send_cmd(conn, cmd-&gt;ident, L2CAP_ECRED_RECONF_RSP, sizeof(rsp),</div><div class='add'>+		       &amp;rsp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,</div><div class='add'>+					 struct l2cap_cmd_hdr *cmd, u16 cmd_len,</div><div class='add'>+					 u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_chan *chan, *tmp;</div><div class='add'>+	struct l2cap_ecred_conn_rsp *rsp = (void *) data;</div><div class='add'>+	u16 result;</div><div class='add'>+</div><div class='add'>+	if (cmd_len &lt; sizeof(*rsp))</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	result = __le16_to_cpu(rsp-&gt;result);</div><div class='add'>+</div><div class='add'>+	BT_DBG("result 0x%4.4x", rsp-&gt;result);</div><div class='add'>+</div><div class='add'>+	if (!result)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(chan, tmp, &amp;conn-&gt;chan_l, list) {</div><div class='add'>+		if (chan-&gt;ident != cmd-&gt;ident)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		l2cap_chan_del(chan, ECONNRESET);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5609,18 +5396,20 @@ static inline int l2cap_le_command_rej(struct l2cap_conn *conn,</div><div class='ctx'> 	if (cmd_len &lt; sizeof(*rej))</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='del'>-</div><div class='ctx'> 	chan = __l2cap_get_chan_by_ident(conn, cmd-&gt;ident);</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	chan = l2cap_chan_hold_unless_zero(chan);</div><div class='add'>+	if (!chan)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> 	l2cap_chan_del(chan, ECONNREFUSED);</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5654,6 +5443,22 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn,</div><div class='ctx'> 		err = l2cap_le_credits(conn, cmd, cmd_len, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case L2CAP_ECRED_CONN_REQ:</div><div class='add'>+		err = l2cap_ecred_conn_req(conn, cmd, cmd_len, data);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case L2CAP_ECRED_CONN_RSP:</div><div class='add'>+		err = l2cap_ecred_conn_rsp(conn, cmd, cmd_len, data);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case L2CAP_ECRED_RECONF_REQ:</div><div class='add'>+		err = l2cap_ecred_reconf_req(conn, cmd, cmd_len, data);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case L2CAP_ECRED_RECONF_RSP:</div><div class='add'>+		err = l2cap_ecred_reconf_rsp(conn, cmd, cmd_len, data);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case L2CAP_DISCONN_REQ:</div><div class='ctx'> 		err = l2cap_disconnect_req(conn, cmd, cmd_len, data);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5712,13 +5517,19 @@ drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void l2cap_sig_send_rej(struct l2cap_conn *conn, u16 ident)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_cmd_rej_unk rej;</div><div class='add'>+</div><div class='add'>+	rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);</div><div class='add'>+	l2cap_send_cmd(conn, ident, L2CAP_COMMAND_REJ, sizeof(rej), &amp;rej);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void l2cap_sig_channel(struct l2cap_conn *conn,</div><div class='ctx'> 				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='del'>-	u8 *data = skb-&gt;data;</div><div class='del'>-	int len = skb-&gt;len;</div><div class='del'>-	struct l2cap_cmd_hdr cmd;</div><div class='add'>+	struct l2cap_cmd_hdr *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	l2cap_raw_recv(conn, skb);</div><div class='hunk'>@@ -5726,35 +5537,36 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,</div><div class='ctx'> 	if (hcon-&gt;type != ACL_LINK)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	while (len &gt;= L2CAP_CMD_HDR_SIZE) {</div><div class='del'>-		u16 cmd_len;</div><div class='del'>-		memcpy(&amp;cmd, data, L2CAP_CMD_HDR_SIZE);</div><div class='del'>-		data += L2CAP_CMD_HDR_SIZE;</div><div class='del'>-		len  -= L2CAP_CMD_HDR_SIZE;</div><div class='add'>+	while (skb-&gt;len &gt;= L2CAP_CMD_HDR_SIZE) {</div><div class='add'>+		u16 len;</div><div class='add'>+</div><div class='add'>+		cmd = (void *) skb-&gt;data;</div><div class='add'>+		skb_pull(skb, L2CAP_CMD_HDR_SIZE);</div><div class='ctx'> </div><div class='del'>-		cmd_len = le16_to_cpu(cmd.len);</div><div class='add'>+		len = le16_to_cpu(cmd-&gt;len);</div><div class='ctx'> </div><div class='del'>-		BT_DBG("code 0x%2.2x len %d id 0x%2.2x", cmd.code, cmd_len,</div><div class='del'>-		       cmd.ident);</div><div class='add'>+		BT_DBG("code 0x%2.2x len %d id 0x%2.2x", cmd-&gt;code, len,</div><div class='add'>+		       cmd-&gt;ident);</div><div class='ctx'> </div><div class='del'>-		if (cmd_len &gt; len || !cmd.ident) {</div><div class='add'>+		if (len &gt; skb-&gt;len || !cmd-&gt;ident) {</div><div class='ctx'> 			BT_DBG("corrupted command");</div><div class='del'>-			break;</div><div class='add'>+			l2cap_sig_send_rej(conn, cmd-&gt;ident);</div><div class='add'>+			skb_pull(skb, len &gt; skb-&gt;len ? skb-&gt;len : len);</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = l2cap_bredr_sig_cmd(conn, &amp;cmd, cmd_len, data);</div><div class='add'>+		err = l2cap_bredr_sig_cmd(conn, cmd, len, skb-&gt;data);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			struct l2cap_cmd_rej_unk rej;</div><div class='del'>-</div><div class='ctx'> 			BT_ERR("Wrong link type (%d)", err);</div><div class='del'>-</div><div class='del'>-			rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);</div><div class='del'>-			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,</div><div class='del'>-				       sizeof(rej), &amp;rej);</div><div class='add'>+			l2cap_sig_send_rej(conn, cmd-&gt;ident);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		data += cmd_len;</div><div class='del'>-		len  -= cmd_len;</div><div class='add'>+		skb_pull(skb, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; 0) {</div><div class='add'>+		BT_DBG("corrupted command");</div><div class='add'>+		l2cap_sig_send_rej(conn, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='hunk'>@@ -6156,6 +5968,7 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,</div><div class='ctx'> 			       struct l2cap_ctrl *control,</div><div class='ctx'> 			       struct sk_buff *skb, u8 event)</div><div class='ctx'> {</div><div class='add'>+	struct l2cap_ctrl local_control;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	bool skb_in_use = false;</div><div class='ctx'> </div><div class='hunk'>@@ -6180,15 +5993,32 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,</div><div class='ctx'> 			chan-&gt;buffer_seq = chan-&gt;expected_tx_seq;</div><div class='ctx'> 			skb_in_use = true;</div><div class='ctx'> </div><div class='add'>+			/* l2cap_reassemble_sdu may free skb, hence invalidate</div><div class='add'>+			 * control, so make a copy in advance to use it after</div><div class='add'>+			 * l2cap_reassemble_sdu returns and to avoid the race</div><div class='add'>+			 * condition, for example:</div><div class='add'>+			 *</div><div class='add'>+			 * The current thread calls:</div><div class='add'>+			 *   l2cap_reassemble_sdu</div><div class='add'>+			 *     chan-&gt;ops-&gt;recv == l2cap_sock_recv_cb</div><div class='add'>+			 *       __sock_queue_rcv_skb</div><div class='add'>+			 * Another thread calls:</div><div class='add'>+			 *   bt_sock_recvmsg</div><div class='add'>+			 *     skb_recv_datagram</div><div class='add'>+			 *     skb_free_datagram</div><div class='add'>+			 * Then the current thread tries to access control, but</div><div class='add'>+			 * it was freed by skb_free_datagram.</div><div class='add'>+			 */</div><div class='add'>+			local_control = *control;</div><div class='ctx'> 			err = l2cap_reassemble_sdu(chan, skb, control);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			if (control-&gt;final) {</div><div class='add'>+			if (local_control.final) {</div><div class='ctx'> 				if (!test_and_clear_bit(CONN_REJ_ACT,</div><div class='ctx'> 							&amp;chan-&gt;conn_state)) {</div><div class='del'>-					control-&gt;final = 0;</div><div class='del'>-					l2cap_retransmit_all(chan, control);</div><div class='add'>+					local_control.final = 0;</div><div class='add'>+					l2cap_retransmit_all(chan, &amp;local_control);</div><div class='ctx'> 					l2cap_ertm_send(chan);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -6240,8 +6070,8 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,</div><div class='ctx'> 		if (control-&gt;final) {</div><div class='ctx'> 			clear_bit(CONN_REMOTE_BUSY, &amp;chan-&gt;conn_state);</div><div class='ctx'> </div><div class='del'>-			if (!test_and_clear_bit(CONN_REJ_ACT, &amp;chan-&gt;conn_state) &amp;&amp;</div><div class='del'>-			    !__chan_is_moving(chan)) {</div><div class='add'>+			if (!test_and_clear_bit(CONN_REJ_ACT,</div><div class='add'>+						&amp;chan-&gt;conn_state)) {</div><div class='ctx'> 				control-&gt;final = 0;</div><div class='ctx'> 				l2cap_retransmit_all(chan, control);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -6434,11 +6264,7 @@ static int l2cap_finish_move(struct l2cap_chan *chan)</div><div class='ctx'> 	BT_DBG("chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;rx_state = L2CAP_RX_STATE_RECV;</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;hs_hcon)</div><div class='del'>-		chan-&gt;conn-&gt;mtu = chan-&gt;hs_hcon-&gt;hdev-&gt;block_mtu;</div><div class='del'>-	else</div><div class='del'>-		chan-&gt;conn-&gt;mtu = chan-&gt;conn-&gt;hcon-&gt;hdev-&gt;acl_mtu;</div><div class='add'>+	chan-&gt;conn-&gt;mtu = chan-&gt;conn-&gt;hcon-&gt;mtu;</div><div class='ctx'> </div><div class='ctx'> 	return l2cap_resegment(chan);</div><div class='ctx'> }</div><div class='hunk'>@@ -6505,11 +6331,7 @@ static int l2cap_rx_state_wait_f(struct l2cap_chan *chan,</div><div class='ctx'> 	 */</div><div class='ctx'> 	chan-&gt;next_tx_seq = control-&gt;reqseq;</div><div class='ctx'> 	chan-&gt;unacked_frames = 0;</div><div class='del'>-</div><div class='del'>-	if (chan-&gt;hs_hcon)</div><div class='del'>-		chan-&gt;conn-&gt;mtu = chan-&gt;hs_hcon-&gt;hdev-&gt;block_mtu;</div><div class='del'>-	else</div><div class='del'>-		chan-&gt;conn-&gt;mtu = chan-&gt;conn-&gt;hcon-&gt;hdev-&gt;acl_mtu;</div><div class='add'>+	chan-&gt;conn-&gt;mtu = chan-&gt;conn-&gt;hcon-&gt;mtu;</div><div class='ctx'> </div><div class='ctx'> 	err = l2cap_resegment(chan);</div><div class='ctx'> </div><div class='hunk'>@@ -6568,14 +6390,30 @@ static int l2cap_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,</div><div class='ctx'> static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,</div><div class='ctx'> 			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	/* l2cap_reassemble_sdu may free skb, hence invalidate control, so store</div><div class='add'>+	 * the txseq field in advance to use it after l2cap_reassemble_sdu</div><div class='add'>+	 * returns and to avoid the race condition, for example:</div><div class='add'>+	 *</div><div class='add'>+	 * The current thread calls:</div><div class='add'>+	 *   l2cap_reassemble_sdu</div><div class='add'>+	 *     chan-&gt;ops-&gt;recv == l2cap_sock_recv_cb</div><div class='add'>+	 *       __sock_queue_rcv_skb</div><div class='add'>+	 * Another thread calls:</div><div class='add'>+	 *   bt_sock_recvmsg</div><div class='add'>+	 *     skb_recv_datagram</div><div class='add'>+	 *     skb_free_datagram</div><div class='add'>+	 * Then the current thread tries to access control, but it was freed by</div><div class='add'>+	 * skb_free_datagram.</div><div class='add'>+	 */</div><div class='add'>+	u16 txseq = control-&gt;txseq;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("chan %p, control %p, skb %p, state %d", chan, control, skb,</div><div class='ctx'> 	       chan-&gt;rx_state);</div><div class='ctx'> </div><div class='del'>-	if (l2cap_classify_txseq(chan, control-&gt;txseq) ==</div><div class='del'>-	    L2CAP_TXSEQ_EXPECTED) {</div><div class='add'>+	if (l2cap_classify_txseq(chan, txseq) == L2CAP_TXSEQ_EXPECTED) {</div><div class='ctx'> 		l2cap_pass_to_tx(chan, control);</div><div class='ctx'> </div><div class='del'>-		BT_DBG("buffer_seq %d-&gt;%d", chan-&gt;buffer_seq,</div><div class='add'>+		BT_DBG("buffer_seq %u-&gt;%u", chan-&gt;buffer_seq,</div><div class='ctx'> 		       __next_seq(chan, chan-&gt;buffer_seq));</div><div class='ctx'> </div><div class='ctx'> 		chan-&gt;buffer_seq = __next_seq(chan, chan-&gt;buffer_seq);</div><div class='hunk'>@@ -6595,8 +6433,8 @@ static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chan-&gt;last_acked_seq = control-&gt;txseq;</div><div class='del'>-	chan-&gt;expected_tx_seq = __next_seq(chan, control-&gt;txseq);</div><div class='add'>+	chan-&gt;last_acked_seq = txseq;</div><div class='add'>+	chan-&gt;expected_tx_seq = __next_seq(chan, txseq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6630,9 +6468,10 @@ static int l2cap_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((chan-&gt;mode == L2CAP_MODE_ERTM ||</div><div class='del'>-	     chan-&gt;mode == L2CAP_MODE_STREAMING) &amp;&amp; sk_filter(chan-&gt;data, skb))</div><div class='del'>-		goto drop;</div><div class='add'>+	if (chan-&gt;ops-&gt;filter) {</div><div class='add'>+		if (chan-&gt;ops-&gt;filter(chan, skb))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!control-&gt;sframe) {</div><div class='ctx'> 		int err;</div><div class='hunk'>@@ -6697,15 +6536,12 @@ static void l2cap_chan_le_send_credits(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='ctx'> 	struct l2cap_le_credits pkt;</div><div class='del'>-	u16 return_credits;</div><div class='add'>+	u16 return_credits = l2cap_le_rx_credits(chan);</div><div class='ctx'> </div><div class='del'>-	/* We return more credits to the sender only after the amount of</div><div class='del'>-	 * credits falls below half of the initial amount.</div><div class='del'>-	 */</div><div class='del'>-	if (chan-&gt;rx_credits &gt;= (le_max_credits + 1) / 2)</div><div class='add'>+	if (chan-&gt;rx_credits &gt;= return_credits)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	return_credits = le_max_credits - chan-&gt;rx_credits;</div><div class='add'>+	return_credits -= chan-&gt;rx_credits;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p returning %u credits to sender", chan, return_credits);</div><div class='ctx'> </div><div class='hunk'>@@ -6719,7 +6555,41 @@ static void l2cap_chan_le_send_credits(struct l2cap_chan *chan)</div><div class='ctx'> 	l2cap_send_cmd(conn, chan-&gt;ident, L2CAP_LE_CREDITS, sizeof(pkt), &amp;pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='add'>+void l2cap_chan_rx_avail(struct l2cap_chan *chan, ssize_t rx_avail)</div><div class='add'>+{</div><div class='add'>+	if (chan-&gt;rx_avail == rx_avail)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("chan %p has %zd bytes avail for rx", chan, rx_avail);</div><div class='add'>+</div><div class='add'>+	chan-&gt;rx_avail = rx_avail;</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;state == BT_CONNECTED)</div><div class='add'>+		l2cap_chan_le_send_credits(chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int l2cap_ecred_recv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("SDU reassemble complete: chan %p skb-&gt;len %u", chan, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Wait recv to confirm reception before updating the credits */</div><div class='add'>+	err = chan-&gt;ops-&gt;recv(chan, skb);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0 &amp;&amp; chan-&gt;rx_avail != -1) {</div><div class='add'>+		BT_ERR("Queueing received LE L2CAP data failed");</div><div class='add'>+		l2cap_send_disconn_req(chan, ECONNRESET);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update credits whenever an SDU is received */</div><div class='add'>+	l2cap_chan_le_send_credits(chan);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int l2cap_ecred_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -6735,9 +6605,14 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;rx_credits--;</div><div class='del'>-	BT_DBG("rx_credits %u -&gt; %u", chan-&gt;rx_credits + 1, chan-&gt;rx_credits);</div><div class='add'>+	BT_DBG("chan %p: rx_credits %u -&gt; %u",</div><div class='add'>+	       chan, chan-&gt;rx_credits + 1, chan-&gt;rx_credits);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_le_send_credits(chan);</div><div class='add'>+	/* Update if remote had run out of credits, this should only happens</div><div class='add'>+	 * if the remote is not using the entire MPS.</div><div class='add'>+	 */</div><div class='add'>+	if (!chan-&gt;rx_credits)</div><div class='add'>+		l2cap_chan_le_send_credits(chan);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6763,12 +6638,22 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len == sdu_len)</div><div class='del'>-			return chan-&gt;ops-&gt;recv(chan, skb);</div><div class='add'>+			return l2cap_ecred_recv(chan, skb);</div><div class='ctx'> </div><div class='ctx'> 		chan-&gt;sdu = skb;</div><div class='ctx'> 		chan-&gt;sdu_len = sdu_len;</div><div class='ctx'> 		chan-&gt;sdu_last_frag = skb;</div><div class='ctx'> </div><div class='add'>+		/* Detect if remote is not able to use the selected MPS */</div><div class='add'>+		if (skb-&gt;len + L2CAP_SDULEN_SIZE &lt; chan-&gt;mps) {</div><div class='add'>+			u16 mps_len = skb-&gt;len + L2CAP_SDULEN_SIZE;</div><div class='add'>+</div><div class='add'>+			/* Adjust the number of credits */</div><div class='add'>+			BT_DBG("chan-&gt;mps %u -&gt; %u", chan-&gt;mps, mps_len);</div><div class='add'>+			chan-&gt;mps = mps_len;</div><div class='add'>+			l2cap_chan_le_send_credits(chan);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6785,7 +6670,7 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 	skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;sdu-&gt;len == chan-&gt;sdu_len) {</div><div class='del'>-		err = chan-&gt;ops-&gt;recv(chan, chan-&gt;sdu);</div><div class='add'>+		err = l2cap_ecred_recv(chan, chan-&gt;sdu);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			chan-&gt;sdu = NULL;</div><div class='ctx'> 			chan-&gt;sdu_last_frag = NULL;</div><div class='hunk'>@@ -6816,26 +6701,16 @@ static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,</div><div class='ctx'> </div><div class='ctx'> 	chan = l2cap_get_chan_by_scid(conn, cid);</div><div class='ctx'> 	if (!chan) {</div><div class='del'>-		if (cid == L2CAP_CID_A2MP) {</div><div class='del'>-			chan = a2mp_channel_create(conn, skb);</div><div class='del'>-			if (!chan) {</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			l2cap_chan_lock(chan);</div><div class='del'>-		} else {</div><div class='del'>-			BT_DBG("unknown cid 0x%4.4x", cid);</div><div class='del'>-			/* Drop packet and return */</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		BT_DBG("unknown cid 0x%4.4x", cid);</div><div class='add'>+		/* Drop packet and return */</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p, len %d", chan, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* If we receive data on a fixed channel before the info req/rsp</div><div class='del'>-	 * procdure is done simply assume that the channel is supported</div><div class='add'>+	 * procedure is done simply assume that the channel is supported</div><div class='ctx'> 	 * and mark it as ready.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (chan-&gt;chan_type == L2CAP_CHAN_FIXED)</div><div class='hunk'>@@ -6846,7 +6721,8 @@ static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,</div><div class='ctx'> </div><div class='ctx'> 	switch (chan-&gt;mode) {</div><div class='ctx'> 	case L2CAP_MODE_LE_FLOWCTL:</div><div class='del'>-		if (l2cap_le_data_rcv(chan, skb) &lt; 0)</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+		if (l2cap_ecred_data_rcv(chan, skb) &lt; 0)</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -6881,6 +6757,7 @@ drop:</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,</div><div class='hunk'>@@ -6899,6 +6776,8 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p, len %d", chan, skb-&gt;len);</div><div class='ctx'> </div><div class='add'>+	l2cap_chan_lock(chan);</div><div class='add'>+</div><div class='ctx'> 	if (chan-&gt;state != BT_BOUND &amp;&amp; chan-&gt;state != BT_CONNECTED)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='hunk'>@@ -6910,11 +6789,13 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,</div><div class='ctx'> 	bt_cb(skb)-&gt;l2cap.psm = psm;</div><div class='ctx'> </div><div class='ctx'> 	if (!chan-&gt;ops-&gt;recv(chan, skb)) {</div><div class='add'>+		l2cap_chan_unlock(chan);</div><div class='ctx'> 		l2cap_chan_put(chan);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='add'>+	l2cap_chan_unlock(chan);</div><div class='ctx'> 	l2cap_chan_put(chan);</div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -6946,7 +6827,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	 * at least ensure that we ignore incoming data from them.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hcon-&gt;type == LE_LINK &amp;&amp;</div><div class='del'>-	    hci_bdaddr_list_lookup(&amp;hcon-&gt;hdev-&gt;blacklist, &amp;hcon-&gt;dst,</div><div class='add'>+	    hci_bdaddr_list_lookup(&amp;hcon-&gt;hdev-&gt;reject_list, &amp;hcon-&gt;dst,</div><div class='ctx'> 				   bdaddr_dst_type(hcon))) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6983,8 +6864,12 @@ static void process_pending_rx(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("");</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;conn-&gt;pending_rx)))</div><div class='ctx'> 		l2cap_recv_frame(conn, skb);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)</div><div class='hunk'>@@ -7012,33 +6897,18 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hcon %p conn %p hchan %p", hcon, conn, hchan);</div><div class='ctx'> </div><div class='del'>-	switch (hcon-&gt;type) {</div><div class='del'>-	case LE_LINK:</div><div class='del'>-		if (hcon-&gt;hdev-&gt;le_mtu) {</div><div class='del'>-			conn-&gt;mtu = hcon-&gt;hdev-&gt;le_mtu;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		conn-&gt;mtu = hcon-&gt;hdev-&gt;acl_mtu;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	conn-&gt;mtu = hcon-&gt;mtu;</div><div class='ctx'> 	conn-&gt;feat_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;local_fixed_chan = L2CAP_FC_SIG_BREDR | L2CAP_FC_CONNLESS;</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;type == ACL_LINK &amp;&amp;</div><div class='del'>-	    hci_dev_test_flag(hcon-&gt;hdev, HCI_HS_ENABLED))</div><div class='del'>-		conn-&gt;local_fixed_chan |= L2CAP_FC_A2MP;</div><div class='del'>-</div><div class='ctx'> 	if (hci_dev_test_flag(hcon-&gt;hdev, HCI_LE_ENABLED) &amp;&amp;</div><div class='ctx'> 	    (bredr_sc_enabled(hcon-&gt;hdev) ||</div><div class='ctx'> 	     hci_dev_test_flag(hcon-&gt;hdev, HCI_FORCE_BREDR_SMP)))</div><div class='ctx'> 		conn-&gt;local_fixed_chan |= L2CAP_FC_SMP_BREDR;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;conn-&gt;ident_lock);</div><div class='del'>-	mutex_init(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_init(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;conn-&gt;chan_l);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;conn-&gt;users);</div><div class='hunk'>@@ -7047,14 +6917,15 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;conn-&gt;pending_rx);</div><div class='ctx'> 	INIT_WORK(&amp;conn-&gt;pending_rx_work, process_pending_rx);</div><div class='del'>-	INIT_WORK(&amp;conn-&gt;id_addr_update_work, l2cap_conn_update_id_addr);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;conn-&gt;id_addr_timer, l2cap_conn_update_id_addr);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;disc_reason = HCI_ERROR_REMOTE_USER_TERM;</div><div class='ctx'> </div><div class='ctx'> 	return conn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_valid_psm(u16 psm, u8 dst_type) {</div><div class='add'>+static bool is_valid_psm(u16 psm, u8 dst_type)</div><div class='add'>+{</div><div class='ctx'> 	if (!psm)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -7065,16 +6936,43 @@ static bool is_valid_psm(u16 psm, u8 dst_type) {</div><div class='ctx'> 	return ((psm &amp; 0x0101) == 0x0001);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct l2cap_chan_data {</div><div class='add'>+	struct l2cap_chan *chan;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void l2cap_chan_by_pid(struct l2cap_chan *chan, void *data)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_chan_data *d = data;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+</div><div class='add'>+	if (chan == d-&gt;chan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pid = chan-&gt;ops-&gt;get_peer_pid(chan);</div><div class='add'>+</div><div class='add'>+	/* Only count deferred channels with the same PID/PSM */</div><div class='add'>+	if (d-&gt;pid != pid || chan-&gt;psm != d-&gt;chan-&gt;psm || chan-&gt;ident ||</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL || chan-&gt;state != BT_CONNECT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d-&gt;count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,</div><div class='del'>-		       bdaddr_t *dst, u8 dst_type)</div><div class='add'>+		       bdaddr_t *dst, u8 dst_type, u16 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn;</div><div class='ctx'> 	struct hci_conn *hcon;</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%pMR -&gt; %pMR (type %u) psm 0x%2.2x", &amp;chan-&gt;src, dst,</div><div class='del'>-	       dst_type, __le16_to_cpu(psm));</div><div class='add'>+	BT_DBG("%pMR -&gt; %pMR (type %u) psm 0x%4.4x mode 0x%2.2x", &amp;chan-&gt;src,</div><div class='add'>+	       dst, dst_type, __le16_to_cpu(psm), chan-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	hdev = hci_get_route(dst, &amp;chan-&gt;src, chan-&gt;src_type);</div><div class='ctx'> 	if (!hdev)</div><div class='hunk'>@@ -7102,13 +7000,18 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,</div><div class='ctx'> 	case L2CAP_MODE_BASIC:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case L2CAP_MODE_LE_FLOWCTL:</div><div class='del'>-		l2cap_le_flowctl_init(chan);</div><div class='add'>+		break;</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+		if (!enable_ecred) {</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case L2CAP_MODE_ERTM:</div><div class='ctx'> 	case L2CAP_MODE_STREAMING:</div><div class='ctx'> 		if (!disable_ertm)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -7153,18 +7056,18 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,</div><div class='ctx'> 			dst_type = ADDR_LE_DEV_RANDOM;</div><div class='ctx'> </div><div class='ctx'> 		if (hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='del'>-			hcon = hci_connect_le(hdev, dst, dst_type,</div><div class='del'>-					      chan-&gt;sec_level,</div><div class='del'>-					      HCI_LE_CONN_TIMEOUT,</div><div class='del'>-					      HCI_ROLE_SLAVE, NULL);</div><div class='add'>+			hcon = hci_connect_le(hdev, dst, dst_type, false,</div><div class='add'>+					      chan-&gt;sec_level, timeout,</div><div class='add'>+					      HCI_ROLE_SLAVE, 0, 0);</div><div class='ctx'> 		else</div><div class='ctx'> 			hcon = hci_connect_le_scan(hdev, dst, dst_type,</div><div class='del'>-						   chan-&gt;sec_level,</div><div class='del'>-						   HCI_LE_CONN_TIMEOUT);</div><div class='add'>+						   chan-&gt;sec_level, timeout,</div><div class='add'>+						   CONN_REASON_L2CAP_CHAN);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 auth_type = l2cap_get_auth_type(chan);</div><div class='del'>-		hcon = hci_connect_acl(hdev, dst, chan-&gt;sec_level, auth_type);</div><div class='add'>+		hcon = hci_connect_acl(hdev, dst, chan-&gt;sec_level, auth_type,</div><div class='add'>+				       CONN_REASON_L2CAP_CHAN, timeout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(hcon)) {</div><div class='hunk'>@@ -7179,7 +7082,24 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	if (chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL) {</div><div class='add'>+		struct l2cap_chan_data data;</div><div class='add'>+</div><div class='add'>+		data.chan = chan;</div><div class='add'>+		data.pid = chan-&gt;ops-&gt;get_peer_pid(chan);</div><div class='add'>+		data.count = 1;</div><div class='add'>+</div><div class='add'>+		l2cap_chan_list(conn, l2cap_chan_by_pid, &amp;data);</div><div class='add'>+</div><div class='add'>+		/* Check if there isn't too many channels being connected */</div><div class='add'>+		if (data.count &gt; L2CAP_ECRED_CONN_SCID_MAX) {</div><div class='add'>+			hci_conn_drop(hcon);</div><div class='add'>+			err = -EPROTO;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='ctx'> 	if (cid &amp;&amp; __l2cap_get_chan_by_dcid(conn, cid)) {</div><div class='hunk'>@@ -7220,7 +7140,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,</div><div class='ctx'> </div><div class='ctx'> chan_unlock:</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> done:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	hci_dev_put(hdev);</div><div class='hunk'>@@ -7228,6 +7148,35 @@ done:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2cap_chan_connect);</div><div class='ctx'> </div><div class='add'>+static void l2cap_ecred_reconfigure(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='add'>+	DEFINE_RAW_FLEX(struct l2cap_ecred_reconf_req, pdu, scid, 1);</div><div class='add'>+</div><div class='add'>+	pdu-&gt;mtu = cpu_to_le16(chan-&gt;imtu);</div><div class='add'>+	pdu-&gt;mps = cpu_to_le16(chan-&gt;mps);</div><div class='add'>+	pdu-&gt;scid[0] = cpu_to_le16(chan-&gt;scid);</div><div class='add'>+</div><div class='add'>+	chan-&gt;ident = l2cap_get_ident(conn);</div><div class='add'>+</div><div class='add'>+	l2cap_send_cmd(conn, chan-&gt;ident, L2CAP_ECRED_RECONF_REQ,</div><div class='add'>+		       sizeof(pdu), &amp;pdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int l2cap_chan_reconfigure(struct l2cap_chan *chan, __u16 mtu)</div><div class='add'>+{</div><div class='add'>+	if (chan-&gt;imtu &gt; mtu)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	BT_DBG("chan %p mtu 0x%4.4x", chan, mtu);</div><div class='add'>+</div><div class='add'>+	chan-&gt;imtu = mtu;</div><div class='add'>+</div><div class='add'>+	l2cap_ecred_reconfigure(chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ---- L2CAP interface with lower layer (HCI) ---- */</div><div class='ctx'> </div><div class='ctx'> int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)</div><div class='hunk'>@@ -7285,7 +7234,7 @@ static struct l2cap_chan *l2cap_global_fixed_chan(struct l2cap_chan *c,</div><div class='ctx'> 		if (src_type != c-&gt;src_type)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		l2cap_chan_hold(c);</div><div class='add'>+		c = l2cap_chan_hold_unless_zero(c);</div><div class='ctx'> 		read_unlock(&amp;chan_list_lock);</div><div class='ctx'> 		return c;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7319,7 +7268,7 @@ static void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)</div><div class='ctx'> 	dst_type = bdaddr_dst_type(hcon);</div><div class='ctx'> </div><div class='ctx'> 	/* If device is blocked, do not create channels for it */</div><div class='del'>-	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;blacklist, &amp;hcon-&gt;dst, dst_type))</div><div class='add'>+	if (hci_bdaddr_list_lookup(&amp;hdev-&gt;reject_list, &amp;hcon-&gt;dst, dst_type))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Find fixed channels and notify them of the new connection. We</div><div class='hunk'>@@ -7404,7 +7353,7 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("conn %p status 0x%2.2x encrypt %u", conn, status, encrypt);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(chan, &amp;conn-&gt;chan_l, list) {</div><div class='ctx'> 		l2cap_chan_lock(chan);</div><div class='hunk'>@@ -7412,11 +7361,6 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)</div><div class='ctx'> 		BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan-&gt;scid,</div><div class='ctx'> 		       state_to_string(chan-&gt;state));</div><div class='ctx'> </div><div class='del'>-		if (chan-&gt;scid == L2CAP_CID_A2MP) {</div><div class='del'>-			l2cap_chan_unlock(chan);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (!status &amp;&amp; encrypt)</div><div class='ctx'> 			chan-&gt;sec_level = hcon-&gt;sec_level;</div><div class='ctx'> </div><div class='hunk'>@@ -7434,16 +7378,17 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (chan-&gt;state == BT_CONNECT) {</div><div class='del'>-			if (!status)</div><div class='add'>+			if (!status &amp;&amp; l2cap_check_enc_key_size(hcon, chan))</div><div class='ctx'> 				l2cap_start_connection(chan);</div><div class='ctx'> 			else</div><div class='ctx'> 				__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);</div><div class='ctx'> 		} else if (chan-&gt;state == BT_CONNECT2 &amp;&amp;</div><div class='del'>-			   chan-&gt;mode != L2CAP_MODE_LE_FLOWCTL) {</div><div class='add'>+			   !(chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL ||</div><div class='add'>+			     chan-&gt;mode == L2CAP_MODE_LE_FLOWCTL)) {</div><div class='ctx'> 			struct l2cap_conn_rsp rsp;</div><div class='ctx'> 			__u16 res, stat;</div><div class='ctx'> </div><div class='del'>-			if (!status) {</div><div class='add'>+			if (!status &amp;&amp; l2cap_check_enc_key_size(hcon, chan)) {</div><div class='ctx'> 				if (test_bit(FLAG_DEFER_SETUP, &amp;chan-&gt;flags)) {</div><div class='ctx'> 					res = L2CAP_CR_PEND;</div><div class='ctx'> 					stat = L2CAP_CS_AUTHOR_PEND;</div><div class='hunk'>@@ -7482,96 +7427,216 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)</div><div class='ctx'> 		l2cap_chan_unlock(chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)</div><div class='add'>+/* Append fragment into frame respecting the maximum len of rx_skb */</div><div class='add'>+static int l2cap_recv_frag(struct l2cap_conn *conn, struct sk_buff *skb,</div><div class='add'>+			   u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct l2cap_conn *conn = hcon-&gt;l2cap_data;</div><div class='del'>-	struct l2cap_hdr *hdr;</div><div class='add'>+	if (!conn-&gt;rx_skb) {</div><div class='add'>+		/* Allocate skb for the complete frame (with header) */</div><div class='add'>+		conn-&gt;rx_skb = bt_skb_alloc(len, GFP_KERNEL);</div><div class='add'>+		if (!conn-&gt;rx_skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		/* Init rx_len */</div><div class='add'>+		conn-&gt;rx_len = len;</div><div class='add'>+</div><div class='add'>+		skb_set_delivery_time(conn-&gt;rx_skb, skb-&gt;tstamp,</div><div class='add'>+				      skb-&gt;tstamp_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy as much as the rx_skb can hold */</div><div class='add'>+	len = min_t(u16, len, skb-&gt;len);</div><div class='add'>+	skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, len), len);</div><div class='add'>+	skb_pull(skb, len);</div><div class='add'>+	conn-&gt;rx_len -= len;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int l2cap_recv_len(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *rx_skb;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	/* For AMP controller do not create l2cap conn */</div><div class='del'>-	if (!conn &amp;&amp; hcon-&gt;hdev-&gt;dev_type != HCI_PRIMARY)</div><div class='del'>-		goto drop;</div><div class='add'>+	/* Append just enough to complete the header */</div><div class='add'>+	len = l2cap_recv_frag(conn, skb, L2CAP_LEN_SIZE - conn-&gt;rx_skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* If header could not be read just continue */</div><div class='add'>+	if (len &lt; 0 || conn-&gt;rx_skb-&gt;len &lt; L2CAP_LEN_SIZE)</div><div class='add'>+		return len;</div><div class='add'>+</div><div class='add'>+	rx_skb = conn-&gt;rx_skb;</div><div class='add'>+	len = get_unaligned_le16(rx_skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	/* Check if rx_skb has enough space to received all fragments */</div><div class='add'>+	if (len + (L2CAP_HDR_SIZE - L2CAP_LEN_SIZE) &lt;= skb_tailroom(rx_skb)) {</div><div class='add'>+		/* Update expected len */</div><div class='add'>+		conn-&gt;rx_len = len + (L2CAP_HDR_SIZE - L2CAP_LEN_SIZE);</div><div class='add'>+		return L2CAP_LEN_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset conn-&gt;rx_skb since it will need to be reallocated in order to</div><div class='add'>+	 * fit all fragments.</div><div class='add'>+	 */</div><div class='add'>+	conn-&gt;rx_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* Reallocates rx_skb using the exact expected length */</div><div class='add'>+	len = l2cap_recv_frag(conn, rx_skb,</div><div class='add'>+			      len + (L2CAP_HDR_SIZE - L2CAP_LEN_SIZE));</div><div class='add'>+	kfree_skb(rx_skb);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2cap_recv_reset(struct l2cap_conn *conn)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(conn-&gt;rx_skb);</div><div class='add'>+	conn-&gt;rx_skb = NULL;</div><div class='add'>+	conn-&gt;rx_len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct l2cap_conn *l2cap_conn_hold_unless_zero(struct l2cap_conn *c)</div><div class='add'>+{</div><div class='add'>+	if (!c)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p orig refcnt %u", c, kref_read(&amp;c-&gt;ref));</div><div class='add'>+</div><div class='add'>+	if (!kref_get_unless_zero(&amp;c-&gt;ref))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int l2cap_recv_acldata(struct hci_dev *hdev, u16 handle,</div><div class='add'>+		       struct sk_buff *skb, u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct l2cap_conn *conn;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	/* Lock hdev for hci_conn, and race on l2cap_data vs. l2cap_conn_del */</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hcon = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!hcon) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_conn_enter_active_mode(hcon, BT_POWER_FORCE_ACTIVE_OFF);</div><div class='add'>+</div><div class='add'>+	conn = hcon-&gt;l2cap_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		conn = l2cap_conn_add(hcon);</div><div class='ctx'> </div><div class='del'>-	if (!conn)</div><div class='del'>-		goto drop;</div><div class='add'>+	conn = l2cap_conn_hold_unless_zero(conn);</div><div class='add'>+	hcon = NULL;</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!conn) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p len %d flags 0x%x", conn, skb-&gt;len, flags);</div><div class='add'>+	BT_DBG("conn %p len %u flags 0x%x", conn, skb-&gt;len, flags);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (flags) {</div><div class='ctx'> 	case ACL_START:</div><div class='ctx'> 	case ACL_START_NO_FLUSH:</div><div class='ctx'> 	case ACL_COMPLETE:</div><div class='del'>-		if (conn-&gt;rx_len) {</div><div class='add'>+		if (conn-&gt;rx_skb) {</div><div class='ctx'> 			BT_ERR("Unexpected start frame (len %d)", skb-&gt;len);</div><div class='del'>-			kfree_skb(conn-&gt;rx_skb);</div><div class='del'>-			conn-&gt;rx_skb = NULL;</div><div class='del'>-			conn-&gt;rx_len = 0;</div><div class='add'>+			l2cap_recv_reset(conn);</div><div class='ctx'> 			l2cap_conn_unreliable(conn, ECOMM);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Start fragment always begin with Basic L2CAP header */</div><div class='del'>-		if (skb-&gt;len &lt; L2CAP_HDR_SIZE) {</div><div class='del'>-			BT_ERR("Frame is too short (len %d)", skb-&gt;len);</div><div class='del'>-			l2cap_conn_unreliable(conn, ECOMM);</div><div class='del'>-			goto drop;</div><div class='add'>+		/* Start fragment may not contain the L2CAP length so just</div><div class='add'>+		 * copy the initial byte when that happens and use conn-&gt;mtu as</div><div class='add'>+		 * expected length.</div><div class='add'>+		 */</div><div class='add'>+		if (skb-&gt;len &lt; L2CAP_LEN_SIZE) {</div><div class='add'>+			l2cap_recv_frag(conn, skb, conn-&gt;mtu);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hdr = (struct l2cap_hdr *) skb-&gt;data;</div><div class='del'>-		len = __le16_to_cpu(hdr-&gt;len) + L2CAP_HDR_SIZE;</div><div class='add'>+		len = get_unaligned_le16(skb-&gt;data) + L2CAP_HDR_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		if (len == skb-&gt;len) {</div><div class='ctx'> 			/* Complete frame received */</div><div class='ctx'> 			l2cap_recv_frame(conn, skb);</div><div class='del'>-			return;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BT_DBG("Start: total len %d, frag len %d", len, skb-&gt;len);</div><div class='add'>+		BT_DBG("Start: total len %d, frag len %u", len, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len &gt; len) {</div><div class='del'>-			BT_ERR("Frame is too long (len %d, expected len %d)",</div><div class='add'>+			BT_ERR("Frame is too long (len %u, expected len %d)",</div><div class='ctx'> 			       skb-&gt;len, len);</div><div class='add'>+			/* PTS test cases L2CAP/COS/CED/BI-14-C and BI-15-C</div><div class='add'>+			 * (Multiple Signaling Command in one PDU, Data</div><div class='add'>+			 * Truncated, BR/EDR) send a C-frame to the IUT with</div><div class='add'>+			 * PDU Length set to 8 and Channel ID set to the</div><div class='add'>+			 * correct signaling channel for the logical link.</div><div class='add'>+			 * The Information payload contains one L2CAP_ECHO_REQ</div><div class='add'>+			 * packet with Data Length set to 0 with 0 octets of</div><div class='add'>+			 * echo data and one invalid command packet due to</div><div class='add'>+			 * data truncated in PDU but present in HCI packet.</div><div class='add'>+			 *</div><div class='add'>+			 * Shorter the socket buffer to the PDU length to</div><div class='add'>+			 * allow to process valid commands from the PDU before</div><div class='add'>+			 * setting the socket unreliable.</div><div class='add'>+			 */</div><div class='add'>+			skb-&gt;len = len;</div><div class='add'>+			l2cap_recv_frame(conn, skb);</div><div class='ctx'> 			l2cap_conn_unreliable(conn, ECOMM);</div><div class='del'>-			goto drop;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Allocate skb for the complete frame (with header) */</div><div class='del'>-		conn-&gt;rx_skb = bt_skb_alloc(len, GFP_KERNEL);</div><div class='del'>-		if (!conn-&gt;rx_skb)</div><div class='add'>+		/* Append fragment into frame (with header) */</div><div class='add'>+		if (l2cap_recv_frag(conn, skb, len) &lt; 0)</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='del'>-		skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, skb-&gt;len),</div><div class='del'>-					  skb-&gt;len);</div><div class='del'>-		conn-&gt;rx_len = len - skb-&gt;len;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACL_CONT:</div><div class='del'>-		BT_DBG("Cont: frag len %d (expecting %d)", skb-&gt;len, conn-&gt;rx_len);</div><div class='add'>+		BT_DBG("Cont: frag len %u (expecting %u)", skb-&gt;len, conn-&gt;rx_len);</div><div class='ctx'> </div><div class='del'>-		if (!conn-&gt;rx_len) {</div><div class='add'>+		if (!conn-&gt;rx_skb) {</div><div class='ctx'> 			BT_ERR("Unexpected continuation frame (len %d)", skb-&gt;len);</div><div class='ctx'> 			l2cap_conn_unreliable(conn, ECOMM);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Complete the L2CAP length if it has not been read */</div><div class='add'>+		if (conn-&gt;rx_skb-&gt;len &lt; L2CAP_LEN_SIZE) {</div><div class='add'>+			if (l2cap_recv_len(conn, skb) &lt; 0) {</div><div class='add'>+				l2cap_conn_unreliable(conn, ECOMM);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Header still could not be read just continue */</div><div class='add'>+			if (conn-&gt;rx_skb-&gt;len &lt; L2CAP_LEN_SIZE)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (skb-&gt;len &gt; conn-&gt;rx_len) {</div><div class='del'>-			BT_ERR("Fragment is too long (len %d, expected %d)",</div><div class='add'>+			BT_ERR("Fragment is too long (len %u, expected %u)",</div><div class='ctx'> 			       skb-&gt;len, conn-&gt;rx_len);</div><div class='del'>-			kfree_skb(conn-&gt;rx_skb);</div><div class='del'>-			conn-&gt;rx_skb = NULL;</div><div class='del'>-			conn-&gt;rx_len = 0;</div><div class='add'>+			l2cap_recv_reset(conn);</div><div class='ctx'> 			l2cap_conn_unreliable(conn, ECOMM);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_copy_from_linear_data(skb, skb_put(conn-&gt;rx_skb, skb-&gt;len),</div><div class='del'>-					  skb-&gt;len);</div><div class='del'>-		conn-&gt;rx_len -= skb-&gt;len;</div><div class='add'>+		/* Append fragment into frame (with header) */</div><div class='add'>+		l2cap_recv_frag(conn, skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		if (!conn-&gt;rx_len) {</div><div class='ctx'> 			/* Complete frame received. l2cap_recv_frame</div><div class='hunk'>@@ -7587,6 +7652,10 @@ void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;lock);</div><div class='add'>+	l2cap_conn_put(conn);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct hci_cb l2cap_cb = {</div><div class='hunk'>@@ -7615,17 +7684,7 @@ static int l2cap_debugfs_show(struct seq_file *f, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2cap_debugfs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, l2cap_debugfs_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations l2cap_debugfs_fops = {</div><div class='del'>-	.open		= l2cap_debugfs_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(l2cap_debugfs);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *l2cap_debugfs;</div><div class='ctx'> </div><div class='hunk'>@@ -7645,11 +7704,6 @@ int __init l2cap_init(void)</div><div class='ctx'> 	l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,</div><div class='ctx'> 					    NULL, &amp;l2cap_debugfs_fops);</div><div class='ctx'> </div><div class='del'>-	debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,</div><div class='del'>-			   &amp;le_max_credits);</div><div class='del'>-	debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,</div><div class='del'>-			   &amp;le_default_mps);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7662,3 +7716,6 @@ void l2cap_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_param(disable_ertm, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode");</div><div class='add'>+</div><div class='add'>+module_param(enable_ecred, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_ecred, "Enable enhanced credit flow control mode");</div><div class='head'>diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c<br/>index 686bdc6b35b0..9ee189c815d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/l2cap_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/l2cap_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/l2cap_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/l2cap_sock.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='hunk'>@@ -45,6 +46,7 @@ static const struct proto_ops l2cap_sock_ops;</div><div class='ctx'> static void l2cap_sock_init(struct sock *sk, struct sock *parent);</div><div class='ctx'> static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,</div><div class='ctx'> 				     int proto, gfp_t prio, int kern);</div><div class='add'>+static void l2cap_sock_cleanup_listen(struct sock *parent);</div><div class='ctx'> </div><div class='ctx'> bool l2cap_is_socket(struct socket *sock)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,7 +80,7 @@ static int l2cap_validate_le_psm(u16 psm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)</div><div class='add'>+static int l2cap_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int alen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='hunk'>@@ -161,7 +163,11 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;psm &amp;&amp; bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+	/* Use L2CAP_MODE_LE_FLOWCTL (CoC) in case of LE address and</div><div class='add'>+	 * L2CAP_MODE_EXT_FLOWCTL (ECRED) has not been set.</div><div class='add'>+	 */</div><div class='add'>+	if (chan-&gt;psm &amp;&amp; bdaddr_type_is_le(chan-&gt;src_type) &amp;&amp;</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL)</div><div class='ctx'> 		chan-&gt;mode = L2CAP_MODE_LE_FLOWCTL;</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;state = BT_BOUND;</div><div class='hunk'>@@ -172,16 +178,24 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+static int l2cap_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='ctx'> 			      int alen, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	struct sockaddr_l2 la;</div><div class='ctx'> 	int len, err = 0;</div><div class='add'>+	bool zapped;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	zapped = sock_flag(sk, SOCK_ZAPPED);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (zapped)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (!addr || alen &lt; offsetofend(struct sockaddr, sa_family) ||</div><div class='ctx'> 	    addr-&gt;sa_family != AF_BLUETOOTH)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -232,11 +246,16 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;psm &amp;&amp; bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+	/* Use L2CAP_MODE_LE_FLOWCTL (CoC) in case of LE address and</div><div class='add'>+	 * L2CAP_MODE_EXT_FLOWCTL (ECRED) has not been set.</div><div class='add'>+	 */</div><div class='add'>+	if (chan-&gt;psm &amp;&amp; bdaddr_type_is_le(chan-&gt;src_type) &amp;&amp;</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL)</div><div class='ctx'> 		chan-&gt;mode = L2CAP_MODE_LE_FLOWCTL;</div><div class='ctx'> </div><div class='ctx'> 	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),</div><div class='del'>-				 &amp;la.l2_bdaddr, la.l2_bdaddr_type);</div><div class='add'>+				 &amp;la.l2_bdaddr, la.l2_bdaddr_type,</div><div class='add'>+				 READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -274,11 +293,17 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)</div><div class='ctx'> 	case L2CAP_MODE_BASIC:</div><div class='ctx'> 	case L2CAP_MODE_LE_FLOWCTL:</div><div class='ctx'> 		break;</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+		if (!enable_ecred) {</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case L2CAP_MODE_ERTM:</div><div class='ctx'> 	case L2CAP_MODE_STREAMING:</div><div class='ctx'> 		if (!disable_ertm)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -302,7 +327,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='del'>-			     int flags, bool kern)</div><div class='add'>+			     struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk, *nsk;</div><div class='hunk'>@@ -311,7 +336,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='ctx'> </div><div class='ctx'> 	lock_sock_nested(sk, L2CAP_NESTING_PARENT);</div><div class='ctx'> </div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+	timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p timeo %ld", sk, timeo);</div><div class='ctx'> </div><div class='hunk'>@@ -389,6 +414,24 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 	return sizeof(struct sockaddr_l2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2cap_get_mode(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	switch (chan-&gt;mode) {</div><div class='add'>+	case L2CAP_MODE_BASIC:</div><div class='add'>+		return BT_MODE_BASIC;</div><div class='add'>+	case L2CAP_MODE_ERTM:</div><div class='add'>+		return BT_MODE_ERTM;</div><div class='add'>+	case L2CAP_MODE_STREAMING:</div><div class='add'>+		return BT_MODE_STREAMING;</div><div class='add'>+	case L2CAP_MODE_LE_FLOWCTL:</div><div class='add'>+		return BT_MODE_LE_FLOWCTL;</div><div class='add'>+	case L2CAP_MODE_EXT_FLOWCTL:</div><div class='add'>+		return BT_MODE_EXT_FLOWCTL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 				     char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -396,7 +439,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	struct l2cap_options opts;</div><div class='ctx'> 	struct l2cap_conninfo cinfo;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	size_t len;</div><div class='ctx'> 	u32 opt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='hunk'>@@ -418,6 +462,20 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Only BR/EDR modes are supported here */</div><div class='add'>+		switch (chan-&gt;mode) {</div><div class='add'>+		case L2CAP_MODE_BASIC:</div><div class='add'>+		case L2CAP_MODE_ERTM:</div><div class='add'>+		case L2CAP_MODE_STREAMING:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		memset(&amp;opts, 0, sizeof(opts));</div><div class='ctx'> 		opts.imtu     = chan-&gt;imtu;</div><div class='ctx'> 		opts.omtu     = chan-&gt;omtu;</div><div class='hunk'>@@ -427,7 +485,9 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		opts.max_tx   = chan-&gt;max_tx;</div><div class='ctx'> 		opts.txwin_size = chan-&gt;tx_win;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(opts));</div><div class='add'>+		BT_DBG("mode 0x%2.2x", chan-&gt;mode);</div><div class='add'>+</div><div class='add'>+		len = min(len, sizeof(opts));</div><div class='ctx'> 		if (copy_to_user(optval, (char *) &amp;opts, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +537,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		cinfo.hci_handle = chan-&gt;conn-&gt;hcon-&gt;handle;</div><div class='ctx'> 		memcpy(cinfo.dev_class, chan-&gt;conn-&gt;hcon-&gt;dev_class, 3);</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(cinfo));</div><div class='add'>+		len = min(len, sizeof(cinfo));</div><div class='ctx'> 		if (copy_to_user(optval, (char *) &amp;cinfo, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -499,7 +559,8 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	struct bt_security sec;</div><div class='ctx'> 	struct bt_power pwr;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	u32 phys;</div><div class='add'>+	int len, mode, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -603,6 +664,39 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case BT_PHY:</div><div class='add'>+		if (sk-&gt;sk_state != BT_CONNECTED) {</div><div class='add'>+			err = -ENOTCONN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phys = hci_conn_get_phy(chan-&gt;conn-&gt;hcon);</div><div class='add'>+</div><div class='add'>+		if (put_user(phys, (u32 __user *) optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_MODE:</div><div class='add'>+		if (!enable_ecred) {</div><div class='add'>+			err = -ENOPROTOOPT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;chan_type != L2CAP_CHAN_CONN_ORIENTED) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mode = l2cap_get_mode(chan);</div><div class='add'>+		if (mode &lt; 0) {</div><div class='add'>+			err = mode;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (put_user(mode, (u8 __user *) optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOPROTOOPT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -616,12 +710,12 @@ static bool l2cap_valid_mtu(struct l2cap_chan *chan, u16 mtu)</div><div class='ctx'> {</div><div class='ctx'> 	switch (chan-&gt;scid) {</div><div class='ctx'> 	case L2CAP_CID_ATT:</div><div class='del'>-		if (mtu &lt; L2CAP_LE_MIN_MTU)</div><div class='add'>+		if (mtu &amp;&amp; mtu &lt; L2CAP_LE_MIN_MTU)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		if (mtu &lt; L2CAP_DEFAULT_MIN_MTU)</div><div class='add'>+		if (mtu &amp;&amp; mtu &lt; L2CAP_DEFAULT_MIN_MTU)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -629,12 +723,12 @@ static bool l2cap_valid_mtu(struct l2cap_chan *chan, u16 mtu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='del'>-				     char __user *optval, unsigned int optlen)</div><div class='add'>+				     sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	struct l2cap_options opts;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u32 opt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='hunk'>@@ -661,11 +755,10 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		opts.max_tx   = chan-&gt;max_tx;</div><div class='ctx'> 		opts.txwin_size = chan-&gt;tx_win;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, sizeof(opts), optlen);</div><div class='del'>-		if (copy_from_user((char *) &amp;opts, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opts, sizeof(opts), optval,</div><div class='add'>+					     optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opts.txwin_size &gt; L2CAP_DEFAULT_EXT_WINDOW) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -677,10 +770,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		chan-&gt;mode = opts.mode;</div><div class='del'>-		switch (chan-&gt;mode) {</div><div class='del'>-		case L2CAP_MODE_LE_FLOWCTL:</div><div class='del'>-			break;</div><div class='add'>+		/* Only BR/EDR modes are supported here */</div><div class='add'>+		switch (opts.mode) {</div><div class='ctx'> 		case L2CAP_MODE_BASIC:</div><div class='ctx'> 			clear_bit(CONF_STATE2_DEVICE, &amp;chan-&gt;conf_state);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -688,12 +779,19 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		case L2CAP_MODE_STREAMING:</div><div class='ctx'> 			if (!disable_ertm)</div><div class='ctx'> 				break;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		chan-&gt;mode = opts.mode;</div><div class='add'>+</div><div class='add'>+		BT_DBG("mode 0x%2.2x", chan-&gt;mode);</div><div class='add'>+</div><div class='ctx'> 		chan-&gt;imtu = opts.imtu;</div><div class='ctx'> 		chan-&gt;omtu = opts.omtu;</div><div class='ctx'> 		chan-&gt;fcs  = opts.fcs;</div><div class='hunk'>@@ -703,10 +801,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case L2CAP_LM:</div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt &amp; L2CAP_LM_FIPS) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -740,16 +837,57 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2cap_set_mode(struct l2cap_chan *chan, u8 mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case BT_MODE_BASIC:</div><div class='add'>+		if (bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mode = L2CAP_MODE_BASIC;</div><div class='add'>+		clear_bit(CONF_STATE2_DEVICE, &amp;chan-&gt;conf_state);</div><div class='add'>+		break;</div><div class='add'>+	case BT_MODE_ERTM:</div><div class='add'>+		if (!disable_ertm || bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mode = L2CAP_MODE_ERTM;</div><div class='add'>+		break;</div><div class='add'>+	case BT_MODE_STREAMING:</div><div class='add'>+		if (!disable_ertm || bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mode = L2CAP_MODE_STREAMING;</div><div class='add'>+		break;</div><div class='add'>+	case BT_MODE_LE_FLOWCTL:</div><div class='add'>+		if (!bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mode = L2CAP_MODE_LE_FLOWCTL;</div><div class='add'>+		break;</div><div class='add'>+	case BT_MODE_EXT_FLOWCTL:</div><div class='add'>+		/* TODO: Add support for ECRED PDUs to BR/EDR */</div><div class='add'>+		if (!bdaddr_type_is_le(chan-&gt;src_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mode = L2CAP_MODE_EXT_FLOWCTL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chan-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				 char __user *optval, unsigned int optlen)</div><div class='add'>+				 sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	struct bt_security sec;</div><div class='ctx'> 	struct bt_power pwr;</div><div class='ctx'> 	struct l2cap_conn *conn;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u32 opt;</div><div class='add'>+	u16 mtu;</div><div class='add'>+	u8 mode;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -772,11 +910,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		sec.level = BT_SECURITY_LOW;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, sizeof(sec), optlen);</div><div class='del'>-		if (copy_from_user((char *) &amp;sec, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;sec, sizeof(sec), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (sec.level &lt; BT_SECURITY_LOW ||</div><div class='ctx'> 		    sec.level &gt; BT_SECURITY_FIPS) {</div><div class='hunk'>@@ -791,10 +927,13 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		conn = chan-&gt;conn;</div><div class='ctx'> </div><div class='del'>-		/*change security for LE channels */</div><div class='add'>+		/* change security for LE channels */</div><div class='ctx'> 		if (chan-&gt;scid == L2CAP_CID_ATT) {</div><div class='del'>-			if (smp_conn_security(conn-&gt;hcon, sec.level))</div><div class='add'>+			if (smp_conn_security(conn-&gt;hcon, sec.level)) {</div><div class='add'>+				err = -EINVAL;</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			set_bit(FLAG_PENDING_SECURITY, &amp;chan-&gt;flags);</div><div class='ctx'> 			sk-&gt;sk_state = BT_CONFIG;</div><div class='ctx'> 			chan-&gt;state = BT_CONFIG;</div><div class='hunk'>@@ -818,10 +957,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt) {</div><div class='ctx'> 			set_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='hunk'>@@ -833,10 +971,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BT_FLUSHABLE:</div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt &gt; BT_FLUSHABLE_ON) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -868,11 +1005,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, sizeof(pwr), optlen);</div><div class='del'>-		if (copy_from_user((char *) &amp;pwr, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;pwr, sizeof(pwr), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (pwr.force_active)</div><div class='ctx'> 			set_bit(FLAG_FORCE_ACTIVE, &amp;chan-&gt;flags);</div><div class='hunk'>@@ -881,28 +1016,11 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BT_CHANNEL_POLICY:</div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (opt &gt; BT_CHANNEL_POLICY_AMP_PREFERRED) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (chan-&gt;mode != L2CAP_MODE_ERTM &amp;&amp;</div><div class='del'>-		    chan-&gt;mode != L2CAP_MODE_STREAMING) {</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		chan-&gt;chan_policy = (u8) opt;</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_state == BT_CONNECTED &amp;&amp;</div><div class='del'>-		    chan-&gt;move_role == L2CAP_MOVE_ROLE_NONE)</div><div class='del'>-			l2cap_move_start(chan);</div><div class='ctx'> </div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BT_SNDMTU:</div><div class='hunk'>@@ -923,17 +1041,55 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sk-&gt;sk_state == BT_CONNECTED) {</div><div class='add'>+		if (chan-&gt;mode == L2CAP_MODE_LE_FLOWCTL &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state == BT_CONNECTED) {</div><div class='ctx'> 			err = -EISCONN;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_user(opt, (u16 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;mtu, sizeof(mtu), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state == BT_CONNECTED)</div><div class='add'>+			err = l2cap_chan_reconfigure(chan, mtu);</div><div class='add'>+		else</div><div class='add'>+			chan-&gt;imtu = mtu;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_MODE:</div><div class='add'>+		if (!enable_ecred) {</div><div class='add'>+			err = -ENOPROTOOPT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		BT_DBG("sk-&gt;sk_state %u", sk-&gt;sk_state);</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state != BT_BOUND) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;chan_type != L2CAP_CHAN_CONN_ORIENTED) {</div><div class='add'>+			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		chan-&gt;imtu = opt;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;mode, sizeof(mode), optval,</div><div class='add'>+					     optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		BT_DBG("mode %u", mode);</div><div class='add'>+</div><div class='add'>+		err = l2cap_set_mode(chan, mode);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		BT_DBG("mode 0x%2.2x", chan-&gt;mode);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -950,6 +1106,7 @@ static int l2cap_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2cap_chan *chan = l2cap_pi(sk)-&gt;chan;</div><div class='add'>+	struct sockcm_cookie sockc;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='hunk'>@@ -964,6 +1121,14 @@ static int l2cap_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	if (sk-&gt;sk_state != BT_CONNECTED)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='add'>+	hci_sockcm_init(&amp;sockc, sk);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	err = bt_sock_wait_ready(sk, msg-&gt;msg_flags);</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -971,12 +1136,40 @@ static int l2cap_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='del'>-	err = l2cap_chan_send(chan, msg, len);</div><div class='add'>+	err = l2cap_chan_send(chan, msg, len, &amp;sockc);</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l2cap_publish_rx_avail(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = chan-&gt;data;</div><div class='add'>+	ssize_t avail = sk-&gt;sk_rcvbuf - atomic_read(&amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+	int expected_skbs, skb_overhead;</div><div class='add'>+</div><div class='add'>+	if (avail &lt;= 0) {</div><div class='add'>+		l2cap_chan_rx_avail(chan, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!chan-&gt;mps) {</div><div class='add'>+		l2cap_chan_rx_avail(chan, -1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Correct available memory by estimated sk_buff overhead.</div><div class='add'>+	 * This is significant due to small transfer sizes. However, accept</div><div class='add'>+	 * at least one full packet if receive space is non-zero.</div><div class='add'>+	 */</div><div class='add'>+	expected_skbs = DIV_ROUND_UP(avail, chan-&gt;mps);</div><div class='add'>+	skb_overhead = expected_skbs * sizeof(struct sk_buff);</div><div class='add'>+	if (skb_overhead &lt; avail)</div><div class='add'>+		l2cap_chan_rx_avail(chan, avail - skb_overhead);</div><div class='add'>+	else</div><div class='add'>+		l2cap_chan_rx_avail(chan, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			      size_t len, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -984,11 +1177,19 @@ static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	struct l2cap_pinfo *pi = l2cap_pi(sk);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return sock_recv_errqueue(sk, msg, len, SOL_BLUETOOTH,</div><div class='add'>+					  BT_SCM_ERROR);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CONNECT2 &amp;&amp; test_bit(BT_SK_DEFER_SETUP,</div><div class='ctx'> 						    &amp;bt_sk(sk)-&gt;flags)) {</div><div class='del'>-		if (bdaddr_type_is_le(pi-&gt;chan-&gt;src_type)) {</div><div class='add'>+		if (pi-&gt;chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL) {</div><div class='add'>+			sk-&gt;sk_state = BT_CONNECTED;</div><div class='add'>+			pi-&gt;chan-&gt;state = BT_CONNECTED;</div><div class='add'>+			__l2cap_ecred_conn_rsp_defer(pi-&gt;chan);</div><div class='add'>+		} else if (bdaddr_type_is_le(pi-&gt;chan-&gt;src_type)) {</div><div class='ctx'> 			sk-&gt;sk_state = BT_CONNECTED;</div><div class='ctx'> 			pi-&gt;chan-&gt;state = BT_CONNECTED;</div><div class='ctx'> 			__l2cap_le_connect_rsp_defer(pi-&gt;chan);</div><div class='hunk'>@@ -1009,28 +1210,33 @@ static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	else</div><div class='ctx'> 		err = bt_sock_recvmsg(sock, msg, len, flags);</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;chan-&gt;mode != L2CAP_MODE_ERTM)</div><div class='add'>+	if (pi-&gt;chan-&gt;mode != L2CAP_MODE_ERTM &amp;&amp;</div><div class='add'>+	    pi-&gt;chan-&gt;mode != L2CAP_MODE_LE_FLOWCTL &amp;&amp;</div><div class='add'>+	    pi-&gt;chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Attempt to put pending rx data in the socket buffer */</div><div class='del'>-</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(CONN_LOCAL_BUSY, &amp;pi-&gt;chan-&gt;conn_state))</div><div class='del'>-		goto done;</div><div class='add'>+	l2cap_publish_rx_avail(pi-&gt;chan);</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;rx_busy_skb) {</div><div class='del'>-		if (!__sock_queue_rcv_skb(sk, pi-&gt;rx_busy_skb))</div><div class='del'>-			pi-&gt;rx_busy_skb = NULL;</div><div class='del'>-		else</div><div class='add'>+	/* Attempt to put pending rx data in the socket buffer */</div><div class='add'>+	while (!list_empty(&amp;pi-&gt;rx_busy)) {</div><div class='add'>+		struct l2cap_rx_busy *rx_busy =</div><div class='add'>+			list_first_entry(&amp;pi-&gt;rx_busy,</div><div class='add'>+					 struct l2cap_rx_busy,</div><div class='add'>+					 list);</div><div class='add'>+		if (__sock_queue_rcv_skb(sk, rx_busy-&gt;skb) &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='add'>+		list_del(&amp;rx_busy-&gt;list);</div><div class='add'>+		kfree(rx_busy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restore data flow when half of the receive buffer is</div><div class='ctx'> 	 * available.  This avoids resending large numbers of</div><div class='ctx'> 	 * frames.</div><div class='ctx'> 	 */</div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf &gt;&gt; 1)</div><div class='add'>+	if (test_bit(CONN_LOCAL_BUSY, &amp;pi-&gt;chan-&gt;conn_state) &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf &gt;&gt; 1)</div><div class='ctx'> 		l2cap_chan_busy(pi-&gt;chan, 0);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -1039,7 +1245,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Kill socket (only if zapped and orphan)</div><div class='del'>- * Must be called on unlocked socket.</div><div class='add'>+ * Must be called on unlocked socket, with l2cap channel lock.</div><div class='ctx'>  */</div><div class='ctx'> static void l2cap_sock_kill(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -1048,6 +1254,10 @@ static void l2cap_sock_kill(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p state %s", sk, state_to_string(sk-&gt;sk_state));</div><div class='ctx'> </div><div class='add'>+	/* Sock is dead, so set chan data to NULL, avoid other task use invalid</div><div class='add'>+	 * sock pointer.</div><div class='add'>+	 */</div><div class='add'>+	l2cap_pi(sk)-&gt;chan-&gt;data = NULL;</div><div class='ctx'> 	/* Kill poor orphan */</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_put(l2cap_pi(sk)-&gt;chan);</div><div class='hunk'>@@ -1107,14 +1317,21 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 	struct l2cap_conn *conn;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='add'>+	BT_DBG("sock %p, sk %p, how %d", sock, sk, how);</div><div class='add'>+</div><div class='add'>+	/* 'how' parameter is mapped to sk_shutdown as follows:</div><div class='add'>+	 * SHUT_RD   (0) --&gt; RCV_SHUTDOWN  (1)</div><div class='add'>+	 * SHUT_WR   (1) --&gt; SEND_SHUTDOWN (2)</div><div class='add'>+	 * SHUT_RDWR (2) --&gt; SHUTDOWN_MASK (3)</div><div class='add'>+	 */</div><div class='add'>+	how++;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_shutdown)</div><div class='add'>+	if ((sk-&gt;sk_shutdown &amp; how) == how)</div><div class='ctx'> 		goto shutdown_already;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("Handling sock shutdown");</div><div class='hunk'>@@ -1122,9 +1339,10 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 	/* prevent sk structure from being freed whilst unlocked */</div><div class='ctx'> 	sock_hold(sk);</div><div class='ctx'> </div><div class='del'>-	chan = l2cap_pi(sk)-&gt;chan;</div><div class='ctx'> 	/* prevent chan structure from being freed whilst unlocked */</div><div class='del'>-	l2cap_chan_hold(chan);</div><div class='add'>+	chan = l2cap_chan_hold_unless_zero(l2cap_pi(sk)-&gt;chan);</div><div class='add'>+	if (!chan)</div><div class='add'>+		goto shutdown_already;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("chan %p state %s", chan, state_to_string(chan-&gt;state));</div><div class='ctx'> </div><div class='hunk'>@@ -1137,30 +1355,37 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 		 * has already been actioned to close the L2CAP</div><div class='ctx'> 		 * link such as by l2cap_disconnection_req().</div><div class='ctx'> 		 */</div><div class='del'>-		if (sk-&gt;sk_shutdown)</div><div class='del'>-			goto has_shutdown;</div><div class='add'>+		if ((sk-&gt;sk_shutdown &amp; how) == how)</div><div class='add'>+			goto shutdown_matched;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='add'>+	/* Try setting the RCV_SHUTDOWN bit, return early if SEND_SHUTDOWN</div><div class='add'>+	 * is already set</div><div class='add'>+	 */</div><div class='add'>+	if ((how &amp; RCV_SHUTDOWN) &amp;&amp; !(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)) {</div><div class='add'>+		sk-&gt;sk_shutdown |= RCV_SHUTDOWN;</div><div class='add'>+		if ((sk-&gt;sk_shutdown &amp; how) == how)</div><div class='add'>+			goto shutdown_matched;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_shutdown |= SEND_SHUTDOWN;</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='del'>-	conn = chan-&gt;conn;</div><div class='del'>-	if (conn)</div><div class='del'>-		/* prevent conn structure from being freed */</div><div class='del'>-		l2cap_conn_get(conn);</div><div class='add'>+	/* prevent conn structure from being freed */</div><div class='add'>+	conn = l2cap_conn_hold_unless_zero(chan-&gt;conn);</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='ctx'> </div><div class='ctx'> 	if (conn)</div><div class='ctx'> 		/* mutex lock must be taken before l2cap_chan_lock() */</div><div class='del'>-		mutex_lock(&amp;conn-&gt;chan_lock);</div><div class='add'>+		mutex_lock(&amp;conn-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_lock(chan);</div><div class='ctx'> 	l2cap_chan_close(chan, 0);</div><div class='ctx'> 	l2cap_chan_unlock(chan);</div><div class='ctx'> </div><div class='ctx'> 	if (conn) {</div><div class='del'>-		mutex_unlock(&amp;conn-&gt;chan_lock);</div><div class='add'>+		mutex_unlock(&amp;conn-&gt;lock);</div><div class='ctx'> 		l2cap_conn_put(conn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1171,7 +1396,7 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 		err = bt_sock_wait_state(sk, BT_CLOSED,</div><div class='ctx'> 					 sk-&gt;sk_lingertime);</div><div class='ctx'> </div><div class='del'>-has_shutdown:</div><div class='add'>+shutdown_matched:</div><div class='ctx'> 	l2cap_chan_put(chan);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -1190,18 +1415,31 @@ static int l2cap_sock_release(struct socket *sock)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int err;</div><div class='add'>+	struct l2cap_chan *chan;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	lock_sock_nested(sk, L2CAP_NESTING_PARENT);</div><div class='add'>+	l2cap_sock_cleanup_listen(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='ctx'> 	bt_sock_unlink(&amp;l2cap_sk_list, sk);</div><div class='ctx'> </div><div class='del'>-	err = l2cap_sock_shutdown(sock, 2);</div><div class='add'>+	err = l2cap_sock_shutdown(sock, SHUT_RDWR);</div><div class='add'>+	chan = l2cap_pi(sk)-&gt;chan;</div><div class='add'>+</div><div class='add'>+	l2cap_chan_hold(chan);</div><div class='add'>+	l2cap_chan_lock(chan);</div><div class='ctx'> </div><div class='ctx'> 	sock_orphan(sk);</div><div class='ctx'> 	l2cap_sock_kill(sk);</div><div class='add'>+</div><div class='add'>+	l2cap_chan_unlock(chan);</div><div class='add'>+	l2cap_chan_put(chan);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1219,12 +1457,15 @@ static void l2cap_sock_cleanup_listen(struct sock *parent)</div><div class='ctx'> 		BT_DBG("child chan %p state %s", chan,</div><div class='ctx'> 		       state_to_string(chan-&gt;state));</div><div class='ctx'> </div><div class='add'>+		l2cap_chan_hold(chan);</div><div class='ctx'> 		l2cap_chan_lock(chan);</div><div class='add'>+</div><div class='ctx'> 		__clear_chan_timer(chan);</div><div class='ctx'> 		l2cap_chan_close(chan, ECONNRESET);</div><div class='del'>-		l2cap_chan_unlock(chan);</div><div class='del'>-</div><div class='ctx'> 		l2cap_sock_kill(sk);</div><div class='add'>+</div><div class='add'>+		l2cap_chan_unlock(chan);</div><div class='add'>+		l2cap_chan_put(chan);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1252,7 +1493,7 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	l2cap_sock_init(sk, parent);</div><div class='ctx'> </div><div class='del'>-	bt_accept_enqueue(parent, sk);</div><div class='add'>+	bt_accept_enqueue(parent, sk, false);</div><div class='ctx'> </div><div class='ctx'> 	release_sock(parent);</div><div class='ctx'> </div><div class='hunk'>@@ -1261,18 +1502,25 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = chan-&gt;data;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct l2cap_pinfo *pi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	sk = chan-&gt;data;</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (l2cap_pi(sk)-&gt;rx_busy_skb) {</div><div class='add'>+	pi = l2cap_pi(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	if (chan-&gt;mode == L2CAP_MODE_ERTM &amp;&amp; !list_empty(&amp;pi-&gt;rx_busy)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;mode != L2CAP_MODE_ERTM &amp;&amp;</div><div class='del'>-	    chan-&gt;mode != L2CAP_MODE_STREAMING) {</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_STREAMING &amp;&amp;</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_LE_FLOWCTL &amp;&amp;</div><div class='add'>+	    chan-&gt;mode != L2CAP_MODE_EXT_FLOWCTL) {</div><div class='ctx'> 		/* Even if no filter is attached, we could potentially</div><div class='ctx'> 		 * get errors from security modules, etc.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1283,7 +1531,9 @@ static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	err = __sock_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='del'>-	/* For ERTM, handle one skb that doesn't fit into the recv</div><div class='add'>+	l2cap_publish_rx_avail(chan);</div><div class='add'>+</div><div class='add'>+	/* For ERTM and LE, handle a skb that doesn't fit into the recv</div><div class='ctx'> 	 * buffer.  This is important to do because the data frames</div><div class='ctx'> 	 * have already been acked, so the skb cannot be discarded.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1292,8 +1542,18 @@ static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 	 * acked and reassembled until there is buffer space</div><div class='ctx'> 	 * available.</div><div class='ctx'> 	 */</div><div class='del'>-	if (err &lt; 0 &amp;&amp; chan-&gt;mode == L2CAP_MODE_ERTM) {</div><div class='del'>-		l2cap_pi(sk)-&gt;rx_busy_skb = skb;</div><div class='add'>+	if (err &lt; 0 &amp;&amp;</div><div class='add'>+	    (chan-&gt;mode == L2CAP_MODE_ERTM ||</div><div class='add'>+	     chan-&gt;mode == L2CAP_MODE_LE_FLOWCTL ||</div><div class='add'>+	     chan-&gt;mode == L2CAP_MODE_EXT_FLOWCTL)) {</div><div class='add'>+		struct l2cap_rx_busy *rx_busy =</div><div class='add'>+			kmalloc(sizeof(*rx_busy), GFP_KERNEL);</div><div class='add'>+		if (!rx_busy) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		rx_busy-&gt;skb = skb;</div><div class='add'>+		list_add_tail(&amp;rx_busy-&gt;list, &amp;pi-&gt;rx_busy);</div><div class='ctx'> 		l2cap_chan_busy(chan, 1);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1308,6 +1568,9 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = chan-&gt;data;</div><div class='ctx'> </div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	l2cap_sock_kill(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1316,6 +1579,9 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)</div><div class='ctx'> 	struct sock *sk = chan-&gt;data;</div><div class='ctx'> 	struct sock *parent;</div><div class='ctx'> </div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("chan %p state %s", chan, state_to_string(chan-&gt;state));</div><div class='ctx'> </div><div class='ctx'> 	/* This callback can be called both for server (BT_LISTEN)</div><div class='hunk'>@@ -1329,8 +1595,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)</div><div class='ctx'> </div><div class='ctx'> 	parent = bt_sk(sk)-&gt;parent;</div><div class='ctx'> </div><div class='del'>-	sock_set_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='ctx'> 	switch (chan-&gt;state) {</div><div class='ctx'> 	case BT_OPEN:</div><div class='ctx'> 	case BT_BOUND:</div><div class='hunk'>@@ -1357,8 +1621,11 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* Only zap after cleanup to avoid use after free race */</div><div class='add'>+	sock_set_flag(sk, SOCK_ZAPPED);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_sock_state_change_cb(struct l2cap_chan *chan, int state,</div><div class='hunk'>@@ -1387,7 +1654,15 @@ static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='add'>+	/* Channel lock is released before requesting new skb and then</div><div class='add'>+	 * reacquired thus we need to recheck channel state.</div><div class='add'>+	 */</div><div class='add'>+	if (chan-&gt;state != BT_CONNECTED) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ERR_PTR(-ENOTCONN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = READ_ONCE(sk-&gt;sk_priority);</div><div class='ctx'> </div><div class='ctx'> 	bt_cb(skb)-&gt;l2cap.chan = chan;</div><div class='ctx'> </div><div class='hunk'>@@ -1431,6 +1706,9 @@ static void l2cap_sock_resume_cb(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = chan-&gt;data;</div><div class='ctx'> </div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (test_and_clear_bit(FLAG_PENDING_SECURITY, &amp;chan-&gt;flags)) {</div><div class='ctx'> 		sk-&gt;sk_state = BT_CONNECTED;</div><div class='ctx'> 		chan-&gt;state = BT_CONNECTED;</div><div class='hunk'>@@ -1453,7 +1731,14 @@ static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = chan-&gt;data;</div><div class='ctx'> </div><div class='del'>-	return sk-&gt;sk_sndtimeo;</div><div class='add'>+	return READ_ONCE(sk-&gt;sk_sndtimeo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pid *l2cap_sock_get_peer_pid_cb(struct l2cap_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = chan-&gt;data;</div><div class='add'>+</div><div class='add'>+	return sk-&gt;sk_peer_pid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2cap_sock_suspend_cb(struct l2cap_chan *chan)</div><div class='hunk'>@@ -1464,6 +1749,19 @@ static void l2cap_sock_suspend_cb(struct l2cap_chan *chan)</div><div class='ctx'> 	sk-&gt;sk_state_change(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2cap_sock_filter(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = chan-&gt;data;</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;mode) {</div><div class='add'>+	case L2CAP_MODE_ERTM:</div><div class='add'>+	case L2CAP_MODE_STREAMING:</div><div class='add'>+		return sk_filter(sk, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct l2cap_ops l2cap_chan_ops = {</div><div class='ctx'> 	.name			= "L2CAP Socket Interface",</div><div class='ctx'> 	.new_connection		= l2cap_sock_new_connection_cb,</div><div class='hunk'>@@ -1477,19 +1775,26 @@ static const struct l2cap_ops l2cap_chan_ops = {</div><div class='ctx'> 	.suspend		= l2cap_sock_suspend_cb,</div><div class='ctx'> 	.set_shutdown		= l2cap_sock_set_shutdown_cb,</div><div class='ctx'> 	.get_sndtimeo		= l2cap_sock_get_sndtimeo_cb,</div><div class='add'>+	.get_peer_pid		= l2cap_sock_get_peer_pid_cb,</div><div class='ctx'> 	.alloc_skb		= l2cap_sock_alloc_skb_cb,</div><div class='add'>+	.filter			= l2cap_sock_filter,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void l2cap_sock_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	struct l2cap_rx_busy *rx_busy, *next;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='del'>-	if (l2cap_pi(sk)-&gt;chan)</div><div class='add'>+	if (l2cap_pi(sk)-&gt;chan) {</div><div class='add'>+		l2cap_pi(sk)-&gt;chan-&gt;data = NULL;</div><div class='ctx'> 		l2cap_chan_put(l2cap_pi(sk)-&gt;chan);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (l2cap_pi(sk)-&gt;rx_busy_skb) {</div><div class='del'>-		kfree_skb(l2cap_pi(sk)-&gt;rx_busy_skb);</div><div class='del'>-		l2cap_pi(sk)-&gt;rx_busy_skb = NULL;</div><div class='add'>+	list_for_each_entry_safe(rx_busy, next, &amp;l2cap_pi(sk)-&gt;rx_busy, list) {</div><div class='add'>+		kfree_skb(rx_busy-&gt;skb);</div><div class='add'>+		list_del(&amp;rx_busy-&gt;list);</div><div class='add'>+		kfree(rx_busy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='hunk'>@@ -1573,6 +1878,8 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;data = sk;</div><div class='ctx'> 	chan-&gt;ops = &amp;l2cap_chan_ops;</div><div class='add'>+</div><div class='add'>+	l2cap_publish_rx_avail(chan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct proto l2cap_proto = {</div><div class='hunk'>@@ -1587,24 +1894,20 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct l2cap_chan *chan;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, prio, &amp;l2cap_proto, kern);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;l2cap_proto, proto, prio, kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bt_sk(sk)-&gt;accept_q);</div><div class='del'>-</div><div class='ctx'> 	sk-&gt;sk_destruct = l2cap_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_sndtimeo = L2CAP_CONN_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = proto;</div><div class='del'>-	sk-&gt;sk_state = BT_OPEN;</div><div class='add'>+	INIT_LIST_HEAD(&amp;l2cap_pi(sk)-&gt;rx_busy);</div><div class='ctx'> </div><div class='ctx'> 	chan = l2cap_chan_create();</div><div class='ctx'> 	if (!chan) {</div><div class='ctx'> 		sk_free(sk);</div><div class='add'>+		if (sock)</div><div class='add'>+			sock-&gt;sk = NULL;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1655,6 +1958,7 @@ static const struct proto_ops l2cap_sock_ops = {</div><div class='ctx'> 	.recvmsg	= l2cap_sock_recvmsg,</div><div class='ctx'> 	.poll		= bt_sock_poll,</div><div class='ctx'> 	.ioctl		= bt_sock_ioctl,</div><div class='add'>+	.gettstamp	= sock_gettstamp,</div><div class='ctx'> 	.mmap		= sock_no_mmap,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='ctx'> 	.shutdown	= l2cap_sock_shutdown,</div><div class='head'>diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c<br/>index 6d59a5023231..6e349704efe4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/leds.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/leds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/leds.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2015, Heiner Kallweit &lt;hkallweit1@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='hunk'>@@ -51,7 +48,7 @@ static int power_activate(struct led_classdev *led_cdev)</div><div class='ctx'> 	htrig = to_hci_basic_led_trigger(led_cdev-&gt;trigger);</div><div class='ctx'> 	powered = test_bit(HCI_UP, &amp;htrig-&gt;hdev-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	led_trigger_event(led_cdev-&gt;trigger, powered ? LED_FULL : LED_OFF);</div><div class='add'>+	led_set_brightness(led_cdev, powered ? LED_FULL : LED_OFF);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bluetooth/leds.h b/net/bluetooth/leds.h<br/>index 08725a2fbd9b..bb5e09204436 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/leds.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/leds.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/leds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/leds.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2015, Heiner Kallweit &lt;hkallweit1@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BT_LEDS)</div><div class='head'>diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c<br/>index 63e65d9b4b24..305044a84478 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/lib.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/lib.c</a></div><div class='hunk'>@@ -30,6 +30,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * baswap() - Swaps the order of a bd address</div><div class='add'>+ * @dst: Pointer to a bdaddr_t struct that will store the swapped</div><div class='add'>+ * 		 bd address.</div><div class='add'>+ * @src: Pointer to the bdaddr_t struct to be swapped.</div><div class='add'>+ *</div><div class='add'>+ * This function reverses the byte order of a Bluetooth device</div><div class='add'>+ * address.</div><div class='add'>+ */</div><div class='ctx'> void baswap(bdaddr_t *dst, const bdaddr_t *src)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned char *s = (const unsigned char *)src;</div><div class='hunk'>@@ -41,7 +50,19 @@ void baswap(bdaddr_t *dst, const bdaddr_t *src)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(baswap);</div><div class='ctx'> </div><div class='del'>-/* Bluetooth error codes to Unix errno mapping */</div><div class='add'>+/**</div><div class='add'>+ * bt_to_errno() - Bluetooth error codes to standard errno</div><div class='add'>+ * @code: Bluetooth error code to be converted</div><div class='add'>+ *</div><div class='add'>+ * This function takes a Bluetooth error code as input and converts</div><div class='add'>+ * it to an equivalent Unix/standard errno value.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *</div><div class='add'>+ * If the bt error code is known, an equivalent Unix errno value</div><div class='add'>+ * is returned.</div><div class='add'>+ * If the given bt error code is not known, ENOSYS is returned.</div><div class='add'>+ */</div><div class='ctx'> int bt_to_errno(__u16 code)</div><div class='ctx'> {</div><div class='ctx'> 	switch (code) {</div><div class='hunk'>@@ -135,6 +156,93 @@ int bt_to_errno(__u16 code)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_to_errno);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bt_status() - Standard errno value to Bluetooth error code</div><div class='add'>+ * @err: Unix/standard errno value to be converted</div><div class='add'>+ *</div><div class='add'>+ * This function converts a standard/Unix errno value to an</div><div class='add'>+ * equivalent Bluetooth error code.</div><div class='add'>+ *</div><div class='add'>+ * Return: Bluetooth error code.</div><div class='add'>+ *</div><div class='add'>+ * If the given errno is not found, 0x1f is returned by default</div><div class='add'>+ * which indicates an unspecified error.</div><div class='add'>+ * For err &gt;= 0, no conversion is performed, and the same value</div><div class='add'>+ * is immediately returned.</div><div class='add'>+ */</div><div class='add'>+__u8 bt_status(int err)</div><div class='add'>+{</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (err) {</div><div class='add'>+	case -EBADRQC:</div><div class='add'>+		return 0x01;</div><div class='add'>+</div><div class='add'>+	case -ENOTCONN:</div><div class='add'>+		return 0x02;</div><div class='add'>+</div><div class='add'>+	case -EIO:</div><div class='add'>+		return 0x03;</div><div class='add'>+</div><div class='add'>+	case -EHOSTDOWN:</div><div class='add'>+		return 0x04;</div><div class='add'>+</div><div class='add'>+	case -EACCES:</div><div class='add'>+		return 0x05;</div><div class='add'>+</div><div class='add'>+	case -EBADE:</div><div class='add'>+		return 0x06;</div><div class='add'>+</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		return 0x07;</div><div class='add'>+</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		return 0x08;</div><div class='add'>+</div><div class='add'>+	case -EMLINK:</div><div class='add'>+		return 0x09;</div><div class='add'>+</div><div class='add'>+	case -EALREADY:</div><div class='add'>+		return 0x0b;</div><div class='add'>+</div><div class='add'>+	case -EBUSY:</div><div class='add'>+		return 0x0c;</div><div class='add'>+</div><div class='add'>+	case -ECONNREFUSED:</div><div class='add'>+		return 0x0d;</div><div class='add'>+</div><div class='add'>+	case -EOPNOTSUPP:</div><div class='add'>+		return 0x11;</div><div class='add'>+</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		return 0x12;</div><div class='add'>+</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+		return 0x13;</div><div class='add'>+</div><div class='add'>+	case -ECONNABORTED:</div><div class='add'>+		return 0x16;</div><div class='add'>+</div><div class='add'>+	case -ELOOP:</div><div class='add'>+		return 0x17;</div><div class='add'>+</div><div class='add'>+	case -EPROTONOSUPPORT:</div><div class='add'>+		return 0x1a;</div><div class='add'>+</div><div class='add'>+	case -EPROTO:</div><div class='add'>+		return 0x19;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return 0x1f;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bt_status);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bt_info() - Log Bluetooth information message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ */</div><div class='ctx'> void bt_info(const char *format, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -151,6 +259,10 @@ void bt_info(const char *format, ...)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_info);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bt_warn() - Log Bluetooth warning message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ */</div><div class='ctx'> void bt_warn(const char *format, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -167,6 +279,10 @@ void bt_warn(const char *format, ...)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_warn);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bt_err() - Log Bluetooth error message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ */</div><div class='ctx'> void bt_err(const char *format, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -183,6 +299,73 @@ void bt_err(const char *format, ...)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bt_err);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+static bool debug_enable;</div><div class='add'>+</div><div class='add'>+void bt_dbg_set(bool enable)</div><div class='add'>+{</div><div class='add'>+	debug_enable = enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bt_dbg_get(void)</div><div class='add'>+{</div><div class='add'>+	return debug_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bt_dbg() - Log Bluetooth debugging message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ */</div><div class='add'>+void bt_dbg(const char *format, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	if (likely(!debug_enable))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	va_start(args, format);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = format;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG pr_fmt("%pV"), &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bt_dbg);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bt_warn_ratelimited() - Log rate-limited Bluetooth warning message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ *</div><div class='add'>+ * This functions works like bt_warn, but it uses rate limiting</div><div class='add'>+ * to prevent the message from being logged too often.</div><div class='add'>+ */</div><div class='add'>+void bt_warn_ratelimited(const char *format, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, format);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = format;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	pr_warn_ratelimited("%pV", &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bt_warn_ratelimited);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bt_err_ratelimited() - Log rate-limited Bluetooth error message</div><div class='add'>+ * @format: Message's format string</div><div class='add'>+ *</div><div class='add'>+ * This functions works like bt_err, but it uses rate limiting</div><div class='add'>+ * to prevent the message from being logged too often.</div><div class='add'>+ */</div><div class='ctx'> void bt_err_ratelimited(const char *format, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='head'>diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c<br/>index ccce954f8146..c11cdef42b6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/mgmt.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> /* Bluetooth HCI Management interface */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='hunk'>@@ -33,12 +33,15 @@</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/mgmt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hci_request.h"</div><div class='ctx'> #include "smp.h"</div><div class='ctx'> #include "mgmt_util.h"</div><div class='add'>+#include "mgmt_config.h"</div><div class='add'>+#include "msft.h"</div><div class='add'>+#include "eir.h"</div><div class='add'>+#include "aosp.h"</div><div class='ctx'> </div><div class='ctx'> #define MGMT_VERSION	1</div><div class='del'>-#define MGMT_REVISION	14</div><div class='add'>+#define MGMT_REVISION	23</div><div class='ctx'> </div><div class='ctx'> static const u16 mgmt_commands[] = {</div><div class='ctx'> 	MGMT_OP_READ_INDEX_LIST,</div><div class='hunk'>@@ -106,6 +109,30 @@ static const u16 mgmt_commands[] = {</div><div class='ctx'> 	MGMT_OP_START_LIMITED_DISCOVERY,</div><div class='ctx'> 	MGMT_OP_READ_EXT_INFO,</div><div class='ctx'> 	MGMT_OP_SET_APPEARANCE,</div><div class='add'>+	MGMT_OP_GET_PHY_CONFIGURATION,</div><div class='add'>+	MGMT_OP_SET_PHY_CONFIGURATION,</div><div class='add'>+	MGMT_OP_SET_BLOCKED_KEYS,</div><div class='add'>+	MGMT_OP_SET_WIDEBAND_SPEECH,</div><div class='add'>+	MGMT_OP_READ_CONTROLLER_CAP,</div><div class='add'>+	MGMT_OP_READ_EXP_FEATURES_INFO,</div><div class='add'>+	MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+	MGMT_OP_READ_DEF_SYSTEM_CONFIG,</div><div class='add'>+	MGMT_OP_SET_DEF_SYSTEM_CONFIG,</div><div class='add'>+	MGMT_OP_READ_DEF_RUNTIME_CONFIG,</div><div class='add'>+	MGMT_OP_SET_DEF_RUNTIME_CONFIG,</div><div class='add'>+	MGMT_OP_GET_DEVICE_FLAGS,</div><div class='add'>+	MGMT_OP_SET_DEVICE_FLAGS,</div><div class='add'>+	MGMT_OP_READ_ADV_MONITOR_FEATURES,</div><div class='add'>+	MGMT_OP_ADD_ADV_PATTERNS_MONITOR,</div><div class='add'>+	MGMT_OP_REMOVE_ADV_MONITOR,</div><div class='add'>+	MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+	MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+	MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI,</div><div class='add'>+	MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+	MGMT_OP_MESH_READ_FEATURES,</div><div class='add'>+	MGMT_OP_MESH_SEND,</div><div class='add'>+	MGMT_OP_MESH_SEND_CANCEL,</div><div class='add'>+	MGMT_OP_HCI_CMD_SYNC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u16 mgmt_events[] = {</div><div class='hunk'>@@ -144,6 +171,15 @@ static const u16 mgmt_events[] = {</div><div class='ctx'> 	MGMT_EV_ADVERTISING_ADDED,</div><div class='ctx'> 	MGMT_EV_ADVERTISING_REMOVED,</div><div class='ctx'> 	MGMT_EV_EXT_INFO_CHANGED,</div><div class='add'>+	MGMT_EV_PHY_CONFIGURATION_CHANGED,</div><div class='add'>+	MGMT_EV_EXP_FEATURE_CHANGED,</div><div class='add'>+	MGMT_EV_DEVICE_FLAGS_CHANGED,</div><div class='add'>+	MGMT_EV_ADV_MONITOR_ADDED,</div><div class='add'>+	MGMT_EV_ADV_MONITOR_REMOVED,</div><div class='add'>+	MGMT_EV_CONTROLLER_SUSPEND,</div><div class='add'>+	MGMT_EV_CONTROLLER_RESUME,</div><div class='add'>+	MGMT_EV_ADV_MONITOR_DEVICE_FOUND,</div><div class='add'>+	MGMT_EV_ADV_MONITOR_DEVICE_LOST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u16 mgmt_untrusted_commands[] = {</div><div class='hunk'>@@ -153,6 +189,10 @@ static const u16 mgmt_untrusted_commands[] = {</div><div class='ctx'> 	MGMT_OP_READ_CONFIG_INFO,</div><div class='ctx'> 	MGMT_OP_READ_EXT_INDEX_LIST,</div><div class='ctx'> 	MGMT_OP_READ_EXT_INFO,</div><div class='add'>+	MGMT_OP_READ_CONTROLLER_CAP,</div><div class='add'>+	MGMT_OP_READ_EXP_FEATURES_INFO,</div><div class='add'>+	MGMT_OP_READ_DEF_SYSTEM_CONFIG,</div><div class='add'>+	MGMT_OP_READ_DEF_RUNTIME_CONFIG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u16 mgmt_untrusted_events[] = {</div><div class='hunk'>@@ -167,15 +207,16 @@ static const u16 mgmt_untrusted_events[] = {</div><div class='ctx'> 	MGMT_EV_EXT_INDEX_ADDED,</div><div class='ctx'> 	MGMT_EV_EXT_INDEX_REMOVED,</div><div class='ctx'> 	MGMT_EV_EXT_INFO_CHANGED,</div><div class='add'>+	MGMT_EV_EXP_FEATURE_CHANGED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CACHE_TIMEOUT	msecs_to_jiffies(2 * 1000)</div><div class='add'>+#define CACHE_TIMEOUT	secs_to_jiffies(2)</div><div class='ctx'> </div><div class='ctx'> #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \</div><div class='ctx'> 		 "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='ctx'> </div><div class='ctx'> /* HCI to MGMT error code conversion table */</div><div class='del'>-static u8 mgmt_status_table[] = {</div><div class='add'>+static const u8 mgmt_status_table[] = {</div><div class='ctx'> 	MGMT_STATUS_SUCCESS,</div><div class='ctx'> 	MGMT_STATUS_UNKNOWN_COMMAND,	/* Unknown Command */</div><div class='ctx'> 	MGMT_STATUS_NOT_CONNECTED,	/* No Connection */</div><div class='hunk'>@@ -219,12 +260,15 @@ static u8 mgmt_status_table[] = {</div><div class='ctx'> 	MGMT_STATUS_TIMEOUT,		/* Instant Passed */</div><div class='ctx'> 	MGMT_STATUS_NOT_SUPPORTED,	/* Pairing Not Supported */</div><div class='ctx'> 	MGMT_STATUS_FAILED,		/* Transaction Collision */</div><div class='add'>+	MGMT_STATUS_FAILED,		/* Reserved for future use */</div><div class='ctx'> 	MGMT_STATUS_INVALID_PARAMS,	/* Unacceptable Parameter */</div><div class='ctx'> 	MGMT_STATUS_REJECTED,		/* QoS Rejected */</div><div class='ctx'> 	MGMT_STATUS_NOT_SUPPORTED,	/* Classification Not Supported */</div><div class='ctx'> 	MGMT_STATUS_REJECTED,		/* Insufficient Security */</div><div class='ctx'> 	MGMT_STATUS_INVALID_PARAMS,	/* Parameter Out Of Range */</div><div class='add'>+	MGMT_STATUS_FAILED,		/* Reserved for future use */</div><div class='ctx'> 	MGMT_STATUS_BUSY,		/* Role Switch Pending */</div><div class='add'>+	MGMT_STATUS_FAILED,		/* Reserved for future use */</div><div class='ctx'> 	MGMT_STATUS_FAILED,		/* Slot Violation */</div><div class='ctx'> 	MGMT_STATUS_FAILED,		/* Role Switch Failed */</div><div class='ctx'> 	MGMT_STATUS_INVALID_PARAMS,	/* EIR Too Large */</div><div class='hunk'>@@ -239,10 +283,39 @@ static u8 mgmt_status_table[] = {</div><div class='ctx'> 	MGMT_STATUS_CONNECT_FAILED,	/* MAC Connection Failed */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 mgmt_status(u8 hci_status)</div><div class='add'>+static u8 mgmt_errno_status(int err)</div><div class='ctx'> {</div><div class='del'>-	if (hci_status &lt; ARRAY_SIZE(mgmt_status_table))</div><div class='del'>-		return mgmt_status_table[hci_status];</div><div class='add'>+	switch (err) {</div><div class='add'>+	case 0:</div><div class='add'>+		return MGMT_STATUS_SUCCESS;</div><div class='add'>+	case -EPERM:</div><div class='add'>+		return MGMT_STATUS_REJECTED;</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		return MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+	case -EOPNOTSUPP:</div><div class='add'>+		return MGMT_STATUS_NOT_SUPPORTED;</div><div class='add'>+	case -EBUSY:</div><div class='add'>+		return MGMT_STATUS_BUSY;</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		return MGMT_STATUS_AUTH_FAILED;</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		return MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+	case -EISCONN:</div><div class='add'>+		return MGMT_STATUS_ALREADY_CONNECTED;</div><div class='add'>+	case -ENOTCONN:</div><div class='add'>+		return MGMT_STATUS_DISCONNECTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return MGMT_STATUS_FAILED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 mgmt_status(int err)</div><div class='add'>+{</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return mgmt_errno_status(err);</div><div class='add'>+</div><div class='add'>+	if (err &lt; ARRAY_SIZE(mgmt_status_table))</div><div class='add'>+		return mgmt_status_table[err];</div><div class='ctx'> </div><div class='ctx'> 	return MGMT_STATUS_FAILED;</div><div class='ctx'> }</div><div class='hunk'>@@ -268,6 +341,12 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 len,</div><div class='ctx'> 			       HCI_SOCK_TRUSTED, skip_sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mgmt_event_skb(struct sk_buff *skb, struct sock *skip_sk)</div><div class='add'>+{</div><div class='add'>+	return mgmt_send_event_skb(HCI_CHANNEL_CONTROL, skb, HCI_SOCK_TRUSTED,</div><div class='add'>+				   skip_sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 le_addr_type(u8 mgmt_addr_type)</div><div class='ctx'> {</div><div class='ctx'> 	if (mgmt_addr_type == BDADDR_LE_PUBLIC)</div><div class='hunk'>@@ -289,7 +368,7 @@ static int read_version(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_rp_read_version rp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p", sk);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	mgmt_fill_version_info(&amp;rp);</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +384,7 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	size_t rp_size;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p", sk);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hci_sock_test_flag(sk, HCI_SOCK_TRUSTED)) {</div><div class='ctx'> 		num_commands = ARRAY_SIZE(mgmt_commands);</div><div class='hunk'>@@ -358,14 +437,13 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p", sk);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	list_for_each_entry(d, &amp;hci_dev_list, list) {</div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='add'>+		if (!hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='ctx'> 			count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -386,13 +464,12 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		/* Devices marked as raw-only are neither configured</div><div class='ctx'> 		 * nor unconfigured controllers.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;d-&gt;quirks))</div><div class='add'>+		if (hci_test_quirk(d, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-		    !hci_dev_test_flag(d, HCI_UNCONFIGURED)) {</div><div class='add'>+		if (!hci_dev_test_flag(d, HCI_UNCONFIGURED)) {</div><div class='ctx'> 			rp-&gt;index[count++] = cpu_to_le16(d-&gt;id);</div><div class='del'>-			BT_DBG("Added hci%u", d-&gt;id);</div><div class='add'>+			bt_dev_dbg(hdev, "Added hci%u", d-&gt;id);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -418,14 +495,13 @@ static int read_unconf_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p", sk);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	list_for_each_entry(d, &amp;hci_dev_list, list) {</div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='add'>+		if (hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='ctx'> 			count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -446,13 +522,12 @@ static int read_unconf_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		/* Devices marked as raw-only are neither configured</div><div class='ctx'> 		 * nor unconfigured controllers.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;d-&gt;quirks))</div><div class='add'>+		if (hci_test_quirk(d, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(d, HCI_UNCONFIGURED)) {</div><div class='add'>+		if (hci_dev_test_flag(d, HCI_UNCONFIGURED)) {</div><div class='ctx'> 			rp-&gt;index[count++] = cpu_to_le16(d-&gt;id);</div><div class='del'>-			BT_DBG("Added hci%u", d-&gt;id);</div><div class='add'>+			bt_dev_dbg(hdev, "Added hci%u", d-&gt;id);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -474,22 +549,18 @@ static int read_ext_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_rp_read_ext_index_list *rp;</div><div class='ctx'> 	struct hci_dev *d;</div><div class='del'>-	size_t rp_len;</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p", sk);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='del'>-	list_for_each_entry(d, &amp;hci_dev_list, list) {</div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY || d-&gt;dev_type == HCI_AMP)</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(d, &amp;hci_dev_list, list)</div><div class='add'>+		count++;</div><div class='ctx'> </div><div class='del'>-	rp_len = sizeof(*rp) + (sizeof(rp-&gt;entry[0]) * count);</div><div class='del'>-	rp = kmalloc(rp_len, GFP_ATOMIC);</div><div class='add'>+	rp = kmalloc(struct_size(rp, entry, count), GFP_ATOMIC);</div><div class='ctx'> 	if (!rp) {</div><div class='ctx'> 		read_unlock(&amp;hci_dev_list_lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -505,27 +576,20 @@ static int read_ext_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		/* Devices marked as raw-only are neither configured</div><div class='ctx'> 		 * nor unconfigured controllers.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;d-&gt;quirks))</div><div class='add'>+		if (hci_test_quirk(d, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (d-&gt;dev_type == HCI_PRIMARY) {</div><div class='del'>-			if (hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='del'>-				rp-&gt;entry[count].type = 0x01;</div><div class='del'>-			else</div><div class='del'>-				rp-&gt;entry[count].type = 0x00;</div><div class='del'>-		} else if (d-&gt;dev_type == HCI_AMP) {</div><div class='del'>-			rp-&gt;entry[count].type = 0x02;</div><div class='del'>-		} else {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		if (hci_dev_test_flag(d, HCI_UNCONFIGURED))</div><div class='add'>+			rp-&gt;entry[count].type = 0x01;</div><div class='add'>+		else</div><div class='add'>+			rp-&gt;entry[count].type = 0x00;</div><div class='ctx'> </div><div class='ctx'> 		rp-&gt;entry[count].bus = d-&gt;bus;</div><div class='ctx'> 		rp-&gt;entry[count++].index = cpu_to_le16(d-&gt;id);</div><div class='del'>-		BT_DBG("Added hci%u", d-&gt;id);</div><div class='add'>+		bt_dev_dbg(hdev, "Added hci%u", d-&gt;id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;num_controllers = cpu_to_le16(count);</div><div class='del'>-	rp_len = sizeof(*rp) + (sizeof(rp-&gt;entry[0]) * count);</div><div class='ctx'> </div><div class='ctx'> 	read_unlock(&amp;hci_dev_list_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -538,7 +602,8 @@ static int read_ext_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	hci_sock_clear_flag(sk, HCI_MGMT_UNCONF_INDEX_EVENTS);</div><div class='ctx'> </div><div class='ctx'> 	err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE,</div><div class='del'>-				MGMT_OP_READ_EXT_INDEX_LIST, 0, rp, rp_len);</div><div class='add'>+				MGMT_OP_READ_EXT_INDEX_LIST, 0, rp,</div><div class='add'>+				struct_size(rp, entry, count));</div><div class='ctx'> </div><div class='ctx'> 	kfree(rp);</div><div class='ctx'> </div><div class='hunk'>@@ -547,11 +612,12 @@ static int read_ext_index_list(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> static bool is_configured(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_EXT_CONFIGURED))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_INVALID_BDADDR, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='add'>+	if ((hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) ||</div><div class='add'>+	     hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY)) &amp;&amp;</div><div class='ctx'> 	    !bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -562,11 +628,12 @@ static __le32 get_missing_options(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 options = 0;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_EXT_CONFIGURED))</div><div class='ctx'> 		options |= MGMT_OPTION_EXTERNAL_CONFIG;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_INVALID_BDADDR, &amp;hdev-&gt;quirks) &amp;&amp;</div><div class='add'>+	if ((hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) ||</div><div class='add'>+	     hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY)) &amp;&amp;</div><div class='ctx'> 	    !bacmp(&amp;hdev-&gt;public_addr, BDADDR_ANY))</div><div class='ctx'> 		options |= MGMT_OPTION_PUBLIC_ADDRESS;</div><div class='ctx'> </div><div class='hunk'>@@ -595,14 +662,14 @@ static int read_config_info(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_rp_read_config_info rp;</div><div class='ctx'> 	u32 options = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p %s", sk, hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> 	rp.manufacturer = cpu_to_le16(hdev-&gt;manufacturer);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks))</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG))</div><div class='ctx'> 		options |= MGMT_OPTION_EXTERNAL_CONFIG;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;set_bdaddr)</div><div class='hunk'>@@ -756,25 +823,41 @@ static u32 get_supported_settings(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 		if (lmp_ssp_capable(hdev)) {</div><div class='ctx'> 			settings |= MGMT_SETTING_SSP;</div><div class='del'>-			settings |= MGMT_SETTING_HS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (lmp_sc_capable(hdev))</div><div class='ctx'> 			settings |= MGMT_SETTING_SECURE_CONN;</div><div class='add'>+</div><div class='add'>+		if (hci_test_quirk(hdev, HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED))</div><div class='add'>+			settings |= MGMT_SETTING_WIDEBAND_SPEECH;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lmp_le_capable(hdev)) {</div><div class='ctx'> 		settings |= MGMT_SETTING_LE;</div><div class='del'>-		settings |= MGMT_SETTING_ADVERTISING;</div><div class='ctx'> 		settings |= MGMT_SETTING_SECURE_CONN;</div><div class='ctx'> 		settings |= MGMT_SETTING_PRIVACY;</div><div class='ctx'> 		settings |= MGMT_SETTING_STATIC_ADDRESS;</div><div class='add'>+		settings |= MGMT_SETTING_ADVERTISING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks) ||</div><div class='del'>-	    hdev-&gt;set_bdaddr)</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG) || hdev-&gt;set_bdaddr)</div><div class='ctx'> 		settings |= MGMT_SETTING_CONFIGURATION;</div><div class='ctx'> </div><div class='add'>+	if (cis_central_capable(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_CIS_CENTRAL;</div><div class='add'>+</div><div class='add'>+	if (cis_peripheral_capable(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_CIS_PERIPHERAL;</div><div class='add'>+</div><div class='add'>+	if (ll_privacy_capable(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_LL_PRIVACY;</div><div class='add'>+</div><div class='add'>+	if (past_sender_capable(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_PAST_SENDER;</div><div class='add'>+</div><div class='add'>+	if (past_receiver_capable(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_PAST_RECEIVER;</div><div class='add'>+</div><div class='ctx'> 	settings |= MGMT_SETTING_PHY_CONFIGURATION;</div><div class='ctx'> </div><div class='ctx'> 	return settings;</div><div class='hunk'>@@ -811,9 +894,6 @@ static u32 get_current_settings(struct hci_dev *hdev)</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='ctx'> 		settings |= MGMT_SETTING_SSP;</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_HS_ENABLED))</div><div class='del'>-		settings |= MGMT_SETTING_HS;</div><div class='del'>-</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='ctx'> 		settings |= MGMT_SETTING_ADVERTISING;</div><div class='ctx'> </div><div class='hunk'>@@ -845,6 +925,30 @@ static u32 get_current_settings(struct hci_dev *hdev)</div><div class='ctx'> 			settings |= MGMT_SETTING_STATIC_ADDRESS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_WIDEBAND_SPEECH_ENABLED))</div><div class='add'>+		settings |= MGMT_SETTING_WIDEBAND_SPEECH;</div><div class='add'>+</div><div class='add'>+	if (cis_central_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_CIS_CENTRAL;</div><div class='add'>+</div><div class='add'>+	if (cis_peripheral_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_CIS_PERIPHERAL;</div><div class='add'>+</div><div class='add'>+	if (bis_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_ISO_BROADCASTER;</div><div class='add'>+</div><div class='add'>+	if (sync_recv_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_ISO_SYNC_RECEIVER;</div><div class='add'>+</div><div class='add'>+	if (ll_privacy_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_LL_PRIVACY;</div><div class='add'>+</div><div class='add'>+	if (past_sender_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_PAST_SENDER;</div><div class='add'>+</div><div class='add'>+	if (past_receiver_enabled(hdev))</div><div class='add'>+		settings |= MGMT_SETTING_PAST_RECEIVER;</div><div class='add'>+</div><div class='ctx'> 	return settings;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -853,13 +957,6 @@ static struct mgmt_pending_cmd *pending_find(u16 opcode, struct hci_dev *hdev)</div><div class='ctx'> 	return mgmt_pending_find(HCI_CHANNEL_CONTROL, opcode, hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mgmt_pending_cmd *pending_find_data(u16 opcode,</div><div class='del'>-						  struct hci_dev *hdev,</div><div class='del'>-						  const void *data)</div><div class='del'>-{</div><div class='del'>-	return mgmt_pending_find_data(HCI_CHANNEL_CONTROL, opcode, hdev, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u8 mgmt_get_adv_discov_flags(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='hunk'>@@ -901,59 +998,148 @@ bool mgmt_get_connectable(struct hci_dev *hdev)</div><div class='ctx'> 	return hci_dev_test_flag(hdev, HCI_CONNECTABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int service_cache_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	hci_update_eir_sync(hdev);</div><div class='add'>+	hci_update_class_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void service_cache_off(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='ctx'> 					    service_cache.work);</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_and_clear_flag(hdev, HCI_SERVICE_CACHE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_update_eir(&amp;req);</div><div class='del'>-	__hci_req_update_class(&amp;req);</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	hci_cmd_sync_queue(hdev, service_cache_sync, NULL, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='add'>+static int rpa_expired_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	/* The generation of a new RPA and programming it into the</div><div class='add'>+	 * controller happens in the hci_req_enable_advertising()</div><div class='add'>+	 * function.</div><div class='add'>+	 */</div><div class='add'>+	if (ext_adv_capable(hdev))</div><div class='add'>+		return hci_start_ext_adv_sync(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+	else</div><div class='add'>+		return hci_enable_advertising_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rpa_expired(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='ctx'> 					    rpa_expired.work);</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* The generation of a new RPA and programming it into the</div><div class='del'>-	 * controller happens in the hci_req_enable_advertising()</div><div class='del'>-	 * function.</div><div class='add'>+	hci_cmd_sync_queue(hdev, rpa_expired_sync, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_discoverable_sync(struct hci_dev *hdev, void *data);</div><div class='add'>+</div><div class='add'>+static void discov_off(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    discov_off.work);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* When discoverable timeout triggers, then just make sure</div><div class='add'>+	 * the limited discoverable flag is cleared. Even in the case</div><div class='add'>+	 * of a timeout triggered from general discoverable, it is</div><div class='add'>+	 * safe to unconditionally clear the flag.</div><div class='ctx'> 	 */</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	if (ext_adv_capable(hdev))</div><div class='del'>-		__hci_req_start_ext_adv(&amp;req, hdev-&gt;cur_adv_instance);</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);</div><div class='add'>+	hdev-&gt;discov_timeout = 0;</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	mgmt_new_settings(hdev);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_settings_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev);</div><div class='add'>+</div><div class='add'>+static void mesh_send_complete(struct hci_dev *hdev,</div><div class='add'>+			       struct mgmt_mesh_tx *mesh_tx, bool silent)</div><div class='add'>+{</div><div class='add'>+	u8 handle = mesh_tx-&gt;handle;</div><div class='add'>+</div><div class='add'>+	if (!silent)</div><div class='add'>+		mgmt_event(MGMT_EV_MESH_PACKET_CMPLT, hdev, &amp;handle,</div><div class='add'>+			   sizeof(handle), NULL);</div><div class='add'>+</div><div class='add'>+	mgmt_mesh_remove(mesh_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mesh_send_done_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+</div><div class='add'>+	hci_dev_clear_flag(hdev, HCI_MESH_SENDING);</div><div class='add'>+	if (list_empty(&amp;hdev-&gt;adv_instances))</div><div class='add'>+		hci_disable_advertising_sync(hdev);</div><div class='add'>+	mesh_tx = mgmt_mesh_next(hdev, NULL);</div><div class='add'>+</div><div class='add'>+	if (mesh_tx)</div><div class='add'>+		mesh_send_complete(hdev, mesh_tx, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mesh_send_sync(struct hci_dev *hdev, void *data);</div><div class='add'>+static void mesh_send_start_complete(struct hci_dev *hdev, void *data, int err);</div><div class='add'>+static void mesh_next(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx = mgmt_mesh_next(hdev, NULL);</div><div class='add'>+</div><div class='add'>+	if (!mesh_tx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, mesh_send_sync, mesh_tx,</div><div class='add'>+				 mesh_send_start_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mesh_send_complete(hdev, mesh_tx, false);</div><div class='ctx'> 	else</div><div class='del'>-		__hci_req_enable_advertising(&amp;req);</div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_MESH_SENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mesh_send_done(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = container_of(work, struct hci_dev,</div><div class='add'>+					    mesh_send_done.work);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_MESH_SENDING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_cmd_sync_queue(hdev, mesh_send_done_sync, NULL, mesh_next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mgmt_init_hdev(struct sock *sk, struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	if (hci_dev_test_and_set_flag(hdev, HCI_MGMT))</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	BT_INFO("MGMT ver %d.%d", MGMT_VERSION, MGMT_REVISION);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;discov_off, discov_off);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hdev-&gt;service_cache, service_cache_off);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hdev-&gt;rpa_expired, rpa_expired);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hdev-&gt;mesh_send_done, mesh_send_done);</div><div class='ctx'> </div><div class='ctx'> 	/* Non-mgmt controlled devices get this bit set</div><div class='ctx'> 	 * implicitly so that pairing works for them, however</div><div class='hunk'>@@ -961,6 +1147,8 @@ static void mgmt_init_hdev(struct sock *sk, struct hci_dev *hdev)</div><div class='ctx'> 	 * it</div><div class='ctx'> 	 */</div><div class='ctx'> 	hci_dev_clear_flag(hdev, HCI_BONDABLE);</div><div class='add'>+</div><div class='add'>+	hci_dev_set_flag(hdev, HCI_MGMT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_controller_info(struct sock *sk, struct hci_dev *hdev,</div><div class='hunk'>@@ -968,7 +1156,7 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_rp_read_info rp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p %s", sk, hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1006,11 +1194,11 @@ static u16 append_eir_data_to_buf(struct hci_dev *hdev, u8 *eir)</div><div class='ctx'> 		eir_len = eir_append_le16(eir, eir_len, EIR_APPEARANCE,</div><div class='ctx'> 					  hdev-&gt;appearance);</div><div class='ctx'> </div><div class='del'>-	name_len = strlen(hdev-&gt;dev_name);</div><div class='add'>+	name_len = strnlen(hdev-&gt;dev_name, sizeof(hdev-&gt;dev_name));</div><div class='ctx'> 	eir_len = eir_append_data(eir, eir_len, EIR_NAME_COMPLETE,</div><div class='ctx'> 				  hdev-&gt;dev_name, name_len);</div><div class='ctx'> </div><div class='del'>-	name_len = strlen(hdev-&gt;short_name);</div><div class='add'>+	name_len = strnlen(hdev-&gt;short_name, sizeof(hdev-&gt;short_name));</div><div class='ctx'> 	eir_len = eir_append_data(eir, eir_len, EIR_NAME_SHORT,</div><div class='ctx'> 				  hdev-&gt;short_name, name_len);</div><div class='ctx'> </div><div class='hunk'>@@ -1024,7 +1212,7 @@ static int read_ext_controller_info(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_rp_read_ext_info *rp = (void *)buf;</div><div class='ctx'> 	u16 eir_len;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p %s", sk, hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;buf, 0, sizeof(buf));</div><div class='ctx'> </div><div class='hunk'>@@ -1081,16 +1269,6 @@ static int send_settings_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev)</div><div class='ctx'> 				 sizeof(settings));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clean_up_hci_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='del'>-{</div><div class='del'>-	BT_DBG("%s status 0x%02x", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	if (hci_conn_count(hdev) == 0) {</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-		queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off.work);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void mgmt_advertising_added(struct sock *sk, struct hci_dev *hdev, u8 instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_advertising_added ev;</div><div class='hunk'>@@ -1118,38 +1296,95 @@ static void cancel_adv_timeout(struct hci_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int clean_up_hci_state(struct hci_dev *hdev)</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static void restart_le_actions(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-	bool discov_stopped;</div><div class='del'>-	int err;</div><div class='add'>+	struct hci_conn_params *p;</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+	list_for_each_entry(p, &amp;hdev-&gt;le_conn_params, list) {</div><div class='add'>+		/* Needed for AUTO_OFF case where might not "really"</div><div class='add'>+		 * have been powered off.</div><div class='add'>+		 */</div><div class='add'>+		hci_pend_le_list_del_init(p);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_ISCAN, &amp;hdev-&gt;flags) ||</div><div class='del'>-	    test_bit(HCI_PSCAN, &amp;hdev-&gt;flags)) {</div><div class='del'>-		u8 scan = 0x00;</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_WRITE_SCAN_ENABLE, 1, &amp;scan);</div><div class='add'>+		switch (p-&gt;auto_connect) {</div><div class='add'>+		case HCI_AUTO_CONN_DIRECT:</div><div class='add'>+		case HCI_AUTO_CONN_ALWAYS:</div><div class='add'>+			hci_pend_le_list_add(p, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+			break;</div><div class='add'>+		case HCI_AUTO_CONN_REPORT:</div><div class='add'>+			hci_pend_le_list_add(p, &amp;hdev-&gt;pend_le_reports);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	hci_req_clear_adv_instance(hdev, NULL, NULL, 0x00, false);</div><div class='add'>+static int new_settings(struct hci_dev *hdev, struct sock *skip)</div><div class='add'>+{</div><div class='add'>+	__le32 ev = cpu_to_le32(get_current_settings(hdev));</div><div class='ctx'> </div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-		__hci_req_disable_advertising(&amp;req);</div><div class='add'>+	return mgmt_limited_event(MGMT_EV_NEW_SETTINGS, hdev, &amp;ev,</div><div class='add'>+				  sizeof(ev), HCI_MGMT_SETTING_EVENTS, skip);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	discov_stopped = hci_req_stop_discovery(&amp;req);</div><div class='add'>+static void mgmt_set_powered_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode *cp;</div><div class='add'>+</div><div class='add'>+	/* Make sure cmd still outstanding. */</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(conn, &amp;hdev-&gt;conn_hash.list, list) {</div><div class='del'>-		/* 0x15 == Terminated due to Power Off */</div><div class='del'>-		__hci_abort_conn(&amp;req, conn, 0x15);</div><div class='add'>+	cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (cp-&gt;val) {</div><div class='add'>+			hci_dev_lock(hdev);</div><div class='add'>+			restart_le_actions(hdev);</div><div class='add'>+			hci_update_passive_scan(hdev);</div><div class='add'>+			hci_dev_unlock(hdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		send_settings_rsp(cmd-&gt;sk, cmd-&gt;opcode, hdev);</div><div class='add'>+</div><div class='add'>+		/* Only call new_setting for power on as power off is deferred</div><div class='add'>+		 * to hdev-&gt;power_off work which does call hci_dev_do_close.</div><div class='add'>+		 */</div><div class='add'>+		if (cp-&gt;val)</div><div class='add'>+			new_settings(hdev, cmd-&gt;sk);</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_SET_POWERED,</div><div class='add'>+				mgmt_status(err));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run(&amp;req, clean_up_hci_complete);</div><div class='del'>-	if (!err &amp;&amp; discov_stopped)</div><div class='del'>-		hci_discovery_set_state(hdev, DISCOVERY_STOPPING);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+static int set_powered_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode cp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	/* Make sure cmd still outstanding. */</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cp, cmd-&gt;param, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return hci_set_powered_sync(hdev, cp.val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -1159,7 +1394,7 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_POWERED,</div><div class='hunk'>@@ -1167,6 +1402,14 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='add'>+	if (!cp-&gt;val) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_POWERING_DOWN)) {</div><div class='add'>+			err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_POWERED,</div><div class='add'>+					      MGMT_STATUS_BUSY);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (pending_find(MGMT_OP_SET_POWERED, hdev)) {</div><div class='ctx'> 		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_POWERED,</div><div class='ctx'> 				      MGMT_STATUS_BUSY);</div><div class='hunk'>@@ -1184,37 +1427,25 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;val) {</div><div class='del'>-		queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_on);</div><div class='del'>-		err = 0;</div><div class='add'>+	/* Cancel potentially blocking sync operation before power off */</div><div class='add'>+	if (cp-&gt;val == 0x00) {</div><div class='add'>+		hci_cmd_sync_cancel_sync(hdev, -EHOSTDOWN);</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_powered_sync, cmd,</div><div class='add'>+					 mgmt_set_powered_complete);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Disconnect connections, stop scans, etc */</div><div class='del'>-		err = clean_up_hci_state(hdev);</div><div class='del'>-		if (!err)</div><div class='del'>-			queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off,</div><div class='del'>-					   HCI_POWER_OFF_TIMEOUT);</div><div class='del'>-</div><div class='del'>-		/* ENODATA means there were no HCI commands queued */</div><div class='del'>-		if (err == -ENODATA) {</div><div class='del'>-			cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-			queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off.work);</div><div class='del'>-			err = 0;</div><div class='del'>-		}</div><div class='add'>+		/* Use hci_cmd_sync_submit since hdev might not be running */</div><div class='add'>+		err = hci_cmd_sync_submit(hdev, set_powered_sync, cmd,</div><div class='add'>+					  mgmt_set_powered_complete);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='add'>+</div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int new_settings(struct hci_dev *hdev, struct sock *skip)</div><div class='del'>-{</div><div class='del'>-	__le32 ev = cpu_to_le32(get_current_settings(hdev));</div><div class='del'>-</div><div class='del'>-	return mgmt_limited_event(MGMT_EV_NEW_SETTINGS, hdev, &amp;ev,</div><div class='del'>-				  sizeof(ev), HCI_MGMT_SETTING_EVENTS, skip);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mgmt_new_settings(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	return new_settings(hdev, NULL);</div><div class='hunk'>@@ -1232,32 +1463,30 @@ static void settings_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> </div><div class='ctx'> 	send_settings_rsp(cmd-&gt;sk, cmd-&gt;opcode, match-&gt;hdev);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;cmd-&gt;list);</div><div class='del'>-</div><div class='ctx'> 	if (match-&gt;sk == NULL) {</div><div class='ctx'> 		match-&gt;sk = cmd-&gt;sk;</div><div class='ctx'> 		sock_hold(match-&gt;sk);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cmd_status_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *status = data;</div><div class='ctx'> </div><div class='del'>-	mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, *status);</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, *status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> {</div><div class='del'>-	if (cmd-&gt;cmd_complete) {</div><div class='del'>-		u8 *status = data;</div><div class='add'>+	struct cmd_lookup *match = data;</div><div class='ctx'> </div><div class='del'>-		cmd-&gt;cmd_complete(cmd, *status);</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+	/* dequeue cmd_sync entries using cmd as data as that is about to be</div><div class='add'>+	 * removed/freed.</div><div class='add'>+	 */</div><div class='add'>+	hci_cmd_sync_dequeue(match-&gt;hdev, NULL, cmd, NULL);</div><div class='ctx'> </div><div class='add'>+	if (cmd-&gt;cmd_complete) {</div><div class='add'>+		cmd-&gt;cmd_complete(cmd, match-&gt;mgmt_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1266,13 +1495,13 @@ static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> </div><div class='ctx'> static int generic_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='ctx'> {</div><div class='del'>-	return mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, status,</div><div class='add'>+	return mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, status,</div><div class='ctx'> 				 cmd-&gt;param, cmd-&gt;param_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int addr_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='ctx'> {</div><div class='del'>-	return mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, status,</div><div class='add'>+	return mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, status,</div><div class='ctx'> 				 cmd-&gt;param, sizeof(struct mgmt_addr_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1296,41 +1525,50 @@ static u8 mgmt_le_support(struct hci_dev *hdev)</div><div class='ctx'> 		return MGMT_STATUS_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_set_discoverable_complete(struct hci_dev *hdev, u8 status)</div><div class='add'>+static void mgmt_set_discoverable_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					   int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	/* Make sure cmd still outstanding. */</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_DISCOVERABLE, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='del'>-		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, mgmt_err);</div><div class='add'>+	if (err) {</div><div class='add'>+		u8 mgmt_err = mgmt_status(err);</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_err);</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='del'>-		goto remove_cmd;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE) &amp;&amp;</div><div class='ctx'> 	    hdev-&gt;discov_timeout &gt; 0) {</div><div class='del'>-		int to = msecs_to_jiffies(hdev-&gt;discov_timeout * 1000);</div><div class='add'>+		int to = secs_to_jiffies(hdev-&gt;discov_timeout);</div><div class='ctx'> 		queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;discov_off, to);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	send_settings_rsp(cmd-&gt;sk, MGMT_OP_SET_DISCOVERABLE, hdev);</div><div class='ctx'> 	new_settings(hdev, cmd-&gt;sk);</div><div class='ctx'> </div><div class='del'>-remove_cmd:</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_discoverable_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!mgmt_pending_listed(hdev, data))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return hci_update_discoverable_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			    u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1339,7 +1577,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	u16 timeout;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='hunk'>@@ -1381,6 +1619,12 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;advertising_paused) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_DISCOVERABLE,</div><div class='add'>+				      MGMT_STATUS_BUSY);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!hdev_is_powered(hdev)) {</div><div class='ctx'> 		bool changed = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1414,7 +1658,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		hdev-&gt;discov_timeout = timeout;</div><div class='ctx'> </div><div class='ctx'> 		if (cp-&gt;val &amp;&amp; hdev-&gt;discov_timeout &gt; 0) {</div><div class='del'>-			int to = msecs_to_jiffies(hdev-&gt;discov_timeout * 1000);</div><div class='add'>+			int to = secs_to_jiffies(hdev-&gt;discov_timeout);</div><div class='ctx'> 			queue_delayed_work(hdev-&gt;req_workqueue,</div><div class='ctx'> 					   &amp;hdev-&gt;discov_off, to);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1447,39 +1691,42 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	else</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);</div><div class='ctx'> </div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;discoverable_update);</div><div class='del'>-	err = 0;</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, set_discoverable_sync, cmd,</div><div class='add'>+				 mgmt_set_discoverable_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_set_connectable_complete(struct hci_dev *hdev, u8 status)</div><div class='add'>+static void mgmt_set_connectable_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					  int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	/* Make sure cmd still outstanding. */</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_CONNECTABLE, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='del'>-		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, mgmt_err);</div><div class='del'>-		goto remove_cmd;</div><div class='add'>+	if (err) {</div><div class='add'>+		u8 mgmt_err = mgmt_status(err);</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_err);</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	send_settings_rsp(cmd-&gt;sk, MGMT_OP_SET_CONNECTABLE, hdev);</div><div class='ctx'> 	new_settings(hdev, cmd-&gt;sk);</div><div class='ctx'> </div><div class='del'>-remove_cmd:</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1504,14 +1751,24 @@ static int set_connectable_update_settings(struct hci_dev *hdev,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (changed) {</div><div class='del'>-		hci_req_update_scan(hdev);</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+		hci_update_scan(hdev);</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='ctx'> 		return new_settings(hdev, sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_connectable_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!mgmt_pending_listed(hdev, data))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return hci_update_connectable_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			   u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1519,7 +1776,7 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))</div><div class='hunk'>@@ -1561,8 +1818,11 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_CONNECTABLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;connectable_update);</div><div class='del'>-	err = 0;</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, set_connectable_sync, cmd,</div><div class='add'>+				 mgmt_set_connectable_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -1576,7 +1836,7 @@ static int set_bondable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	bool changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BONDABLE,</div><div class='hunk'>@@ -1597,12 +1857,7 @@ static int set_bondable(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		/* In limited privacy mode the change of bondable mode</div><div class='ctx'> 		 * may affect the local advertising address.</div><div class='ctx'> 		 */</div><div class='del'>-		if (hdev_is_powered(hdev) &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(hdev, HCI_DISCOVERABLE) &amp;&amp;</div><div class='del'>-		    hci_dev_test_flag(hdev, HCI_LIMITED_PRIVACY))</div><div class='del'>-			queue_work(hdev-&gt;req_workqueue,</div><div class='del'>-				   &amp;hdev-&gt;discoverable_update);</div><div class='add'>+		hci_update_discoverable(hdev);</div><div class='ctx'> </div><div class='ctx'> 		err = new_settings(hdev, sk);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1620,7 +1875,7 @@ static int set_link_security(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	u8 val, status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	status = mgmt_bredr_support(hdev);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -1681,6 +1936,79 @@ failed:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void set_ssp_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct cmd_lookup match = { NULL, hdev };</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode *cp;</div><div class='add'>+	u8 enable;</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	/* Make sure cmd still outstanding. */</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cp = cmd-&gt;param;</div><div class='add'>+	enable = cp-&gt;val;</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		u8 mgmt_err = mgmt_status(err);</div><div class='add'>+</div><div class='add'>+		if (enable &amp;&amp; hci_dev_test_and_clear_flag(hdev,</div><div class='add'>+							  HCI_SSP_ENABLED)) {</div><div class='add'>+			new_settings(hdev, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		changed = !hci_dev_test_and_set_flag(hdev, HCI_SSP_ENABLED);</div><div class='add'>+	} else {</div><div class='add'>+		changed = hci_dev_test_and_clear_flag(hdev, HCI_SSP_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	settings_rsp(cmd, &amp;match);</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		new_settings(hdev, match.sk);</div><div class='add'>+</div><div class='add'>+	if (match.sk)</div><div class='add'>+		sock_put(match.sk);</div><div class='add'>+</div><div class='add'>+	hci_update_eir_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ssp_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode cp;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cp, cmd-&gt;param, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (cp.val)</div><div class='add'>+		changed = !hci_dev_test_and_set_flag(hdev, HCI_SSP_ENABLED);</div><div class='add'>+</div><div class='add'>+	err = hci_write_ssp_mode_sync(hdev, cp.val);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; changed)</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_SSP_ENABLED);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='hunk'>@@ -1688,7 +2016,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	status = mgmt_bredr_support(hdev);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -1713,11 +2041,6 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			changed = hci_dev_test_and_clear_flag(hdev,</div><div class='ctx'> 							      HCI_SSP_ENABLED);</div><div class='del'>-			if (!changed)</div><div class='del'>-				changed = hci_dev_test_and_clear_flag(hdev,</div><div class='del'>-								      HCI_HS_ENABLED);</div><div class='del'>-			else</div><div class='del'>-				hci_dev_clear_flag(hdev, HCI_HS_ENABLED);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = send_settings_rsp(sk, MGMT_OP_SET_SSP, hdev);</div><div class='hunk'>@@ -1742,19 +2065,18 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = mgmt_pending_add(sk, MGMT_OP_SET_SSP, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cp-&gt;val &amp;&amp; hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS))</div><div class='del'>-		hci_send_cmd(hdev, HCI_OP_WRITE_SSP_DEBUG_MODE,</div><div class='del'>-			     sizeof(cp-&gt;val), &amp;cp-&gt;val);</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_ssp_sync, cmd,</div><div class='add'>+					 set_ssp_complete);</div><div class='ctx'> </div><div class='del'>-	err = hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &amp;cp-&gt;val);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='del'>-		goto failed;</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_SSP,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_remove(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='hunk'>@@ -1764,118 +2086,457 @@ failed:</div><div class='ctx'> </div><div class='ctx'> static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_mode *cp = data;</div><div class='del'>-	bool changed;</div><div class='del'>-	u8 status;</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_le_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct cmd_lookup match = { NULL, hdev };</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, data))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, status);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	settings_rsp(cmd, &amp;match);</div><div class='add'>+</div><div class='add'>+	new_settings(hdev, match.sk);</div><div class='add'>+</div><div class='add'>+	if (match.sk)</div><div class='add'>+		sock_put(match.sk);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_le_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode cp;</div><div class='add'>+	u8 val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> </div><div class='del'>-	status = mgmt_bredr_support(hdev);</div><div class='del'>-	if (status)</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS, status);</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!lmp_ssp_capable(hdev))</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='add'>+	memcpy(&amp;cp, cmd-&gt;param, sizeof(cp));</div><div class='add'>+	val = !!cp.val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!val) {</div><div class='add'>+		hci_clear_adv_instance_sync(hdev, NULL, 0x00, true);</div><div class='add'>+</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='add'>+			hci_disable_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+		if (ext_adv_capable(hdev))</div><div class='add'>+			hci_remove_ext_adv_instance_sync(hdev, 0, cmd-&gt;sk);</div><div class='add'>+	} else {</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_LE_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_write_le_host_supported_sync(hdev, val, 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the controller has a good default for</div><div class='add'>+	 * advertising data. Restrict the update to when LE</div><div class='add'>+	 * has actually been enabled. During power on, the</div><div class='add'>+	 * update in powered_update_hci will take care of it.</div><div class='add'>+	 */</div><div class='add'>+	if (!err &amp;&amp; hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='add'>+		if (ext_adv_capable(hdev)) {</div><div class='add'>+			int status;</div><div class='add'>+</div><div class='add'>+			status = hci_setup_ext_adv_instance_sync(hdev, 0x00);</div><div class='add'>+			if (!status)</div><div class='add'>+				hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+		} else {</div><div class='add'>+			hci_update_adv_data_sync(hdev, 0x00);</div><div class='add'>+			hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_mesh_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk = cmd-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+				status);</div><div class='add'>+		mgmt_pending_foreach(MGMT_OP_SET_MESH_RECEIVER, hdev, true,</div><div class='add'>+				     cmd_status_rsp, &amp;status);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER, 0, NULL, 0);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_mesh_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	DEFINE_FLEX(struct mgmt_cp_set_mesh, cp, ad_types, num_ad_types,</div><div class='add'>+		    sizeof(hdev-&gt;mesh_ad_types));</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = cmd-&gt;param_len;</div><div class='add'>+	memcpy(cp, cmd-&gt;param, min(__struct_size(cp), len));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	memset(hdev-&gt;mesh_ad_types, 0, sizeof(hdev-&gt;mesh_ad_types));</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;enable)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_MESH);</div><div class='add'>+	else</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_MESH);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;le_scan_interval = __le16_to_cpu(cp-&gt;period);</div><div class='add'>+	hdev-&gt;le_scan_window = __le16_to_cpu(cp-&gt;window);</div><div class='add'>+</div><div class='add'>+	len -= sizeof(struct mgmt_cp_set_mesh);</div><div class='add'>+</div><div class='add'>+	/* If filters don't fit, forward all adv pkts */</div><div class='add'>+	if (len &lt;= sizeof(hdev-&gt;mesh_ad_types))</div><div class='add'>+		memcpy(hdev-&gt;mesh_ad_types, cp-&gt;ad_types, len);</div><div class='add'>+</div><div class='add'>+	hci_update_passive_scan_sync(hdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_mesh(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_set_mesh *cp = data;</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	__u16 period, window;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	if (!lmp_le_capable(hdev) ||</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='ctx'> 				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='ctx'> </div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED))</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='del'>-				       MGMT_STATUS_REJECTED);</div><div class='add'>+	if (cp-&gt;enable != 0x00 &amp;&amp; cp-&gt;enable != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01)</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='add'>+	/* Keep allowed ranges in sync with set_scan_params() */</div><div class='add'>+	period = __le16_to_cpu(cp-&gt;period);</div><div class='add'>+</div><div class='add'>+	if (period &lt; 0x0004 || period &gt; 0x4000)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	window = __le16_to_cpu(cp-&gt;window);</div><div class='add'>+</div><div class='add'>+	if (window &lt; 0x0004 || window &gt; 0x4000)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	if (window &gt; period)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_SET_SSP, hdev)) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='del'>-				      MGMT_STATUS_BUSY);</div><div class='del'>-		goto unlock;</div><div class='add'>+	cmd = mgmt_pending_add(sk, MGMT_OP_SET_MESH_RECEIVER, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_mesh_sync, cmd,</div><div class='add'>+					 set_mesh_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_MESH_RECEIVER,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_remove(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;val) {</div><div class='del'>-		changed = !hci_dev_test_and_set_flag(hdev, HCI_HS_ENABLED);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mesh_send_start_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx = data;</div><div class='add'>+	struct mgmt_cp_mesh_send *send = (void *)mesh_tx-&gt;param;</div><div class='add'>+	unsigned long mesh_send_interval;</div><div class='add'>+	u8 mgmt_err = mgmt_status(err);</div><div class='add'>+</div><div class='add'>+	/* Report any errors here, but don't report completion */</div><div class='add'>+</div><div class='add'>+	if (mgmt_err) {</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_MESH_SENDING);</div><div class='add'>+		/* Send Complete Error Code for handle */</div><div class='add'>+		mesh_send_complete(hdev, mesh_tx, false);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mesh_send_interval = msecs_to_jiffies((send-&gt;cnt) * 25);</div><div class='add'>+	queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;mesh_send_done,</div><div class='add'>+			   mesh_send_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mesh_send_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx = data;</div><div class='add'>+	struct mgmt_cp_mesh_send *send = (void *)mesh_tx-&gt;param;</div><div class='add'>+	struct adv_info *adv, *next_instance;</div><div class='add'>+	u8 instance = hdev-&gt;le_num_of_adv_sets + 1;</div><div class='add'>+	u16 timeout, duration;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;le_num_of_adv_sets &lt;= hdev-&gt;adv_instance_cnt)</div><div class='add'>+		return MGMT_STATUS_BUSY;</div><div class='add'>+</div><div class='add'>+	timeout = 1000;</div><div class='add'>+	duration = send-&gt;cnt * INTERVAL_TO_MS(hdev-&gt;le_adv_max_interval);</div><div class='add'>+	adv = hci_add_adv_instance(hdev, instance, 0,</div><div class='add'>+				   send-&gt;adv_data_len, send-&gt;adv_data,</div><div class='add'>+				   0, NULL,</div><div class='add'>+				   timeout, duration,</div><div class='add'>+				   HCI_ADV_TX_POWER_NO_PREFERENCE,</div><div class='add'>+				   hdev-&gt;le_adv_min_interval,</div><div class='add'>+				   hdev-&gt;le_adv_max_interval,</div><div class='add'>+				   mesh_tx-&gt;handle);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(adv))</div><div class='add'>+		mesh_tx-&gt;instance = instance;</div><div class='add'>+	else</div><div class='add'>+		err = PTR_ERR(adv);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;cur_adv_instance == instance) {</div><div class='add'>+		/* If the currently advertised instance is being changed then</div><div class='add'>+		 * cancel the current advertising and schedule the next</div><div class='add'>+		 * instance. If there is only one instance then the overridden</div><div class='add'>+		 * advertising data will be visible right away.</div><div class='add'>+		 */</div><div class='add'>+		cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+		next_instance = hci_get_next_instance(hdev, instance);</div><div class='add'>+		if (next_instance)</div><div class='add'>+			instance = next_instance-&gt;instance;</div><div class='add'>+		else</div><div class='add'>+			instance = 0;</div><div class='add'>+	} else if (hdev-&gt;adv_instance_timeout) {</div><div class='add'>+		/* Immediately advertise the new instance if no other, or</div><div class='add'>+		 * let it go naturally from queue if ADV is already happening</div><div class='add'>+		 */</div><div class='add'>+		instance = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (instance)</div><div class='add'>+		return hci_schedule_adv_instance_sync(hdev, instance, true);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_count(struct mgmt_mesh_tx *mesh_tx, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_mesh_read_features *rp = data;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;used_handles &gt;= rp-&gt;max_handles)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rp-&gt;handles[rp-&gt;used_handles++] = mesh_tx-&gt;handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mesh_features(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			 void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_mesh_read_features rp;</div><div class='add'>+</div><div class='add'>+	if (!lmp_le_capable(hdev) ||</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_READ_FEATURES,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='add'>+	rp.index = cpu_to_le16(hdev-&gt;id);</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		rp.max_handles = MESH_HANDLES_MAX;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (rp.max_handles)</div><div class='add'>+		mgmt_mesh_foreach(hdev, send_count, &amp;rp, sk);</div><div class='add'>+</div><div class='add'>+	mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_MESH_READ_FEATURES, 0, &amp;rp,</div><div class='add'>+			  rp.used_handles + sizeof(rp) - MESH_HANDLES_MAX);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_cancel(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_mesh_send_cancel *cancel = (void *)cmd-&gt;param;</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+</div><div class='add'>+	if (!cancel-&gt;handle) {</div><div class='add'>+		do {</div><div class='add'>+			mesh_tx = mgmt_mesh_next(hdev, cmd-&gt;sk);</div><div class='add'>+</div><div class='add'>+			if (mesh_tx)</div><div class='add'>+				mesh_send_complete(hdev, mesh_tx, false);</div><div class='add'>+		} while (mesh_tx);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (hdev_is_powered(hdev)) {</div><div class='del'>-			err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_HS,</div><div class='del'>-					      MGMT_STATUS_REJECTED);</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='add'>+		mesh_tx = mgmt_mesh_find(hdev, cancel-&gt;handle);</div><div class='ctx'> </div><div class='del'>-		changed = hci_dev_test_and_clear_flag(hdev, HCI_HS_ENABLED);</div><div class='add'>+		if (mesh_tx &amp;&amp; mesh_tx-&gt;sk == cmd-&gt;sk)</div><div class='add'>+			mesh_send_complete(hdev, mesh_tx, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = send_settings_rsp(sk, MGMT_OP_SET_HS, hdev);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto unlock;</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_MESH_SEND_CANCEL,</div><div class='add'>+			  0, NULL, 0);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='del'>-	if (changed)</div><div class='del'>-		err = new_settings(hdev, sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mesh_send_cancel(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			    void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!lmp_le_capable(hdev) ||</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND_CANCEL,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND_CANCEL,</div><div class='add'>+				       MGMT_STATUS_REJECTED);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_MESH_SEND_CANCEL, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, send_cancel, cmd, NULL);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND_CANCEL,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void le_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int mesh_send(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct cmd_lookup match = { NULL, hdev };</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+	struct mgmt_cp_mesh_send *send = data;</div><div class='add'>+	struct mgmt_rp_mesh_read_features rp;</div><div class='add'>+	bool sending;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!lmp_le_capable(hdev) ||</div><div class='add'>+	    !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED) ||</div><div class='add'>+	    len &lt;= MGMT_MESH_SEND_SIZE ||</div><div class='add'>+	    len &gt; (MGMT_MESH_SEND_SIZE + 31))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND,</div><div class='add'>+				       MGMT_STATUS_REJECTED);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='add'>+	rp.max_handles = MESH_HANDLES_MAX;</div><div class='ctx'> </div><div class='del'>-		mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, cmd_status_rsp,</div><div class='del'>-				     &amp;mgmt_err);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	mgmt_mesh_foreach(hdev, send_count, &amp;rp, sk);</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, settings_rsp, &amp;match);</div><div class='add'>+	if (rp.max_handles &lt;= rp.used_handles) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND,</div><div class='add'>+				      MGMT_STATUS_BUSY);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	new_settings(hdev, match.sk);</div><div class='add'>+	sending = hci_dev_test_flag(hdev, HCI_MESH_SENDING);</div><div class='add'>+	mesh_tx = mgmt_mesh_add(sk, hdev, send, len);</div><div class='ctx'> </div><div class='del'>-	if (match.sk)</div><div class='del'>-		sock_put(match.sk);</div><div class='add'>+	if (!mesh_tx)</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+	else if (!sending)</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, mesh_send_sync, mesh_tx,</div><div class='add'>+					 mesh_send_start_complete);</div><div class='ctx'> </div><div class='del'>-	/* Make sure the controller has a good default for</div><div class='del'>-	 * advertising data. Restrict the update to when LE</div><div class='del'>-	 * has actually been enabled. During power on, the</div><div class='del'>-	 * update in powered_update_hci will take care of it.</div><div class='del'>-	 */</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {</div><div class='del'>-		struct hci_request req;</div><div class='del'>-		hci_req_init(&amp;req, hdev);</div><div class='del'>-		if (ext_adv_capable(hdev)) {</div><div class='del'>-			int err;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Send Mesh Failed %d", err);</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_MESH_SEND,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='ctx'> </div><div class='del'>-			err = __hci_req_setup_ext_adv_instance(&amp;req, 0x00);</div><div class='del'>-			if (!err)</div><div class='del'>-				__hci_req_update_scan_rsp_data(&amp;req, 0x00);</div><div class='del'>-		} else {</div><div class='del'>-			__hci_req_update_adv_data(&amp;req, 0x00);</div><div class='del'>-			__hci_req_update_scan_rsp_data(&amp;req, 0x00);</div><div class='add'>+		if (mesh_tx) {</div><div class='add'>+			if (sending)</div><div class='add'>+				mgmt_mesh_remove(mesh_tx);</div><div class='ctx'> 		}</div><div class='del'>-		hci_req_run(&amp;req, NULL);</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+	} else {</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_MESH_SENDING);</div><div class='add'>+</div><div class='add'>+		mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_MESH_SEND, 0,</div><div class='add'>+				  &amp;mesh_tx-&gt;handle, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='add'>+done:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='del'>-	struct hci_cp_write_le_host_supported hci_cp;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 val, enabled;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_LE,</div><div class='hunk'>@@ -1907,9 +2568,6 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 	val = !!cp-&gt;val;</div><div class='ctx'> 	enabled = lmp_host_le_capable(hdev);</div><div class='ctx'> </div><div class='del'>-	if (!val)</div><div class='del'>-		hci_req_clear_adv_instance(hdev, NULL, NULL, 0x00, true);</div><div class='del'>-</div><div class='ctx'> 	if (!hdev_is_powered(hdev) || val == enabled) {</div><div class='ctx'> 		bool changed = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1941,34 +2599,80 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = mgmt_pending_add(sk, MGMT_OP_SET_LE, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_le_sync, cmd,</div><div class='add'>+					 set_le_complete);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_LE,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;hci_cp, 0, sizeof(hci_cp));</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_remove(cmd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (val) {</div><div class='del'>-		hci_cp.le = val;</div><div class='del'>-		hci_cp.simul = 0x00;</div><div class='del'>-	} else {</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-			__hci_req_disable_advertising(&amp;req);</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (ext_adv_capable(hdev))</div><div class='del'>-			__hci_req_clear_ext_adv_sets(&amp;req);</div><div class='add'>+static int send_hci_cmd_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_hci_cmd_sync *cp = cmd-&gt;param;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync_ev(hdev, le16_to_cpu(cp-&gt;opcode),</div><div class='add'>+				le16_to_cpu(cp-&gt;params_len), cp-&gt;params,</div><div class='add'>+				cp-&gt;event, cp-&gt;timeout ?</div><div class='add'>+				secs_to_jiffies(cp-&gt;timeout) :</div><div class='add'>+				HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_HCI_CMD_SYNC,</div><div class='add'>+				mgmt_status(PTR_ERR(skb)));</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(hci_cp),</div><div class='del'>-		    &amp;hci_cp);</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_HCI_CMD_SYNC, 0,</div><div class='add'>+			  skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run(&amp;req, le_enable_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mgmt_hci_cmd_sync(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			     void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_hci_cmd_sync *cp = data;</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (len != (offsetof(struct mgmt_cp_hci_cmd_sync, params) +</div><div class='add'>+		    le16_to_cpu(cp-&gt;params_len)))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_HCI_CMD_SYNC,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_HCI_CMD_SYNC, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, send_hci_cmd_sync, cmd, NULL);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_HCI_CMD_SYNC,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2015,41 +2719,37 @@ static u8 get_uuid_size(const u8 *uuid)</div><div class='ctx'> 	return 16;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mgmt_class_complete(struct hci_dev *hdev, u16 mgmt_op, u8 status)</div><div class='add'>+static void mgmt_class_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	cmd = pending_find(mgmt_op, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode,</div><div class='del'>-			  mgmt_status(status), hdev-&gt;dev_class, 3);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+			  mgmt_status(err), hdev-&gt;dev_class, 3);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_uuid_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int add_uuid_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hci_update_class_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	mgmt_class_complete(hdev, MGMT_OP_ADD_UUID, status);</div><div class='add'>+	return hci_update_eir_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_add_uuid *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	struct bt_uuid *uuid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2071,28 +2771,21 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;uuid-&gt;list, &amp;hdev-&gt;uuids);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_update_class(&amp;req);</div><div class='del'>-	__hci_req_update_eir(&amp;req);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, add_uuid_complete);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		if (err != -ENODATA)</div><div class='del'>-			goto failed;</div><div class='del'>-</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_ADD_UUID, 0,</div><div class='del'>-					hdev-&gt;dev_class, 3);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_ADD_UUID, hdev, data, len);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_ADD_UUID, hdev, data, len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='add'>+	/* MGMT_OP_ADD_UUID don't require adapter the UP/Running so use</div><div class='add'>+	 * hci_cmd_sync_submit instead of hci_cmd_sync_queue.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_cmd_sync_submit(hdev, add_uuid_sync, cmd,</div><div class='add'>+				  mgmt_class_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -2113,11 +2806,15 @@ static bool enable_service_cache(struct hci_dev *hdev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void remove_uuid_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int remove_uuid_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mgmt_class_complete(hdev, MGMT_OP_REMOVE_UUID, status);</div><div class='add'>+	err = hci_update_class_sync(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return hci_update_eir_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -2126,11 +2823,12 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct mgmt_cp_remove_uuid *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	struct bt_uuid *match, *tmp;</div><div class='del'>-	u8 bt_uuid_any[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };</div><div class='del'>-	struct hci_request req;</div><div class='add'>+	static const u8 bt_uuid_any[] = {</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+	};</div><div class='ctx'> 	int err, found;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2171,39 +2869,38 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> update_class:</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_update_class(&amp;req);</div><div class='del'>-	__hci_req_update_eir(&amp;req);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, remove_uuid_complete);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		if (err != -ENODATA)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_REMOVE_UUID, 0,</div><div class='del'>-					hdev-&gt;dev_class, 3);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_REMOVE_UUID, hdev, data, len);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_REMOVE_UUID, hdev, data, len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='add'>+	/* MGMT_OP_REMOVE_UUID don't require adapter the UP/Running so use</div><div class='add'>+	 * hci_cmd_sync_submit instead of hci_cmd_sync_queue.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_cmd_sync_submit(hdev, remove_uuid_sync, cmd,</div><div class='add'>+				  mgmt_class_complete);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_class_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int set_class_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_and_clear_flag(hdev, HCI_SERVICE_CACHE)) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;hdev-&gt;service_cache);</div><div class='add'>+		err = hci_update_eir_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	mgmt_class_complete(hdev, MGMT_OP_SET_DEV_CLASS, status);</div><div class='add'>+	return hci_update_class_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -2211,10 +2908,9 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_set_dev_class *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_bredr_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_DEV_CLASS,</div><div class='hunk'>@@ -2243,34 +2939,19 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_and_clear_flag(hdev, HCI_SERVICE_CACHE)) {</div><div class='del'>-		hci_dev_unlock(hdev);</div><div class='del'>-		cancel_delayed_work_sync(&amp;hdev-&gt;service_cache);</div><div class='del'>-		hci_dev_lock(hdev);</div><div class='del'>-		__hci_req_update_eir(&amp;req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__hci_req_update_class(&amp;req);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, set_class_complete);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		if (err != -ENODATA)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_DEV_CLASS, 0,</div><div class='del'>-					hdev-&gt;dev_class, 3);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_SET_DEV_CLASS, hdev, data, len);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_SET_DEV_CLASS, hdev, data, len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='add'>+	/* MGMT_OP_SET_DEV_CLASS don't require adapter the UP/Running so use</div><div class='add'>+	 * hci_cmd_sync_submit instead of hci_cmd_sync_queue.</div><div class='add'>+	 */</div><div class='add'>+	err = hci_cmd_sync_submit(hdev, set_class_sync, cmd,</div><div class='add'>+				  mgmt_class_complete);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -2287,7 +2968,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	bool changed;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_bredr_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_LOAD_LINK_KEYS,</div><div class='hunk'>@@ -2301,8 +2982,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	expected_len = sizeof(*cp) + key_count *</div><div class='del'>-					sizeof(struct mgmt_link_key_info);</div><div class='add'>+	expected_len = struct_size(cp, keys, key_count);</div><div class='ctx'> 	if (expected_len != len) {</div><div class='ctx'> 		bt_dev_err(hdev, "load_link_keys: expected %u bytes, got %u bytes",</div><div class='ctx'> 			   expected_len, len);</div><div class='hunk'>@@ -2314,17 +2994,8 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_LOAD_LINK_KEYS,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s debug_keys %u key_count %u", hdev-&gt;name, cp-&gt;debug_keys,</div><div class='del'>-	       key_count);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; key_count; i++) {</div><div class='del'>-		struct mgmt_link_key_info *key = &amp;cp-&gt;keys[i];</div><div class='del'>-</div><div class='del'>-		if (key-&gt;addr.type != BDADDR_BREDR || key-&gt;type &gt; 0x08)</div><div class='del'>-			return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='del'>-					       MGMT_OP_LOAD_LINK_KEYS,</div><div class='del'>-					       MGMT_STATUS_INVALID_PARAMS);</div><div class='del'>-	}</div><div class='add'>+	bt_dev_dbg(hdev, "debug_keys %u key_count %u", cp-&gt;debug_keys,</div><div class='add'>+		   key_count);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2342,6 +3013,27 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	for (i = 0; i &lt; key_count; i++) {</div><div class='ctx'> 		struct mgmt_link_key_info *key = &amp;cp-&gt;keys[i];</div><div class='ctx'> </div><div class='add'>+		if (hci_is_blocked_key(hdev,</div><div class='add'>+				       HCI_BLOCKED_KEY_TYPE_LINKKEY,</div><div class='add'>+				       key-&gt;val)) {</div><div class='add'>+			bt_dev_warn(hdev, "Skipping blocked link key for %pMR",</div><div class='add'>+				    &amp;key-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key-&gt;addr.type != BDADDR_BREDR) {</div><div class='add'>+			bt_dev_warn(hdev,</div><div class='add'>+				    "Invalid link address type %u for %pMR",</div><div class='add'>+				    key-&gt;addr.type, &amp;key-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key-&gt;type &gt; 0x08) {</div><div class='add'>+			bt_dev_warn(hdev, "Invalid link key type %u for %pMR",</div><div class='add'>+				    key-&gt;type, &amp;key-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Always ignore debug keys and require a new pairing if</div><div class='ctx'> 		 * the user wants to use them.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2371,6 +3063,42 @@ static int device_unpaired(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 			  skip_sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void unpair_device_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_unpair_device *cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		device_unpaired(hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type, cmd-&gt;sk);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;cmd_complete(cmd, err);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int unpair_device_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_unpair_device *cp = cmd-&gt;param;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;addr.type == BDADDR_BREDR)</div><div class='add'>+		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,</div><div class='add'>+					       &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	else</div><div class='add'>+		conn = hci_conn_hash_lookup_le(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+					       le_addr_type(cp-&gt;addr.type));</div><div class='add'>+</div><div class='add'>+	if (!conn)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Disregard any possible error since the likes of hci_abort_conn_sync</div><div class='add'>+	 * will clean up the connection no matter the error.</div><div class='add'>+	 */</div><div class='add'>+	hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			 u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -2481,7 +3209,7 @@ done:</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_UNPAIR_DEVICE, hdev, cp,</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_UNPAIR_DEVICE, hdev, cp,</div><div class='ctx'> 			       sizeof(*cp));</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -2490,25 +3218,57 @@ done:</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmd_complete = addr_cmd_complete;</div><div class='ctx'> </div><div class='del'>-	err = hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, unpair_device_sync, cmd,</div><div class='add'>+				 unpair_device_complete);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void disconnect_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;cmd_complete(cmd, mgmt_status(err));</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int disconnect_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_disconnect *cp = cmd-&gt;param;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;addr.type == BDADDR_BREDR)</div><div class='add'>+		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,</div><div class='add'>+					       &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	else</div><div class='add'>+		conn = hci_conn_hash_lookup_le(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+					       le_addr_type(cp-&gt;addr.type));</div><div class='add'>+</div><div class='add'>+	if (!conn)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	/* Disregard any possible error since the likes of hci_abort_conn_sync</div><div class='add'>+	 * will clean up the connection no matter the error.</div><div class='add'>+	 */</div><div class='add'>+	hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		      u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_disconnect *cp = data;</div><div class='ctx'> 	struct mgmt_rp_disconnect rp;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_conn *conn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> 	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='hunk'>@@ -2528,27 +3288,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_DISCONNECT, hdev)) {</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_DISCONNECT,</div><div class='del'>-					MGMT_STATUS_BUSY, &amp;rp, sizeof(rp));</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cp-&gt;addr.type == BDADDR_BREDR)</div><div class='del'>-		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,</div><div class='del'>-					       &amp;cp-&gt;addr.bdaddr);</div><div class='del'>-	else</div><div class='del'>-		conn = hci_conn_hash_lookup_le(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='del'>-					       le_addr_type(cp-&gt;addr.type));</div><div class='del'>-</div><div class='del'>-	if (!conn || conn-&gt;state == BT_OPEN || conn-&gt;state == BT_CLOSED) {</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_DISCONNECT,</div><div class='del'>-					MGMT_STATUS_NOT_CONNECTED, &amp;rp,</div><div class='del'>-					sizeof(rp));</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_DISCONNECT, hdev, data, len);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_DISCONNECT, hdev, data, len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failed;</div><div class='hunk'>@@ -2556,9 +3296,10 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmd_complete = generic_cmd_complete;</div><div class='ctx'> </div><div class='del'>-	err = hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, disconnect_sync, cmd,</div><div class='add'>+				 disconnect_complete);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -2568,6 +3309,9 @@ failed:</div><div class='ctx'> static u8 link_to_bdaddr(u8 link_type, u8 addr_type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (link_type) {</div><div class='add'>+	case CIS_LINK:</div><div class='add'>+	case BIS_LINK:</div><div class='add'>+	case PA_LINK:</div><div class='ctx'> 	case LE_LINK:</div><div class='ctx'> 		switch (addr_type) {</div><div class='ctx'> 		case ADDR_LE_DEV_PUBLIC:</div><div class='hunk'>@@ -2589,11 +3333,10 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_rp_get_connections *rp;</div><div class='ctx'> 	struct hci_conn *c;</div><div class='del'>-	size_t rp_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2609,8 +3352,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));</div><div class='del'>-	rp = kmalloc(rp_len, GFP_KERNEL);</div><div class='add'>+	rp = kmalloc(struct_size(rp, addr, i), GFP_KERNEL);</div><div class='ctx'> 	if (!rp) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -2630,10 +3372,8 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	rp-&gt;conn_count = cpu_to_le16(i);</div><div class='ctx'> </div><div class='ctx'> 	/* Recalculate length in case of filtered SCO connections, etc */</div><div class='del'>-	rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));</div><div class='del'>-</div><div class='ctx'> 	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_CONNECTIONS, 0, rp,</div><div class='del'>-				rp_len);</div><div class='add'>+				struct_size(rp, addr, i));</div><div class='ctx'> </div><div class='ctx'> 	kfree(rp);</div><div class='ctx'> </div><div class='hunk'>@@ -2672,7 +3412,7 @@ static int pin_code_reply(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2730,7 +3470,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_set_io_capability *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;io_capability &gt; SMP_IO_KEYBOARD_DISPLAY)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_IO_CAPABILITY,</div><div class='hunk'>@@ -2740,8 +3480,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;io_capability = cp-&gt;io_capability;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s IO capability set to 0x%02x", hdev-&gt;name,</div><div class='del'>-	       hdev-&gt;io_capability);</div><div class='add'>+	bt_dev_dbg(hdev, "IO capability set to 0x%02x", hdev-&gt;io_capability);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2776,7 +3515,7 @@ static int pairing_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='ctx'> 	bacpy(&amp;rp.addr.bdaddr, &amp;conn-&gt;dst);</div><div class='ctx'> 	rp.addr.type = link_to_bdaddr(conn-&gt;type, conn-&gt;dst_type);</div><div class='ctx'> </div><div class='del'>-	err = mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, MGMT_OP_PAIR_DEVICE,</div><div class='add'>+	err = mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, MGMT_OP_PAIR_DEVICE,</div><div class='ctx'> 				status, &amp;rp, sizeof(rp));</div><div class='ctx'> </div><div class='ctx'> 	/* So we don't get further callbacks for this connection */</div><div class='hunk'>@@ -2853,7 +3592,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> 	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='hunk'>@@ -2890,7 +3629,8 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;addr.type == BDADDR_BREDR) {</div><div class='ctx'> 		conn = hci_connect_acl(hdev, &amp;cp-&gt;addr.bdaddr, sec_level,</div><div class='del'>-				       auth_type);</div><div class='add'>+				       auth_type, CONN_REASON_PAIR_DEVICE,</div><div class='add'>+				       HCI_ACL_CONN_TIMEOUT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 addr_type = le_addr_type(cp-&gt;addr.type);</div><div class='ctx'> 		struct hci_conn_params *p;</div><div class='hunk'>@@ -2898,20 +3638,24 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		/* When pairing a new device, it is expected to remember</div><div class='ctx'> 		 * this device for future connections. Adding the connection</div><div class='ctx'> 		 * parameter information ahead of time allows tracking</div><div class='del'>-		 * of the slave preferred values and will speed up any</div><div class='add'>+		 * of the peripheral preferred values and will speed up any</div><div class='ctx'> 		 * further connection establishment.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * If connection parameters already exist, then they</div><div class='ctx'> 		 * will be kept and this function does nothing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		p = hci_conn_params_add(hdev, &amp;cp-&gt;addr.bdaddr, addr_type);</div><div class='add'>+		if (!p) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;auto_connect == HCI_AUTO_CONN_EXPLICIT)</div><div class='ctx'> 			p-&gt;auto_connect = HCI_AUTO_CONN_DISABLED;</div><div class='ctx'> </div><div class='del'>-		conn = hci_connect_le_scan(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='del'>-					   addr_type, sec_level,</div><div class='del'>-					   HCI_LE_CONN_TIMEOUT);</div><div class='add'>+		conn = hci_connect_le_scan(hdev, &amp;cp-&gt;addr.bdaddr, addr_type,</div><div class='add'>+					   sec_level, HCI_LE_CONN_TIMEOUT,</div><div class='add'>+					   CONN_REASON_PAIR_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(conn)) {</div><div class='hunk'>@@ -2982,7 +3726,7 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3012,6 +3756,20 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_CANCEL_PAIR_DEVICE, 0,</div><div class='ctx'> 				addr, sizeof(*addr));</div><div class='add'>+</div><div class='add'>+	/* Since user doesn't want to proceed with the connection, abort any</div><div class='add'>+	 * ongoing pairing and then terminate the link if it was created</div><div class='add'>+	 * because of the pair device action.</div><div class='add'>+	 */</div><div class='add'>+	if (addr-&gt;type == BDADDR_BREDR)</div><div class='add'>+		hci_remove_link_key(hdev, &amp;addr-&gt;bdaddr);</div><div class='add'>+	else</div><div class='add'>+		smp_cancel_and_remove_pairing(hdev, &amp;addr-&gt;bdaddr,</div><div class='add'>+					      le_addr_type(addr-&gt;type));</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;conn_reason == CONN_REASON_PAIR_DEVICE)</div><div class='add'>+		hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+</div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -3093,7 +3851,7 @@ static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_pin_code_neg_reply *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	return user_pairing_resp(sk, hdev, &amp;cp-&gt;addr,</div><div class='ctx'> 				MGMT_OP_PIN_CODE_NEG_REPLY,</div><div class='hunk'>@@ -3105,7 +3863,7 @@ static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_user_confirm_reply *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (len != sizeof(*cp))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_USER_CONFIRM_REPLY,</div><div class='hunk'>@@ -3121,7 +3879,7 @@ static int user_confirm_neg_reply(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_user_confirm_neg_reply *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	return user_pairing_resp(sk, hdev, &amp;cp-&gt;addr,</div><div class='ctx'> 				 MGMT_OP_USER_CONFIRM_NEG_REPLY,</div><div class='hunk'>@@ -3133,7 +3891,7 @@ static int user_passkey_reply(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_user_passkey_reply *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	return user_pairing_resp(sk, hdev, &amp;cp-&gt;addr,</div><div class='ctx'> 				 MGMT_OP_USER_PASSKEY_REPLY,</div><div class='hunk'>@@ -3145,72 +3903,96 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_user_passkey_neg_reply *cp = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	return user_pairing_resp(sk, hdev, &amp;cp-&gt;addr,</div><div class='ctx'> 				 MGMT_OP_USER_PASSKEY_NEG_REPLY,</div><div class='ctx'> 				 HCI_OP_USER_PASSKEY_NEG_REPLY, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void adv_expire(struct hci_dev *hdev, u32 flags)</div><div class='add'>+static int adv_expire_sync(struct hci_dev *hdev, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct adv_info *adv_instance;</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	adv_instance = hci_find_adv_instance(hdev, hdev-&gt;cur_adv_instance);</div><div class='ctx'> 	if (!adv_instance)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* stop if current instance doesn't need to be changed */</div><div class='ctx'> 	if (!(adv_instance-&gt;flags &amp; flags))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cancel_adv_timeout(hdev);</div><div class='ctx'> </div><div class='ctx'> 	adv_instance = hci_get_next_instance(hdev, adv_instance-&gt;instance);</div><div class='ctx'> 	if (!adv_instance)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	err = __hci_req_schedule_adv_instance(&amp;req, adv_instance-&gt;instance,</div><div class='del'>-					      true);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='add'>+	hci_schedule_adv_instance_sync(hdev, adv_instance-&gt;instance, true);</div><div class='ctx'> </div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_name_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int name_changed_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='add'>+	return adv_expire_sync(hdev, MGMT_ADV_FLAG_LOCAL_NAME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_name_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> 	struct mgmt_cp_set_local_name *cp;</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_LOCAL_NAME, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	cp = cmd-&gt;param;</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_SET_LOCAL_NAME,</div><div class='del'>-			        mgmt_status(status));</div><div class='add'>+				status);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mgmt_cmd_complete(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_SET_LOCAL_NAME, 0,</div><div class='ctx'> 				  cp, sizeof(*cp));</div><div class='ctx'> </div><div class='ctx'> 		if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-			adv_expire(hdev, MGMT_ADV_FLAG_LOCAL_NAME);</div><div class='add'>+			hci_cmd_sync_queue(hdev, name_changed_sync, NULL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+static int set_name_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_set_local_name cp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cp, cmd-&gt;param, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (lmp_bredr_capable(hdev)) {</div><div class='add'>+		hci_update_name_sync(hdev, cp.name);</div><div class='add'>+		hci_update_eir_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The name is stored in the scan response data and so</div><div class='add'>+	 * no need to update the advertising data here.</div><div class='add'>+	 */</div><div class='add'>+	if (lmp_le_capable(hdev) &amp;&amp; hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='add'>+		hci_update_scan_rsp_data_sync(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -3218,10 +4000,9 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_set_local_name *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3254,57 +4035,57 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = mgmt_pending_add(sk, MGMT_OP_SET_LOCAL_NAME, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_name_sync, cmd,</div><div class='add'>+					 set_name_complete);</div><div class='ctx'> </div><div class='del'>-	memcpy(hdev-&gt;dev_name, cp-&gt;name, sizeof(hdev-&gt;dev_name));</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_LOCAL_NAME,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_remove(cmd);</div><div class='ctx'> </div><div class='del'>-	if (lmp_bredr_capable(hdev)) {</div><div class='del'>-		__hci_req_update_name(&amp;req);</div><div class='del'>-		__hci_req_update_eir(&amp;req);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The name is stored in the scan response data and so</div><div class='del'>-	 * no need to udpate the advertising data here.</div><div class='del'>-	 */</div><div class='del'>-	if (lmp_le_capable(hdev) &amp;&amp; hci_dev_test_flag(hdev, HCI_ADVERTISING))</div><div class='del'>-		__hci_req_update_scan_rsp_data(&amp;req, hdev-&gt;cur_adv_instance);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, set_name_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+	memcpy(hdev-&gt;dev_name, cp-&gt;name, sizeof(hdev-&gt;dev_name));</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int appearance_changed_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return adv_expire_sync(hdev, MGMT_ADV_FLAG_APPEARANCE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_appearance(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			  u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_set_appearance *cp = data;</div><div class='del'>-	u16 apperance;</div><div class='add'>+	u16 appearance;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_APPEARANCE,</div><div class='ctx'> 				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='ctx'> </div><div class='del'>-	apperance = le16_to_cpu(cp-&gt;appearance);</div><div class='add'>+	appearance = le16_to_cpu(cp-&gt;appearance);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;appearance != apperance) {</div><div class='del'>-		hdev-&gt;appearance = apperance;</div><div class='add'>+	if (hdev-&gt;appearance != appearance) {</div><div class='add'>+		hdev-&gt;appearance = appearance;</div><div class='ctx'> </div><div class='ctx'> 		if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='del'>-			adv_expire(hdev, MGMT_ADV_FLAG_APPEARANCE);</div><div class='add'>+			hci_cmd_sync_queue(hdev, appearance_changed_sync, NULL,</div><div class='add'>+					   NULL);</div><div class='ctx'> </div><div class='ctx'> 		ext_info_changed(hdev, sk);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3320,9 +4101,9 @@ static int set_appearance(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> static int get_phy_configuration(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				 void *data, u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_rp_get_phy_confguration rp;</div><div class='add'>+	struct mgmt_rp_get_phy_configuration rp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p %s", sk, hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3350,23 +4131,28 @@ int mgmt_phy_configuration_changed(struct hci_dev *hdev, struct sock *skip)</div><div class='ctx'> 			  sizeof(ev), skip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_default_phy_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				     u16 opcode, struct sk_buff *skb)</div><div class='add'>+static void set_default_phy_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='add'>+	skb = cmd-&gt;skb;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	if (!status) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			status = MGMT_STATUS_FAILED;</div><div class='add'>+		else if (IS_ERR(skb))</div><div class='add'>+			status = mgmt_status(PTR_ERR(skb));</div><div class='add'>+		else</div><div class='add'>+			status = mgmt_status(skb-&gt;data[0]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_PHY_CONFIGURATION, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	bt_dev_dbg(hdev, "status %d", status);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id,</div><div class='del'>-				MGMT_OP_SET_PHY_CONFIGURATION,</div><div class='del'>-				mgmt_status(status));</div><div class='add'>+				MGMT_OP_SET_PHY_CONFIGURATION, status);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mgmt_cmd_complete(cmd-&gt;sk, hdev-&gt;id,</div><div class='ctx'> 				  MGMT_OP_SET_PHY_CONFIGURATION, 0,</div><div class='hunk'>@@ -3375,25 +4161,64 @@ static void set_default_phy_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		mgmt_phy_configuration_changed(hdev, cmd-&gt;sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	if (skb &amp;&amp; !IS_ERR(skb))</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_default_phy_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_set_phy_configuration *cp = cmd-&gt;param;</div><div class='add'>+	struct hci_cp_le_set_default_phy cp_phy;</div><div class='add'>+	u32 selected_phys;</div><div class='add'>+</div><div class='add'>+	selected_phys = __le32_to_cpu(cp-&gt;selected_phys);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cp_phy, 0, sizeof(cp_phy));</div><div class='add'>+</div><div class='add'>+	if (!(selected_phys &amp; MGMT_PHY_LE_TX_MASK))</div><div class='add'>+		cp_phy.all_phys |= 0x01;</div><div class='add'>+</div><div class='add'>+	if (!(selected_phys &amp; MGMT_PHY_LE_RX_MASK))</div><div class='add'>+		cp_phy.all_phys |= 0x02;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_1M_TX)</div><div class='add'>+		cp_phy.tx_phys |= HCI_LE_SET_PHY_1M;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_2M_TX)</div><div class='add'>+		cp_phy.tx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_CODED_TX)</div><div class='add'>+		cp_phy.tx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_1M_RX)</div><div class='add'>+		cp_phy.rx_phys |= HCI_LE_SET_PHY_1M;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_2M_RX)</div><div class='add'>+		cp_phy.rx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+</div><div class='add'>+	if (selected_phys &amp; MGMT_PHY_LE_CODED_RX)</div><div class='add'>+		cp_phy.rx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;skb =  __hci_cmd_sync(hdev, HCI_OP_LE_SET_DEFAULT_PHY,</div><div class='add'>+				   sizeof(cp_phy), &amp;cp_phy, HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_phy_configuration(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				 void *data, u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_cp_set_phy_confguration *cp = data;</div><div class='del'>-	struct hci_cp_le_set_default_phy cp_phy;</div><div class='add'>+	struct mgmt_cp_set_phy_configuration *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	u32 selected_phys, configurable_phys, supported_phys, unconfigure_phys;</div><div class='ctx'> 	u16 pkt_type = (HCI_DH1 | HCI_DM1);</div><div class='ctx'> 	bool changed = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sock %p %s", sk, hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	configurable_phys = get_configurable_phys(hdev);</div><div class='ctx'> 	supported_phys = get_supported_phys(hdev);</div><div class='hunk'>@@ -3489,75 +4314,1380 @@ static int set_phy_configuration(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_SET_PHY_CONFIGURATION, hdev, data,</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_SET_PHY_CONFIGURATION, hdev, data,</div><div class='ctx'> 			       len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_default_phy_sync, cmd,</div><div class='add'>+					 set_default_phy_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				      MGMT_OP_SET_PHY_CONFIGURATION,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_remove(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cp_phy, 0, sizeof(cp_phy));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!(selected_phys &amp; MGMT_PHY_LE_TX_MASK))</div><div class='del'>-		cp_phy.all_phys |= 0x01;</div><div class='add'>+static int set_blocked_keys(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 len)</div><div class='add'>+{</div><div class='add'>+	int err = MGMT_STATUS_SUCCESS;</div><div class='add'>+	struct mgmt_cp_set_blocked_keys *keys = data;</div><div class='add'>+	const u16 max_key_count = ((U16_MAX - sizeof(*keys)) /</div><div class='add'>+				   sizeof(struct mgmt_blocked_key_info));</div><div class='add'>+	u16 key_count, expected_len;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!(selected_phys &amp; MGMT_PHY_LE_RX_MASK))</div><div class='del'>-		cp_phy.all_phys |= 0x02;</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_1M_TX)</div><div class='del'>-		cp_phy.tx_phys |= HCI_LE_SET_PHY_1M;</div><div class='add'>+	key_count = __le16_to_cpu(keys-&gt;key_count);</div><div class='add'>+	if (key_count &gt; max_key_count) {</div><div class='add'>+		bt_dev_err(hdev, "too big key_count value %u", key_count);</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BLOCKED_KEYS,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_2M_TX)</div><div class='del'>-		cp_phy.tx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+	expected_len = struct_size(keys, keys, key_count);</div><div class='add'>+	if (expected_len != len) {</div><div class='add'>+		bt_dev_err(hdev, "expected %u bytes, got %u bytes",</div><div class='add'>+			   expected_len, len);</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BLOCKED_KEYS,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_CODED_TX)</div><div class='del'>-		cp_phy.tx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_1M_RX)</div><div class='del'>-		cp_phy.rx_phys |= HCI_LE_SET_PHY_1M;</div><div class='add'>+	hci_blocked_keys_clear(hdev);</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_2M_RX)</div><div class='del'>-		cp_phy.rx_phys |= HCI_LE_SET_PHY_2M;</div><div class='add'>+	for (i = 0; i &lt; key_count; ++i) {</div><div class='add'>+		struct blocked_key *b = kzalloc(sizeof(*b), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (selected_phys &amp; MGMT_PHY_LE_CODED_RX)</div><div class='del'>-		cp_phy.rx_phys |= HCI_LE_SET_PHY_CODED;</div><div class='add'>+		if (!b) {</div><div class='add'>+			err = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b-&gt;type = keys-&gt;keys[i].type;</div><div class='add'>+		memcpy(b-&gt;val, keys-&gt;keys[i].val, sizeof(b-&gt;val));</div><div class='add'>+		list_add_rcu(&amp;b-&gt;list, &amp;hdev-&gt;blocked_keys);</div><div class='add'>+	}</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_BLOCKED_KEYS,</div><div class='add'>+				err, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_wideband_speech(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			       void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mode *cp = data;</div><div class='add'>+	int err;</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	if (!hci_test_quirk(hdev, HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_WIDEBAND_SPEECH,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_WIDEBAND_SPEECH,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_LE_SET_DEFAULT_PHY, sizeof(cp_phy), &amp;cp_phy);</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (hdev_is_powered(hdev) &amp;&amp;</div><div class='add'>+	    !!cp-&gt;val != hci_dev_test_flag(hdev,</div><div class='add'>+					   HCI_WIDEBAND_SPEECH_ENABLED)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				      MGMT_OP_SET_WIDEBAND_SPEECH,</div><div class='add'>+				      MGMT_STATUS_REJECTED);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run_skb(&amp;req, set_default_phy_complete);</div><div class='add'>+	if (cp-&gt;val)</div><div class='add'>+		changed = !hci_dev_test_and_set_flag(hdev,</div><div class='add'>+						   HCI_WIDEBAND_SPEECH_ENABLED);</div><div class='add'>+	else</div><div class='add'>+		changed = hci_dev_test_and_clear_flag(hdev,</div><div class='add'>+						   HCI_WIDEBAND_SPEECH_ENABLED);</div><div class='add'>+</div><div class='add'>+	err = send_settings_rsp(sk, MGMT_OP_SET_WIDEBAND_SPEECH, hdev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		err = new_settings(hdev, sk);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_controller_cap(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			       void *data, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	char buf[20];</div><div class='add'>+	struct mgmt_rp_read_controller_cap *rp = (void *)buf;</div><div class='add'>+	u16 cap_len = 0;</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+	u8 tx_power_range[2];</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	memset(&amp;buf, 0, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* When the Read Simple Pairing Options command is supported, then</div><div class='add'>+	 * the remote public key validation is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * Alternatively, when Microsoft extensions are available, they can</div><div class='add'>+	 * indicate support for public key validation as well.</div><div class='add'>+	 */</div><div class='add'>+	if ((hdev-&gt;commands[41] &amp; 0x08) || msft_curve_validity(hdev))</div><div class='add'>+		flags |= 0x01;	/* Remote public key validation (BR/EDR) */</div><div class='add'>+</div><div class='add'>+	flags |= 0x02;		/* Remote public key validation (LE) */</div><div class='add'>+</div><div class='add'>+	/* When the Read Encryption Key Size command is supported, then the</div><div class='add'>+	 * encryption key size is enforced.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[20] &amp; 0x10)</div><div class='add'>+		flags |= 0x04;	/* Encryption key size enforcement (BR/EDR) */</div><div class='add'>+</div><div class='add'>+	flags |= 0x08;		/* Encryption key size enforcement (LE) */</div><div class='add'>+</div><div class='add'>+	cap_len = eir_append_data(rp-&gt;cap, cap_len, MGMT_CAP_SEC_FLAGS,</div><div class='add'>+				  &amp;flags, 1);</div><div class='add'>+</div><div class='add'>+	/* When the Read Simple Pairing Options command is supported, then</div><div class='add'>+	 * also max encryption key size information is provided.</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[41] &amp; 0x08)</div><div class='add'>+		cap_len = eir_append_le16(rp-&gt;cap, cap_len,</div><div class='add'>+					  MGMT_CAP_MAX_ENC_KEY_SIZE,</div><div class='add'>+					  hdev-&gt;max_enc_key_size);</div><div class='add'>+</div><div class='add'>+	cap_len = eir_append_le16(rp-&gt;cap, cap_len,</div><div class='add'>+				  MGMT_CAP_SMP_MAX_ENC_KEY_SIZE,</div><div class='add'>+				  SMP_MAX_ENC_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Append the min/max LE tx power parameters if we were able to fetch</div><div class='add'>+	 * it from the controller</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;commands[38] &amp; 0x80) {</div><div class='add'>+		memcpy(&amp;tx_power_range[0], &amp;hdev-&gt;min_le_tx_power, 1);</div><div class='add'>+		memcpy(&amp;tx_power_range[1], &amp;hdev-&gt;max_le_tx_power, 1);</div><div class='add'>+		cap_len = eir_append_data(rp-&gt;cap, cap_len, MGMT_CAP_LE_TX_PWR,</div><div class='add'>+					  tx_power_range, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rp-&gt;cap_len = cpu_to_le16(cap_len);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_READ_CONTROLLER_CAP, 0,</div><div class='add'>+				 rp, sizeof(*rp) + cap_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+/* d4992530-b9ec-469f-ab01-6c481c47da1c */</div><div class='add'>+static const u8 debug_uuid[16] = {</div><div class='add'>+	0x1c, 0xda, 0x47, 0x1c, 0x48, 0x6c, 0x01, 0xab,</div><div class='add'>+	0x9f, 0x46, 0xec, 0xb9, 0x30, 0x25, 0x99, 0xd4,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* 330859bc-7506-492d-9370-9a6f0614037f */</div><div class='add'>+static const u8 quality_report_uuid[16] = {</div><div class='add'>+	0x7f, 0x03, 0x14, 0x06, 0x6f, 0x9a, 0x70, 0x93,</div><div class='add'>+	0x2d, 0x49, 0x06, 0x75, 0xbc, 0x59, 0x08, 0x33,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* a6695ace-ee7f-4fb9-881a-5fac66c629af */</div><div class='add'>+static const u8 offload_codecs_uuid[16] = {</div><div class='add'>+	0xaf, 0x29, 0xc6, 0x66, 0xac, 0x5f, 0x1a, 0x88,</div><div class='add'>+	0xb9, 0x4f, 0x7f, 0xee, 0xce, 0x5a, 0x69, 0xa6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 671b10b5-42c0-4696-9227-eb28d1b049d6 */</div><div class='add'>+static const u8 le_simultaneous_roles_uuid[16] = {</div><div class='add'>+	0xd6, 0x49, 0xb0, 0xd1, 0x28, 0xeb, 0x27, 0x92,</div><div class='add'>+	0x96, 0x46, 0xc0, 0x42, 0xb5, 0x10, 0x1b, 0x67,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 6fbaf188-05e0-496a-9885-d6ddfdb4e03e */</div><div class='add'>+static const u8 iso_socket_uuid[16] = {</div><div class='add'>+	0x3e, 0xe0, 0xb4, 0xfd, 0xdd, 0xd6, 0x85, 0x98,</div><div class='add'>+	0x6a, 0x49, 0xe0, 0x05, 0x88, 0xf1, 0xba, 0x6f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 2ce463d7-7a03-4d8d-bf05-5f24e8f36e76 */</div><div class='add'>+static const u8 mgmt_mesh_uuid[16] = {</div><div class='add'>+	0x76, 0x6e, 0xf3, 0xe8, 0x24, 0x5f, 0x05, 0xbf,</div><div class='add'>+	0x8d, 0x4d, 0x03, 0x7a, 0xd7, 0x63, 0xe4, 0x2c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				  void *data, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_read_exp_features_info *rp;</div><div class='add'>+	size_t len;</div><div class='add'>+	u16 idx = 0;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	/* Enough space for 7 features */</div><div class='add'>+	len = sizeof(*rp) + (sizeof(rp-&gt;features[0]) * 7);</div><div class='add'>+	rp = kzalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!rp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+	flags = bt_dbg_get() ? BIT(0) : 0;</div><div class='add'>+</div><div class='add'>+	memcpy(rp-&gt;features[idx].uuid, debug_uuid, 16);</div><div class='add'>+	rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+	idx++;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (hdev &amp;&amp; hci_dev_le_state_simultaneous(hdev)) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES))</div><div class='add'>+			flags = BIT(0);</div><div class='add'>+		else</div><div class='add'>+			flags = 0;</div><div class='add'>+</div><div class='add'>+		memcpy(rp-&gt;features[idx].uuid, le_simultaneous_roles_uuid, 16);</div><div class='add'>+		rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev &amp;&amp; (aosp_has_quality_report(hdev) ||</div><div class='add'>+		     hdev-&gt;set_quality_report)) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_QUALITY_REPORT))</div><div class='add'>+			flags = BIT(0);</div><div class='add'>+		else</div><div class='add'>+			flags = 0;</div><div class='add'>+</div><div class='add'>+		memcpy(rp-&gt;features[idx].uuid, quality_report_uuid, 16);</div><div class='add'>+		rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev &amp;&amp; hdev-&gt;get_data_path_id) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED))</div><div class='add'>+			flags = BIT(0);</div><div class='add'>+		else</div><div class='add'>+			flags = 0;</div><div class='add'>+</div><div class='add'>+		memcpy(rp-&gt;features[idx].uuid, offload_codecs_uuid, 16);</div><div class='add'>+		rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_BT_LE)) {</div><div class='add'>+		flags = iso_inited() ? BIT(0) : 0;</div><div class='add'>+		memcpy(rp-&gt;features[idx].uuid, iso_socket_uuid, 16);</div><div class='add'>+		rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdev &amp;&amp; lmp_le_capable(hdev)) {</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))</div><div class='add'>+			flags = BIT(0);</div><div class='add'>+		else</div><div class='add'>+			flags = 0;</div><div class='add'>+</div><div class='add'>+		memcpy(rp-&gt;features[idx].uuid, mgmt_mesh_uuid, 16);</div><div class='add'>+		rp-&gt;features[idx].flags = cpu_to_le32(flags);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rp-&gt;feature_count = cpu_to_le16(idx);</div><div class='add'>+</div><div class='add'>+	/* After reading the experimental features information, enable</div><div class='add'>+	 * the events to update client on any future change.</div><div class='add'>+	 */</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	status = mgmt_cmd_complete(sk, hdev ? hdev-&gt;id : MGMT_INDEX_NONE,</div><div class='add'>+				   MGMT_OP_READ_EXP_FEATURES_INFO,</div><div class='add'>+				   0, rp, sizeof(*rp) + (20 * idx));</div><div class='add'>+</div><div class='add'>+	kfree(rp);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exp_feature_changed(struct hci_dev *hdev, const u8 *uuid,</div><div class='add'>+			       bool enabled, struct sock *skip)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_exp_feature_changed ev;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ev, 0, sizeof(ev));</div><div class='add'>+	memcpy(ev.uuid, uuid, 16);</div><div class='add'>+	ev.flags = cpu_to_le32(enabled ? BIT(0) : 0);</div><div class='add'>+</div><div class='add'>+	return mgmt_limited_event(MGMT_EV_EXP_FEATURE_CHANGED, hdev,</div><div class='add'>+				  &amp;ev, sizeof(ev),</div><div class='add'>+				  HCI_MGMT_EXP_FEATURE_EVENTS, skip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define EXP_FEAT(_uuid, _set_func)	\</div><div class='add'>+{					\</div><div class='add'>+	.uuid = _uuid,			\</div><div class='add'>+	.set_func = _set_func,		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The zero key uuid is special. Multiple exp features are set through it. */</div><div class='add'>+static int set_zero_key_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			     struct mgmt_cp_set_exp_feature *cp, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+</div><div class='add'>+	memset(rp.uuid, 0, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(0);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+	if (!hdev) {</div><div class='add'>+		bool changed = bt_dbg_get();</div><div class='add'>+</div><div class='add'>+		bt_dbg_set(false);</div><div class='add'>+</div><div class='add'>+		if (changed)</div><div class='add'>+			exp_feature_changed(NULL, ZERO_KEY, false, sk);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev ? hdev-&gt;id : MGMT_INDEX_NONE,</div><div class='add'>+				 MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				 &amp;rp, sizeof(rp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+static int set_debug_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			  struct mgmt_cp_set_exp_feature *cp, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+</div><div class='add'>+	bool val, changed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use the non-controller index */</div><div class='add'>+	if (hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	val = !!cp-&gt;param[0];</div><div class='add'>+	changed = val ? !bt_dbg_get() : bt_dbg_get();</div><div class='add'>+	bt_dbg_set(val);</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, debug_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE,</div><div class='add'>+				MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, debug_uuid, val, sk);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void read_local_oob_data_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				         u16 opcode, struct sk_buff *skb)</div><div class='add'>+static int set_mgmt_mesh_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			      struct mgmt_cp_set_exp_feature *cp, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+	bool val, changed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use the controller index */</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	val = !!cp-&gt;param[0];</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		changed = !hci_dev_test_and_set_flag(hdev,</div><div class='add'>+						     HCI_MESH_EXPERIMENTAL);</div><div class='add'>+	} else {</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_MESH);</div><div class='add'>+		changed = hci_dev_test_and_clear_flag(hdev,</div><div class='add'>+						      HCI_MESH_EXPERIMENTAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, mgmt_mesh_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, mgmt_mesh_uuid, val, sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_quality_report_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				   struct mgmt_cp_set_exp_feature *cp,</div><div class='add'>+				   u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+	bool val, changed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use a valid controller index */</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	hci_req_sync_lock(hdev);</div><div class='add'>+</div><div class='add'>+	val = !!cp-&gt;param[0];</div><div class='add'>+	changed = (val != hci_dev_test_flag(hdev, HCI_QUALITY_REPORT));</div><div class='add'>+</div><div class='add'>+	if (!aosp_has_quality_report(hdev) &amp;&amp; !hdev-&gt;set_quality_report) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				      MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				      MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+		goto unlock_quality_report;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed) {</div><div class='add'>+		if (hdev-&gt;set_quality_report)</div><div class='add'>+			err = hdev-&gt;set_quality_report(hdev, val);</div><div class='add'>+		else</div><div class='add'>+			err = aosp_set_quality_report(hdev, val);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			err = mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+					      MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+					      MGMT_STATUS_FAILED);</div><div class='add'>+			goto unlock_quality_report;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (val)</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_QUALITY_REPORT);</div><div class='add'>+		else</div><div class='add'>+			hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "quality report enable %d changed %d", val, changed);</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, quality_report_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, quality_report_uuid, val, sk);</div><div class='add'>+</div><div class='add'>+unlock_quality_report:</div><div class='add'>+	hci_req_sync_unlock(hdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_offload_codec_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				  struct mgmt_cp_set_exp_feature *cp,</div><div class='add'>+				  u16 data_len)</div><div class='add'>+{</div><div class='add'>+	bool val, changed;</div><div class='add'>+	int err;</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use a valid controller index */</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	val = !!cp-&gt;param[0];</div><div class='add'>+	changed = (val != hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED));</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;get_data_path_id) {</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed) {</div><div class='add'>+		if (val)</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED);</div><div class='add'>+		else</div><div class='add'>+			hci_dev_clear_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_info(hdev, "offload codecs enable %d changed %d",</div><div class='add'>+		    val, changed);</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, offload_codecs_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+	err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, offload_codecs_uuid, val, sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_le_simultaneous_roles_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+					  struct mgmt_cp_set_exp_feature *cp,</div><div class='add'>+					  u16 data_len)</div><div class='add'>+{</div><div class='add'>+	bool val, changed;</div><div class='add'>+	int err;</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use a valid controller index */</div><div class='add'>+	if (!hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	val = !!cp-&gt;param[0];</div><div class='add'>+	changed = (val != hci_dev_test_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES));</div><div class='add'>+</div><div class='add'>+	if (!hci_dev_le_state_simultaneous(hdev)) {</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed) {</div><div class='add'>+		if (val)</div><div class='add'>+			hci_dev_set_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES);</div><div class='add'>+		else</div><div class='add'>+			hci_dev_clear_flag(hdev, HCI_LE_SIMULTANEOUS_ROLES);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_info(hdev, "LE simultaneous roles enable %d changed %d",</div><div class='add'>+		    val, changed);</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, le_simultaneous_roles_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+	err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, le_simultaneous_roles_uuid, val, sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BT_LE</div><div class='add'>+static int set_iso_socket_func(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			       struct mgmt_cp_set_exp_feature *cp, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_set_exp_feature rp;</div><div class='add'>+	bool val, changed = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Command requires to use the non-controller index */</div><div class='add'>+	if (hdev)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_INDEX);</div><div class='add'>+</div><div class='add'>+	/* Parameters are limited to a single octet */</div><div class='add'>+	if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* Only boolean on/off is supported */</div><div class='add'>+	if (cp-&gt;param[0] != 0x00 &amp;&amp; cp-&gt;param[0] != 0x01)</div><div class='add'>+		return mgmt_cmd_status(sk, MGMT_INDEX_NONE,</div><div class='add'>+				       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	val = cp-&gt;param[0] ? true : false;</div><div class='add'>+	if (val)</div><div class='add'>+		err = iso_init();</div><div class='add'>+	else</div><div class='add'>+		err = iso_exit();</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	memcpy(rp.uuid, iso_socket_uuid, 16);</div><div class='add'>+	rp.flags = cpu_to_le32(val ? BIT(0) : 0);</div><div class='add'>+</div><div class='add'>+	hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);</div><div class='add'>+</div><div class='add'>+	err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE,</div><div class='add'>+				MGMT_OP_SET_EXP_FEATURE, 0,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		exp_feature_changed(hdev, iso_socket_uuid, val, sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct mgmt_exp_feature {</div><div class='add'>+	const u8 *uuid;</div><div class='add'>+	int (*set_func)(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			struct mgmt_cp_set_exp_feature *cp, u16 data_len);</div><div class='add'>+} exp_features[] = {</div><div class='add'>+	EXP_FEAT(ZERO_KEY, set_zero_key_func),</div><div class='add'>+#ifdef CONFIG_BT_FEATURE_DEBUG</div><div class='add'>+	EXP_FEAT(debug_uuid, set_debug_func),</div><div class='add'>+#endif</div><div class='add'>+	EXP_FEAT(mgmt_mesh_uuid, set_mgmt_mesh_func),</div><div class='add'>+	EXP_FEAT(quality_report_uuid, set_quality_report_func),</div><div class='add'>+	EXP_FEAT(offload_codecs_uuid, set_offload_codec_func),</div><div class='add'>+	EXP_FEAT(le_simultaneous_roles_uuid, set_le_simultaneous_roles_func),</div><div class='add'>+#ifdef CONFIG_BT_LE</div><div class='add'>+	EXP_FEAT(iso_socket_uuid, set_iso_socket_func),</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* end with a null feature */</div><div class='add'>+	EXP_FEAT(NULL, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_exp_feature(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			   void *data, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_set_exp_feature *cp = data;</div><div class='add'>+	size_t i = 0;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	for (i = 0; exp_features[i].uuid; i++) {</div><div class='add'>+		if (!memcmp(cp-&gt;uuid, exp_features[i].uuid, 16))</div><div class='add'>+			return exp_features[i].set_func(sk, hdev, cp, data_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_status(sk, hdev ? hdev-&gt;id : MGMT_INDEX_NONE,</div><div class='add'>+			       MGMT_OP_SET_EXP_FEATURE,</div><div class='add'>+			       MGMT_STATUS_NOT_SUPPORTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_get_device_flags *cp = data;</div><div class='add'>+	struct mgmt_rp_get_device_flags rp;</div><div class='add'>+	struct bdaddr_list_with_flags *br_params;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+	u32 supported_flags;</div><div class='add'>+	u32 current_flags = 0;</div><div class='add'>+	u8 status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Get device flags %pMR (type 0x%x)\n",</div><div class='add'>+		   &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	supported_flags = hdev-&gt;conn_flags;</div><div class='add'>+</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;addr.type == BDADDR_BREDR) {</div><div class='add'>+		br_params = hci_bdaddr_list_lookup_with_flags(&amp;hdev-&gt;accept_list,</div><div class='add'>+							      &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+							      cp-&gt;addr.type);</div><div class='add'>+		if (!br_params)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		current_flags = br_params-&gt;flags;</div><div class='add'>+	} else {</div><div class='add'>+		params = hci_conn_params_lookup(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+						le_addr_type(cp-&gt;addr.type));</div><div class='add'>+		if (!params)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		current_flags = params-&gt;flags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	rp.addr.type = cp-&gt;addr.type;</div><div class='add'>+	rp.supported_flags = cpu_to_le32(supported_flags);</div><div class='add'>+	rp.current_flags = cpu_to_le32(current_flags);</div><div class='add'>+</div><div class='add'>+	status = MGMT_STATUS_SUCCESS;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_DEVICE_FLAGS, status,</div><div class='add'>+				&amp;rp, sizeof(rp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_flags_changed(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				 bdaddr_t *bdaddr, u8 bdaddr_type,</div><div class='add'>+				 u32 supported_flags, u32 current_flags)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_device_flags_changed ev;</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='add'>+	ev.addr.type = bdaddr_type;</div><div class='add'>+	ev.supported_flags = cpu_to_le32(supported_flags);</div><div class='add'>+	ev.current_flags = cpu_to_le32(current_flags);</div><div class='add'>+</div><div class='add'>+	mgmt_event(MGMT_EV_DEVICE_FLAGS_CHANGED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_connected(struct hci_dev *hdev, bdaddr_t *addr, u8 type)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, addr);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;dst_type != type)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;state != BT_CONNECTED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static struct hci_conn_params *hci_conn_params_set(struct hci_dev *hdev,</div><div class='add'>+						   bdaddr_t *addr, u8 addr_type,</div><div class='add'>+						   u8 auto_connect)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+</div><div class='add'>+	params = hci_conn_params_add(hdev, addr, addr_type);</div><div class='add'>+	if (!params)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;auto_connect == auto_connect)</div><div class='add'>+		return params;</div><div class='add'>+</div><div class='add'>+	hci_pend_le_list_del_init(params);</div><div class='add'>+</div><div class='add'>+	switch (auto_connect) {</div><div class='add'>+	case HCI_AUTO_CONN_DISABLED:</div><div class='add'>+	case HCI_AUTO_CONN_LINK_LOSS:</div><div class='add'>+		/* If auto connect is being disabled when we're trying to</div><div class='add'>+		 * connect to device, keep connecting.</div><div class='add'>+		 */</div><div class='add'>+		if (params-&gt;explicit_connect)</div><div class='add'>+			hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+		break;</div><div class='add'>+	case HCI_AUTO_CONN_REPORT:</div><div class='add'>+		if (params-&gt;explicit_connect)</div><div class='add'>+			hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+		else</div><div class='add'>+			hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_reports);</div><div class='add'>+		break;</div><div class='add'>+	case HCI_AUTO_CONN_DIRECT:</div><div class='add'>+	case HCI_AUTO_CONN_ALWAYS:</div><div class='add'>+		if (!is_connected(hdev, addr, addr_type))</div><div class='add'>+			hci_pend_le_list_add(params, &amp;hdev-&gt;pend_le_conns);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params-&gt;auto_connect = auto_connect;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "addr %pMR (type %u) auto_connect %u",</div><div class='add'>+		   addr, addr_type, auto_connect);</div><div class='add'>+</div><div class='add'>+	return params;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_set_device_flags *cp = data;</div><div class='add'>+	struct bdaddr_list_with_flags *br_params;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='add'>+	u8 status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+	u32 supported_flags;</div><div class='add'>+	u32 current_flags = __le32_to_cpu(cp-&gt;current_flags);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Set device flags %pMR (type 0x%x) = 0x%x",</div><div class='add'>+		   &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type, current_flags);</div><div class='add'>+</div><div class='add'>+	// We should take hci_dev_lock() early, I think.. conn_flags can change</div><div class='add'>+	supported_flags = hdev-&gt;conn_flags;</div><div class='add'>+</div><div class='add'>+	if ((supported_flags | current_flags) != supported_flags) {</div><div class='add'>+		bt_dev_warn(hdev, "Bad flag given (0x%x) vs supported (0x%0x)",</div><div class='add'>+			    current_flags, supported_flags);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;addr.type == BDADDR_BREDR) {</div><div class='add'>+		br_params = hci_bdaddr_list_lookup_with_flags(&amp;hdev-&gt;accept_list,</div><div class='add'>+							      &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+							      cp-&gt;addr.type);</div><div class='add'>+</div><div class='add'>+		if (br_params) {</div><div class='add'>+			br_params-&gt;flags = current_flags;</div><div class='add'>+			status = MGMT_STATUS_SUCCESS;</div><div class='add'>+		} else {</div><div class='add'>+			bt_dev_warn(hdev, "No such BR/EDR device %pMR (0x%x)",</div><div class='add'>+				    &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params = hci_conn_params_lookup(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+					le_addr_type(cp-&gt;addr.type));</div><div class='add'>+	if (!params) {</div><div class='add'>+		/* Create a new hci_conn_params if it doesn't exist */</div><div class='add'>+		params = hci_conn_params_set(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+					     le_addr_type(cp-&gt;addr.type),</div><div class='add'>+					     HCI_AUTO_CONN_DISABLED);</div><div class='add'>+		if (!params) {</div><div class='add'>+			bt_dev_warn(hdev, "No such LE device %pMR (0x%x)",</div><div class='add'>+				    &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+				    le_addr_type(cp-&gt;addr.type));</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	supported_flags = hdev-&gt;conn_flags;</div><div class='add'>+</div><div class='add'>+	if ((supported_flags | current_flags) != supported_flags) {</div><div class='add'>+		bt_dev_warn(hdev, "Bad flag given (0x%x) vs supported (0x%0x)",</div><div class='add'>+			    current_flags, supported_flags);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(params-&gt;flags, current_flags);</div><div class='add'>+	status = MGMT_STATUS_SUCCESS;</div><div class='add'>+</div><div class='add'>+	/* Update passive scan if HCI_CONN_FLAG_DEVICE_PRIVACY</div><div class='add'>+	 * has been set.</div><div class='add'>+	 */</div><div class='add'>+	if (params-&gt;flags &amp; HCI_CONN_FLAG_DEVICE_PRIVACY)</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (status == MGMT_STATUS_SUCCESS)</div><div class='add'>+		device_flags_changed(sk, hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type,</div><div class='add'>+				     supported_flags, current_flags);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_DEVICE_FLAGS, status,</div><div class='add'>+				 &amp;cp-&gt;addr, sizeof(cp-&gt;addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_adv_monitor_added(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				   u16 handle)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_adv_monitor_added ev;</div><div class='add'>+</div><div class='add'>+	ev.monitor_handle = cpu_to_le16(handle);</div><div class='add'>+</div><div class='add'>+	mgmt_event(MGMT_EV_ADV_MONITOR_ADDED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_adv_monitor_removed(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				     __le16 handle)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_adv_monitor_removed ev;</div><div class='add'>+</div><div class='add'>+	ev.monitor_handle = handle;</div><div class='add'>+</div><div class='add'>+	mgmt_event(MGMT_EV_ADV_MONITOR_REMOVED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				 void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct adv_monitor *monitor = NULL;</div><div class='add'>+	struct mgmt_rp_read_adv_monitor_features *rp = NULL;</div><div class='add'>+	int handle, err;</div><div class='add'>+	size_t rp_size = 0;</div><div class='add'>+	__u32 supported = 0;</div><div class='add'>+	__u32 enabled = 0;</div><div class='add'>+	__u16 num_handles = 0;</div><div class='add'>+	__u16 handles[HCI_MAX_ADV_MONITOR_NUM_HANDLES];</div><div class='add'>+</div><div class='add'>+	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (msft_monitor_supported(hdev))</div><div class='add'>+		supported |= MGMT_ADV_MONITOR_FEATURE_MASK_OR_PATTERNS;</div><div class='add'>+</div><div class='add'>+	idr_for_each_entry(&amp;hdev-&gt;adv_monitors_idr, monitor, handle)</div><div class='add'>+		handles[num_handles++] = monitor-&gt;handle;</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	rp_size = sizeof(*rp) + (num_handles * sizeof(u16));</div><div class='add'>+	rp = kmalloc(rp_size, GFP_KERNEL);</div><div class='add'>+	if (!rp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* All supported features are currently enabled */</div><div class='add'>+	enabled = supported;</div><div class='add'>+</div><div class='add'>+	rp-&gt;supported_features = cpu_to_le32(supported);</div><div class='add'>+	rp-&gt;enabled_features = cpu_to_le32(enabled);</div><div class='add'>+	rp-&gt;max_num_handles = cpu_to_le16(HCI_MAX_ADV_MONITOR_NUM_HANDLES);</div><div class='add'>+	rp-&gt;max_num_patterns = HCI_MAX_ADV_MONITOR_NUM_PATTERNS;</div><div class='add'>+	rp-&gt;num_handles = cpu_to_le16(num_handles);</div><div class='add'>+	if (num_handles)</div><div class='add'>+		memcpy(&amp;rp-&gt;handles, &amp;handles, (num_handles * sizeof(u16)));</div><div class='add'>+</div><div class='add'>+	err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_READ_ADV_MONITOR_FEATURES,</div><div class='add'>+				MGMT_STATUS_SUCCESS, rp, rp_size);</div><div class='add'>+</div><div class='add'>+	kfree(rp);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev,</div><div class='add'>+						   void *data, int status)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_add_adv_patterns_monitor rp;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+</div><div class='add'>+	/* This is likely the result of hdev being closed and mgmt_index_removed</div><div class='add'>+	 * is attempting to clean up any pending command so</div><div class='add'>+	 * hci_adv_monitors_clear is about to be called which will take care of</div><div class='add'>+	 * freeing the adv_monitor instances.</div><div class='add'>+	 */</div><div class='add'>+	if (status == -ECANCELED &amp;&amp; !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	monitor = cmd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	rp.monitor_handle = cpu_to_le16(monitor-&gt;handle);</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		mgmt_adv_monitor_added(cmd-&gt;sk, hdev, monitor-&gt;handle);</div><div class='add'>+		hdev-&gt;adv_monitors_cnt++;</div><div class='add'>+		if (monitor-&gt;state == ADV_MONITOR_STATE_NOT_REGISTERED)</div><div class='add'>+			monitor-&gt;state = ADV_MONITOR_STATE_REGISTERED;</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+			  mgmt_status(status), &amp;rp, sizeof(rp));</div><div class='add'>+	mgmt_pending_remove(cmd);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "add monitor %d complete, status %d",</div><div class='add'>+		   rp.monitor_handle, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mgmt_add_adv_patterns_monitor_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct adv_monitor *mon;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mon = cmd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	return hci_add_adv_monitor(hdev, mon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				      struct adv_monitor *m, u8 status,</div><div class='add'>+				      void *data, u16 len, u16 op)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_rp_read_local_oob_data mgmt_rp;</div><div class='del'>-	size_t rp_size = sizeof(mgmt_rp);</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status %u", hdev-&gt;name, status);</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_READ_LOCAL_OOB_DATA, hdev);</div><div class='del'>-	if (!cmd)</div><div class='add'>+	if (status)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (pending_find(MGMT_OP_SET_LE, hdev) ||</div><div class='add'>+	    pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR, hdev) ||</div><div class='add'>+	    pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev)) {</div><div class='add'>+		status = MGMT_STATUS_BUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd = mgmt_pending_add(sk, op, hdev, data, len);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;user_data = m;</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, mgmt_add_adv_patterns_monitor_sync, cmd,</div><div class='add'>+				 mgmt_add_adv_patterns_monitor_complete);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -ENOMEM)</div><div class='add'>+			status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		else</div><div class='add'>+			status = MGMT_STATUS_FAILED;</div><div class='add'>+</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_free_adv_monitor(hdev, m);</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return mgmt_cmd_status(sk, hdev-&gt;id, op, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_adv_monitor_rssi(struct adv_monitor *m,</div><div class='add'>+				   struct mgmt_adv_rssi_thresholds *rssi)</div><div class='add'>+{</div><div class='add'>+	if (rssi) {</div><div class='add'>+		m-&gt;rssi.low_threshold = rssi-&gt;low_threshold;</div><div class='add'>+		m-&gt;rssi.low_threshold_timeout =</div><div class='add'>+		    __le16_to_cpu(rssi-&gt;low_threshold_timeout);</div><div class='add'>+		m-&gt;rssi.high_threshold = rssi-&gt;high_threshold;</div><div class='add'>+		m-&gt;rssi.high_threshold_timeout =</div><div class='add'>+		    __le16_to_cpu(rssi-&gt;high_threshold_timeout);</div><div class='add'>+		m-&gt;rssi.sampling_period = rssi-&gt;sampling_period;</div><div class='add'>+	} else {</div><div class='add'>+		/* Default values. These numbers are the least constricting</div><div class='add'>+		 * parameters for MSFT API to work, so it behaves as if there</div><div class='add'>+		 * are no rssi parameter to consider. May need to be changed</div><div class='add'>+		 * if other API are to be supported.</div><div class='add'>+		 */</div><div class='add'>+		m-&gt;rssi.low_threshold = -127;</div><div class='add'>+		m-&gt;rssi.low_threshold_timeout = 60;</div><div class='add'>+		m-&gt;rssi.high_threshold = -127;</div><div class='add'>+		m-&gt;rssi.high_threshold_timeout = 0;</div><div class='add'>+		m-&gt;rssi.sampling_period = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 parse_adv_monitor_pattern(struct adv_monitor *m, u8 pattern_count,</div><div class='add'>+				    struct mgmt_adv_pattern *patterns)</div><div class='add'>+{</div><div class='add'>+	u8 offset = 0, length = 0;</div><div class='add'>+	struct adv_pattern *p = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pattern_count; i++) {</div><div class='add'>+		offset = patterns[i].offset;</div><div class='add'>+		length = patterns[i].length;</div><div class='add'>+		if (offset &gt;= HCI_MAX_AD_LENGTH ||</div><div class='add'>+		    length &gt; HCI_MAX_AD_LENGTH ||</div><div class='add'>+		    (offset + length) &gt; HCI_MAX_AD_LENGTH)</div><div class='add'>+			return MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+</div><div class='add'>+		p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+		if (!p)</div><div class='add'>+			return MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+</div><div class='add'>+		p-&gt;ad_type = patterns[i].ad_type;</div><div class='add'>+		p-&gt;offset = patterns[i].offset;</div><div class='add'>+		p-&gt;length = patterns[i].length;</div><div class='add'>+		memcpy(p-&gt;value, patterns[i].value, p-&gt;length);</div><div class='add'>+</div><div class='add'>+		INIT_LIST_HEAD(&amp;p-&gt;list);</div><div class='add'>+		list_add(&amp;p-&gt;list, &amp;m-&gt;patterns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return MGMT_STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				    void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_add_adv_patterns_monitor *cp = data;</div><div class='add'>+	struct adv_monitor *m = NULL;</div><div class='add'>+	u8 status = MGMT_STATUS_SUCCESS;</div><div class='add'>+	size_t expected_size = sizeof(*cp);</div><div class='add'>+</div><div class='add'>+	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (len &lt;= sizeof(*cp)) {</div><div class='add'>+		status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expected_size += cp-&gt;pattern_count * sizeof(struct mgmt_adv_pattern);</div><div class='add'>+	if (len != expected_size) {</div><div class='add'>+		status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = kzalloc(sizeof(*m), GFP_KERNEL);</div><div class='add'>+	if (!m) {</div><div class='add'>+		status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;m-&gt;patterns);</div><div class='add'>+</div><div class='add'>+	parse_adv_monitor_rssi(m, NULL);</div><div class='add'>+	status = parse_adv_monitor_pattern(m, cp-&gt;pattern_count, cp-&gt;patterns);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return __add_adv_patterns_monitor(sk, hdev, m, status, data, len,</div><div class='add'>+					  MGMT_OP_ADD_ADV_PATTERNS_MONITOR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_adv_patterns_monitor_rssi(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+					 void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_add_adv_patterns_monitor_rssi *cp = data;</div><div class='add'>+	struct adv_monitor *m = NULL;</div><div class='add'>+	u8 status = MGMT_STATUS_SUCCESS;</div><div class='add'>+	size_t expected_size = sizeof(*cp);</div><div class='add'>+</div><div class='add'>+	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (len &lt;= sizeof(*cp)) {</div><div class='add'>+		status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expected_size += cp-&gt;pattern_count * sizeof(struct mgmt_adv_pattern);</div><div class='add'>+	if (len != expected_size) {</div><div class='add'>+		status = MGMT_STATUS_INVALID_PARAMS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = kzalloc(sizeof(*m), GFP_KERNEL);</div><div class='add'>+	if (!m) {</div><div class='add'>+		status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;m-&gt;patterns);</div><div class='add'>+</div><div class='add'>+	parse_adv_monitor_rssi(m, &amp;cp-&gt;rssi);</div><div class='add'>+	status = parse_adv_monitor_pattern(m, cp-&gt;pattern_count, cp-&gt;patterns);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return __add_adv_patterns_monitor(sk, hdev, m, status, data, len,</div><div class='add'>+					 MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev,</div><div class='add'>+					     void *data, int status)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_remove_adv_monitor rp;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_remove_adv_monitor *cp;</div><div class='add'>+</div><div class='add'>+	if (status == -ECANCELED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (status || !skb) {</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	rp.monitor_handle = cp-&gt;monitor_handle;</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		mgmt_adv_monitor_removed(cmd-&gt;sk, hdev, cp-&gt;monitor_handle);</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+			  mgmt_status(status), &amp;rp, sizeof(rp));</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "remove monitor %d complete, status %d",</div><div class='add'>+		   rp.monitor_handle, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mgmt_remove_adv_monitor_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_remove_adv_monitor *cp = cmd-&gt;param;</div><div class='add'>+	u16 handle = __le16_to_cpu(cp-&gt;monitor_handle);</div><div class='add'>+</div><div class='add'>+	if (!handle)</div><div class='add'>+		return hci_remove_all_adv_monitor(hdev);</div><div class='add'>+</div><div class='add'>+	return hci_remove_single_adv_monitor(hdev, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			      void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	int err, status;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	if (pending_find(MGMT_OP_SET_LE, hdev) ||</div><div class='add'>+	    pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR, hdev) ||</div><div class='add'>+	    pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev)) {</div><div class='add'>+		status = MGMT_STATUS_BUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_REMOVE_ADV_MONITOR, hdev, data, len);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd,</div><div class='add'>+				  mgmt_remove_adv_monitor_complete);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='add'>+		if (err == -ENOMEM)</div><div class='add'>+			status = MGMT_STATUS_NO_RESOURCES;</div><div class='add'>+		else</div><div class='add'>+			status = MGMT_STATUS_FAILED;</div><div class='add'>+</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+	return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_REMOVE_ADV_MONITOR,</div><div class='add'>+			       status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_local_oob_data_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					 int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_rp_read_local_oob_data mgmt_rp;</div><div class='add'>+	size_t rp_size = sizeof(mgmt_rp);</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct sk_buff *skb = cmd-&gt;skb;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			status = MGMT_STATUS_FAILED;</div><div class='add'>+		else if (IS_ERR(skb))</div><div class='add'>+			status = mgmt_status(PTR_ERR(skb));</div><div class='add'>+		else</div><div class='add'>+			status = mgmt_status(skb-&gt;data[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "status %d", status);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='ctx'> 		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_READ_LOCAL_OOB_DATA,</div><div class='del'>-				status ? mgmt_status(status) : MGMT_STATUS_FAILED);</div><div class='add'>+				status);</div><div class='ctx'> 		goto remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;mgmt_rp, 0, sizeof(mgmt_rp));</div><div class='ctx'> </div><div class='del'>-	if (opcode == HCI_OP_READ_LOCAL_OOB_DATA) {</div><div class='add'>+	if (!bredr_sc_enabled(hdev)) {</div><div class='ctx'> 		struct hci_rp_read_local_oob_data *rp = (void *) skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len &lt; sizeof(*rp)) {</div><div class='hunk'>@@ -3592,17 +5722,34 @@ static void read_local_oob_data_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 			  MGMT_STATUS_SUCCESS, &amp;mgmt_rp, rp_size);</div><div class='ctx'> </div><div class='ctx'> remove:</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	if (skb &amp;&amp; !IS_ERR(skb))</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_local_oob_data_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+</div><div class='add'>+	if (bredr_sc_enabled(hdev))</div><div class='add'>+		cmd-&gt;skb = hci_read_local_oob_data_sync(hdev, true, cmd-&gt;sk);</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;skb = hci_read_local_oob_data_sync(hdev, false, cmd-&gt;sk);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(cmd-&gt;skb))</div><div class='add'>+		return PTR_ERR(cmd-&gt;skb);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_local_oob_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			       void *data, u16 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3618,28 +5765,20 @@ static int read_local_oob_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_READ_LOCAL_OOB_DATA, hdev)) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_READ_LOCAL_OOB_DATA,</div><div class='del'>-				      MGMT_STATUS_BUSY);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_READ_LOCAL_OOB_DATA, hdev, NULL, 0);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_READ_LOCAL_OOB_DATA, hdev, NULL, 0);</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	if (bredr_sc_enabled(hdev))</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_LOCAL_OOB_EXT_DATA, 0, NULL);</div><div class='ctx'> 	else</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_LOCAL_OOB_DATA, 0, NULL);</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, read_local_oob_data_sync, cmd,</div><div class='add'>+					 read_local_oob_data_complete);</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run_skb(&amp;req, read_local_oob_data_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_READ_LOCAL_OOB_DATA,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -3652,7 +5791,7 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_addr_info *addr = data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s ", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!bdaddr_type_is_valid(addr-&gt;type))</div><div class='ctx'> 		return mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='hunk'>@@ -3761,7 +5900,7 @@ static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;addr.type != BDADDR_BREDR)</div><div class='ctx'> 		return mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='hunk'>@@ -3791,29 +5930,6 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status)</div><div class='del'>-{</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-</div><div class='del'>-	BT_DBG("status %d", status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	cmd = pending_find(MGMT_OP_START_DISCOVERY, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		cmd = pending_find(MGMT_OP_START_SERVICE_DISCOVERY, hdev);</div><div class='del'>-</div><div class='del'>-	if (!cmd)</div><div class='del'>-		cmd = pending_find(MGMT_OP_START_LIMITED_DISCOVERY, hdev);</div><div class='del'>-</div><div class='del'>-	if (cmd) {</div><div class='del'>-		cmd-&gt;cmd_complete(cmd, mgmt_status(status));</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool discovery_type_is_valid(struct hci_dev *hdev, uint8_t type,</div><div class='ctx'> 				    uint8_t *mgmt_status)</div><div class='ctx'> {</div><div class='hunk'>@@ -3827,7 +5943,7 @@ static bool discovery_type_is_valid(struct hci_dev *hdev, uint8_t type,</div><div class='ctx'> 		*mgmt_status = mgmt_le_support(hdev);</div><div class='ctx'> 		if (*mgmt_status)</div><div class='ctx'> 			return false;</div><div class='del'>-		/* Intentional fall-through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case DISCOV_TYPE_BREDR:</div><div class='ctx'> 		*mgmt_status = mgmt_bredr_support(hdev);</div><div class='ctx'> 		if (*mgmt_status)</div><div class='hunk'>@@ -3841,6 +5957,31 @@ static bool discovery_type_is_valid(struct hci_dev *hdev, uint8_t type,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void start_discovery_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_status(err),</div><div class='add'>+			  cmd-&gt;param, 1);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='add'>+	hci_discovery_set_state(hdev, err ? DISCOVERY_STOPPED:</div><div class='add'>+				DISCOVERY_FINDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_discovery_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!mgmt_pending_listed(hdev, data))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	return hci_start_discovery_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int start_discovery_internal(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				    u16 op, void *data, u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -3849,7 +5990,7 @@ static int start_discovery_internal(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3873,6 +6014,13 @@ static int start_discovery_internal(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Can't start discovery when it is paused */</div><div class='add'>+	if (hdev-&gt;discovery_paused) {</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id, op, MGMT_STATUS_BUSY,</div><div class='add'>+					&amp;cp-&gt;type, sizeof(cp-&gt;type));</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Clear the discovery filter first to free any previously</div><div class='ctx'> 	 * allocated memory for the UUID list.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3891,11 +6039,14 @@ static int start_discovery_internal(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;cmd_complete = generic_cmd_complete;</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, start_discovery_sync, cmd,</div><div class='add'>+				 start_discovery_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hci_discovery_set_state(hdev, DISCOVERY_STARTING);</div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;discov_update);</div><div class='del'>-	err = 0;</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -3917,13 +6068,6 @@ static int start_limited_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 					data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int service_discovery_cmd_complete(struct mgmt_pending_cmd *cmd,</div><div class='del'>-					  u8 status)</div><div class='del'>-{</div><div class='del'>-	return mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, status,</div><div class='del'>-				 cmd-&gt;param, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				   void *data, u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -3934,7 +6078,7 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3955,6 +6099,14 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;discovery_paused) {</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+					MGMT_OP_START_SERVICE_DISCOVERY,</div><div class='add'>+					MGMT_STATUS_BUSY, &amp;cp-&gt;type,</div><div class='add'>+					sizeof(cp-&gt;type));</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	uuid_count = __le16_to_cpu(cp-&gt;uuid_count);</div><div class='ctx'> 	if (uuid_count &gt; max_uuid_count) {</div><div class='ctx'> 		bt_dev_err(hdev, "service_discovery: too big uuid_count value %u",</div><div class='hunk'>@@ -3991,8 +6143,6 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;cmd_complete = service_discovery_cmd_complete;</div><div class='del'>-</div><div class='ctx'> 	/* Clear the discovery filter first to free any previously</div><div class='ctx'> 	 * allocated memory for the UUID list.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4016,30 +6166,43 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = hci_cmd_sync_queue(hdev, start_discovery_sync, cmd,</div><div class='add'>+				 start_discovery_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hci_discovery_set_state(hdev, DISCOVERY_STARTING);</div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;discov_update);</div><div class='del'>-	err = 0;</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_stop_discovery_complete(struct hci_dev *hdev, u8 status)</div><div class='add'>+static void stop_discovery_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status %d", status);</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, cmd))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_STOP_DISCOVERY, hdev);</div><div class='del'>-	if (cmd) {</div><div class='del'>-		cmd-&gt;cmd_complete(cmd, mgmt_status(status));</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='del'>-	}</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_status(err),</div><div class='add'>+			  cmd-&gt;param, 1);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	if (!err)</div><div class='add'>+		hci_discovery_set_state(hdev, DISCOVERY_STOPPED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stop_discovery_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!mgmt_pending_listed(hdev, data))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	return hci_stop_discovery_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -4049,7 +6212,7 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4073,11 +6236,14 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;cmd_complete = generic_cmd_complete;</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, stop_discovery_sync, cmd,</div><div class='add'>+				 stop_discovery_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_pending_remove(cmd);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hci_discovery_set_state(hdev, DISCOVERY_STOPPING);</div><div class='del'>-	queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;discov_update);</div><div class='del'>-	err = 0;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -4091,7 +6257,7 @@ static int confirm_name(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	struct inquiry_entry *e;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4133,7 +6299,7 @@ static int block_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!bdaddr_type_is_valid(cp-&gt;addr.type))</div><div class='ctx'> 		return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_BLOCK_DEVICE,</div><div class='hunk'>@@ -4142,7 +6308,7 @@ static int block_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	err = hci_bdaddr_list_add(&amp;hdev-&gt;blacklist, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+	err = hci_bdaddr_list_add(&amp;hdev-&gt;reject_list, &amp;cp-&gt;addr.bdaddr,</div><div class='ctx'> 				  cp-&gt;addr.type);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		status = MGMT_STATUS_FAILED;</div><div class='hunk'>@@ -4169,7 +6335,7 @@ static int unblock_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!bdaddr_type_is_valid(cp-&gt;addr.type))</div><div class='ctx'> 		return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_UNBLOCK_DEVICE,</div><div class='hunk'>@@ -4178,7 +6344,7 @@ static int unblock_device(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	err = hci_bdaddr_list_del(&amp;hdev-&gt;blacklist, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+	err = hci_bdaddr_list_del(&amp;hdev-&gt;reject_list, &amp;cp-&gt;addr.bdaddr,</div><div class='ctx'> 				  cp-&gt;addr.type);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		status = MGMT_STATUS_INVALID_PARAMS;</div><div class='hunk'>@@ -4198,15 +6364,19 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_device_id_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_update_eir_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			 u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_set_device_id *cp = data;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	__u16 source;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	source = __le16_to_cpu(cp-&gt;source);</div><div class='ctx'> </div><div class='hunk'>@@ -4224,38 +6394,36 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_SET_DEVICE_ID, 0,</div><div class='ctx'> 				NULL, 0);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	__hci_req_update_eir(&amp;req);</div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='add'>+	hci_cmd_sync_queue(hdev, set_device_id_sync, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enable_advertising_instance(struct hci_dev *hdev, u8 status,</div><div class='del'>-					u16 opcode)</div><div class='add'>+static void enable_advertising_instance(struct hci_dev *hdev, int err)</div><div class='ctx'> {</div><div class='del'>-	BT_DBG("status %d", status);</div><div class='add'>+	if (err)</div><div class='add'>+		bt_dev_err(hdev, "failed to re-configure advertising %d", err);</div><div class='add'>+	else</div><div class='add'>+		bt_dev_dbg(hdev, "status %d", err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_advertising_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				     u16 opcode)</div><div class='add'>+static void set_advertising_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> 	struct cmd_lookup match = { NULL, hdev };</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	u8 instance;</div><div class='ctx'> 	struct adv_info *adv_instance;</div><div class='del'>-	int err;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	if (err == -ECANCELED || !mgmt_pending_valid(hdev, data))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='del'>-</div><div class='del'>-		mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev,</div><div class='del'>-				     cmd_status_rsp, &amp;mgmt_err);</div><div class='del'>-		goto unlock;</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, status);</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_LE_ADV))</div><div class='hunk'>@@ -4263,8 +6431,7 @@ static void set_advertising_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	else</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_ADVERTISING);</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, settings_rsp,</div><div class='del'>-			     &amp;match);</div><div class='add'>+	settings_rsp(cmd, &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	new_settings(hdev, match.sk);</div><div class='ctx'> </div><div class='hunk'>@@ -4276,30 +6443,68 @@ static void set_advertising_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||</div><div class='ctx'> 	    list_empty(&amp;hdev-&gt;adv_instances))</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	instance = hdev-&gt;cur_adv_instance;</div><div class='ctx'> 	if (!instance) {</div><div class='ctx'> 		adv_instance = list_first_entry_or_null(&amp;hdev-&gt;adv_instances,</div><div class='ctx'> 							struct adv_info, list);</div><div class='ctx'> 		if (!adv_instance)</div><div class='del'>-			goto unlock;</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		instance = adv_instance-&gt;instance;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+	err = hci_schedule_adv_instance_sync(hdev, instance, true);</div><div class='ctx'> </div><div class='del'>-	err = __hci_req_schedule_adv_instance(&amp;req, instance, true);</div><div class='add'>+	enable_advertising_instance(hdev, err);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		err = hci_req_run(&amp;req, enable_advertising_instance);</div><div class='add'>+static int set_adv_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode cp;</div><div class='add'>+	u8 val;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		bt_dev_err(hdev, "failed to re-configure advertising");</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	if (!__mgmt_pending_listed(hdev, cmd)) {</div><div class='add'>+		mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cp, cmd-&gt;param, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	val = !!cp.val;</div><div class='add'>+</div><div class='add'>+	if (cp.val == 0x02)</div><div class='add'>+		hci_dev_set_flag(hdev, HCI_ADVERTISING_CONNECTABLE);</div><div class='add'>+	else</div><div class='add'>+		hci_dev_clear_flag(hdev, HCI_ADVERTISING_CONNECTABLE);</div><div class='add'>+</div><div class='add'>+	cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		/* Switch to instance "0" for the Set Advertising setting.</div><div class='add'>+		 * We cannot use update_[adv|scan_rsp]_data() here as the</div><div class='add'>+		 * HCI_ADVERTISING flag is not yet set.</div><div class='add'>+		 */</div><div class='add'>+		hdev-&gt;cur_adv_instance = 0x00;</div><div class='add'>+</div><div class='add'>+		if (ext_adv_capable(hdev)) {</div><div class='add'>+			hci_start_ext_adv_sync(hdev, 0x00);</div><div class='add'>+		} else {</div><div class='add'>+			hci_update_adv_data_sync(hdev, 0x00);</div><div class='add'>+			hci_update_scan_rsp_data_sync(hdev, 0x00);</div><div class='add'>+			hci_enable_advertising_sync(hdev);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		hci_disable_advertising_sync(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -4307,11 +6512,10 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	u8 val, status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	status = mgmt_le_support(hdev);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -4322,6 +6526,10 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_ADVERTISING,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;advertising_paused)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_ADVERTISING,</div><div class='add'>+				       MGMT_STATUS_BUSY);</div><div class='add'>+</div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	val = !!cp-&gt;val;</div><div class='hunk'>@@ -4334,6 +6542,7 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	if (!hdev_is_powered(hdev) ||</div><div class='ctx'> 	    (val == hci_dev_test_flag(hdev, HCI_ADVERTISING) &amp;&amp;</div><div class='ctx'> 	     (cp-&gt;val == 0x02) == hci_dev_test_flag(hdev, HCI_ADVERTISING_CONNECTABLE)) ||</div><div class='add'>+	    hci_dev_test_flag(hdev, HCI_MESH) ||</div><div class='ctx'> 	    hci_conn_num(hdev, LE_LINK) &gt; 0 ||</div><div class='ctx'> 	    (hci_dev_test_flag(hdev, HCI_LE_SCAN) &amp;&amp;</div><div class='ctx'> 	     hdev-&gt;le_scan_type == LE_SCAN_ACTIVE)) {</div><div class='hunk'>@@ -4369,40 +6578,13 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = mgmt_pending_add(sk, MGMT_OP_SET_ADVERTISING, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	if (cp-&gt;val == 0x02)</div><div class='del'>-		hci_dev_set_flag(hdev, HCI_ADVERTISING_CONNECTABLE);</div><div class='ctx'> 	else</div><div class='del'>-		hci_dev_clear_flag(hdev, HCI_ADVERTISING_CONNECTABLE);</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_adv_sync, cmd,</div><div class='add'>+					 set_advertising_complete);</div><div class='ctx'> </div><div class='del'>-	cancel_adv_timeout(hdev);</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		/* Switch to instance "0" for the Set Advertising setting.</div><div class='del'>-		 * We cannot use update_[adv|scan_rsp]_data() here as the</div><div class='del'>-		 * HCI_ADVERTISING flag is not yet set.</div><div class='del'>-		 */</div><div class='del'>-		hdev-&gt;cur_adv_instance = 0x00;</div><div class='del'>-</div><div class='del'>-		if (ext_adv_capable(hdev)) {</div><div class='del'>-			__hci_req_start_ext_adv(&amp;req, 0x00);</div><div class='del'>-		} else {</div><div class='del'>-			__hci_req_update_adv_data(&amp;req, 0x00);</div><div class='del'>-			__hci_req_update_scan_rsp_data(&amp;req, 0x00);</div><div class='del'>-			__hci_req_enable_advertising(&amp;req);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		__hci_req_disable_advertising(&amp;req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, set_advertising_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err &lt; 0 &amp;&amp; cmd)</div><div class='ctx'> 		mgmt_pending_remove(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -4416,7 +6598,7 @@ static int set_static_address(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_cp_set_static_address *cp = data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_STATIC_ADDRESS,</div><div class='hunk'>@@ -4461,12 +6643,13 @@ static int set_scan_params(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	__u16 interval, window;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_SCAN_PARAMS,</div><div class='ctx'> 				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='ctx'> </div><div class='add'>+	/* Keep allowed ranges in sync with set_mesh() */</div><div class='ctx'> 	interval = __le16_to_cpu(cp-&gt;interval);</div><div class='ctx'> </div><div class='ctx'> 	if (interval &lt; 0x0004 || interval &gt; 0x4000)</div><div class='hunk'>@@ -4495,38 +6678,23 @@ static int set_scan_params(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	 * loaded.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_LE_SCAN) &amp;&amp;</div><div class='del'>-	    hdev-&gt;discovery.state == DISCOVERY_STOPPED) {</div><div class='del'>-		struct hci_request req;</div><div class='del'>-</div><div class='del'>-		hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-		hci_req_add_le_scan_disable(&amp;req);</div><div class='del'>-		hci_req_add_le_passive_scan(&amp;req);</div><div class='del'>-</div><div class='del'>-		hci_req_run(&amp;req, NULL);</div><div class='del'>-	}</div><div class='add'>+	    hdev-&gt;discovery.state == DISCOVERY_STOPPED)</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fast_connectable_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				      u16 opcode)</div><div class='add'>+static void fast_connectable_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-</div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_FAST_CONNECTABLE, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		mgmt_cmd_status(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='del'>-			        mgmt_status(status));</div><div class='add'>+				mgmt_status(err));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct mgmt_mode *cp = cmd-&gt;param;</div><div class='ctx'> </div><div class='hunk'>@@ -4539,10 +6707,15 @@ static void fast_connectable_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		new_settings(hdev, cmd-&gt;sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+static int write_fast_connectable_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode *cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	return hci_write_fast_connectable_sync(hdev, cp-&gt;val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,</div><div class='hunk'>@@ -4550,58 +6723,49 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED) ||</div><div class='ctx'> 	    hdev-&gt;hci_ver &lt; BLUETOOTH_VER_1_2)</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='ctx'> 				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01)</div><div class='del'>-		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_SET_FAST_CONNECTABLE, hdev)) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='del'>-				      MGMT_STATUS_BUSY);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!!cp-&gt;val == hci_dev_test_flag(hdev, HCI_FAST_CONNECTABLE)) {</div><div class='del'>-		err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='del'>-					hdev);</div><div class='add'>+		err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE, hdev);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!hdev_is_powered(hdev)) {</div><div class='ctx'> 		hci_dev_change_flag(hdev, HCI_FAST_CONNECTABLE);</div><div class='del'>-		err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='del'>-					hdev);</div><div class='add'>+		err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE, hdev);</div><div class='ctx'> 		new_settings(hdev, sk);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_SET_FAST_CONNECTABLE, hdev,</div><div class='del'>-			       data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_SET_FAST_CONNECTABLE, hdev, data,</div><div class='add'>+			       len);</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_write_fast_connectable(&amp;req, cp-&gt;val);</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, write_fast_connectable_sync, cmd,</div><div class='add'>+					 fast_connectable_complete);</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run(&amp;req, fast_connectable_complete);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='del'>-				      MGMT_STATUS_FAILED);</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+		mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_FAST_CONNECTABLE,</div><div class='add'>+				MGMT_STATUS_FAILED);</div><div class='add'>+</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -4610,46 +6774,54 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_bredr_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static void set_bredr_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-</div><div class='del'>-	BT_DBG("status 0x%02x", status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_BREDR, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='add'>+	if (err) {</div><div class='add'>+		u8 mgmt_err = mgmt_status(err);</div><div class='ctx'> </div><div class='ctx'> 		/* We need to restore the flag if related HCI commands</div><div class='ctx'> 		 * failed.</div><div class='ctx'> 		 */</div><div class='ctx'> 		hci_dev_clear_flag(hdev, HCI_BREDR_ENABLED);</div><div class='ctx'> </div><div class='del'>-		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, mgmt_err);</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_err);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		send_settings_rsp(cmd-&gt;sk, MGMT_OP_SET_BREDR, hdev);</div><div class='ctx'> 		new_settings(hdev, cmd-&gt;sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+static int set_bredr_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = hci_write_fast_connectable_sync(hdev, false);</div><div class='add'>+</div><div class='add'>+	if (!status)</div><div class='add'>+		status = hci_update_scan_sync(hdev);</div><div class='add'>+</div><div class='add'>+	/* Since only the advertising data flags will change, there</div><div class='add'>+	 * is no need to update the scan response data.</div><div class='add'>+	 */</div><div class='add'>+	if (!status)</div><div class='add'>+		status = hci_update_adv_data_sync(hdev, hdev-&gt;cur_adv_instance);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_bredr_capable(hdev) || !lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BREDR,</div><div class='hunk'>@@ -4676,7 +6848,6 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 			hci_dev_clear_flag(hdev, HCI_SSP_ENABLED);</div><div class='ctx'> 			hci_dev_clear_flag(hdev, HCI_LINK_SECURITY);</div><div class='ctx'> 			hci_dev_clear_flag(hdev, HCI_FAST_CONNECTABLE);</div><div class='del'>-			hci_dev_clear_flag(hdev, HCI_HS_ENABLED);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hci_dev_change_flag(hdev, HCI_BREDR_ENABLED);</div><div class='hunk'>@@ -4718,15 +6889,19 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_SET_BREDR, hdev)) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BREDR,</div><div class='del'>-				      MGMT_STATUS_BUSY);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_SET_BREDR, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_SET_BREDR, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_bredr_sync, cmd,</div><div class='add'>+					 set_bredr_complete);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_BREDR,</div><div class='add'>+				MGMT_STATUS_FAILED);</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4735,42 +6910,23 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)</div><div class='ctx'> 	 */</div><div class='ctx'> 	hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	__hci_req_write_fast_connectable(&amp;req, false);</div><div class='del'>-	__hci_req_update_scan(&amp;req);</div><div class='del'>-</div><div class='del'>-	/* Since only the advertising data flags will change, there</div><div class='del'>-	 * is no need to update the scan response data.</div><div class='del'>-	 */</div><div class='del'>-	__hci_req_update_adv_data(&amp;req, hdev-&gt;cur_adv_instance);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run(&amp;req, set_bredr_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='del'>-</div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sc_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static void set_secure_conn_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> 	struct mgmt_mode *cp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status %u", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_SET_SECURE_CONN, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (err) {</div><div class='add'>+		u8 mgmt_err = mgmt_status(err);</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode,</div><div class='del'>-			        mgmt_status(status));</div><div class='del'>-		goto remove;</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, mgmt_err);</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cp = cmd-&gt;param;</div><div class='hunk'>@@ -4790,13 +6946,23 @@ static void sc_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	send_settings_rsp(cmd-&gt;sk, MGMT_OP_SET_SECURE_CONN, hdev);</div><div class='add'>+	send_settings_rsp(cmd-&gt;sk, cmd-&gt;opcode, hdev);</div><div class='ctx'> 	new_settings(hdev, cmd-&gt;sk);</div><div class='ctx'> </div><div class='del'>-remove:</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+done:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_secure_conn_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_mode *cp = cmd-&gt;param;</div><div class='add'>+	u8 val = !!cp-&gt;val;</div><div class='add'>+</div><div class='add'>+	/* Force write of val */</div><div class='add'>+	hci_dev_set_flag(hdev, HCI_SC_ENABLED);</div><div class='add'>+</div><div class='add'>+	return hci_write_sc_support_sync(hdev, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,</div><div class='hunk'>@@ -4804,11 +6970,10 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_mode *cp = data;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_sc_capable(hdev) &amp;&amp;</div><div class='ctx'> 	    !hci_dev_test_flag(hdev, HCI_LE_ENABLED))</div><div class='hunk'>@@ -4823,7 +6988,7 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01 &amp;&amp; cp-&gt;val != 0x02)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_SECURE_CONN,</div><div class='del'>-				  MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4854,12 +7019,6 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_SET_SECURE_CONN, hdev)) {</div><div class='del'>-		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_SECURE_CONN,</div><div class='del'>-				      MGMT_STATUS_BUSY);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	val = !!cp-&gt;val;</div><div class='ctx'> </div><div class='ctx'> 	if (val == hci_dev_test_flag(hdev, HCI_SC_ENABLED) &amp;&amp;</div><div class='hunk'>@@ -4868,18 +7027,18 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_SET_SECURE_CONN, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_SET_SECURE_CONN, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, set_secure_conn_sync, cmd,</div><div class='add'>+					 set_secure_conn_complete);</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_WRITE_SC_SUPPORT, 1, &amp;val);</div><div class='del'>-	err = hci_req_run(&amp;req, sc_enable_complete);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='del'>-		goto failed;</div><div class='add'>+		mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_SECURE_CONN,</div><div class='add'>+				MGMT_STATUS_FAILED);</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='hunk'>@@ -4894,7 +7053,7 @@ static int set_debug_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	bool changed, use_changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (cp-&gt;val != 0x00 &amp;&amp; cp-&gt;val != 0x01 &amp;&amp; cp-&gt;val != 0x02)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_DEBUG_KEYS,</div><div class='hunk'>@@ -4941,7 +7100,7 @@ static int set_privacy(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> 	bool changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_PRIVACY,</div><div class='hunk'>@@ -5016,7 +7175,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> 	u16 irk_count, expected_len;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_LOAD_IRKS,</div><div class='hunk'>@@ -5030,7 +7189,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	expected_len = sizeof(*cp) + irk_count * sizeof(struct mgmt_irk_info);</div><div class='add'>+	expected_len = struct_size(cp, irks, irk_count);</div><div class='ctx'> 	if (expected_len != len) {</div><div class='ctx'> 		bt_dev_err(hdev, "load_irks: expected %u bytes, got %u bytes",</div><div class='ctx'> 			   expected_len, len);</div><div class='hunk'>@@ -5038,7 +7197,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s irk_count %u", hdev-&gt;name, irk_count);</div><div class='add'>+	bt_dev_dbg(hdev, "irk_count %u", irk_count);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; irk_count; i++) {</div><div class='ctx'> 		struct mgmt_irk_info *key = &amp;cp-&gt;irks[i];</div><div class='hunk'>@@ -5056,6 +7215,14 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> 	for (i = 0; i &lt; irk_count; i++) {</div><div class='ctx'> 		struct mgmt_irk_info *irk = &amp;cp-&gt;irks[i];</div><div class='ctx'> </div><div class='add'>+		if (hci_is_blocked_key(hdev,</div><div class='add'>+				       HCI_BLOCKED_KEY_TYPE_IRK,</div><div class='add'>+				       irk-&gt;val)) {</div><div class='add'>+			bt_dev_warn(hdev, "Skipping blocked IRK for %pMR",</div><div class='add'>+				    &amp;irk-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hci_add_irk(hdev, &amp;irk-&gt;addr.bdaddr,</div><div class='ctx'> 			    le_addr_type(irk-&gt;addr.type), irk-&gt;val,</div><div class='ctx'> 			    BDADDR_ANY);</div><div class='hunk'>@@ -5072,7 +7239,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,</div><div class='ctx'> </div><div class='ctx'> static bool ltk_is_valid(struct mgmt_ltk_info *key)</div><div class='ctx'> {</div><div class='del'>-	if (key-&gt;master != 0x00 &amp;&amp; key-&gt;master != 0x01)</div><div class='add'>+	if (key-&gt;initiator != 0x00 &amp;&amp; key-&gt;initiator != 0x01)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (key-&gt;addr.type) {</div><div class='hunk'>@@ -5098,7 +7265,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u16 key_count, expected_len;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("request for %s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_LOAD_LONG_TERM_KEYS,</div><div class='hunk'>@@ -5112,8 +7279,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	expected_len = sizeof(*cp) + key_count *</div><div class='del'>-					sizeof(struct mgmt_ltk_info);</div><div class='add'>+	expected_len = struct_size(cp, keys, key_count);</div><div class='ctx'> 	if (expected_len != len) {</div><div class='ctx'> 		bt_dev_err(hdev, "load_keys: expected %u bytes, got %u bytes",</div><div class='ctx'> 			   expected_len, len);</div><div class='hunk'>@@ -5121,16 +7287,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s key_count %u", hdev-&gt;name, key_count);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; key_count; i++) {</div><div class='del'>-		struct mgmt_ltk_info *key = &amp;cp-&gt;keys[i];</div><div class='del'>-</div><div class='del'>-		if (!ltk_is_valid(key))</div><div class='del'>-			return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='del'>-					       MGMT_OP_LOAD_LONG_TERM_KEYS,</div><div class='del'>-					       MGMT_STATUS_INVALID_PARAMS);</div><div class='del'>-	}</div><div class='add'>+	bt_dev_dbg(hdev, "key_count %u", key_count);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -5140,14 +7297,28 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		struct mgmt_ltk_info *key = &amp;cp-&gt;keys[i];</div><div class='ctx'> 		u8 type, authenticated;</div><div class='ctx'> </div><div class='add'>+		if (hci_is_blocked_key(hdev,</div><div class='add'>+				       HCI_BLOCKED_KEY_TYPE_LTK,</div><div class='add'>+				       key-&gt;val)) {</div><div class='add'>+			bt_dev_warn(hdev, "Skipping blocked LTK for %pMR",</div><div class='add'>+				    &amp;key-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ltk_is_valid(key)) {</div><div class='add'>+			bt_dev_warn(hdev, "Invalid LTK for %pMR",</div><div class='add'>+				    &amp;key-&gt;addr.bdaddr);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (key-&gt;type) {</div><div class='ctx'> 		case MGMT_LTK_UNAUTHENTICATED:</div><div class='ctx'> 			authenticated = 0x00;</div><div class='del'>-			type = key-&gt;master ? SMP_LTK : SMP_LTK_SLAVE;</div><div class='add'>+			type = key-&gt;initiator ? SMP_LTK : SMP_LTK_RESPONDER;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MGMT_LTK_AUTHENTICATED:</div><div class='ctx'> 			authenticated = 0x01;</div><div class='del'>-			type = key-&gt;master ? SMP_LTK : SMP_LTK_SLAVE;</div><div class='add'>+			type = key-&gt;initiator ? SMP_LTK : SMP_LTK_RESPONDER;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MGMT_LTK_P256_UNAUTH:</div><div class='ctx'> 			authenticated = 0x00;</div><div class='hunk'>@@ -5160,7 +7331,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		case MGMT_LTK_P256_DEBUG:</div><div class='ctx'> 			authenticated = 0x00;</div><div class='ctx'> 			type = SMP_LTK_P256_DEBUG;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		default:</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5178,14 +7349,19 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int conn_info_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='add'>+static void get_conn_info_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='ctx'> 	struct hci_conn *conn = cmd-&gt;user_data;</div><div class='add'>+	struct mgmt_cp_get_conn_info *cp = cmd-&gt;param;</div><div class='ctx'> 	struct mgmt_rp_get_conn_info rp;</div><div class='del'>-	int err;</div><div class='add'>+	u8 status;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;rp.addr, cmd-&gt;param, sizeof(rp.addr));</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='add'>+	memcpy(&amp;rp.addr, &amp;cp-&gt;addr, sizeof(rp.addr));</div><div class='add'>+</div><div class='add'>+	status = mgmt_status(err);</div><div class='ctx'> 	if (status == MGMT_STATUS_SUCCESS) {</div><div class='ctx'> 		rp.rssi = conn-&gt;rssi;</div><div class='ctx'> 		rp.tx_power = conn-&gt;tx_power;</div><div class='hunk'>@@ -5196,67 +7372,48 @@ static int conn_info_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='ctx'> 		rp.max_tx_power = HCI_TX_POWER_INVALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, MGMT_OP_GET_CONN_INFO,</div><div class='del'>-				status, &amp;rp, sizeof(rp));</div><div class='del'>-</div><div class='del'>-	hci_conn_drop(conn);</div><div class='del'>-	hci_conn_put(conn);</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, MGMT_OP_GET_CONN_INFO, status,</div><div class='add'>+			  &amp;rp, sizeof(rp));</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void conn_info_refresh_complete(struct hci_dev *hdev, u8 hci_status,</div><div class='del'>-				       u16 opcode)</div><div class='add'>+static int get_conn_info_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct hci_cp_read_rssi *cp;</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_get_conn_info *cp = cmd-&gt;param;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='del'>-	u16 handle;</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	BT_DBG("status 0x%02x", hci_status);</div><div class='add'>+	int err;</div><div class='add'>+	__le16   handle;</div><div class='ctx'> </div><div class='del'>-	hci_dev_lock(hdev);</div><div class='add'>+	/* Make sure we are still connected */</div><div class='add'>+	if (cp-&gt;addr.type == BDADDR_BREDR)</div><div class='add'>+		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,</div><div class='add'>+					       &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	else</div><div class='add'>+		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &amp;cp-&gt;addr.bdaddr);</div><div class='ctx'> </div><div class='del'>-	/* Commands sent in request are either Read RSSI or Read Transmit Power</div><div class='del'>-	 * Level so we check which one was last sent to retrieve connection</div><div class='del'>-	 * handle.  Both commands have handle as first parameter so it's safe to</div><div class='del'>-	 * cast data on the same command struct.</div><div class='del'>-	 *</div><div class='del'>-	 * First command sent is always Read RSSI and we fail only if it fails.</div><div class='del'>-	 * In other case we simply override error to indicate success as we</div><div class='del'>-	 * already remembered if TX power value is actually valid.</div><div class='del'>-	 */</div><div class='del'>-	cp = hci_sent_cmd_data(hdev, HCI_OP_READ_RSSI);</div><div class='del'>-	if (!cp) {</div><div class='del'>-		cp = hci_sent_cmd_data(hdev, HCI_OP_READ_TX_POWER);</div><div class='del'>-		status = MGMT_STATUS_SUCCESS;</div><div class='del'>-	} else {</div><div class='del'>-		status = mgmt_status(hci_status);</div><div class='del'>-	}</div><div class='add'>+	if (!conn || conn-&gt;state != BT_CONNECTED)</div><div class='add'>+		return MGMT_STATUS_NOT_CONNECTED;</div><div class='ctx'> </div><div class='del'>-	if (!cp) {</div><div class='del'>-		bt_dev_err(hdev, "invalid sent_cmd in conn_info response");</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	cmd-&gt;user_data = conn;</div><div class='add'>+	handle = cpu_to_le16(conn-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	handle = __le16_to_cpu(cp-&gt;handle);</div><div class='del'>-	conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	if (!conn) {</div><div class='del'>-		bt_dev_err(hdev, "unknown handle (%d) in conn_info response",</div><div class='del'>-			   handle);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	/* Refresh RSSI each time */</div><div class='add'>+	err = hci_read_rssi_sync(hdev, handle);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find_data(MGMT_OP_GET_CONN_INFO, hdev, conn);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	/* For LE links TX power does not change thus we don't need to</div><div class='add'>+	 * query for it once value is known.</div><div class='add'>+	 */</div><div class='add'>+	if (!err &amp;&amp; (!bdaddr_type_is_le(cp-&gt;addr.type) ||</div><div class='add'>+		     conn-&gt;tx_power == HCI_TX_POWER_INVALID))</div><div class='add'>+		err = hci_read_tx_power_sync(hdev, handle, 0x00);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;cmd_complete(cmd, status);</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	/* Max TX power needs to be read only once per connection */</div><div class='add'>+	if (!err &amp;&amp; conn-&gt;max_tx_power == HCI_TX_POWER_INVALID)</div><div class='add'>+		err = hci_read_tx_power_sync(hdev, handle, 0x01);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='hunk'>@@ -5268,7 +7425,7 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	unsigned long conn_info_age;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> 	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='hunk'>@@ -5301,18 +7458,11 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find_data(MGMT_OP_GET_CONN_INFO, hdev, conn)) {</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_CONN_INFO,</div><div class='del'>-					MGMT_STATUS_BUSY, &amp;rp, sizeof(rp));</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* To avoid client trying to guess when to poll again for information we</div><div class='ctx'> 	 * calculate conn info age as random value between min/max set in hdev.</div><div class='ctx'> 	 */</div><div class='del'>-	conn_info_age = hdev-&gt;conn_info_min_age +</div><div class='del'>-			prandom_u32_max(hdev-&gt;conn_info_max_age -</div><div class='del'>-					hdev-&gt;conn_info_min_age);</div><div class='add'>+	conn_info_age = get_random_u32_inclusive(hdev-&gt;conn_info_min_age,</div><div class='add'>+						 hdev-&gt;conn_info_max_age - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Query controller to refresh cached values if they are too old or were</div><div class='ctx'> 	 * never read.</div><div class='hunk'>@@ -5320,50 +7470,27 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 	if (time_after(jiffies, conn-&gt;conn_info_timestamp +</div><div class='ctx'> 		       msecs_to_jiffies(conn_info_age)) ||</div><div class='ctx'> 	    !conn-&gt;conn_info_timestamp) {</div><div class='del'>-		struct hci_request req;</div><div class='del'>-		struct hci_cp_read_tx_power req_txp_cp;</div><div class='del'>-		struct hci_cp_read_rssi req_rssi_cp;</div><div class='ctx'> 		struct mgmt_pending_cmd *cmd;</div><div class='ctx'> </div><div class='del'>-		hci_req_init(&amp;req, hdev);</div><div class='del'>-		req_rssi_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_RSSI, sizeof(req_rssi_cp),</div><div class='del'>-			    &amp;req_rssi_cp);</div><div class='del'>-</div><div class='del'>-		/* For LE links TX power does not change thus we don't need to</div><div class='del'>-		 * query for it once value is known.</div><div class='del'>-		 */</div><div class='del'>-		if (!bdaddr_type_is_le(cp-&gt;addr.type) ||</div><div class='del'>-		    conn-&gt;tx_power == HCI_TX_POWER_INVALID) {</div><div class='del'>-			req_txp_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-			req_txp_cp.type = 0x00;</div><div class='del'>-			hci_req_add(&amp;req, HCI_OP_READ_TX_POWER,</div><div class='del'>-				    sizeof(req_txp_cp), &amp;req_txp_cp);</div><div class='add'>+		cmd = mgmt_pending_new(sk, MGMT_OP_GET_CONN_INFO, hdev, data,</div><div class='add'>+				       len);</div><div class='add'>+		if (!cmd) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+		} else {</div><div class='add'>+			err = hci_cmd_sync_queue(hdev, get_conn_info_sync,</div><div class='add'>+						 cmd, get_conn_info_complete);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Max TX power needs to be read only once per connection */</div><div class='del'>-		if (conn-&gt;max_tx_power == HCI_TX_POWER_INVALID) {</div><div class='del'>-			req_txp_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-			req_txp_cp.type = 0x01;</div><div class='del'>-			hci_req_add(&amp;req, HCI_OP_READ_TX_POWER,</div><div class='del'>-				    sizeof(req_txp_cp), &amp;req_txp_cp);</div><div class='del'>-		}</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_CONN_INFO,</div><div class='add'>+					  MGMT_STATUS_FAILED, &amp;rp, sizeof(rp));</div><div class='ctx'> </div><div class='del'>-		err = hci_req_run(&amp;req, conn_info_refresh_complete);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto unlock;</div><div class='add'>+			if (cmd)</div><div class='add'>+				mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='del'>-		cmd = mgmt_pending_add(sk, MGMT_OP_GET_CONN_INFO, hdev,</div><div class='del'>-				       data, len);</div><div class='del'>-		if (!cmd) {</div><div class='del'>-			err = -ENOMEM;</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hci_conn_hold(conn);</div><div class='del'>-		cmd-&gt;user_data = hci_conn_get(conn);</div><div class='del'>-		cmd-&gt;cmd_complete = conn_info_cmd_complete;</div><div class='del'>-</div><div class='ctx'> 		conn-&gt;conn_info_timestamp = jiffies;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Cache is valid, just reply with values cached in hci_conn */</div><div class='hunk'>@@ -5380,24 +7507,24 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int clock_info_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='add'>+static void get_clock_info_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn *conn = cmd-&gt;user_data;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_get_clock_info *cp = cmd-&gt;param;</div><div class='ctx'> 	struct mgmt_rp_get_clock_info rp;</div><div class='del'>-	struct hci_dev *hdev;</div><div class='del'>-	int err;</div><div class='add'>+	struct hci_conn *conn = cmd-&gt;user_data;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='del'>-	memcpy(&amp;rp.addr, cmd-&gt;param, sizeof(rp.addr));</div><div class='add'>+	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	rp.addr.type = cp-&gt;addr.type;</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto complete;</div><div class='ctx'> </div><div class='del'>-	hdev = hci_dev_get(cmd-&gt;index);</div><div class='del'>-	if (hdev) {</div><div class='del'>-		rp.local_clock = cpu_to_le32(hdev-&gt;clock);</div><div class='del'>-		hci_dev_put(hdev);</div><div class='del'>-	}</div><div class='add'>+	rp.local_clock = cpu_to_le32(hdev-&gt;clock);</div><div class='ctx'> </div><div class='ctx'> 	if (conn) {</div><div class='ctx'> 		rp.piconet_clock = cpu_to_le32(conn-&gt;clock);</div><div class='hunk'>@@ -5405,61 +7532,44 @@ static int clock_info_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> complete:</div><div class='del'>-	err = mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, status, &amp;rp,</div><div class='del'>-				sizeof(rp));</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode, status, &amp;rp,</div><div class='add'>+			  sizeof(rp));</div><div class='ctx'> </div><div class='del'>-	if (conn) {</div><div class='del'>-		hci_conn_drop(conn);</div><div class='del'>-		hci_conn_put(conn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_clock_info_complete(struct hci_dev *hdev, u8 status, u16 opcode)</div><div class='add'>+static int get_clock_info_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct hci_cp_read_clock *hci_cp;</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_get_clock_info *cp = cmd-&gt;param;</div><div class='add'>+	struct hci_cp_read_clock hci_cp;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status %u", hdev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	hci_dev_lock(hdev);</div><div class='del'>-</div><div class='del'>-	hci_cp = hci_sent_cmd_data(hdev, HCI_OP_READ_CLOCK);</div><div class='del'>-	if (!hci_cp)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	if (hci_cp-&gt;which) {</div><div class='del'>-		u16 handle = __le16_to_cpu(hci_cp-&gt;handle);</div><div class='del'>-		conn = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='del'>-	} else {</div><div class='del'>-		conn = NULL;</div><div class='del'>-	}</div><div class='add'>+	memset(&amp;hci_cp, 0, sizeof(hci_cp));</div><div class='add'>+	hci_read_clock_sync(hdev, &amp;hci_cp);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find_data(MGMT_OP_GET_CLOCK_INFO, hdev, conn);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	/* Make sure connection still exists */</div><div class='add'>+	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &amp;cp-&gt;addr.bdaddr);</div><div class='add'>+	if (!conn || conn-&gt;state != BT_CONNECTED)</div><div class='add'>+		return MGMT_STATUS_NOT_CONNECTED;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;cmd_complete(cmd, mgmt_status(status));</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	cmd-&gt;user_data = conn;</div><div class='add'>+	hci_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='add'>+	hci_cp.which = 0x01; /* Piconet clock */</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	return hci_read_clock_sync(hdev, &amp;hci_cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_clock_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='del'>-			 u16 len)</div><div class='add'>+								u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_get_clock_info *cp = data;</div><div class='ctx'> 	struct mgmt_rp_get_clock_info rp;</div><div class='del'>-	struct hci_cp_read_clock hci_cp;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	struct hci_conn *conn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> 	bacpy(&amp;rp.addr.bdaddr, &amp;cp-&gt;addr.bdaddr);</div><div class='hunk'>@@ -5493,119 +7603,79 @@ static int get_clock_info(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		conn = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_GET_CLOCK_INFO, hdev, data, len);</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_GET_CLOCK_INFO, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;cmd_complete = clock_info_cmd_complete;</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	memset(&amp;hci_cp, 0, sizeof(hci_cp));</div><div class='del'>-	hci_req_add(&amp;req, HCI_OP_READ_CLOCK, sizeof(hci_cp), &amp;hci_cp);</div><div class='add'>+	else</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, get_clock_info_sync, cmd,</div><div class='add'>+					 get_clock_info_complete);</div><div class='ctx'> </div><div class='del'>-	if (conn) {</div><div class='del'>-		hci_conn_hold(conn);</div><div class='del'>-		cmd-&gt;user_data = hci_conn_get(conn);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_CLOCK_INFO,</div><div class='add'>+					MGMT_STATUS_FAILED, &amp;rp, sizeof(rp));</div><div class='ctx'> </div><div class='del'>-		hci_cp.handle = cpu_to_le16(conn-&gt;handle);</div><div class='del'>-		hci_cp.which = 0x01; /* Piconet clock */</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_CLOCK, sizeof(hci_cp), &amp;hci_cp);</div><div class='add'>+		if (cmd)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run(&amp;req, get_clock_info_complete);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_connected(struct hci_dev *hdev, bdaddr_t *addr, u8 type)</div><div class='add'>+static void device_added(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			 bdaddr_t *bdaddr, u8 type, u8 action)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn *conn;</div><div class='del'>-</div><div class='del'>-	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, addr);</div><div class='del'>-	if (!conn)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;dst_type != type)</div><div class='del'>-		return false;</div><div class='add'>+	struct mgmt_ev_device_added ev;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;state != BT_CONNECTED)</div><div class='del'>-		return false;</div><div class='add'>+	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='add'>+	ev.addr.type = type;</div><div class='add'>+	ev.action = action;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	mgmt_event(MGMT_EV_DEVICE_ADDED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-static int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr,</div><div class='del'>-			       u8 addr_type, u8 auto_connect)</div><div class='add'>+static void add_device_complete(struct hci_dev *hdev, void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct hci_conn_params *params;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_device *cp = cmd-&gt;param;</div><div class='ctx'> </div><div class='del'>-	params = hci_conn_params_add(hdev, addr, addr_type);</div><div class='del'>-	if (!params)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (params-&gt;auto_connect == auto_connect)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!err) {</div><div class='add'>+		struct hci_conn_params *params;</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;params-&gt;action);</div><div class='add'>+		params = hci_conn_params_lookup(hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+						le_addr_type(cp-&gt;addr.type));</div><div class='ctx'> </div><div class='del'>-	switch (auto_connect) {</div><div class='del'>-	case HCI_AUTO_CONN_DISABLED:</div><div class='del'>-	case HCI_AUTO_CONN_LINK_LOSS:</div><div class='del'>-		/* If auto connect is being disabled when we're trying to</div><div class='del'>-		 * connect to device, keep connecting.</div><div class='del'>-		 */</div><div class='del'>-		if (params-&gt;explicit_connect)</div><div class='del'>-			list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AUTO_CONN_REPORT:</div><div class='del'>-		if (params-&gt;explicit_connect)</div><div class='del'>-			list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='del'>-		else</div><div class='del'>-			list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_reports);</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AUTO_CONN_DIRECT:</div><div class='del'>-	case HCI_AUTO_CONN_ALWAYS:</div><div class='del'>-		if (!is_connected(hdev, addr, addr_type))</div><div class='del'>-			list_add(&amp;params-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='del'>-		break;</div><div class='add'>+		device_added(cmd-&gt;sk, hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type,</div><div class='add'>+			     cp-&gt;action);</div><div class='add'>+		device_flags_changed(NULL, hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+				     cp-&gt;addr.type, hdev-&gt;conn_flags,</div><div class='add'>+				     params ? params-&gt;flags : 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	params-&gt;auto_connect = auto_connect;</div><div class='del'>-</div><div class='del'>-	BT_DBG("addr %pMR (type %u) auto_connect %u", addr, addr_type,</div><div class='del'>-	       auto_connect);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	mgmt_cmd_complete(cmd-&gt;sk, hdev-&gt;id, MGMT_OP_ADD_DEVICE,</div><div class='add'>+			  mgmt_status(err), &amp;cp-&gt;addr, sizeof(cp-&gt;addr));</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void device_added(struct sock *sk, struct hci_dev *hdev,</div><div class='del'>-			 bdaddr_t *bdaddr, u8 type, u8 action)</div><div class='add'>+static int add_device_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_ev_device_added ev;</div><div class='del'>-</div><div class='del'>-	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='del'>-	ev.addr.type = type;</div><div class='del'>-	ev.action = action;</div><div class='del'>-</div><div class='del'>-	mgmt_event(MGMT_EV_DEVICE_ADDED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='add'>+	return hci_update_passive_scan_sync(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		      void *data, u16 len)</div><div class='ctx'> {</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	struct mgmt_cp_add_device *cp = data;</div><div class='ctx'> 	u8 auto_conn, addr_type;</div><div class='add'>+	struct hci_conn_params *params;</div><div class='ctx'> 	int err;</div><div class='add'>+	u32 current_flags = 0;</div><div class='add'>+	u32 supported_flags;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!bdaddr_type_is_valid(cp-&gt;addr.type) ||</div><div class='ctx'> 	    !bacmp(&amp;cp-&gt;addr.bdaddr, BDADDR_ANY))</div><div class='hunk'>@@ -5630,12 +7700,13 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = hci_bdaddr_list_add(&amp;hdev-&gt;whitelist, &amp;cp-&gt;addr.bdaddr,</div><div class='del'>-					  cp-&gt;addr.type);</div><div class='add'>+		err = hci_bdaddr_list_add_with_flags(&amp;hdev-&gt;accept_list,</div><div class='add'>+						     &amp;cp-&gt;addr.bdaddr,</div><div class='add'>+						     cp-&gt;addr.type, 0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> </div><div class='del'>-		hci_req_update_scan(hdev);</div><div class='add'>+		hci_update_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 		goto added;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5664,18 +7735,37 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	/* If the connection parameters don't exist for this device,</div><div class='ctx'> 	 * they will be created and configured with defaults.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hci_conn_params_set(hdev, &amp;cp-&gt;addr.bdaddr, addr_type,</div><div class='del'>-				auto_conn) &lt; 0) {</div><div class='add'>+	params = hci_conn_params_set(hdev, &amp;cp-&gt;addr.bdaddr, addr_type,</div><div class='add'>+				     auto_conn);</div><div class='add'>+	if (!params) {</div><div class='ctx'> 		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_ADD_DEVICE,</div><div class='ctx'> 					MGMT_STATUS_FAILED, &amp;cp-&gt;addr,</div><div class='ctx'> 					sizeof(cp-&gt;addr));</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_update_background_scan(hdev);</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_ADD_DEVICE, hdev, data, len);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, add_device_sync, cmd,</div><div class='add'>+				 add_device_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_ADD_DEVICE,</div><div class='add'>+					MGMT_STATUS_FAILED, &amp;cp-&gt;addr,</div><div class='add'>+					sizeof(cp-&gt;addr));</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto unlock;</div><div class='ctx'> </div><div class='ctx'> added:</div><div class='ctx'> 	device_added(sk, hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type, cp-&gt;action);</div><div class='add'>+	supported_flags = hdev-&gt;conn_flags;</div><div class='add'>+	device_flags_changed(NULL, hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type,</div><div class='add'>+			     supported_flags, current_flags);</div><div class='ctx'> </div><div class='ctx'> 	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_ADD_DEVICE,</div><div class='ctx'> 				MGMT_STATUS_SUCCESS, &amp;cp-&gt;addr,</div><div class='hunk'>@@ -5697,13 +7787,18 @@ static void device_removed(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	mgmt_event(MGMT_EV_DEVICE_REMOVED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int remove_device_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	return hci_update_passive_scan_sync(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			 void *data, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_remove_device *cp = data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -5720,7 +7815,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cp-&gt;addr.type == BDADDR_BREDR) {</div><div class='del'>-			err = hci_bdaddr_list_del(&amp;hdev-&gt;whitelist,</div><div class='add'>+			err = hci_bdaddr_list_del(&amp;hdev-&gt;accept_list,</div><div class='ctx'> 						  &amp;cp-&gt;addr.bdaddr,</div><div class='ctx'> 						  cp-&gt;addr.type);</div><div class='ctx'> 			if (err) {</div><div class='hunk'>@@ -5732,7 +7827,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			hci_req_update_scan(hdev);</div><div class='add'>+			hci_update_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 			device_removed(sk, hdev, &amp;cp-&gt;addr.bdaddr,</div><div class='ctx'> 				       cp-&gt;addr.type);</div><div class='hunk'>@@ -5773,10 +7868,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;params-&gt;action);</div><div class='del'>-		list_del(&amp;params-&gt;list);</div><div class='del'>-		kfree(params);</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+		hci_conn_params_free(params);</div><div class='ctx'> </div><div class='ctx'> 		device_removed(sk, hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -5791,13 +7883,13 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(b, btmp, &amp;hdev-&gt;whitelist, list) {</div><div class='add'>+		list_for_each_entry_safe(b, btmp, &amp;hdev-&gt;accept_list, list) {</div><div class='ctx'> 			device_removed(sk, hdev, &amp;b-&gt;bdaddr, b-&gt;bdaddr_type);</div><div class='ctx'> 			list_del(&amp;b-&gt;list);</div><div class='ctx'> 			kfree(b);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hci_req_update_scan(hdev);</div><div class='add'>+		hci_update_scan(hdev);</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry_safe(p, tmp, &amp;hdev-&gt;le_conn_params, list) {</div><div class='ctx'> 			if (p-&gt;auto_connect == HCI_AUTO_CONN_DISABLED)</div><div class='hunk'>@@ -5807,16 +7899,14 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 				p-&gt;auto_connect = HCI_AUTO_CONN_EXPLICIT;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			list_del(&amp;p-&gt;action);</div><div class='del'>-			list_del(&amp;p-&gt;list);</div><div class='del'>-			kfree(p);</div><div class='add'>+			hci_conn_params_free(p);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BT_DBG("All LE connection parameters were removed");</div><div class='del'>-</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+		bt_dev_dbg(hdev, "All LE connection parameters were removed");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hci_cmd_sync_queue(hdev, remove_device_sync, NULL, NULL);</div><div class='add'>+</div><div class='ctx'> complete:</div><div class='ctx'> 	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_REMOVE_DEVICE,</div><div class='ctx'> 				MGMT_STATUS_SUCCESS, &amp;cp-&gt;addr,</div><div class='hunk'>@@ -5826,6 +7916,18 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int conn_update_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hci_conn_params *params = data;</div><div class='add'>+	struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+	conn = hci_conn_hash_lookup_le(hdev, &amp;params-&gt;addr, params-&gt;addr_type);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	return hci_le_conn_update_sync(hdev, conn, params);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 			   u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -5847,8 +7949,7 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	expected_len = sizeof(*cp) + param_count *</div><div class='del'>-					sizeof(struct mgmt_conn_param);</div><div class='add'>+	expected_len = struct_size(cp, params, param_count);</div><div class='ctx'> 	if (expected_len != len) {</div><div class='ctx'> 		bt_dev_err(hdev, "load_conn_param: expected %u bytes, got %u bytes",</div><div class='ctx'> 			   expected_len, len);</div><div class='hunk'>@@ -5856,20 +7957,22 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s param_count %u", hdev-&gt;name, param_count);</div><div class='add'>+	bt_dev_dbg(hdev, "param_count %u", param_count);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	hci_conn_params_clear_disabled(hdev);</div><div class='add'>+	if (param_count &gt; 1)</div><div class='add'>+		hci_conn_params_clear_disabled(hdev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; param_count; i++) {</div><div class='ctx'> 		struct mgmt_conn_param *param = &amp;cp-&gt;params[i];</div><div class='ctx'> 		struct hci_conn_params *hci_param;</div><div class='ctx'> 		u16 min, max, latency, timeout;</div><div class='add'>+		bool update = false;</div><div class='ctx'> 		u8 addr_type;</div><div class='ctx'> </div><div class='del'>-		BT_DBG("Adding %pMR (type %u)", &amp;param-&gt;addr.bdaddr,</div><div class='del'>-		       param-&gt;addr.type);</div><div class='add'>+		bt_dev_dbg(hdev, "Adding %pMR (type %u)", &amp;param-&gt;addr.bdaddr,</div><div class='add'>+			   param-&gt;addr.type);</div><div class='ctx'> </div><div class='ctx'> 		if (param-&gt;addr.type == BDADDR_LE_PUBLIC) {</div><div class='ctx'> 			addr_type = ADDR_LE_DEV_PUBLIC;</div><div class='hunk'>@@ -5885,14 +7988,27 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		latency = le16_to_cpu(param-&gt;latency);</div><div class='ctx'> 		timeout = le16_to_cpu(param-&gt;timeout);</div><div class='ctx'> </div><div class='del'>-		BT_DBG("min 0x%04x max 0x%04x latency 0x%04x timeout 0x%04x",</div><div class='del'>-		       min, max, latency, timeout);</div><div class='add'>+		bt_dev_dbg(hdev, "min 0x%04x max 0x%04x latency 0x%04x timeout 0x%04x",</div><div class='add'>+			   min, max, latency, timeout);</div><div class='ctx'> </div><div class='ctx'> 		if (hci_check_conn_params(min, max, latency, timeout) &lt; 0) {</div><div class='ctx'> 			bt_dev_err(hdev, "ignoring invalid connection parameters");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Detect when the loading is for an existing parameter then</div><div class='add'>+		 * attempt to trigger the connection update procedure.</div><div class='add'>+		 */</div><div class='add'>+		if (!i &amp;&amp; param_count == 1) {</div><div class='add'>+			hci_param = hci_conn_params_lookup(hdev,</div><div class='add'>+							   &amp;param-&gt;addr.bdaddr,</div><div class='add'>+							   addr_type);</div><div class='add'>+			if (hci_param)</div><div class='add'>+				update = true;</div><div class='add'>+			else</div><div class='add'>+				hci_conn_params_clear_disabled(hdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hci_param = hci_conn_params_add(hdev, &amp;param-&gt;addr.bdaddr,</div><div class='ctx'> 						addr_type);</div><div class='ctx'> 		if (!hci_param) {</div><div class='hunk'>@@ -5904,6 +8020,25 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='ctx'> 		hci_param-&gt;conn_max_interval = max;</div><div class='ctx'> 		hci_param-&gt;conn_latency = latency;</div><div class='ctx'> 		hci_param-&gt;supervision_timeout = timeout;</div><div class='add'>+</div><div class='add'>+		/* Check if we need to trigger a connection update */</div><div class='add'>+		if (update) {</div><div class='add'>+			struct hci_conn *conn;</div><div class='add'>+</div><div class='add'>+			/* Lookup for existing connection as central and check</div><div class='add'>+			 * if parameters match and if they don't then trigger</div><div class='add'>+			 * a connection update.</div><div class='add'>+			 */</div><div class='add'>+			conn = hci_conn_hash_lookup_le(hdev, &amp;hci_param-&gt;addr,</div><div class='add'>+						       addr_type);</div><div class='add'>+			if (conn &amp;&amp; conn-&gt;role == HCI_ROLE_MASTER &amp;&amp;</div><div class='add'>+			    (conn-&gt;le_conn_min_interval != min ||</div><div class='add'>+			     conn-&gt;le_conn_max_interval != max ||</div><div class='add'>+			     conn-&gt;le_conn_latency != latency ||</div><div class='add'>+			     conn-&gt;le_supv_timeout != timeout))</div><div class='add'>+				hci_cmd_sync_queue(hdev, conn_update_sync,</div><div class='add'>+						   hci_param, NULL);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -5919,7 +8054,7 @@ static int set_external_config(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	bool changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev_is_powered(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_EXTERNAL_CONFIG,</div><div class='hunk'>@@ -5929,7 +8064,7 @@ static int set_external_config(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_EXTERNAL_CONFIG,</div><div class='ctx'> 				         MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &amp;hdev-&gt;quirks))</div><div class='add'>+	if (!hci_test_quirk(hdev, HCI_QUIRK_EXTERNAL_CONFIG))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_EXTERNAL_CONFIG,</div><div class='ctx'> 				       MGMT_STATUS_NOT_SUPPORTED);</div><div class='ctx'> </div><div class='hunk'>@@ -5975,7 +8110,7 @@ static int set_public_address(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	bool changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev_is_powered(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_PUBLIC_ADDRESS,</div><div class='hunk'>@@ -6020,21 +8155,27 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void read_local_oob_ext_data_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-					     u16 opcode, struct sk_buff *skb)</div><div class='add'>+static void read_local_oob_ext_data_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					     int err)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mgmt_cp_read_local_oob_ext_data *mgmt_cp;</div><div class='ctx'> 	struct mgmt_rp_read_local_oob_ext_data *mgmt_rp;</div><div class='ctx'> 	u8 *h192, *r192, *h256, *r256;</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct sk_buff *skb = cmd-&gt;skb;</div><div class='add'>+	u8 status = mgmt_status(err);</div><div class='ctx'> 	u16 eir_len;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s status %u", hdev-&gt;name, status);</div><div class='add'>+	if (!status) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			status = MGMT_STATUS_FAILED;</div><div class='add'>+		else if (IS_ERR(skb))</div><div class='add'>+			status = mgmt_status(PTR_ERR(skb));</div><div class='add'>+		else</div><div class='add'>+			status = mgmt_status(skb-&gt;data[0]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		return;</div><div class='add'>+	bt_dev_dbg(hdev, "status %u", status);</div><div class='ctx'> </div><div class='ctx'> 	mgmt_cp = cmd-&gt;param;</div><div class='ctx'> </div><div class='hunk'>@@ -6046,7 +8187,7 @@ static void read_local_oob_ext_data_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 		r192 = NULL;</div><div class='ctx'> 		h256 = NULL;</div><div class='ctx'> 		r256 = NULL;</div><div class='del'>-	} else if (opcode == HCI_OP_READ_LOCAL_OOB_DATA) {</div><div class='add'>+	} else if (!bredr_sc_enabled(hdev)) {</div><div class='ctx'> 		struct hci_rp_read_local_oob_data *rp;</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len != sizeof(*rp)) {</div><div class='hunk'>@@ -6091,7 +8232,7 @@ static void read_local_oob_ext_data_complete(struct hci_dev *hdev, u8 status,</div><div class='ctx'> 	if (!mgmt_rp)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='add'>+	if (eir_len == 0)</div><div class='ctx'> 		goto send_rsp;</div><div class='ctx'> </div><div class='ctx'> 	eir_len = eir_append_data(mgmt_rp-&gt;eir, 0, EIR_CLASS_OF_DEV,</div><div class='hunk'>@@ -6127,30 +8268,27 @@ send_rsp:</div><div class='ctx'> 				 mgmt_rp, sizeof(*mgmt_rp) + eir_len,</div><div class='ctx'> 				 HCI_MGMT_OOB_DATA_EVENTS, cmd-&gt;sk);</div><div class='ctx'> done:</div><div class='add'>+	if (skb &amp;&amp; !IS_ERR(skb))</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='ctx'> 	kfree(mgmt_rp);</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_local_ssp_oob_req(struct hci_dev *hdev, struct sock *sk,</div><div class='ctx'> 				  struct mgmt_cp_read_local_oob_ext_data *cp)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev,</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev,</div><div class='ctx'> 			       cp, sizeof(*cp));</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, read_local_oob_data_sync, cmd,</div><div class='add'>+				 read_local_oob_ext_data_complete);</div><div class='ctx'> </div><div class='del'>-	if (bredr_sc_enabled(hdev))</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_LOCAL_OOB_EXT_DATA, 0, NULL);</div><div class='del'>-	else</div><div class='del'>-		hci_req_add(&amp;req, HCI_OP_READ_LOCAL_OOB_DATA, 0, NULL);</div><div class='del'>-</div><div class='del'>-	err = hci_req_run_skb(&amp;req, read_local_oob_ext_data_complete);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		mgmt_pending_remove(cmd);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -6169,7 +8307,7 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u8 status, flags, role, addr[7], hash[16], rand[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (hdev_is_powered(hdev)) {</div><div class='ctx'> 		switch (cp-&gt;type) {</div><div class='hunk'>@@ -6202,6 +8340,11 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	if (!rp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (!status &amp;&amp; !lmp_ssp_capable(hdev)) {</div><div class='add'>+		status = MGMT_STATUS_NOT_SUPPORTED;</div><div class='add'>+		eir_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto complete;</div><div class='ctx'> </div><div class='hunk'>@@ -6325,21 +8468,27 @@ static u32 get_supported_adv_flags(struct hci_dev *hdev)</div><div class='ctx'> 	flags |= MGMT_ADV_FLAG_MANAGED_FLAGS;</div><div class='ctx'> 	flags |= MGMT_ADV_FLAG_APPEARANCE;</div><div class='ctx'> 	flags |= MGMT_ADV_FLAG_LOCAL_NAME;</div><div class='add'>+	flags |= MGMT_ADV_PARAM_DURATION;</div><div class='add'>+	flags |= MGMT_ADV_PARAM_TIMEOUT;</div><div class='add'>+	flags |= MGMT_ADV_PARAM_INTERVALS;</div><div class='add'>+	flags |= MGMT_ADV_PARAM_TX_POWER;</div><div class='add'>+	flags |= MGMT_ADV_PARAM_SCAN_RSP;</div><div class='ctx'> </div><div class='ctx'> 	/* In extended adv TX_POWER returned from Set Adv Param</div><div class='ctx'> 	 * will be always valid.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((hdev-&gt;adv_tx_power != HCI_TX_POWER_INVALID) ||</div><div class='del'>-	    ext_adv_capable(hdev))</div><div class='add'>+	if (hdev-&gt;adv_tx_power != HCI_TX_POWER_INVALID || ext_adv_capable(hdev))</div><div class='ctx'> 		flags |= MGMT_ADV_FLAG_TX_POWER;</div><div class='ctx'> </div><div class='ctx'> 	if (ext_adv_capable(hdev)) {</div><div class='ctx'> 		flags |= MGMT_ADV_FLAG_SEC_1M;</div><div class='add'>+		flags |= MGMT_ADV_FLAG_HW_OFFLOAD;</div><div class='add'>+		flags |= MGMT_ADV_FLAG_CAN_SET_TX_POWER;</div><div class='ctx'> </div><div class='del'>-		if (hdev-&gt;le_features[1] &amp; HCI_LE_PHY_2M)</div><div class='add'>+		if (le_2m_capable(hdev))</div><div class='ctx'> 			flags |= MGMT_ADV_FLAG_SEC_2M;</div><div class='ctx'> </div><div class='del'>-		if (hdev-&gt;le_features[1] &amp; HCI_LE_PHY_CODED)</div><div class='add'>+		if (le_coded_capable(hdev))</div><div class='ctx'> 			flags |= MGMT_ADV_FLAG_SEC_CODED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6356,7 +8505,7 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	u32 supported_flags;</div><div class='ctx'> 	u8 *instance;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_READ_ADV_FEATURES,</div><div class='hunk'>@@ -6374,15 +8523,21 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	supported_flags = get_supported_adv_flags(hdev);</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;supported_flags = cpu_to_le32(supported_flags);</div><div class='del'>-	rp-&gt;max_adv_data_len = HCI_MAX_AD_LENGTH;</div><div class='del'>-	rp-&gt;max_scan_rsp_len = HCI_MAX_AD_LENGTH;</div><div class='del'>-	rp-&gt;max_instances = HCI_MAX_ADV_INSTANCES;</div><div class='add'>+	rp-&gt;max_adv_data_len = max_adv_len(hdev);</div><div class='add'>+	rp-&gt;max_scan_rsp_len = max_adv_len(hdev);</div><div class='add'>+	rp-&gt;max_instances = hdev-&gt;le_num_of_adv_sets;</div><div class='ctx'> 	rp-&gt;num_instances = hdev-&gt;adv_instance_cnt;</div><div class='ctx'> </div><div class='ctx'> 	instance = rp-&gt;instance;</div><div class='ctx'> 	list_for_each_entry(adv_instance, &amp;hdev-&gt;adv_instances, list) {</div><div class='del'>-		*instance = adv_instance-&gt;instance;</div><div class='del'>-		instance++;</div><div class='add'>+		/* Only instances 1-le_num_of_adv_sets are externally visible */</div><div class='add'>+		if (adv_instance-&gt;instance &lt;= hdev-&gt;adv_instance_cnt) {</div><div class='add'>+			*instance = adv_instance-&gt;instance;</div><div class='add'>+			instance++;</div><div class='add'>+		} else {</div><div class='add'>+			rp-&gt;num_instances--;</div><div class='add'>+			rp_len--;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -6397,15 +8552,15 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> </div><div class='ctx'> static u8 calculate_name_len(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	u8 buf[HCI_MAX_SHORT_NAME_LENGTH + 3];</div><div class='add'>+	u8 buf[HCI_MAX_SHORT_NAME_LENGTH + 2]; /* len + type + name */</div><div class='ctx'> </div><div class='del'>-	return append_local_name(hdev, buf, 0);</div><div class='add'>+	return eir_append_local_name(hdev, buf, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 tlv_data_max_len(struct hci_dev *hdev, u32 adv_flags,</div><div class='ctx'> 			   bool is_adv_data)</div><div class='ctx'> {</div><div class='del'>-	u8 max_len = HCI_MAX_AD_LENGTH;</div><div class='add'>+	u8 max_len = max_adv_len(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (is_adv_data) {</div><div class='ctx'> 		if (adv_flags &amp; (MGMT_ADV_FLAG_DISCOV |</div><div class='hunk'>@@ -6460,9 +8615,12 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that the data is correctly formatted. */</div><div class='del'>-	for (i = 0, cur_len = 0; i &lt; len; i += (cur_len + 1)) {</div><div class='add'>+	for (i = 0; i &lt; len; i += (cur_len + 1)) {</div><div class='ctx'> 		cur_len = data[i];</div><div class='ctx'> </div><div class='add'>+		if (!cur_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (data[i + 1] == EIR_FLAGS &amp;&amp;</div><div class='ctx'> 		    (!is_adv_data || flags_managed(adv_flags)))</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -6490,56 +8648,87 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_advertising_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-				     u16 opcode)</div><div class='add'>+static bool requested_adv_flags_are_valid(struct hci_dev *hdev, u32 adv_flags)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct mgmt_cp_add_advertising *cp;</div><div class='del'>-	struct mgmt_rp_add_advertising rp;</div><div class='del'>-	struct adv_info *adv_instance, *n;</div><div class='del'>-	u8 instance;</div><div class='add'>+	u32 supported_flags, phy_flags;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status %d", status);</div><div class='add'>+	/* The current implementation only supports a subset of the specified</div><div class='add'>+	 * flags. Also need to check mutual exclusiveness of sec flags.</div><div class='add'>+	 */</div><div class='add'>+	supported_flags = get_supported_adv_flags(hdev);</div><div class='add'>+	phy_flags = adv_flags &amp; MGMT_ADV_FLAG_SEC_MASK;</div><div class='add'>+	if (adv_flags &amp; ~supported_flags ||</div><div class='add'>+	    ((phy_flags &amp;&amp; (phy_flags ^ (phy_flags &amp; -phy_flags)))))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool adv_busy(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return pending_find(MGMT_OP_SET_LE, hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_adv_complete(struct hci_dev *hdev, struct sock *sk, u8 instance,</div><div class='add'>+			     int err)</div><div class='add'>+{</div><div class='add'>+	struct adv_info *adv, *n;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	cmd = pending_find(MGMT_OP_ADD_ADVERTISING, hdev);</div><div class='add'>+	list_for_each_entry_safe(adv, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='add'>+		u8 instance;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(adv_instance, n, &amp;hdev-&gt;adv_instances, list) {</div><div class='del'>-		if (!adv_instance-&gt;pending)</div><div class='add'>+		if (!adv-&gt;pending)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!status) {</div><div class='del'>-			adv_instance-&gt;pending = false;</div><div class='add'>+		if (!err) {</div><div class='add'>+			adv-&gt;pending = false;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		instance = adv_instance-&gt;instance;</div><div class='add'>+		instance = adv-&gt;instance;</div><div class='ctx'> </div><div class='ctx'> 		if (hdev-&gt;cur_adv_instance == instance)</div><div class='ctx'> 			cancel_adv_timeout(hdev);</div><div class='ctx'> </div><div class='ctx'> 		hci_remove_adv_instance(hdev, instance);</div><div class='del'>-		mgmt_advertising_removed(cmd ? cmd-&gt;sk : NULL, hdev, instance);</div><div class='add'>+		mgmt_advertising_removed(sk, hdev, instance);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cmd)</div><div class='del'>-		goto unlock;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_advertising_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_advertising *cp = cmd-&gt;param;</div><div class='add'>+	struct mgmt_rp_add_advertising rp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='ctx'> </div><div class='del'>-	cp = cmd-&gt;param;</div><div class='ctx'> 	rp.instance = cp-&gt;instance;</div><div class='ctx'> </div><div class='del'>-	if (status)</div><div class='del'>-		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode,</div><div class='del'>-				mgmt_status(status));</div><div class='add'>+	if (err)</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				mgmt_status(err));</div><div class='ctx'> 	else</div><div class='del'>-		mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode,</div><div class='del'>-				  mgmt_status(status), &amp;rp, sizeof(rp));</div><div class='add'>+		mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				  mgmt_status(err), &amp;rp, sizeof(rp));</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	add_adv_complete(hdev, cmd-&gt;sk, cp-&gt;instance, err);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	hci_dev_unlock(hdev);</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_advertising_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_advertising *cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	return hci_schedule_adv_instance_sync(hdev, cp-&gt;instance, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='hunk'>@@ -6548,24 +8737,22 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_cp_add_advertising *cp = data;</div><div class='ctx'> 	struct mgmt_rp_add_advertising rp;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	u32 supported_flags, phy_flags;</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	u16 timeout, duration;</div><div class='del'>-	unsigned int prev_instance_cnt = hdev-&gt;adv_instance_cnt;</div><div class='add'>+	unsigned int prev_instance_cnt;</div><div class='ctx'> 	u8 schedule_instance = 0;</div><div class='del'>-	struct adv_info *next_instance;</div><div class='add'>+	struct adv_info *adv, *next_instance;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	status = mgmt_le_support(hdev);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_ADVERTISING,</div><div class='ctx'> 				       status);</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;instance &lt; 1 || cp-&gt;instance &gt; HCI_MAX_ADV_INSTANCES)</div><div class='add'>+	if (cp-&gt;instance &lt; 1 || cp-&gt;instance &gt; hdev-&gt;le_num_of_adv_sets)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_ADVERTISING,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='hunk'>@@ -6577,13 +8764,7 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	timeout = __le16_to_cpu(cp-&gt;timeout);</div><div class='ctx'> 	duration = __le16_to_cpu(cp-&gt;duration);</div><div class='ctx'> </div><div class='del'>-	/* The current implementation only supports a subset of the specified</div><div class='del'>-	 * flags. Also need to check mutual exclusiveness of sec flags.</div><div class='del'>-	 */</div><div class='del'>-	supported_flags = get_supported_adv_flags(hdev);</div><div class='del'>-	phy_flags = flags &amp; MGMT_ADV_FLAG_SEC_MASK;</div><div class='del'>-	if (flags &amp; ~supported_flags ||</div><div class='del'>-	    ((phy_flags &amp;&amp; (phy_flags ^ (phy_flags &amp; -phy_flags)))))</div><div class='add'>+	if (!requested_adv_flags_are_valid(hdev, flags))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_ADVERTISING,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='hunk'>@@ -6595,9 +8776,7 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_ADD_ADVERTISING, hdev) ||</div><div class='del'>-	    pending_find(MGMT_OP_REMOVE_ADVERTISING, hdev) ||</div><div class='del'>-	    pending_find(MGMT_OP_SET_LE, hdev)) {</div><div class='add'>+	if (adv_busy(hdev)) {</div><div class='ctx'> 		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_ADVERTISING,</div><div class='ctx'> 				      MGMT_STATUS_BUSY);</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -6611,12 +8790,17 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hci_add_adv_instance(hdev, cp-&gt;instance, flags,</div><div class='add'>+	prev_instance_cnt = hdev-&gt;adv_instance_cnt;</div><div class='add'>+</div><div class='add'>+	adv = hci_add_adv_instance(hdev, cp-&gt;instance, flags,</div><div class='ctx'> 				   cp-&gt;adv_data_len, cp-&gt;data,</div><div class='ctx'> 				   cp-&gt;scan_rsp_len,</div><div class='ctx'> 				   cp-&gt;data + cp-&gt;adv_data_len,</div><div class='del'>-				   timeout, duration);</div><div class='del'>-	if (err &lt; 0) {</div><div class='add'>+				   timeout, duration,</div><div class='add'>+				   HCI_ADV_TX_POWER_NO_PREFERENCE,</div><div class='add'>+				   hdev-&gt;le_adv_min_interval,</div><div class='add'>+				   hdev-&gt;le_adv_max_interval, 0);</div><div class='add'>+	if (IS_ERR(adv)) {</div><div class='ctx'> 		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_ADVERTISING,</div><div class='ctx'> 				      MGMT_STATUS_FAILED);</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -6662,22 +8846,193 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	/* We're good to go, update advertising data, parameters, and start</div><div class='ctx'> 	 * advertising.</div><div class='ctx'> 	 */</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_ADD_ADVERTISING, hdev, data,</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_ADD_ADVERTISING, hdev, data,</div><div class='ctx'> 			       data_len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='add'>+	cp-&gt;instance = schedule_instance;</div><div class='ctx'> </div><div class='del'>-	err = __hci_req_schedule_adv_instance(&amp;req, schedule_instance, true);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, add_advertising_sync, cmd,</div><div class='add'>+				 add_advertising_complete);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		err = hci_req_run(&amp;req, add_advertising_complete);</div><div class='add'>+unlock:</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_ext_adv_params_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_ext_adv_params *cp = cmd-&gt;param;</div><div class='add'>+	struct mgmt_rp_add_ext_adv_params rp;</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	adv = hci_find_adv_instance(hdev, cp-&gt;instance);</div><div class='add'>+	if (!adv)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	rp.instance = cp-&gt;instance;</div><div class='add'>+	rp.tx_power = adv-&gt;tx_power;</div><div class='add'>+</div><div class='add'>+	/* While we're at it, inform userspace of the available space for this</div><div class='add'>+	 * advertisement, given the flags that will be used.</div><div class='add'>+	 */</div><div class='add'>+	flags = __le32_to_cpu(cp-&gt;flags);</div><div class='add'>+	rp.max_adv_data_len = tlv_data_max_len(hdev, flags, true);</div><div class='add'>+	rp.max_scan_rsp_len = tlv_data_max_len(hdev, flags, false);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		/* If this advertisement was previously advertising and we</div><div class='add'>+		 * failed to update it, we signal that it has been removed and</div><div class='add'>+		 * delete its structure</div><div class='add'>+		 */</div><div class='add'>+		if (!adv-&gt;pending)</div><div class='add'>+			mgmt_advertising_removed(cmd-&gt;sk, hdev, cp-&gt;instance);</div><div class='add'>+</div><div class='add'>+		hci_remove_adv_instance(hdev, cp-&gt;instance);</div><div class='add'>+</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				mgmt_status(err));</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				  mgmt_status(err), &amp;rp, sizeof(rp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ext_adv_params_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_ext_adv_params *cp = cmd-&gt;param;</div><div class='add'>+</div><div class='add'>+	return hci_setup_ext_adv_instance_sync(hdev, cp-&gt;instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ext_adv_params(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+			      void *data, u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_add_ext_adv_params *cp = data;</div><div class='add'>+	struct mgmt_rp_add_ext_adv_params rp;</div><div class='add'>+	struct mgmt_pending_cmd *cmd = NULL;</div><div class='add'>+	struct adv_info *adv;</div><div class='add'>+	u32 flags, min_interval, max_interval;</div><div class='add'>+	u16 timeout, duration;</div><div class='add'>+	u8 status;</div><div class='add'>+	s8 tx_power;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	status = mgmt_le_support(hdev);</div><div class='add'>+	if (status)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				       status);</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;instance &lt; 1 || cp-&gt;instance &gt; hdev-&gt;le_num_of_adv_sets)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	/* The purpose of breaking add_advertising into two separate MGMT calls</div><div class='add'>+	 * for params and data is to allow more parameters to be added to this</div><div class='add'>+	 * structure in the future. For this reason, we verify that we have the</div><div class='add'>+	 * bare minimum structure we know of when the interface was defined. Any</div><div class='add'>+	 * extra parameters we don't know about will be ignored in this request.</div><div class='add'>+	 */</div><div class='add'>+	if (data_len &lt; MGMT_ADD_EXT_ADV_PARAMS_MIN_SIZE)</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	flags = __le32_to_cpu(cp-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!requested_adv_flags_are_valid(hdev, flags))</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* In new interface, we require that we are powered to register */</div><div class='add'>+	if (!hdev_is_powered(hdev)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				      MGMT_STATUS_REJECTED);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adv_busy(hdev)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				      MGMT_STATUS_BUSY);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse defined parameters from request, use defaults otherwise */</div><div class='add'>+	timeout = (flags &amp; MGMT_ADV_PARAM_TIMEOUT) ?</div><div class='add'>+		  __le16_to_cpu(cp-&gt;timeout) : 0;</div><div class='add'>+</div><div class='add'>+	duration = (flags &amp; MGMT_ADV_PARAM_DURATION) ?</div><div class='add'>+		   __le16_to_cpu(cp-&gt;duration) :</div><div class='add'>+		   hdev-&gt;def_multi_adv_rotation_duration;</div><div class='add'>+</div><div class='add'>+	min_interval = (flags &amp; MGMT_ADV_PARAM_INTERVALS) ?</div><div class='add'>+		       __le32_to_cpu(cp-&gt;min_interval) :</div><div class='add'>+		       hdev-&gt;le_adv_min_interval;</div><div class='add'>+</div><div class='add'>+	max_interval = (flags &amp; MGMT_ADV_PARAM_INTERVALS) ?</div><div class='add'>+		       __le32_to_cpu(cp-&gt;max_interval) :</div><div class='add'>+		       hdev-&gt;le_adv_max_interval;</div><div class='add'>+</div><div class='add'>+	tx_power = (flags &amp; MGMT_ADV_PARAM_TX_POWER) ?</div><div class='add'>+		   cp-&gt;tx_power :</div><div class='add'>+		   HCI_ADV_TX_POWER_NO_PREFERENCE;</div><div class='add'>+</div><div class='add'>+	/* Create advertising instance with no advertising or response data */</div><div class='add'>+	adv = hci_add_adv_instance(hdev, cp-&gt;instance, flags, 0, NULL, 0, NULL,</div><div class='add'>+				   timeout, duration, tx_power, min_interval,</div><div class='add'>+				   max_interval, 0);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(adv)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+				      MGMT_STATUS_FAILED);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Submit request for advertising params if ext adv available */</div><div class='add'>+	if (ext_adv_capable(hdev)) {</div><div class='add'>+		cmd = mgmt_pending_new(sk, MGMT_OP_ADD_EXT_ADV_PARAMS, hdev,</div><div class='add'>+				       data, data_len);</div><div class='add'>+		if (!cmd) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			hci_remove_adv_instance(hdev, cp-&gt;instance);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = hci_cmd_sync_queue(hdev, add_ext_adv_params_sync, cmd,</div><div class='add'>+					 add_ext_adv_params_complete);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='add'>+	} else {</div><div class='add'>+		rp.instance = cp-&gt;instance;</div><div class='add'>+		rp.tx_power = HCI_ADV_TX_POWER_NO_PREFERENCE;</div><div class='add'>+		rp.max_adv_data_len = tlv_data_max_len(hdev, flags, true);</div><div class='add'>+		rp.max_scan_rsp_len = tlv_data_max_len(hdev, flags, false);</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+					MGMT_OP_ADD_EXT_ADV_PARAMS,</div><div class='add'>+					MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -6685,46 +9040,214 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void remove_advertising_complete(struct hci_dev *hdev, u8 status,</div><div class='del'>-					u16 opcode)</div><div class='add'>+static void add_ext_adv_data_complete(struct hci_dev *hdev, void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_ext_adv_data *cp = cmd-&gt;param;</div><div class='add'>+	struct mgmt_rp_add_advertising rp;</div><div class='add'>+</div><div class='add'>+	add_adv_complete(hdev, cmd-&gt;sk, cp-&gt;instance, err);</div><div class='add'>+</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	rp.instance = cp-&gt;instance;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				mgmt_status(err));</div><div class='add'>+	else</div><div class='add'>+		mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				  mgmt_status(err), &amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ext_adv_data_sync(struct hci_dev *hdev, void *data)</div><div class='ctx'> {</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_add_ext_adv_data *cp = cmd-&gt;param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ext_adv_capable(hdev)) {</div><div class='add'>+		err = hci_update_adv_data_sync(hdev, cp-&gt;instance);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = hci_update_scan_rsp_data_sync(hdev, cp-&gt;instance);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return hci_enable_ext_advertising_sync(hdev, cp-&gt;instance);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hci_schedule_adv_instance_sync(hdev, cp-&gt;instance, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ext_adv_data(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_cp_add_ext_adv_data *cp = data;</div><div class='add'>+	struct mgmt_rp_add_ext_adv_data rp;</div><div class='add'>+	u8 schedule_instance = 0;</div><div class='add'>+	struct adv_info *next_instance;</div><div class='add'>+	struct adv_info *adv_instance;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct mgmt_cp_remove_advertising *cp;</div><div class='del'>-	struct mgmt_rp_remove_advertising rp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("status %d", status);</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='del'>-	/* A failure status here only means that we failed to disable</div><div class='del'>-	 * advertising. Otherwise, the advertising instance has been removed,</div><div class='del'>-	 * so report success.</div><div class='add'>+	adv_instance = hci_find_adv_instance(hdev, cp-&gt;instance);</div><div class='add'>+</div><div class='add'>+	if (!adv_instance) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+				      MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In new interface, we require that we are powered to register */</div><div class='add'>+	if (!hdev_is_powered(hdev)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+				      MGMT_STATUS_REJECTED);</div><div class='add'>+		goto clear_new_instance;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adv_busy(hdev)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+				      MGMT_STATUS_BUSY);</div><div class='add'>+		goto clear_new_instance;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate new data */</div><div class='add'>+	if (!tlv_data_is_valid(hdev, adv_instance-&gt;flags, cp-&gt;data,</div><div class='add'>+			       cp-&gt;adv_data_len, true) ||</div><div class='add'>+	    !tlv_data_is_valid(hdev, adv_instance-&gt;flags, cp-&gt;data +</div><div class='add'>+			       cp-&gt;adv_data_len, cp-&gt;scan_rsp_len, false)) {</div><div class='add'>+		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+				      MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+		goto clear_new_instance;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the data in the advertising instance */</div><div class='add'>+	hci_set_adv_instance_data(hdev, cp-&gt;instance, cp-&gt;adv_data_len,</div><div class='add'>+				  cp-&gt;data, cp-&gt;scan_rsp_len,</div><div class='add'>+				  cp-&gt;data + cp-&gt;adv_data_len);</div><div class='add'>+</div><div class='add'>+	/* If using software rotation, determine next instance to use */</div><div class='add'>+	if (hdev-&gt;cur_adv_instance == cp-&gt;instance) {</div><div class='add'>+		/* If the currently advertised instance is being changed</div><div class='add'>+		 * then cancel the current advertising and schedule the</div><div class='add'>+		 * next instance. If there is only one instance then the</div><div class='add'>+		 * overridden advertising data will be visible right</div><div class='add'>+		 * away</div><div class='add'>+		 */</div><div class='add'>+		cancel_adv_timeout(hdev);</div><div class='add'>+</div><div class='add'>+		next_instance = hci_get_next_instance(hdev, cp-&gt;instance);</div><div class='add'>+		if (next_instance)</div><div class='add'>+			schedule_instance = next_instance-&gt;instance;</div><div class='add'>+	} else if (!hdev-&gt;adv_instance_timeout) {</div><div class='add'>+		/* Immediately advertise the new instance if no other</div><div class='add'>+		 * instance is currently being advertised.</div><div class='add'>+		 */</div><div class='add'>+		schedule_instance = cp-&gt;instance;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the HCI_ADVERTISING flag is set or there is no instance to</div><div class='add'>+	 * be advertised then we have no HCI communication to make.</div><div class='add'>+	 * Simply return.</div><div class='ctx'> 	 */</div><div class='del'>-	cmd = pending_find(MGMT_OP_REMOVE_ADVERTISING, hdev);</div><div class='del'>-	if (!cmd)</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_ADVERTISING) || !schedule_instance) {</div><div class='add'>+		if (adv_instance-&gt;pending) {</div><div class='add'>+			mgmt_advertising_added(sk, hdev, cp-&gt;instance);</div><div class='add'>+			adv_instance-&gt;pending = false;</div><div class='add'>+		}</div><div class='add'>+		rp.instance = cp-&gt;instance;</div><div class='add'>+		err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_ADD_EXT_ADV_DATA,</div><div class='add'>+					MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='ctx'> 		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cp = cmd-&gt;param;</div><div class='del'>-	rp.instance = cp-&gt;instance;</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_ADD_EXT_ADV_DATA, hdev, data,</div><div class='add'>+			       data_len);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto clear_new_instance;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;index, cmd-&gt;opcode, MGMT_STATUS_SUCCESS,</div><div class='del'>-			  &amp;rp, sizeof(rp));</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, add_ext_adv_data_sync, cmd,</div><div class='add'>+				 add_ext_adv_data_complete);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='add'>+		goto clear_new_instance;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We were successful in updating data, so trigger advertising_added</div><div class='add'>+	 * event if this is an instance that wasn't previously advertising. If</div><div class='add'>+	 * a failure occurs in the requests we initiated, we will remove the</div><div class='add'>+	 * instance again in add_advertising_complete</div><div class='add'>+	 */</div><div class='add'>+	if (adv_instance-&gt;pending)</div><div class='add'>+		mgmt_advertising_added(sk, hdev, cp-&gt;instance);</div><div class='add'>+</div><div class='add'>+	goto unlock;</div><div class='add'>+</div><div class='add'>+clear_new_instance:</div><div class='add'>+	hci_remove_adv_instance(hdev, cp-&gt;instance);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_advertising_complete(struct hci_dev *hdev, void *data,</div><div class='add'>+					int err)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_remove_advertising *cp = cmd-&gt;param;</div><div class='add'>+	struct mgmt_rp_remove_advertising rp;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='add'>+</div><div class='add'>+	memset(&amp;rp, 0, sizeof(rp));</div><div class='add'>+	rp.instance = cp-&gt;instance;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		mgmt_cmd_status(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				mgmt_status(err));</div><div class='add'>+	else</div><div class='add'>+		mgmt_cmd_complete(cmd-&gt;sk, cmd-&gt;hdev-&gt;id, cmd-&gt;opcode,</div><div class='add'>+				  MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='add'>+</div><div class='add'>+	mgmt_pending_free(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_advertising_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd = data;</div><div class='add'>+	struct mgmt_cp_remove_advertising *cp = cmd-&gt;param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hci_remove_advertising_sync(hdev, cmd-&gt;sk, cp-&gt;instance, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;hdev-&gt;adv_instances))</div><div class='add'>+		err = hci_disable_advertising_sync(hdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int remove_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 			      void *data, u16 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_cp_remove_advertising *cp = data;</div><div class='del'>-	struct mgmt_rp_remove_advertising rp;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='del'>-	struct hci_request req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -6735,9 +9258,7 @@ static int remove_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pending_find(MGMT_OP_ADD_ADVERTISING, hdev) ||</div><div class='del'>-	    pending_find(MGMT_OP_REMOVE_ADVERTISING, hdev) ||</div><div class='del'>-	    pending_find(MGMT_OP_SET_LE, hdev)) {</div><div class='add'>+	if (pending_find(MGMT_OP_SET_LE, hdev)) {</div><div class='ctx'> 		err = mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_REMOVE_ADVERTISING,</div><div class='ctx'> 				      MGMT_STATUS_BUSY);</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -6749,38 +9270,17 @@ static int remove_advertising(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	hci_req_clear_adv_instance(hdev, sk, &amp;req, cp-&gt;instance, true);</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;hdev-&gt;adv_instances))</div><div class='del'>-		__hci_req_disable_advertising(&amp;req);</div><div class='del'>-</div><div class='del'>-	/* If no HCI commands have been collected so far or the HCI_ADVERTISING</div><div class='del'>-	 * flag is set or the device isn't powered then we have no HCI</div><div class='del'>-	 * communication to make. Simply return.</div><div class='del'>-	 */</div><div class='del'>-	if (skb_queue_empty(&amp;req.cmd_q) ||</div><div class='del'>-	    !hdev_is_powered(hdev) ||</div><div class='del'>-	    hci_dev_test_flag(hdev, HCI_ADVERTISING)) {</div><div class='del'>-		hci_req_purge(&amp;req);</div><div class='del'>-		rp.instance = cp-&gt;instance;</div><div class='del'>-		err = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='del'>-					MGMT_OP_REMOVE_ADVERTISING,</div><div class='del'>-					MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = mgmt_pending_add(sk, MGMT_OP_REMOVE_ADVERTISING, hdev, data,</div><div class='add'>+	cmd = mgmt_pending_new(sk, MGMT_OP_REMOVE_ADVERTISING, hdev, data,</div><div class='ctx'> 			       data_len);</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hci_req_run(&amp;req, remove_advertising_complete);</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, remove_advertising_sync, cmd,</div><div class='add'>+				 remove_advertising_complete);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		mgmt_pending_remove(cmd);</div><div class='add'>+		mgmt_pending_free(cmd);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='hunk'>@@ -6794,15 +9294,14 @@ static int get_adv_size_info(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	struct mgmt_cp_get_adv_size_info *cp = data;</div><div class='ctx'> 	struct mgmt_rp_get_adv_size_info rp;</div><div class='ctx'> 	u32 flags, supported_flags;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!lmp_le_capable(hdev))</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_GET_ADV_SIZE_INFO,</div><div class='ctx'> 				       MGMT_STATUS_REJECTED);</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;instance &lt; 1 || cp-&gt;instance &gt; HCI_MAX_ADV_INSTANCES)</div><div class='add'>+	if (cp-&gt;instance &lt; 1 || cp-&gt;instance &gt; hdev-&gt;le_num_of_adv_sets)</div><div class='ctx'> 		return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_GET_ADV_SIZE_INFO,</div><div class='ctx'> 				       MGMT_STATUS_INVALID_PARAMS);</div><div class='ctx'> </div><div class='hunk'>@@ -6821,10 +9320,8 @@ static int get_adv_size_info(struct sock *sk, struct hci_dev *hdev,</div><div class='ctx'> 	rp.max_adv_data_len = tlv_data_max_len(hdev, flags, true);</div><div class='ctx'> 	rp.max_scan_rsp_len = tlv_data_max_len(hdev, flags, false);</div><div class='ctx'> </div><div class='del'>-	err = mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_ADV_SIZE_INFO,</div><div class='del'>-				MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id, MGMT_OP_GET_ADV_SIZE_INFO,</div><div class='add'>+				 MGMT_STATUS_SUCCESS, &amp;rp, sizeof(rp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct hci_mgmt_handler mgmt_handlers[] = {</div><div class='hunk'>@@ -6921,32 +9418,62 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {</div><div class='ctx'> 	{ set_appearance,	   MGMT_SET_APPEARANCE_SIZE },</div><div class='ctx'> 	{ get_phy_configuration,   MGMT_GET_PHY_CONFIGURATION_SIZE },</div><div class='ctx'> 	{ set_phy_configuration,   MGMT_SET_PHY_CONFIGURATION_SIZE },</div><div class='add'>+	{ set_blocked_keys,	   MGMT_OP_SET_BLOCKED_KEYS_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ set_wideband_speech,	   MGMT_SETTING_SIZE },</div><div class='add'>+	{ read_controller_cap,     MGMT_READ_CONTROLLER_CAP_SIZE,</div><div class='add'>+						HCI_MGMT_UNTRUSTED },</div><div class='add'>+	{ read_exp_features_info,  MGMT_READ_EXP_FEATURES_INFO_SIZE,</div><div class='add'>+						HCI_MGMT_UNTRUSTED |</div><div class='add'>+						HCI_MGMT_HDEV_OPTIONAL },</div><div class='add'>+	{ set_exp_feature,         MGMT_SET_EXP_FEATURE_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN |</div><div class='add'>+						HCI_MGMT_HDEV_OPTIONAL },</div><div class='add'>+	{ read_def_system_config,  MGMT_READ_DEF_SYSTEM_CONFIG_SIZE,</div><div class='add'>+						HCI_MGMT_UNTRUSTED },</div><div class='add'>+	{ set_def_system_config,   MGMT_SET_DEF_SYSTEM_CONFIG_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ read_def_runtime_config, MGMT_READ_DEF_RUNTIME_CONFIG_SIZE,</div><div class='add'>+						HCI_MGMT_UNTRUSTED },</div><div class='add'>+	{ set_def_runtime_config,  MGMT_SET_DEF_RUNTIME_CONFIG_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ get_device_flags,        MGMT_GET_DEVICE_FLAGS_SIZE },</div><div class='add'>+	{ set_device_flags,        MGMT_SET_DEVICE_FLAGS_SIZE },</div><div class='add'>+	{ read_adv_mon_features,   MGMT_READ_ADV_MONITOR_FEATURES_SIZE },</div><div class='add'>+	{ add_adv_patterns_monitor,MGMT_ADD_ADV_PATTERNS_MONITOR_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ remove_adv_monitor,      MGMT_REMOVE_ADV_MONITOR_SIZE },</div><div class='add'>+	{ add_ext_adv_params,      MGMT_ADD_EXT_ADV_PARAMS_MIN_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ add_ext_adv_data,        MGMT_ADD_EXT_ADV_DATA_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ add_adv_patterns_monitor_rssi,</div><div class='add'>+				   MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ set_mesh,                MGMT_SET_MESH_RECEIVER_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ mesh_features,           MGMT_MESH_READ_FEATURES_SIZE },</div><div class='add'>+	{ mesh_send,               MGMT_MESH_SEND_SIZE,</div><div class='add'>+						HCI_MGMT_VAR_LEN },</div><div class='add'>+	{ mesh_send_cancel,        MGMT_MESH_SEND_CANCEL_SIZE },</div><div class='add'>+	{ mgmt_hci_cmd_sync,       MGMT_HCI_CMD_SYNC_SIZE, HCI_MGMT_VAR_LEN },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void mgmt_index_added(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_ext_index ev;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks))</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='del'>-			mgmt_index_event(MGMT_EV_UNCONF_INDEX_ADDED, hdev,</div><div class='del'>-					 NULL, 0, HCI_MGMT_UNCONF_INDEX_EVENTS);</div><div class='del'>-			ev.type = 0x01;</div><div class='del'>-		} else {</div><div class='del'>-			mgmt_index_event(MGMT_EV_INDEX_ADDED, hdev, NULL, 0,</div><div class='del'>-					 HCI_MGMT_INDEX_EVENTS);</div><div class='del'>-			ev.type = 0x00;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		ev.type = 0x02;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='add'>+		mgmt_index_event(MGMT_EV_UNCONF_INDEX_ADDED, hdev, NULL, 0,</div><div class='add'>+				 HCI_MGMT_UNCONF_INDEX_EVENTS);</div><div class='add'>+		ev.type = 0x01;</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_index_event(MGMT_EV_INDEX_ADDED, hdev, NULL, 0,</div><div class='add'>+				 HCI_MGMT_INDEX_EVENTS);</div><div class='add'>+		ev.type = 0x00;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ev.bus = hdev-&gt;bus;</div><div class='hunk'>@@ -6958,77 +9485,52 @@ void mgmt_index_added(struct hci_dev *hdev)</div><div class='ctx'> void mgmt_index_removed(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_ext_index ev;</div><div class='del'>-	u8 status = MGMT_STATUS_INVALID_INDEX;</div><div class='add'>+	struct cmd_lookup match = { NULL, hdev, MGMT_STATUS_INVALID_INDEX };</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks))</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_RAW_DEVICE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	switch (hdev-&gt;dev_type) {</div><div class='del'>-	case HCI_PRIMARY:</div><div class='del'>-		mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &amp;status);</div><div class='add'>+	mgmt_pending_foreach(0, hdev, true, cmd_complete_rsp, &amp;match);</div><div class='ctx'> </div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='del'>-			mgmt_index_event(MGMT_EV_UNCONF_INDEX_REMOVED, hdev,</div><div class='del'>-					 NULL, 0, HCI_MGMT_UNCONF_INDEX_EVENTS);</div><div class='del'>-			ev.type = 0x01;</div><div class='del'>-		} else {</div><div class='del'>-			mgmt_index_event(MGMT_EV_INDEX_REMOVED, hdev, NULL, 0,</div><div class='del'>-					 HCI_MGMT_INDEX_EVENTS);</div><div class='del'>-			ev.type = 0x00;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case HCI_AMP:</div><div class='del'>-		ev.type = 0x02;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {</div><div class='add'>+		mgmt_index_event(MGMT_EV_UNCONF_INDEX_REMOVED, hdev, NULL, 0,</div><div class='add'>+				 HCI_MGMT_UNCONF_INDEX_EVENTS);</div><div class='add'>+		ev.type = 0x01;</div><div class='add'>+	} else {</div><div class='add'>+		mgmt_index_event(MGMT_EV_INDEX_REMOVED, hdev, NULL, 0,</div><div class='add'>+				 HCI_MGMT_INDEX_EVENTS);</div><div class='add'>+		ev.type = 0x00;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ev.bus = hdev-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 	mgmt_index_event(MGMT_EV_EXT_INDEX_REMOVED, hdev, &amp;ev, sizeof(ev),</div><div class='ctx'> 			 HCI_MGMT_EXT_INDEX_EVENTS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function requires the caller holds hdev-&gt;lock */</div><div class='del'>-static void restart_le_actions(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hci_conn_params *p;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(p, &amp;hdev-&gt;le_conn_params, list) {</div><div class='del'>-		/* Needed for AUTO_OFF case where might not "really"</div><div class='del'>-		 * have been powered off.</div><div class='del'>-		 */</div><div class='del'>-		list_del_init(&amp;p-&gt;action);</div><div class='ctx'> </div><div class='del'>-		switch (p-&gt;auto_connect) {</div><div class='del'>-		case HCI_AUTO_CONN_DIRECT:</div><div class='del'>-		case HCI_AUTO_CONN_ALWAYS:</div><div class='del'>-			list_add(&amp;p-&gt;action, &amp;hdev-&gt;pend_le_conns);</div><div class='del'>-			break;</div><div class='del'>-		case HCI_AUTO_CONN_REPORT:</div><div class='del'>-			list_add(&amp;p-&gt;action, &amp;hdev-&gt;pend_le_reports);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Cancel any remaining timed work */</div><div class='add'>+	if (!hci_dev_test_flag(hdev, HCI_MGMT))</div><div class='add'>+		return;</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;discov_off);</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;service_cache);</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;rpa_expired);</div><div class='add'>+	cancel_delayed_work_sync(&amp;hdev-&gt;mesh_send_done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mgmt_power_on(struct hci_dev *hdev, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_lookup match = { NULL, hdev };</div><div class='ctx'> </div><div class='del'>-	BT_DBG("err %d", err);</div><div class='add'>+	bt_dev_dbg(hdev, "err %d", err);</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_lock(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		restart_le_actions(hdev);</div><div class='del'>-		hci_update_background_scan(hdev);</div><div class='add'>+		hci_update_passive_scan(hdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, true, settings_rsp,</div><div class='add'>+			     &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	new_settings(hdev, match.sk);</div><div class='ctx'> </div><div class='hunk'>@@ -7041,9 +9543,10 @@ void mgmt_power_on(struct hci_dev *hdev, int err)</div><div class='ctx'> void __mgmt_power_off(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_lookup match = { NULL, hdev };</div><div class='del'>-	u8 status, zero_cod[] = { 0, 0, 0 };</div><div class='add'>+	u8 zero_cod[] = { 0, 0, 0 };</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, true, settings_rsp,</div><div class='add'>+			     &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	/* If the power off is because of hdev unregistration let</div><div class='ctx'> 	 * use the appropriate INVALID_INDEX status. Otherwise use</div><div class='hunk'>@@ -7053,11 +9556,11 @@ void __mgmt_power_off(struct hci_dev *hdev)</div><div class='ctx'> 	 * status responses.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_UNREGISTER))</div><div class='del'>-		status = MGMT_STATUS_INVALID_INDEX;</div><div class='add'>+		match.mgmt_status = MGMT_STATUS_INVALID_INDEX;</div><div class='ctx'> 	else</div><div class='del'>-		status = MGMT_STATUS_NOT_POWERED;</div><div class='add'>+		match.mgmt_status = MGMT_STATUS_NOT_POWERED;</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &amp;status);</div><div class='add'>+	mgmt_pending_foreach(0, hdev, true, cmd_complete_rsp, &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(hdev-&gt;dev_class, zero_cod, sizeof(zero_cod)) != 0) {</div><div class='ctx'> 		mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,</div><div class='hunk'>@@ -7112,7 +9615,7 @@ static u8 mgmt_ltk_type(struct smp_ltk *ltk)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ltk-&gt;type) {</div><div class='ctx'> 	case SMP_LTK:</div><div class='del'>-	case SMP_LTK_SLAVE:</div><div class='add'>+	case SMP_LTK_RESPONDER:</div><div class='ctx'> 		if (ltk-&gt;authenticated)</div><div class='ctx'> 			return MGMT_LTK_AUTHENTICATED;</div><div class='ctx'> 		return MGMT_LTK_UNAUTHENTICATED;</div><div class='hunk'>@@ -7158,7 +9661,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent)</div><div class='ctx'> 	ev.key.rand = key-&gt;rand;</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;type == SMP_LTK)</div><div class='del'>-		ev.key.master = 1;</div><div class='add'>+		ev.key.initiator = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we copy only the significant bytes based on the</div><div class='ctx'> 	 * encryption key size, and set the rest of the value to zeroes.</div><div class='hunk'>@@ -7238,15 +9741,35 @@ void mgmt_new_conn_param(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='del'>-			   u32 flags, u8 *name, u8 name_len)</div><div class='add'>+			   u8 *name, u8 name_len)</div><div class='ctx'> {</div><div class='del'>-	char buf[512];</div><div class='del'>-	struct mgmt_ev_device_connected *ev = (void *) buf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct mgmt_ev_device_connected *ev;</div><div class='ctx'> 	u16 eir_len = 0;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* allocate buff for LE or BR/EDR adv */</div><div class='add'>+	if (conn-&gt;le_adv_data_len &gt; 0)</div><div class='add'>+		skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_CONNECTED,</div><div class='add'>+				     sizeof(*ev) + conn-&gt;le_adv_data_len);</div><div class='add'>+	else</div><div class='add'>+		skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_CONNECTED,</div><div class='add'>+				     sizeof(*ev) + (name ? eir_precalc_len(name_len) : 0) +</div><div class='add'>+				     eir_precalc_len(sizeof(conn-&gt;dev_class)));</div><div class='ctx'> </div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='ctx'> 	bacpy(&amp;ev-&gt;addr.bdaddr, &amp;conn-&gt;dst);</div><div class='ctx'> 	ev-&gt;addr.type = link_to_bdaddr(conn-&gt;type, conn-&gt;dst_type);</div><div class='ctx'> </div><div class='add'>+	if (conn-&gt;out)</div><div class='add'>+		flags |= MGMT_DEV_FOUND_INITIATED_CONN;</div><div class='add'>+</div><div class='ctx'> 	ev-&gt;flags = __cpu_to_le32(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* We must ensure that the EIR Data fields are ordered and</div><div class='hunk'>@@ -7254,36 +9777,20 @@ void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,</div><div class='ctx'> 	 * adding any BR/EDR data to the LE adv.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (conn-&gt;le_adv_data_len &gt; 0) {</div><div class='del'>-		memcpy(&amp;ev-&gt;eir[eir_len],</div><div class='del'>-		       conn-&gt;le_adv_data, conn-&gt;le_adv_data_len);</div><div class='add'>+		skb_put_data(skb, conn-&gt;le_adv_data, conn-&gt;le_adv_data_len);</div><div class='ctx'> 		eir_len = conn-&gt;le_adv_data_len;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (name_len &gt; 0)</div><div class='del'>-			eir_len = eir_append_data(ev-&gt;eir, 0, EIR_NAME_COMPLETE,</div><div class='del'>-						  name, name_len);</div><div class='add'>+		if (name)</div><div class='add'>+			eir_len += eir_skb_put_data(skb, EIR_NAME_COMPLETE, name, name_len);</div><div class='ctx'> </div><div class='del'>-		if (memcmp(conn-&gt;dev_class, "\0\0\0", 3) != 0)</div><div class='del'>-			eir_len = eir_append_data(ev-&gt;eir, eir_len,</div><div class='del'>-						  EIR_CLASS_OF_DEV,</div><div class='del'>-						  conn-&gt;dev_class, 3);</div><div class='add'>+		if (memcmp(conn-&gt;dev_class, "\0\0\0", sizeof(conn-&gt;dev_class)))</div><div class='add'>+			eir_len += eir_skb_put_data(skb, EIR_CLASS_OF_DEV,</div><div class='add'>+						    conn-&gt;dev_class, sizeof(conn-&gt;dev_class));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ev-&gt;eir_len = cpu_to_le16(eir_len);</div><div class='ctx'> </div><div class='del'>-	mgmt_event(MGMT_EV_DEVICE_CONNECTED, hdev, buf,</div><div class='del'>-		    sizeof(*ev) + eir_len, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void disconnect_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='del'>-{</div><div class='del'>-	struct sock **sk = data;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;cmd_complete(cmd, 0);</div><div class='del'>-</div><div class='del'>-	*sk = cmd-&gt;sk;</div><div class='del'>-	sock_hold(*sk);</div><div class='del'>-</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='add'>+	mgmt_event_skb(skb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void unpair_device_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='hunk'>@@ -7294,7 +9801,6 @@ static void unpair_device_rsp(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> 	device_unpaired(hdev, &amp;cp-&gt;addr.bdaddr, cp-&gt;addr.type, cmd-&gt;sk);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmd_complete(cmd, 0);</div><div class='del'>-	mgmt_pending_remove(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool mgmt_powering_down(struct hci_dev *hdev)</div><div class='hunk'>@@ -7302,6 +9808,9 @@ bool mgmt_powering_down(struct hci_dev *hdev)</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> 	struct mgmt_mode *cp;</div><div class='ctx'> </div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_POWERING_DOWN))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	cmd = pending_find(MGMT_OP_SET_POWERED, hdev);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -7320,33 +9829,26 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 	struct mgmt_ev_device_disconnected ev;</div><div class='ctx'> 	struct sock *sk = NULL;</div><div class='ctx'> </div><div class='del'>-	/* The connection is still in hci_conn_hash so test for 1</div><div class='del'>-	 * instead of 0 to know if this is the last one.</div><div class='del'>-	 */</div><div class='del'>-	if (mgmt_powering_down(hdev) &amp;&amp; hci_conn_count(hdev) == 1) {</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-		queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off.work);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!mgmt_connected)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (link_type != ACL_LINK &amp;&amp; link_type != LE_LINK)</div><div class='add'>+	if (link_type != ACL_LINK &amp;&amp;</div><div class='add'>+	    link_type != LE_LINK  &amp;&amp;</div><div class='add'>+	    link_type != BIS_LINK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &amp;sk);</div><div class='del'>-</div><div class='ctx'> 	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='ctx'> 	ev.addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='ctx'> 	ev.reason = reason;</div><div class='ctx'> </div><div class='add'>+	/* Report disconnects due to suspend */</div><div class='add'>+	if (hdev-&gt;suspended)</div><div class='add'>+		ev.reason = MGMT_DEV_DISCONN_LOCAL_HOST_SUSPEND;</div><div class='add'>+</div><div class='ctx'> 	mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &amp;ev, sizeof(ev), sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk)</div><div class='ctx'> 		sock_put(sk);</div><div class='del'>-</div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,</div><div class='del'>-			     hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='hunk'>@@ -7356,8 +9858,8 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 	struct mgmt_cp_disconnect *cp;</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd;</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,</div><div class='del'>-			     hdev);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, true,</div><div class='add'>+			     unpair_device_rsp, hdev);</div><div class='ctx'> </div><div class='ctx'> 	cmd = pending_find(MGMT_OP_DISCONNECT, hdev);</div><div class='ctx'> 	if (!cmd)</div><div class='hunk'>@@ -7375,21 +9877,18 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 	mgmt_pending_remove(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='del'>-			 u8 addr_type, u8 status)</div><div class='add'>+void mgmt_connect_failed(struct hci_dev *hdev, struct hci_conn *conn, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_connect_failed ev;</div><div class='ctx'> </div><div class='del'>-	/* The connection is still in hci_conn_hash so test for 1</div><div class='del'>-	 * instead of 0 to know if this is the last one.</div><div class='del'>-	 */</div><div class='del'>-	if (mgmt_powering_down(hdev) &amp;&amp; hci_conn_count(hdev) == 1) {</div><div class='del'>-		cancel_delayed_work(&amp;hdev-&gt;power_off);</div><div class='del'>-		queue_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;power_off.work);</div><div class='add'>+	if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &amp;conn-&gt;flags)) {</div><div class='add'>+		mgmt_device_disconnected(hdev, &amp;conn-&gt;dst, conn-&gt;type,</div><div class='add'>+					 conn-&gt;dst_type, status, true);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='del'>-	ev.addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='add'>+	bacpy(&amp;ev.addr.bdaddr, &amp;conn-&gt;dst);</div><div class='add'>+	ev.addr.type = link_to_bdaddr(conn-&gt;type, conn-&gt;dst_type);</div><div class='ctx'> 	ev.status = mgmt_status(status);</div><div class='ctx'> </div><div class='ctx'> 	mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &amp;ev, sizeof(ev), NULL);</div><div class='hunk'>@@ -7438,7 +9937,7 @@ int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_user_confirm_request ev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);</div><div class='ctx'> </div><div class='ctx'> 	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='ctx'> 	ev.addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='hunk'>@@ -7454,7 +9953,7 @@ int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_user_passkey_request ev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);</div><div class='ctx'> </div><div class='ctx'> 	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='ctx'> 	ev.addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='hunk'>@@ -7515,7 +10014,7 @@ int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_passkey_notify ev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);</div><div class='ctx'> </div><div class='ctx'> 	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='ctx'> 	ev.addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='hunk'>@@ -7553,7 +10052,7 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		u8 mgmt_err = mgmt_status(status);</div><div class='del'>-		mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev,</div><div class='add'>+		mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, true,</div><div class='ctx'> 				     cmd_status_rsp, &amp;mgmt_err);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7563,8 +10062,8 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 	else</div><div class='ctx'> 		changed = hci_dev_test_and_clear_flag(hdev, HCI_LINK_SECURITY);</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp,</div><div class='del'>-			     &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, true,</div><div class='add'>+			     settings_rsp, &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		new_settings(hdev, match.sk);</div><div class='hunk'>@@ -7573,74 +10072,6 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)</div><div class='ctx'> 		sock_put(match.sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clear_eir(struct hci_request *req)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = req-&gt;hdev;</div><div class='del'>-	struct hci_cp_write_eir cp;</div><div class='del'>-</div><div class='del'>-	if (!lmp_ext_inq_capable(hdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(hdev-&gt;eir, 0, sizeof(hdev-&gt;eir));</div><div class='del'>-</div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-</div><div class='del'>-	hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &amp;cp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)</div><div class='del'>-{</div><div class='del'>-	struct cmd_lookup match = { NULL, hdev };</div><div class='del'>-	struct hci_request req;</div><div class='del'>-	bool changed = false;</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		u8 mgmt_err = mgmt_status(status);</div><div class='del'>-</div><div class='del'>-		if (enable &amp;&amp; hci_dev_test_and_clear_flag(hdev,</div><div class='del'>-							  HCI_SSP_ENABLED)) {</div><div class='del'>-			hci_dev_clear_flag(hdev, HCI_HS_ENABLED);</div><div class='del'>-			new_settings(hdev, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, cmd_status_rsp,</div><div class='del'>-				     &amp;mgmt_err);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		changed = !hci_dev_test_and_set_flag(hdev, HCI_SSP_ENABLED);</div><div class='del'>-	} else {</div><div class='del'>-		changed = hci_dev_test_and_clear_flag(hdev, HCI_SSP_ENABLED);</div><div class='del'>-		if (!changed)</div><div class='del'>-			changed = hci_dev_test_and_clear_flag(hdev,</div><div class='del'>-							      HCI_HS_ENABLED);</div><div class='del'>-		else</div><div class='del'>-			hci_dev_clear_flag(hdev, HCI_HS_ENABLED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &amp;match);</div><div class='del'>-</div><div class='del'>-	if (changed)</div><div class='del'>-		new_settings(hdev, match.sk);</div><div class='del'>-</div><div class='del'>-	if (match.sk)</div><div class='del'>-		sock_put(match.sk);</div><div class='del'>-</div><div class='del'>-	hci_req_init(&amp;req, hdev);</div><div class='del'>-</div><div class='del'>-	if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED)) {</div><div class='del'>-		if (hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS))</div><div class='del'>-			hci_req_add(&amp;req, HCI_OP_WRITE_SSP_DEBUG_MODE,</div><div class='del'>-				    sizeof(enable), &amp;enable);</div><div class='del'>-		__hci_req_update_eir(&amp;req);</div><div class='del'>-	} else {</div><div class='del'>-		clear_eir(&amp;req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hci_req_run(&amp;req, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sk_lookup(struct mgmt_pending_cmd *cmd, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_lookup *match = data;</div><div class='hunk'>@@ -7656,9 +10087,12 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_lookup match = { NULL, hdev, mgmt_status(status) };</div><div class='ctx'> </div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, sk_lookup, &amp;match);</div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, sk_lookup, &amp;match);</div><div class='del'>-	mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, false, sk_lookup,</div><div class='add'>+			     &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, false, sk_lookup,</div><div class='add'>+			     &amp;match);</div><div class='add'>+	mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, false, sk_lookup,</div><div class='add'>+			     &amp;match);</div><div class='ctx'> </div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev, dev_class,</div><div class='hunk'>@@ -7689,6 +10123,9 @@ void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)</div><div class='ctx'> 		/* If this is a HCI command related to powering on the</div><div class='ctx'> 		 * HCI dev don't send any mgmt signals.</div><div class='ctx'> 		 */</div><div class='add'>+		if (hci_dev_test_flag(hdev, HCI_POWERING_DOWN))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		if (pending_find(MGMT_OP_SET_POWERED, hdev))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7765,21 +10202,6 @@ static bool eir_has_uuids(u8 *eir, u16 eir_len, u16 uuid_count, u8 (*uuids)[16])</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void restart_le_scan(struct hci_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	/* If controller is not scanning we are done. */</div><div class='del'>-	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (time_after(jiffies + DISCOV_LE_RESTART_DELAY,</div><div class='del'>-		       hdev-&gt;discovery.scan_start +</div><div class='del'>-		       hdev-&gt;discovery.scan_duration))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	queue_delayed_work(hdev-&gt;req_workqueue, &amp;hdev-&gt;le_scan_restart,</div><div class='del'>-			   DISCOV_LE_RESTART_DELAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,</div><div class='ctx'> 			    u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -7795,7 +10217,7 @@ static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,</div><div class='ctx'> 	if (hdev-&gt;discovery.rssi != HCI_RSSI_INVALID &amp;&amp;</div><div class='ctx'> 	    (rssi == HCI_RSSI_INVALID ||</div><div class='ctx'> 	    (rssi &lt; hdev-&gt;discovery.rssi &amp;&amp;</div><div class='del'>-	     !test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &amp;hdev-&gt;quirks))))</div><div class='add'>+	     !hci_test_quirk(hdev, HCI_QUIRK_STRICT_DUPLICATE_FILTER))))</div><div class='ctx'> 		return  false;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;discovery.uuid_count != 0) {</div><div class='hunk'>@@ -7813,9 +10235,7 @@ static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,</div><div class='ctx'> 	/* If duplicate filtering does not report RSSI changes, then restart</div><div class='ctx'> 	 * scanning to ensure updated result with updated RSSI values.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &amp;hdev-&gt;quirks)) {</div><div class='del'>-		restart_le_scan(hdev);</div><div class='del'>-</div><div class='add'>+	if (hci_test_quirk(hdev, HCI_QUIRK_STRICT_DUPLICATE_FILTER)) {</div><div class='ctx'> 		/* Validate RSSI value against the RSSI threshold once more. */</div><div class='ctx'> 		if (hdev-&gt;discovery.rssi != HCI_RSSI_INVALID &amp;&amp;</div><div class='ctx'> 		    rssi &lt; hdev-&gt;discovery.rssi)</div><div class='hunk'>@@ -7825,13 +10245,192 @@ static bool is_filter_match(struct hci_dev *hdev, s8 rssi, u8 *eir,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mgmt_adv_monitor_device_lost(struct hci_dev *hdev, u16 handle,</div><div class='add'>+				  bdaddr_t *bdaddr, u8 addr_type)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_adv_monitor_device_lost ev;</div><div class='add'>+</div><div class='add'>+	ev.monitor_handle = cpu_to_le16(handle);</div><div class='add'>+	bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='add'>+	ev.addr.type = addr_type;</div><div class='add'>+</div><div class='add'>+	mgmt_event(MGMT_EV_ADV_MONITOR_DEVICE_LOST, hdev, &amp;ev, sizeof(ev),</div><div class='add'>+		   NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_send_adv_monitor_device_found(struct hci_dev *hdev,</div><div class='add'>+					       struct sk_buff *skb,</div><div class='add'>+					       struct sock *skip_sk,</div><div class='add'>+					       u16 handle)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *advmon_skb;</div><div class='add'>+	size_t advmon_skb_len;</div><div class='add'>+	__le16 *monitor_handle;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	advmon_skb_len = (sizeof(struct mgmt_ev_adv_monitor_device_found) -</div><div class='add'>+			  sizeof(struct mgmt_ev_device_found)) + skb-&gt;len;</div><div class='add'>+	advmon_skb = mgmt_alloc_skb(hdev, MGMT_EV_ADV_MONITOR_DEVICE_FOUND,</div><div class='add'>+				    advmon_skb_len);</div><div class='add'>+	if (!advmon_skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* ADV_MONITOR_DEVICE_FOUND is similar to DEVICE_FOUND event except</div><div class='add'>+	 * that it also has 'monitor_handle'. Make a copy of DEVICE_FOUND and</div><div class='add'>+	 * store monitor_handle of the matched monitor.</div><div class='add'>+	 */</div><div class='add'>+	monitor_handle = skb_put(advmon_skb, sizeof(*monitor_handle));</div><div class='add'>+	*monitor_handle = cpu_to_le16(handle);</div><div class='add'>+	skb_put_data(advmon_skb, skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	mgmt_event_skb(advmon_skb, skip_sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mgmt_adv_monitor_device_found(struct hci_dev *hdev,</div><div class='add'>+					  bdaddr_t *bdaddr, bool report_device,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='add'>+					  struct sock *skip_sk)</div><div class='add'>+{</div><div class='add'>+	struct monitored_device *dev, *tmp;</div><div class='add'>+	bool matched = false;</div><div class='add'>+	bool notified = false;</div><div class='add'>+</div><div class='add'>+	/* We have received the Advertisement Report because:</div><div class='add'>+	 * 1. the kernel has initiated active discovery</div><div class='add'>+	 * 2. if not, we have pend_le_reports &gt; 0 in which case we are doing</div><div class='add'>+	 *    passive scanning</div><div class='add'>+	 * 3. if none of the above is true, we have one or more active</div><div class='add'>+	 *    Advertisement Monitor</div><div class='add'>+	 *</div><div class='add'>+	 * For case 1 and 2, report all advertisements via MGMT_EV_DEVICE_FOUND</div><div class='add'>+	 * and report ONLY one advertisement per device for the matched Monitor</div><div class='add'>+	 * via MGMT_EV_ADV_MONITOR_DEVICE_FOUND event.</div><div class='add'>+	 *</div><div class='add'>+	 * For case 3, since we are not active scanning and all advertisements</div><div class='add'>+	 * received are due to a matched Advertisement Monitor, report all</div><div class='add'>+	 * advertisements ONLY via MGMT_EV_ADV_MONITOR_DEVICE_FOUND event.</div><div class='add'>+	 */</div><div class='add'>+	if (report_device &amp;&amp; !hdev-&gt;advmon_pend_notify) {</div><div class='add'>+		mgmt_event_skb(skb, skip_sk);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;advmon_pend_notify = false;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(dev, tmp, &amp;hdev-&gt;monitored_devices, list) {</div><div class='add'>+		if (!bacmp(&amp;dev-&gt;bdaddr, bdaddr)) {</div><div class='add'>+			matched = true;</div><div class='add'>+</div><div class='add'>+			if (!dev-&gt;notified) {</div><div class='add'>+				mgmt_send_adv_monitor_device_found(hdev, skb,</div><div class='add'>+								   skip_sk,</div><div class='add'>+								   dev-&gt;handle);</div><div class='add'>+				notified = true;</div><div class='add'>+				dev-&gt;notified = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;notified)</div><div class='add'>+			hdev-&gt;advmon_pend_notify = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!report_device &amp;&amp;</div><div class='add'>+	    ((matched &amp;&amp; !notified) || !msft_monitor_supported(hdev))) {</div><div class='add'>+		/* Handle 0 indicates that we are not active scanning and this</div><div class='add'>+		 * is a subsequent advertisement report for an already matched</div><div class='add'>+		 * Advertisement Monitor or the controller offloading support</div><div class='add'>+		 * is not available.</div><div class='add'>+		 */</div><div class='add'>+		mgmt_send_adv_monitor_device_found(hdev, skb, skip_sk, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (report_device)</div><div class='add'>+		mgmt_event_skb(skb, skip_sk);</div><div class='add'>+	else</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mesh_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='add'>+			      u8 addr_type, s8 rssi, u32 flags, u8 *eir,</div><div class='add'>+			      u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len,</div><div class='add'>+			      u64 instant)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct mgmt_ev_mesh_device_found *ev;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;mesh_ad_types[0])</div><div class='add'>+		goto accepted;</div><div class='add'>+</div><div class='add'>+	/* Scan for requested AD types */</div><div class='add'>+	if (eir_len &gt; 0) {</div><div class='add'>+		for (i = 0; i + 1 &lt; eir_len; i += eir[i] + 1) {</div><div class='add'>+			for (j = 0; j &lt; sizeof(hdev-&gt;mesh_ad_types); j++) {</div><div class='add'>+				if (!hdev-&gt;mesh_ad_types[j])</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				if (hdev-&gt;mesh_ad_types[j] == eir[i + 1])</div><div class='add'>+					goto accepted;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_rsp_len &gt; 0) {</div><div class='add'>+		for (i = 0; i + 1 &lt; scan_rsp_len; i += scan_rsp[i] + 1) {</div><div class='add'>+			for (j = 0; j &lt; sizeof(hdev-&gt;mesh_ad_types); j++) {</div><div class='add'>+				if (!hdev-&gt;mesh_ad_types[j])</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				if (hdev-&gt;mesh_ad_types[j] == scan_rsp[i + 1])</div><div class='add'>+					goto accepted;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+accepted:</div><div class='add'>+	skb = mgmt_alloc_skb(hdev, MGMT_EV_MESH_DEVICE_FOUND,</div><div class='add'>+			     sizeof(*ev) + eir_len + scan_rsp_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;ev-&gt;addr.bdaddr, bdaddr);</div><div class='add'>+	ev-&gt;addr.type = link_to_bdaddr(LE_LINK, addr_type);</div><div class='add'>+	ev-&gt;rssi = rssi;</div><div class='add'>+	ev-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	ev-&gt;instant = cpu_to_le64(instant);</div><div class='add'>+</div><div class='add'>+	if (eir_len &gt; 0)</div><div class='add'>+		/* Copy EIR or advertising data into event */</div><div class='add'>+		skb_put_data(skb, eir, eir_len);</div><div class='add'>+</div><div class='add'>+	if (scan_rsp_len &gt; 0)</div><div class='add'>+		/* Append scan response data to event */</div><div class='add'>+		skb_put_data(skb, scan_rsp, scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	ev-&gt;eir_len = cpu_to_le16(eir_len + scan_rsp_len);</div><div class='add'>+</div><div class='add'>+	mgmt_event_skb(skb, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='ctx'> 		       u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,</div><div class='del'>-		       u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len)</div><div class='add'>+		       u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len,</div><div class='add'>+		       u64 instant)</div><div class='ctx'> {</div><div class='del'>-	char buf[512];</div><div class='del'>-	struct mgmt_ev_device_found *ev = (void *)buf;</div><div class='del'>-	size_t ev_size;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct mgmt_ev_device_found *ev;</div><div class='add'>+	bool report_device = hci_discovery_active(hdev);</div><div class='add'>+</div><div class='add'>+	if (hci_dev_test_flag(hdev, HCI_MESH) &amp;&amp; link_type == LE_LINK)</div><div class='add'>+		mesh_device_found(hdev, bdaddr, addr_type, rssi, flags,</div><div class='add'>+				  eir, eir_len, scan_rsp, scan_rsp_len,</div><div class='add'>+				  instant);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't send events for a non-kernel initiated discovery. With</div><div class='ctx'> 	 * LE one exception is if we have pend_le_reports &gt; 0 in which</div><div class='hunk'>@@ -7840,7 +10439,9 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='ctx'> 	if (!hci_discovery_active(hdev)) {</div><div class='ctx'> 		if (link_type == ACL_LINK)</div><div class='ctx'> 			return;</div><div class='del'>-		if (link_type == LE_LINK &amp;&amp; list_empty(&amp;hdev-&gt;pend_le_reports))</div><div class='add'>+		if (link_type == LE_LINK &amp;&amp; !list_empty(&amp;hdev-&gt;pend_le_reports))</div><div class='add'>+			report_device = true;</div><div class='add'>+		else if (!hci_is_adv_monitoring(hdev))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7863,13 +10464,13 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Make sure that the buffer is big enough. The 5 extra bytes</div><div class='del'>-	 * are for the potential CoD field.</div><div class='del'>-	 */</div><div class='del'>-	if (sizeof(*ev) + eir_len + scan_rsp_len + 5 &gt; sizeof(buf))</div><div class='add'>+	/* Allocate skb. The 5 extra bytes are for the potential CoD field */</div><div class='add'>+	skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_FOUND,</div><div class='add'>+			     sizeof(*ev) + eir_len + scan_rsp_len + 5);</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='ctx'> </div><div class='ctx'> 	/* In case of device discovery with BR/EDR devices (pre 1.2), the</div><div class='ctx'> 	 * RSSI value was reported as 0 when not available. This behavior</div><div class='hunk'>@@ -7890,51 +10491,59 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='ctx'> </div><div class='ctx'> 	if (eir_len &gt; 0)</div><div class='ctx'> 		/* Copy EIR or advertising data into event */</div><div class='del'>-		memcpy(ev-&gt;eir, eir, eir_len);</div><div class='add'>+		skb_put_data(skb, eir, eir_len);</div><div class='ctx'> </div><div class='del'>-	if (dev_class &amp;&amp; !eir_get_data(ev-&gt;eir, eir_len, EIR_CLASS_OF_DEV,</div><div class='del'>-				       NULL))</div><div class='del'>-		eir_len = eir_append_data(ev-&gt;eir, eir_len, EIR_CLASS_OF_DEV,</div><div class='del'>-					  dev_class, 3);</div><div class='add'>+	if (dev_class &amp;&amp; !eir_get_data(eir, eir_len, EIR_CLASS_OF_DEV, NULL)) {</div><div class='add'>+		u8 eir_cod[5];</div><div class='add'>+</div><div class='add'>+		eir_len += eir_append_data(eir_cod, 0, EIR_CLASS_OF_DEV,</div><div class='add'>+					   dev_class, 3);</div><div class='add'>+		skb_put_data(skb, eir_cod, sizeof(eir_cod));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (scan_rsp_len &gt; 0)</div><div class='ctx'> 		/* Append scan response data to event */</div><div class='del'>-		memcpy(ev-&gt;eir + eir_len, scan_rsp, scan_rsp_len);</div><div class='add'>+		skb_put_data(skb, scan_rsp, scan_rsp_len);</div><div class='ctx'> </div><div class='ctx'> 	ev-&gt;eir_len = cpu_to_le16(eir_len + scan_rsp_len);</div><div class='del'>-	ev_size = sizeof(*ev) + eir_len + scan_rsp_len;</div><div class='ctx'> </div><div class='del'>-	mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);</div><div class='add'>+	mgmt_adv_monitor_device_found(hdev, bdaddr, report_device, skb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,</div><div class='ctx'> 		      u8 addr_type, s8 rssi, u8 *name, u8 name_len)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	struct mgmt_ev_device_found *ev;</div><div class='del'>-	char buf[sizeof(*ev) + HCI_MAX_NAME_LENGTH + 2];</div><div class='del'>-	u16 eir_len;</div><div class='del'>-</div><div class='del'>-	ev = (struct mgmt_ev_device_found *) buf;</div><div class='add'>+	u16 eir_len = 0;</div><div class='add'>+	u32 flags = 0;</div><div class='ctx'> </div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='add'>+	skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_FOUND,</div><div class='add'>+			     sizeof(*ev) + (name ? eir_precalc_len(name_len) : 0));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	ev = skb_put(skb, sizeof(*ev));</div><div class='ctx'> 	bacpy(&amp;ev-&gt;addr.bdaddr, bdaddr);</div><div class='ctx'> 	ev-&gt;addr.type = link_to_bdaddr(link_type, addr_type);</div><div class='ctx'> 	ev-&gt;rssi = rssi;</div><div class='ctx'> </div><div class='del'>-	eir_len = eir_append_data(ev-&gt;eir, 0, EIR_NAME_COMPLETE, name,</div><div class='del'>-				  name_len);</div><div class='add'>+	if (name)</div><div class='add'>+		eir_len += eir_skb_put_data(skb, EIR_NAME_COMPLETE, name, name_len);</div><div class='add'>+	else</div><div class='add'>+		flags = MGMT_DEV_FOUND_NAME_REQUEST_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ev-&gt;eir_len = cpu_to_le16(eir_len);</div><div class='add'>+	ev-&gt;flags = cpu_to_le32(flags);</div><div class='ctx'> </div><div class='del'>-	mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL);</div><div class='add'>+	mgmt_event_skb(skb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mgmt_discovering(struct hci_dev *hdev, u8 discovering)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_ev_discovering ev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s discovering %u", hdev-&gt;name, discovering);</div><div class='add'>+	bt_dev_dbg(hdev, "discovering %u", discovering);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ev, 0, sizeof(ev));</div><div class='ctx'> 	ev.type = hdev-&gt;discovery.type;</div><div class='hunk'>@@ -7943,6 +10552,30 @@ void mgmt_discovering(struct hci_dev *hdev, u8 discovering)</div><div class='ctx'> 	mgmt_event(MGMT_EV_DISCOVERING, hdev, &amp;ev, sizeof(ev), NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mgmt_suspending(struct hci_dev *hdev, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_controller_suspend ev;</div><div class='add'>+</div><div class='add'>+	ev.suspend_state = state;</div><div class='add'>+	mgmt_event(MGMT_EV_CONTROLLER_SUSPEND, hdev, &amp;ev, sizeof(ev), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mgmt_resuming(struct hci_dev *hdev, u8 reason, bdaddr_t *bdaddr,</div><div class='add'>+		   u8 addr_type)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_ev_controller_resume ev;</div><div class='add'>+</div><div class='add'>+	ev.wake_reason = reason;</div><div class='add'>+	if (bdaddr) {</div><div class='add'>+		bacpy(&amp;ev.addr.bdaddr, bdaddr);</div><div class='add'>+		ev.addr.type = addr_type;</div><div class='add'>+	} else {</div><div class='add'>+		memset(&amp;ev.addr, 0, sizeof(ev.addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt_event(MGMT_EV_CONTROLLER_RESUME, hdev, &amp;ev, sizeof(ev), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct hci_mgmt_chan chan = {</div><div class='ctx'> 	.channel	= HCI_CHANNEL_CONTROL,</div><div class='ctx'> 	.handler_count	= ARRAY_SIZE(mgmt_handlers),</div><div class='hunk'>@@ -7959,3 +10592,22 @@ void mgmt_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	hci_mgmt_chan_unregister(&amp;chan);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mgmt_cleanup(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;hci_dev_list_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(hdev, &amp;hci_dev_list, list) {</div><div class='add'>+		do {</div><div class='add'>+			mesh_tx = mgmt_mesh_next(hdev, sk);</div><div class='add'>+</div><div class='add'>+			if (mesh_tx)</div><div class='add'>+				mesh_send_complete(hdev, mesh_tx, true);</div><div class='add'>+		} while (mesh_tx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_unlock(&amp;hci_dev_list_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/mgmt_config.c b/net/bluetooth/mgmt_config.c<br/>new file mode 100644<br/>index 000000000000..c4063d200c0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_config.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/mgmt_config.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mgmt_util.h"</div><div class='add'>+#include "mgmt_config.h"</div><div class='add'>+</div><div class='add'>+#define HDEV_PARAM_U16(_param_name_) \</div><div class='add'>+	struct {\</div><div class='add'>+		struct mgmt_tlv_hdr entry; \</div><div class='add'>+		__le16 value; \</div><div class='add'>+	} __packed _param_name_</div><div class='add'>+</div><div class='add'>+#define HDEV_PARAM_U8(_param_name_) \</div><div class='add'>+	struct {\</div><div class='add'>+		struct mgmt_tlv_hdr entry; \</div><div class='add'>+		__u8 value; \</div><div class='add'>+	} __packed _param_name_</div><div class='add'>+</div><div class='add'>+#define TLV_SET_U16(_param_code_, _param_name_) \</div><div class='add'>+	{ \</div><div class='add'>+		{ cpu_to_le16(_param_code_), sizeof(__u16) }, \</div><div class='add'>+		cpu_to_le16(hdev-&gt;_param_name_) \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define TLV_SET_U8(_param_code_, _param_name_) \</div><div class='add'>+	{ \</div><div class='add'>+		{ cpu_to_le16(_param_code_), sizeof(__u8) }, \</div><div class='add'>+		hdev-&gt;_param_name_ \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define TLV_SET_U16_JIFFIES_TO_MSECS(_param_code_, _param_name_) \</div><div class='add'>+	{ \</div><div class='add'>+		{ cpu_to_le16(_param_code_), sizeof(__u16) }, \</div><div class='add'>+		cpu_to_le16(jiffies_to_msecs(hdev-&gt;_param_name_)) \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			   u16 data_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mgmt_rp_read_def_system_config {</div><div class='add'>+		/* Please see mgmt-api.txt for documentation of these values */</div><div class='add'>+		HDEV_PARAM_U16(def_page_scan_type);</div><div class='add'>+		HDEV_PARAM_U16(def_page_scan_int);</div><div class='add'>+		HDEV_PARAM_U16(def_page_scan_window);</div><div class='add'>+		HDEV_PARAM_U16(def_inq_scan_type);</div><div class='add'>+		HDEV_PARAM_U16(def_inq_scan_int);</div><div class='add'>+		HDEV_PARAM_U16(def_inq_scan_window);</div><div class='add'>+		HDEV_PARAM_U16(def_br_lsto);</div><div class='add'>+		HDEV_PARAM_U16(def_page_timeout);</div><div class='add'>+		HDEV_PARAM_U16(sniff_min_interval);</div><div class='add'>+		HDEV_PARAM_U16(sniff_max_interval);</div><div class='add'>+		HDEV_PARAM_U16(le_adv_min_interval);</div><div class='add'>+		HDEV_PARAM_U16(le_adv_max_interval);</div><div class='add'>+		HDEV_PARAM_U16(def_multi_adv_rotation_duration);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_interval);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_window);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_int_suspend);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_window_suspend);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_int_discovery);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_window_discovery);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_int_adv_monitor);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_window_adv_monitor);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_int_connect);</div><div class='add'>+		HDEV_PARAM_U16(le_scan_window_connect);</div><div class='add'>+		HDEV_PARAM_U16(le_conn_min_interval);</div><div class='add'>+		HDEV_PARAM_U16(le_conn_max_interval);</div><div class='add'>+		HDEV_PARAM_U16(le_conn_latency);</div><div class='add'>+		HDEV_PARAM_U16(le_supv_timeout);</div><div class='add'>+		HDEV_PARAM_U16(def_le_autoconnect_timeout);</div><div class='add'>+		HDEV_PARAM_U16(advmon_allowlist_duration);</div><div class='add'>+		HDEV_PARAM_U16(advmon_no_filter_duration);</div><div class='add'>+		HDEV_PARAM_U8(enable_advmon_interleave_scan);</div><div class='add'>+	} __packed rp = {</div><div class='add'>+		TLV_SET_U16(0x0000, def_page_scan_type),</div><div class='add'>+		TLV_SET_U16(0x0001, def_page_scan_int),</div><div class='add'>+		TLV_SET_U16(0x0002, def_page_scan_window),</div><div class='add'>+		TLV_SET_U16(0x0003, def_inq_scan_type),</div><div class='add'>+		TLV_SET_U16(0x0004, def_inq_scan_int),</div><div class='add'>+		TLV_SET_U16(0x0005, def_inq_scan_window),</div><div class='add'>+		TLV_SET_U16(0x0006, def_br_lsto),</div><div class='add'>+		TLV_SET_U16(0x0007, def_page_timeout),</div><div class='add'>+		TLV_SET_U16(0x0008, sniff_min_interval),</div><div class='add'>+		TLV_SET_U16(0x0009, sniff_max_interval),</div><div class='add'>+		TLV_SET_U16(0x000a, le_adv_min_interval),</div><div class='add'>+		TLV_SET_U16(0x000b, le_adv_max_interval),</div><div class='add'>+		TLV_SET_U16(0x000c, def_multi_adv_rotation_duration),</div><div class='add'>+		TLV_SET_U16(0x000d, le_scan_interval),</div><div class='add'>+		TLV_SET_U16(0x000e, le_scan_window),</div><div class='add'>+		TLV_SET_U16(0x000f, le_scan_int_suspend),</div><div class='add'>+		TLV_SET_U16(0x0010, le_scan_window_suspend),</div><div class='add'>+		TLV_SET_U16(0x0011, le_scan_int_discovery),</div><div class='add'>+		TLV_SET_U16(0x0012, le_scan_window_discovery),</div><div class='add'>+		TLV_SET_U16(0x0013, le_scan_int_adv_monitor),</div><div class='add'>+		TLV_SET_U16(0x0014, le_scan_window_adv_monitor),</div><div class='add'>+		TLV_SET_U16(0x0015, le_scan_int_connect),</div><div class='add'>+		TLV_SET_U16(0x0016, le_scan_window_connect),</div><div class='add'>+		TLV_SET_U16(0x0017, le_conn_min_interval),</div><div class='add'>+		TLV_SET_U16(0x0018, le_conn_max_interval),</div><div class='add'>+		TLV_SET_U16(0x0019, le_conn_latency),</div><div class='add'>+		TLV_SET_U16(0x001a, le_supv_timeout),</div><div class='add'>+		TLV_SET_U16_JIFFIES_TO_MSECS(0x001b,</div><div class='add'>+					     def_le_autoconnect_timeout),</div><div class='add'>+		TLV_SET_U16(0x001d, advmon_allowlist_duration),</div><div class='add'>+		TLV_SET_U16(0x001e, advmon_no_filter_duration),</div><div class='add'>+		TLV_SET_U8(0x001f, enable_advmon_interleave_scan),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	ret = mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_READ_DEF_SYSTEM_CONFIG,</div><div class='add'>+				0, &amp;rp, sizeof(rp));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TO_TLV(x)		((struct mgmt_tlv *)(x))</div><div class='add'>+#define TLV_GET_LE16(tlv)	le16_to_cpu(*((__le16 *)(TO_TLV(tlv)-&gt;value)))</div><div class='add'>+#define TLV_GET_U8(tlv)		(*((__u8 *)(TO_TLV(tlv)-&gt;value)))</div><div class='add'>+</div><div class='add'>+int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			  u16 data_len)</div><div class='add'>+{</div><div class='add'>+	u16 buffer_left = data_len;</div><div class='add'>+	u8 *buffer = data;</div><div class='add'>+</div><div class='add'>+	if (buffer_left &lt; sizeof(struct mgmt_tlv)) {</div><div class='add'>+		return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				       MGMT_OP_SET_DEF_SYSTEM_CONFIG,</div><div class='add'>+				       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First pass to validate the tlv */</div><div class='add'>+	while (buffer_left &gt;= sizeof(struct mgmt_tlv)) {</div><div class='add'>+		const u8 len = TO_TLV(buffer)-&gt;length;</div><div class='add'>+		size_t exp_type_len;</div><div class='add'>+		const u16 exp_len = sizeof(struct mgmt_tlv) +</div><div class='add'>+				    len;</div><div class='add'>+		const u16 type = le16_to_cpu(TO_TLV(buffer)-&gt;type);</div><div class='add'>+</div><div class='add'>+		if (buffer_left &lt; exp_len) {</div><div class='add'>+			bt_dev_warn(hdev, "invalid len left %u, exp &gt;= %u",</div><div class='add'>+				    buffer_left, exp_len);</div><div class='add'>+</div><div class='add'>+			return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+					MGMT_OP_SET_DEF_SYSTEM_CONFIG,</div><div class='add'>+					MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Please see mgmt-api.txt for documentation of these values */</div><div class='add'>+		switch (type) {</div><div class='add'>+		case 0x0000:</div><div class='add'>+		case 0x0001:</div><div class='add'>+		case 0x0002:</div><div class='add'>+		case 0x0003:</div><div class='add'>+		case 0x0004:</div><div class='add'>+		case 0x0005:</div><div class='add'>+		case 0x0006:</div><div class='add'>+		case 0x0007:</div><div class='add'>+		case 0x0008:</div><div class='add'>+		case 0x0009:</div><div class='add'>+		case 0x000a:</div><div class='add'>+		case 0x000b:</div><div class='add'>+		case 0x000c:</div><div class='add'>+		case 0x000d:</div><div class='add'>+		case 0x000e:</div><div class='add'>+		case 0x000f:</div><div class='add'>+		case 0x0010:</div><div class='add'>+		case 0x0011:</div><div class='add'>+		case 0x0012:</div><div class='add'>+		case 0x0013:</div><div class='add'>+		case 0x0014:</div><div class='add'>+		case 0x0015:</div><div class='add'>+		case 0x0016:</div><div class='add'>+		case 0x0017:</div><div class='add'>+		case 0x0018:</div><div class='add'>+		case 0x0019:</div><div class='add'>+		case 0x001a:</div><div class='add'>+		case 0x001b:</div><div class='add'>+		case 0x001d:</div><div class='add'>+		case 0x001e:</div><div class='add'>+			exp_type_len = sizeof(u16);</div><div class='add'>+			break;</div><div class='add'>+		case 0x001f:</div><div class='add'>+			exp_type_len = sizeof(u8);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			exp_type_len = 0;</div><div class='add'>+			bt_dev_warn(hdev, "unsupported parameter %u", type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (exp_type_len &amp;&amp; len != exp_type_len) {</div><div class='add'>+			bt_dev_warn(hdev, "invalid length %d, exp %zu for type %u",</div><div class='add'>+				    len, exp_type_len, type);</div><div class='add'>+</div><div class='add'>+			return mgmt_cmd_status(sk, hdev-&gt;id,</div><div class='add'>+				MGMT_OP_SET_DEF_SYSTEM_CONFIG,</div><div class='add'>+				MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer_left -= exp_len;</div><div class='add'>+		buffer += exp_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer_left = data_len;</div><div class='add'>+	buffer = data;</div><div class='add'>+	while (buffer_left &gt;= sizeof(struct mgmt_tlv)) {</div><div class='add'>+		const u8 len = TO_TLV(buffer)-&gt;length;</div><div class='add'>+		const u16 exp_len = sizeof(struct mgmt_tlv) +</div><div class='add'>+				    len;</div><div class='add'>+		const u16 type = le16_to_cpu(TO_TLV(buffer)-&gt;type);</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case 0x0000:</div><div class='add'>+			hdev-&gt;def_page_scan_type = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001:</div><div class='add'>+			hdev-&gt;def_page_scan_int = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0002:</div><div class='add'>+			hdev-&gt;def_page_scan_window = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0003:</div><div class='add'>+			hdev-&gt;def_inq_scan_type = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0004:</div><div class='add'>+			hdev-&gt;def_inq_scan_int = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0005:</div><div class='add'>+			hdev-&gt;def_inq_scan_window = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0006:</div><div class='add'>+			hdev-&gt;def_br_lsto = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0007:</div><div class='add'>+			hdev-&gt;def_page_timeout = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0008:</div><div class='add'>+			hdev-&gt;sniff_min_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0009:</div><div class='add'>+			hdev-&gt;sniff_max_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000a:</div><div class='add'>+			hdev-&gt;le_adv_min_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000b:</div><div class='add'>+			hdev-&gt;le_adv_max_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000c:</div><div class='add'>+			hdev-&gt;def_multi_adv_rotation_duration =</div><div class='add'>+							   TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000d:</div><div class='add'>+			hdev-&gt;le_scan_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000e:</div><div class='add'>+			hdev-&gt;le_scan_window = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x000f:</div><div class='add'>+			hdev-&gt;le_scan_int_suspend = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0010:</div><div class='add'>+			hdev-&gt;le_scan_window_suspend = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0011:</div><div class='add'>+			hdev-&gt;le_scan_int_discovery = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00012:</div><div class='add'>+			hdev-&gt;le_scan_window_discovery = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00013:</div><div class='add'>+			hdev-&gt;le_scan_int_adv_monitor = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00014:</div><div class='add'>+			hdev-&gt;le_scan_window_adv_monitor = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00015:</div><div class='add'>+			hdev-&gt;le_scan_int_connect = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00016:</div><div class='add'>+			hdev-&gt;le_scan_window_connect = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00017:</div><div class='add'>+			hdev-&gt;le_conn_min_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00018:</div><div class='add'>+			hdev-&gt;le_conn_max_interval = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x00019:</div><div class='add'>+			hdev-&gt;le_conn_latency = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001a:</div><div class='add'>+			hdev-&gt;le_supv_timeout = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001b:</div><div class='add'>+			hdev-&gt;def_le_autoconnect_timeout =</div><div class='add'>+					msecs_to_jiffies(TLV_GET_LE16(buffer));</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001d:</div><div class='add'>+			hdev-&gt;advmon_allowlist_duration = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001e:</div><div class='add'>+			hdev-&gt;advmon_no_filter_duration = TLV_GET_LE16(buffer);</div><div class='add'>+			break;</div><div class='add'>+		case 0x0001f:</div><div class='add'>+			hdev-&gt;enable_advmon_interleave_scan = TLV_GET_U8(buffer);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			bt_dev_warn(hdev, "unsupported parameter %u", type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer_left -= exp_len;</div><div class='add'>+		buffer += exp_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				 MGMT_OP_SET_DEF_SYSTEM_CONFIG, 0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int read_def_runtime_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 data_len)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_complete(sk, hdev-&gt;id,</div><div class='add'>+				 MGMT_OP_READ_DEF_RUNTIME_CONFIG, 0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int set_def_runtime_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			   u16 data_len)</div><div class='add'>+{</div><div class='add'>+	bt_dev_dbg(hdev, "sock %p", sk);</div><div class='add'>+</div><div class='add'>+	return mgmt_cmd_status(sk, hdev-&gt;id, MGMT_OP_SET_DEF_SYSTEM_CONFIG,</div><div class='add'>+			       MGMT_STATUS_INVALID_PARAMS);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/mgmt_config.h b/net/bluetooth/mgmt_config.h<br/>new file mode 100644<br/>index 000000000000..a4965f107891<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/mgmt_config.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			   u16 data_len);</div><div class='add'>+</div><div class='add'>+int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			  u16 data_len);</div><div class='add'>+</div><div class='add'>+int read_def_runtime_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			    u16 data_len);</div><div class='add'>+</div><div class='add'>+int set_def_runtime_config(struct sock *sk, struct hci_dev *hdev, void *data,</div><div class='add'>+			   u16 data_len);</div><div class='head'>diff --git a/net/bluetooth/mgmt_util.c b/net/bluetooth/mgmt_util.c<br/>index 0d0a6d77b9e8..aa7b5585cb26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_util.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/mgmt_util.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>    SOFTWARE IS DISCLAIMED.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='hunk'>@@ -56,40 +56,73 @@ static struct sk_buff *create_monitor_ctrl_event(__le16 index, u32 cookie,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mgmt_send_event(u16 event, struct hci_dev *hdev, unsigned short channel,</div><div class='del'>-		    void *data, u16 data_len, int flag, struct sock *skip_sk)</div><div class='add'>+struct sk_buff *mgmt_alloc_skb(struct hci_dev *hdev, u16 opcode,</div><div class='add'>+			       unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct mgmt_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_skb(sizeof(*hdr) + data_len, GFP_KERNEL);</div><div class='add'>+	skb = alloc_skb(sizeof(struct mgmt_hdr) + size, GFP_KERNEL);</div><div class='ctx'> 	if (!skb)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return skb;</div><div class='ctx'> </div><div class='del'>-	hdr = skb_put(skb, sizeof(*hdr));</div><div class='del'>-	hdr-&gt;opcode = cpu_to_le16(event);</div><div class='del'>-	if (hdev)</div><div class='del'>-		hdr-&gt;index = cpu_to_le16(hdev-&gt;id);</div><div class='del'>-	else</div><div class='del'>-		hdr-&gt;index = cpu_to_le16(MGMT_INDEX_NONE);</div><div class='del'>-	hdr-&gt;len = cpu_to_le16(data_len);</div><div class='add'>+	skb_reserve(skb, sizeof(struct mgmt_hdr));</div><div class='add'>+	bt_cb(skb)-&gt;mgmt.hdev = hdev;</div><div class='add'>+	bt_cb(skb)-&gt;mgmt.opcode = opcode;</div><div class='ctx'> </div><div class='del'>-	if (data)</div><div class='del'>-		skb_put_data(skb, data, data_len);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mgmt_send_event_skb(unsigned short channel, struct sk_buff *skb, int flag,</div><div class='add'>+			struct sock *skip_sk)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	struct mgmt_hdr *hdr;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	hdev = bt_cb(skb)-&gt;mgmt.hdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Time stamp */</div><div class='ctx'> 	__net_timestamp(skb);</div><div class='ctx'> </div><div class='del'>-	hci_send_to_channel(channel, skb, flag, skip_sk);</div><div class='del'>-</div><div class='add'>+	/* Send just the data, without headers, to the monitor */</div><div class='ctx'> 	if (channel == HCI_CHANNEL_CONTROL)</div><div class='del'>-		hci_send_monitor_ctrl_event(hdev, event, data, data_len,</div><div class='add'>+		hci_send_monitor_ctrl_event(hdev, bt_cb(skb)-&gt;mgmt.opcode,</div><div class='add'>+					    skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 					    skb_get_ktime(skb), flag, skip_sk);</div><div class='ctx'> </div><div class='add'>+	hdr = skb_push(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;opcode = cpu_to_le16(bt_cb(skb)-&gt;mgmt.opcode);</div><div class='add'>+	if (hdev)</div><div class='add'>+		hdr-&gt;index = cpu_to_le16(hdev-&gt;id);</div><div class='add'>+	else</div><div class='add'>+		hdr-&gt;index = cpu_to_le16(MGMT_INDEX_NONE);</div><div class='add'>+	hdr-&gt;len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	hci_send_to_channel(channel, skb, flag, skip_sk);</div><div class='add'>+</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mgmt_send_event(u16 event, struct hci_dev *hdev, unsigned short channel,</div><div class='add'>+		    void *data, u16 data_len, int flag, struct sock *skip_sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = mgmt_alloc_skb(hdev, event, data_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		skb_put_data(skb, data, data_len);</div><div class='add'>+</div><div class='add'>+	return mgmt_send_event_skb(channel, skb, flag, skip_sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mgmt_cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *mskb;</div><div class='hunk'>@@ -184,50 +217,50 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,</div><div class='ctx'> struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode,</div><div class='ctx'> 					   struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='add'>+	struct mgmt_pending_cmd *cmd, *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(cmd, &amp;hdev-&gt;mgmt_pending, list) {</div><div class='add'>+	list_for_each_entry_safe(cmd, tmp, &amp;hdev-&gt;mgmt_pending, list) {</div><div class='ctx'> 		if (hci_sock_get_channel(cmd-&gt;sk) != channel)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (cmd-&gt;opcode == opcode)</div><div class='del'>-			return cmd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-struct mgmt_pending_cmd *mgmt_pending_find_data(unsigned short channel,</div><div class='del'>-						u16 opcode,</div><div class='del'>-						struct hci_dev *hdev,</div><div class='del'>-						const void *data)</div><div class='del'>-{</div><div class='del'>-	struct mgmt_pending_cmd *cmd;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(cmd, &amp;hdev-&gt;mgmt_pending, list) {</div><div class='del'>-		if (cmd-&gt;user_data != data)</div><div class='del'>-			continue;</div><div class='del'>-		if (cmd-&gt;opcode == opcode)</div><div class='add'>+		if (cmd-&gt;opcode == opcode) {</div><div class='add'>+			mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> 			return cmd;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev,</div><div class='add'>+void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, bool remove,</div><div class='ctx'> 			  void (*cb)(struct mgmt_pending_cmd *cmd, void *data),</div><div class='ctx'> 			  void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mgmt_pending_cmd *cmd, *tmp;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(cmd, tmp, &amp;hdev-&gt;mgmt_pending, list) {</div><div class='ctx'> 		if (opcode &gt; 0 &amp;&amp; cmd-&gt;opcode != opcode)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (remove)</div><div class='add'>+			list_del(&amp;cmd-&gt;list);</div><div class='add'>+</div><div class='ctx'> 		cb(cmd, data);</div><div class='add'>+</div><div class='add'>+		if (remove)</div><div class='add'>+			mgmt_pending_free(cmd);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,</div><div class='add'>+struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,</div><div class='ctx'> 					  struct hci_dev *hdev,</div><div class='ctx'> 					  void *data, u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -238,7 +271,7 @@ struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;opcode = opcode;</div><div class='del'>-	cmd-&gt;index = hdev-&gt;id;</div><div class='add'>+	cmd-&gt;hdev = hdev;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;param = kmemdup(data, len, GFP_KERNEL);</div><div class='ctx'> 	if (!cmd-&gt;param) {</div><div class='hunk'>@@ -251,7 +284,22 @@ struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,</div><div class='ctx'> 	cmd-&gt;sk = sk;</div><div class='ctx'> 	sock_hold(sk);</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;cmd-&gt;list, &amp;hdev-&gt;mgmt_pending);</div><div class='add'>+	return cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,</div><div class='add'>+					  struct hci_dev *hdev,</div><div class='add'>+					  void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	cmd = mgmt_pending_new(sk, opcode, hdev, data, len);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+	list_add_tail(&amp;cmd-&gt;list, &amp;hdev-&gt;mgmt_pending);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> </div><div class='ctx'> 	return cmd;</div><div class='ctx'> }</div><div class='hunk'>@@ -265,6 +313,129 @@ void mgmt_pending_free(struct mgmt_pending_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> void mgmt_pending_remove(struct mgmt_pending_cmd *cmd)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;cmd-&gt;hdev-&gt;mgmt_pending_lock);</div><div class='ctx'> 	list_del(&amp;cmd-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;cmd-&gt;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='ctx'> 	mgmt_pending_free(cmd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool __mgmt_pending_listed(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_pending_cmd *tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;hdev-&gt;mgmt_pending, list) {</div><div class='add'>+		if (cmd == tmp)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mgmt_pending_listed(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	bool listed;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+	listed = __mgmt_pending_listed(hdev, cmd);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	return listed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mgmt_pending_valid(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	bool listed;</div><div class='add'>+</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	listed = __mgmt_pending_listed(hdev, cmd);</div><div class='add'>+	if (listed)</div><div class='add'>+		list_del(&amp;cmd-&gt;list);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;mgmt_pending_lock);</div><div class='add'>+</div><div class='add'>+	return listed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mgmt_mesh_foreach(struct hci_dev *hdev,</div><div class='add'>+		       void (*cb)(struct mgmt_mesh_tx *mesh_tx, void *data),</div><div class='add'>+		       void *data, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(mesh_tx, tmp, &amp;hdev-&gt;mesh_pending, list) {</div><div class='add'>+		if (!sk || mesh_tx-&gt;sk == sk)</div><div class='add'>+			cb(mesh_tx, data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_next(struct hci_dev *hdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;hdev-&gt;mesh_pending))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mesh_tx, &amp;hdev-&gt;mesh_pending, list) {</div><div class='add'>+		if (!sk || mesh_tx-&gt;sk == sk)</div><div class='add'>+			return mesh_tx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_find(struct hci_dev *hdev, u8 handle)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;hdev-&gt;mesh_pending))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mesh_tx, &amp;hdev-&gt;mesh_pending, list) {</div><div class='add'>+		if (mesh_tx-&gt;handle == handle)</div><div class='add'>+			return mesh_tx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_add(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				   void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct mgmt_mesh_tx *mesh_tx;</div><div class='add'>+</div><div class='add'>+	mesh_tx = kzalloc(sizeof(*mesh_tx), GFP_KERNEL);</div><div class='add'>+	if (!mesh_tx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;mesh_send_ref++;</div><div class='add'>+	if (!hdev-&gt;mesh_send_ref)</div><div class='add'>+		hdev-&gt;mesh_send_ref++;</div><div class='add'>+</div><div class='add'>+	mesh_tx-&gt;handle = hdev-&gt;mesh_send_ref;</div><div class='add'>+	mesh_tx-&gt;index = hdev-&gt;id;</div><div class='add'>+	memcpy(mesh_tx-&gt;param, data, len);</div><div class='add'>+	mesh_tx-&gt;param_len = len;</div><div class='add'>+	mesh_tx-&gt;sk = sk;</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;mesh_tx-&gt;list, &amp;hdev-&gt;mesh_pending);</div><div class='add'>+</div><div class='add'>+	return mesh_tx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mgmt_mesh_remove(struct mgmt_mesh_tx *mesh_tx)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;mesh_tx-&gt;list);</div><div class='add'>+	sock_put(mesh_tx-&gt;sk);</div><div class='add'>+	kfree(mesh_tx);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/mgmt_util.h b/net/bluetooth/mgmt_util.h<br/>index 6559f189213c..bcba8c9d8952 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_util.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/mgmt_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/mgmt_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/mgmt_util.h</a></div><div class='hunk'>@@ -20,17 +20,32 @@</div><div class='ctx'>    SOFTWARE IS DISCLAIMED.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+struct mgmt_mesh_tx {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int index;</div><div class='add'>+	size_t param_len;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	u8 handle;</div><div class='add'>+	u8 instance;</div><div class='add'>+	u8 param[sizeof(struct mgmt_cp_mesh_send) + 31];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mgmt_pending_cmd {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u16 opcode;</div><div class='del'>-	int index;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='ctx'> 	void *param;</div><div class='ctx'> 	size_t param_len;</div><div class='ctx'> 	struct sock *sk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	void *user_data;</div><div class='ctx'> 	int (*cmd_complete)(struct mgmt_pending_cmd *cmd, u8 status);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sk_buff *mgmt_alloc_skb(struct hci_dev *hdev, u16 opcode,</div><div class='add'>+			       unsigned int size);</div><div class='add'>+int mgmt_send_event_skb(unsigned short channel, struct sk_buff *skb, int flag,</div><div class='add'>+			struct sock *skip_sk);</div><div class='ctx'> int mgmt_send_event(u16 event, struct hci_dev *hdev, unsigned short channel,</div><div class='ctx'> 		    void *data, u16 data_len, int flag, struct sock *skip_sk);</div><div class='ctx'> int mgmt_cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status);</div><div class='hunk'>@@ -39,15 +54,25 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,</div><div class='ctx'> </div><div class='ctx'> struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode,</div><div class='ctx'> 					   struct hci_dev *hdev);</div><div class='del'>-struct mgmt_pending_cmd *mgmt_pending_find_data(unsigned short channel,</div><div class='del'>-						u16 opcode,</div><div class='del'>-						struct hci_dev *hdev,</div><div class='del'>-						const void *data);</div><div class='del'>-void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev,</div><div class='add'>+void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, bool remove,</div><div class='ctx'> 			  void (*cb)(struct mgmt_pending_cmd *cmd, void *data),</div><div class='ctx'> 			  void *data);</div><div class='ctx'> struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,</div><div class='ctx'> 					  struct hci_dev *hdev,</div><div class='ctx'> 					  void *data, u16 len);</div><div class='add'>+struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,</div><div class='add'>+					  struct hci_dev *hdev,</div><div class='add'>+					  void *data, u16 len);</div><div class='ctx'> void mgmt_pending_free(struct mgmt_pending_cmd *cmd);</div><div class='ctx'> void mgmt_pending_remove(struct mgmt_pending_cmd *cmd);</div><div class='add'>+bool __mgmt_pending_listed(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd);</div><div class='add'>+bool mgmt_pending_listed(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd);</div><div class='add'>+bool mgmt_pending_valid(struct hci_dev *hdev, struct mgmt_pending_cmd *cmd);</div><div class='add'>+void mgmt_mesh_foreach(struct hci_dev *hdev,</div><div class='add'>+		       void (*cb)(struct mgmt_mesh_tx *mesh_tx, void *data),</div><div class='add'>+		       void *data, struct sock *sk);</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_find(struct hci_dev *hdev, u8 handle);</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_next(struct hci_dev *hdev, struct sock *sk);</div><div class='add'>+struct mgmt_mesh_tx *mgmt_mesh_add(struct sock *sk, struct hci_dev *hdev,</div><div class='add'>+				   void *data, u16 len);</div><div class='add'>+void mgmt_mesh_remove(struct mgmt_mesh_tx *mesh_tx);</div><div class='head'>diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c<br/>new file mode 100644<br/>index 000000000000..c560d8467669<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/msft.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/msft.c</a></div><div class='hunk'>@@ -0,0 +1,1201 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/mgmt.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mgmt_util.h"</div><div class='add'>+#include "msft.h"</div><div class='add'>+</div><div class='add'>+#define MSFT_RSSI_THRESHOLD_VALUE_MIN		-127</div><div class='add'>+#define MSFT_RSSI_THRESHOLD_VALUE_MAX		20</div><div class='add'>+#define MSFT_RSSI_LOW_TIMEOUT_MAX		0x3C</div><div class='add'>+</div><div class='add'>+#define MSFT_OP_READ_SUPPORTED_FEATURES		0x00</div><div class='add'>+struct msft_cp_read_supported_features {</div><div class='add'>+	__u8   sub_opcode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct msft_rp_read_supported_features {</div><div class='add'>+	__u8   status;</div><div class='add'>+	__u8   sub_opcode;</div><div class='add'>+	__le64 features;</div><div class='add'>+	__u8   evt_prefix_len;</div><div class='add'>+	__u8   evt_prefix[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MSFT_OP_LE_MONITOR_ADVERTISEMENT	0x03</div><div class='add'>+#define MSFT_MONITOR_ADVERTISEMENT_TYPE_PATTERN	0x01</div><div class='add'>+struct msft_le_monitor_advertisement_pattern {</div><div class='add'>+	__u8 length;</div><div class='add'>+	__u8 data_type;</div><div class='add'>+	__u8 start_byte;</div><div class='add'>+	__u8 pattern[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msft_le_monitor_advertisement_pattern_data {</div><div class='add'>+	__u8 count;</div><div class='add'>+	__u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msft_cp_le_monitor_advertisement {</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+	__s8 rssi_high;</div><div class='add'>+	__s8 rssi_low;</div><div class='add'>+	__u8 rssi_low_interval;</div><div class='add'>+	__u8 rssi_sampling_period;</div><div class='add'>+	__u8 cond_type;</div><div class='add'>+	__u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct msft_rp_le_monitor_advertisement {</div><div class='add'>+	__u8 status;</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+	__u8 handle;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MSFT_OP_LE_CANCEL_MONITOR_ADVERTISEMENT	0x04</div><div class='add'>+struct msft_cp_le_cancel_monitor_advertisement {</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+	__u8 handle;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct msft_rp_le_cancel_monitor_advertisement {</div><div class='add'>+	__u8 status;</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MSFT_OP_LE_SET_ADVERTISEMENT_FILTER_ENABLE	0x05</div><div class='add'>+struct msft_cp_le_set_advertisement_filter_enable {</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+	__u8 enable;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct msft_rp_le_set_advertisement_filter_enable {</div><div class='add'>+	__u8 status;</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MSFT_EV_LE_MONITOR_DEVICE	0x02</div><div class='add'>+struct msft_ev_le_monitor_device {</div><div class='add'>+	__u8     addr_type;</div><div class='add'>+	bdaddr_t bdaddr;</div><div class='add'>+	__u8     monitor_handle;</div><div class='add'>+	__u8     monitor_state;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct msft_monitor_advertisement_handle_data {</div><div class='add'>+	__u8  msft_handle;</div><div class='add'>+	__u16 mgmt_handle;</div><div class='add'>+	__s8 rssi_high;</div><div class='add'>+	__s8 rssi_low;</div><div class='add'>+	__u8 rssi_low_interval;</div><div class='add'>+	__u8 rssi_sampling_period;</div><div class='add'>+	__u8 cond_type;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum monitor_addr_filter_state {</div><div class='add'>+	AF_STATE_IDLE,</div><div class='add'>+	AF_STATE_ADDING,</div><div class='add'>+	AF_STATE_ADDED,</div><div class='add'>+	AF_STATE_REMOVING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MSFT_MONITOR_ADVERTISEMENT_TYPE_ADDR	0x04</div><div class='add'>+struct msft_monitor_addr_filter_data {</div><div class='add'>+	__u8     msft_handle;</div><div class='add'>+	__u8     pattern_handle; /* address filters pertain to */</div><div class='add'>+	__u16    mgmt_handle;</div><div class='add'>+	int      state;</div><div class='add'>+	__s8     rssi_high;</div><div class='add'>+	__s8     rssi_low;</div><div class='add'>+	__u8     rssi_low_interval;</div><div class='add'>+	__u8     rssi_sampling_period;</div><div class='add'>+	__u8     addr_type;</div><div class='add'>+	bdaddr_t bdaddr;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msft_data {</div><div class='add'>+	__u64 features;</div><div class='add'>+	__u8  evt_prefix_len;</div><div class='add'>+	__u8  *evt_prefix;</div><div class='add'>+	struct list_head handle_map;</div><div class='add'>+	struct list_head address_filters;</div><div class='add'>+	__u8 resuming;</div><div class='add'>+	__u8 suspending;</div><div class='add'>+	__u8 filter_enabled;</div><div class='add'>+	/* To synchronize add/remove address filter and monitor device event.*/</div><div class='add'>+	struct mutex filter_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool msft_monitor_supported(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return !!(msft_get_features(hdev) &amp; MSFT_FEATURE_MASK_LE_ADV_MONITOR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool read_supported_features(struct hci_dev *hdev,</div><div class='add'>+				    struct msft_data *msft)</div><div class='add'>+{</div><div class='add'>+	struct msft_cp_read_supported_features cp;</div><div class='add'>+	struct msft_rp_read_supported_features *rp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	cp.sub_opcode = MSFT_OP_READ_SUPPORTED_FEATURES;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, sizeof(cp), &amp;cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to read MSFT supported features (%ld)",</div><div class='add'>+			   PTR_ERR(skb));</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*rp)) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT supported features length mismatch");</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rp = (struct msft_rp_read_supported_features *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;sub_opcode != MSFT_OP_READ_SUPPORTED_FEATURES)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;evt_prefix_len &gt; 0) {</div><div class='add'>+		msft-&gt;evt_prefix = kmemdup(rp-&gt;evt_prefix, rp-&gt;evt_prefix_len,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!msft-&gt;evt_prefix)</div><div class='add'>+			goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msft-&gt;evt_prefix_len = rp-&gt;evt_prefix_len;</div><div class='add'>+	msft-&gt;features = __le64_to_cpu(rp-&gt;features);</div><div class='add'>+</div><div class='add'>+	if (msft-&gt;features &amp; MSFT_FEATURE_MASK_CURVE_VALIDITY)</div><div class='add'>+		hdev-&gt;msft_curve_validity = true;</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* is_mgmt = true matches the handle exposed to userspace via mgmt.</div><div class='add'>+ * is_mgmt = false matches the handle used by the msft controller.</div><div class='add'>+ * This function requires the caller holds hdev-&gt;lock</div><div class='add'>+ */</div><div class='add'>+static struct msft_monitor_advertisement_handle_data *msft_find_handle_data</div><div class='add'>+				(struct hci_dev *hdev, u16 handle, bool is_mgmt)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *entry;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;msft-&gt;handle_map, list) {</div><div class='add'>+		if (is_mgmt &amp;&amp; entry-&gt;mgmt_handle == handle)</div><div class='add'>+			return entry;</div><div class='add'>+		if (!is_mgmt &amp;&amp; entry-&gt;msft_handle == handle)</div><div class='add'>+			return entry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds msft-&gt;filter_lock */</div><div class='add'>+static struct msft_monitor_addr_filter_data *msft_find_address_data</div><div class='add'>+			(struct hci_dev *hdev, u8 addr_type, bdaddr_t *addr,</div><div class='add'>+			 u8 pattern_handle)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *entry;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;msft-&gt;address_filters, list) {</div><div class='add'>+		if (entry-&gt;pattern_handle == pattern_handle &amp;&amp;</div><div class='add'>+		    addr_type == entry-&gt;addr_type &amp;&amp;</div><div class='add'>+		    !bacmp(addr, &amp;entry-&gt;bdaddr))</div><div class='add'>+			return entry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static int msft_monitor_device_del(struct hci_dev *hdev, __u16 mgmt_handle,</div><div class='add'>+				   bdaddr_t *bdaddr, __u8 addr_type,</div><div class='add'>+				   bool notify)</div><div class='add'>+{</div><div class='add'>+	struct monitored_device *dev, *tmp;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(dev, tmp, &amp;hdev-&gt;monitored_devices, list) {</div><div class='add'>+		/* mgmt_handle == 0 indicates remove all devices, whereas,</div><div class='add'>+		 * bdaddr == NULL indicates remove all devices matching the</div><div class='add'>+		 * mgmt_handle.</div><div class='add'>+		 */</div><div class='add'>+		if ((!mgmt_handle || dev-&gt;handle == mgmt_handle) &amp;&amp;</div><div class='add'>+		    (!bdaddr || (!bacmp(bdaddr, &amp;dev-&gt;bdaddr) &amp;&amp;</div><div class='add'>+				 addr_type == dev-&gt;addr_type))) {</div><div class='add'>+			if (notify &amp;&amp; dev-&gt;notified) {</div><div class='add'>+				mgmt_adv_monitor_device_lost(hdev, dev-&gt;handle,</div><div class='add'>+							     &amp;dev-&gt;bdaddr,</div><div class='add'>+							     dev-&gt;addr_type);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			list_del(&amp;dev-&gt;list);</div><div class='add'>+			kfree(dev);</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msft_le_monitor_advertisement_cb(struct hci_dev *hdev, u16 opcode,</div><div class='add'>+					    struct adv_monitor *monitor,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct msft_rp_le_monitor_advertisement *rp;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	rp = (struct msft_rp_le_monitor_advertisement *)skb-&gt;data;</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*rp)) {</div><div class='add'>+		status = HCI_ERROR_UNSPECIFIED;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = rp-&gt;status;</div><div class='add'>+	if (status)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	handle_data = kmalloc(sizeof(*handle_data), GFP_KERNEL);</div><div class='add'>+	if (!handle_data) {</div><div class='add'>+		status = HCI_ERROR_UNSPECIFIED;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	handle_data-&gt;mgmt_handle = monitor-&gt;handle;</div><div class='add'>+	handle_data-&gt;msft_handle = rp-&gt;handle;</div><div class='add'>+	handle_data-&gt;cond_type   = MSFT_MONITOR_ADVERTISEMENT_TYPE_PATTERN;</div><div class='add'>+	INIT_LIST_HEAD(&amp;handle_data-&gt;list);</div><div class='add'>+	list_add(&amp;handle_data-&gt;list, &amp;msft-&gt;handle_map);</div><div class='add'>+</div><div class='add'>+	monitor-&gt;state = ADV_MONITOR_STATE_OFFLOADED;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	if (status)</div><div class='add'>+		hci_free_adv_monitor(hdev, monitor);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+static void msft_remove_addr_filters_sync(struct hci_dev *hdev, u8 handle)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *address_filter, *n;</div><div class='add'>+	struct msft_cp_le_cancel_monitor_advertisement cp;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	struct list_head head;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;head);</div><div class='add'>+</div><div class='add'>+	/* Cancel all corresponding address monitors */</div><div class='add'>+	mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(address_filter, n, &amp;msft-&gt;address_filters,</div><div class='add'>+				 list) {</div><div class='add'>+		if (address_filter-&gt;pattern_handle != handle)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+</div><div class='add'>+		/* Keep the address filter and let</div><div class='add'>+		 * msft_add_address_filter_sync() remove and free the address</div><div class='add'>+		 * filter.</div><div class='add'>+		 */</div><div class='add'>+		if (address_filter-&gt;state == AF_STATE_ADDING) {</div><div class='add'>+			address_filter-&gt;state = AF_STATE_REMOVING;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Keep the address filter and let</div><div class='add'>+		 * msft_cancel_address_filter_sync() remove and free the address</div><div class='add'>+		 * filter</div><div class='add'>+		 */</div><div class='add'>+		if (address_filter-&gt;state == AF_STATE_REMOVING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;address_filter-&gt;list, &amp;head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(address_filter, n, &amp;head, list) {</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+</div><div class='add'>+		cp.sub_opcode = MSFT_OP_LE_CANCEL_MONITOR_ADVERTISEMENT;</div><div class='add'>+		cp.handle = address_filter-&gt;msft_handle;</div><div class='add'>+</div><div class='add'>+		skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, sizeof(cp), &amp;cp,</div><div class='add'>+				     HCI_CMD_TIMEOUT);</div><div class='add'>+		if (IS_ERR(skb)) {</div><div class='add'>+			kfree(address_filter);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+		bt_dev_dbg(hdev, "MSFT: Canceled device %pMR address filter",</div><div class='add'>+			   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+		kfree(address_filter);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msft_le_cancel_monitor_advertisement_cb(struct hci_dev *hdev,</div><div class='add'>+						   u16 opcode,</div><div class='add'>+						   struct adv_monitor *monitor,</div><div class='add'>+						   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct msft_rp_le_cancel_monitor_advertisement *rp;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	int status = 0;</div><div class='add'>+	u8 msft_handle;</div><div class='add'>+</div><div class='add'>+	rp = (struct msft_rp_le_cancel_monitor_advertisement *)skb-&gt;data;</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*rp)) {</div><div class='add'>+		status = HCI_ERROR_UNSPECIFIED;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = rp-&gt;status;</div><div class='add'>+	if (status)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	handle_data = msft_find_handle_data(hdev, monitor-&gt;handle, true);</div><div class='add'>+</div><div class='add'>+	if (handle_data) {</div><div class='add'>+		if (monitor-&gt;state == ADV_MONITOR_STATE_OFFLOADED)</div><div class='add'>+			monitor-&gt;state = ADV_MONITOR_STATE_REGISTERED;</div><div class='add'>+</div><div class='add'>+		/* Do not free the monitor if it is being removed due to</div><div class='add'>+		 * suspend. It will be re-monitored on resume.</div><div class='add'>+		 */</div><div class='add'>+		if (!msft-&gt;suspending) {</div><div class='add'>+			hci_free_adv_monitor(hdev, monitor);</div><div class='add'>+</div><div class='add'>+			/* Clear any monitored devices by this Adv Monitor */</div><div class='add'>+			msft_monitor_device_del(hdev, handle_data-&gt;mgmt_handle,</div><div class='add'>+						NULL, 0, false);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msft_handle = handle_data-&gt;msft_handle;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;handle_data-&gt;list);</div><div class='add'>+		kfree(handle_data);</div><div class='add'>+</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+		msft_remove_addr_filters_sync(hdev, msft_handle);</div><div class='add'>+	} else {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+static int msft_remove_monitor_sync(struct hci_dev *hdev,</div><div class='add'>+				    struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct msft_cp_le_cancel_monitor_advertisement cp;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	handle_data = msft_find_handle_data(hdev, monitor-&gt;handle, true);</div><div class='add'>+</div><div class='add'>+	/* If no matched handle, just remove without telling controller */</div><div class='add'>+	if (!handle_data)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	cp.sub_opcode = MSFT_OP_LE_CANCEL_MONITOR_ADVERTISEMENT;</div><div class='add'>+	cp.handle = handle_data-&gt;msft_handle;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, sizeof(cp), &amp;cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	return msft_le_cancel_monitor_advertisement_cb(hdev, hdev-&gt;msft_opcode,</div><div class='add'>+						       monitor, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int msft_suspend_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+	int handle = 0;</div><div class='add'>+</div><div class='add'>+	if (!msft || !msft_monitor_supported(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	msft-&gt;suspending = true;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		monitor = idr_get_next(&amp;hdev-&gt;adv_monitors_idr, &amp;handle);</div><div class='add'>+		if (!monitor)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msft_remove_monitor_sync(hdev, monitor);</div><div class='add'>+</div><div class='add'>+		handle++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All monitors have been removed */</div><div class='add'>+	msft-&gt;suspending = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool msft_monitor_rssi_valid(struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct adv_rssi_thresholds *r = &amp;monitor-&gt;rssi;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;high_threshold &lt; MSFT_RSSI_THRESHOLD_VALUE_MIN ||</div><div class='add'>+	    r-&gt;high_threshold &gt; MSFT_RSSI_THRESHOLD_VALUE_MAX ||</div><div class='add'>+	    r-&gt;low_threshold &lt; MSFT_RSSI_THRESHOLD_VALUE_MIN ||</div><div class='add'>+	    r-&gt;low_threshold &gt; MSFT_RSSI_THRESHOLD_VALUE_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* High_threshold_timeout is not supported,</div><div class='add'>+	 * once high_threshold is reached, events are immediately reported.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;high_threshold_timeout != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;low_threshold_timeout &gt; MSFT_RSSI_LOW_TIMEOUT_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Sampling period from 0x00 to 0xFF are all allowed */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool msft_monitor_pattern_valid(struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	return msft_monitor_rssi_valid(monitor);</div><div class='add'>+	/* No additional check needed for pattern-based monitor */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msft_add_monitor_sync(struct hci_dev *hdev,</div><div class='add'>+				 struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct msft_cp_le_monitor_advertisement *cp;</div><div class='add'>+	struct msft_le_monitor_advertisement_pattern_data *pattern_data;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data;</div><div class='add'>+	struct msft_le_monitor_advertisement_pattern *pattern;</div><div class='add'>+	struct adv_pattern *entry;</div><div class='add'>+	size_t total_size = sizeof(*cp) + sizeof(*pattern_data);</div><div class='add'>+	ptrdiff_t offset = 0;</div><div class='add'>+	u8 pattern_count = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!msft_monitor_pattern_valid(monitor))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;monitor-&gt;patterns, list) {</div><div class='add'>+		pattern_count++;</div><div class='add'>+		total_size += sizeof(*pattern) + entry-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp = kmalloc(total_size, GFP_KERNEL);</div><div class='add'>+	if (!cp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cp-&gt;sub_opcode = MSFT_OP_LE_MONITOR_ADVERTISEMENT;</div><div class='add'>+	cp-&gt;rssi_high = monitor-&gt;rssi.high_threshold;</div><div class='add'>+	cp-&gt;rssi_low = monitor-&gt;rssi.low_threshold;</div><div class='add'>+	cp-&gt;rssi_low_interval = (u8)monitor-&gt;rssi.low_threshold_timeout;</div><div class='add'>+	cp-&gt;rssi_sampling_period = monitor-&gt;rssi.sampling_period;</div><div class='add'>+</div><div class='add'>+	cp-&gt;cond_type = MSFT_MONITOR_ADVERTISEMENT_TYPE_PATTERN;</div><div class='add'>+</div><div class='add'>+	pattern_data = (void *)cp-&gt;data;</div><div class='add'>+	pattern_data-&gt;count = pattern_count;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;monitor-&gt;patterns, list) {</div><div class='add'>+		pattern = (void *)(pattern_data-&gt;data + offset);</div><div class='add'>+		/* the length also includes data_type and offset */</div><div class='add'>+		pattern-&gt;length = entry-&gt;length + 2;</div><div class='add'>+		pattern-&gt;data_type = entry-&gt;ad_type;</div><div class='add'>+		pattern-&gt;start_byte = entry-&gt;offset;</div><div class='add'>+		memcpy(pattern-&gt;pattern, entry-&gt;value, entry-&gt;length);</div><div class='add'>+		offset += sizeof(*pattern) + entry-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, total_size, cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		err = PTR_ERR(skb);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = msft_le_monitor_advertisement_cb(hdev, hdev-&gt;msft_opcode,</div><div class='add'>+					       monitor, skb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	handle_data = msft_find_handle_data(hdev, monitor-&gt;handle, true);</div><div class='add'>+	if (!handle_data) {</div><div class='add'>+		err = -ENODATA;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	handle_data-&gt;rssi_high	= cp-&gt;rssi_high;</div><div class='add'>+	handle_data-&gt;rssi_low	= cp-&gt;rssi_low;</div><div class='add'>+	handle_data-&gt;rssi_low_interval	  = cp-&gt;rssi_low_interval;</div><div class='add'>+	handle_data-&gt;rssi_sampling_period = cp-&gt;rssi_sampling_period;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(cp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+static void reregister_monitor(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	int handle = 0;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msft-&gt;resuming = true;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		monitor = idr_get_next(&amp;hdev-&gt;adv_monitors_idr, &amp;handle);</div><div class='add'>+		if (!monitor)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msft_add_monitor_sync(hdev, monitor);</div><div class='add'>+</div><div class='add'>+		handle++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All monitors have been reregistered */</div><div class='add'>+	msft-&gt;resuming = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int msft_resume_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	if (!msft || !msft_monitor_supported(hdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Clear already tracked devices on resume. Once the monitors are</div><div class='add'>+	 * reregistered, devices in range will be found again after resume.</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;advmon_pend_notify = false;</div><div class='add'>+	msft_monitor_device_del(hdev, 0, NULL, 0, true);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	reregister_monitor(hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+void msft_do_open(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;msft_opcode == HCI_OP_NOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!msft) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT extension not registered");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Initialize MSFT extension");</div><div class='add'>+</div><div class='add'>+	/* Reset existing MSFT data before re-reading */</div><div class='add'>+	kfree(msft-&gt;evt_prefix);</div><div class='add'>+	msft-&gt;evt_prefix = NULL;</div><div class='add'>+	msft-&gt;evt_prefix_len = 0;</div><div class='add'>+	msft-&gt;features = 0;</div><div class='add'>+</div><div class='add'>+	if (!read_supported_features(hdev, msft)) {</div><div class='add'>+		hdev-&gt;msft_data = NULL;</div><div class='add'>+		kfree(msft);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msft_monitor_supported(hdev)) {</div><div class='add'>+		msft-&gt;resuming = true;</div><div class='add'>+		msft_set_filter_enable(hdev, true);</div><div class='add'>+		/* Monitors get removed on power off, so we need to explicitly</div><div class='add'>+		 * tell the controller to re-monitor.</div><div class='add'>+		 */</div><div class='add'>+		reregister_monitor(hdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msft_do_close(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data, *tmp;</div><div class='add'>+	struct msft_monitor_addr_filter_data *address_filter, *n;</div><div class='add'>+	struct adv_monitor *monitor;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Cleanup of MSFT extension");</div><div class='add'>+</div><div class='add'>+	/* The controller will silently remove all monitors on power off.</div><div class='add'>+	 * Therefore, remove handle_data mapping and reset monitor state.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(handle_data, tmp, &amp;msft-&gt;handle_map, list) {</div><div class='add'>+		monitor = idr_find(&amp;hdev-&gt;adv_monitors_idr,</div><div class='add'>+				   handle_data-&gt;mgmt_handle);</div><div class='add'>+</div><div class='add'>+		if (monitor &amp;&amp; monitor-&gt;state == ADV_MONITOR_STATE_OFFLOADED)</div><div class='add'>+			monitor-&gt;state = ADV_MONITOR_STATE_REGISTERED;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;handle_data-&gt;list);</div><div class='add'>+		kfree(handle_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+	list_for_each_entry_safe(address_filter, n, &amp;msft-&gt;address_filters,</div><div class='add'>+				 list) {</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+		kfree(address_filter);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Clear any devices that are being monitored and notify device lost */</div><div class='add'>+	hdev-&gt;advmon_pend_notify = false;</div><div class='add'>+	msft_monitor_device_del(hdev, 0, NULL, 0, true);</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msft_cancel_address_filter_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *address_filter = data;</div><div class='add'>+	struct msft_cp_le_cancel_monitor_advertisement cp;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!msft) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT: msft data is freed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The address filter has been removed by hci dev close */</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+	list_del(&amp;address_filter-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	cp.sub_opcode = MSFT_OP_LE_CANCEL_MONITOR_ADVERTISEMENT;</div><div class='add'>+	cp.handle = address_filter-&gt;msft_handle;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, sizeof(cp), &amp;cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT: Failed to cancel address (%pMR) filter",</div><div class='add'>+			   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+		err = PTR_ERR(skb);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "MSFT: Canceled device %pMR address filter",</div><div class='add'>+		   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	kfree(address_filter);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msft_register(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = NULL;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Register MSFT extension");</div><div class='add'>+</div><div class='add'>+	msft = kzalloc(sizeof(*msft), GFP_KERNEL);</div><div class='add'>+	if (!msft) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to register MSFT extension");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;msft-&gt;handle_map);</div><div class='add'>+	INIT_LIST_HEAD(&amp;msft-&gt;address_filters);</div><div class='add'>+	hdev-&gt;msft_data = msft;</div><div class='add'>+	mutex_init(&amp;msft-&gt;filter_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msft_release(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "Unregister MSFT extension");</div><div class='add'>+</div><div class='add'>+	hdev-&gt;msft_data = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(msft-&gt;evt_prefix);</div><div class='add'>+	mutex_destroy(&amp;msft-&gt;filter_lock);</div><div class='add'>+	kfree(msft);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static void msft_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='add'>+			      __u8 addr_type, __u16 mgmt_handle)</div><div class='add'>+{</div><div class='add'>+	struct monitored_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = kmalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT vendor event %u: no memory",</div><div class='add'>+			   MSFT_EV_LE_MONITOR_DEVICE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bacpy(&amp;dev-&gt;bdaddr, bdaddr);</div><div class='add'>+	dev-&gt;addr_type = addr_type;</div><div class='add'>+	dev-&gt;handle = mgmt_handle;</div><div class='add'>+	dev-&gt;notified = false;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;list);</div><div class='add'>+	list_add(&amp;dev-&gt;list, &amp;hdev-&gt;monitored_devices);</div><div class='add'>+	hdev-&gt;advmon_pend_notify = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static void msft_device_lost(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='add'>+			     __u8 addr_type, __u16 mgmt_handle)</div><div class='add'>+{</div><div class='add'>+	if (!msft_monitor_device_del(hdev, mgmt_handle, bdaddr, addr_type,</div><div class='add'>+				     true)) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT vendor event %u: dev %pMR not in list",</div><div class='add'>+			   MSFT_EV_LE_MONITOR_DEVICE, bdaddr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *msft_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,</div><div class='add'>+			   u8 ev, size_t len)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	data = skb_pull_data(skb, len);</div><div class='add'>+	if (!data)</div><div class='add'>+		bt_dev_err(hdev, "Malformed MSFT vendor event: 0x%02x", ev);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msft_add_address_filter_sync(struct hci_dev *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *address_filter = data;</div><div class='add'>+	struct msft_rp_le_monitor_advertisement *rp;</div><div class='add'>+	struct msft_cp_le_monitor_advertisement *cp;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	bool remove = false;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!msft) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT: msft data is freed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The address filter has been removed by hci dev close */</div><div class='add'>+	if (!test_bit(HCI_UP, &amp;hdev-&gt;flags))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* We are safe to use the address filter from now on.</div><div class='add'>+	 * msft_monitor_device_evt() wouldn't delete this filter because it's</div><div class='add'>+	 * not been added by now.</div><div class='add'>+	 * And all other functions that requiring hci_req_sync_lock wouldn't</div><div class='add'>+	 * touch this filter before this func completes because it's protected</div><div class='add'>+	 * by hci_req_sync_lock.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (address_filter-&gt;state == AF_STATE_REMOVING) {</div><div class='add'>+		mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+		mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+		kfree(address_filter);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = sizeof(*cp) +</div><div class='add'>+	       sizeof(address_filter-&gt;addr_type) +</div><div class='add'>+	       sizeof(address_filter-&gt;bdaddr);</div><div class='add'>+	cp = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!cp) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT: Alloc cmd param err");</div><div class='add'>+		remove = true;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp-&gt;sub_opcode           = MSFT_OP_LE_MONITOR_ADVERTISEMENT;</div><div class='add'>+	cp-&gt;rssi_high		 = address_filter-&gt;rssi_high;</div><div class='add'>+	cp-&gt;rssi_low		 = address_filter-&gt;rssi_low;</div><div class='add'>+	cp-&gt;rssi_low_interval    = address_filter-&gt;rssi_low_interval;</div><div class='add'>+	cp-&gt;rssi_sampling_period = address_filter-&gt;rssi_sampling_period;</div><div class='add'>+	cp-&gt;cond_type            = MSFT_MONITOR_ADVERTISEMENT_TYPE_ADDR;</div><div class='add'>+	cp-&gt;data[0]              = address_filter-&gt;addr_type;</div><div class='add'>+	memcpy(&amp;cp-&gt;data[1], &amp;address_filter-&gt;bdaddr,</div><div class='add'>+	       sizeof(address_filter-&gt;bdaddr));</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, hdev-&gt;msft_opcode, size, cp,</div><div class='add'>+			     HCI_CMD_TIMEOUT);</div><div class='add'>+	kfree(cp);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to enable address %pMR filter",</div><div class='add'>+			   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+		skb = NULL;</div><div class='add'>+		remove = true;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rp = skb_pull_data(skb, sizeof(*rp));</div><div class='add'>+	if (!rp || rp-&gt;sub_opcode != MSFT_OP_LE_MONITOR_ADVERTISEMENT ||</div><div class='add'>+	    rp-&gt;status)</div><div class='add'>+		remove = true;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	if (remove) {</div><div class='add'>+		bt_dev_warn(hdev, "MSFT: Remove address (%pMR) filter",</div><div class='add'>+			    &amp;address_filter-&gt;bdaddr);</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+		kfree(address_filter);</div><div class='add'>+	} else {</div><div class='add'>+		address_filter-&gt;state = AF_STATE_ADDED;</div><div class='add'>+		address_filter-&gt;msft_handle = rp-&gt;handle;</div><div class='add'>+		bt_dev_dbg(hdev, "MSFT: Address %pMR filter enabled",</div><div class='add'>+			   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds msft-&gt;filter_lock */</div><div class='add'>+static struct msft_monitor_addr_filter_data *msft_add_address_filter</div><div class='add'>+		(struct hci_dev *hdev, u8 addr_type, bdaddr_t *bdaddr,</div><div class='add'>+		 struct msft_monitor_advertisement_handle_data *handle_data)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *address_filter = NULL;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	address_filter = kzalloc(sizeof(*address_filter), GFP_KERNEL);</div><div class='add'>+	if (!address_filter)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	address_filter-&gt;state             = AF_STATE_ADDING;</div><div class='add'>+	address_filter-&gt;msft_handle       = 0xff;</div><div class='add'>+	address_filter-&gt;pattern_handle    = handle_data-&gt;msft_handle;</div><div class='add'>+	address_filter-&gt;mgmt_handle       = handle_data-&gt;mgmt_handle;</div><div class='add'>+	address_filter-&gt;rssi_high         = handle_data-&gt;rssi_high;</div><div class='add'>+	address_filter-&gt;rssi_low          = handle_data-&gt;rssi_low;</div><div class='add'>+	address_filter-&gt;rssi_low_interval = handle_data-&gt;rssi_low_interval;</div><div class='add'>+	address_filter-&gt;rssi_sampling_period = handle_data-&gt;rssi_sampling_period;</div><div class='add'>+	address_filter-&gt;addr_type            = addr_type;</div><div class='add'>+	bacpy(&amp;address_filter-&gt;bdaddr, bdaddr);</div><div class='add'>+</div><div class='add'>+	/* With the above AF_STATE_ADDING, duplicated address filter can be</div><div class='add'>+	 * avoided when receiving monitor device event (found/lost) frequently</div><div class='add'>+	 * for the same device.</div><div class='add'>+	 */</div><div class='add'>+	list_add_tail(&amp;address_filter-&gt;list, &amp;msft-&gt;address_filters);</div><div class='add'>+</div><div class='add'>+	err = hci_cmd_sync_queue(hdev, msft_add_address_filter_sync,</div><div class='add'>+				 address_filter, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "MSFT: Add address %pMR filter err", bdaddr);</div><div class='add'>+		list_del(&amp;address_filter-&gt;list);</div><div class='add'>+		kfree(address_filter);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev, "MSFT: Add device %pMR address filter",</div><div class='add'>+		   &amp;address_filter-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+	return address_filter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hdev-&gt;lock */</div><div class='add'>+static void msft_monitor_device_evt(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct msft_monitor_addr_filter_data *n, *address_filter = NULL;</div><div class='add'>+	struct msft_ev_le_monitor_device *ev;</div><div class='add'>+	struct msft_monitor_advertisement_handle_data *handle_data;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	u16 mgmt_handle = 0xffff;</div><div class='add'>+	u8 addr_type;</div><div class='add'>+</div><div class='add'>+	ev = msft_skb_pull(hdev, skb, MSFT_EV_LE_MONITOR_DEVICE, sizeof(*ev));</div><div class='add'>+	if (!ev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bt_dev_dbg(hdev,</div><div class='add'>+		   "MSFT vendor event 0x%02x: handle 0x%04x state %d addr %pMR",</div><div class='add'>+		   MSFT_EV_LE_MONITOR_DEVICE, ev-&gt;monitor_handle,</div><div class='add'>+		   ev-&gt;monitor_state, &amp;ev-&gt;bdaddr);</div><div class='add'>+</div><div class='add'>+	handle_data = msft_find_handle_data(hdev, ev-&gt;monitor_handle, false);</div><div class='add'>+</div><div class='add'>+	if (!hci_test_quirk(hdev, HCI_QUIRK_USE_MSFT_EXT_ADDRESS_FILTER)) {</div><div class='add'>+		if (!handle_data)</div><div class='add'>+			return;</div><div class='add'>+		mgmt_handle = handle_data-&gt;mgmt_handle;</div><div class='add'>+		goto report_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (handle_data) {</div><div class='add'>+		/* Don't report any device found/lost event from pattern</div><div class='add'>+		 * monitors. Pattern monitor always has its address filters for</div><div class='add'>+		 * tracking devices.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		address_filter = msft_find_address_data(hdev, ev-&gt;addr_type,</div><div class='add'>+							&amp;ev-&gt;bdaddr,</div><div class='add'>+							handle_data-&gt;msft_handle);</div><div class='add'>+		if (address_filter)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (ev-&gt;monitor_state &amp;&amp; handle_data-&gt;cond_type ==</div><div class='add'>+				MSFT_MONITOR_ADVERTISEMENT_TYPE_PATTERN)</div><div class='add'>+			msft_add_address_filter(hdev, ev-&gt;addr_type,</div><div class='add'>+						&amp;ev-&gt;bdaddr, handle_data);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This device event is not from pattern monitor.</div><div class='add'>+	 * Report it if there is a corresponding address_filter for it.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(n, &amp;msft-&gt;address_filters, list) {</div><div class='add'>+		if (n-&gt;state == AF_STATE_ADDED &amp;&amp;</div><div class='add'>+		    n-&gt;msft_handle == ev-&gt;monitor_handle) {</div><div class='add'>+			mgmt_handle = n-&gt;mgmt_handle;</div><div class='add'>+			address_filter = n;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!address_filter) {</div><div class='add'>+		bt_dev_warn(hdev, "MSFT: Unexpected device event %pMR, %u, %u",</div><div class='add'>+			    &amp;ev-&gt;bdaddr, ev-&gt;monitor_handle, ev-&gt;monitor_state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+report_state:</div><div class='add'>+	switch (ev-&gt;addr_type) {</div><div class='add'>+	case ADDR_LE_DEV_PUBLIC:</div><div class='add'>+		addr_type = BDADDR_LE_PUBLIC;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ADDR_LE_DEV_RANDOM:</div><div class='add'>+		addr_type = BDADDR_LE_RANDOM;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		bt_dev_err(hdev,</div><div class='add'>+			   "MSFT vendor event 0x%02x: unknown addr type 0x%02x",</div><div class='add'>+			   MSFT_EV_LE_MONITOR_DEVICE, ev-&gt;addr_type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;monitor_state) {</div><div class='add'>+		msft_device_found(hdev, &amp;ev-&gt;bdaddr, addr_type, mgmt_handle);</div><div class='add'>+	} else {</div><div class='add'>+		if (address_filter &amp;&amp; address_filter-&gt;state == AF_STATE_ADDED) {</div><div class='add'>+			address_filter-&gt;state = AF_STATE_REMOVING;</div><div class='add'>+			hci_cmd_sync_queue(hdev,</div><div class='add'>+					   msft_cancel_address_filter_sync,</div><div class='add'>+					   address_filter,</div><div class='add'>+					   NULL);</div><div class='add'>+		}</div><div class='add'>+		msft_device_lost(hdev, &amp;ev-&gt;bdaddr, addr_type, mgmt_handle);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msft_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	u8 *evt_prefix;</div><div class='add'>+	u8 *evt;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* When the extension has defined an event prefix, check that it</div><div class='add'>+	 * matches, and otherwise just return.</div><div class='add'>+	 */</div><div class='add'>+	if (msft-&gt;evt_prefix_len &gt; 0) {</div><div class='add'>+		evt_prefix = msft_skb_pull(hdev, skb, 0, msft-&gt;evt_prefix_len);</div><div class='add'>+		if (!evt_prefix)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (memcmp(evt_prefix, msft-&gt;evt_prefix, msft-&gt;evt_prefix_len))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Every event starts at least with an event code and the rest of</div><div class='add'>+	 * the data is variable and depends on the event code.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len &lt; 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	evt = msft_skb_pull(hdev, skb, 0, sizeof(*evt));</div><div class='add'>+	if (!evt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	switch (*evt) {</div><div class='add'>+	case MSFT_EV_LE_MONITOR_DEVICE:</div><div class='add'>+		mutex_lock(&amp;msft-&gt;filter_lock);</div><div class='add'>+		msft_monitor_device_evt(hdev, skb);</div><div class='add'>+		mutex_unlock(&amp;msft-&gt;filter_lock);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		bt_dev_dbg(hdev, "MSFT vendor event 0x%02x", *evt);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__u64 msft_get_features(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	return msft ? msft-&gt;features : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void msft_le_set_advertisement_filter_enable_cb(struct hci_dev *hdev,</div><div class='add'>+						       void *user_data,</div><div class='add'>+						       u8 status)</div><div class='add'>+{</div><div class='add'>+	struct msft_cp_le_set_advertisement_filter_enable *cp = user_data;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	/* Error 0x0C would be returned if the filter enabled status is</div><div class='add'>+	 * already set to whatever we were trying to set.</div><div class='add'>+	 * Although the default state should be disabled, some controller set</div><div class='add'>+	 * the initial value to enabled. Because there is no way to know the</div><div class='add'>+	 * actual initial value before sending this command, here we also treat</div><div class='add'>+	 * error 0x0C as success.</div><div class='add'>+	 */</div><div class='add'>+	if (status != 0x00 &amp;&amp; status != 0x0C)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	msft-&gt;filter_enabled = cp-&gt;enable;</div><div class='add'>+</div><div class='add'>+	if (status == 0x0C)</div><div class='add'>+		bt_dev_warn(hdev, "MSFT filter_enable is already %s",</div><div class='add'>+			    cp-&gt;enable ? "on" : "off");</div><div class='add'>+</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (msft-&gt;resuming || msft-&gt;suspending)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return msft_add_monitor_sync(hdev, monitor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires the caller holds hci_req_sync_lock */</div><div class='add'>+int msft_remove_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (msft-&gt;resuming || msft-&gt;suspending)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return msft_remove_monitor_sync(hdev, monitor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int msft_set_filter_enable(struct hci_dev *hdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct msft_cp_le_set_advertisement_filter_enable cp;</div><div class='add'>+	struct msft_data *msft = hdev-&gt;msft_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!msft)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	cp.sub_opcode = MSFT_OP_LE_SET_ADVERTISEMENT_FILTER_ENABLE;</div><div class='add'>+	cp.enable = enable;</div><div class='add'>+	err = __hci_cmd_sync_status(hdev, hdev-&gt;msft_opcode, sizeof(cp), &amp;cp,</div><div class='add'>+				    HCI_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	msft_le_set_advertisement_filter_enable_cb(hdev, &amp;cp, err);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool msft_curve_validity(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return hdev-&gt;msft_curve_validity;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bluetooth/msft.h b/net/bluetooth/msft.h<br/>new file mode 100644<br/>index 000000000000..fe538e9c91c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/msft.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/msft.h</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 Google Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MSFT_FEATURE_MASK_BREDR_RSSI_MONITOR		BIT(0)</div><div class='add'>+#define MSFT_FEATURE_MASK_LE_CONN_RSSI_MONITOR		BIT(1)</div><div class='add'>+#define MSFT_FEATURE_MASK_LE_ADV_RSSI_MONITOR		BIT(2)</div><div class='add'>+#define MSFT_FEATURE_MASK_LE_ADV_MONITOR		BIT(3)</div><div class='add'>+#define MSFT_FEATURE_MASK_CURVE_VALIDITY		BIT(4)</div><div class='add'>+#define MSFT_FEATURE_MASK_CONCURRENT_ADV_MONITOR	BIT(5)</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BT_MSFTEXT)</div><div class='add'>+</div><div class='add'>+bool msft_monitor_supported(struct hci_dev *hdev);</div><div class='add'>+void msft_register(struct hci_dev *hdev);</div><div class='add'>+void msft_release(struct hci_dev *hdev);</div><div class='add'>+void msft_do_open(struct hci_dev *hdev);</div><div class='add'>+void msft_do_close(struct hci_dev *hdev);</div><div class='add'>+void msft_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb);</div><div class='add'>+__u64 msft_get_features(struct hci_dev *hdev);</div><div class='add'>+int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monitor *monitor);</div><div class='add'>+int msft_remove_monitor(struct hci_dev *hdev, struct adv_monitor *monitor);</div><div class='add'>+void msft_req_add_set_filter_enable(struct hci_request *req, bool enable);</div><div class='add'>+int msft_set_filter_enable(struct hci_dev *hdev, bool enable);</div><div class='add'>+int msft_suspend_sync(struct hci_dev *hdev);</div><div class='add'>+int msft_resume_sync(struct hci_dev *hdev);</div><div class='add'>+bool msft_curve_validity(struct hci_dev *hdev);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline bool msft_monitor_supported(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void msft_register(struct hci_dev *hdev) {}</div><div class='add'>+static inline void msft_release(struct hci_dev *hdev) {}</div><div class='add'>+static inline void msft_do_open(struct hci_dev *hdev) {}</div><div class='add'>+static inline void msft_do_close(struct hci_dev *hdev) {}</div><div class='add'>+static inline void msft_vendor_evt(struct hci_dev *hdev, void *data,</div><div class='add'>+				   struct sk_buff *skb) {}</div><div class='add'>+static inline __u64 msft_get_features(struct hci_dev *hdev) { return 0; }</div><div class='add'>+static inline int msft_add_monitor_pattern(struct hci_dev *hdev,</div><div class='add'>+					   struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int msft_remove_monitor(struct hci_dev *hdev,</div><div class='add'>+				      struct adv_monitor *monitor)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void msft_req_add_set_filter_enable(struct hci_request *req,</div><div class='add'>+						  bool enable) {}</div><div class='add'>+static inline int msft_set_filter_enable(struct hci_dev *hdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int msft_suspend_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int msft_resume_sync(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool msft_curve_validity(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/bluetooth/rfcomm/Kconfig b/net/bluetooth/rfcomm/Kconfig<br/>index 335df7515220..9b9953ebf4c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/rfcomm/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config BT_RFCOMM</div><div class='ctx'> 	tristate "RFCOMM protocol support"</div><div class='ctx'> 	depends on BT_BREDR</div><div class='head'>diff --git a/net/bluetooth/rfcomm/Makefile b/net/bluetooth/rfcomm/Makefile<br/>index fe07988a3705..593e5c48c131 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/rfcomm/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux Bluetooth RFCOMM layer.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c<br/>index b98225d65e87..57b1dca8141f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/rfcomm/core.c</a></div><div class='hunk'>@@ -28,19 +28,20 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/l2cap.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/rfcomm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;trace/events/sock.h&gt;</div><div class='add'>+</div><div class='ctx'> #define VERSION "1.11"</div><div class='ctx'> </div><div class='ctx'> static bool disable_cfc;</div><div class='ctx'> static bool l2cap_ertm;</div><div class='ctx'> static int channel_mtu = -1;</div><div class='del'>-static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU;</div><div class='ctx'> </div><div class='ctx'> static struct task_struct *rfcomm_thread;</div><div class='ctx'> </div><div class='hunk'>@@ -73,8 +74,6 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s);</div><div class='ctx'> </div><div class='ctx'> /* ---- RFCOMM frame parsing macros ---- */</div><div class='ctx'> #define __get_dlci(b)     ((b &amp; 0xfc) &gt;&gt; 2)</div><div class='del'>-#define __get_channel(b)  ((b &amp; 0xf8) &gt;&gt; 3)</div><div class='del'>-#define __get_dir(b)      ((b &amp; 0x04) &gt;&gt; 2)</div><div class='ctx'> #define __get_type(b)     ((b &amp; 0xef))</div><div class='ctx'> </div><div class='ctx'> #define __test_ea(b)      ((b &amp; 0x01))</div><div class='hunk'>@@ -87,7 +86,6 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s);</div><div class='ctx'> #define __ctrl(type, pf)       (((type &amp; 0xef) | (pf &lt;&lt; 4)))</div><div class='ctx'> #define __dlci(dir, chn)       (((chn &amp; 0x1f) &lt;&lt; 1) | dir)</div><div class='ctx'> #define __srv_channel(dlci)    (dlci &gt;&gt; 1)</div><div class='del'>-#define __dir(dlci)            (dlci &amp; 0x01)</div><div class='ctx'> </div><div class='ctx'> #define __len8(len)       (((len) &lt;&lt; 1) | 1)</div><div class='ctx'> #define __len16(len)      ((len) &lt;&lt; 1)</div><div class='hunk'>@@ -190,6 +188,8 @@ static void rfcomm_l2state_change(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_l2data_ready(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("%p", sk);</div><div class='ctx'> 	rfcomm_schedule();</div><div class='ctx'> }</div><div class='hunk'>@@ -235,7 +235,7 @@ static int rfcomm_check_security(struct rfcomm_dlc *d)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_session_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_session *s = from_timer(s, t, timer);</div><div class='add'>+	struct rfcomm_session *s = timer_container_of(s, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("session %p state %ld", s, s-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -254,13 +254,13 @@ static void rfcomm_session_clear_timer(struct rfcomm_session *s)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("session %p state %ld", s, s-&gt;state);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;s-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;s-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---- RFCOMM DLCs ---- */</div><div class='ctx'> static void rfcomm_dlc_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dlc *d = from_timer(d, t, timer);</div><div class='add'>+	struct rfcomm_dlc *d = timer_container_of(d, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("dlc %p state %ld", d, d-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -281,7 +281,7 @@ static void rfcomm_dlc_clear_timer(struct rfcomm_dlc *d)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("dlc %p state %ld", d, d-&gt;state);</div><div class='ctx'> </div><div class='del'>-	if (del_timer(&amp;d-&gt;timer))</div><div class='add'>+	if (timer_delete(&amp;d-&gt;timer))</div><div class='ctx'> 		rfcomm_dlc_put(d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,6 +483,7 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)</div><div class='ctx'> 		/* if closing a dlc in a session that hasn't been started,</div><div class='ctx'> 		 * just close and unlink the dlc</div><div class='ctx'> 		 */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		rfcomm_dlc_clear_timer(d);</div><div class='hunk'>@@ -552,22 +553,58 @@ struct rfcomm_dlc *rfcomm_dlc_exists(bdaddr_t *src, bdaddr_t *dst, u8 channel)</div><div class='ctx'> 	return dlc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rfcomm_dlc_send_frag(struct rfcomm_dlc *d, struct sk_buff *frag)</div><div class='add'>+{</div><div class='add'>+	int len = frag-&gt;len;</div><div class='add'>+</div><div class='add'>+	BT_DBG("dlc %p mtu %d len %d", d, d-&gt;mtu, len);</div><div class='add'>+</div><div class='add'>+	if (len &gt; d-&gt;mtu)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rfcomm_make_uih(frag, d-&gt;addr);</div><div class='add'>+	__skb_queue_tail(&amp;d-&gt;tx_queue, frag);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int len = skb-&gt;len;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct sk_buff *frag, *next;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (d-&gt;state != BT_CONNECTED)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("dlc %p mtu %d len %d", d, d-&gt;mtu, len);</div><div class='add'>+	frag = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+	skb_shinfo(skb)-&gt;frag_list = NULL;</div><div class='ctx'> </div><div class='del'>-	if (len &gt; d-&gt;mtu)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* Queue all fragments atomically. */</div><div class='add'>+	spin_lock_irqsave(&amp;d-&gt;tx_queue.lock, flags);</div><div class='ctx'> </div><div class='del'>-	rfcomm_make_uih(skb, d-&gt;addr);</div><div class='del'>-	skb_queue_tail(&amp;d-&gt;tx_queue, skb);</div><div class='add'>+	len = rfcomm_dlc_send_frag(d, skb);</div><div class='add'>+	if (len &lt; 0 || !frag)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	for (; frag; frag = next) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		next = frag-&gt;next;</div><div class='add'>+</div><div class='add'>+		ret = rfcomm_dlc_send_frag(d, frag);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_kfree_skb_irq(frag);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len += ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;d-&gt;tx_queue.lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(RFCOMM_TX_THROTTLED, &amp;d-&gt;flags))</div><div class='add'>+	if (len &gt; 0 &amp;&amp; !test_bit(RFCOMM_TX_THROTTLED, &amp;d-&gt;flags))</div><div class='ctx'> 		rfcomm_schedule();</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -744,14 +781,15 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,</div><div class='ctx'> 	addr.l2_psm    = 0;</div><div class='ctx'> 	addr.l2_cid    = 0;</div><div class='ctx'> 	addr.l2_bdaddr_type = BDADDR_BREDR;</div><div class='del'>-	*err = kernel_bind(sock, (struct sockaddr *) &amp;addr, sizeof(addr));</div><div class='add'>+	*err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;addr, sizeof(addr));</div><div class='ctx'> 	if (*err &lt; 0)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	/* Set L2CAP options */</div><div class='ctx'> 	sk = sock-&gt;sk;</div><div class='ctx'> 	lock_sock(sk);</div><div class='del'>-	l2cap_pi(sk)-&gt;chan-&gt;imtu = l2cap_mtu;</div><div class='add'>+	/* Set MTU to 0 so L2CAP can auto select the MTU */</div><div class='add'>+	l2cap_pi(sk)-&gt;chan-&gt;imtu = 0;</div><div class='ctx'> 	l2cap_pi(sk)-&gt;chan-&gt;sec_level = sec_level;</div><div class='ctx'> 	if (l2cap_ertm)</div><div class='ctx'> 		l2cap_pi(sk)-&gt;chan-&gt;mode = L2CAP_MODE_ERTM;</div><div class='hunk'>@@ -770,7 +808,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,</div><div class='ctx'> 	addr.l2_psm    = cpu_to_le16(L2CAP_PSM_RFCOMM);</div><div class='ctx'> 	addr.l2_cid    = 0;</div><div class='ctx'> 	addr.l2_bdaddr_type = BDADDR_BREDR;</div><div class='del'>-	*err = kernel_connect(sock, (struct sockaddr *) &amp;addr, sizeof(addr), O_NONBLOCK);</div><div class='add'>+	*err = kernel_connect(sock, (struct sockaddr_unsized *)&amp;addr, sizeof(addr), O_NONBLOCK);</div><div class='ctx'> 	if (*err == 0 || *err == -EINPROGRESS)</div><div class='ctx'> 		return s;</div><div class='ctx'> </div><div class='hunk'>@@ -1903,7 +1941,7 @@ static struct rfcomm_session *rfcomm_process_rx(struct rfcomm_session *s)</div><div class='ctx'> 	/* Get data directly from socket receive queue without copying it. */</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue))) {</div><div class='ctx'> 		skb_orphan(skb);</div><div class='del'>-		if (!skb_linearize(skb)) {</div><div class='add'>+		if (!skb_linearize(skb) &amp;&amp; sk-&gt;sk_state != BT_CLOSED) {</div><div class='ctx'> 			s = rfcomm_recv_frame(s, skb);</div><div class='ctx'> 			if (!s)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1924,7 +1962,8 @@ static void rfcomm_accept_connection(struct rfcomm_session *s)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Fast check for a new connection.</div><div class='del'>-	 * Avoids unnesesary socket allocations. */</div><div class='add'>+	 * Avoids unnecessary socket allocations.</div><div class='add'>+	 */</div><div class='ctx'> 	if (list_empty(&amp;bt_sk(sock-&gt;sk)-&gt;accept_q))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2029,7 +2068,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)</div><div class='ctx'> 	addr.l2_psm    = cpu_to_le16(L2CAP_PSM_RFCOMM);</div><div class='ctx'> 	addr.l2_cid    = 0;</div><div class='ctx'> 	addr.l2_bdaddr_type = BDADDR_BREDR;</div><div class='del'>-	err = kernel_bind(sock, (struct sockaddr *) &amp;addr, sizeof(addr));</div><div class='add'>+	err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;addr, sizeof(addr));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		BT_ERR("Bind failed %d", err);</div><div class='ctx'> 		goto failed;</div><div class='hunk'>@@ -2038,7 +2077,8 @@ static int rfcomm_add_listener(bdaddr_t *ba)</div><div class='ctx'> 	/* Set L2CAP options */</div><div class='ctx'> 	sk = sock-&gt;sk;</div><div class='ctx'> 	lock_sock(sk);</div><div class='del'>-	l2cap_pi(sk)-&gt;chan-&gt;imtu = l2cap_mtu;</div><div class='add'>+	/* Set MTU to 0 so L2CAP can auto select the MTU */</div><div class='add'>+	l2cap_pi(sk)-&gt;chan-&gt;imtu = 0;</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Start listening on the socket */</div><div class='hunk'>@@ -2166,17 +2206,7 @@ static int rfcomm_dlc_debugfs_show(struct seq_file *f, void *x)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_dlc_debugfs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, rfcomm_dlc_debugfs_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rfcomm_dlc_debugfs_fops = {</div><div class='del'>-	.open		= rfcomm_dlc_debugfs_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(rfcomm_dlc_debugfs);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *rfcomm_dlc_debugfs;</div><div class='ctx'> </div><div class='hunk'>@@ -2246,9 +2276,6 @@ MODULE_PARM_DESC(disable_cfc, "Disable credit based flow control");</div><div class='ctx'> module_param(channel_mtu, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(channel_mtu, "Default MTU for the RFCOMM channel");</div><div class='ctx'> </div><div class='del'>-module_param(l2cap_mtu, uint, 0644);</div><div class='del'>-MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection");</div><div class='del'>-</div><div class='ctx'> module_param(l2cap_ertm, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(l2cap_ertm, "Use L2CAP ERTM mode for connection");</div><div class='ctx'> </div><div class='head'>diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c<br/>index d606e9212291..be6639cd6f59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/rfcomm/sock.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * RFCOMM sockets.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='hunk'>@@ -64,15 +64,13 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb)</div><div class='ctx'> static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = d-&gt;owner, *parent;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("dlc %p state %ld err %d", d, d-&gt;state, err);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	bh_lock_sock(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		sk-&gt;sk_err = err;</div><div class='hunk'>@@ -93,8 +91,7 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (parent &amp;&amp; sock_flag(sk, SOCK_ZAPPED)) {</div><div class='ctx'> 		/* We have to drop DLC lock here, otherwise</div><div class='hunk'>@@ -221,7 +218,7 @@ static void __rfcomm_sock_close(struct sock *sk)</div><div class='ctx'> 	case BT_CONFIG:</div><div class='ctx'> 	case BT_CONNECTED:</div><div class='ctx'> 		rfcomm_dlc_close(d, 0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		sock_set_flag(sk, SOCK_ZAPPED);</div><div class='hunk'>@@ -271,21 +268,19 @@ static struct proto rfcomm_proto = {</div><div class='ctx'> 	.obj_size	= sizeof(struct rfcomm_pinfo)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio, int kern)</div><div class='add'>+static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock,</div><div class='add'>+				      int proto, gfp_t prio, int kern)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfcomm_dlc *d;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, prio, &amp;rfcomm_proto, kern);</div><div class='del'>-	if (!sk)</div><div class='add'>+	d = rfcomm_dlc_alloc(prio);</div><div class='add'>+	if (!d)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bt_sk(sk)-&gt;accept_q);</div><div class='del'>-</div><div class='del'>-	d = rfcomm_dlc_alloc(prio);</div><div class='del'>-	if (!d) {</div><div class='del'>-		sk_free(sk);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;rfcomm_proto, proto, prio, kern);</div><div class='add'>+	if (!sk) {</div><div class='add'>+		rfcomm_dlc_free(d);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -301,11 +296,6 @@ static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int</div><div class='ctx'> 	sk-&gt;sk_sndbuf = RFCOMM_MAX_CREDITS * RFCOMM_DEFAULT_MTU * 10;</div><div class='ctx'> 	sk-&gt;sk_rcvbuf = RFCOMM_MAX_CREDITS * RFCOMM_DEFAULT_MTU * 10;</div><div class='ctx'> </div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = proto;</div><div class='del'>-	sk-&gt;sk_state    = BT_OPEN;</div><div class='del'>-</div><div class='ctx'> 	bt_sock_link(&amp;rfcomm_sk_list, sk);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='hunk'>@@ -334,7 +324,7 @@ static int rfcomm_sock_create(struct net *net, struct socket *sock,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)</div><div class='add'>+static int rfcomm_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_rc sa;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -381,7 +371,8 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)</div><div class='add'>+static int rfcomm_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='add'>+			       int alen, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_rc *sa = (struct sockaddr_rc *) addr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -394,6 +385,7 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a</div><div class='ctx'> 	    addr-&gt;sa_family != AF_BLUETOOTH)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	sock_hold(sk);</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state != BT_OPEN &amp;&amp; sk-&gt;sk_state != BT_BOUND) {</div><div class='hunk'>@@ -413,14 +405,18 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a</div><div class='ctx'> 	d-&gt;sec_level = rfcomm_pi(sk)-&gt;sec_level;</div><div class='ctx'> 	d-&gt;role_switch = rfcomm_pi(sk)-&gt;role_switch;</div><div class='ctx'> </div><div class='add'>+	/* Drop sock lock to avoid potential deadlock with the RFCOMM lock */</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> 	err = rfcomm_dlc_open(d, &amp;rfcomm_pi(sk)-&gt;src, &amp;sa-&gt;rc_bdaddr,</div><div class='ctx'> 			      sa-&gt;rc_channel);</div><div class='del'>-	if (!err)</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	if (!err &amp;&amp; !sock_flag(sk, SOCK_ZAPPED))</div><div class='ctx'> 		err = bt_sock_wait_state(sk, BT_CONNECTED,</div><div class='ctx'> 				sock_sndtimeo(sk, flags &amp; O_NONBLOCK));</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -473,8 +469,8 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-			      bool kern)</div><div class='add'>+static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+			      struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk, *nsk;</div><div class='hunk'>@@ -488,7 +484,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+	timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p timeo %ld", sk, timeo);</div><div class='ctx'> </div><div class='hunk'>@@ -578,46 +574,20 @@ static int rfcomm_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	sent = bt_sock_wait_ready(sk, msg-&gt;msg_flags);</div><div class='del'>-	if (sent)</div><div class='del'>-		goto done;</div><div class='ctx'> </div><div class='del'>-	while (len) {</div><div class='del'>-		size_t size = min_t(size_t, len, d-&gt;mtu);</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		skb = sock_alloc_send_skb(sk, size + RFCOMM_SKB_RESERVE,</div><div class='del'>-				msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			if (sent == 0)</div><div class='del'>-				sent = err;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, RFCOMM_SKB_HEAD_RESERVE);</div><div class='del'>-</div><div class='del'>-		err = memcpy_from_msg(skb_put(skb, size), msg, size);</div><div class='del'>-		if (err) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			if (sent == 0)</div><div class='del'>-				sent = err;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb-&gt;priority = sk-&gt;sk_priority;</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> </div><div class='del'>-		err = rfcomm_dlc_send(d, skb);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			if (sent == 0)</div><div class='del'>-				sent = err;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (sent)</div><div class='add'>+		return sent;</div><div class='ctx'> </div><div class='del'>-		sent += size;</div><div class='del'>-		len  -= size;</div><div class='del'>-	}</div><div class='add'>+	skb = bt_skb_sendmmsg(sk, msg, len, d-&gt;mtu, RFCOMM_SKB_HEAD_RESERVE,</div><div class='add'>+			      RFCOMM_SKB_TAIL_RESERVE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sent = rfcomm_dlc_send(d, skb);</div><div class='add'>+	if (sent &lt; 0)</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return sent;</div><div class='ctx'> }</div><div class='hunk'>@@ -647,7 +617,8 @@ static int rfcomm_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname,</div><div class='add'>+		sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -659,10 +630,9 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, char __u</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case RFCOMM_LM:</div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt &amp; RFCOMM_LM_FIPS) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -688,12 +658,12 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, char __u</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+		sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct bt_security sec;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	size_t len;</div><div class='ctx'> 	u32 opt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='hunk'>@@ -715,11 +685,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c</div><div class='ctx'> </div><div class='ctx'> 		sec.level = BT_SECURITY_LOW;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, sizeof(sec), optlen);</div><div class='del'>-		if (copy_from_user((char *) &amp;sec, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;sec, sizeof(sec), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (sec.level &gt; BT_SECURITY_HIGH) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -735,10 +703,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt)</div><div class='ctx'> 			set_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='hunk'>@@ -762,7 +729,8 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u</div><div class='ctx'> 	struct sock *l2cap_sk;</div><div class='ctx'> 	struct l2cap_conn *conn;</div><div class='ctx'> 	struct rfcomm_conninfo cinfo;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	size_t len;</div><div class='ctx'> 	u32 opt;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='hunk'>@@ -816,7 +784,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u</div><div class='ctx'> 		cinfo.hci_handle = conn-&gt;hcon-&gt;handle;</div><div class='ctx'> 		memcpy(cinfo.dev_class, conn-&gt;hcon-&gt;dev_class, 3);</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(cinfo));</div><div class='add'>+		len = min(len, sizeof(cinfo));</div><div class='ctx'> 		if (copy_to_user(optval, (char *) &amp;cinfo, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -835,7 +803,8 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct bt_security sec;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	size_t len;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -860,7 +829,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c</div><div class='ctx'> 		sec.level = rfcomm_pi(sk)-&gt;sec_level;</div><div class='ctx'> 		sec.key_size = 0;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(sec));</div><div class='add'>+		len = min(len, sizeof(sec));</div><div class='ctx'> 		if (copy_to_user(optval, (char *) &amp;sec, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -898,9 +867,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon</div><div class='ctx'> </div><div class='ctx'> 	if (err == -ENOIOCTLCMD) {</div><div class='ctx'> #ifdef CONFIG_BT_RFCOMM_TTY</div><div class='del'>-		lock_sock(sk);</div><div class='ctx'> 		err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);</div><div class='del'>-		release_sock(sk);</div><div class='ctx'> #else</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -909,6 +876,13 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int rfcomm_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return rfcomm_sock_ioctl(sock, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int rfcomm_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -922,7 +896,10 @@ static int rfcomm_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (!sk-&gt;sk_shutdown) {</div><div class='ctx'> 		sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='add'>+</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> 		__rfcomm_sock_close(sk);</div><div class='add'>+		lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 		if (sock_flag(sk, SOCK_LINGER) &amp;&amp; sk-&gt;sk_lingertime &amp;&amp;</div><div class='ctx'> 		    !(current-&gt;flags &amp; PF_EXITING))</div><div class='hunk'>@@ -968,7 +945,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc *</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bh_lock_sock(parent);</div><div class='add'>+	lock_sock(parent);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for backlog size */</div><div class='ctx'> 	if (sk_acceptq_is_full(parent)) {</div><div class='hunk'>@@ -988,14 +965,14 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc *</div><div class='ctx'> 	rfcomm_pi(sk)-&gt;channel = channel;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_state = BT_CONFIG;</div><div class='del'>-	bt_accept_enqueue(parent, sk);</div><div class='add'>+	bt_accept_enqueue(parent, sk, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Accept connection and return socket DLC */</div><div class='ctx'> 	*d = rfcomm_pi(sk)-&gt;dlc;</div><div class='ctx'> 	result = 1;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	bh_unlock_sock(parent);</div><div class='add'>+	release_sock(parent);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(parent)-&gt;flags))</div><div class='ctx'> 		parent-&gt;sk_state_change(parent);</div><div class='hunk'>@@ -1020,17 +997,7 @@ static int rfcomm_sock_debugfs_show(struct seq_file *f, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_sock_debugfs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, rfcomm_sock_debugfs_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rfcomm_sock_debugfs_fops = {</div><div class='del'>-	.open		= rfcomm_sock_debugfs_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(rfcomm_sock_debugfs);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *rfcomm_sock_debugfs;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,9 +1016,13 @@ static const struct proto_ops rfcomm_sock_ops = {</div><div class='ctx'> 	.setsockopt	= rfcomm_sock_setsockopt,</div><div class='ctx'> 	.getsockopt	= rfcomm_sock_getsockopt,</div><div class='ctx'> 	.ioctl		= rfcomm_sock_ioctl,</div><div class='add'>+	.gettstamp	= sock_gettstamp,</div><div class='ctx'> 	.poll		= bt_sock_poll,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='del'>-	.mmap		= sock_no_mmap</div><div class='add'>+	.mmap		= sock_no_mmap,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl	= rfcomm_sock_compat_ioctl,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_proto_family rfcomm_sock_family_ops = {</div><div class='head'>diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c<br/>index 5e44d842cc5d..b783526ab588 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/tty.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/rfcomm/tty.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/rfcomm/tty.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/rfcomm/tty.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/rfcomm.h&gt;</div><div class='ctx'> </div><div class='del'>-#define RFCOMM_TTY_MAGIC 0x6d02		/* magic number for rfcomm struct */</div><div class='ctx'> #define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV	/* whole lotta rfcomm devices */</div><div class='ctx'> #define RFCOMM_TTY_MAJOR 216		/* device node major id of the usb/bluetooth.c driver */</div><div class='ctx'> #define RFCOMM_TTY_MINOR 0</div><div class='hunk'>@@ -120,7 +119,7 @@ static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* we block the open until the dlc-&gt;state becomes BT_CONNECTED */</div><div class='del'>-static int rfcomm_dev_carrier_raised(struct tty_port *port)</div><div class='add'>+static bool rfcomm_dev_carrier_raised(struct tty_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);</div><div class='ctx'> </div><div class='hunk'>@@ -198,20 +197,22 @@ static void rfcomm_reparent_device(struct rfcomm_dev *dev)</div><div class='ctx'> 	hci_dev_put(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_address(struct device *tty_dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t address_show(struct device *tty_dev,</div><div class='add'>+			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);</div><div class='del'>-	return sprintf(buf, "%pMR\n", &amp;dev-&gt;dst);</div><div class='add'>+	return sysfs_emit(buf, "%pMR\n", &amp;dev-&gt;dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_channel(struct device *tty_dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t channel_show(struct device *tty_dev,</div><div class='add'>+			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);</div><div class='del'>-	return sprintf(buf, "%d\n", dev-&gt;channel);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", dev-&gt;channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(address, 0444, show_address, NULL);</div><div class='del'>-static DEVICE_ATTR(channel, 0444, show_channel, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(address);</div><div class='add'>+static DEVICE_ATTR_RO(channel);</div><div class='ctx'> </div><div class='ctx'> static struct rfcomm_dev *__rfcomm_dev_add(struct rfcomm_dev_req *req,</div><div class='ctx'> 					   struct rfcomm_dlc *dlc)</div><div class='hunk'>@@ -413,10 +414,8 @@ static int __rfcomm_create_dev(struct sock *sk, void __user *arg)</div><div class='ctx'> 		dlc = rfcomm_dlc_exists(&amp;req.src, &amp;req.dst, req.channel);</div><div class='ctx'> 		if (IS_ERR(dlc))</div><div class='ctx'> 			return PTR_ERR(dlc);</div><div class='del'>-		else if (dlc) {</div><div class='del'>-			rfcomm_dlc_put(dlc);</div><div class='add'>+		if (dlc)</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		}</div><div class='ctx'> 		dlc = rfcomm_dlc_alloc(GFP_KERNEL);</div><div class='ctx'> 		if (!dlc)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -439,7 +438,6 @@ static int __rfcomm_release_dev(void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfcomm_dev_req req;</div><div class='ctx'> 	struct rfcomm_dev *dev;</div><div class='del'>-	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;req, arg, sizeof(req)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -465,11 +463,7 @@ static int __rfcomm_release_dev(void __user *arg)</div><div class='ctx'> 		rfcomm_dlc_close(dev-&gt;dlc, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Shut down TTY synchronously before freeing rfcomm_dev */</div><div class='del'>-	tty = tty_port_tty_get(&amp;dev-&gt;port);</div><div class='del'>-	if (tty) {</div><div class='del'>-		tty_vhangup(tty);</div><div class='del'>-		tty_kref_put(tty);</div><div class='del'>-	}</div><div class='add'>+	tty_port_tty_vhangup(&amp;dev-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(RFCOMM_TTY_OWNED, &amp;dev-&gt;status))</div><div class='ctx'> 		tty_port_put(&amp;dev-&gt;port);</div><div class='hunk'>@@ -505,7 +499,7 @@ static int rfcomm_get_dev_list(void __user *arg)</div><div class='ctx'> 	struct rfcomm_dev *dev;</div><div class='ctx'> 	struct rfcomm_dev_list_req *dl;</div><div class='ctx'> 	struct rfcomm_dev_info *di;</div><div class='del'>-	int n = 0, size, err;</div><div class='add'>+	int n = 0, err;</div><div class='ctx'> 	u16 dev_num;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("");</div><div class='hunk'>@@ -516,12 +510,11 @@ static int rfcomm_get_dev_list(void __user *arg)</div><div class='ctx'> 	if (!dev_num || dev_num &gt; (PAGE_SIZE * 4) / sizeof(*di))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(*dl) + dev_num * sizeof(*di);</div><div class='del'>-</div><div class='del'>-	dl = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	dl = kzalloc(struct_size(dl, dev_info, dev_num), GFP_KERNEL);</div><div class='ctx'> 	if (!dl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dl-&gt;dev_num = dev_num;</div><div class='ctx'> 	di = dl-&gt;dev_info;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;rfcomm_dev_lock);</div><div class='hunk'>@@ -529,12 +522,12 @@ static int rfcomm_get_dev_list(void __user *arg)</div><div class='ctx'> 	list_for_each_entry(dev, &amp;rfcomm_dev_list, list) {</div><div class='ctx'> 		if (!tty_port_get(&amp;dev-&gt;port))</div><div class='ctx'> 			continue;</div><div class='del'>-		(di + n)-&gt;id      = dev-&gt;id;</div><div class='del'>-		(di + n)-&gt;flags   = dev-&gt;flags;</div><div class='del'>-		(di + n)-&gt;state   = dev-&gt;dlc-&gt;state;</div><div class='del'>-		(di + n)-&gt;channel = dev-&gt;channel;</div><div class='del'>-		bacpy(&amp;(di + n)-&gt;src, &amp;dev-&gt;src);</div><div class='del'>-		bacpy(&amp;(di + n)-&gt;dst, &amp;dev-&gt;dst);</div><div class='add'>+		di[n].id      = dev-&gt;id;</div><div class='add'>+		di[n].flags   = dev-&gt;flags;</div><div class='add'>+		di[n].state   = dev-&gt;dlc-&gt;state;</div><div class='add'>+		di[n].channel = dev-&gt;channel;</div><div class='add'>+		bacpy(&amp;di[n].src, &amp;dev-&gt;src);</div><div class='add'>+		bacpy(&amp;di[n].dst, &amp;dev-&gt;dst);</div><div class='ctx'> 		tty_port_put(&amp;dev-&gt;port);</div><div class='ctx'> 		if (++n &gt;= dev_num)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -543,9 +536,7 @@ static int rfcomm_get_dev_list(void __user *arg)</div><div class='ctx'> 	mutex_unlock(&amp;rfcomm_dev_lock);</div><div class='ctx'> </div><div class='ctx'> 	dl-&gt;dev_num = n;</div><div class='del'>-	size = sizeof(*dl) + n * sizeof(*di);</div><div class='del'>-</div><div class='del'>-	err = copy_to_user(arg, dl, size);</div><div class='add'>+	err = copy_to_user(arg, dl, struct_size(dl, dev_info, n));</div><div class='ctx'> 	kfree(dl);</div><div class='ctx'> </div><div class='ctx'> 	return err ? -EFAULT : 0;</div><div class='hunk'>@@ -652,8 +643,8 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)</div><div class='ctx'> 		tty_port_tty_hangup(&amp;dev-&gt;port, true);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;modem_status =</div><div class='del'>-		((v24_sig &amp; RFCOMM_V24_RTC) ? (TIOCM_DSR | TIOCM_DTR) : 0) |</div><div class='del'>-		((v24_sig &amp; RFCOMM_V24_RTR) ? (TIOCM_RTS | TIOCM_CTS) : 0) |</div><div class='add'>+		((v24_sig &amp; RFCOMM_V24_RTC) ? TIOCM_DSR : 0) |</div><div class='add'>+		((v24_sig &amp; RFCOMM_V24_RTR) ? TIOCM_CTS : 0) |</div><div class='ctx'> 		((v24_sig &amp; RFCOMM_V24_IC)  ? TIOCM_RI : 0) |</div><div class='ctx'> 		((v24_sig &amp; RFCOMM_V24_DV)  ? TIOCM_CD : 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -772,7 +763,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev-&gt;dlc,</div><div class='ctx'> 						dev-&gt;port.count);</div><div class='hunk'>@@ -780,17 +771,18 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	tty_port_close(&amp;dev-&gt;port, tty, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)</div><div class='add'>+static ssize_t rfcomm_tty_write(struct tty_struct *tty, const u8 *buf,</div><div class='add'>+				size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> 	struct rfcomm_dlc *dlc = dev-&gt;dlc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int sent = 0, size;</div><div class='add'>+	size_t sent = 0, size;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("tty %p count %d", tty, count);</div><div class='add'>+	BT_DBG("tty %p count %zu", tty, count);</div><div class='ctx'> </div><div class='ctx'> 	while (count) {</div><div class='del'>-		size = min_t(uint, count, dlc-&gt;mtu);</div><div class='add'>+		size = min_t(size_t, count, dlc-&gt;mtu);</div><div class='ctx'> </div><div class='ctx'> 		skb = rfcomm_wmalloc(dev, size + RFCOMM_SKB_RESERVE, GFP_ATOMIC);</div><div class='ctx'> 		if (!skb)</div><div class='hunk'>@@ -809,9 +801,9 @@ static int rfcomm_tty_write(struct tty_struct *tty, const unsigned char *buf, in</div><div class='ctx'> 	return sent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_tty_write_room(struct tty_struct *tty)</div><div class='add'>+static unsigned int rfcomm_tty_write_room(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> 	int room = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &amp;&amp; dev-&gt;dlc)</div><div class='hunk'>@@ -839,18 +831,6 @@ static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned l</div><div class='ctx'> 		BT_DBG("TIOCMIWAIT");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case TIOCGSERIAL:</div><div class='del'>-		BT_ERR("TIOCGSERIAL is not supported");</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	case TIOCSSERIAL:</div><div class='del'>-		BT_ERR("TIOCSSERIAL is not supported");</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	case TIOCSERGSTRUCT:</div><div class='del'>-		BT_ERR("TIOCSERGSTRUCT is not supported");</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='ctx'> 	case TIOCSERGETLSR:</div><div class='ctx'> 		BT_ERR("TIOCSERGETLSR is not supported");</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='hunk'>@@ -867,7 +847,8 @@ static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned l</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)</div><div class='add'>+static void rfcomm_tty_set_termios(struct tty_struct *tty,</div><div class='add'>+				   const struct ktermios *old)</div><div class='ctx'> {</div><div class='ctx'> 	struct ktermios *new = &amp;tty-&gt;termios;</div><div class='ctx'> 	int old_baud_rate = tty_termios_baud_rate(old);</div><div class='hunk'>@@ -876,7 +857,7 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> 	u8 baud, data_bits, stop_bits, parity, x_on, x_off;</div><div class='ctx'> 	u16 changes = 0;</div><div class='ctx'> </div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p termios %p", tty, old);</div><div class='ctx'> </div><div class='hunk'>@@ -994,7 +975,7 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> 		baud = RFCOMM_RPN_BR_230400;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		/* 9600 is standard accordinag to the RFCOMM specification */</div><div class='add'>+		/* 9600 is standard according to the RFCOMM specification */</div><div class='ctx'> 		baud = RFCOMM_RPN_BR_9600;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1008,7 +989,7 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_tty_throttle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1017,16 +998,16 @@ static void rfcomm_tty_throttle(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_tty_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='ctx'> 	rfcomm_dlc_unthrottle(dev-&gt;dlc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfcomm_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='add'>+static unsigned int rfcomm_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +1022,7 @@ static int rfcomm_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_tty_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1052,7 +1033,7 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> 	tty_wakeup(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch)</div><div class='add'>+static void rfcomm_tty_send_xchar(struct tty_struct *tty, u8 ch)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("tty %p ch %c", tty, ch);</div><div class='ctx'> }</div><div class='hunk'>@@ -1064,7 +1045,7 @@ static void rfcomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)</div><div class='ctx'> </div><div class='ctx'> static void rfcomm_tty_hangup(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1073,16 +1054,20 @@ static void rfcomm_tty_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static int rfcomm_tty_tiocmget(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dlc *dlc = dev-&gt;dlc;</div><div class='add'>+	u8 v24_sig;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("tty %p dev %p", tty, dev);</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;modem_status;</div><div class='add'>+	rfcomm_dlc_get_modem_status(dlc, &amp;v24_sig);</div><div class='add'>+</div><div class='add'>+	return (v24_sig &amp; (TIOCM_DTR | TIOCM_RTS)) | dev-&gt;modem_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)</div><div class='ctx'> {</div><div class='del'>-	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty-&gt;driver_data;</div><div class='add'>+	struct rfcomm_dev *dev = tty-&gt;driver_data;</div><div class='ctx'> 	struct rfcomm_dlc *dlc = dev-&gt;dlc;</div><div class='ctx'> 	u8 v24_sig;</div><div class='ctx'> </div><div class='hunk'>@@ -1090,23 +1075,15 @@ static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigne</div><div class='ctx'> </div><div class='ctx'> 	rfcomm_dlc_get_modem_status(dlc, &amp;v24_sig);</div><div class='ctx'> </div><div class='del'>-	if (set &amp; TIOCM_DSR || set &amp; TIOCM_DTR)</div><div class='add'>+	if (set &amp; TIOCM_DTR)</div><div class='ctx'> 		v24_sig |= RFCOMM_V24_RTC;</div><div class='del'>-	if (set &amp; TIOCM_RTS || set &amp; TIOCM_CTS)</div><div class='add'>+	if (set &amp; TIOCM_RTS)</div><div class='ctx'> 		v24_sig |= RFCOMM_V24_RTR;</div><div class='del'>-	if (set &amp; TIOCM_RI)</div><div class='del'>-		v24_sig |= RFCOMM_V24_IC;</div><div class='del'>-	if (set &amp; TIOCM_CD)</div><div class='del'>-		v24_sig |= RFCOMM_V24_DV;</div><div class='ctx'> </div><div class='del'>-	if (clear &amp; TIOCM_DSR || clear &amp; TIOCM_DTR)</div><div class='add'>+	if (clear &amp; TIOCM_DTR)</div><div class='ctx'> 		v24_sig &amp;= ~RFCOMM_V24_RTC;</div><div class='del'>-	if (clear &amp; TIOCM_RTS || clear &amp; TIOCM_CTS)</div><div class='add'>+	if (clear &amp; TIOCM_RTS)</div><div class='ctx'> 		v24_sig &amp;= ~RFCOMM_V24_RTR;</div><div class='del'>-	if (clear &amp; TIOCM_RI)</div><div class='del'>-		v24_sig &amp;= ~RFCOMM_V24_IC;</div><div class='del'>-	if (clear &amp; TIOCM_CD)</div><div class='del'>-		v24_sig &amp;= ~RFCOMM_V24_DV;</div><div class='ctx'> </div><div class='ctx'> 	rfcomm_dlc_set_modem_status(dlc, v24_sig);</div><div class='ctx'> </div><div class='hunk'>@@ -1139,9 +1116,10 @@ int __init rfcomm_init_ttys(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	rfcomm_tty_driver = alloc_tty_driver(RFCOMM_TTY_PORTS);</div><div class='del'>-	if (!rfcomm_tty_driver)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	rfcomm_tty_driver = tty_alloc_driver(RFCOMM_TTY_PORTS,</div><div class='add'>+			TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV);</div><div class='add'>+	if (IS_ERR(rfcomm_tty_driver))</div><div class='add'>+		return PTR_ERR(rfcomm_tty_driver);</div><div class='ctx'> </div><div class='ctx'> 	rfcomm_tty_driver-&gt;driver_name	= "rfcomm";</div><div class='ctx'> 	rfcomm_tty_driver-&gt;name		= "rfcomm";</div><div class='hunk'>@@ -1149,7 +1127,6 @@ int __init rfcomm_init_ttys(void)</div><div class='ctx'> 	rfcomm_tty_driver-&gt;minor_start	= RFCOMM_TTY_MINOR;</div><div class='ctx'> 	rfcomm_tty_driver-&gt;type		= TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	rfcomm_tty_driver-&gt;subtype	= SERIAL_TYPE_NORMAL;</div><div class='del'>-	rfcomm_tty_driver-&gt;flags	= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	rfcomm_tty_driver-&gt;init_termios	= tty_std_termios;</div><div class='ctx'> 	rfcomm_tty_driver-&gt;init_termios.c_cflag	= B9600 | CS8 | CREAD | HUPCL;</div><div class='ctx'> 	rfcomm_tty_driver-&gt;init_termios.c_lflag &amp;= ~ICANON;</div><div class='hunk'>@@ -1158,7 +1135,7 @@ int __init rfcomm_init_ttys(void)</div><div class='ctx'> 	error = tty_register_driver(rfcomm_tty_driver);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		BT_ERR("Can't register RFCOMM TTY driver");</div><div class='del'>-		put_tty_driver(rfcomm_tty_driver);</div><div class='add'>+		tty_driver_kref_put(rfcomm_tty_driver);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1170,5 +1147,5 @@ int __init rfcomm_init_ttys(void)</div><div class='ctx'> void rfcomm_cleanup_ttys(void)</div><div class='ctx'> {</div><div class='ctx'> 	tty_unregister_driver(rfcomm_tty_driver);</div><div class='del'>-	put_tty_driver(rfcomm_tty_driver);</div><div class='add'>+	tty_driver_kref_put(rfcomm_tty_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c<br/>index 8f0f9279eac9..87ba90336e80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/sco.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/sco.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/sco.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/sco.c</a></div><div class='hunk'>@@ -48,11 +48,14 @@ struct sco_conn {</div><div class='ctx'> 	spinlock_t	lock;</div><div class='ctx'> 	struct sock	*sk;</div><div class='ctx'> </div><div class='add'>+	struct delayed_work	timeout_work;</div><div class='add'>+</div><div class='ctx'> 	unsigned int    mtu;</div><div class='add'>+	struct kref	ref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define sco_conn_lock(c)	spin_lock(&amp;c-&gt;lock);</div><div class='del'>-#define sco_conn_unlock(c)	spin_unlock(&amp;c-&gt;lock);</div><div class='add'>+#define sco_conn_lock(c)	spin_lock(&amp;c-&gt;lock)</div><div class='add'>+#define sco_conn_unlock(c)	spin_unlock(&amp;c-&gt;lock)</div><div class='ctx'> </div><div class='ctx'> static void sco_sock_close(struct sock *sk);</div><div class='ctx'> static void sco_sock_kill(struct sock *sk);</div><div class='hunk'>@@ -66,6 +69,7 @@ struct sco_pinfo {</div><div class='ctx'> 	bdaddr_t	dst;</div><div class='ctx'> 	__u32		flags;</div><div class='ctx'> 	__u16		setting;</div><div class='add'>+	struct bt_codec codec;</div><div class='ctx'> 	struct sco_conn	*conn;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -73,53 +77,147 @@ struct sco_pinfo {</div><div class='ctx'> #define SCO_CONN_TIMEOUT	(HZ * 40)</div><div class='ctx'> #define SCO_DISCONN_TIMEOUT	(HZ * 2)</div><div class='ctx'> </div><div class='del'>-static void sco_sock_timeout(struct timer_list *t)</div><div class='add'>+static void sco_conn_free(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct sco_conn *conn = container_of(ref, struct sco_conn, ref);</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p", conn);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;sk)</div><div class='add'>+		sco_pi(conn-&gt;sk)-&gt;conn = NULL;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;hcon) {</div><div class='add'>+		conn-&gt;hcon-&gt;sco_data = NULL;</div><div class='add'>+		hci_conn_drop(conn-&gt;hcon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure no more work items will run since hci_conn has been dropped */</div><div class='add'>+	disable_delayed_work_sync(&amp;conn-&gt;timeout_work);</div><div class='add'>+</div><div class='add'>+	kfree(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sco_conn_put(struct sco_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p refcnt %d", conn, kref_read(&amp;conn-&gt;ref));</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;conn-&gt;ref, sco_conn_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sco_conn *sco_conn_hold(struct sco_conn *conn)</div><div class='add'>+{</div><div class='add'>+	BT_DBG("conn %p refcnt %u", conn, kref_read(&amp;conn-&gt;ref));</div><div class='add'>+</div><div class='add'>+	kref_get(&amp;conn-&gt;ref);</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sco_conn *sco_conn_hold_unless_zero(struct sco_conn *conn)</div><div class='add'>+{</div><div class='add'>+	if (!conn)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	BT_DBG("conn %p refcnt %u", conn, kref_read(&amp;conn-&gt;ref));</div><div class='add'>+</div><div class='add'>+	if (!kref_get_unless_zero(&amp;conn-&gt;ref))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *sco_sock_hold(struct sco_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = from_timer(sk, t, sk_timer);</div><div class='add'>+	if (!conn || !bt_sock_linked(&amp;sco_sk_list, conn-&gt;sk))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sock_hold(conn-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return conn-&gt;sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sco_sock_timeout(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct sco_conn *conn = container_of(work, struct sco_conn,</div><div class='add'>+					     timeout_work.work);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	conn = sco_conn_hold_unless_zero(conn);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sco_conn_lock(conn);</div><div class='add'>+	if (!conn-&gt;hcon) {</div><div class='add'>+		sco_conn_unlock(conn);</div><div class='add'>+		sco_conn_put(conn);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	sk = sco_sock_hold(conn);</div><div class='add'>+	sco_conn_unlock(conn);</div><div class='add'>+	sco_conn_put(conn);</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sock %p state %d", sk, sk-&gt;sk_state);</div><div class='ctx'> </div><div class='del'>-	bh_lock_sock(sk);</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	sk-&gt;sk_err = ETIMEDOUT;</div><div class='ctx'> 	sk-&gt;sk_state_change(sk);</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-</div><div class='del'>-	sco_sock_kill(sk);</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sco_sock_set_timer(struct sock *sk, long timeout)</div><div class='ctx'> {</div><div class='add'>+	if (!sco_pi(sk)-&gt;conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("sock %p state %d timeout %ld", sk, sk-&gt;sk_state, timeout);</div><div class='del'>-	sk_reset_timer(sk, &amp;sk-&gt;sk_timer, jiffies + timeout);</div><div class='add'>+	cancel_delayed_work(&amp;sco_pi(sk)-&gt;conn-&gt;timeout_work);</div><div class='add'>+	schedule_delayed_work(&amp;sco_pi(sk)-&gt;conn-&gt;timeout_work, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sco_sock_clear_timer(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	if (!sco_pi(sk)-&gt;conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	BT_DBG("sock %p state %d", sk, sk-&gt;sk_state);</div><div class='del'>-	sk_stop_timer(sk, &amp;sk-&gt;sk_timer);</div><div class='add'>+	cancel_delayed_work(&amp;sco_pi(sk)-&gt;conn-&gt;timeout_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---- SCO connections ---- */</div><div class='ctx'> static struct sco_conn *sco_conn_add(struct hci_conn *hcon)</div><div class='ctx'> {</div><div class='del'>-	struct hci_dev *hdev = hcon-&gt;hdev;</div><div class='ctx'> 	struct sco_conn *conn = hcon-&gt;sco_data;</div><div class='ctx'> </div><div class='del'>-	if (conn)</div><div class='add'>+	conn = sco_conn_hold_unless_zero(conn);</div><div class='add'>+	if (conn) {</div><div class='add'>+		if (!conn-&gt;hcon) {</div><div class='add'>+			sco_conn_lock(conn);</div><div class='add'>+			conn-&gt;hcon = hcon;</div><div class='add'>+			sco_conn_unlock(conn);</div><div class='add'>+		}</div><div class='ctx'> 		return conn;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	conn = kzalloc(sizeof(struct sco_conn), GFP_KERNEL);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	kref_init(&amp;conn-&gt;ref);</div><div class='ctx'> 	spin_lock_init(&amp;conn-&gt;lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;conn-&gt;timeout_work, sco_sock_timeout);</div><div class='ctx'> </div><div class='ctx'> 	hcon-&gt;sco_data = conn;</div><div class='ctx'> 	conn-&gt;hcon = hcon;</div><div class='add'>+	conn-&gt;mtu = hcon-&gt;mtu;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;sco_mtu &gt; 0)</div><div class='del'>-		conn-&gt;mtu = hdev-&gt;sco_mtu;</div><div class='add'>+	if (hcon-&gt;mtu &gt; 0)</div><div class='add'>+		conn-&gt;mtu = hcon-&gt;mtu;</div><div class='ctx'> 	else</div><div class='ctx'> 		conn-&gt;mtu = 60;</div><div class='ctx'> </div><div class='hunk'>@@ -135,17 +233,15 @@ static void sco_chan_del(struct sock *sk, int err)</div><div class='ctx'> 	struct sco_conn *conn;</div><div class='ctx'> </div><div class='ctx'> 	conn = sco_pi(sk)-&gt;conn;</div><div class='add'>+	sco_pi(sk)-&gt;conn = NULL;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p, conn %p, err %d", sk, conn, err);</div><div class='ctx'> </div><div class='ctx'> 	if (conn) {</div><div class='ctx'> 		sco_conn_lock(conn);</div><div class='ctx'> 		conn-&gt;sk = NULL;</div><div class='del'>-		sco_pi(sk)-&gt;conn = NULL;</div><div class='ctx'> 		sco_conn_unlock(conn);</div><div class='del'>-</div><div class='del'>-		if (conn-&gt;hcon)</div><div class='del'>-			hci_conn_drop(conn-&gt;hcon);</div><div class='add'>+		sco_conn_put(conn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_state = BT_CLOSED;</div><div class='hunk'>@@ -160,28 +256,28 @@ static void sco_conn_del(struct hci_conn *hcon, int err)</div><div class='ctx'> 	struct sco_conn *conn = hcon-&gt;sco_data;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='add'>+	conn = sco_conn_hold_unless_zero(conn);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);</div><div class='ctx'> </div><div class='del'>-	/* Kill socket */</div><div class='ctx'> 	sco_conn_lock(conn);</div><div class='del'>-	sk = conn-&gt;sk;</div><div class='add'>+	sk = sco_sock_hold(conn);</div><div class='ctx'> 	sco_conn_unlock(conn);</div><div class='add'>+	sco_conn_put(conn);</div><div class='ctx'> </div><div class='del'>-	if (sk) {</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		bh_lock_sock(sk);</div><div class='del'>-		sco_sock_clear_timer(sk);</div><div class='del'>-		sco_chan_del(sk, err);</div><div class='del'>-		bh_unlock_sock(sk);</div><div class='del'>-		sco_sock_kill(sk);</div><div class='del'>-		sock_put(sk);</div><div class='add'>+	if (!sk) {</div><div class='add'>+		sco_conn_put(conn);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hcon-&gt;sco_data = NULL;</div><div class='del'>-	kfree(conn);</div><div class='add'>+	/* Kill socket */</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	sco_sock_clear_timer(sk);</div><div class='add'>+	sco_chan_del(sk, err);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __sco_chan_add(struct sco_conn *conn, struct sock *sk,</div><div class='hunk'>@@ -193,7 +289,7 @@ static void __sco_chan_add(struct sco_conn *conn, struct sock *sk,</div><div class='ctx'> 	conn-&gt;sk = sk;</div><div class='ctx'> </div><div class='ctx'> 	if (parent)</div><div class='del'>-		bt_accept_enqueue(parent, sk);</div><div class='add'>+		bt_accept_enqueue(parent, sk, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sco_chan_add(struct sco_conn *conn, struct sock *sk,</div><div class='hunk'>@@ -231,52 +327,62 @@ static int sco_connect(struct sock *sk)</div><div class='ctx'> 	else</div><div class='ctx'> 		type = SCO_LINK;</div><div class='ctx'> </div><div class='del'>-	if (sco_pi(sk)-&gt;setting == BT_VOICE_TRANSPARENT &amp;&amp;</div><div class='del'>-	    (!lmp_transp_capable(hdev) || !lmp_esco_capable(hdev))) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto done;</div><div class='add'>+	switch (sco_pi(sk)-&gt;setting &amp; SCO_AIRMODE_MASK) {</div><div class='add'>+	case SCO_AIRMODE_TRANSP:</div><div class='add'>+		if (!lmp_transp_capable(hdev) || !lmp_esco_capable(hdev)) {</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hcon = hci_connect_sco(hdev, type, &amp;sco_pi(sk)-&gt;dst,</div><div class='del'>-			       sco_pi(sk)-&gt;setting);</div><div class='add'>+			       sco_pi(sk)-&gt;setting, &amp;sco_pi(sk)-&gt;codec,</div><div class='add'>+			       READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='ctx'> 	if (IS_ERR(hcon)) {</div><div class='ctx'> 		err = PTR_ERR(hcon);</div><div class='del'>-		goto done;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	conn = sco_conn_add(hcon);</div><div class='ctx'> 	if (!conn) {</div><div class='ctx'> 		hci_conn_drop(hcon);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Update source addr of the socket */</div><div class='del'>-	bacpy(&amp;sco_pi(sk)-&gt;src, &amp;hcon-&gt;src);</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	err = sco_chan_add(conn, sk, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		goto done;</div><div class='add'>+	if (err) {</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update source addr of the socket */</div><div class='add'>+	bacpy(&amp;sco_pi(sk)-&gt;src, &amp;hcon-&gt;src);</div><div class='ctx'> </div><div class='ctx'> 	if (hcon-&gt;state == BT_CONNECTED) {</div><div class='ctx'> 		sco_sock_clear_timer(sk);</div><div class='ctx'> 		sk-&gt;sk_state = BT_CONNECTED;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sk-&gt;sk_state = BT_CONNECT;</div><div class='del'>-		sco_sock_set_timer(sk, sk-&gt;sk_sndtimeo);</div><div class='add'>+		sco_sock_set_timer(sk, READ_ONCE(sk-&gt;sk_sndtimeo));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='ctx'> 	hci_dev_unlock(hdev);</div><div class='ctx'> 	hci_dev_put(hdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='add'>+static int sco_send_frame(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			  const struct sockcm_cookie *sockc)</div><div class='ctx'> {</div><div class='ctx'> 	struct sco_conn *conn = sco_pi(sk)-&gt;conn;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int err;</div><div class='add'>+	int len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	/* Check outgoing MTU */</div><div class='ctx'> 	if (len &gt; conn-&gt;mtu)</div><div class='hunk'>@@ -284,15 +390,7 @@ static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p len %d", sk, len);</div><div class='ctx'> </div><div class='del'>-	skb = bt_skb_send_alloc(sk, len, msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (memcpy_from_msg(skb_put(skb, len), msg, len)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	hci_setup_tx_timestamp(skb, 1, sockc);</div><div class='ctx'> 	hci_send_sco(conn-&gt;hcon, skb);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -309,7 +407,7 @@ static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sk %p len %d", sk, skb-&gt;len);</div><div class='add'>+	BT_DBG("sk %p len %u", sk, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state != BT_CONNECTED)</div><div class='ctx'> 		goto drop;</div><div class='hunk'>@@ -368,6 +466,8 @@ static void sco_sock_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='add'>+	sco_conn_put(sco_pi(sk)-&gt;conn);</div><div class='add'>+</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='ctx'> }</div><div class='hunk'>@@ -393,12 +493,18 @@ static void sco_sock_cleanup_listen(struct sock *parent)</div><div class='ctx'>  */</div><div class='ctx'> static void sco_sock_kill(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	if (!sock_flag(sk, SOCK_ZAPPED) || sk-&gt;sk_socket ||</div><div class='del'>-	    sock_flag(sk, SOCK_DEAD))</div><div class='add'>+	if (!sock_flag(sk, SOCK_ZAPPED) || sk-&gt;sk_socket)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p state %d", sk, sk-&gt;sk_state);</div><div class='ctx'> </div><div class='add'>+	/* Sock is dead, so set conn-&gt;sk to NULL to avoid possible UAF */</div><div class='add'>+	if (sco_pi(sk)-&gt;conn) {</div><div class='add'>+		sco_conn_lock(sco_pi(sk)-&gt;conn);</div><div class='add'>+		sco_pi(sk)-&gt;conn-&gt;sk = NULL;</div><div class='add'>+		sco_conn_unlock(sco_pi(sk)-&gt;conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Kill poor orphan */</div><div class='ctx'> 	bt_sock_unlink(&amp;sco_sk_list, sk);</div><div class='ctx'> 	sock_set_flag(sk, SOCK_DEAD);</div><div class='hunk'>@@ -416,17 +522,6 @@ static void __sco_sock_close(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	case BT_CONNECTED:</div><div class='ctx'> 	case BT_CONFIG:</div><div class='del'>-		if (sco_pi(sk)-&gt;conn-&gt;hcon) {</div><div class='del'>-			sk-&gt;sk_state = BT_DISCONN;</div><div class='del'>-			sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);</div><div class='del'>-			sco_conn_lock(sco_pi(sk)-&gt;conn);</div><div class='del'>-			hci_conn_drop(sco_pi(sk)-&gt;conn-&gt;hcon);</div><div class='del'>-			sco_pi(sk)-&gt;conn-&gt;hcon = NULL;</div><div class='del'>-			sco_conn_unlock(sco_pi(sk)-&gt;conn);</div><div class='del'>-		} else</div><div class='del'>-			sco_chan_del(sk, ECONNRESET);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case BT_CONNECT2:</div><div class='ctx'> 	case BT_CONNECT:</div><div class='ctx'> 	case BT_DISCONN:</div><div class='hunk'>@@ -437,16 +532,16 @@ static void __sco_sock_close(struct sock *sk)</div><div class='ctx'> 		sock_set_flag(sk, SOCK_ZAPPED);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called on unlocked socket. */</div><div class='ctx'> static void sco_sock_close(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	sco_sock_clear_timer(sk);</div><div class='ctx'> 	lock_sock(sk);</div><div class='add'>+	sco_sock_clear_timer(sk);</div><div class='ctx'> 	__sco_sock_close(sk);</div><div class='ctx'> 	release_sock(sk);</div><div class='del'>-	sco_sock_kill(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sco_sock_init(struct sock *sk, struct sock *parent)</div><div class='hunk'>@@ -471,24 +566,18 @@ static struct sock *sco_sock_alloc(struct net *net, struct socket *sock,</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk = sk_alloc(net, PF_BLUETOOTH, prio, &amp;sco_proto, kern);</div><div class='add'>+	sk = bt_sock_alloc(net, sock, &amp;sco_proto, proto, prio, kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bt_sk(sk)-&gt;accept_q);</div><div class='del'>-</div><div class='ctx'> 	sk-&gt;sk_destruct = sco_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_sndtimeo = SCO_CONN_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = proto;</div><div class='del'>-	sk-&gt;sk_state    = BT_OPEN;</div><div class='del'>-</div><div class='ctx'> 	sco_pi(sk)-&gt;setting = BT_VOICE_CVSD_16BIT;</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;sk-&gt;sk_timer, sco_sock_timeout, 0);</div><div class='add'>+	sco_pi(sk)-&gt;codec.id = BT_CODEC_CVSD;</div><div class='add'>+	sco_pi(sk)-&gt;codec.cid = 0xffff;</div><div class='add'>+	sco_pi(sk)-&gt;codec.vid = 0xffff;</div><div class='add'>+	sco_pi(sk)-&gt;codec.data_path = 0x00;</div><div class='ctx'> </div><div class='ctx'> 	bt_sock_link(&amp;sco_sk_list, sk);</div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -516,19 +605,19 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+static int sco_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='ctx'> 			 int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("sk %p %pMR", sk, &amp;sa-&gt;sco_bdaddr);</div><div class='del'>-</div><div class='ctx'> 	if (!addr || addr_len &lt; sizeof(struct sockaddr_sco) ||</div><div class='ctx'> 	    addr-&gt;sa_family != AF_BLUETOOTH)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	BT_DBG("sk %p %pMR", sk, &amp;sa-&gt;sco_bdaddr);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state != BT_OPEN) {</div><div class='hunk'>@@ -550,7 +639,7 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)</div><div class='add'>+static int sco_sock_connect(struct socket *sock, struct sockaddr_unsized *addr, int alen, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -566,21 +655,22 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type != SOCK_SEQPACKET)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='del'>-</div><div class='ctx'> 	/* Set destination address and psm */</div><div class='ctx'> 	bacpy(&amp;sco_pi(sk)-&gt;dst, &amp;sa-&gt;sco_bdaddr);</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	err = sco_connect(sk);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto done;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	err = bt_sock_wait_state(sk, BT_CONNECTED,</div><div class='ctx'> 				 sock_sndtimeo(sk, flags &amp; O_NONBLOCK));</div><div class='ctx'> </div><div class='del'>-done:</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -626,7 +716,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sco_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='del'>-			   int flags, bool kern)</div><div class='add'>+			   struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk, *ch;</div><div class='hunk'>@@ -635,7 +725,7 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+	timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p timeo %ld", sk, timeo);</div><div class='ctx'> </div><div class='hunk'>@@ -702,6 +792,8 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			    size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sockcm_cookie sockc;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sock %p, sk %p", sock, sk);</div><div class='hunk'>@@ -713,14 +805,29 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	if (msg-&gt;msg_flags &amp; MSG_OOB)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	hci_sockcm_init(&amp;sockc, sk);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CONNECTED)</div><div class='del'>-		err = sco_send_frame(sk, msg, len);</div><div class='add'>+		err = sco_send_frame(sk, skb, &amp;sockc);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = -ENOTCONN;</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -761,6 +868,11 @@ static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)</div><div class='ctx'> 			cp.max_latency = cpu_to_le16(0xffff);</div><div class='ctx'> 			cp.retrans_effort = 0xff;</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			/* use CVSD settings as fallback */</div><div class='add'>+			cp.max_latency = cpu_to_le16(0xffff);</div><div class='add'>+			cp.retrans_effort = 0xff;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ,</div><div class='hunk'>@@ -774,6 +886,10 @@ static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sco_pinfo *pi = sco_pi(sk);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return sock_recv_errqueue(sk, msg, len, SOL_BLUETOOTH,</div><div class='add'>+					  BT_SCM_ERROR);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == BT_CONNECT2 &amp;&amp;</div><div class='hunk'>@@ -791,12 +907,15 @@ static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sco_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			       char __user *optval, unsigned int optlen)</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct bt_voice voice;</div><div class='ctx'> 	u32 opt;</div><div class='add'>+	struct bt_codecs *codecs;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	__u8 buffer[255];</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -810,10 +929,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_user(opt, (u32 __user *) optval)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (opt)</div><div class='ctx'> 			set_bit(BT_SK_DEFER_SETUP, &amp;bt_sk(sk)-&gt;flags);</div><div class='hunk'>@@ -830,20 +948,90 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		voice.setting = sco_pi(sk)-&gt;setting;</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, sizeof(voice), optlen);</div><div class='del'>-		if (copy_from_user((char *)&amp;voice, optval, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;voice, sizeof(voice), optval,</div><div class='add'>+					     optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		sco_pi(sk)-&gt;setting = voice.setting;</div><div class='add'>+		hdev = hci_get_route(&amp;sco_pi(sk)-&gt;dst, &amp;sco_pi(sk)-&gt;src,</div><div class='add'>+				     BDADDR_BREDR);</div><div class='add'>+		if (!hdev) {</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (sco_pi(sk)-&gt;setting &amp; SCO_AIRMODE_MASK) {</div><div class='add'>+		case SCO_AIRMODE_TRANSP:</div><div class='add'>+			if (enhanced_sync_conn_capable(hdev))</div><div class='add'>+				sco_pi(sk)-&gt;codec.id = BT_CODEC_TRANSPARENT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_dev_put(hdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_PKT_STATUS:</div><div class='add'>+		err = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (opt)</div><div class='add'>+			set_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CODEC:</div><div class='add'>+		if (sk-&gt;sk_state != BT_OPEN &amp;&amp; sk-&gt;sk_state != BT_BOUND &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state != BT_CONNECT2) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hdev = hci_get_route(&amp;sco_pi(sk)-&gt;dst, &amp;sco_pi(sk)-&gt;src,</div><div class='add'>+				     BDADDR_BREDR);</div><div class='add'>+		if (!hdev) {</div><div class='add'>+			err = -EBADFD;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Explicitly check for these values */</div><div class='del'>-		if (voice.setting != BT_VOICE_TRANSPARENT &amp;&amp;</div><div class='del'>-		    voice.setting != BT_VOICE_CVSD_16BIT) {</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED)) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!hdev-&gt;get_data_path_id) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (optlen &lt; sizeof(struct bt_codecs) ||</div><div class='add'>+		    optlen &gt; sizeof(buffer)) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sco_pi(sk)-&gt;setting = voice.setting;</div><div class='add'>+		err = copy_struct_from_sockptr(buffer, sizeof(buffer), optval,</div><div class='add'>+					       optlen);</div><div class='add'>+		if (err) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		codecs = (void *)buffer;</div><div class='add'>+</div><div class='add'>+		if (codecs-&gt;num_codecs &gt; 1) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sco_pi(sk)-&gt;codec = codecs-&gt;codecs[0];</div><div class='add'>+		hci_dev_put(hdev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -861,7 +1049,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sco_options opts;</div><div class='ctx'> 	struct sco_conninfo cinfo;</div><div class='del'>-	int len, err = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	size_t len;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -881,9 +1070,9 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> </div><div class='ctx'> 		opts.mtu = sco_pi(sk)-&gt;conn-&gt;mtu;</div><div class='ctx'> </div><div class='del'>-		BT_DBG("mtu %d", opts.mtu);</div><div class='add'>+		BT_DBG("mtu %u", opts.mtu);</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(opts));</div><div class='add'>+		len = min(len, sizeof(opts));</div><div class='ctx'> 		if (copy_to_user(optval, (char *)&amp;opts, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -901,7 +1090,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,</div><div class='ctx'> 		cinfo.hci_handle = sco_pi(sk)-&gt;conn-&gt;hcon-&gt;handle;</div><div class='ctx'> 		memcpy(cinfo.dev_class, sco_pi(sk)-&gt;conn-&gt;hcon-&gt;dev_class, 3);</div><div class='ctx'> </div><div class='del'>-		len = min_t(unsigned int, len, sizeof(cinfo));</div><div class='add'>+		len = min(len, sizeof(cinfo));</div><div class='ctx'> 		if (copy_to_user(optval, (char *)&amp;cinfo, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -922,6 +1111,13 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int len, err = 0;</div><div class='ctx'> 	struct bt_voice voice;</div><div class='add'>+	u32 phys;</div><div class='add'>+	int buf_len;</div><div class='add'>+	struct codec_list *c;</div><div class='add'>+	u8 num_codecs, i, __user *ptr;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	struct hci_codec_caps *caps;</div><div class='add'>+	struct bt_codec codec;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("sk %p", sk);</div><div class='ctx'> </div><div class='hunk'>@@ -956,6 +1152,132 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case BT_PHY:</div><div class='add'>+		if (sk-&gt;sk_state != BT_CONNECTED) {</div><div class='add'>+			err = -ENOTCONN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phys = hci_conn_get_phy(sco_pi(sk)-&gt;conn-&gt;hcon);</div><div class='add'>+</div><div class='add'>+		if (put_user(phys, (u32 __user *) optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_PKT_STATUS:</div><div class='add'>+		if (put_user(test_bit(BT_SK_PKT_STATUS, &amp;bt_sk(sk)-&gt;flags),</div><div class='add'>+			     (int __user *)optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_SNDMTU:</div><div class='add'>+	case BT_RCVMTU:</div><div class='add'>+		if (sk-&gt;sk_state != BT_CONNECTED) {</div><div class='add'>+			err = -ENOTCONN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (put_user(sco_pi(sk)-&gt;conn-&gt;mtu, (u32 __user *)optval))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BT_CODEC:</div><div class='add'>+		num_codecs = 0;</div><div class='add'>+		buf_len = 0;</div><div class='add'>+</div><div class='add'>+		hdev = hci_get_route(&amp;sco_pi(sk)-&gt;dst, &amp;sco_pi(sk)-&gt;src, BDADDR_BREDR);</div><div class='add'>+		if (!hdev) {</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED)) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!hdev-&gt;get_data_path_id) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+		/* find total buffer size required to copy codec + caps */</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		list_for_each_entry(c, &amp;hdev-&gt;local_codecs, list) {</div><div class='add'>+			if (c-&gt;transport != HCI_TRANSPORT_SCO_ESCO)</div><div class='add'>+				continue;</div><div class='add'>+			num_codecs++;</div><div class='add'>+			for (i = 0, caps = c-&gt;caps; i &lt; c-&gt;num_caps; i++) {</div><div class='add'>+				buf_len += 1 + caps-&gt;len;</div><div class='add'>+				caps = (void *)&amp;caps-&gt;data[caps-&gt;len];</div><div class='add'>+			}</div><div class='add'>+			buf_len += sizeof(struct bt_codec);</div><div class='add'>+		}</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+		buf_len += sizeof(struct bt_codecs);</div><div class='add'>+		if (buf_len &gt; len) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+		}</div><div class='add'>+		ptr = optval;</div><div class='add'>+</div><div class='add'>+		if (put_user(num_codecs, ptr)) {</div><div class='add'>+			hci_dev_put(hdev);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		ptr += sizeof(num_codecs);</div><div class='add'>+</div><div class='add'>+		/* Iterate all the codecs supported over SCO and populate</div><div class='add'>+		 * codec data</div><div class='add'>+		 */</div><div class='add'>+		hci_dev_lock(hdev);</div><div class='add'>+		list_for_each_entry(c, &amp;hdev-&gt;local_codecs, list) {</div><div class='add'>+			if (c-&gt;transport != HCI_TRANSPORT_SCO_ESCO)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			codec.id = c-&gt;id;</div><div class='add'>+			codec.cid = c-&gt;cid;</div><div class='add'>+			codec.vid = c-&gt;vid;</div><div class='add'>+			err = hdev-&gt;get_data_path_id(hdev, &amp;codec.data_path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+			codec.num_caps = c-&gt;num_caps;</div><div class='add'>+			if (copy_to_user(ptr, &amp;codec, sizeof(codec))) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ptr += sizeof(codec);</div><div class='add'>+</div><div class='add'>+			/* find codec capabilities data length */</div><div class='add'>+			len = 0;</div><div class='add'>+			for (i = 0, caps = c-&gt;caps; i &lt; c-&gt;num_caps; i++) {</div><div class='add'>+				len += 1 + caps-&gt;len;</div><div class='add'>+				caps = (void *)&amp;caps-&gt;data[caps-&gt;len];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* copy codec capabilities data */</div><div class='add'>+			if (len &amp;&amp; copy_to_user(ptr, c-&gt;caps, len)) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ptr += len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		hci_dev_put(hdev);</div><div class='add'>+</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+</div><div class='add'>+		if (!err &amp;&amp; put_user(buf_len, optlen))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOPROTOOPT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1007,7 +1329,7 @@ static int sco_sock_release(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> 	sco_sock_close(sk);</div><div class='ctx'> </div><div class='del'>-	if (sock_flag(sk, SOCK_LINGER) &amp;&amp; sk-&gt;sk_lingertime &amp;&amp;</div><div class='add'>+	if (sock_flag(sk, SOCK_LINGER) &amp;&amp; READ_ONCE(sk-&gt;sk_lingertime) &amp;&amp;</div><div class='ctx'> 	    !(current-&gt;flags &amp; PF_EXITING)) {</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> 		err = bt_sock_wait_state(sk, BT_CLOSED, sk-&gt;sk_lingertime);</div><div class='hunk'>@@ -1027,11 +1349,11 @@ static void sco_conn_ready(struct sco_conn *conn)</div><div class='ctx'> 	BT_DBG("conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (sk) {</div><div class='add'>+		lock_sock(sk);</div><div class='ctx'> 		sco_sock_clear_timer(sk);</div><div class='del'>-		bh_lock_sock(sk);</div><div class='ctx'> 		sk-&gt;sk_state = BT_CONNECTED;</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='del'>-		bh_unlock_sock(sk);</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sco_conn_lock(conn);</div><div class='ctx'> </div><div class='hunk'>@@ -1046,12 +1368,12 @@ static void sco_conn_ready(struct sco_conn *conn)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bh_lock_sock(parent);</div><div class='add'>+		lock_sock(parent);</div><div class='ctx'> </div><div class='ctx'> 		sk = sco_sock_alloc(sock_net(parent), NULL,</div><div class='ctx'> 				    BTPROTO_SCO, GFP_ATOMIC, 0);</div><div class='ctx'> 		if (!sk) {</div><div class='del'>-			bh_unlock_sock(parent);</div><div class='add'>+			release_sock(parent);</div><div class='ctx'> 			sco_conn_unlock(conn);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1061,6 +1383,7 @@ static void sco_conn_ready(struct sco_conn *conn)</div><div class='ctx'> 		bacpy(&amp;sco_pi(sk)-&gt;src, &amp;conn-&gt;hcon-&gt;src);</div><div class='ctx'> 		bacpy(&amp;sco_pi(sk)-&gt;dst, &amp;conn-&gt;hcon-&gt;dst);</div><div class='ctx'> </div><div class='add'>+		sco_conn_hold(conn);</div><div class='ctx'> 		hci_conn_hold(conn-&gt;hcon);</div><div class='ctx'> 		__sco_chan_add(conn, sk, parent);</div><div class='ctx'> </div><div class='hunk'>@@ -1072,7 +1395,7 @@ static void sco_conn_ready(struct sco_conn *conn)</div><div class='ctx'> 		/* Wake up parent */</div><div class='ctx'> 		parent-&gt;sk_data_ready(parent);</div><div class='ctx'> </div><div class='del'>-		bh_unlock_sock(parent);</div><div class='add'>+		release_sock(parent);</div><div class='ctx'> </div><div class='ctx'> 		sco_conn_unlock(conn);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1111,14 +1434,16 @@ static void sco_connect_cfm(struct hci_conn *hcon, __u8 status)</div><div class='ctx'> 	if (hcon-&gt;type != SCO_LINK &amp;&amp; hcon-&gt;type != ESCO_LINK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &amp;hcon-&gt;dst, status);</div><div class='add'>+	BT_DBG("hcon %p bdaddr %pMR status %u", hcon, &amp;hcon-&gt;dst, status);</div><div class='ctx'> </div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		struct sco_conn *conn;</div><div class='ctx'> </div><div class='ctx'> 		conn = sco_conn_add(hcon);</div><div class='del'>-		if (conn)</div><div class='add'>+		if (conn) {</div><div class='ctx'> 			sco_conn_ready(conn);</div><div class='add'>+			sco_conn_put(conn);</div><div class='add'>+		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		sco_conn_del(hcon, bt_to_errno(status));</div><div class='ctx'> }</div><div class='hunk'>@@ -1133,22 +1458,39 @@ static void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)</div><div class='ctx'> 	sco_conn_del(hcon, bt_to_errno(reason));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)</div><div class='add'>+int sco_recv_scodata(struct hci_dev *hdev, u16 handle, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sco_conn *conn = hcon-&gt;sco_data;</div><div class='add'>+	struct hci_conn *hcon;</div><div class='add'>+	struct sco_conn *conn;</div><div class='ctx'> </div><div class='del'>-	if (!conn)</div><div class='del'>-		goto drop;</div><div class='add'>+	hci_dev_lock(hdev);</div><div class='add'>+</div><div class='add'>+	hcon = hci_conn_hash_lookup_handle(hdev, handle);</div><div class='add'>+	if (!hcon) {</div><div class='add'>+		hci_dev_unlock(hdev);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p len %d", conn, skb-&gt;len);</div><div class='add'>+	conn = sco_conn_hold_unless_zero(hcon-&gt;sco_data);</div><div class='add'>+	hcon = NULL;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len) {</div><div class='del'>-		sco_recv_frame(conn, skb);</div><div class='del'>-		return;</div><div class='add'>+	hci_dev_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	if (!conn) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	BT_DBG("conn %p len %u", conn, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len)</div><div class='add'>+		sco_recv_frame(conn, skb);</div><div class='add'>+	else</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	sco_conn_put(conn);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct hci_cb sco_cb = {</div><div class='hunk'>@@ -1173,17 +1515,7 @@ static int sco_debugfs_show(struct seq_file *f, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sco_debugfs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, sco_debugfs_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations sco_debugfs_fops = {</div><div class='del'>-	.open		= sco_debugfs_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(sco_debugfs);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *sco_debugfs;</div><div class='ctx'> </div><div class='hunk'>@@ -1200,6 +1532,7 @@ static const struct proto_ops sco_sock_ops = {</div><div class='ctx'> 	.recvmsg	= sco_sock_recvmsg,</div><div class='ctx'> 	.poll		= bt_sock_poll,</div><div class='ctx'> 	.ioctl		= bt_sock_ioctl,</div><div class='add'>+	.gettstamp	= sock_gettstamp,</div><div class='ctx'> 	.mmap		= sock_no_mmap,</div><div class='ctx'> 	.socketpair	= sock_no_socketpair,</div><div class='ctx'> 	.shutdown	= sco_sock_shutdown,</div><div class='head'>diff --git a/net/bluetooth/selftest.c b/net/bluetooth/selftest.c<br/>index 03e3c89c3046..f49604d44b87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/selftest.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/selftest.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/selftest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/selftest.c</a></div><div class='hunk'>@@ -205,7 +205,7 @@ static int __init test_ecdh(void)</div><div class='ctx'> </div><div class='ctx'> 	calltime = ktime_get();</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_kpp("ecdh", CRYPTO_ALG_INTERNAL, 0);</div><div class='add'>+	tfm = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		BT_ERR("Unable to create ECDH crypto context");</div><div class='ctx'> 		err = PTR_ERR(tfm);</div><div class='head'>diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c<br/>index 73f7211d0431..3a1ce04a7a53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/smp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/smp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/smp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/smp.c</a></div><div class='hunk'>@@ -22,11 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;crypto/b128ops.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/kpp.h&gt;</div><div class='add'>+#include &lt;crypto/utils.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> #include &lt;net/bluetooth/hci_core.h&gt;</div><div class='hunk'>@@ -40,7 +39,7 @@</div><div class='ctx'> 	((struct smp_dev *)((struct l2cap_chan *)((hdev)-&gt;smp_data))-&gt;data)</div><div class='ctx'> </div><div class='ctx'> /* Low-level debug macros to be used for stuff that we don't want</div><div class='del'>- * accidentially in dmesg, i.e. the values of the various crypto keys</div><div class='add'>+ * accidentally in dmesg, i.e. the values of the various crypto keys</div><div class='ctx'>  * and the inputs &amp; outputs of crypto functions.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -54,9 +53,11 @@</div><div class='ctx'> #define SMP_ALLOW_CMD(smp, code)	set_bit(code, &amp;smp-&gt;allow_cmd)</div><div class='ctx'> </div><div class='ctx'> /* Keys which are not distributed with Secure Connections */</div><div class='del'>-#define SMP_SC_NO_DIST (SMP_DIST_ENC_KEY | SMP_DIST_LINK_KEY);</div><div class='add'>+#define SMP_SC_NO_DIST (SMP_DIST_ENC_KEY | SMP_DIST_LINK_KEY)</div><div class='ctx'> </div><div class='del'>-#define SMP_TIMEOUT	msecs_to_jiffies(30000)</div><div class='add'>+#define SMP_TIMEOUT	secs_to_jiffies(30)</div><div class='add'>+</div><div class='add'>+#define ID_ADDR_TIMEOUT	msecs_to_jiffies(200)</div><div class='ctx'> </div><div class='ctx'> #define AUTH_REQ_MASK(dev)	(hci_dev_test_flag(dev, HCI_SC_ENABLED) ? \</div><div class='ctx'> 				 0x3f : 0x07)</div><div class='hunk'>@@ -88,10 +89,6 @@ struct smp_dev {</div><div class='ctx'> 	u8			local_rand[16];</div><div class='ctx'> 	bool			debug_key;</div><div class='ctx'> </div><div class='del'>-	u8			min_key_size;</div><div class='del'>-	u8			max_key_size;</div><div class='del'>-</div><div class='del'>-	struct crypto_cipher	*tfm_aes;</div><div class='ctx'> 	struct crypto_shash	*tfm_cmac;</div><div class='ctx'> 	struct crypto_kpp	*tfm_ecdh;</div><div class='ctx'> };</div><div class='hunk'>@@ -115,9 +112,9 @@ struct smp_chan {</div><div class='ctx'> 	u8		id_addr_type;</div><div class='ctx'> 	u8		irk[16];</div><div class='ctx'> 	struct smp_csrk	*csrk;</div><div class='del'>-	struct smp_csrk	*slave_csrk;</div><div class='add'>+	struct smp_csrk	*responder_csrk;</div><div class='ctx'> 	struct smp_ltk	*ltk;</div><div class='del'>-	struct smp_ltk	*slave_ltk;</div><div class='add'>+	struct smp_ltk	*responder_ltk;</div><div class='ctx'> 	struct smp_irk	*remote_irk;</div><div class='ctx'> 	u8		*link_key;</div><div class='ctx'> 	unsigned long	flags;</div><div class='hunk'>@@ -130,7 +127,6 @@ struct smp_chan {</div><div class='ctx'> 	u8			dhkey[32];</div><div class='ctx'> 	u8			mackey[16];</div><div class='ctx'> </div><div class='del'>-	struct crypto_cipher	*tfm_aes;</div><div class='ctx'> 	struct crypto_shash	*tfm_cmac;</div><div class='ctx'> 	struct crypto_kpp	*tfm_ecdh;</div><div class='ctx'> };</div><div class='hunk'>@@ -174,7 +170,6 @@ static int aes_cmac(struct crypto_shash *tfm, const u8 k[16], const u8 *m,</div><div class='ctx'> 		    size_t len, u8 mac[16])</div><div class='ctx'> {</div><div class='ctx'> 	uint8_t tmp[16], mac_msb[16], msg_msb[CMAC_MSG_MAX];</div><div class='del'>-	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; CMAC_MSG_MAX)</div><div class='hunk'>@@ -185,9 +180,6 @@ static int aes_cmac(struct crypto_shash *tfm, const u8 k[16], const u8 *m,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='del'>-</div><div class='ctx'> 	/* Swap key and message from LSB to MSB */</div><div class='ctx'> 	swap_buf(k, tmp, 16);</div><div class='ctx'> 	swap_buf(m, msg_msb, len);</div><div class='hunk'>@@ -201,8 +193,7 @@ static int aes_cmac(struct crypto_shash *tfm, const u8 k[16], const u8 *m,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = crypto_shash_digest(desc, msg_msb, len, mac_msb);</div><div class='del'>-	shash_desc_zero(desc);</div><div class='add'>+	err = crypto_shash_tfm_digest(tfm, msg_msb, len, mac_msb);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("Hash computation error %d", err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -381,22 +372,18 @@ static int smp_h7(struct crypto_shash *tfm_cmac, const u8 w[16],</div><div class='ctx'>  * s1 and ah.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int smp_e(struct crypto_cipher *tfm, const u8 *k, u8 *r)</div><div class='add'>+static int smp_e(const u8 *k, u8 *r)</div><div class='ctx'> {</div><div class='add'>+	struct crypto_aes_ctx ctx;</div><div class='ctx'> 	uint8_t tmp[16], data[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	SMP_DBG("k %16phN r %16phN", k, r);</div><div class='ctx'> </div><div class='del'>-	if (!tfm) {</div><div class='del'>-		BT_ERR("tfm %p", tfm);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* The most significant octet of key corresponds to k[0] */</div><div class='ctx'> 	swap_buf(k, tmp, 16);</div><div class='ctx'> </div><div class='del'>-	err = crypto_cipher_setkey(tfm, tmp, 16);</div><div class='add'>+	err = aes_expandkey(&amp;ctx, tmp, 16);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("cipher setkey failed: %d", err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -405,17 +392,18 @@ static int smp_e(struct crypto_cipher *tfm, const u8 *k, u8 *r)</div><div class='ctx'> 	/* Most significant octet of plaintextData corresponds to data[0] */</div><div class='ctx'> 	swap_buf(r, data, 16);</div><div class='ctx'> </div><div class='del'>-	crypto_cipher_encrypt_one(tfm, data, data);</div><div class='add'>+	aes_encrypt(&amp;ctx, data, data);</div><div class='ctx'> </div><div class='ctx'> 	/* Most significant octet of encryptedData corresponds to data[0] */</div><div class='ctx'> 	swap_buf(data, r, 16);</div><div class='ctx'> </div><div class='ctx'> 	SMP_DBG("r %16phN", r);</div><div class='ctx'> </div><div class='add'>+	memzero_explicit(&amp;ctx, sizeof(ctx));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smp_c1(struct crypto_cipher *tfm_aes, const u8 k[16],</div><div class='add'>+static int smp_c1(const u8 k[16],</div><div class='ctx'> 		  const u8 r[16], const u8 preq[7], const u8 pres[7], u8 _iat,</div><div class='ctx'> 		  const bdaddr_t *ia, u8 _rat, const bdaddr_t *ra, u8 res[16])</div><div class='ctx'> {</div><div class='hunk'>@@ -437,10 +425,10 @@ static int smp_c1(struct crypto_cipher *tfm_aes, const u8 k[16],</div><div class='ctx'> 	SMP_DBG("p1 %16phN", p1);</div><div class='ctx'> </div><div class='ctx'> 	/* res = r XOR p1 */</div><div class='del'>-	u128_xor((u128 *) res, (u128 *) r, (u128 *) p1);</div><div class='add'>+	crypto_xor_cpy(res, r, p1, sizeof(p1));</div><div class='ctx'> </div><div class='ctx'> 	/* res = e(k, res) */</div><div class='del'>-	err = smp_e(tfm_aes, k, res);</div><div class='add'>+	err = smp_e(k, res);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("Encrypt data error");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -454,17 +442,17 @@ static int smp_c1(struct crypto_cipher *tfm_aes, const u8 k[16],</div><div class='ctx'> 	SMP_DBG("p2 %16phN", p2);</div><div class='ctx'> </div><div class='ctx'> 	/* res = res XOR p2 */</div><div class='del'>-	u128_xor((u128 *) res, (u128 *) res, (u128 *) p2);</div><div class='add'>+	crypto_xor(res, p2, sizeof(p2));</div><div class='ctx'> </div><div class='ctx'> 	/* res = e(k, res) */</div><div class='del'>-	err = smp_e(tfm_aes, k, res);</div><div class='add'>+	err = smp_e(k, res);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		BT_ERR("Encrypt data error");</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smp_s1(struct crypto_cipher *tfm_aes, const u8 k[16],</div><div class='add'>+static int smp_s1(const u8 k[16],</div><div class='ctx'> 		  const u8 r1[16], const u8 r2[16], u8 _r[16])</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -473,15 +461,14 @@ static int smp_s1(struct crypto_cipher *tfm_aes, const u8 k[16],</div><div class='ctx'> 	memcpy(_r, r2, 8);</div><div class='ctx'> 	memcpy(_r + 8, r1, 8);</div><div class='ctx'> </div><div class='del'>-	err = smp_e(tfm_aes, k, _r);</div><div class='add'>+	err = smp_e(k, _r);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		BT_ERR("Encrypt data error");</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smp_ah(struct crypto_cipher *tfm, const u8 irk[16],</div><div class='del'>-		  const u8 r[3], u8 res[3])</div><div class='add'>+static int smp_ah(const u8 irk[16], const u8 r[3], u8 res[3])</div><div class='ctx'> {</div><div class='ctx'> 	u8 _res[16];</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -490,7 +477,7 @@ static int smp_ah(struct crypto_cipher *tfm, const u8 irk[16],</div><div class='ctx'> 	memcpy(_res, r, 3);</div><div class='ctx'> 	memset(_res + 3, 0, 13);</div><div class='ctx'> </div><div class='del'>-	err = smp_e(tfm, irk, _res);</div><div class='add'>+	err = smp_e(irk, _res);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("Encrypt error");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -511,18 +498,15 @@ bool smp_irk_matches(struct hci_dev *hdev, const u8 irk[16],</div><div class='ctx'> 		     const bdaddr_t *bdaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan = hdev-&gt;smp_data;</div><div class='del'>-	struct smp_dev *smp;</div><div class='ctx'> 	u8 hash[3];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!chan || !chan-&gt;data)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	smp = chan-&gt;data;</div><div class='del'>-</div><div class='del'>-	BT_DBG("RPA %pMR IRK %*phN", bdaddr, 16, irk);</div><div class='add'>+	bt_dev_dbg(hdev, "RPA %pMR IRK %*phN", bdaddr, 16, irk);</div><div class='ctx'> </div><div class='del'>-	err = smp_ah(smp-&gt;tfm_aes, irk, &amp;bdaddr-&gt;b[3], hash);</div><div class='add'>+	err = smp_ah(irk, &amp;bdaddr-&gt;b[3], hash);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -532,24 +516,21 @@ bool smp_irk_matches(struct hci_dev *hdev, const u8 irk[16],</div><div class='ctx'> int smp_generate_rpa(struct hci_dev *hdev, const u8 irk[16], bdaddr_t *rpa)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan = hdev-&gt;smp_data;</div><div class='del'>-	struct smp_dev *smp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!chan || !chan-&gt;data)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	smp = chan-&gt;data;</div><div class='del'>-</div><div class='ctx'> 	get_random_bytes(&amp;rpa-&gt;b[3], 3);</div><div class='ctx'> </div><div class='ctx'> 	rpa-&gt;b[5] &amp;= 0x3f;	/* Clear two most significant bits */</div><div class='ctx'> 	rpa-&gt;b[5] |= 0x40;	/* Set second most significant bit */</div><div class='ctx'> </div><div class='del'>-	err = smp_ah(smp-&gt;tfm_aes, irk, &amp;rpa-&gt;b[3], rpa-&gt;b);</div><div class='add'>+	err = smp_ah(irk, &amp;rpa-&gt;b[3], rpa-&gt;b);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("RPA %pMR", rpa);</div><div class='add'>+	bt_dev_dbg(hdev, "RPA %pMR", rpa);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -566,7 +547,7 @@ int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16])</div><div class='ctx'> 	smp = chan-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS)) {</div><div class='del'>-		BT_DBG("Using debug keys");</div><div class='add'>+		bt_dev_dbg(hdev, "Using debug keys");</div><div class='ctx'> 		err = set_ecdh_privkey(smp-&gt;tfm_ecdh, debug_sk);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -580,7 +561,7 @@ int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16])</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			/* This is unlikely, but we need to check that</div><div class='del'>-			 * we didn't accidentially generate a debug key.</div><div class='add'>+			 * we didn't accidentally generate a debug key.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (crypto_memneq(smp-&gt;local_pk, debug_pk, 64))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -615,7 +596,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("code 0x%2.2x", code);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "code 0x%2.2x", code);</div><div class='ctx'> </div><div class='ctx'> 	iv[0].iov_base = &amp;code;</div><div class='ctx'> 	iv[0].iov_len = 1;</div><div class='hunk'>@@ -625,9 +606,9 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;msg, 0, sizeof(msg));</div><div class='ctx'> </div><div class='del'>-	iov_iter_kvec(&amp;msg.msg_iter, WRITE | ITER_KVEC, iv, 2, 1 + len);</div><div class='add'>+	iov_iter_kvec(&amp;msg.msg_iter, ITER_SOURCE, iv, 2, 1 + len);</div><div class='ctx'> </div><div class='del'>-	l2cap_chan_send(chan, &amp;msg, 1 + len);</div><div class='add'>+	l2cap_chan_send(chan, &amp;msg, 1 + len, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!chan-&gt;data)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -720,7 +701,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn,</div><div class='ctx'> 	if (rsp == NULL) {</div><div class='ctx'> 		req-&gt;io_capability = conn-&gt;hcon-&gt;io_capability;</div><div class='ctx'> 		req-&gt;oob_flag = oob_flag;</div><div class='del'>-		req-&gt;max_key_size = SMP_DEV(hdev)-&gt;max_key_size;</div><div class='add'>+		req-&gt;max_key_size = hdev-&gt;le_max_key_size;</div><div class='ctx'> 		req-&gt;init_key_dist = local_dist;</div><div class='ctx'> 		req-&gt;resp_key_dist = remote_dist;</div><div class='ctx'> 		req-&gt;auth_req = (authreq &amp; AUTH_REQ_MASK(hdev));</div><div class='hunk'>@@ -731,7 +712,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn,</div><div class='ctx'> </div><div class='ctx'> 	rsp-&gt;io_capability = conn-&gt;hcon-&gt;io_capability;</div><div class='ctx'> 	rsp-&gt;oob_flag = oob_flag;</div><div class='del'>-	rsp-&gt;max_key_size = SMP_DEV(hdev)-&gt;max_key_size;</div><div class='add'>+	rsp-&gt;max_key_size = hdev-&gt;le_max_key_size;</div><div class='ctx'> 	rsp-&gt;init_key_dist = req-&gt;init_key_dist &amp; remote_dist;</div><div class='ctx'> 	rsp-&gt;resp_key_dist = req-&gt;resp_key_dist &amp; local_dist;</div><div class='ctx'> 	rsp-&gt;auth_req = (authreq &amp; AUTH_REQ_MASK(hdev));</div><div class='hunk'>@@ -745,7 +726,11 @@ static u8 check_enc_key_size(struct l2cap_conn *conn, __u8 max_key_size)</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hcon-&gt;hdev;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (max_key_size &gt; SMP_DEV(hdev)-&gt;max_key_size ||</div><div class='add'>+	if (conn-&gt;hcon-&gt;pending_sec_level == BT_SECURITY_FIPS &amp;&amp;</div><div class='add'>+	    max_key_size != SMP_MAX_ENC_KEY_SIZE)</div><div class='add'>+		return SMP_ENC_KEY_SIZE;</div><div class='add'>+</div><div class='add'>+	if (max_key_size &gt; hdev-&gt;le_max_key_size ||</div><div class='ctx'> 	    max_key_size &lt; SMP_MIN_ENC_KEY_SIZE)</div><div class='ctx'> 		return SMP_ENC_KEY_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -768,11 +753,10 @@ static void smp_chan_destroy(struct l2cap_conn *conn)</div><div class='ctx'> 	complete = test_bit(SMP_FLAG_COMPLETE, &amp;smp-&gt;flags);</div><div class='ctx'> 	mgmt_smp_complete(hcon, complete);</div><div class='ctx'> </div><div class='del'>-	kzfree(smp-&gt;csrk);</div><div class='del'>-	kzfree(smp-&gt;slave_csrk);</div><div class='del'>-	kzfree(smp-&gt;link_key);</div><div class='add'>+	kfree_sensitive(smp-&gt;csrk);</div><div class='add'>+	kfree_sensitive(smp-&gt;responder_csrk);</div><div class='add'>+	kfree_sensitive(smp-&gt;link_key);</div><div class='ctx'> </div><div class='del'>-	crypto_free_cipher(smp-&gt;tfm_aes);</div><div class='ctx'> 	crypto_free_shash(smp-&gt;tfm_cmac);</div><div class='ctx'> 	crypto_free_kpp(smp-&gt;tfm_ecdh);</div><div class='ctx'> </div><div class='hunk'>@@ -793,9 +777,9 @@ static void smp_chan_destroy(struct l2cap_conn *conn)</div><div class='ctx'> 			kfree_rcu(smp-&gt;ltk, rcu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (smp-&gt;slave_ltk) {</div><div class='del'>-			list_del_rcu(&amp;smp-&gt;slave_ltk-&gt;list);</div><div class='del'>-			kfree_rcu(smp-&gt;slave_ltk, rcu);</div><div class='add'>+		if (smp-&gt;responder_ltk) {</div><div class='add'>+			list_del_rcu(&amp;smp-&gt;responder_ltk-&gt;list);</div><div class='add'>+			kfree_rcu(smp-&gt;responder_ltk, rcu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (smp-&gt;remote_irk) {</div><div class='hunk'>@@ -805,7 +789,7 @@ static void smp_chan_destroy(struct l2cap_conn *conn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;data = NULL;</div><div class='del'>-	kzfree(smp);</div><div class='add'>+	kfree_sensitive(smp);</div><div class='ctx'> 	hci_conn_drop(hcon);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -870,13 +854,14 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> 	u32 passkey = 0;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize key for JUST WORKS */</div><div class='ctx'> 	memset(smp-&gt;tk, 0, sizeof(smp-&gt;tk));</div><div class='ctx'> 	clear_bit(SMP_FLAG_TK_VALID, &amp;smp-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("tk_request: auth:%d lcl:%d rem:%d", auth, local_io, remote_io);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "auth:%u lcl:%u rem:%u", auth, local_io,</div><div class='add'>+		   remote_io);</div><div class='ctx'> </div><div class='ctx'> 	/* If neither side wants MITM, either "just" confirm an incoming</div><div class='ctx'> 	 * request or use just-works for outgoing ones. The JUST_CFM</div><div class='hunk'>@@ -899,9 +884,16 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,</div><div class='ctx'> 	    hcon-&gt;io_capability == HCI_IO_NO_INPUT_OUTPUT)</div><div class='ctx'> 		smp-&gt;method = JUST_WORKS;</div><div class='ctx'> </div><div class='del'>-	/* If Just Works, Continue with Zero TK */</div><div class='add'>+	/* If Just Works, Continue with Zero TK and ask user-space for</div><div class='add'>+	 * confirmation */</div><div class='ctx'> 	if (smp-&gt;method == JUST_WORKS) {</div><div class='del'>-		set_bit(SMP_FLAG_TK_VALID, &amp;smp-&gt;flags);</div><div class='add'>+		ret = mgmt_user_confirm_request(hcon-&gt;hdev, &amp;hcon-&gt;dst,</div><div class='add'>+						hcon-&gt;type,</div><div class='add'>+						hcon-&gt;dst_type,</div><div class='add'>+						passkey, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		set_bit(SMP_FLAG_WAIT_USER, &amp;smp-&gt;flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -918,11 +910,11 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,</div><div class='ctx'> 			hcon-&gt;pending_sec_level = BT_SECURITY_HIGH;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If both devices have Keyoard-Display I/O, the master</div><div class='del'>-	 * Confirms and the slave Enters the passkey.</div><div class='add'>+	/* If both devices have Keyboard-Display I/O, the initiator</div><div class='add'>+	 * Confirms and the responder Enters the passkey.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (smp-&gt;method == OVERLAP) {</div><div class='del'>-		if (hcon-&gt;role == HCI_ROLE_MASTER)</div><div class='add'>+		if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 			smp-&gt;method = CFM_PASSKEY;</div><div class='ctx'> 		else</div><div class='ctx'> 			smp-&gt;method = REQ_PASSKEY;</div><div class='hunk'>@@ -934,7 +926,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,</div><div class='ctx'> 		get_random_bytes(&amp;passkey, sizeof(passkey));</div><div class='ctx'> 		passkey %= 1000000;</div><div class='ctx'> 		put_unaligned_le32(passkey, smp-&gt;tk);</div><div class='del'>-		BT_DBG("PassKey: %d", passkey);</div><div class='add'>+		bt_dev_dbg(hcon-&gt;hdev, "PassKey: %u", passkey);</div><div class='ctx'> 		set_bit(SMP_FLAG_TK_VALID, &amp;smp-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -959,9 +951,9 @@ static u8 smp_confirm(struct smp_chan *smp)</div><div class='ctx'> 	struct smp_cmd_pairing_confirm cp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='del'>-	ret = smp_c1(smp-&gt;tfm_aes, smp-&gt;tk, smp-&gt;prnd, smp-&gt;preq, smp-&gt;prsp,</div><div class='add'>+	ret = smp_c1(smp-&gt;tk, smp-&gt;prnd, smp-&gt;preq, smp-&gt;prsp,</div><div class='ctx'> 		     conn-&gt;hcon-&gt;init_addr_type, &amp;conn-&gt;hcon-&gt;init_addr,</div><div class='ctx'> 		     conn-&gt;hcon-&gt;resp_addr_type, &amp;conn-&gt;hcon-&gt;resp_addr,</div><div class='ctx'> 		     cp.confirm_val);</div><div class='hunk'>@@ -972,7 +964,7 @@ static u8 smp_confirm(struct smp_chan *smp)</div><div class='ctx'> </div><div class='ctx'> 	smp_send_cmd(smp-&gt;conn, SMP_CMD_PAIRING_CONFIRM, sizeof(cp), &amp;cp);</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;hcon-&gt;out)</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_CONFIRM);</div><div class='ctx'> 	else</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RANDOM);</div><div class='hunk'>@@ -987,12 +979,11 @@ static u8 smp_random(struct smp_chan *smp)</div><div class='ctx'> 	u8 confirm[16];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(smp-&gt;tfm_aes))</div><div class='del'>-		return SMP_UNSPECIFIED;</div><div class='del'>-</div><div class='del'>-	BT_DBG("conn %p %s", conn, conn-&gt;hcon-&gt;out ? "master" : "slave");</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "conn %p %s", conn,</div><div class='add'>+		   test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags) ? "initiator" :</div><div class='add'>+		   "responder");</div><div class='ctx'> </div><div class='del'>-	ret = smp_c1(smp-&gt;tfm_aes, smp-&gt;tk, smp-&gt;rrnd, smp-&gt;preq, smp-&gt;prsp,</div><div class='add'>+	ret = smp_c1(smp-&gt;tk, smp-&gt;rrnd, smp-&gt;preq, smp-&gt;prsp,</div><div class='ctx'> 		     hcon-&gt;init_addr_type, &amp;hcon-&gt;init_addr,</div><div class='ctx'> 		     hcon-&gt;resp_addr_type, &amp;hcon-&gt;resp_addr, confirm);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1004,12 +995,12 @@ static u8 smp_random(struct smp_chan *smp)</div><div class='ctx'> 		return SMP_CONFIRM_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		u8 stk[16];</div><div class='ctx'> 		__le64 rand = 0;</div><div class='ctx'> 		__le16 ediv = 0;</div><div class='ctx'> </div><div class='del'>-		smp_s1(smp-&gt;tfm_aes, smp-&gt;tk, smp-&gt;rrnd, smp-&gt;prnd, stk);</div><div class='add'>+		smp_s1(smp-&gt;tk, smp-&gt;rrnd, smp-&gt;prnd, stk);</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &amp;hcon-&gt;flags))</div><div class='ctx'> 			return SMP_UNSPECIFIED;</div><div class='hunk'>@@ -1025,15 +1016,15 @@ static u8 smp_random(struct smp_chan *smp)</div><div class='ctx'> 		smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM, sizeof(smp-&gt;prnd),</div><div class='ctx'> 			     smp-&gt;prnd);</div><div class='ctx'> </div><div class='del'>-		smp_s1(smp-&gt;tfm_aes, smp-&gt;tk, smp-&gt;prnd, smp-&gt;rrnd, stk);</div><div class='add'>+		smp_s1(smp-&gt;tk, smp-&gt;prnd, smp-&gt;rrnd, stk);</div><div class='ctx'> </div><div class='ctx'> 		if (hcon-&gt;pending_sec_level == BT_SECURITY_HIGH)</div><div class='ctx'> 			auth = 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			auth = 0;</div><div class='ctx'> </div><div class='del'>-		/* Even though there's no _SLAVE suffix this is the</div><div class='del'>-		 * slave STK we're adding for later lookup (the master</div><div class='add'>+		/* Even though there's no _RESPONDER suffix this is the</div><div class='add'>+		 * responder STK we're adding for later lookup (the initiator</div><div class='ctx'> 		 * STK never needs to be stored).</div><div class='ctx'> 		 */</div><div class='ctx'> 		hci_add_ltk(hcon-&gt;hdev, &amp;hcon-&gt;dst, hcon-&gt;dst_type,</div><div class='hunk'>@@ -1078,7 +1069,12 @@ static void smp_notify_keys(struct l2cap_conn *conn)</div><div class='ctx'> 		if (hcon-&gt;type == LE_LINK) {</div><div class='ctx'> 			bacpy(&amp;hcon-&gt;dst, &amp;smp-&gt;remote_irk-&gt;bdaddr);</div><div class='ctx'> 			hcon-&gt;dst_type = smp-&gt;remote_irk-&gt;addr_type;</div><div class='del'>-			queue_work(hdev-&gt;workqueue, &amp;conn-&gt;id_addr_update_work);</div><div class='add'>+			/* Use a short delay to make sure the new address is</div><div class='add'>+			 * propagated _before_ the channels.</div><div class='add'>+			 */</div><div class='add'>+			queue_delayed_work(hdev-&gt;workqueue,</div><div class='add'>+					   &amp;conn-&gt;id_addr_timer,</div><div class='add'>+					   ID_ADDR_TIMEOUT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1088,10 +1084,10 @@ static void smp_notify_keys(struct l2cap_conn *conn)</div><div class='ctx'> 		mgmt_new_csrk(hdev, smp-&gt;csrk, persistent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (smp-&gt;slave_csrk) {</div><div class='del'>-		smp-&gt;slave_csrk-&gt;bdaddr_type = hcon-&gt;dst_type;</div><div class='del'>-		bacpy(&amp;smp-&gt;slave_csrk-&gt;bdaddr, &amp;hcon-&gt;dst);</div><div class='del'>-		mgmt_new_csrk(hdev, smp-&gt;slave_csrk, persistent);</div><div class='add'>+	if (smp-&gt;responder_csrk) {</div><div class='add'>+		smp-&gt;responder_csrk-&gt;bdaddr_type = hcon-&gt;dst_type;</div><div class='add'>+		bacpy(&amp;smp-&gt;responder_csrk-&gt;bdaddr, &amp;hcon-&gt;dst);</div><div class='add'>+		mgmt_new_csrk(hdev, smp-&gt;responder_csrk, persistent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;ltk) {</div><div class='hunk'>@@ -1100,10 +1096,10 @@ static void smp_notify_keys(struct l2cap_conn *conn)</div><div class='ctx'> 		mgmt_new_ltk(hdev, smp-&gt;ltk, persistent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (smp-&gt;slave_ltk) {</div><div class='del'>-		smp-&gt;slave_ltk-&gt;bdaddr_type = hcon-&gt;dst_type;</div><div class='del'>-		bacpy(&amp;smp-&gt;slave_ltk-&gt;bdaddr, &amp;hcon-&gt;dst);</div><div class='del'>-		mgmt_new_ltk(hdev, smp-&gt;slave_ltk, persistent);</div><div class='add'>+	if (smp-&gt;responder_ltk) {</div><div class='add'>+		smp-&gt;responder_ltk-&gt;bdaddr_type = hcon-&gt;dst_type;</div><div class='add'>+		bacpy(&amp;smp-&gt;responder_ltk-&gt;bdaddr, &amp;hcon-&gt;dst);</div><div class='add'>+		mgmt_new_ltk(hdev, smp-&gt;responder_ltk, persistent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;link_key) {</div><div class='hunk'>@@ -1164,11 +1160,11 @@ static void sc_generate_link_key(struct smp_chan *smp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(SMP_FLAG_CT2, &amp;smp-&gt;flags)) {</div><div class='del'>-		/* SALT = 0x00000000000000000000000000000000746D7031 */</div><div class='add'>+		/* SALT = 0x000000000000000000000000746D7031 */</div><div class='ctx'> 		const u8 salt[16] = { 0x31, 0x70, 0x6d, 0x74 };</div><div class='ctx'> </div><div class='ctx'> 		if (smp_h7(smp-&gt;tfm_cmac, smp-&gt;tk, salt, smp-&gt;link_key)) {</div><div class='del'>-			kzfree(smp-&gt;link_key);</div><div class='add'>+			kfree_sensitive(smp-&gt;link_key);</div><div class='ctx'> 			smp-&gt;link_key = NULL;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1177,14 +1173,14 @@ static void sc_generate_link_key(struct smp_chan *smp)</div><div class='ctx'> 		const u8 tmp1[4] = { 0x31, 0x70, 0x6d, 0x74 };</div><div class='ctx'> </div><div class='ctx'> 		if (smp_h6(smp-&gt;tfm_cmac, smp-&gt;tk, tmp1, smp-&gt;link_key)) {</div><div class='del'>-			kzfree(smp-&gt;link_key);</div><div class='add'>+			kfree_sensitive(smp-&gt;link_key);</div><div class='ctx'> 			smp-&gt;link_key = NULL;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smp_h6(smp-&gt;tfm_cmac, smp-&gt;link_key, lebr, smp-&gt;link_key)) {</div><div class='del'>-		kzfree(smp-&gt;link_key);</div><div class='add'>+		kfree_sensitive(smp-&gt;link_key);</div><div class='ctx'> 		smp-&gt;link_key = NULL;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1222,7 +1218,7 @@ static void sc_generate_ltk(struct smp_chan *smp)</div><div class='ctx'> 		set_bit(SMP_FLAG_DEBUG_KEY, &amp;smp-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(SMP_FLAG_CT2, &amp;smp-&gt;flags)) {</div><div class='del'>-		/* SALT = 0x00000000000000000000000000000000746D7032 */</div><div class='add'>+		/* SALT = 0x000000000000000000000000746D7032 */</div><div class='ctx'> 		const u8 salt[16] = { 0x32, 0x70, 0x6d, 0x74 };</div><div class='ctx'> </div><div class='ctx'> 		if (smp_h7(smp-&gt;tfm_cmac, key-&gt;val, salt, smp-&gt;tk))</div><div class='hunk'>@@ -1249,19 +1245,20 @@ static void smp_distribute_keys(struct smp_chan *smp)</div><div class='ctx'> 	struct hci_dev *hdev = hcon-&gt;hdev;</div><div class='ctx'> 	__u8 *keydist;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	rsp = (void *) &amp;smp-&gt;prsp[1];</div><div class='ctx'> </div><div class='ctx'> 	/* The responder sends its keys first */</div><div class='del'>-	if (hcon-&gt;out &amp;&amp; (smp-&gt;remote_key_dist &amp; KEY_DIST_MASK)) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags) &amp;&amp;</div><div class='add'>+	    (smp-&gt;remote_key_dist &amp; KEY_DIST_MASK)) {</div><div class='ctx'> 		smp_allow_key_dist(smp);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	req = (void *) &amp;smp-&gt;preq[1];</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		keydist = &amp;rsp-&gt;init_key_dist;</div><div class='ctx'> 		*keydist &amp;= req-&gt;init_key_dist;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1279,11 +1276,11 @@ static void smp_distribute_keys(struct smp_chan *smp)</div><div class='ctx'> 		*keydist &amp;= ~SMP_SC_NO_DIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BT_DBG("keydist 0x%x", *keydist);</div><div class='add'>+	bt_dev_dbg(hdev, "keydist 0x%x", *keydist);</div><div class='ctx'> </div><div class='ctx'> 	if (*keydist &amp; SMP_DIST_ENC_KEY) {</div><div class='ctx'> 		struct smp_cmd_encrypt_info enc;</div><div class='del'>-		struct smp_cmd_master_ident ident;</div><div class='add'>+		struct smp_cmd_initiator_ident ident;</div><div class='ctx'> 		struct smp_ltk *ltk;</div><div class='ctx'> 		u8 authenticated;</div><div class='ctx'> 		__le16 ediv;</div><div class='hunk'>@@ -1304,14 +1301,15 @@ static void smp_distribute_keys(struct smp_chan *smp)</div><div class='ctx'> </div><div class='ctx'> 		authenticated = hcon-&gt;sec_level == BT_SECURITY_HIGH;</div><div class='ctx'> 		ltk = hci_add_ltk(hdev, &amp;hcon-&gt;dst, hcon-&gt;dst_type,</div><div class='del'>-				  SMP_LTK_SLAVE, authenticated, enc.ltk,</div><div class='add'>+				  SMP_LTK_RESPONDER, authenticated, enc.ltk,</div><div class='ctx'> 				  smp-&gt;enc_key_size, ediv, rand);</div><div class='del'>-		smp-&gt;slave_ltk = ltk;</div><div class='add'>+		smp-&gt;responder_ltk = ltk;</div><div class='ctx'> </div><div class='ctx'> 		ident.ediv = ediv;</div><div class='ctx'> 		ident.rand = rand;</div><div class='ctx'> </div><div class='del'>-		smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &amp;ident);</div><div class='add'>+		smp_send_cmd(conn, SMP_CMD_INITIATOR_IDENT, sizeof(ident),</div><div class='add'>+			     &amp;ident);</div><div class='ctx'> </div><div class='ctx'> 		*keydist &amp;= ~SMP_DIST_ENC_KEY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1354,7 +1352,7 @@ static void smp_distribute_keys(struct smp_chan *smp)</div><div class='ctx'> 				csrk-&gt;type = MGMT_CSRK_LOCAL_UNAUTHENTICATED;</div><div class='ctx'> 			memcpy(csrk-&gt;val, sign.csrk, sizeof(csrk-&gt;val));</div><div class='ctx'> 		}</div><div class='del'>-		smp-&gt;slave_csrk = csrk;</div><div class='add'>+		smp-&gt;responder_csrk = csrk;</div><div class='ctx'> </div><div class='ctx'> 		smp_send_cmd(conn, SMP_CMD_SIGN_INFO, sizeof(sign), &amp;sign);</div><div class='ctx'> </div><div class='hunk'>@@ -1379,13 +1377,14 @@ static void smp_timeout(struct work_struct *work)</div><div class='ctx'> 					    security_timer.work);</div><div class='ctx'> 	struct l2cap_conn *conn = smp-&gt;conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='del'>-	hci_disconnect(conn-&gt;hcon, HCI_ERROR_REMOTE_USER_TERM);</div><div class='add'>+	hci_disconnect(conn-&gt;hcon, HCI_ERROR_AUTH_FAILURE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)</div><div class='ctx'> {</div><div class='add'>+	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp;</div><div class='ctx'> </div><div class='hunk'>@@ -1393,21 +1392,15 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)</div><div class='ctx'> 	if (!smp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	smp-&gt;tfm_aes = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (IS_ERR(smp-&gt;tfm_aes)) {</div><div class='del'>-		BT_ERR("Unable to create AES crypto context");</div><div class='del'>-		goto zfree_smp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	smp-&gt;tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, 0);</div><div class='ctx'> 	if (IS_ERR(smp-&gt;tfm_cmac)) {</div><div class='del'>-		BT_ERR("Unable to create CMAC crypto context");</div><div class='del'>-		goto free_cipher;</div><div class='add'>+		bt_dev_err(hcon-&gt;hdev, "Unable to create CMAC crypto context");</div><div class='add'>+		goto zfree_smp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	smp-&gt;tfm_ecdh = crypto_alloc_kpp("ecdh", CRYPTO_ALG_INTERNAL, 0);</div><div class='add'>+	smp-&gt;tfm_ecdh = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);</div><div class='ctx'> 	if (IS_ERR(smp-&gt;tfm_ecdh)) {</div><div class='del'>-		BT_ERR("Unable to create ECDH crypto context");</div><div class='add'>+		bt_dev_err(hcon-&gt;hdev, "Unable to create ECDH crypto context");</div><div class='ctx'> 		goto free_shash;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1418,16 +1411,14 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;smp-&gt;security_timer, smp_timeout);</div><div class='ctx'> </div><div class='del'>-	hci_conn_hold(conn-&gt;hcon);</div><div class='add'>+	hci_conn_hold(hcon);</div><div class='ctx'> </div><div class='ctx'> 	return smp;</div><div class='ctx'> </div><div class='ctx'> free_shash:</div><div class='ctx'> 	crypto_free_shash(smp-&gt;tfm_cmac);</div><div class='del'>-free_cipher:</div><div class='del'>-	crypto_free_cipher(smp-&gt;tfm_aes);</div><div class='ctx'> zfree_smp:</div><div class='del'>-	kzfree(smp);</div><div class='add'>+	kfree_sensitive(smp);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1436,7 +1427,7 @@ static int sc_mackey_and_ltk(struct smp_chan *smp, u8 mackey[16], u8 ltk[16])</div><div class='ctx'> 	struct hci_conn *hcon = smp-&gt;conn-&gt;hcon;</div><div class='ctx'> 	u8 *na, *nb, a[7], b[7];</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		na   = smp-&gt;prnd;</div><div class='ctx'> 		nb   = smp-&gt;rrnd;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1464,7 +1455,7 @@ static void sc_dhkey_check(struct smp_chan *smp)</div><div class='ctx'> 	a[6] = hcon-&gt;init_addr_type;</div><div class='ctx'> 	b[6] = hcon-&gt;resp_addr_type;</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		local_addr = a;</div><div class='ctx'> 		remote_addr = b;</div><div class='ctx'> 		memcpy(io_cap, &amp;smp-&gt;preq[1], 3);</div><div class='hunk'>@@ -1543,7 +1534,7 @@ static u8 sc_passkey_round(struct smp_chan *smp, u8 smp_op)</div><div class='ctx'> 		/* The round is only complete when the initiator</div><div class='ctx'> 		 * receives pairing random.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!hcon-&gt;out) {</div><div class='add'>+		if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 			smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,</div><div class='ctx'> 				     sizeof(smp-&gt;prnd), smp-&gt;prnd);</div><div class='ctx'> 			if (smp-&gt;passkey_round == 20)</div><div class='hunk'>@@ -1571,7 +1562,7 @@ static u8 sc_passkey_round(struct smp_chan *smp, u8 smp_op)</div><div class='ctx'> </div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RANDOM);</div><div class='ctx'> </div><div class='del'>-		if (hcon-&gt;out) {</div><div class='add'>+		if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 			smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,</div><div class='ctx'> 				     sizeof(smp-&gt;prnd), smp-&gt;prnd);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1582,11 +1573,11 @@ static u8 sc_passkey_round(struct smp_chan *smp, u8 smp_op)</div><div class='ctx'> 	case SMP_CMD_PUBLIC_KEY:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Initiating device starts the round */</div><div class='del'>-		if (!hcon-&gt;out)</div><div class='add'>+		if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		BT_DBG("%s Starting passkey round %u", hdev-&gt;name,</div><div class='del'>-		       smp-&gt;passkey_round + 1);</div><div class='add'>+		bt_dev_dbg(hdev, "Starting passkey round %u",</div><div class='add'>+			   smp-&gt;passkey_round + 1);</div><div class='ctx'> </div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_CONFIRM);</div><div class='ctx'> </div><div class='hunk'>@@ -1627,7 +1618,7 @@ static int sc_user_reply(struct smp_chan *smp, u16 mgmt_op, __le32 passkey)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initiator sends DHKey check first */</div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		sc_dhkey_check(smp);</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);</div><div class='ctx'> 	} else if (test_and_clear_bit(SMP_FLAG_DHKEY_PENDING, &amp;smp-&gt;flags)) {</div><div class='hunk'>@@ -1646,11 +1637,11 @@ int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey)</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='del'>-</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "");</div><div class='add'>+</div><div class='ctx'> 	chan = conn-&gt;smp;</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='hunk'>@@ -1672,9 +1663,9 @@ int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey)</div><div class='ctx'> 	case MGMT_OP_USER_PASSKEY_REPLY:</div><div class='ctx'> 		value = le32_to_cpu(passkey);</div><div class='ctx'> 		memset(smp-&gt;tk, 0, sizeof(smp-&gt;tk));</div><div class='del'>-		BT_DBG("PassKey: %d", value);</div><div class='add'>+		bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "PassKey: %u", value);</div><div class='ctx'> 		put_unaligned_le32(value, smp-&gt;tk);</div><div class='del'>-		/* Fall Through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case MGMT_OP_USER_CONFIRM_REPLY:</div><div class='ctx'> 		set_bit(SMP_FLAG_TK_VALID, &amp;smp-&gt;flags);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1750,25 +1741,23 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct smp_cmd_pairing rsp, *req = (void *) skb-&gt;data;</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hcon-&gt;hdev;</div><div class='del'>-	struct smp_chan *smp;</div><div class='add'>+	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> 	u8 key_size, auth, sec_level;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*req))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;hcon-&gt;role != HCI_ROLE_SLAVE)</div><div class='add'>+	if (smp &amp;&amp; test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		return SMP_CMD_NOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!chan-&gt;data)</div><div class='add'>+	if (!smp) {</div><div class='ctx'> 		smp = smp_chan_create(conn);</div><div class='del'>-	else</div><div class='del'>-		smp = chan-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!smp)</div><div class='del'>-		return SMP_UNSPECIFIED;</div><div class='add'>+		if (!smp)</div><div class='add'>+			return SMP_UNSPECIFIED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* We didn't start the pairing, so match remote */</div><div class='ctx'> 	auth = req-&gt;auth_req &amp; AUTH_REQ_MASK(hdev);</div><div class='hunk'>@@ -1887,7 +1876,7 @@ static u8 sc_send_public_key(struct smp_chan *smp)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_dev *hdev = smp-&gt;conn-&gt;hcon-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(SMP_FLAG_LOCAL_OOB, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		struct l2cap_chan *chan = hdev-&gt;smp_data;</div><div class='hunk'>@@ -1908,7 +1897,7 @@ static u8 sc_send_public_key(struct smp_chan *smp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_USE_DEBUG_KEYS)) {</div><div class='del'>-		BT_DBG("Using debug keys");</div><div class='add'>+		bt_dev_dbg(hdev, "Using debug keys");</div><div class='ctx'> 		if (set_ecdh_privkey(smp-&gt;tfm_ecdh, debug_sk))</div><div class='ctx'> 			return SMP_UNSPECIFIED;</div><div class='ctx'> 		memcpy(smp-&gt;local_pk, debug_pk, 64);</div><div class='hunk'>@@ -1920,7 +1909,7 @@ static u8 sc_send_public_key(struct smp_chan *smp)</div><div class='ctx'> 				return SMP_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 			/* This is unlikely, but we need to check that</div><div class='del'>-			 * we didn't accidentially generate a debug key.</div><div class='add'>+			 * we didn't accidentally generate a debug key.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (crypto_memneq(smp-&gt;local_pk, debug_pk, 64))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1945,12 +1934,12 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	u8 key_size, auth;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rsp))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;hcon-&gt;role != HCI_ROLE_MASTER)</div><div class='add'>+	if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		return SMP_CMD_NOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(*rsp));</div><div class='hunk'>@@ -2040,12 +2029,12 @@ static u8 sc_check_confirm(struct smp_chan *smp)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = smp-&gt;conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;method == REQ_PASSKEY || smp-&gt;method == DSP_PASSKEY)</div><div class='ctx'> 		return sc_passkey_round(smp, SMP_CMD_PAIRING_CONFIRM);</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM, sizeof(smp-&gt;prnd),</div><div class='ctx'> 			     smp-&gt;prnd);</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RANDOM);</div><div class='hunk'>@@ -2066,8 +2055,8 @@ static int fixup_sc_false_positive(struct smp_chan *smp)</div><div class='ctx'> 	struct smp_cmd_pairing *req, *rsp;</div><div class='ctx'> 	u8 auth;</div><div class='ctx'> </div><div class='del'>-	/* The issue is only observed when we're in slave role */</div><div class='del'>-	if (hcon-&gt;out)</div><div class='add'>+	/* The issue is only observed when we're in responder role */</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		return SMP_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	if (hci_dev_test_flag(hdev, HCI_SC_ONLY)) {</div><div class='hunk'>@@ -2099,8 +2088,12 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='add'>+	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='add'>+	struct hci_dev *hdev = hcon-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p %s", conn, conn-&gt;hcon-&gt;out ? "master" : "slave");</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p %s", conn,</div><div class='add'>+		   test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags) ? "initiator" :</div><div class='add'>+		   "responder");</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(smp-&gt;pcnf))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2115,14 +2108,14 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 		if (test_bit(SMP_FLAG_REMOTE_PK, &amp;smp-&gt;flags))</div><div class='ctx'> 			return sc_check_confirm(smp);</div><div class='ctx'> </div><div class='del'>-		BT_ERR("Unexpected SMP Pairing Confirm");</div><div class='add'>+		bt_dev_err(hdev, "Unexpected SMP Pairing Confirm");</div><div class='ctx'> </div><div class='ctx'> 		ret = fixup_sc_false_positive(smp);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM, sizeof(smp-&gt;prnd),</div><div class='ctx'> 			     smp-&gt;prnd);</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RANDOM);</div><div class='hunk'>@@ -2142,11 +2135,11 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='del'>-	u8 *pkax, *pkbx, *na, *nb;</div><div class='del'>-	u32 passkey;</div><div class='add'>+	u8 *pkax, *pkbx, *na, *nb, confirm_hint;</div><div class='add'>+	u32 passkey = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(smp-&gt;rrnd))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2157,7 +2150,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	if (!test_bit(SMP_FLAG_SC, &amp;smp-&gt;flags))</div><div class='ctx'> 		return smp_random(smp);</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		pkax = smp-&gt;local_pk;</div><div class='ctx'> 		pkbx = smp-&gt;remote_pk;</div><div class='ctx'> 		na   = smp-&gt;prnd;</div><div class='hunk'>@@ -2170,7 +2163,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;method == REQ_OOB) {</div><div class='del'>-		if (!hcon-&gt;out)</div><div class='add'>+		if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 			smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,</div><div class='ctx'> 				     sizeof(smp-&gt;prnd), smp-&gt;prnd);</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);</div><div class='hunk'>@@ -2181,7 +2174,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	if (smp-&gt;method == REQ_PASSKEY || smp-&gt;method == DSP_PASSKEY)</div><div class='ctx'> 		return sc_passkey_round(smp, SMP_CMD_PAIRING_RANDOM);</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		u8 cfm[16];</div><div class='ctx'> </div><div class='ctx'> 		err = smp_f4(smp-&gt;tfm_cmac, smp-&gt;remote_pk, smp-&gt;local_pk,</div><div class='hunk'>@@ -2203,8 +2196,8 @@ mackey_and_ltk:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return SMP_UNSPECIFIED;</div><div class='ctx'> </div><div class='del'>-	if (smp-&gt;method == JUST_WORKS || smp-&gt;method == REQ_OOB) {</div><div class='del'>-		if (hcon-&gt;out) {</div><div class='add'>+	if (smp-&gt;method == REQ_OOB) {</div><div class='add'>+		if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 			sc_dhkey_check(smp);</div><div class='ctx'> 			SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2215,8 +2208,15 @@ mackey_and_ltk:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return SMP_UNSPECIFIED;</div><div class='ctx'> </div><div class='add'>+	/* Always require user confirmation for Just-Works pairing to prevent</div><div class='add'>+	 * impersonation attacks, or in case of a legitimate device that is</div><div class='add'>+	 * repairing use the confirmation as acknowledgment to proceed with the</div><div class='add'>+	 * creation of new keys.</div><div class='add'>+	 */</div><div class='add'>+	confirm_hint = smp-&gt;method == JUST_WORKS ? 1 : 0;</div><div class='add'>+</div><div class='ctx'> 	err = mgmt_user_confirm_request(hcon-&gt;hdev, &amp;hcon-&gt;dst, hcon-&gt;type,</div><div class='del'>-					hcon-&gt;dst_type, passkey, 0);</div><div class='add'>+					hcon-&gt;dst_type, passkey, confirm_hint);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return SMP_UNSPECIFIED;</div><div class='ctx'> </div><div class='hunk'>@@ -2243,7 +2243,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)</div><div class='ctx'> 	hci_le_start_enc(hcon, key-&gt;ediv, key-&gt;rand, key-&gt;val, key-&gt;enc_size);</div><div class='ctx'> 	hcon-&gt;enc_key_size = key-&gt;enc_size;</div><div class='ctx'> </div><div class='del'>-	/* We never store STKs for master role, so clear this flag */</div><div class='add'>+	/* We never store STKs for initiator role, so clear this flag */</div><div class='ctx'> 	clear_bit(HCI_CONN_STK_ENCRYPT, &amp;hcon-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -2272,16 +2272,33 @@ bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void smp_send_pairing_req(struct smp_chan *smp, __u8 auth)</div><div class='add'>+{</div><div class='add'>+	struct smp_cmd_pairing cp;</div><div class='add'>+</div><div class='add'>+	if (smp-&gt;conn-&gt;hcon-&gt;type == ACL_LINK)</div><div class='add'>+		build_bredr_pairing_cmd(smp, &amp;cp, NULL);</div><div class='add'>+	else</div><div class='add'>+		build_pairing_cmd(smp-&gt;conn, &amp;cp, NULL, auth);</div><div class='add'>+</div><div class='add'>+	smp-&gt;preq[0] = SMP_CMD_PAIRING_REQ;</div><div class='add'>+	memcpy(&amp;smp-&gt;preq[1], &amp;cp, sizeof(cp));</div><div class='add'>+</div><div class='add'>+	smp_send_cmd(smp-&gt;conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &amp;cp);</div><div class='add'>+	SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RSP);</div><div class='add'>+</div><div class='add'>+	set_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct smp_cmd_security_req *rp = (void *) skb-&gt;data;</div><div class='del'>-	struct smp_cmd_pairing cp;</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	struct hci_dev *hdev = hcon-&gt;hdev;</div><div class='ctx'> 	struct smp_chan *smp;</div><div class='ctx'> 	u8 sec_level, auth;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2324,16 +2341,20 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(*rp));</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cp, 0, sizeof(cp));</div><div class='del'>-	build_pairing_cmd(conn, &amp;cp, NULL, auth);</div><div class='add'>+	smp_send_pairing_req(smp, auth);</div><div class='ctx'> </div><div class='del'>-	smp-&gt;preq[0] = SMP_CMD_PAIRING_REQ;</div><div class='del'>-	memcpy(&amp;smp-&gt;preq[1], &amp;cp, sizeof(cp));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &amp;cp);</div><div class='del'>-	SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RSP);</div><div class='add'>+static void smp_send_security_req(struct smp_chan *smp, __u8 auth)</div><div class='add'>+{</div><div class='add'>+	struct smp_cmd_security_req cp;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	cp.auth_req = auth;</div><div class='add'>+	smp_send_cmd(smp-&gt;conn, SMP_CMD_SECURITY_REQ, sizeof(cp), &amp;cp);</div><div class='add'>+	SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_REQ);</div><div class='add'>+</div><div class='add'>+	clear_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)</div><div class='hunk'>@@ -2344,7 +2365,8 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)</div><div class='ctx'> 	__u8 authreq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p hcon %p level 0x%2.2x", conn, hcon, sec_level);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "conn %p hcon %p level 0x%2.2x", conn, hcon,</div><div class='add'>+		   sec_level);</div><div class='ctx'> </div><div class='ctx'> 	/* This may be NULL if there's an unexpected disconnection */</div><div class='ctx'> 	if (!conn)</div><div class='hunk'>@@ -2391,30 +2413,23 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)</div><div class='ctx'> 			authreq |= SMP_AUTH_CT2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Require MITM if IO Capability allows or the security level</div><div class='del'>-	 * requires it.</div><div class='add'>+	/* Don't attempt to set MITM if setting is overridden by debugfs</div><div class='add'>+	 * Needed to pass certification test SM/MAS/PKE/BV-01-C</div><div class='ctx'> 	 */</div><div class='del'>-	if (hcon-&gt;io_capability != HCI_IO_NO_INPUT_OUTPUT ||</div><div class='del'>-	    hcon-&gt;pending_sec_level &gt; BT_SECURITY_MEDIUM)</div><div class='del'>-		authreq |= SMP_AUTH_MITM;</div><div class='del'>-</div><div class='del'>-	if (hcon-&gt;role == HCI_ROLE_MASTER) {</div><div class='del'>-		struct smp_cmd_pairing cp;</div><div class='del'>-</div><div class='del'>-		build_pairing_cmd(conn, &amp;cp, NULL, authreq);</div><div class='del'>-		smp-&gt;preq[0] = SMP_CMD_PAIRING_REQ;</div><div class='del'>-		memcpy(&amp;smp-&gt;preq[1], &amp;cp, sizeof(cp));</div><div class='del'>-</div><div class='del'>-		smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &amp;cp);</div><div class='del'>-		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RSP);</div><div class='del'>-	} else {</div><div class='del'>-		struct smp_cmd_security_req cp;</div><div class='del'>-		cp.auth_req = authreq;</div><div class='del'>-		smp_send_cmd(conn, SMP_CMD_SECURITY_REQ, sizeof(cp), &amp;cp);</div><div class='del'>-		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_REQ);</div><div class='add'>+	if (!hci_dev_test_flag(hcon-&gt;hdev, HCI_FORCE_NO_MITM)) {</div><div class='add'>+		/* Require MITM if IO Capability allows or the security level</div><div class='add'>+		 * requires it.</div><div class='add'>+		 */</div><div class='add'>+		if (hcon-&gt;io_capability != HCI_IO_NO_INPUT_OUTPUT ||</div><div class='add'>+		    hcon-&gt;pending_sec_level &gt; BT_SECURITY_MEDIUM)</div><div class='add'>+			authreq |= SMP_AUTH_MITM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags);</div><div class='add'>+	if (hcon-&gt;role == HCI_ROLE_MASTER)</div><div class='add'>+		smp_send_pairing_req(smp, authreq);</div><div class='add'>+	else</div><div class='add'>+		smp_send_security_req(smp, authreq);</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -2453,7 +2468,7 @@ int smp_cancel_and_remove_pairing(struct hci_dev *hdev, bdaddr_t *bdaddr,</div><div class='ctx'> 		/* Set keys to NULL to make sure smp_failure() does not try to</div><div class='ctx'> 		 * remove and free already invalidated rcu list entries. */</div><div class='ctx'> 		smp-&gt;ltk = NULL;</div><div class='del'>-		smp-&gt;slave_ltk = NULL;</div><div class='add'>+		smp-&gt;responder_ltk = NULL;</div><div class='ctx'> 		smp-&gt;remote_irk = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(SMP_FLAG_COMPLETE, &amp;smp-&gt;flags))</div><div class='hunk'>@@ -2475,12 +2490,21 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='ctx'> </div><div class='del'>-	SMP_ALLOW_CMD(smp, SMP_CMD_MASTER_IDENT);</div><div class='add'>+	/* Pairing is aborted if any blocked keys are distributed */</div><div class='add'>+	if (hci_is_blocked_key(conn-&gt;hcon-&gt;hdev, HCI_BLOCKED_KEY_TYPE_LTK,</div><div class='add'>+			       rp-&gt;ltk)) {</div><div class='add'>+		bt_dev_warn_ratelimited(conn-&gt;hcon-&gt;hdev,</div><div class='add'>+					"LTK blocked for %pMR",</div><div class='add'>+					&amp;conn-&gt;hcon-&gt;dst);</div><div class='add'>+		return SMP_INVALID_PARAMS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SMP_ALLOW_CMD(smp, SMP_CMD_INITIATOR_IDENT);</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(*rp));</div><div class='ctx'> </div><div class='hunk'>@@ -2489,9 +2513,9 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='add'>+static int smp_cmd_initiator_ident(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct smp_cmd_master_ident *rp = (void *) skb-&gt;data;</div><div class='add'>+	struct smp_cmd_initiator_ident *rp = (void *)skb-&gt;data;</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> 	struct hci_dev *hdev = conn-&gt;hcon-&gt;hdev;</div><div class='hunk'>@@ -2499,7 +2523,7 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct smp_ltk *ltk;</div><div class='ctx'> 	u8 authenticated;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2531,11 +2555,20 @@ static int smp_cmd_ident_info(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct l2cap_chan *chan = conn-&gt;smp;</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*info))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='ctx'> </div><div class='add'>+	/* Pairing is aborted if any blocked keys are distributed */</div><div class='add'>+	if (hci_is_blocked_key(conn-&gt;hcon-&gt;hdev, HCI_BLOCKED_KEY_TYPE_IRK,</div><div class='add'>+			       info-&gt;irk)) {</div><div class='add'>+		bt_dev_warn_ratelimited(conn-&gt;hcon-&gt;hdev,</div><div class='add'>+					"Identity key blocked for %pMR",</div><div class='add'>+					&amp;conn-&gt;hcon-&gt;dst);</div><div class='add'>+		return SMP_INVALID_PARAMS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	SMP_ALLOW_CMD(smp, SMP_CMD_IDENT_ADDR_INFO);</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(*info));</div><div class='hunk'>@@ -2554,7 +2587,7 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	bdaddr_t rpa;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("");</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*info))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2583,6 +2616,19 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,</div><div class='ctx'> 		goto distribute;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Drop IRK if peer is using identity address during pairing but is</div><div class='add'>+	 * providing different address as identity information.</div><div class='add'>+	 *</div><div class='add'>+	 * Microsoft Surface Precision Mouse is known to have this bug.</div><div class='add'>+	 */</div><div class='add'>+	if (hci_is_identity_address(&amp;hcon-&gt;dst, hcon-&gt;dst_type) &amp;&amp;</div><div class='add'>+	    (bacmp(&amp;info-&gt;bdaddr, &amp;hcon-&gt;dst) ||</div><div class='add'>+	     info-&gt;addr_type != hcon-&gt;dst_type)) {</div><div class='add'>+		bt_dev_err(hcon-&gt;hdev,</div><div class='add'>+			   "ignoring IRK with invalid identity address");</div><div class='add'>+		goto distribute;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bacpy(&amp;smp-&gt;id_addr, &amp;info-&gt;bdaddr);</div><div class='ctx'> 	smp-&gt;id_addr_type = info-&gt;addr_type;</div><div class='ctx'> </div><div class='hunk'>@@ -2608,7 +2654,7 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct smp_chan *smp = chan-&gt;data;</div><div class='ctx'> 	struct smp_csrk *csrk;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rp))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2634,8 +2680,6 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static u8 sc_select_method(struct smp_chan *smp)</div><div class='ctx'> {</div><div class='del'>-	struct l2cap_conn *conn = smp-&gt;conn;</div><div class='del'>-	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	struct smp_cmd_pairing *local, *remote;</div><div class='ctx'> 	u8 local_mitm, remote_mitm, local_io, remote_io, method;</div><div class='ctx'> </div><div class='hunk'>@@ -2648,7 +2692,7 @@ static u8 sc_select_method(struct smp_chan *smp)</div><div class='ctx'> 	 * the "struct smp_cmd_pairing" from them we need to skip the</div><div class='ctx'> 	 * first byte which contains the opcode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		local = (void *) &amp;smp-&gt;preq[1];</div><div class='ctx'> 		remote = (void *) &amp;smp-&gt;prsp[1];</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2688,11 +2732,20 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	struct smp_cmd_pairing_confirm cfm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*key))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='ctx'> </div><div class='add'>+	/* Check if remote and local public keys are the same and debug key is</div><div class='add'>+	 * not in use.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(SMP_FLAG_DEBUG_KEY, &amp;smp-&gt;flags) &amp;&amp;</div><div class='add'>+	    !crypto_memneq(key, smp-&gt;local_pk, 64)) {</div><div class='add'>+		bt_dev_err(hdev, "Remote and local public keys are identical");</div><div class='add'>+		return SMP_UNSPECIFIED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(smp-&gt;remote_pk, key, 64);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(SMP_FLAG_REMOTE_OOB, &amp;smp-&gt;flags)) {</div><div class='hunk'>@@ -2708,7 +2761,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	/* Non-initiating device sends its public key after receiving</div><div class='ctx'> 	 * the key from the initiating device.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!hcon-&gt;out) {</div><div class='add'>+	if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		err = sc_send_public_key(smp);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -2743,7 +2796,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	smp-&gt;method = sc_select_method(smp);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s selected method 0x%02x", hdev-&gt;name, smp-&gt;method);</div><div class='add'>+	bt_dev_dbg(hdev, "selected method 0x%02x", smp-&gt;method);</div><div class='ctx'> </div><div class='ctx'> 	/* JUST_WORKS and JUST_CFM result in an unauthenticated key */</div><div class='ctx'> 	if (smp-&gt;method == JUST_WORKS || smp-&gt;method == JUST_CFM)</div><div class='hunk'>@@ -2770,7 +2823,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;method == REQ_OOB) {</div><div class='del'>-		if (hcon-&gt;out)</div><div class='add'>+		if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 			smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,</div><div class='ctx'> 				     sizeof(smp-&gt;prnd), smp-&gt;prnd);</div><div class='ctx'> </div><div class='hunk'>@@ -2779,7 +2832,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out)</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_CONFIRM);</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;method == REQ_PASSKEY) {</div><div class='hunk'>@@ -2794,7 +2847,7 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	/* The Initiating device waits for the non-initiating device to</div><div class='ctx'> 	 * send the confirm value.</div><div class='ctx'> 	 */</div><div class='del'>-	if (conn-&gt;hcon-&gt;out)</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = smp_f4(smp-&gt;tfm_cmac, smp-&gt;local_pk, smp-&gt;remote_pk, smp-&gt;prnd,</div><div class='hunk'>@@ -2818,7 +2871,7 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	u8 io_cap[3], r[16], e[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("conn %p", conn);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "conn %p", conn);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*check))</div><div class='ctx'> 		return SMP_INVALID_PARAMS;</div><div class='hunk'>@@ -2828,7 +2881,7 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	a[6] = hcon-&gt;init_addr_type;</div><div class='ctx'> 	b[6] = hcon-&gt;resp_addr_type;</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		local_addr = a;</div><div class='ctx'> 		remote_addr = b;</div><div class='ctx'> 		memcpy(io_cap, &amp;smp-&gt;prsp[1], 3);</div><div class='hunk'>@@ -2853,19 +2906,19 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)</div><div class='ctx'> 	if (crypto_memneq(check-&gt;e, e, 16))</div><div class='ctx'> 		return SMP_DHKEY_CHECK_FAILED;</div><div class='ctx'> </div><div class='del'>-	if (!hcon-&gt;out) {</div><div class='add'>+	if (!test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		if (test_bit(SMP_FLAG_WAIT_USER, &amp;smp-&gt;flags)) {</div><div class='ctx'> 			set_bit(SMP_FLAG_DHKEY_PENDING, &amp;smp-&gt;flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Slave sends DHKey check as response to master */</div><div class='add'>+		/* Responder sends DHKey check as response to initiator */</div><div class='ctx'> 		sc_dhkey_check(smp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sc_add_ltk(smp);</div><div class='ctx'> </div><div class='del'>-	if (hcon-&gt;out) {</div><div class='add'>+	if (test_bit(SMP_FLAG_INITIATOR, &amp;smp-&gt;flags)) {</div><div class='ctx'> 		hci_le_start_enc(hcon, 0, 0, smp-&gt;tk, smp-&gt;enc_key_size);</div><div class='ctx'> 		hcon-&gt;enc_key_size = smp-&gt;enc_key_size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2878,7 +2931,7 @@ static int smp_cmd_keypress_notify(struct l2cap_conn *conn,</div><div class='ctx'> {</div><div class='ctx'> 	struct smp_cmd_keypress_notify *kp = (void *) skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("value 0x%02x", kp-&gt;value);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "value 0x%02x", kp-&gt;value);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2907,8 +2960,25 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 	if (code &gt; SMP_CMD_MAX)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (smp &amp;&amp; !test_and_clear_bit(code, &amp;smp-&gt;allow_cmd))</div><div class='add'>+	if (smp &amp;&amp; !test_and_clear_bit(code, &amp;smp-&gt;allow_cmd)) {</div><div class='add'>+		/* If there is a context and the command is not allowed consider</div><div class='add'>+		 * it a failure so the session is cleanup properly.</div><div class='add'>+		 */</div><div class='add'>+		switch (code) {</div><div class='add'>+		case SMP_CMD_IDENT_INFO:</div><div class='add'>+		case SMP_CMD_IDENT_ADDR_INFO:</div><div class='add'>+		case SMP_CMD_SIGN_INFO:</div><div class='add'>+			/* 3.6.1. Key distribution and generation</div><div class='add'>+			 *</div><div class='add'>+			 * A device may reject a distributed key by sending the</div><div class='add'>+			 * Pairing Failed command with the reason set to</div><div class='add'>+			 * "Key Rejected".</div><div class='add'>+			 */</div><div class='add'>+			smp_failure(conn, SMP_KEY_REJECTED);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If we don't have a context the only allowed commands are</div><div class='ctx'> 	 * pairing request and security request.</div><div class='hunk'>@@ -2946,8 +3016,8 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 		reason = smp_cmd_encrypt_info(conn, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SMP_CMD_MASTER_IDENT:</div><div class='del'>-		reason = smp_cmd_master_ident(conn, skb);</div><div class='add'>+	case SMP_CMD_INITIATOR_IDENT:</div><div class='add'>+		reason = smp_cmd_initiator_ident(conn, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SMP_CMD_IDENT_INFO:</div><div class='hunk'>@@ -2975,7 +3045,7 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		BT_DBG("Unknown command code 0x%2.2x", code);</div><div class='add'>+		bt_dev_dbg(hcon-&gt;hdev, "Unknown command code 0x%2.2x", code);</div><div class='ctx'> 		reason = SMP_CMD_NOTSUPP;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3000,7 +3070,7 @@ static void smp_teardown_cb(struct l2cap_chan *chan, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='add'>+	bt_dev_dbg(conn-&gt;hcon-&gt;hdev, "chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;data)</div><div class='ctx'> 		smp_chan_destroy(conn);</div><div class='hunk'>@@ -3014,10 +3084,9 @@ static void bredr_pairing(struct l2cap_chan *chan)</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> 	struct hci_dev *hdev = hcon-&gt;hdev;</div><div class='del'>-	struct smp_cmd_pairing req;</div><div class='ctx'> 	struct smp_chan *smp;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='add'>+	bt_dev_dbg(hdev, "chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	/* Only new pairings are interesting */</div><div class='ctx'> 	if (!test_bit(HCI_CONN_NEW_LINK_KEY, &amp;hcon-&gt;flags))</div><div class='hunk'>@@ -3027,7 +3096,7 @@ static void bredr_pairing(struct l2cap_chan *chan)</div><div class='ctx'> 	if (!test_bit(HCI_CONN_ENCRYPT, &amp;hcon-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Only master may initiate SMP over BR/EDR */</div><div class='add'>+	/* Only initiator may initiate SMP over BR/EDR */</div><div class='ctx'> 	if (hcon-&gt;role != HCI_ROLE_MASTER)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -3064,16 +3133,9 @@ static void bredr_pairing(struct l2cap_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(SMP_FLAG_SC, &amp;smp-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s starting SMP over BR/EDR", hdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* Prepare and send the BR/EDR SMP Pairing Request */</div><div class='del'>-	build_bredr_pairing_cmd(smp, &amp;req, NULL);</div><div class='add'>+	bt_dev_dbg(hdev, "starting SMP over BR/EDR");</div><div class='ctx'> </div><div class='del'>-	smp-&gt;preq[0] = SMP_CMD_PAIRING_REQ;</div><div class='del'>-	memcpy(&amp;smp-&gt;preq[1], &amp;req, sizeof(req));</div><div class='del'>-</div><div class='del'>-	smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(req), &amp;req);</div><div class='del'>-	SMP_ALLOW_CMD(smp, SMP_CMD_PAIRING_RSP);</div><div class='add'>+	smp_send_pairing_req(smp, 0x00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void smp_resume_cb(struct l2cap_chan *chan)</div><div class='hunk'>@@ -3082,7 +3144,7 @@ static void smp_resume_cb(struct l2cap_chan *chan)</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	if (hcon-&gt;type == ACL_LINK) {</div><div class='ctx'> 		bredr_pairing(chan);</div><div class='hunk'>@@ -3105,12 +3167,12 @@ static void smp_ready_cb(struct l2cap_chan *chan)</div><div class='ctx'> 	struct l2cap_conn *conn = chan-&gt;conn;</div><div class='ctx'> 	struct hci_conn *hcon = conn-&gt;hcon;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='add'>+	bt_dev_dbg(hcon-&gt;hdev, "chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	/* No need to call l2cap_chan_hold() here since we already own</div><div class='ctx'> 	 * the reference taken in smp_new_conn_cb(). This is just the</div><div class='ctx'> 	 * first time that we tie it to a specific pointer. The code in</div><div class='del'>-	 * l2cap_core.c ensures that there's no risk this function wont</div><div class='add'>+	 * l2cap_core.c ensures that there's no risk this function won't</div><div class='ctx'> 	 * get called if smp_new_conn_cb was previously called.</div><div class='ctx'> 	 */</div><div class='ctx'> 	conn-&gt;smp = chan;</div><div class='hunk'>@@ -3123,7 +3185,7 @@ static int smp_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("chan %p", chan);</div><div class='add'>+	bt_dev_dbg(chan-&gt;conn-&gt;hcon-&gt;hdev, "chan %p", chan);</div><div class='ctx'> </div><div class='ctx'> 	err = smp_sig_channel(chan, skb);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -3223,7 +3285,6 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan;</div><div class='ctx'> 	struct smp_dev *smp;</div><div class='del'>-	struct crypto_cipher *tfm_aes;</div><div class='ctx'> 	struct crypto_shash *tfm_cmac;</div><div class='ctx'> 	struct crypto_kpp *tfm_ecdh;</div><div class='ctx'> </div><div class='hunk'>@@ -3236,45 +3297,32 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)</div><div class='ctx'> 	if (!smp)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	tfm_aes = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (IS_ERR(tfm_aes)) {</div><div class='del'>-		BT_ERR("Unable to create AES crypto context");</div><div class='del'>-		kzfree(smp);</div><div class='del'>-		return ERR_CAST(tfm_aes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, 0);</div><div class='ctx'> 	if (IS_ERR(tfm_cmac)) {</div><div class='del'>-		BT_ERR("Unable to create CMAC crypto context");</div><div class='del'>-		crypto_free_cipher(tfm_aes);</div><div class='del'>-		kzfree(smp);</div><div class='add'>+		bt_dev_err(hdev, "Unable to create CMAC crypto context");</div><div class='add'>+		kfree_sensitive(smp);</div><div class='ctx'> 		return ERR_CAST(tfm_cmac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tfm_ecdh = crypto_alloc_kpp("ecdh", CRYPTO_ALG_INTERNAL, 0);</div><div class='add'>+	tfm_ecdh = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);</div><div class='ctx'> 	if (IS_ERR(tfm_ecdh)) {</div><div class='del'>-		BT_ERR("Unable to create ECDH crypto context");</div><div class='add'>+		bt_dev_err(hdev, "Unable to create ECDH crypto context");</div><div class='ctx'> 		crypto_free_shash(tfm_cmac);</div><div class='del'>-		crypto_free_cipher(tfm_aes);</div><div class='del'>-		kzfree(smp);</div><div class='add'>+		kfree_sensitive(smp);</div><div class='ctx'> 		return ERR_CAST(tfm_ecdh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smp-&gt;local_oob = false;</div><div class='del'>-	smp-&gt;tfm_aes = tfm_aes;</div><div class='ctx'> 	smp-&gt;tfm_cmac = tfm_cmac;</div><div class='ctx'> 	smp-&gt;tfm_ecdh = tfm_ecdh;</div><div class='del'>-	smp-&gt;min_key_size = SMP_MIN_ENC_KEY_SIZE;</div><div class='del'>-	smp-&gt;max_key_size = SMP_MAX_ENC_KEY_SIZE;</div><div class='ctx'> </div><div class='ctx'> create_chan:</div><div class='ctx'> 	chan = l2cap_chan_create();</div><div class='ctx'> 	if (!chan) {</div><div class='ctx'> 		if (smp) {</div><div class='del'>-			crypto_free_cipher(smp-&gt;tfm_aes);</div><div class='ctx'> 			crypto_free_shash(smp-&gt;tfm_cmac);</div><div class='ctx'> 			crypto_free_kpp(smp-&gt;tfm_ecdh);</div><div class='del'>-			kzfree(smp);</div><div class='add'>+			kfree_sensitive(smp);</div><div class='ctx'> 		}</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3319,40 +3367,16 @@ static void smp_del_chan(struct l2cap_chan *chan)</div><div class='ctx'> 	smp = chan-&gt;data;</div><div class='ctx'> 	if (smp) {</div><div class='ctx'> 		chan-&gt;data = NULL;</div><div class='del'>-		crypto_free_cipher(smp-&gt;tfm_aes);</div><div class='ctx'> 		crypto_free_shash(smp-&gt;tfm_cmac);</div><div class='ctx'> 		crypto_free_kpp(smp-&gt;tfm_ecdh);</div><div class='del'>-		kzfree(smp);</div><div class='add'>+		kfree_sensitive(smp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	l2cap_chan_put(chan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t force_bredr_smp_read(struct file *file,</div><div class='del'>-				    char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[3];</div><div class='del'>-</div><div class='del'>-	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP) ? 'Y': 'N';</div><div class='del'>-	buf[1] = '\n';</div><div class='del'>-	buf[2] = '\0';</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t force_bredr_smp_write(struct file *file,</div><div class='del'>-				     const char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='add'>+int smp_force_bredr(struct hci_dev *hdev, bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	bool enable;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = kstrtobool_from_user(user_buf, count, &amp;enable);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	if (enable == hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP))</div><div class='ctx'> 		return -EALREADY;</div><div class='ctx'> </div><div class='hunk'>@@ -3374,109 +3398,14 @@ static ssize_t force_bredr_smp_write(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	hci_dev_change_flag(hdev, HCI_FORCE_BREDR_SMP);</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations force_bredr_smp_fops = {</div><div class='del'>-	.open		= simple_open,</div><div class='del'>-	.read		= force_bredr_smp_read,</div><div class='del'>-	.write		= force_bredr_smp_write,</div><div class='del'>-	.llseek		= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t le_min_key_size_read(struct file *file,</div><div class='del'>-				     char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[4];</div><div class='del'>-</div><div class='del'>-	snprintf(buf, sizeof(buf), "%2u\n", SMP_DEV(hdev)-&gt;min_key_size);</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t le_min_key_size_write(struct file *file,</div><div class='del'>-				      const char __user *user_buf,</div><div class='del'>-				      size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[32];</div><div class='del'>-	size_t buf_size = min(count, (sizeof(buf) - 1));</div><div class='del'>-	u8 key_size;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[buf_size] = '\0';</div><div class='del'>-</div><div class='del'>-	sscanf(buf, "%hhu", &amp;key_size);</div><div class='del'>-</div><div class='del'>-	if (key_size &gt; SMP_DEV(hdev)-&gt;max_key_size ||</div><div class='del'>-	    key_size &lt; SMP_MIN_ENC_KEY_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	SMP_DEV(hdev)-&gt;min_key_size = key_size;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations le_min_key_size_fops = {</div><div class='del'>-	.open		= simple_open,</div><div class='del'>-	.read		= le_min_key_size_read,</div><div class='del'>-	.write		= le_min_key_size_write,</div><div class='del'>-	.llseek		= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t le_max_key_size_read(struct file *file,</div><div class='del'>-				     char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[4];</div><div class='del'>-</div><div class='del'>-	snprintf(buf, sizeof(buf), "%2u\n", SMP_DEV(hdev)-&gt;max_key_size);</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t le_max_key_size_write(struct file *file,</div><div class='del'>-				      const char __user *user_buf,</div><div class='del'>-				      size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct hci_dev *hdev = file-&gt;private_data;</div><div class='del'>-	char buf[32];</div><div class='del'>-	size_t buf_size = min(count, (sizeof(buf) - 1));</div><div class='del'>-	u8 key_size;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[buf_size] = '\0';</div><div class='del'>-</div><div class='del'>-	sscanf(buf, "%hhu", &amp;key_size);</div><div class='del'>-</div><div class='del'>-	if (key_size &gt; SMP_MAX_ENC_KEY_SIZE ||</div><div class='del'>-	    key_size &lt; SMP_DEV(hdev)-&gt;min_key_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	SMP_DEV(hdev)-&gt;max_key_size = key_size;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations le_max_key_size_fops = {</div><div class='del'>-	.open		= simple_open,</div><div class='del'>-	.read		= le_max_key_size_read,</div><div class='del'>-	.write		= le_max_key_size_write,</div><div class='del'>-	.llseek		= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int smp_register(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2cap_chan *chan;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+	bt_dev_dbg(hdev, "");</div><div class='ctx'> </div><div class='ctx'> 	/* If the controller does not support Low Energy operation, then</div><div class='ctx'> 	 * there is also no need to register any SMP channel.</div><div class='hunk'>@@ -3496,22 +3425,7 @@ int smp_register(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;smp_data = chan;</div><div class='ctx'> </div><div class='del'>-	debugfs_create_file("le_min_key_size", 0644, hdev-&gt;debugfs, hdev,</div><div class='del'>-			    &amp;le_min_key_size_fops);</div><div class='del'>-	debugfs_create_file("le_max_key_size", 0644, hdev-&gt;debugfs, hdev,</div><div class='del'>-			    &amp;le_max_key_size_fops);</div><div class='del'>-</div><div class='del'>-	/* If the controller does not support BR/EDR Secure Connections</div><div class='del'>-	 * feature, then the BR/EDR SMP channel shall not be present.</div><div class='del'>-	 *</div><div class='del'>-	 * To test this with Bluetooth 4.0 controllers, create a debugfs</div><div class='del'>-	 * switch that allows forcing BR/EDR SMP support and accepting</div><div class='del'>-	 * cross-transport pairing on non-AES encrypted connections.</div><div class='del'>-	 */</div><div class='ctx'> 	if (!lmp_sc_capable(hdev)) {</div><div class='del'>-		debugfs_create_file("force_bredr_smp", 0644, hdev-&gt;debugfs,</div><div class='del'>-				    hdev, &amp;force_bredr_smp_fops);</div><div class='del'>-</div><div class='ctx'> 		/* Flag can be already set here (due to power toggle) */</div><div class='ctx'> 		if (!hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -3575,7 +3489,7 @@ static int __init test_debug_key(struct crypto_kpp *tfm_ecdh)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init test_ah(struct crypto_cipher *tfm_aes)</div><div class='add'>+static int __init test_ah(void)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 irk[16] = {</div><div class='ctx'> 			0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,</div><div class='hunk'>@@ -3585,7 +3499,7 @@ static int __init test_ah(struct crypto_cipher *tfm_aes)</div><div class='ctx'> 	u8 res[3];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = smp_ah(tfm_aes, irk, r, res);</div><div class='add'>+	err = smp_ah(irk, r, res);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3595,7 +3509,7 @@ static int __init test_ah(struct crypto_cipher *tfm_aes)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init test_c1(struct crypto_cipher *tfm_aes)</div><div class='add'>+static int __init test_c1(void)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 k[16] = {</div><div class='ctx'> 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='hunk'>@@ -3615,7 +3529,7 @@ static int __init test_c1(struct crypto_cipher *tfm_aes)</div><div class='ctx'> 	u8 res[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = smp_c1(tfm_aes, k, r, preq, pres, _iat, &amp;ia, _rat, &amp;ra, res);</div><div class='add'>+	err = smp_c1(k, r, preq, pres, _iat, &amp;ia, _rat, &amp;ra, res);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3625,7 +3539,7 @@ static int __init test_c1(struct crypto_cipher *tfm_aes)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init test_s1(struct crypto_cipher *tfm_aes)</div><div class='add'>+static int __init test_s1(void)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 k[16] = {</div><div class='ctx'> 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='hunk'>@@ -3640,7 +3554,7 @@ static int __init test_s1(struct crypto_cipher *tfm_aes)</div><div class='ctx'> 	u8 res[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = smp_s1(tfm_aes, k, r1, r2, res);</div><div class='add'>+	err = smp_s1(k, r1, r2, res);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3821,8 +3735,7 @@ static const struct file_operations test_smp_fops = {</div><div class='ctx'> 	.llseek		= default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init run_selftests(struct crypto_cipher *tfm_aes,</div><div class='del'>-				struct crypto_shash *tfm_cmac,</div><div class='add'>+static int __init run_selftests(struct crypto_shash *tfm_cmac,</div><div class='ctx'> 				struct crypto_kpp *tfm_ecdh)</div><div class='ctx'> {</div><div class='ctx'> 	ktime_t calltime, delta, rettime;</div><div class='hunk'>@@ -3837,19 +3750,19 @@ static int __init run_selftests(struct crypto_cipher *tfm_aes,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = test_ah(tfm_aes);</div><div class='add'>+	err = test_ah();</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("smp_ah test failed");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = test_c1(tfm_aes);</div><div class='add'>+	err = test_c1();</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("smp_c1 test failed");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = test_s1(tfm_aes);</div><div class='add'>+	err = test_s1();</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		BT_ERR("smp_s1 test failed");</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -3906,36 +3819,26 @@ done:</div><div class='ctx'> </div><div class='ctx'> int __init bt_selftest_smp(void)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_cipher *tfm_aes;</div><div class='ctx'> 	struct crypto_shash *tfm_cmac;</div><div class='ctx'> 	struct crypto_kpp *tfm_ecdh;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	tfm_aes = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (IS_ERR(tfm_aes)) {</div><div class='del'>-		BT_ERR("Unable to create AES crypto context");</div><div class='del'>-		return PTR_ERR(tfm_aes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, 0);</div><div class='ctx'> 	if (IS_ERR(tfm_cmac)) {</div><div class='ctx'> 		BT_ERR("Unable to create CMAC crypto context");</div><div class='del'>-		crypto_free_cipher(tfm_aes);</div><div class='ctx'> 		return PTR_ERR(tfm_cmac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tfm_ecdh = crypto_alloc_kpp("ecdh", CRYPTO_ALG_INTERNAL, 0);</div><div class='add'>+	tfm_ecdh = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);</div><div class='ctx'> 	if (IS_ERR(tfm_ecdh)) {</div><div class='ctx'> 		BT_ERR("Unable to create ECDH crypto context");</div><div class='ctx'> 		crypto_free_shash(tfm_cmac);</div><div class='del'>-		crypto_free_cipher(tfm_aes);</div><div class='ctx'> 		return PTR_ERR(tfm_ecdh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = run_selftests(tfm_aes, tfm_cmac, tfm_ecdh);</div><div class='add'>+	err = run_selftests(tfm_cmac, tfm_ecdh);</div><div class='ctx'> </div><div class='ctx'> 	crypto_free_shash(tfm_cmac);</div><div class='del'>-	crypto_free_cipher(tfm_aes);</div><div class='ctx'> 	crypto_free_kpp(tfm_ecdh);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h<br/>index 121edadd5f8d..c5da53dfab04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bluetooth/smp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bluetooth/smp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bluetooth/smp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bluetooth/smp.h</a></div><div class='hunk'>@@ -79,8 +79,8 @@ struct smp_cmd_encrypt_info {</div><div class='ctx'> 	__u8	ltk[16];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define SMP_CMD_MASTER_IDENT	0x07</div><div class='del'>-struct smp_cmd_master_ident {</div><div class='add'>+#define SMP_CMD_INITIATOR_IDENT	0x07</div><div class='add'>+struct smp_cmd_initiator_ident {</div><div class='ctx'> 	__le16	ediv;</div><div class='ctx'> 	__le64	rand;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -138,6 +138,7 @@ struct smp_cmd_keypress_notify {</div><div class='ctx'> #define SMP_NUMERIC_COMP_FAILED		0x0c</div><div class='ctx'> #define SMP_BREDR_PAIRING_IN_PROGRESS	0x0d</div><div class='ctx'> #define SMP_CROSS_TRANSP_NOT_ALLOWED	0x0e</div><div class='add'>+#define SMP_KEY_REJECTED		0x0f</div><div class='ctx'> </div><div class='ctx'> #define SMP_MIN_ENC_KEY_SIZE		7</div><div class='ctx'> #define SMP_MAX_ENC_KEY_SIZE		16</div><div class='hunk'>@@ -146,7 +147,7 @@ struct smp_cmd_keypress_notify {</div><div class='ctx'> enum {</div><div class='ctx'> 	SMP_STK,</div><div class='ctx'> 	SMP_LTK,</div><div class='del'>-	SMP_LTK_SLAVE,</div><div class='add'>+	SMP_LTK_RESPONDER,</div><div class='ctx'> 	SMP_LTK_P256,</div><div class='ctx'> 	SMP_LTK_P256_DEBUG,</div><div class='ctx'> };</div><div class='hunk'>@@ -193,6 +194,8 @@ bool smp_irk_matches(struct hci_dev *hdev, const u8 irk[16],</div><div class='ctx'> int smp_generate_rpa(struct hci_dev *hdev, const u8 irk[16], bdaddr_t *rpa);</div><div class='ctx'> int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16]);</div><div class='ctx'> </div><div class='add'>+int smp_force_bredr(struct hci_dev *hdev, bool enable);</div><div class='add'>+</div><div class='ctx'> int smp_register(struct hci_dev *hdev);</div><div class='ctx'> void smp_unregister(struct hci_dev *hdev);</div><div class='ctx'> </div><div class='head'>diff --git a/net/bpf/Makefile b/net/bpf/Makefile<br/>index 27b2992a0692..1ebe270bde23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpf/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpf/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bpf/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bpf/Makefile</a></div><div class='hunk'>@@ -1 +1,5 @@</div><div class='del'>-obj-y	:= test_run.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL)	:= test_run.o</div><div class='add'>+ifeq ($(CONFIG_BPF_JIT),y)</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL)	+= bpf_dummy_struct_ops.o</div><div class='add'>+endif</div><div class='head'>diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c<br/>new file mode 100644<br/>index 000000000000..812457819b5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bpf/bpf_dummy_struct_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bpf/bpf_dummy_struct_ops.c</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021. Huawei Technologies Co., Ltd</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/bpf_verifier.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bpf_struct_ops bpf_bpf_dummy_ops;</div><div class='add'>+</div><div class='add'>+/* A common type for test_N with return value in bpf_dummy_ops */</div><div class='add'>+typedef int (*dummy_ops_test_ret_fn)(struct bpf_dummy_ops_state *state, ...);</div><div class='add'>+</div><div class='add'>+static int dummy_ops_test_ret_function(struct bpf_dummy_ops_state *state, ...)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_dummy_ops_test_args {</div><div class='add'>+	u64 args[MAX_BPF_FUNC_ARGS];</div><div class='add'>+	struct bpf_dummy_ops_state state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct btf *bpf_dummy_ops_btf;</div><div class='add'>+</div><div class='add'>+static struct bpf_dummy_ops_test_args *</div><div class='add'>+dummy_ops_init_args(const union bpf_attr *kattr, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	__u32 size_in;</div><div class='add'>+	struct bpf_dummy_ops_test_args *args;</div><div class='add'>+	void __user *ctx_in;</div><div class='add'>+	void __user *u_state;</div><div class='add'>+</div><div class='add'>+	size_in = kattr-&gt;test.ctx_size_in;</div><div class='add'>+	if (size_in != sizeof(u64) * nr)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	args = kzalloc(sizeof(*args), GFP_KERNEL);</div><div class='add'>+	if (!args)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ctx_in = u64_to_user_ptr(kattr-&gt;test.ctx_in);</div><div class='add'>+	if (copy_from_user(args-&gt;args, ctx_in, size_in))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* args[0] is 0 means state argument of test_N will be NULL */</div><div class='add'>+	u_state = u64_to_user_ptr(args-&gt;args[0]);</div><div class='add'>+	if (u_state &amp;&amp; copy_from_user(&amp;args-&gt;state, u_state,</div><div class='add'>+				      sizeof(args-&gt;state)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return args;</div><div class='add'>+out:</div><div class='add'>+	kfree(args);</div><div class='add'>+	return ERR_PTR(-EFAULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dummy_ops_copy_args(struct bpf_dummy_ops_test_args *args)</div><div class='add'>+{</div><div class='add'>+	void __user *u_state;</div><div class='add'>+</div><div class='add'>+	u_state = u64_to_user_ptr(args-&gt;args[0]);</div><div class='add'>+	if (u_state &amp;&amp; copy_to_user(u_state, &amp;args-&gt;state, sizeof(args-&gt;state)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dummy_ops_call_op(void *image, struct bpf_dummy_ops_test_args *args)</div><div class='add'>+{</div><div class='add'>+	dummy_ops_test_ret_fn test = (void *)image + cfi_get_offset();</div><div class='add'>+	struct bpf_dummy_ops_state *state = NULL;</div><div class='add'>+</div><div class='add'>+	/* state needs to be NULL if args[0] is 0 */</div><div class='add'>+	if (args-&gt;args[0])</div><div class='add'>+		state = &amp;args-&gt;state;</div><div class='add'>+	return test(state, args-&gt;args[1], args-&gt;args[2],</div><div class='add'>+		    args-&gt;args[3], args-&gt;args[4]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_ctx_arg_aux *find_ctx_arg_info(struct bpf_prog_aux *aux, int offset)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; aux-&gt;ctx_arg_info_size; i++)</div><div class='add'>+		if (aux-&gt;ctx_arg_info[i].offset == offset)</div><div class='add'>+			return &amp;aux-&gt;ctx_arg_info[i];</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There is only one check at the moment:</div><div class='add'>+ * - zero should not be passed for pointer parameters not marked as nullable.</div><div class='add'>+ */</div><div class='add'>+static int check_test_run_args(struct bpf_prog *prog, struct bpf_dummy_ops_test_args *args)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *func_proto = prog-&gt;aux-&gt;attach_func_proto;</div><div class='add'>+</div><div class='add'>+	for (u32 arg_no = 0; arg_no &lt; btf_type_vlen(func_proto) ; ++arg_no) {</div><div class='add'>+		const struct btf_param *param = &amp;btf_params(func_proto)[arg_no];</div><div class='add'>+		const struct bpf_ctx_arg_aux *info;</div><div class='add'>+		const struct btf_type *t;</div><div class='add'>+		int offset;</div><div class='add'>+</div><div class='add'>+		if (args-&gt;args[arg_no] != 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Program is validated already, so there is no need</div><div class='add'>+		 * to check if t is NULL.</div><div class='add'>+		 */</div><div class='add'>+		t = btf_type_skip_modifiers(bpf_dummy_ops_btf, param-&gt;type, NULL);</div><div class='add'>+		if (!btf_type_is_ptr(t))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		offset = btf_ctx_arg_offset(bpf_dummy_ops_btf, func_proto, arg_no);</div><div class='add'>+		info = find_ctx_arg_info(prog-&gt;aux, offset);</div><div class='add'>+		if (info &amp;&amp; type_may_be_null(info-&gt;reg_type))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const struct bpf_link_ops bpf_struct_ops_link_lops;</div><div class='add'>+</div><div class='add'>+int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,</div><div class='add'>+			    union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	const struct bpf_struct_ops *st_ops = &amp;bpf_bpf_dummy_ops;</div><div class='add'>+	const struct btf_type *func_proto;</div><div class='add'>+	struct bpf_dummy_ops_test_args *args;</div><div class='add'>+	struct bpf_tramp_links *tlinks = NULL;</div><div class='add'>+	struct bpf_tramp_link *link = NULL;</div><div class='add'>+	void *image = NULL;</div><div class='add'>+	unsigned int op_idx;</div><div class='add'>+	u32 image_off = 0;</div><div class='add'>+	int prog_ret;</div><div class='add'>+	s32 type_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	type_id = btf_find_by_name_kind(bpf_dummy_ops_btf,</div><div class='add'>+					bpf_bpf_dummy_ops.name,</div><div class='add'>+					BTF_KIND_STRUCT);</div><div class='add'>+	if (type_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (prog-&gt;aux-&gt;attach_btf_id != type_id)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	func_proto = prog-&gt;aux-&gt;attach_func_proto;</div><div class='add'>+	args = dummy_ops_init_args(kattr, btf_type_vlen(func_proto));</div><div class='add'>+	if (IS_ERR(args))</div><div class='add'>+		return PTR_ERR(args);</div><div class='add'>+</div><div class='add'>+	err = check_test_run_args(prog, args);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tlinks = kcalloc(BPF_TRAMP_MAX, sizeof(*tlinks), GFP_KERNEL);</div><div class='add'>+	if (!tlinks) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = kzalloc(sizeof(*link), GFP_USER);</div><div class='add'>+	if (!link) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* prog doesn't take the ownership of the reference from caller */</div><div class='add'>+	bpf_prog_inc(prog);</div><div class='add'>+	bpf_link_init(&amp;link-&gt;link, BPF_LINK_TYPE_STRUCT_OPS, &amp;bpf_struct_ops_link_lops, prog,</div><div class='add'>+		      prog-&gt;expected_attach_type);</div><div class='add'>+</div><div class='add'>+	op_idx = prog-&gt;expected_attach_type;</div><div class='add'>+	err = bpf_struct_ops_prepare_trampoline(tlinks, link,</div><div class='add'>+						&amp;st_ops-&gt;func_models[op_idx],</div><div class='add'>+						&amp;dummy_ops_test_ret_function,</div><div class='add'>+						&amp;image, &amp;image_off,</div><div class='add'>+						true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = arch_protect_bpf_trampoline(image, PAGE_SIZE);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	prog_ret = dummy_ops_call_op(image, args);</div><div class='add'>+</div><div class='add'>+	err = dummy_ops_copy_args(args);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	if (put_user(prog_ret, &amp;uattr-&gt;test.retval))</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+out:</div><div class='add'>+	kfree(args);</div><div class='add'>+	bpf_struct_ops_image_free(image);</div><div class='add'>+	if (link)</div><div class='add'>+		bpf_link_put(&amp;link-&gt;link);</div><div class='add'>+	kfree(tlinks);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_init(struct btf *btf)</div><div class='add'>+{</div><div class='add'>+	bpf_dummy_ops_btf = btf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_dummy_ops_is_valid_access(int off, int size,</div><div class='add'>+					  enum bpf_access_type type,</div><div class='add'>+					  const struct bpf_prog *prog,</div><div class='add'>+					  struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	return bpf_tracing_btf_ctx_access(off, size, type, prog, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_ops_check_member(const struct btf_type *t,</div><div class='add'>+				      const struct btf_member *member,</div><div class='add'>+				      const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	u32 moff = __btf_member_bit_offset(t, member) / 8;</div><div class='add'>+</div><div class='add'>+	switch (moff) {</div><div class='add'>+	case offsetof(struct bpf_dummy_ops, test_sleepable):</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (prog-&gt;sleepable)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_ops_btf_struct_access(struct bpf_verifier_log *log,</div><div class='add'>+					   const struct bpf_reg_state *reg,</div><div class='add'>+					   int off, int size)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *state;</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	s32 type_id;</div><div class='add'>+</div><div class='add'>+	type_id = btf_find_by_name_kind(reg-&gt;btf, "bpf_dummy_ops_state",</div><div class='add'>+					BTF_KIND_STRUCT);</div><div class='add'>+	if (type_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	t = btf_type_by_id(reg-&gt;btf, reg-&gt;btf_id);</div><div class='add'>+	state = btf_type_by_id(reg-&gt;btf, type_id);</div><div class='add'>+	if (t != state) {</div><div class='add'>+		bpf_log(log, "only access to bpf_dummy_ops_state is supported\n");</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (off + size &gt; sizeof(struct bpf_dummy_ops_state)) {</div><div class='add'>+		bpf_log(log, "write access at off %d with size %d\n", off, size);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOT_INIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_verifier_ops bpf_dummy_verifier_ops = {</div><div class='add'>+	.is_valid_access = bpf_dummy_ops_is_valid_access,</div><div class='add'>+	.btf_struct_access = bpf_dummy_ops_btf_struct_access,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_init_member(const struct btf_type *t,</div><div class='add'>+				 const struct btf_member *member,</div><div class='add'>+				 void *kdata, const void *udata)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_reg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_dummy_unreg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_ops__test_1(struct bpf_dummy_ops_state *cb__nullable)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_test_2(struct bpf_dummy_ops_state *cb, int a1, unsigned short a2,</div><div class='add'>+			    char a3, unsigned long a4)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_dummy_test_sleepable(struct bpf_dummy_ops_state *cb)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_dummy_ops __bpf_bpf_dummy_ops = {</div><div class='add'>+	.test_1 = bpf_dummy_ops__test_1,</div><div class='add'>+	.test_2 = bpf_dummy_test_2,</div><div class='add'>+	.test_sleepable = bpf_dummy_test_sleepable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bpf_struct_ops bpf_bpf_dummy_ops = {</div><div class='add'>+	.verifier_ops = &amp;bpf_dummy_verifier_ops,</div><div class='add'>+	.init = bpf_dummy_init,</div><div class='add'>+	.check_member = bpf_dummy_ops_check_member,</div><div class='add'>+	.init_member = bpf_dummy_init_member,</div><div class='add'>+	.reg = bpf_dummy_reg,</div><div class='add'>+	.unreg = bpf_dummy_unreg,</div><div class='add'>+	.name = "bpf_dummy_ops",</div><div class='add'>+	.cfi_stubs = &amp;__bpf_bpf_dummy_ops,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_dummy_struct_ops_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_bpf_struct_ops(&amp;bpf_bpf_dummy_ops, bpf_dummy_ops);</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_dummy_struct_ops_init);</div><div class='head'>diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c<br/>index f4078830ea50..655efac6f133 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpf/test_run.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpf/test_run.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bpf/test_run.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bpf/test_run.c</a></div><div class='hunk'>@@ -1,199 +1,1834 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Copyright (c) 2017 Facebook</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate_trace.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;linux/error-injection.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/sock_diag.h&gt;</div><div class='add'>+#include &lt;linux/netfilter.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_bpf_link.h&gt;</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/bpf_test_run.h&gt;</div><div class='add'>+</div><div class='add'>+struct bpf_test_timer {</div><div class='add'>+	u32 i;</div><div class='add'>+	u64 time_start, time_spent;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx,</div><div class='del'>-					    struct bpf_cgroup_storage *storage)</div><div class='add'>+static void bpf_test_timer_enter(struct bpf_test_timer *t)</div><div class='add'>+	__acquires(rcu)</div><div class='ctx'> {</div><div class='del'>-	u32 ret;</div><div class='add'>+	rcu_read_lock_dont_migrate();</div><div class='add'>+	t-&gt;time_start = ktime_get_ns();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	bpf_cgroup_storage_set(storage);</div><div class='del'>-	ret = BPF_PROG_RUN(prog, ctx);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	preempt_enable();</div><div class='add'>+static void bpf_test_timer_leave(struct bpf_test_timer *t)</div><div class='add'>+	__releases(rcu)</div><div class='add'>+{</div><div class='add'>+	t-&gt;time_start = 0;</div><div class='add'>+	rcu_read_unlock_migrate();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+static bool bpf_test_timer_continue(struct bpf_test_timer *t, int iterations,</div><div class='add'>+				    u32 repeat, int *err, u32 *duration)</div><div class='add'>+	__must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	t-&gt;i += iterations;</div><div class='add'>+	if (t-&gt;i &gt;= repeat) {</div><div class='add'>+		/* We're done. */</div><div class='add'>+		t-&gt;time_spent += ktime_get_ns() - t-&gt;time_start;</div><div class='add'>+		do_div(t-&gt;time_spent, t-&gt;i);</div><div class='add'>+		*duration = t-&gt;time_spent &gt; U32_MAX ? U32_MAX : (u32)t-&gt;time_spent;</div><div class='add'>+		*err = 0;</div><div class='add'>+		goto reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (signal_pending(current)) {</div><div class='add'>+		/* During iteration: we've been cancelled, abort. */</div><div class='add'>+		*err = -EINTR;</div><div class='add'>+		goto reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_resched()) {</div><div class='add'>+		/* During iteration: we need to reschedule between runs. */</div><div class='add'>+		t-&gt;time_spent += ktime_get_ns() - t-&gt;time_start;</div><div class='add'>+		bpf_test_timer_leave(t);</div><div class='add'>+		cond_resched();</div><div class='add'>+		bpf_test_timer_enter(t);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do another round. */</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+reset:</div><div class='add'>+	t-&gt;i = 0;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We put this struct at the head of each page with a context and frame</div><div class='add'>+ * initialised when the page is allocated, so we don't have to do this on each</div><div class='add'>+ * repetition of the test run.</div><div class='add'>+ */</div><div class='add'>+struct xdp_page_head {</div><div class='add'>+	struct xdp_buff orig_ctx;</div><div class='add'>+	struct xdp_buff ctx;</div><div class='add'>+	union {</div><div class='add'>+		/* ::data_hard_start starts here */</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct xdp_frame, frame);</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, data);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xdp_test_data {</div><div class='add'>+	struct xdp_buff *orig_ctx;</div><div class='add'>+	struct xdp_rxq_info rxq;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct page_pool *pp;</div><div class='add'>+	struct xdp_frame **frames;</div><div class='add'>+	struct sk_buff **skbs;</div><div class='add'>+	struct xdp_mem_info mem;</div><div class='add'>+	u32 batch_size;</div><div class='add'>+	u32 frame_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c:%MAX_PKT_SIZE</div><div class='add'>+ * must be updated accordingly this gets changed, otherwise BPF selftests</div><div class='add'>+ * will fail.</div><div class='add'>+ */</div><div class='add'>+#define TEST_XDP_FRAME_SIZE (PAGE_SIZE - sizeof(struct xdp_page_head))</div><div class='add'>+#define TEST_XDP_MAX_BATCH 256</div><div class='add'>+</div><div class='add'>+static void xdp_test_run_init_page(netmem_ref netmem, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct xdp_page_head *head =</div><div class='add'>+		phys_to_virt(page_to_phys(netmem_to_page(netmem)));</div><div class='add'>+	struct xdp_buff *new_ctx, *orig_ctx;</div><div class='add'>+	u32 headroom = XDP_PACKET_HEADROOM;</div><div class='add'>+	struct xdp_test_data *xdp = arg;</div><div class='add'>+	size_t frm_len, meta_len;</div><div class='add'>+	struct xdp_frame *frm;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	orig_ctx = xdp-&gt;orig_ctx;</div><div class='add'>+	frm_len = orig_ctx-&gt;data_end - orig_ctx-&gt;data_meta;</div><div class='add'>+	meta_len = orig_ctx-&gt;data - orig_ctx-&gt;data_meta;</div><div class='add'>+	headroom -= meta_len;</div><div class='add'>+</div><div class='add'>+	new_ctx = &amp;head-&gt;ctx;</div><div class='add'>+	frm = head-&gt;frame;</div><div class='add'>+	data = head-&gt;data;</div><div class='add'>+	memcpy(data + headroom, orig_ctx-&gt;data_meta, frm_len);</div><div class='add'>+</div><div class='add'>+	xdp_init_buff(new_ctx, TEST_XDP_FRAME_SIZE, &amp;xdp-&gt;rxq);</div><div class='add'>+	xdp_prepare_buff(new_ctx, data, headroom, frm_len, true);</div><div class='add'>+	new_ctx-&gt;data = new_ctx-&gt;data_meta + meta_len;</div><div class='add'>+</div><div class='add'>+	xdp_update_frame_from_buff(new_ctx, frm);</div><div class='add'>+	frm-&gt;mem_type = new_ctx-&gt;rxq-&gt;mem.type;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;head-&gt;orig_ctx, new_ctx, sizeof(head-&gt;orig_ctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xdp_test_run_setup(struct xdp_test_data *xdp, struct xdp_buff *orig_ctx)</div><div class='add'>+{</div><div class='add'>+	struct page_pool *pp;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+	struct page_pool_params pp_params = {</div><div class='add'>+		.order = 0,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.pool_size = xdp-&gt;batch_size,</div><div class='add'>+		.nid = NUMA_NO_NODE,</div><div class='add'>+		.init_callback = xdp_test_run_init_page,</div><div class='add'>+		.init_arg = xdp,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xdp-&gt;frames = kvmalloc_array(xdp-&gt;batch_size, sizeof(void *), GFP_KERNEL);</div><div class='add'>+	if (!xdp-&gt;frames)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	xdp-&gt;skbs = kvmalloc_array(xdp-&gt;batch_size, sizeof(void *), GFP_KERNEL);</div><div class='add'>+	if (!xdp-&gt;skbs)</div><div class='add'>+		goto err_skbs;</div><div class='add'>+</div><div class='add'>+	pp = page_pool_create(&amp;pp_params);</div><div class='add'>+	if (IS_ERR(pp)) {</div><div class='add'>+		err = PTR_ERR(pp);</div><div class='add'>+		goto err_pp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* will copy 'mem.id' into pp-&gt;xdp_mem_id */</div><div class='add'>+	err = xdp_reg_mem_model(&amp;xdp-&gt;mem, MEM_TYPE_PAGE_POOL, pp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_mmodel;</div><div class='add'>+</div><div class='add'>+	xdp-&gt;pp = pp;</div><div class='add'>+</div><div class='add'>+	/* We create a 'fake' RXQ referencing the original dev, but with an</div><div class='add'>+	 * xdp_mem_info pointing to our page_pool</div><div class='add'>+	 */</div><div class='add'>+	xdp_rxq_info_reg(&amp;xdp-&gt;rxq, orig_ctx-&gt;rxq-&gt;dev, 0, 0);</div><div class='add'>+	xdp-&gt;rxq.mem.type = MEM_TYPE_PAGE_POOL;</div><div class='add'>+	xdp-&gt;rxq.mem.id = pp-&gt;xdp_mem_id;</div><div class='add'>+	xdp-&gt;dev = orig_ctx-&gt;rxq-&gt;dev;</div><div class='add'>+	xdp-&gt;orig_ctx = orig_ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mmodel:</div><div class='add'>+	page_pool_destroy(pp);</div><div class='add'>+err_pp:</div><div class='add'>+	kvfree(xdp-&gt;skbs);</div><div class='add'>+err_skbs:</div><div class='add'>+	kvfree(xdp-&gt;frames);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xdp_test_run_teardown(struct xdp_test_data *xdp)</div><div class='add'>+{</div><div class='add'>+	xdp_unreg_mem_model(&amp;xdp-&gt;mem);</div><div class='add'>+	page_pool_destroy(xdp-&gt;pp);</div><div class='add'>+	kfree(xdp-&gt;frames);</div><div class='add'>+	kfree(xdp-&gt;skbs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool frame_was_changed(const struct xdp_page_head *head)</div><div class='add'>+{</div><div class='add'>+	/* xdp_scrub_frame() zeroes the data pointer, flags is the last field,</div><div class='add'>+	 * i.e. has the highest chances to be overwritten. If those two are</div><div class='add'>+	 * untouched, it's most likely safe to skip the context reset.</div><div class='add'>+	 */</div><div class='add'>+	return head-&gt;frame-&gt;data != head-&gt;orig_ctx.data ||</div><div class='add'>+	       head-&gt;frame-&gt;flags != head-&gt;orig_ctx.flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ctx_was_changed(struct xdp_page_head *head)</div><div class='add'>+{</div><div class='add'>+	return head-&gt;orig_ctx.data != head-&gt;ctx.data ||</div><div class='add'>+		head-&gt;orig_ctx.data_meta != head-&gt;ctx.data_meta ||</div><div class='add'>+		head-&gt;orig_ctx.data_end != head-&gt;ctx.data_end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *time)</div><div class='add'>+static void reset_ctx(struct xdp_page_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_cgroup_storage *storage = NULL;</div><div class='del'>-	u64 time_start, time_spent = 0;</div><div class='del'>-	u32 ret = 0, i;</div><div class='add'>+	if (likely(!frame_was_changed(head) &amp;&amp; !ctx_was_changed(head)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	head-&gt;ctx.data = head-&gt;orig_ctx.data;</div><div class='add'>+	head-&gt;ctx.data_meta = head-&gt;orig_ctx.data_meta;</div><div class='add'>+	head-&gt;ctx.data_end = head-&gt;orig_ctx.data_end;</div><div class='add'>+	xdp_update_frame_from_buff(&amp;head-&gt;ctx, head-&gt;frame);</div><div class='add'>+	head-&gt;frame-&gt;mem_type = head-&gt;orig_ctx.rxq-&gt;mem.type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xdp_recv_frames(struct xdp_frame **frames, int nframes,</div><div class='add'>+			   struct sk_buff **skbs,</div><div class='add'>+			   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	gfp_t gfp = __GFP_ZERO | GFP_ATOMIC;</div><div class='add'>+	int i, n;</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+</div><div class='add'>+	n = kmem_cache_alloc_bulk(net_hotdata.skbuff_cache, gfp, nframes,</div><div class='add'>+				  (void **)skbs);</div><div class='add'>+	if (unlikely(n == 0)) {</div><div class='add'>+		for (i = 0; i &lt; nframes; i++)</div><div class='add'>+			xdp_return_frame(frames[i]);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nframes; i++) {</div><div class='add'>+		struct xdp_frame *xdpf = frames[i];</div><div class='add'>+		struct sk_buff *skb = skbs[i];</div><div class='add'>+</div><div class='add'>+		skb = __xdp_build_skb_from_frame(xdpf, skb, dev);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			xdp_return_frame(xdpf);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;skb-&gt;list, &amp;list);</div><div class='add'>+	}</div><div class='add'>+	netif_receive_skb_list(&amp;list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xdp_test_run_batch(struct xdp_test_data *xdp, struct bpf_prog *prog,</div><div class='add'>+			      u32 repeat)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	int err = 0, act, ret, i, nframes = 0, batch_sz;</div><div class='add'>+	struct xdp_frame **frames = xdp-&gt;frames;</div><div class='add'>+	struct bpf_redirect_info *ri;</div><div class='add'>+	struct xdp_page_head *head;</div><div class='add'>+	struct xdp_frame *frm;</div><div class='add'>+	bool redirect = false;</div><div class='add'>+	struct xdp_buff *ctx;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	batch_sz = min_t(u32, repeat, xdp-&gt;batch_size);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+	ri = bpf_net_ctx_get_ri();</div><div class='add'>+	xdp_set_return_frame_no_direct();</div><div class='ctx'> </div><div class='del'>-	storage = bpf_cgroup_storage_alloc(prog);</div><div class='del'>-	if (IS_ERR(storage))</div><div class='del'>-		return PTR_ERR(storage);</div><div class='add'>+	for (i = 0; i &lt; batch_sz; i++) {</div><div class='add'>+		page = page_pool_dev_alloc_pages(xdp-&gt;pp);</div><div class='add'>+		if (!page) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		head = phys_to_virt(page_to_phys(page));</div><div class='add'>+		reset_ctx(head);</div><div class='add'>+		ctx = &amp;head-&gt;ctx;</div><div class='add'>+		frm = head-&gt;frame;</div><div class='add'>+		xdp-&gt;frame_cnt++;</div><div class='add'>+</div><div class='add'>+		act = bpf_prog_run_xdp(prog, ctx);</div><div class='add'>+</div><div class='add'>+		/* if program changed pkt bounds we need to update the xdp_frame */</div><div class='add'>+		if (unlikely(ctx_was_changed(head))) {</div><div class='add'>+			ret = xdp_update_frame_from_buff(ctx, frm);</div><div class='add'>+			if (ret) {</div><div class='add'>+				xdp_return_buff(ctx);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (act) {</div><div class='add'>+		case XDP_TX:</div><div class='add'>+			/* we can't do a real XDP_TX since we're not in the</div><div class='add'>+			 * driver, so turn it into a REDIRECT back to the same</div><div class='add'>+			 * index</div><div class='add'>+			 */</div><div class='add'>+			ri-&gt;tgt_index = xdp-&gt;dev-&gt;ifindex;</div><div class='add'>+			ri-&gt;map_id = INT_MAX;</div><div class='add'>+			ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case XDP_REDIRECT:</div><div class='add'>+			redirect = true;</div><div class='add'>+			ret = xdp_do_redirect_frame(xdp-&gt;dev, ctx, frm, prog);</div><div class='add'>+			if (ret)</div><div class='add'>+				xdp_return_buff(ctx);</div><div class='add'>+			break;</div><div class='add'>+		case XDP_PASS:</div><div class='add'>+			frames[nframes++] = frm;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			bpf_warn_invalid_xdp_action(NULL, prog, act);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case XDP_DROP:</div><div class='add'>+			xdp_return_buff(ctx);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (redirect)</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+	if (nframes) {</div><div class='add'>+		ret = xdp_recv_frames(frames, nframes, xdp-&gt;skbs, xdp-&gt;dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			err = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xdp_clear_return_frame_no_direct();</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_test_run_xdp_live(struct bpf_prog *prog, struct xdp_buff *ctx,</div><div class='add'>+				 u32 repeat, u32 batch_size, u32 *time)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct xdp_test_data xdp = { .batch_size = batch_size };</div><div class='add'>+	struct bpf_test_timer t = {};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!repeat)</div><div class='ctx'> 		repeat = 1;</div><div class='del'>-	time_start = ktime_get_ns();</div><div class='del'>-	for (i = 0; i &lt; repeat; i++) {</div><div class='del'>-		ret = bpf_test_run_one(prog, ctx, storage);</div><div class='del'>-		if (need_resched()) {</div><div class='del'>-			if (signal_pending(current))</div><div class='del'>-				break;</div><div class='del'>-			time_spent += ktime_get_ns() - time_start;</div><div class='del'>-			cond_resched();</div><div class='del'>-			time_start = ktime_get_ns();</div><div class='add'>+</div><div class='add'>+	ret = xdp_test_run_setup(&amp;xdp, ctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bpf_test_timer_enter(&amp;t);</div><div class='add'>+	do {</div><div class='add'>+		xdp.frame_cnt = 0;</div><div class='add'>+		ret = xdp_test_run_batch(&amp;xdp, prog, repeat - t.i);</div><div class='add'>+		if (unlikely(ret &lt; 0))</div><div class='add'>+			break;</div><div class='add'>+	} while (bpf_test_timer_continue(&amp;t, xdp.frame_cnt, repeat, &amp;ret, time));</div><div class='add'>+	bpf_test_timer_leave(&amp;t);</div><div class='add'>+</div><div class='add'>+	xdp_test_run_teardown(&amp;xdp);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat,</div><div class='add'>+			u32 *retval, u32 *time, bool xdp)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	struct bpf_prog_array_item item = {.prog = prog};</div><div class='add'>+	struct bpf_run_ctx *old_ctx;</div><div class='add'>+	struct bpf_cg_run_ctx run_ctx;</div><div class='add'>+	struct bpf_test_timer t = {};</div><div class='add'>+	enum bpf_cgroup_storage_type stype;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for_each_cgroup_storage_type(stype) {</div><div class='add'>+		item.cgroup_storage[stype] = bpf_cgroup_storage_alloc(prog, stype);</div><div class='add'>+		if (IS_ERR(item.cgroup_storage[stype])) {</div><div class='add'>+			item.cgroup_storage[stype] = NULL;</div><div class='add'>+			for_each_cgroup_storage_type(stype)</div><div class='add'>+				bpf_cgroup_storage_free(item.cgroup_storage[stype]);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	time_spent += ktime_get_ns() - time_start;</div><div class='del'>-	do_div(time_spent, repeat);</div><div class='del'>-	*time = time_spent &gt; U32_MAX ? U32_MAX : (u32)time_spent;</div><div class='ctx'> </div><div class='del'>-	bpf_cgroup_storage_free(storage);</div><div class='add'>+	if (!repeat)</div><div class='add'>+		repeat = 1;</div><div class='add'>+</div><div class='add'>+	bpf_test_timer_enter(&amp;t);</div><div class='add'>+	old_ctx = bpf_set_run_ctx(&amp;run_ctx.run_ctx);</div><div class='add'>+	do {</div><div class='add'>+		run_ctx.prog_item = &amp;item;</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+		if (xdp)</div><div class='add'>+			*retval = bpf_prog_run_xdp(prog, ctx);</div><div class='add'>+		else</div><div class='add'>+			*retval = bpf_prog_run(prog, ctx);</div><div class='add'>+</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	} while (bpf_test_timer_continue(&amp;t, 1, repeat, &amp;ret, time));</div><div class='add'>+	bpf_reset_run_ctx(old_ctx);</div><div class='add'>+	bpf_test_timer_leave(&amp;t);</div><div class='add'>+</div><div class='add'>+	for_each_cgroup_storage_type(stype)</div><div class='add'>+		bpf_cgroup_storage_free(item.cgroup_storage[stype]);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bpf_test_finish(const union bpf_attr *kattr,</div><div class='ctx'> 			   union bpf_attr __user *uattr, const void *data,</div><div class='del'>-			   u32 size, u32 retval, u32 duration)</div><div class='add'>+			   struct skb_shared_info *sinfo, u32 size, u32 frag_size,</div><div class='add'>+			   u32 retval, u32 duration)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *data_out = u64_to_user_ptr(kattr-&gt;test.data_out);</div><div class='ctx'> 	int err = -EFAULT;</div><div class='add'>+	u32 copy_size = size;</div><div class='add'>+</div><div class='add'>+	/* Clamp copy if the user has provided a size hint, but copy the full</div><div class='add'>+	 * buffer if not to retain old behaviour.</div><div class='add'>+	 */</div><div class='add'>+	if (kattr-&gt;test.data_size_out &amp;&amp;</div><div class='add'>+	    copy_size &gt; kattr-&gt;test.data_size_out) {</div><div class='add'>+		copy_size = kattr-&gt;test.data_size_out;</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_out) {</div><div class='add'>+		int len = sinfo ? copy_size - frag_size : copy_size;</div><div class='add'>+</div><div class='add'>+		if (len &lt; 0) {</div><div class='add'>+			err = -ENOSPC;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(data_out, data, len))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (sinfo) {</div><div class='add'>+			int i, offset = len;</div><div class='add'>+			u32 data_len;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; sinfo-&gt;nr_frags; i++) {</div><div class='add'>+				skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+				if (offset &gt;= copy_size) {</div><div class='add'>+					err = -ENOSPC;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				data_len = min_t(u32, copy_size - offset,</div><div class='add'>+						 skb_frag_size(frag));</div><div class='add'>+</div><div class='add'>+				if (copy_to_user(data_out + offset,</div><div class='add'>+						 skb_frag_address(frag),</div><div class='add'>+						 data_len))</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				offset += data_len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (data_out &amp;&amp; copy_to_user(data_out, data, size))</div><div class='del'>-		goto out;</div><div class='ctx'> 	if (copy_to_user(&amp;uattr-&gt;test.data_size_out, &amp;size, sizeof(size)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (copy_to_user(&amp;uattr-&gt;test.retval, &amp;retval, sizeof(retval)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (copy_to_user(&amp;uattr-&gt;test.duration, &amp;duration, sizeof(duration)))</div><div class='ctx'> 		goto out;</div><div class='del'>-	err = 0;</div><div class='add'>+	if (err != -ENOSPC)</div><div class='add'>+		err = 0;</div><div class='ctx'> out:</div><div class='add'>+	trace_bpf_test_finish(&amp;err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *bpf_test_init(const union bpf_attr *kattr, u32 size,</div><div class='del'>-			   u32 headroom, u32 tailroom)</div><div class='add'>+/* Integer types of various sizes and pointer combinations cover variety of</div><div class='add'>+ * architecture dependent calling conventions. 7+ can be supported in the</div><div class='add'>+ * future.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_fentry_test1(int a)</div><div class='add'>+{</div><div class='add'>+	return a + 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bpf_fentry_test1);</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test2(int a, u64 b)</div><div class='add'>+{</div><div class='add'>+	return a + b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test3(char a, int b, u64 c)</div><div class='add'>+{</div><div class='add'>+	return a + b + c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test4(void *a, char b, int c, u64 d)</div><div class='add'>+{</div><div class='add'>+	return (long)a + b + c + d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test5(u64 a, void *b, short c, int d, u64 e)</div><div class='add'>+{</div><div class='add'>+	return a + (long)b + c + d + e;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test6(u64 a, void *b, short c, int d, void *e, u64 f)</div><div class='add'>+{</div><div class='add'>+	return a + (long)b + c + d + (long)e + f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_fentry_test_t {</div><div class='add'>+	struct bpf_fentry_test_t *a;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test7(struct bpf_fentry_test_t *arg)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("" : "+r"(arg));</div><div class='add'>+	return (long)arg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test8(struct bpf_fentry_test_t *arg)</div><div class='add'>+{</div><div class='add'>+	return (long)arg-&gt;a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc u32 bpf_fentry_test9(u32 *a)</div><div class='add'>+{</div><div class='add'>+	return *a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_test10(const void *a)</div><div class='add'>+{</div><div class='add'>+	return (long)a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline void bpf_fentry_test_sinfo(struct skb_shared_info *sinfo)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_modify_return_test(int a, int *b)</div><div class='add'>+{</div><div class='add'>+	*b += 1;</div><div class='add'>+	return a + *b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_modify_return_test2(int a, int *b, short c, int d,</div><div class='add'>+					void *e, char f, int g)</div><div class='add'>+{</div><div class='add'>+	*b += 1;</div><div class='add'>+	return a + *b + c + d + (long)e + f + g;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_modify_return_test_tp(int nonce)</div><div class='add'>+{</div><div class='add'>+	trace_bpf_trigger_tp(nonce);</div><div class='add'>+</div><div class='add'>+	return nonce;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int bpf_fentry_shadow_test(int a)</div><div class='add'>+{</div><div class='add'>+	return a + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct prog_test_member1 {</div><div class='add'>+	int a;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct prog_test_member {</div><div class='add'>+	struct prog_test_member1 m;</div><div class='add'>+	int c;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct prog_test_ref_kfunc {</div><div class='add'>+	int a;</div><div class='add'>+	int b;</div><div class='add'>+	struct prog_test_member memb;</div><div class='add'>+	struct prog_test_ref_kfunc *next;</div><div class='add'>+	refcount_t cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+__bpf_kfunc void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)</div><div class='add'>+{</div><div class='add'>+	refcount_dec(&amp;p-&gt;cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc void bpf_kfunc_call_test_release_dtor(void *p)</div><div class='add'>+{</div><div class='add'>+	bpf_kfunc_call_test_release(p);</div><div class='add'>+}</div><div class='add'>+CFI_NOSEAL(bpf_kfunc_call_test_release_dtor);</div><div class='add'>+</div><div class='add'>+__bpf_kfunc void bpf_kfunc_call_memb_release(struct prog_test_member *p)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc void bpf_kfunc_call_memb_release_dtor(void *p)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+CFI_NOSEAL(bpf_kfunc_call_memb_release_dtor);</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_test_modify_return_ids)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_modify_return_test)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_modify_return_test2)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_modify_return_test_tp)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_fentry_test1, KF_SLEEPABLE)</div><div class='add'>+BTF_KFUNCS_END(bpf_test_modify_return_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_test_modify_return_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;bpf_test_modify_return_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(test_sk_check_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_kfunc_call_test_release, KF_RELEASE)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_kfunc_call_memb_release, KF_RELEASE)</div><div class='add'>+BTF_KFUNCS_END(test_sk_check_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static void *bpf_test_init(const union bpf_attr *kattr, u32 user_size,</div><div class='add'>+			   u32 size, u32 headroom, u32 tailroom)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *data_in = u64_to_user_ptr(kattr-&gt;test.data_in);</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='del'>-	if (size &lt; ETH_HLEN || size &gt; PAGE_SIZE - headroom - tailroom)</div><div class='add'>+	if (user_size &gt; PAGE_SIZE - headroom - tailroom)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='add'>+	size = SKB_DATA_ALIGN(size);</div><div class='ctx'> 	data = kzalloc(size + headroom + tailroom, GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(data + headroom, data_in, size)) {</div><div class='add'>+	if (copy_from_user(data + headroom, data_in, user_size)) {</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 		return ERR_PTR(-EFAULT);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int bpf_prog_test_run_tracing(struct bpf_prog *prog,</div><div class='add'>+			      const union bpf_attr *kattr,</div><div class='add'>+			      union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_fentry_test_t arg = {};</div><div class='add'>+	u16 side_effect = 0, ret = 0;</div><div class='add'>+	int b = 2, err = -EFAULT;</div><div class='add'>+	u32 retval = 0;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.flags || kattr-&gt;test.cpu || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (prog-&gt;expected_attach_type) {</div><div class='add'>+	case BPF_TRACE_FENTRY:</div><div class='add'>+	case BPF_TRACE_FEXIT:</div><div class='add'>+		if (bpf_fentry_test1(1) != 2 ||</div><div class='add'>+		    bpf_fentry_test2(2, 3) != 5 ||</div><div class='add'>+		    bpf_fentry_test3(4, 5, 6) != 15 ||</div><div class='add'>+		    bpf_fentry_test4((void *)7, 8, 9, 10) != 34 ||</div><div class='add'>+		    bpf_fentry_test5(11, (void *)12, 13, 14, 15) != 65 ||</div><div class='add'>+		    bpf_fentry_test6(16, (void *)17, 18, 19, (void *)20, 21) != 111 ||</div><div class='add'>+		    bpf_fentry_test7((struct bpf_fentry_test_t *)0) != 0 ||</div><div class='add'>+		    bpf_fentry_test8(&amp;arg) != 0 ||</div><div class='add'>+		    bpf_fentry_test9(&amp;retval) != 0 ||</div><div class='add'>+		    bpf_fentry_test10((void *)0) != 0)</div><div class='add'>+			goto out;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_MODIFY_RETURN:</div><div class='add'>+		ret = bpf_modify_return_test(1, &amp;b);</div><div class='add'>+		if (b != 2)</div><div class='add'>+			side_effect++;</div><div class='add'>+		b = 2;</div><div class='add'>+		ret += bpf_modify_return_test2(1, &amp;b, 3, 4, (void *)5, 6, 7);</div><div class='add'>+		if (b != 2)</div><div class='add'>+			side_effect++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = ((u32)side_effect &lt;&lt; 16) | ret;</div><div class='add'>+	if (copy_to_user(&amp;uattr-&gt;test.retval, &amp;retval, sizeof(retval)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	trace_bpf_test_finish(&amp;err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_raw_tp_test_run_info {</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	void *ctx;</div><div class='add'>+	u32 retval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__bpf_prog_test_run_raw_tp(void *data)</div><div class='add'>+{</div><div class='add'>+	struct bpf_raw_tp_test_run_info *info = data;</div><div class='add'>+	struct bpf_trace_run_ctx run_ctx = {};</div><div class='add'>+	struct bpf_run_ctx *old_run_ctx;</div><div class='add'>+</div><div class='add'>+	old_run_ctx = bpf_set_run_ctx(&amp;run_ctx.run_ctx);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	info-&gt;retval = bpf_prog_run(info-&gt;prog, info-&gt;ctx);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	bpf_reset_run_ctx(old_run_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_prog_test_run_raw_tp(struct bpf_prog *prog,</div><div class='add'>+			     const union bpf_attr *kattr,</div><div class='add'>+			     union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	void __user *ctx_in = u64_to_user_ptr(kattr-&gt;test.ctx_in);</div><div class='add'>+	__u32 ctx_size_in = kattr-&gt;test.ctx_size_in;</div><div class='add'>+	struct bpf_raw_tp_test_run_info info;</div><div class='add'>+	int cpu = kattr-&gt;test.cpu, err = 0;</div><div class='add'>+	int current_cpu;</div><div class='add'>+</div><div class='add'>+	/* doesn't support data_in/out, ctx_out, duration, or repeat */</div><div class='add'>+	if (kattr-&gt;test.data_in || kattr-&gt;test.data_out ||</div><div class='add'>+	    kattr-&gt;test.ctx_out || kattr-&gt;test.duration ||</div><div class='add'>+	    kattr-&gt;test.repeat || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ctx_size_in &lt; prog-&gt;aux-&gt;max_ctx_offset ||</div><div class='add'>+	    ctx_size_in &gt; MAX_BPF_FUNC_ARGS * sizeof(u64))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((kattr-&gt;test.flags &amp; BPF_F_TEST_RUN_ON_CPU) == 0 &amp;&amp; cpu != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ctx_size_in) {</div><div class='add'>+		info.ctx = memdup_user(ctx_in, ctx_size_in);</div><div class='add'>+		if (IS_ERR(info.ctx))</div><div class='add'>+			return PTR_ERR(info.ctx);</div><div class='add'>+	} else {</div><div class='add'>+		info.ctx = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info.prog = prog;</div><div class='add'>+</div><div class='add'>+	current_cpu = get_cpu();</div><div class='add'>+	if ((kattr-&gt;test.flags &amp; BPF_F_TEST_RUN_ON_CPU) == 0 ||</div><div class='add'>+	    cpu == current_cpu) {</div><div class='add'>+		__bpf_prog_test_run_raw_tp(&amp;info);</div><div class='add'>+	} else if (cpu &gt;= nr_cpu_ids || !cpu_online(cpu)) {</div><div class='add'>+		/* smp_call_function_single() also checks cpu_online()</div><div class='add'>+		 * after csd_lock(). However, since cpu is from user</div><div class='add'>+		 * space, let's do an extra quick check to filter out</div><div class='add'>+		 * invalid value before smp_call_function_single().</div><div class='add'>+		 */</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+	} else {</div><div class='add'>+		err = smp_call_function_single(cpu, __bpf_prog_test_run_raw_tp,</div><div class='add'>+					       &amp;info, 1);</div><div class='add'>+	}</div><div class='add'>+	put_cpu();</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp;</div><div class='add'>+	    copy_to_user(&amp;uattr-&gt;test.retval, &amp;info.retval, sizeof(u32)))</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+</div><div class='add'>+	kfree(info.ctx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_ctx_init(const union bpf_attr *kattr, u32 max_size)</div><div class='add'>+{</div><div class='add'>+	void __user *data_in = u64_to_user_ptr(kattr-&gt;test.ctx_in);</div><div class='add'>+	void __user *data_out = u64_to_user_ptr(kattr-&gt;test.ctx_out);</div><div class='add'>+	u32 size = kattr-&gt;test.ctx_size_in;</div><div class='add'>+	void *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!data_in &amp;&amp; !data_out)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(max_size, GFP_USER);</div><div class='add'>+	if (!data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	if (data_in) {</div><div class='add'>+		err = bpf_check_uarg_tail_zero(USER_BPFPTR(data_in), max_size, size);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(data);</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		size = min_t(u32, max_size, size);</div><div class='add'>+		if (copy_from_user(data, data_in, size)) {</div><div class='add'>+			kfree(data);</div><div class='add'>+			return ERR_PTR(-EFAULT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_ctx_finish(const union bpf_attr *kattr,</div><div class='add'>+			  union bpf_attr __user *uattr, const void *data,</div><div class='add'>+			  u32 size)</div><div class='add'>+{</div><div class='add'>+	void __user *data_out = u64_to_user_ptr(kattr-&gt;test.ctx_out);</div><div class='add'>+	int err = -EFAULT;</div><div class='add'>+	u32 copy_size = size;</div><div class='add'>+</div><div class='add'>+	if (!data || !data_out)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (copy_size &gt; kattr-&gt;test.ctx_size_out) {</div><div class='add'>+		copy_size = kattr-&gt;test.ctx_size_out;</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(data_out, data, copy_size))</div><div class='add'>+		goto out;</div><div class='add'>+	if (copy_to_user(&amp;uattr-&gt;test.ctx_size_out, &amp;size, sizeof(size)))</div><div class='add'>+		goto out;</div><div class='add'>+	if (err != -ENOSPC)</div><div class='add'>+		err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * range_is_zero - test whether buffer is initialized</div><div class='add'>+ * @buf: buffer to check</div><div class='add'>+ * @from: check from this position</div><div class='add'>+ * @to: check up until (excluding) this position</div><div class='add'>+ *</div><div class='add'>+ * This function returns true if the there is a non-zero byte</div><div class='add'>+ * in the buf in the range [from,to).</div><div class='add'>+ */</div><div class='add'>+static inline bool range_is_zero(void *buf, size_t from, size_t to)</div><div class='add'>+{</div><div class='add'>+	return !memchr_inv((u8 *)buf + from, 0, to - from);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int convert___skb_to_skb(struct sk_buff *skb, struct __sk_buff *__skb)</div><div class='add'>+{</div><div class='add'>+	struct qdisc_skb_cb *cb = (struct qdisc_skb_cb *)skb-&gt;cb;</div><div class='add'>+</div><div class='add'>+	if (!__skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* make sure the fields we don't use are zeroed */</div><div class='add'>+	if (!range_is_zero(__skb, 0, offsetof(struct __sk_buff, mark)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* mark is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, mark),</div><div class='add'>+			   offsetof(struct __sk_buff, priority)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* priority is allowed */</div><div class='add'>+	/* ingress_ifindex is allowed */</div><div class='add'>+	/* ifindex is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, ifindex),</div><div class='add'>+			   offsetof(struct __sk_buff, cb)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* cb is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, cb),</div><div class='add'>+			   offsetof(struct __sk_buff, data_end)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* data_end is allowed, but not copied to skb */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, data_end),</div><div class='add'>+			   offsetof(struct __sk_buff, tstamp)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* tstamp is allowed */</div><div class='add'>+	/* wire_len is allowed */</div><div class='add'>+	/* gso_segs is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_segs),</div><div class='add'>+			   offsetof(struct __sk_buff, gso_size)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* gso_size is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_size),</div><div class='add'>+			   offsetof(struct __sk_buff, hwtstamp)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* hwtstamp is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, hwtstamp),</div><div class='add'>+			   sizeof(struct __sk_buff)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	skb-&gt;mark = __skb-&gt;mark;</div><div class='add'>+	skb-&gt;priority = __skb-&gt;priority;</div><div class='add'>+	skb-&gt;skb_iif = __skb-&gt;ingress_ifindex;</div><div class='add'>+	skb-&gt;tstamp = __skb-&gt;tstamp;</div><div class='add'>+	memcpy(&amp;cb-&gt;data, __skb-&gt;cb, QDISC_CB_PRIV_LEN);</div><div class='add'>+</div><div class='add'>+	if (__skb-&gt;wire_len == 0) {</div><div class='add'>+		cb-&gt;pkt_len = skb-&gt;len;</div><div class='add'>+	} else {</div><div class='add'>+		if (__skb-&gt;wire_len &lt; skb-&gt;len ||</div><div class='add'>+		    __skb-&gt;wire_len &gt; GSO_LEGACY_MAX_SIZE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cb-&gt;pkt_len = __skb-&gt;wire_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (__skb-&gt;gso_segs &gt; GSO_MAX_SEGS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Currently GSO type is zero/unset. If this gets extended with</div><div class='add'>+	 * a small list of accepted GSO types in future, the filter for</div><div class='add'>+	 * an unset GSO type in bpf_clone_redirect() can be lifted.</div><div class='add'>+	 */</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_segs = __skb-&gt;gso_segs;</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_size = __skb-&gt;gso_size;</div><div class='add'>+	skb_shinfo(skb)-&gt;hwtstamps.hwtstamp = __skb-&gt;hwtstamp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void convert_skb_to___skb(struct sk_buff *skb, struct __sk_buff *__skb)</div><div class='add'>+{</div><div class='add'>+	struct qdisc_skb_cb *cb = (struct qdisc_skb_cb *)skb-&gt;cb;</div><div class='add'>+</div><div class='add'>+	if (!__skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__skb-&gt;mark = skb-&gt;mark;</div><div class='add'>+	__skb-&gt;priority = skb-&gt;priority;</div><div class='add'>+	__skb-&gt;ingress_ifindex = skb-&gt;skb_iif;</div><div class='add'>+	__skb-&gt;ifindex = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	__skb-&gt;tstamp = skb-&gt;tstamp;</div><div class='add'>+	memcpy(__skb-&gt;cb, &amp;cb-&gt;data, QDISC_CB_PRIV_LEN);</div><div class='add'>+	__skb-&gt;wire_len = cb-&gt;pkt_len;</div><div class='add'>+	__skb-&gt;gso_segs = skb_shinfo(skb)-&gt;gso_segs;</div><div class='add'>+	__skb-&gt;hwtstamp = skb_shinfo(skb)-&gt;hwtstamps.hwtstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct proto bpf_dummy_proto = {</div><div class='add'>+	.name   = "bpf_dummy",</div><div class='add'>+	.owner  = THIS_MODULE,</div><div class='add'>+	.obj_size = sizeof(struct sock),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,</div><div class='ctx'> 			  union bpf_attr __user *uattr)</div><div class='ctx'> {</div><div class='del'>-	bool is_l2 = false, is_direct_pkt_access = false;</div><div class='del'>-	u32 size = kattr-&gt;test.data_size_in;</div><div class='add'>+	bool is_l2 = false, is_direct_pkt_access = false, is_lwt = false;</div><div class='add'>+	u32 tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	struct net *net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	struct net_device *dev = net-&gt;loopback_dev;</div><div class='add'>+	u32 headroom = NET_SKB_PAD + NET_IP_ALIGN;</div><div class='add'>+	u32 linear_sz = kattr-&gt;test.data_size_in;</div><div class='ctx'> 	u32 repeat = kattr-&gt;test.repeat;</div><div class='add'>+	struct __sk_buff *ctx = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='ctx'> 	u32 retval, duration;</div><div class='ctx'> 	int hh_len = ETH_HLEN;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	void *data;</div><div class='add'>+	void *data = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	data = bpf_test_init(kattr, size, NET_SKB_PAD + NET_IP_ALIGN,</div><div class='del'>-			     SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));</div><div class='del'>-	if (IS_ERR(data))</div><div class='del'>-		return PTR_ERR(data);</div><div class='add'>+	if ((kattr-&gt;test.flags &amp; ~BPF_F_TEST_SKB_CHECKSUM_COMPLETE) ||</div><div class='add'>+	    kattr-&gt;test.cpu || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.data_size_in &lt; ETH_HLEN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (prog-&gt;type) {</div><div class='ctx'> 	case BPF_PROG_TYPE_SCHED_CLS:</div><div class='ctx'> 	case BPF_PROG_TYPE_SCHED_ACT:</div><div class='add'>+		is_direct_pkt_access = true;</div><div class='ctx'> 		is_l2 = true;</div><div class='del'>-		/* fall through */</div><div class='add'>+		break;</div><div class='ctx'> 	case BPF_PROG_TYPE_LWT_IN:</div><div class='ctx'> 	case BPF_PROG_TYPE_LWT_OUT:</div><div class='ctx'> 	case BPF_PROG_TYPE_LWT_XMIT:</div><div class='add'>+		is_lwt = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BPF_PROG_TYPE_CGROUP_SKB:</div><div class='ctx'> 		is_direct_pkt_access = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = build_skb(data, 0);</div><div class='add'>+	ctx = bpf_ctx_init(kattr, sizeof(struct __sk_buff));</div><div class='add'>+	if (IS_ERR(ctx))</div><div class='add'>+		return PTR_ERR(ctx);</div><div class='add'>+</div><div class='add'>+	if (ctx) {</div><div class='add'>+		if (ctx-&gt;data_end &gt; kattr-&gt;test.data_size_in || ctx-&gt;data || ctx-&gt;data_meta) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (ctx-&gt;data_end) {</div><div class='add'>+			/* Non-linear LWT test_run is unsupported for now. */</div><div class='add'>+			if (is_lwt) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			linear_sz = max(ETH_HLEN, ctx-&gt;data_end);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	linear_sz = min_t(u32, linear_sz, PAGE_SIZE - headroom - tailroom);</div><div class='add'>+</div><div class='add'>+	data = bpf_test_init(kattr, linear_sz, linear_sz, headroom, tailroom);</div><div class='add'>+	if (IS_ERR(data)) {</div><div class='add'>+		ret = PTR_ERR(data);</div><div class='add'>+		data = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk = sk_alloc(net, AF_UNSPEC, GFP_USER, &amp;bpf_dummy_proto, 1);</div><div class='add'>+	if (!sk) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	sock_init_data(NULL, sk);</div><div class='add'>+</div><div class='add'>+	skb = slab_build_skb(data);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		kfree(data);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	skb-&gt;sk = sk;</div><div class='add'>+</div><div class='add'>+	data = NULL; /* data released via kfree_skb */</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);</div><div class='del'>-	__skb_put(skb, size);</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, current-&gt;nsproxy-&gt;net_ns-&gt;loopback_dev);</div><div class='add'>+	__skb_put(skb, linear_sz);</div><div class='add'>+</div><div class='add'>+	if (unlikely(kattr-&gt;test.data_size_in &gt; linear_sz)) {</div><div class='add'>+		void __user *data_in = u64_to_user_ptr(kattr-&gt;test.data_in);</div><div class='add'>+		struct skb_shared_info *sinfo = skb_shinfo(skb);</div><div class='add'>+		u32 copied = linear_sz;</div><div class='add'>+</div><div class='add'>+		while (copied &lt; kattr-&gt;test.data_size_in) {</div><div class='add'>+			struct page *page;</div><div class='add'>+			u32 data_len;</div><div class='add'>+</div><div class='add'>+			if (sinfo-&gt;nr_frags == MAX_SKB_FRAGS) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			page = alloc_page(GFP_KERNEL);</div><div class='add'>+			if (!page) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			data_len = min_t(u32, kattr-&gt;test.data_size_in - copied,</div><div class='add'>+					 PAGE_SIZE);</div><div class='add'>+			skb_fill_page_desc(skb, sinfo-&gt;nr_frags, page, 0, data_len);</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(page_address(page), data_in + copied,</div><div class='add'>+					   data_len)) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			skb-&gt;data_len += data_len;</div><div class='add'>+			skb-&gt;truesize += PAGE_SIZE;</div><div class='add'>+			skb-&gt;len += data_len;</div><div class='add'>+			copied += data_len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx &amp;&amp; ctx-&gt;ifindex &gt; 1) {</div><div class='add'>+		dev = dev_get_by_index(net, ctx-&gt;ifindex);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> </div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		sk-&gt;sk_family = AF_INET;</div><div class='add'>+		if (sizeof(struct iphdr) &lt;= skb_headlen(skb)) {</div><div class='add'>+			sk-&gt;sk_rcv_saddr = ip_hdr(skb)-&gt;saddr;</div><div class='add'>+			sk-&gt;sk_daddr = ip_hdr(skb)-&gt;daddr;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		sk-&gt;sk_family = AF_INET6;</div><div class='add'>+		if (sizeof(struct ipv6hdr) &lt;= skb_headlen(skb)) {</div><div class='add'>+			sk-&gt;sk_v6_rcv_saddr = ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+			sk-&gt;sk_v6_daddr = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (is_l2)</div><div class='ctx'> 		__skb_push(skb, hh_len);</div><div class='ctx'> 	if (is_direct_pkt_access)</div><div class='ctx'> 		bpf_compute_data_pointers(skb);</div><div class='del'>-	retval = bpf_test_run(prog, skb, repeat, &amp;duration);</div><div class='add'>+</div><div class='add'>+	ret = convert___skb_to_skb(skb, ctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.flags &amp; BPF_F_TEST_SKB_CHECKSUM_COMPLETE) {</div><div class='add'>+		const int off = skb_network_offset(skb);</div><div class='add'>+		int len = skb-&gt;len - off;</div><div class='add'>+</div><div class='add'>+		skb-&gt;csum = skb_checksum(skb, off, len, 0);</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = bpf_test_run(prog, skb, repeat, &amp;retval, &amp;duration, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (!is_l2) {</div><div class='ctx'> 		if (skb_headroom(skb) &lt; hh_len) {</div><div class='ctx'> 			int nhead = HH_DATA_ALIGN(hh_len - skb_headroom(skb));</div><div class='ctx'> </div><div class='ctx'> 			if (pskb_expand_head(skb, nhead, 0, GFP_USER)) {</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(__skb_push(skb, hh_len), 0, hh_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = skb-&gt;len;</div><div class='del'>-	/* bpf program can never convert linear skb to non-linear */</div><div class='del'>-	if (WARN_ON_ONCE(skb_is_nonlinear(skb)))</div><div class='del'>-		size = skb_headlen(skb);</div><div class='del'>-	ret = bpf_test_finish(kattr, uattr, skb-&gt;data, size, retval, duration);</div><div class='add'>+	if (kattr-&gt;test.flags &amp; BPF_F_TEST_SKB_CHECKSUM_COMPLETE) {</div><div class='add'>+		const int off = skb_network_offset(skb);</div><div class='add'>+		int len = skb-&gt;len - off;</div><div class='add'>+		__wsum csum;</div><div class='add'>+</div><div class='add'>+		csum = skb_checksum(skb, off, len, 0);</div><div class='add'>+</div><div class='add'>+		if (csum_fold(skb-&gt;csum) != csum_fold(csum)) {</div><div class='add'>+			ret = -EBADMSG;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	convert_skb_to___skb(skb, ctx);</div><div class='add'>+</div><div class='add'>+	if (skb_is_nonlinear(skb))</div><div class='add'>+		/* bpf program can never convert linear skb to non-linear */</div><div class='add'>+		WARN_ON_ONCE(linear_sz == kattr-&gt;test.data_size_in);</div><div class='add'>+	ret = bpf_test_finish(kattr, uattr, skb-&gt;data, skb_shinfo(skb), skb-&gt;len,</div><div class='add'>+			      skb-&gt;data_len, retval, duration);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = bpf_ctx_finish(kattr, uattr, ctx,</div><div class='add'>+				     sizeof(struct __sk_buff));</div><div class='add'>+out:</div><div class='add'>+	if (dev &amp;&amp; dev != net-&gt;loopback_dev)</div><div class='add'>+		dev_put(dev);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='add'>+	kfree(data);</div><div class='add'>+	if (sk)</div><div class='add'>+		sk_free(sk);</div><div class='add'>+	kfree(ctx);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xdp_convert_md_to_buff(struct xdp_md *xdp_md, struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	unsigned int ingress_ifindex, rx_queue_index;</div><div class='add'>+	struct netdev_rx_queue *rxqueue;</div><div class='add'>+	struct net_device *device;</div><div class='add'>+</div><div class='add'>+	if (!xdp_md)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (xdp_md-&gt;egress_ifindex != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ingress_ifindex = xdp_md-&gt;ingress_ifindex;</div><div class='add'>+	rx_queue_index = xdp_md-&gt;rx_queue_index;</div><div class='add'>+</div><div class='add'>+	if (!ingress_ifindex &amp;&amp; rx_queue_index)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ingress_ifindex) {</div><div class='add'>+		device = dev_get_by_index(current-&gt;nsproxy-&gt;net_ns,</div><div class='add'>+					  ingress_ifindex);</div><div class='add'>+		if (!device)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		if (rx_queue_index &gt;= device-&gt;real_num_rx_queues)</div><div class='add'>+			goto free_dev;</div><div class='add'>+</div><div class='add'>+		rxqueue = __netif_get_rx_queue(device, rx_queue_index);</div><div class='add'>+</div><div class='add'>+		if (!xdp_rxq_info_is_reg(&amp;rxqueue-&gt;xdp_rxq))</div><div class='add'>+			goto free_dev;</div><div class='add'>+</div><div class='add'>+		xdp-&gt;rxq = &amp;rxqueue-&gt;xdp_rxq;</div><div class='add'>+		/* The device is now tracked in the xdp-&gt;rxq for later</div><div class='add'>+		 * dev_put()</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xdp-&gt;data = xdp-&gt;data_meta + xdp_md-&gt;data;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_dev:</div><div class='add'>+	dev_put(device);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md)</div><div class='add'>+{</div><div class='add'>+	if (!xdp_md)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xdp_md-&gt;data = xdp-&gt;data - xdp-&gt;data_meta;</div><div class='add'>+	xdp_md-&gt;data_end = xdp-&gt;data_end - xdp-&gt;data_meta;</div><div class='add'>+</div><div class='add'>+	if (xdp_md-&gt;ingress_ifindex)</div><div class='add'>+		dev_put(xdp-&gt;rxq-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,</div><div class='ctx'> 			  union bpf_attr __user *uattr)</div><div class='ctx'> {</div><div class='del'>-	u32 size = kattr-&gt;test.data_size_in;</div><div class='add'>+	bool do_live = (kattr-&gt;test.flags &amp; BPF_F_TEST_XDP_LIVE_FRAMES);</div><div class='add'>+	u32 tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	u32 retval = 0, meta_sz = 0, duration, max_linear_sz, size;</div><div class='add'>+	u32 linear_sz = kattr-&gt;test.data_size_in;</div><div class='add'>+	u32 batch_size = kattr-&gt;test.batch_size;</div><div class='add'>+	u32 headroom = XDP_PACKET_HEADROOM;</div><div class='ctx'> 	u32 repeat = kattr-&gt;test.repeat;</div><div class='ctx'> 	struct netdev_rx_queue *rxqueue;</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='ctx'> 	struct xdp_buff xdp = {};</div><div class='add'>+	int i, ret = -EINVAL;</div><div class='add'>+	struct xdp_md *ctx;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (prog-&gt;expected_attach_type == BPF_XDP_DEVMAP ||</div><div class='add'>+	    prog-&gt;expected_attach_type == BPF_XDP_CPUMAP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.flags &amp; ~BPF_F_TEST_XDP_LIVE_FRAMES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (bpf_prog_is_dev_bound(prog-&gt;aux))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (do_live) {</div><div class='add'>+		if (!batch_size)</div><div class='add'>+			batch_size = NAPI_POLL_WEIGHT;</div><div class='add'>+		else if (batch_size &gt; TEST_XDP_MAX_BATCH)</div><div class='add'>+			return -E2BIG;</div><div class='add'>+</div><div class='add'>+		headroom += sizeof(struct xdp_page_head);</div><div class='add'>+	} else if (batch_size) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = bpf_ctx_init(kattr, sizeof(struct xdp_md));</div><div class='add'>+	if (IS_ERR(ctx))</div><div class='add'>+		return PTR_ERR(ctx);</div><div class='add'>+</div><div class='add'>+	if (ctx) {</div><div class='add'>+		/* There can't be user provided data before the meta data */</div><div class='add'>+		if (ctx-&gt;data_meta || ctx-&gt;data_end &gt; kattr-&gt;test.data_size_in ||</div><div class='add'>+		    ctx-&gt;data &gt; ctx-&gt;data_end ||</div><div class='add'>+		    unlikely(xdp_metalen_invalid(ctx-&gt;data)) ||</div><div class='add'>+		    (do_live &amp;&amp; (kattr-&gt;test.data_out || kattr-&gt;test.ctx_out)))</div><div class='add'>+			goto free_ctx;</div><div class='add'>+		/* Meta data is allocated from the headroom */</div><div class='add'>+		headroom -= ctx-&gt;data;</div><div class='add'>+</div><div class='add'>+		meta_sz = ctx-&gt;data;</div><div class='add'>+		linear_sz = ctx-&gt;data_end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_linear_sz = PAGE_SIZE - headroom - tailroom;</div><div class='add'>+	linear_sz = min_t(u32, linear_sz, max_linear_sz);</div><div class='add'>+</div><div class='add'>+	/* disallow live data mode for jumbo frames */</div><div class='add'>+	if (do_live &amp;&amp; kattr-&gt;test.data_size_in &gt; linear_sz)</div><div class='add'>+		goto free_ctx;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.data_size_in - meta_sz &lt; ETH_HLEN)</div><div class='add'>+		goto free_ctx;</div><div class='add'>+</div><div class='add'>+	data = bpf_test_init(kattr, linear_sz, max_linear_sz, headroom, tailroom);</div><div class='add'>+	if (IS_ERR(data)) {</div><div class='add'>+		ret = PTR_ERR(data);</div><div class='add'>+		goto free_ctx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxqueue = __netif_get_rx_queue(current-&gt;nsproxy-&gt;net_ns-&gt;loopback_dev, 0);</div><div class='add'>+	rxqueue-&gt;xdp_rxq.frag_size = PAGE_SIZE;</div><div class='add'>+	xdp_init_buff(&amp;xdp, rxqueue-&gt;xdp_rxq.frag_size, &amp;rxqueue-&gt;xdp_rxq);</div><div class='add'>+	xdp_prepare_buff(&amp;xdp, data, headroom, linear_sz, true);</div><div class='add'>+	sinfo = xdp_get_shared_info_from_buff(&amp;xdp);</div><div class='add'>+</div><div class='add'>+	ret = xdp_convert_md_to_buff(ctx, &amp;xdp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_data;</div><div class='add'>+</div><div class='add'>+	size = linear_sz;</div><div class='add'>+	if (unlikely(kattr-&gt;test.data_size_in &gt; size)) {</div><div class='add'>+		void __user *data_in = u64_to_user_ptr(kattr-&gt;test.data_in);</div><div class='add'>+</div><div class='add'>+		while (size &lt; kattr-&gt;test.data_size_in) {</div><div class='add'>+			struct page *page;</div><div class='add'>+			skb_frag_t *frag;</div><div class='add'>+			u32 data_len;</div><div class='add'>+</div><div class='add'>+			if (sinfo-&gt;nr_frags == MAX_SKB_FRAGS) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			page = alloc_page(GFP_KERNEL);</div><div class='add'>+			if (!page) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			frag = &amp;sinfo-&gt;frags[sinfo-&gt;nr_frags++];</div><div class='add'>+</div><div class='add'>+			data_len = min_t(u32, kattr-&gt;test.data_size_in - size,</div><div class='add'>+					 PAGE_SIZE);</div><div class='add'>+			skb_frag_fill_page_desc(frag, page, 0, data_len);</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(page_address(page), data_in + size,</div><div class='add'>+					   data_len)) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			sinfo-&gt;xdp_frags_size += data_len;</div><div class='add'>+			size += data_len;</div><div class='add'>+		}</div><div class='add'>+		xdp_buff_set_frags_flag(&amp;xdp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (repeat &gt; 1)</div><div class='add'>+		bpf_prog_change_xdp(NULL, prog);</div><div class='add'>+</div><div class='add'>+	if (do_live)</div><div class='add'>+		ret = bpf_test_run_xdp_live(prog, &amp;xdp, repeat, batch_size, &amp;duration);</div><div class='add'>+	else</div><div class='add'>+		ret = bpf_test_run(prog, &amp;xdp, repeat, &amp;retval, &amp;duration, true);</div><div class='add'>+	/* We convert the xdp_buff back to an xdp_md before checking the return</div><div class='add'>+	 * code so the reference count of any held netdevice will be decremented</div><div class='add'>+	 * even if the test run failed.</div><div class='add'>+	 */</div><div class='add'>+	xdp_convert_buff_to_md(&amp;xdp, ctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	size = xdp.data_end - xdp.data_meta + sinfo-&gt;xdp_frags_size;</div><div class='add'>+	ret = bpf_test_finish(kattr, uattr, xdp.data_meta, sinfo, size, sinfo-&gt;xdp_frags_size,</div><div class='add'>+			      retval, duration);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = bpf_ctx_finish(kattr, uattr, ctx,</div><div class='add'>+				     sizeof(struct xdp_md));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (repeat &gt; 1)</div><div class='add'>+		bpf_prog_change_xdp(prog, NULL);</div><div class='add'>+free_data:</div><div class='add'>+	for (i = 0; i &lt; sinfo-&gt;nr_frags; i++)</div><div class='add'>+		__free_page(skb_frag_page(&amp;sinfo-&gt;frags[i]));</div><div class='add'>+	kfree(data);</div><div class='add'>+free_ctx:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int verify_user_bpf_flow_keys(struct bpf_flow_keys *ctx)</div><div class='add'>+{</div><div class='add'>+	/* make sure the fields we don't use are zeroed */</div><div class='add'>+	if (!range_is_zero(ctx, 0, offsetof(struct bpf_flow_keys, flags)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* flags is allowed */</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(ctx, offsetofend(struct bpf_flow_keys, flags),</div><div class='add'>+			   sizeof(struct bpf_flow_keys)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,</div><div class='add'>+				     const union bpf_attr *kattr,</div><div class='add'>+				     union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_test_timer t = {};</div><div class='add'>+	u32 size = kattr-&gt;test.data_size_in;</div><div class='add'>+	struct bpf_flow_dissector ctx = {};</div><div class='add'>+	u32 repeat = kattr-&gt;test.repeat;</div><div class='add'>+	struct bpf_flow_keys *user_ctx;</div><div class='add'>+	struct bpf_flow_keys flow_keys;</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	unsigned int flags = 0;</div><div class='ctx'> 	u32 retval, duration;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	data = bpf_test_init(kattr, size, XDP_PACKET_HEADROOM + NET_IP_ALIGN, 0);</div><div class='add'>+	if (kattr-&gt;test.flags || kattr-&gt;test.cpu || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size &lt; ETH_HLEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data = bpf_test_init(kattr, kattr-&gt;test.data_size_in, size, 0, 0);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-	xdp.data_hard_start = data;</div><div class='del'>-	xdp.data = data + XDP_PACKET_HEADROOM + NET_IP_ALIGN;</div><div class='del'>-	xdp.data_meta = xdp.data;</div><div class='del'>-	xdp.data_end = xdp.data + size;</div><div class='add'>+	eth = (struct ethhdr *)data;</div><div class='ctx'> </div><div class='del'>-	rxqueue = __netif_get_rx_queue(current-&gt;nsproxy-&gt;net_ns-&gt;loopback_dev, 0);</div><div class='del'>-	xdp.rxq = &amp;rxqueue-&gt;xdp_rxq;</div><div class='add'>+	if (!repeat)</div><div class='add'>+		repeat = 1;</div><div class='add'>+</div><div class='add'>+	user_ctx = bpf_ctx_init(kattr, sizeof(struct bpf_flow_keys));</div><div class='add'>+	if (IS_ERR(user_ctx)) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		return PTR_ERR(user_ctx);</div><div class='add'>+	}</div><div class='add'>+	if (user_ctx) {</div><div class='add'>+		ret = verify_user_bpf_flow_keys(user_ctx);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		flags = user_ctx-&gt;flags;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	retval = bpf_test_run(prog, &amp;xdp, repeat, &amp;duration);</div><div class='del'>-	if (xdp.data != data + XDP_PACKET_HEADROOM + NET_IP_ALIGN ||</div><div class='del'>-	    xdp.data_end != xdp.data + size)</div><div class='del'>-		size = xdp.data_end - xdp.data;</div><div class='del'>-	ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);</div><div class='add'>+	ctx.flow_keys = &amp;flow_keys;</div><div class='add'>+	ctx.data = data;</div><div class='add'>+	ctx.data_end = (__u8 *)data + size;</div><div class='add'>+</div><div class='add'>+	bpf_test_timer_enter(&amp;t);</div><div class='add'>+	do {</div><div class='add'>+		retval = bpf_flow_dissect(prog, &amp;ctx, eth-&gt;h_proto, ETH_HLEN,</div><div class='add'>+					  size, flags);</div><div class='add'>+	} while (bpf_test_timer_continue(&amp;t, 1, repeat, &amp;ret, &amp;duration));</div><div class='add'>+	bpf_test_timer_leave(&amp;t);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = bpf_test_finish(kattr, uattr, &amp;flow_keys, NULL,</div><div class='add'>+			      sizeof(flow_keys), 0, retval, duration);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = bpf_ctx_finish(kattr, uattr, user_ctx,</div><div class='add'>+				     sizeof(struct bpf_flow_keys));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(user_ctx);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int bpf_prog_test_run_sk_lookup(struct bpf_prog *prog, const union bpf_attr *kattr,</div><div class='add'>+				union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_test_timer t = {};</div><div class='add'>+	struct bpf_prog_array *progs = NULL;</div><div class='add'>+	struct bpf_sk_lookup_kern ctx = {};</div><div class='add'>+	u32 repeat = kattr-&gt;test.repeat;</div><div class='add'>+	struct bpf_sk_lookup *user_ctx;</div><div class='add'>+	u32 retval, duration;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.flags || kattr-&gt;test.cpu || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.data_in || kattr-&gt;test.data_size_in || kattr-&gt;test.data_out ||</div><div class='add'>+	    kattr-&gt;test.data_size_out)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!repeat)</div><div class='add'>+		repeat = 1;</div><div class='add'>+</div><div class='add'>+	user_ctx = bpf_ctx_init(kattr, sizeof(*user_ctx));</div><div class='add'>+	if (IS_ERR(user_ctx))</div><div class='add'>+		return PTR_ERR(user_ctx);</div><div class='add'>+</div><div class='add'>+	if (!user_ctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (user_ctx-&gt;sk)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!range_is_zero(user_ctx, offsetofend(typeof(*user_ctx), local_port), sizeof(*user_ctx)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (user_ctx-&gt;local_port &gt; U16_MAX) {</div><div class='add'>+		ret = -ERANGE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx.family = (u16)user_ctx-&gt;family;</div><div class='add'>+	ctx.protocol = (u16)user_ctx-&gt;protocol;</div><div class='add'>+	ctx.dport = (u16)user_ctx-&gt;local_port;</div><div class='add'>+	ctx.sport = user_ctx-&gt;remote_port;</div><div class='add'>+</div><div class='add'>+	switch (ctx.family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		ctx.v4.daddr = (__force __be32)user_ctx-&gt;local_ip4;</div><div class='add'>+		ctx.v4.saddr = (__force __be32)user_ctx-&gt;remote_ip4;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		ctx.v6.daddr = (struct in6_addr *)user_ctx-&gt;local_ip6;</div><div class='add'>+		ctx.v6.saddr = (struct in6_addr *)user_ctx-&gt;remote_ip6;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EAFNOSUPPORT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	progs = bpf_prog_array_alloc(1, GFP_KERNEL);</div><div class='add'>+	if (!progs) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	progs-&gt;items[0].prog = prog;</div><div class='add'>+</div><div class='add'>+	bpf_test_timer_enter(&amp;t);</div><div class='add'>+	do {</div><div class='add'>+		ctx.selected_sk = NULL;</div><div class='add'>+		retval = BPF_PROG_SK_LOOKUP_RUN_ARRAY(progs, ctx, bpf_prog_run);</div><div class='add'>+	} while (bpf_test_timer_continue(&amp;t, 1, repeat, &amp;ret, &amp;duration));</div><div class='add'>+	bpf_test_timer_leave(&amp;t);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	user_ctx-&gt;cookie = 0;</div><div class='add'>+	if (ctx.selected_sk) {</div><div class='add'>+		if (ctx.selected_sk-&gt;sk_reuseport &amp;&amp; !ctx.no_reuseport) {</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		user_ctx-&gt;cookie = sock_gen_cookie(ctx.selected_sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = bpf_test_finish(kattr, uattr, NULL, NULL, 0, 0, retval, duration);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = bpf_ctx_finish(kattr, uattr, user_ctx, sizeof(*user_ctx));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bpf_prog_array_free(progs);</div><div class='add'>+	kfree(user_ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_prog_test_run_syscall(struct bpf_prog *prog,</div><div class='add'>+			      const union bpf_attr *kattr,</div><div class='add'>+			      union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	void __user *ctx_in = u64_to_user_ptr(kattr-&gt;test.ctx_in);</div><div class='add'>+	__u32 ctx_size_in = kattr-&gt;test.ctx_size_in;</div><div class='add'>+	void *ctx = NULL;</div><div class='add'>+	u32 retval;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* doesn't support data_in/out, ctx_out, duration, or repeat or flags */</div><div class='add'>+	if (kattr-&gt;test.data_in || kattr-&gt;test.data_out ||</div><div class='add'>+	    kattr-&gt;test.ctx_out || kattr-&gt;test.duration ||</div><div class='add'>+	    kattr-&gt;test.repeat || kattr-&gt;test.flags ||</div><div class='add'>+	    kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ctx_size_in &lt; prog-&gt;aux-&gt;max_ctx_offset ||</div><div class='add'>+	    ctx_size_in &gt; U16_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ctx_size_in) {</div><div class='add'>+		ctx = memdup_user(ctx_in, ctx_size_in);</div><div class='add'>+		if (IS_ERR(ctx))</div><div class='add'>+			return PTR_ERR(ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_trace();</div><div class='add'>+	retval = bpf_prog_run_pin_on_cpu(prog, ctx);</div><div class='add'>+	rcu_read_unlock_trace();</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(&amp;uattr-&gt;test.retval, &amp;retval, sizeof(u32))) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (ctx_size_in)</div><div class='add'>+		if (copy_to_user(ctx_in, ctx, ctx_size_in))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+out:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int verify_and_copy_hook_state(struct nf_hook_state *state,</div><div class='add'>+				      const struct nf_hook_state *user,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (user-&gt;in || user-&gt;out)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (user-&gt;net || user-&gt;sk || user-&gt;okfn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (user-&gt;pf) {</div><div class='add'>+	case NFPROTO_IPV4:</div><div class='add'>+	case NFPROTO_IPV6:</div><div class='add'>+		switch (state-&gt;hook) {</div><div class='add'>+		case NF_INET_PRE_ROUTING:</div><div class='add'>+			state-&gt;in = dev;</div><div class='add'>+			break;</div><div class='add'>+		case NF_INET_LOCAL_IN:</div><div class='add'>+			state-&gt;in = dev;</div><div class='add'>+			break;</div><div class='add'>+		case NF_INET_FORWARD:</div><div class='add'>+			state-&gt;in = dev;</div><div class='add'>+			state-&gt;out = dev;</div><div class='add'>+			break;</div><div class='add'>+		case NF_INET_LOCAL_OUT:</div><div class='add'>+			state-&gt;out = dev;</div><div class='add'>+			break;</div><div class='add'>+		case NF_INET_POST_ROUTING:</div><div class='add'>+			state-&gt;out = dev;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;pf = user-&gt;pf;</div><div class='add'>+	state-&gt;hook = user-&gt;hook;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be16 nfproto_eth(int nfproto)</div><div class='add'>+{</div><div class='add'>+	switch (nfproto) {</div><div class='add'>+	case NFPROTO_IPV4:</div><div class='add'>+		return htons(ETH_P_IP);</div><div class='add'>+	case NFPROTO_IPV6:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return htons(ETH_P_IPV6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_prog_test_run_nf(struct bpf_prog *prog,</div><div class='add'>+			 const union bpf_attr *kattr,</div><div class='add'>+			 union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	struct net *net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	struct net_device *dev = net-&gt;loopback_dev;</div><div class='add'>+	struct nf_hook_state *user_ctx, hook_state = {</div><div class='add'>+		.pf = NFPROTO_IPV4,</div><div class='add'>+		.hook = NF_INET_LOCAL_OUT,</div><div class='add'>+	};</div><div class='add'>+	u32 size = kattr-&gt;test.data_size_in;</div><div class='add'>+	u32 repeat = kattr-&gt;test.repeat;</div><div class='add'>+	struct bpf_nf_ctx ctx = {</div><div class='add'>+		.state = &amp;hook_state,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	u32 retval, duration;</div><div class='add'>+	void *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (kattr-&gt;test.flags || kattr-&gt;test.cpu || kattr-&gt;test.batch_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size &lt; sizeof(struct iphdr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data = bpf_test_init(kattr, kattr-&gt;test.data_size_in, size,</div><div class='add'>+			     NET_SKB_PAD + NET_IP_ALIGN,</div><div class='add'>+			     SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='add'>+</div><div class='add'>+	if (!repeat)</div><div class='add'>+		repeat = 1;</div><div class='add'>+</div><div class='add'>+	user_ctx = bpf_ctx_init(kattr, sizeof(struct nf_hook_state));</div><div class='add'>+	if (IS_ERR(user_ctx)) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		return PTR_ERR(user_ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (user_ctx) {</div><div class='add'>+		ret = verify_and_copy_hook_state(&amp;hook_state, user_ctx, dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = slab_build_skb(data);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = NULL; /* data released via kfree_skb */</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);</div><div class='add'>+	__skb_put(skb, size);</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (hook_state.hook != NF_INET_LOCAL_OUT) {</div><div class='add'>+		if (size &lt; ETH_HLEN + sizeof(struct iphdr))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='add'>+		switch (skb-&gt;protocol) {</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='add'>+			if (hook_state.pf == NFPROTO_IPV4)</div><div class='add'>+				break;</div><div class='add'>+			goto out;</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			if (size &lt; ETH_HLEN + sizeof(struct ipv6hdr))</div><div class='add'>+				goto out;</div><div class='add'>+			if (hook_state.pf == NFPROTO_IPV6)</div><div class='add'>+				break;</div><div class='add'>+			goto out;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb-&gt;protocol = nfproto_eth(hook_state.pf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx.skb = skb;</div><div class='add'>+</div><div class='add'>+	ret = bpf_test_run(prog, &amp;ctx, repeat, &amp;retval, &amp;duration, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = bpf_test_finish(kattr, uattr, NULL, NULL, 0, 0, retval, duration);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(user_ctx);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_prog_test_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;test_sk_check_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST(bpf_prog_test_dtor_kfunc_ids)</div><div class='add'>+BTF_ID(struct, prog_test_ref_kfunc)</div><div class='add'>+BTF_ID(func, bpf_kfunc_call_test_release_dtor)</div><div class='add'>+BTF_ID(struct, prog_test_member)</div><div class='add'>+BTF_ID(func, bpf_kfunc_call_memb_release_dtor)</div><div class='add'>+</div><div class='add'>+static int __init bpf_prog_test_run_init(void)</div><div class='add'>+{</div><div class='add'>+	const struct btf_id_dtor_kfunc bpf_prog_test_dtor_kfunc[] = {</div><div class='add'>+		{</div><div class='add'>+		  .btf_id       = bpf_prog_test_dtor_kfunc_ids[0],</div><div class='add'>+		  .kfunc_btf_id = bpf_prog_test_dtor_kfunc_ids[1]</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+		  .btf_id	= bpf_prog_test_dtor_kfunc_ids[2],</div><div class='add'>+		  .kfunc_btf_id = bpf_prog_test_dtor_kfunc_ids[3],</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_btf_fmodret_id_set(&amp;bpf_test_modify_return_set);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &amp;bpf_prog_test_kfunc_set);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &amp;bpf_prog_test_kfunc_set);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL, &amp;bpf_prog_test_kfunc_set);</div><div class='add'>+	return ret ?: register_btf_id_dtor_kfuncs(bpf_prog_test_dtor_kfunc,</div><div class='add'>+						  ARRAY_SIZE(bpf_prog_test_dtor_kfunc),</div><div class='add'>+						  THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_prog_test_run_init);</div><div class='head'>diff --git a/net/bpfilter/.gitignore b/net/bpfilter/.gitignore<br/>deleted file mode 100644<br/>index e97084e3eea2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/.gitignore?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/.gitignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-bpfilter_umh</div><div class='head'>diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig<br/>deleted file mode 100644<br/>index e558b46596c4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-menuconfig BPFILTER</div><div class='del'>-	bool "BPF based packet filtering framework (BPFILTER)"</div><div class='del'>-	depends on NET &amp;&amp; BPF &amp;&amp; INET</div><div class='del'>-	help</div><div class='del'>-	  This builds experimental bpfilter framework that is aiming to</div><div class='del'>-	  provide netfilter compatible functionality via BPF</div><div class='del'>-</div><div class='del'>-if BPFILTER</div><div class='del'>-config BPFILTER_UMH</div><div class='del'>-	tristate "bpfilter kernel module with user mode helper"</div><div class='del'>-	depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))</div><div class='del'>-	default m</div><div class='del'>-	help</div><div class='del'>-	  This builds bpfilter kernel module with embedded user mode helper</div><div class='del'>-endif</div><div class='head'>diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile<br/>deleted file mode 100644<br/>index 0947ee7f70d5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# Makefile for the Linux BPFILTER layer.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-hostprogs-y := bpfilter_umh</div><div class='del'>-bpfilter_umh-objs := main.o</div><div class='del'>-KBUILD_HOSTCFLAGS += -I. -Itools/include/ -Itools/include/uapi</div><div class='del'>-HOSTCC := $(CC)</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_BPFILTER_UMH), y)</div><div class='del'>-# builtin bpfilter_umh should be compiled with -static</div><div class='del'>-# since rootfs isn't mounted at the time of __init</div><div class='del'>-# function is called and do_execv won't find elf interpreter</div><div class='del'>-KBUILD_HOSTLDFLAGS += -static</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_BPFILTER_UMH) += bpfilter.o</div><div class='del'>-bpfilter-objs += bpfilter_kern.o bpfilter_umh_blob.o</div><div class='head'>diff --git a/net/bpfilter/bpfilter_kern.c b/net/bpfilter/bpfilter_kern.c<br/>deleted file mode 100644<br/>index b64e1649993b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/bpfilter_kern.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/bpfilter_kern.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,117 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/umh.h&gt;</div><div class='del'>-#include &lt;linux/bpfilter.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/file.h&gt;</div><div class='del'>-#include "msgfmt.h"</div><div class='del'>-</div><div class='del'>-extern char bpfilter_umh_start;</div><div class='del'>-extern char bpfilter_umh_end;</div><div class='del'>-</div><div class='del'>-static struct umh_info info;</div><div class='del'>-/* since ip_getsockopt() can run in parallel, serialize access to umh */</div><div class='del'>-static DEFINE_MUTEX(bpfilter_lock);</div><div class='del'>-</div><div class='del'>-static void shutdown_umh(struct umh_info *info)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *tsk;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;pid)</div><div class='del'>-		return;</div><div class='del'>-	tsk = pid_task(find_vpid(info-&gt;pid), PIDTYPE_PID);</div><div class='del'>-	if (tsk)</div><div class='del'>-		force_sig(SIGKILL, tsk);</div><div class='del'>-	fput(info-&gt;pipe_to_umh);</div><div class='del'>-	fput(info-&gt;pipe_from_umh);</div><div class='del'>-	info-&gt;pid = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __stop_umh(void)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_INET)) {</div><div class='del'>-		bpfilter_process_sockopt = NULL;</div><div class='del'>-		shutdown_umh(&amp;info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stop_umh(void)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;bpfilter_lock);</div><div class='del'>-	__stop_umh();</div><div class='del'>-	mutex_unlock(&amp;bpfilter_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bpfilter_process_sockopt(struct sock *sk, int optname,</div><div class='del'>-				      char __user *optval,</div><div class='del'>-				      unsigned int optlen, bool is_set)</div><div class='del'>-{</div><div class='del'>-	struct mbox_request req;</div><div class='del'>-	struct mbox_reply reply;</div><div class='del'>-	loff_t pos;</div><div class='del'>-	ssize_t n;</div><div class='del'>-	int ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-	req.is_set = is_set;</div><div class='del'>-	req.pid = current-&gt;pid;</div><div class='del'>-	req.cmd = optname;</div><div class='del'>-	req.addr = (long __force __user)optval;</div><div class='del'>-	req.len = optlen;</div><div class='del'>-	mutex_lock(&amp;bpfilter_lock);</div><div class='del'>-	if (!info.pid)</div><div class='del'>-		goto out;</div><div class='del'>-	n = __kernel_write(info.pipe_to_umh, &amp;req, sizeof(req), &amp;pos);</div><div class='del'>-	if (n != sizeof(req)) {</div><div class='del'>-		pr_err("write fail %zd\n", n);</div><div class='del'>-		__stop_umh();</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	pos = 0;</div><div class='del'>-	n = kernel_read(info.pipe_from_umh, &amp;reply, sizeof(reply), &amp;pos);</div><div class='del'>-	if (n != sizeof(reply)) {</div><div class='del'>-		pr_err("read fail %zd\n", n);</div><div class='del'>-		__stop_umh();</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ret = reply.status;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;bpfilter_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init load_umh(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* fork usermode process */</div><div class='del'>-	err = fork_usermode_blob(&amp;bpfilter_umh_start,</div><div class='del'>-				 &amp;bpfilter_umh_end - &amp;bpfilter_umh_start,</div><div class='del'>-				 &amp;info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	pr_info("Loaded bpfilter_umh pid %d\n", info.pid);</div><div class='del'>-</div><div class='del'>-	/* health check that usermode process started correctly */</div><div class='del'>-	if (__bpfilter_process_sockopt(NULL, 0, NULL, 0, 0) != 0) {</div><div class='del'>-		stop_umh();</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	if (IS_ENABLED(CONFIG_INET))</div><div class='del'>-		bpfilter_process_sockopt = &amp;__bpfilter_process_sockopt;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fini_umh(void)</div><div class='del'>-{</div><div class='del'>-	stop_umh();</div><div class='del'>-}</div><div class='del'>-module_init(load_umh);</div><div class='del'>-module_exit(fini_umh);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/bpfilter/bpfilter_umh_blob.S b/net/bpfilter/bpfilter_umh_blob.S<br/>deleted file mode 100644<br/>index 40311d10d2f2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/bpfilter_umh_blob.S?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/bpfilter_umh_blob.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-	.section .init.rodata, "a"</div><div class='del'>-	.global bpfilter_umh_start</div><div class='del'>-bpfilter_umh_start:</div><div class='del'>-	.incbin "net/bpfilter/bpfilter_umh"</div><div class='del'>-	.global bpfilter_umh_end</div><div class='del'>-bpfilter_umh_end:</div><div class='head'>diff --git a/net/bpfilter/main.c b/net/bpfilter/main.c<br/>deleted file mode 100644<br/>index 1317f108df8a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/main.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#define _GNU_SOURCE</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include "include/uapi/linux/bpf.h"</div><div class='del'>-#include &lt;asm/unistd.h&gt;</div><div class='del'>-#include "msgfmt.h"</div><div class='del'>-</div><div class='del'>-int debug_fd;</div><div class='del'>-</div><div class='del'>-static int handle_get_cmd(struct mbox_request *cmd)</div><div class='del'>-{</div><div class='del'>-	switch (cmd-&gt;cmd) {</div><div class='del'>-	case 0:</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return -ENOPROTOOPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int handle_set_cmd(struct mbox_request *cmd)</div><div class='del'>-{</div><div class='del'>-	return -ENOPROTOOPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void loop(void)</div><div class='del'>-{</div><div class='del'>-	while (1) {</div><div class='del'>-		struct mbox_request req;</div><div class='del'>-		struct mbox_reply reply;</div><div class='del'>-		int n;</div><div class='del'>-</div><div class='del'>-		n = read(0, &amp;req, sizeof(req));</div><div class='del'>-		if (n != sizeof(req)) {</div><div class='del'>-			dprintf(debug_fd, "invalid request %d\n", n);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reply.status = req.is_set ?</div><div class='del'>-			handle_set_cmd(&amp;req) :</div><div class='del'>-			handle_get_cmd(&amp;req);</div><div class='del'>-</div><div class='del'>-		n = write(1, &amp;reply, sizeof(reply));</div><div class='del'>-		if (n != sizeof(reply)) {</div><div class='del'>-			dprintf(debug_fd, "reply failed %d\n", n);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(void)</div><div class='del'>-{</div><div class='del'>-	debug_fd = open("/dev/console", 00000002);</div><div class='del'>-	dprintf(debug_fd, "Started bpfilter\n");</div><div class='del'>-	loop();</div><div class='del'>-	close(debug_fd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/net/bpfilter/msgfmt.h b/net/bpfilter/msgfmt.h<br/>deleted file mode 100644<br/>index 98d121c62945..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bpfilter/msgfmt.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bpfilter/msgfmt.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _NET_BPFILTER_MSGFMT_H</div><div class='del'>-#define _NET_BPFILTER_MSGFMT_H</div><div class='del'>-</div><div class='del'>-struct mbox_request {</div><div class='del'>-	__u64 addr;</div><div class='del'>-	__u32 len;</div><div class='del'>-	__u32 is_set;</div><div class='del'>-	__u32 cmd;</div><div class='del'>-	__u32 pid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mbox_reply {</div><div class='del'>-	__u32 status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/bridge/Kconfig b/net/bridge/Kconfig<br/>index aa0d3b2f1bb7..3c8ded7d3e84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # 802.1d Ethernet Bridging</div><div class='ctx'> #</div><div class='hunk'>@@ -7,7 +8,7 @@ config BRIDGE</div><div class='ctx'> 	select LLC</div><div class='ctx'> 	select STP</div><div class='ctx'> 	depends on IPV6 || IPV6=n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you say Y here, then your Linux box will be able to act as an</div><div class='ctx'> 	  Ethernet bridge, which means that the different Ethernet segments it</div><div class='ctx'> 	  is connected to will appear as one Ethernet to the participants.</div><div class='hunk'>@@ -17,7 +18,7 @@ config BRIDGE</div><div class='ctx'> 	  other third party bridge products.</div><div class='ctx'> </div><div class='ctx'> 	  In order to use the Ethernet bridge, you'll need the bridge</div><div class='del'>-	  configuration tools; see &lt;file:Documentation/networking/bridge.txt&gt;</div><div class='add'>+	  configuration tools; see &lt;file:Documentation/networking/bridge.rst&gt;</div><div class='ctx'> 	  for location. Please read the Bridge mini-HOWTO for more</div><div class='ctx'> 	  information.</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +39,7 @@ config BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 	depends on BRIDGE</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you say Y here, then the Ethernet bridge will be able selectively</div><div class='ctx'> 	  forward multicast traffic based on IGMP/MLD traffic received from</div><div class='ctx'> 	  each port.</div><div class='hunk'>@@ -52,7 +53,7 @@ config BRIDGE_VLAN_FILTERING</div><div class='ctx'> 	depends on BRIDGE</div><div class='ctx'> 	depends on VLAN_8021Q</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you say Y here, then the Ethernet bridge will be able selectively</div><div class='ctx'> 	  receive and forward traffic based on VLAN information in the packet</div><div class='ctx'> 	  any VLAN information configured on the bridge port or bridge device.</div><div class='hunk'>@@ -60,3 +61,26 @@ config BRIDGE_VLAN_FILTERING</div><div class='ctx'> 	  Say N to exclude this support and reduce the binary size.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config BRIDGE_MRP</div><div class='add'>+	bool "MRP protocol"</div><div class='add'>+	depends on BRIDGE</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here, then the Ethernet bridge will be able to run MRP</div><div class='add'>+	  protocol to detect loops</div><div class='add'>+</div><div class='add'>+	  Say N to exclude this support and reduce the binary size.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config BRIDGE_CFM</div><div class='add'>+	bool "CFM protocol"</div><div class='add'>+	depends on BRIDGE</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here, then the Ethernet bridge will be able to run CFM</div><div class='add'>+	  protocol according to 802.1Q section 12.14</div><div class='add'>+</div><div class='add'>+	  Say N to exclude this support and reduce the binary size.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='head'>diff --git a/net/bridge/Makefile b/net/bridge/Makefile<br/>index ac9ef337f0fa..24bd1c0a9a5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/Makefile</a></div><div class='hunk'>@@ -18,10 +18,14 @@ br_netfilter-y := br_netfilter_hooks.o</div><div class='ctx'> br_netfilter-$(subst m,y,$(CONFIG_IPV6)) += br_netfilter_ipv6.o</div><div class='ctx'> obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o</div><div class='ctx'> </div><div class='del'>-bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o</div><div class='add'>+bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o br_multicast_eht.o</div><div class='ctx'> </div><div class='del'>-bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o br_vlan_tunnel.o</div><div class='add'>+bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o br_vlan_tunnel.o br_vlan_options.o br_mst.o</div><div class='ctx'> </div><div class='ctx'> bridge-$(CONFIG_NET_SWITCHDEV) += br_switchdev.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NETFILTER) += netfilter/</div><div class='add'>+</div><div class='add'>+bridge-$(CONFIG_BRIDGE_MRP)	+= br_mrp_switchdev.o br_mrp.o br_mrp_netlink.o</div><div class='add'>+</div><div class='add'>+bridge-$(CONFIG_BRIDGE_CFM)	+= br_cfm.o br_cfm_netlink.o</div><div class='head'>diff --git a/net/bridge/br.c b/net/bridge/br.c<br/>index b0a0b82e2d91..c37e52e2f29a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Generic parts</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -31,6 +27,8 @@</div><div class='ctx'>  */</div><div class='ctx'> static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct netlink_ext_ack *extack = netdev_notifier_info_to_extack(ptr);</div><div class='add'>+	struct netdev_notifier_pre_changeaddr_info *prechaddr_info;</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='hunk'>@@ -38,10 +36,31 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v</div><div class='ctx'> 	bool changed_addr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* register of bridge completed, add sysfs entries */</div><div class='del'>-	if ((dev-&gt;priv_flags &amp; IFF_EBRIDGE) &amp;&amp; event == NETDEV_REGISTER) {</div><div class='del'>-		br_sysfs_addbr(dev);</div><div class='del'>-		return NOTIFY_DONE;</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='add'>+		struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+		if (event == NETDEV_REGISTER)</div><div class='add'>+			br_fdb_change_mac_address(br, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+		err = br_vlan_bridge_event(dev, event, ptr);</div><div class='add'>+		if (err)</div><div class='add'>+			return notifier_from_errno(err);</div><div class='add'>+</div><div class='add'>+		if (event == NETDEV_REGISTER) {</div><div class='add'>+			/* register of bridge completed, add sysfs entries */</div><div class='add'>+			err = br_sysfs_addbr(dev);</div><div class='add'>+			if (err)</div><div class='add'>+				return notifier_from_errno(err);</div><div class='add'>+</div><div class='add'>+			return NOTIFY_DONE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_vlan_dev(dev)) {</div><div class='add'>+		struct net_device *real_dev = vlan_dev_real_dev(dev);</div><div class='add'>+</div><div class='add'>+		if (netif_is_bridge_master(real_dev))</div><div class='add'>+			br_vlan_vlan_upper_event(real_dev, dev, event);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* not a port of a bridge */</div><div class='hunk'>@@ -56,6 +75,17 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v</div><div class='ctx'> 		br_mtu_auto_adjust(br);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case NETDEV_PRE_CHANGEADDR:</div><div class='add'>+		if (br-&gt;dev-&gt;addr_assign_type == NET_ADDR_SET)</div><div class='add'>+			break;</div><div class='add'>+		prechaddr_info = ptr;</div><div class='add'>+		err = netif_pre_changeaddr_notify(br-&gt;dev,</div><div class='add'>+						  prechaddr_info-&gt;dev_addr,</div><div class='add'>+						  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return notifier_from_errno(err);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='ctx'> 		spin_lock_bh(&amp;br-&gt;lock);</div><div class='ctx'> 		br_fdb_changeaddr(p, dev-&gt;dev_addr);</div><div class='hunk'>@@ -104,7 +134,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NETDEV_PRE_TYPE_CHANGE:</div><div class='del'>-		/* Forbid underlaying device to change its type. */</div><div class='add'>+		/* Forbid underlying device to change its type. */</div><div class='ctx'> 		return NOTIFY_BAD;</div><div class='ctx'> </div><div class='ctx'> 	case NETDEV_RESEND_IGMP:</div><div class='hunk'>@@ -113,6 +143,9 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (event != NETDEV_UNREGISTER)</div><div class='add'>+		br_vlan_port_event(p, event);</div><div class='add'>+</div><div class='ctx'> 	/* Events that may cause spanning tree to refresh */</div><div class='ctx'> 	if (!notified &amp;&amp; (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||</div><div class='ctx'> 			  event == NETDEV_CHANGE || event == NETDEV_DOWN))</div><div class='hunk'>@@ -145,13 +178,14 @@ static int br_switchdev_event(struct notifier_block *unused,</div><div class='ctx'> 	case SWITCHDEV_FDB_ADD_TO_BRIDGE:</div><div class='ctx'> 		fdb_info = ptr;</div><div class='ctx'> 		err = br_fdb_external_learn_add(br, p, fdb_info-&gt;addr,</div><div class='del'>-						fdb_info-&gt;vid, false);</div><div class='add'>+						fdb_info-&gt;vid,</div><div class='add'>+						fdb_info-&gt;locked, false);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			err = notifier_from_errno(err);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		br_fdb_offloaded_set(br, p, fdb_info-&gt;addr,</div><div class='del'>-				     fdb_info-&gt;vid);</div><div class='add'>+				     fdb_info-&gt;vid, fdb_info-&gt;offloaded);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SWITCHDEV_FDB_DEL_TO_BRIDGE:</div><div class='ctx'> 		fdb_info = ptr;</div><div class='hunk'>@@ -163,7 +197,12 @@ static int br_switchdev_event(struct notifier_block *unused,</div><div class='ctx'> 	case SWITCHDEV_FDB_OFFLOADED:</div><div class='ctx'> 		fdb_info = ptr;</div><div class='ctx'> 		br_fdb_offloaded_set(br, p, fdb_info-&gt;addr,</div><div class='del'>-				     fdb_info-&gt;vid);</div><div class='add'>+				     fdb_info-&gt;vid, fdb_info-&gt;offloaded);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_FDB_FLUSH_TO_BRIDGE:</div><div class='add'>+		fdb_info = ptr;</div><div class='add'>+		/* Don't delete static entries */</div><div class='add'>+		br_fdb_delete_by_port(br, p, fdb_info-&gt;vid, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -175,23 +214,208 @@ static struct notifier_block br_switchdev_notifier = {</div><div class='ctx'> 	.notifier_call = br_switchdev_event,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __net_exit br_net_exit(struct net *net)</div><div class='add'>+/* called under rtnl_mutex */</div><div class='add'>+static int br_switchdev_blocking_event(struct notifier_block *nb,</div><div class='add'>+				       unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	LIST_HEAD(list);</div><div class='add'>+	struct netlink_ext_ack *extack = netdev_notifier_info_to_extack(ptr);</div><div class='add'>+	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct switchdev_notifier_brport_info *brport_info;</div><div class='add'>+	const struct switchdev_brport *b;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	for_each_netdev(net, dev)</div><div class='del'>-		if (dev-&gt;priv_flags &amp; IFF_EBRIDGE)</div><div class='del'>-			br_dev_delete(dev, &amp;list);</div><div class='add'>+	p = br_port_get_rtnl(dev);</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_BRPORT_OFFLOADED:</div><div class='add'>+		brport_info = ptr;</div><div class='add'>+		b = &amp;brport_info-&gt;brport;</div><div class='add'>+</div><div class='add'>+		err = br_switchdev_port_offload(p, b-&gt;dev, b-&gt;ctx,</div><div class='add'>+						b-&gt;atomic_nb, b-&gt;blocking_nb,</div><div class='add'>+						b-&gt;tx_fwd_offload, extack);</div><div class='add'>+		err = notifier_from_errno(err);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_BRPORT_UNOFFLOADED:</div><div class='add'>+		brport_info = ptr;</div><div class='add'>+		b = &amp;brport_info-&gt;brport;</div><div class='add'>+</div><div class='add'>+		br_switchdev_port_unoffload(p, b-&gt;ctx, b-&gt;atomic_nb,</div><div class='add'>+					    b-&gt;blocking_nb);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_BRPORT_REPLAY:</div><div class='add'>+		brport_info = ptr;</div><div class='add'>+		b = &amp;brport_info-&gt;brport;</div><div class='ctx'> </div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+		err = br_switchdev_port_replay(p, b-&gt;dev, b-&gt;ctx, b-&gt;atomic_nb,</div><div class='add'>+					       b-&gt;blocking_nb, extack);</div><div class='add'>+		err = notifier_from_errno(err);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block br_switchdev_blocking_notifier = {</div><div class='add'>+	.notifier_call = br_switchdev_blocking_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_toggle_fdb_local_vlan_0(struct net_bridge *br, bool on,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0) == on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = br_fdb_toggle_local_vlan_0(br, on, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	br_opt_toggle(br, BROPT_FDB_LOCAL_VLAN_0, on);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* br_boolopt_toggle - change user-controlled boolean option</div><div class='add'>+ *</div><div class='add'>+ * @br: bridge device</div><div class='add'>+ * @opt: id of the option to change</div><div class='add'>+ * @on: new option value</div><div class='add'>+ * @extack: extack for error messages</div><div class='add'>+ *</div><div class='add'>+ * Changes the value of the respective boolean option to @on taking care of</div><div class='add'>+ * any internal option value mapping and configuration.</div><div class='add'>+ */</div><div class='add'>+int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case BR_BOOLOPT_NO_LL_LEARN:</div><div class='add'>+		br_opt_toggle(br, BROPT_NO_LL_LEARN, on);</div><div class='add'>+		break;</div><div class='add'>+	case BR_BOOLOPT_MCAST_VLAN_SNOOPING:</div><div class='add'>+		err = br_multicast_toggle_vlan_snooping(br, on, extack);</div><div class='add'>+		break;</div><div class='add'>+	case BR_BOOLOPT_MST_ENABLE:</div><div class='add'>+		err = br_mst_set_enabled(br, on, extack);</div><div class='add'>+		break;</div><div class='add'>+	case BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION:</div><div class='add'>+		br_opt_toggle(br, BROPT_MDB_OFFLOAD_FAIL_NOTIFICATION, on);</div><div class='add'>+		break;</div><div class='add'>+	case BR_BOOLOPT_FDB_LOCAL_VLAN_0:</div><div class='add'>+		err = br_toggle_fdb_local_vlan_0(br, on, extack);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* shouldn't be called with unsupported options */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_boolopt_get(const struct net_bridge *br, enum br_boolopt_id opt)</div><div class='add'>+{</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case BR_BOOLOPT_NO_LL_LEARN:</div><div class='add'>+		return br_opt_get(br, BROPT_NO_LL_LEARN);</div><div class='add'>+	case BR_BOOLOPT_MCAST_VLAN_SNOOPING:</div><div class='add'>+		return br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED);</div><div class='add'>+	case BR_BOOLOPT_MST_ENABLE:</div><div class='add'>+		return br_opt_get(br, BROPT_MST_ENABLED);</div><div class='add'>+	case BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION:</div><div class='add'>+		return br_opt_get(br, BROPT_MDB_OFFLOAD_FAIL_NOTIFICATION);</div><div class='add'>+	case BR_BOOLOPT_FDB_LOCAL_VLAN_0:</div><div class='add'>+		return br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0);</div><div class='add'>+	default:</div><div class='add'>+		/* shouldn't be called with unsupported options */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_boolopt_multi_toggle(struct net_bridge *br,</div><div class='add'>+			    struct br_boolopt_multi *bm,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned long bitmap = bm-&gt;optmask;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int opt_id;</div><div class='add'>+</div><div class='add'>+	opt_id = find_next_bit(&amp;bitmap, BITS_PER_LONG, BR_BOOLOPT_MAX);</div><div class='add'>+	if (opt_id != BITS_PER_LONG) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "Unknown boolean option %d",</div><div class='add'>+				       opt_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(opt_id, &amp;bitmap, BR_BOOLOPT_MAX) {</div><div class='add'>+		bool on = !!(bm-&gt;optval &amp; BIT(opt_id));</div><div class='add'>+</div><div class='add'>+		err = br_boolopt_toggle(br, opt_id, on, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			br_debug(br, "boolopt multi-toggle error: option: %d current: %d new: %d error: %d\n",</div><div class='add'>+				 opt_id, br_boolopt_get(br, opt_id), on, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_boolopt_multi_get(const struct net_bridge *br,</div><div class='add'>+			  struct br_boolopt_multi *bm)</div><div class='add'>+{</div><div class='add'>+	u32 optval = 0;</div><div class='add'>+	int opt_id;</div><div class='add'>+</div><div class='add'>+	for (opt_id = 0; opt_id &lt; BR_BOOLOPT_MAX; opt_id++)</div><div class='add'>+		optval |= (br_boolopt_get(br, opt_id) &lt;&lt; opt_id);</div><div class='add'>+</div><div class='add'>+	bm-&gt;optval = optval;</div><div class='add'>+	bm-&gt;optmask = GENMASK((BR_BOOLOPT_MAX - 1), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* private bridge options, controlled by the kernel */</div><div class='add'>+void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on)</div><div class='add'>+{</div><div class='add'>+	bool cur = !!br_opt_get(br, opt);</div><div class='add'>+</div><div class='add'>+	br_debug(br, "toggle option: %d state: %d -&gt; %d\n",</div><div class='add'>+		 opt, cur, on);</div><div class='add'>+</div><div class='add'>+	if (cur == on)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		set_bit(opt, &amp;br-&gt;options);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(opt, &amp;br-&gt;options);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit br_net_exit_rtnl(struct net *net,</div><div class='add'>+					struct list_head *dev_to_kill)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='add'>+</div><div class='add'>+	for_each_netdev(net, dev)</div><div class='add'>+		if (netif_is_bridge_master(dev))</div><div class='add'>+			br_dev_delete(dev, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations br_net_ops = {</div><div class='del'>-	.exit	= br_net_exit,</div><div class='add'>+	.exit_rtnl = br_net_exit_rtnl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct stp_proto br_stp_proto = {</div><div class='hunk'>@@ -202,7 +426,7 @@ static int __init br_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(sizeof(struct br_input_skb_cb) &gt; FIELD_SIZEOF(struct sk_buff, cb));</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct br_input_skb_cb) &gt; sizeof_field(struct sk_buff, cb));</div><div class='ctx'> </div><div class='ctx'> 	err = stp_proto_register(&amp;br_stp_proto);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -230,11 +454,15 @@ static int __init br_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out4;</div><div class='ctx'> </div><div class='del'>-	err = br_netlink_init();</div><div class='add'>+	err = register_switchdev_blocking_notifier(&amp;br_switchdev_blocking_notifier);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out5;</div><div class='ctx'> </div><div class='del'>-	brioctl_set(br_ioctl_deviceless_stub);</div><div class='add'>+	err = br_netlink_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out6;</div><div class='add'>+</div><div class='add'>+	brioctl_set(br_ioctl_stub);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_ATM_LANE)</div><div class='ctx'> 	br_fdb_test_addr_hook = br_fdb_test_addr;</div><div class='hunk'>@@ -248,6 +476,8 @@ static int __init br_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_out6:</div><div class='add'>+	unregister_switchdev_blocking_notifier(&amp;br_switchdev_blocking_notifier);</div><div class='ctx'> err_out5:</div><div class='ctx'> 	unregister_switchdev_notifier(&amp;br_switchdev_notifier);</div><div class='ctx'> err_out4:</div><div class='hunk'>@@ -267,6 +497,7 @@ static void __exit br_deinit(void)</div><div class='ctx'> {</div><div class='ctx'> 	stp_proto_unregister(&amp;br_stp_proto);</div><div class='ctx'> 	br_netlink_fini();</div><div class='add'>+	unregister_switchdev_blocking_notifier(&amp;br_switchdev_blocking_notifier);</div><div class='ctx'> 	unregister_switchdev_notifier(&amp;br_switchdev_notifier);</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;br_device_notifier);</div><div class='ctx'> 	brioctl_set(NULL);</div><div class='hunk'>@@ -286,3 +517,5 @@ module_exit(br_deinit)</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(BR_VERSION);</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("bridge");</div><div class='add'>+MODULE_DESCRIPTION("Ethernet bridge driver");</div><div class='add'>+MODULE_IMPORT_NS("NETDEV_INTERNAL");</div><div class='head'>diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c<br/>index 2cf7716254be..1e2b51769eec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_arp_nd_proxy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_arp_nd_proxy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_arp_nd_proxy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_arp_nd_proxy.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Handle bridge arp/nd proxy/suppress</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Authors:</div><div class='ctx'>  *	Roopa Prabhu &lt;roopa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -21,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -33,13 +30,13 @@ void br_recalculate_neigh_suppress_enabled(struct net_bridge *br)</div><div class='ctx'> 	bool neigh_suppress = false;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='del'>-		if (p-&gt;flags &amp; BR_NEIGH_SUPPRESS) {</div><div class='add'>+		if (p-&gt;flags &amp; (BR_NEIGH_SUPPRESS | BR_NEIGH_VLAN_SUPPRESS)) {</div><div class='ctx'> 			neigh_suppress = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	br-&gt;neigh_suppress_enabled = neigh_suppress;</div><div class='add'>+	br_opt_toggle(br, BROPT_NEIGH_SUPPRESS_ENABLED, neigh_suppress);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_INET)</div><div class='hunk'>@@ -87,13 +84,14 @@ static void br_arp_send(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> </div><div class='del'>-		netif_rx_ni(skb);</div><div class='add'>+		netif_rx(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_chk_addr_ip(struct net_device *dev, void *data)</div><div class='add'>+static int br_chk_addr_ip(struct net_device *dev,</div><div class='add'>+			  struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	__be32 ip = *(__be32 *)data;</div><div class='add'>+	__be32 ip = *(__be32 *)priv-&gt;data;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='ctx'> 	__be32 addr = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -110,11 +108,15 @@ static int br_chk_addr_ip(struct net_device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static bool br_is_local_ip(struct net_device *dev, __be32 ip)</div><div class='ctx'> {</div><div class='del'>-	if (br_chk_addr_ip(dev, &amp;ip))</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)&amp;ip,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (br_chk_addr_ip(dev, &amp;priv))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* check if ip is configured on upper dev */</div><div class='del'>-	if (netdev_walk_all_upper_dev_rcu(dev, br_chk_addr_ip, &amp;ip))</div><div class='add'>+	if (netdev_walk_all_upper_dev_rcu(dev, br_chk_addr_ip, &amp;priv))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -130,7 +132,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 	u8 *arpptr, *sha;</div><div class='ctx'> 	__be32 sip, tip;</div><div class='ctx'> </div><div class='del'>-	BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = false;</div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((dev-&gt;flags &amp; IFF_NOARP) ||</div><div class='ctx'> 	    !pskb_may_pull(skb, arp_hdr_len(dev)))</div><div class='hunk'>@@ -155,12 +157,17 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 	    ipv4_is_multicast(tip))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;neigh_suppress_enabled) {</div><div class='del'>-		if (p &amp;&amp; (p-&gt;flags &amp; BR_NEIGH_SUPPRESS))</div><div class='add'>+	if (br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {</div><div class='add'>+		if (br_is_neigh_suppress_enabled(p, vid))</div><div class='ctx'> 			return;</div><div class='del'>-		if (ipv4_is_zeronet(sip) || sip == tip) {</div><div class='add'>+		if (is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest) &amp;&amp;</div><div class='add'>+		    parp-&gt;ar_op == htons(ARPOP_REQUEST))</div><div class='add'>+			return;</div><div class='add'>+		if (parp-&gt;ar_op != htons(ARPOP_RREQUEST) &amp;&amp;</div><div class='add'>+		    parp-&gt;ar_op != htons(ARPOP_RREPLY) &amp;&amp;</div><div class='add'>+		    (ipv4_is_zeronet(sip) || sip == tip)) {</div><div class='ctx'> 			/* prevent flooding to neigh suppress ports */</div><div class='del'>-			BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+			BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -175,11 +182,12 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;neigh_suppress_enabled &amp;&amp; br_is_local_ip(vlandev, tip)) {</div><div class='add'>+	if (br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) &amp;&amp;</div><div class='add'>+	    br_is_local_ip(vlandev, tip)) {</div><div class='ctx'> 		/* its our local ip, so don't proxy reply</div><div class='ctx'> 		 * and don't forward to neigh suppress ports</div><div class='ctx'> 		 */</div><div class='del'>-		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +195,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 	if (n) {</div><div class='ctx'> 		struct net_bridge_fdb_entry *f;</div><div class='ctx'> </div><div class='del'>-		if (!(n-&gt;nud_state &amp; NUD_VALID)) {</div><div class='add'>+		if (!(READ_ONCE(n-&gt;nud_state) &amp; NUD_VALID)) {</div><div class='ctx'> 			neigh_release(n);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -197,8 +205,8 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 			bool replied = false;</div><div class='ctx'> </div><div class='ctx'> 			if ((p &amp;&amp; (p-&gt;flags &amp; BR_PROXYARP)) ||</div><div class='del'>-			    (f-&gt;dst &amp;&amp; (f-&gt;dst-&gt;flags &amp; (BR_PROXYARP_WIFI |</div><div class='del'>-							 BR_NEIGH_SUPPRESS)))) {</div><div class='add'>+			    (f-&gt;dst &amp;&amp; (f-&gt;dst-&gt;flags &amp; BR_PROXYARP_WIFI)) ||</div><div class='add'>+			    br_is_neigh_suppress_enabled(f-&gt;dst, vid)) {</div><div class='ctx'> 				if (!vid)</div><div class='ctx'> 					br_arp_send(br, p, skb-&gt;dev, sip, tip,</div><div class='ctx'> 						    sha, n-&gt;ha, sha, 0, 0);</div><div class='hunk'>@@ -213,8 +221,9 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 			/* If we have replied or as long as we know the</div><div class='ctx'> 			 * mac, indicate to arp replied</div><div class='ctx'> 			 */</div><div class='del'>-			if (replied || br-&gt;neigh_suppress_enabled)</div><div class='del'>-				BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+			if (replied ||</div><div class='add'>+			    br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED))</div><div class='add'>+				BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		neigh_release(n);</div><div class='hunk'>@@ -223,7 +232,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *msg)</div><div class='add'>+struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb, struct nd_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct nd_msg *m;</div><div class='ctx'> </div><div class='hunk'>@@ -277,6 +286,10 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 	ns_olen = request-&gt;len - (skb_network_offset(request) +</div><div class='ctx'> 				  sizeof(struct ipv6hdr)) - sizeof(*ns);</div><div class='ctx'> 	for (i = 0; i &lt; ns_olen - 1; i += (ns-&gt;opt[i + 1] &lt;&lt; 3)) {</div><div class='add'>+		if (!ns-&gt;opt[i + 1]) {</div><div class='add'>+			kfree_skb(reply);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		if (ns-&gt;opt[i] == ND_OPT_SOURCE_LL_ADDR) {</div><div class='ctx'> 			daddr = ns-&gt;opt + i + sizeof(struct nd_opt_hdr);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -311,7 +324,7 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 	/* Neighbor Advertisement */</div><div class='ctx'> 	memset(na, 0, sizeof(*na) + na_olen);</div><div class='ctx'> 	na-&gt;icmph.icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT;</div><div class='del'>-	na-&gt;icmph.icmp6_router = 0; /* XXX: should be 1 ? */</div><div class='add'>+	na-&gt;icmph.icmp6_router = (n-&gt;flags &amp; NTF_ROUTER) ? 1 : 0;</div><div class='ctx'> 	na-&gt;icmph.icmp6_override = 1;</div><div class='ctx'> 	na-&gt;icmph.icmp6_solicited = 1;</div><div class='ctx'> 	na-&gt;target = ns-&gt;target;</div><div class='hunk'>@@ -354,13 +367,14 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 		reply-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> 		reply-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> </div><div class='del'>-		netif_rx_ni(reply);</div><div class='add'>+		netif_rx(reply);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_chk_addr_ip6(struct net_device *dev, void *data)</div><div class='add'>+static int br_chk_addr_ip6(struct net_device *dev,</div><div class='add'>+			   struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct in6_addr *addr = (struct in6_addr *)data;</div><div class='add'>+	struct in6_addr *addr = (struct in6_addr *)priv-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_chk_addr(dev_net(dev), addr, dev, 0))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -371,11 +385,15 @@ static int br_chk_addr_ip6(struct net_device *dev, void *data)</div><div class='ctx'> static bool br_is_local_ip6(struct net_device *dev, struct in6_addr *addr)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	if (br_chk_addr_ip6(dev, addr))</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)addr,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (br_chk_addr_ip6(dev, &amp;priv))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* check if ip is configured on upper dev */</div><div class='del'>-	if (netdev_walk_all_upper_dev_rcu(dev, br_chk_addr_ip6, addr))</div><div class='add'>+	if (netdev_walk_all_upper_dev_rcu(dev, br_chk_addr_ip6, &amp;priv))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -390,15 +408,19 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 	struct ipv6hdr *iphdr;</div><div class='ctx'> 	struct neighbour *n;</div><div class='ctx'> </div><div class='del'>-	BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = false;</div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 0;</div><div class='add'>+</div><div class='add'>+	if (br_is_neigh_suppress_enabled(p, vid))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (p &amp;&amp; (p-&gt;flags &amp; BR_NEIGH_SUPPRESS))</div><div class='add'>+	if (is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest) &amp;&amp;</div><div class='add'>+	    msg-&gt;icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;icmph.icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT &amp;&amp;</div><div class='ctx'> 	    !msg-&gt;icmph.icmp6_solicited) {</div><div class='ctx'> 		/* prevent flooding to neigh suppress ports */</div><div class='del'>-		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +433,7 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_any(saddr) || !ipv6_addr_cmp(saddr, daddr)) {</div><div class='ctx'> 		/* prevent flooding to neigh suppress ports */</div><div class='del'>-		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +451,7 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 		/* its our own ip, so don't proxy reply</div><div class='ctx'> 		 * and don't forward to arp suppress ports</div><div class='ctx'> 		 */</div><div class='del'>-		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +459,7 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 	if (n) {</div><div class='ctx'> 		struct net_bridge_fdb_entry *f;</div><div class='ctx'> </div><div class='del'>-		if (!(n-&gt;nud_state &amp; NUD_VALID)) {</div><div class='add'>+		if (!(READ_ONCE(n-&gt;nud_state) &amp; NUD_VALID)) {</div><div class='ctx'> 			neigh_release(n);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -446,7 +468,7 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 		if (f) {</div><div class='ctx'> 			bool replied = false;</div><div class='ctx'> </div><div class='del'>-			if (f-&gt;dst &amp;&amp; (f-&gt;dst-&gt;flags &amp; BR_NEIGH_SUPPRESS)) {</div><div class='add'>+			if (br_is_neigh_suppress_enabled(f-&gt;dst, vid)) {</div><div class='ctx'> 				if (vid != 0)</div><div class='ctx'> 					br_nd_send(br, p, skb, n,</div><div class='ctx'> 						   skb-&gt;vlan_proto,</div><div class='hunk'>@@ -460,10 +482,32 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 			 * mac, indicate to NEIGH_SUPPRESS ports that we</div><div class='ctx'> 			 * have replied</div><div class='ctx'> 			 */</div><div class='del'>-			if (replied || br-&gt;neigh_suppress_enabled)</div><div class='del'>-				BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = true;</div><div class='add'>+			if (replied ||</div><div class='add'>+			    br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED))</div><div class='add'>+				BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		neigh_release(n);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid)</div><div class='add'>+{</div><div class='add'>+	if (!p)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!vid)</div><div class='add'>+		return !!(p-&gt;flags &amp; BR_NEIGH_SUPPRESS);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;flags &amp; BR_NEIGH_VLAN_SUPPRESS) {</div><div class='add'>+		struct net_bridge_vlan_group *vg = nbp_vlan_group_rcu(p);</div><div class='add'>+		struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+		v = br_vlan_find(vg, vid);</div><div class='add'>+		if (!v)</div><div class='add'>+			return false;</div><div class='add'>+		return !!(v-&gt;priv_flags &amp; BR_VLFLAG_NEIGH_SUPPRESS_ENABLED);</div><div class='add'>+	} else {</div><div class='add'>+		return !!(p-&gt;flags &amp; BR_NEIGH_SUPPRESS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c<br/>new file mode 100644<br/>index 000000000000..c2c1c7d44c61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_cfm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_cfm.c</a></div><div class='hunk'>@@ -0,0 +1,867 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cfm_bridge.h&gt;</div><div class='add'>+#include &lt;uapi/linux/cfm_bridge.h&gt;</div><div class='add'>+#include "br_private_cfm.h"</div><div class='add'>+</div><div class='add'>+static struct br_cfm_mep *br_mep_find(struct net_bridge *br, u32 instance)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(mep, &amp;br-&gt;mep_list, head)</div><div class='add'>+		if (mep-&gt;instance == instance)</div><div class='add'>+			return mep;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_cfm_mep *br_mep_find_ifindex(struct net_bridge *br,</div><div class='add'>+					      u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mep, &amp;br-&gt;mep_list, head,</div><div class='add'>+				 lockdep_rtnl_is_held())</div><div class='add'>+		if (mep-&gt;create.ifindex == ifindex)</div><div class='add'>+			return mep;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_cfm_peer_mep *br_peer_mep_find(struct br_cfm_mep *mep,</div><div class='add'>+						u32 mepid)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(peer_mep, &amp;mep-&gt;peer_mep_list, head,</div><div class='add'>+				 lockdep_rtnl_is_held())</div><div class='add'>+		if (peer_mep-&gt;mepid == mepid)</div><div class='add'>+			return peer_mep;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_port *br_mep_get_port(struct net_bridge *br,</div><div class='add'>+					       u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *port;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;br-&gt;port_list, list)</div><div class='add'>+		if (port-&gt;dev-&gt;ifindex == ifindex)</div><div class='add'>+			return port;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the CCM interval in us. */</div><div class='add'>+static u32 interval_to_us(enum br_cfm_ccm_interval interval)</div><div class='add'>+{</div><div class='add'>+	switch (interval) {</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_NONE:</div><div class='add'>+		return 0;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_3_3_MS:</div><div class='add'>+		return 3300;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_MS:</div><div class='add'>+		return 10 * 1000;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_100_MS:</div><div class='add'>+		return 100 * 1000;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_1_SEC:</div><div class='add'>+		return 1000 * 1000;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_SEC:</div><div class='add'>+		return 10 * 1000 * 1000;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_1_MIN:</div><div class='add'>+		return 60 * 1000 * 1000;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_MIN:</div><div class='add'>+		return 10 * 60 * 1000 * 1000;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert the interface interval to CCM PDU value. */</div><div class='add'>+static u32 interval_to_pdu(enum br_cfm_ccm_interval interval)</div><div class='add'>+{</div><div class='add'>+	switch (interval) {</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_NONE:</div><div class='add'>+		return 0;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_3_3_MS:</div><div class='add'>+		return 1;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_MS:</div><div class='add'>+		return 2;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_100_MS:</div><div class='add'>+		return 3;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_1_SEC:</div><div class='add'>+		return 4;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_SEC:</div><div class='add'>+		return 5;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_1_MIN:</div><div class='add'>+		return 6;</div><div class='add'>+	case BR_CFM_CCM_INTERVAL_10_MIN:</div><div class='add'>+		return 7;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert the CCM PDU value to interval on interface. */</div><div class='add'>+static u32 pdu_to_interval(u32 value)</div><div class='add'>+{</div><div class='add'>+	switch (value) {</div><div class='add'>+	case 0:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_NONE;</div><div class='add'>+	case 1:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_3_3_MS;</div><div class='add'>+	case 2:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_10_MS;</div><div class='add'>+	case 3:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_100_MS;</div><div class='add'>+	case 4:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_1_SEC;</div><div class='add'>+	case 5:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_10_SEC;</div><div class='add'>+	case 6:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_1_MIN;</div><div class='add'>+	case 7:</div><div class='add'>+		return BR_CFM_CCM_INTERVAL_10_MIN;</div><div class='add'>+	}</div><div class='add'>+	return BR_CFM_CCM_INTERVAL_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ccm_rx_timer_start(struct br_cfm_peer_mep *peer_mep)</div><div class='add'>+{</div><div class='add'>+	u32 interval_us;</div><div class='add'>+</div><div class='add'>+	interval_us = interval_to_us(peer_mep-&gt;mep-&gt;cc_config.exp_interval);</div><div class='add'>+	/* Function ccm_rx_dwork must be called with 1/4</div><div class='add'>+	 * of the configured CC 'expected_interval'</div><div class='add'>+	 * in order to detect CCM defect after 3.25 interval.</div><div class='add'>+	 */</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;peer_mep-&gt;ccm_rx_dwork,</div><div class='add'>+			   usecs_to_jiffies(interval_us / 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_cfm_notify(int event, const struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	u32 filter = RTEXT_FILTER_CFM_STATUS;</div><div class='add'>+</div><div class='add'>+	br_info_notify(event, port-&gt;br, NULL, filter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_peer_enable(struct br_cfm_peer_mep *peer_mep)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;peer_mep-&gt;cc_status, 0, sizeof(peer_mep-&gt;cc_status));</div><div class='add'>+	peer_mep-&gt;ccm_rx_count_miss = 0;</div><div class='add'>+</div><div class='add'>+	ccm_rx_timer_start(peer_mep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_peer_disable(struct br_cfm_peer_mep *peer_mep)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;peer_mep-&gt;ccm_rx_dwork);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ccm_frame_build(struct br_cfm_mep *mep,</div><div class='add'>+				       const struct br_cfm_cc_ccm_tx_info *const tx_info)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_common_hdr *common_hdr;</div><div class='add'>+	struct net_bridge_port *b_port;</div><div class='add'>+	struct br_cfm_maid *maid;</div><div class='add'>+	u8 *itu_reserved, *e_tlv;</div><div class='add'>+	struct ethhdr *eth_hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__be32 *status_tlv;</div><div class='add'>+	__be32 *snumber;</div><div class='add'>+	__be16 *mepid;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(CFM_CCM_MAX_FRAME_LENGTH);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	b_port = rcu_dereference(mep-&gt;b_port);</div><div class='add'>+	if (!b_port) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	skb-&gt;dev = b_port-&gt;dev;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	/* The device cannot be deleted until the work_queue functions has</div><div class='add'>+	 * completed. This function is called from ccm_tx_work_expired()</div><div class='add'>+	 * that is a work_queue functions.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_CFM);</div><div class='add'>+	skb-&gt;priority = CFM_FRAME_PRIO;</div><div class='add'>+</div><div class='add'>+	/* Ethernet header */</div><div class='add'>+	eth_hdr = skb_put(skb, sizeof(*eth_hdr));</div><div class='add'>+	ether_addr_copy(eth_hdr-&gt;h_dest, tx_info-&gt;dmac.addr);</div><div class='add'>+	ether_addr_copy(eth_hdr-&gt;h_source, mep-&gt;config.unicast_mac.addr);</div><div class='add'>+	eth_hdr-&gt;h_proto = htons(ETH_P_CFM);</div><div class='add'>+</div><div class='add'>+	/* Common CFM Header */</div><div class='add'>+	common_hdr = skb_put(skb, sizeof(*common_hdr));</div><div class='add'>+	common_hdr-&gt;mdlevel_version = mep-&gt;config.mdlevel &lt;&lt; 5;</div><div class='add'>+	common_hdr-&gt;opcode = BR_CFM_OPCODE_CCM;</div><div class='add'>+	common_hdr-&gt;flags = (mep-&gt;rdi &lt;&lt; 7) |</div><div class='add'>+			    interval_to_pdu(mep-&gt;cc_config.exp_interval);</div><div class='add'>+	common_hdr-&gt;tlv_offset = CFM_CCM_TLV_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* Sequence number */</div><div class='add'>+	snumber = skb_put(skb, sizeof(*snumber));</div><div class='add'>+	if (tx_info-&gt;seq_no_update) {</div><div class='add'>+		*snumber = cpu_to_be32(mep-&gt;ccm_tx_snumber);</div><div class='add'>+		mep-&gt;ccm_tx_snumber += 1;</div><div class='add'>+	} else {</div><div class='add'>+		*snumber = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mepid = skb_put(skb, sizeof(*mepid));</div><div class='add'>+	*mepid = cpu_to_be16((u16)mep-&gt;config.mepid);</div><div class='add'>+</div><div class='add'>+	maid = skb_put(skb, sizeof(*maid));</div><div class='add'>+	memcpy(maid-&gt;data, mep-&gt;cc_config.exp_maid.data, sizeof(maid-&gt;data));</div><div class='add'>+</div><div class='add'>+	/* ITU reserved (CFM_CCM_ITU_RESERVED_SIZE octets) */</div><div class='add'>+	itu_reserved = skb_put(skb, CFM_CCM_ITU_RESERVED_SIZE);</div><div class='add'>+	memset(itu_reserved, 0, CFM_CCM_ITU_RESERVED_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Generel CFM TLV format:</div><div class='add'>+	 * TLV type:		one byte</div><div class='add'>+	 * TLV value length:	two bytes</div><div class='add'>+	 * TLV value:		'TLV value length' bytes</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Port status TLV. The value length is 1. Total of 4 bytes. */</div><div class='add'>+	if (tx_info-&gt;port_tlv) {</div><div class='add'>+		status_tlv = skb_put(skb, sizeof(*status_tlv));</div><div class='add'>+		*status_tlv = cpu_to_be32((CFM_PORT_STATUS_TLV_TYPE &lt;&lt; 24) |</div><div class='add'>+					  (1 &lt;&lt; 8) |	/* Value length */</div><div class='add'>+					  (tx_info-&gt;port_tlv_value &amp; 0xFF));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Interface status TLV. The value length is 1. Total of 4 bytes. */</div><div class='add'>+	if (tx_info-&gt;if_tlv) {</div><div class='add'>+		status_tlv = skb_put(skb, sizeof(*status_tlv));</div><div class='add'>+		*status_tlv = cpu_to_be32((CFM_IF_STATUS_TLV_TYPE &lt;&lt; 24) |</div><div class='add'>+					  (1 &lt;&lt; 8) |	/* Value length */</div><div class='add'>+					  (tx_info-&gt;if_tlv_value &amp; 0xFF));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* End TLV */</div><div class='add'>+	e_tlv = skb_put(skb, sizeof(*e_tlv));</div><div class='add'>+	*e_tlv = CFM_ENDE_TLV_TYPE;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ccm_frame_tx(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is called with the configured CC 'expected_interval'</div><div class='add'>+ * in order to drive CCM transmission when enabled.</div><div class='add'>+ */</div><div class='add'>+static void ccm_tx_work_expired(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *del_work;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 interval_us;</div><div class='add'>+</div><div class='add'>+	del_work = to_delayed_work(work);</div><div class='add'>+	mep = container_of(del_work, struct br_cfm_mep, ccm_tx_dwork);</div><div class='add'>+</div><div class='add'>+	if (time_before_eq(mep-&gt;ccm_tx_end, jiffies)) {</div><div class='add'>+		/* Transmission period has ended */</div><div class='add'>+		mep-&gt;cc_ccm_tx_info.period = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ccm_frame_build(mep, &amp;mep-&gt;cc_ccm_tx_info);</div><div class='add'>+	if (skb)</div><div class='add'>+		ccm_frame_tx(skb);</div><div class='add'>+</div><div class='add'>+	interval_us = interval_to_us(mep-&gt;cc_config.exp_interval);</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mep-&gt;ccm_tx_dwork,</div><div class='add'>+			   usecs_to_jiffies(interval_us));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is called with 1/4 of the configured CC 'expected_interval'</div><div class='add'>+ * in order to detect CCM defect after 3.25 interval.</div><div class='add'>+ */</div><div class='add'>+static void ccm_rx_work_expired(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct net_bridge_port *b_port;</div><div class='add'>+	struct delayed_work *del_work;</div><div class='add'>+</div><div class='add'>+	del_work = to_delayed_work(work);</div><div class='add'>+	peer_mep = container_of(del_work, struct br_cfm_peer_mep, ccm_rx_dwork);</div><div class='add'>+</div><div class='add'>+	/* After 13 counts (4 * 3,25) then 3.25 intervals are expired */</div><div class='add'>+	if (peer_mep-&gt;ccm_rx_count_miss &lt; 13) {</div><div class='add'>+		/* 3.25 intervals are NOT expired without CCM reception */</div><div class='add'>+		peer_mep-&gt;ccm_rx_count_miss++;</div><div class='add'>+</div><div class='add'>+		/* Start timer again */</div><div class='add'>+		ccm_rx_timer_start(peer_mep);</div><div class='add'>+	} else {</div><div class='add'>+		/* 3.25 intervals are expired without CCM reception.</div><div class='add'>+		 * CCM defect detected</div><div class='add'>+		 */</div><div class='add'>+		peer_mep-&gt;cc_status.ccm_defect = true;</div><div class='add'>+</div><div class='add'>+		/* Change in CCM defect status - notify */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		b_port = rcu_dereference(peer_mep-&gt;mep-&gt;b_port);</div><div class='add'>+		if (b_port)</div><div class='add'>+			br_cfm_notify(RTM_NEWLINK, b_port);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ccm_tlv_extract(struct sk_buff *skb, u32 index,</div><div class='add'>+			   struct br_cfm_peer_mep *peer_mep)</div><div class='add'>+{</div><div class='add'>+	__be32 *s_tlv;</div><div class='add'>+	__be32 _s_tlv;</div><div class='add'>+	u32 h_s_tlv;</div><div class='add'>+	u8 *e_tlv;</div><div class='add'>+	u8 _e_tlv;</div><div class='add'>+</div><div class='add'>+	e_tlv = skb_header_pointer(skb, index, sizeof(_e_tlv), &amp;_e_tlv);</div><div class='add'>+	if (!e_tlv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* TLV is present - get the status TLV */</div><div class='add'>+	s_tlv = skb_header_pointer(skb,</div><div class='add'>+				   index,</div><div class='add'>+				   sizeof(_s_tlv), &amp;_s_tlv);</div><div class='add'>+	if (!s_tlv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	h_s_tlv = ntohl(*s_tlv);</div><div class='add'>+	if ((h_s_tlv &gt;&gt; 24) == CFM_IF_STATUS_TLV_TYPE) {</div><div class='add'>+		/* Interface status TLV */</div><div class='add'>+		peer_mep-&gt;cc_status.tlv_seen = true;</div><div class='add'>+		peer_mep-&gt;cc_status.if_tlv_value = (h_s_tlv &amp; 0xFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((h_s_tlv &gt;&gt; 24) == CFM_PORT_STATUS_TLV_TYPE) {</div><div class='add'>+		/* Port status TLV */</div><div class='add'>+		peer_mep-&gt;cc_status.tlv_seen = true;</div><div class='add'>+		peer_mep-&gt;cc_status.port_tlv_value = (h_s_tlv &amp; 0xFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The Sender ID TLV is not handled */</div><div class='add'>+	/* The Organization-Specific TLV is not handled */</div><div class='add'>+</div><div class='add'>+	/* Return the length of this tlv.</div><div class='add'>+	 * This is the length of the value field plus 3 bytes for size of type</div><div class='add'>+	 * field and length field</div><div class='add'>+	 */</div><div class='add'>+	return ((h_s_tlv &gt;&gt; 8) &amp; 0xFFFF) + 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* note: already called with rcu_read_lock */</div><div class='add'>+static int br_cfm_frame_rx(struct net_bridge_port *port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 mdlevel, interval, size, index, max;</div><div class='add'>+	const struct br_cfm_common_hdr *hdr;</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	const struct br_cfm_maid *maid;</div><div class='add'>+	struct br_cfm_common_hdr _hdr;</div><div class='add'>+	struct br_cfm_maid _maid;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	__be32 *snumber;</div><div class='add'>+	__be32 _snumber;</div><div class='add'>+	__be16 *mepid;</div><div class='add'>+	__be16 _mepid;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;state == BR_STATE_DISABLED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdr = skb_header_pointer(skb, 0, sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	br = port-&gt;br;</div><div class='add'>+	mep = br_mep_find_ifindex(br, port-&gt;dev-&gt;ifindex);</div><div class='add'>+	if (unlikely(!mep))</div><div class='add'>+		/* No MEP on this port - must be forwarded */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mdlevel = hdr-&gt;mdlevel_version &gt;&gt; 5;</div><div class='add'>+	if (mdlevel &gt; mep-&gt;config.mdlevel)</div><div class='add'>+		/* The level is above this MEP level - must be forwarded */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((hdr-&gt;mdlevel_version &amp; 0x1F) != 0) {</div><div class='add'>+		/* Invalid version */</div><div class='add'>+		mep-&gt;status.version_unexp_seen = true;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdlevel &lt; mep-&gt;config.mdlevel) {</div><div class='add'>+		/* The level is below this MEP level */</div><div class='add'>+		mep-&gt;status.rx_level_low_seen = true;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;opcode == BR_CFM_OPCODE_CCM) {</div><div class='add'>+		/* CCM PDU received. */</div><div class='add'>+		/* MA ID is after common header + sequence number + MEP ID */</div><div class='add'>+		maid = skb_header_pointer(skb,</div><div class='add'>+					  CFM_CCM_PDU_MAID_OFFSET,</div><div class='add'>+					  sizeof(_maid), &amp;_maid);</div><div class='add'>+		if (!maid)</div><div class='add'>+			return 1;</div><div class='add'>+		if (memcmp(maid-&gt;data, mep-&gt;cc_config.exp_maid.data,</div><div class='add'>+			   sizeof(maid-&gt;data)))</div><div class='add'>+			/* MA ID not as expected */</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* MEP ID is after common header + sequence number */</div><div class='add'>+		mepid = skb_header_pointer(skb,</div><div class='add'>+					   CFM_CCM_PDU_MEPID_OFFSET,</div><div class='add'>+					   sizeof(_mepid), &amp;_mepid);</div><div class='add'>+		if (!mepid)</div><div class='add'>+			return 1;</div><div class='add'>+		peer_mep = br_peer_mep_find(mep, (u32)ntohs(*mepid));</div><div class='add'>+		if (!peer_mep)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* Interval is in common header flags */</div><div class='add'>+		interval = hdr-&gt;flags &amp; 0x07;</div><div class='add'>+		if (mep-&gt;cc_config.exp_interval != pdu_to_interval(interval))</div><div class='add'>+			/* Interval not as expected */</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* A valid CCM frame is received */</div><div class='add'>+		if (peer_mep-&gt;cc_status.ccm_defect) {</div><div class='add'>+			peer_mep-&gt;cc_status.ccm_defect = false;</div><div class='add'>+</div><div class='add'>+			/* Change in CCM defect status - notify */</div><div class='add'>+			br_cfm_notify(RTM_NEWLINK, port);</div><div class='add'>+</div><div class='add'>+			/* Start CCM RX timer */</div><div class='add'>+			ccm_rx_timer_start(peer_mep);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		peer_mep-&gt;cc_status.seen = true;</div><div class='add'>+		peer_mep-&gt;ccm_rx_count_miss = 0;</div><div class='add'>+</div><div class='add'>+		/* RDI is in common header flags */</div><div class='add'>+		peer_mep-&gt;cc_status.rdi = (hdr-&gt;flags &amp; 0x80) ? true : false;</div><div class='add'>+</div><div class='add'>+		/* Sequence number is after common header */</div><div class='add'>+		snumber = skb_header_pointer(skb,</div><div class='add'>+					     CFM_CCM_PDU_SEQNR_OFFSET,</div><div class='add'>+					     sizeof(_snumber), &amp;_snumber);</div><div class='add'>+		if (!snumber)</div><div class='add'>+			return 1;</div><div class='add'>+		if (ntohl(*snumber) != (mep-&gt;ccm_rx_snumber + 1))</div><div class='add'>+			/* Unexpected sequence number */</div><div class='add'>+			peer_mep-&gt;cc_status.seq_unexp_seen = true;</div><div class='add'>+</div><div class='add'>+		mep-&gt;ccm_rx_snumber = ntohl(*snumber);</div><div class='add'>+</div><div class='add'>+		/* TLV end is after common header + sequence number + MEP ID +</div><div class='add'>+		 * MA ID + ITU reserved</div><div class='add'>+		 */</div><div class='add'>+		index = CFM_CCM_PDU_TLV_OFFSET;</div><div class='add'>+		max = 0;</div><div class='add'>+		do { /* Handle all TLVs */</div><div class='add'>+			size = ccm_tlv_extract(skb, index, peer_mep);</div><div class='add'>+			index += size;</div><div class='add'>+			max += 1;</div><div class='add'>+		} while (size != 0 &amp;&amp; max &lt; 4); /* Max four TLVs possible */</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mep-&gt;status.opcode_unexp_seen = true;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_frame_type cfm_frame_type __read_mostly = {</div><div class='add'>+	.type = cpu_to_be16(ETH_P_CFM),</div><div class='add'>+	.frame_handler = br_cfm_frame_rx,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_create(struct net_bridge *br,</div><div class='add'>+		      const u32 instance,</div><div class='add'>+		      struct br_cfm_mep_create *const create,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (create-&gt;domain == BR_CFM_VLAN) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "VLAN domain not supported");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (create-&gt;domain != BR_CFM_PORT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Invalid domain value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (create-&gt;direction == BR_CFM_MEP_DIRECTION_UP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Up-MEP not supported");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (create-&gt;direction != BR_CFM_MEP_DIRECTION_DOWN) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Invalid direction value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	p = br_mep_get_port(br, create-&gt;ifindex);</div><div class='add'>+	if (!p) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Port is not related to bridge");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance already exists");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In PORT domain only one instance can be created per port */</div><div class='add'>+	if (create-&gt;domain == BR_CFM_PORT) {</div><div class='add'>+		mep = br_mep_find_ifindex(br, create-&gt;ifindex);</div><div class='add'>+		if (mep) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only one Port MEP on a port allowed");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mep = kzalloc(sizeof(*mep), GFP_KERNEL);</div><div class='add'>+	if (!mep)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mep-&gt;create = *create;</div><div class='add'>+	mep-&gt;instance = instance;</div><div class='add'>+	rcu_assign_pointer(mep-&gt;b_port, p);</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_HEAD(&amp;mep-&gt;peer_mep_list);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mep-&gt;ccm_tx_dwork, ccm_tx_work_expired);</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;br-&gt;mep_list))</div><div class='add'>+		br_add_frame(br, &amp;cfm_frame_type);</div><div class='add'>+</div><div class='add'>+	hlist_add_tail_rcu(&amp;mep-&gt;head, &amp;br-&gt;mep_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mep_delete_implementation(struct net_bridge *br,</div><div class='add'>+				      struct br_cfm_mep *mep)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct hlist_node *n_store;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* Empty and free peer MEP list */</div><div class='add'>+	hlist_for_each_entry_safe(peer_mep, n_store, &amp;mep-&gt;peer_mep_list, head) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;peer_mep-&gt;ccm_rx_dwork);</div><div class='add'>+		hlist_del_rcu(&amp;peer_mep-&gt;head);</div><div class='add'>+		kfree_rcu(peer_mep, rcu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;mep-&gt;ccm_tx_dwork);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mep-&gt;b_port, NULL);</div><div class='add'>+	hlist_del_rcu(&amp;mep-&gt;head);</div><div class='add'>+	kfree_rcu(mep, rcu);</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;br-&gt;mep_list))</div><div class='add'>+		br_del_frame(br, &amp;cfm_frame_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_delete(struct net_bridge *br,</div><div class='add'>+		      const u32 instance,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mep_delete_implementation(br, mep);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_config_set(struct net_bridge *br,</div><div class='add'>+			  const u32 instance,</div><div class='add'>+			  const struct br_cfm_mep_config *const config,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mep-&gt;config = *config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_config_set(struct net_bridge *br,</div><div class='add'>+			 const u32 instance,</div><div class='add'>+			 const struct br_cfm_cc_config *const config,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for no change in configuration */</div><div class='add'>+	if (memcmp(config, &amp;mep-&gt;cc_config, sizeof(*config)) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (config-&gt;enable &amp;&amp; !mep-&gt;cc_config.enable)</div><div class='add'>+		/* CC is enabled */</div><div class='add'>+		hlist_for_each_entry(peer_mep, &amp;mep-&gt;peer_mep_list, head)</div><div class='add'>+			cc_peer_enable(peer_mep);</div><div class='add'>+</div><div class='add'>+	if (!config-&gt;enable &amp;&amp; mep-&gt;cc_config.enable)</div><div class='add'>+		/* CC is disabled */</div><div class='add'>+		hlist_for_each_entry(peer_mep, &amp;mep-&gt;peer_mep_list, head)</div><div class='add'>+			cc_peer_disable(peer_mep);</div><div class='add'>+</div><div class='add'>+	mep-&gt;cc_config = *config;</div><div class='add'>+	mep-&gt;ccm_rx_snumber = 0;</div><div class='add'>+	mep-&gt;ccm_tx_snumber = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_peer_mep_add(struct net_bridge *br, const u32 instance,</div><div class='add'>+			   u32 mepid,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_mep = br_peer_mep_find(mep, mepid);</div><div class='add'>+	if (peer_mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Peer MEP-ID already exists");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_mep = kzalloc(sizeof(*peer_mep), GFP_KERNEL);</div><div class='add'>+	if (!peer_mep)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	peer_mep-&gt;mepid = mepid;</div><div class='add'>+	peer_mep-&gt;mep = mep;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;peer_mep-&gt;ccm_rx_dwork, ccm_rx_work_expired);</div><div class='add'>+</div><div class='add'>+	if (mep-&gt;cc_config.enable)</div><div class='add'>+		cc_peer_enable(peer_mep);</div><div class='add'>+</div><div class='add'>+	hlist_add_tail_rcu(&amp;peer_mep-&gt;head, &amp;mep-&gt;peer_mep_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_peer_mep_remove(struct net_bridge *br, const u32 instance,</div><div class='add'>+			      u32 mepid,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_mep = br_peer_mep_find(mep, mepid);</div><div class='add'>+	if (!peer_mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Peer MEP-ID does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cc_peer_disable(peer_mep);</div><div class='add'>+</div><div class='add'>+	hlist_del_rcu(&amp;peer_mep-&gt;head);</div><div class='add'>+	kfree_rcu(peer_mep, rcu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_rdi_set(struct net_bridge *br, const u32 instance,</div><div class='add'>+		      const bool rdi, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mep-&gt;rdi = rdi;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_ccm_tx(struct net_bridge *br, const u32 instance,</div><div class='add'>+		     const struct br_cfm_cc_ccm_tx_info *const tx_info,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mep = br_mep_find(br, instance);</div><div class='add'>+	if (!mep) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "MEP instance does not exists");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(tx_info, &amp;mep-&gt;cc_ccm_tx_info, sizeof(*tx_info)) == 0) {</div><div class='add'>+		/* No change in tx_info. */</div><div class='add'>+		if (mep-&gt;cc_ccm_tx_info.period == 0)</div><div class='add'>+			/* Transmission is not enabled - just return */</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Transmission is ongoing, the end time is recalculated */</div><div class='add'>+		mep-&gt;ccm_tx_end = jiffies +</div><div class='add'>+				  usecs_to_jiffies(tx_info-&gt;period * 1000000);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;period == 0 &amp;&amp; mep-&gt;cc_ccm_tx_info.period == 0)</div><div class='add'>+		/* Some change in info and transmission is not ongoing */</div><div class='add'>+		goto save;</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;period != 0 &amp;&amp; mep-&gt;cc_ccm_tx_info.period != 0) {</div><div class='add'>+		/* Some change in info and transmission is ongoing</div><div class='add'>+		 * The end time is recalculated</div><div class='add'>+		 */</div><div class='add'>+		mep-&gt;ccm_tx_end = jiffies +</div><div class='add'>+				  usecs_to_jiffies(tx_info-&gt;period * 1000000);</div><div class='add'>+</div><div class='add'>+		goto save;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;period == 0 &amp;&amp; mep-&gt;cc_ccm_tx_info.period != 0) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;mep-&gt;ccm_tx_dwork);</div><div class='add'>+		goto save;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start delayed work to transmit CCM frames. It is done with zero delay</div><div class='add'>+	 * to send first frame immediately</div><div class='add'>+	 */</div><div class='add'>+	mep-&gt;ccm_tx_end = jiffies + usecs_to_jiffies(tx_info-&gt;period * 1000000);</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mep-&gt;ccm_tx_dwork, 0);</div><div class='add'>+</div><div class='add'>+save:</div><div class='add'>+	mep-&gt;cc_ccm_tx_info = *tx_info;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_count(struct net_bridge *br, u32 *count)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	*count = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(mep, &amp;br-&gt;mep_list, head)</div><div class='add'>+		*count += 1;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	*count = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(mep, &amp;br-&gt;mep_list, head)</div><div class='add'>+		hlist_for_each_entry_rcu(peer_mep, &amp;mep-&gt;peer_mep_list, head)</div><div class='add'>+			*count += 1;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_cfm_created(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return !hlist_empty(&amp;br-&gt;mep_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deletes the CFM instances on a specific bridge port</div><div class='add'>+ */</div><div class='add'>+void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *n_store;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(mep, n_store, &amp;br-&gt;mep_list, head)</div><div class='add'>+		if (mep-&gt;create.ifindex == port-&gt;dev-&gt;ifindex)</div><div class='add'>+			mep_delete_implementation(br, mep);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_cfm_netlink.c b/net/bridge/br_cfm_netlink.c<br/>new file mode 100644<br/>index 000000000000..2faab44652e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_cfm_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_cfm_netlink.c</a></div><div class='hunk'>@@ -0,0 +1,726 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include "br_private_cfm.h"</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_mep_create_policy[IFLA_BRIDGE_CFM_MEP_CREATE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE_INSTANCE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE_DOMAIN]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE_DIRECTION]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE_IFINDEX]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_mep_delete_policy[IFLA_BRIDGE_CFM_MEP_DELETE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_DELETE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_DELETE_INSTANCE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_mep_config_policy[IFLA_BRIDGE_CFM_MEP_CONFIG_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG_UNSPEC]	 = { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG_INSTANCE]	 = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG_UNICAST_MAC] = NLA_POLICY_ETH_ADDR,</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG_MDLEVEL]	 = NLA_POLICY_MAX(NLA_U32, 7),</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG_MEPID]	 = NLA_POLICY_MAX(NLA_U32, 0x1FFF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_cc_config_policy[IFLA_BRIDGE_CFM_CC_CONFIG_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG_UNSPEC]	 = { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG_INSTANCE]	 = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG_ENABLE]	 = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_MAID]	 = {</div><div class='add'>+	.type = NLA_BINARY, .len = CFM_MAID_LENGTH },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_cc_peer_mep_policy[IFLA_BRIDGE_CFM_CC_PEER_MEP_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_PEER_MEP_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_PEER_MEPID]		= NLA_POLICY_MAX(NLA_U32, 0x1FFF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_cc_rdi_policy[IFLA_BRIDGE_CFM_CC_RDI_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_RDI_UNSPEC]		= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_RDI_INSTANCE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_RDI_RDI]		= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_cc_ccm_tx_policy[IFLA_BRIDGE_CFM_CC_CCM_TX_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_UNSPEC]	   = { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE]	   = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_DMAC]	   = NLA_POLICY_ETH_ADDR,</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_SEQ_NO_UPDATE]  = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_PERIOD]	   = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV]	   = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV_VALUE]   = { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV]	   = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV_VALUE] = { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_cfm_policy[IFLA_BRIDGE_CFM_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_CFM_UNSPEC]		= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CREATE]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_mep_create_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_DELETE]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_mep_delete_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_MEP_CONFIG]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_mep_config_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CONFIG]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_cc_config_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_PEER_MEP_ADD]	=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_cc_peer_mep_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_PEER_MEP_REMOVE]	=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_cc_peer_mep_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_RDI]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_cc_rdi_policy),</div><div class='add'>+	[IFLA_BRIDGE_CFM_CC_CCM_TX]		=</div><div class='add'>+				NLA_POLICY_NESTED(br_cfm_cc_ccm_tx_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mep_create_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_MEP_CREATE_MAX + 1];</div><div class='add'>+	struct br_cfm_mep_create create;</div><div class='add'>+	u32 instance;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_MEP_CREATE_MAX, attr,</div><div class='add'>+			       br_cfm_mep_create_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CREATE_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CREATE_DOMAIN]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing DOMAIN attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CREATE_DIRECTION]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing DIRECTION attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CREATE_IFINDEX]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing IFINDEX attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;create, 0, sizeof(create));</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CREATE_INSTANCE]);</div><div class='add'>+	create.domain = nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CREATE_DOMAIN]);</div><div class='add'>+	create.direction = nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CREATE_DIRECTION]);</div><div class='add'>+	create.ifindex = nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CREATE_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_mep_create(br, instance, &amp;create, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mep_delete_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_MEP_DELETE_MAX + 1];</div><div class='add'>+	u32 instance;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_MEP_DELETE_MAX, attr,</div><div class='add'>+			       br_cfm_mep_delete_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_DELETE_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_DELETE_INSTANCE]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_mep_delete(br, instance, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mep_config_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_MEP_CONFIG_MAX + 1];</div><div class='add'>+	struct br_cfm_mep_config config;</div><div class='add'>+	u32 instance;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_MEP_CONFIG_MAX, attr,</div><div class='add'>+			       br_cfm_mep_config_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CONFIG_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CONFIG_UNICAST_MAC]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing UNICAST_MAC attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CONFIG_MDLEVEL]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing MDLEVEL attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_MEP_CONFIG_MEPID]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing MEPID attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;config, 0, sizeof(config));</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CONFIG_INSTANCE]);</div><div class='add'>+	nla_memcpy(&amp;config.unicast_mac.addr,</div><div class='add'>+		   tb[IFLA_BRIDGE_CFM_MEP_CONFIG_UNICAST_MAC],</div><div class='add'>+		   sizeof(config.unicast_mac.addr));</div><div class='add'>+	config.mdlevel = nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CONFIG_MDLEVEL]);</div><div class='add'>+	config.mepid = nla_get_u32(tb[IFLA_BRIDGE_CFM_MEP_CONFIG_MEPID]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_mep_config_set(br, instance, &amp;config, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_cc_config_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_CC_CONFIG_MAX + 1];</div><div class='add'>+	struct br_cfm_cc_config config;</div><div class='add'>+	u32 instance;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_CC_CONFIG_MAX, attr,</div><div class='add'>+			       br_cfm_cc_config_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CONFIG_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CONFIG_ENABLE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing ENABLE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INTERVAL attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_MAID]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing MAID attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;config, 0, sizeof(config));</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CONFIG_INSTANCE]);</div><div class='add'>+	config.enable = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CONFIG_ENABLE]);</div><div class='add'>+	config.exp_interval = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL]);</div><div class='add'>+	nla_memcpy(&amp;config.exp_maid.data, tb[IFLA_BRIDGE_CFM_CC_CONFIG_EXP_MAID],</div><div class='add'>+		   sizeof(config.exp_maid.data));</div><div class='add'>+</div><div class='add'>+	return br_cfm_cc_config_set(br, instance, &amp;config, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_cc_peer_mep_add_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_MAX + 1];</div><div class='add'>+	u32 instance, peer_mep_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_CC_PEER_MEP_MAX, attr,</div><div class='add'>+			       br_cfm_cc_peer_mep_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_PEER_MEPID]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing PEER_MEP_ID attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE]);</div><div class='add'>+	peer_mep_id =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_PEER_MEPID]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_cc_peer_mep_add(br, instance, peer_mep_id, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_cc_peer_mep_remove_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_MAX + 1];</div><div class='add'>+	u32 instance, peer_mep_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_CC_PEER_MEP_MAX, attr,</div><div class='add'>+			       br_cfm_cc_peer_mep_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_PEER_MEPID]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing PEER_MEP_ID attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE]);</div><div class='add'>+	peer_mep_id =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_PEER_MEPID]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_cc_peer_mep_remove(br, instance, peer_mep_id, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_cc_rdi_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_CC_RDI_MAX + 1];</div><div class='add'>+	u32 instance, rdi;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_CC_RDI_MAX, attr,</div><div class='add'>+			       br_cfm_cc_rdi_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_RDI_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_RDI_RDI]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing RDI attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	instance =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_RDI_INSTANCE]);</div><div class='add'>+	rdi =  nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_RDI_RDI]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_cc_rdi_set(br, instance, rdi, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_cc_ccm_tx_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_CC_CCM_TX_MAX + 1];</div><div class='add'>+	struct br_cfm_cc_ccm_tx_info tx_info;</div><div class='add'>+	u32 instance;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_CC_CCM_TX_MAX, attr,</div><div class='add'>+			       br_cfm_cc_ccm_tx_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing INSTANCE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_DMAC]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing DMAC attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_SEQ_NO_UPDATE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing SEQ_NO_UPDATE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PERIOD]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing PERIOD attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing IF_TLV attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV_VALUE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing IF_TLV_VALUE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing PORT_TLV attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV_VALUE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing PORT_TLV_VALUE attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;tx_info, 0, sizeof(tx_info));</div><div class='add'>+</div><div class='add'>+	instance = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE]);</div><div class='add'>+	nla_memcpy(&amp;tx_info.dmac.addr,</div><div class='add'>+		   tb[IFLA_BRIDGE_CFM_CC_CCM_TX_DMAC],</div><div class='add'>+		   sizeof(tx_info.dmac.addr));</div><div class='add'>+	tx_info.seq_no_update = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_SEQ_NO_UPDATE]);</div><div class='add'>+	tx_info.period = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PERIOD]);</div><div class='add'>+	tx_info.if_tlv = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV]);</div><div class='add'>+	tx_info.if_tlv_value = nla_get_u8(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV_VALUE]);</div><div class='add'>+	tx_info.port_tlv = nla_get_u32(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV]);</div><div class='add'>+	tx_info.port_tlv_value = nla_get_u8(tb[IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV_VALUE]);</div><div class='add'>+</div><div class='add'>+	return br_cfm_cc_ccm_tx(br, instance, &amp;tx_info, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+		 struct nlattr *attr, int cmd, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_CFM_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* When this function is called for a port then the br pointer is</div><div class='add'>+	 * invalid, therefor set the br to point correctly</div><div class='add'>+	 */</div><div class='add'>+	if (p)</div><div class='add'>+		br = p-&gt;br;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_CFM_MAX, attr,</div><div class='add'>+			       br_cfm_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_MEP_CREATE]) {</div><div class='add'>+		err = br_mep_create_parse(br, tb[IFLA_BRIDGE_CFM_MEP_CREATE],</div><div class='add'>+					  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_MEP_DELETE]) {</div><div class='add'>+		err = br_mep_delete_parse(br, tb[IFLA_BRIDGE_CFM_MEP_DELETE],</div><div class='add'>+					  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_MEP_CONFIG]) {</div><div class='add'>+		err = br_mep_config_parse(br, tb[IFLA_BRIDGE_CFM_MEP_CONFIG],</div><div class='add'>+					  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_CC_CONFIG]) {</div><div class='add'>+		err = br_cc_config_parse(br, tb[IFLA_BRIDGE_CFM_CC_CONFIG],</div><div class='add'>+					 extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_ADD]) {</div><div class='add'>+		err = br_cc_peer_mep_add_parse(br, tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_ADD],</div><div class='add'>+					       extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_REMOVE]) {</div><div class='add'>+		err = br_cc_peer_mep_remove_parse(br, tb[IFLA_BRIDGE_CFM_CC_PEER_MEP_REMOVE],</div><div class='add'>+						  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_CC_RDI]) {</div><div class='add'>+		err = br_cc_rdi_parse(br, tb[IFLA_BRIDGE_CFM_CC_RDI],</div><div class='add'>+				      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_CFM_CC_CCM_TX]) {</div><div class='add'>+		err = br_cc_ccm_tx_parse(br, tb[IFLA_BRIDGE_CFM_CC_CCM_TX],</div><div class='add'>+					 extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+	struct nlattr *tb;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mep, &amp;br-&gt;mep_list, head) {</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_MEP_CREATE_INFO);</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CREATE_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CREATE_DOMAIN,</div><div class='add'>+				mep-&gt;create.domain))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CREATE_DIRECTION,</div><div class='add'>+				mep-&gt;create.direction))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CREATE_IFINDEX,</div><div class='add'>+				mep-&gt;create.ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_MEP_CONFIG_INFO);</div><div class='add'>+</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CONFIG_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put(skb, IFLA_BRIDGE_CFM_MEP_CONFIG_UNICAST_MAC,</div><div class='add'>+			    sizeof(mep-&gt;config.unicast_mac.addr),</div><div class='add'>+			    mep-&gt;config.unicast_mac.addr))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CONFIG_MDLEVEL,</div><div class='add'>+				mep-&gt;config.mdlevel))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_CONFIG_MEPID,</div><div class='add'>+				mep-&gt;config.mepid))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_CC_CONFIG_INFO);</div><div class='add'>+</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CONFIG_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CONFIG_ENABLE,</div><div class='add'>+				mep-&gt;cc_config.enable))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL,</div><div class='add'>+				mep-&gt;cc_config.exp_interval))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put(skb, IFLA_BRIDGE_CFM_CC_CONFIG_EXP_MAID,</div><div class='add'>+			    sizeof(mep-&gt;cc_config.exp_maid.data),</div><div class='add'>+			    mep-&gt;cc_config.exp_maid.data))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_CC_RDI_INFO);</div><div class='add'>+</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_RDI_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_RDI_RDI,</div><div class='add'>+				mep-&gt;rdi))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_INFO);</div><div class='add'>+</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_DMAC,</div><div class='add'>+			    sizeof(mep-&gt;cc_ccm_tx_info.dmac),</div><div class='add'>+			    mep-&gt;cc_ccm_tx_info.dmac.addr))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_SEQ_NO_UPDATE,</div><div class='add'>+				mep-&gt;cc_ccm_tx_info.seq_no_update))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_PERIOD,</div><div class='add'>+				mep-&gt;cc_ccm_tx_info.period))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV,</div><div class='add'>+				mep-&gt;cc_ccm_tx_info.if_tlv))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_IF_TLV_VALUE,</div><div class='add'>+			       mep-&gt;cc_ccm_tx_info.if_tlv_value))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV,</div><div class='add'>+				mep-&gt;cc_ccm_tx_info.port_tlv))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(skb, IFLA_BRIDGE_CFM_CC_CCM_TX_PORT_TLV_VALUE,</div><div class='add'>+			       mep-&gt;cc_ccm_tx_info.port_tlv_value))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_rcu(peer_mep, &amp;mep-&gt;peer_mep_list, head) {</div><div class='add'>+			tb = nla_nest_start(skb,</div><div class='add'>+					    IFLA_BRIDGE_CFM_CC_PEER_MEP_INFO);</div><div class='add'>+</div><div class='add'>+			if (!tb)</div><div class='add'>+				goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_MEP_INSTANCE,</div><div class='add'>+					mep-&gt;instance))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_PEER_MEPID,</div><div class='add'>+					peer_mep-&gt;mepid))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			nla_nest_end(skb, tb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, tb);</div><div class='add'>+</div><div class='add'>+nla_info_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_cfm_status_fill_info(struct sk_buff *skb,</div><div class='add'>+			    struct net_bridge *br,</div><div class='add'>+			    bool getlink)</div><div class='add'>+{</div><div class='add'>+	struct br_cfm_peer_mep *peer_mep;</div><div class='add'>+	struct br_cfm_mep *mep;</div><div class='add'>+	struct nlattr *tb;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mep, &amp;br-&gt;mep_list, head) {</div><div class='add'>+		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_MEP_STATUS_INFO);</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_STATUS_INSTANCE,</div><div class='add'>+				mep-&gt;instance))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb,</div><div class='add'>+				IFLA_BRIDGE_CFM_MEP_STATUS_OPCODE_UNEXP_SEEN,</div><div class='add'>+				mep-&gt;status.opcode_unexp_seen))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb,</div><div class='add'>+				IFLA_BRIDGE_CFM_MEP_STATUS_VERSION_UNEXP_SEEN,</div><div class='add'>+				mep-&gt;status.version_unexp_seen))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb,</div><div class='add'>+				IFLA_BRIDGE_CFM_MEP_STATUS_RX_LEVEL_LOW_SEEN,</div><div class='add'>+				mep-&gt;status.rx_level_low_seen))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		/* Only clear if this is a GETLINK */</div><div class='add'>+		if (getlink) {</div><div class='add'>+			/* Clear all 'seen' indications */</div><div class='add'>+			mep-&gt;status.opcode_unexp_seen = false;</div><div class='add'>+			mep-&gt;status.version_unexp_seen = false;</div><div class='add'>+			mep-&gt;status.rx_level_low_seen = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_rcu(peer_mep, &amp;mep-&gt;peer_mep_list, head) {</div><div class='add'>+			tb = nla_nest_start(skb,</div><div class='add'>+					    IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO);</div><div class='add'>+			if (!tb)</div><div class='add'>+				goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_INSTANCE,</div><div class='add'>+					mep-&gt;instance))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_PEER_MEPID,</div><div class='add'>+					peer_mep-&gt;mepid))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_CCM_DEFECT,</div><div class='add'>+					peer_mep-&gt;cc_status.ccm_defect))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_PEER_STATUS_RDI,</div><div class='add'>+					peer_mep-&gt;cc_status.rdi))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u8(skb,</div><div class='add'>+				       IFLA_BRIDGE_CFM_CC_PEER_STATUS_PORT_TLV_VALUE,</div><div class='add'>+				       peer_mep-&gt;cc_status.port_tlv_value))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u8(skb,</div><div class='add'>+				       IFLA_BRIDGE_CFM_CC_PEER_STATUS_IF_TLV_VALUE,</div><div class='add'>+				       peer_mep-&gt;cc_status.if_tlv_value))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEEN,</div><div class='add'>+					peer_mep-&gt;cc_status.seen))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_TLV_SEEN,</div><div class='add'>+					peer_mep-&gt;cc_status.tlv_seen))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb,</div><div class='add'>+					IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEQ_UNEXP_SEEN,</div><div class='add'>+					peer_mep-&gt;cc_status.seq_unexp_seen))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			if (getlink) { /* Only clear if this is a GETLINK */</div><div class='add'>+				/* Clear all 'seen' indications */</div><div class='add'>+				peer_mep-&gt;cc_status.seen = false;</div><div class='add'>+				peer_mep-&gt;cc_status.tlv_seen = false;</div><div class='add'>+				peer_mep-&gt;cc_status.seq_unexp_seen = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			nla_nest_end(skb, tb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, tb);</div><div class='add'>+</div><div class='add'>+nla_info_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c<br/>index e682a668ce57..a818fdc22da9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_device.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_device.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Device handling code</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,6 +16,8 @@</div><div class='ctx'> #include &lt;linux/netfilter_bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> </div><div class='ctx'> #define COMMON_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | \</div><div class='hunk'>@@ -28,20 +26,29 @@</div><div class='ctx'> const struct nf_br_ops __rcu *nf_br_ops __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_br_ops);</div><div class='ctx'> </div><div class='del'>-static struct lock_class_key bridge_netdev_addr_lock_key;</div><div class='del'>-</div><div class='ctx'> /* net device transmit always called with BH disabled */</div><div class='ctx'> netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = pskb_may_pull_reason(skb, ETH_HLEN);</div><div class='add'>+	struct net_bridge_mcast_port *pmctx_null = NULL;</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct net_bridge_mcast *brmctx = &amp;br-&gt;multicast_ctx;</div><div class='ctx'> 	struct net_bridge_fdb_entry *dst;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mdst;</div><div class='del'>-	struct pcpu_sw_netstats *brstats = this_cpu_ptr(br-&gt;stats);</div><div class='ctx'> 	const struct nf_br_ops *nf_ops;</div><div class='add'>+	u8 state = BR_STATE_FORWARDING;</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='ctx'> 	const unsigned char *dest;</div><div class='del'>-	struct ethhdr *eth;</div><div class='ctx'> 	u16 vid = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(reason != SKB_NOT_DROPPED_YET)) {</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(struct br_input_skb_cb));</div><div class='add'>+	br_tc_skb_miss_set(skb, false);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	nf_ops = rcu_dereference(nf_br_ops);</div><div class='ctx'> 	if (nf_ops &amp;&amp; nf_ops-&gt;br_dev_xmit_hook(skb)) {</div><div class='hunk'>@@ -49,29 +56,27 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;brstats-&gt;syncp);</div><div class='del'>-	brstats-&gt;tx_packets++;</div><div class='del'>-	brstats-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;brstats-&gt;syncp);</div><div class='add'>+	dev_sw_netstats_tx_add(dev, 1, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	br_switchdev_frame_unmark(skb);</div><div class='ctx'> 	BR_INPUT_SKB_CB(skb)-&gt;brdev = dev;</div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;frag_max_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='del'>-	eth = eth_hdr(skb);</div><div class='ctx'> 	skb_pull(skb, ETH_HLEN);</div><div class='ctx'> </div><div class='del'>-	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &amp;vid))</div><div class='add'>+	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &amp;vid,</div><div class='add'>+				&amp;state, &amp;vlan))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_INET) &amp;&amp;</div><div class='del'>-	    (eth-&gt;h_proto == htons(ETH_P_ARP) ||</div><div class='del'>-	     eth-&gt;h_proto == htons(ETH_P_RARP)) &amp;&amp;</div><div class='del'>-	    br-&gt;neigh_suppress_enabled) {</div><div class='add'>+	    (eth_hdr(skb)-&gt;h_proto == htons(ETH_P_ARP) ||</div><div class='add'>+	     eth_hdr(skb)-&gt;h_proto == htons(ETH_P_RARP)) &amp;&amp;</div><div class='add'>+	    br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {</div><div class='ctx'> 		br_do_proxy_suppress_arp(skb, br, vid, NULL);</div><div class='ctx'> 	} else if (IS_ENABLED(CONFIG_IPV6) &amp;&amp;</div><div class='ctx'> 		   skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-		   br-&gt;neigh_suppress_enabled &amp;&amp;</div><div class='add'>+		   br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) &amp;&amp;</div><div class='ctx'> 		   pskb_may_pull(skb, sizeof(struct ipv6hdr) +</div><div class='ctx'> 				 sizeof(struct nd_msg)) &amp;&amp;</div><div class='ctx'> 		   ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_ICMPV6) {</div><div class='hunk'>@@ -84,69 +89,65 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dest = eth_hdr(skb)-&gt;h_dest;</div><div class='ctx'> 	if (is_broadcast_ether_addr(dest)) {</div><div class='del'>-		br_flood(br, skb, BR_PKT_BROADCAST, false, true);</div><div class='add'>+		br_flood(br, skb, BR_PKT_BROADCAST, false, true, vid);</div><div class='ctx'> 	} else if (is_multicast_ether_addr(dest)) {</div><div class='ctx'> 		if (unlikely(netpoll_tx_running(dev))) {</div><div class='del'>-			br_flood(br, skb, BR_PKT_MULTICAST, false, true);</div><div class='add'>+			br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (br_multicast_rcv(br, NULL, skb, vid)) {</div><div class='add'>+		if (br_multicast_rcv(&amp;brmctx, &amp;pmctx_null, vlan, skb, vid)) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mdst = br_mdb_get(br, skb, vid);</div><div class='add'>+		mdst = br_mdb_entry_skb_get(brmctx, skb, vid);</div><div class='ctx'> 		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &amp;&amp;</div><div class='del'>-		    br_multicast_querier_exists(br, eth_hdr(skb)))</div><div class='del'>-			br_multicast_flood(mdst, skb, false, true);</div><div class='add'>+		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))</div><div class='add'>+			br_multicast_flood(mdst, skb, brmctx, false, true);</div><div class='ctx'> 		else</div><div class='del'>-			br_flood(br, skb, BR_PKT_MULTICAST, false, true);</div><div class='add'>+			br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);</div><div class='ctx'> 	} else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {</div><div class='ctx'> 		br_forward(dst-&gt;dst, skb, false, true);</div><div class='ctx'> 	} else {</div><div class='del'>-		br_flood(br, skb, BR_PKT_UNICAST, false, true);</div><div class='add'>+		br_flood(br, skb, BR_PKT_UNICAST, false, true, vid);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_set_lockdep_class(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	lockdep_set_class(&amp;dev-&gt;addr_list_lock, &amp;bridge_netdev_addr_lock_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int br_dev_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	br-&gt;stats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!br-&gt;stats)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	err = br_fdb_hash_init(br);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_hash_init(br);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_percpu(br-&gt;stats);</div><div class='add'>+		br_fdb_hash_fini(br);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = br_vlan_init(br);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_percpu(br-&gt;stats);</div><div class='add'>+		br_mdb_hash_fini(br);</div><div class='ctx'> 		br_fdb_hash_fini(br);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = br_multicast_init_stats(br);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_percpu(br-&gt;stats);</div><div class='ctx'> 		br_vlan_flush(br);</div><div class='add'>+		br_mdb_hash_fini(br);</div><div class='ctx'> 		br_fdb_hash_fini(br);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='del'>-	br_set_lockdep_class(dev);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void br_dev_uninit(struct net_device *dev)</div><div class='hunk'>@@ -156,8 +157,8 @@ static void br_dev_uninit(struct net_device *dev)</div><div class='ctx'> 	br_multicast_dev_del(br);</div><div class='ctx'> 	br_multicast_uninit_stats(br);</div><div class='ctx'> 	br_vlan_flush(br);</div><div class='add'>+	br_mdb_hash_fini(br);</div><div class='ctx'> 	br_fdb_hash_fini(br);</div><div class='del'>-	free_percpu(br-&gt;stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int br_dev_open(struct net_device *dev)</div><div class='hunk'>@@ -169,6 +170,9 @@ static int br_dev_open(struct net_device *dev)</div><div class='ctx'> 	br_stp_enable_bridge(br);</div><div class='ctx'> 	br_multicast_open(br);</div><div class='ctx'> </div><div class='add'>+	if (br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		br_multicast_join_snoopers(br);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -189,46 +193,22 @@ static int br_dev_stop(struct net_device *dev)</div><div class='ctx'> 	br_stp_disable_bridge(br);</div><div class='ctx'> 	br_multicast_stop(br);</div><div class='ctx'> </div><div class='add'>+	if (br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		br_multicast_leave_snoopers(br);</div><div class='add'>+</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_get_stats64(struct net_device *dev,</div><div class='del'>-			   struct rtnl_link_stats64 *stats)</div><div class='del'>-{</div><div class='del'>-	struct net_bridge *br = netdev_priv(dev);</div><div class='del'>-	struct pcpu_sw_netstats tmp, sum = { 0 };</div><div class='del'>-	unsigned int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		unsigned int start;</div><div class='del'>-		const struct pcpu_sw_netstats *bstats</div><div class='del'>-			= per_cpu_ptr(br-&gt;stats, cpu);</div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;bstats-&gt;syncp);</div><div class='del'>-			memcpy(&amp;tmp, bstats, sizeof(tmp));</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;bstats-&gt;syncp, start));</div><div class='del'>-		sum.tx_bytes   += tmp.tx_bytes;</div><div class='del'>-		sum.tx_packets += tmp.tx_packets;</div><div class='del'>-		sum.rx_bytes   += tmp.rx_bytes;</div><div class='del'>-		sum.rx_packets += tmp.rx_packets;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_bytes   = sum.tx_bytes;</div><div class='del'>-	stats-&gt;tx_packets = sum.tx_packets;</div><div class='del'>-	stats-&gt;rx_bytes   = sum.rx_bytes;</div><div class='del'>-	stats-&gt;rx_packets = sum.rx_packets;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int br_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	/* this flag will be cleared if the MTU was automatically adjusted */</div><div class='del'>-	br-&gt;mtu_set_by_user = true;</div><div class='add'>+	br_opt_toggle(br, BROPT_MTU_SET_BY_USER, true);</div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	/* remember the MTU in the rtable for PMTU */</div><div class='ctx'> 	dst_metric_set(&amp;br-&gt;fake_rtable.dst, RTAX_MTU, new_mtu);</div><div class='hunk'>@@ -246,6 +226,12 @@ static int br_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='add'>+	/* dev_set_mac_addr() can be called by a master device on bridge's</div><div class='add'>+	 * NETDEV_UNREGISTER, but since it's being destroyed do nothing</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;reg_state != NETREG_REGISTERED)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;lock);</div><div class='ctx'> 	if (!ether_addr_equal(dev-&gt;dev_addr, addr-&gt;sa_data)) {</div><div class='ctx'> 		/* Mac address will be changed in br_stp_change_bridge_id(). */</div><div class='hunk'>@@ -258,10 +244,41 @@ static int br_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> </div><div class='ctx'> static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, "bridge", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, BR_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "N/A", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, "bridge", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, BR_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, "N/A", sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_get_link_ksettings(struct net_device *dev,</div><div class='add'>+				 struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;base.duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	cmd-&gt;base.port = PORT_OTHER;</div><div class='add'>+	cmd-&gt;base.speed = SPEED_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		struct ethtool_link_ksettings ecmd;</div><div class='add'>+		struct net_device *pdev = p-&gt;dev;</div><div class='add'>+</div><div class='add'>+		if (!netif_running(pdev) || !netif_oper_up(pdev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (__ethtool_get_link_ksettings(pdev, &amp;ecmd))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ecmd.base.speed == (__u32)SPEED_UNKNOWN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;base.speed == (__u32)SPEED_UNKNOWN ||</div><div class='add'>+		    cmd-&gt;base.speed &lt; ecmd.base.speed)</div><div class='add'>+			cmd-&gt;base.speed = ecmd.base.speed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_features_t br_fix_features(struct net_device *dev,</div><div class='hunk'>@@ -313,7 +330,7 @@ int br_netpoll_enable(struct net_bridge_port *p)</div><div class='ctx'> 	return __br_netpoll_enable(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)</div><div class='add'>+static int br_netpoll_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='hunk'>@@ -344,7 +361,7 @@ void br_netpoll_disable(struct net_bridge_port *p)</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;np = NULL;</div><div class='ctx'> </div><div class='del'>-	__netpoll_free_async(np);</div><div class='add'>+	__netpoll_free(np);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -365,9 +382,58 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)</div><div class='ctx'> 	return br_del_if(br, slave_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int br_fill_forward_path(struct net_device_path_ctx *ctx,</div><div class='add'>+				struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_fdb_entry *f;</div><div class='add'>+	struct net_bridge_port *dst;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_port(ctx-&gt;dev))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	br = netdev_priv(ctx-&gt;dev);</div><div class='add'>+</div><div class='add'>+	br_vlan_fill_forward_path_pvid(br, ctx, path);</div><div class='add'>+</div><div class='add'>+	f = br_fdb_find_rcu(br, ctx-&gt;daddr, path-&gt;bridge.vlan_id);</div><div class='add'>+	if (!f)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dst = READ_ONCE(f-&gt;dst);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_fill_forward_path_mode(br, dst, path))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	path-&gt;type = DEV_PATH_BRIDGE;</div><div class='add'>+	path-&gt;dev = dst-&gt;br-&gt;dev;</div><div class='add'>+	ctx-&gt;dev = dst-&gt;dev;</div><div class='add'>+</div><div class='add'>+	switch (path-&gt;bridge.vlan_mode) {</div><div class='add'>+	case DEV_PATH_BR_VLAN_TAG:</div><div class='add'>+		if (ctx-&gt;num_vlans &gt;= ARRAY_SIZE(ctx-&gt;vlan))</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		ctx-&gt;vlan[ctx-&gt;num_vlans].id = path-&gt;bridge.vlan_id;</div><div class='add'>+		ctx-&gt;vlan[ctx-&gt;num_vlans].proto = path-&gt;bridge.vlan_proto;</div><div class='add'>+		ctx-&gt;num_vlans++;</div><div class='add'>+		break;</div><div class='add'>+	case DEV_PATH_BR_VLAN_UNTAG_HW:</div><div class='add'>+	case DEV_PATH_BR_VLAN_UNTAG:</div><div class='add'>+		ctx-&gt;num_vlans--;</div><div class='add'>+		break;</div><div class='add'>+	case DEV_PATH_BR_VLAN_KEEP:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops br_ethtool_ops = {</div><div class='del'>-	.get_drvinfo    = br_getinfo,</div><div class='del'>-	.get_link	= ethtool_op_get_link,</div><div class='add'>+	.get_drvinfo		 = br_getinfo,</div><div class='add'>+	.get_link		 = ethtool_op_get_link,</div><div class='add'>+	.get_link_ksettings	 = br_get_link_ksettings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops br_netdev_ops = {</div><div class='hunk'>@@ -376,12 +442,12 @@ static const struct net_device_ops br_netdev_ops = {</div><div class='ctx'> 	.ndo_init		 = br_dev_init,</div><div class='ctx'> 	.ndo_uninit		 = br_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit		 = br_dev_xmit,</div><div class='del'>-	.ndo_get_stats64	 = br_get_stats64,</div><div class='add'>+	.ndo_get_stats64	 = dev_get_tstats64,</div><div class='ctx'> 	.ndo_set_mac_address	 = br_set_mac_address,</div><div class='ctx'> 	.ndo_set_rx_mode	 = br_dev_set_multicast_list,</div><div class='ctx'> 	.ndo_change_rx_flags	 = br_dev_change_rx_flags,</div><div class='ctx'> 	.ndo_change_mtu		 = br_change_mtu,</div><div class='del'>-	.ndo_do_ioctl		 = br_dev_ioctl,</div><div class='add'>+	.ndo_siocdevprivate	 = br_dev_siocdevprivate,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_netpoll_setup	 = br_netpoll_setup,</div><div class='ctx'> 	.ndo_netpoll_cleanup	 = br_netpoll_cleanup,</div><div class='hunk'>@@ -392,14 +458,22 @@ static const struct net_device_ops br_netdev_ops = {</div><div class='ctx'> 	.ndo_fix_features        = br_fix_features,</div><div class='ctx'> 	.ndo_fdb_add		 = br_fdb_add,</div><div class='ctx'> 	.ndo_fdb_del		 = br_fdb_delete,</div><div class='add'>+	.ndo_fdb_del_bulk	 = br_fdb_delete_bulk,</div><div class='ctx'> 	.ndo_fdb_dump		 = br_fdb_dump,</div><div class='add'>+	.ndo_fdb_get		 = br_fdb_get,</div><div class='add'>+	.ndo_mdb_add		 = br_mdb_add,</div><div class='add'>+	.ndo_mdb_del		 = br_mdb_del,</div><div class='add'>+	.ndo_mdb_del_bulk	 = br_mdb_del_bulk,</div><div class='add'>+	.ndo_mdb_dump		 = br_mdb_dump,</div><div class='add'>+	.ndo_mdb_get		 = br_mdb_get,</div><div class='ctx'> 	.ndo_bridge_getlink	 = br_getlink,</div><div class='ctx'> 	.ndo_bridge_setlink	 = br_setlink,</div><div class='ctx'> 	.ndo_bridge_dellink	 = br_dellink,</div><div class='ctx'> 	.ndo_features_check	 = passthru_features_check,</div><div class='add'>+	.ndo_fill_forward_path	 = br_fill_forward_path,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct device_type br_type = {</div><div class='add'>+static const struct device_type br_type = {</div><div class='ctx'> 	.name	= "bridge",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -415,17 +489,27 @@ void br_dev_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;br_ethtool_ops;</div><div class='ctx'> 	SET_NETDEV_DEVTYPE(dev, &amp;br_type);</div><div class='ctx'> 	dev-&gt;priv_flags = IFF_EBRIDGE | IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;features = COMMON_FEATURES | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL |</div><div class='del'>-			NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;</div><div class='add'>+	dev-&gt;features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX |</div><div class='add'>+			NETIF_F_HW_VLAN_STAG_TX;</div><div class='ctx'> 	dev-&gt;hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX |</div><div class='ctx'> 			   NETIF_F_HW_VLAN_STAG_TX;</div><div class='ctx'> 	dev-&gt;vlan_features = COMMON_FEATURES;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> </div><div class='ctx'> 	br-&gt;dev = dev;</div><div class='ctx'> 	spin_lock_init(&amp;br-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;br-&gt;port_list);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;br-&gt;fdb_list);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;br-&gt;frame_type_list);</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_MRP)</div><div class='add'>+	INIT_HLIST_HEAD(&amp;br-&gt;mrp_list);</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_CFM)</div><div class='add'>+	INIT_HLIST_HEAD(&amp;br-&gt;mep_list);</div><div class='add'>+#endif</div><div class='ctx'> 	spin_lock_init(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	br-&gt;bridge_id.prio[0] = 0x80;</div><div class='head'>diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c<br/>index 502f66349530..58d22e2b85fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_fdb.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_fdb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_fdb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_fdb.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Forwarding database</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -22,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> #include &lt;trace/events/bridge.h&gt;</div><div class='hunk'>@@ -33,21 +29,13 @@ static const struct rhashtable_params br_fdb_rht_params = {</div><div class='ctx'> 	.key_offset = offsetof(struct net_bridge_fdb_entry, key),</div><div class='ctx'> 	.key_len = sizeof(struct net_bridge_fdb_key),</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='del'>-	.locks_mul = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *br_fdb_cache __read_mostly;</div><div class='del'>-static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		      const unsigned char *addr, u16 vid);</div><div class='del'>-static void fdb_notify(struct net_bridge *br,</div><div class='del'>-		       const struct net_bridge_fdb_entry *, int, bool);</div><div class='ctx'> </div><div class='ctx'> int __init br_fdb_init(void)</div><div class='ctx'> {</div><div class='del'>-	br_fdb_cache = kmem_cache_create("bridge_fdb_cache",</div><div class='del'>-					 sizeof(struct net_bridge_fdb_entry),</div><div class='del'>-					 0,</div><div class='del'>-					 SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	br_fdb_cache = KMEM_CACHE(net_bridge_fdb_entry, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!br_fdb_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -80,15 +68,138 @@ static inline unsigned long hold_time(const struct net_bridge *br)</div><div class='ctx'> static inline int has_expired(const struct net_bridge *br,</div><div class='ctx'> 				  const struct net_bridge_fdb_entry *fdb)</div><div class='ctx'> {</div><div class='del'>-	return !fdb-&gt;is_static &amp;&amp; !fdb-&gt;added_by_external_learn &amp;&amp;</div><div class='del'>-		time_before_eq(fdb-&gt;updated + hold_time(br), jiffies);</div><div class='add'>+	return !test_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags) &amp;&amp;</div><div class='add'>+	       !test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;fdb-&gt;flags) &amp;&amp;</div><div class='add'>+	       time_before_eq(fdb-&gt;updated + hold_time(br), jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fdb_rcu_free(struct rcu_head *head)</div><div class='add'>+static int fdb_to_nud(const struct net_bridge *br,</div><div class='add'>+		      const struct net_bridge_fdb_entry *fdb)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_fdb_entry *ent</div><div class='del'>-		= container_of(head, struct net_bridge_fdb_entry, rcu);</div><div class='del'>-	kmem_cache_free(br_fdb_cache, ent);</div><div class='add'>+	if (test_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags))</div><div class='add'>+		return NUD_PERMANENT;</div><div class='add'>+	else if (test_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags))</div><div class='add'>+		return NUD_NOARP;</div><div class='add'>+	else if (has_expired(br, fdb))</div><div class='add'>+		return NUD_STALE;</div><div class='add'>+	else</div><div class='add'>+		return NUD_REACHABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,</div><div class='add'>+			 const struct net_bridge_fdb_entry *fdb,</div><div class='add'>+			 u32 portid, u32 seq, int type, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge_port *dst = READ_ONCE(fdb-&gt;dst);</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	struct nda_cacheinfo ci;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+	u32 ext_flags = 0;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, portid, seq, type, sizeof(*ndm), flags);</div><div class='add'>+	if (nlh == NULL)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_data(nlh);</div><div class='add'>+	ndm-&gt;ndm_family	 = AF_BRIDGE;</div><div class='add'>+	ndm-&gt;ndm_pad1    = 0;</div><div class='add'>+	ndm-&gt;ndm_pad2    = 0;</div><div class='add'>+	ndm-&gt;ndm_flags	 = 0;</div><div class='add'>+	ndm-&gt;ndm_type	 = 0;</div><div class='add'>+	ndm-&gt;ndm_ifindex = dst ? dst-&gt;dev-&gt;ifindex : br-&gt;dev-&gt;ifindex;</div><div class='add'>+	ndm-&gt;ndm_state   = fdb_to_nud(br, fdb);</div><div class='add'>+</div><div class='add'>+	if (test_bit(BR_FDB_OFFLOADED, &amp;fdb-&gt;flags))</div><div class='add'>+		ndm-&gt;ndm_flags |= NTF_OFFLOADED;</div><div class='add'>+	if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;fdb-&gt;flags))</div><div class='add'>+		ndm-&gt;ndm_flags |= NTF_EXT_LEARNED;</div><div class='add'>+	if (test_bit(BR_FDB_STICKY, &amp;fdb-&gt;flags))</div><div class='add'>+		ndm-&gt;ndm_flags |= NTF_STICKY;</div><div class='add'>+	if (test_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags))</div><div class='add'>+		ext_flags |= NTF_EXT_LOCKED;</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, NDA_LLADDR, ETH_ALEN, &amp;fdb-&gt;key.addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(skb, NDA_MASTER, br-&gt;dev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(skb, NDA_FLAGS_EXT, ext_flags))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	ci.ndm_used	 = jiffies_to_clock_t(now - fdb-&gt;used);</div><div class='add'>+	ci.ndm_confirmed = 0;</div><div class='add'>+	ci.ndm_updated	 = jiffies_to_clock_t(now - fdb-&gt;updated);</div><div class='add'>+	ci.ndm_refcnt	 = 0;</div><div class='add'>+	if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &amp;ci))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (fdb-&gt;key.vlan_id &amp;&amp; nla_put(skb, NDA_VLAN, sizeof(u16),</div><div class='add'>+					&amp;fdb-&gt;key.vlan_id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BR_FDB_NOTIFY, &amp;fdb-&gt;flags)) {</div><div class='add'>+		struct nlattr *nest = nla_nest_start(skb, NDA_FDB_EXT_ATTRS);</div><div class='add'>+		u8 notify_bits = FDB_NOTIFY_BIT;</div><div class='add'>+</div><div class='add'>+		if (!nest)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (test_bit(BR_FDB_NOTIFY_INACTIVE, &amp;fdb-&gt;flags))</div><div class='add'>+			notify_bits |= FDB_NOTIFY_INACTIVE_BIT;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(skb, NFEA_ACTIVITY_NOTIFY, notify_bits)) {</div><div class='add'>+			nla_nest_cancel(skb, nest);</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_cancel(skb, nlh);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t fdb_nlmsg_size(void)</div><div class='add'>+{</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct ndmsg))</div><div class='add'>+		+ nla_total_size(ETH_ALEN) /* NDA_LLADDR */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* NDA_MASTER */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* NDA_FLAGS_EXT */</div><div class='add'>+		+ nla_total_size(sizeof(u16)) /* NDA_VLAN */</div><div class='add'>+		+ nla_total_size(sizeof(struct nda_cacheinfo))</div><div class='add'>+		+ nla_total_size(0) /* NDA_FDB_EXT_ATTRS */</div><div class='add'>+		+ nla_total_size(sizeof(u8)); /* NFEA_ACTIVITY_NOTIFY */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fdb_notify(struct net_bridge *br,</div><div class='add'>+		       const struct net_bridge_fdb_entry *fdb, int type,</div><div class='add'>+		       bool swdev_notify)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net(br-&gt;dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (swdev_notify)</div><div class='add'>+		br_switchdev_fdb_notify(br, fdb, type);</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);</div><div class='add'>+	if (skb == NULL)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);</div><div class='add'>+	return;</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_bridge_fdb_entry *fdb_find_rcu(struct rhashtable *tbl,</div><div class='hunk'>@@ -202,17 +313,24 @@ static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f,</div><div class='ctx'> {</div><div class='ctx'> 	trace_fdb_delete(br, f);</div><div class='ctx'> </div><div class='del'>-	if (f-&gt;is_static)</div><div class='add'>+	if (test_bit(BR_FDB_STATIC, &amp;f-&gt;flags))</div><div class='ctx'> 		fdb_del_hw_addr(br, f-&gt;key.addr.addr);</div><div class='ctx'> </div><div class='ctx'> 	hlist_del_init_rcu(&amp;f-&gt;fdb_node);</div><div class='ctx'> 	rhashtable_remove_fast(&amp;br-&gt;fdb_hash_tbl, &amp;f-&gt;rhnode,</div><div class='ctx'> 			       br_fdb_rht_params);</div><div class='add'>+	if (test_and_clear_bit(BR_FDB_DYNAMIC_LEARNED, &amp;f-&gt;flags))</div><div class='add'>+		atomic_dec(&amp;br-&gt;fdb_n_learned);</div><div class='ctx'> 	fdb_notify(br, f, RTM_DELNEIGH, swdev_notify);</div><div class='del'>-	call_rcu(&amp;f-&gt;rcu, fdb_rcu_free);</div><div class='add'>+	kfree_rcu(f, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Delete a local entry if no other port had the same address. */</div><div class='add'>+/* Delete a local entry if no other port had the same address.</div><div class='add'>+ *</div><div class='add'>+ * This function should only be called on entries with BR_FDB_LOCAL set,</div><div class='add'>+ * so even with BR_FDB_ADDED_BY_USER cleared we never need to increase</div><div class='add'>+ * the accounting for dynamically learned entries again.</div><div class='add'>+ */</div><div class='ctx'> static void fdb_delete_local(struct net_bridge *br,</div><div class='ctx'> 			     const struct net_bridge_port *p,</div><div class='ctx'> 			     struct net_bridge_fdb_entry *f)</div><div class='hunk'>@@ -229,7 +347,7 @@ static void fdb_delete_local(struct net_bridge *br,</div><div class='ctx'> 		if (op != p &amp;&amp; ether_addr_equal(op-&gt;dev-&gt;dev_addr, addr) &amp;&amp;</div><div class='ctx'> 		    (!vid || br_vlan_find(vg, vid))) {</div><div class='ctx'> 			f-&gt;dst = op;</div><div class='del'>-			f-&gt;added_by_user = 0;</div><div class='add'>+			clear_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -240,7 +358,7 @@ static void fdb_delete_local(struct net_bridge *br,</div><div class='ctx'> 	if (p &amp;&amp; ether_addr_equal(br-&gt;dev-&gt;dev_addr, addr) &amp;&amp;</div><div class='ctx'> 	    (!vid || (v &amp;&amp; br_vlan_should_use(v)))) {</div><div class='ctx'> 		f-&gt;dst = NULL;</div><div class='del'>-		f-&gt;added_by_user = 0;</div><div class='add'>+		clear_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -255,39 +373,118 @@ void br_fdb_find_delete_local(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> 	f = br_fdb_find(br, addr, vid);</div><div class='del'>-	if (f &amp;&amp; f-&gt;is_local &amp;&amp; !f-&gt;added_by_user &amp;&amp; f-&gt;dst == p)</div><div class='add'>+	if (f &amp;&amp; test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags) &amp;&amp; f-&gt;dst == p)</div><div class='ctx'> 		fdb_delete_local(br, p, f);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,</div><div class='add'>+					       struct net_bridge_port *source,</div><div class='add'>+					       const unsigned char *addr,</div><div class='add'>+					       __u16 vid,</div><div class='add'>+					       unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	bool learned = !test_bit(BR_FDB_ADDED_BY_USER, &amp;flags) &amp;&amp;</div><div class='add'>+		       !test_bit(BR_FDB_LOCAL, &amp;flags);</div><div class='add'>+	u32 max_learned = READ_ONCE(br-&gt;fdb_max_learned);</div><div class='add'>+	struct net_bridge_fdb_entry *fdb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (likely(learned)) {</div><div class='add'>+		int n_learned = atomic_read(&amp;br-&gt;fdb_n_learned);</div><div class='add'>+</div><div class='add'>+		if (unlikely(max_learned &amp;&amp; n_learned &gt;= max_learned))</div><div class='add'>+			return NULL;</div><div class='add'>+		__set_bit(BR_FDB_DYNAMIC_LEARNED, &amp;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);</div><div class='add'>+	if (!fdb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(fdb-&gt;key.addr.addr, addr, ETH_ALEN);</div><div class='add'>+	WRITE_ONCE(fdb-&gt;dst, source);</div><div class='add'>+	fdb-&gt;key.vlan_id = vid;</div><div class='add'>+	fdb-&gt;flags = flags;</div><div class='add'>+	fdb-&gt;updated = fdb-&gt;used = jiffies;</div><div class='add'>+	err = rhashtable_lookup_insert_fast(&amp;br-&gt;fdb_hash_tbl, &amp;fdb-&gt;rhnode,</div><div class='add'>+					    br_fdb_rht_params);</div><div class='add'>+	if (err) {</div><div class='add'>+		kmem_cache_free(br_fdb_cache, fdb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(learned))</div><div class='add'>+		atomic_inc(&amp;br-&gt;fdb_n_learned);</div><div class='add'>+</div><div class='add'>+	hlist_add_head_rcu(&amp;fdb-&gt;fdb_node, &amp;br-&gt;fdb_list);</div><div class='add'>+</div><div class='add'>+	return fdb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,</div><div class='add'>+			 const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_fdb_entry *fdb;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fdb = br_fdb_find(br, addr, vid);</div><div class='add'>+	if (fdb) {</div><div class='add'>+		/* it is okay to have multiple ports with same</div><div class='add'>+		 * address, just use the first one.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags))</div><div class='add'>+			return 0;</div><div class='add'>+		br_warn(br, "adding interface %s with same address as a received packet (addr:%pM, vlan:%u)\n",</div><div class='add'>+			source ? source-&gt;dev-&gt;name : br-&gt;dev-&gt;name, addr, vid);</div><div class='add'>+		fdb_delete(br, fdb, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fdb = fdb_create(br, source, addr, vid,</div><div class='add'>+			 BIT(BR_FDB_LOCAL) | BIT(BR_FDB_STATIC));</div><div class='add'>+	if (!fdb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fdb_add_hw_addr(br, addr);</div><div class='add'>+	fdb_notify(br, fdb, RTM_NEWNEIGH, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_fdb_entry *f;</div><div class='ctx'> 	struct net_bridge *br = p-&gt;br;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='add'>+	bool local_vlan_0;</div><div class='add'>+</div><div class='add'>+	local_vlan_0 = br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> 	vg = nbp_vlan_group(p);</div><div class='ctx'> 	hlist_for_each_entry(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='del'>-		if (f-&gt;dst == p &amp;&amp; f-&gt;is_local &amp;&amp; !f-&gt;added_by_user) {</div><div class='add'>+		if (f-&gt;dst == p &amp;&amp; test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags)) {</div><div class='ctx'> 			/* delete old one */</div><div class='ctx'> 			fdb_delete_local(br, p, f);</div><div class='ctx'> </div><div class='del'>-			/* if this port has no vlan information</div><div class='del'>-			 * configured, we can safely be done at</div><div class='del'>-			 * this point.</div><div class='add'>+			/* if this port has no vlan information configured, or</div><div class='add'>+			 * local entries are only kept on VLAN 0, we can safely</div><div class='add'>+			 * be done at this point.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!vg || !vg-&gt;num_vlans)</div><div class='add'>+			if (!vg || !vg-&gt;num_vlans || local_vlan_0)</div><div class='ctx'> 				goto insert;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> insert:</div><div class='ctx'> 	/* insert new address,  may fail if invalid address or dup. */</div><div class='del'>-	fdb_insert(br, p, newaddr, 0);</div><div class='add'>+	fdb_add_local(br, p, newaddr, 0);</div><div class='ctx'> </div><div class='del'>-	if (!vg || !vg-&gt;num_vlans)</div><div class='add'>+	if (!vg || !vg-&gt;num_vlans || local_vlan_0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* Now add entries for every VLAN configured on the port.</div><div class='hunk'>@@ -295,7 +492,7 @@ insert:</div><div class='ctx'> 	 * from under us.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist)</div><div class='del'>-		fdb_insert(br, p, newaddr, v-&gt;vid);</div><div class='add'>+		fdb_add_local(br, p, newaddr, v-&gt;vid);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='hunk'>@@ -306,17 +503,21 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr)</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_fdb_entry *f;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='add'>+	bool local_vlan_0;</div><div class='add'>+</div><div class='add'>+	local_vlan_0 = br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* If old entry was unassociated with any port, then delete it. */</div><div class='ctx'> 	f = br_fdb_find(br, br-&gt;dev-&gt;dev_addr, 0);</div><div class='del'>-	if (f &amp;&amp; f-&gt;is_local &amp;&amp; !f-&gt;dst &amp;&amp; !f-&gt;added_by_user)</div><div class='add'>+	if (f &amp;&amp; test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags) &amp;&amp;</div><div class='add'>+	    !f-&gt;dst &amp;&amp; !test_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags))</div><div class='ctx'> 		fdb_delete_local(br, NULL, f);</div><div class='ctx'> </div><div class='del'>-	fdb_insert(br, NULL, newaddr, 0);</div><div class='add'>+	fdb_add_local(br, NULL, newaddr, 0);</div><div class='ctx'> 	vg = br_vlan_group(br);</div><div class='del'>-	if (!vg || !vg-&gt;num_vlans)</div><div class='add'>+	if (!vg || !vg-&gt;num_vlans || local_vlan_0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* Now remove and add entries for every VLAN configured on the</div><div class='ctx'> 	 * bridge.  This function runs under RTNL so the bitmap will not</div><div class='hunk'>@@ -326,9 +527,10 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr)</div><div class='ctx'> 		if (!br_vlan_should_use(v))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		f = br_fdb_find(br, br-&gt;dev-&gt;dev_addr, v-&gt;vid);</div><div class='del'>-		if (f &amp;&amp; f-&gt;is_local &amp;&amp; !f-&gt;dst &amp;&amp; !f-&gt;added_by_user)</div><div class='add'>+		if (f &amp;&amp; test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags) &amp;&amp;</div><div class='add'>+		    !f-&gt;dst &amp;&amp; !test_bit(BR_FDB_ADDED_BY_USER, &amp;f-&gt;flags))</div><div class='ctx'> 			fdb_delete_local(br, NULL, f);</div><div class='del'>-		fdb_insert(br, NULL, newaddr, v-&gt;vid);</div><div class='add'>+		fdb_add_local(br, NULL, newaddr, v-&gt;vid);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='hunk'>@@ -349,11 +551,21 @@ void br_fdb_cleanup(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='del'>-		unsigned long this_timer;</div><div class='del'>-</div><div class='del'>-		if (f-&gt;is_static || f-&gt;added_by_external_learn)</div><div class='add'>+		unsigned long this_timer = f-&gt;updated + delay;</div><div class='add'>+</div><div class='add'>+		if (test_bit(BR_FDB_STATIC, &amp;f-&gt;flags) ||</div><div class='add'>+		    test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;f-&gt;flags)) {</div><div class='add'>+			if (test_bit(BR_FDB_NOTIFY, &amp;f-&gt;flags)) {</div><div class='add'>+				if (time_after(this_timer, now))</div><div class='add'>+					work_delay = min(work_delay,</div><div class='add'>+							 this_timer - now);</div><div class='add'>+				else if (!test_and_set_bit(BR_FDB_NOTIFY_INACTIVE,</div><div class='add'>+							   &amp;f-&gt;flags))</div><div class='add'>+					fdb_notify(br, f, RTM_NEWNEIGH, false);</div><div class='add'>+			}</div><div class='ctx'> 			continue;</div><div class='del'>-		this_timer = f-&gt;updated + delay;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (time_after(this_timer, now)) {</div><div class='ctx'> 			work_delay = min(work_delay, this_timer - now);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -370,18 +582,276 @@ void br_fdb_cleanup(struct work_struct *work)</div><div class='ctx'> 	mod_delayed_work(system_long_wq, &amp;br-&gt;gc_work, work_delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Completely flush all dynamic entries in forwarding database.*/</div><div class='del'>-void br_fdb_flush(struct net_bridge *br)</div><div class='add'>+static void br_fdb_delete_locals_per_vlan_port(struct net_bridge *br,</div><div class='add'>+					       struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+		dev = p-&gt;dev;</div><div class='add'>+	} else {</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+		dev = br-&gt;dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist)</div><div class='add'>+		br_fdb_find_delete_local(br, p, dev-&gt;dev_addr, v-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_fdb_delete_locals_per_vlan(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list)</div><div class='add'>+		br_fdb_delete_locals_per_vlan_port(br, p);</div><div class='add'>+</div><div class='add'>+	br_fdb_delete_locals_per_vlan_port(br, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_fdb_insert_locals_per_vlan_port(struct net_bridge *br,</div><div class='add'>+					      struct net_bridge_port *p,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+		dev = p-&gt;dev;</div><div class='add'>+	} else {</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+		dev = br-&gt;dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (!br_vlan_should_use(v))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = br_fdb_add_local(br, p, dev-&gt;dev_addr, v-&gt;vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_fdb_insert_locals_per_vlan(struct net_bridge *br,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		err = br_fdb_insert_locals_per_vlan_port(br, p, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = br_fdb_insert_locals_per_vlan_port(br, NULL, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto rollback;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "fdb_local_vlan_0 toggle: FDB entry insertion failed");</div><div class='add'>+	br_fdb_delete_locals_per_vlan(br);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_fdb_toggle_local_vlan_0(struct net_bridge *br, bool on,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!on)</div><div class='add'>+		return br_fdb_insert_locals_per_vlan(br, extack);</div><div class='add'>+</div><div class='add'>+	br_fdb_delete_locals_per_vlan(br);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __fdb_flush_matches(const struct net_bridge *br,</div><div class='add'>+				const struct net_bridge_fdb_entry *f,</div><div class='add'>+				const struct net_bridge_fdb_flush_desc *desc)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge_port *dst = READ_ONCE(f-&gt;dst);</div><div class='add'>+	int port_ifidx = dst ? dst-&gt;dev-&gt;ifindex : br-&gt;dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;vlan_id &amp;&amp; desc-&gt;vlan_id != f-&gt;key.vlan_id)</div><div class='add'>+		return false;</div><div class='add'>+	if (desc-&gt;port_ifindex &amp;&amp; desc-&gt;port_ifindex != port_ifidx)</div><div class='add'>+		return false;</div><div class='add'>+	if (desc-&gt;flags_mask &amp;&amp; (f-&gt;flags &amp; desc-&gt;flags_mask) != desc-&gt;flags)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Flush forwarding database entries matching the description */</div><div class='add'>+void br_fdb_flush(struct net_bridge *br,</div><div class='add'>+		  const struct net_bridge_fdb_flush_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_fdb_entry *f;</div><div class='del'>-	struct hlist_node *tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='del'>-	hlist_for_each_entry_safe(f, tmp, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='del'>-		if (!f-&gt;is_static)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='add'>+		if (!__fdb_flush_matches(br, f, desc))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='add'>+		if (!hlist_unhashed(&amp;f-&gt;fdb_node))</div><div class='ctx'> 			fdb_delete(br, f, true);</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __ndm_state_to_fdb_flags(u16 ndm_state)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	if (ndm_state &amp; NUD_PERMANENT)</div><div class='add'>+		__set_bit(BR_FDB_LOCAL, &amp;flags);</div><div class='add'>+	if (ndm_state &amp; NUD_NOARP)</div><div class='add'>+		__set_bit(BR_FDB_STATIC, &amp;flags);</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __ndm_flags_to_fdb_flags(u8 ndm_flags)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	if (ndm_flags &amp; NTF_USE)</div><div class='add'>+		__set_bit(BR_FDB_ADDED_BY_USER, &amp;flags);</div><div class='add'>+	if (ndm_flags &amp; NTF_EXT_LEARNED)</div><div class='add'>+		__set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;flags);</div><div class='add'>+	if (ndm_flags &amp; NTF_OFFLOADED)</div><div class='add'>+		__set_bit(BR_FDB_OFFLOADED, &amp;flags);</div><div class='add'>+	if (ndm_flags &amp; NTF_STICKY)</div><div class='add'>+		__set_bit(BR_FDB_STICKY, &amp;flags);</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __fdb_flush_validate_ifindex(const struct net_bridge *br,</div><div class='add'>+					int ifindex,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = __dev_get_by_index(dev_net(br-&gt;dev), ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unknown flush device ifindex");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	if (!netif_is_bridge_master(dev) &amp;&amp; !netif_is_bridge_port(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Flush device is not a bridge or bridge port");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (netif_is_bridge_master(dev) &amp;&amp; dev != br-&gt;dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Flush bridge device does not match target bridge device");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (netif_is_bridge_port(dev)) {</div><div class='add'>+		struct net_bridge_port *p = br_port_get_rtnl(dev);</div><div class='add'>+</div><div class='add'>+		if (p-&gt;br != br) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_fdb_del_bulk_policy[NDA_MAX + 1] = {</div><div class='add'>+	[NDA_VLAN]	= NLA_POLICY_RANGE(NLA_U16, 1, VLAN_N_VID - 2),</div><div class='add'>+	[NDA_IFINDEX]	= NLA_POLICY_MIN(NLA_S32, 1),</div><div class='add'>+	[NDA_NDM_STATE_MASK]	= { .type = NLA_U16 },</div><div class='add'>+	[NDA_NDM_FLAGS_MASK]	= { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_fdb_delete_bulk(struct nlmsghdr *nlh, struct net_device *dev,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_fdb_flush_desc desc = {};</div><div class='add'>+	struct ndmsg *ndm = nlmsg_data(nlh);</div><div class='add'>+	struct net_bridge_port *p = NULL;</div><div class='add'>+	struct nlattr *tb[NDA_MAX + 1];</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	u8 ndm_flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ndm_flags = ndm-&gt;ndm_flags &amp; ~FDB_FLUSH_IGNORED_NDM_FLAGS;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX,</div><div class='add'>+			  br_fdb_del_bulk_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='add'>+		br = netdev_priv(dev);</div><div class='add'>+	} else {</div><div class='add'>+		p = br_port_get_rtnl(dev);</div><div class='add'>+		if (!p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge port");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		br = p-&gt;br;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NDA_VLAN])</div><div class='add'>+		desc.vlan_id = nla_get_u16(tb[NDA_VLAN]);</div><div class='add'>+</div><div class='add'>+	if (ndm_flags &amp; ~FDB_FLUSH_ALLOWED_NDM_FLAGS) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported fdb flush ndm flag bits set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ndm-&gt;ndm_state &amp; ~FDB_FLUSH_ALLOWED_NDM_STATES) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported fdb flush ndm state bits set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc.flags |= __ndm_state_to_fdb_flags(ndm-&gt;ndm_state);</div><div class='add'>+	desc.flags |= __ndm_flags_to_fdb_flags(ndm_flags);</div><div class='add'>+	if (tb[NDA_NDM_STATE_MASK]) {</div><div class='add'>+		u16 ndm_state_mask = nla_get_u16(tb[NDA_NDM_STATE_MASK]);</div><div class='add'>+</div><div class='add'>+		desc.flags_mask |= __ndm_state_to_fdb_flags(ndm_state_mask);</div><div class='add'>+	}</div><div class='add'>+	if (tb[NDA_NDM_FLAGS_MASK]) {</div><div class='add'>+		u8 ndm_flags_mask = nla_get_u8(tb[NDA_NDM_FLAGS_MASK]);</div><div class='add'>+</div><div class='add'>+		desc.flags_mask |= __ndm_flags_to_fdb_flags(ndm_flags_mask);</div><div class='add'>+	}</div><div class='add'>+	if (tb[NDA_IFINDEX]) {</div><div class='add'>+		int ifidx = nla_get_s32(tb[NDA_IFINDEX]);</div><div class='add'>+</div><div class='add'>+		err = __fdb_flush_validate_ifindex(br, ifidx, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		desc.port_ifindex = ifidx;</div><div class='add'>+	} else if (p) {</div><div class='add'>+		/* flush was invoked with port device and NTF_MASTER */</div><div class='add'>+		desc.port_ifindex = p-&gt;dev-&gt;ifindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_debug(br, "flushing port ifindex: %d vlan id: %u flags: 0x%lx flags mask: 0x%lx\n",</div><div class='add'>+		 desc.port_ifindex, desc.vlan_id, desc.flags, desc.flags_mask);</div><div class='add'>+</div><div class='add'>+	br_fdb_flush(br, &amp;desc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Flush all entries referring to a specific port.</div><div class='hunk'>@@ -402,10 +872,13 @@ void br_fdb_delete_by_port(struct net_bridge *br,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!do_all)</div><div class='del'>-			if (f-&gt;is_static || (vid &amp;&amp; f-&gt;key.vlan_id != vid))</div><div class='add'>+			if (test_bit(BR_FDB_STATIC, &amp;f-&gt;flags) ||</div><div class='add'>+			    (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;f-&gt;flags) &amp;&amp;</div><div class='add'>+			     !test_bit(BR_FDB_OFFLOADED, &amp;f-&gt;flags)) ||</div><div class='add'>+			    (vid &amp;&amp; f-&gt;key.vlan_id != vid))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-		if (f-&gt;is_local)</div><div class='add'>+		if (test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags))</div><div class='ctx'> 			fdb_delete_local(br, p, f);</div><div class='ctx'> 		else</div><div class='ctx'> 			fdb_delete(br, f, true);</div><div class='hunk'>@@ -427,9 +900,14 @@ int br_fdb_test_addr(struct net_device *dev, unsigned char *addr)</div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	else {</div><div class='add'>+		const struct net_bridge_port *dst = NULL;</div><div class='add'>+</div><div class='ctx'> 		fdb = br_fdb_find_rcu(port-&gt;br, addr, 0);</div><div class='del'>-		ret = fdb &amp;&amp; fdb-&gt;dst &amp;&amp; fdb-&gt;dst-&gt;dev != dev &amp;&amp;</div><div class='del'>-			fdb-&gt;dst-&gt;state == BR_STATE_FORWARDING;</div><div class='add'>+		if (fdb)</div><div class='add'>+			dst = READ_ONCE(fdb-&gt;dst);</div><div class='add'>+</div><div class='add'>+		ret = dst &amp;&amp; dst-&gt;dev != dev &amp;&amp;</div><div class='add'>+		      dst-&gt;state == BR_STATE_FORWARDING;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -474,8 +952,8 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,</div><div class='ctx'> 		fe-&gt;port_no = f-&gt;dst-&gt;port_no;</div><div class='ctx'> 		fe-&gt;port_hi = f-&gt;dst-&gt;port_no &gt;&gt; 8;</div><div class='ctx'> </div><div class='del'>-		fe-&gt;is_local = f-&gt;is_local;</div><div class='del'>-		if (!f-&gt;is_static)</div><div class='add'>+		fe-&gt;is_local = test_bit(BR_FDB_LOCAL, &amp;f-&gt;flags);</div><div class='add'>+		if (!test_bit(BR_FDB_STATIC, &amp;f-&gt;flags))</div><div class='ctx'> 			fe-&gt;ageing_timer_value = jiffies_delta_to_clock_t(jiffies - f-&gt;updated);</div><div class='ctx'> 		++fe;</div><div class='ctx'> 		++num;</div><div class='hunk'>@@ -485,129 +963,84 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,</div><div class='del'>-					       struct net_bridge_port *source,</div><div class='del'>-					       const unsigned char *addr,</div><div class='del'>-					       __u16 vid,</div><div class='del'>-					       unsigned char is_local,</div><div class='del'>-					       unsigned char is_static)</div><div class='del'>-{</div><div class='del'>-	struct net_bridge_fdb_entry *fdb;</div><div class='del'>-</div><div class='del'>-	fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);</div><div class='del'>-	if (fdb) {</div><div class='del'>-		memcpy(fdb-&gt;key.addr.addr, addr, ETH_ALEN);</div><div class='del'>-		fdb-&gt;dst = source;</div><div class='del'>-		fdb-&gt;key.vlan_id = vid;</div><div class='del'>-		fdb-&gt;is_local = is_local;</div><div class='del'>-		fdb-&gt;is_static = is_static;</div><div class='del'>-		fdb-&gt;added_by_user = 0;</div><div class='del'>-		fdb-&gt;added_by_external_learn = 0;</div><div class='del'>-		fdb-&gt;offloaded = 0;</div><div class='del'>-		fdb-&gt;updated = fdb-&gt;used = jiffies;</div><div class='del'>-		if (rhashtable_lookup_insert_fast(&amp;br-&gt;fdb_hash_tbl,</div><div class='del'>-						  &amp;fdb-&gt;rhnode,</div><div class='del'>-						  br_fdb_rht_params)) {</div><div class='del'>-			kmem_cache_free(br_fdb_cache, fdb);</div><div class='del'>-			fdb = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			hlist_add_head_rcu(&amp;fdb-&gt;fdb_node, &amp;br-&gt;fdb_list);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return fdb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		  const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct net_bridge_fdb_entry *fdb;</div><div class='del'>-</div><div class='del'>-	if (!is_valid_ether_addr(addr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	fdb = br_fdb_find(br, addr, vid);</div><div class='del'>-	if (fdb) {</div><div class='del'>-		/* it is okay to have multiple ports with same</div><div class='del'>-		 * address, just use the first one.</div><div class='del'>-		 */</div><div class='del'>-		if (fdb-&gt;is_local)</div><div class='del'>-			return 0;</div><div class='del'>-		br_warn(br, "adding interface %s with same address as a received packet (addr:%pM, vlan:%u)\n",</div><div class='del'>-		       source ? source-&gt;dev-&gt;name : br-&gt;dev-&gt;name, addr, vid);</div><div class='del'>-		fdb_delete(br, fdb, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fdb = fdb_create(br, source, addr, vid, 1, 1);</div><div class='del'>-	if (!fdb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	fdb_add_hw_addr(br, addr);</div><div class='del'>-	fdb_notify(br, fdb, RTM_NEWNEIGH, true);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Add entry for local address of interface */</div><div class='del'>-int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		  const unsigned char *addr, u16 vid)</div><div class='add'>+int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,</div><div class='add'>+		     const unsigned char *addr, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='del'>-	ret = fdb_insert(br, source, addr, vid);</div><div class='add'>+	ret = fdb_add_local(br, source, addr, vid);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* returns true if the fdb was modified */</div><div class='add'>+static bool __fdb_mark_active(struct net_bridge_fdb_entry *fdb)</div><div class='add'>+{</div><div class='add'>+	return !!(test_bit(BR_FDB_NOTIFY_INACTIVE, &amp;fdb-&gt;flags) &amp;&amp;</div><div class='add'>+		  test_and_clear_bit(BR_FDB_NOTIFY_INACTIVE, &amp;fdb-&gt;flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		   const unsigned char *addr, u16 vid, bool added_by_user)</div><div class='add'>+		   const unsigned char *addr, u16 vid, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_fdb_entry *fdb;</div><div class='del'>-	bool fdb_modified = false;</div><div class='ctx'> </div><div class='ctx'> 	/* some users want to always flood. */</div><div class='ctx'> 	if (hold_time(br) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* ignore packets unless we are using this port */</div><div class='del'>-	if (!(source-&gt;state == BR_STATE_LEARNING ||</div><div class='del'>-	      source-&gt;state == BR_STATE_FORWARDING))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	fdb = fdb_find_rcu(&amp;br-&gt;fdb_hash_tbl, addr, vid);</div><div class='ctx'> 	if (likely(fdb)) {</div><div class='ctx'> 		/* attempt to update an entry for a local interface */</div><div class='del'>-		if (unlikely(fdb-&gt;is_local)) {</div><div class='add'>+		if (unlikely(test_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags))) {</div><div class='ctx'> 			if (net_ratelimit())</div><div class='ctx'> 				br_warn(br, "received packet on %s with own address as source address (addr:%pM, vlan:%u)\n",</div><div class='ctx'> 					source-&gt;dev-&gt;name, addr, vid);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unsigned long now = jiffies;</div><div class='add'>+			bool fdb_modified = false;</div><div class='add'>+</div><div class='add'>+			if (now != fdb-&gt;updated) {</div><div class='add'>+				fdb-&gt;updated = now;</div><div class='add'>+				fdb_modified = __fdb_mark_active(fdb);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* fastpath: update of existing entry */</div><div class='del'>-			if (unlikely(source != fdb-&gt;dst)) {</div><div class='del'>-				fdb-&gt;dst = source;</div><div class='add'>+			if (unlikely(source != READ_ONCE(fdb-&gt;dst) &amp;&amp;</div><div class='add'>+				     !test_bit(BR_FDB_STICKY, &amp;fdb-&gt;flags))) {</div><div class='add'>+				br_switchdev_fdb_notify(br, fdb, RTM_DELNEIGH);</div><div class='add'>+				WRITE_ONCE(fdb-&gt;dst, source);</div><div class='ctx'> 				fdb_modified = true;</div><div class='ctx'> 				/* Take over HW learned entry */</div><div class='del'>-				if (unlikely(fdb-&gt;added_by_external_learn))</div><div class='del'>-					fdb-&gt;added_by_external_learn = 0;</div><div class='add'>+				if (unlikely(test_bit(BR_FDB_ADDED_BY_EXT_LEARN,</div><div class='add'>+						      &amp;fdb-&gt;flags)))</div><div class='add'>+					clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,</div><div class='add'>+						  &amp;fdb-&gt;flags);</div><div class='add'>+				/* Clear locked flag when roaming to an</div><div class='add'>+				 * unlocked port.</div><div class='add'>+				 */</div><div class='add'>+				if (unlikely(test_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags)))</div><div class='add'>+					clear_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &amp;flags))) {</div><div class='add'>+				set_bit(BR_FDB_ADDED_BY_USER, &amp;fdb-&gt;flags);</div><div class='add'>+				if (test_and_clear_bit(BR_FDB_DYNAMIC_LEARNED,</div><div class='add'>+						       &amp;fdb-&gt;flags))</div><div class='add'>+					atomic_dec(&amp;br-&gt;fdb_n_learned);</div><div class='ctx'> 			}</div><div class='del'>-			if (now != fdb-&gt;updated)</div><div class='del'>-				fdb-&gt;updated = now;</div><div class='del'>-			if (unlikely(added_by_user))</div><div class='del'>-				fdb-&gt;added_by_user = 1;</div><div class='ctx'> 			if (unlikely(fdb_modified)) {</div><div class='del'>-				trace_br_fdb_update(br, source, addr, vid, added_by_user);</div><div class='add'>+				trace_br_fdb_update(br, source, addr, vid, flags);</div><div class='ctx'> 				fdb_notify(br, fdb, RTM_NEWNEIGH, true);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock(&amp;br-&gt;hash_lock);</div><div class='del'>-		fdb = fdb_create(br, source, addr, vid, 0, 0);</div><div class='add'>+		fdb = fdb_create(br, source, addr, vid, flags);</div><div class='ctx'> 		if (fdb) {</div><div class='del'>-			if (unlikely(added_by_user))</div><div class='del'>-				fdb-&gt;added_by_user = 1;</div><div class='del'>-			trace_br_fdb_update(br, source, addr, vid,</div><div class='del'>-					    added_by_user);</div><div class='add'>+			trace_br_fdb_update(br, source, addr, vid, flags);</div><div class='ctx'> 			fdb_notify(br, fdb, RTM_NEWNEIGH, true);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* else  we lose race and someone else inserts</div><div class='hunk'>@@ -617,106 +1050,6 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fdb_to_nud(const struct net_bridge *br,</div><div class='del'>-		      const struct net_bridge_fdb_entry *fdb)</div><div class='del'>-{</div><div class='del'>-	if (fdb-&gt;is_local)</div><div class='del'>-		return NUD_PERMANENT;</div><div class='del'>-	else if (fdb-&gt;is_static)</div><div class='del'>-		return NUD_NOARP;</div><div class='del'>-	else if (has_expired(br, fdb))</div><div class='del'>-		return NUD_STALE;</div><div class='del'>-	else</div><div class='del'>-		return NUD_REACHABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,</div><div class='del'>-			 const struct net_bridge_fdb_entry *fdb,</div><div class='del'>-			 u32 portid, u32 seq, int type, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	struct nda_cacheinfo ci;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	struct ndmsg *ndm;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, type, sizeof(*ndm), flags);</div><div class='del'>-	if (nlh == NULL)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	ndm = nlmsg_data(nlh);</div><div class='del'>-	ndm-&gt;ndm_family	 = AF_BRIDGE;</div><div class='del'>-	ndm-&gt;ndm_pad1    = 0;</div><div class='del'>-	ndm-&gt;ndm_pad2    = 0;</div><div class='del'>-	ndm-&gt;ndm_flags	 = 0;</div><div class='del'>-	ndm-&gt;ndm_type	 = 0;</div><div class='del'>-	ndm-&gt;ndm_ifindex = fdb-&gt;dst ? fdb-&gt;dst-&gt;dev-&gt;ifindex : br-&gt;dev-&gt;ifindex;</div><div class='del'>-	ndm-&gt;ndm_state   = fdb_to_nud(br, fdb);</div><div class='del'>-</div><div class='del'>-	if (fdb-&gt;offloaded)</div><div class='del'>-		ndm-&gt;ndm_flags |= NTF_OFFLOADED;</div><div class='del'>-	if (fdb-&gt;added_by_external_learn)</div><div class='del'>-		ndm-&gt;ndm_flags |= NTF_EXT_LEARNED;</div><div class='del'>-</div><div class='del'>-	if (nla_put(skb, NDA_LLADDR, ETH_ALEN, &amp;fdb-&gt;key.addr))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(skb, NDA_MASTER, br-&gt;dev-&gt;ifindex))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	ci.ndm_used	 = jiffies_to_clock_t(now - fdb-&gt;used);</div><div class='del'>-	ci.ndm_confirmed = 0;</div><div class='del'>-	ci.ndm_updated	 = jiffies_to_clock_t(now - fdb-&gt;updated);</div><div class='del'>-	ci.ndm_refcnt	 = 0;</div><div class='del'>-	if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &amp;ci))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (fdb-&gt;key.vlan_id &amp;&amp; nla_put(skb, NDA_VLAN, sizeof(u16),</div><div class='del'>-					&amp;fdb-&gt;key.vlan_id))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nlmsg_cancel(skb, nlh);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t fdb_nlmsg_size(void)</div><div class='del'>-{</div><div class='del'>-	return NLMSG_ALIGN(sizeof(struct ndmsg))</div><div class='del'>-		+ nla_total_size(ETH_ALEN) /* NDA_LLADDR */</div><div class='del'>-		+ nla_total_size(sizeof(u32)) /* NDA_MASTER */</div><div class='del'>-		+ nla_total_size(sizeof(u16)) /* NDA_VLAN */</div><div class='del'>-		+ nla_total_size(sizeof(struct nda_cacheinfo));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fdb_notify(struct net_bridge *br,</div><div class='del'>-		       const struct net_bridge_fdb_entry *fdb, int type,</div><div class='del'>-		       bool swdev_notify)</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(br-&gt;dev);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int err = -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	if (swdev_notify)</div><div class='del'>-		br_switchdev_fdb_notify(fdb, type);</div><div class='del'>-</div><div class='del'>-	skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */</div><div class='del'>-		WARN_ON(err == -EMSGSIZE);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);</div><div class='del'>-	return;</div><div class='del'>-errout:</div><div class='del'>-	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Dump information about entries, in response to GETNEIGH */</div><div class='ctx'> int br_fdb_dump(struct sk_buff *skb,</div><div class='ctx'> 		struct netlink_callback *cb,</div><div class='hunk'>@@ -724,11 +1057,12 @@ int br_fdb_dump(struct sk_buff *skb,</div><div class='ctx'> 		struct net_device *filter_dev,</div><div class='ctx'> 		int *idx)</div><div class='ctx'> {</div><div class='add'>+	struct ndo_fdb_dump_context *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> 	struct net_bridge_fdb_entry *f;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;priv_flags &amp; IFF_EBRIDGE))</div><div class='add'>+	if (!netif_is_bridge_master(dev))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!filter_dev) {</div><div class='hunk'>@@ -739,7 +1073,7 @@ int br_fdb_dump(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='del'>-		if (*idx &lt; cb-&gt;args[2])</div><div class='add'>+		if (*idx &lt; ctx-&gt;fdb_idx)</div><div class='ctx'> 			goto skip;</div><div class='ctx'> 		if (filter_dev &amp;&amp; (!f-&gt;dst || f-&gt;dst-&gt;dev != filter_dev)) {</div><div class='ctx'> 			if (filter_dev != dev)</div><div class='hunk'>@@ -770,12 +1104,67 @@ skip:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int br_fdb_get(struct sk_buff *skb,</div><div class='add'>+	       struct nlattr *tb[],</div><div class='add'>+	       struct net_device *dev,</div><div class='add'>+	       const unsigned char *addr,</div><div class='add'>+	       u16 vid, u32 portid, u32 seq,</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct net_bridge_fdb_entry *f;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	f = br_fdb_find_rcu(br, addr, vid);</div><div class='add'>+	if (!f) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Fdb entry not found");</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fdb_fill_info(skb, br, f, portid, seq,</div><div class='add'>+			    RTM_NEWNEIGH, 0);</div><div class='add'>+errout:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* returns true if the fdb is modified */</div><div class='add'>+static bool fdb_handle_notify(struct net_bridge_fdb_entry *fdb, u8 notify)</div><div class='add'>+{</div><div class='add'>+	bool modified = false;</div><div class='add'>+</div><div class='add'>+	/* allow to mark an entry as inactive, usually done on creation */</div><div class='add'>+	if ((notify &amp; FDB_NOTIFY_INACTIVE_BIT) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(BR_FDB_NOTIFY_INACTIVE, &amp;fdb-&gt;flags))</div><div class='add'>+		modified = true;</div><div class='add'>+</div><div class='add'>+	if ((notify &amp; FDB_NOTIFY_BIT) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(BR_FDB_NOTIFY, &amp;fdb-&gt;flags)) {</div><div class='add'>+		/* enabled activity tracking */</div><div class='add'>+		modified = true;</div><div class='add'>+	} else if (!(notify &amp; FDB_NOTIFY_BIT) &amp;&amp;</div><div class='add'>+		   test_and_clear_bit(BR_FDB_NOTIFY, &amp;fdb-&gt;flags)) {</div><div class='add'>+		/* disabled activity tracking, clear notify state */</div><div class='add'>+		clear_bit(BR_FDB_NOTIFY_INACTIVE, &amp;fdb-&gt;flags);</div><div class='add'>+		modified = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return modified;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Update (create or replace) forwarding database entry */</div><div class='ctx'> static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-			 const __u8 *addr, __u16 state, __u16 flags, __u16 vid)</div><div class='add'>+			 const u8 *addr, struct ndmsg *ndm, u16 flags, u16 vid,</div><div class='add'>+			 struct nlattr *nfea_tb[])</div><div class='ctx'> {</div><div class='add'>+	bool is_sticky = !!(ndm-&gt;ndm_flags &amp; NTF_STICKY);</div><div class='add'>+	bool refresh = !nfea_tb[NFEA_DONT_REFRESH];</div><div class='ctx'> 	struct net_bridge_fdb_entry *fdb;</div><div class='add'>+	u16 state = ndm-&gt;ndm_state;</div><div class='ctx'> 	bool modified = false;</div><div class='add'>+	u8 notify = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If the port cannot learn allow only local and static entries */</div><div class='ctx'> 	if (source &amp;&amp; !(state &amp; NUD_PERMANENT) &amp;&amp; !(state &amp; NUD_NOARP) &amp;&amp;</div><div class='hunk'>@@ -789,12 +1178,23 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (is_sticky &amp;&amp; (state &amp; NUD_PERMANENT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nfea_tb[NFEA_ACTIVITY_NOTIFY]) {</div><div class='add'>+		notify = nla_get_u8(nfea_tb[NFEA_ACTIVITY_NOTIFY]);</div><div class='add'>+		if ((notify &amp; ~BR_FDB_NOTIFY_SETTABLE_BITS) ||</div><div class='add'>+		    (notify &amp; BR_FDB_NOTIFY_SETTABLE_BITS) == FDB_NOTIFY_INACTIVE_BIT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fdb = br_fdb_find(br, addr, vid);</div><div class='ctx'> 	if (fdb == NULL) {</div><div class='ctx'> 		if (!(flags &amp; NLM_F_CREATE))</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> </div><div class='del'>-		fdb = fdb_create(br, source, addr, vid, 0, 0);</div><div class='add'>+		fdb = fdb_create(br, source, addr, vid,</div><div class='add'>+				 BIT(BR_FDB_ADDED_BY_USER));</div><div class='ctx'> 		if (!fdb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -803,40 +1203,49 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,</div><div class='ctx'> 		if (flags &amp; NLM_F_EXCL)</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> </div><div class='del'>-		if (fdb-&gt;dst != source) {</div><div class='del'>-			fdb-&gt;dst = source;</div><div class='add'>+		if (READ_ONCE(fdb-&gt;dst) != source) {</div><div class='add'>+			WRITE_ONCE(fdb-&gt;dst, source);</div><div class='ctx'> 			modified = true;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		set_bit(BR_FDB_ADDED_BY_USER, &amp;fdb-&gt;flags);</div><div class='add'>+		if (test_and_clear_bit(BR_FDB_DYNAMIC_LEARNED, &amp;fdb-&gt;flags))</div><div class='add'>+			atomic_dec(&amp;br-&gt;fdb_n_learned);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fdb_to_nud(br, fdb) != state) {</div><div class='ctx'> 		if (state &amp; NUD_PERMANENT) {</div><div class='del'>-			fdb-&gt;is_local = 1;</div><div class='del'>-			if (!fdb-&gt;is_static) {</div><div class='del'>-				fdb-&gt;is_static = 1;</div><div class='add'>+			set_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags);</div><div class='add'>+			if (!test_and_set_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags))</div><div class='ctx'> 				fdb_add_hw_addr(br, addr);</div><div class='del'>-			}</div><div class='ctx'> 		} else if (state &amp; NUD_NOARP) {</div><div class='del'>-			fdb-&gt;is_local = 0;</div><div class='del'>-			if (!fdb-&gt;is_static) {</div><div class='del'>-				fdb-&gt;is_static = 1;</div><div class='add'>+			clear_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags);</div><div class='add'>+			if (!test_and_set_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags))</div><div class='ctx'> 				fdb_add_hw_addr(br, addr);</div><div class='del'>-			}</div><div class='ctx'> 		} else {</div><div class='del'>-			fdb-&gt;is_local = 0;</div><div class='del'>-			if (fdb-&gt;is_static) {</div><div class='del'>-				fdb-&gt;is_static = 0;</div><div class='add'>+			clear_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags);</div><div class='add'>+			if (test_and_clear_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags))</div><div class='ctx'> 				fdb_del_hw_addr(br, addr);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		modified = true;</div><div class='ctx'> 	}</div><div class='del'>-	fdb-&gt;added_by_user = 1;</div><div class='add'>+</div><div class='add'>+	if (is_sticky != test_bit(BR_FDB_STICKY, &amp;fdb-&gt;flags)) {</div><div class='add'>+		change_bit(BR_FDB_STICKY, &amp;fdb-&gt;flags);</div><div class='add'>+		modified = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags))</div><div class='add'>+		modified = true;</div><div class='add'>+</div><div class='add'>+	if (fdb_handle_notify(fdb, notify))</div><div class='add'>+		modified = true;</div><div class='ctx'> </div><div class='ctx'> 	fdb-&gt;used = jiffies;</div><div class='ctx'> 	if (modified) {</div><div class='del'>-		fdb-&gt;updated = jiffies;</div><div class='add'>+		if (refresh)</div><div class='add'>+			fdb-&gt;updated = jiffies;</div><div class='ctx'> 		fdb_notify(br, fdb, RTM_NEWNEIGH, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -845,7 +1254,8 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,</div><div class='ctx'> </div><div class='ctx'> static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br,</div><div class='ctx'> 			struct net_bridge_port *p, const unsigned char *addr,</div><div class='del'>-			u16 nlh_flags, u16 vid)</div><div class='add'>+			u16 nlh_flags, u16 vid, struct nlattr *nfea_tb[],</div><div class='add'>+			bool *notified, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -855,32 +1265,49 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br,</div><div class='ctx'> 				br-&gt;dev-&gt;name);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		if (!nbp_state_should_learn(p))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='ctx'> 		local_bh_disable();</div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		br_fdb_update(br, p, addr, vid, true);</div><div class='add'>+		br_fdb_update(br, p, addr, vid, BIT(BR_FDB_ADDED_BY_USER));</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		local_bh_enable();</div><div class='ctx'> 	} else if (ndm-&gt;ndm_flags &amp; NTF_EXT_LEARNED) {</div><div class='del'>-		err = br_fdb_external_learn_add(br, p, addr, vid, true);</div><div class='add'>+		if (!p &amp;&amp; !(ndm-&gt;ndm_state &amp; NUD_PERMANENT)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "FDB entry towards bridge must be permanent");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		err = br_fdb_external_learn_add(br, p, addr, vid, false, true);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='del'>-		err = fdb_add_entry(br, p, addr, ndm-&gt;ndm_state,</div><div class='del'>-				    nlh_flags, vid);</div><div class='add'>+		err = fdb_add_entry(br, p, addr, ndm, nlh_flags, vid, nfea_tb);</div><div class='ctx'> 		spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!err)</div><div class='add'>+		*notified = true;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nla_policy br_nda_fdb_pol[NFEA_MAX + 1] = {</div><div class='add'>+	[NFEA_ACTIVITY_NOTIFY]	= { .type = NLA_U8 },</div><div class='add'>+	[NFEA_DONT_REFRESH]	= { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Add new permanent fdb entry with RTM_NEWNEIGH */</div><div class='ctx'> int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 	       struct net_device *dev,</div><div class='del'>-	       const unsigned char *addr, u16 vid, u16 nlh_flags)</div><div class='add'>+	       const unsigned char *addr, u16 vid, u16 nlh_flags,</div><div class='add'>+	       bool *notified, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct nlattr *nfea_tb[NFEA_MAX + 1], *attr;</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_port *p = NULL;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='ctx'> 	struct net_bridge *br = NULL;</div><div class='add'>+	u32 ext_flags = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_br_fdb_add(ndm, dev, addr, vid, nlh_flags);</div><div class='hunk'>@@ -895,7 +1322,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;priv_flags &amp; IFF_EBRIDGE) {</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='ctx'> 		br = netdev_priv(dev);</div><div class='ctx'> 		vg = br_vlan_group(br);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -909,6 +1336,24 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 		vg = nbp_vlan_group(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (tb[NDA_FLAGS_EXT])</div><div class='add'>+		ext_flags = nla_get_u32(tb[NDA_FLAGS_EXT]);</div><div class='add'>+</div><div class='add'>+	if (ext_flags &amp; NTF_EXT_LOCKED) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot add FDB entry with \"locked\" flag set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NDA_FDB_EXT_ATTRS]) {</div><div class='add'>+		attr = tb[NDA_FDB_EXT_ATTRS];</div><div class='add'>+		err = nla_parse_nested(nfea_tb, NFEA_MAX, attr,</div><div class='add'>+				       br_nda_fdb_pol, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		memset(nfea_tb, 0, sizeof(struct nlattr *) * (NFEA_MAX + 1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (vid) {</div><div class='ctx'> 		v = br_vlan_find(vg, vid);</div><div class='ctx'> 		if (!v || !br_vlan_should_use(v)) {</div><div class='hunk'>@@ -917,9 +1362,11 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* VID was specified, so use it. */</div><div class='del'>-		err = __br_fdb_add(ndm, br, p, addr, nlh_flags, vid);</div><div class='add'>+		err = __br_fdb_add(ndm, br, p, addr, nlh_flags, vid, nfea_tb,</div><div class='add'>+				   notified, extack);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = __br_fdb_add(ndm, br, p, addr, nlh_flags, 0);</div><div class='add'>+		err = __br_fdb_add(ndm, br, p, addr, nlh_flags, 0, nfea_tb,</div><div class='add'>+				   notified, extack);</div><div class='ctx'> 		if (err || !vg || !vg-&gt;num_vlans)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -930,7 +1377,8 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 		list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='ctx'> 			if (!br_vlan_should_use(v))</div><div class='ctx'> 				continue;</div><div class='del'>-			err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v-&gt;vid);</div><div class='add'>+			err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v-&gt;vid,</div><div class='add'>+					   nfea_tb, notified, extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -942,27 +1390,28 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int fdb_delete_by_addr_and_port(struct net_bridge *br,</div><div class='ctx'> 				       const struct net_bridge_port *p,</div><div class='del'>-				       const u8 *addr, u16 vlan)</div><div class='add'>+				       const u8 *addr, u16 vlan, bool *notified)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_fdb_entry *fdb;</div><div class='ctx'> </div><div class='ctx'> 	fdb = br_fdb_find(br, addr, vlan);</div><div class='del'>-	if (!fdb || fdb-&gt;dst != p)</div><div class='add'>+	if (!fdb || READ_ONCE(fdb-&gt;dst) != p)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	fdb_delete(br, fdb, true);</div><div class='add'>+	*notified = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __br_fdb_delete(struct net_bridge *br,</div><div class='ctx'> 			   const struct net_bridge_port *p,</div><div class='del'>-			   const unsigned char *addr, u16 vid)</div><div class='add'>+			   const unsigned char *addr, u16 vid, bool *notified)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='del'>-	err = fdb_delete_by_addr_and_port(br, p, addr, vid);</div><div class='add'>+	err = fdb_delete_by_addr_and_port(br, p, addr, vid, notified);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -971,15 +1420,15 @@ static int __br_fdb_delete(struct net_bridge *br,</div><div class='ctx'> /* Remove neighbor entry with RTM_DELNEIGH */</div><div class='ctx'> int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 		  struct net_device *dev,</div><div class='del'>-		  const unsigned char *addr, u16 vid)</div><div class='add'>+		  const unsigned char *addr, u16 vid, bool *notified,</div><div class='add'>+		  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_port *p = NULL;</div><div class='del'>-	struct net_bridge_vlan *v;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;priv_flags &amp; IFF_EBRIDGE) {</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='ctx'> 		br = netdev_priv(dev);</div><div class='ctx'> 		vg = br_vlan_group(br);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -994,23 +1443,19 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vid) {</div><div class='del'>-		v = br_vlan_find(vg, vid);</div><div class='del'>-		if (!v) {</div><div class='del'>-			pr_info("bridge: RTM_DELNEIGH with unconfigured vlan %d on %s\n", vid, dev-&gt;name);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = __br_fdb_delete(br, p, addr, vid);</div><div class='add'>+		err = __br_fdb_delete(br, p, addr, vid, notified);</div><div class='ctx'> 	} else {</div><div class='add'>+		struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-		err &amp;= __br_fdb_delete(br, p, addr, 0);</div><div class='add'>+		err &amp;= __br_fdb_delete(br, p, addr, 0, notified);</div><div class='ctx'> 		if (!vg || !vg-&gt;num_vlans)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='ctx'> 			if (!br_vlan_should_use(v))</div><div class='ctx'> 				continue;</div><div class='del'>-			err &amp;= __br_fdb_delete(br, p, addr, v-&gt;vid);</div><div class='add'>+			err &amp;= __br_fdb_delete(br, p, addr, v-&gt;vid, notified);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1028,7 +1473,7 @@ int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='ctx'> 		/* We only care for static entries */</div><div class='del'>-		if (!f-&gt;is_static)</div><div class='add'>+		if (!test_bit(BR_FDB_STATIC, &amp;f-&gt;flags))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		err = dev_uc_add(p-&gt;dev, f-&gt;key.addr.addr);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1042,7 +1487,7 @@ done:</div><div class='ctx'> rollback:</div><div class='ctx'> 	hlist_for_each_entry_rcu(tmp, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='ctx'> 		/* We only care for static entries */</div><div class='del'>-		if (!tmp-&gt;is_static)</div><div class='add'>+		if (!test_bit(BR_FDB_STATIC, &amp;tmp-&gt;flags))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (tmp == f)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1061,7 +1506,7 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(f, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='ctx'> 		/* We only care for static entries */</div><div class='del'>-		if (!f-&gt;is_static)</div><div class='add'>+		if (!test_bit(BR_FDB_STATIC, &amp;f-&gt;flags))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dev_uc_del(p-&gt;dev, f-&gt;key.addr.addr);</div><div class='hunk'>@@ -1070,7 +1515,7 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,</div><div class='del'>-			      const unsigned char *addr, u16 vid,</div><div class='add'>+			      const unsigned char *addr, u16 vid, bool locked,</div><div class='ctx'> 			      bool swdev_notify)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_fdb_entry *fdb;</div><div class='hunk'>@@ -1079,34 +1524,67 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> </div><div class='ctx'> 	trace_br_fdb_external_learn_add(br, p, addr, vid);</div><div class='ctx'> </div><div class='add'>+	if (locked &amp;&amp; (!p || !(p-&gt;flags &amp; BR_PORT_MAB)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	fdb = br_fdb_find(br, addr, vid);</div><div class='ctx'> 	if (!fdb) {</div><div class='del'>-		fdb = fdb_create(br, p, addr, vid, 0, 0);</div><div class='add'>+		unsigned long flags = BIT(BR_FDB_ADDED_BY_EXT_LEARN);</div><div class='add'>+</div><div class='add'>+		if (swdev_notify)</div><div class='add'>+			flags |= BIT(BR_FDB_ADDED_BY_USER);</div><div class='add'>+</div><div class='add'>+		if (!p)</div><div class='add'>+			flags |= BIT(BR_FDB_LOCAL);</div><div class='add'>+</div><div class='add'>+		if (locked)</div><div class='add'>+			flags |= BIT(BR_FDB_LOCKED);</div><div class='add'>+</div><div class='add'>+		fdb = fdb_create(br, p, addr, vid, flags);</div><div class='ctx'> 		if (!fdb) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto err_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		fdb-&gt;added_by_external_learn = 1;</div><div class='ctx'> 		fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);</div><div class='ctx'> 	} else {</div><div class='add'>+		if (locked &amp;&amp;</div><div class='add'>+		    (!test_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags) ||</div><div class='add'>+		     READ_ONCE(fdb-&gt;dst) != p)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		fdb-&gt;updated = jiffies;</div><div class='ctx'> </div><div class='del'>-		if (fdb-&gt;dst != p) {</div><div class='del'>-			fdb-&gt;dst = p;</div><div class='add'>+		if (READ_ONCE(fdb-&gt;dst) != p) {</div><div class='add'>+			WRITE_ONCE(fdb-&gt;dst, p);</div><div class='ctx'> 			modified = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (fdb-&gt;added_by_external_learn) {</div><div class='add'>+		if (test_and_set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;fdb-&gt;flags)) {</div><div class='ctx'> 			/* Refresh entry */</div><div class='ctx'> 			fdb-&gt;used = jiffies;</div><div class='del'>-		} else if (!fdb-&gt;added_by_user) {</div><div class='del'>-			/* Take over SW learned entry */</div><div class='del'>-			fdb-&gt;added_by_external_learn = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			modified = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (locked != test_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags)) {</div><div class='add'>+			change_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags);</div><div class='add'>+			modified = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (swdev_notify)</div><div class='add'>+			set_bit(BR_FDB_ADDED_BY_USER, &amp;fdb-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if (!p)</div><div class='add'>+			set_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if ((swdev_notify || !p) &amp;&amp;</div><div class='add'>+		    test_and_clear_bit(BR_FDB_DYNAMIC_LEARNED, &amp;fdb-&gt;flags))</div><div class='add'>+			atomic_dec(&amp;br-&gt;fdb_n_learned);</div><div class='add'>+</div><div class='ctx'> 		if (modified)</div><div class='ctx'> 			fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1127,7 +1605,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	fdb = br_fdb_find(br, addr, vid);</div><div class='del'>-	if (fdb &amp;&amp; fdb-&gt;added_by_external_learn)</div><div class='add'>+	if (fdb &amp;&amp; test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;fdb-&gt;flags))</div><div class='ctx'> 		fdb_delete(br, fdb, swdev_notify);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = -ENOENT;</div><div class='hunk'>@@ -1138,15 +1616,35 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,</div><div class='del'>-			  const unsigned char *addr, u16 vid)</div><div class='add'>+			  const unsigned char *addr, u16 vid, bool offloaded)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_fdb_entry *fdb;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	fdb = br_fdb_find(br, addr, vid);</div><div class='del'>-	if (fdb)</div><div class='del'>-		fdb-&gt;offloaded = 1;</div><div class='add'>+	if (fdb &amp;&amp; offloaded != test_bit(BR_FDB_OFFLOADED, &amp;fdb-&gt;flags))</div><div class='add'>+		change_bit(BR_FDB_OFFLOADED, &amp;fdb-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;hash_lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void br_fdb_clear_offload(const struct net_device *dev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_fdb_entry *f;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	p = br_port_get_rtnl(dev);</div><div class='add'>+	if (!p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;p-&gt;br-&gt;hash_lock);</div><div class='add'>+	hlist_for_each_entry(f, &amp;p-&gt;br-&gt;fdb_list, fdb_node) {</div><div class='add'>+		if (f-&gt;dst == p &amp;&amp; f-&gt;key.vlan_id == vid)</div><div class='add'>+			clear_bit(BR_FDB_OFFLOADED, &amp;f-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;p-&gt;br-&gt;hash_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_fdb_clear_offload);</div><div class='head'>diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c<br/>index 5372e2042adf..dea09096ad0f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_forward.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_forward.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_forward.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_forward.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Forwarding decision</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -29,30 +25,31 @@ static inline int should_deliver(const struct net_bridge_port *p,</div><div class='ctx'> </div><div class='ctx'> 	vg = nbp_vlan_group_rcu(p);</div><div class='ctx'> 	return ((p-&gt;flags &amp; BR_HAIRPIN_MODE) || skb-&gt;dev != p-&gt;dev) &amp;&amp;</div><div class='del'>-		br_allowed_egress(vg, skb) &amp;&amp; p-&gt;state == BR_STATE_FORWARDING &amp;&amp;</div><div class='del'>-		nbp_switchdev_allowed_egress(p, skb) &amp;&amp;</div><div class='add'>+		(br_mst_is_enabled(p) || p-&gt;state == BR_STATE_FORWARDING) &amp;&amp;</div><div class='add'>+		br_allowed_egress(vg, skb) &amp;&amp; nbp_switchdev_allowed_egress(p, skb) &amp;&amp;</div><div class='ctx'> 		!br_skb_isolated(p, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	skb_push(skb, ETH_HLEN);</div><div class='ctx'> 	if (!is_skb_forwardable(skb-&gt;dev, skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	skb_push(skb, ETH_HLEN);</div><div class='ctx'> 	br_drop_fake_rtable(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='del'>-	    (skb-&gt;protocol == htons(ETH_P_8021Q) ||</div><div class='del'>-	     skb-&gt;protocol == htons(ETH_P_8021AD))) {</div><div class='add'>+	    eth_type_vlan(skb-&gt;protocol)) {</div><div class='ctx'> 		int depth;</div><div class='ctx'> </div><div class='del'>-		if (!__vlan_get_protocol(skb, skb-&gt;protocol, &amp;depth))</div><div class='add'>+		if (!vlan_get_protocol_and_depth(skb, skb-&gt;protocol, &amp;depth))</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='ctx'> 		skb_set_network_header(skb, depth);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	br_switchdev_frame_set_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='ctx'> 	dev_queue_xmit(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -65,6 +62,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit);</div><div class='ctx'> </div><div class='ctx'> int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='ctx'> 	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING,</div><div class='ctx'> 		       net, sk, skb, NULL, skb-&gt;dev,</div><div class='ctx'> 		       br_dev_queue_push_xmit);</div><div class='hunk'>@@ -80,6 +78,11 @@ static void __br_forward(const struct net_bridge_port *to,</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int br_hook;</div><div class='ctx'> </div><div class='add'>+	/* Mark the skb for forwarding offload early so that br_handle_vlan()</div><div class='add'>+	 * can know whether to pop the VLAN header on egress or keep it.</div><div class='add'>+	 */</div><div class='add'>+	nbp_switchdev_frame_mark_tx_fwd_offload(to, skb);</div><div class='add'>+</div><div class='ctx'> 	vg = nbp_vlan_group_rcu(to);</div><div class='ctx'> 	skb = br_handle_vlan(to-&gt;br, to, vg, skb);</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -97,12 +100,11 @@ static void __br_forward(const struct net_bridge_port *to,</div><div class='ctx'> 		net = dev_net(indev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (unlikely(netpoll_tx_running(to-&gt;br-&gt;dev))) {</div><div class='del'>-			if (!is_skb_forwardable(skb-&gt;dev, skb)) {</div><div class='add'>+			skb_push(skb, ETH_HLEN);</div><div class='add'>+			if (!is_skb_forwardable(skb-&gt;dev, skb))</div><div class='ctx'> 				kfree_skb(skb);</div><div class='del'>-			} else {</div><div class='del'>-				skb_push(skb, ETH_HLEN);</div><div class='add'>+			else</div><div class='ctx'> 				br_netpoll_send_skb(to, skb);</div><div class='del'>-			}</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		br_hook = NF_BR_LOCAL_OUT;</div><div class='hunk'>@@ -122,7 +124,7 @@ static int deliver_clone(const struct net_bridge_port *prev,</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='add'>+		DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -146,12 +148,14 @@ void br_forward(const struct net_bridge_port *to,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* redirect to backup link if the destination port is down */</div><div class='del'>-	if (rcu_access_pointer(to-&gt;backup_port) &amp;&amp; !netif_carrier_ok(to-&gt;dev)) {</div><div class='add'>+	if (rcu_access_pointer(to-&gt;backup_port) &amp;&amp;</div><div class='add'>+	    (!netif_carrier_ok(to-&gt;dev) || !netif_running(to-&gt;dev))) {</div><div class='ctx'> 		struct net_bridge_port *backup_port;</div><div class='ctx'> </div><div class='ctx'> 		backup_port = rcu_dereference(to-&gt;backup_port);</div><div class='ctx'> 		if (unlikely(!backup_port))</div><div class='ctx'> 			goto out;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;backup_nhid = READ_ONCE(to-&gt;backup_nhid);</div><div class='ctx'> 		to = backup_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -173,30 +177,37 @@ static struct net_bridge_port *maybe_deliver(</div><div class='ctx'> 	struct net_bridge_port *prev, struct net_bridge_port *p,</div><div class='ctx'> 	struct sk_buff *skb, bool local_orig)</div><div class='ctx'> {</div><div class='add'>+	u8 igmp_type = br_multicast_igmp_type(skb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!should_deliver(p, skb))</div><div class='ctx'> 		return prev;</div><div class='ctx'> </div><div class='add'>+	nbp_switchdev_frame_mark_tx_fwd_to_hwdom(p, skb);</div><div class='add'>+</div><div class='ctx'> 	if (!prev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = deliver_clone(prev, skb, local_orig);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='add'>+	br_multicast_count(p-&gt;br, p, skb, igmp_type, BR_MCAST_DIR_TX);</div><div class='add'>+</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called under rcu_read_lock */</div><div class='ctx'> void br_flood(struct net_bridge *br, struct sk_buff *skb,</div><div class='del'>-	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)</div><div class='add'>+	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,</div><div class='add'>+	      u16 vid)</div><div class='ctx'> {</div><div class='del'>-	u8 igmp_type = br_multicast_igmp_type(skb);</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NO_TX_TARGET;</div><div class='ctx'> 	struct net_bridge_port *prev = NULL;</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> </div><div class='add'>+	br_tc_skb_miss_set(skb, pkt_type != BR_PKT_BROADCAST);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_rcu(p, &amp;br-&gt;port_list, list) {</div><div class='ctx'> 		/* Do not flood unicast traffic to ports that turn it off, nor</div><div class='ctx'> 		 * other traffic if flood off, except for traffic we originate</div><div class='hunk'>@@ -219,16 +230,17 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb,</div><div class='ctx'> 		/* Do not flood to ports that enable proxy ARP */</div><div class='ctx'> 		if (p-&gt;flags &amp; BR_PROXYARP)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((p-&gt;flags &amp; (BR_PROXYARP_WIFI | BR_NEIGH_SUPPRESS)) &amp;&amp;</div><div class='del'>-		    BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied)</div><div class='add'>+		if (BR_INPUT_SKB_CB(skb)-&gt;proxyarp_replied &amp;&amp;</div><div class='add'>+		    ((p-&gt;flags &amp; BR_PROXYARP_WIFI) ||</div><div class='add'>+		     br_is_neigh_suppress_enabled(p, vid)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		prev = maybe_deliver(prev, p, skb, local_orig);</div><div class='del'>-		if (IS_ERR(prev))</div><div class='add'>+		if (IS_ERR(prev)) {</div><div class='add'>+			reason = PTR_ERR(prev) == -ENOMEM ? SKB_DROP_REASON_NOMEM :</div><div class='add'>+				 SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (prev == p)</div><div class='del'>-			br_multicast_count(p-&gt;br, p, skb, igmp_type,</div><div class='del'>-					   BR_MCAST_DIR_TX);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!prev)</div><div class='hunk'>@@ -242,7 +254,7 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (!local_rcv)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='hunk'>@@ -251,6 +263,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = BR_INPUT_SKB_CB(skb)-&gt;brdev;</div><div class='ctx'> 	const unsigned char *src = eth_hdr(skb)-&gt;h_source;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='ctx'> </div><div class='ctx'> 	if (!should_deliver(p, skb))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -259,12 +272,16 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,</div><div class='ctx'> 	if (skb-&gt;dev == p-&gt;dev &amp;&amp; ether_addr_equal(src, addr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb = skb_copy(skb, GFP_ATOMIC);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='add'>+	__skb_push(skb, ETH_HLEN);</div><div class='add'>+	nskb = pskb_copy(skb, GFP_ATOMIC);</div><div class='add'>+	__skb_pull(skb, ETH_HLEN);</div><div class='add'>+	if (!nskb) {</div><div class='add'>+		DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb = nskb;</div><div class='add'>+	__skb_pull(skb, ETH_HLEN);</div><div class='ctx'> 	if (!is_broadcast_ether_addr(addr))</div><div class='ctx'> 		memcpy(eth_hdr(skb)-&gt;h_dest, addr, ETH_ALEN);</div><div class='ctx'> </div><div class='hunk'>@@ -274,22 +291,32 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,</div><div class='ctx'> /* called with rcu_read_lock */</div><div class='ctx'> void br_multicast_flood(struct net_bridge_mdb_entry *mdst,</div><div class='ctx'> 			struct sk_buff *skb,</div><div class='add'>+			struct net_bridge_mcast *brmctx,</div><div class='ctx'> 			bool local_rcv, bool local_orig)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = BR_INPUT_SKB_CB(skb)-&gt;brdev;</div><div class='del'>-	u8 igmp_type = br_multicast_igmp_type(skb);</div><div class='del'>-	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NO_TX_TARGET;</div><div class='ctx'> 	struct net_bridge_port *prev = NULL;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='add'>+	bool allow_mode_include = true;</div><div class='ctx'> 	struct hlist_node *rp;</div><div class='ctx'> </div><div class='del'>-	rp = rcu_dereference(hlist_first_rcu(&amp;br-&gt;router_list));</div><div class='del'>-	p = mdst ? rcu_dereference(mdst-&gt;ports) : NULL;</div><div class='add'>+	rp = br_multicast_get_first_rport_node(brmctx, skb);</div><div class='add'>+</div><div class='add'>+	if (mdst) {</div><div class='add'>+		p = rcu_dereference(mdst-&gt;ports);</div><div class='add'>+		if (br_multicast_should_handle_mode(brmctx, mdst-&gt;addr.proto) &amp;&amp;</div><div class='add'>+		    br_multicast_is_star_g(&amp;mdst-&gt;addr))</div><div class='add'>+			allow_mode_include = false;</div><div class='add'>+	} else {</div><div class='add'>+		p = NULL;</div><div class='add'>+		br_tc_skb_miss_set(skb, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (p || rp) {</div><div class='ctx'> 		struct net_bridge_port *port, *lport, *rport;</div><div class='ctx'> </div><div class='del'>-		lport = p ? p-&gt;port : NULL;</div><div class='del'>-		rport = hlist_entry_safe(rp, struct net_bridge_port, rlist);</div><div class='add'>+		lport = p ? p-&gt;key.port : NULL;</div><div class='add'>+		rport = br_multicast_rport_from_node_skb(rp, skb);</div><div class='ctx'> </div><div class='ctx'> 		if ((unsigned long)lport &gt; (unsigned long)rport) {</div><div class='ctx'> 			port = lport;</div><div class='hunk'>@@ -299,18 +326,21 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst,</div><div class='ctx'> 						   local_orig);</div><div class='ctx'> 				goto delivered;</div><div class='ctx'> 			}</div><div class='add'>+			if ((!allow_mode_include &amp;&amp;</div><div class='add'>+			     p-&gt;filter_mode == MCAST_INCLUDE) ||</div><div class='add'>+			    (p-&gt;flags &amp; MDB_PG_FLAGS_BLOCKED))</div><div class='add'>+				goto delivered;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			port = rport;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		prev = maybe_deliver(prev, port, skb, local_orig);</div><div class='del'>-delivered:</div><div class='del'>-		if (IS_ERR(prev))</div><div class='add'>+		if (IS_ERR(prev)) {</div><div class='add'>+			reason = PTR_ERR(prev) == -ENOMEM ? SKB_DROP_REASON_NOMEM :</div><div class='add'>+				 SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (prev == port)</div><div class='del'>-			br_multicast_count(port-&gt;br, port, skb, igmp_type,</div><div class='del'>-					   BR_MCAST_DIR_TX);</div><div class='del'>-</div><div class='add'>+		}</div><div class='add'>+delivered:</div><div class='ctx'> 		if ((unsigned long)lport &gt;= (unsigned long)port)</div><div class='ctx'> 			p = rcu_dereference(p-&gt;next);</div><div class='ctx'> 		if ((unsigned long)rport &gt;= (unsigned long)port)</div><div class='hunk'>@@ -328,6 +358,6 @@ delivered:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (!local_rcv)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c<br/>index 0363f1bdc401..4c67a32745f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_if.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_if.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_if.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_if.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Userspace interface</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -44,12 +40,21 @@ static int port_cost(struct net_device *dev)</div><div class='ctx'> 		switch (ecmd.base.speed) {</div><div class='ctx'> 		case SPEED_10000:</div><div class='ctx'> 			return 2;</div><div class='del'>-		case SPEED_1000:</div><div class='add'>+		case SPEED_5000:</div><div class='add'>+			return 3;</div><div class='add'>+		case SPEED_2500:</div><div class='ctx'> 			return 4;</div><div class='add'>+		case SPEED_1000:</div><div class='add'>+			return 5;</div><div class='ctx'> 		case SPEED_100:</div><div class='ctx'> 			return 19;</div><div class='ctx'> 		case SPEED_10:</div><div class='ctx'> 			return 100;</div><div class='add'>+		case SPEED_UNKNOWN:</div><div class='add'>+			return 100;</div><div class='add'>+		default:</div><div class='add'>+			if (ecmd.base.speed &gt; SPEED_10000)</div><div class='add'>+				return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -161,8 +166,9 @@ void br_manage_promisc(struct net_bridge *br)</div><div class='ctx'> 			 * This lets us disable promiscuous mode and write</div><div class='ctx'> 			 * this config to hw.</div><div class='ctx'> 			 */</div><div class='del'>-			if (br-&gt;auto_cnt == 0 ||</div><div class='del'>-			    (br-&gt;auto_cnt == 1 &amp;&amp; br_auto_port(p)))</div><div class='add'>+			if ((p-&gt;dev-&gt;priv_flags &amp; IFF_UNICAST_FLT) &amp;&amp;</div><div class='add'>+			    (br-&gt;auto_cnt == 0 ||</div><div class='add'>+			     (br-&gt;auto_cnt == 1 &amp;&amp; br_auto_port(p))))</div><div class='ctx'> 				br_port_clear_promisc(p);</div><div class='ctx'> 			else</div><div class='ctx'> 				br_port_set_promisc(p);</div><div class='hunk'>@@ -179,7 +185,7 @@ int nbp_backup_change(struct net_bridge_port *p,</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	if (backup_dev) {</div><div class='del'>-		if (!br_port_exists(backup_dev))</div><div class='add'>+		if (!netif_is_bridge_port(backup_dev))</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 		backup_p = br_port_get_rtnl(backup_dev);</div><div class='hunk'>@@ -257,14 +263,14 @@ static void release_nbp(struct kobject *kobj)</div><div class='ctx'> 	kfree(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brport_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid)</div><div class='add'>+static void brport_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port *p = kobj_to_brport(kobj);</div><div class='ctx'> </div><div class='ctx'> 	net_ns_get_ownership(dev_net(p-&gt;dev), uid, gid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type brport_ktype = {</div><div class='add'>+static const struct kobj_type brport_ktype = {</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> 	.sysfs_ops = &amp;brport_sysfs_ops,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -278,7 +284,7 @@ static void destroy_nbp(struct net_bridge_port *p)</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;br = NULL;</div><div class='ctx'> 	p-&gt;dev = NULL;</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;p-&gt;dev_tracker);</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;p-&gt;kobj);</div><div class='ctx'> }</div><div class='hunk'>@@ -337,6 +343,9 @@ static void del_nbp(struct net_bridge_port *p)</div><div class='ctx'> 	br_stp_disable_port(p);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	br_mrp_port_del(br, p);</div><div class='add'>+	br_cfm_port_del(br, p);</div><div class='add'>+</div><div class='ctx'> 	br_ifinfo_notify(RTM_DELLINK, NULL, p);</div><div class='ctx'> </div><div class='ctx'> 	list_del_rcu(&amp;p-&gt;list);</div><div class='hunk'>@@ -377,6 +386,7 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)</div><div class='ctx'> 		del_nbp(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	br_mst_uninit(br);</div><div class='ctx'> 	br_recalculate_neigh_suppress_enabled(br);</div><div class='ctx'> </div><div class='ctx'> 	br_fdb_delete_by_port(br, NULL, 0, 1);</div><div class='hunk'>@@ -394,17 +404,16 @@ static int find_portno(struct net_bridge *br)</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	unsigned long *inuse;</div><div class='ctx'> </div><div class='del'>-	inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),</div><div class='del'>-			GFP_KERNEL);</div><div class='add'>+	inuse = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);</div><div class='ctx'> 	if (!inuse)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	set_bit(0, inuse);	/* zero is reserved */</div><div class='del'>-	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='del'>-		set_bit(p-&gt;port_no, inuse);</div><div class='del'>-	}</div><div class='add'>+	__set_bit(0, inuse);	/* zero is reserved */</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list)</div><div class='add'>+		__set_bit(p-&gt;port_no, inuse);</div><div class='add'>+</div><div class='ctx'> 	index = find_first_zero_bit(inuse, BR_MAX_PORTS);</div><div class='del'>-	kfree(inuse);</div><div class='add'>+	bitmap_free(inuse);</div><div class='ctx'> </div><div class='ctx'> 	return (index &gt;= BR_MAX_PORTS) ? -EXFULL : index;</div><div class='ctx'> }</div><div class='hunk'>@@ -425,7 +434,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;br = br;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;p-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 	p-&gt;dev = dev;</div><div class='ctx'> 	p-&gt;path_cost = port_cost(dev);</div><div class='ctx'> 	p-&gt;priority = 0x8000 &gt;&gt; BR_PORT_BITS;</div><div class='hunk'>@@ -436,7 +445,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,</div><div class='ctx'> 	br_stp_port_timer_init(p);</div><div class='ctx'> 	err = br_multicast_add_port(p);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_put(dev);</div><div class='add'>+		netdev_put(dev, &amp;p-&gt;dev_tracker);</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 		p = ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -458,7 +467,7 @@ int br_add_bridge(struct net *net, const char *name)</div><div class='ctx'> 	dev_net_set(dev, net);</div><div class='ctx'> 	dev-&gt;rtnl_link_ops = &amp;br_link_ops;</div><div class='ctx'> </div><div class='del'>-	res = register_netdev(dev);</div><div class='add'>+	res = register_netdevice(dev);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -469,12 +478,11 @@ int br_del_bridge(struct net *net, const char *name)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='ctx'> 	dev = __dev_get_by_name(net, name);</div><div class='ctx'> 	if (dev == NULL)</div><div class='ctx'> 		ret =  -ENXIO; 	/* Could not find device */</div><div class='ctx'> </div><div class='del'>-	else if (!(dev-&gt;priv_flags &amp; IFF_EBRIDGE)) {</div><div class='add'>+	else if (!netif_is_bridge_master(dev)) {</div><div class='ctx'> 		/* Attempt to delete non bridge device! */</div><div class='ctx'> 		ret = -EPERM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -487,7 +495,6 @@ int br_del_bridge(struct net *net, const char *name)</div><div class='ctx'> 	else</div><div class='ctx'> 		br_dev_delete(dev, NULL);</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -509,28 +516,14 @@ void br_mtu_auto_adjust(struct net_bridge *br)</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	/* if the bridge MTU was manually configured don't mess with it */</div><div class='del'>-	if (br-&gt;mtu_set_by_user)</div><div class='add'>+	if (br_opt_get(br, BROPT_MTU_SET_BY_USER))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* change to the minimum MTU and clear the flag which was set by</div><div class='ctx'> 	 * the bridge ndo_change_mtu callback</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev_set_mtu(br-&gt;dev, br_mtu_min(br));</div><div class='del'>-	br-&gt;mtu_set_by_user = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void br_set_gso_limits(struct net_bridge *br)</div><div class='del'>-{</div><div class='del'>-	unsigned int gso_max_size = GSO_MAX_SIZE;</div><div class='del'>-	u16 gso_max_segs = GSO_MAX_SEGS;</div><div class='del'>-	const struct net_bridge_port *p;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='del'>-		gso_max_size = min(gso_max_size, p-&gt;dev-&gt;gso_max_size);</div><div class='del'>-		gso_max_segs = min(gso_max_segs, p-&gt;dev-&gt;gso_max_segs);</div><div class='del'>-	}</div><div class='del'>-	br-&gt;dev-&gt;gso_max_size = gso_max_size;</div><div class='del'>-	br-&gt;dev-&gt;gso_max_segs = gso_max_segs;</div><div class='add'>+	br_opt_toggle(br, BROPT_MTU_SET_BY_USER, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -564,18 +557,12 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned br_hr, dev_hr;</div><div class='del'>-	bool changed_addr;</div><div class='add'>+	bool changed_addr, fdb_synced = false;</div><div class='ctx'> </div><div class='del'>-	/* Don't allow bridging non-ethernet like devices, or DSA-enabled</div><div class='del'>-	 * master network devices since the bridge layer rx_handler prevents</div><div class='del'>-	 * the DSA fake ethertype handler to be invoked, so we do not strip off</div><div class='del'>-	 * the DSA switch tag protocol header and the bridge layer just return</div><div class='del'>-	 * RX_HANDLER_CONSUMED, stopping RX processing for these frames.</div><div class='del'>-	 */</div><div class='add'>+	/* Don't allow bridging non-ethernet like devices. */</div><div class='ctx'> 	if ((dev-&gt;flags &amp; IFF_LOOPBACK) ||</div><div class='ctx'> 	    dev-&gt;type != ARPHRD_ETHER || dev-&gt;addr_len != ETH_ALEN ||</div><div class='del'>-	    !is_valid_ether_addr(dev-&gt;dev_addr) ||</div><div class='del'>-	    netdev_uses_dsa(dev))</div><div class='add'>+	    !is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* No bridging of bridges */</div><div class='hunk'>@@ -603,13 +590,17 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_JOIN, dev);</div><div class='ctx'> </div><div class='ctx'> 	err = dev_set_allmulti(dev, 1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto put_back;</div><div class='add'>+	if (err) {</div><div class='add'>+		br_multicast_del_port(p);</div><div class='add'>+		netdev_put(dev, &amp;p-&gt;dev_tracker);</div><div class='add'>+		kfree(p);	/* kobject not yet init'd, manually free */</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = kobject_init_and_add(&amp;p-&gt;kobj, &amp;brport_ktype, &amp;(dev-&gt;dev.kobj),</div><div class='ctx'> 				   SYSFS_BRIDGE_PORT_ATTR);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err1;</div><div class='add'>+		goto err2;</div><div class='ctx'> </div><div class='ctx'> 	err = br_sysfs_addif(p);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -619,7 +610,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err3;</div><div class='ctx'> </div><div class='del'>-	err = netdev_rx_handler_register(dev, br_handle_frame, p);</div><div class='add'>+	err = netdev_rx_handler_register(dev, br_get_rx_handler(dev), p);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err4;</div><div class='ctx'> </div><div class='hunk'>@@ -629,17 +620,24 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err5;</div><div class='ctx'> </div><div class='del'>-	err = nbp_switchdev_mark_set(p);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err6;</div><div class='del'>-</div><div class='ctx'> 	dev_disable_lro(dev);</div><div class='ctx'> </div><div class='ctx'> 	list_add_rcu(&amp;p-&gt;list, &amp;br-&gt;port_list);</div><div class='ctx'> </div><div class='ctx'> 	nbp_update_port_count(br);</div><div class='del'>-</div><div class='del'>-	netdev_update_features(br-&gt;dev);</div><div class='add'>+	if (!br_promisc_port(p) &amp;&amp; (p-&gt;dev-&gt;priv_flags &amp; IFF_UNICAST_FLT)) {</div><div class='add'>+		/* When updating the port count we also update all ports'</div><div class='add'>+		 * promiscuous mode.</div><div class='add'>+		 * A port leaving promiscuous mode normally gets the bridge's</div><div class='add'>+		 * fdb synced to the unicast filter (if supported), however,</div><div class='add'>+		 * `br_port_clear_promisc` does not distinguish between</div><div class='add'>+		 * non-promiscuous ports and *new* ports, so we need to</div><div class='add'>+		 * sync explicitly here.</div><div class='add'>+		 */</div><div class='add'>+		fdb_synced = br_fdb_sync_static(br, p) == 0;</div><div class='add'>+		if (!fdb_synced)</div><div class='add'>+			netdev_err(dev, "failed to sync bridge static fdb addresses to this port\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	br_hr = br-&gt;dev-&gt;needed_headroom;</div><div class='ctx'> 	dev_hr = netdev_get_fwd_headroom(dev);</div><div class='hunk'>@@ -648,13 +646,23 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		netdev_set_rx_headroom(dev, br_hr);</div><div class='ctx'> </div><div class='del'>-	if (br_fdb_insert(br, p, dev-&gt;dev_addr, 0))</div><div class='add'>+	if (br_fdb_add_local(br, p, dev-&gt;dev_addr, 0))</div><div class='ctx'> 		netdev_err(dev, "failed insert local address bridge forwarding table\n");</div><div class='ctx'> </div><div class='del'>-	err = nbp_vlan_init(p);</div><div class='add'>+	if (br-&gt;dev-&gt;addr_assign_type != NET_ADDR_SET) {</div><div class='add'>+		/* Ask for permission to use this MAC address now, even if we</div><div class='add'>+		 * don't end up choosing it below.</div><div class='add'>+		 */</div><div class='add'>+		err = netif_pre_changeaddr_notify(br-&gt;dev, dev-&gt;dev_addr,</div><div class='add'>+						  extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nbp_vlan_init(p, extack);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_err(dev, "failed to initialize vlan filtering on this port\n");</div><div class='del'>-		goto err7;</div><div class='add'>+		goto err6;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;lock);</div><div class='hunk'>@@ -671,17 +679,19 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEADDR, br-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	br_mtu_auto_adjust(br);</div><div class='del'>-	br_set_gso_limits(br);</div><div class='add'>+</div><div class='add'>+	netdev_compute_master_upper_features(br-&gt;dev, false);</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;p-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err7:</div><div class='add'>+err6:</div><div class='add'>+	if (fdb_synced)</div><div class='add'>+		br_fdb_unsync_static(br, p);</div><div class='ctx'> 	list_del_rcu(&amp;p-&gt;list);</div><div class='ctx'> 	br_fdb_delete_by_port(br, p, 0, 1);</div><div class='ctx'> 	nbp_update_port_count(br);</div><div class='del'>-err6:</div><div class='ctx'> 	netdev_upper_dev_unlink(dev, br-&gt;dev);</div><div class='ctx'> err5:</div><div class='ctx'> 	dev-&gt;priv_flags &amp;= ~IFF_BRIDGE_PORT;</div><div class='hunk'>@@ -691,13 +701,11 @@ err4:</div><div class='ctx'> err3:</div><div class='ctx'> 	sysfs_remove_link(br-&gt;ifobj, p-&gt;dev-&gt;name);</div><div class='ctx'> err2:</div><div class='add'>+	br_multicast_del_port(p);</div><div class='add'>+	netdev_put(dev, &amp;p-&gt;dev_tracker);</div><div class='ctx'> 	kobject_put(&amp;p-&gt;kobj);</div><div class='del'>-	p = NULL; /* kobject_put frees */</div><div class='del'>-err1:</div><div class='ctx'> 	dev_set_allmulti(dev, -1);</div><div class='del'>-put_back:</div><div class='del'>-	dev_put(dev);</div><div class='del'>-	kfree(p);</div><div class='add'>+err1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -718,7 +726,6 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)</div><div class='ctx'> 	del_nbp(p);</div><div class='ctx'> </div><div class='ctx'> 	br_mtu_auto_adjust(br);</div><div class='del'>-	br_set_gso_limits(br);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;lock);</div><div class='ctx'> 	changed_addr = br_stp_recalculate_bridge_id(br);</div><div class='hunk'>@@ -727,7 +734,7 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)</div><div class='ctx'> 	if (changed_addr)</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEADDR, br-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	netdev_update_features(br-&gt;dev);</div><div class='add'>+	netdev_compute_master_upper_features(br-&gt;dev, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -739,6 +746,18 @@ void br_port_flags_change(struct net_bridge_port *p, unsigned long mask)</div><div class='ctx'> 	if (mask &amp; BR_AUTO_MASK)</div><div class='ctx'> 		nbp_update_port_count(br);</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; BR_NEIGH_SUPPRESS)</div><div class='add'>+	if (mask &amp; (BR_NEIGH_SUPPRESS | BR_NEIGH_VLAN_SUPPRESS))</div><div class='ctx'> 		br_recalculate_neigh_suppress_enabled(br);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	p = br_port_get_rtnl_rcu(dev);</div><div class='add'>+	if (!p)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return p-&gt;flags &amp; flag;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_port_flag_is_set);</div><div class='head'>diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c<br/>index 72074276c088..777fa869c1a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_input.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Handle incoming frames</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -16,17 +12,17 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_bridge.h&gt;</div><div class='add'>+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE</div><div class='add'>+#include &lt;net/netfilter/nf_queue.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> #include &lt;linux/neighbour.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> #include "br_private_tunnel.h"</div><div class='ctx'> </div><div class='del'>-/* Hook for brouter */</div><div class='del'>-br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(br_should_route_hook);</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -34,21 +30,24 @@ br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return netif_receive_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_pass_frame_up(struct sk_buff *skb)</div><div class='add'>+static int br_pass_frame_up(struct sk_buff *skb, bool promisc)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)-&gt;brdev;</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(brdev);</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='del'>-	struct pcpu_sw_netstats *brstats = this_cpu_ptr(br-&gt;stats);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;brstats-&gt;syncp);</div><div class='del'>-	brstats-&gt;rx_packets++;</div><div class='del'>-	brstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;brstats-&gt;syncp);</div><div class='add'>+	dev_sw_netstats_rx_add(brdev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	vg = br_vlan_group_rcu(br);</div><div class='add'>+</div><div class='add'>+	/* Reset the offload_fwd_mark because there could be a stacked</div><div class='add'>+	 * bridge above, and it should not think this bridge it doing</div><div class='add'>+	 * that bridge's work forwarding out its ports.</div><div class='add'>+	 */</div><div class='add'>+	br_switchdev_frame_unmark(skb);</div><div class='add'>+</div><div class='ctx'> 	/* Bridge is just like any other port.  Make sure the</div><div class='del'>-	 * packet is allowed except in promisc modue when someone</div><div class='add'>+	 * packet is allowed except in promisc mode when someone</div><div class='ctx'> 	 * may be running packet capture.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(brdev-&gt;flags &amp; IFF_PROMISC) &amp;&amp;</div><div class='hunk'>@@ -66,6 +65,8 @@ static int br_pass_frame_up(struct sk_buff *skb)</div><div class='ctx'> 	br_multicast_count(br, NULL, skb, br_multicast_igmp_type(skb),</div><div class='ctx'> 			   BR_MCAST_DIR_TX);</div><div class='ctx'> </div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;promisc = promisc;</div><div class='add'>+</div><div class='ctx'> 	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN,</div><div class='ctx'> 		       dev_net(indev), NULL, skb, indev, NULL,</div><div class='ctx'> 		       br_netif_receive_skb);</div><div class='hunk'>@@ -74,44 +75,93 @@ static int br_pass_frame_up(struct sk_buff *skb)</div><div class='ctx'> /* note: already called with rcu_read_lock */</div><div class='ctx'> int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct net_bridge_port *p = br_port_get_rcu(skb-&gt;dev);</div><div class='ctx'> 	enum br_pkt_type pkt_type = BR_PKT_UNICAST;</div><div class='ctx'> 	struct net_bridge_fdb_entry *dst = NULL;</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mdst;</div><div class='ctx'> 	bool local_rcv, mcast_hit = false;</div><div class='del'>-	const unsigned char *dest;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='add'>+	bool promisc;</div><div class='ctx'> 	u16 vid = 0;</div><div class='add'>+	u8 state;</div><div class='ctx'> </div><div class='del'>-	if (!p || p-&gt;state == BR_STATE_DISABLED)</div><div class='add'>+	if (!p)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (!br_allowed_ingress(p-&gt;br, nbp_vlan_group_rcu(p), skb, &amp;vid))</div><div class='add'>+	br = p-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (br_mst_is_enabled(p)) {</div><div class='add'>+		state = BR_STATE_FORWARDING;</div><div class='add'>+	} else {</div><div class='add'>+		if (p-&gt;state == BR_STATE_DISABLED) {</div><div class='add'>+			reason = SKB_DROP_REASON_BRIDGE_INGRESS_STP_STATE;</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		state = p-&gt;state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brmctx = &amp;p-&gt;br-&gt;multicast_ctx;</div><div class='add'>+	pmctx = &amp;p-&gt;multicast_ctx;</div><div class='add'>+	if (!br_allowed_ingress(p-&gt;br, nbp_vlan_group_rcu(p), skb, &amp;vid,</div><div class='add'>+				&amp;state, &amp;vlan))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (p-&gt;flags &amp; BR_PORT_LOCKED) {</div><div class='add'>+		struct net_bridge_fdb_entry *fdb_src =</div><div class='add'>+			br_fdb_find_rcu(br, eth_hdr(skb)-&gt;h_source, vid);</div><div class='add'>+</div><div class='add'>+		if (!fdb_src) {</div><div class='add'>+			/* FDB miss. Create locked FDB entry if MAB is enabled</div><div class='add'>+			 * and drop the packet.</div><div class='add'>+			 */</div><div class='add'>+			if (p-&gt;flags &amp; BR_PORT_MAB)</div><div class='add'>+				br_fdb_update(br, p, eth_hdr(skb)-&gt;h_source,</div><div class='add'>+					      vid, BIT(BR_FDB_LOCKED));</div><div class='add'>+			goto drop;</div><div class='add'>+		} else if (READ_ONCE(fdb_src-&gt;dst) != p ||</div><div class='add'>+			   test_bit(BR_FDB_LOCAL, &amp;fdb_src-&gt;flags)) {</div><div class='add'>+			/* FDB mismatch. Drop the packet without roaming. */</div><div class='add'>+			goto drop;</div><div class='add'>+		} else if (test_bit(BR_FDB_LOCKED, &amp;fdb_src-&gt;flags)) {</div><div class='add'>+			/* FDB match, but entry is locked. Refresh it and drop</div><div class='add'>+			 * the packet.</div><div class='add'>+			 */</div><div class='add'>+			br_fdb_update(br, p, eth_hdr(skb)-&gt;h_source, vid,</div><div class='add'>+				      BIT(BR_FDB_LOCKED));</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nbp_switchdev_frame_mark(p, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* insert into forwarding database after filtering to avoid spoofing */</div><div class='del'>-	br = p-&gt;br;</div><div class='ctx'> 	if (p-&gt;flags &amp; BR_LEARNING)</div><div class='del'>-		br_fdb_update(br, p, eth_hdr(skb)-&gt;h_source, vid, false);</div><div class='add'>+		br_fdb_update(br, p, eth_hdr(skb)-&gt;h_source, vid, 0);</div><div class='add'>+</div><div class='add'>+	promisc = !!(br-&gt;dev-&gt;flags &amp; IFF_PROMISC);</div><div class='add'>+	local_rcv = promisc;</div><div class='ctx'> </div><div class='del'>-	local_rcv = !!(br-&gt;dev-&gt;flags &amp; IFF_PROMISC);</div><div class='del'>-	dest = eth_hdr(skb)-&gt;h_dest;</div><div class='del'>-	if (is_multicast_ether_addr(dest)) {</div><div class='add'>+	if (is_multicast_ether_addr(eth_hdr(skb)-&gt;h_dest)) {</div><div class='ctx'> 		/* by definition the broadcast is also a multicast address */</div><div class='del'>-		if (is_broadcast_ether_addr(dest)) {</div><div class='add'>+		if (is_broadcast_ether_addr(eth_hdr(skb)-&gt;h_dest)) {</div><div class='ctx'> 			pkt_type = BR_PKT_BROADCAST;</div><div class='ctx'> 			local_rcv = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pkt_type = BR_PKT_MULTICAST;</div><div class='del'>-			if (br_multicast_rcv(br, p, skb, vid))</div><div class='add'>+			if (br_multicast_rcv(&amp;brmctx, &amp;pmctx, vlan, skb, vid))</div><div class='ctx'> 				goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;state == BR_STATE_LEARNING)</div><div class='add'>+	if (state == BR_STATE_LEARNING) {</div><div class='add'>+		reason = SKB_DROP_REASON_BRIDGE_INGRESS_STP_STATE;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	BR_INPUT_SKB_CB(skb)-&gt;brdev = br-&gt;dev;</div><div class='ctx'> 	BR_INPUT_SKB_CB(skb)-&gt;src_port_isolated = !!(p-&gt;flags &amp; BR_ISOLATED);</div><div class='hunk'>@@ -122,7 +172,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb</div><div class='ctx'> 		br_do_proxy_suppress_arp(skb, br, vid, p);</div><div class='ctx'> 	} else if (IS_ENABLED(CONFIG_IPV6) &amp;&amp;</div><div class='ctx'> 		   skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-		   br-&gt;neigh_suppress_enabled &amp;&amp;</div><div class='add'>+		   br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) &amp;&amp;</div><div class='ctx'> 		   pskb_may_pull(skb, sizeof(struct ipv6hdr) +</div><div class='ctx'> 				 sizeof(struct nd_msg)) &amp;&amp;</div><div class='ctx'> 		   ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_ICMPV6) {</div><div class='hunk'>@@ -135,22 +185,32 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb</div><div class='ctx'> </div><div class='ctx'> 	switch (pkt_type) {</div><div class='ctx'> 	case BR_PKT_MULTICAST:</div><div class='del'>-		mdst = br_mdb_get(br, skb, vid);</div><div class='add'>+		mdst = br_mdb_entry_skb_get(brmctx, skb, vid);</div><div class='ctx'> 		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &amp;&amp;</div><div class='del'>-		    br_multicast_querier_exists(br, eth_hdr(skb))) {</div><div class='add'>+		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) {</div><div class='ctx'> 			if ((mdst &amp;&amp; mdst-&gt;host_joined) ||</div><div class='del'>-			    br_multicast_is_router(br)) {</div><div class='add'>+			    br_multicast_is_router(brmctx, skb) ||</div><div class='add'>+			    br-&gt;dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 				local_rcv = true;</div><div class='del'>-				br-&gt;dev-&gt;stats.multicast++;</div><div class='add'>+				DEV_STATS_INC(br-&gt;dev, multicast);</div><div class='ctx'> 			}</div><div class='ctx'> 			mcast_hit = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			local_rcv = true;</div><div class='del'>-			br-&gt;dev-&gt;stats.multicast++;</div><div class='add'>+			DEV_STATS_INC(br-&gt;dev, multicast);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BR_PKT_UNICAST:</div><div class='del'>-		dst = br_fdb_find_rcu(br, dest, vid);</div><div class='add'>+		dst = br_fdb_find_rcu(br, eth_hdr(skb)-&gt;h_dest, vid);</div><div class='add'>+		if (unlikely(!dst &amp;&amp; vid &amp;&amp;</div><div class='add'>+			     br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0))) {</div><div class='add'>+			dst = br_fdb_find_rcu(br, eth_hdr(skb)-&gt;h_dest, 0);</div><div class='add'>+			if (dst &amp;&amp;</div><div class='add'>+			    (!test_bit(BR_FDB_LOCAL, &amp;dst-&gt;flags) ||</div><div class='add'>+			     test_bit(BR_FDB_ADDED_BY_USER, &amp;dst-&gt;flags)))</div><div class='add'>+				dst = NULL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -158,26 +218,26 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb</div><div class='ctx'> 	if (dst) {</div><div class='ctx'> 		unsigned long now = jiffies;</div><div class='ctx'> </div><div class='del'>-		if (dst-&gt;is_local)</div><div class='del'>-			return br_pass_frame_up(skb);</div><div class='add'>+		if (test_bit(BR_FDB_LOCAL, &amp;dst-&gt;flags))</div><div class='add'>+			return br_pass_frame_up(skb, false);</div><div class='ctx'> </div><div class='ctx'> 		if (now != dst-&gt;used)</div><div class='ctx'> 			dst-&gt;used = now;</div><div class='ctx'> 		br_forward(dst-&gt;dst, skb, local_rcv, false);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!mcast_hit)</div><div class='del'>-			br_flood(br, skb, pkt_type, local_rcv, false);</div><div class='add'>+			br_flood(br, skb, pkt_type, local_rcv, false, vid);</div><div class='ctx'> 		else</div><div class='del'>-			br_multicast_flood(mdst, skb, local_rcv, false);</div><div class='add'>+			br_multicast_flood(mdst, skb, brmctx, local_rcv, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (local_rcv)</div><div class='del'>-		return br_pass_frame_up(skb);</div><div class='add'>+		return br_pass_frame_up(skb, promisc);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_handle_frame_finish);</div><div class='hunk'>@@ -188,19 +248,87 @@ static void __br_handle_local_finish(struct sk_buff *skb)</div><div class='ctx'> 	u16 vid = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check if vlan is allowed, to avoid spoofing */</div><div class='del'>-	if (p-&gt;flags &amp; BR_LEARNING &amp;&amp; br_should_learn(p, skb, &amp;vid))</div><div class='del'>-		br_fdb_update(p-&gt;br, p, eth_hdr(skb)-&gt;h_source, vid, false);</div><div class='add'>+	if ((p-&gt;flags &amp; BR_LEARNING) &amp;&amp;</div><div class='add'>+	    nbp_state_should_learn(p) &amp;&amp;</div><div class='add'>+	    !br_opt_get(p-&gt;br, BROPT_NO_LL_LEARN) &amp;&amp;</div><div class='add'>+	    br_should_learn(p, skb, &amp;vid))</div><div class='add'>+		br_fdb_update(p-&gt;br, p, eth_hdr(skb)-&gt;h_source, vid, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* note: already called with rcu_read_lock */</div><div class='ctx'> static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p = br_port_get_rcu(skb-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	__br_handle_local_finish(skb);</div><div class='ctx'> </div><div class='del'>-	BR_INPUT_SKB_CB(skb)-&gt;brdev = p-&gt;br-&gt;dev;</div><div class='del'>-	br_pass_frame_up(skb);</div><div class='add'>+	/* return 1 to signal the okfn() was called so it's ok to use the skb */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE</div><div class='add'>+	struct nf_hook_entries *e = NULL;</div><div class='add'>+	struct nf_hook_state state;</div><div class='add'>+	unsigned int verdict, i;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	net = dev_net(skb-&gt;dev);</div><div class='add'>+#ifdef HAVE_JUMP_LABEL</div><div class='add'>+	if (!static_key_false(&amp;nf_hooks_needed[NFPROTO_BRIDGE][NF_BR_PRE_ROUTING]))</div><div class='add'>+		goto frame_finish;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	e = rcu_dereference(net-&gt;nf.hooks_bridge[NF_BR_PRE_ROUTING]);</div><div class='add'>+	if (!e)</div><div class='add'>+		goto frame_finish;</div><div class='add'>+</div><div class='add'>+	nf_hook_state_init(&amp;state, NF_BR_PRE_ROUTING,</div><div class='add'>+			   NFPROTO_BRIDGE, skb-&gt;dev, NULL, NULL,</div><div class='add'>+			   net, br_handle_frame_finish);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;num_hook_entries; i++) {</div><div class='add'>+		verdict = nf_hook_entry_hookfn(&amp;e-&gt;hooks[i], skb, &amp;state);</div><div class='add'>+		switch (verdict &amp; NF_VERDICT_MASK) {</div><div class='add'>+		case NF_ACCEPT:</div><div class='add'>+			if (BR_INPUT_SKB_CB(skb)-&gt;br_netfilter_broute) {</div><div class='add'>+				*pskb = skb;</div><div class='add'>+				return RX_HANDLER_PASS;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case NF_DROP:</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return RX_HANDLER_CONSUMED;</div><div class='add'>+		case NF_QUEUE:</div><div class='add'>+			ret = nf_queue(skb, &amp;state, i, verdict);</div><div class='add'>+			if (ret == 1)</div><div class='add'>+				continue;</div><div class='add'>+			return RX_HANDLER_CONSUMED;</div><div class='add'>+		default: /* STOLEN */</div><div class='add'>+			return RX_HANDLER_CONSUMED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+frame_finish:</div><div class='add'>+	net = dev_net(skb-&gt;dev);</div><div class='add'>+	br_handle_frame_finish(net, NULL, skb);</div><div class='add'>+#else</div><div class='add'>+	br_handle_frame_finish(dev_net(skb-&gt;dev), NULL, skb);</div><div class='add'>+#endif</div><div class='add'>+	return RX_HANDLER_CONSUMED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return 0 if the frame was not processed otherwise 1</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static int br_process_frame_type(struct net_bridge_port *p,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct br_frame_type *tmp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(tmp, &amp;p-&gt;br-&gt;frame_type_list, list)</div><div class='add'>+		if (unlikely(tmp-&gt;type == skb-&gt;protocol))</div><div class='add'>+			return tmp-&gt;frame_handler(p, skb);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -208,29 +336,31 @@ static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_bu</div><div class='ctx'>  * Return NULL if skb is handled</div><div class='ctx'>  * note: already called with rcu_read_lock</div><div class='ctx'>  */</div><div class='del'>-rx_handler_result_t br_handle_frame(struct sk_buff **pskb)</div><div class='add'>+static rx_handler_result_t br_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct sk_buff *skb = *pskb;</div><div class='ctx'> 	const unsigned char *dest = eth_hdr(skb)-&gt;h_dest;</div><div class='del'>-	br_should_route_hook_t *rhook;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb-&gt;pkt_type == PACKET_LOOPBACK))</div><div class='ctx'> 		return RX_HANDLER_PASS;</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(eth_hdr(skb)-&gt;h_source))</div><div class='add'>+	if (!is_valid_ether_addr(eth_hdr(skb)-&gt;h_source)) {</div><div class='add'>+		reason = SKB_DROP_REASON_MAC_INVALID_SOURCE;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return RX_HANDLER_CONSUMED;</div><div class='ctx'> </div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(struct br_input_skb_cb));</div><div class='add'>+	br_tc_skb_miss_set(skb, false);</div><div class='add'>+</div><div class='ctx'> 	p = br_port_get_rcu(skb-&gt;dev);</div><div class='del'>-	if (p-&gt;flags &amp; BR_VLAN_TUNNEL) {</div><div class='del'>-		if (br_handle_ingress_vlan_tunnel(skb, p,</div><div class='del'>-						  nbp_vlan_group_rcu(p)))</div><div class='del'>-			goto drop;</div><div class='del'>-	}</div><div class='add'>+	if (p-&gt;flags &amp; BR_VLAN_TUNNEL)</div><div class='add'>+		br_handle_ingress_vlan_tunnel(skb, p, nbp_vlan_group_rcu(p));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_link_local_ether_addr(dest))) {</div><div class='ctx'> 		u16 fwd_mask = p-&gt;br-&gt;group_fwd_mask_required;</div><div class='hunk'>@@ -261,6 +391,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> 			return RX_HANDLER_PASS;</div><div class='ctx'> </div><div class='ctx'> 		case 0x01:	/* IEEE MAC (Pause) */</div><div class='add'>+			reason = SKB_DROP_REASON_MAC_IEEE_MAC_CONTROL;</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='ctx'> 		case 0x0E:	/* 802.1AB LLDP */</div><div class='hunk'>@@ -278,35 +409,77 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> 				goto forward;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Deliver packet to local host only */</div><div class='del'>-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, dev_net(skb-&gt;dev),</div><div class='del'>-			NULL, skb, skb-&gt;dev, NULL, br_handle_local_finish);</div><div class='del'>-		return RX_HANDLER_CONSUMED;</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;promisc = false;</div><div class='add'>+</div><div class='add'>+		/* The else clause should be hit when nf_hook():</div><div class='add'>+		 *   - returns &lt; 0 (drop/error)</div><div class='add'>+		 *   - returns = 0 (stolen/nf_queue)</div><div class='add'>+		 * Thus return 1 from the okfn() to signal the skb is ok to pass</div><div class='add'>+		 */</div><div class='add'>+		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN,</div><div class='add'>+			    dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='add'>+			    br_handle_local_finish) == 1) {</div><div class='add'>+			return RX_HANDLER_PASS;</div><div class='add'>+		} else {</div><div class='add'>+			return RX_HANDLER_CONSUMED;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(br_process_frame_type(p, skb)))</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='add'>+</div><div class='ctx'> forward:</div><div class='add'>+	if (br_mst_is_enabled(p))</div><div class='add'>+		goto defer_stp_filtering;</div><div class='add'>+</div><div class='ctx'> 	switch (p-&gt;state) {</div><div class='ctx'> 	case BR_STATE_FORWARDING:</div><div class='del'>-		rhook = rcu_dereference(br_should_route_hook);</div><div class='del'>-		if (rhook) {</div><div class='del'>-			if ((*rhook)(skb)) {</div><div class='del'>-				*pskb = skb;</div><div class='del'>-				return RX_HANDLER_PASS;</div><div class='del'>-			}</div><div class='del'>-			dest = eth_hdr(skb)-&gt;h_dest;</div><div class='del'>-		}</div><div class='del'>-		/* fall through */</div><div class='ctx'> 	case BR_STATE_LEARNING:</div><div class='add'>+defer_stp_filtering:</div><div class='ctx'> 		if (ether_addr_equal(p-&gt;br-&gt;dev-&gt;dev_addr, dest))</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> </div><div class='del'>-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING,</div><div class='del'>-			dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-			br_handle_frame_finish);</div><div class='del'>-		break;</div><div class='add'>+		return nf_hook_bridge_pre(skb, pskb);</div><div class='ctx'> 	default:</div><div class='add'>+		reason = SKB_DROP_REASON_BRIDGE_INGRESS_STP_STATE;</div><div class='ctx'> drop:</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='ctx'> 	}</div><div class='ctx'> 	return RX_HANDLER_CONSUMED;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* This function has no purpose other than to appease the br_port_get_rcu/rtnl</div><div class='add'>+ * helpers which identify bridged ports according to the rx_handler installed</div><div class='add'>+ * on them (so there _needs_ to be a bridge rx_handler even if we don't need it</div><div class='add'>+ * to do anything useful). This bridge won't support traffic to/from the stack,</div><div class='add'>+ * but only hardware bridging. So return RX_HANDLER_PASS so we don't steal</div><div class='add'>+ * frames from the ETH_P_XDSA packet_type handler.</div><div class='add'>+ */</div><div class='add'>+static rx_handler_result_t br_handle_frame_dummy(struct sk_buff **pskb)</div><div class='add'>+{</div><div class='add'>+	return RX_HANDLER_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+rx_handler_func_t *br_get_rx_handler(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (netdev_uses_dsa(dev))</div><div class='add'>+		return br_handle_frame_dummy;</div><div class='add'>+</div><div class='add'>+	return br_handle_frame;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_add_frame(struct net_bridge *br, struct br_frame_type *ft)</div><div class='add'>+{</div><div class='add'>+	hlist_add_head_rcu(&amp;ft-&gt;list, &amp;br-&gt;frame_type_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_del_frame(struct net_bridge *br, struct br_frame_type *ft)</div><div class='add'>+{</div><div class='add'>+	struct br_frame_type *tmp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(tmp, &amp;br-&gt;frame_type_list, list)</div><div class='add'>+		if (ft == tmp) {</div><div class='add'>+			hlist_del_rcu(&amp;ft-&gt;list);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c<br/>index 73b957fd639d..6bc0a11f2ed3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_ioctl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_ioctl.c</a></div><div class='hunk'>@@ -1,17 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Ioctl handler</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -30,7 +27,7 @@ static int get_bridge_ifindices(struct net *net, int *indices, int num)</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='ctx'> 		if (i &gt;= num)</div><div class='ctx'> 			break;</div><div class='del'>-		if (dev-&gt;priv_flags &amp; IFF_EBRIDGE)</div><div class='add'>+		if (netif_is_bridge_master(dev))</div><div class='ctx'> 			indices[i++] = dev-&gt;ifindex;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -75,7 +72,8 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,</div><div class='ctx'> </div><div class='ctx'> 	num = br_fdb_fillbuf(br, buf, maxnum, offset);</div><div class='ctx'> 	if (num &gt; 0) {</div><div class='del'>-		if (copy_to_user(userbuf, buf, num*sizeof(struct __fdb_entry)))</div><div class='add'>+		if (copy_to_user(userbuf, buf,</div><div class='add'>+				 array_size(num, sizeof(struct __fdb_entry))))</div><div class='ctx'> 			num = -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -105,20 +103,56 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BR_UARGS_MAX 4</div><div class='add'>+static int br_dev_read_uargs(unsigned long *args, size_t nr_args,</div><div class='add'>+			     void __user **argp, void __user *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (nr_args &lt; 2 || nr_args &gt; BR_UARGS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		unsigned int cargs[BR_UARGS_MAX];</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		ret = copy_from_user(cargs, data, nr_args * sizeof(*cargs));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fault;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nr_args; ++i)</div><div class='add'>+			args[i] = cargs[i];</div><div class='add'>+</div><div class='add'>+		*argp = compat_ptr(args[1]);</div><div class='add'>+	} else {</div><div class='add'>+		ret = copy_from_user(args, data, nr_args * sizeof(*args));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fault;</div><div class='add'>+		*argp = (void __user *)args[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fault:</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Legacy ioctl's through SIOCDEVPRIVATE</div><div class='del'>- * This interface is deprecated because it was too difficult to</div><div class='add'>+ * This interface is deprecated because it was too difficult</div><div class='ctx'>  * to do the translation for 32/64bit ioctl compatibility.</div><div class='ctx'>  */</div><div class='del'>-static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+int br_dev_siocdevprivate(struct net_device *dev, struct ifreq *rq,</div><div class='add'>+			  void __user *data, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> 	struct net_bridge_port *p = NULL;</div><div class='ctx'> 	unsigned long args[4];</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='add'>+	void __user *argp;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(args, rq-&gt;ifr_data, sizeof(args)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ret = br_dev_read_uargs(args, ARRAY_SIZE(args), &amp;argp, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (args[0]) {</div><div class='ctx'> 	case BRCTL_ADD_IF:</div><div class='hunk'>@@ -175,7 +209,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		get_port_ifindices(br, indices, num);</div><div class='del'>-		if (copy_to_user((void __user *)args[1], indices, num*sizeof(int)))</div><div class='add'>+		if (copy_to_user(argp, indices, array_size(num, sizeof(int))))</div><div class='ctx'> 			num =  -EFAULT;</div><div class='ctx'> 		kfree(indices);</div><div class='ctx'> 		return num;</div><div class='hunk'>@@ -236,7 +270,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user((void __user *)args[1], &amp;p, sizeof(p)))</div><div class='add'>+		if (copy_to_user(argp, &amp;p, sizeof(p)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -246,8 +280,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		if (!ns_capable(dev_net(dev)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		br_stp_set_enabled(br, args[1]);</div><div class='del'>-		ret = 0;</div><div class='add'>+		ret = br_stp_set_enabled(br, args[1], NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BRCTL_SET_BRIDGE_PRIORITY:</div><div class='hunk'>@@ -287,8 +320,10 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case BRCTL_GET_FDB_ENTRIES:</div><div class='del'>-		return get_fdb_entries(br, (void __user *)args[1],</div><div class='del'>-				       args[2], args[3]);</div><div class='add'>+		return get_fdb_entries(br, argp, args[2], args[3]);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='hunk'>@@ -301,12 +336,15 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int old_deviceless(struct net *net, void __user *uarg)</div><div class='add'>+static int old_deviceless(struct net *net, void __user *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long args[3];</div><div class='add'>+	void __user *argp;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(args, uarg, sizeof(args)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ret = br_dev_read_uargs(args, ARRAY_SIZE(args), &amp;argp, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (args[0]) {</div><div class='ctx'> 	case BRCTL_GET_VERSION:</div><div class='hunk'>@@ -325,7 +363,8 @@ static int old_deviceless(struct net *net, void __user *uarg)</div><div class='ctx'> </div><div class='ctx'> 		args[2] = get_bridge_ifindices(net, indices, args[2]);</div><div class='ctx'> </div><div class='del'>-		ret = copy_to_user((void __user *)args[1], indices, args[2]*sizeof(int))</div><div class='add'>+		ret = copy_to_user(argp, indices,</div><div class='add'>+				   array_size(args[2], sizeof(int)))</div><div class='ctx'> 			? -EFAULT : args[2];</div><div class='ctx'> </div><div class='ctx'> 		kfree(indices);</div><div class='hunk'>@@ -340,7 +379,7 @@ static int old_deviceless(struct net *net, void __user *uarg)</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(buf, (void __user *)args[1], IFNAMSIZ))</div><div class='add'>+		if (copy_from_user(buf, argp, IFNAMSIZ))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		buf[IFNAMSIZ-1] = 0;</div><div class='hunk'>@@ -355,48 +394,77 @@ static int old_deviceless(struct net *net, void __user *uarg)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uarg)</div><div class='add'>+int br_ioctl_stub(struct net *net, unsigned int cmd, void __user *uarg)</div><div class='ctx'> {</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct ifreq ifr;</div><div class='add'>+</div><div class='add'>+	if (cmd == SIOCBRADDIF || cmd == SIOCBRDELIF) {</div><div class='add'>+		void __user *data;</div><div class='add'>+		char *colon;</div><div class='add'>+</div><div class='add'>+		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		if (get_user_ifreq(&amp;ifr, &amp;data, uarg))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		ifr.ifr_name[IFNAMSIZ - 1] = 0;</div><div class='add'>+		colon = strchr(ifr.ifr_name, ':');</div><div class='add'>+		if (colon)</div><div class='add'>+			*colon = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGIFBR:</div><div class='ctx'> 	case SIOCSIFBR:</div><div class='del'>-		return old_deviceless(net, uarg);</div><div class='del'>-</div><div class='add'>+		ret = old_deviceless(net, uarg);</div><div class='add'>+		break;</div><div class='ctx'> 	case SIOCBRADDBR:</div><div class='ctx'> 	case SIOCBRDELBR:</div><div class='ctx'> 	{</div><div class='ctx'> 		char buf[IFNAMSIZ];</div><div class='ctx'> </div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='add'>+		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(buf, uarg, IFNAMSIZ))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (copy_from_user(buf, uarg, IFNAMSIZ)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		buf[IFNAMSIZ-1] = 0;</div><div class='ctx'> 		if (cmd == SIOCBRADDBR)</div><div class='del'>-			return br_add_bridge(net, buf);</div><div class='del'>-</div><div class='del'>-		return br_del_bridge(net, buf);</div><div class='del'>-	}</div><div class='add'>+			ret = br_add_bridge(net, buf);</div><div class='add'>+		else</div><div class='add'>+			ret = br_del_bridge(net, buf);</div><div class='ctx'> 	}</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct net_bridge *br = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCDEVPRIVATE:</div><div class='del'>-		return old_dev_ioctl(dev, rq, cmd);</div><div class='del'>-</div><div class='add'>+		break;</div><div class='ctx'> 	case SIOCBRADDIF:</div><div class='ctx'> 	case SIOCBRDELIF:</div><div class='del'>-		return add_del_if(br, rq-&gt;ifr_ifindex, cmd == SIOCBRADDIF);</div><div class='add'>+	{</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = __dev_get_by_name(net, ifr.ifr_name);</div><div class='add'>+		if (!dev || !netif_device_present(dev)) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!netif_is_bridge_master(dev)) {</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		ret = add_del_if(netdev_priv(dev), ifr.ifr_ifindex, cmd == SIOCBRADDIF);</div><div class='add'>+	}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	br_debug(br, "Bridge does not support ioctl 0x%x\n", cmd);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c<br/>index 6d9f48bd374a..400eb872b403 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mdb.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_mdb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mdb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_mdb.c</a></div><div class='hunk'>@@ -16,31 +16,109 @@</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> </div><div class='del'>-static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			       struct net_device *dev)</div><div class='add'>+static bool</div><div class='add'>+br_ip4_rports_get_timer(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			unsigned long *timer)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = netdev_priv(dev);</div><div class='del'>-	struct net_bridge_port *p;</div><div class='add'>+	*timer = br_timer_value(&amp;pmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+	return !hlist_unhashed(&amp;pmctx-&gt;ip4_rlist);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+br_ip6_rports_get_timer(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			unsigned long *timer)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	*timer = br_timer_value(&amp;pmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+	return !hlist_unhashed(&amp;pmctx-&gt;ip6_rlist);</div><div class='add'>+#else</div><div class='add'>+	*timer = 0;</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t __br_rports_one_size(void)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u32)) + /* MDBA_ROUTER_PORT */</div><div class='add'>+	       nla_total_size(sizeof(u32)) + /* MDBA_ROUTER_PATTR_TIMER */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +  /* MDBA_ROUTER_PATTR_TYPE */</div><div class='add'>+	       nla_total_size(sizeof(u32)) + /* MDBA_ROUTER_PATTR_INET_TIMER */</div><div class='add'>+	       nla_total_size(sizeof(u32)) + /* MDBA_ROUTER_PATTR_INET6_TIMER */</div><div class='add'>+	       nla_total_size(sizeof(u32));  /* MDBA_ROUTER_PATTR_VID */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t br_rports_size(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	size_t size = nla_total_size(0); /* MDBA_ROUTER */</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(pmctx, &amp;brmctx-&gt;ip4_mc_router_list,</div><div class='add'>+				 ip4_rlist)</div><div class='add'>+		size += __br_rports_one_size();</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	hlist_for_each_entry_rcu(pmctx, &amp;brmctx-&gt;ip6_mc_router_list,</div><div class='add'>+				 ip6_rlist)</div><div class='add'>+		size += __br_rports_one_size();</div><div class='add'>+#endif</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_rports_fill_info(struct sk_buff *skb,</div><div class='add'>+			const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	u16 vid = brmctx-&gt;vlan ? brmctx-&gt;vlan-&gt;vid : 0;</div><div class='add'>+	bool have_ip4_mc_rtr, have_ip6_mc_rtr;</div><div class='add'>+	unsigned long ip4_timer, ip6_timer;</div><div class='ctx'> 	struct nlattr *nest, *port_nest;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='ctx'> </div><div class='del'>-	if (!br-&gt;multicast_router || hlist_empty(&amp;br-&gt;router_list))</div><div class='add'>+	if (!brmctx-&gt;multicast_router || !br_rports_have_mc_router(brmctx))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, MDBA_ROUTER);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, MDBA_ROUTER);</div><div class='ctx'> 	if (nest == NULL)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(p, &amp;br-&gt;router_list, rlist) {</div><div class='del'>-		if (!p)</div><div class='add'>+	list_for_each_entry_rcu(p, &amp;brmctx-&gt;br-&gt;port_list, list) {</div><div class='add'>+		struct net_bridge_mcast_port *pmctx;</div><div class='add'>+</div><div class='add'>+		if (vid) {</div><div class='add'>+			struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+			v = br_vlan_find(nbp_vlan_group(p), vid);</div><div class='add'>+			if (!v)</div><div class='add'>+				continue;</div><div class='add'>+			pmctx = &amp;v-&gt;port_mcast_ctx;</div><div class='add'>+		} else {</div><div class='add'>+			pmctx = &amp;p-&gt;multicast_ctx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		have_ip4_mc_rtr = br_ip4_rports_get_timer(pmctx, &amp;ip4_timer);</div><div class='add'>+		have_ip6_mc_rtr = br_ip6_rports_get_timer(pmctx, &amp;ip6_timer);</div><div class='add'>+</div><div class='add'>+		if (!have_ip4_mc_rtr &amp;&amp; !have_ip6_mc_rtr)</div><div class='ctx'> 			continue;</div><div class='del'>-		port_nest = nla_nest_start(skb, MDBA_ROUTER_PORT);</div><div class='add'>+</div><div class='add'>+		port_nest = nla_nest_start_noflag(skb, MDBA_ROUTER_PORT);</div><div class='ctx'> 		if (!port_nest)</div><div class='ctx'> 			goto fail;</div><div class='add'>+</div><div class='ctx'> 		if (nla_put_nohdr(skb, sizeof(u32), &amp;p-&gt;dev-&gt;ifindex) ||</div><div class='ctx'> 		    nla_put_u32(skb, MDBA_ROUTER_PATTR_TIMER,</div><div class='del'>-				br_timer_value(&amp;p-&gt;multicast_router_timer)) ||</div><div class='add'>+				max(ip4_timer, ip6_timer)) ||</div><div class='ctx'> 		    nla_put_u8(skb, MDBA_ROUTER_PATTR_TYPE,</div><div class='del'>-			       p-&gt;multicast_router)) {</div><div class='add'>+			       p-&gt;multicast_ctx.multicast_router) ||</div><div class='add'>+		    (have_ip4_mc_rtr &amp;&amp;</div><div class='add'>+		     nla_put_u32(skb, MDBA_ROUTER_PATTR_INET_TIMER,</div><div class='add'>+				 ip4_timer)) ||</div><div class='add'>+		    (have_ip6_mc_rtr &amp;&amp;</div><div class='add'>+		     nla_put_u32(skb, MDBA_ROUTER_PATTR_INET6_TIMER,</div><div class='add'>+				 ip6_timer)) ||</div><div class='add'>+		    (vid &amp;&amp; nla_put_u16(skb, MDBA_ROUTER_PATTR_VID, vid))) {</div><div class='ctx'> 			nla_nest_cancel(skb, port_nest);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -60,168 +138,291 @@ static void __mdb_entry_fill_flags(struct br_mdb_entry *e, unsigned char flags)</div><div class='ctx'> 	e-&gt;flags = 0;</div><div class='ctx'> 	if (flags &amp; MDB_PG_FLAGS_OFFLOAD)</div><div class='ctx'> 		e-&gt;flags |= MDB_FLAGS_OFFLOAD;</div><div class='add'>+	if (flags &amp; MDB_PG_FLAGS_FAST_LEAVE)</div><div class='add'>+		e-&gt;flags |= MDB_FLAGS_FAST_LEAVE;</div><div class='add'>+	if (flags &amp; MDB_PG_FLAGS_STAR_EXCL)</div><div class='add'>+		e-&gt;flags |= MDB_FLAGS_STAR_EXCL;</div><div class='add'>+	if (flags &amp; MDB_PG_FLAGS_BLOCKED)</div><div class='add'>+		e-&gt;flags |= MDB_FLAGS_BLOCKED;</div><div class='add'>+	if (flags &amp; MDB_PG_FLAGS_OFFLOAD_FAILED)</div><div class='add'>+		e-&gt;flags |= MDB_FLAGS_OFFLOAD_FAILED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip)</div><div class='add'>+static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip,</div><div class='add'>+				 struct nlattr **mdb_attrs)</div><div class='ctx'> {</div><div class='ctx'> 	memset(ip, 0, sizeof(struct br_ip));</div><div class='ctx'> 	ip-&gt;vid = entry-&gt;vid;</div><div class='ctx'> 	ip-&gt;proto = entry-&gt;addr.proto;</div><div class='del'>-	if (ip-&gt;proto == htons(ETH_P_IP))</div><div class='del'>-		ip-&gt;u.ip4 = entry-&gt;addr.u.ip4;</div><div class='add'>+	switch (ip-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		ip-&gt;dst.ip4 = entry-&gt;addr.u.ip4;</div><div class='add'>+		if (mdb_attrs &amp;&amp; mdb_attrs[MDBE_ATTR_SOURCE])</div><div class='add'>+			ip-&gt;src.ip4 = nla_get_in_addr(mdb_attrs[MDBE_ATTR_SOURCE]);</div><div class='add'>+		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	else</div><div class='del'>-		ip-&gt;u.ip6 = entry-&gt;addr.u.ip6;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		ip-&gt;dst.ip6 = entry-&gt;addr.u.ip6;</div><div class='add'>+		if (mdb_attrs &amp;&amp; mdb_attrs[MDBE_ATTR_SOURCE])</div><div class='add'>+			ip-&gt;src.ip6 = nla_get_in6_addr(mdb_attrs[MDBE_ATTR_SOURCE]);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		ether_addr_copy(ip-&gt;dst.mac_addr, entry-&gt;addr.u.mac_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mdb_fill_srcs(struct sk_buff *skb,</div><div class='add'>+			   struct net_bridge_port_group *p)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	struct nlattr *nest, *nest_ent;</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;p-&gt;src_list))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, MDBA_MDB_EATTR_SRC_LIST);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(ent, &amp;p-&gt;src_list, node,</div><div class='add'>+				 lockdep_is_held(&amp;p-&gt;key.port-&gt;br-&gt;multicast_lock)) {</div><div class='add'>+		nest_ent = nla_nest_start(skb, MDBA_MDB_SRCLIST_ENTRY);</div><div class='add'>+		if (!nest_ent)</div><div class='add'>+			goto out_cancel_err;</div><div class='add'>+		switch (ent-&gt;addr.proto) {</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='add'>+			if (nla_put_in_addr(skb, MDBA_MDB_SRCATTR_ADDRESS,</div><div class='add'>+					    ent-&gt;addr.src.ip4)) {</div><div class='add'>+				nla_nest_cancel(skb, nest_ent);</div><div class='add'>+				goto out_cancel_err;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			if (nla_put_in6_addr(skb, MDBA_MDB_SRCATTR_ADDRESS,</div><div class='add'>+					     &amp;ent-&gt;addr.src.ip6)) {</div><div class='add'>+				nla_nest_cancel(skb, nest_ent);</div><div class='add'>+				goto out_cancel_err;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		default:</div><div class='add'>+			nla_nest_cancel(skb, nest_ent);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (nla_put_u32(skb, MDBA_MDB_SRCATTR_TIMER,</div><div class='add'>+				br_timer_value(&amp;ent-&gt;timer))) {</div><div class='add'>+			nla_nest_cancel(skb, nest_ent);</div><div class='add'>+			goto out_cancel_err;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, nest_ent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_cancel_err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mdb_fill_info(struct sk_buff *skb,</div><div class='add'>+			   struct net_bridge_mdb_entry *mp,</div><div class='add'>+			   struct net_bridge_port_group *p)</div><div class='add'>+{</div><div class='add'>+	bool dump_srcs_mode = false;</div><div class='add'>+	struct timer_list *mtimer;</div><div class='add'>+	struct nlattr *nest_ent;</div><div class='add'>+	struct br_mdb_entry e;</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+	int ifindex;</div><div class='add'>+</div><div class='add'>+	memset(&amp;e, 0, sizeof(e));</div><div class='add'>+	if (p) {</div><div class='add'>+		ifindex = p-&gt;key.port-&gt;dev-&gt;ifindex;</div><div class='add'>+		mtimer = &amp;p-&gt;timer;</div><div class='add'>+		flags = p-&gt;flags;</div><div class='add'>+	} else {</div><div class='add'>+		ifindex = mp-&gt;br-&gt;dev-&gt;ifindex;</div><div class='add'>+		mtimer = &amp;mp-&gt;timer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__mdb_entry_fill_flags(&amp;e, flags);</div><div class='add'>+	e.ifindex = ifindex;</div><div class='add'>+	e.vid = mp-&gt;addr.vid;</div><div class='add'>+	if (mp-&gt;addr.proto == htons(ETH_P_IP)) {</div><div class='add'>+		e.addr.u.ip4 = mp-&gt;addr.dst.ip4;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (mp-&gt;addr.proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		e.addr.u.ip6 = mp-&gt;addr.dst.ip6;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		ether_addr_copy(e.addr.u.mac_addr, mp-&gt;addr.dst.mac_addr);</div><div class='add'>+		e.state = MDB_PERMANENT;</div><div class='add'>+	}</div><div class='add'>+	e.addr.proto = mp-&gt;addr.proto;</div><div class='add'>+	nest_ent = nla_nest_start_noflag(skb,</div><div class='add'>+					 MDBA_MDB_ENTRY_INFO);</div><div class='add'>+	if (!nest_ent)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_nohdr(skb, sizeof(e), &amp;e) ||</div><div class='add'>+	    nla_put_u32(skb,</div><div class='add'>+			MDBA_MDB_EATTR_TIMER,</div><div class='add'>+			br_timer_value(mtimer)))</div><div class='add'>+		goto nest_err;</div><div class='add'>+</div><div class='add'>+	switch (mp-&gt;addr.proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		dump_srcs_mode = !!(mp-&gt;br-&gt;multicast_ctx.multicast_igmp_version == 3);</div><div class='add'>+		if (mp-&gt;addr.src.ip4) {</div><div class='add'>+			if (nla_put_in_addr(skb, MDBA_MDB_EATTR_SOURCE,</div><div class='add'>+					    mp-&gt;addr.src.ip4))</div><div class='add'>+				goto nest_err;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		dump_srcs_mode = !!(mp-&gt;br-&gt;multicast_ctx.multicast_mld_version == 2);</div><div class='add'>+		if (!ipv6_addr_any(&amp;mp-&gt;addr.src.ip6)) {</div><div class='add'>+			if (nla_put_in6_addr(skb, MDBA_MDB_EATTR_SOURCE,</div><div class='add'>+					     &amp;mp-&gt;addr.src.ip6))</div><div class='add'>+				goto nest_err;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='add'>+	default:</div><div class='add'>+		ether_addr_copy(e.addr.u.mac_addr, mp-&gt;addr.dst.mac_addr);</div><div class='add'>+	}</div><div class='add'>+	if (p) {</div><div class='add'>+		if (nla_put_u8(skb, MDBA_MDB_EATTR_RTPROT, p-&gt;rt_protocol))</div><div class='add'>+			goto nest_err;</div><div class='add'>+		if (dump_srcs_mode &amp;&amp;</div><div class='add'>+		    (__mdb_fill_srcs(skb, p) ||</div><div class='add'>+		     nla_put_u8(skb, MDBA_MDB_EATTR_GROUP_MODE,</div><div class='add'>+				p-&gt;filter_mode)))</div><div class='add'>+			goto nest_err;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, nest_ent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nest_err:</div><div class='add'>+	nla_nest_cancel(skb, nest_ent);</div><div class='add'>+	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 			    struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	int idx = 0, s_idx = cb-&gt;args[1], err = 0, pidx = 0, s_pidx = cb-&gt;args[2];</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct nlattr *nest, *nest2;</div><div class='del'>-	int i, err = 0;</div><div class='del'>-	int idx = 0, s_idx = cb-&gt;args[1];</div><div class='del'>-</div><div class='del'>-	if (br-&gt;multicast_disabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mdb = rcu_dereference(br-&gt;mdb);</div><div class='del'>-	if (!mdb)</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, MDBA_MDB);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, MDBA_MDB);</div><div class='ctx'> 	if (nest == NULL)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mdb-&gt;max; i++) {</div><div class='del'>-		struct net_bridge_mdb_entry *mp;</div><div class='add'>+	hlist_for_each_entry_rcu(mp, &amp;br-&gt;mdb_list, mdb_node) {</div><div class='ctx'> 		struct net_bridge_port_group *p;</div><div class='ctx'> 		struct net_bridge_port_group __rcu **pp;</div><div class='del'>-		struct net_bridge_port *port;</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_rcu(mp, &amp;mdb-&gt;mhash[i], hlist[mdb-&gt;ver]) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto skip;</div><div class='add'>+		if (idx &lt; s_idx)</div><div class='add'>+			goto skip;</div><div class='ctx'> </div><div class='del'>-			nest2 = nla_nest_start(skb, MDBA_MDB_ENTRY);</div><div class='del'>-			if (nest2 == NULL) {</div><div class='del'>-				err = -EMSGSIZE;</div><div class='del'>-				goto out;</div><div class='add'>+		nest2 = nla_nest_start_noflag(skb, MDBA_MDB_ENTRY);</div><div class='add'>+		if (!nest2) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!s_pidx &amp;&amp; mp-&gt;host_joined) {</div><div class='add'>+			err = __mdb_fill_info(skb, mp, NULL);</div><div class='add'>+			if (err) {</div><div class='add'>+				nla_nest_cancel(skb, nest2);</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			for (pp = &amp;mp-&gt;ports;</div><div class='del'>-			     (p = rcu_dereference(*pp)) != NULL;</div><div class='del'>-			      pp = &amp;p-&gt;next) {</div><div class='del'>-				struct nlattr *nest_ent;</div><div class='del'>-				struct br_mdb_entry e;</div><div class='del'>-</div><div class='del'>-				port = p-&gt;port;</div><div class='del'>-				if (!port)</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				memset(&amp;e, 0, sizeof(e));</div><div class='del'>-				e.ifindex = port-&gt;dev-&gt;ifindex;</div><div class='del'>-				e.vid = p-&gt;addr.vid;</div><div class='del'>-				__mdb_entry_fill_flags(&amp;e, p-&gt;flags);</div><div class='del'>-				if (p-&gt;addr.proto == htons(ETH_P_IP))</div><div class='del'>-					e.addr.u.ip4 = p-&gt;addr.u.ip4;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-				if (p-&gt;addr.proto == htons(ETH_P_IPV6))</div><div class='del'>-					e.addr.u.ip6 = p-&gt;addr.u.ip6;</div><div class='del'>-#endif</div><div class='del'>-				e.addr.proto = p-&gt;addr.proto;</div><div class='del'>-				nest_ent = nla_nest_start(skb,</div><div class='del'>-							  MDBA_MDB_ENTRY_INFO);</div><div class='del'>-				if (!nest_ent) {</div><div class='del'>-					nla_nest_cancel(skb, nest2);</div><div class='del'>-					err = -EMSGSIZE;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				if (nla_put_nohdr(skb, sizeof(e), &amp;e) ||</div><div class='del'>-				    nla_put_u32(skb,</div><div class='del'>-						MDBA_MDB_EATTR_TIMER,</div><div class='del'>-						br_timer_value(&amp;p-&gt;timer))) {</div><div class='del'>-					nla_nest_cancel(skb, nest_ent);</div><div class='del'>-					nla_nest_cancel(skb, nest2);</div><div class='del'>-					err = -EMSGSIZE;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				nla_nest_end(skb, nest_ent);</div><div class='add'>+		for (pp = &amp;mp-&gt;ports; (p = rcu_dereference(*pp)) != NULL;</div><div class='add'>+		      pp = &amp;p-&gt;next) {</div><div class='add'>+			if (!p-&gt;key.port)</div><div class='add'>+				continue;</div><div class='add'>+			if (pidx &lt; s_pidx)</div><div class='add'>+				goto skip_pg;</div><div class='add'>+</div><div class='add'>+			err = __mdb_fill_info(skb, mp, p);</div><div class='add'>+			if (err) {</div><div class='add'>+				nla_nest_end(skb, nest2);</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			nla_nest_end(skb, nest2);</div><div class='del'>-		skip:</div><div class='del'>-			idx++;</div><div class='add'>+skip_pg:</div><div class='add'>+			pidx++;</div><div class='ctx'> 		}</div><div class='add'>+		pidx = 0;</div><div class='add'>+		s_pidx = 0;</div><div class='add'>+		nla_nest_end(skb, nest2);</div><div class='add'>+skip:</div><div class='add'>+		idx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	cb-&gt;args[1] = idx;</div><div class='add'>+	cb-&gt;args[2] = pidx;</div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+int br_mdb_dump(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+		struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct nlmsghdr *nlh = NULL;</div><div class='del'>-	int idx = 0, s_idx;</div><div class='del'>-</div><div class='del'>-	s_idx = cb-&gt;args[0];</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	/* In theory this could be wrapped to 0... */</div><div class='del'>-	cb-&gt;seq = net-&gt;dev_base_seq + br_mdb_rehash_seq;</div><div class='del'>-</div><div class='del'>-	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (dev-&gt;priv_flags &amp; IFF_EBRIDGE) {</div><div class='del'>-			struct br_port_msg *bpm;</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto skip;</div><div class='add'>+	nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			cb-&gt;nlh-&gt;nlmsg_seq, RTM_GETMDB, sizeof(*bpm),</div><div class='add'>+			NLM_F_MULTI);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-			nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					cb-&gt;nlh-&gt;nlmsg_seq, RTM_GETMDB,</div><div class='del'>-					sizeof(*bpm), NLM_F_MULTI);</div><div class='del'>-			if (nlh == NULL)</div><div class='del'>-				break;</div><div class='add'>+	bpm = nlmsg_data(nlh);</div><div class='add'>+	memset(bpm, 0, sizeof(*bpm));</div><div class='add'>+	bpm-&gt;ifindex = dev-&gt;ifindex;</div><div class='ctx'> </div><div class='del'>-			bpm = nlmsg_data(nlh);</div><div class='del'>-			memset(bpm, 0, sizeof(*bpm));</div><div class='del'>-			bpm-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-			if (br_mdb_fill_info(skb, cb, dev) &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			if (br_rports_fill_info(skb, cb, dev) &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-			cb-&gt;args[1] = 0;</div><div class='del'>-			nlmsg_end(skb, nlh);</div><div class='del'>-		skip:</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err = br_mdb_fill_info(skb, cb, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = br_rports_fill_info(skb, &amp;br-&gt;multicast_ctx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (nlh)</div><div class='del'>-		nlmsg_end(skb, nlh);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nlmsg_populate_mdb_fill(struct sk_buff *skb,</div><div class='ctx'> 				   struct net_device *dev,</div><div class='del'>-				   struct br_mdb_entry *entry, u32 pid,</div><div class='del'>-				   u32 seq, int type, unsigned int flags)</div><div class='add'>+				   struct net_bridge_mdb_entry *mp,</div><div class='add'>+				   struct net_bridge_port_group *pg,</div><div class='add'>+				   int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct br_port_msg *bpm;</div><div class='ctx'> 	struct nlattr *nest, *nest2;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*bpm), 0);</div><div class='add'>+	nlh = nlmsg_put(skb, 0, 0, type, sizeof(*bpm), 0);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -229,14 +430,14 @@ static int nlmsg_populate_mdb_fill(struct sk_buff *skb,</div><div class='ctx'> 	memset(bpm, 0, sizeof(*bpm));</div><div class='ctx'> 	bpm-&gt;family  = AF_BRIDGE;</div><div class='ctx'> 	bpm-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-	nest = nla_nest_start(skb, MDBA_MDB);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, MDBA_MDB);</div><div class='ctx'> 	if (nest == NULL)</div><div class='ctx'> 		goto cancel;</div><div class='del'>-	nest2 = nla_nest_start(skb, MDBA_MDB_ENTRY);</div><div class='add'>+	nest2 = nla_nest_start_noflag(skb, MDBA_MDB_ENTRY);</div><div class='ctx'> 	if (nest2 == NULL)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	if (nla_put(skb, MDBA_MDB_ENTRY_INFO, sizeof(*entry), entry))</div><div class='add'>+	if (__mdb_fill_info(skb, mp, pg))</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	nla_nest_end(skb, nest2);</div><div class='hunk'>@@ -251,134 +452,90 @@ cancel:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t rtnl_mdb_nlmsg_size(void)</div><div class='add'>+static size_t rtnl_mdb_nlmsg_pg_size(const struct net_bridge_port_group *pg)</div><div class='ctx'> {</div><div class='del'>-	return NLMSG_ALIGN(sizeof(struct br_port_msg))</div><div class='del'>-		+ nla_total_size(sizeof(struct br_mdb_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct br_mdb_complete_info {</div><div class='del'>-	struct net_bridge_port *port;</div><div class='del'>-	struct br_ip ip;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void br_mdb_complete(struct net_device *dev, int err, void *priv)</div><div class='del'>-{</div><div class='del'>-	struct br_mdb_complete_info *data = priv;</div><div class='del'>-	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct net_bridge_port_group *p;</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='del'>-	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	struct net_bridge_port *port = data-&gt;port;</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	size_t nlmsg_size, addr_size = 0;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		     /* MDBA_MDB_ENTRY_INFO */</div><div class='add'>+	nlmsg_size = nla_total_size(sizeof(struct br_mdb_entry)) +</div><div class='add'>+		     /* MDBA_MDB_EATTR_TIMER */</div><div class='add'>+		     nla_total_size(sizeof(u32));</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	mp = br_mdb_ip_get(mdb, &amp;data-&gt;ip);</div><div class='del'>-	if (!mp)</div><div class='add'>+	if (!pg)</div><div class='ctx'> 		goto out;</div><div class='del'>-	for (pp = &amp;mp-&gt;ports; (p = mlock_dereference(*pp, br)) != NULL;</div><div class='del'>-	     pp = &amp;p-&gt;next) {</div><div class='del'>-		if (p-&gt;port != port)</div><div class='del'>-			continue;</div><div class='del'>-		p-&gt;flags |= MDB_PG_FLAGS_OFFLOAD;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-err:</div><div class='del'>-	kfree(priv);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void br_mdb_switchdev_host_port(struct net_device *dev,</div><div class='del'>-				       struct net_device *lower_dev,</div><div class='del'>-				       struct br_mdb_entry *entry, int type)</div><div class='del'>-{</div><div class='del'>-	struct switchdev_obj_port_mdb mdb = {</div><div class='del'>-		.obj = {</div><div class='del'>-			.id = SWITCHDEV_OBJ_ID_HOST_MDB,</div><div class='del'>-			.flags = SWITCHDEV_F_DEFER,</div><div class='del'>-		},</div><div class='del'>-		.vid = entry-&gt;vid,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;addr.proto == htons(ETH_P_IP))</div><div class='del'>-		ip_eth_mc_map(entry-&gt;addr.u.ip4, mdb.addr);</div><div class='add'>+	/* MDBA_MDB_EATTR_RTPROT */</div><div class='add'>+	nlmsg_size += nla_total_size(sizeof(u8));</div><div class='add'>+</div><div class='add'>+	switch (pg-&gt;key.addr.proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		/* MDBA_MDB_EATTR_SOURCE */</div><div class='add'>+		if (pg-&gt;key.addr.src.ip4)</div><div class='add'>+			nlmsg_size += nla_total_size(sizeof(__be32));</div><div class='add'>+		if (pg-&gt;key.port-&gt;br-&gt;multicast_ctx.multicast_igmp_version == 2)</div><div class='add'>+			goto out;</div><div class='add'>+		addr_size = sizeof(__be32);</div><div class='add'>+		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	else</div><div class='del'>-		ipv6_eth_mc_map(&amp;entry-&gt;addr.u.ip6, mdb.addr);</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		/* MDBA_MDB_EATTR_SOURCE */</div><div class='add'>+		if (!ipv6_addr_any(&amp;pg-&gt;key.addr.src.ip6))</div><div class='add'>+			nlmsg_size += nla_total_size(sizeof(struct in6_addr));</div><div class='add'>+		if (pg-&gt;key.port-&gt;br-&gt;multicast_ctx.multicast_mld_version == 1)</div><div class='add'>+			goto out;</div><div class='add'>+		addr_size = sizeof(struct in6_addr);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mdb.obj.orig_dev = dev;</div><div class='del'>-	switch (type) {</div><div class='del'>-	case RTM_NEWMDB:</div><div class='del'>-		switchdev_port_obj_add(lower_dev, &amp;mdb.obj);</div><div class='del'>-		break;</div><div class='del'>-	case RTM_DELMDB:</div><div class='del'>-		switchdev_port_obj_del(lower_dev, &amp;mdb.obj);</div><div class='del'>-		break;</div><div class='add'>+	/* MDBA_MDB_EATTR_GROUP_MODE */</div><div class='add'>+	nlmsg_size += nla_total_size(sizeof(u8));</div><div class='add'>+</div><div class='add'>+	/* MDBA_MDB_EATTR_SRC_LIST nested attr */</div><div class='add'>+	if (!hlist_empty(&amp;pg-&gt;src_list))</div><div class='add'>+		nlmsg_size += nla_total_size(0);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+		/* MDBA_MDB_SRCLIST_ENTRY nested attr +</div><div class='add'>+		 * MDBA_MDB_SRCATTR_ADDRESS + MDBA_MDB_SRCATTR_TIMER</div><div class='add'>+		 */</div><div class='add'>+		nlmsg_size += nla_total_size(0) +</div><div class='add'>+			      nla_total_size(addr_size) +</div><div class='add'>+			      nla_total_size(sizeof(u32));</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	return nlmsg_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_mdb_switchdev_host(struct net_device *dev,</div><div class='del'>-				  struct br_mdb_entry *entry, int type)</div><div class='add'>+static size_t rtnl_mdb_nlmsg_size(const struct net_bridge_port_group *pg)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *lower_dev;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-</div><div class='del'>-	netdev_for_each_lower_dev(dev, lower_dev, iter)</div><div class='del'>-		br_mdb_switchdev_host_port(dev, lower_dev, entry, type);</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct br_port_msg)) +</div><div class='add'>+	       /* MDBA_MDB */</div><div class='add'>+	       nla_total_size(0) +</div><div class='add'>+	       /* MDBA_MDB_ENTRY */</div><div class='add'>+	       nla_total_size(0) +</div><div class='add'>+	       /* Port group entry */</div><div class='add'>+	       rtnl_mdb_nlmsg_pg_size(pg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __br_mdb_notify(struct net_device *dev, struct net_bridge_port *p,</div><div class='del'>-			    struct br_mdb_entry *entry, int type)</div><div class='add'>+static void __br_mdb_notify(struct net_device *dev,</div><div class='add'>+			    struct net_bridge_mdb_entry *mp,</div><div class='add'>+			    struct net_bridge_port_group *pg,</div><div class='add'>+			    int type, bool notify_switchdev)</div><div class='ctx'> {</div><div class='del'>-	struct br_mdb_complete_info *complete_info;</div><div class='del'>-	struct switchdev_obj_port_mdb mdb = {</div><div class='del'>-		.obj = {</div><div class='del'>-			.id = SWITCHDEV_OBJ_ID_PORT_MDB,</div><div class='del'>-			.flags = SWITCHDEV_F_DEFER,</div><div class='del'>-		},</div><div class='del'>-		.vid = entry-&gt;vid,</div><div class='del'>-	};</div><div class='del'>-	struct net_device *port_dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	port_dev = __dev_get_by_index(net, entry-&gt;ifindex);</div><div class='del'>-	if (entry-&gt;addr.proto == htons(ETH_P_IP))</div><div class='del'>-		ip_eth_mc_map(entry-&gt;addr.u.ip4, mdb.addr);</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	else</div><div class='del'>-		ipv6_eth_mc_map(&amp;entry-&gt;addr.u.ip6, mdb.addr);</div><div class='del'>-#endif</div><div class='add'>+	if (notify_switchdev)</div><div class='add'>+		br_switchdev_mdb_notify(dev, mp, pg, type);</div><div class='ctx'> </div><div class='del'>-	mdb.obj.orig_dev = port_dev;</div><div class='del'>-	if (p &amp;&amp; port_dev &amp;&amp; type == RTM_NEWMDB) {</div><div class='del'>-		complete_info = kmalloc(sizeof(*complete_info), GFP_ATOMIC);</div><div class='del'>-		if (complete_info) {</div><div class='del'>-			complete_info-&gt;port = p;</div><div class='del'>-			__mdb_entry_to_br_ip(entry, &amp;complete_info-&gt;ip);</div><div class='del'>-			mdb.obj.complete_priv = complete_info;</div><div class='del'>-			mdb.obj.complete = br_mdb_complete;</div><div class='del'>-			if (switchdev_port_obj_add(port_dev, &amp;mdb.obj))</div><div class='del'>-				kfree(complete_info);</div><div class='del'>-		}</div><div class='del'>-	} else if (p &amp;&amp; port_dev &amp;&amp; type == RTM_DELMDB) {</div><div class='del'>-		switchdev_port_obj_del(port_dev, &amp;mdb.obj);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!p)</div><div class='del'>-		br_mdb_switchdev_host(dev, entry, type);</div><div class='del'>-</div><div class='del'>-	skb = nlmsg_new(rtnl_mdb_nlmsg_size(), GFP_ATOMIC);</div><div class='add'>+	skb = nlmsg_new(rtnl_mdb_nlmsg_size(pg), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_populate_mdb_fill(skb, dev, entry, 0, 0, type, NTF_SELF);</div><div class='add'>+	err = nlmsg_populate_mdb_fill(skb, dev, mp, pg, type);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -390,36 +547,31 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_MDB, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,</div><div class='del'>-		   struct br_ip *group, int type, u8 flags)</div><div class='add'>+void br_mdb_notify(struct net_device *dev,</div><div class='add'>+		   struct net_bridge_mdb_entry *mp,</div><div class='add'>+		   struct net_bridge_port_group *pg,</div><div class='add'>+		   int type)</div><div class='ctx'> {</div><div class='del'>-	struct br_mdb_entry entry;</div><div class='add'>+	__br_mdb_notify(dev, mp, pg, type, true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;entry, 0, sizeof(entry));</div><div class='del'>-	if (port)</div><div class='del'>-		entry.ifindex = port-&gt;dev-&gt;ifindex;</div><div class='del'>-	else</div><div class='del'>-		entry.ifindex = dev-&gt;ifindex;</div><div class='del'>-	entry.addr.proto = group-&gt;proto;</div><div class='del'>-	entry.addr.u.ip4 = group-&gt;u.ip4;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	entry.addr.u.ip6 = group-&gt;u.ip6;</div><div class='del'>-#endif</div><div class='del'>-	entry.vid = group-&gt;vid;</div><div class='del'>-	__mdb_entry_fill_flags(&amp;entry, flags);</div><div class='del'>-	__br_mdb_notify(dev, port, &amp;entry, type);</div><div class='add'>+void br_mdb_flag_change_notify(struct net_device *dev,</div><div class='add'>+			       struct net_bridge_mdb_entry *mp,</div><div class='add'>+			       struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	__br_mdb_notify(dev, mp, pg, RTM_NEWMDB, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nlmsg_populate_rtr_fill(struct sk_buff *skb,</div><div class='ctx'> 				   struct net_device *dev,</div><div class='del'>-				   int ifindex, u32 pid,</div><div class='add'>+				   int ifindex, u16 vid, u32 pid,</div><div class='ctx'> 				   u32 seq, int type, unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	struct nlattr *nest, *port_nest;</div><div class='ctx'> 	struct br_port_msg *bpm;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='del'>-	struct nlattr *nest;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*bpm), NLM_F_MULTI);</div><div class='add'>+	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*bpm), 0);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -427,12 +579,22 @@ static int nlmsg_populate_rtr_fill(struct sk_buff *skb,</div><div class='ctx'> 	memset(bpm, 0, sizeof(*bpm));</div><div class='ctx'> 	bpm-&gt;family = AF_BRIDGE;</div><div class='ctx'> 	bpm-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-	nest = nla_nest_start(skb, MDBA_ROUTER);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, MDBA_ROUTER);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		goto cancel;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u32(skb, MDBA_ROUTER_PORT, ifindex))</div><div class='add'>+	port_nest = nla_nest_start_noflag(skb, MDBA_ROUTER_PORT);</div><div class='add'>+	if (!port_nest)</div><div class='add'>+		goto end;</div><div class='add'>+	if (nla_put_nohdr(skb, sizeof(u32), &amp;ifindex)) {</div><div class='add'>+		nla_nest_cancel(skb, port_nest);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	if (vid &amp;&amp; nla_put_u16(skb, MDBA_ROUTER_PATTR_VID, vid)) {</div><div class='add'>+		nla_nest_cancel(skb, port_nest);</div><div class='ctx'> 		goto end;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, port_nest);</div><div class='ctx'> </div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='hunk'>@@ -448,23 +610,28 @@ cancel:</div><div class='ctx'> static inline size_t rtnl_rtr_nlmsg_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	return NLMSG_ALIGN(sizeof(struct br_port_msg))</div><div class='del'>-		+ nla_total_size(sizeof(__u32));</div><div class='add'>+		+ nla_total_size(sizeof(__u32))</div><div class='add'>+		+ nla_total_size(sizeof(u16));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,</div><div class='add'>+void br_rtr_notify(struct net_device *dev, struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 		   int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> 	int ifindex;</div><div class='add'>+	u16 vid;</div><div class='ctx'> </div><div class='del'>-	ifindex = port ? port-&gt;dev-&gt;ifindex : 0;</div><div class='add'>+	ifindex = pmctx ? pmctx-&gt;port-&gt;dev-&gt;ifindex : 0;</div><div class='add'>+	vid = pmctx &amp;&amp; br_multicast_port_ctx_is_vlan(pmctx) ? pmctx-&gt;vlan-&gt;vid :</div><div class='add'>+							      0;</div><div class='ctx'> 	skb = nlmsg_new(rtnl_rtr_nlmsg_size(), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_populate_rtr_fill(skb, dev, ifindex, 0, 0, type, NTF_SELF);</div><div class='add'>+	err = nlmsg_populate_rtr_fill(skb, dev, ifindex, vid, 0, 0, type,</div><div class='add'>+				      NTF_SELF);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -477,233 +644,750 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_MDB, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_valid_mdb_entry(struct br_mdb_entry *entry)</div><div class='del'>-{</div><div class='del'>-	if (entry-&gt;ifindex == 0)</div><div class='del'>-		return false;</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mdbe_src_list_entry_pol[MDBE_SRCATTR_MAX + 1] = {</div><div class='add'>+	[MDBE_SRCATTR_ADDRESS] = NLA_POLICY_RANGE(NLA_BINARY,</div><div class='add'>+						  sizeof(struct in_addr),</div><div class='add'>+						  sizeof(struct in6_addr)),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;addr.proto == htons(ETH_P_IP)) {</div><div class='del'>-		if (!ipv4_is_multicast(entry-&gt;addr.u.ip4))</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mdbe_src_list_pol[MDBE_SRC_LIST_MAX + 1] = {</div><div class='add'>+	[MDBE_SRC_LIST_ENTRY] = NLA_POLICY_NESTED(br_mdbe_src_list_entry_pol),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = {</div><div class='add'>+	[MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY,</div><div class='add'>+					      sizeof(struct in_addr),</div><div class='add'>+					      sizeof(struct in6_addr)),</div><div class='add'>+	[MDBE_ATTR_GROUP_MODE] = NLA_POLICY_RANGE(NLA_U8, MCAST_EXCLUDE,</div><div class='add'>+						  MCAST_INCLUDE),</div><div class='add'>+	[MDBE_ATTR_SRC_LIST] = NLA_POLICY_NESTED(br_mdbe_src_list_pol),</div><div class='add'>+	[MDBE_ATTR_RTPROT] = NLA_POLICY_MIN(NLA_U8, RTPROT_STATIC),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool is_valid_mdb_source(struct nlattr *attr, __be16 proto,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		if (nla_len(attr) != sizeof(struct in_addr)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "IPv4 invalid source address length");</div><div class='ctx'> 			return false;</div><div class='del'>-		if (ipv4_is_local_multicast(entry-&gt;addr.u.ip4))</div><div class='add'>+		}</div><div class='add'>+		if (ipv4_is_multicast(nla_get_in_addr(attr))) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "IPv4 multicast source address is not allowed");</div><div class='ctx'> 			return false;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	} else if (entry-&gt;addr.proto == htons(ETH_P_IPV6)) {</div><div class='del'>-		if (ipv6_addr_is_ll_all_nodes(&amp;entry-&gt;addr.u.ip6))</div><div class='add'>+	case htons(ETH_P_IPV6): {</div><div class='add'>+		struct in6_addr src;</div><div class='add'>+</div><div class='add'>+		if (nla_len(attr) != sizeof(struct in6_addr)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "IPv6 invalid source address length");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		src = nla_get_in6_addr(attr);</div><div class='add'>+		if (ipv6_addr_is_multicast(&amp;src)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "IPv6 multicast source address is not allowed");</div><div class='ctx'> 			return false;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='del'>-	} else</div><div class='del'>-		return false;</div><div class='del'>-	if (entry-&gt;state != MDB_PERMANENT &amp;&amp; entry-&gt;state != MDB_TEMPORARY)</div><div class='del'>-		return false;</div><div class='del'>-	if (entry-&gt;vid &gt;= VLAN_VID_MASK)</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid protocol used with source address");</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			struct net_device **pdev, struct br_mdb_entry **pentry)</div><div class='add'>+static struct net_bridge_mcast *</div><div class='add'>+__br_mdb_choose_context(struct net_bridge *br,</div><div class='add'>+			const struct br_mdb_entry *entry,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct br_mdb_entry *entry;</div><div class='del'>-	struct br_port_msg *bpm;</div><div class='del'>-	struct nlattr *tb[MDBA_SET_ENTRY_MAX+1];</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*bpm), tb, MDBA_SET_ENTRY_MAX, NULL,</div><div class='del'>-			  NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	struct net_bridge_mcast *brmctx = NULL;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='ctx'> </div><div class='del'>-	bpm = nlmsg_data(nlh);</div><div class='del'>-	if (bpm-&gt;ifindex == 0) {</div><div class='del'>-		pr_info("PF_BRIDGE: br_mdb_parse() with invalid ifindex\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {</div><div class='add'>+		brmctx = &amp;br-&gt;multicast_ctx;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = __dev_get_by_index(net, bpm-&gt;ifindex);</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		pr_info("PF_BRIDGE: br_mdb_parse() with unknown ifindex\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!entry-&gt;vid) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot add an entry without a vlan when vlan snooping is enabled");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;priv_flags &amp; IFF_EBRIDGE)) {</div><div class='del'>-		pr_info("PF_BRIDGE: br_mdb_parse() with non-bridge\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	v = br_vlan_find(br_vlan_group(br), entry-&gt;vid);</div><div class='add'>+	if (!v) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Vlan is not configured");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (br_multicast_ctx_vlan_global_disabled(&amp;v-&gt;br_mcast_ctx)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Vlan's multicast processing is disabled");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	brmctx = &amp;v-&gt;br_mcast_ctx;</div><div class='add'>+out:</div><div class='add'>+	return brmctx;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	*pdev = dev;</div><div class='add'>+static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,</div><div class='add'>+				   struct net_bridge_mdb_entry *mp,</div><div class='add'>+				   struct net_bridge_port_group *pg,</div><div class='add'>+				   struct net_bridge_mcast *brmctx,</div><div class='add'>+				   unsigned char flags)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (!tb[MDBA_SET_ENTRY] ||</div><div class='del'>-	    nla_len(tb[MDBA_SET_ENTRY]) != sizeof(struct br_mdb_entry)) {</div><div class='del'>-		pr_info("PF_BRIDGE: br_mdb_parse() with invalid attr\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	pg-&gt;flags = flags;</div><div class='add'>+	pg-&gt;rt_protocol = cfg-&gt;rt_protocol;</div><div class='add'>+	if (!(flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp; !cfg-&gt;src_entry)</div><div class='add'>+		mod_timer(&amp;pg-&gt;timer,</div><div class='add'>+			  now + brmctx-&gt;multicast_membership_interval);</div><div class='add'>+	else</div><div class='add'>+		timer_delete(&amp;pg-&gt;timer);</div><div class='add'>+</div><div class='add'>+	br_mdb_notify(cfg-&gt;br-&gt;dev, mp, pg, RTM_NEWMDB);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,</div><div class='add'>+			       struct net_bridge_mdb_entry *mp,</div><div class='add'>+			       struct net_bridge_mcast *brmctx,</div><div class='add'>+			       unsigned char flags,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='add'>+	struct net_bridge_port_group *p;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+</div><div class='add'>+	for (pp = &amp;mp-&gt;ports;</div><div class='add'>+	     (p = mlock_dereference(*pp, cfg-&gt;br)) != NULL;</div><div class='add'>+	     pp = &amp;p-&gt;next) {</div><div class='add'>+		if (p-&gt;key.port == cfg-&gt;p) {</div><div class='add'>+			if (!(cfg-&gt;nlflags &amp; NLM_F_REPLACE)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "(S, G) group is already joined by port");</div><div class='add'>+				return -EEXIST;</div><div class='add'>+			}</div><div class='add'>+			return br_mdb_replace_group_sg(cfg, mp, p, brmctx,</div><div class='add'>+						       flags);</div><div class='add'>+		}</div><div class='add'>+		if ((unsigned long)p-&gt;key.port &lt; (unsigned long)cfg-&gt;p)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	entry = nla_data(tb[MDBA_SET_ENTRY]);</div><div class='del'>-	if (!is_valid_mdb_entry(entry)) {</div><div class='del'>-		pr_info("PF_BRIDGE: br_mdb_parse() with invalid entry\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	p = br_multicast_new_port_group(cfg-&gt;p, &amp;cfg-&gt;group, *pp, flags, NULL,</div><div class='add'>+					MCAST_INCLUDE, cfg-&gt;rt_protocol, extack);</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(*pp, p);</div><div class='add'>+	if (!(flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp; !cfg-&gt;src_entry)</div><div class='add'>+		mod_timer(&amp;p-&gt;timer,</div><div class='add'>+			  now + brmctx-&gt;multicast_membership_interval);</div><div class='add'>+	br_mdb_notify(cfg-&gt;br-&gt;dev, mp, p, RTM_NEWMDB);</div><div class='add'>+</div><div class='add'>+	/* All of (*, G) EXCLUDE ports need to be added to the new (S, G) for</div><div class='add'>+	 * proper replication.</div><div class='add'>+	 */</div><div class='add'>+	if (br_multicast_should_handle_mode(brmctx, cfg-&gt;group.proto)) {</div><div class='add'>+		struct net_bridge_mdb_entry *star_mp;</div><div class='add'>+		struct br_ip star_group;</div><div class='add'>+</div><div class='add'>+		star_group = p-&gt;key.addr;</div><div class='add'>+		memset(&amp;star_group.src, 0, sizeof(star_group.src));</div><div class='add'>+		star_mp = br_mdb_ip_get(cfg-&gt;br, &amp;star_group);</div><div class='add'>+		if (star_mp)</div><div class='add'>+			br_multicast_sg_add_exclude_ports(star_mp, p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pentry = entry;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,</div><div class='del'>-			    struct br_ip *group, unsigned char state)</div><div class='add'>+static int br_mdb_add_group_src_fwd(const struct br_mdb_config *cfg,</div><div class='add'>+				    struct br_ip *src_ip,</div><div class='add'>+				    struct net_bridge_mcast *brmctx,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	struct net_bridge_port_group *p;</div><div class='del'>-	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='add'>+	struct net_bridge_mdb_entry *sgmp;</div><div class='add'>+	struct br_mdb_config sg_cfg;</div><div class='add'>+	struct br_ip sg_ip;</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	sg_ip = cfg-&gt;group;</div><div class='add'>+	sg_ip.src = src_ip-&gt;src;</div><div class='add'>+	sgmp = br_multicast_new_group(cfg-&gt;br, &amp;sg_ip);</div><div class='add'>+	if (IS_ERR(sgmp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to add (S, G) MDB entry");</div><div class='add'>+		return PTR_ERR(sgmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;entry-&gt;state == MDB_PERMANENT)</div><div class='add'>+		flags |= MDB_PG_FLAGS_PERMANENT;</div><div class='add'>+	if (cfg-&gt;filter_mode == MCAST_EXCLUDE)</div><div class='add'>+		flags |= MDB_PG_FLAGS_BLOCKED;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_cfg, 0, sizeof(sg_cfg));</div><div class='add'>+	sg_cfg.br = cfg-&gt;br;</div><div class='add'>+	sg_cfg.p = cfg-&gt;p;</div><div class='add'>+	sg_cfg.entry = cfg-&gt;entry;</div><div class='add'>+	sg_cfg.group = sg_ip;</div><div class='add'>+	sg_cfg.src_entry = true;</div><div class='add'>+	sg_cfg.filter_mode = MCAST_INCLUDE;</div><div class='add'>+	sg_cfg.rt_protocol = cfg-&gt;rt_protocol;</div><div class='add'>+	sg_cfg.nlflags = cfg-&gt;nlflags;</div><div class='add'>+	return br_mdb_add_group_sg(&amp;sg_cfg, sgmp, brmctx, flags, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_add_group_src(const struct br_mdb_config *cfg,</div><div class='add'>+				struct net_bridge_port_group *pg,</div><div class='add'>+				struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct br_mdb_src_entry *src,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	mp = br_mdb_ip_get(mdb, group);</div><div class='del'>-	if (!mp) {</div><div class='del'>-		mp = br_multicast_new_group(br, port, group);</div><div class='del'>-		err = PTR_ERR_OR_ZERO(mp);</div><div class='add'>+	ent = br_multicast_find_group_src(pg, &amp;src-&gt;addr);</div><div class='add'>+	if (!ent) {</div><div class='add'>+		ent = br_multicast_new_group_src(pg, &amp;src-&gt;addr);</div><div class='add'>+		if (!ent) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Failed to add new source entry");</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+	} else if (!(cfg-&gt;nlflags &amp; NLM_F_REPLACE)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Source entry already exists");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;filter_mode == MCAST_INCLUDE &amp;&amp;</div><div class='add'>+	    cfg-&gt;entry-&gt;state == MDB_TEMPORARY)</div><div class='add'>+		mod_timer(&amp;ent-&gt;timer, now + br_multicast_gmi(brmctx));</div><div class='add'>+	else</div><div class='add'>+		timer_delete(&amp;ent-&gt;timer);</div><div class='add'>+</div><div class='add'>+	/* Install a (S, G) forwarding entry for the source. */</div><div class='add'>+	err = br_mdb_add_group_src_fwd(cfg, &amp;src-&gt;addr, brmctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_del_sg;</div><div class='add'>+</div><div class='add'>+	ent-&gt;flags = BR_SGRP_F_INSTALLED | BR_SGRP_F_USER_ADDED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_del_sg:</div><div class='add'>+	__br_multicast_del_group_src(ent);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mdb_del_group_src(struct net_bridge_port_group *pg,</div><div class='add'>+				 struct br_mdb_src_entry *src)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+</div><div class='add'>+	ent = br_multicast_find_group_src(pg, &amp;src-&gt;addr);</div><div class='add'>+	if (WARN_ON_ONCE(!ent))</div><div class='add'>+		return;</div><div class='add'>+	br_multicast_del_group_src(ent, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_add_group_srcs(const struct br_mdb_config *cfg,</div><div class='add'>+				 struct net_bridge_port_group *pg,</div><div class='add'>+				 struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_src_entries; i++) {</div><div class='add'>+		err = br_mdb_add_group_src(cfg, pg, brmctx,</div><div class='add'>+					   &amp;cfg-&gt;src_entries[i], extack);</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			goto err_del_group_srcs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_del_group_srcs:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		br_mdb_del_group_src(pg, &amp;cfg-&gt;src_entries[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_replace_group_srcs(const struct br_mdb_config *cfg,</div><div class='add'>+				     struct net_bridge_port_group *pg,</div><div class='add'>+				     struct net_bridge_mcast *brmctx,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags |= BR_SGRP_F_DELETE;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_add_group_srcs(cfg, pg, brmctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clear_delete;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(ent, tmp, &amp;pg-&gt;src_list, node) {</div><div class='add'>+		if (ent-&gt;flags &amp; BR_SGRP_F_DELETE)</div><div class='add'>+			br_multicast_del_group_src(ent, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_clear_delete:</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags &amp;= ~BR_SGRP_F_DELETE;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_replace_group_star_g(const struct br_mdb_config *cfg,</div><div class='add'>+				       struct net_bridge_mdb_entry *mp,</div><div class='add'>+				       struct net_bridge_port_group *pg,</div><div class='add'>+				       struct net_bridge_mcast *brmctx,</div><div class='add'>+				       unsigned char flags,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_replace_group_srcs(cfg, pg, brmctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pg-&gt;flags = flags;</div><div class='add'>+	pg-&gt;filter_mode = cfg-&gt;filter_mode;</div><div class='add'>+	pg-&gt;rt_protocol = cfg-&gt;rt_protocol;</div><div class='add'>+	if (!(flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp;</div><div class='add'>+	    cfg-&gt;filter_mode == MCAST_EXCLUDE)</div><div class='add'>+		mod_timer(&amp;pg-&gt;timer,</div><div class='add'>+			  now + brmctx-&gt;multicast_membership_interval);</div><div class='add'>+	else</div><div class='add'>+		timer_delete(&amp;pg-&gt;timer);</div><div class='add'>+</div><div class='add'>+	br_mdb_notify(cfg-&gt;br-&gt;dev, mp, pg, RTM_NEWMDB);</div><div class='add'>+</div><div class='add'>+	if (br_multicast_should_handle_mode(brmctx, cfg-&gt;group.proto))</div><div class='add'>+		br_multicast_star_g_handle_mode(pg, cfg-&gt;filter_mode);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_add_group_star_g(const struct br_mdb_config *cfg,</div><div class='add'>+				   struct net_bridge_mdb_entry *mp,</div><div class='add'>+				   struct net_bridge_mcast *brmctx,</div><div class='add'>+				   unsigned char flags,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='add'>+	struct net_bridge_port_group *p;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	for (pp = &amp;mp-&gt;ports;</div><div class='del'>-	     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+	     (p = mlock_dereference(*pp, cfg-&gt;br)) != NULL;</div><div class='ctx'> 	     pp = &amp;p-&gt;next) {</div><div class='del'>-		if (p-&gt;port == port)</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		if ((unsigned long)p-&gt;port &lt; (unsigned long)port)</div><div class='add'>+		if (p-&gt;key.port == cfg-&gt;p) {</div><div class='add'>+			if (!(cfg-&gt;nlflags &amp; NLM_F_REPLACE)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "(*, G) group is already joined by port");</div><div class='add'>+				return -EEXIST;</div><div class='add'>+			}</div><div class='add'>+			return br_mdb_replace_group_star_g(cfg, mp, p, brmctx,</div><div class='add'>+							   flags, extack);</div><div class='add'>+		}</div><div class='add'>+		if ((unsigned long)p-&gt;key.port &lt; (unsigned long)cfg-&gt;p)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = br_multicast_new_port_group(port, group, *pp, state, NULL);</div><div class='add'>+	p = br_multicast_new_port_group(cfg-&gt;p, &amp;cfg-&gt;group, *pp, flags, NULL,</div><div class='add'>+					cfg-&gt;filter_mode, cfg-&gt;rt_protocol,</div><div class='add'>+					extack);</div><div class='ctx'> 	if (unlikely(!p))</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_add_group_srcs(cfg, p, brmctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_del_port_group;</div><div class='add'>+</div><div class='ctx'> 	rcu_assign_pointer(*pp, p);</div><div class='del'>-	if (state == MDB_TEMPORARY)</div><div class='del'>-		mod_timer(&amp;p-&gt;timer, now + br-&gt;multicast_membership_interval);</div><div class='add'>+	if (!(flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp;</div><div class='add'>+	    cfg-&gt;filter_mode == MCAST_EXCLUDE)</div><div class='add'>+		mod_timer(&amp;p-&gt;timer,</div><div class='add'>+			  now + brmctx-&gt;multicast_membership_interval);</div><div class='add'>+	br_mdb_notify(cfg-&gt;br-&gt;dev, mp, p, RTM_NEWMDB);</div><div class='add'>+	/* If we are adding a new EXCLUDE port group (*, G), it needs to be</div><div class='add'>+	 * also added to all (S, G) entries for proper replication.</div><div class='add'>+	 */</div><div class='add'>+	if (br_multicast_should_handle_mode(brmctx, cfg-&gt;group.proto) &amp;&amp;</div><div class='add'>+	    cfg-&gt;filter_mode == MCAST_EXCLUDE)</div><div class='add'>+		br_multicast_star_g_handle_mode(p, MCAST_EXCLUDE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_del_port_group:</div><div class='add'>+	br_multicast_del_port_group(p);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __br_mdb_add(struct net *net, struct net_bridge *br,</div><div class='del'>-			struct br_mdb_entry *entry)</div><div class='add'>+static int br_mdb_add_group(const struct br_mdb_config *cfg,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_mdb_entry *entry = cfg-&gt;entry;</div><div class='add'>+	struct net_bridge_port *port = cfg-&gt;p;</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+	struct net_bridge *br = cfg-&gt;br;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+	struct br_ip group = cfg-&gt;group;</div><div class='add'>+	unsigned char flags = 0;</div><div class='add'>+</div><div class='add'>+	brmctx = __br_mdb_choose_context(br, entry, extack);</div><div class='add'>+	if (!brmctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mp = br_multicast_new_group(br, &amp;group);</div><div class='add'>+	if (IS_ERR(mp))</div><div class='add'>+		return PTR_ERR(mp);</div><div class='add'>+</div><div class='add'>+	/* host join */</div><div class='add'>+	if (!port) {</div><div class='add'>+		if (mp-&gt;host_joined &amp;&amp; !(cfg-&gt;nlflags &amp; NLM_F_REPLACE)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Group is already joined by host");</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		br_multicast_host_join(brmctx, mp, false);</div><div class='add'>+		br_mdb_notify(br-&gt;dev, mp, NULL, RTM_NEWMDB);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;state == MDB_PERMANENT)</div><div class='add'>+		flags |= MDB_PG_FLAGS_PERMANENT;</div><div class='add'>+</div><div class='add'>+	if (br_multicast_is_star_g(&amp;group))</div><div class='add'>+		return br_mdb_add_group_star_g(cfg, mp, brmctx, flags, extack);</div><div class='add'>+	else</div><div class='add'>+		return br_mdb_add_group_sg(cfg, mp, brmctx, flags, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __br_mdb_add(const struct br_mdb_config *cfg,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct br_ip ip;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct net_bridge_port *p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(br-&gt;dev) || br-&gt;multicast_disabled)</div><div class='add'>+	spin_lock_bh(&amp;cfg-&gt;br-&gt;multicast_lock);</div><div class='add'>+	ret = br_mdb_add_group(cfg, extack);</div><div class='add'>+	spin_unlock_bh(&amp;cfg-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_config_src_entry_init(struct nlattr *src_entry,</div><div class='add'>+					struct br_mdb_src_entry *src,</div><div class='add'>+					__be16 proto,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[MDBE_SRCATTR_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, MDBE_SRCATTR_MAX, src_entry,</div><div class='add'>+			       br_mdbe_src_list_entry_pol, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, src_entry, tb, MDBE_SRCATTR_ADDRESS))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev = __dev_get_by_index(net, entry-&gt;ifindex);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!is_valid_mdb_source(tb[MDBE_SRCATTR_ADDRESS], proto, extack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	src-&gt;addr.proto = proto;</div><div class='add'>+	nla_memcpy(&amp;src-&gt;addr.src, tb[MDBE_SRCATTR_ADDRESS],</div><div class='add'>+		   nla_len(tb[MDBE_SRCATTR_ADDRESS]));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	p = br_port_get_rtnl(dev);</div><div class='del'>-	if (!p || p-&gt;br != br || p-&gt;state == BR_STATE_DISABLED)</div><div class='add'>+static int br_mdb_config_src_list_init(struct nlattr *src_list,</div><div class='add'>+				       struct br_mdb_config *cfg,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *src_entry;</div><div class='add'>+	int rem, err;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(src_entry, src_list, rem)</div><div class='add'>+		cfg-&gt;num_src_entries++;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;num_src_entries &gt;= PG_SRC_ENT_LIMIT) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "Exceeded maximum number of source entries (%u)",</div><div class='add'>+				       PG_SRC_ENT_LIMIT - 1);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	__mdb_entry_to_br_ip(entry, &amp;ip);</div><div class='add'>+	cfg-&gt;src_entries = kcalloc(cfg-&gt;num_src_entries,</div><div class='add'>+				   sizeof(struct br_mdb_src_entry), GFP_KERNEL);</div><div class='add'>+	if (!cfg-&gt;src_entries)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	ret = br_mdb_add_group(br, p, &amp;ip, entry-&gt;state);</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	return ret;</div><div class='add'>+	nla_for_each_nested(src_entry, src_list, rem) {</div><div class='add'>+		err = br_mdb_config_src_entry_init(src_entry,</div><div class='add'>+						   &amp;cfg-&gt;src_entries[i],</div><div class='add'>+						   cfg-&gt;entry-&gt;addr.proto,</div><div class='add'>+						   extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_src_entry_init;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_src_entry_init:</div><div class='add'>+	kfree(cfg-&gt;src_entries);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mdb_config_src_list_fini(struct br_mdb_config *cfg)</div><div class='add'>+{</div><div class='add'>+	kfree(cfg-&gt;src_entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_config_attrs_init(struct nlattr *set_attrs,</div><div class='add'>+				    struct br_mdb_config *cfg,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *mdb_attrs[MDBE_ATTR_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(mdb_attrs, MDBE_ATTR_MAX, set_attrs,</div><div class='add'>+			       br_mdbe_attrs_pol, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mdb_attrs[MDBE_ATTR_SOURCE] &amp;&amp;</div><div class='add'>+	    !is_valid_mdb_source(mdb_attrs[MDBE_ATTR_SOURCE],</div><div class='add'>+				 cfg-&gt;entry-&gt;addr.proto, extack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	__mdb_entry_to_br_ip(cfg-&gt;entry, &amp;cfg-&gt;group, mdb_attrs);</div><div class='add'>+</div><div class='add'>+	if (mdb_attrs[MDBE_ATTR_GROUP_MODE]) {</div><div class='add'>+		if (!cfg-&gt;p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Filter mode cannot be set for host groups");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!br_multicast_is_star_g(&amp;cfg-&gt;group)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Filter mode can only be set for (*, G) entries");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;filter_mode = nla_get_u8(mdb_attrs[MDBE_ATTR_GROUP_MODE]);</div><div class='add'>+	} else {</div><div class='add'>+		cfg-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdb_attrs[MDBE_ATTR_SRC_LIST]) {</div><div class='add'>+		if (!cfg-&gt;p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Source list cannot be set for host groups");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!br_multicast_is_star_g(&amp;cfg-&gt;group)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Source list can only be set for (*, G) entries");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!mdb_attrs[MDBE_ATTR_GROUP_MODE]) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Source list cannot be set without filter mode");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		err = br_mdb_config_src_list_init(mdb_attrs[MDBE_ATTR_SRC_LIST],</div><div class='add'>+						  cfg, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;num_src_entries &amp;&amp; cfg-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot add (*, G) INCLUDE with an empty source list");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdb_attrs[MDBE_ATTR_RTPROT]) {</div><div class='add'>+		if (!cfg-&gt;p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Protocol cannot be set for host groups");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;rt_protocol = nla_get_u8(mdb_attrs[MDBE_ATTR_RTPROT]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_config_init(struct br_mdb_config *cfg, struct net_device *dev,</div><div class='add'>+			      struct nlattr *tb[], u16 nlmsg_flags,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	memset(cfg, 0, sizeof(*cfg));</div><div class='add'>+	cfg-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+	cfg-&gt;rt_protocol = RTPROT_STATIC;</div><div class='add'>+	cfg-&gt;nlflags = nlmsg_flags;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;br = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(cfg-&gt;br-&gt;dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Bridge device is not running");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(cfg-&gt;br, BROPT_MULTICAST_ENABLED)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Bridge's multicast processing is disabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg-&gt;entry = nla_data(tb[MDBA_SET_ENTRY]);</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;entry-&gt;ifindex != cfg-&gt;br-&gt;dev-&gt;ifindex) {</div><div class='add'>+		struct net_device *pdev;</div><div class='add'>+</div><div class='add'>+		pdev = __dev_get_by_index(net, cfg-&gt;entry-&gt;ifindex);</div><div class='add'>+		if (!pdev) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Port net device doesn't exist");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfg-&gt;p = br_port_get_rtnl(pdev);</div><div class='add'>+		if (!cfg-&gt;p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Net device is not a bridge port");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;p-&gt;br != cfg-&gt;br) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;entry-&gt;addr.proto == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	    ipv4_is_zeronet(cfg-&gt;entry-&gt;addr.u.ip4)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "IPv4 entry group address 0.0.0.0 is not allowed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[MDBA_SET_ENTRY_ATTRS])</div><div class='add'>+		return br_mdb_config_attrs_init(tb[MDBA_SET_ENTRY_ATTRS], cfg,</div><div class='add'>+						extack);</div><div class='add'>+	else</div><div class='add'>+		__mdb_entry_to_br_ip(cfg-&gt;entry, &amp;cfg-&gt;group, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-		      struct netlink_ext_ack *extack)</div><div class='add'>+static void br_mdb_config_fini(struct br_mdb_config *cfg)</div><div class='add'>+{</div><div class='add'>+	br_mdb_config_src_list_fini(cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mdb_add(struct net_device *dev, struct nlattr *tb[], u16 nlmsg_flags,</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='del'>-	struct net_device *dev, *pdev;</div><div class='del'>-	struct br_mdb_entry *entry;</div><div class='del'>-	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='del'>-	struct net_bridge *br;</div><div class='add'>+	struct br_mdb_config cfg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = br_mdb_parse(skb, nlh, &amp;dev, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = br_mdb_config_init(&amp;cfg, dev, tb, nlmsg_flags, extack);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	br = netdev_priv(dev);</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	/* host join errors which can happen before creating the group */</div><div class='add'>+	if (!cfg.p &amp;&amp; !br_group_is_l2(&amp;cfg.group)) {</div><div class='add'>+		/* don't allow any flags for host-joined IP groups */</div><div class='add'>+		if (cfg.entry-&gt;state) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (!br_multicast_is_star_g(&amp;cfg.group)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Groups with sources cannot be manually host joined");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_group_is_l2(&amp;cfg.group) &amp;&amp; cfg.entry-&gt;state != MDB_PERMANENT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only permanent L2 entries allowed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg.p) {</div><div class='add'>+		if (cfg.p-&gt;state == BR_STATE_DISABLED &amp;&amp; cfg.entry-&gt;state != MDB_PERMANENT) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Port is in disabled state and entry is not permanent");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		vg = nbp_vlan_group(cfg.p);</div><div class='add'>+	} else {</div><div class='add'>+		vg = br_vlan_group(cfg.br);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If vlan filtering is enabled and VLAN is not specified</div><div class='ctx'> 	 * install mdb entry on all vlans configured on the port.</div><div class='ctx'> 	 */</div><div class='del'>-	pdev = __dev_get_by_index(net, entry-&gt;ifindex);</div><div class='del'>-	if (!pdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	p = br_port_get_rtnl(pdev);</div><div class='del'>-	if (!p || p-&gt;br != br || p-&gt;state == BR_STATE_DISABLED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	vg = nbp_vlan_group(p);</div><div class='del'>-	if (br_vlan_enabled(br-&gt;dev) &amp;&amp; vg &amp;&amp; entry-&gt;vid == 0) {</div><div class='add'>+	if (br_vlan_enabled(cfg.br-&gt;dev) &amp;&amp; vg &amp;&amp; cfg.entry-&gt;vid == 0) {</div><div class='ctx'> 		list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='del'>-			entry-&gt;vid = v-&gt;vid;</div><div class='del'>-			err = __br_mdb_add(net, br, entry);</div><div class='add'>+			cfg.entry-&gt;vid = v-&gt;vid;</div><div class='add'>+			cfg.group.vid = v-&gt;vid;</div><div class='add'>+			err = __br_mdb_add(&amp;cfg, extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='del'>-			__br_mdb_notify(dev, p, entry, RTM_NEWMDB);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		err = __br_mdb_add(net, br, entry);</div><div class='del'>-		if (!err)</div><div class='del'>-			__br_mdb_notify(dev, p, entry, RTM_NEWMDB);</div><div class='add'>+		err = __br_mdb_add(&amp;cfg, extack);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	br_mdb_config_fini(&amp;cfg);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)</div><div class='add'>+static int __br_mdb_del(const struct br_mdb_config *cfg)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='add'>+	struct br_mdb_entry *entry = cfg-&gt;entry;</div><div class='add'>+	struct net_bridge *br = cfg-&gt;br;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='ctx'> 	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct br_ip ip;</div><div class='add'>+	struct br_ip ip = cfg-&gt;group;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(br-&gt;dev) || br-&gt;multicast_disabled)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	__mdb_entry_to_br_ip(entry, &amp;ip);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-</div><div class='del'>-	mp = br_mdb_ip_get(mdb, &amp;ip);</div><div class='add'>+	mp = br_mdb_ip_get(br, &amp;ip);</div><div class='ctx'> 	if (!mp)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='add'>+	/* host leave */</div><div class='add'>+	if (entry-&gt;ifindex == mp-&gt;br-&gt;dev-&gt;ifindex &amp;&amp; mp-&gt;host_joined) {</div><div class='add'>+		br_multicast_host_leave(mp, false);</div><div class='add'>+		err = 0;</div><div class='add'>+		br_mdb_notify(br-&gt;dev, mp, NULL, RTM_DELMDB);</div><div class='add'>+		if (!mp-&gt;ports &amp;&amp; netif_running(br-&gt;dev))</div><div class='add'>+			mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (pp = &amp;mp-&gt;ports;</div><div class='ctx'> 	     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='ctx'> 	     pp = &amp;p-&gt;next) {</div><div class='del'>-		if (!p-&gt;port || p-&gt;port-&gt;dev-&gt;ifindex != entry-&gt;ifindex)</div><div class='add'>+		if (!p-&gt;key.port || p-&gt;key.port-&gt;dev-&gt;ifindex != entry-&gt;ifindex)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (p-&gt;port-&gt;state == BR_STATE_DISABLED)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		__mdb_entry_fill_flags(entry, p-&gt;flags);</div><div class='del'>-		rcu_assign_pointer(*pp, p-&gt;next);</div><div class='del'>-		hlist_del_init(&amp;p-&gt;mglist);</div><div class='del'>-		del_timer(&amp;p-&gt;timer);</div><div class='del'>-		call_rcu_bh(&amp;p-&gt;rcu, br_multicast_free_pg);</div><div class='add'>+		br_multicast_del_pg(mp, p, pp);</div><div class='ctx'> 		err = 0;</div><div class='del'>-</div><div class='del'>-		if (!mp-&gt;ports &amp;&amp; !mp-&gt;host_joined &amp;&amp;</div><div class='del'>-		    netif_running(br-&gt;dev))</div><div class='del'>-			mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -712,62 +1396,327 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-		      struct netlink_ext_ack *extack)</div><div class='add'>+int br_mdb_del(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='del'>-	struct net_device *dev, *pdev;</div><div class='del'>-	struct br_mdb_entry *entry;</div><div class='del'>-	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='del'>-	struct net_bridge *br;</div><div class='add'>+	struct br_mdb_config cfg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = br_mdb_parse(skb, nlh, &amp;dev, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = br_mdb_config_init(&amp;cfg, dev, tb, 0, extack);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	br = netdev_priv(dev);</div><div class='add'>+	if (cfg.p)</div><div class='add'>+		vg = nbp_vlan_group(cfg.p);</div><div class='add'>+	else</div><div class='add'>+		vg = br_vlan_group(cfg.br);</div><div class='ctx'> </div><div class='ctx'> 	/* If vlan filtering is enabled and VLAN is not specified</div><div class='ctx'> 	 * delete mdb entry on all vlans configured on the port.</div><div class='ctx'> 	 */</div><div class='del'>-	pdev = __dev_get_by_index(net, entry-&gt;ifindex);</div><div class='del'>-	if (!pdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	p = br_port_get_rtnl(pdev);</div><div class='del'>-	if (!p || p-&gt;br != br || p-&gt;state == BR_STATE_DISABLED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	vg = nbp_vlan_group(p);</div><div class='del'>-	if (br_vlan_enabled(br-&gt;dev) &amp;&amp; vg &amp;&amp; entry-&gt;vid == 0) {</div><div class='add'>+	if (br_vlan_enabled(cfg.br-&gt;dev) &amp;&amp; vg &amp;&amp; cfg.entry-&gt;vid == 0) {</div><div class='ctx'> 		list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='del'>-			entry-&gt;vid = v-&gt;vid;</div><div class='del'>-			err = __br_mdb_del(br, entry);</div><div class='del'>-			if (!err)</div><div class='del'>-				__br_mdb_notify(dev, p, entry, RTM_DELMDB);</div><div class='add'>+			cfg.entry-&gt;vid = v-&gt;vid;</div><div class='add'>+			cfg.group.vid = v-&gt;vid;</div><div class='add'>+			err = __br_mdb_del(&amp;cfg);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		err = __br_mdb_del(br, entry);</div><div class='del'>-		if (!err)</div><div class='del'>-			__br_mdb_notify(dev, p, entry, RTM_DELMDB);</div><div class='add'>+		err = __br_mdb_del(&amp;cfg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	br_mdb_config_fini(&amp;cfg);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_mdb_init(void)</div><div class='add'>+struct br_mdb_flush_desc {</div><div class='add'>+	u32 port_ifindex;</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 rt_protocol;</div><div class='add'>+	u8 state;</div><div class='add'>+	u8 state_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_mdbe_attrs_del_bulk_pol[MDBE_ATTR_MAX + 1] = {</div><div class='add'>+	[MDBE_ATTR_RTPROT] = NLA_POLICY_MIN(NLA_U8, RTPROT_STATIC),</div><div class='add'>+	[MDBE_ATTR_STATE_MASK] = NLA_POLICY_MASK(NLA_U8, MDB_PERMANENT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mdb_flush_desc_init(struct br_mdb_flush_desc *desc,</div><div class='add'>+				  struct nlattr *tb[],</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_mdb_entry *entry = nla_data(tb[MDBA_SET_ENTRY]);</div><div class='add'>+	struct nlattr *mdbe_attrs[MDBE_ATTR_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	desc-&gt;port_ifindex = entry-&gt;ifindex;</div><div class='add'>+	desc-&gt;vid = entry-&gt;vid;</div><div class='add'>+	desc-&gt;state = entry-&gt;state;</div><div class='add'>+</div><div class='add'>+	if (!tb[MDBA_SET_ENTRY_ATTRS])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(mdbe_attrs, MDBE_ATTR_MAX,</div><div class='add'>+			       tb[MDBA_SET_ENTRY_ATTRS],</div><div class='add'>+			       br_mdbe_attrs_del_bulk_pol, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mdbe_attrs[MDBE_ATTR_STATE_MASK])</div><div class='add'>+		desc-&gt;state_mask = nla_get_u8(mdbe_attrs[MDBE_ATTR_STATE_MASK]);</div><div class='add'>+</div><div class='add'>+	if (mdbe_attrs[MDBE_ATTR_RTPROT])</div><div class='add'>+		desc-&gt;rt_protocol = nla_get_u8(mdbe_attrs[MDBE_ATTR_RTPROT]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mdb_flush_host(struct net_bridge *br,</div><div class='add'>+			      struct net_bridge_mdb_entry *mp,</div><div class='add'>+			      const struct br_mdb_flush_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;port_ifindex &amp;&amp; desc-&gt;port_ifindex != br-&gt;dev-&gt;ifindex)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;rt_protocol)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	state = br_group_is_l2(&amp;mp-&gt;addr) ? MDB_PERMANENT : 0;</div><div class='add'>+	if (desc-&gt;state_mask &amp;&amp; (state &amp; desc-&gt;state_mask) != desc-&gt;state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_multicast_host_leave(mp, true);</div><div class='add'>+	if (!mp-&gt;ports &amp;&amp; netif_running(br-&gt;dev))</div><div class='add'>+		mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mdb_flush_pgs(struct net_bridge *br,</div><div class='add'>+			     struct net_bridge_mdb_entry *mp,</div><div class='add'>+			     const struct br_mdb_flush_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='add'>+	struct net_bridge_port_group *p;</div><div class='add'>+</div><div class='add'>+	for (pp = &amp;mp-&gt;ports; (p = mlock_dereference(*pp, br)) != NULL;) {</div><div class='add'>+		u8 state;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;port_ifindex &amp;&amp;</div><div class='add'>+		    desc-&gt;port_ifindex != p-&gt;key.port-&gt;dev-&gt;ifindex) {</div><div class='add'>+			pp = &amp;p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;rt_protocol &amp;&amp; desc-&gt;rt_protocol != p-&gt;rt_protocol) {</div><div class='add'>+			pp = &amp;p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		state = p-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT ? MDB_PERMANENT : 0;</div><div class='add'>+		if (desc-&gt;state_mask &amp;&amp;</div><div class='add'>+		    (state &amp; desc-&gt;state_mask) != desc-&gt;state) {</div><div class='add'>+			pp = &amp;p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		br_multicast_del_pg(mp, p, pp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mdb_flush(struct net_bridge *br,</div><div class='add'>+			 const struct br_mdb_flush_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	/* Safe variant is not needed because entries are removed from the list</div><div class='add'>+	 * upon group timer expiration or bridge deletion.</div><div class='add'>+	 */</div><div class='add'>+	hlist_for_each_entry(mp, &amp;br-&gt;mdb_list, mdb_node) {</div><div class='add'>+		if (desc-&gt;vid &amp;&amp; desc-&gt;vid != mp-&gt;addr.vid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		br_mdb_flush_host(br, mp, desc);</div><div class='add'>+		br_mdb_flush_pgs(br, mp, desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+		    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_GETMDB, NULL, br_mdb_dump, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_NEWMDB, br_mdb_add, NULL, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_DELMDB, br_mdb_del, NULL, 0);</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct br_mdb_flush_desc desc = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_flush_desc_init(&amp;desc, tb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	br_mdb_flush(br, &amp;desc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_mdb_uninit(void)</div><div class='add'>+static const struct nla_policy br_mdbe_attrs_get_pol[MDBE_ATTR_MAX + 1] = {</div><div class='add'>+	[MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY,</div><div class='add'>+					      sizeof(struct in_addr),</div><div class='add'>+					      sizeof(struct in6_addr)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mdb_get_parse(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			    struct br_ip *group, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	rtnl_unregister(PF_BRIDGE, RTM_GETMDB);</div><div class='del'>-	rtnl_unregister(PF_BRIDGE, RTM_NEWMDB);</div><div class='del'>-	rtnl_unregister(PF_BRIDGE, RTM_DELMDB);</div><div class='add'>+	struct br_mdb_entry *entry = nla_data(tb[MDBA_GET_ENTRY]);</div><div class='add'>+	struct nlattr *mdbe_attrs[MDBE_ATTR_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!tb[MDBA_GET_ENTRY_ATTRS]) {</div><div class='add'>+		__mdb_entry_to_br_ip(entry, group, NULL);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(mdbe_attrs, MDBE_ATTR_MAX,</div><div class='add'>+			       tb[MDBA_GET_ENTRY_ATTRS], br_mdbe_attrs_get_pol,</div><div class='add'>+			       extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mdbe_attrs[MDBE_ATTR_SOURCE] &amp;&amp;</div><div class='add'>+	    !is_valid_mdb_source(mdbe_attrs[MDBE_ATTR_SOURCE],</div><div class='add'>+				 entry-&gt;addr.proto, extack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	__mdb_entry_to_br_ip(entry, group, mdbe_attrs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+br_mdb_get_reply_alloc(const struct net_bridge_mdb_entry *mp)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	size_t nlmsg_size;</div><div class='add'>+</div><div class='add'>+	nlmsg_size = NLMSG_ALIGN(sizeof(struct br_port_msg)) +</div><div class='add'>+		     /* MDBA_MDB */</div><div class='add'>+		     nla_total_size(0) +</div><div class='add'>+		     /* MDBA_MDB_ENTRY */</div><div class='add'>+		     nla_total_size(0);</div><div class='add'>+</div><div class='add'>+	if (mp-&gt;host_joined)</div><div class='add'>+		nlmsg_size += rtnl_mdb_nlmsg_pg_size(NULL);</div><div class='add'>+</div><div class='add'>+	for (pg = mlock_dereference(mp-&gt;ports, mp-&gt;br); pg;</div><div class='add'>+	     pg = mlock_dereference(pg-&gt;next, mp-&gt;br))</div><div class='add'>+		nlmsg_size += rtnl_mdb_nlmsg_pg_size(pg);</div><div class='add'>+</div><div class='add'>+	return nlmsg_new(nlmsg_size, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mdb_get_reply_fill(struct sk_buff *skb,</div><div class='add'>+				 struct net_bridge_mdb_entry *mp, u32 portid,</div><div class='add'>+				 u32 seq)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *mdb_nest, *mdb_entry_nest;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, portid, seq, RTM_NEWMDB, sizeof(*bpm), 0);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	bpm = nlmsg_data(nlh);</div><div class='add'>+	memset(bpm, 0, sizeof(*bpm));</div><div class='add'>+	bpm-&gt;family  = AF_BRIDGE;</div><div class='add'>+	bpm-&gt;ifindex = mp-&gt;br-&gt;dev-&gt;ifindex;</div><div class='add'>+	mdb_nest = nla_nest_start_noflag(skb, MDBA_MDB);</div><div class='add'>+	if (!mdb_nest) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+	mdb_entry_nest = nla_nest_start_noflag(skb, MDBA_MDB_ENTRY);</div><div class='add'>+	if (!mdb_entry_nest) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mp-&gt;host_joined) {</div><div class='add'>+		err = __mdb_fill_info(skb, mp, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pg = mlock_dereference(mp-&gt;ports, mp-&gt;br); pg;</div><div class='add'>+	     pg = mlock_dereference(pg-&gt;next, mp-&gt;br)) {</div><div class='add'>+		err = __mdb_fill_info(skb, mp, pg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, mdb_entry_nest);</div><div class='add'>+	nla_nest_end(skb, mdb_nest);</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cancel:</div><div class='add'>+	nlmsg_cancel(skb, nlh);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid, u32 seq,</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct br_ip group;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_mdb_get_parse(dev, tb, &amp;group, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Hold the multicast lock to ensure that the MDB entry does not change</div><div class='add'>+	 * between the time the reply size is determined and when the reply is</div><div class='add'>+	 * filled in.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	mp = br_mdb_ip_get(br, &amp;group);</div><div class='add'>+	if (!mp || (!mp-&gt;ports &amp;&amp; !mp-&gt;host_joined)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "MDB entry not found");</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = br_mdb_get_reply_alloc(mp);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = br_mdb_get_reply_fill(skb, mp, portid, seq);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to fill MDB get reply");</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	return rtnl_unicast(skb, dev_net(dev), portid);</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c<br/>new file mode 100644<br/>index 000000000000..3c36fa24bc05<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mrp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_mrp.c</a></div><div class='hunk'>@@ -0,0 +1,1260 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mrp_bridge.h&gt;</div><div class='add'>+#include "br_private_mrp.h"</div><div class='add'>+</div><div class='add'>+static const u8 mrp_test_dmac[ETH_ALEN] = { 0x1, 0x15, 0x4e, 0x0, 0x0, 0x1 };</div><div class='add'>+static const u8 mrp_in_test_dmac[ETH_ALEN] = { 0x1, 0x15, 0x4e, 0x0, 0x0, 0x3 };</div><div class='add'>+</div><div class='add'>+static int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+static struct br_frame_type mrp_frame_type __read_mostly = {</div><div class='add'>+	.type = cpu_to_be16(ETH_P_MRP),</div><div class='add'>+	.frame_handler = br_mrp_process,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool br_mrp_is_ring_port(struct net_bridge_port *p_port,</div><div class='add'>+				struct net_bridge_port *s_port,</div><div class='add'>+				struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	if (port == p_port ||</div><div class='add'>+	    port == s_port)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_mrp_is_in_port(struct net_bridge_port *i_port,</div><div class='add'>+			      struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	if (port == i_port)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_port *br_mrp_get_port(struct net_bridge *br,</div><div class='add'>+					       u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *res = NULL;</div><div class='add'>+	struct net_bridge_port *port;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;br-&gt;port_list, list) {</div><div class='add'>+		if (port-&gt;dev-&gt;ifindex == ifindex) {</div><div class='add'>+			res = port;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_id)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *res = NULL;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mrp, &amp;br-&gt;mrp_list, list,</div><div class='add'>+				 lockdep_rtnl_is_held()) {</div><div class='add'>+		if (mrp-&gt;ring_id == ring_id) {</div><div class='add'>+			res = mrp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_mrp *br_mrp_find_in_id(struct net_bridge *br, u32 in_id)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *res = NULL;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mrp, &amp;br-&gt;mrp_list, list,</div><div class='add'>+				 lockdep_rtnl_is_held()) {</div><div class='add'>+		if (mrp-&gt;in_id == in_id) {</div><div class='add'>+			res = mrp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_mrp_unique_ifindex(struct net_bridge *br, u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mrp, &amp;br-&gt;mrp_list, list,</div><div class='add'>+				 lockdep_rtnl_is_held()) {</div><div class='add'>+		struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+		p = rtnl_dereference(mrp-&gt;p_port);</div><div class='add'>+		if (p &amp;&amp; p-&gt;dev-&gt;ifindex == ifindex)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		p = rtnl_dereference(mrp-&gt;s_port);</div><div class='add'>+		if (p &amp;&amp; p-&gt;dev-&gt;ifindex == ifindex)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		p = rtnl_dereference(mrp-&gt;i_port);</div><div class='add'>+		if (p &amp;&amp; p-&gt;dev-&gt;ifindex == ifindex)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct br_mrp *br_mrp_find_port(struct net_bridge *br,</div><div class='add'>+				       struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *res = NULL;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mrp, &amp;br-&gt;mrp_list, list,</div><div class='add'>+				 lockdep_rtnl_is_held()) {</div><div class='add'>+		if (rcu_access_pointer(mrp-&gt;p_port) == p ||</div><div class='add'>+		    rcu_access_pointer(mrp-&gt;s_port) == p ||</div><div class='add'>+		    rcu_access_pointer(mrp-&gt;i_port) == p) {</div><div class='add'>+			res = mrp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mrp_next_seq(struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	mrp-&gt;seq_id++;</div><div class='add'>+	return mrp-&gt;seq_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *br_mrp_skb_alloc(struct net_bridge_port *p,</div><div class='add'>+					const u8 *src, const u8 *dst)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth_hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__be16 *version;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(MRP_MAX_FRAME_LENGTH);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = p-&gt;dev;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_MRP);</div><div class='add'>+	skb-&gt;priority = MRP_FRAME_PRIO;</div><div class='add'>+	skb_reserve(skb, sizeof(*eth_hdr));</div><div class='add'>+</div><div class='add'>+	eth_hdr = skb_push(skb, sizeof(*eth_hdr));</div><div class='add'>+	ether_addr_copy(eth_hdr-&gt;h_dest, dst);</div><div class='add'>+	ether_addr_copy(eth_hdr-&gt;h_source, src);</div><div class='add'>+	eth_hdr-&gt;h_proto = htons(ETH_P_MRP);</div><div class='add'>+</div><div class='add'>+	version = skb_put(skb, sizeof(*version));</div><div class='add'>+	*version = cpu_to_be16(MRP_VERSION);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mrp_skb_tlv(struct sk_buff *skb,</div><div class='add'>+			   enum br_mrp_tlv_header_type type,</div><div class='add'>+			   u8 length)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;type = type;</div><div class='add'>+	hdr-&gt;length = length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mrp_skb_common(struct sk_buff *skb, struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp_common_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_COMMON, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;seq_id = cpu_to_be16(br_mrp_next_seq(mrp));</div><div class='add'>+	memset(hdr-&gt;domain, 0xff, MRP_DOMAIN_UUID_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *br_mrp_alloc_test_skb(struct br_mrp *mrp,</div><div class='add'>+					     struct net_bridge_port *p,</div><div class='add'>+					     enum br_mrp_port_role_type port_role)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp_ring_test_hdr *hdr = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = br_mrp_skb_alloc(p, p-&gt;dev-&gt;dev_addr, mrp_test_dmac);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_RING_TEST, sizeof(*hdr));</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;prio = cpu_to_be16(mrp-&gt;prio);</div><div class='add'>+	ether_addr_copy(hdr-&gt;sa, p-&gt;br-&gt;dev-&gt;dev_addr);</div><div class='add'>+	hdr-&gt;port_role = cpu_to_be16(port_role);</div><div class='add'>+	hdr-&gt;state = cpu_to_be16(mrp-&gt;ring_state);</div><div class='add'>+	hdr-&gt;transitions = cpu_to_be16(mrp-&gt;ring_transitions);</div><div class='add'>+	hdr-&gt;timestamp = cpu_to_be32(jiffies_to_msecs(jiffies));</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_common(skb, mrp);</div><div class='add'>+</div><div class='add'>+	/* In case the node behaves as MRA then the Test frame needs to have</div><div class='add'>+	 * an Option TLV which includes eventually a sub-option TLV that has</div><div class='add'>+	 * the type AUTO_MGR</div><div class='add'>+	 */</div><div class='add'>+	if (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRA) {</div><div class='add'>+		struct br_mrp_sub_option1_hdr *sub_opt = NULL;</div><div class='add'>+		struct br_mrp_tlv_hdr *sub_tlv = NULL;</div><div class='add'>+		struct br_mrp_oui_hdr *oui = NULL;</div><div class='add'>+		u8 length;</div><div class='add'>+</div><div class='add'>+		length = sizeof(*sub_opt) + sizeof(*sub_tlv) + sizeof(oui) +</div><div class='add'>+			MRP_OPT_PADDING;</div><div class='add'>+		br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_OPTION, length);</div><div class='add'>+</div><div class='add'>+		oui = skb_put(skb, sizeof(*oui));</div><div class='add'>+		memset(oui, 0x0, sizeof(*oui));</div><div class='add'>+		sub_opt = skb_put(skb, sizeof(*sub_opt));</div><div class='add'>+		memset(sub_opt, 0x0, sizeof(*sub_opt));</div><div class='add'>+</div><div class='add'>+		sub_tlv = skb_put(skb, sizeof(*sub_tlv));</div><div class='add'>+		sub_tlv-&gt;type = BR_MRP_SUB_TLV_HEADER_TEST_AUTO_MGR;</div><div class='add'>+</div><div class='add'>+		/* 32 bit alligment shall be ensured therefore add 2 bytes */</div><div class='add'>+		skb_put(skb, MRP_OPT_PADDING);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_END, 0x0);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *br_mrp_alloc_in_test_skb(struct br_mrp *mrp,</div><div class='add'>+						struct net_bridge_port *p,</div><div class='add'>+						enum br_mrp_port_role_type port_role)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp_in_test_hdr *hdr = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = br_mrp_skb_alloc(p, p-&gt;dev-&gt;dev_addr, mrp_in_test_dmac);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_IN_TEST, sizeof(*hdr));</div><div class='add'>+	hdr = skb_put(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;id = cpu_to_be16(mrp-&gt;in_id);</div><div class='add'>+	ether_addr_copy(hdr-&gt;sa, p-&gt;br-&gt;dev-&gt;dev_addr);</div><div class='add'>+	hdr-&gt;port_role = cpu_to_be16(port_role);</div><div class='add'>+	hdr-&gt;state = cpu_to_be16(mrp-&gt;in_state);</div><div class='add'>+	hdr-&gt;transitions = cpu_to_be16(mrp-&gt;in_transitions);</div><div class='add'>+	hdr-&gt;timestamp = cpu_to_be32(jiffies_to_msecs(jiffies));</div><div class='add'>+</div><div class='add'>+	br_mrp_skb_common(skb, mrp);</div><div class='add'>+	br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_END, 0x0);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is continuously called in the following cases:</div><div class='add'>+ * - when node role is MRM, in this case test_monitor is always set to false</div><div class='add'>+ *   because it needs to notify the userspace that the ring is open and needs to</div><div class='add'>+ *   send MRP_Test frames</div><div class='add'>+ * - when node role is MRA, there are 2 subcases:</div><div class='add'>+ *     - when MRA behaves as MRM, in this case is similar with MRM role</div><div class='add'>+ *     - when MRA behaves as MRC, in this case test_monitor is set to true,</div><div class='add'>+ *       because it needs to detect when it stops seeing MRP_Test frames</div><div class='add'>+ *       from MRM node but it doesn't need to send MRP_Test frames.</div><div class='add'>+ */</div><div class='add'>+static void br_mrp_test_work_expired(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *del_work = to_delayed_work(work);</div><div class='add'>+	struct br_mrp *mrp = container_of(del_work, struct br_mrp, test_work);</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	bool notify_open = false;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (time_before_eq(mrp-&gt;test_end, jiffies))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mrp-&gt;test_count_miss &lt; mrp-&gt;test_max_miss) {</div><div class='add'>+		mrp-&gt;test_count_miss++;</div><div class='add'>+	} else {</div><div class='add'>+		/* Notify that the ring is open only if the ring state is</div><div class='add'>+		 * closed, otherwise it would continue to notify at every</div><div class='add'>+		 * interval.</div><div class='add'>+		 * Also notify that the ring is open when the node has the</div><div class='add'>+		 * role MRA and behaves as MRC. The reason is that the</div><div class='add'>+		 * userspace needs to know when the MRM stopped sending</div><div class='add'>+		 * MRP_Test frames so that the current node to try to take</div><div class='add'>+		 * the role of a MRM.</div><div class='add'>+		 */</div><div class='add'>+		if (mrp-&gt;ring_state == BR_MRP_RING_STATE_CLOSED ||</div><div class='add'>+		    mrp-&gt;test_monitor)</div><div class='add'>+			notify_open = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(mrp-&gt;p_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		if (!mrp-&gt;test_monitor) {</div><div class='add'>+			skb = br_mrp_alloc_test_skb(mrp, p,</div><div class='add'>+						    BR_MRP_PORT_ROLE_PRIMARY);</div><div class='add'>+			if (!skb)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			skb_reset_network_header(skb);</div><div class='add'>+			dev_queue_xmit(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (notify_open &amp;&amp; !mrp-&gt;ring_role_offloaded)</div><div class='add'>+			br_mrp_ring_port_open(p-&gt;dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(mrp-&gt;s_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		if (!mrp-&gt;test_monitor) {</div><div class='add'>+			skb = br_mrp_alloc_test_skb(mrp, p,</div><div class='add'>+						    BR_MRP_PORT_ROLE_SECONDARY);</div><div class='add'>+			if (!skb)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			skb_reset_network_header(skb);</div><div class='add'>+			dev_queue_xmit(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (notify_open &amp;&amp; !mrp-&gt;ring_role_offloaded)</div><div class='add'>+			br_mrp_ring_port_open(p-&gt;dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mrp-&gt;test_work,</div><div class='add'>+			   usecs_to_jiffies(mrp-&gt;test_interval));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is continuously called when the node has the interconnect role</div><div class='add'>+ * MIM. It would generate interconnect test frames and will send them on all 3</div><div class='add'>+ * ports. But will also check if it stop receiving interconnect test frames.</div><div class='add'>+ */</div><div class='add'>+static void br_mrp_in_test_work_expired(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *del_work = to_delayed_work(work);</div><div class='add'>+	struct br_mrp *mrp = container_of(del_work, struct br_mrp, in_test_work);</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	bool notify_open = false;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (time_before_eq(mrp-&gt;in_test_end, jiffies))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mrp-&gt;in_test_count_miss &lt; mrp-&gt;in_test_max_miss) {</div><div class='add'>+		mrp-&gt;in_test_count_miss++;</div><div class='add'>+	} else {</div><div class='add'>+		/* Notify that the interconnect ring is open only if the</div><div class='add'>+		 * interconnect ring state is closed, otherwise it would</div><div class='add'>+		 * continue to notify at every interval.</div><div class='add'>+		 */</div><div class='add'>+		if (mrp-&gt;in_state == BR_MRP_IN_STATE_CLOSED)</div><div class='add'>+			notify_open = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(mrp-&gt;p_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		skb = br_mrp_alloc_in_test_skb(mrp, p,</div><div class='add'>+					       BR_MRP_PORT_ROLE_PRIMARY);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+		dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+		if (notify_open &amp;&amp; !mrp-&gt;in_role_offloaded)</div><div class='add'>+			br_mrp_in_port_open(p-&gt;dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(mrp-&gt;s_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		skb = br_mrp_alloc_in_test_skb(mrp, p,</div><div class='add'>+					       BR_MRP_PORT_ROLE_SECONDARY);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+		dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+		if (notify_open &amp;&amp; !mrp-&gt;in_role_offloaded)</div><div class='add'>+			br_mrp_in_port_open(p-&gt;dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(mrp-&gt;i_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		skb = br_mrp_alloc_in_test_skb(mrp, p,</div><div class='add'>+					       BR_MRP_PORT_ROLE_INTER);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+		dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+		if (notify_open &amp;&amp; !mrp-&gt;in_role_offloaded)</div><div class='add'>+			br_mrp_in_port_open(p-&gt;dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mrp-&gt;in_test_work,</div><div class='add'>+			   usecs_to_jiffies(mrp-&gt;in_test_interval));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deletes the MRP instance.</div><div class='add'>+ * note: called under rtnl_lock</div><div class='add'>+ */</div><div class='add'>+static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	/* Stop sending MRP_Test frames */</div><div class='add'>+	cancel_delayed_work_sync(&amp;mrp-&gt;test_work);</div><div class='add'>+	br_mrp_switchdev_send_ring_test(br, mrp, 0, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* Stop sending MRP_InTest frames if has an interconnect role */</div><div class='add'>+	cancel_delayed_work_sync(&amp;mrp-&gt;in_test_work);</div><div class='add'>+	br_mrp_switchdev_send_in_test(br, mrp, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable the roles */</div><div class='add'>+	br_mrp_switchdev_set_ring_role(br, mrp, BR_MRP_RING_ROLE_DISABLED);</div><div class='add'>+	p = rtnl_dereference(mrp-&gt;i_port);</div><div class='add'>+	if (p)</div><div class='add'>+		br_mrp_switchdev_set_in_role(br, mrp, mrp-&gt;in_id, mrp-&gt;ring_id,</div><div class='add'>+					     BR_MRP_IN_ROLE_DISABLED);</div><div class='add'>+</div><div class='add'>+	br_mrp_switchdev_del(br, mrp);</div><div class='add'>+</div><div class='add'>+	/* Reset the ports */</div><div class='add'>+	p = rtnl_dereference(mrp-&gt;p_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+		state = netif_running(br-&gt;dev) ?</div><div class='add'>+				BR_STATE_FORWARDING : BR_STATE_DISABLED;</div><div class='add'>+		p-&gt;state = state;</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_AWARE;</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+		br_mrp_port_switchdev_set_state(p, state);</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;p_port, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = rtnl_dereference(mrp-&gt;s_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+		state = netif_running(br-&gt;dev) ?</div><div class='add'>+				BR_STATE_FORWARDING : BR_STATE_DISABLED;</div><div class='add'>+		p-&gt;state = state;</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_AWARE;</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+		br_mrp_port_switchdev_set_state(p, state);</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;s_port, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = rtnl_dereference(mrp-&gt;i_port);</div><div class='add'>+	if (p) {</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+		state = netif_running(br-&gt;dev) ?</div><div class='add'>+				BR_STATE_FORWARDING : BR_STATE_DISABLED;</div><div class='add'>+		p-&gt;state = state;</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_AWARE;</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+		br_mrp_port_switchdev_set_state(p, state);</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;i_port, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlist_del_rcu(&amp;mrp-&gt;list);</div><div class='add'>+	kfree_rcu(mrp, rcu);</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;br-&gt;mrp_list))</div><div class='add'>+		br_del_frame(br, &amp;mrp_frame_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Adds a new MRP instance.</div><div class='add'>+ * note: called under rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If the ring exists, it is not possible to create another one with the</div><div class='add'>+	 * same ring_id</div><div class='add'>+	 */</div><div class='add'>+	mrp = br_mrp_find_id(br, instance-&gt;ring_id);</div><div class='add'>+	if (mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!br_mrp_get_port(br, instance-&gt;p_ifindex) ||</div><div class='add'>+	    !br_mrp_get_port(br, instance-&gt;s_ifindex))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* It is not possible to have the same port part of multiple rings */</div><div class='add'>+	if (!br_mrp_unique_ifindex(br, instance-&gt;p_ifindex) ||</div><div class='add'>+	    !br_mrp_unique_ifindex(br, instance-&gt;s_ifindex))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mrp = kzalloc(sizeof(*mrp), GFP_KERNEL);</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;ring_id = instance-&gt;ring_id;</div><div class='add'>+	mrp-&gt;prio = instance-&gt;prio;</div><div class='add'>+</div><div class='add'>+	p = br_mrp_get_port(br, instance-&gt;p_ifindex);</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+	p-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	p-&gt;flags |= BR_MRP_AWARE;</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+	rcu_assign_pointer(mrp-&gt;p_port, p);</div><div class='add'>+</div><div class='add'>+	p = br_mrp_get_port(br, instance-&gt;s_ifindex);</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+	p-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	p-&gt;flags |= BR_MRP_AWARE;</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+	rcu_assign_pointer(mrp-&gt;s_port, p);</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;br-&gt;mrp_list))</div><div class='add'>+		br_add_frame(br, &amp;mrp_frame_type);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mrp-&gt;test_work, br_mrp_test_work_expired);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mrp-&gt;in_test_work, br_mrp_in_test_work_expired);</div><div class='add'>+	hlist_add_tail_rcu(&amp;mrp-&gt;list, &amp;br-&gt;mrp_list);</div><div class='add'>+</div><div class='add'>+	err = br_mrp_switchdev_add(br, mrp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto delete_mrp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+delete_mrp:</div><div class='add'>+	br_mrp_del_impl(br, mrp);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deletes the MRP instance from which the port is part of</div><div class='add'>+ * note: called under rtnl_lock</div><div class='add'>+ */</div><div class='add'>+void br_mrp_port_del(struct net_bridge *br, struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_port(br, p);</div><div class='add'>+</div><div class='add'>+	/* If the port is not part of a MRP instance just bail out */</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_mrp_del_impl(br, mrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deletes existing MRP instance based on ring_id</div><div class='add'>+ * note: called under rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_del(struct net_bridge *br, struct br_mrp_instance *instance)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_id(br, instance-&gt;ring_id);</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	br_mrp_del_impl(br, mrp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set port state, port state can be forwarding, blocked or disabled</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_port_state(struct net_bridge_port *p,</div><div class='add'>+			  enum br_mrp_port_state_type state)</div><div class='add'>+{</div><div class='add'>+	u32 port_state;</div><div class='add'>+</div><div class='add'>+	if (!p || !(p-&gt;flags &amp; BR_MRP_AWARE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;p-&gt;br-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (state == BR_MRP_PORT_STATE_FORWARDING)</div><div class='add'>+		port_state = BR_STATE_FORWARDING;</div><div class='add'>+	else</div><div class='add'>+		port_state = BR_STATE_BLOCKING;</div><div class='add'>+</div><div class='add'>+	p-&gt;state = port_state;</div><div class='add'>+	spin_unlock_bh(&amp;p-&gt;br-&gt;lock);</div><div class='add'>+</div><div class='add'>+	br_mrp_port_switchdev_set_state(p, port_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set port role, port role can be primary or secondary</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_port_role(struct net_bridge_port *p,</div><div class='add'>+			 enum br_mrp_port_role_type role)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	if (!p || !(p-&gt;flags &amp; BR_MRP_AWARE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mrp = br_mrp_find_port(p-&gt;br, p);</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (role) {</div><div class='add'>+	case BR_MRP_PORT_ROLE_PRIMARY:</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;p_port, p);</div><div class='add'>+		break;</div><div class='add'>+	case BR_MRP_PORT_ROLE_SECONDARY:</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;s_port, p);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_mrp_port_switchdev_set_role(p, role);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set ring state, ring state can be only Open or Closed</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_ring_state(struct net_bridge *br,</div><div class='add'>+			  struct br_mrp_ring_state *state)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_id(br, state-&gt;ring_id);</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mrp-&gt;ring_state != state-&gt;ring_state)</div><div class='add'>+		mrp-&gt;ring_transitions++;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;ring_state = state-&gt;ring_state;</div><div class='add'>+</div><div class='add'>+	br_mrp_switchdev_set_ring_state(br, mrp, state-&gt;ring_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set ring role, ring role can be only MRM(Media Redundancy Manager) or</div><div class='add'>+ * MRC(Media Redundancy Client).</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_ring_role(struct net_bridge *br,</div><div class='add'>+			 struct br_mrp_ring_role *role)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_id(br, role-&gt;ring_id);</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;ring_role = role-&gt;ring_role;</div><div class='add'>+</div><div class='add'>+	/* If there is an error just bailed out */</div><div class='add'>+	support = br_mrp_switchdev_set_ring_role(br, mrp, role-&gt;ring_role);</div><div class='add'>+	if (support == BR_MRP_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Now detect if the HW actually applied the role or not. If the HW</div><div class='add'>+	 * applied the role it means that the SW will not to do those operations</div><div class='add'>+	 * anymore. For example if the role ir MRM then the HW will notify the</div><div class='add'>+	 * SW when ring is open, but if the is not pushed to the HW the SW will</div><div class='add'>+	 * need to detect when the ring is open</div><div class='add'>+	 */</div><div class='add'>+	mrp-&gt;ring_role_offloaded = support == BR_MRP_SW ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start to generate or monitor MRP test frames, the frames are generated by</div><div class='add'>+ * HW and if it fails, they are generated by the SW.</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_start_test(struct net_bridge *br,</div><div class='add'>+		      struct br_mrp_start_test *test)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_id(br, test-&gt;ring_id);</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Try to push it to the HW and if it fails then continue with SW</div><div class='add'>+	 * implementation and if that also fails then return error.</div><div class='add'>+	 */</div><div class='add'>+	support = br_mrp_switchdev_send_ring_test(br, mrp, test-&gt;interval,</div><div class='add'>+						  test-&gt;max_miss, test-&gt;period,</div><div class='add'>+						  test-&gt;monitor);</div><div class='add'>+	if (support == BR_MRP_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (support == BR_MRP_HW)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;test_interval = test-&gt;interval;</div><div class='add'>+	mrp-&gt;test_end = jiffies + usecs_to_jiffies(test-&gt;period);</div><div class='add'>+	mrp-&gt;test_max_miss = test-&gt;max_miss;</div><div class='add'>+	mrp-&gt;test_monitor = test-&gt;monitor;</div><div class='add'>+	mrp-&gt;test_count_miss = 0;</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mrp-&gt;test_work,</div><div class='add'>+			   usecs_to_jiffies(test-&gt;interval));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set in state, int state can be only Open or Closed</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_in_state(struct net_bridge *br, struct br_mrp_in_state *state)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_in_id(br, state-&gt;in_id);</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mrp-&gt;in_state != state-&gt;in_state)</div><div class='add'>+		mrp-&gt;in_transitions++;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;in_state = state-&gt;in_state;</div><div class='add'>+</div><div class='add'>+	br_mrp_switchdev_set_in_state(br, mrp, state-&gt;in_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set in role, in role can be only MIM(Media Interconnection Manager) or</div><div class='add'>+ * MIC(Media Interconnection Client).</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_set_in_role(struct net_bridge *br, struct br_mrp_in_role *role)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_id(br, role-&gt;ring_id);</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!br_mrp_get_port(br, role-&gt;i_ifindex))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (role-&gt;in_role == BR_MRP_IN_ROLE_DISABLED) {</div><div class='add'>+		u8 state;</div><div class='add'>+</div><div class='add'>+		/* It is not allowed to disable a port that doesn't exist */</div><div class='add'>+		p = rtnl_dereference(mrp-&gt;i_port);</div><div class='add'>+		if (!p)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Stop the generating MRP_InTest frames */</div><div class='add'>+		cancel_delayed_work_sync(&amp;mrp-&gt;in_test_work);</div><div class='add'>+		br_mrp_switchdev_send_in_test(br, mrp, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+		/* Remove the port */</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+		state = netif_running(br-&gt;dev) ?</div><div class='add'>+				BR_STATE_FORWARDING : BR_STATE_DISABLED;</div><div class='add'>+		p-&gt;state = state;</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_AWARE;</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+		br_mrp_port_switchdev_set_state(p, state);</div><div class='add'>+		rcu_assign_pointer(mrp-&gt;i_port, NULL);</div><div class='add'>+</div><div class='add'>+		mrp-&gt;in_role = role-&gt;in_role;</div><div class='add'>+		mrp-&gt;in_id = 0;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It is not possible to have the same port part of multiple rings */</div><div class='add'>+	if (!br_mrp_unique_ifindex(br, role-&gt;i_ifindex))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* It is not allowed to set a different interconnect port if the mrp</div><div class='add'>+	 * instance has already one. First it needs to be disabled and after</div><div class='add'>+	 * that set the new port</div><div class='add'>+	 */</div><div class='add'>+	if (rcu_access_pointer(mrp-&gt;i_port))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = br_mrp_get_port(br, role-&gt;i_ifindex);</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+	p-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	p-&gt;flags |= BR_MRP_AWARE;</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+	rcu_assign_pointer(mrp-&gt;i_port, p);</div><div class='add'>+</div><div class='add'>+	mrp-&gt;in_role = role-&gt;in_role;</div><div class='add'>+	mrp-&gt;in_id = role-&gt;in_id;</div><div class='add'>+</div><div class='add'>+	/* If there is an error just bailed out */</div><div class='add'>+	support = br_mrp_switchdev_set_in_role(br, mrp, role-&gt;in_id,</div><div class='add'>+					       role-&gt;ring_id, role-&gt;in_role);</div><div class='add'>+	if (support == BR_MRP_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Now detect if the HW actually applied the role or not. If the HW</div><div class='add'>+	 * applied the role it means that the SW will not to do those operations</div><div class='add'>+	 * anymore. For example if the role is MIM then the HW will notify the</div><div class='add'>+	 * SW when interconnect ring is open, but if the is not pushed to the HW</div><div class='add'>+	 * the SW will need to detect when the interconnect ring is open.</div><div class='add'>+	 */</div><div class='add'>+	mrp-&gt;in_role_offloaded = support == BR_MRP_SW ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start to generate MRP_InTest frames, the frames are generated by</div><div class='add'>+ * HW and if it fails, they are generated by the SW.</div><div class='add'>+ * note: already called with rtnl_lock</div><div class='add'>+ */</div><div class='add'>+int br_mrp_start_in_test(struct net_bridge *br,</div><div class='add'>+			 struct br_mrp_start_in_test *in_test)</div><div class='add'>+{</div><div class='add'>+	struct br_mrp *mrp = br_mrp_find_in_id(br, in_test-&gt;in_id);</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+</div><div class='add'>+	if (!mrp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mrp-&gt;in_role != BR_MRP_IN_ROLE_MIM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Try to push it to the HW and if it fails then continue with SW</div><div class='add'>+	 * implementation and if that also fails then return error.</div><div class='add'>+	 */</div><div class='add'>+	support =  br_mrp_switchdev_send_in_test(br, mrp, in_test-&gt;interval,</div><div class='add'>+						 in_test-&gt;max_miss,</div><div class='add'>+						 in_test-&gt;period);</div><div class='add'>+	if (support == BR_MRP_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (support == BR_MRP_HW)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;in_test_interval = in_test-&gt;interval;</div><div class='add'>+	mrp-&gt;in_test_end = jiffies + usecs_to_jiffies(in_test-&gt;period);</div><div class='add'>+	mrp-&gt;in_test_max_miss = in_test-&gt;max_miss;</div><div class='add'>+	mrp-&gt;in_test_count_miss = 0;</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;mrp-&gt;in_test_work,</div><div class='add'>+			   usecs_to_jiffies(in_test-&gt;interval));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if the frame type is a ring frame */</div><div class='add'>+static bool br_mrp_ring_frame(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type == BR_MRP_TLV_HEADER_RING_TEST ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_RING_TOPO ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_RING_LINK_DOWN ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_RING_LINK_UP ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_OPTION)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if the frame type is an interconnect frame */</div><div class='add'>+static bool br_mrp_in_frame(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type == BR_MRP_TLV_HEADER_IN_TEST ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_IN_TOPO ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_IN_LINK_DOWN ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_IN_LINK_UP ||</div><div class='add'>+	    hdr-&gt;type == BR_MRP_TLV_HEADER_IN_LINK_STATUS)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process only MRP Test frame. All the other MRP frames are processed by</div><div class='add'>+ * userspace application</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static void br_mrp_mrm_process(struct br_mrp *mrp, struct net_bridge_port *port,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	/* Each MRP header starts with a version field which is 16 bits.</div><div class='add'>+	 * Therefore skip the version and get directly the TLV header.</div><div class='add'>+	 */</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type != BR_MRP_TLV_HEADER_RING_TEST)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;test_count_miss = 0;</div><div class='add'>+</div><div class='add'>+	/* Notify the userspace that the ring is closed only when the ring is</div><div class='add'>+	 * not closed</div><div class='add'>+	 */</div><div class='add'>+	if (mrp-&gt;ring_state != BR_MRP_RING_STATE_CLOSED)</div><div class='add'>+		br_mrp_ring_port_open(port-&gt;dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if the test hdr has a better priority than the node */</div><div class='add'>+static bool br_mrp_test_better_than_own(struct br_mrp *mrp,</div><div class='add'>+					struct net_bridge *br,</div><div class='add'>+					const struct br_mrp_ring_test_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	u16 prio = be16_to_cpu(hdr-&gt;prio);</div><div class='add'>+</div><div class='add'>+	if (prio &lt; mrp-&gt;prio ||</div><div class='add'>+	    (prio == mrp-&gt;prio &amp;&amp;</div><div class='add'>+	    ether_addr_to_u64(hdr-&gt;sa) &lt; ether_addr_to_u64(br-&gt;dev-&gt;dev_addr)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process only MRP Test frame. All the other MRP frames are processed by</div><div class='add'>+ * userspace application</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static void br_mrp_mra_process(struct br_mrp *mrp, struct net_bridge *br,</div><div class='add'>+			       struct net_bridge_port *port,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_ring_test_hdr *test_hdr;</div><div class='add'>+	struct br_mrp_ring_test_hdr _test_hdr;</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	/* Each MRP header starts with a version field which is 16 bits.</div><div class='add'>+	 * Therefore skip the version and get directly the TLV header.</div><div class='add'>+	 */</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type != BR_MRP_TLV_HEADER_RING_TEST)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	test_hdr = skb_header_pointer(skb, sizeof(uint16_t) + sizeof(_hdr),</div><div class='add'>+				      sizeof(_test_hdr), &amp;_test_hdr);</div><div class='add'>+	if (!test_hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Only frames that have a better priority than the node will</div><div class='add'>+	 * clear the miss counter because otherwise the node will need to behave</div><div class='add'>+	 * as MRM.</div><div class='add'>+	 */</div><div class='add'>+	if (br_mrp_test_better_than_own(mrp, br, test_hdr))</div><div class='add'>+		mrp-&gt;test_count_miss = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process only MRP InTest frame. All the other MRP frames are processed by</div><div class='add'>+ * userspace application</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static bool br_mrp_mim_process(struct br_mrp *mrp, struct net_bridge_port *port,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_in_test_hdr *in_hdr;</div><div class='add'>+	struct br_mrp_in_test_hdr _in_hdr;</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	/* Each MRP header starts with a version field which is 16 bits.</div><div class='add'>+	 * Therefore skip the version and get directly the TLV header.</div><div class='add'>+	 */</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* The check for InTest frame type was already done */</div><div class='add'>+	in_hdr = skb_header_pointer(skb, sizeof(uint16_t) + sizeof(_hdr),</div><div class='add'>+				    sizeof(_in_hdr), &amp;_in_hdr);</div><div class='add'>+	if (!in_hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* It needs to process only it's own InTest frames. */</div><div class='add'>+	if (mrp-&gt;in_id != ntohs(in_hdr-&gt;id))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mrp-&gt;in_test_count_miss = 0;</div><div class='add'>+</div><div class='add'>+	/* Notify the userspace that the ring is closed only when the ring is</div><div class='add'>+	 * not closed</div><div class='add'>+	 */</div><div class='add'>+	if (mrp-&gt;in_state != BR_MRP_IN_STATE_CLOSED)</div><div class='add'>+		br_mrp_in_port_open(port-&gt;dev, false);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the MRP frame type</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static u8 br_mrp_get_frame_type(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct br_mrp_tlv_hdr *hdr;</div><div class='add'>+	struct br_mrp_tlv_hdr _hdr;</div><div class='add'>+</div><div class='add'>+	/* Each MRP header starts with a version field which is 16 bits.</div><div class='add'>+	 * Therefore skip the version and get directly the TLV header.</div><div class='add'>+	 */</div><div class='add'>+	hdr = skb_header_pointer(skb, sizeof(uint16_t), sizeof(_hdr), &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return 0xff;</div><div class='add'>+</div><div class='add'>+	return hdr-&gt;type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_mrp_mrm_behaviour(struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	if (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRM ||</div><div class='add'>+	    (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRA &amp;&amp; !mrp-&gt;test_monitor))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_mrp_mrc_behaviour(struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	if (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRC ||</div><div class='add'>+	    (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRA &amp;&amp; mrp-&gt;test_monitor))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This will just forward the frame to the other mrp ring ports, depending on</div><div class='add'>+ * the frame type, ring role and interconnect role</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static int br_mrp_rcv(struct net_bridge_port *p,</div><div class='add'>+		      struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p_port, *s_port, *i_port = NULL;</div><div class='add'>+	struct net_bridge_port *p_dst, *s_dst, *i_dst = NULL;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	/* If port is disabled don't accept any frames */</div><div class='add'>+	if (p-&gt;state == BR_STATE_DISABLED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	br = p-&gt;br;</div><div class='add'>+	mrp =  br_mrp_find_port(br, p);</div><div class='add'>+	if (unlikely(!mrp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	p_port = rcu_dereference(mrp-&gt;p_port);</div><div class='add'>+	if (!p_port)</div><div class='add'>+		return 0;</div><div class='add'>+	p_dst = p_port;</div><div class='add'>+</div><div class='add'>+	s_port = rcu_dereference(mrp-&gt;s_port);</div><div class='add'>+	if (!s_port)</div><div class='add'>+		return 0;</div><div class='add'>+	s_dst = s_port;</div><div class='add'>+</div><div class='add'>+	/* If the frame is a ring frame then it is not required to check the</div><div class='add'>+	 * interconnect role and ports to process or forward the frame</div><div class='add'>+	 */</div><div class='add'>+	if (br_mrp_ring_frame(skb)) {</div><div class='add'>+		/* If the role is MRM then don't forward the frames */</div><div class='add'>+		if (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRM) {</div><div class='add'>+			br_mrp_mrm_process(mrp, p, skb);</div><div class='add'>+			goto no_forward;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If the role is MRA then don't forward the frames if it</div><div class='add'>+		 * behaves as MRM node</div><div class='add'>+		 */</div><div class='add'>+		if (mrp-&gt;ring_role == BR_MRP_RING_ROLE_MRA) {</div><div class='add'>+			if (!mrp-&gt;test_monitor) {</div><div class='add'>+				br_mrp_mrm_process(mrp, p, skb);</div><div class='add'>+				goto no_forward;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			br_mrp_mra_process(mrp, br, p, skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto forward;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_mrp_in_frame(skb)) {</div><div class='add'>+		u8 in_type = br_mrp_get_frame_type(skb);</div><div class='add'>+</div><div class='add'>+		i_port = rcu_dereference(mrp-&gt;i_port);</div><div class='add'>+		i_dst = i_port;</div><div class='add'>+</div><div class='add'>+		/* If the ring port is in block state it should not forward</div><div class='add'>+		 * In_Test frames</div><div class='add'>+		 */</div><div class='add'>+		if (br_mrp_is_ring_port(p_port, s_port, p) &amp;&amp;</div><div class='add'>+		    p-&gt;state == BR_STATE_BLOCKING &amp;&amp;</div><div class='add'>+		    in_type == BR_MRP_TLV_HEADER_IN_TEST)</div><div class='add'>+			goto no_forward;</div><div class='add'>+</div><div class='add'>+		/* Nodes that behaves as MRM needs to stop forwarding the</div><div class='add'>+		 * frames in case the ring is closed, otherwise will be a loop.</div><div class='add'>+		 * In this case the frame is no forward between the ring ports.</div><div class='add'>+		 */</div><div class='add'>+		if (br_mrp_mrm_behaviour(mrp) &amp;&amp;</div><div class='add'>+		    br_mrp_is_ring_port(p_port, s_port, p) &amp;&amp;</div><div class='add'>+		    (s_port-&gt;state != BR_STATE_FORWARDING ||</div><div class='add'>+		     p_port-&gt;state != BR_STATE_FORWARDING)) {</div><div class='add'>+			p_dst = NULL;</div><div class='add'>+			s_dst = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* A node that behaves as MRC and doesn't have a interconnect</div><div class='add'>+		 * role then it should forward all frames between the ring ports</div><div class='add'>+		 * because it doesn't have an interconnect port</div><div class='add'>+		 */</div><div class='add'>+		if (br_mrp_mrc_behaviour(mrp) &amp;&amp;</div><div class='add'>+		    mrp-&gt;in_role == BR_MRP_IN_ROLE_DISABLED)</div><div class='add'>+			goto forward;</div><div class='add'>+</div><div class='add'>+		if (mrp-&gt;in_role == BR_MRP_IN_ROLE_MIM) {</div><div class='add'>+			if (in_type == BR_MRP_TLV_HEADER_IN_TEST) {</div><div class='add'>+				/* MIM should not forward it's own InTest</div><div class='add'>+				 * frames</div><div class='add'>+				 */</div><div class='add'>+				if (br_mrp_mim_process(mrp, p, skb)) {</div><div class='add'>+					goto no_forward;</div><div class='add'>+				} else {</div><div class='add'>+					if (br_mrp_is_ring_port(p_port, s_port,</div><div class='add'>+								p))</div><div class='add'>+						i_dst = NULL;</div><div class='add'>+</div><div class='add'>+					if (br_mrp_is_in_port(i_port, p))</div><div class='add'>+						goto no_forward;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* MIM should forward IntLinkChange/Status and</div><div class='add'>+				 * IntTopoChange between ring ports but MIM</div><div class='add'>+				 * should not forward IntLinkChange/Status and</div><div class='add'>+				 * IntTopoChange if the frame was received at</div><div class='add'>+				 * the interconnect port</div><div class='add'>+				 */</div><div class='add'>+				if (br_mrp_is_ring_port(p_port, s_port, p))</div><div class='add'>+					i_dst = NULL;</div><div class='add'>+</div><div class='add'>+				if (br_mrp_is_in_port(i_port, p))</div><div class='add'>+					goto no_forward;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mrp-&gt;in_role == BR_MRP_IN_ROLE_MIC) {</div><div class='add'>+			/* MIC should forward InTest frames on all ports</div><div class='add'>+			 * regardless of the received port</div><div class='add'>+			 */</div><div class='add'>+			if (in_type == BR_MRP_TLV_HEADER_IN_TEST)</div><div class='add'>+				goto forward;</div><div class='add'>+</div><div class='add'>+			/* MIC should forward IntLinkChange frames only if they</div><div class='add'>+			 * are received on ring ports to all the ports</div><div class='add'>+			 */</div><div class='add'>+			if (br_mrp_is_ring_port(p_port, s_port, p) &amp;&amp;</div><div class='add'>+			    (in_type == BR_MRP_TLV_HEADER_IN_LINK_UP ||</div><div class='add'>+			     in_type == BR_MRP_TLV_HEADER_IN_LINK_DOWN))</div><div class='add'>+				goto forward;</div><div class='add'>+</div><div class='add'>+			/* MIC should forward IntLinkStatus frames only to</div><div class='add'>+			 * interconnect port if it was received on a ring port.</div><div class='add'>+			 * If it is received on interconnect port then, it</div><div class='add'>+			 * should be forward on both ring ports</div><div class='add'>+			 */</div><div class='add'>+			if (br_mrp_is_ring_port(p_port, s_port, p) &amp;&amp;</div><div class='add'>+			    in_type == BR_MRP_TLV_HEADER_IN_LINK_STATUS) {</div><div class='add'>+				p_dst = NULL;</div><div class='add'>+				s_dst = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Should forward the InTopo frames only between the</div><div class='add'>+			 * ring ports</div><div class='add'>+			 */</div><div class='add'>+			if (in_type == BR_MRP_TLV_HEADER_IN_TOPO) {</div><div class='add'>+				i_dst = NULL;</div><div class='add'>+				goto forward;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* In all the other cases don't forward the frames */</div><div class='add'>+			goto no_forward;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+forward:</div><div class='add'>+	if (p_dst)</div><div class='add'>+		br_forward(p_dst, skb, true, false);</div><div class='add'>+	if (s_dst)</div><div class='add'>+		br_forward(s_dst, skb, true, false);</div><div class='add'>+	if (i_dst)</div><div class='add'>+		br_forward(i_dst, skb, true, false);</div><div class='add'>+</div><div class='add'>+no_forward:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if the frame was received on a port that is part of MRP ring</div><div class='add'>+ * and if the frame has MRP eth. In that case process the frame otherwise do</div><div class='add'>+ * normal forwarding.</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* If there is no MRP instance do normal forwarding */</div><div class='add'>+	if (likely(!(p-&gt;flags &amp; BR_MRP_AWARE)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return br_mrp_rcv(p, skb, p-&gt;dev);</div><div class='add'>+out:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_mrp_enabled(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return !hlist_empty(&amp;br-&gt;mrp_list);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c<br/>new file mode 100644<br/>index 000000000000..ce6f63c77cc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mrp_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_mrp_netlink.c</a></div><div class='hunk'>@@ -0,0 +1,571 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/mrp_bridge.h&gt;</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include "br_private_mrp.h"</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_mrp_policy[IFLA_BRIDGE_MRP_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_STATE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_ROLE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_STATE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_ROLE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_STATE]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_instance_policy[IFLA_BRIDGE_MRP_INSTANCE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE_RING_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_INSTANCE_PRIO]		= { .type = NLA_U16 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_instance_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				 int cmd, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_INSTANCE_MAX + 1];</div><div class='add'>+	struct br_mrp_instance inst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_INSTANCE_MAX, attr,</div><div class='add'>+			       br_mrp_instance_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_INSTANCE_RING_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or P_IFINDEX or S_IFINDEX");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;inst, 0, sizeof(inst));</div><div class='add'>+</div><div class='add'>+	inst.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_RING_ID]);</div><div class='add'>+	inst.p_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX]);</div><div class='add'>+	inst.s_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX]);</div><div class='add'>+	inst.prio = MRP_DEFAULT_PRIO;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_INSTANCE_PRIO])</div><div class='add'>+		inst.prio = nla_get_u16(tb[IFLA_BRIDGE_MRP_INSTANCE_PRIO]);</div><div class='add'>+</div><div class='add'>+	if (cmd == RTM_SETLINK)</div><div class='add'>+		return br_mrp_add(br, &amp;inst);</div><div class='add'>+	else</div><div class='add'>+		return br_mrp_del(br, &amp;inst);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_port_state_policy[IFLA_BRIDGE_MRP_PORT_STATE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_STATE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_STATE_STATE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_port_state_parse(struct net_bridge_port *p,</div><div class='add'>+				   struct nlattr *attr,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_PORT_STATE_MAX + 1];</div><div class='add'>+	enum br_mrp_port_state_type state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_PORT_STATE_MAX, attr,</div><div class='add'>+			       br_mrp_port_state_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_PORT_STATE_STATE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing attribute: STATE");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state = nla_get_u32(tb[IFLA_BRIDGE_MRP_PORT_STATE_STATE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_port_state(p, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_port_role_policy[IFLA_BRIDGE_MRP_PORT_ROLE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_ROLE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_PORT_ROLE_ROLE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_port_role_parse(struct net_bridge_port *p,</div><div class='add'>+				  struct nlattr *attr,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_PORT_ROLE_MAX + 1];</div><div class='add'>+	enum br_mrp_port_role_type role;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_PORT_ROLE_MAX, attr,</div><div class='add'>+			       br_mrp_port_role_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_PORT_ROLE_ROLE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing attribute: ROLE");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	role = nla_get_u32(tb[IFLA_BRIDGE_MRP_PORT_ROLE_ROLE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_port_role(p, role);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_ring_state_policy[IFLA_BRIDGE_MRP_RING_STATE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_STATE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_STATE_RING_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_STATE_STATE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_ring_state_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_RING_STATE_MAX + 1];</div><div class='add'>+	struct br_mrp_ring_state state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_RING_STATE_MAX, attr,</div><div class='add'>+			       br_mrp_ring_state_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_RING_STATE_RING_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_RING_STATE_STATE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or STATE");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;state, 0x0, sizeof(state));</div><div class='add'>+</div><div class='add'>+	state.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_RING_STATE_RING_ID]);</div><div class='add'>+	state.ring_state = nla_get_u32(tb[IFLA_BRIDGE_MRP_RING_STATE_STATE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_ring_state(br, &amp;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_ring_role_policy[IFLA_BRIDGE_MRP_RING_ROLE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_ROLE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_ROLE_RING_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_RING_ROLE_ROLE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_ring_role_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_RING_ROLE_MAX + 1];</div><div class='add'>+	struct br_mrp_ring_role role;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_RING_ROLE_MAX, attr,</div><div class='add'>+			       br_mrp_ring_role_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_RING_ROLE_RING_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_RING_ROLE_ROLE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or ROLE");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;role, 0x0, sizeof(role));</div><div class='add'>+</div><div class='add'>+	role.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_RING_ROLE_RING_ID]);</div><div class='add'>+	role.ring_role = nla_get_u32(tb[IFLA_BRIDGE_MRP_RING_ROLE_ROLE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_ring_role(br, &amp;role);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_start_test_policy[IFLA_BRIDGE_MRP_START_TEST_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_RING_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_INTERVAL]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_MAX_MISS]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_PERIOD]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_TEST_MONITOR]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_start_test_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_START_TEST_MAX + 1];</div><div class='add'>+	struct br_mrp_start_test test;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_START_TEST_MAX, attr,</div><div class='add'>+			       br_mrp_start_test_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_START_TEST_RING_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_TEST_INTERVAL] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_TEST_MAX_MISS] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_TEST_PERIOD]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or INTERVAL or MAX_MISS or PERIOD");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;test, 0x0, sizeof(test));</div><div class='add'>+</div><div class='add'>+	test.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_TEST_RING_ID]);</div><div class='add'>+	test.interval = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_TEST_INTERVAL]);</div><div class='add'>+	test.max_miss = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_TEST_MAX_MISS]);</div><div class='add'>+	test.period = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_TEST_PERIOD]);</div><div class='add'>+	test.monitor = false;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_START_TEST_MONITOR])</div><div class='add'>+		test.monitor =</div><div class='add'>+			nla_get_u32(tb[IFLA_BRIDGE_MRP_START_TEST_MONITOR]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_start_test(br, &amp;test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_in_state_policy[IFLA_BRIDGE_MRP_IN_STATE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_STATE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_STATE_IN_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_STATE_STATE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_in_state_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_IN_STATE_MAX + 1];</div><div class='add'>+	struct br_mrp_in_state state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_IN_STATE_MAX, attr,</div><div class='add'>+			       br_mrp_in_state_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_IN_STATE_IN_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_IN_STATE_STATE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: IN_ID or STATE");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;state, 0x0, sizeof(state));</div><div class='add'>+</div><div class='add'>+	state.in_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_IN_STATE_IN_ID]);</div><div class='add'>+	state.in_state = nla_get_u32(tb[IFLA_BRIDGE_MRP_IN_STATE_STATE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_in_state(br, &amp;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_in_role_policy[IFLA_BRIDGE_MRP_IN_ROLE_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE_RING_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE_IN_ID]		= { .type = NLA_U16 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE_ROLE]		= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_in_role_parse(struct net_bridge *br, struct nlattr *attr,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_IN_ROLE_MAX + 1];</div><div class='add'>+	struct br_mrp_in_role role;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_IN_ROLE_MAX, attr,</div><div class='add'>+			       br_mrp_in_role_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_IN_ROLE_RING_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_IN_ROLE_IN_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_IN_ROLE_ROLE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or ROLE or IN_ID or I_IFINDEX");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;role, 0x0, sizeof(role));</div><div class='add'>+</div><div class='add'>+	role.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_IN_ROLE_RING_ID]);</div><div class='add'>+	role.in_id = nla_get_u16(tb[IFLA_BRIDGE_MRP_IN_ROLE_IN_ID]);</div><div class='add'>+	role.i_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX]);</div><div class='add'>+	role.in_role = nla_get_u32(tb[IFLA_BRIDGE_MRP_IN_ROLE_ROLE]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_set_in_role(br, &amp;role);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+br_mrp_start_in_test_policy[IFLA_BRIDGE_MRP_START_IN_TEST_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST_UNSPEC]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mrp_start_in_test_parse(struct net_bridge *br,</div><div class='add'>+				      struct nlattr *attr,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_START_IN_TEST_MAX + 1];</div><div class='add'>+	struct br_mrp_start_in_test test;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_START_IN_TEST_MAX, attr,</div><div class='add'>+			       br_mrp_start_in_test_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS] ||</div><div class='add'>+	    !tb[IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Missing attribute: RING_ID or INTERVAL or MAX_MISS or PERIOD");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;test, 0x0, sizeof(test));</div><div class='add'>+</div><div class='add'>+	test.in_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID]);</div><div class='add'>+	test.interval = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL]);</div><div class='add'>+	test.max_miss = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS]);</div><div class='add'>+	test.period = nla_get_u32(tb[IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD]);</div><div class='add'>+</div><div class='add'>+	return br_mrp_start_in_test(br, &amp;test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+		 struct nlattr *attr, int cmd, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* When this function is called for a port then the br pointer is</div><div class='add'>+	 * invalid, therefor set the br to point correctly</div><div class='add'>+	 */</div><div class='add'>+	if (p)</div><div class='add'>+		br = p-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (br-&gt;stp_enabled != BR_NO_STP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_MAX, attr,</div><div class='add'>+			       br_mrp_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_INSTANCE]) {</div><div class='add'>+		err = br_mrp_instance_parse(br, tb[IFLA_BRIDGE_MRP_INSTANCE],</div><div class='add'>+					    cmd, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_PORT_STATE]) {</div><div class='add'>+		err = br_mrp_port_state_parse(p, tb[IFLA_BRIDGE_MRP_PORT_STATE],</div><div class='add'>+					      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_PORT_ROLE]) {</div><div class='add'>+		err = br_mrp_port_role_parse(p, tb[IFLA_BRIDGE_MRP_PORT_ROLE],</div><div class='add'>+					     extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_RING_STATE]) {</div><div class='add'>+		err = br_mrp_ring_state_parse(br,</div><div class='add'>+					      tb[IFLA_BRIDGE_MRP_RING_STATE],</div><div class='add'>+					      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_RING_ROLE]) {</div><div class='add'>+		err = br_mrp_ring_role_parse(br, tb[IFLA_BRIDGE_MRP_RING_ROLE],</div><div class='add'>+					     extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_START_TEST]) {</div><div class='add'>+		err = br_mrp_start_test_parse(br,</div><div class='add'>+					      tb[IFLA_BRIDGE_MRP_START_TEST],</div><div class='add'>+					      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_IN_STATE]) {</div><div class='add'>+		err = br_mrp_in_state_parse(br, tb[IFLA_BRIDGE_MRP_IN_STATE],</div><div class='add'>+					    extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_IN_ROLE]) {</div><div class='add'>+		err = br_mrp_in_role_parse(br, tb[IFLA_BRIDGE_MRP_IN_ROLE],</div><div class='add'>+					   extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRIDGE_MRP_START_IN_TEST]) {</div><div class='add'>+		err = br_mrp_start_in_test_parse(br,</div><div class='add'>+						 tb[IFLA_BRIDGE_MRP_START_IN_TEST],</div><div class='add'>+						 extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb, *mrp_tb;</div><div class='add'>+	struct br_mrp *mrp;</div><div class='add'>+</div><div class='add'>+	mrp_tb = nla_nest_start_noflag(skb, IFLA_BRIDGE_MRP);</div><div class='add'>+	if (!mrp_tb)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(mrp, &amp;br-&gt;mrp_list, list) {</div><div class='add'>+		struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+		tb = nla_nest_start_noflag(skb, IFLA_BRIDGE_MRP_INFO);</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto nla_info_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_RING_ID,</div><div class='add'>+				mrp-&gt;ring_id))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		p = rcu_dereference(mrp-&gt;p_port);</div><div class='add'>+		if (p &amp;&amp; nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_P_IFINDEX,</div><div class='add'>+				     p-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		p = rcu_dereference(mrp-&gt;s_port);</div><div class='add'>+		if (p &amp;&amp; nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_S_IFINDEX,</div><div class='add'>+				     p-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		p = rcu_dereference(mrp-&gt;i_port);</div><div class='add'>+		if (p &amp;&amp; nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_I_IFINDEX,</div><div class='add'>+				     p-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u16(skb, IFLA_BRIDGE_MRP_INFO_PRIO,</div><div class='add'>+				mrp-&gt;prio))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_RING_STATE,</div><div class='add'>+				mrp-&gt;ring_state))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_RING_ROLE,</div><div class='add'>+				mrp-&gt;ring_role))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_TEST_INTERVAL,</div><div class='add'>+				mrp-&gt;test_interval))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_TEST_MAX_MISS,</div><div class='add'>+				mrp-&gt;test_max_miss))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_TEST_MONITOR,</div><div class='add'>+				mrp-&gt;test_monitor))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_STATE,</div><div class='add'>+				mrp-&gt;in_state))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_ROLE,</div><div class='add'>+				mrp-&gt;in_role))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_INTERVAL,</div><div class='add'>+				mrp-&gt;in_test_interval))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_MAX_MISS,</div><div class='add'>+				mrp-&gt;in_test_max_miss))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, tb);</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, mrp_tb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, tb);</div><div class='add'>+</div><div class='add'>+nla_info_failure:</div><div class='add'>+	nla_nest_cancel(skb, mrp_tb);</div><div class='add'>+</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_ring_port_open(struct net_device *dev, u8 loc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	p = br_port_get_rcu(dev);</div><div class='add'>+	if (!p) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (loc)</div><div class='add'>+		p-&gt;flags |= BR_MRP_LOST_CONT;</div><div class='add'>+	else</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_LOST_CONT;</div><div class='add'>+</div><div class='add'>+	br_ifinfo_notify(RTM_NEWLINK, NULL, p);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_in_port_open(struct net_device *dev, u8 loc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	p = br_port_get_rcu(dev);</div><div class='add'>+	if (!p) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (loc)</div><div class='add'>+		p-&gt;flags |= BR_MRP_LOST_IN_CONT;</div><div class='add'>+	else</div><div class='add'>+		p-&gt;flags &amp;= ~BR_MRP_LOST_IN_CONT;</div><div class='add'>+</div><div class='add'>+	br_ifinfo_notify(RTM_NEWLINK, NULL, p);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_mrp_switchdev.c b/net/bridge/br_mrp_switchdev.c<br/>new file mode 100644<br/>index 000000000000..cb54b324fa8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mrp_switchdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_mrp_switchdev.c</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include "br_private_mrp.h"</div><div class='add'>+</div><div class='add'>+static enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_port_obj(struct net_bridge *br,</div><div class='add'>+			  const struct switchdev_obj *obj, bool add)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (add)</div><div class='add'>+		err = switchdev_port_obj_add(br-&gt;dev, obj, NULL);</div><div class='add'>+	else</div><div class='add'>+		err = switchdev_port_obj_del(br-&gt;dev, obj);</div><div class='add'>+</div><div class='add'>+	/* In case of success just return and notify the SW that doesn't need</div><div class='add'>+	 * to do anything</div><div class='add'>+	 */</div><div class='add'>+	if (!err)</div><div class='add'>+		return BR_MRP_HW;</div><div class='add'>+</div><div class='add'>+	if (err != -EOPNOTSUPP)</div><div class='add'>+		return BR_MRP_NONE;</div><div class='add'>+</div><div class='add'>+	/* Continue with SW backup */</div><div class='add'>+	return BR_MRP_SW;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_switchdev_add(struct net_bridge *br, struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_mrp mrp_obj = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_MRP,</div><div class='add'>+		.p_port = rtnl_dereference(mrp-&gt;p_port)-&gt;dev,</div><div class='add'>+		.s_port = rtnl_dereference(mrp-&gt;s_port)-&gt;dev,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+		.prio = mrp-&gt;prio,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_obj_add(br-&gt;dev, &amp;mrp_obj.obj, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_switchdev_del(struct net_bridge *br, struct br_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_mrp mrp_obj = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_MRP,</div><div class='add'>+		.p_port = NULL,</div><div class='add'>+		.s_port = NULL,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_obj_del(br-&gt;dev, &amp;mrp_obj.obj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_set_ring_role(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			       enum br_mrp_ring_role_type role)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_ring_role_mrp mrp_role = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_RING_ROLE_MRP,</div><div class='add'>+		.ring_role = role,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+		.sw_backup = false,</div><div class='add'>+	};</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	support = br_mrp_switchdev_port_obj(br, &amp;mrp_role.obj,</div><div class='add'>+					    role != BR_MRP_RING_ROLE_DISABLED);</div><div class='add'>+	if (support != BR_MRP_SW)</div><div class='add'>+		return support;</div><div class='add'>+</div><div class='add'>+	/* If the driver can't configure to run completely the protocol in HW,</div><div class='add'>+	 * then try again to configure the HW so the SW can run the protocol.</div><div class='add'>+	 */</div><div class='add'>+	mrp_role.sw_backup = true;</div><div class='add'>+	if (role != BR_MRP_RING_ROLE_DISABLED)</div><div class='add'>+		err = switchdev_port_obj_add(br-&gt;dev, &amp;mrp_role.obj, NULL);</div><div class='add'>+	else</div><div class='add'>+		err = switchdev_port_obj_del(br-&gt;dev, &amp;mrp_role.obj);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	return BR_MRP_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_send_ring_test(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+				u32 interval, u8 max_miss, u32 period,</div><div class='add'>+				bool monitor)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_ring_test_mrp test = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_RING_TEST_MRP,</div><div class='add'>+		.interval = interval,</div><div class='add'>+		.max_miss = max_miss,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+		.period = period,</div><div class='add'>+		.monitor = monitor,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	return br_mrp_switchdev_port_obj(br, &amp;test.obj, interval != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_switchdev_set_ring_state(struct net_bridge *br,</div><div class='add'>+				    struct br_mrp *mrp,</div><div class='add'>+				    enum br_mrp_ring_state_type state)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_ring_state_mrp mrp_state = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_RING_STATE_MRP,</div><div class='add'>+		.ring_state = state,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_obj_add(br-&gt;dev, &amp;mrp_state.obj, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_set_in_role(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			     u16 in_id, u32 ring_id,</div><div class='add'>+			     enum br_mrp_in_role_type role)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_in_role_mrp mrp_role = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_IN_ROLE_MRP,</div><div class='add'>+		.in_role = role,</div><div class='add'>+		.in_id = mrp-&gt;in_id,</div><div class='add'>+		.ring_id = mrp-&gt;ring_id,</div><div class='add'>+		.i_port = rtnl_dereference(mrp-&gt;i_port)-&gt;dev,</div><div class='add'>+		.sw_backup = false,</div><div class='add'>+	};</div><div class='add'>+	enum br_mrp_hw_support support;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	support = br_mrp_switchdev_port_obj(br, &amp;mrp_role.obj,</div><div class='add'>+					    role != BR_MRP_IN_ROLE_DISABLED);</div><div class='add'>+	if (support != BR_MRP_NONE)</div><div class='add'>+		return support;</div><div class='add'>+</div><div class='add'>+	/* If the driver can't configure to run completely the protocol in HW,</div><div class='add'>+	 * then try again to configure the HW so the SW can run the protocol.</div><div class='add'>+	 */</div><div class='add'>+	mrp_role.sw_backup = true;</div><div class='add'>+	if (role != BR_MRP_IN_ROLE_DISABLED)</div><div class='add'>+		err = switchdev_port_obj_add(br-&gt;dev, &amp;mrp_role.obj, NULL);</div><div class='add'>+	else</div><div class='add'>+		err = switchdev_port_obj_del(br-&gt;dev, &amp;mrp_role.obj);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	return BR_MRP_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_switchdev_set_in_state(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+				  enum br_mrp_in_state_type state)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_in_state_mrp mrp_state = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_IN_STATE_MRP,</div><div class='add'>+		.in_state = state,</div><div class='add'>+		.in_id = mrp-&gt;in_id,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_obj_add(br-&gt;dev, &amp;mrp_state.obj, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_send_in_test(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			      u32 interval, u8 max_miss, u32 period)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_in_test_mrp test = {</div><div class='add'>+		.obj.orig_dev = br-&gt;dev,</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_IN_TEST_MRP,</div><div class='add'>+		.interval = interval,</div><div class='add'>+		.max_miss = max_miss,</div><div class='add'>+		.in_id = mrp-&gt;in_id,</div><div class='add'>+		.period = period,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return BR_MRP_SW;</div><div class='add'>+</div><div class='add'>+	return br_mrp_switchdev_port_obj(br, &amp;test.obj, interval != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_port_switchdev_set_state(struct net_bridge_port *p, u32 state)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.orig_dev = p-&gt;dev,</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_PORT_STP_STATE,</div><div class='add'>+		.u.stp_state = state,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_attr_set(p-&gt;dev, &amp;attr, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mrp_port_switchdev_set_role(struct net_bridge_port *p,</div><div class='add'>+				   enum br_mrp_port_role_type role)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.orig_dev = p-&gt;dev,</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_MRP_PORT_ROLE,</div><div class='add'>+		.u.mrp_port_role = role,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_SWITCHDEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return switchdev_port_attr_set(p-&gt;dev, &amp;attr, NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_mst.c b/net/bridge/br_mst.c<br/>new file mode 100644<br/>index 000000000000..43a300ae6bfa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_mst.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_mst.c</a></div><div class='hunk'>@@ -0,0 +1,366 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *	Bridge Multiple Spanning Tree Support</div><div class='add'>+ *</div><div class='add'>+ *	Authors:</div><div class='add'>+ *	Tobias Waldekranz		&lt;tobias@waldekranz.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(br_mst_used);</div><div class='add'>+</div><div class='add'>+bool br_mst_enabled(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!netif_is_bridge_master(dev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return br_opt_get(netdev_priv(dev), BROPT_MST_ENABLED);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_mst_enabled);</div><div class='add'>+</div><div class='add'>+void br_mst_uninit(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	if (br_opt_get(br, BROPT_MST_ENABLED))</div><div class='add'>+		static_branch_dec(&amp;br_mst_used);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_get_info(const struct net_device *dev, u16 msti, unsigned long *vids)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge_vlan_group *vg;</div><div class='add'>+	const struct net_bridge_vlan *v;</div><div class='add'>+	const struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	br = netdev_priv(dev);</div><div class='add'>+	if (!br_opt_get(br, BROPT_MST_ENABLED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vg = br_vlan_group(br);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (v-&gt;msti == msti)</div><div class='add'>+			__set_bit(v-&gt;vid, vids);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_mst_get_info);</div><div class='add'>+</div><div class='add'>+int br_mst_get_state(const struct net_device *dev, u16 msti, u8 *state)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge_port *p = NULL;</div><div class='add'>+	const struct net_bridge_vlan_group *vg;</div><div class='add'>+	const struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	p = br_port_get_check_rtnl(dev);</div><div class='add'>+	if (!p || !br_opt_get(p-&gt;br, BROPT_MST_ENABLED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vg = nbp_vlan_group(p);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (v-&gt;brvlan-&gt;msti == msti) {</div><div class='add'>+			*state = v-&gt;state;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_mst_get_state);</div><div class='add'>+</div><div class='add'>+static void br_mst_vlan_set_state(struct net_bridge_vlan_group *vg,</div><div class='add'>+				  struct net_bridge_vlan *v,</div><div class='add'>+				  u8 state)</div><div class='add'>+{</div><div class='add'>+	if (br_vlan_get_state(v) == state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (v-&gt;vid == vg-&gt;pvid)</div><div class='add'>+		br_vlan_set_pvid_state(vg, state);</div><div class='add'>+</div><div class='add'>+	br_vlan_set_state(v, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_PORT_MST_STATE,</div><div class='add'>+		.orig_dev = p-&gt;dev,</div><div class='add'>+		.u.mst_state = {</div><div class='add'>+			.msti = msti,</div><div class='add'>+			.state = state,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	vg = nbp_vlan_group_rcu(p);</div><div class='add'>+	if (!vg)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* MSTI 0 (CST) state changes are notified via the regular</div><div class='add'>+	 * SWITCHDEV_ATTR_ID_PORT_STP_STATE.</div><div class='add'>+	 */</div><div class='add'>+	if (msti) {</div><div class='add'>+		err = switchdev_port_attr_set(p-&gt;dev, &amp;attr, extack);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	list_for_each_entry_rcu(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (v-&gt;brvlan-&gt;msti != msti)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		br_mst_vlan_set_state(vg, v, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_mst_vlan_sync_state(struct net_bridge_vlan *pv, u16 msti)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg = nbp_vlan_group(pv-&gt;port);</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		/* If this port already has a defined state in this</div><div class='add'>+		 * MSTI (through some other VLAN membership), inherit</div><div class='add'>+		 * it.</div><div class='add'>+		 */</div><div class='add'>+		if (v != pv &amp;&amp; v-&gt;brvlan-&gt;msti == msti) {</div><div class='add'>+			br_mst_vlan_set_state(vg, pv, v-&gt;state);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Otherwise, start out in a new MSTI with all ports disabled. */</div><div class='add'>+	return br_mst_vlan_set_state(vg, pv, BR_STATE_DISABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_vlan_set_msti(struct net_bridge_vlan *mv, u16 msti)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_VLAN_MSTI,</div><div class='add'>+		.orig_dev = mv-&gt;br-&gt;dev,</div><div class='add'>+		.u.vlan_msti = {</div><div class='add'>+			.vid = mv-&gt;vid,</div><div class='add'>+			.msti = msti,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *pv;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mv-&gt;msti == msti)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = switchdev_port_attr_set(mv-&gt;br-&gt;dev, &amp;attr, NULL);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mv-&gt;msti = msti;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;mv-&gt;br-&gt;port_list, list) {</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+</div><div class='add'>+		pv = br_vlan_find(vg, mv-&gt;vid);</div><div class='add'>+		if (pv)</div><div class='add'>+			br_mst_vlan_sync_state(pv, msti);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_mst_vlan_init_state(struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	/* VLANs always start out in MSTI 0 (CST) */</div><div class='add'>+	v-&gt;msti = 0;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_master(v))</div><div class='add'>+		v-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	else</div><div class='add'>+		v-&gt;state = v-&gt;port-&gt;state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_set_enabled(struct net_bridge *br, bool on,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_BRIDGE_MST,</div><div class='add'>+		.orig_dev = br-&gt;dev,</div><div class='add'>+		.u.mst = on,</div><div class='add'>+	};</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+</div><div class='add'>+		if (!vg-&gt;num_vlans)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "MST mode can't be changed while VLANs exist");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_MST_ENABLED) == on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = switchdev_port_attr_set(br-&gt;dev, &amp;attr, extack);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		static_branch_inc(&amp;br_mst_used);</div><div class='add'>+	else</div><div class='add'>+		static_branch_dec(&amp;br_mst_used);</div><div class='add'>+</div><div class='add'>+	br_opt_toggle(br, BROPT_MST_ENABLED, on);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t br_mst_info_size(const struct net_bridge_vlan_group *vg)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(seen, VLAN_N_VID) = { 0 };</div><div class='add'>+	const struct net_bridge_vlan *v;</div><div class='add'>+	size_t sz;</div><div class='add'>+</div><div class='add'>+	/* IFLA_BRIDGE_MST */</div><div class='add'>+	sz = nla_total_size(0);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (test_bit(v-&gt;brvlan-&gt;msti, seen))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* IFLA_BRIDGE_MST_ENTRY */</div><div class='add'>+		sz += nla_total_size(0) +</div><div class='add'>+			/* IFLA_BRIDGE_MST_ENTRY_MSTI */</div><div class='add'>+			nla_total_size(sizeof(u16)) +</div><div class='add'>+			/* IFLA_BRIDGE_MST_ENTRY_STATE */</div><div class='add'>+			nla_total_size(sizeof(u8));</div><div class='add'>+</div><div class='add'>+		__set_bit(v-&gt;brvlan-&gt;msti, seen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_fill_info(struct sk_buff *skb,</div><div class='add'>+		     const struct net_bridge_vlan_group *vg)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(seen, VLAN_N_VID) = { 0 };</div><div class='add'>+	const struct net_bridge_vlan *v;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (test_bit(v-&gt;brvlan-&gt;msti, seen))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start_noflag(skb, IFLA_BRIDGE_MST_ENTRY);</div><div class='add'>+		if (!nest ||</div><div class='add'>+		    nla_put_u16(skb, IFLA_BRIDGE_MST_ENTRY_MSTI, v-&gt;brvlan-&gt;msti) ||</div><div class='add'>+		    nla_put_u8(skb, IFLA_BRIDGE_MST_ENTRY_STATE, v-&gt;state)) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+		__set_bit(v-&gt;brvlan-&gt;msti, seen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_mst_nl_policy[IFLA_BRIDGE_MST_ENTRY_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_MST_ENTRY_MSTI] = NLA_POLICY_RANGE(NLA_U16,</div><div class='add'>+						   1, /* 0 reserved for CST */</div><div class='add'>+						   VLAN_N_VID - 1),</div><div class='add'>+	[IFLA_BRIDGE_MST_ENTRY_STATE] = NLA_POLICY_RANGE(NLA_U8,</div><div class='add'>+						    BR_STATE_DISABLED,</div><div class='add'>+						    BR_STATE_BLOCKING),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_mst_process_one(struct net_bridge_port *p,</div><div class='add'>+			      const struct nlattr *attr,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_BRIDGE_MST_ENTRY_MAX + 1];</div><div class='add'>+	u16 msti;</div><div class='add'>+	u8 state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_BRIDGE_MST_ENTRY_MAX, attr,</div><div class='add'>+			       br_mst_nl_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MST_ENTRY_MSTI]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "MSTI not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_BRIDGE_MST_ENTRY_STATE]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "State not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msti = nla_get_u16(tb[IFLA_BRIDGE_MST_ENTRY_MSTI]);</div><div class='add'>+	state = nla_get_u8(tb[IFLA_BRIDGE_MST_ENTRY_STATE]);</div><div class='add'>+</div><div class='add'>+	return br_mst_set_state(p, msti, state, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_process(struct net_bridge_port *p, const struct nlattr *mst_attr,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int err, msts = 0;</div><div class='add'>+	int rem;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(p-&gt;br, BROPT_MST_ENABLED)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Can't modify MST state when MST is disabled");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(attr, mst_attr, rem) {</div><div class='add'>+		switch (nla_type(attr)) {</div><div class='add'>+		case IFLA_BRIDGE_MST_ENTRY:</div><div class='add'>+			err = br_mst_process_one(p, attr, extack);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msts++;</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!msts) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Found no MST entries to process");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c<br/>index 20ed7adcf1cc..d55a4ab87837 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_multicast.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_multicast.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_multicast.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_multicast.c</a></div><div class='hunk'>@@ -1,19 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Bridge multicast support.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/igmp.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='hunk'>@@ -29,254 +25,819 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/mld.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;trace/events/bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='del'>-</div><div class='del'>-static void br_multicast_start_querier(struct net_bridge *br,</div><div class='add'>+#include "br_private_mcast_eht.h"</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params br_mdb_rht_params = {</div><div class='add'>+	.head_offset = offsetof(struct net_bridge_mdb_entry, rhnode),</div><div class='add'>+	.key_offset = offsetof(struct net_bridge_mdb_entry, addr),</div><div class='add'>+	.key_len = sizeof(struct br_ip),</div><div class='add'>+	.automatic_shrinking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params br_sg_port_rht_params = {</div><div class='add'>+	.head_offset = offsetof(struct net_bridge_port_group, rhnode),</div><div class='add'>+	.key_offset = offsetof(struct net_bridge_port_group, key),</div><div class='add'>+	.key_len = sizeof(struct net_bridge_port_group_sg_key),</div><div class='add'>+	.automatic_shrinking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void br_multicast_start_querier(struct net_bridge_mcast *brmctx,</div><div class='ctx'> 				       struct bridge_mcast_own_query *query);</div><div class='del'>-static void br_multicast_add_router(struct net_bridge *br,</div><div class='del'>-				    struct net_bridge_port *port);</div><div class='del'>-static void br_ip4_multicast_leave_group(struct net_bridge *br,</div><div class='del'>-					 struct net_bridge_port *port,</div><div class='add'>+static void br_ip4_multicast_add_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx);</div><div class='add'>+static void br_ip4_multicast_leave_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					 __be32 group,</div><div class='ctx'> 					 __u16 vid,</div><div class='ctx'> 					 const unsigned char *src);</div><div class='add'>+static void br_multicast_port_group_rexmit(struct timer_list *t);</div><div class='ctx'> </div><div class='del'>-static void __del_port_router(struct net_bridge_port *p);</div><div class='add'>+static void</div><div class='add'>+br_multicast_rport_del_notify(struct net_bridge_mcast_port *pmctx, bool deleted);</div><div class='add'>+static void br_ip6_multicast_add_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static void br_ip6_multicast_leave_group(struct net_bridge *br,</div><div class='del'>-					 struct net_bridge_port *port,</div><div class='add'>+static void br_ip6_multicast_leave_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					 const struct in6_addr *group,</div><div class='ctx'> 					 __u16 vid, const unsigned char *src);</div><div class='ctx'> #endif</div><div class='del'>-unsigned int br_mdb_rehash_seq;</div><div class='del'>-</div><div class='del'>-static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b)</div><div class='add'>+static struct net_bridge_port_group *</div><div class='add'>+__br_multicast_add_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+			 struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			 struct br_ip *group,</div><div class='add'>+			 const unsigned char *src,</div><div class='add'>+			 u8 filter_mode,</div><div class='add'>+			 bool igmpv2_mldv1,</div><div class='add'>+			 bool blocked);</div><div class='add'>+static void br_multicast_find_del_pg(struct net_bridge *br,</div><div class='add'>+				     struct net_bridge_port_group *pg);</div><div class='add'>+static void __br_multicast_stop(struct net_bridge_mcast *brmctx);</div><div class='add'>+</div><div class='add'>+static int br_mc_disabled_update(struct net_device *dev, bool value,</div><div class='add'>+				 struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static struct net_bridge_port_group *</div><div class='add'>+br_sg_port_find(struct net_bridge *br,</div><div class='add'>+		struct net_bridge_port_group_sg_key *sg_p)</div><div class='ctx'> {</div><div class='del'>-	if (a-&gt;proto != b-&gt;proto)</div><div class='del'>-		return 0;</div><div class='del'>-	if (a-&gt;vid != b-&gt;vid)</div><div class='del'>-		return 0;</div><div class='del'>-	switch (a-&gt;proto) {</div><div class='del'>-	case htons(ETH_P_IP):</div><div class='del'>-		return a-&gt;u.ip4 == b-&gt;u.ip4;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	case htons(ETH_P_IPV6):</div><div class='del'>-		return ipv6_addr_equal(&amp;a-&gt;u.ip6, &amp;b-&gt;u.ip6);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	lockdep_assert_held_once(&amp;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='del'>-static inline int __br_ip4_hash(struct net_bridge_mdb_htable *mdb, __be32 ip,</div><div class='del'>-				__u16 vid)</div><div class='del'>-{</div><div class='del'>-	return jhash_2words((__force u32)ip, vid, mdb-&gt;secret) &amp; (mdb-&gt;max - 1);</div><div class='add'>+	return rhashtable_lookup_fast(&amp;br-&gt;sg_port_tbl, sg_p,</div><div class='add'>+				      br_sg_port_rht_params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static inline int __br_ip6_hash(struct net_bridge_mdb_htable *mdb,</div><div class='del'>-				const struct in6_addr *ip,</div><div class='del'>-				__u16 vid)</div><div class='add'>+static struct net_bridge_mdb_entry *br_mdb_ip_get_rcu(struct net_bridge *br,</div><div class='add'>+						      struct br_ip *dst)</div><div class='ctx'> {</div><div class='del'>-	return jhash_2words(ipv6_addr_hash(ip), vid,</div><div class='del'>-			    mdb-&gt;secret) &amp; (mdb-&gt;max - 1);</div><div class='add'>+	return rhashtable_lookup(&amp;br-&gt;mdb_hash_tbl, dst, br_mdb_rht_params);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static inline int br_ip_hash(struct net_bridge_mdb_htable *mdb,</div><div class='del'>-			     struct br_ip *ip)</div><div class='del'>-{</div><div class='del'>-	switch (ip-&gt;proto) {</div><div class='del'>-	case htons(ETH_P_IP):</div><div class='del'>-		return __br_ip4_hash(mdb, ip-&gt;u.ip4, ip-&gt;vid);</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	case htons(ETH_P_IPV6):</div><div class='del'>-		return __br_ip6_hash(mdb, &amp;ip-&gt;u.ip6, ip-&gt;vid);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_bridge_mdb_entry *__br_mdb_ip_get(</div><div class='del'>-	struct net_bridge_mdb_htable *mdb, struct br_ip *dst, int hash)</div><div class='add'>+struct net_bridge_mdb_entry *br_mdb_ip_get(struct net_bridge *br,</div><div class='add'>+					   struct br_ip *dst)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_entry *mp;</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(mp, &amp;mdb-&gt;mhash[hash], hlist[mdb-&gt;ver]) {</div><div class='del'>-		if (br_ip_equal(&amp;mp-&gt;addr, dst))</div><div class='del'>-			return mp;</div><div class='del'>-	}</div><div class='add'>+	struct net_bridge_mdb_entry *ent;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+	lockdep_assert_held_once(&amp;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='del'>-struct net_bridge_mdb_entry *br_mdb_ip_get(struct net_bridge_mdb_htable *mdb,</div><div class='del'>-					   struct br_ip *dst)</div><div class='del'>-{</div><div class='del'>-	if (!mdb)</div><div class='del'>-		return NULL;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ent = rhashtable_lookup(&amp;br-&gt;mdb_hash_tbl, dst, br_mdb_rht_params);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return __br_mdb_ip_get(mdb, dst, br_ip_hash(mdb, dst));</div><div class='add'>+	return ent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_bridge_mdb_entry *br_mdb_ip4_get(</div><div class='del'>-	struct net_bridge_mdb_htable *mdb, __be32 dst, __u16 vid)</div><div class='add'>+static struct net_bridge_mdb_entry *br_mdb_ip4_get(struct net_bridge *br,</div><div class='add'>+						   __be32 dst, __u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct br_ip br_dst;</div><div class='ctx'> </div><div class='del'>-	br_dst.u.ip4 = dst;</div><div class='add'>+	memset(&amp;br_dst, 0, sizeof(br_dst));</div><div class='add'>+	br_dst.dst.ip4 = dst;</div><div class='ctx'> 	br_dst.proto = htons(ETH_P_IP);</div><div class='ctx'> 	br_dst.vid = vid;</div><div class='ctx'> </div><div class='del'>-	return br_mdb_ip_get(mdb, &amp;br_dst);</div><div class='add'>+	return br_mdb_ip_get(br, &amp;br_dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static struct net_bridge_mdb_entry *br_mdb_ip6_get(</div><div class='del'>-	struct net_bridge_mdb_htable *mdb, const struct in6_addr *dst,</div><div class='del'>-	__u16 vid)</div><div class='add'>+static struct net_bridge_mdb_entry *br_mdb_ip6_get(struct net_bridge *br,</div><div class='add'>+						   const struct in6_addr *dst,</div><div class='add'>+						   __u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct br_ip br_dst;</div><div class='ctx'> </div><div class='del'>-	br_dst.u.ip6 = *dst;</div><div class='add'>+	memset(&amp;br_dst, 0, sizeof(br_dst));</div><div class='add'>+	br_dst.dst.ip6 = *dst;</div><div class='ctx'> 	br_dst.proto = htons(ETH_P_IPV6);</div><div class='ctx'> 	br_dst.vid = vid;</div><div class='ctx'> </div><div class='del'>-	return br_mdb_ip_get(mdb, &amp;br_dst);</div><div class='add'>+	return br_mdb_ip_get(br, &amp;br_dst);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,</div><div class='del'>-					struct sk_buff *skb, u16 vid)</div><div class='add'>+struct net_bridge_mdb_entry *</div><div class='add'>+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,</div><div class='add'>+		     u16 vid)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb = rcu_dereference(br-&gt;mdb);</div><div class='add'>+	struct net_bridge *br = brmctx-&gt;br;</div><div class='ctx'> 	struct br_ip ip;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_disabled)</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_ENABLED) ||</div><div class='add'>+	    br_multicast_ctx_vlan_global_disabled(brmctx))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (BR_INPUT_SKB_CB(skb)-&gt;igmp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;ip, 0, sizeof(ip));</div><div class='ctx'> 	ip.proto = skb-&gt;protocol;</div><div class='ctx'> 	ip.vid = vid;</div><div class='ctx'> </div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		ip.u.ip4 = ip_hdr(skb)-&gt;daddr;</div><div class='add'>+		ip.dst.ip4 = ip_hdr(skb)-&gt;daddr;</div><div class='add'>+		if (brmctx-&gt;multicast_igmp_version == 3) {</div><div class='add'>+			struct net_bridge_mdb_entry *mdb;</div><div class='add'>+</div><div class='add'>+			ip.src.ip4 = ip_hdr(skb)-&gt;saddr;</div><div class='add'>+			mdb = br_mdb_ip_get_rcu(br, &amp;ip);</div><div class='add'>+			if (mdb)</div><div class='add'>+				return mdb;</div><div class='add'>+			ip.src.ip4 = 0;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case htons(ETH_P_IPV6):</div><div class='del'>-		ip.u.ip6 = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+		ip.dst.ip6 = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+		if (brmctx-&gt;multicast_mld_version == 2) {</div><div class='add'>+			struct net_bridge_mdb_entry *mdb;</div><div class='add'>+</div><div class='add'>+			ip.src.ip6 = ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+			mdb = br_mdb_ip_get_rcu(br, &amp;ip);</div><div class='add'>+			if (mdb)</div><div class='add'>+				return mdb;</div><div class='add'>+			memset(&amp;ip.src.ip6, 0, sizeof(ip.src.ip6));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='add'>+		ip.proto = 0;</div><div class='add'>+		ether_addr_copy(ip.dst.mac_addr, eth_hdr(skb)-&gt;h_dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return br_mdb_ip_get_rcu(br, &amp;ip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* IMPORTANT: this function must be used only when the contexts cannot be</div><div class='add'>+ * passed down (e.g. timer) and must be used for read-only purposes because</div><div class='add'>+ * the vlan snooping option can change, so it can return any context</div><div class='add'>+ * (non-vlan or vlan). Its initial intended purpose is to read timer values</div><div class='add'>+ * from the *current* context based on the option. At worst that could lead</div><div class='add'>+ * to inconsistent timers when the contexts are changed, i.e. src timer</div><div class='add'>+ * which needs to re-arm with a specific delay taken from the old context</div><div class='add'>+ */</div><div class='add'>+static struct net_bridge_mcast_port *</div><div class='add'>+br_multicast_pg_to_port_ctx(const struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = &amp;pg-&gt;key.port-&gt;multicast_ctx;</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_once(&amp;pg-&gt;key.port-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	/* if vlan snooping is disabled use the port's multicast context */</div><div class='add'>+	if (!pg-&gt;key.addr.vid ||</div><div class='add'>+	    !br_opt_get(pg-&gt;key.port-&gt;br, BROPT_MCAST_VLAN_SNOOPING_ENABLED))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* locking is tricky here, due to different rules for multicast and</div><div class='add'>+	 * vlans we need to take rcu to find the vlan and make sure it has</div><div class='add'>+	 * the BR_VLFLAG_MCAST_ENABLED flag set, it can only change under</div><div class='add'>+	 * multicast_lock which must be already held here, so the vlan's pmctx</div><div class='add'>+	 * can safely be used on return</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	vlan = br_vlan_find(nbp_vlan_group_rcu(pg-&gt;key.port), pg-&gt;key.addr.vid);</div><div class='add'>+	if (vlan &amp;&amp; !br_multicast_port_ctx_vlan_disabled(&amp;vlan-&gt;port_mcast_ctx))</div><div class='add'>+		pmctx = &amp;vlan-&gt;port_mcast_ctx;</div><div class='add'>+	else</div><div class='add'>+		pmctx = NULL;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out:</div><div class='add'>+	return pmctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_mcast_port *</div><div class='add'>+br_multicast_port_vid_to_port_ctx(struct net_bridge_port *port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = NULL;</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_once(&amp;port-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(port-&gt;br, BROPT_MCAST_VLAN_SNOOPING_ENABLED))</div><div class='ctx'> 		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Take RCU to access the vlan. */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	vlan = br_vlan_find(nbp_vlan_group_rcu(port), vid);</div><div class='add'>+	if (vlan &amp;&amp; !br_multicast_port_ctx_vlan_disabled(&amp;vlan-&gt;port_mcast_ctx))</div><div class='add'>+		pmctx = &amp;vlan-&gt;port_mcast_ctx;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return pmctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* when snooping we need to check if the contexts should be used</div><div class='add'>+ * in the following order:</div><div class='add'>+ * - if pmctx is non-NULL (port), check if it should be used</div><div class='add'>+ * - if pmctx is NULL (bridge), check if brmctx should be used</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+br_multicast_ctx_should_use(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			    const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	if (!netif_running(brmctx-&gt;br-&gt;dev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (pmctx)</div><div class='add'>+		return !br_multicast_port_ctx_state_disabled(pmctx);</div><div class='add'>+	else</div><div class='add'>+		return !br_multicast_ctx_vlan_disabled(brmctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_port_group_equal(struct net_bridge_port_group *p,</div><div class='add'>+				struct net_bridge_port *port,</div><div class='add'>+				const unsigned char *src)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;key.port != port)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!(port-&gt;flags &amp; BR_MULTICAST_TO_UNICAST))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return ether_addr_equal(src, p-&gt;eth_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __fwd_add_star_excl(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct net_bridge_port_group *pg,</div><div class='add'>+				struct br_ip *sg_ip)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group_sg_key sg_key;</div><div class='add'>+	struct net_bridge_port_group *src_pg;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_key, 0, sizeof(sg_key));</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	sg_key.port = pg-&gt;key.port;</div><div class='add'>+	sg_key.addr = *sg_ip;</div><div class='add'>+	if (br_sg_port_find(brmctx-&gt;br, &amp;sg_key))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	src_pg = __br_multicast_add_group(brmctx, pmctx,</div><div class='add'>+					  sg_ip, pg-&gt;eth_addr,</div><div class='add'>+					  MCAST_INCLUDE, false, false);</div><div class='add'>+	if (IS_ERR_OR_NULL(src_pg) ||</div><div class='add'>+	    src_pg-&gt;rt_protocol != RTPROT_KERNEL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	src_pg-&gt;flags |= MDB_PG_FLAGS_STAR_EXCL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __fwd_del_star_excl(struct net_bridge_port_group *pg,</div><div class='add'>+				struct br_ip *sg_ip)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group_sg_key sg_key;</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct net_bridge_port_group *src_pg;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_key, 0, sizeof(sg_key));</div><div class='add'>+	sg_key.port = pg-&gt;key.port;</div><div class='add'>+	sg_key.addr = *sg_ip;</div><div class='add'>+	src_pg = br_sg_port_find(br, &amp;sg_key);</div><div class='add'>+	if (!src_pg || !(src_pg-&gt;flags &amp; MDB_PG_FLAGS_STAR_EXCL) ||</div><div class='add'>+	    src_pg-&gt;rt_protocol != RTPROT_KERNEL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_multicast_find_del_pg(br, src_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* When a port group transitions to (or is added as) EXCLUDE we need to add it</div><div class='add'>+ * to all other ports' S,G entries which are not blocked by the current group</div><div class='add'>+ * for proper replication, the assumption is that any S,G blocked entries</div><div class='add'>+ * are already added so the S,G,port lookup should skip them.</div><div class='add'>+ * When a port group transitions from EXCLUDE -&gt; INCLUDE mode or is being</div><div class='add'>+ * deleted we need to remove it from all ports' S,G entries where it was</div><div class='add'>+ * automatically installed before (i.e. where it's MDB_PG_FLAGS_STAR_EXCL).</div><div class='add'>+ */</div><div class='add'>+void br_multicast_star_g_handle_mode(struct net_bridge_port_group *pg,</div><div class='add'>+				     u8 filter_mode)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct net_bridge_port_group *pg_lst;</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+	struct br_ip sg_ip;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!br_multicast_is_star_g(&amp;pg-&gt;key.addr)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mp = br_mdb_ip_get(br, &amp;pg-&gt;key.addr);</div><div class='add'>+	if (!mp)</div><div class='add'>+		return;</div><div class='add'>+	pmctx = br_multicast_pg_to_port_ctx(pg);</div><div class='add'>+	if (!pmctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_ip, 0, sizeof(sg_ip));</div><div class='add'>+	sg_ip = pg-&gt;key.addr;</div><div class='add'>+</div><div class='add'>+	for (pg_lst = mlock_dereference(mp-&gt;ports, br);</div><div class='add'>+	     pg_lst;</div><div class='add'>+	     pg_lst = mlock_dereference(pg_lst-&gt;next, br)) {</div><div class='add'>+		struct net_bridge_group_src *src_ent;</div><div class='add'>+</div><div class='add'>+		if (pg_lst == pg)</div><div class='add'>+			continue;</div><div class='add'>+		hlist_for_each_entry(src_ent, &amp;pg_lst-&gt;src_list, node) {</div><div class='add'>+			if (!(src_ent-&gt;flags &amp; BR_SGRP_F_INSTALLED))</div><div class='add'>+				continue;</div><div class='add'>+			sg_ip.src = src_ent-&gt;addr.src;</div><div class='add'>+			switch (filter_mode) {</div><div class='add'>+			case MCAST_INCLUDE:</div><div class='add'>+				__fwd_del_star_excl(pg, &amp;sg_ip);</div><div class='add'>+				break;</div><div class='add'>+			case MCAST_EXCLUDE:</div><div class='add'>+				__fwd_add_star_excl(pmctx, pg, &amp;sg_ip);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called when adding a new S,G with host_joined == false by default */</div><div class='add'>+static void br_multicast_sg_host_state(struct net_bridge_mdb_entry *star_mp,</div><div class='add'>+				       struct net_bridge_port_group *sg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mdb_entry *sg_mp;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!br_multicast_is_star_g(&amp;star_mp-&gt;addr)))</div><div class='add'>+		return;</div><div class='add'>+	if (!star_mp-&gt;host_joined)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sg_mp = br_mdb_ip_get(star_mp-&gt;br, &amp;sg-&gt;key.addr);</div><div class='add'>+	if (!sg_mp)</div><div class='add'>+		return;</div><div class='add'>+	sg_mp-&gt;host_joined = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set the host_joined state of all of *,G's S,G entries */</div><div class='add'>+static void br_multicast_star_g_host_state(struct net_bridge_mdb_entry *star_mp)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = star_mp-&gt;br;</div><div class='add'>+	struct net_bridge_mdb_entry *sg_mp;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	struct br_ip sg_ip;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!br_multicast_is_star_g(&amp;star_mp-&gt;addr)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_ip, 0, sizeof(sg_ip));</div><div class='add'>+	sg_ip = star_mp-&gt;addr;</div><div class='add'>+	for (pg = mlock_dereference(star_mp-&gt;ports, br);</div><div class='add'>+	     pg;</div><div class='add'>+	     pg = mlock_dereference(pg-&gt;next, br)) {</div><div class='add'>+		struct net_bridge_group_src *src_ent;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry(src_ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+			if (!(src_ent-&gt;flags &amp; BR_SGRP_F_INSTALLED))</div><div class='add'>+				continue;</div><div class='add'>+			sg_ip.src = src_ent-&gt;addr.src;</div><div class='add'>+			sg_mp = br_mdb_ip_get(br, &amp;sg_ip);</div><div class='add'>+			if (!sg_mp)</div><div class='add'>+				continue;</div><div class='add'>+			sg_mp-&gt;host_joined = star_mp-&gt;host_joined;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_sg_del_exclude_ports(struct net_bridge_mdb_entry *sgmp)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='add'>+	struct net_bridge_port_group *p;</div><div class='add'>+</div><div class='add'>+	/* *,G exclude ports are only added to S,G entries */</div><div class='add'>+	if (WARN_ON(br_multicast_is_star_g(&amp;sgmp-&gt;addr)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return br_mdb_ip_get(mdb, &amp;ip);</div><div class='add'>+	/* we need the STAR_EXCLUDE ports if there are non-STAR_EXCLUDE ports</div><div class='add'>+	 * we should ignore perm entries since they're managed by user-space</div><div class='add'>+	 */</div><div class='add'>+	for (pp = &amp;sgmp-&gt;ports;</div><div class='add'>+	     (p = mlock_dereference(*pp, sgmp-&gt;br)) != NULL;</div><div class='add'>+	     pp = &amp;p-&gt;next)</div><div class='add'>+		if (!(p-&gt;flags &amp; (MDB_PG_FLAGS_STAR_EXCL |</div><div class='add'>+				  MDB_PG_FLAGS_PERMANENT)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+	/* currently the host can only have joined the *,G which means</div><div class='add'>+	 * we treat it as EXCLUDE {}, so for an S,G it's considered a</div><div class='add'>+	 * STAR_EXCLUDE entry and we can safely leave it</div><div class='add'>+	 */</div><div class='add'>+	sgmp-&gt;host_joined = false;</div><div class='add'>+</div><div class='add'>+	for (pp = &amp;sgmp-&gt;ports;</div><div class='add'>+	     (p = mlock_dereference(*pp, sgmp-&gt;br)) != NULL;) {</div><div class='add'>+		if (!(p-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='add'>+			br_multicast_del_pg(sgmp, p, pp);</div><div class='add'>+		else</div><div class='add'>+			pp = &amp;p-&gt;next;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_mdb_free(struct rcu_head *head)</div><div class='add'>+void br_multicast_sg_add_exclude_ports(struct net_bridge_mdb_entry *star_mp,</div><div class='add'>+				       struct net_bridge_port_group *sg)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb =</div><div class='del'>-		container_of(head, struct net_bridge_mdb_htable, rcu);</div><div class='del'>-	struct net_bridge_mdb_htable *old = mdb-&gt;old;</div><div class='add'>+	struct net_bridge_port_group_sg_key sg_key;</div><div class='add'>+	struct net_bridge *br = star_mp-&gt;br;</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(br_multicast_is_star_g(&amp;sg-&gt;key.addr)))</div><div class='add'>+		return;</div><div class='add'>+	if (WARN_ON(!br_multicast_is_star_g(&amp;star_mp-&gt;addr)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_multicast_sg_host_state(star_mp, sg);</div><div class='add'>+	memset(&amp;sg_key, 0, sizeof(sg_key));</div><div class='add'>+	sg_key.addr = sg-&gt;key.addr;</div><div class='add'>+	/* we need to add all exclude ports to the S,G */</div><div class='add'>+	for (pg = mlock_dereference(star_mp-&gt;ports, br);</div><div class='add'>+	     pg;</div><div class='add'>+	     pg = mlock_dereference(pg-&gt;next, br)) {</div><div class='add'>+		struct net_bridge_port_group *src_pg;</div><div class='add'>+</div><div class='add'>+		if (pg == sg || pg-&gt;filter_mode == MCAST_INCLUDE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sg_key.port = pg-&gt;key.port;</div><div class='add'>+		if (br_sg_port_find(br, &amp;sg_key))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	mdb-&gt;old = NULL;</div><div class='del'>-	kfree(old-&gt;mhash);</div><div class='del'>-	kfree(old);</div><div class='add'>+		pmctx = br_multicast_pg_to_port_ctx(pg);</div><div class='add'>+		if (!pmctx)</div><div class='add'>+			continue;</div><div class='add'>+		brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+</div><div class='add'>+		src_pg = __br_multicast_add_group(brmctx, pmctx,</div><div class='add'>+						  &amp;sg-&gt;key.addr,</div><div class='add'>+						  sg-&gt;eth_addr,</div><div class='add'>+						  MCAST_INCLUDE, false, false);</div><div class='add'>+		if (IS_ERR_OR_NULL(src_pg) ||</div><div class='add'>+		    src_pg-&gt;rt_protocol != RTPROT_KERNEL)</div><div class='add'>+			continue;</div><div class='add'>+		src_pg-&gt;flags |= MDB_PG_FLAGS_STAR_EXCL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_copy(struct net_bridge_mdb_htable *new,</div><div class='del'>-		       struct net_bridge_mdb_htable *old,</div><div class='del'>-		       int elasticity)</div><div class='add'>+static void br_multicast_fwd_src_add(struct net_bridge_group_src *src)</div><div class='ctx'> {</div><div class='add'>+	struct net_bridge_mdb_entry *star_mp;</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	struct net_bridge_port_group *sg;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+	struct br_ip sg_ip;</div><div class='add'>+</div><div class='add'>+	if (src-&gt;flags &amp; BR_SGRP_F_INSTALLED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_ip, 0, sizeof(sg_ip));</div><div class='add'>+	pmctx = br_multicast_pg_to_port_ctx(src-&gt;pg);</div><div class='add'>+	if (!pmctx)</div><div class='add'>+		return;</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	sg_ip = src-&gt;pg-&gt;key.addr;</div><div class='add'>+	sg_ip.src = src-&gt;addr.src;</div><div class='add'>+</div><div class='add'>+	sg = __br_multicast_add_group(brmctx, pmctx, &amp;sg_ip,</div><div class='add'>+				      src-&gt;pg-&gt;eth_addr, MCAST_INCLUDE, false,</div><div class='add'>+				      !timer_pending(&amp;src-&gt;timer));</div><div class='add'>+	if (IS_ERR_OR_NULL(sg))</div><div class='add'>+		return;</div><div class='add'>+	src-&gt;flags |= BR_SGRP_F_INSTALLED;</div><div class='add'>+	sg-&gt;flags &amp;= ~MDB_PG_FLAGS_STAR_EXCL;</div><div class='add'>+</div><div class='add'>+	/* if it was added by user-space as perm we can skip next steps */</div><div class='add'>+	if (sg-&gt;rt_protocol != RTPROT_KERNEL &amp;&amp;</div><div class='add'>+	    (sg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* the kernel is now responsible for removing this S,G */</div><div class='add'>+	timer_delete(&amp;sg-&gt;timer);</div><div class='add'>+	star_mp = br_mdb_ip_get(src-&gt;br, &amp;src-&gt;pg-&gt;key.addr);</div><div class='add'>+	if (!star_mp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_multicast_sg_add_exclude_ports(star_mp, sg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_fwd_src_remove(struct net_bridge_group_src *src,</div><div class='add'>+					bool fastleave)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group *p, *pg = src-&gt;pg;</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	int maxlen;</div><div class='del'>-	int len;</div><div class='del'>-	int i;</div><div class='add'>+	struct br_ip sg_ip;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; old-&gt;max; i++)</div><div class='del'>-		hlist_for_each_entry(mp, &amp;old-&gt;mhash[i], hlist[old-&gt;ver])</div><div class='del'>-			hlist_add_head(&amp;mp-&gt;hlist[new-&gt;ver],</div><div class='del'>-				       &amp;new-&gt;mhash[br_ip_hash(new, &amp;mp-&gt;addr)]);</div><div class='add'>+	memset(&amp;sg_ip, 0, sizeof(sg_ip));</div><div class='add'>+	sg_ip = pg-&gt;key.addr;</div><div class='add'>+	sg_ip.src = src-&gt;addr.src;</div><div class='ctx'> </div><div class='del'>-	if (!elasticity)</div><div class='del'>-		return 0;</div><div class='add'>+	mp = br_mdb_ip_get(src-&gt;br, &amp;sg_ip);</div><div class='add'>+	if (!mp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (pp = &amp;mp-&gt;ports;</div><div class='add'>+	     (p = mlock_dereference(*pp, src-&gt;br)) != NULL;</div><div class='add'>+	     pp = &amp;p-&gt;next) {</div><div class='add'>+		if (!br_port_group_equal(p, pg-&gt;key.port, pg-&gt;eth_addr))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	maxlen = 0;</div><div class='del'>-	for (i = 0; i &lt; new-&gt;max; i++) {</div><div class='del'>-		len = 0;</div><div class='del'>-		hlist_for_each_entry(mp, &amp;new-&gt;mhash[i], hlist[new-&gt;ver])</div><div class='del'>-			len++;</div><div class='del'>-		if (len &gt; maxlen)</div><div class='del'>-			maxlen = len;</div><div class='add'>+		if (p-&gt;rt_protocol != RTPROT_KERNEL &amp;&amp;</div><div class='add'>+		    (p-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp;</div><div class='add'>+		    !(src-&gt;flags &amp; BR_SGRP_F_USER_ADDED))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (fastleave)</div><div class='add'>+			p-&gt;flags |= MDB_PG_FLAGS_FAST_LEAVE;</div><div class='add'>+		br_multicast_del_pg(mp, p, pp);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	src-&gt;flags &amp;= ~BR_SGRP_F_INSTALLED;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return maxlen &gt; elasticity ? -EINVAL : 0;</div><div class='add'>+/* install S,G and based on src's timer enable or disable forwarding */</div><div class='add'>+static void br_multicast_fwd_src_handle(struct net_bridge_group_src *src)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group_sg_key sg_key;</div><div class='add'>+	struct net_bridge_port_group *sg;</div><div class='add'>+	u8 old_flags;</div><div class='add'>+</div><div class='add'>+	br_multicast_fwd_src_add(src);</div><div class='add'>+</div><div class='add'>+	memset(&amp;sg_key, 0, sizeof(sg_key));</div><div class='add'>+	sg_key.addr = src-&gt;pg-&gt;key.addr;</div><div class='add'>+	sg_key.addr.src = src-&gt;addr.src;</div><div class='add'>+	sg_key.port = src-&gt;pg-&gt;key.port;</div><div class='add'>+</div><div class='add'>+	sg = br_sg_port_find(src-&gt;br, &amp;sg_key);</div><div class='add'>+	if (!sg || (sg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	old_flags = sg-&gt;flags;</div><div class='add'>+	if (timer_pending(&amp;src-&gt;timer))</div><div class='add'>+		sg-&gt;flags &amp;= ~MDB_PG_FLAGS_BLOCKED;</div><div class='add'>+	else</div><div class='add'>+		sg-&gt;flags |= MDB_PG_FLAGS_BLOCKED;</div><div class='add'>+</div><div class='add'>+	if (old_flags != sg-&gt;flags) {</div><div class='add'>+		struct net_bridge_mdb_entry *sg_mp;</div><div class='add'>+</div><div class='add'>+		sg_mp = br_mdb_ip_get(src-&gt;br, &amp;sg_key.addr);</div><div class='add'>+		if (!sg_mp)</div><div class='add'>+			return;</div><div class='add'>+		br_mdb_notify(src-&gt;br-&gt;dev, sg_mp, sg, RTM_NEWMDB);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_free_pg(struct rcu_head *head)</div><div class='add'>+static void br_multicast_destroy_mdb_entry(struct net_bridge_mcast_gc *gc)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port_group *p =</div><div class='del'>-		container_of(head, struct net_bridge_port_group, rcu);</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> </div><div class='del'>-	kfree(p);</div><div class='add'>+	mp = container_of(gc, struct net_bridge_mdb_entry, mcast_gc);</div><div class='add'>+	WARN_ON(!hlist_unhashed(&amp;mp-&gt;mdb_node));</div><div class='add'>+	WARN_ON(mp-&gt;ports);</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;mp-&gt;timer);</div><div class='add'>+	kfree_rcu(mp, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_free_group(struct rcu_head *head)</div><div class='add'>+static void br_multicast_del_mdb_entry(struct net_bridge_mdb_entry *mp)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_entry *mp =</div><div class='del'>-		container_of(head, struct net_bridge_mdb_entry, rcu);</div><div class='add'>+	struct net_bridge *br = mp-&gt;br;</div><div class='ctx'> </div><div class='del'>-	kfree(mp);</div><div class='add'>+	rhashtable_remove_fast(&amp;br-&gt;mdb_hash_tbl, &amp;mp-&gt;rhnode,</div><div class='add'>+			       br_mdb_rht_params);</div><div class='add'>+	hlist_del_init_rcu(&amp;mp-&gt;mdb_node);</div><div class='add'>+	hlist_add_head(&amp;mp-&gt;mcast_gc.gc_node, &amp;br-&gt;mcast_gc_list);</div><div class='add'>+	queue_work(system_long_wq, &amp;br-&gt;mcast_gc_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void br_multicast_group_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_entry *mp = from_timer(mp, t, timer);</div><div class='add'>+	struct net_bridge_mdb_entry *mp = timer_container_of(mp, t, timer);</div><div class='ctx'> 	struct net_bridge *br = mp-&gt;br;</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) || timer_pending(&amp;mp-&gt;timer))</div><div class='add'>+	if (hlist_unhashed(&amp;mp-&gt;mdb_node) || !netif_running(br-&gt;dev) ||</div><div class='add'>+	    timer_pending(&amp;mp-&gt;timer))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mp-&gt;host_joined = false;</div><div class='del'>-	br_mdb_notify(br-&gt;dev, NULL, &amp;mp-&gt;addr, RTM_DELMDB, 0);</div><div class='add'>+	br_multicast_host_leave(mp, true);</div><div class='ctx'> </div><div class='ctx'> 	if (mp-&gt;ports)</div><div class='ctx'> 		goto out;</div><div class='add'>+	br_multicast_del_mdb_entry(mp);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='add'>+static void br_multicast_destroy_group_src(struct net_bridge_mcast_gc *gc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *src;</div><div class='ctx'> </div><div class='del'>-	hlist_del_rcu(&amp;mp-&gt;hlist[mdb-&gt;ver]);</div><div class='del'>-	mdb-&gt;size--;</div><div class='add'>+	src = container_of(gc, struct net_bridge_group_src, mcast_gc);</div><div class='add'>+	WARN_ON(!hlist_unhashed(&amp;src-&gt;node));</div><div class='ctx'> </div><div class='del'>-	call_rcu_bh(&amp;mp-&gt;rcu, br_multicast_free_group);</div><div class='add'>+	timer_shutdown_sync(&amp;src-&gt;timer);</div><div class='add'>+	kfree_rcu(src, rcu);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+void __br_multicast_del_group_src(struct net_bridge_group_src *src)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = src-&gt;pg-&gt;key.port-&gt;br;</div><div class='add'>+</div><div class='add'>+	hlist_del_init_rcu(&amp;src-&gt;node);</div><div class='add'>+	src-&gt;pg-&gt;src_ents--;</div><div class='add'>+	hlist_add_head(&amp;src-&gt;mcast_gc.gc_node, &amp;br-&gt;mcast_gc_list);</div><div class='add'>+	queue_work(system_long_wq, &amp;br-&gt;mcast_gc_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_del_group_src(struct net_bridge_group_src *src,</div><div class='add'>+				bool fastleave)</div><div class='add'>+{</div><div class='add'>+	br_multicast_fwd_src_remove(src, fastleave);</div><div class='add'>+	__br_multicast_del_group_src(src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_del_pg(struct net_bridge *br,</div><div class='del'>-				struct net_bridge_port_group *pg)</div><div class='add'>+static int</div><div class='add'>+br_multicast_port_ngroups_inc_one(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				  struct netlink_ext_ack *extack,</div><div class='add'>+				  const char *what)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='add'>+	u32 max = READ_ONCE(pmctx-&gt;mdb_max_entries);</div><div class='add'>+	u32 n = READ_ONCE(pmctx-&gt;mdb_n_entries);</div><div class='add'>+</div><div class='add'>+	if (max &amp;&amp; n &gt;= max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "%s is already in %u groups, and mcast_max_groups=%u",</div><div class='add'>+				       what, n, max);</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(pmctx-&gt;mdb_n_entries, n + 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_port_ngroups_dec_one(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	u32 n = READ_ONCE(pmctx-&gt;mdb_n_entries);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(n == 0);</div><div class='add'>+	WRITE_ONCE(pmctx-&gt;mdb_n_entries, n - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_multicast_port_ngroups_inc(struct net_bridge_port *port,</div><div class='add'>+					 const struct br_ip *group,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_once(&amp;port-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	/* Always count on the port context. */</div><div class='add'>+	err = br_multicast_port_ngroups_inc_one(&amp;port-&gt;multicast_ctx, extack,</div><div class='add'>+						"Port");</div><div class='add'>+	if (err) {</div><div class='add'>+		trace_br_mdb_full(port-&gt;dev, group);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only count on the VLAN context if VID is given, and if snooping on</div><div class='add'>+	 * that VLAN is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (!group-&gt;vid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pmctx = br_multicast_port_vid_to_port_ctx(port, group-&gt;vid);</div><div class='add'>+	if (!pmctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = br_multicast_port_ngroups_inc_one(pmctx, extack, "Port-VLAN");</div><div class='add'>+	if (err) {</div><div class='add'>+		trace_br_mdb_full(port-&gt;dev, group);</div><div class='add'>+		goto dec_one_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dec_one_out:</div><div class='add'>+	br_multicast_port_ngroups_dec_one(&amp;port-&gt;multicast_ctx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_port_ngroups_dec(struct net_bridge_port *port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_once(&amp;port-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	if (vid) {</div><div class='add'>+		pmctx = br_multicast_port_vid_to_port_ctx(port, vid);</div><div class='add'>+		if (pmctx)</div><div class='add'>+			br_multicast_port_ngroups_dec_one(pmctx);</div><div class='add'>+	}</div><div class='add'>+	br_multicast_port_ngroups_dec_one(&amp;port-&gt;multicast_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 br_multicast_ngroups_get(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(pmctx-&gt;mdb_n_entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_ngroups_set_max(struct net_bridge_mcast_port *pmctx, u32 max)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(pmctx-&gt;mdb_max_entries, max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 br_multicast_ngroups_get_max(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(pmctx-&gt;mdb_max_entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+</div><div class='add'>+	pg = container_of(gc, struct net_bridge_port_group, mcast_gc);</div><div class='add'>+	WARN_ON(!hlist_unhashed(&amp;pg-&gt;mglist));</div><div class='add'>+	WARN_ON(!hlist_empty(&amp;pg-&gt;src_list));</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;pg-&gt;rexmit_timer);</div><div class='add'>+	timer_shutdown_sync(&amp;pg-&gt;timer);</div><div class='add'>+	kfree_rcu(pg, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_del_pg(struct net_bridge_mdb_entry *mp,</div><div class='add'>+			 struct net_bridge_port_group *pg,</div><div class='add'>+			 struct net_bridge_port_group __rcu **pp)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(*pp, pg-&gt;next);</div><div class='add'>+	hlist_del_init(&amp;pg-&gt;mglist);</div><div class='add'>+	br_multicast_eht_clean_sets(pg);</div><div class='add'>+	hlist_for_each_entry_safe(ent, tmp, &amp;pg-&gt;src_list, node)</div><div class='add'>+		br_multicast_del_group_src(ent, false);</div><div class='add'>+	br_mdb_notify(br-&gt;dev, mp, pg, RTM_DELMDB);</div><div class='add'>+	if (!br_multicast_is_star_g(&amp;mp-&gt;addr)) {</div><div class='add'>+		rhashtable_remove_fast(&amp;br-&gt;sg_port_tbl, &amp;pg-&gt;rhnode,</div><div class='add'>+				       br_sg_port_rht_params);</div><div class='add'>+		br_multicast_sg_del_exclude_ports(mp);</div><div class='add'>+	} else {</div><div class='add'>+		br_multicast_star_g_handle_mode(pg, MCAST_INCLUDE);</div><div class='add'>+	}</div><div class='add'>+	br_multicast_port_ngroups_dec(pg-&gt;key.port, pg-&gt;key.addr.vid);</div><div class='add'>+	hlist_add_head(&amp;pg-&gt;mcast_gc.gc_node, &amp;br-&gt;mcast_gc_list);</div><div class='add'>+	queue_work(system_long_wq, &amp;br-&gt;mcast_gc_work);</div><div class='add'>+</div><div class='add'>+	if (!mp-&gt;ports &amp;&amp; !mp-&gt;host_joined &amp;&amp; netif_running(br-&gt;dev))</div><div class='add'>+		mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_find_del_pg(struct net_bridge *br,</div><div class='add'>+				     struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='del'>-	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='ctx'> </div><div class='del'>-	mp = br_mdb_ip_get(mdb, &amp;pg-&gt;addr);</div><div class='add'>+	mp = br_mdb_ip_get(br, &amp;pg-&gt;key.addr);</div><div class='ctx'> 	if (WARN_ON(!mp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -286,17 +847,7 @@ static void br_multicast_del_pg(struct net_bridge *br,</div><div class='ctx'> 		if (p != pg)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		rcu_assign_pointer(*pp, p-&gt;next);</div><div class='del'>-		hlist_del_init(&amp;p-&gt;mglist);</div><div class='del'>-		del_timer(&amp;p-&gt;timer);</div><div class='del'>-		br_mdb_notify(br-&gt;dev, p-&gt;port, &amp;pg-&gt;addr, RTM_DELMDB,</div><div class='del'>-			      p-&gt;flags);</div><div class='del'>-		call_rcu_bh(&amp;p-&gt;rcu, br_multicast_free_pg);</div><div class='del'>-</div><div class='del'>-		if (!mp-&gt;ports &amp;&amp; !mp-&gt;host_joined &amp;&amp;</div><div class='del'>-		    netif_running(br-&gt;dev))</div><div class='del'>-			mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='del'>-</div><div class='add'>+		br_multicast_del_pg(mp, pg, pp);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -305,115 +856,148 @@ static void br_multicast_del_pg(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> static void br_multicast_port_group_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port_group *pg = from_timer(pg, t, timer);</div><div class='del'>-	struct net_bridge *br = pg-&gt;port-&gt;br;</div><div class='add'>+	struct net_bridge_port_group *pg = timer_container_of(pg, t, timer);</div><div class='add'>+	struct net_bridge_group_src *src_ent;</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	bool changed;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='ctx'> 	if (!netif_running(br-&gt;dev) || timer_pending(&amp;pg-&gt;timer) ||</div><div class='ctx'> 	    hlist_unhashed(&amp;pg-&gt;mglist) || pg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	br_multicast_del_pg(br, pg);</div><div class='add'>+	changed = !!(pg-&gt;filter_mode == MCAST_EXCLUDE);</div><div class='add'>+	pg-&gt;filter_mode = MCAST_INCLUDE;</div><div class='add'>+	hlist_for_each_entry_safe(src_ent, tmp, &amp;pg-&gt;src_list, node) {</div><div class='add'>+		if (!timer_pending(&amp;src_ent-&gt;timer)) {</div><div class='add'>+			br_multicast_del_group_src(src_ent, false);</div><div class='add'>+			changed = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;pg-&gt;src_list)) {</div><div class='add'>+		br_multicast_find_del_pg(br, pg);</div><div class='add'>+	} else if (changed) {</div><div class='add'>+		struct net_bridge_mdb_entry *mp = br_mdb_ip_get(br, &amp;pg-&gt;key.addr);</div><div class='ctx'> </div><div class='add'>+		if (changed &amp;&amp; br_multicast_is_star_g(&amp;pg-&gt;key.addr))</div><div class='add'>+			br_multicast_star_g_handle_mode(pg, MCAST_INCLUDE);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mp))</div><div class='add'>+			goto out;</div><div class='add'>+		br_mdb_notify(br-&gt;dev, mp, pg, RTM_NEWMDB);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_mdb_rehash(struct net_bridge_mdb_htable __rcu **mdbp, int max,</div><div class='del'>-			 int elasticity)</div><div class='add'>+static void br_multicast_gc(struct hlist_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *old = rcu_dereference_protected(*mdbp, 1);</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mdb = kmalloc(sizeof(*mdb), GFP_ATOMIC);</div><div class='del'>-	if (!mdb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	mdb-&gt;max = max;</div><div class='del'>-	mdb-&gt;old = old;</div><div class='add'>+	struct net_bridge_mcast_gc *gcent;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='ctx'> </div><div class='del'>-	mdb-&gt;mhash = kcalloc(max, sizeof(*mdb-&gt;mhash), GFP_ATOMIC);</div><div class='del'>-	if (!mdb-&gt;mhash) {</div><div class='del'>-		kfree(mdb);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	hlist_for_each_entry_safe(gcent, tmp, head, gc_node) {</div><div class='add'>+		hlist_del_init(&amp;gcent-&gt;gc_node);</div><div class='add'>+		gcent-&gt;destroy(gcent);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mdb-&gt;size = old ? old-&gt;size : 0;</div><div class='del'>-	mdb-&gt;ver = old ? old-&gt;ver ^ 1 : 0;</div><div class='add'>+static void __br_multicast_query_handle_vlan(struct net_bridge_mcast *brmctx,</div><div class='add'>+					     struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *vlan = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!old || elasticity)</div><div class='del'>-		get_random_bytes(&amp;mdb-&gt;secret, sizeof(mdb-&gt;secret));</div><div class='del'>-	else</div><div class='del'>-		mdb-&gt;secret = old-&gt;secret;</div><div class='add'>+	if (pmctx &amp;&amp; br_multicast_port_ctx_is_vlan(pmctx))</div><div class='add'>+		vlan = pmctx-&gt;vlan;</div><div class='add'>+	else if (br_multicast_ctx_is_vlan(brmctx))</div><div class='add'>+		vlan = brmctx-&gt;vlan;</div><div class='ctx'> </div><div class='del'>-	if (!old)</div><div class='del'>-		goto out;</div><div class='add'>+	if (vlan &amp;&amp; !(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED)) {</div><div class='add'>+		u16 vlan_proto;</div><div class='ctx'> </div><div class='del'>-	err = br_mdb_copy(mdb, old, elasticity);</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(mdb-&gt;mhash);</div><div class='del'>-		kfree(mdb);</div><div class='del'>-		return err;</div><div class='add'>+		if (br_vlan_get_proto(brmctx-&gt;br-&gt;dev, &amp;vlan_proto) != 0)</div><div class='add'>+			return;</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, htons(vlan_proto), vlan-&gt;vid);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	br_mdb_rehash_seq++;</div><div class='del'>-	call_rcu_bh(&amp;mdb-&gt;rcu, br_mdb_free);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	rcu_assign_pointer(*mdbp, mdb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,</div><div class='del'>-						    __be32 group,</div><div class='del'>-						    u8 *igmp_type)</div><div class='add'>+static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+						    struct net_bridge_mcast_port *pmctx,</div><div class='add'>+						    struct net_bridge_port_group *pg,</div><div class='add'>+						    __be32 ip_dst, __be32 group,</div><div class='add'>+						    bool with_srcs, bool over_lmqt,</div><div class='add'>+						    u8 sflag, u8 *igmp_type,</div><div class='add'>+						    bool *need_rexmit)</div><div class='ctx'> {</div><div class='add'>+	struct net_bridge_port *p = pg ? pg-&gt;key.port : NULL;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	size_t pkt_size, igmp_hdr_size;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='ctx'> 	struct igmpv3_query *ihv3;</div><div class='del'>-	size_t igmp_hdr_size;</div><div class='add'>+	void *csum_start = NULL;</div><div class='add'>+	__sum16 *csum = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct igmphdr *ih;</div><div class='ctx'> 	struct ethhdr *eth;</div><div class='add'>+	unsigned long lmqt;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='add'>+	u16 lmqt_srcs = 0;</div><div class='ctx'> </div><div class='ctx'> 	igmp_hdr_size = sizeof(*ih);</div><div class='del'>-	if (br-&gt;multicast_igmp_version == 3)</div><div class='add'>+	if (brmctx-&gt;multicast_igmp_version == 3) {</div><div class='ctx'> 		igmp_hdr_size = sizeof(*ihv3);</div><div class='del'>-	skb = netdev_alloc_skb_ip_align(br-&gt;dev, sizeof(*eth) + sizeof(*iph) +</div><div class='del'>-						 igmp_hdr_size + 4);</div><div class='add'>+		if (pg &amp;&amp; with_srcs) {</div><div class='add'>+			lmqt = now + (brmctx-&gt;multicast_last_member_interval *</div><div class='add'>+				      brmctx-&gt;multicast_last_member_count);</div><div class='add'>+			hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+				if (over_lmqt == time_after(ent-&gt;timer.expires,</div><div class='add'>+							    lmqt) &amp;&amp;</div><div class='add'>+				    ent-&gt;src_query_rexmit_cnt &gt; 0)</div><div class='add'>+					lmqt_srcs++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!lmqt_srcs)</div><div class='add'>+				return NULL;</div><div class='add'>+			igmp_hdr_size += lmqt_srcs * sizeof(__be32);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt_size = sizeof(*eth) + sizeof(*iph) + 4 + igmp_hdr_size;</div><div class='add'>+	if ((p &amp;&amp; pkt_size &gt; p-&gt;dev-&gt;mtu) ||</div><div class='add'>+	    pkt_size &gt; brmctx-&gt;br-&gt;dev-&gt;mtu)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(brmctx-&gt;br-&gt;dev, pkt_size);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	__br_multicast_query_handle_vlan(brmctx, pmctx, skb);</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	eth = eth_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(eth-&gt;h_source, br-&gt;dev-&gt;dev_addr);</div><div class='del'>-	eth-&gt;h_dest[0] = 1;</div><div class='del'>-	eth-&gt;h_dest[1] = 0;</div><div class='del'>-	eth-&gt;h_dest[2] = 0x5e;</div><div class='del'>-	eth-&gt;h_dest[3] = 0;</div><div class='del'>-	eth-&gt;h_dest[4] = 0;</div><div class='del'>-	eth-&gt;h_dest[5] = 1;</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, brmctx-&gt;br-&gt;dev-&gt;dev_addr);</div><div class='add'>+	ip_eth_mc_map(ip_dst, eth-&gt;h_dest);</div><div class='ctx'> 	eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='ctx'> 	skb_put(skb, sizeof(*eth));</div><div class='ctx'> </div><div class='ctx'> 	skb_set_network_header(skb, skb-&gt;len);</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='add'>+	iph-&gt;tot_len = htons(pkt_size - sizeof(*eth));</div><div class='ctx'> </div><div class='ctx'> 	iph-&gt;version = 4;</div><div class='ctx'> 	iph-&gt;ihl = 6;</div><div class='ctx'> 	iph-&gt;tos = 0xc0;</div><div class='del'>-	iph-&gt;tot_len = htons(sizeof(*iph) + igmp_hdr_size + 4);</div><div class='ctx'> 	iph-&gt;id = 0;</div><div class='ctx'> 	iph-&gt;frag_off = htons(IP_DF);</div><div class='ctx'> 	iph-&gt;ttl = 1;</div><div class='ctx'> 	iph-&gt;protocol = IPPROTO_IGMP;</div><div class='del'>-	iph-&gt;saddr = br-&gt;multicast_query_use_ifaddr ?</div><div class='del'>-		     inet_select_addr(br-&gt;dev, 0, RT_SCOPE_LINK) : 0;</div><div class='del'>-	iph-&gt;daddr = htonl(INADDR_ALLHOSTS_GROUP);</div><div class='add'>+	iph-&gt;saddr = br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_QUERY_USE_IFADDR) ?</div><div class='add'>+		     inet_select_addr(brmctx-&gt;br-&gt;dev, 0, RT_SCOPE_LINK) : 0;</div><div class='add'>+	iph-&gt;daddr = ip_dst;</div><div class='ctx'> 	((u8 *)&amp;iph[1])[0] = IPOPT_RA;</div><div class='ctx'> 	((u8 *)&amp;iph[1])[1] = 4;</div><div class='ctx'> 	((u8 *)&amp;iph[1])[2] = 0;</div><div class='hunk'>@@ -424,34 +1008,60 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,</div><div class='ctx'> 	skb_set_transport_header(skb, skb-&gt;len);</div><div class='ctx'> 	*igmp_type = IGMP_HOST_MEMBERSHIP_QUERY;</div><div class='ctx'> </div><div class='del'>-	switch (br-&gt;multicast_igmp_version) {</div><div class='add'>+	switch (brmctx-&gt;multicast_igmp_version) {</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		ih = igmp_hdr(skb);</div><div class='ctx'> 		ih-&gt;type = IGMP_HOST_MEMBERSHIP_QUERY;</div><div class='del'>-		ih-&gt;code = (group ? br-&gt;multicast_last_member_interval :</div><div class='del'>-				    br-&gt;multicast_query_response_interval) /</div><div class='add'>+		ih-&gt;code = (group ? brmctx-&gt;multicast_last_member_interval :</div><div class='add'>+				    brmctx-&gt;multicast_query_response_interval) /</div><div class='ctx'> 			   (HZ / IGMP_TIMER_SCALE);</div><div class='ctx'> 		ih-&gt;group = group;</div><div class='ctx'> 		ih-&gt;csum = 0;</div><div class='del'>-		ih-&gt;csum = ip_compute_csum((void *)ih, sizeof(*ih));</div><div class='add'>+		csum = &amp;ih-&gt;csum;</div><div class='add'>+		csum_start = (void *)ih;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		ihv3 = igmpv3_query_hdr(skb);</div><div class='ctx'> 		ihv3-&gt;type = IGMP_HOST_MEMBERSHIP_QUERY;</div><div class='del'>-		ihv3-&gt;code = (group ? br-&gt;multicast_last_member_interval :</div><div class='del'>-				      br-&gt;multicast_query_response_interval) /</div><div class='add'>+		ihv3-&gt;code = (group ? brmctx-&gt;multicast_last_member_interval :</div><div class='add'>+				      brmctx-&gt;multicast_query_response_interval) /</div><div class='ctx'> 			     (HZ / IGMP_TIMER_SCALE);</div><div class='ctx'> 		ihv3-&gt;group = group;</div><div class='del'>-		ihv3-&gt;qqic = br-&gt;multicast_query_interval / HZ;</div><div class='del'>-		ihv3-&gt;nsrcs = 0;</div><div class='add'>+		ihv3-&gt;qqic = brmctx-&gt;multicast_query_interval / HZ;</div><div class='add'>+		ihv3-&gt;nsrcs = htons(lmqt_srcs);</div><div class='ctx'> 		ihv3-&gt;resv = 0;</div><div class='del'>-		ihv3-&gt;suppress = 0;</div><div class='add'>+		ihv3-&gt;suppress = sflag;</div><div class='ctx'> 		ihv3-&gt;qrv = 2;</div><div class='ctx'> 		ihv3-&gt;csum = 0;</div><div class='del'>-		ihv3-&gt;csum = ip_compute_csum((void *)ihv3, sizeof(*ihv3));</div><div class='add'>+		csum = &amp;ihv3-&gt;csum;</div><div class='add'>+		csum_start = (void *)ihv3;</div><div class='add'>+		if (!pg || !with_srcs)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		lmqt_srcs = 0;</div><div class='add'>+		hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+			if (over_lmqt == time_after(ent-&gt;timer.expires,</div><div class='add'>+						    lmqt) &amp;&amp;</div><div class='add'>+			    ent-&gt;src_query_rexmit_cnt &gt; 0) {</div><div class='add'>+				ihv3-&gt;srcs[lmqt_srcs++] = ent-&gt;addr.src.ip4;</div><div class='add'>+				ent-&gt;src_query_rexmit_cnt--;</div><div class='add'>+				if (need_rexmit &amp;&amp; ent-&gt;src_query_rexmit_cnt)</div><div class='add'>+					*need_rexmit = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (WARN_ON(lmqt_srcs != ntohs(ihv3-&gt;nsrcs))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(!csum || !csum_start)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*csum = ip_compute_csum(csum_start, igmp_hdr_size);</div><div class='ctx'> 	skb_put(skb, igmp_hdr_size);</div><div class='ctx'> 	__skb_pull(skb, sizeof(*eth));</div><div class='ctx'> </div><div class='hunk'>@@ -460,34 +1070,67 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,</div><div class='del'>-						    const struct in6_addr *grp,</div><div class='del'>-						    u8 *igmp_type)</div><div class='add'>+static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+						    struct net_bridge_mcast_port *pmctx,</div><div class='add'>+						    struct net_bridge_port_group *pg,</div><div class='add'>+						    const struct in6_addr *ip6_dst,</div><div class='add'>+						    const struct in6_addr *group,</div><div class='add'>+						    bool with_srcs, bool over_llqt,</div><div class='add'>+						    u8 sflag, u8 *igmp_type,</div><div class='add'>+						    bool *need_rexmit)</div><div class='ctx'> {</div><div class='add'>+	struct net_bridge_port *p = pg ? pg-&gt;key.port : NULL;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	size_t pkt_size, mld_hdr_size;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='ctx'> 	struct mld2_query *mld2q;</div><div class='add'>+	void *csum_start = NULL;</div><div class='ctx'> 	unsigned long interval;</div><div class='add'>+	__sum16 *csum = NULL;</div><div class='ctx'> 	struct ipv6hdr *ip6h;</div><div class='ctx'> 	struct mld_msg *mldq;</div><div class='del'>-	size_t mld_hdr_size;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	unsigned long llqt;</div><div class='ctx'> 	struct ethhdr *eth;</div><div class='add'>+	u16 llqt_srcs = 0;</div><div class='ctx'> 	u8 *hopopt;</div><div class='ctx'> </div><div class='ctx'> 	mld_hdr_size = sizeof(*mldq);</div><div class='del'>-	if (br-&gt;multicast_mld_version == 2)</div><div class='add'>+	if (brmctx-&gt;multicast_mld_version == 2) {</div><div class='ctx'> 		mld_hdr_size = sizeof(*mld2q);</div><div class='del'>-	skb = netdev_alloc_skb_ip_align(br-&gt;dev, sizeof(*eth) + sizeof(*ip6h) +</div><div class='del'>-						 8 + mld_hdr_size);</div><div class='add'>+		if (pg &amp;&amp; with_srcs) {</div><div class='add'>+			llqt = now + (brmctx-&gt;multicast_last_member_interval *</div><div class='add'>+				      brmctx-&gt;multicast_last_member_count);</div><div class='add'>+			hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+				if (over_llqt == time_after(ent-&gt;timer.expires,</div><div class='add'>+							    llqt) &amp;&amp;</div><div class='add'>+				    ent-&gt;src_query_rexmit_cnt &gt; 0)</div><div class='add'>+					llqt_srcs++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!llqt_srcs)</div><div class='add'>+				return NULL;</div><div class='add'>+			mld_hdr_size += llqt_srcs * sizeof(struct in6_addr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt_size = sizeof(*eth) + sizeof(*ip6h) + 8 + mld_hdr_size;</div><div class='add'>+	if ((p &amp;&amp; pkt_size &gt; p-&gt;dev-&gt;mtu) ||</div><div class='add'>+	    pkt_size &gt; brmctx-&gt;br-&gt;dev-&gt;mtu)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(brmctx-&gt;br-&gt;dev, pkt_size);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	__br_multicast_query_handle_vlan(brmctx, pmctx, skb);</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='ctx'> 	/* Ethernet header */</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	eth = eth_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(eth-&gt;h_source, br-&gt;dev-&gt;dev_addr);</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, brmctx-&gt;br-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='ctx'> 	skb_put(skb, sizeof(*eth));</div><div class='ctx'> </div><div class='hunk'>@@ -499,15 +1142,15 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,</div><div class='ctx'> 	ip6h-&gt;payload_len = htons(8 + mld_hdr_size);</div><div class='ctx'> 	ip6h-&gt;nexthdr = IPPROTO_HOPOPTS;</div><div class='ctx'> 	ip6h-&gt;hop_limit = 1;</div><div class='del'>-	ipv6_addr_set(&amp;ip6h-&gt;daddr, htonl(0xff020000), 0, 0, htonl(1));</div><div class='del'>-	if (ipv6_dev_get_saddr(dev_net(br-&gt;dev), br-&gt;dev, &amp;ip6h-&gt;daddr, 0,</div><div class='del'>-			       &amp;ip6h-&gt;saddr)) {</div><div class='add'>+	ip6h-&gt;daddr = *ip6_dst;</div><div class='add'>+	if (ipv6_dev_get_saddr(dev_net(brmctx-&gt;br-&gt;dev), brmctx-&gt;br-&gt;dev,</div><div class='add'>+			       &amp;ip6h-&gt;daddr, 0, &amp;ip6h-&gt;saddr)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-		br-&gt;has_ipv6_addr = 0;</div><div class='add'>+		br_opt_toggle(brmctx-&gt;br, BROPT_HAS_IPV6_ADDR, false);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	br-&gt;has_ipv6_addr = 1;</div><div class='add'>+	br_opt_toggle(brmctx-&gt;br, BROPT_HAS_IPV6_ADDR, true);</div><div class='ctx'> 	ipv6_eth_mc_map(&amp;ip6h-&gt;daddr, eth-&gt;h_dest);</div><div class='ctx'> </div><div class='ctx'> 	hopopt = (u8 *)(ip6h + 1);</div><div class='hunk'>@@ -524,11 +1167,11 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	/* ICMPv6 */</div><div class='ctx'> 	skb_set_transport_header(skb, skb-&gt;len);</div><div class='del'>-	interval = ipv6_addr_any(grp) ?</div><div class='del'>-			br-&gt;multicast_query_response_interval :</div><div class='del'>-			br-&gt;multicast_last_member_interval;</div><div class='add'>+	interval = ipv6_addr_any(group) ?</div><div class='add'>+			brmctx-&gt;multicast_query_response_interval :</div><div class='add'>+			brmctx-&gt;multicast_last_member_interval;</div><div class='ctx'> 	*igmp_type = ICMPV6_MGM_QUERY;</div><div class='del'>-	switch (br-&gt;multicast_mld_version) {</div><div class='add'>+	switch (brmctx-&gt;multicast_mld_version) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		mldq = (struct mld_msg *)icmp6_hdr(skb);</div><div class='ctx'> 		mldq-&gt;mld_type = ICMPV6_MGM_QUERY;</div><div class='hunk'>@@ -536,12 +1179,9 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,</div><div class='ctx'> 		mldq-&gt;mld_cksum = 0;</div><div class='ctx'> 		mldq-&gt;mld_maxdelay = htons((u16)jiffies_to_msecs(interval));</div><div class='ctx'> 		mldq-&gt;mld_reserved = 0;</div><div class='del'>-		mldq-&gt;mld_mca = *grp;</div><div class='del'>-		mldq-&gt;mld_cksum = csum_ipv6_magic(&amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr,</div><div class='del'>-						  sizeof(*mldq), IPPROTO_ICMPV6,</div><div class='del'>-						  csum_partial(mldq,</div><div class='del'>-							       sizeof(*mldq),</div><div class='del'>-							       0));</div><div class='add'>+		mldq-&gt;mld_mca = *group;</div><div class='add'>+		csum = &amp;mldq-&gt;mld_cksum;</div><div class='add'>+		csum_start = (void *)mldq;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		mld2q = (struct mld2_query *)icmp6_hdr(skb);</div><div class='hunk'>@@ -551,21 +1191,43 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,</div><div class='ctx'> 		mld2q-&gt;mld2q_cksum = 0;</div><div class='ctx'> 		mld2q-&gt;mld2q_resv1 = 0;</div><div class='ctx'> 		mld2q-&gt;mld2q_resv2 = 0;</div><div class='del'>-		mld2q-&gt;mld2q_suppress = 0;</div><div class='add'>+		mld2q-&gt;mld2q_suppress = sflag;</div><div class='ctx'> 		mld2q-&gt;mld2q_qrv = 2;</div><div class='del'>-		mld2q-&gt;mld2q_nsrcs = 0;</div><div class='del'>-		mld2q-&gt;mld2q_qqic = br-&gt;multicast_query_interval / HZ;</div><div class='del'>-		mld2q-&gt;mld2q_mca = *grp;</div><div class='del'>-		mld2q-&gt;mld2q_cksum = csum_ipv6_magic(&amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr,</div><div class='del'>-						     sizeof(*mld2q),</div><div class='del'>-						     IPPROTO_ICMPV6,</div><div class='del'>-						     csum_partial(mld2q,</div><div class='del'>-								  sizeof(*mld2q),</div><div class='del'>-								  0));</div><div class='add'>+		mld2q-&gt;mld2q_nsrcs = htons(llqt_srcs);</div><div class='add'>+		mld2q-&gt;mld2q_qqic = brmctx-&gt;multicast_query_interval / HZ;</div><div class='add'>+		mld2q-&gt;mld2q_mca = *group;</div><div class='add'>+		csum = &amp;mld2q-&gt;mld2q_cksum;</div><div class='add'>+		csum_start = (void *)mld2q;</div><div class='add'>+		if (!pg || !with_srcs)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		llqt_srcs = 0;</div><div class='add'>+		hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+			if (over_llqt == time_after(ent-&gt;timer.expires,</div><div class='add'>+						    llqt) &amp;&amp;</div><div class='add'>+			    ent-&gt;src_query_rexmit_cnt &gt; 0) {</div><div class='add'>+				mld2q-&gt;mld2q_srcs[llqt_srcs++] = ent-&gt;addr.src.ip6;</div><div class='add'>+				ent-&gt;src_query_rexmit_cnt--;</div><div class='add'>+				if (need_rexmit &amp;&amp; ent-&gt;src_query_rexmit_cnt)</div><div class='add'>+					*need_rexmit = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (WARN_ON(llqt_srcs != ntohs(mld2q-&gt;mld2q_nsrcs))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	skb_put(skb, mld_hdr_size);</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(!csum || !csum_start)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*csum = csum_ipv6_magic(&amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr, mld_hdr_size,</div><div class='add'>+				IPPROTO_ICMPV6,</div><div class='add'>+				csum_partial(csum_start, mld_hdr_size, 0));</div><div class='add'>+	skb_put(skb, mld_hdr_size);</div><div class='ctx'> 	__skb_pull(skb, sizeof(*eth));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -573,295 +1235,454 @@ out:</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *br_multicast_alloc_query(struct net_bridge *br,</div><div class='del'>-						struct br_ip *addr,</div><div class='del'>-						u8 *igmp_type)</div><div class='add'>+static struct sk_buff *br_multicast_alloc_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+						struct net_bridge_mcast_port *pmctx,</div><div class='add'>+						struct net_bridge_port_group *pg,</div><div class='add'>+						struct br_ip *ip_dst,</div><div class='add'>+						struct br_ip *group,</div><div class='add'>+						bool with_srcs, bool over_lmqt,</div><div class='add'>+						u8 sflag, u8 *igmp_type,</div><div class='add'>+						bool *need_rexmit)</div><div class='ctx'> {</div><div class='del'>-	switch (addr-&gt;proto) {</div><div class='add'>+	__be32 ip4_dst;</div><div class='add'>+</div><div class='add'>+	switch (group-&gt;proto) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		return br_ip4_multicast_alloc_query(br, addr-&gt;u.ip4, igmp_type);</div><div class='add'>+		ip4_dst = ip_dst ? ip_dst-&gt;dst.ip4 : htonl(INADDR_ALLHOSTS_GROUP);</div><div class='add'>+		return br_ip4_multicast_alloc_query(brmctx, pmctx, pg,</div><div class='add'>+						    ip4_dst, group-&gt;dst.ip4,</div><div class='add'>+						    with_srcs, over_lmqt,</div><div class='add'>+						    sflag, igmp_type,</div><div class='add'>+						    need_rexmit);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	case htons(ETH_P_IPV6):</div><div class='del'>-		return br_ip6_multicast_alloc_query(br, &amp;addr-&gt;u.ip6,</div><div class='del'>-						    igmp_type);</div><div class='add'>+	case htons(ETH_P_IPV6): {</div><div class='add'>+		struct in6_addr ip6_dst;</div><div class='add'>+</div><div class='add'>+		if (ip_dst)</div><div class='add'>+			ip6_dst = ip_dst-&gt;dst.ip6;</div><div class='add'>+		else</div><div class='add'>+			ipv6_addr_set(&amp;ip6_dst, htonl(0xff020000), 0, 0,</div><div class='add'>+				      htonl(1));</div><div class='add'>+</div><div class='add'>+		return br_ip6_multicast_alloc_query(brmctx, pmctx, pg,</div><div class='add'>+						    &amp;ip6_dst, &amp;group-&gt;dst.ip6,</div><div class='add'>+						    with_srcs, over_lmqt,</div><div class='add'>+						    sflag, igmp_type,</div><div class='add'>+						    need_rexmit);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_bridge_mdb_entry *br_multicast_get_group(</div><div class='del'>-	struct net_bridge *br, struct net_bridge_port *port,</div><div class='del'>-	struct br_ip *group, int hash)</div><div class='add'>+struct net_bridge_mdb_entry *br_multicast_new_group(struct net_bridge *br,</div><div class='add'>+						    struct br_ip *group)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	unsigned int count = 0;</div><div class='del'>-	unsigned int max;</div><div class='del'>-	int elasticity;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mdb = rcu_dereference_protected(br-&gt;mdb, 1);</div><div class='del'>-	hlist_for_each_entry(mp, &amp;mdb-&gt;mhash[hash], hlist[mdb-&gt;ver]) {</div><div class='del'>-		count++;</div><div class='del'>-		if (unlikely(br_ip_equal(group, &amp;mp-&gt;addr)))</div><div class='del'>-			return mp;</div><div class='del'>-	}</div><div class='add'>+	mp = br_mdb_ip_get(br, group);</div><div class='add'>+	if (mp)</div><div class='add'>+		return mp;</div><div class='ctx'> </div><div class='del'>-	elasticity = 0;</div><div class='del'>-	max = mdb-&gt;max;</div><div class='add'>+	if (atomic_read(&amp;br-&gt;mdb_hash_tbl.nelems) &gt;= br-&gt;hash_max) {</div><div class='add'>+		trace_br_mdb_full(br-&gt;dev, group);</div><div class='add'>+		br_mc_disabled_update(br-&gt;dev, false, NULL);</div><div class='add'>+		br_opt_toggle(br, BROPT_MULTICAST_ENABLED, false);</div><div class='add'>+		return ERR_PTR(-E2BIG);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(count &gt; br-&gt;hash_elasticity &amp;&amp; count)) {</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			br_info(br, "Multicast hash table "</div><div class='del'>-				"chain limit reached: %s\n",</div><div class='del'>-				port ? port-&gt;dev-&gt;name : br-&gt;dev-&gt;name);</div><div class='add'>+	mp = kzalloc(sizeof(*mp), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!mp))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-		elasticity = br-&gt;hash_elasticity;</div><div class='add'>+	mp-&gt;br = br;</div><div class='add'>+	mp-&gt;addr = *group;</div><div class='add'>+	mp-&gt;mcast_gc.destroy = br_multicast_destroy_mdb_entry;</div><div class='add'>+	timer_setup(&amp;mp-&gt;timer, br_multicast_group_expired, 0);</div><div class='add'>+	err = rhashtable_lookup_insert_fast(&amp;br-&gt;mdb_hash_tbl, &amp;mp-&gt;rhnode,</div><div class='add'>+					    br_mdb_rht_params);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(mp);</div><div class='add'>+		mp = ERR_PTR(err);</div><div class='add'>+	} else {</div><div class='add'>+		hlist_add_head_rcu(&amp;mp-&gt;mdb_node, &amp;br-&gt;mdb_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mdb-&gt;size &gt;= max) {</div><div class='del'>-		max *= 2;</div><div class='del'>-		if (unlikely(max &gt; br-&gt;hash_max)) {</div><div class='del'>-			br_warn(br, "Multicast hash table maximum of %d "</div><div class='del'>-				"reached, disabling snooping: %s\n",</div><div class='del'>-				br-&gt;hash_max,</div><div class='del'>-				port ? port-&gt;dev-&gt;name : br-&gt;dev-&gt;name);</div><div class='del'>-			err = -E2BIG;</div><div class='del'>-disable:</div><div class='del'>-			br-&gt;multicast_disabled = 1;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='add'>+	return mp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_group_src_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *src = timer_container_of(src, t, timer);</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	struct net_bridge *br = src-&gt;br;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (hlist_unhashed(&amp;src-&gt;node) || !netif_running(br-&gt;dev) ||</div><div class='add'>+	    timer_pending(&amp;src-&gt;timer))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pg = src-&gt;pg;</div><div class='add'>+	if (pg-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+		br_multicast_del_group_src(src, false);</div><div class='add'>+		if (!hlist_empty(&amp;pg-&gt;src_list))</div><div class='add'>+			goto out;</div><div class='add'>+		br_multicast_find_del_pg(br, pg);</div><div class='add'>+	} else {</div><div class='add'>+		br_multicast_fwd_src_handle(src);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (max &gt; mdb-&gt;max || elasticity) {</div><div class='del'>-		if (mdb-&gt;old) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				br_info(br, "Multicast hash table "</div><div class='del'>-					"on fire: %s\n",</div><div class='del'>-					port ? port-&gt;dev-&gt;name : br-&gt;dev-&gt;name);</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		err = br_mdb_rehash(&amp;br-&gt;mdb, max, elasticity);</div><div class='del'>-		if (err) {</div><div class='del'>-			br_warn(br, "Cannot rehash multicast "</div><div class='del'>-				"hash table, disabling snooping: %s, %d, %d\n",</div><div class='del'>-				port ? port-&gt;dev-&gt;name : br-&gt;dev-&gt;name,</div><div class='del'>-				mdb-&gt;size, err);</div><div class='del'>-			goto disable;</div><div class='del'>-		}</div><div class='add'>+struct net_bridge_group_src *</div><div class='add'>+br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='ctx'> </div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		goto err;</div><div class='add'>+	switch (ip-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+			if (ip-&gt;src.ip4 == ent-&gt;addr.src.ip4)</div><div class='add'>+				return ent;</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+			if (!ipv6_addr_cmp(&amp;ent-&gt;addr.src.ip6, &amp;ip-&gt;src.ip6))</div><div class='add'>+				return ent;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	mp = ERR_PTR(err);</div><div class='del'>-	return mp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net_bridge_mdb_entry *br_multicast_new_group(struct net_bridge *br,</div><div class='del'>-						    struct net_bridge_port *p,</div><div class='del'>-						    struct br_ip *group)</div><div class='add'>+struct net_bridge_group_src *</div><div class='add'>+br_multicast_new_group_src(struct net_bridge_port_group *pg, struct br_ip *src_ip)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='del'>-	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	int hash;</div><div class='del'>-	int err;</div><div class='add'>+	struct net_bridge_group_src *grp_src;</div><div class='ctx'> </div><div class='del'>-	mdb = rcu_dereference_protected(br-&gt;mdb, 1);</div><div class='del'>-	if (!mdb) {</div><div class='del'>-		err = br_mdb_rehash(&amp;br-&gt;mdb, BR_HASH_SIZE, 0);</div><div class='del'>-		if (err)</div><div class='del'>-			return ERR_PTR(err);</div><div class='del'>-		goto rehash;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(pg-&gt;src_ents &gt;= PG_SRC_ENT_LIMIT))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	hash = br_ip_hash(mdb, group);</div><div class='del'>-	mp = br_multicast_get_group(br, p, group, hash);</div><div class='del'>-	switch (PTR_ERR(mp)) {</div><div class='del'>-	case 0:</div><div class='add'>+	switch (src_ip-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		if (ipv4_is_zeronet(src_ip-&gt;src.ip4) ||</div><div class='add'>+		    ipv4_is_multicast(src_ip-&gt;src.ip4))</div><div class='add'>+			return NULL;</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	case -EAGAIN:</div><div class='del'>-rehash:</div><div class='del'>-		mdb = rcu_dereference_protected(br-&gt;mdb, 1);</div><div class='del'>-		hash = br_ip_hash(mdb, group);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		if (ipv6_addr_any(&amp;src_ip-&gt;src.ip6) ||</div><div class='add'>+		    ipv6_addr_is_multicast(&amp;src_ip-&gt;src.ip6))</div><div class='add'>+			return NULL;</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		goto out;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mp = kzalloc(sizeof(*mp), GFP_ATOMIC);</div><div class='del'>-	if (unlikely(!mp))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	grp_src = kzalloc(sizeof(*grp_src), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!grp_src))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	mp-&gt;br = br;</div><div class='del'>-	mp-&gt;addr = *group;</div><div class='del'>-	timer_setup(&amp;mp-&gt;timer, br_multicast_group_expired, 0);</div><div class='add'>+	grp_src-&gt;pg = pg;</div><div class='add'>+	grp_src-&gt;br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	grp_src-&gt;addr = *src_ip;</div><div class='add'>+	grp_src-&gt;mcast_gc.destroy = br_multicast_destroy_group_src;</div><div class='add'>+	timer_setup(&amp;grp_src-&gt;timer, br_multicast_group_src_expired, 0);</div><div class='ctx'> </div><div class='del'>-	hlist_add_head_rcu(&amp;mp-&gt;hlist[mdb-&gt;ver], &amp;mdb-&gt;mhash[hash]);</div><div class='del'>-	mdb-&gt;size++;</div><div class='add'>+	hlist_add_head_rcu(&amp;grp_src-&gt;node, &amp;pg-&gt;src_list);</div><div class='add'>+	pg-&gt;src_ents++;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return mp;</div><div class='add'>+	return grp_src;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct net_bridge_port_group *br_multicast_new_port_group(</div><div class='ctx'> 			struct net_bridge_port *port,</div><div class='del'>-			struct br_ip *group,</div><div class='add'>+			const struct br_ip *group,</div><div class='ctx'> 			struct net_bridge_port_group __rcu *next,</div><div class='ctx'> 			unsigned char flags,</div><div class='del'>-			const unsigned char *src)</div><div class='add'>+			const unsigned char *src,</div><div class='add'>+			u8 filter_mode,</div><div class='add'>+			u8 rt_protocol,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	p = kzalloc(sizeof(*p), GFP_ATOMIC);</div><div class='del'>-	if (unlikely(!p))</div><div class='add'>+	err = br_multicast_port_ngroups_inc(port, group, extack);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	p-&gt;addr = *group;</div><div class='del'>-	p-&gt;port = port;</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!p)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Couldn't allocate new port group");</div><div class='add'>+		goto dec_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;key.addr = *group;</div><div class='add'>+	p-&gt;key.port = port;</div><div class='ctx'> 	p-&gt;flags = flags;</div><div class='add'>+	p-&gt;filter_mode = filter_mode;</div><div class='add'>+	p-&gt;rt_protocol = rt_protocol;</div><div class='add'>+	p-&gt;eht_host_tree = RB_ROOT;</div><div class='add'>+	p-&gt;eht_set_tree = RB_ROOT;</div><div class='add'>+	p-&gt;mcast_gc.destroy = br_multicast_destroy_port_group;</div><div class='add'>+	INIT_HLIST_HEAD(&amp;p-&gt;src_list);</div><div class='add'>+</div><div class='add'>+	if (!br_multicast_is_star_g(group) &amp;&amp;</div><div class='add'>+	    rhashtable_lookup_insert_fast(&amp;port-&gt;br-&gt;sg_port_tbl, &amp;p-&gt;rhnode,</div><div class='add'>+					  br_sg_port_rht_params)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Couldn't insert new port group");</div><div class='add'>+		goto free_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rcu_assign_pointer(p-&gt;next, next);</div><div class='del'>-	hlist_add_head(&amp;p-&gt;mglist, &amp;port-&gt;mglist);</div><div class='ctx'> 	timer_setup(&amp;p-&gt;timer, br_multicast_port_group_expired, 0);</div><div class='add'>+	timer_setup(&amp;p-&gt;rexmit_timer, br_multicast_port_group_rexmit, 0);</div><div class='add'>+	hlist_add_head(&amp;p-&gt;mglist, &amp;port-&gt;mglist);</div><div class='ctx'> </div><div class='ctx'> 	if (src)</div><div class='ctx'> 		memcpy(p-&gt;eth_addr, src, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='del'>-		memset(p-&gt;eth_addr, 0xff, ETH_ALEN);</div><div class='add'>+		eth_broadcast_addr(p-&gt;eth_addr);</div><div class='ctx'> </div><div class='ctx'> 	return p;</div><div class='add'>+</div><div class='add'>+free_out:</div><div class='add'>+	kfree(p);</div><div class='add'>+dec_out:</div><div class='add'>+	br_multicast_port_ngroups_dec(port, group-&gt;vid);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool br_port_group_equal(struct net_bridge_port_group *p,</div><div class='del'>-				struct net_bridge_port *port,</div><div class='del'>-				const unsigned char *src)</div><div class='add'>+void br_multicast_del_port_group(struct net_bridge_port_group *p)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;port != port)</div><div class='del'>-		return false;</div><div class='add'>+	struct net_bridge_port *port = p-&gt;key.port;</div><div class='add'>+	__u16 vid = p-&gt;key.addr.vid;</div><div class='ctx'> </div><div class='del'>-	if (!(port-&gt;flags &amp; BR_MULTICAST_TO_UNICAST))</div><div class='del'>-		return true;</div><div class='add'>+	hlist_del_init(&amp;p-&gt;mglist);</div><div class='add'>+	if (!br_multicast_is_star_g(&amp;p-&gt;key.addr))</div><div class='add'>+		rhashtable_remove_fast(&amp;port-&gt;br-&gt;sg_port_tbl, &amp;p-&gt;rhnode,</div><div class='add'>+				       br_sg_port_rht_params);</div><div class='add'>+	kfree(p);</div><div class='add'>+	br_multicast_port_ngroups_dec(port, vid);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ether_addr_equal(src, p-&gt;eth_addr);</div><div class='add'>+void br_multicast_host_join(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			    struct net_bridge_mdb_entry *mp, bool notify)</div><div class='add'>+{</div><div class='add'>+	if (!mp-&gt;host_joined) {</div><div class='add'>+		mp-&gt;host_joined = true;</div><div class='add'>+		if (br_multicast_is_star_g(&amp;mp-&gt;addr))</div><div class='add'>+			br_multicast_star_g_host_state(mp);</div><div class='add'>+		if (notify)</div><div class='add'>+			br_mdb_notify(mp-&gt;br-&gt;dev, mp, NULL, RTM_NEWMDB);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_group_is_l2(&amp;mp-&gt;addr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;mp-&gt;timer, jiffies + brmctx-&gt;multicast_membership_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_multicast_add_group(struct net_bridge *br,</div><div class='del'>-				  struct net_bridge_port *port,</div><div class='del'>-				  struct br_ip *group,</div><div class='del'>-				  const unsigned char *src)</div><div class='add'>+void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify)</div><div class='add'>+{</div><div class='add'>+	if (!mp-&gt;host_joined)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mp-&gt;host_joined = false;</div><div class='add'>+	if (br_multicast_is_star_g(&amp;mp-&gt;addr))</div><div class='add'>+		br_multicast_star_g_host_state(mp);</div><div class='add'>+	if (notify)</div><div class='add'>+		br_mdb_notify(mp-&gt;br-&gt;dev, mp, NULL, RTM_DELMDB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_port_group *</div><div class='add'>+__br_multicast_add_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+			 struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			 struct br_ip *group,</div><div class='add'>+			 const unsigned char *src,</div><div class='add'>+			 u8 filter_mode,</div><div class='add'>+			 bool igmpv2_mldv1,</div><div class='add'>+			 bool blocked)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct net_bridge_port_group *p;</div><div class='add'>+	struct net_bridge_port_group *p = NULL;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) ||</div><div class='del'>-	    (port &amp;&amp; port-&gt;state == BR_STATE_DISABLED))</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mp = br_multicast_new_group(br, port, group);</div><div class='del'>-	err = PTR_ERR(mp);</div><div class='add'>+	mp = br_multicast_new_group(brmctx-&gt;br, group);</div><div class='ctx'> 	if (IS_ERR(mp))</div><div class='del'>-		goto err;</div><div class='add'>+		return ERR_CAST(mp);</div><div class='ctx'> </div><div class='del'>-	if (!port) {</div><div class='del'>-		if (!mp-&gt;host_joined) {</div><div class='del'>-			mp-&gt;host_joined = true;</div><div class='del'>-			br_mdb_notify(br-&gt;dev, NULL, &amp;mp-&gt;addr, RTM_NEWMDB, 0);</div><div class='del'>-		}</div><div class='del'>-		mod_timer(&amp;mp-&gt;timer, now + br-&gt;multicast_membership_interval);</div><div class='add'>+	if (!pmctx) {</div><div class='add'>+		br_multicast_host_join(brmctx, mp, true);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (pp = &amp;mp-&gt;ports;</div><div class='del'>-	     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+	     (p = mlock_dereference(*pp, brmctx-&gt;br)) != NULL;</div><div class='ctx'> 	     pp = &amp;p-&gt;next) {</div><div class='del'>-		if (br_port_group_equal(p, port, src))</div><div class='add'>+		if (br_port_group_equal(p, pmctx-&gt;port, src))</div><div class='ctx'> 			goto found;</div><div class='del'>-		if ((unsigned long)p-&gt;port &lt; (unsigned long)port)</div><div class='add'>+		if ((unsigned long)p-&gt;key.port &lt; (unsigned long)pmctx-&gt;port)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = br_multicast_new_port_group(port, group, *pp, 0, src);</div><div class='del'>-	if (unlikely(!p))</div><div class='del'>-		goto err;</div><div class='add'>+	p = br_multicast_new_port_group(pmctx-&gt;port, group, *pp, 0, src,</div><div class='add'>+					filter_mode, RTPROT_KERNEL, NULL);</div><div class='add'>+	if (unlikely(!p)) {</div><div class='add'>+		p = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_assign_pointer(*pp, p);</div><div class='del'>-	br_mdb_notify(br-&gt;dev, port, group, RTM_NEWMDB, 0);</div><div class='add'>+	if (blocked)</div><div class='add'>+		p-&gt;flags |= MDB_PG_FLAGS_BLOCKED;</div><div class='add'>+	br_mdb_notify(brmctx-&gt;br-&gt;dev, mp, p, RTM_NEWMDB);</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='del'>-	mod_timer(&amp;p-&gt;timer, now + br-&gt;multicast_membership_interval);</div><div class='add'>+	if (igmpv2_mldv1)</div><div class='add'>+		mod_timer(&amp;p-&gt;timer,</div><div class='add'>+			  now + brmctx-&gt;multicast_membership_interval);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='del'>-	err = 0;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_multicast_add_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				  struct br_ip *group,</div><div class='add'>+				  const unsigned char *src,</div><div class='add'>+				  u8 filter_mode,</div><div class='add'>+				  bool igmpv2_mldv1)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	pg = __br_multicast_add_group(brmctx, pmctx, group, src, filter_mode,</div><div class='add'>+				      igmpv2_mldv1, false);</div><div class='add'>+	/* NULL is considered valid for host joined groups */</div><div class='add'>+	err = PTR_ERR_OR_ZERO(pg);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='del'>-err:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_ip4_multicast_add_group(struct net_bridge *br,</div><div class='del'>-				      struct net_bridge_port *port,</div><div class='add'>+static int br_ip4_multicast_add_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+				      struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				      __be32 group,</div><div class='ctx'> 				      __u16 vid,</div><div class='del'>-				      const unsigned char *src)</div><div class='add'>+				      const unsigned char *src,</div><div class='add'>+				      bool igmpv2)</div><div class='ctx'> {</div><div class='ctx'> 	struct br_ip br_group;</div><div class='add'>+	u8 filter_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv4_is_local_multicast(group))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	br_group.u.ip4 = group;</div><div class='add'>+	memset(&amp;br_group, 0, sizeof(br_group));</div><div class='add'>+	br_group.dst.ip4 = group;</div><div class='ctx'> 	br_group.proto = htons(ETH_P_IP);</div><div class='ctx'> 	br_group.vid = vid;</div><div class='add'>+	filter_mode = igmpv2 ? MCAST_EXCLUDE : MCAST_INCLUDE;</div><div class='ctx'> </div><div class='del'>-	return br_multicast_add_group(br, port, &amp;br_group, src);</div><div class='add'>+	return br_multicast_add_group(brmctx, pmctx, &amp;br_group, src,</div><div class='add'>+				      filter_mode, igmpv2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static int br_ip6_multicast_add_group(struct net_bridge *br,</div><div class='del'>-				      struct net_bridge_port *port,</div><div class='add'>+static int br_ip6_multicast_add_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+				      struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				      const struct in6_addr *group,</div><div class='ctx'> 				      __u16 vid,</div><div class='del'>-				      const unsigned char *src)</div><div class='add'>+				      const unsigned char *src,</div><div class='add'>+				      bool mldv1)</div><div class='ctx'> {</div><div class='ctx'> 	struct br_ip br_group;</div><div class='add'>+	u8 filter_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_is_ll_all_nodes(group))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	br_group.u.ip6 = *group;</div><div class='add'>+	memset(&amp;br_group, 0, sizeof(br_group));</div><div class='add'>+	br_group.dst.ip6 = *group;</div><div class='ctx'> 	br_group.proto = htons(ETH_P_IPV6);</div><div class='ctx'> 	br_group.vid = vid;</div><div class='add'>+	filter_mode = mldv1 ? MCAST_EXCLUDE : MCAST_INCLUDE;</div><div class='ctx'> </div><div class='del'>-	return br_multicast_add_group(br, port, &amp;br_group, src);</div><div class='add'>+	return br_multicast_add_group(brmctx, pmctx, &amp;br_group, src,</div><div class='add'>+				      filter_mode, mldv1);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void br_multicast_router_expired(struct timer_list *t)</div><div class='add'>+static bool br_multicast_rport_del(struct hlist_node *rlist)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *port =</div><div class='del'>-			from_timer(port, t, multicast_router_timer);</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	if (hlist_unhashed(rlist))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	hlist_del_init_rcu(rlist);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_ip4_multicast_rport_del(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_rport_del(&amp;pmctx-&gt;ip4_rlist);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_ip6_multicast_rport_del(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	return br_multicast_rport_del(&amp;pmctx-&gt;ip6_rlist);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_router_expired(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					struct timer_list *t,</div><div class='add'>+					struct hlist_node *rlist)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='add'>+	bool del;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (port-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='del'>-	    port-&gt;multicast_router == MDB_RTR_TYPE_PERM ||</div><div class='del'>-	    timer_pending(&amp;port-&gt;multicast_router_timer))</div><div class='add'>+	if (pmctx-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='add'>+	    pmctx-&gt;multicast_router == MDB_RTR_TYPE_PERM ||</div><div class='add'>+	    timer_pending(t))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	__del_port_router(port);</div><div class='add'>+	del = br_multicast_rport_del(rlist);</div><div class='add'>+	br_multicast_rport_del_notify(pmctx, del);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void br_ip4_multicast_router_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = timer_container_of(pmctx, t,</div><div class='add'>+								 ip4_mc_router_timer);</div><div class='add'>+</div><div class='add'>+	br_multicast_router_expired(pmctx, t, &amp;pmctx-&gt;ip4_rlist);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void br_ip6_multicast_router_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = timer_container_of(pmctx, t,</div><div class='add'>+								 ip6_mc_router_timer);</div><div class='add'>+</div><div class='add'>+	br_multicast_router_expired(pmctx, t, &amp;pmctx-&gt;ip6_rlist);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void br_mc_router_state_change(struct net_bridge *p,</div><div class='ctx'> 				      bool is_mc_router)</div><div class='ctx'> {</div><div class='hunk'>@@ -872,112 +1693,184 @@ static void br_mc_router_state_change(struct net_bridge *p,</div><div class='ctx'> 		.u.mrouter = is_mc_router,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switchdev_port_attr_set(p-&gt;dev, &amp;attr);</div><div class='add'>+	switchdev_port_attr_set(p-&gt;dev, &amp;attr, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_local_router_expired(struct timer_list *t)</div><div class='add'>+static void br_multicast_local_router_expired(struct net_bridge_mcast *brmctx,</div><div class='add'>+					      struct timer_list *timer)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, multicast_router_timer);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (br-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='del'>-	    br-&gt;multicast_router == MDB_RTR_TYPE_PERM ||</div><div class='del'>-	    timer_pending(&amp;br-&gt;multicast_router_timer))</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (brmctx-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='add'>+	    brmctx-&gt;multicast_router == MDB_RTR_TYPE_PERM ||</div><div class='add'>+	    br_ip4_multicast_is_router(brmctx) ||</div><div class='add'>+	    br_ip6_multicast_is_router(brmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	br_mc_router_state_change(br, false);</div><div class='add'>+	br_mc_router_state_change(brmctx-&gt;br, false);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_querier_expired(struct net_bridge *br,</div><div class='add'>+static void br_ip4_multicast_local_router_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip4_mc_router_timer);</div><div class='add'>+</div><div class='add'>+	br_multicast_local_router_expired(brmctx, t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void br_ip6_multicast_local_router_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip6_mc_router_timer);</div><div class='add'>+</div><div class='add'>+	br_multicast_local_router_expired(brmctx, t);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void br_multicast_querier_expired(struct net_bridge_mcast *brmctx,</div><div class='ctx'> 					 struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) || br-&gt;multicast_disabled)</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (!netif_running(brmctx-&gt;br-&gt;dev) ||</div><div class='add'>+	    br_multicast_ctx_vlan_global_disabled(brmctx) ||</div><div class='add'>+	    !br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_ENABLED))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	br_multicast_start_querier(br, query);</div><div class='add'>+	br_multicast_start_querier(brmctx, query);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void br_ip4_multicast_querier_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, ip4_other_query.timer);</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip4_other_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_querier_expired(br, &amp;br-&gt;ip4_own_query);</div><div class='add'>+	br_multicast_querier_expired(brmctx, &amp;brmctx-&gt;ip4_own_query);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static void br_ip6_multicast_querier_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, ip6_other_query.timer);</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip6_other_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_querier_expired(br, &amp;br-&gt;ip6_own_query);</div><div class='add'>+	br_multicast_querier_expired(brmctx, &amp;brmctx-&gt;ip6_own_query);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void br_multicast_select_own_querier(struct net_bridge *br,</div><div class='add'>+static void br_multicast_query_delay_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,</div><div class='ctx'> 					    struct br_ip *ip,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (ip-&gt;proto == htons(ETH_P_IP))</div><div class='del'>-		br-&gt;ip4_querier.addr.u.ip4 = ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		brmctx-&gt;ip4_querier.addr.src.ip4 = ip_hdr(skb)-&gt;saddr;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	else</div><div class='del'>-		br-&gt;ip6_querier.addr.u.ip6 = ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+		brmctx-&gt;ip6_querier.addr.src.ip6 = ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __br_multicast_send_query(struct net_bridge *br,</div><div class='del'>-				      struct net_bridge_port *port,</div><div class='del'>-				      struct br_ip *ip)</div><div class='add'>+static void __br_multicast_send_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+				      struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				      struct net_bridge_port_group *pg,</div><div class='add'>+				      struct br_ip *ip_dst,</div><div class='add'>+				      struct br_ip *group,</div><div class='add'>+				      bool with_srcs,</div><div class='add'>+				      u8 sflag,</div><div class='add'>+				      bool *need_rexmit)</div><div class='ctx'> {</div><div class='add'>+	bool over_lmqt = !!sflag;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 igmp_type;</div><div class='ctx'> </div><div class='del'>-	skb = br_multicast_alloc_query(br, ip, &amp;igmp_type);</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx) ||</div><div class='add'>+	    !br_multicast_ctx_matches_vlan_snooping(brmctx))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+again_under_lmqt:</div><div class='add'>+	skb = br_multicast_alloc_query(brmctx, pmctx, pg, ip_dst, group,</div><div class='add'>+				       with_srcs, over_lmqt, sflag, &amp;igmp_type,</div><div class='add'>+				       need_rexmit);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (port) {</div><div class='del'>-		skb-&gt;dev = port-&gt;dev;</div><div class='del'>-		br_multicast_count(br, port, skb, igmp_type,</div><div class='add'>+	if (pmctx) {</div><div class='add'>+		skb-&gt;dev = pmctx-&gt;port-&gt;dev;</div><div class='add'>+		br_multicast_count(brmctx-&gt;br, pmctx-&gt;port, skb, igmp_type,</div><div class='ctx'> 				   BR_MCAST_DIR_TX);</div><div class='ctx'> 		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT,</div><div class='del'>-			dev_net(port-&gt;dev), NULL, skb, NULL, skb-&gt;dev,</div><div class='add'>+			dev_net(pmctx-&gt;port-&gt;dev), NULL, skb, NULL, skb-&gt;dev,</div><div class='ctx'> 			br_dev_queue_push_xmit);</div><div class='add'>+</div><div class='add'>+		if (over_lmqt &amp;&amp; with_srcs &amp;&amp; sflag) {</div><div class='add'>+			over_lmqt = false;</div><div class='add'>+			goto again_under_lmqt;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		br_multicast_select_own_querier(br, ip, skb);</div><div class='del'>-		br_multicast_count(br, port, skb, igmp_type,</div><div class='add'>+		br_multicast_select_own_querier(brmctx, group, skb);</div><div class='add'>+		br_multicast_count(brmctx-&gt;br, NULL, skb, igmp_type,</div><div class='ctx'> 				   BR_MCAST_DIR_RX);</div><div class='ctx'> 		netif_rx(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_send_query(struct net_bridge *br,</div><div class='del'>-				    struct net_bridge_port *port,</div><div class='add'>+static void br_multicast_read_querier(const struct bridge_mcast_querier *querier,</div><div class='add'>+				      struct bridge_mcast_querier *dest)</div><div class='add'>+{</div><div class='add'>+	unsigned int seq;</div><div class='add'>+</div><div class='add'>+	memset(dest, 0, sizeof(*dest));</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqcount_begin(&amp;querier-&gt;seq);</div><div class='add'>+		dest-&gt;port_ifidx = querier-&gt;port_ifidx;</div><div class='add'>+		memcpy(&amp;dest-&gt;addr, &amp;querier-&gt;addr, sizeof(struct br_ip));</div><div class='add'>+	} while (read_seqcount_retry(&amp;querier-&gt;seq, seq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_update_querier(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct bridge_mcast_querier *querier,</div><div class='add'>+					int ifindex,</div><div class='add'>+					struct br_ip *saddr)</div><div class='add'>+{</div><div class='add'>+	write_seqcount_begin(&amp;querier-&gt;seq);</div><div class='add'>+	querier-&gt;port_ifidx = ifindex;</div><div class='add'>+	memcpy(&amp;querier-&gt;addr, saddr, sizeof(*saddr));</div><div class='add'>+	write_seqcount_end(&amp;querier-&gt;seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_send_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+				    struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				    struct bridge_mcast_own_query *own_query)</div><div class='ctx'> {</div><div class='ctx'> 	struct bridge_mcast_other_query *other_query = NULL;</div><div class='add'>+	struct bridge_mcast_querier *querier;</div><div class='ctx'> 	struct br_ip br_group;</div><div class='ctx'> 	unsigned long time;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(br-&gt;dev) || br-&gt;multicast_disabled ||</div><div class='del'>-	    !br-&gt;multicast_querier)</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx) ||</div><div class='add'>+	    !br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_ENABLED) ||</div><div class='add'>+	    !brmctx-&gt;multicast_querier)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;br_group.u, 0, sizeof(br_group.u));</div><div class='add'>+	memset(&amp;br_group.dst, 0, sizeof(br_group.dst));</div><div class='ctx'> </div><div class='del'>-	if (port ? (own_query == &amp;port-&gt;ip4_own_query) :</div><div class='del'>-		   (own_query == &amp;br-&gt;ip4_own_query)) {</div><div class='del'>-		other_query = &amp;br-&gt;ip4_other_query;</div><div class='add'>+	if (pmctx ? (own_query == &amp;pmctx-&gt;ip4_own_query) :</div><div class='add'>+		    (own_query == &amp;brmctx-&gt;ip4_own_query)) {</div><div class='add'>+		querier = &amp;brmctx-&gt;ip4_querier;</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip4_other_query;</div><div class='ctx'> 		br_group.proto = htons(ETH_P_IP);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	} else {</div><div class='del'>-		other_query = &amp;br-&gt;ip6_other_query;</div><div class='add'>+		querier = &amp;brmctx-&gt;ip6_querier;</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip6_other_query;</div><div class='ctx'> 		br_group.proto = htons(ETH_P_IPV6);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -985,30 +1878,39 @@ static void br_multicast_send_query(struct net_bridge *br,</div><div class='ctx'> 	if (!other_query || timer_pending(&amp;other_query-&gt;timer))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	__br_multicast_send_query(br, port, &amp;br_group);</div><div class='add'>+	/* we're about to select ourselves as querier */</div><div class='add'>+	if (!pmctx &amp;&amp; querier-&gt;port_ifidx) {</div><div class='add'>+		struct br_ip zeroip = {};</div><div class='add'>+</div><div class='add'>+		br_multicast_update_querier(brmctx, querier, 0, &amp;zeroip);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__br_multicast_send_query(brmctx, pmctx, NULL, NULL, &amp;br_group, false,</div><div class='add'>+				  0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	time = jiffies;</div><div class='del'>-	time += own_query-&gt;startup_sent &lt; br-&gt;multicast_startup_query_count ?</div><div class='del'>-		br-&gt;multicast_startup_query_interval :</div><div class='del'>-		br-&gt;multicast_query_interval;</div><div class='add'>+	time += own_query-&gt;startup_sent &lt; brmctx-&gt;multicast_startup_query_count ?</div><div class='add'>+		brmctx-&gt;multicast_startup_query_interval :</div><div class='add'>+		brmctx-&gt;multicast_query_interval;</div><div class='ctx'> 	mod_timer(&amp;own_query-&gt;timer, time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-br_multicast_port_query_expired(struct net_bridge_port *port,</div><div class='add'>+br_multicast_port_query_expired(struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (port-&gt;state == BR_STATE_DISABLED ||</div><div class='del'>-	    port-&gt;state == BR_STATE_BLOCKING)</div><div class='add'>+	if (br_multicast_port_ctx_state_stopped(pmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (query-&gt;startup_sent &lt; br-&gt;multicast_startup_query_count)</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	if (query-&gt;startup_sent &lt; brmctx-&gt;multicast_startup_query_count)</div><div class='ctx'> 		query-&gt;startup_sent++;</div><div class='ctx'> </div><div class='del'>-	br_multicast_send_query(port-&gt;br, port, query);</div><div class='add'>+	br_multicast_send_query(brmctx, pmctx, query);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='hunk'>@@ -1016,45 +1918,131 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void br_ip4_multicast_port_query_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *port = from_timer(port, t, ip4_own_query.timer);</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = timer_container_of(pmctx, t,</div><div class='add'>+								 ip4_own_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_port_query_expired(port, &amp;port-&gt;ip4_own_query);</div><div class='add'>+	br_multicast_port_query_expired(pmctx, &amp;pmctx-&gt;ip4_own_query);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static void br_ip6_multicast_port_query_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *port = from_timer(port, t, ip6_own_query.timer);</div><div class='add'>+	struct net_bridge_mcast_port *pmctx = timer_container_of(pmctx, t,</div><div class='add'>+								 ip6_own_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_port_query_expired(port, &amp;port-&gt;ip6_own_query);</div><div class='add'>+	br_multicast_port_query_expired(pmctx, &amp;pmctx-&gt;ip6_own_query);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void br_mc_disabled_update(struct net_device *dev, bool value)</div><div class='add'>+static void br_multicast_port_group_rexmit(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port_group *pg = timer_container_of(pg, t,</div><div class='add'>+							      rexmit_timer);</div><div class='add'>+	struct bridge_mcast_other_query *other_query = NULL;</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+	bool need_rexmit = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (!netif_running(br-&gt;dev) || hlist_unhashed(&amp;pg-&gt;mglist) ||</div><div class='add'>+	    !br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pmctx = br_multicast_pg_to_port_ctx(pg);</div><div class='add'>+	if (!pmctx)</div><div class='add'>+		goto out;</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	if (!brmctx-&gt;multicast_querier)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;key.addr.proto == htons(ETH_P_IP))</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip4_other_query;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip6_other_query;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!other_query || timer_pending(&amp;other_query-&gt;timer))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;grp_query_rexmit_cnt) {</div><div class='add'>+		pg-&gt;grp_query_rexmit_cnt--;</div><div class='add'>+		__br_multicast_send_query(brmctx, pmctx, pg, &amp;pg-&gt;key.addr,</div><div class='add'>+					  &amp;pg-&gt;key.addr, false, 1, NULL);</div><div class='add'>+	}</div><div class='add'>+	__br_multicast_send_query(brmctx, pmctx, pg, &amp;pg-&gt;key.addr,</div><div class='add'>+				  &amp;pg-&gt;key.addr, true, 0, &amp;need_rexmit);</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;grp_query_rexmit_cnt || need_rexmit)</div><div class='add'>+		mod_timer(&amp;pg-&gt;rexmit_timer, jiffies +</div><div class='add'>+					     brmctx-&gt;multicast_last_member_interval);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_mc_disabled_update(struct net_device *dev, bool value,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct switchdev_attr attr = {</div><div class='ctx'> 		.orig_dev = dev,</div><div class='ctx'> 		.id = SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED,</div><div class='ctx'> 		.flags = SWITCHDEV_F_DEFER,</div><div class='del'>-		.u.mc_disabled = value,</div><div class='add'>+		.u.mc_disabled = !value,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switchdev_port_attr_set(dev, &amp;attr);</div><div class='add'>+	return switchdev_port_attr_set(dev, &amp;attr, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_multicast_add_port(struct net_bridge_port *port)</div><div class='add'>+void br_multicast_port_ctx_init(struct net_bridge_port *port,</div><div class='add'>+				struct net_bridge_vlan *vlan,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx)</div><div class='ctx'> {</div><div class='del'>-	port-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;port-&gt;multicast_router_timer,</div><div class='del'>-		    br_multicast_router_expired, 0);</div><div class='del'>-	timer_setup(&amp;port-&gt;ip4_own_query.timer,</div><div class='add'>+	pmctx-&gt;port = port;</div><div class='add'>+	pmctx-&gt;vlan = vlan;</div><div class='add'>+	pmctx-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='add'>+	timer_setup(&amp;pmctx-&gt;ip4_mc_router_timer,</div><div class='add'>+		    br_ip4_multicast_router_expired, 0);</div><div class='add'>+	timer_setup(&amp;pmctx-&gt;ip4_own_query.timer,</div><div class='ctx'> 		    br_ip4_multicast_port_query_expired, 0);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	timer_setup(&amp;port-&gt;ip6_own_query.timer,</div><div class='add'>+	timer_setup(&amp;pmctx-&gt;ip6_mc_router_timer,</div><div class='add'>+		    br_ip6_multicast_router_expired, 0);</div><div class='add'>+	timer_setup(&amp;pmctx-&gt;ip6_own_query.timer,</div><div class='ctx'> 		    br_ip6_multicast_port_query_expired, 0);</div><div class='ctx'> #endif</div><div class='del'>-	br_mc_disabled_update(port-&gt;dev, port-&gt;br-&gt;multicast_disabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='add'>+	bool del = false;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	timer_delete_sync(&amp;pmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+#endif</div><div class='add'>+	timer_delete_sync(&amp;pmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	del |= br_ip6_multicast_rport_del(pmctx);</div><div class='add'>+	del |= br_ip4_multicast_rport_del(pmctx);</div><div class='add'>+	br_multicast_rport_del_notify(pmctx, del);</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_multicast_add_port(struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port-&gt;multicast_eht_hosts_limit = BR_MCAST_DEFAULT_EHT_HOSTS_LIMIT;</div><div class='add'>+	br_multicast_port_ctx_init(port, NULL, &amp;port-&gt;multicast_ctx);</div><div class='add'>+</div><div class='add'>+	err = br_mc_disabled_update(port-&gt;dev,</div><div class='add'>+				    br_opt_get(port-&gt;br,</div><div class='add'>+					       BROPT_MULTICAST_ENABLED),</div><div class='add'>+				    NULL);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats);</div><div class='ctx'> 	if (!port-&gt;mcast_stats)</div><div class='hunk'>@@ -1072,9 +2060,10 @@ void br_multicast_del_port(struct net_bridge_port *port)</div><div class='ctx'> 	/* Take care of the remaining groups, only perm ones should be left */</div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='ctx'> 	hlist_for_each_entry_safe(pg, n, &amp;port-&gt;mglist, mglist)</div><div class='del'>-		br_multicast_del_pg(br, pg);</div><div class='add'>+		br_multicast_find_del_pg(br, pg);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	del_timer_sync(&amp;port-&gt;multicast_router_timer);</div><div class='add'>+	flush_work(&amp;br-&gt;mcast_gc_work);</div><div class='add'>+	br_multicast_port_ctx_deinit(&amp;port-&gt;multicast_ctx);</div><div class='ctx'> 	free_percpu(port-&gt;mcast_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1082,71 +2071,800 @@ static void br_multicast_enable(struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='ctx'> 	query-&gt;startup_sent = 0;</div><div class='ctx'> </div><div class='del'>-	if (try_to_del_timer_sync(&amp;query-&gt;timer) &gt;= 0 ||</div><div class='del'>-	    del_timer(&amp;query-&gt;timer))</div><div class='add'>+	if (timer_delete_sync_try(&amp;query-&gt;timer) &gt;= 0 ||</div><div class='add'>+	    timer_delete(&amp;query-&gt;timer))</div><div class='ctx'> 		mod_timer(&amp;query-&gt;timer, jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __br_multicast_enable_port(struct net_bridge_port *port)</div><div class='add'>+static void __br_multicast_enable_port_ctx(struct net_bridge_mcast_port *pmctx)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_disabled || !netif_running(br-&gt;dev))</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_ENABLED) ||</div><div class='add'>+	    !netif_running(br-&gt;dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	br_multicast_enable(&amp;port-&gt;ip4_own_query);</div><div class='add'>+	br_multicast_enable(&amp;pmctx-&gt;ip4_own_query);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	br_multicast_enable(&amp;port-&gt;ip6_own_query);</div><div class='add'>+	br_multicast_enable(&amp;pmctx-&gt;ip6_own_query);</div><div class='ctx'> #endif</div><div class='del'>-	if (port-&gt;multicast_router == MDB_RTR_TYPE_PERM &amp;&amp;</div><div class='del'>-	    hlist_unhashed(&amp;port-&gt;rlist))</div><div class='del'>-		br_multicast_add_router(br, port);</div><div class='add'>+	if (pmctx-&gt;multicast_router == MDB_RTR_TYPE_PERM) {</div><div class='add'>+		br_ip4_multicast_add_router(brmctx, pmctx);</div><div class='add'>+		br_ip6_multicast_add_router(brmctx, pmctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_port_ctx_is_vlan(pmctx)) {</div><div class='add'>+		struct net_bridge_port_group *pg;</div><div class='add'>+		u32 n = 0;</div><div class='add'>+</div><div class='add'>+		/* The mcast_n_groups counter might be wrong. First,</div><div class='add'>+		 * BR_VLFLAG_MCAST_ENABLED is toggled before temporary entries</div><div class='add'>+		 * are flushed, thus mcast_n_groups after the toggle does not</div><div class='add'>+		 * reflect the true values. And second, permanent entries added</div><div class='add'>+		 * while BR_VLFLAG_MCAST_ENABLED was disabled, are not reflected</div><div class='add'>+		 * either. Thus we have to refresh the counter.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry(pg, &amp;pmctx-&gt;port-&gt;mglist, mglist) {</div><div class='add'>+			if (pg-&gt;key.addr.vid == pmctx-&gt;vlan-&gt;vid)</div><div class='add'>+				n++;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(pmctx-&gt;mdb_n_entries, n);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_enable_port(struct net_bridge_port *port)</div><div class='add'>+static void br_multicast_enable_port_ctx(struct net_bridge_mcast_port *pmctx)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	__br_multicast_enable_port(port);</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (br_multicast_port_ctx_is_vlan(pmctx) &amp;&amp;</div><div class='add'>+	    !(pmctx-&gt;vlan-&gt;priv_flags &amp; BR_VLFLAG_MCAST_ENABLED)) {</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__br_multicast_enable_port_ctx(pmctx);</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_disable_port(struct net_bridge_port *port)</div><div class='add'>+static void __br_multicast_disable_port_ctx(struct net_bridge_mcast_port *pmctx)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = port-&gt;br;</div><div class='ctx'> 	struct net_bridge_port_group *pg;</div><div class='ctx'> 	struct hlist_node *n;</div><div class='add'>+	bool del = false;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(pg, n, &amp;pmctx-&gt;port-&gt;mglist, mglist)</div><div class='add'>+		if (!(pg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT) &amp;&amp;</div><div class='add'>+		    (!br_multicast_port_ctx_is_vlan(pmctx) ||</div><div class='add'>+		     pg-&gt;key.addr.vid == pmctx-&gt;vlan-&gt;vid))</div><div class='add'>+			br_multicast_find_del_pg(pmctx-&gt;port-&gt;br, pg);</div><div class='add'>+</div><div class='add'>+	del |= br_ip4_multicast_rport_del(pmctx);</div><div class='add'>+	timer_delete(&amp;pmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+	timer_delete(&amp;pmctx-&gt;ip4_own_query.timer);</div><div class='add'>+	del |= br_ip6_multicast_rport_del(pmctx);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	timer_delete(&amp;pmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+	timer_delete(&amp;pmctx-&gt;ip6_own_query.timer);</div><div class='add'>+#endif</div><div class='add'>+	br_multicast_rport_del_notify(pmctx, del);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	hlist_for_each_entry_safe(pg, n, &amp;port-&gt;mglist, mglist)</div><div class='del'>-		if (!(pg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='del'>-			br_multicast_del_pg(br, pg);</div><div class='add'>+static void br_multicast_disable_port_ctx(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = pmctx-&gt;port-&gt;br;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (br_multicast_port_ctx_is_vlan(pmctx) &amp;&amp;</div><div class='add'>+	    !(pmctx-&gt;vlan-&gt;priv_flags &amp; BR_VLFLAG_MCAST_ENABLED)) {</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__br_multicast_disable_port_ctx(pmctx);</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	__del_port_router(port);</div><div class='add'>+static void br_multicast_toggle_port(struct net_bridge_port *port, bool on)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_VLAN_FILTERING)</div><div class='add'>+	if (br_opt_get(port-&gt;br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {</div><div class='add'>+		struct net_bridge_vlan_group *vg;</div><div class='add'>+		struct net_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		vg = nbp_vlan_group_rcu(port);</div><div class='add'>+		if (!vg) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* iterate each vlan, toggle vlan multicast context */</div><div class='add'>+		list_for_each_entry_rcu(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+			struct net_bridge_mcast_port *pmctx =</div><div class='add'>+						&amp;vlan-&gt;port_mcast_ctx;</div><div class='add'>+			u8 state = br_vlan_get_state(vlan);</div><div class='add'>+			/* enable vlan multicast context when state is</div><div class='add'>+			 * LEARNING or FORWARDING</div><div class='add'>+			 */</div><div class='add'>+			if (on &amp;&amp; br_vlan_state_allowed(state, true))</div><div class='add'>+				br_multicast_enable_port_ctx(pmctx);</div><div class='add'>+			else</div><div class='add'>+				br_multicast_disable_port_ctx(pmctx);</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* toggle port multicast context when vlan snooping is disabled */</div><div class='add'>+	if (on)</div><div class='add'>+		br_multicast_enable_port_ctx(&amp;port-&gt;multicast_ctx);</div><div class='add'>+	else</div><div class='add'>+		br_multicast_disable_port_ctx(&amp;port-&gt;multicast_ctx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;port-&gt;multicast_router_timer);</div><div class='del'>-	del_timer(&amp;port-&gt;ip4_own_query.timer);</div><div class='add'>+void br_multicast_enable_port(struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	br_multicast_toggle_port(port, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_disable_port(struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	br_multicast_toggle_port(port, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __grp_src_delete_marked(struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	int deleted = 0;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(ent, tmp, &amp;pg-&gt;src_list, node)</div><div class='add'>+		if (ent-&gt;flags &amp; BR_SGRP_F_DELETE) {</div><div class='add'>+			br_multicast_del_group_src(ent, false);</div><div class='add'>+			deleted++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return deleted;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __grp_src_mod_timer(struct net_bridge_group_src *src,</div><div class='add'>+				unsigned long expires)</div><div class='add'>+{</div><div class='add'>+	mod_timer(&amp;src-&gt;timer, expires);</div><div class='add'>+	br_multicast_fwd_src_handle(src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __grp_src_query_marked_and_rexmit(struct net_bridge_mcast *brmctx,</div><div class='add'>+					      struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					      struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct bridge_mcast_other_query *other_query = NULL;</div><div class='add'>+	u32 lmqc = brmctx-&gt;multicast_last_member_count;</div><div class='add'>+	unsigned long lmqt, lmi, now = jiffies;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(brmctx-&gt;br-&gt;dev) ||</div><div class='add'>+	    !br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;key.addr.proto == htons(ETH_P_IP))</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip4_other_query;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	del_timer(&amp;port-&gt;ip6_own_query.timer);</div><div class='add'>+	else</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip6_other_query;</div><div class='ctx'> #endif</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	lmqt = now + br_multicast_lmqt(brmctx);</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node) {</div><div class='add'>+		if (ent-&gt;flags &amp; BR_SGRP_F_SEND) {</div><div class='add'>+			ent-&gt;flags &amp;= ~BR_SGRP_F_SEND;</div><div class='add'>+			if (ent-&gt;timer.expires &gt; lmqt) {</div><div class='add'>+				if (brmctx-&gt;multicast_querier &amp;&amp;</div><div class='add'>+				    other_query &amp;&amp;</div><div class='add'>+				    !timer_pending(&amp;other_query-&gt;timer))</div><div class='add'>+					ent-&gt;src_query_rexmit_cnt = lmqc;</div><div class='add'>+				__grp_src_mod_timer(ent, lmqt);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!brmctx-&gt;multicast_querier ||</div><div class='add'>+	    !other_query || timer_pending(&amp;other_query-&gt;timer))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__br_multicast_send_query(brmctx, pmctx, pg, &amp;pg-&gt;key.addr,</div><div class='add'>+				  &amp;pg-&gt;key.addr, true, 1, NULL);</div><div class='add'>+</div><div class='add'>+	lmi = now + brmctx-&gt;multicast_last_member_interval;</div><div class='add'>+	if (!timer_pending(&amp;pg-&gt;rexmit_timer) ||</div><div class='add'>+	    time_after(pg-&gt;rexmit_timer.expires, lmi))</div><div class='add'>+		mod_timer(&amp;pg-&gt;rexmit_timer, lmi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __grp_send_query_and_rexmit(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct bridge_mcast_other_query *other_query = NULL;</div><div class='add'>+	unsigned long now = jiffies, lmi;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(brmctx-&gt;br-&gt;dev) ||</div><div class='add'>+	    !br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;key.addr.proto == htons(ETH_P_IP))</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip4_other_query;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		other_query = &amp;brmctx-&gt;ip6_other_query;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (brmctx-&gt;multicast_querier &amp;&amp;</div><div class='add'>+	    other_query &amp;&amp; !timer_pending(&amp;other_query-&gt;timer)) {</div><div class='add'>+		lmi = now + brmctx-&gt;multicast_last_member_interval;</div><div class='add'>+		pg-&gt;grp_query_rexmit_cnt = brmctx-&gt;multicast_last_member_count - 1;</div><div class='add'>+		__br_multicast_send_query(brmctx, pmctx, pg, &amp;pg-&gt;key.addr,</div><div class='add'>+					  &amp;pg-&gt;key.addr, false, 0, NULL);</div><div class='add'>+		if (!timer_pending(&amp;pg-&gt;rexmit_timer) ||</div><div class='add'>+		    time_after(pg-&gt;rexmit_timer.expires, lmi))</div><div class='add'>+			mod_timer(&amp;pg-&gt;rexmit_timer, lmi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;filter_mode == MCAST_EXCLUDE &amp;&amp;</div><div class='add'>+	    (!timer_pending(&amp;pg-&gt;timer) ||</div><div class='add'>+	     time_after(pg-&gt;timer.expires, now + br_multicast_lmqt(brmctx))))</div><div class='add'>+		mod_timer(&amp;pg-&gt;timer, now + br_multicast_lmqt(brmctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * INCLUDE (A)    IS_IN (B)     INCLUDE (A+B)            (B)=GMI</div><div class='add'>+ * INCLUDE (A)    ALLOW (B)     INCLUDE (A+B)            (B)=GMI</div><div class='add'>+ * EXCLUDE (X,Y)  ALLOW (A)     EXCLUDE (X+A,Y-A)        (A)=GMI</div><div class='add'>+ */</div><div class='add'>+static bool br_multicast_isinc_allow(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				     struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				     void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				     int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+	u32 src_idx;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (!ent) {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent)</div><div class='add'>+				changed = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ent)</div><div class='add'>+			__grp_src_mod_timer(ent, now + br_multicast_gmi(brmctx));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * INCLUDE (A)    IS_EX (B)     EXCLUDE (A*B,B-A)        (B-A)=0</div><div class='add'>+ *                                                       Delete (A-B)</div><div class='add'>+ *                                                       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+static void __grp_src_isexc_incl(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				 void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				 int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+	u32 src_idx;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags |= BR_SGRP_F_DELETE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent)</div><div class='add'>+			ent-&gt;flags &amp;= ~BR_SGRP_F_DELETE;</div><div class='add'>+		else</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent)</div><div class='add'>+			br_multicast_fwd_src_handle(ent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				grec_type);</div><div class='add'>+</div><div class='add'>+	__grp_src_delete_marked(pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * EXCLUDE (X,Y)  IS_EX (A)     EXCLUDE (A-Y,Y*A)        (A-X-Y)=GMI</div><div class='add'>+ *                                                       Delete (X-A)</div><div class='add'>+ *                                                       Delete (Y-A)</div><div class='add'>+ *                                                       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_isexc_excl(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				 void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				 int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+	u32 src_idx;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags |= BR_SGRP_F_DELETE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			ent-&gt;flags &amp;= ~BR_SGRP_F_DELETE;</div><div class='add'>+		} else {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent) {</div><div class='add'>+				__grp_src_mod_timer(ent,</div><div class='add'>+						    now + br_multicast_gmi(brmctx));</div><div class='add'>+				changed = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (__grp_src_delete_marked(pg))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_isexc(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			       struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+			       void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+			       int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (pg-&gt;filter_mode) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		__grp_src_isexc_incl(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				     grec_type);</div><div class='add'>+		br_multicast_star_g_handle_mode(pg, MCAST_EXCLUDE);</div><div class='add'>+		changed = true;</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		changed = __grp_src_isexc_excl(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					       addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pg-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+	mod_timer(&amp;pg-&gt;timer, jiffies + br_multicast_gmi(brmctx));</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * INCLUDE (A)    TO_IN (B)     INCLUDE (A+B)            (B)=GMI</div><div class='add'>+ *                                                       Send Q(G,A-B)</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_toin_incl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				int grec_type)</div><div class='add'>+{</div><div class='add'>+	u32 src_idx, to_send = pg-&gt;src_ents;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags |= BR_SGRP_F_SEND;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			ent-&gt;flags &amp;= ~BR_SGRP_F_SEND;</div><div class='add'>+			to_send--;</div><div class='add'>+		} else {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent)</div><div class='add'>+				changed = true;</div><div class='add'>+		}</div><div class='add'>+		if (ent)</div><div class='add'>+			__grp_src_mod_timer(ent, now + br_multicast_gmi(brmctx));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * EXCLUDE (X,Y)  TO_IN (A)     EXCLUDE (X+A,Y-A)        (A)=GMI</div><div class='add'>+ *                                                       Send Q(G,X-A)</div><div class='add'>+ *                                                       Send Q(G)</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_toin_excl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				int grec_type)</div><div class='add'>+{</div><div class='add'>+	u32 src_idx, to_send = pg-&gt;src_ents;</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		if (timer_pending(&amp;ent-&gt;timer))</div><div class='add'>+			ent-&gt;flags |= BR_SGRP_F_SEND;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			if (timer_pending(&amp;ent-&gt;timer)) {</div><div class='add'>+				ent-&gt;flags &amp;= ~BR_SGRP_F_SEND;</div><div class='add'>+				to_send--;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent)</div><div class='add'>+				changed = true;</div><div class='add'>+		}</div><div class='add'>+		if (ent)</div><div class='add'>+			__grp_src_mod_timer(ent, now + br_multicast_gmi(brmctx));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	__grp_send_query_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_toin(struct net_bridge_mcast *brmctx,</div><div class='add'>+			      struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			      struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+			      void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+			      int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (pg-&gt;filter_mode) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		changed = __grp_src_toin_incl(brmctx, pmctx, pg, h_addr, srcs,</div><div class='add'>+					      nsrcs, addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		changed = __grp_src_toin_excl(brmctx, pmctx, pg, h_addr, srcs,</div><div class='add'>+					      nsrcs, addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_should_del_pg(pg)) {</div><div class='add'>+		pg-&gt;flags |= MDB_PG_FLAGS_FAST_LEAVE;</div><div class='add'>+		br_multicast_find_del_pg(pg-&gt;key.port-&gt;br, pg);</div><div class='add'>+		/* a notification has already been sent and we shouldn't</div><div class='add'>+		 * access pg after the delete so we have to return false</div><div class='add'>+		 */</div><div class='add'>+		changed = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * INCLUDE (A)    TO_EX (B)     EXCLUDE (A*B,B-A)        (B-A)=0</div><div class='add'>+ *                                                       Delete (A-B)</div><div class='add'>+ *                                                       Send Q(G,A*B)</div><div class='add'>+ *                                                       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+static void __grp_src_toex_incl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	u32 src_idx, to_send = 0;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags = (ent-&gt;flags &amp; ~BR_SGRP_F_SEND) | BR_SGRP_F_DELETE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			ent-&gt;flags = (ent-&gt;flags &amp; ~BR_SGRP_F_DELETE) |</div><div class='add'>+				     BR_SGRP_F_SEND;</div><div class='add'>+			to_send++;</div><div class='add'>+		} else {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+		}</div><div class='add'>+		if (ent)</div><div class='add'>+			br_multicast_fwd_src_handle(ent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				grec_type);</div><div class='add'>+</div><div class='add'>+	__grp_src_delete_marked(pg);</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * EXCLUDE (X,Y)  TO_EX (A)     EXCLUDE (A-Y,Y*A)        (A-X-Y)=Group Timer</div><div class='add'>+ *                                                       Delete (X-A)</div><div class='add'>+ *                                                       Delete (Y-A)</div><div class='add'>+ *                                                       Send Q(G,A-Y)</div><div class='add'>+ *                                                       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_toex_excl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+				int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	u32 src_idx, to_send = 0;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags = (ent-&gt;flags &amp; ~BR_SGRP_F_SEND) | BR_SGRP_F_DELETE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			ent-&gt;flags &amp;= ~BR_SGRP_F_DELETE;</div><div class='add'>+		} else {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent) {</div><div class='add'>+				__grp_src_mod_timer(ent, pg-&gt;timer.expires);</div><div class='add'>+				changed = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (ent &amp;&amp; timer_pending(&amp;ent-&gt;timer)) {</div><div class='add'>+			ent-&gt;flags |= BR_SGRP_F_SEND;</div><div class='add'>+			to_send++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (__grp_src_delete_marked(pg))</div><div class='add'>+		changed = true;</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_toex(struct net_bridge_mcast *brmctx,</div><div class='add'>+			      struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			      struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+			      void *srcs, u32 nsrcs, size_t addr_size,</div><div class='add'>+			      int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (pg-&gt;filter_mode) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		__grp_src_toex_incl(brmctx, pmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+				    addr_size, grec_type);</div><div class='add'>+		br_multicast_star_g_handle_mode(pg, MCAST_EXCLUDE);</div><div class='add'>+		changed = true;</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		changed = __grp_src_toex_excl(brmctx, pmctx, pg, h_addr, srcs,</div><div class='add'>+					      nsrcs, addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pg-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+	mod_timer(&amp;pg-&gt;timer, jiffies + br_multicast_gmi(brmctx));</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_ip4_multicast_igmp3_report(struct net_bridge *br,</div><div class='del'>-					 struct net_bridge_port *port,</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * INCLUDE (A)    BLOCK (B)     INCLUDE (A)              Send Q(G,A*B)</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_block_incl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				 void *srcs, u32 nsrcs, size_t addr_size, int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	u32 src_idx, to_send = 0;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags &amp;= ~BR_SGRP_F_SEND;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (ent) {</div><div class='add'>+			ent-&gt;flags |= BR_SGRP_F_SEND;</div><div class='add'>+			to_send++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* State          Msg type      New state                Actions</div><div class='add'>+ * EXCLUDE (X,Y)  BLOCK (A)     EXCLUDE (X+(A-Y),Y)      (A-X-Y)=Group Timer</div><div class='add'>+ *                                                       Send Q(G,A-Y)</div><div class='add'>+ */</div><div class='add'>+static bool __grp_src_block_excl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+				 void *srcs, u32 nsrcs, size_t addr_size, int grec_type)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_src *ent;</div><div class='add'>+	u32 src_idx, to_send = 0;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(ent, &amp;pg-&gt;src_list, node)</div><div class='add'>+		ent-&gt;flags &amp;= ~BR_SGRP_F_SEND;</div><div class='add'>+</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;src_ip.src, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (!ent) {</div><div class='add'>+			ent = br_multicast_new_group_src(pg, &amp;src_ip);</div><div class='add'>+			if (ent) {</div><div class='add'>+				__grp_src_mod_timer(ent, pg-&gt;timer.expires);</div><div class='add'>+				changed = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (ent &amp;&amp; timer_pending(&amp;ent-&gt;timer)) {</div><div class='add'>+			ent-&gt;flags |= BR_SGRP_F_SEND;</div><div class='add'>+			to_send++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_handle(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				    grec_type))</div><div class='add'>+		changed = true;</div><div class='add'>+</div><div class='add'>+	if (to_send)</div><div class='add'>+		__grp_src_query_marked_and_rexmit(brmctx, pmctx, pg);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_block(struct net_bridge_mcast *brmctx,</div><div class='add'>+			       struct net_bridge_mcast_port *pmctx,</div><div class='add'>+			       struct net_bridge_port_group *pg, void *h_addr,</div><div class='add'>+			       void *srcs, u32 nsrcs, size_t addr_size, int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (pg-&gt;filter_mode) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		changed = __grp_src_block_incl(brmctx, pmctx, pg, h_addr, srcs,</div><div class='add'>+					       nsrcs, addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		changed = __grp_src_block_excl(brmctx, pmctx, pg, h_addr, srcs,</div><div class='add'>+					       nsrcs, addr_size, grec_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((pg-&gt;filter_mode == MCAST_INCLUDE &amp;&amp; hlist_empty(&amp;pg-&gt;src_list)) ||</div><div class='add'>+	    br_multicast_eht_should_del_pg(pg)) {</div><div class='add'>+		if (br_multicast_eht_should_del_pg(pg))</div><div class='add'>+			pg-&gt;flags |= MDB_PG_FLAGS_FAST_LEAVE;</div><div class='add'>+		br_multicast_find_del_pg(pg-&gt;key.port-&gt;br, pg);</div><div class='add'>+		/* a notification has already been sent and we shouldn't</div><div class='add'>+		 * access pg after the delete so we have to return false</div><div class='add'>+		 */</div><div class='add'>+		changed = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_port_group *</div><div class='add'>+br_multicast_find_port(struct net_bridge_mdb_entry *mp,</div><div class='add'>+		       struct net_bridge_port *p,</div><div class='add'>+		       const unsigned char *src)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br __maybe_unused = mp-&gt;br;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+</div><div class='add'>+	for (pg = mlock_dereference(mp-&gt;ports, br);</div><div class='add'>+	     pg;</div><div class='add'>+	     pg = mlock_dereference(pg-&gt;next, br))</div><div class='add'>+		if (br_port_group_equal(pg, p, src))</div><div class='add'>+			return pg;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_ip4_multicast_igmp3_report(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					 struct sk_buff *skb,</div><div class='ctx'> 					 u16 vid)</div><div class='ctx'> {</div><div class='add'>+	bool igmpv2 = brmctx-&gt;multicast_igmp_version == 2;</div><div class='add'>+	struct net_bridge_mdb_entry *mdst;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='ctx'> 	const unsigned char *src;</div><div class='ctx'> 	struct igmpv3_report *ih;</div><div class='ctx'> 	struct igmpv3_grec *grec;</div><div class='del'>-	int i;</div><div class='del'>-	int len;</div><div class='del'>-	int num;</div><div class='del'>-	int type;</div><div class='add'>+	int i, len, num, type;</div><div class='add'>+	__be32 group, *h_addr;</div><div class='add'>+	bool changed = false;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	__be32 group;</div><div class='add'>+	u16 nsrcs;</div><div class='ctx'> </div><div class='ctx'> 	ih = igmpv3_report_hdr(skb);</div><div class='ctx'> 	num = ntohs(ih-&gt;ngrec);</div><div class='hunk'>@@ -1154,18 +2872,18 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		len += sizeof(*grec);</div><div class='del'>-		if (!pskb_may_pull(skb, len))</div><div class='add'>+		if (!ip_mc_may_pull(skb, len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		grec = (void *)(skb-&gt;data + len - sizeof(*grec));</div><div class='ctx'> 		group = grec-&gt;grec_mca;</div><div class='ctx'> 		type = grec-&gt;grec_type;</div><div class='add'>+		nsrcs = ntohs(grec-&gt;grec_nsrcs);</div><div class='ctx'> </div><div class='del'>-		len += ntohs(grec-&gt;grec_nsrcs) * 4;</div><div class='del'>-		if (!pskb_may_pull(skb, len))</div><div class='add'>+		len += nsrcs * 4;</div><div class='add'>+		if (!ip_mc_may_pull(skb, len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		/* We treat this as an IGMPv2 report for now. */</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case IGMPV3_MODE_IS_INCLUDE:</div><div class='ctx'> 		case IGMPV3_MODE_IS_EXCLUDE:</div><div class='hunk'>@@ -1180,62 +2898,128 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		src = eth_hdr(skb)-&gt;h_source;</div><div class='del'>-		if ((type == IGMPV3_CHANGE_TO_INCLUDE ||</div><div class='del'>-		     type == IGMPV3_MODE_IS_INCLUDE) &amp;&amp;</div><div class='del'>-		    ntohs(grec-&gt;grec_nsrcs) == 0) {</div><div class='del'>-			br_ip4_multicast_leave_group(br, port, group, vid, src);</div><div class='add'>+		if (nsrcs == 0 &amp;&amp;</div><div class='add'>+		    (type == IGMPV3_CHANGE_TO_INCLUDE ||</div><div class='add'>+		     type == IGMPV3_MODE_IS_INCLUDE)) {</div><div class='add'>+			if (!pmctx || igmpv2) {</div><div class='add'>+				br_ip4_multicast_leave_group(brmctx, pmctx,</div><div class='add'>+							     group, vid, src);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			err = br_ip4_multicast_add_group(br, port, group, vid,</div><div class='del'>-							 src);</div><div class='add'>+			err = br_ip4_multicast_add_group(brmctx, pmctx, group,</div><div class='add'>+							 vid, src, igmpv2);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!pmctx || igmpv2)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+		if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+</div><div class='add'>+		mdst = br_mdb_ip4_get(brmctx-&gt;br, group, vid);</div><div class='add'>+		if (!mdst)</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+		pg = br_multicast_find_port(mdst, pmctx-&gt;port, src);</div><div class='add'>+		if (!pg || (pg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+		/* reload grec and host addr */</div><div class='add'>+		grec = (void *)(skb-&gt;data + len - sizeof(*grec) - (nsrcs * 4));</div><div class='add'>+		h_addr = &amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		switch (type) {</div><div class='add'>+		case IGMPV3_ALLOW_NEW_SOURCES:</div><div class='add'>+			changed = br_multicast_isinc_allow(brmctx, pg, h_addr,</div><div class='add'>+							   grec-&gt;grec_src,</div><div class='add'>+							   nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_MODE_IS_INCLUDE:</div><div class='add'>+			changed = br_multicast_isinc_allow(brmctx, pg, h_addr,</div><div class='add'>+							   grec-&gt;grec_src,</div><div class='add'>+							   nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_MODE_IS_EXCLUDE:</div><div class='add'>+			changed = br_multicast_isexc(brmctx, pg, h_addr,</div><div class='add'>+						     grec-&gt;grec_src,</div><div class='add'>+						     nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_CHANGE_TO_INCLUDE:</div><div class='add'>+			changed = br_multicast_toin(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						    grec-&gt;grec_src,</div><div class='add'>+						    nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_CHANGE_TO_EXCLUDE:</div><div class='add'>+			changed = br_multicast_toex(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						    grec-&gt;grec_src,</div><div class='add'>+						    nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_BLOCK_OLD_SOURCES:</div><div class='add'>+			changed = br_multicast_block(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						     grec-&gt;grec_src,</div><div class='add'>+						     nsrcs, sizeof(__be32), type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (changed)</div><div class='add'>+			br_mdb_notify(brmctx-&gt;br-&gt;dev, mdst, pg, RTM_NEWMDB);</div><div class='add'>+unlock_continue:</div><div class='add'>+		spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static int br_ip6_multicast_mld2_report(struct net_bridge *br,</div><div class='del'>-					struct net_bridge_port *port,</div><div class='add'>+static int br_ip6_multicast_mld2_report(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					struct sk_buff *skb,</div><div class='ctx'> 					u16 vid)</div><div class='ctx'> {</div><div class='add'>+	bool mldv1 = brmctx-&gt;multicast_mld_version == 1;</div><div class='add'>+	struct net_bridge_mdb_entry *mdst;</div><div class='add'>+	struct net_bridge_port_group *pg;</div><div class='add'>+	unsigned int nsrcs_offset;</div><div class='add'>+	struct mld2_report *mld2r;</div><div class='ctx'> 	const unsigned char *src;</div><div class='del'>-	struct icmp6hdr *icmp6h;</div><div class='add'>+	struct in6_addr *h_addr;</div><div class='ctx'> 	struct mld2_grec *grec;</div><div class='del'>-	int i;</div><div class='del'>-	int len;</div><div class='del'>-	int num;</div><div class='add'>+	unsigned int grec_len;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	int i, len, num;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(*icmp6h)))</div><div class='add'>+	if (!ipv6_mc_may_pull(skb, sizeof(*mld2r)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	icmp6h = icmp6_hdr(skb);</div><div class='del'>-	num = ntohs(icmp6h-&gt;icmp6_dataun.un_data16[1]);</div><div class='del'>-	len = skb_transport_offset(skb) + sizeof(*icmp6h);</div><div class='add'>+	mld2r = (struct mld2_report *)icmp6_hdr(skb);</div><div class='add'>+	num = ntohs(mld2r-&gt;mld2r_ngrec);</div><div class='add'>+	len = skb_transport_offset(skb) + sizeof(*mld2r);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		__be16 *nsrcs, _nsrcs;</div><div class='add'>+		__be16 *_nsrcs, __nsrcs;</div><div class='add'>+		u16 nsrcs;</div><div class='add'>+</div><div class='add'>+		nsrcs_offset = len + offsetof(struct mld2_grec, grec_nsrcs);</div><div class='add'>+</div><div class='add'>+		if (skb_transport_offset(skb) + ipv6_transport_len(skb) &lt;</div><div class='add'>+		    nsrcs_offset + sizeof(__nsrcs))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		nsrcs = skb_header_pointer(skb,</div><div class='del'>-					   len + offsetof(struct mld2_grec,</div><div class='del'>-							  grec_nsrcs),</div><div class='del'>-					   sizeof(_nsrcs), &amp;_nsrcs);</div><div class='del'>-		if (!nsrcs)</div><div class='add'>+		_nsrcs = skb_header_pointer(skb, nsrcs_offset,</div><div class='add'>+					    sizeof(__nsrcs), &amp;__nsrcs);</div><div class='add'>+		if (!_nsrcs)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (!pskb_may_pull(skb,</div><div class='del'>-				   len + sizeof(*grec) +</div><div class='del'>-				   sizeof(struct in6_addr) * ntohs(*nsrcs)))</div><div class='add'>+		nsrcs = ntohs(*_nsrcs);</div><div class='add'>+		grec_len = struct_size(grec, grec_src, nsrcs);</div><div class='add'>+</div><div class='add'>+		if (!ipv6_mc_may_pull(skb, len + grec_len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		grec = (struct mld2_grec *)(skb-&gt;data + len);</div><div class='del'>-		len += sizeof(*grec) +</div><div class='del'>-		       sizeof(struct in6_addr) * ntohs(*nsrcs);</div><div class='add'>+		len += grec_len;</div><div class='ctx'> </div><div class='del'>-		/* We treat these as MLDv1 reports for now. */</div><div class='ctx'> 		switch (grec-&gt;grec_type) {</div><div class='ctx'> 		case MLD2_MODE_IS_INCLUDE:</div><div class='ctx'> 		case MLD2_MODE_IS_EXCLUDE:</div><div class='hunk'>@@ -1252,96 +3036,244 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,</div><div class='ctx'> 		src = eth_hdr(skb)-&gt;h_source;</div><div class='ctx'> 		if ((grec-&gt;grec_type == MLD2_CHANGE_TO_INCLUDE ||</div><div class='ctx'> 		     grec-&gt;grec_type == MLD2_MODE_IS_INCLUDE) &amp;&amp;</div><div class='del'>-		    ntohs(*nsrcs) == 0) {</div><div class='del'>-			br_ip6_multicast_leave_group(br, port, &amp;grec-&gt;grec_mca,</div><div class='del'>-						     vid, src);</div><div class='add'>+		    nsrcs == 0) {</div><div class='add'>+			if (!pmctx || mldv1) {</div><div class='add'>+				br_ip6_multicast_leave_group(brmctx, pmctx,</div><div class='add'>+							     &amp;grec-&gt;grec_mca,</div><div class='add'>+							     vid, src);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			err = br_ip6_multicast_add_group(br, port,</div><div class='add'>+			err = br_ip6_multicast_add_group(brmctx, pmctx,</div><div class='ctx'> 							 &amp;grec-&gt;grec_mca, vid,</div><div class='del'>-							 src);</div><div class='add'>+							 src, mldv1);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!pmctx || mldv1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+		if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+</div><div class='add'>+		mdst = br_mdb_ip6_get(brmctx-&gt;br, &amp;grec-&gt;grec_mca, vid);</div><div class='add'>+		if (!mdst)</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+		pg = br_multicast_find_port(mdst, pmctx-&gt;port, src);</div><div class='add'>+		if (!pg || (pg-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT))</div><div class='add'>+			goto unlock_continue;</div><div class='add'>+		h_addr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+		switch (grec-&gt;grec_type) {</div><div class='add'>+		case MLD2_ALLOW_NEW_SOURCES:</div><div class='add'>+			changed = br_multicast_isinc_allow(brmctx, pg, h_addr,</div><div class='add'>+							   grec-&gt;grec_src, nsrcs,</div><div class='add'>+							   sizeof(struct in6_addr),</div><div class='add'>+							   grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_MODE_IS_INCLUDE:</div><div class='add'>+			changed = br_multicast_isinc_allow(brmctx, pg, h_addr,</div><div class='add'>+							   grec-&gt;grec_src, nsrcs,</div><div class='add'>+							   sizeof(struct in6_addr),</div><div class='add'>+							   grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_MODE_IS_EXCLUDE:</div><div class='add'>+			changed = br_multicast_isexc(brmctx, pg, h_addr,</div><div class='add'>+						     grec-&gt;grec_src, nsrcs,</div><div class='add'>+						     sizeof(struct in6_addr),</div><div class='add'>+						     grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_CHANGE_TO_INCLUDE:</div><div class='add'>+			changed = br_multicast_toin(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						    grec-&gt;grec_src, nsrcs,</div><div class='add'>+						    sizeof(struct in6_addr),</div><div class='add'>+						    grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_CHANGE_TO_EXCLUDE:</div><div class='add'>+			changed = br_multicast_toex(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						    grec-&gt;grec_src, nsrcs,</div><div class='add'>+						    sizeof(struct in6_addr),</div><div class='add'>+						    grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_BLOCK_OLD_SOURCES:</div><div class='add'>+			changed = br_multicast_block(brmctx, pmctx, pg, h_addr,</div><div class='add'>+						     grec-&gt;grec_src, nsrcs,</div><div class='add'>+						     sizeof(struct in6_addr),</div><div class='add'>+						     grec-&gt;grec_type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (changed)</div><div class='add'>+			br_mdb_notify(brmctx-&gt;br-&gt;dev, mdst, pg, RTM_NEWMDB);</div><div class='add'>+unlock_continue:</div><div class='add'>+		spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool br_ip4_multicast_select_querier(struct net_bridge *br,</div><div class='del'>-					    struct net_bridge_port *port,</div><div class='del'>-					    __be32 saddr)</div><div class='add'>+static bool br_multicast_select_querier(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					struct br_ip *saddr)</div><div class='ctx'> {</div><div class='del'>-	if (!timer_pending(&amp;br-&gt;ip4_own_query.timer) &amp;&amp;</div><div class='del'>-	    !timer_pending(&amp;br-&gt;ip4_other_query.timer))</div><div class='del'>-		goto update;</div><div class='add'>+	int port_ifidx = pmctx ? pmctx-&gt;port-&gt;dev-&gt;ifindex : 0;</div><div class='add'>+	struct timer_list *own_timer, *other_timer;</div><div class='add'>+	struct bridge_mcast_querier *querier;</div><div class='ctx'> </div><div class='del'>-	if (!br-&gt;ip4_querier.addr.u.ip4)</div><div class='del'>-		goto update;</div><div class='add'>+	switch (saddr-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		querier = &amp;brmctx-&gt;ip4_querier;</div><div class='add'>+		own_timer = &amp;brmctx-&gt;ip4_own_query.timer;</div><div class='add'>+		other_timer = &amp;brmctx-&gt;ip4_other_query.timer;</div><div class='add'>+		if (!querier-&gt;addr.src.ip4 ||</div><div class='add'>+		    ntohl(saddr-&gt;src.ip4) &lt;= ntohl(querier-&gt;addr.src.ip4))</div><div class='add'>+			goto update;</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		querier = &amp;brmctx-&gt;ip6_querier;</div><div class='add'>+		own_timer = &amp;brmctx-&gt;ip6_own_query.timer;</div><div class='add'>+		other_timer = &amp;brmctx-&gt;ip6_other_query.timer;</div><div class='add'>+		if (ipv6_addr_cmp(&amp;saddr-&gt;src.ip6, &amp;querier-&gt;addr.src.ip6) &lt;= 0)</div><div class='add'>+			goto update;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ntohl(saddr) &lt;= ntohl(br-&gt;ip4_querier.addr.u.ip4))</div><div class='add'>+	if (!timer_pending(own_timer) &amp;&amp; !timer_pending(other_timer))</div><div class='ctx'> 		goto update;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> </div><div class='ctx'> update:</div><div class='del'>-	br-&gt;ip4_querier.addr.u.ip4 = saddr;</div><div class='del'>-</div><div class='del'>-	/* update protected by general multicast_lock by caller */</div><div class='del'>-	rcu_assign_pointer(br-&gt;ip4_querier.port, port);</div><div class='add'>+	br_multicast_update_querier(brmctx, querier, port_ifidx, saddr);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static bool br_ip6_multicast_select_querier(struct net_bridge *br,</div><div class='del'>-					    struct net_bridge_port *port,</div><div class='del'>-					    struct in6_addr *saddr)</div><div class='add'>+static struct net_bridge_port *</div><div class='add'>+__br_multicast_get_querier_port(struct net_bridge *br,</div><div class='add'>+				const struct bridge_mcast_querier *querier)</div><div class='ctx'> {</div><div class='del'>-	if (!timer_pending(&amp;br-&gt;ip6_own_query.timer) &amp;&amp;</div><div class='del'>-	    !timer_pending(&amp;br-&gt;ip6_other_query.timer))</div><div class='del'>-		goto update;</div><div class='del'>-</div><div class='del'>-	if (ipv6_addr_cmp(saddr, &amp;br-&gt;ip6_querier.addr.u.ip6) &lt;= 0)</div><div class='del'>-		goto update;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	int port_ifidx = READ_ONCE(querier-&gt;port_ifidx);</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-update:</div><div class='del'>-	br-&gt;ip6_querier.addr.u.ip6 = *saddr;</div><div class='add'>+	if (port_ifidx == 0)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* update protected by general multicast_lock by caller */</div><div class='del'>-	rcu_assign_pointer(br-&gt;ip6_querier.port, port);</div><div class='add'>+	dev = dev_get_by_index_rcu(dev_net(br-&gt;dev), port_ifidx);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	p = br_port_get_rtnl_rcu(dev);</div><div class='add'>+	if (!p || p-&gt;br != br)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return p;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static bool br_multicast_select_querier(struct net_bridge *br,</div><div class='del'>-					struct net_bridge_port *port,</div><div class='del'>-					struct br_ip *saddr)</div><div class='add'>+size_t br_multicast_querier_state_size(void)</div><div class='ctx'> {</div><div class='del'>-	switch (saddr-&gt;proto) {</div><div class='del'>-	case htons(ETH_P_IP):</div><div class='del'>-		return br_ip4_multicast_select_querier(br, port, saddr-&gt;u.ip4);</div><div class='add'>+	return nla_total_size(0) +		/* nest attribute */</div><div class='add'>+	       nla_total_size(sizeof(__be32)) + /* BRIDGE_QUERIER_IP_ADDRESS */</div><div class='add'>+	       nla_total_size(sizeof(int)) +    /* BRIDGE_QUERIER_IP_PORT */</div><div class='add'>+	       nla_total_size_64bit(sizeof(u64)) + /* BRIDGE_QUERIER_IP_OTHER_TIMER */</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	case htons(ETH_P_IPV6):</div><div class='del'>-		return br_ip6_multicast_select_querier(br, port, &amp;saddr-&gt;u.ip6);</div><div class='add'>+	       nla_total_size(sizeof(struct in6_addr)) + /* BRIDGE_QUERIER_IPV6_ADDRESS */</div><div class='add'>+	       nla_total_size(sizeof(int)) +		 /* BRIDGE_QUERIER_IPV6_PORT */</div><div class='add'>+	       nla_total_size_64bit(sizeof(u64)) +	 /* BRIDGE_QUERIER_IPV6_OTHER_TIMER */</div><div class='ctx'> #endif</div><div class='add'>+	       0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* protected by rtnl or rcu */</div><div class='add'>+int br_multicast_dump_querier_state(struct sk_buff *skb,</div><div class='add'>+				    const struct net_bridge_mcast *brmctx,</div><div class='add'>+				    int nest_attr)</div><div class='add'>+{</div><div class='add'>+	struct bridge_mcast_querier querier = {};</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(brmctx-&gt;br, BROPT_MULTICAST_ENABLED) ||</div><div class='add'>+	    br_multicast_ctx_vlan_global_disabled(brmctx))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, nest_attr);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!brmctx-&gt;multicast_querier &amp;&amp;</div><div class='add'>+	    !timer_pending(&amp;brmctx-&gt;ip4_other_query.timer))</div><div class='add'>+		goto out_v6;</div><div class='add'>+</div><div class='add'>+	br_multicast_read_querier(&amp;brmctx-&gt;ip4_querier, &amp;querier);</div><div class='add'>+	if (nla_put_in_addr(skb, BRIDGE_QUERIER_IP_ADDRESS,</div><div class='add'>+			    querier.addr.src.ip4)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	p = __br_multicast_get_querier_port(brmctx-&gt;br, &amp;querier);</div><div class='add'>+	if (timer_pending(&amp;brmctx-&gt;ip4_other_query.timer) &amp;&amp;</div><div class='add'>+	    (nla_put_u64_64bit(skb, BRIDGE_QUERIER_IP_OTHER_TIMER,</div><div class='add'>+			       br_timer_value(&amp;brmctx-&gt;ip4_other_query.timer),</div><div class='add'>+			       BRIDGE_QUERIER_PAD) ||</div><div class='add'>+	     (p &amp;&amp; nla_put_u32(skb, BRIDGE_QUERIER_IP_PORT, p-&gt;dev-&gt;ifindex)))) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_v6:</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (!brmctx-&gt;multicast_querier &amp;&amp;</div><div class='add'>+	    !timer_pending(&amp;brmctx-&gt;ip6_other_query.timer))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	br_multicast_read_querier(&amp;brmctx-&gt;ip6_querier, &amp;querier);</div><div class='add'>+	if (nla_put_in6_addr(skb, BRIDGE_QUERIER_IPV6_ADDRESS,</div><div class='add'>+			     &amp;querier.addr.src.ip6)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = __br_multicast_get_querier_port(brmctx-&gt;br, &amp;querier);</div><div class='add'>+	if (timer_pending(&amp;brmctx-&gt;ip6_other_query.timer) &amp;&amp;</div><div class='add'>+	    (nla_put_u64_64bit(skb, BRIDGE_QUERIER_IPV6_OTHER_TIMER,</div><div class='add'>+			       br_timer_value(&amp;brmctx-&gt;ip6_other_query.timer),</div><div class='add'>+			       BRIDGE_QUERIER_PAD) ||</div><div class='add'>+	     (p &amp;&amp; nla_put_u32(skb, BRIDGE_QUERIER_IPV6_PORT,</div><div class='add'>+			       p-&gt;dev-&gt;ifindex)))) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	if (!nla_len(nest))</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-br_multicast_update_query_timer(struct net_bridge *br,</div><div class='add'>+br_multicast_update_query_timer(struct net_bridge_mcast *brmctx,</div><div class='ctx'> 				struct bridge_mcast_other_query *query,</div><div class='ctx'> 				unsigned long max_delay)</div><div class='ctx'> {</div><div class='ctx'> 	if (!timer_pending(&amp;query-&gt;timer))</div><div class='del'>-		query-&gt;delay_time = jiffies + max_delay;</div><div class='add'>+		mod_timer(&amp;query-&gt;delay_timer, jiffies + max_delay);</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;query-&gt;timer, jiffies + br-&gt;multicast_querier_interval);</div><div class='add'>+	mod_timer(&amp;query-&gt;timer, jiffies + brmctx-&gt;multicast_querier_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void br_port_mc_router_state_change(struct net_bridge_port *p,</div><div class='hunk'>@@ -1354,109 +3286,244 @@ static void br_port_mc_router_state_change(struct net_bridge_port *p,</div><div class='ctx'> 		.u.mrouter = is_mc_router,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switchdev_port_attr_set(p-&gt;dev, &amp;attr);</div><div class='add'>+	switchdev_port_attr_set(p-&gt;dev, &amp;attr, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add port to router_list</div><div class='add'>+static struct net_bridge_port *</div><div class='add'>+br_multicast_rport_from_node(struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct hlist_head *mc_router_list,</div><div class='add'>+			     struct hlist_node *rlist)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (mc_router_list == &amp;brmctx-&gt;ip6_mc_router_list)</div><div class='add'>+		pmctx = hlist_entry(rlist, struct net_bridge_mcast_port,</div><div class='add'>+				    ip6_rlist);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		pmctx = hlist_entry(rlist, struct net_bridge_mcast_port,</div><div class='add'>+				    ip4_rlist);</div><div class='add'>+</div><div class='add'>+	return pmctx-&gt;port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hlist_node *</div><div class='add'>+br_multicast_get_rport_slot(struct net_bridge_mcast *brmctx,</div><div class='add'>+			    struct net_bridge_port *port,</div><div class='add'>+			    struct hlist_head *mc_router_list)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *slot = NULL;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct hlist_node *rlist;</div><div class='add'>+</div><div class='add'>+	hlist_for_each(rlist, mc_router_list) {</div><div class='add'>+		p = br_multicast_rport_from_node(brmctx, mc_router_list, rlist);</div><div class='add'>+</div><div class='add'>+		if ((unsigned long)port &gt;= (unsigned long)p)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		slot = rlist;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_no_router_otherpf(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+					   struct hlist_node *rnode)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (rnode != &amp;pmctx-&gt;ip6_rlist)</div><div class='add'>+		return hlist_unhashed(&amp;pmctx-&gt;ip6_rlist);</div><div class='add'>+	else</div><div class='add'>+		return hlist_unhashed(&amp;pmctx-&gt;ip4_rlist);</div><div class='add'>+#else</div><div class='add'>+	return true;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add port to router_list</div><div class='ctx'>  *  list is maintained ordered by pointer value</div><div class='ctx'>  *  and locked by br-&gt;multicast_lock and RCU</div><div class='ctx'>  */</div><div class='del'>-static void br_multicast_add_router(struct net_bridge *br,</div><div class='del'>-				    struct net_bridge_port *port)</div><div class='add'>+static void br_multicast_add_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+				    struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				    struct hlist_node *rlist,</div><div class='add'>+				    struct hlist_head *mc_router_list)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p;</div><div class='del'>-	struct hlist_node *slot = NULL;</div><div class='add'>+	struct hlist_node *slot;</div><div class='ctx'> </div><div class='del'>-	if (!hlist_unhashed(&amp;port-&gt;rlist))</div><div class='add'>+	if (!hlist_unhashed(rlist))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry(p, &amp;br-&gt;router_list, rlist) {</div><div class='del'>-		if ((unsigned long) port &gt;= (unsigned long) p)</div><div class='del'>-			break;</div><div class='del'>-		slot = &amp;p-&gt;rlist;</div><div class='del'>-	}</div><div class='add'>+	slot = br_multicast_get_rport_slot(brmctx, pmctx-&gt;port, mc_router_list);</div><div class='ctx'> </div><div class='ctx'> 	if (slot)</div><div class='del'>-		hlist_add_behind_rcu(&amp;port-&gt;rlist, slot);</div><div class='add'>+		hlist_add_behind_rcu(rlist, slot);</div><div class='ctx'> 	else</div><div class='del'>-		hlist_add_head_rcu(&amp;port-&gt;rlist, &amp;br-&gt;router_list);</div><div class='del'>-	br_rtr_notify(br-&gt;dev, port, RTM_NEWMDB);</div><div class='del'>-	br_port_mc_router_state_change(port, true);</div><div class='add'>+		hlist_add_head_rcu(rlist, mc_router_list);</div><div class='add'>+</div><div class='add'>+	/* For backwards compatibility for now, only notify if we</div><div class='add'>+	 * switched from no IPv4/IPv6 multicast router to a new</div><div class='add'>+	 * IPv4 or IPv6 multicast router.</div><div class='add'>+	 */</div><div class='add'>+	if (br_multicast_no_router_otherpf(pmctx, rlist)) {</div><div class='add'>+		br_rtr_notify(pmctx-&gt;port-&gt;br-&gt;dev, pmctx, RTM_NEWMDB);</div><div class='add'>+		br_port_mc_router_state_change(pmctx-&gt;port, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add port to router_list</div><div class='add'>+ *  list is maintained ordered by pointer value</div><div class='add'>+ *  and locked by br-&gt;multicast_lock and RCU</div><div class='add'>+ */</div><div class='add'>+static void br_ip4_multicast_add_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	br_multicast_add_router(brmctx, pmctx, &amp;pmctx-&gt;ip4_rlist,</div><div class='add'>+				&amp;brmctx-&gt;ip4_mc_router_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_mark_router(struct net_bridge *br,</div><div class='del'>-				     struct net_bridge_port *port)</div><div class='add'>+/* Add port to router_list</div><div class='add'>+ *  list is maintained ordered by pointer value</div><div class='add'>+ *  and locked by br-&gt;multicast_lock and RCU</div><div class='add'>+ */</div><div class='add'>+static void br_ip6_multicast_add_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	br_multicast_add_router(brmctx, pmctx, &amp;pmctx-&gt;ip6_rlist,</div><div class='add'>+				&amp;brmctx-&gt;ip6_mc_router_list);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_mark_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+				     struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				     struct timer_list *timer,</div><div class='add'>+				     struct hlist_node *rlist,</div><div class='add'>+				     struct hlist_head *mc_router_list)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (!port) {</div><div class='del'>-		if (br-&gt;multicast_router == MDB_RTR_TYPE_TEMP_QUERY) {</div><div class='del'>-			if (!timer_pending(&amp;br-&gt;multicast_router_timer))</div><div class='del'>-				br_mc_router_state_change(br, true);</div><div class='del'>-			mod_timer(&amp;br-&gt;multicast_router_timer,</div><div class='del'>-				  now + br-&gt;multicast_querier_interval);</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!pmctx) {</div><div class='add'>+		if (brmctx-&gt;multicast_router == MDB_RTR_TYPE_TEMP_QUERY) {</div><div class='add'>+			if (!br_ip4_multicast_is_router(brmctx) &amp;&amp;</div><div class='add'>+			    !br_ip6_multicast_is_router(brmctx))</div><div class='add'>+				br_mc_router_state_change(brmctx-&gt;br, true);</div><div class='add'>+			mod_timer(timer, now + brmctx-&gt;multicast_querier_interval);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='del'>-	    port-&gt;multicast_router == MDB_RTR_TYPE_PERM)</div><div class='add'>+	if (pmctx-&gt;multicast_router == MDB_RTR_TYPE_DISABLED ||</div><div class='add'>+	    pmctx-&gt;multicast_router == MDB_RTR_TYPE_PERM)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	br_multicast_add_router(br, port);</div><div class='add'>+	br_multicast_add_router(brmctx, pmctx, rlist, mc_router_list);</div><div class='add'>+	mod_timer(timer, now + brmctx-&gt;multicast_querier_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_ip4_multicast_mark_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	struct timer_list *timer = &amp;brmctx-&gt;ip4_mc_router_timer;</div><div class='add'>+	struct hlist_node *rlist = NULL;</div><div class='add'>+</div><div class='add'>+	if (pmctx) {</div><div class='add'>+		timer = &amp;pmctx-&gt;ip4_mc_router_timer;</div><div class='add'>+		rlist = &amp;pmctx-&gt;ip4_rlist;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;port-&gt;multicast_router_timer,</div><div class='del'>-		  now + br-&gt;multicast_querier_interval);</div><div class='add'>+	br_multicast_mark_router(brmctx, pmctx, timer, rlist,</div><div class='add'>+				 &amp;brmctx-&gt;ip4_mc_router_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_query_received(struct net_bridge *br,</div><div class='del'>-					struct net_bridge_port *port,</div><div class='del'>-					struct bridge_mcast_other_query *query,</div><div class='del'>-					struct br_ip *saddr,</div><div class='del'>-					unsigned long max_delay)</div><div class='add'>+static void br_ip6_multicast_mark_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx)</div><div class='ctx'> {</div><div class='del'>-	if (!br_multicast_select_querier(br, port, saddr))</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct timer_list *timer = &amp;brmctx-&gt;ip6_mc_router_timer;</div><div class='add'>+	struct hlist_node *rlist = NULL;</div><div class='add'>+</div><div class='add'>+	if (pmctx) {</div><div class='add'>+		timer = &amp;pmctx-&gt;ip6_mc_router_timer;</div><div class='add'>+		rlist = &amp;pmctx-&gt;ip6_rlist;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_multicast_mark_router(brmctx, pmctx, timer, rlist,</div><div class='add'>+				 &amp;brmctx-&gt;ip6_mc_router_list);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+br_ip4_multicast_query_received(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct bridge_mcast_other_query *query,</div><div class='add'>+				struct br_ip *saddr,</div><div class='add'>+				unsigned long max_delay)</div><div class='add'>+{</div><div class='add'>+	if (!br_multicast_select_querier(brmctx, pmctx, saddr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_multicast_update_query_timer(brmctx, query, max_delay);</div><div class='add'>+	br_ip4_multicast_mark_router(brmctx, pmctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void</div><div class='add'>+br_ip6_multicast_query_received(struct net_bridge_mcast *brmctx,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				struct bridge_mcast_other_query *query,</div><div class='add'>+				struct br_ip *saddr,</div><div class='add'>+				unsigned long max_delay)</div><div class='add'>+{</div><div class='add'>+	if (!br_multicast_select_querier(brmctx, pmctx, saddr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	br_multicast_update_query_timer(br, query, max_delay);</div><div class='del'>-	br_multicast_mark_router(br, port);</div><div class='add'>+	br_multicast_update_query_timer(brmctx, query, max_delay);</div><div class='add'>+	br_ip6_multicast_mark_router(brmctx, pmctx);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void br_ip4_multicast_query(struct net_bridge *br,</div><div class='del'>-				   struct net_bridge_port *port,</div><div class='add'>+static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+				   struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				   struct sk_buff *skb,</div><div class='ctx'> 				   u16 vid)</div><div class='ctx'> {</div><div class='add'>+	unsigned int transport_len = ip_transport_len(skb);</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct igmphdr *ih = igmp_hdr(skb);</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct igmpv3_query *ih3;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='ctx'> 	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct br_ip saddr;</div><div class='add'>+	struct br_ip saddr = {};</div><div class='ctx'> 	unsigned long max_delay;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='del'>-	unsigned int offset = skb_transport_offset(skb);</div><div class='ctx'> 	__be32 group;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) ||</div><div class='del'>-	    (port &amp;&amp; port-&gt;state == BR_STATE_DISABLED))</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	group = ih-&gt;group;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len == offset + sizeof(*ih)) {</div><div class='add'>+	if (transport_len == sizeof(*ih)) {</div><div class='ctx'> 		max_delay = ih-&gt;code * (HZ / IGMP_TIMER_SCALE);</div><div class='ctx'> </div><div class='ctx'> 		if (!max_delay) {</div><div class='ctx'> 			max_delay = 10 * HZ;</div><div class='ctx'> 			group = 0;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (skb-&gt;len &gt;= offset + sizeof(*ih3)) {</div><div class='add'>+	} else if (transport_len &gt;= sizeof(*ih3)) {</div><div class='ctx'> 		ih3 = igmpv3_query_hdr(skb);</div><div class='del'>-		if (ih3-&gt;nsrcs)</div><div class='add'>+		if (ih3-&gt;nsrcs ||</div><div class='add'>+		    (brmctx-&gt;multicast_igmp_version == 3 &amp;&amp; group &amp;&amp;</div><div class='add'>+		     ih3-&gt;suppress))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		max_delay = ih3-&gt;code ?</div><div class='hunk'>@@ -1467,51 +3534,54 @@ static void br_ip4_multicast_query(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	if (!group) {</div><div class='ctx'> 		saddr.proto = htons(ETH_P_IP);</div><div class='del'>-		saddr.u.ip4 = iph-&gt;saddr;</div><div class='add'>+		saddr.src.ip4 = iph-&gt;saddr;</div><div class='ctx'> </div><div class='del'>-		br_multicast_query_received(br, port, &amp;br-&gt;ip4_other_query,</div><div class='del'>-					    &amp;saddr, max_delay);</div><div class='add'>+		br_ip4_multicast_query_received(brmctx, pmctx,</div><div class='add'>+						&amp;brmctx-&gt;ip4_other_query,</div><div class='add'>+						&amp;saddr, max_delay);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mp = br_mdb_ip4_get(mlock_dereference(br-&gt;mdb, br), group, vid);</div><div class='add'>+	mp = br_mdb_ip4_get(brmctx-&gt;br, group, vid);</div><div class='ctx'> 	if (!mp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	max_delay *= br-&gt;multicast_last_member_count;</div><div class='add'>+	max_delay *= brmctx-&gt;multicast_last_member_count;</div><div class='ctx'> </div><div class='ctx'> 	if (mp-&gt;host_joined &amp;&amp;</div><div class='ctx'> 	    (timer_pending(&amp;mp-&gt;timer) ?</div><div class='ctx'> 	     time_after(mp-&gt;timer.expires, now + max_delay) :</div><div class='del'>-	     try_to_del_timer_sync(&amp;mp-&gt;timer) &gt;= 0))</div><div class='add'>+	     timer_delete_sync_try(&amp;mp-&gt;timer) &gt;= 0))</div><div class='ctx'> 		mod_timer(&amp;mp-&gt;timer, now + max_delay);</div><div class='ctx'> </div><div class='ctx'> 	for (pp = &amp;mp-&gt;ports;</div><div class='del'>-	     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+	     (p = mlock_dereference(*pp, brmctx-&gt;br)) != NULL;</div><div class='ctx'> 	     pp = &amp;p-&gt;next) {</div><div class='ctx'> 		if (timer_pending(&amp;p-&gt;timer) ?</div><div class='ctx'> 		    time_after(p-&gt;timer.expires, now + max_delay) :</div><div class='del'>-		    try_to_del_timer_sync(&amp;p-&gt;timer) &gt;= 0)</div><div class='add'>+		    timer_delete_sync_try(&amp;p-&gt;timer) &gt;= 0 &amp;&amp;</div><div class='add'>+		    (brmctx-&gt;multicast_igmp_version == 2 ||</div><div class='add'>+		     p-&gt;filter_mode == MCAST_EXCLUDE))</div><div class='ctx'> 			mod_timer(&amp;p-&gt;timer, now + max_delay);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static int br_ip6_multicast_query(struct net_bridge *br,</div><div class='del'>-				  struct net_bridge_port *port,</div><div class='add'>+static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				  struct sk_buff *skb,</div><div class='ctx'> 				  u16 vid)</div><div class='ctx'> {</div><div class='del'>-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	unsigned int transport_len = ipv6_transport_len(skb);</div><div class='ctx'> 	struct mld_msg *mld;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct mld2_query *mld2q;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='ctx'> 	struct net_bridge_port_group __rcu **pp;</div><div class='del'>-	struct br_ip saddr;</div><div class='add'>+	struct br_ip saddr = {};</div><div class='ctx'> 	unsigned long max_delay;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	unsigned int offset = skb_transport_offset(skb);</div><div class='hunk'>@@ -1519,12 +3589,11 @@ static int br_ip6_multicast_query(struct net_bridge *br,</div><div class='ctx'> 	bool is_general_query;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) ||</div><div class='del'>-	    (port &amp;&amp; port-&gt;state == BR_STATE_DISABLED))</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len == offset + sizeof(*mld)) {</div><div class='add'>+	if (transport_len == sizeof(*mld)) {</div><div class='ctx'> 		if (!pskb_may_pull(skb, offset + sizeof(*mld))) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1541,6 +3610,10 @@ static int br_ip6_multicast_query(struct net_bridge *br,</div><div class='ctx'> 		mld2q = (struct mld2_query *)icmp6_hdr(skb);</div><div class='ctx'> 		if (!mld2q-&gt;mld2q_nsrcs)</div><div class='ctx'> 			group = &amp;mld2q-&gt;mld2q_mca;</div><div class='add'>+		if (brmctx-&gt;multicast_mld_version == 2 &amp;&amp;</div><div class='add'>+		    !ipv6_addr_any(&amp;mld2q-&gt;mld2q_mca) &amp;&amp;</div><div class='add'>+		    mld2q-&gt;mld2q_suppress)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		max_delay = max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1549,84 +3622,79 @@ static int br_ip6_multicast_query(struct net_bridge *br,</div><div class='ctx'> </div><div class='ctx'> 	if (is_general_query) {</div><div class='ctx'> 		saddr.proto = htons(ETH_P_IPV6);</div><div class='del'>-		saddr.u.ip6 = ip6h-&gt;saddr;</div><div class='add'>+		saddr.src.ip6 = ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> </div><div class='del'>-		br_multicast_query_received(br, port, &amp;br-&gt;ip6_other_query,</div><div class='del'>-					    &amp;saddr, max_delay);</div><div class='add'>+		br_ip6_multicast_query_received(brmctx, pmctx,</div><div class='add'>+						&amp;brmctx-&gt;ip6_other_query,</div><div class='add'>+						&amp;saddr, max_delay);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (!group) {</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mp = br_mdb_ip6_get(mlock_dereference(br-&gt;mdb, br), group, vid);</div><div class='add'>+	mp = br_mdb_ip6_get(brmctx-&gt;br, group, vid);</div><div class='ctx'> 	if (!mp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	max_delay *= br-&gt;multicast_last_member_count;</div><div class='add'>+	max_delay *= brmctx-&gt;multicast_last_member_count;</div><div class='ctx'> 	if (mp-&gt;host_joined &amp;&amp;</div><div class='ctx'> 	    (timer_pending(&amp;mp-&gt;timer) ?</div><div class='ctx'> 	     time_after(mp-&gt;timer.expires, now + max_delay) :</div><div class='del'>-	     try_to_del_timer_sync(&amp;mp-&gt;timer) &gt;= 0))</div><div class='add'>+	     timer_delete_sync_try(&amp;mp-&gt;timer) &gt;= 0))</div><div class='ctx'> 		mod_timer(&amp;mp-&gt;timer, now + max_delay);</div><div class='ctx'> </div><div class='ctx'> 	for (pp = &amp;mp-&gt;ports;</div><div class='del'>-	     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+	     (p = mlock_dereference(*pp, brmctx-&gt;br)) != NULL;</div><div class='ctx'> 	     pp = &amp;p-&gt;next) {</div><div class='ctx'> 		if (timer_pending(&amp;p-&gt;timer) ?</div><div class='ctx'> 		    time_after(p-&gt;timer.expires, now + max_delay) :</div><div class='del'>-		    try_to_del_timer_sync(&amp;p-&gt;timer) &gt;= 0)</div><div class='add'>+		    timer_delete_sync_try(&amp;p-&gt;timer) &gt;= 0 &amp;&amp;</div><div class='add'>+		    (brmctx-&gt;multicast_mld_version == 1 ||</div><div class='add'>+		     p-&gt;filter_mode == MCAST_EXCLUDE))</div><div class='ctx'> 			mod_timer(&amp;p-&gt;timer, now + max_delay);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-br_multicast_leave_group(struct net_bridge *br,</div><div class='del'>-			 struct net_bridge_port *port,</div><div class='add'>+br_multicast_leave_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+			 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 			 struct br_ip *group,</div><div class='ctx'> 			 struct bridge_mcast_other_query *other_query,</div><div class='ctx'> 			 struct bridge_mcast_own_query *own_query,</div><div class='ctx'> 			 const unsigned char *src)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='ctx'> 	struct net_bridge_mdb_entry *mp;</div><div class='ctx'> 	struct net_bridge_port_group *p;</div><div class='ctx'> 	unsigned long now;</div><div class='ctx'> 	unsigned long time;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!netif_running(br-&gt;dev) ||</div><div class='del'>-	    (port &amp;&amp; port-&gt;state == BR_STATE_DISABLED))</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (!br_multicast_ctx_should_use(brmctx, pmctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	mp = br_mdb_ip_get(mdb, group);</div><div class='add'>+	mp = br_mdb_ip_get(brmctx-&gt;br, group);</div><div class='ctx'> 	if (!mp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (port &amp;&amp; (port-&gt;flags &amp; BR_MULTICAST_FAST_LEAVE)) {</div><div class='add'>+	if (pmctx &amp;&amp; (pmctx-&gt;port-&gt;flags &amp; BR_MULTICAST_FAST_LEAVE)) {</div><div class='ctx'> 		struct net_bridge_port_group __rcu **pp;</div><div class='ctx'> </div><div class='ctx'> 		for (pp = &amp;mp-&gt;ports;</div><div class='del'>-		     (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+		     (p = mlock_dereference(*pp, brmctx-&gt;br)) != NULL;</div><div class='ctx'> 		     pp = &amp;p-&gt;next) {</div><div class='del'>-			if (!br_port_group_equal(p, port, src))</div><div class='add'>+			if (!br_port_group_equal(p, pmctx-&gt;port, src))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			rcu_assign_pointer(*pp, p-&gt;next);</div><div class='del'>-			hlist_del_init(&amp;p-&gt;mglist);</div><div class='del'>-			del_timer(&amp;p-&gt;timer);</div><div class='del'>-			call_rcu_bh(&amp;p-&gt;rcu, br_multicast_free_pg);</div><div class='del'>-			br_mdb_notify(br-&gt;dev, port, group, RTM_DELMDB,</div><div class='del'>-				      p-&gt;flags);</div><div class='add'>+			if (p-&gt;flags &amp; MDB_PG_FLAGS_PERMANENT)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-			if (!mp-&gt;ports &amp;&amp; !mp-&gt;host_joined &amp;&amp;</div><div class='del'>-			    netif_running(br-&gt;dev))</div><div class='del'>-				mod_timer(&amp;mp-&gt;timer, jiffies);</div><div class='add'>+			p-&gt;flags |= MDB_PG_FLAGS_FAST_LEAVE;</div><div class='add'>+			br_multicast_del_pg(mp, p, pp);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1634,24 +3702,25 @@ br_multicast_leave_group(struct net_bridge *br,</div><div class='ctx'> 	if (timer_pending(&amp;other_query-&gt;timer))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_querier) {</div><div class='del'>-		__br_multicast_send_query(br, port, &amp;mp-&gt;addr);</div><div class='add'>+	if (brmctx-&gt;multicast_querier) {</div><div class='add'>+		__br_multicast_send_query(brmctx, pmctx, NULL, NULL, &amp;mp-&gt;addr,</div><div class='add'>+					  false, 0, NULL);</div><div class='ctx'> </div><div class='del'>-		time = jiffies + br-&gt;multicast_last_member_count *</div><div class='del'>-				 br-&gt;multicast_last_member_interval;</div><div class='add'>+		time = jiffies + brmctx-&gt;multicast_last_member_count *</div><div class='add'>+				 brmctx-&gt;multicast_last_member_interval;</div><div class='ctx'> </div><div class='ctx'> 		mod_timer(&amp;own_query-&gt;timer, time);</div><div class='ctx'> </div><div class='del'>-		for (p = mlock_dereference(mp-&gt;ports, br);</div><div class='del'>-		     p != NULL;</div><div class='del'>-		     p = mlock_dereference(p-&gt;next, br)) {</div><div class='del'>-			if (!br_port_group_equal(p, port, src))</div><div class='add'>+		for (p = mlock_dereference(mp-&gt;ports, brmctx-&gt;br);</div><div class='add'>+		     p != NULL &amp;&amp; pmctx != NULL;</div><div class='add'>+		     p = mlock_dereference(p-&gt;next, brmctx-&gt;br)) {</div><div class='add'>+			if (!br_port_group_equal(p, pmctx-&gt;port, src))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			if (!hlist_unhashed(&amp;p-&gt;mglist) &amp;&amp;</div><div class='ctx'> 			    (timer_pending(&amp;p-&gt;timer) ?</div><div class='ctx'> 			     time_after(p-&gt;timer.expires, time) :</div><div class='del'>-			     try_to_del_timer_sync(&amp;p-&gt;timer) &gt;= 0)) {</div><div class='add'>+			     timer_delete_sync_try(&amp;p-&gt;timer) &gt;= 0)) {</div><div class='ctx'> 				mod_timer(&amp;p-&gt;timer, time);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -1660,41 +3729,41 @@ br_multicast_leave_group(struct net_bridge *br,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	now = jiffies;</div><div class='del'>-	time = now + br-&gt;multicast_last_member_count *</div><div class='del'>-		     br-&gt;multicast_last_member_interval;</div><div class='add'>+	time = now + brmctx-&gt;multicast_last_member_count *</div><div class='add'>+		     brmctx-&gt;multicast_last_member_interval;</div><div class='ctx'> </div><div class='del'>-	if (!port) {</div><div class='add'>+	if (!pmctx) {</div><div class='ctx'> 		if (mp-&gt;host_joined &amp;&amp;</div><div class='ctx'> 		    (timer_pending(&amp;mp-&gt;timer) ?</div><div class='ctx'> 		     time_after(mp-&gt;timer.expires, time) :</div><div class='del'>-		     try_to_del_timer_sync(&amp;mp-&gt;timer) &gt;= 0)) {</div><div class='add'>+		     timer_delete_sync_try(&amp;mp-&gt;timer) &gt;= 0)) {</div><div class='ctx'> 			mod_timer(&amp;mp-&gt;timer, time);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (p = mlock_dereference(mp-&gt;ports, br);</div><div class='add'>+	for (p = mlock_dereference(mp-&gt;ports, brmctx-&gt;br);</div><div class='ctx'> 	     p != NULL;</div><div class='del'>-	     p = mlock_dereference(p-&gt;next, br)) {</div><div class='del'>-		if (p-&gt;port != port)</div><div class='add'>+	     p = mlock_dereference(p-&gt;next, brmctx-&gt;br)) {</div><div class='add'>+		if (p-&gt;key.port != pmctx-&gt;port)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!hlist_unhashed(&amp;p-&gt;mglist) &amp;&amp;</div><div class='ctx'> 		    (timer_pending(&amp;p-&gt;timer) ?</div><div class='ctx'> 		     time_after(p-&gt;timer.expires, time) :</div><div class='del'>-		     try_to_del_timer_sync(&amp;p-&gt;timer) &gt;= 0)) {</div><div class='add'>+		     timer_delete_sync_try(&amp;p-&gt;timer) &gt;= 0)) {</div><div class='ctx'> 			mod_timer(&amp;p-&gt;timer, time);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_ip4_multicast_leave_group(struct net_bridge *br,</div><div class='del'>-					 struct net_bridge_port *port,</div><div class='add'>+static void br_ip4_multicast_leave_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					 __be32 group,</div><div class='ctx'> 					 __u16 vid,</div><div class='ctx'> 					 const unsigned char *src)</div><div class='hunk'>@@ -1705,19 +3774,21 @@ static void br_ip4_multicast_leave_group(struct net_bridge *br,</div><div class='ctx'> 	if (ipv4_is_local_multicast(group))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	own_query = port ? &amp;port-&gt;ip4_own_query : &amp;br-&gt;ip4_own_query;</div><div class='add'>+	own_query = pmctx ? &amp;pmctx-&gt;ip4_own_query : &amp;brmctx-&gt;ip4_own_query;</div><div class='ctx'> </div><div class='del'>-	br_group.u.ip4 = group;</div><div class='add'>+	memset(&amp;br_group, 0, sizeof(br_group));</div><div class='add'>+	br_group.dst.ip4 = group;</div><div class='ctx'> 	br_group.proto = htons(ETH_P_IP);</div><div class='ctx'> 	br_group.vid = vid;</div><div class='ctx'> </div><div class='del'>-	br_multicast_leave_group(br, port, &amp;br_group, &amp;br-&gt;ip4_other_query,</div><div class='add'>+	br_multicast_leave_group(brmctx, pmctx, &amp;br_group,</div><div class='add'>+				 &amp;brmctx-&gt;ip4_other_query,</div><div class='ctx'> 				 own_query, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static void br_ip6_multicast_leave_group(struct net_bridge *br,</div><div class='del'>-					 struct net_bridge_port *port,</div><div class='add'>+static void br_ip6_multicast_leave_group(struct net_bridge_mcast *brmctx,</div><div class='add'>+					 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 					 const struct in6_addr *group,</div><div class='ctx'> 					 __u16 vid,</div><div class='ctx'> 					 const unsigned char *src)</div><div class='hunk'>@@ -1728,13 +3799,15 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br,</div><div class='ctx'> 	if (ipv6_addr_is_ll_all_nodes(group))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	own_query = port ? &amp;port-&gt;ip6_own_query : &amp;br-&gt;ip6_own_query;</div><div class='add'>+	own_query = pmctx ? &amp;pmctx-&gt;ip6_own_query : &amp;brmctx-&gt;ip6_own_query;</div><div class='ctx'> </div><div class='del'>-	br_group.u.ip6 = *group;</div><div class='add'>+	memset(&amp;br_group, 0, sizeof(br_group));</div><div class='add'>+	br_group.dst.ip6 = *group;</div><div class='ctx'> 	br_group.proto = htons(ETH_P_IPV6);</div><div class='ctx'> 	br_group.vid = vid;</div><div class='ctx'> </div><div class='del'>-	br_multicast_leave_group(br, port, &amp;br_group, &amp;br-&gt;ip6_other_query,</div><div class='add'>+	br_multicast_leave_group(brmctx, pmctx, &amp;br_group,</div><div class='add'>+				 &amp;brmctx-&gt;ip6_other_query,</div><div class='ctx'> 				 own_query, src);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1746,7 +3819,7 @@ static void br_multicast_err_count(const struct net_bridge *br,</div><div class='ctx'> 	struct bridge_mcast_stats __percpu *stats;</div><div class='ctx'> 	struct bridge_mcast_stats *pstats;</div><div class='ctx'> </div><div class='del'>-	if (!br-&gt;multicast_stats_enabled)</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (p)</div><div class='hunk'>@@ -1772,8 +3845,8 @@ static void br_multicast_err_count(const struct net_bridge *br,</div><div class='ctx'> 	u64_stats_update_end(&amp;pstats-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_pim(struct net_bridge *br,</div><div class='del'>-			     struct net_bridge_port *port,</div><div class='add'>+static void br_multicast_pim(struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 			     const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int offset = skb_transport_offset(skb);</div><div class='hunk'>@@ -1784,31 +3857,51 @@ static void br_multicast_pim(struct net_bridge *br,</div><div class='ctx'> 	    pim_hdr_type(pimhdr) != PIM_TYPE_HELLO)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	br_multicast_mark_router(br, port);</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	br_ip4_multicast_mark_router(brmctx, pmctx);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_ip4_multicast_mrd_rcv(struct net_bridge_mcast *brmctx,</div><div class='add'>+				    struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (ip_hdr(skb)-&gt;protocol != IPPROTO_IGMP ||</div><div class='add'>+	    igmp_hdr(skb)-&gt;type != IGMP_MRDISC_ADV)</div><div class='add'>+		return -ENOMSG;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	br_ip4_multicast_mark_router(brmctx, pmctx);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_multicast_ipv4_rcv(struct net_bridge *br,</div><div class='del'>-				 struct net_bridge_port *port,</div><div class='add'>+static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				 struct sk_buff *skb,</div><div class='ctx'> 				 u16 vid)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb_trimmed = NULL;</div><div class='add'>+	struct net_bridge_port *p = pmctx ? pmctx-&gt;port : NULL;</div><div class='ctx'> 	const unsigned char *src;</div><div class='ctx'> 	struct igmphdr *ih;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = ip_mc_check_igmp(skb, &amp;skb_trimmed);</div><div class='add'>+	err = ip_mc_check_igmp(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (err == -ENOMSG) {</div><div class='ctx'> 		if (!ipv4_is_local_multicast(ip_hdr(skb)-&gt;daddr)) {</div><div class='ctx'> 			BR_INPUT_SKB_CB(skb)-&gt;mrouters_only = 1;</div><div class='ctx'> 		} else if (pim_ipv4_all_pim_routers(ip_hdr(skb)-&gt;daddr)) {</div><div class='ctx'> 			if (ip_hdr(skb)-&gt;protocol == IPPROTO_PIM)</div><div class='del'>-				br_multicast_pim(br, port, skb);</div><div class='add'>+				br_multicast_pim(brmctx, pmctx, skb);</div><div class='add'>+		} else if (ipv4_is_all_snoopers(ip_hdr(skb)-&gt;daddr)) {</div><div class='add'>+			br_ip4_multicast_mrd_rcv(brmctx, pmctx, skb);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if (err &lt; 0) {</div><div class='del'>-		br_multicast_err_count(br, port, skb-&gt;protocol);</div><div class='add'>+		br_multicast_err_count(brmctx-&gt;br, p, skb-&gt;protocol);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1820,47 +3913,61 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,</div><div class='ctx'> 	case IGMP_HOST_MEMBERSHIP_REPORT:</div><div class='ctx'> 	case IGMPV2_HOST_MEMBERSHIP_REPORT:</div><div class='ctx'> 		BR_INPUT_SKB_CB(skb)-&gt;mrouters_only = 1;</div><div class='del'>-		err = br_ip4_multicast_add_group(br, port, ih-&gt;group, vid, src);</div><div class='add'>+		err = br_ip4_multicast_add_group(brmctx, pmctx, ih-&gt;group, vid,</div><div class='add'>+						 src, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IGMPV3_HOST_MEMBERSHIP_REPORT:</div><div class='del'>-		err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);</div><div class='add'>+		err = br_ip4_multicast_igmp3_report(brmctx, pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IGMP_HOST_MEMBERSHIP_QUERY:</div><div class='del'>-		br_ip4_multicast_query(br, port, skb_trimmed, vid);</div><div class='add'>+		br_ip4_multicast_query(brmctx, pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IGMP_HOST_LEAVE_MESSAGE:</div><div class='del'>-		br_ip4_multicast_leave_group(br, port, ih-&gt;group, vid, src);</div><div class='add'>+		br_ip4_multicast_leave_group(brmctx, pmctx, ih-&gt;group, vid, src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_trimmed &amp;&amp; skb_trimmed != skb)</div><div class='del'>-		kfree_skb(skb_trimmed);</div><div class='del'>-</div><div class='del'>-	br_multicast_count(br, port, skb, BR_INPUT_SKB_CB(skb)-&gt;igmp,</div><div class='add'>+	br_multicast_count(brmctx-&gt;br, p, skb, BR_INPUT_SKB_CB(skb)-&gt;igmp,</div><div class='ctx'> 			   BR_MCAST_DIR_RX);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static int br_multicast_ipv6_rcv(struct net_bridge *br,</div><div class='del'>-				 struct net_bridge_port *port,</div><div class='add'>+static void br_ip6_multicast_mrd_rcv(struct net_bridge_mcast *brmctx,</div><div class='add'>+				     struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (icmp6_hdr(skb)-&gt;icmp6_type != ICMPV6_MRDISC_ADV)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	br_ip6_multicast_mark_router(brmctx, pmctx);</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 				 struct sk_buff *skb,</div><div class='ctx'> 				 u16 vid)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb_trimmed = NULL;</div><div class='add'>+	struct net_bridge_port *p = pmctx ? pmctx-&gt;port : NULL;</div><div class='ctx'> 	const unsigned char *src;</div><div class='ctx'> 	struct mld_msg *mld;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = ipv6_mc_check_mld(skb, &amp;skb_trimmed);</div><div class='add'>+	err = ipv6_mc_check_mld(skb);</div><div class='ctx'> </div><div class='del'>-	if (err == -ENOMSG) {</div><div class='add'>+	if (err == -ENOMSG || err == -ENODATA) {</div><div class='ctx'> 		if (!ipv6_addr_is_ll_all_nodes(&amp;ipv6_hdr(skb)-&gt;daddr))</div><div class='ctx'> 			BR_INPUT_SKB_CB(skb)-&gt;mrouters_only = 1;</div><div class='add'>+		if (err == -ENODATA &amp;&amp;</div><div class='add'>+		    ipv6_addr_is_all_snoopers(&amp;ipv6_hdr(skb)-&gt;daddr))</div><div class='add'>+			br_ip6_multicast_mrd_rcv(brmctx, pmctx, skb);</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if (err &lt; 0) {</div><div class='del'>-		br_multicast_err_count(br, port, skb-&gt;protocol);</div><div class='add'>+		br_multicast_err_count(brmctx-&gt;br, p, skb-&gt;protocol);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1871,32 +3978,32 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,</div><div class='ctx'> 	case ICMPV6_MGM_REPORT:</div><div class='ctx'> 		src = eth_hdr(skb)-&gt;h_source;</div><div class='ctx'> 		BR_INPUT_SKB_CB(skb)-&gt;mrouters_only = 1;</div><div class='del'>-		err = br_ip6_multicast_add_group(br, port, &amp;mld-&gt;mld_mca, vid,</div><div class='del'>-						 src);</div><div class='add'>+		err = br_ip6_multicast_add_group(brmctx, pmctx, &amp;mld-&gt;mld_mca,</div><div class='add'>+						 vid, src, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICMPV6_MLD2_REPORT:</div><div class='del'>-		err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid);</div><div class='add'>+		err = br_ip6_multicast_mld2_report(brmctx, pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICMPV6_MGM_QUERY:</div><div class='del'>-		err = br_ip6_multicast_query(br, port, skb_trimmed, vid);</div><div class='add'>+		err = br_ip6_multicast_query(brmctx, pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICMPV6_MGM_REDUCTION:</div><div class='ctx'> 		src = eth_hdr(skb)-&gt;h_source;</div><div class='del'>-		br_ip6_multicast_leave_group(br, port, &amp;mld-&gt;mld_mca, vid, src);</div><div class='add'>+		br_ip6_multicast_leave_group(brmctx, pmctx, &amp;mld-&gt;mld_mca, vid,</div><div class='add'>+					     src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_trimmed &amp;&amp; skb_trimmed != skb)</div><div class='del'>-		kfree_skb(skb_trimmed);</div><div class='del'>-</div><div class='del'>-	br_multicast_count(br, port, skb, BR_INPUT_SKB_CB(skb)-&gt;igmp,</div><div class='add'>+	br_multicast_count(brmctx-&gt;br, p, skb, BR_INPUT_SKB_CB(skb)-&gt;igmp,</div><div class='ctx'> 			   BR_MCAST_DIR_RX);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,</div><div class='add'>+int br_multicast_rcv(struct net_bridge_mcast **brmctx,</div><div class='add'>+		     struct net_bridge_mcast_port **pmctx,</div><div class='add'>+		     struct net_bridge_vlan *vlan,</div><div class='ctx'> 		     struct sk_buff *skb, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1904,16 +4011,36 @@ int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,</div><div class='ctx'> 	BR_INPUT_SKB_CB(skb)-&gt;igmp = 0;</div><div class='ctx'> 	BR_INPUT_SKB_CB(skb)-&gt;mrouters_only = 0;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_disabled)</div><div class='add'>+	if (!br_opt_get((*brmctx)-&gt;br, BROPT_MULTICAST_ENABLED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (br_opt_get((*brmctx)-&gt;br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) &amp;&amp; vlan) {</div><div class='add'>+		const struct net_bridge_vlan *masterv;</div><div class='add'>+</div><div class='add'>+		/* the vlan has the master flag set only when transmitting</div><div class='add'>+		 * through the bridge device</div><div class='add'>+		 */</div><div class='add'>+		if (br_vlan_is_master(vlan)) {</div><div class='add'>+			masterv = vlan;</div><div class='add'>+			*brmctx = &amp;vlan-&gt;br_mcast_ctx;</div><div class='add'>+			*pmctx = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			masterv = vlan-&gt;brvlan;</div><div class='add'>+			*brmctx = &amp;vlan-&gt;brvlan-&gt;br_mcast_ctx;</div><div class='add'>+			*pmctx = &amp;vlan-&gt;port_mcast_ctx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(masterv-&gt;priv_flags &amp; BR_VLFLAG_GLOBAL_MCAST_ENABLED))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		ret = br_multicast_ipv4_rcv(br, port, skb, vid);</div><div class='add'>+		ret = br_multicast_ipv4_rcv(*brmctx, *pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case htons(ETH_P_IPV6):</div><div class='del'>-		ret = br_multicast_ipv6_rcv(br, port, skb, vid);</div><div class='add'>+		ret = br_multicast_ipv6_rcv(*brmctx, *pmctx, skb, vid);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1921,291 +4048,670 @@ int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_query_expired(struct net_bridge *br,</div><div class='del'>-				       struct bridge_mcast_own_query *query,</div><div class='del'>-				       struct bridge_mcast_querier *querier)</div><div class='add'>+static void br_multicast_query_expired(struct net_bridge_mcast *brmctx,</div><div class='add'>+				       struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (query-&gt;startup_sent &lt; br-&gt;multicast_startup_query_count)</div><div class='add'>+	spin_lock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (br_multicast_ctx_vlan_disabled(brmctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (query-&gt;startup_sent &lt; brmctx-&gt;multicast_startup_query_count)</div><div class='ctx'> 		query-&gt;startup_sent++;</div><div class='ctx'> </div><div class='del'>-	RCU_INIT_POINTER(querier-&gt;port, NULL);</div><div class='del'>-	br_multicast_send_query(br, NULL, query);</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	br_multicast_send_query(brmctx, NULL, query);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void br_ip4_multicast_query_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, ip4_own_query.timer);</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip4_own_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_query_expired(br, &amp;br-&gt;ip4_own_query, &amp;br-&gt;ip4_querier);</div><div class='add'>+	br_multicast_query_expired(brmctx, &amp;brmctx-&gt;ip4_own_query);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static void br_ip6_multicast_query_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, ip6_own_query.timer);</div><div class='add'>+	struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,</div><div class='add'>+							     ip6_own_query.timer);</div><div class='ctx'> </div><div class='del'>-	br_multicast_query_expired(br, &amp;br-&gt;ip6_own_query, &amp;br-&gt;ip6_querier);</div><div class='add'>+	br_multicast_query_expired(brmctx, &amp;brmctx-&gt;ip6_own_query);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void br_multicast_init(struct net_bridge *br)</div><div class='add'>+static void br_multicast_gc_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = container_of(work, struct net_bridge,</div><div class='add'>+					     mcast_gc_work);</div><div class='add'>+	HLIST_HEAD(deleted_head);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	hlist_move_list(&amp;br-&gt;mcast_gc_list, &amp;deleted_head);</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	br_multicast_gc(&amp;deleted_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_ctx_init(struct net_bridge *br,</div><div class='add'>+			   struct net_bridge_vlan *vlan,</div><div class='add'>+			   struct net_bridge_mcast *brmctx)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;hash_elasticity = 4;</div><div class='del'>-	br-&gt;hash_max = 512;</div><div class='del'>-</div><div class='del'>-	br-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='del'>-	br-&gt;multicast_querier = 0;</div><div class='del'>-	br-&gt;multicast_query_use_ifaddr = 0;</div><div class='del'>-	br-&gt;multicast_last_member_count = 2;</div><div class='del'>-	br-&gt;multicast_startup_query_count = 2;</div><div class='del'>-</div><div class='del'>-	br-&gt;multicast_last_member_interval = HZ;</div><div class='del'>-	br-&gt;multicast_query_response_interval = 10 * HZ;</div><div class='del'>-	br-&gt;multicast_startup_query_interval = 125 * HZ / 4;</div><div class='del'>-	br-&gt;multicast_query_interval = 125 * HZ;</div><div class='del'>-	br-&gt;multicast_querier_interval = 255 * HZ;</div><div class='del'>-	br-&gt;multicast_membership_interval = 260 * HZ;</div><div class='del'>-</div><div class='del'>-	br-&gt;ip4_other_query.delay_time = 0;</div><div class='del'>-	br-&gt;ip4_querier.port = NULL;</div><div class='del'>-	br-&gt;multicast_igmp_version = 2;</div><div class='add'>+	brmctx-&gt;br = br;</div><div class='add'>+	brmctx-&gt;vlan = vlan;</div><div class='add'>+	brmctx-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='add'>+	brmctx-&gt;multicast_last_member_count = 2;</div><div class='add'>+	brmctx-&gt;multicast_startup_query_count = 2;</div><div class='add'>+</div><div class='add'>+	brmctx-&gt;multicast_last_member_interval = HZ;</div><div class='add'>+	brmctx-&gt;multicast_query_response_interval = 10 * HZ;</div><div class='add'>+	brmctx-&gt;multicast_startup_query_interval = 125 * HZ / 4;</div><div class='add'>+	brmctx-&gt;multicast_query_interval = 125 * HZ;</div><div class='add'>+	brmctx-&gt;multicast_querier_interval = 255 * HZ;</div><div class='add'>+	brmctx-&gt;multicast_membership_interval = 260 * HZ;</div><div class='add'>+</div><div class='add'>+	brmctx-&gt;ip4_querier.port_ifidx = 0;</div><div class='add'>+	seqcount_spinlock_init(&amp;brmctx-&gt;ip4_querier.seq, &amp;br-&gt;multicast_lock);</div><div class='add'>+	brmctx-&gt;multicast_igmp_version = 2;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	br-&gt;multicast_mld_version = 1;</div><div class='del'>-	br-&gt;ip6_other_query.delay_time = 0;</div><div class='del'>-	br-&gt;ip6_querier.port = NULL;</div><div class='add'>+	brmctx-&gt;multicast_mld_version = 1;</div><div class='add'>+	brmctx-&gt;ip6_querier.port_ifidx = 0;</div><div class='add'>+	seqcount_spinlock_init(&amp;brmctx-&gt;ip6_querier.seq, &amp;br-&gt;multicast_lock);</div><div class='ctx'> #endif</div><div class='del'>-	br-&gt;has_ipv6_addr = 1;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;br-&gt;multicast_lock);</div><div class='del'>-	timer_setup(&amp;br-&gt;multicast_router_timer,</div><div class='del'>-		    br_multicast_local_router_expired, 0);</div><div class='del'>-	timer_setup(&amp;br-&gt;ip4_other_query.timer,</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip4_mc_router_timer,</div><div class='add'>+		    br_ip4_multicast_local_router_expired, 0);</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip4_other_query.timer,</div><div class='ctx'> 		    br_ip4_multicast_querier_expired, 0);</div><div class='del'>-	timer_setup(&amp;br-&gt;ip4_own_query.timer,</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip4_other_query.delay_timer,</div><div class='add'>+		    br_multicast_query_delay_expired, 0);</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip4_own_query.timer,</div><div class='ctx'> 		    br_ip4_multicast_query_expired, 0);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	timer_setup(&amp;br-&gt;ip6_other_query.timer,</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip6_mc_router_timer,</div><div class='add'>+		    br_ip6_multicast_local_router_expired, 0);</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip6_other_query.timer,</div><div class='ctx'> 		    br_ip6_multicast_querier_expired, 0);</div><div class='del'>-	timer_setup(&amp;br-&gt;ip6_own_query.timer,</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip6_other_query.delay_timer,</div><div class='add'>+		    br_multicast_query_delay_expired, 0);</div><div class='add'>+	timer_setup(&amp;brmctx-&gt;ip6_own_query.timer,</div><div class='ctx'> 		    br_ip6_multicast_query_expired, 0);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __br_multicast_open(struct net_bridge *br,</div><div class='del'>-				struct bridge_mcast_own_query *query)</div><div class='add'>+void br_multicast_ctx_deinit(struct net_bridge_mcast *brmctx)</div><div class='ctx'> {</div><div class='del'>-	query-&gt;startup_sent = 0;</div><div class='add'>+	__br_multicast_stop(brmctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_init(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	br-&gt;hash_max = BR_MULTICAST_DEFAULT_HASH_MAX;</div><div class='add'>+</div><div class='add'>+	br_multicast_ctx_init(br, NULL, &amp;br-&gt;multicast_ctx);</div><div class='add'>+</div><div class='add'>+	br_opt_toggle(br, BROPT_MULTICAST_ENABLED, true);</div><div class='add'>+	br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;br-&gt;multicast_lock);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;br-&gt;mdb_list);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;br-&gt;mcast_gc_list);</div><div class='add'>+	INIT_WORK(&amp;br-&gt;mcast_gc_work, br_multicast_gc_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_ip4_multicast_join_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct in_device *in_dev = in_dev_get(br-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_disabled)</div><div class='add'>+	if (!in_dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;query-&gt;timer, jiffies);</div><div class='add'>+	__ip_mc_inc_group(in_dev, htonl(INADDR_ALLSNOOPERS_GROUP), GFP_ATOMIC);</div><div class='add'>+	in_dev_put(in_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_open(struct net_bridge *br)</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void br_ip6_multicast_join_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr addr;</div><div class='add'>+</div><div class='add'>+	ipv6_addr_set(&amp;addr, htonl(0xff020000), 0, 0, htonl(0x6a));</div><div class='add'>+	ipv6_dev_mc_inc(br-&gt;dev, &amp;addr);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void br_ip6_multicast_join_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void br_multicast_join_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	br_ip4_multicast_join_snoopers(br);</div><div class='add'>+	br_ip6_multicast_join_snoopers(br);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_ip4_multicast_leave_snoopers(struct net_bridge *br)</div><div class='ctx'> {</div><div class='del'>-	__br_multicast_open(br, &amp;br-&gt;ip4_own_query);</div><div class='add'>+	struct in_device *in_dev = in_dev_get(br-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!in_dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__ip_mc_dec_group(in_dev, htonl(INADDR_ALLSNOOPERS_GROUP), GFP_ATOMIC);</div><div class='add'>+	in_dev_put(in_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	__br_multicast_open(br, &amp;br-&gt;ip6_own_query);</div><div class='add'>+static void br_ip6_multicast_leave_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr addr;</div><div class='add'>+</div><div class='add'>+	ipv6_addr_set(&amp;addr, htonl(0xff020000), 0, 0, htonl(0x6a));</div><div class='add'>+	ipv6_dev_mc_dec(br-&gt;dev, &amp;addr);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void br_ip6_multicast_leave_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+void br_multicast_leave_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	br_ip4_multicast_leave_snoopers(br);</div><div class='add'>+	br_ip6_multicast_leave_snoopers(br);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_stop(struct net_bridge *br)</div><div class='add'>+static void __br_multicast_open_query(struct net_bridge *br,</div><div class='add'>+				      struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;br-&gt;multicast_router_timer);</div><div class='del'>-	del_timer_sync(&amp;br-&gt;ip4_other_query.timer);</div><div class='del'>-	del_timer_sync(&amp;br-&gt;ip4_own_query.timer);</div><div class='add'>+	query-&gt;startup_sent = 0;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;query-&gt;timer, jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __br_multicast_open(struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	__br_multicast_open_query(brmctx-&gt;br, &amp;brmctx-&gt;ip4_own_query);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	del_timer_sync(&amp;br-&gt;ip6_other_query.timer);</div><div class='del'>-	del_timer_sync(&amp;br-&gt;ip6_own_query.timer);</div><div class='add'>+	__br_multicast_open_query(brmctx-&gt;br, &amp;brmctx-&gt;ip6_own_query);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_dev_del(struct net_bridge *br)</div><div class='add'>+void br_multicast_open(struct net_bridge *br)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='del'>-	struct net_bridge_mdb_entry *mp;</div><div class='del'>-	struct hlist_node *n;</div><div class='del'>-	u32 ver;</div><div class='del'>-	int i;</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	if (!mdb)</div><div class='del'>-		goto out;</div><div class='add'>+	if (br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {</div><div class='add'>+		struct net_bridge_vlan_group *vg;</div><div class='add'>+		struct net_bridge_vlan *vlan;</div><div class='ctx'> </div><div class='del'>-	br-&gt;mdb = NULL;</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+		if (vg) {</div><div class='add'>+			list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+				struct net_bridge_mcast *brmctx;</div><div class='ctx'> </div><div class='del'>-	ver = mdb-&gt;ver;</div><div class='del'>-	for (i = 0; i &lt; mdb-&gt;max; i++) {</div><div class='del'>-		hlist_for_each_entry_safe(mp, n, &amp;mdb-&gt;mhash[i],</div><div class='del'>-					  hlist[ver]) {</div><div class='del'>-			del_timer(&amp;mp-&gt;timer);</div><div class='del'>-			call_rcu_bh(&amp;mp-&gt;rcu, br_multicast_free_group);</div><div class='add'>+				brmctx = &amp;vlan-&gt;br_mcast_ctx;</div><div class='add'>+				if (br_vlan_is_brentry(vlan) &amp;&amp;</div><div class='add'>+				    !br_multicast_ctx_vlan_disabled(brmctx))</div><div class='add'>+					__br_multicast_open(&amp;vlan-&gt;br_mcast_ctx);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		__br_multicast_open(&amp;br-&gt;multicast_ctx);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (mdb-&gt;old) {</div><div class='add'>+static void __br_multicast_stop(struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip4_other_query.timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip4_other_query.delay_timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip4_own_query.timer);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip6_other_query.timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip6_other_query.delay_timer);</div><div class='add'>+	timer_delete_sync(&amp;brmctx-&gt;ip6_own_query.timer);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_update_vlan_mcast_ctx(struct net_bridge_vlan *v, u8 state)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_VLAN_FILTERING)</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_should_use(v))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_master(v))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br = v-&gt;port-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_state_allowed(state, true))</div><div class='add'>+		br_multicast_enable_port_ctx(&amp;v-&gt;port_mcast_ctx);</div><div class='add'>+</div><div class='add'>+	/* Multicast is not disabled for the vlan when it goes in</div><div class='add'>+	 * blocking state because the timers will expire and stop by</div><div class='add'>+	 * themselves without sending more queries.</div><div class='add'>+	 */</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan, bool on)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	/* it's okay to check for the flag without the multicast lock because it</div><div class='add'>+	 * can only change under RTNL -&gt; multicast_lock, we need the latter to</div><div class='add'>+	 * sync with timers and packets</div><div class='add'>+	 */</div><div class='add'>+	if (on == !!(vlan-&gt;priv_flags &amp; BR_VLFLAG_MCAST_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_master(vlan)) {</div><div class='add'>+		br = vlan-&gt;br;</div><div class='add'>+</div><div class='add'>+		if (!br_vlan_is_brentry(vlan) ||</div><div class='add'>+		    (on &amp;&amp;</div><div class='add'>+		     br_multicast_ctx_vlan_global_disabled(&amp;vlan-&gt;br_mcast_ctx)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+		vlan-&gt;priv_flags ^= BR_VLFLAG_MCAST_ENABLED;</div><div class='ctx'> 		spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-		rcu_barrier_bh();</div><div class='add'>+</div><div class='add'>+		if (on)</div><div class='add'>+			__br_multicast_open(&amp;vlan-&gt;br_mcast_ctx);</div><div class='add'>+		else</div><div class='add'>+			__br_multicast_stop(&amp;vlan-&gt;br_mcast_ctx);</div><div class='add'>+	} else {</div><div class='add'>+		struct net_bridge_mcast *brmctx;</div><div class='add'>+</div><div class='add'>+		brmctx = br_multicast_port_ctx_get_global(&amp;vlan-&gt;port_mcast_ctx);</div><div class='add'>+		if (on &amp;&amp; br_multicast_ctx_vlan_global_disabled(brmctx))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		br = vlan-&gt;port-&gt;br;</div><div class='ctx'> 		spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-		WARN_ON(mdb-&gt;old);</div><div class='add'>+		vlan-&gt;priv_flags ^= BR_VLFLAG_MCAST_ENABLED;</div><div class='add'>+		if (on)</div><div class='add'>+			__br_multicast_enable_port_ctx(&amp;vlan-&gt;port_mcast_ctx);</div><div class='add'>+		else</div><div class='add'>+			__br_multicast_disable_port_ctx(&amp;vlan-&gt;port_mcast_ctx);</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mdb-&gt;old = mdb;</div><div class='del'>-	call_rcu_bh(&amp;mdb-&gt;rcu, br_mdb_free);</div><div class='add'>+static void br_multicast_toggle_vlan(struct net_bridge_vlan *vlan, bool on)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='add'>+	if (WARN_ON_ONCE(!br_vlan_is_master(vlan)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;vlan-&gt;br-&gt;port_list, list) {</div><div class='add'>+		struct net_bridge_vlan *vport;</div><div class='add'>+</div><div class='add'>+		vport = br_vlan_find(nbp_vlan_group(p), vlan-&gt;vid);</div><div class='add'>+		if (!vport)</div><div class='add'>+			continue;</div><div class='add'>+		br_multicast_toggle_one_vlan(vport, on);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_brentry(vlan))</div><div class='add'>+		br_multicast_toggle_one_vlan(vlan, on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_multicast_toggle_vlan_snooping(struct net_bridge *br, bool on,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) == on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (on &amp;&amp; !br_opt_get(br, BROPT_VLAN_ENABLED)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot enable multicast vlan snooping with vlan filtering disabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vg = br_vlan_group(br);</div><div class='add'>+	if (!vg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	br_opt_toggle(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED, on);</div><div class='add'>+</div><div class='add'>+	/* disable/enable non-vlan mcast contexts based on vlan snooping */</div><div class='add'>+	if (on)</div><div class='add'>+		__br_multicast_stop(&amp;br-&gt;multicast_ctx);</div><div class='add'>+	else</div><div class='add'>+		__br_multicast_open(&amp;br-&gt;multicast_ctx);</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		if (on)</div><div class='add'>+			br_multicast_disable_port_ctx(&amp;p-&gt;multicast_ctx);</div><div class='add'>+		else</div><div class='add'>+			br_multicast_enable_port_ctx(&amp;p-&gt;multicast_ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist)</div><div class='add'>+		br_multicast_toggle_vlan(vlan, on);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan, bool on)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* BR_VLFLAG_GLOBAL_MCAST_ENABLED relies on eventual consistency and</div><div class='add'>+	 * requires only RTNL to change</div><div class='add'>+	 */</div><div class='add'>+	if (on == !!(vlan-&gt;priv_flags &amp; BR_VLFLAG_GLOBAL_MCAST_ENABLED))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	vlan-&gt;priv_flags ^= BR_VLFLAG_GLOBAL_MCAST_ENABLED;</div><div class='add'>+	br_multicast_toggle_vlan(vlan, on);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_stop(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {</div><div class='add'>+		struct net_bridge_vlan_group *vg;</div><div class='add'>+		struct net_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+		if (vg) {</div><div class='add'>+			list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+				struct net_bridge_mcast *brmctx;</div><div class='add'>+</div><div class='add'>+				brmctx = &amp;vlan-&gt;br_mcast_ctx;</div><div class='add'>+				if (br_vlan_is_brentry(vlan) &amp;&amp;</div><div class='add'>+				    !br_multicast_ctx_vlan_disabled(brmctx))</div><div class='add'>+					__br_multicast_stop(&amp;vlan-&gt;br_mcast_ctx);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		__br_multicast_stop(&amp;br-&gt;multicast_ctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_dev_del(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+	HLIST_HEAD(deleted_head);</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	hlist_for_each_entry_safe(mp, tmp, &amp;br-&gt;mdb_list, mdb_node)</div><div class='add'>+		br_multicast_del_mdb_entry(mp);</div><div class='add'>+	hlist_move_list(&amp;br-&gt;mcast_gc_list, &amp;deleted_head);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	br_multicast_ctx_deinit(&amp;br-&gt;multicast_ctx);</div><div class='add'>+	br_multicast_gc(&amp;deleted_head);</div><div class='add'>+	cancel_work_sync(&amp;br-&gt;mcast_gc_work);</div><div class='add'>+</div><div class='add'>+	rcu_barrier();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_multicast_set_router(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_multicast_set_router(struct net_bridge_mcast *brmctx, unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_lock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case MDB_RTR_TYPE_DISABLED:</div><div class='ctx'> 	case MDB_RTR_TYPE_PERM:</div><div class='del'>-		br_mc_router_state_change(br, val == MDB_RTR_TYPE_PERM);</div><div class='del'>-		del_timer(&amp;br-&gt;multicast_router_timer);</div><div class='del'>-		br-&gt;multicast_router = val;</div><div class='add'>+		br_mc_router_state_change(brmctx-&gt;br, val == MDB_RTR_TYPE_PERM);</div><div class='add'>+		timer_delete(&amp;brmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		timer_delete(&amp;brmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+#endif</div><div class='add'>+		brmctx-&gt;multicast_router = val;</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MDB_RTR_TYPE_TEMP_QUERY:</div><div class='del'>-		if (br-&gt;multicast_router != MDB_RTR_TYPE_TEMP_QUERY)</div><div class='del'>-			br_mc_router_state_change(br, false);</div><div class='del'>-		br-&gt;multicast_router = val;</div><div class='add'>+		if (brmctx-&gt;multicast_router != MDB_RTR_TYPE_TEMP_QUERY)</div><div class='add'>+			br_mc_router_state_change(brmctx-&gt;br, false);</div><div class='add'>+		brmctx-&gt;multicast_router = val;</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __del_port_router(struct net_bridge_port *p)</div><div class='add'>+static void</div><div class='add'>+br_multicast_rport_del_notify(struct net_bridge_mcast_port *pmctx, bool deleted)</div><div class='ctx'> {</div><div class='del'>-	if (hlist_unhashed(&amp;p-&gt;rlist))</div><div class='add'>+	if (!deleted)</div><div class='ctx'> 		return;</div><div class='del'>-	hlist_del_init_rcu(&amp;p-&gt;rlist);</div><div class='del'>-	br_rtr_notify(p-&gt;br-&gt;dev, p, RTM_DELMDB);</div><div class='del'>-	br_port_mc_router_state_change(p, false);</div><div class='add'>+</div><div class='add'>+	/* For backwards compatibility for now, only notify if there is</div><div class='add'>+	 * no multicast router anymore for both IPv4 and IPv6.</div><div class='add'>+	 */</div><div class='add'>+	if (!hlist_unhashed(&amp;pmctx-&gt;ip4_rlist))</div><div class='add'>+		return;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (!hlist_unhashed(&amp;pmctx-&gt;ip6_rlist))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	br_rtr_notify(pmctx-&gt;port-&gt;br-&gt;dev, pmctx, RTM_DELMDB);</div><div class='add'>+	br_port_mc_router_state_change(pmctx-&gt;port, false);</div><div class='ctx'> </div><div class='ctx'> 	/* don't allow timer refresh */</div><div class='del'>-	if (p-&gt;multicast_router == MDB_RTR_TYPE_TEMP)</div><div class='del'>-		p-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='add'>+	if (pmctx-&gt;multicast_router == MDB_RTR_TYPE_TEMP)</div><div class='add'>+		pmctx-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)</div><div class='add'>+int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				 unsigned long val)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = p-&gt;br;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='add'>+	bool del = false;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (p-&gt;multicast_router == val) {</div><div class='add'>+	brmctx = br_multicast_port_ctx_get_global(pmctx);</div><div class='add'>+	spin_lock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (pmctx-&gt;multicast_router == val) {</div><div class='ctx'> 		/* Refresh the temp router port timer */</div><div class='del'>-		if (p-&gt;multicast_router == MDB_RTR_TYPE_TEMP)</div><div class='del'>-			mod_timer(&amp;p-&gt;multicast_router_timer,</div><div class='del'>-				  now + br-&gt;multicast_querier_interval);</div><div class='add'>+		if (pmctx-&gt;multicast_router == MDB_RTR_TYPE_TEMP) {</div><div class='add'>+			mod_timer(&amp;pmctx-&gt;ip4_mc_router_timer,</div><div class='add'>+				  now + brmctx-&gt;multicast_querier_interval);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			mod_timer(&amp;pmctx-&gt;ip6_mc_router_timer,</div><div class='add'>+				  now + brmctx-&gt;multicast_querier_interval);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case MDB_RTR_TYPE_DISABLED:</div><div class='del'>-		p-&gt;multicast_router = MDB_RTR_TYPE_DISABLED;</div><div class='del'>-		__del_port_router(p);</div><div class='del'>-		del_timer(&amp;p-&gt;multicast_router_timer);</div><div class='add'>+		pmctx-&gt;multicast_router = MDB_RTR_TYPE_DISABLED;</div><div class='add'>+		del |= br_ip4_multicast_rport_del(pmctx);</div><div class='add'>+		timer_delete(&amp;pmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+		del |= br_ip6_multicast_rport_del(pmctx);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		timer_delete(&amp;pmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+#endif</div><div class='add'>+		br_multicast_rport_del_notify(pmctx, del);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MDB_RTR_TYPE_TEMP_QUERY:</div><div class='del'>-		p-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='del'>-		__del_port_router(p);</div><div class='add'>+		pmctx-&gt;multicast_router = MDB_RTR_TYPE_TEMP_QUERY;</div><div class='add'>+		del |= br_ip4_multicast_rport_del(pmctx);</div><div class='add'>+		del |= br_ip6_multicast_rport_del(pmctx);</div><div class='add'>+		br_multicast_rport_del_notify(pmctx, del);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MDB_RTR_TYPE_PERM:</div><div class='del'>-		p-&gt;multicast_router = MDB_RTR_TYPE_PERM;</div><div class='del'>-		del_timer(&amp;p-&gt;multicast_router_timer);</div><div class='del'>-		br_multicast_add_router(br, p);</div><div class='add'>+		pmctx-&gt;multicast_router = MDB_RTR_TYPE_PERM;</div><div class='add'>+		timer_delete(&amp;pmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+		br_ip4_multicast_add_router(brmctx, pmctx);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		timer_delete(&amp;pmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+#endif</div><div class='add'>+		br_ip6_multicast_add_router(brmctx, pmctx);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MDB_RTR_TYPE_TEMP:</div><div class='del'>-		p-&gt;multicast_router = MDB_RTR_TYPE_TEMP;</div><div class='del'>-		br_multicast_mark_router(br, p);</div><div class='add'>+		pmctx-&gt;multicast_router = MDB_RTR_TYPE_TEMP;</div><div class='add'>+		br_ip4_multicast_mark_router(brmctx, pmctx);</div><div class='add'>+		br_ip6_multicast_mark_router(brmctx, pmctx);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_multicast_set_vlan_router(struct net_bridge_vlan *v, u8 mcast_router)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_master(v))</div><div class='add'>+		err = br_multicast_set_router(&amp;v-&gt;br_mcast_ctx, mcast_router);</div><div class='add'>+	else</div><div class='add'>+		err = br_multicast_set_port_router(&amp;v-&gt;port_mcast_ctx,</div><div class='add'>+						   mcast_router);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void br_multicast_start_querier(struct net_bridge *br,</div><div class='add'>+static void br_multicast_start_querier(struct net_bridge_mcast *brmctx,</div><div class='ctx'> 				       struct bridge_mcast_own_query *query)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port *port;</div><div class='ctx'> </div><div class='del'>-	__br_multicast_open(br, query);</div><div class='add'>+	if (!br_multicast_ctx_matches_vlan_snooping(brmctx))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__br_multicast_open_query(brmctx-&gt;br, query);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(port, &amp;br-&gt;port_list, list) {</div><div class='del'>-		if (port-&gt;state == BR_STATE_DISABLED ||</div><div class='del'>-		    port-&gt;state == BR_STATE_BLOCKING)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;brmctx-&gt;br-&gt;port_list, list) {</div><div class='add'>+		struct bridge_mcast_own_query *ip4_own_query;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		struct bridge_mcast_own_query *ip6_own_query;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		if (br_multicast_port_ctx_state_stopped(&amp;port-&gt;multicast_ctx))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (query == &amp;br-&gt;ip4_own_query)</div><div class='del'>-			br_multicast_enable(&amp;port-&gt;ip4_own_query);</div><div class='add'>+		if (br_multicast_ctx_is_vlan(brmctx)) {</div><div class='add'>+			struct net_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+			vlan = br_vlan_find(nbp_vlan_group_rcu(port),</div><div class='add'>+					    brmctx-&gt;vlan-&gt;vid);</div><div class='add'>+			if (!vlan ||</div><div class='add'>+			    br_multicast_port_ctx_state_stopped(&amp;vlan-&gt;port_mcast_ctx))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ip4_own_query = &amp;vlan-&gt;port_mcast_ctx.ip4_own_query;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			ip6_own_query = &amp;vlan-&gt;port_mcast_ctx.ip6_own_query;</div><div class='add'>+#endif</div><div class='add'>+		} else {</div><div class='add'>+			ip4_own_query = &amp;port-&gt;multicast_ctx.ip4_own_query;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			ip6_own_query = &amp;port-&gt;multicast_ctx.ip6_own_query;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (query == &amp;brmctx-&gt;ip4_own_query)</div><div class='add'>+			br_multicast_enable(ip4_own_query);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 		else</div><div class='del'>-			br_multicast_enable(&amp;port-&gt;ip6_own_query);</div><div class='add'>+			br_multicast_enable(ip6_own_query);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_multicast_toggle(struct net_bridge *br, unsigned long val)</div><div class='add'>+static void br_multicast_del_grps(struct net_bridge *br)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='ctx'> 	struct net_bridge_port *port;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;br-&gt;port_list, list)</div><div class='add'>+		__br_multicast_disable_port_ctx(&amp;port-&gt;multicast_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_multicast_toggle(struct net_bridge *br, unsigned long val,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *port;</div><div class='add'>+	bool change_snoopers = false;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (br-&gt;multicast_disabled == !val)</div><div class='add'>+	if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	br_mc_disabled_update(br-&gt;dev, !val);</div><div class='del'>-	br-&gt;multicast_disabled = !val;</div><div class='del'>-	if (br-&gt;multicast_disabled)</div><div class='add'>+	err = br_mc_disabled_update(br-&gt;dev, val, extack);</div><div class='add'>+	if (err == -EOPNOTSUPP)</div><div class='add'>+		err = 0;</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(br-&gt;dev))</div><div class='add'>+	br_opt_toggle(br, BROPT_MULTICAST_ENABLED, !!val);</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_ENABLED)) {</div><div class='add'>+		change_snoopers = true;</div><div class='add'>+		br_multicast_del_grps(br);</div><div class='ctx'> 		goto unlock;</div><div class='del'>-</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	if (mdb) {</div><div class='del'>-		if (mdb-&gt;old) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-rollback:</div><div class='del'>-			br-&gt;multicast_disabled = !!val;</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = br_mdb_rehash(&amp;br-&gt;mdb, mdb-&gt;max,</div><div class='del'>-				    br-&gt;hash_elasticity);</div><div class='del'>-		if (err)</div><div class='del'>-			goto rollback;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!netif_running(br-&gt;dev))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='ctx'> 	br_multicast_open(br);</div><div class='ctx'> 	list_for_each_entry(port, &amp;br-&gt;port_list, list)</div><div class='del'>-		__br_multicast_enable_port(port);</div><div class='add'>+		__br_multicast_enable_port_ctx(&amp;port-&gt;multicast_ctx);</div><div class='add'>+</div><div class='add'>+	change_snoopers = true;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='add'>+	/* br_multicast_join_snoopers has the potential to cause</div><div class='add'>+	 * an MLD Report/Leave to be delivered to br_multicast_rcv,</div><div class='add'>+	 * which would in turn call br_multicast_add_group, which would</div><div class='add'>+	 * attempt to acquire multicast_lock. This function should be</div><div class='add'>+	 * called after the lock has been released to avoid deadlocks on</div><div class='add'>+	 * multicast_lock.</div><div class='add'>+	 *</div><div class='add'>+	 * br_multicast_leave_snoopers does not have the problem since</div><div class='add'>+	 * br_multicast_rcv first checks BROPT_MULTICAST_ENABLED, and</div><div class='add'>+	 * returns without calling br_multicast_ipv4/6_rcv if it's not</div><div class='add'>+	 * enabled. Moved both functions out just for symmetry.</div><div class='add'>+	 */</div><div class='add'>+	if (change_snoopers) {</div><div class='add'>+		if (br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+			br_multicast_join_snoopers(br);</div><div class='add'>+		else</div><div class='add'>+			br_multicast_leave_snoopers(br);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2213,7 +4719,7 @@ bool br_multicast_enabled(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return !br-&gt;multicast_disabled;</div><div class='add'>+	return !!br_opt_get(br, BROPT_MULTICAST_ENABLED);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_multicast_enabled);</div><div class='ctx'> </div><div class='hunk'>@@ -2223,86 +4729,50 @@ bool br_multicast_router(const struct net_device *dev)</div><div class='ctx'> 	bool is_router;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	is_router = br_multicast_is_router(br);</div><div class='add'>+	is_router = br_multicast_is_router(&amp;br-&gt;multicast_ctx, NULL);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='ctx'> 	return is_router;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_multicast_router);</div><div class='ctx'> </div><div class='del'>-int br_multicast_set_querier(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long max_delay;</div><div class='ctx'> </div><div class='ctx'> 	val = !!val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (br-&gt;multicast_querier == val)</div><div class='add'>+	spin_lock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	if (brmctx-&gt;multicast_querier == val)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	br-&gt;multicast_querier = val;</div><div class='add'>+	WRITE_ONCE(brmctx-&gt;multicast_querier, val);</div><div class='ctx'> 	if (!val)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	max_delay = br-&gt;multicast_query_response_interval;</div><div class='add'>+	max_delay = brmctx-&gt;multicast_query_response_interval;</div><div class='ctx'> </div><div class='del'>-	if (!timer_pending(&amp;br-&gt;ip4_other_query.timer))</div><div class='del'>-		br-&gt;ip4_other_query.delay_time = jiffies + max_delay;</div><div class='add'>+	if (!timer_pending(&amp;brmctx-&gt;ip4_other_query.timer))</div><div class='add'>+		mod_timer(&amp;brmctx-&gt;ip4_other_query.delay_timer,</div><div class='add'>+			  jiffies + max_delay);</div><div class='ctx'> </div><div class='del'>-	br_multicast_start_querier(br, &amp;br-&gt;ip4_own_query);</div><div class='add'>+	br_multicast_start_querier(brmctx, &amp;brmctx-&gt;ip4_own_query);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	if (!timer_pending(&amp;br-&gt;ip6_other_query.timer))</div><div class='del'>-		br-&gt;ip6_other_query.delay_time = jiffies + max_delay;</div><div class='add'>+	if (!timer_pending(&amp;brmctx-&gt;ip6_other_query.timer))</div><div class='add'>+		mod_timer(&amp;brmctx-&gt;ip6_other_query.delay_timer,</div><div class='add'>+			  jiffies + max_delay);</div><div class='ctx'> </div><div class='del'>-	br_multicast_start_querier(br, &amp;br-&gt;ip6_own_query);</div><div class='add'>+	br_multicast_start_querier(brmctx, &amp;brmctx-&gt;ip6_own_query);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_unlock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	u32 old;</div><div class='del'>-	struct net_bridge_mdb_htable *mdb;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	if (!is_power_of_2(val))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	mdb = mlock_dereference(br-&gt;mdb, br);</div><div class='del'>-	if (mdb &amp;&amp; val &lt; mdb-&gt;size)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-	old = br-&gt;hash_max;</div><div class='del'>-	br-&gt;hash_max = val;</div><div class='del'>-</div><div class='del'>-	if (mdb) {</div><div class='del'>-		if (mdb-&gt;old) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-rollback:</div><div class='del'>-			br-&gt;hash_max = old;</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = br_mdb_rehash(&amp;br-&gt;mdb, br-&gt;hash_max,</div><div class='del'>-				    br-&gt;hash_elasticity);</div><div class='del'>-		if (err)</div><div class='del'>-			goto rollback;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_multicast_set_igmp_version(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	/* Currently we support only version 2 and 3 */</div><div class='ctx'> 	switch (val) {</div><div class='hunk'>@@ -2313,15 +4783,16 @@ int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	br-&gt;multicast_igmp_version = val;</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_lock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	brmctx-&gt;multicast_igmp_version = val;</div><div class='add'>+	spin_unlock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_multicast_set_mld_version(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	/* Currently we support version 1 and 2 */</div><div class='ctx'> 	switch (val) {</div><div class='hunk'>@@ -2332,14 +4803,62 @@ int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='del'>-	br-&gt;multicast_mld_version = val;</div><div class='del'>-	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	spin_lock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='add'>+	brmctx-&gt;multicast_mld_version = val;</div><div class='add'>+	spin_unlock_bh(&amp;brmctx-&gt;br-&gt;multicast_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void br_multicast_set_query_intvl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long intvl_jiffies = clock_t_to_jiffies(val);</div><div class='add'>+</div><div class='add'>+	if (intvl_jiffies &lt; BR_MULTICAST_QUERY_INTVL_MIN) {</div><div class='add'>+		br_info(brmctx-&gt;br,</div><div class='add'>+			"trying to set multicast query interval below minimum, setting to %lu (%ums)\n",</div><div class='add'>+			jiffies_to_clock_t(BR_MULTICAST_QUERY_INTVL_MIN),</div><div class='add'>+			jiffies_to_msecs(BR_MULTICAST_QUERY_INTVL_MIN));</div><div class='add'>+		intvl_jiffies = BR_MULTICAST_QUERY_INTVL_MIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intvl_jiffies &gt; BR_MULTICAST_QUERY_INTVL_MAX) {</div><div class='add'>+		br_info(brmctx-&gt;br,</div><div class='add'>+			"trying to set multicast query interval above maximum, setting to %lu (%ums)\n",</div><div class='add'>+			jiffies_to_clock_t(BR_MULTICAST_QUERY_INTVL_MAX),</div><div class='add'>+			jiffies_to_msecs(BR_MULTICAST_QUERY_INTVL_MAX));</div><div class='add'>+		intvl_jiffies = BR_MULTICAST_QUERY_INTVL_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brmctx-&gt;multicast_query_interval = intvl_jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_set_startup_query_intvl(struct net_bridge_mcast *brmctx,</div><div class='add'>+					  unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long intvl_jiffies = clock_t_to_jiffies(val);</div><div class='add'>+</div><div class='add'>+	if (intvl_jiffies &lt; BR_MULTICAST_STARTUP_QUERY_INTVL_MIN) {</div><div class='add'>+		br_info(brmctx-&gt;br,</div><div class='add'>+			"trying to set multicast startup query interval below minimum, setting to %lu (%ums)\n",</div><div class='add'>+			jiffies_to_clock_t(BR_MULTICAST_STARTUP_QUERY_INTVL_MIN),</div><div class='add'>+			jiffies_to_msecs(BR_MULTICAST_STARTUP_QUERY_INTVL_MIN));</div><div class='add'>+		intvl_jiffies = BR_MULTICAST_STARTUP_QUERY_INTVL_MIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intvl_jiffies &gt; BR_MULTICAST_STARTUP_QUERY_INTVL_MAX) {</div><div class='add'>+		br_info(brmctx-&gt;br,</div><div class='add'>+			"trying to set multicast startup query interval above maximum, setting to %lu (%ums)\n",</div><div class='add'>+			jiffies_to_clock_t(BR_MULTICAST_STARTUP_QUERY_INTVL_MAX),</div><div class='add'>+			jiffies_to_msecs(BR_MULTICAST_STARTUP_QUERY_INTVL_MAX));</div><div class='add'>+		intvl_jiffies = BR_MULTICAST_STARTUP_QUERY_INTVL_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brmctx-&gt;multicast_startup_query_interval = intvl_jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * br_multicast_list_adjacent - Returns snooped multicast addresses</div><div class='ctx'>  * @dev:	The bridge port adjacent to which to retrieve addresses</div><div class='hunk'>@@ -2367,7 +4886,7 @@ int br_multicast_list_adjacent(struct net_device *dev,</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (!br_ip_list || !br_port_exists(dev))</div><div class='add'>+	if (!br_ip_list || !netif_is_bridge_port(dev))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	port = br_port_get_rcu(dev);</div><div class='hunk'>@@ -2385,7 +4904,7 @@ int br_multicast_list_adjacent(struct net_device *dev,</div><div class='ctx'> 			if (!entry)</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> </div><div class='del'>-			entry-&gt;addr = group-&gt;addr;</div><div class='add'>+			entry-&gt;addr = group-&gt;key.addr;</div><div class='ctx'> 			list_add(&amp;entry-&gt;list, br_ip_list);</div><div class='ctx'> 			count++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2414,7 +4933,7 @@ bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto)</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (!br_port_exists(dev))</div><div class='add'>+	if (!netif_is_bridge_port(dev))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	port = br_port_get_rcu(dev);</div><div class='hunk'>@@ -2426,7 +4945,7 @@ bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto)</div><div class='ctx'> 	memset(&amp;eth, 0, sizeof(eth));</div><div class='ctx'> 	eth.h_proto = htons(proto);</div><div class='ctx'> </div><div class='del'>-	ret = br_multicast_querier_exists(br, &amp;eth);</div><div class='add'>+	ret = br_multicast_querier_exists(&amp;br-&gt;multicast_ctx, &amp;eth, NULL);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -2445,12 +4964,14 @@ EXPORT_SYMBOL_GPL(br_multicast_has_querier_anywhere);</div><div class='ctx'>  */</div><div class='ctx'> bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)</div><div class='ctx'> {</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	struct net_bridge_port *port;</div><div class='ctx'> 	bool ret = false;</div><div class='add'>+	int port_ifidx;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (!br_port_exists(dev))</div><div class='add'>+	if (!netif_is_bridge_port(dev))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	port = br_port_get_rcu(dev);</div><div class='hunk'>@@ -2458,17 +4979,20 @@ bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	br = port-&gt;br;</div><div class='add'>+	brmctx = &amp;br-&gt;multicast_ctx;</div><div class='ctx'> </div><div class='ctx'> 	switch (proto) {</div><div class='ctx'> 	case ETH_P_IP:</div><div class='del'>-		if (!timer_pending(&amp;br-&gt;ip4_other_query.timer) ||</div><div class='del'>-		    rcu_dereference(br-&gt;ip4_querier.port) == port)</div><div class='add'>+		port_ifidx = brmctx-&gt;ip4_querier.port_ifidx;</div><div class='add'>+		if (!timer_pending(&amp;brmctx-&gt;ip4_other_query.timer) ||</div><div class='add'>+		    port_ifidx == port-&gt;dev-&gt;ifindex)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		break;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case ETH_P_IPV6:</div><div class='del'>-		if (!timer_pending(&amp;br-&gt;ip6_other_query.timer) ||</div><div class='del'>-		    rcu_dereference(br-&gt;ip6_querier.port) == port)</div><div class='add'>+		port_ifidx = brmctx-&gt;ip6_querier.port_ifidx;</div><div class='add'>+		if (!timer_pending(&amp;brmctx-&gt;ip6_other_query.timer) ||</div><div class='add'>+		    port_ifidx == port-&gt;dev-&gt;ifindex)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2483,6 +5007,64 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_multicast_has_querier_adjacent);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * br_multicast_has_router_adjacent - Checks for a router behind a bridge port</div><div class='add'>+ * @dev: The bridge port adjacent to which to check for a multicast router</div><div class='add'>+ * @proto: The protocol family to check for: IGMP -&gt; ETH_P_IP, MLD -&gt; ETH_P_IPV6</div><div class='add'>+ *</div><div class='add'>+ * Checks whether the given interface has a bridge on top and if so returns</div><div class='add'>+ * true if a multicast router is behind one of the other ports of this</div><div class='add'>+ * bridge. Otherwise returns false.</div><div class='add'>+ */</div><div class='add'>+bool br_multicast_has_router_adjacent(struct net_device *dev, int proto)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *pmctx;</div><div class='add'>+	struct net_bridge_mcast *brmctx;</div><div class='add'>+	struct net_bridge_port *port;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	port = br_port_get_check_rcu(dev);</div><div class='add'>+	if (!port)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	brmctx = &amp;port-&gt;br-&gt;multicast_ctx;</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case ETH_P_IP:</div><div class='add'>+		hlist_for_each_entry_rcu(pmctx, &amp;brmctx-&gt;ip4_mc_router_list,</div><div class='add'>+					 ip4_rlist) {</div><div class='add'>+			if (pmctx-&gt;port == port)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ret = true;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case ETH_P_IPV6:</div><div class='add'>+		hlist_for_each_entry_rcu(pmctx, &amp;brmctx-&gt;ip6_mc_router_list,</div><div class='add'>+					 ip6_rlist) {</div><div class='add'>+			if (pmctx-&gt;port == port)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ret = true;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		/* when compiled without IPv6 support, be conservative and</div><div class='add'>+		 * always assume presence of an IPv6 multicast router</div><div class='add'>+		 */</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_multicast_has_router_adjacent);</div><div class='add'>+</div><div class='ctx'> static void br_mcast_stats_add(struct bridge_mcast_stats __percpu *stats,</div><div class='ctx'> 			       const struct sk_buff *skb, u8 type, u8 dir)</div><div class='ctx'> {</div><div class='hunk'>@@ -2554,13 +5136,14 @@ static void br_mcast_stats_add(struct bridge_mcast_stats __percpu *stats,</div><div class='ctx'> 	u64_stats_update_end(&amp;pstats-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,</div><div class='add'>+void br_multicast_count(struct net_bridge *br,</div><div class='add'>+			const struct net_bridge_port *p,</div><div class='ctx'> 			const struct sk_buff *skb, u8 type, u8 dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct bridge_mcast_stats __percpu *stats;</div><div class='ctx'> </div><div class='ctx'> 	/* if multicast_disabled is true then igmp type can't be set */</div><div class='del'>-	if (!type || !br-&gt;multicast_stats_enabled)</div><div class='add'>+	if (!type || !br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (p)</div><div class='hunk'>@@ -2587,7 +5170,8 @@ void br_multicast_uninit_stats(struct net_bridge *br)</div><div class='ctx'> 	free_percpu(br-&gt;mcast_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mcast_stats_add_dir(u64 *dst, u64 *src)</div><div class='add'>+/* noinline for https://llvm.org/pr45802#c9 */</div><div class='add'>+static noinline_for_stack void mcast_stats_add_dir(u64 *dst, u64 *src)</div><div class='ctx'> {</div><div class='ctx'> 	dst[BR_MCAST_DIR_RX] += src[BR_MCAST_DIR_RX];</div><div class='ctx'> 	dst[BR_MCAST_DIR_TX] += src[BR_MCAST_DIR_TX];</div><div class='hunk'>@@ -2616,9 +5200,9 @@ void br_multicast_get_stats(const struct net_bridge *br,</div><div class='ctx'> 		unsigned int start;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='ctx'> 			memcpy(&amp;temp, &amp;cpu_stats-&gt;mstats, sizeof(temp));</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> 		mcast_stats_add_dir(tdst.igmp_v1queries, temp.igmp_v1queries);</div><div class='ctx'> 		mcast_stats_add_dir(tdst.igmp_v2queries, temp.igmp_v2queries);</div><div class='hunk'>@@ -2638,3 +5222,26 @@ void br_multicast_get_stats(const struct net_bridge *br,</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(dest, &amp;tdst, sizeof(*dest));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int br_mdb_hash_init(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;br-&gt;sg_port_tbl, &amp;br_sg_port_rht_params);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;br-&gt;mdb_hash_tbl, &amp;br_mdb_rht_params);</div><div class='add'>+	if (err) {</div><div class='add'>+		rhashtable_destroy(&amp;br-&gt;sg_port_tbl);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_mdb_hash_fini(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	rhashtable_destroy(&amp;br-&gt;sg_port_tbl);</div><div class='add'>+	rhashtable_destroy(&amp;br-&gt;mdb_hash_tbl);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_multicast_eht.c b/net/bridge/br_multicast_eht.c<br/>new file mode 100644<br/>index 000000000000..adfd74102019<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_multicast_eht.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_multicast_eht.c</a></div><div class='hunk'>@@ -0,0 +1,822 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+// Copyright (c) 2020, Nikolay Aleksandrov &lt;nikolay@nvidia.com&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/igmp.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/jhash.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netfilter_bridge.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/mroute.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#include &lt;linux/icmpv6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/mld.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include "br_private_mcast_eht.h"</div><div class='add'>+</div><div class='add'>+static bool br_multicast_del_eht_set_entry(struct net_bridge_port_group *pg,</div><div class='add'>+					   union net_bridge_eht_addr *src_addr,</div><div class='add'>+					   union net_bridge_eht_addr *h_addr);</div><div class='add'>+static void br_multicast_create_eht_set_entry(const struct net_bridge_mcast *brmctx,</div><div class='add'>+					      struct net_bridge_port_group *pg,</div><div class='add'>+					      union net_bridge_eht_addr *src_addr,</div><div class='add'>+					      union net_bridge_eht_addr *h_addr,</div><div class='add'>+					      int filter_mode,</div><div class='add'>+					      bool allow_zero_src);</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_host *</div><div class='add'>+br_multicast_eht_host_lookup(struct net_bridge_port_group *pg,</div><div class='add'>+			     union net_bridge_eht_addr *h_addr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = pg-&gt;eht_host_tree.rb_node;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		struct net_bridge_group_eht_host *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(node, struct net_bridge_group_eht_host,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(h_addr, &amp;this-&gt;h_addr, sizeof(*h_addr));</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_multicast_eht_host_filter_mode(struct net_bridge_port_group *pg,</div><div class='add'>+					     union net_bridge_eht_addr *h_addr)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host;</div><div class='add'>+</div><div class='add'>+	eht_host = br_multicast_eht_host_lookup(pg, h_addr);</div><div class='add'>+	if (!eht_host)</div><div class='add'>+		return MCAST_INCLUDE;</div><div class='add'>+</div><div class='add'>+	return eht_host-&gt;filter_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_set_entry *</div><div class='add'>+br_multicast_eht_set_entry_lookup(struct net_bridge_group_eht_set *eht_set,</div><div class='add'>+				  union net_bridge_eht_addr *h_addr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = eht_set-&gt;entry_tree.rb_node;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		struct net_bridge_group_eht_set_entry *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(node, struct net_bridge_group_eht_set_entry,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(h_addr, &amp;this-&gt;h_addr, sizeof(*h_addr));</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_set *</div><div class='add'>+br_multicast_eht_set_lookup(struct net_bridge_port_group *pg,</div><div class='add'>+			    union net_bridge_eht_addr *src_addr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = pg-&gt;eht_set_tree.rb_node;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		struct net_bridge_group_eht_set *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(node, struct net_bridge_group_eht_set,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(src_addr, &amp;this-&gt;src_addr, sizeof(*src_addr));</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __eht_destroy_host(struct net_bridge_group_eht_host *eht_host)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!hlist_empty(&amp;eht_host-&gt;set_entries));</div><div class='add'>+</div><div class='add'>+	br_multicast_eht_hosts_dec(eht_host-&gt;pg);</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;eht_host-&gt;rb_node, &amp;eht_host-&gt;pg-&gt;eht_host_tree);</div><div class='add'>+	RB_CLEAR_NODE(&amp;eht_host-&gt;rb_node);</div><div class='add'>+	kfree(eht_host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_destroy_eht_set_entry(struct net_bridge_mcast_gc *gc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+</div><div class='add'>+	set_h = container_of(gc, struct net_bridge_group_eht_set_entry, mcast_gc);</div><div class='add'>+	WARN_ON(!RB_EMPTY_NODE(&amp;set_h-&gt;rb_node));</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;set_h-&gt;timer);</div><div class='add'>+	kfree(set_h);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_destroy_eht_set(struct net_bridge_mcast_gc *gc)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+</div><div class='add'>+	eht_set = container_of(gc, struct net_bridge_group_eht_set, mcast_gc);</div><div class='add'>+	WARN_ON(!RB_EMPTY_NODE(&amp;eht_set-&gt;rb_node));</div><div class='add'>+	WARN_ON(!RB_EMPTY_ROOT(&amp;eht_set-&gt;entry_tree));</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;eht_set-&gt;timer);</div><div class='add'>+	kfree(eht_set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __eht_del_set_entry(struct net_bridge_group_eht_set_entry *set_h)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host = set_h-&gt;h_parent;</div><div class='add'>+	union net_bridge_eht_addr zero_addr;</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;set_h-&gt;rb_node, &amp;set_h-&gt;eht_set-&gt;entry_tree);</div><div class='add'>+	RB_CLEAR_NODE(&amp;set_h-&gt;rb_node);</div><div class='add'>+	hlist_del_init(&amp;set_h-&gt;host_list);</div><div class='add'>+	memset(&amp;zero_addr, 0, sizeof(zero_addr));</div><div class='add'>+	if (memcmp(&amp;set_h-&gt;h_addr, &amp;zero_addr, sizeof(zero_addr)))</div><div class='add'>+		eht_host-&gt;num_entries--;</div><div class='add'>+	hlist_add_head(&amp;set_h-&gt;mcast_gc.gc_node, &amp;set_h-&gt;br-&gt;mcast_gc_list);</div><div class='add'>+	queue_work(system_long_wq, &amp;set_h-&gt;br-&gt;mcast_gc_work);</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;eht_host-&gt;set_entries))</div><div class='add'>+		__eht_destroy_host(eht_host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_del_eht_set(struct net_bridge_group_eht_set *eht_set)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	while ((node = rb_first(&amp;eht_set-&gt;entry_tree))) {</div><div class='add'>+		set_h = rb_entry(node, struct net_bridge_group_eht_set_entry,</div><div class='add'>+				 rb_node);</div><div class='add'>+		__eht_del_set_entry(set_h);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;eht_set-&gt;rb_node, &amp;eht_set-&gt;pg-&gt;eht_set_tree);</div><div class='add'>+	RB_CLEAR_NODE(&amp;eht_set-&gt;rb_node);</div><div class='add'>+	hlist_add_head(&amp;eht_set-&gt;mcast_gc.gc_node, &amp;eht_set-&gt;br-&gt;mcast_gc_list);</div><div class='add'>+	queue_work(system_long_wq, &amp;eht_set-&gt;br-&gt;mcast_gc_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_multicast_eht_clean_sets(struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	while ((node = rb_first(&amp;pg-&gt;eht_set_tree))) {</div><div class='add'>+		eht_set = rb_entry(node, struct net_bridge_group_eht_set,</div><div class='add'>+				   rb_node);</div><div class='add'>+		br_multicast_del_eht_set(eht_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_eht_set_entry_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h = timer_container_of(set_h,</div><div class='add'>+									  t,</div><div class='add'>+									  timer);</div><div class='add'>+	struct net_bridge *br = set_h-&gt;br;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (RB_EMPTY_NODE(&amp;set_h-&gt;rb_node) || timer_pending(&amp;set_h-&gt;timer))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	br_multicast_del_eht_set_entry(set_h-&gt;eht_set-&gt;pg,</div><div class='add'>+				       &amp;set_h-&gt;eht_set-&gt;src_addr,</div><div class='add'>+				       &amp;set_h-&gt;h_addr);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_eht_set_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set = timer_container_of(eht_set,</div><div class='add'>+								      t,</div><div class='add'>+								      timer);</div><div class='add'>+	struct net_bridge *br = eht_set-&gt;br;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;br-&gt;multicast_lock);</div><div class='add'>+	if (RB_EMPTY_NODE(&amp;eht_set-&gt;rb_node) || timer_pending(&amp;eht_set-&gt;timer))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	br_multicast_del_eht_set(eht_set);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;br-&gt;multicast_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_host *</div><div class='add'>+__eht_lookup_create_host(struct net_bridge_port_group *pg,</div><div class='add'>+			 union net_bridge_eht_addr *h_addr,</div><div class='add'>+			 unsigned char filter_mode)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **link = &amp;pg-&gt;eht_host_tree.rb_node, *parent = NULL;</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host;</div><div class='add'>+</div><div class='add'>+	while (*link) {</div><div class='add'>+		struct net_bridge_group_eht_host *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(*link, struct net_bridge_group_eht_host,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(h_addr, &amp;this-&gt;h_addr, sizeof(*h_addr));</div><div class='add'>+		parent = *link;</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_left);</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_right);</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_hosts_over_limit(pg))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	eht_host = kzalloc(sizeof(*eht_host), GFP_ATOMIC);</div><div class='add'>+	if (!eht_host)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;eht_host-&gt;h_addr, h_addr, sizeof(*h_addr));</div><div class='add'>+	INIT_HLIST_HEAD(&amp;eht_host-&gt;set_entries);</div><div class='add'>+	eht_host-&gt;pg = pg;</div><div class='add'>+	eht_host-&gt;filter_mode = filter_mode;</div><div class='add'>+</div><div class='add'>+	rb_link_node(&amp;eht_host-&gt;rb_node, parent, link);</div><div class='add'>+	rb_insert_color(&amp;eht_host-&gt;rb_node, &amp;pg-&gt;eht_host_tree);</div><div class='add'>+</div><div class='add'>+	br_multicast_eht_hosts_inc(pg);</div><div class='add'>+</div><div class='add'>+	return eht_host;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_set_entry *</div><div class='add'>+__eht_lookup_create_set_entry(struct net_bridge *br,</div><div class='add'>+			      struct net_bridge_group_eht_set *eht_set,</div><div class='add'>+			      struct net_bridge_group_eht_host *eht_host,</div><div class='add'>+			      bool allow_zero_src)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **link = &amp;eht_set-&gt;entry_tree.rb_node, *parent = NULL;</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+</div><div class='add'>+	while (*link) {</div><div class='add'>+		struct net_bridge_group_eht_set_entry *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(*link, struct net_bridge_group_eht_set_entry,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(&amp;eht_host-&gt;h_addr, &amp;this-&gt;h_addr,</div><div class='add'>+				sizeof(union net_bridge_eht_addr));</div><div class='add'>+		parent = *link;</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_left);</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_right);</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* always allow auto-created zero entry */</div><div class='add'>+	if (!allow_zero_src &amp;&amp; eht_host-&gt;num_entries &gt;= PG_SRC_ENT_LIMIT)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	set_h = kzalloc(sizeof(*set_h), GFP_ATOMIC);</div><div class='add'>+	if (!set_h)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;set_h-&gt;h_addr, &amp;eht_host-&gt;h_addr,</div><div class='add'>+	       sizeof(union net_bridge_eht_addr));</div><div class='add'>+	set_h-&gt;mcast_gc.destroy = br_multicast_destroy_eht_set_entry;</div><div class='add'>+	set_h-&gt;eht_set = eht_set;</div><div class='add'>+	set_h-&gt;h_parent = eht_host;</div><div class='add'>+	set_h-&gt;br = br;</div><div class='add'>+	timer_setup(&amp;set_h-&gt;timer, br_multicast_eht_set_entry_expired, 0);</div><div class='add'>+</div><div class='add'>+	hlist_add_head(&amp;set_h-&gt;host_list, &amp;eht_host-&gt;set_entries);</div><div class='add'>+	rb_link_node(&amp;set_h-&gt;rb_node, parent, link);</div><div class='add'>+	rb_insert_color(&amp;set_h-&gt;rb_node, &amp;eht_set-&gt;entry_tree);</div><div class='add'>+	/* we must not count the auto-created zero entry otherwise we won't be</div><div class='add'>+	 * able to track the full list of PG_SRC_ENT_LIMIT entries</div><div class='add'>+	 */</div><div class='add'>+	if (!allow_zero_src)</div><div class='add'>+		eht_host-&gt;num_entries++;</div><div class='add'>+</div><div class='add'>+	return set_h;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_bridge_group_eht_set *</div><div class='add'>+__eht_lookup_create_set(struct net_bridge_port_group *pg,</div><div class='add'>+			union net_bridge_eht_addr *src_addr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **link = &amp;pg-&gt;eht_set_tree.rb_node, *parent = NULL;</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+</div><div class='add'>+	while (*link) {</div><div class='add'>+		struct net_bridge_group_eht_set *this;</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		this = rb_entry(*link, struct net_bridge_group_eht_set,</div><div class='add'>+				rb_node);</div><div class='add'>+		result = memcmp(src_addr, &amp;this-&gt;src_addr, sizeof(*src_addr));</div><div class='add'>+		parent = *link;</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_left);</div><div class='add'>+		else if (result &gt; 0)</div><div class='add'>+			link = &amp;((*link)-&gt;rb_right);</div><div class='add'>+		else</div><div class='add'>+			return this;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eht_set = kzalloc(sizeof(*eht_set), GFP_ATOMIC);</div><div class='add'>+	if (!eht_set)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;eht_set-&gt;src_addr, src_addr, sizeof(*src_addr));</div><div class='add'>+	eht_set-&gt;mcast_gc.destroy = br_multicast_destroy_eht_set;</div><div class='add'>+	eht_set-&gt;pg = pg;</div><div class='add'>+	eht_set-&gt;br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	eht_set-&gt;entry_tree = RB_ROOT;</div><div class='add'>+	timer_setup(&amp;eht_set-&gt;timer, br_multicast_eht_set_expired, 0);</div><div class='add'>+</div><div class='add'>+	rb_link_node(&amp;eht_set-&gt;rb_node, parent, link);</div><div class='add'>+	rb_insert_color(&amp;eht_set-&gt;rb_node, &amp;pg-&gt;eht_set_tree);</div><div class='add'>+</div><div class='add'>+	return eht_set;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_ip_src_to_eht_addr(const struct br_ip *src,</div><div class='add'>+					    union net_bridge_eht_addr *dest)</div><div class='add'>+{</div><div class='add'>+	switch (src-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		dest-&gt;ip4 = src-&gt;src.ip4;</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		memcpy(&amp;dest-&gt;ip6, &amp;src-&gt;src.ip6, sizeof(struct in6_addr));</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_eht_convert_host_filter_mode(const struct net_bridge_mcast *brmctx,</div><div class='add'>+					    struct net_bridge_port_group *pg,</div><div class='add'>+					    union net_bridge_eht_addr *h_addr,</div><div class='add'>+					    int filter_mode)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host;</div><div class='add'>+	union net_bridge_eht_addr zero_addr;</div><div class='add'>+</div><div class='add'>+	eht_host = br_multicast_eht_host_lookup(pg, h_addr);</div><div class='add'>+	if (eht_host)</div><div class='add'>+		eht_host-&gt;filter_mode = filter_mode;</div><div class='add'>+</div><div class='add'>+	memset(&amp;zero_addr, 0, sizeof(zero_addr));</div><div class='add'>+	switch (filter_mode) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		br_multicast_del_eht_set_entry(pg, &amp;zero_addr, h_addr);</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		br_multicast_create_eht_set_entry(brmctx, pg, &amp;zero_addr,</div><div class='add'>+						  h_addr, MCAST_EXCLUDE,</div><div class='add'>+						  true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_create_eht_set_entry(const struct net_bridge_mcast *brmctx,</div><div class='add'>+					      struct net_bridge_port_group *pg,</div><div class='add'>+					      union net_bridge_eht_addr *src_addr,</div><div class='add'>+					      union net_bridge_eht_addr *h_addr,</div><div class='add'>+					      int filter_mode,</div><div class='add'>+					      bool allow_zero_src)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host;</div><div class='add'>+	struct net_bridge *br = pg-&gt;key.port-&gt;br;</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+	union net_bridge_eht_addr zero_addr;</div><div class='add'>+</div><div class='add'>+	memset(&amp;zero_addr, 0, sizeof(zero_addr));</div><div class='add'>+	if (!allow_zero_src &amp;&amp; !memcmp(src_addr, &amp;zero_addr, sizeof(zero_addr)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht_set = __eht_lookup_create_set(pg, src_addr);</div><div class='add'>+	if (!eht_set)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht_host = __eht_lookup_create_host(pg, h_addr, filter_mode);</div><div class='add'>+	if (!eht_host)</div><div class='add'>+		goto fail_host;</div><div class='add'>+</div><div class='add'>+	set_h = __eht_lookup_create_set_entry(br, eht_set, eht_host,</div><div class='add'>+					      allow_zero_src);</div><div class='add'>+	if (!set_h)</div><div class='add'>+		goto fail_set_entry;</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;set_h-&gt;timer, jiffies + br_multicast_gmi(brmctx));</div><div class='add'>+	mod_timer(&amp;eht_set-&gt;timer, jiffies + br_multicast_gmi(brmctx));</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+fail_set_entry:</div><div class='add'>+	if (hlist_empty(&amp;eht_host-&gt;set_entries))</div><div class='add'>+		__eht_destroy_host(eht_host);</div><div class='add'>+fail_host:</div><div class='add'>+	if (RB_EMPTY_ROOT(&amp;eht_set-&gt;entry_tree))</div><div class='add'>+		br_multicast_del_eht_set(eht_set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_del_eht_set_entry(struct net_bridge_port_group *pg,</div><div class='add'>+					   union net_bridge_eht_addr *src_addr,</div><div class='add'>+					   union net_bridge_eht_addr *h_addr)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+	struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+	bool set_deleted = false;</div><div class='add'>+</div><div class='add'>+	eht_set = br_multicast_eht_set_lookup(pg, src_addr);</div><div class='add'>+	if (!eht_set)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	set_h = br_multicast_eht_set_entry_lookup(eht_set, h_addr);</div><div class='add'>+	if (!set_h)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	__eht_del_set_entry(set_h);</div><div class='add'>+</div><div class='add'>+	if (RB_EMPTY_ROOT(&amp;eht_set-&gt;entry_tree)) {</div><div class='add'>+		br_multicast_del_eht_set(eht_set);</div><div class='add'>+		set_deleted = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return set_deleted;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_multicast_del_eht_host(struct net_bridge_port_group *pg,</div><div class='add'>+				      union net_bridge_eht_addr *h_addr)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_group_eht_set_entry *set_h;</div><div class='add'>+	struct net_bridge_group_eht_host *eht_host;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+</div><div class='add'>+	eht_host = br_multicast_eht_host_lookup(pg, h_addr);</div><div class='add'>+	if (!eht_host)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(set_h, tmp, &amp;eht_host-&gt;set_entries, host_list)</div><div class='add'>+		br_multicast_del_eht_set_entry(set_h-&gt;eht_set-&gt;pg,</div><div class='add'>+					       &amp;set_h-&gt;eht_set-&gt;src_addr,</div><div class='add'>+					       &amp;set_h-&gt;h_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create new set entries from reports */</div><div class='add'>+static void __eht_create_set_entries(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				     struct net_bridge_port_group *pg,</div><div class='add'>+				     union net_bridge_eht_addr *h_addr,</div><div class='add'>+				     void *srcs,</div><div class='add'>+				     u32 nsrcs,</div><div class='add'>+				     size_t addr_size,</div><div class='add'>+				     int filter_mode)</div><div class='add'>+{</div><div class='add'>+	union net_bridge_eht_addr eht_src_addr;</div><div class='add'>+	u32 src_idx;</div><div class='add'>+</div><div class='add'>+	memset(&amp;eht_src_addr, 0, sizeof(eht_src_addr));</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;eht_src_addr, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		br_multicast_create_eht_set_entry(brmctx, pg, &amp;eht_src_addr,</div><div class='add'>+						  h_addr, filter_mode,</div><div class='add'>+						  false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* delete existing set entries and their (S,G) entries if they were the last */</div><div class='add'>+static bool __eht_del_set_entries(struct net_bridge_port_group *pg,</div><div class='add'>+				  union net_bridge_eht_addr *h_addr,</div><div class='add'>+				  void *srcs,</div><div class='add'>+				  u32 nsrcs,</div><div class='add'>+				  size_t addr_size)</div><div class='add'>+{</div><div class='add'>+	union net_bridge_eht_addr eht_src_addr;</div><div class='add'>+	struct net_bridge_group_src *src_ent;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct br_ip src_ip;</div><div class='add'>+	u32 src_idx;</div><div class='add'>+</div><div class='add'>+	memset(&amp;eht_src_addr, 0, sizeof(eht_src_addr));</div><div class='add'>+	memset(&amp;src_ip, 0, sizeof(src_ip));</div><div class='add'>+	src_ip.proto = pg-&gt;key.addr.proto;</div><div class='add'>+	for (src_idx = 0; src_idx &lt; nsrcs; src_idx++) {</div><div class='add'>+		memcpy(&amp;eht_src_addr, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		if (!br_multicast_del_eht_set_entry(pg, &amp;eht_src_addr, h_addr))</div><div class='add'>+			continue;</div><div class='add'>+		memcpy(&amp;src_ip, srcs + (src_idx * addr_size), addr_size);</div><div class='add'>+		src_ent = br_multicast_find_group_src(pg, &amp;src_ip);</div><div class='add'>+		if (!src_ent)</div><div class='add'>+			continue;</div><div class='add'>+		br_multicast_del_group_src(src_ent, true);</div><div class='add'>+		changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_eht_allow(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				   struct net_bridge_port_group *pg,</div><div class='add'>+				   union net_bridge_eht_addr *h_addr,</div><div class='add'>+				   void *srcs,</div><div class='add'>+				   u32 nsrcs,</div><div class='add'>+				   size_t addr_size)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (br_multicast_eht_host_filter_mode(pg, h_addr)) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		__eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					 addr_size, MCAST_INCLUDE);</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		changed = __eht_del_set_entries(pg, h_addr, srcs, nsrcs,</div><div class='add'>+						addr_size);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_eht_block(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				   struct net_bridge_port_group *pg,</div><div class='add'>+				   union net_bridge_eht_addr *h_addr,</div><div class='add'>+				   void *srcs,</div><div class='add'>+				   u32 nsrcs,</div><div class='add'>+				   size_t addr_size)</div><div class='add'>+{</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (br_multicast_eht_host_filter_mode(pg, h_addr)) {</div><div class='add'>+	case MCAST_INCLUDE:</div><div class='add'>+		changed = __eht_del_set_entries(pg, h_addr, srcs, nsrcs,</div><div class='add'>+						addr_size);</div><div class='add'>+		break;</div><div class='add'>+	case MCAST_EXCLUDE:</div><div class='add'>+		__eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+					 MCAST_EXCLUDE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* flush_entries is true when changing mode */</div><div class='add'>+static bool __eht_inc_exc(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			  struct net_bridge_port_group *pg,</div><div class='add'>+			  union net_bridge_eht_addr *h_addr,</div><div class='add'>+			  void *srcs,</div><div class='add'>+			  u32 nsrcs,</div><div class='add'>+			  size_t addr_size,</div><div class='add'>+			  unsigned char filter_mode,</div><div class='add'>+			  bool to_report)</div><div class='add'>+{</div><div class='add'>+	bool changed = false, flush_entries = to_report;</div><div class='add'>+	union net_bridge_eht_addr eht_src_addr;</div><div class='add'>+</div><div class='add'>+	if (br_multicast_eht_host_filter_mode(pg, h_addr) != filter_mode)</div><div class='add'>+		flush_entries = true;</div><div class='add'>+</div><div class='add'>+	memset(&amp;eht_src_addr, 0, sizeof(eht_src_addr));</div><div class='add'>+	/* if we're changing mode del host and its entries */</div><div class='add'>+	if (flush_entries)</div><div class='add'>+		br_multicast_del_eht_host(pg, h_addr);</div><div class='add'>+	__eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				 filter_mode);</div><div class='add'>+	/* we can be missing sets only if we've deleted some entries */</div><div class='add'>+	if (flush_entries) {</div><div class='add'>+		struct net_bridge_group_eht_set *eht_set;</div><div class='add'>+		struct net_bridge_group_src *src_ent;</div><div class='add'>+		struct hlist_node *tmp;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_safe(src_ent, tmp, &amp;pg-&gt;src_list, node) {</div><div class='add'>+			br_multicast_ip_src_to_eht_addr(&amp;src_ent-&gt;addr,</div><div class='add'>+							&amp;eht_src_addr);</div><div class='add'>+			if (!br_multicast_eht_set_lookup(pg, &amp;eht_src_addr)) {</div><div class='add'>+				br_multicast_del_group_src(src_ent, true);</div><div class='add'>+				changed = true;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* this is an optimization for TO_INCLUDE where we lower</div><div class='add'>+			 * the set's timeout to LMQT to catch timeout hosts:</div><div class='add'>+			 * - host A (timing out): set entries X, Y</div><div class='add'>+			 * - host B: set entry Z (new from current TO_INCLUDE)</div><div class='add'>+			 *           sends BLOCK Z after LMQT but host A's EHT</div><div class='add'>+			 *           entries still exist (unless lowered to LMQT</div><div class='add'>+			 *           so they can timeout with the S,Gs)</div><div class='add'>+			 * =&gt; we wait another LMQT, when we can just delete the</div><div class='add'>+			 *    group immediately</div><div class='add'>+			 */</div><div class='add'>+			if (!(src_ent-&gt;flags &amp; BR_SGRP_F_SEND) ||</div><div class='add'>+			    filter_mode != MCAST_INCLUDE ||</div><div class='add'>+			    !to_report)</div><div class='add'>+				continue;</div><div class='add'>+			eht_set = br_multicast_eht_set_lookup(pg,</div><div class='add'>+							      &amp;eht_src_addr);</div><div class='add'>+			if (!eht_set)</div><div class='add'>+				continue;</div><div class='add'>+			mod_timer(&amp;eht_set-&gt;timer, jiffies + br_multicast_lmqt(brmctx));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_eht_inc(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg,</div><div class='add'>+				 union net_bridge_eht_addr *h_addr,</div><div class='add'>+				 void *srcs,</div><div class='add'>+				 u32 nsrcs,</div><div class='add'>+				 size_t addr_size,</div><div class='add'>+				 bool to_report)</div><div class='add'>+{</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	changed = __eht_inc_exc(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				MCAST_INCLUDE, to_report);</div><div class='add'>+	br_eht_convert_host_filter_mode(brmctx, pg, h_addr, MCAST_INCLUDE);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_multicast_eht_exc(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				 struct net_bridge_port_group *pg,</div><div class='add'>+				 union net_bridge_eht_addr *h_addr,</div><div class='add'>+				 void *srcs,</div><div class='add'>+				 u32 nsrcs,</div><div class='add'>+				 size_t addr_size,</div><div class='add'>+				 bool to_report)</div><div class='add'>+{</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	changed = __eht_inc_exc(brmctx, pg, h_addr, srcs, nsrcs, addr_size,</div><div class='add'>+				MCAST_EXCLUDE, to_report);</div><div class='add'>+	br_eht_convert_host_filter_mode(brmctx, pg, h_addr, MCAST_EXCLUDE);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __eht_ip4_handle(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='add'>+			     union net_bridge_eht_addr *h_addr,</div><div class='add'>+			     void *srcs,</div><div class='add'>+			     u32 nsrcs,</div><div class='add'>+			     int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false, to_report = false;</div><div class='add'>+</div><div class='add'>+	switch (grec_type) {</div><div class='add'>+	case IGMPV3_ALLOW_NEW_SOURCES:</div><div class='add'>+		br_multicast_eht_allow(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+				       sizeof(__be32));</div><div class='add'>+		break;</div><div class='add'>+	case IGMPV3_BLOCK_OLD_SOURCES:</div><div class='add'>+		changed = br_multicast_eht_block(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+						 sizeof(__be32));</div><div class='add'>+		break;</div><div class='add'>+	case IGMPV3_CHANGE_TO_INCLUDE:</div><div class='add'>+		to_report = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IGMPV3_MODE_IS_INCLUDE:</div><div class='add'>+		changed = br_multicast_eht_inc(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					       sizeof(__be32), to_report);</div><div class='add'>+		break;</div><div class='add'>+	case IGMPV3_CHANGE_TO_EXCLUDE:</div><div class='add'>+		to_report = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IGMPV3_MODE_IS_EXCLUDE:</div><div class='add'>+		changed = br_multicast_eht_exc(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					       sizeof(__be32), to_report);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static bool __eht_ip6_handle(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='add'>+			     union net_bridge_eht_addr *h_addr,</div><div class='add'>+			     void *srcs,</div><div class='add'>+			     u32 nsrcs,</div><div class='add'>+			     int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool changed = false, to_report = false;</div><div class='add'>+</div><div class='add'>+	switch (grec_type) {</div><div class='add'>+	case MLD2_ALLOW_NEW_SOURCES:</div><div class='add'>+		br_multicast_eht_allow(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+				       sizeof(struct in6_addr));</div><div class='add'>+		break;</div><div class='add'>+	case MLD2_BLOCK_OLD_SOURCES:</div><div class='add'>+		changed = br_multicast_eht_block(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+						 sizeof(struct in6_addr));</div><div class='add'>+		break;</div><div class='add'>+	case MLD2_CHANGE_TO_INCLUDE:</div><div class='add'>+		to_report = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MLD2_MODE_IS_INCLUDE:</div><div class='add'>+		changed = br_multicast_eht_inc(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					       sizeof(struct in6_addr),</div><div class='add'>+					       to_report);</div><div class='add'>+		break;</div><div class='add'>+	case MLD2_CHANGE_TO_EXCLUDE:</div><div class='add'>+		to_report = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MLD2_MODE_IS_EXCLUDE:</div><div class='add'>+		changed = br_multicast_eht_exc(brmctx, pg, h_addr, srcs, nsrcs,</div><div class='add'>+					       sizeof(struct in6_addr),</div><div class='add'>+					       to_report);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* true means an entry was deleted */</div><div class='add'>+bool br_multicast_eht_handle(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='add'>+			     void *h_addr,</div><div class='add'>+			     void *srcs,</div><div class='add'>+			     u32 nsrcs,</div><div class='add'>+			     size_t addr_size,</div><div class='add'>+			     int grec_type)</div><div class='add'>+{</div><div class='add'>+	bool eht_enabled = !!(pg-&gt;key.port-&gt;flags &amp; BR_MULTICAST_FAST_LEAVE);</div><div class='add'>+	union net_bridge_eht_addr eht_host_addr;</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	if (!eht_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memset(&amp;eht_host_addr, 0, sizeof(eht_host_addr));</div><div class='add'>+	memcpy(&amp;eht_host_addr, h_addr, addr_size);</div><div class='add'>+	if (addr_size == sizeof(__be32))</div><div class='add'>+		changed = __eht_ip4_handle(brmctx, pg, &amp;eht_host_addr, srcs,</div><div class='add'>+					   nsrcs, grec_type);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		changed = __eht_ip6_handle(brmctx, pg, &amp;eht_host_addr, srcs,</div><div class='add'>+					   nsrcs, grec_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_multicast_eht_set_hosts_limit(struct net_bridge_port *p,</div><div class='add'>+				     u32 eht_hosts_limit)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = p-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (!eht_hosts_limit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	p-&gt;multicast_eht_hosts_limit = eht_hosts_limit;</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c<br/>index 37278dc280eb..083e2fe96441 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netfilter_hooks.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netfilter_hooks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netfilter_hooks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_netfilter_hooks.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Handle firewalling</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='ctx'>  *	Bart De Schuymer		&lt;bdschuym@pandora.be&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Lennert dedicates this file to Kerstin Wurdinger.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -37,9 +33,11 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/br_netfilter.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "br_private.h"</div><div class='hunk'>@@ -47,29 +45,30 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_core.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static unsigned int brnf_net_id __read_mostly;</div><div class='ctx'> </div><div class='ctx'> struct brnf_net {</div><div class='ctx'> 	bool enabled;</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table_header *brnf_sysctl_header;</div><div class='del'>-static int brnf_call_iptables __read_mostly = 1;</div><div class='del'>-static int brnf_call_ip6tables __read_mostly = 1;</div><div class='del'>-static int brnf_call_arptables __read_mostly = 1;</div><div class='del'>-static int brnf_filter_vlan_tagged __read_mostly;</div><div class='del'>-static int brnf_filter_pppoe_tagged __read_mostly;</div><div class='del'>-static int brnf_pass_vlan_indev __read_mostly;</div><div class='del'>-#else</div><div class='del'>-#define brnf_call_iptables 1</div><div class='del'>-#define brnf_call_ip6tables 1</div><div class='del'>-#define brnf_call_arptables 1</div><div class='del'>-#define brnf_filter_vlan_tagged 0</div><div class='del'>-#define brnf_filter_pppoe_tagged 0</div><div class='del'>-#define brnf_pass_vlan_indev 0</div><div class='add'>+	struct ctl_table_header *ctl_hdr;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* default value is 1 */</div><div class='add'>+	int call_iptables;</div><div class='add'>+	int call_ip6tables;</div><div class='add'>+	int call_arptables;</div><div class='add'>+</div><div class='add'>+	/* default value is 0 */</div><div class='add'>+	int filter_vlan_tagged;</div><div class='add'>+	int filter_pppoe_tagged;</div><div class='add'>+	int pass_vlan_indev;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IS_IP(skb) \</div><div class='ctx'> 	(!skb_vlan_tag_present(skb) &amp;&amp; skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> </div><div class='hunk'>@@ -89,17 +88,28 @@ static inline __be16 vlan_proto(const struct sk_buff *skb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IS_VLAN_IP(skb) \</div><div class='del'>-	(vlan_proto(skb) == htons(ETH_P_IP) &amp;&amp; \</div><div class='del'>-	 brnf_filter_vlan_tagged)</div><div class='add'>+static inline bool is_vlan_ip(const struct sk_buff *skb, const struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='add'>+</div><div class='add'>+	return vlan_proto(skb) == htons(ETH_P_IP) &amp;&amp; brnet-&gt;filter_vlan_tagged;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_vlan_ipv6(const struct sk_buff *skb,</div><div class='add'>+				const struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='add'>+</div><div class='add'>+	return vlan_proto(skb) == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+	       brnet-&gt;filter_vlan_tagged;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define IS_VLAN_IPV6(skb) \</div><div class='del'>-	(vlan_proto(skb) == htons(ETH_P_IPV6) &amp;&amp; \</div><div class='del'>-	 brnf_filter_vlan_tagged)</div><div class='add'>+static inline bool is_vlan_arp(const struct sk_buff *skb, const struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='ctx'> </div><div class='del'>-#define IS_VLAN_ARP(skb) \</div><div class='del'>-	(vlan_proto(skb) == htons(ETH_P_ARP) &amp;&amp;	\</div><div class='del'>-	 brnf_filter_vlan_tagged)</div><div class='add'>+	return vlan_proto(skb) == htons(ETH_P_ARP) &amp;&amp; brnet-&gt;filter_vlan_tagged;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline __be16 pppoe_proto(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -107,20 +117,29 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb)</div><div class='ctx'> 			    sizeof(struct pppoe_hdr)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IS_PPPOE_IP(skb) \</div><div class='del'>-	(skb-&gt;protocol == htons(ETH_P_PPP_SES) &amp;&amp; \</div><div class='del'>-	 pppoe_proto(skb) == htons(PPP_IP) &amp;&amp; \</div><div class='del'>-	 brnf_filter_pppoe_tagged)</div><div class='add'>+static inline bool is_pppoe_ip(const struct sk_buff *skb, const struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='add'>+</div><div class='add'>+	return skb-&gt;protocol == htons(ETH_P_PPP_SES) &amp;&amp;</div><div class='add'>+	       pppoe_proto(skb) == htons(PPP_IP) &amp;&amp; brnet-&gt;filter_pppoe_tagged;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_pppoe_ipv6(const struct sk_buff *skb,</div><div class='add'>+				 const struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='ctx'> </div><div class='del'>-#define IS_PPPOE_IPV6(skb) \</div><div class='del'>-	(skb-&gt;protocol == htons(ETH_P_PPP_SES) &amp;&amp; \</div><div class='del'>-	 pppoe_proto(skb) == htons(PPP_IPV6) &amp;&amp; \</div><div class='del'>-	 brnf_filter_pppoe_tagged)</div><div class='add'>+	return skb-&gt;protocol == htons(ETH_P_PPP_SES) &amp;&amp;</div><div class='add'>+	       pppoe_proto(skb) == htons(PPP_IPV6) &amp;&amp;</div><div class='add'>+	       brnet-&gt;filter_pppoe_tagged;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* largest possible L2 header, see br_nf_dev_queue_xmit() */</div><div class='ctx'> #define NF_BRIDGE_MAX_MAC_HEADER_LENGTH (PPPOE_SES_HLEN + ETH_HLEN)</div><div class='ctx'> </div><div class='ctx'> struct brnf_frag_data {</div><div class='add'>+	local_lock_t bh_lock;</div><div class='ctx'> 	char mac[NF_BRIDGE_MAX_MAC_HEADER_LENGTH];</div><div class='ctx'> 	u8 encap_size;</div><div class='ctx'> 	u8 size;</div><div class='hunk'>@@ -128,14 +147,13 @@ struct brnf_frag_data {</div><div class='ctx'> 	__be16 vlan_proto;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct brnf_frag_data, brnf_frag_data_storage);</div><div class='add'>+static DEFINE_PER_CPU(struct brnf_frag_data, brnf_frag_data_storage) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void nf_bridge_info_free(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;nf_bridge) {</div><div class='del'>-		nf_bridge_put(skb-&gt;nf_bridge);</div><div class='del'>-		skb-&gt;nf_bridge = NULL;</div><div class='del'>-	}</div><div class='add'>+	skb_ext_del(skb, SKB_EXT_BRIDGE_NF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct net_device *bridge_parent(const struct net_device *dev)</div><div class='hunk'>@@ -148,19 +166,7 @@ static inline struct net_device *bridge_parent(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static inline struct nf_bridge_info *nf_bridge_unshare(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct nf_bridge_info *nf_bridge = skb-&gt;nf_bridge;</div><div class='del'>-</div><div class='del'>-	if (refcount_read(&amp;nf_bridge-&gt;use) &gt; 1) {</div><div class='del'>-		struct nf_bridge_info *tmp = nf_bridge_alloc(skb);</div><div class='del'>-</div><div class='del'>-		if (tmp) {</div><div class='del'>-			memcpy(tmp, nf_bridge, sizeof(struct nf_bridge_info));</div><div class='del'>-			refcount_set(&amp;tmp-&gt;use, 1);</div><div class='del'>-		}</div><div class='del'>-		nf_bridge_put(nf_bridge);</div><div class='del'>-		nf_bridge = tmp;</div><div class='del'>-	}</div><div class='del'>-	return nf_bridge;</div><div class='add'>+	return skb_ext_add(skb, SKB_EXT_BRIDGE_NF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)</div><div class='hunk'>@@ -217,7 +223,7 @@ static int br_validate_ipv4(struct net *net, struct sk_buff *skb)</div><div class='ctx'> 	if (unlikely(ip_fast_csum((u8 *)iph, iph-&gt;ihl)))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='del'>-	len = ntohs(iph-&gt;tot_len);</div><div class='add'>+	len = skb_ip_totlen(skb);</div><div class='ctx'> 	if (skb-&gt;len &lt; len) {</div><div class='ctx'> 		__IP_INC_STATS(net, IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='ctx'> 		goto drop;</div><div class='hunk'>@@ -247,7 +253,9 @@ drop:</div><div class='ctx'> </div><div class='ctx'> void nf_bridge_update_protocol(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	switch (skb-&gt;nf_bridge-&gt;orig_proto) {</div><div class='add'>+	const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+</div><div class='add'>+	switch (nf_bridge-&gt;orig_proto) {</div><div class='ctx'> 	case BRNF_PROTO_8021Q:</div><div class='ctx'> 		skb-&gt;protocol = htons(ETH_P_8021Q);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -278,9 +286,19 @@ int br_nf_pre_routing_finish_bridge(struct net *net, struct sock *sk, struct sk_</div><div class='ctx'> 		struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (neigh-&gt;hh.hh_len) {</div><div class='add'>+		if ((READ_ONCE(neigh-&gt;nud_state) &amp; NUD_CONNECTED) &amp;&amp;</div><div class='add'>+		    READ_ONCE(neigh-&gt;hh.hh_len)) {</div><div class='add'>+			struct net_device *br_indev;</div><div class='add'>+</div><div class='add'>+			br_indev = nf_bridge_get_physindev(skb, net);</div><div class='add'>+			if (!br_indev) {</div><div class='add'>+				neigh_release(neigh);</div><div class='add'>+				goto free_skb;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			neigh_hh_bridge(&amp;neigh-&gt;hh, skb);</div><div class='del'>-			skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+			skb-&gt;dev = br_indev;</div><div class='add'>+</div><div class='ctx'> 			ret = br_handle_frame_finish(net, sk, skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* the neighbour function below overwrites the complete</div><div class='hunk'>@@ -294,7 +312,7 @@ int br_nf_pre_routing_finish_bridge(struct net *net, struct sock *sk, struct sk_</div><div class='ctx'> 			/* tell br_dev_xmit to continue with forwarding */</div><div class='ctx'> 			nf_bridge-&gt;bridged_dnat = 1;</div><div class='ctx'> 			/* FIXME Need to refragment */</div><div class='del'>-			ret = neigh-&gt;output(neigh, skb);</div><div class='add'>+			ret = READ_ONCE(neigh-&gt;output)(neigh, skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		neigh_release(neigh);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -352,11 +370,17 @@ br_nf_ipv4_daddr_was_changed(const struct sk_buff *skb,</div><div class='ctx'>  */</div><div class='ctx'> static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+	struct net_device *dev = skb-&gt;dev, *br_indev;</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	int err;</div><div class='add'>+</div><div class='add'>+	br_indev = nf_bridge_get_physindev(skb, net);</div><div class='add'>+	if (!br_indev) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge-&gt;frag_max_size = IPCB(skb)-&gt;frag_max_size;</div><div class='ctx'> </div><div class='hunk'>@@ -366,37 +390,14 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_</div><div class='ctx'> 	}</div><div class='ctx'> 	nf_bridge-&gt;in_prerouting = 0;</div><div class='ctx'> 	if (br_nf_ipv4_daddr_was_changed(skb, nf_bridge)) {</div><div class='del'>-		if ((err = ip_route_input(skb, iph-&gt;daddr, iph-&gt;saddr, iph-&gt;tos, dev))) {</div><div class='del'>-			struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='del'>-</div><div class='del'>-			/* If err equals -EHOSTUNREACH the error is due to a</div><div class='del'>-			 * martian destination or due to the fact that</div><div class='del'>-			 * forwarding is disabled. For most martian packets,</div><div class='del'>-			 * ip_route_output_key() will fail. It won't fail for 2 types of</div><div class='del'>-			 * martian destinations: loopback destinations and destination</div><div class='del'>-			 * 0.0.0.0. In both cases the packet will be dropped because the</div><div class='del'>-			 * destination is the loopback device and not the bridge. */</div><div class='del'>-			if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev))</div><div class='del'>-				goto free_skb;</div><div class='del'>-</div><div class='del'>-			rt = ip_route_output(net, iph-&gt;daddr, 0,</div><div class='del'>-					     RT_TOS(iph-&gt;tos), 0);</div><div class='del'>-			if (!IS_ERR(rt)) {</div><div class='del'>-				/* - Bridged-and-DNAT'ed traffic doesn't</div><div class='del'>-				 *   require ip_forwarding. */</div><div class='del'>-				if (rt-&gt;dst.dev == dev) {</div><div class='del'>-					skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='del'>-					goto bridged_dnat;</div><div class='del'>-				}</div><div class='del'>-				ip_rt_put(rt);</div><div class='del'>-			}</div><div class='del'>-free_skb:</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+		reason = ip_route_input(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+					ip4h_dscp(iph), dev);</div><div class='add'>+		if (reason) {</div><div class='add'>+			kfree_skb_reason(skb, reason);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (skb_dst(skb)-&gt;dev == dev) {</div><div class='del'>-bridged_dnat:</div><div class='del'>-				skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+				skb-&gt;dev = br_indev;</div><div class='ctx'> 				nf_bridge_update_protocol(skb);</div><div class='ctx'> 				nf_bridge_push_encap_header(skb);</div><div class='ctx'> 				br_nf_hook_thresh(NF_BR_PRE_ROUTING,</div><div class='hunk'>@@ -409,15 +410,16 @@ bridged_dnat:</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		rt = bridge_parent_rtable(nf_bridge-&gt;physindev);</div><div class='add'>+		rt = bridge_parent_rtable(br_indev);</div><div class='ctx'> 		if (!rt) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		skb_dst_drop(skb);</div><div class='ctx'> 		skb_dst_set_noref(skb, &amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+	skb-&gt;dev = br_indev;</div><div class='ctx'> 	nf_bridge_update_protocol(skb);</div><div class='ctx'> 	nf_bridge_push_encap_header(skb);</div><div class='ctx'> 	br_nf_hook_thresh(NF_BR_PRE_ROUTING, net, sk, skb, skb-&gt;dev, NULL,</div><div class='hunk'>@@ -425,12 +427,16 @@ bridged_dnat:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device *brnf_get_logical_dev(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+static struct net_device *brnf_get_logical_dev(struct sk_buff *skb,</div><div class='add'>+					       const struct net_device *dev,</div><div class='add'>+					       const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *vlan, *br;</div><div class='add'>+	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='ctx'> </div><div class='ctx'> 	br = bridge_parent(dev);</div><div class='del'>-	if (brnf_pass_vlan_indev == 0 || !skb_vlan_tag_present(skb))</div><div class='add'>+</div><div class='add'>+	if (brnet-&gt;pass_vlan_indev == 0 || !skb_vlan_tag_present(skb))</div><div class='ctx'> 		return br;</div><div class='ctx'> </div><div class='ctx'> 	vlan = __vlan_find_dev_deep_rcu(br, skb-&gt;vlan_proto,</div><div class='hunk'>@@ -440,7 +446,7 @@ static struct net_device *brnf_get_logical_dev(struct sk_buff *skb, const struct</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Some common code for IPv4/IPv6 */</div><div class='del'>-struct net_device *setup_pre_routing(struct sk_buff *skb)</div><div class='add'>+struct net_device *setup_pre_routing(struct sk_buff *skb, const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -450,8 +456,8 @@ struct net_device *setup_pre_routing(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge-&gt;in_prerouting = 1;</div><div class='del'>-	nf_bridge-&gt;physindev = skb-&gt;dev;</div><div class='del'>-	skb-&gt;dev = brnf_get_logical_dev(skb, skb-&gt;dev);</div><div class='add'>+	nf_bridge-&gt;physinif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	skb-&gt;dev = brnf_get_logical_dev(skb, skb-&gt;dev, net);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_8021Q))</div><div class='ctx'> 		nf_bridge-&gt;orig_proto = BRNF_PROTO_8021Q;</div><div class='hunk'>@@ -477,44 +483,53 @@ static unsigned int br_nf_pre_routing(void *priv,</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	__u32 len = nf_bridge_encap_header_len(skb);</div><div class='add'>+	struct brnf_net *brnet;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, len)))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_PKT_TOO_SMALL, 0);</div><div class='ctx'> </div><div class='ctx'> 	p = br_port_get_rcu(state-&gt;in);</div><div class='ctx'> 	if (p == NULL)</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_DEV_READY, 0);</div><div class='ctx'> 	br = p-&gt;br;</div><div class='ctx'> </div><div class='del'>-	if (IS_IPV6(skb) || IS_VLAN_IPV6(skb) || IS_PPPOE_IPV6(skb)) {</div><div class='del'>-		if (!brnf_call_ip6tables &amp;&amp; !br-&gt;nf_call_ip6tables)</div><div class='add'>+	brnet = net_generic(state-&gt;net, brnf_net_id);</div><div class='add'>+	if (IS_IPV6(skb) || is_vlan_ipv6(skb, state-&gt;net) ||</div><div class='add'>+	    is_pppoe_ipv6(skb, state-&gt;net)) {</div><div class='add'>+		if (!brnet-&gt;call_ip6tables &amp;&amp;</div><div class='add'>+		    !br_opt_get(br, BROPT_NF_CALL_IP6TABLES))</div><div class='ctx'> 			return NF_ACCEPT;</div><div class='add'>+		if (!ipv6_mod_enabled()) {</div><div class='add'>+			pr_warn_once("Module ipv6 is disabled, so call_ip6tables is not supported.");</div><div class='add'>+			return NF_DROP_REASON(skb, SKB_DROP_REASON_IPV6DISABLED, 0);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		nf_bridge_pull_encap_header_rcsum(skb);</div><div class='ctx'> 		return br_nf_pre_routing_ipv6(priv, skb, state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!brnf_call_iptables &amp;&amp; !br-&gt;nf_call_iptables)</div><div class='add'>+	if (!brnet-&gt;call_iptables &amp;&amp; !br_opt_get(br, BROPT_NF_CALL_IPTABLES))</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='del'>-	if (!IS_IP(skb) &amp;&amp; !IS_VLAN_IP(skb) &amp;&amp; !IS_PPPOE_IP(skb))</div><div class='add'>+	if (!IS_IP(skb) &amp;&amp; !is_vlan_ip(skb, state-&gt;net) &amp;&amp;</div><div class='add'>+	    !is_pppoe_ip(skb, state-&gt;net))</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge_pull_encap_header_rcsum(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (br_validate_ipv4(state-&gt;net, skb))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_IP_INHDR, 0);</div><div class='ctx'> </div><div class='del'>-	nf_bridge_put(skb-&gt;nf_bridge);</div><div class='ctx'> 	if (!nf_bridge_alloc(skb))</div><div class='del'>-		return NF_DROP;</div><div class='del'>-	if (!setup_pre_routing(skb))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_NOMEM, 0);</div><div class='add'>+	if (!setup_pre_routing(skb, state-&gt;net))</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_DEV_READY, 0);</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	nf_bridge-&gt;ipv4_daddr = ip_hdr(skb)-&gt;daddr;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	skb-&gt;transport_header = skb-&gt;network_header + ip_hdr(skb)-&gt;ihl * 4;</div><div class='ctx'> </div><div class='ctx'> 	NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state-&gt;net, state-&gt;sk, skb,</div><div class='ctx'> 		skb-&gt;dev, NULL,</div><div class='hunk'>@@ -523,6 +538,97 @@ static unsigned int br_nf_pre_routing(void *priv,</div><div class='ctx'> 	return NF_STOLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+/* conntracks' nf_confirm logic cannot handle cloned skbs referencing</div><div class='add'>+ * the same nf_conn entry, which will happen for multicast (broadcast)</div><div class='add'>+ * Frames on bridges.</div><div class='add'>+ *</div><div class='add'>+ * Example:</div><div class='add'>+ *      macvlan0</div><div class='add'>+ *      br0</div><div class='add'>+ *  ethX  ethY</div><div class='add'>+ *</div><div class='add'>+ * ethX (or Y) receives multicast or broadcast packet containing</div><div class='add'>+ * an IP packet, not yet in conntrack table.</div><div class='add'>+ *</div><div class='add'>+ * 1. skb passes through bridge and fake-ip (br_netfilter)Prerouting.</div><div class='add'>+ *    -&gt; skb-&gt;_nfct now references a unconfirmed entry</div><div class='add'>+ * 2. skb is broad/mcast packet. bridge now passes clones out on each bridge</div><div class='add'>+ *    interface.</div><div class='add'>+ * 3. skb gets passed up the stack.</div><div class='add'>+ * 4. In macvlan case, macvlan driver retains clone(s) of the mcast skb</div><div class='add'>+ *    and schedules a work queue to send them out on the lower devices.</div><div class='add'>+ *</div><div class='add'>+ *    The clone skb-&gt;_nfct is not a copy, it is the same entry as the</div><div class='add'>+ *    original skb.  The macvlan rx handler then returns RX_HANDLER_PASS.</div><div class='add'>+ * 5. Normal conntrack hooks (in NF_INET_LOCAL_IN) confirm the orig skb.</div><div class='add'>+ *</div><div class='add'>+ * The Macvlan broadcast worker and normal confirm path will race.</div><div class='add'>+ *</div><div class='add'>+ * This race will not happen if step 2 already confirmed a clone. In that</div><div class='add'>+ * case later steps perform skb_clone() with skb-&gt;_nfct already confirmed (in</div><div class='add'>+ * hash table).  This works fine.</div><div class='add'>+ *</div><div class='add'>+ * But such confirmation won't happen when eb/ip/nftables rules dropped the</div><div class='add'>+ * packets before they reached the nf_confirm step in postrouting.</div><div class='add'>+ *</div><div class='add'>+ * Work around this problem by explicit confirmation of the entry at</div><div class='add'>+ * LOCAL_IN time, before upper layer has a chance to clone the unconfirmed</div><div class='add'>+ * entry.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static unsigned int br_nf_local_in(void *priv,</div><div class='add'>+				   struct sk_buff *skb,</div><div class='add'>+				   const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	bool promisc = BR_INPUT_SKB_CB(skb)-&gt;promisc;</div><div class='add'>+	struct nf_conntrack *nfct = skb_nfct(skb);</div><div class='add'>+	const struct nf_ct_hook *ct_hook;</div><div class='add'>+	struct nf_conn *ct;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (promisc) {</div><div class='add'>+		nf_reset_ct(skb);</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nfct || skb-&gt;pkt_type == PACKET_HOST)</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	ct = container_of(nfct, struct nf_conn, ct_general);</div><div class='add'>+	if (likely(nf_ct_is_confirmed(ct)))</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(refcount_read(&amp;nfct-&gt;use) != 1)) {</div><div class='add'>+		nf_reset_ct(skb);</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(skb_shared(skb));</div><div class='add'>+</div><div class='add'>+	/* We can't call nf_confirm here, it would create a dependency</div><div class='add'>+	 * on nf_conntrack module.</div><div class='add'>+	 */</div><div class='add'>+	ct_hook = rcu_dereference(nf_ct_hook);</div><div class='add'>+	if (!ct_hook) {</div><div class='add'>+		skb-&gt;_nfct = 0ul;</div><div class='add'>+		nf_conntrack_put(nfct);</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nf_bridge_pull_encap_header(skb);</div><div class='add'>+	ret = ct_hook-&gt;confirm(skb);</div><div class='add'>+	switch (ret &amp; NF_VERDICT_MASK) {</div><div class='add'>+	case NF_STOLEN:</div><div class='add'>+		return NF_STOLEN;</div><div class='add'>+	default:</div><div class='add'>+		nf_bridge_push_encap_header(skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* PF_BRIDGE/FORWARD *************************************************/</div><div class='ctx'> static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='hunk'>@@ -530,7 +636,7 @@ static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	struct net_device *in;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ARP(skb) &amp;&amp; !IS_VLAN_ARP(skb)) {</div><div class='add'>+	if (!IS_ARP(skb) &amp;&amp; !is_vlan_arp(skb, net)) {</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 			nf_bridge-&gt;frag_max_size = IPCB(skb)-&gt;frag_max_size;</div><div class='hunk'>@@ -538,7 +644,11 @@ static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='ctx'> 			nf_bridge-&gt;frag_max_size = IP6CB(skb)-&gt;frag_max_size;</div><div class='ctx'> </div><div class='del'>-		in = nf_bridge-&gt;physindev;</div><div class='add'>+		in = nf_bridge_get_physindev(skb, net);</div><div class='add'>+		if (!in) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 		if (nf_bridge-&gt;pkt_otherhost) {</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='ctx'> 			nf_bridge-&gt;pkt_otherhost = false;</div><div class='hunk'>@@ -555,41 +665,29 @@ static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* This is the 'purely bridged' case.  For IP, we pass the packet to</div><div class='del'>- * netfilter with indev and outdev set to the bridge device,</div><div class='del'>- * but we are still able to filter on the 'real' indev/outdev</div><div class='del'>- * because of the physdev module. For ARP, indev and outdev are the</div><div class='del'>- * bridge ports. */</div><div class='del'>-static unsigned int br_nf_forward_ip(void *priv,</div><div class='del'>-				     struct sk_buff *skb,</div><div class='del'>-				     const struct nf_hook_state *state)</div><div class='add'>+static unsigned int br_nf_forward_ip(struct sk_buff *skb,</div><div class='add'>+				     const struct nf_hook_state *state,</div><div class='add'>+				     u8 pf)</div><div class='ctx'> {</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge;</div><div class='ctx'> 	struct net_device *parent;</div><div class='del'>-	u_int8_t pf;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;nf_bridge)</div><div class='add'>+	nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+	if (!nf_bridge)</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='ctx'> 	/* Need exclusive nf_bridge_info since we might have multiple</div><div class='ctx'> 	 * different physoutdevs. */</div><div class='ctx'> 	if (!nf_bridge_unshare(skb))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_NOMEM, 0);</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	if (!nf_bridge)</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_NOMEM, 0);</div><div class='ctx'> </div><div class='ctx'> 	parent = bridge_parent(state-&gt;out);</div><div class='ctx'> 	if (!parent)</div><div class='del'>-		return NF_DROP;</div><div class='del'>-</div><div class='del'>-	if (IS_IP(skb) || IS_VLAN_IP(skb) || IS_PPPOE_IP(skb))</div><div class='del'>-		pf = NFPROTO_IPV4;</div><div class='del'>-	else if (IS_IPV6(skb) || IS_VLAN_IPV6(skb) || IS_PPPOE_IPV6(skb))</div><div class='del'>-		pf = NFPROTO_IPV6;</div><div class='del'>-	else</div><div class='del'>-		return NF_ACCEPT;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_DEV_READY, 0);</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge_pull_encap_header(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -600,53 +698,53 @@ static unsigned int br_nf_forward_ip(void *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (pf == NFPROTO_IPV4) {</div><div class='ctx'> 		if (br_validate_ipv4(state-&gt;net, skb))</div><div class='del'>-			return NF_DROP;</div><div class='add'>+			return NF_DROP_REASON(skb, SKB_DROP_REASON_IP_INHDR, 0);</div><div class='ctx'> 		IPCB(skb)-&gt;frag_max_size = nf_bridge-&gt;frag_max_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pf == NFPROTO_IPV6) {</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	} else if (pf == NFPROTO_IPV6) {</div><div class='ctx'> 		if (br_validate_ipv6(state-&gt;net, skb))</div><div class='del'>-			return NF_DROP;</div><div class='add'>+			return NF_DROP_REASON(skb, SKB_DROP_REASON_IP_INHDR, 0);</div><div class='ctx'> 		IP6CB(skb)-&gt;frag_max_size = nf_bridge-&gt;frag_max_size;</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return NF_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge-&gt;physoutdev = skb-&gt;dev;</div><div class='del'>-	if (pf == NFPROTO_IPV4)</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='del'>-	else</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='ctx'> 	NF_HOOK(pf, NF_INET_FORWARD, state-&gt;net, NULL, skb,</div><div class='del'>-		brnf_get_logical_dev(skb, state-&gt;in),</div><div class='add'>+		brnf_get_logical_dev(skb, state-&gt;in, state-&gt;net),</div><div class='ctx'> 		parent,	br_nf_forward_finish);</div><div class='ctx'> </div><div class='ctx'> 	return NF_STOLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int br_nf_forward_arp(void *priv,</div><div class='del'>-				      struct sk_buff *skb,</div><div class='add'>+static unsigned int br_nf_forward_arp(struct sk_buff *skb,</div><div class='ctx'> 				      const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	struct net_device **d = (struct net_device **)(skb-&gt;cb);</div><div class='add'>+	struct brnf_net *brnet;</div><div class='ctx'> </div><div class='ctx'> 	p = br_port_get_rcu(state-&gt;out);</div><div class='ctx'> 	if (p == NULL)</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> 	br = p-&gt;br;</div><div class='ctx'> </div><div class='del'>-	if (!brnf_call_arptables &amp;&amp; !br-&gt;nf_call_arptables)</div><div class='add'>+	brnet = net_generic(state-&gt;net, brnf_net_id);</div><div class='add'>+	if (!brnet-&gt;call_arptables &amp;&amp; !br_opt_get(br, BROPT_NF_CALL_ARPTABLES))</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ARP(skb)) {</div><div class='del'>-		if (!IS_VLAN_ARP(skb))</div><div class='del'>-			return NF_ACCEPT;</div><div class='add'>+	if (is_vlan_arp(skb, state-&gt;net))</div><div class='ctx'> 		nf_bridge_pull_encap_header(skb);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, sizeof(struct arphdr))))</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_PKT_TOO_SMALL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (arp_hdr(skb)-&gt;ar_pln != 4) {</div><div class='del'>-		if (IS_VLAN_ARP(skb))</div><div class='add'>+		if (is_vlan_arp(skb, state-&gt;net))</div><div class='ctx'> 			nf_bridge_push_encap_header(skb);</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -657,6 +755,28 @@ static unsigned int br_nf_forward_arp(void *priv,</div><div class='ctx'> 	return NF_STOLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This is the 'purely bridged' case.  For IP, we pass the packet to</div><div class='add'>+ * netfilter with indev and outdev set to the bridge device,</div><div class='add'>+ * but we are still able to filter on the 'real' indev/outdev</div><div class='add'>+ * because of the physdev module. For ARP, indev and outdev are the</div><div class='add'>+ * bridge ports.</div><div class='add'>+ */</div><div class='add'>+static unsigned int br_nf_forward(void *priv,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	if (IS_IP(skb) || is_vlan_ip(skb, state-&gt;net) ||</div><div class='add'>+	    is_pppoe_ip(skb, state-&gt;net))</div><div class='add'>+		return br_nf_forward_ip(skb, state, NFPROTO_IPV4);</div><div class='add'>+	if (IS_IPV6(skb) || is_vlan_ipv6(skb, state-&gt;net) ||</div><div class='add'>+	    is_pppoe_ipv6(skb, state-&gt;net))</div><div class='add'>+		return br_nf_forward_ip(skb, state, NFPROTO_IPV6);</div><div class='add'>+	if (IS_ARP(skb) || is_vlan_arp(skb, state-&gt;net))</div><div class='add'>+		return br_nf_forward_arp(skb, state);</div><div class='add'>+</div><div class='add'>+	return NF_ACCEPT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int br_nf_push_frag_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct brnf_frag_data *data;</div><div class='hunk'>@@ -670,10 +790,8 @@ static int br_nf_push_frag_xmit(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vlan_tci) {</div><div class='del'>-		skb-&gt;vlan_tci = data-&gt;vlan_tci;</div><div class='del'>-		skb-&gt;vlan_proto = data-&gt;vlan_proto;</div><div class='del'>-	}</div><div class='add'>+	if (data-&gt;vlan_proto)</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, data-&gt;vlan_proto, data-&gt;vlan_tci);</div><div class='ctx'> </div><div class='ctx'> 	skb_copy_to_linear_data_offset(skb, -data-&gt;size, data-&gt;mac, data-&gt;size);</div><div class='ctx'> 	__skb_push(skb, data-&gt;encap_size);</div><div class='hunk'>@@ -702,7 +820,9 @@ br_nf_ip_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;nf_bridge-&gt;orig_proto == BRNF_PROTO_PPPOE)</div><div class='add'>+	const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+</div><div class='add'>+	if (nf_bridge-&gt;orig_proto == BRNF_PROTO_PPPOE)</div><div class='ctx'> 		return PPPOE_SES_HLEN;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -711,18 +831,31 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> {</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	unsigned int mtu, mtu_reserved;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mtu_reserved = nf_bridge_mtu_reduction(skb);</div><div class='ctx'> 	mtu = skb-&gt;dev-&gt;mtu;</div><div class='ctx'> </div><div class='add'>+	if (nf_bridge-&gt;pkt_otherhost) {</div><div class='add'>+		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+		nf_bridge-&gt;pkt_otherhost = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (nf_bridge-&gt;frag_max_size &amp;&amp; nf_bridge-&gt;frag_max_size &lt; mtu)</div><div class='ctx'> 		mtu = nf_bridge-&gt;frag_max_size;</div><div class='ctx'> </div><div class='add'>+	nf_bridge_update_protocol(skb);</div><div class='add'>+	nf_bridge_push_encap_header(skb);</div><div class='add'>+</div><div class='ctx'> 	if (skb_is_gso(skb) || skb-&gt;len + mtu_reserved &lt;= mtu) {</div><div class='ctx'> 		nf_bridge_info_free(skb);</div><div class='ctx'> 		return br_dev_queue_push_xmit(net, sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Fragmentation on metadata/template dst is not supported */</div><div class='add'>+	if (unlikely(!skb_valid_dst(skb)))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='ctx'> 	/* This is wrong! We should preserve the original fragment</div><div class='ctx'> 	 * boundaries by preserving frag_list rather than refragmenting.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -735,19 +868,25 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> </div><div class='ctx'> 		IPCB(skb)-&gt;frag_max_size = nf_bridge-&gt;frag_max_size;</div><div class='ctx'> </div><div class='del'>-		nf_bridge_update_protocol(skb);</div><div class='del'>-</div><div class='add'>+		local_lock_nested_bh(&amp;brnf_frag_data_storage.bh_lock);</div><div class='ctx'> 		data = this_cpu_ptr(&amp;brnf_frag_data_storage);</div><div class='ctx'> </div><div class='del'>-		data-&gt;vlan_tci = skb-&gt;vlan_tci;</div><div class='del'>-		data-&gt;vlan_proto = skb-&gt;vlan_proto;</div><div class='add'>+		if (skb_vlan_tag_present(skb)) {</div><div class='add'>+			data-&gt;vlan_tci = skb-&gt;vlan_tci;</div><div class='add'>+			data-&gt;vlan_proto = skb-&gt;vlan_proto;</div><div class='add'>+		} else {</div><div class='add'>+			data-&gt;vlan_proto = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		data-&gt;encap_size = nf_bridge_encap_header_len(skb);</div><div class='ctx'> 		data-&gt;size = ETH_HLEN + data-&gt;encap_size;</div><div class='ctx'> </div><div class='ctx'> 		skb_copy_from_linear_data_offset(skb, -data-&gt;size, data-&gt;mac,</div><div class='ctx'> 						 data-&gt;size);</div><div class='ctx'> </div><div class='del'>-		return br_nf_ip_fragment(net, sk, skb, br_nf_push_frag_xmit);</div><div class='add'>+		ret = br_nf_ip_fragment(net, sk, skb, br_nf_push_frag_xmit);</div><div class='add'>+		local_unlock_nested_bh(&amp;brnf_frag_data_storage.bh_lock);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) &amp;&amp;</div><div class='ctx'> 	    skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='hunk'>@@ -759,8 +898,7 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> </div><div class='ctx'> 		IP6CB(skb)-&gt;frag_max_size = nf_bridge-&gt;frag_max_size;</div><div class='ctx'> </div><div class='del'>-		nf_bridge_update_protocol(skb);</div><div class='del'>-</div><div class='add'>+		local_lock_nested_bh(&amp;brnf_frag_data_storage.bh_lock);</div><div class='ctx'> 		data = this_cpu_ptr(&amp;brnf_frag_data_storage);</div><div class='ctx'> 		data-&gt;encap_size = nf_bridge_encap_header_len(skb);</div><div class='ctx'> 		data-&gt;size = ETH_HLEN + data-&gt;encap_size;</div><div class='hunk'>@@ -768,8 +906,12 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> 		skb_copy_from_linear_data_offset(skb, -data-&gt;size, data-&gt;mac,</div><div class='ctx'> 						 data-&gt;size);</div><div class='ctx'> </div><div class='del'>-		if (v6ops)</div><div class='del'>-			return v6ops-&gt;fragment(net, sk, skb, br_nf_push_frag_xmit);</div><div class='add'>+		if (v6ops) {</div><div class='add'>+			ret = v6ops-&gt;fragment(net, sk, skb, br_nf_push_frag_xmit);</div><div class='add'>+			local_unlock_nested_bh(&amp;brnf_frag_data_storage.bh_lock);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		local_unlock_nested_bh(&amp;brnf_frag_data_storage.bh_lock);</div><div class='ctx'> </div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='hunk'>@@ -799,17 +941,17 @@ static unsigned int br_nf_post_routing(void *priv,</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='ctx'> 	if (!realoutdev)</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_DEV_READY, 0);</div><div class='ctx'> </div><div class='del'>-	if (IS_IP(skb) || IS_VLAN_IP(skb) || IS_PPPOE_IP(skb))</div><div class='add'>+	if (IS_IP(skb) || is_vlan_ip(skb, state-&gt;net) ||</div><div class='add'>+	    is_pppoe_ip(skb, state-&gt;net))</div><div class='ctx'> 		pf = NFPROTO_IPV4;</div><div class='del'>-	else if (IS_IPV6(skb) || IS_VLAN_IPV6(skb) || IS_PPPOE_IPV6(skb))</div><div class='add'>+	else if (IS_IPV6(skb) || is_vlan_ipv6(skb, state-&gt;net) ||</div><div class='add'>+		 is_pppoe_ipv6(skb, state-&gt;net))</div><div class='ctx'> 		pf = NFPROTO_IPV6;</div><div class='ctx'> 	else</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='del'>-	/* We assume any code from br_dev_queue_push_xmit onwards doesn't care</div><div class='del'>-	 * about the value of skb-&gt;pkt_type. */</div><div class='ctx'> 	if (skb-&gt;pkt_type == PACKET_OTHERHOST) {</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> 		nf_bridge-&gt;pkt_otherhost = true;</div><div class='hunk'>@@ -835,10 +977,19 @@ static unsigned int ip_sabotage_in(void *priv,</div><div class='ctx'> 				   struct sk_buff *skb,</div><div class='ctx'> 				   const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;nf_bridge &amp;&amp; !skb-&gt;nf_bridge-&gt;in_prerouting &amp;&amp;</div><div class='del'>-	    !netif_is_l3_master(skb-&gt;dev)) {</div><div class='del'>-		state-&gt;okfn(state-&gt;net, state-&gt;sk, skb);</div><div class='del'>-		return NF_STOLEN;</div><div class='add'>+	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+</div><div class='add'>+	if (nf_bridge) {</div><div class='add'>+		if (nf_bridge-&gt;sabotage_in_done)</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		if (!nf_bridge-&gt;in_prerouting &amp;&amp;</div><div class='add'>+		    !netif_is_l3_master(skb-&gt;dev) &amp;&amp;</div><div class='add'>+		    !netif_is_l3_slave(skb-&gt;dev)) {</div><div class='add'>+			nf_bridge-&gt;sabotage_in_done = 1;</div><div class='add'>+			state-&gt;okfn(state-&gt;net, state-&gt;sk, skb);</div><div class='add'>+			return NF_STOLEN;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NF_ACCEPT;</div><div class='hunk'>@@ -856,6 +1007,13 @@ static unsigned int ip_sabotage_in(void *priv,</div><div class='ctx'> static void br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+	struct net_device *br_indev;</div><div class='add'>+</div><div class='add'>+	br_indev = nf_bridge_get_physindev(skb, dev_net(skb-&gt;dev));</div><div class='add'>+	if (!br_indev) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, ETH_HLEN);</div><div class='ctx'> 	nf_bridge-&gt;bridged_dnat = 0;</div><div class='hunk'>@@ -865,7 +1023,7 @@ static void br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)</div><div class='ctx'> 	skb_copy_to_linear_data_offset(skb, -(ETH_HLEN - ETH_ALEN),</div><div class='ctx'> 				       nf_bridge-&gt;neigh_header,</div><div class='ctx'> 				       ETH_HLEN - ETH_ALEN);</div><div class='del'>-	skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+	skb-&gt;dev = br_indev;</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge-&gt;physoutdev = NULL;</div><div class='ctx'> 	br_handle_frame_finish(dev_net(skb-&gt;dev), NULL, skb);</div><div class='hunk'>@@ -873,7 +1031,9 @@ static void br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int br_nf_dev_xmit(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;nf_bridge &amp;&amp; skb-&gt;nf_bridge-&gt;bridged_dnat) {</div><div class='add'>+	const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='add'>+</div><div class='add'>+	if (nf_bridge &amp;&amp; nf_bridge-&gt;bridged_dnat) {</div><div class='ctx'> 		br_nf_pre_routing_finish_bridge_slow(skb);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -884,11 +1044,6 @@ static const struct nf_br_ops br_ops = {</div><div class='ctx'> 	.br_dev_xmit_hook =	br_nf_dev_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void br_netfilter_enable(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(br_netfilter_enable);</div><div class='del'>-</div><div class='ctx'> /* For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because</div><div class='ctx'>  * br_dev_queue_push_xmit is called afterwards */</div><div class='ctx'> static const struct nf_hook_ops br_nf_ops[] = {</div><div class='hunk'>@@ -898,14 +1053,16 @@ static const struct nf_hook_ops br_nf_ops[] = {</div><div class='ctx'> 		.hooknum = NF_BR_PRE_ROUTING,</div><div class='ctx'> 		.priority = NF_BR_PRI_BRNF,</div><div class='ctx'> 	},</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='ctx'> 	{</div><div class='del'>-		.hook = br_nf_forward_ip,</div><div class='add'>+		.hook = br_nf_local_in,</div><div class='ctx'> 		.pf = NFPROTO_BRIDGE,</div><div class='del'>-		.hooknum = NF_BR_FORWARD,</div><div class='del'>-		.priority = NF_BR_PRI_BRNF - 1,</div><div class='add'>+		.hooknum = NF_BR_LOCAL_IN,</div><div class='add'>+		.priority = NF_BR_PRI_LAST,</div><div class='ctx'> 	},</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='del'>-		.hook = br_nf_forward_arp,</div><div class='add'>+		.hook = br_nf_forward,</div><div class='ctx'> 		.pf = NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum = NF_BR_FORWARD,</div><div class='ctx'> 		.priority = NF_BR_PRI_BRNF,</div><div class='hunk'>@@ -938,7 +1095,7 @@ static int brnf_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (event != NETDEV_REGISTER || !(dev-&gt;priv_flags &amp; IFF_EBRIDGE))</div><div class='add'>+	if (event != NETDEV_REGISTER || !netif_is_bridge_master(dev))</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='hunk'>@@ -956,23 +1113,6 @@ static int brnf_device_event(struct notifier_block *unused, unsigned long event,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit brnf_exit_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	struct brnf_net *brnet = net_generic(net, brnf_net_id);</div><div class='del'>-</div><div class='del'>-	if (!brnet-&gt;enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	nf_unregister_net_hooks(net, br_nf_ops, ARRAY_SIZE(br_nf_ops));</div><div class='del'>-	brnet-&gt;enabled = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations brnf_net_ops __read_mostly = {</div><div class='del'>-	.exit = brnf_exit_net,</div><div class='del'>-	.id   = &amp;brnf_net_id,</div><div class='del'>-	.size = sizeof(struct brnf_net),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct notifier_block brnf_notifier __read_mostly = {</div><div class='ctx'> 	.notifier_call = brnf_device_event,</div><div class='ctx'> };</div><div class='hunk'>@@ -1000,9 +1140,24 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net,</div><div class='ctx'> 		return okfn(net, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	ops = nf_hook_entries_get_hook_ops(e);</div><div class='del'>-	for (i = 0; i &lt; e-&gt;num_hook_entries &amp;&amp;</div><div class='del'>-	      ops[i]-&gt;priority &lt;= NF_BR_PRI_BRNF; i++)</div><div class='del'>-		;</div><div class='add'>+	for (i = 0; i &lt; e-&gt;num_hook_entries; i++) {</div><div class='add'>+		/* These hooks have already been called */</div><div class='add'>+		if (ops[i]-&gt;priority &lt; NF_BR_PRI_BRNF)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* These hooks have not been called yet, run them. */</div><div class='add'>+		if (ops[i]-&gt;priority &gt; NF_BR_PRI_BRNF)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* take a closer look at NF_BR_PRI_BRNF. */</div><div class='add'>+		if (ops[i]-&gt;hook == br_nf_pre_routing) {</div><div class='add'>+			/* This hook diverted the skb to this function,</div><div class='add'>+			 * hooks after this have not been run yet.</div><div class='add'>+			 */</div><div class='add'>+			i++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nf_hook_state_init(&amp;state, hook, NFPROTO_BRIDGE, indev, outdev,</div><div class='ctx'> 			   sk, net, okfn);</div><div class='hunk'>@@ -1016,8 +1171,8 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> static</div><div class='del'>-int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,</div><div class='del'>-			    void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+int brnf_sysctl_call_tables(const struct ctl_table *ctl, int write,</div><div class='add'>+			    void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1031,49 +1186,124 @@ int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,</div><div class='ctx'> static struct ctl_table brnf_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-call-arptables",</div><div class='del'>-		.data		= &amp;brnf_call_arptables,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-call-iptables",</div><div class='del'>-		.data		= &amp;brnf_call_iptables,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-call-ip6tables",</div><div class='del'>-		.data		= &amp;brnf_call_ip6tables,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-filter-vlan-tagged",</div><div class='del'>-		.data		= &amp;brnf_filter_vlan_tagged,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-filter-pppoe-tagged",</div><div class='del'>-		.data		= &amp;brnf_filter_pppoe_tagged,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bridge-nf-pass-vlan-input-dev",</div><div class='del'>-		.data		= &amp;brnf_pass_vlan_indev,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= brnf_sysctl_call_tables,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static inline void br_netfilter_sysctl_default(struct brnf_net *brnf)</div><div class='add'>+{</div><div class='add'>+	brnf-&gt;call_iptables = 1;</div><div class='add'>+	brnf-&gt;call_ip6tables = 1;</div><div class='add'>+	brnf-&gt;call_arptables = 1;</div><div class='add'>+	brnf-&gt;filter_vlan_tagged = 0;</div><div class='add'>+	brnf-&gt;filter_pppoe_tagged = 0;</div><div class='add'>+	brnf-&gt;pass_vlan_indev = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_netfilter_sysctl_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct ctl_table *table = brnf_table;</div><div class='add'>+	struct brnf_net *brnet;</div><div class='add'>+</div><div class='add'>+	if (!net_eq(net, &amp;init_net)) {</div><div class='add'>+		table = kmemdup(table, sizeof(brnf_table), GFP_KERNEL);</div><div class='add'>+		if (!table)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brnet = net_generic(net, brnf_net_id);</div><div class='add'>+	table[0].data = &amp;brnet-&gt;call_arptables;</div><div class='add'>+	table[1].data = &amp;brnet-&gt;call_iptables;</div><div class='add'>+	table[2].data = &amp;brnet-&gt;call_ip6tables;</div><div class='add'>+	table[3].data = &amp;brnet-&gt;filter_vlan_tagged;</div><div class='add'>+	table[4].data = &amp;brnet-&gt;filter_pppoe_tagged;</div><div class='add'>+	table[5].data = &amp;brnet-&gt;pass_vlan_indev;</div><div class='add'>+</div><div class='add'>+	br_netfilter_sysctl_default(brnet);</div><div class='add'>+</div><div class='add'>+	brnet-&gt;ctl_hdr = register_net_sysctl_sz(net, "net/bridge", table,</div><div class='add'>+						ARRAY_SIZE(brnf_table));</div><div class='add'>+	if (!brnet-&gt;ctl_hdr) {</div><div class='add'>+		if (!net_eq(net, &amp;init_net))</div><div class='add'>+			kfree(table);</div><div class='add'>+</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_netfilter_sysctl_exit_net(struct net *net,</div><div class='add'>+					 struct brnf_net *brnet)</div><div class='add'>+{</div><div class='add'>+	const struct ctl_table *table = brnet-&gt;ctl_hdr-&gt;ctl_table_arg;</div><div class='add'>+</div><div class='add'>+	unregister_net_sysctl_table(brnet-&gt;ctl_hdr);</div><div class='add'>+	if (!net_eq(net, &amp;init_net))</div><div class='add'>+		kfree(table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init brnf_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return br_netfilter_sysctl_init_net(net);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __net_exit brnf_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct brnf_net *brnet;</div><div class='add'>+</div><div class='add'>+	brnet = net_generic(net, brnf_net_id);</div><div class='add'>+	if (brnet-&gt;enabled) {</div><div class='add'>+		nf_unregister_net_hooks(net, br_nf_ops, ARRAY_SIZE(br_nf_ops));</div><div class='add'>+		brnet-&gt;enabled = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+	br_netfilter_sysctl_exit_net(net, brnet);</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations brnf_net_ops __read_mostly = {</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+	.init = brnf_init_net,</div><div class='add'>+#endif</div><div class='add'>+	.exit = brnf_exit_net,</div><div class='add'>+	.id   = &amp;brnf_net_id,</div><div class='add'>+	.size = sizeof(struct brnf_net),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int __init br_netfilter_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1089,16 +1319,6 @@ static int __init br_netfilter_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-	brnf_sysctl_header = register_net_sysctl(&amp;init_net, "net/bridge", brnf_table);</div><div class='del'>-	if (brnf_sysctl_header == NULL) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "br_netfilter: can't register to sysctl.\n");</div><div class='del'>-		unregister_netdevice_notifier(&amp;brnf_notifier);</div><div class='del'>-		unregister_pernet_subsys(&amp;brnf_net_ops);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	RCU_INIT_POINTER(nf_br_ops, &amp;br_ops);</div><div class='ctx'> 	printk(KERN_NOTICE "Bridge firewalling registered\n");</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1109,9 +1329,6 @@ static void __exit br_netfilter_fini(void)</div><div class='ctx'> 	RCU_INIT_POINTER(nf_br_ops, NULL);</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;brnf_notifier);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;brnf_net_ops);</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-	unregister_net_sysctl_table(brnf_sysctl_header);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(br_netfilter_init);</div><div class='head'>diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c<br/>index 96c072e71ea2..e0421eaa3abc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netfilter_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netfilter_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netfilter_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_netfilter_ipv6.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Handle firewalling</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='ctx'>  *	Bart De Schuymer		&lt;bdschuym@pandora.be&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Lennert dedicates this file to Kerstin Wurdinger.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -44,62 +40,6 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* We only check the length. A bridge shouldn't do any hop-by-hop stuff</div><div class='del'>- * anyway</div><div class='del'>- */</div><div class='del'>-static int br_nf_check_hbh_len(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	unsigned char *raw = (u8 *)(ipv6_hdr(skb) + 1);</div><div class='del'>-	u32 pkt_len;</div><div class='del'>-	const unsigned char *nh = skb_network_header(skb);</div><div class='del'>-	int off = raw - nh;</div><div class='del'>-	int len = (raw[1] + 1) &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	if ((raw + len) - skb-&gt;data &gt; skb_headlen(skb))</div><div class='del'>-		goto bad;</div><div class='del'>-</div><div class='del'>-	off += 2;</div><div class='del'>-	len -= 2;</div><div class='del'>-</div><div class='del'>-	while (len &gt; 0) {</div><div class='del'>-		int optlen = nh[off + 1] + 2;</div><div class='del'>-</div><div class='del'>-		switch (nh[off]) {</div><div class='del'>-		case IPV6_TLV_PAD1:</div><div class='del'>-			optlen = 1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPV6_TLV_PADN:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPV6_TLV_JUMBO:</div><div class='del'>-			if (nh[off + 1] != 4 || (off &amp; 3) != 2)</div><div class='del'>-				goto bad;</div><div class='del'>-			pkt_len = ntohl(*(__be32 *)(nh + off + 2));</div><div class='del'>-			if (pkt_len &lt;= IPV6_MAXPLEN ||</div><div class='del'>-			    ipv6_hdr(skb)-&gt;payload_len)</div><div class='del'>-				goto bad;</div><div class='del'>-			if (pkt_len &gt; skb-&gt;len - sizeof(struct ipv6hdr))</div><div class='del'>-				goto bad;</div><div class='del'>-			if (pskb_trim_rcsum(skb,</div><div class='del'>-					    pkt_len + sizeof(struct ipv6hdr)))</div><div class='del'>-				goto bad;</div><div class='del'>-			nh = skb_network_header(skb);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			if (optlen &gt; len)</div><div class='del'>-				goto bad;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		off += optlen;</div><div class='del'>-		len -= optlen;</div><div class='del'>-	}</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-bad:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int br_validate_ipv6(struct net *net, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *hdr;</div><div class='hunk'>@@ -119,21 +59,19 @@ int br_validate_ipv6(struct net *net, struct sk_buff *skb)</div><div class='ctx'> 		goto inhdr_error;</div><div class='ctx'> </div><div class='ctx'> 	pkt_len = ntohs(hdr-&gt;payload_len);</div><div class='add'>+	if (hdr-&gt;nexthdr == NEXTHDR_HOP &amp;&amp; nf_ip6_check_hbh_len(skb, &amp;pkt_len))</div><div class='add'>+		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (pkt_len || hdr-&gt;nexthdr != NEXTHDR_HOP) {</div><div class='del'>-		if (pkt_len + ip6h_len &gt; skb-&gt;len) {</div><div class='del'>-			__IP6_INC_STATS(net, idev,</div><div class='del'>-					IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='del'>-		if (pskb_trim_rcsum(skb, pkt_len + ip6h_len)) {</div><div class='del'>-			__IP6_INC_STATS(net, idev,</div><div class='del'>-					IPSTATS_MIB_INDISCARDS);</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='add'>+	if (pkt_len + ip6h_len &gt; skb-&gt;len) {</div><div class='add'>+		__IP6_INC_STATS(net, idev,</div><div class='add'>+				IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='add'>+		goto drop;</div><div class='ctx'> 	}</div><div class='del'>-	if (hdr-&gt;nexthdr == NEXTHDR_HOP &amp;&amp; br_nf_check_hbh_len(skb))</div><div class='add'>+	if (pskb_trim_rcsum(skb, pkt_len + ip6h_len)) {</div><div class='add'>+		__IP6_INC_STATS(net, idev,</div><div class='add'>+				IPSTATS_MIB_INDISCARDS);</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));</div><div class='ctx'> 	/* No IP options in IPv6 header; however it should be</div><div class='hunk'>@@ -164,9 +102,15 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc</div><div class='ctx'> {</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	struct net_device *dev = skb-&gt;dev, *br_indev;</div><div class='ctx'> 	const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();</div><div class='ctx'> </div><div class='add'>+	br_indev = nf_bridge_get_physindev(skb, net);</div><div class='add'>+	if (!br_indev) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nf_bridge-&gt;frag_max_size = IP6CB(skb)-&gt;frag_max_size;</div><div class='ctx'> </div><div class='ctx'> 	if (nf_bridge-&gt;pkt_otherhost) {</div><div class='hunk'>@@ -184,7 +128,7 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (skb_dst(skb)-&gt;dev == dev) {</div><div class='del'>-			skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+			skb-&gt;dev = br_indev;</div><div class='ctx'> 			nf_bridge_update_protocol(skb);</div><div class='ctx'> 			nf_bridge_push_encap_header(skb);</div><div class='ctx'> 			br_nf_hook_thresh(NF_BR_PRE_ROUTING,</div><div class='hunk'>@@ -195,15 +139,16 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc</div><div class='ctx'> 		ether_addr_copy(eth_hdr(skb)-&gt;h_dest, dev-&gt;dev_addr);</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_HOST;</div><div class='ctx'> 	} else {</div><div class='del'>-		rt = bridge_parent_rtable(nf_bridge-&gt;physindev);</div><div class='add'>+		rt = bridge_parent_rtable(br_indev);</div><div class='ctx'> 		if (!rt) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		skb_dst_drop(skb);</div><div class='ctx'> 		skb_dst_set_noref(skb, &amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = nf_bridge-&gt;physindev;</div><div class='add'>+	skb-&gt;dev = br_indev;</div><div class='ctx'> 	nf_bridge_update_protocol(skb);</div><div class='ctx'> 	nf_bridge_push_encap_header(skb);</div><div class='ctx'> 	br_nf_hook_thresh(NF_BR_PRE_ROUTING, net, sk, skb,</div><div class='hunk'>@@ -222,18 +167,20 @@ unsigned int br_nf_pre_routing_ipv6(void *priv,</div><div class='ctx'> 	struct nf_bridge_info *nf_bridge;</div><div class='ctx'> </div><div class='ctx'> 	if (br_validate_ipv6(state-&gt;net, skb))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_IP_INHDR, 0);</div><div class='ctx'> </div><div class='del'>-	nf_bridge_put(skb-&gt;nf_bridge);</div><div class='del'>-	if (!nf_bridge_alloc(skb))</div><div class='del'>-		return NF_DROP;</div><div class='del'>-	if (!setup_pre_routing(skb))</div><div class='del'>-		return NF_DROP;</div><div class='add'>+	nf_bridge = nf_bridge_alloc(skb);</div><div class='add'>+	if (!nf_bridge)</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_NOMEM, 0);</div><div class='add'>+	if (!setup_pre_routing(skb, state-&gt;net))</div><div class='add'>+		return NF_DROP_REASON(skb, SKB_DROP_REASON_DEV_READY, 0);</div><div class='ctx'> </div><div class='ctx'> 	nf_bridge = nf_bridge_info_get(skb);</div><div class='ctx'> 	nf_bridge-&gt;ipv6_daddr = ipv6_hdr(skb)-&gt;daddr;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	skb-&gt;transport_header = skb-&gt;network_header + sizeof(struct ipv6hdr);</div><div class='add'>+</div><div class='ctx'> 	NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, state-&gt;net, state-&gt;sk, skb,</div><div class='ctx'> 		skb-&gt;dev, NULL,</div><div class='ctx'> 		br_nf_pre_routing_finish_ipv6);</div><div class='head'>diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c<br/>index ec2b58a09f76..0264730938f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_netlink.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Bridge netlink control interface</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Stephen Hemminger		&lt;shemminger@osdl.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,7 +16,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> #include "br_private_stp.h"</div><div class='add'>+#include "br_private_cfm.h"</div><div class='ctx'> #include "br_private_tunnel.h"</div><div class='add'>+#include "br_private_mcast_eht.h"</div><div class='ctx'> </div><div class='ctx'> static int __get_num_vlan_infos(struct net_bridge_vlan_group *vg,</div><div class='ctx'> 				u32 filter_mask)</div><div class='hunk'>@@ -97,15 +95,18 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg = NULL;</div><div class='ctx'> 	struct net_bridge_port *p = NULL;</div><div class='del'>-	struct net_bridge *br;</div><div class='del'>-	int num_vlan_infos;</div><div class='add'>+	struct net_bridge *br = NULL;</div><div class='add'>+	u32 num_cfm_peer_mep_infos;</div><div class='add'>+	u32 num_cfm_mep_infos;</div><div class='ctx'> 	size_t vinfo_sz = 0;</div><div class='add'>+	int num_vlan_infos;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (br_port_exists(dev)) {</div><div class='del'>-		p = br_port_get_rcu(dev);</div><div class='del'>-		vg = nbp_vlan_group_rcu(p);</div><div class='del'>-	} else if (dev-&gt;priv_flags &amp; IFF_EBRIDGE) {</div><div class='add'>+	if (netif_is_bridge_port(dev)) {</div><div class='add'>+		p = br_port_get_check_rcu(dev);</div><div class='add'>+		if (p)</div><div class='add'>+			vg = nbp_vlan_group_rcu(p);</div><div class='add'>+	} else if (netif_is_bridge_master(dev)) {</div><div class='ctx'> 		br = netdev_priv(dev);</div><div class='ctx'> 		vg = br_vlan_group_rcu(br);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -118,6 +119,52 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,</div><div class='ctx'> 	/* Each VLAN is returned in bridge_vlan_info along with flags */</div><div class='ctx'> 	vinfo_sz += num_vlan_infos * nla_total_size(sizeof(struct bridge_vlan_info));</div><div class='ctx'> </div><div class='add'>+	if (p &amp;&amp; vg &amp;&amp; (filter_mask &amp; RTEXT_FILTER_MST))</div><div class='add'>+		vinfo_sz += br_mst_info_size(vg);</div><div class='add'>+</div><div class='add'>+	if (!(filter_mask &amp; RTEXT_FILTER_CFM_STATUS))</div><div class='add'>+		return vinfo_sz;</div><div class='add'>+</div><div class='add'>+	if (!br)</div><div class='add'>+		return vinfo_sz;</div><div class='add'>+</div><div class='add'>+	/* CFM status info must be added */</div><div class='add'>+	br_cfm_mep_count(br, &amp;num_cfm_mep_infos);</div><div class='add'>+	br_cfm_peer_mep_count(br, &amp;num_cfm_peer_mep_infos);</div><div class='add'>+</div><div class='add'>+	vinfo_sz += nla_total_size(0);	/* IFLA_BRIDGE_CFM */</div><div class='add'>+	/* For each status struct the MEP instance (u32) is added */</div><div class='add'>+	/* MEP instance (u32) + br_cfm_mep_status */</div><div class='add'>+	vinfo_sz += num_cfm_mep_infos *</div><div class='add'>+		     /*IFLA_BRIDGE_CFM_MEP_STATUS_INSTANCE */</div><div class='add'>+		    (nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_MEP_STATUS_OPCODE_UNEXP_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_MEP_STATUS_VERSION_UNEXP_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_MEP_STATUS_RX_LEVEL_LOW_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32)));</div><div class='add'>+	/* MEP instance (u32) + br_cfm_cc_peer_status */</div><div class='add'>+	vinfo_sz += num_cfm_peer_mep_infos *</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_INSTANCE */</div><div class='add'>+		    (nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_PEER_MEPID */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_CCM_DEFECT */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_RDI */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_PORT_TLV_VALUE */</div><div class='add'>+		     + nla_total_size(sizeof(u8))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_IF_TLV_VALUE */</div><div class='add'>+		     + nla_total_size(sizeof(u8))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_TLV_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32))</div><div class='add'>+		     /* IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEQ_UNEXP_SEEN */</div><div class='add'>+		     + nla_total_size(sizeof(u32)));</div><div class='add'>+</div><div class='ctx'> 	return vinfo_sz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,6 +187,9 @@ static inline size_t br_port_info_size(void)</div><div class='ctx'> 		+ nla_total_size(1)	/* IFLA_BRPORT_VLAN_TUNNEL */</div><div class='ctx'> 		+ nla_total_size(1)	/* IFLA_BRPORT_NEIGH_SUPPRESS */</div><div class='ctx'> 		+ nla_total_size(1)	/* IFLA_BRPORT_ISOLATED */</div><div class='add'>+		+ nla_total_size(1)	/* IFLA_BRPORT_LOCKED */</div><div class='add'>+		+ nla_total_size(1)	/* IFLA_BRPORT_MAB */</div><div class='add'>+		+ nla_total_size(1)	/* IFLA_BRPORT_NEIGH_VLAN_SUPPRESS */</div><div class='ctx'> 		+ nla_total_size(sizeof(struct ifla_bridge_id))	/* IFLA_BRPORT_ROOT_ID */</div><div class='ctx'> 		+ nla_total_size(sizeof(struct ifla_bridge_id))	/* IFLA_BRPORT_BRIDGE_ID */</div><div class='ctx'> 		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_DESIGNATED_PORT */</div><div class='hunk'>@@ -153,8 +203,15 @@ static inline size_t br_port_info_size(void)</div><div class='ctx'> 		+ nla_total_size_64bit(sizeof(u64)) /* IFLA_BRPORT_HOLD_TIMER */</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MULTICAST_ROUTER */</div><div class='add'>+		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_N_GROUPS */</div><div class='add'>+		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_MAX_GROUPS */</div><div class='ctx'> #endif</div><div class='ctx'> 		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_GROUP_FWD_MASK */</div><div class='add'>+		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MRP_RING_OPEN */</div><div class='add'>+		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MRP_IN_OPEN */</div><div class='add'>+		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT */</div><div class='add'>+		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_EHT_HOSTS_CNT */</div><div class='add'>+		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_BACKUP_NHID */</div><div class='ctx'> 		+ 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +274,15 @@ static int br_port_fill_attrs(struct sk_buff *skb,</div><div class='ctx'> 	    nla_put_u16(skb, IFLA_BRPORT_GROUP_FWD_MASK, p-&gt;group_fwd_mask) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BRPORT_NEIGH_SUPPRESS,</div><div class='ctx'> 		       !!(p-&gt;flags &amp; BR_NEIGH_SUPPRESS)) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_BRPORT_ISOLATED, !!(p-&gt;flags &amp; BR_ISOLATED)))</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_MRP_RING_OPEN, !!(p-&gt;flags &amp;</div><div class='add'>+							  BR_MRP_LOST_CONT)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_MRP_IN_OPEN,</div><div class='add'>+		       !!(p-&gt;flags &amp; BR_MRP_LOST_IN_CONT)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_ISOLATED, !!(p-&gt;flags &amp; BR_ISOLATED)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_LOCKED, !!(p-&gt;flags &amp; BR_PORT_LOCKED)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_MAB, !!(p-&gt;flags &amp; BR_PORT_MAB)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,</div><div class='add'>+		       !!(p-&gt;flags &amp; BR_NEIGH_VLAN_SUPPRESS)))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	timerval = br_timer_value(&amp;p-&gt;message_age_timer);</div><div class='hunk'>@@ -235,7 +300,15 @@ static int br_port_fill_attrs(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 	if (nla_put_u8(skb, IFLA_BRPORT_MULTICAST_ROUTER,</div><div class='del'>-		       p-&gt;multicast_router))</div><div class='add'>+		       p-&gt;multicast_ctx.multicast_router) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT,</div><div class='add'>+			p-&gt;multicast_eht_hosts_limit) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BRPORT_MCAST_EHT_HOSTS_CNT,</div><div class='add'>+			p-&gt;multicast_eht_hosts_cnt) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BRPORT_MCAST_N_GROUPS,</div><div class='add'>+			br_multicast_ngroups_get(&amp;p-&gt;multicast_ctx)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BRPORT_MCAST_MAX_GROUPS,</div><div class='add'>+			br_multicast_ngroups_get_max(&amp;p-&gt;multicast_ctx)))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +320,10 @@ static int br_port_fill_attrs(struct sk_buff *skb,</div><div class='ctx'> 			    backup_p-&gt;dev-&gt;ifindex);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	if (p-&gt;backup_nhid &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, IFLA_BRPORT_BACKUP_NHID, p-&gt;backup_nhid))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,9 +452,12 @@ nla_put_failure:</div><div class='ctx'> static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 			  const struct net_bridge_port *port,</div><div class='ctx'> 			  u32 pid, u32 seq, int event, unsigned int flags,</div><div class='del'>-			  u32 filter_mask, const struct net_device *dev)</div><div class='add'>+			  u32 filter_mask, const struct net_device *dev,</div><div class='add'>+			  bool getlink)</div><div class='ctx'> {</div><div class='del'>-	u8 operstate = netif_running(dev) ? dev-&gt;operstate : IF_OPER_DOWN;</div><div class='add'>+	u8 operstate = netif_running(dev) ? READ_ONCE(dev-&gt;operstate) :</div><div class='add'>+					    IF_OPER_DOWN;</div><div class='add'>+	struct nlattr *af = NULL;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	struct ifinfomsg *hdr;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='hunk'>@@ -387,7 +467,7 @@ static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 	else</div><div class='ctx'> 		br = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	br_debug(br, "br_fill_info event %d port %s master %s\n",</div><div class='add'>+	br_debug(br, "br_fill_ifinfo event %d port %s master %s\n",</div><div class='ctx'> 		     event, dev-&gt;name, br-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*hdr), flags);</div><div class='hunk'>@@ -399,7 +479,7 @@ static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 	hdr-&gt;__ifi_pad = 0;</div><div class='ctx'> 	hdr-&gt;ifi_type = dev-&gt;type;</div><div class='ctx'> 	hdr-&gt;ifi_index = dev-&gt;ifindex;</div><div class='del'>-	hdr-&gt;ifi_flags = dev_get_flags(dev);</div><div class='add'>+	hdr-&gt;ifi_flags = netif_get_flags(dev);</div><div class='ctx'> 	hdr-&gt;ifi_change = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(skb, IFLA_IFNAME, dev-&gt;name) ||</div><div class='hunk'>@@ -413,19 +493,29 @@ static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (event == RTM_NEWLINK &amp;&amp; port) {</div><div class='del'>-		struct nlattr *nest</div><div class='del'>-			= nla_nest_start(skb, IFLA_PROTINFO | NLA_F_NESTED);</div><div class='add'>+		struct nlattr *nest;</div><div class='ctx'> </div><div class='add'>+		nest = nla_nest_start(skb, IFLA_PROTINFO);</div><div class='ctx'> 		if (nest == NULL || br_port_fill_attrs(skb, port) &lt; 0)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		nla_nest_end(skb, nest);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (filter_mask &amp; (RTEXT_FILTER_BRVLAN |</div><div class='add'>+			   RTEXT_FILTER_BRVLAN_COMPRESSED |</div><div class='add'>+			   RTEXT_FILTER_MRP |</div><div class='add'>+			   RTEXT_FILTER_CFM_CONFIG |</div><div class='add'>+			   RTEXT_FILTER_CFM_STATUS |</div><div class='add'>+			   RTEXT_FILTER_MST)) {</div><div class='add'>+		af = nla_nest_start_noflag(skb, IFLA_AF_SPEC);</div><div class='add'>+		if (!af)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check if  the VID information is requested */</div><div class='ctx'> 	if ((filter_mask &amp; RTEXT_FILTER_BRVLAN) ||</div><div class='ctx'> 	    (filter_mask &amp; RTEXT_FILTER_BRVLAN_COMPRESSED)) {</div><div class='ctx'> 		struct net_bridge_vlan_group *vg;</div><div class='del'>-		struct nlattr *af;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='ctx'> 		/* RCU needed because of the VLAN locking rules (rcu || rtnl) */</div><div class='hunk'>@@ -439,11 +529,6 @@ static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		af = nla_nest_start(skb, IFLA_AF_SPEC);</div><div class='del'>-		if (!af) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		}</div><div class='ctx'> 		if (filter_mask &amp; RTEXT_FILTER_BRVLAN_COMPRESSED)</div><div class='ctx'> 			err = br_fill_ifvlaninfo_compressed(skb, vg);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -454,10 +539,80 @@ static int br_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='del'>-		nla_nest_end(skb, af);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter_mask &amp; RTEXT_FILTER_MRP) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!br_mrp_enabled(br) || port)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		err = br_mrp_fill_info(skb, br);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter_mask &amp; (RTEXT_FILTER_CFM_CONFIG | RTEXT_FILTER_CFM_STATUS)) {</div><div class='add'>+		struct nlattr *cfm_nest = NULL;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!br_cfm_created(br) || port)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		cfm_nest = nla_nest_start(skb, IFLA_BRIDGE_CFM);</div><div class='add'>+		if (!cfm_nest)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (filter_mask &amp; RTEXT_FILTER_CFM_CONFIG) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			err = br_cfm_config_fill_info(skb, br);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			if (err)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (filter_mask &amp; RTEXT_FILTER_CFM_STATUS) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			err = br_cfm_status_fill_info(skb, br, getlink);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			if (err)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, cfm_nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((filter_mask &amp; RTEXT_FILTER_MST) &amp;&amp;</div><div class='add'>+	    br_opt_get(br, BROPT_MST_ENABLED) &amp;&amp; port) {</div><div class='add'>+		const struct net_bridge_vlan_group *vg = nbp_vlan_group(port);</div><div class='add'>+		struct nlattr *mst_nest;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!vg || !vg-&gt;num_vlans)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		mst_nest = nla_nest_start(skb, IFLA_BRIDGE_MST);</div><div class='add'>+		if (!mst_nest)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		err = br_mst_fill_info(skb, vg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, mst_nest);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='add'>+	if (af) {</div><div class='add'>+		if (nlmsg_get_pos(skb) - (void *)af &gt; nla_attr_size(0))</div><div class='add'>+			nla_nest_end(skb, af);</div><div class='add'>+		else</div><div class='add'>+			nla_nest_cancel(skb, af);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -466,11 +621,9 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Notify listeners of a change in bridge or port information */</div><div class='del'>-void br_ifinfo_notify(int event, const struct net_bridge *br,</div><div class='del'>-		      const struct net_bridge_port *port)</div><div class='add'>+void br_info_notify(int event, const struct net_bridge *br,</div><div class='add'>+		    const struct net_bridge_port *port, u32 filter)</div><div class='ctx'> {</div><div class='del'>-	u32 filter = RTEXT_FILTER_BRVLAN_COMPRESSED;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='hunk'>@@ -495,7 +648,7 @@ void br_ifinfo_notify(int event, const struct net_bridge *br,</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = br_fill_ifinfo(skb, port, 0, 0, event, 0, filter, dev);</div><div class='add'>+	err = br_fill_ifinfo(skb, port, 0, 0, event, 0, filter, dev, false);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in br_nlmsg_size() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -508,6 +661,15 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_LINK, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Notify listeners of a change in bridge or port information */</div><div class='add'>+void br_ifinfo_notify(int event, const struct net_bridge *br,</div><div class='add'>+		      const struct net_bridge_port *port)</div><div class='add'>+{</div><div class='add'>+	u32 filter = RTEXT_FILTER_BRVLAN_COMPRESSED;</div><div class='add'>+</div><div class='add'>+	br_info_notify(event, br, port, filter);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Dump information about all ports, in response to GETLINK</div><div class='ctx'>  */</div><div class='hunk'>@@ -517,15 +679,19 @@ int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 	struct net_bridge_port *port = br_port_get_rtnl(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!port &amp;&amp; !(filter_mask &amp; RTEXT_FILTER_BRVLAN) &amp;&amp;</div><div class='del'>-	    !(filter_mask &amp; RTEXT_FILTER_BRVLAN_COMPRESSED))</div><div class='add'>+	    !(filter_mask &amp; RTEXT_FILTER_BRVLAN_COMPRESSED) &amp;&amp;</div><div class='add'>+	    !(filter_mask &amp; RTEXT_FILTER_MRP) &amp;&amp;</div><div class='add'>+	    !(filter_mask &amp; RTEXT_FILTER_CFM_CONFIG) &amp;&amp;</div><div class='add'>+	    !(filter_mask &amp; RTEXT_FILTER_CFM_STATUS))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK, nlflags,</div><div class='del'>-			      filter_mask, dev);</div><div class='add'>+			      filter_mask, dev, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,</div><div class='del'>-			int cmd, struct bridge_vlan_info *vinfo, bool *changed)</div><div class='add'>+			int cmd, struct bridge_vlan_info *vinfo, bool *changed,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	bool curr_change;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -537,11 +703,11 @@ static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 			 * per-VLAN entry as well</div><div class='ctx'> 			 */</div><div class='ctx'> 			err = nbp_vlan_add(p, vinfo-&gt;vid, vinfo-&gt;flags,</div><div class='del'>-					   &amp;curr_change);</div><div class='add'>+					   &amp;curr_change, extack);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vinfo-&gt;flags |= BRIDGE_VLAN_INFO_BRENTRY;</div><div class='ctx'> 			err = br_vlan_add(br, vinfo-&gt;vid, vinfo-&gt;flags,</div><div class='del'>-					  &amp;curr_change);</div><div class='add'>+					  &amp;curr_change, extack);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (curr_change)</div><div class='ctx'> 			*changed = true;</div><div class='hunk'>@@ -564,56 +730,81 @@ static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_process_vlan_info(struct net_bridge *br,</div><div class='del'>-				struct net_bridge_port *p, int cmd,</div><div class='del'>-				struct bridge_vlan_info *vinfo_curr,</div><div class='del'>-				struct bridge_vlan_info **vinfo_last,</div><div class='del'>-				bool *changed)</div><div class='add'>+int br_process_vlan_info(struct net_bridge *br,</div><div class='add'>+			 struct net_bridge_port *p, int cmd,</div><div class='add'>+			 struct bridge_vlan_info *vinfo_curr,</div><div class='add'>+			 struct bridge_vlan_info **vinfo_last,</div><div class='add'>+			 bool *changed,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	if (!vinfo_curr-&gt;vid || vinfo_curr-&gt;vid &gt;= VLAN_VID_MASK)</div><div class='add'>+	int err, rtm_cmd;</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_valid_id(vinfo_curr-&gt;vid, extack))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* needed for vlan-only NEWVLAN/DELVLAN notifications */</div><div class='add'>+	rtm_cmd = br_afspec_cmd_to_rtm(cmd);</div><div class='add'>+</div><div class='ctx'> 	if (vinfo_curr-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_BEGIN) {</div><div class='del'>-		/* check if we are already processing a range */</div><div class='del'>-		if (*vinfo_last)</div><div class='add'>+		if (!br_vlan_valid_range(vinfo_curr, *vinfo_last, extack))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		*vinfo_last = vinfo_curr;</div><div class='del'>-		/* don't allow range of pvids */</div><div class='del'>-		if ((*vinfo_last)-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*vinfo_last) {</div><div class='ctx'> 		struct bridge_vlan_info tmp_vinfo;</div><div class='del'>-		int v, err;</div><div class='del'>-</div><div class='del'>-		if (!(vinfo_curr-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_END))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		int v, v_change_start = 0;</div><div class='ctx'> </div><div class='del'>-		if (vinfo_curr-&gt;vid &lt;= (*vinfo_last)-&gt;vid)</div><div class='add'>+		if (!br_vlan_valid_range(vinfo_curr, *vinfo_last, extack))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;tmp_vinfo, *vinfo_last,</div><div class='ctx'> 		       sizeof(struct bridge_vlan_info));</div><div class='ctx'> 		for (v = (*vinfo_last)-&gt;vid; v &lt;= vinfo_curr-&gt;vid; v++) {</div><div class='add'>+			bool curr_change = false;</div><div class='add'>+</div><div class='ctx'> 			tmp_vinfo.vid = v;</div><div class='del'>-			err = br_vlan_info(br, p, cmd, &amp;tmp_vinfo, changed);</div><div class='add'>+			err = br_vlan_info(br, p, cmd, &amp;tmp_vinfo, &amp;curr_change,</div><div class='add'>+					   extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='add'>+			if (curr_change) {</div><div class='add'>+				*changed = curr_change;</div><div class='add'>+				if (!v_change_start)</div><div class='add'>+					v_change_start = v;</div><div class='add'>+			} else {</div><div class='add'>+				/* nothing to notify yet */</div><div class='add'>+				if (!v_change_start)</div><div class='add'>+					continue;</div><div class='add'>+				br_vlan_notify(br, p, v_change_start,</div><div class='add'>+					       v - 1, rtm_cmd);</div><div class='add'>+				v_change_start = 0;</div><div class='add'>+			}</div><div class='add'>+			cond_resched();</div><div class='ctx'> 		}</div><div class='add'>+		/* v_change_start is set only if the last/whole range changed */</div><div class='add'>+		if (v_change_start)</div><div class='add'>+			br_vlan_notify(br, p, v_change_start,</div><div class='add'>+				       v - 1, rtm_cmd);</div><div class='add'>+</div><div class='ctx'> 		*vinfo_last = NULL;</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return br_vlan_info(br, p, cmd, vinfo_curr, changed);</div><div class='add'>+	err = br_vlan_info(br, p, cmd, vinfo_curr, changed, extack);</div><div class='add'>+	if (*changed)</div><div class='add'>+		br_vlan_notify(br, p, vinfo_curr-&gt;vid, 0, rtm_cmd);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int br_afspec(struct net_bridge *br,</div><div class='ctx'> 		     struct net_bridge_port *p,</div><div class='ctx'> 		     struct nlattr *af_spec,</div><div class='del'>-		     int cmd, bool *changed)</div><div class='add'>+		     int cmd, bool *changed,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bridge_vlan_info *vinfo_curr = NULL;</div><div class='ctx'> 	struct bridge_vlan_info *vinfo_last = NULL;</div><div class='hunk'>@@ -643,7 +834,35 @@ static int br_afspec(struct net_bridge *br,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			vinfo_curr = nla_data(attr);</div><div class='ctx'> 			err = br_process_vlan_info(br, p, cmd, vinfo_curr,</div><div class='del'>-						   &amp;vinfo_last, changed);</div><div class='add'>+						   &amp;vinfo_last, changed,</div><div class='add'>+						   extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_BRIDGE_MRP:</div><div class='add'>+			err = br_mrp_parse(br, p, attr, cmd, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_BRIDGE_CFM:</div><div class='add'>+			err = br_cfm_parse(br, p, attr, cmd, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_BRIDGE_MST:</div><div class='add'>+			if (!p) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "MST states can only be set on bridge ports");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (cmd != RTM_SETLINK) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "MST states can only be set through RTM_SETLINK");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = br_mst_process(p, attr, extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -654,6 +873,8 @@ static int br_afspec(struct net_bridge *br,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {</div><div class='add'>+	[IFLA_BRPORT_UNSPEC]	= { .strict_start_type =</div><div class='add'>+					IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT + 1 },</div><div class='ctx'> 	[IFLA_BRPORT_STATE]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BRPORT_COST]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BRPORT_PRIORITY]	= { .type = NLA_U16 },</div><div class='hunk'>@@ -673,7 +894,14 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BRPORT_GROUP_FWD_MASK] = { .type = NLA_U16 },</div><div class='ctx'> 	[IFLA_BRPORT_NEIGH_SUPPRESS] = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BRPORT_ISOLATED]	= { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BRPORT_LOCKED] = { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BRPORT_MAB] = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BRPORT_BACKUP_PORT] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRPORT_MCAST_N_GROUPS] = { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BRPORT_MCAST_MAX_GROUPS] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BRPORT_NEIGH_VLAN_SUPPRESS] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[IFLA_BRPORT_BACKUP_NHID] = { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Change the state of the port and notify spanning tree */</div><div class='hunk'>@@ -699,87 +927,78 @@ static int br_set_port_state(struct net_bridge_port *p, u8 state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set/clear or port flags based on attribute */</div><div class='del'>-static int br_set_port_flag(struct net_bridge_port *p, struct nlattr *tb[],</div><div class='del'>-			    int attrtype, unsigned long mask)</div><div class='add'>+static void br_set_port_flag(struct net_bridge_port *p, struct nlattr *tb[],</div><div class='add'>+			     int attrtype, unsigned long mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	if (!tb[attrtype])</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_get_u8(tb[attrtype]))</div><div class='del'>-		flags = p-&gt;flags | mask;</div><div class='add'>+		p-&gt;flags |= mask;</div><div class='ctx'> 	else</div><div class='del'>-		flags = p-&gt;flags &amp; ~mask;</div><div class='del'>-</div><div class='del'>-	err = br_switchdev_set_port_flag(p, flags, mask);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	p-&gt;flags = flags;</div><div class='del'>-	return 0;</div><div class='add'>+		p-&gt;flags &amp;= ~mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Process bridge protocol info on port */</div><div class='del'>-static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])</div><div class='add'>+static int br_setport(struct net_bridge_port *p, struct nlattr *tb[],</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long old_flags = p-&gt;flags;</div><div class='del'>-	bool br_vlan_tunnel_old = false;</div><div class='add'>+	unsigned long old_flags, changed_mask;</div><div class='add'>+	bool br_vlan_tunnel_old;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	old_flags = p-&gt;flags;</div><div class='add'>+	br_vlan_tunnel_old = (old_flags &amp; BR_VLAN_TUNNEL) ? true : false;</div><div class='add'>+</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE,</div><div class='add'>+			 BR_MULTICAST_FAST_LEAVE);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST,</div><div class='add'>+			 BR_MULTICAST_TO_UNICAST);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_VLAN_TUNNEL, BR_VLAN_TUNNEL);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_NEIGH_SUPPRESS, BR_NEIGH_SUPPRESS);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_ISOLATED, BR_ISOLATED);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_LOCKED, BR_PORT_LOCKED);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_MAB, BR_PORT_MAB);</div><div class='add'>+	br_set_port_flag(p, tb, IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,</div><div class='add'>+			 BR_NEIGH_VLAN_SUPPRESS);</div><div class='add'>+</div><div class='add'>+	if ((p-&gt;flags &amp; BR_PORT_MAB) &amp;&amp;</div><div class='add'>+	    (!(p-&gt;flags &amp; BR_PORT_LOCKED) || !(p-&gt;flags &amp; BR_LEARNING))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Bridge port must be locked and have learning enabled when MAB is enabled");</div><div class='add'>+		p-&gt;flags = old_flags;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (!(p-&gt;flags &amp; BR_PORT_MAB) &amp;&amp; (old_flags &amp; BR_PORT_MAB)) {</div><div class='add'>+		struct net_bridge_fdb_flush_desc desc = {</div><div class='add'>+			.flags = BIT(BR_FDB_LOCKED),</div><div class='add'>+			.flags_mask = BIT(BR_FDB_LOCKED),</div><div class='add'>+			.port_ifindex = p-&gt;dev-&gt;ifindex,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		br_fdb_flush(p-&gt;br, &amp;desc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	changed_mask = old_flags ^ p-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	br_vlan_tunnel_old = (p-&gt;flags &amp; BR_VLAN_TUNNEL) ? true : false;</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_VLAN_TUNNEL, BR_VLAN_TUNNEL);</div><div class='del'>-	if (err)</div><div class='add'>+	err = br_switchdev_set_port_flag(p, p-&gt;flags, changed_mask, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		p-&gt;flags = old_flags;</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (br_vlan_tunnel_old &amp;&amp; !(p-&gt;flags &amp; BR_VLAN_TUNNEL))</div><div class='ctx'> 		nbp_vlan_tunnel_info_flush(p);</div><div class='ctx'> </div><div class='add'>+	br_port_flags_change(p, changed_mask);</div><div class='add'>+</div><div class='ctx'> 	if (tb[IFLA_BRPORT_COST]) {</div><div class='ctx'> 		err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -805,10 +1024,27 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])</div><div class='ctx'> 	if (tb[IFLA_BRPORT_MULTICAST_ROUTER]) {</div><div class='ctx'> 		u8 mcast_router = nla_get_u8(tb[IFLA_BRPORT_MULTICAST_ROUTER]);</div><div class='ctx'> </div><div class='del'>-		err = br_multicast_set_port_router(p, mcast_router);</div><div class='add'>+		err = br_multicast_set_port_router(&amp;p-&gt;multicast_ctx,</div><div class='add'>+						   mcast_router);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT]) {</div><div class='add'>+		u32 hlimit;</div><div class='add'>+</div><div class='add'>+		hlimit = nla_get_u32(tb[IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT]);</div><div class='add'>+		err = br_multicast_eht_set_hosts_limit(p, hlimit);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BRPORT_MCAST_MAX_GROUPS]) {</div><div class='add'>+		u32 max_groups;</div><div class='add'>+</div><div class='add'>+		max_groups = nla_get_u32(tb[IFLA_BRPORT_MCAST_MAX_GROUPS]);</div><div class='add'>+		br_multicast_ngroups_set_max(&amp;p-&gt;multicast_ctx, max_groups);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_BRPORT_GROUP_FWD_MASK]) {</div><div class='hunk'>@@ -819,15 +1055,6 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])</div><div class='ctx'> 		p-&gt;group_fwd_mask = fwd_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_NEIGH_SUPPRESS,</div><div class='del'>-			       BR_NEIGH_SUPPRESS);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = br_set_port_flag(p, tb, IFLA_BRPORT_ISOLATED, BR_ISOLATED);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	if (tb[IFLA_BRPORT_BACKUP_PORT]) {</div><div class='ctx'> 		struct net_device *backup_dev = NULL;</div><div class='ctx'> 		u32 backup_ifindex;</div><div class='hunk'>@@ -845,12 +1072,18 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	br_port_flags_change(p, old_flags ^ p-&gt;flags);</div><div class='add'>+	if (tb[IFLA_BRPORT_BACKUP_NHID]) {</div><div class='add'>+		u32 backup_nhid = nla_get_u32(tb[IFLA_BRPORT_BACKUP_NHID]);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(p-&gt;backup_nhid, backup_nhid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Change state and parameters on port. */</div><div class='del'>-int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)</div><div class='add'>+int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags,</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);</div><div class='ctx'> 	struct nlattr *tb[IFLA_BRPORT_MAX + 1];</div><div class='hunk'>@@ -874,13 +1107,15 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)</div><div class='ctx'> </div><div class='ctx'> 	if (p &amp;&amp; protinfo) {</div><div class='ctx'> 		if (protinfo-&gt;nla_type &amp; NLA_F_NESTED) {</div><div class='del'>-			err = nla_parse_nested(tb, IFLA_BRPORT_MAX, protinfo,</div><div class='del'>-					       br_port_policy, NULL);</div><div class='add'>+			err = nla_parse_nested_deprecated(tb, IFLA_BRPORT_MAX,</div><div class='add'>+							  protinfo,</div><div class='add'>+							  br_port_policy,</div><div class='add'>+							  NULL);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_bh(&amp;p-&gt;br-&gt;lock);</div><div class='del'>-			err = br_setport(p, tb);</div><div class='add'>+			err = br_setport(p, tb, extack);</div><div class='ctx'> 			spin_unlock_bh(&amp;p-&gt;br-&gt;lock);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Binary compatibility with old RSTP */</div><div class='hunk'>@@ -897,7 +1132,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (afspec)</div><div class='del'>-		err = br_afspec(br, p, afspec, RTM_SETLINK, &amp;changed);</div><div class='add'>+		err = br_afspec(br, p, afspec, RTM_SETLINK, &amp;changed, extack);</div><div class='ctx'> </div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		br_ifinfo_notify(RTM_NEWLINK, br, p);</div><div class='hunk'>@@ -920,10 +1155,10 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)</div><div class='ctx'> </div><div class='ctx'> 	p = br_port_get_rtnl(dev);</div><div class='ctx'> 	/* We want to accept dev as bridge itself as well */</div><div class='del'>-	if (!p &amp;&amp; !(dev-&gt;priv_flags &amp; IFF_EBRIDGE))</div><div class='add'>+	if (!p &amp;&amp; !netif_is_bridge_master(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = br_afspec(br, p, afspec, RTM_DELLINK, &amp;changed);</div><div class='add'>+	err = br_afspec(br, p, afspec, RTM_DELLINK, &amp;changed, NULL);</div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		/* Send RTM_NEWLINK because userspace</div><div class='ctx'> 		 * expects RTM_NEWLINK for vlan dels</div><div class='hunk'>@@ -947,15 +1182,9 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='del'>-	if (data[IFLA_BR_VLAN_PROTOCOL]) {</div><div class='del'>-		switch (nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL])) {</div><div class='del'>-		case htons(ETH_P_8021Q):</div><div class='del'>-		case htons(ETH_P_8021AD):</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EPROTONOSUPPORT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (data[IFLA_BR_VLAN_PROTOCOL] &amp;&amp;</div><div class='add'>+	    !eth_type_vlan(nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL])))</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_VLAN_DEFAULT_PVID]) {</div><div class='ctx'> 		__u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]);</div><div class='hunk'>@@ -981,7 +1210,7 @@ static int br_port_slave_changelink(struct net_device *brdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;lock);</div><div class='del'>-	ret = br_setport(br_port_get_rtnl(dev), data);</div><div class='add'>+	ret = br_setport(br_port_get_rtnl(dev), data, extack);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1001,6 +1230,8 @@ static size_t br_port_get_slave_size(const struct net_device *brdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {</div><div class='add'>+	[IFLA_BR_UNSPEC]	= { .strict_start_type =</div><div class='add'>+				    IFLA_BR_FDB_N_LEARNED },</div><div class='ctx'> 	[IFLA_BR_FORWARD_DELAY]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BR_HELLO_TIME]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BR_MAX_AGE]	= { .type = NLA_U32 },</div><div class='hunk'>@@ -1034,6 +1265,11 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BR_MCAST_STATS_ENABLED] = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BR_MCAST_IGMP_VERSION] = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BR_MCAST_MLD_VERSION] = { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BR_VLAN_STATS_PER_PORT] = { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BR_MULTI_BOOLOPT] =</div><div class='add'>+		NLA_POLICY_EXACT_LEN(sizeof(struct br_boolopt_multi)),</div><div class='add'>+	[IFLA_BR_FDB_N_LEARNED] = { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_BR_FDB_MAX_LEARNED] = { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='hunk'>@@ -1073,7 +1309,9 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_STP_STATE]) {</div><div class='ctx'> 		u32 stp_enabled = nla_get_u32(data[IFLA_BR_STP_STATE]);</div><div class='ctx'> </div><div class='del'>-		br_stp_set_enabled(br, stp_enabled);</div><div class='add'>+		err = br_stp_set_enabled(br, stp_enabled, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_PRIORITY]) {</div><div class='hunk'>@@ -1085,7 +1323,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_VLAN_FILTERING]) {</div><div class='ctx'> 		u8 vlan_filter = nla_get_u8(data[IFLA_BR_VLAN_FILTERING]);</div><div class='ctx'> </div><div class='del'>-		err = __br_vlan_filter_toggle(br, vlan_filter);</div><div class='add'>+		err = br_vlan_filter_toggle(br, vlan_filter, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1094,7 +1332,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_VLAN_PROTOCOL]) {</div><div class='ctx'> 		__be16 vlan_proto = nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL]);</div><div class='ctx'> </div><div class='del'>-		err = __br_vlan_set_proto(br, vlan_proto);</div><div class='add'>+		err = __br_vlan_set_proto(br, vlan_proto, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1102,7 +1340,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_VLAN_DEFAULT_PVID]) {</div><div class='ctx'> 		__u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]);</div><div class='ctx'> </div><div class='del'>-		err = __br_vlan_set_default_pvid(br, defpvid);</div><div class='add'>+		err = __br_vlan_set_default_pvid(br, defpvid, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1114,6 +1352,14 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BR_VLAN_STATS_PER_PORT]) {</div><div class='add'>+		__u8 per_port = nla_get_u8(data[IFLA_BR_VLAN_STATS_PER_PORT]);</div><div class='add'>+</div><div class='add'>+		err = br_vlan_set_stats_per_port(br, per_port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_GROUP_FWD_MASK]) {</div><div class='hunk'>@@ -1139,18 +1385,24 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 		spin_lock_bh(&amp;br-&gt;lock);</div><div class='ctx'> 		memcpy(br-&gt;group_addr, new_addr, sizeof(br-&gt;group_addr));</div><div class='ctx'> 		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='del'>-		br-&gt;group_addr_set = true;</div><div class='add'>+		br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true);</div><div class='ctx'> 		br_recalculate_fwd_mask(br);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data[IFLA_BR_FDB_FLUSH])</div><div class='del'>-		br_fdb_flush(br);</div><div class='add'>+	if (data[IFLA_BR_FDB_FLUSH]) {</div><div class='add'>+		struct net_bridge_fdb_flush_desc desc = {</div><div class='add'>+			.flags_mask = BIT(BR_FDB_STATIC)</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		br_fdb_flush(br, &amp;desc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 	if (data[IFLA_BR_MCAST_ROUTER]) {</div><div class='ctx'> 		u8 multicast_router = nla_get_u8(data[IFLA_BR_MCAST_ROUTER]);</div><div class='ctx'> </div><div class='del'>-		err = br_multicast_set_router(br, multicast_router);</div><div class='add'>+		err = br_multicast_set_router(&amp;br-&gt;multicast_ctx,</div><div class='add'>+					      multicast_router);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1158,7 +1410,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_MCAST_SNOOPING]) {</div><div class='ctx'> 		u8 mcast_snooping = nla_get_u8(data[IFLA_BR_MCAST_SNOOPING]);</div><div class='ctx'> </div><div class='del'>-		err = br_multicast_toggle(br, mcast_snooping);</div><div class='add'>+		err = br_multicast_toggle(br, mcast_snooping, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1167,91 +1419,86 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 		u8 val;</div><div class='ctx'> </div><div class='ctx'> 		val = nla_get_u8(data[IFLA_BR_MCAST_QUERY_USE_IFADDR]);</div><div class='del'>-		br-&gt;multicast_query_use_ifaddr = !!val;</div><div class='add'>+		br_opt_toggle(br, BROPT_MULTICAST_QUERY_USE_IFADDR, !!val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_QUERIER]) {</div><div class='ctx'> 		u8 mcast_querier = nla_get_u8(data[IFLA_BR_MCAST_QUERIER]);</div><div class='ctx'> </div><div class='del'>-		err = br_multicast_set_querier(br, mcast_querier);</div><div class='add'>+		err = br_multicast_set_querier(&amp;br-&gt;multicast_ctx,</div><div class='add'>+					       mcast_querier);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data[IFLA_BR_MCAST_HASH_ELASTICITY]) {</div><div class='del'>-		u32 val = nla_get_u32(data[IFLA_BR_MCAST_HASH_ELASTICITY]);</div><div class='del'>-</div><div class='del'>-		br-&gt;hash_elasticity = val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_BR_MCAST_HASH_MAX]) {</div><div class='del'>-		u32 hash_max = nla_get_u32(data[IFLA_BR_MCAST_HASH_MAX]);</div><div class='add'>+	if (data[IFLA_BR_MCAST_HASH_ELASTICITY])</div><div class='add'>+		br_warn(br, "the hash_elasticity option has been deprecated and is always %u\n",</div><div class='add'>+			RHT_ELASTICITY);</div><div class='ctx'> </div><div class='del'>-		err = br_multicast_set_hash_max(br, hash_max);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	if (data[IFLA_BR_MCAST_HASH_MAX])</div><div class='add'>+		br-&gt;hash_max = nla_get_u32(data[IFLA_BR_MCAST_HASH_MAX]);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_LAST_MEMBER_CNT]) {</div><div class='ctx'> 		u32 val = nla_get_u32(data[IFLA_BR_MCAST_LAST_MEMBER_CNT]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_last_member_count = val;</div><div class='add'>+		br-&gt;multicast_ctx.multicast_last_member_count = val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]) {</div><div class='ctx'> 		u32 val = nla_get_u32(data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_startup_query_count = val;</div><div class='add'>+		br-&gt;multicast_ctx.multicast_startup_query_count = val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_LAST_MEMBER_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_LAST_MEMBER_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_last_member_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br-&gt;multicast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_MEMBERSHIP_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_MEMBERSHIP_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_membership_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br-&gt;multicast_ctx.multicast_membership_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_QUERIER_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERIER_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_querier_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br-&gt;multicast_ctx.multicast_querier_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_QUERY_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERY_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_query_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br_multicast_set_query_intvl(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_query_response_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br-&gt;multicast_ctx.multicast_query_response_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]) {</div><div class='ctx'> 		u64 val = nla_get_u64(data[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;multicast_startup_query_interval = clock_t_to_jiffies(val);</div><div class='add'>+		br_multicast_set_startup_query_intvl(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_STATS_ENABLED]) {</div><div class='ctx'> 		__u8 mcast_stats;</div><div class='ctx'> </div><div class='ctx'> 		mcast_stats = nla_get_u8(data[IFLA_BR_MCAST_STATS_ENABLED]);</div><div class='del'>-		br-&gt;multicast_stats_enabled = !!mcast_stats;</div><div class='add'>+		br_opt_toggle(br, BROPT_MULTICAST_STATS_ENABLED, !!mcast_stats);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_MCAST_IGMP_VERSION]) {</div><div class='ctx'> 		__u8 igmp_version;</div><div class='ctx'> </div><div class='ctx'> 		igmp_version = nla_get_u8(data[IFLA_BR_MCAST_IGMP_VERSION]);</div><div class='del'>-		err = br_multicast_set_igmp_version(br, igmp_version);</div><div class='add'>+		err = br_multicast_set_igmp_version(&amp;br-&gt;multicast_ctx,</div><div class='add'>+						    igmp_version);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1261,7 +1508,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 		__u8 mld_version;</div><div class='ctx'> </div><div class='ctx'> 		mld_version = nla_get_u8(data[IFLA_BR_MCAST_MLD_VERSION]);</div><div class='del'>-		err = br_multicast_set_mld_version(br, mld_version);</div><div class='add'>+		err = br_multicast_set_mld_version(&amp;br-&gt;multicast_ctx,</div><div class='add'>+						   mld_version);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1271,30 +1519,47 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],</div><div class='ctx'> 	if (data[IFLA_BR_NF_CALL_IPTABLES]) {</div><div class='ctx'> 		u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_IPTABLES]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;nf_call_iptables = val ? true : false;</div><div class='add'>+		br_opt_toggle(br, BROPT_NF_CALL_IPTABLES, !!val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_NF_CALL_IP6TABLES]) {</div><div class='ctx'> 		u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_IP6TABLES]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;nf_call_ip6tables = val ? true : false;</div><div class='add'>+		br_opt_toggle(br, BROPT_NF_CALL_IP6TABLES, !!val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_BR_NF_CALL_ARPTABLES]) {</div><div class='ctx'> 		u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_ARPTABLES]);</div><div class='ctx'> </div><div class='del'>-		br-&gt;nf_call_arptables = val ? true : false;</div><div class='add'>+		br_opt_toggle(br, BROPT_NF_CALL_ARPTABLES, !!val);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (data[IFLA_BR_MULTI_BOOLOPT]) {</div><div class='add'>+		struct br_boolopt_multi *bm;</div><div class='add'>+</div><div class='add'>+		bm = nla_data(data[IFLA_BR_MULTI_BOOLOPT]);</div><div class='add'>+		err = br_boolopt_multi_toggle(br, bm, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BR_FDB_MAX_LEARNED]) {</div><div class='add'>+		u32 val = nla_get_u32(data[IFLA_BR_FDB_MAX_LEARNED]);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(br-&gt;fdb_max_learned, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int br_dev_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			  struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int br_dev_newlink(struct net_device *dev,</div><div class='add'>+			  struct rtnl_newlink_params *params,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdevice(dev);</div><div class='hunk'>@@ -1327,6 +1592,7 @@ static size_t br_get_size(const struct net_device *brdev)</div><div class='ctx'> 	       nla_total_size(sizeof(__be16)) +	/* IFLA_BR_VLAN_PROTOCOL */</div><div class='ctx'> 	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_VLAN_DEFAULT_PVID */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_VLAN_STATS_ENABLED */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* IFLA_BR_VLAN_STATS_PER_PORT */</div><div class='ctx'> #endif</div><div class='ctx'> 	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_GROUP_FWD_MASK */</div><div class='ctx'> 	       nla_total_size(sizeof(struct ifla_bridge_id)) +   /* IFLA_BR_ROOT_ID */</div><div class='hunk'>@@ -1340,6 +1606,8 @@ static size_t br_get_size(const struct net_device *brdev)</div><div class='ctx'> 	       nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_TOPOLOGY_CHANGE_TIMER */</div><div class='ctx'> 	       nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_GC_TIMER */</div><div class='ctx'> 	       nla_total_size(ETH_ALEN) +       /* IFLA_BR_GROUP_ADDR */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_FDB_N_LEARNED */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_FDB_MAX_LEARNED */</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_ROUTER */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_SNOOPING */</div><div class='hunk'>@@ -1358,12 +1626,14 @@ static size_t br_get_size(const struct net_device *brdev)</div><div class='ctx'> 	       nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_STARTUP_QUERY_INTVL */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +	/* IFLA_BR_MCAST_IGMP_VERSION */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +	/* IFLA_BR_MCAST_MLD_VERSION */</div><div class='add'>+	       br_multicast_querier_state_size() + /* IFLA_BR_MCAST_QUERIER_STATE */</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_NF_CALL_IPTABLES */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_NF_CALL_IP6TABLES */</div><div class='ctx'> 	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_NF_CALL_ARPTABLES */</div><div class='ctx'> #endif</div><div class='add'>+	       nla_total_size(sizeof(struct br_boolopt_multi)) + /* IFLA_BR_MULTI_BOOLOPT */</div><div class='ctx'> 	       0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1377,6 +1647,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)</div><div class='ctx'> 	u32 stp_enabled = br-&gt;stp_enabled;</div><div class='ctx'> 	u16 priority = (br-&gt;bridge_id.prio[0] &lt;&lt; 8) | br-&gt;bridge_id.prio[1];</div><div class='ctx'> 	u8 vlan_enabled = br_vlan_enabled(br-&gt;dev);</div><div class='add'>+	struct br_boolopt_multi bm;</div><div class='ctx'> 	u64 clockval;</div><div class='ctx'> </div><div class='ctx'> 	clockval = br_timer_value(&amp;br-&gt;hello_timer);</div><div class='hunk'>@@ -1393,6 +1664,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_GC_TIMER, clockval, IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	br_boolopt_multi_get(br, &amp;bm);</div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_BR_FORWARD_DELAY, forward_delay) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BR_HELLO_TIME, hello_time) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BR_MAX_AGE, age_time) ||</div><div class='hunk'>@@ -1410,70 +1682,81 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE, br-&gt;topology_change) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE_DETECTED,</div><div class='ctx'> 		       br-&gt;topology_change_detected) ||</div><div class='del'>-	    nla_put(skb, IFLA_BR_GROUP_ADDR, ETH_ALEN, br-&gt;group_addr))</div><div class='add'>+	    nla_put(skb, IFLA_BR_GROUP_ADDR, ETH_ALEN, br-&gt;group_addr) ||</div><div class='add'>+	    nla_put(skb, IFLA_BR_MULTI_BOOLOPT, sizeof(bm), &amp;bm) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BR_FDB_N_LEARNED,</div><div class='add'>+			atomic_read(&amp;br-&gt;fdb_n_learned)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BR_FDB_MAX_LEARNED, br-&gt;fdb_max_learned))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='ctx'> 	if (nla_put_be16(skb, IFLA_BR_VLAN_PROTOCOL, br-&gt;vlan_proto) ||</div><div class='ctx'> 	    nla_put_u16(skb, IFLA_BR_VLAN_DEFAULT_PVID, br-&gt;default_pvid) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_BR_VLAN_STATS_ENABLED, br-&gt;vlan_stats_enabled))</div><div class='add'>+	    nla_put_u8(skb, IFLA_BR_VLAN_STATS_ENABLED,</div><div class='add'>+		       br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BR_VLAN_STATS_PER_PORT,</div><div class='add'>+		       br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='del'>-	if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br-&gt;multicast_router) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_BR_MCAST_SNOOPING, !br-&gt;multicast_disabled) ||</div><div class='add'>+	if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER,</div><div class='add'>+		       br-&gt;multicast_ctx.multicast_router) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BR_MCAST_SNOOPING,</div><div class='add'>+		       br_opt_get(br, BROPT_MULTICAST_ENABLED)) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_MCAST_QUERY_USE_IFADDR,</div><div class='del'>-		       br-&gt;multicast_query_use_ifaddr) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_BR_MCAST_QUERIER, br-&gt;multicast_querier) ||</div><div class='add'>+		       br_opt_get(br, BROPT_MULTICAST_QUERY_USE_IFADDR)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_BR_MCAST_QUERIER,</div><div class='add'>+		       br-&gt;multicast_ctx.multicast_querier) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_MCAST_STATS_ENABLED,</div><div class='del'>-		       br-&gt;multicast_stats_enabled) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY,</div><div class='del'>-			br-&gt;hash_elasticity) ||</div><div class='add'>+		       br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BR_MCAST_HASH_MAX, br-&gt;hash_max) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BR_MCAST_LAST_MEMBER_CNT,</div><div class='del'>-			br-&gt;multicast_last_member_count) ||</div><div class='add'>+			br-&gt;multicast_ctx.multicast_last_member_count) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BR_MCAST_STARTUP_QUERY_CNT,</div><div class='del'>-			br-&gt;multicast_startup_query_count) ||</div><div class='add'>+			br-&gt;multicast_ctx.multicast_startup_query_count) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_MCAST_IGMP_VERSION,</div><div class='del'>-		       br-&gt;multicast_igmp_version))</div><div class='add'>+		       br-&gt;multicast_ctx.multicast_igmp_version) ||</div><div class='add'>+	    br_multicast_dump_querier_state(skb, &amp;br-&gt;multicast_ctx,</div><div class='add'>+					    IFLA_BR_MCAST_QUERIER_STATE))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	if (nla_put_u8(skb, IFLA_BR_MCAST_MLD_VERSION,</div><div class='del'>-		       br-&gt;multicast_mld_version))</div><div class='add'>+		       br-&gt;multicast_ctx.multicast_mld_version))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #endif</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_last_member_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_last_member_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_LAST_MEMBER_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_membership_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_membership_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_MEMBERSHIP_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_querier_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_querier_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERIER_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_query_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_query_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERY_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_query_response_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_query_response_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	clockval = jiffies_to_clock_t(br-&gt;multicast_startup_query_interval);</div><div class='add'>+	clockval = jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_startup_query_interval);</div><div class='ctx'> 	if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, clockval,</div><div class='ctx'> 			      IFLA_BR_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	if (nla_put_u8(skb, IFLA_BR_NF_CALL_IPTABLES,</div><div class='del'>-		       br-&gt;nf_call_iptables ? 1 : 0) ||</div><div class='add'>+		       br_opt_get(br, BROPT_NF_CALL_IPTABLES) ? 1 : 0) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_NF_CALL_IP6TABLES,</div><div class='del'>-		       br-&gt;nf_call_ip6tables ? 1 : 0) ||</div><div class='add'>+		       br_opt_get(br, BROPT_NF_CALL_IP6TABLES) ? 1 : 0) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_BR_NF_CALL_ARPTABLES,</div><div class='del'>-		       br-&gt;nf_call_arptables ? 1 : 0))</div><div class='add'>+		       br_opt_get(br, BROPT_NF_CALL_ARPTABLES) ? 1 : 0))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1497,7 +1780,6 @@ static size_t br_get_linkxstats_size(const struct net_device *dev, int attr)</div><div class='ctx'> 		p = br_port_get_rtnl(dev);</div><div class='ctx'> 		if (!p)</div><div class='ctx'> 			return 0;</div><div class='del'>-		br = p-&gt;br;</div><div class='ctx'> 		vg = nbp_vlan_group(p);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1511,7 +1793,8 @@ static size_t br_get_linkxstats_size(const struct net_device *dev, int attr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return numvls * nla_total_size(sizeof(struct bridge_vlan_xstats)) +</div><div class='del'>-	       nla_total_size(sizeof(struct br_mcast_stats)) +</div><div class='add'>+	       nla_total_size_64bit(sizeof(struct br_mcast_stats)) +</div><div class='add'>+	       (p ? nla_total_size_64bit(sizeof(p-&gt;stp_xstats)) : 0) +</div><div class='ctx'> 	       nla_total_size(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1543,7 +1826,7 @@ static int br_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, LINK_XSTATS_TYPE_BRIDGE);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, LINK_XSTATS_TYPE_BRIDGE);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1553,7 +1836,7 @@ static int br_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 		pvid = br_get_pvid(vg);</div><div class='ctx'> 		list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='ctx'> 			struct bridge_vlan_xstats vxi;</div><div class='del'>-			struct br_vlan_stats stats;</div><div class='add'>+			struct pcpu_sw_netstats stats;</div><div class='ctx'> </div><div class='ctx'> 			if (++vl_idx &lt; *prividx)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1563,10 +1846,10 @@ static int br_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 			if (v-&gt;vid == pvid)</div><div class='ctx'> 				vxi.flags |= BRIDGE_VLAN_INFO_PVID;</div><div class='ctx'> 			br_vlan_get_stats(v, &amp;stats);</div><div class='del'>-			vxi.rx_bytes = stats.rx_bytes;</div><div class='del'>-			vxi.rx_packets = stats.rx_packets;</div><div class='del'>-			vxi.tx_bytes = stats.tx_bytes;</div><div class='del'>-			vxi.tx_packets = stats.tx_packets;</div><div class='add'>+			vxi.rx_bytes = u64_stats_read(&amp;stats.rx_bytes);</div><div class='add'>+			vxi.rx_packets = u64_stats_read(&amp;stats.rx_packets);</div><div class='add'>+			vxi.tx_bytes = u64_stats_read(&amp;stats.tx_bytes);</div><div class='add'>+			vxi.tx_packets = u64_stats_read(&amp;stats.tx_packets);</div><div class='ctx'> </div><div class='ctx'> 			if (nla_put(skb, BRIDGE_XSTATS_VLAN, sizeof(vxi), &amp;vxi))</div><div class='ctx'> 				goto nla_put_failure;</div><div class='hunk'>@@ -1583,6 +1866,19 @@ static int br_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 		br_multicast_get_stats(br, p, nla_data(nla));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		nla = nla_reserve_64bit(skb, BRIDGE_XSTATS_STP,</div><div class='add'>+					sizeof(p-&gt;stp_xstats),</div><div class='add'>+					BRIDGE_XSTATS_PAD);</div><div class='add'>+		if (!nla)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;br-&gt;lock);</div><div class='add'>+		memcpy(nla_data(nla), &amp;p-&gt;stp_xstats, sizeof(p-&gt;stp_xstats));</div><div class='add'>+		spin_unlock_bh(&amp;br-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='ctx'> 	*prividx = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1626,8 +1922,13 @@ int __init br_netlink_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	br_mdb_init();</div><div class='del'>-	rtnl_af_register(&amp;br_af_ops);</div><div class='add'>+	err = br_vlan_rtnl_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = rtnl_af_register(&amp;br_af_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_vlan;</div><div class='ctx'> </div><div class='ctx'> 	err = rtnl_link_register(&amp;br_link_ops);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1637,13 +1938,15 @@ int __init br_netlink_init(void)</div><div class='ctx'> </div><div class='ctx'> out_af:</div><div class='ctx'> 	rtnl_af_unregister(&amp;br_af_ops);</div><div class='del'>-	br_mdb_uninit();</div><div class='add'>+out_vlan:</div><div class='add'>+	br_vlan_rtnl_uninit();</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void br_netlink_fini(void)</div><div class='ctx'> {</div><div class='del'>-	br_mdb_uninit();</div><div class='add'>+	br_vlan_rtnl_uninit();</div><div class='ctx'> 	rtnl_af_unregister(&amp;br_af_ops);</div><div class='ctx'> 	rtnl_link_unregister(&amp;br_link_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c<br/>index da8cb99fd259..71a12da30004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netlink_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_netlink_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_netlink_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_netlink_tunnel.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Bridge per vlan tunnel port dst_metadata netlink control interface</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Roopa Prabhu		&lt;roopa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -30,8 +26,8 @@ static size_t __get_vlan_tinfo_size(void)</div><div class='ctx'> 		  nla_total_size(sizeof(u16)); /* IFLA_BRIDGE_VLAN_TUNNEL_FLAGS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool vlan_tunid_inrange(struct net_bridge_vlan *v_curr,</div><div class='del'>-			       struct net_bridge_vlan *v_last)</div><div class='add'>+bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			const struct net_bridge_vlan *v_last)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 tunid_curr = tunnel_id_to_key32(v_curr-&gt;tinfo.tunnel_id);</div><div class='ctx'> 	__be32 tunid_last = tunnel_id_to_key32(v_last-&gt;tinfo.tunnel_id);</div><div class='hunk'>@@ -97,7 +93,7 @@ static int br_fill_vlan_tinfo(struct sk_buff *skb, u16 vid,</div><div class='ctx'> 	__be32 tid = tunnel_id_to_key32(tunnel_id);</div><div class='ctx'> 	struct nlattr *tmap;</div><div class='ctx'> </div><div class='del'>-	tmap = nla_nest_start(skb, IFLA_BRIDGE_VLAN_TUNNEL_INFO);</div><div class='add'>+	tmap = nla_nest_start_noflag(skb, IFLA_BRIDGE_VLAN_TUNNEL_INFO);</div><div class='ctx'> 	if (!tmap)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_BRIDGE_VLAN_TUNNEL_ID,</div><div class='hunk'>@@ -192,13 +188,16 @@ initvars:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy vlan_tunnel_policy[IFLA_BRIDGE_VLAN_TUNNEL_MAX + 1] = {</div><div class='add'>+	[IFLA_BRIDGE_VLAN_TUNNEL_UNSPEC] = {</div><div class='add'>+		.strict_start_type = IFLA_BRIDGE_VLAN_TUNNEL_FLAGS + 1</div><div class='add'>+	},</div><div class='ctx'> 	[IFLA_BRIDGE_VLAN_TUNNEL_ID] = { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BRIDGE_VLAN_TUNNEL_VID] = { .type = NLA_U16 },</div><div class='ctx'> 	[IFLA_BRIDGE_VLAN_TUNNEL_FLAGS] = { .type = NLA_U16 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int br_vlan_tunnel_info(struct net_bridge_port *p, int cmd,</div><div class='del'>-			       u16 vid, u32 tun_id, bool *changed)</div><div class='add'>+int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,</div><div class='add'>+			u16 vid, u32 tun_id, bool *changed)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -230,8 +229,8 @@ int br_parse_vlan_tunnel_info(struct nlattr *attr,</div><div class='ctx'> </div><div class='ctx'> 	memset(tinfo, 0, sizeof(*tinfo));</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX, attr,</div><div class='del'>-			       vlan_tunnel_policy, NULL);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX,</div><div class='add'>+					  attr, vlan_tunnel_policy, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -254,8 +253,38 @@ int br_parse_vlan_tunnel_info(struct nlattr *attr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='del'>-				struct net_bridge_port *p, int cmd,</div><div class='add'>+/* send a notification if v_curr can't enter the range and start a new one */</div><div class='add'>+static void __vlan_tunnel_handle_range(const struct net_bridge_port *p,</div><div class='add'>+				       struct net_bridge_vlan **v_start,</div><div class='add'>+				       struct net_bridge_vlan **v_end,</div><div class='add'>+				       int v_curr, bool curr_change)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+	vg = nbp_vlan_group(p);</div><div class='add'>+	if (!vg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	v = br_vlan_find(vg, v_curr);</div><div class='add'>+</div><div class='add'>+	if (!*v_start)</div><div class='add'>+		goto out_init;</div><div class='add'>+</div><div class='add'>+	if (v &amp;&amp; curr_change &amp;&amp; br_vlan_can_enter_range(v, *v_end)) {</div><div class='add'>+		*v_end = v;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_vlan_notify(p-&gt;br, p, (*v_start)-&gt;vid, (*v_end)-&gt;vid, RTM_NEWVLAN);</div><div class='add'>+out_init:</div><div class='add'>+	/* we start a range only if there are any changes to notify about */</div><div class='add'>+	*v_start = curr_change ? v : NULL;</div><div class='add'>+	*v_end = *v_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_process_vlan_tunnel_info(const struct net_bridge *br,</div><div class='add'>+				const struct net_bridge_port *p, int cmd,</div><div class='ctx'> 				struct vtunnel_info *tinfo_curr,</div><div class='ctx'> 				struct vtunnel_info *tinfo_last,</div><div class='ctx'> 				bool *changed)</div><div class='hunk'>@@ -267,6 +296,7 @@ int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		memcpy(tinfo_last, tinfo_curr, sizeof(struct vtunnel_info));</div><div class='ctx'> 	} else if (tinfo_curr-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_END) {</div><div class='add'>+		struct net_bridge_vlan *v_start = NULL, *v_end = NULL;</div><div class='ctx'> 		int t, v;</div><div class='ctx'> </div><div class='ctx'> 		if (!(tinfo_last-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_BEGIN))</div><div class='hunk'>@@ -276,11 +306,24 @@ int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		t = tinfo_last-&gt;tunid;</div><div class='ctx'> 		for (v = tinfo_last-&gt;vid; v &lt;= tinfo_curr-&gt;vid; v++) {</div><div class='del'>-			err = br_vlan_tunnel_info(p, cmd, v, t, changed);</div><div class='add'>+			bool curr_change = false;</div><div class='add'>+</div><div class='add'>+			err = br_vlan_tunnel_info(p, cmd, v, t, &amp;curr_change);</div><div class='ctx'> 			if (err)</div><div class='del'>-				return err;</div><div class='add'>+				break;</div><div class='ctx'> 			t++;</div><div class='add'>+</div><div class='add'>+			if (curr_change)</div><div class='add'>+				*changed = curr_change;</div><div class='add'>+			__vlan_tunnel_handle_range(p, &amp;v_start, &amp;v_end, v,</div><div class='add'>+						   curr_change);</div><div class='ctx'> 		}</div><div class='add'>+		if (v_start &amp;&amp; v_end)</div><div class='add'>+			br_vlan_notify(br, p, v_start-&gt;vid, v_end-&gt;vid,</div><div class='add'>+				       RTM_NEWVLAN);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		memset(tinfo_last, 0, sizeof(struct vtunnel_info));</div><div class='ctx'> 		memset(tinfo_curr, 0, sizeof(struct vtunnel_info));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -290,6 +333,7 @@ int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='ctx'> 					  tinfo_curr-&gt;tunid, changed);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+		br_vlan_notify(br, p, tinfo_curr-&gt;vid, 0, RTM_NEWVLAN);</div><div class='ctx'> 		memset(tinfo_last, 0, sizeof(struct vtunnel_info));</div><div class='ctx'> 		memset(tinfo_curr, 0, sizeof(struct vtunnel_info));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/bridge/br_nf_core.c b/net/bridge/br_nf_core.c<br/>index 8e2d7cfa4e16..a8c67035e23c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_nf_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_nf_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_nf_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_nf_core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Handle firewalling core</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='ctx'>  *	Bart De Schuymer		&lt;bdschuym@pandora.be&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Lennert dedicates this file to Kerstin Wurdinger.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -26,7 +22,8 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void fake_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			     struct sk_buff *skb, u32 mtu)</div><div class='add'>+			     struct sk_buff *skb, u32 mtu,</div><div class='add'>+			     bool confirm_neigh)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -68,17 +65,14 @@ static struct dst_ops fake_dst_ops = {</div><div class='ctx'>  * ipt_REJECT needs it.  Future netfilter modules might</div><div class='ctx'>  * require us to fill additional fields.</div><div class='ctx'>  */</div><div class='del'>-static const u32 br_dst_default_metrics[RTAX_MAX] = {</div><div class='del'>-	[RTAX_MTU - 1] = 1500,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void br_netfilter_rtable_init(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt = &amp;br-&gt;fake_rtable;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;rt-&gt;dst.__refcnt, 1);</div><div class='add'>+	rcuref_init(&amp;rt-&gt;dst.__rcuref, 1);</div><div class='ctx'> 	rt-&gt;dst.dev = br-&gt;dev;</div><div class='del'>-	dst_init_metrics(&amp;rt-&gt;dst, br_dst_default_metrics, true);</div><div class='add'>+	dst_init_metrics(&amp;rt-&gt;dst, br-&gt;metrics, false);</div><div class='add'>+	dst_metric_set(&amp;rt-&gt;dst, RTAX_MTU, br-&gt;dev-&gt;mtu);</div><div class='ctx'> 	rt-&gt;dst.flags	= DST_NOXFRM | DST_FAKE_RTABLE;</div><div class='ctx'> 	rt-&gt;dst.ops = &amp;fake_dst_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h<br/>index 11ed2029985f..7280c4e9305f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private.h</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _BR_PRIVATE_H</div><div class='hunk'>@@ -19,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/u64_stats_sync.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/ip6_fib.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='hunk'>@@ -31,6 +28,14 @@</div><div class='ctx'> #define BR_PORT_BITS	10</div><div class='ctx'> #define BR_MAX_PORTS	(1&lt;&lt;BR_PORT_BITS)</div><div class='ctx'> </div><div class='add'>+#define BR_MULTICAST_DEFAULT_HASH_MAX 4096</div><div class='add'>+#define BR_MULTICAST_QUERY_INTVL_MIN msecs_to_jiffies(1000)</div><div class='add'>+#define BR_MULTICAST_STARTUP_QUERY_INTVL_MIN BR_MULTICAST_QUERY_INTVL_MIN</div><div class='add'>+#define BR_MULTICAST_QUERY_INTVL_MAX msecs_to_jiffies(86400000) /* 24 hours */</div><div class='add'>+#define BR_MULTICAST_STARTUP_QUERY_INTVL_MAX BR_MULTICAST_QUERY_INTVL_MAX</div><div class='add'>+</div><div class='add'>+#define BR_HWDOM_MAX BITS_PER_LONG</div><div class='add'>+</div><div class='ctx'> #define BR_VERSION	"2.3"</div><div class='ctx'> </div><div class='ctx'> /* Control of forwarding link local multicast */</div><div class='hunk'>@@ -50,18 +55,18 @@ enum {</div><div class='ctx'> /* Path to usermode spanning tree program */</div><div class='ctx'> #define BR_STP_PROG	"/sbin/bridge-stp"</div><div class='ctx'> </div><div class='add'>+#define BR_FDB_NOTIFY_SETTABLE_BITS (FDB_NOTIFY_BIT | FDB_NOTIFY_INACTIVE_BIT)</div><div class='add'>+</div><div class='ctx'> typedef struct bridge_id bridge_id;</div><div class='ctx'> typedef struct mac_addr mac_addr;</div><div class='ctx'> typedef __u16 port_id;</div><div class='ctx'> </div><div class='del'>-struct bridge_id</div><div class='del'>-{</div><div class='add'>+struct bridge_id {</div><div class='ctx'> 	unsigned char	prio[2];</div><div class='ctx'> 	unsigned char	addr[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mac_addr</div><div class='del'>-{</div><div class='add'>+struct mac_addr {</div><div class='ctx'> 	unsigned char	addr[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -75,13 +80,14 @@ struct bridge_mcast_own_query {</div><div class='ctx'> /* other querier */</div><div class='ctx'> struct bridge_mcast_other_query {</div><div class='ctx'> 	struct timer_list		timer;</div><div class='del'>-	unsigned long			delay_time;</div><div class='add'>+	struct timer_list		delay_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* selected querier */</div><div class='ctx'> struct bridge_mcast_querier {</div><div class='ctx'> 	struct br_ip addr;</div><div class='del'>-	struct net_bridge_port __rcu	*port;</div><div class='add'>+	int port_ifidx;</div><div class='add'>+	seqcount_spinlock_t seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IGMP/MLD statistics */</div><div class='hunk'>@@ -89,33 +95,115 @@ struct bridge_mcast_stats {</div><div class='ctx'> 	struct br_mcast_stats mstats;</div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+struct br_mdb_src_entry {</div><div class='add'>+	struct br_ip			addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_mdb_config {</div><div class='add'>+	struct net_bridge		*br;</div><div class='add'>+	struct net_bridge_port		*p;</div><div class='add'>+	struct br_mdb_entry		*entry;</div><div class='add'>+	struct br_ip			group;</div><div class='add'>+	bool				src_entry;</div><div class='add'>+	u8				filter_mode;</div><div class='add'>+	u16				nlflags;</div><div class='add'>+	struct br_mdb_src_entry		*src_entries;</div><div class='add'>+	int				num_src_entries;</div><div class='add'>+	u8				rt_protocol;</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct br_vlan_stats {</div><div class='del'>-	u64 rx_bytes;</div><div class='del'>-	u64 rx_packets;</div><div class='del'>-	u64 tx_bytes;</div><div class='del'>-	u64 tx_packets;</div><div class='del'>-	struct u64_stats_sync syncp;</div><div class='add'>+/* net_bridge_mcast_port must be always defined due to forwarding stubs */</div><div class='add'>+struct net_bridge_mcast_port {</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	struct net_bridge_port		*port;</div><div class='add'>+	struct net_bridge_vlan		*vlan;</div><div class='add'>+</div><div class='add'>+	struct bridge_mcast_own_query	ip4_own_query;</div><div class='add'>+	struct timer_list		ip4_mc_router_timer;</div><div class='add'>+	struct hlist_node		ip4_rlist;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct bridge_mcast_own_query	ip6_own_query;</div><div class='add'>+	struct timer_list		ip6_mc_router_timer;</div><div class='add'>+	struct hlist_node		ip6_rlist;</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+	unsigned char			multicast_router;</div><div class='add'>+	u32				mdb_n_entries;</div><div class='add'>+	u32				mdb_max_entries;</div><div class='add'>+#endif /* CONFIG_BRIDGE_IGMP_SNOOPING */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* net_bridge_mcast must be always defined due to forwarding stubs */</div><div class='add'>+struct net_bridge_mcast {</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	struct net_bridge		*br;</div><div class='add'>+	struct net_bridge_vlan		*vlan;</div><div class='add'>+</div><div class='add'>+	u32				multicast_last_member_count;</div><div class='add'>+	u32				multicast_startup_query_count;</div><div class='add'>+</div><div class='add'>+	u8				multicast_querier;</div><div class='add'>+	u8				multicast_igmp_version;</div><div class='add'>+	u8				multicast_router;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	u8				multicast_mld_version;</div><div class='add'>+#endif</div><div class='add'>+	unsigned long			multicast_last_member_interval;</div><div class='add'>+	unsigned long			multicast_membership_interval;</div><div class='add'>+	unsigned long			multicast_querier_interval;</div><div class='add'>+	unsigned long			multicast_query_interval;</div><div class='add'>+	unsigned long			multicast_query_response_interval;</div><div class='add'>+	unsigned long			multicast_startup_query_interval;</div><div class='add'>+	struct hlist_head		ip4_mc_router_list;</div><div class='add'>+	struct timer_list		ip4_mc_router_timer;</div><div class='add'>+	struct bridge_mcast_other_query	ip4_other_query;</div><div class='add'>+	struct bridge_mcast_own_query	ip4_own_query;</div><div class='add'>+	struct bridge_mcast_querier	ip4_querier;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct hlist_head		ip6_mc_router_list;</div><div class='add'>+	struct timer_list		ip6_mc_router_timer;</div><div class='add'>+	struct bridge_mcast_other_query	ip6_other_query;</div><div class='add'>+	struct bridge_mcast_own_query	ip6_own_query;</div><div class='add'>+	struct bridge_mcast_querier	ip6_querier;</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+#endif /* CONFIG_BRIDGE_IGMP_SNOOPING */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct br_tunnel_info {</div><div class='del'>-	__be64			tunnel_id;</div><div class='del'>-	struct metadata_dst	*tunnel_dst;</div><div class='add'>+	__be64				tunnel_id;</div><div class='add'>+	struct metadata_dst __rcu	*tunnel_dst;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* private vlan flags */</div><div class='add'>+enum {</div><div class='add'>+	BR_VLFLAG_PER_PORT_STATS = BIT(0),</div><div class='add'>+	BR_VLFLAG_ADDED_BY_SWITCHDEV = BIT(1),</div><div class='add'>+	BR_VLFLAG_MCAST_ENABLED = BIT(2),</div><div class='add'>+	BR_VLFLAG_GLOBAL_MCAST_ENABLED = BIT(3),</div><div class='add'>+	BR_VLFLAG_NEIGH_SUPPRESS_ENABLED = BIT(4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct net_bridge_vlan - per-vlan entry</div><div class='ctx'>  *</div><div class='ctx'>  * @vnode: rhashtable member</div><div class='add'>+ * @tnode: rhashtable member</div><div class='ctx'>  * @vid: VLAN id</div><div class='ctx'>  * @flags: bridge vlan flags</div><div class='add'>+ * @priv_flags: private (in-kernel) bridge vlan flags</div><div class='add'>+ * @state: STP state (e.g. blocking, learning, forwarding)</div><div class='ctx'>  * @stats: per-cpu VLAN statistics</div><div class='ctx'>  * @br: if MASTER flag set, this points to a bridge struct</div><div class='ctx'>  * @port: if MASTER flag unset, this points to a port struct</div><div class='ctx'>  * @refcnt: if MASTER flag set, this is bumped for each port referencing it</div><div class='ctx'>  * @brvlan: if MASTER flag unset, this points to the global per-VLAN context</div><div class='ctx'>  *          for this VLAN entry</div><div class='add'>+ * @tinfo: bridge tunnel info</div><div class='add'>+ * @br_mcast_ctx: if MASTER flag set, this is the global vlan multicast context</div><div class='add'>+ * @port_mcast_ctx: if MASTER flag unset, this is the per-port/vlan multicast</div><div class='add'>+ *                  context</div><div class='add'>+ * @msti: if MASTER flag set, this holds the VLANs MST instance</div><div class='ctx'>  * @vlist: sorted list of VLAN entries</div><div class='ctx'>  * @rcu: used for entry destruction</div><div class='ctx'>  *</div><div class='hunk'>@@ -129,7 +217,9 @@ struct net_bridge_vlan {</div><div class='ctx'> 	struct rhash_head		tnode;</div><div class='ctx'> 	u16				vid;</div><div class='ctx'> 	u16				flags;</div><div class='del'>-	struct br_vlan_stats __percpu	*stats;</div><div class='add'>+	u16				priv_flags;</div><div class='add'>+	u8				state;</div><div class='add'>+	struct pcpu_sw_netstats __percpu *stats;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct net_bridge	*br;</div><div class='ctx'> 		struct net_bridge_port	*port;</div><div class='hunk'>@@ -141,6 +231,13 @@ struct net_bridge_vlan {</div><div class='ctx'> </div><div class='ctx'> 	struct br_tunnel_info		tinfo;</div><div class='ctx'> </div><div class='add'>+	union {</div><div class='add'>+		struct net_bridge_mcast		br_mcast_ctx;</div><div class='add'>+		struct net_bridge_mcast_port	port_mcast_ctx;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u16				msti;</div><div class='add'>+</div><div class='ctx'> 	struct list_head		vlist;</div><div class='ctx'> </div><div class='ctx'> 	struct rcu_head			rcu;</div><div class='hunk'>@@ -153,6 +250,7 @@ struct net_bridge_vlan {</div><div class='ctx'>  * @vlan_list: sorted VLAN entry list</div><div class='ctx'>  * @num_vlans: number of total VLAN entries</div><div class='ctx'>  * @pvid: PVID VLAN id</div><div class='add'>+ * @pvid_state: PVID's STP state (e.g. forwarding, learning, blocking)</div><div class='ctx'>  *</div><div class='ctx'>  * IMPORTANT: Be careful when checking if there're VLAN entries using list</div><div class='ctx'>  *            primitives because the bridge can have entries in its list which</div><div class='hunk'>@@ -166,6 +264,21 @@ struct net_bridge_vlan_group {</div><div class='ctx'> 	struct list_head		vlan_list;</div><div class='ctx'> 	u16				num_vlans;</div><div class='ctx'> 	u16				pvid;</div><div class='add'>+	u8				pvid_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* bridge fdb flags */</div><div class='add'>+enum {</div><div class='add'>+	BR_FDB_LOCAL,</div><div class='add'>+	BR_FDB_STATIC,</div><div class='add'>+	BR_FDB_STICKY,</div><div class='add'>+	BR_FDB_ADDED_BY_USER,</div><div class='add'>+	BR_FDB_ADDED_BY_EXT_LEARN,</div><div class='add'>+	BR_FDB_OFFLOADED,</div><div class='add'>+	BR_FDB_NOTIFY,</div><div class='add'>+	BR_FDB_NOTIFY_INACTIVE,</div><div class='add'>+	BR_FDB_LOCKED,</div><div class='add'>+	BR_FDB_DYNAMIC_LEARNED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct net_bridge_fdb_key {</div><div class='hunk'>@@ -179,11 +292,7 @@ struct net_bridge_fdb_entry {</div><div class='ctx'> </div><div class='ctx'> 	struct net_bridge_fdb_key	key;</div><div class='ctx'> 	struct hlist_node		fdb_node;</div><div class='del'>-	unsigned char			is_local:1,</div><div class='del'>-					is_static:1,</div><div class='del'>-					added_by_user:1,</div><div class='del'>-					added_by_external_learn:1,</div><div class='del'>-					offloaded:1;</div><div class='add'>+	unsigned long			flags;</div><div class='ctx'> </div><div class='ctx'> 	/* write-heavy members should not affect lookups */</div><div class='ctx'> 	unsigned long			updated ____cacheline_aligned_in_smp;</div><div class='hunk'>@@ -192,45 +301,91 @@ struct net_bridge_fdb_entry {</div><div class='ctx'> 	struct rcu_head			rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MDB_PG_FLAGS_PERMANENT	BIT(0)</div><div class='del'>-#define MDB_PG_FLAGS_OFFLOAD	BIT(1)</div><div class='add'>+struct net_bridge_fdb_flush_desc {</div><div class='add'>+	unsigned long			flags;</div><div class='add'>+	unsigned long			flags_mask;</div><div class='add'>+	int				port_ifindex;</div><div class='add'>+	u16				vlan_id;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct net_bridge_port_group {</div><div class='add'>+#define MDB_PG_FLAGS_PERMANENT		BIT(0)</div><div class='add'>+#define MDB_PG_FLAGS_OFFLOAD		BIT(1)</div><div class='add'>+#define MDB_PG_FLAGS_FAST_LEAVE		BIT(2)</div><div class='add'>+#define MDB_PG_FLAGS_STAR_EXCL		BIT(3)</div><div class='add'>+#define MDB_PG_FLAGS_BLOCKED		BIT(4)</div><div class='add'>+#define MDB_PG_FLAGS_OFFLOAD_FAILED	BIT(5)</div><div class='add'>+</div><div class='add'>+#define PG_SRC_ENT_LIMIT	32</div><div class='add'>+</div><div class='add'>+#define BR_SGRP_F_DELETE	BIT(0)</div><div class='add'>+#define BR_SGRP_F_SEND		BIT(1)</div><div class='add'>+#define BR_SGRP_F_INSTALLED	BIT(2)</div><div class='add'>+#define BR_SGRP_F_USER_ADDED	BIT(3)</div><div class='add'>+</div><div class='add'>+struct net_bridge_mcast_gc {</div><div class='add'>+	struct hlist_node		gc_node;</div><div class='add'>+	void				(*destroy)(struct net_bridge_mcast_gc *gc);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_bridge_group_src {</div><div class='add'>+	struct hlist_node		node;</div><div class='add'>+</div><div class='add'>+	struct br_ip			addr;</div><div class='add'>+	struct net_bridge_port_group	*pg;</div><div class='add'>+	u8				flags;</div><div class='add'>+	u8				src_query_rexmit_cnt;</div><div class='add'>+	struct timer_list		timer;</div><div class='add'>+</div><div class='add'>+	struct net_bridge		*br;</div><div class='add'>+	struct net_bridge_mcast_gc	mcast_gc;</div><div class='add'>+	struct rcu_head			rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_bridge_port_group_sg_key {</div><div class='ctx'> 	struct net_bridge_port		*port;</div><div class='add'>+	struct br_ip			addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_bridge_port_group {</div><div class='ctx'> 	struct net_bridge_port_group __rcu *next;</div><div class='add'>+	struct net_bridge_port_group_sg_key key;</div><div class='add'>+	unsigned char			eth_addr[ETH_ALEN] __aligned(2);</div><div class='add'>+	unsigned char			flags;</div><div class='add'>+	unsigned char			filter_mode;</div><div class='add'>+	unsigned char			grp_query_rexmit_cnt;</div><div class='add'>+	unsigned char			rt_protocol;</div><div class='add'>+</div><div class='add'>+	struct hlist_head		src_list;</div><div class='add'>+	unsigned int			src_ents;</div><div class='add'>+	struct timer_list		timer;</div><div class='add'>+	struct timer_list		rexmit_timer;</div><div class='ctx'> 	struct hlist_node		mglist;</div><div class='add'>+	struct rb_root			eht_set_tree;</div><div class='add'>+	struct rb_root			eht_host_tree;</div><div class='add'>+</div><div class='add'>+	struct rhash_head		rhnode;</div><div class='add'>+	struct net_bridge_mcast_gc	mcast_gc;</div><div class='ctx'> 	struct rcu_head			rcu;</div><div class='del'>-	struct timer_list		timer;</div><div class='del'>-	struct br_ip			addr;</div><div class='del'>-	unsigned char			flags;</div><div class='del'>-	unsigned char			eth_addr[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct net_bridge_mdb_entry</div><div class='del'>-{</div><div class='del'>-	struct hlist_node		hlist[2];</div><div class='add'>+struct net_bridge_mdb_entry {</div><div class='add'>+	struct rhash_head		rhnode;</div><div class='ctx'> 	struct net_bridge		*br;</div><div class='ctx'> 	struct net_bridge_port_group __rcu *ports;</div><div class='del'>-	struct rcu_head			rcu;</div><div class='del'>-	struct timer_list		timer;</div><div class='ctx'> 	struct br_ip			addr;</div><div class='ctx'> 	bool				host_joined;</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-struct net_bridge_mdb_htable</div><div class='del'>-{</div><div class='del'>-	struct hlist_head		*mhash;</div><div class='add'>+	struct timer_list		timer;</div><div class='add'>+	struct hlist_node		mdb_node;</div><div class='add'>+</div><div class='add'>+	struct net_bridge_mcast_gc	mcast_gc;</div><div class='ctx'> 	struct rcu_head			rcu;</div><div class='del'>-	struct net_bridge_mdb_htable	*old;</div><div class='del'>-	u32				size;</div><div class='del'>-	u32				max;</div><div class='del'>-	u32				secret;</div><div class='del'>-	u32				ver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct net_bridge_port {</div><div class='ctx'> 	struct net_bridge		*br;</div><div class='ctx'> 	struct net_device		*dev;</div><div class='add'>+	netdevice_tracker		dev_tracker;</div><div class='ctx'> 	struct list_head		list;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long			flags;</div><div class='hunk'>@@ -238,6 +393,7 @@ struct net_bridge_port {</div><div class='ctx'> 	struct net_bridge_vlan_group	__rcu *vlgrp;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct net_bridge_port		__rcu *backup_port;</div><div class='add'>+	u32				backup_nhid;</div><div class='ctx'> </div><div class='ctx'> 	/* STP */</div><div class='ctx'> 	u8				priority;</div><div class='hunk'>@@ -259,16 +415,14 @@ struct net_bridge_port {</div><div class='ctx'> 	struct kobject			kobj;</div><div class='ctx'> 	struct rcu_head			rcu;</div><div class='ctx'> </div><div class='add'>+	struct net_bridge_mcast_port	multicast_ctx;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='del'>-	struct bridge_mcast_own_query	ip4_own_query;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	struct bridge_mcast_own_query	ip6_own_query;</div><div class='del'>-#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='del'>-	unsigned char			multicast_router;</div><div class='ctx'> 	struct bridge_mcast_stats	__percpu *mcast_stats;</div><div class='del'>-	struct timer_list		multicast_router_timer;</div><div class='add'>+</div><div class='add'>+	u32				multicast_eht_hosts_limit;</div><div class='add'>+	u32				multicast_eht_hosts_cnt;</div><div class='ctx'> 	struct hlist_head		mglist;</div><div class='del'>-	struct hlist_node		rlist;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='hunk'>@@ -279,10 +433,17 @@ struct net_bridge_port {</div><div class='ctx'> 	struct netpoll			*np;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_NET_SWITCHDEV</div><div class='del'>-	int				offload_fwd_mark;</div><div class='add'>+	/* Identifier used to group ports that share the same switchdev</div><div class='add'>+	 * hardware domain.</div><div class='add'>+	 */</div><div class='add'>+	int				hwdom;</div><div class='add'>+	int				offload_count;</div><div class='add'>+	struct netdev_phys_item_id	ppid;</div><div class='ctx'> #endif</div><div class='ctx'> 	u16				group_fwd_mask;</div><div class='ctx'> 	u16				backup_redirected_cnt;</div><div class='add'>+</div><div class='add'>+	struct bridge_stp_xstats	stp_xstats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define kobj_to_brport(obj)	container_of(obj, struct net_bridge_port, kobj)</div><div class='hunk'>@@ -290,8 +451,6 @@ struct net_bridge_port {</div><div class='ctx'> #define br_auto_port(p) ((p)-&gt;flags &amp; BR_AUTO_MASK)</div><div class='ctx'> #define br_promisc_port(p) ((p)-&gt;flags &amp; BR_PROMISC)</div><div class='ctx'> </div><div class='del'>-#define br_port_exists(dev) (dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT)</div><div class='del'>-</div><div class='ctx'> static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return rcu_dereference(dev-&gt;rx_handler_data);</div><div class='hunk'>@@ -299,40 +458,59 @@ static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *d</div><div class='ctx'> </div><div class='ctx'> static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return br_port_exists(dev) ?</div><div class='add'>+	return netif_is_bridge_port(dev) ?</div><div class='ctx'> 		rtnl_dereference(dev-&gt;rx_handler_data) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct net_bridge_port *br_port_get_rtnl_rcu(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return br_port_exists(dev) ?</div><div class='add'>+	return netif_is_bridge_port(dev) ?</div><div class='ctx'> 		rcu_dereference_rtnl(dev-&gt;rx_handler_data) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum net_bridge_opts {</div><div class='add'>+	BROPT_VLAN_ENABLED,</div><div class='add'>+	BROPT_VLAN_STATS_ENABLED,</div><div class='add'>+	BROPT_NF_CALL_IPTABLES,</div><div class='add'>+	BROPT_NF_CALL_IP6TABLES,</div><div class='add'>+	BROPT_NF_CALL_ARPTABLES,</div><div class='add'>+	BROPT_GROUP_ADDR_SET,</div><div class='add'>+	BROPT_MULTICAST_ENABLED,</div><div class='add'>+	BROPT_MULTICAST_QUERY_USE_IFADDR,</div><div class='add'>+	BROPT_MULTICAST_STATS_ENABLED,</div><div class='add'>+	BROPT_HAS_IPV6_ADDR,</div><div class='add'>+	BROPT_NEIGH_SUPPRESS_ENABLED,</div><div class='add'>+	BROPT_MTU_SET_BY_USER,</div><div class='add'>+	BROPT_VLAN_STATS_PER_PORT,</div><div class='add'>+	BROPT_NO_LL_LEARN,</div><div class='add'>+	BROPT_VLAN_BRIDGE_BINDING,</div><div class='add'>+	BROPT_MCAST_VLAN_SNOOPING_ENABLED,</div><div class='add'>+	BROPT_MST_ENABLED,</div><div class='add'>+	BROPT_MDB_OFFLOAD_FAIL_NOTIFICATION,</div><div class='add'>+	BROPT_FDB_LOCAL_VLAN_0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct net_bridge {</div><div class='ctx'> 	spinlock_t			lock;</div><div class='ctx'> 	spinlock_t			hash_lock;</div><div class='del'>-	struct list_head		port_list;</div><div class='add'>+	struct hlist_head		frame_type_list;</div><div class='ctx'> 	struct net_device		*dev;</div><div class='del'>-	struct pcpu_sw_netstats		__percpu *stats;</div><div class='add'>+	unsigned long			options;</div><div class='ctx'> 	/* These fields are accessed on each packet */</div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='del'>-	u8				vlan_enabled;</div><div class='del'>-	u8				vlan_stats_enabled;</div><div class='ctx'> 	__be16				vlan_proto;</div><div class='ctx'> 	u16				default_pvid;</div><div class='ctx'> 	struct net_bridge_vlan_group	__rcu *vlgrp;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	struct rhashtable		fdb_hash_tbl;</div><div class='add'>+	struct list_head		port_list;</div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct rtable		fake_rtable;</div><div class='ctx'> 		struct rt6_info		fake_rt6_info;</div><div class='ctx'> 	};</div><div class='del'>-	bool				nf_call_iptables;</div><div class='del'>-	bool				nf_call_ip6tables;</div><div class='del'>-	bool				nf_call_arptables;</div><div class='add'>+	u32				metrics[RTAX_MAX];</div><div class='ctx'> #endif</div><div class='ctx'> 	u16				group_fwd_mask;</div><div class='ctx'> 	u16				group_fwd_mask_required;</div><div class='hunk'>@@ -340,7 +518,6 @@ struct net_bridge {</div><div class='ctx'> 	/* STP */</div><div class='ctx'> 	bridge_id			designated_root;</div><div class='ctx'> 	bridge_id			bridge_id;</div><div class='del'>-	u32				root_path_cost;</div><div class='ctx'> 	unsigned char			topology_change;</div><div class='ctx'> 	unsigned char			topology_change_detected;</div><div class='ctx'> 	u16				root_port;</div><div class='hunk'>@@ -352,9 +529,9 @@ struct net_bridge {</div><div class='ctx'> 	unsigned long			bridge_hello_time;</div><div class='ctx'> 	unsigned long			bridge_forward_delay;</div><div class='ctx'> 	unsigned long			bridge_ageing_time;</div><div class='add'>+	u32				root_path_cost;</div><div class='ctx'> </div><div class='ctx'> 	u8				group_addr[ETH_ALEN];</div><div class='del'>-	bool				group_addr_set;</div><div class='ctx'> </div><div class='ctx'> 	enum {</div><div class='ctx'> 		BR_NO_STP, 		/* no spanning tree */</div><div class='hunk'>@@ -362,45 +539,22 @@ struct net_bridge {</div><div class='ctx'> 		BR_USER_STP,		/* new RSTP in userspace */</div><div class='ctx'> 	} stp_enabled;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='del'>-	unsigned char			multicast_router;</div><div class='add'>+	struct net_bridge_mcast		multicast_ctx;</div><div class='ctx'> </div><div class='del'>-	u8				multicast_disabled:1;</div><div class='del'>-	u8				multicast_querier:1;</div><div class='del'>-	u8				multicast_query_use_ifaddr:1;</div><div class='del'>-	u8				has_ipv6_addr:1;</div><div class='del'>-	u8				multicast_stats_enabled:1;</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	struct bridge_mcast_stats	__percpu *mcast_stats;</div><div class='ctx'> </div><div class='del'>-	u32				hash_elasticity;</div><div class='ctx'> 	u32				hash_max;</div><div class='ctx'> </div><div class='del'>-	u32				multicast_last_member_count;</div><div class='del'>-	u32				multicast_startup_query_count;</div><div class='del'>-</div><div class='del'>-	u8				multicast_igmp_version;</div><div class='add'>+	spinlock_t			multicast_lock;</div><div class='ctx'> </div><div class='del'>-	unsigned long			multicast_last_member_interval;</div><div class='del'>-	unsigned long			multicast_membership_interval;</div><div class='del'>-	unsigned long			multicast_querier_interval;</div><div class='del'>-	unsigned long			multicast_query_interval;</div><div class='del'>-	unsigned long			multicast_query_response_interval;</div><div class='del'>-	unsigned long			multicast_startup_query_interval;</div><div class='add'>+	struct rhashtable		mdb_hash_tbl;</div><div class='add'>+	struct rhashtable		sg_port_tbl;</div><div class='ctx'> </div><div class='del'>-	spinlock_t			multicast_lock;</div><div class='del'>-	struct net_bridge_mdb_htable __rcu *mdb;</div><div class='del'>-	struct hlist_head		router_list;</div><div class='add'>+	struct hlist_head		mcast_gc_list;</div><div class='add'>+	struct hlist_head		mdb_list;</div><div class='ctx'> </div><div class='del'>-	struct timer_list		multicast_router_timer;</div><div class='del'>-	struct bridge_mcast_other_query	ip4_other_query;</div><div class='del'>-	struct bridge_mcast_own_query	ip4_own_query;</div><div class='del'>-	struct bridge_mcast_querier	ip4_querier;</div><div class='del'>-	struct bridge_mcast_stats	__percpu *mcast_stats;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	struct bridge_mcast_other_query	ip6_other_query;</div><div class='del'>-	struct bridge_mcast_own_query	ip6_own_query;</div><div class='del'>-	struct bridge_mcast_querier	ip6_querier;</div><div class='del'>-	u8				multicast_mld_version;</div><div class='del'>-#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+	struct work_struct		mcast_gc_work;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	struct timer_list		hello_timer;</div><div class='hunk'>@@ -410,32 +564,63 @@ struct net_bridge {</div><div class='ctx'> 	struct kobject			*ifobj;</div><div class='ctx'> 	u32				auto_cnt;</div><div class='ctx'> </div><div class='add'>+	atomic_t			fdb_n_learned;</div><div class='add'>+	u32				fdb_max_learned;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NET_SWITCHDEV</div><div class='del'>-	int offload_fwd_mark;</div><div class='add'>+	/* Counter used to make sure that hardware domains get unique</div><div class='add'>+	 * identifiers in case a bridge spans multiple switchdev instances.</div><div class='add'>+	 */</div><div class='add'>+	int				last_hwdom;</div><div class='add'>+	/* Bit mask of hardware domain numbers in use */</div><div class='add'>+	unsigned long			busy_hwdoms;</div><div class='ctx'> #endif</div><div class='del'>-	bool				neigh_suppress_enabled;</div><div class='del'>-	bool				mtu_set_by_user;</div><div class='ctx'> 	struct hlist_head		fdb_list;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_MRP)</div><div class='add'>+	struct hlist_head		mrp_list;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_CFM)</div><div class='add'>+	struct hlist_head		mep_list;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct br_input_skb_cb {</div><div class='ctx'> 	struct net_device *brdev;</div><div class='ctx'> </div><div class='add'>+	u16 frag_max_size;</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='del'>-	int igmp;</div><div class='del'>-	int mrouters_only;</div><div class='add'>+	u8 igmp;</div><div class='add'>+	u8 mrouters_only:1;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	bool proxyarp_replied;</div><div class='del'>-	bool src_port_isolated;</div><div class='del'>-</div><div class='add'>+	u8 proxyarp_replied:1;</div><div class='add'>+	u8 src_port_isolated:1;</div><div class='add'>+	u8 promisc:1;</div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='del'>-	bool vlan_filtered;</div><div class='add'>+	u8 vlan_filtered:1;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE</div><div class='add'>+	u8 br_netfilter_broute:1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_SWITCHDEV</div><div class='del'>-	int offload_fwd_mark;</div><div class='add'>+	/* Set if TX data plane offloading is used towards at least one</div><div class='add'>+	 * hardware domain.</div><div class='add'>+	 */</div><div class='add'>+	u8 tx_fwd_offload:1;</div><div class='add'>+	/* The switchdev hardware domain from which this packet was received.</div><div class='add'>+	 * If skb-&gt;offload_fwd_mark was set, then this packet was already</div><div class='add'>+	 * forwarded by hardware to the other ports in the source hardware</div><div class='add'>+	 * domain, otherwise it wasn't.</div><div class='add'>+	 */</div><div class='add'>+	int src_hwdom;</div><div class='add'>+	/* Bit mask of hardware domains towards this packet has already been</div><div class='add'>+	 * transmitted using the TX data plane offload.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long fwd_hwdoms;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	u32 backup_nhid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BR_INPUT_SKB_CB(__skb)	((struct br_input_skb_cb *)(__skb)-&gt;cb)</div><div class='hunk'>@@ -492,6 +677,126 @@ static inline bool br_vlan_should_use(const struct net_bridge_vlan *v)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool nbp_state_should_learn(const struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;state == BR_STATE_LEARNING || p-&gt;state == BR_STATE_FORWARDING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_vlan_valid_id(u16 vid, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool ret = vid &gt; 0 &amp;&amp; vid &lt; VLAN_VID_MASK;</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Vlan id is invalid");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_vlan_valid_range(const struct bridge_vlan_info *cur,</div><div class='add'>+				       const struct bridge_vlan_info *last,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	/* pvid flag is not allowed in ranges */</div><div class='add'>+	if (cur-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Pvid isn't allowed in a range");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* when cur is the range end, check if:</div><div class='add'>+	 *  - it has range start flag</div><div class='add'>+	 *  - range ids are invalid (end is equal to or before start)</div><div class='add'>+	 */</div><div class='add'>+	if (last) {</div><div class='add'>+		if (cur-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_BEGIN) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Found a new vlan range start while processing one");</div><div class='add'>+			return false;</div><div class='add'>+		} else if (!(cur-&gt;flags &amp; BRIDGE_VLAN_INFO_RANGE_END)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Vlan range end flag is missing");</div><div class='add'>+			return false;</div><div class='add'>+		} else if (cur-&gt;vid &lt;= last-&gt;vid) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "End vlan id is less than or equal to start vlan id");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check for required range flags */</div><div class='add'>+	if (!(cur-&gt;flags &amp; (BRIDGE_VLAN_INFO_RANGE_BEGIN |</div><div class='add'>+			    BRIDGE_VLAN_INFO_RANGE_END))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Both vlan range flags are missing");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 br_vlan_multicast_router(const struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	u8 mcast_router = MDB_RTR_TYPE_DISABLED;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	if (!br_vlan_is_master(v))</div><div class='add'>+		mcast_router = v-&gt;port_mcast_ctx.multicast_router;</div><div class='add'>+	else</div><div class='add'>+		mcast_router = v-&gt;br_mcast_ctx.multicast_router;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return mcast_router;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_afspec_cmd_to_rtm(int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTM_SETLINK:</div><div class='add'>+		return RTM_NEWVLAN;</div><div class='add'>+	case RTM_DELLINK:</div><div class='add'>+		return RTM_DELVLAN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_opt_get(const struct net_bridge *br,</div><div class='add'>+			     enum net_bridge_opts opt)</div><div class='add'>+{</div><div class='add'>+	return test_bit(opt, &amp;br-&gt;options);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+int br_boolopt_get(const struct net_bridge *br, enum br_boolopt_id opt);</div><div class='add'>+int br_boolopt_multi_toggle(struct net_bridge *br,</div><div class='add'>+			    struct br_boolopt_multi *bm,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+void br_boolopt_multi_get(const struct net_bridge *br,</div><div class='add'>+			  struct br_boolopt_multi *bm);</div><div class='add'>+void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)</div><div class='add'>+static inline void br_tc_skb_miss_set(struct sk_buff *skb, bool miss)</div><div class='add'>+{</div><div class='add'>+	struct tc_skb_ext *ext;</div><div class='add'>+</div><div class='add'>+	if (!tc_skb_ext_tc_enabled())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ext = skb_ext_find(skb, TC_SKB_EXT);</div><div class='add'>+	if (ext) {</div><div class='add'>+		ext-&gt;l2_miss = miss;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (!miss)</div><div class='add'>+		return;</div><div class='add'>+	ext = tc_skb_ext_alloc(skb);</div><div class='add'>+	if (!ext)</div><div class='add'>+		return;</div><div class='add'>+	ext-&gt;l2_miss = true;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void br_tc_skb_miss_set(struct sk_buff *skb, bool miss)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* br_device.c */</div><div class='ctx'> void br_dev_setup(struct net_device *dev);</div><div class='ctx'> void br_dev_delete(struct net_device *dev, struct list_head *list);</div><div class='hunk'>@@ -500,10 +805,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static inline void br_netpoll_send_skb(const struct net_bridge_port *p,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct netpoll *np = p-&gt;np;</div><div class='del'>-</div><div class='del'>-	if (np)</div><div class='del'>-		netpoll_send_skb(np, skb);</div><div class='add'>+	netpoll_send_skb(p-&gt;np, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_netpoll_enable(struct net_bridge_port *p);</div><div class='hunk'>@@ -525,17 +827,25 @@ static inline void br_netpoll_disable(struct net_bridge_port *p)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* br_fdb.c */</div><div class='add'>+#define FDB_FLUSH_IGNORED_NDM_FLAGS (NTF_MASTER | NTF_SELF)</div><div class='add'>+#define FDB_FLUSH_ALLOWED_NDM_STATES (NUD_PERMANENT | NUD_NOARP)</div><div class='add'>+#define FDB_FLUSH_ALLOWED_NDM_FLAGS (NTF_USE | NTF_EXT_LEARNED | \</div><div class='add'>+				     NTF_STICKY | NTF_OFFLOADED)</div><div class='add'>+</div><div class='ctx'> int br_fdb_init(void);</div><div class='ctx'> void br_fdb_fini(void);</div><div class='ctx'> int br_fdb_hash_init(struct net_bridge *br);</div><div class='ctx'> void br_fdb_hash_fini(struct net_bridge *br);</div><div class='del'>-void br_fdb_flush(struct net_bridge *br);</div><div class='add'>+void br_fdb_flush(struct net_bridge *br,</div><div class='add'>+		  const struct net_bridge_fdb_flush_desc *desc);</div><div class='ctx'> void br_fdb_find_delete_local(struct net_bridge *br,</div><div class='ctx'> 			      const struct net_bridge_port *p,</div><div class='ctx'> 			      const unsigned char *addr, u16 vid);</div><div class='ctx'> void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr);</div><div class='ctx'> void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);</div><div class='ctx'> void br_fdb_cleanup(struct work_struct *work);</div><div class='add'>+int br_fdb_toggle_local_vlan_0(struct net_bridge *br, bool on,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='ctx'> void br_fdb_delete_by_port(struct net_bridge *br,</div><div class='ctx'> 			   const struct net_bridge_port *p, u16 vid, int do_all);</div><div class='ctx'> struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,</div><div class='hunk'>@@ -544,27 +854,34 @@ struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,</div><div class='ctx'> int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);</div><div class='ctx'> int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count,</div><div class='ctx'> 		   unsigned long off);</div><div class='del'>-int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		  const unsigned char *addr, u16 vid);</div><div class='add'>+int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,</div><div class='add'>+		     const unsigned char *addr, u16 vid);</div><div class='ctx'> void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,</div><div class='del'>-		   const unsigned char *addr, u16 vid, bool added_by_user);</div><div class='add'>+		   const unsigned char *addr, u16 vid, unsigned long flags);</div><div class='ctx'> </div><div class='ctx'> int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='del'>-		  struct net_device *dev, const unsigned char *addr, u16 vid);</div><div class='add'>+		  struct net_device *dev, const unsigned char *addr, u16 vid,</div><div class='add'>+		  bool *notified, struct netlink_ext_ack *extack);</div><div class='add'>+int br_fdb_delete_bulk(struct nlmsghdr *nlh, struct net_device *dev,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='ctx'> int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,</div><div class='del'>-	       const unsigned char *addr, u16 vid, u16 nlh_flags);</div><div class='add'>+	       const unsigned char *addr, u16 vid, u16 nlh_flags,</div><div class='add'>+	       bool *notified, struct netlink_ext_ack *extack);</div><div class='ctx'> int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 		struct net_device *dev, struct net_device *fdev, int *idx);</div><div class='add'>+int br_fdb_get(struct sk_buff *skb, struct nlattr *tb[], struct net_device *dev,</div><div class='add'>+	       const unsigned char *addr, u16 vid, u32 portid, u32 seq,</div><div class='add'>+	       struct netlink_ext_ack *extack);</div><div class='ctx'> int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p);</div><div class='ctx'> void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p);</div><div class='ctx'> int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 			      const unsigned char *addr, u16 vid,</div><div class='del'>-			      bool swdev_notify);</div><div class='add'>+			      bool locked, bool swdev_notify);</div><div class='ctx'> int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,</div><div class='ctx'> 			      const unsigned char *addr, u16 vid,</div><div class='ctx'> 			      bool swdev_notify);</div><div class='ctx'> void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,</div><div class='del'>-			  const unsigned char *addr, u16 vid);</div><div class='add'>+			  const unsigned char *addr, u16 vid, bool offloaded);</div><div class='ctx'> </div><div class='ctx'> /* br_forward.c */</div><div class='ctx'> enum br_pkt_type {</div><div class='hunk'>@@ -577,7 +894,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,</div><div class='ctx'> 		bool local_rcv, bool local_orig);</div><div class='ctx'> int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> void br_flood(struct net_bridge *br, struct sk_buff *skb,</div><div class='del'>-	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig);</div><div class='add'>+	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,</div><div class='add'>+	      u16 vid);</div><div class='ctx'> </div><div class='ctx'> /* return true if both source port and dest port are isolated */</div><div class='ctx'> static inline bool br_skb_isolated(const struct net_bridge_port *to,</div><div class='hunk'>@@ -603,16 +921,26 @@ int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev);</div><div class='ctx'> </div><div class='ctx'> /* br_input.c */</div><div class='ctx'> int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);</div><div class='del'>-rx_handler_result_t br_handle_frame(struct sk_buff **pskb);</div><div class='add'>+rx_handler_func_t *br_get_rx_handler(const struct net_device *dev);</div><div class='add'>+</div><div class='add'>+struct br_frame_type {</div><div class='add'>+	__be16			type;</div><div class='add'>+	int			(*frame_handler)(struct net_bridge_port *port,</div><div class='add'>+						 struct sk_buff *skb);</div><div class='add'>+	struct hlist_node	list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void br_add_frame(struct net_bridge *br, struct br_frame_type *ft);</div><div class='add'>+void br_del_frame(struct net_bridge *br, struct br_frame_type *ft);</div><div class='ctx'> </div><div class='ctx'> static inline bool br_rx_handler_check_rcu(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return rcu_dereference(dev-&gt;rx_handler) == br_handle_frame;</div><div class='add'>+	return rcu_dereference(dev-&gt;rx_handler) == br_get_rx_handler(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool br_rx_handler_check_rtnl(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return rcu_dereference_rtnl(dev-&gt;rx_handler) == br_handle_frame;</div><div class='add'>+	return rcu_dereference_rtnl(dev-&gt;rx_handler) == br_get_rx_handler(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct net_bridge_port *br_port_get_check_rcu(const struct net_device *dev)</div><div class='hunk'>@@ -627,79 +955,214 @@ br_port_get_check_rtnl(const struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* br_ioctl.c */</div><div class='del'>-int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd,</div><div class='del'>-			     void __user *arg);</div><div class='add'>+int br_dev_siocdevprivate(struct net_device *dev, struct ifreq *rq,</div><div class='add'>+			  void __user *data, int cmd);</div><div class='add'>+int br_ioctl_stub(struct net *net, unsigned int cmd, void __user *uarg);</div><div class='ctx'> </div><div class='ctx'> /* br_multicast.c */</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='del'>-extern unsigned int br_mdb_rehash_seq;</div><div class='del'>-int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,</div><div class='add'>+int br_multicast_rcv(struct net_bridge_mcast **brmctx,</div><div class='add'>+		     struct net_bridge_mcast_port **pmctx,</div><div class='add'>+		     struct net_bridge_vlan *vlan,</div><div class='ctx'> 		     struct sk_buff *skb, u16 vid);</div><div class='del'>-struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,</div><div class='del'>-					struct sk_buff *skb, u16 vid);</div><div class='add'>+struct net_bridge_mdb_entry *</div><div class='add'>+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,</div><div class='add'>+		     u16 vid);</div><div class='ctx'> int br_multicast_add_port(struct net_bridge_port *port);</div><div class='ctx'> void br_multicast_del_port(struct net_bridge_port *port);</div><div class='ctx'> void br_multicast_enable_port(struct net_bridge_port *port);</div><div class='ctx'> void br_multicast_disable_port(struct net_bridge_port *port);</div><div class='ctx'> void br_multicast_init(struct net_bridge *br);</div><div class='add'>+void br_multicast_join_snoopers(struct net_bridge *br);</div><div class='add'>+void br_multicast_leave_snoopers(struct net_bridge *br);</div><div class='ctx'> void br_multicast_open(struct net_bridge *br);</div><div class='ctx'> void br_multicast_stop(struct net_bridge *br);</div><div class='ctx'> void br_multicast_dev_del(struct net_bridge *br);</div><div class='del'>-void br_multicast_flood(struct net_bridge_mdb_entry *mdst,</div><div class='del'>-			struct sk_buff *skb, bool local_rcv, bool local_orig);</div><div class='del'>-int br_multicast_set_router(struct net_bridge *br, unsigned long val);</div><div class='del'>-int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val);</div><div class='del'>-int br_multicast_toggle(struct net_bridge *br, unsigned long val);</div><div class='del'>-int br_multicast_set_querier(struct net_bridge *br, unsigned long val);</div><div class='del'>-int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);</div><div class='del'>-int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val);</div><div class='add'>+void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,</div><div class='add'>+			struct net_bridge_mcast *brmctx,</div><div class='add'>+			bool local_rcv, bool local_orig);</div><div class='add'>+int br_multicast_set_router(struct net_bridge_mcast *brmctx, unsigned long val);</div><div class='add'>+int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,</div><div class='add'>+				 unsigned long val);</div><div class='add'>+int br_multicast_set_vlan_router(struct net_bridge_vlan *v, u8 mcast_router);</div><div class='add'>+int br_multicast_toggle(struct net_bridge *br, unsigned long val,</div><div class='add'>+			struct netlink_ext_ack *extack);</div><div class='add'>+int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val);</div><div class='add'>+int br_multicast_set_igmp_version(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  unsigned long val);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val);</div><div class='add'>+int br_multicast_set_mld_version(struct net_bridge_mcast *brmctx,</div><div class='add'>+				 unsigned long val);</div><div class='ctx'> #endif</div><div class='ctx'> struct net_bridge_mdb_entry *</div><div class='del'>-br_mdb_ip_get(struct net_bridge_mdb_htable *mdb, struct br_ip *dst);</div><div class='add'>+br_mdb_ip_get(struct net_bridge *br, struct br_ip *dst);</div><div class='ctx'> struct net_bridge_mdb_entry *</div><div class='del'>-br_multicast_new_group(struct net_bridge *br, struct net_bridge_port *port,</div><div class='del'>-		       struct br_ip *group);</div><div class='del'>-void br_multicast_free_pg(struct rcu_head *head);</div><div class='add'>+br_multicast_new_group(struct net_bridge *br, struct br_ip *group);</div><div class='ctx'> struct net_bridge_port_group *</div><div class='del'>-br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,</div><div class='add'>+br_multicast_new_port_group(struct net_bridge_port *port,</div><div class='add'>+			    const struct br_ip *group,</div><div class='ctx'> 			    struct net_bridge_port_group __rcu *next,</div><div class='del'>-			    unsigned char flags, const unsigned char *src);</div><div class='del'>-void br_mdb_init(void);</div><div class='del'>-void br_mdb_uninit(void);</div><div class='del'>-void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,</div><div class='del'>-		   struct br_ip *group, int type, u8 flags);</div><div class='del'>-void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,</div><div class='add'>+			    unsigned char flags, const unsigned char *src,</div><div class='add'>+			    u8 filter_mode, u8 rt_protocol,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+void br_multicast_del_port_group(struct net_bridge_port_group *p);</div><div class='add'>+int br_mdb_hash_init(struct net_bridge *br);</div><div class='add'>+void br_mdb_hash_fini(struct net_bridge *br);</div><div class='add'>+void br_mdb_notify(struct net_device *dev, struct net_bridge_mdb_entry *mp,</div><div class='add'>+		   struct net_bridge_port_group *pg, int type);</div><div class='add'>+void br_mdb_flag_change_notify(struct net_device *dev, struct net_bridge_mdb_entry *mp,</div><div class='add'>+			       struct net_bridge_port_group *pg);</div><div class='add'>+void br_rtr_notify(struct net_device *dev, struct net_bridge_mcast_port *pmctx,</div><div class='ctx'> 		   int type);</div><div class='del'>-void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,</div><div class='add'>+void br_multicast_del_pg(struct net_bridge_mdb_entry *mp,</div><div class='add'>+			 struct net_bridge_port_group *pg,</div><div class='add'>+			 struct net_bridge_port_group __rcu **pp);</div><div class='add'>+void br_multicast_count(struct net_bridge *br,</div><div class='add'>+			const struct net_bridge_port *p,</div><div class='ctx'> 			const struct sk_buff *skb, u8 type, u8 dir);</div><div class='ctx'> int br_multicast_init_stats(struct net_bridge *br);</div><div class='ctx'> void br_multicast_uninit_stats(struct net_bridge *br);</div><div class='ctx'> void br_multicast_get_stats(const struct net_bridge *br,</div><div class='ctx'> 			    const struct net_bridge_port *p,</div><div class='ctx'> 			    struct br_mcast_stats *dest);</div><div class='add'>+u32 br_multicast_ngroups_get(const struct net_bridge_mcast_port *pmctx);</div><div class='add'>+void br_multicast_ngroups_set_max(struct net_bridge_mcast_port *pmctx, u32 max);</div><div class='add'>+u32 br_multicast_ngroups_get_max(const struct net_bridge_mcast_port *pmctx);</div><div class='add'>+int br_mdb_add(struct net_device *dev, struct nlattr *tb[], u16 nlmsg_flags,</div><div class='add'>+	       struct netlink_ext_ack *extack);</div><div class='add'>+int br_mdb_del(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+	       struct netlink_ext_ack *extack);</div><div class='add'>+int br_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+		    struct netlink_ext_ack *extack);</div><div class='add'>+int br_mdb_dump(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+		struct netlink_callback *cb);</div><div class='add'>+int br_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid, u32 seq,</div><div class='add'>+	       struct netlink_ext_ack *extack);</div><div class='add'>+void br_multicast_host_join(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			    struct net_bridge_mdb_entry *mp, bool notify);</div><div class='add'>+void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify);</div><div class='add'>+void br_multicast_star_g_handle_mode(struct net_bridge_port_group *pg,</div><div class='add'>+				     u8 filter_mode);</div><div class='add'>+void br_multicast_sg_add_exclude_ports(struct net_bridge_mdb_entry *star_mp,</div><div class='add'>+				       struct net_bridge_port_group *sg);</div><div class='add'>+struct net_bridge_group_src *</div><div class='add'>+br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip);</div><div class='add'>+struct net_bridge_group_src *</div><div class='add'>+br_multicast_new_group_src(struct net_bridge_port_group *pg,</div><div class='add'>+			   struct br_ip *src_ip);</div><div class='add'>+void __br_multicast_del_group_src(struct net_bridge_group_src *src);</div><div class='add'>+void br_multicast_del_group_src(struct net_bridge_group_src *src,</div><div class='add'>+				bool fastleave);</div><div class='add'>+void br_multicast_ctx_init(struct net_bridge *br,</div><div class='add'>+			   struct net_bridge_vlan *vlan,</div><div class='add'>+			   struct net_bridge_mcast *brmctx);</div><div class='add'>+void br_multicast_ctx_deinit(struct net_bridge_mcast *brmctx);</div><div class='add'>+void br_multicast_port_ctx_init(struct net_bridge_port *port,</div><div class='add'>+				struct net_bridge_vlan *vlan,</div><div class='add'>+				struct net_bridge_mcast_port *pmctx);</div><div class='add'>+void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx);</div><div class='add'>+void br_multicast_update_vlan_mcast_ctx(struct net_bridge_vlan *v, u8 state);</div><div class='add'>+void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan, bool on);</div><div class='add'>+int br_multicast_toggle_vlan_snooping(struct net_bridge *br, bool on,</div><div class='add'>+				      struct netlink_ext_ack *extack);</div><div class='add'>+bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan, bool on);</div><div class='add'>+</div><div class='add'>+int br_rports_fill_info(struct sk_buff *skb,</div><div class='add'>+			const struct net_bridge_mcast *brmctx);</div><div class='add'>+int br_multicast_dump_querier_state(struct sk_buff *skb,</div><div class='add'>+				    const struct net_bridge_mcast *brmctx,</div><div class='add'>+				    int nest_attr);</div><div class='add'>+size_t br_multicast_querier_state_size(void);</div><div class='add'>+size_t br_rports_size(const struct net_bridge_mcast *brmctx);</div><div class='add'>+void br_multicast_set_query_intvl(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  unsigned long val);</div><div class='add'>+void br_multicast_set_startup_query_intvl(struct net_bridge_mcast *brmctx,</div><div class='add'>+					  unsigned long val);</div><div class='add'>+</div><div class='add'>+static inline bool br_group_is_l2(const struct br_ip *group)</div><div class='add'>+{</div><div class='add'>+	return group-&gt;proto == 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define mlock_dereference(X, br) \</div><div class='ctx'> 	rcu_dereference_protected(X, lockdep_is_held(&amp;br-&gt;multicast_lock))</div><div class='ctx'> </div><div class='del'>-static inline bool br_multicast_is_router(struct net_bridge *br)</div><div class='add'>+static inline struct hlist_node *</div><div class='add'>+br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		return rcu_dereference(hlist_first_rcu(&amp;brmctx-&gt;ip6_mc_router_list));</div><div class='add'>+#endif</div><div class='add'>+	return rcu_dereference(hlist_first_rcu(&amp;brmctx-&gt;ip4_mc_router_list));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_bridge_port *</div><div class='add'>+br_multicast_rport_from_node_skb(struct hlist_node *rp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_mcast_port *mctx;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		mctx = hlist_entry_safe(rp, struct net_bridge_mcast_port,</div><div class='add'>+					ip6_rlist);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		mctx = hlist_entry_safe(rp, struct net_bridge_mcast_port,</div><div class='add'>+					ip4_rlist);</div><div class='add'>+</div><div class='add'>+	if (mctx)</div><div class='add'>+		return mctx-&gt;port;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_ip4_multicast_is_router(struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return timer_pending(&amp;brmctx-&gt;ip4_mc_router_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_ip6_multicast_is_router(struct net_bridge_mcast *brmctx)</div><div class='ctx'> {</div><div class='del'>-	return br-&gt;multicast_router == 2 ||</div><div class='del'>-	       (br-&gt;multicast_router == 1 &amp;&amp;</div><div class='del'>-		timer_pending(&amp;br-&gt;multicast_router_timer));</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	return timer_pending(&amp;brmctx-&gt;ip6_mc_router_timer);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='del'>-__br_multicast_querier_exists(struct net_bridge *br,</div><div class='del'>-				struct bridge_mcast_other_query *querier,</div><div class='del'>-				const bool is_ipv6)</div><div class='add'>+br_multicast_is_router(struct net_bridge_mcast *brmctx, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	switch (brmctx-&gt;multicast_router) {</div><div class='add'>+	case MDB_RTR_TYPE_PERM:</div><div class='add'>+		return true;</div><div class='add'>+	case MDB_RTR_TYPE_TEMP_QUERY:</div><div class='add'>+		if (skb) {</div><div class='add'>+			if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+				return br_ip4_multicast_is_router(brmctx);</div><div class='add'>+			else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+				return br_ip6_multicast_is_router(brmctx);</div><div class='add'>+		} else {</div><div class='add'>+			return br_ip4_multicast_is_router(brmctx) ||</div><div class='add'>+			       br_ip6_multicast_is_router(brmctx);</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+__br_multicast_querier_exists(struct net_bridge_mcast *brmctx,</div><div class='add'>+			      struct bridge_mcast_other_query *querier,</div><div class='add'>+			      const bool is_ipv6)</div><div class='ctx'> {</div><div class='ctx'> 	bool own_querier_enabled;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;multicast_querier) {</div><div class='del'>-		if (is_ipv6 &amp;&amp; !br-&gt;has_ipv6_addr)</div><div class='add'>+	if (brmctx-&gt;multicast_querier) {</div><div class='add'>+		if (is_ipv6 &amp;&amp; !br_opt_get(brmctx-&gt;br, BROPT_HAS_IPV6_ADDR))</div><div class='ctx'> 			own_querier_enabled = false;</div><div class='ctx'> 		else</div><div class='ctx'> 			own_querier_enabled = true;</div><div class='hunk'>@@ -707,21 +1170,52 @@ __br_multicast_querier_exists(struct net_bridge *br,</div><div class='ctx'> 		own_querier_enabled = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return time_is_before_jiffies(querier-&gt;delay_time) &amp;&amp;</div><div class='add'>+	return !timer_pending(&amp;querier-&gt;delay_timer) &amp;&amp;</div><div class='ctx'> 	       (own_querier_enabled || timer_pending(&amp;querier-&gt;timer));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool br_multicast_querier_exists(struct net_bridge *br,</div><div class='del'>-					       struct ethhdr *eth)</div><div class='add'>+static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,</div><div class='add'>+					       struct ethhdr *eth,</div><div class='add'>+					       const struct net_bridge_mdb_entry *mdb)</div><div class='ctx'> {</div><div class='ctx'> 	switch (eth-&gt;h_proto) {</div><div class='ctx'> 	case (htons(ETH_P_IP)):</div><div class='del'>-		return __br_multicast_querier_exists(br,</div><div class='del'>-			&amp;br-&gt;ip4_other_query, false);</div><div class='add'>+		return __br_multicast_querier_exists(brmctx,</div><div class='add'>+			&amp;brmctx-&gt;ip4_other_query, false);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case (htons(ETH_P_IPV6)):</div><div class='del'>-		return __br_multicast_querier_exists(br,</div><div class='del'>-			&amp;br-&gt;ip6_other_query, true);</div><div class='add'>+		return __br_multicast_querier_exists(brmctx,</div><div class='add'>+			&amp;brmctx-&gt;ip6_other_query, true);</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return !!mdb &amp;&amp; br_group_is_l2(&amp;mdb-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_multicast_is_star_g(const struct br_ip *ip)</div><div class='add'>+{</div><div class='add'>+	switch (ip-&gt;proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		return ipv4_is_zeronet(ip-&gt;src.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		return ipv6_addr_any(&amp;ip-&gt;src.ip6);</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_should_handle_mode(const struct net_bridge_mcast *brmctx,</div><div class='add'>+				__be16 proto)</div><div class='add'>+{</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		return !!(brmctx-&gt;multicast_igmp_version == 3);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		return !!(brmctx-&gt;multicast_mld_version == 2);</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -732,17 +1226,162 @@ static inline int br_multicast_igmp_type(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return BR_INPUT_SKB_CB(skb)-&gt;igmp;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline unsigned long br_multicast_lmqt(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return brmctx-&gt;multicast_last_member_interval *</div><div class='add'>+	       brmctx-&gt;multicast_last_member_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long br_multicast_gmi(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return brmctx-&gt;multicast_membership_interval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_is_vlan(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return !!brmctx-&gt;vlan;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_port_ctx_is_vlan(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return !!pmctx-&gt;vlan;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_bridge_mcast *</div><div class='add'>+br_multicast_port_ctx_get_global(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	if (!br_multicast_port_ctx_is_vlan(pmctx))</div><div class='add'>+		return &amp;pmctx-&gt;port-&gt;br-&gt;multicast_ctx;</div><div class='add'>+	else</div><div class='add'>+		return &amp;pmctx-&gt;vlan-&gt;brvlan-&gt;br_mcast_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_vlan_global_disabled(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_ctx_is_vlan(brmctx) &amp;&amp;</div><div class='add'>+	       (!br_opt_get(brmctx-&gt;br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) ||</div><div class='add'>+		!(brmctx-&gt;vlan-&gt;priv_flags &amp; BR_VLFLAG_GLOBAL_MCAST_ENABLED));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_vlan_disabled(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_ctx_is_vlan(brmctx) &amp;&amp;</div><div class='add'>+	       !(brmctx-&gt;vlan-&gt;priv_flags &amp; BR_VLFLAG_MCAST_ENABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_port_ctx_vlan_disabled(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_port_ctx_is_vlan(pmctx) &amp;&amp;</div><div class='add'>+	       !(pmctx-&gt;vlan-&gt;priv_flags &amp; BR_VLFLAG_MCAST_ENABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_port_ctx_state_disabled(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return pmctx-&gt;port-&gt;state == BR_STATE_DISABLED ||</div><div class='add'>+	       (br_multicast_port_ctx_is_vlan(pmctx) &amp;&amp;</div><div class='add'>+		(br_multicast_port_ctx_vlan_disabled(pmctx) ||</div><div class='add'>+		 pmctx-&gt;vlan-&gt;state == BR_STATE_DISABLED));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_port_ctx_state_stopped(const struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_port_ctx_state_disabled(pmctx) ||</div><div class='add'>+	       pmctx-&gt;port-&gt;state == BR_STATE_BLOCKING ||</div><div class='add'>+	       (br_multicast_port_ctx_is_vlan(pmctx) &amp;&amp;</div><div class='add'>+		pmctx-&gt;vlan-&gt;state == BR_STATE_BLOCKING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_rports_have_mc_router(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	return !hlist_empty(&amp;brmctx-&gt;ip4_mc_router_list) ||</div><div class='add'>+	       !hlist_empty(&amp;brmctx-&gt;ip6_mc_router_list);</div><div class='ctx'> #else</div><div class='del'>-static inline int br_multicast_rcv(struct net_bridge *br,</div><div class='del'>-				   struct net_bridge_port *port,</div><div class='add'>+	return !hlist_empty(&amp;brmctx-&gt;ip4_mc_router_list);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,</div><div class='add'>+			       const struct net_bridge_mcast *brmctx2)</div><div class='add'>+{</div><div class='add'>+	return brmctx1-&gt;multicast_igmp_version ==</div><div class='add'>+	       brmctx2-&gt;multicast_igmp_version &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_last_member_count ==</div><div class='add'>+	       brmctx2-&gt;multicast_last_member_count &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_startup_query_count ==</div><div class='add'>+	       brmctx2-&gt;multicast_startup_query_count &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_last_member_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_last_member_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_membership_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_membership_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_querier_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_querier_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_query_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_query_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_query_response_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_query_response_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_startup_query_interval ==</div><div class='add'>+	       brmctx2-&gt;multicast_startup_query_interval &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_querier == brmctx2-&gt;multicast_querier &amp;&amp;</div><div class='add'>+	       brmctx1-&gt;multicast_router == brmctx2-&gt;multicast_router &amp;&amp;</div><div class='add'>+	       !br_rports_have_mc_router(brmctx1) &amp;&amp;</div><div class='add'>+	       !br_rports_have_mc_router(brmctx2) &amp;&amp;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	       brmctx1-&gt;multicast_mld_version ==</div><div class='add'>+	       brmctx2-&gt;multicast_mld_version &amp;&amp;</div><div class='add'>+#endif</div><div class='add'>+	       true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_matches_vlan_snooping(const struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+	bool vlan_snooping_enabled;</div><div class='add'>+</div><div class='add'>+	vlan_snooping_enabled = !!br_opt_get(brmctx-&gt;br,</div><div class='add'>+					     BROPT_MCAST_VLAN_SNOOPING_ENABLED);</div><div class='add'>+</div><div class='add'>+	return !!(vlan_snooping_enabled == br_multicast_ctx_is_vlan(brmctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+br_multicast_set_pg_offload_flags(struct net_bridge_port_group *p,</div><div class='add'>+				  bool offloaded)</div><div class='add'>+{</div><div class='add'>+	p-&gt;flags &amp;= ~(MDB_PG_FLAGS_OFFLOAD | MDB_PG_FLAGS_OFFLOAD_FAILED);</div><div class='add'>+	p-&gt;flags |= (offloaded ? MDB_PG_FLAGS_OFFLOAD :</div><div class='add'>+		MDB_PG_FLAGS_OFFLOAD_FAILED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_mdb_should_notify(const struct net_bridge *br, u8 changed_flags)</div><div class='add'>+{</div><div class='add'>+	return br_opt_get(br, BROPT_MDB_OFFLOAD_FAIL_NOTIFICATION) &amp;&amp;</div><div class='add'>+		(changed_flags &amp; MDB_PG_FLAGS_OFFLOAD_FAILED);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx,</div><div class='add'>+				   struct net_bridge_mcast_port **pmctx,</div><div class='add'>+				   struct net_bridge_vlan *vlan,</div><div class='ctx'> 				   struct sk_buff *skb,</div><div class='ctx'> 				   u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,</div><div class='del'>-						      struct sk_buff *skb, u16 vid)</div><div class='add'>+static inline struct net_bridge_mdb_entry *</div><div class='add'>+br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,</div><div class='add'>+		     u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -768,6 +1407,14 @@ static inline void br_multicast_init(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void br_multicast_join_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_leave_snoopers(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void br_multicast_open(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -782,26 +1429,61 @@ static inline void br_multicast_dev_del(struct net_bridge *br)</div><div class='ctx'> </div><div class='ctx'> static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,</div><div class='ctx'> 				      struct sk_buff *skb,</div><div class='add'>+				      struct net_bridge_mcast *brmctx,</div><div class='ctx'> 				      bool local_rcv, bool local_orig)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool br_multicast_is_router(struct net_bridge *br)</div><div class='add'>+static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool br_multicast_querier_exists(struct net_bridge *br,</div><div class='del'>-					       struct ethhdr *eth)</div><div class='add'>+static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,</div><div class='add'>+					       struct ethhdr *eth,</div><div class='add'>+					       const struct net_bridge_mdb_entry *mdb)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void br_mdb_init(void)</div><div class='add'>+static inline int br_mdb_add(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			     u16 nlmsg_flags, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mdb_del(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void br_mdb_uninit(void)</div><div class='add'>+static inline int br_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mdb_dump(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			      struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mdb_get(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			     u32 portid, u32 seq,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mdb_hash_init(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_mdb_hash_fini(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -825,13 +1507,64 @@ static inline int br_multicast_igmp_type(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_ctx_init(struct net_bridge *br,</div><div class='add'>+					 struct net_bridge_vlan *vlan,</div><div class='add'>+					 struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_ctx_deinit(struct net_bridge_mcast *brmctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_port_ctx_init(struct net_bridge_port *port,</div><div class='add'>+					      struct net_bridge_vlan *vlan,</div><div class='add'>+					      struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_update_vlan_mcast_ctx(struct net_bridge_vlan *v,</div><div class='add'>+						      u8 state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan,</div><div class='add'>+						bool on)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_multicast_toggle_vlan_snooping(struct net_bridge *br,</div><div class='add'>+						    bool on,</div><div class='add'>+						    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan,</div><div class='add'>+						   bool on)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,</div><div class='add'>+			       const struct net_bridge_mcast *brmctx2)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* br_vlan.c */</div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='ctx'> bool br_allowed_ingress(const struct net_bridge *br,</div><div class='ctx'> 			struct net_bridge_vlan_group *vg, struct sk_buff *skb,</div><div class='del'>-			u16 *vid);</div><div class='add'>+			u16 *vid, u8 *state,</div><div class='add'>+			struct net_bridge_vlan **vlan);</div><div class='ctx'> bool br_allowed_egress(struct net_bridge_vlan_group *vg,</div><div class='ctx'> 		       const struct sk_buff *skb);</div><div class='ctx'> bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid);</div><div class='hunk'>@@ -840,27 +1573,53 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,</div><div class='ctx'> 			       struct net_bridge_vlan_group *vg,</div><div class='ctx'> 			       struct sk_buff *skb);</div><div class='ctx'> int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags,</div><div class='del'>-		bool *changed);</div><div class='add'>+		bool *changed, struct netlink_ext_ack *extack);</div><div class='ctx'> int br_vlan_delete(struct net_bridge *br, u16 vid);</div><div class='ctx'> void br_vlan_flush(struct net_bridge *br);</div><div class='ctx'> struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid);</div><div class='ctx'> void br_recalculate_fwd_mask(struct net_bridge *br);</div><div class='del'>-int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);</div><div class='del'>-int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);</div><div class='del'>-int __br_vlan_set_proto(struct net_bridge *br, __be16 proto);</div><div class='del'>-int br_vlan_set_proto(struct net_bridge *br, unsigned long val);</div><div class='add'>+int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+int __br_vlan_set_proto(struct net_bridge *br, __be16 proto,</div><div class='add'>+			struct netlink_ext_ack *extack);</div><div class='add'>+int br_vlan_set_proto(struct net_bridge *br, unsigned long val,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='ctx'> int br_vlan_set_stats(struct net_bridge *br, unsigned long val);</div><div class='add'>+int br_vlan_set_stats_per_port(struct net_bridge *br, unsigned long val);</div><div class='ctx'> int br_vlan_init(struct net_bridge *br);</div><div class='del'>-int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val);</div><div class='del'>-int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid);</div><div class='add'>+int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='ctx'> int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,</div><div class='del'>-		 bool *changed);</div><div class='add'>+		 bool *changed, struct netlink_ext_ack *extack);</div><div class='ctx'> int nbp_vlan_delete(struct net_bridge_port *port, u16 vid);</div><div class='ctx'> void nbp_vlan_flush(struct net_bridge_port *port);</div><div class='del'>-int nbp_vlan_init(struct net_bridge_port *port);</div><div class='add'>+int nbp_vlan_init(struct net_bridge_port *port, struct netlink_ext_ack *extack);</div><div class='ctx'> int nbp_get_num_vlan_infos(struct net_bridge_port *p, u32 filter_mask);</div><div class='ctx'> void br_vlan_get_stats(const struct net_bridge_vlan *v,</div><div class='del'>-		       struct br_vlan_stats *stats);</div><div class='add'>+		       struct pcpu_sw_netstats *stats);</div><div class='add'>+void br_vlan_port_event(struct net_bridge_port *p, unsigned long event);</div><div class='add'>+int br_vlan_bridge_event(struct net_device *dev, unsigned long event,</div><div class='add'>+			 void *ptr);</div><div class='add'>+void br_vlan_vlan_upper_event(struct net_device *br_dev,</div><div class='add'>+			      struct net_device *vlan_dev,</div><div class='add'>+			      unsigned long event);</div><div class='add'>+int br_vlan_rtnl_init(void);</div><div class='add'>+void br_vlan_rtnl_uninit(void);</div><div class='add'>+void br_vlan_notify(const struct net_bridge *br,</div><div class='add'>+		    const struct net_bridge_port *p,</div><div class='add'>+		    u16 vid, u16 vid_range,</div><div class='add'>+		    int cmd);</div><div class='add'>+bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			     const struct net_bridge_vlan *range_end);</div><div class='add'>+</div><div class='add'>+void br_vlan_fill_forward_path_pvid(struct net_bridge *br,</div><div class='add'>+				    struct net_device_path_ctx *ctx,</div><div class='add'>+				    struct net_device_path *path);</div><div class='add'>+int br_vlan_fill_forward_path_mode(struct net_bridge *br,</div><div class='add'>+				   struct net_bridge_port *dst,</div><div class='add'>+				   struct net_device_path *path);</div><div class='ctx'> </div><div class='ctx'> static inline struct net_bridge_vlan_group *br_vlan_group(</div><div class='ctx'> 					const struct net_bridge *br)</div><div class='hunk'>@@ -894,7 +1653,7 @@ static inline int br_vlan_get_tag(const struct sk_buff *skb, u16 *vid)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_vlan_tag_present(skb)) {</div><div class='del'>-		*vid = skb_vlan_tag_get(skb) &amp; VLAN_VID_MASK;</div><div class='add'>+		*vid = skb_vlan_tag_get_id(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*vid = 0;</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -912,12 +1671,19 @@ static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)</div><div class='ctx'> 	return vg-&gt;pvid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 br_vlan_flags(const struct net_bridge_vlan *v, u16 pvid)</div><div class='add'>+{</div><div class='add'>+	return v-&gt;vid == pvid ? v-&gt;flags | BRIDGE_VLAN_INFO_PVID : v-&gt;flags;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline bool br_allowed_ingress(const struct net_bridge *br,</div><div class='ctx'> 				      struct net_bridge_vlan_group *vg,</div><div class='ctx'> 				      struct sk_buff *skb,</div><div class='del'>-				      u16 *vid)</div><div class='add'>+				      u16 *vid, u8 *state,</div><div class='add'>+				      struct net_bridge_vlan **vlan)</div><div class='add'>+</div><div class='ctx'> {</div><div class='add'>+	*vlan = NULL;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -942,7 +1708,7 @@ static inline struct sk_buff *br_handle_vlan(struct net_bridge *br,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags,</div><div class='del'>-			      bool *changed)</div><div class='add'>+			      bool *changed, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	*changed = false;</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -967,7 +1733,7 @@ static inline int br_vlan_init(struct net_bridge *br)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,</div><div class='del'>-			       bool *changed)</div><div class='add'>+			       bool *changed, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	*changed = false;</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -988,7 +1754,8 @@ static inline struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nbp_vlan_init(struct net_bridge_port *port)</div><div class='add'>+static inline int nbp_vlan_init(struct net_bridge_port *port,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1003,8 +1770,9 @@ static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __br_vlan_filter_toggle(struct net_bridge *br,</div><div class='del'>-					  unsigned long val)</div><div class='add'>+static inline int br_vlan_filter_toggle(struct net_bridge *br,</div><div class='add'>+					unsigned long val,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1015,6 +1783,19 @@ static inline int nbp_get_num_vlan_infos(struct net_bridge_port *p,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void br_vlan_fill_forward_path_pvid(struct net_bridge *br,</div><div class='add'>+						  struct net_device_path_ctx *ctx,</div><div class='add'>+						  struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_vlan_fill_forward_path_mode(struct net_bridge *br,</div><div class='add'>+						 struct net_bridge_port *dst,</div><div class='add'>+						 struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct net_bridge_vlan_group *br_vlan_group(</div><div class='ctx'> 					const struct net_bridge *br)</div><div class='ctx'> {</div><div class='hunk'>@@ -1040,7 +1821,177 @@ static inline struct net_bridge_vlan_group *nbp_vlan_group_rcu(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void br_vlan_get_stats(const struct net_bridge_vlan *v,</div><div class='del'>-				     struct br_vlan_stats *stats)</div><div class='add'>+				     struct pcpu_sw_netstats *stats)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_port_event(struct net_bridge_port *p,</div><div class='add'>+				      unsigned long event)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_vlan_bridge_event(struct net_device *dev,</div><div class='add'>+				       unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_vlan_upper_event(struct net_device *br_dev,</div><div class='add'>+					    struct net_device *vlan_dev,</div><div class='add'>+					    unsigned long event)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_vlan_rtnl_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_rtnl_uninit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_notify(const struct net_bridge *br,</div><div class='add'>+				  const struct net_bridge_port *p,</div><div class='add'>+				  u16 vid, u16 vid_range,</div><div class='add'>+				  int cmd)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+					   const struct net_bridge_vlan *range_end)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 br_vlan_flags(const struct net_bridge_vlan *v, u16 pvid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* br_vlan_options.c */</div><div class='add'>+#ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='add'>+bool br_vlan_opts_eq_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			   const struct net_bridge_vlan *range_end);</div><div class='add'>+bool br_vlan_opts_fill(struct sk_buff *skb, const struct net_bridge_vlan *v,</div><div class='add'>+		       const struct net_bridge_port *p);</div><div class='add'>+size_t br_vlan_opts_nl_size(void);</div><div class='add'>+int br_vlan_process_options(const struct net_bridge *br,</div><div class='add'>+			    const struct net_bridge_port *p,</div><div class='add'>+			    struct net_bridge_vlan *range_start,</div><div class='add'>+			    struct net_bridge_vlan *range_end,</div><div class='add'>+			    struct nlattr **tb,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+int br_vlan_rtm_process_global_options(struct net_device *dev,</div><div class='add'>+				       const struct nlattr *attr,</div><div class='add'>+				       int cmd,</div><div class='add'>+				       struct netlink_ext_ack *extack);</div><div class='add'>+bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+					 const struct net_bridge_vlan *r_end);</div><div class='add'>+bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,</div><div class='add'>+			      const struct net_bridge_vlan *v_opts);</div><div class='add'>+</div><div class='add'>+/* vlan state manipulation helpers using *_ONCE to annotate lock-free access,</div><div class='add'>+ * while br_vlan_set_state() may access data protected by multicast_lock.</div><div class='add'>+ */</div><div class='add'>+static inline u8 br_vlan_get_state(const struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(v-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_set_state(struct net_bridge_vlan *v, u8 state)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(v-&gt;state, state);</div><div class='add'>+	br_multicast_update_vlan_mcast_ctx(v, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 br_vlan_get_pvid_state(const struct net_bridge_vlan_group *vg)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(vg-&gt;pvid_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_vlan_set_pvid_state(struct net_bridge_vlan_group *vg,</div><div class='add'>+					  u8 state)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(vg-&gt;pvid_state, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* learn_allow is true at ingress and false at egress */</div><div class='add'>+static inline bool br_vlan_state_allowed(u8 state, bool learn_allow)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		return learn_allow;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* br_mst.c */</div><div class='add'>+#ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(br_mst_used);</div><div class='add'>+static inline bool br_mst_is_enabled(const struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	/* check the port's vlan group to avoid racing with port deletion */</div><div class='add'>+	return static_branch_unlikely(&amp;br_mst_used) &amp;&amp;</div><div class='add'>+	       br_opt_get(p-&gt;br, BROPT_MST_ENABLED) &amp;&amp;</div><div class='add'>+	       rcu_access_pointer(p-&gt;vlgrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+int br_mst_vlan_set_msti(struct net_bridge_vlan *v, u16 msti);</div><div class='add'>+void br_mst_vlan_init_state(struct net_bridge_vlan *v);</div><div class='add'>+int br_mst_set_enabled(struct net_bridge *br, bool on,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+size_t br_mst_info_size(const struct net_bridge_vlan_group *vg);</div><div class='add'>+int br_mst_fill_info(struct sk_buff *skb,</div><div class='add'>+		     const struct net_bridge_vlan_group *vg);</div><div class='add'>+int br_mst_process(struct net_bridge_port *p, const struct nlattr *mst_attr,</div><div class='add'>+		   struct netlink_ext_ack *extack);</div><div class='add'>+void br_mst_uninit(struct net_bridge *br);</div><div class='add'>+#else</div><div class='add'>+static inline bool br_mst_is_enabled(const struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mst_set_state(struct net_bridge_port *p, u16 msti,</div><div class='add'>+				   u8 state, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mst_set_enabled(struct net_bridge *br, bool on,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t br_mst_info_size(const struct net_bridge_vlan_group *vg)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mst_fill_info(struct sk_buff *skb,</div><div class='add'>+				   const struct net_bridge_vlan_group *vg)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mst_process(struct net_bridge_port *p,</div><div class='add'>+				 const struct nlattr *mst_attr,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_mst_uninit(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1078,7 +2029,8 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time);</div><div class='ctx'> /* br_stp_if.c */</div><div class='ctx'> void br_stp_enable_bridge(struct net_bridge *br);</div><div class='ctx'> void br_stp_disable_bridge(struct net_bridge *br);</div><div class='del'>-void br_stp_set_enabled(struct net_bridge *br, unsigned long val);</div><div class='add'>+int br_stp_set_enabled(struct net_bridge *br, unsigned long val,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='ctx'> void br_stp_enable_port(struct net_bridge_port *p);</div><div class='ctx'> void br_stp_disable_port(struct net_bridge_port *p);</div><div class='ctx'> bool br_stp_recalculate_bridge_id(struct net_bridge *br);</div><div class='hunk'>@@ -1103,16 +2055,112 @@ unsigned long br_timer_value(const struct timer_list *timer);</div><div class='ctx'> extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* br_mrp.c */</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_MRP)</div><div class='add'>+int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+		 struct nlattr *attr, int cmd, struct netlink_ext_ack *extack);</div><div class='add'>+bool br_mrp_enabled(struct net_bridge *br);</div><div class='add'>+void br_mrp_port_del(struct net_bridge *br, struct net_bridge_port *p);</div><div class='add'>+int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br);</div><div class='add'>+#else</div><div class='add'>+static inline int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+			       struct nlattr *attr, int cmd,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_mrp_enabled(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_mrp_port_del(struct net_bridge *br,</div><div class='add'>+				   struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* br_cfm.c */</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_CFM)</div><div class='add'>+int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+		 struct nlattr *attr, int cmd, struct netlink_ext_ack *extack);</div><div class='add'>+bool br_cfm_created(struct net_bridge *br);</div><div class='add'>+void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *p);</div><div class='add'>+int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br);</div><div class='add'>+int br_cfm_status_fill_info(struct sk_buff *skb,</div><div class='add'>+			    struct net_bridge *br,</div><div class='add'>+			    bool getlink);</div><div class='add'>+int br_cfm_mep_count(struct net_bridge *br, u32 *count);</div><div class='add'>+int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count);</div><div class='add'>+#else</div><div class='add'>+static inline int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p,</div><div class='add'>+			       struct nlattr *attr, int cmd,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_cfm_created(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_cfm_port_del(struct net_bridge *br,</div><div class='add'>+				   struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_cfm_status_fill_info(struct sk_buff *skb,</div><div class='add'>+					  struct net_bridge *br,</div><div class='add'>+					  bool getlink)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_cfm_mep_count(struct net_bridge *br, u32 *count)</div><div class='add'>+{</div><div class='add'>+	*count = 0;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count)</div><div class='add'>+{</div><div class='add'>+	*count = 0;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* br_netlink.c */</div><div class='ctx'> extern struct rtnl_link_ops br_link_ops;</div><div class='ctx'> int br_netlink_init(void);</div><div class='ctx'> void br_netlink_fini(void);</div><div class='ctx'> void br_ifinfo_notify(int event, const struct net_bridge *br,</div><div class='ctx'> 		      const struct net_bridge_port *port);</div><div class='del'>-int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);</div><div class='add'>+void br_info_notify(int event, const struct net_bridge *br,</div><div class='add'>+		    const struct net_bridge_port *port, u32 filter);</div><div class='add'>+int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags,</div><div class='add'>+	       struct netlink_ext_ack *extack);</div><div class='ctx'> int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);</div><div class='ctx'> int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,</div><div class='ctx'> 	       u32 filter_mask, int nlflags);</div><div class='add'>+int br_process_vlan_info(struct net_bridge *br,</div><div class='add'>+			 struct net_bridge_port *p, int cmd,</div><div class='add'>+			 struct bridge_vlan_info *vinfo_curr,</div><div class='add'>+			 struct bridge_vlan_info **vinfo_last,</div><div class='add'>+			 bool *changed,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> /* br_sysfs_if.c */</div><div class='hunk'>@@ -1134,27 +2182,102 @@ static inline void br_sysfs_delbr(struct net_device *dev) { return; }</div><div class='ctx'> </div><div class='ctx'> /* br_switchdev.c */</div><div class='ctx'> #ifdef CONFIG_NET_SWITCHDEV</div><div class='del'>-int nbp_switchdev_mark_set(struct net_bridge_port *p);</div><div class='add'>+int br_switchdev_port_offload(struct net_bridge_port *p,</div><div class='add'>+			      struct net_device *dev, const void *ctx,</div><div class='add'>+			      struct notifier_block *atomic_nb,</div><div class='add'>+			      struct notifier_block *blocking_nb,</div><div class='add'>+			      bool tx_fwd_offload,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+void br_switchdev_port_unoffload(struct net_bridge_port *p, const void *ctx,</div><div class='add'>+				 struct notifier_block *atomic_nb,</div><div class='add'>+				 struct notifier_block *blocking_nb);</div><div class='add'>+</div><div class='add'>+int br_switchdev_port_replay(struct net_bridge_port *p,</div><div class='add'>+			     struct net_device *dev, const void *ctx,</div><div class='add'>+			     struct notifier_block *atomic_nb,</div><div class='add'>+			     struct notifier_block *blocking_nb,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+void nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p,</div><div class='add'>+					     struct sk_buff *skb);</div><div class='add'>+void nbp_switchdev_frame_mark_tx_fwd_to_hwdom(const struct net_bridge_port *p,</div><div class='add'>+					      struct sk_buff *skb);</div><div class='ctx'> void nbp_switchdev_frame_mark(const struct net_bridge_port *p,</div><div class='ctx'> 			      struct sk_buff *skb);</div><div class='ctx'> bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,</div><div class='ctx'> 				  const struct sk_buff *skb);</div><div class='ctx'> int br_switchdev_set_port_flag(struct net_bridge_port *p,</div><div class='ctx'> 			       unsigned long flags,</div><div class='del'>-			       unsigned long mask);</div><div class='del'>-void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,</div><div class='add'>+			       unsigned long mask,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='add'>+void br_switchdev_fdb_notify(struct net_bridge *br,</div><div class='add'>+			     const struct net_bridge_fdb_entry *fdb, int type);</div><div class='add'>+void br_switchdev_mdb_notify(struct net_device *dev,</div><div class='add'>+			     struct net_bridge_mdb_entry *mp,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='ctx'> 			     int type);</div><div class='del'>-int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags);</div><div class='add'>+int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,</div><div class='add'>+			       bool changed, struct netlink_ext_ack *extack);</div><div class='ctx'> int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid);</div><div class='add'>+void br_switchdev_init(struct net_bridge *br);</div><div class='ctx'> </div><div class='ctx'> static inline void br_switchdev_frame_unmark(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;offload_fwd_mark = 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)</div><div class='add'>+static inline int</div><div class='add'>+br_switchdev_port_offload(struct net_bridge_port *p,</div><div class='add'>+			  struct net_device *dev, const void *ctx,</div><div class='add'>+			  struct notifier_block *atomic_nb,</div><div class='add'>+			  struct notifier_block *blocking_nb,</div><div class='add'>+			  bool tx_fwd_offload,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+br_switchdev_port_unoffload(struct net_bridge_port *p, const void *ctx,</div><div class='add'>+			    struct notifier_block *atomic_nb,</div><div class='add'>+			    struct notifier_block *blocking_nb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+br_switchdev_port_replay(struct net_bridge_port *p,</div><div class='add'>+			 struct net_device *dev, const void *ctx,</div><div class='add'>+			 struct notifier_block *atomic_nb,</div><div class='add'>+			 struct notifier_block *blocking_nb,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nbp_switchdev_frame_mark_tx_fwd_to_hwdom(const struct net_bridge_port *p,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void nbp_switchdev_frame_mark(const struct net_bridge_port *p,</div><div class='hunk'>@@ -1170,13 +2293,15 @@ static inline bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,</div><div class='ctx'> </div><div class='ctx'> static inline int br_switchdev_set_port_flag(struct net_bridge_port *p,</div><div class='ctx'> 					     unsigned long flags,</div><div class='del'>-					     unsigned long mask)</div><div class='add'>+					     unsigned long mask,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int br_switchdev_port_vlan_add(struct net_device *dev,</div><div class='del'>-					     u16 vid, u16 flags)</div><div class='add'>+static inline int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid,</div><div class='add'>+					     u16 flags, bool changed,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1187,13 +2312,26 @@ static inline int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)</div><div class='add'>+br_switchdev_fdb_notify(struct net_bridge *br,</div><div class='add'>+			const struct net_bridge_fdb_entry *fdb, int type)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_switchdev_mdb_notify(struct net_device *dev,</div><div class='add'>+					   struct net_bridge_mdb_entry *mp,</div><div class='add'>+					   struct net_bridge_port_group *pg,</div><div class='add'>+					   int type)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void br_switchdev_frame_unmark(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void br_switchdev_init(struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_NET_SWITCHDEV */</div><div class='ctx'> </div><div class='ctx'> /* br_arp_nd_proxy.c */</div><div class='hunk'>@@ -1202,5 +2340,6 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 			      u16 vid, struct net_bridge_port *p);</div><div class='ctx'> void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,</div><div class='ctx'> 		       u16 vid, struct net_bridge_port *p, struct nd_msg *msg);</div><div class='del'>-struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);</div><div class='add'>+struct nd_msg *br_is_nd_neigh_msg(const struct sk_buff *skb, struct nd_msg *m);</div><div class='add'>+bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/bridge/br_private_cfm.h b/net/bridge/br_private_cfm.h<br/>new file mode 100644<br/>index 000000000000..a43a5e7fa2c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_cfm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private_cfm.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef _BR_PRIVATE_CFM_H_</div><div class='add'>+#define _BR_PRIVATE_CFM_H_</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include &lt;uapi/linux/cfm_bridge.h&gt;</div><div class='add'>+</div><div class='add'>+struct br_cfm_mep_create {</div><div class='add'>+	enum br_cfm_domain domain; /* Domain for this MEP */</div><div class='add'>+	enum br_cfm_mep_direction direction; /* Up or Down MEP direction */</div><div class='add'>+	u32 ifindex; /* Residence port */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_create(struct net_bridge *br,</div><div class='add'>+		      const u32 instance,</div><div class='add'>+		      struct br_cfm_mep_create *const create,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_delete(struct net_bridge *br,</div><div class='add'>+		      const u32 instance,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+struct br_cfm_mep_config {</div><div class='add'>+	u32 mdlevel;</div><div class='add'>+	u32 mepid; /* MEPID for this MEP */</div><div class='add'>+	struct mac_addr unicast_mac; /* The MEP unicast MAC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_cfm_mep_config_set(struct net_bridge *br,</div><div class='add'>+			  const u32 instance,</div><div class='add'>+			  const struct br_cfm_mep_config *const config,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+struct br_cfm_maid {</div><div class='add'>+	u8 data[CFM_MAID_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_cfm_cc_config {</div><div class='add'>+	/* Expected received CCM PDU MAID. */</div><div class='add'>+	struct br_cfm_maid exp_maid;</div><div class='add'>+</div><div class='add'>+	/* Expected received CCM PDU interval. */</div><div class='add'>+	/* Transmitting CCM PDU interval when CCM tx is enabled. */</div><div class='add'>+	enum br_cfm_ccm_interval exp_interval;</div><div class='add'>+</div><div class='add'>+	bool enable; /* Enable/disable CCM PDU handling */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_config_set(struct net_bridge *br,</div><div class='add'>+			 const u32 instance,</div><div class='add'>+			 const struct br_cfm_cc_config *const config,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_peer_mep_add(struct net_bridge *br, const u32 instance,</div><div class='add'>+			   u32 peer_mep_id,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+int br_cfm_cc_peer_mep_remove(struct net_bridge *br, const u32 instance,</div><div class='add'>+			      u32 peer_mep_id,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+/* Transmitted CCM Remote Defect Indication status set.</div><div class='add'>+ * This RDI is inserted in transmitted CCM PDUs if CCM transmission is enabled.</div><div class='add'>+ * See br_cfm_cc_ccm_tx() with interval != BR_CFM_CCM_INTERVAL_NONE</div><div class='add'>+ */</div><div class='add'>+int br_cfm_cc_rdi_set(struct net_bridge *br, const u32 instance,</div><div class='add'>+		      const bool rdi, struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+/* OAM PDU Tx information */</div><div class='add'>+struct br_cfm_cc_ccm_tx_info {</div><div class='add'>+	struct mac_addr dmac;</div><div class='add'>+	/* The CCM will be transmitted for this period in seconds.</div><div class='add'>+	 * Call br_cfm_cc_ccm_tx before timeout to keep transmission alive.</div><div class='add'>+	 * When period is zero any ongoing transmission will be stopped.</div><div class='add'>+	 */</div><div class='add'>+	u32 period;</div><div class='add'>+</div><div class='add'>+	bool seq_no_update; /* Update Tx CCM sequence number */</div><div class='add'>+	bool if_tlv; /* Insert Interface Status TLV */</div><div class='add'>+	u8 if_tlv_value; /* Interface Status TLV value */</div><div class='add'>+	bool port_tlv; /* Insert Port Status TLV */</div><div class='add'>+	u8 port_tlv_value; /* Port Status TLV value */</div><div class='add'>+	/* Sender ID TLV ??</div><div class='add'>+	 * Organization-Specific TLV ??</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_cfm_cc_ccm_tx(struct net_bridge *br, const u32 instance,</div><div class='add'>+		     const struct br_cfm_cc_ccm_tx_info *const tx_info,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+struct br_cfm_mep_status {</div><div class='add'>+	/* Indications that an OAM PDU has been seen. */</div><div class='add'>+	bool opcode_unexp_seen; /* RX of OAM PDU with unexpected opcode */</div><div class='add'>+	bool version_unexp_seen; /* RX of OAM PDU with unexpected version */</div><div class='add'>+	bool rx_level_low_seen; /* Rx of OAM PDU with level low */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_cfm_cc_peer_status {</div><div class='add'>+	/* This CCM related status is based on the latest received CCM PDU. */</div><div class='add'>+	u8 port_tlv_value; /* Port Status TLV value */</div><div class='add'>+	u8 if_tlv_value; /* Interface Status TLV value */</div><div class='add'>+</div><div class='add'>+	/* CCM has not been received for 3.25 intervals */</div><div class='add'>+	u8 ccm_defect:1;</div><div class='add'>+</div><div class='add'>+	/* (RDI == 1) for last received CCM PDU */</div><div class='add'>+	u8 rdi:1;</div><div class='add'>+</div><div class='add'>+	/* Indications that a CCM PDU has been seen. */</div><div class='add'>+	u8 seen:1; /* CCM PDU received */</div><div class='add'>+	u8 tlv_seen:1; /* CCM PDU with TLV received */</div><div class='add'>+	/* CCM PDU with unexpected sequence number received */</div><div class='add'>+	u8 seq_unexp_seen:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_cfm_mep {</div><div class='add'>+	/* list header of MEP instances */</div><div class='add'>+	struct hlist_node		head;</div><div class='add'>+	u32				instance;</div><div class='add'>+	struct br_cfm_mep_create	create;</div><div class='add'>+	struct br_cfm_mep_config	config;</div><div class='add'>+	struct br_cfm_cc_config		cc_config;</div><div class='add'>+	struct br_cfm_cc_ccm_tx_info	cc_ccm_tx_info;</div><div class='add'>+	/* List of multiple peer MEPs */</div><div class='add'>+	struct hlist_head		peer_mep_list;</div><div class='add'>+	struct net_bridge_port __rcu	*b_port;</div><div class='add'>+	unsigned long			ccm_tx_end;</div><div class='add'>+	struct delayed_work		ccm_tx_dwork;</div><div class='add'>+	u32				ccm_tx_snumber;</div><div class='add'>+	u32				ccm_rx_snumber;</div><div class='add'>+	struct br_cfm_mep_status	status;</div><div class='add'>+	bool				rdi;</div><div class='add'>+	struct rcu_head			rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_cfm_peer_mep {</div><div class='add'>+	struct hlist_node		head;</div><div class='add'>+	struct br_cfm_mep		*mep;</div><div class='add'>+	struct delayed_work		ccm_rx_dwork;</div><div class='add'>+	u32				mepid;</div><div class='add'>+	struct br_cfm_cc_peer_status	cc_status;</div><div class='add'>+	u32				ccm_rx_count_miss;</div><div class='add'>+	struct rcu_head			rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _BR_PRIVATE_CFM_H_ */</div><div class='head'>diff --git a/net/bridge/br_private_mcast_eht.h b/net/bridge/br_private_mcast_eht.h<br/>new file mode 100644<br/>index 000000000000..adf82a05515a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_mcast_eht.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private_mcast_eht.h</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+ * Copyright (c) 2020, Nikolay Aleksandrov &lt;nikolay@nvidia.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _BR_PRIVATE_MCAST_EHT_H_</div><div class='add'>+#define _BR_PRIVATE_MCAST_EHT_H_</div><div class='add'>+</div><div class='add'>+#define BR_MCAST_DEFAULT_EHT_HOSTS_LIMIT 512</div><div class='add'>+</div><div class='add'>+union net_bridge_eht_addr {</div><div class='add'>+	__be32				ip4;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct in6_addr			ip6;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* single host's list of set entries and filter_mode */</div><div class='add'>+struct net_bridge_group_eht_host {</div><div class='add'>+	struct rb_node			rb_node;</div><div class='add'>+</div><div class='add'>+	union net_bridge_eht_addr	h_addr;</div><div class='add'>+	struct hlist_head		set_entries;</div><div class='add'>+	unsigned int			num_entries;</div><div class='add'>+	unsigned char			filter_mode;</div><div class='add'>+	struct net_bridge_port_group	*pg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* (host, src entry) added to a per-src set and host's list */</div><div class='add'>+struct net_bridge_group_eht_set_entry {</div><div class='add'>+	struct rb_node			rb_node;</div><div class='add'>+	struct hlist_node		host_list;</div><div class='add'>+</div><div class='add'>+	union net_bridge_eht_addr	h_addr;</div><div class='add'>+	struct timer_list		timer;</div><div class='add'>+	struct net_bridge		*br;</div><div class='add'>+	struct net_bridge_group_eht_set	*eht_set;</div><div class='add'>+	struct net_bridge_group_eht_host *h_parent;</div><div class='add'>+	struct net_bridge_mcast_gc	mcast_gc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per-src set */</div><div class='add'>+struct net_bridge_group_eht_set {</div><div class='add'>+	struct rb_node			rb_node;</div><div class='add'>+</div><div class='add'>+	union net_bridge_eht_addr	src_addr;</div><div class='add'>+	struct rb_root			entry_tree;</div><div class='add'>+	struct timer_list		timer;</div><div class='add'>+	struct net_bridge_port_group	*pg;</div><div class='add'>+	struct net_bridge		*br;</div><div class='add'>+	struct net_bridge_mcast_gc	mcast_gc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+void br_multicast_eht_clean_sets(struct net_bridge_port_group *pg);</div><div class='add'>+bool br_multicast_eht_handle(const struct net_bridge_mcast *brmctx,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='add'>+			     void *h_addr,</div><div class='add'>+			     void *srcs,</div><div class='add'>+			     u32 nsrcs,</div><div class='add'>+			     size_t addr_size,</div><div class='add'>+			     int grec_type);</div><div class='add'>+int br_multicast_eht_set_hosts_limit(struct net_bridge_port *p,</div><div class='add'>+				     u32 eht_hosts_limit);</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_eht_should_del_pg(const struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	return !!((pg-&gt;key.port-&gt;flags &amp; BR_MULTICAST_FAST_LEAVE) &amp;&amp;</div><div class='add'>+		  RB_EMPTY_ROOT(&amp;pg-&gt;eht_host_tree));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+br_multicast_eht_hosts_over_limit(const struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge_port *p = pg-&gt;key.port;</div><div class='add'>+</div><div class='add'>+	return !!(p-&gt;multicast_eht_hosts_cnt &gt;= p-&gt;multicast_eht_hosts_limit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_eht_hosts_inc(struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p = pg-&gt;key.port;</div><div class='add'>+</div><div class='add'>+	p-&gt;multicast_eht_hosts_cnt++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void br_multicast_eht_hosts_dec(struct net_bridge_port_group *pg)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p = pg-&gt;key.port;</div><div class='add'>+</div><div class='add'>+	p-&gt;multicast_eht_hosts_cnt--;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BRIDGE_IGMP_SNOOPING */</div><div class='add'>+</div><div class='add'>+#endif /* _BR_PRIVATE_MCAST_EHT_H_ */</div><div class='head'>diff --git a/net/bridge/br_private_mrp.h b/net/bridge/br_private_mrp.h<br/>new file mode 100644<br/>index 000000000000..bda8e1896712<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_mrp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private_mrp.h</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef _BR_PRIVATE_MRP_H_</div><div class='add'>+#define _BR_PRIVATE_MRP_H_</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include &lt;uapi/linux/mrp_bridge.h&gt;</div><div class='add'>+</div><div class='add'>+#define MRP_OPT_PADDING		0x2</div><div class='add'>+</div><div class='add'>+struct br_mrp {</div><div class='add'>+	/* list of mrp instances */</div><div class='add'>+	struct hlist_node		list;</div><div class='add'>+</div><div class='add'>+	struct net_bridge_port __rcu	*p_port;</div><div class='add'>+	struct net_bridge_port __rcu	*s_port;</div><div class='add'>+	struct net_bridge_port __rcu	*i_port;</div><div class='add'>+</div><div class='add'>+	u32				ring_id;</div><div class='add'>+	u16				in_id;</div><div class='add'>+	u16				prio;</div><div class='add'>+</div><div class='add'>+	enum br_mrp_ring_role_type	ring_role;</div><div class='add'>+	u8				ring_role_offloaded;</div><div class='add'>+	enum br_mrp_ring_state_type	ring_state;</div><div class='add'>+	u32				ring_transitions;</div><div class='add'>+</div><div class='add'>+	enum br_mrp_in_role_type	in_role;</div><div class='add'>+	u8				in_role_offloaded;</div><div class='add'>+	enum br_mrp_in_state_type	in_state;</div><div class='add'>+	u32				in_transitions;</div><div class='add'>+</div><div class='add'>+	struct delayed_work		test_work;</div><div class='add'>+	u32				test_interval;</div><div class='add'>+	unsigned long			test_end;</div><div class='add'>+	u32				test_count_miss;</div><div class='add'>+	u32				test_max_miss;</div><div class='add'>+	bool				test_monitor;</div><div class='add'>+</div><div class='add'>+	struct delayed_work		in_test_work;</div><div class='add'>+	u32				in_test_interval;</div><div class='add'>+	unsigned long			in_test_end;</div><div class='add'>+	u32				in_test_count_miss;</div><div class='add'>+	u32				in_test_max_miss;</div><div class='add'>+</div><div class='add'>+	u32				seq_id;</div><div class='add'>+</div><div class='add'>+	struct rcu_head			rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This type is returned by br_mrp_switchdev functions that allow to have a SW</div><div class='add'>+ * backup in case the HW can't implement completely the protocol.</div><div class='add'>+ * BR_MRP_NONE - means the HW can't run at all the protocol, so the SW stops</div><div class='add'>+ *               configuring the node anymore.</div><div class='add'>+ * BR_MRP_SW - the HW can help the SW to run the protocol, by redirecting MRP</div><div class='add'>+ *             frames to CPU.</div><div class='add'>+ * BR_MRP_HW - the HW can implement completely the protocol.</div><div class='add'>+ */</div><div class='add'>+enum br_mrp_hw_support {</div><div class='add'>+	BR_MRP_NONE,</div><div class='add'>+	BR_MRP_SW,</div><div class='add'>+	BR_MRP_HW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* br_mrp.c */</div><div class='add'>+int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance);</div><div class='add'>+int br_mrp_del(struct net_bridge *br, struct br_mrp_instance *instance);</div><div class='add'>+int br_mrp_set_port_state(struct net_bridge_port *p,</div><div class='add'>+			  enum br_mrp_port_state_type state);</div><div class='add'>+int br_mrp_set_port_role(struct net_bridge_port *p,</div><div class='add'>+			 enum br_mrp_port_role_type role);</div><div class='add'>+int br_mrp_set_ring_state(struct net_bridge *br,</div><div class='add'>+			  struct br_mrp_ring_state *state);</div><div class='add'>+int br_mrp_set_ring_role(struct net_bridge *br, struct br_mrp_ring_role *role);</div><div class='add'>+int br_mrp_start_test(struct net_bridge *br, struct br_mrp_start_test *test);</div><div class='add'>+int br_mrp_set_in_state(struct net_bridge *br, struct br_mrp_in_state *state);</div><div class='add'>+int br_mrp_set_in_role(struct net_bridge *br, struct br_mrp_in_role *role);</div><div class='add'>+int br_mrp_start_in_test(struct net_bridge *br,</div><div class='add'>+			 struct br_mrp_start_in_test *test);</div><div class='add'>+</div><div class='add'>+/* br_mrp_switchdev.c */</div><div class='add'>+int br_mrp_switchdev_add(struct net_bridge *br, struct br_mrp *mrp);</div><div class='add'>+int br_mrp_switchdev_del(struct net_bridge *br, struct br_mrp *mrp);</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_set_ring_role(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			       enum br_mrp_ring_role_type role);</div><div class='add'>+int br_mrp_switchdev_set_ring_state(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+				    enum br_mrp_ring_state_type state);</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_send_ring_test(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+				u32 interval, u8 max_miss, u32 period,</div><div class='add'>+				bool monitor);</div><div class='add'>+int br_mrp_port_switchdev_set_state(struct net_bridge_port *p, u32 state);</div><div class='add'>+int br_mrp_port_switchdev_set_role(struct net_bridge_port *p,</div><div class='add'>+				   enum br_mrp_port_role_type role);</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_set_in_role(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			     u16 in_id, u32 ring_id,</div><div class='add'>+			     enum br_mrp_in_role_type role);</div><div class='add'>+int br_mrp_switchdev_set_in_state(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+				  enum br_mrp_in_state_type state);</div><div class='add'>+enum br_mrp_hw_support</div><div class='add'>+br_mrp_switchdev_send_in_test(struct net_bridge *br, struct br_mrp *mrp,</div><div class='add'>+			      u32 interval, u8 max_miss, u32 period);</div><div class='add'>+</div><div class='add'>+/* br_mrp_netlink.c  */</div><div class='add'>+int br_mrp_ring_port_open(struct net_device *dev, u8 loc);</div><div class='add'>+int br_mrp_in_port_open(struct net_device *dev, u8 loc);</div><div class='add'>+</div><div class='add'>+/* MRP protocol data units */</div><div class='add'>+struct br_mrp_tlv_hdr {</div><div class='add'>+	__u8 type;</div><div class='add'>+	__u8 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_mrp_common_hdr {</div><div class='add'>+	__be16 seq_id;</div><div class='add'>+	__u8 domain[MRP_DOMAIN_UUID_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_mrp_ring_test_hdr {</div><div class='add'>+	__be16 prio;</div><div class='add'>+	__u8 sa[ETH_ALEN];</div><div class='add'>+	__be16 port_role;</div><div class='add'>+	__be16 state;</div><div class='add'>+	__be16 transitions;</div><div class='add'>+	__be32 timestamp;</div><div class='add'>+} __attribute__((__packed__));</div><div class='add'>+</div><div class='add'>+struct br_mrp_in_test_hdr {</div><div class='add'>+	__be16 id;</div><div class='add'>+	__u8 sa[ETH_ALEN];</div><div class='add'>+	__be16 port_role;</div><div class='add'>+	__be16 state;</div><div class='add'>+	__be16 transitions;</div><div class='add'>+	__be32 timestamp;</div><div class='add'>+} __attribute__((__packed__));</div><div class='add'>+</div><div class='add'>+struct br_mrp_oui_hdr {</div><div class='add'>+	__u8 oui[MRP_OUI_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct br_mrp_sub_option1_hdr {</div><div class='add'>+	__u8 type;</div><div class='add'>+	__u8 data[MRP_MANUFACTURE_DATA_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _BR_PRIVATE_MRP_H */</div><div class='head'>diff --git a/net/bridge/br_private_stp.h b/net/bridge/br_private_stp.h<br/>index 3f7543a29b76..814cf1364cfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_stp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_stp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_stp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private_stp.h</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _BR_PRIVATE_STP_H</div><div class='head'>diff --git a/net/bridge/br_private_tunnel.h b/net/bridge/br_private_tunnel.h<br/>index a259471bfd78..efb096025151 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_tunnel.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_private_tunnel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_private_tunnel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_private_tunnel.h</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *	Bridge per vlan tunnels</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Roopa Prabhu		&lt;roopa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _BR_PRIVATE_TUNNEL_H</div><div class='hunk'>@@ -22,8 +18,8 @@ struct vtunnel_info {</div><div class='ctx'> /* br_netlink_tunnel.c */</div><div class='ctx'> int br_parse_vlan_tunnel_info(struct nlattr *attr,</div><div class='ctx'> 			      struct vtunnel_info *tinfo);</div><div class='del'>-int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='del'>-				struct net_bridge_port *p,</div><div class='add'>+int br_process_vlan_tunnel_info(const struct net_bridge *br,</div><div class='add'>+				const struct net_bridge_port *p,</div><div class='ctx'> 				int cmd,</div><div class='ctx'> 				struct vtunnel_info *tinfo_curr,</div><div class='ctx'> 				struct vtunnel_info *tinfo_last,</div><div class='hunk'>@@ -31,19 +27,24 @@ int br_process_vlan_tunnel_info(struct net_bridge *br,</div><div class='ctx'> int br_get_vlan_tunnel_info_size(struct net_bridge_vlan_group *vg);</div><div class='ctx'> int br_fill_vlan_tunnel_info(struct sk_buff *skb,</div><div class='ctx'> 			     struct net_bridge_vlan_group *vg);</div><div class='add'>+bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			const struct net_bridge_vlan *v_last);</div><div class='add'>+int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,</div><div class='add'>+			u16 vid, u32 tun_id, bool *changed);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRIDGE_VLAN_FILTERING</div><div class='ctx'> /* br_vlan_tunnel.c */</div><div class='ctx'> int vlan_tunnel_init(struct net_bridge_vlan_group *vg);</div><div class='ctx'> void vlan_tunnel_deinit(struct net_bridge_vlan_group *vg);</div><div class='del'>-int nbp_vlan_tunnel_info_delete(struct net_bridge_port *port, u16 vid);</div><div class='del'>-int nbp_vlan_tunnel_info_add(struct net_bridge_port *port, u16 vid, u32 tun_id);</div><div class='add'>+int nbp_vlan_tunnel_info_delete(const struct net_bridge_port *port, u16 vid);</div><div class='add'>+int nbp_vlan_tunnel_info_add(const struct net_bridge_port *port, u16 vid,</div><div class='add'>+			     u32 tun_id);</div><div class='ctx'> void nbp_vlan_tunnel_info_flush(struct net_bridge_port *port);</div><div class='ctx'> void vlan_tunnel_info_del(struct net_bridge_vlan_group *vg,</div><div class='ctx'> 			  struct net_bridge_vlan *vlan);</div><div class='del'>-int br_handle_ingress_vlan_tunnel(struct sk_buff *skb,</div><div class='del'>-				  struct net_bridge_port *p,</div><div class='del'>-				  struct net_bridge_vlan_group *vg);</div><div class='add'>+void br_handle_ingress_vlan_tunnel(struct sk_buff *skb,</div><div class='add'>+				   struct net_bridge_port *p,</div><div class='add'>+				   struct net_bridge_vlan_group *vg);</div><div class='ctx'> int br_handle_egress_vlan_tunnel(struct sk_buff *skb,</div><div class='ctx'> 				 struct net_bridge_vlan *vlan);</div><div class='ctx'> #else</div><div class='hunk'>@@ -52,13 +53,13 @@ static inline int vlan_tunnel_init(struct net_bridge_vlan_group *vg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nbp_vlan_tunnel_info_delete(struct net_bridge_port *port,</div><div class='add'>+static inline int nbp_vlan_tunnel_info_delete(const struct net_bridge_port *port,</div><div class='ctx'> 					      u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nbp_vlan_tunnel_info_add(struct net_bridge_port *port,</div><div class='add'>+static inline int nbp_vlan_tunnel_info_add(const struct net_bridge_port *port,</div><div class='ctx'> 					   u16 vid, u32 tun_id)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c<br/>index b6941961a876..024210f95468 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_stp.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Spanning tree protocol; generic parts</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='hunk'>@@ -40,8 +36,20 @@ void br_set_state(struct net_bridge_port *p, unsigned int state)</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Don't change the state of the ports if they are driven by a different</div><div class='add'>+	 * protocol.</div><div class='add'>+	 */</div><div class='add'>+	if (p-&gt;flags &amp; BR_MRP_AWARE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	p-&gt;state = state;</div><div class='del'>-	err = switchdev_port_attr_set(p-&gt;dev, &amp;attr);</div><div class='add'>+	if (br_opt_get(p-&gt;br, BROPT_MST_ENABLED)) {</div><div class='add'>+		err = br_mst_set_state(p, 0, state, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			br_warn(p-&gt;br, "error setting MST state on port %u(%s)\n",</div><div class='add'>+				p-&gt;port_no, netdev_name(p-&gt;dev));</div><div class='add'>+	}</div><div class='add'>+	err = switchdev_port_attr_set(p-&gt;dev, &amp;attr, NULL);</div><div class='ctx'> 	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='ctx'> 		br_warn(p-&gt;br, "error setting offload STP state on port %u(%s)\n",</div><div class='ctx'> 				(unsigned int) p-&gt;port_no, p-&gt;dev-&gt;name);</div><div class='hunk'>@@ -49,14 +57,40 @@ void br_set_state(struct net_bridge_port *p, unsigned int state)</div><div class='ctx'> 		br_info(p-&gt;br, "port %u(%s) entered %s state\n",</div><div class='ctx'> 				(unsigned int) p-&gt;port_no, p-&gt;dev-&gt;name,</div><div class='ctx'> 				br_port_state_names[p-&gt;state]);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;br-&gt;stp_enabled == BR_KERNEL_STP) {</div><div class='add'>+		switch (p-&gt;state) {</div><div class='add'>+		case BR_STATE_BLOCKING:</div><div class='add'>+			p-&gt;stp_xstats.transition_blk++;</div><div class='add'>+			break;</div><div class='add'>+		case BR_STATE_FORWARDING:</div><div class='add'>+			p-&gt;stp_xstats.transition_fwd++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 br_port_get_stp_state(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	p = br_port_get_rtnl(dev);</div><div class='add'>+	if (!p)</div><div class='add'>+		return BR_STATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	return p-&gt;state;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(br_port_get_stp_state);</div><div class='ctx'> </div><div class='ctx'> /* called under bridge lock */</div><div class='ctx'> struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+	list_for_each_entry_rcu(p, &amp;br-&gt;port_list, list,</div><div class='add'>+				lockdep_is_held(&amp;br-&gt;lock)) {</div><div class='ctx'> 		if (p-&gt;port_no == port_no)</div><div class='ctx'> 			return p;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -164,7 +198,7 @@ void br_become_root_bridge(struct net_bridge *br)</div><div class='ctx'> 	br-&gt;hello_time = br-&gt;bridge_hello_time;</div><div class='ctx'> 	br-&gt;forward_delay = br-&gt;bridge_forward_delay;</div><div class='ctx'> 	br_topology_change_detection(br);</div><div class='del'>-	del_timer(&amp;br-&gt;tcn_timer);</div><div class='add'>+	timer_delete(&amp;br-&gt;tcn_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (br-&gt;dev-&gt;flags &amp; IFF_UP) {</div><div class='ctx'> 		br_config_bpdu_generation(br);</div><div class='hunk'>@@ -329,7 +363,7 @@ static int br_supersedes_port_info(const struct net_bridge_port *p,</div><div class='ctx'> static void br_topology_change_acknowledged(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> 	br-&gt;topology_change_detected = 0;</div><div class='del'>-	del_timer(&amp;br-&gt;tcn_timer);</div><div class='add'>+	timer_delete(&amp;br-&gt;tcn_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called under bridge lock */</div><div class='hunk'>@@ -405,7 +439,7 @@ static void br_make_blocking(struct net_bridge_port *p)</div><div class='ctx'> 		br_set_state(p, BR_STATE_BLOCKING);</div><div class='ctx'> 		br_ifinfo_notify(RTM_NEWLINK, NULL, p);</div><div class='ctx'> </div><div class='del'>-		del_timer(&amp;p-&gt;forward_delay_timer);</div><div class='add'>+		timer_delete(&amp;p-&gt;forward_delay_timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -420,7 +454,7 @@ static void br_make_forwarding(struct net_bridge_port *p)</div><div class='ctx'> 	if (br-&gt;stp_enabled == BR_NO_STP || br-&gt;forward_delay == 0) {</div><div class='ctx'> 		br_set_state(p, BR_STATE_FORWARDING);</div><div class='ctx'> 		br_topology_change_detection(br);</div><div class='del'>-		del_timer(&amp;p-&gt;forward_delay_timer);</div><div class='add'>+		timer_delete(&amp;p-&gt;forward_delay_timer);</div><div class='ctx'> 	} else if (br-&gt;stp_enabled == BR_KERNEL_STP)</div><div class='ctx'> 		br_set_state(p, BR_STATE_LISTENING);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -449,7 +483,7 @@ void br_port_state_selection(struct net_bridge *br)</div><div class='ctx'> 				p-&gt;topology_change_ack = 0;</div><div class='ctx'> 				br_make_forwarding(p);</div><div class='ctx'> 			} else if (br_is_designated_port(p)) {</div><div class='del'>-				del_timer(&amp;p-&gt;message_age_timer);</div><div class='add'>+				timer_delete(&amp;p-&gt;message_age_timer);</div><div class='ctx'> 				br_make_forwarding(p);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				p-&gt;config_pending = 0;</div><div class='hunk'>@@ -488,6 +522,8 @@ void br_received_config_bpdu(struct net_bridge_port *p,</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	int was_root;</div><div class='ctx'> </div><div class='add'>+	p-&gt;stp_xstats.rx_bpdu++;</div><div class='add'>+</div><div class='ctx'> 	br = p-&gt;br;</div><div class='ctx'> 	was_root = br_is_root_bridge(br);</div><div class='ctx'> </div><div class='hunk'>@@ -497,9 +533,9 @@ void br_received_config_bpdu(struct net_bridge_port *p,</div><div class='ctx'> 		br_port_state_selection(br);</div><div class='ctx'> </div><div class='ctx'> 		if (!br_is_root_bridge(br) &amp;&amp; was_root) {</div><div class='del'>-			del_timer(&amp;br-&gt;hello_timer);</div><div class='add'>+			timer_delete(&amp;br-&gt;hello_timer);</div><div class='ctx'> 			if (br-&gt;topology_change_detected) {</div><div class='del'>-				del_timer(&amp;br-&gt;topology_change_timer);</div><div class='add'>+				timer_delete(&amp;br-&gt;topology_change_timer);</div><div class='ctx'> 				br_transmit_tcn(br);</div><div class='ctx'> </div><div class='ctx'> 				mod_timer(&amp;br-&gt;tcn_timer,</div><div class='hunk'>@@ -521,6 +557,8 @@ void br_received_config_bpdu(struct net_bridge_port *p,</div><div class='ctx'> /* called under bridge lock */</div><div class='ctx'> void br_received_tcn_bpdu(struct net_bridge_port *p)</div><div class='ctx'> {</div><div class='add'>+	p-&gt;stp_xstats.rx_tcn++;</div><div class='add'>+</div><div class='ctx'> 	if (br_is_designated_port(p)) {</div><div class='ctx'> 		br_info(p-&gt;br, "port %u(%s) received tcn bpdu\n",</div><div class='ctx'> 			(unsigned int) p-&gt;port_no, p-&gt;dev-&gt;name);</div><div class='hunk'>@@ -573,7 +611,7 @@ int __set_ageing_time(struct net_device *dev, unsigned long t)</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = switchdev_port_attr_set(dev, &amp;attr);</div><div class='add'>+	err = switchdev_port_attr_set(dev, &amp;attr, NULL);</div><div class='ctx'> 	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -583,8 +621,8 @@ int __set_ageing_time(struct net_device *dev, unsigned long t)</div><div class='ctx'> /* Set time interval that dynamic forwarding entries live</div><div class='ctx'>  * For pure software bridge, allow values outside the 802.1</div><div class='ctx'>  * standard specification for special cases:</div><div class='del'>- *  0 - entry never ages (all permanant)</div><div class='del'>- *  1 - entry disappears (no persistance)</div><div class='add'>+ *  0 - entry never ages (all permanent)</div><div class='add'>+ *  1 - entry disappears (no persistence)</div><div class='ctx'>  *</div><div class='ctx'>  * Offloaded switch entries maybe more restrictive</div><div class='ctx'>  */</div><div class='hunk'>@@ -607,6 +645,19 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+clock_t br_get_ageing_time(const struct net_device *br_dev)</div><div class='add'>+{</div><div class='add'>+	const struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(br_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	br = netdev_priv(br_dev);</div><div class='add'>+</div><div class='add'>+	return jiffies_to_clock_t(br-&gt;ageing_time);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_get_ageing_time);</div><div class='add'>+</div><div class='ctx'> /* called under bridge lock */</div><div class='ctx'> void __br_set_topology_change(struct net_bridge *br, unsigned char val)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c<br/>index 1b75d6bf12bd..7895489ac6fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_bpdu.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_bpdu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_bpdu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_stp_bpdu.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Spanning tree protocol; BPDU handling</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -21,7 +17,7 @@</div><div class='ctx'> #include &lt;net/llc.h&gt;</div><div class='ctx'> #include &lt;net/llc_pdu.h&gt;</div><div class='ctx'> #include &lt;net/stp.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> #include "br_private_stp.h"</div><div class='hunk'>@@ -122,6 +118,8 @@ void br_send_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *bpdu)</div><div class='ctx'> 	br_set_ticks(buf+33, bpdu-&gt;forward_delay);</div><div class='ctx'> </div><div class='ctx'> 	br_send_bpdu(p, buf, 35);</div><div class='add'>+</div><div class='add'>+	p-&gt;stp_xstats.tx_bpdu++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called under bridge lock */</div><div class='hunk'>@@ -137,6 +135,8 @@ void br_send_tcn_bpdu(struct net_bridge_port *p)</div><div class='ctx'> 	buf[2] = 0;</div><div class='ctx'> 	buf[3] = BPDU_TYPE_TCN;</div><div class='ctx'> 	br_send_bpdu(p, buf, 4);</div><div class='add'>+</div><div class='add'>+	p-&gt;stp_xstats.tx_tcn++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -147,7 +147,6 @@ void br_send_tcn_bpdu(struct net_bridge_port *p)</div><div class='ctx'> void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,</div><div class='ctx'> 		struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	const unsigned char *dest = eth_hdr(skb)-&gt;h_dest;</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge *br;</div><div class='ctx'> 	const unsigned char *buf;</div><div class='hunk'>@@ -176,7 +175,7 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,</div><div class='ctx'> 	if (p-&gt;state == BR_STATE_DISABLED)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!ether_addr_equal(dest, br-&gt;group_addr))</div><div class='add'>+	if (!ether_addr_equal(eth_hdr(skb)-&gt;h_dest, br-&gt;group_addr))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;flags &amp; BR_BPDU_GUARD) {</div><div class='head'>diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c<br/>index 808e2b914015..c20a41bf253b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_if.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_if.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_if.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_stp_if.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Spanning tree protocol; interface code</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -85,9 +81,9 @@ void br_stp_disable_bridge(struct net_bridge *br)</div><div class='ctx'> 	br-&gt;topology_change_detected = 0;</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;br-&gt;hello_timer);</div><div class='del'>-	del_timer_sync(&amp;br-&gt;topology_change_timer);</div><div class='del'>-	del_timer_sync(&amp;br-&gt;tcn_timer);</div><div class='add'>+	timer_delete_sync(&amp;br-&gt;hello_timer);</div><div class='add'>+	timer_delete_sync(&amp;br-&gt;topology_change_timer);</div><div class='add'>+	timer_delete_sync(&amp;br-&gt;tcn_timer);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;br-&gt;gc_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,11 +109,12 @@ void br_stp_disable_port(struct net_bridge_port *p)</div><div class='ctx'> </div><div class='ctx'> 	br_ifinfo_notify(RTM_NEWLINK, NULL, p);</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;p-&gt;message_age_timer);</div><div class='del'>-	del_timer(&amp;p-&gt;forward_delay_timer);</div><div class='del'>-	del_timer(&amp;p-&gt;hold_timer);</div><div class='add'>+	timer_delete(&amp;p-&gt;message_age_timer);</div><div class='add'>+	timer_delete(&amp;p-&gt;forward_delay_timer);</div><div class='add'>+	timer_delete(&amp;p-&gt;hold_timer);</div><div class='ctx'> </div><div class='del'>-	br_fdb_delete_by_port(br, p, 0, 0);</div><div class='add'>+	if (!rcu_access_pointer(p-&gt;backup_port))</div><div class='add'>+		br_fdb_delete_by_port(br, p, 0, 0);</div><div class='ctx'> 	br_multicast_disable_port(p);</div><div class='ctx'> </div><div class='ctx'> 	br_configuration_update(br);</div><div class='hunk'>@@ -199,10 +196,17 @@ static void br_stp_stop(struct net_bridge *br)</div><div class='ctx'> 	br-&gt;stp_enabled = BR_NO_STP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void br_stp_set_enabled(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_stp_set_enabled(struct net_bridge *br, unsigned long val,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='add'>+	if (br_mrp_enabled(br)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "STP can't be enabled if MRP is already enabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (val) {</div><div class='ctx'> 		if (br-&gt;stp_enabled == BR_NO_STP)</div><div class='ctx'> 			br_stp_start(br);</div><div class='hunk'>@@ -210,6 +214,8 @@ void br_stp_set_enabled(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 		if (br-&gt;stp_enabled != BR_NO_STP)</div><div class='ctx'> 			br_stp_stop(br);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called under bridge lock */</div><div class='hunk'>@@ -227,7 +233,7 @@ void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(oldaddr, br-&gt;bridge_id.addr, ETH_ALEN);</div><div class='ctx'> 	memcpy(br-&gt;bridge_id.addr, addr, ETH_ALEN);</div><div class='del'>-	memcpy(br-&gt;dev-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(br-&gt;dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='ctx'> 		if (ether_addr_equal(p-&gt;designated_bridge.addr, oldaddr))</div><div class='head'>diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c<br/>index e7739de5f0e1..e5d453305381 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_stp_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_stp_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_stp_timer.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Spanning tree protocol; timer-related code</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Lennert Buytenhek		&lt;buytenh@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -33,7 +29,7 @@ static int br_is_designated_for_some_port(const struct net_bridge *br)</div><div class='ctx'> </div><div class='ctx'> static void br_hello_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, hello_timer);</div><div class='add'>+	struct net_bridge *br = timer_container_of(br, t, hello_timer);</div><div class='ctx'> </div><div class='ctx'> 	br_debug(br, "hello timer expired\n");</div><div class='ctx'> 	spin_lock(&amp;br-&gt;lock);</div><div class='hunk'>@@ -49,7 +45,8 @@ static void br_hello_timer_expired(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void br_message_age_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p = from_timer(p, t, message_age_timer);</div><div class='add'>+	struct net_bridge_port *p = timer_container_of(p, t,</div><div class='add'>+						       message_age_timer);</div><div class='ctx'> 	struct net_bridge *br = p-&gt;br;</div><div class='ctx'> 	const bridge_id *id = &amp;p-&gt;designated_bridge;</div><div class='ctx'> 	int was_root;</div><div class='hunk'>@@ -82,7 +79,8 @@ static void br_message_age_timer_expired(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void br_forward_delay_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p = from_timer(p, t, forward_delay_timer);</div><div class='add'>+	struct net_bridge_port *p = timer_container_of(p, t,</div><div class='add'>+						       forward_delay_timer);</div><div class='ctx'> 	struct net_bridge *br = p-&gt;br;</div><div class='ctx'> </div><div class='ctx'> 	br_debug(br, "port %u(%s) forward delay timer\n",</div><div class='hunk'>@@ -106,7 +104,7 @@ static void br_forward_delay_timer_expired(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void br_tcn_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, tcn_timer);</div><div class='add'>+	struct net_bridge *br = timer_container_of(br, t, tcn_timer);</div><div class='ctx'> </div><div class='ctx'> 	br_debug(br, "tcn timer expired\n");</div><div class='ctx'> 	spin_lock(&amp;br-&gt;lock);</div><div class='hunk'>@@ -120,7 +118,8 @@ static void br_tcn_timer_expired(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void br_topology_change_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = from_timer(br, t, topology_change_timer);</div><div class='add'>+	struct net_bridge *br = timer_container_of(br, t,</div><div class='add'>+						   topology_change_timer);</div><div class='ctx'> </div><div class='ctx'> 	br_debug(br, "topo change timer expired\n");</div><div class='ctx'> 	spin_lock(&amp;br-&gt;lock);</div><div class='hunk'>@@ -131,7 +130,7 @@ static void br_topology_change_timer_expired(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void br_hold_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p = from_timer(p, t, hold_timer);</div><div class='add'>+	struct net_bridge_port *p = timer_container_of(p, t, hold_timer);</div><div class='ctx'> </div><div class='ctx'> 	br_debug(p-&gt;br, "port %u(%s) hold timer expired\n",</div><div class='ctx'> 		 (unsigned int) p-&gt;port_no, p-&gt;dev-&gt;name);</div><div class='head'>diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c<br/>index d77f807420c4..fe3f7bbe86ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_switchdev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_switchdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_switchdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_switchdev.c</a></div><div class='hunk'>@@ -4,150 +4,190 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> </div><div class='del'>-static int br_switchdev_mark_get(struct net_bridge *br, struct net_device *dev)</div><div class='add'>+static struct static_key_false br_switchdev_tx_fwd_offload;</div><div class='add'>+</div><div class='add'>+static bool nbp_switchdev_can_offload_tx_fwd(const struct net_bridge_port *p,</div><div class='add'>+					     const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge_port *p;</div><div class='add'>+	if (!static_branch_unlikely(&amp;br_switchdev_tx_fwd_offload))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	/* dev is yet to be added to the port list. */</div><div class='del'>-	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='del'>-		if (switchdev_port_same_parent_id(dev, p-&gt;dev))</div><div class='del'>-			return p-&gt;offload_fwd_mark;</div><div class='del'>-	}</div><div class='add'>+	if (br_multicast_igmp_type(skb))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return ++br-&gt;offload_fwd_mark;</div><div class='add'>+	return (p-&gt;flags &amp; BR_TX_FWD_OFFLOAD) &amp;&amp;</div><div class='add'>+	       (p-&gt;hwdom != BR_INPUT_SKB_CB(skb)-&gt;src_hwdom);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nbp_switchdev_mark_set(struct net_bridge_port *p)</div><div class='add'>+bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct switchdev_attr attr = {</div><div class='del'>-		.orig_dev = p-&gt;dev,</div><div class='del'>-		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,</div><div class='del'>-	};</div><div class='del'>-	int err;</div><div class='add'>+	if (!static_branch_unlikely(&amp;br_switchdev_tx_fwd_offload))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	return BR_INPUT_SKB_CB(skb)-&gt;tx_fwd_offload;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = switchdev_port_attr_get(p-&gt;dev, &amp;attr);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err == -EOPNOTSUPP)</div><div class='del'>-			return 0;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;offload_fwd_mark = br_switchdev_frame_uses_tx_fwd_offload(skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	p-&gt;offload_fwd_mark = br_switchdev_mark_get(p-&gt;br, p-&gt;dev);</div><div class='add'>+/* Mark the frame for TX forwarding offload if this egress port supports it */</div><div class='add'>+void nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (nbp_switchdev_can_offload_tx_fwd(p, skb))</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;tx_fwd_offload = true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+/* Lazily adds the hwdom of the egress bridge port to the bit mask of hwdoms</div><div class='add'>+ * that the skb has been already forwarded to, to avoid further cloning to</div><div class='add'>+ * other ports in the same hwdom by making nbp_switchdev_allowed_egress()</div><div class='add'>+ * return false.</div><div class='add'>+ */</div><div class='add'>+void nbp_switchdev_frame_mark_tx_fwd_to_hwdom(const struct net_bridge_port *p,</div><div class='add'>+					      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (nbp_switchdev_can_offload_tx_fwd(p, skb))</div><div class='add'>+		set_bit(p-&gt;hwdom, &amp;BR_INPUT_SKB_CB(skb)-&gt;fwd_hwdoms);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nbp_switchdev_frame_mark(const struct net_bridge_port *p,</div><div class='ctx'> 			      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;offload_fwd_mark &amp;&amp; !WARN_ON_ONCE(!p-&gt;offload_fwd_mark))</div><div class='del'>-		BR_INPUT_SKB_CB(skb)-&gt;offload_fwd_mark = p-&gt;offload_fwd_mark;</div><div class='add'>+	if (p-&gt;hwdom)</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;src_hwdom = p-&gt;hwdom;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,</div><div class='ctx'> 				  const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return !skb-&gt;offload_fwd_mark ||</div><div class='del'>-	       BR_INPUT_SKB_CB(skb)-&gt;offload_fwd_mark != p-&gt;offload_fwd_mark;</div><div class='add'>+	struct br_input_skb_cb *cb = BR_INPUT_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	return !test_bit(p-&gt;hwdom, &amp;cb-&gt;fwd_hwdoms) &amp;&amp;</div><div class='add'>+		(!skb-&gt;offload_fwd_mark || cb-&gt;src_hwdom != p-&gt;hwdom);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Flags that can be offloaded to hardware */</div><div class='del'>-#define BR_PORT_FLAGS_HW_OFFLOAD (BR_LEARNING | BR_FLOOD | \</div><div class='del'>-				  BR_MCAST_FLOOD | BR_BCAST_FLOOD)</div><div class='add'>+#define BR_PORT_FLAGS_HW_OFFLOAD (BR_LEARNING | BR_FLOOD | BR_PORT_MAB | \</div><div class='add'>+				  BR_MCAST_FLOOD | BR_BCAST_FLOOD | BR_PORT_LOCKED | \</div><div class='add'>+				  BR_HAIRPIN_MODE | BR_ISOLATED | BR_MULTICAST_TO_UNICAST)</div><div class='ctx'> </div><div class='ctx'> int br_switchdev_set_port_flag(struct net_bridge_port *p,</div><div class='ctx'> 			       unsigned long flags,</div><div class='del'>-			       unsigned long mask)</div><div class='add'>+			       unsigned long mask,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct switchdev_attr attr = {</div><div class='ctx'> 		.orig_dev = p-&gt;dev,</div><div class='del'>-		.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,</div><div class='add'>+	};</div><div class='add'>+	struct switchdev_notifier_port_attr_info info = {</div><div class='add'>+		.attr = &amp;attr,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; ~BR_PORT_FLAGS_HW_OFFLOAD)</div><div class='add'>+	mask &amp;= BR_PORT_FLAGS_HW_OFFLOAD;</div><div class='add'>+	if (!mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = switchdev_port_attr_get(p-&gt;dev, &amp;attr);</div><div class='add'>+	attr.id = SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS;</div><div class='add'>+	attr.u.brport_flags.val = flags;</div><div class='add'>+	attr.u.brport_flags.mask = mask;</div><div class='add'>+</div><div class='add'>+	/* We run from atomic context here */</div><div class='add'>+	err = call_switchdev_notifiers(SWITCHDEV_PORT_ATTR_SET, p-&gt;dev,</div><div class='add'>+				       &amp;info.info, extack);</div><div class='add'>+	err = notifier_to_errno(err);</div><div class='ctx'> 	if (err == -EOPNOTSUPP)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='del'>-	/* Check if specific bridge flag attribute offload is supported */</div><div class='del'>-	if (!(attr.u.brport_flags_support &amp; mask)) {</div><div class='del'>-		br_warn(p-&gt;br, "bridge flag offload is not supported %u(%s)\n",</div><div class='del'>-			(unsigned int)p-&gt;port_no, p-&gt;dev-&gt;name);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_WEAK_MOD(extack,</div><div class='add'>+					"bridge flag offload is not supported");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS;</div><div class='ctx'> 	attr.flags = SWITCHDEV_F_DEFER;</div><div class='del'>-	attr.u.brport_flags = flags;</div><div class='del'>-	err = switchdev_port_attr_set(p-&gt;dev, &amp;attr);</div><div class='add'>+</div><div class='add'>+	err = switchdev_port_attr_set(p-&gt;dev, &amp;attr, extack);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		br_warn(p-&gt;br, "error setting offload flag on port %u(%s)\n",</div><div class='del'>-			(unsigned int)p-&gt;port_no, p-&gt;dev-&gt;name);</div><div class='add'>+		NL_SET_ERR_MSG_WEAK_MOD(extack,</div><div class='add'>+					"error setting offload flag on port");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,</div><div class='del'>-				u16 vid, struct net_device *dev,</div><div class='del'>-				bool added_by_user)</div><div class='add'>+static void br_switchdev_fdb_populate(struct net_bridge *br,</div><div class='add'>+				      struct switchdev_notifier_fdb_info *item,</div><div class='add'>+				      const struct net_bridge_fdb_entry *fdb,</div><div class='add'>+				      const void *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct switchdev_notifier_fdb_info info;</div><div class='del'>-	unsigned long notifier_type;</div><div class='add'>+	const struct net_bridge_port *p = READ_ONCE(fdb-&gt;dst);</div><div class='ctx'> </div><div class='del'>-	info.addr = mac;</div><div class='del'>-	info.vid = vid;</div><div class='del'>-	info.added_by_user = added_by_user;</div><div class='del'>-	notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;</div><div class='del'>-	call_switchdev_notifiers(notifier_type, dev, &amp;info.info);</div><div class='add'>+	item-&gt;addr = fdb-&gt;key.addr.addr;</div><div class='add'>+	item-&gt;vid = fdb-&gt;key.vlan_id;</div><div class='add'>+	item-&gt;added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &amp;fdb-&gt;flags);</div><div class='add'>+	item-&gt;offloaded = test_bit(BR_FDB_OFFLOADED, &amp;fdb-&gt;flags);</div><div class='add'>+	item-&gt;is_local = test_bit(BR_FDB_LOCAL, &amp;fdb-&gt;flags);</div><div class='add'>+	item-&gt;locked = false;</div><div class='add'>+	item-&gt;info.dev = (!p || item-&gt;is_local) ? br-&gt;dev : p-&gt;dev;</div><div class='add'>+	item-&gt;info.ctx = ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)</div><div class='add'>+br_switchdev_fdb_notify(struct net_bridge *br,</div><div class='add'>+			const struct net_bridge_fdb_entry *fdb, int type)</div><div class='ctx'> {</div><div class='del'>-	if (!fdb-&gt;dst)</div><div class='add'>+	struct switchdev_notifier_fdb_info item;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BR_FDB_LOCKED, &amp;fdb-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Entries with these flags were created using ndm_state == NUD_REACHABLE,</div><div class='add'>+	 * ndm_flags == NTF_MASTER( | NTF_STICKY), ext_flags == 0 by something</div><div class='add'>+	 * equivalent to 'bridge fdb add ... master dynamic (sticky)'.</div><div class='add'>+	 * Drivers don't know how to deal with these, so don't notify them to</div><div class='add'>+	 * avoid confusing them.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BR_FDB_ADDED_BY_USER, &amp;fdb-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(BR_FDB_STATIC, &amp;fdb-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &amp;fdb-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	br_switchdev_fdb_populate(br, &amp;item, fdb, NULL);</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case RTM_DELNEIGH:</div><div class='del'>-		br_switchdev_fdb_call_notifiers(false, fdb-&gt;key.addr.addr,</div><div class='del'>-						fdb-&gt;key.vlan_id,</div><div class='del'>-						fdb-&gt;dst-&gt;dev,</div><div class='del'>-						fdb-&gt;added_by_user);</div><div class='add'>+		call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_DEVICE,</div><div class='add'>+					 item.info.dev, &amp;item.info, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTM_NEWNEIGH:</div><div class='del'>-		br_switchdev_fdb_call_notifiers(true, fdb-&gt;key.addr.addr,</div><div class='del'>-						fdb-&gt;key.vlan_id,</div><div class='del'>-						fdb-&gt;dst-&gt;dev,</div><div class='del'>-						fdb-&gt;added_by_user);</div><div class='add'>+		call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_DEVICE,</div><div class='add'>+					 item.info.dev, &amp;item.info, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags)</div><div class='add'>+int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,</div><div class='add'>+			       bool changed, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct switchdev_obj_port_vlan v = {</div><div class='ctx'> 		.obj.orig_dev = dev,</div><div class='ctx'> 		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='ctx'> 		.flags = flags,</div><div class='del'>-		.vid_begin = vid,</div><div class='del'>-		.vid_end = vid,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.changed = changed,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return switchdev_port_obj_add(dev, &amp;v.obj);</div><div class='add'>+	return switchdev_port_obj_add(dev, &amp;v.obj, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)</div><div class='hunk'>@@ -155,9 +195,682 @@ int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)</div><div class='ctx'> 	struct switchdev_obj_port_vlan v = {</div><div class='ctx'> 		.obj.orig_dev = dev,</div><div class='ctx'> 		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='del'>-		.vid_begin = vid,</div><div class='del'>-		.vid_end = vid,</div><div class='add'>+		.vid = vid,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return switchdev_port_obj_del(dev, &amp;v.obj);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int nbp_switchdev_hwdom_set(struct net_bridge_port *joining)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = joining-&gt;br;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	int hwdom;</div><div class='add'>+</div><div class='add'>+	/* joining is yet to be added to the port list. */</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		if (netdev_phys_item_id_same(&amp;joining-&gt;ppid, &amp;p-&gt;ppid)) {</div><div class='add'>+			joining-&gt;hwdom = p-&gt;hwdom;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwdom = find_next_zero_bit(&amp;br-&gt;busy_hwdoms, BR_HWDOM_MAX, 1);</div><div class='add'>+	if (hwdom &gt;= BR_HWDOM_MAX)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	set_bit(hwdom, &amp;br-&gt;busy_hwdoms);</div><div class='add'>+	joining-&gt;hwdom = hwdom;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nbp_switchdev_hwdom_put(struct net_bridge_port *leaving)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = leaving-&gt;br;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	/* leaving is no longer in the port list. */</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		if (p-&gt;hwdom == leaving-&gt;hwdom)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(leaving-&gt;hwdom, &amp;br-&gt;busy_hwdoms);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nbp_switchdev_add(struct net_bridge_port *p,</div><div class='add'>+			     struct netdev_phys_item_id ppid,</div><div class='add'>+			     bool tx_fwd_offload,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;offload_count) {</div><div class='add'>+		/* Prevent unsupported configurations such as a bridge port</div><div class='add'>+		 * which is a bonding interface, and the member ports are from</div><div class='add'>+		 * different hardware switches.</div><div class='add'>+		 */</div><div class='add'>+		if (!netdev_phys_item_id_same(&amp;p-&gt;ppid, &amp;ppid)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Same bridge port cannot be offloaded by two physical switches");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Tolerate drivers that call switchdev_bridge_port_offload()</div><div class='add'>+		 * more than once for the same bridge port, such as when the</div><div class='add'>+		 * bridge port is an offloaded bonding/team interface.</div><div class='add'>+		 */</div><div class='add'>+		p-&gt;offload_count++;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;ppid = ppid;</div><div class='add'>+	p-&gt;offload_count = 1;</div><div class='add'>+</div><div class='add'>+	err = nbp_switchdev_hwdom_set(p);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tx_fwd_offload) {</div><div class='add'>+		p-&gt;flags |= BR_TX_FWD_OFFLOAD;</div><div class='add'>+		static_branch_inc(&amp;br_switchdev_tx_fwd_offload);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nbp_switchdev_del(struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!p-&gt;offload_count))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p-&gt;offload_count--;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;offload_count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;hwdom)</div><div class='add'>+		nbp_switchdev_hwdom_put(p);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;flags &amp; BR_TX_FWD_OFFLOAD) {</div><div class='add'>+		p-&gt;flags &amp;= ~BR_TX_FWD_OFFLOAD;</div><div class='add'>+		static_branch_dec(&amp;br_switchdev_tx_fwd_offload);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_switchdev_fdb_replay_one(struct net_bridge *br, struct notifier_block *nb,</div><div class='add'>+			    const struct net_bridge_fdb_entry *fdb,</div><div class='add'>+			    unsigned long action, const void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_fdb_info item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	br_switchdev_fdb_populate(br, &amp;item, fdb, ctx);</div><div class='add'>+</div><div class='add'>+	err = nb-&gt;notifier_call(nb, action, &amp;item);</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_switchdev_fdb_replay(const struct net_device *br_dev, const void *ctx,</div><div class='add'>+			bool adding, struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_fdb_entry *fdb;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	unsigned long action;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!nb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(br_dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	br = netdev_priv(br_dev);</div><div class='add'>+</div><div class='add'>+	if (adding)</div><div class='add'>+		action = SWITCHDEV_FDB_ADD_TO_DEVICE;</div><div class='add'>+	else</div><div class='add'>+		action = SWITCHDEV_FDB_DEL_TO_DEVICE;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(fdb, &amp;br-&gt;fdb_list, fdb_node) {</div><div class='add'>+		err = br_switchdev_fdb_replay_one(br, nb, fdb, action, ctx);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_switchdev_vlan_attr_replay(struct net_device *br_dev,</div><div class='add'>+					 const void *ctx,</div><div class='add'>+					 struct notifier_block *nb,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_port_attr_info attr_info = {</div><div class='add'>+		.info = {</div><div class='add'>+			.dev = br_dev,</div><div class='add'>+			.extack = extack,</div><div class='add'>+			.ctx = ctx,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct net_bridge *br = netdev_priv(br_dev);</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct switchdev_attr attr;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	attr_info.attr = &amp;attr;</div><div class='add'>+	attr.orig_dev = br_dev;</div><div class='add'>+</div><div class='add'>+	vg = br_vlan_group(br);</div><div class='add'>+	if (!vg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (v-&gt;msti) {</div><div class='add'>+			attr.id = SWITCHDEV_ATTR_ID_VLAN_MSTI;</div><div class='add'>+			attr.u.vlan_msti.vid = v-&gt;vid;</div><div class='add'>+			attr.u.vlan_msti.msti = v-&gt;msti;</div><div class='add'>+</div><div class='add'>+			err = nb-&gt;notifier_call(nb, SWITCHDEV_PORT_ATTR_SET,</div><div class='add'>+						&amp;attr_info);</div><div class='add'>+			err = notifier_to_errno(err);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_switchdev_vlan_replay_one(struct notifier_block *nb,</div><div class='add'>+			     struct net_device *dev,</div><div class='add'>+			     struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			     const void *ctx, unsigned long action,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_port_obj_info obj_info = {</div><div class='add'>+		.info = {</div><div class='add'>+			.dev = dev,</div><div class='add'>+			.extack = extack,</div><div class='add'>+			.ctx = ctx,</div><div class='add'>+		},</div><div class='add'>+		.obj = &amp;vlan-&gt;obj,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nb-&gt;notifier_call(nb, action, &amp;obj_info);</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_switchdev_vlan_replay_group(struct notifier_block *nb,</div><div class='add'>+					  struct net_device *dev,</div><div class='add'>+					  struct net_bridge_vlan_group *vg,</div><div class='add'>+					  const void *ctx, unsigned long action,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 pvid;</div><div class='add'>+</div><div class='add'>+	if (!vg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pvid = br_get_pvid(vg);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+			.obj.orig_dev = dev,</div><div class='add'>+			.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='add'>+			.flags = br_vlan_flags(v, pvid),</div><div class='add'>+			.vid = v-&gt;vid,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (!br_vlan_should_use(v))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = br_switchdev_vlan_replay_one(nb, dev, &amp;vlan, ctx,</div><div class='add'>+						   action, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_switchdev_vlan_replay(struct net_device *br_dev,</div><div class='add'>+				    const void *ctx, bool adding,</div><div class='add'>+				    struct notifier_block *nb,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(br_dev);</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	unsigned long action;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!nb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(br_dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (adding)</div><div class='add'>+		action = SWITCHDEV_PORT_OBJ_ADD;</div><div class='add'>+	else</div><div class='add'>+		action = SWITCHDEV_PORT_OBJ_DEL;</div><div class='add'>+</div><div class='add'>+	err = br_switchdev_vlan_replay_group(nb, br_dev, br_vlan_group(br),</div><div class='add'>+					     ctx, action, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		struct net_device *dev = p-&gt;dev;</div><div class='add'>+</div><div class='add'>+		err = br_switchdev_vlan_replay_group(nb, dev,</div><div class='add'>+						     nbp_vlan_group(p),</div><div class='add'>+						     ctx, action, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adding) {</div><div class='add'>+		err = br_switchdev_vlan_attr_replay(br_dev, ctx, nb, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+struct br_switchdev_mdb_complete_info {</div><div class='add'>+	struct net_bridge_port *port;</div><div class='add'>+	struct br_ip ip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void br_switchdev_mdb_complete(struct net_device *dev, int err, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct br_switchdev_mdb_complete_info *data = priv;</div><div class='add'>+	struct net_bridge_port_group __rcu **pp;</div><div class='add'>+	struct net_bridge_port_group *p;</div><div class='add'>+	struct net_bridge_mdb_entry *mp;</div><div class='add'>+	struct net_bridge_port *port = data-&gt;port;</div><div class='add'>+	struct net_bridge *br = port-&gt;br;</div><div class='add'>+	u8 old_flags;</div><div class='add'>+</div><div class='add'>+	if (err == -EOPNOTSUPP)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+	mp = br_mdb_ip_get(br, &amp;data-&gt;ip);</div><div class='add'>+	if (!mp)</div><div class='add'>+		goto out;</div><div class='add'>+	for (pp = &amp;mp-&gt;ports; (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+	     pp = &amp;p-&gt;next) {</div><div class='add'>+		if (p-&gt;key.port != port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		old_flags = p-&gt;flags;</div><div class='add'>+		br_multicast_set_pg_offload_flags(p, !err);</div><div class='add'>+		if (br_mdb_should_notify(br, old_flags ^ p-&gt;flags))</div><div class='add'>+			br_mdb_flag_change_notify(br-&gt;dev, mp, p);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_switchdev_mdb_populate(struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				      const struct net_bridge_mdb_entry *mp)</div><div class='add'>+{</div><div class='add'>+	if (mp-&gt;addr.proto == htons(ETH_P_IP))</div><div class='add'>+		ip_eth_mc_map(mp-&gt;addr.dst.ip4, mdb-&gt;addr);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else if (mp-&gt;addr.proto == htons(ETH_P_IPV6))</div><div class='add'>+		ipv6_eth_mc_map(&amp;mp-&gt;addr.dst.ip6, mdb-&gt;addr);</div><div class='add'>+#endif</div><div class='add'>+	else</div><div class='add'>+		ether_addr_copy(mdb-&gt;addr, mp-&gt;addr.dst.mac_addr);</div><div class='add'>+</div><div class='add'>+	mdb-&gt;vid = mp-&gt;addr.vid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_switchdev_host_mdb_one(struct net_device *dev,</div><div class='add'>+				      struct net_device *lower_dev,</div><div class='add'>+				      struct net_bridge_mdb_entry *mp,</div><div class='add'>+				      int type)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_port_mdb mdb = {</div><div class='add'>+		.obj = {</div><div class='add'>+			.id = SWITCHDEV_OBJ_ID_HOST_MDB,</div><div class='add'>+			.flags = SWITCHDEV_F_DEFER,</div><div class='add'>+			.orig_dev = dev,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	br_switchdev_mdb_populate(&amp;mdb, mp);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RTM_NEWMDB:</div><div class='add'>+		switchdev_port_obj_add(lower_dev, &amp;mdb.obj, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case RTM_DELMDB:</div><div class='add'>+		switchdev_port_obj_del(lower_dev, &amp;mdb.obj);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_switchdev_host_mdb(struct net_device *dev,</div><div class='add'>+				  struct net_bridge_mdb_entry *mp, int type)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lower_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower_dev, iter)</div><div class='add'>+		br_switchdev_host_mdb_one(dev, lower_dev, mp, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_switchdev_mdb_replay_one(struct notifier_block *nb, struct net_device *dev,</div><div class='add'>+			    const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			    unsigned long action, const void *ctx,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_port_obj_info obj_info = {</div><div class='add'>+		.info = {</div><div class='add'>+			.dev = dev,</div><div class='add'>+			.extack = extack,</div><div class='add'>+			.ctx = ctx,</div><div class='add'>+		},</div><div class='add'>+		.obj = &amp;mdb-&gt;obj,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nb-&gt;notifier_call(nb, action, &amp;obj_info);</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_switchdev_mdb_queue_one(struct list_head *mdb_list,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      unsigned long action,</div><div class='add'>+				      enum switchdev_obj_id id,</div><div class='add'>+				      const struct net_bridge_mdb_entry *mp,</div><div class='add'>+				      struct net_device *orig_dev)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_port_mdb mdb = {</div><div class='add'>+		.obj = {</div><div class='add'>+			.id = id,</div><div class='add'>+			.orig_dev = orig_dev,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct switchdev_obj_port_mdb *pmdb;</div><div class='add'>+</div><div class='add'>+	br_switchdev_mdb_populate(&amp;mdb, mp);</div><div class='add'>+</div><div class='add'>+	if (action == SWITCHDEV_PORT_OBJ_ADD &amp;&amp;</div><div class='add'>+	    switchdev_port_obj_act_is_deferred(dev, action, &amp;mdb.obj)) {</div><div class='add'>+		/* This event is already in the deferred queue of</div><div class='add'>+		 * events, so this replay must be elided, lest the</div><div class='add'>+		 * driver receives duplicate events for it. This can</div><div class='add'>+		 * only happen when replaying additions, since</div><div class='add'>+		 * modifications are always immediately visible in</div><div class='add'>+		 * br-&gt;mdb_list, whereas actual event delivery may be</div><div class='add'>+		 * delayed.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmdb = kmemdup(&amp;mdb, sizeof(mdb), GFP_ATOMIC);</div><div class='add'>+	if (!pmdb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;pmdb-&gt;obj.list, mdb_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_switchdev_mdb_notify(struct net_device *dev,</div><div class='add'>+			     struct net_bridge_mdb_entry *mp,</div><div class='add'>+			     struct net_bridge_port_group *pg,</div><div class='add'>+			     int type)</div><div class='add'>+{</div><div class='add'>+	struct br_switchdev_mdb_complete_info *complete_info;</div><div class='add'>+	struct switchdev_obj_port_mdb mdb = {</div><div class='add'>+		.obj = {</div><div class='add'>+			.id = SWITCHDEV_OBJ_ID_PORT_MDB,</div><div class='add'>+			.flags = SWITCHDEV_F_DEFER,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!pg)</div><div class='add'>+		return br_switchdev_host_mdb(dev, mp, type);</div><div class='add'>+</div><div class='add'>+	br_switchdev_mdb_populate(&amp;mdb, mp);</div><div class='add'>+</div><div class='add'>+	mdb.obj.orig_dev = pg-&gt;key.port-&gt;dev;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RTM_NEWMDB:</div><div class='add'>+		complete_info = kmalloc(sizeof(*complete_info), GFP_ATOMIC);</div><div class='add'>+		if (!complete_info)</div><div class='add'>+			break;</div><div class='add'>+		complete_info-&gt;port = pg-&gt;key.port;</div><div class='add'>+		complete_info-&gt;ip = mp-&gt;addr;</div><div class='add'>+		mdb.obj.complete_priv = complete_info;</div><div class='add'>+		mdb.obj.complete = br_switchdev_mdb_complete;</div><div class='add'>+		if (switchdev_port_obj_add(pg-&gt;key.port-&gt;dev, &amp;mdb.obj, NULL))</div><div class='add'>+			kfree(complete_info);</div><div class='add'>+		break;</div><div class='add'>+	case RTM_DELMDB:</div><div class='add'>+		switchdev_port_obj_del(pg-&gt;key.port-&gt;dev, &amp;mdb.obj);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+br_switchdev_mdb_replay(struct net_device *br_dev, struct net_device *dev,</div><div class='add'>+			const void *ctx, bool adding, struct notifier_block *nb,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	const struct net_bridge_mdb_entry *mp;</div><div class='add'>+	struct switchdev_obj *obj, *tmp;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	unsigned long action;</div><div class='add'>+	LIST_HEAD(mdb_list);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!nb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(br_dev) || !netif_is_bridge_port(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	br = netdev_priv(br_dev);</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (adding)</div><div class='add'>+		action = SWITCHDEV_PORT_OBJ_ADD;</div><div class='add'>+	else</div><div class='add'>+		action = SWITCHDEV_PORT_OBJ_DEL;</div><div class='add'>+</div><div class='add'>+	/* br_switchdev_mdb_queue_one() will take care to not queue a</div><div class='add'>+	 * replay of an event that is already pending in the switchdev</div><div class='add'>+	 * deferred queue. In order to safely determine that, there</div><div class='add'>+	 * must be no new deferred MDB notifications enqueued for the</div><div class='add'>+	 * duration of the MDB scan. Therefore, grab the write-side</div><div class='add'>+	 * lock to avoid racing with any concurrent IGMP/MLD snooping.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(mp, &amp;br-&gt;mdb_list, mdb_node) {</div><div class='add'>+		struct net_bridge_port_group __rcu * const *pp;</div><div class='add'>+		const struct net_bridge_port_group *p;</div><div class='add'>+</div><div class='add'>+		if (mp-&gt;host_joined) {</div><div class='add'>+			err = br_switchdev_mdb_queue_one(&amp;mdb_list, dev, action,</div><div class='add'>+							 SWITCHDEV_OBJ_ID_HOST_MDB,</div><div class='add'>+							 mp, br_dev);</div><div class='add'>+			if (err) {</div><div class='add'>+				spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+				goto out_free_mdb;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (pp = &amp;mp-&gt;ports; (p = mlock_dereference(*pp, br)) != NULL;</div><div class='add'>+		     pp = &amp;p-&gt;next) {</div><div class='add'>+			if (p-&gt;key.port-&gt;dev != dev)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			err = br_switchdev_mdb_queue_one(&amp;mdb_list, dev, action,</div><div class='add'>+							 SWITCHDEV_OBJ_ID_PORT_MDB,</div><div class='add'>+							 mp, dev);</div><div class='add'>+			if (err) {</div><div class='add'>+				spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+				goto out_free_mdb;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;br-&gt;multicast_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(obj, &amp;mdb_list, list) {</div><div class='add'>+		err = br_switchdev_mdb_replay_one(nb, dev,</div><div class='add'>+						  SWITCHDEV_OBJ_PORT_MDB(obj),</div><div class='add'>+						  action, ctx, extack);</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			err = 0;</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_mdb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free_mdb:</div><div class='add'>+	list_for_each_entry_safe(obj, tmp, &amp;mdb_list, list) {</div><div class='add'>+		list_del(&amp;obj-&gt;list);</div><div class='add'>+		kfree(SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nbp_switchdev_sync_objs(struct net_bridge_port *p, const void *ctx,</div><div class='add'>+				   struct notifier_block *atomic_nb,</div><div class='add'>+				   struct notifier_block *blocking_nb,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br_dev = p-&gt;br-&gt;dev;</div><div class='add'>+	struct net_device *dev = p-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_switchdev_vlan_replay(br_dev, ctx, true, blocking_nb, extack);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = br_switchdev_mdb_replay(br_dev, dev, ctx, true, blocking_nb,</div><div class='add'>+				      extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* -EOPNOTSUPP not propagated from MDB replay. */</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = br_switchdev_fdb_replay(br_dev, ctx, true, atomic_nb);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nbp_switchdev_unsync_objs(struct net_bridge_port *p,</div><div class='add'>+				      const void *ctx,</div><div class='add'>+				      struct notifier_block *atomic_nb,</div><div class='add'>+				      struct notifier_block *blocking_nb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br_dev = p-&gt;br-&gt;dev;</div><div class='add'>+	struct net_device *dev = p-&gt;dev;</div><div class='add'>+</div><div class='add'>+	br_switchdev_fdb_replay(br_dev, ctx, false, atomic_nb);</div><div class='add'>+</div><div class='add'>+	br_switchdev_mdb_replay(br_dev, dev, ctx, false, blocking_nb, NULL);</div><div class='add'>+</div><div class='add'>+	br_switchdev_vlan_replay(br_dev, ctx, false, blocking_nb, NULL);</div><div class='add'>+</div><div class='add'>+	/* Make sure that the device leaving this bridge has seen all</div><div class='add'>+	 * relevant events before it is disassociated. In the normal</div><div class='add'>+	 * case, when the device is directly attached to the bridge,</div><div class='add'>+	 * this is covered by del_nbp(). If the association was indirect</div><div class='add'>+	 * however, e.g. via a team or bond, and the device is leaving</div><div class='add'>+	 * that intermediate device, then the bridge port remains in</div><div class='add'>+	 * place.</div><div class='add'>+	 */</div><div class='add'>+	switchdev_deferred_process();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Let the bridge know that this port is offloaded, so that it can assign a</div><div class='add'>+ * switchdev hardware domain to it.</div><div class='add'>+ */</div><div class='add'>+int br_switchdev_port_offload(struct net_bridge_port *p,</div><div class='add'>+			      struct net_device *dev, const void *ctx,</div><div class='add'>+			      struct notifier_block *atomic_nb,</div><div class='add'>+			      struct notifier_block *blocking_nb,</div><div class='add'>+			      bool tx_fwd_offload,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_phys_item_id ppid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = netif_get_port_parent_id(dev, &amp;ppid, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nbp_switchdev_add(p, ppid, tx_fwd_offload, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nbp_switchdev_sync_objs(p, ctx, atomic_nb, blocking_nb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_switchdev_del;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_switchdev_del:</div><div class='add'>+	nbp_switchdev_del(p);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_switchdev_port_unoffload(struct net_bridge_port *p, const void *ctx,</div><div class='add'>+				 struct notifier_block *atomic_nb,</div><div class='add'>+				 struct notifier_block *blocking_nb)</div><div class='add'>+{</div><div class='add'>+	nbp_switchdev_unsync_objs(p, ctx, atomic_nb, blocking_nb);</div><div class='add'>+</div><div class='add'>+	nbp_switchdev_del(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_switchdev_port_replay(struct net_bridge_port *p,</div><div class='add'>+			     struct net_device *dev, const void *ctx,</div><div class='add'>+			     struct notifier_block *atomic_nb,</div><div class='add'>+			     struct notifier_block *blocking_nb,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return nbp_switchdev_sync_objs(p, ctx, atomic_nb, blocking_nb, extack);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c<br/>index 0318a69888d4..cb4855ed9500 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_sysfs_br.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_sysfs_br.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_sysfs_br.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_sysfs_br.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Sysfs attributes of bridge</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Stephen Hemminger		&lt;shemminger@osdl.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -23,6 +19,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> </div><div class='add'>+/* IMPORTANT: new bridge options must be added with netlink support only</div><div class='add'>+ *            please do not add new sysfs entries</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #define to_bridge(cd)	((struct net_bridge *)netdev_priv(to_net_dev(cd)))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -30,26 +30,33 @@</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t store_bridge_parm(struct device *d,</div><div class='ctx'> 				 const char *buf, size_t len,</div><div class='del'>-				 int (*set)(struct net_bridge *, unsigned long))</div><div class='add'>+				 int (*set)(struct net_bridge *br, unsigned long val,</div><div class='add'>+					    struct netlink_ext_ack *extack))</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	char *endp;</div><div class='add'>+	struct netlink_ext_ack extack = {0};</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(dev_net(br-&gt;dev)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtoul(buf, &amp;endp, 0);</div><div class='del'>-	if (endp == buf)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtoul(buf, 0, &amp;val);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!rtnl_trylock())</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='del'>-	err = (*set)(br, val);</div><div class='add'>+	err = (*set)(br, val, &amp;extack);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		netdev_state_change(br-&gt;dev);</div><div class='add'>+	if (extack._msg) {</div><div class='add'>+		if (err)</div><div class='add'>+			br_err(br, "%s\n", extack._msg);</div><div class='add'>+		else</div><div class='add'>+			br_warn(br, "%s\n", extack._msg);</div><div class='add'>+	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : len;</div><div class='hunk'>@@ -63,11 +70,17 @@ static ssize_t forward_delay_show(struct device *d,</div><div class='ctx'> 	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br-&gt;forward_delay));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_forward_delay(struct net_bridge *br, unsigned long val,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_set_forward_delay(br, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t forward_delay_store(struct device *d,</div><div class='ctx'> 				   struct device_attribute *attr,</div><div class='ctx'> 				   const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_set_forward_delay);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_forward_delay);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(forward_delay);</div><div class='ctx'> </div><div class='hunk'>@@ -78,11 +91,17 @@ static ssize_t hello_time_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 		       jiffies_to_clock_t(to_bridge(d)-&gt;hello_time));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_hello_time(struct net_bridge *br, unsigned long val,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_set_hello_time(br, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t hello_time_store(struct device *d,</div><div class='ctx'> 				struct device_attribute *attr, const char *buf,</div><div class='ctx'> 				size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_set_hello_time);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_hello_time);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(hello_time);</div><div class='ctx'> </div><div class='hunk'>@@ -93,10 +112,16 @@ static ssize_t max_age_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 		       jiffies_to_clock_t(to_bridge(d)-&gt;max_age));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_max_age(struct net_bridge *br, unsigned long val,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_set_max_age(br, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t max_age_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_set_max_age);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_max_age);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(max_age);</div><div class='ctx'> </div><div class='hunk'>@@ -107,7 +132,8 @@ static ssize_t ageing_time_show(struct device *d,</div><div class='ctx'> 	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br-&gt;ageing_time));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_ageing_time(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_ageing_time(struct net_bridge *br, unsigned long val,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return br_set_ageing_time(br, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -128,11 +154,10 @@ static ssize_t stp_state_show(struct device *d,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int set_stp_state(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_stp_state(struct net_bridge *br, unsigned long val,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br_stp_set_enabled(br, val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return br_stp_set_enabled(br, val, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t stp_state_store(struct device *d,</div><div class='hunk'>@@ -151,7 +176,8 @@ static ssize_t group_fwd_mask_show(struct device *d,</div><div class='ctx'> 	return sprintf(buf, "%#x\n", br-&gt;group_fwd_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_group_fwd_mask(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_group_fwd_mask(struct net_bridge *br, unsigned long val,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	if (val &amp; BR_GROUPFWD_RESTRICTED)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -178,7 +204,8 @@ static ssize_t priority_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 		       (br-&gt;bridge_id.prio[0] &lt;&lt; 8) | br-&gt;bridge_id.prio[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_priority(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_priority(struct net_bridge *br, unsigned long val,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	br_stp_set_bridge_priority(br, (u16) val);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -303,7 +330,7 @@ static ssize_t group_addr_store(struct device *d,</div><div class='ctx'> 	ether_addr_copy(br-&gt;group_addr, new_addr);</div><div class='ctx'> 	spin_unlock_bh(&amp;br-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	br-&gt;group_addr_set = true;</div><div class='add'>+	br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true);</div><div class='ctx'> 	br_recalculate_fwd_mask(br);</div><div class='ctx'> 	netdev_state_change(br-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -314,9 +341,14 @@ static ssize_t group_addr_store(struct device *d,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RW(group_addr);</div><div class='ctx'> </div><div class='del'>-static int set_flush(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_flush(struct net_bridge *br, unsigned long val,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br_fdb_flush(br);</div><div class='add'>+	struct net_bridge_fdb_flush_desc desc = {</div><div class='add'>+		.flags_mask = BIT(BR_FDB_STATIC)</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	br_fdb_flush(br, &amp;desc);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -328,19 +360,47 @@ static ssize_t flush_store(struct device *d,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_WO(flush);</div><div class='ctx'> </div><div class='add'>+static ssize_t no_linklocal_learn_show(struct device *d,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = to_bridge(d);</div><div class='add'>+	return sprintf(buf, "%d\n", br_boolopt_get(br, BR_BOOLOPT_NO_LL_LEARN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_no_linklocal_learn(struct net_bridge *br, unsigned long val,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_boolopt_toggle(br, BR_BOOLOPT_NO_LL_LEARN, !!val, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t no_linklocal_learn_store(struct device *d,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_no_linklocal_learn);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RW(no_linklocal_learn);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> static ssize_t multicast_router_show(struct device *d,</div><div class='ctx'> 				     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%d\n", br-&gt;multicast_router);</div><div class='add'>+	return sprintf(buf, "%d\n", br-&gt;multicast_ctx.multicast_router);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_multicast_router(struct net_bridge *br, unsigned long val,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_set_router(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t multicast_router_store(struct device *d,</div><div class='ctx'> 				      struct device_attribute *attr,</div><div class='ctx'> 				      const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_multicast_set_router);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_multicast_router);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(multicast_router);</div><div class='ctx'> </div><div class='hunk'>@@ -349,7 +409,7 @@ static ssize_t multicast_snooping_show(struct device *d,</div><div class='ctx'> 				       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%d\n", !br-&gt;multicast_disabled);</div><div class='add'>+	return sprintf(buf, "%d\n", br_opt_get(br, BROPT_MULTICAST_ENABLED));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t multicast_snooping_store(struct device *d,</div><div class='hunk'>@@ -365,12 +425,14 @@ static ssize_t multicast_query_use_ifaddr_show(struct device *d,</div><div class='ctx'> 					       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%d\n", br-&gt;multicast_query_use_ifaddr);</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		       br_opt_get(br, BROPT_MULTICAST_QUERY_USE_IFADDR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_query_use_ifaddr(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_query_use_ifaddr(struct net_bridge *br, unsigned long val,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_query_use_ifaddr = !!val;</div><div class='add'>+	br_opt_toggle(br, BROPT_MULTICAST_QUERY_USE_IFADDR, !!val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -388,27 +450,35 @@ static ssize_t multicast_querier_show(struct device *d,</div><div class='ctx'> 				      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%d\n", br-&gt;multicast_querier);</div><div class='add'>+	return sprintf(buf, "%d\n", br-&gt;multicast_ctx.multicast_querier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_multicast_querier(struct net_bridge *br, unsigned long val,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_set_querier(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t multicast_querier_store(struct device *d,</div><div class='ctx'> 				       struct device_attribute *attr,</div><div class='ctx'> 				       const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_multicast_set_querier);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_multicast_querier);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(multicast_querier);</div><div class='ctx'> </div><div class='ctx'> static ssize_t hash_elasticity_show(struct device *d,</div><div class='ctx'> 				    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;hash_elasticity);</div><div class='add'>+	return sprintf(buf, "%u\n", RHT_ELASTICITY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_elasticity(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_elasticity(struct net_bridge *br, unsigned long val,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;hash_elasticity = val;</div><div class='add'>+	/* 16 is RHT_ELASTICITY */</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+			   "the hash_elasticity option has been deprecated and is always 16");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -427,10 +497,17 @@ static ssize_t hash_max_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%u\n", br-&gt;hash_max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_hash_max(struct net_bridge *br, unsigned long val,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	br-&gt;hash_max = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t hash_max_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_multicast_set_hash_max);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_hash_max);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(hash_max);</div><div class='ctx'> </div><div class='hunk'>@@ -440,14 +517,20 @@ static ssize_t multicast_igmp_version_show(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;multicast_igmp_version);</div><div class='add'>+	return sprintf(buf, "%u\n", br-&gt;multicast_ctx.multicast_igmp_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_multicast_igmp_version(struct net_bridge *br, unsigned long val,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_set_igmp_version(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t multicast_igmp_version_store(struct device *d,</div><div class='ctx'> 					    struct device_attribute *attr,</div><div class='ctx'> 					    const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_multicast_set_igmp_version);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_multicast_igmp_version);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(multicast_igmp_version);</div><div class='ctx'> </div><div class='hunk'>@@ -456,12 +539,13 @@ static ssize_t multicast_last_member_count_show(struct device *d,</div><div class='ctx'> 						char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;multicast_last_member_count);</div><div class='add'>+	return sprintf(buf, "%u\n", br-&gt;multicast_ctx.multicast_last_member_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_last_member_count(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_last_member_count(struct net_bridge *br, unsigned long val,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_last_member_count = val;</div><div class='add'>+	br-&gt;multicast_ctx.multicast_last_member_count = val;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,12 +561,13 @@ static ssize_t multicast_startup_query_count_show(</div><div class='ctx'> 	struct device *d, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;multicast_startup_query_count);</div><div class='add'>+	return sprintf(buf, "%u\n", br-&gt;multicast_ctx.multicast_startup_query_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_startup_query_count(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_startup_query_count(struct net_bridge *br, unsigned long val,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_startup_query_count = val;</div><div class='add'>+	br-&gt;multicast_ctx.multicast_startup_query_count = val;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -499,12 +584,13 @@ static ssize_t multicast_last_member_interval_show(</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(buf, "%lu\n",</div><div class='del'>-		       jiffies_to_clock_t(br-&gt;multicast_last_member_interval));</div><div class='add'>+		       jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_last_member_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_last_member_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_last_member_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_last_member_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br-&gt;multicast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -521,12 +607,13 @@ static ssize_t multicast_membership_interval_show(</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(buf, "%lu\n",</div><div class='del'>-		       jiffies_to_clock_t(br-&gt;multicast_membership_interval));</div><div class='add'>+		       jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_membership_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_membership_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_membership_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_membership_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br-&gt;multicast_ctx.multicast_membership_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -544,12 +631,13 @@ static ssize_t multicast_querier_interval_show(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(buf, "%lu\n",</div><div class='del'>-		       jiffies_to_clock_t(br-&gt;multicast_querier_interval));</div><div class='add'>+		       jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_querier_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_querier_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_querier_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_querier_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br-&gt;multicast_ctx.multicast_querier_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -567,12 +655,13 @@ static ssize_t multicast_query_interval_show(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(buf, "%lu\n",</div><div class='del'>-		       jiffies_to_clock_t(br-&gt;multicast_query_interval));</div><div class='add'>+		       jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_query_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_query_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_query_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_query_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br_multicast_set_query_intvl(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -590,12 +679,13 @@ static ssize_t multicast_query_response_interval_show(</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(</div><div class='ctx'> 		buf, "%lu\n",</div><div class='del'>-		jiffies_to_clock_t(br-&gt;multicast_query_response_interval));</div><div class='add'>+		jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_query_response_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_query_response_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_query_response_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_query_response_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br-&gt;multicast_ctx.multicast_query_response_interval = clock_t_to_jiffies(val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -613,12 +703,13 @@ static ssize_t multicast_startup_query_interval_show(</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> 	return sprintf(</div><div class='ctx'> 		buf, "%lu\n",</div><div class='del'>-		jiffies_to_clock_t(br-&gt;multicast_startup_query_interval));</div><div class='add'>+		jiffies_to_clock_t(br-&gt;multicast_ctx.multicast_startup_query_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_startup_query_interval(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_startup_query_interval(struct net_bridge *br, unsigned long val,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_startup_query_interval = clock_t_to_jiffies(val);</div><div class='add'>+	br_multicast_set_startup_query_intvl(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -636,12 +727,14 @@ static ssize_t multicast_stats_enabled_show(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;multicast_stats_enabled);</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		       br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_stats_enabled(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_stats_enabled(struct net_bridge *br, unsigned long val,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;multicast_stats_enabled = !!val;</div><div class='add'>+	br_opt_toggle(br, BROPT_MULTICAST_STATS_ENABLED, !!val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -661,14 +754,20 @@ static ssize_t multicast_mld_version_show(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;multicast_mld_version);</div><div class='add'>+	return sprintf(buf, "%u\n", br-&gt;multicast_ctx.multicast_mld_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_multicast_mld_version(struct net_bridge *br, unsigned long val,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_multicast_set_mld_version(&amp;br-&gt;multicast_ctx, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t multicast_mld_version_store(struct device *d,</div><div class='ctx'> 					   struct device_attribute *attr,</div><div class='ctx'> 					   const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_multicast_set_mld_version);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_multicast_mld_version);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(multicast_mld_version);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -678,12 +777,13 @@ static ssize_t nf_call_iptables_show(</div><div class='ctx'> 	struct device *d, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;nf_call_iptables);</div><div class='add'>+	return sprintf(buf, "%u\n", br_opt_get(br, BROPT_NF_CALL_IPTABLES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_nf_call_iptables(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_nf_call_iptables(struct net_bridge *br, unsigned long val,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;nf_call_iptables = val ? true : false;</div><div class='add'>+	br_opt_toggle(br, BROPT_NF_CALL_IPTABLES, !!val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -699,12 +799,13 @@ static ssize_t nf_call_ip6tables_show(</div><div class='ctx'> 	struct device *d, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;nf_call_ip6tables);</div><div class='add'>+	return sprintf(buf, "%u\n", br_opt_get(br, BROPT_NF_CALL_IP6TABLES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_nf_call_ip6tables(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_nf_call_ip6tables(struct net_bridge *br, unsigned long val,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;nf_call_ip6tables = val ? true : false;</div><div class='add'>+	br_opt_toggle(br, BROPT_NF_CALL_IP6TABLES, !!val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -720,12 +821,13 @@ static ssize_t nf_call_arptables_show(</div><div class='ctx'> 	struct device *d, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;nf_call_arptables);</div><div class='add'>+	return sprintf(buf, "%u\n", br_opt_get(br, BROPT_NF_CALL_ARPTABLES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_nf_call_arptables(struct net_bridge *br, unsigned long val)</div><div class='add'>+static int set_nf_call_arptables(struct net_bridge *br, unsigned long val,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;nf_call_arptables = val ? true : false;</div><div class='add'>+	br_opt_toggle(br, BROPT_NF_CALL_ARPTABLES, !!val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -743,7 +845,7 @@ static ssize_t vlan_filtering_show(struct device *d,</div><div class='ctx'> 				   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%d\n", br-&gt;vlan_enabled);</div><div class='add'>+	return sprintf(buf, "%d\n", br_opt_get(br, BROPT_VLAN_ENABLED));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t vlan_filtering_store(struct device *d,</div><div class='hunk'>@@ -791,16 +893,44 @@ static ssize_t vlan_stats_enabled_show(struct device *d,</div><div class='ctx'> 				       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = to_bridge(d);</div><div class='del'>-	return sprintf(buf, "%u\n", br-&gt;vlan_stats_enabled);</div><div class='add'>+	return sprintf(buf, "%u\n", br_opt_get(br, BROPT_VLAN_STATS_ENABLED));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_vlan_stats_enabled(struct net_bridge *br, unsigned long val,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_vlan_set_stats(br, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t vlan_stats_enabled_store(struct device *d,</div><div class='ctx'> 					struct device_attribute *attr,</div><div class='ctx'> 					const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return store_bridge_parm(d, buf, len, br_vlan_set_stats);</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_vlan_stats_enabled);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(vlan_stats_enabled);</div><div class='add'>+</div><div class='add'>+static ssize_t vlan_stats_per_port_show(struct device *d,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = to_bridge(d);</div><div class='add'>+	return sprintf(buf, "%u\n", br_opt_get(br, BROPT_VLAN_STATS_PER_PORT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_vlan_stats_per_port(struct net_bridge *br, unsigned long val,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return br_vlan_set_stats_per_port(br, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vlan_stats_per_port_store(struct device *d,</div><div class='add'>+					 struct device_attribute *attr,</div><div class='add'>+					 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return store_bridge_parm(d, buf, len, set_vlan_stats_per_port);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RW(vlan_stats_per_port);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct attribute *bridge_attrs[] = {</div><div class='hunk'>@@ -823,6 +953,7 @@ static struct attribute *bridge_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_gc_timer.attr,</div><div class='ctx'> 	&amp;dev_attr_group_addr.attr,</div><div class='ctx'> 	&amp;dev_attr_flush.attr,</div><div class='add'>+	&amp;dev_attr_no_linklocal_learn.attr,</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> 	&amp;dev_attr_multicast_router.attr,</div><div class='ctx'> 	&amp;dev_attr_multicast_snooping.attr,</div><div class='hunk'>@@ -854,6 +985,7 @@ static struct attribute *bridge_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_vlan_protocol.attr,</div><div class='ctx'> 	&amp;dev_attr_default_pvid.attr,</div><div class='ctx'> 	&amp;dev_attr_vlan_stats_enabled.attr,</div><div class='add'>+	&amp;dev_attr_vlan_stats_per_port.attr,</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='hunk'>@@ -870,7 +1002,7 @@ static const struct attribute_group bridge_group = {</div><div class='ctx'>  * Returns the number of bytes read.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t brforward_read(struct file *filp, struct kobject *kobj,</div><div class='del'>-			      struct bin_attribute *bin_attr,</div><div class='add'>+			      const struct bin_attribute *bin_attr,</div><div class='ctx'> 			      char *buf, loff_t off, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = kobj_to_dev(kobj);</div><div class='hunk'>@@ -891,7 +1023,7 @@ static ssize_t brforward_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct bin_attribute bridge_forward = {</div><div class='add'>+static const struct bin_attribute bridge_forward = {</div><div class='ctx'> 	.attr = { .name = SYSFS_BRIDGE_FDB,</div><div class='ctx'> 		  .mode = 0444, },</div><div class='ctx'> 	.read = brforward_read,</div><div class='head'>diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c<br/>index 7c87a2fe5248..74fdd8105dca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_sysfs_if.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_sysfs_if.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_sysfs_if.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_sysfs_if.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Sysfs attributes of bridge ports</div><div class='ctx'>  *	Linux ethernet bridge</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Stephen Hemminger		&lt;shemminger@osdl.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -21,6 +17,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> </div><div class='add'>+/* IMPORTANT: new bridge port options must be added with netlink support only</div><div class='add'>+ *            please do not add new sysfs entries</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> struct brport_attribute {</div><div class='ctx'> 	struct attribute	attr;</div><div class='ctx'> 	ssize_t (*show)(struct net_bridge_port *, char *);</div><div class='hunk'>@@ -59,9 +59,9 @@ static BRPORT_ATTR(_name, 0644,					\</div><div class='ctx'> static int store_flag(struct net_bridge_port *p, unsigned long v,</div><div class='ctx'> 		      unsigned long mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	flags = p-&gt;flags;</div><div class='add'>+	struct netlink_ext_ack extack = {0};</div><div class='add'>+	unsigned long flags = p-&gt;flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (v)</div><div class='ctx'> 		flags |= mask;</div><div class='hunk'>@@ -69,6 +69,12 @@ static int store_flag(struct net_bridge_port *p, unsigned long v,</div><div class='ctx'> 		flags &amp;= ~mask;</div><div class='ctx'> </div><div class='ctx'> 	if (flags != p-&gt;flags) {</div><div class='add'>+		err = br_switchdev_set_port_flag(p, flags, mask, &amp;extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(p-&gt;dev, "%s\n", extack._msg);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		p-&gt;flags = flags;</div><div class='ctx'> 		br_port_flags_change(p, mask);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -238,13 +244,13 @@ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);</div><div class='ctx'> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='ctx'> static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", p-&gt;multicast_router);</div><div class='add'>+	return sprintf(buf, "%d\n", p-&gt;multicast_ctx.multicast_router);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int store_multicast_router(struct net_bridge_port *p,</div><div class='ctx'> 				      unsigned long v)</div><div class='ctx'> {</div><div class='del'>-	return br_multicast_set_port_router(p, v);</div><div class='add'>+	return br_multicast_set_port_router(&amp;p-&gt;multicast_ctx, v);</div><div class='ctx'> }</div><div class='ctx'> static BRPORT_ATTR(multicast_router, 0644, show_multicast_router,</div><div class='ctx'> 		   store_multicast_router);</div><div class='hunk'>@@ -320,9 +326,6 @@ static ssize_t brport_store(struct kobject *kobj,</div><div class='ctx'> 	if (!rtnl_trylock())</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='del'>-	if (!p-&gt;dev || !p-&gt;br)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='ctx'> 	if (brport_attr-&gt;store_raw) {</div><div class='ctx'> 		char *buf_copy;</div><div class='ctx'> </div><div class='hunk'>@@ -381,7 +384,7 @@ int br_sysfs_addif(struct net_bridge_port *p)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(p-&gt;sysfs_name, p-&gt;dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	strscpy(p-&gt;sysfs_name, p-&gt;dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	return sysfs_create_link(br-&gt;ifobj, &amp;p-&gt;kobj, p-&gt;sysfs_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +406,7 @@ int br_sysfs_renameif(struct net_bridge_port *p)</div><div class='ctx'> 		netdev_notice(br-&gt;dev, "unable to rename link %s to %s",</div><div class='ctx'> 			      p-&gt;sysfs_name, p-&gt;dev-&gt;name);</div><div class='ctx'> 	else</div><div class='del'>-		strlcpy(p-&gt;sysfs_name, p-&gt;dev-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(p-&gt;sysfs_name, p-&gt;dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c<br/>index 7df269092103..ce72b837ff8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_vlan.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_vlan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_vlan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_vlan.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='hunk'>@@ -7,6 +8,8 @@</div><div class='ctx'> #include "br_private.h"</div><div class='ctx'> #include "br_private_tunnel.h"</div><div class='ctx'> </div><div class='add'>+static void nbp_vlan_set_vlan_dev_state(struct net_bridge_port *p, u16 vid);</div><div class='add'>+</div><div class='ctx'> static inline int br_vlan_cmp(struct rhashtable_compare_arg *arg,</div><div class='ctx'> 			      const void *ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -21,7 +24,6 @@ static const struct rhashtable_params br_vlan_rht_params = {</div><div class='ctx'> 	.key_offset = offsetof(struct net_bridge_vlan, vid),</div><div class='ctx'> 	.key_len = sizeof(u16),</div><div class='ctx'> 	.nelem_hint = 3,</div><div class='del'>-	.locks_mul = 1,</div><div class='ctx'> 	.max_size = VLAN_N_VID,</div><div class='ctx'> 	.obj_cmpfn = br_vlan_cmp,</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='hunk'>@@ -32,64 +34,85 @@ static struct net_bridge_vlan *br_vlan_lookup(struct rhashtable *tbl, u16 vid)</div><div class='ctx'> 	return rhashtable_lookup_fast(tbl, &amp;vid, br_vlan_rht_params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __vlan_add_pvid(struct net_bridge_vlan_group *vg, u16 vid)</div><div class='add'>+static void __vlan_add_pvid(struct net_bridge_vlan_group *vg,</div><div class='add'>+			    const struct net_bridge_vlan *v)</div><div class='ctx'> {</div><div class='del'>-	if (vg-&gt;pvid == vid)</div><div class='del'>-		return false;</div><div class='add'>+	if (vg-&gt;pvid == v-&gt;vid)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='del'>-	vg-&gt;pvid = vid;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	br_vlan_set_pvid_state(vg, v-&gt;state);</div><div class='add'>+	vg-&gt;pvid = v-&gt;vid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __vlan_delete_pvid(struct net_bridge_vlan_group *vg, u16 vid)</div><div class='add'>+static void __vlan_delete_pvid(struct net_bridge_vlan_group *vg, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	if (vg-&gt;pvid != vid)</div><div class='del'>-		return false;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	vg-&gt;pvid = 0;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* return true if anything changed, false otherwise */</div><div class='del'>-static bool __vlan_add_flags(struct net_bridge_vlan *v, u16 flags)</div><div class='add'>+/* Update the BRIDGE_VLAN_INFO_PVID and BRIDGE_VLAN_INFO_UNTAGGED flags of @v.</div><div class='add'>+ * If @commit is false, return just whether the BRIDGE_VLAN_INFO_PVID and</div><div class='add'>+ * BRIDGE_VLAN_INFO_UNTAGGED bits of @flags would produce any change onto @v.</div><div class='add'>+ */</div><div class='add'>+static bool __vlan_flags_update(struct net_bridge_vlan *v, u16 flags,</div><div class='add'>+				bool commit)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='del'>-	u16 old_flags = v-&gt;flags;</div><div class='del'>-	bool ret;</div><div class='add'>+	bool change;</div><div class='ctx'> </div><div class='ctx'> 	if (br_vlan_is_master(v))</div><div class='ctx'> 		vg = br_vlan_group(v-&gt;br);</div><div class='ctx'> 	else</div><div class='ctx'> 		vg = nbp_vlan_group(v-&gt;port);</div><div class='ctx'> </div><div class='add'>+	/* check if anything would be changed on commit */</div><div class='add'>+	change = !!(flags &amp; BRIDGE_VLAN_INFO_PVID) == !!(vg-&gt;pvid != v-&gt;vid) ||</div><div class='add'>+		 ((flags ^ v-&gt;flags) &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+</div><div class='add'>+	if (!commit)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='del'>-		ret = __vlan_add_pvid(vg, v-&gt;vid);</div><div class='add'>+		__vlan_add_pvid(vg, v);</div><div class='ctx'> 	else</div><div class='del'>-		ret = __vlan_delete_pvid(vg, v-&gt;vid);</div><div class='add'>+		__vlan_delete_pvid(vg, v-&gt;vid);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BRIDGE_VLAN_INFO_UNTAGGED)</div><div class='ctx'> 		v-&gt;flags |= BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	else</div><div class='ctx'> 		v-&gt;flags &amp;= ~BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> </div><div class='del'>-	return ret || !!(old_flags ^ v-&gt;flags);</div><div class='add'>+out:</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __vlan_flags_would_change(struct net_bridge_vlan *v, u16 flags)</div><div class='add'>+{</div><div class='add'>+	return __vlan_flags_update(v, flags, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __vlan_flags_commit(struct net_bridge_vlan *v, u16 flags)</div><div class='add'>+{</div><div class='add'>+	__vlan_flags_update(v, flags, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,</div><div class='del'>-			  u16 vid, u16 flags)</div><div class='add'>+			  struct net_bridge_vlan *v, u16 flags,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Try switchdev op first. In case it is not supported, fallback to</div><div class='ctx'> 	 * 8021q add.</div><div class='ctx'> 	 */</div><div class='del'>-	err = br_switchdev_port_vlan_add(dev, vid, flags);</div><div class='add'>+	err = br_switchdev_port_vlan_add(dev, v-&gt;vid, flags, false, extack);</div><div class='ctx'> 	if (err == -EOPNOTSUPP)</div><div class='del'>-		return vlan_vid_add(dev, br-&gt;vlan_proto, vid);</div><div class='add'>+		return vlan_vid_add(dev, br-&gt;vlan_proto, v-&gt;vid);</div><div class='add'>+	v-&gt;priv_flags |= BR_VLFLAG_ADDED_BY_SWITCHDEV;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -107,9 +130,7 @@ static void __vlan_add_list(struct net_bridge_vlan *v)</div><div class='ctx'> 	headp = &amp;vg-&gt;vlan_list;</div><div class='ctx'> 	list_for_each_prev(hpos, headp) {</div><div class='ctx'> 		vent = list_entry(hpos, struct net_bridge_vlan, vlist);</div><div class='del'>-		if (v-&gt;vid &lt; vent-&gt;vid)</div><div class='del'>-			continue;</div><div class='del'>-		else</div><div class='add'>+		if (v-&gt;vid &gt;= vent-&gt;vid)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_add_rcu(&amp;v-&gt;vlist, hpos);</div><div class='hunk'>@@ -121,25 +142,25 @@ static void __vlan_del_list(struct net_bridge_vlan *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,</div><div class='del'>-			  u16 vid)</div><div class='add'>+			  const struct net_bridge_vlan *v)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Try switchdev op first. In case it is not supported, fallback to</div><div class='ctx'> 	 * 8021q del.</div><div class='ctx'> 	 */</div><div class='del'>-	err = br_switchdev_port_vlan_del(dev, vid);</div><div class='del'>-	if (err == -EOPNOTSUPP) {</div><div class='del'>-		vlan_vid_del(dev, br-&gt;vlan_proto, vid);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	err = br_switchdev_port_vlan_del(dev, v-&gt;vid);</div><div class='add'>+	if (!(v-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV))</div><div class='add'>+		vlan_vid_del(dev, br-&gt;vlan_proto, v-&gt;vid);</div><div class='add'>+	return err == -EOPNOTSUPP ? 0 : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns a master vlan, if it didn't exist it gets created. In all cases a</div><div class='add'>+/* Returns a master vlan, if it didn't exist it gets created. In all cases</div><div class='ctx'>  * a reference is taken to the master vlan before returning.</div><div class='ctx'>  */</div><div class='del'>-static struct net_bridge_vlan *br_vlan_get_master(struct net_bridge *br, u16 vid)</div><div class='add'>+static struct net_bridge_vlan *</div><div class='add'>+br_vlan_get_master(struct net_bridge *br, u16 vid,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_vlan *masterv;</div><div class='hunk'>@@ -150,7 +171,7 @@ static struct net_bridge_vlan *br_vlan_get_master(struct net_bridge *br, u16 vid</div><div class='ctx'> 		bool changed;</div><div class='ctx'> </div><div class='ctx'> 		/* missing global ctx, create it now */</div><div class='del'>-		if (br_vlan_add(br, vid, 0, &amp;changed))</div><div class='add'>+		if (br_vlan_add(br, vid, 0, &amp;changed, extack))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		masterv = br_vlan_find(vg, vid);</div><div class='ctx'> 		if (WARN_ON(!masterv))</div><div class='hunk'>@@ -186,10 +207,43 @@ static void br_vlan_put_master(struct net_bridge_vlan *masterv)</div><div class='ctx'> 		rhashtable_remove_fast(&amp;vg-&gt;vlan_hash,</div><div class='ctx'> 				       &amp;masterv-&gt;vnode, br_vlan_rht_params);</div><div class='ctx'> 		__vlan_del_list(masterv);</div><div class='add'>+		br_multicast_toggle_one_vlan(masterv, false);</div><div class='add'>+		br_multicast_ctx_deinit(&amp;masterv-&gt;br_mcast_ctx);</div><div class='ctx'> 		call_rcu(&amp;masterv-&gt;rcu, br_master_vlan_rcu_free);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nbp_vlan_rcu_free(struct rcu_head *rcu)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+	v = container_of(rcu, struct net_bridge_vlan, rcu);</div><div class='add'>+	WARN_ON(br_vlan_is_master(v));</div><div class='add'>+	/* if we had per-port stats configured then free them here */</div><div class='add'>+	if (v-&gt;priv_flags &amp; BR_VLFLAG_PER_PORT_STATS)</div><div class='add'>+		free_percpu(v-&gt;stats);</div><div class='add'>+	v-&gt;stats = NULL;</div><div class='add'>+	kfree(v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_init_state(struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_master(v))</div><div class='add'>+		br = v-&gt;br;</div><div class='add'>+	else</div><div class='add'>+		br = v-&gt;port-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_MST_ENABLED)) {</div><div class='add'>+		br_mst_vlan_init_state(v);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	v-&gt;msti = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This is the shared VLAN add function which works for both ports and bridge</div><div class='ctx'>  * devices. There are four possible calls to this function in terms of the</div><div class='ctx'>  * vlan entry type:</div><div class='hunk'>@@ -201,7 +255,8 @@ static void br_vlan_put_master(struct net_bridge_vlan *masterv)</div><div class='ctx'>  * 4. same as 3 but with both master and brentry flags set so the entry</div><div class='ctx'>  *    will be used for filtering in both the port and the bridge</div><div class='ctx'>  */</div><div class='del'>-static int __vlan_add(struct net_bridge_vlan *v, u16 flags)</div><div class='add'>+static int __vlan_add(struct net_bridge_vlan *v, u16 flags,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan *masterv = NULL;</div><div class='ctx'> 	struct net_bridge_port *p = NULL;</div><div class='hunk'>@@ -226,7 +281,7 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)</div><div class='ctx'> 		 * This ensures tagged traffic enters the bridge when</div><div class='ctx'> 		 * promiscuous mode is disabled by br_manage_promisc().</div><div class='ctx'> 		 */</div><div class='del'>-		err = __vlan_vid_add(dev, br, v-&gt;vid, flags);</div><div class='add'>+		err = __vlan_vid_add(dev, br, v, flags, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -236,39 +291,70 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)</div><div class='ctx'> </div><div class='ctx'> 			err = br_vlan_add(br, v-&gt;vid,</div><div class='ctx'> 					  flags | BRIDGE_VLAN_INFO_BRENTRY,</div><div class='del'>-					  &amp;changed);</div><div class='add'>+					  &amp;changed, extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out_filt;</div><div class='add'>+</div><div class='add'>+			if (changed)</div><div class='add'>+				br_vlan_notify(br, NULL, v-&gt;vid, 0,</div><div class='add'>+					       RTM_NEWVLAN);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		masterv = br_vlan_get_master(br, v-&gt;vid);</div><div class='del'>-		if (!masterv)</div><div class='add'>+		masterv = br_vlan_get_master(br, v-&gt;vid, extack);</div><div class='add'>+		if (!masterv) {</div><div class='add'>+			err = -ENOMEM;</div><div class='ctx'> 			goto out_filt;</div><div class='add'>+		}</div><div class='ctx'> 		v-&gt;brvlan = masterv;</div><div class='del'>-		v-&gt;stats = masterv-&gt;stats;</div><div class='add'>+		if (br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)) {</div><div class='add'>+			v-&gt;stats =</div><div class='add'>+			     netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='add'>+			if (!v-&gt;stats) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto out_filt;</div><div class='add'>+			}</div><div class='add'>+			v-&gt;priv_flags |= BR_VLFLAG_PER_PORT_STATS;</div><div class='add'>+		} else {</div><div class='add'>+			v-&gt;stats = masterv-&gt;stats;</div><div class='add'>+		}</div><div class='add'>+		br_multicast_port_ctx_init(p, v, &amp;v-&gt;port_mcast_ctx);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = br_switchdev_port_vlan_add(dev, v-&gt;vid, flags);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			goto out;</div><div class='add'>+		if (br_vlan_should_use(v)) {</div><div class='add'>+			err = br_switchdev_port_vlan_add(dev, v-&gt;vid, flags,</div><div class='add'>+							 false, extack);</div><div class='add'>+			if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		br_multicast_ctx_init(br, v, &amp;v-&gt;br_mcast_ctx);</div><div class='add'>+		v-&gt;priv_flags |= BR_VLFLAG_GLOBAL_MCAST_ENABLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Add the dev mac and count the vlan only if it's usable */</div><div class='ctx'> 	if (br_vlan_should_use(v)) {</div><div class='del'>-		err = br_fdb_insert(br, p, dev-&gt;dev_addr, v-&gt;vid);</div><div class='del'>-		if (err) {</div><div class='del'>-			br_err(br, "failed insert local address into bridge forwarding table\n");</div><div class='del'>-			goto out_filt;</div><div class='add'>+		if (!br_opt_get(br, BROPT_FDB_LOCAL_VLAN_0)) {</div><div class='add'>+			err = br_fdb_add_local(br, p, dev-&gt;dev_addr, v-&gt;vid);</div><div class='add'>+			if (err) {</div><div class='add'>+				br_err(br, "failed insert local address into bridge forwarding table\n");</div><div class='add'>+				goto out_filt;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		vg-&gt;num_vlans++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set the state before publishing */</div><div class='add'>+	br_vlan_init_state(v);</div><div class='add'>+</div><div class='ctx'> 	err = rhashtable_lookup_insert_fast(&amp;vg-&gt;vlan_hash, &amp;v-&gt;vnode,</div><div class='ctx'> 					    br_vlan_rht_params);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_fdb_insert;</div><div class='ctx'> </div><div class='ctx'> 	__vlan_add_list(v);</div><div class='del'>-	__vlan_add_flags(v, flags);</div><div class='add'>+	__vlan_flags_commit(v, flags);</div><div class='add'>+	br_multicast_toggle_one_vlan(v, true);</div><div class='add'>+</div><div class='add'>+	if (p)</div><div class='add'>+		nbp_vlan_set_vlan_dev_state(p, v-&gt;vid);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -280,8 +366,12 @@ out_fdb_insert:</div><div class='ctx'> </div><div class='ctx'> out_filt:</div><div class='ctx'> 	if (p) {</div><div class='del'>-		__vlan_vid_del(dev, br, v-&gt;vid);</div><div class='add'>+		__vlan_vid_del(dev, br, v);</div><div class='ctx'> 		if (masterv) {</div><div class='add'>+			if (v-&gt;stats &amp;&amp; masterv-&gt;stats != v-&gt;stats)</div><div class='add'>+				free_percpu(v-&gt;stats);</div><div class='add'>+			v-&gt;stats = NULL;</div><div class='add'>+</div><div class='ctx'> 			br_vlan_put_master(masterv);</div><div class='ctx'> 			v-&gt;brvlan = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -309,7 +399,7 @@ static int __vlan_del(struct net_bridge_vlan *v)</div><div class='ctx'> </div><div class='ctx'> 	__vlan_delete_pvid(vg, v-&gt;vid);</div><div class='ctx'> 	if (p) {</div><div class='del'>-		err = __vlan_vid_del(p-&gt;dev, p-&gt;br, v-&gt;vid);</div><div class='add'>+		err = __vlan_vid_del(p-&gt;dev, p-&gt;br, v);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -329,7 +419,10 @@ static int __vlan_del(struct net_bridge_vlan *v)</div><div class='ctx'> 		rhashtable_remove_fast(&amp;vg-&gt;vlan_hash, &amp;v-&gt;vnode,</div><div class='ctx'> 				       br_vlan_rht_params);</div><div class='ctx'> 		__vlan_del_list(v);</div><div class='del'>-		kfree_rcu(v, rcu);</div><div class='add'>+		nbp_vlan_set_vlan_dev_state(p, v-&gt;vid);</div><div class='add'>+		br_multicast_toggle_one_vlan(v, false);</div><div class='add'>+		br_multicast_port_ctx_deinit(&amp;v-&gt;port_mcast_ctx);</div><div class='add'>+		call_rcu(&amp;v-&gt;rcu, nbp_vlan_rcu_free);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	br_vlan_put_master(masterv);</div><div class='hunk'>@@ -345,13 +438,38 @@ static void __vlan_group_free(struct net_bridge_vlan_group *vg)</div><div class='ctx'> 	kfree(vg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __vlan_flush(struct net_bridge_vlan_group *vg)</div><div class='add'>+static void __vlan_flush(const struct net_bridge *br,</div><div class='add'>+			 const struct net_bridge_port *p,</div><div class='add'>+			 struct net_bridge_vlan_group *vg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan *vlan, *tmp;</div><div class='add'>+	u16 v_start = 0, v_end = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	__vlan_delete_pvid(vg, vg-&gt;pvid);</div><div class='del'>-	list_for_each_entry_safe(vlan, tmp, &amp;vg-&gt;vlan_list, vlist)</div><div class='del'>-		__vlan_del(vlan);</div><div class='add'>+	list_for_each_entry_safe(vlan, tmp, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		/* take care of disjoint ranges */</div><div class='add'>+		if (!v_start) {</div><div class='add'>+			v_start = vlan-&gt;vid;</div><div class='add'>+		} else if (vlan-&gt;vid - v_end != 1) {</div><div class='add'>+			/* found range end, notify and start next one */</div><div class='add'>+			br_vlan_notify(br, p, v_start, v_end, RTM_DELVLAN);</div><div class='add'>+			v_start = vlan-&gt;vid;</div><div class='add'>+		}</div><div class='add'>+		v_end = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+		err = __vlan_del(vlan);</div><div class='add'>+		if (err) {</div><div class='add'>+			br_err(br,</div><div class='add'>+			       "port %u(%s) failed to delete vlan %d: %pe\n",</div><div class='add'>+			       (unsigned int) p-&gt;port_no, p-&gt;dev-&gt;name,</div><div class='add'>+			       vlan-&gt;vid, ERR_PTR(err));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* notify about the last/whole vlan range */</div><div class='add'>+	if (v_start)</div><div class='add'>+		br_vlan_notify(br, p, v_start, v_end, RTM_DELVLAN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *br_handle_vlan(struct net_bridge *br,</div><div class='hunk'>@@ -359,7 +477,7 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,</div><div class='ctx'> 			       struct net_bridge_vlan_group *vg,</div><div class='ctx'> 			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct br_vlan_stats *stats;</div><div class='add'>+	struct pcpu_sw_netstats *stats;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> </div><div class='hunk'>@@ -386,16 +504,24 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (br-&gt;vlan_stats_enabled) {</div><div class='add'>+	if (br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) {</div><div class='ctx'> 		stats = this_cpu_ptr(v-&gt;stats);</div><div class='ctx'> 		u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='del'>-		stats-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-		stats-&gt;tx_packets++;</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;tx_bytes, skb-&gt;len);</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;tx_packets);</div><div class='ctx'> 		u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (v-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED)</div><div class='del'>-		skb-&gt;vlan_tci = 0;</div><div class='add'>+	/* If the skb will be sent using forwarding offload, the assumption is</div><div class='add'>+	 * that the switchdev will inject the packet into hardware together</div><div class='add'>+	 * with the bridge VLAN, so that it can be forwarded according to that</div><div class='add'>+	 * VLAN. The switchdev should deal with popping the VLAN header in</div><div class='add'>+	 * hardware on each egress port as appropriate. So only strip the VLAN</div><div class='add'>+	 * header if forwarding offload is not being used.</div><div class='add'>+	 */</div><div class='add'>+	if (v-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED &amp;&amp;</div><div class='add'>+	    !br_switchdev_frame_uses_tx_fwd_offload(skb))</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (p &amp;&amp; (p-&gt;flags &amp; BR_VLAN_TUNNEL) &amp;&amp;</div><div class='ctx'> 	    br_handle_egress_vlan_tunnel(skb, v)) {</div><div class='hunk'>@@ -409,9 +535,11 @@ out:</div><div class='ctx'> /* Called under RCU */</div><div class='ctx'> static bool __allowed_ingress(const struct net_bridge *br,</div><div class='ctx'> 			      struct net_bridge_vlan_group *vg,</div><div class='del'>-			      struct sk_buff *skb, u16 *vid)</div><div class='add'>+			      struct sk_buff *skb, u16 *vid,</div><div class='add'>+			      u8 *state,</div><div class='add'>+			      struct net_bridge_vlan **vlan)</div><div class='ctx'> {</div><div class='del'>-	struct br_vlan_stats *stats;</div><div class='add'>+	struct pcpu_sw_netstats *stats;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='ctx'> 	bool tagged;</div><div class='ctx'> </div><div class='hunk'>@@ -468,28 +596,43 @@ static bool __allowed_ingress(const struct net_bridge *br,</div><div class='ctx'> 			__vlan_hwaccel_put_tag(skb, br-&gt;vlan_proto, pvid);</div><div class='ctx'> 		else</div><div class='ctx'> 			/* Priority-tagged Frame.</div><div class='del'>-			 * At this point, We know that skb-&gt;vlan_tci had</div><div class='del'>-			 * VLAN_TAG_PRESENT bit and its VID field was 0x000.</div><div class='add'>+			 * At this point, we know that skb-&gt;vlan_tci VID</div><div class='add'>+			 * field was 0.</div><div class='ctx'> 			 * We update only VID field and preserve PCP field.</div><div class='ctx'> 			 */</div><div class='ctx'> 			skb-&gt;vlan_tci |= pvid;</div><div class='ctx'> </div><div class='del'>-		/* if stats are disabled we can avoid the lookup */</div><div class='del'>-		if (!br-&gt;vlan_stats_enabled)</div><div class='add'>+		/* if snooping and stats are disabled we can avoid the lookup */</div><div class='add'>+		if (!br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) &amp;&amp;</div><div class='add'>+		    !br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) {</div><div class='add'>+			if (*state == BR_STATE_FORWARDING) {</div><div class='add'>+				*state = br_vlan_get_pvid_state(vg);</div><div class='add'>+				if (!br_vlan_state_allowed(*state, true))</div><div class='add'>+					goto drop;</div><div class='add'>+			}</div><div class='ctx'> 			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	v = br_vlan_find(vg, *vid);</div><div class='ctx'> 	if (!v || !br_vlan_should_use(v))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;vlan_stats_enabled) {</div><div class='add'>+	if (*state == BR_STATE_FORWARDING) {</div><div class='add'>+		*state = br_vlan_get_state(v);</div><div class='add'>+		if (!br_vlan_state_allowed(*state, true))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) {</div><div class='ctx'> 		stats = this_cpu_ptr(v-&gt;stats);</div><div class='ctx'> 		u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='del'>-		stats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_bytes, skb-&gt;len);</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;rx_packets);</div><div class='ctx'> 		u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	*vlan = v;</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='hunk'>@@ -499,17 +642,19 @@ drop:</div><div class='ctx'> </div><div class='ctx'> bool br_allowed_ingress(const struct net_bridge *br,</div><div class='ctx'> 			struct net_bridge_vlan_group *vg, struct sk_buff *skb,</div><div class='del'>-			u16 *vid)</div><div class='add'>+			u16 *vid, u8 *state,</div><div class='add'>+			struct net_bridge_vlan **vlan)</div><div class='ctx'> {</div><div class='ctx'> 	/* If VLAN filtering is disabled on the bridge, all packets are</div><div class='ctx'> 	 * permitted.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!br-&gt;vlan_enabled) {</div><div class='add'>+	*vlan = NULL;</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED)) {</div><div class='ctx'> 		BR_INPUT_SKB_CB(skb)-&gt;vlan_filtered = false;</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __allowed_ingress(br, vg, skb, vid);</div><div class='add'>+	return __allowed_ingress(br, vg, skb, vid, state, vlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called under RCU. */</div><div class='hunk'>@@ -525,7 +670,8 @@ bool br_allowed_egress(struct net_bridge_vlan_group *vg,</div><div class='ctx'> </div><div class='ctx'> 	br_vlan_get_tag(skb, &amp;vid);</div><div class='ctx'> 	v = br_vlan_find(vg, vid);</div><div class='del'>-	if (v &amp;&amp; br_vlan_should_use(v))</div><div class='add'>+	if (v &amp;&amp; br_vlan_should_use(v) &amp;&amp;</div><div class='add'>+	    br_vlan_state_allowed(br_vlan_get_state(v), false))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -536,9 +682,10 @@ bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge *br = p-&gt;br;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='ctx'> </div><div class='ctx'> 	/* If filtering was disabled at input, let it pass. */</div><div class='del'>-	if (!br-&gt;vlan_enabled)</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	vg = nbp_vlan_group_rcu(p);</div><div class='hunk'>@@ -550,13 +697,15 @@ bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid)</div><div class='ctx'> </div><div class='ctx'> 	if (!*vid) {</div><div class='ctx'> 		*vid = br_get_pvid(vg);</div><div class='del'>-		if (!*vid)</div><div class='add'>+		if (!*vid ||</div><div class='add'>+		    !br_vlan_state_allowed(br_vlan_get_pvid_state(vg), true))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (br_vlan_find(vg, *vid))</div><div class='add'>+	v = br_vlan_find(vg, *vid);</div><div class='add'>+	if (v &amp;&amp; br_vlan_state_allowed(br_vlan_get_state(v), true))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -565,23 +714,36 @@ bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid)</div><div class='ctx'> static int br_vlan_add_existing(struct net_bridge *br,</div><div class='ctx'> 				struct net_bridge_vlan_group *vg,</div><div class='ctx'> 				struct net_bridge_vlan *vlan,</div><div class='del'>-				u16 flags, bool *changed)</div><div class='add'>+				u16 flags, bool *changed,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	bool becomes_brentry = false;</div><div class='add'>+	bool would_change = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = br_switchdev_port_vlan_add(br-&gt;dev, vlan-&gt;vid, flags);</div><div class='del'>-	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	if (!br_vlan_is_brentry(vlan)) {</div><div class='ctx'> 		/* Trying to change flags of non-existent bridge vlan */</div><div class='del'>-		if (!(flags &amp; BRIDGE_VLAN_INFO_BRENTRY)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto err_flags;</div><div class='del'>-		}</div><div class='add'>+		if (!(flags &amp; BRIDGE_VLAN_INFO_BRENTRY))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		becomes_brentry = true;</div><div class='add'>+	} else {</div><div class='add'>+		would_change = __vlan_flags_would_change(vlan, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Master VLANs that aren't brentries weren't notified before,</div><div class='add'>+	 * time to notify them now.</div><div class='add'>+	 */</div><div class='add'>+	if (becomes_brentry || would_change) {</div><div class='add'>+		err = br_switchdev_port_vlan_add(br-&gt;dev, vlan-&gt;vid, flags,</div><div class='add'>+						 would_change, extack);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (becomes_brentry) {</div><div class='ctx'> 		/* It was only kept for port vlans, now make it real */</div><div class='del'>-		err = br_fdb_insert(br, NULL, br-&gt;dev-&gt;dev_addr,</div><div class='del'>-				    vlan-&gt;vid);</div><div class='add'>+		err = br_fdb_add_local(br, NULL, br-&gt;dev-&gt;dev_addr, vlan-&gt;vid);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			br_err(br, "failed to insert local address into bridge forwarding table\n");</div><div class='ctx'> 			goto err_fdb_insert;</div><div class='hunk'>@@ -591,15 +753,16 @@ static int br_vlan_add_existing(struct net_bridge *br,</div><div class='ctx'> 		vlan-&gt;flags |= BRIDGE_VLAN_INFO_BRENTRY;</div><div class='ctx'> 		vg-&gt;num_vlans++;</div><div class='ctx'> 		*changed = true;</div><div class='add'>+		br_multicast_toggle_one_vlan(vlan, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (__vlan_add_flags(vlan, flags))</div><div class='add'>+	__vlan_flags_commit(vlan, flags);</div><div class='add'>+	if (would_change)</div><div class='ctx'> 		*changed = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_fdb_insert:</div><div class='del'>-err_flags:</div><div class='ctx'> 	br_switchdev_port_vlan_del(br-&gt;dev, vlan-&gt;vid);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -608,7 +771,8 @@ err_flags:</div><div class='ctx'>  * Must be called with vid in range from 1 to 4094 inclusive.</div><div class='ctx'>  * changed must be true only if the vlan was created or updated</div><div class='ctx'>  */</div><div class='del'>-int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags, bool *changed)</div><div class='add'>+int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags, bool *changed,</div><div class='add'>+		struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_vlan *vlan;</div><div class='hunk'>@@ -620,13 +784,14 @@ int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags, bool *changed)</div><div class='ctx'> 	vg = br_vlan_group(br);</div><div class='ctx'> 	vlan = br_vlan_find(vg, vid);</div><div class='ctx'> 	if (vlan)</div><div class='del'>-		return br_vlan_add_existing(br, vg, vlan, flags, changed);</div><div class='add'>+		return br_vlan_add_existing(br, vg, vlan, flags, changed,</div><div class='add'>+					    extack);</div><div class='ctx'> </div><div class='ctx'> 	vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	vlan-&gt;stats = netdev_alloc_pcpu_stats(struct br_vlan_stats);</div><div class='add'>+	vlan-&gt;stats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='ctx'> 	if (!vlan-&gt;stats) {</div><div class='ctx'> 		kfree(vlan);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -637,7 +802,7 @@ int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags, bool *changed)</div><div class='ctx'> 	vlan-&gt;br = br;</div><div class='ctx'> 	if (flags &amp; BRIDGE_VLAN_INFO_BRENTRY)</div><div class='ctx'> 		refcount_set(&amp;vlan-&gt;refcnt, 1);</div><div class='del'>-	ret = __vlan_add(vlan, flags);</div><div class='add'>+	ret = __vlan_add(vlan, flags, extack);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		free_percpu(vlan-&gt;stats);</div><div class='ctx'> 		kfree(vlan);</div><div class='hunk'>@@ -678,9 +843,9 @@ void br_vlan_flush(struct net_bridge *br)</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	vg = br_vlan_group(br);</div><div class='del'>-	__vlan_flush(vg);</div><div class='add'>+	__vlan_flush(br, NULL, vg);</div><div class='ctx'> 	RCU_INIT_POINTER(br-&gt;vlgrp, NULL);</div><div class='del'>-	synchronize_rcu();</div><div class='add'>+	synchronize_net();</div><div class='ctx'> 	__vlan_group_free(vg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -695,11 +860,12 @@ struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid)</div><div class='ctx'> /* Must be protected by RTNL. */</div><div class='ctx'> static void recalculate_group_addr(struct net_bridge *br)</div><div class='ctx'> {</div><div class='del'>-	if (br-&gt;group_addr_set)</div><div class='add'>+	if (br_opt_get(br, BROPT_GROUP_ADDR_SET))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;br-&gt;lock);</div><div class='del'>-	if (!br-&gt;vlan_enabled || br-&gt;vlan_proto == htons(ETH_P_8021Q)) {</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED) ||</div><div class='add'>+	    br-&gt;vlan_proto == htons(ETH_P_8021Q)) {</div><div class='ctx'> 		/* Bridge Group Address */</div><div class='ctx'> 		br-&gt;group_addr[5] = 0x00;</div><div class='ctx'> 	} else { /* vlan_enabled &amp;&amp; ETH_P_8021AD */</div><div class='hunk'>@@ -712,14 +878,16 @@ static void recalculate_group_addr(struct net_bridge *br)</div><div class='ctx'> /* Must be protected by RTNL. */</div><div class='ctx'> void br_recalculate_fwd_mask(struct net_bridge *br)</div><div class='ctx'> {</div><div class='del'>-	if (!br-&gt;vlan_enabled || br-&gt;vlan_proto == htons(ETH_P_8021Q))</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED) ||</div><div class='add'>+	    br-&gt;vlan_proto == htons(ETH_P_8021Q))</div><div class='ctx'> 		br-&gt;group_fwd_mask_required = BR_GROUPFWD_DEFAULT;</div><div class='ctx'> 	else /* vlan_enabled &amp;&amp; ETH_P_8021AD */</div><div class='ctx'> 		br-&gt;group_fwd_mask_required = BR_GROUPFWD_8021AD &amp;</div><div class='ctx'> 					      ~(1u &lt;&lt; br-&gt;group_addr[5]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct switchdev_attr attr = {</div><div class='ctx'> 		.orig_dev = br-&gt;dev,</div><div class='hunk'>@@ -729,56 +897,80 @@ int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (br-&gt;vlan_enabled == val)</div><div class='add'>+	if (br_opt_get(br, BROPT_VLAN_ENABLED) == !!val)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = switchdev_port_attr_set(br-&gt;dev, &amp;attr);</div><div class='del'>-	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+	br_opt_toggle(br, BROPT_VLAN_ENABLED, !!val);</div><div class='add'>+</div><div class='add'>+	err = switchdev_port_attr_set(br-&gt;dev, &amp;attr, extack);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='add'>+		br_opt_toggle(br, BROPT_VLAN_ENABLED, !val);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	br-&gt;vlan_enabled = val;</div><div class='ctx'> 	br_manage_promisc(br);</div><div class='ctx'> 	recalculate_group_addr(br);</div><div class='ctx'> 	br_recalculate_fwd_mask(br);</div><div class='add'>+	if (!val &amp;&amp; br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {</div><div class='add'>+		br_info(br, "vlan filtering disabled, automatically disabling multicast vlan snooping\n");</div><div class='add'>+		br_multicast_toggle_vlan_snooping(br, false, NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)</div><div class='add'>+bool br_vlan_enabled(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __br_vlan_filter_toggle(br, val);</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return br_opt_get(br, BROPT_VLAN_ENABLED);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(br_vlan_enabled);</div><div class='ctx'> </div><div class='del'>-bool br_vlan_enabled(const struct net_device *dev)</div><div class='add'>+int br_vlan_get_proto(const struct net_device *dev, u16 *p_proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge *br = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return !!br-&gt;vlan_enabled;</div><div class='add'>+	*p_proto = ntohs(br-&gt;vlan_proto);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(br_vlan_enabled);</div><div class='add'>+EXPORT_SYMBOL_GPL(br_vlan_get_proto);</div><div class='ctx'> </div><div class='del'>-int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)</div><div class='add'>+int __br_vlan_set_proto(struct net_bridge *br, __be16 proto,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct switchdev_attr attr = {</div><div class='add'>+		.orig_dev = br-&gt;dev,</div><div class='add'>+		.id = SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL,</div><div class='add'>+		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,</div><div class='add'>+		.u.vlan_protocol = ntohs(proto),</div><div class='add'>+	};</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct net_bridge_port *p;</div><div class='ctx'> 	struct net_bridge_vlan *vlan;</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='del'>-	__be16 oldproto;</div><div class='add'>+	__be16 oldproto = br-&gt;vlan_proto;</div><div class='ctx'> </div><div class='ctx'> 	if (br-&gt;vlan_proto == proto)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	err = switchdev_port_attr_set(br-&gt;dev, &amp;attr, extack);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/* Add VLANs for the new proto to the device filter. */</div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='ctx'> 		vg = nbp_vlan_group(p);</div><div class='ctx'> 		list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+			if (vlan-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV)</div><div class='add'>+				continue;</div><div class='ctx'> 			err = vlan_vid_add(p-&gt;dev, proto, vlan-&gt;vid);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto err_filt;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	oldproto = br-&gt;vlan_proto;</div><div class='ctx'> 	br-&gt;vlan_proto = proto;</div><div class='ctx'> </div><div class='ctx'> 	recalculate_group_addr(br);</div><div class='hunk'>@@ -787,31 +979,44 @@ int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)</div><div class='ctx'> 	/* Delete VLANs for the old proto from the device filter. */</div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='ctx'> 		vg = nbp_vlan_group(p);</div><div class='del'>-		list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist)</div><div class='add'>+		list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+			if (vlan-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV)</div><div class='add'>+				continue;</div><div class='ctx'> 			vlan_vid_del(p-&gt;dev, oldproto, vlan-&gt;vid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_filt:</div><div class='del'>-	list_for_each_entry_continue_reverse(vlan, &amp;vg-&gt;vlan_list, vlist)</div><div class='add'>+	attr.u.vlan_protocol = ntohs(oldproto);</div><div class='add'>+	switchdev_port_attr_set(br-&gt;dev, &amp;attr, NULL);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_continue_reverse(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (vlan-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV)</div><div class='add'>+			continue;</div><div class='ctx'> 		vlan_vid_del(p-&gt;dev, proto, vlan-&gt;vid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_continue_reverse(p, &amp;br-&gt;port_list, list) {</div><div class='ctx'> 		vg = nbp_vlan_group(p);</div><div class='del'>-		list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist)</div><div class='add'>+		list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+			if (vlan-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV)</div><div class='add'>+				continue;</div><div class='ctx'> 			vlan_vid_del(p-&gt;dev, proto, vlan-&gt;vid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_vlan_set_proto(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_vlan_set_proto(struct net_bridge *br, unsigned long val,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	if (val != ETH_P_8021Q &amp;&amp; val != ETH_P_8021AD)</div><div class='add'>+	if (!eth_type_vlan(htons(val)))</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	return __br_vlan_set_proto(br, htons(val));</div><div class='add'>+	return __br_vlan_set_proto(br, htons(val), extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_vlan_set_stats(struct net_bridge *br, unsigned long val)</div><div class='hunk'>@@ -819,7 +1024,31 @@ int br_vlan_set_stats(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 	case 1:</div><div class='del'>-		br-&gt;vlan_stats_enabled = val;</div><div class='add'>+		br_opt_toggle(br, BROPT_VLAN_STATS_ENABLED, !!val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_vlan_set_stats_per_port(struct net_bridge *br, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	/* allow to change the option if there are no port vlans configured */</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		struct net_bridge_vlan_group *vg = nbp_vlan_group(p);</div><div class='add'>+</div><div class='add'>+		if (vg-&gt;num_vlans)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+		br_opt_toggle(br, BROPT_VLAN_STATS_PER_PORT, !!val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -851,18 +1080,22 @@ static void br_vlan_disable_default_pvid(struct net_bridge *br)</div><div class='ctx'> 	/* Disable default_pvid on all ports where it is still</div><div class='ctx'> 	 * configured.</div><div class='ctx'> 	 */</div><div class='del'>-	if (vlan_default_pvid(br_vlan_group(br), pvid))</div><div class='del'>-		br_vlan_delete(br, pvid);</div><div class='add'>+	if (vlan_default_pvid(br_vlan_group(br), pvid)) {</div><div class='add'>+		if (!br_vlan_delete(br, pvid))</div><div class='add'>+			br_vlan_notify(br, NULL, pvid, 0, RTM_DELVLAN);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='del'>-		if (vlan_default_pvid(nbp_vlan_group(p), pvid))</div><div class='del'>-			nbp_vlan_delete(p, pvid);</div><div class='add'>+		if (vlan_default_pvid(nbp_vlan_group(p), pvid) &amp;&amp;</div><div class='add'>+		    !nbp_vlan_delete(p, pvid))</div><div class='add'>+			br_vlan_notify(br, p, pvid, 0, RTM_DELVLAN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	br-&gt;default_pvid = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)</div><div class='add'>+int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_bridge_vlan *pvent;</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='hunk'>@@ -877,8 +1110,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),</div><div class='del'>-			  GFP_KERNEL);</div><div class='add'>+	changed = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);</div><div class='ctx'> 	if (!changed)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -895,11 +1127,14 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)</div><div class='ctx'> 				  BRIDGE_VLAN_INFO_PVID |</div><div class='ctx'> 				  BRIDGE_VLAN_INFO_UNTAGGED |</div><div class='ctx'> 				  BRIDGE_VLAN_INFO_BRENTRY,</div><div class='del'>-				  &amp;vlchange);</div><div class='add'>+				  &amp;vlchange, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='del'>-		br_vlan_delete(br, old_pvid);</div><div class='del'>-		set_bit(0, changed);</div><div class='add'>+</div><div class='add'>+		if (br_vlan_delete(br, old_pvid))</div><div class='add'>+			br_vlan_notify(br, NULL, old_pvid, 0, RTM_DELVLAN);</div><div class='add'>+		br_vlan_notify(br, NULL, pvid, 0, RTM_NEWVLAN);</div><div class='add'>+		__set_bit(0, changed);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='hunk'>@@ -915,17 +1150,19 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)</div><div class='ctx'> 		err = nbp_vlan_add(p, pvid,</div><div class='ctx'> 				   BRIDGE_VLAN_INFO_PVID |</div><div class='ctx'> 				   BRIDGE_VLAN_INFO_UNTAGGED,</div><div class='del'>-				   &amp;vlchange);</div><div class='add'>+				   &amp;vlchange, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_port;</div><div class='del'>-		nbp_vlan_delete(p, old_pvid);</div><div class='del'>-		set_bit(p-&gt;port_no, changed);</div><div class='add'>+		if (nbp_vlan_delete(p, old_pvid))</div><div class='add'>+			br_vlan_notify(br, p, old_pvid, 0, RTM_DELVLAN);</div><div class='add'>+		br_vlan_notify(p-&gt;br, p, pvid, 0, RTM_NEWVLAN);</div><div class='add'>+		__set_bit(p-&gt;port_no, changed);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	br-&gt;default_pvid = pvid;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(changed);</div><div class='add'>+	bitmap_free(changed);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> err_port:</div><div class='hunk'>@@ -933,27 +1170,34 @@ err_port:</div><div class='ctx'> 		if (!test_bit(p-&gt;port_no, changed))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (old_pvid)</div><div class='add'>+		if (old_pvid) {</div><div class='ctx'> 			nbp_vlan_add(p, old_pvid,</div><div class='ctx'> 				     BRIDGE_VLAN_INFO_PVID |</div><div class='ctx'> 				     BRIDGE_VLAN_INFO_UNTAGGED,</div><div class='del'>-				     &amp;vlchange);</div><div class='add'>+				     &amp;vlchange, NULL);</div><div class='add'>+			br_vlan_notify(p-&gt;br, p, old_pvid, 0, RTM_NEWVLAN);</div><div class='add'>+		}</div><div class='ctx'> 		nbp_vlan_delete(p, pvid);</div><div class='add'>+		br_vlan_notify(br, p, pvid, 0, RTM_DELVLAN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(0, changed)) {</div><div class='del'>-		if (old_pvid)</div><div class='add'>+		if (old_pvid) {</div><div class='ctx'> 			br_vlan_add(br, old_pvid,</div><div class='ctx'> 				    BRIDGE_VLAN_INFO_PVID |</div><div class='ctx'> 				    BRIDGE_VLAN_INFO_UNTAGGED |</div><div class='ctx'> 				    BRIDGE_VLAN_INFO_BRENTRY,</div><div class='del'>-				    &amp;vlchange);</div><div class='add'>+				    &amp;vlchange, NULL);</div><div class='add'>+			br_vlan_notify(br, NULL, old_pvid, 0, RTM_NEWVLAN);</div><div class='add'>+		}</div><div class='ctx'> 		br_vlan_delete(br, pvid);</div><div class='add'>+		br_vlan_notify(br, NULL, pvid, 0, RTM_DELVLAN);</div><div class='ctx'> 	}</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val)</div><div class='add'>+int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	u16 pvid = val;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -965,12 +1209,12 @@ int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Only allow default pvid change when filtering is disabled */</div><div class='del'>-	if (br-&gt;vlan_enabled) {</div><div class='add'>+	if (br_opt_get(br, BROPT_VLAN_ENABLED)) {</div><div class='ctx'> 		pr_info_once("Please disable vlan filtering to change default_pvid\n");</div><div class='ctx'> 		err = -EPERM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	err = __br_vlan_set_default_pvid(br, pvid);</div><div class='add'>+	err = __br_vlan_set_default_pvid(br, pvid, extack);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -979,7 +1223,6 @@ int br_vlan_init(struct net_bridge *br)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='del'>-	bool changed;</div><div class='ctx'> </div><div class='ctx'> 	vg = kzalloc(sizeof(*vg), GFP_KERNEL);</div><div class='ctx'> 	if (!vg)</div><div class='hunk'>@@ -994,17 +1237,10 @@ int br_vlan_init(struct net_bridge *br)</div><div class='ctx'> 	br-&gt;vlan_proto = htons(ETH_P_8021Q);</div><div class='ctx'> 	br-&gt;default_pvid = 1;</div><div class='ctx'> 	rcu_assign_pointer(br-&gt;vlgrp, vg);</div><div class='del'>-	ret = br_vlan_add(br, 1,</div><div class='del'>-			  BRIDGE_VLAN_INFO_PVID | BRIDGE_VLAN_INFO_UNTAGGED |</div><div class='del'>-			  BRIDGE_VLAN_INFO_BRENTRY, &amp;changed);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_vlan_add;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-err_vlan_add:</div><div class='del'>-	vlan_tunnel_deinit(vg);</div><div class='ctx'> err_tunnel_init:</div><div class='ctx'> 	rhashtable_destroy(&amp;vg-&gt;vlan_hash);</div><div class='ctx'> err_rhtbl:</div><div class='hunk'>@@ -1013,13 +1249,13 @@ err_rhtbl:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nbp_vlan_init(struct net_bridge_port *p)</div><div class='add'>+int nbp_vlan_init(struct net_bridge_port *p, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct switchdev_attr attr = {</div><div class='ctx'> 		.orig_dev = p-&gt;br-&gt;dev,</div><div class='ctx'> 		.id = SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING,</div><div class='ctx'> 		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,</div><div class='del'>-		.u.vlan_filtering = p-&gt;br-&gt;vlan_enabled,</div><div class='add'>+		.u.vlan_filtering = br_opt_get(p-&gt;br, BROPT_VLAN_ENABLED),</div><div class='ctx'> 	};</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='hunk'>@@ -1028,7 +1264,7 @@ int nbp_vlan_init(struct net_bridge_port *p)</div><div class='ctx'> 	if (!vg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = switchdev_port_attr_set(p-&gt;dev, &amp;attr);</div><div class='add'>+	ret = switchdev_port_attr_set(p-&gt;dev, &amp;attr, extack);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EOPNOTSUPP)</div><div class='ctx'> 		goto err_vlan_enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -1046,9 +1282,10 @@ int nbp_vlan_init(struct net_bridge_port *p)</div><div class='ctx'> 		ret = nbp_vlan_add(p, p-&gt;br-&gt;default_pvid,</div><div class='ctx'> 				   BRIDGE_VLAN_INFO_PVID |</div><div class='ctx'> 				   BRIDGE_VLAN_INFO_UNTAGGED,</div><div class='del'>-				   &amp;changed);</div><div class='add'>+				   &amp;changed, extack);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_vlan_add;</div><div class='add'>+		br_vlan_notify(p-&gt;br, p, p-&gt;br-&gt;default_pvid, 0, RTM_NEWVLAN);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1071,7 +1308,7 @@ err_vlan_enabled:</div><div class='ctx'>  * changed must be true only if the vlan was created or updated</div><div class='ctx'>  */</div><div class='ctx'> int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,</div><div class='del'>-		 bool *changed)</div><div class='add'>+		 bool *changed, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan *vlan;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1081,11 +1318,18 @@ int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,</div><div class='ctx'> 	*changed = false;</div><div class='ctx'> 	vlan = br_vlan_find(nbp_vlan_group(port), vid);</div><div class='ctx'> 	if (vlan) {</div><div class='del'>-		/* Pass the flags to the hardware bridge */</div><div class='del'>-		ret = br_switchdev_port_vlan_add(port-&gt;dev, vid, flags);</div><div class='del'>-		if (ret &amp;&amp; ret != -EOPNOTSUPP)</div><div class='del'>-			return ret;</div><div class='del'>-		*changed = __vlan_add_flags(vlan, flags);</div><div class='add'>+		bool would_change = __vlan_flags_would_change(vlan, flags);</div><div class='add'>+</div><div class='add'>+		if (would_change) {</div><div class='add'>+			/* Pass the flags to the hardware bridge */</div><div class='add'>+			ret = br_switchdev_port_vlan_add(port-&gt;dev, vid, flags,</div><div class='add'>+							 true, extack);</div><div class='add'>+			if (ret &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__vlan_flags_commit(vlan, flags);</div><div class='add'>+		*changed = would_change;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1096,7 +1340,7 @@ int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,</div><div class='ctx'> </div><div class='ctx'> 	vlan-&gt;vid = vid;</div><div class='ctx'> 	vlan-&gt;port = port;</div><div class='del'>-	ret = __vlan_add(vlan, flags);</div><div class='add'>+	ret = __vlan_add(vlan, flags, extack);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		kfree(vlan);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1130,45 +1374,49 @@ void nbp_vlan_flush(struct net_bridge_port *port)</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	vg = nbp_vlan_group(port);</div><div class='del'>-	__vlan_flush(vg);</div><div class='add'>+	__vlan_flush(port-&gt;br, port, vg);</div><div class='ctx'> 	RCU_INIT_POINTER(port-&gt;vlgrp, NULL);</div><div class='del'>-	synchronize_rcu();</div><div class='add'>+	synchronize_net();</div><div class='ctx'> 	__vlan_group_free(vg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void br_vlan_get_stats(const struct net_bridge_vlan *v,</div><div class='del'>-		       struct br_vlan_stats *stats)</div><div class='add'>+		       struct pcpu_sw_netstats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(stats, 0, sizeof(*stats));</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		u64 rxpackets, rxbytes, txpackets, txbytes;</div><div class='del'>-		struct br_vlan_stats *cpu_stats;</div><div class='add'>+		struct pcpu_sw_netstats *cpu_stats;</div><div class='ctx'> 		unsigned int start;</div><div class='ctx'> </div><div class='ctx'> 		cpu_stats = per_cpu_ptr(v-&gt;stats, i);</div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;cpu_stats-&gt;syncp);</div><div class='del'>-			rxpackets = cpu_stats-&gt;rx_packets;</div><div class='del'>-			rxbytes = cpu_stats-&gt;rx_bytes;</div><div class='del'>-			txbytes = cpu_stats-&gt;tx_bytes;</div><div class='del'>-			txpackets = cpu_stats-&gt;tx_packets;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;cpu_stats-&gt;syncp, start));</div><div class='del'>-</div><div class='del'>-		stats-&gt;rx_packets += rxpackets;</div><div class='del'>-		stats-&gt;rx_bytes += rxbytes;</div><div class='del'>-		stats-&gt;tx_bytes += txbytes;</div><div class='del'>-		stats-&gt;tx_packets += txpackets;</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			rxpackets = u64_stats_read(&amp;cpu_stats-&gt;rx_packets);</div><div class='add'>+			rxbytes = u64_stats_read(&amp;cpu_stats-&gt;rx_bytes);</div><div class='add'>+			txbytes = u64_stats_read(&amp;cpu_stats-&gt;tx_bytes);</div><div class='add'>+			txpackets = u64_stats_read(&amp;cpu_stats-&gt;tx_packets);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_packets, rxpackets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_bytes, rxbytes);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;tx_bytes, txbytes);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;tx_packets, txpackets);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-	if (netif_is_bridge_master(dev))</div><div class='add'>+	p = br_port_get_check_rtnl(dev);</div><div class='add'>+	if (p)</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+	else if (netif_is_bridge_master(dev))</div><div class='ctx'> 		vg = br_vlan_group(netdev_priv(dev));</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1178,6 +1426,79 @@ int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_vlan_get_pvid);</div><div class='ctx'> </div><div class='add'>+int br_vlan_get_pvid_rcu(const struct net_device *dev, u16 *p_pvid)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	p = br_port_get_check_rcu(dev);</div><div class='add'>+	if (p)</div><div class='add'>+		vg = nbp_vlan_group_rcu(p);</div><div class='add'>+	else if (netif_is_bridge_master(dev))</div><div class='add'>+		vg = br_vlan_group_rcu(netdev_priv(dev));</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*p_pvid = br_get_pvid(vg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_vlan_get_pvid_rcu);</div><div class='add'>+</div><div class='add'>+void br_vlan_fill_forward_path_pvid(struct net_bridge *br,</div><div class='add'>+				    struct net_device_path_ctx *ctx,</div><div class='add'>+				    struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	int idx = ctx-&gt;num_vlans - 1;</div><div class='add'>+	u16 vid;</div><div class='add'>+</div><div class='add'>+	path-&gt;bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vg = br_vlan_group_rcu(br);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= 0 &amp;&amp;</div><div class='add'>+	    ctx-&gt;vlan[idx].proto == br-&gt;vlan_proto) {</div><div class='add'>+		vid = ctx-&gt;vlan[idx].id;</div><div class='add'>+	} else {</div><div class='add'>+		path-&gt;bridge.vlan_mode = DEV_PATH_BR_VLAN_TAG;</div><div class='add'>+		vid = br_get_pvid(vg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path-&gt;bridge.vlan_id = vid;</div><div class='add'>+	path-&gt;bridge.vlan_proto = br-&gt;vlan_proto;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_vlan_fill_forward_path_mode(struct net_bridge *br,</div><div class='add'>+				   struct net_bridge_port *dst,</div><div class='add'>+				   struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(br, BROPT_VLAN_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vg = nbp_vlan_group_rcu(dst);</div><div class='add'>+	v = br_vlan_find(vg, path-&gt;bridge.vlan_id);</div><div class='add'>+	if (!v || !br_vlan_should_use(v))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(v-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (path-&gt;bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG)</div><div class='add'>+		path-&gt;bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;</div><div class='add'>+	else if (v-&gt;priv_flags &amp; BR_VLFLAG_ADDED_BY_SWITCHDEV)</div><div class='add'>+		path-&gt;bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG_HW;</div><div class='add'>+	else</div><div class='add'>+		path-&gt;bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int br_vlan_get_info(const struct net_device *dev, u16 vid,</div><div class='ctx'> 		     struct bridge_vlan_info *p_vinfo)</div><div class='ctx'> {</div><div class='hunk'>@@ -1200,6 +1521,829 @@ int br_vlan_get_info(const struct net_device *dev, u16 vid,</div><div class='ctx'> </div><div class='ctx'> 	p_vinfo-&gt;vid = vid;</div><div class='ctx'> 	p_vinfo-&gt;flags = v-&gt;flags;</div><div class='add'>+	if (vid == br_get_pvid(vg))</div><div class='add'>+		p_vinfo-&gt;flags |= BRIDGE_VLAN_INFO_PVID;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_vlan_get_info);</div><div class='add'>+</div><div class='add'>+int br_vlan_get_info_rcu(const struct net_device *dev, u16 vid,</div><div class='add'>+			 struct bridge_vlan_info *p_vinfo)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+</div><div class='add'>+	p = br_port_get_check_rcu(dev);</div><div class='add'>+	if (p)</div><div class='add'>+		vg = nbp_vlan_group_rcu(p);</div><div class='add'>+	else if (netif_is_bridge_master(dev))</div><div class='add'>+		vg = br_vlan_group_rcu(netdev_priv(dev));</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	v = br_vlan_find(vg, vid);</div><div class='add'>+	if (!v)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	p_vinfo-&gt;vid = vid;</div><div class='add'>+	p_vinfo-&gt;flags = v-&gt;flags;</div><div class='add'>+	if (vid == br_get_pvid(vg))</div><div class='add'>+		p_vinfo-&gt;flags |= BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_vlan_get_info_rcu);</div><div class='add'>+</div><div class='add'>+static int br_vlan_is_bind_vlan_dev(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return is_vlan_dev(dev) &amp;&amp;</div><div class='add'>+		!!(vlan_dev_priv(dev)-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_is_bind_vlan_dev_fn(struct net_device *dev,</div><div class='add'>+			       __always_unused struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return br_vlan_is_bind_vlan_dev(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_vlan_has_upper_bind_vlan_dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int found;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	found = netdev_walk_all_upper_dev_rcu(dev, br_vlan_is_bind_vlan_dev_fn,</div><div class='add'>+					      NULL);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return !!found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct br_vlan_bind_walk_data {</div><div class='add'>+	u16 vid;</div><div class='add'>+	struct net_device *result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_vlan_match_bind_vlan_dev_fn(struct net_device *dev,</div><div class='add'>+					  struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct br_vlan_bind_walk_data *data = priv-&gt;data;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_bind_vlan_dev(dev) &amp;&amp;</div><div class='add'>+	    vlan_dev_priv(dev)-&gt;vlan_id == data-&gt;vid) {</div><div class='add'>+		data-&gt;result = dev;</div><div class='add'>+		found = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *</div><div class='add'>+br_vlan_get_upper_bind_vlan_dev(struct net_device *dev, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct br_vlan_bind_walk_data data = {</div><div class='add'>+		.vid = vid,</div><div class='add'>+	};</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)&amp;data,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev_walk_all_upper_dev_rcu(dev, br_vlan_match_bind_vlan_dev_fn,</div><div class='add'>+				      &amp;priv);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return data.result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_vlan_is_dev_up(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return  !!(dev-&gt;flags &amp; IFF_UP) &amp;&amp; netif_oper_up(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_set_vlan_dev_state(const struct net_bridge *br,</div><div class='add'>+				       struct net_device *vlan_dev)</div><div class='add'>+{</div><div class='add'>+	u16 vid = vlan_dev_priv(vlan_dev)-&gt;vlan_id;</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	bool has_carrier = false;</div><div class='add'>+</div><div class='add'>+	if (!netif_carrier_ok(br-&gt;dev)) {</div><div class='add'>+		netif_carrier_off(vlan_dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;br-&gt;port_list, list) {</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+		if (br_vlan_find(vg, vid) &amp;&amp; br_vlan_is_dev_up(p-&gt;dev)) {</div><div class='add'>+			has_carrier = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_carrier)</div><div class='add'>+		netif_carrier_on(vlan_dev);</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_off(vlan_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_set_all_vlan_dev_state(struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg = nbp_vlan_group(p);</div><div class='add'>+	struct net_bridge_vlan *vlan;</div><div class='add'>+	struct net_device *vlan_dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vlan, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		vlan_dev = br_vlan_get_upper_bind_vlan_dev(p-&gt;br-&gt;dev,</div><div class='add'>+							   vlan-&gt;vid);</div><div class='add'>+		if (vlan_dev) {</div><div class='add'>+			if (br_vlan_is_dev_up(p-&gt;dev)) {</div><div class='add'>+				if (netif_carrier_ok(p-&gt;br-&gt;dev))</div><div class='add'>+					netif_carrier_on(vlan_dev);</div><div class='add'>+			} else {</div><div class='add'>+				br_vlan_set_vlan_dev_state(p-&gt;br, vlan_dev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_toggle_bridge_binding(struct net_device *br_dev,</div><div class='add'>+					  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(br_dev);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING, true);</div><div class='add'>+	else</div><div class='add'>+		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING,</div><div class='add'>+			      br_vlan_has_upper_bind_vlan_dev(br_dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_upper_change(struct net_device *dev,</div><div class='add'>+				 struct net_device *upper_dev,</div><div class='add'>+				 bool linking)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_is_bind_vlan_dev(upper_dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	br_vlan_toggle_bridge_binding(dev, linking);</div><div class='add'>+	if (linking)</div><div class='add'>+		br_vlan_set_vlan_dev_state(br, upper_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct br_vlan_link_state_walk_data {</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_vlan_link_state_change_fn(struct net_device *vlan_dev,</div><div class='add'>+					struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct br_vlan_link_state_walk_data *data = priv-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_bind_vlan_dev(vlan_dev))</div><div class='add'>+		br_vlan_set_vlan_dev_state(data-&gt;br, vlan_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_link_state_change(struct net_device *dev,</div><div class='add'>+				      struct net_bridge *br)</div><div class='add'>+{</div><div class='add'>+	struct br_vlan_link_state_walk_data data = {</div><div class='add'>+		.br = br</div><div class='add'>+	};</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)&amp;data,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev_walk_all_upper_dev_rcu(dev, br_vlan_link_state_change_fn,</div><div class='add'>+				      &amp;priv);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be protected by RTNL. */</div><div class='add'>+static void nbp_vlan_set_vlan_dev_state(struct net_bridge_port *p, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_device *vlan_dev;</div><div class='add'>+</div><div class='add'>+	if (!br_opt_get(p-&gt;br, BROPT_VLAN_BRIDGE_BINDING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vlan_dev = br_vlan_get_upper_bind_vlan_dev(p-&gt;br-&gt;dev, vid);</div><div class='add'>+	if (vlan_dev)</div><div class='add'>+		br_vlan_set_vlan_dev_state(p-&gt;br, vlan_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be protected by RTNL. */</div><div class='add'>+int br_vlan_bridge_event(struct net_device *dev, unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_changeupper_info *info;</div><div class='add'>+	struct net_bridge *br = netdev_priv(dev);</div><div class='add'>+	int vlcmd = 0, ret = 0;</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_REGISTER:</div><div class='add'>+		ret = br_vlan_add(br, br-&gt;default_pvid,</div><div class='add'>+				  BRIDGE_VLAN_INFO_PVID |</div><div class='add'>+				  BRIDGE_VLAN_INFO_UNTAGGED |</div><div class='add'>+				  BRIDGE_VLAN_INFO_BRENTRY, &amp;changed, NULL);</div><div class='add'>+		vlcmd = RTM_NEWVLAN;</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		changed = !br_vlan_delete(br, br-&gt;default_pvid);</div><div class='add'>+		vlcmd = RTM_DELVLAN;</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGEUPPER:</div><div class='add'>+		info = ptr;</div><div class='add'>+		br_vlan_upper_change(dev, info-&gt;upper_dev, info-&gt;linking);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		if (!br_opt_get(br, BROPT_VLAN_BRIDGE_BINDING))</div><div class='add'>+			break;</div><div class='add'>+		br_vlan_link_state_change(dev, br);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (changed)</div><div class='add'>+		br_vlan_notify(br, NULL, br-&gt;default_pvid, 0, vlcmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_vlan_vlan_upper_event(struct net_device *br_dev,</div><div class='add'>+			      struct net_device *vlan_dev,</div><div class='add'>+			      unsigned long event)</div><div class='add'>+{</div><div class='add'>+	struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev);</div><div class='add'>+	struct net_bridge *br = netdev_priv(br_dev);</div><div class='add'>+	bool bridge_binding;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bridge_binding = vlan-&gt;flags &amp; VLAN_FLAG_BRIDGE_BINDING;</div><div class='add'>+	br_vlan_toggle_bridge_binding(br_dev, bridge_binding);</div><div class='add'>+	if (bridge_binding)</div><div class='add'>+		br_vlan_set_vlan_dev_state(br, vlan_dev);</div><div class='add'>+	else if (!bridge_binding &amp;&amp; netif_carrier_ok(br_dev))</div><div class='add'>+		netif_carrier_on(vlan_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be protected by RTNL. */</div><div class='add'>+void br_vlan_port_event(struct net_bridge_port *p, unsigned long event)</div><div class='add'>+{</div><div class='add'>+	if (!br_opt_get(p-&gt;br, BROPT_VLAN_BRIDGE_BINDING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		br_vlan_set_all_vlan_dev_state(p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool br_vlan_stats_fill(struct sk_buff *skb,</div><div class='add'>+			       const struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_sw_netstats stats;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, BRIDGE_VLANDB_ENTRY_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	br_vlan_get_stats(v, &amp;stats);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_STATS_RX_BYTES,</div><div class='add'>+			      u64_stats_read(&amp;stats.rx_bytes),</div><div class='add'>+			      BRIDGE_VLANDB_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, BRIDGE_VLANDB_STATS_RX_PACKETS,</div><div class='add'>+			      u64_stats_read(&amp;stats.rx_packets),</div><div class='add'>+			      BRIDGE_VLANDB_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, BRIDGE_VLANDB_STATS_TX_BYTES,</div><div class='add'>+			      u64_stats_read(&amp;stats.tx_bytes),</div><div class='add'>+			      BRIDGE_VLANDB_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, BRIDGE_VLANDB_STATS_TX_PACKETS,</div><div class='add'>+			      u64_stats_read(&amp;stats.tx_packets),</div><div class='add'>+			      BRIDGE_VLANDB_STATS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* v_opts is used to dump the options which must be equal in the whole range */</div><div class='add'>+static bool br_vlan_fill_vids(struct sk_buff *skb, u16 vid, u16 vid_range,</div><div class='add'>+			      const struct net_bridge_vlan *v_opts,</div><div class='add'>+			      const struct net_bridge_port *p,</div><div class='add'>+			      u16 flags,</div><div class='add'>+			      bool dump_stats)</div><div class='add'>+{</div><div class='add'>+	struct bridge_vlan_info info;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, BRIDGE_VLANDB_ENTRY);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.vid = vid;</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_UNTAGGED)</div><div class='add'>+		info.flags |= BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='add'>+		info.flags |= BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, BRIDGE_VLANDB_ENTRY_INFO, sizeof(info), &amp;info))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (vid_range &amp;&amp; vid &lt; vid_range &amp;&amp;</div><div class='add'>+	    !(flags &amp; BRIDGE_VLAN_INFO_PVID) &amp;&amp;</div><div class='add'>+	    nla_put_u16(skb, BRIDGE_VLANDB_ENTRY_RANGE, vid_range))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (v_opts) {</div><div class='add'>+		if (!br_vlan_opts_fill(skb, v_opts, p))</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+		if (dump_stats &amp;&amp; !br_vlan_stats_fill(skb, v_opts))</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rtnl_vlan_nlmsg_size(void)</div><div class='add'>+{</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct br_vlan_msg))</div><div class='add'>+		+ nla_total_size(0) /* BRIDGE_VLANDB_ENTRY */</div><div class='add'>+		+ nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_ENTRY_RANGE */</div><div class='add'>+		+ nla_total_size(sizeof(struct bridge_vlan_info)) /* BRIDGE_VLANDB_ENTRY_INFO */</div><div class='add'>+		+ br_vlan_opts_nl_size(); /* bridge vlan options */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_vlan_notify(const struct net_bridge *br,</div><div class='add'>+		    const struct net_bridge_port *p,</div><div class='add'>+		    u16 vid, u16 vid_range,</div><div class='add'>+		    int cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_vlan *v = NULL;</div><div class='add'>+	struct br_vlan_msg *bvm;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+	struct net *net;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+	int ifindex;</div><div class='add'>+</div><div class='add'>+	/* right now notifications are done only with rtnl held */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		ifindex = p-&gt;dev-&gt;ifindex;</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+		net = dev_net(p-&gt;dev);</div><div class='add'>+	} else {</div><div class='add'>+		ifindex = br-&gt;dev-&gt;ifindex;</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+		net = dev_net(br-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(rtnl_vlan_nlmsg_size(), GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	nlh = nlmsg_put(skb, 0, 0, cmd, sizeof(*bvm), 0);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		goto out_err;</div><div class='add'>+	bvm = nlmsg_data(nlh);</div><div class='add'>+	memset(bvm, 0, sizeof(*bvm));</div><div class='add'>+	bvm-&gt;family = AF_BRIDGE;</div><div class='add'>+	bvm-&gt;ifindex = ifindex;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTM_NEWVLAN:</div><div class='add'>+		/* need to find the vlan due to flags/options */</div><div class='add'>+		v = br_vlan_find(vg, vid);</div><div class='add'>+		if (!v || !br_vlan_should_use(v))</div><div class='add'>+			goto out_kfree;</div><div class='add'>+</div><div class='add'>+		flags = v-&gt;flags;</div><div class='add'>+		if (br_get_pvid(vg) == v-&gt;vid)</div><div class='add'>+			flags |= BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+		break;</div><div class='add'>+	case RTM_DELVLAN:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto out_kfree;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_fill_vids(skb, vid, vid_range, v, p, flags, false))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_BRVLAN, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_BRVLAN, err);</div><div class='add'>+out_kfree:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check if v_curr can enter a range ending in range_end */</div><div class='add'>+bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			     const struct net_bridge_vlan *range_end)</div><div class='add'>+{</div><div class='add'>+	return v_curr-&gt;vid - range_end-&gt;vid == 1 &amp;&amp;</div><div class='add'>+	       range_end-&gt;flags == v_curr-&gt;flags &amp;&amp;</div><div class='add'>+	       br_vlan_opts_eq_range(v_curr, range_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_dump_dev(const struct net_device *dev,</div><div class='add'>+			    struct sk_buff *skb,</div><div class='add'>+			    struct netlink_callback *cb,</div><div class='add'>+			    u32 dump_flags)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v, *range_start = NULL, *range_end = NULL;</div><div class='add'>+	bool dump_global = !!(dump_flags &amp; BRIDGE_VLANDB_DUMPF_GLOBAL);</div><div class='add'>+	bool dump_stats = !!(dump_flags &amp; BRIDGE_VLANDB_DUMPF_STATS);</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	int idx = 0, s_idx = cb-&gt;args[1];</div><div class='add'>+	struct nlmsghdr *nlh = NULL;</div><div class='add'>+	struct net_bridge_port *p;</div><div class='add'>+	struct br_vlan_msg *bvm;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 pvid;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(dev) &amp;&amp; !netif_is_bridge_port(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='add'>+		br = netdev_priv(dev);</div><div class='add'>+		vg = br_vlan_group_rcu(br);</div><div class='add'>+		p = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		/* global options are dumped only for bridge devices */</div><div class='add'>+		if (dump_global)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		p = br_port_get_rcu(dev);</div><div class='add'>+		if (WARN_ON(!p))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		vg = nbp_vlan_group_rcu(p);</div><div class='add'>+		br = p-&gt;br;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!vg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			RTM_NEWVLAN, sizeof(*bvm), NLM_F_MULTI);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	bvm = nlmsg_data(nlh);</div><div class='add'>+	memset(bvm, 0, sizeof(*bvm));</div><div class='add'>+	bvm-&gt;family = PF_BRIDGE;</div><div class='add'>+	bvm-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+	pvid = br_get_pvid(vg);</div><div class='add'>+</div><div class='add'>+	/* idx must stay at range's beginning until it is filled in */</div><div class='add'>+	list_for_each_entry_rcu(v, &amp;vg-&gt;vlan_list, vlist) {</div><div class='add'>+		if (!dump_global &amp;&amp; !br_vlan_should_use(v))</div><div class='add'>+			continue;</div><div class='add'>+		if (idx &lt; s_idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!range_start) {</div><div class='add'>+			range_start = v;</div><div class='add'>+			range_end = v;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dump_global) {</div><div class='add'>+			if (br_vlan_global_opts_can_enter_range(v, range_end))</div><div class='add'>+				goto update_end;</div><div class='add'>+			if (!br_vlan_global_opts_fill(skb, range_start-&gt;vid,</div><div class='add'>+						      range_end-&gt;vid,</div><div class='add'>+						      range_start)) {</div><div class='add'>+				err = -EMSGSIZE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* advance number of filled vlans */</div><div class='add'>+			idx += range_end-&gt;vid - range_start-&gt;vid + 1;</div><div class='add'>+</div><div class='add'>+			range_start = v;</div><div class='add'>+		} else if (dump_stats || v-&gt;vid == pvid ||</div><div class='add'>+			   !br_vlan_can_enter_range(v, range_end)) {</div><div class='add'>+			u16 vlan_flags = br_vlan_flags(range_start, pvid);</div><div class='add'>+</div><div class='add'>+			if (!br_vlan_fill_vids(skb, range_start-&gt;vid,</div><div class='add'>+					       range_end-&gt;vid, range_start,</div><div class='add'>+					       p, vlan_flags, dump_stats)) {</div><div class='add'>+				err = -EMSGSIZE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* advance number of filled vlans */</div><div class='add'>+			idx += range_end-&gt;vid - range_start-&gt;vid + 1;</div><div class='add'>+</div><div class='add'>+			range_start = v;</div><div class='add'>+		}</div><div class='add'>+update_end:</div><div class='add'>+		range_end = v;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* err will be 0 and range_start will be set in 3 cases here:</div><div class='add'>+	 * - first vlan (range_start == range_end)</div><div class='add'>+	 * - last vlan (range_start == range_end, not in range)</div><div class='add'>+	 * - last vlan range (range_start != range_end, in range)</div><div class='add'>+	 */</div><div class='add'>+	if (!err &amp;&amp; range_start) {</div><div class='add'>+		if (dump_global &amp;&amp;</div><div class='add'>+		    !br_vlan_global_opts_fill(skb, range_start-&gt;vid,</div><div class='add'>+					      range_end-&gt;vid, range_start))</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+		else if (!dump_global &amp;&amp;</div><div class='add'>+			 !br_vlan_fill_vids(skb, range_start-&gt;vid,</div><div class='add'>+					    range_end-&gt;vid, range_start,</div><div class='add'>+					    p, br_vlan_flags(range_start, pvid),</div><div class='add'>+					    dump_stats))</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cb-&gt;args[1] = err ? idx : 0;</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_vlan_db_dump_pol[BRIDGE_VLANDB_DUMP_MAX + 1] = {</div><div class='add'>+	[BRIDGE_VLANDB_DUMP_FLAGS] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *dtb[BRIDGE_VLANDB_DUMP_MAX + 1];</div><div class='add'>+	int idx = 0, err = 0, s_idx = cb-&gt;args[0];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct br_vlan_msg *bvm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 dump_flags = 0;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(cb-&gt;nlh, sizeof(*bvm), dtb, BRIDGE_VLANDB_DUMP_MAX,</div><div class='add'>+			  br_vlan_db_dump_pol, cb-&gt;extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bvm = nlmsg_data(cb-&gt;nlh);</div><div class='add'>+	if (dtb[BRIDGE_VLANDB_DUMP_FLAGS])</div><div class='add'>+		dump_flags = nla_get_u32(dtb[BRIDGE_VLANDB_DUMP_FLAGS]);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (bvm-&gt;ifindex) {</div><div class='add'>+		dev = dev_get_by_index_rcu(net, bvm-&gt;ifindex);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		err = br_vlan_dump_dev(dev, skb, cb, dump_flags);</div><div class='add'>+		/* if the dump completed without an error we return 0 here */</div><div class='add'>+		if (err != -EMSGSIZE)</div><div class='add'>+			goto out_err;</div><div class='add'>+	} else {</div><div class='add'>+		for_each_netdev_rcu(net, dev) {</div><div class='add'>+			if (idx &lt; s_idx)</div><div class='add'>+				goto skip;</div><div class='add'>+</div><div class='add'>+			err = br_vlan_dump_dev(dev, skb, cb, dump_flags);</div><div class='add'>+			if (err == -EMSGSIZE)</div><div class='add'>+				break;</div><div class='add'>+skip:</div><div class='add'>+			idx++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cb-&gt;args[0] = idx;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_vlan_db_policy[BRIDGE_VLANDB_ENTRY_MAX + 1] = {</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_INFO]	=</div><div class='add'>+		NLA_POLICY_EXACT_LEN(sizeof(struct bridge_vlan_info)),</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_RANGE]	= { .type = NLA_U16 },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_STATE]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = { .type = NLA_NESTED },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_MCAST_ROUTER]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS]	= { .type = NLA_REJECT },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS]	= { .type = NLA_U32 },</div><div class='add'>+	[BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_vlan_rtm_process_one(struct net_device *dev,</div><div class='add'>+				   const struct nlattr *attr,</div><div class='add'>+				   int cmd, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bridge_vlan_info *vinfo, vrange_end, *vinfo_last = NULL;</div><div class='add'>+	struct nlattr *tb[BRIDGE_VLANDB_ENTRY_MAX + 1];</div><div class='add'>+	bool changed = false, skip_processing = false;</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	struct net_bridge_port *p = NULL;</div><div class='add'>+	int err = 0, cmdmap = 0;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(dev)) {</div><div class='add'>+		br = netdev_priv(dev);</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+	} else {</div><div class='add'>+		p = br_port_get_rtnl(dev);</div><div class='add'>+		if (WARN_ON(!p))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		br = p-&gt;br;</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vg))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, BRIDGE_VLANDB_ENTRY_MAX, attr,</div><div class='add'>+			       br_vlan_db_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[BRIDGE_VLANDB_ENTRY_INFO]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing vlan entry info");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	memset(&amp;vrange_end, 0, sizeof(vrange_end));</div><div class='add'>+</div><div class='add'>+	vinfo = nla_data(tb[BRIDGE_VLANDB_ENTRY_INFO]);</div><div class='add'>+	if (vinfo-&gt;flags &amp; (BRIDGE_VLAN_INFO_RANGE_BEGIN |</div><div class='add'>+			    BRIDGE_VLAN_INFO_RANGE_END)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Old-style vlan ranges are not allowed when using RTM vlan calls");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!br_vlan_valid_id(vinfo-&gt;vid, extack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_RANGE]) {</div><div class='add'>+		vrange_end.vid = nla_get_u16(tb[BRIDGE_VLANDB_ENTRY_RANGE]);</div><div class='add'>+		/* validate user-provided flags without RANGE_BEGIN */</div><div class='add'>+		vrange_end.flags = BRIDGE_VLAN_INFO_RANGE_END | vinfo-&gt;flags;</div><div class='add'>+		vinfo-&gt;flags |= BRIDGE_VLAN_INFO_RANGE_BEGIN;</div><div class='add'>+</div><div class='add'>+		/* vinfo_last is the range start, vinfo the range end */</div><div class='add'>+		vinfo_last = vinfo;</div><div class='add'>+		vinfo = &amp;vrange_end;</div><div class='add'>+</div><div class='add'>+		if (!br_vlan_valid_id(vinfo-&gt;vid, extack) ||</div><div class='add'>+		    !br_vlan_valid_range(vinfo, vinfo_last, extack))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTM_NEWVLAN:</div><div class='add'>+		cmdmap = RTM_SETLINK;</div><div class='add'>+		skip_processing = !!(vinfo-&gt;flags &amp; BRIDGE_VLAN_INFO_ONLY_OPTS);</div><div class='add'>+		break;</div><div class='add'>+	case RTM_DELVLAN:</div><div class='add'>+		cmdmap = RTM_DELLINK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skip_processing) {</div><div class='add'>+		struct bridge_vlan_info *tmp_last = vinfo_last;</div><div class='add'>+</div><div class='add'>+		/* br_process_vlan_info may overwrite vinfo_last */</div><div class='add'>+		err = br_process_vlan_info(br, p, cmdmap, vinfo, &amp;tmp_last,</div><div class='add'>+					   &amp;changed, extack);</div><div class='add'>+</div><div class='add'>+		/* notify first if anything changed */</div><div class='add'>+		if (changed)</div><div class='add'>+			br_ifinfo_notify(cmdmap, br, p);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* deal with options */</div><div class='add'>+	if (cmd == RTM_NEWVLAN) {</div><div class='add'>+		struct net_bridge_vlan *range_start, *range_end;</div><div class='add'>+</div><div class='add'>+		if (vinfo_last) {</div><div class='add'>+			range_start = br_vlan_find(vg, vinfo_last-&gt;vid);</div><div class='add'>+			range_end = br_vlan_find(vg, vinfo-&gt;vid);</div><div class='add'>+		} else {</div><div class='add'>+			range_start = br_vlan_find(vg, vinfo-&gt;vid);</div><div class='add'>+			range_end = range_start;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = br_vlan_process_options(br, p, range_start, range_end,</div><div class='add'>+					      tb, extack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_rtm_process(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct br_vlan_msg *bvm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int err, vlans = 0;</div><div class='add'>+	int rem;</div><div class='add'>+</div><div class='add'>+	/* this should validate the header and check for remaining bytes */</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(*bvm), NULL, BRIDGE_VLANDB_MAX, NULL,</div><div class='add'>+			  extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bvm = nlmsg_data(nlh);</div><div class='add'>+	dev = __dev_get_by_index(net, bvm-&gt;ifindex);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(dev) &amp;&amp; !netif_is_bridge_port(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "The device is not a valid bridge or bridge port");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlmsg_for_each_attr(attr, nlh, sizeof(*bvm), rem) {</div><div class='add'>+		switch (nla_type(attr)) {</div><div class='add'>+		case BRIDGE_VLANDB_ENTRY:</div><div class='add'>+			err = br_vlan_rtm_process_one(dev, attr,</div><div class='add'>+						      nlh-&gt;nlmsg_type,</div><div class='add'>+						      extack);</div><div class='add'>+			break;</div><div class='add'>+		case BRIDGE_VLANDB_GLOBAL_OPTIONS:</div><div class='add'>+			err = br_vlan_rtm_process_global_options(dev, attr,</div><div class='add'>+								 nlh-&gt;nlmsg_type,</div><div class='add'>+								 extack);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vlans++;</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!vlans) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "No vlans found to process");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler br_vlan_rtnl_msg_handlers[] = {</div><div class='add'>+	{THIS_MODULE, PF_BRIDGE, RTM_NEWVLAN, br_vlan_rtm_process, NULL, 0},</div><div class='add'>+	{THIS_MODULE, PF_BRIDGE, RTM_DELVLAN, br_vlan_rtm_process, NULL, 0},</div><div class='add'>+	{THIS_MODULE, PF_BRIDGE, RTM_GETVLAN, NULL, br_vlan_rtm_dump, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_vlan_rtnl_init(void)</div><div class='add'>+{</div><div class='add'>+	return rtnl_register_many(br_vlan_rtnl_msg_handlers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void br_vlan_rtnl_uninit(void)</div><div class='add'>+{</div><div class='add'>+	rtnl_unregister_many(br_vlan_rtnl_msg_handlers);</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_vlan_options.c b/net/bridge/br_vlan_options.c<br/>new file mode 100644<br/>index 000000000000..8fa89b04ee94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_vlan_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_vlan_options.c</a></div><div class='hunk'>@@ -0,0 +1,740 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (c) 2020, Nikolay Aleksandrov &lt;nikolay@cumulusnetworks.com&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='add'>+</div><div class='add'>+#include "br_private.h"</div><div class='add'>+#include "br_private_tunnel.h"</div><div class='add'>+</div><div class='add'>+static bool __vlan_tun_put(struct sk_buff *skb, const struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	__be32 tid = tunnel_id_to_key32(v-&gt;tinfo.tunnel_id);</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (!v-&gt;tinfo.tunnel_dst)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, BRIDGE_VLANDB_ENTRY_TUNNEL_INFO);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return false;</div><div class='add'>+	if (nla_put_u32(skb, BRIDGE_VLANDB_TINFO_ID, be32_to_cpu(tid))) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __vlan_tun_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+				       const struct net_bridge_vlan *range_end)</div><div class='add'>+{</div><div class='add'>+	return (!v_curr-&gt;tinfo.tunnel_dst &amp;&amp; !range_end-&gt;tinfo.tunnel_dst) ||</div><div class='add'>+	       vlan_tunid_inrange(v_curr, range_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check if the options' state of v_curr allow it to enter the range */</div><div class='add'>+bool br_vlan_opts_eq_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+			   const struct net_bridge_vlan *range_end)</div><div class='add'>+{</div><div class='add'>+	u8 range_mc_rtr = br_vlan_multicast_router(range_end);</div><div class='add'>+	u8 curr_mc_rtr = br_vlan_multicast_router(v_curr);</div><div class='add'>+</div><div class='add'>+	return v_curr-&gt;state == range_end-&gt;state &amp;&amp;</div><div class='add'>+	       __vlan_tun_can_enter_range(v_curr, range_end) &amp;&amp;</div><div class='add'>+	       curr_mc_rtr == range_mc_rtr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_vlan_opts_fill(struct sk_buff *skb, const struct net_bridge_vlan *v,</div><div class='add'>+		       const struct net_bridge_port *p)</div><div class='add'>+{</div><div class='add'>+	if (nla_put_u8(skb, BRIDGE_VLANDB_ENTRY_STATE, br_vlan_get_state(v)) ||</div><div class='add'>+	    !__vlan_tun_put(skb, v) ||</div><div class='add'>+	    nla_put_u8(skb, BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS,</div><div class='add'>+		       !!(v-&gt;priv_flags &amp; BR_VLFLAG_NEIGH_SUPPRESS_ENABLED)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	if (nla_put_u8(skb, BRIDGE_VLANDB_ENTRY_MCAST_ROUTER,</div><div class='add'>+		       br_vlan_multicast_router(v)))</div><div class='add'>+		return false;</div><div class='add'>+	if (p &amp;&amp; !br_multicast_port_ctx_vlan_disabled(&amp;v-&gt;port_mcast_ctx) &amp;&amp;</div><div class='add'>+	    (nla_put_u32(skb, BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS,</div><div class='add'>+			 br_multicast_ngroups_get(&amp;v-&gt;port_mcast_ctx)) ||</div><div class='add'>+	     nla_put_u32(skb, BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS,</div><div class='add'>+			 br_multicast_ngroups_get_max(&amp;v-&gt;port_mcast_ctx))))</div><div class='add'>+		return false;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t br_vlan_opts_nl_size(void)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_ENTRY_STATE */</div><div class='add'>+	       + nla_total_size(0) /* BRIDGE_VLANDB_ENTRY_TUNNEL_INFO */</div><div class='add'>+	       + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_TINFO_ID */</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	       + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_ENTRY_MCAST_ROUTER */</div><div class='add'>+	       + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS */</div><div class='add'>+	       + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS */</div><div class='add'>+#endif</div><div class='add'>+	       + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS */</div><div class='add'>+	       + 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_modify_state(struct net_bridge_vlan_group *vg,</div><div class='add'>+				struct net_bridge_vlan *v,</div><div class='add'>+				u8 state,</div><div class='add'>+				bool *changed,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (state &gt; BR_STATE_BLOCKING) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid vlan state");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_vlan_is_brentry(v))</div><div class='add'>+		br = v-&gt;br;</div><div class='add'>+	else</div><div class='add'>+		br = v-&gt;port-&gt;br;</div><div class='add'>+</div><div class='add'>+	if (br-&gt;stp_enabled == BR_KERNEL_STP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Can't modify vlan state when using kernel STP");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (br_opt_get(br, BROPT_MST_ENABLED)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Can't modify vlan state directly when MST is enabled");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (v-&gt;state == state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (v-&gt;vid == br_get_pvid(vg))</div><div class='add'>+		br_vlan_set_pvid_state(vg, state);</div><div class='add'>+</div><div class='add'>+	br_vlan_set_state(v, state);</div><div class='add'>+	*changed = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_vlandb_tinfo_pol[BRIDGE_VLANDB_TINFO_MAX + 1] = {</div><div class='add'>+	[BRIDGE_VLANDB_TINFO_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[BRIDGE_VLANDB_TINFO_CMD]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int br_vlan_modify_tunnel(const struct net_bridge_port *p,</div><div class='add'>+				 struct net_bridge_vlan *v,</div><div class='add'>+				 struct nlattr **tb,</div><div class='add'>+				 bool *changed,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tun_tb[BRIDGE_VLANDB_TINFO_MAX + 1], *attr;</div><div class='add'>+	struct bridge_vlan_info *vinfo;</div><div class='add'>+	u32 tun_id = 0;</div><div class='add'>+	int cmd, err;</div><div class='add'>+</div><div class='add'>+	if (!p) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Can't modify tunnel mapping of non-port vlans");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!(p-&gt;flags &amp; BR_VLAN_TUNNEL)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Port doesn't have tunnel flag set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr = tb[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO];</div><div class='add'>+	err = nla_parse_nested(tun_tb, BRIDGE_VLANDB_TINFO_MAX, attr,</div><div class='add'>+			       br_vlandb_tinfo_pol, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tun_tb[BRIDGE_VLANDB_TINFO_CMD]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing tunnel command attribute");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	cmd = nla_get_u32(tun_tb[BRIDGE_VLANDB_TINFO_CMD]);</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTM_SETLINK:</div><div class='add'>+		if (!tun_tb[BRIDGE_VLANDB_TINFO_ID]) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Missing tunnel id attribute");</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		/* when working on vlan ranges this is the starting tunnel id */</div><div class='add'>+		tun_id = nla_get_u32(tun_tb[BRIDGE_VLANDB_TINFO_ID]);</div><div class='add'>+		/* vlan info attr is guaranteed by br_vlan_rtm_process_one */</div><div class='add'>+		vinfo = nla_data(tb[BRIDGE_VLANDB_ENTRY_INFO]);</div><div class='add'>+		/* tunnel ids are mapped to each vlan in increasing order,</div><div class='add'>+		 * the starting vlan is in BRIDGE_VLANDB_ENTRY_INFO and v is the</div><div class='add'>+		 * current vlan, so we compute: tun_id + v - vinfo-&gt;vid</div><div class='add'>+		 */</div><div class='add'>+		tun_id += v-&gt;vid - vinfo-&gt;vid;</div><div class='add'>+		break;</div><div class='add'>+	case RTM_DELLINK:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unsupported tunnel command");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return br_vlan_tunnel_info(p, cmd, v-&gt;vid, tun_id, changed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_process_one_opts(const struct net_bridge *br,</div><div class='add'>+				    const struct net_bridge_port *p,</div><div class='add'>+				    struct net_bridge_vlan_group *vg,</div><div class='add'>+				    struct net_bridge_vlan *v,</div><div class='add'>+				    struct nlattr **tb,</div><div class='add'>+				    bool *changed,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*changed = false;</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_STATE]) {</div><div class='add'>+		u8 state = nla_get_u8(tb[BRIDGE_VLANDB_ENTRY_STATE]);</div><div class='add'>+</div><div class='add'>+		err = br_vlan_modify_state(vg, v, state, changed, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO]) {</div><div class='add'>+		err = br_vlan_modify_tunnel(p, v, tb, changed, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_MCAST_ROUTER]) {</div><div class='add'>+		u8 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u8(tb[BRIDGE_VLANDB_ENTRY_MCAST_ROUTER]);</div><div class='add'>+		err = br_multicast_set_vlan_router(v, val);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS]) {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		if (!p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Can't set mcast_max_groups for non-port vlans");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (br_multicast_port_ctx_vlan_disabled(&amp;v-&gt;port_mcast_ctx)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Multicast snooping disabled on this VLAN");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val = nla_get_u32(tb[BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS]);</div><div class='add'>+		br_multicast_ngroups_set_max(&amp;v-&gt;port_mcast_ctx, val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (tb[BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS]) {</div><div class='add'>+		bool enabled = v-&gt;priv_flags &amp; BR_VLFLAG_NEIGH_SUPPRESS_ENABLED;</div><div class='add'>+		bool val = nla_get_u8(tb[BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS]);</div><div class='add'>+</div><div class='add'>+		if (!p) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Can't set neigh_suppress for non-port vlans");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (val != enabled) {</div><div class='add'>+			v-&gt;priv_flags ^= BR_VLFLAG_NEIGH_SUPPRESS_ENABLED;</div><div class='add'>+			*changed = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int br_vlan_process_options(const struct net_bridge *br,</div><div class='add'>+			    const struct net_bridge_port *p,</div><div class='add'>+			    struct net_bridge_vlan *range_start,</div><div class='add'>+			    struct net_bridge_vlan *range_end,</div><div class='add'>+			    struct nlattr **tb,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v, *curr_start = NULL, *curr_end = NULL;</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	int vid, err = 0;</div><div class='add'>+	u16 pvid;</div><div class='add'>+</div><div class='add'>+	if (p)</div><div class='add'>+		vg = nbp_vlan_group(p);</div><div class='add'>+	else</div><div class='add'>+		vg = br_vlan_group(br);</div><div class='add'>+</div><div class='add'>+	if (!range_start || !br_vlan_should_use(range_start)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Vlan range start doesn't exist, can't process options");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	if (!range_end || !br_vlan_should_use(range_end)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Vlan range end doesn't exist, can't process options");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvid = br_get_pvid(vg);</div><div class='add'>+	for (vid = range_start-&gt;vid; vid &lt;= range_end-&gt;vid; vid++) {</div><div class='add'>+		bool changed = false;</div><div class='add'>+</div><div class='add'>+		v = br_vlan_find(vg, vid);</div><div class='add'>+		if (!v || !br_vlan_should_use(v)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Vlan in range doesn't exist, can't process options");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = br_vlan_process_one_opts(br, p, vg, v, tb, &amp;changed,</div><div class='add'>+					       extack);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (changed) {</div><div class='add'>+			/* vlan options changed, check for range */</div><div class='add'>+			if (!curr_start) {</div><div class='add'>+				curr_start = v;</div><div class='add'>+				curr_end = v;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (v-&gt;vid == pvid ||</div><div class='add'>+			    !br_vlan_can_enter_range(v, curr_end)) {</div><div class='add'>+				br_vlan_notify(br, p, curr_start-&gt;vid,</div><div class='add'>+					       curr_end-&gt;vid, RTM_NEWVLAN);</div><div class='add'>+				curr_start = v;</div><div class='add'>+			}</div><div class='add'>+			curr_end = v;</div><div class='add'>+		} else {</div><div class='add'>+			/* nothing changed and nothing to notify yet */</div><div class='add'>+			if (!curr_start)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			br_vlan_notify(br, p, curr_start-&gt;vid, curr_end-&gt;vid,</div><div class='add'>+				       RTM_NEWVLAN);</div><div class='add'>+			curr_start = NULL;</div><div class='add'>+			curr_end = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (curr_start)</div><div class='add'>+		br_vlan_notify(br, p, curr_start-&gt;vid, curr_end-&gt;vid,</div><div class='add'>+			       RTM_NEWVLAN);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,</div><div class='add'>+					 const struct net_bridge_vlan *r_end)</div><div class='add'>+{</div><div class='add'>+	return v_curr-&gt;vid - r_end-&gt;vid == 1 &amp;&amp;</div><div class='add'>+		v_curr-&gt;msti == r_end-&gt;msti &amp;&amp;</div><div class='add'>+	       ((v_curr-&gt;priv_flags ^ r_end-&gt;priv_flags) &amp;</div><div class='add'>+		BR_VLFLAG_GLOBAL_MCAST_ENABLED) == 0 &amp;&amp;</div><div class='add'>+		br_multicast_ctx_options_equal(&amp;v_curr-&gt;br_mcast_ctx,</div><div class='add'>+					       &amp;r_end-&gt;br_mcast_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,</div><div class='add'>+			      const struct net_bridge_vlan *v_opts)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest2 __maybe_unused;</div><div class='add'>+	u64 clockval __maybe_unused;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, BRIDGE_VLANDB_GLOBAL_OPTIONS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, BRIDGE_VLANDB_GOPTS_ID, vid))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (vid_range &amp;&amp; vid &lt; vid_range &amp;&amp;</div><div class='add'>+	    nla_put_u16(skb, BRIDGE_VLANDB_GOPTS_RANGE, vid_range))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,</div><div class='add'>+		       !!(v_opts-&gt;priv_flags &amp; BR_VLFLAG_GLOBAL_MCAST_ENABLED)) ||</div><div class='add'>+	    nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION,</div><div class='add'>+		       v_opts-&gt;br_mcast_ctx.multicast_igmp_version) ||</div><div class='add'>+	    nla_put_u32(skb, BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,</div><div class='add'>+			v_opts-&gt;br_mcast_ctx.multicast_last_member_count) ||</div><div class='add'>+	    nla_put_u32(skb, BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,</div><div class='add'>+			v_opts-&gt;br_mcast_ctx.multicast_startup_query_count) ||</div><div class='add'>+	    nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,</div><div class='add'>+		       v_opts-&gt;br_mcast_ctx.multicast_querier) ||</div><div class='add'>+	    br_multicast_dump_querier_state(skb, &amp;v_opts-&gt;br_mcast_ctx,</div><div class='add'>+					    BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_last_member_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_membership_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_querier_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_query_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_query_response_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+	clockval = jiffies_to_clock_t(v_opts-&gt;br_mcast_ctx.multicast_startup_query_interval);</div><div class='add'>+	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,</div><div class='add'>+			      clockval, BRIDGE_VLANDB_GOPTS_PAD))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (br_rports_have_mc_router(&amp;v_opts-&gt;br_mcast_ctx)) {</div><div class='add'>+		nest2 = nla_nest_start(skb,</div><div class='add'>+				       BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS);</div><div class='add'>+		if (!nest2)</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (br_rports_fill_info(skb, &amp;v_opts-&gt;br_mcast_ctx)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			nla_nest_cancel(skb, nest2);</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,</div><div class='add'>+		       v_opts-&gt;br_mcast_ctx.multicast_mld_version))</div><div class='add'>+		goto out_err;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, BRIDGE_VLANDB_GOPTS_MSTI, v_opts-&gt;msti))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rtnl_vlan_global_opts_nlmsg_size(const struct net_bridge_vlan *v)</div><div class='add'>+{</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct br_vlan_msg))</div><div class='add'>+		+ nla_total_size(0) /* BRIDGE_VLANDB_GLOBAL_OPTIONS */</div><div class='add'>+		+ nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_GOPTS_ID */</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER */</div><div class='add'>+		+ br_multicast_querier_state_size() /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE */</div><div class='add'>+		+ nla_total_size(0) /* BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS */</div><div class='add'>+		+ br_rports_size(&amp;v-&gt;br_mcast_ctx) /* BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS */</div><div class='add'>+#endif</div><div class='add'>+		+ nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_GOPTS_MSTI */</div><div class='add'>+		+ nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_vlan_global_opts_notify(const struct net_bridge *br,</div><div class='add'>+				       u16 vid, u16 vid_range)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v;</div><div class='add'>+	struct br_vlan_msg *bvm;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	/* right now notifications are done only with rtnl held */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* need to find the vlan due to flags/options */</div><div class='add'>+	v = br_vlan_find(br_vlan_group(br), vid);</div><div class='add'>+	if (!v)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(rtnl_vlan_global_opts_nlmsg_size(v), GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	nlh = nlmsg_put(skb, 0, 0, RTM_NEWVLAN, sizeof(*bvm), 0);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		goto out_err;</div><div class='add'>+	bvm = nlmsg_data(nlh);</div><div class='add'>+	memset(bvm, 0, sizeof(*bvm));</div><div class='add'>+	bvm-&gt;family = AF_BRIDGE;</div><div class='add'>+	bvm-&gt;ifindex = br-&gt;dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_global_opts_fill(skb, vid, vid_range, v))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	rtnl_notify(skb, dev_net(br-&gt;dev), 0, RTNLGRP_BRVLAN, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	rtnl_set_sk_err(dev_net(br-&gt;dev), RTNLGRP_BRVLAN, err);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int br_vlan_process_global_one_opts(const struct net_bridge *br,</div><div class='add'>+					   struct net_bridge_vlan_group *vg,</div><div class='add'>+					   struct net_bridge_vlan *v,</div><div class='add'>+					   struct nlattr **tb,</div><div class='add'>+					   bool *changed,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err __maybe_unused;</div><div class='add'>+</div><div class='add'>+	*changed = false;</div><div class='add'>+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]) {</div><div class='add'>+		u8 mc_snooping;</div><div class='add'>+</div><div class='add'>+		mc_snooping = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]);</div><div class='add'>+		if (br_multicast_toggle_global_vlan(v, !!mc_snooping))</div><div class='add'>+			*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]) {</div><div class='add'>+		u8 ver;</div><div class='add'>+</div><div class='add'>+		ver = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]);</div><div class='add'>+		err = br_multicast_set_igmp_version(&amp;v-&gt;br_mcast_ctx, ver);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT]) {</div><div class='add'>+		u32 cnt;</div><div class='add'>+</div><div class='add'>+		cnt = nla_get_u32(tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_last_member_count = cnt;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]) {</div><div class='add'>+		u32 cnt;</div><div class='add'>+</div><div class='add'>+		cnt = nla_get_u32(tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_startup_query_count = cnt;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_membership_interval = clock_t_to_jiffies(val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_querier_interval = clock_t_to_jiffies(val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]);</div><div class='add'>+		br_multicast_set_query_intvl(&amp;v-&gt;br_mcast_ctx, val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL]);</div><div class='add'>+		v-&gt;br_mcast_ctx.multicast_query_response_interval = clock_t_to_jiffies(val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL]) {</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL]);</div><div class='add'>+		br_multicast_set_startup_query_intvl(&amp;v-&gt;br_mcast_ctx, val);</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER]) {</div><div class='add'>+		u8 val;</div><div class='add'>+</div><div class='add'>+		val = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER]);</div><div class='add'>+		err = br_multicast_set_querier(&amp;v-&gt;br_mcast_ctx, val);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {</div><div class='add'>+		u8 ver;</div><div class='add'>+</div><div class='add'>+		ver = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]);</div><div class='add'>+		err = br_multicast_set_mld_version(&amp;v-&gt;br_mcast_ctx, ver);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_MSTI]) {</div><div class='add'>+		u16 msti;</div><div class='add'>+</div><div class='add'>+		msti = nla_get_u16(tb[BRIDGE_VLANDB_GOPTS_MSTI]);</div><div class='add'>+		err = br_mst_vlan_set_msti(v, msti);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		*changed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = {</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_ID]	= { .type = NLA_U16 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_RANGE]	= { .type = NLA_U16 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]	= { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]	= { .type = NLA_U8 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT]	= { .type = NLA_U32 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]	= { .type = NLA_U32 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]	= { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]	= { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]	= { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL]	= { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL] = { .type = NLA_U64 },</div><div class='add'>+	[BRIDGE_VLANDB_GOPTS_MSTI] = NLA_POLICY_MAX(NLA_U16, VLAN_N_VID - 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int br_vlan_rtm_process_global_options(struct net_device *dev,</div><div class='add'>+				       const struct nlattr *attr,</div><div class='add'>+				       int cmd,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_bridge_vlan *v, *curr_start = NULL, *curr_end = NULL;</div><div class='add'>+	struct nlattr *tb[BRIDGE_VLANDB_GOPTS_MAX + 1];</div><div class='add'>+	struct net_bridge_vlan_group *vg;</div><div class='add'>+	u16 vid, vid_range = 0;</div><div class='add'>+	struct net_bridge *br;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (cmd != RTM_NEWVLAN) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Global vlan options support only set operation");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!netif_is_bridge_master(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Global vlan options can only be set on bridge device");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	br = netdev_priv(dev);</div><div class='add'>+	vg = br_vlan_group(br);</div><div class='add'>+	if (WARN_ON(!vg))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, BRIDGE_VLANDB_GOPTS_MAX, attr,</div><div class='add'>+			       br_vlan_db_gpol, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[BRIDGE_VLANDB_GOPTS_ID]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Missing vlan entry id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	vid = nla_get_u16(tb[BRIDGE_VLANDB_GOPTS_ID]);</div><div class='add'>+	if (!br_vlan_valid_id(vid, extack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tb[BRIDGE_VLANDB_GOPTS_RANGE]) {</div><div class='add'>+		vid_range = nla_get_u16(tb[BRIDGE_VLANDB_GOPTS_RANGE]);</div><div class='add'>+		if (!br_vlan_valid_id(vid_range, extack))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (vid &gt;= vid_range) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "End vlan id is less than or equal to start vlan id");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		vid_range = vid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; vid &lt;= vid_range; vid++) {</div><div class='add'>+		bool changed = false;</div><div class='add'>+</div><div class='add'>+		v = br_vlan_find(vg, vid);</div><div class='add'>+		if (!v) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Vlan in range doesn't exist, can't process global options");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = br_vlan_process_global_one_opts(br, vg, v, tb, &amp;changed,</div><div class='add'>+						      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (changed) {</div><div class='add'>+			/* vlan options changed, check for range */</div><div class='add'>+			if (!curr_start) {</div><div class='add'>+				curr_start = v;</div><div class='add'>+				curr_end = v;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!br_vlan_global_opts_can_enter_range(v, curr_end)) {</div><div class='add'>+				br_vlan_global_opts_notify(br, curr_start-&gt;vid,</div><div class='add'>+							   curr_end-&gt;vid);</div><div class='add'>+				curr_start = v;</div><div class='add'>+			}</div><div class='add'>+			curr_end = v;</div><div class='add'>+		} else {</div><div class='add'>+			/* nothing changed and nothing to notify yet */</div><div class='add'>+			if (!curr_start)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			br_vlan_global_opts_notify(br, curr_start-&gt;vid,</div><div class='add'>+						   curr_end-&gt;vid);</div><div class='add'>+			curr_start = NULL;</div><div class='add'>+			curr_end = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (curr_start)</div><div class='add'>+		br_vlan_global_opts_notify(br, curr_start-&gt;vid, curr_end-&gt;vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/bridge/br_vlan_tunnel.c b/net/bridge/br_vlan_tunnel.c<br/>index 6d2c4eed2dc8..a966a6ec8263 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/br_vlan_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/br_vlan_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/br_vlan_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/br_vlan_tunnel.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Bridge per vlan tunnel port dst_metadata handling code</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Roopa Prabhu		&lt;roopa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -34,48 +30,55 @@ static const struct rhashtable_params br_vlan_tunnel_rht_params = {</div><div class='ctx'> 	.key_offset = offsetof(struct net_bridge_vlan, tinfo.tunnel_id),</div><div class='ctx'> 	.key_len = sizeof(__be64),</div><div class='ctx'> 	.nelem_hint = 3,</div><div class='del'>-	.locks_mul = 1,</div><div class='ctx'> 	.obj_cmpfn = br_vlan_tunid_cmp,</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct net_bridge_vlan *br_vlan_tunnel_lookup(struct rhashtable *tbl,</div><div class='del'>-						     u64 tunnel_id)</div><div class='add'>+						     __be64 tunnel_id)</div><div class='ctx'> {</div><div class='ctx'> 	return rhashtable_lookup_fast(tbl, &amp;tunnel_id,</div><div class='ctx'> 				      br_vlan_tunnel_rht_params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vlan_tunnel_info_release(struct net_bridge_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct metadata_dst *tdst = rtnl_dereference(vlan-&gt;tinfo.tunnel_dst);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(vlan-&gt;tinfo.tunnel_id, 0);</div><div class='add'>+	RCU_INIT_POINTER(vlan-&gt;tinfo.tunnel_dst, NULL);</div><div class='add'>+	dst_release(&amp;tdst-&gt;dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void vlan_tunnel_info_del(struct net_bridge_vlan_group *vg,</div><div class='ctx'> 			  struct net_bridge_vlan *vlan)</div><div class='ctx'> {</div><div class='del'>-	if (!vlan-&gt;tinfo.tunnel_dst)</div><div class='add'>+	if (!rcu_access_pointer(vlan-&gt;tinfo.tunnel_dst))</div><div class='ctx'> 		return;</div><div class='ctx'> 	rhashtable_remove_fast(&amp;vg-&gt;tunnel_hash, &amp;vlan-&gt;tnode,</div><div class='ctx'> 			       br_vlan_tunnel_rht_params);</div><div class='del'>-	vlan-&gt;tinfo.tunnel_id = 0;</div><div class='del'>-	dst_release(&amp;vlan-&gt;tinfo.tunnel_dst-&gt;dst);</div><div class='del'>-	vlan-&gt;tinfo.tunnel_dst = NULL;</div><div class='add'>+	vlan_tunnel_info_release(vlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __vlan_tunnel_info_add(struct net_bridge_vlan_group *vg,</div><div class='ctx'> 				  struct net_bridge_vlan *vlan, u32 tun_id)</div><div class='ctx'> {</div><div class='del'>-	struct metadata_dst *metadata = NULL;</div><div class='add'>+	struct metadata_dst *metadata = rtnl_dereference(vlan-&gt;tinfo.tunnel_dst);</div><div class='ctx'> 	__be64 key = key32_to_tunnel_id(cpu_to_be32(tun_id));</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (vlan-&gt;tinfo.tunnel_dst)</div><div class='add'>+	if (metadata)</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> </div><div class='del'>-	metadata = __ip_tun_set_dst(0, 0, 0, 0, 0, TUNNEL_KEY,</div><div class='del'>-				    key, 0);</div><div class='add'>+	__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+	metadata = __ip_tun_set_dst(0, 0, 0, 0, 0, flags, key, 0);</div><div class='ctx'> 	if (!metadata)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	metadata-&gt;u.tun_info.mode |= IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_BRIDGE;</div><div class='del'>-	vlan-&gt;tinfo.tunnel_dst = metadata;</div><div class='del'>-	vlan-&gt;tinfo.tunnel_id = key;</div><div class='add'>+	rcu_assign_pointer(vlan-&gt;tinfo.tunnel_dst, metadata);</div><div class='add'>+	WRITE_ONCE(vlan-&gt;tinfo.tunnel_id, key);</div><div class='ctx'> </div><div class='ctx'> 	err = rhashtable_lookup_insert_fast(&amp;vg-&gt;tunnel_hash, &amp;vlan-&gt;tnode,</div><div class='ctx'> 					    br_vlan_tunnel_rht_params);</div><div class='hunk'>@@ -84,9 +87,7 @@ static int __vlan_tunnel_info_add(struct net_bridge_vlan_group *vg,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='del'>-	dst_release(&amp;vlan-&gt;tinfo.tunnel_dst-&gt;dst);</div><div class='del'>-	vlan-&gt;tinfo.tunnel_dst = NULL;</div><div class='del'>-	vlan-&gt;tinfo.tunnel_id = 0;</div><div class='add'>+	vlan_tunnel_info_release(vlan);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -94,7 +95,8 @@ out:</div><div class='ctx'> /* Must be protected by RTNL.</div><div class='ctx'>  * Must be called with vid in range from 1 to 4094 inclusive.</div><div class='ctx'>  */</div><div class='del'>-int nbp_vlan_tunnel_info_add(struct net_bridge_port *port, u16 vid, u32 tun_id)</div><div class='add'>+int nbp_vlan_tunnel_info_add(const struct net_bridge_port *port, u16 vid,</div><div class='add'>+			     u32 tun_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_vlan *vlan;</div><div class='hunk'>@@ -112,7 +114,7 @@ int nbp_vlan_tunnel_info_add(struct net_bridge_port *port, u16 vid, u32 tun_id)</div><div class='ctx'> /* Must be protected by RTNL.</div><div class='ctx'>  * Must be called with vid in range from 1 to 4094 inclusive.</div><div class='ctx'>  */</div><div class='del'>-int nbp_vlan_tunnel_info_delete(struct net_bridge_port *port, u16 vid)</div><div class='add'>+int nbp_vlan_tunnel_info_delete(const struct net_bridge_port *port, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_bridge_vlan_group *vg;</div><div class='ctx'> 	struct net_bridge_vlan *v;</div><div class='hunk'>@@ -157,41 +159,43 @@ void vlan_tunnel_deinit(struct net_bridge_vlan_group *vg)</div><div class='ctx'> 	rhashtable_destroy(&amp;vg-&gt;tunnel_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int br_handle_ingress_vlan_tunnel(struct sk_buff *skb,</div><div class='del'>-				  struct net_bridge_port *p,</div><div class='del'>-				  struct net_bridge_vlan_group *vg)</div><div class='add'>+void br_handle_ingress_vlan_tunnel(struct sk_buff *skb,</div><div class='add'>+				   struct net_bridge_port *p,</div><div class='add'>+				   struct net_bridge_vlan_group *vg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel_info *tinfo = skb_tunnel_info(skb);</div><div class='ctx'> 	struct net_bridge_vlan *vlan;</div><div class='ctx'> </div><div class='ctx'> 	if (!vg || !tinfo)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* if already tagged, ignore */</div><div class='ctx'> 	if (skb_vlan_tagged(skb))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* lookup vid, given tunnel id */</div><div class='ctx'> 	vlan = br_vlan_tunnel_lookup(&amp;vg-&gt;tunnel_hash, tinfo-&gt;key.tun_id);</div><div class='ctx'> 	if (!vlan)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> </div><div class='ctx'> 	__vlan_hwaccel_put_tag(skb, p-&gt;br-&gt;vlan_proto, vlan-&gt;vid);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int br_handle_egress_vlan_tunnel(struct sk_buff *skb,</div><div class='ctx'> 				 struct net_bridge_vlan *vlan)</div><div class='ctx'> {</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='add'>+	struct metadata_dst *tunnel_dst;</div><div class='add'>+	__be64 tunnel_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!vlan || !vlan-&gt;tinfo.tunnel_id)</div><div class='add'>+	if (!vlan)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!skb_vlan_tag_present(skb)))</div><div class='add'>+	tunnel_id = READ_ONCE(vlan-&gt;tinfo.tunnel_id);</div><div class='add'>+	if (!tunnel_id || unlikely(!skb_vlan_tag_present(skb)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='hunk'>@@ -199,7 +203,25 @@ int br_handle_egress_vlan_tunnel(struct sk_buff *skb,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	skb_dst_set(skb, dst_clone(&amp;vlan-&gt;tinfo.tunnel_dst-&gt;dst));</div><div class='add'>+	if (BR_INPUT_SKB_CB(skb)-&gt;backup_nhid) {</div><div class='add'>+		__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+		tunnel_dst = __ip_tun_set_dst(0, 0, 0, 0, 0, flags,</div><div class='add'>+					      tunnel_id, 0);</div><div class='add'>+		if (!tunnel_dst)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		tunnel_dst-&gt;u.tun_info.mode |= IP_TUNNEL_INFO_TX |</div><div class='add'>+					       IP_TUNNEL_INFO_BRIDGE;</div><div class='add'>+		tunnel_dst-&gt;u.tun_info.key.nhid =</div><div class='add'>+			BR_INPUT_SKB_CB(skb)-&gt;backup_nhid;</div><div class='add'>+		skb_dst_set(skb, &amp;tunnel_dst-&gt;dst);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tunnel_dst = rcu_dereference(vlan-&gt;tinfo.tunnel_dst);</div><div class='add'>+	if (tunnel_dst &amp;&amp; dst_hold_safe(&amp;tunnel_dst-&gt;dst))</div><div class='add'>+		skb_dst_set(skb, &amp;tunnel_dst-&gt;dst);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig<br/>index 9a0159aebe1a..4fd5a6ea26b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Bridge netfilter configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,21 +6,50 @@</div><div class='ctx'> menuconfig NF_TABLES_BRIDGE</div><div class='ctx'> 	depends on BRIDGE &amp;&amp; NETFILTER &amp;&amp; NF_TABLES</div><div class='ctx'> 	select NETFILTER_FAMILY_BRIDGE</div><div class='del'>-	bool "Ethernet Bridge nf_tables support"</div><div class='add'>+	tristate "Ethernet Bridge nf_tables support"</div><div class='ctx'> </div><div class='ctx'> if NF_TABLES_BRIDGE</div><div class='add'>+</div><div class='add'>+config NFT_BRIDGE_META</div><div class='add'>+	tristate "Netfilter nf_table bridge meta support"</div><div class='add'>+	help</div><div class='add'>+	  Add support for bridge dedicated meta key.</div><div class='add'>+</div><div class='ctx'> config NFT_BRIDGE_REJECT</div><div class='ctx'> 	tristate "Netfilter nf_tables bridge reject support"</div><div class='del'>-	depends on NFT_REJECT &amp;&amp; NFT_REJECT_IPV4 &amp;&amp; NFT_REJECT_IPV6</div><div class='add'>+	depends on NFT_REJECT</div><div class='add'>+	depends on NF_REJECT_IPV4</div><div class='add'>+	depends on NF_REJECT_IPV6</div><div class='ctx'> 	help</div><div class='ctx'> 	  Add support to reject packets.</div><div class='ctx'> </div><div class='del'>-config NF_LOG_BRIDGE</div><div class='del'>-	tristate "Bridge packet logging"</div><div class='del'>-	select NF_LOG_COMMON</div><div class='del'>-</div><div class='ctx'> endif # NF_TABLES_BRIDGE</div><div class='ctx'> </div><div class='add'>+config NF_CONNTRACK_BRIDGE</div><div class='add'>+	tristate "IPv4/IPV6 bridge connection tracking support"</div><div class='add'>+	depends on NF_CONNTRACK</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Connection tracking keeps a record of what packets have passed</div><div class='add'>+	  through your machine, in order to figure out how they are related</div><div class='add'>+	  into connections. This is used to enhance packet filtering via</div><div class='add'>+	  stateful policies. Enable this if you want native tracking from</div><div class='add'>+	  the bridge. This provides a replacement for the `br_netfilter'</div><div class='add'>+	  infrastructure.</div><div class='add'>+</div><div class='add'>+	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='add'>+</div><div class='add'>+# old sockopt interface and eval loop</div><div class='add'>+config BRIDGE_NF_EBTABLES_LEGACY</div><div class='add'>+	tristate "Legacy EBTABLES support"</div><div class='add'>+	depends on BRIDGE &amp;&amp; NETFILTER_XTABLES_LEGACY</div><div class='add'>+	depends on NETFILTER_XTABLES</div><div class='add'>+	default	n</div><div class='add'>+	help</div><div class='add'>+	 Legacy ebtables packet/frame classifier.</div><div class='add'>+	 This is not needed if you are using ebtables over nftables</div><div class='add'>+	 (iptables-nft).</div><div class='add'>+</div><div class='ctx'> menuconfig BRIDGE_NF_EBTABLES</div><div class='ctx'> 	tristate "Ethernet Bridge tables (ebtables) support"</div><div class='ctx'> 	depends on BRIDGE &amp;&amp; NETFILTER &amp;&amp; NETFILTER_XTABLES</div><div class='hunk'>@@ -36,6 +66,7 @@ if BRIDGE_NF_EBTABLES</div><div class='ctx'> #</div><div class='ctx'> config BRIDGE_EBT_BROUTE</div><div class='ctx'> 	tristate "ebt: broute table support"</div><div class='add'>+	depends on BRIDGE_NF_EBTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ebtables broute table is used to define rules that decide between</div><div class='ctx'> 	  bridging and routing frames, giving Linux the functionality of a</div><div class='hunk'>@@ -46,6 +77,7 @@ config BRIDGE_EBT_BROUTE</div><div class='ctx'> </div><div class='ctx'> config BRIDGE_EBT_T_FILTER</div><div class='ctx'> 	tristate "ebt: filter table support"</div><div class='add'>+	depends on BRIDGE_NF_EBTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ebtables filter table is used to define frame filtering rules at</div><div class='ctx'> 	  local input, forwarding and local output. See the man page for</div><div class='hunk'>@@ -55,6 +87,7 @@ config BRIDGE_EBT_T_FILTER</div><div class='ctx'> </div><div class='ctx'> config BRIDGE_EBT_T_NAT</div><div class='ctx'> 	tristate "ebt: nat table support"</div><div class='add'>+	depends on BRIDGE_NF_EBTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ebtables nat table is used to define rules that alter the MAC</div><div class='ctx'> 	  source address (MAC SNAT) or the MAC destination address (MAC DNAT).</div><div class='hunk'>@@ -113,7 +146,7 @@ config BRIDGE_EBT_LIMIT</div><div class='ctx'> 	  equivalent of the iptables limit match.</div><div class='ctx'> </div><div class='ctx'> 	  If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.  If unsure, say `N'.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.  If unsure, say `N'.</div><div class='ctx'> </div><div class='ctx'> config BRIDGE_EBT_MARK</div><div class='ctx'> 	tristate "ebt: mark filter support"</div><div class='head'>diff --git a/net/bridge/netfilter/Makefile b/net/bridge/netfilter/Makefile<br/>index 9b868861f21a..b9a1303da977 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/Makefile</a></div><div class='hunk'>@@ -3,12 +3,13 @@</div><div class='ctx'> # Makefile for the netfilter modules for Link Layer filtering on a bridge.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_NFT_BRIDGE_META)  += nft_meta_bridge.o</div><div class='ctx'> obj-$(CONFIG_NFT_BRIDGE_REJECT)  += nft_reject_bridge.o</div><div class='ctx'> </div><div class='del'>-# packet logging</div><div class='del'>-obj-$(CONFIG_NF_LOG_BRIDGE) += nf_log_bridge.o</div><div class='add'>+# connection tracking</div><div class='add'>+obj-$(CONFIG_NF_CONNTRACK_BRIDGE) += nf_conntrack_bridge.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o</div><div class='add'>+obj-$(CONFIG_BRIDGE_NF_EBTABLES_LEGACY) += ebtables.o</div><div class='ctx'> </div><div class='ctx'> # tables</div><div class='ctx'> obj-$(CONFIG_BRIDGE_EBT_BROUTE) += ebtable_broute.o</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c<br/>index 5fc4affd9fdb..68c2519bdc52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_802_3.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_802_3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_802_3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_802_3.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * 802_3</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +11,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter/x_tables.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_bridge/ebtables.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_bridge/ebt_802_3.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;uapi/linux/netfilter_bridge/ebt_802_3.h&gt;</div><div class='add'>+</div><div class='add'>+static struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return (struct ebt_802_3_hdr *)skb_mac_header(skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='ctx'> ebt_802_3_mt(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c<br/>index 620e54f08296..96f7243b6314 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_among.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_among.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_among.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_among.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_among</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c<br/>index 227142282b45..0707cc00fe8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_arp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_arp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_arp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_arp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_arp</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c<br/>index db85230e49c3..d9e77e2500cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_arpreply.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_arpreply.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_arpreply.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_arpreply.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_arpreply</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c<br/>index dfc86a0199da..3fda71a8579d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_dnat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_dnat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_dnat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_dnat.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_dnat</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,9 +20,8 @@ static unsigned int</div><div class='ctx'> ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ebt_nat_info *info = par-&gt;targinfo;</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, 0))</div><div class='add'>+	if (skb_ensure_writable(skb, 0))</div><div class='ctx'> 		return EBT_DROP;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(eth_hdr(skb)-&gt;h_dest, info-&gt;mac);</div><div class='hunk'>@@ -32,10 +32,22 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 		else</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (xt_hooknum(par) != NF_BR_BROUTING)</div><div class='del'>-			dev = br_port_get_rcu(xt_in(par))-&gt;br-&gt;dev;</div><div class='del'>-		else</div><div class='add'>+		const struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		switch (xt_hooknum(par)) {</div><div class='add'>+		case NF_BR_BROUTING:</div><div class='ctx'> 			dev = xt_in(par);</div><div class='add'>+			break;</div><div class='add'>+		case NF_BR_PRE_ROUTING:</div><div class='add'>+			dev = br_port_get_rcu(xt_in(par))-&gt;br-&gt;dev;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dev) /* NF_BR_LOCAL_OUT */</div><div class='add'>+			return info-&gt;target;</div><div class='ctx'> </div><div class='ctx'> 		if (ether_addr_equal(info-&gt;mac, dev-&gt;dev_addr))</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_HOST;</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c<br/>index ffaa8ce2e724..df372496c1c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_ip.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_ip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_ip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_ip.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_ip</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c<br/>index 2a5a52a53ec4..f3225bc31f6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_ip6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_ip6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_ip6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_ip6.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_ip6</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c<br/>index 165b9d678cf1..e16183bd1bb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_limit.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_limit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_limit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_limit.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_limit</div><div class='ctx'>  *</div><div class='hunk'>@@ -86,7 +87,7 @@ static int ebt_limit_mt_check(const struct xt_mtchk_param *par)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> /*</div><div class='ctx'>  * no conversion function needed --</div><div class='ctx'>  * only avg/burst have meaningful values in userspace.</div><div class='hunk'>@@ -106,7 +107,7 @@ static struct xt_match ebt_limit_mt_reg __read_mostly = {</div><div class='ctx'> 	.checkentry	= ebt_limit_mt_check,</div><div class='ctx'> 	.matchsize	= sizeof(struct ebt_limit_info),</div><div class='ctx'> 	.usersize	= offsetof(struct ebt_limit_info, prev),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 	.compatsize	= sizeof(struct ebt_compat_limit_info),</div><div class='ctx'> #endif</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c<br/>index 707caea39743..e2eea1daaf8b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_log.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_log.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_log.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_log.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_log</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_mark.c b/net/bridge/netfilter/ebt_mark.c<br/>index 19f0f9592d32..8cf653c72fd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_mark.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_mark.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_mark.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_mark.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_mark</div><div class='ctx'>  *</div><div class='hunk'>@@ -52,7 +53,7 @@ static int ebt_mark_tg_check(const struct xt_tgchk_param *par)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> struct compat_ebt_mark_t_info {</div><div class='ctx'> 	compat_ulong_t mark;</div><div class='ctx'> 	compat_uint_t target;</div><div class='hunk'>@@ -86,7 +87,7 @@ static struct xt_target ebt_mark_tg_reg __read_mostly = {</div><div class='ctx'> 	.target		= ebt_mark_tg,</div><div class='ctx'> 	.checkentry	= ebt_mark_tg_check,</div><div class='ctx'> 	.targetsize	= sizeof(struct ebt_mark_t_info),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 	.compatsize	= sizeof(struct compat_ebt_mark_t_info),</div><div class='ctx'> 	.compat_from_user = mark_tg_compat_from_user,</div><div class='ctx'> 	.compat_to_user	= mark_tg_compat_to_user,</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c<br/>index d98baefc4c7e..5872e73c741e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_mark_m.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_mark_m.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_mark_m.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_mark_m.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_mark_m</div><div class='ctx'>  *</div><div class='hunk'>@@ -36,7 +37,7 @@ static int ebt_mark_mt_check(const struct xt_mtchk_param *par)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> struct compat_ebt_mark_m_info {</div><div class='ctx'> 	compat_ulong_t mark, mask;</div><div class='ctx'> 	uint8_t invert, bitmask;</div><div class='hunk'>@@ -74,7 +75,7 @@ static struct xt_match ebt_mark_mt_reg __read_mostly = {</div><div class='ctx'> 	.match		= ebt_mark_mt,</div><div class='ctx'> 	.checkentry	= ebt_mark_mt_check,</div><div class='ctx'> 	.matchsize	= sizeof(struct ebt_mark_m_info),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 	.compatsize	= sizeof(struct compat_ebt_mark_m_info),</div><div class='ctx'> 	.compat_from_user = mark_mt_compat_from_user,</div><div class='ctx'> 	.compat_to_user	= mark_mt_compat_to_user,</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_nflog.c b/net/bridge/netfilter/ebt_nflog.c<br/>index da1c2fdc08c8..61bf8f4465ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_nflog.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_nflog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_nflog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_nflog.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * ebt_nflog</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c<br/>index 496a56515307..c9e306119ee3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_pkttype.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_pkttype.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_pkttype.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_pkttype.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_pkttype</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c<br/>index a7223eaf490b..307790562b49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_redirect.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_redirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_redirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_redirect.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_redirect</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +21,7 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ebt_redirect_info *info = par-&gt;targinfo;</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, 0))</div><div class='add'>+	if (skb_ensure_writable(skb, 0))</div><div class='ctx'> 		return EBT_DROP;</div><div class='ctx'> </div><div class='ctx'> 	if (xt_hooknum(par) != NF_BR_BROUTING)</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c<br/>index 11cf9e9e9222..7dfbcdfc30e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_snat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_snat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_snat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_snat.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_snat</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +22,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ebt_nat_info *info = par-&gt;targinfo;</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, 0))</div><div class='add'>+	if (skb_ensure_writable(skb, 0))</div><div class='ctx'> 		return EBT_DROP;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(eth_hdr(skb)-&gt;h_source, info-&gt;mac);</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c<br/>index 46c1fe7637ea..8f68afda5f81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_stp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_stp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_stp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_stp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebt_stp</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/netfilter_bridge/ebt_stp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BPDU_TYPE_CONFIG 0</div><div class='del'>-#define BPDU_TYPE_TCN 0x80</div><div class='ctx'> </div><div class='ctx'> struct stp_header {</div><div class='ctx'> 	u8 dsap;</div><div class='head'>diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c<br/>index 98c221dbf059..80ede370afed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_vlan.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebt_vlan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebt_vlan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebt_vlan.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Description: EBTables 802.1Q match extension kernelspace module.</div><div class='ctx'>  * Authors: Nick Fedchik &lt;nick@fedchik.org.ua&gt;</div><div class='ctx'>  *          Bart De Schuymer &lt;bdschuym@pandora.be&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='head'>diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c<br/>index 276b60262981..741360219552 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_broute.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_broute.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_broute.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebtable_broute.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebtable_broute</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,6 +16,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "../br_private.h"</div><div class='add'>+</div><div class='ctx'> /* EBT_ACCEPT means the frame will be bridged</div><div class='ctx'>  * EBT_DROP means the frame will be routed</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,72 +36,103 @@ static struct ebt_replace_kernel initial_table = {</div><div class='ctx'> 	.entries	= (char *)&amp;initial_chain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int check(const struct ebt_table_info *info, unsigned int valid_hooks)</div><div class='del'>-{</div><div class='del'>-	if (valid_hooks &amp; ~(1 &lt;&lt; NF_BR_BROUTING))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ebt_table broute_table = {</div><div class='ctx'> 	.name		= "broute",</div><div class='ctx'> 	.table		= &amp;initial_table,</div><div class='ctx'> 	.valid_hooks	= 1 &lt;&lt; NF_BR_BROUTING,</div><div class='del'>-	.check		= check,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ebt_broute(struct sk_buff *skb)</div><div class='add'>+static unsigned int ebt_broute(void *priv, struct sk_buff *skb,</div><div class='add'>+			       const struct nf_hook_state *s)</div><div class='ctx'> {</div><div class='add'>+	struct net_bridge_port *p = br_port_get_rcu(skb-&gt;dev);</div><div class='ctx'> 	struct nf_hook_state state;</div><div class='add'>+	unsigned char *dest;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!p || p-&gt;state != BR_STATE_FORWARDING)</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='ctx'> 	nf_hook_state_init(&amp;state, NF_BR_BROUTING,</div><div class='del'>-			   NFPROTO_BRIDGE, skb-&gt;dev, NULL, NULL,</div><div class='del'>-			   dev_net(skb-&gt;dev), NULL);</div><div class='add'>+			   NFPROTO_BRIDGE, s-&gt;in, NULL, NULL,</div><div class='add'>+			   s-&gt;net, NULL);</div><div class='add'>+</div><div class='add'>+	ret = ebt_do_table(priv, skb, &amp;state);</div><div class='add'>+	if (ret != NF_DROP)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* DROP in ebtables -t broute means that the</div><div class='add'>+	 * skb should be routed, not bridged.</div><div class='add'>+	 * This is awkward, but can't be changed for compatibility</div><div class='add'>+	 * reasons.</div><div class='add'>+	 *</div><div class='add'>+	 * We map DROP to ACCEPT and set the -&gt;br_netfilter_broute flag.</div><div class='add'>+	 */</div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;br_netfilter_broute = 1;</div><div class='add'>+</div><div class='add'>+	/* undo PACKET_HOST mangling done in br_input in case the dst</div><div class='add'>+	 * address matches the logical bridge but not the port.</div><div class='add'>+	 */</div><div class='add'>+	dest = eth_hdr(skb)-&gt;h_dest;</div><div class='add'>+	if (skb-&gt;pkt_type == PACKET_HOST &amp;&amp;</div><div class='add'>+	    !ether_addr_equal(skb-&gt;dev-&gt;dev_addr, dest) &amp;&amp;</div><div class='add'>+	     ether_addr_equal(p-&gt;br-&gt;dev-&gt;dev_addr, dest))</div><div class='add'>+		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='ctx'> </div><div class='del'>-	ret = ebt_do_table(skb, &amp;state, state.net-&gt;xt.broute_table);</div><div class='del'>-	if (ret == NF_DROP)</div><div class='del'>-		return 1; /* route it */</div><div class='del'>-	return 0; /* bridge it */</div><div class='add'>+	return NF_ACCEPT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init broute_net_init(struct net *net)</div><div class='add'>+static const struct nf_hook_ops ebt_ops_broute = {</div><div class='add'>+	.hook		= ebt_broute,</div><div class='add'>+	.pf		= NFPROTO_BRIDGE,</div><div class='add'>+	.hooknum	= NF_BR_PRE_ROUTING,</div><div class='add'>+	.priority	= NF_BR_PRI_FIRST,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int broute_table_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return ebt_register_table(net, &amp;broute_table, &amp;ebt_ops_broute);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit broute_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	return ebt_register_table(net, &amp;broute_table, NULL,</div><div class='del'>-				  &amp;net-&gt;xt.broute_table);</div><div class='add'>+	ebt_unregister_table_pre_exit(net, "broute");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit broute_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ebt_unregister_table(net, net-&gt;xt.broute_table, NULL);</div><div class='add'>+	ebt_unregister_table(net, "broute");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations broute_net_ops = {</div><div class='del'>-	.init = broute_net_init,</div><div class='ctx'> 	.exit = broute_net_exit,</div><div class='add'>+	.pre_exit = broute_net_pre_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ebtable_broute_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = ebt_register_template(&amp;broute_table, broute_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;broute_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret) {</div><div class='add'>+		ebt_unregister_template(&amp;broute_table);</div><div class='ctx'> 		return ret;</div><div class='del'>-	/* see br_input.c */</div><div class='del'>-	RCU_INIT_POINTER(br_should_route_hook,</div><div class='del'>-			   (br_should_route_hook_t *)ebt_broute);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ebtable_broute_fini(void)</div><div class='ctx'> {</div><div class='del'>-	RCU_INIT_POINTER(br_should_route_hook, NULL);</div><div class='del'>-	synchronize_net();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;broute_net_ops);</div><div class='add'>+	ebt_unregister_template(&amp;broute_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ebtable_broute_init);</div><div class='ctx'> module_exit(ebtable_broute_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Force packets to be routed instead of bridged");</div><div class='head'>diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c<br/>index 550324c516ee..dacd81b12e62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_filter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebtable_filter.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebtable_filter</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,82 +43,77 @@ static struct ebt_replace_kernel initial_table = {</div><div class='ctx'> 	.entries	= (char *)initial_chains,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int check(const struct ebt_table_info *info, unsigned int valid_hooks)</div><div class='del'>-{</div><div class='del'>-	if (valid_hooks &amp; ~FILTER_VALID_HOOKS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ebt_table frame_filter = {</div><div class='ctx'> 	.name		= "filter",</div><div class='ctx'> 	.table		= &amp;initial_table,</div><div class='ctx'> 	.valid_hooks	= FILTER_VALID_HOOKS,</div><div class='del'>-	.check		= check,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='del'>-ebt_in_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-	    const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ebt_do_table(skb, state, state-&gt;net-&gt;xt.frame_filter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-ebt_out_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-	     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ebt_do_table(skb, state, state-&gt;net-&gt;xt.frame_filter);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct nf_hook_ops ebt_ops_filter[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_in_hook,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_LOCAL_IN,</div><div class='ctx'> 		.priority	= NF_BR_PRI_FILTER_BRIDGED,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_in_hook,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_FORWARD,</div><div class='ctx'> 		.priority	= NF_BR_PRI_FILTER_BRIDGED,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_out_hook,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_LOCAL_OUT,</div><div class='ctx'> 		.priority	= NF_BR_PRI_FILTER_OTHER,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __net_init frame_filter_net_init(struct net *net)</div><div class='add'>+static int frame_filter_table_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return ebt_register_table(net, &amp;frame_filter, ebt_ops_filter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit frame_filter_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	return ebt_register_table(net, &amp;frame_filter, ebt_ops_filter,</div><div class='del'>-				  &amp;net-&gt;xt.frame_filter);</div><div class='add'>+	ebt_unregister_table_pre_exit(net, "filter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit frame_filter_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ebt_unregister_table(net, net-&gt;xt.frame_filter, ebt_ops_filter);</div><div class='add'>+	ebt_unregister_table(net, "filter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations frame_filter_net_ops = {</div><div class='del'>-	.init = frame_filter_net_init,</div><div class='ctx'> 	.exit = frame_filter_net_exit,</div><div class='add'>+	.pre_exit = frame_filter_net_pre_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ebtable_filter_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_pernet_subsys(&amp;frame_filter_net_ops);</div><div class='add'>+	int ret = ebt_register_template(&amp;frame_filter, frame_filter_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = register_pernet_subsys(&amp;frame_filter_net_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ebt_unregister_template(&amp;frame_filter);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ebtable_filter_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;frame_filter_net_ops);</div><div class='add'>+	ebt_unregister_template(&amp;frame_filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ebtable_filter_init);</div><div class='ctx'> module_exit(ebtable_filter_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("ebtables legacy filter table");</div><div class='head'>diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c<br/>index c0fb3ca518af..0f2a8c6118d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_nat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtable_nat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtable_nat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebtable_nat.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ebtable_nat</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,82 +43,77 @@ static struct ebt_replace_kernel initial_table = {</div><div class='ctx'> 	.entries	= (char *)initial_chains,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int check(const struct ebt_table_info *info, unsigned int valid_hooks)</div><div class='del'>-{</div><div class='del'>-	if (valid_hooks &amp; ~NAT_VALID_HOOKS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ebt_table frame_nat = {</div><div class='ctx'> 	.name		= "nat",</div><div class='ctx'> 	.table		= &amp;initial_table,</div><div class='ctx'> 	.valid_hooks	= NAT_VALID_HOOKS,</div><div class='del'>-	.check		= check,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='del'>-ebt_nat_in(void *priv, struct sk_buff *skb,</div><div class='del'>-	   const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ebt_do_table(skb, state, state-&gt;net-&gt;xt.frame_nat);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-ebt_nat_out(void *priv, struct sk_buff *skb,</div><div class='del'>-	    const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ebt_do_table(skb, state, state-&gt;net-&gt;xt.frame_nat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct nf_hook_ops ebt_ops_nat[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_nat_out,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_LOCAL_OUT,</div><div class='ctx'> 		.priority	= NF_BR_PRI_NAT_DST_OTHER,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_nat_out,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_POST_ROUTING,</div><div class='ctx'> 		.priority	= NF_BR_PRI_NAT_SRC,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ebt_nat_in,</div><div class='add'>+		.hook		= ebt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_BRIDGE,</div><div class='ctx'> 		.hooknum	= NF_BR_PRE_ROUTING,</div><div class='ctx'> 		.priority	= NF_BR_PRI_NAT_DST_BRIDGED,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __net_init frame_nat_net_init(struct net *net)</div><div class='add'>+static int frame_nat_table_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return ebt_register_table(net, &amp;frame_nat, ebt_ops_nat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit frame_nat_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	return ebt_register_table(net, &amp;frame_nat, ebt_ops_nat,</div><div class='del'>-				  &amp;net-&gt;xt.frame_nat);</div><div class='add'>+	ebt_unregister_table_pre_exit(net, "nat");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit frame_nat_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ebt_unregister_table(net, net-&gt;xt.frame_nat, ebt_ops_nat);</div><div class='add'>+	ebt_unregister_table(net, "nat");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations frame_nat_net_ops = {</div><div class='del'>-	.init = frame_nat_net_init,</div><div class='ctx'> 	.exit = frame_nat_net_exit,</div><div class='add'>+	.pre_exit = frame_nat_net_pre_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ebtable_nat_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_pernet_subsys(&amp;frame_nat_net_ops);</div><div class='add'>+	int ret = ebt_register_template(&amp;frame_nat, frame_nat_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = register_pernet_subsys(&amp;frame_nat_net_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ebt_unregister_template(&amp;frame_nat);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ebtable_nat_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;frame_nat_net_ops);</div><div class='add'>+	ebt_unregister_template(&amp;frame_nat);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ebtable_nat_init);</div><div class='ctx'> module_exit(ebtable_nat_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("ebtables legacy stateless nat table");</div><div class='head'>diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c<br/>index 491828713e0b..5697e3949a36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/ebtables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/ebtables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/ebtables.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ebtables</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,11 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  This code is strongly inspired by the iptables code which is</div><div class='ctx'>  *  Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='hunk'>@@ -28,13 +24,10 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> /* needed for logical [in,out]-dev filtering */</div><div class='ctx'> #include "../br_private.h"</div><div class='ctx'> </div><div class='del'>-#define BUGPRINT(format, args...) printk("kernel msg: ebtables bug: please "\</div><div class='del'>-					 "report to author: "format, ## args)</div><div class='del'>-/* #define BUGPRINT(format, args...) */</div><div class='del'>-</div><div class='ctx'> /* Each cpu has its own set of counters, so there is no need for write_lock in</div><div class='ctx'>  * the softirq</div><div class='ctx'>  * For reading or updating the counters, the user context needs to</div><div class='hunk'>@@ -47,11 +40,23 @@</div><div class='ctx'> #define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \</div><div class='ctx'> 				 COUNTER_OFFSET(n) * cpu))</div><div class='ctx'> </div><div class='add'>+struct ebt_pernet {</div><div class='add'>+	struct list_head tables;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+struct ebt_template {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	char name[EBT_TABLE_MAXNAMELEN];</div><div class='add'>+	struct module *owner;</div><div class='add'>+	/* called when table is needed in the given netns */</div><div class='add'>+	int (*table_init)(struct net *net);</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static unsigned int ebt_pernet_id __read_mostly;</div><div class='add'>+static LIST_HEAD(template_tables);</div><div class='ctx'> static DEFINE_MUTEX(ebt_mutex);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> static void ebt_standard_compat_from_user(void *dst, const void *src)</div><div class='ctx'> {</div><div class='ctx'> 	int v = *(compat_int_t *)src;</div><div class='hunk'>@@ -77,7 +82,7 @@ static struct xt_target ebt_standard_target = {</div><div class='ctx'> 	.revision   = 0,</div><div class='ctx'> 	.family     = NFPROTO_BRIDGE,</div><div class='ctx'> 	.targetsize = sizeof(int),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 	.compatsize = sizeof(compat_int_t),</div><div class='ctx'> 	.compat_from_user = ebt_standard_compat_from_user,</div><div class='ctx'> 	.compat_to_user =  ebt_standard_compat_to_user,</div><div class='hunk'>@@ -184,10 +189,10 @@ ebt_get_target_c(const struct ebt_entry *e)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Do some firewalling */</div><div class='del'>-unsigned int ebt_do_table(struct sk_buff *skb,</div><div class='del'>-			  const struct nf_hook_state *state,</div><div class='del'>-			  struct ebt_table *table)</div><div class='add'>+unsigned int ebt_do_table(void *priv, struct sk_buff *skb,</div><div class='add'>+			  const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='add'>+	struct ebt_table *table = priv;</div><div class='ctx'> 	unsigned int hook = state-&gt;hook;</div><div class='ctx'> 	int i, nentries;</div><div class='ctx'> 	struct ebt_entry *point;</div><div class='hunk'>@@ -229,7 +234,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,</div><div class='ctx'> 			return NF_DROP;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ADD_COUNTER(*(counter_base + i), 1, skb-&gt;len);</div><div class='add'>+		ADD_COUNTER(*(counter_base + i), skb-&gt;len, 1);</div><div class='ctx'> </div><div class='ctx'> 		/* these should only watch: not modify, nor tell us</div><div class='ctx'> 		 * what to do with the packet</div><div class='hunk'>@@ -313,30 +318,57 @@ letscontinue:</div><div class='ctx'> </div><div class='ctx'> /* If it succeeds, returns element and locks mutex */</div><div class='ctx'> static inline void *</div><div class='del'>-find_inlist_lock_noload(struct list_head *head, const char *name, int *error,</div><div class='add'>+find_inlist_lock_noload(struct net *net, const char *name, int *error,</div><div class='ctx'> 			struct mutex *mutex)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct list_head list;</div><div class='del'>-		char name[EBT_FUNCTION_MAXNAMELEN];</div><div class='del'>-	} *e;</div><div class='add'>+	struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);</div><div class='add'>+	struct ebt_template *tmpl;</div><div class='add'>+	struct ebt_table *table;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(mutex);</div><div class='del'>-	list_for_each_entry(e, head, list) {</div><div class='del'>-		if (strcmp(e-&gt;name, name) == 0)</div><div class='del'>-			return e;</div><div class='add'>+	list_for_each_entry(table, &amp;ebt_net-&gt;tables, list) {</div><div class='add'>+		if (strcmp(table-&gt;name, name) == 0)</div><div class='add'>+			return table;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmpl, &amp;template_tables, list) {</div><div class='add'>+		if (strcmp(name, tmpl-&gt;name) == 0) {</div><div class='add'>+			struct module *owner = tmpl-&gt;owner;</div><div class='add'>+</div><div class='add'>+			if (!try_module_get(owner))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			mutex_unlock(mutex);</div><div class='add'>+</div><div class='add'>+			*error = tmpl-&gt;table_init(net);</div><div class='add'>+			if (*error) {</div><div class='add'>+				module_put(owner);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mutex_lock(mutex);</div><div class='add'>+			module_put(owner);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(table, &amp;ebt_net-&gt;tables, list) {</div><div class='add'>+		if (strcmp(table-&gt;name, name) == 0)</div><div class='add'>+			return table;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	*error = -ENOENT;</div><div class='ctx'> 	mutex_unlock(mutex);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='del'>-find_inlist_lock(struct list_head *head, const char *name, const char *prefix,</div><div class='add'>+find_inlist_lock(struct net *net, const char *name, const char *prefix,</div><div class='ctx'> 		 int *error, struct mutex *mutex)</div><div class='ctx'> {</div><div class='ctx'> 	return try_then_request_module(</div><div class='del'>-			find_inlist_lock_noload(head, name, error, mutex),</div><div class='add'>+			find_inlist_lock_noload(net, name, error, mutex),</div><div class='ctx'> 			"%s%s", prefix, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -344,8 +376,7 @@ static inline struct ebt_table *</div><div class='ctx'> find_table_lock(struct net *net, const char *name, int *error,</div><div class='ctx'> 		struct mutex *mutex)</div><div class='ctx'> {</div><div class='del'>-	return find_inlist_lock(&amp;net-&gt;xt.tables[NFPROTO_BRIDGE], name,</div><div class='del'>-				"ebtable_", error, mutex);</div><div class='add'>+	return find_inlist_lock(net, name, "ebtable_", error, mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ebt_free_table_info(struct ebt_table_info *info)</div><div class='hunk'>@@ -385,7 +416,7 @@ ebt_check_match(struct ebt_entry_match *m, struct xt_mtchk_param *par,</div><div class='ctx'> 	par-&gt;match     = match;</div><div class='ctx'> 	par-&gt;matchinfo = m-&gt;data;</div><div class='ctx'> 	ret = xt_check_match(par, m-&gt;match_size,</div><div class='del'>-	      e-&gt;ethproto, e-&gt;invflags &amp; EBT_IPROTO);</div><div class='add'>+	      ntohs(e-&gt;ethproto), e-&gt;invflags &amp; EBT_IPROTO);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		module_put(match-&gt;me);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -422,7 +453,7 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct xt_tgchk_param *par,</div><div class='ctx'> 	par-&gt;target   = watcher;</div><div class='ctx'> 	par-&gt;targinfo = w-&gt;data;</div><div class='ctx'> 	ret = xt_check_target(par, w-&gt;watcher_size,</div><div class='del'>-	      e-&gt;ethproto, e-&gt;invflags &amp; EBT_IPROTO);</div><div class='add'>+	      ntohs(e-&gt;ethproto), e-&gt;invflags &amp; EBT_IPROTO);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		module_put(watcher-&gt;me);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -466,8 +497,6 @@ static int ebt_verify_pointers(const struct ebt_replace *repl,</div><div class='ctx'> 				/* we make userspace set this right,</div><div class='ctx'> 				 * so there is no misunderstanding</div><div class='ctx'> 				 */</div><div class='del'>-				BUGPRINT("EBT_ENTRY_OR_ENTRIES shouldn't be set "</div><div class='del'>-					 "in distinguisher\n");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (i != NF_BR_NUMHOOKS)</div><div class='hunk'>@@ -485,18 +514,14 @@ static int ebt_verify_pointers(const struct ebt_replace *repl,</div><div class='ctx'> 			offset += e-&gt;next_offset;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (offset != limit) {</div><div class='del'>-		BUGPRINT("entries_size too small\n");</div><div class='add'>+	if (offset != limit)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if all valid hooks have a chain */</div><div class='ctx'> 	for (i = 0; i &lt; NF_BR_NUMHOOKS; i++) {</div><div class='ctx'> 		if (!newinfo-&gt;hook_entry[i] &amp;&amp;</div><div class='del'>-		   (valid_hooks &amp; (1 &lt;&lt; i))) {</div><div class='del'>-			BUGPRINT("Valid hook without chain\n");</div><div class='add'>+		   (valid_hooks &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -523,26 +548,20 @@ ebt_check_entry_size_and_hooks(const struct ebt_entry *e,</div><div class='ctx'> 		/* this checks if the previous chain has as many entries</div><div class='ctx'> 		 * as it said it has</div><div class='ctx'> 		 */</div><div class='del'>-		if (*n != *cnt) {</div><div class='del'>-			BUGPRINT("nentries does not equal the nr of entries "</div><div class='del'>-				 "in the chain\n");</div><div class='add'>+		if (*n != *cnt)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		if (((struct ebt_entries *)e)-&gt;policy != EBT_DROP &amp;&amp;</div><div class='ctx'> 		   ((struct ebt_entries *)e)-&gt;policy != EBT_ACCEPT) {</div><div class='ctx'> 			/* only RETURN from udc */</div><div class='ctx'> 			if (i != NF_BR_NUMHOOKS ||</div><div class='del'>-			   ((struct ebt_entries *)e)-&gt;policy != EBT_RETURN) {</div><div class='del'>-				BUGPRINT("bad policy\n");</div><div class='add'>+			   ((struct ebt_entries *)e)-&gt;policy != EBT_RETURN)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i == NF_BR_NUMHOOKS) /* it's a user defined chain */</div><div class='ctx'> 			(*udc_cnt)++;</div><div class='del'>-		if (((struct ebt_entries *)e)-&gt;counter_offset != *totalcnt) {</div><div class='del'>-			BUGPRINT("counter_offset != totalcnt");</div><div class='add'>+		if (((struct ebt_entries *)e)-&gt;counter_offset != *totalcnt)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		*n = ((struct ebt_entries *)e)-&gt;nentries;</div><div class='ctx'> 		*cnt = 0;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -550,15 +569,13 @@ ebt_check_entry_size_and_hooks(const struct ebt_entry *e,</div><div class='ctx'> 	/* a plain old entry, heh */</div><div class='ctx'> 	if (sizeof(struct ebt_entry) &gt; e-&gt;watchers_offset ||</div><div class='ctx'> 	   e-&gt;watchers_offset &gt; e-&gt;target_offset ||</div><div class='del'>-	   e-&gt;target_offset &gt;= e-&gt;next_offset) {</div><div class='del'>-		BUGPRINT("entry offsets not in right order\n");</div><div class='add'>+	   e-&gt;target_offset &gt;= e-&gt;next_offset)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* this is not checked anywhere else */</div><div class='del'>-	if (e-&gt;next_offset - e-&gt;target_offset &lt; sizeof(struct ebt_entry_target)) {</div><div class='del'>-		BUGPRINT("target size too small\n");</div><div class='add'>+	if (e-&gt;next_offset - e-&gt;target_offset &lt; sizeof(struct ebt_entry_target))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	(*cnt)++;</div><div class='ctx'> 	(*totalcnt)++;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -678,18 +695,15 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,</div><div class='ctx'> 	if (e-&gt;bitmask == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;bitmask &amp; ~EBT_F_MASK) {</div><div class='del'>-		BUGPRINT("Unknown flag for bitmask\n");</div><div class='add'>+	if (e-&gt;bitmask &amp; ~EBT_F_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (e-&gt;invflags &amp; ~EBT_INV_MASK) {</div><div class='del'>-		BUGPRINT("Unknown flag for inv bitmask\n");</div><div class='add'>+</div><div class='add'>+	if (e-&gt;invflags &amp; ~EBT_INV_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if ((e-&gt;bitmask &amp; EBT_NOPROTO) &amp;&amp; (e-&gt;bitmask &amp; EBT_802_3)) {</div><div class='del'>-		BUGPRINT("NOPROTO &amp; 802_3 not allowed\n");</div><div class='add'>+</div><div class='add'>+	if ((e-&gt;bitmask &amp; EBT_NOPROTO) &amp;&amp; (e-&gt;bitmask &amp; EBT_802_3))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* what hook do we belong to? */</div><div class='ctx'> 	for (i = 0; i &lt; NF_BR_NUMHOOKS; i++) {</div><div class='ctx'> 		if (!newinfo-&gt;hook_entry[i])</div><div class='hunk'>@@ -748,13 +762,11 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,</div><div class='ctx'> 	t-&gt;u.target = target;</div><div class='ctx'> 	if (t-&gt;u.target == &amp;ebt_standard_target) {</div><div class='ctx'> 		if (gap &lt; sizeof(struct ebt_standard_target)) {</div><div class='del'>-			BUGPRINT("Standard target size too big\n");</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto cleanup_watchers;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (((struct ebt_standard_target *)t)-&gt;verdict &lt;</div><div class='ctx'> 		   -NUM_STANDARD_TARGETS) {</div><div class='del'>-			BUGPRINT("Invalid standard target\n");</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto cleanup_watchers;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -767,7 +779,7 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,</div><div class='ctx'> 	tgpar.target   = target;</div><div class='ctx'> 	tgpar.targinfo = t-&gt;data;</div><div class='ctx'> 	ret = xt_check_target(&amp;tgpar, t-&gt;target_size,</div><div class='del'>-	      e-&gt;ethproto, e-&gt;invflags &amp; EBT_IPROTO);</div><div class='add'>+	      ntohs(e-&gt;ethproto), e-&gt;invflags &amp; EBT_IPROTO);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		module_put(target-&gt;me);</div><div class='ctx'> 		goto cleanup_watchers;</div><div class='hunk'>@@ -813,10 +825,9 @@ static int check_chainloops(const struct ebt_entries *chain, struct ebt_cl_stack</div><div class='ctx'> 		if (strcmp(t-&gt;u.name, EBT_STANDARD_TARGET))</div><div class='ctx'> 			goto letscontinue;</div><div class='ctx'> 		if (e-&gt;target_offset + sizeof(struct ebt_standard_target) &gt;</div><div class='del'>-		   e-&gt;next_offset) {</div><div class='del'>-			BUGPRINT("Standard target size too big\n");</div><div class='add'>+		   e-&gt;next_offset)</div><div class='ctx'> 			return -1;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		verdict = ((struct ebt_standard_target *)t)-&gt;verdict;</div><div class='ctx'> 		if (verdict &gt;= 0) { /* jump to another chain */</div><div class='ctx'> 			struct ebt_entries *hlp2 =</div><div class='hunk'>@@ -825,14 +836,12 @@ static int check_chainloops(const struct ebt_entries *chain, struct ebt_cl_stack</div><div class='ctx'> 				if (hlp2 == cl_s[i].cs.chaininfo)</div><div class='ctx'> 					break;</div><div class='ctx'> 			/* bad destination or loop */</div><div class='del'>-			if (i == udc_cnt) {</div><div class='del'>-				BUGPRINT("bad destination\n");</div><div class='add'>+			if (i == udc_cnt)</div><div class='ctx'> 				return -1;</div><div class='del'>-			}</div><div class='del'>-			if (cl_s[i].cs.n) {</div><div class='del'>-				BUGPRINT("loop\n");</div><div class='add'>+</div><div class='add'>+			if (cl_s[i].cs.n)</div><div class='ctx'> 				return -1;</div><div class='del'>-			}</div><div class='add'>+</div><div class='ctx'> 			if (cl_s[i].hookmask &amp; (1 &lt;&lt; hooknr))</div><div class='ctx'> 				goto letscontinue;</div><div class='ctx'> 			/* this can't be 0, so the loop test is correct */</div><div class='hunk'>@@ -865,24 +874,21 @@ static int translate_table(struct net *net, const char *name,</div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	while (i &lt; NF_BR_NUMHOOKS &amp;&amp; !newinfo-&gt;hook_entry[i])</div><div class='ctx'> 		i++;</div><div class='del'>-	if (i == NF_BR_NUMHOOKS) {</div><div class='del'>-		BUGPRINT("No valid hooks specified\n");</div><div class='add'>+	if (i == NF_BR_NUMHOOKS)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (newinfo-&gt;hook_entry[i] != (struct ebt_entries *)newinfo-&gt;entries) {</div><div class='del'>-		BUGPRINT("Chains don't start at beginning\n");</div><div class='add'>+</div><div class='add'>+	if (newinfo-&gt;hook_entry[i] != (struct ebt_entries *)newinfo-&gt;entries)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* make sure chains are ordered after each other in same order</div><div class='ctx'> 	 * as their corresponding hooks</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (j = i + 1; j &lt; NF_BR_NUMHOOKS; j++) {</div><div class='ctx'> 		if (!newinfo-&gt;hook_entry[j])</div><div class='ctx'> 			continue;</div><div class='del'>-		if (newinfo-&gt;hook_entry[j] &lt;= newinfo-&gt;hook_entry[i]) {</div><div class='del'>-			BUGPRINT("Hook order must be followed\n");</div><div class='add'>+		if (newinfo-&gt;hook_entry[j] &lt;= newinfo-&gt;hook_entry[i])</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		i = j;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -900,15 +906,11 @@ static int translate_table(struct net *net, const char *name,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (i != j) {</div><div class='del'>-		BUGPRINT("nentries does not equal the nr of entries in the "</div><div class='del'>-			 "(last) chain\n");</div><div class='add'>+	if (i != j)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (k != newinfo-&gt;nentries) {</div><div class='del'>-		BUGPRINT("Total nentries is wrong\n");</div><div class='add'>+</div><div class='add'>+	if (k != newinfo-&gt;nentries)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* get the location of the udc, put them in an array</div><div class='ctx'> 	 * while we're at it, allocate the chainstack</div><div class='hunk'>@@ -918,13 +920,15 @@ static int translate_table(struct net *net, const char *name,</div><div class='ctx'> 		 * if an error occurs</div><div class='ctx'> 		 */</div><div class='ctx'> 		newinfo-&gt;chainstack =</div><div class='del'>-			vmalloc(array_size(nr_cpu_ids,</div><div class='del'>-					   sizeof(*(newinfo-&gt;chainstack))));</div><div class='add'>+			vmalloc_array(nr_cpu_ids,</div><div class='add'>+				      sizeof(*(newinfo-&gt;chainstack)));</div><div class='ctx'> 		if (!newinfo-&gt;chainstack)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		for_each_possible_cpu(i) {</div><div class='ctx'> 			newinfo-&gt;chainstack[i] =</div><div class='del'>-			  vmalloc(array_size(udc_cnt, sizeof(*(newinfo-&gt;chainstack[0]))));</div><div class='add'>+			  vmalloc_node(array_size(udc_cnt,</div><div class='add'>+					  sizeof(*(newinfo-&gt;chainstack[0]))),</div><div class='add'>+				       cpu_to_node(i));</div><div class='ctx'> 			if (!newinfo-&gt;chainstack[i]) {</div><div class='ctx'> 				while (i)</div><div class='ctx'> 					vfree(newinfo-&gt;chainstack[--i]);</div><div class='hunk'>@@ -934,7 +938,7 @@ static int translate_table(struct net *net, const char *name,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cl_s = vmalloc(array_size(udc_cnt, sizeof(*cl_s)));</div><div class='add'>+		cl_s = vmalloc_array(udc_cnt, sizeof(*cl_s));</div><div class='ctx'> 		if (!cl_s)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		i = 0; /* the i'th udc */</div><div class='hunk'>@@ -942,7 +946,6 @@ static int translate_table(struct net *net, const char *name,</div><div class='ctx'> 		   ebt_get_udc_positions, newinfo, &amp;i, cl_s);</div><div class='ctx'> 		/* sanity check */</div><div class='ctx'> 		if (i != udc_cnt) {</div><div class='del'>-			BUGPRINT("i != udc_cnt\n");</div><div class='ctx'> 			vfree(cl_s);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -997,8 +1000,8 @@ static void get_counters(const struct ebt_counter *oldcounters,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		counter_base = COUNTER_BASE(oldcounters, nentries, cpu);</div><div class='ctx'> 		for (i = 0; i &lt; nentries; i++)</div><div class='del'>-			ADD_COUNTER(counters[i], counter_base[i].pcnt,</div><div class='del'>-				    counter_base[i].bcnt);</div><div class='add'>+			ADD_COUNTER(counters[i], counter_base[i].bcnt,</div><div class='add'>+				    counter_base[i].pcnt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1015,8 +1018,8 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,</div><div class='ctx'> 	 * the check on the size is done later, when we have the lock</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (repl-&gt;num_counters) {</div><div class='del'>-		unsigned long size = repl-&gt;num_counters * sizeof(*counterstmp);</div><div class='del'>-		counterstmp = vmalloc(size);</div><div class='add'>+		counterstmp = vmalloc_array(repl-&gt;num_counters,</div><div class='add'>+					    sizeof(*counterstmp));</div><div class='ctx'> 		if (!counterstmp)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1037,12 +1040,12 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,</div><div class='ctx'> 		goto free_iterate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* the table doesn't like it */</div><div class='del'>-	if (t-&gt;check &amp;&amp; (ret = t-&gt;check(newinfo, repl-&gt;valid_hooks)))</div><div class='add'>+	if (repl-&gt;valid_hooks != t-&gt;valid_hooks) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto free_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (repl-&gt;num_counters &amp;&amp; repl-&gt;num_counters != t-&gt;private-&gt;nentries) {</div><div class='del'>-		BUGPRINT("Wrong nr. of counters requested\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto free_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1071,7 +1074,7 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (repl-&gt;num_counters &amp;&amp;</div><div class='ctx'> 	   copy_to_user(repl-&gt;counters, counterstmp,</div><div class='del'>-	   repl-&gt;num_counters * sizeof(struct ebt_counter))) {</div><div class='add'>+	   array_size(repl-&gt;num_counters, sizeof(struct ebt_counter)))) {</div><div class='ctx'> 		/* Silent error, can't fail, new table is already in place */</div><div class='ctx'> 		net_warn_ratelimited("ebtables: counters copy to user failed while replacing table\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1085,15 +1088,9 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,</div><div class='ctx'> 	vfree(table);</div><div class='ctx'> 	vfree(counterstmp);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_AUDIT</div><div class='del'>-	if (audit_enabled) {</div><div class='del'>-		audit_log(audit_context(), GFP_KERNEL,</div><div class='del'>-			  AUDIT_NETFILTER_CFG,</div><div class='del'>-			  "table=%s family=%u entries=%u",</div><div class='del'>-			  repl-&gt;name, AF_BRIDGE, repl-&gt;nentries);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='add'>+	audit_log_nfcfg(repl-&gt;name, AF_BRIDGE, repl-&gt;nentries,</div><div class='add'>+			AUDIT_XT_OP_REPLACE, GFP_KERNEL);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> free_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;ebt_mutex);</div><div class='hunk'>@@ -1108,25 +1105,23 @@ free_counterstmp:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* replace the table */</div><div class='del'>-static int do_replace(struct net *net, const void __user *user,</div><div class='del'>-		      unsigned int len)</div><div class='add'>+static int do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, countersize;</div><div class='ctx'> 	struct ebt_table_info *newinfo;</div><div class='ctx'> 	struct ebt_replace tmp;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (len != sizeof(tmp) + tmp.entries_size) {</div><div class='del'>-		BUGPRINT("Wrong len argument\n");</div><div class='add'>+	if (len != sizeof(tmp) + tmp.entries_size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (tmp.entries_size == 0) {</div><div class='del'>-		BUGPRINT("Entries_size never zero\n");</div><div class='add'>+	if (tmp.entries_size == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* overflow check */</div><div class='ctx'> 	if (tmp.nentries &gt;= ((INT_MAX - sizeof(struct ebt_table_info)) /</div><div class='ctx'> 			NR_CPUS - SMP_CACHE_BYTES) / sizeof(struct ebt_counter))</div><div class='hunk'>@@ -1137,21 +1132,20 @@ static int do_replace(struct net *net, const void __user *user,</div><div class='ctx'> 	tmp.name[sizeof(tmp.name) - 1] = 0;</div><div class='ctx'> </div><div class='ctx'> 	countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;</div><div class='del'>-	newinfo = vmalloc(sizeof(*newinfo) + countersize);</div><div class='add'>+	newinfo = __vmalloc(sizeof(*newinfo) + countersize, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!newinfo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (countersize)</div><div class='ctx'> 		memset(newinfo-&gt;counters, 0, countersize);</div><div class='ctx'> </div><div class='del'>-	newinfo-&gt;entries = vmalloc(tmp.entries_size);</div><div class='add'>+	newinfo-&gt;entries = __vmalloc(tmp.entries_size, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!newinfo-&gt;entries) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (copy_from_user(</div><div class='ctx'> 	   newinfo-&gt;entries, tmp.entries, tmp.entries_size) != 0) {</div><div class='del'>-		BUGPRINT("Couldn't copy entries from userspace\n");</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_entries;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1171,6 +1165,8 @@ static void __ebt_unregister_table(struct net *net, struct ebt_table *table)</div><div class='ctx'> 	mutex_lock(&amp;ebt_mutex);</div><div class='ctx'> 	list_del(&amp;table-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+	audit_log_nfcfg(table-&gt;name, AF_BRIDGE, table-&gt;private-&gt;nentries,</div><div class='add'>+			AUDIT_XT_OP_UNREGISTER, GFP_KERNEL);</div><div class='ctx'> 	EBT_ENTRY_ITERATE(table-&gt;private-&gt;entries, table-&gt;private-&gt;entries_size,</div><div class='ctx'> 			  ebt_cleanup_entry, net, NULL);</div><div class='ctx'> 	if (table-&gt;private-&gt;nentries)</div><div class='hunk'>@@ -1178,24 +1174,26 @@ static void __ebt_unregister_table(struct net *net, struct ebt_table *table)</div><div class='ctx'> 	vfree(table-&gt;private-&gt;entries);</div><div class='ctx'> 	ebt_free_table_info(table-&gt;private);</div><div class='ctx'> 	vfree(table-&gt;private);</div><div class='add'>+	kfree(table-&gt;ops);</div><div class='ctx'> 	kfree(table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ebt_register_table(struct net *net, const struct ebt_table *input_table,</div><div class='del'>-		       const struct nf_hook_ops *ops, struct ebt_table **res)</div><div class='add'>+		       const struct nf_hook_ops *template_ops)</div><div class='ctx'> {</div><div class='add'>+	struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);</div><div class='ctx'> 	struct ebt_table_info *newinfo;</div><div class='ctx'> 	struct ebt_table *t, *table;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	unsigned int num_ops;</div><div class='ctx'> 	struct ebt_replace_kernel *repl;</div><div class='ctx'> 	int ret, i, countersize;</div><div class='ctx'> 	void *p;</div><div class='ctx'> </div><div class='ctx'> 	if (input_table == NULL || (repl = input_table-&gt;table) == NULL ||</div><div class='ctx'> 	    repl-&gt;entries == NULL || repl-&gt;entries_size == 0 ||</div><div class='del'>-	    repl-&gt;counters != NULL || input_table-&gt;private != NULL) {</div><div class='del'>-		BUGPRINT("Bad table data for ebt_register_table!!!\n");</div><div class='add'>+	    repl-&gt;counters != NULL || input_table-&gt;private != NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't add one table to multiple lists. */</div><div class='ctx'> 	table = kmemdup(input_table, sizeof(struct ebt_table), GFP_KERNEL);</div><div class='hunk'>@@ -1233,24 +1231,15 @@ int ebt_register_table(struct net *net, const struct ebt_table *input_table,</div><div class='ctx'> 				((char *)repl-&gt;hook_entry[i] - repl-&gt;entries);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = translate_table(net, repl-&gt;name, newinfo);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		BUGPRINT("Translate_table failed\n");</div><div class='del'>-		goto free_chainstack;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (table-&gt;check &amp;&amp; table-&gt;check(newinfo, table-&gt;valid_hooks)) {</div><div class='del'>-		BUGPRINT("The table doesn't like its own initial data, lol\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		goto free_chainstack;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	table-&gt;private = newinfo;</div><div class='ctx'> 	rwlock_init(&amp;table-&gt;lock);</div><div class='ctx'> 	mutex_lock(&amp;ebt_mutex);</div><div class='del'>-	list_for_each_entry(t, &amp;net-&gt;xt.tables[NFPROTO_BRIDGE], list) {</div><div class='add'>+	list_for_each_entry(t, &amp;ebt_net-&gt;tables, list) {</div><div class='ctx'> 		if (strcmp(t-&gt;name, table-&gt;name) == 0) {</div><div class='ctx'> 			ret = -EEXIST;</div><div class='del'>-			BUGPRINT("Table name already exists\n");</div><div class='ctx'> 			goto free_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1260,20 +1249,34 @@ int ebt_register_table(struct net *net, const struct ebt_table *input_table,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto free_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	list_add(&amp;table-&gt;list, &amp;net-&gt;xt.tables[NFPROTO_BRIDGE]);</div><div class='del'>-	mutex_unlock(&amp;ebt_mutex);</div><div class='ctx'> </div><div class='del'>-	WRITE_ONCE(*res, table);</div><div class='add'>+	num_ops = hweight32(table-&gt;valid_hooks);</div><div class='add'>+	if (num_ops == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!ops)</div><div class='del'>-		return 0;</div><div class='add'>+	ops = kmemdup_array(template_ops, num_ops, sizeof(*ops), GFP_KERNEL);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		if (newinfo-&gt;nentries)</div><div class='add'>+			module_put(table-&gt;me);</div><div class='add'>+		goto free_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = nf_register_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	if (ret) {</div><div class='add'>+	for (i = 0; i &lt; num_ops; i++)</div><div class='add'>+		ops[i].priv = table;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;table-&gt;list, &amp;ebt_net-&gt;tables);</div><div class='add'>+	mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+</div><div class='add'>+	table-&gt;ops = ops;</div><div class='add'>+	ret = nf_register_net_hooks(net, ops, num_ops);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		__ebt_unregister_table(net, table);</div><div class='del'>-		*res = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	audit_log_nfcfg(repl-&gt;name, AF_BRIDGE, repl-&gt;nentries,</div><div class='add'>+			AUDIT_XT_OP_REGISTER, GFP_KERNEL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> free_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;ebt_mutex);</div><div class='hunk'>@@ -1288,19 +1291,93 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ebt_unregister_table(struct net *net, struct ebt_table *table,</div><div class='del'>-			  const struct nf_hook_ops *ops)</div><div class='add'>+int ebt_register_template(const struct ebt_table *t, int (*table_init)(struct net *net))</div><div class='ctx'> {</div><div class='del'>-	if (ops)</div><div class='del'>-		nf_unregister_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	__ebt_unregister_table(net, table);</div><div class='add'>+	struct ebt_template *tmpl;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ebt_mutex);</div><div class='add'>+	list_for_each_entry(tmpl, &amp;template_tables, list) {</div><div class='add'>+		if (WARN_ON_ONCE(strcmp(t-&gt;name, tmpl-&gt;name) == 0)) {</div><div class='add'>+			mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmpl = kzalloc(sizeof(*tmpl), GFP_KERNEL);</div><div class='add'>+	if (!tmpl) {</div><div class='add'>+		mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmpl-&gt;table_init = table_init;</div><div class='add'>+	strscpy(tmpl-&gt;name, t-&gt;name, sizeof(tmpl-&gt;name));</div><div class='add'>+	tmpl-&gt;owner = t-&gt;me;</div><div class='add'>+	list_add(&amp;tmpl-&gt;list, &amp;template_tables);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ebt_register_template);</div><div class='add'>+</div><div class='add'>+void ebt_unregister_template(const struct ebt_table *t)</div><div class='add'>+{</div><div class='add'>+	struct ebt_template *tmpl;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ebt_mutex);</div><div class='add'>+	list_for_each_entry(tmpl, &amp;template_tables, list) {</div><div class='add'>+		if (strcmp(t-&gt;name, tmpl-&gt;name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;tmpl-&gt;list);</div><div class='add'>+		mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+		kfree(tmpl);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ebt_unregister_template);</div><div class='add'>+</div><div class='add'>+static struct ebt_table *__ebt_find_table(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);</div><div class='add'>+	struct ebt_table *t;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ebt_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(t, &amp;ebt_net-&gt;tables, list) {</div><div class='add'>+		if (strcmp(t-&gt;name, name) == 0) {</div><div class='add'>+			mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+			return t;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ebt_unregister_table_pre_exit(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct ebt_table *table = __ebt_find_table(net, name);</div><div class='add'>+</div><div class='add'>+	if (table)</div><div class='add'>+		nf_unregister_net_hooks(net, table-&gt;ops, hweight32(table-&gt;valid_hooks));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ebt_unregister_table_pre_exit);</div><div class='add'>+</div><div class='add'>+void ebt_unregister_table(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct ebt_table *table = __ebt_find_table(net, name);</div><div class='add'>+</div><div class='add'>+	if (table)</div><div class='add'>+		__ebt_unregister_table(net, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* userspace just supplied us with counters */</div><div class='ctx'> static int do_update_counters(struct net *net, const char *name,</div><div class='del'>-				struct ebt_counter __user *counters,</div><div class='del'>-				unsigned int num_counters,</div><div class='del'>-				const void __user *user, unsigned int len)</div><div class='add'>+			      struct ebt_counter __user *counters,</div><div class='add'>+			      unsigned int num_counters, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	struct ebt_counter *tmp;</div><div class='hunk'>@@ -1309,7 +1386,7 @@ static int do_update_counters(struct net *net, const char *name,</div><div class='ctx'> 	if (num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tmp = vmalloc(array_size(num_counters, sizeof(*tmp)));</div><div class='add'>+	tmp = vmalloc_array(num_counters, sizeof(*tmp));</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1318,12 +1395,12 @@ static int do_update_counters(struct net *net, const char *name,</div><div class='ctx'> 		goto free_tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (num_counters != t-&gt;private-&gt;nentries) {</div><div class='del'>-		BUGPRINT("Wrong nr of counters\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto unlock_mutex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(tmp, counters, num_counters * sizeof(*counters))) {</div><div class='add'>+	if (copy_from_user(tmp, counters,</div><div class='add'>+			   array_size(num_counters, sizeof(*counters)))) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto unlock_mutex;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1333,7 +1410,7 @@ static int do_update_counters(struct net *net, const char *name,</div><div class='ctx'> </div><div class='ctx'> 	/* we add to the counters of the first cpu */</div><div class='ctx'> 	for (i = 0; i &lt; num_counters; i++)</div><div class='del'>-		ADD_COUNTER(t-&gt;private-&gt;counters[i], tmp[i].pcnt, tmp[i].bcnt);</div><div class='add'>+		ADD_COUNTER(t-&gt;private-&gt;counters[i], tmp[i].bcnt, tmp[i].pcnt);</div><div class='ctx'> </div><div class='ctx'> 	write_unlock_bh(&amp;t-&gt;lock);</div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -1344,19 +1421,20 @@ free_tmp:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int update_counters(struct net *net, const void __user *user,</div><div class='del'>-			    unsigned int len)</div><div class='add'>+static int update_counters(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ebt_replace hlp;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;hlp, user, sizeof(hlp)))</div><div class='add'>+	if (len &lt; sizeof(hlp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;hlp, arg, sizeof(hlp)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (len != sizeof(hlp) + hlp.num_counters * sizeof(struct ebt_counter))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return do_update_counters(net, hlp.name, hlp.counters,</div><div class='del'>-				hlp.num_counters, user, len);</div><div class='add'>+				  hlp.num_counters, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ebt_obj_to_user(char __user *um, const char *_name,</div><div class='hunk'>@@ -1368,7 +1446,7 @@ static inline int ebt_obj_to_user(char __user *um, const char *_name,</div><div class='ctx'> 	/* ebtables expects 31 bytes long names but xt_match names are 29 bytes</div><div class='ctx'> 	 * long. Copy 29 bytes and fill remaining bytes with zeroes.</div><div class='ctx'> 	 */</div><div class='del'>-	strlcpy(name, _name, sizeof(name));</div><div class='add'>+	strscpy(name, _name, sizeof(name));</div><div class='ctx'> 	if (copy_to_user(um, name, EBT_EXTENSION_MAXNAMELEN) ||</div><div class='ctx'> 	    put_user(revision, (u8 __user *)(um + EBT_EXTENSION_MAXNAMELEN)) ||</div><div class='ctx'> 	    put_user(datasize, (int __user *)(um + EBT_EXTENSION_MAXNAMELEN + 1)) ||</div><div class='hunk'>@@ -1445,12 +1523,10 @@ static int copy_counters_to_user(struct ebt_table *t,</div><div class='ctx'> 	if (num_counters == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (num_counters != nentries) {</div><div class='del'>-		BUGPRINT("Num_counters wrong\n");</div><div class='add'>+	if (num_counters != nentries)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	counterstmp = vmalloc(array_size(nentries, sizeof(*counterstmp)));</div><div class='add'>+	counterstmp = vmalloc_array(nentries, sizeof(*counterstmp));</div><div class='ctx'> 	if (!counterstmp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1459,7 +1535,7 @@ static int copy_counters_to_user(struct ebt_table *t,</div><div class='ctx'> 	write_unlock_bh(&amp;t-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(user, counterstmp,</div><div class='del'>-	   nentries * sizeof(struct ebt_counter)))</div><div class='add'>+	    array_size(nentries, sizeof(struct ebt_counter))))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	vfree(counterstmp);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1494,15 +1570,11 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,</div><div class='ctx'> 	   (tmp.num_counters ? nentries * sizeof(struct ebt_counter) : 0))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (tmp.nentries != nentries) {</div><div class='del'>-		BUGPRINT("Nentries wrong\n");</div><div class='add'>+	if (tmp.nentries != nentries)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (tmp.entries_size != entries_size) {</div><div class='del'>-		BUGPRINT("Wrong size\n");</div><div class='add'>+	if (tmp.entries_size != entries_size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = copy_counters_to_user(t, oldcounters, tmp.counters,</div><div class='ctx'> 					tmp.num_counters, nentries);</div><div class='hunk'>@@ -1514,88 +1586,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,</div><div class='ctx'> 	   ebt_entry_to_user, entries, tmp.entries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_ebt_set_ctl(struct sock *sk,</div><div class='del'>-	int cmd, void __user *user, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case EBT_SO_SET_ENTRIES:</div><div class='del'>-		ret = do_replace(net, user, len);</div><div class='del'>-		break;</div><div class='del'>-	case EBT_SO_SET_COUNTERS:</div><div class='del'>-		ret = update_counters(net, user, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct ebt_replace tmp;</div><div class='del'>-	struct ebt_table *t;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	tmp.name[sizeof(tmp.name) - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	t = find_table_lock(net, tmp.name, &amp;ret, &amp;ebt_mutex);</div><div class='del'>-	if (!t)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case EBT_SO_GET_INFO:</div><div class='del'>-	case EBT_SO_GET_INIT_INFO:</div><div class='del'>-		if (*len != sizeof(struct ebt_replace)) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			mutex_unlock(&amp;ebt_mutex);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (cmd == EBT_SO_GET_INFO) {</div><div class='del'>-			tmp.nentries = t-&gt;private-&gt;nentries;</div><div class='del'>-			tmp.entries_size = t-&gt;private-&gt;entries_size;</div><div class='del'>-			tmp.valid_hooks = t-&gt;valid_hooks;</div><div class='del'>-		} else {</div><div class='del'>-			tmp.nentries = t-&gt;table-&gt;nentries;</div><div class='del'>-			tmp.entries_size = t-&gt;table-&gt;entries_size;</div><div class='del'>-			tmp.valid_hooks = t-&gt;table-&gt;valid_hooks;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;ebt_mutex);</div><div class='del'>-		if (copy_to_user(user, &amp;tmp, *len) != 0) {</div><div class='del'>-			BUGPRINT("c2u Didn't work\n");</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case EBT_SO_GET_ENTRIES:</div><div class='del'>-	case EBT_SO_GET_INIT_ENTRIES:</div><div class='del'>-		ret = copy_everything_to_user(t, user, len, cmd);</div><div class='del'>-		mutex_unlock(&amp;ebt_mutex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		mutex_unlock(&amp;ebt_mutex);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> /* 32 bit-userspace compatibility definitions. */</div><div class='ctx'> struct compat_ebt_replace {</div><div class='ctx'> 	char name[EBT_TABLE_MAXNAMELEN];</div><div class='hunk'>@@ -1621,7 +1612,7 @@ struct compat_ebt_entry_mwt {</div><div class='ctx'> 		compat_uptr_t ptr;</div><div class='ctx'> 	} u;</div><div class='ctx'> 	compat_uint_t match_size;</div><div class='del'>-	compat_uint_t data[0] __attribute__ ((aligned (__alignof__(struct compat_ebt_replace))));</div><div class='add'>+	compat_uint_t data[] __aligned(__alignof__(struct compat_ebt_replace));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* account for possible padding between match_size and -&gt;data */</div><div class='hunk'>@@ -1830,20 +1821,28 @@ static int compat_calc_entry(const struct ebt_entry *e,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ebt_compat_init_offsets(unsigned int number)</div><div class='add'>+{</div><div class='add'>+	if (number &gt; INT_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* also count the base chain policies */</div><div class='add'>+	number += NF_BR_NUMHOOKS;</div><div class='add'>+</div><div class='add'>+	return xt_compat_init_offsets(NFPROTO_BRIDGE, number);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int compat_table_info(const struct ebt_table_info *info,</div><div class='ctx'> 			     struct compat_ebt_replace *newinfo)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int size = info-&gt;entries_size;</div><div class='ctx'> 	const void *entries = info-&gt;entries;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	newinfo-&gt;entries_size = size;</div><div class='del'>-	if (info-&gt;nentries) {</div><div class='del'>-		int ret = xt_compat_init_offsets(NFPROTO_BRIDGE,</div><div class='del'>-						 info-&gt;nentries);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	ret = ebt_compat_init_offsets(info-&gt;nentries);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info,</div><div class='ctx'> 							entries, newinfo);</div><div class='hunk'>@@ -1919,7 +1918,7 @@ static int ebt_buf_count(struct ebt_entries_buf_state *state, unsigned int sz)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ebt_buf_add(struct ebt_entries_buf_state *state,</div><div class='del'>-		       void *data, unsigned int sz)</div><div class='add'>+		       const void *data, unsigned int sz)</div><div class='ctx'> {</div><div class='ctx'> 	if (state-&gt;buf_kern_start == NULL)</div><div class='ctx'> 		goto count_only;</div><div class='hunk'>@@ -1953,7 +1952,7 @@ enum compat_mwt {</div><div class='ctx'> 	EBT_COMPAT_TARGET,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,</div><div class='add'>+static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt,</div><div class='ctx'> 				enum compat_mwt compat_mwt,</div><div class='ctx'> 				struct ebt_entries_buf_state *state,</div><div class='ctx'> 				const unsigned char *base)</div><div class='hunk'>@@ -1991,7 +1990,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,</div><div class='ctx'> 			size_kern = match_size;</div><div class='ctx'> 		module_put(match-&gt;me);</div><div class='ctx'> 		break;</div><div class='del'>-	case EBT_COMPAT_WATCHER: /* fallthrough */</div><div class='add'>+	case EBT_COMPAT_WATCHER:</div><div class='ctx'> 	case EBT_COMPAT_TARGET:</div><div class='ctx'> 		wt = xt_request_find_target(NFPROTO_BRIDGE, name,</div><div class='ctx'> 					    mwt-&gt;u.revision);</div><div class='hunk'>@@ -2031,22 +2030,23 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,</div><div class='ctx'> /* return size of all matches, watchers or target, including necessary</div><div class='ctx'>  * alignment and padding.</div><div class='ctx'>  */</div><div class='del'>-static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32,</div><div class='add'>+static int ebt_size_mwt(const struct compat_ebt_entry_mwt *match32,</div><div class='ctx'> 			unsigned int size_left, enum compat_mwt type,</div><div class='ctx'> 			struct ebt_entries_buf_state *state, const void *base)</div><div class='ctx'> {</div><div class='add'>+	const char *buf = (const char *)match32;</div><div class='ctx'> 	int growth = 0;</div><div class='del'>-	char *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (size_left == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	buf = (char *) match32;</div><div class='del'>-</div><div class='del'>-	while (size_left &gt;= sizeof(*match32)) {</div><div class='add'>+	do {</div><div class='ctx'> 		struct ebt_entry_match *match_kern;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='add'>+		if (size_left &lt; sizeof(*match32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		match_kern = (struct ebt_entry_match *) state-&gt;buf_kern_start;</div><div class='ctx'> 		if (match_kern) {</div><div class='ctx'> 			char *tmp;</div><div class='hunk'>@@ -2083,21 +2083,18 @@ static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32,</div><div class='ctx'> 		if (match_kern)</div><div class='ctx'> 			match_kern-&gt;match_size = ret;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(type == EBT_COMPAT_TARGET &amp;&amp; size_left))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		match32 = (struct compat_ebt_entry_mwt *) buf;</div><div class='del'>-	}</div><div class='add'>+	} while (size_left);</div><div class='ctx'> </div><div class='ctx'> 	return growth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called for all ebt_entry structures. */</div><div class='del'>-static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base,</div><div class='add'>+static int size_entry_mwt(const struct ebt_entry *entry, const unsigned char *base,</div><div class='ctx'> 			  unsigned int *total,</div><div class='ctx'> 			  struct ebt_entries_buf_state *state)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, j, startoff, new_offset = 0;</div><div class='add'>+	unsigned int i, j, startoff, next_expected_off, new_offset = 0;</div><div class='ctx'> 	/* stores match/watchers/targets &amp; offset of next struct ebt_entry: */</div><div class='ctx'> 	unsigned int offsets[4];</div><div class='ctx'> 	unsigned int *offsets_update = NULL;</div><div class='hunk'>@@ -2122,8 +2119,7 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	offsets[0] = sizeof(struct ebt_entry); /* matches come first */</div><div class='del'>-	memcpy(&amp;offsets[1], &amp;entry-&gt;watchers_offset,</div><div class='del'>-			sizeof(offsets) - sizeof(offsets[0]));</div><div class='add'>+	memcpy(&amp;offsets[1], &amp;entry-&gt;offsets, sizeof(entry-&gt;offsets));</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;buf_kern_start) {</div><div class='ctx'> 		buf_start = state-&gt;buf_kern_start + state-&gt;buf_kern_offset;</div><div class='hunk'>@@ -2183,11 +2179,13 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	startoff = state-&gt;buf_user_offset - startoff;</div><div class='add'>+	next_expected_off = state-&gt;buf_user_offset - startoff;</div><div class='add'>+	if (next_expected_off != entry-&gt;next_offset)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(*total &lt; startoff))</div><div class='add'>+	if (*total &lt; entry-&gt;next_offset)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	*total -= startoff;</div><div class='add'>+	*total -= entry-&gt;next_offset;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2208,13 +2206,15 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(size_remaining);</div><div class='add'>+	if (size_remaining)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	return state-&gt;buf_kern_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int compat_copy_ebt_replace_from_user(struct ebt_replace *repl,</div><div class='del'>-					    void __user *user, unsigned int len)</div><div class='add'>+					     sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct compat_ebt_replace tmp;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2222,7 +2222,7 @@ static int compat_copy_ebt_replace_from_user(struct ebt_replace *repl,</div><div class='ctx'> 	if (len &lt; sizeof(tmp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)))</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (len != sizeof(tmp) + tmp.entries_size)</div><div class='hunk'>@@ -2249,8 +2249,7 @@ static int compat_copy_ebt_replace_from_user(struct ebt_replace *repl,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compat_do_replace(struct net *net, void __user *user,</div><div class='del'>-			     unsigned int len)</div><div class='add'>+static int compat_do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i, countersize, size64;</div><div class='ctx'> 	struct ebt_table_info *newinfo;</div><div class='hunk'>@@ -2258,10 +2257,10 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> 	struct ebt_entries_buf_state state;</div><div class='ctx'> 	void *entries_tmp;</div><div class='ctx'> </div><div class='del'>-	ret = compat_copy_ebt_replace_from_user(&amp;tmp, user, len);</div><div class='add'>+	ret = compat_copy_ebt_replace_from_user(&amp;tmp, arg, len);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* try real handler in case userland supplied needed padding */</div><div class='del'>-		if (ret == -EINVAL &amp;&amp; do_replace(net, user, len) == 0)</div><div class='add'>+		if (ret == -EINVAL &amp;&amp; do_replace(net, arg, len) == 0)</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2291,9 +2290,10 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> </div><div class='ctx'> 	xt_compat_lock(NFPROTO_BRIDGE);</div><div class='ctx'> </div><div class='del'>-	ret = xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);</div><div class='add'>+	ret = ebt_compat_init_offsets(tmp.nentries);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+</div><div class='ctx'> 	ret = compat_copy_entries(entries_tmp, tmp.entries_size, &amp;state);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -2315,8 +2315,10 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> 	state.buf_kern_len = size64;</div><div class='ctx'> </div><div class='ctx'> 	ret = compat_copy_entries(entries_tmp, tmp.entries_size, &amp;state);</div><div class='del'>-	if (WARN_ON(ret &lt; 0))</div><div class='add'>+	if (WARN_ON(ret &lt; 0)) {</div><div class='add'>+		vfree(entries_tmp);</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	vfree(entries_tmp);</div><div class='ctx'> 	tmp.entries_size = size64;</div><div class='hunk'>@@ -2349,42 +2351,22 @@ out_unlock:</div><div class='ctx'> 	goto free_entries;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compat_update_counters(struct net *net, void __user *user,</div><div class='add'>+static int compat_update_counters(struct net *net, sockptr_t arg,</div><div class='ctx'> 				  unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct compat_ebt_replace hlp;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;hlp, user, sizeof(hlp)))</div><div class='add'>+	if (len &lt; sizeof(hlp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;hlp, arg, sizeof(hlp)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* try real handler in case userland supplied needed padding */</div><div class='ctx'> 	if (len != sizeof(hlp) + hlp.num_counters * sizeof(struct ebt_counter))</div><div class='del'>-		return update_counters(net, user, len);</div><div class='add'>+		return update_counters(net, arg, len);</div><div class='ctx'> </div><div class='ctx'> 	return do_update_counters(net, hlp.name, compat_ptr(hlp.counters),</div><div class='del'>-					hlp.num_counters, user, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int compat_do_ebt_set_ctl(struct sock *sk,</div><div class='del'>-		int cmd, void __user *user, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case EBT_SO_SET_ENTRIES:</div><div class='del'>-		ret = compat_do_replace(net, user, len);</div><div class='del'>-		break;</div><div class='del'>-	case EBT_SO_SET_COUNTERS:</div><div class='del'>-		ret = compat_update_counters(net, user, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='add'>+				  hlp.num_counters, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,</div><div class='hunk'>@@ -2395,13 +2377,9 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,</div><div class='ctx'> 	struct ebt_table *t;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> </div><div class='del'>-	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	/* try real handler in case userland supplied needed padding */</div><div class='del'>-	if ((cmd == EBT_SO_GET_INFO ||</div><div class='del'>-	     cmd == EBT_SO_GET_INIT_INFO) &amp;&amp; *len != sizeof(tmp))</div><div class='del'>-			return do_ebt_get_ctl(sk, cmd, user, len);</div><div class='add'>+	if ((cmd == EBT_SO_GET_INFO || cmd == EBT_SO_GET_INIT_INFO) &amp;&amp;</div><div class='add'>+	    *len != sizeof(struct compat_ebt_replace))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;tmp, user, sizeof(tmp)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -2464,23 +2442,129 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct ebt_replace tmp;</div><div class='add'>+	struct ebt_table *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	/* try real handler in case userland supplied needed padding */</div><div class='add'>+	if (in_compat_syscall() &amp;&amp;</div><div class='add'>+	    ((cmd != EBT_SO_GET_INFO &amp;&amp; cmd != EBT_SO_GET_INIT_INFO) ||</div><div class='add'>+	     *len != sizeof(tmp)))</div><div class='add'>+		return compat_do_ebt_get_ctl(sk, cmd, user, len);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;tmp, user, sizeof(tmp)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	tmp.name[sizeof(tmp.name) - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	t = find_table_lock(net, tmp.name, &amp;ret, &amp;ebt_mutex);</div><div class='add'>+	if (!t)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case EBT_SO_GET_INFO:</div><div class='add'>+	case EBT_SO_GET_INIT_INFO:</div><div class='add'>+		if (*len != sizeof(struct ebt_replace)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (cmd == EBT_SO_GET_INFO) {</div><div class='add'>+			tmp.nentries = t-&gt;private-&gt;nentries;</div><div class='add'>+			tmp.entries_size = t-&gt;private-&gt;entries_size;</div><div class='add'>+			tmp.valid_hooks = t-&gt;valid_hooks;</div><div class='add'>+		} else {</div><div class='add'>+			tmp.nentries = t-&gt;table-&gt;nentries;</div><div class='add'>+			tmp.entries_size = t-&gt;table-&gt;entries_size;</div><div class='add'>+			tmp.valid_hooks = t-&gt;table-&gt;valid_hooks;</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+		if (copy_to_user(user, &amp;tmp, *len) != 0) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case EBT_SO_GET_ENTRIES:</div><div class='add'>+	case EBT_SO_GET_INIT_ENTRIES:</div><div class='add'>+		ret = copy_everything_to_user(t, user, len, cmd);</div><div class='add'>+		mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		mutex_unlock(&amp;ebt_mutex);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_ebt_set_ctl(struct sock *sk, int cmd, sockptr_t arg,</div><div class='add'>+		unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case EBT_SO_SET_ENTRIES:</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_do_replace(net, arg, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = do_replace(net, arg, len);</div><div class='add'>+		break;</div><div class='add'>+	case EBT_SO_SET_COUNTERS:</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_update_counters(net, arg, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = update_counters(net, arg, len);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct nf_sockopt_ops ebt_sockopts = {</div><div class='ctx'> 	.pf		= PF_INET,</div><div class='ctx'> 	.set_optmin	= EBT_BASE_CTL,</div><div class='ctx'> 	.set_optmax	= EBT_SO_SET_MAX + 1,</div><div class='ctx'> 	.set		= do_ebt_set_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_set	= compat_do_ebt_set_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.get_optmin	= EBT_BASE_CTL,</div><div class='ctx'> 	.get_optmax	= EBT_SO_GET_MAX + 1,</div><div class='ctx'> 	.get		= do_ebt_get_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_get	= compat_do_ebt_get_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __net_init ebt_pernet_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ebt_net-&gt;tables);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations ebt_net_ops = {</div><div class='add'>+	.init = ebt_pernet_init,</div><div class='add'>+	.id   = &amp;ebt_pernet_id,</div><div class='add'>+	.size = sizeof(struct ebt_pernet),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init ebtables_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2494,13 +2578,21 @@ static int __init ebtables_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = register_pernet_subsys(&amp;ebt_net_ops);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nf_unregister_sockopt(&amp;ebt_sockopts);</div><div class='add'>+		xt_unregister_target(&amp;ebt_standard_target);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit ebtables_fini(void)</div><div class='add'>+static void ebtables_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	nf_unregister_sockopt(&amp;ebt_sockopts);</div><div class='ctx'> 	xt_unregister_target(&amp;ebt_standard_target);</div><div class='add'>+	unregister_pernet_subsys(&amp;ebt_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ebt_register_table);</div><div class='hunk'>@@ -2509,3 +2601,4 @@ EXPORT_SYMBOL(ebt_do_table);</div><div class='ctx'> module_init(ebtables_init);</div><div class='ctx'> module_exit(ebtables_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("ebtables legacy core");</div><div class='head'>diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c<br/>new file mode 100644<br/>index 000000000000..6482de4d8750<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/nf_conntrack_bridge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/nf_conntrack_bridge.c</a></div><div class='hunk'>@@ -0,0 +1,455 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/netfilter.h&gt;</div><div class='add'>+#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='add'>+#include &lt;linux/netfilter_bridge.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/icmp.h&gt;</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+#include &lt;net/route.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_core.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_helper.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_bridge.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../br_private.h"</div><div class='add'>+</div><div class='add'>+/* Best effort variant of ip_do_fragment which preserves geometry, unless skbuff</div><div class='add'>+ * has been linearized or cloned.</div><div class='add'>+ */</div><div class='add'>+static int nf_br_ip_fragment(struct net *net, struct sock *sk,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     struct nf_bridge_frag_data *data,</div><div class='add'>+			     int (*output)(struct net *, struct sock *sk,</div><div class='add'>+					   const struct nf_bridge_frag_data *data,</div><div class='add'>+					   struct sk_buff *))</div><div class='add'>+{</div><div class='add'>+	int frag_max_size = BR_INPUT_SKB_CB(skb)-&gt;frag_max_size;</div><div class='add'>+	u8 tstamp_type = skb-&gt;tstamp_type;</div><div class='add'>+	unsigned int hlen, ll_rs, mtu;</div><div class='add'>+	ktime_t tstamp = skb-&gt;tstamp;</div><div class='add'>+	struct ip_frag_state state;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* for offloaded checksums cleanup checksum before fragmentation */</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    (err = skb_checksum_help(skb)))</div><div class='add'>+		goto blackhole;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Setup starting values</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	hlen = iph-&gt;ihl * 4;</div><div class='add'>+	frag_max_size -= hlen;</div><div class='add'>+	ll_rs = LL_RESERVED_SPACE(skb-&gt;dev);</div><div class='add'>+	mtu = skb-&gt;dev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	if (skb_has_frag_list(skb)) {</div><div class='add'>+		unsigned int first_len = skb_pagelen(skb);</div><div class='add'>+		struct ip_fraglist_iter iter;</div><div class='add'>+		struct sk_buff *frag;</div><div class='add'>+</div><div class='add'>+		if (first_len - hlen &gt; mtu)</div><div class='add'>+			goto blackhole;</div><div class='add'>+</div><div class='add'>+		if (skb_cloned(skb) ||</div><div class='add'>+		    skb_headroom(skb) &lt; ll_rs)</div><div class='add'>+			goto slow_path;</div><div class='add'>+</div><div class='add'>+		skb_walk_frags(skb, frag) {</div><div class='add'>+			if (frag-&gt;len &gt; mtu)</div><div class='add'>+				goto blackhole;</div><div class='add'>+</div><div class='add'>+			if (skb_shared(frag) ||</div><div class='add'>+			    skb_headroom(frag) &lt; hlen + ll_rs)</div><div class='add'>+				goto slow_path;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ip_fraglist_init(skb, iph, hlen, &amp;iter);</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			if (iter.frag)</div><div class='add'>+				ip_fraglist_prepare(skb, &amp;iter);</div><div class='add'>+</div><div class='add'>+			skb_set_delivery_time(skb, tstamp, tstamp_type);</div><div class='add'>+			err = output(net, sk, data, skb);</div><div class='add'>+			if (err || !iter.frag)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			skb = ip_fraglist_next(&amp;iter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		kfree_skb_list(iter.frag);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+slow_path:</div><div class='add'>+	/* This is a linearized skbuff, the original geometry is lost for us.</div><div class='add'>+	 * This may also be a clone skbuff, we could preserve the geometry for</div><div class='add'>+	 * the copies but probably not worth the effort.</div><div class='add'>+	 */</div><div class='add'>+	ip_frag_init(skb, hlen, ll_rs, frag_max_size, false, &amp;state);</div><div class='add'>+</div><div class='add'>+	while (state.left &gt; 0) {</div><div class='add'>+		struct sk_buff *skb2;</div><div class='add'>+</div><div class='add'>+		skb2 = ip_frag_next(skb, &amp;state);</div><div class='add'>+		if (IS_ERR(skb2)) {</div><div class='add'>+			err = PTR_ERR(skb2);</div><div class='add'>+			goto blackhole;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_set_delivery_time(skb2, tstamp, tstamp_type);</div><div class='add'>+		err = output(net, sk, data, skb2);</div><div class='add'>+		if (err)</div><div class='add'>+			goto blackhole;</div><div class='add'>+	}</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+blackhole:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ip_defrag() expects IPCB() in place. */</div><div class='add'>+static void br_skb_cb_save(struct sk_buff *skb, struct br_input_skb_cb *cb,</div><div class='add'>+			   size_t inet_skb_parm_size)</div><div class='add'>+{</div><div class='add'>+	memcpy(cb, skb-&gt;cb, sizeof(*cb));</div><div class='add'>+	memset(skb-&gt;cb, 0, inet_skb_parm_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void br_skb_cb_restore(struct sk_buff *skb,</div><div class='add'>+			      const struct br_input_skb_cb *cb,</div><div class='add'>+			      u16 fragsz)</div><div class='add'>+{</div><div class='add'>+	memcpy(skb-&gt;cb, cb, sizeof(*cb));</div><div class='add'>+	BR_INPUT_SKB_CB(skb)-&gt;frag_max_size = fragsz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nf_ct_br_defrag4(struct sk_buff *skb,</div><div class='add'>+				     const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	u16 zone_id = NF_CT_DEFAULT_ZONE_ID;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	struct br_input_skb_cb cb;</div><div class='add'>+	const struct nf_conn *ct;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ip_is_fragment(ip_hdr(skb)))</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='add'>+	if (ct)</div><div class='add'>+		zone_id = nf_ct_zone_id(nf_ct_zone(ct), CTINFO2DIR(ctinfo));</div><div class='add'>+</div><div class='add'>+	br_skb_cb_save(skb, &amp;cb, sizeof(struct inet_skb_parm));</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	err = ip_defrag(state-&gt;net, skb,</div><div class='add'>+			IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	if (!err) {</div><div class='add'>+		br_skb_cb_restore(skb, &amp;cb, IPCB(skb)-&gt;frag_max_size);</div><div class='add'>+		skb-&gt;ignore_df = 1;</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NF_STOLEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nf_ct_br_defrag6(struct sk_buff *skb,</div><div class='add'>+				     const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)</div><div class='add'>+	u16 zone_id = NF_CT_DEFAULT_ZONE_ID;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	struct br_input_skb_cb cb;</div><div class='add'>+	const struct nf_conn *ct;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='add'>+	if (ct)</div><div class='add'>+		zone_id = nf_ct_zone_id(nf_ct_zone(ct), CTINFO2DIR(ctinfo));</div><div class='add'>+</div><div class='add'>+	br_skb_cb_save(skb, &amp;cb, sizeof(struct inet6_skb_parm));</div><div class='add'>+</div><div class='add'>+	err = nf_ct_frag6_gather(state-&gt;net, skb,</div><div class='add'>+				 IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id);</div><div class='add'>+	/* queued */</div><div class='add'>+	if (err == -EINPROGRESS)</div><div class='add'>+		return NF_STOLEN;</div><div class='add'>+</div><div class='add'>+	br_skb_cb_restore(skb, &amp;cb, IP6CB(skb)-&gt;frag_max_size);</div><div class='add'>+	return err == 0 ? NF_ACCEPT : NF_DROP;</div><div class='add'>+#else</div><div class='add'>+	return NF_ACCEPT;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nf_ct_br_ip_check(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph;</div><div class='add'>+	int nhoff, len;</div><div class='add'>+</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	if (iph-&gt;ihl &lt; 5 ||</div><div class='add'>+	    iph-&gt;version != 4)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	len = skb_ip_totlen(skb);</div><div class='add'>+	if (skb-&gt;len &lt; nhoff + len ||</div><div class='add'>+	    len &lt; (iph-&gt;ihl * 4))</div><div class='add'>+                return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nf_ct_br_ipv6_check(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *hdr;</div><div class='add'>+	int nhoff, len;</div><div class='add'>+</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	if (hdr-&gt;version != 6)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	len = ntohs(hdr-&gt;payload_len) + sizeof(struct ipv6hdr) + nhoff;</div><div class='add'>+	if (skb-&gt;len &lt; len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb,</div><div class='add'>+				     const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	struct nf_hook_state bridge_state = *state;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	struct nf_conn *ct;</div><div class='add'>+	u32 len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='add'>+	if ((ct &amp;&amp; !nf_ct_is_template(ct)) ||</div><div class='add'>+	    ctinfo == IP_CT_UNTRACKED)</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		len = skb_ip_totlen(skb);</div><div class='add'>+		if (pskb_trim_rcsum(skb, len))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		if (nf_ct_br_ip_check(skb))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		bridge_state.pf = NFPROTO_IPV4;</div><div class='add'>+		ret = nf_ct_br_defrag4(skb, &amp;bridge_state);</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		len = sizeof(struct ipv6hdr) + ntohs(ipv6_hdr(skb)-&gt;payload_len);</div><div class='add'>+		if (pskb_trim_rcsum(skb, len))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		if (nf_ct_br_ipv6_check(skb))</div><div class='add'>+			return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+		bridge_state.pf = NFPROTO_IPV6;</div><div class='add'>+		ret = nf_ct_br_defrag6(skb, &amp;bridge_state);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nf_ct_set(skb, NULL, IP_CT_UNTRACKED);</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret != NF_ACCEPT)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return nf_conntrack_in(skb, &amp;bridge_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nf_ct_bridge_in(void *priv, struct sk_buff *skb,</div><div class='add'>+				    const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	bool promisc = BR_INPUT_SKB_CB(skb)-&gt;promisc;</div><div class='add'>+	struct nf_conntrack *nfct = skb_nfct(skb);</div><div class='add'>+	struct nf_conn *ct;</div><div class='add'>+</div><div class='add'>+	if (promisc) {</div><div class='add'>+		nf_reset_ct(skb);</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nfct || skb-&gt;pkt_type == PACKET_HOST)</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	/* nf_conntrack_confirm() cannot handle concurrent clones,</div><div class='add'>+	 * this happens for broad/multicast frames with e.g. macvlan on top</div><div class='add'>+	 * of the bridge device.</div><div class='add'>+	 */</div><div class='add'>+	ct = container_of(nfct, struct nf_conn, ct_general);</div><div class='add'>+	if (nf_ct_is_confirmed(ct) || nf_ct_is_template(ct))</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	/* let inet prerouting call conntrack again */</div><div class='add'>+	skb-&gt;_nfct = 0;</div><div class='add'>+	nf_ct_put(ct);</div><div class='add'>+</div><div class='add'>+	return NF_ACCEPT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nf_ct_bridge_frag_save(struct sk_buff *skb,</div><div class='add'>+				   struct nf_bridge_frag_data *data)</div><div class='add'>+{</div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		data-&gt;vlan_present = true;</div><div class='add'>+		data-&gt;vlan_tci = skb-&gt;vlan_tci;</div><div class='add'>+		data-&gt;vlan_proto = skb-&gt;vlan_proto;</div><div class='add'>+	} else {</div><div class='add'>+		data-&gt;vlan_present = false;</div><div class='add'>+	}</div><div class='add'>+	skb_copy_from_linear_data_offset(skb, -ETH_HLEN, data-&gt;mac, ETH_HLEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+nf_ct_bridge_refrag(struct sk_buff *skb, const struct nf_hook_state *state,</div><div class='add'>+		    int (*output)(struct net *, struct sock *sk,</div><div class='add'>+				  const struct nf_bridge_frag_data *data,</div><div class='add'>+				  struct sk_buff *))</div><div class='add'>+{</div><div class='add'>+	struct nf_bridge_frag_data data;</div><div class='add'>+</div><div class='add'>+	if (!BR_INPUT_SKB_CB(skb)-&gt;frag_max_size)</div><div class='add'>+		return NF_ACCEPT;</div><div class='add'>+</div><div class='add'>+	nf_ct_bridge_frag_save(skb, &amp;data);</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		nf_br_ip_fragment(state-&gt;net, state-&gt;sk, skb, &amp;data, output);</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		nf_br_ip6_fragment(state-&gt;net, state-&gt;sk, skb, &amp;data, output);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return NF_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NF_STOLEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Actually only slow path refragmentation needs this. */</div><div class='add'>+static int nf_ct_bridge_frag_restore(struct sk_buff *skb,</div><div class='add'>+				     const struct nf_bridge_frag_data *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, ETH_HLEN);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;vlan_present)</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, data-&gt;vlan_proto, data-&gt;vlan_tci);</div><div class='add'>+	else if (skb_vlan_tag_present(skb))</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+</div><div class='add'>+	skb_copy_to_linear_data_offset(skb, -ETH_HLEN, data-&gt;mac, ETH_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nf_ct_bridge_refrag_post(struct net *net, struct sock *sk,</div><div class='add'>+				    const struct nf_bridge_frag_data *data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nf_ct_bridge_frag_restore(skb, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return br_dev_queue_push_xmit(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nf_ct_bridge_post(void *priv, struct sk_buff *skb,</div><div class='add'>+				      const struct nf_hook_state *state)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nf_confirm(priv, skb, state);</div><div class='add'>+	if (ret != NF_ACCEPT)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return nf_ct_bridge_refrag(skb, state, nf_ct_bridge_refrag_post);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nf_hook_ops nf_ct_bridge_hook_ops[] __read_mostly = {</div><div class='add'>+	{</div><div class='add'>+		.hook		= nf_ct_bridge_pre,</div><div class='add'>+		.pf		= NFPROTO_BRIDGE,</div><div class='add'>+		.hooknum	= NF_BR_PRE_ROUTING,</div><div class='add'>+		.priority	= NF_IP_PRI_CONNTRACK,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.hook		= nf_ct_bridge_in,</div><div class='add'>+		.pf		= NFPROTO_BRIDGE,</div><div class='add'>+		.hooknum	= NF_BR_LOCAL_IN,</div><div class='add'>+		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.hook		= nf_ct_bridge_post,</div><div class='add'>+		.pf		= NFPROTO_BRIDGE,</div><div class='add'>+		.hooknum	= NF_BR_POST_ROUTING,</div><div class='add'>+		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nf_ct_bridge_info bridge_info = {</div><div class='add'>+	.ops		= nf_ct_bridge_hook_ops,</div><div class='add'>+	.ops_size	= ARRAY_SIZE(nf_ct_bridge_hook_ops),</div><div class='add'>+	.me		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init nf_conntrack_l3proto_bridge_init(void)</div><div class='add'>+{</div><div class='add'>+	nf_ct_bridge_register(&amp;bridge_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit nf_conntrack_l3proto_bridge_fini(void)</div><div class='add'>+{</div><div class='add'>+	nf_ct_bridge_unregister(&amp;bridge_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(nf_conntrack_l3proto_bridge_init);</div><div class='add'>+module_exit(nf_conntrack_l3proto_bridge_fini);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("nf_conntrack-" __stringify(AF_BRIDGE));</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Bridge IPv4 and IPv6 connection tracking");</div><div class='head'>diff --git a/net/bridge/netfilter/nf_log_bridge.c b/net/bridge/netfilter/nf_log_bridge.c<br/>deleted file mode 100644<br/>index bd2b3c78f59b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/nf_log_bridge.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nf_log_bridge.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * (C) 2014 by Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_log.h&gt;</div><div class='del'>-</div><div class='del'>-static void nf_log_bridge_packet(struct net *net, u_int8_t pf,</div><div class='del'>-				 unsigned int hooknum,</div><div class='del'>-				 const struct sk_buff *skb,</div><div class='del'>-				 const struct net_device *in,</div><div class='del'>-				 const struct net_device *out,</div><div class='del'>-				 const struct nf_loginfo *loginfo,</div><div class='del'>-				 const char *prefix)</div><div class='del'>-{</div><div class='del'>-	nf_log_l2packet(net, pf, eth_hdr(skb)-&gt;h_proto, hooknum, skb,</div><div class='del'>-			in, out, loginfo, prefix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nf_logger nf_bridge_logger __read_mostly = {</div><div class='del'>-	.name		= "nf_log_bridge",</div><div class='del'>-	.type		= NF_LOG_TYPE_LOG,</div><div class='del'>-	.logfn		= nf_log_bridge_packet,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init nf_log_bridge_net_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return nf_log_set(net, NFPROTO_BRIDGE, &amp;nf_bridge_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit nf_log_bridge_net_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	nf_log_unset(net, &amp;nf_bridge_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nf_log_bridge_net_ops = {</div><div class='del'>-	.init = nf_log_bridge_net_init,</div><div class='del'>-	.exit = nf_log_bridge_net_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_log_bridge_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Request to load the real packet loggers. */</div><div class='del'>-	nf_logger_request_module(NFPROTO_IPV4, NF_LOG_TYPE_LOG);</div><div class='del'>-	nf_logger_request_module(NFPROTO_IPV6, NF_LOG_TYPE_LOG);</div><div class='del'>-	nf_logger_request_module(NFPROTO_ARP, NF_LOG_TYPE_LOG);</div><div class='del'>-</div><div class='del'>-	ret = register_pernet_subsys(&amp;nf_log_bridge_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	nf_log_register(NFPROTO_BRIDGE, &amp;nf_bridge_logger);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_log_bridge_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_bridge_net_ops);</div><div class='del'>-	nf_log_unregister(&amp;nf_bridge_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_log_bridge_init);</div><div class='del'>-module_exit(nf_log_bridge_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter bridge packet logging");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 0);</div><div class='head'>diff --git a/net/bridge/netfilter/nft_meta_bridge.c b/net/bridge/netfilter/nft_meta_bridge.c<br/>new file mode 100644<br/>index 000000000000..b7af36bbd306<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/nft_meta_bridge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/nft_meta_bridge.c</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/netfilter.h&gt;</div><div class='add'>+#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nft_meta.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;uapi/linux/netfilter_bridge.h&gt; /* NF_BR_PRE_ROUTING */</div><div class='add'>+</div><div class='add'>+#include "../br_private.h"</div><div class='add'>+</div><div class='add'>+static const struct net_device *</div><div class='add'>+nft_meta_get_bridge(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev &amp;&amp; netif_is_bridge_port(dev))</div><div class='add'>+		return netdev_master_upper_dev_get_rcu((struct net_device *)dev);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nft_meta_bridge_get_eval(const struct nft_expr *expr,</div><div class='add'>+				     struct nft_regs *regs,</div><div class='add'>+				     const struct nft_pktinfo *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct nft_meta *priv = nft_expr_priv(expr);</div><div class='add'>+	const struct net_device *in = nft_in(pkt), *out = nft_out(pkt);</div><div class='add'>+	u32 *dest = &amp;regs-&gt;data[priv-&gt;dreg];</div><div class='add'>+	const struct net_device *br_dev;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;key) {</div><div class='add'>+	case NFT_META_BRI_IIFNAME:</div><div class='add'>+		br_dev = nft_meta_get_bridge(in);</div><div class='add'>+		break;</div><div class='add'>+	case NFT_META_BRI_OIFNAME:</div><div class='add'>+		br_dev = nft_meta_get_bridge(out);</div><div class='add'>+		break;</div><div class='add'>+	case NFT_META_BRI_IIFPVID: {</div><div class='add'>+		u16 p_pvid;</div><div class='add'>+</div><div class='add'>+		br_dev = nft_meta_get_bridge(in);</div><div class='add'>+		if (!br_dev || !br_vlan_enabled(br_dev))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		br_vlan_get_pvid_rcu(in, &amp;p_pvid);</div><div class='add'>+		nft_reg_store16(dest, p_pvid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	case NFT_META_BRI_IIFVPROTO: {</div><div class='add'>+		u16 p_proto;</div><div class='add'>+</div><div class='add'>+		br_dev = nft_meta_get_bridge(in);</div><div class='add'>+		if (!br_dev || !br_vlan_enabled(br_dev))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		br_vlan_get_proto(br_dev, &amp;p_proto);</div><div class='add'>+		nft_reg_store_be16(dest, htons(p_proto));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	case NFT_META_BRI_IIFHWADDR:</div><div class='add'>+		br_dev = nft_meta_get_bridge(in);</div><div class='add'>+		if (!br_dev)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		memcpy(dest, br_dev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		return nft_meta_get_eval(expr, regs, pkt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy_pad((char *)dest, br_dev ? br_dev-&gt;name : "", IFNAMSIZ);</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	regs-&gt;verdict.code = NFT_BREAK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nft_meta_bridge_get_init(const struct nft_ctx *ctx,</div><div class='add'>+				    const struct nft_expr *expr,</div><div class='add'>+				    const struct nlattr * const tb[])</div><div class='add'>+{</div><div class='add'>+	struct nft_meta *priv = nft_expr_priv(expr);</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	priv-&gt;key = ntohl(nla_get_be32(tb[NFTA_META_KEY]));</div><div class='add'>+	switch (priv-&gt;key) {</div><div class='add'>+	case NFT_META_BRI_IIFNAME:</div><div class='add'>+	case NFT_META_BRI_OIFNAME:</div><div class='add'>+		len = IFNAMSIZ;</div><div class='add'>+		break;</div><div class='add'>+	case NFT_META_BRI_IIFPVID:</div><div class='add'>+	case NFT_META_BRI_IIFVPROTO:</div><div class='add'>+		len = sizeof(u16);</div><div class='add'>+		break;</div><div class='add'>+	case NFT_META_BRI_IIFHWADDR:</div><div class='add'>+		len = ETH_ALEN;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return nft_meta_get_init(ctx, expr, tb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;len = len;</div><div class='add'>+	return nft_parse_register_store(ctx, tb[NFTA_META_DREG], &amp;priv-&gt;dreg,</div><div class='add'>+					NULL, NFT_DATA_VALUE, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nft_expr_type nft_meta_bridge_type;</div><div class='add'>+static const struct nft_expr_ops nft_meta_bridge_get_ops = {</div><div class='add'>+	.type		= &amp;nft_meta_bridge_type,</div><div class='add'>+	.size		= NFT_EXPR_SIZE(sizeof(struct nft_meta)),</div><div class='add'>+	.eval		= nft_meta_bridge_get_eval,</div><div class='add'>+	.init		= nft_meta_bridge_get_init,</div><div class='add'>+	.dump		= nft_meta_get_dump,</div><div class='add'>+	.reduce		= nft_meta_get_reduce,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nft_meta_bridge_set_eval(const struct nft_expr *expr,</div><div class='add'>+				     struct nft_regs *regs,</div><div class='add'>+				     const struct nft_pktinfo *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct nft_meta *meta = nft_expr_priv(expr);</div><div class='add'>+	u32 *sreg = &amp;regs-&gt;data[meta-&gt;sreg];</div><div class='add'>+	struct sk_buff *skb = pkt-&gt;skb;</div><div class='add'>+	u8 value8;</div><div class='add'>+</div><div class='add'>+	switch (meta-&gt;key) {</div><div class='add'>+	case NFT_META_BRI_BROUTE:</div><div class='add'>+		value8 = nft_reg_load8(sreg);</div><div class='add'>+		BR_INPUT_SKB_CB(skb)-&gt;br_netfilter_broute = !!value8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nft_meta_set_eval(expr, regs, pkt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nft_meta_bridge_set_init(const struct nft_ctx *ctx,</div><div class='add'>+				    const struct nft_expr *expr,</div><div class='add'>+				    const struct nlattr * const tb[])</div><div class='add'>+{</div><div class='add'>+	struct nft_meta *priv = nft_expr_priv(expr);</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;key = ntohl(nla_get_be32(tb[NFTA_META_KEY]));</div><div class='add'>+	switch (priv-&gt;key) {</div><div class='add'>+	case NFT_META_BRI_BROUTE:</div><div class='add'>+		len = sizeof(u8);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return nft_meta_set_init(ctx, expr, tb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;len = len;</div><div class='add'>+	err = nft_parse_register_load(ctx, tb[NFTA_META_SREG], &amp;priv-&gt;sreg, len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nft_meta_bridge_set_reduce(struct nft_regs_track *track,</div><div class='add'>+				       const struct nft_expr *expr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NFT_REG32_NUM; i++) {</div><div class='add'>+		if (!track-&gt;regs[i].selector)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (track-&gt;regs[i].selector-&gt;ops != &amp;nft_meta_bridge_get_ops)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__nft_reg_track_cancel(track, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nft_meta_bridge_set_validate(const struct nft_ctx *ctx,</div><div class='add'>+					const struct nft_expr *expr)</div><div class='add'>+{</div><div class='add'>+	struct nft_meta *priv = nft_expr_priv(expr);</div><div class='add'>+	unsigned int hooks;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;key) {</div><div class='add'>+	case NFT_META_BRI_BROUTE:</div><div class='add'>+	case NFT_META_BRI_IIFHWADDR:</div><div class='add'>+		hooks = 1 &lt;&lt; NF_BR_PRE_ROUTING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return nft_meta_set_validate(ctx, expr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nft_chain_validate_hooks(ctx-&gt;chain, hooks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nft_expr_ops nft_meta_bridge_set_ops = {</div><div class='add'>+	.type		= &amp;nft_meta_bridge_type,</div><div class='add'>+	.size		= NFT_EXPR_SIZE(sizeof(struct nft_meta)),</div><div class='add'>+	.eval		= nft_meta_bridge_set_eval,</div><div class='add'>+	.init		= nft_meta_bridge_set_init,</div><div class='add'>+	.destroy	= nft_meta_set_destroy,</div><div class='add'>+	.dump		= nft_meta_set_dump,</div><div class='add'>+	.reduce		= nft_meta_bridge_set_reduce,</div><div class='add'>+	.validate	= nft_meta_bridge_set_validate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nft_expr_ops *</div><div class='add'>+nft_meta_bridge_select_ops(const struct nft_ctx *ctx,</div><div class='add'>+			   const struct nlattr * const tb[])</div><div class='add'>+{</div><div class='add'>+	if (tb[NFTA_META_KEY] == NULL)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (tb[NFTA_META_DREG] &amp;&amp; tb[NFTA_META_SREG])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (tb[NFTA_META_DREG])</div><div class='add'>+		return &amp;nft_meta_bridge_get_ops;</div><div class='add'>+</div><div class='add'>+	if (tb[NFTA_META_SREG])</div><div class='add'>+		return &amp;nft_meta_bridge_set_ops;</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nft_expr_type nft_meta_bridge_type __read_mostly = {</div><div class='add'>+	.family         = NFPROTO_BRIDGE,</div><div class='add'>+	.name           = "meta",</div><div class='add'>+	.select_ops     = nft_meta_bridge_select_ops,</div><div class='add'>+	.policy         = nft_meta_policy,</div><div class='add'>+	.maxattr        = NFTA_META_MAX,</div><div class='add'>+	.owner          = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init nft_meta_bridge_module_init(void)</div><div class='add'>+{</div><div class='add'>+	return nft_register_expr(&amp;nft_meta_bridge_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit nft_meta_bridge_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	nft_unregister_expr(&amp;nft_meta_bridge_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(nft_meta_bridge_module_init);</div><div class='add'>+module_exit(nft_meta_bridge_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("wenxu &lt;wenxu@ucloud.cn&gt;");</div><div class='add'>+MODULE_ALIAS_NFT_AF_EXPR(AF_BRIDGE, "meta");</div><div class='add'>+MODULE_DESCRIPTION("Support for bridge dedicated meta key");</div><div class='head'>diff --git a/net/bridge/netfilter/nft_reject_bridge.c b/net/bridge/netfilter/nft_reject_bridge.c<br/>index 08cbed7d940e..1cb5c16e97b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/nft_reject_bridge.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/bridge/netfilter/nft_reject_bridge.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/bridge/netfilter/nft_reject_bridge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/bridge/netfilter/nft_reject_bridge.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -34,30 +31,12 @@ static void nft_reject_br_push_etherhdr(struct sk_buff *oldskb,</div><div class='ctx'> 	ether_addr_copy(eth-&gt;h_dest, eth_hdr(oldskb)-&gt;h_source);</div><div class='ctx'> 	eth-&gt;h_proto = eth_hdr(oldskb)-&gt;h_proto;</div><div class='ctx'> 	skb_pull(nskb, ETH_HLEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nft_bridge_iphdr_validate(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph;</div><div class='del'>-	u32 len;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-	if (iph-&gt;ihl &lt; 5 || iph-&gt;version != 4)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	len = ntohs(iph-&gt;tot_len);</div><div class='del'>-	if (skb-&gt;len &lt; len)</div><div class='del'>-		return 0;</div><div class='del'>-	else if (len &lt; (iph-&gt;ihl*4))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, iph-&gt;ihl*4))</div><div class='del'>-		return 0;</div><div class='add'>+	if (skb_vlan_tag_present(oldskb)) {</div><div class='add'>+		u16 vid = skb_vlan_tag_get(oldskb);</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+		__vlan_hwaccel_put_tag(nskb, oldskb-&gt;vlan_proto, vid);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We cannot use oldskb-&gt;dev, it can be either bridge device (NF_BRIDGE INPUT)</div><div class='hunk'>@@ -69,29 +48,11 @@ static void nft_reject_br_send_v4_tcp_reset(struct net *net,</div><div class='ctx'> 					    int hook)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *niph;</div><div class='del'>-	const struct tcphdr *oth;</div><div class='del'>-	struct tcphdr _oth;</div><div class='del'>-</div><div class='del'>-	if (!nft_bridge_iphdr_validate(oldskb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	oth = nf_reject_ip_tcphdr_get(oldskb, &amp;_oth, hook);</div><div class='del'>-	if (!oth)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='del'>-	nskb = alloc_skb(sizeof(struct iphdr) + sizeof(struct tcphdr) +</div><div class='del'>-			 LL_MAX_HEADER, GFP_ATOMIC);</div><div class='add'>+	nskb = nf_reject_skb_v4_tcp_reset(net, oldskb, NULL, hook);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='del'>-	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='del'>-				   net-&gt;ipv4.sysctl_ip_default_ttl);</div><div class='del'>-	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);</div><div class='del'>-	niph-&gt;tot_len = htons(nskb-&gt;len);</div><div class='del'>-	ip_send_check(niph);</div><div class='del'>-</div><div class='ctx'> 	nft_reject_br_push_etherhdr(oldskb, nskb);</div><div class='ctx'> </div><div class='ctx'> 	br_forward(br_port_get_rcu(dev), nskb, false, true);</div><div class='hunk'>@@ -103,138 +64,32 @@ static void nft_reject_br_send_v4_unreach(struct net *net,</div><div class='ctx'> 					  int hook, u8 code)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *niph;</div><div class='del'>-	struct icmphdr *icmph;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	__wsum csum;</div><div class='del'>-	u8 proto;</div><div class='del'>-</div><div class='del'>-	if (!nft_bridge_iphdr_validate(oldskb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* IP header checks: fragment. */</div><div class='del'>-	if (ip_hdr(oldskb)-&gt;frag_off &amp; htons(IP_OFFSET))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* RFC says return as much as we can without exceeding 576 bytes. */</div><div class='del'>-	len = min_t(unsigned int, 536, oldskb-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(oldskb, len))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (pskb_trim_rcsum(oldskb, ntohs(ip_hdr(oldskb)-&gt;tot_len)))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='del'>-	if (ip_hdr(oldskb)-&gt;protocol == IPPROTO_TCP ||</div><div class='del'>-	    ip_hdr(oldskb)-&gt;protocol == IPPROTO_UDP)</div><div class='del'>-		proto = ip_hdr(oldskb)-&gt;protocol;</div><div class='del'>-	else</div><div class='del'>-		proto = 0;</div><div class='del'>-</div><div class='del'>-	if (!skb_csum_unnecessary(oldskb) &amp;&amp;</div><div class='del'>-	    nf_ip_checksum(oldskb, hook, ip_hdrlen(oldskb), proto))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	nskb = alloc_skb(sizeof(struct iphdr) + sizeof(struct icmphdr) +</div><div class='del'>-			 LL_MAX_HEADER + len, GFP_ATOMIC);</div><div class='add'>+	nskb = nf_reject_skb_v4_unreach(net, oldskb, NULL, hook, code);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='del'>-	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_ICMP,</div><div class='del'>-				   net-&gt;ipv4.sysctl_ip_default_ttl);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	icmph = skb_put_zero(nskb, sizeof(struct icmphdr));</div><div class='del'>-	icmph-&gt;type     = ICMP_DEST_UNREACH;</div><div class='del'>-	icmph-&gt;code	= code;</div><div class='del'>-</div><div class='del'>-	skb_put_data(nskb, skb_network_header(oldskb), len);</div><div class='del'>-</div><div class='del'>-	csum = csum_partial((void *)icmph, len + sizeof(struct icmphdr), 0);</div><div class='del'>-	icmph-&gt;checksum = csum_fold(csum);</div><div class='del'>-</div><div class='del'>-	niph-&gt;tot_len	= htons(nskb-&gt;len);</div><div class='del'>-	ip_send_check(niph);</div><div class='del'>-</div><div class='ctx'> 	nft_reject_br_push_etherhdr(oldskb, nskb);</div><div class='ctx'> </div><div class='ctx'> 	br_forward(br_port_get_rcu(dev), nskb, false, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nft_bridge_ip6hdr_validate(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *hdr;</div><div class='del'>-	u32 pkt_len;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hdr = ipv6_hdr(skb);</div><div class='del'>-	if (hdr-&gt;version != 6)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pkt_len = ntohs(hdr-&gt;payload_len);</div><div class='del'>-	if (pkt_len + sizeof(struct ipv6hdr) &gt; skb-&gt;len)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nft_reject_br_send_v6_tcp_reset(struct net *net,</div><div class='ctx'> 					    struct sk_buff *oldskb,</div><div class='ctx'> 					    const struct net_device *dev,</div><div class='ctx'> 					    int hook)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='del'>-	const struct tcphdr *oth;</div><div class='del'>-	struct tcphdr _oth;</div><div class='del'>-	unsigned int otcplen;</div><div class='del'>-	struct ipv6hdr *nip6h;</div><div class='ctx'> </div><div class='del'>-	if (!nft_bridge_ip6hdr_validate(oldskb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	oth = nf_reject_ip6_tcphdr_get(oldskb, &amp;_oth, &amp;otcplen, hook);</div><div class='del'>-	if (!oth)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	nskb = alloc_skb(sizeof(struct ipv6hdr) + sizeof(struct tcphdr) +</div><div class='del'>-			 LL_MAX_HEADER, GFP_ATOMIC);</div><div class='add'>+	nskb = nf_reject_skb_v6_tcp_reset(net, oldskb, NULL, hook);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='del'>-	nip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='del'>-				     net-&gt;ipv6.devconf_all-&gt;hop_limit);</div><div class='del'>-	nf_reject_ip6_tcphdr_put(nskb, oldskb, oth, otcplen);</div><div class='del'>-	nip6h-&gt;payload_len = htons(nskb-&gt;len - sizeof(struct ipv6hdr));</div><div class='del'>-</div><div class='ctx'> 	nft_reject_br_push_etherhdr(oldskb, nskb);</div><div class='ctx'> </div><div class='ctx'> 	br_forward(br_port_get_rcu(dev), nskb, false, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool reject6_br_csum_ok(struct sk_buff *skb, int hook)</div><div class='del'>-{</div><div class='del'>-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='del'>-	int thoff;</div><div class='del'>-	__be16 fo;</div><div class='del'>-	u8 proto = ip6h-&gt;nexthdr;</div><div class='del'>-</div><div class='del'>-	if (skb_csum_unnecessary(skb))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (ip6h-&gt;payload_len &amp;&amp;</div><div class='del'>-	    pskb_trim_rcsum(skb, ntohs(ip6h-&gt;payload_len) + sizeof(*ip6h)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	thoff = ipv6_skip_exthdr(skb, ((u8*)(ip6h+1) - skb-&gt;data), &amp;proto, &amp;fo);</div><div class='del'>-	if (thoff &lt; 0 || thoff &gt;= skb-&gt;len || (fo &amp; htons(~0x7)) != 0)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return nf_ip6_checksum(skb, hook, thoff, proto) == 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static void nft_reject_br_send_v6_unreach(struct net *net,</div><div class='ctx'> 					  struct sk_buff *oldskb,</div><div class='hunk'>@@ -242,49 +97,11 @@ static void nft_reject_br_send_v6_unreach(struct net *net,</div><div class='ctx'> 					  int hook, u8 code)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='del'>-	struct ipv6hdr *nip6h;</div><div class='del'>-	struct icmp6hdr *icmp6h;</div><div class='del'>-	unsigned int len;</div><div class='del'>-</div><div class='del'>-	if (!nft_bridge_ip6hdr_validate(oldskb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Include "As much of invoking packet as possible without the ICMPv6</div><div class='del'>-	 * packet exceeding the minimum IPv6 MTU" in the ICMP payload.</div><div class='del'>-	 */</div><div class='del'>-	len = min_t(unsigned int, 1220, oldskb-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(oldskb, len))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!reject6_br_csum_ok(oldskb, hook))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='del'>-	nskb = alloc_skb(sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr) +</div><div class='del'>-			 LL_MAX_HEADER + len, GFP_ATOMIC);</div><div class='add'>+	nskb = nf_reject_skb_v6_unreach(net, oldskb, NULL, hook, code);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='del'>-	nip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_ICMPV6,</div><div class='del'>-				     net-&gt;ipv6.devconf_all-&gt;hop_limit);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	icmp6h = skb_put_zero(nskb, sizeof(struct icmp6hdr));</div><div class='del'>-	icmp6h-&gt;icmp6_type = ICMPV6_DEST_UNREACH;</div><div class='del'>-	icmp6h-&gt;icmp6_code = code;</div><div class='del'>-</div><div class='del'>-	skb_put_data(nskb, skb_network_header(oldskb), len);</div><div class='del'>-	nip6h-&gt;payload_len = htons(nskb-&gt;len - sizeof(struct ipv6hdr));</div><div class='del'>-</div><div class='del'>-	icmp6h-&gt;icmp6_cksum =</div><div class='del'>-		csum_ipv6_magic(&amp;nip6h-&gt;saddr, &amp;nip6h-&gt;daddr,</div><div class='del'>-				nskb-&gt;len - sizeof(struct ipv6hdr),</div><div class='del'>-				IPPROTO_ICMPV6,</div><div class='del'>-				csum_partial(icmp6h,</div><div class='del'>-					     nskb-&gt;len - sizeof(struct ipv6hdr),</div><div class='del'>-					     0));</div><div class='del'>-</div><div class='ctx'> 	nft_reject_br_push_etherhdr(oldskb, nskb);</div><div class='ctx'> </div><div class='ctx'> 	br_forward(br_port_get_rcu(dev), nskb, false, true);</div><div class='hunk'>@@ -353,77 +170,21 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nft_reject_bridge_validate(const struct nft_ctx *ctx,</div><div class='del'>-				      const struct nft_expr *expr,</div><div class='del'>-				      const struct nft_data **data)</div><div class='add'>+				      const struct nft_expr *expr)</div><div class='ctx'> {</div><div class='ctx'> 	return nft_chain_validate_hooks(ctx-&gt;chain, (1 &lt;&lt; NF_BR_PRE_ROUTING) |</div><div class='ctx'> 						    (1 &lt;&lt; NF_BR_LOCAL_IN));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nft_reject_bridge_init(const struct nft_ctx *ctx,</div><div class='del'>-				  const struct nft_expr *expr,</div><div class='del'>-				  const struct nlattr * const tb[])</div><div class='del'>-{</div><div class='del'>-	struct nft_reject *priv = nft_expr_priv(expr);</div><div class='del'>-	int icmp_code;</div><div class='del'>-</div><div class='del'>-	if (tb[NFTA_REJECT_TYPE] == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;type = ntohl(nla_get_be32(tb[NFTA_REJECT_TYPE]));</div><div class='del'>-	switch (priv-&gt;type) {</div><div class='del'>-	case NFT_REJECT_ICMP_UNREACH:</div><div class='del'>-	case NFT_REJECT_ICMPX_UNREACH:</div><div class='del'>-		if (tb[NFTA_REJECT_ICMP_CODE] == NULL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		icmp_code = nla_get_u8(tb[NFTA_REJECT_ICMP_CODE]);</div><div class='del'>-		if (priv-&gt;type == NFT_REJECT_ICMPX_UNREACH &amp;&amp;</div><div class='del'>-		    icmp_code &gt; NFT_REJECT_ICMPX_MAX)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		priv-&gt;icmp_code = icmp_code;</div><div class='del'>-		break;</div><div class='del'>-	case NFT_REJECT_TCP_RST:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nft_reject_bridge_dump(struct sk_buff *skb,</div><div class='del'>-				  const struct nft_expr *expr)</div><div class='del'>-{</div><div class='del'>-	const struct nft_reject *priv = nft_expr_priv(expr);</div><div class='del'>-</div><div class='del'>-	if (nla_put_be32(skb, NFTA_REJECT_TYPE, htonl(priv-&gt;type)))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;type) {</div><div class='del'>-	case NFT_REJECT_ICMP_UNREACH:</div><div class='del'>-	case NFT_REJECT_ICMPX_UNREACH:</div><div class='del'>-		if (nla_put_u8(skb, NFTA_REJECT_ICMP_CODE, priv-&gt;icmp_code))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nft_expr_type nft_reject_bridge_type;</div><div class='ctx'> static const struct nft_expr_ops nft_reject_bridge_ops = {</div><div class='ctx'> 	.type		= &amp;nft_reject_bridge_type,</div><div class='ctx'> 	.size		= NFT_EXPR_SIZE(sizeof(struct nft_reject)),</div><div class='ctx'> 	.eval		= nft_reject_bridge_eval,</div><div class='del'>-	.init		= nft_reject_bridge_init,</div><div class='del'>-	.dump		= nft_reject_bridge_dump,</div><div class='add'>+	.init		= nft_reject_init,</div><div class='add'>+	.dump		= nft_reject_dump,</div><div class='ctx'> 	.validate	= nft_reject_bridge_validate,</div><div class='add'>+	.reduce		= NFT_REDUCE_READONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nft_expr_type nft_reject_bridge_type __read_mostly = {</div><div class='hunk'>@@ -451,3 +212,4 @@ module_exit(nft_reject_bridge_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(AF_BRIDGE, "reject");</div><div class='add'>+MODULE_DESCRIPTION("Reject packets from bridge via nftables");</div><div class='head'>diff --git a/net/caif/Kconfig b/net/caif/Kconfig<br/>index d3694953b1d7..87205251cc25 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # CAIF net configurations</div><div class='ctx'> #</div><div class='hunk'>@@ -6,17 +7,17 @@ menuconfig CAIF</div><div class='ctx'> 	tristate "CAIF support"</div><div class='ctx'> 	select CRC_CCITT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	The "Communication CPU to Application CPU Interface" (CAIF) is a packet</div><div class='ctx'> 	based connection-oriented MUX protocol developed by ST-Ericsson for use</div><div class='ctx'> 	with its modems. It is accessed from user space as sockets (PF_CAIF).</div><div class='ctx'> </div><div class='ctx'> 	Say Y (or M) here if you build for a phone product (e.g. Android or</div><div class='del'>-	MeeGo ) that uses CAIF as transport, if unsure say N.</div><div class='add'>+	MeeGo) that uses CAIF as transport. If unsure say N.</div><div class='ctx'> </div><div class='ctx'> 	If you select to build it as module then CAIF_NETDEV also needs to be</div><div class='del'>-	built as modules. You will also need to say yes to any CAIF physical</div><div class='del'>-	devices that your platform requires.</div><div class='add'>+	built as a module. You will also need to say Y (or M) to any CAIF</div><div class='add'>+	physical devices that your platform requires.</div><div class='ctx'> </div><div class='ctx'> 	See Documentation/networking/caif for a further explanation on how to</div><div class='ctx'> 	use and configure CAIF.</div><div class='hunk'>@@ -25,7 +26,7 @@ config  CAIF_DEBUG</div><div class='ctx'> 	bool "Enable Debug"</div><div class='ctx'> 	depends on CAIF</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	Enable the inclusion of debug code in the CAIF stack.</div><div class='ctx'> 	Be aware that doing this will impact performance.</div><div class='ctx'> 	If unsure say N.</div><div class='hunk'>@@ -34,9 +35,9 @@ config CAIF_NETDEV</div><div class='ctx'> 	tristate "CAIF GPRS Network device"</div><div class='ctx'> 	depends on CAIF</div><div class='ctx'> 	default CAIF</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	Say Y if you will be using a CAIF based GPRS network device.</div><div class='del'>-	This can be either built-in or a loadable module,</div><div class='add'>+	This can be either built-in or a loadable module.</div><div class='ctx'> 	If you select to build it as a built-in then the main CAIF device must</div><div class='ctx'> 	also be a built-in.</div><div class='ctx'> 	If unsure say Y.</div><div class='hunk'>@@ -45,9 +46,9 @@ config CAIF_USB</div><div class='ctx'> 	tristate "CAIF USB support"</div><div class='ctx'> 	depends on CAIF</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	Say Y if you are using CAIF over USB CDC NCM.</div><div class='del'>-	This can be either built-in or a loadable module,</div><div class='add'>+	This can be either built-in or a loadable module.</div><div class='ctx'> 	If you select to build it as a built-in then the main CAIF device must</div><div class='ctx'> 	also be a built-in.</div><div class='ctx'> 	If unsure say N.</div><div class='head'>diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c<br/>index 711d7156efd8..24e85c5487ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/caif_dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/caif_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/caif_dev.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAIF Interface registration.</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  *</div><div class='ctx'>  * Borrowed heavily from file: pn_dev.c. Thanks to Remi Denis-Courmont</div><div class='ctx'>  *  and Sakari Ailus &lt;sakari.ailus@nokia.com&gt;</div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;net/caif/cfcnfg.h&gt;</div><div class='ctx'> #include &lt;net/caif/cfserl.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ST-Ericsson CAIF modem protocol support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* Used for local tracking of the CAIF net devices */</div><div class='hunk'>@@ -112,7 +113,8 @@ static struct caif_device_entry *caif_get(struct net_device *dev)</div><div class='ctx'> 	    caif_device_list(dev_net(dev));</div><div class='ctx'> 	struct caif_device_entry *caifd;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(caifd, &amp;caifdevs-&gt;list, list) {</div><div class='add'>+	list_for_each_entry_rcu(caifd, &amp;caifdevs-&gt;list, list,</div><div class='add'>+				lockdep_rtnl_is_held()) {</div><div class='ctx'> 		if (caifd-&gt;netdev == dev)</div><div class='ctx'> 			return caifd;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -141,7 +143,7 @@ static void caif_flow_cb(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;caifd-&gt;flow_lock);</div><div class='ctx'> 	send_xoff = caifd-&gt;xoff;</div><div class='del'>-	caifd-&gt;xoff = 0;</div><div class='add'>+	caifd-&gt;xoff = false;</div><div class='ctx'> 	dtor = caifd-&gt;xoff_skb_dtor;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(caifd-&gt;xoff_skb != skb))</div><div class='hunk'>@@ -186,15 +188,19 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)</div><div class='ctx'> 		goto noxoff;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!netif_queue_stopped(caifd-&gt;netdev))) {</div><div class='add'>+		struct Qdisc *sch;</div><div class='add'>+</div><div class='ctx'> 		/* If we run with a TX queue, check if the queue is too long*/</div><div class='ctx'> 		txq = netdev_get_tx_queue(skb-&gt;dev, 0);</div><div class='del'>-		qlen = qdisc_qlen(rcu_dereference_bh(txq-&gt;qdisc));</div><div class='del'>-</div><div class='del'>-		if (likely(qlen == 0))</div><div class='add'>+		sch = rcu_dereference_bh(txq-&gt;qdisc);</div><div class='add'>+		if (likely(qdisc_is_empty(sch)))</div><div class='ctx'> 			goto noxoff;</div><div class='ctx'> </div><div class='add'>+		/* can check for explicit qdisc len value only !NOLOCK,</div><div class='add'>+		 * always set flow off otherwise</div><div class='add'>+		 */</div><div class='ctx'> 		high = (caifd-&gt;netdev-&gt;tx_queue_len * q_high) / 100;</div><div class='del'>-		if (likely(qlen &lt; high))</div><div class='add'>+		if (!(sch-&gt;flags &amp; TCQ_F_NOLOCK) &amp;&amp; likely(sch-&gt;q.qlen &lt; high))</div><div class='ctx'> 			goto noxoff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +221,7 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)</div><div class='ctx'> 	pr_debug("queue has stopped(%d) or is full (%d &gt; %d)\n",</div><div class='ctx'> 			netif_queue_stopped(caifd-&gt;netdev),</div><div class='ctx'> 			qlen, high);</div><div class='del'>-	caifd-&gt;xoff = 1;</div><div class='add'>+	caifd-&gt;xoff = true;</div><div class='ctx'> 	caifd-&gt;xoff_skb = skb;</div><div class='ctx'> 	caifd-&gt;xoff_skb_dtor = skb-&gt;destructor;</div><div class='ctx'> 	skb-&gt;destructor = caif_flow_cb;</div><div class='hunk'>@@ -263,7 +269,7 @@ static int receive(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	err = caifd-&gt;layer.up-&gt;receive(caifd-&gt;layer.up, pkt);</div><div class='ctx'> </div><div class='del'>-	/* For -EILSEQ the packet is not freed so so it now */</div><div class='add'>+	/* For -EILSEQ the packet is not freed so free it now */</div><div class='ctx'> 	if (err == -EILSEQ)</div><div class='ctx'> 		cfpkt_destroy(pkt);</div><div class='ctx'> </div><div class='hunk'>@@ -303,7 +309,7 @@ static void dev_flowctrl(struct net_device *dev, int on)</div><div class='ctx'> 	caifd_put(caifd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,</div><div class='add'>+int caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,</div><div class='ctx'> 		     struct cflayer *link_support, int head_room,</div><div class='ctx'> 		     struct cflayer **layer,</div><div class='ctx'> 		     int (**rcv_func)(struct sk_buff *, struct net_device *,</div><div class='hunk'>@@ -314,11 +320,12 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,</div><div class='ctx'> 	enum cfcnfg_phy_preference pref;</div><div class='ctx'> 	struct cfcnfg *cfg = get_cfcnfg(dev_net(dev));</div><div class='ctx'> 	struct caif_device_entry_list *caifdevs;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	caifdevs = caif_device_list(dev_net(dev));</div><div class='ctx'> 	caifd = caif_device_alloc(dev);</div><div class='ctx'> 	if (!caifd)</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	*layer = &amp;caifd-&gt;layer;</div><div class='ctx'> 	spin_lock_init(&amp;caifd-&gt;flow_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -336,10 +343,10 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,</div><div class='ctx'> 	mutex_lock(&amp;caifdevs-&gt;lock);</div><div class='ctx'> 	list_add_rcu(&amp;caifd-&gt;list, &amp;caifdevs-&gt;list);</div><div class='ctx'> </div><div class='del'>-	strlcpy(caifd-&gt;layer.name, dev-&gt;name,</div><div class='add'>+	strscpy(caifd-&gt;layer.name, dev-&gt;name,</div><div class='ctx'> 		sizeof(caifd-&gt;layer.name));</div><div class='ctx'> 	caifd-&gt;layer.transmit = transmit;</div><div class='del'>-	cfcnfg_add_phy_layer(cfg,</div><div class='add'>+	res = cfcnfg_add_phy_layer(cfg,</div><div class='ctx'> 				dev,</div><div class='ctx'> 				&amp;caifd-&gt;layer,</div><div class='ctx'> 				pref,</div><div class='hunk'>@@ -349,6 +356,7 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,</div><div class='ctx'> 	mutex_unlock(&amp;caifdevs-&gt;lock);</div><div class='ctx'> 	if (rcv_func)</div><div class='ctx'> 		*rcv_func = receive;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(caif_enroll_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -363,6 +371,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 	struct cflayer *layer, *link_support;</div><div class='ctx'> 	int head_room = 0;</div><div class='ctx'> 	struct caif_device_entry_list *caifdevs;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	cfg = get_cfcnfg(dev_net(dev));</div><div class='ctx'> 	caifdevs = caif_device_list(dev_net(dev));</div><div class='hunk'>@@ -388,8 +397,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		caif_enroll_dev(dev, caifdev, link_support, head_room,</div><div class='add'>+		res = caif_enroll_dev(dev, caifdev, link_support, head_room,</div><div class='ctx'> 				&amp;layer, NULL);</div><div class='add'>+		if (res)</div><div class='add'>+			cfserl_release(link_support);</div><div class='ctx'> 		caifdev-&gt;flowctrl = dev_flowctrl;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -402,7 +413,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		caifd-&gt;xoff = 0;</div><div class='add'>+		caifd-&gt;xoff = false;</div><div class='ctx'> 		cfcnfg_set_phy_state(cfg, &amp;caifd-&gt;layer, true);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +448,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 		if (caifd-&gt;xoff_skb_dtor != NULL &amp;&amp; caifd-&gt;xoff_skb != NULL)</div><div class='ctx'> 			caifd-&gt;xoff_skb-&gt;destructor = caifd-&gt;xoff_skb_dtor;</div><div class='ctx'> </div><div class='del'>-		caifd-&gt;xoff = 0;</div><div class='add'>+		caifd-&gt;xoff = false;</div><div class='ctx'> 		caifd-&gt;xoff_skb_dtor = NULL;</div><div class='ctx'> 		caifd-&gt;xoff_skb = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c<br/>index d18965f3291f..af218742af5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/caif_socket.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_socket.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/caif_socket.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/caif_socket.c</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -26,6 +27,7 @@</div><div class='ctx'> #include &lt;net/caif/caif_dev.h&gt;</div><div class='ctx'> #include &lt;net/caif/cfpkt.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ST-Ericsson CAIF modem protocol socket support (AF_CAIF)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_NETPROTO(AF_CAIF);</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +48,7 @@ enum caif_states {</div><div class='ctx'> struct caifsock {</div><div class='ctx'> 	struct sock sk; /* must be first member */</div><div class='ctx'> 	struct cflayer layer;</div><div class='del'>-	u32 flow_state;</div><div class='add'>+	unsigned long flow_state;</div><div class='ctx'> 	struct caif_connect_request conn_req;</div><div class='ctx'> 	struct mutex readlock;</div><div class='ctx'> 	struct dentry *debugfs_socket_dir;</div><div class='hunk'>@@ -55,38 +57,32 @@ struct caifsock {</div><div class='ctx'> </div><div class='ctx'> static int rx_flow_is_on(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(RX_FLOW_ON_BIT,</div><div class='del'>-			(void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	return test_bit(RX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tx_flow_is_on(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(TX_FLOW_ON_BIT,</div><div class='del'>-			(void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	return test_bit(TX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_rx_flow_off(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	 clear_bit(RX_FLOW_ON_BIT,</div><div class='del'>-		 (void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	clear_bit(RX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_rx_flow_on(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	 set_bit(RX_FLOW_ON_BIT,</div><div class='del'>-			(void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	set_bit(RX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_tx_flow_off(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	 clear_bit(TX_FLOW_ON_BIT,</div><div class='del'>-		(void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	clear_bit(TX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_tx_flow_on(struct caifsock *cf_sk)</div><div class='ctx'> {</div><div class='del'>-	 set_bit(TX_FLOW_ON_BIT,</div><div class='del'>-		(void *) &amp;cf_sk-&gt;flow_state);</div><div class='add'>+	set_bit(TX_FLOW_ON_BIT, &amp;cf_sk-&gt;flow_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void caif_read_lock(struct sock *sk)</div><div class='hunk'>@@ -243,7 +239,7 @@ static void caif_ctrl_cb(struct cflayer *layr,</div><div class='ctx'> 		cf_sk-&gt;sk.sk_shutdown = SHUTDOWN_MASK;</div><div class='ctx'> 		cf_sk-&gt;sk.sk_err = ECONNRESET;</div><div class='ctx'> 		set_rx_flow_on(cf_sk);</div><div class='del'>-		cf_sk-&gt;sk.sk_error_report(&amp;cf_sk-&gt;sk);</div><div class='add'>+		sk_error_report(&amp;cf_sk-&gt;sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -281,7 +277,7 @@ static int caif_seqpkt_recvmsg(struct socket *sock, struct msghdr *m,</div><div class='ctx'> 	if (flags &amp; MSG_OOB)</div><div class='ctx'> 		goto read_error;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, 0 , &amp;ret);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;ret);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto read_error;</div><div class='ctx'> 	copylen = skb-&gt;len;</div><div class='hunk'>@@ -538,9 +534,6 @@ static int caif_seqpkt_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	if (msg-&gt;msg_namelen)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	if (unlikely(msg-&gt;msg_iter.iov-&gt;iov_base == NULL))</div><div class='del'>-		goto err;</div><div class='ctx'> 	noblock = msg-&gt;msg_flags &amp; MSG_DONTWAIT;</div><div class='ctx'> </div><div class='ctx'> 	timeo = sock_sndtimeo(sk, noblock);</div><div class='hunk'>@@ -669,8 +662,8 @@ out_err:</div><div class='ctx'> 	return sent ? : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setsockopt(struct socket *sock,</div><div class='del'>-		      int lvl, int opt, char __user *ov, unsigned int ol)</div><div class='add'>+static int setsockopt(struct socket *sock, int lvl, int opt, sockptr_t ov,</div><div class='add'>+		unsigned int ol)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);</div><div class='hunk'>@@ -685,7 +678,7 @@ static int setsockopt(struct socket *sock,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (lvl != SOL_CAIF)</div><div class='ctx'> 			goto bad_sol;</div><div class='del'>-		if (copy_from_user(&amp;linksel, ov, sizeof(int)))</div><div class='add'>+		if (copy_from_sockptr(&amp;linksel, ov, sizeof(int)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		lock_sock(&amp;(cf_sk-&gt;sk));</div><div class='ctx'> 		cf_sk-&gt;conn_req.link_selector = linksel;</div><div class='hunk'>@@ -699,7 +692,7 @@ static int setsockopt(struct socket *sock,</div><div class='ctx'> 			return -ENOPROTOOPT;</div><div class='ctx'> 		lock_sock(&amp;(cf_sk-&gt;sk));</div><div class='ctx'> 		if (ol &gt; sizeof(cf_sk-&gt;conn_req.param.data) ||</div><div class='del'>-			copy_from_user(&amp;cf_sk-&gt;conn_req.param.data, ov, ol)) {</div><div class='add'>+		    copy_from_sockptr(&amp;cf_sk-&gt;conn_req.param.data, ov, ol)) {</div><div class='ctx'> 			release_sock(&amp;cf_sk-&gt;sk);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -741,7 +734,7 @@ bad_sol:</div><div class='ctx'>  *  o sock-&gt;state: holds the SS_* socket state and is updated by connect and</div><div class='ctx'>  *	disconnect.</div><div class='ctx'>  */</div><div class='del'>-static int caif_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+static int caif_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -941,7 +934,7 @@ static __poll_t caif_poll(struct file *file,</div><div class='ctx'> 	__poll_t mask;</div><div class='ctx'> 	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);</div><div class='ctx'> </div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='add'>+	sock_poll_wait(file, sock, wait);</div><div class='ctx'> 	mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* exceptional events? */</div><div class='hunk'>@@ -953,7 +946,7 @@ static __poll_t caif_poll(struct file *file,</div><div class='ctx'> 		mask |= EPOLLRDHUP;</div><div class='ctx'> </div><div class='ctx'> 	/* readable? */</div><div class='del'>-	if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue) ||</div><div class='add'>+	if (!skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue) ||</div><div class='ctx'> 		(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN))</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='hunk'>@@ -981,11 +974,9 @@ static const struct proto_ops caif_seqpacket_ops = {</div><div class='ctx'> 	.listen = sock_no_listen,</div><div class='ctx'> 	.shutdown = sock_no_shutdown,</div><div class='ctx'> 	.setsockopt = setsockopt,</div><div class='del'>-	.getsockopt = sock_no_getsockopt,</div><div class='ctx'> 	.sendmsg = caif_seqpkt_sendmsg,</div><div class='ctx'> 	.recvmsg = caif_seqpkt_recvmsg,</div><div class='ctx'> 	.mmap = sock_no_mmap,</div><div class='del'>-	.sendpage = sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct proto_ops caif_stream_ops = {</div><div class='hunk'>@@ -1002,11 +993,9 @@ static const struct proto_ops caif_stream_ops = {</div><div class='ctx'> 	.listen = sock_no_listen,</div><div class='ctx'> 	.shutdown = sock_no_shutdown,</div><div class='ctx'> 	.setsockopt = setsockopt,</div><div class='del'>-	.getsockopt = sock_no_getsockopt,</div><div class='ctx'> 	.sendmsg = caif_stream_sendmsg,</div><div class='ctx'> 	.recvmsg = caif_stream_recvmsg,</div><div class='ctx'> 	.mmap = sock_no_mmap,</div><div class='del'>-	.sendpage = sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This function is called when a socket is finally destroyed. */</div><div class='hunk'>@@ -1021,6 +1010,7 @@ static void caif_sock_destructor(struct sock *sk)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	sk_stream_kill_queues(&amp;cf_sk-&gt;sk);</div><div class='add'>+	WARN_ON_ONCE(sk-&gt;sk_forward_alloc);</div><div class='ctx'> 	caif_free_client(&amp;cf_sk-&gt;layer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c<br/>index 1a082a946045..5dc05a1e3178 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/caif_usb.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/caif_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/caif_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/caif_usb.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAIF USB handler</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2011</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -21,6 +20,7 @@</div><div class='ctx'> #include &lt;net/caif/cfpkt.h&gt;</div><div class='ctx'> #include &lt;net/caif/cfcnfg.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ST-Ericsson CAIF modem protocol USB support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define CFUSB_PAD_DESCR_SZ 1	/* Alignment descriptor length */</div><div class='hunk'>@@ -63,7 +63,7 @@ static int cfusbl_transmit(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 	hpad = (info-&gt;hdr_len + CFUSB_PAD_DESCR_SZ) &amp; (CFUSB_ALIGNMENT - 1);</div><div class='ctx'> </div><div class='ctx'> 	if (skb_headroom(skb) &lt; ETH_HLEN + CFUSB_PAD_DESCR_SZ + hpad) {</div><div class='del'>-		pr_warn("Headroom to small\n");</div><div class='add'>+		pr_warn("Headroom too small\n");</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -82,7 +82,7 @@ static void cfusbl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,</div><div class='ctx'> 		layr-&gt;up-&gt;ctrlcmd(layr-&gt;up, ctrl, layr-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],</div><div class='add'>+static struct cflayer *cfusbl_create(int phyid, const u8 ethaddr[ETH_ALEN],</div><div class='ctx'> 				      u8 braddr[ETH_ALEN])</div><div class='ctx'> {</div><div class='ctx'> 	struct cfusbl *this = kmalloc(sizeof(struct cfusbl), GFP_ATOMIC);</div><div class='hunk'>@@ -116,6 +116,11 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],</div><div class='ctx'> 	return (struct cflayer *) this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cfusbl_release(struct cflayer *layer)</div><div class='add'>+{</div><div class='add'>+	kfree(layer);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct packet_type caif_usb_type __read_mostly = {</div><div class='ctx'> 	.type = cpu_to_be16(ETH_P_802_EX1),</div><div class='ctx'> };</div><div class='hunk'>@@ -128,6 +133,10 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 	struct cflayer *layer, *link_support;</div><div class='ctx'> 	struct usbnet *usbnet;</div><div class='ctx'> 	struct usb_device *usbdev;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (what == NETDEV_UNREGISTER &amp;&amp; dev-&gt;reg_state &gt;= NETREG_UNREGISTERED)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether we have a NCM device, and find its VID/PID. */</div><div class='ctx'> 	if (!(dev-&gt;dev.parent &amp;&amp; dev-&gt;dev.parent-&gt;driver &amp;&amp;</div><div class='hunk'>@@ -170,15 +179,21 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 	if (dev-&gt;num_tx_queues &gt; 1)</div><div class='ctx'> 		pr_warn("USB device uses more than one tx queue\n");</div><div class='ctx'> </div><div class='del'>-	caif_enroll_dev(dev, &amp;common, link_support, CFUSB_MAX_HEADLEN,</div><div class='add'>+	res = caif_enroll_dev(dev, &amp;common, link_support, CFUSB_MAX_HEADLEN,</div><div class='ctx'> 			&amp;layer, &amp;caif_usb_type.func);</div><div class='add'>+	if (res)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	if (!pack_added)</div><div class='ctx'> 		dev_add_pack(&amp;caif_usb_type);</div><div class='ctx'> 	pack_added = true;</div><div class='ctx'> </div><div class='del'>-	strlcpy(layer-&gt;name, dev-&gt;name, sizeof(layer-&gt;name));</div><div class='add'>+	strscpy(layer-&gt;name, dev-&gt;name, sizeof(layer-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+err:</div><div class='add'>+	cfusbl_release(link_support);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block caif_device_notifier = {</div><div class='head'>diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c<br/>index 8f00bea093b9..52509e185960 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfcnfg.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfcnfg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfcnfg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfcnfg.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -268,14 +268,14 @@ static int caif_connect_req_to_link_param(struct cfcnfg *cnfg,</div><div class='ctx'> 	case CAIFPROTO_RFM:</div><div class='ctx'> 		l-&gt;linktype = CFCTRL_SRV_RFM;</div><div class='ctx'> 		l-&gt;u.datagram.connid = s-&gt;sockaddr.u.rfm.connection_id;</div><div class='del'>-		strlcpy(l-&gt;u.rfm.volume, s-&gt;sockaddr.u.rfm.volume,</div><div class='add'>+		strscpy(l-&gt;u.rfm.volume, s-&gt;sockaddr.u.rfm.volume,</div><div class='ctx'> 			sizeof(l-&gt;u.rfm.volume));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAIFPROTO_UTIL:</div><div class='ctx'> 		l-&gt;linktype = CFCTRL_SRV_UTIL;</div><div class='ctx'> 		l-&gt;endpoint = 0x00;</div><div class='ctx'> 		l-&gt;chtype = 0x00;</div><div class='del'>-		strlcpy(l-&gt;u.utility.name, s-&gt;sockaddr.u.util.service,</div><div class='add'>+		strscpy(l-&gt;u.utility.name, s-&gt;sockaddr.u.util.service,</div><div class='ctx'> 			sizeof(l-&gt;u.utility.name));</div><div class='ctx'> 		caif_assert(sizeof(l-&gt;u.utility.name) &gt; 10);</div><div class='ctx'> 		l-&gt;u.utility.paramlen = s-&gt;param.size;</div><div class='hunk'>@@ -450,7 +450,7 @@ unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> cfcnfg_add_phy_layer(struct cfcnfg *cnfg,</div><div class='ctx'> 		     struct net_device *dev, struct cflayer *phy_layer,</div><div class='ctx'> 		     enum cfcnfg_phy_preference pref,</div><div class='hunk'>@@ -459,7 +459,7 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg,</div><div class='ctx'> {</div><div class='ctx'> 	struct cflayer *frml;</div><div class='ctx'> 	struct cfcnfg_phyinfo *phyinfo = NULL;</div><div class='del'>-	int i;</div><div class='add'>+	int i, res = 0;</div><div class='ctx'> 	u8 phyid;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cnfg-&gt;lock);</div><div class='hunk'>@@ -473,12 +473,15 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg,</div><div class='ctx'> 			goto got_phyid;</div><div class='ctx'> 	}</div><div class='ctx'> 	pr_warn("Too many CAIF Link Layers (max 6)\n");</div><div class='add'>+	res = -EEXIST;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> got_phyid:</div><div class='ctx'> 	phyinfo = kzalloc(sizeof(struct cfcnfg_phyinfo), GFP_ATOMIC);</div><div class='del'>-	if (!phyinfo)</div><div class='del'>-		goto out_err;</div><div class='add'>+	if (!phyinfo) {</div><div class='add'>+		res = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	phy_layer-&gt;id = phyid;</div><div class='ctx'> 	phyinfo-&gt;pref = pref;</div><div class='hunk'>@@ -492,8 +495,10 @@ got_phyid:</div><div class='ctx'> </div><div class='ctx'> 	frml = cffrml_create(phyid, fcs);</div><div class='ctx'> </div><div class='del'>-	if (!frml)</div><div class='add'>+	if (!frml) {</div><div class='add'>+		res = -ENOMEM;</div><div class='ctx'> 		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> 	phyinfo-&gt;frm_layer = frml;</div><div class='ctx'> 	layer_set_up(frml, cnfg-&gt;mux);</div><div class='ctx'> </div><div class='hunk'>@@ -511,11 +516,12 @@ got_phyid:</div><div class='ctx'> 	list_add_rcu(&amp;phyinfo-&gt;node, &amp;cnfg-&gt;phys);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;cnfg-&gt;lock);</div><div class='del'>-	return;</div><div class='add'>+	return res;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='ctx'> 	kfree(phyinfo);</div><div class='ctx'> 	mutex_unlock(&amp;cnfg-&gt;lock);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cfcnfg_add_phy_layer);</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c<br/>index a1e85f032108..2aa1e7d46eb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfctrl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfctrl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfctrl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfctrl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -201,14 +201,14 @@ int cfctrl_linkup_request(struct cflayer *layer,</div><div class='ctx'> 			  struct cflayer *user_layer)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfctrl *cfctrl = container_obj(layer);</div><div class='add'>+	struct cflayer *dn = cfctrl-&gt;serv.layer.dn;</div><div class='add'>+	char utility_name[UTILITY_NAME_LENGTH];</div><div class='add'>+	struct cfctrl_request_info *req;</div><div class='add'>+	struct cfpkt *pkt;</div><div class='ctx'> 	u32 tmp32;</div><div class='ctx'> 	u16 tmp16;</div><div class='ctx'> 	u8 tmp8;</div><div class='del'>-	struct cfctrl_request_info *req;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char utility_name[16];</div><div class='del'>-	struct cfpkt *pkt;</div><div class='del'>-	struct cflayer *dn = cfctrl-&gt;serv.layer.dn;</div><div class='ctx'> </div><div class='ctx'> 	if (!dn) {</div><div class='ctx'> 		pr_debug("not able to send linkup request\n");</div><div class='hunk'>@@ -257,9 +257,7 @@ int cfctrl_linkup_request(struct cflayer *layer,</div><div class='ctx'> 		cfpkt_add_body(pkt, &amp;tmp16, 2);</div><div class='ctx'> 		tmp16 = cpu_to_le16(param-&gt;u.utility.fifosize_bufs);</div><div class='ctx'> 		cfpkt_add_body(pkt, &amp;tmp16, 2);</div><div class='del'>-		memset(utility_name, 0, sizeof(utility_name));</div><div class='del'>-		strlcpy(utility_name, param-&gt;u.utility.name,</div><div class='del'>-			UTILITY_NAME_LENGTH);</div><div class='add'>+		strscpy_pad(utility_name, param-&gt;u.utility.name);</div><div class='ctx'> 		cfpkt_add_body(pkt, utility_name, UTILITY_NAME_LENGTH);</div><div class='ctx'> 		tmp8 = param-&gt;u.utility.paramlen;</div><div class='ctx'> 		cfpkt_add_body(pkt, &amp;tmp8, 1);</div><div class='hunk'>@@ -269,11 +267,15 @@ int cfctrl_linkup_request(struct cflayer *layer,</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_warn("Request setup of bad link type = %d\n",</div><div class='ctx'> 			param-&gt;linktype);</div><div class='add'>+		cfpkt_destroy(pkt);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='del'>-	if (!req)</div><div class='add'>+	if (!req) {</div><div class='add'>+		cfpkt_destroy(pkt);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	req-&gt;client_layer = user_layer;</div><div class='ctx'> 	req-&gt;cmd = CFCTRL_CMD_LINK_SETUP;</div><div class='ctx'> 	req-&gt;param = *param;</div><div class='hunk'>@@ -347,17 +349,154 @@ int cfctrl_cancel_req(struct cflayer *layr, struct cflayer *adap_layer)</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cfctrl_link_setup(struct cfctrl *cfctrl, struct cfpkt *pkt, u8 cmdrsp)</div><div class='add'>+{</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 linkid = 0;</div><div class='add'>+	enum cfctrl_srv serv;</div><div class='add'>+	enum cfctrl_srv servtype;</div><div class='add'>+	u8 endpoint;</div><div class='add'>+	u8 physlinkid;</div><div class='add'>+	u8 prio;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	u8 *cp;</div><div class='add'>+	int i;</div><div class='add'>+	struct cfctrl_link_param linkparam;</div><div class='add'>+	struct cfctrl_request_info rsp, *req;</div><div class='add'>+</div><div class='add'>+	memset(&amp;linkparam, 0, sizeof(linkparam));</div><div class='add'>+</div><div class='add'>+	tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+</div><div class='add'>+	serv = tmp &amp; CFCTRL_SRV_MASK;</div><div class='add'>+	linkparam.linktype = serv;</div><div class='add'>+</div><div class='add'>+	servtype = tmp &gt;&gt; 4;</div><div class='add'>+	linkparam.chtype = servtype;</div><div class='add'>+</div><div class='add'>+	tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+	physlinkid = tmp &amp; 0x07;</div><div class='add'>+	prio = tmp &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+	linkparam.priority = prio;</div><div class='add'>+	linkparam.phyid = physlinkid;</div><div class='add'>+	endpoint = cfpkt_extr_head_u8(pkt);</div><div class='add'>+	linkparam.endpoint = endpoint &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	switch (serv) {</div><div class='add'>+	case CFCTRL_SRV_VEI:</div><div class='add'>+	case CFCTRL_SRV_DBG:</div><div class='add'>+		if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='add'>+			break;</div><div class='add'>+		/* Link ID */</div><div class='add'>+		linkid = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		break;</div><div class='add'>+	case CFCTRL_SRV_VIDEO:</div><div class='add'>+		tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		linkparam.u.video.connid = tmp;</div><div class='add'>+		if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='add'>+			break;</div><div class='add'>+		/* Link ID */</div><div class='add'>+		linkid = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CFCTRL_SRV_DATAGRAM:</div><div class='add'>+		linkparam.u.datagram.connid = cfpkt_extr_head_u32(pkt);</div><div class='add'>+		if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='add'>+			break;</div><div class='add'>+		/* Link ID */</div><div class='add'>+		linkid = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		break;</div><div class='add'>+	case CFCTRL_SRV_RFM:</div><div class='add'>+		/* Construct a frame, convert</div><div class='add'>+		 * DatagramConnectionID</div><div class='add'>+		 * to network format long and copy it out...</div><div class='add'>+		 */</div><div class='add'>+		linkparam.u.rfm.connid = cfpkt_extr_head_u32(pkt);</div><div class='add'>+		cp = (u8 *) linkparam.u.rfm.volume;</div><div class='add'>+		for (tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		     cfpkt_more(pkt) &amp;&amp; tmp != '\0';</div><div class='add'>+		     tmp = cfpkt_extr_head_u8(pkt))</div><div class='add'>+			*cp++ = tmp;</div><div class='add'>+		*cp = '\0';</div><div class='add'>+</div><div class='add'>+		if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='add'>+			break;</div><div class='add'>+		/* Link ID */</div><div class='add'>+		linkid = cfpkt_extr_head_u8(pkt);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case CFCTRL_SRV_UTIL:</div><div class='add'>+		/* Construct a frame, convert</div><div class='add'>+		 * DatagramConnectionID</div><div class='add'>+		 * to network format long and copy it out...</div><div class='add'>+		 */</div><div class='add'>+		/* Fifosize KB */</div><div class='add'>+		linkparam.u.utility.fifosize_kb = cfpkt_extr_head_u16(pkt);</div><div class='add'>+		/* Fifosize bufs */</div><div class='add'>+		linkparam.u.utility.fifosize_bufs = cfpkt_extr_head_u16(pkt);</div><div class='add'>+		/* name */</div><div class='add'>+		cp = (u8 *) linkparam.u.utility.name;</div><div class='add'>+		caif_assert(sizeof(linkparam.u.utility.name)</div><div class='add'>+			     &gt;= UTILITY_NAME_LENGTH);</div><div class='add'>+		for (i = 0; i &lt; UTILITY_NAME_LENGTH &amp;&amp; cfpkt_more(pkt); i++) {</div><div class='add'>+			tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+			*cp++ = tmp;</div><div class='add'>+		}</div><div class='add'>+		/* Length */</div><div class='add'>+		len = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		linkparam.u.utility.paramlen = len;</div><div class='add'>+		/* Param Data */</div><div class='add'>+		cp = linkparam.u.utility.params;</div><div class='add'>+		while (cfpkt_more(pkt) &amp;&amp; len--) {</div><div class='add'>+			tmp = cfpkt_extr_head_u8(pkt);</div><div class='add'>+			*cp++ = tmp;</div><div class='add'>+		}</div><div class='add'>+		if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='add'>+			break;</div><div class='add'>+		/* Link ID */</div><div class='add'>+		linkid = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		/* Length */</div><div class='add'>+		len = cfpkt_extr_head_u8(pkt);</div><div class='add'>+		/* Param Data */</div><div class='add'>+		cfpkt_extr_head(pkt, NULL, len);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("Request setup, invalid type (%d)\n", serv);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp.cmd = CFCTRL_CMD_LINK_SETUP;</div><div class='add'>+	rsp.param = linkparam;</div><div class='add'>+	spin_lock_bh(&amp;cfctrl-&gt;info_list_lock);</div><div class='add'>+	req = cfctrl_remove_req(cfctrl, &amp;rsp);</div><div class='add'>+</div><div class='add'>+	if (CFCTRL_ERR_BIT == (CFCTRL_ERR_BIT &amp; cmdrsp) ||</div><div class='add'>+		cfpkt_erroneous(pkt)) {</div><div class='add'>+		pr_err("Invalid O/E bit or parse error "</div><div class='add'>+				"on CAIF control channel\n");</div><div class='add'>+		cfctrl-&gt;res.reject_rsp(cfctrl-&gt;serv.layer.up, 0,</div><div class='add'>+				       req ? req-&gt;client_layer : NULL);</div><div class='add'>+	} else {</div><div class='add'>+		cfctrl-&gt;res.linksetup_rsp(cfctrl-&gt;serv.layer.up, linkid,</div><div class='add'>+					  serv, physlinkid,</div><div class='add'>+					  req ?  req-&gt;client_layer : NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(req);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;cfctrl-&gt;info_list_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cmdrsp;</div><div class='ctx'> 	u8 cmd;</div><div class='del'>-	int ret = -1;</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 param[255];</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u8 linkid = 0;</div><div class='ctx'> 	struct cfctrl *cfctrl = container_obj(layer);</div><div class='del'>-	struct cfctrl_request_info rsp, *req;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> 	cmdrsp = cfpkt_extr_head_u8(pkt);</div><div class='ctx'> 	cmd = cmdrsp &amp; CFCTRL_CMD_MASK;</div><div class='hunk'>@@ -370,150 +509,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case CFCTRL_CMD_LINK_SETUP:</div><div class='del'>-		{</div><div class='del'>-			enum cfctrl_srv serv;</div><div class='del'>-			enum cfctrl_srv servtype;</div><div class='del'>-			u8 endpoint;</div><div class='del'>-			u8 physlinkid;</div><div class='del'>-			u8 prio;</div><div class='del'>-			u8 tmp;</div><div class='del'>-			u8 *cp;</div><div class='del'>-			int i;</div><div class='del'>-			struct cfctrl_link_param linkparam;</div><div class='del'>-			memset(&amp;linkparam, 0, sizeof(linkparam));</div><div class='del'>-</div><div class='del'>-			tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-</div><div class='del'>-			serv = tmp &amp; CFCTRL_SRV_MASK;</div><div class='del'>-			linkparam.linktype = serv;</div><div class='del'>-</div><div class='del'>-			servtype = tmp &gt;&gt; 4;</div><div class='del'>-			linkparam.chtype = servtype;</div><div class='del'>-</div><div class='del'>-			tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-			physlinkid = tmp &amp; 0x07;</div><div class='del'>-			prio = tmp &gt;&gt; 3;</div><div class='del'>-</div><div class='del'>-			linkparam.priority = prio;</div><div class='del'>-			linkparam.phyid = physlinkid;</div><div class='del'>-			endpoint = cfpkt_extr_head_u8(pkt);</div><div class='del'>-			linkparam.endpoint = endpoint &amp; 0x03;</div><div class='del'>-</div><div class='del'>-			switch (serv) {</div><div class='del'>-			case CFCTRL_SRV_VEI:</div><div class='del'>-			case CFCTRL_SRV_DBG:</div><div class='del'>-				if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='del'>-					break;</div><div class='del'>-				/* Link ID */</div><div class='del'>-				linkid = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				break;</div><div class='del'>-			case CFCTRL_SRV_VIDEO:</div><div class='del'>-				tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				linkparam.u.video.connid = tmp;</div><div class='del'>-				if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='del'>-					break;</div><div class='del'>-				/* Link ID */</div><div class='del'>-				linkid = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case CFCTRL_SRV_DATAGRAM:</div><div class='del'>-				linkparam.u.datagram.connid =</div><div class='del'>-				    cfpkt_extr_head_u32(pkt);</div><div class='del'>-				if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='del'>-					break;</div><div class='del'>-				/* Link ID */</div><div class='del'>-				linkid = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				break;</div><div class='del'>-			case CFCTRL_SRV_RFM:</div><div class='del'>-				/* Construct a frame, convert</div><div class='del'>-				 * DatagramConnectionID</div><div class='del'>-				 * to network format long and copy it out...</div><div class='del'>-				 */</div><div class='del'>-				linkparam.u.rfm.connid =</div><div class='del'>-				    cfpkt_extr_head_u32(pkt);</div><div class='del'>-				cp = (u8 *) linkparam.u.rfm.volume;</div><div class='del'>-				for (tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				     cfpkt_more(pkt) &amp;&amp; tmp != '\0';</div><div class='del'>-				     tmp = cfpkt_extr_head_u8(pkt))</div><div class='del'>-					*cp++ = tmp;</div><div class='del'>-				*cp = '\0';</div><div class='del'>-</div><div class='del'>-				if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='del'>-					break;</div><div class='del'>-				/* Link ID */</div><div class='del'>-				linkid = cfpkt_extr_head_u8(pkt);</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			case CFCTRL_SRV_UTIL:</div><div class='del'>-				/* Construct a frame, convert</div><div class='del'>-				 * DatagramConnectionID</div><div class='del'>-				 * to network format long and copy it out...</div><div class='del'>-				 */</div><div class='del'>-				/* Fifosize KB */</div><div class='del'>-				linkparam.u.utility.fifosize_kb =</div><div class='del'>-				    cfpkt_extr_head_u16(pkt);</div><div class='del'>-				/* Fifosize bufs */</div><div class='del'>-				linkparam.u.utility.fifosize_bufs =</div><div class='del'>-				    cfpkt_extr_head_u16(pkt);</div><div class='del'>-				/* name */</div><div class='del'>-				cp = (u8 *) linkparam.u.utility.name;</div><div class='del'>-				caif_assert(sizeof(linkparam.u.utility.name)</div><div class='del'>-					     &gt;= UTILITY_NAME_LENGTH);</div><div class='del'>-				for (i = 0;</div><div class='del'>-				     i &lt; UTILITY_NAME_LENGTH</div><div class='del'>-				     &amp;&amp; cfpkt_more(pkt); i++) {</div><div class='del'>-					tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-					*cp++ = tmp;</div><div class='del'>-				}</div><div class='del'>-				/* Length */</div><div class='del'>-				len = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				linkparam.u.utility.paramlen = len;</div><div class='del'>-				/* Param Data */</div><div class='del'>-				cp = linkparam.u.utility.params;</div><div class='del'>-				while (cfpkt_more(pkt) &amp;&amp; len--) {</div><div class='del'>-					tmp = cfpkt_extr_head_u8(pkt);</div><div class='del'>-					*cp++ = tmp;</div><div class='del'>-				}</div><div class='del'>-				if (CFCTRL_ERR_BIT &amp; cmdrsp)</div><div class='del'>-					break;</div><div class='del'>-				/* Link ID */</div><div class='del'>-				linkid = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				/* Length */</div><div class='del'>-				len = cfpkt_extr_head_u8(pkt);</div><div class='del'>-				/* Param Data */</div><div class='del'>-				cfpkt_extr_head(pkt, &amp;param, len);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				pr_warn("Request setup, invalid type (%d)\n",</div><div class='del'>-					serv);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rsp.cmd = cmd;</div><div class='del'>-			rsp.param = linkparam;</div><div class='del'>-			spin_lock_bh(&amp;cfctrl-&gt;info_list_lock);</div><div class='del'>-			req = cfctrl_remove_req(cfctrl, &amp;rsp);</div><div class='del'>-</div><div class='del'>-			if (CFCTRL_ERR_BIT == (CFCTRL_ERR_BIT &amp; cmdrsp) ||</div><div class='del'>-				cfpkt_erroneous(pkt)) {</div><div class='del'>-				pr_err("Invalid O/E bit or parse error "</div><div class='del'>-						"on CAIF control channel\n");</div><div class='del'>-				cfctrl-&gt;res.reject_rsp(cfctrl-&gt;serv.layer.up,</div><div class='del'>-						       0,</div><div class='del'>-						       req ? req-&gt;client_layer</div><div class='del'>-						       : NULL);</div><div class='del'>-			} else {</div><div class='del'>-				cfctrl-&gt;res.linksetup_rsp(cfctrl-&gt;serv.</div><div class='del'>-							  layer.up, linkid,</div><div class='del'>-							  serv, physlinkid,</div><div class='del'>-							  req ? req-&gt;</div><div class='del'>-							  client_layer : NULL);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			kfree(req);</div><div class='del'>-</div><div class='del'>-			spin_unlock_bh(&amp;cfctrl-&gt;info_list_lock);</div><div class='del'>-		}</div><div class='add'>+		ret = cfctrl_link_setup(cfctrl, pkt, cmdrsp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CFCTRL_CMD_LINK_DESTROY:</div><div class='ctx'> 		linkid = cfpkt_extr_head_u8(pkt);</div><div class='hunk'>@@ -540,9 +536,9 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_err("Unrecognized Control Frame\n");</div><div class='add'>+		ret = -1;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='ctx'> error:</div><div class='ctx'> 	cfpkt_destroy(pkt);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/net/caif/cfdbgl.c b/net/caif/cfdbgl.c<br/>index 7aae0b56829e..77f428428b47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfdbgl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfdbgl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfdbgl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfdbgl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -26,7 +26,7 @@ struct cflayer *cfdbgl_create(u8 channel_id, struct dev_info *dev_info)</div><div class='ctx'> 	cfsrvl_init(dbg, channel_id, dev_info, false);</div><div class='ctx'> 	dbg-&gt;layer.receive = cfdbgl_receive;</div><div class='ctx'> 	dbg-&gt;layer.transmit = cfdbgl_transmit;</div><div class='del'>-	snprintf(dbg-&gt;layer.name, CAIF_LAYER_NAME_SZ - 1, "dbg%d", channel_id);</div><div class='add'>+	snprintf(dbg-&gt;layer.name, CAIF_LAYER_NAME_SZ, "dbg%d", channel_id);</div><div class='ctx'> 	return &amp;dbg-&gt;layer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c<br/>index 3bdddb32d55a..eb6f8ef47a79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfdgml.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfdgml.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfdgml.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfdgml.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -33,8 +33,7 @@ struct cflayer *cfdgml_create(u8 channel_id, struct dev_info *dev_info)</div><div class='ctx'> 	cfsrvl_init(dgm, channel_id, dev_info, true);</div><div class='ctx'> 	dgm-&gt;layer.receive = cfdgml_receive;</div><div class='ctx'> 	dgm-&gt;layer.transmit = cfdgml_transmit;</div><div class='del'>-	snprintf(dgm-&gt;layer.name, CAIF_LAYER_NAME_SZ - 1, "dgm%d", channel_id);</div><div class='del'>-	dgm-&gt;layer.name[CAIF_LAYER_NAME_SZ - 1] = '\0';</div><div class='add'>+	snprintf(dgm-&gt;layer.name, CAIF_LAYER_NAME_SZ, "dgm%d", channel_id);</div><div class='ctx'> 	return &amp;dgm-&gt;layer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c<br/>index 434ba8557826..6651a8dc62e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cffrml.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cffrml.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cffrml.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cffrml.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAIF Framing Layer.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='head'>diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c<br/>index 510aa5a753f0..4172b0d0db63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfmuxl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfmuxl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfmuxl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfmuxl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='head'>diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c<br/>index 38c2b7a890dd..96236d21b18e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfpkt_skbuff.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfpkt_skbuff.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfpkt_skbuff.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfpkt_skbuff.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -21,13 +21,6 @@ do {					   \</div><div class='ctx'> 	pr_warn(errmsg);		   \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-struct cfpktq {</div><div class='del'>-	struct sk_buff_head head;</div><div class='del'>-	atomic_t count;</div><div class='del'>-	/* Lock protects count updates */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * net/caif/ is generic and does not</div><div class='ctx'>  * understand SKB, so we do this typecast</div><div class='hunk'>@@ -305,10 +298,8 @@ struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,</div><div class='ctx'> 	if (unlikely(is_erronous(dstpkt) || is_erronous(addpkt))) {</div><div class='ctx'> 		return dstpkt;</div><div class='ctx'> 	}</div><div class='del'>-	if (expectlen &gt; addlen)</div><div class='del'>-		neededtailspace = expectlen;</div><div class='del'>-	else</div><div class='del'>-		neededtailspace = addlen;</div><div class='add'>+</div><div class='add'>+	neededtailspace = max(expectlen, addlen);</div><div class='ctx'> </div><div class='ctx'> 	if (dst-&gt;tail + neededtailspace &gt; dst-&gt;end) {</div><div class='ctx'> 		/* Create a dumplicate of 'dst' with more tail space */</div><div class='hunk'>@@ -319,16 +310,12 @@ struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,</div><div class='ctx'> 		if (tmppkt == NULL)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		tmp = pkt_to_skb(tmppkt);</div><div class='del'>-		skb_set_tail_pointer(tmp, dstlen);</div><div class='del'>-		tmp-&gt;len = dstlen;</div><div class='del'>-		memcpy(tmp-&gt;data, dst-&gt;data, dstlen);</div><div class='add'>+		skb_put_data(tmp, dst-&gt;data, dstlen);</div><div class='ctx'> 		cfpkt_destroy(dstpkt);</div><div class='ctx'> 		dst = tmp;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(skb_tail_pointer(dst), add-&gt;data, skb_headlen(add));</div><div class='add'>+	skb_put_data(dst, add-&gt;data, skb_headlen(add));</div><div class='ctx'> 	cfpkt_destroy(addpkt);</div><div class='del'>-	dst-&gt;tail += addlen;</div><div class='del'>-	dst-&gt;len += addlen;</div><div class='ctx'> 	return skb_to_pkt(dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -359,13 +346,11 @@ struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos)</div><div class='ctx'> 	if (skb2 == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	skb_put_data(skb2, split, len2nd);</div><div class='add'>+</div><div class='ctx'> 	/* Reduce the length of the original packet */</div><div class='del'>-	skb_set_tail_pointer(skb, pos);</div><div class='del'>-	skb-&gt;len = pos;</div><div class='add'>+	skb_trim(skb, pos);</div><div class='ctx'> </div><div class='del'>-	memcpy(skb2-&gt;data, split, len2nd);</div><div class='del'>-	skb2-&gt;tail += len2nd;</div><div class='del'>-	skb2-&gt;len += len2nd;</div><div class='ctx'> 	skb2-&gt;priority = skb-&gt;priority;</div><div class='ctx'> 	return skb_to_pkt(skb2);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c<br/>index b82440e1fcb4..3c335057f255 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfrfml.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfrfml.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfrfml.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfrfml.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;net/caif/caif_layer.h&gt;</div><div class='ctx'> #include &lt;net/caif/cfsrvl.h&gt;</div><div class='ctx'> #include &lt;net/caif/cfpkt.h&gt;</div><div class='hunk'>@@ -116,7 +116,7 @@ static int cfrfml_receive(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 	if (segmented) {</div><div class='ctx'> 		if (rfml-&gt;incomplete_frm == NULL) {</div><div class='ctx'> 			/* Initial Segment */</div><div class='del'>-			if (cfpkt_peek_head(pkt, rfml-&gt;seghead, 6) &lt; 0)</div><div class='add'>+			if (cfpkt_peek_head(pkt, rfml-&gt;seghead, 6) != 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			rfml-&gt;pdu_size = get_unaligned_le16(rfml-&gt;seghead+4);</div><div class='hunk'>@@ -233,7 +233,7 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 	if (cfpkt_getlen(pkt) &gt; rfml-&gt;fragment_size + RFM_HEAD_SIZE)</div><div class='ctx'> 		err = cfpkt_peek_head(pkt, head, 6);</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	while (cfpkt_getlen(frontpkt) &gt; rfml-&gt;fragment_size + RFM_HEAD_SIZE) {</div><div class='hunk'>@@ -264,9 +264,6 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 		frontpkt = rearpkt;</div><div class='ctx'> 		rearpkt = NULL;</div><div class='ctx'> </div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		if (frontpkt == NULL)</div><div class='del'>-			goto out;</div><div class='ctx'> 		err = -EPROTO;</div><div class='ctx'> 		if (cfpkt_add_head(frontpkt, head, 6) &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='head'>diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c<br/>index ce60f06d76de..aee11c74d3c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfserl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfserl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfserl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfserl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -31,6 +31,11 @@ static int cfserl_transmit(struct cflayer *layr, struct cfpkt *pkt);</div><div class='ctx'> static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,</div><div class='ctx'> 			   int phyid);</div><div class='ctx'> </div><div class='add'>+void cfserl_release(struct cflayer *layer)</div><div class='add'>+{</div><div class='add'>+	kfree(layer);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct cflayer *cfserl_create(int instance, bool use_stx)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC);</div><div class='hunk'>@@ -123,7 +128,6 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt)</div><div class='ctx'> 				if (pkt != NULL)</div><div class='ctx'> 					cfpkt_destroy(pkt);</div><div class='ctx'> 				layr-&gt;incomplete_frm = NULL;</div><div class='del'>-				expectlen = 0;</div><div class='ctx'> 				spin_unlock(&amp;layr-&gt;sync);</div><div class='ctx'> 				return -EPROTO;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c<br/>index a6e115463052..171fa32ada85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfsrvl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfsrvl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfsrvl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfsrvl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #define SRVL_FLOW_OFF 0x81</div><div class='ctx'> #define SRVL_FLOW_ON  0x80</div><div class='ctx'> #define SRVL_SET_PIN  0x82</div><div class='del'>-#define SRVL_CTRL_PKT_SIZE 1</div><div class='ctx'> </div><div class='ctx'> #define container_obj(layr) container_of(layr, struct cfsrvl, layer)</div><div class='ctx'> </div><div class='hunk'>@@ -184,12 +183,6 @@ bool cfsrvl_ready(struct cfsrvl *service, int *err)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 cfsrvl_getphyid(struct cflayer *layer)</div><div class='del'>-{</div><div class='del'>-	struct cfsrvl *servl = container_obj(layer);</div><div class='del'>-	return servl-&gt;dev_info.id;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool cfsrvl_phyid_match(struct cflayer *layer, int phyid)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfsrvl *servl = container_obj(layer);</div><div class='head'>diff --git a/net/caif/cfutill.c b/net/caif/cfutill.c<br/>index 1728fa4471cf..b2e47ede912f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfutill.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfutill.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfutill.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfutill.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -33,7 +33,7 @@ struct cflayer *cfutill_create(u8 channel_id, struct dev_info *dev_info)</div><div class='ctx'> 	cfsrvl_init(util, channel_id, dev_info, true);</div><div class='ctx'> 	util-&gt;layer.receive = cfutill_receive;</div><div class='ctx'> 	util-&gt;layer.transmit = cfutill_transmit;</div><div class='del'>-	snprintf(util-&gt;layer.name, CAIF_LAYER_NAME_SZ - 1, "util1");</div><div class='add'>+	snprintf(util-&gt;layer.name, CAIF_LAYER_NAME_SZ, "util1");</div><div class='ctx'> 	return &amp;util-&gt;layer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c<br/>index 262224581efa..db2274b94a5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfveil.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfveil.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfveil.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfveil.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -32,7 +32,7 @@ struct cflayer *cfvei_create(u8 channel_id, struct dev_info *dev_info)</div><div class='ctx'> 	cfsrvl_init(vei, channel_id, dev_info, true);</div><div class='ctx'> 	vei-&gt;layer.receive = cfvei_receive;</div><div class='ctx'> 	vei-&gt;layer.transmit = cfvei_transmit;</div><div class='del'>-	snprintf(vei-&gt;layer.name, CAIF_LAYER_NAME_SZ - 1, "vei%d", channel_id);</div><div class='add'>+	snprintf(vei-&gt;layer.name, CAIF_LAYER_NAME_SZ, "vei%d", channel_id);</div><div class='ctx'> 	return &amp;vei-&gt;layer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c<br/>index b3b110e8a350..134bad43196c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/cfvidl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/cfvidl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/cfvidl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/cfvidl.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Author:	Sjur Brendeland</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -29,7 +29,7 @@ struct cflayer *cfvidl_create(u8 channel_id, struct dev_info *dev_info)</div><div class='ctx'> 	cfsrvl_init(vid, channel_id, dev_info, false);</div><div class='ctx'> 	vid-&gt;layer.receive = cfvidl_receive;</div><div class='ctx'> 	vid-&gt;layer.transmit = cfvidl_transmit;</div><div class='del'>-	snprintf(vid-&gt;layer.name, CAIF_LAYER_NAME_SZ - 1, "vid1");</div><div class='add'>+	snprintf(vid-&gt;layer.name, CAIF_LAYER_NAME_SZ, "vid1");</div><div class='ctx'> 	return &amp;vid-&gt;layer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c<br/>index 13e2ae6be620..fa6a3c2634a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/caif/chnl_net.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/caif/chnl_net.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/caif/chnl_net.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/caif/chnl_net.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) ST-Ericsson AB 2010</div><div class='ctx'>  * Authors:	Sjur Brendeland</div><div class='ctx'>  *		Daniel Martensson</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__</div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> /*This list is protected by the rtnl lock. */</div><div class='ctx'> static LIST_HEAD(chnl_net_list);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ST-Ericsson CAIF modem protocol GPRS network device");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("caif");</div><div class='ctx'> </div><div class='hunk'>@@ -46,27 +47,12 @@ struct chnl_net {</div><div class='ctx'> 	struct caif_connect_request conn_req;</div><div class='ctx'> 	struct list_head list_field;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='del'>-	char name[256];</div><div class='ctx'> 	wait_queue_head_t netmgmt_wq;</div><div class='ctx'> 	/* Flow status to remember and control the transmission. */</div><div class='ctx'> 	bool flowenabled;</div><div class='ctx'> 	enum caif_states state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void robust_list_del(struct list_head *delete_node)</div><div class='del'>-{</div><div class='del'>-	struct list_head *list_node;</div><div class='del'>-	struct list_head *n;</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	list_for_each_safe(list_node, n, &amp;chnl_net_list) {</div><div class='del'>-		if (list_node == delete_node) {</div><div class='del'>-			list_del(list_node);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	WARN_ON(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -76,8 +62,6 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 	u8 buf;</div><div class='ctx'> </div><div class='ctx'> 	priv = container_of(layr, struct chnl_net, chnl);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	skb = (struct sk_buff *) cfpkt_tonative(pkt);</div><div class='ctx'> </div><div class='hunk'>@@ -115,10 +99,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)</div><div class='ctx'> 	else</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	else</div><div class='del'>-		netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Update statistics. */</div><div class='ctx'> 	priv-&gt;netdev-&gt;stats.rx_packets++;</div><div class='hunk'>@@ -211,7 +192,8 @@ static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t chnl_net_start_xmit(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct chnl_net *priv;</div><div class='ctx'> 	struct cfpkt *pkt = NULL;</div><div class='hunk'>@@ -328,9 +310,6 @@ static int chnl_net_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (result == 0) {</div><div class='ctx'> 		pr_debug("connect timeout\n");</div><div class='del'>-		caif_disconnect_client(dev_net(dev), &amp;priv-&gt;chnl);</div><div class='del'>-		priv-&gt;state = CAIF_DISCONNECTED;</div><div class='del'>-		pr_debug("state disconnected\n");</div><div class='ctx'> 		result = -ETIMEDOUT;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -367,7 +346,7 @@ static int chnl_net_init(struct net_device *dev)</div><div class='ctx'> 	struct chnl_net *priv;</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='del'>-	strncpy(priv-&gt;name, dev-&gt;name, sizeof(priv-&gt;name));</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;list_field);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +355,7 @@ static void chnl_net_uninit(struct net_device *dev)</div><div class='ctx'> 	struct chnl_net *priv;</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='del'>-	robust_list_del(&amp;priv-&gt;list_field);</div><div class='add'>+	list_del_init(&amp;priv-&gt;list_field);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops netdev_ops = {</div><div class='hunk'>@@ -459,10 +438,11 @@ static void caif_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipcaif_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			  struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ipcaif_newlink(struct net_device *dev,</div><div class='add'>+			  struct rtnl_newlink_params *params,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct chnl_net *caifdev;</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='hunk'>@@ -541,7 +521,7 @@ static void __exit chnl_exit_module(void)</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	list_for_each_safe(list_node, _tmp, &amp;chnl_net_list) {</div><div class='ctx'> 		dev = list_entry(list_node, struct chnl_net, list_field);</div><div class='del'>-		list_del(list_node);</div><div class='add'>+		list_del_init(list_node);</div><div class='ctx'> 		delete_device(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='head'>diff --git a/net/can/Kconfig b/net/can/Kconfig<br/>index a4399be54ff4..e4ccf731a24c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/Kconfig</a></div><div class='hunk'>@@ -1,27 +1,30 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Controller Area Network (CAN) network layer core configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig CAN</div><div class='del'>-	depends on NET</div><div class='ctx'> 	tristate "CAN bus subsystem support"</div><div class='del'>-	---help---</div><div class='add'>+	select CAN_DEV</div><div class='add'>+	help</div><div class='ctx'> 	  Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial</div><div class='del'>-	  communications protocol which was developed by Bosch in</div><div class='del'>-	  1991, mainly for automotive, but now widely used in marine</div><div class='del'>-	  (NMEA2000), industrial, and medical applications.</div><div class='del'>-	  More information on the CAN network protocol family PF_CAN</div><div class='del'>-	  is contained in &lt;Documentation/networking/can.rst&gt;.</div><div class='add'>+	  communications protocol. Development of the CAN bus started in</div><div class='add'>+	  1983 at Robert Bosch GmbH, and the protocol was officially</div><div class='add'>+	  released in 1986. The CAN bus was originally mainly for automotive,</div><div class='add'>+	  but is now widely used in marine (NMEA2000), industrial, and medical</div><div class='add'>+	  applications. More information on the CAN network protocol family</div><div class='add'>+	  PF_CAN is contained in &lt;Documentation/networking/can.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  If you want CAN support you should say Y here and also to the</div><div class='del'>-	  specific driver for your controller(s) below.</div><div class='add'>+	  specific driver for your controller(s) under the Network device</div><div class='add'>+	  support section.</div><div class='ctx'> </div><div class='ctx'> if CAN</div><div class='ctx'> </div><div class='ctx'> config CAN_RAW</div><div class='ctx'> 	tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The raw CAN protocol option offers access to the CAN bus via</div><div class='ctx'> 	  the BSD socket API. You probably want to use the raw socket in</div><div class='ctx'> 	  most cases where no higher level protocol is being used. The raw</div><div class='hunk'>@@ -31,7 +34,7 @@ config CAN_RAW</div><div class='ctx'> config CAN_BCM</div><div class='ctx'> 	tristate "Broadcast Manager CAN Protocol (with content filtering)"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The Broadcast Manager offers content filtering, timeout monitoring,</div><div class='ctx'> 	  sending of RTR frames, and cyclic CAN messages without permanent user</div><div class='ctx'> 	  interaction. The BCM can be 'programmed' via the BSD socket API and</div><div class='hunk'>@@ -43,7 +46,7 @@ config CAN_BCM</div><div class='ctx'> config CAN_GW</div><div class='ctx'> 	tristate "CAN Gateway/Router (with netlink configuration)"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The CAN Gateway/Router is used to route (and modify) CAN frames.</div><div class='ctx'> 	  It is based on the PF_CAN core infrastructure for msg filtering and</div><div class='ctx'> 	  msg sending and can optionally modify routed CAN frames on the fly.</div><div class='hunk'>@@ -51,6 +54,20 @@ config CAN_GW</div><div class='ctx'> 	  They can be modified with AND/OR/XOR/SET operations as configured</div><div class='ctx'> 	  by the netlink configuration interface known e.g. from iptables.</div><div class='ctx'> </div><div class='del'>-source "drivers/net/can/Kconfig"</div><div class='add'>+source "net/can/j1939/Kconfig"</div><div class='add'>+</div><div class='add'>+config CAN_ISOTP</div><div class='add'>+	tristate "ISO 15765-2 CAN transport protocol"</div><div class='add'>+	help</div><div class='add'>+	  CAN Transport Protocols offer support for segmented Point-to-Point</div><div class='add'>+	  communication between CAN nodes via two defined CAN Identifiers.</div><div class='add'>+	  This protocol driver implements segmented data transfers for CAN CC</div><div class='add'>+	  (aka Classical CAN, CAN 2.0B) and CAN FD frame types which were</div><div class='add'>+	  introduced with ISO 15765-2:2016.</div><div class='add'>+	  As CAN frames can only transport a small amount of data bytes</div><div class='add'>+	  (max. 8 bytes for CAN CC and max. 64 bytes for CAN FD) this</div><div class='add'>+	  segmentation is needed to transport longer Protocol Data Units (PDU)</div><div class='add'>+	  as needed e.g. for vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN</div><div class='add'>+	  traffic.</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/net/can/Makefile b/net/can/Makefile<br/>index 1242bbbfe57f..58f2c31c1ef3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/Makefile</a></div><div class='hunk'>@@ -15,3 +15,8 @@ can-bcm-y		:= bcm.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_GW)	+= can-gw.o</div><div class='ctx'> can-gw-y		:= gw.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_J1939)	+= j1939/</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_ISOTP)	+= can-isotp.o</div><div class='add'>+can-isotp-y		:= isotp.o</div><div class='head'>diff --git a/net/can/af_can.c b/net/can/af_can.c<br/>index 1684ba5b51eb..770173d8db42 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/af_can.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/af_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/af_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/af_can.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * af_can.c - Protocol family CAN core module</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='add'>+/* af_can.c - Protocol family CAN core module</div><div class='ctx'>  *            (used by different CAN protocol modules)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2017 Volkswagen Group Electronic Research</div><div class='hunk'>@@ -58,6 +58,7 @@</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/core.h&gt;</div><div class='ctx'> #include &lt;linux/can/skb.h&gt;</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='hunk'>@@ -83,29 +84,14 @@ static DEFINE_MUTEX(proto_tab_lock);</div><div class='ctx'> </div><div class='ctx'> static atomic_t skbcounter = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can socket functions</div><div class='del'>- */</div><div class='add'>+/* af_can socket functions */</div><div class='ctx'> </div><div class='del'>-int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-</div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		return sock_get_timestamp(sk, (struct timeval __user *)arg);</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(can_ioctl);</div><div class='del'>-</div><div class='del'>-static void can_sock_destruct(struct sock *sk)</div><div class='add'>+void can_sock_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(can_sock_destruct);</div><div class='ctx'> </div><div class='ctx'> static const struct can_proto *can_get_proto(int protocol)</div><div class='ctx'> {</div><div class='hunk'>@@ -145,14 +131,13 @@ static int can_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> </div><div class='ctx'> 		err = request_module("can-proto-%d", protocol);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * In case of error we only print a message but don't</div><div class='add'>+		/* In case of error we only print a message but don't</div><div class='ctx'> 		 * return the error code immediately.  Below we will</div><div class='ctx'> 		 * return -EPROTONOSUPPORT</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (err)</div><div class='del'>-			printk_ratelimited(KERN_ERR "can: request_module "</div><div class='del'>-			       "(can-proto-%d) failed.\n", protocol);</div><div class='add'>+			pr_err_ratelimited("can: request_module (can-proto-%d) failed.\n",</div><div class='add'>+					   protocol);</div><div class='ctx'> </div><div class='ctx'> 		cp = can_get_proto(protocol);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -186,6 +171,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 		/* release sk on errors */</div><div class='ctx'> 		sock_orphan(sk);</div><div class='ctx'> 		sock_put(sk);</div><div class='add'>+		sock-&gt;sk = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		sock_prot_inuse_add(net, sk-&gt;sk_prot, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  errout:</div><div class='hunk'>@@ -193,9 +181,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can tx path</div><div class='del'>- */</div><div class='add'>+/* af_can tx path */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * can_send - transmit a CAN frame (optional with local loopback)</div><div class='hunk'>@@ -216,27 +202,26 @@ static int can_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> int can_send(struct sk_buff *skb, int loop)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *newskb = NULL;</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='del'>-	struct s_stats *can_stats = dev_net(skb-&gt;dev)-&gt;can.can_stats;</div><div class='add'>+	struct can_pkg_stats *pkg_stats = dev_net(skb-&gt;dev)-&gt;can.pkg_stats;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len == CAN_MTU) {</div><div class='add'>+	if (can_is_canxl_skb(skb)) {</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_CANXL);</div><div class='add'>+	} else if (can_is_can_skb(skb)) {</div><div class='ctx'> 		skb-&gt;protocol = htons(ETH_P_CAN);</div><div class='del'>-		if (unlikely(cfd-&gt;len &gt; CAN_MAX_DLEN))</div><div class='del'>-			goto inval_skb;</div><div class='del'>-	} else if (skb-&gt;len == CANFD_MTU) {</div><div class='add'>+	} else if (can_is_canfd_skb(skb)) {</div><div class='add'>+		struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='ctx'> 		skb-&gt;protocol = htons(ETH_P_CANFD);</div><div class='del'>-		if (unlikely(cfd-&gt;len &gt; CANFD_MAX_DLEN))</div><div class='del'>-			goto inval_skb;</div><div class='del'>-	} else</div><div class='add'>+</div><div class='add'>+		/* set CAN FD flag for CAN FD frames by default */</div><div class='add'>+		cfd-&gt;flags |= CANFD_FDF;</div><div class='add'>+	} else {</div><div class='ctx'> 		goto inval_skb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the CAN frame can pass the selected CAN netdevice.</div><div class='del'>-	 * As structs can_frame and canfd_frame are similar, we can provide</div><div class='del'>-	 * CAN FD frames to legacy CAN drivers as long as the length is &lt;= 8</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(skb-&gt;len &gt; skb-&gt;dev-&gt;mtu &amp;&amp; cfd-&gt;len &gt; CAN_MAX_DLEN)) {</div><div class='add'>+	/* Make sure the CAN frame can pass the selected CAN netdevice. */</div><div class='add'>+	if (unlikely(skb-&gt;len &gt; READ_ONCE(skb-&gt;dev-&gt;mtu))) {</div><div class='ctx'> 		err = -EMSGSIZE;</div><div class='ctx'> 		goto inval_skb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -263,8 +248,7 @@ int can_send(struct sk_buff *skb, int loop)</div><div class='ctx'> 		/* indication for the CAN driver: do loopback */</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_LOOPBACK;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The reference to the originating sock may be required</div><div class='add'>+		/* The reference to the originating sock may be required</div><div class='ctx'> 		 * by the receiving socket to check whether the frame is</div><div class='ctx'> 		 * its own. Example: can_raw sockopt CAN_RAW_RECV_OWN_MSGS</div><div class='ctx'> 		 * Therefore we have to ensure that skb-&gt;sk remains the</div><div class='hunk'>@@ -273,8 +257,7 @@ int can_send(struct sk_buff *skb, int loop)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (!(skb-&gt;dev-&gt;flags &amp; IFF_ECHO)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If the interface is not capable to do loopback</div><div class='add'>+			/* If the interface is not capable to do loopback</div><div class='ctx'> 			 * itself, we do it here.</div><div class='ctx'> 			 */</div><div class='ctx'> 			newskb = skb_clone(skb, GFP_ATOMIC);</div><div class='hunk'>@@ -303,11 +286,11 @@ int can_send(struct sk_buff *skb, int loop)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (newskb)</div><div class='del'>-		netif_rx_ni(newskb);</div><div class='add'>+		netif_rx(newskb);</div><div class='ctx'> </div><div class='ctx'> 	/* update statistics */</div><div class='del'>-	can_stats-&gt;tx_frames++;</div><div class='del'>-	can_stats-&gt;tx_frames_delta++;</div><div class='add'>+	atomic_long_inc(&amp;pkg_stats-&gt;tx_frames);</div><div class='add'>+	atomic_long_inc(&amp;pkg_stats-&gt;tx_frames_delta);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -317,17 +300,17 @@ inval_skb:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(can_send);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can rx path</div><div class='del'>- */</div><div class='add'>+/* af_can rx path */</div><div class='ctx'> </div><div class='del'>-static struct can_dev_rcv_lists *find_dev_rcv_lists(struct net *net,</div><div class='del'>-						struct net_device *dev)</div><div class='add'>+static struct can_dev_rcv_lists *can_dev_rcv_lists_find(struct net *net,</div><div class='add'>+							struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (!dev)</div><div class='del'>-		return net-&gt;can.can_rx_alldev_list;</div><div class='del'>-	else</div><div class='del'>-		return (struct can_dev_rcv_lists *)dev-&gt;ml_priv;</div><div class='add'>+	if (dev) {</div><div class='add'>+		struct can_ml_priv *can_ml = can_get_ml_priv(dev);</div><div class='add'>+		return &amp;can_ml-&gt;dev_rcv_lists;</div><div class='add'>+	} else {</div><div class='add'>+		return net-&gt;can.rx_alldev_list;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -354,10 +337,10 @@ static unsigned int effhash(canid_t can_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find_rcv_list - determine optimal filterlist inside device filter struct</div><div class='add'>+ * can_rcv_list_find - determine optimal filterlist inside device filter struct</div><div class='ctx'>  * @can_id: pointer to CAN identifier of a given can_filter</div><div class='ctx'>  * @mask: pointer to CAN mask of a given can_filter</div><div class='del'>- * @d: pointer to the device filter struct</div><div class='add'>+ * @dev_rcv_lists: pointer to the device filter struct</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *  Returns the optimal filterlist to reduce the filter handling in the</div><div class='hunk'>@@ -377,11 +360,11 @@ static unsigned int effhash(canid_t can_id)</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='ctx'>  *  Pointer to optimal filterlist for the given can_id/mask pair.</div><div class='del'>- *  Constistency checked mask.</div><div class='add'>+ *  Consistency checked mask.</div><div class='ctx'>  *  Reduced can_id to have a preprocessed filter compare value.</div><div class='ctx'>  */</div><div class='del'>-static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,</div><div class='del'>-					struct can_dev_rcv_lists *d)</div><div class='add'>+static struct hlist_head *can_rcv_list_find(canid_t *can_id, canid_t *mask,</div><div class='add'>+					    struct can_dev_rcv_lists *dev_rcv_lists)</div><div class='ctx'> {</div><div class='ctx'> 	canid_t inv = *can_id &amp; CAN_INV_FILTER; /* save flag before masking */</div><div class='ctx'> </div><div class='hunk'>@@ -389,7 +372,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,</div><div class='ctx'> 	if (*mask &amp; CAN_ERR_FLAG) {</div><div class='ctx'> 		/* clear CAN_ERR_FLAG in filter entry */</div><div class='ctx'> 		*mask &amp;= CAN_ERR_MASK;</div><div class='del'>-		return &amp;d-&gt;rx[RX_ERR];</div><div class='add'>+		return &amp;dev_rcv_lists-&gt;rx[RX_ERR];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* with cleared CAN_ERR_FLAG we have a simple mask/value filterpair */</div><div class='hunk'>@@ -405,32 +388,32 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,</div><div class='ctx'> </div><div class='ctx'> 	/* inverse can_id/can_mask filter */</div><div class='ctx'> 	if (inv)</div><div class='del'>-		return &amp;d-&gt;rx[RX_INV];</div><div class='add'>+		return &amp;dev_rcv_lists-&gt;rx[RX_INV];</div><div class='ctx'> </div><div class='ctx'> 	/* mask == 0 =&gt; no condition testing at receive time */</div><div class='ctx'> 	if (!(*mask))</div><div class='del'>-		return &amp;d-&gt;rx[RX_ALL];</div><div class='add'>+		return &amp;dev_rcv_lists-&gt;rx[RX_ALL];</div><div class='ctx'> </div><div class='ctx'> 	/* extra filterlists for the subscription of a single non-RTR can_id */</div><div class='ctx'> 	if (((*mask &amp; CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) &amp;&amp;</div><div class='ctx'> 	    !(*can_id &amp; CAN_RTR_FLAG)) {</div><div class='del'>-</div><div class='ctx'> 		if (*can_id &amp; CAN_EFF_FLAG) {</div><div class='ctx'> 			if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS))</div><div class='del'>-				return &amp;d-&gt;rx_eff[effhash(*can_id)];</div><div class='add'>+				return &amp;dev_rcv_lists-&gt;rx_eff[effhash(*can_id)];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (*mask == (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS))</div><div class='del'>-				return &amp;d-&gt;rx_sff[*can_id];</div><div class='add'>+				return &amp;dev_rcv_lists-&gt;rx_sff[*can_id];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* default: filter via can_id/can_mask */</div><div class='del'>-	return &amp;d-&gt;rx[RX_FIL];</div><div class='add'>+	return &amp;dev_rcv_lists-&gt;rx[RX_FIL];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * can_rx_register - subscribe CAN frames from a specific interface</div><div class='del'>- * @dev: pointer to netdevice (NULL =&gt; subcribe from 'all' CAN devices list)</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @dev: pointer to netdevice (NULL =&gt; subscribe from 'all' CAN devices list)</div><div class='ctx'>  * @can_id: CAN identifier (see description)</div><div class='ctx'>  * @mask: CAN mask (see description)</div><div class='ctx'>  * @func: callback function on filter match</div><div class='hunk'>@@ -462,70 +445,62 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id,</div><div class='ctx'> 		    canid_t mask, void (*func)(struct sk_buff *, void *),</div><div class='ctx'> 		    void *data, char *ident, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct receiver *r;</div><div class='del'>-	struct hlist_head *rl;</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='del'>-	struct s_pstats *can_pstats = net-&gt;can.can_pstats;</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct receiver *rcv;</div><div class='add'>+	struct hlist_head *rcv_list;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='add'>+	struct can_rcv_lists_stats *rcv_lists_stats = net-&gt;can.rcv_lists_stats;</div><div class='ctx'> </div><div class='ctx'> 	/* insert new receiver  (dev,canid,mask) -&gt; (func,data) */</div><div class='ctx'> </div><div class='del'>-	if (dev &amp;&amp; dev-&gt;type != ARPHRD_CAN)</div><div class='add'>+	if (dev &amp;&amp; (dev-&gt;type != ARPHRD_CAN || !can_get_ml_priv(dev)))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &amp;&amp; !net_eq(net, dev_net(dev)))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	r = kmem_cache_alloc(rcv_cache, GFP_KERNEL);</div><div class='del'>-	if (!r)</div><div class='add'>+	rcv = kmem_cache_alloc(rcv_cache, GFP_KERNEL);</div><div class='add'>+	if (!rcv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;net-&gt;can.can_rcvlists_lock);</div><div class='add'>+	spin_lock_bh(&amp;net-&gt;can.rcvlists_lock);</div><div class='ctx'> </div><div class='del'>-	d = find_dev_rcv_lists(net, dev);</div><div class='del'>-	if (d) {</div><div class='del'>-		rl = find_rcv_list(&amp;can_id, &amp;mask, d);</div><div class='add'>+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);</div><div class='add'>+	rcv_list = can_rcv_list_find(&amp;can_id, &amp;mask, dev_rcv_lists);</div><div class='ctx'> </div><div class='del'>-		r-&gt;can_id  = can_id;</div><div class='del'>-		r-&gt;mask    = mask;</div><div class='del'>-		r-&gt;matches = 0;</div><div class='del'>-		r-&gt;func    = func;</div><div class='del'>-		r-&gt;data    = data;</div><div class='del'>-		r-&gt;ident   = ident;</div><div class='del'>-		r-&gt;sk      = sk;</div><div class='add'>+	rcv-&gt;can_id = can_id;</div><div class='add'>+	rcv-&gt;mask = mask;</div><div class='add'>+	rcv-&gt;matches = 0;</div><div class='add'>+	rcv-&gt;func = func;</div><div class='add'>+	rcv-&gt;data = data;</div><div class='add'>+	rcv-&gt;ident = ident;</div><div class='add'>+	rcv-&gt;sk = sk;</div><div class='ctx'> </div><div class='del'>-		hlist_add_head_rcu(&amp;r-&gt;list, rl);</div><div class='del'>-		d-&gt;entries++;</div><div class='add'>+	hlist_add_head_rcu(&amp;rcv-&gt;list, rcv_list);</div><div class='add'>+	dev_rcv_lists-&gt;entries++;</div><div class='ctx'> </div><div class='del'>-		can_pstats-&gt;rcv_entries++;</div><div class='del'>-		if (can_pstats-&gt;rcv_entries_max &lt; can_pstats-&gt;rcv_entries)</div><div class='del'>-			can_pstats-&gt;rcv_entries_max = can_pstats-&gt;rcv_entries;</div><div class='del'>-	} else {</div><div class='del'>-		kmem_cache_free(rcv_cache, r);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;net-&gt;can.can_rcvlists_lock);</div><div class='add'>+	rcv_lists_stats-&gt;rcv_entries++;</div><div class='add'>+	rcv_lists_stats-&gt;rcv_entries_max = max(rcv_lists_stats-&gt;rcv_entries_max,</div><div class='add'>+					       rcv_lists_stats-&gt;rcv_entries);</div><div class='add'>+	spin_unlock_bh(&amp;net-&gt;can.rcvlists_lock);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(can_rx_register);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * can_rx_delete_receiver - rcu callback for single receiver entry removal</div><div class='del'>- */</div><div class='add'>+/* can_rx_delete_receiver - rcu callback for single receiver entry removal */</div><div class='ctx'> static void can_rx_delete_receiver(struct rcu_head *rp)</div><div class='ctx'> {</div><div class='del'>-	struct receiver *r = container_of(rp, struct receiver, rcu);</div><div class='del'>-	struct sock *sk = r-&gt;sk;</div><div class='add'>+	struct receiver *rcv = container_of(rp, struct receiver, rcu);</div><div class='add'>+	struct sock *sk = rcv-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	kmem_cache_free(rcv_cache, r);</div><div class='add'>+	kmem_cache_free(rcv_cache, rcv);</div><div class='ctx'> 	if (sk)</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * can_rx_unregister - unsubscribe CAN frames from a specific interface</div><div class='add'>+ * @net: the applicable net namespace</div><div class='ctx'>  * @dev: pointer to netdevice (NULL =&gt; unsubscribe from 'all' CAN devices list)</div><div class='ctx'>  * @can_id: CAN identifier</div><div class='ctx'>  * @mask: CAN mask</div><div class='hunk'>@@ -539,10 +514,10 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id,</div><div class='ctx'> 		       canid_t mask, void (*func)(struct sk_buff *, void *),</div><div class='ctx'> 		       void *data)</div><div class='ctx'> {</div><div class='del'>-	struct receiver *r = NULL;</div><div class='del'>-	struct hlist_head *rl;</div><div class='del'>-	struct s_pstats *can_pstats = net-&gt;can.can_pstats;</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='add'>+	struct receiver *rcv = NULL;</div><div class='add'>+	struct hlist_head *rcv_list;</div><div class='add'>+	struct can_rcv_lists_stats *rcv_lists_stats = net-&gt;can.rcv_lists_stats;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &amp;&amp; dev-&gt;type != ARPHRD_CAN)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -550,86 +525,72 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id,</div><div class='ctx'> 	if (dev &amp;&amp; !net_eq(net, dev_net(dev)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;net-&gt;can.can_rcvlists_lock);</div><div class='add'>+	spin_lock_bh(&amp;net-&gt;can.rcvlists_lock);</div><div class='ctx'> </div><div class='del'>-	d = find_dev_rcv_lists(net, dev);</div><div class='del'>-	if (!d) {</div><div class='del'>-		pr_err("BUG: receive list not found for "</div><div class='del'>-		       "dev %s, id %03X, mask %03X\n",</div><div class='del'>-		       DNAME(dev), can_id, mask);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);</div><div class='add'>+	rcv_list = can_rcv_list_find(&amp;can_id, &amp;mask, dev_rcv_lists);</div><div class='ctx'> </div><div class='del'>-	rl = find_rcv_list(&amp;can_id, &amp;mask, d);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Search the receiver list for the item to delete.  This should</div><div class='add'>+	/* Search the receiver list for the item to delete.  This should</div><div class='ctx'> 	 * exist, since no receiver may be unregistered that hasn't</div><div class='ctx'> 	 * been registered before.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(r, rl, list) {</div><div class='del'>-		if (r-&gt;can_id == can_id &amp;&amp; r-&gt;mask == mask &amp;&amp;</div><div class='del'>-		    r-&gt;func == func &amp;&amp; r-&gt;data == data)</div><div class='add'>+	hlist_for_each_entry_rcu(rcv, rcv_list, list) {</div><div class='add'>+		if (rcv-&gt;can_id == can_id &amp;&amp; rcv-&gt;mask == mask &amp;&amp;</div><div class='add'>+		    rcv-&gt;func == func &amp;&amp; rcv-&gt;data == data)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check for bugs in CAN protocol implementations using af_can.c:</div><div class='del'>-	 * 'r' will be NULL if no matching list item was found for removal.</div><div class='add'>+	/* Check for bugs in CAN protocol implementations using af_can.c:</div><div class='add'>+	 * 'rcv' will be NULL if no matching list item was found for removal.</div><div class='add'>+	 * As this case may potentially happen when closing a socket while</div><div class='add'>+	 * the notifier for removing the CAN netdev is running we just print</div><div class='add'>+	 * a warning here.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	if (!r) {</div><div class='del'>-		WARN(1, "BUG: receive list entry not found for dev %s, "</div><div class='del'>-		     "id %03X, mask %03X\n", DNAME(dev), can_id, mask);</div><div class='add'>+	if (!rcv) {</div><div class='add'>+		pr_warn("can: receive list entry not found for dev %s, id %03X, mask %03X\n",</div><div class='add'>+			DNAME(dev), can_id, mask);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hlist_del_rcu(&amp;r-&gt;list);</div><div class='del'>-	d-&gt;entries--;</div><div class='del'>-</div><div class='del'>-	if (can_pstats-&gt;rcv_entries &gt; 0)</div><div class='del'>-		can_pstats-&gt;rcv_entries--;</div><div class='add'>+	hlist_del_rcu(&amp;rcv-&gt;list);</div><div class='add'>+	dev_rcv_lists-&gt;entries--;</div><div class='ctx'> </div><div class='del'>-	/* remove device structure requested by NETDEV_UNREGISTER */</div><div class='del'>-	if (d-&gt;remove_on_zero_entries &amp;&amp; !d-&gt;entries) {</div><div class='del'>-		kfree(d);</div><div class='del'>-		dev-&gt;ml_priv = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (rcv_lists_stats-&gt;rcv_entries &gt; 0)</div><div class='add'>+		rcv_lists_stats-&gt;rcv_entries--;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;net-&gt;can.can_rcvlists_lock);</div><div class='add'>+	spin_unlock_bh(&amp;net-&gt;can.rcvlists_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* schedule the receiver item for deletion */</div><div class='del'>-	if (r) {</div><div class='del'>-		if (r-&gt;sk)</div><div class='del'>-			sock_hold(r-&gt;sk);</div><div class='del'>-		call_rcu(&amp;r-&gt;rcu, can_rx_delete_receiver);</div><div class='add'>+	if (rcv) {</div><div class='add'>+		if (rcv-&gt;sk)</div><div class='add'>+			sock_hold(rcv-&gt;sk);</div><div class='add'>+		call_rcu(&amp;rcv-&gt;rcu, can_rx_delete_receiver);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(can_rx_unregister);</div><div class='ctx'> </div><div class='del'>-static inline void deliver(struct sk_buff *skb, struct receiver *r)</div><div class='add'>+static inline void deliver(struct sk_buff *skb, struct receiver *rcv)</div><div class='ctx'> {</div><div class='del'>-	r-&gt;func(skb, r-&gt;data);</div><div class='del'>-	r-&gt;matches++;</div><div class='add'>+	rcv-&gt;func(skb, rcv-&gt;data);</div><div class='add'>+	rcv-&gt;matches++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)</div><div class='add'>+static int can_rcv_filter(struct can_dev_rcv_lists *dev_rcv_lists, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct receiver *r;</div><div class='add'>+	struct receiver *rcv;</div><div class='ctx'> 	int matches = 0;</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	canid_t can_id = cf-&gt;can_id;</div><div class='ctx'> </div><div class='del'>-	if (d-&gt;entries == 0)</div><div class='add'>+	if (dev_rcv_lists-&gt;entries == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (can_id &amp; CAN_ERR_FLAG) {</div><div class='ctx'> 		/* check for error message frame entries only */</div><div class='del'>-		hlist_for_each_entry_rcu(r, &amp;d-&gt;rx[RX_ERR], list) {</div><div class='del'>-			if (can_id &amp; r-&gt;mask) {</div><div class='del'>-				deliver(skb, r);</div><div class='add'>+		hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx[RX_ERR], list) {</div><div class='add'>+			if (can_id &amp; rcv-&gt;mask) {</div><div class='add'>+				deliver(skb, rcv);</div><div class='ctx'> 				matches++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -637,23 +598,23 @@ static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for unfiltered entries */</div><div class='del'>-	hlist_for_each_entry_rcu(r, &amp;d-&gt;rx[RX_ALL], list) {</div><div class='del'>-		deliver(skb, r);</div><div class='add'>+	hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx[RX_ALL], list) {</div><div class='add'>+		deliver(skb, rcv);</div><div class='ctx'> 		matches++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for can_id/mask entries */</div><div class='del'>-	hlist_for_each_entry_rcu(r, &amp;d-&gt;rx[RX_FIL], list) {</div><div class='del'>-		if ((can_id &amp; r-&gt;mask) == r-&gt;can_id) {</div><div class='del'>-			deliver(skb, r);</div><div class='add'>+	hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx[RX_FIL], list) {</div><div class='add'>+		if ((can_id &amp; rcv-&gt;mask) == rcv-&gt;can_id) {</div><div class='add'>+			deliver(skb, rcv);</div><div class='ctx'> 			matches++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for inverted can_id/mask entries */</div><div class='del'>-	hlist_for_each_entry_rcu(r, &amp;d-&gt;rx[RX_INV], list) {</div><div class='del'>-		if ((can_id &amp; r-&gt;mask) != r-&gt;can_id) {</div><div class='del'>-			deliver(skb, r);</div><div class='add'>+	hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx[RX_INV], list) {</div><div class='add'>+		if ((can_id &amp; rcv-&gt;mask) != rcv-&gt;can_id) {</div><div class='add'>+			deliver(skb, rcv);</div><div class='ctx'> 			matches++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -663,16 +624,16 @@ static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)</div><div class='ctx'> 		return matches;</div><div class='ctx'> </div><div class='ctx'> 	if (can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		hlist_for_each_entry_rcu(r, &amp;d-&gt;rx_eff[effhash(can_id)], list) {</div><div class='del'>-			if (r-&gt;can_id == can_id) {</div><div class='del'>-				deliver(skb, r);</div><div class='add'>+		hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx_eff[effhash(can_id)], list) {</div><div class='add'>+			if (rcv-&gt;can_id == can_id) {</div><div class='add'>+				deliver(skb, rcv);</div><div class='ctx'> 				matches++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		can_id &amp;= CAN_SFF_MASK;</div><div class='del'>-		hlist_for_each_entry_rcu(r, &amp;d-&gt;rx_sff[can_id], list) {</div><div class='del'>-			deliver(skb, r);</div><div class='add'>+		hlist_for_each_entry_rcu(rcv, &amp;dev_rcv_lists-&gt;rx_sff[can_id], list) {</div><div class='add'>+			deliver(skb, rcv);</div><div class='ctx'> 			matches++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -682,14 +643,14 @@ static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static void can_receive(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='del'>-	struct s_stats *can_stats = net-&gt;can.can_stats;</div><div class='add'>+	struct can_pkg_stats *pkg_stats = net-&gt;can.pkg_stats;</div><div class='ctx'> 	int matches;</div><div class='ctx'> </div><div class='ctx'> 	/* update statistics */</div><div class='del'>-	can_stats-&gt;rx_frames++;</div><div class='del'>-	can_stats-&gt;rx_frames_delta++;</div><div class='add'>+	atomic_long_inc(&amp;pkg_stats-&gt;rx_frames);</div><div class='add'>+	atomic_long_inc(&amp;pkg_stats-&gt;rx_frames_delta);</div><div class='ctx'> </div><div class='ctx'> 	/* create non-zero unique skb identifier together with *skb */</div><div class='ctx'> 	while (!(can_skb_prv(skb)-&gt;skbcnt))</div><div class='hunk'>@@ -698,12 +659,11 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* deliver the packet to sockets listening on all devices */</div><div class='del'>-	matches = can_rcv_filter(net-&gt;can.can_rx_alldev_list, skb);</div><div class='add'>+	matches = can_rcv_filter(net-&gt;can.rx_alldev_list, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* find receive list for this device */</div><div class='del'>-	d = find_dev_rcv_lists(net, dev);</div><div class='del'>-	if (d)</div><div class='del'>-		matches += can_rcv_filter(d, skb);</div><div class='add'>+	dev_rcv_lists = can_dev_rcv_lists_find(net, dev);</div><div class='add'>+	matches += can_rcv_filter(dev_rcv_lists, skb);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -711,21 +671,19 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	consume_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (matches &gt; 0) {</div><div class='del'>-		can_stats-&gt;matches++;</div><div class='del'>-		can_stats-&gt;matches_delta++;</div><div class='add'>+		atomic_long_inc(&amp;pkg_stats-&gt;matches);</div><div class='add'>+		atomic_long_inc(&amp;pkg_stats-&gt;matches_delta);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int can_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		   struct packet_type *pt, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	if (unlikely(dev-&gt;type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_can_skb(skb))) {</div><div class='add'>+		pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n",</div><div class='add'>+			     dev-&gt;type, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dev-&gt;type != ARPHRD_CAN || skb-&gt;len != CAN_MTU ||</div><div class='del'>-		     cfd-&gt;len &gt; CAN_MAX_DLEN)) {</div><div class='del'>-		pr_warn_once("PF_CAN: dropped non conform CAN skbuf: dev type %d, len %d, datalen %d\n",</div><div class='del'>-			     dev-&gt;type, skb-&gt;len, cfd-&gt;len);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_CAN_RX_INVALID_FRAME);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -734,15 +692,13 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-		   struct packet_type *pt, struct net_device *orig_dev)</div><div class='add'>+		     struct packet_type *pt, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	if (unlikely(dev-&gt;type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) {</div><div class='add'>+		pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n",</div><div class='add'>+			     dev-&gt;type, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dev-&gt;type != ARPHRD_CAN || skb-&gt;len != CANFD_MTU ||</div><div class='del'>-		     cfd-&gt;len &gt; CANFD_MAX_DLEN)) {</div><div class='del'>-		pr_warn_once("PF_CAN: dropped non conform CAN FD skbuf: dev type %d, len %d, datalen %d\n",</div><div class='del'>-			     dev-&gt;type, skb-&gt;len, cfd-&gt;len);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_CANFD_RX_INVALID_FRAME);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -750,9 +706,22 @@ static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can protocol functions</div><div class='del'>- */</div><div class='add'>+static int canxl_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		     struct packet_type *pt, struct net_device *orig_dev)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(dev-&gt;type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) {</div><div class='add'>+		pr_warn_once("PF_CAN: dropped non conform CAN XL skbuff: dev type %d, len %d\n",</div><div class='add'>+			     dev-&gt;type, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_CANXL_RX_INVALID_FRAME);</div><div class='add'>+		return NET_RX_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_receive(skb, dev);</div><div class='add'>+	return NET_RX_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* af_can protocol functions */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * can_proto_register - register CAN transport protocol</div><div class='hunk'>@@ -783,8 +752,9 @@ int can_proto_register(const struct can_proto *cp)</div><div class='ctx'> 	if (rcu_access_pointer(proto_tab[proto])) {</div><div class='ctx'> 		pr_err("can: protocol %d already registered\n", proto);</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		RCU_INIT_POINTER(proto_tab[proto], cp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;proto_tab_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -814,121 +784,56 @@ void can_proto_unregister(const struct can_proto *cp)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(can_proto_unregister);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can notifier to create/remove CAN netdevice specific structs</div><div class='del'>- */</div><div class='del'>-static int can_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='del'>-			void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type != ARPHRD_CAN)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	switch (msg) {</div><div class='del'>-</div><div class='del'>-	case NETDEV_REGISTER:</div><div class='del'>-</div><div class='del'>-		/* create new dev_rcv_lists for this device */</div><div class='del'>-		d = kzalloc(sizeof(*d), GFP_KERNEL);</div><div class='del'>-		if (!d)</div><div class='del'>-			return NOTIFY_DONE;</div><div class='del'>-		BUG_ON(dev-&gt;ml_priv);</div><div class='del'>-		dev-&gt;ml_priv = d;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NETDEV_UNREGISTER:</div><div class='del'>-		spin_lock(&amp;dev_net(dev)-&gt;can.can_rcvlists_lock);</div><div class='del'>-</div><div class='del'>-		d = dev-&gt;ml_priv;</div><div class='del'>-		if (d) {</div><div class='del'>-			if (d-&gt;entries)</div><div class='del'>-				d-&gt;remove_on_zero_entries = 1;</div><div class='del'>-			else {</div><div class='del'>-				kfree(d);</div><div class='del'>-				dev-&gt;ml_priv = NULL;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			pr_err("can: notifier: receive list not found for dev "</div><div class='del'>-			       "%s\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;dev_net(dev)-&gt;can.can_rcvlists_lock);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int can_pernet_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_init(&amp;net-&gt;can.can_rcvlists_lock);</div><div class='del'>-	net-&gt;can.can_rx_alldev_list =</div><div class='del'>-		kzalloc(sizeof(struct can_dev_rcv_lists), GFP_KERNEL);</div><div class='del'>-	if (!net-&gt;can.can_rx_alldev_list)</div><div class='add'>+	spin_lock_init(&amp;net-&gt;can.rcvlists_lock);</div><div class='add'>+	net-&gt;can.rx_alldev_list =</div><div class='add'>+		kzalloc(sizeof(*net-&gt;can.rx_alldev_list), GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;can.rx_alldev_list)</div><div class='ctx'> 		goto out;</div><div class='del'>-	net-&gt;can.can_stats = kzalloc(sizeof(struct s_stats), GFP_KERNEL);</div><div class='del'>-	if (!net-&gt;can.can_stats)</div><div class='del'>-		goto out_free_alldev_list;</div><div class='del'>-	net-&gt;can.can_pstats = kzalloc(sizeof(struct s_pstats), GFP_KERNEL);</div><div class='del'>-	if (!net-&gt;can.can_pstats)</div><div class='del'>-		goto out_free_can_stats;</div><div class='add'>+	net-&gt;can.pkg_stats = kzalloc(sizeof(*net-&gt;can.pkg_stats), GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;can.pkg_stats)</div><div class='add'>+		goto out_free_rx_alldev_list;</div><div class='add'>+	net-&gt;can.rcv_lists_stats = kzalloc(sizeof(*net-&gt;can.rcv_lists_stats), GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;can.rcv_lists_stats)</div><div class='add'>+		goto out_free_pkg_stats;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_PROC_FS)) {</div><div class='ctx'> 		/* the statistics are updated every second (timer triggered) */</div><div class='ctx'> 		if (stats_timer) {</div><div class='del'>-			timer_setup(&amp;net-&gt;can.can_stattimer, can_stat_update,</div><div class='add'>+			timer_setup(&amp;net-&gt;can.stattimer, can_stat_update,</div><div class='ctx'> 				    0);</div><div class='del'>-			mod_timer(&amp;net-&gt;can.can_stattimer,</div><div class='add'>+			mod_timer(&amp;net-&gt;can.stattimer,</div><div class='ctx'> 				  round_jiffies(jiffies + HZ));</div><div class='ctx'> 		}</div><div class='del'>-		net-&gt;can.can_stats-&gt;jiffies_init = jiffies;</div><div class='add'>+		net-&gt;can.pkg_stats-&gt;jiffies_init = jiffies;</div><div class='ctx'> 		can_init_proc(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_free_can_stats:</div><div class='del'>-	kfree(net-&gt;can.can_stats);</div><div class='del'>- out_free_alldev_list:</div><div class='del'>-	kfree(net-&gt;can.can_rx_alldev_list);</div><div class='add'>+ out_free_pkg_stats:</div><div class='add'>+	kfree(net-&gt;can.pkg_stats);</div><div class='add'>+ out_free_rx_alldev_list:</div><div class='add'>+	kfree(net-&gt;can.rx_alldev_list);</div><div class='ctx'>  out:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void can_pernet_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_PROC_FS)) {</div><div class='ctx'> 		can_remove_proc(net);</div><div class='ctx'> 		if (stats_timer)</div><div class='del'>-			del_timer_sync(&amp;net-&gt;can.can_stattimer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* remove created dev_rcv_lists from still registered CAN devices */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (dev-&gt;type == ARPHRD_CAN &amp;&amp; dev-&gt;ml_priv) {</div><div class='del'>-			struct can_dev_rcv_lists *d = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-			BUG_ON(d-&gt;entries);</div><div class='del'>-			kfree(d);</div><div class='del'>-			dev-&gt;ml_priv = NULL;</div><div class='del'>-		}</div><div class='add'>+			timer_delete_sync(&amp;net-&gt;can.stattimer);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	kfree(net-&gt;can.can_rx_alldev_list);</div><div class='del'>-	kfree(net-&gt;can.can_stats);</div><div class='del'>-	kfree(net-&gt;can.can_pstats);</div><div class='add'>+	kfree(net-&gt;can.rx_alldev_list);</div><div class='add'>+	kfree(net-&gt;can.pkg_stats);</div><div class='add'>+	kfree(net-&gt;can.rcv_lists_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * af_can module init/exit functions</div><div class='del'>- */</div><div class='add'>+/* af_can module init/exit functions */</div><div class='ctx'> </div><div class='ctx'> static struct packet_type can_packet __read_mostly = {</div><div class='ctx'> 	.type = cpu_to_be16(ETH_P_CAN),</div><div class='hunk'>@@ -940,17 +845,17 @@ static struct packet_type canfd_packet __read_mostly = {</div><div class='ctx'> 	.func = canfd_rcv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct packet_type canxl_packet __read_mostly = {</div><div class='add'>+	.type = cpu_to_be16(ETH_P_CANXL),</div><div class='add'>+	.func = canxl_rcv,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct net_proto_family can_family_ops = {</div><div class='ctx'> 	.family = PF_CAN,</div><div class='ctx'> 	.create = can_create,</div><div class='ctx'> 	.owner  = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* notifier block for netdevice event */</div><div class='del'>-static struct notifier_block can_netdev_notifier __read_mostly = {</div><div class='del'>-	.notifier_call = can_notifier,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations can_pernet_ops __read_mostly = {</div><div class='ctx'> 	.init = can_pernet_init,</div><div class='ctx'> 	.exit = can_pernet_exit,</div><div class='hunk'>@@ -958,36 +863,52 @@ static struct pernet_operations can_pernet_ops __read_mostly = {</div><div class='ctx'> </div><div class='ctx'> static __init int can_init(void)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	/* check for correct padding to be able to use the structs similarly */</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct can_frame, can_dlc) !=</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct can_frame, len) !=</div><div class='ctx'> 		     offsetof(struct canfd_frame, len) ||</div><div class='add'>+		     offsetof(struct can_frame, len) !=</div><div class='add'>+		     offsetof(struct canxl_frame, flags) ||</div><div class='ctx'> 		     offsetof(struct can_frame, data) !=</div><div class='ctx'> 		     offsetof(struct canfd_frame, data));</div><div class='ctx'> </div><div class='del'>-	pr_info("can: controller area network core (" CAN_VERSION_STRING ")\n");</div><div class='add'>+	pr_info("can: controller area network core\n");</div><div class='ctx'> </div><div class='ctx'> 	rcv_cache = kmem_cache_create("can_receiver", sizeof(struct receiver),</div><div class='ctx'> 				      0, 0, NULL);</div><div class='ctx'> 	if (!rcv_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	register_pernet_subsys(&amp;can_pernet_ops);</div><div class='add'>+	err = register_pernet_subsys(&amp;can_pernet_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pernet;</div><div class='ctx'> </div><div class='ctx'> 	/* protocol register */</div><div class='del'>-	sock_register(&amp;can_family_ops);</div><div class='del'>-	register_netdevice_notifier(&amp;can_netdev_notifier);</div><div class='add'>+	err = sock_register(&amp;can_family_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_sock;</div><div class='add'>+</div><div class='ctx'> 	dev_add_pack(&amp;can_packet);</div><div class='ctx'> 	dev_add_pack(&amp;canfd_packet);</div><div class='add'>+	dev_add_pack(&amp;canxl_packet);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_sock:</div><div class='add'>+	unregister_pernet_subsys(&amp;can_pernet_ops);</div><div class='add'>+out_pernet:</div><div class='add'>+	kmem_cache_destroy(rcv_cache);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __exit void can_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* protocol unregister */</div><div class='add'>+	dev_remove_pack(&amp;canxl_packet);</div><div class='ctx'> 	dev_remove_pack(&amp;canfd_packet);</div><div class='ctx'> 	dev_remove_pack(&amp;can_packet);</div><div class='del'>-	unregister_netdevice_notifier(&amp;can_netdev_notifier);</div><div class='ctx'> 	sock_unregister(PF_CAN);</div><div class='ctx'> </div><div class='ctx'> 	unregister_pernet_subsys(&amp;can_pernet_ops);</div><div class='head'>diff --git a/net/can/af_can.h b/net/can/af_can.h<br/>index 9cb3719632bd..22f3352c77fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/af_can.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/af_can.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/af_can.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/af_can.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */</div><div class='add'>+/* Copyright (c) 2002-2007 Volkswagen Group Electronic Research</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -53,37 +53,22 @@ struct receiver {</div><div class='ctx'> 	canid_t can_id;</div><div class='ctx'> 	canid_t mask;</div><div class='ctx'> 	unsigned long matches;</div><div class='del'>-	void (*func)(struct sk_buff *, void *);</div><div class='add'>+	void (*func)(struct sk_buff *skb, void *data);</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	char *ident;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CAN_SFF_RCV_ARRAY_SZ (1 &lt;&lt; CAN_SFF_ID_BITS)</div><div class='del'>-#define CAN_EFF_RCV_HASH_BITS 10</div><div class='del'>-#define CAN_EFF_RCV_ARRAY_SZ (1 &lt;&lt; CAN_EFF_RCV_HASH_BITS)</div><div class='del'>-</div><div class='del'>-enum { RX_ERR, RX_ALL, RX_FIL, RX_INV, RX_MAX };</div><div class='del'>-</div><div class='del'>-/* per device receive filters linked at dev-&gt;ml_priv */</div><div class='del'>-struct can_dev_rcv_lists {</div><div class='del'>-	struct hlist_head rx[RX_MAX];</div><div class='del'>-	struct hlist_head rx_sff[CAN_SFF_RCV_ARRAY_SZ];</div><div class='del'>-	struct hlist_head rx_eff[CAN_EFF_RCV_ARRAY_SZ];</div><div class='del'>-	int remove_on_zero_entries;</div><div class='del'>-	int entries;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* statistic structures */</div><div class='ctx'> </div><div class='ctx'> /* can be reset e.g. by can_init_stats() */</div><div class='del'>-struct s_stats {</div><div class='add'>+struct can_pkg_stats {</div><div class='ctx'> 	unsigned long jiffies_init;</div><div class='ctx'> </div><div class='del'>-	unsigned long rx_frames;</div><div class='del'>-	unsigned long tx_frames;</div><div class='del'>-	unsigned long matches;</div><div class='add'>+	atomic_long_t rx_frames;</div><div class='add'>+	atomic_long_t tx_frames;</div><div class='add'>+	atomic_long_t matches;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long total_rx_rate;</div><div class='ctx'> 	unsigned long total_tx_rate;</div><div class='hunk'>@@ -97,13 +82,13 @@ struct s_stats {</div><div class='ctx'> 	unsigned long max_tx_rate;</div><div class='ctx'> 	unsigned long max_rx_match_ratio;</div><div class='ctx'> </div><div class='del'>-	unsigned long rx_frames_delta;</div><div class='del'>-	unsigned long tx_frames_delta;</div><div class='del'>-	unsigned long matches_delta;</div><div class='add'>+	atomic_long_t rx_frames_delta;</div><div class='add'>+	atomic_long_t tx_frames_delta;</div><div class='add'>+	atomic_long_t matches_delta;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* persistent statistics */</div><div class='del'>-struct s_pstats {</div><div class='add'>+struct can_rcv_lists_stats {</div><div class='ctx'> 	unsigned long stats_reset;</div><div class='ctx'> 	unsigned long user_reset;</div><div class='ctx'> 	unsigned long rcv_entries;</div><div class='head'>diff --git a/net/can/bcm.c b/net/can/bcm.c<br/>index 0af8f0db892a..7eba8ae01a5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/bcm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/bcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/bcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/bcm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='ctx'>  * bcm.c - Broadcast Manager to filter/send (cyclic) CAN content</div><div class='ctx'>  *</div><div class='hunk'>@@ -57,6 +58,7 @@</div><div class='ctx'> #include &lt;linux/can/skb.h&gt;</div><div class='ctx'> #include &lt;linux/can/bcm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -67,23 +69,28 @@</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_NFRAMES 256</div><div class='ctx'> </div><div class='add'>+/* limit timers to 400 days for sending/timeouts */</div><div class='add'>+#define BCM_TIMER_SEC_MAX (400 * 24 * 60 * 60)</div><div class='add'>+</div><div class='ctx'> /* use of last_frames[index].flags */</div><div class='add'>+#define RX_LOCAL   0x10 /* frame was created on the local host */</div><div class='add'>+#define RX_OWN     0x20 /* frame was sent via the socket it was received on */</div><div class='ctx'> #define RX_RECV    0x40 /* received data for this element */</div><div class='ctx'> #define RX_THR     0x80 /* element not been sent due to throttle feature */</div><div class='del'>-#define BCM_CAN_FLAGS_MASK 0x3F /* to clean private flags after usage */</div><div class='add'>+#define BCM_CAN_FLAGS_MASK 0x0F /* to clean private flags after usage */</div><div class='ctx'> </div><div class='ctx'> /* get best masking value for can_rx_register() for a given single can_id */</div><div class='ctx'> #define REGMASK(id) ((id &amp; CAN_EFF_FLAG) ? \</div><div class='ctx'> 		     (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \</div><div class='ctx'> 		     (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))</div><div class='ctx'> </div><div class='del'>-#define CAN_BCM_VERSION "20170425"</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_AUTHOR("Oliver Hartkopp &lt;oliver.hartkopp@volkswagen.de&gt;");</div><div class='ctx'> MODULE_ALIAS("can-proto-2");</div><div class='ctx'> </div><div class='add'>+#define BCM_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_ifindex)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * easy access to the first 64 bit of can(fd)_frame payload. cp-&gt;data is</div><div class='ctx'>  * 64 bit aligned so the offset has to be multiples of 8 which is ensured</div><div class='hunk'>@@ -96,13 +103,13 @@ static inline u64 get_u64(const struct canfd_frame *cp, int offset)</div><div class='ctx'> </div><div class='ctx'> struct bcm_op {</div><div class='ctx'> 	struct list_head list;</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> 	int ifindex;</div><div class='ctx'> 	canid_t can_id;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	unsigned long frames_abs, frames_filtered;</div><div class='ctx'> 	struct bcm_timeval ival1, ival2;</div><div class='ctx'> 	struct hrtimer timer, thrtimer;</div><div class='del'>-	struct tasklet_struct tsklet, thrtsklet;</div><div class='ctx'> 	ktime_t rx_stamp, kt_ival1, kt_ival2, kt_lastmsg;</div><div class='ctx'> 	int rx_ifindex;</div><div class='ctx'> 	int cfsiz;</div><div class='hunk'>@@ -116,13 +123,14 @@ struct bcm_op {</div><div class='ctx'> 	struct canfd_frame last_sframe;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct net_device *rx_reg_dev;</div><div class='add'>+	spinlock_t bcm_tx_lock; /* protect currframe/count in runtime updates */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcm_sock {</div><div class='ctx'> 	struct sock sk;</div><div class='ctx'> 	int bound;</div><div class='ctx'> 	int ifindex;</div><div class='del'>-	struct notifier_block notifier;</div><div class='add'>+	struct list_head notifier;</div><div class='ctx'> 	struct list_head rx_ops;</div><div class='ctx'> 	struct list_head tx_ops;</div><div class='ctx'> 	unsigned long dropped_usr_msgs;</div><div class='hunk'>@@ -130,6 +138,20 @@ struct bcm_sock {</div><div class='ctx'> 	char procname [32]; /* inode number in decimal with \0 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static LIST_HEAD(bcm_notifier_list);</div><div class='add'>+static DEFINE_SPINLOCK(bcm_notifier_lock);</div><div class='add'>+static struct bcm_sock *bcm_busy_notifier;</div><div class='add'>+</div><div class='add'>+/* Return pointer to store the extra msg flags for bcm_recvmsg().</div><div class='add'>+ * We use the space of one unsigned int beyond the 'struct sockaddr_can'</div><div class='add'>+ * in skb-&gt;cb.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int *bcm_flags(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* return pointer after struct sockaddr_can */</div><div class='add'>+	return (unsigned int *)(&amp;((struct sockaddr_can *)skb-&gt;cb)[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct bcm_sock *bcm_sk(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct bcm_sock *)sk;</div><div class='hunk'>@@ -140,6 +162,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)</div><div class='ctx'> 	return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* check limitations for timeval provided by user */</div><div class='add'>+static bool bcm_is_invalid_tv(struct bcm_msg_head *msg_head)</div><div class='add'>+{</div><div class='add'>+	if ((msg_head-&gt;ival1.tv_sec &lt; 0) ||</div><div class='add'>+	    (msg_head-&gt;ival1.tv_sec &gt; BCM_TIMER_SEC_MAX) ||</div><div class='add'>+	    (msg_head-&gt;ival1.tv_usec &lt; 0) ||</div><div class='add'>+	    (msg_head-&gt;ival1.tv_usec &gt;= USEC_PER_SEC) ||</div><div class='add'>+	    (msg_head-&gt;ival2.tv_sec &lt; 0) ||</div><div class='add'>+	    (msg_head-&gt;ival2.tv_sec &gt; BCM_TIMER_SEC_MAX) ||</div><div class='add'>+	    (msg_head-&gt;ival2.tv_usec &lt; 0) ||</div><div class='add'>+	    (msg_head-&gt;ival2.tv_usec &gt;= USEC_PER_SEC))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define CFSIZ(flags) ((flags &amp; CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)</div><div class='ctx'> #define OPSIZ sizeof(struct bcm_op)</div><div class='ctx'> #define MHSIZ sizeof(struct bcm_msg_head)</div><div class='hunk'>@@ -170,7 +208,7 @@ static int bcm_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	char ifname[IFNAMSIZ];</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='del'>-	struct sock *sk = (struct sock *)PDE_DATA(m-&gt;file-&gt;f_inode);</div><div class='add'>+	struct sock *sk = (struct sock *)pde_data(m-&gt;file-&gt;f_inode);</div><div class='ctx'> 	struct bcm_sock *bo = bcm_sk(sk);</div><div class='ctx'> 	struct bcm_op *op;</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +219,9 @@ static int bcm_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, " / bound %s", bcm_proc_getifname(net, ifname, bo-&gt;ifindex));</div><div class='ctx'> 	seq_printf(m, " &lt;&lt;&lt;\n");</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(op, &amp;bo-&gt;rx_ops, list) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(op, &amp;bo-&gt;rx_ops, list) {</div><div class='ctx'> </div><div class='ctx'> 		unsigned long reduction;</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +277,9 @@ static int bcm_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 		seq_printf(m, "# sent %ld\n", op-&gt;frames_abs);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='hunk'>@@ -249,12 +292,18 @@ static void bcm_can_tx(struct bcm_op *op)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct canfd_frame *cf = op-&gt;frames + op-&gt;cfsiz * op-&gt;currframe;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* no target device? =&gt; exit */</div><div class='ctx'> 	if (!op-&gt;ifindex)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* read currframe under lock protection */</div><div class='add'>+	spin_lock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='add'>+	cf = op-&gt;frames + op-&gt;cfsiz * op-&gt;currframe;</div><div class='add'>+	spin_unlock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='add'>+</div><div class='ctx'> 	dev = dev_get_by_index(sock_net(op-&gt;sk), op-&gt;ifindex);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		/* RFC: should this bcm_op remove itself here? */</div><div class='hunk'>@@ -274,15 +323,24 @@ static void bcm_can_tx(struct bcm_op *op)</div><div class='ctx'> 	/* send with loopback */</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> 	can_skb_set_owner(skb, op-&gt;sk);</div><div class='del'>-	can_send(skb, 1);</div><div class='add'>+	err = can_send(skb, 1);</div><div class='add'>+</div><div class='add'>+	/* update currframe and count under lock protection */</div><div class='add'>+	spin_lock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		op-&gt;frames_abs++;</div><div class='ctx'> </div><div class='del'>-	/* update statistics */</div><div class='ctx'> 	op-&gt;currframe++;</div><div class='del'>-	op-&gt;frames_abs++;</div><div class='ctx'> </div><div class='ctx'> 	/* reached last frame? */</div><div class='ctx'> 	if (op-&gt;currframe &gt;= op-&gt;nframes)</div><div class='ctx'> 		op-&gt;currframe = 0;</div><div class='add'>+</div><div class='add'>+	if (op-&gt;count &gt; 0)</div><div class='add'>+		op-&gt;count--;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	dev_put(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -300,6 +358,8 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,</div><div class='ctx'> 	struct sock *sk = op-&gt;sk;</div><div class='ctx'> 	unsigned int datalen = head-&gt;nframes * op-&gt;cfsiz;</div><div class='ctx'> 	int err;</div><div class='add'>+	unsigned int *pflags;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(sizeof(*head) + datalen, gfp_any());</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -307,6 +367,14 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,</div><div class='ctx'> </div><div class='ctx'> 	skb_put_data(skb, head, sizeof(*head));</div><div class='ctx'> </div><div class='add'>+	/* ensure space for sockaddr_can and msg flags */</div><div class='add'>+	sock_skb_cb_check_size(sizeof(struct sockaddr_can) +</div><div class='add'>+			       sizeof(unsigned int));</div><div class='add'>+</div><div class='add'>+	/* initialize msg flags */</div><div class='add'>+	pflags = bcm_flags(skb);</div><div class='add'>+	*pflags = 0;</div><div class='add'>+</div><div class='ctx'> 	if (head-&gt;nframes) {</div><div class='ctx'> 		/* CAN frames starting here */</div><div class='ctx'> 		firstframe = (struct canfd_frame *)skb_tail_pointer(skb);</div><div class='hunk'>@@ -319,8 +387,14 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,</div><div class='ctx'> 		 * relevant for updates that are generated by the</div><div class='ctx'> 		 * BCM, where nframes is 1</div><div class='ctx'> 		 */</div><div class='del'>-		if (head-&gt;nframes == 1)</div><div class='add'>+		if (head-&gt;nframes == 1) {</div><div class='add'>+			if (firstframe-&gt;flags &amp; RX_LOCAL)</div><div class='add'>+				*pflags |= MSG_DONTROUTE;</div><div class='add'>+			if (firstframe-&gt;flags &amp; RX_OWN)</div><div class='add'>+				*pflags |= MSG_CONFIRM;</div><div class='add'>+</div><div class='ctx'> 			firstframe-&gt;flags &amp;= BCM_CAN_FLAGS_MASK;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (has_timestamp) {</div><div class='hunk'>@@ -335,45 +409,54 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,</div><div class='ctx'> 	 *  containing the interface index.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	sock_skb_cb_check_size(sizeof(struct sockaddr_can));</div><div class='ctx'> 	addr = (struct sockaddr_can *)skb-&gt;cb;</div><div class='ctx'> 	memset(addr, 0, sizeof(*addr));</div><div class='ctx'> 	addr-&gt;can_family  = AF_CAN;</div><div class='ctx'> 	addr-&gt;can_ifindex = op-&gt;rx_ifindex;</div><div class='ctx'> </div><div class='del'>-	err = sock_queue_rcv_skb(sk, skb);</div><div class='add'>+	err = sock_queue_rcv_skb_reason(sk, skb, &amp;reason);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		struct bcm_sock *bo = bcm_sk(sk);</div><div class='ctx'> </div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 		/* don't care about overflows in this statistic */</div><div class='ctx'> 		bo-&gt;dropped_usr_msgs++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_tx_start_timer(struct bcm_op *op)</div><div class='add'>+static bool bcm_tx_set_expiry(struct bcm_op *op, struct hrtimer *hrt)</div><div class='ctx'> {</div><div class='add'>+	ktime_t ival;</div><div class='add'>+</div><div class='ctx'> 	if (op-&gt;kt_ival1 &amp;&amp; op-&gt;count)</div><div class='del'>-		hrtimer_start(&amp;op-&gt;timer,</div><div class='del'>-			      ktime_add(ktime_get(), op-&gt;kt_ival1),</div><div class='del'>-			      HRTIMER_MODE_ABS);</div><div class='add'>+		ival = op-&gt;kt_ival1;</div><div class='ctx'> 	else if (op-&gt;kt_ival2)</div><div class='del'>-		hrtimer_start(&amp;op-&gt;timer,</div><div class='del'>-			      ktime_add(ktime_get(), op-&gt;kt_ival2),</div><div class='del'>-			      HRTIMER_MODE_ABS);</div><div class='add'>+		ival = op-&gt;kt_ival2;</div><div class='add'>+	else</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	hrtimer_set_expires(hrt, ktime_add(ktime_get(), ival));</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_tx_timeout_tsklet(unsigned long data)</div><div class='add'>+static void bcm_tx_start_timer(struct bcm_op *op)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_op *op = (struct bcm_op *)data;</div><div class='add'>+	if (bcm_tx_set_expiry(op, &amp;op-&gt;timer))</div><div class='add'>+		hrtimer_start_expires(&amp;op-&gt;timer, HRTIMER_MODE_ABS_SOFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* bcm_tx_timeout_handler - performs cyclic CAN frame transmissions */</div><div class='add'>+static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);</div><div class='ctx'> 	struct bcm_msg_head msg_head;</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;kt_ival1 &amp;&amp; (op-&gt;count &gt; 0)) {</div><div class='del'>-</div><div class='del'>-		op-&gt;count--;</div><div class='add'>+		bcm_can_tx(op);</div><div class='ctx'> 		if (!op-&gt;count &amp;&amp; (op-&gt;flags &amp; TX_COUNTEVT)) {</div><div class='ctx'> </div><div class='ctx'> 			/* create notification to user */</div><div class='add'>+			memset(&amp;msg_head, 0, sizeof(msg_head));</div><div class='ctx'> 			msg_head.opcode  = TX_EXPIRED;</div><div class='ctx'> 			msg_head.flags   = op-&gt;flags;</div><div class='ctx'> 			msg_head.count   = op-&gt;count;</div><div class='hunk'>@@ -384,24 +467,13 @@ static void bcm_tx_timeout_tsklet(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 			bcm_send_to_user(op, &amp;msg_head, NULL, 0);</div><div class='ctx'> 		}</div><div class='del'>-		bcm_can_tx(op);</div><div class='ctx'> </div><div class='del'>-	} else if (op-&gt;kt_ival2)</div><div class='add'>+	} else if (op-&gt;kt_ival2) {</div><div class='ctx'> 		bcm_can_tx(op);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bcm_tx_start_timer(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bcm_tx_timeout_handler - performs cyclic CAN frame transmissions</div><div class='del'>- */</div><div class='del'>-static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)</div><div class='del'>-{</div><div class='del'>-	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);</div><div class='del'>-</div><div class='del'>-	tasklet_schedule(&amp;op-&gt;tsklet);</div><div class='del'>-</div><div class='del'>-	return HRTIMER_NORESTART;</div><div class='add'>+	return bcm_tx_set_expiry(op, &amp;op-&gt;timer) ?</div><div class='add'>+		HRTIMER_RESTART : HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -419,8 +491,9 @@ static void bcm_rx_changed(struct bcm_op *op, struct canfd_frame *data)</div><div class='ctx'> 		op-&gt;frames_filtered = op-&gt;frames_abs = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* this element is not throttled anymore */</div><div class='del'>-	data-&gt;flags &amp;= (BCM_CAN_FLAGS_MASK|RX_RECV);</div><div class='add'>+	data-&gt;flags &amp;= ~RX_THR;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;head, 0, sizeof(head));</div><div class='ctx'> 	head.opcode  = RX_CHANGED;</div><div class='ctx'> 	head.flags   = op-&gt;flags;</div><div class='ctx'> 	head.count   = op-&gt;count;</div><div class='hunk'>@@ -439,13 +512,17 @@ static void bcm_rx_changed(struct bcm_op *op, struct canfd_frame *data)</div><div class='ctx'>  */</div><div class='ctx'> static void bcm_rx_update_and_send(struct bcm_op *op,</div><div class='ctx'> 				   struct canfd_frame *lastdata,</div><div class='del'>-				   const struct canfd_frame *rxdata)</div><div class='add'>+				   const struct canfd_frame *rxdata,</div><div class='add'>+				   unsigned char traffic_flags)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(lastdata, rxdata, op-&gt;cfsiz);</div><div class='ctx'> </div><div class='ctx'> 	/* mark as used and throttled by default */</div><div class='ctx'> 	lastdata-&gt;flags |= (RX_RECV|RX_THR);</div><div class='ctx'> </div><div class='add'>+	/* add own/local/remote traffic flags */</div><div class='add'>+	lastdata-&gt;flags |= traffic_flags;</div><div class='add'>+</div><div class='ctx'> 	/* throttling mode inactive ? */</div><div class='ctx'> 	if (!op-&gt;kt_ival2) {</div><div class='ctx'> 		/* send RX_CHANGED to the user immediately */</div><div class='hunk'>@@ -467,7 +544,7 @@ static void bcm_rx_update_and_send(struct bcm_op *op,</div><div class='ctx'> 		/* do not send the saved data - only start throttle timer */</div><div class='ctx'> 		hrtimer_start(&amp;op-&gt;thrtimer,</div><div class='ctx'> 			      ktime_add(op-&gt;kt_lastmsg, op-&gt;kt_ival2),</div><div class='del'>-			      HRTIMER_MODE_ABS);</div><div class='add'>+			      HRTIMER_MODE_ABS_SOFT);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +559,8 @@ rx_changed_settime:</div><div class='ctx'>  *                       received data stored in op-&gt;last_frames[]</div><div class='ctx'>  */</div><div class='ctx'> static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index,</div><div class='del'>-				const struct canfd_frame *rxdata)</div><div class='add'>+				const struct canfd_frame *rxdata,</div><div class='add'>+				unsigned char traffic_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct canfd_frame *cf = op-&gt;frames + op-&gt;cfsiz * index;</div><div class='ctx'> 	struct canfd_frame *lcf = op-&gt;last_frames + op-&gt;cfsiz * index;</div><div class='hunk'>@@ -495,7 +573,7 @@ static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index,</div><div class='ctx'> </div><div class='ctx'> 	if (!(lcf-&gt;flags &amp; RX_RECV)) {</div><div class='ctx'> 		/* received data for the first time =&gt; send update to user */</div><div class='del'>-		bcm_rx_update_and_send(op, lcf, rxdata);</div><div class='add'>+		bcm_rx_update_and_send(op, lcf, rxdata, traffic_flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -503,7 +581,7 @@ static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index,</div><div class='ctx'> 	for (i = 0; i &lt; rxdata-&gt;len; i += 8) {</div><div class='ctx'> 		if ((get_u64(cf, i) &amp; get_u64(rxdata, i)) !=</div><div class='ctx'> 		    (get_u64(cf, i) &amp; get_u64(lcf, i))) {</div><div class='del'>-			bcm_rx_update_and_send(op, lcf, rxdata);</div><div class='add'>+			bcm_rx_update_and_send(op, lcf, rxdata, traffic_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -511,7 +589,7 @@ static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index,</div><div class='ctx'> 	if (op-&gt;flags &amp; RX_CHECK_DLC) {</div><div class='ctx'> 		/* do a real check in CAN frame length */</div><div class='ctx'> 		if (rxdata-&gt;len != lcf-&gt;len) {</div><div class='del'>-			bcm_rx_update_and_send(op, lcf, rxdata);</div><div class='add'>+			bcm_rx_update_and_send(op, lcf, rxdata, traffic_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -526,15 +604,23 @@ static void bcm_rx_starttimer(struct bcm_op *op)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;kt_ival1)</div><div class='del'>-		hrtimer_start(&amp;op-&gt;timer, op-&gt;kt_ival1, HRTIMER_MODE_REL);</div><div class='add'>+		hrtimer_start(&amp;op-&gt;timer, op-&gt;kt_ival1, HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_rx_timeout_tsklet(unsigned long data)</div><div class='add'>+/* bcm_rx_timeout_handler - when the (cyclic) CAN frame reception timed out */</div><div class='add'>+static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_op *op = (struct bcm_op *)data;</div><div class='add'>+	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);</div><div class='ctx'> 	struct bcm_msg_head msg_head;</div><div class='ctx'> </div><div class='add'>+	/* if user wants to be informed, when cyclic CAN-Messages come back */</div><div class='add'>+	if ((op-&gt;flags &amp; RX_ANNOUNCE_RESUME) &amp;&amp; op-&gt;last_frames) {</div><div class='add'>+		/* clear received CAN frames to indicate 'nothing received' */</div><div class='add'>+		memset(op-&gt;last_frames, 0, op-&gt;nframes * op-&gt;cfsiz);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* create notification to user */</div><div class='add'>+	memset(&amp;msg_head, 0, sizeof(msg_head));</div><div class='ctx'> 	msg_head.opcode  = RX_TIMEOUT;</div><div class='ctx'> 	msg_head.flags   = op-&gt;flags;</div><div class='ctx'> 	msg_head.count   = op-&gt;count;</div><div class='hunk'>@@ -544,25 +630,6 @@ static void bcm_rx_timeout_tsklet(unsigned long data)</div><div class='ctx'> 	msg_head.nframes = 0;</div><div class='ctx'> </div><div class='ctx'> 	bcm_send_to_user(op, &amp;msg_head, NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bcm_rx_timeout_handler - when the (cyclic) CAN frame reception timed out</div><div class='del'>- */</div><div class='del'>-static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer)</div><div class='del'>-{</div><div class='del'>-	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);</div><div class='del'>-</div><div class='del'>-	/* schedule before NET_RX_SOFTIRQ */</div><div class='del'>-	tasklet_hi_schedule(&amp;op-&gt;tsklet);</div><div class='del'>-</div><div class='del'>-	/* no restart of the timer is done here! */</div><div class='del'>-</div><div class='del'>-	/* if user wants to be informed, when cyclic CAN-Messages come back */</div><div class='del'>-	if ((op-&gt;flags &amp; RX_ANNOUNCE_RESUME) &amp;&amp; op-&gt;last_frames) {</div><div class='del'>-		/* clear received CAN frames to indicate 'nothing received' */</div><div class='del'>-		memset(op-&gt;last_frames, 0, op-&gt;nframes * op-&gt;cfsiz);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='hunk'>@@ -570,14 +637,12 @@ static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer)</div><div class='ctx'> /*</div><div class='ctx'>  * bcm_rx_do_flush - helper for bcm_rx_thr_flush</div><div class='ctx'>  */</div><div class='del'>-static inline int bcm_rx_do_flush(struct bcm_op *op, int update,</div><div class='del'>-				  unsigned int index)</div><div class='add'>+static inline int bcm_rx_do_flush(struct bcm_op *op, unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct canfd_frame *lcf = op-&gt;last_frames + op-&gt;cfsiz * index;</div><div class='ctx'> </div><div class='ctx'> 	if ((op-&gt;last_frames) &amp;&amp; (lcf-&gt;flags &amp; RX_THR)) {</div><div class='del'>-		if (update)</div><div class='del'>-			bcm_rx_changed(op, lcf);</div><div class='add'>+		bcm_rx_changed(op, lcf);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -585,11 +650,8 @@ static inline int bcm_rx_do_flush(struct bcm_op *op, int update,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * bcm_rx_thr_flush - Check for throttled data and send it to the userspace</div><div class='del'>- *</div><div class='del'>- * update == 0 : just check if throttled data is available  (any irq context)</div><div class='del'>- * update == 1 : check and send throttled data to userspace (soft_irq context)</div><div class='ctx'>  */</div><div class='del'>-static int bcm_rx_thr_flush(struct bcm_op *op, int update)</div><div class='add'>+static int bcm_rx_thr_flush(struct bcm_op *op)</div><div class='ctx'> {</div><div class='ctx'> 	int updated = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -598,24 +660,16 @@ static int bcm_rx_thr_flush(struct bcm_op *op, int update)</div><div class='ctx'> </div><div class='ctx'> 		/* for MUX filter we start at index 1 */</div><div class='ctx'> 		for (i = 1; i &lt; op-&gt;nframes; i++)</div><div class='del'>-			updated += bcm_rx_do_flush(op, update, i);</div><div class='add'>+			updated += bcm_rx_do_flush(op, i);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* for RX_FILTER_ID and simple filter */</div><div class='del'>-		updated += bcm_rx_do_flush(op, update, 0);</div><div class='add'>+		updated += bcm_rx_do_flush(op, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return updated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_rx_thr_tsklet(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct bcm_op *op = (struct bcm_op *)data;</div><div class='del'>-</div><div class='del'>-	/* push the changed data to the userspace */</div><div class='del'>-	bcm_rx_thr_flush(op, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * bcm_rx_thr_handler - the time for blocked content updates is over now:</div><div class='ctx'>  *                      Check for throttled data and send it to the userspace</div><div class='hunk'>@@ -624,10 +678,8 @@ static enum hrtimer_restart bcm_rx_thr_handler(struct hrtimer *hrtimer)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_op *op = container_of(hrtimer, struct bcm_op, thrtimer);</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;op-&gt;thrtsklet);</div><div class='del'>-</div><div class='del'>-	if (bcm_rx_thr_flush(op, 0)) {</div><div class='del'>-		hrtimer_forward(hrtimer, ktime_get(), op-&gt;kt_ival2);</div><div class='add'>+	if (bcm_rx_thr_flush(op)) {</div><div class='add'>+		hrtimer_forward_now(hrtimer, op-&gt;kt_ival2);</div><div class='ctx'> 		return HRTIMER_RESTART;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* rearm throttle handling */</div><div class='hunk'>@@ -644,13 +696,19 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)</div><div class='ctx'> 	struct bcm_op *op = (struct bcm_op *)data;</div><div class='ctx'> 	const struct canfd_frame *rxframe = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	unsigned char traffic_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;can_id != rxframe-&gt;can_id)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure to handle the correct frame type (CAN / CAN FD) */</div><div class='del'>-	if (skb-&gt;len != op-&gt;cfsiz)</div><div class='del'>-		return;</div><div class='add'>+	if (op-&gt;flags &amp; CAN_FD_FRAME) {</div><div class='add'>+		if (!can_is_canfd_skb(skb))</div><div class='add'>+			return;</div><div class='add'>+	} else {</div><div class='add'>+		if (!can_is_can_skb(skb))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* disable timeout */</div><div class='ctx'> 	hrtimer_cancel(&amp;op-&gt;timer);</div><div class='hunk'>@@ -668,15 +726,24 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* compute flags to distinguish between own/local/remote CAN traffic */</div><div class='add'>+	traffic_flags = 0;</div><div class='add'>+	if (skb-&gt;sk) {</div><div class='add'>+		traffic_flags |= RX_LOCAL;</div><div class='add'>+		if (skb-&gt;sk == op-&gt;sk)</div><div class='add'>+			traffic_flags |= RX_OWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (op-&gt;flags &amp; RX_FILTER_ID) {</div><div class='ctx'> 		/* the easiest case */</div><div class='del'>-		bcm_rx_update_and_send(op, op-&gt;last_frames, rxframe);</div><div class='add'>+		bcm_rx_update_and_send(op, op-&gt;last_frames, rxframe,</div><div class='add'>+				       traffic_flags);</div><div class='ctx'> 		goto rx_starttimer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;nframes == 1) {</div><div class='ctx'> 		/* simple compare with index 0 */</div><div class='del'>-		bcm_rx_cmp_to_index(op, 0, rxframe);</div><div class='add'>+		bcm_rx_cmp_to_index(op, 0, rxframe, traffic_flags);</div><div class='ctx'> 		goto rx_starttimer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -693,7 +760,8 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)</div><div class='ctx'> 			if ((get_u64(op-&gt;frames, 0) &amp; get_u64(rxframe, 0)) ==</div><div class='ctx'> 			    (get_u64(op-&gt;frames, 0) &amp;</div><div class='ctx'> 			     get_u64(op-&gt;frames + op-&gt;cfsiz * i, 0))) {</div><div class='del'>-				bcm_rx_cmp_to_index(op, i, rxframe);</div><div class='add'>+				bcm_rx_cmp_to_index(op, i, rxframe,</div><div class='add'>+						    traffic_flags);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -720,25 +788,9 @@ static struct bcm_op *bcm_find_op(struct list_head *ops,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_remove_op(struct bcm_op *op)</div><div class='add'>+static void bcm_free_op_rcu(struct rcu_head *rcu_head)</div><div class='ctx'> {</div><div class='del'>-	if (op-&gt;tsklet.func) {</div><div class='del'>-		while (test_bit(TASKLET_STATE_SCHED, &amp;op-&gt;tsklet.state) ||</div><div class='del'>-		       test_bit(TASKLET_STATE_RUN, &amp;op-&gt;tsklet.state) ||</div><div class='del'>-		       hrtimer_active(&amp;op-&gt;timer)) {</div><div class='del'>-			hrtimer_cancel(&amp;op-&gt;timer);</div><div class='del'>-			tasklet_kill(&amp;op-&gt;tsklet);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;thrtsklet.func) {</div><div class='del'>-		while (test_bit(TASKLET_STATE_SCHED, &amp;op-&gt;thrtsklet.state) ||</div><div class='del'>-		       test_bit(TASKLET_STATE_RUN, &amp;op-&gt;thrtsklet.state) ||</div><div class='del'>-		       hrtimer_active(&amp;op-&gt;thrtimer)) {</div><div class='del'>-			hrtimer_cancel(&amp;op-&gt;thrtimer);</div><div class='del'>-			tasklet_kill(&amp;op-&gt;thrtsklet);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct bcm_op *op = container_of(rcu_head, struct bcm_op, rcu);</div><div class='ctx'> </div><div class='ctx'> 	if ((op-&gt;frames) &amp;&amp; (op-&gt;frames != &amp;op-&gt;sframe))</div><div class='ctx'> 		kfree(op-&gt;frames);</div><div class='hunk'>@@ -749,6 +801,14 @@ static void bcm_remove_op(struct bcm_op *op)</div><div class='ctx'> 	kfree(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcm_remove_op(struct bcm_op *op)</div><div class='add'>+{</div><div class='add'>+	hrtimer_cancel(&amp;op-&gt;timer);</div><div class='add'>+	hrtimer_cancel(&amp;op-&gt;thrtimer);</div><div class='add'>+</div><div class='add'>+	call_rcu(&amp;op-&gt;rcu, bcm_free_op_rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op)</div><div class='ctx'> {</div><div class='ctx'> 	if (op-&gt;rx_reg_dev == dev) {</div><div class='hunk'>@@ -774,6 +834,9 @@ static int bcm_delete_rx_op(struct list_head *ops, struct bcm_msg_head *mh,</div><div class='ctx'> 		if ((op-&gt;can_id == mh-&gt;can_id) &amp;&amp; (op-&gt;ifindex == ifindex) &amp;&amp;</div><div class='ctx'> 		    (op-&gt;flags &amp; CAN_FD_FRAME) == (mh-&gt;flags &amp; CAN_FD_FRAME)) {</div><div class='ctx'> </div><div class='add'>+			/* disable automatic timer on frame reception */</div><div class='add'>+			op-&gt;flags |= RX_NO_AUTOTIMER;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Don't care if we're bound or not (due to netdev</div><div class='ctx'> 			 * problems) can_rx_unregister() is always a save</div><div class='hunk'>@@ -801,7 +864,7 @@ static int bcm_delete_rx_op(struct list_head *ops, struct bcm_msg_head *mh,</div><div class='ctx'> 						  REGMASK(op-&gt;can_id),</div><div class='ctx'> 						  bcm_rx_handler, op);</div><div class='ctx'> </div><div class='del'>-			list_del(&amp;op-&gt;list);</div><div class='add'>+			list_del_rcu(&amp;op-&gt;list);</div><div class='ctx'> 			bcm_remove_op(op);</div><div class='ctx'> 			return 1; /* done */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -821,7 +884,7 @@ static int bcm_delete_tx_op(struct list_head *ops, struct bcm_msg_head *mh,</div><div class='ctx'> 	list_for_each_entry_safe(op, n, ops, list) {</div><div class='ctx'> 		if ((op-&gt;can_id == mh-&gt;can_id) &amp;&amp; (op-&gt;ifindex == ifindex) &amp;&amp;</div><div class='ctx'> 		    (op-&gt;flags &amp; CAN_FD_FRAME) == (mh-&gt;flags &amp; CAN_FD_FRAME)) {</div><div class='del'>-			list_del(&amp;op-&gt;list);</div><div class='add'>+			list_del_rcu(&amp;op-&gt;list);</div><div class='ctx'> 			bcm_remove_op(op);</div><div class='ctx'> 			return 1; /* done */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -873,6 +936,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 	if (msg_head-&gt;nframes &lt; 1 || msg_head-&gt;nframes &gt; MAX_NFRAMES)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* check timeval limitations */</div><div class='add'>+	if ((msg_head-&gt;flags &amp; SETTIMER) &amp;&amp; bcm_is_invalid_tv(msg_head))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* check the given can_id */</div><div class='ctx'> 	op = bcm_find_op(&amp;bo-&gt;tx_ops, msg_head, ifindex);</div><div class='ctx'> 	if (op) {</div><div class='hunk'>@@ -910,6 +977,27 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 		}</div><div class='ctx'> 		op-&gt;flags = msg_head-&gt;flags;</div><div class='ctx'> </div><div class='add'>+		/* only lock for unlikely count/nframes/currframe changes */</div><div class='add'>+		if (op-&gt;nframes != msg_head-&gt;nframes ||</div><div class='add'>+		    op-&gt;flags &amp; TX_RESET_MULTI_IDX ||</div><div class='add'>+		    op-&gt;flags &amp; SETTIMER) {</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='add'>+</div><div class='add'>+			if (op-&gt;nframes != msg_head-&gt;nframes ||</div><div class='add'>+			    op-&gt;flags &amp; TX_RESET_MULTI_IDX) {</div><div class='add'>+				/* potentially update changed nframes */</div><div class='add'>+				op-&gt;nframes = msg_head-&gt;nframes;</div><div class='add'>+				/* restart multiple frame transmission */</div><div class='add'>+				op-&gt;currframe = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (op-&gt;flags &amp; SETTIMER)</div><div class='add'>+				op-&gt;count = msg_head-&gt;count;</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;op-&gt;bcm_tx_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* insert new BCM operation for the given can_id */</div><div class='ctx'> </div><div class='hunk'>@@ -917,9 +1005,14 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 		if (!op)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+		spin_lock_init(&amp;op-&gt;bcm_tx_lock);</div><div class='ctx'> 		op-&gt;can_id = msg_head-&gt;can_id;</div><div class='ctx'> 		op-&gt;cfsiz = CFSIZ(msg_head-&gt;flags);</div><div class='ctx'> 		op-&gt;flags = msg_head-&gt;flags;</div><div class='add'>+		op-&gt;nframes = msg_head-&gt;nframes;</div><div class='add'>+</div><div class='add'>+		if (op-&gt;flags &amp; SETTIMER)</div><div class='add'>+			op-&gt;count = msg_head-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 		/* create array for CAN frames and copy the data */</div><div class='ctx'> 		if (msg_head-&gt;nframes &gt; 1) {</div><div class='hunk'>@@ -937,6 +1030,8 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> </div><div class='ctx'> 			cf = op-&gt;frames + op-&gt;cfsiz * i;</div><div class='ctx'> 			err = memcpy_from_msg((u8 *)cf, msg, op-&gt;cfsiz);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto free_op;</div><div class='ctx'> </div><div class='ctx'> 			if (op-&gt;flags &amp; CAN_FD_FRAME) {</div><div class='ctx'> 				if (cf-&gt;len &gt; 64)</div><div class='hunk'>@@ -946,12 +1041,8 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 					err = -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				if (op-&gt;frames != &amp;op-&gt;sframe)</div><div class='del'>-					kfree(op-&gt;frames);</div><div class='del'>-				kfree(op);</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto free_op;</div><div class='ctx'> </div><div class='ctx'> 			if (msg_head-&gt;flags &amp; TX_CP_CAN_ID) {</div><div class='ctx'> 				/* copy can_id into frame */</div><div class='hunk'>@@ -967,37 +1058,20 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 		op-&gt;ifindex = ifindex;</div><div class='ctx'> </div><div class='ctx'> 		/* initialize uninitialized (kzalloc) structure */</div><div class='del'>-		hrtimer_init(&amp;op-&gt;timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-		op-&gt;timer.function = bcm_tx_timeout_handler;</div><div class='del'>-</div><div class='del'>-		/* initialize tasklet for tx countevent notification */</div><div class='del'>-		tasklet_init(&amp;op-&gt;tsklet, bcm_tx_timeout_tsklet,</div><div class='del'>-			     (unsigned long) op);</div><div class='add'>+		hrtimer_setup(&amp;op-&gt;timer, bcm_tx_timeout_handler, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> </div><div class='ctx'> 		/* currently unused in tx_ops */</div><div class='del'>-		hrtimer_init(&amp;op-&gt;thrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='add'>+		hrtimer_setup(&amp;op-&gt;thrtimer, hrtimer_dummy_timeout, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> </div><div class='ctx'> 		/* add this bcm_op to the list of the tx_ops */</div><div class='ctx'> 		list_add(&amp;op-&gt;list, &amp;bo-&gt;tx_ops);</div><div class='ctx'> </div><div class='ctx'> 	} /* if ((op = bcm_find_op(&amp;bo-&gt;tx_ops, msg_head-&gt;can_id, ifindex))) */</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;nframes != msg_head-&gt;nframes) {</div><div class='del'>-		op-&gt;nframes   = msg_head-&gt;nframes;</div><div class='del'>-		/* start multiple frame transmission with index 0 */</div><div class='del'>-		op-&gt;currframe = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check flags */</div><div class='del'>-</div><div class='del'>-	if (op-&gt;flags &amp; TX_RESET_MULTI_IDX) {</div><div class='del'>-		/* start multiple frame transmission with index 0 */</div><div class='del'>-		op-&gt;currframe = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (op-&gt;flags &amp; SETTIMER) {</div><div class='ctx'> 		/* set timer values */</div><div class='del'>-		op-&gt;count = msg_head-&gt;count;</div><div class='ctx'> 		op-&gt;ival1 = msg_head-&gt;ival1;</div><div class='ctx'> 		op-&gt;ival2 = msg_head-&gt;ival2;</div><div class='ctx'> 		op-&gt;kt_ival1 = bcm_timeval_to_ktime(msg_head-&gt;ival1);</div><div class='hunk'>@@ -1014,16 +1088,19 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 		op-&gt;flags |= TX_ANNOUNCE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;flags &amp; TX_ANNOUNCE) {</div><div class='add'>+	if (op-&gt;flags &amp; TX_ANNOUNCE)</div><div class='ctx'> 		bcm_can_tx(op);</div><div class='del'>-		if (op-&gt;count)</div><div class='del'>-			op-&gt;count--;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;flags &amp; STARTTIMER)</div><div class='ctx'> 		bcm_tx_start_timer(op);</div><div class='ctx'> </div><div class='ctx'> 	return msg_head-&gt;nframes * op-&gt;cfsiz + MHSIZ;</div><div class='add'>+</div><div class='add'>+free_op:</div><div class='add'>+	if (op-&gt;frames != &amp;op-&gt;sframe)</div><div class='add'>+		kfree(op-&gt;frames);</div><div class='add'>+	kfree(op);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1053,6 +1130,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 	     (!(msg_head-&gt;can_id &amp; CAN_RTR_FLAG))))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* check timeval limitations */</div><div class='add'>+	if ((msg_head-&gt;flags &amp; SETTIMER) &amp;&amp; bcm_is_invalid_tv(msg_head))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* check the given can_id */</div><div class='ctx'> 	op = bcm_find_op(&amp;bo-&gt;rx_ops, msg_head, ifindex);</div><div class='ctx'> 	if (op) {</div><div class='hunk'>@@ -1140,19 +1221,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 		op-&gt;rx_ifindex = ifindex;</div><div class='ctx'> </div><div class='ctx'> 		/* initialize uninitialized (kzalloc) structure */</div><div class='del'>-		hrtimer_init(&amp;op-&gt;timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-		op-&gt;timer.function = bcm_rx_timeout_handler;</div><div class='del'>-</div><div class='del'>-		/* initialize tasklet for rx timeout notification */</div><div class='del'>-		tasklet_init(&amp;op-&gt;tsklet, bcm_rx_timeout_tsklet,</div><div class='del'>-			     (unsigned long) op);</div><div class='del'>-</div><div class='del'>-		hrtimer_init(&amp;op-&gt;thrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-		op-&gt;thrtimer.function = bcm_rx_thr_handler;</div><div class='del'>-</div><div class='del'>-		/* initialize tasklet for rx throttle handling */</div><div class='del'>-		tasklet_init(&amp;op-&gt;thrtsklet, bcm_rx_thr_tsklet,</div><div class='del'>-			     (unsigned long) op);</div><div class='add'>+		hrtimer_setup(&amp;op-&gt;timer, bcm_rx_timeout_handler, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		hrtimer_setup(&amp;op-&gt;thrtimer, bcm_rx_thr_handler, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> </div><div class='ctx'> 		/* add this bcm_op to the list of the rx_ops */</div><div class='ctx'> 		list_add(&amp;op-&gt;list, &amp;bo-&gt;rx_ops);</div><div class='hunk'>@@ -1199,12 +1271,12 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 			 */</div><div class='ctx'> 			op-&gt;kt_lastmsg = 0;</div><div class='ctx'> 			hrtimer_cancel(&amp;op-&gt;thrtimer);</div><div class='del'>-			bcm_rx_thr_flush(op, 1);</div><div class='add'>+			bcm_rx_thr_flush(op);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((op-&gt;flags &amp; STARTTIMER) &amp;&amp; op-&gt;kt_ival1)</div><div class='ctx'> 			hrtimer_start(&amp;op-&gt;timer, op-&gt;kt_ival1,</div><div class='del'>-				      HRTIMER_MODE_REL);</div><div class='add'>+				      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* now we can register for can_ids, if we added a new bcm_op */</div><div class='hunk'>@@ -1230,7 +1302,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,</div><div class='ctx'> 					      bcm_rx_handler, op, "bcm", sk);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			/* this bcm rx op is broken -&gt; remove it */</div><div class='del'>-			list_del(&amp;op-&gt;list);</div><div class='add'>+			list_del_rcu(&amp;op-&gt;list);</div><div class='ctx'> 			bcm_remove_op(op);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1318,7 +1390,7 @@ static int bcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='ctx'> 		/* no bound device as default =&gt; check msg_name */</div><div class='ctx'> 		DECLARE_SOCKADDR(struct sockaddr_can *, addr, msg-&gt;msg_name);</div><div class='ctx'> </div><div class='del'>-		if (msg-&gt;msg_namelen &lt; sizeof(*addr))</div><div class='add'>+		if (msg-&gt;msg_namelen &lt; BCM_MIN_NAMELEN)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (addr-&gt;can_family != AF_CAN)</div><div class='hunk'>@@ -1402,20 +1474,15 @@ static int bcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='ctx'> /*</div><div class='ctx'>  * notification handler for netdevice status changes</div><div class='ctx'>  */</div><div class='del'>-static int bcm_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='del'>-			void *ptr)</div><div class='add'>+static void bcm_notify(struct bcm_sock *bo, unsigned long msg,</div><div class='add'>+		       struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct bcm_sock *bo = container_of(nb, struct bcm_sock, notifier);</div><div class='ctx'> 	struct sock *sk = &amp;bo-&gt;sk;</div><div class='ctx'> 	struct bcm_op *op;</div><div class='ctx'> 	int notify_enodev = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(dev_net(dev), sock_net(sk)))</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type != ARPHRD_CAN)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (msg) {</div><div class='ctx'> </div><div class='hunk'>@@ -1429,6 +1496,12 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='ctx'> </div><div class='ctx'> 		/* remove device reference, if this is our bound device */</div><div class='ctx'> 		if (bo-&gt;bound &amp;&amp; bo-&gt;ifindex == dev-&gt;ifindex) {</div><div class='add'>+#if IS_ENABLED(CONFIG_PROC_FS)</div><div class='add'>+			if (sock_net(sk)-&gt;can.bcmproc_dir &amp;&amp; bo-&gt;bcm_proc_read) {</div><div class='add'>+				remove_proc_entry(bo-&gt;procname, sock_net(sk)-&gt;can.bcmproc_dir);</div><div class='add'>+				bo-&gt;bcm_proc_read = NULL;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> 			bo-&gt;bound   = 0;</div><div class='ctx'> 			bo-&gt;ifindex = 0;</div><div class='ctx'> 			notify_enodev = 1;</div><div class='hunk'>@@ -1439,7 +1512,7 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='ctx'> 		if (notify_enodev) {</div><div class='ctx'> 			sk-&gt;sk_err = ENODEV;</div><div class='ctx'> 			if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-				sk-&gt;sk_error_report(sk);</div><div class='add'>+				sk_error_report(sk);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1447,10 +1520,31 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='ctx'> 		if (bo-&gt;bound &amp;&amp; bo-&gt;ifindex == dev-&gt;ifindex) {</div><div class='ctx'> 			sk-&gt;sk_err = ENETDOWN;</div><div class='ctx'> 			if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-				sk-&gt;sk_error_report(sk);</div><div class='add'>+				sk_error_report(sk);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int bcm_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='add'>+			void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type != ARPHRD_CAN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (msg != NETDEV_UNREGISTER &amp;&amp; msg != NETDEV_DOWN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (unlikely(bcm_busy_notifier)) /* Check for reentrant bug. */</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bcm_notifier_lock);</div><div class='add'>+	list_for_each_entry(bcm_busy_notifier, &amp;bcm_notifier_list, notifier) {</div><div class='add'>+		spin_unlock(&amp;bcm_notifier_lock);</div><div class='add'>+		bcm_notify(bcm_busy_notifier, msg, dev);</div><div class='add'>+		spin_lock(&amp;bcm_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	bcm_busy_notifier = NULL;</div><div class='add'>+	spin_unlock(&amp;bcm_notifier_lock);</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1470,9 +1564,9 @@ static int bcm_init(struct sock *sk)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bo-&gt;rx_ops);</div><div class='ctx'> </div><div class='ctx'> 	/* set notifier */</div><div class='del'>-	bo-&gt;notifier.notifier_call = bcm_notifier;</div><div class='del'>-</div><div class='del'>-	register_netdevice_notifier(&amp;bo-&gt;notifier);</div><div class='add'>+	spin_lock(&amp;bcm_notifier_lock);</div><div class='add'>+	list_add_tail(&amp;bo-&gt;notifier, &amp;bcm_notifier_list);</div><div class='add'>+	spin_unlock(&amp;bcm_notifier_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1495,10 +1589,23 @@ static int bcm_release(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> 	/* remove bcm_ops, timer, rx_unregister(), etc. */</div><div class='ctx'> </div><div class='del'>-	unregister_netdevice_notifier(&amp;bo-&gt;notifier);</div><div class='add'>+	spin_lock(&amp;bcm_notifier_lock);</div><div class='add'>+	while (bcm_busy_notifier == bo) {</div><div class='add'>+		spin_unlock(&amp;bcm_notifier_lock);</div><div class='add'>+		schedule_timeout_uninterruptible(1);</div><div class='add'>+		spin_lock(&amp;bcm_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;bo-&gt;notifier);</div><div class='add'>+	spin_unlock(&amp;bcm_notifier_lock);</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_PROC_FS)</div><div class='add'>+	/* remove procfs entry */</div><div class='add'>+	if (net-&gt;can.bcmproc_dir &amp;&amp; bo-&gt;bcm_proc_read)</div><div class='add'>+		remove_proc_entry(bo-&gt;procname, net-&gt;can.bcmproc_dir);</div><div class='add'>+#endif /* CONFIG_PROC_FS */</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(op, next, &amp;bo-&gt;tx_ops, list)</div><div class='ctx'> 		bcm_remove_op(op);</div><div class='ctx'> </div><div class='hunk'>@@ -1527,14 +1634,12 @@ static int bcm_release(struct socket *sock)</div><div class='ctx'> 					  REGMASK(op-&gt;can_id),</div><div class='ctx'> 					  bcm_rx_handler, op);</div><div class='ctx'> </div><div class='del'>-		bcm_remove_op(op);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_PROC_FS)</div><div class='del'>-	/* remove procfs entry */</div><div class='del'>-	if (net-&gt;can.bcmproc_dir &amp;&amp; bo-&gt;bcm_proc_read)</div><div class='del'>-		remove_proc_entry(bo-&gt;procname, net-&gt;can.bcmproc_dir);</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(op, next, &amp;bo-&gt;rx_ops, list)</div><div class='add'>+		bcm_remove_op(op);</div><div class='ctx'> </div><div class='ctx'> 	/* remove device reference */</div><div class='ctx'> 	if (bo-&gt;bound) {</div><div class='hunk'>@@ -1546,12 +1651,13 @@ static int bcm_release(struct socket *sock)</div><div class='ctx'> 	sock-&gt;sk = NULL;</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,</div><div class='add'>+static int bcm_connect(struct socket *sock, struct sockaddr_unsized *uaddr, int len,</div><div class='ctx'> 		       int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='hunk'>@@ -1560,7 +1666,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(*addr))</div><div class='add'>+	if (len &lt; BCM_MIN_NAMELEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -1621,12 +1727,9 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int error = 0;</div><div class='del'>-	int noblock;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	noblock =  flags &amp; MSG_DONTWAIT;</div><div class='del'>-	flags   &amp;= ~MSG_DONTWAIT;</div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;error);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;error);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -1639,19 +1742,29 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='del'>-		__sockaddr_check_size(sizeof(struct sockaddr_can));</div><div class='del'>-		msg-&gt;msg_namelen = sizeof(struct sockaddr_can);</div><div class='add'>+		__sockaddr_check_size(BCM_MIN_NAMELEN);</div><div class='add'>+		msg-&gt;msg_namelen = BCM_MIN_NAMELEN;</div><div class='ctx'> 		memcpy(msg-&gt;msg_name, skb-&gt;cb, msg-&gt;msg_namelen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* assign the flags that have been recorded in bcm_send_to_user() */</div><div class='add'>+	msg-&gt;msg_flags |= *(bcm_flags(skb));</div><div class='add'>+</div><div class='ctx'> 	skb_free_datagram(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcm_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,</div><div class='add'>+				unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	/* no ioctls for socket layer -&gt; hand it down to NIC layer */</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct proto_ops bcm_ops = {</div><div class='ctx'> 	.family        = PF_CAN,</div><div class='ctx'> 	.release       = bcm_release,</div><div class='hunk'>@@ -1661,15 +1774,13 @@ static const struct proto_ops bcm_ops = {</div><div class='ctx'> 	.accept        = sock_no_accept,</div><div class='ctx'> 	.getname       = sock_no_getname,</div><div class='ctx'> 	.poll          = datagram_poll,</div><div class='del'>-	.ioctl         = can_ioctl,	/* use can_ioctl() from af_can.c */</div><div class='add'>+	.ioctl         = bcm_sock_no_ioctlcmd,</div><div class='add'>+	.gettstamp     = sock_gettstamp,</div><div class='ctx'> 	.listen        = sock_no_listen,</div><div class='ctx'> 	.shutdown      = sock_no_shutdown,</div><div class='del'>-	.setsockopt    = sock_no_setsockopt,</div><div class='del'>-	.getsockopt    = sock_no_getsockopt,</div><div class='ctx'> 	.sendmsg       = bcm_sendmsg,</div><div class='ctx'> 	.recvmsg       = bcm_recvmsg,</div><div class='ctx'> 	.mmap          = sock_no_mmap,</div><div class='del'>-	.sendpage      = sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct proto bcm_proto __read_mostly = {</div><div class='hunk'>@@ -1710,25 +1821,43 @@ static struct pernet_operations canbcm_pernet_ops __read_mostly = {</div><div class='ctx'> 	.exit = canbcm_pernet_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct notifier_block canbcm_notifier = {</div><div class='add'>+	.notifier_call = bcm_notifier</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init bcm_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pr_info("can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n");</div><div class='add'>+	pr_info("can: broadcast manager protocol\n");</div><div class='add'>+</div><div class='add'>+	err = register_pernet_subsys(&amp;canbcm_pernet_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;canbcm_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		goto register_notifier_failed;</div><div class='ctx'> </div><div class='ctx'> 	err = can_proto_register(&amp;bcm_can_proto);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "can: registration of bcm protocol failed\n");</div><div class='del'>-		return err;</div><div class='add'>+		goto register_proto_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	register_pernet_subsys(&amp;canbcm_pernet_ops);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+register_proto_failed:</div><div class='add'>+	unregister_netdevice_notifier(&amp;canbcm_notifier);</div><div class='add'>+register_notifier_failed:</div><div class='add'>+	unregister_pernet_subsys(&amp;canbcm_pernet_ops);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit bcm_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	can_proto_unregister(&amp;bcm_can_proto);</div><div class='add'>+	unregister_netdevice_notifier(&amp;canbcm_notifier);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;canbcm_pernet_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/can/gw.c b/net/can/gw.c<br/>index faa3da88a127..55eccb1c7620 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/gw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/gw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/gw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/gw.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * gw.c - CAN frame Gateway/Router/Bridge with netlink interface</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='add'>+/* gw.c - CAN frame Gateway/Router/Bridge with netlink interface</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2017 Volkswagen Group Electronic Research</div><div class='add'>+ * Copyright (c) 2019 Volkswagen Group Electronic Research</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -59,7 +59,6 @@</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CAN_GW_VERSION "20170425"</div><div class='ctx'> #define CAN_GW_NAME "can-gw"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PF_CAN netlink gateway");</div><div class='hunk'>@@ -85,10 +84,10 @@ static struct kmem_cache *cgw_cache __read_mostly;</div><div class='ctx'> /* structure that contains the (on-the-fly) CAN frame modifications */</div><div class='ctx'> struct cf_mod {</div><div class='ctx'> 	struct {</div><div class='del'>-		struct can_frame and;</div><div class='del'>-		struct can_frame or;</div><div class='del'>-		struct can_frame xor;</div><div class='del'>-		struct can_frame set;</div><div class='add'>+		struct canfd_frame and;</div><div class='add'>+		struct canfd_frame or;</div><div class='add'>+		struct canfd_frame xor;</div><div class='add'>+		struct canfd_frame set;</div><div class='ctx'> 	} modframe;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 and;</div><div class='hunk'>@@ -96,7 +95,7 @@ struct cf_mod {</div><div class='ctx'> 		u8 xor;</div><div class='ctx'> 		u8 set;</div><div class='ctx'> 	} modtype;</div><div class='del'>-	void (*modfunc[MAX_MODFUNCTIONS])(struct can_frame *cf,</div><div class='add'>+	void (*modfunc[MAX_MODFUNCTIONS])(struct canfd_frame *cf,</div><div class='ctx'> 					  struct cf_mod *mod);</div><div class='ctx'> </div><div class='ctx'> 	/* CAN frame checksum calculation after CAN frame modifications */</div><div class='hunk'>@@ -105,15 +104,15 @@ struct cf_mod {</div><div class='ctx'> 		struct cgw_csum_crc8 crc8;</div><div class='ctx'> 	} csum;</div><div class='ctx'> 	struct {</div><div class='del'>-		void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);</div><div class='del'>-		void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);</div><div class='add'>+		void (*xor)(struct canfd_frame *cf,</div><div class='add'>+			    struct cgw_csum_xor *xor);</div><div class='add'>+		void (*crc8)(struct canfd_frame *cf,</div><div class='add'>+			     struct cgw_csum_crc8 *crc8);</div><div class='ctx'> 	} csumfunc;</div><div class='ctx'> 	u32 uid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * So far we just support CAN -&gt; CAN routing and frame modifications.</div><div class='add'>+/* So far we just support CAN -&gt; CAN routing and frame modifications.</div><div class='ctx'>  *</div><div class='ctx'>  * The internal can_can_gw structure contains data and attributes for</div><div class='ctx'>  * a CAN -&gt; CAN gateway job.</div><div class='hunk'>@@ -131,7 +130,7 @@ struct cgw_job {</div><div class='ctx'> 	u32 handled_frames;</div><div class='ctx'> 	u32 dropped_frames;</div><div class='ctx'> 	u32 deleted_frames;</div><div class='del'>-	struct cf_mod mod;</div><div class='add'>+	struct cf_mod __rcu *cf_mod;</div><div class='ctx'> 	union {</div><div class='ctx'> 		/* CAN frame data source */</div><div class='ctx'> 		struct net_device *dev;</div><div class='hunk'>@@ -151,39 +150,150 @@ struct cgw_job {</div><div class='ctx'> </div><div class='ctx'> /* modification functions that are invoked in the hot path in can_can_gw_rcv */</div><div class='ctx'> </div><div class='del'>-#define MODFUNC(func, op) static void func(struct can_frame *cf, \</div><div class='add'>+#define MODFUNC(func, op) static void func(struct canfd_frame *cf, \</div><div class='ctx'> 					   struct cf_mod *mod) { op ; }</div><div class='ctx'> </div><div class='ctx'> MODFUNC(mod_and_id, cf-&gt;can_id &amp;= mod-&gt;modframe.and.can_id)</div><div class='del'>-MODFUNC(mod_and_dlc, cf-&gt;can_dlc &amp;= mod-&gt;modframe.and.can_dlc)</div><div class='add'>+MODFUNC(mod_and_len, cf-&gt;len &amp;= mod-&gt;modframe.and.len)</div><div class='add'>+MODFUNC(mod_and_flags, cf-&gt;flags &amp;= mod-&gt;modframe.and.flags)</div><div class='ctx'> MODFUNC(mod_and_data, *(u64 *)cf-&gt;data &amp;= *(u64 *)mod-&gt;modframe.and.data)</div><div class='ctx'> MODFUNC(mod_or_id, cf-&gt;can_id |= mod-&gt;modframe.or.can_id)</div><div class='del'>-MODFUNC(mod_or_dlc, cf-&gt;can_dlc |= mod-&gt;modframe.or.can_dlc)</div><div class='add'>+MODFUNC(mod_or_len, cf-&gt;len |= mod-&gt;modframe.or.len)</div><div class='add'>+MODFUNC(mod_or_flags, cf-&gt;flags |= mod-&gt;modframe.or.flags)</div><div class='ctx'> MODFUNC(mod_or_data, *(u64 *)cf-&gt;data |= *(u64 *)mod-&gt;modframe.or.data)</div><div class='ctx'> MODFUNC(mod_xor_id, cf-&gt;can_id ^= mod-&gt;modframe.xor.can_id)</div><div class='del'>-MODFUNC(mod_xor_dlc, cf-&gt;can_dlc ^= mod-&gt;modframe.xor.can_dlc)</div><div class='add'>+MODFUNC(mod_xor_len, cf-&gt;len ^= mod-&gt;modframe.xor.len)</div><div class='add'>+MODFUNC(mod_xor_flags, cf-&gt;flags ^= mod-&gt;modframe.xor.flags)</div><div class='ctx'> MODFUNC(mod_xor_data, *(u64 *)cf-&gt;data ^= *(u64 *)mod-&gt;modframe.xor.data)</div><div class='ctx'> MODFUNC(mod_set_id, cf-&gt;can_id = mod-&gt;modframe.set.can_id)</div><div class='del'>-MODFUNC(mod_set_dlc, cf-&gt;can_dlc = mod-&gt;modframe.set.can_dlc)</div><div class='add'>+MODFUNC(mod_set_len, cf-&gt;len = mod-&gt;modframe.set.len)</div><div class='add'>+MODFUNC(mod_set_flags, cf-&gt;flags = mod-&gt;modframe.set.flags)</div><div class='ctx'> MODFUNC(mod_set_data, *(u64 *)cf-&gt;data = *(u64 *)mod-&gt;modframe.set.data)</div><div class='ctx'> </div><div class='del'>-static inline void canframecpy(struct can_frame *dst, struct can_frame *src)</div><div class='add'>+static void mod_and_fddata(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CANFD_MAX_DLEN; i += 8)</div><div class='add'>+		*(u64 *)(cf-&gt;data + i) &amp;= *(u64 *)(mod-&gt;modframe.and.data + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_or_fddata(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CANFD_MAX_DLEN; i += 8)</div><div class='add'>+		*(u64 *)(cf-&gt;data + i) |= *(u64 *)(mod-&gt;modframe.or.data + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_xor_fddata(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Copy the struct members separately to ensure that no uninitialized</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CANFD_MAX_DLEN; i += 8)</div><div class='add'>+		*(u64 *)(cf-&gt;data + i) ^= *(u64 *)(mod-&gt;modframe.xor.data + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_set_fddata(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	memcpy(cf-&gt;data, mod-&gt;modframe.set.data, CANFD_MAX_DLEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* retrieve valid CC DLC value and store it into 'len' */</div><div class='add'>+static void mod_retrieve_ccdlc(struct canfd_frame *cf)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *ccf = (struct can_frame *)cf;</div><div class='add'>+</div><div class='add'>+	/* len8_dlc is only valid if len == CAN_MAX_DLEN */</div><div class='add'>+	if (ccf-&gt;len != CAN_MAX_DLEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* do we have a valid len8_dlc value from 9 .. 15 ? */</div><div class='add'>+	if (ccf-&gt;len8_dlc &gt; CAN_MAX_DLEN &amp;&amp; ccf-&gt;len8_dlc &lt;= CAN_MAX_RAW_DLC)</div><div class='add'>+		ccf-&gt;len = ccf-&gt;len8_dlc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert valid CC DLC value in 'len' into struct can_frame elements */</div><div class='add'>+static void mod_store_ccdlc(struct canfd_frame *cf)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *ccf = (struct can_frame *)cf;</div><div class='add'>+</div><div class='add'>+	/* clear potential leftovers */</div><div class='add'>+	ccf-&gt;len8_dlc = 0;</div><div class='add'>+</div><div class='add'>+	/* plain data length 0 .. 8 - that was easy */</div><div class='add'>+	if (ccf-&gt;len &lt;= CAN_MAX_DLEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* potentially broken values are caught in can_can_gw_rcv() */</div><div class='add'>+	if (ccf-&gt;len &gt; CAN_MAX_RAW_DLC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* we have a valid dlc value from 9 .. 15 in ccf-&gt;len */</div><div class='add'>+	ccf-&gt;len8_dlc = ccf-&gt;len;</div><div class='add'>+	ccf-&gt;len = CAN_MAX_DLEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_and_ccdlc(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	mod_retrieve_ccdlc(cf);</div><div class='add'>+	mod_and_len(cf, mod);</div><div class='add'>+	mod_store_ccdlc(cf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_or_ccdlc(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	mod_retrieve_ccdlc(cf);</div><div class='add'>+	mod_or_len(cf, mod);</div><div class='add'>+	mod_store_ccdlc(cf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_xor_ccdlc(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	mod_retrieve_ccdlc(cf);</div><div class='add'>+	mod_xor_len(cf, mod);</div><div class='add'>+	mod_store_ccdlc(cf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mod_set_ccdlc(struct canfd_frame *cf, struct cf_mod *mod)</div><div class='add'>+{</div><div class='add'>+	mod_set_len(cf, mod);</div><div class='add'>+	mod_store_ccdlc(cf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void canframecpy(struct canfd_frame *dst, struct can_frame *src)</div><div class='add'>+{</div><div class='add'>+	/* Copy the struct members separately to ensure that no uninitialized</div><div class='ctx'> 	 * data are copied in the 3 bytes hole of the struct. This is needed</div><div class='ctx'> 	 * to make easy compares of the data in the struct cf_mod.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	dst-&gt;can_id = src-&gt;can_id;</div><div class='del'>-	dst-&gt;can_dlc = src-&gt;can_dlc;</div><div class='add'>+	dst-&gt;len = src-&gt;len;</div><div class='ctx'> 	*(u64 *)dst-&gt;data = *(u64 *)src-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cgw_chk_csum_parms(s8 fr, s8 to, s8 re)</div><div class='add'>+static void canfdframecpy(struct canfd_frame *dst, struct canfd_frame *src)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * absolute dlc values 0 .. 7 =&gt; 0 .. 7, e.g. data [0]</div><div class='add'>+	/* Copy the struct members separately to ensure that no uninitialized</div><div class='add'>+	 * data are copied in the 2 bytes hole of the struct. This is needed</div><div class='add'>+	 * to make easy compares of the data in the struct cf_mod.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	dst-&gt;can_id = src-&gt;can_id;</div><div class='add'>+	dst-&gt;flags = src-&gt;flags;</div><div class='add'>+	dst-&gt;len = src-&gt;len;</div><div class='add'>+	memcpy(dst-&gt;data, src-&gt;data, CANFD_MAX_DLEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cgw_chk_csum_parms(s8 fr, s8 to, s8 re, struct rtcanmsg *r)</div><div class='add'>+{</div><div class='add'>+	s8 dlen = CAN_MAX_DLEN;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;flags &amp; CGW_FLAGS_CAN_FD)</div><div class='add'>+		dlen = CANFD_MAX_DLEN;</div><div class='add'>+</div><div class='add'>+	/* absolute dlc values 0 .. 7 =&gt; 0 .. 7, e.g. data [0]</div><div class='ctx'> 	 * relative to received dlc -1 .. -8 :</div><div class='ctx'> 	 * e.g. for received dlc = 8</div><div class='ctx'> 	 * -1 =&gt; index = 7 (data[7])</div><div class='hunk'>@@ -191,27 +301,27 @@ static int cgw_chk_csum_parms(s8 fr, s8 to, s8 re)</div><div class='ctx'> 	 * -8 =&gt; index = 0 (data[0])</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (fr &gt; -9 &amp;&amp; fr &lt; 8 &amp;&amp;</div><div class='del'>-	    to &gt; -9 &amp;&amp; to &lt; 8 &amp;&amp;</div><div class='del'>-	    re &gt; -9 &amp;&amp; re &lt; 8)</div><div class='add'>+	if (fr &gt;= -dlen &amp;&amp; fr &lt; dlen &amp;&amp;</div><div class='add'>+	    to &gt;= -dlen &amp;&amp; to &lt; dlen &amp;&amp;</div><div class='add'>+	    re &gt;= -dlen &amp;&amp; re &lt; dlen)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int calc_idx(int idx, int rx_dlc)</div><div class='add'>+static inline int calc_idx(int idx, int rx_len)</div><div class='ctx'> {</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='del'>-		return rx_dlc + idx;</div><div class='add'>+		return rx_len + idx;</div><div class='ctx'> 	else</div><div class='ctx'> 		return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_xor_rel(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='add'>+static void cgw_csum_xor_rel(struct canfd_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> {</div><div class='del'>-	int from = calc_idx(xor-&gt;from_idx, cf-&gt;can_dlc);</div><div class='del'>-	int to = calc_idx(xor-&gt;to_idx, cf-&gt;can_dlc);</div><div class='del'>-	int res = calc_idx(xor-&gt;result_idx, cf-&gt;can_dlc);</div><div class='add'>+	int from = calc_idx(xor-&gt;from_idx, cf-&gt;len);</div><div class='add'>+	int to = calc_idx(xor-&gt;to_idx, cf-&gt;len);</div><div class='add'>+	int res = calc_idx(xor-&gt;result_idx, cf-&gt;len);</div><div class='ctx'> 	u8 val = xor-&gt;init_xor_val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +339,7 @@ static void cgw_csum_xor_rel(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> 	cf-&gt;data[res] = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_xor_pos(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='add'>+static void cgw_csum_xor_pos(struct canfd_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val = xor-&gt;init_xor_val;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -240,7 +350,7 @@ static void cgw_csum_xor_pos(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> 	cf-&gt;data[xor-&gt;result_idx] = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_xor_neg(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='add'>+static void cgw_csum_xor_neg(struct canfd_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val = xor-&gt;init_xor_val;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -251,11 +361,12 @@ static void cgw_csum_xor_neg(struct can_frame *cf, struct cgw_csum_xor *xor)</div><div class='ctx'> 	cf-&gt;data[xor-&gt;result_idx] = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_crc8_rel(struct can_frame *cf, struct cgw_csum_crc8 *crc8)</div><div class='add'>+static void cgw_csum_crc8_rel(struct canfd_frame *cf,</div><div class='add'>+			      struct cgw_csum_crc8 *crc8)</div><div class='ctx'> {</div><div class='del'>-	int from = calc_idx(crc8-&gt;from_idx, cf-&gt;can_dlc);</div><div class='del'>-	int to = calc_idx(crc8-&gt;to_idx, cf-&gt;can_dlc);</div><div class='del'>-	int res = calc_idx(crc8-&gt;result_idx, cf-&gt;can_dlc);</div><div class='add'>+	int from = calc_idx(crc8-&gt;from_idx, cf-&gt;len);</div><div class='add'>+	int to = calc_idx(crc8-&gt;to_idx, cf-&gt;len);</div><div class='add'>+	int res = calc_idx(crc8-&gt;result_idx, cf-&gt;len);</div><div class='ctx'> 	u8 crc = crc8-&gt;init_crc_val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -264,96 +375,103 @@ static void cgw_csum_crc8_rel(struct can_frame *cf, struct cgw_csum_crc8 *crc8)</div><div class='ctx'> </div><div class='ctx'> 	if (from &lt;= to) {</div><div class='ctx'> 		for (i = crc8-&gt;from_idx; i &lt;= crc8-&gt;to_idx; i++)</div><div class='del'>-			crc = crc8-&gt;crctab[crc^cf-&gt;data[i]];</div><div class='add'>+			crc = crc8-&gt;crctab[crc ^ cf-&gt;data[i]];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = crc8-&gt;from_idx; i &gt;= crc8-&gt;to_idx; i--)</div><div class='del'>-			crc = crc8-&gt;crctab[crc^cf-&gt;data[i]];</div><div class='add'>+			crc = crc8-&gt;crctab[crc ^ cf-&gt;data[i]];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (crc8-&gt;profile) {</div><div class='del'>-</div><div class='ctx'> 	case CGW_CRC8PRF_1U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[0]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[0]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case  CGW_CRC8PRF_16U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CGW_CRC8PRF_SFFID_XOR:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^(cf-&gt;can_id &amp; 0xFF)^</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ (cf-&gt;can_id &amp; 0xFF) ^</div><div class='ctx'> 				   (cf-&gt;can_id &gt;&gt; 8 &amp; 0xFF)];</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;data[crc8-&gt;result_idx] = crc^crc8-&gt;final_xor_val;</div><div class='add'>+	cf-&gt;data[crc8-&gt;result_idx] = crc ^ crc8-&gt;final_xor_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_crc8_pos(struct can_frame *cf, struct cgw_csum_crc8 *crc8)</div><div class='add'>+static void cgw_csum_crc8_pos(struct canfd_frame *cf,</div><div class='add'>+			      struct cgw_csum_crc8 *crc8)</div><div class='ctx'> {</div><div class='ctx'> 	u8 crc = crc8-&gt;init_crc_val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = crc8-&gt;from_idx; i &lt;= crc8-&gt;to_idx; i++)</div><div class='del'>-		crc = crc8-&gt;crctab[crc^cf-&gt;data[i]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ cf-&gt;data[i]];</div><div class='ctx'> </div><div class='ctx'> 	switch (crc8-&gt;profile) {</div><div class='del'>-</div><div class='ctx'> 	case CGW_CRC8PRF_1U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[0]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[0]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case  CGW_CRC8PRF_16U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CGW_CRC8PRF_SFFID_XOR:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^(cf-&gt;can_id &amp; 0xFF)^</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ (cf-&gt;can_id &amp; 0xFF) ^</div><div class='ctx'> 				   (cf-&gt;can_id &gt;&gt; 8 &amp; 0xFF)];</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;data[crc8-&gt;result_idx] = crc^crc8-&gt;final_xor_val;</div><div class='add'>+	cf-&gt;data[crc8-&gt;result_idx] = crc ^ crc8-&gt;final_xor_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cgw_csum_crc8_neg(struct can_frame *cf, struct cgw_csum_crc8 *crc8)</div><div class='add'>+static void cgw_csum_crc8_neg(struct canfd_frame *cf,</div><div class='add'>+			      struct cgw_csum_crc8 *crc8)</div><div class='ctx'> {</div><div class='ctx'> 	u8 crc = crc8-&gt;init_crc_val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = crc8-&gt;from_idx; i &gt;= crc8-&gt;to_idx; i--)</div><div class='del'>-		crc = crc8-&gt;crctab[crc^cf-&gt;data[i]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ cf-&gt;data[i]];</div><div class='ctx'> </div><div class='ctx'> 	switch (crc8-&gt;profile) {</div><div class='del'>-</div><div class='ctx'> 	case CGW_CRC8PRF_1U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[0]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[0]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case  CGW_CRC8PRF_16U8:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ crc8-&gt;profile_data[cf-&gt;data[1] &amp; 0xF]];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CGW_CRC8PRF_SFFID_XOR:</div><div class='del'>-		crc = crc8-&gt;crctab[crc^(cf-&gt;can_id &amp; 0xFF)^</div><div class='add'>+		crc = crc8-&gt;crctab[crc ^ (cf-&gt;can_id &amp; 0xFF) ^</div><div class='ctx'> 				   (cf-&gt;can_id &gt;&gt; 8 &amp; 0xFF)];</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;data[crc8-&gt;result_idx] = crc^crc8-&gt;final_xor_val;</div><div class='add'>+	cf-&gt;data[crc8-&gt;result_idx] = crc ^ crc8-&gt;final_xor_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* the receive &amp; process &amp; send function */</div><div class='ctx'> static void can_can_gw_rcv(struct sk_buff *skb, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cgw_job *gwj = (struct cgw_job *)data;</div><div class='del'>-	struct can_frame *cf;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='add'>+	struct cf_mod *mod;</div><div class='ctx'> 	int modidx = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Do not handle CAN frames routed more than 'max_hops' times.</div><div class='add'>+	/* process strictly Classic CAN or CAN FD frames */</div><div class='add'>+	if (gwj-&gt;flags &amp; CGW_FLAGS_CAN_FD) {</div><div class='add'>+		if (!can_is_canfd_skb(skb))</div><div class='add'>+			return;</div><div class='add'>+	} else {</div><div class='add'>+		if (!can_is_can_skb(skb))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not handle CAN frames routed more than 'max_hops' times.</div><div class='ctx'> 	 * In general we should never catch this delimiter which is intended</div><div class='ctx'> 	 * to cover a misconfiguration protection (e.g. circular CAN routes).</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -384,13 +502,13 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data)</div><div class='ctx'> 	    can_skb_prv(skb)-&gt;ifindex == gwj-&gt;dst.dev-&gt;ifindex)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * clone the given skb, which has not been done in can_rcv()</div><div class='add'>+	/* clone the given skb, which has not been done in can_rcv()</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * When there is at least one modification function activated,</div><div class='ctx'> 	 * we need to copy the skb as we want to modify skb-&gt;data.</div><div class='ctx'> 	 */</div><div class='del'>-	if (gwj-&gt;mod.modfunc[0])</div><div class='add'>+	mod = rcu_dereference(gwj-&gt;cf_mod);</div><div class='add'>+	if (mod-&gt;modfunc[0])</div><div class='ctx'> 		nskb = skb_copy(skb, GFP_ATOMIC);</div><div class='ctx'> 	else</div><div class='ctx'> 		nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='hunk'>@@ -410,19 +528,31 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data)</div><div class='ctx'> 	nskb-&gt;dev = gwj-&gt;dst.dev;</div><div class='ctx'> </div><div class='ctx'> 	/* pointer to modifiable CAN frame */</div><div class='del'>-	cf = (struct can_frame *)nskb-&gt;data;</div><div class='add'>+	cf = (struct canfd_frame *)nskb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* perform preprocessed modification functions if there are any */</div><div class='del'>-	while (modidx &lt; MAX_MODFUNCTIONS &amp;&amp; gwj-&gt;mod.modfunc[modidx])</div><div class='del'>-		(*gwj-&gt;mod.modfunc[modidx++])(cf, &amp;gwj-&gt;mod);</div><div class='add'>+	while (modidx &lt; MAX_MODFUNCTIONS &amp;&amp; mod-&gt;modfunc[modidx])</div><div class='add'>+		(*mod-&gt;modfunc[modidx++])(cf, mod);</div><div class='ctx'> </div><div class='del'>-	/* check for checksum updates when the CAN frame has been modified */</div><div class='add'>+	/* Has the CAN frame been modified? */</div><div class='ctx'> 	if (modidx) {</div><div class='del'>-		if (gwj-&gt;mod.csumfunc.crc8)</div><div class='del'>-			(*gwj-&gt;mod.csumfunc.crc8)(cf, &amp;gwj-&gt;mod.csum.crc8);</div><div class='add'>+		/* get available space for the processed CAN frame type */</div><div class='add'>+		int max_len = nskb-&gt;len - offsetof(struct canfd_frame, data);</div><div class='add'>+</div><div class='add'>+		/* dlc may have changed, make sure it fits to the CAN frame */</div><div class='add'>+		if (cf-&gt;len &gt; max_len) {</div><div class='add'>+			/* delete frame due to misconfiguration */</div><div class='add'>+			gwj-&gt;deleted_frames++;</div><div class='add'>+			kfree_skb(nskb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check for checksum updates */</div><div class='add'>+		if (mod-&gt;csumfunc.crc8)</div><div class='add'>+			(*mod-&gt;csumfunc.crc8)(cf, &amp;mod-&gt;csum.crc8);</div><div class='ctx'> </div><div class='del'>-		if (gwj-&gt;mod.csumfunc.xor)</div><div class='del'>-			(*gwj-&gt;mod.csumfunc.xor)(cf, &amp;gwj-&gt;mod.csum.xor);</div><div class='add'>+		if (mod-&gt;csumfunc.xor)</div><div class='add'>+			(*mod-&gt;csumfunc.xor)(cf, &amp;mod-&gt;csum.xor);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear the skb timestamp if not configured the other way */</div><div class='hunk'>@@ -449,6 +579,24 @@ static inline void cgw_unregister_filter(struct net *net, struct cgw_job *gwj)</div><div class='ctx'> 			  gwj-&gt;ccgw.filter.can_mask, can_can_gw_rcv, gwj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cgw_job_free_rcu(struct rcu_head *rcu_head)</div><div class='add'>+{</div><div class='add'>+	struct cgw_job *gwj = container_of(rcu_head, struct cgw_job, rcu);</div><div class='add'>+</div><div class='add'>+	/* cgw_job::cf_mod is always accessed from the same cgw_job object within</div><div class='add'>+	 * the same RCU read section. Once cgw_job is scheduled for removal,</div><div class='add'>+	 * cf_mod can also be removed without mandating an additional grace period.</div><div class='add'>+	 */</div><div class='add'>+	kfree(rcu_access_pointer(gwj-&gt;cf_mod));</div><div class='add'>+	kmem_cache_free(cgw_cache, gwj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return cgw_job::cf_mod with RTNL protected section */</div><div class='add'>+static struct cf_mod *cgw_job_cf_mod(struct cgw_job *gwj)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference_protected(gwj-&gt;cf_mod, rtnl_is_locked());</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cgw_notifier(struct notifier_block *nb,</div><div class='ctx'> 			unsigned long msg, void *ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -459,18 +607,16 @@ static int cgw_notifier(struct notifier_block *nb,</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='ctx'> 	if (msg == NETDEV_UNREGISTER) {</div><div class='del'>-</div><div class='ctx'> 		struct cgw_job *gwj = NULL;</div><div class='ctx'> 		struct hlist_node *nx;</div><div class='ctx'> </div><div class='ctx'> 		ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 		hlist_for_each_entry_safe(gwj, nx, &amp;net-&gt;can.cgw_list, list) {</div><div class='del'>-</div><div class='ctx'> 			if (gwj-&gt;src.dev == dev || gwj-&gt;dst.dev == dev) {</div><div class='ctx'> 				hlist_del(&amp;gwj-&gt;list);</div><div class='ctx'> 				cgw_unregister_filter(net, gwj);</div><div class='del'>-				kmem_cache_free(cgw_cache, gwj);</div><div class='add'>+				call_rcu(&amp;gwj-&gt;rcu, cgw_job_free_rcu);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -481,9 +627,9 @@ static int cgw_notifier(struct notifier_block *nb,</div><div class='ctx'> static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj, int type,</div><div class='ctx'> 		       u32 pid, u32 seq, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct cgw_frame_mod mb;</div><div class='ctx'> 	struct rtcanmsg *rtcan;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='add'>+	struct cf_mod *mod;</div><div class='ctx'> </div><div class='ctx'> 	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*rtcan), flags);</div><div class='ctx'> 	if (!nlh)</div><div class='hunk'>@@ -518,53 +664,87 @@ static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj, int type,</div><div class='ctx'> 			goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.modtype.and) {</div><div class='del'>-		memcpy(&amp;mb.cf, &amp;gwj-&gt;mod.modframe.and, sizeof(mb.cf));</div><div class='del'>-		mb.modtype = gwj-&gt;mod.modtype.and;</div><div class='del'>-		if (nla_put(skb, CGW_MOD_AND, sizeof(mb), &amp;mb) &lt; 0)</div><div class='del'>-			goto cancel;</div><div class='del'>-	}</div><div class='add'>+	mod = cgw_job_cf_mod(gwj);</div><div class='add'>+	if (gwj-&gt;flags &amp; CGW_FLAGS_CAN_FD) {</div><div class='add'>+		struct cgw_fdframe_mod mb;</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.modtype.or) {</div><div class='del'>-		memcpy(&amp;mb.cf, &amp;gwj-&gt;mod.modframe.or, sizeof(mb.cf));</div><div class='del'>-		mb.modtype = gwj-&gt;mod.modtype.or;</div><div class='del'>-		if (nla_put(skb, CGW_MOD_OR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='del'>-			goto cancel;</div><div class='del'>-	}</div><div class='add'>+		if (mod-&gt;modtype.and) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.and, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.and;</div><div class='add'>+			if (nla_put(skb, CGW_FDMOD_AND, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.modtype.xor) {</div><div class='del'>-		memcpy(&amp;mb.cf, &amp;gwj-&gt;mod.modframe.xor, sizeof(mb.cf));</div><div class='del'>-		mb.modtype = gwj-&gt;mod.modtype.xor;</div><div class='del'>-		if (nla_put(skb, CGW_MOD_XOR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='del'>-			goto cancel;</div><div class='del'>-	}</div><div class='add'>+		if (mod-&gt;modtype.or) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.or, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.or;</div><div class='add'>+			if (nla_put(skb, CGW_FDMOD_OR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.modtype.set) {</div><div class='del'>-		memcpy(&amp;mb.cf, &amp;gwj-&gt;mod.modframe.set, sizeof(mb.cf));</div><div class='del'>-		mb.modtype = gwj-&gt;mod.modtype.set;</div><div class='del'>-		if (nla_put(skb, CGW_MOD_SET, sizeof(mb), &amp;mb) &lt; 0)</div><div class='del'>-			goto cancel;</div><div class='add'>+		if (mod-&gt;modtype.xor) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.xor, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.xor;</div><div class='add'>+			if (nla_put(skb, CGW_FDMOD_XOR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mod-&gt;modtype.set) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.set, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.set;</div><div class='add'>+			if (nla_put(skb, CGW_FDMOD_SET, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct cgw_frame_mod mb;</div><div class='add'>+</div><div class='add'>+		if (mod-&gt;modtype.and) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.and, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.and;</div><div class='add'>+			if (nla_put(skb, CGW_MOD_AND, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mod-&gt;modtype.or) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.or, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.or;</div><div class='add'>+			if (nla_put(skb, CGW_MOD_OR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mod-&gt;modtype.xor) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.xor, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.xor;</div><div class='add'>+			if (nla_put(skb, CGW_MOD_XOR, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mod-&gt;modtype.set) {</div><div class='add'>+			memcpy(&amp;mb.cf, &amp;mod-&gt;modframe.set, sizeof(mb.cf));</div><div class='add'>+			mb.modtype = mod-&gt;modtype.set;</div><div class='add'>+			if (nla_put(skb, CGW_MOD_SET, sizeof(mb), &amp;mb) &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.uid) {</div><div class='del'>-		if (nla_put_u32(skb, CGW_MOD_UID, gwj-&gt;mod.uid) &lt; 0)</div><div class='add'>+	if (mod-&gt;uid) {</div><div class='add'>+		if (nla_put_u32(skb, CGW_MOD_UID, mod-&gt;uid) &lt; 0)</div><div class='ctx'> 			goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.csumfunc.crc8) {</div><div class='add'>+	if (mod-&gt;csumfunc.crc8) {</div><div class='ctx'> 		if (nla_put(skb, CGW_CS_CRC8, CGW_CS_CRC8_LEN,</div><div class='del'>-			    &amp;gwj-&gt;mod.csum.crc8) &lt; 0)</div><div class='add'>+			    &amp;mod-&gt;csum.crc8) &lt; 0)</div><div class='ctx'> 			goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gwj-&gt;mod.csumfunc.xor) {</div><div class='add'>+	if (mod-&gt;csumfunc.xor) {</div><div class='ctx'> 		if (nla_put(skb, CGW_CS_XOR, CGW_CS_XOR_LEN,</div><div class='del'>-			    &amp;gwj-&gt;mod.csum.xor) &lt; 0)</div><div class='add'>+			    &amp;mod-&gt;csum.xor) &lt; 0)</div><div class='ctx'> 			goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (gwj-&gt;gwtype == CGW_TYPE_CAN_CAN) {</div><div class='del'>-</div><div class='ctx'> 		if (gwj-&gt;ccgw.filter.can_id || gwj-&gt;ccgw.filter.can_mask) {</div><div class='ctx'> 			if (nla_put(skb, CGW_FILTER, sizeof(struct can_filter),</div><div class='ctx'> 				    &amp;gwj-&gt;ccgw.filter) &lt; 0)</div><div class='hunk'>@@ -599,8 +779,9 @@ static int cgw_dump_jobs(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 		if (idx &lt; s_idx)</div><div class='ctx'> 			goto cont;</div><div class='ctx'> </div><div class='del'>-		if (cgw_put_job(skb, gwj, RTM_NEWROUTE, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-		    cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI) &lt; 0)</div><div class='add'>+		if (cgw_put_job(skb, gwj, RTM_NEWROUTE,</div><div class='add'>+				NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+				cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI) &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> cont:</div><div class='ctx'> 		idx++;</div><div class='hunk'>@@ -612,7 +793,7 @@ cont:</div><div class='ctx'> 	return skb-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy cgw_policy[CGW_MAX+1] = {</div><div class='add'>+static const struct nla_policy cgw_policy[CGW_MAX + 1] = {</div><div class='ctx'> 	[CGW_MOD_AND]	= { .len = sizeof(struct cgw_frame_mod) },</div><div class='ctx'> 	[CGW_MOD_OR]	= { .len = sizeof(struct cgw_frame_mod) },</div><div class='ctx'> 	[CGW_MOD_XOR]	= { .len = sizeof(struct cgw_frame_mod) },</div><div class='hunk'>@@ -624,22 +805,26 @@ static const struct nla_policy cgw_policy[CGW_MAX+1] = {</div><div class='ctx'> 	[CGW_FILTER]	= { .len = sizeof(struct can_filter) },</div><div class='ctx'> 	[CGW_LIM_HOPS]	= { .type = NLA_U8 },</div><div class='ctx'> 	[CGW_MOD_UID]	= { .type = NLA_U32 },</div><div class='add'>+	[CGW_FDMOD_AND]	= { .len = sizeof(struct cgw_fdframe_mod) },</div><div class='add'>+	[CGW_FDMOD_OR]	= { .len = sizeof(struct cgw_fdframe_mod) },</div><div class='add'>+	[CGW_FDMOD_XOR]	= { .len = sizeof(struct cgw_fdframe_mod) },</div><div class='add'>+	[CGW_FDMOD_SET]	= { .len = sizeof(struct cgw_fdframe_mod) },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* check for common and gwtype specific attributes */</div><div class='ctx'> static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,</div><div class='ctx'> 			  u8 gwtype, void *gwtypeattr, u8 *limhops)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr *tb[CGW_MAX+1];</div><div class='del'>-	struct cgw_frame_mod mb;</div><div class='add'>+	struct nlattr *tb[CGW_MAX + 1];</div><div class='add'>+	struct rtcanmsg *r = nlmsg_data(nlh);</div><div class='ctx'> 	int modidx = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize modification &amp; checksum data space */</div><div class='ctx'> 	memset(mod, 0, sizeof(*mod));</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(struct rtcanmsg), tb, CGW_MAX,</div><div class='del'>-			  cgw_policy, NULL);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(struct rtcanmsg), tb,</div><div class='add'>+				     CGW_MAX, cgw_policy, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -651,87 +836,166 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for AND/OR/XOR/SET modifications */</div><div class='add'>+	if (r-&gt;flags &amp; CGW_FLAGS_CAN_FD) {</div><div class='add'>+		struct cgw_fdframe_mod mb;</div><div class='ctx'> </div><div class='del'>-	if (tb[CGW_MOD_AND]) {</div><div class='del'>-		nla_memcpy(&amp;mb, tb[CGW_MOD_AND], CGW_MODATTR_LEN);</div><div class='add'>+		if (tb[CGW_FDMOD_AND]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_FDMOD_AND], CGW_FDMODATTR_LEN);</div><div class='ctx'> </div><div class='del'>-		canframecpy(&amp;mod-&gt;modframe.and, &amp;mb.cf);</div><div class='del'>-		mod-&gt;modtype.and = mb.modtype;</div><div class='add'>+			canfdframecpy(&amp;mod-&gt;modframe.and, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.and = mb.modtype;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_ID)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_and_id;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_id;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_and_dlc;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_LEN)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_len;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_and_data;</div><div class='del'>-	}</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_FLAGS)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_flags;</div><div class='ctx'> </div><div class='del'>-	if (tb[CGW_MOD_OR]) {</div><div class='del'>-		nla_memcpy(&amp;mb, tb[CGW_MOD_OR], CGW_MODATTR_LEN);</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_fddata;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		canframecpy(&amp;mod-&gt;modframe.or, &amp;mb.cf);</div><div class='del'>-		mod-&gt;modtype.or = mb.modtype;</div><div class='add'>+		if (tb[CGW_FDMOD_OR]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_FDMOD_OR], CGW_FDMODATTR_LEN);</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_ID)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_or_id;</div><div class='add'>+			canfdframecpy(&amp;mod-&gt;modframe.or, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.or = mb.modtype;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_or_dlc;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_id;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_or_data;</div><div class='del'>-	}</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_LEN)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_len;</div><div class='ctx'> </div><div class='del'>-	if (tb[CGW_MOD_XOR]) {</div><div class='del'>-		nla_memcpy(&amp;mb, tb[CGW_MOD_XOR], CGW_MODATTR_LEN);</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_FLAGS)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_flags;</div><div class='ctx'> </div><div class='del'>-		canframecpy(&amp;mod-&gt;modframe.xor, &amp;mb.cf);</div><div class='del'>-		mod-&gt;modtype.xor = mb.modtype;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_fddata;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_ID)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_xor_id;</div><div class='add'>+		if (tb[CGW_FDMOD_XOR]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_FDMOD_XOR], CGW_FDMODATTR_LEN);</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_xor_dlc;</div><div class='add'>+			canfdframecpy(&amp;mod-&gt;modframe.xor, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.xor = mb.modtype;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_xor_data;</div><div class='del'>-	}</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_id;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_LEN)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_len;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_FLAGS)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_flags;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_fddata;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tb[CGW_FDMOD_SET]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_FDMOD_SET], CGW_FDMODATTR_LEN);</div><div class='add'>+</div><div class='add'>+			canfdframecpy(&amp;mod-&gt;modframe.set, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.set = mb.modtype;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_id;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_LEN)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_len;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_FLAGS)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_flags;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_fddata;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct cgw_frame_mod mb;</div><div class='add'>+</div><div class='add'>+		if (tb[CGW_MOD_AND]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_MOD_AND], CGW_MODATTR_LEN);</div><div class='add'>+</div><div class='add'>+			canframecpy(&amp;mod-&gt;modframe.and, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.and = mb.modtype;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_id;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_ccdlc;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_and_data;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tb[CGW_MOD_OR]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_MOD_OR], CGW_MODATTR_LEN);</div><div class='add'>+</div><div class='add'>+			canframecpy(&amp;mod-&gt;modframe.or, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.or = mb.modtype;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_id;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_ccdlc;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_or_data;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tb[CGW_MOD_XOR]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_MOD_XOR], CGW_MODATTR_LEN);</div><div class='add'>+</div><div class='add'>+			canframecpy(&amp;mod-&gt;modframe.xor, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.xor = mb.modtype;</div><div class='ctx'> </div><div class='del'>-	if (tb[CGW_MOD_SET]) {</div><div class='del'>-		nla_memcpy(&amp;mb, tb[CGW_MOD_SET], CGW_MODATTR_LEN);</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_id;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_ccdlc;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_xor_data;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		canframecpy(&amp;mod-&gt;modframe.set, &amp;mb.cf);</div><div class='del'>-		mod-&gt;modtype.set = mb.modtype;</div><div class='add'>+		if (tb[CGW_MOD_SET]) {</div><div class='add'>+			nla_memcpy(&amp;mb, tb[CGW_MOD_SET], CGW_MODATTR_LEN);</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_ID)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_set_id;</div><div class='add'>+			canframecpy(&amp;mod-&gt;modframe.set, &amp;mb.cf);</div><div class='add'>+			mod-&gt;modtype.set = mb.modtype;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_set_dlc;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_ID)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_id;</div><div class='ctx'> </div><div class='del'>-		if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='del'>-			mod-&gt;modfunc[modidx++] = mod_set_data;</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DLC)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_ccdlc;</div><div class='add'>+</div><div class='add'>+			if (mb.modtype &amp; CGW_MOD_DATA)</div><div class='add'>+				mod-&gt;modfunc[modidx++] = mod_set_data;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for checksum operations after CAN frame modifications */</div><div class='ctx'> 	if (modidx) {</div><div class='del'>-</div><div class='ctx'> 		if (tb[CGW_CS_CRC8]) {</div><div class='ctx'> 			struct cgw_csum_crc8 *c = nla_data(tb[CGW_CS_CRC8]);</div><div class='ctx'> </div><div class='ctx'> 			err = cgw_chk_csum_parms(c-&gt;from_idx, c-&gt;to_idx,</div><div class='del'>-						 c-&gt;result_idx);</div><div class='add'>+						 c-&gt;result_idx, r);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			nla_memcpy(&amp;mod-&gt;csum.crc8, tb[CGW_CS_CRC8],</div><div class='ctx'> 				   CGW_CS_CRC8_LEN);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * select dedicated processing function to reduce</div><div class='add'>+			/* select dedicated processing function to reduce</div><div class='ctx'> 			 * runtime operations in receive hot path.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (c-&gt;from_idx &lt; 0 || c-&gt;to_idx &lt; 0 ||</div><div class='hunk'>@@ -747,15 +1011,14 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,</div><div class='ctx'> 			struct cgw_csum_xor *c = nla_data(tb[CGW_CS_XOR]);</div><div class='ctx'> </div><div class='ctx'> 			err = cgw_chk_csum_parms(c-&gt;from_idx, c-&gt;to_idx,</div><div class='del'>-						 c-&gt;result_idx);</div><div class='add'>+						 c-&gt;result_idx, r);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			nla_memcpy(&amp;mod-&gt;csum.xor, tb[CGW_CS_XOR],</div><div class='ctx'> 				   CGW_CS_XOR_LEN);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * select dedicated processing function to reduce</div><div class='add'>+			/* select dedicated processing function to reduce</div><div class='ctx'> 			 * runtime operations in receive hot path.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (c-&gt;from_idx &lt; 0 || c-&gt;to_idx &lt; 0 ||</div><div class='hunk'>@@ -767,16 +1030,14 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,</div><div class='ctx'> 				mod-&gt;csumfunc.xor = cgw_csum_xor_neg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (tb[CGW_MOD_UID]) {</div><div class='add'>+		if (tb[CGW_MOD_UID])</div><div class='ctx'> 			nla_memcpy(&amp;mod-&gt;uid, tb[CGW_MOD_UID], sizeof(u32));</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (gwtype == CGW_TYPE_CAN_CAN) {</div><div class='del'>-</div><div class='ctx'> 		/* check CGW_TYPE_CAN_CAN specific attributes */</div><div class='del'>-</div><div class='ctx'> 		struct can_can_gw *ccgw = (struct can_can_gw *)gwtypeattr;</div><div class='add'>+</div><div class='ctx'> 		memset(ccgw, 0, sizeof(*ccgw));</div><div class='ctx'> </div><div class='ctx'> 		/* check for can_filter in attributes */</div><div class='hunk'>@@ -813,7 +1074,7 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct rtcanmsg *r;</div><div class='ctx'> 	struct cgw_job *gwj;</div><div class='del'>-	struct cf_mod mod;</div><div class='add'>+	struct cf_mod *mod;</div><div class='ctx'> 	struct can_can_gw ccgw;</div><div class='ctx'> 	u8 limhops = 0;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -832,39 +1093,48 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,</div><div class='ctx'> 	if (r-&gt;gwtype != CGW_TYPE_CAN_CAN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = cgw_parse_attr(nlh, &amp;mod, CGW_TYPE_CAN_CAN, &amp;ccgw, &amp;limhops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	mod = kmalloc(sizeof(*mod), GFP_KERNEL);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (mod.uid) {</div><div class='add'>+	err = cgw_parse_attr(nlh, mod, CGW_TYPE_CAN_CAN, &amp;ccgw, &amp;limhops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free_cf;</div><div class='ctx'> </div><div class='add'>+	if (mod-&gt;uid) {</div><div class='ctx'> 		ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 		/* check for updating an existing job with identical uid */</div><div class='ctx'> 		hlist_for_each_entry(gwj, &amp;net-&gt;can.cgw_list, list) {</div><div class='add'>+			struct cf_mod *old_cf;</div><div class='ctx'> </div><div class='del'>-			if (gwj-&gt;mod.uid != mod.uid)</div><div class='add'>+			old_cf = cgw_job_cf_mod(gwj);</div><div class='add'>+			if (old_cf-&gt;uid != mod-&gt;uid)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			/* interfaces &amp; filters must be identical */</div><div class='del'>-			if (memcmp(&amp;gwj-&gt;ccgw, &amp;ccgw, sizeof(ccgw)))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+			if (memcmp(&amp;gwj-&gt;ccgw, &amp;ccgw, sizeof(ccgw))) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto out_free_cf;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			/* update modifications with disabled softirq &amp; quit */</div><div class='del'>-			local_bh_disable();</div><div class='del'>-			memcpy(&amp;gwj-&gt;mod, &amp;mod, sizeof(mod));</div><div class='del'>-			local_bh_enable();</div><div class='add'>+			rcu_assign_pointer(gwj-&gt;cf_mod, mod);</div><div class='add'>+			kfree_rcu_mightsleep(old_cf);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ifindex == 0 is not allowed for job creation */</div><div class='del'>-	if (!ccgw.src_idx || !ccgw.dst_idx)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!ccgw.src_idx || !ccgw.dst_idx) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_free_cf;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gwj = kmem_cache_alloc(cgw_cache, GFP_KERNEL);</div><div class='del'>-	if (!gwj)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!gwj) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_free_cf;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gwj-&gt;handled_frames = 0;</div><div class='ctx'> 	gwj-&gt;dropped_frames = 0;</div><div class='hunk'>@@ -874,7 +1144,7 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,</div><div class='ctx'> 	gwj-&gt;limit_hops = limhops;</div><div class='ctx'> </div><div class='ctx'> 	/* insert already parsed information */</div><div class='del'>-	memcpy(&amp;gwj-&gt;mod, &amp;mod, sizeof(mod));</div><div class='add'>+	RCU_INIT_POINTER(gwj-&gt;cf_mod, mod);</div><div class='ctx'> 	memcpy(&amp;gwj-&gt;ccgw, &amp;ccgw, sizeof(ccgw));</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='hunk'>@@ -895,15 +1165,24 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,</div><div class='ctx'> 	if (gwj-&gt;dst.dev-&gt;type != ARPHRD_CAN)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* is sending the skb back to the incoming interface intended? */</div><div class='add'>+	if (gwj-&gt;src.dev == gwj-&gt;dst.dev &amp;&amp;</div><div class='add'>+	    !(gwj-&gt;flags &amp; CGW_FLAGS_CAN_IIF_TX_OK)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	err = cgw_register_filter(net, gwj);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		hlist_add_head_rcu(&amp;gwj-&gt;list, &amp;net-&gt;can.cgw_list);</div><div class='ctx'> out:</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kmem_cache_free(cgw_cache, gwj);</div><div class='del'>-</div><div class='add'>+out_free_cf:</div><div class='add'>+		kfree(mod);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -917,7 +1196,7 @@ static void cgw_remove_all_jobs(struct net *net)</div><div class='ctx'> 	hlist_for_each_entry_safe(gwj, nx, &amp;net-&gt;can.cgw_list, list) {</div><div class='ctx'> 		hlist_del(&amp;gwj-&gt;list);</div><div class='ctx'> 		cgw_unregister_filter(net, gwj);</div><div class='del'>-		kmem_cache_free(cgw_cache, gwj);</div><div class='add'>+		call_rcu(&amp;gwj-&gt;rcu, cgw_job_free_rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -963,6 +1242,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	/* remove only the first matching entry */</div><div class='ctx'> 	hlist_for_each_entry_safe(gwj, nx, &amp;net-&gt;can.cgw_list, list) {</div><div class='add'>+		struct cf_mod *cf_mod;</div><div class='ctx'> </div><div class='ctx'> 		if (gwj-&gt;flags != r-&gt;flags)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -970,13 +1250,14 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		if (gwj-&gt;limit_hops != limhops)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		cf_mod = cgw_job_cf_mod(gwj);</div><div class='ctx'> 		/* we have a match when uid is enabled and identical */</div><div class='del'>-		if (gwj-&gt;mod.uid || mod.uid) {</div><div class='del'>-			if (gwj-&gt;mod.uid != mod.uid)</div><div class='add'>+		if (cf_mod-&gt;uid || mod.uid) {</div><div class='add'>+			if (cf_mod-&gt;uid != mod.uid)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* no uid =&gt; check for identical modifications */</div><div class='del'>-			if (memcmp(&amp;gwj-&gt;mod, &amp;mod, sizeof(mod)))</div><div class='add'>+			if (memcmp(cf_mod, &amp;mod, sizeof(mod)))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -986,7 +1267,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 		hlist_del(&amp;gwj-&gt;list);</div><div class='ctx'> 		cgw_unregister_filter(net, gwj);</div><div class='del'>-		kmem_cache_free(cgw_cache, gwj);</div><div class='add'>+		call_rcu(&amp;gwj-&gt;rcu, cgw_job_free_rcu);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1000,16 +1281,28 @@ static int __net_init cangw_pernet_init(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit cangw_pernet_exit(struct net *net)</div><div class='add'>+static void __net_exit cangw_pernet_exit_batch(struct list_head *net_list)</div><div class='ctx'> {</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	cgw_remove_all_jobs(net);</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list)</div><div class='add'>+		cgw_remove_all_jobs(net);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations cangw_pernet_ops = {</div><div class='ctx'> 	.init = cangw_pernet_init,</div><div class='del'>-	.exit = cangw_pernet_exit,</div><div class='add'>+	.exit_batch = cangw_pernet_exit_batch,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler cgw_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_CAN, .msgtype = RTM_NEWROUTE,</div><div class='add'>+	 .doit = cgw_create_job},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_CAN, .msgtype = RTM_DELROUTE,</div><div class='add'>+	 .doit = cgw_remove_job},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_CAN, .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .dumpit = cgw_dump_jobs},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int cgw_module_init(void)</div><div class='hunk'>@@ -1019,35 +1312,38 @@ static __init int cgw_module_init(void)</div><div class='ctx'> 	/* sanitize given module parameter */</div><div class='ctx'> 	max_hops = clamp_t(unsigned int, max_hops, CGW_MIN_HOPS, CGW_MAX_HOPS);</div><div class='ctx'> </div><div class='del'>-	pr_info("can: netlink gateway (rev " CAN_GW_VERSION ") max_hops=%d\n",</div><div class='del'>-		max_hops);</div><div class='add'>+	pr_info("can: netlink gateway - max_hops=%d\n",	max_hops);</div><div class='add'>+</div><div class='add'>+	ret = register_pernet_subsys(&amp;cangw_pernet_ops);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	register_pernet_subsys(&amp;cangw_pernet_ops);</div><div class='add'>+	ret = -ENOMEM;</div><div class='ctx'> 	cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),</div><div class='ctx'> 				      0, 0, NULL);</div><div class='del'>-</div><div class='ctx'> 	if (!cgw_cache)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto out_cache_create;</div><div class='ctx'> </div><div class='ctx'> 	/* set notifier */</div><div class='ctx'> 	notifier.notifier_call = cgw_notifier;</div><div class='del'>-	register_netdevice_notifier(&amp;notifier);</div><div class='del'>-</div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_CAN, RTM_GETROUTE,</div><div class='del'>-				   NULL, cgw_dump_jobs, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_netdevice_notifier(&amp;notifier);</div><div class='del'>-		kmem_cache_destroy(cgw_cache);</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	}</div><div class='add'>+	ret = register_netdevice_notifier(&amp;notifier);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_register_notifier;</div><div class='ctx'> </div><div class='del'>-	/* Only the first call to rtnl_register_module can fail */</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_CAN, RTM_NEWROUTE,</div><div class='del'>-			     cgw_create_job, NULL, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_CAN, RTM_DELROUTE,</div><div class='del'>-			     cgw_remove_job, NULL, 0);</div><div class='add'>+	ret = rtnl_register_many(cgw_rtnl_msg_handlers);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_rtnl_register;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_rtnl_register:</div><div class='add'>+	unregister_netdevice_notifier(&amp;notifier);</div><div class='add'>+out_register_notifier:</div><div class='add'>+	kmem_cache_destroy(cgw_cache);</div><div class='add'>+out_cache_create:</div><div class='add'>+	unregister_pernet_subsys(&amp;cangw_pernet_ops);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __exit void cgw_module_exit(void)</div><div class='head'>diff --git a/net/can/isotp.c b/net/can/isotp.c<br/>new file mode 100644<br/>index 000000000000..ce588b85665a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/isotp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/isotp.c</a></div><div class='hunk'>@@ -0,0 +1,1739 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='add'>+/* isotp.c - ISO 15765-2 CAN transport protocol for protocol family CAN</div><div class='add'>+ *</div><div class='add'>+ * This implementation does not provide ISO-TP specific return values to the</div><div class='add'>+ * userspace.</div><div class='add'>+ *</div><div class='add'>+ * - RX path timeout of data reception leads to -ETIMEDOUT</div><div class='add'>+ * - RX path SN mismatch leads to -EILSEQ</div><div class='add'>+ * - RX path data reception with wrong padding leads to -EBADMSG</div><div class='add'>+ * - TX path flowcontrol reception timeout leads to -ECOMM</div><div class='add'>+ * - TX path flowcontrol reception overflow leads to -EMSGSIZE</div><div class='add'>+ * - TX path flowcontrol reception with wrong layout/padding leads to -EBADMSG</div><div class='add'>+ * - when a transfer (tx) is on the run the next write() blocks until it's done</div><div class='add'>+ * - use CAN_ISOTP_WAIT_TX_DONE flag to block the caller until the PDU is sent</div><div class='add'>+ * - as we have static buffers the check whether the PDU fits into the buffer</div><div class='add'>+ *   is done at FF reception time (no support for sending 'wait frames')</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2020 Volkswagen Group Electronic Research</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *    documentation and/or other materials provided with the distribution.</div><div class='add'>+ * 3. Neither the name of Volkswagen nor the names of its contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, provided that this notice is retained in full, this</div><div class='add'>+ * software may be distributed under the terms of the GNU General</div><div class='add'>+ * Public License ("GPL") version 2, in which case the provisions of the</div><div class='add'>+ * GPL apply INSTEAD OF those given above.</div><div class='add'>+ *</div><div class='add'>+ * The provided data structures and external interfaces from this code</div><div class='add'>+ * are not restricted to be used by modules with a GPL compatible license.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+#include &lt;linux/can/isotp.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("PF_CAN ISO 15765-2 transport protocol");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_AUTHOR("Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;");</div><div class='add'>+MODULE_ALIAS("can-proto-6");</div><div class='add'>+</div><div class='add'>+#define ISOTP_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_addr.tp)</div><div class='add'>+</div><div class='add'>+#define SINGLE_MASK(id) (((id) &amp; CAN_EFF_FLAG) ? \</div><div class='add'>+			 (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \</div><div class='add'>+			 (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))</div><div class='add'>+</div><div class='add'>+/* Since ISO 15765-2:2016 the CAN isotp protocol supports more than 4095</div><div class='add'>+ * byte per ISO PDU as the FF_DL can take full 32 bit values (4 Gbyte).</div><div class='add'>+ * We would need some good concept to handle this between user space and</div><div class='add'>+ * kernel space. For now set the static buffer to something about 8 kbyte</div><div class='add'>+ * to be able to test this new functionality.</div><div class='add'>+ */</div><div class='add'>+#define DEFAULT_MAX_PDU_SIZE 8300</div><div class='add'>+</div><div class='add'>+/* maximum PDU size before ISO 15765-2:2016 extension was 4095 */</div><div class='add'>+#define MAX_12BIT_PDU_SIZE 4095</div><div class='add'>+</div><div class='add'>+/* limit the isotp pdu size from the optional module parameter to 1MByte */</div><div class='add'>+#define MAX_PDU_SIZE (1025 * 1024U)</div><div class='add'>+</div><div class='add'>+static unsigned int max_pdu_size __read_mostly = DEFAULT_MAX_PDU_SIZE;</div><div class='add'>+module_param(max_pdu_size, uint, 0444);</div><div class='add'>+MODULE_PARM_DESC(max_pdu_size, "maximum isotp pdu size (default "</div><div class='add'>+		 __stringify(DEFAULT_MAX_PDU_SIZE) ")");</div><div class='add'>+</div><div class='add'>+/* N_PCI type values in bits 7-4 of N_PCI bytes */</div><div class='add'>+#define N_PCI_SF 0x00	/* single frame */</div><div class='add'>+#define N_PCI_FF 0x10	/* first frame */</div><div class='add'>+#define N_PCI_CF 0x20	/* consecutive frame */</div><div class='add'>+#define N_PCI_FC 0x30	/* flow control */</div><div class='add'>+</div><div class='add'>+#define N_PCI_SZ 1	/* size of the PCI byte #1 */</div><div class='add'>+#define SF_PCI_SZ4 1	/* size of SingleFrame PCI including 4 bit SF_DL */</div><div class='add'>+#define SF_PCI_SZ8 2	/* size of SingleFrame PCI including 8 bit SF_DL */</div><div class='add'>+#define FF_PCI_SZ12 2	/* size of FirstFrame PCI including 12 bit FF_DL */</div><div class='add'>+#define FF_PCI_SZ32 6	/* size of FirstFrame PCI including 32 bit FF_DL */</div><div class='add'>+#define FC_CONTENT_SZ 3	/* flow control content size in byte (FS/BS/STmin) */</div><div class='add'>+</div><div class='add'>+#define ISOTP_CHECK_PADDING (CAN_ISOTP_CHK_PAD_LEN | CAN_ISOTP_CHK_PAD_DATA)</div><div class='add'>+#define ISOTP_ALL_BC_FLAGS (CAN_ISOTP_SF_BROADCAST | CAN_ISOTP_CF_BROADCAST)</div><div class='add'>+</div><div class='add'>+/* Flow Status given in FC frame */</div><div class='add'>+#define ISOTP_FC_CTS 0		/* clear to send */</div><div class='add'>+#define ISOTP_FC_WT 1		/* wait */</div><div class='add'>+#define ISOTP_FC_OVFLW 2	/* overflow */</div><div class='add'>+</div><div class='add'>+#define ISOTP_FC_TIMEOUT 1	/* 1 sec */</div><div class='add'>+#define ISOTP_ECHO_TIMEOUT 2	/* 2 secs */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ISOTP_IDLE = 0,</div><div class='add'>+	ISOTP_WAIT_FIRST_FC,</div><div class='add'>+	ISOTP_WAIT_FC,</div><div class='add'>+	ISOTP_WAIT_DATA,</div><div class='add'>+	ISOTP_SENDING,</div><div class='add'>+	ISOTP_SHUTDOWN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tpcon {</div><div class='add'>+	u8 *buf;</div><div class='add'>+	unsigned int buflen;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	u32 state;</div><div class='add'>+	u8 bs;</div><div class='add'>+	u8 sn;</div><div class='add'>+	u8 ll_dl;</div><div class='add'>+	u8 sbuf[DEFAULT_MAX_PDU_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isotp_sock {</div><div class='add'>+	struct sock sk;</div><div class='add'>+	int bound;</div><div class='add'>+	int ifindex;</div><div class='add'>+	canid_t txid;</div><div class='add'>+	canid_t rxid;</div><div class='add'>+	ktime_t tx_gap;</div><div class='add'>+	ktime_t lastrxcf_tstamp;</div><div class='add'>+	struct hrtimer rxtimer, txtimer, txfrtimer;</div><div class='add'>+	struct can_isotp_options opt;</div><div class='add'>+	struct can_isotp_fc_options rxfc, txfc;</div><div class='add'>+	struct can_isotp_ll_options ll;</div><div class='add'>+	u32 frame_txtime;</div><div class='add'>+	u32 force_tx_stmin;</div><div class='add'>+	u32 force_rx_stmin;</div><div class='add'>+	u32 cfecho; /* consecutive frame echo tag */</div><div class='add'>+	struct tpcon rx, tx;</div><div class='add'>+	struct list_head notifier;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	spinlock_t rx_lock; /* protect single thread state machine */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(isotp_notifier_list);</div><div class='add'>+static DEFINE_SPINLOCK(isotp_notifier_lock);</div><div class='add'>+static struct isotp_sock *isotp_busy_notifier;</div><div class='add'>+</div><div class='add'>+static inline struct isotp_sock *isotp_sk(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return (struct isotp_sock *)sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 isotp_bc_flags(struct isotp_sock *so)</div><div class='add'>+{</div><div class='add'>+	return so-&gt;opt.flags &amp; ISOTP_ALL_BC_FLAGS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool isotp_register_rxid(struct isotp_sock *so)</div><div class='add'>+{</div><div class='add'>+	/* no broadcast modes =&gt; register rx_id for FC frame reception */</div><div class='add'>+	return (isotp_bc_flags(so) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart isotp_rx_timer_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = container_of(hrtimer, struct isotp_sock,</div><div class='add'>+					     rxtimer);</div><div class='add'>+	struct sock *sk = &amp;so-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.state == ISOTP_WAIT_DATA) {</div><div class='add'>+		/* we did not get new data frames in time */</div><div class='add'>+</div><div class='add'>+		/* report 'connection timed out' */</div><div class='add'>+		sk-&gt;sk_err = ETIMEDOUT;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+		/* reset rx state */</div><div class='add'>+		so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct canfd_frame *ncf;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	int can_send_ret;</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(so-&gt;ll.mtu + sizeof(struct can_skb_priv), gfp_any());</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(sock_net(sk), so-&gt;ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		kfree_skb(nskb);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_skb_reserve(nskb);</div><div class='add'>+	can_skb_prv(nskb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(nskb)-&gt;skbcnt = 0;</div><div class='add'>+</div><div class='add'>+	nskb-&gt;dev = dev;</div><div class='add'>+	can_skb_set_owner(nskb, sk);</div><div class='add'>+	ncf = (struct canfd_frame *)nskb-&gt;data;</div><div class='add'>+	skb_put_zero(nskb, so-&gt;ll.mtu);</div><div class='add'>+</div><div class='add'>+	/* create &amp; send flow control reply */</div><div class='add'>+	ncf-&gt;can_id = so-&gt;txid;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_TX_PADDING) {</div><div class='add'>+		memset(ncf-&gt;data, so-&gt;opt.txpad_content, CAN_MAX_DLEN);</div><div class='add'>+		ncf-&gt;len = CAN_MAX_DLEN;</div><div class='add'>+	} else {</div><div class='add'>+		ncf-&gt;len = ae + FC_CONTENT_SZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ncf-&gt;data[ae] = N_PCI_FC | flowstatus;</div><div class='add'>+	ncf-&gt;data[ae + 1] = so-&gt;rxfc.bs;</div><div class='add'>+	ncf-&gt;data[ae + 2] = so-&gt;rxfc.stmin;</div><div class='add'>+</div><div class='add'>+	if (ae)</div><div class='add'>+		ncf-&gt;data[0] = so-&gt;opt.ext_address;</div><div class='add'>+</div><div class='add'>+	ncf-&gt;flags = so-&gt;ll.tx_flags;</div><div class='add'>+</div><div class='add'>+	can_send_ret = can_send(nskb, 1);</div><div class='add'>+	if (can_send_ret)</div><div class='add'>+		pr_notice_once("can-isotp: %s: can_send_ret %pe\n",</div><div class='add'>+			       __func__, ERR_PTR(can_send_ret));</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+</div><div class='add'>+	/* reset blocksize counter */</div><div class='add'>+	so-&gt;rx.bs = 0;</div><div class='add'>+</div><div class='add'>+	/* reset last CF frame rx timestamp for rx stmin enforcement */</div><div class='add'>+	so-&gt;lastrxcf_tstamp = ktime_set(0, 0);</div><div class='add'>+</div><div class='add'>+	/* start rx timeout watchdog */</div><div class='add'>+	hrtimer_start(&amp;so-&gt;rxtimer, ktime_set(ISOTP_FC_TIMEOUT, 0),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_rcv_skb(struct sk_buff *skb, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)skb-&gt;cb;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(skb-&gt;cb) &lt; sizeof(struct sockaddr_can));</div><div class='add'>+</div><div class='add'>+	memset(addr, 0, sizeof(*addr));</div><div class='add'>+	addr-&gt;can_family = AF_CAN;</div><div class='add'>+	addr-&gt;can_ifindex = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (sock_queue_rcv_skb_reason(sk, skb, &amp;reason) &lt; 0)</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 padlen(u8 datalen)</div><div class='add'>+{</div><div class='add'>+	static const u8 plen[] = {</div><div class='add'>+		8, 8, 8, 8, 8, 8, 8, 8, 8,	/* 0 - 8 */</div><div class='add'>+		12, 12, 12, 12,			/* 9 - 12 */</div><div class='add'>+		16, 16, 16, 16,			/* 13 - 16 */</div><div class='add'>+		20, 20, 20, 20,			/* 17 - 20 */</div><div class='add'>+		24, 24, 24, 24,			/* 21 - 24 */</div><div class='add'>+		32, 32, 32, 32, 32, 32, 32, 32,	/* 25 - 32 */</div><div class='add'>+		48, 48, 48, 48, 48, 48, 48, 48,	/* 33 - 40 */</div><div class='add'>+		48, 48, 48, 48, 48, 48, 48, 48	/* 41 - 48 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (datalen &gt; 48)</div><div class='add'>+		return 64;</div><div class='add'>+</div><div class='add'>+	return plen[datalen];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check for length optimization and return 1/true when the check fails */</div><div class='add'>+static int check_optimized(struct canfd_frame *cf, int start_index)</div><div class='add'>+{</div><div class='add'>+	/* for CAN_DL &lt;= 8 the start_index is equal to the CAN_DL as the</div><div class='add'>+	 * padding would start at this point. E.g. if the padding would</div><div class='add'>+	 * start at cf.data[7] cf-&gt;len has to be 7 to be optimal.</div><div class='add'>+	 * Note: The data[] index starts with zero.</div><div class='add'>+	 */</div><div class='add'>+	if (cf-&gt;len &lt;= CAN_MAX_DLEN)</div><div class='add'>+		return (cf-&gt;len != start_index);</div><div class='add'>+</div><div class='add'>+	/* This relation is also valid in the non-linear DLC range, where</div><div class='add'>+	 * we need to take care of the minimal next possible CAN_DL.</div><div class='add'>+	 * The correct check would be (padlen(cf-&gt;len) != padlen(start_index)).</div><div class='add'>+	 * But as cf-&gt;len can only take discrete values from 12, .., 64 at this</div><div class='add'>+	 * point the padlen(cf-&gt;len) is always equal to cf-&gt;len.</div><div class='add'>+	 */</div><div class='add'>+	return (cf-&gt;len != padlen(start_index));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check padding and return 1/true when the check fails */</div><div class='add'>+static int check_pad(struct isotp_sock *so, struct canfd_frame *cf,</div><div class='add'>+		     int start_index, u8 content)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* no RX_PADDING value =&gt; check length of optimized frame length */</div><div class='add'>+	if (!(so-&gt;opt.flags &amp; CAN_ISOTP_RX_PADDING)) {</div><div class='add'>+		if (so-&gt;opt.flags &amp; CAN_ISOTP_CHK_PAD_LEN)</div><div class='add'>+			return check_optimized(cf, start_index);</div><div class='add'>+</div><div class='add'>+		/* no valid test against empty value =&gt; ignore frame */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check datalength of correctly padded CAN frame */</div><div class='add'>+	if ((so-&gt;opt.flags &amp; CAN_ISOTP_CHK_PAD_LEN) &amp;&amp;</div><div class='add'>+	    cf-&gt;len != padlen(cf-&gt;len))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* check padding content */</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_CHK_PAD_DATA) {</div><div class='add'>+		for (i = start_index; i &lt; cf-&gt;len; i++)</div><div class='add'>+			if (cf-&gt;data[i] != content)</div><div class='add'>+				return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_send_cframe(struct isotp_sock *so);</div><div class='add'>+</div><div class='add'>+static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = &amp;so-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;tx.state != ISOTP_WAIT_FC &amp;&amp;</div><div class='add'>+	    so-&gt;tx.state != ISOTP_WAIT_FIRST_FC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txtimer);</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;len &lt; ae + FC_CONTENT_SZ) ||</div><div class='add'>+	    ((so-&gt;opt.flags &amp; ISOTP_CHECK_PADDING) &amp;&amp;</div><div class='add'>+	     check_pad(so, cf, ae + FC_CONTENT_SZ, so-&gt;opt.rxpad_content))) {</div><div class='add'>+		/* malformed PDU - report 'not a data message' */</div><div class='add'>+		sk-&gt;sk_err = EBADMSG;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+		so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+		wake_up_interruptible(&amp;so-&gt;wait);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get static/dynamic communication params from first/every FC frame */</div><div class='add'>+	if (so-&gt;tx.state == ISOTP_WAIT_FIRST_FC ||</div><div class='add'>+	    so-&gt;opt.flags &amp; CAN_ISOTP_DYN_FC_PARMS) {</div><div class='add'>+		so-&gt;txfc.bs = cf-&gt;data[ae + 1];</div><div class='add'>+		so-&gt;txfc.stmin = cf-&gt;data[ae + 2];</div><div class='add'>+</div><div class='add'>+		/* fix wrong STmin values according spec */</div><div class='add'>+		if (so-&gt;txfc.stmin &gt; 0x7F &amp;&amp;</div><div class='add'>+		    (so-&gt;txfc.stmin &lt; 0xF1 || so-&gt;txfc.stmin &gt; 0xF9))</div><div class='add'>+			so-&gt;txfc.stmin = 0x7F;</div><div class='add'>+</div><div class='add'>+		so-&gt;tx_gap = ktime_set(0, 0);</div><div class='add'>+		/* add transmission time for CAN frame N_As */</div><div class='add'>+		so-&gt;tx_gap = ktime_add_ns(so-&gt;tx_gap, so-&gt;frame_txtime);</div><div class='add'>+		/* add waiting time for consecutive frames N_Cs */</div><div class='add'>+		if (so-&gt;opt.flags &amp; CAN_ISOTP_FORCE_TXSTMIN)</div><div class='add'>+			so-&gt;tx_gap = ktime_add_ns(so-&gt;tx_gap,</div><div class='add'>+						  so-&gt;force_tx_stmin);</div><div class='add'>+		else if (so-&gt;txfc.stmin &lt; 0x80)</div><div class='add'>+			so-&gt;tx_gap = ktime_add_ns(so-&gt;tx_gap,</div><div class='add'>+						  so-&gt;txfc.stmin * 1000000);</div><div class='add'>+		else</div><div class='add'>+			so-&gt;tx_gap = ktime_add_ns(so-&gt;tx_gap,</div><div class='add'>+						  (so-&gt;txfc.stmin - 0xF0)</div><div class='add'>+						  * 100000);</div><div class='add'>+		so-&gt;tx.state = ISOTP_WAIT_FC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cf-&gt;data[ae] &amp; 0x0F) {</div><div class='add'>+	case ISOTP_FC_CTS:</div><div class='add'>+		so-&gt;tx.bs = 0;</div><div class='add'>+		so-&gt;tx.state = ISOTP_SENDING;</div><div class='add'>+		/* send CF frame and enable echo timeout handling */</div><div class='add'>+		hrtimer_start(&amp;so-&gt;txtimer, ktime_set(ISOTP_ECHO_TIMEOUT, 0),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		isotp_send_cframe(so);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ISOTP_FC_WT:</div><div class='add'>+		/* start timer to wait for next FC frame */</div><div class='add'>+		hrtimer_start(&amp;so-&gt;txtimer, ktime_set(ISOTP_FC_TIMEOUT, 0),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ISOTP_FC_OVFLW:</div><div class='add'>+		/* overflow on receiver side - report 'message too long' */</div><div class='add'>+		sk-&gt;sk_err = EMSGSIZE;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* stop this tx job */</div><div class='add'>+		so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+		wake_up_interruptible(&amp;so-&gt;wait);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_rcv_sf(struct sock *sk, struct canfd_frame *cf, int pcilen,</div><div class='add'>+			struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;rxtimer);</div><div class='add'>+	so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+</div><div class='add'>+	if (!len || len &gt; cf-&gt;len - pcilen)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if ((so-&gt;opt.flags &amp; ISOTP_CHECK_PADDING) &amp;&amp;</div><div class='add'>+	    check_pad(so, cf, pcilen + len, so-&gt;opt.rxpad_content)) {</div><div class='add'>+		/* malformed PDU - report 'not a data message' */</div><div class='add'>+		sk-&gt;sk_err = EBADMSG;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(len, gfp_any());</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(nskb, len), &amp;cf-&gt;data[pcilen], len);</div><div class='add'>+</div><div class='add'>+	nskb-&gt;tstamp = skb-&gt;tstamp;</div><div class='add'>+	nskb-&gt;dev = skb-&gt;dev;</div><div class='add'>+	isotp_rcv_skb(nskb, sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_rcv_ff(struct sock *sk, struct canfd_frame *cf, int ae)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	int i;</div><div class='add'>+	int off;</div><div class='add'>+	int ff_pci_sz;</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;rxtimer);</div><div class='add'>+	so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+</div><div class='add'>+	/* get the used sender LL_DL from the (first) CAN frame data length */</div><div class='add'>+	so-&gt;rx.ll_dl = padlen(cf-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* the first frame has to use the entire frame up to LL_DL length */</div><div class='add'>+	if (cf-&gt;len != so-&gt;rx.ll_dl)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* get the FF_DL */</div><div class='add'>+	so-&gt;rx.len = (cf-&gt;data[ae] &amp; 0x0F) &lt;&lt; 8;</div><div class='add'>+	so-&gt;rx.len += cf-&gt;data[ae + 1];</div><div class='add'>+</div><div class='add'>+	/* Check for FF_DL escape sequence supporting 32 bit PDU length */</div><div class='add'>+	if (so-&gt;rx.len) {</div><div class='add'>+		ff_pci_sz = FF_PCI_SZ12;</div><div class='add'>+	} else {</div><div class='add'>+		/* FF_DL = 0 =&gt; get real length from next 4 bytes */</div><div class='add'>+		so-&gt;rx.len = cf-&gt;data[ae + 2] &lt;&lt; 24;</div><div class='add'>+		so-&gt;rx.len += cf-&gt;data[ae + 3] &lt;&lt; 16;</div><div class='add'>+		so-&gt;rx.len += cf-&gt;data[ae + 4] &lt;&lt; 8;</div><div class='add'>+		so-&gt;rx.len += cf-&gt;data[ae + 5];</div><div class='add'>+		ff_pci_sz = FF_PCI_SZ32;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* take care of a potential SF_DL ESC offset for TX_DL &gt; 8 */</div><div class='add'>+	off = (so-&gt;rx.ll_dl &gt; CAN_MAX_DLEN) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.len + ae + off + ff_pci_sz &lt; so-&gt;rx.ll_dl)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* PDU size &gt; default =&gt; try max_pdu_size */</div><div class='add'>+	if (so-&gt;rx.len &gt; so-&gt;rx.buflen &amp;&amp; so-&gt;rx.buflen &lt; max_pdu_size) {</div><div class='add'>+		u8 *newbuf = kmalloc(max_pdu_size, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (newbuf) {</div><div class='add'>+			so-&gt;rx.buf = newbuf;</div><div class='add'>+			so-&gt;rx.buflen = max_pdu_size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.len &gt; so-&gt;rx.buflen) {</div><div class='add'>+		/* send FC frame with overflow status */</div><div class='add'>+		isotp_send_fc(sk, ae, ISOTP_FC_OVFLW);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy the first received data bytes */</div><div class='add'>+	so-&gt;rx.idx = 0;</div><div class='add'>+	for (i = ae + ff_pci_sz; i &lt; so-&gt;rx.ll_dl; i++)</div><div class='add'>+		so-&gt;rx.buf[so-&gt;rx.idx++] = cf-&gt;data[i];</div><div class='add'>+</div><div class='add'>+	/* initial setup for this pdu reception */</div><div class='add'>+	so-&gt;rx.sn = 1;</div><div class='add'>+	so-&gt;rx.state = ISOTP_WAIT_DATA;</div><div class='add'>+</div><div class='add'>+	/* no creation of flow control frames */</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_LISTEN_MODE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* send our first FC frame */</div><div class='add'>+	isotp_send_fc(sk, ae, ISOTP_FC_CTS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_rcv_cf(struct sock *sk, struct canfd_frame *cf, int ae,</div><div class='add'>+			struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.state != ISOTP_WAIT_DATA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* drop if timestamp gap is less than force_rx_stmin nano secs */</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_FORCE_RXSTMIN) {</div><div class='add'>+		if (ktime_to_ns(ktime_sub(skb-&gt;tstamp, so-&gt;lastrxcf_tstamp)) &lt;</div><div class='add'>+		    so-&gt;force_rx_stmin)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		so-&gt;lastrxcf_tstamp = skb-&gt;tstamp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;rxtimer);</div><div class='add'>+</div><div class='add'>+	/* CFs are never longer than the FF */</div><div class='add'>+	if (cf-&gt;len &gt; so-&gt;rx.ll_dl)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* CFs have usually the LL_DL length */</div><div class='add'>+	if (cf-&gt;len &lt; so-&gt;rx.ll_dl) {</div><div class='add'>+		/* this is only allowed for the last CF */</div><div class='add'>+		if (so-&gt;rx.len - so-&gt;rx.idx &gt; so-&gt;rx.ll_dl - ae - N_PCI_SZ)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cf-&gt;data[ae] &amp; 0x0F) != so-&gt;rx.sn) {</div><div class='add'>+		/* wrong sn detected - report 'illegal byte sequence' */</div><div class='add'>+		sk-&gt;sk_err = EILSEQ;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+		/* reset rx state */</div><div class='add'>+		so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	so-&gt;rx.sn++;</div><div class='add'>+	so-&gt;rx.sn %= 16;</div><div class='add'>+</div><div class='add'>+	for (i = ae + N_PCI_SZ; i &lt; cf-&gt;len; i++) {</div><div class='add'>+		so-&gt;rx.buf[so-&gt;rx.idx++] = cf-&gt;data[i];</div><div class='add'>+		if (so-&gt;rx.idx &gt;= so-&gt;rx.len)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.idx &gt;= so-&gt;rx.len) {</div><div class='add'>+		/* we are done */</div><div class='add'>+		so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+</div><div class='add'>+		if ((so-&gt;opt.flags &amp; ISOTP_CHECK_PADDING) &amp;&amp;</div><div class='add'>+		    check_pad(so, cf, i + 1, so-&gt;opt.rxpad_content)) {</div><div class='add'>+			/* malformed PDU - report 'not a data message' */</div><div class='add'>+			sk-&gt;sk_err = EBADMSG;</div><div class='add'>+			if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+				sk_error_report(sk);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nskb = alloc_skb(so-&gt;rx.len, gfp_any());</div><div class='add'>+		if (!nskb)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		memcpy(skb_put(nskb, so-&gt;rx.len), so-&gt;rx.buf,</div><div class='add'>+		       so-&gt;rx.len);</div><div class='add'>+</div><div class='add'>+		nskb-&gt;tstamp = skb-&gt;tstamp;</div><div class='add'>+		nskb-&gt;dev = skb-&gt;dev;</div><div class='add'>+		isotp_rcv_skb(nskb, sk);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* perform blocksize handling, if enabled */</div><div class='add'>+	if (!so-&gt;rxfc.bs || ++so-&gt;rx.bs &lt; so-&gt;rxfc.bs) {</div><div class='add'>+		/* start rx timeout watchdog */</div><div class='add'>+		hrtimer_start(&amp;so-&gt;rxtimer, ktime_set(ISOTP_FC_TIMEOUT, 0),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no creation of flow control frames */</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_LISTEN_MODE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* we reached the specified blocksize so-&gt;rxfc.bs */</div><div class='add'>+	isotp_send_fc(sk, ae, ISOTP_FC_CTS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_rcv(struct sk_buff *skb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)data;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	int ae = (so-&gt;opt.flags &amp; CAN_ISOTP_EXTEND_ADDR) ? 1 : 0;</div><div class='add'>+	u8 n_pci_type, sf_dl;</div><div class='add'>+</div><div class='add'>+	/* Strictly receive only frames with the configured MTU size</div><div class='add'>+	 * =&gt; clear separation of CAN2.0 / CAN FD transport channels</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len != so-&gt;ll.mtu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* if enabled: check reception of my configured extended address */</div><div class='add'>+	if (ae &amp;&amp; cf-&gt;data[0] != so-&gt;opt.rx_ext_address)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	n_pci_type = cf-&gt;data[ae] &amp; 0xF0;</div><div class='add'>+</div><div class='add'>+	/* Make sure the state changes and data structures stay consistent at</div><div class='add'>+	 * CAN frame reception time. This locking is not needed in real world</div><div class='add'>+	 * use cases but the inconsistency can be triggered with syzkaller.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;so-&gt;rx_lock);</div><div class='add'>+</div><div class='add'>+	if (so-&gt;opt.flags &amp; CAN_ISOTP_HALF_DUPLEX) {</div><div class='add'>+		/* check rx/tx path half duplex expectations */</div><div class='add'>+		if ((so-&gt;tx.state != ISOTP_IDLE &amp;&amp; n_pci_type != N_PCI_FC) ||</div><div class='add'>+		    (so-&gt;rx.state != ISOTP_IDLE &amp;&amp; n_pci_type == N_PCI_FC))</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (n_pci_type) {</div><div class='add'>+	case N_PCI_FC:</div><div class='add'>+		/* tx path: flow control frame containing the FC parameters */</div><div class='add'>+		isotp_rcv_fc(so, cf, ae);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case N_PCI_SF:</div><div class='add'>+		/* rx path: single frame</div><div class='add'>+		 *</div><div class='add'>+		 * As we do not have a rx.ll_dl configuration, we can only test</div><div class='add'>+		 * if the CAN frames payload length matches the LL_DL == 8</div><div class='add'>+		 * requirements - no matter if it's CAN 2.0 or CAN FD</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* get the SF_DL from the N_PCI byte */</div><div class='add'>+		sf_dl = cf-&gt;data[ae] &amp; 0x0F;</div><div class='add'>+</div><div class='add'>+		if (cf-&gt;len &lt;= CAN_MAX_DLEN) {</div><div class='add'>+			isotp_rcv_sf(sk, cf, SF_PCI_SZ4 + ae, skb, sf_dl);</div><div class='add'>+		} else {</div><div class='add'>+			if (can_is_canfd_skb(skb)) {</div><div class='add'>+				/* We have a CAN FD frame and CAN_DL is greater than 8:</div><div class='add'>+				 * Only frames with the SF_DL == 0 ESC value are valid.</div><div class='add'>+				 *</div><div class='add'>+				 * If so take care of the increased SF PCI size</div><div class='add'>+				 * (SF_PCI_SZ8) to point to the message content behind</div><div class='add'>+				 * the extended SF PCI info and get the real SF_DL</div><div class='add'>+				 * length value from the formerly first data byte.</div><div class='add'>+				 */</div><div class='add'>+				if (sf_dl == 0)</div><div class='add'>+					isotp_rcv_sf(sk, cf, SF_PCI_SZ8 + ae, skb,</div><div class='add'>+						     cf-&gt;data[SF_PCI_SZ4 + ae]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case N_PCI_FF:</div><div class='add'>+		/* rx path: first frame */</div><div class='add'>+		isotp_rcv_ff(sk, cf, ae);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case N_PCI_CF:</div><div class='add'>+		/* rx path: consecutive frame */</div><div class='add'>+		isotp_rcv_cf(sk, cf, ae, skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;so-&gt;rx_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_fill_dataframe(struct canfd_frame *cf, struct isotp_sock *so,</div><div class='add'>+				 int ae, int off)</div><div class='add'>+{</div><div class='add'>+	int pcilen = N_PCI_SZ + ae + off;</div><div class='add'>+	int space = so-&gt;tx.ll_dl - pcilen;</div><div class='add'>+	int num = min_t(int, so-&gt;tx.len - so-&gt;tx.idx, space);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id = so-&gt;txid;</div><div class='add'>+	cf-&gt;len = num + pcilen;</div><div class='add'>+</div><div class='add'>+	if (num &lt; space) {</div><div class='add'>+		if (so-&gt;opt.flags &amp; CAN_ISOTP_TX_PADDING) {</div><div class='add'>+			/* user requested padding */</div><div class='add'>+			cf-&gt;len = padlen(cf-&gt;len);</div><div class='add'>+			memset(cf-&gt;data, so-&gt;opt.txpad_content, cf-&gt;len);</div><div class='add'>+		} else if (cf-&gt;len &gt; CAN_MAX_DLEN) {</div><div class='add'>+			/* mandatory padding for CAN FD frames */</div><div class='add'>+			cf-&gt;len = padlen(cf-&gt;len);</div><div class='add'>+			memset(cf-&gt;data, CAN_ISOTP_DEFAULT_PAD_CONTENT,</div><div class='add'>+			       cf-&gt;len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++)</div><div class='add'>+		cf-&gt;data[pcilen + i] = so-&gt;tx.buf[so-&gt;tx.idx++];</div><div class='add'>+</div><div class='add'>+	if (ae)</div><div class='add'>+		cf-&gt;data[0] = so-&gt;opt.ext_address;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_send_cframe(struct isotp_sock *so)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = &amp;so-&gt;sk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	int can_send_ret;</div><div class='add'>+	int ae = (so-&gt;opt.flags &amp; CAN_ISOTP_EXTEND_ADDR) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(sock_net(sk), so-&gt;ifindex);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(so-&gt;ll.mtu + sizeof(struct can_skb_priv), GFP_ATOMIC);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+</div><div class='add'>+	cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	skb_put_zero(skb, so-&gt;ll.mtu);</div><div class='add'>+</div><div class='add'>+	/* create consecutive frame */</div><div class='add'>+	isotp_fill_dataframe(cf, so, ae, 0);</div><div class='add'>+</div><div class='add'>+	/* place consecutive frame N_PCI in appropriate index */</div><div class='add'>+	cf-&gt;data[ae] = N_PCI_CF | so-&gt;tx.sn++;</div><div class='add'>+	so-&gt;tx.sn %= 16;</div><div class='add'>+	so-&gt;tx.bs++;</div><div class='add'>+</div><div class='add'>+	cf-&gt;flags = so-&gt;ll.tx_flags;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	can_skb_set_owner(skb, sk);</div><div class='add'>+</div><div class='add'>+	/* cfecho should have been zero'ed by init/isotp_rcv_echo() */</div><div class='add'>+	if (so-&gt;cfecho)</div><div class='add'>+		pr_notice_once("can-isotp: cfecho is %08X != 0\n", so-&gt;cfecho);</div><div class='add'>+</div><div class='add'>+	/* set consecutive frame echo tag */</div><div class='add'>+	so-&gt;cfecho = *(u32 *)cf-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* send frame with local echo enabled */</div><div class='add'>+	can_send_ret = can_send(skb, 1);</div><div class='add'>+	if (can_send_ret) {</div><div class='add'>+		pr_notice_once("can-isotp: %s: can_send_ret %pe\n",</div><div class='add'>+			       __func__, ERR_PTR(can_send_ret));</div><div class='add'>+		if (can_send_ret == -ENOBUFS)</div><div class='add'>+			pr_notice_once("can-isotp: tx queue is full\n");</div><div class='add'>+	}</div><div class='add'>+	dev_put(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_create_fframe(struct canfd_frame *cf, struct isotp_sock *so,</div><div class='add'>+				int ae)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ff_pci_sz;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id = so-&gt;txid;</div><div class='add'>+	cf-&gt;len = so-&gt;tx.ll_dl;</div><div class='add'>+	if (ae)</div><div class='add'>+		cf-&gt;data[0] = so-&gt;opt.ext_address;</div><div class='add'>+</div><div class='add'>+	/* create N_PCI bytes with 12/32 bit FF_DL data length */</div><div class='add'>+	if (so-&gt;tx.len &gt; MAX_12BIT_PDU_SIZE) {</div><div class='add'>+		/* use 32 bit FF_DL notation */</div><div class='add'>+		cf-&gt;data[ae] = N_PCI_FF;</div><div class='add'>+		cf-&gt;data[ae + 1] = 0;</div><div class='add'>+		cf-&gt;data[ae + 2] = (u8)(so-&gt;tx.len &gt;&gt; 24) &amp; 0xFFU;</div><div class='add'>+		cf-&gt;data[ae + 3] = (u8)(so-&gt;tx.len &gt;&gt; 16) &amp; 0xFFU;</div><div class='add'>+		cf-&gt;data[ae + 4] = (u8)(so-&gt;tx.len &gt;&gt; 8) &amp; 0xFFU;</div><div class='add'>+		cf-&gt;data[ae + 5] = (u8)so-&gt;tx.len &amp; 0xFFU;</div><div class='add'>+		ff_pci_sz = FF_PCI_SZ32;</div><div class='add'>+	} else {</div><div class='add'>+		/* use 12 bit FF_DL notation */</div><div class='add'>+		cf-&gt;data[ae] = (u8)(so-&gt;tx.len &gt;&gt; 8) | N_PCI_FF;</div><div class='add'>+		cf-&gt;data[ae + 1] = (u8)so-&gt;tx.len &amp; 0xFFU;</div><div class='add'>+		ff_pci_sz = FF_PCI_SZ12;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add first data bytes depending on ae */</div><div class='add'>+	for (i = ae + ff_pci_sz; i &lt; so-&gt;tx.ll_dl; i++)</div><div class='add'>+		cf-&gt;data[i] = so-&gt;tx.buf[so-&gt;tx.idx++];</div><div class='add'>+</div><div class='add'>+	so-&gt;tx.sn = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_rcv_echo(struct sk_buff *skb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)data;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* only handle my own local echo CF/SF skb's (no FF!) */</div><div class='add'>+	if (skb-&gt;sk != sk || so-&gt;cfecho != *(u32 *)cf-&gt;data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* cancel local echo timeout */</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txtimer);</div><div class='add'>+</div><div class='add'>+	/* local echo skb with consecutive frame has been consumed */</div><div class='add'>+	so-&gt;cfecho = 0;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;tx.idx &gt;= so-&gt;tx.len) {</div><div class='add'>+		/* we are done */</div><div class='add'>+		so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+		wake_up_interruptible(&amp;so-&gt;wait);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (so-&gt;txfc.bs &amp;&amp; so-&gt;tx.bs &gt;= so-&gt;txfc.bs) {</div><div class='add'>+		/* stop and wait for FC with timeout */</div><div class='add'>+		so-&gt;tx.state = ISOTP_WAIT_FC;</div><div class='add'>+		hrtimer_start(&amp;so-&gt;txtimer, ktime_set(ISOTP_FC_TIMEOUT, 0),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no gap between data frames needed =&gt; use burst mode */</div><div class='add'>+	if (!so-&gt;tx_gap) {</div><div class='add'>+		/* enable echo timeout handling */</div><div class='add'>+		hrtimer_start(&amp;so-&gt;txtimer, ktime_set(ISOTP_ECHO_TIMEOUT, 0),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+		isotp_send_cframe(so);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start timer to send next consecutive frame with correct delay */</div><div class='add'>+	hrtimer_start(&amp;so-&gt;txfrtimer, so-&gt;tx_gap, HRTIMER_MODE_REL_SOFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = container_of(hrtimer, struct isotp_sock,</div><div class='add'>+					     txtimer);</div><div class='add'>+	struct sock *sk = &amp;so-&gt;sk;</div><div class='add'>+</div><div class='add'>+	/* don't handle timeouts in IDLE or SHUTDOWN state */</div><div class='add'>+	if (so-&gt;tx.state == ISOTP_IDLE || so-&gt;tx.state == ISOTP_SHUTDOWN)</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	/* we did not get any flow control or echo frame in time */</div><div class='add'>+</div><div class='add'>+	/* report 'communication error on send' */</div><div class='add'>+	sk-&gt;sk_err = ECOMM;</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+	/* reset tx state */</div><div class='add'>+	so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+	wake_up_interruptible(&amp;so-&gt;wait);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart isotp_txfr_timer_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = container_of(hrtimer, struct isotp_sock,</div><div class='add'>+					     txfrtimer);</div><div class='add'>+</div><div class='add'>+	/* start echo timeout handling and cover below protocol error */</div><div class='add'>+	hrtimer_start(&amp;so-&gt;txtimer, ktime_set(ISOTP_ECHO_TIMEOUT, 0),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+</div><div class='add'>+	/* cfecho should be consumed by isotp_rcv_echo() here */</div><div class='add'>+	if (so-&gt;tx.state == ISOTP_SENDING &amp;&amp; !so-&gt;cfecho)</div><div class='add'>+		isotp_send_cframe(so);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	int ae = (so-&gt;opt.flags &amp; CAN_ISOTP_EXTEND_ADDR) ? 1 : 0;</div><div class='add'>+	int wait_tx_done = (so-&gt;opt.flags &amp; CAN_ISOTP_WAIT_TX_DONE) ? 1 : 0;</div><div class='add'>+	s64 hrtimer_sec = ISOTP_ECHO_TIMEOUT;</div><div class='add'>+	int off;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!so-&gt;bound || so-&gt;tx.state == ISOTP_SHUTDOWN)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	while (cmpxchg(&amp;so-&gt;tx.state, ISOTP_IDLE, ISOTP_SENDING) != ISOTP_IDLE) {</div><div class='add'>+		/* we do not support multiple buffers - for now */</div><div class='add'>+		if (msg-&gt;msg_flags &amp; MSG_DONTWAIT)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		if (so-&gt;tx.state == ISOTP_SHUTDOWN)</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+		/* wait for complete transmission of current pdu */</div><div class='add'>+		err = wait_event_interruptible(so-&gt;wait, so-&gt;tx.state == ISOTP_IDLE);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_event_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PDU size &gt; default =&gt; try max_pdu_size */</div><div class='add'>+	if (size &gt; so-&gt;tx.buflen &amp;&amp; so-&gt;tx.buflen &lt; max_pdu_size) {</div><div class='add'>+		u8 *newbuf = kmalloc(max_pdu_size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (newbuf) {</div><div class='add'>+			so-&gt;tx.buf = newbuf;</div><div class='add'>+			so-&gt;tx.buflen = max_pdu_size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!size || size &gt; so-&gt;tx.buflen) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* take care of a potential SF_DL ESC offset for TX_DL &gt; 8 */</div><div class='add'>+	off = (so-&gt;tx.ll_dl &gt; CAN_MAX_DLEN) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* does the given data fit into a single frame for SF_BROADCAST? */</div><div class='add'>+	if ((isotp_bc_flags(so) == CAN_ISOTP_SF_BROADCAST) &amp;&amp;</div><div class='add'>+	    (size &gt; so-&gt;tx.ll_dl - SF_PCI_SZ4 - ae - off)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = memcpy_from_msg(so-&gt;tx.buf, msg, size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(sock_net(sk), so-&gt;ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = sock_alloc_send_skb(sk, so-&gt;ll.mtu + sizeof(struct can_skb_priv),</div><div class='add'>+				  msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+</div><div class='add'>+	so-&gt;tx.len = size;</div><div class='add'>+	so-&gt;tx.idx = 0;</div><div class='add'>+</div><div class='add'>+	cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	skb_put_zero(skb, so-&gt;ll.mtu);</div><div class='add'>+</div><div class='add'>+	/* cfecho should have been zero'ed by init / former isotp_rcv_echo() */</div><div class='add'>+	if (so-&gt;cfecho)</div><div class='add'>+		pr_notice_once("can-isotp: uninit cfecho %08X\n", so-&gt;cfecho);</div><div class='add'>+</div><div class='add'>+	/* check for single frame transmission depending on TX_DL */</div><div class='add'>+	if (size &lt;= so-&gt;tx.ll_dl - SF_PCI_SZ4 - ae - off) {</div><div class='add'>+		/* The message size generally fits into a SingleFrame - good.</div><div class='add'>+		 *</div><div class='add'>+		 * SF_DL ESC offset optimization:</div><div class='add'>+		 *</div><div class='add'>+		 * When TX_DL is greater 8 but the message would still fit</div><div class='add'>+		 * into a 8 byte CAN frame, we can omit the offset.</div><div class='add'>+		 * This prevents a protocol caused length extension from</div><div class='add'>+		 * CAN_DL = 8 to CAN_DL = 12 due to the SF_SL ESC handling.</div><div class='add'>+		 */</div><div class='add'>+		if (size &lt;= CAN_MAX_DLEN - SF_PCI_SZ4 - ae)</div><div class='add'>+			off = 0;</div><div class='add'>+</div><div class='add'>+		isotp_fill_dataframe(cf, so, ae, off);</div><div class='add'>+</div><div class='add'>+		/* place single frame N_PCI w/o length in appropriate index */</div><div class='add'>+		cf-&gt;data[ae] = N_PCI_SF;</div><div class='add'>+</div><div class='add'>+		/* place SF_DL size value depending on the SF_DL ESC offset */</div><div class='add'>+		if (off)</div><div class='add'>+			cf-&gt;data[SF_PCI_SZ4 + ae] = size;</div><div class='add'>+		else</div><div class='add'>+			cf-&gt;data[ae] |= size;</div><div class='add'>+</div><div class='add'>+		/* set CF echo tag for isotp_rcv_echo() (SF-mode) */</div><div class='add'>+		so-&gt;cfecho = *(u32 *)cf-&gt;data;</div><div class='add'>+	} else {</div><div class='add'>+		/* send first frame */</div><div class='add'>+</div><div class='add'>+		isotp_create_fframe(cf, so, ae);</div><div class='add'>+</div><div class='add'>+		if (isotp_bc_flags(so) == CAN_ISOTP_CF_BROADCAST) {</div><div class='add'>+			/* set timer for FC-less operation (STmin = 0) */</div><div class='add'>+			if (so-&gt;opt.flags &amp; CAN_ISOTP_FORCE_TXSTMIN)</div><div class='add'>+				so-&gt;tx_gap = ktime_set(0, so-&gt;force_tx_stmin);</div><div class='add'>+			else</div><div class='add'>+				so-&gt;tx_gap = ktime_set(0, so-&gt;frame_txtime);</div><div class='add'>+</div><div class='add'>+			/* disable wait for FCs due to activated block size */</div><div class='add'>+			so-&gt;txfc.bs = 0;</div><div class='add'>+</div><div class='add'>+			/* set CF echo tag for isotp_rcv_echo() (CF-mode) */</div><div class='add'>+			so-&gt;cfecho = *(u32 *)cf-&gt;data;</div><div class='add'>+		} else {</div><div class='add'>+			/* standard flow control check */</div><div class='add'>+			so-&gt;tx.state = ISOTP_WAIT_FIRST_FC;</div><div class='add'>+</div><div class='add'>+			/* start timeout for FC */</div><div class='add'>+			hrtimer_sec = ISOTP_FC_TIMEOUT;</div><div class='add'>+</div><div class='add'>+			/* no CF echo tag for isotp_rcv_echo() (FF-mode) */</div><div class='add'>+			so-&gt;cfecho = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hrtimer_start(&amp;so-&gt;txtimer, ktime_set(hrtimer_sec, 0),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+</div><div class='add'>+	/* send the first or only CAN frame */</div><div class='add'>+	cf-&gt;flags = so-&gt;ll.tx_flags;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	skb-&gt;sk = sk;</div><div class='add'>+	err = can_send(skb, 1);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_notice_once("can-isotp: %s: can_send_ret %pe\n",</div><div class='add'>+			       __func__, ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+		/* no transmission -&gt; no timeout monitoring */</div><div class='add'>+		hrtimer_cancel(&amp;so-&gt;txtimer);</div><div class='add'>+</div><div class='add'>+		/* reset consecutive frame echo tag */</div><div class='add'>+		so-&gt;cfecho = 0;</div><div class='add'>+</div><div class='add'>+		goto err_out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wait_tx_done) {</div><div class='add'>+		/* wait for complete transmission of current pdu */</div><div class='add'>+		err = wait_event_interruptible(so-&gt;wait, so-&gt;tx.state == ISOTP_IDLE);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_event_drop;</div><div class='add'>+</div><div class='add'>+		err = sock_error(sk);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+</div><div class='add'>+err_event_drop:</div><div class='add'>+	/* got signal: force tx state machine to be idle */</div><div class='add'>+	so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txfrtimer);</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txtimer);</div><div class='add'>+err_out_drop:</div><div class='add'>+	/* drop this PDU and unlock a potential wait queue */</div><div class='add'>+	so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+	wake_up_interruptible(&amp;so-&gt;wait);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='add'>+			 int flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ~(MSG_DONTWAIT | MSG_TRUNC | MSG_PEEK | MSG_CMSG_COMPAT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!so-&gt;bound)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;ret);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (size &lt; skb-&gt;len)</div><div class='add'>+		msg-&gt;msg_flags |= MSG_TRUNC;</div><div class='add'>+	else</div><div class='add'>+		size = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	ret = memcpy_to_msg(msg, skb-&gt;data, size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_name) {</div><div class='add'>+		__sockaddr_check_size(ISOTP_MIN_NAMELEN);</div><div class='add'>+		msg-&gt;msg_namelen = ISOTP_MIN_NAMELEN;</div><div class='add'>+		memcpy(msg-&gt;msg_name, skb-&gt;cb, msg-&gt;msg_namelen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set length of return value */</div><div class='add'>+	ret = (flags &amp; MSG_TRUNC) ? skb-&gt;len : size;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	skb_free_datagram(sk, skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_release(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	so = isotp_sk(sk);</div><div class='add'>+	net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	/* wait for complete transmission of current pdu */</div><div class='add'>+	while (wait_event_interruptible(so-&gt;wait, so-&gt;tx.state == ISOTP_IDLE) == 0 &amp;&amp;</div><div class='add'>+	       cmpxchg(&amp;so-&gt;tx.state, ISOTP_IDLE, ISOTP_SHUTDOWN) != ISOTP_IDLE)</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	/* force state machines to be idle also when a signal occurred */</div><div class='add'>+	so-&gt;tx.state = ISOTP_SHUTDOWN;</div><div class='add'>+	so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;isotp_notifier_lock);</div><div class='add'>+	while (isotp_busy_notifier == so) {</div><div class='add'>+		spin_unlock(&amp;isotp_notifier_lock);</div><div class='add'>+		schedule_timeout_uninterruptible(1);</div><div class='add'>+		spin_lock(&amp;isotp_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;so-&gt;notifier);</div><div class='add'>+	spin_unlock(&amp;isotp_notifier_lock);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* remove current filters &amp; unregister */</div><div class='add'>+	if (so-&gt;bound) {</div><div class='add'>+		if (so-&gt;ifindex) {</div><div class='add'>+			struct net_device *dev;</div><div class='add'>+</div><div class='add'>+			dev = dev_get_by_index(net, so-&gt;ifindex);</div><div class='add'>+			if (dev) {</div><div class='add'>+				if (isotp_register_rxid(so))</div><div class='add'>+					can_rx_unregister(net, dev, so-&gt;rxid,</div><div class='add'>+							  SINGLE_MASK(so-&gt;rxid),</div><div class='add'>+							  isotp_rcv, sk);</div><div class='add'>+</div><div class='add'>+				can_rx_unregister(net, dev, so-&gt;txid,</div><div class='add'>+						  SINGLE_MASK(so-&gt;txid),</div><div class='add'>+						  isotp_rcv_echo, sk);</div><div class='add'>+				dev_put(dev);</div><div class='add'>+				synchronize_rcu();</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txfrtimer);</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;txtimer);</div><div class='add'>+	hrtimer_cancel(&amp;so-&gt;rxtimer);</div><div class='add'>+</div><div class='add'>+	so-&gt;ifindex = 0;</div><div class='add'>+	so-&gt;bound = 0;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;rx.buf != so-&gt;rx.sbuf)</div><div class='add'>+		kfree(so-&gt;rx.buf);</div><div class='add'>+</div><div class='add'>+	if (so-&gt;tx.buf != so-&gt;tx.sbuf)</div><div class='add'>+		kfree(so-&gt;tx.buf);</div><div class='add'>+</div><div class='add'>+	sock_orphan(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	int ifindex;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	canid_t tx_id = addr-&gt;can_addr.tp.tx_id;</div><div class='add'>+	canid_t rx_id = addr-&gt;can_addr.tp.rx_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int notify_enetdown = 0;</div><div class='add'>+</div><div class='add'>+	if (len &lt; ISOTP_MIN_NAMELEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (addr-&gt;can_family != AF_CAN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* sanitize tx CAN identifier */</div><div class='add'>+	if (tx_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		tx_id &amp;= (CAN_EFF_FLAG | CAN_EFF_MASK);</div><div class='add'>+	else</div><div class='add'>+		tx_id &amp;= CAN_SFF_MASK;</div><div class='add'>+</div><div class='add'>+	/* give feedback on wrong CAN-ID value */</div><div class='add'>+	if (tx_id != addr-&gt;can_addr.tp.tx_id)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* sanitize rx CAN identifier (if needed) */</div><div class='add'>+	if (isotp_register_rxid(so)) {</div><div class='add'>+		if (rx_id &amp; CAN_EFF_FLAG)</div><div class='add'>+			rx_id &amp;= (CAN_EFF_FLAG | CAN_EFF_MASK);</div><div class='add'>+		else</div><div class='add'>+			rx_id &amp;= CAN_SFF_MASK;</div><div class='add'>+</div><div class='add'>+		/* give feedback on wrong CAN-ID value */</div><div class='add'>+		if (rx_id != addr-&gt;can_addr.tp.rx_id)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!addr-&gt;can_ifindex)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (so-&gt;bound) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure different CAN IDs when the rx_id is to be registered */</div><div class='add'>+	if (isotp_register_rxid(so) &amp;&amp; rx_id == tx_id) {</div><div class='add'>+		err = -EADDRNOTAVAIL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(net, addr-&gt;can_ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;type != ARPHRD_CAN) {</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (READ_ONCE(dev-&gt;mtu) &lt; so-&gt;ll.mtu) {</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		notify_enetdown = 1;</div><div class='add'>+</div><div class='add'>+	ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (isotp_register_rxid(so))</div><div class='add'>+		can_rx_register(net, dev, rx_id, SINGLE_MASK(rx_id),</div><div class='add'>+				isotp_rcv, sk, "isotp", sk);</div><div class='add'>+</div><div class='add'>+	/* no consecutive frame echo skb in flight */</div><div class='add'>+	so-&gt;cfecho = 0;</div><div class='add'>+</div><div class='add'>+	/* register for echo skb's */</div><div class='add'>+	can_rx_register(net, dev, tx_id, SINGLE_MASK(tx_id),</div><div class='add'>+			isotp_rcv_echo, sk, "isotpe", sk);</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+</div><div class='add'>+	/* switch to new settings */</div><div class='add'>+	so-&gt;ifindex = ifindex;</div><div class='add'>+	so-&gt;rxid = rx_id;</div><div class='add'>+	so-&gt;txid = tx_id;</div><div class='add'>+	so-&gt;bound = 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (notify_enetdown) {</div><div class='add'>+		sk-&gt;sk_err = ENETDOWN;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_getname(struct socket *sock, struct sockaddr *uaddr, int peer)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (peer)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	memset(addr, 0, ISOTP_MIN_NAMELEN);</div><div class='add'>+	addr-&gt;can_family = AF_CAN;</div><div class='add'>+	addr-&gt;can_ifindex = so-&gt;ifindex;</div><div class='add'>+	addr-&gt;can_addr.tp.rx_id = so-&gt;rxid;</div><div class='add'>+	addr-&gt;can_addr.tp.tx_id = so-&gt;txid;</div><div class='add'>+</div><div class='add'>+	return ISOTP_MIN_NAMELEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_setsockopt_locked(struct socket *sock, int level, int optname,</div><div class='add'>+			    sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;bound)</div><div class='add'>+		return -EISCONN;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case CAN_ISOTP_OPTS:</div><div class='add'>+		if (optlen != sizeof(struct can_isotp_options))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;so-&gt;opt, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* no separate rx_ext_address is given =&gt; use ext_address */</div><div class='add'>+		if (!(so-&gt;opt.flags &amp; CAN_ISOTP_RX_EXT_ADDR))</div><div class='add'>+			so-&gt;opt.rx_ext_address = so-&gt;opt.ext_address;</div><div class='add'>+</div><div class='add'>+		/* these broadcast flags are not allowed together */</div><div class='add'>+		if (isotp_bc_flags(so) == ISOTP_ALL_BC_FLAGS) {</div><div class='add'>+			/* CAN_ISOTP_SF_BROADCAST is prioritized */</div><div class='add'>+			so-&gt;opt.flags &amp;= ~CAN_ISOTP_CF_BROADCAST;</div><div class='add'>+</div><div class='add'>+			/* give user feedback on wrong config attempt */</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check for frame_txtime changes (0 =&gt; no changes) */</div><div class='add'>+		if (so-&gt;opt.frame_txtime) {</div><div class='add'>+			if (so-&gt;opt.frame_txtime == CAN_ISOTP_FRAME_TXTIME_ZERO)</div><div class='add'>+				so-&gt;frame_txtime = 0;</div><div class='add'>+			else</div><div class='add'>+				so-&gt;frame_txtime = so-&gt;opt.frame_txtime;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_RECV_FC:</div><div class='add'>+		if (optlen != sizeof(struct can_isotp_fc_options))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;so-&gt;rxfc, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_TX_STMIN:</div><div class='add'>+		if (optlen != sizeof(u32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;so-&gt;force_tx_stmin, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_RX_STMIN:</div><div class='add'>+		if (optlen != sizeof(u32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;so-&gt;force_rx_stmin, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_LL_OPTS:</div><div class='add'>+		if (optlen == sizeof(struct can_isotp_ll_options)) {</div><div class='add'>+			struct can_isotp_ll_options ll;</div><div class='add'>+</div><div class='add'>+			if (copy_from_sockptr(&amp;ll, optval, optlen))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			/* check for correct ISO 11898-1 DLC data length */</div><div class='add'>+			if (ll.tx_dl != padlen(ll.tx_dl))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			if (ll.mtu != CAN_MTU &amp;&amp; ll.mtu != CANFD_MTU)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			if (ll.mtu == CAN_MTU &amp;&amp;</div><div class='add'>+			    (ll.tx_dl &gt; CAN_MAX_DLEN || ll.tx_flags != 0))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;so-&gt;ll, &amp;ll, sizeof(ll));</div><div class='add'>+</div><div class='add'>+			/* set ll_dl for tx path to similar place as for rx */</div><div class='add'>+			so-&gt;tx.ll_dl = ll.tx_dl;</div><div class='add'>+		} else {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOPROTOOPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			    sockptr_t optval, unsigned int optlen)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (level != SOL_CAN_ISOTP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	ret = isotp_setsockopt_locked(sock, level, optname, optval, optlen);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_getsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			    char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+	int len;</div><div class='add'>+	void *val;</div><div class='add'>+</div><div class='add'>+	if (level != SOL_CAN_ISOTP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (get_user(len, optlen))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (len &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case CAN_ISOTP_OPTS:</div><div class='add'>+		len = min_t(int, len, sizeof(struct can_isotp_options));</div><div class='add'>+		val = &amp;so-&gt;opt;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_RECV_FC:</div><div class='add'>+		len = min_t(int, len, sizeof(struct can_isotp_fc_options));</div><div class='add'>+		val = &amp;so-&gt;rxfc;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_TX_STMIN:</div><div class='add'>+		len = min_t(int, len, sizeof(u32));</div><div class='add'>+		val = &amp;so-&gt;force_tx_stmin;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_RX_STMIN:</div><div class='add'>+		len = min_t(int, len, sizeof(u32));</div><div class='add'>+		val = &amp;so-&gt;force_rx_stmin;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_ISOTP_LL_OPTS:</div><div class='add'>+		len = min_t(int, len, sizeof(struct can_isotp_ll_options));</div><div class='add'>+		val = &amp;so-&gt;ll;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENOPROTOOPT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(len, optlen))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_to_user(optval, val, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isotp_notify(struct isotp_sock *so, unsigned long msg,</div><div class='add'>+			 struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = &amp;so-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (!net_eq(dev_net(dev), sock_net(sk)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (so-&gt;ifindex != dev-&gt;ifindex)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (msg) {</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+		/* remove current filters &amp; unregister */</div><div class='add'>+		if (so-&gt;bound) {</div><div class='add'>+			if (isotp_register_rxid(so))</div><div class='add'>+				can_rx_unregister(dev_net(dev), dev, so-&gt;rxid,</div><div class='add'>+						  SINGLE_MASK(so-&gt;rxid),</div><div class='add'>+						  isotp_rcv, sk);</div><div class='add'>+</div><div class='add'>+			can_rx_unregister(dev_net(dev), dev, so-&gt;txid,</div><div class='add'>+					  SINGLE_MASK(so-&gt;txid),</div><div class='add'>+					  isotp_rcv_echo, sk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		so-&gt;ifindex = 0;</div><div class='add'>+		so-&gt;bound  = 0;</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+		sk-&gt;sk_err = ENODEV;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+		sk-&gt;sk_err = ENETDOWN;</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='add'>+			  void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type != ARPHRD_CAN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (msg != NETDEV_UNREGISTER &amp;&amp; msg != NETDEV_DOWN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (unlikely(isotp_busy_notifier)) /* Check for reentrant bug. */</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;isotp_notifier_lock);</div><div class='add'>+	list_for_each_entry(isotp_busy_notifier, &amp;isotp_notifier_list, notifier) {</div><div class='add'>+		spin_unlock(&amp;isotp_notifier_lock);</div><div class='add'>+		isotp_notify(isotp_busy_notifier, msg, dev);</div><div class='add'>+		spin_lock(&amp;isotp_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	isotp_busy_notifier = NULL;</div><div class='add'>+	spin_unlock(&amp;isotp_notifier_lock);</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+</div><div class='add'>+	so-&gt;ifindex = 0;</div><div class='add'>+	so-&gt;bound = 0;</div><div class='add'>+</div><div class='add'>+	so-&gt;opt.flags = CAN_ISOTP_DEFAULT_FLAGS;</div><div class='add'>+	so-&gt;opt.ext_address = CAN_ISOTP_DEFAULT_EXT_ADDRESS;</div><div class='add'>+	so-&gt;opt.rx_ext_address = CAN_ISOTP_DEFAULT_EXT_ADDRESS;</div><div class='add'>+	so-&gt;opt.rxpad_content = CAN_ISOTP_DEFAULT_PAD_CONTENT;</div><div class='add'>+	so-&gt;opt.txpad_content = CAN_ISOTP_DEFAULT_PAD_CONTENT;</div><div class='add'>+	so-&gt;opt.frame_txtime = CAN_ISOTP_DEFAULT_FRAME_TXTIME;</div><div class='add'>+	so-&gt;frame_txtime = CAN_ISOTP_DEFAULT_FRAME_TXTIME;</div><div class='add'>+	so-&gt;rxfc.bs = CAN_ISOTP_DEFAULT_RECV_BS;</div><div class='add'>+	so-&gt;rxfc.stmin = CAN_ISOTP_DEFAULT_RECV_STMIN;</div><div class='add'>+	so-&gt;rxfc.wftmax = CAN_ISOTP_DEFAULT_RECV_WFTMAX;</div><div class='add'>+	so-&gt;ll.mtu = CAN_ISOTP_DEFAULT_LL_MTU;</div><div class='add'>+	so-&gt;ll.tx_dl = CAN_ISOTP_DEFAULT_LL_TX_DL;</div><div class='add'>+	so-&gt;ll.tx_flags = CAN_ISOTP_DEFAULT_LL_TX_FLAGS;</div><div class='add'>+</div><div class='add'>+	/* set ll_dl for tx path to similar place as for rx */</div><div class='add'>+	so-&gt;tx.ll_dl = so-&gt;ll.tx_dl;</div><div class='add'>+</div><div class='add'>+	so-&gt;rx.state = ISOTP_IDLE;</div><div class='add'>+	so-&gt;tx.state = ISOTP_IDLE;</div><div class='add'>+</div><div class='add'>+	so-&gt;rx.buf = so-&gt;rx.sbuf;</div><div class='add'>+	so-&gt;tx.buf = so-&gt;tx.sbuf;</div><div class='add'>+	so-&gt;rx.buflen = ARRAY_SIZE(so-&gt;rx.sbuf);</div><div class='add'>+	so-&gt;tx.buflen = ARRAY_SIZE(so-&gt;tx.sbuf);</div><div class='add'>+</div><div class='add'>+	hrtimer_setup(&amp;so-&gt;rxtimer, isotp_rx_timer_handler, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);</div><div class='add'>+	hrtimer_setup(&amp;so-&gt;txtimer, isotp_tx_timer_handler, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);</div><div class='add'>+	hrtimer_setup(&amp;so-&gt;txfrtimer, isotp_txfr_timer_handler, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;so-&gt;wait);</div><div class='add'>+	spin_lock_init(&amp;so-&gt;rx_lock);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;isotp_notifier_lock);</div><div class='add'>+	list_add_tail(&amp;so-&gt;notifier, &amp;isotp_notifier_list);</div><div class='add'>+	spin_unlock(&amp;isotp_notifier_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t isotp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct isotp_sock *so = isotp_sk(sk);</div><div class='add'>+</div><div class='add'>+	__poll_t mask = datagram_poll(file, sock, wait);</div><div class='add'>+	poll_wait(file, &amp;so-&gt;wait, wait);</div><div class='add'>+</div><div class='add'>+	/* Check for false positives due to TX state */</div><div class='add'>+	if ((mask &amp; EPOLLWRNORM) &amp;&amp; (so-&gt;tx.state != ISOTP_IDLE))</div><div class='add'>+		mask &amp;= ~(EPOLLOUT | EPOLLWRNORM);</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isotp_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,</div><div class='add'>+				  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	/* no ioctls for socket layer -&gt; hand it down to NIC layer */</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct proto_ops isotp_ops = {</div><div class='add'>+	.family = PF_CAN,</div><div class='add'>+	.release = isotp_release,</div><div class='add'>+	.bind = isotp_bind,</div><div class='add'>+	.connect = sock_no_connect,</div><div class='add'>+	.socketpair = sock_no_socketpair,</div><div class='add'>+	.accept = sock_no_accept,</div><div class='add'>+	.getname = isotp_getname,</div><div class='add'>+	.poll = isotp_poll,</div><div class='add'>+	.ioctl = isotp_sock_no_ioctlcmd,</div><div class='add'>+	.gettstamp = sock_gettstamp,</div><div class='add'>+	.listen = sock_no_listen,</div><div class='add'>+	.shutdown = sock_no_shutdown,</div><div class='add'>+	.setsockopt = isotp_setsockopt,</div><div class='add'>+	.getsockopt = isotp_getsockopt,</div><div class='add'>+	.sendmsg = isotp_sendmsg,</div><div class='add'>+	.recvmsg = isotp_recvmsg,</div><div class='add'>+	.mmap = sock_no_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct proto isotp_proto __read_mostly = {</div><div class='add'>+	.name = "CAN_ISOTP",</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.obj_size = sizeof(struct isotp_sock),</div><div class='add'>+	.init = isotp_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_proto isotp_can_proto = {</div><div class='add'>+	.type = SOCK_DGRAM,</div><div class='add'>+	.protocol = CAN_ISOTP,</div><div class='add'>+	.ops = &amp;isotp_ops,</div><div class='add'>+	.prot = &amp;isotp_proto,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block canisotp_notifier = {</div><div class='add'>+	.notifier_call = isotp_notifier</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int isotp_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	max_pdu_size = max_t(unsigned int, max_pdu_size, MAX_12BIT_PDU_SIZE);</div><div class='add'>+	max_pdu_size = min_t(unsigned int, max_pdu_size, MAX_PDU_SIZE);</div><div class='add'>+</div><div class='add'>+	pr_info("can: isotp protocol (max_pdu_size %d)\n", max_pdu_size);</div><div class='add'>+</div><div class='add'>+	err = can_proto_register(&amp;isotp_can_proto);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		pr_err("can: registration of isotp protocol failed %pe\n", ERR_PTR(err));</div><div class='add'>+	else</div><div class='add'>+		register_netdevice_notifier(&amp;canisotp_notifier);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void isotp_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	can_proto_unregister(&amp;isotp_can_proto);</div><div class='add'>+	unregister_netdevice_notifier(&amp;canisotp_notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(isotp_module_init);</div><div class='add'>+module_exit(isotp_module_exit);</div><div class='head'>diff --git a/net/can/j1939/Kconfig b/net/can/j1939/Kconfig<br/>new file mode 100644<br/>index 000000000000..2998298b71ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# SAE J1939 network layer core configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config CAN_J1939</div><div class='add'>+	tristate "SAE J1939"</div><div class='add'>+	depends on CAN</div><div class='add'>+	help</div><div class='add'>+	  SAE J1939</div><div class='add'>+	  Say Y to have in-kernel support for j1939 socket type. This</div><div class='add'>+	  allows communication according to SAE j1939.</div><div class='add'>+	  The relevant parts in kernel are</div><div class='add'>+	  SAE j1939-21 (datalink &amp; transport protocol)</div><div class='add'>+	  &amp; SAE j1939-81 (network management).</div><div class='head'>diff --git a/net/can/j1939/Makefile b/net/can/j1939/Makefile<br/>new file mode 100644<br/>index 000000000000..19181bdae173<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_J1939) += can-j1939.o</div><div class='add'>+</div><div class='add'>+can-j1939-objs := \</div><div class='add'>+	address-claim.o \</div><div class='add'>+	bus.o \</div><div class='add'>+	main.o \</div><div class='add'>+	socket.o \</div><div class='add'>+	transport.o</div><div class='head'>diff --git a/net/can/j1939/address-claim.c b/net/can/j1939/address-claim.c<br/>new file mode 100644<br/>index 000000000000..ca4ad6cdd5cb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/address-claim.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/address-claim.c</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Pieter Beyens &lt;pieter.beyens@eia.be&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+/* J1939 Address Claiming.</div><div class='add'>+ * Address Claiming in the kernel</div><div class='add'>+ * - keeps track of the AC states of ECU's,</div><div class='add'>+ * - resolves NAME&lt;=&gt;SA taking into account the AC states of ECU's.</div><div class='add'>+ *</div><div class='add'>+ * All Address Claim msgs (including host-originated msg) are processed</div><div class='add'>+ * at the receive path (a sent msg is always received again via CAN echo).</div><div class='add'>+ * As such, the processing of AC msgs is done in the order on which msgs</div><div class='add'>+ * are sent on the bus.</div><div class='add'>+ *</div><div class='add'>+ * This module doesn't send msgs itself (e.g. replies on Address Claims),</div><div class='add'>+ * this is the responsibility of a user space application or daemon.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include "j1939-priv.h"</div><div class='add'>+</div><div class='add'>+static inline name_t j1939_skb_to_name(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return le64_to_cpup((__le64 *)skb-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool j1939_ac_msg_is_request(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	int req_pgn;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; 3 || skcb-&gt;addr.pgn != J1939_PGN_REQUEST)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	req_pgn = skb-&gt;data[0] | (skb-&gt;data[1] &lt;&lt; 8) | (skb-&gt;data[2] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return req_pgn == J1939_PGN_ADDRESS_CLAIMED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_ac_verify_outgoing(struct j1939_priv *priv,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len != 8) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "tx address claim with dlc %i\n",</div><div class='add'>+			      skb-&gt;len);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.src_name != j1939_skb_to_name(skb)) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "tx address claim with different name\n");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.sa == J1939_NO_ADDR) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "tx address claim with broadcast sa\n");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ac must always be a broadcast */</div><div class='add'>+	if (skcb-&gt;addr.dst_name || skcb-&gt;addr.da != J1939_NO_ADDR) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "tx address claim with dest, not broadcast\n");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_ac_fixup(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 addr;</div><div class='add'>+</div><div class='add'>+	/* network mgmt: address claiming msgs */</div><div class='add'>+	if (skcb-&gt;addr.pgn == J1939_PGN_ADDRESS_CLAIMED) {</div><div class='add'>+		struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+		ret = j1939_ac_verify_outgoing(priv, skb);</div><div class='add'>+		/* return both when failure &amp; when successful */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ecu = j1939_ecu_get_by_name(priv, skcb-&gt;addr.src_name);</div><div class='add'>+		if (!ecu)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		if (ecu-&gt;addr != skcb-&gt;addr.sa)</div><div class='add'>+			/* hold further traffic for ecu, remove from parent */</div><div class='add'>+			j1939_ecu_unmap(ecu);</div><div class='add'>+		j1939_ecu_put(ecu);</div><div class='add'>+	} else if (skcb-&gt;addr.src_name) {</div><div class='add'>+		/* assign source address */</div><div class='add'>+		addr = j1939_name_to_addr(priv, skcb-&gt;addr.src_name);</div><div class='add'>+		if (!j1939_address_is_unicast(addr) &amp;&amp;</div><div class='add'>+		    !j1939_ac_msg_is_request(skb)) {</div><div class='add'>+			netdev_notice(priv-&gt;ndev, "tx drop: invalid sa for name 0x%016llx\n",</div><div class='add'>+				      skcb-&gt;addr.src_name);</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		}</div><div class='add'>+		skcb-&gt;addr.sa = addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* assign destination address */</div><div class='add'>+	if (skcb-&gt;addr.dst_name) {</div><div class='add'>+		addr = j1939_name_to_addr(priv, skcb-&gt;addr.dst_name);</div><div class='add'>+		if (!j1939_address_is_unicast(addr)) {</div><div class='add'>+			netdev_notice(priv-&gt;ndev, "tx drop: invalid da for name 0x%016llx\n",</div><div class='add'>+				      skcb-&gt;addr.dst_name);</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		}</div><div class='add'>+		skcb-&gt;addr.da = addr;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_ac_process(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_ecu *ecu, *prev;</div><div class='add'>+	name_t name;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len != 8) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "rx address claim with wrong dlc %i\n",</div><div class='add'>+			      skb-&gt;len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	name = j1939_skb_to_name(skb);</div><div class='add'>+	skcb-&gt;addr.src_name = name;</div><div class='add'>+	if (!name) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "rx address claim without name\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!j1939_address_is_valid(skcb-&gt;addr.sa)) {</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "rx address claim with broadcast sa\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Few words on the ECU ref counting:</div><div class='add'>+	 *</div><div class='add'>+	 * First we get an ECU handle, either with</div><div class='add'>+	 * j1939_ecu_get_by_name_locked() (increments the ref counter)</div><div class='add'>+	 * or j1939_ecu_create_locked() (initializes an ECU object</div><div class='add'>+	 * with a ref counter of 1).</div><div class='add'>+	 *</div><div class='add'>+	 * j1939_ecu_unmap_locked() will decrement the ref counter,</div><div class='add'>+	 * but only if the ECU was mapped before. So "ecu" still</div><div class='add'>+	 * belongs to us.</div><div class='add'>+	 *</div><div class='add'>+	 * j1939_ecu_timer_start() will increment the ref counter</div><div class='add'>+	 * before it starts the timer, so we can put the ecu when</div><div class='add'>+	 * leaving this function.</div><div class='add'>+	 */</div><div class='add'>+	ecu = j1939_ecu_get_by_name_locked(priv, name);</div><div class='add'>+</div><div class='add'>+	if (ecu &amp;&amp; ecu-&gt;addr == skcb-&gt;addr.sa) {</div><div class='add'>+		/* The ISO 11783-5 standard, in "4.5.2 - Address claim</div><div class='add'>+		 * requirements", states:</div><div class='add'>+		 *   d) No CF shall begin, or resume, transmission on the</div><div class='add'>+		 *      network until 250 ms after it has successfully claimed</div><div class='add'>+		 *      an address except when responding to a request for</div><div class='add'>+		 *      address-claimed.</div><div class='add'>+		 *</div><div class='add'>+		 * But "Figure 6" and "Figure 7" in "4.5.4.2 - Address-claim</div><div class='add'>+		 * prioritization" show that the CF begins the transmission</div><div class='add'>+		 * after 250 ms from the first AC (address-claimed) message</div><div class='add'>+		 * even if it sends another AC message during that time window</div><div class='add'>+		 * to resolve the address contention with another CF.</div><div class='add'>+		 *</div><div class='add'>+		 * As stated in "4.4.2.3 - Address-claimed message":</div><div class='add'>+		 *   In order to successfully claim an address, the CF sending</div><div class='add'>+		 *   an address claimed message shall not receive a contending</div><div class='add'>+		 *   claim from another CF for at least 250 ms.</div><div class='add'>+		 *</div><div class='add'>+		 * As stated in "4.4.3.2 - NAME management (NM) message":</div><div class='add'>+		 *   1) A commanding CF can</div><div class='add'>+		 *      d) request that a CF with a specified NAME transmit</div><div class='add'>+		 *         the address-claimed message with its current NAME.</div><div class='add'>+		 *   2) A target CF shall</div><div class='add'>+		 *      d) send an address-claimed message in response to a</div><div class='add'>+		 *         request for a matching NAME</div><div class='add'>+		 *</div><div class='add'>+		 * Taking the above arguments into account, the 250 ms wait is</div><div class='add'>+		 * requested only during network initialization.</div><div class='add'>+		 *</div><div class='add'>+		 * Do not restart the timer on AC message if both the NAME and</div><div class='add'>+		 * the address match and so if the address has already been</div><div class='add'>+		 * claimed (timer has expired) or the AC message has been sent</div><div class='add'>+		 * to resolve the contention with another CF (timer is still</div><div class='add'>+		 * running).</div><div class='add'>+		 */</div><div class='add'>+		goto out_ecu_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ecu &amp;&amp; j1939_address_is_unicast(skcb-&gt;addr.sa))</div><div class='add'>+		ecu = j1939_ecu_create_locked(priv, name);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(ecu))</div><div class='add'>+		goto out_unlock_bh;</div><div class='add'>+</div><div class='add'>+	/* cancel pending (previous) address claim */</div><div class='add'>+	j1939_ecu_timer_cancel(ecu);</div><div class='add'>+</div><div class='add'>+	if (j1939_address_is_idle(skcb-&gt;addr.sa)) {</div><div class='add'>+		j1939_ecu_unmap_locked(ecu);</div><div class='add'>+		goto out_ecu_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* save new addr */</div><div class='add'>+	if (ecu-&gt;addr != skcb-&gt;addr.sa)</div><div class='add'>+		j1939_ecu_unmap_locked(ecu);</div><div class='add'>+	ecu-&gt;addr = skcb-&gt;addr.sa;</div><div class='add'>+</div><div class='add'>+	prev = j1939_ecu_get_by_addr_locked(priv, skcb-&gt;addr.sa);</div><div class='add'>+	if (prev) {</div><div class='add'>+		if (ecu-&gt;name &gt; prev-&gt;name) {</div><div class='add'>+			j1939_ecu_unmap_locked(ecu);</div><div class='add'>+			j1939_ecu_put(prev);</div><div class='add'>+			goto out_ecu_put;</div><div class='add'>+		} else {</div><div class='add'>+			/* kick prev if less or equal */</div><div class='add'>+			j1939_ecu_unmap_locked(prev);</div><div class='add'>+			j1939_ecu_put(prev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_ecu_timer_start(ecu);</div><div class='add'>+ out_ecu_put:</div><div class='add'>+	j1939_ecu_put(ecu);</div><div class='add'>+ out_unlock_bh:</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ac_recv(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	/* network mgmt */</div><div class='add'>+	if (skcb-&gt;addr.pgn == J1939_PGN_ADDRESS_CLAIMED) {</div><div class='add'>+		j1939_ac_process(priv, skb);</div><div class='add'>+	} else if (j1939_address_is_unicast(skcb-&gt;addr.sa)) {</div><div class='add'>+		/* assign source name */</div><div class='add'>+		ecu = j1939_ecu_get_by_addr(priv, skcb-&gt;addr.sa);</div><div class='add'>+		if (ecu) {</div><div class='add'>+			skcb-&gt;addr.src_name = ecu-&gt;name;</div><div class='add'>+			j1939_ecu_put(ecu);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* assign destination name */</div><div class='add'>+	ecu = j1939_ecu_get_by_addr(priv, skcb-&gt;addr.da);</div><div class='add'>+	if (ecu) {</div><div class='add'>+		skcb-&gt;addr.dst_name = ecu-&gt;name;</div><div class='add'>+		j1939_ecu_put(ecu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/net/can/j1939/bus.c b/net/can/j1939/bus.c<br/>new file mode 100644<br/>index 000000000000..797719cb227e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/bus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/bus.c</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+/* bus for j1939 remote devices</div><div class='add'>+ * Since rtnetlink, no real bus is used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "j1939-priv.h"</div><div class='add'>+</div><div class='add'>+static void __j1939_ecu_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu = container_of(kref, struct j1939_ecu, kref);</div><div class='add'>+	struct j1939_priv *priv = ecu-&gt;priv;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;ecu-&gt;list);</div><div class='add'>+	kfree(ecu);</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ecu_put(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;ecu-&gt;kref, __j1939_ecu_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_ecu_get(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;ecu-&gt;kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_ecu_is_mapped_locked(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = ecu-&gt;priv;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return j1939_ecu_find_by_addr_locked(priv, ecu-&gt;addr) == ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ECU device interface */</div><div class='add'>+/* map ECU to a bus address space */</div><div class='add'>+static void j1939_ecu_map_locked(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = ecu-&gt;priv;</div><div class='add'>+	struct j1939_addr_ent *ent;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!j1939_address_is_unicast(ecu-&gt;addr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ent = &amp;priv-&gt;ents[ecu-&gt;addr];</div><div class='add'>+</div><div class='add'>+	if (ent-&gt;ecu) {</div><div class='add'>+		netdev_warn(priv-&gt;ndev, "Trying to map already mapped ECU, addr: 0x%02x, name: 0x%016llx. Skip it.\n",</div><div class='add'>+			    ecu-&gt;addr, ecu-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_ecu_get(ecu);</div><div class='add'>+	ent-&gt;ecu = ecu;</div><div class='add'>+	ent-&gt;nusers += ecu-&gt;nusers;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* unmap ECU from a bus address space */</div><div class='add'>+void j1939_ecu_unmap_locked(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = ecu-&gt;priv;</div><div class='add'>+	struct j1939_addr_ent *ent;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!j1939_address_is_unicast(ecu-&gt;addr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!j1939_ecu_is_mapped_locked(ecu))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ent = &amp;priv-&gt;ents[ecu-&gt;addr];</div><div class='add'>+	ent-&gt;ecu = NULL;</div><div class='add'>+	ent-&gt;nusers -= ecu-&gt;nusers;</div><div class='add'>+	j1939_ecu_put(ecu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ecu_unmap(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	write_lock_bh(&amp;ecu-&gt;priv-&gt;lock);</div><div class='add'>+	j1939_ecu_unmap_locked(ecu);</div><div class='add'>+	write_unlock_bh(&amp;ecu-&gt;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ecu_unmap_all(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;ents); i++)</div><div class='add'>+		if (priv-&gt;ents[i].ecu)</div><div class='add'>+			j1939_ecu_unmap_locked(priv-&gt;ents[i].ecu);</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ecu_timer_start(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	/* The ECU is held here and released in the</div><div class='add'>+	 * j1939_ecu_timer_handler() or j1939_ecu_timer_cancel().</div><div class='add'>+	 */</div><div class='add'>+	j1939_ecu_get(ecu);</div><div class='add'>+</div><div class='add'>+	/* Schedule timer in 250 msec to commit address change. */</div><div class='add'>+	hrtimer_start(&amp;ecu-&gt;ac_timer, ms_to_ktime(250),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_ecu_timer_cancel(struct j1939_ecu *ecu)</div><div class='add'>+{</div><div class='add'>+	if (hrtimer_cancel(&amp;ecu-&gt;ac_timer))</div><div class='add'>+		j1939_ecu_put(ecu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart j1939_ecu_timer_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu =</div><div class='add'>+		container_of(hrtimer, struct j1939_ecu, ac_timer);</div><div class='add'>+	struct j1939_priv *priv = ecu-&gt;priv;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	/* TODO: can we test if ecu-&gt;addr is unicast before starting</div><div class='add'>+	 * the timer?</div><div class='add'>+	 */</div><div class='add'>+	j1939_ecu_map_locked(ecu);</div><div class='add'>+</div><div class='add'>+	/* The corresponding j1939_ecu_get() is in</div><div class='add'>+	 * j1939_ecu_timer_start().</div><div class='add'>+	 */</div><div class='add'>+	j1939_ecu_put(ecu);</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_create_locked(struct j1939_priv *priv, name_t name)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ecu = kzalloc(sizeof(*ecu), gfp_any());</div><div class='add'>+	if (!ecu)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	kref_init(&amp;ecu-&gt;kref);</div><div class='add'>+	ecu-&gt;addr = J1939_IDLE_ADDR;</div><div class='add'>+	ecu-&gt;name = name;</div><div class='add'>+</div><div class='add'>+	hrtimer_setup(&amp;ecu-&gt;ac_timer, j1939_ecu_timer_handler, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ecu-&gt;list);</div><div class='add'>+</div><div class='add'>+	j1939_priv_get(priv);</div><div class='add'>+	ecu-&gt;priv = priv;</div><div class='add'>+	list_add_tail(&amp;ecu-&gt;list, &amp;priv-&gt;ecus);</div><div class='add'>+</div><div class='add'>+	return ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_find_by_addr_locked(struct j1939_priv *priv,</div><div class='add'>+						u8 addr)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;ents[addr].ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_addr_locked(struct j1939_priv *priv, u8 addr)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!j1939_address_is_unicast(addr))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ecu = j1939_ecu_find_by_addr_locked(priv, addr);</div><div class='add'>+	if (ecu)</div><div class='add'>+		j1939_ecu_get(ecu);</div><div class='add'>+</div><div class='add'>+	return ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_addr(struct j1939_priv *priv, u8 addr)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	ecu = j1939_ecu_get_by_addr_locked(priv, addr);</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get pointer to ecu without increasing ref counter */</div><div class='add'>+static struct j1939_ecu *j1939_ecu_find_by_name_locked(struct j1939_priv *priv,</div><div class='add'>+						       name_t name)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ecu, &amp;priv-&gt;ecus, list) {</div><div class='add'>+		if (ecu-&gt;name == name)</div><div class='add'>+			return ecu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_name_locked(struct j1939_priv *priv,</div><div class='add'>+					       name_t name)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ecu = j1939_ecu_find_by_name_locked(priv, name);</div><div class='add'>+	if (ecu)</div><div class='add'>+		j1939_ecu_get(ecu);</div><div class='add'>+</div><div class='add'>+	return ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_name(struct j1939_priv *priv, name_t name)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	ecu = j1939_ecu_get_by_name_locked(priv, name);</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ecu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 j1939_name_to_addr(struct j1939_priv *priv, name_t name)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+	int addr = J1939_IDLE_ADDR;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return J1939_NO_ADDR;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	ecu = j1939_ecu_find_by_name_locked(priv, name);</div><div class='add'>+	if (ecu &amp;&amp; j1939_ecu_is_mapped_locked(ecu))</div><div class='add'>+		/* ecu's SA is registered */</div><div class='add'>+		addr = ecu-&gt;addr;</div><div class='add'>+</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TX addr/name accounting</div><div class='add'>+ * Transport protocol needs to know if a SA is local or not</div><div class='add'>+ * These functions originate from userspace manipulating sockets,</div><div class='add'>+ * so locking is straigforward</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int j1939_local_ecu_get(struct j1939_priv *priv, name_t name, u8 sa)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (j1939_address_is_unicast(sa))</div><div class='add'>+		priv-&gt;ents[sa].nusers++;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ecu = j1939_ecu_get_by_name_locked(priv, name);</div><div class='add'>+	if (!ecu)</div><div class='add'>+		ecu = j1939_ecu_create_locked(priv, name);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(ecu);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (j1939_address_is_unicast(sa))</div><div class='add'>+			priv-&gt;ents[sa].nusers--;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecu-&gt;nusers++;</div><div class='add'>+	/* TODO: do we care if ecu-&gt;addr != sa? */</div><div class='add'>+	if (j1939_ecu_is_mapped_locked(ecu))</div><div class='add'>+		/* ecu's sa is active already */</div><div class='add'>+		priv-&gt;ents[ecu-&gt;addr].nusers++;</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_local_ecu_put(struct j1939_priv *priv, name_t name, u8 sa)</div><div class='add'>+{</div><div class='add'>+	struct j1939_ecu *ecu;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (j1939_address_is_unicast(sa))</div><div class='add'>+		priv-&gt;ents[sa].nusers--;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ecu = j1939_ecu_find_by_name_locked(priv, name);</div><div class='add'>+	if (WARN_ON_ONCE(!ecu))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ecu-&gt;nusers--;</div><div class='add'>+	/* TODO: do we care if ecu-&gt;addr != sa? */</div><div class='add'>+	if (j1939_ecu_is_mapped_locked(ecu))</div><div class='add'>+		/* ecu's sa is active already */</div><div class='add'>+		priv-&gt;ents[ecu-&gt;addr].nusers--;</div><div class='add'>+	j1939_ecu_put(ecu);</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='head'>diff --git a/net/can/j1939/j1939-priv.h b/net/can/j1939/j1939-priv.h<br/>new file mode 100644<br/>index 000000000000..81f58924b4ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/j1939-priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/j1939-priv.h</a></div><div class='hunk'>@@ -0,0 +1,345 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#ifndef _J1939_PRIV_H_</div><div class='add'>+#define _J1939_PRIV_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/j1939.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+/* Timeout to receive the abort signal over loop back. In case CAN</div><div class='add'>+ * bus is open, the timeout should be triggered.</div><div class='add'>+ */</div><div class='add'>+#define J1939_XTP_ABORT_TIMEOUT_MS 500</div><div class='add'>+#define J1939_SIMPLE_ECHO_TIMEOUT_MS (10 * 1000)</div><div class='add'>+</div><div class='add'>+struct j1939_session;</div><div class='add'>+enum j1939_sk_errqueue_type {</div><div class='add'>+	J1939_ERRQUEUE_TX_ACK,</div><div class='add'>+	J1939_ERRQUEUE_TX_SCHED,</div><div class='add'>+	J1939_ERRQUEUE_TX_ABORT,</div><div class='add'>+	J1939_ERRQUEUE_RX_RTS,</div><div class='add'>+	J1939_ERRQUEUE_RX_DPO,</div><div class='add'>+	J1939_ERRQUEUE_RX_ABORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* j1939 devices */</div><div class='add'>+struct j1939_ecu {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	name_t name;</div><div class='add'>+	u8 addr;</div><div class='add'>+</div><div class='add'>+	/* indicates that this ecu successfully claimed @sa as its address */</div><div class='add'>+	struct hrtimer ac_timer;</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+</div><div class='add'>+	/* count users, to help transport protocol decide for interaction */</div><div class='add'>+	int nusers;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct j1939_priv {</div><div class='add'>+	struct list_head ecus;</div><div class='add'>+	/* local list entry in priv</div><div class='add'>+	 * These allow irq (&amp; softirq) context lookups on j1939 devices</div><div class='add'>+	 * This approach (separate lists) is done as the other 2 alternatives</div><div class='add'>+	 * are not easier or even wrong</div><div class='add'>+	 * 1) using the pure kobject methods involves mutexes, which are not</div><div class='add'>+	 *    allowed in irq context.</div><div class='add'>+	 * 2) duplicating data structures would require a lot of synchronization</div><div class='add'>+	 *    code</div><div class='add'>+	 * usage:</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* segments need a lock to protect the above list */</div><div class='add'>+	rwlock_t lock;</div><div class='add'>+</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	/* list of 256 ecu ptrs, that cache the claimed addresses.</div><div class='add'>+	 * also protected by the above lock</div><div class='add'>+	 */</div><div class='add'>+	struct j1939_addr_ent {</div><div class='add'>+		struct j1939_ecu *ecu;</div><div class='add'>+		/* count users, to help transport protocol */</div><div class='add'>+		int nusers;</div><div class='add'>+	} ents[256];</div><div class='add'>+</div><div class='add'>+	struct kref kref;</div><div class='add'>+</div><div class='add'>+	/* List of active sessions to prevent start of conflicting</div><div class='add'>+	 * one.</div><div class='add'>+	 *</div><div class='add'>+	 * Do not start two sessions of same type, addresses and</div><div class='add'>+	 * direction.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head active_session_list;</div><div class='add'>+</div><div class='add'>+	/* protects active_session_list */</div><div class='add'>+	spinlock_t active_session_list_lock;</div><div class='add'>+</div><div class='add'>+	unsigned int tp_max_packet_size;</div><div class='add'>+</div><div class='add'>+	/* lock for j1939_socks list */</div><div class='add'>+	rwlock_t j1939_socks_lock;</div><div class='add'>+	struct list_head j1939_socks;</div><div class='add'>+</div><div class='add'>+	struct kref rx_kref;</div><div class='add'>+	u32 rx_tskey;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void j1939_ecu_put(struct j1939_ecu *ecu);</div><div class='add'>+</div><div class='add'>+/* keep the cache of what is local */</div><div class='add'>+int j1939_local_ecu_get(struct j1939_priv *priv, name_t name, u8 sa);</div><div class='add'>+void j1939_local_ecu_put(struct j1939_priv *priv, name_t name, u8 sa);</div><div class='add'>+</div><div class='add'>+static inline bool j1939_address_is_unicast(u8 addr)</div><div class='add'>+{</div><div class='add'>+	return addr &lt;= J1939_MAX_UNICAST_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool j1939_address_is_idle(u8 addr)</div><div class='add'>+{</div><div class='add'>+	return addr == J1939_IDLE_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool j1939_address_is_valid(u8 addr)</div><div class='add'>+{</div><div class='add'>+	return addr != J1939_NO_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool j1939_pgn_is_pdu1(pgn_t pgn)</div><div class='add'>+{</div><div class='add'>+	/* ignore dp &amp; res bits for this */</div><div class='add'>+	return (pgn &amp; 0xff00) &lt; 0xf000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* utility to correctly unmap an ECU */</div><div class='add'>+void j1939_ecu_unmap_locked(struct j1939_ecu *ecu);</div><div class='add'>+void j1939_ecu_unmap(struct j1939_ecu *ecu);</div><div class='add'>+</div><div class='add'>+u8 j1939_name_to_addr(struct j1939_priv *priv, name_t name);</div><div class='add'>+struct j1939_ecu *j1939_ecu_find_by_addr_locked(struct j1939_priv *priv,</div><div class='add'>+						u8 addr);</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_addr(struct j1939_priv *priv, u8 addr);</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_addr_locked(struct j1939_priv *priv,</div><div class='add'>+					       u8 addr);</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_name(struct j1939_priv *priv, name_t name);</div><div class='add'>+struct j1939_ecu *j1939_ecu_get_by_name_locked(struct j1939_priv *priv,</div><div class='add'>+					       name_t name);</div><div class='add'>+</div><div class='add'>+enum j1939_transfer_type {</div><div class='add'>+	J1939_TP,</div><div class='add'>+	J1939_ETP,</div><div class='add'>+	J1939_SIMPLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct j1939_addr {</div><div class='add'>+	name_t src_name;</div><div class='add'>+	name_t dst_name;</div><div class='add'>+	pgn_t pgn;</div><div class='add'>+</div><div class='add'>+	u8 sa;</div><div class='add'>+	u8 da;</div><div class='add'>+</div><div class='add'>+	u8 type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* control buffer of the sk_buff */</div><div class='add'>+struct j1939_sk_buff_cb {</div><div class='add'>+	/* Offset in bytes within one ETP session */</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	/* for tx, MSG_SYN will be used to sync on sockets */</div><div class='add'>+	u32 msg_flags;</div><div class='add'>+	u32 tskey;</div><div class='add'>+</div><div class='add'>+	struct j1939_addr addr;</div><div class='add'>+</div><div class='add'>+	/* Flags for quick lookups during skb processing.</div><div class='add'>+	 * These are set in the receive path only.</div><div class='add'>+	 */</div><div class='add'>+#define J1939_ECU_LOCAL_SRC BIT(0)</div><div class='add'>+#define J1939_ECU_LOCAL_DST BIT(1)</div><div class='add'>+	u8 flags;</div><div class='add'>+</div><div class='add'>+	priority_t priority;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct j1939_sk_buff_cb *j1939_skb_to_cb(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct j1939_sk_buff_cb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	return (struct j1939_sk_buff_cb *)skb-&gt;cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+void j1939_sk_recv(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+bool j1939_sk_recv_match(struct j1939_priv *priv,</div><div class='add'>+			 struct j1939_sk_buff_cb *skcb);</div><div class='add'>+void j1939_sk_send_loop_abort(struct sock *sk, int err);</div><div class='add'>+void j1939_sk_errqueue(struct j1939_session *session,</div><div class='add'>+		       enum j1939_sk_errqueue_type type);</div><div class='add'>+void j1939_sk_queue_activate_next(struct j1939_session *session);</div><div class='add'>+</div><div class='add'>+/* stack entries */</div><div class='add'>+struct j1939_session *j1939_tp_send(struct j1939_priv *priv,</div><div class='add'>+				    struct sk_buff *skb, size_t size);</div><div class='add'>+int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+int j1939_ac_fixup(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+void j1939_ac_recv(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+void j1939_simple_recv(struct j1939_priv *priv, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+/* network management */</div><div class='add'>+struct j1939_ecu *j1939_ecu_create_locked(struct j1939_priv *priv, name_t name);</div><div class='add'>+</div><div class='add'>+void j1939_ecu_timer_start(struct j1939_ecu *ecu);</div><div class='add'>+void j1939_ecu_timer_cancel(struct j1939_ecu *ecu);</div><div class='add'>+void j1939_ecu_unmap_all(struct j1939_priv *priv);</div><div class='add'>+</div><div class='add'>+struct j1939_priv *j1939_netdev_start(struct net_device *ndev);</div><div class='add'>+void j1939_netdev_stop(struct j1939_priv *priv);</div><div class='add'>+</div><div class='add'>+void j1939_priv_put(struct j1939_priv *priv);</div><div class='add'>+void j1939_priv_get(struct j1939_priv *priv);</div><div class='add'>+</div><div class='add'>+/* notify/alert all j1939 sockets bound to ifindex */</div><div class='add'>+void j1939_sk_netdev_event_netdown(struct j1939_priv *priv);</div><div class='add'>+void j1939_sk_netdev_event_unregister(struct j1939_priv *priv);</div><div class='add'>+int j1939_cancel_active_session(struct j1939_priv *priv, struct sock *sk);</div><div class='add'>+void j1939_tp_init(struct j1939_priv *priv);</div><div class='add'>+</div><div class='add'>+/* decrement pending skb for a j1939 socket */</div><div class='add'>+void j1939_sock_pending_del(struct sock *sk);</div><div class='add'>+</div><div class='add'>+enum j1939_session_state {</div><div class='add'>+	J1939_SESSION_NEW,</div><div class='add'>+	J1939_SESSION_ACTIVE,</div><div class='add'>+	/* waiting for abort signal on the bus */</div><div class='add'>+	J1939_SESSION_WAITING_ABORT,</div><div class='add'>+	J1939_SESSION_ACTIVE_MAX,</div><div class='add'>+	J1939_SESSION_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct j1939_session {</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+	struct list_head active_session_list_entry;</div><div class='add'>+	struct list_head sk_session_queue_entry;</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	/* ifindex, src, dst, pgn define the session block</div><div class='add'>+	 * the are _never_ modified after insertion in the list</div><div class='add'>+	 * this decreases locking problems a _lot_</div><div class='add'>+	 */</div><div class='add'>+	struct j1939_sk_buff_cb skcb;</div><div class='add'>+	struct sk_buff_head skb_queue;</div><div class='add'>+</div><div class='add'>+	/* all tx related stuff (last_txcmd, pkt.tx)</div><div class='add'>+	 * is protected (modified only) with the txtimer hrtimer</div><div class='add'>+	 * 'total' &amp; 'block' are never changed,</div><div class='add'>+	 * last_cmd, last &amp; block are protected by -&gt;lock</div><div class='add'>+	 * this means that the tx may run after cts is received that should</div><div class='add'>+	 * have stopped tx, but this time discrepancy is never avoided anyhow</div><div class='add'>+	 */</div><div class='add'>+	u8 last_cmd, last_txcmd;</div><div class='add'>+	bool transmission;</div><div class='add'>+	bool extd;</div><div class='add'>+	/* Total message size, number of bytes */</div><div class='add'>+	unsigned int total_message_size;</div><div class='add'>+	/* Total number of bytes queue from socket to the session */</div><div class='add'>+	unsigned int total_queued_size;</div><div class='add'>+	unsigned int tx_retry;</div><div class='add'>+</div><div class='add'>+	int err;</div><div class='add'>+	u32 tskey;</div><div class='add'>+	enum j1939_session_state state;</div><div class='add'>+</div><div class='add'>+	/* Packets counters for a (extended) transfer session. The packet is</div><div class='add'>+	 * maximal of 7 bytes.</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		/* total - total number of packets for this session */</div><div class='add'>+		unsigned int total;</div><div class='add'>+		/* last - last packet of a transfer block after which</div><div class='add'>+		 * responder should send ETP.CM_CTS and originator</div><div class='add'>+		 * ETP.CM_DPO</div><div class='add'>+		 */</div><div class='add'>+		unsigned int last;</div><div class='add'>+		/* tx - number of packets send by originator node.</div><div class='add'>+		 * this counter can be set back if responder node</div><div class='add'>+		 * didn't received all packets send by originator.</div><div class='add'>+		 */</div><div class='add'>+		unsigned int tx;</div><div class='add'>+		unsigned int tx_acked;</div><div class='add'>+		/* rx - number of packets received */</div><div class='add'>+		unsigned int rx;</div><div class='add'>+		/* block - amount of packets expected in one block */</div><div class='add'>+		unsigned int block;</div><div class='add'>+		/* dpo - ETP.CM_DPO, Data Packet Offset */</div><div class='add'>+		unsigned int dpo;</div><div class='add'>+	} pkt;</div><div class='add'>+	struct hrtimer txtimer, rxtimer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct j1939_sock {</div><div class='add'>+	struct sock sk; /* must be first to skip with memset */</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+#define J1939_SOCK_BOUND BIT(0)</div><div class='add'>+#define J1939_SOCK_CONNECTED BIT(1)</div><div class='add'>+#define J1939_SOCK_PROMISC BIT(2)</div><div class='add'>+#define J1939_SOCK_ERRQUEUE BIT(3)</div><div class='add'>+	int state;</div><div class='add'>+</div><div class='add'>+	int ifindex;</div><div class='add'>+	struct j1939_addr addr;</div><div class='add'>+	spinlock_t filters_lock;</div><div class='add'>+	struct j1939_filter *filters;</div><div class='add'>+	int nfilters;</div><div class='add'>+	pgn_t pgn_rx_filter;</div><div class='add'>+</div><div class='add'>+	/* j1939 may emit equal PGN (!= equal CAN-id's) out of order</div><div class='add'>+	 * when transport protocol comes in.</div><div class='add'>+	 * To allow emitting in order, keep a 'pending' nr. of packets</div><div class='add'>+	 */</div><div class='add'>+	atomic_t skb_pending;</div><div class='add'>+	wait_queue_head_t waitq;</div><div class='add'>+</div><div class='add'>+	/* lock for the sk_session_queue list */</div><div class='add'>+	spinlock_t sk_session_queue_lock;</div><div class='add'>+	struct list_head sk_session_queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct j1939_sock *j1939_sk(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return container_of(sk, struct j1939_sock, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_session_get(struct j1939_session *session);</div><div class='add'>+void j1939_session_put(struct j1939_session *session);</div><div class='add'>+void j1939_session_skb_queue(struct j1939_session *session,</div><div class='add'>+			     struct sk_buff *skb);</div><div class='add'>+int j1939_session_activate(struct j1939_session *session);</div><div class='add'>+void j1939_tp_schedule_txtimer(struct j1939_session *session, int msec);</div><div class='add'>+void j1939_session_timers_cancel(struct j1939_session *session);</div><div class='add'>+</div><div class='add'>+#define J1939_MIN_TP_PACKET_SIZE 9</div><div class='add'>+#define J1939_MAX_TP_PACKET_SIZE (7 * 0xff)</div><div class='add'>+#define J1939_MAX_ETP_PACKET_SIZE (7 * 0x00ffffff)</div><div class='add'>+</div><div class='add'>+#define J1939_REGULAR 0</div><div class='add'>+#define J1939_EXTENDED 1</div><div class='add'>+</div><div class='add'>+/* CAN protocol */</div><div class='add'>+extern const struct can_proto j1939_can_proto;</div><div class='add'>+</div><div class='add'>+#endif /* _J1939_PRIV_H_ */</div><div class='head'>diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c<br/>new file mode 100644<br/>index 000000000000..a93af55df5fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/main.c</a></div><div class='hunk'>@@ -0,0 +1,430 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Pieter Beyens &lt;pieter.beyens@eia.be&gt;</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2018 Protonic,</div><div class='add'>+//                         Robin van der Gracht &lt;robin@protonic.nl&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+/* Core of can-j1939 that links j1939 to CAN. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='add'>+#include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "j1939-priv.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("PF_CAN SAE J1939");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("EIA Electronics (Kurt Van Dijck &amp; Pieter Beyens)");</div><div class='add'>+MODULE_ALIAS("can-proto-" __stringify(CAN_J1939));</div><div class='add'>+</div><div class='add'>+/* LOWLEVEL CAN interface */</div><div class='add'>+</div><div class='add'>+/* CAN_HDR: #bytes before can_frame data part */</div><div class='add'>+#define J1939_CAN_HDR (offsetof(struct can_frame, data))</div><div class='add'>+</div><div class='add'>+/* lowest layer */</div><div class='add'>+static void j1939_can_recv(struct sk_buff *iskb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb, *iskcb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+	/* make sure we only get Classical CAN frames */</div><div class='add'>+	if (!can_is_can_skb(iskb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* create a copy of the skb</div><div class='add'>+	 * j1939 only delivers the real data bytes,</div><div class='add'>+	 * the header goes into sockaddr.</div><div class='add'>+	 * j1939 may not touch the incoming skb in such way</div><div class='add'>+	 */</div><div class='add'>+	skb = skb_clone(iskb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	j1939_priv_get(priv);</div><div class='add'>+	can_skb_set_owner(skb, iskb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* get a pointer to the header of the skb</div><div class='add'>+	 * the skb payload (pointer) is moved, so that the next skb_data</div><div class='add'>+	 * returns the actual payload</div><div class='add'>+	 */</div><div class='add'>+	cf = (void *)skb-&gt;data;</div><div class='add'>+	skb_pull(skb, J1939_CAN_HDR);</div><div class='add'>+</div><div class='add'>+	/* fix length, set to dlc, with 8 maximum */</div><div class='add'>+	skb_trim(skb, min_t(uint8_t, cf-&gt;len, 8));</div><div class='add'>+</div><div class='add'>+	/* set addr */</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	memset(skcb, 0, sizeof(*skcb));</div><div class='add'>+</div><div class='add'>+	iskcb = j1939_skb_to_cb(iskb);</div><div class='add'>+	skcb-&gt;tskey = iskcb-&gt;tskey;</div><div class='add'>+	skcb-&gt;priority = (cf-&gt;can_id &gt;&gt; 26) &amp; 0x7;</div><div class='add'>+	skcb-&gt;addr.sa = cf-&gt;can_id;</div><div class='add'>+	skcb-&gt;addr.pgn = (cf-&gt;can_id &gt;&gt; 8) &amp; J1939_PGN_MAX;</div><div class='add'>+	/* set default message type */</div><div class='add'>+	skcb-&gt;addr.type = J1939_TP;</div><div class='add'>+</div><div class='add'>+	if (!j1939_address_is_valid(skcb-&gt;addr.sa)) {</div><div class='add'>+		netdev_err_once(priv-&gt;ndev, "%s: sa is broadcast address, ignoring!\n",</div><div class='add'>+				__func__);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (j1939_pgn_is_pdu1(skcb-&gt;addr.pgn)) {</div><div class='add'>+		/* Type 1: with destination address */</div><div class='add'>+		skcb-&gt;addr.da = skcb-&gt;addr.pgn;</div><div class='add'>+		/* normalize pgn: strip dst address */</div><div class='add'>+		skcb-&gt;addr.pgn &amp;= 0x3ff00;</div><div class='add'>+	} else {</div><div class='add'>+		/* set broadcast address */</div><div class='add'>+		skcb-&gt;addr.da = J1939_NO_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update localflags */</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+	if (j1939_address_is_unicast(skcb-&gt;addr.sa) &amp;&amp;</div><div class='add'>+	    priv-&gt;ents[skcb-&gt;addr.sa].nusers)</div><div class='add'>+		skcb-&gt;flags |= J1939_ECU_LOCAL_SRC;</div><div class='add'>+	if (j1939_address_is_unicast(skcb-&gt;addr.da) &amp;&amp;</div><div class='add'>+	    priv-&gt;ents[skcb-&gt;addr.da].nusers)</div><div class='add'>+		skcb-&gt;flags |= J1939_ECU_LOCAL_DST;</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* deliver into the j1939 stack ... */</div><div class='add'>+	j1939_ac_recv(priv, skb);</div><div class='add'>+</div><div class='add'>+	if (j1939_tp_recv(priv, skb))</div><div class='add'>+		/* this means the transport layer processed the message */</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	j1939_simple_recv(priv, skb);</div><div class='add'>+	j1939_sk_recv(priv, skb);</div><div class='add'>+ done:</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* NETDEV MANAGEMENT */</div><div class='add'>+</div><div class='add'>+/* values for can_rx_(un)register */</div><div class='add'>+#define J1939_CAN_ID CAN_EFF_FLAG</div><div class='add'>+#define J1939_CAN_MASK (CAN_EFF_FLAG | CAN_RTR_FLAG)</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(j1939_netdev_lock);</div><div class='add'>+</div><div class='add'>+static struct j1939_priv *j1939_priv_create(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rwlock_init(&amp;priv-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;ecus);</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+	kref_init(&amp;priv-&gt;kref);</div><div class='add'>+	kref_init(&amp;priv-&gt;rx_kref);</div><div class='add'>+	dev_hold(ndev);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s : 0x%p\n", __func__, priv);</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void j1939_priv_set(struct net_device *ndev,</div><div class='add'>+				  struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct can_ml_priv *can_ml = can_get_ml_priv(ndev);</div><div class='add'>+</div><div class='add'>+	can_ml-&gt;j1939_priv = priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __j1939_priv_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = container_of(kref, struct j1939_priv, kref);</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s: 0x%p\n", __func__, priv);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;priv-&gt;active_session_list));</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;priv-&gt;ecus));</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;priv-&gt;j1939_socks));</div><div class='add'>+</div><div class='add'>+	dev_put(ndev);</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_priv_put(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;priv-&gt;kref, __j1939_priv_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_priv_get(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;priv-&gt;kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_can_rx_register(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	j1939_priv_get(priv);</div><div class='add'>+	ret = can_rx_register(dev_net(ndev), ndev, J1939_CAN_ID, J1939_CAN_MASK,</div><div class='add'>+			      j1939_can_recv, priv, "j1939", NULL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		j1939_priv_put(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_can_rx_unregister(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	can_rx_unregister(dev_net(ndev), ndev, J1939_CAN_ID, J1939_CAN_MASK,</div><div class='add'>+			  j1939_can_recv, priv);</div><div class='add'>+</div><div class='add'>+	/* The last reference of priv is dropped by the RCU deferred</div><div class='add'>+	 * j1939_sk_sock_destruct() of the last socket, so we can</div><div class='add'>+	 * safely drop this reference here.</div><div class='add'>+	 */</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __j1939_rx_release(struct kref *kref)</div><div class='add'>+	__releases(&amp;j1939_netdev_lock)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = container_of(kref, struct j1939_priv,</div><div class='add'>+					       rx_kref);</div><div class='add'>+</div><div class='add'>+	j1939_can_rx_unregister(priv);</div><div class='add'>+	j1939_ecu_unmap_all(priv);</div><div class='add'>+	j1939_priv_set(priv-&gt;ndev, NULL);</div><div class='add'>+	mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get pointer to priv without increasing ref counter */</div><div class='add'>+static inline struct j1939_priv *j1939_ndev_to_priv(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct can_ml_priv *can_ml = can_get_ml_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return can_ml-&gt;j1939_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct j1939_priv *j1939_priv_get_by_ndev_locked(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;j1939_netdev_lock);</div><div class='add'>+</div><div class='add'>+	priv = j1939_ndev_to_priv(ndev);</div><div class='add'>+	if (priv)</div><div class='add'>+		j1939_priv_get(priv);</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct j1939_priv *j1939_priv_get_by_ndev(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;j1939_netdev_lock);</div><div class='add'>+	priv = j1939_priv_get_by_ndev_locked(ndev);</div><div class='add'>+	mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct j1939_priv *j1939_netdev_start(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv, *priv_new;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;j1939_netdev_lock);</div><div class='add'>+	priv = j1939_priv_get_by_ndev_locked(ndev);</div><div class='add'>+	if (priv) {</div><div class='add'>+		kref_get(&amp;priv-&gt;rx_kref);</div><div class='add'>+		mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+		return priv;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+</div><div class='add'>+	priv = j1939_priv_create(ndev);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	j1939_tp_init(priv);</div><div class='add'>+	rwlock_init(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;j1939_socks);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;j1939_netdev_lock);</div><div class='add'>+	priv_new = j1939_priv_get_by_ndev_locked(ndev);</div><div class='add'>+	if (priv_new) {</div><div class='add'>+		/* Someone was faster than us, use their priv and roll</div><div class='add'>+		 * back our's.</div><div class='add'>+		 */</div><div class='add'>+		kref_get(&amp;priv_new-&gt;rx_kref);</div><div class='add'>+		mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+		dev_put(ndev);</div><div class='add'>+		kfree(priv);</div><div class='add'>+		return priv_new;</div><div class='add'>+	}</div><div class='add'>+	j1939_priv_set(ndev, priv);</div><div class='add'>+</div><div class='add'>+	ret = j1939_can_rx_register(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_priv_put;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+	return priv;</div><div class='add'>+</div><div class='add'>+ out_priv_put:</div><div class='add'>+	j1939_priv_set(ndev, NULL);</div><div class='add'>+	mutex_unlock(&amp;j1939_netdev_lock);</div><div class='add'>+</div><div class='add'>+	dev_put(ndev);</div><div class='add'>+	kfree(priv);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_netdev_stop(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	kref_put_mutex(&amp;priv-&gt;rx_kref, __j1939_rx_release, &amp;j1939_netdev_lock);</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret, dlc;</div><div class='add'>+	canid_t canid;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+	/* apply sanity checks */</div><div class='add'>+	if (j1939_pgn_is_pdu1(skcb-&gt;addr.pgn))</div><div class='add'>+		skcb-&gt;addr.pgn &amp;= J1939_PGN_PDU1_MAX;</div><div class='add'>+	else</div><div class='add'>+		skcb-&gt;addr.pgn &amp;= J1939_PGN_MAX;</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;priority &gt; 7)</div><div class='add'>+		skcb-&gt;priority = 6;</div><div class='add'>+</div><div class='add'>+	ret = j1939_ac_fixup(priv, skb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto failed;</div><div class='add'>+	dlc = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* re-claim the CAN_HDR from the SKB */</div><div class='add'>+	cf = skb_push(skb, J1939_CAN_HDR);</div><div class='add'>+</div><div class='add'>+	/* initialize header structure */</div><div class='add'>+	memset(cf, 0, J1939_CAN_HDR);</div><div class='add'>+</div><div class='add'>+	/* make it a full can frame again */</div><div class='add'>+	skb_put_zero(skb, 8 - dlc);</div><div class='add'>+</div><div class='add'>+	canid = CAN_EFF_FLAG |</div><div class='add'>+		(skcb-&gt;priority &lt;&lt; 26) |</div><div class='add'>+		(skcb-&gt;addr.pgn &lt;&lt; 8) |</div><div class='add'>+		skcb-&gt;addr.sa;</div><div class='add'>+	if (j1939_pgn_is_pdu1(skcb-&gt;addr.pgn))</div><div class='add'>+		canid |= skcb-&gt;addr.da &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id = canid;</div><div class='add'>+	cf-&gt;len = dlc;</div><div class='add'>+</div><div class='add'>+	return can_send(skb, 1);</div><div class='add'>+</div><div class='add'>+ failed:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_netdev_notify(struct notifier_block *nb,</div><div class='add'>+			       unsigned long msg, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = netdev_notifier_info_to_dev(data);</div><div class='add'>+	struct can_ml_priv *can_ml = can_get_ml_priv(ndev);</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+</div><div class='add'>+	if (!can_ml)</div><div class='add'>+		goto notify_done;</div><div class='add'>+</div><div class='add'>+	priv = j1939_priv_get_by_ndev(ndev);</div><div class='add'>+	if (!priv)</div><div class='add'>+		goto notify_done;</div><div class='add'>+</div><div class='add'>+	switch (msg) {</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+		j1939_cancel_active_session(priv, NULL);</div><div class='add'>+		j1939_sk_netdev_event_netdown(priv);</div><div class='add'>+		j1939_ecu_unmap_all(priv);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		j1939_cancel_active_session(priv, NULL);</div><div class='add'>+		j1939_sk_netdev_event_netdown(priv);</div><div class='add'>+		j1939_sk_netdev_event_unregister(priv);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+</div><div class='add'>+notify_done:</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block j1939_netdev_notifier = {</div><div class='add'>+	.notifier_call = j1939_netdev_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MODULE interface */</div><div class='add'>+static __init int j1939_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pr_info("can: SAE J1939\n");</div><div class='add'>+</div><div class='add'>+	ret = register_netdevice_notifier(&amp;j1939_netdev_notifier);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_notifier;</div><div class='add'>+</div><div class='add'>+	ret = can_proto_register(&amp;j1939_can_proto);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("can: registration of j1939 protocol failed\n");</div><div class='add'>+		goto fail_sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ fail_sk:</div><div class='add'>+	unregister_netdevice_notifier(&amp;j1939_netdev_notifier);</div><div class='add'>+ fail_notifier:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void j1939_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	can_proto_unregister(&amp;j1939_can_proto);</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_notifier(&amp;j1939_netdev_notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(j1939_module_init);</div><div class='add'>+module_exit(j1939_module_exit);</div><div class='head'>diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c<br/>new file mode 100644<br/>index 000000000000..6272326dd614<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/socket.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/socket.c</a></div><div class='hunk'>@@ -0,0 +1,1393 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Pieter Beyens &lt;pieter.beyens@eia.be&gt;</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2018 Protonic,</div><div class='add'>+//                         Robin van der Gracht &lt;robin@protonic.nl&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='add'>+#include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "j1939-priv.h"</div><div class='add'>+</div><div class='add'>+#define J1939_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_addr.j1939)</div><div class='add'>+</div><div class='add'>+/* conversion function between struct sock::sk_priority from linux and</div><div class='add'>+ * j1939 priority field</div><div class='add'>+ */</div><div class='add'>+static inline priority_t j1939_prio(u32 sk_priority)</div><div class='add'>+{</div><div class='add'>+	sk_priority = min(sk_priority, 7U);</div><div class='add'>+</div><div class='add'>+	return 7 - sk_priority;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 j1939_to_sk_priority(priority_t prio)</div><div class='add'>+{</div><div class='add'>+	return 7 - prio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* function to see if pgn is to be evaluated */</div><div class='add'>+static inline bool j1939_pgn_is_valid(pgn_t pgn)</div><div class='add'>+{</div><div class='add'>+	return pgn &lt;= J1939_PGN_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* test function to avoid non-zero DA placeholder for pdu1 pgn's */</div><div class='add'>+static inline bool j1939_pgn_is_clean_pdu(pgn_t pgn)</div><div class='add'>+{</div><div class='add'>+	if (j1939_pgn_is_pdu1(pgn))</div><div class='add'>+		return !(pgn &amp; 0xff);</div><div class='add'>+	else</div><div class='add'>+		return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void j1939_sock_pending_add(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;jsk-&gt;skb_pending);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sock_pending_get(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;jsk-&gt;skb_pending);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_sock_pending_del(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	/* atomic_dec_return returns the new value */</div><div class='add'>+	if (!atomic_dec_return(&amp;jsk-&gt;skb_pending))</div><div class='add'>+		wake_up(&amp;jsk-&gt;waitq);	/* no pending SKB's */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_jsk_add(struct j1939_priv *priv, struct j1939_sock *jsk)</div><div class='add'>+{</div><div class='add'>+	jsk-&gt;state |= J1939_SOCK_BOUND;</div><div class='add'>+	j1939_priv_get(priv);</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_add_tail(&amp;jsk-&gt;list, &amp;priv-&gt;j1939_socks);</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_jsk_del(struct j1939_priv *priv, struct j1939_sock *jsk)</div><div class='add'>+{</div><div class='add'>+	write_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_del_init(&amp;jsk-&gt;list);</div><div class='add'>+	write_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+</div><div class='add'>+	j1939_priv_put(priv);</div><div class='add'>+	jsk-&gt;state &amp;= ~J1939_SOCK_BOUND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_sk_queue_session(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(session-&gt;sk);</div><div class='add'>+	bool empty;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	empty = list_empty(&amp;jsk-&gt;sk_session_queue);</div><div class='add'>+	j1939_session_get(session);</div><div class='add'>+	list_add_tail(&amp;session-&gt;sk_session_queue_entry, &amp;jsk-&gt;sk_session_queue);</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	j1939_sock_pending_add(&amp;jsk-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return empty;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_sk_get_incomplete_session(struct j1939_sock *jsk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	if (!list_empty(&amp;jsk-&gt;sk_session_queue)) {</div><div class='add'>+		session = list_last_entry(&amp;jsk-&gt;sk_session_queue,</div><div class='add'>+					  struct j1939_session,</div><div class='add'>+					  sk_session_queue_entry);</div><div class='add'>+		if (session-&gt;total_queued_size == session-&gt;total_message_size)</div><div class='add'>+			session = NULL;</div><div class='add'>+		else</div><div class='add'>+			j1939_session_get(session);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_sk_queue_drop_all(struct j1939_priv *priv,</div><div class='add'>+				    struct j1939_sock *jsk, int err)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session, *tmp;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s: err: %i\n", __func__, err);</div><div class='add'>+	spin_lock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	list_for_each_entry_safe(session, tmp, &amp;jsk-&gt;sk_session_queue,</div><div class='add'>+				 sk_session_queue_entry) {</div><div class='add'>+		list_del_init(&amp;session-&gt;sk_session_queue_entry);</div><div class='add'>+		session-&gt;err = err;</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_sk_queue_activate_next_locked(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+	struct j1939_session *first;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* RX-Session don't have a socket (yet) */</div><div class='add'>+	if (!session-&gt;sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	jsk = j1939_sk(session-&gt;sk);</div><div class='add'>+	lockdep_assert_held(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+</div><div class='add'>+	err = session-&gt;err;</div><div class='add'>+</div><div class='add'>+	first = list_first_entry_or_null(&amp;jsk-&gt;sk_session_queue,</div><div class='add'>+					 struct j1939_session,</div><div class='add'>+					 sk_session_queue_entry);</div><div class='add'>+</div><div class='add'>+	/* Some else has already activated the next session */</div><div class='add'>+	if (first != session)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+activate_next:</div><div class='add'>+	list_del_init(&amp;first-&gt;sk_session_queue_entry);</div><div class='add'>+	j1939_session_put(first);</div><div class='add'>+	first = list_first_entry_or_null(&amp;jsk-&gt;sk_session_queue,</div><div class='add'>+					 struct j1939_session,</div><div class='add'>+					 sk_session_queue_entry);</div><div class='add'>+	if (!first)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (j1939_session_activate(first)) {</div><div class='add'>+		netdev_warn_once(first-&gt;priv-&gt;ndev,</div><div class='add'>+				 "%s: 0x%p: Identical session is already activated.\n",</div><div class='add'>+				 __func__, first);</div><div class='add'>+		first-&gt;err = -EBUSY;</div><div class='add'>+		goto activate_next;</div><div class='add'>+	} else {</div><div class='add'>+		/* Give receiver some time (arbitrary chosen) to recover */</div><div class='add'>+		int time_ms = 0;</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			time_ms = 10 + get_random_u32_below(16);</div><div class='add'>+</div><div class='add'>+		j1939_tp_schedule_txtimer(first, time_ms);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_sk_queue_activate_next(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+</div><div class='add'>+	if (!session-&gt;sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	jsk = j1939_sk(session-&gt;sk);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	j1939_sk_queue_activate_next_locked(session);</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_sk_match_dst(struct j1939_sock *jsk,</div><div class='add'>+			       const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	if ((jsk-&gt;state &amp; J1939_SOCK_PROMISC))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Destination address filter */</div><div class='add'>+	if (jsk-&gt;addr.src_name &amp;&amp; skcb-&gt;addr.dst_name) {</div><div class='add'>+		if (jsk-&gt;addr.src_name != skcb-&gt;addr.dst_name)</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		/* receive (all sockets) if</div><div class='add'>+		 * - all packages that match our bind() address</div><div class='add'>+		 * - all broadcast on a socket if SO_BROADCAST</div><div class='add'>+		 *   is set</div><div class='add'>+		 */</div><div class='add'>+		if (j1939_address_is_unicast(skcb-&gt;addr.da)) {</div><div class='add'>+			if (jsk-&gt;addr.sa != skcb-&gt;addr.da)</div><div class='add'>+				return false;</div><div class='add'>+		} else if (!sock_flag(&amp;jsk-&gt;sk, SOCK_BROADCAST)) {</div><div class='add'>+			/* receiving broadcast without SO_BROADCAST</div><div class='add'>+			 * flag is not allowed</div><div class='add'>+			 */</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Source address filter */</div><div class='add'>+	if (jsk-&gt;state &amp; J1939_SOCK_CONNECTED) {</div><div class='add'>+		/* receive (all sockets) if</div><div class='add'>+		 * - all packages that match our connect() name or address</div><div class='add'>+		 */</div><div class='add'>+		if (jsk-&gt;addr.dst_name &amp;&amp; skcb-&gt;addr.src_name) {</div><div class='add'>+			if (jsk-&gt;addr.dst_name != skcb-&gt;addr.src_name)</div><div class='add'>+				return false;</div><div class='add'>+		} else {</div><div class='add'>+			if (jsk-&gt;addr.da != skcb-&gt;addr.sa)</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PGN filter */</div><div class='add'>+	if (j1939_pgn_is_valid(jsk-&gt;pgn_rx_filter) &amp;&amp;</div><div class='add'>+	    jsk-&gt;pgn_rx_filter != skcb-&gt;addr.pgn)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* matches skb control buffer (addr) with a j1939 filter */</div><div class='add'>+static bool j1939_sk_match_filter(struct j1939_sock *jsk,</div><div class='add'>+				  const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	const struct j1939_filter *f;</div><div class='add'>+	int nfilter;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;jsk-&gt;filters_lock);</div><div class='add'>+</div><div class='add'>+	f = jsk-&gt;filters;</div><div class='add'>+	nfilter = jsk-&gt;nfilters;</div><div class='add'>+</div><div class='add'>+	if (!nfilter)</div><div class='add'>+		/* receive all when no filters are assigned */</div><div class='add'>+		goto filter_match_found;</div><div class='add'>+</div><div class='add'>+	for (; nfilter; ++f, --nfilter) {</div><div class='add'>+		if ((skcb-&gt;addr.pgn &amp; f-&gt;pgn_mask) != f-&gt;pgn)</div><div class='add'>+			continue;</div><div class='add'>+		if ((skcb-&gt;addr.sa &amp; f-&gt;addr_mask) != f-&gt;addr)</div><div class='add'>+			continue;</div><div class='add'>+		if ((skcb-&gt;addr.src_name &amp; f-&gt;name_mask) != f-&gt;name)</div><div class='add'>+			continue;</div><div class='add'>+		goto filter_match_found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;filters_lock);</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+filter_match_found:</div><div class='add'>+	spin_unlock_bh(&amp;jsk-&gt;filters_lock);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_sk_recv_match_one(struct j1939_sock *jsk,</div><div class='add'>+				    const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	if (!(jsk-&gt;state &amp; J1939_SOCK_BOUND))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_match_dst(jsk, skcb))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_match_filter(jsk, skcb))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_sk_recv_one(struct j1939_sock *jsk, struct sk_buff *oskb)</div><div class='add'>+{</div><div class='add'>+	const struct j1939_sk_buff_cb *oskcb = j1939_skb_to_cb(oskb);</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (oskb-&gt;sk == &amp;jsk-&gt;sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_recv_match_one(jsk, oskcb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(oskb, GFP_ATOMIC);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		pr_warn("skb clone failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	can_skb_set_owner(skb, oskb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	skcb-&gt;msg_flags &amp;= ~(MSG_DONTROUTE);</div><div class='add'>+	if (skb-&gt;sk)</div><div class='add'>+		skcb-&gt;msg_flags |= MSG_DONTROUTE;</div><div class='add'>+</div><div class='add'>+	if (sock_queue_rcv_skb_reason(&amp;jsk-&gt;sk, skb, &amp;reason) &lt; 0)</div><div class='add'>+		sk_skb_reason_drop(&amp;jsk-&gt;sk, skb, reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool j1939_sk_recv_match(struct j1939_priv *priv, struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+	bool match = false;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_for_each_entry(jsk, &amp;priv-&gt;j1939_socks, list) {</div><div class='add'>+		match = j1939_sk_recv_match_one(jsk, skcb);</div><div class='add'>+		if (match)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+</div><div class='add'>+	return match;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_sk_recv(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_for_each_entry(jsk, &amp;priv-&gt;j1939_socks, list) {</div><div class='add'>+		j1939_sk_recv_one(jsk, skb);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_sk_sock_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	/* This function will be called by the generic networking code, when</div><div class='add'>+	 * the socket is ultimately closed (sk-&gt;sk_destruct).</div><div class='add'>+	 *</div><div class='add'>+	 * The race between</div><div class='add'>+	 * - processing a received CAN frame</div><div class='add'>+	 *   (can_receive -&gt; j1939_can_recv)</div><div class='add'>+	 *   and accessing j1939_priv</div><div class='add'>+	 * ... and ...</div><div class='add'>+	 * - closing a socket</div><div class='add'>+	 *   (j1939_can_rx_unregister -&gt; can_rx_unregister)</div><div class='add'>+	 *   and calling the final j1939_priv_put()</div><div class='add'>+	 *</div><div class='add'>+	 * is avoided by calling the final j1939_priv_put() from this</div><div class='add'>+	 * RCU deferred cleanup call.</div><div class='add'>+	 */</div><div class='add'>+	if (jsk-&gt;priv) {</div><div class='add'>+		j1939_priv_put(jsk-&gt;priv);</div><div class='add'>+		jsk-&gt;priv = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* call generic CAN sock destruct */</div><div class='add'>+	can_sock_destruct(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	/* Ensure that "sk" is first member in "struct j1939_sock", so that we</div><div class='add'>+	 * can skip it during memset().</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct j1939_sock, sk) != 0);</div><div class='add'>+	memset((void *)jsk + sizeof(jsk-&gt;sk), 0x0,</div><div class='add'>+	       sizeof(*jsk) - sizeof(jsk-&gt;sk));</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;jsk-&gt;list);</div><div class='add'>+	init_waitqueue_head(&amp;jsk-&gt;waitq);</div><div class='add'>+	jsk-&gt;sk.sk_priority = j1939_to_sk_priority(6);</div><div class='add'>+	jsk-&gt;sk.sk_reuse = 1; /* per default */</div><div class='add'>+	jsk-&gt;addr.sa = J1939_NO_ADDR;</div><div class='add'>+	jsk-&gt;addr.da = J1939_NO_ADDR;</div><div class='add'>+	jsk-&gt;addr.pgn = J1939_NO_PGN;</div><div class='add'>+	jsk-&gt;pgn_rx_filter = J1939_NO_PGN;</div><div class='add'>+	atomic_set(&amp;jsk-&gt;skb_pending, 0);</div><div class='add'>+	spin_lock_init(&amp;jsk-&gt;sk_session_queue_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;jsk-&gt;sk_session_queue);</div><div class='add'>+	spin_lock_init(&amp;jsk-&gt;filters_lock);</div><div class='add'>+</div><div class='add'>+	/* j1939_sk_sock_destruct() depends on SOCK_RCU_FREE flag */</div><div class='add'>+	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+	sk-&gt;sk_destruct = j1939_sk_sock_destruct;</div><div class='add'>+	sk-&gt;sk_protocol = CAN_J1939;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_sanity_check(struct sockaddr_can *addr, int len)</div><div class='add'>+{</div><div class='add'>+	if (!addr)</div><div class='add'>+		return -EDESTADDRREQ;</div><div class='add'>+	if (len &lt; J1939_MIN_NAMELEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (addr-&gt;can_family != AF_CAN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!addr-&gt;can_ifindex)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (j1939_pgn_is_valid(addr-&gt;can_addr.j1939.pgn) &amp;&amp;</div><div class='add'>+	    !j1939_pgn_is_clean_pdu(addr-&gt;can_addr.j1939.pgn))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sock-&gt;sk);</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = j1939_sk_sanity_check(addr, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	lock_sock(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	priv = jsk-&gt;priv;</div><div class='add'>+	sk = sock-&gt;sk;</div><div class='add'>+	net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	/* Already bound to an interface? */</div><div class='add'>+	if (jsk-&gt;state &amp; J1939_SOCK_BOUND) {</div><div class='add'>+		/* A re-bind() to a different interface is not</div><div class='add'>+		 * supported.</div><div class='add'>+		 */</div><div class='add'>+		if (jsk-&gt;ifindex != addr-&gt;can_ifindex) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_release_sock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* drop old references */</div><div class='add'>+		j1939_jsk_del(priv, jsk);</div><div class='add'>+		j1939_local_ecu_put(priv, jsk-&gt;addr.src_name, jsk-&gt;addr.sa);</div><div class='add'>+	} else {</div><div class='add'>+		struct can_ml_priv *can_ml;</div><div class='add'>+		struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+		ndev = dev_get_by_index(net, addr-&gt;can_ifindex);</div><div class='add'>+		if (!ndev) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto out_release_sock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		can_ml = can_get_ml_priv(ndev);</div><div class='add'>+		if (!can_ml) {</div><div class='add'>+			dev_put(ndev);</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto out_release_sock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(ndev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+			dev_put(ndev);</div><div class='add'>+			ret = -ENETDOWN;</div><div class='add'>+			goto out_release_sock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv = j1939_netdev_start(ndev);</div><div class='add'>+		dev_put(ndev);</div><div class='add'>+		if (IS_ERR(priv)) {</div><div class='add'>+			ret = PTR_ERR(priv);</div><div class='add'>+			goto out_release_sock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jsk-&gt;ifindex = addr-&gt;can_ifindex;</div><div class='add'>+</div><div class='add'>+		/* the corresponding j1939_priv_put() is called via</div><div class='add'>+		 * sk-&gt;sk_destruct, which points to j1939_sk_sock_destruct()</div><div class='add'>+		 */</div><div class='add'>+		j1939_priv_get(priv);</div><div class='add'>+		jsk-&gt;priv = priv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set default transmit pgn */</div><div class='add'>+	if (j1939_pgn_is_valid(addr-&gt;can_addr.j1939.pgn))</div><div class='add'>+		jsk-&gt;pgn_rx_filter = addr-&gt;can_addr.j1939.pgn;</div><div class='add'>+	jsk-&gt;addr.src_name = addr-&gt;can_addr.j1939.name;</div><div class='add'>+	jsk-&gt;addr.sa = addr-&gt;can_addr.j1939.addr;</div><div class='add'>+</div><div class='add'>+	/* get new references */</div><div class='add'>+	ret = j1939_local_ecu_get(priv, jsk-&gt;addr.src_name, jsk-&gt;addr.sa);</div><div class='add'>+	if (ret) {</div><div class='add'>+		j1939_netdev_stop(priv);</div><div class='add'>+		jsk-&gt;priv = NULL;</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+		j1939_priv_put(priv);</div><div class='add'>+		goto out_release_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_jsk_add(priv, jsk);</div><div class='add'>+</div><div class='add'>+ out_release_sock: /* fall through */</div><div class='add'>+	release_sock(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='add'>+			    int len, int flags)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sock-&gt;sk);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = j1939_sk_sanity_check(addr, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	lock_sock(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* bind() before connect() is mandatory */</div><div class='add'>+	if (!(jsk-&gt;state &amp; J1939_SOCK_BOUND)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_release_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* A connect() to a different interface is not supported. */</div><div class='add'>+	if (jsk-&gt;ifindex != addr-&gt;can_ifindex) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_release_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!addr-&gt;can_addr.j1939.name &amp;&amp;</div><div class='add'>+	    addr-&gt;can_addr.j1939.addr == J1939_NO_ADDR &amp;&amp;</div><div class='add'>+	    !sock_flag(&amp;jsk-&gt;sk, SOCK_BROADCAST)) {</div><div class='add'>+		/* broadcast, but SO_BROADCAST not set */</div><div class='add'>+		ret = -EACCES;</div><div class='add'>+		goto out_release_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jsk-&gt;addr.dst_name = addr-&gt;can_addr.j1939.name;</div><div class='add'>+	jsk-&gt;addr.da = addr-&gt;can_addr.j1939.addr;</div><div class='add'>+</div><div class='add'>+	if (j1939_pgn_is_valid(addr-&gt;can_addr.j1939.pgn))</div><div class='add'>+		jsk-&gt;addr.pgn = addr-&gt;can_addr.j1939.pgn;</div><div class='add'>+</div><div class='add'>+	jsk-&gt;state |= J1939_SOCK_CONNECTED;</div><div class='add'>+</div><div class='add'>+ out_release_sock: /* fall through */</div><div class='add'>+	release_sock(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_sk_sock2sockaddr_can(struct sockaddr_can *addr,</div><div class='add'>+				       const struct j1939_sock *jsk, int peer)</div><div class='add'>+{</div><div class='add'>+	/* There are two holes (2 bytes and 3 bytes) to clear to avoid</div><div class='add'>+	 * leaking kernel information to user space.</div><div class='add'>+	 */</div><div class='add'>+	memset(addr, 0, J1939_MIN_NAMELEN);</div><div class='add'>+</div><div class='add'>+	addr-&gt;can_family = AF_CAN;</div><div class='add'>+	addr-&gt;can_ifindex = jsk-&gt;ifindex;</div><div class='add'>+	addr-&gt;can_addr.j1939.pgn = jsk-&gt;addr.pgn;</div><div class='add'>+	if (peer) {</div><div class='add'>+		addr-&gt;can_addr.j1939.name = jsk-&gt;addr.dst_name;</div><div class='add'>+		addr-&gt;can_addr.j1939.addr = jsk-&gt;addr.da;</div><div class='add'>+	} else {</div><div class='add'>+		addr-&gt;can_addr.j1939.name = jsk-&gt;addr.src_name;</div><div class='add'>+		addr-&gt;can_addr.j1939.addr = jsk-&gt;addr.sa;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+			    int peer)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (peer &amp;&amp; !(jsk-&gt;state &amp; J1939_SOCK_CONNECTED)) {</div><div class='add'>+		ret = -EADDRNOTAVAIL;</div><div class='add'>+		goto failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_sk_sock2sockaddr_can(addr, jsk, peer);</div><div class='add'>+	ret = J1939_MIN_NAMELEN;</div><div class='add'>+</div><div class='add'>+ failure:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_release(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (jsk-&gt;state &amp; J1939_SOCK_BOUND) {</div><div class='add'>+		struct j1939_priv *priv = jsk-&gt;priv;</div><div class='add'>+</div><div class='add'>+		if (wait_event_interruptible(jsk-&gt;waitq,</div><div class='add'>+					     !j1939_sock_pending_get(&amp;jsk-&gt;sk))) {</div><div class='add'>+			j1939_cancel_active_session(priv, sk);</div><div class='add'>+			j1939_sk_queue_drop_all(priv, jsk, ESHUTDOWN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		j1939_jsk_del(priv, jsk);</div><div class='add'>+</div><div class='add'>+		j1939_local_ecu_put(priv, jsk-&gt;addr.src_name,</div><div class='add'>+				    jsk-&gt;addr.sa);</div><div class='add'>+</div><div class='add'>+		j1939_netdev_stop(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(jsk-&gt;filters);</div><div class='add'>+	sock_orphan(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_setsockopt_flag(struct j1939_sock *jsk, sockptr_t optval,</div><div class='add'>+				    unsigned int optlen, int flag)</div><div class='add'>+{</div><div class='add'>+	int tmp;</div><div class='add'>+</div><div class='add'>+	if (optlen != sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, optval, optlen))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	lock_sock(&amp;jsk-&gt;sk);</div><div class='add'>+	if (tmp)</div><div class='add'>+		jsk-&gt;state |= flag;</div><div class='add'>+	else</div><div class='add'>+		jsk-&gt;state &amp;= ~flag;</div><div class='add'>+	release_sock(&amp;jsk-&gt;sk);</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	int tmp, count = 0, ret = 0;</div><div class='add'>+	struct j1939_filter *filters = NULL, *ofilters;</div><div class='add'>+</div><div class='add'>+	if (level != SOL_CAN_J1939)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case SO_J1939_FILTER:</div><div class='add'>+		if (!sockptr_is_null(optval) &amp;&amp; optlen != 0) {</div><div class='add'>+			struct j1939_filter *f;</div><div class='add'>+			int c;</div><div class='add'>+</div><div class='add'>+			if (optlen % sizeof(*filters) != 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			if (optlen &gt; J1939_FILTER_MAX *</div><div class='add'>+			    sizeof(struct j1939_filter))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			count = optlen / sizeof(*filters);</div><div class='add'>+			filters = memdup_sockptr(optval, optlen);</div><div class='add'>+			if (IS_ERR(filters))</div><div class='add'>+				return PTR_ERR(filters);</div><div class='add'>+</div><div class='add'>+			for (f = filters, c = count; c; f++, c--) {</div><div class='add'>+				f-&gt;name &amp;= f-&gt;name_mask;</div><div class='add'>+				f-&gt;pgn &amp;= f-&gt;pgn_mask;</div><div class='add'>+				f-&gt;addr &amp;= f-&gt;addr_mask;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lock_sock(&amp;jsk-&gt;sk);</div><div class='add'>+		spin_lock_bh(&amp;jsk-&gt;filters_lock);</div><div class='add'>+		ofilters = jsk-&gt;filters;</div><div class='add'>+		jsk-&gt;filters = filters;</div><div class='add'>+		jsk-&gt;nfilters = count;</div><div class='add'>+		spin_unlock_bh(&amp;jsk-&gt;filters_lock);</div><div class='add'>+		release_sock(&amp;jsk-&gt;sk);</div><div class='add'>+		kfree(ofilters);</div><div class='add'>+		return 0;</div><div class='add'>+	case SO_J1939_PROMISC:</div><div class='add'>+		return j1939_sk_setsockopt_flag(jsk, optval, optlen,</div><div class='add'>+						J1939_SOCK_PROMISC);</div><div class='add'>+	case SO_J1939_ERRQUEUE:</div><div class='add'>+		ret = j1939_sk_setsockopt_flag(jsk, optval, optlen,</div><div class='add'>+					       J1939_SOCK_ERRQUEUE);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (!(jsk-&gt;state &amp; J1939_SOCK_ERRQUEUE))</div><div class='add'>+			skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='add'>+		return ret;</div><div class='add'>+	case SO_J1939_SEND_PRIO:</div><div class='add'>+		if (optlen != sizeof(tmp))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;tmp, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (tmp &lt; 0 || tmp &gt; 7)</div><div class='add'>+			return -EDOM;</div><div class='add'>+		if (tmp &lt; 2 &amp;&amp; !capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		lock_sock(&amp;jsk-&gt;sk);</div><div class='add'>+		jsk-&gt;sk.sk_priority = j1939_to_sk_priority(tmp);</div><div class='add'>+		release_sock(&amp;jsk-&gt;sk);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOPROTOOPT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_getsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+			       char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	int ret, ulen;</div><div class='add'>+	/* set defaults for using 'int' properties */</div><div class='add'>+	int tmp = 0;</div><div class='add'>+	int len = sizeof(tmp);</div><div class='add'>+	void *val = &amp;tmp;</div><div class='add'>+</div><div class='add'>+	if (level != SOL_CAN_J1939)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (get_user(ulen, optlen))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (ulen &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_sock(&amp;jsk-&gt;sk);</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case SO_J1939_PROMISC:</div><div class='add'>+		tmp = (jsk-&gt;state &amp; J1939_SOCK_PROMISC) ? 1 : 0;</div><div class='add'>+		break;</div><div class='add'>+	case SO_J1939_ERRQUEUE:</div><div class='add'>+		tmp = (jsk-&gt;state &amp; J1939_SOCK_ERRQUEUE) ? 1 : 0;</div><div class='add'>+		break;</div><div class='add'>+	case SO_J1939_SEND_PRIO:</div><div class='add'>+		tmp = j1939_prio(jsk-&gt;sk.sk_priority);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOPROTOOPT;</div><div class='add'>+		goto no_copy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy to user, based on 'len' &amp; 'val'</div><div class='add'>+	 * but most sockopt's are 'int' properties, and have 'len' &amp; 'val'</div><div class='add'>+	 * left unchanged, but instead modified 'tmp'</div><div class='add'>+	 */</div><div class='add'>+	if (len &gt; ulen)</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	else if (put_user(len, optlen))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	else if (copy_to_user(optval, val, len))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+ no_copy:</div><div class='add'>+	release_sock(&amp;jsk-&gt;sk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='add'>+			    size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ~(MSG_DONTWAIT | MSG_ERRQUEUE | MSG_CMSG_COMPAT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MSG_ERRQUEUE)</div><div class='add'>+		return sock_recv_errqueue(sock-&gt;sk, msg, size, SOL_CAN_J1939,</div><div class='add'>+					  SCM_J1939_ERRQUEUE);</div><div class='add'>+</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;ret);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (size &lt; skb-&gt;len)</div><div class='add'>+		msg-&gt;msg_flags |= MSG_TRUNC;</div><div class='add'>+	else</div><div class='add'>+		size = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	ret = memcpy_to_msg(msg, skb-&gt;data, size);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		skb_free_datagram(sk, skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	if (j1939_address_is_valid(skcb-&gt;addr.da))</div><div class='add'>+		put_cmsg(msg, SOL_CAN_J1939, SCM_J1939_DEST_ADDR,</div><div class='add'>+			 sizeof(skcb-&gt;addr.da), &amp;skcb-&gt;addr.da);</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.dst_name)</div><div class='add'>+		put_cmsg(msg, SOL_CAN_J1939, SCM_J1939_DEST_NAME,</div><div class='add'>+			 sizeof(skcb-&gt;addr.dst_name), &amp;skcb-&gt;addr.dst_name);</div><div class='add'>+</div><div class='add'>+	put_cmsg(msg, SOL_CAN_J1939, SCM_J1939_PRIO,</div><div class='add'>+		 sizeof(skcb-&gt;priority), &amp;skcb-&gt;priority);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_name) {</div><div class='add'>+		struct sockaddr_can *paddr = msg-&gt;msg_name;</div><div class='add'>+</div><div class='add'>+		msg-&gt;msg_namelen = J1939_MIN_NAMELEN;</div><div class='add'>+		memset(msg-&gt;msg_name, 0, msg-&gt;msg_namelen);</div><div class='add'>+		paddr-&gt;can_family = AF_CAN;</div><div class='add'>+		paddr-&gt;can_ifindex = skb-&gt;skb_iif;</div><div class='add'>+		paddr-&gt;can_addr.j1939.name = skcb-&gt;addr.src_name;</div><div class='add'>+		paddr-&gt;can_addr.j1939.addr = skcb-&gt;addr.sa;</div><div class='add'>+		paddr-&gt;can_addr.j1939.pgn = skcb-&gt;addr.pgn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='add'>+	msg-&gt;msg_flags |= skcb-&gt;msg_flags;</div><div class='add'>+	skb_free_datagram(sk, skb);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *j1939_sk_alloc_skb(struct net_device *ndev,</div><div class='add'>+					  struct sock *sk,</div><div class='add'>+					  struct msghdr *msg, size_t size,</div><div class='add'>+					  int *errcode)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = sock_alloc_send_skb(sk,</div><div class='add'>+				  size +</div><div class='add'>+				  sizeof(struct can_frame) -</div><div class='add'>+				  sizeof(((struct can_frame *)NULL)-&gt;data) +</div><div class='add'>+				  sizeof(struct can_skb_priv),</div><div class='add'>+				  msg-&gt;msg_flags &amp; MSG_DONTWAIT, &amp;ret);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = ndev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+	skb_reserve(skb, offsetof(struct can_frame, data));</div><div class='add'>+</div><div class='add'>+	ret = memcpy_from_msg(skb_put(skb, size), msg, size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = ndev;</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	memset(skcb, 0, sizeof(*skcb));</div><div class='add'>+	skcb-&gt;addr = jsk-&gt;addr;</div><div class='add'>+	skcb-&gt;priority = j1939_prio(READ_ONCE(sk-&gt;sk_priority));</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_name) {</div><div class='add'>+		struct sockaddr_can *addr = msg-&gt;msg_name;</div><div class='add'>+</div><div class='add'>+		if (addr-&gt;can_addr.j1939.name ||</div><div class='add'>+		    addr-&gt;can_addr.j1939.addr != J1939_NO_ADDR) {</div><div class='add'>+			skcb-&gt;addr.dst_name = addr-&gt;can_addr.j1939.name;</div><div class='add'>+			skcb-&gt;addr.da = addr-&gt;can_addr.j1939.addr;</div><div class='add'>+		}</div><div class='add'>+		if (j1939_pgn_is_valid(addr-&gt;can_addr.j1939.pgn))</div><div class='add'>+			skcb-&gt;addr.pgn = addr-&gt;can_addr.j1939.pgn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*errcode = ret;</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+failure:</div><div class='add'>+	*errcode = ret;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t j1939_sk_opt_stats_get_size(enum j1939_sk_errqueue_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case J1939_ERRQUEUE_RX_RTS:</div><div class='add'>+		return</div><div class='add'>+			nla_total_size(sizeof(u32)) + /* J1939_NLA_TOTAL_SIZE */</div><div class='add'>+			nla_total_size(sizeof(u32)) + /* J1939_NLA_PGN */</div><div class='add'>+			nla_total_size(sizeof(u64)) + /* J1939_NLA_SRC_NAME */</div><div class='add'>+			nla_total_size(sizeof(u64)) + /* J1939_NLA_DEST_NAME */</div><div class='add'>+			nla_total_size(sizeof(u8)) +  /* J1939_NLA_SRC_ADDR */</div><div class='add'>+			nla_total_size(sizeof(u8)) +  /* J1939_NLA_DEST_ADDR */</div><div class='add'>+			0;</div><div class='add'>+	default:</div><div class='add'>+		return</div><div class='add'>+			nla_total_size(sizeof(u32)) + /* J1939_NLA_BYTES_ACKED */</div><div class='add'>+			0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+j1939_sk_get_timestamping_opt_stats(struct j1939_session *session,</div><div class='add'>+				    enum j1939_sk_errqueue_type type)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *stats;</div><div class='add'>+	u32 size;</div><div class='add'>+</div><div class='add'>+	stats = alloc_skb(j1939_sk_opt_stats_get_size(type), GFP_ATOMIC);</div><div class='add'>+	if (!stats)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_SIMPLE)</div><div class='add'>+		size = session-&gt;total_message_size;</div><div class='add'>+	else</div><div class='add'>+		size = min(session-&gt;pkt.tx_acked * 7,</div><div class='add'>+			   session-&gt;total_message_size);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case J1939_ERRQUEUE_RX_RTS:</div><div class='add'>+		nla_put_u32(stats, J1939_NLA_TOTAL_SIZE,</div><div class='add'>+			    session-&gt;total_message_size);</div><div class='add'>+		nla_put_u32(stats, J1939_NLA_PGN,</div><div class='add'>+			    session-&gt;skcb.addr.pgn);</div><div class='add'>+		nla_put_u64_64bit(stats, J1939_NLA_SRC_NAME,</div><div class='add'>+				  session-&gt;skcb.addr.src_name, J1939_NLA_PAD);</div><div class='add'>+		nla_put_u64_64bit(stats, J1939_NLA_DEST_NAME,</div><div class='add'>+				  session-&gt;skcb.addr.dst_name, J1939_NLA_PAD);</div><div class='add'>+		nla_put_u8(stats, J1939_NLA_SRC_ADDR,</div><div class='add'>+			   session-&gt;skcb.addr.sa);</div><div class='add'>+		nla_put_u8(stats, J1939_NLA_DEST_ADDR,</div><div class='add'>+			   session-&gt;skcb.addr.da);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nla_put_u32(stats, J1939_NLA_BYTES_ACKED, size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __j1939_sk_errqueue(struct j1939_session *session, struct sock *sk,</div><div class='add'>+				enum j1939_sk_errqueue_type type)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+	struct sock_exterr_skb *serr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	char *state = "UNK";</div><div class='add'>+	u32 tsflags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!(jsk-&gt;state &amp; J1939_SOCK_ERRQUEUE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tsflags = READ_ONCE(sk-&gt;sk_tsflags);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case J1939_ERRQUEUE_TX_ACK:</div><div class='add'>+		if (!(tsflags &amp; SOF_TIMESTAMPING_TX_ACK))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_TX_SCHED:</div><div class='add'>+		if (!(tsflags &amp; SOF_TIMESTAMPING_TX_SCHED))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_TX_ABORT:</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_RX_RTS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_ERRQUEUE_RX_DPO:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_ERRQUEUE_RX_ABORT:</div><div class='add'>+		if (!(tsflags &amp; SOF_TIMESTAMPING_RX_SOFTWARE))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(priv-&gt;ndev, "Unknown errqueue type %i\n", type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = j1939_sk_get_timestamping_opt_stats(session, type);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb-&gt;tstamp = ktime_get_real();</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct sock_exterr_skb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	serr = SKB_EXT_ERR(skb);</div><div class='add'>+	memset(serr, 0, sizeof(*serr));</div><div class='add'>+	switch (type) {</div><div class='add'>+	case J1939_ERRQUEUE_TX_ACK:</div><div class='add'>+		serr-&gt;ee.ee_errno = ENOMSG;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;</div><div class='add'>+		serr-&gt;ee.ee_info = SCM_TSTAMP_ACK;</div><div class='add'>+		state = "TX ACK";</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_TX_SCHED:</div><div class='add'>+		serr-&gt;ee.ee_errno = ENOMSG;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;</div><div class='add'>+		serr-&gt;ee.ee_info = SCM_TSTAMP_SCHED;</div><div class='add'>+		state = "TX SCH";</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_TX_ABORT:</div><div class='add'>+		serr-&gt;ee.ee_errno = session-&gt;err;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_LOCAL;</div><div class='add'>+		serr-&gt;ee.ee_info = J1939_EE_INFO_TX_ABORT;</div><div class='add'>+		state = "TX ABT";</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_RX_RTS:</div><div class='add'>+		serr-&gt;ee.ee_errno = ENOMSG;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_LOCAL;</div><div class='add'>+		serr-&gt;ee.ee_info = J1939_EE_INFO_RX_RTS;</div><div class='add'>+		state = "RX RTS";</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_RX_DPO:</div><div class='add'>+		serr-&gt;ee.ee_errno = ENOMSG;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_LOCAL;</div><div class='add'>+		serr-&gt;ee.ee_info = J1939_EE_INFO_RX_DPO;</div><div class='add'>+		state = "RX DPO";</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ERRQUEUE_RX_ABORT:</div><div class='add'>+		serr-&gt;ee.ee_errno = session-&gt;err;</div><div class='add'>+		serr-&gt;ee.ee_origin = SO_EE_ORIGIN_LOCAL;</div><div class='add'>+		serr-&gt;ee.ee_info = J1939_EE_INFO_RX_ABORT;</div><div class='add'>+		state = "RX ABT";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	serr-&gt;opt_stats = true;</div><div class='add'>+	if (tsflags &amp; SOF_TIMESTAMPING_OPT_ID)</div><div class='add'>+		serr-&gt;ee.ee_data = session-&gt;tskey;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p tskey: %i, state: %s\n",</div><div class='add'>+		   __func__, session, session-&gt;tskey, state);</div><div class='add'>+	err = sock_queue_err_skb(sk, skb);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void j1939_sk_errqueue(struct j1939_session *session,</div><div class='add'>+		       enum j1939_sk_errqueue_type type)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;sk) {</div><div class='add'>+		/* send TX notifications to the socket of origin  */</div><div class='add'>+		__j1939_sk_errqueue(session, session-&gt;sk, type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* spread RX notifications to all sockets subscribed to this session */</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_for_each_entry(jsk, &amp;priv-&gt;j1939_socks, list) {</div><div class='add'>+		if (j1939_sk_recv_match_one(jsk, &amp;session-&gt;skcb))</div><div class='add'>+			__j1939_sk_errqueue(session, &amp;jsk-&gt;sk, type);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void j1939_sk_send_loop_abort(struct sock *sk, int err)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (jsk-&gt;state &amp; J1939_SOCK_ERRQUEUE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_err = err;</div><div class='add'>+</div><div class='add'>+	sk_error_report(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_send_loop(struct j1939_priv *priv,  struct sock *sk,</div><div class='add'>+			      struct msghdr *msg, size_t size)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	struct j1939_session *session = j1939_sk_get_incomplete_session(jsk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t segment_size, todo_size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (session &amp;&amp;</div><div class='add'>+	    session-&gt;total_message_size != session-&gt;total_queued_size + size) {</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	todo_size = size;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct j1939_sk_buff_cb *skcb;</div><div class='add'>+</div><div class='add'>+		segment_size = min_t(size_t, J1939_MAX_TP_PACKET_SIZE,</div><div class='add'>+				     todo_size);</div><div class='add'>+</div><div class='add'>+		/* Allocate skb for one segment */</div><div class='add'>+		skb = j1939_sk_alloc_skb(priv-&gt;ndev, sk, msg, segment_size,</div><div class='add'>+					 &amp;ret);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		skcb = j1939_skb_to_cb(skb);</div><div class='add'>+</div><div class='add'>+		if (!session) {</div><div class='add'>+			/* at this point the size should be full size</div><div class='add'>+			 * of the session</div><div class='add'>+			 */</div><div class='add'>+			skcb-&gt;offset = 0;</div><div class='add'>+			session = j1939_tp_send(priv, skb, size);</div><div class='add'>+			if (IS_ERR(session)) {</div><div class='add'>+				ret = PTR_ERR(session);</div><div class='add'>+				goto kfree_skb;</div><div class='add'>+			}</div><div class='add'>+			if (j1939_sk_queue_session(session)) {</div><div class='add'>+				/* try to activate session if we a</div><div class='add'>+				 * fist in the queue</div><div class='add'>+				 */</div><div class='add'>+				if (!j1939_session_activate(session)) {</div><div class='add'>+					j1939_tp_schedule_txtimer(session, 0);</div><div class='add'>+				} else {</div><div class='add'>+					ret = -EBUSY;</div><div class='add'>+					session-&gt;err = ret;</div><div class='add'>+					j1939_sk_queue_drop_all(priv, jsk,</div><div class='add'>+								EBUSY);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			skcb-&gt;offset = session-&gt;total_queued_size;</div><div class='add'>+			j1939_session_skb_queue(session, skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		todo_size -= segment_size;</div><div class='add'>+		session-&gt;total_queued_size += segment_size;</div><div class='add'>+	} while (todo_size);</div><div class='add'>+</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0: /* OK */</div><div class='add'>+		if (todo_size)</div><div class='add'>+			netdev_warn(priv-&gt;ndev,</div><div class='add'>+				    "no error found and not completely queued?! %zu\n",</div><div class='add'>+				    todo_size);</div><div class='add'>+		ret = size;</div><div class='add'>+		break;</div><div class='add'>+	case -ERESTARTSYS:</div><div class='add'>+		ret = -EINTR;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case -EAGAIN: /* OK */</div><div class='add'>+		if (todo_size != size)</div><div class='add'>+			ret = size - todo_size;</div><div class='add'>+		break;</div><div class='add'>+	default: /* ERROR */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (session)</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+ kfree_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='add'>+			    size_t size)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct j1939_sock *jsk = j1939_sk(sk);</div><div class='add'>+	struct j1939_priv *priv;</div><div class='add'>+	int ifindex;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lock_sock(sock-&gt;sk);</div><div class='add'>+	/* various socket state tests */</div><div class='add'>+	if (!(jsk-&gt;state &amp; J1939_SOCK_BOUND)) {</div><div class='add'>+		ret = -EBADFD;</div><div class='add'>+		goto sendmsg_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = jsk-&gt;priv;</div><div class='add'>+	ifindex = jsk-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (!jsk-&gt;addr.src_name &amp;&amp; jsk-&gt;addr.sa == J1939_NO_ADDR) {</div><div class='add'>+		/* no source address assigned yet */</div><div class='add'>+		ret = -EBADFD;</div><div class='add'>+		goto sendmsg_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* deal with provided destination address info */</div><div class='add'>+	if (msg-&gt;msg_name) {</div><div class='add'>+		struct sockaddr_can *addr = msg-&gt;msg_name;</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;msg_namelen &lt; J1939_MIN_NAMELEN) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (addr-&gt;can_family != AF_CAN) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (addr-&gt;can_ifindex &amp;&amp; addr-&gt;can_ifindex != ifindex) {</div><div class='add'>+			ret = -EBADFD;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j1939_pgn_is_valid(addr-&gt;can_addr.j1939.pgn) &amp;&amp;</div><div class='add'>+		    !j1939_pgn_is_clean_pdu(addr-&gt;can_addr.j1939.pgn)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!addr-&gt;can_addr.j1939.name &amp;&amp;</div><div class='add'>+		    addr-&gt;can_addr.j1939.addr == J1939_NO_ADDR &amp;&amp;</div><div class='add'>+		    !sock_flag(sk, SOCK_BROADCAST)) {</div><div class='add'>+			/* broadcast, but SO_BROADCAST not set */</div><div class='add'>+			ret = -EACCES;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!jsk-&gt;addr.dst_name &amp;&amp; jsk-&gt;addr.da == J1939_NO_ADDR &amp;&amp;</div><div class='add'>+		    !sock_flag(sk, SOCK_BROADCAST)) {</div><div class='add'>+			/* broadcast, but SO_BROADCAST not set */</div><div class='add'>+			ret = -EACCES;</div><div class='add'>+			goto sendmsg_done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = j1939_sk_send_loop(priv, sk, msg, size);</div><div class='add'>+</div><div class='add'>+sendmsg_done:</div><div class='add'>+	release_sock(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_sk_netdev_event_netdown(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+	int error_code = ENETDOWN;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_for_each_entry(jsk, &amp;priv-&gt;j1939_socks, list) {</div><div class='add'>+		jsk-&gt;sk.sk_err = error_code;</div><div class='add'>+		if (!sock_flag(&amp;jsk-&gt;sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(&amp;jsk-&gt;sk);</div><div class='add'>+</div><div class='add'>+		j1939_sk_queue_drop_all(priv, jsk, error_code);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_sk_netdev_event_unregister(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct j1939_sock *jsk;</div><div class='add'>+	bool wait_rcu = false;</div><div class='add'>+</div><div class='add'>+rescan: /* The caller is holding a ref on this "priv" via j1939_priv_get_by_ndev(). */</div><div class='add'>+	read_lock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	list_for_each_entry(jsk, &amp;priv-&gt;j1939_socks, list) {</div><div class='add'>+		/* Skip if j1939_jsk_add() is not called on this socket. */</div><div class='add'>+		if (!(jsk-&gt;state &amp; J1939_SOCK_BOUND))</div><div class='add'>+			continue;</div><div class='add'>+		sk = &amp;jsk-&gt;sk;</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+		read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+		/* Check if j1939_jsk_del() is not yet called on this socket after holding</div><div class='add'>+		 * socket's lock, for both j1939_sk_bind() and j1939_sk_release() call</div><div class='add'>+		 * j1939_jsk_del() with socket's lock held.</div><div class='add'>+		 */</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+		if (jsk-&gt;state &amp; J1939_SOCK_BOUND) {</div><div class='add'>+			/* Neither j1939_sk_bind() nor j1939_sk_release() called j1939_jsk_del().</div><div class='add'>+			 * Make this socket no longer bound, by pretending as if j1939_sk_bind()</div><div class='add'>+			 * dropped old references but did not get new references.</div><div class='add'>+			 */</div><div class='add'>+			j1939_jsk_del(priv, jsk);</div><div class='add'>+			j1939_local_ecu_put(priv, jsk-&gt;addr.src_name, jsk-&gt;addr.sa);</div><div class='add'>+			j1939_netdev_stop(priv);</div><div class='add'>+			/* Call j1939_priv_put() now and prevent j1939_sk_sock_destruct() from</div><div class='add'>+			 * calling the corresponding j1939_priv_put().</div><div class='add'>+			 *</div><div class='add'>+			 * j1939_sk_sock_destruct() is supposed to call j1939_priv_put() after</div><div class='add'>+			 * an RCU grace period. But since the caller is holding a ref on this</div><div class='add'>+			 * "priv", we can defer synchronize_rcu() until immediately before</div><div class='add'>+			 * the caller calls j1939_priv_put().</div><div class='add'>+			 */</div><div class='add'>+			j1939_priv_put(priv);</div><div class='add'>+			jsk-&gt;priv = NULL;</div><div class='add'>+			wait_rcu = true;</div><div class='add'>+		}</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		goto rescan;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;priv-&gt;j1939_socks_lock);</div><div class='add'>+	if (wait_rcu)</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_sk_no_ioctlcmd(struct socket *sock, unsigned int cmd,</div><div class='add'>+				unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	/* no ioctls for socket layer -&gt; hand it down to NIC layer */</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct proto_ops j1939_ops = {</div><div class='add'>+	.family = PF_CAN,</div><div class='add'>+	.release = j1939_sk_release,</div><div class='add'>+	.bind = j1939_sk_bind,</div><div class='add'>+	.connect = j1939_sk_connect,</div><div class='add'>+	.socketpair = sock_no_socketpair,</div><div class='add'>+	.accept = sock_no_accept,</div><div class='add'>+	.getname = j1939_sk_getname,</div><div class='add'>+	.poll = datagram_poll,</div><div class='add'>+	.ioctl = j1939_sk_no_ioctlcmd,</div><div class='add'>+	.listen = sock_no_listen,</div><div class='add'>+	.shutdown = sock_no_shutdown,</div><div class='add'>+	.setsockopt = j1939_sk_setsockopt,</div><div class='add'>+	.getsockopt = j1939_sk_getsockopt,</div><div class='add'>+	.sendmsg = j1939_sk_sendmsg,</div><div class='add'>+	.recvmsg = j1939_sk_recvmsg,</div><div class='add'>+	.mmap = sock_no_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct proto j1939_proto __read_mostly = {</div><div class='add'>+	.name = "CAN_J1939",</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.obj_size = sizeof(struct j1939_sock),</div><div class='add'>+	.init = j1939_sk_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct can_proto j1939_can_proto = {</div><div class='add'>+	.type = SOCK_DGRAM,</div><div class='add'>+	.protocol = CAN_J1939,</div><div class='add'>+	.ops = &amp;j1939_ops,</div><div class='add'>+	.prot = &amp;j1939_proto,</div><div class='add'>+};</div><div class='head'>diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c<br/>new file mode 100644<br/>index 000000000000..fbf5c8001c9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/j1939/transport.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/j1939/transport.c</a></div><div class='hunk'>@@ -0,0 +1,2220 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2010-2011 EIA Electronics,</div><div class='add'>+//                         Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='add'>+// Copyright (c) 2018 Protonic,</div><div class='add'>+//                         Robin van der Gracht &lt;robin@protonic.nl&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2017-2019 Pengutronix,</div><div class='add'>+//                         Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "j1939-priv.h"</div><div class='add'>+</div><div class='add'>+#define J1939_XTP_TX_RETRY_LIMIT 100</div><div class='add'>+</div><div class='add'>+#define J1939_ETP_PGN_CTL 0xc800</div><div class='add'>+#define J1939_ETP_PGN_DAT 0xc700</div><div class='add'>+#define J1939_TP_PGN_CTL 0xec00</div><div class='add'>+#define J1939_TP_PGN_DAT 0xeb00</div><div class='add'>+</div><div class='add'>+#define J1939_TP_CMD_RTS 0x10</div><div class='add'>+#define J1939_TP_CMD_CTS 0x11</div><div class='add'>+#define J1939_TP_CMD_EOMA 0x13</div><div class='add'>+#define J1939_TP_CMD_BAM 0x20</div><div class='add'>+#define J1939_TP_CMD_ABORT 0xff</div><div class='add'>+</div><div class='add'>+#define J1939_ETP_CMD_RTS 0x14</div><div class='add'>+#define J1939_ETP_CMD_CTS 0x15</div><div class='add'>+#define J1939_ETP_CMD_DPO 0x16</div><div class='add'>+#define J1939_ETP_CMD_EOMA 0x17</div><div class='add'>+#define J1939_ETP_CMD_ABORT 0xff</div><div class='add'>+</div><div class='add'>+enum j1939_xtp_abort {</div><div class='add'>+	J1939_XTP_NO_ABORT = 0,</div><div class='add'>+	J1939_XTP_ABORT_BUSY = 1,</div><div class='add'>+	/* Already in one or more connection managed sessions and</div><div class='add'>+	 * cannot support another.</div><div class='add'>+	 *</div><div class='add'>+	 * EALREADY:</div><div class='add'>+	 * Operation already in progress</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_RESOURCE = 2,</div><div class='add'>+	/* System resources were needed for another task so this</div><div class='add'>+	 * connection managed session was terminated.</div><div class='add'>+	 *</div><div class='add'>+	 * EMSGSIZE:</div><div class='add'>+	 * The socket type requires that message be sent atomically,</div><div class='add'>+	 * and the size of the message to be sent made this</div><div class='add'>+	 * impossible.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_TIMEOUT = 3,</div><div class='add'>+	/* A timeout occurred and this is the connection abort to</div><div class='add'>+	 * close the session.</div><div class='add'>+	 *</div><div class='add'>+	 * EHOSTUNREACH:</div><div class='add'>+	 * The destination host cannot be reached (probably because</div><div class='add'>+	 * the host is down or a remote router cannot reach it).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_GENERIC = 4,</div><div class='add'>+	/* CTS messages received when data transfer is in progress</div><div class='add'>+	 *</div><div class='add'>+	 * EBADMSG:</div><div class='add'>+	 * Not a data message</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_FAULT = 5,</div><div class='add'>+	/* Maximal retransmit request limit reached</div><div class='add'>+	 *</div><div class='add'>+	 * ENOTRECOVERABLE:</div><div class='add'>+	 * State not recoverable</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_UNEXPECTED_DATA = 6,</div><div class='add'>+	/* Unexpected data transfer packet</div><div class='add'>+	 *</div><div class='add'>+	 * ENOTCONN:</div><div class='add'>+	 * Transport endpoint is not connected</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_BAD_SEQ = 7,</div><div class='add'>+	/* Bad sequence number (and software is not able to recover)</div><div class='add'>+	 *</div><div class='add'>+	 * EILSEQ:</div><div class='add'>+	 * Illegal byte sequence</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_DUP_SEQ = 8,</div><div class='add'>+	/* Duplicate sequence number (and software is not able to</div><div class='add'>+	 * recover)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_EDPO_UNEXPECTED = 9,</div><div class='add'>+	/* Unexpected EDPO packet (ETP) or Message size &gt; 1785 bytes</div><div class='add'>+	 * (TP)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_BAD_EDPO_PGN = 10,</div><div class='add'>+	/* Unexpected EDPO PGN (PGN in EDPO is bad) */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_EDPO_OUTOF_CTS = 11,</div><div class='add'>+	/* EDPO number of packets is greater than CTS */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_BAD_EDPO_OFFSET = 12,</div><div class='add'>+	/* Bad EDPO offset */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_OTHER_DEPRECATED = 13,</div><div class='add'>+	/* Deprecated. Use 250 instead (Any other reason)  */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_ECTS_UNXPECTED_PGN = 14,</div><div class='add'>+	/* Unexpected ECTS PGN (PGN in ECTS is bad) */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_ECTS_TOO_BIG = 15,</div><div class='add'>+	/* ECTS requested packets exceeds message size */</div><div class='add'>+</div><div class='add'>+	J1939_XTP_ABORT_OTHER = 250,</div><div class='add'>+	/* Any other reason (if a Connection Abort reason is</div><div class='add'>+	 * identified that is not listed in the table use code 250)</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int j1939_tp_block = 255;</div><div class='add'>+static unsigned int j1939_tp_packet_delay;</div><div class='add'>+static unsigned int j1939_tp_padding = 1;</div><div class='add'>+</div><div class='add'>+/* helpers */</div><div class='add'>+static const char *j1939_xtp_abort_to_str(enum j1939_xtp_abort abort)</div><div class='add'>+{</div><div class='add'>+	switch (abort) {</div><div class='add'>+	case J1939_XTP_ABORT_BUSY:</div><div class='add'>+		return "Already in one or more connection managed sessions and cannot support another.";</div><div class='add'>+	case J1939_XTP_ABORT_RESOURCE:</div><div class='add'>+		return "System resources were needed for another task so this connection managed session was terminated.";</div><div class='add'>+	case J1939_XTP_ABORT_TIMEOUT:</div><div class='add'>+		return "A timeout occurred and this is the connection abort to close the session.";</div><div class='add'>+	case J1939_XTP_ABORT_GENERIC:</div><div class='add'>+		return "CTS messages received when data transfer is in progress";</div><div class='add'>+	case J1939_XTP_ABORT_FAULT:</div><div class='add'>+		return "Maximal retransmit request limit reached";</div><div class='add'>+	case J1939_XTP_ABORT_UNEXPECTED_DATA:</div><div class='add'>+		return "Unexpected data transfer packet";</div><div class='add'>+	case J1939_XTP_ABORT_BAD_SEQ:</div><div class='add'>+		return "Bad sequence number (and software is not able to recover)";</div><div class='add'>+	case J1939_XTP_ABORT_DUP_SEQ:</div><div class='add'>+		return "Duplicate sequence number (and software is not able to recover)";</div><div class='add'>+	case J1939_XTP_ABORT_EDPO_UNEXPECTED:</div><div class='add'>+		return "Unexpected EDPO packet (ETP) or Message size &gt; 1785 bytes (TP)";</div><div class='add'>+	case J1939_XTP_ABORT_BAD_EDPO_PGN:</div><div class='add'>+		return "Unexpected EDPO PGN (PGN in EDPO is bad)";</div><div class='add'>+	case J1939_XTP_ABORT_EDPO_OUTOF_CTS:</div><div class='add'>+		return "EDPO number of packets is greater than CTS";</div><div class='add'>+	case J1939_XTP_ABORT_BAD_EDPO_OFFSET:</div><div class='add'>+		return "Bad EDPO offset";</div><div class='add'>+	case J1939_XTP_ABORT_OTHER_DEPRECATED:</div><div class='add'>+		return "Deprecated. Use 250 instead (Any other reason)";</div><div class='add'>+	case J1939_XTP_ABORT_ECTS_UNXPECTED_PGN:</div><div class='add'>+		return "Unexpected ECTS PGN (PGN in ECTS is bad)";</div><div class='add'>+	case J1939_XTP_ABORT_ECTS_TOO_BIG:</div><div class='add'>+		return "ECTS requested packets exceeds message size";</div><div class='add'>+	case J1939_XTP_ABORT_OTHER:</div><div class='add'>+		return "Any other reason (if a Connection Abort reason is identified that is not listed in the table use code 250)";</div><div class='add'>+	default:</div><div class='add'>+		return "&lt;unknown&gt;";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_abort_to_errno(struct j1939_priv *priv,</div><div class='add'>+				    enum j1939_xtp_abort abort)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (abort) {</div><div class='add'>+	case J1939_XTP_NO_ABORT:</div><div class='add'>+		WARN_ON_ONCE(abort == J1939_XTP_NO_ABORT);</div><div class='add'>+		err = 0;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_BUSY:</div><div class='add'>+		err = EALREADY;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_RESOURCE:</div><div class='add'>+		err = EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_TIMEOUT:</div><div class='add'>+		err = EHOSTUNREACH;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_GENERIC:</div><div class='add'>+		err = EBADMSG;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_FAULT:</div><div class='add'>+		err = ENOTRECOVERABLE;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_UNEXPECTED_DATA:</div><div class='add'>+		err = ENOTCONN;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_BAD_SEQ:</div><div class='add'>+		err = EILSEQ;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_DUP_SEQ:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_EDPO_UNEXPECTED:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_BAD_EDPO_PGN:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_EDPO_OUTOF_CTS:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_BAD_EDPO_OFFSET:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_OTHER_DEPRECATED:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_ECTS_UNXPECTED_PGN:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_ECTS_TOO_BIG:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	case J1939_XTP_ABORT_OTHER:</div><div class='add'>+		err = EPROTO;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_warn(priv-&gt;ndev, "Unknown abort code %i", abort);</div><div class='add'>+		err = EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void j1939_session_list_lock(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;active_session_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void j1939_session_list_unlock(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;active_session_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_session_get(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;session-&gt;kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* session completion functions */</div><div class='add'>+static void __j1939_session_drop(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	if (!session-&gt;transmission)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	j1939_sock_pending_del(session-&gt;sk);</div><div class='add'>+	sock_put(session-&gt;sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_destroy(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;transmission) {</div><div class='add'>+		if (session-&gt;err)</div><div class='add'>+			j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ABORT);</div><div class='add'>+		else</div><div class='add'>+			j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ACK);</div><div class='add'>+	} else if (session-&gt;err) {</div><div class='add'>+			j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;session-&gt;sk_session_queue_entry));</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;session-&gt;active_session_list_entry));</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;session-&gt;skb_queue)) != NULL) {</div><div class='add'>+		/* drop ref taken in j1939_session_skb_queue() */</div><div class='add'>+		skb_unref(skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	__j1939_session_drop(session);</div><div class='add'>+	j1939_priv_put(session-&gt;priv);</div><div class='add'>+	kfree(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __j1939_session_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session = container_of(kref, struct j1939_session,</div><div class='add'>+						     kref);</div><div class='add'>+</div><div class='add'>+	j1939_session_destroy(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_session_put(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;session-&gt;kref, __j1939_session_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_txtimer_cancel(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	if (hrtimer_cancel(&amp;session-&gt;txtimer))</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_rxtimer_cancel(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	if (hrtimer_cancel(&amp;session-&gt;rxtimer))</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_session_timers_cancel(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	j1939_session_txtimer_cancel(session);</div><div class='add'>+	j1939_session_rxtimer_cancel(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool j1939_cb_is_broadcast(const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	return (!skcb-&gt;addr.dst_name &amp;&amp; (skcb-&gt;addr.da == 0xff));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_skb_drop_old(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *do_skb;</div><div class='add'>+	struct j1939_sk_buff_cb *do_skcb;</div><div class='add'>+	unsigned int offset_start;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_len(&amp;session-&gt;skb_queue) &lt; 2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	offset_start = session-&gt;pkt.tx_acked * 7;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;session-&gt;skb_queue.lock, flags);</div><div class='add'>+	do_skb = skb_peek(&amp;session-&gt;skb_queue);</div><div class='add'>+	do_skcb = j1939_skb_to_cb(do_skb);</div><div class='add'>+</div><div class='add'>+	if ((do_skcb-&gt;offset + do_skb-&gt;len) &lt; offset_start) {</div><div class='add'>+		__skb_unlink(do_skb, &amp;session-&gt;skb_queue);</div><div class='add'>+		/* drop ref taken in j1939_session_skb_queue() */</div><div class='add'>+		skb_unref(do_skb);</div><div class='add'>+		spin_unlock_irqrestore(&amp;session-&gt;skb_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+		kfree_skb(do_skb);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irqrestore(&amp;session-&gt;skb_queue.lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_session_skb_queue(struct j1939_session *session,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+</div><div class='add'>+	j1939_ac_fixup(priv, skb);</div><div class='add'>+</div><div class='add'>+	if (j1939_address_is_unicast(skcb-&gt;addr.da) &amp;&amp;</div><div class='add'>+	    priv-&gt;ents[skcb-&gt;addr.da].nusers)</div><div class='add'>+		skcb-&gt;flags |= J1939_ECU_LOCAL_DST;</div><div class='add'>+</div><div class='add'>+	skcb-&gt;flags |= J1939_ECU_LOCAL_SRC;</div><div class='add'>+</div><div class='add'>+	skb_get(skb);</div><div class='add'>+	skb_queue_tail(&amp;session-&gt;skb_queue, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+sk_buff *j1939_session_skb_get_by_offset(struct j1939_session *session,</div><div class='add'>+					 unsigned int offset_start)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_sk_buff_cb *do_skcb;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct sk_buff *do_skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;session-&gt;skb_queue.lock, flags);</div><div class='add'>+	skb_queue_walk(&amp;session-&gt;skb_queue, do_skb) {</div><div class='add'>+		do_skcb = j1939_skb_to_cb(do_skb);</div><div class='add'>+</div><div class='add'>+		if ((offset_start &gt;= do_skcb-&gt;offset &amp;&amp;</div><div class='add'>+		     offset_start &lt; (do_skcb-&gt;offset + do_skb-&gt;len)) ||</div><div class='add'>+		     (offset_start == 0 &amp;&amp; do_skcb-&gt;offset == 0 &amp;&amp; do_skb-&gt;len == 0)) {</div><div class='add'>+			skb = do_skb;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		skb_get(skb);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;session-&gt;skb_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "%s: 0x%p: no skb found for start: %i, queue size: %i\n",</div><div class='add'>+			   __func__, session, offset_start,</div><div class='add'>+			   skb_queue_len(&amp;session-&gt;skb_queue));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *j1939_session_skb_get(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset_start;</div><div class='add'>+</div><div class='add'>+	offset_start = session-&gt;pkt.dpo * 7;</div><div class='add'>+	return j1939_session_skb_get_by_offset(session, offset_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* see if we are receiver</div><div class='add'>+ * returns 0 for broadcasts, although we will receive them</div><div class='add'>+ */</div><div class='add'>+static inline int j1939_tp_im_receiver(const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	return skcb-&gt;flags &amp; J1939_ECU_LOCAL_DST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* see if we are sender */</div><div class='add'>+static inline int j1939_tp_im_transmitter(const struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	return skcb-&gt;flags &amp; J1939_ECU_LOCAL_SRC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* see if we are involved as either receiver or transmitter */</div><div class='add'>+static int j1939_tp_im_involved(const struct j1939_sk_buff_cb *skcb, bool swap)</div><div class='add'>+{</div><div class='add'>+	if (swap)</div><div class='add'>+		return j1939_tp_im_receiver(skcb);</div><div class='add'>+	else</div><div class='add'>+		return j1939_tp_im_transmitter(skcb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_tp_im_involved_anydir(struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	return skcb-&gt;flags &amp; (J1939_ECU_LOCAL_SRC | J1939_ECU_LOCAL_DST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* extract pgn from flow-ctl message */</div><div class='add'>+static inline pgn_t j1939_xtp_ctl_to_pgn(const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	pgn_t pgn;</div><div class='add'>+</div><div class='add'>+	pgn = (dat[7] &lt;&lt; 16) | (dat[6] &lt;&lt; 8) | (dat[5] &lt;&lt; 0);</div><div class='add'>+	if (j1939_pgn_is_pdu1(pgn))</div><div class='add'>+		pgn &amp;= 0xffff00;</div><div class='add'>+	return pgn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int j1939_tp_ctl_to_size(const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	return (dat[2] &lt;&lt; 8) + (dat[1] &lt;&lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int j1939_etp_ctl_to_packet(const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	return (dat[4] &lt;&lt; 16) | (dat[3] &lt;&lt; 8) | (dat[2] &lt;&lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int j1939_etp_ctl_to_size(const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	return (dat[4] &lt;&lt; 24) | (dat[3] &lt;&lt; 16) |</div><div class='add'>+		(dat[2] &lt;&lt; 8) | (dat[1] &lt;&lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* find existing session:</div><div class='add'>+ * reverse: swap cb's src &amp; dst</div><div class='add'>+ * there is no problem with matching broadcasts, since</div><div class='add'>+ * broadcasts (no dst, no da) would never call this</div><div class='add'>+ * with reverse == true</div><div class='add'>+ */</div><div class='add'>+static bool j1939_session_match(struct j1939_addr *se_addr,</div><div class='add'>+				struct j1939_addr *sk_addr, bool reverse)</div><div class='add'>+{</div><div class='add'>+	if (se_addr-&gt;type != sk_addr-&gt;type)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (reverse) {</div><div class='add'>+		if (se_addr-&gt;src_name) {</div><div class='add'>+			if (se_addr-&gt;src_name != sk_addr-&gt;dst_name)</div><div class='add'>+				return false;</div><div class='add'>+		} else if (se_addr-&gt;sa != sk_addr-&gt;da) {</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (se_addr-&gt;dst_name) {</div><div class='add'>+			if (se_addr-&gt;dst_name != sk_addr-&gt;src_name)</div><div class='add'>+				return false;</div><div class='add'>+		} else if (se_addr-&gt;da != sk_addr-&gt;sa) {</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (se_addr-&gt;src_name) {</div><div class='add'>+			if (se_addr-&gt;src_name != sk_addr-&gt;src_name)</div><div class='add'>+				return false;</div><div class='add'>+		} else if (se_addr-&gt;sa != sk_addr-&gt;sa) {</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (se_addr-&gt;dst_name) {</div><div class='add'>+			if (se_addr-&gt;dst_name != sk_addr-&gt;dst_name)</div><div class='add'>+				return false;</div><div class='add'>+		} else if (se_addr-&gt;da != sk_addr-&gt;da) {</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_session_get_by_addr_locked(struct j1939_priv *priv,</div><div class='add'>+						struct list_head *root,</div><div class='add'>+						struct j1939_addr *addr,</div><div class='add'>+						bool reverse, bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;active_session_list_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(session, root, active_session_list_entry) {</div><div class='add'>+		j1939_session_get(session);</div><div class='add'>+		if (j1939_session_match(&amp;session-&gt;skcb.addr, addr, reverse) &amp;&amp;</div><div class='add'>+		    session-&gt;transmission == transmitter)</div><div class='add'>+			return session;</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_session_get_simple(struct j1939_priv *priv,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;active_session_list_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(session, &amp;priv-&gt;active_session_list,</div><div class='add'>+			    active_session_list_entry) {</div><div class='add'>+		j1939_session_get(session);</div><div class='add'>+		if (session-&gt;skcb.addr.type == J1939_SIMPLE &amp;&amp;</div><div class='add'>+		    session-&gt;tskey == skcb-&gt;tskey &amp;&amp; session-&gt;sk == skb-&gt;sk)</div><div class='add'>+			return session;</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_session_get_by_addr(struct j1939_priv *priv,</div><div class='add'>+					 struct j1939_addr *addr,</div><div class='add'>+					 bool reverse, bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	j1939_session_list_lock(priv);</div><div class='add'>+	session = j1939_session_get_by_addr_locked(priv,</div><div class='add'>+						   &amp;priv-&gt;active_session_list,</div><div class='add'>+						   addr, reverse, transmitter);</div><div class='add'>+	j1939_session_list_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_skbcb_swap(struct j1939_sk_buff_cb *skcb)</div><div class='add'>+{</div><div class='add'>+	u8 tmp = 0;</div><div class='add'>+</div><div class='add'>+	swap(skcb-&gt;addr.dst_name, skcb-&gt;addr.src_name);</div><div class='add'>+	swap(skcb-&gt;addr.da, skcb-&gt;addr.sa);</div><div class='add'>+</div><div class='add'>+	/* swap SRC and DST flags, leave other untouched */</div><div class='add'>+	if (skcb-&gt;flags &amp; J1939_ECU_LOCAL_SRC)</div><div class='add'>+		tmp |= J1939_ECU_LOCAL_DST;</div><div class='add'>+	if (skcb-&gt;flags &amp; J1939_ECU_LOCAL_DST)</div><div class='add'>+		tmp |= J1939_ECU_LOCAL_SRC;</div><div class='add'>+	skcb-&gt;flags &amp;= ~(J1939_ECU_LOCAL_SRC | J1939_ECU_LOCAL_DST);</div><div class='add'>+	skcb-&gt;flags |= tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+sk_buff *j1939_tp_tx_dat_new(struct j1939_priv *priv,</div><div class='add'>+			     const struct j1939_sk_buff_cb *re_skcb,</div><div class='add'>+			     bool ctl,</div><div class='add'>+			     bool swap_src_dst)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(sizeof(struct can_frame) + sizeof(struct can_skb_priv),</div><div class='add'>+			GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = priv-&gt;ndev;</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = priv-&gt;ndev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+	/* reserve CAN header */</div><div class='add'>+	skb_reserve(skb, offsetof(struct can_frame, data));</div><div class='add'>+</div><div class='add'>+	/* skb-&gt;cb must be large enough to hold a j1939_sk_buff_cb structure */</div><div class='add'>+	BUILD_BUG_ON(sizeof(skb-&gt;cb) &lt; sizeof(*re_skcb));</div><div class='add'>+</div><div class='add'>+	memcpy(skb-&gt;cb, re_skcb, sizeof(*re_skcb));</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	if (swap_src_dst)</div><div class='add'>+		j1939_skbcb_swap(skcb);</div><div class='add'>+</div><div class='add'>+	if (ctl) {</div><div class='add'>+		if (skcb-&gt;addr.type == J1939_ETP)</div><div class='add'>+			skcb-&gt;addr.pgn = J1939_ETP_PGN_CTL;</div><div class='add'>+		else</div><div class='add'>+			skcb-&gt;addr.pgn = J1939_TP_PGN_CTL;</div><div class='add'>+	} else {</div><div class='add'>+		if (skcb-&gt;addr.type == J1939_ETP)</div><div class='add'>+			skcb-&gt;addr.pgn = J1939_ETP_PGN_DAT;</div><div class='add'>+		else</div><div class='add'>+			skcb-&gt;addr.pgn = J1939_TP_PGN_DAT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TP transmit packet functions */</div><div class='add'>+static int j1939_tp_tx_dat(struct j1939_session *session,</div><div class='add'>+			   const u8 *dat, int len)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = j1939_tp_tx_dat_new(priv, &amp;session-&gt;skcb,</div><div class='add'>+				  false, false);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, dat, len);</div><div class='add'>+	if (j1939_tp_padding &amp;&amp; len &lt; 8)</div><div class='add'>+		memset(skb_put(skb, 8 - len), 0xff, 8 - len);</div><div class='add'>+</div><div class='add'>+	return j1939_send_one(priv, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_do_tx_ctl(struct j1939_priv *priv,</div><div class='add'>+			       const struct j1939_sk_buff_cb *re_skcb,</div><div class='add'>+			       bool swap_src_dst, pgn_t pgn, const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *skdat;</div><div class='add'>+</div><div class='add'>+	if (!j1939_tp_im_involved(re_skcb, swap_src_dst))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	skb = j1939_tp_tx_dat_new(priv, re_skcb, true, swap_src_dst);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	skdat = skb_put(skb, 8);</div><div class='add'>+	memcpy(skdat, dat, 5);</div><div class='add'>+	skdat[5] = (pgn &gt;&gt; 0);</div><div class='add'>+	skdat[6] = (pgn &gt;&gt; 8);</div><div class='add'>+	skdat[7] = (pgn &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	return j1939_send_one(priv, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int j1939_tp_tx_ctl(struct j1939_session *session,</div><div class='add'>+				  bool swap_src_dst, const u8 *dat)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return j1939_xtp_do_tx_ctl(priv, &amp;session-&gt;skcb,</div><div class='add'>+				   swap_src_dst,</div><div class='add'>+				   session-&gt;skcb.addr.pgn, dat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_tx_abort(struct j1939_priv *priv,</div><div class='add'>+			      const struct j1939_sk_buff_cb *re_skcb,</div><div class='add'>+			      bool swap_src_dst,</div><div class='add'>+			      enum j1939_xtp_abort err,</div><div class='add'>+			      pgn_t pgn)</div><div class='add'>+{</div><div class='add'>+	u8 dat[5];</div><div class='add'>+</div><div class='add'>+	if (!j1939_tp_im_involved(re_skcb, swap_src_dst))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(dat, 0xff, sizeof(dat));</div><div class='add'>+	dat[0] = J1939_TP_CMD_ABORT;</div><div class='add'>+	dat[1] = err;</div><div class='add'>+	return j1939_xtp_do_tx_ctl(priv, re_skcb, swap_src_dst, pgn, dat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_tp_schedule_txtimer(struct j1939_session *session, int msec)</div><div class='add'>+{</div><div class='add'>+	j1939_session_get(session);</div><div class='add'>+	hrtimer_start(&amp;session-&gt;txtimer, ms_to_ktime(msec),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void j1939_tp_set_rxtimeout(struct j1939_session *session,</div><div class='add'>+					  int msec)</div><div class='add'>+{</div><div class='add'>+	j1939_session_rxtimer_cancel(session);</div><div class='add'>+	j1939_session_get(session);</div><div class='add'>+	hrtimer_start(&amp;session-&gt;rxtimer, ms_to_ktime(msec),</div><div class='add'>+		      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_session_tx_rts(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	u8 dat[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(dat, 0xff, sizeof(dat));</div><div class='add'>+</div><div class='add'>+	dat[1] = (session-&gt;total_message_size &gt;&gt; 0);</div><div class='add'>+	dat[2] = (session-&gt;total_message_size &gt;&gt; 8);</div><div class='add'>+	dat[3] = session-&gt;pkt.total;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_ETP) {</div><div class='add'>+		dat[0] = J1939_ETP_CMD_RTS;</div><div class='add'>+		dat[1] = (session-&gt;total_message_size &gt;&gt; 0);</div><div class='add'>+		dat[2] = (session-&gt;total_message_size &gt;&gt; 8);</div><div class='add'>+		dat[3] = (session-&gt;total_message_size &gt;&gt; 16);</div><div class='add'>+		dat[4] = (session-&gt;total_message_size &gt;&gt; 24);</div><div class='add'>+	} else if (j1939_cb_is_broadcast(&amp;session-&gt;skcb)) {</div><div class='add'>+		dat[0] = J1939_TP_CMD_BAM;</div><div class='add'>+		/* fake cts for broadcast */</div><div class='add'>+		session-&gt;pkt.tx = 0;</div><div class='add'>+	} else {</div><div class='add'>+		dat[0] = J1939_TP_CMD_RTS;</div><div class='add'>+		dat[4] = dat[3];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dat[0] == session-&gt;last_txcmd)</div><div class='add'>+		/* done already */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = j1939_tp_tx_ctl(session, false, dat);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	session-&gt;last_txcmd = dat[0];</div><div class='add'>+	if (dat[0] == J1939_TP_CMD_BAM) {</div><div class='add'>+		j1939_tp_schedule_txtimer(session, 50);</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 250);</div><div class='add'>+	} else {</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_session_tx_dpo(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	unsigned int pkt;</div><div class='add'>+	u8 dat[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(dat, 0xff, sizeof(dat));</div><div class='add'>+</div><div class='add'>+	dat[0] = J1939_ETP_CMD_DPO;</div><div class='add'>+	session-&gt;pkt.dpo = session-&gt;pkt.tx_acked;</div><div class='add'>+	pkt = session-&gt;pkt.dpo;</div><div class='add'>+	dat[1] = session-&gt;pkt.last - session-&gt;pkt.tx_acked;</div><div class='add'>+	dat[2] = (pkt &gt;&gt; 0);</div><div class='add'>+	dat[3] = (pkt &gt;&gt; 8);</div><div class='add'>+	dat[4] = (pkt &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	ret = j1939_tp_tx_ctl(session, false, dat);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	session-&gt;last_txcmd = dat[0];</div><div class='add'>+	j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+	session-&gt;pkt.tx = session-&gt;pkt.tx_acked;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_session_tx_dat(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_sk_buff_cb *se_skcb;</div><div class='add'>+	int offset, pkt_done, pkt_end;</div><div class='add'>+	unsigned int len, pdelay;</div><div class='add'>+	struct sk_buff *se_skb;</div><div class='add'>+	const u8 *tpdat;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 dat[8];</div><div class='add'>+</div><div class='add'>+	se_skb = j1939_session_skb_get_by_offset(session, session-&gt;pkt.tx * 7);</div><div class='add'>+	if (!se_skb)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	se_skcb = j1939_skb_to_cb(se_skb);</div><div class='add'>+	tpdat = se_skb-&gt;data;</div><div class='add'>+	ret = 0;</div><div class='add'>+	pkt_done = 0;</div><div class='add'>+	if (session-&gt;skcb.addr.type != J1939_ETP &amp;&amp;</div><div class='add'>+	    j1939_cb_is_broadcast(&amp;session-&gt;skcb))</div><div class='add'>+		pkt_end = session-&gt;pkt.total;</div><div class='add'>+	else</div><div class='add'>+		pkt_end = session-&gt;pkt.last;</div><div class='add'>+</div><div class='add'>+	while (session-&gt;pkt.tx &lt; pkt_end) {</div><div class='add'>+		dat[0] = session-&gt;pkt.tx - session-&gt;pkt.dpo + 1;</div><div class='add'>+		offset = (session-&gt;pkt.tx * 7) - se_skcb-&gt;offset;</div><div class='add'>+		len =  se_skb-&gt;len - offset;</div><div class='add'>+		if (len &gt; 7)</div><div class='add'>+			len = 7;</div><div class='add'>+</div><div class='add'>+		if (offset + len &gt; se_skb-&gt;len) {</div><div class='add'>+			netdev_err_once(priv-&gt;ndev,</div><div class='add'>+					"%s: 0x%p: requested data outside of queued buffer: offset %i, len %i, pkt.tx: %i\n",</div><div class='add'>+					__func__, session, se_skcb-&gt;offset,</div><div class='add'>+					se_skb-&gt;len , session-&gt;pkt.tx);</div><div class='add'>+			ret = -EOVERFLOW;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!len) {</div><div class='add'>+			ret = -ENOBUFS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;dat[1], &amp;tpdat[offset], len);</div><div class='add'>+		ret = j1939_tp_tx_dat(session, dat, len + 1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			/* ENOBUFS == CAN interface TX queue is full */</div><div class='add'>+			if (ret != -ENOBUFS)</div><div class='add'>+				netdev_alert(priv-&gt;ndev,</div><div class='add'>+					     "%s: 0x%p: queue data error: %i\n",</div><div class='add'>+					     __func__, session, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		session-&gt;last_txcmd = 0xff;</div><div class='add'>+		pkt_done++;</div><div class='add'>+		session-&gt;pkt.tx++;</div><div class='add'>+		pdelay = j1939_cb_is_broadcast(&amp;session-&gt;skcb) ? 50 :</div><div class='add'>+			j1939_tp_packet_delay;</div><div class='add'>+</div><div class='add'>+		if (session-&gt;pkt.tx &lt; session-&gt;pkt.total &amp;&amp; pdelay) {</div><div class='add'>+			j1939_tp_schedule_txtimer(session, pdelay);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pkt_done)</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 250);</div><div class='add'>+</div><div class='add'>+ out_free:</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree_skb(se_skb);</div><div class='add'>+	else</div><div class='add'>+		consume_skb(se_skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_txnext_transmiter(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!j1939_tp_im_transmitter(&amp;session-&gt;skcb)) {</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: called by not transmitter!\n",</div><div class='add'>+			     __func__, session);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (session-&gt;last_cmd) {</div><div class='add'>+	case 0:</div><div class='add'>+		ret = j1939_session_tx_rts(session);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_CTS:</div><div class='add'>+		if (session-&gt;last_txcmd != J1939_ETP_CMD_DPO) {</div><div class='add'>+			ret = j1939_session_tx_dpo(session);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_CTS:</div><div class='add'>+	case 0xff: /* did some data */</div><div class='add'>+	case J1939_ETP_CMD_DPO:</div><div class='add'>+	case J1939_TP_CMD_BAM:</div><div class='add'>+		ret = j1939_session_tx_dat(session);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: unexpected last_cmd: %x\n",</div><div class='add'>+			     __func__, session, session-&gt;last_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_session_tx_cts(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	unsigned int pkt, len;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 dat[8];</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_recv_match(priv, &amp;session-&gt;skcb))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	len = session-&gt;pkt.total - session-&gt;pkt.rx;</div><div class='add'>+	len = min3(len, session-&gt;pkt.block, j1939_tp_block ?: 255);</div><div class='add'>+	memset(dat, 0xff, sizeof(dat));</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_ETP) {</div><div class='add'>+		pkt = session-&gt;pkt.rx + 1;</div><div class='add'>+		dat[0] = J1939_ETP_CMD_CTS;</div><div class='add'>+		dat[1] = len;</div><div class='add'>+		dat[2] = (pkt &gt;&gt; 0);</div><div class='add'>+		dat[3] = (pkt &gt;&gt; 8);</div><div class='add'>+		dat[4] = (pkt &gt;&gt; 16);</div><div class='add'>+	} else {</div><div class='add'>+		dat[0] = J1939_TP_CMD_CTS;</div><div class='add'>+		dat[1] = len;</div><div class='add'>+		dat[2] = session-&gt;pkt.rx + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dat[0] == session-&gt;last_txcmd)</div><div class='add'>+		/* done already */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = j1939_tp_tx_ctl(session, true, dat);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		/* only mark cts done when len is set */</div><div class='add'>+		session-&gt;last_txcmd = dat[0];</div><div class='add'>+	j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_session_tx_eoma(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	u8 dat[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_recv_match(priv, &amp;session-&gt;skcb))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	memset(dat, 0xff, sizeof(dat));</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_ETP) {</div><div class='add'>+		dat[0] = J1939_ETP_CMD_EOMA;</div><div class='add'>+		dat[1] = session-&gt;total_message_size &gt;&gt; 0;</div><div class='add'>+		dat[2] = session-&gt;total_message_size &gt;&gt; 8;</div><div class='add'>+		dat[3] = session-&gt;total_message_size &gt;&gt; 16;</div><div class='add'>+		dat[4] = session-&gt;total_message_size &gt;&gt; 24;</div><div class='add'>+	} else {</div><div class='add'>+		dat[0] = J1939_TP_CMD_EOMA;</div><div class='add'>+		dat[1] = session-&gt;total_message_size;</div><div class='add'>+		dat[2] = session-&gt;total_message_size &gt;&gt; 8;</div><div class='add'>+		dat[3] = session-&gt;pkt.total;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dat[0] == session-&gt;last_txcmd)</div><div class='add'>+		/* done already */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = j1939_tp_tx_ctl(session, true, dat);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	session-&gt;last_txcmd = dat[0];</div><div class='add'>+</div><div class='add'>+	/* wait for the EOMA packet to come in */</div><div class='add'>+	j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_txnext_receiver(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!j1939_tp_im_receiver(&amp;session-&gt;skcb)) {</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: called by not receiver!\n",</div><div class='add'>+			     __func__, session);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (session-&gt;last_cmd) {</div><div class='add'>+	case J1939_TP_CMD_RTS:</div><div class='add'>+	case J1939_ETP_CMD_RTS:</div><div class='add'>+		ret = j1939_session_tx_cts(session);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_CTS:</div><div class='add'>+	case J1939_TP_CMD_CTS:</div><div class='add'>+	case 0xff: /* did some data */</div><div class='add'>+	case J1939_ETP_CMD_DPO:</div><div class='add'>+		if ((session-&gt;skcb.addr.type == J1939_TP &amp;&amp;</div><div class='add'>+		     j1939_cb_is_broadcast(&amp;session-&gt;skcb)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (session-&gt;pkt.rx &gt;= session-&gt;pkt.total) {</div><div class='add'>+			ret = j1939_session_tx_eoma(session);</div><div class='add'>+		} else if (session-&gt;pkt.rx &gt;= session-&gt;pkt.last) {</div><div class='add'>+			session-&gt;last_txcmd = 0;</div><div class='add'>+			ret = j1939_session_tx_cts(session);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: unexpected last_cmd: %x\n",</div><div class='add'>+			     __func__, session, session-&gt;last_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_simple_txnext(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct sk_buff *se_skb = j1939_session_skb_get(session);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!se_skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(se_skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_skb_set_owner(skb, se_skb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	j1939_tp_set_rxtimeout(session, J1939_SIMPLE_ECHO_TIMEOUT_MS);</div><div class='add'>+</div><div class='add'>+	ret = j1939_send_one(priv, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_SCHED);</div><div class='add'>+	j1939_sk_queue_activate_next(session);</div><div class='add'>+</div><div class='add'>+ out_free:</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree_skb(se_skb);</div><div class='add'>+	else</div><div class='add'>+		consume_skb(se_skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_session_deactivate_locked(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	bool active = false;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;session-&gt;priv-&gt;active_session_list_lock);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;state &gt;= J1939_SESSION_ACTIVE &amp;&amp;</div><div class='add'>+	    session-&gt;state &lt; J1939_SESSION_ACTIVE_MAX) {</div><div class='add'>+		active = true;</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;session-&gt;active_session_list_entry);</div><div class='add'>+		session-&gt;state = J1939_SESSION_DONE;</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_session_deactivate(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	bool active;</div><div class='add'>+</div><div class='add'>+	j1939_session_list_lock(priv);</div><div class='add'>+	active = j1939_session_deactivate_locked(session);</div><div class='add'>+	j1939_session_list_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+j1939_session_deactivate_activate_next(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	if (j1939_session_deactivate(session))</div><div class='add'>+		j1939_sk_queue_activate_next(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __j1939_session_cancel(struct j1939_session *session,</div><div class='add'>+				   enum j1939_xtp_abort err)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!err);</div><div class='add'>+	lockdep_assert_held(&amp;session-&gt;priv-&gt;active_session_list_lock);</div><div class='add'>+</div><div class='add'>+	session-&gt;err = j1939_xtp_abort_to_errno(priv, err);</div><div class='add'>+	session-&gt;state = J1939_SESSION_WAITING_ABORT;</div><div class='add'>+	/* do not send aborts on incoming broadcasts */</div><div class='add'>+	if (!j1939_cb_is_broadcast(&amp;session-&gt;skcb)) {</div><div class='add'>+		j1939_xtp_tx_abort(priv, &amp;session-&gt;skcb,</div><div class='add'>+				   !session-&gt;transmission,</div><div class='add'>+				   err, session-&gt;skcb.addr.pgn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (session-&gt;sk)</div><div class='add'>+		j1939_sk_send_loop_abort(session-&gt;sk, session-&gt;err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_cancel(struct j1939_session *session,</div><div class='add'>+				 enum j1939_xtp_abort err)</div><div class='add'>+{</div><div class='add'>+	j1939_session_list_lock(session-&gt;priv);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;state &gt;= J1939_SESSION_ACTIVE &amp;&amp;</div><div class='add'>+	    session-&gt;state &lt; J1939_SESSION_WAITING_ABORT) {</div><div class='add'>+		j1939_tp_set_rxtimeout(session, J1939_XTP_ABORT_TIMEOUT_MS);</div><div class='add'>+		__j1939_session_cancel(session, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_list_unlock(session-&gt;priv);</div><div class='add'>+</div><div class='add'>+	if (!session-&gt;sk)</div><div class='add'>+		j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart j1939_tp_txtimer(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session =</div><div class='add'>+		container_of(hrtimer, struct j1939_session, txtimer);</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_SIMPLE) {</div><div class='add'>+		ret = j1939_simple_txnext(session);</div><div class='add'>+	} else {</div><div class='add'>+		if (session-&gt;transmission)</div><div class='add'>+			ret = j1939_xtp_txnext_transmiter(session);</div><div class='add'>+		else</div><div class='add'>+			ret = j1939_xtp_txnext_receiver(session);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case -ENOBUFS:</div><div class='add'>+		/* Retry limit is currently arbitrary chosen */</div><div class='add'>+		if (session-&gt;tx_retry &lt; J1939_XTP_TX_RETRY_LIMIT) {</div><div class='add'>+			session-&gt;tx_retry++;</div><div class='add'>+			j1939_tp_schedule_txtimer(session,</div><div class='add'>+						  10 + get_random_u32_below(16));</div><div class='add'>+		} else {</div><div class='add'>+			netdev_alert(priv-&gt;ndev, "%s: 0x%p: tx retry count reached\n",</div><div class='add'>+				     __func__, session);</div><div class='add'>+			session-&gt;err = -ENETUNREACH;</div><div class='add'>+			j1939_session_rxtimer_cancel(session);</div><div class='add'>+			j1939_session_deactivate_activate_next(session);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case -ENETDOWN:</div><div class='add'>+		/* In this case we should get a netdev_event(), all active</div><div class='add'>+		 * sessions will be cleared by j1939_cancel_active_session().</div><div class='add'>+		 * So handle this as an error, but let</div><div class='add'>+		 * j1939_cancel_active_session() do the cleanup including</div><div class='add'>+		 * propagation of the error to user space.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+		j1939_session_cancel(session, J1939_XTP_ABORT_ECTS_TOO_BIG);</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		session-&gt;tx_retry = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: tx aborted with unknown reason: %i\n",</div><div class='add'>+			     __func__, session, ret);</div><div class='add'>+		if (session-&gt;skcb.addr.type != J1939_SIMPLE) {</div><div class='add'>+			j1939_session_cancel(session, J1939_XTP_ABORT_OTHER);</div><div class='add'>+		} else {</div><div class='add'>+			session-&gt;err = ret;</div><div class='add'>+			j1939_session_rxtimer_cancel(session);</div><div class='add'>+			j1939_session_deactivate_activate_next(session);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_session_completed(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *se_skb;</div><div class='add'>+</div><div class='add'>+	if (!session-&gt;transmission) {</div><div class='add'>+		se_skb = j1939_session_skb_get(session);</div><div class='add'>+		/* distribute among j1939 receivers */</div><div class='add'>+		j1939_sk_recv(session-&gt;priv, se_skb);</div><div class='add'>+		consume_skb(se_skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_deactivate_activate_next(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart j1939_tp_rxtimer(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session = container_of(hrtimer,</div><div class='add'>+						     struct j1939_session,</div><div class='add'>+						     rxtimer);</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (session-&gt;state == J1939_SESSION_WAITING_ABORT) {</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: abort rx timeout. Force session deactivation\n",</div><div class='add'>+			     __func__, session);</div><div class='add'>+</div><div class='add'>+		j1939_session_deactivate_activate_next(session);</div><div class='add'>+</div><div class='add'>+	} else if (session-&gt;skcb.addr.type == J1939_SIMPLE) {</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: Timeout. Failed to send simple message.\n",</div><div class='add'>+			     __func__, session);</div><div class='add'>+</div><div class='add'>+		/* The message is probably stuck in the CAN controller and can</div><div class='add'>+		 * be send as soon as CAN bus is in working state again.</div><div class='add'>+		 */</div><div class='add'>+		session-&gt;err = -ETIME;</div><div class='add'>+		j1939_session_deactivate(session);</div><div class='add'>+	} else {</div><div class='add'>+		j1939_session_list_lock(session-&gt;priv);</div><div class='add'>+		if (session-&gt;state &gt;= J1939_SESSION_ACTIVE &amp;&amp;</div><div class='add'>+		    session-&gt;state &lt; J1939_SESSION_ACTIVE_MAX) {</div><div class='add'>+			netdev_alert(priv-&gt;ndev, "%s: 0x%p: rx timeout, send abort\n",</div><div class='add'>+				     __func__, session);</div><div class='add'>+			j1939_session_get(session);</div><div class='add'>+			hrtimer_start(&amp;session-&gt;rxtimer,</div><div class='add'>+				      ms_to_ktime(J1939_XTP_ABORT_TIMEOUT_MS),</div><div class='add'>+				      HRTIMER_MODE_REL_SOFT);</div><div class='add'>+			__j1939_session_cancel(session, J1939_XTP_ABORT_TIMEOUT);</div><div class='add'>+		}</div><div class='add'>+		j1939_session_list_unlock(session-&gt;priv);</div><div class='add'>+</div><div class='add'>+		if (!session-&gt;sk)</div><div class='add'>+			j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool j1939_xtp_rx_cmd_bad_pgn(struct j1939_session *session,</div><div class='add'>+				     const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	pgn_t pgn = j1939_xtp_ctl_to_pgn(skb-&gt;data);</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	enum j1939_xtp_abort abort = J1939_XTP_NO_ABORT;</div><div class='add'>+	u8 cmd = skb-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.pgn == pgn)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case J1939_TP_CMD_BAM:</div><div class='add'>+		abort = J1939_XTP_NO_ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_RTS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_RTS:</div><div class='add'>+		abort = J1939_XTP_ABORT_BUSY;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_CTS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_CTS:</div><div class='add'>+		abort = J1939_XTP_ABORT_ECTS_UNXPECTED_PGN;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_DPO:</div><div class='add'>+		abort = J1939_XTP_ABORT_BAD_EDPO_PGN;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_EOMA:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_EOMA:</div><div class='add'>+		abort = J1939_XTP_ABORT_OTHER;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_ABORT: /* &amp;&amp; J1939_TP_CMD_ABORT */</div><div class='add'>+		abort = J1939_XTP_NO_ABORT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_warn(priv-&gt;ndev, "%s: 0x%p: CMD 0x%02x with PGN 0x%05x for running session with different PGN 0x%05x.\n",</div><div class='add'>+		    __func__, session, cmd, pgn, session-&gt;skcb.addr.pgn);</div><div class='add'>+	if (abort != J1939_XTP_NO_ABORT)</div><div class='add'>+		j1939_xtp_tx_abort(priv, skcb, true, abort, pgn);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_abort_one(struct j1939_priv *priv, struct sk_buff *skb,</div><div class='add'>+				   bool reverse, bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+	u8 abort = skb-&gt;data[1];</div><div class='add'>+</div><div class='add'>+	session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, reverse,</div><div class='add'>+					    transmitter);</div><div class='add'>+	if (!session)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (j1939_xtp_rx_cmd_bad_pgn(session, skb))</div><div class='add'>+		goto abort_put;</div><div class='add'>+</div><div class='add'>+	netdev_info(priv-&gt;ndev, "%s: 0x%p: 0x%05x: (%u) %s\n", __func__,</div><div class='add'>+		    session, j1939_xtp_ctl_to_pgn(skb-&gt;data), abort,</div><div class='add'>+		    j1939_xtp_abort_to_str(abort));</div><div class='add'>+</div><div class='add'>+	j1939_session_timers_cancel(session);</div><div class='add'>+	session-&gt;err = j1939_xtp_abort_to_errno(priv, abort);</div><div class='add'>+	if (session-&gt;sk)</div><div class='add'>+		j1939_sk_send_loop_abort(session-&gt;sk, session-&gt;err);</div><div class='add'>+	else</div><div class='add'>+		j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT);</div><div class='add'>+	j1939_session_deactivate_activate_next(session);</div><div class='add'>+</div><div class='add'>+abort_put:</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* abort packets may come in 2 directions */</div><div class='add'>+static void</div><div class='add'>+j1939_xtp_rx_abort(struct j1939_priv *priv, struct sk_buff *skb,</div><div class='add'>+		   bool transmitter)</div><div class='add'>+{</div><div class='add'>+	j1939_xtp_rx_abort_one(priv, skb, false, transmitter);</div><div class='add'>+	j1939_xtp_rx_abort_one(priv, skb, true, transmitter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+j1939_xtp_rx_eoma_one(struct j1939_session *session, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	const u8 *dat;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (j1939_xtp_rx_cmd_bad_pgn(session, skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dat = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.type == J1939_ETP)</div><div class='add'>+		len = j1939_etp_ctl_to_size(dat);</div><div class='add'>+	else</div><div class='add'>+		len = j1939_tp_ctl_to_size(dat);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;total_message_size != len) {</div><div class='add'>+		netdev_warn_once(session-&gt;priv-&gt;ndev,</div><div class='add'>+				 "%s: 0x%p: Incorrect size. Expected: %i; got: %i.\n",</div><div class='add'>+				 __func__, session, session-&gt;total_message_size,</div><div class='add'>+				 len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	session-&gt;pkt.tx_acked = session-&gt;pkt.total;</div><div class='add'>+	j1939_session_timers_cancel(session);</div><div class='add'>+	/* transmitted without problems */</div><div class='add'>+	j1939_session_completed(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+j1939_xtp_rx_eoma(struct j1939_priv *priv, struct sk_buff *skb,</div><div class='add'>+		  bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, true,</div><div class='add'>+					    transmitter);</div><div class='add'>+	if (!session)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	j1939_xtp_rx_eoma_one(session, skb);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+j1939_xtp_rx_cts_one(struct j1939_session *session, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	enum j1939_xtp_abort err = J1939_XTP_ABORT_FAULT;</div><div class='add'>+	unsigned int pkt;</div><div class='add'>+	const u8 *dat;</div><div class='add'>+</div><div class='add'>+	dat = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (j1939_xtp_rx_cmd_bad_pgn(session, skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;last_cmd == dat[0]) {</div><div class='add'>+		err = J1939_XTP_ABORT_DUP_SEQ;</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.type == J1939_ETP)</div><div class='add'>+		pkt = j1939_etp_ctl_to_packet(dat);</div><div class='add'>+	else</div><div class='add'>+		pkt = dat[2];</div><div class='add'>+</div><div class='add'>+	if (!pkt)</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	else if (dat[1] &gt; session-&gt;pkt.block /* 0xff for etp */)</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+</div><div class='add'>+	/* set packet counters only when not CTS(0) */</div><div class='add'>+	session-&gt;pkt.tx_acked = pkt - 1;</div><div class='add'>+	j1939_session_skb_drop_old(session);</div><div class='add'>+	session-&gt;pkt.last = session-&gt;pkt.tx_acked + dat[1];</div><div class='add'>+	if (session-&gt;pkt.last &gt; session-&gt;pkt.total)</div><div class='add'>+		/* safety measure */</div><div class='add'>+		session-&gt;pkt.last = session-&gt;pkt.total;</div><div class='add'>+	/* TODO: do not set tx here, do it in txtimer */</div><div class='add'>+	session-&gt;pkt.tx = session-&gt;pkt.tx_acked;</div><div class='add'>+</div><div class='add'>+	session-&gt;last_cmd = dat[0];</div><div class='add'>+	if (dat[1]) {</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+		if (session-&gt;transmission) {</div><div class='add'>+			if (session-&gt;pkt.tx_acked)</div><div class='add'>+				j1939_sk_errqueue(session,</div><div class='add'>+						  J1939_ERRQUEUE_TX_SCHED);</div><div class='add'>+			j1939_session_txtimer_cancel(session);</div><div class='add'>+			j1939_tp_schedule_txtimer(session, 0);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* CTS(0) */</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 550);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ out_session_cancel:</div><div class='add'>+	j1939_session_timers_cancel(session);</div><div class='add'>+	j1939_session_cancel(session, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+j1939_xtp_rx_cts(struct j1939_priv *priv, struct sk_buff *skb, bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, true,</div><div class='add'>+					    transmitter);</div><div class='add'>+	if (!session)</div><div class='add'>+		return;</div><div class='add'>+	j1939_xtp_rx_cts_one(session, skb);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct j1939_session *j1939_session_new(struct j1939_priv *priv,</div><div class='add'>+					       struct sk_buff *skb, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+</div><div class='add'>+	session = kzalloc(sizeof(*session), gfp_any());</div><div class='add'>+	if (!session)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;session-&gt;active_session_list_entry);</div><div class='add'>+	INIT_LIST_HEAD(&amp;session-&gt;sk_session_queue_entry);</div><div class='add'>+	kref_init(&amp;session-&gt;kref);</div><div class='add'>+</div><div class='add'>+	j1939_priv_get(priv);</div><div class='add'>+	session-&gt;priv = priv;</div><div class='add'>+	session-&gt;total_message_size = size;</div><div class='add'>+	session-&gt;state = J1939_SESSION_NEW;</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;session-&gt;skb_queue);</div><div class='add'>+	skb_queue_tail(&amp;session-&gt;skb_queue, skb_get(skb));</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	memcpy(&amp;session-&gt;skcb, skcb, sizeof(session-&gt;skcb));</div><div class='add'>+</div><div class='add'>+	hrtimer_setup(&amp;session-&gt;txtimer, j1939_tp_txtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);</div><div class='add'>+	hrtimer_setup(&amp;session-&gt;rxtimer, j1939_tp_rxtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s: 0x%p: sa: %02x, da: %02x\n",</div><div class='add'>+		   __func__, session, skcb-&gt;addr.sa, skcb-&gt;addr.da);</div><div class='add'>+</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_session_fresh_new(struct j1939_priv *priv,</div><div class='add'>+				       int size,</div><div class='add'>+				       const struct j1939_sk_buff_cb *rel_skcb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(size + sizeof(struct can_skb_priv), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = priv-&gt;ndev;</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = priv-&gt;ndev-&gt;ifindex;</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	memcpy(skcb, rel_skcb, sizeof(*skcb));</div><div class='add'>+</div><div class='add'>+	session = j1939_session_new(priv, skb, size);</div><div class='add'>+	if (!session) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* alloc data area */</div><div class='add'>+	skb_put(skb, size);</div><div class='add'>+	/* skb is recounted in j1939_session_new() */</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_session_activate(struct j1939_session *session)</div><div class='add'>+{</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_session *active = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	j1939_session_list_lock(priv);</div><div class='add'>+	if (session-&gt;skcb.addr.type != J1939_SIMPLE)</div><div class='add'>+		active = j1939_session_get_by_addr_locked(priv,</div><div class='add'>+							  &amp;priv-&gt;active_session_list,</div><div class='add'>+							  &amp;session-&gt;skcb.addr, false,</div><div class='add'>+							  session-&gt;transmission);</div><div class='add'>+	if (active) {</div><div class='add'>+		j1939_session_put(active);</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(session-&gt;state != J1939_SESSION_NEW);</div><div class='add'>+		list_add_tail(&amp;session-&gt;active_session_list_entry,</div><div class='add'>+			      &amp;priv-&gt;active_session_list);</div><div class='add'>+		j1939_session_get(session);</div><div class='add'>+		session-&gt;state = J1939_SESSION_ACTIVE;</div><div class='add'>+</div><div class='add'>+		netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n",</div><div class='add'>+			   __func__, session);</div><div class='add'>+	}</div><div class='add'>+	j1939_session_list_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+j1939_session *j1939_xtp_rx_rts_session_new(struct j1939_priv *priv,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	enum j1939_xtp_abort abort = J1939_XTP_NO_ABORT;</div><div class='add'>+	struct j1939_sk_buff_cb skcb = *j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+	const u8 *dat;</div><div class='add'>+	int len, ret;</div><div class='add'>+	pgn_t pgn;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	dat = skb-&gt;data;</div><div class='add'>+	pgn = j1939_xtp_ctl_to_pgn(dat);</div><div class='add'>+	skcb.addr.pgn = pgn;</div><div class='add'>+</div><div class='add'>+	if (!j1939_sk_recv_match(priv, &amp;skcb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (skcb.addr.type == J1939_ETP) {</div><div class='add'>+		len = j1939_etp_ctl_to_size(dat);</div><div class='add'>+		if (len &gt; J1939_MAX_ETP_PACKET_SIZE)</div><div class='add'>+			abort = J1939_XTP_ABORT_FAULT;</div><div class='add'>+		else if (len &gt; priv-&gt;tp_max_packet_size)</div><div class='add'>+			abort = J1939_XTP_ABORT_RESOURCE;</div><div class='add'>+		else if (len &lt;= J1939_MAX_TP_PACKET_SIZE)</div><div class='add'>+			abort = J1939_XTP_ABORT_FAULT;</div><div class='add'>+	} else {</div><div class='add'>+		len = j1939_tp_ctl_to_size(dat);</div><div class='add'>+		if (len &gt; J1939_MAX_TP_PACKET_SIZE)</div><div class='add'>+			abort = J1939_XTP_ABORT_FAULT;</div><div class='add'>+		else if (len &gt; priv-&gt;tp_max_packet_size)</div><div class='add'>+			abort = J1939_XTP_ABORT_RESOURCE;</div><div class='add'>+		else if (len &lt; J1939_MIN_TP_PACKET_SIZE)</div><div class='add'>+			abort = J1939_XTP_ABORT_FAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (abort != J1939_XTP_NO_ABORT) {</div><div class='add'>+		j1939_xtp_tx_abort(priv, &amp;skcb, true, abort, pgn);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	session = j1939_session_fresh_new(priv, len, &amp;skcb);</div><div class='add'>+	if (!session) {</div><div class='add'>+		j1939_xtp_tx_abort(priv, &amp;skcb, true,</div><div class='add'>+				   J1939_XTP_ABORT_RESOURCE, pgn);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize the control buffer: plain copy */</div><div class='add'>+	session-&gt;pkt.total = (len + 6) / 7;</div><div class='add'>+	session-&gt;pkt.block = 0xff;</div><div class='add'>+	if (skcb.addr.type != J1939_ETP) {</div><div class='add'>+		if (dat[3] != session-&gt;pkt.total)</div><div class='add'>+			netdev_alert(priv-&gt;ndev, "%s: 0x%p: strange total, %u != %u\n",</div><div class='add'>+				     __func__, session, session-&gt;pkt.total,</div><div class='add'>+				     dat[3]);</div><div class='add'>+		session-&gt;pkt.total = dat[3];</div><div class='add'>+		session-&gt;pkt.block = min(dat[3], dat[4]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	session-&gt;pkt.rx = 0;</div><div class='add'>+	session-&gt;pkt.tx = 0;</div><div class='add'>+</div><div class='add'>+	session-&gt;tskey = priv-&gt;rx_tskey++;</div><div class='add'>+	j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_RTS);</div><div class='add'>+</div><div class='add'>+	ret = j1939_session_activate(session);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Entering this scope indicates an issue with the J1939 bus.</div><div class='add'>+		 * Possible scenarios include:</div><div class='add'>+		 * - A time lapse occurred, and a new session was initiated</div><div class='add'>+		 *   due to another packet being sent correctly. This could</div><div class='add'>+		 *   have been caused by too long interrupt, debugger, or being</div><div class='add'>+		 *   out-scheduled by another task.</div><div class='add'>+		 * - The bus is receiving numerous erroneous packets, either</div><div class='add'>+		 *   from a malfunctioning device or during a test scenario.</div><div class='add'>+		 */</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: concurrent session with same addr (%02x %02x) is already active.\n",</div><div class='add'>+			     __func__, session, skcb.addr.sa, skcb.addr.da);</div><div class='add'>+		j1939_session_put(session);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int j1939_xtp_rx_rts_session_active(struct j1939_session *session,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!session-&gt;transmission) {</div><div class='add'>+		if (j1939_xtp_rx_cmd_bad_pgn(session, skb))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		/* RTS on active session */</div><div class='add'>+		j1939_session_timers_cancel(session);</div><div class='add'>+		j1939_session_cancel(session, J1939_XTP_ABORT_BUSY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (session-&gt;last_cmd != 0) {</div><div class='add'>+		/* we received a second rts on the same connection */</div><div class='add'>+		netdev_alert(priv-&gt;ndev, "%s: 0x%p: connection exists (%02x %02x). last cmd: %x\n",</div><div class='add'>+			     __func__, session, skcb-&gt;addr.sa, skcb-&gt;addr.da,</div><div class='add'>+			     session-&gt;last_cmd);</div><div class='add'>+</div><div class='add'>+		j1939_session_timers_cancel(session);</div><div class='add'>+		j1939_session_cancel(session, J1939_XTP_ABORT_BUSY);</div><div class='add'>+		if (session-&gt;transmission)</div><div class='add'>+			j1939_session_deactivate_activate_next(session);</div><div class='add'>+</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (session-&gt;skcb.addr.sa != skcb-&gt;addr.sa ||</div><div class='add'>+	    session-&gt;skcb.addr.da != skcb-&gt;addr.da)</div><div class='add'>+		netdev_warn(priv-&gt;ndev, "%s: 0x%p: session-&gt;skcb.addr.sa=0x%02x skcb-&gt;addr.sa=0x%02x session-&gt;skcb.addr.da=0x%02x skcb-&gt;addr.da=0x%02x\n",</div><div class='add'>+			    __func__, session,</div><div class='add'>+			    session-&gt;skcb.addr.sa, skcb-&gt;addr.sa,</div><div class='add'>+			    session-&gt;skcb.addr.da, skcb-&gt;addr.da);</div><div class='add'>+	/* make sure 'sa' &amp; 'da' are correct !</div><div class='add'>+	 * They may be 'not filled in yet' for sending</div><div class='add'>+	 * skb's, since they did not pass the Address Claim ever.</div><div class='add'>+	 */</div><div class='add'>+	session-&gt;skcb.addr.sa = skcb-&gt;addr.sa;</div><div class='add'>+	session-&gt;skcb.addr.da = skcb-&gt;addr.da;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb,</div><div class='add'>+			     bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+	u8 cmd = skb-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, false,</div><div class='add'>+					    transmitter);</div><div class='add'>+</div><div class='add'>+	if (!session) {</div><div class='add'>+		if (transmitter) {</div><div class='add'>+			/* If we're the transmitter and this function is called,</div><div class='add'>+			 * we received our own RTS. A session has already been</div><div class='add'>+			 * created.</div><div class='add'>+			 *</div><div class='add'>+			 * For some reasons however it might have been destroyed</div><div class='add'>+			 * already. So don't create a new one here (using</div><div class='add'>+			 * "j1939_xtp_rx_rts_session_new()") as this will be a</div><div class='add'>+			 * receiver session.</div><div class='add'>+			 *</div><div class='add'>+			 * The reasons the session is already destroyed might</div><div class='add'>+			 * be:</div><div class='add'>+			 * - user space closed socket was and the session was</div><div class='add'>+			 *   aborted</div><div class='add'>+			 * - session was aborted due to external abort message</div><div class='add'>+			 */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		session = j1939_xtp_rx_rts_session_new(priv, skb);</div><div class='add'>+		if (!session) {</div><div class='add'>+			if (cmd == J1939_TP_CMD_BAM &amp;&amp; j1939_sk_recv_match(priv, skcb))</div><div class='add'>+				netdev_info(priv-&gt;ndev, "%s: failed to create TP BAM session\n",</div><div class='add'>+					    __func__);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (j1939_xtp_rx_rts_session_active(session, skb)) {</div><div class='add'>+			j1939_session_put(session);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	session-&gt;last_cmd = cmd;</div><div class='add'>+</div><div class='add'>+	if (cmd == J1939_TP_CMD_BAM) {</div><div class='add'>+		if (!session-&gt;transmission)</div><div class='add'>+			j1939_tp_set_rxtimeout(session, 750);</div><div class='add'>+	} else {</div><div class='add'>+		if (!session-&gt;transmission) {</div><div class='add'>+			j1939_session_txtimer_cancel(session);</div><div class='add'>+			j1939_tp_schedule_txtimer(session, 0);</div><div class='add'>+		}</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_dpo_one(struct j1939_session *session,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const u8 *dat = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (j1939_xtp_rx_cmd_bad_pgn(session, skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(session-&gt;priv-&gt;ndev, "%s: 0x%p\n", __func__, session);</div><div class='add'>+</div><div class='add'>+	/* transmitted without problems */</div><div class='add'>+	session-&gt;pkt.dpo = j1939_etp_ctl_to_packet(skb-&gt;data);</div><div class='add'>+	session-&gt;last_cmd = dat[0];</div><div class='add'>+	j1939_tp_set_rxtimeout(session, 750);</div><div class='add'>+</div><div class='add'>+	if (!session-&gt;transmission)</div><div class='add'>+		j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_DPO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_dpo(struct j1939_priv *priv, struct sk_buff *skb,</div><div class='add'>+			     bool transmitter)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, false,</div><div class='add'>+					    transmitter);</div><div class='add'>+	if (!session) {</div><div class='add'>+		netdev_info(priv-&gt;ndev,</div><div class='add'>+			    "%s: no connection found\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_xtp_rx_dpo_one(session, skb);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_dat_one(struct j1939_session *session,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	enum j1939_xtp_abort abort = J1939_XTP_ABORT_FAULT;</div><div class='add'>+	struct j1939_priv *priv = session-&gt;priv;</div><div class='add'>+	struct j1939_sk_buff_cb *skcb, *se_skcb;</div><div class='add'>+	struct sk_buff *se_skb = NULL;</div><div class='add'>+	const u8 *dat;</div><div class='add'>+	u8 *tpdat;</div><div class='add'>+	int offset;</div><div class='add'>+	int nbytes;</div><div class='add'>+	bool final = false;</div><div class='add'>+	bool remain = false;</div><div class='add'>+	bool do_cts_eoma = false;</div><div class='add'>+	int packet;</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	dat = skb-&gt;data;</div><div class='add'>+	if (skb-&gt;len != 8) {</div><div class='add'>+		/* makes no sense */</div><div class='add'>+		abort = J1939_XTP_ABORT_UNEXPECTED_DATA;</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (session-&gt;last_cmd) {</div><div class='add'>+	case 0xff:</div><div class='add'>+		break;</div><div class='add'>+	case J1939_ETP_CMD_DPO:</div><div class='add'>+		if (skcb-&gt;addr.type == J1939_ETP)</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_BAM:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_CTS:</div><div class='add'>+		if (skcb-&gt;addr.type != J1939_ETP)</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: 0x%p: last %02x\n", __func__,</div><div class='add'>+			    session, session-&gt;last_cmd);</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	packet = (dat[0] - 1 + session-&gt;pkt.dpo);</div><div class='add'>+	if (packet &gt; session-&gt;pkt.total ||</div><div class='add'>+	    (session-&gt;pkt.rx + 1) &gt; session-&gt;pkt.total) {</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: 0x%p: should have been completed\n",</div><div class='add'>+			    __func__, session);</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	se_skb = j1939_session_skb_get_by_offset(session, packet * 7);</div><div class='add'>+	if (!se_skb) {</div><div class='add'>+		netdev_warn(priv-&gt;ndev, "%s: 0x%p: no skb found\n", __func__,</div><div class='add'>+			    session);</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	se_skcb = j1939_skb_to_cb(se_skb);</div><div class='add'>+	offset = packet * 7 - se_skcb-&gt;offset;</div><div class='add'>+	nbytes = se_skb-&gt;len - offset;</div><div class='add'>+	if (nbytes &gt; 7)</div><div class='add'>+		nbytes = 7;</div><div class='add'>+	if (nbytes &lt;= 0 || (nbytes + 1) &gt; skb-&gt;len) {</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: 0x%p: nbytes %i, len %i\n",</div><div class='add'>+			    __func__, session, nbytes, skb-&gt;len);</div><div class='add'>+		goto out_session_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tpdat = se_skb-&gt;data;</div><div class='add'>+	if (!session-&gt;transmission) {</div><div class='add'>+		memcpy(&amp;tpdat[offset], &amp;dat[1], nbytes);</div><div class='add'>+	} else {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = memcmp(&amp;tpdat[offset], &amp;dat[1], nbytes);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_err_once(priv-&gt;ndev,</div><div class='add'>+					"%s: 0x%p: Data of RX-looped back packet (%*ph) doesn't match TX data (%*ph)!\n",</div><div class='add'>+					__func__, session,</div><div class='add'>+					nbytes, &amp;dat[1],</div><div class='add'>+					nbytes, &amp;tpdat[offset]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (packet == session-&gt;pkt.rx)</div><div class='add'>+		session-&gt;pkt.rx++;</div><div class='add'>+</div><div class='add'>+	if (se_skcb-&gt;addr.type != J1939_ETP &amp;&amp;</div><div class='add'>+	    j1939_cb_is_broadcast(&amp;session-&gt;skcb)) {</div><div class='add'>+		if (session-&gt;pkt.rx &gt;= session-&gt;pkt.total)</div><div class='add'>+			final = true;</div><div class='add'>+		else</div><div class='add'>+			remain = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* never final, an EOMA must follow */</div><div class='add'>+		if (session-&gt;pkt.rx &gt;= session-&gt;pkt.last)</div><div class='add'>+			do_cts_eoma = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (final) {</div><div class='add'>+		j1939_session_timers_cancel(session);</div><div class='add'>+		j1939_session_completed(session);</div><div class='add'>+	} else if (remain) {</div><div class='add'>+		if (!session-&gt;transmission)</div><div class='add'>+			j1939_tp_set_rxtimeout(session, 750);</div><div class='add'>+	} else if (do_cts_eoma) {</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 1250);</div><div class='add'>+		if (!session-&gt;transmission)</div><div class='add'>+			j1939_tp_schedule_txtimer(session, 0);</div><div class='add'>+	} else {</div><div class='add'>+		j1939_tp_set_rxtimeout(session, 750);</div><div class='add'>+	}</div><div class='add'>+	session-&gt;last_cmd = 0xff;</div><div class='add'>+	consume_skb(se_skb);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ out_session_cancel:</div><div class='add'>+	kfree_skb(se_skb);</div><div class='add'>+	j1939_session_timers_cancel(session);</div><div class='add'>+	j1939_session_cancel(session, abort);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_xtp_rx_dat(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb;</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	skcb = j1939_skb_to_cb(skb);</div><div class='add'>+</div><div class='add'>+	if (j1939_tp_im_transmitter(skcb)) {</div><div class='add'>+		session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, false,</div><div class='add'>+						    true);</div><div class='add'>+		if (!session)</div><div class='add'>+			netdev_info(priv-&gt;ndev, "%s: no tx connection found\n",</div><div class='add'>+				    __func__);</div><div class='add'>+		else</div><div class='add'>+			j1939_xtp_rx_dat_one(session, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (j1939_tp_im_receiver(skcb)) {</div><div class='add'>+		session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, false,</div><div class='add'>+						    false);</div><div class='add'>+		if (!session)</div><div class='add'>+			netdev_info(priv-&gt;ndev, "%s: no rx connection found\n",</div><div class='add'>+				    __func__);</div><div class='add'>+		else</div><div class='add'>+			j1939_xtp_rx_dat_one(session, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (j1939_cb_is_broadcast(skcb)) {</div><div class='add'>+		session = j1939_session_get_by_addr(priv, &amp;skcb-&gt;addr, false,</div><div class='add'>+						    false);</div><div class='add'>+		if (session)</div><div class='add'>+			j1939_xtp_rx_dat_one(session, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* j1939 main intf */</div><div class='add'>+struct j1939_session *j1939_tp_send(struct j1939_priv *priv,</div><div class='add'>+				    struct sk_buff *skb, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.pgn == J1939_TP_PGN_DAT ||</div><div class='add'>+	    skcb-&gt;addr.pgn == J1939_TP_PGN_CTL ||</div><div class='add'>+	    skcb-&gt;addr.pgn == J1939_ETP_PGN_DAT ||</div><div class='add'>+	    skcb-&gt;addr.pgn == J1939_ETP_PGN_CTL)</div><div class='add'>+		/* avoid conflict */</div><div class='add'>+		return ERR_PTR(-EDOM);</div><div class='add'>+</div><div class='add'>+	if (size &gt; priv-&gt;tp_max_packet_size)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	if (size &lt;= 8)</div><div class='add'>+		skcb-&gt;addr.type = J1939_SIMPLE;</div><div class='add'>+	else if (size &gt; J1939_MAX_TP_PACKET_SIZE)</div><div class='add'>+		skcb-&gt;addr.type = J1939_ETP;</div><div class='add'>+	else</div><div class='add'>+		skcb-&gt;addr.type = J1939_TP;</div><div class='add'>+</div><div class='add'>+	if (skcb-&gt;addr.type == J1939_ETP &amp;&amp;</div><div class='add'>+	    j1939_cb_is_broadcast(skcb))</div><div class='add'>+		return ERR_PTR(-EDESTADDRREQ);</div><div class='add'>+</div><div class='add'>+	/* fill in addresses from names */</div><div class='add'>+	ret = j1939_ac_fixup(priv, skb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	/* fix DST flags, it may be used there soon */</div><div class='add'>+	if (j1939_address_is_unicast(skcb-&gt;addr.da) &amp;&amp;</div><div class='add'>+	    priv-&gt;ents[skcb-&gt;addr.da].nusers)</div><div class='add'>+		skcb-&gt;flags |= J1939_ECU_LOCAL_DST;</div><div class='add'>+</div><div class='add'>+	/* src is always local, I'm sending ... */</div><div class='add'>+	skcb-&gt;flags |= J1939_ECU_LOCAL_SRC;</div><div class='add'>+</div><div class='add'>+	/* prepare new session */</div><div class='add'>+	session = j1939_session_new(priv, skb, size);</div><div class='add'>+	if (!session)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/* skb is recounted in j1939_session_new() */</div><div class='add'>+	sock_hold(skb-&gt;sk);</div><div class='add'>+	session-&gt;sk = skb-&gt;sk;</div><div class='add'>+	session-&gt;transmission = true;</div><div class='add'>+	session-&gt;pkt.total = (size + 6) / 7;</div><div class='add'>+	session-&gt;pkt.block = skcb-&gt;addr.type == J1939_ETP ? 255 :</div><div class='add'>+		min(j1939_tp_block ?: 255, session-&gt;pkt.total);</div><div class='add'>+</div><div class='add'>+	if (j1939_cb_is_broadcast(&amp;session-&gt;skcb))</div><div class='add'>+		/* set the end-packet for broadcast */</div><div class='add'>+		session-&gt;pkt.last = session-&gt;pkt.total;</div><div class='add'>+</div><div class='add'>+	skcb-&gt;tskey = atomic_inc_return(&amp;session-&gt;sk-&gt;sk_tskey) - 1;</div><div class='add'>+	session-&gt;tskey = skcb-&gt;tskey;</div><div class='add'>+</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+	int extd = J1939_TP;</div><div class='add'>+	u8 cmd = skb-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case J1939_ETP_CMD_RTS:</div><div class='add'>+		extd = J1939_ETP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_BAM:</div><div class='add'>+		if (cmd == J1939_TP_CMD_BAM &amp;&amp; !j1939_cb_is_broadcast(skcb)) {</div><div class='add'>+			netdev_err_once(priv-&gt;ndev, "%s: BAM to unicast (%02x), ignoring!\n",</div><div class='add'>+					__func__, skcb-&gt;addr.sa);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_RTS:</div><div class='add'>+		if (skcb-&gt;addr.type != extd)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (cmd == J1939_TP_CMD_RTS &amp;&amp; j1939_cb_is_broadcast(skcb)) {</div><div class='add'>+			netdev_alert(priv-&gt;ndev, "%s: rts without destination (%02x)\n",</div><div class='add'>+				     __func__, skcb-&gt;addr.sa);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_transmitter(skcb))</div><div class='add'>+			j1939_xtp_rx_rts(priv, skb, true);</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_receiver(skcb) || j1939_cb_is_broadcast(skcb))</div><div class='add'>+			j1939_xtp_rx_rts(priv, skb, false);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_CTS:</div><div class='add'>+		extd = J1939_ETP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_CTS:</div><div class='add'>+		if (skcb-&gt;addr.type != extd)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_transmitter(skcb))</div><div class='add'>+			j1939_xtp_rx_cts(priv, skb, false);</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_receiver(skcb))</div><div class='add'>+			j1939_xtp_rx_cts(priv, skb, true);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_DPO:</div><div class='add'>+		if (skcb-&gt;addr.type != J1939_ETP)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_transmitter(skcb))</div><div class='add'>+			j1939_xtp_rx_dpo(priv, skb, true);</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_receiver(skcb))</div><div class='add'>+			j1939_xtp_rx_dpo(priv, skb, false);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_EOMA:</div><div class='add'>+		extd = J1939_ETP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_CMD_EOMA:</div><div class='add'>+		if (skcb-&gt;addr.type != extd)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_transmitter(skcb))</div><div class='add'>+			j1939_xtp_rx_eoma(priv, skb, false);</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_receiver(skcb))</div><div class='add'>+			j1939_xtp_rx_eoma(priv, skb, true);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_CMD_ABORT: /* &amp;&amp; J1939_TP_CMD_ABORT */</div><div class='add'>+		if (j1939_cb_is_broadcast(skcb)) {</div><div class='add'>+			netdev_err_once(priv-&gt;ndev, "%s: abort to broadcast (%02x), ignoring!\n",</div><div class='add'>+					__func__, skcb-&gt;addr.sa);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_transmitter(skcb))</div><div class='add'>+			j1939_xtp_rx_abort(priv, skb, true);</div><div class='add'>+</div><div class='add'>+		if (j1939_tp_im_receiver(skcb))</div><div class='add'>+			j1939_xtp_rx_abort(priv, skb, false);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb);</div><div class='add'>+</div><div class='add'>+	if (!j1939_tp_im_involved_anydir(skcb) &amp;&amp; !j1939_cb_is_broadcast(skcb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (skcb-&gt;addr.pgn) {</div><div class='add'>+	case J1939_ETP_PGN_DAT:</div><div class='add'>+		skcb-&gt;addr.type = J1939_ETP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_PGN_DAT:</div><div class='add'>+		j1939_xtp_rx_dat(priv, skb);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case J1939_ETP_PGN_CTL:</div><div class='add'>+		skcb-&gt;addr.type = J1939_ETP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case J1939_TP_PGN_CTL:</div><div class='add'>+		if (skb-&gt;len &lt; 8)</div><div class='add'>+			return 0; /* Don't care. Nothing to extract here */</div><div class='add'>+</div><div class='add'>+		j1939_tp_cmd_recv(priv, skb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0; /* no problem */</div><div class='add'>+	}</div><div class='add'>+	return 1; /* "I processed the message" */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_simple_recv(struct j1939_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session;</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;sk-&gt;sk_family != AF_CAN ||</div><div class='add'>+	    skb-&gt;sk-&gt;sk_protocol != CAN_J1939)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	j1939_session_list_lock(priv);</div><div class='add'>+	session = j1939_session_get_simple(priv, skb);</div><div class='add'>+	j1939_session_list_unlock(priv);</div><div class='add'>+	if (!session) {</div><div class='add'>+		netdev_warn(priv-&gt;ndev,</div><div class='add'>+			    "%s: Received already invalidated message\n",</div><div class='add'>+			    __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	j1939_session_timers_cancel(session);</div><div class='add'>+	j1939_session_deactivate(session);</div><div class='add'>+	j1939_session_put(session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int j1939_cancel_active_session(struct j1939_priv *priv, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct j1939_session *session, *saved;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s, sk: %p\n", __func__, sk);</div><div class='add'>+	j1939_session_list_lock(priv);</div><div class='add'>+	list_for_each_entry_safe(session, saved,</div><div class='add'>+				 &amp;priv-&gt;active_session_list,</div><div class='add'>+				 active_session_list_entry) {</div><div class='add'>+		if (!sk || sk == session-&gt;sk) {</div><div class='add'>+			if (hrtimer_try_to_cancel(&amp;session-&gt;txtimer) == 1)</div><div class='add'>+				j1939_session_put(session);</div><div class='add'>+			if (hrtimer_try_to_cancel(&amp;session-&gt;rxtimer) == 1)</div><div class='add'>+				j1939_session_put(session);</div><div class='add'>+</div><div class='add'>+			session-&gt;err = ESHUTDOWN;</div><div class='add'>+			j1939_session_deactivate_locked(session);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	j1939_session_list_unlock(priv);</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void j1939_tp_init(struct j1939_priv *priv)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;active_session_list_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;active_session_list);</div><div class='add'>+	priv-&gt;tp_max_packet_size = J1939_MAX_ETP_PACKET_SIZE;</div><div class='add'>+}</div><div class='head'>diff --git a/net/can/proc.c b/net/can/proc.c<br/>index 70fea17bb04c..0938bf7dd646 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/proc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='ctx'>  * proc.c - procfs support for Protocol family CAN core module</div><div class='ctx'>  *</div><div class='hunk'>@@ -44,6 +45,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='ctx'> #include &lt;linux/can/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "af_can.h"</div><div class='hunk'>@@ -52,7 +54,6 @@</div><div class='ctx'>  * proc filenames for the PF_CAN core</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define CAN_PROC_VERSION     "version"</div><div class='ctx'> #define CAN_PROC_STATS       "stats"</div><div class='ctx'> #define CAN_PROC_RESET_STATS "reset_stats"</div><div class='ctx'> #define CAN_PROC_RCVLIST_ALL "rcvlist_all"</div><div class='hunk'>@@ -77,29 +78,27 @@ static const char rx_list_name[][8] = {</div><div class='ctx'> </div><div class='ctx'> static void can_init_stats(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct s_stats *can_stats = net-&gt;can.can_stats;</div><div class='del'>-	struct s_pstats *can_pstats = net-&gt;can.can_pstats;</div><div class='add'>+	struct can_pkg_stats *pkg_stats = net-&gt;can.pkg_stats;</div><div class='add'>+	struct can_rcv_lists_stats *rcv_lists_stats = net-&gt;can.rcv_lists_stats;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This memset function is called from a timer context (when</div><div class='ctx'> 	 * can_stattimer is active which is the default) OR in a process</div><div class='ctx'> 	 * context (reading the proc_fs when can_stattimer is disabled).</div><div class='ctx'> 	 */</div><div class='del'>-	memset(can_stats, 0, sizeof(struct s_stats));</div><div class='del'>-	can_stats-&gt;jiffies_init = jiffies;</div><div class='add'>+	memset(pkg_stats, 0, sizeof(struct can_pkg_stats));</div><div class='add'>+	pkg_stats-&gt;jiffies_init = jiffies;</div><div class='ctx'> </div><div class='del'>-	can_pstats-&gt;stats_reset++;</div><div class='add'>+	rcv_lists_stats-&gt;stats_reset++;</div><div class='ctx'> </div><div class='ctx'> 	if (user_reset) {</div><div class='ctx'> 		user_reset = 0;</div><div class='del'>-		can_pstats-&gt;user_reset++;</div><div class='add'>+		rcv_lists_stats-&gt;user_reset++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,</div><div class='ctx'> 			       unsigned long count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rate;</div><div class='del'>-</div><div class='ctx'> 	if (oldjif == newjif)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -110,73 +109,76 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,</div><div class='ctx'> 		return 99999999;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rate = (count * HZ) / (newjif - oldjif);</div><div class='del'>-</div><div class='del'>-	return rate;</div><div class='add'>+	return (count * HZ) / (newjif - oldjif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void can_stat_update(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = from_timer(net, t, can.can_stattimer);</div><div class='del'>-	struct s_stats *can_stats = net-&gt;can.can_stats;</div><div class='add'>+	struct net *net = timer_container_of(net, t, can.stattimer);</div><div class='add'>+	struct can_pkg_stats *pkg_stats = net-&gt;can.pkg_stats;</div><div class='ctx'> 	unsigned long j = jiffies; /* snapshot */</div><div class='ctx'> </div><div class='add'>+	long rx_frames = atomic_long_read(&amp;pkg_stats-&gt;rx_frames);</div><div class='add'>+	long tx_frames = atomic_long_read(&amp;pkg_stats-&gt;tx_frames);</div><div class='add'>+	long matches = atomic_long_read(&amp;pkg_stats-&gt;matches);</div><div class='add'>+	long rx_frames_delta = atomic_long_read(&amp;pkg_stats-&gt;rx_frames_delta);</div><div class='add'>+	long tx_frames_delta = atomic_long_read(&amp;pkg_stats-&gt;tx_frames_delta);</div><div class='add'>+	long matches_delta = atomic_long_read(&amp;pkg_stats-&gt;matches_delta);</div><div class='add'>+</div><div class='ctx'> 	/* restart counting in timer context on user request */</div><div class='ctx'> 	if (user_reset)</div><div class='ctx'> 		can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 	/* restart counting on jiffies overflow */</div><div class='del'>-	if (j &lt; can_stats-&gt;jiffies_init)</div><div class='add'>+	if (j &lt; pkg_stats-&gt;jiffies_init)</div><div class='ctx'> 		can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 	/* prevent overflow in calc_rate() */</div><div class='del'>-	if (can_stats-&gt;rx_frames &gt; (ULONG_MAX / HZ))</div><div class='add'>+	if (rx_frames &gt; (LONG_MAX / HZ))</div><div class='ctx'> 		can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 	/* prevent overflow in calc_rate() */</div><div class='del'>-	if (can_stats-&gt;tx_frames &gt; (ULONG_MAX / HZ))</div><div class='add'>+	if (tx_frames &gt; (LONG_MAX / HZ))</div><div class='ctx'> 		can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 	/* matches overflow - very improbable */</div><div class='del'>-	if (can_stats-&gt;matches &gt; (ULONG_MAX / 100))</div><div class='add'>+	if (matches &gt; (LONG_MAX / 100))</div><div class='ctx'> 		can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 	/* calc total values */</div><div class='del'>-	if (can_stats-&gt;rx_frames)</div><div class='del'>-		can_stats-&gt;total_rx_match_ratio = (can_stats-&gt;matches * 100) /</div><div class='del'>-			can_stats-&gt;rx_frames;</div><div class='add'>+	if (rx_frames)</div><div class='add'>+		pkg_stats-&gt;total_rx_match_ratio = (matches * 100) / rx_frames;</div><div class='ctx'> </div><div class='del'>-	can_stats-&gt;total_tx_rate = calc_rate(can_stats-&gt;jiffies_init, j,</div><div class='del'>-					    can_stats-&gt;tx_frames);</div><div class='del'>-	can_stats-&gt;total_rx_rate = calc_rate(can_stats-&gt;jiffies_init, j,</div><div class='del'>-					    can_stats-&gt;rx_frames);</div><div class='add'>+	pkg_stats-&gt;total_tx_rate = calc_rate(pkg_stats-&gt;jiffies_init, j,</div><div class='add'>+					    tx_frames);</div><div class='add'>+	pkg_stats-&gt;total_rx_rate = calc_rate(pkg_stats-&gt;jiffies_init, j,</div><div class='add'>+					    rx_frames);</div><div class='ctx'> </div><div class='ctx'> 	/* calc current values */</div><div class='del'>-	if (can_stats-&gt;rx_frames_delta)</div><div class='del'>-		can_stats-&gt;current_rx_match_ratio =</div><div class='del'>-			(can_stats-&gt;matches_delta * 100) /</div><div class='del'>-			can_stats-&gt;rx_frames_delta;</div><div class='add'>+	if (rx_frames_delta)</div><div class='add'>+		pkg_stats-&gt;current_rx_match_ratio =</div><div class='add'>+			(matches_delta * 100) /	rx_frames_delta;</div><div class='ctx'> </div><div class='del'>-	can_stats-&gt;current_tx_rate = calc_rate(0, HZ, can_stats-&gt;tx_frames_delta);</div><div class='del'>-	can_stats-&gt;current_rx_rate = calc_rate(0, HZ, can_stats-&gt;rx_frames_delta);</div><div class='add'>+	pkg_stats-&gt;current_tx_rate = calc_rate(0, HZ, tx_frames_delta);</div><div class='add'>+	pkg_stats-&gt;current_rx_rate = calc_rate(0, HZ, rx_frames_delta);</div><div class='ctx'> </div><div class='ctx'> 	/* check / update maximum values */</div><div class='del'>-	if (can_stats-&gt;max_tx_rate &lt; can_stats-&gt;current_tx_rate)</div><div class='del'>-		can_stats-&gt;max_tx_rate = can_stats-&gt;current_tx_rate;</div><div class='add'>+	if (pkg_stats-&gt;max_tx_rate &lt; pkg_stats-&gt;current_tx_rate)</div><div class='add'>+		pkg_stats-&gt;max_tx_rate = pkg_stats-&gt;current_tx_rate;</div><div class='ctx'> </div><div class='del'>-	if (can_stats-&gt;max_rx_rate &lt; can_stats-&gt;current_rx_rate)</div><div class='del'>-		can_stats-&gt;max_rx_rate = can_stats-&gt;current_rx_rate;</div><div class='add'>+	if (pkg_stats-&gt;max_rx_rate &lt; pkg_stats-&gt;current_rx_rate)</div><div class='add'>+		pkg_stats-&gt;max_rx_rate = pkg_stats-&gt;current_rx_rate;</div><div class='ctx'> </div><div class='del'>-	if (can_stats-&gt;max_rx_match_ratio &lt; can_stats-&gt;current_rx_match_ratio)</div><div class='del'>-		can_stats-&gt;max_rx_match_ratio = can_stats-&gt;current_rx_match_ratio;</div><div class='add'>+	if (pkg_stats-&gt;max_rx_match_ratio &lt; pkg_stats-&gt;current_rx_match_ratio)</div><div class='add'>+		pkg_stats-&gt;max_rx_match_ratio = pkg_stats-&gt;current_rx_match_ratio;</div><div class='ctx'> </div><div class='ctx'> 	/* clear values for 'current rate' calculation */</div><div class='del'>-	can_stats-&gt;tx_frames_delta = 0;</div><div class='del'>-	can_stats-&gt;rx_frames_delta = 0;</div><div class='del'>-	can_stats-&gt;matches_delta   = 0;</div><div class='add'>+	atomic_long_set(&amp;pkg_stats-&gt;tx_frames_delta, 0);</div><div class='add'>+	atomic_long_set(&amp;pkg_stats-&gt;rx_frames_delta, 0);</div><div class='add'>+	atomic_long_set(&amp;pkg_stats-&gt;matches_delta, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* restart timer (one second) */</div><div class='del'>-	mod_timer(&amp;net-&gt;can.can_stattimer, round_jiffies(jiffies + HZ));</div><div class='add'>+	mod_timer(&amp;net-&gt;can.stattimer, round_jiffies(jiffies + HZ));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -204,67 +206,72 @@ static void can_print_recv_banner(struct seq_file *m)</div><div class='ctx'> 	 *                  can1.  00000000  00000000  00000000</div><div class='ctx'> 	 *                 .......          0  tp20</div><div class='ctx'> 	 */</div><div class='del'>-	seq_puts(m, "  device   can_id   can_mask  function"</div><div class='del'>-			"  userdata   matches  ident\n");</div><div class='add'>+	if (IS_ENABLED(CONFIG_64BIT))</div><div class='add'>+		seq_puts(m, "  device   can_id   can_mask      function          userdata       matches  ident\n");</div><div class='add'>+	else</div><div class='add'>+		seq_puts(m, "  device   can_id   can_mask  function  userdata   matches  ident\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int can_stats_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='del'>-	struct s_stats *can_stats = net-&gt;can.can_stats;</div><div class='del'>-	struct s_pstats *can_pstats = net-&gt;can.can_pstats;</div><div class='add'>+	struct can_pkg_stats *pkg_stats = net-&gt;can.pkg_stats;</div><div class='add'>+	struct can_rcv_lists_stats *rcv_lists_stats = net-&gt;can.rcv_lists_stats;</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='del'>-	seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats-&gt;tx_frames);</div><div class='del'>-	seq_printf(m, " %8ld received frames (RXF)\n", can_stats-&gt;rx_frames);</div><div class='del'>-	seq_printf(m, " %8ld matched frames (RXMF)\n", can_stats-&gt;matches);</div><div class='add'>+	seq_printf(m, " %8ld transmitted frames (TXF)\n",</div><div class='add'>+		   atomic_long_read(&amp;pkg_stats-&gt;tx_frames));</div><div class='add'>+	seq_printf(m, " %8ld received frames (RXF)\n",</div><div class='add'>+		   atomic_long_read(&amp;pkg_stats-&gt;rx_frames));</div><div class='add'>+	seq_printf(m, " %8ld matched frames (RXMF)\n",</div><div class='add'>+		   atomic_long_read(&amp;pkg_stats-&gt;matches));</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;can.can_stattimer.function == can_stat_update) {</div><div class='add'>+	if (net-&gt;can.stattimer.function == can_stat_update) {</div><div class='ctx'> 		seq_printf(m, " %8ld %% total match ratio (RXMR)\n",</div><div class='del'>-				can_stats-&gt;total_rx_match_ratio);</div><div class='add'>+				pkg_stats-&gt;total_rx_match_ratio);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, " %8ld frames/s total tx rate (TXR)\n",</div><div class='del'>-				can_stats-&gt;total_tx_rate);</div><div class='add'>+				pkg_stats-&gt;total_tx_rate);</div><div class='ctx'> 		seq_printf(m, " %8ld frames/s total rx rate (RXR)\n",</div><div class='del'>-				can_stats-&gt;total_rx_rate);</div><div class='add'>+				pkg_stats-&gt;total_rx_rate);</div><div class='ctx'> </div><div class='ctx'> 		seq_putc(m, '\n');</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, " %8ld %% current match ratio (CRXMR)\n",</div><div class='del'>-				can_stats-&gt;current_rx_match_ratio);</div><div class='add'>+				pkg_stats-&gt;current_rx_match_ratio);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, " %8ld frames/s current tx rate (CTXR)\n",</div><div class='del'>-				can_stats-&gt;current_tx_rate);</div><div class='add'>+				pkg_stats-&gt;current_tx_rate);</div><div class='ctx'> 		seq_printf(m, " %8ld frames/s current rx rate (CRXR)\n",</div><div class='del'>-				can_stats-&gt;current_rx_rate);</div><div class='add'>+				pkg_stats-&gt;current_rx_rate);</div><div class='ctx'> </div><div class='ctx'> 		seq_putc(m, '\n');</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, " %8ld %% max match ratio (MRXMR)\n",</div><div class='del'>-				can_stats-&gt;max_rx_match_ratio);</div><div class='add'>+				pkg_stats-&gt;max_rx_match_ratio);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, " %8ld frames/s max tx rate (MTXR)\n",</div><div class='del'>-				can_stats-&gt;max_tx_rate);</div><div class='add'>+				pkg_stats-&gt;max_tx_rate);</div><div class='ctx'> 		seq_printf(m, " %8ld frames/s max rx rate (MRXR)\n",</div><div class='del'>-				can_stats-&gt;max_rx_rate);</div><div class='add'>+				pkg_stats-&gt;max_rx_rate);</div><div class='ctx'> </div><div class='ctx'> 		seq_putc(m, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, " %8ld current receive list entries (CRCV)\n",</div><div class='del'>-			can_pstats-&gt;rcv_entries);</div><div class='add'>+			rcv_lists_stats-&gt;rcv_entries);</div><div class='ctx'> 	seq_printf(m, " %8ld maximum receive list entries (MRCV)\n",</div><div class='del'>-			can_pstats-&gt;rcv_entries_max);</div><div class='add'>+			rcv_lists_stats-&gt;rcv_entries_max);</div><div class='ctx'> </div><div class='del'>-	if (can_pstats-&gt;stats_reset)</div><div class='add'>+	if (rcv_lists_stats-&gt;stats_reset)</div><div class='ctx'> 		seq_printf(m, "\n %8ld statistic resets (STR)\n",</div><div class='del'>-				can_pstats-&gt;stats_reset);</div><div class='add'>+				rcv_lists_stats-&gt;stats_reset);</div><div class='ctx'> </div><div class='del'>-	if (can_pstats-&gt;user_reset)</div><div class='add'>+	if (rcv_lists_stats-&gt;user_reset)</div><div class='ctx'> 		seq_printf(m, " %8ld user statistic resets (USTR)\n",</div><div class='del'>-				can_pstats-&gt;user_reset);</div><div class='add'>+				rcv_lists_stats-&gt;user_reset);</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -273,37 +280,31 @@ static int can_stats_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> static int can_reset_stats_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='del'>-	struct s_pstats *can_pstats = net-&gt;can.can_pstats;</div><div class='del'>-	struct s_stats *can_stats = net-&gt;can.can_stats;</div><div class='add'>+	struct can_rcv_lists_stats *rcv_lists_stats = net-&gt;can.rcv_lists_stats;</div><div class='add'>+	struct can_pkg_stats *pkg_stats = net-&gt;can.pkg_stats;</div><div class='ctx'> </div><div class='ctx'> 	user_reset = 1;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;can.can_stattimer.function == can_stat_update) {</div><div class='add'>+	if (net-&gt;can.stattimer.function == can_stat_update) {</div><div class='ctx'> 		seq_printf(m, "Scheduled statistic reset #%ld.\n",</div><div class='del'>-				can_pstats-&gt;stats_reset + 1);</div><div class='add'>+				rcv_lists_stats-&gt;stats_reset + 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (can_stats-&gt;jiffies_init != jiffies)</div><div class='add'>+		if (pkg_stats-&gt;jiffies_init != jiffies)</div><div class='ctx'> 			can_init_stats(net);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, "Performed statistic reset #%ld.\n",</div><div class='del'>-				can_pstats-&gt;stats_reset);</div><div class='add'>+				rcv_lists_stats-&gt;stats_reset);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int can_version_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	seq_printf(m, "%s\n", CAN_VERSION_STRING);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,</div><div class='ctx'> 					     struct net_device *dev,</div><div class='del'>-					     struct can_dev_rcv_lists *d)</div><div class='add'>+					     struct can_dev_rcv_lists *dev_rcv_lists)</div><div class='ctx'> {</div><div class='del'>-	if (!hlist_empty(&amp;d-&gt;rx[idx])) {</div><div class='add'>+	if (!hlist_empty(&amp;dev_rcv_lists-&gt;rx[idx])) {</div><div class='ctx'> 		can_print_recv_banner(m);</div><div class='del'>-		can_print_rcvlist(m, &amp;d-&gt;rx[idx], dev);</div><div class='add'>+		can_print_rcvlist(m, &amp;dev_rcv_lists-&gt;rx[idx], dev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		seq_printf(m, "  (%s: no entry)\n", DNAME(dev));</div><div class='ctx'> </div><div class='hunk'>@@ -312,9 +313,9 @@ static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,</div><div class='ctx'> static int can_rcvlist_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	/* double cast to prevent GCC warning */</div><div class='del'>-	int idx = (int)(long)PDE_DATA(m-&gt;file-&gt;f_inode);</div><div class='add'>+	int idx = (int)(long)pde_data(m-&gt;file-&gt;f_inode);</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]);</div><div class='hunk'>@@ -322,13 +323,16 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* receive list for 'all' CAN devices (dev == NULL) */</div><div class='del'>-	d = net-&gt;can.can_rx_alldev_list;</div><div class='del'>-	can_rcvlist_proc_show_one(m, idx, NULL, d);</div><div class='add'>+	dev_rcv_lists = net-&gt;can.rx_alldev_list;</div><div class='add'>+	can_rcvlist_proc_show_one(m, idx, NULL, dev_rcv_lists);</div><div class='ctx'> </div><div class='ctx'> 	/* receive list for registered CAN devices */</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (dev-&gt;type == ARPHRD_CAN &amp;&amp; dev-&gt;ml_priv)</div><div class='del'>-			can_rcvlist_proc_show_one(m, idx, dev, dev-&gt;ml_priv);</div><div class='add'>+		struct can_ml_priv *can_ml = can_get_ml_priv(dev);</div><div class='add'>+</div><div class='add'>+		if (can_ml)</div><div class='add'>+			can_rcvlist_proc_show_one(m, idx, dev,</div><div class='add'>+						  &amp;can_ml-&gt;dev_rcv_lists);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -365,7 +369,7 @@ static inline void can_rcvlist_proc_show_array(struct seq_file *m,</div><div class='ctx'> static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	/* RX_SFF */</div><div class='hunk'>@@ -374,15 +378,18 @@ static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* sff receive list for 'all' CAN devices (dev == NULL) */</div><div class='del'>-	d = net-&gt;can.can_rx_alldev_list;</div><div class='del'>-	can_rcvlist_proc_show_array(m, NULL, d-&gt;rx_sff, ARRAY_SIZE(d-&gt;rx_sff));</div><div class='add'>+	dev_rcv_lists = net-&gt;can.rx_alldev_list;</div><div class='add'>+	can_rcvlist_proc_show_array(m, NULL, dev_rcv_lists-&gt;rx_sff,</div><div class='add'>+				    ARRAY_SIZE(dev_rcv_lists-&gt;rx_sff));</div><div class='ctx'> </div><div class='ctx'> 	/* sff receive list for registered CAN devices */</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (dev-&gt;type == ARPHRD_CAN &amp;&amp; dev-&gt;ml_priv) {</div><div class='del'>-			d = dev-&gt;ml_priv;</div><div class='del'>-			can_rcvlist_proc_show_array(m, dev, d-&gt;rx_sff,</div><div class='del'>-						    ARRAY_SIZE(d-&gt;rx_sff));</div><div class='add'>+		struct can_ml_priv *can_ml = can_get_ml_priv(dev);</div><div class='add'>+</div><div class='add'>+		if (can_ml) {</div><div class='add'>+			dev_rcv_lists = &amp;can_ml-&gt;dev_rcv_lists;</div><div class='add'>+			can_rcvlist_proc_show_array(m, dev, dev_rcv_lists-&gt;rx_sff,</div><div class='add'>+						    ARRAY_SIZE(dev_rcv_lists-&gt;rx_sff));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +402,7 @@ static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct can_dev_rcv_lists *d;</div><div class='add'>+	struct can_dev_rcv_lists *dev_rcv_lists;</div><div class='ctx'> 	struct net *net = m-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	/* RX_EFF */</div><div class='hunk'>@@ -404,15 +411,18 @@ static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* eff receive list for 'all' CAN devices (dev == NULL) */</div><div class='del'>-	d = net-&gt;can.can_rx_alldev_list;</div><div class='del'>-	can_rcvlist_proc_show_array(m, NULL, d-&gt;rx_eff, ARRAY_SIZE(d-&gt;rx_eff));</div><div class='add'>+	dev_rcv_lists = net-&gt;can.rx_alldev_list;</div><div class='add'>+	can_rcvlist_proc_show_array(m, NULL, dev_rcv_lists-&gt;rx_eff,</div><div class='add'>+				    ARRAY_SIZE(dev_rcv_lists-&gt;rx_eff));</div><div class='ctx'> </div><div class='ctx'> 	/* eff receive list for registered CAN devices */</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (dev-&gt;type == ARPHRD_CAN &amp;&amp; dev-&gt;ml_priv) {</div><div class='del'>-			d = dev-&gt;ml_priv;</div><div class='del'>-			can_rcvlist_proc_show_array(m, dev, d-&gt;rx_eff,</div><div class='del'>-						    ARRAY_SIZE(d-&gt;rx_eff));</div><div class='add'>+		struct can_ml_priv *can_ml = can_get_ml_priv(dev);</div><div class='add'>+</div><div class='add'>+		if (can_ml) {</div><div class='add'>+			dev_rcv_lists = &amp;can_ml-&gt;dev_rcv_lists;</div><div class='add'>+			can_rcvlist_proc_show_array(m, dev, dev_rcv_lists-&gt;rx_eff,</div><div class='add'>+						    ARRAY_SIZE(dev_rcv_lists-&gt;rx_eff));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -437,8 +447,6 @@ void can_init_proc(struct net *net)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* own procfs entries from the AF_CAN core */</div><div class='del'>-	net-&gt;can.pde_version = proc_create_net_single(CAN_PROC_VERSION, 0644,</div><div class='del'>-			net-&gt;can.proc_dir, can_version_proc_show, NULL);</div><div class='ctx'> 	net-&gt;can.pde_stats = proc_create_net_single(CAN_PROC_STATS, 0644,</div><div class='ctx'> 			net-&gt;can.proc_dir, can_stats_proc_show, NULL);</div><div class='ctx'> 	net-&gt;can.pde_reset_stats = proc_create_net_single(CAN_PROC_RESET_STATS,</div><div class='hunk'>@@ -467,8 +475,8 @@ void can_init_proc(struct net *net)</div><div class='ctx'>  */</div><div class='ctx'> void can_remove_proc(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (net-&gt;can.pde_version)</div><div class='del'>-		remove_proc_entry(CAN_PROC_VERSION, net-&gt;can.proc_dir);</div><div class='add'>+	if (!net-&gt;can.proc_dir)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (net-&gt;can.pde_stats)</div><div class='ctx'> 		remove_proc_entry(CAN_PROC_STATS, net-&gt;can.proc_dir);</div><div class='hunk'>@@ -494,6 +502,5 @@ void can_remove_proc(struct net *net)</div><div class='ctx'> 	if (net-&gt;can.pde_rcvlist_sff)</div><div class='ctx'> 		remove_proc_entry(CAN_PROC_RCVLIST_SFF, net-&gt;can.proc_dir);</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;can.proc_dir)</div><div class='del'>-		remove_proc_entry("can", net-&gt;proc_net);</div><div class='add'>+	remove_proc_entry("can", net-&gt;proc_net);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/can/raw.c b/net/can/raw.c<br/>index 1051eee82581..be1ef7cf4204 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/can/raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/can/raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/can/raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/can/raw.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * raw.c - Raw sockets for protocol family CAN</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='add'>+/* raw.c - Raw sockets for protocol family CAN</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -50,22 +50,22 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt; /* for can_is_canxl_dev_mtu() */</div><div class='ctx'> #include &lt;linux/can/skb.h&gt;</div><div class='ctx'> #include &lt;linux/can/raw.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CAN_RAW_VERSION CAN_VERSION</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("PF_CAN raw protocol");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_AUTHOR("Urs Thuermann &lt;urs.thuermann@volkswagen.de&gt;");</div><div class='ctx'> MODULE_ALIAS("can-proto-1");</div><div class='ctx'> </div><div class='add'>+#define RAW_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_ifindex)</div><div class='add'>+</div><div class='ctx'> #define MASK_ALL 0</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A raw socket has a list of can_filters attached to it, each receiving</div><div class='add'>+/* A raw socket has a list of can_filters attached to it, each receiving</div><div class='ctx'>  * the CAN frames matching that filter.  If the filter list is empty,</div><div class='ctx'>  * no CAN frames will be received by the socket.  The default after</div><div class='ctx'>  * opening the socket, is to have one filter which receives all frames.</div><div class='hunk'>@@ -75,29 +75,39 @@ MODULE_ALIAS("can-proto-1");</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct uniqframe {</div><div class='del'>-	int skbcnt;</div><div class='ctx'> 	const struct sk_buff *skb;</div><div class='add'>+	int skbcnt;</div><div class='ctx'> 	unsigned int join_rx_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct raw_sock {</div><div class='ctx'> 	struct sock sk;</div><div class='del'>-	int bound;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='add'>+	struct list_head notifier;</div><div class='ctx'> 	int ifindex;</div><div class='del'>-	struct notifier_block notifier;</div><div class='del'>-	int loopback;</div><div class='del'>-	int recv_own_msgs;</div><div class='del'>-	int fd_frames;</div><div class='del'>-	int join_filters;</div><div class='add'>+	unsigned int bound:1;</div><div class='add'>+	unsigned int loopback:1;</div><div class='add'>+	unsigned int recv_own_msgs:1;</div><div class='add'>+	unsigned int fd_frames:1;</div><div class='add'>+	unsigned int xl_frames:1;</div><div class='add'>+	unsigned int join_filters:1;</div><div class='add'>+	struct can_raw_vcid_options raw_vcid_opts;</div><div class='add'>+	canid_t tx_vcid_shifted;</div><div class='add'>+	canid_t rx_vcid_shifted;</div><div class='add'>+	canid_t rx_vcid_mask_shifted;</div><div class='add'>+	can_err_mask_t err_mask;</div><div class='ctx'> 	int count;                 /* number of active filters */</div><div class='ctx'> 	struct can_filter dfilter; /* default/single filter */</div><div class='ctx'> 	struct can_filter *filter; /* pointer to filter(s) */</div><div class='del'>-	can_err_mask_t err_mask;</div><div class='ctx'> 	struct uniqframe __percpu *uniq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Return pointer to store the extra msg flags for raw_recvmsg().</div><div class='add'>+static LIST_HEAD(raw_notifier_list);</div><div class='add'>+static DEFINE_SPINLOCK(raw_notifier_lock);</div><div class='add'>+static struct raw_sock *raw_busy_notifier;</div><div class='add'>+</div><div class='add'>+/* Return pointer to store the extra msg flags for raw_recvmsg().</div><div class='ctx'>  * We use the space of one unsigned int beyond the 'struct sockaddr_can'</div><div class='ctx'>  * in skb-&gt;cb.</div><div class='ctx'>  */</div><div class='hunk'>@@ -119,6 +129,7 @@ static void raw_rcv(struct sk_buff *oskb, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = (struct sock *)data;</div><div class='ctx'> 	struct raw_sock *ro = raw_sk(sk);</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct sockaddr_can *addr;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int *pflags;</div><div class='hunk'>@@ -127,21 +138,40 @@ static void raw_rcv(struct sk_buff *oskb, void *data)</div><div class='ctx'> 	if (!ro-&gt;recv_own_msgs &amp;&amp; oskb-&gt;sk == sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* do not pass non-CAN2.0 frames to a legacy socket */</div><div class='del'>-	if (!ro-&gt;fd_frames &amp;&amp; oskb-&gt;len != CAN_MTU)</div><div class='add'>+	/* make sure to not pass oversized frames to the socket */</div><div class='add'>+	if (!ro-&gt;fd_frames &amp;&amp; can_is_canfd_skb(oskb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (can_is_canxl_skb(oskb)) {</div><div class='add'>+		struct canxl_frame *cxl = (struct canxl_frame *)oskb-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* make sure to not pass oversized frames to the socket */</div><div class='add'>+		if (!ro-&gt;xl_frames)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* filter CAN XL VCID content */</div><div class='add'>+		if (ro-&gt;raw_vcid_opts.flags &amp; CAN_RAW_XL_VCID_RX_FILTER) {</div><div class='add'>+			/* apply VCID filter if user enabled the filter */</div><div class='add'>+			if ((cxl-&gt;prio &amp; ro-&gt;rx_vcid_mask_shifted) !=</div><div class='add'>+			    (ro-&gt;rx_vcid_shifted &amp; ro-&gt;rx_vcid_mask_shifted))</div><div class='add'>+				return;</div><div class='add'>+		} else {</div><div class='add'>+			/* no filter =&gt; do not forward VCID tagged frames */</div><div class='add'>+			if (cxl-&gt;prio &amp; CANXL_VCID_MASK)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* eliminate multiple filter matches for the same skb */</div><div class='ctx'> 	if (this_cpu_ptr(ro-&gt;uniq)-&gt;skb == oskb &amp;&amp;</div><div class='ctx'> 	    this_cpu_ptr(ro-&gt;uniq)-&gt;skbcnt == can_skb_prv(oskb)-&gt;skbcnt) {</div><div class='del'>-		if (ro-&gt;join_filters) {</div><div class='del'>-			this_cpu_inc(ro-&gt;uniq-&gt;join_rx_count);</div><div class='del'>-			/* drop frame until all enabled filters matched */</div><div class='del'>-			if (this_cpu_ptr(ro-&gt;uniq)-&gt;join_rx_count &lt; ro-&gt;count)</div><div class='del'>-				return;</div><div class='del'>-		} else {</div><div class='add'>+		if (!ro-&gt;join_filters)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		this_cpu_inc(ro-&gt;uniq-&gt;join_rx_count);</div><div class='add'>+		/* drop frame until all enabled filters matched */</div><div class='add'>+		if (this_cpu_ptr(ro-&gt;uniq)-&gt;join_rx_count &lt; ro-&gt;count)</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		this_cpu_ptr(ro-&gt;uniq)-&gt;skb = oskb;</div><div class='ctx'> 		this_cpu_ptr(ro-&gt;uniq)-&gt;skbcnt = can_skb_prv(oskb)-&gt;skbcnt;</div><div class='hunk'>@@ -156,17 +186,16 @@ static void raw_rcv(struct sk_buff *oskb, void *data)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *  Put the datagram to the queue so that raw_recvmsg() can</div><div class='del'>-	 *  get it from there.  We need to pass the interface index to</div><div class='del'>-	 *  raw_recvmsg().  We pass a whole struct sockaddr_can in skb-&gt;cb</div><div class='del'>-	 *  containing the interface index.</div><div class='add'>+	/* Put the datagram to the queue so that raw_recvmsg() can get</div><div class='add'>+	 * it from there. We need to pass the interface index to</div><div class='add'>+	 * raw_recvmsg(). We pass a whole struct sockaddr_can in</div><div class='add'>+	 * skb-&gt;cb containing the interface index.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	sock_skb_cb_check_size(sizeof(struct sockaddr_can));</div><div class='ctx'> 	addr = (struct sockaddr_can *)skb-&gt;cb;</div><div class='ctx'> 	memset(addr, 0, sizeof(*addr));</div><div class='del'>-	addr-&gt;can_family  = AF_CAN;</div><div class='add'>+	addr-&gt;can_family = AF_CAN;</div><div class='ctx'> 	addr-&gt;can_ifindex = skb-&gt;dev-&gt;ifindex;</div><div class='ctx'> </div><div class='ctx'> 	/* add CAN specific message flags for raw_recvmsg() */</div><div class='hunk'>@@ -177,8 +206,8 @@ static void raw_rcv(struct sk_buff *oskb, void *data)</div><div class='ctx'> 	if (oskb-&gt;sk == sk)</div><div class='ctx'> 		*pflags |= MSG_CONFIRM;</div><div class='ctx'> </div><div class='del'>-	if (sock_queue_rcv_skb(sk, skb) &lt; 0)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	if (sock_queue_rcv_skb_reason(sk, skb, &amp;reason) &lt; 0)</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_enable_filters(struct net *net, struct net_device *dev,</div><div class='hunk'>@@ -266,50 +295,68 @@ static int raw_enable_allfilters(struct net *net, struct net_device *dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_notifier(struct notifier_block *nb,</div><div class='del'>-			unsigned long msg, void *ptr)</div><div class='add'>+static void raw_notify(struct raw_sock *ro, unsigned long msg,</div><div class='add'>+		       struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct raw_sock *ro = container_of(nb, struct raw_sock, notifier);</div><div class='ctx'> 	struct sock *sk = &amp;ro-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(dev_net(dev), sock_net(sk)))</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type != ARPHRD_CAN)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (ro-&gt;ifindex != dev-&gt;ifindex)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='add'>+	if (ro-&gt;dev != dev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (msg) {</div><div class='del'>-</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> 		/* remove current filters &amp; unregister */</div><div class='del'>-		if (ro-&gt;bound)</div><div class='add'>+		if (ro-&gt;bound) {</div><div class='ctx'> 			raw_disable_allfilters(dev_net(dev), dev, sk);</div><div class='add'>+			netdev_put(dev, &amp;ro-&gt;dev_tracker);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (ro-&gt;count &gt; 1)</div><div class='ctx'> 			kfree(ro-&gt;filter);</div><div class='ctx'> </div><div class='ctx'> 		ro-&gt;ifindex = 0;</div><div class='del'>-		ro-&gt;bound   = 0;</div><div class='del'>-		ro-&gt;count   = 0;</div><div class='add'>+		ro-&gt;bound = 0;</div><div class='add'>+		ro-&gt;dev = NULL;</div><div class='add'>+		ro-&gt;count = 0;</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 		sk-&gt;sk_err = ENODEV;</div><div class='ctx'> 		if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='add'>+			sk_error_report(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='ctx'> 		sk-&gt;sk_err = ENETDOWN;</div><div class='ctx'> 		if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='add'>+			sk_error_report(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int raw_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='add'>+			void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type != ARPHRD_CAN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (msg != NETDEV_UNREGISTER &amp;&amp; msg != NETDEV_DOWN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	if (unlikely(raw_busy_notifier)) /* Check for reentrant bug. */</div><div class='add'>+		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;raw_notifier_lock);</div><div class='add'>+	list_for_each_entry(raw_busy_notifier, &amp;raw_notifier_list, notifier) {</div><div class='add'>+		spin_unlock(&amp;raw_notifier_lock);</div><div class='add'>+		raw_notify(raw_busy_notifier, msg, dev);</div><div class='add'>+		spin_lock(&amp;raw_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	raw_busy_notifier = NULL;</div><div class='add'>+	spin_unlock(&amp;raw_notifier_lock);</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +366,7 @@ static int raw_init(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	ro-&gt;bound            = 0;</div><div class='ctx'> 	ro-&gt;ifindex          = 0;</div><div class='add'>+	ro-&gt;dev              = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* set default filter to single entry dfilter */</div><div class='ctx'> 	ro-&gt;dfilter.can_id   = 0;</div><div class='hunk'>@@ -330,6 +378,7 @@ static int raw_init(struct sock *sk)</div><div class='ctx'> 	ro-&gt;loopback         = 1;</div><div class='ctx'> 	ro-&gt;recv_own_msgs    = 0;</div><div class='ctx'> 	ro-&gt;fd_frames        = 0;</div><div class='add'>+	ro-&gt;xl_frames        = 0;</div><div class='ctx'> 	ro-&gt;join_filters     = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc_percpu provides zero'ed memory */</div><div class='hunk'>@@ -338,9 +387,9 @@ static int raw_init(struct sock *sk)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* set notifier */</div><div class='del'>-	ro-&gt;notifier.notifier_call = raw_notifier;</div><div class='del'>-</div><div class='del'>-	register_netdevice_notifier(&amp;ro-&gt;notifier);</div><div class='add'>+	spin_lock(&amp;raw_notifier_lock);</div><div class='add'>+	list_add_tail(&amp;ro-&gt;notifier, &amp;raw_notifier_list);</div><div class='add'>+	spin_unlock(&amp;raw_notifier_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -349,79 +398,89 @@ static int raw_release(struct socket *sock)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct raw_sock *ro;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ro = raw_sk(sk);</div><div class='add'>+	net = sock_net(sk);</div><div class='ctx'> </div><div class='del'>-	unregister_netdevice_notifier(&amp;ro-&gt;notifier);</div><div class='add'>+	spin_lock(&amp;raw_notifier_lock);</div><div class='add'>+	while (raw_busy_notifier == ro) {</div><div class='add'>+		spin_unlock(&amp;raw_notifier_lock);</div><div class='add'>+		schedule_timeout_uninterruptible(1);</div><div class='add'>+		spin_lock(&amp;raw_notifier_lock);</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;ro-&gt;notifier);</div><div class='add'>+	spin_unlock(&amp;raw_notifier_lock);</div><div class='ctx'> </div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* remove current filters &amp; unregister */</div><div class='ctx'> 	if (ro-&gt;bound) {</div><div class='del'>-		if (ro-&gt;ifindex) {</div><div class='del'>-			struct net_device *dev;</div><div class='del'>-</div><div class='del'>-			dev = dev_get_by_index(sock_net(sk), ro-&gt;ifindex);</div><div class='del'>-			if (dev) {</div><div class='del'>-				raw_disable_allfilters(dev_net(dev), dev, sk);</div><div class='del'>-				dev_put(dev);</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			raw_disable_allfilters(sock_net(sk), NULL, sk);</div><div class='add'>+		if (ro-&gt;dev) {</div><div class='add'>+			raw_disable_allfilters(dev_net(ro-&gt;dev), ro-&gt;dev, sk);</div><div class='add'>+			netdev_put(ro-&gt;dev, &amp;ro-&gt;dev_tracker);</div><div class='add'>+		} else {</div><div class='add'>+			raw_disable_allfilters(net, NULL, sk);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ro-&gt;count &gt; 1)</div><div class='ctx'> 		kfree(ro-&gt;filter);</div><div class='ctx'> </div><div class='ctx'> 	ro-&gt;ifindex = 0;</div><div class='del'>-	ro-&gt;bound   = 0;</div><div class='del'>-	ro-&gt;count   = 0;</div><div class='add'>+	ro-&gt;bound = 0;</div><div class='add'>+	ro-&gt;dev = NULL;</div><div class='add'>+	ro-&gt;count = 0;</div><div class='ctx'> 	free_percpu(ro-&gt;uniq);</div><div class='ctx'> </div><div class='ctx'> 	sock_orphan(sk);</div><div class='ctx'> 	sock-&gt;sk = NULL;</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)</div><div class='add'>+static int raw_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct raw_sock *ro = raw_sk(sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='ctx'> 	int ifindex;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int notify_enetdown = 0;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(*addr))</div><div class='add'>+	if (len &lt; RAW_MIN_NAMELEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (addr-&gt;can_family != AF_CAN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (ro-&gt;bound &amp;&amp; addr-&gt;can_ifindex == ro-&gt;ifindex)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (addr-&gt;can_ifindex) {</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-</div><div class='ctx'> 		dev = dev_get_by_index(sock_net(sk), addr-&gt;can_ifindex);</div><div class='ctx'> 		if (!dev) {</div><div class='ctx'> 			err = -ENODEV;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dev-&gt;type != ARPHRD_CAN) {</div><div class='del'>-			dev_put(dev);</div><div class='ctx'> 			err = -ENODEV;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_put_dev;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			notify_enetdown = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +488,9 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)</div><div class='ctx'> </div><div class='ctx'> 		/* filters set by default/setsockopt */</div><div class='ctx'> 		err = raw_enable_allfilters(sock_net(sk), dev, sk);</div><div class='del'>-		dev_put(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_put_dev;</div><div class='add'>+</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ifindex = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -440,30 +501,34 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		if (ro-&gt;bound) {</div><div class='ctx'> 			/* unregister old filters */</div><div class='del'>-			if (ro-&gt;ifindex) {</div><div class='del'>-				struct net_device *dev;</div><div class='del'>-</div><div class='del'>-				dev = dev_get_by_index(sock_net(sk),</div><div class='del'>-						       ro-&gt;ifindex);</div><div class='del'>-				if (dev) {</div><div class='del'>-					raw_disable_allfilters(dev_net(dev),</div><div class='del'>-							       dev, sk);</div><div class='del'>-					dev_put(dev);</div><div class='del'>-				}</div><div class='del'>-			} else</div><div class='add'>+			if (ro-&gt;dev) {</div><div class='add'>+				raw_disable_allfilters(dev_net(ro-&gt;dev),</div><div class='add'>+						       ro-&gt;dev, sk);</div><div class='add'>+				/* drop reference to old ro-&gt;dev */</div><div class='add'>+				netdev_put(ro-&gt;dev, &amp;ro-&gt;dev_tracker);</div><div class='add'>+			} else {</div><div class='ctx'> 				raw_disable_allfilters(sock_net(sk), NULL, sk);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ro-&gt;ifindex = ifindex;</div><div class='ctx'> 		ro-&gt;bound = 1;</div><div class='add'>+		/* bind() ok -&gt; hold a reference for new ro-&gt;dev */</div><div class='add'>+		ro-&gt;dev = dev;</div><div class='add'>+		if (ro-&gt;dev)</div><div class='add'>+			netdev_hold(ro-&gt;dev, &amp;ro-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- out:</div><div class='add'>+out_put_dev:</div><div class='add'>+	/* remove potential reference from dev_get_by_index() */</div><div class='add'>+	dev_put(dev);</div><div class='add'>+out:</div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (notify_enetdown) {</div><div class='ctx'> 		sk-&gt;sk_err = ENETDOWN;</div><div class='ctx'> 		if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='add'>+			sk_error_report(sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -479,15 +544,15 @@ static int raw_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 	if (peer)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	memset(addr, 0, sizeof(*addr));</div><div class='add'>+	memset(addr, 0, RAW_MIN_NAMELEN);</div><div class='ctx'> 	addr-&gt;can_family  = AF_CAN;</div><div class='ctx'> 	addr-&gt;can_ifindex = ro-&gt;ifindex;</div><div class='ctx'> </div><div class='del'>-	return sizeof(*addr);</div><div class='add'>+	return RAW_MIN_NAMELEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct raw_sock *ro = raw_sk(sk);</div><div class='hunk'>@@ -496,13 +561,13 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	can_err_mask_t err_mask = 0;</div><div class='ctx'> 	int count = 0;</div><div class='add'>+	int flag;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_CAN_RAW)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='del'>-</div><div class='ctx'> 	case CAN_RAW_FILTER:</div><div class='ctx'> 		if (optlen % sizeof(struct can_filter) != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -514,18 +579,26 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 		if (count &gt; 1) {</div><div class='ctx'> 			/* filter does not fit into dfilter =&gt; alloc space */</div><div class='del'>-			filter = memdup_user(optval, optlen);</div><div class='add'>+			filter = memdup_sockptr(optval, optlen);</div><div class='ctx'> 			if (IS_ERR(filter))</div><div class='ctx'> 				return PTR_ERR(filter);</div><div class='ctx'> 		} else if (count == 1) {</div><div class='del'>-			if (copy_from_user(&amp;sfilter, optval, sizeof(sfilter)))</div><div class='add'>+			if (copy_from_sockptr(&amp;sfilter, optval, sizeof(sfilter)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		rtnl_lock();</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-		if (ro-&gt;bound &amp;&amp; ro-&gt;ifindex)</div><div class='del'>-			dev = dev_get_by_index(sock_net(sk), ro-&gt;ifindex);</div><div class='add'>+		dev = ro-&gt;dev;</div><div class='add'>+		if (ro-&gt;bound &amp;&amp; dev) {</div><div class='add'>+			if (dev-&gt;reg_state != NETREG_REGISTERED) {</div><div class='add'>+				if (count &gt; 1)</div><div class='add'>+					kfree(filter);</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out_fil;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (ro-&gt;bound) {</div><div class='ctx'> 			/* (try to) register the new filters */</div><div class='hunk'>@@ -560,10 +633,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		ro-&gt;count  = count;</div><div class='ctx'> </div><div class='ctx'>  out_fil:</div><div class='del'>-		if (dev)</div><div class='del'>-			dev_put(dev);</div><div class='del'>-</div><div class='ctx'> 		release_sock(sk);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -571,15 +642,21 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		if (optlen != sizeof(err_mask))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;err_mask, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;err_mask, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		err_mask &amp;= CAN_ERR_MASK;</div><div class='ctx'> </div><div class='add'>+		rtnl_lock();</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-		if (ro-&gt;bound &amp;&amp; ro-&gt;ifindex)</div><div class='del'>-			dev = dev_get_by_index(sock_net(sk), ro-&gt;ifindex);</div><div class='add'>+		dev = ro-&gt;dev;</div><div class='add'>+		if (ro-&gt;bound &amp;&amp; dev) {</div><div class='add'>+			if (dev-&gt;reg_state != NETREG_REGISTERED) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out_err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* remove current error mask */</div><div class='ctx'> 		if (ro-&gt;bound) {</div><div class='hunk'>@@ -599,47 +676,80 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		ro-&gt;err_mask = err_mask;</div><div class='ctx'> </div><div class='ctx'>  out_err:</div><div class='del'>-		if (dev)</div><div class='del'>-			dev_put(dev);</div><div class='del'>-</div><div class='ctx'> 		release_sock(sk);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_LOOPBACK:</div><div class='del'>-		if (optlen != sizeof(ro-&gt;loopback))</div><div class='add'>+		if (optlen != sizeof(flag))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ro-&gt;loopback, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;flag, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='add'>+		ro-&gt;loopback = !!flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_RECV_OWN_MSGS:</div><div class='del'>-		if (optlen != sizeof(ro-&gt;recv_own_msgs))</div><div class='add'>+		if (optlen != sizeof(flag))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ro-&gt;recv_own_msgs, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;flag, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='add'>+		ro-&gt;recv_own_msgs = !!flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_FD_FRAMES:</div><div class='del'>-		if (optlen != sizeof(ro-&gt;fd_frames))</div><div class='add'>+		if (optlen != sizeof(flag))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;flag, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* Enabling CAN XL includes CAN FD */</div><div class='add'>+		if (ro-&gt;xl_frames &amp;&amp; !flag)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ro-&gt;fd_frames = !!flag;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_RAW_XL_FRAMES:</div><div class='add'>+		if (optlen != sizeof(flag))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ro-&gt;fd_frames, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;flag, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='add'>+		ro-&gt;xl_frames = !!flag;</div><div class='add'>+</div><div class='add'>+		/* Enabling CAN XL includes CAN FD */</div><div class='add'>+		if (ro-&gt;xl_frames)</div><div class='add'>+			ro-&gt;fd_frames = ro-&gt;xl_frames;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_RAW_XL_VCID_OPTS:</div><div class='add'>+		if (optlen != sizeof(ro-&gt;raw_vcid_opts))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;ro-&gt;raw_vcid_opts, optval, optlen))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* prepare 32 bit values for handling in hot path */</div><div class='add'>+		ro-&gt;tx_vcid_shifted = ro-&gt;raw_vcid_opts.tx_vcid &lt;&lt; CANXL_VCID_OFFSET;</div><div class='add'>+		ro-&gt;rx_vcid_shifted = ro-&gt;raw_vcid_opts.rx_vcid &lt;&lt; CANXL_VCID_OFFSET;</div><div class='add'>+		ro-&gt;rx_vcid_mask_shifted = ro-&gt;raw_vcid_opts.rx_vcid_mask &lt;&lt; CANXL_VCID_OFFSET;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_JOIN_FILTERS:</div><div class='del'>-		if (optlen != sizeof(ro-&gt;join_filters))</div><div class='add'>+		if (optlen != sizeof(flag))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ro-&gt;join_filters, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;flag, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='add'>+		ro-&gt;join_filters = !!flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -653,9 +763,9 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct raw_sock *ro = raw_sk(sk);</div><div class='add'>+	int flag;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	void *val;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_CAN_RAW)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -665,23 +775,34 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='add'>+	case CAN_RAW_FILTER: {</div><div class='add'>+		int err = 0;</div><div class='ctx'> </div><div class='del'>-	case CAN_RAW_FILTER:</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> 		if (ro-&gt;count &gt; 0) {</div><div class='ctx'> 			int fsize = ro-&gt;count * sizeof(struct can_filter);</div><div class='del'>-			if (len &gt; fsize)</div><div class='del'>-				len = fsize;</div><div class='del'>-			if (copy_to_user(optval, ro-&gt;filter, len))</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-		} else</div><div class='add'>+</div><div class='add'>+			/* user space buffer to small for filter list? */</div><div class='add'>+			if (len &lt; fsize) {</div><div class='add'>+				/* return -ERANGE and needed space in optlen */</div><div class='add'>+				err = -ERANGE;</div><div class='add'>+				if (put_user(fsize, optlen))</div><div class='add'>+					err = -EFAULT;</div><div class='add'>+			} else {</div><div class='add'>+				if (len &gt; fsize)</div><div class='add'>+					len = fsize;</div><div class='add'>+				if (copy_to_user(optval, ro-&gt;filter, len))</div><div class='add'>+					err = -EFAULT;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			len = 0;</div><div class='add'>+		}</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = put_user(len, optlen);</div><div class='ctx'> 		return err;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	case CAN_RAW_ERR_FILTER:</div><div class='ctx'> 		if (len &gt; sizeof(can_err_mask_t))</div><div class='ctx'> 			len = sizeof(can_err_mask_t);</div><div class='hunk'>@@ -691,25 +812,55 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	case CAN_RAW_LOOPBACK:</div><div class='ctx'> 		if (len &gt; sizeof(int))</div><div class='ctx'> 			len = sizeof(int);</div><div class='del'>-		val = &amp;ro-&gt;loopback;</div><div class='add'>+		flag = ro-&gt;loopback;</div><div class='add'>+		val = &amp;flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_RECV_OWN_MSGS:</div><div class='ctx'> 		if (len &gt; sizeof(int))</div><div class='ctx'> 			len = sizeof(int);</div><div class='del'>-		val = &amp;ro-&gt;recv_own_msgs;</div><div class='add'>+		flag = ro-&gt;recv_own_msgs;</div><div class='add'>+		val = &amp;flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CAN_RAW_FD_FRAMES:</div><div class='ctx'> 		if (len &gt; sizeof(int))</div><div class='ctx'> 			len = sizeof(int);</div><div class='del'>-		val = &amp;ro-&gt;fd_frames;</div><div class='add'>+		flag = ro-&gt;fd_frames;</div><div class='add'>+		val = &amp;flag;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN_RAW_XL_FRAMES:</div><div class='add'>+		if (len &gt; sizeof(int))</div><div class='add'>+			len = sizeof(int);</div><div class='add'>+		flag = ro-&gt;xl_frames;</div><div class='add'>+		val = &amp;flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case CAN_RAW_XL_VCID_OPTS: {</div><div class='add'>+		int err = 0;</div><div class='add'>+</div><div class='add'>+		/* user space buffer to small for VCID opts? */</div><div class='add'>+		if (len &lt; sizeof(ro-&gt;raw_vcid_opts)) {</div><div class='add'>+			/* return -ERANGE and needed space in optlen */</div><div class='add'>+			err = -ERANGE;</div><div class='add'>+			if (put_user(sizeof(ro-&gt;raw_vcid_opts), optlen))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+		} else {</div><div class='add'>+			if (len &gt; sizeof(ro-&gt;raw_vcid_opts))</div><div class='add'>+				len = sizeof(ro-&gt;raw_vcid_opts);</div><div class='add'>+			if (copy_to_user(optval, &amp;ro-&gt;raw_vcid_opts, len))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		if (!err)</div><div class='add'>+			err = put_user(len, optlen);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> 	case CAN_RAW_JOIN_FILTERS:</div><div class='ctx'> 		if (len &gt; sizeof(int))</div><div class='ctx'> 			len = sizeof(int);</div><div class='del'>-		val = &amp;ro-&gt;join_filters;</div><div class='add'>+		flag = ro-&gt;join_filters;</div><div class='add'>+		val = &amp;flag;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -723,34 +874,108 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void raw_put_canxl_vcid(struct raw_sock *ro, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct canxl_frame *cxl = (struct canxl_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* sanitize non CAN XL bits */</div><div class='add'>+	cxl-&gt;prio &amp;= (CANXL_PRIO_MASK | CANXL_VCID_MASK);</div><div class='add'>+</div><div class='add'>+	/* clear VCID in CAN XL frame if pass through is disabled */</div><div class='add'>+	if (!(ro-&gt;raw_vcid_opts.flags &amp; CAN_RAW_XL_VCID_TX_PASS))</div><div class='add'>+		cxl-&gt;prio &amp;= CANXL_PRIO_MASK;</div><div class='add'>+</div><div class='add'>+	/* set VCID in CAN XL frame if enabled */</div><div class='add'>+	if (ro-&gt;raw_vcid_opts.flags &amp; CAN_RAW_XL_VCID_TX_SET) {</div><div class='add'>+		cxl-&gt;prio &amp;= CANXL_PRIO_MASK;</div><div class='add'>+		cxl-&gt;prio |= ro-&gt;tx_vcid_shifted;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool raw_dev_cc_enabled(struct net_device *dev,</div><div class='add'>+				      struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* The CANXL-only mode disables error-signalling on the CAN bus</div><div class='add'>+	 * which is needed to send CAN CC/FD frames</div><div class='add'>+	 */</div><div class='add'>+	if (priv)</div><div class='add'>+		return !can_dev_in_xl_only_mode(priv);</div><div class='add'>+</div><div class='add'>+	/* virtual CAN interfaces always support CAN CC */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool raw_dev_fd_enabled(struct net_device *dev,</div><div class='add'>+				      struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* check FD ctrlmode on real CAN interfaces */</div><div class='add'>+	if (priv)</div><div class='add'>+		return (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD);</div><div class='add'>+</div><div class='add'>+	/* check MTU for virtual CAN FD interfaces */</div><div class='add'>+	return (READ_ONCE(dev-&gt;mtu) &gt;= CANFD_MTU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool raw_dev_xl_enabled(struct net_device *dev,</div><div class='add'>+				      struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* check XL ctrlmode on real CAN interfaces */</div><div class='add'>+	if (priv)</div><div class='add'>+		return (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL);</div><div class='add'>+</div><div class='add'>+	/* check MTU for virtual CAN XL interfaces */</div><div class='add'>+	return can_is_canxl_dev_mtu(READ_ONCE(dev-&gt;mtu));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int raw_check_txframe(struct raw_sock *ro, struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = safe_candev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Classical CAN */</div><div class='add'>+	if (can_is_can_skb(skb) &amp;&amp; raw_dev_cc_enabled(dev, priv))</div><div class='add'>+		return CAN_MTU;</div><div class='add'>+</div><div class='add'>+	/* CAN FD */</div><div class='add'>+	if (ro-&gt;fd_frames &amp;&amp; can_is_canfd_skb(skb) &amp;&amp;</div><div class='add'>+	    raw_dev_fd_enabled(dev, priv))</div><div class='add'>+		return CANFD_MTU;</div><div class='add'>+</div><div class='add'>+	/* CAN XL */</div><div class='add'>+	if (ro-&gt;xl_frames &amp;&amp; can_is_canxl_skb(skb) &amp;&amp;</div><div class='add'>+	    raw_dev_xl_enabled(dev, priv))</div><div class='add'>+		return CANXL_MTU;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct raw_sock *ro = raw_sk(sk);</div><div class='add'>+	struct sockcm_cookie sockc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	unsigned int txmtu;</div><div class='ctx'> 	int ifindex;</div><div class='del'>-	int err;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* check for valid CAN frame sizes */</div><div class='add'>+	if (size &lt; CANXL_HDR_SIZE + CANXL_MIN_DLEN || size &gt; CANXL_MTU)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='ctx'> 		DECLARE_SOCKADDR(struct sockaddr_can *, addr, msg-&gt;msg_name);</div><div class='ctx'> </div><div class='del'>-		if (msg-&gt;msg_namelen &lt; sizeof(*addr))</div><div class='add'>+		if (msg-&gt;msg_namelen &lt; RAW_MIN_NAMELEN)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (addr-&gt;can_family != AF_CAN)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		ifindex = addr-&gt;can_ifindex;</div><div class='del'>-	} else</div><div class='del'>-		ifindex = ro-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	if (ro-&gt;fd_frames) {</div><div class='del'>-		if (unlikely(size != CANFD_MTU &amp;&amp; size != CAN_MTU))</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (unlikely(size != CAN_MTU))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		ifindex = ro-&gt;ifindex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = dev_get_by_index(sock_net(sk), ifindex);</div><div class='hunk'>@@ -766,15 +991,35 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='ctx'> 	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='ctx'> 	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='ctx'> </div><div class='add'>+	/* fill the skb before testing for valid CAN frames */</div><div class='ctx'> 	err = memcpy_from_msg(skb_put(skb, size), msg, size);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='del'>-	sock_tx_timestamp(sk, sk-&gt;sk_tsflags, &amp;skb_shinfo(skb)-&gt;tx_flags);</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* check for valid CAN (CC/FD/XL) frame content */</div><div class='add'>+	txmtu = raw_check_txframe(ro, skb, dev);</div><div class='add'>+	if (!txmtu)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	/* only CANXL: clear/forward/set VCID value */</div><div class='add'>+	if (txmtu == CANXL_MTU)</div><div class='add'>+		raw_put_canxl_vcid(ro, skb);</div><div class='add'>+</div><div class='add'>+	sockcm_init(&amp;sockc, sk);</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto free_skb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='del'>-	skb-&gt;sk  = sk;</div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='add'>+	skb-&gt;priority = sockc.priority;</div><div class='add'>+	skb-&gt;mark = sockc.mark;</div><div class='add'>+	skb-&gt;tstamp = sockc.transmit_time;</div><div class='add'>+</div><div class='add'>+	skb_setup_tx_timestamp(skb, &amp;sockc);</div><div class='ctx'> </div><div class='ctx'> 	err = can_send(skb, ro-&gt;loopback);</div><div class='ctx'> </div><div class='hunk'>@@ -799,12 +1044,12 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int noblock;</div><div class='ctx'> </div><div class='del'>-	noblock =  flags &amp; MSG_DONTWAIT;</div><div class='del'>-	flags   &amp;= ~MSG_DONTWAIT;</div><div class='add'>+	if (flags &amp; MSG_ERRQUEUE)</div><div class='add'>+		return sock_recv_errqueue(sk, msg, size,</div><div class='add'>+					  SOL_CAN_RAW, SCM_CAN_RAW_ERRQUEUE);</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -819,11 +1064,11 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='del'>-		__sockaddr_check_size(sizeof(struct sockaddr_can));</div><div class='del'>-		msg-&gt;msg_namelen = sizeof(struct sockaddr_can);</div><div class='add'>+		__sockaddr_check_size(RAW_MIN_NAMELEN);</div><div class='add'>+		msg-&gt;msg_namelen = RAW_MIN_NAMELEN;</div><div class='ctx'> 		memcpy(msg-&gt;msg_name, skb-&gt;cb, msg-&gt;msg_namelen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -835,6 +1080,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,</div><div class='add'>+				unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	/* no ioctls for socket layer -&gt; hand it down to NIC layer */</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct proto_ops raw_ops = {</div><div class='ctx'> 	.family        = PF_CAN,</div><div class='ctx'> 	.release       = raw_release,</div><div class='hunk'>@@ -844,7 +1096,8 @@ static const struct proto_ops raw_ops = {</div><div class='ctx'> 	.accept        = sock_no_accept,</div><div class='ctx'> 	.getname       = raw_getname,</div><div class='ctx'> 	.poll          = datagram_poll,</div><div class='del'>-	.ioctl         = can_ioctl,	/* use can_ioctl() from af_can.c */</div><div class='add'>+	.ioctl         = raw_sock_no_ioctlcmd,</div><div class='add'>+	.gettstamp     = sock_gettstamp,</div><div class='ctx'> 	.listen        = sock_no_listen,</div><div class='ctx'> 	.shutdown      = sock_no_shutdown,</div><div class='ctx'> 	.setsockopt    = raw_setsockopt,</div><div class='hunk'>@@ -852,7 +1105,6 @@ static const struct proto_ops raw_ops = {</div><div class='ctx'> 	.sendmsg       = raw_sendmsg,</div><div class='ctx'> 	.recvmsg       = raw_recvmsg,</div><div class='ctx'> 	.mmap          = sock_no_mmap,</div><div class='del'>-	.sendpage      = sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct proto raw_proto __read_mostly = {</div><div class='hunk'>@@ -869,22 +1121,37 @@ static const struct can_proto raw_can_proto = {</div><div class='ctx'> 	.prot       = &amp;raw_proto,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct notifier_block canraw_notifier = {</div><div class='add'>+	.notifier_call = raw_notifier</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __init int raw_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n");</div><div class='add'>+	pr_info("can: raw protocol\n");</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;canraw_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = can_proto_register(&amp;raw_can_proto);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		printk(KERN_ERR "can: registration of raw protocol failed\n");</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("can: registration of raw protocol failed\n");</div><div class='add'>+		goto register_proto_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+register_proto_failed:</div><div class='add'>+	unregister_netdevice_notifier(&amp;canraw_notifier);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __exit void raw_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	can_proto_unregister(&amp;raw_can_proto);</div><div class='add'>+	unregister_netdevice_notifier(&amp;canraw_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(raw_module_init);</div><div class='head'>diff --git a/net/ceph/Kconfig b/net/ceph/Kconfig<br/>index cd2d5b9301a1..ea60e3ef0834 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config CEPH_LIB</div><div class='ctx'> 	tristate "Ceph core library"</div><div class='ctx'> 	depends on INET</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_CBC</div><div class='add'>+	select CRYPTO_GCM</div><div class='add'>+	select CRYPTO_LIB_SHA256</div><div class='ctx'> 	select CRYPTO</div><div class='ctx'> 	select KEYS</div><div class='ctx'> 	default n</div><div class='hunk'>@@ -12,7 +15,7 @@ config CEPH_LIB</div><div class='ctx'> 	  common functionality to both the Ceph filesystem and</div><div class='ctx'> 	  to the rados block device (rbd).</div><div class='ctx'> </div><div class='del'>-	  More information at http://ceph.newdream.net/.</div><div class='add'>+	  More information at https://ceph.io/.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -38,6 +41,6 @@ config CEPH_LIB_USE_DNS_RESOLVER</div><div class='ctx'> 	  be resolved using the CONFIG_DNS_RESOLVER facility.</div><div class='ctx'> </div><div class='ctx'> 	  For information on how to use CONFIG_DNS_RESOLVER consult</div><div class='del'>-	  Documentation/networking/dns_resolver.txt</div><div class='add'>+	  Documentation/networking/dns_resolver.rst</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='head'>diff --git a/net/ceph/Makefile b/net/ceph/Makefile<br/>index db09defe27d0..8802a0c0155d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> obj-$(CONFIG_CEPH_LIB) += libceph.o</div><div class='ctx'> </div><div class='ctx'> libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \</div><div class='del'>-	mon_client.o \</div><div class='add'>+	mon_client.o decode.o \</div><div class='ctx'> 	cls_lock_client.o \</div><div class='ctx'> 	osd_client.o osdmap.o crush/crush.o crush/mapper.o crush/hash.o \</div><div class='ctx'> 	striper.o \</div><div class='hunk'>@@ -13,5 +13,6 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \</div><div class='ctx'> 	auth.o auth_none.o \</div><div class='ctx'> 	crypto.o armor.o \</div><div class='ctx'> 	auth_x.o \</div><div class='del'>-	ceph_fs.o ceph_strings.o ceph_hash.o \</div><div class='del'>-	pagevec.o snapshot.o string_table.o</div><div class='add'>+	ceph_strings.o ceph_hash.o \</div><div class='add'>+	pagevec.o snapshot.o string_table.o \</div><div class='add'>+	messenger_v1.o messenger_v2.o</div><div class='head'>diff --git a/net/ceph/auth.c b/net/ceph/auth.c<br/>index fbeee068ea14..d38c9eadbe2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/auth.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/auth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/auth.c</a></div><div class='hunk'>@@ -21,32 +21,47 @@ static u32 supported_protocols[] = {</div><div class='ctx'> 	CEPH_AUTH_CEPHX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)</div><div class='add'>+static int init_protocol(struct ceph_auth_client *ac, int proto)</div><div class='ctx'> {</div><div class='del'>-	switch (protocol) {</div><div class='add'>+	dout("%s proto %d\n", __func__, proto);</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='ctx'> 	case CEPH_AUTH_NONE:</div><div class='ctx'> 		return ceph_auth_none_init(ac);</div><div class='ctx'> 	case CEPH_AUTH_CEPHX:</div><div class='ctx'> 		return ceph_x_init(ac);</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOENT;</div><div class='add'>+		pr_err("bad auth protocol %d\n", proto);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ceph_auth_set_global_id(struct ceph_auth_client *ac, u64 global_id)</div><div class='add'>+{</div><div class='add'>+	dout("%s global_id %llu\n", __func__, global_id);</div><div class='add'>+</div><div class='add'>+	if (!global_id)</div><div class='add'>+		pr_err("got zero global_id\n");</div><div class='add'>+</div><div class='add'>+	if (ac-&gt;global_id &amp;&amp; global_id != ac-&gt;global_id)</div><div class='add'>+		pr_err("global_id changed from %llu to %llu\n", ac-&gt;global_id,</div><div class='add'>+		       global_id);</div><div class='add'>+</div><div class='add'>+	ac-&gt;global_id = global_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * setup, teardown.</div><div class='ctx'>  */</div><div class='del'>-struct ceph_auth_client *ceph_auth_init(const char *name, const struct ceph_crypto_key *key)</div><div class='add'>+struct ceph_auth_client *ceph_auth_init(const char *name,</div><div class='add'>+					const struct ceph_crypto_key *key,</div><div class='add'>+					const int *con_modes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_auth_client *ac;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	dout("auth_init name '%s'\n", name);</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='ctx'> 	ac = kzalloc(sizeof(*ac), GFP_NOFS);</div><div class='ctx'> 	if (!ac)</div><div class='del'>-		goto out;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;ac-&gt;mutex);</div><div class='ctx'> 	ac-&gt;negotiating = true;</div><div class='hunk'>@@ -54,12 +69,13 @@ struct ceph_auth_client *ceph_auth_init(const char *name, const struct ceph_cryp</div><div class='ctx'> 		ac-&gt;name = name;</div><div class='ctx'> 	else</div><div class='ctx'> 		ac-&gt;name = CEPH_AUTH_NAME_DEFAULT;</div><div class='del'>-	dout("auth_init name %s\n", ac-&gt;name);</div><div class='ctx'> 	ac-&gt;key = key;</div><div class='del'>-	return ac;</div><div class='add'>+	ac-&gt;preferred_mode = con_modes[0];</div><div class='add'>+	ac-&gt;fallback_mode = con_modes[1];</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ERR_PTR(ret);</div><div class='add'>+	dout("%s name '%s' preferred_mode %d fallback_mode %d\n", __func__,</div><div class='add'>+	     ac-&gt;name, ac-&gt;preferred_mode, ac-&gt;fallback_mode);</div><div class='add'>+	return ac;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_auth_destroy(struct ceph_auth_client *ac)</div><div class='hunk'>@@ -145,31 +161,35 @@ bad:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ceph_build_auth_request(struct ceph_auth_client *ac,</div><div class='del'>-				   void *msg_buf, size_t msg_len)</div><div class='add'>+static int build_request(struct ceph_auth_client *ac, bool add_header,</div><div class='add'>+			 void *buf, int buf_len)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_mon_request_header *monhdr = msg_buf;</div><div class='del'>-	void *p = monhdr + 1;</div><div class='del'>-	void *end = msg_buf + msg_len;</div><div class='add'>+	void *end = buf + buf_len;</div><div class='add'>+	void *p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	monhdr-&gt;have_version = 0;</div><div class='del'>-	monhdr-&gt;session_mon = cpu_to_le16(-1);</div><div class='del'>-	monhdr-&gt;session_mon_tid = 0;</div><div class='del'>-</div><div class='del'>-	ceph_encode_32(&amp;p, ac-&gt;protocol);</div><div class='add'>+	p = buf;</div><div class='add'>+	if (add_header) {</div><div class='add'>+		/* struct ceph_mon_request_header + protocol */</div><div class='add'>+		ceph_encode_64_safe(&amp;p, end, 0, e_range);</div><div class='add'>+		ceph_encode_16_safe(&amp;p, end, -1, e_range);</div><div class='add'>+		ceph_encode_64_safe(&amp;p, end, 0, e_range);</div><div class='add'>+		ceph_encode_32_safe(&amp;p, end, ac-&gt;protocol, e_range);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ceph_encode_need(&amp;p, end, sizeof(u32), e_range);</div><div class='ctx'> 	ret = ac-&gt;ops-&gt;build_request(ac, p + sizeof(u32), end);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		pr_err("error %d building auth method %s request\n", ret,</div><div class='del'>-		       ac-&gt;ops-&gt;name);</div><div class='del'>-		goto out;</div><div class='add'>+		pr_err("auth protocol '%s' building request failed: %d\n",</div><div class='add'>+		       ceph_auth_proto_name(ac-&gt;protocol), ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	dout(" built request %d bytes\n", ret);</div><div class='ctx'> 	ceph_encode_32(&amp;p, ret);</div><div class='del'>-	ret = p + ret - msg_buf;</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return p + ret - buf;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	return -ERANGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -211,11 +231,6 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,</div><div class='ctx'> </div><div class='ctx'> 	payload_end = payload + payload_len;</div><div class='ctx'> </div><div class='del'>-	if (global_id &amp;&amp; ac-&gt;global_id != global_id) {</div><div class='del'>-		dout(" set global_id %lld -&gt; %lld\n", ac-&gt;global_id, global_id);</div><div class='del'>-		ac-&gt;global_id = global_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (ac-&gt;negotiating) {</div><div class='ctx'> 		/* server does not support our protocols? */</div><div class='ctx'> 		if (!protocol &amp;&amp; result &lt; 0) {</div><div class='hunk'>@@ -229,10 +244,10 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,</div><div class='ctx'> 			ac-&gt;ops = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ac-&gt;protocol != protocol) {</div><div class='del'>-			ret = ceph_auth_init_protocol(ac, protocol);</div><div class='add'>+			ret = init_protocol(ac, protocol);</div><div class='ctx'> 			if (ret) {</div><div class='del'>-				pr_err("error %d on auth protocol %d init\n",</div><div class='del'>-				       ret, protocol);</div><div class='add'>+				pr_err("auth protocol '%s' init failed: %d\n",</div><div class='add'>+				       ceph_auth_proto_name(protocol), ret);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -240,11 +255,20 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,</div><div class='ctx'> 		ac-&gt;negotiating = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ac-&gt;ops-&gt;handle_reply(ac, result, payload, payload_end);</div><div class='add'>+	if (result) {</div><div class='add'>+		pr_err("auth protocol '%s' mauth authentication failed: %d\n",</div><div class='add'>+		       ceph_auth_proto_name(ac-&gt;protocol), result);</div><div class='add'>+		ret = result;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ac-&gt;ops-&gt;handle_reply(ac, global_id, payload, payload_end,</div><div class='add'>+				    NULL, NULL, NULL, NULL);</div><div class='ctx'> 	if (ret == -EAGAIN) {</div><div class='del'>-		ret = ceph_build_auth_request(ac, reply_buf, reply_len);</div><div class='add'>+		ret = build_request(ac, true, reply_buf, reply_len);</div><div class='add'>+		goto out;</div><div class='ctx'> 	} else if (ret) {</div><div class='del'>-		pr_err("auth method '%s' error %d\n", ac-&gt;ops-&gt;name, ret);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -264,7 +288,7 @@ int ceph_build_auth(struct ceph_auth_client *ac,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ac-&gt;mutex);</div><div class='ctx'> 	if (ac-&gt;ops-&gt;should_authenticate(ac))</div><div class='del'>-		ret = ceph_build_auth_request(ac, msg_buf, msg_len);</div><div class='add'>+		ret = build_request(ac, true, msg_buf, msg_len);</div><div class='ctx'> 	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -281,19 +305,38 @@ int ceph_auth_is_authenticated(struct ceph_auth_client *ac)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_auth_is_authenticated);</div><div class='ctx'> </div><div class='del'>-int ceph_auth_create_authorizer(struct ceph_auth_client *ac,</div><div class='del'>-				int peer_type,</div><div class='del'>-				struct ceph_auth_handshake *auth)</div><div class='add'>+int __ceph_auth_get_authorizer(struct ceph_auth_client *ac,</div><div class='add'>+			       struct ceph_auth_handshake *auth,</div><div class='add'>+			       int peer_type, bool force_new,</div><div class='add'>+			       int *proto, int *pref_mode, int *fallb_mode)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ac-&gt;mutex);</div><div class='del'>-	if (ac-&gt;ops &amp;&amp; ac-&gt;ops-&gt;create_authorizer)</div><div class='add'>+	if (force_new &amp;&amp; auth-&gt;authorizer) {</div><div class='add'>+		ceph_auth_destroy_authorizer(auth-&gt;authorizer);</div><div class='add'>+		auth-&gt;authorizer = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!auth-&gt;authorizer)</div><div class='ctx'> 		ret = ac-&gt;ops-&gt;create_authorizer(ac, peer_type, auth);</div><div class='add'>+	else if (ac-&gt;ops-&gt;update_authorizer)</div><div class='add'>+		ret = ac-&gt;ops-&gt;update_authorizer(ac, peer_type, auth);</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*proto = ac-&gt;protocol;</div><div class='add'>+	if (pref_mode &amp;&amp; fallb_mode) {</div><div class='add'>+		*pref_mode = ac-&gt;preferred_mode;</div><div class='add'>+		*fallb_mode = ac-&gt;fallback_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_auth_create_authorizer);</div><div class='add'>+EXPORT_SYMBOL(__ceph_auth_get_authorizer);</div><div class='ctx'> </div><div class='ctx'> void ceph_auth_destroy_authorizer(struct ceph_authorizer *a)</div><div class='ctx'> {</div><div class='hunk'>@@ -301,20 +344,6 @@ void ceph_auth_destroy_authorizer(struct ceph_authorizer *a)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_auth_destroy_authorizer);</div><div class='ctx'> </div><div class='del'>-int ceph_auth_update_authorizer(struct ceph_auth_client *ac,</div><div class='del'>-				int peer_type,</div><div class='del'>-				struct ceph_auth_handshake *a)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ac-&gt;mutex);</div><div class='del'>-	if (ac-&gt;ops &amp;&amp; ac-&gt;ops-&gt;update_authorizer)</div><div class='del'>-		ret = ac-&gt;ops-&gt;update_authorizer(ac, peer_type, a);</div><div class='del'>-	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_auth_update_authorizer);</div><div class='del'>-</div><div class='ctx'> int ceph_auth_add_authorizer_challenge(struct ceph_auth_client *ac,</div><div class='ctx'> 				       struct ceph_authorizer *a,</div><div class='ctx'> 				       void *challenge_buf,</div><div class='hunk'>@@ -332,13 +361,18 @@ int ceph_auth_add_authorizer_challenge(struct ceph_auth_client *ac,</div><div class='ctx'> EXPORT_SYMBOL(ceph_auth_add_authorizer_challenge);</div><div class='ctx'> </div><div class='ctx'> int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,</div><div class='del'>-				      struct ceph_authorizer *a)</div><div class='add'>+				      struct ceph_authorizer *a,</div><div class='add'>+				      void *reply, int reply_len,</div><div class='add'>+				      u8 *session_key, int *session_key_len,</div><div class='add'>+				      u8 *con_secret, int *con_secret_len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ac-&gt;mutex);</div><div class='ctx'> 	if (ac-&gt;ops &amp;&amp; ac-&gt;ops-&gt;verify_authorizer_reply)</div><div class='del'>-		ret = ac-&gt;ops-&gt;verify_authorizer_reply(ac, a);</div><div class='add'>+		ret = ac-&gt;ops-&gt;verify_authorizer_reply(ac, a,</div><div class='add'>+			reply, reply_len, session_key, session_key_len,</div><div class='add'>+			con_secret, con_secret_len);</div><div class='ctx'> 	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -352,3 +386,274 @@ void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac, int peer_type)</div><div class='ctx'> 	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_auth_invalidate_authorizer);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * msgr2 authentication</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static bool contains(const int *arr, int cnt, int val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		if (arr[i] == val)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int encode_con_modes(void **p, void *end, int pref_mode, int fallb_mode)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(pref_mode == CEPH_CON_MODE_UNKNOWN);</div><div class='add'>+	if (fallb_mode != CEPH_CON_MODE_UNKNOWN) {</div><div class='add'>+		ceph_encode_32_safe(p, end, 2, e_range);</div><div class='add'>+		ceph_encode_32_safe(p, end, pref_mode, e_range);</div><div class='add'>+		ceph_encode_32_safe(p, end, fallb_mode, e_range);</div><div class='add'>+	} else {</div><div class='add'>+		ceph_encode_32_safe(p, end, 1, e_range);</div><div class='add'>+		ceph_encode_32_safe(p, end, pref_mode, e_range);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Similar to ceph_auth_build_hello().</div><div class='add'>+ */</div><div class='add'>+int ceph_auth_get_request(struct ceph_auth_client *ac, void *buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	int proto = ac-&gt;key ? CEPH_AUTH_CEPHX : CEPH_AUTH_NONE;</div><div class='add'>+	void *end = buf + buf_len;</div><div class='add'>+	void *lenp;</div><div class='add'>+	void *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ac-&gt;mutex);</div><div class='add'>+	if (ac-&gt;protocol == CEPH_AUTH_UNKNOWN) {</div><div class='add'>+		ret = init_protocol(ac, proto);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("auth protocol '%s' init failed: %d\n",</div><div class='add'>+			       ceph_auth_proto_name(proto), ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(ac-&gt;protocol != proto);</div><div class='add'>+		ac-&gt;ops-&gt;reset(ac);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = buf;</div><div class='add'>+	ceph_encode_32_safe(&amp;p, end, ac-&gt;protocol, e_range);</div><div class='add'>+	ret = encode_con_modes(&amp;p, end, ac-&gt;preferred_mode, ac-&gt;fallback_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	lenp = p;</div><div class='add'>+	p += 4;  /* space for len */</div><div class='add'>+</div><div class='add'>+	ceph_encode_8_safe(&amp;p, end, CEPH_AUTH_MODE_MON, e_range);</div><div class='add'>+	ret = ceph_auth_entity_name_encode(ac-&gt;name, &amp;p, end);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ceph_encode_64_safe(&amp;p, end, ac-&gt;global_id, e_range);</div><div class='add'>+	ceph_encode_32(&amp;lenp, p - lenp - 4);</div><div class='add'>+	ret = p - buf;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	ret = -ERANGE;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_auth_handle_reply_more(struct ceph_auth_client *ac, void *reply,</div><div class='add'>+				int reply_len, void *buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ac-&gt;mutex);</div><div class='add'>+	ret = ac-&gt;ops-&gt;handle_reply(ac, 0, reply, reply + reply_len,</div><div class='add'>+				    NULL, NULL, NULL, NULL);</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		ret = build_request(ac, false, buf, buf_len);</div><div class='add'>+	else</div><div class='add'>+		WARN_ON(ret &gt;= 0);</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_auth_handle_reply_done(struct ceph_auth_client *ac,</div><div class='add'>+				u64 global_id, void *reply, int reply_len,</div><div class='add'>+				u8 *session_key, int *session_key_len,</div><div class='add'>+				u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ac-&gt;mutex);</div><div class='add'>+	ret = ac-&gt;ops-&gt;handle_reply(ac, global_id, reply, reply + reply_len,</div><div class='add'>+				    session_key, session_key_len,</div><div class='add'>+				    con_secret, con_secret_len);</div><div class='add'>+	WARN_ON(ret == -EAGAIN || ret &gt; 0);</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ceph_auth_handle_bad_method(struct ceph_auth_client *ac,</div><div class='add'>+				 int used_proto, int result,</div><div class='add'>+				 const int *allowed_protos, int proto_cnt,</div><div class='add'>+				 const int *allowed_modes, int mode_cnt)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ac-&gt;mutex);</div><div class='add'>+	WARN_ON(used_proto != ac-&gt;protocol);</div><div class='add'>+</div><div class='add'>+	if (result == -EOPNOTSUPP) {</div><div class='add'>+		if (!contains(allowed_protos, proto_cnt, ac-&gt;protocol)) {</div><div class='add'>+			pr_err("auth protocol '%s' not allowed\n",</div><div class='add'>+			       ceph_auth_proto_name(ac-&gt;protocol));</div><div class='add'>+			goto not_allowed;</div><div class='add'>+		}</div><div class='add'>+		if (!contains(allowed_modes, mode_cnt, ac-&gt;preferred_mode) &amp;&amp;</div><div class='add'>+		    (ac-&gt;fallback_mode == CEPH_CON_MODE_UNKNOWN ||</div><div class='add'>+		     !contains(allowed_modes, mode_cnt, ac-&gt;fallback_mode))) {</div><div class='add'>+			pr_err("preferred mode '%s' not allowed\n",</div><div class='add'>+			       ceph_con_mode_name(ac-&gt;preferred_mode));</div><div class='add'>+			if (ac-&gt;fallback_mode == CEPH_CON_MODE_UNKNOWN)</div><div class='add'>+				pr_err("no fallback mode\n");</div><div class='add'>+			else</div><div class='add'>+				pr_err("fallback mode '%s' not allowed\n",</div><div class='add'>+				       ceph_con_mode_name(ac-&gt;fallback_mode));</div><div class='add'>+			goto not_allowed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(result == -EOPNOTSUPP || result &gt;= 0);</div><div class='add'>+	pr_err("auth protocol '%s' msgr authentication failed: %d\n",</div><div class='add'>+	       ceph_auth_proto_name(ac-&gt;protocol), result);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+not_allowed:</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_auth_get_authorizer(struct ceph_auth_client *ac,</div><div class='add'>+			     struct ceph_auth_handshake *auth,</div><div class='add'>+			     int peer_type, void *buf, int *buf_len)</div><div class='add'>+{</div><div class='add'>+	void *end = buf + *buf_len;</div><div class='add'>+	int pref_mode, fallb_mode;</div><div class='add'>+	int proto;</div><div class='add'>+	void *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __ceph_auth_get_authorizer(ac, auth, peer_type, true, &amp;proto,</div><div class='add'>+					 &amp;pref_mode, &amp;fallb_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	p = buf;</div><div class='add'>+	ceph_encode_32_safe(&amp;p, end, proto, e_range);</div><div class='add'>+	ret = encode_con_modes(&amp;p, end, pref_mode, fallb_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ceph_encode_32_safe(&amp;p, end, auth-&gt;authorizer_buf_len, e_range);</div><div class='add'>+	*buf_len = p - buf;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_auth_get_authorizer);</div><div class='add'>+</div><div class='add'>+int ceph_auth_handle_svc_reply_more(struct ceph_auth_client *ac,</div><div class='add'>+				    struct ceph_auth_handshake *auth,</div><div class='add'>+				    void *reply, int reply_len,</div><div class='add'>+				    void *buf, int *buf_len)</div><div class='add'>+{</div><div class='add'>+	void *end = buf + *buf_len;</div><div class='add'>+	void *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ceph_auth_add_authorizer_challenge(ac, auth-&gt;authorizer,</div><div class='add'>+						 reply, reply_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	p = buf;</div><div class='add'>+	ceph_encode_32_safe(&amp;p, end, auth-&gt;authorizer_buf_len, e_range);</div><div class='add'>+	*buf_len = p - buf;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_auth_handle_svc_reply_more);</div><div class='add'>+</div><div class='add'>+int ceph_auth_handle_svc_reply_done(struct ceph_auth_client *ac,</div><div class='add'>+				    struct ceph_auth_handshake *auth,</div><div class='add'>+				    void *reply, int reply_len,</div><div class='add'>+				    u8 *session_key, int *session_key_len,</div><div class='add'>+				    u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	return ceph_auth_verify_authorizer_reply(ac, auth-&gt;authorizer,</div><div class='add'>+		reply, reply_len, session_key, session_key_len,</div><div class='add'>+		con_secret, con_secret_len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_auth_handle_svc_reply_done);</div><div class='add'>+</div><div class='add'>+bool ceph_auth_handle_bad_authorizer(struct ceph_auth_client *ac,</div><div class='add'>+				     int peer_type, int used_proto, int result,</div><div class='add'>+				     const int *allowed_protos, int proto_cnt,</div><div class='add'>+				     const int *allowed_modes, int mode_cnt)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ac-&gt;mutex);</div><div class='add'>+	WARN_ON(used_proto != ac-&gt;protocol);</div><div class='add'>+</div><div class='add'>+	if (result == -EOPNOTSUPP) {</div><div class='add'>+		if (!contains(allowed_protos, proto_cnt, ac-&gt;protocol)) {</div><div class='add'>+			pr_err("auth protocol '%s' not allowed by %s\n",</div><div class='add'>+			       ceph_auth_proto_name(ac-&gt;protocol),</div><div class='add'>+			       ceph_entity_type_name(peer_type));</div><div class='add'>+			goto not_allowed;</div><div class='add'>+		}</div><div class='add'>+		if (!contains(allowed_modes, mode_cnt, ac-&gt;preferred_mode) &amp;&amp;</div><div class='add'>+		    (ac-&gt;fallback_mode == CEPH_CON_MODE_UNKNOWN ||</div><div class='add'>+		     !contains(allowed_modes, mode_cnt, ac-&gt;fallback_mode))) {</div><div class='add'>+			pr_err("preferred mode '%s' not allowed by %s\n",</div><div class='add'>+			       ceph_con_mode_name(ac-&gt;preferred_mode),</div><div class='add'>+			       ceph_entity_type_name(peer_type));</div><div class='add'>+			if (ac-&gt;fallback_mode == CEPH_CON_MODE_UNKNOWN)</div><div class='add'>+				pr_err("no fallback mode\n");</div><div class='add'>+			else</div><div class='add'>+				pr_err("fallback mode '%s' not allowed by %s\n",</div><div class='add'>+				       ceph_con_mode_name(ac-&gt;fallback_mode),</div><div class='add'>+				       ceph_entity_type_name(peer_type));</div><div class='add'>+			goto not_allowed;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(result == -EOPNOTSUPP || result &gt;= 0);</div><div class='add'>+	pr_err("auth protocol '%s' authorization to %s failed: %d\n",</div><div class='add'>+	       ceph_auth_proto_name(ac-&gt;protocol),</div><div class='add'>+	       ceph_entity_type_name(peer_type), result);</div><div class='add'>+</div><div class='add'>+	if (ac-&gt;ops-&gt;invalidate_authorizer)</div><div class='add'>+		ac-&gt;ops-&gt;invalidate_authorizer(ac, peer_type);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+not_allowed:</div><div class='add'>+	mutex_unlock(&amp;ac-&gt;mutex);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_auth_handle_bad_authorizer);</div><div class='head'>diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c<br/>index edb7042479ed..77b5519bc45f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_none.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_none.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_none.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/auth_none.c</a></div><div class='hunk'>@@ -69,13 +69,16 @@ static int build_request(struct ceph_auth_client *ac, void *buf, void *end)</div><div class='ctx'>  * the generic auth code decode the global_id, and we carry no actual</div><div class='ctx'>  * authenticate state, so nothing happens here.</div><div class='ctx'>  */</div><div class='del'>-static int handle_reply(struct ceph_auth_client *ac, int result,</div><div class='del'>-			void *buf, void *end)</div><div class='add'>+static int handle_reply(struct ceph_auth_client *ac, u64 global_id,</div><div class='add'>+			void *buf, void *end, u8 *session_key,</div><div class='add'>+			int *session_key_len, u8 *con_secret,</div><div class='add'>+			int *con_secret_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_auth_none_info *xi = ac-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	xi-&gt;starting = false;</div><div class='del'>-	return result;</div><div class='add'>+	ceph_auth_set_global_id(ac, global_id);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_auth_none_destroy_authorizer(struct ceph_authorizer *a)</div><div class='hunk'>@@ -109,14 +112,13 @@ static int ceph_auth_none_create_authorizer(</div><div class='ctx'> 	auth-&gt;authorizer = (struct ceph_authorizer *) au;</div><div class='ctx'> 	auth-&gt;authorizer_buf = au-&gt;buf;</div><div class='ctx'> 	auth-&gt;authorizer_buf_len = au-&gt;buf_len;</div><div class='del'>-	auth-&gt;authorizer_reply_buf = au-&gt;reply_buf;</div><div class='del'>-	auth-&gt;authorizer_reply_buf_len = sizeof (au-&gt;reply_buf);</div><div class='add'>+	auth-&gt;authorizer_reply_buf = NULL;</div><div class='add'>+	auth-&gt;authorizer_reply_buf_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ceph_auth_client_ops ceph_auth_none_ops = {</div><div class='del'>-	.name = "none",</div><div class='ctx'> 	.reset = reset,</div><div class='ctx'> 	.destroy = destroy,</div><div class='ctx'> 	.is_authenticated = is_authenticated,</div><div class='head'>diff --git a/net/ceph/auth_none.h b/net/ceph/auth_none.h<br/>index 4158f064302e..bb121539e796 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_none.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_none.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_none.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/auth_none.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@ struct ceph_none_authorizer {</div><div class='ctx'> 	struct ceph_authorizer base;</div><div class='ctx'> 	char buf[128];</div><div class='ctx'> 	int buf_len;</div><div class='del'>-	char reply_buf[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ceph_auth_none_info {</div><div class='head'>diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c<br/>index b52732337ca6..a21c157daf7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_x.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/auth_x.c</a></div><div class='hunk'>@@ -22,12 +22,15 @@ static void ceph_x_validate_tickets(struct ceph_auth_client *ac, int *pneed);</div><div class='ctx'> static int ceph_x_is_authenticated(struct ceph_auth_client *ac)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_x_info *xi = ac-&gt;private;</div><div class='del'>-	int need;</div><div class='add'>+	int missing;</div><div class='add'>+	int need;  /* missing + need renewal */</div><div class='ctx'> </div><div class='ctx'> 	ceph_x_validate_tickets(ac, &amp;need);</div><div class='del'>-	dout("ceph_x_is_authenticated want=%d need=%d have=%d\n",</div><div class='del'>-	     ac-&gt;want_keys, need, xi-&gt;have_keys);</div><div class='del'>-	return (ac-&gt;want_keys &amp; xi-&gt;have_keys) == ac-&gt;want_keys;</div><div class='add'>+	missing = ac-&gt;want_keys &amp; ~xi-&gt;have_keys;</div><div class='add'>+	WARN_ON((need &amp; missing) != missing);</div><div class='add'>+	dout("%s want 0x%x have 0x%x missing 0x%x -&gt; %d\n", __func__,</div><div class='add'>+	     ac-&gt;want_keys, xi-&gt;have_keys, missing, !missing);</div><div class='add'>+	return !missing;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ceph_x_should_authenticate(struct ceph_auth_client *ac)</div><div class='hunk'>@@ -36,9 +39,9 @@ static int ceph_x_should_authenticate(struct ceph_auth_client *ac)</div><div class='ctx'> 	int need;</div><div class='ctx'> </div><div class='ctx'> 	ceph_x_validate_tickets(ac, &amp;need);</div><div class='del'>-	dout("ceph_x_should_authenticate want=%d need=%d have=%d\n",</div><div class='del'>-	     ac-&gt;want_keys, need, xi-&gt;have_keys);</div><div class='del'>-	return need != 0;</div><div class='add'>+	dout("%s want 0x%x have 0x%x need 0x%x -&gt; %d\n", __func__,</div><div class='add'>+	     ac-&gt;want_keys, xi-&gt;have_keys, need, !!need);</div><div class='add'>+	return !!need;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ceph_x_encrypt_offset(void)</div><div class='hunk'>@@ -197,7 +200,7 @@ static int process_one_ticket(struct ceph_auth_client *ac,</div><div class='ctx'> 	dout(" decrypted %d bytes\n", ret);</div><div class='ctx'> 	dend = dp + ret;</div><div class='ctx'> </div><div class='del'>-	tkt_struct_v = ceph_decode_8(&amp;dp);</div><div class='add'>+	ceph_decode_8_safe(&amp;dp, dend, tkt_struct_v, bad);</div><div class='ctx'> 	if (tkt_struct_v != 1)</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='hunk'>@@ -205,6 +208,7 @@ static int process_one_ticket(struct ceph_auth_client *ac,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	ceph_decode_need(&amp;dp, dend, sizeof(struct ceph_timespec), bad);</div><div class='ctx'> 	ceph_decode_timespec64(&amp;validity, dp);</div><div class='ctx'> 	dp += sizeof(struct ceph_timespec);</div><div class='ctx'> 	new_expires = ktime_get_real_seconds() + validity.tv_sec;</div><div class='hunk'>@@ -265,22 +269,21 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,</div><div class='ctx'> 				    struct ceph_crypto_key *secret,</div><div class='del'>-				    void *buf, void *end)</div><div class='add'>+				    void **p, void *end)</div><div class='ctx'> {</div><div class='del'>-	void *p = buf;</div><div class='ctx'> 	u8 reply_struct_v;</div><div class='ctx'> 	u32 num;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ceph_decode_8_safe(&amp;p, end, reply_struct_v, bad);</div><div class='add'>+	ceph_decode_8_safe(p, end, reply_struct_v, bad);</div><div class='ctx'> 	if (reply_struct_v != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ceph_decode_32_safe(&amp;p, end, num, bad);</div><div class='add'>+	ceph_decode_32_safe(p, end, num, bad);</div><div class='ctx'> 	dout("%d tickets\n", num);</div><div class='ctx'> </div><div class='ctx'> 	while (num--) {</div><div class='del'>-		ret = process_one_ticket(ac, secret, &amp;p, end);</div><div class='add'>+		ret = process_one_ticket(ac, secret, p, end);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -379,6 +382,7 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	au-&gt;service = th-&gt;service;</div><div class='add'>+	WARN_ON(!th-&gt;secret_id);</div><div class='ctx'> 	au-&gt;secret_id = th-&gt;secret_id;</div><div class='ctx'> </div><div class='ctx'> 	msg_a = au-&gt;buf-&gt;vec.iov_base;</div><div class='hunk'>@@ -442,9 +446,10 @@ static bool need_key(struct ceph_x_ticket_handler *th)</div><div class='ctx'> </div><div class='ctx'> static bool have_key(struct ceph_x_ticket_handler *th)</div><div class='ctx'> {</div><div class='del'>-	if (th-&gt;have_key) {</div><div class='del'>-		if (ktime_get_real_seconds() &gt;= th-&gt;expires)</div><div class='del'>-			th-&gt;have_key = false;</div><div class='add'>+	if (th-&gt;have_key &amp;&amp; ktime_get_real_seconds() &gt;= th-&gt;expires) {</div><div class='add'>+		dout("ticket %d (%s) secret_id %llu expired\n", th-&gt;service,</div><div class='add'>+		     ceph_entity_type_name(th-&gt;service), th-&gt;secret_id);</div><div class='add'>+		th-&gt;have_key = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return th-&gt;have_key;</div><div class='hunk'>@@ -486,6 +491,7 @@ static int ceph_x_build_request(struct ceph_auth_client *ac,</div><div class='ctx'> 	struct ceph_x_info *xi = ac-&gt;private;</div><div class='ctx'> 	int need;</div><div class='ctx'> 	struct ceph_x_request_header *head = buf;</div><div class='add'>+	void *p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ceph_x_ticket_handler *th =</div><div class='ctx'> 		get_ticket_handler(ac, CEPH_ENTITY_TYPE_AUTH);</div><div class='hunk'>@@ -494,18 +500,17 @@ static int ceph_x_build_request(struct ceph_auth_client *ac,</div><div class='ctx'> 		return PTR_ERR(th);</div><div class='ctx'> </div><div class='ctx'> 	ceph_x_validate_tickets(ac, &amp;need);</div><div class='del'>-</div><div class='del'>-	dout("build_request want %x have %x need %x\n",</div><div class='del'>-	     ac-&gt;want_keys, xi-&gt;have_keys, need);</div><div class='add'>+	dout("%s want 0x%x have 0x%x need 0x%x\n", __func__, ac-&gt;want_keys,</div><div class='add'>+	     xi-&gt;have_keys, need);</div><div class='ctx'> </div><div class='ctx'> 	if (need &amp; CEPH_ENTITY_TYPE_AUTH) {</div><div class='ctx'> 		struct ceph_x_authenticate *auth = (void *)(head + 1);</div><div class='del'>-		void *p = auth + 1;</div><div class='ctx'> 		void *enc_buf = xi-&gt;auth_authorizer.enc_buf;</div><div class='ctx'> 		struct ceph_x_challenge_blob *blob = enc_buf +</div><div class='ctx'> 							ceph_x_encrypt_offset();</div><div class='ctx'> 		u64 *u;</div><div class='ctx'> </div><div class='add'>+		p = auth + 1;</div><div class='ctx'> 		if (p &gt; end)</div><div class='ctx'> 			return -ERANGE;</div><div class='ctx'> </div><div class='hunk'>@@ -521,7 +526,7 @@ static int ceph_x_build_request(struct ceph_auth_client *ac,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		auth-&gt;struct_v = 1;</div><div class='add'>+		auth-&gt;struct_v = 3;  /* nautilus+ */</div><div class='ctx'> 		auth-&gt;key = 0;</div><div class='ctx'> 		for (u = (u64 *)enc_buf; u + 1 &lt;= (u64 *)(enc_buf + ret); u++)</div><div class='ctx'> 			auth-&gt;key ^= *(__le64 *)u;</div><div class='hunk'>@@ -534,45 +539,144 @@ static int ceph_x_build_request(struct ceph_auth_client *ac,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='add'>+		/* nautilus+: request service tickets at the same time */</div><div class='add'>+		need = ac-&gt;want_keys &amp; ~CEPH_ENTITY_TYPE_AUTH;</div><div class='add'>+		WARN_ON(!need);</div><div class='add'>+		ceph_encode_32_safe(&amp;p, end, need, e_range);</div><div class='ctx'> 		return p - buf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (need) {</div><div class='del'>-		void *p = head + 1;</div><div class='del'>-		struct ceph_x_service_ticket_request *req;</div><div class='del'>-</div><div class='del'>-		if (p &gt; end)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		head-&gt;op = cpu_to_le16(CEPHX_GET_PRINCIPAL_SESSION_KEY);</div><div class='del'>-</div><div class='add'>+		dout(" get_principal_session_key\n");</div><div class='ctx'> 		ret = ceph_x_build_authorizer(ac, th, &amp;xi-&gt;auth_authorizer);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		ceph_encode_copy(&amp;p, xi-&gt;auth_authorizer.buf-&gt;vec.iov_base,</div><div class='del'>-				 xi-&gt;auth_authorizer.buf-&gt;vec.iov_len);</div><div class='ctx'> </div><div class='del'>-		req = p;</div><div class='del'>-		req-&gt;keys = cpu_to_le32(need);</div><div class='del'>-		p += sizeof(*req);</div><div class='add'>+		p = buf;</div><div class='add'>+		ceph_encode_16_safe(&amp;p, end, CEPHX_GET_PRINCIPAL_SESSION_KEY,</div><div class='add'>+				    e_range);</div><div class='add'>+		ceph_encode_copy_safe(&amp;p, end,</div><div class='add'>+			xi-&gt;auth_authorizer.buf-&gt;vec.iov_base,</div><div class='add'>+			xi-&gt;auth_authorizer.buf-&gt;vec.iov_len, e_range);</div><div class='add'>+		ceph_encode_8_safe(&amp;p, end, 1, e_range);</div><div class='add'>+		ceph_encode_32_safe(&amp;p, end, need, e_range);</div><div class='ctx'> 		return p - buf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+e_range:</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_con_secret(void **p, void *end, u8 *con_secret,</div><div class='add'>+			     int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(p, end, len, bad);</div><div class='add'>+	ceph_decode_need(p, end, len, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s len %d\n", __func__, len);</div><div class='add'>+	if (con_secret) {</div><div class='add'>+		if (len &gt; CEPH_MAX_CON_SECRET_LEN) {</div><div class='add'>+			pr_err("connection secret too big %d\n", len);</div><div class='add'>+			goto bad_memzero;</div><div class='add'>+		}</div><div class='add'>+		memcpy(con_secret, *p, len);</div><div class='add'>+		*con_secret_len = len;</div><div class='add'>+	}</div><div class='add'>+	memzero_explicit(*p, len);</div><div class='add'>+	*p += len;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad_memzero:</div><div class='add'>+	memzero_explicit(*p, len);</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode connection secret\n");</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result,</div><div class='del'>-			       void *buf, void *end)</div><div class='add'>+static int handle_auth_session_key(struct ceph_auth_client *ac, u64 global_id,</div><div class='add'>+				   void **p, void *end,</div><div class='add'>+				   u8 *session_key, int *session_key_len,</div><div class='add'>+				   u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_x_info *xi = ac-&gt;private;</div><div class='add'>+	struct ceph_x_ticket_handler *th;</div><div class='add'>+	void *dp, *dend;</div><div class='add'>+	int len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* AUTH ticket */</div><div class='add'>+	ret = ceph_x_proc_ticket_reply(ac, &amp;xi-&gt;secret, p, end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ceph_auth_set_global_id(ac, global_id);</div><div class='add'>+	if (*p == end) {</div><div class='add'>+		/* pre-nautilus (or didn't request service tickets!) */</div><div class='add'>+		WARN_ON(session_key || con_secret);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	th = get_ticket_handler(ac, CEPH_ENTITY_TYPE_AUTH);</div><div class='add'>+	if (IS_ERR(th))</div><div class='add'>+		return PTR_ERR(th);</div><div class='add'>+</div><div class='add'>+	if (session_key) {</div><div class='add'>+		memcpy(session_key, th-&gt;session_key.key, th-&gt;session_key.len);</div><div class='add'>+		*session_key_len = th-&gt;session_key.len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* connection secret */</div><div class='add'>+	ceph_decode_32_safe(p, end, len, e_inval);</div><div class='add'>+	ceph_decode_need(p, end, len, e_inval);</div><div class='add'>+	dout("%s connection secret blob len %d\n", __func__, len);</div><div class='add'>+	if (len &gt; 0) {</div><div class='add'>+		dp = *p + ceph_x_encrypt_offset();</div><div class='add'>+		ret = ceph_x_decrypt(&amp;th-&gt;session_key, p, *p + len);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dout("%s decrypted %d bytes\n", __func__, ret);</div><div class='add'>+		dend = dp + ret;</div><div class='add'>+</div><div class='add'>+		ret = decode_con_secret(&amp;dp, dend, con_secret, con_secret_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* service tickets */</div><div class='add'>+	ceph_decode_32_safe(p, end, len, e_inval);</div><div class='add'>+	ceph_decode_need(p, end, len, e_inval);</div><div class='add'>+	dout("%s service tickets blob len %d\n", __func__, len);</div><div class='add'>+	if (len &gt; 0) {</div><div class='add'>+		ret = ceph_x_proc_ticket_reply(ac, &amp;th-&gt;session_key,</div><div class='add'>+					       p, *p + len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ceph_x_handle_reply(struct ceph_auth_client *ac, u64 global_id,</div><div class='add'>+			       void *buf, void *end,</div><div class='add'>+			       u8 *session_key, int *session_key_len,</div><div class='add'>+			       u8 *con_secret, int *con_secret_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_x_info *xi = ac-&gt;private;</div><div class='del'>-	struct ceph_x_reply_header *head = buf;</div><div class='ctx'> 	struct ceph_x_ticket_handler *th;</div><div class='ctx'> 	int len = end - buf;</div><div class='add'>+	int result;</div><div class='add'>+	void *p;</div><div class='ctx'> 	int op;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (result)</div><div class='del'>-		return result;  /* XXX hmm? */</div><div class='del'>-</div><div class='ctx'> 	if (xi-&gt;starting) {</div><div class='ctx'> 		/* it's a hello */</div><div class='ctx'> 		struct ceph_x_server_challenge *sc = buf;</div><div class='hunk'>@@ -587,22 +691,25 @@ static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result,</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	op = le16_to_cpu(head-&gt;op);</div><div class='del'>-	result = le32_to_cpu(head-&gt;result);</div><div class='add'>+	p = buf;</div><div class='add'>+	ceph_decode_16_safe(&amp;p, end, op, e_inval);</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, result, e_inval);</div><div class='ctx'> 	dout("handle_reply op %d result %d\n", op, result);</div><div class='ctx'> 	switch (op) {</div><div class='ctx'> 	case CEPHX_GET_AUTH_SESSION_KEY:</div><div class='del'>-		/* verify auth key */</div><div class='del'>-		ret = ceph_x_proc_ticket_reply(ac, &amp;xi-&gt;secret,</div><div class='del'>-					       buf + sizeof(*head), end);</div><div class='add'>+		/* AUTH ticket + [connection secret] + service tickets */</div><div class='add'>+		ret = handle_auth_session_key(ac, global_id, &amp;p, end,</div><div class='add'>+					      session_key, session_key_len,</div><div class='add'>+					      con_secret, con_secret_len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CEPHX_GET_PRINCIPAL_SESSION_KEY:</div><div class='ctx'> 		th = get_ticket_handler(ac, CEPH_ENTITY_TYPE_AUTH);</div><div class='ctx'> 		if (IS_ERR(th))</div><div class='ctx'> 			return PTR_ERR(th);</div><div class='del'>-		ret = ceph_x_proc_ticket_reply(ac, &amp;th-&gt;session_key,</div><div class='del'>-					       buf + sizeof(*head), end);</div><div class='add'>+</div><div class='add'>+		/* service tickets */</div><div class='add'>+		ret = ceph_x_proc_ticket_reply(ac, &amp;th-&gt;session_key, &amp;p, end);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -613,6 +720,9 @@ static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result,</div><div class='ctx'> 	if (ac-&gt;want_keys == xi-&gt;have_keys)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -EAGAIN;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_x_destroy_authorizer(struct ceph_authorizer *a)</div><div class='hunk'>@@ -678,40 +788,44 @@ static int ceph_x_update_authorizer(</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decrypt_authorize_challenge(struct ceph_x_authorizer *au,</div><div class='del'>-				       void *challenge_buf,</div><div class='del'>-				       int challenge_buf_len,</div><div class='del'>-				       u64 *server_challenge)</div><div class='add'>+/*</div><div class='add'>+ * CephXAuthorizeChallenge</div><div class='add'>+ */</div><div class='add'>+static int decrypt_authorizer_challenge(struct ceph_crypto_key *secret,</div><div class='add'>+					void *challenge, int challenge_len,</div><div class='add'>+					u64 *server_challenge)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_x_authorize_challenge *ch =</div><div class='del'>-	    challenge_buf + sizeof(struct ceph_x_encrypt_header);</div><div class='add'>+	void *dp, *dend;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* no leading len */</div><div class='del'>-	ret = __ceph_x_decrypt(&amp;au-&gt;session_key, challenge_buf,</div><div class='del'>-			       challenge_buf_len);</div><div class='add'>+	ret = __ceph_x_decrypt(secret, challenge, challenge_len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (ret &lt; sizeof(*ch)) {</div><div class='del'>-		pr_err("bad size %d for ceph_x_authorize_challenge\n", ret);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	*server_challenge = le64_to_cpu(ch-&gt;server_challenge);</div><div class='add'>+	dout("%s decrypted %d bytes\n", __func__, ret);</div><div class='add'>+	dp = challenge + sizeof(struct ceph_x_encrypt_header);</div><div class='add'>+	dend = dp + ret;</div><div class='add'>+</div><div class='add'>+	ceph_decode_skip_8(&amp;dp, dend, e_inval);  /* struct_v */</div><div class='add'>+	ceph_decode_64_safe(&amp;dp, dend, *server_challenge, e_inval);</div><div class='add'>+	dout("%s server_challenge %llu\n", __func__, *server_challenge);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ceph_x_add_authorizer_challenge(struct ceph_auth_client *ac,</div><div class='ctx'> 					   struct ceph_authorizer *a,</div><div class='del'>-					   void *challenge_buf,</div><div class='del'>-					   int challenge_buf_len)</div><div class='add'>+					   void *challenge, int challenge_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_x_authorizer *au = (void *)a;</div><div class='ctx'> 	u64 server_challenge;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = decrypt_authorize_challenge(au, challenge_buf, challenge_buf_len,</div><div class='del'>-					  &amp;server_challenge);</div><div class='add'>+	ret = decrypt_authorizer_challenge(&amp;au-&gt;session_key, challenge,</div><div class='add'>+					   challenge_len, &amp;server_challenge);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("failed to decrypt authorize challenge: %d", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -726,29 +840,67 @@ static int ceph_x_add_authorizer_challenge(struct ceph_auth_client *ac,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * CephXAuthorizeReply</div><div class='add'>+ */</div><div class='add'>+static int decrypt_authorizer_reply(struct ceph_crypto_key *secret,</div><div class='add'>+				    void **p, void *end, u64 *nonce_plus_one,</div><div class='add'>+				    u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	void *dp, *dend;</div><div class='add'>+	u8 struct_v;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dp = *p + ceph_x_encrypt_offset();</div><div class='add'>+	ret = ceph_x_decrypt(secret, p, end);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dout("%s decrypted %d bytes\n", __func__, ret);</div><div class='add'>+	dend = dp + ret;</div><div class='add'>+</div><div class='add'>+	ceph_decode_8_safe(&amp;dp, dend, struct_v, e_inval);</div><div class='add'>+	ceph_decode_64_safe(&amp;dp, dend, *nonce_plus_one, e_inval);</div><div class='add'>+	dout("%s nonce_plus_one %llu\n", __func__, *nonce_plus_one);</div><div class='add'>+	if (struct_v &gt;= 2) {</div><div class='add'>+		ret = decode_con_secret(&amp;dp, dend, con_secret, con_secret_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ceph_x_verify_authorizer_reply(struct ceph_auth_client *ac,</div><div class='del'>-					  struct ceph_authorizer *a)</div><div class='add'>+					  struct ceph_authorizer *a,</div><div class='add'>+					  void *reply, int reply_len,</div><div class='add'>+					  u8 *session_key, int *session_key_len,</div><div class='add'>+					  u8 *con_secret, int *con_secret_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_x_authorizer *au = (void *)a;</div><div class='del'>-	void *p = au-&gt;enc_buf;</div><div class='del'>-	struct ceph_x_authorize_reply *reply = p + ceph_x_encrypt_offset();</div><div class='add'>+	u64 nonce_plus_one;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_x_decrypt(&amp;au-&gt;session_key, &amp;p, p + CEPHX_AU_ENC_BUF_LEN);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (session_key) {</div><div class='add'>+		memcpy(session_key, au-&gt;session_key.key, au-&gt;session_key.len);</div><div class='add'>+		*session_key_len = au-&gt;session_key.len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = decrypt_authorizer_reply(&amp;au-&gt;session_key, &amp;reply,</div><div class='add'>+				       reply + reply_len, &amp;nonce_plus_one,</div><div class='add'>+				       con_secret, con_secret_len);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (ret &lt; sizeof(*reply)) {</div><div class='del'>-		pr_err("bad size %d for ceph_x_authorize_reply\n", ret);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nonce_plus_one != au-&gt;nonce + 1) {</div><div class='add'>+		pr_err("failed to authenticate server\n");</div><div class='add'>+		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (au-&gt;nonce + 1 != le64_to_cpu(reply-&gt;nonce_plus_one))</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-	dout("verify_authorizer_reply nonce %llx got %llx ret %d\n",</div><div class='del'>-	     au-&gt;nonce, le64_to_cpu(reply-&gt;nonce_plus_one), ret);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_x_reset(struct ceph_auth_client *ac)</div><div class='hunk'>@@ -785,8 +937,15 @@ static void invalidate_ticket(struct ceph_auth_client *ac, int peer_type)</div><div class='ctx'> 	struct ceph_x_ticket_handler *th;</div><div class='ctx'> </div><div class='ctx'> 	th = get_ticket_handler(ac, peer_type);</div><div class='del'>-	if (!IS_ERR(th))</div><div class='add'>+	if (IS_ERR(th))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (th-&gt;have_key) {</div><div class='add'>+		dout("ticket %d (%s) secret_id %llu invalidated\n",</div><div class='add'>+		     th-&gt;service, ceph_entity_type_name(th-&gt;service),</div><div class='add'>+		     th-&gt;secret_id);</div><div class='ctx'> 		th-&gt;have_key = false;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_x_invalidate_authorizer(struct ceph_auth_client *ac,</div><div class='hunk'>@@ -911,7 +1070,6 @@ static int ceph_x_check_message_signature(struct ceph_auth_handshake *auth,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ceph_auth_client_ops ceph_x_ops = {</div><div class='del'>-	.name = "x",</div><div class='ctx'> 	.is_authenticated = ceph_x_is_authenticated,</div><div class='ctx'> 	.should_authenticate = ceph_x_should_authenticate,</div><div class='ctx'> 	.build_request = ceph_x_build_request,</div><div class='head'>diff --git a/net/ceph/auth_x_protocol.h b/net/ceph/auth_x_protocol.h<br/>index 24b0b74564d0..9c60feeb1bcb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_x_protocol.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/auth_x_protocol.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/auth_x_protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/auth_x_protocol.h</a></div><div class='hunk'>@@ -38,7 +38,8 @@ struct ceph_x_authenticate {</div><div class='ctx'> 	__u8 struct_v;</div><div class='ctx'> 	__le64 client_challenge;</div><div class='ctx'> 	__le64 key;</div><div class='del'>-	/* ticket blob */</div><div class='add'>+	/* old_ticket blob */</div><div class='add'>+	/* nautilus+: other_keys */</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct ceph_x_service_ticket_request {</div><div class='hunk'>@@ -86,7 +87,7 @@ struct ceph_x_authorize_reply {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * encyption bundle</div><div class='add'>+ * encryption bundle</div><div class='ctx'>  */</div><div class='ctx'> #define CEPHX_ENC_MAGIC 0xff009cad8826aa55ull</div><div class='ctx'> </div><div class='head'>diff --git a/net/ceph/buffer.c b/net/ceph/buffer.c<br/>index 5622763ad402..7e51f128045d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/buffer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/buffer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/buffer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/buffer.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/decode.h&gt;</div><div class='del'>-#include &lt;linux/ceph/libceph.h&gt; /* for ceph_kvmalloc */</div><div class='add'>+#include &lt;linux/ceph/libceph.h&gt; /* for kvmalloc */</div><div class='ctx'> </div><div class='ctx'> struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp)</div><div class='ctx'> {</div><div class='hunk'>@@ -17,7 +17,7 @@ struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp)</div><div class='ctx'> 	if (!b)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	b-&gt;vec.iov_base = ceph_kvmalloc(len, gfp);</div><div class='add'>+	b-&gt;vec.iov_base = kvmalloc(len, gfp);</div><div class='ctx'> 	if (!b-&gt;vec.iov_base) {</div><div class='ctx'> 		kfree(b);</div><div class='ctx'> 		return NULL;</div><div class='head'>diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c<br/>index 87afb9ec4c68..e734e57be083 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_common.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/ceph_common.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='hunk'>@@ -10,8 +11,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='hunk'>@@ -174,6 +176,10 @@ int ceph_compare_options(struct ceph_options *new_opt,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ceph_compare_crush_locs(&amp;opt1-&gt;crush_locs, &amp;opt2-&gt;crush_locs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* any matching mon ip implies a match */</div><div class='ctx'> 	for (i = 0; i &lt; opt1-&gt;num_mon; i++) {</div><div class='ctx'> 		if (ceph_monmap_contains(client-&gt;monc.monmap,</div><div class='hunk'>@@ -184,26 +190,14 @@ int ceph_compare_options(struct ceph_options *new_opt,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_compare_options);</div><div class='ctx'> </div><div class='del'>-void *ceph_kvmalloc(size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	if (size &lt;= (PAGE_SIZE &lt;&lt; PAGE_ALLOC_COSTLY_ORDER)) {</div><div class='del'>-		void *ptr = kmalloc(size, flags | __GFP_NOWARN);</div><div class='del'>-		if (ptr)</div><div class='del'>-			return ptr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __vmalloc(size, flags, PAGE_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int parse_fsid(const char *str, struct ceph_fsid *fsid)</div><div class='add'>+int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	char tmp[3];</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	int d;</div><div class='ctx'> </div><div class='del'>-	dout("parse_fsid '%s'\n", str);</div><div class='add'>+	dout("%s '%s'\n", __func__, str);</div><div class='ctx'> 	tmp[2] = 0;</div><div class='ctx'> 	while (*str &amp;&amp; i &lt; 16) {</div><div class='ctx'> 		if (ispunct(*str)) {</div><div class='hunk'>@@ -223,69 +217,129 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid)</div><div class='ctx'> </div><div class='ctx'> 	if (i == 16)</div><div class='ctx'> 		err = 0;</div><div class='del'>-	dout("parse_fsid ret %d got fsid %pU\n", err, fsid);</div><div class='add'>+	dout("%s ret %d got fsid %pU\n", __func__, err, fsid);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ceph_parse_fsid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ceph options</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='del'>-	Opt_osdtimeout,</div><div class='ctx'> 	Opt_osdkeepalivetimeout,</div><div class='ctx'> 	Opt_mount_timeout,</div><div class='ctx'> 	Opt_osd_idle_ttl,</div><div class='ctx'> 	Opt_osd_request_timeout,</div><div class='del'>-	Opt_last_int,</div><div class='ctx'> 	/* int args above */</div><div class='ctx'> 	Opt_fsid,</div><div class='ctx'> 	Opt_name,</div><div class='ctx'> 	Opt_secret,</div><div class='ctx'> 	Opt_key,</div><div class='ctx'> 	Opt_ip,</div><div class='del'>-	Opt_last_string,</div><div class='add'>+	Opt_crush_location,</div><div class='add'>+	Opt_read_from_replica,</div><div class='add'>+	Opt_ms_mode,</div><div class='ctx'> 	/* string args above */</div><div class='ctx'> 	Opt_share,</div><div class='del'>-	Opt_noshare,</div><div class='ctx'> 	Opt_crc,</div><div class='del'>-	Opt_nocrc,</div><div class='ctx'> 	Opt_cephx_require_signatures,</div><div class='del'>-	Opt_nocephx_require_signatures,</div><div class='ctx'> 	Opt_cephx_sign_messages,</div><div class='del'>-	Opt_nocephx_sign_messages,</div><div class='ctx'> 	Opt_tcp_nodelay,</div><div class='del'>-	Opt_notcp_nodelay,</div><div class='add'>+	Opt_abort_on_full,</div><div class='add'>+	Opt_rxbounce,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t opt_tokens = {</div><div class='del'>-	{Opt_osdtimeout, "osdtimeout=%d"},</div><div class='del'>-	{Opt_osdkeepalivetimeout, "osdkeepalive=%d"},</div><div class='del'>-	{Opt_mount_timeout, "mount_timeout=%d"},</div><div class='del'>-	{Opt_osd_idle_ttl, "osd_idle_ttl=%d"},</div><div class='del'>-	{Opt_osd_request_timeout, "osd_request_timeout=%d"},</div><div class='del'>-	/* int args above */</div><div class='del'>-	{Opt_fsid, "fsid=%s"},</div><div class='del'>-	{Opt_name, "name=%s"},</div><div class='del'>-	{Opt_secret, "secret=%s"},</div><div class='del'>-	{Opt_key, "key=%s"},</div><div class='del'>-	{Opt_ip, "ip=%s"},</div><div class='del'>-	/* string args above */</div><div class='del'>-	{Opt_share, "share"},</div><div class='del'>-	{Opt_noshare, "noshare"},</div><div class='del'>-	{Opt_crc, "crc"},</div><div class='del'>-	{Opt_nocrc, "nocrc"},</div><div class='del'>-	{Opt_cephx_require_signatures, "cephx_require_signatures"},</div><div class='del'>-	{Opt_nocephx_require_signatures, "nocephx_require_signatures"},</div><div class='del'>-	{Opt_cephx_sign_messages, "cephx_sign_messages"},</div><div class='del'>-	{Opt_nocephx_sign_messages, "nocephx_sign_messages"},</div><div class='del'>-	{Opt_tcp_nodelay, "tcp_nodelay"},</div><div class='del'>-	{Opt_notcp_nodelay, "notcp_nodelay"},</div><div class='del'>-	{-1, NULL}</div><div class='add'>+enum {</div><div class='add'>+	Opt_read_from_replica_no,</div><div class='add'>+	Opt_read_from_replica_balance,</div><div class='add'>+	Opt_read_from_replica_localize,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table ceph_param_read_from_replica[] = {</div><div class='add'>+	{"no",		Opt_read_from_replica_no},</div><div class='add'>+	{"balance",	Opt_read_from_replica_balance},</div><div class='add'>+	{"localize",	Opt_read_from_replica_localize},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ceph_ms_mode {</div><div class='add'>+	Opt_ms_mode_legacy,</div><div class='add'>+	Opt_ms_mode_crc,</div><div class='add'>+	Opt_ms_mode_secure,</div><div class='add'>+	Opt_ms_mode_prefer_crc,</div><div class='add'>+	Opt_ms_mode_prefer_secure</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table ceph_param_ms_mode[] = {</div><div class='add'>+	{"legacy",		Opt_ms_mode_legacy},</div><div class='add'>+	{"crc",			Opt_ms_mode_crc},</div><div class='add'>+	{"secure",		Opt_ms_mode_secure},</div><div class='add'>+	{"prefer-crc",		Opt_ms_mode_prefer_crc},</div><div class='add'>+	{"prefer-secure",	Opt_ms_mode_prefer_secure},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct fs_parameter_spec ceph_parameters[] = {</div><div class='add'>+	fsparam_flag	("abort_on_full",		Opt_abort_on_full),</div><div class='add'>+	__fsparam	(NULL, "cephx_require_signatures", Opt_cephx_require_signatures,</div><div class='add'>+			 fs_param_neg_with_no|fs_param_deprecated, NULL),</div><div class='add'>+	fsparam_flag_no ("cephx_sign_messages",		Opt_cephx_sign_messages),</div><div class='add'>+	fsparam_flag_no ("crc",				Opt_crc),</div><div class='add'>+	fsparam_string	("crush_location",		Opt_crush_location),</div><div class='add'>+	fsparam_string	("fsid",			Opt_fsid),</div><div class='add'>+	fsparam_string	("ip",				Opt_ip),</div><div class='add'>+	fsparam_string	("key",				Opt_key),</div><div class='add'>+	fsparam_u32	("mount_timeout",		Opt_mount_timeout),</div><div class='add'>+	fsparam_string	("name",			Opt_name),</div><div class='add'>+	fsparam_u32	("osd_idle_ttl",		Opt_osd_idle_ttl),</div><div class='add'>+	fsparam_u32	("osd_request_timeout",		Opt_osd_request_timeout),</div><div class='add'>+	fsparam_u32	("osdkeepalive",		Opt_osdkeepalivetimeout),</div><div class='add'>+	fsparam_enum	("read_from_replica",		Opt_read_from_replica,</div><div class='add'>+			 ceph_param_read_from_replica),</div><div class='add'>+	fsparam_flag	("rxbounce",			Opt_rxbounce),</div><div class='add'>+	fsparam_enum	("ms_mode",			Opt_ms_mode,</div><div class='add'>+			 ceph_param_ms_mode),</div><div class='add'>+	fsparam_string	("secret",			Opt_secret),</div><div class='add'>+	fsparam_flag_no ("share",			Opt_share),</div><div class='add'>+	fsparam_flag_no ("tcp_nodelay",			Opt_tcp_nodelay),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ceph_options *ceph_alloc_options(void)</div><div class='add'>+{</div><div class='add'>+	struct ceph_options *opt;</div><div class='add'>+</div><div class='add'>+	opt = kzalloc(sizeof(*opt), GFP_KERNEL);</div><div class='add'>+	if (!opt)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	opt-&gt;crush_locs = RB_ROOT;</div><div class='add'>+	opt-&gt;mon_addr = kcalloc(CEPH_MAX_MON, sizeof(*opt-&gt;mon_addr),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!opt-&gt;mon_addr) {</div><div class='add'>+		kfree(opt);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opt-&gt;flags = CEPH_OPT_DEFAULT;</div><div class='add'>+	opt-&gt;osd_keepalive_timeout = CEPH_OSD_KEEPALIVE_DEFAULT;</div><div class='add'>+	opt-&gt;mount_timeout = CEPH_MOUNT_TIMEOUT_DEFAULT;</div><div class='add'>+	opt-&gt;osd_idle_ttl = CEPH_OSD_IDLE_TTL_DEFAULT;</div><div class='add'>+	opt-&gt;osd_request_timeout = CEPH_OSD_REQUEST_TIMEOUT_DEFAULT;</div><div class='add'>+	opt-&gt;read_from_replica = CEPH_READ_FROM_REPLICA_DEFAULT;</div><div class='add'>+	opt-&gt;con_modes[0] = CEPH_CON_MODE_UNKNOWN;</div><div class='add'>+	opt-&gt;con_modes[1] = CEPH_CON_MODE_UNKNOWN;</div><div class='add'>+	return opt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_alloc_options);</div><div class='add'>+</div><div class='ctx'> void ceph_destroy_options(struct ceph_options *opt)</div><div class='ctx'> {</div><div class='ctx'> 	dout("destroy_options %p\n", opt);</div><div class='add'>+	if (!opt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ceph_clear_crush_locs(&amp;opt-&gt;crush_locs);</div><div class='ctx'> 	kfree(opt-&gt;name);</div><div class='ctx'> 	if (opt-&gt;key) {</div><div class='ctx'> 		ceph_crypto_key_destroy(opt-&gt;key);</div><div class='hunk'>@@ -297,7 +351,9 @@ void ceph_destroy_options(struct ceph_options *opt)</div><div class='ctx'> EXPORT_SYMBOL(ceph_destroy_options);</div><div class='ctx'> </div><div class='ctx'> /* get secret from key store */</div><div class='del'>-static int get_secret(struct ceph_crypto_key *dst, const char *name) {</div><div class='add'>+static int get_secret(struct ceph_crypto_key *dst, const char *name,</div><div class='add'>+		      struct p_log *log)</div><div class='add'>+{</div><div class='ctx'> 	struct key *ukey;</div><div class='ctx'> 	int key_err;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -310,20 +366,20 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name) {</div><div class='ctx'> 		key_err = PTR_ERR(ukey);</div><div class='ctx'> 		switch (key_err) {</div><div class='ctx'> 		case -ENOKEY:</div><div class='del'>-			pr_warn("ceph: Mount failed due to key not found: %s\n",</div><div class='del'>-				name);</div><div class='add'>+			error_plog(log, "Failed due to key not found: %s",</div><div class='add'>+			       name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EKEYEXPIRED:</div><div class='del'>-			pr_warn("ceph: Mount failed due to expired key: %s\n",</div><div class='del'>-				name);</div><div class='add'>+			error_plog(log, "Failed due to expired key: %s",</div><div class='add'>+			       name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EKEYREVOKED:</div><div class='del'>-			pr_warn("ceph: Mount failed due to revoked key: %s\n",</div><div class='del'>-				name);</div><div class='add'>+			error_plog(log, "Failed due to revoked key: %s",</div><div class='add'>+			       name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			pr_warn("ceph: Mount failed due to unknown key error %d: %s\n",</div><div class='del'>-				key_err, name);</div><div class='add'>+			error_plog(log, "Failed due to key error %d: %s",</div><div class='add'>+			       key_err, name);</div><div class='ctx'> 		}</div><div class='ctx'> 		err = -EPERM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -341,218 +397,216 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ceph_options *</div><div class='del'>-ceph_parse_options(char *options, const char *dev_name,</div><div class='del'>-			const char *dev_name_end,</div><div class='del'>-			int (*parse_extra_token)(char *c, void *private),</div><div class='del'>-			void *private)</div><div class='add'>+int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt,</div><div class='add'>+		       struct fc_log *l, char delim)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_options *opt;</div><div class='del'>-	const char *c;</div><div class='del'>-	int err = -ENOMEM;</div><div class='del'>-	substring_t argstr[MAX_OPT_ARGS];</div><div class='del'>-</div><div class='del'>-	opt = kzalloc(sizeof(*opt), GFP_KERNEL);</div><div class='del'>-	if (!opt)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	opt-&gt;mon_addr = kcalloc(CEPH_MAX_MON, sizeof(*opt-&gt;mon_addr),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!opt-&gt;mon_addr)</div><div class='del'>-		goto out;</div><div class='add'>+	struct p_log log = {.prefix = "libceph", .log = l};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	dout("parse_options %p options '%s' dev_name '%s'\n", opt, options,</div><div class='del'>-	     dev_name);</div><div class='add'>+	/* ip1[:port1][&lt;delim&gt;ip2[:port2]...] */</div><div class='add'>+	ret = ceph_parse_ips(buf, buf + len, opt-&gt;mon_addr, CEPH_MAX_MON,</div><div class='add'>+			     &amp;opt-&gt;num_mon, delim);</div><div class='add'>+	if (ret) {</div><div class='add'>+		error_plog(&amp;log, "Failed to parse monitor IPs: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* start with defaults */</div><div class='del'>-	opt-&gt;flags = CEPH_OPT_DEFAULT;</div><div class='del'>-	opt-&gt;osd_keepalive_timeout = CEPH_OSD_KEEPALIVE_DEFAULT;</div><div class='del'>-	opt-&gt;mount_timeout = CEPH_MOUNT_TIMEOUT_DEFAULT;</div><div class='del'>-	opt-&gt;osd_idle_ttl = CEPH_OSD_IDLE_TTL_DEFAULT;</div><div class='del'>-	opt-&gt;osd_request_timeout = CEPH_OSD_REQUEST_TIMEOUT_DEFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_parse_mon_ips);</div><div class='ctx'> </div><div class='del'>-	/* get mon ip(s) */</div><div class='del'>-	/* ip1[:port1][,ip2[:port2]...] */</div><div class='del'>-	err = ceph_parse_ips(dev_name, dev_name_end, opt-&gt;mon_addr,</div><div class='del'>-			     CEPH_MAX_MON, &amp;opt-&gt;num_mon);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,</div><div class='add'>+		     struct fc_log *l)</div><div class='add'>+{</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int token, err;</div><div class='add'>+	struct p_log log = {.prefix = "libceph", .log = l};</div><div class='add'>+</div><div class='add'>+	token = __fs_parse(&amp;log, ceph_parameters, param, &amp;result);</div><div class='add'>+	dout("%s fs_parse '%s' token %d\n", __func__, param-&gt;key, token);</div><div class='add'>+	if (token &lt; 0)</div><div class='add'>+		return token;</div><div class='add'>+</div><div class='add'>+	switch (token) {</div><div class='add'>+	case Opt_ip:</div><div class='add'>+		err = ceph_parse_ips(param-&gt;string,</div><div class='add'>+				     param-&gt;string + param-&gt;size,</div><div class='add'>+				     &amp;opt-&gt;my_addr, 1, NULL, ',');</div><div class='add'>+		if (err) {</div><div class='add'>+			error_plog(&amp;log, "Failed to parse ip: %d", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		opt-&gt;flags |= CEPH_OPT_MYIP;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	/* parse mount options */</div><div class='del'>-	while ((c = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token, intval;</div><div class='del'>-		if (!*c)</div><div class='del'>-			continue;</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		token = match_token((char *)c, opt_tokens, argstr);</div><div class='del'>-		if (token &lt; 0 &amp;&amp; parse_extra_token) {</div><div class='del'>-			/* extra? */</div><div class='del'>-			err = parse_extra_token((char *)c, private);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				pr_err("bad option at '%s'\n", c);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='add'>+	case Opt_fsid:</div><div class='add'>+		err = ceph_parse_fsid(param-&gt;string, &amp;opt-&gt;fsid);</div><div class='add'>+		if (err) {</div><div class='add'>+			error_plog(&amp;log, "Failed to parse fsid: %d", err);</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='del'>-		if (token &lt; Opt_last_int) {</div><div class='del'>-			err = match_int(&amp;argstr[0], &amp;intval);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				pr_err("bad option arg (not int) at '%s'\n", c);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			dout("got int token %d val %d\n", token, intval);</div><div class='del'>-		} else if (token &gt; Opt_last_int &amp;&amp; token &lt; Opt_last_string) {</div><div class='del'>-			dout("got string token %d val %s\n", token,</div><div class='del'>-			     argstr[0].from);</div><div class='del'>-		} else {</div><div class='del'>-			dout("got token %d\n", token);</div><div class='add'>+		opt-&gt;flags |= CEPH_OPT_FSID;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_name:</div><div class='add'>+		kfree(opt-&gt;name);</div><div class='add'>+		opt-&gt;name = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_secret:</div><div class='add'>+		ceph_crypto_key_destroy(opt-&gt;key);</div><div class='add'>+		kfree(opt-&gt;key);</div><div class='add'>+</div><div class='add'>+		opt-&gt;key = kzalloc(sizeof(*opt-&gt;key), GFP_KERNEL);</div><div class='add'>+		if (!opt-&gt;key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		err = ceph_crypto_key_unarmor(opt-&gt;key, param-&gt;string);</div><div class='add'>+		if (err) {</div><div class='add'>+			error_plog(&amp;log, "Failed to parse secret: %d", err);</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_ip:</div><div class='del'>-			err = ceph_parse_ips(argstr[0].from,</div><div class='del'>-					     argstr[0].to,</div><div class='del'>-					     &amp;opt-&gt;my_addr,</div><div class='del'>-					     1, NULL);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			opt-&gt;flags |= CEPH_OPT_MYIP;</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_key:</div><div class='add'>+		ceph_crypto_key_destroy(opt-&gt;key);</div><div class='add'>+		kfree(opt-&gt;key);</div><div class='ctx'> </div><div class='del'>-		case Opt_fsid:</div><div class='del'>-			err = parse_fsid(argstr[0].from, &amp;opt-&gt;fsid);</div><div class='del'>-			if (err == 0)</div><div class='del'>-				opt-&gt;flags |= CEPH_OPT_FSID;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_name:</div><div class='del'>-			kfree(opt-&gt;name);</div><div class='del'>-			opt-&gt;name = kstrndup(argstr[0].from,</div><div class='del'>-					      argstr[0].to-argstr[0].from,</div><div class='del'>-					      GFP_KERNEL);</div><div class='del'>-			if (!opt-&gt;name) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+		opt-&gt;key = kzalloc(sizeof(*opt-&gt;key), GFP_KERNEL);</div><div class='add'>+		if (!opt-&gt;key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		return get_secret(opt-&gt;key, param-&gt;string, &amp;log);</div><div class='add'>+	case Opt_crush_location:</div><div class='add'>+		ceph_clear_crush_locs(&amp;opt-&gt;crush_locs);</div><div class='add'>+		err = ceph_parse_crush_location(param-&gt;string,</div><div class='add'>+						&amp;opt-&gt;crush_locs);</div><div class='add'>+		if (err) {</div><div class='add'>+			error_plog(&amp;log, "Failed to parse CRUSH location: %d",</div><div class='add'>+				   err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_read_from_replica:</div><div class='add'>+		switch (result.uint_32) {</div><div class='add'>+		case Opt_read_from_replica_no:</div><div class='add'>+			opt-&gt;read_from_replica = 0;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_secret:</div><div class='del'>-			ceph_crypto_key_destroy(opt-&gt;key);</div><div class='del'>-			kfree(opt-&gt;key);</div><div class='del'>-</div><div class='del'>-		        opt-&gt;key = kzalloc(sizeof(*opt-&gt;key), GFP_KERNEL);</div><div class='del'>-			if (!opt-&gt;key) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			err = ceph_crypto_key_unarmor(opt-&gt;key, argstr[0].from);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+		case Opt_read_from_replica_balance:</div><div class='add'>+			opt-&gt;read_from_replica = CEPH_OSD_FLAG_BALANCE_READS;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_key:</div><div class='del'>-			ceph_crypto_key_destroy(opt-&gt;key);</div><div class='del'>-			kfree(opt-&gt;key);</div><div class='del'>-</div><div class='del'>-		        opt-&gt;key = kzalloc(sizeof(*opt-&gt;key), GFP_KERNEL);</div><div class='del'>-			if (!opt-&gt;key) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			err = get_secret(opt-&gt;key, argstr[0].from);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+		case Opt_read_from_replica_localize:</div><div class='add'>+			opt-&gt;read_from_replica = CEPH_OSD_FLAG_LOCALIZE_READS;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-			/* misc */</div><div class='del'>-		case Opt_osdtimeout:</div><div class='del'>-			pr_warn("ignoring deprecated osdtimeout option\n");</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ms_mode:</div><div class='add'>+		switch (result.uint_32) {</div><div class='add'>+		case Opt_ms_mode_legacy:</div><div class='add'>+			opt-&gt;con_modes[0] = CEPH_CON_MODE_UNKNOWN;</div><div class='add'>+			opt-&gt;con_modes[1] = CEPH_CON_MODE_UNKNOWN;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_osdkeepalivetimeout:</div><div class='del'>-			/* 0 isn't well defined right now, reject it */</div><div class='del'>-			if (intval &lt; 1 || intval &gt; INT_MAX / 1000) {</div><div class='del'>-				pr_err("osdkeepalive out of range\n");</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			opt-&gt;osd_keepalive_timeout =</div><div class='del'>-					msecs_to_jiffies(intval * 1000);</div><div class='add'>+		case Opt_ms_mode_crc:</div><div class='add'>+			opt-&gt;con_modes[0] = CEPH_CON_MODE_CRC;</div><div class='add'>+			opt-&gt;con_modes[1] = CEPH_CON_MODE_UNKNOWN;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_osd_idle_ttl:</div><div class='del'>-			/* 0 isn't well defined right now, reject it */</div><div class='del'>-			if (intval &lt; 1 || intval &gt; INT_MAX / 1000) {</div><div class='del'>-				pr_err("osd_idle_ttl out of range\n");</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			opt-&gt;osd_idle_ttl = msecs_to_jiffies(intval * 1000);</div><div class='add'>+		case Opt_ms_mode_secure:</div><div class='add'>+			opt-&gt;con_modes[0] = CEPH_CON_MODE_SECURE;</div><div class='add'>+			opt-&gt;con_modes[1] = CEPH_CON_MODE_UNKNOWN;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_mount_timeout:</div><div class='del'>-			/* 0 is "wait forever" (i.e. infinite timeout) */</div><div class='del'>-			if (intval &lt; 0 || intval &gt; INT_MAX / 1000) {</div><div class='del'>-				pr_err("mount_timeout out of range\n");</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			opt-&gt;mount_timeout = msecs_to_jiffies(intval * 1000);</div><div class='add'>+		case Opt_ms_mode_prefer_crc:</div><div class='add'>+			opt-&gt;con_modes[0] = CEPH_CON_MODE_CRC;</div><div class='add'>+			opt-&gt;con_modes[1] = CEPH_CON_MODE_SECURE;</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_osd_request_timeout:</div><div class='del'>-			/* 0 is "wait forever" (i.e. infinite timeout) */</div><div class='del'>-			if (intval &lt; 0 || intval &gt; INT_MAX / 1000) {</div><div class='del'>-				pr_err("osd_request_timeout out of range\n");</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			opt-&gt;osd_request_timeout = msecs_to_jiffies(intval * 1000);</div><div class='add'>+		case Opt_ms_mode_prefer_secure:</div><div class='add'>+			opt-&gt;con_modes[0] = CEPH_CON_MODE_SECURE;</div><div class='add'>+			opt-&gt;con_modes[1] = CEPH_CON_MODE_CRC;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		case Opt_share:</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_osdkeepalivetimeout:</div><div class='add'>+		/* 0 isn't well defined right now, reject it */</div><div class='add'>+		if (result.uint_32 &lt; 1 || result.uint_32 &gt; INT_MAX / 1000)</div><div class='add'>+			goto out_of_range;</div><div class='add'>+		opt-&gt;osd_keepalive_timeout =</div><div class='add'>+		    msecs_to_jiffies(result.uint_32 * 1000);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_osd_idle_ttl:</div><div class='add'>+		/* 0 isn't well defined right now, reject it */</div><div class='add'>+		if (result.uint_32 &lt; 1 || result.uint_32 &gt; INT_MAX / 1000)</div><div class='add'>+			goto out_of_range;</div><div class='add'>+		opt-&gt;osd_idle_ttl = msecs_to_jiffies(result.uint_32 * 1000);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mount_timeout:</div><div class='add'>+		/* 0 is "wait forever" (i.e. infinite timeout) */</div><div class='add'>+		if (result.uint_32 &gt; INT_MAX / 1000)</div><div class='add'>+			goto out_of_range;</div><div class='add'>+		opt-&gt;mount_timeout = msecs_to_jiffies(result.uint_32 * 1000);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_osd_request_timeout:</div><div class='add'>+		/* 0 is "wait forever" (i.e. infinite timeout) */</div><div class='add'>+		if (result.uint_32 &gt; INT_MAX / 1000)</div><div class='add'>+			goto out_of_range;</div><div class='add'>+		opt-&gt;osd_request_timeout =</div><div class='add'>+		    msecs_to_jiffies(result.uint_32 * 1000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_share:</div><div class='add'>+		if (!result.negated)</div><div class='ctx'> 			opt-&gt;flags &amp;= ~CEPH_OPT_NOSHARE;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noshare:</div><div class='add'>+		else</div><div class='ctx'> 			opt-&gt;flags |= CEPH_OPT_NOSHARE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_crc:</div><div class='add'>+		break;</div><div class='add'>+	case Opt_crc:</div><div class='add'>+		if (!result.negated)</div><div class='ctx'> 			opt-&gt;flags &amp;= ~CEPH_OPT_NOCRC;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocrc:</div><div class='add'>+		else</div><div class='ctx'> 			opt-&gt;flags |= CEPH_OPT_NOCRC;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_cephx_require_signatures:</div><div class='del'>-			opt-&gt;flags &amp;= ~CEPH_OPT_NOMSGAUTH;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocephx_require_signatures:</div><div class='del'>-			opt-&gt;flags |= CEPH_OPT_NOMSGAUTH;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_cephx_sign_messages:</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cephx_require_signatures:</div><div class='add'>+		if (!result.negated)</div><div class='add'>+			warn_plog(&amp;log, "Ignoring cephx_require_signatures");</div><div class='add'>+		else</div><div class='add'>+			warn_plog(&amp;log, "Ignoring nocephx_require_signatures, use nocephx_sign_messages");</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cephx_sign_messages:</div><div class='add'>+		if (!result.negated)</div><div class='ctx'> 			opt-&gt;flags &amp;= ~CEPH_OPT_NOMSGSIGN;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocephx_sign_messages:</div><div class='add'>+		else</div><div class='ctx'> 			opt-&gt;flags |= CEPH_OPT_NOMSGSIGN;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_tcp_nodelay:</div><div class='add'>+		break;</div><div class='add'>+	case Opt_tcp_nodelay:</div><div class='add'>+		if (!result.negated)</div><div class='ctx'> 			opt-&gt;flags |= CEPH_OPT_TCP_NODELAY;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_notcp_nodelay:</div><div class='add'>+		else</div><div class='ctx'> 			opt-&gt;flags &amp;= ~CEPH_OPT_TCP_NODELAY;</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			BUG_ON(token);</div><div class='del'>-		}</div><div class='add'>+	case Opt_abort_on_full:</div><div class='add'>+		opt-&gt;flags |= CEPH_OPT_ABORT_ON_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_rxbounce:</div><div class='add'>+		opt-&gt;flags |= CEPH_OPT_RXBOUNCE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* success */</div><div class='del'>-	return opt;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	ceph_destroy_options(opt);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+out_of_range:</div><div class='add'>+	return inval_plog(&amp;log, "%s out of range", param-&gt;key);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_parse_options);</div><div class='add'>+EXPORT_SYMBOL(ceph_parse_param);</div><div class='ctx'> </div><div class='del'>-int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)</div><div class='add'>+int ceph_print_client_options(struct seq_file *m, struct ceph_client *client,</div><div class='add'>+			      bool show_all)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_options *opt = client-&gt;options;</div><div class='ctx'> 	size_t pos = m-&gt;count;</div><div class='add'>+	struct rb_node *n;</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;name) {</div><div class='ctx'> 		seq_puts(m, "name=");</div><div class='hunk'>@@ -562,18 +616,57 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)</div><div class='ctx'> 	if (opt-&gt;key)</div><div class='ctx'> 		seq_puts(m, "secret=&lt;hidden&gt;,");</div><div class='ctx'> </div><div class='add'>+	if (!RB_EMPTY_ROOT(&amp;opt-&gt;crush_locs)) {</div><div class='add'>+		seq_puts(m, "crush_location=");</div><div class='add'>+		for (n = rb_first(&amp;opt-&gt;crush_locs); ; ) {</div><div class='add'>+			struct crush_loc_node *loc =</div><div class='add'>+			    rb_entry(n, struct crush_loc_node, cl_node);</div><div class='add'>+</div><div class='add'>+			seq_printf(m, "%s:%s", loc-&gt;cl_loc.cl_type_name,</div><div class='add'>+				   loc-&gt;cl_loc.cl_name);</div><div class='add'>+			n = rb_next(n);</div><div class='add'>+			if (!n)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			seq_putc(m, '|');</div><div class='add'>+		}</div><div class='add'>+		seq_putc(m, ',');</div><div class='add'>+	}</div><div class='add'>+	if (opt-&gt;read_from_replica == CEPH_OSD_FLAG_BALANCE_READS) {</div><div class='add'>+		seq_puts(m, "read_from_replica=balance,");</div><div class='add'>+	} else if (opt-&gt;read_from_replica == CEPH_OSD_FLAG_LOCALIZE_READS) {</div><div class='add'>+		seq_puts(m, "read_from_replica=localize,");</div><div class='add'>+	}</div><div class='add'>+	if (opt-&gt;con_modes[0] != CEPH_CON_MODE_UNKNOWN) {</div><div class='add'>+		if (opt-&gt;con_modes[0] == CEPH_CON_MODE_CRC &amp;&amp;</div><div class='add'>+		    opt-&gt;con_modes[1] == CEPH_CON_MODE_UNKNOWN) {</div><div class='add'>+			seq_puts(m, "ms_mode=crc,");</div><div class='add'>+		} else if (opt-&gt;con_modes[0] == CEPH_CON_MODE_SECURE &amp;&amp;</div><div class='add'>+			   opt-&gt;con_modes[1] == CEPH_CON_MODE_UNKNOWN) {</div><div class='add'>+			seq_puts(m, "ms_mode=secure,");</div><div class='add'>+		} else if (opt-&gt;con_modes[0] == CEPH_CON_MODE_CRC &amp;&amp;</div><div class='add'>+			   opt-&gt;con_modes[1] == CEPH_CON_MODE_SECURE) {</div><div class='add'>+			seq_puts(m, "ms_mode=prefer-crc,");</div><div class='add'>+		} else if (opt-&gt;con_modes[0] == CEPH_CON_MODE_SECURE &amp;&amp;</div><div class='add'>+			   opt-&gt;con_modes[1] == CEPH_CON_MODE_CRC) {</div><div class='add'>+			seq_puts(m, "ms_mode=prefer-secure,");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (opt-&gt;flags &amp; CEPH_OPT_FSID)</div><div class='ctx'> 		seq_printf(m, "fsid=%pU,", &amp;opt-&gt;fsid);</div><div class='ctx'> 	if (opt-&gt;flags &amp; CEPH_OPT_NOSHARE)</div><div class='ctx'> 		seq_puts(m, "noshare,");</div><div class='ctx'> 	if (opt-&gt;flags &amp; CEPH_OPT_NOCRC)</div><div class='ctx'> 		seq_puts(m, "nocrc,");</div><div class='del'>-	if (opt-&gt;flags &amp; CEPH_OPT_NOMSGAUTH)</div><div class='del'>-		seq_puts(m, "nocephx_require_signatures,");</div><div class='ctx'> 	if (opt-&gt;flags &amp; CEPH_OPT_NOMSGSIGN)</div><div class='ctx'> 		seq_puts(m, "nocephx_sign_messages,");</div><div class='ctx'> 	if ((opt-&gt;flags &amp; CEPH_OPT_TCP_NODELAY) == 0)</div><div class='ctx'> 		seq_puts(m, "notcp_nodelay,");</div><div class='add'>+	if (show_all &amp;&amp; (opt-&gt;flags &amp; CEPH_OPT_ABORT_ON_FULL))</div><div class='add'>+		seq_puts(m, "abort_on_full,");</div><div class='add'>+	if (opt-&gt;flags &amp; CEPH_OPT_RXBOUNCE)</div><div class='add'>+		seq_puts(m, "rxbounce,");</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)</div><div class='ctx'> 		seq_printf(m, "mount_timeout=%d,",</div><div class='hunk'>@@ -636,7 +729,7 @@ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private)</div><div class='ctx'> 	client-&gt;supported_features = CEPH_FEATURES_SUPPORTED_DEFAULT;</div><div class='ctx'> 	client-&gt;required_features = CEPH_FEATURES_REQUIRED_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	if (!ceph_test_opt(client, NOMSGAUTH))</div><div class='add'>+	if (!ceph_test_opt(client, NOMSGSIGN))</div><div class='ctx'> 		client-&gt;required_features |= CEPH_FEATURE_MSG_AUTH;</div><div class='ctx'> </div><div class='ctx'> 	/* msgr */</div><div class='hunk'>@@ -684,42 +777,61 @@ void ceph_destroy_client(struct ceph_client *client)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_destroy_client);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * true if we have the mon map (and have thus joined the cluster)</div><div class='del'>- */</div><div class='del'>-static bool have_mon_and_osd_map(struct ceph_client *client)</div><div class='add'>+void ceph_reset_client_addr(struct ceph_client *client)</div><div class='ctx'> {</div><div class='del'>-	return client-&gt;monc.monmap &amp;&amp; client-&gt;monc.monmap-&gt;epoch &amp;&amp;</div><div class='del'>-	       client-&gt;osdc.osdmap &amp;&amp; client-&gt;osdc.osdmap-&gt;epoch;</div><div class='add'>+	ceph_messenger_reset_nonce(&amp;client-&gt;msgr);</div><div class='add'>+	ceph_monc_reopen_session(&amp;client-&gt;monc);</div><div class='add'>+	ceph_osdc_reopen_osds(&amp;client-&gt;osdc);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ceph_reset_client_addr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * mount: join the ceph cluster, and open root directory.</div><div class='ctx'>  */</div><div class='del'>-int __ceph_open_session(struct ceph_client *client, unsigned long started)</div><div class='add'>+int __ceph_open_session(struct ceph_client *client)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout = client-&gt;options-&gt;mount_timeout;</div><div class='del'>-	long err;</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='add'>+	long timeout = ceph_timeout_jiffies(client-&gt;options-&gt;mount_timeout);</div><div class='add'>+	bool have_monmap, have_osdmap;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* open session, and wait for mon and osd maps */</div><div class='ctx'> 	err = ceph_monc_open_session(&amp;client-&gt;monc);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	while (!have_mon_and_osd_map(client)) {</div><div class='del'>-		if (timeout &amp;&amp; time_after_eq(jiffies, started + timeout))</div><div class='del'>-			return -ETIMEDOUT;</div><div class='add'>+	add_wait_queue(&amp;client-&gt;auth_wq, &amp;wait);</div><div class='add'>+	for (;;) {</div><div class='add'>+		mutex_lock(&amp;client-&gt;monc.mutex);</div><div class='add'>+		err = client-&gt;auth_err;</div><div class='add'>+		have_monmap = client-&gt;monc.monmap &amp;&amp; client-&gt;monc.monmap-&gt;epoch;</div><div class='add'>+		mutex_unlock(&amp;client-&gt;monc.mutex);</div><div class='add'>+</div><div class='add'>+		down_read(&amp;client-&gt;osdc.lock);</div><div class='add'>+		have_osdmap = client-&gt;osdc.osdmap &amp;&amp; client-&gt;osdc.osdmap-&gt;epoch;</div><div class='add'>+		up_read(&amp;client-&gt;osdc.lock);</div><div class='add'>+</div><div class='add'>+		if (err || (have_monmap &amp;&amp; have_osdmap))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			err = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* wait */</div><div class='ctx'> 		dout("mount waiting for mon_map\n");</div><div class='del'>-		err = wait_event_interruptible_timeout(client-&gt;auth_wq,</div><div class='del'>-			have_mon_and_osd_map(client) || (client-&gt;auth_err &lt; 0),</div><div class='del'>-			ceph_timeout_jiffies(timeout));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (client-&gt;auth_err &lt; 0)</div><div class='del'>-			return client-&gt;auth_err;</div><div class='add'>+		timeout = wait_woken(&amp;wait, TASK_INTERRUPTIBLE, timeout);</div><div class='ctx'> 	}</div><div class='add'>+	remove_wait_queue(&amp;client-&gt;auth_wq, &amp;wait);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("client%llu fsid %pU\n", ceph_client_gid(client),</div><div class='ctx'> 		&amp;client-&gt;fsid);</div><div class='hunk'>@@ -729,30 +841,43 @@ int __ceph_open_session(struct ceph_client *client, unsigned long started)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ceph_open_session);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> int ceph_open_session(struct ceph_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned long started = jiffies;  /* note the start time */</div><div class='ctx'> </div><div class='ctx'> 	dout("open_session start\n");</div><div class='ctx'> 	mutex_lock(&amp;client-&gt;mount_mutex);</div><div class='ctx'> </div><div class='del'>-	ret = __ceph_open_session(client, started);</div><div class='add'>+	ret = __ceph_open_session(client);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;client-&gt;mount_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_open_session);</div><div class='ctx'> </div><div class='add'>+int ceph_wait_for_latest_osdmap(struct ceph_client *client,</div><div class='add'>+				unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	u64 newest_epoch;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ceph_monc_get_version(&amp;client-&gt;monc, "osdmap", &amp;newest_epoch);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (client-&gt;osdc.osdmap-&gt;epoch &gt;= newest_epoch)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ceph_osdc_maybe_request_map(&amp;client-&gt;osdc);</div><div class='add'>+	return ceph_monc_wait_osdmap(&amp;client-&gt;monc, newest_epoch, timeout);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_wait_for_latest_osdmap);</div><div class='ctx'> </div><div class='ctx'> static int __init init_ceph_lib(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_debugfs_init();</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	ceph_debugfs_init();</div><div class='ctx'> </div><div class='ctx'> 	ret = ceph_crypto_init();</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -777,7 +902,6 @@ out_crypto:</div><div class='ctx'> 	ceph_crypto_shutdown();</div><div class='ctx'> out_debugfs:</div><div class='ctx'> 	ceph_debugfs_cleanup();</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ceph/ceph_fs.c b/net/ceph/ceph_fs.c<br/>deleted file mode 100644<br/>index 756a2dc10d27..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_fs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_fs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Some non-inline ceph helpers</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/ceph/types.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return true if @layout appears to be valid</div><div class='del'>- */</div><div class='del'>-int ceph_file_layout_is_valid(const struct ceph_file_layout *layout)</div><div class='del'>-{</div><div class='del'>-	__u32 su = layout-&gt;stripe_unit;</div><div class='del'>-	__u32 sc = layout-&gt;stripe_count;</div><div class='del'>-	__u32 os = layout-&gt;object_size;</div><div class='del'>-</div><div class='del'>-	/* stripe unit, object size must be non-zero, 64k increment */</div><div class='del'>-	if (!su || (su &amp; (CEPH_MIN_STRIPE_UNIT-1)))</div><div class='del'>-		return 0;</div><div class='del'>-	if (!os || (os &amp; (CEPH_MIN_STRIPE_UNIT-1)))</div><div class='del'>-		return 0;</div><div class='del'>-	/* object size must be a multiple of stripe unit */</div><div class='del'>-	if (os &lt; su || os % su)</div><div class='del'>-		return 0;</div><div class='del'>-	/* stripe count must be non-zero */</div><div class='del'>-	if (!sc)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ceph_file_layout_from_legacy(struct ceph_file_layout *fl,</div><div class='del'>-				  struct ceph_file_layout_legacy *legacy)</div><div class='del'>-{</div><div class='del'>-	fl-&gt;stripe_unit = le32_to_cpu(legacy-&gt;fl_stripe_unit);</div><div class='del'>-	fl-&gt;stripe_count = le32_to_cpu(legacy-&gt;fl_stripe_count);</div><div class='del'>-	fl-&gt;object_size = le32_to_cpu(legacy-&gt;fl_object_size);</div><div class='del'>-	fl-&gt;pool_id = le32_to_cpu(legacy-&gt;fl_pg_pool);</div><div class='del'>-	if (fl-&gt;pool_id == 0 &amp;&amp; fl-&gt;stripe_unit == 0 &amp;&amp;</div><div class='del'>-	    fl-&gt;stripe_count == 0 &amp;&amp; fl-&gt;object_size == 0)</div><div class='del'>-		fl-&gt;pool_id = -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_file_layout_from_legacy);</div><div class='del'>-</div><div class='del'>-void ceph_file_layout_to_legacy(struct ceph_file_layout *fl,</div><div class='del'>-				struct ceph_file_layout_legacy *legacy)</div><div class='del'>-{</div><div class='del'>-	legacy-&gt;fl_stripe_unit = cpu_to_le32(fl-&gt;stripe_unit);</div><div class='del'>-	legacy-&gt;fl_stripe_count = cpu_to_le32(fl-&gt;stripe_count);</div><div class='del'>-	legacy-&gt;fl_object_size = cpu_to_le32(fl-&gt;object_size);</div><div class='del'>-	if (fl-&gt;pool_id &gt;= 0)</div><div class='del'>-		legacy-&gt;fl_pg_pool = cpu_to_le32(fl-&gt;pool_id);</div><div class='del'>-	else</div><div class='del'>-		legacy-&gt;fl_pg_pool = 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_file_layout_to_legacy);</div><div class='del'>-</div><div class='del'>-int ceph_flags_to_mode(int flags)</div><div class='del'>-{</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-#ifdef O_DIRECTORY  /* fixme */</div><div class='del'>-	if ((flags &amp; O_DIRECTORY) == O_DIRECTORY)</div><div class='del'>-		return CEPH_FILE_MODE_PIN;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (flags &amp; O_ACCMODE) {</div><div class='del'>-	case O_WRONLY:</div><div class='del'>-		mode = CEPH_FILE_MODE_WR;</div><div class='del'>-		break;</div><div class='del'>-	case O_RDONLY:</div><div class='del'>-		mode = CEPH_FILE_MODE_RD;</div><div class='del'>-		break;</div><div class='del'>-	case O_RDWR:</div><div class='del'>-	case O_ACCMODE: /* this is what the VFS does */</div><div class='del'>-		mode = CEPH_FILE_MODE_RDWR;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#ifdef O_LAZY</div><div class='del'>-	if (flags &amp; O_LAZY)</div><div class='del'>-		mode |= CEPH_FILE_MODE_LAZY;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return mode;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_flags_to_mode);</div><div class='del'>-</div><div class='del'>-int ceph_caps_for_mode(int mode)</div><div class='del'>-{</div><div class='del'>-	int caps = CEPH_CAP_PIN;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; CEPH_FILE_MODE_RD)</div><div class='del'>-		caps |= CEPH_CAP_FILE_SHARED |</div><div class='del'>-			CEPH_CAP_FILE_RD | CEPH_CAP_FILE_CACHE;</div><div class='del'>-	if (mode &amp; CEPH_FILE_MODE_WR)</div><div class='del'>-		caps |= CEPH_CAP_FILE_EXCL |</div><div class='del'>-			CEPH_CAP_FILE_WR | CEPH_CAP_FILE_BUFFER |</div><div class='del'>-			CEPH_CAP_AUTH_SHARED | CEPH_CAP_AUTH_EXCL |</div><div class='del'>-			CEPH_CAP_XATTR_SHARED | CEPH_CAP_XATTR_EXCL;</div><div class='del'>-	if (mode &amp; CEPH_FILE_MODE_LAZY)</div><div class='del'>-		caps |= CEPH_CAP_FILE_LAZYIO;</div><div class='del'>-</div><div class='del'>-	return caps;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_caps_for_mode);</div><div class='head'>diff --git a/net/ceph/ceph_hash.c b/net/ceph/ceph_hash.c<br/>index 9a5850f264ed..16a47c0eef37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_hash.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_hash.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_hash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/ceph_hash.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Robert Jenkin's hash function.</div><div class='del'>- * http://burtleburtle.net/bob/hash/evahash.html</div><div class='add'>+ * https://burtleburtle.net/bob/hash/evahash.html</div><div class='ctx'>  * This is in the public domain.</div><div class='ctx'>  */</div><div class='ctx'> #define mix(a, b, c)						\</div><div class='hunk'>@@ -50,35 +50,35 @@ unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length)</div><div class='ctx'> 	switch (len) {</div><div class='ctx'> 	case 11:</div><div class='ctx'> 		c = c + ((__u32)k[10] &lt;&lt; 24);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 10:</div><div class='ctx'> 		c = c + ((__u32)k[9] &lt;&lt; 16);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 9:</div><div class='ctx'> 		c = c + ((__u32)k[8] &lt;&lt; 8);</div><div class='ctx'> 		/* the first byte of c is reserved for the length */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		b = b + ((__u32)k[7] &lt;&lt; 24);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		b = b + ((__u32)k[6] &lt;&lt; 16);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		b = b + ((__u32)k[5] &lt;&lt; 8);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 5:</div><div class='ctx'> 		b = b + k[4];</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		a = a + ((__u32)k[3] &lt;&lt; 24);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		a = a + ((__u32)k[2] &lt;&lt; 16);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		a = a + ((__u32)k[1] &lt;&lt; 8);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		a = a + k[0];</div><div class='ctx'> 		/* case 0: nothing left to add */</div><div class='head'>diff --git a/net/ceph/ceph_strings.c b/net/ceph/ceph_strings.c<br/>index 10e01494993c..355fea272120 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_strings.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/ceph_strings.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/ceph_strings.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/ceph_strings.c</a></div><div class='hunk'>@@ -18,6 +18,34 @@ const char *ceph_entity_type_name(int type)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_entity_type_name);</div><div class='ctx'> </div><div class='add'>+const char *ceph_auth_proto_name(int proto)</div><div class='add'>+{</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case CEPH_AUTH_UNKNOWN:</div><div class='add'>+		return "unknown";</div><div class='add'>+	case CEPH_AUTH_NONE:</div><div class='add'>+		return "none";</div><div class='add'>+	case CEPH_AUTH_CEPHX:</div><div class='add'>+		return "cephx";</div><div class='add'>+	default:</div><div class='add'>+		return "???";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *ceph_con_mode_name(int mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CEPH_CON_MODE_UNKNOWN:</div><div class='add'>+		return "unknown";</div><div class='add'>+	case CEPH_CON_MODE_CRC:</div><div class='add'>+		return "crc";</div><div class='add'>+	case CEPH_CON_MODE_SECURE:</div><div class='add'>+		return "secure";</div><div class='add'>+	default:</div><div class='add'>+		return "???";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const char *ceph_osd_op_name(int op)</div><div class='ctx'> {</div><div class='ctx'> 	switch (op) {</div><div class='head'>diff --git a/net/ceph/cls_lock_client.c b/net/ceph/cls_lock_client.c<br/>index 2105a6eaa66c..66136a4c1ce7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/cls_lock_client.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/cls_lock_client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/cls_lock_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/cls_lock_client.c</a></div><div class='hunk'>@@ -6,10 +6,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/cls_lock_client.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/decode.h&gt;</div><div class='add'>+#include &lt;linux/ceph/libceph.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ceph_cls_lock - grab rados lock for object</div><div class='del'>- * @oid, @oloc: object to lock</div><div class='add'>+ * @osdc: OSD client instance</div><div class='add'>+ * @oid: object to lock</div><div class='add'>+ * @oloc: object to lock</div><div class='ctx'>  * @lock_name: the name of the lock</div><div class='ctx'>  * @type: lock type (CEPH_CLS_LOCK_EXCLUSIVE or CEPH_CLS_LOCK_SHARED)</div><div class='ctx'>  * @cookie: user-defined identifier for this instance of the lock</div><div class='hunk'>@@ -81,7 +84,9 @@ EXPORT_SYMBOL(ceph_cls_lock);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ceph_cls_unlock - release rados lock for object</div><div class='del'>- * @oid, @oloc: object to lock</div><div class='add'>+ * @osdc: OSD client instance</div><div class='add'>+ * @oid: object to lock</div><div class='add'>+ * @oloc: object to lock</div><div class='ctx'>  * @lock_name: the name of the lock</div><div class='ctx'>  * @cookie: user-defined identifier for this instance of the lock</div><div class='ctx'>  */</div><div class='hunk'>@@ -129,7 +134,9 @@ EXPORT_SYMBOL(ceph_cls_unlock);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ceph_cls_break_lock - release rados lock for object for specified client</div><div class='del'>- * @oid, @oloc: object to lock</div><div class='add'>+ * @osdc: OSD client instance</div><div class='add'>+ * @oid: object to lock</div><div class='add'>+ * @oloc: object to lock</div><div class='ctx'>  * @lock_name: the name of the lock</div><div class='ctx'>  * @cookie: user-defined identifier for this instance of the lock</div><div class='ctx'>  * @locker: current lock owner</div><div class='hunk'>@@ -264,14 +271,17 @@ static int decode_locker(void **p, void *end, struct ceph_locker *locker)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	*p += sizeof(struct ceph_timespec); /* skip expiration */</div><div class='del'>-	ceph_decode_copy(p, &amp;locker-&gt;info.addr, sizeof(locker-&gt;info.addr));</div><div class='del'>-	ceph_decode_addr(&amp;locker-&gt;info.addr);</div><div class='add'>+</div><div class='add'>+	ret = ceph_decode_entity_addr(p, end, &amp;locker-&gt;info.addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	len = ceph_decode_32(p);</div><div class='ctx'> 	*p += len; /* skip description */</div><div class='ctx'> </div><div class='ctx'> 	dout("%s %s%llu cookie %s addr %s\n", __func__,</div><div class='ctx'> 	     ENTITY_NAME(locker-&gt;id.name), locker-&gt;id.cookie,</div><div class='del'>-	     ceph_pr_addr(&amp;locker-&gt;info.addr.in_addr));</div><div class='add'>+	     ceph_pr_addr(&amp;locker-&gt;info.addr));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -360,7 +370,7 @@ int ceph_cls_lock_info(struct ceph_osd_client *osdc,</div><div class='ctx'> 	dout("%s lock_name %s\n", __func__, lock_name);</div><div class='ctx'> 	ret = ceph_osdc_call(osdc, oid, oloc, "lock", "get_info",</div><div class='ctx'> 			     CEPH_OSD_FLAG_READ, get_info_op_page,</div><div class='del'>-			     get_info_op_buf_size, reply_page, &amp;reply_len);</div><div class='add'>+			     get_info_op_buf_size, &amp;reply_page, &amp;reply_len);</div><div class='ctx'> </div><div class='ctx'> 	dout("%s: status %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='hunk'>@@ -375,3 +385,47 @@ int ceph_cls_lock_info(struct ceph_osd_client *osdc,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_cls_lock_info);</div><div class='add'>+</div><div class='add'>+int ceph_cls_assert_locked(struct ceph_osd_request *req, int which,</div><div class='add'>+			   char *lock_name, u8 type, char *cookie, char *tag)</div><div class='add'>+{</div><div class='add'>+	int assert_op_buf_size;</div><div class='add'>+	int name_len = strlen(lock_name);</div><div class='add'>+	int cookie_len = strlen(cookie);</div><div class='add'>+	int tag_len = strlen(tag);</div><div class='add'>+	struct page **pages;</div><div class='add'>+	void *p, *end;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	assert_op_buf_size = name_len + sizeof(__le32) +</div><div class='add'>+			     cookie_len + sizeof(__le32) +</div><div class='add'>+			     tag_len + sizeof(__le32) +</div><div class='add'>+			     sizeof(u8) + CEPH_ENCODING_START_BLK_LEN;</div><div class='add'>+	if (assert_op_buf_size &gt; PAGE_SIZE)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	ret = osd_req_op_cls_init(req, which, "lock", "assert_locked");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pages = ceph_alloc_page_vector(1, GFP_NOIO);</div><div class='add'>+	if (IS_ERR(pages))</div><div class='add'>+		return PTR_ERR(pages);</div><div class='add'>+</div><div class='add'>+	p = page_address(pages[0]);</div><div class='add'>+	end = p + assert_op_buf_size;</div><div class='add'>+</div><div class='add'>+	/* encode cls_lock_assert_op struct */</div><div class='add'>+	ceph_start_encoding(&amp;p, 1, 1,</div><div class='add'>+			    assert_op_buf_size - CEPH_ENCODING_START_BLK_LEN);</div><div class='add'>+	ceph_encode_string(&amp;p, end, lock_name, name_len);</div><div class='add'>+	ceph_encode_8(&amp;p, type);</div><div class='add'>+	ceph_encode_string(&amp;p, end, cookie, cookie_len);</div><div class='add'>+	ceph_encode_string(&amp;p, end, tag, tag_len);</div><div class='add'>+	WARN_ON(p != end);</div><div class='add'>+</div><div class='add'>+	osd_req_op_cls_request_data_pages(req, which, pages, assert_op_buf_size,</div><div class='add'>+					  0, false, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_cls_assert_locked);</div><div class='head'>diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c<br/>index 3d70244bc1b6..254ded0b05f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/crush.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/crush.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/crush.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/crush/crush.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> # include &lt;linux/slab.h&gt;</div><div class='ctx'> # include &lt;linux/crush/crush.h&gt;</div><div class='del'>-void clear_choose_args(struct crush_map *c);</div><div class='ctx'> #else</div><div class='ctx'> # include "crush_compat.h"</div><div class='ctx'> # include "crush.h"</div><div class='hunk'>@@ -130,6 +129,8 @@ void crush_destroy(struct crush_map *map)</div><div class='ctx'> #ifndef __KERNEL__</div><div class='ctx'> 	kfree(map-&gt;choose_tries);</div><div class='ctx'> #else</div><div class='add'>+	clear_crush_names(&amp;map-&gt;type_names);</div><div class='add'>+	clear_crush_names(&amp;map-&gt;names);</div><div class='ctx'> 	clear_choose_args(map);</div><div class='ctx'> #endif</div><div class='ctx'> 	kfree(map);</div><div class='head'>diff --git a/net/ceph/crush/hash.c b/net/ceph/crush/hash.c<br/>index e5cc603cdb17..fe79f6d2d0db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/hash.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/hash.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/hash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/crush/hash.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Robert Jenkins' function for mixing 32-bit values</div><div class='del'>- * http://burtleburtle.net/bob/hash/evahash.html</div><div class='add'>+ * https://burtleburtle.net/bob/hash/evahash.html</div><div class='ctx'>  * a, b = random bits, c = input and output</div><div class='ctx'>  */</div><div class='ctx'> #define crush_hashmix(a, b, c) do {			\</div><div class='head'>diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c<br/>index 3f323ed9df52..3a5bd1cd1e99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/mapper.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crush/mapper.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/crush/mapper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/crush/mapper.c</a></div><div class='hunk'>@@ -298,7 +298,7 @@ static __u64 crush_ln(unsigned int xin)</div><div class='ctx'>  *</div><div class='ctx'>  * for reference, see:</div><div class='ctx'>  *</div><div class='del'>- * http://en.wikipedia.org/wiki/Exponential_distribution#Distribution_of_the_minimum_of_exponential_random_variables</div><div class='add'>+ * https://en.wikipedia.org/wiki/Exponential_distribution#Distribution_of_the_minimum_of_exponential_random_variables</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +429,10 @@ static int is_out(const struct crush_map *map,</div><div class='ctx'> /**</div><div class='ctx'>  * crush_choose_firstn - choose numrep distinct items of given type</div><div class='ctx'>  * @map: the crush_map</div><div class='add'>+ * @work: working space initialized by crush_init_workspace()</div><div class='ctx'>  * @bucket: the bucket we are choose an item from</div><div class='add'>+ * @weight: weight vector (for map leaves)</div><div class='add'>+ * @weight_max: size of weight vector</div><div class='ctx'>  * @x: crush input value</div><div class='ctx'>  * @numrep: the number of items to choose</div><div class='ctx'>  * @type: the type of item to choose</div><div class='hunk'>@@ -445,6 +448,7 @@ static int is_out(const struct crush_map *map,</div><div class='ctx'>  * @vary_r: pass r to recursive calls</div><div class='ctx'>  * @out2: second output vector for leaf items (if @recurse_to_leaf)</div><div class='ctx'>  * @parent_r: r value passed from the parent</div><div class='add'>+ * @choose_args: weights and ids for each known bucket</div><div class='ctx'>  */</div><div class='ctx'> static int crush_choose_firstn(const struct crush_map *map,</div><div class='ctx'> 			       struct crush_work *work,</div><div class='hunk'>@@ -636,9 +640,8 @@ reject:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * crush_choose_indep: alternative breadth-first positionally stable mapping</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> static void crush_choose_indep(const struct crush_map *map,</div><div class='ctx'> 			       struct crush_work *work,</div><div class='hunk'>@@ -906,7 +909,6 @@ int crush_do_rule(const struct crush_map *map,</div><div class='ctx'> 	int recurse_to_leaf;</div><div class='ctx'> 	int wsize = 0;</div><div class='ctx'> 	int osize;</div><div class='del'>-	int *tmp;</div><div class='ctx'> 	const struct crush_rule *rule;</div><div class='ctx'> 	__u32 step;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -987,7 +989,7 @@ int crush_do_rule(const struct crush_map *map,</div><div class='ctx'> 		case CRUSH_RULE_CHOOSELEAF_FIRSTN:</div><div class='ctx'> 		case CRUSH_RULE_CHOOSE_FIRSTN:</div><div class='ctx'> 			firstn = 1;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case CRUSH_RULE_CHOOSELEAF_INDEP:</div><div class='ctx'> 		case CRUSH_RULE_CHOOSE_INDEP:</div><div class='ctx'> 			if (wsize == 0)</div><div class='hunk'>@@ -1073,9 +1075,7 @@ int crush_do_rule(const struct crush_map *map,</div><div class='ctx'> 				memcpy(o, c, osize*sizeof(*o));</div><div class='ctx'> </div><div class='ctx'> 			/* swap o and w arrays */</div><div class='del'>-			tmp = o;</div><div class='del'>-			o = w;</div><div class='del'>-			w = tmp;</div><div class='add'>+			swap(o, w);</div><div class='ctx'> 			wsize = osize;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c<br/>index 02172c408ff2..01b2ce1e8fc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/crypto.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crypto.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/crypto.c</a></div><div class='hunk'>@@ -46,9 +46,9 @@ static int set_secret(struct ceph_crypto_key *key, void *buf)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* crypto_alloc_skcipher() allocates with GFP_KERNEL */</div><div class='add'>+	/* crypto_alloc_sync_skcipher() allocates with GFP_KERNEL */</div><div class='ctx'> 	noio_flag = memalloc_noio_save();</div><div class='del'>-	key-&gt;tfm = crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	key-&gt;tfm = crypto_alloc_sync_skcipher("cbc(aes)", 0, 0);</div><div class='ctx'> 	memalloc_noio_restore(noio_flag);</div><div class='ctx'> 	if (IS_ERR(key-&gt;tfm)) {</div><div class='ctx'> 		ret = PTR_ERR(key-&gt;tfm);</div><div class='hunk'>@@ -56,7 +56,7 @@ static int set_secret(struct ceph_crypto_key *key, void *buf)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = crypto_skcipher_setkey(key-&gt;tfm, key-&gt;key, key-&gt;len);</div><div class='add'>+	ret = crypto_sync_skcipher_setkey(key-&gt;tfm, key-&gt;key, key-&gt;len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -74,18 +74,6 @@ int ceph_crypto_key_clone(struct ceph_crypto_key *dst,</div><div class='ctx'> 	return set_secret(dst, src-&gt;key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end)</div><div class='del'>-{</div><div class='del'>-	if (*p + sizeof(u16) + sizeof(key-&gt;created) +</div><div class='del'>-	    sizeof(u16) + key-&gt;len &gt; end)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	ceph_encode_16(p, key-&gt;type);</div><div class='del'>-	ceph_encode_copy(p, &amp;key-&gt;created, sizeof(key-&gt;created));</div><div class='del'>-	ceph_encode_16(p, key-&gt;len);</div><div class='del'>-	ceph_encode_copy(p, key-&gt;key, key-&gt;len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -96,6 +84,7 @@ int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end)</div><div class='ctx'> 	key-&gt;len = ceph_decode_16(p);</div><div class='ctx'> 	ceph_decode_need(p, end, key-&gt;len, bad);</div><div class='ctx'> 	ret = set_secret(key, *p);</div><div class='add'>+	memzero_explicit(*p, key-&gt;len);</div><div class='ctx'> 	*p += key-&gt;len;</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -134,17 +123,19 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *inkey)</div><div class='ctx'> void ceph_crypto_key_destroy(struct ceph_crypto_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	if (key) {</div><div class='del'>-		kfree(key-&gt;key);</div><div class='add'>+		kfree_sensitive(key-&gt;key);</div><div class='ctx'> 		key-&gt;key = NULL;</div><div class='del'>-		crypto_free_skcipher(key-&gt;tfm);</div><div class='del'>-		key-&gt;tfm = NULL;</div><div class='add'>+		if (key-&gt;tfm) {</div><div class='add'>+			crypto_free_sync_skcipher(key-&gt;tfm);</div><div class='add'>+			key-&gt;tfm = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const u8 *aes_iv = (u8 *)CEPH_AES_IV;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Should be used for buffers allocated with ceph_kvmalloc().</div><div class='add'>+ * Should be used for buffers allocated with kvmalloc().</div><div class='ctx'>  * Currently these are encrypt out-buffer (ceph_buffer) and decrypt</div><div class='ctx'>  * in-buffer (msg front).</div><div class='ctx'>  *</div><div class='hunk'>@@ -216,7 +207,7 @@ static void teardown_sgtable(struct sg_table *sgt)</div><div class='ctx'> static int ceph_aes_crypt(const struct ceph_crypto_key *key, bool encrypt,</div><div class='ctx'> 			  void *buf, int buf_len, int in_len, int *pout_len)</div><div class='ctx'> {</div><div class='del'>-	SKCIPHER_REQUEST_ON_STACK(req, key-&gt;tfm);</div><div class='add'>+	SYNC_SKCIPHER_REQUEST_ON_STACK(req, key-&gt;tfm);</div><div class='ctx'> 	struct sg_table sgt;</div><div class='ctx'> 	struct scatterlist prealloc_sg;</div><div class='ctx'> 	char iv[AES_BLOCK_SIZE] __aligned(8);</div><div class='hunk'>@@ -232,7 +223,7 @@ static int ceph_aes_crypt(const struct ceph_crypto_key *key, bool encrypt,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(iv, aes_iv, AES_BLOCK_SIZE);</div><div class='del'>-	skcipher_request_set_tfm(req, key-&gt;tfm);</div><div class='add'>+	skcipher_request_set_sync_tfm(req, key-&gt;tfm);</div><div class='ctx'> 	skcipher_request_set_callback(req, 0, NULL, NULL);</div><div class='ctx'> 	skcipher_request_set_crypt(req, sgt.sgl, sgt.sgl, crypt_len, iv);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ceph/crypto.h b/net/ceph/crypto.h<br/>index bb45c7d43739..23de29fc613c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/crypto.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/crypto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/crypto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/crypto.h</a></div><div class='hunk'>@@ -5,6 +5,9 @@</div><div class='ctx'> #include &lt;linux/ceph/types.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/buffer.h&gt;</div><div class='ctx'> </div><div class='add'>+#define CEPH_KEY_LEN			16</div><div class='add'>+#define CEPH_MAX_CON_SECRET_LEN		64</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * cryptographic secret</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,12 +16,11 @@ struct ceph_crypto_key {</div><div class='ctx'> 	struct ceph_timespec created;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	void *key;</div><div class='del'>-	struct crypto_skcipher *tfm;</div><div class='add'>+	struct crypto_sync_skcipher *tfm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ceph_crypto_key_clone(struct ceph_crypto_key *dst,</div><div class='ctx'> 			  const struct ceph_crypto_key *src);</div><div class='del'>-int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end);</div><div class='ctx'> int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end);</div><div class='ctx'> int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);</div><div class='ctx'> void ceph_crypto_key_destroy(struct ceph_crypto_key *key);</div><div class='head'>diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c<br/>index 02952605d121..83c270bce63c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/debugfs.c</a></div><div class='hunk'>@@ -36,8 +36,9 @@ static int monmap_show(struct seq_file *s, void *p)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct ceph_client *client = s-&gt;private;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;client-&gt;monc.mutex);</div><div class='ctx'> 	if (client-&gt;monc.monmap == NULL)</div><div class='del'>-		return 0;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "epoch %d\n", client-&gt;monc.monmap-&gt;epoch);</div><div class='ctx'> 	for (i = 0; i &lt; client-&gt;monc.monmap-&gt;num_mon; i++) {</div><div class='hunk'>@@ -46,8 +47,11 @@ static int monmap_show(struct seq_file *s, void *p)</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(s, "\t%s%lld\t%s\n",</div><div class='ctx'> 			   ENTITY_NAME(inst-&gt;name),</div><div class='del'>-			   ceph_pr_addr(&amp;inst-&gt;addr.in_addr));</div><div class='add'>+			   ceph_pr_addr(&amp;inst-&gt;addr));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;client-&gt;monc.mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -56,13 +60,14 @@ static int osdmap_show(struct seq_file *s, void *p)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct ceph_client *client = s-&gt;private;</div><div class='ctx'> 	struct ceph_osd_client *osdc = &amp;client-&gt;osdc;</div><div class='del'>-	struct ceph_osdmap *map = osdc-&gt;osdmap;</div><div class='add'>+	struct ceph_osdmap *map;</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> </div><div class='add'>+	down_read(&amp;osdc-&gt;lock);</div><div class='add'>+	map = osdc-&gt;osdmap;</div><div class='ctx'> 	if (map == NULL)</div><div class='del'>-		return 0;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;osdc-&gt;lock);</div><div class='ctx'> 	seq_printf(s, "epoch %u barrier %u flags 0x%x\n", map-&gt;epoch,</div><div class='ctx'> 			osdc-&gt;epoch_barrier, map-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -81,11 +86,13 @@ static int osdmap_show(struct seq_file *s, void *p)</div><div class='ctx'> 		u32 state = map-&gt;osd_state[i];</div><div class='ctx'> 		char sb[64];</div><div class='ctx'> </div><div class='del'>-		seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\n",</div><div class='del'>-			   i, ceph_pr_addr(&amp;addr-&gt;in_addr),</div><div class='add'>+		seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\t%2d\n",</div><div class='add'>+			   i, ceph_pr_addr(addr),</div><div class='ctx'> 			   ((map-&gt;osd_weight[i]*100) &gt;&gt; 16),</div><div class='ctx'> 			   ceph_osdmap_state_str(sb, sizeof(sb), state),</div><div class='del'>-			   ((ceph_get_primary_affinity(map, i)*100) &gt;&gt; 16));</div><div class='add'>+			   ((ceph_get_primary_affinity(map, i)*100) &gt;&gt; 16),</div><div class='add'>+			   ceph_get_crush_locality(map, i,</div><div class='add'>+					   &amp;client-&gt;options-&gt;crush_locs));</div><div class='ctx'> 	}</div><div class='ctx'> 	for (n = rb_first(&amp;map-&gt;pg_temp); n; n = rb_next(n)) {</div><div class='ctx'> 		struct ceph_pg_mapping *pg =</div><div class='hunk'>@@ -129,6 +136,7 @@ static int osdmap_show(struct seq_file *s, void *p)</div><div class='ctx'> 		seq_printf(s, "]\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out_unlock:</div><div class='ctx'> 	up_read(&amp;osdc-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -221,6 +229,9 @@ static void dump_request(struct seq_file *s, struct ceph_osd_request *req)</div><div class='ctx'> 		if (op-&gt;op == CEPH_OSD_OP_WATCH)</div><div class='ctx'> 			seq_printf(s, "-%s",</div><div class='ctx'> 				   ceph_osd_watch_op_name(op-&gt;watch.op));</div><div class='add'>+		else if (op-&gt;op == CEPH_OSD_OP_CALL)</div><div class='add'>+			seq_printf(s, "-%s/%s", op-&gt;cls.class_name,</div><div class='add'>+				   op-&gt;cls.method_name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(s, '\n');</div><div class='hunk'>@@ -375,7 +386,7 @@ static int client_options_show(struct seq_file *s, void *p)</div><div class='ctx'> 	struct ceph_client *client = s-&gt;private;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_print_client_options(s, client);</div><div class='add'>+	ret = ceph_print_client_options(s, client, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -383,18 +394,15 @@ static int client_options_show(struct seq_file *s, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-CEPH_DEFINE_SHOW_FUNC(monmap_show)</div><div class='del'>-CEPH_DEFINE_SHOW_FUNC(osdmap_show)</div><div class='del'>-CEPH_DEFINE_SHOW_FUNC(monc_show)</div><div class='del'>-CEPH_DEFINE_SHOW_FUNC(osdc_show)</div><div class='del'>-CEPH_DEFINE_SHOW_FUNC(client_options_show)</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(monmap);</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(osdmap);</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(monc);</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(osdc);</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(client_options);</div><div class='ctx'> </div><div class='del'>-int __init ceph_debugfs_init(void)</div><div class='add'>+void __init ceph_debugfs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	ceph_debugfs_dir = debugfs_create_dir("ceph", NULL);</div><div class='del'>-	if (!ceph_debugfs_dir)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_debugfs_cleanup(void)</div><div class='hunk'>@@ -402,9 +410,8 @@ void ceph_debugfs_cleanup(void)</div><div class='ctx'> 	debugfs_remove(ceph_debugfs_dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_debugfs_client_init(struct ceph_client *client)</div><div class='add'>+void ceph_debugfs_client_init(struct ceph_client *client)</div><div class='ctx'> {</div><div class='del'>-	int ret = -ENOMEM;</div><div class='ctx'> 	char name[80];</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, sizeof(name), "%pU.client%lld", &amp;client-&gt;fsid,</div><div class='hunk'>@@ -412,56 +419,37 @@ int ceph_debugfs_client_init(struct ceph_client *client)</div><div class='ctx'> </div><div class='ctx'> 	dout("ceph_debugfs_client_init %p %s\n", client, name);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(client-&gt;debugfs_dir);</div><div class='ctx'> 	client-&gt;debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir);</div><div class='del'>-	if (!client-&gt;debugfs_dir)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;monc.debugfs_file = debugfs_create_file("monc",</div><div class='ctx'> 						      0400,</div><div class='ctx'> 						      client-&gt;debugfs_dir,</div><div class='ctx'> 						      client,</div><div class='del'>-						      &amp;monc_show_fops);</div><div class='del'>-	if (!client-&gt;monc.debugfs_file)</div><div class='del'>-		goto out;</div><div class='add'>+						      &amp;monc_fops);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;osdc.debugfs_file = debugfs_create_file("osdc",</div><div class='ctx'> 						      0400,</div><div class='ctx'> 						      client-&gt;debugfs_dir,</div><div class='ctx'> 						      client,</div><div class='del'>-						      &amp;osdc_show_fops);</div><div class='del'>-	if (!client-&gt;osdc.debugfs_file)</div><div class='del'>-		goto out;</div><div class='add'>+						      &amp;osdc_fops);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;debugfs_monmap = debugfs_create_file("monmap",</div><div class='ctx'> 					0400,</div><div class='ctx'> 					client-&gt;debugfs_dir,</div><div class='ctx'> 					client,</div><div class='del'>-					&amp;monmap_show_fops);</div><div class='del'>-	if (!client-&gt;debugfs_monmap)</div><div class='del'>-		goto out;</div><div class='add'>+					&amp;monmap_fops);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;debugfs_osdmap = debugfs_create_file("osdmap",</div><div class='ctx'> 					0400,</div><div class='ctx'> 					client-&gt;debugfs_dir,</div><div class='ctx'> 					client,</div><div class='del'>-					&amp;osdmap_show_fops);</div><div class='del'>-	if (!client-&gt;debugfs_osdmap)</div><div class='del'>-		goto out;</div><div class='add'>+					&amp;osdmap_fops);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;debugfs_options = debugfs_create_file("client_options",</div><div class='ctx'> 					0400,</div><div class='ctx'> 					client-&gt;debugfs_dir,</div><div class='ctx'> 					client,</div><div class='del'>-					&amp;client_options_show_fops);</div><div class='del'>-	if (!client-&gt;debugfs_options)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	ceph_debugfs_client_cleanup(client);</div><div class='del'>-	return ret;</div><div class='add'>+					&amp;client_options_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_debugfs_client_cleanup(struct ceph_client *client)</div><div class='hunk'>@@ -477,18 +465,16 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client)</div><div class='ctx'> </div><div class='ctx'> #else  /* CONFIG_DEBUG_FS */</div><div class='ctx'> </div><div class='del'>-int __init ceph_debugfs_init(void)</div><div class='add'>+void __init ceph_debugfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_debugfs_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_debugfs_client_init(struct ceph_client *client)</div><div class='add'>+void ceph_debugfs_client_init(struct ceph_client *client)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_debugfs_client_cleanup(struct ceph_client *client)</div><div class='head'>diff --git a/net/ceph/decode.c b/net/ceph/decode.c<br/>new file mode 100644<br/>index 000000000000..bc109a1a4616<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/decode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/decode.c</a></div><div class='hunk'>@@ -0,0 +1,193 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ceph/decode.h&gt;</div><div class='add'>+#include &lt;linux/ceph/messenger.h&gt;  /* for ceph_pr_addr() */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ceph_decode_entity_addr_versioned(void **p, void *end,</div><div class='add'>+				  struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 struct_v;</div><div class='add'>+	u32 struct_len, addr_len;</div><div class='add'>+	void *struct_end;</div><div class='add'>+</div><div class='add'>+	ret = ceph_start_decoding(p, end, 1, "entity_addr_t", &amp;struct_v,</div><div class='add'>+				  &amp;struct_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	struct_end = *p + struct_len;</div><div class='add'>+</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;addr-&gt;type, sizeof(addr-&gt;type), bad);</div><div class='add'>+</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;addr-&gt;nonce, sizeof(addr-&gt;nonce), bad);</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(p, end, addr_len, bad);</div><div class='add'>+	if (addr_len &gt; sizeof(addr-&gt;in_addr))</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	memset(&amp;addr-&gt;in_addr, 0, sizeof(addr-&gt;in_addr));</div><div class='add'>+	if (addr_len) {</div><div class='add'>+		ceph_decode_copy_safe(p, end, &amp;addr-&gt;in_addr, addr_len, bad);</div><div class='add'>+</div><div class='add'>+		addr-&gt;in_addr.ss_family =</div><div class='add'>+			le16_to_cpu((__force __le16)addr-&gt;in_addr.ss_family);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Advance past anything the client doesn't yet understand */</div><div class='add'>+	*p = struct_end;</div><div class='add'>+	ret = 0;</div><div class='add'>+bad:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ceph_decode_entity_addr_legacy(void **p, void *end,</div><div class='add'>+			       struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Skip rest of type field */</div><div class='add'>+	ceph_decode_skip_n(p, end, 3, bad);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clients that don't support ADDR2 always send TYPE_NONE, change it</div><div class='add'>+	 * to TYPE_LEGACY for forward compatibility.</div><div class='add'>+	 */</div><div class='add'>+	addr-&gt;type = CEPH_ENTITY_ADDR_TYPE_LEGACY;</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;addr-&gt;nonce, sizeof(addr-&gt;nonce), bad);</div><div class='add'>+	memset(&amp;addr-&gt;in_addr, 0, sizeof(addr-&gt;in_addr));</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;addr-&gt;in_addr,</div><div class='add'>+			      sizeof(addr-&gt;in_addr), bad);</div><div class='add'>+	addr-&gt;in_addr.ss_family =</div><div class='add'>+			be16_to_cpu((__force __be16)addr-&gt;in_addr.ss_family);</div><div class='add'>+	ret = 0;</div><div class='add'>+bad:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ceph_decode_entity_addr(void **p, void *end, struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	u8 marker;</div><div class='add'>+</div><div class='add'>+	ceph_decode_8_safe(p, end, marker, bad);</div><div class='add'>+	if (marker == 1)</div><div class='add'>+		return ceph_decode_entity_addr_versioned(p, end, addr);</div><div class='add'>+	else if (marker == 0)</div><div class='add'>+		return ceph_decode_entity_addr_legacy(p, end, addr);</div><div class='add'>+bad:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_decode_entity_addr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return addr of desired type (MSGR2 or LEGACY) or error.</div><div class='add'>+ * Make sure there is only one match.</div><div class='add'>+ *</div><div class='add'>+ * Assume encoding with MSG_ADDR2.</div><div class='add'>+ */</div><div class='add'>+int ceph_decode_entity_addrvec(void **p, void *end, bool msgr2,</div><div class='add'>+			       struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	__le32 my_type = msgr2 ? CEPH_ENTITY_ADDR_TYPE_MSGR2 :</div><div class='add'>+				 CEPH_ENTITY_ADDR_TYPE_LEGACY;</div><div class='add'>+	struct ceph_entity_addr tmp_addr;</div><div class='add'>+	int addr_cnt;</div><div class='add'>+	bool found;</div><div class='add'>+	u8 marker;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ceph_decode_8_safe(p, end, marker, e_inval);</div><div class='add'>+	if (marker != 2) {</div><div class='add'>+		pr_err("bad addrvec marker %d\n", marker);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(p, end, addr_cnt, e_inval);</div><div class='add'>+	dout("%s addr_cnt %d\n", __func__, addr_cnt);</div><div class='add'>+</div><div class='add'>+	found = false;</div><div class='add'>+	for (i = 0; i &lt; addr_cnt; i++) {</div><div class='add'>+		ret = ceph_decode_entity_addr(p, end, &amp;tmp_addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dout("%s i %d addr %s\n", __func__, i, ceph_pr_addr(&amp;tmp_addr));</div><div class='add'>+		if (tmp_addr.type == my_type) {</div><div class='add'>+			if (found) {</div><div class='add'>+				pr_err("another match of type %d in addrvec\n",</div><div class='add'>+				       le32_to_cpu(my_type));</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(addr, &amp;tmp_addr, sizeof(*addr));</div><div class='add'>+			found = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (found)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!addr_cnt)</div><div class='add'>+		return 0;  /* normal -- e.g. unused OSD id/slot */</div><div class='add'>+</div><div class='add'>+	if (addr_cnt == 1 &amp;&amp; !memchr_inv(&amp;tmp_addr, 0, sizeof(tmp_addr)))</div><div class='add'>+		return 0;  /* weird but effectively the same as !addr_cnt */</div><div class='add'>+</div><div class='add'>+	pr_err("no match of type %d in addrvec\n", le32_to_cpu(my_type));</div><div class='add'>+	return -ENOENT;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_decode_entity_addrvec);</div><div class='add'>+</div><div class='add'>+static int get_sockaddr_encoding_len(sa_family_t family)</div><div class='add'>+{</div><div class='add'>+	union {</div><div class='add'>+		struct sockaddr sa;</div><div class='add'>+		struct sockaddr_in sin;</div><div class='add'>+		struct sockaddr_in6 sin6;</div><div class='add'>+	} u;</div><div class='add'>+</div><div class='add'>+	switch (family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		return sizeof(u.sin);</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		return sizeof(u.sin6);</div><div class='add'>+	default:</div><div class='add'>+		return sizeof(u);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_entity_addr_encoding_len(const struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	sa_family_t family = get_unaligned(&amp;addr-&gt;in_addr.ss_family);</div><div class='add'>+	int addr_len = get_sockaddr_encoding_len(family);</div><div class='add'>+</div><div class='add'>+	return 1 + CEPH_ENCODING_START_BLK_LEN + 4 + 4 + 4 + addr_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_encode_entity_addr(void **p, const struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	sa_family_t family = get_unaligned(&amp;addr-&gt;in_addr.ss_family);</div><div class='add'>+	int addr_len = get_sockaddr_encoding_len(family);</div><div class='add'>+</div><div class='add'>+	ceph_encode_8(p, 1);  /* marker */</div><div class='add'>+	ceph_start_encoding(p, 1, 1, sizeof(addr-&gt;type) +</div><div class='add'>+				     sizeof(addr-&gt;nonce) +</div><div class='add'>+				     sizeof(u32) + addr_len);</div><div class='add'>+	ceph_encode_copy(p, &amp;addr-&gt;type, sizeof(addr-&gt;type));</div><div class='add'>+	ceph_encode_copy(p, &amp;addr-&gt;nonce, sizeof(addr-&gt;nonce));</div><div class='add'>+</div><div class='add'>+	ceph_encode_32(p, addr_len);</div><div class='add'>+	ceph_encode_16(p, family);</div><div class='add'>+	ceph_encode_copy(p, addr-&gt;in_addr.__data, addr_len - sizeof(family));</div><div class='add'>+}</div><div class='head'>diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c<br/>index 0a187196aeed..70b25f4ecba6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/messenger.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/messenger.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/messenger.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/messenger.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #endif	/* CONFIG_BLOCK */</div><div class='ctx'> #include &lt;linux/dns_resolver.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;trace/events/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/ceph_features.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/libceph.h&gt;</div><div class='hunk'>@@ -82,71 +83,51 @@</div><div class='ctx'> #define CON_SOCK_STATE_CONNECTED	3	/* -&gt; CLOSING or -&gt; CLOSED */</div><div class='ctx'> #define CON_SOCK_STATE_CLOSING		4	/* -&gt; CLOSED */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * connection states</div><div class='del'>- */</div><div class='del'>-#define CON_STATE_CLOSED        1  /* -&gt; PREOPEN */</div><div class='del'>-#define CON_STATE_PREOPEN       2  /* -&gt; CONNECTING, CLOSED */</div><div class='del'>-#define CON_STATE_CONNECTING    3  /* -&gt; NEGOTIATING, CLOSED */</div><div class='del'>-#define CON_STATE_NEGOTIATING   4  /* -&gt; OPEN, CLOSED */</div><div class='del'>-#define CON_STATE_OPEN          5  /* -&gt; STANDBY, CLOSED */</div><div class='del'>-#define CON_STATE_STANDBY       6  /* -&gt; PREOPEN, CLOSED */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ceph_connection flag bits</div><div class='del'>- */</div><div class='del'>-#define CON_FLAG_LOSSYTX           0  /* we can close channel or drop</div><div class='del'>-				       * messages on errors */</div><div class='del'>-#define CON_FLAG_KEEPALIVE_PENDING 1  /* we need to send a keepalive */</div><div class='del'>-#define CON_FLAG_WRITE_PENDING	   2  /* we have data ready to send */</div><div class='del'>-#define CON_FLAG_SOCK_CLOSED	   3  /* socket state changed to closed */</div><div class='del'>-#define CON_FLAG_BACKOFF           4  /* need to retry queuing delayed work */</div><div class='del'>-</div><div class='ctx'> static bool con_flag_valid(unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	switch (con_flag) {</div><div class='del'>-	case CON_FLAG_LOSSYTX:</div><div class='del'>-	case CON_FLAG_KEEPALIVE_PENDING:</div><div class='del'>-	case CON_FLAG_WRITE_PENDING:</div><div class='del'>-	case CON_FLAG_SOCK_CLOSED:</div><div class='del'>-	case CON_FLAG_BACKOFF:</div><div class='add'>+	case CEPH_CON_F_LOSSYTX:</div><div class='add'>+	case CEPH_CON_F_KEEPALIVE_PENDING:</div><div class='add'>+	case CEPH_CON_F_WRITE_PENDING:</div><div class='add'>+	case CEPH_CON_F_SOCK_CLOSED:</div><div class='add'>+	case CEPH_CON_F_BACKOFF:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void con_flag_clear(struct ceph_connection *con, unsigned long con_flag)</div><div class='add'>+void ceph_con_flag_clear(struct ceph_connection *con, unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!con_flag_valid(con_flag));</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(con_flag, &amp;con-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void con_flag_set(struct ceph_connection *con, unsigned long con_flag)</div><div class='add'>+void ceph_con_flag_set(struct ceph_connection *con, unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!con_flag_valid(con_flag));</div><div class='ctx'> </div><div class='ctx'> 	set_bit(con_flag, &amp;con-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool con_flag_test(struct ceph_connection *con, unsigned long con_flag)</div><div class='add'>+bool ceph_con_flag_test(struct ceph_connection *con, unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!con_flag_valid(con_flag));</div><div class='ctx'> </div><div class='ctx'> 	return test_bit(con_flag, &amp;con-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool con_flag_test_and_clear(struct ceph_connection *con,</div><div class='del'>-					unsigned long con_flag)</div><div class='add'>+bool ceph_con_flag_test_and_clear(struct ceph_connection *con,</div><div class='add'>+				  unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!con_flag_valid(con_flag));</div><div class='ctx'> </div><div class='ctx'> 	return test_and_clear_bit(con_flag, &amp;con-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool con_flag_test_and_set(struct ceph_connection *con,</div><div class='del'>-					unsigned long con_flag)</div><div class='add'>+bool ceph_con_flag_test_and_set(struct ceph_connection *con,</div><div class='add'>+				unsigned long con_flag)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!con_flag_valid(con_flag));</div><div class='ctx'> </div><div class='hunk'>@@ -156,13 +137,6 @@ static bool con_flag_test_and_set(struct ceph_connection *con,</div><div class='ctx'> /* Slab caches for frequently-allocated structures */</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache	*ceph_msg_cache;</div><div class='del'>-static struct kmem_cache	*ceph_msg_data_cache;</div><div class='del'>-</div><div class='del'>-/* static tag bytes (protocol control messages) */</div><div class='del'>-static char tag_msg = CEPH_MSGR_TAG_MSG;</div><div class='del'>-static char tag_ack = CEPH_MSGR_TAG_ACK;</div><div class='del'>-static char tag_keepalive = CEPH_MSGR_TAG_KEEPALIVE;</div><div class='del'>-static char tag_keepalive2 = CEPH_MSGR_TAG_KEEPALIVE2;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='ctx'> static struct lock_class_key socket_class;</div><div class='hunk'>@@ -185,42 +159,48 @@ static void con_fault(struct ceph_connection *con);</div><div class='ctx'> static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];</div><div class='ctx'> static atomic_t addr_str_seq = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='del'>-static struct page *zero_page;		/* used in certain error cases */</div><div class='add'>+struct page *ceph_zero_page;		/* used in certain error cases */</div><div class='ctx'> </div><div class='del'>-const char *ceph_pr_addr(const struct sockaddr_storage *ss)</div><div class='add'>+const char *ceph_pr_addr(const struct ceph_entity_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *s;</div><div class='del'>-	struct sockaddr_in *in4 = (struct sockaddr_in *) ss;</div><div class='del'>-	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;</div><div class='add'>+	struct sockaddr_storage ss = addr-&gt;in_addr; /* align */</div><div class='add'>+	struct sockaddr_in *in4 = (struct sockaddr_in *)&amp;ss;</div><div class='add'>+	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&amp;ss;</div><div class='ctx'> </div><div class='ctx'> 	i = atomic_inc_return(&amp;addr_str_seq) &amp; ADDR_STR_COUNT_MASK;</div><div class='ctx'> 	s = addr_str[i];</div><div class='ctx'> </div><div class='del'>-	switch (ss-&gt;ss_family) {</div><div class='add'>+	switch (ss.ss_family) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		snprintf(s, MAX_ADDR_STR_LEN, "%pI4:%hu", &amp;in4-&gt;sin_addr,</div><div class='add'>+		snprintf(s, MAX_ADDR_STR_LEN, "(%d)%pI4:%hu",</div><div class='add'>+			 le32_to_cpu(addr-&gt;type), &amp;in4-&gt;sin_addr,</div><div class='ctx'> 			 ntohs(in4-&gt;sin_port));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		snprintf(s, MAX_ADDR_STR_LEN, "[%pI6c]:%hu", &amp;in6-&gt;sin6_addr,</div><div class='add'>+		snprintf(s, MAX_ADDR_STR_LEN, "(%d)[%pI6c]:%hu",</div><div class='add'>+			 le32_to_cpu(addr-&gt;type), &amp;in6-&gt;sin6_addr,</div><div class='ctx'> 			 ntohs(in6-&gt;sin6_port));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		snprintf(s, MAX_ADDR_STR_LEN, "(unknown sockaddr family %hu)",</div><div class='del'>-			 ss-&gt;ss_family);</div><div class='add'>+			 ss.ss_family);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_pr_addr);</div><div class='ctx'> </div><div class='del'>-static void encode_my_addr(struct ceph_messenger *msgr)</div><div class='add'>+void ceph_encode_my_addr(struct ceph_messenger *msgr)</div><div class='ctx'> {</div><div class='del'>-	memcpy(&amp;msgr-&gt;my_enc_addr, &amp;msgr-&gt;inst.addr, sizeof(msgr-&gt;my_enc_addr));</div><div class='del'>-	ceph_encode_addr(&amp;msgr-&gt;my_enc_addr);</div><div class='add'>+	if (!ceph_msgr2(from_msgr(msgr))) {</div><div class='add'>+		memcpy(&amp;msgr-&gt;my_enc_addr, &amp;msgr-&gt;inst.addr,</div><div class='add'>+		       sizeof(msgr-&gt;my_enc_addr));</div><div class='add'>+		ceph_encode_banner_addr(&amp;msgr-&gt;my_enc_addr);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -235,23 +215,11 @@ static int ceph_msgr_slab_init(void)</div><div class='ctx'> 	if (!ceph_msg_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(ceph_msg_data_cache);</div><div class='del'>-	ceph_msg_data_cache = KMEM_CACHE(ceph_msg_data, 0);</div><div class='del'>-	if (ceph_msg_data_cache)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	kmem_cache_destroy(ceph_msg_cache);</div><div class='del'>-	ceph_msg_cache = NULL;</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_msgr_slab_exit(void)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(!ceph_msg_data_cache);</div><div class='del'>-	kmem_cache_destroy(ceph_msg_data_cache);</div><div class='del'>-	ceph_msg_data_cache = NULL;</div><div class='del'>-</div><div class='ctx'> 	BUG_ON(!ceph_msg_cache);</div><div class='ctx'> 	kmem_cache_destroy(ceph_msg_cache);</div><div class='ctx'> 	ceph_msg_cache = NULL;</div><div class='hunk'>@@ -264,9 +232,9 @@ static void _ceph_msgr_exit(void)</div><div class='ctx'> 		ceph_msgr_wq = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(zero_page == NULL);</div><div class='del'>-	put_page(zero_page);</div><div class='del'>-	zero_page = NULL;</div><div class='add'>+	BUG_ON(!ceph_zero_page);</div><div class='add'>+	put_page(ceph_zero_page);</div><div class='add'>+	ceph_zero_page = NULL;</div><div class='ctx'> </div><div class='ctx'> 	ceph_msgr_slab_exit();</div><div class='ctx'> }</div><div class='hunk'>@@ -276,15 +244,16 @@ int __init ceph_msgr_init(void)</div><div class='ctx'> 	if (ceph_msgr_slab_init())</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(zero_page != NULL);</div><div class='del'>-	zero_page = ZERO_PAGE(0);</div><div class='del'>-	get_page(zero_page);</div><div class='add'>+	BUG_ON(ceph_zero_page);</div><div class='add'>+	ceph_zero_page = ZERO_PAGE(0);</div><div class='add'>+	get_page(ceph_zero_page);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The number of active work items is limited by the number of</div><div class='ctx'> 	 * connections, so leave @max_active at default.</div><div class='ctx'> 	 */</div><div class='del'>-	ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	ceph_msgr_wq = alloc_workqueue("ceph-msgr",</div><div class='add'>+				       WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (ceph_msgr_wq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -377,12 +346,15 @@ static void con_sock_state_closed(struct ceph_connection *con)</div><div class='ctx'> static void ceph_sock_data_ready(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_connection *con = sk-&gt;sk_user_data;</div><div class='add'>+</div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='ctx'> 	if (atomic_read(&amp;con-&gt;msgr-&gt;stopping)) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_CLOSE_WAIT) {</div><div class='del'>-		dout("%s on %p state = %lu, queueing work\n", __func__,</div><div class='add'>+		dout("%s %p state = %d, queueing work\n", __func__,</div><div class='ctx'> 		     con, con-&gt;state);</div><div class='ctx'> 		queue_con(con);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -400,7 +372,7 @@ static void ceph_sock_write_space(struct sock *sk)</div><div class='ctx'> 	 * buffer. See net/ipv4/tcp_input.c:tcp_check_space()</div><div class='ctx'> 	 * and net/core/stream.c:sk_stream_write_space().</div><div class='ctx'> 	 */</div><div class='del'>-	if (con_flag_test(con, CON_FLAG_WRITE_PENDING)) {</div><div class='add'>+	if (ceph_con_flag_test(con, CEPH_CON_F_WRITE_PENDING)) {</div><div class='ctx'> 		if (sk_stream_is_writeable(sk)) {</div><div class='ctx'> 			dout("%s %p queueing write work\n", __func__, con);</div><div class='ctx'> 			clear_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='hunk'>@@ -416,17 +388,17 @@ static void ceph_sock_state_change(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_connection *con = sk-&gt;sk_user_data;</div><div class='ctx'> </div><div class='del'>-	dout("%s %p state = %lu sk_state = %u\n", __func__,</div><div class='add'>+	dout("%s %p state = %d sk_state = %u\n", __func__,</div><div class='ctx'> 	     con, con-&gt;state, sk-&gt;sk_state);</div><div class='ctx'> </div><div class='ctx'> 	switch (sk-&gt;sk_state) {</div><div class='ctx'> 	case TCP_CLOSE:</div><div class='ctx'> 		dout("%s TCP_CLOSE\n", __func__);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_CLOSE_WAIT:</div><div class='ctx'> 		dout("%s TCP_CLOSE_WAIT\n", __func__);</div><div class='ctx'> 		con_sock_state_closing(con);</div><div class='del'>-		con_flag_set(con, CON_FLAG_SOCK_CLOSED);</div><div class='add'>+		ceph_con_flag_set(con, CEPH_CON_F_SOCK_CLOSED);</div><div class='ctx'> 		queue_con(con);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_ESTABLISHED:</div><div class='hunk'>@@ -460,23 +432,26 @@ static void set_sock_callbacks(struct socket *sock,</div><div class='ctx'> /*</div><div class='ctx'>  * initiate connection to a remote socket.</div><div class='ctx'>  */</div><div class='del'>-static int ceph_tcp_connect(struct ceph_connection *con)</div><div class='add'>+int ceph_tcp_connect(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_storage *paddr = &amp;con-&gt;peer_addr.in_addr;</div><div class='add'>+	struct sockaddr_storage ss = con-&gt;peer_addr.in_addr; /* align */</div><div class='ctx'> 	struct socket *sock;</div><div class='ctx'> 	unsigned int noio_flag;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	dout("%s con %p peer_addr %s\n", __func__, con,</div><div class='add'>+	     ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='ctx'> 	BUG_ON(con-&gt;sock);</div><div class='ctx'> </div><div class='ctx'> 	/* sock_create_kern() allocates with GFP_KERNEL */</div><div class='ctx'> 	noio_flag = memalloc_noio_save();</div><div class='del'>-	ret = sock_create_kern(read_pnet(&amp;con-&gt;msgr-&gt;net), paddr-&gt;ss_family,</div><div class='add'>+	ret = sock_create_kern(read_pnet(&amp;con-&gt;msgr-&gt;net), ss.ss_family,</div><div class='ctx'> 			       SOCK_STREAM, IPPROTO_TCP, &amp;sock);</div><div class='ctx'> 	memalloc_noio_restore(noio_flag);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	sock-&gt;sk-&gt;sk_allocation = GFP_NOFS;</div><div class='add'>+	sock-&gt;sk-&gt;sk_use_task_frag = false;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='ctx'> 	lockdep_set_class(&amp;sock-&gt;sk-&gt;sk_lock, &amp;socket_class);</div><div class='hunk'>@@ -484,145 +459,35 @@ static int ceph_tcp_connect(struct ceph_connection *con)</div><div class='ctx'> </div><div class='ctx'> 	set_sock_callbacks(sock, con);</div><div class='ctx'> </div><div class='del'>-	dout("connect %s\n", ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr));</div><div class='del'>-</div><div class='ctx'> 	con_sock_state_connecting(con);</div><div class='del'>-	ret = sock-&gt;ops-&gt;connect(sock, (struct sockaddr *)paddr, sizeof(*paddr),</div><div class='del'>-				 O_NONBLOCK);</div><div class='add'>+	ret = kernel_connect(sock, (struct sockaddr_unsized *)&amp;ss, sizeof(ss),</div><div class='add'>+			     O_NONBLOCK);</div><div class='ctx'> 	if (ret == -EINPROGRESS) {</div><div class='ctx'> 		dout("connect %s EINPROGRESS sk_state = %u\n",</div><div class='del'>-		     ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='add'>+		     ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='ctx'> 		     sock-&gt;sk-&gt;sk_state);</div><div class='ctx'> 	} else if (ret &lt; 0) {</div><div class='ctx'> 		pr_err("connect %s error %d\n",</div><div class='del'>-		       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr), ret);</div><div class='add'>+		       ceph_pr_addr(&amp;con-&gt;peer_addr), ret);</div><div class='ctx'> 		sock_release(sock);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ceph_test_opt(from_msgr(con-&gt;msgr), TCP_NODELAY)) {</div><div class='del'>-		int optval = 1;</div><div class='del'>-</div><div class='del'>-		ret = kernel_setsockopt(sock, SOL_TCP, TCP_NODELAY,</div><div class='del'>-					(char *)&amp;optval, sizeof(optval));</div><div class='del'>-		if (ret)</div><div class='del'>-			pr_err("kernel_setsockopt(TCP_NODELAY) failed: %d",</div><div class='del'>-			       ret);</div><div class='del'>-	}</div><div class='add'>+	if (ceph_test_opt(from_msgr(con-&gt;msgr), TCP_NODELAY))</div><div class='add'>+		tcp_sock_set_nodelay(sock-&gt;sk);</div><div class='ctx'> </div><div class='ctx'> 	con-&gt;sock = sock;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If @buf is NULL, discard up to @len bytes.</div><div class='del'>- */</div><div class='del'>-static int ceph_tcp_recvmsg(struct socket *sock, void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct kvec iov = {buf, len};</div><div class='del'>-	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	if (!buf)</div><div class='del'>-		msg.msg_flags |= MSG_TRUNC;</div><div class='del'>-</div><div class='del'>-	iov_iter_kvec(&amp;msg.msg_iter, READ | ITER_KVEC, &amp;iov, 1, len);</div><div class='del'>-	r = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='del'>-	if (r == -EAGAIN)</div><div class='del'>-		r = 0;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ceph_tcp_recvpage(struct socket *sock, struct page *page,</div><div class='del'>-		     int page_offset, size_t length)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bvec = {</div><div class='del'>-		.bv_page = page,</div><div class='del'>-		.bv_offset = page_offset,</div><div class='del'>-		.bv_len = length</div><div class='del'>-	};</div><div class='del'>-	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	BUG_ON(page_offset + length &gt; PAGE_SIZE);</div><div class='del'>-	iov_iter_bvec(&amp;msg.msg_iter, READ | ITER_BVEC, &amp;bvec, 1, length);</div><div class='del'>-	r = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='del'>-	if (r == -EAGAIN)</div><div class='del'>-		r = 0;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write something.  @more is true if caller will be sending more data</div><div class='del'>- * shortly.</div><div class='del'>- */</div><div class='del'>-static int ceph_tcp_sendmsg(struct socket *sock, struct kvec *iov,</div><div class='del'>-		     size_t kvlen, size_t len, int more)</div><div class='del'>-{</div><div class='del'>-	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	if (more)</div><div class='del'>-		msg.msg_flags |= MSG_MORE;</div><div class='del'>-	else</div><div class='del'>-		msg.msg_flags |= MSG_EOR;  /* superfluous, but what the hell */</div><div class='del'>-</div><div class='del'>-	r = kernel_sendmsg(sock, &amp;msg, iov, kvlen, len);</div><div class='del'>-	if (r == -EAGAIN)</div><div class='del'>-		r = 0;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __ceph_tcp_sendpage(struct socket *sock, struct page *page,</div><div class='del'>-		     int offset, size_t size, bool more)</div><div class='del'>-{</div><div class='del'>-	int flags = MSG_DONTWAIT | MSG_NOSIGNAL | (more ? MSG_MORE : MSG_EOR);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = kernel_sendpage(sock, page, offset, size, flags);</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ceph_tcp_sendpage(struct socket *sock, struct page *page,</div><div class='del'>-		     int offset, size_t size, bool more)</div><div class='del'>-{</div><div class='del'>-	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* sendpage cannot properly handle pages with page_count == 0,</div><div class='del'>-	 * we need to fallback to sendmsg if that's the case */</div><div class='del'>-	if (page_count(page) &gt;= 1)</div><div class='del'>-		return __ceph_tcp_sendpage(sock, page, offset, size, more);</div><div class='del'>-</div><div class='del'>-	bvec.bv_page = page;</div><div class='del'>-	bvec.bv_offset = offset;</div><div class='del'>-	bvec.bv_len = size;</div><div class='del'>-</div><div class='del'>-	if (more)</div><div class='del'>-		msg.msg_flags |= MSG_MORE;</div><div class='del'>-	else</div><div class='del'>-		msg.msg_flags |= MSG_EOR;  /* superfluous, but what the hell */</div><div class='del'>-</div><div class='del'>-	iov_iter_bvec(&amp;msg.msg_iter, WRITE | ITER_BVEC, &amp;bvec, 1, size);</div><div class='del'>-	ret = sock_sendmsg(sock, &amp;msg);</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Shutdown/close the socket for the given connection.</div><div class='ctx'>  */</div><div class='del'>-static int con_close_socket(struct ceph_connection *con)</div><div class='add'>+int ceph_con_close_socket(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	dout("con_close_socket on %p sock %p\n", con, con-&gt;sock);</div><div class='add'>+	dout("%s con %p sock %p\n", __func__, con, con-&gt;sock);</div><div class='ctx'> 	if (con-&gt;sock) {</div><div class='ctx'> 		rc = con-&gt;sock-&gt;ops-&gt;shutdown(con-&gt;sock, SHUT_RDWR);</div><div class='ctx'> 		sock_release(con-&gt;sock);</div><div class='hunk'>@@ -635,12 +500,38 @@ static int con_close_socket(struct ceph_connection *con)</div><div class='ctx'> 	 * received a socket close event before we had the chance to</div><div class='ctx'> 	 * shut the socket down.</div><div class='ctx'> 	 */</div><div class='del'>-	con_flag_clear(con, CON_FLAG_SOCK_CLOSED);</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_SOCK_CLOSED);</div><div class='ctx'> </div><div class='ctx'> 	con_sock_state_closed(con);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ceph_con_reset_protocol(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p\n", __func__, con);</div><div class='add'>+</div><div class='add'>+	ceph_con_close_socket(con);</div><div class='add'>+	if (con-&gt;in_msg) {</div><div class='add'>+		WARN_ON(con-&gt;in_msg-&gt;con != con);</div><div class='add'>+		ceph_msg_put(con-&gt;in_msg);</div><div class='add'>+		con-&gt;in_msg = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;out_msg) {</div><div class='add'>+		WARN_ON(con-&gt;out_msg-&gt;con != con);</div><div class='add'>+		ceph_msg_put(con-&gt;out_msg);</div><div class='add'>+		con-&gt;out_msg = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;bounce_page) {</div><div class='add'>+		__free_page(con-&gt;bounce_page);</div><div class='add'>+		con-&gt;bounce_page = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+		ceph_con_v2_reset_protocol(con);</div><div class='add'>+	else</div><div class='add'>+		ceph_con_v1_reset_protocol(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reset a connection.  Discard all incoming and outgoing messages</div><div class='ctx'>  * and clear *_seq state.</div><div class='hunk'>@@ -651,6 +542,7 @@ static void ceph_msg_remove(struct ceph_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	ceph_msg_put(msg);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void ceph_msg_remove_list(struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	while (!list_empty(head)) {</div><div class='hunk'>@@ -660,31 +552,22 @@ static void ceph_msg_remove_list(struct list_head *head)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reset_connection(struct ceph_connection *con)</div><div class='add'>+void ceph_con_reset_session(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='del'>-	/* reset connection, out_queue, msg_ and connect_seq */</div><div class='del'>-	/* discard existing out_queue and msg_seq */</div><div class='del'>-	dout("reset_connection %p\n", con);</div><div class='add'>+	dout("%s con %p\n", __func__, con);</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;in_msg);</div><div class='add'>+	WARN_ON(con-&gt;out_msg);</div><div class='ctx'> 	ceph_msg_remove_list(&amp;con-&gt;out_queue);</div><div class='ctx'> 	ceph_msg_remove_list(&amp;con-&gt;out_sent);</div><div class='del'>-</div><div class='del'>-	if (con-&gt;in_msg) {</div><div class='del'>-		BUG_ON(con-&gt;in_msg-&gt;con != con);</div><div class='del'>-		ceph_msg_put(con-&gt;in_msg);</div><div class='del'>-		con-&gt;in_msg = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	con-&gt;connect_seq = 0;</div><div class='ctx'> 	con-&gt;out_seq = 0;</div><div class='del'>-	if (con-&gt;out_msg) {</div><div class='del'>-		BUG_ON(con-&gt;out_msg-&gt;con != con);</div><div class='del'>-		ceph_msg_put(con-&gt;out_msg);</div><div class='del'>-		con-&gt;out_msg = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	con-&gt;in_seq = 0;</div><div class='ctx'> 	con-&gt;in_seq_acked = 0;</div><div class='ctx'> </div><div class='del'>-	con-&gt;out_skip = 0;</div><div class='add'>+	if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+		ceph_con_v2_reset_session(con);</div><div class='add'>+	else</div><div class='add'>+		ceph_con_v1_reset_session(con);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -693,19 +576,18 @@ static void reset_connection(struct ceph_connection *con)</div><div class='ctx'> void ceph_con_close(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='del'>-	dout("con_close %p peer %s\n", con,</div><div class='del'>-	     ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr));</div><div class='del'>-	con-&gt;state = CON_STATE_CLOSED;</div><div class='add'>+	dout("con_close %p peer %s\n", con, ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='add'>+	con-&gt;state = CEPH_CON_S_CLOSED;</div><div class='ctx'> </div><div class='del'>-	con_flag_clear(con, CON_FLAG_LOSSYTX);	/* so we retry next connect */</div><div class='del'>-	con_flag_clear(con, CON_FLAG_KEEPALIVE_PENDING);</div><div class='del'>-	con_flag_clear(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-	con_flag_clear(con, CON_FLAG_BACKOFF);</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_LOSSYTX);  /* so we retry next</div><div class='add'>+							  connect */</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_KEEPALIVE_PENDING);</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_BACKOFF);</div><div class='ctx'> </div><div class='del'>-	reset_connection(con);</div><div class='del'>-	con-&gt;peer_global_seq = 0;</div><div class='add'>+	ceph_con_reset_protocol(con);</div><div class='add'>+	ceph_con_reset_session(con);</div><div class='ctx'> 	cancel_con(con);</div><div class='del'>-	con_close_socket(con);</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_con_close);</div><div class='hunk'>@@ -718,10 +600,10 @@ void ceph_con_open(struct ceph_connection *con,</div><div class='ctx'> 		   struct ceph_entity_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='del'>-	dout("con_open %p %s\n", con, ceph_pr_addr(&amp;addr-&gt;in_addr));</div><div class='add'>+	dout("con_open %p %s\n", con, ceph_pr_addr(addr));</div><div class='ctx'> </div><div class='del'>-	WARN_ON(con-&gt;state != CON_STATE_CLOSED);</div><div class='del'>-	con-&gt;state = CON_STATE_PREOPEN;</div><div class='add'>+	WARN_ON(con-&gt;state != CEPH_CON_S_CLOSED);</div><div class='add'>+	con-&gt;state = CEPH_CON_S_PREOPEN;</div><div class='ctx'> </div><div class='ctx'> 	con-&gt;peer_name.type = (__u8) entity_type;</div><div class='ctx'> 	con-&gt;peer_name.num = cpu_to_le64(entity_num);</div><div class='hunk'>@@ -738,7 +620,10 @@ EXPORT_SYMBOL(ceph_con_open);</div><div class='ctx'>  */</div><div class='ctx'> bool ceph_con_opened(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='del'>-	return con-&gt;connect_seq &gt; 0;</div><div class='add'>+	if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+		return ceph_con_v2_opened(con);</div><div class='add'>+</div><div class='add'>+	return ceph_con_v1_opened(con);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -761,16 +646,15 @@ void ceph_con_init(struct ceph_connection *con, void *private,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;con-&gt;out_sent);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;con-&gt;work, ceph_con_workfn);</div><div class='ctx'> </div><div class='del'>-	con-&gt;state = CON_STATE_CLOSED;</div><div class='add'>+	con-&gt;state = CEPH_CON_S_CLOSED;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_con_init);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * We maintain a global counter to order connection attempts.  Get</div><div class='ctx'>  * a unique seq greater than @gt.</div><div class='ctx'>  */</div><div class='del'>-static u32 get_global_seq(struct ceph_messenger *msgr, u32 gt)</div><div class='add'>+u32 ceph_get_global_seq(struct ceph_messenger *msgr, u32 gt)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ret;</div><div class='ctx'> </div><div class='hunk'>@@ -782,48 +666,53 @@ static u32 get_global_seq(struct ceph_messenger *msgr, u32 gt)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void con_out_kvec_reset(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(con-&gt;out_skip);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_kvec_left = 0;</div><div class='del'>-	con-&gt;out_kvec_bytes = 0;</div><div class='del'>-	con-&gt;out_kvec_cur = &amp;con-&gt;out_kvec[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void con_out_kvec_add(struct ceph_connection *con,</div><div class='del'>-				size_t size, void *data)</div><div class='add'>+/*</div><div class='add'>+ * Discard messages that have been acked by the server.</div><div class='add'>+ */</div><div class='add'>+void ceph_con_discard_sent(struct ceph_connection *con, u64 ack_seq)</div><div class='ctx'> {</div><div class='del'>-	int index = con-&gt;out_kvec_left;</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+	u64 seq;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(con-&gt;out_skip);</div><div class='del'>-	BUG_ON(index &gt;= ARRAY_SIZE(con-&gt;out_kvec));</div><div class='add'>+	dout("%s con %p ack_seq %llu\n", __func__, con, ack_seq);</div><div class='add'>+	while (!list_empty(&amp;con-&gt;out_sent)) {</div><div class='add'>+		msg = list_first_entry(&amp;con-&gt;out_sent, struct ceph_msg,</div><div class='add'>+				       list_head);</div><div class='add'>+		WARN_ON(msg-&gt;needs_out_seq);</div><div class='add'>+		seq = le64_to_cpu(msg-&gt;hdr.seq);</div><div class='add'>+		if (seq &gt; ack_seq)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	con-&gt;out_kvec[index].iov_len = size;</div><div class='del'>-	con-&gt;out_kvec[index].iov_base = data;</div><div class='del'>-	con-&gt;out_kvec_left++;</div><div class='del'>-	con-&gt;out_kvec_bytes += size;</div><div class='add'>+		dout("%s con %p discarding msg %p seq %llu\n", __func__, con,</div><div class='add'>+		     msg, seq);</div><div class='add'>+		ceph_msg_remove(msg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Chop off a kvec from the end.  Return residual number of bytes for</div><div class='del'>- * that kvec, i.e. how many bytes would have been written if the kvec</div><div class='del'>- * hadn't been nuked.</div><div class='add'>+ * Discard messages that have been requeued in con_fault(), up to</div><div class='add'>+ * reconnect_seq.  This avoids gratuitously resending messages that</div><div class='add'>+ * the server had received and handled prior to reconnect.</div><div class='ctx'>  */</div><div class='del'>-static int con_out_kvec_skip(struct ceph_connection *con)</div><div class='add'>+void ceph_con_discard_requeued(struct ceph_connection *con, u64 reconnect_seq)</div><div class='ctx'> {</div><div class='del'>-	int off = con-&gt;out_kvec_cur - con-&gt;out_kvec;</div><div class='del'>-	int skip = 0;</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+	u64 seq;</div><div class='ctx'> </div><div class='del'>-	if (con-&gt;out_kvec_bytes &gt; 0) {</div><div class='del'>-		skip = con-&gt;out_kvec[off + con-&gt;out_kvec_left - 1].iov_len;</div><div class='del'>-		BUG_ON(con-&gt;out_kvec_bytes &lt; skip);</div><div class='del'>-		BUG_ON(!con-&gt;out_kvec_left);</div><div class='del'>-		con-&gt;out_kvec_bytes -= skip;</div><div class='del'>-		con-&gt;out_kvec_left--;</div><div class='del'>-	}</div><div class='add'>+	dout("%s con %p reconnect_seq %llu\n", __func__, con, reconnect_seq);</div><div class='add'>+	while (!list_empty(&amp;con-&gt;out_queue)) {</div><div class='add'>+		msg = list_first_entry(&amp;con-&gt;out_queue, struct ceph_msg,</div><div class='add'>+				       list_head);</div><div class='add'>+		if (msg-&gt;needs_out_seq)</div><div class='add'>+			break;</div><div class='add'>+		seq = le64_to_cpu(msg-&gt;hdr.seq);</div><div class='add'>+		if (seq &gt; reconnect_seq)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	return skip;</div><div class='add'>+		dout("%s con %p discarding msg %p seq %llu\n", __func__, con,</div><div class='add'>+		     msg, seq);</div><div class='add'>+		ceph_msg_remove(msg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='hunk'>@@ -845,7 +734,6 @@ static void ceph_msg_data_bio_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 		it-&gt;iter.bi_size = cursor-&gt;resid;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(cursor-&gt;resid &lt; bio_iter_len(it-&gt;bio, it-&gt;iter));</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;resid == bio_iter_len(it-&gt;bio, it-&gt;iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *ceph_msg_data_bio_next(struct ceph_msg_data_cursor *cursor,</div><div class='hunk'>@@ -864,18 +752,18 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 					size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_bio_iter *it = &amp;cursor-&gt;bio_iter;</div><div class='add'>+	struct page *page = bio_iter_page(it-&gt;bio, it-&gt;iter);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(bytes &gt; cursor-&gt;resid);</div><div class='ctx'> 	BUG_ON(bytes &gt; bio_iter_len(it-&gt;bio, it-&gt;iter));</div><div class='ctx'> 	cursor-&gt;resid -= bytes;</div><div class='ctx'> 	bio_advance_iter(it-&gt;bio, &amp;it-&gt;iter, bytes);</div><div class='ctx'> </div><div class='del'>-	if (!cursor-&gt;resid) {</div><div class='del'>-		BUG_ON(!cursor-&gt;last_piece);</div><div class='add'>+	if (!cursor-&gt;resid)</div><div class='ctx'> 		return false;   /* no more data */</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!bytes || (it-&gt;iter.bi_size &amp;&amp; it-&gt;iter.bi_bvec_done))</div><div class='add'>+	if (!bytes || (it-&gt;iter.bi_size &amp;&amp; it-&gt;iter.bi_bvec_done &amp;&amp;</div><div class='add'>+		       page == bio_iter_page(it-&gt;bio, it-&gt;iter)))</div><div class='ctx'> 		return false;	/* more bytes to process in this segment */</div><div class='ctx'> </div><div class='ctx'> 	if (!it-&gt;iter.bi_size) {</div><div class='hunk'>@@ -885,9 +773,7 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 			it-&gt;iter.bi_size = cursor-&gt;resid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(cursor-&gt;last_piece);</div><div class='ctx'> 	BUG_ON(cursor-&gt;resid &lt; bio_iter_len(it-&gt;bio, it-&gt;iter));</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;resid == bio_iter_len(it-&gt;bio, it-&gt;iter);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_BLOCK */</div><div class='hunk'>@@ -903,8 +789,6 @@ static void ceph_msg_data_bvecs_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	cursor-&gt;bvec_iter.bi_size = cursor-&gt;resid;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(cursor-&gt;resid &lt; bvec_iter_len(bvecs, cursor-&gt;bvec_iter));</div><div class='del'>-	cursor-&gt;last_piece =</div><div class='del'>-	    cursor-&gt;resid == bvec_iter_len(bvecs, cursor-&gt;bvec_iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *ceph_msg_data_bvecs_next(struct ceph_msg_data_cursor *cursor,</div><div class='hunk'>@@ -923,24 +807,21 @@ static bool ceph_msg_data_bvecs_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 					size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec *bvecs = cursor-&gt;data-&gt;bvec_pos.bvecs;</div><div class='add'>+	struct page *page = bvec_iter_page(bvecs, cursor-&gt;bvec_iter);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(bytes &gt; cursor-&gt;resid);</div><div class='ctx'> 	BUG_ON(bytes &gt; bvec_iter_len(bvecs, cursor-&gt;bvec_iter));</div><div class='ctx'> 	cursor-&gt;resid -= bytes;</div><div class='ctx'> 	bvec_iter_advance(bvecs, &amp;cursor-&gt;bvec_iter, bytes);</div><div class='ctx'> </div><div class='del'>-	if (!cursor-&gt;resid) {</div><div class='del'>-		BUG_ON(!cursor-&gt;last_piece);</div><div class='add'>+	if (!cursor-&gt;resid)</div><div class='ctx'> 		return false;   /* no more data */</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!bytes || cursor-&gt;bvec_iter.bi_bvec_done)</div><div class='add'>+	if (!bytes || (cursor-&gt;bvec_iter.bi_bvec_done &amp;&amp;</div><div class='add'>+		       page == bvec_iter_page(bvecs, cursor-&gt;bvec_iter)))</div><div class='ctx'> 		return false;	/* more bytes to process in this segment */</div><div class='ctx'> </div><div class='del'>-	BUG_ON(cursor-&gt;last_piece);</div><div class='ctx'> 	BUG_ON(cursor-&gt;resid &lt; bvec_iter_len(bvecs, cursor-&gt;bvec_iter));</div><div class='del'>-	cursor-&gt;last_piece =</div><div class='del'>-	    cursor-&gt;resid == bvec_iter_len(bvecs, cursor-&gt;bvec_iter);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -966,7 +847,6 @@ static void ceph_msg_data_pages_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	BUG_ON(page_count &gt; (int)USHRT_MAX);</div><div class='ctx'> 	cursor-&gt;page_count = (unsigned short)page_count;</div><div class='ctx'> 	BUG_ON(length &gt; SIZE_MAX - cursor-&gt;page_offset);</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;page_offset + cursor-&gt;resid &lt;= PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *</div><div class='hunk'>@@ -981,11 +861,7 @@ ceph_msg_data_pages_next(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	BUG_ON(cursor-&gt;page_offset &gt;= PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	*page_offset = cursor-&gt;page_offset;</div><div class='del'>-	if (cursor-&gt;last_piece)</div><div class='del'>-		*length = cursor-&gt;resid;</div><div class='del'>-	else</div><div class='del'>-		*length = PAGE_SIZE - *page_offset;</div><div class='del'>-</div><div class='add'>+	*length = min_t(size_t, cursor-&gt;resid, PAGE_SIZE - *page_offset);</div><div class='ctx'> 	return data-&gt;pages[cursor-&gt;page_index];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1010,8 +886,6 @@ static bool ceph_msg_data_pages_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(cursor-&gt;page_index &gt;= cursor-&gt;page_count);</div><div class='ctx'> 	cursor-&gt;page_index++;</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;resid &lt;= PAGE_SIZE;</div><div class='del'>-</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +915,6 @@ ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	cursor-&gt;resid = min(length, pagelist-&gt;length);</div><div class='ctx'> 	cursor-&gt;page = page;</div><div class='ctx'> 	cursor-&gt;offset = 0;</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;resid &lt;= PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *</div><div class='hunk'>@@ -1061,11 +934,7 @@ ceph_msg_data_pagelist_next(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> </div><div class='ctx'> 	/* offset of first page in pagelist is always 0 */</div><div class='ctx'> 	*page_offset = cursor-&gt;offset &amp; ~PAGE_MASK;</div><div class='del'>-	if (cursor-&gt;last_piece)</div><div class='del'>-		*length = cursor-&gt;resid;</div><div class='del'>-	else</div><div class='del'>-		*length = PAGE_SIZE - *page_offset;</div><div class='del'>-</div><div class='add'>+	*length = min_t(size_t, cursor-&gt;resid, PAGE_SIZE - *page_offset);</div><div class='ctx'> 	return cursor-&gt;page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1098,11 +967,65 @@ static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(list_is_last(&amp;cursor-&gt;page-&gt;lru, &amp;pagelist-&gt;head));</div><div class='ctx'> 	cursor-&gt;page = list_next_entry(cursor-&gt;page, lru);</div><div class='del'>-	cursor-&gt;last_piece = cursor-&gt;resid &lt;= PAGE_SIZE;</div><div class='del'>-</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ceph_msg_data_iter_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+					   size_t length)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data *data = cursor-&gt;data;</div><div class='add'>+</div><div class='add'>+	cursor-&gt;iov_iter = data-&gt;iter;</div><div class='add'>+	cursor-&gt;lastlen = 0;</div><div class='add'>+	iov_iter_truncate(&amp;cursor-&gt;iov_iter, length);</div><div class='add'>+	cursor-&gt;resid = iov_iter_count(&amp;cursor-&gt;iov_iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct page *ceph_msg_data_iter_next(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+					    size_t *page_offset, size_t *length)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	ssize_t len;</div><div class='add'>+</div><div class='add'>+	if (cursor-&gt;lastlen)</div><div class='add'>+		iov_iter_revert(&amp;cursor-&gt;iov_iter, cursor-&gt;lastlen);</div><div class='add'>+</div><div class='add'>+	len = iov_iter_get_pages2(&amp;cursor-&gt;iov_iter, &amp;page, PAGE_SIZE,</div><div class='add'>+				  1, page_offset);</div><div class='add'>+	BUG_ON(len &lt; 0);</div><div class='add'>+</div><div class='add'>+	cursor-&gt;lastlen = len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: The assumption is that the pages represented by the iov_iter</div><div class='add'>+	 *	  are pinned, with the references held by the upper-level</div><div class='add'>+	 *	  callers, or by virtue of being under writeback. Eventually,</div><div class='add'>+	 *	  we'll get an iov_iter_get_pages2 variant that doesn't take</div><div class='add'>+	 *	  page refs. Until then, just put the page ref.</div><div class='add'>+	 */</div><div class='add'>+	VM_BUG_ON_PAGE(!PageWriteback(page) &amp;&amp; page_count(page) &lt; 2, page);</div><div class='add'>+	put_page(page);</div><div class='add'>+</div><div class='add'>+	*length = min_t(size_t, len, cursor-&gt;resid);</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ceph_msg_data_iter_advance(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+				       size_t bytes)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(bytes &gt; cursor-&gt;resid);</div><div class='add'>+	cursor-&gt;resid -= bytes;</div><div class='add'>+</div><div class='add'>+	if (bytes &lt; cursor-&gt;lastlen) {</div><div class='add'>+		cursor-&gt;lastlen -= bytes;</div><div class='add'>+	} else {</div><div class='add'>+		iov_iter_advance(&amp;cursor-&gt;iov_iter, bytes - cursor-&gt;lastlen);</div><div class='add'>+		cursor-&gt;lastlen = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cursor-&gt;resid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Message data is handled (sent or received) in pieces, where each</div><div class='ctx'>  * piece resides on a single page.  The network layer might not</div><div class='hunk'>@@ -1130,6 +1053,9 @@ static void __ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor)</div><div class='ctx'> 	case CEPH_MSG_DATA_BVECS:</div><div class='ctx'> 		ceph_msg_data_bvecs_cursor_init(cursor, length);</div><div class='ctx'> 		break;</div><div class='add'>+	case CEPH_MSG_DATA_ITER:</div><div class='add'>+		ceph_msg_data_iter_cursor_init(cursor, length);</div><div class='add'>+		break;</div><div class='ctx'> 	case CEPH_MSG_DATA_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* BUG(); */</div><div class='hunk'>@@ -1138,19 +1064,16 @@ static void __ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor)</div><div class='ctx'> 	cursor-&gt;need_crc = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ceph_msg_data_cursor_init(struct ceph_msg *msg, size_t length)</div><div class='add'>+void ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+			       struct ceph_msg *msg, size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_msg_data_cursor *cursor = &amp;msg-&gt;cursor;</div><div class='del'>-	struct ceph_msg_data *data;</div><div class='del'>-</div><div class='ctx'> 	BUG_ON(!length);</div><div class='ctx'> 	BUG_ON(length &gt; msg-&gt;data_length);</div><div class='del'>-	BUG_ON(list_empty(&amp;msg-&gt;data));</div><div class='add'>+	BUG_ON(!msg-&gt;num_data_items);</div><div class='ctx'> </div><div class='del'>-	cursor-&gt;data_head = &amp;msg-&gt;data;</div><div class='ctx'> 	cursor-&gt;total_resid = length;</div><div class='del'>-	data = list_first_entry(&amp;msg-&gt;data, struct ceph_msg_data, links);</div><div class='del'>-	cursor-&gt;data = data;</div><div class='add'>+	cursor-&gt;data = msg-&gt;data;</div><div class='add'>+	cursor-&gt;sr_resid = 0;</div><div class='ctx'> </div><div class='ctx'> 	__ceph_msg_data_cursor_init(cursor);</div><div class='ctx'> }</div><div class='hunk'>@@ -1160,9 +1083,8 @@ static void ceph_msg_data_cursor_init(struct ceph_msg *msg, size_t length)</div><div class='ctx'>  * data item, and supply the page offset and length of that piece.</div><div class='ctx'>  * Indicate whether this is the last piece in this data item.</div><div class='ctx'>  */</div><div class='del'>-static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,</div><div class='del'>-					size_t *page_offset, size_t *length,</div><div class='del'>-					bool *last_piece)</div><div class='add'>+struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+				size_t *page_offset, size_t *length)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='hunk'>@@ -1181,6 +1103,9 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	case CEPH_MSG_DATA_BVECS:</div><div class='ctx'> 		page = ceph_msg_data_bvecs_next(cursor, page_offset, length);</div><div class='ctx'> 		break;</div><div class='add'>+	case CEPH_MSG_DATA_ITER:</div><div class='add'>+		page = ceph_msg_data_iter_next(cursor, page_offset, length);</div><div class='add'>+		break;</div><div class='ctx'> 	case CEPH_MSG_DATA_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		page = NULL;</div><div class='hunk'>@@ -1191,8 +1116,6 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	BUG_ON(*page_offset + *length &gt; PAGE_SIZE);</div><div class='ctx'> 	BUG_ON(!*length);</div><div class='ctx'> 	BUG_ON(*length &gt; cursor-&gt;resid);</div><div class='del'>-	if (last_piece)</div><div class='del'>-		*last_piece = cursor-&gt;last_piece;</div><div class='ctx'> </div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='hunk'>@@ -1201,8 +1124,7 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'>  * Returns true if the result moves the cursor on to the next piece</div><div class='ctx'>  * of the data item.</div><div class='ctx'>  */</div><div class='del'>-static void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,</div><div class='del'>-				  size_t bytes)</div><div class='add'>+void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	bool new_piece;</div><div class='ctx'> </div><div class='hunk'>@@ -1222,6 +1144,9 @@ static void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	case CEPH_MSG_DATA_BVECS:</div><div class='ctx'> 		new_piece = ceph_msg_data_bvecs_advance(cursor, bytes);</div><div class='ctx'> 		break;</div><div class='add'>+	case CEPH_MSG_DATA_ITER:</div><div class='add'>+		new_piece = ceph_msg_data_iter_advance(cursor, bytes);</div><div class='add'>+		break;</div><div class='ctx'> 	case CEPH_MSG_DATA_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -1230,340 +1155,15 @@ static void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,</div><div class='ctx'> 	cursor-&gt;total_resid -= bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (!cursor-&gt;resid &amp;&amp; cursor-&gt;total_resid) {</div><div class='del'>-		WARN_ON(!cursor-&gt;last_piece);</div><div class='del'>-		BUG_ON(list_is_last(&amp;cursor-&gt;data-&gt;links, cursor-&gt;data_head));</div><div class='del'>-		cursor-&gt;data = list_next_entry(cursor-&gt;data, links);</div><div class='add'>+		cursor-&gt;data++;</div><div class='ctx'> 		__ceph_msg_data_cursor_init(cursor);</div><div class='ctx'> 		new_piece = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	cursor-&gt;need_crc = new_piece;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t sizeof_footer(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	return (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH) ?</div><div class='del'>-	    sizeof(struct ceph_msg_footer) :</div><div class='del'>-	    sizeof(struct ceph_msg_footer_old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_message_data(struct ceph_msg *msg, u32 data_len)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!msg);</div><div class='del'>-	BUG_ON(!data_len);</div><div class='del'>-</div><div class='del'>-	/* Initialize data cursor */</div><div class='del'>-</div><div class='del'>-	ceph_msg_data_cursor_init(msg, (size_t)data_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare footer for currently outgoing message, and finish things</div><div class='del'>- * off.  Assumes out_kvec* are already valid.. we just add on to the end.</div><div class='del'>- */</div><div class='del'>-static void prepare_write_message_footer(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *m = con-&gt;out_msg;</div><div class='del'>-</div><div class='del'>-	m-&gt;footer.flags |= CEPH_MSG_FOOTER_COMPLETE;</div><div class='del'>-</div><div class='del'>-	dout("prepare_write_message_footer %p\n", con);</div><div class='del'>-	con_out_kvec_add(con, sizeof_footer(con), &amp;m-&gt;footer);</div><div class='del'>-	if (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH) {</div><div class='del'>-		if (con-&gt;ops-&gt;sign_message)</div><div class='del'>-			con-&gt;ops-&gt;sign_message(m);</div><div class='del'>-		else</div><div class='del'>-			m-&gt;footer.sig = 0;</div><div class='del'>-	} else {</div><div class='del'>-		m-&gt;old_footer.flags = m-&gt;footer.flags;</div><div class='del'>-	}</div><div class='del'>-	con-&gt;out_more = m-&gt;more_to_follow;</div><div class='del'>-	con-&gt;out_msg_done = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare headers for the next outgoing message.</div><div class='del'>- */</div><div class='del'>-static void prepare_write_message(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *m;</div><div class='del'>-	u32 crc;</div><div class='del'>-</div><div class='del'>-	con_out_kvec_reset(con);</div><div class='del'>-	con-&gt;out_msg_done = false;</div><div class='del'>-</div><div class='del'>-	/* Sneak an ack in there first?  If we can get it into the same</div><div class='del'>-	 * TCP packet that's a good thing. */</div><div class='del'>-	if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='del'>-		con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='del'>-		con_out_kvec_add(con, sizeof (tag_ack), &amp;tag_ack);</div><div class='del'>-		con-&gt;out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='del'>-		con_out_kvec_add(con, sizeof (con-&gt;out_temp_ack),</div><div class='del'>-			&amp;con-&gt;out_temp_ack);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(list_empty(&amp;con-&gt;out_queue));</div><div class='del'>-	m = list_first_entry(&amp;con-&gt;out_queue, struct ceph_msg, list_head);</div><div class='del'>-	con-&gt;out_msg = m;</div><div class='del'>-	BUG_ON(m-&gt;con != con);</div><div class='del'>-</div><div class='del'>-	/* put message on sent list */</div><div class='del'>-	ceph_msg_get(m);</div><div class='del'>-	list_move_tail(&amp;m-&gt;list_head, &amp;con-&gt;out_sent);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * only assign outgoing seq # if we haven't sent this message</div><div class='del'>-	 * yet.  if it is requeued, resend with it's original seq.</div><div class='del'>-	 */</div><div class='del'>-	if (m-&gt;needs_out_seq) {</div><div class='del'>-		m-&gt;hdr.seq = cpu_to_le64(++con-&gt;out_seq);</div><div class='del'>-		m-&gt;needs_out_seq = false;</div><div class='del'>-</div><div class='del'>-		if (con-&gt;ops-&gt;reencode_message)</div><div class='del'>-			con-&gt;ops-&gt;reencode_message(m);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("prepare_write_message %p seq %lld type %d len %d+%d+%zd\n",</div><div class='del'>-	     m, con-&gt;out_seq, le16_to_cpu(m-&gt;hdr.type),</div><div class='del'>-	     le32_to_cpu(m-&gt;hdr.front_len), le32_to_cpu(m-&gt;hdr.middle_len),</div><div class='del'>-	     m-&gt;data_length);</div><div class='del'>-	WARN_ON(m-&gt;front.iov_len != le32_to_cpu(m-&gt;hdr.front_len));</div><div class='del'>-	WARN_ON(m-&gt;data_length != le32_to_cpu(m-&gt;hdr.data_len));</div><div class='del'>-</div><div class='del'>-	/* tag + hdr + front + middle */</div><div class='del'>-	con_out_kvec_add(con, sizeof (tag_msg), &amp;tag_msg);</div><div class='del'>-	con_out_kvec_add(con, sizeof(con-&gt;out_hdr), &amp;con-&gt;out_hdr);</div><div class='del'>-	con_out_kvec_add(con, m-&gt;front.iov_len, m-&gt;front.iov_base);</div><div class='del'>-</div><div class='del'>-	if (m-&gt;middle)</div><div class='del'>-		con_out_kvec_add(con, m-&gt;middle-&gt;vec.iov_len,</div><div class='del'>-			m-&gt;middle-&gt;vec.iov_base);</div><div class='del'>-</div><div class='del'>-	/* fill in hdr crc and finalize hdr */</div><div class='del'>-	crc = crc32c(0, &amp;m-&gt;hdr, offsetof(struct ceph_msg_header, crc));</div><div class='del'>-	con-&gt;out_msg-&gt;hdr.crc = cpu_to_le32(crc);</div><div class='del'>-	memcpy(&amp;con-&gt;out_hdr, &amp;con-&gt;out_msg-&gt;hdr, sizeof(con-&gt;out_hdr));</div><div class='del'>-</div><div class='del'>-	/* fill in front and middle crc, footer */</div><div class='del'>-	crc = crc32c(0, m-&gt;front.iov_base, m-&gt;front.iov_len);</div><div class='del'>-	con-&gt;out_msg-&gt;footer.front_crc = cpu_to_le32(crc);</div><div class='del'>-	if (m-&gt;middle) {</div><div class='del'>-		crc = crc32c(0, m-&gt;middle-&gt;vec.iov_base,</div><div class='del'>-				m-&gt;middle-&gt;vec.iov_len);</div><div class='del'>-		con-&gt;out_msg-&gt;footer.middle_crc = cpu_to_le32(crc);</div><div class='del'>-	} else</div><div class='del'>-		con-&gt;out_msg-&gt;footer.middle_crc = 0;</div><div class='del'>-	dout("%s front_crc %u middle_crc %u\n", __func__,</div><div class='del'>-	     le32_to_cpu(con-&gt;out_msg-&gt;footer.front_crc),</div><div class='del'>-	     le32_to_cpu(con-&gt;out_msg-&gt;footer.middle_crc));</div><div class='del'>-	con-&gt;out_msg-&gt;footer.flags = 0;</div><div class='del'>-</div><div class='del'>-	/* is there a data payload? */</div><div class='del'>-	con-&gt;out_msg-&gt;footer.data_crc = 0;</div><div class='del'>-	if (m-&gt;data_length) {</div><div class='del'>-		prepare_message_data(con-&gt;out_msg, m-&gt;data_length);</div><div class='del'>-		con-&gt;out_more = 1;  /* data + footer will follow */</div><div class='del'>-	} else {</div><div class='del'>-		/* no, queue up footer too and be done */</div><div class='del'>-		prepare_write_message_footer(con);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare an ack.</div><div class='del'>- */</div><div class='del'>-static void prepare_write_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_write_ack %p %llu -&gt; %llu\n", con,</div><div class='del'>-	     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='del'>-	con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='del'>-</div><div class='del'>-	con_out_kvec_reset(con);</div><div class='del'>-</div><div class='del'>-	con_out_kvec_add(con, sizeof (tag_ack), &amp;tag_ack);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='del'>-	con_out_kvec_add(con, sizeof (con-&gt;out_temp_ack),</div><div class='del'>-				&amp;con-&gt;out_temp_ack);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_more = 1;  /* more will follow.. eventually.. */</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare to share the seq during handshake</div><div class='del'>- */</div><div class='del'>-static void prepare_write_seq(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_write_seq %p %llu -&gt; %llu\n", con,</div><div class='del'>-	     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='del'>-	con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='del'>-</div><div class='del'>-	con_out_kvec_reset(con);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='del'>-	con_out_kvec_add(con, sizeof (con-&gt;out_temp_ack),</div><div class='del'>-			 &amp;con-&gt;out_temp_ack);</div><div class='del'>-</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare to write keepalive byte.</div><div class='del'>- */</div><div class='del'>-static void prepare_write_keepalive(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_write_keepalive %p\n", con);</div><div class='del'>-	con_out_kvec_reset(con);</div><div class='del'>-	if (con-&gt;peer_features &amp; CEPH_FEATURE_MSGR_KEEPALIVE2) {</div><div class='del'>-		struct timespec64 now;</div><div class='del'>-</div><div class='del'>-		ktime_get_real_ts64(&amp;now);</div><div class='del'>-		con_out_kvec_add(con, sizeof(tag_keepalive2), &amp;tag_keepalive2);</div><div class='del'>-		ceph_encode_timespec64(&amp;con-&gt;out_temp_keepalive2, &amp;now);</div><div class='del'>-		con_out_kvec_add(con, sizeof(con-&gt;out_temp_keepalive2),</div><div class='del'>-				 &amp;con-&gt;out_temp_keepalive2);</div><div class='del'>-	} else {</div><div class='del'>-		con_out_kvec_add(con, sizeof(tag_keepalive), &amp;tag_keepalive);</div><div class='del'>-	}</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Connection negotiation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int get_connect_authorizer(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_auth_handshake *auth;</div><div class='del'>-	int auth_proto;</div><div class='del'>-</div><div class='del'>-	if (!con-&gt;ops-&gt;get_authorizer) {</div><div class='del'>-		con-&gt;auth = NULL;</div><div class='del'>-		con-&gt;out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN;</div><div class='del'>-		con-&gt;out_connect.authorizer_len = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	auth = con-&gt;ops-&gt;get_authorizer(con, &amp;auth_proto, con-&gt;auth_retry);</div><div class='del'>-	if (IS_ERR(auth))</div><div class='del'>-		return PTR_ERR(auth);</div><div class='del'>-</div><div class='del'>-	con-&gt;auth = auth;</div><div class='del'>-	con-&gt;out_connect.authorizer_protocol = cpu_to_le32(auth_proto);</div><div class='del'>-	con-&gt;out_connect.authorizer_len = cpu_to_le32(auth-&gt;authorizer_buf_len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We connected to a peer and are saying hello.</div><div class='del'>- */</div><div class='del'>-static void prepare_write_banner(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);</div><div class='del'>-	con_out_kvec_add(con, sizeof (con-&gt;msgr-&gt;my_enc_addr),</div><div class='del'>-					&amp;con-&gt;msgr-&gt;my_enc_addr);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_more = 0;</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __prepare_write_connect(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	con_out_kvec_add(con, sizeof(con-&gt;out_connect), &amp;con-&gt;out_connect);</div><div class='del'>-	if (con-&gt;auth)</div><div class='del'>-		con_out_kvec_add(con, con-&gt;auth-&gt;authorizer_buf_len,</div><div class='del'>-				 con-&gt;auth-&gt;authorizer_buf);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_more = 0;</div><div class='del'>-	con_flag_set(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prepare_write_connect(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	unsigned int global_seq = get_global_seq(con-&gt;msgr, 0);</div><div class='del'>-	int proto;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (con-&gt;peer_name.type) {</div><div class='del'>-	case CEPH_ENTITY_TYPE_MON:</div><div class='del'>-		proto = CEPH_MONC_PROTOCOL;</div><div class='del'>-		break;</div><div class='del'>-	case CEPH_ENTITY_TYPE_OSD:</div><div class='del'>-		proto = CEPH_OSDC_PROTOCOL;</div><div class='del'>-		break;</div><div class='del'>-	case CEPH_ENTITY_TYPE_MDS:</div><div class='del'>-		proto = CEPH_MDSC_PROTOCOL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("prepare_write_connect %p cseq=%d gseq=%d proto=%d\n", con,</div><div class='del'>-	     con-&gt;connect_seq, global_seq, proto);</div><div class='del'>-</div><div class='del'>-	con-&gt;out_connect.features =</div><div class='del'>-	    cpu_to_le64(from_msgr(con-&gt;msgr)-&gt;supported_features);</div><div class='del'>-	con-&gt;out_connect.host_type = cpu_to_le32(CEPH_ENTITY_TYPE_CLIENT);</div><div class='del'>-	con-&gt;out_connect.connect_seq = cpu_to_le32(con-&gt;connect_seq);</div><div class='del'>-	con-&gt;out_connect.global_seq = cpu_to_le32(global_seq);</div><div class='del'>-	con-&gt;out_connect.protocol_version = cpu_to_le32(proto);</div><div class='del'>-	con-&gt;out_connect.flags = 0;</div><div class='del'>-</div><div class='del'>-	ret = get_connect_authorizer(con);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	__prepare_write_connect(con);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write as much of pending kvecs to the socket as we can.</div><div class='del'>- *  1 -&gt; done</div><div class='del'>- *  0 -&gt; socket full, but more to do</div><div class='del'>- * &lt;0 -&gt; error</div><div class='del'>- */</div><div class='del'>-static int write_partial_kvec(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dout("write_partial_kvec %p %d left\n", con, con-&gt;out_kvec_bytes);</div><div class='del'>-	while (con-&gt;out_kvec_bytes &gt; 0) {</div><div class='del'>-		ret = ceph_tcp_sendmsg(con-&gt;sock, con-&gt;out_kvec_cur,</div><div class='del'>-				       con-&gt;out_kvec_left, con-&gt;out_kvec_bytes,</div><div class='del'>-				       con-&gt;out_more);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		con-&gt;out_kvec_bytes -= ret;</div><div class='del'>-		if (con-&gt;out_kvec_bytes == 0)</div><div class='del'>-			break;            /* done */</div><div class='del'>-</div><div class='del'>-		/* account for full iov entries consumed */</div><div class='del'>-		while (ret &gt;= con-&gt;out_kvec_cur-&gt;iov_len) {</div><div class='del'>-			BUG_ON(!con-&gt;out_kvec_left);</div><div class='del'>-			ret -= con-&gt;out_kvec_cur-&gt;iov_len;</div><div class='del'>-			con-&gt;out_kvec_cur++;</div><div class='del'>-			con-&gt;out_kvec_left--;</div><div class='del'>-		}</div><div class='del'>-		/* and for a partially-consumed entry */</div><div class='del'>-		if (ret) {</div><div class='del'>-			con-&gt;out_kvec_cur-&gt;iov_len -= ret;</div><div class='del'>-			con-&gt;out_kvec_cur-&gt;iov_base += ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	con-&gt;out_kvec_left = 0;</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-	dout("write_partial_kvec %p %d left in %d kvecs ret = %d\n", con,</div><div class='del'>-	     con-&gt;out_kvec_bytes, con-&gt;out_kvec_left, ret);</div><div class='del'>-	return ret;  /* done! */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 ceph_crc32c_page(u32 crc, struct page *page,</div><div class='del'>-				unsigned int page_offset,</div><div class='del'>-				unsigned int length)</div><div class='add'>+u32 ceph_crc32c_page(u32 crc, struct page *page, unsigned int page_offset,</div><div class='add'>+		     unsigned int length)</div><div class='ctx'> {</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -1574,284 +1174,43 @@ static u32 ceph_crc32c_page(u32 crc, struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	return crc;</div><div class='ctx'> }</div><div class='del'>-/*</div><div class='del'>- * Write as much message data payload as we can.  If we finish, queue</div><div class='del'>- * up the footer.</div><div class='del'>- *  1 -&gt; done, footer is now queued in out_kvec[].</div><div class='del'>- *  0 -&gt; socket full, but more to do</div><div class='del'>- * &lt;0 -&gt; error</div><div class='del'>- */</div><div class='del'>-static int write_partial_message_data(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *msg = con-&gt;out_msg;</div><div class='del'>-	struct ceph_msg_data_cursor *cursor = &amp;msg-&gt;cursor;</div><div class='del'>-	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='del'>-	u32 crc;</div><div class='del'>-</div><div class='del'>-	dout("%s %p msg %p\n", __func__, con, msg);</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;msg-&gt;data))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate through each page that contains data to be</div><div class='del'>-	 * written, and send as much as possible for each.</div><div class='del'>-	 *</div><div class='del'>-	 * If we are calculating the data crc (the default), we will</div><div class='del'>-	 * need to map the page.  If we have no pages, they have</div><div class='del'>-	 * been revoked, so use the zero page.</div><div class='del'>-	 */</div><div class='del'>-	crc = do_datacrc ? le32_to_cpu(msg-&gt;footer.data_crc) : 0;</div><div class='del'>-	while (cursor-&gt;total_resid) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		size_t page_offset;</div><div class='del'>-		size_t length;</div><div class='del'>-		bool last_piece;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (!cursor-&gt;resid) {</div><div class='del'>-			ceph_msg_data_advance(cursor, 0);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		page = ceph_msg_data_next(cursor, &amp;page_offset, &amp;length,</div><div class='del'>-					  &amp;last_piece);</div><div class='del'>-		ret = ceph_tcp_sendpage(con-&gt;sock, page, page_offset,</div><div class='del'>-					length, !last_piece);</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			if (do_datacrc)</div><div class='del'>-				msg-&gt;footer.data_crc = cpu_to_le32(crc);</div><div class='del'>-</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		if (do_datacrc &amp;&amp; cursor-&gt;need_crc)</div><div class='del'>-			crc = ceph_crc32c_page(crc, page, page_offset, length);</div><div class='del'>-		ceph_msg_data_advance(cursor, (size_t)ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("%s %p msg %p done\n", __func__, con, msg);</div><div class='del'>-</div><div class='del'>-	/* prepare and queue up footer, too */</div><div class='del'>-	if (do_datacrc)</div><div class='del'>-		msg-&gt;footer.data_crc = cpu_to_le32(crc);</div><div class='del'>-	else</div><div class='del'>-		msg-&gt;footer.flags |= CEPH_MSG_FOOTER_NOCRC;</div><div class='del'>-	con_out_kvec_reset(con);</div><div class='del'>-	prepare_write_message_footer(con);</div><div class='del'>-</div><div class='del'>-	return 1;	/* must return &gt; 0 to indicate success */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write some zeros</div><div class='del'>- */</div><div class='del'>-static int write_partial_skip(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dout("%s %p %d left\n", __func__, con, con-&gt;out_skip);</div><div class='del'>-	while (con-&gt;out_skip &gt; 0) {</div><div class='del'>-		size_t size = min(con-&gt;out_skip, (int) PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-		ret = ceph_tcp_sendpage(con-&gt;sock, zero_page, 0, size, true);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		con-&gt;out_skip -= ret;</div><div class='del'>-	}</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare to read connection handshake, or an ack.</div><div class='del'>- */</div><div class='del'>-static void prepare_read_banner(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_banner %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_read_connect(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_connect %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_read_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_ack %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_read_seq(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_seq %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-	con-&gt;in_tag = CEPH_MSGR_TAG_SEQ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_read_tag(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_tag %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-	con-&gt;in_tag = CEPH_MSGR_TAG_READY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_read_keepalive_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_keepalive_ack %p\n", con);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare to read a message.</div><div class='del'>- */</div><div class='del'>-static int prepare_read_message(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("prepare_read_message %p\n", con);</div><div class='del'>-	BUG_ON(con-&gt;in_msg != NULL);</div><div class='del'>-	con-&gt;in_base_pos = 0;</div><div class='del'>-	con-&gt;in_front_crc = con-&gt;in_middle_crc = con-&gt;in_data_crc = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int read_partial(struct ceph_connection *con,</div><div class='del'>-			int end, int size, void *object)</div><div class='del'>-{</div><div class='del'>-	while (con-&gt;in_base_pos &lt; end) {</div><div class='del'>-		int left = end - con-&gt;in_base_pos;</div><div class='del'>-		int have = size - left;</div><div class='del'>-		int ret = ceph_tcp_recvmsg(con-&gt;sock, object + have, left);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			return ret;</div><div class='del'>-		con-&gt;in_base_pos += ret;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read all or part of the connect-side handshake on a new connection</div><div class='del'>- */</div><div class='del'>-static int read_partial_banner(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int size;</div><div class='del'>-	int end;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dout("read_partial_banner %p at %d\n", con, con-&gt;in_base_pos);</div><div class='del'>-</div><div class='del'>-	/* peer's banner */</div><div class='del'>-	size = strlen(CEPH_BANNER);</div><div class='del'>-	end = size;</div><div class='del'>-	ret = read_partial(con, end, size, con-&gt;in_banner);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	size = sizeof (con-&gt;actual_peer_addr);</div><div class='del'>-	end += size;</div><div class='del'>-	ret = read_partial(con, end, size, &amp;con-&gt;actual_peer_addr);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	size = sizeof (con-&gt;peer_addr_for_me);</div><div class='del'>-	end += size;</div><div class='del'>-	ret = read_partial(con, end, size, &amp;con-&gt;peer_addr_for_me);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int read_partial_connect(struct ceph_connection *con)</div><div class='add'>+bool ceph_addr_is_blank(const struct ceph_entity_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	int size;</div><div class='del'>-	int end;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dout("read_partial_connect %p at %d\n", con, con-&gt;in_base_pos);</div><div class='del'>-</div><div class='del'>-	size = sizeof (con-&gt;in_reply);</div><div class='del'>-	end = size;</div><div class='del'>-	ret = read_partial(con, end, size, &amp;con-&gt;in_reply);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (con-&gt;auth) {</div><div class='del'>-		size = le32_to_cpu(con-&gt;in_reply.authorizer_len);</div><div class='del'>-		if (size &gt; con-&gt;auth-&gt;authorizer_reply_buf_len) {</div><div class='del'>-			pr_err("authorizer reply too big: %d &gt; %zu\n", size,</div><div class='del'>-			       con-&gt;auth-&gt;authorizer_reply_buf_len);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	struct sockaddr_storage ss = addr-&gt;in_addr; /* align */</div><div class='add'>+	struct in_addr *addr4 = &amp;((struct sockaddr_in *)&amp;ss)-&gt;sin_addr;</div><div class='add'>+	struct in6_addr *addr6 = &amp;((struct sockaddr_in6 *)&amp;ss)-&gt;sin6_addr;</div><div class='ctx'> </div><div class='del'>-		end += size;</div><div class='del'>-		ret = read_partial(con, end, size,</div><div class='del'>-				   con-&gt;auth-&gt;authorizer_reply_buf);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("read_partial_connect %p tag %d, con_seq = %u, g_seq = %u\n",</div><div class='del'>-	     con, (int)con-&gt;in_reply.tag,</div><div class='del'>-	     le32_to_cpu(con-&gt;in_reply.connect_seq),</div><div class='del'>-	     le32_to_cpu(con-&gt;in_reply.global_seq));</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Verify the hello banner looks okay.</div><div class='del'>- */</div><div class='del'>-static int verify_hello(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	if (memcmp(con-&gt;in_banner, CEPH_BANNER, strlen(CEPH_BANNER))) {</div><div class='del'>-		pr_err("connect to %s got bad banner\n",</div><div class='del'>-		       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr));</div><div class='del'>-		con-&gt;error_msg = "protocol error, bad banner";</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool addr_is_blank(struct sockaddr_storage *ss)</div><div class='del'>-{</div><div class='del'>-	struct in_addr *addr = &amp;((struct sockaddr_in *)ss)-&gt;sin_addr;</div><div class='del'>-	struct in6_addr *addr6 = &amp;((struct sockaddr_in6 *)ss)-&gt;sin6_addr;</div><div class='del'>-</div><div class='del'>-	switch (ss-&gt;ss_family) {</div><div class='add'>+	switch (ss.ss_family) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		return addr-&gt;s_addr == htonl(INADDR_ANY);</div><div class='add'>+		return addr4-&gt;s_addr == htonl(INADDR_ANY);</div><div class='ctx'> 	case AF_INET6:</div><div class='ctx'> 		return ipv6_addr_any(addr6);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ceph_addr_is_blank);</div><div class='ctx'> </div><div class='del'>-static int addr_port(struct sockaddr_storage *ss)</div><div class='add'>+int ceph_addr_port(const struct ceph_entity_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	switch (ss-&gt;ss_family) {</div><div class='add'>+	switch (get_unaligned(&amp;addr-&gt;in_addr.ss_family)) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		return ntohs(((struct sockaddr_in *)ss)-&gt;sin_port);</div><div class='add'>+		return ntohs(get_unaligned(&amp;((struct sockaddr_in *)&amp;addr-&gt;in_addr)-&gt;sin_port));</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		return ntohs(((struct sockaddr_in6 *)ss)-&gt;sin6_port);</div><div class='add'>+		return ntohs(get_unaligned(&amp;((struct sockaddr_in6 *)&amp;addr-&gt;in_addr)-&gt;sin6_port));</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void addr_set_port(struct sockaddr_storage *ss, int p)</div><div class='add'>+void ceph_addr_set_port(struct ceph_entity_addr *addr, int p)</div><div class='ctx'> {</div><div class='del'>-	switch (ss-&gt;ss_family) {</div><div class='add'>+	switch (get_unaligned(&amp;addr-&gt;in_addr.ss_family)) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		((struct sockaddr_in *)ss)-&gt;sin_port = htons(p);</div><div class='add'>+		put_unaligned(htons(p), &amp;((struct sockaddr_in *)&amp;addr-&gt;in_addr)-&gt;sin_port);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		((struct sockaddr_in6 *)ss)-&gt;sin6_port = htons(p);</div><div class='add'>+		put_unaligned(htons(p), &amp;((struct sockaddr_in6 *)&amp;addr-&gt;in_addr)-&gt;sin6_port);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1859,21 +1218,18 @@ static void addr_set_port(struct sockaddr_storage *ss, int p)</div><div class='ctx'> /*</div><div class='ctx'>  * Unlike other *_pton function semantics, zero indicates success.</div><div class='ctx'>  */</div><div class='del'>-static int ceph_pton(const char *str, size_t len, struct sockaddr_storage *ss,</div><div class='add'>+static int ceph_pton(const char *str, size_t len, struct ceph_entity_addr *addr,</div><div class='ctx'> 		char delim, const char **ipend)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_in *in4 = (struct sockaddr_in *) ss;</div><div class='del'>-	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;</div><div class='del'>-</div><div class='del'>-	memset(ss, 0, sizeof(*ss));</div><div class='add'>+	memset(&amp;addr-&gt;in_addr, 0, sizeof(addr-&gt;in_addr));</div><div class='ctx'> </div><div class='del'>-	if (in4_pton(str, len, (u8 *)&amp;in4-&gt;sin_addr.s_addr, delim, ipend)) {</div><div class='del'>-		ss-&gt;ss_family = AF_INET;</div><div class='add'>+	if (in4_pton(str, len, (u8 *)&amp;((struct sockaddr_in *)&amp;addr-&gt;in_addr)-&gt;sin_addr.s_addr, delim, ipend)) {</div><div class='add'>+		put_unaligned(AF_INET, &amp;addr-&gt;in_addr.ss_family);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (in6_pton(str, len, (u8 *)&amp;in6-&gt;sin6_addr.s6_addr, delim, ipend)) {</div><div class='del'>-		ss-&gt;ss_family = AF_INET6;</div><div class='add'>+	if (in6_pton(str, len, (u8 *)&amp;((struct sockaddr_in6 *)&amp;addr-&gt;in_addr)-&gt;sin6_addr.s6_addr, delim, ipend)) {</div><div class='add'>+		put_unaligned(AF_INET6, &amp;addr-&gt;in_addr.ss_family);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1885,7 +1241,7 @@ static int ceph_pton(const char *str, size_t len, struct sockaddr_storage *ss,</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_CEPH_LIB_USE_DNS_RESOLVER</div><div class='ctx'> static int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='del'>-		struct sockaddr_storage *ss, char delim, const char **ipend)</div><div class='add'>+		struct ceph_entity_addr *addr, char delim, const char **ipend)</div><div class='ctx'> {</div><div class='ctx'> 	const char *end, *delim_p;</div><div class='ctx'> 	char *colon_p, *ip_addr = NULL;</div><div class='hunk'>@@ -1899,7 +1255,7 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='ctx'> 	colon_p = memchr(name, ':', namelen);</div><div class='ctx'> </div><div class='ctx'> 	if (delim_p &amp;&amp; colon_p)</div><div class='del'>-		end = delim_p &lt; colon_p ? delim_p : colon_p;</div><div class='add'>+		end = min(delim_p, colon_p);</div><div class='ctx'> 	else if (!delim_p &amp;&amp; colon_p)</div><div class='ctx'> 		end = colon_p;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1912,9 +1268,10 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* do dns_resolve upcall */</div><div class='del'>-	ip_len = dns_query(NULL, name, end - name, NULL, &amp;ip_addr, NULL);</div><div class='add'>+	ip_len = dns_query(current-&gt;nsproxy-&gt;net_ns,</div><div class='add'>+			   NULL, name, end - name, NULL, &amp;ip_addr, NULL, false);</div><div class='ctx'> 	if (ip_len &gt; 0)</div><div class='del'>-		ret = ceph_pton(ip_addr, ip_len, ss, -1, NULL);</div><div class='add'>+		ret = ceph_pton(ip_addr, ip_len, addr, -1, NULL);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = -ESRCH;</div><div class='ctx'> </div><div class='hunk'>@@ -1923,13 +1280,13 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='ctx'> 	*ipend = end;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("resolve '%.*s' (ret=%d): %s\n", (int)(end - name), name,</div><div class='del'>-			ret, ret ? "failed" : ceph_pr_addr(ss));</div><div class='add'>+			ret, ret ? "failed" : ceph_pr_addr(addr));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='del'>-		struct sockaddr_storage *ss, char delim, const char **ipend)</div><div class='add'>+		struct ceph_entity_addr *addr, char delim, const char **ipend)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1940,13 +1297,13 @@ static inline int ceph_dns_resolve_name(const char *name, size_t namelen,</div><div class='ctx'>  * then try to extract a hostname to resolve using userspace DNS upcall.</div><div class='ctx'>  */</div><div class='ctx'> static int ceph_parse_server_name(const char *name, size_t namelen,</div><div class='del'>-			struct sockaddr_storage *ss, char delim, const char **ipend)</div><div class='add'>+		struct ceph_entity_addr *addr, char delim, const char **ipend)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_pton(name, namelen, ss, delim, ipend);</div><div class='add'>+	ret = ceph_pton(name, namelen, addr, delim, ipend);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		ret = ceph_dns_resolve_name(name, namelen, ss, delim, ipend);</div><div class='add'>+		ret = ceph_dns_resolve_name(name, namelen, addr, delim, ipend);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1957,31 +1314,31 @@ static int ceph_parse_server_name(const char *name, size_t namelen,</div><div class='ctx'>  */</div><div class='ctx'> int ceph_parse_ips(const char *c, const char *end,</div><div class='ctx'> 		   struct ceph_entity_addr *addr,</div><div class='del'>-		   int max_count, int *count)</div><div class='add'>+		   int max_count, int *count, char delim)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = -EINVAL;</div><div class='ctx'> 	const char *p = c;</div><div class='ctx'> </div><div class='ctx'> 	dout("parse_ips on '%.*s'\n", (int)(end-c), c);</div><div class='ctx'> 	for (i = 0; i &lt; max_count; i++) {</div><div class='add'>+		char cur_delim = delim;</div><div class='ctx'> 		const char *ipend;</div><div class='del'>-		struct sockaddr_storage *ss = &amp;addr[i].in_addr;</div><div class='ctx'> 		int port;</div><div class='del'>-		char delim = ',';</div><div class='ctx'> </div><div class='ctx'> 		if (*p == '[') {</div><div class='del'>-			delim = ']';</div><div class='add'>+			cur_delim = ']';</div><div class='ctx'> 			p++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = ceph_parse_server_name(p, end - p, ss, delim, &amp;ipend);</div><div class='add'>+		ret = ceph_parse_server_name(p, end - p, &amp;addr[i], cur_delim,</div><div class='add'>+					     &amp;ipend);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto bad;</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		p = ipend;</div><div class='ctx'> </div><div class='del'>-		if (delim == ']') {</div><div class='add'>+		if (cur_delim == ']') {</div><div class='ctx'> 			if (*p != ']') {</div><div class='ctx'> 				dout("missing matching ']'\n");</div><div class='ctx'> 				goto bad;</div><div class='hunk'>@@ -2005,13 +1362,23 @@ int ceph_parse_ips(const char *c, const char *end,</div><div class='ctx'> 			port = CEPH_MON_PORT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		addr_set_port(ss, port);</div><div class='add'>+		ceph_addr_set_port(&amp;addr[i], port);</div><div class='add'>+		/*</div><div class='add'>+		 * We want the type to be set according to ms_mode</div><div class='add'>+		 * option, but options are normally parsed after mon</div><div class='add'>+		 * addresses.  Rather than complicating parsing, set</div><div class='add'>+		 * to LEGACY and override in build_initial_monmap()</div><div class='add'>+		 * for mon addresses and ceph_messenger_init() for</div><div class='add'>+		 * ip option.</div><div class='add'>+		 */</div><div class='add'>+		addr[i].type = CEPH_ENTITY_ADDR_TYPE_LEGACY;</div><div class='add'>+		addr[i].nonce = 0;</div><div class='ctx'> </div><div class='del'>-		dout("parse_ips got %s\n", ceph_pr_addr(ss));</div><div class='add'>+		dout("%s got %s\n", __func__, ceph_pr_addr(&amp;addr[i]));</div><div class='ctx'> </div><div class='ctx'> 		if (p == end)</div><div class='ctx'> 			break;</div><div class='del'>-		if (*p != ',')</div><div class='add'>+		if (*p != delim)</div><div class='ctx'> 			goto bad;</div><div class='ctx'> 		p++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2024,527 +1391,15 @@ int ceph_parse_ips(const char *c, const char *end,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> bad:</div><div class='del'>-	pr_err("parse_ips bad ip '%.*s'\n", (int)(end - c), c);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_parse_ips);</div><div class='del'>-</div><div class='del'>-static int process_banner(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	dout("process_banner on %p\n", con);</div><div class='del'>-</div><div class='del'>-	if (verify_hello(con) &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	ceph_decode_addr(&amp;con-&gt;actual_peer_addr);</div><div class='del'>-	ceph_decode_addr(&amp;con-&gt;peer_addr_for_me);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the other end is who we wanted.  note that the other</div><div class='del'>-	 * end may not yet know their ip address, so if it's 0.0.0.0, give</div><div class='del'>-	 * them the benefit of the doubt.</div><div class='del'>-	 */</div><div class='del'>-	if (memcmp(&amp;con-&gt;peer_addr, &amp;con-&gt;actual_peer_addr,</div><div class='del'>-		   sizeof(con-&gt;peer_addr)) != 0 &amp;&amp;</div><div class='del'>-	    !(addr_is_blank(&amp;con-&gt;actual_peer_addr.in_addr) &amp;&amp;</div><div class='del'>-	      con-&gt;actual_peer_addr.nonce == con-&gt;peer_addr.nonce)) {</div><div class='del'>-		pr_warn("wrong peer, want %s/%d, got %s/%d\n",</div><div class='del'>-			ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='del'>-			(int)le32_to_cpu(con-&gt;peer_addr.nonce),</div><div class='del'>-			ceph_pr_addr(&amp;con-&gt;actual_peer_addr.in_addr),</div><div class='del'>-			(int)le32_to_cpu(con-&gt;actual_peer_addr.nonce));</div><div class='del'>-		con-&gt;error_msg = "wrong peer at address";</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * did we learn our address?</div><div class='del'>-	 */</div><div class='del'>-	if (addr_is_blank(&amp;con-&gt;msgr-&gt;inst.addr.in_addr)) {</div><div class='del'>-		int port = addr_port(&amp;con-&gt;msgr-&gt;inst.addr.in_addr);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;con-&gt;msgr-&gt;inst.addr.in_addr,</div><div class='del'>-		       &amp;con-&gt;peer_addr_for_me.in_addr,</div><div class='del'>-		       sizeof(con-&gt;peer_addr_for_me.in_addr));</div><div class='del'>-		addr_set_port(&amp;con-&gt;msgr-&gt;inst.addr.in_addr, port);</div><div class='del'>-		encode_my_addr(con-&gt;msgr);</div><div class='del'>-		dout("process_banner learned my addr is %s\n",</div><div class='del'>-		     ceph_pr_addr(&amp;con-&gt;msgr-&gt;inst.addr.in_addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int process_connect(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	u64 sup_feat = from_msgr(con-&gt;msgr)-&gt;supported_features;</div><div class='del'>-	u64 req_feat = from_msgr(con-&gt;msgr)-&gt;required_features;</div><div class='del'>-	u64 server_feat = le64_to_cpu(con-&gt;in_reply.features);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dout("process_connect on %p tag %d\n", con, (int)con-&gt;in_tag);</div><div class='del'>-</div><div class='del'>-	if (con-&gt;auth) {</div><div class='del'>-		/*</div><div class='del'>-		 * Any connection that defines -&gt;get_authorizer()</div><div class='del'>-		 * should also define -&gt;add_authorizer_challenge() and</div><div class='del'>-		 * -&gt;verify_authorizer_reply().</div><div class='del'>-		 *</div><div class='del'>-		 * See get_connect_authorizer().</div><div class='del'>-		 */</div><div class='del'>-		if (con-&gt;in_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) {</div><div class='del'>-			ret = con-&gt;ops-&gt;add_authorizer_challenge(</div><div class='del'>-				    con, con-&gt;auth-&gt;authorizer_reply_buf,</div><div class='del'>-				    le32_to_cpu(con-&gt;in_reply.authorizer_len));</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			con_out_kvec_reset(con);</div><div class='del'>-			__prepare_write_connect(con);</div><div class='del'>-			prepare_read_connect(con);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = con-&gt;ops-&gt;verify_authorizer_reply(con);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			con-&gt;error_msg = "bad authorize reply";</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (con-&gt;in_reply.tag) {</div><div class='del'>-	case CEPH_MSGR_TAG_FEATURES:</div><div class='del'>-		pr_err("%s%lld %s feature set mismatch,"</div><div class='del'>-		       " my %llx &lt; server's %llx, missing %llx\n",</div><div class='del'>-		       ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-		       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='del'>-		       sup_feat, server_feat, server_feat &amp; ~sup_feat);</div><div class='del'>-		con-&gt;error_msg = "missing required protocol features";</div><div class='del'>-		reset_connection(con);</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_BADPROTOVER:</div><div class='del'>-		pr_err("%s%lld %s protocol version mismatch,"</div><div class='del'>-		       " my %d != server's %d\n",</div><div class='del'>-		       ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-		       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='del'>-		       le32_to_cpu(con-&gt;out_connect.protocol_version),</div><div class='del'>-		       le32_to_cpu(con-&gt;in_reply.protocol_version));</div><div class='del'>-		con-&gt;error_msg = "protocol version mismatch";</div><div class='del'>-		reset_connection(con);</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_BADAUTHORIZER:</div><div class='del'>-		con-&gt;auth_retry++;</div><div class='del'>-		dout("process_connect %p got BADAUTHORIZER attempt %d\n", con,</div><div class='del'>-		     con-&gt;auth_retry);</div><div class='del'>-		if (con-&gt;auth_retry == 2) {</div><div class='del'>-			con-&gt;error_msg = "connect authorization failure";</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		con_out_kvec_reset(con);</div><div class='del'>-		ret = prepare_write_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		prepare_read_connect(con);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_RESETSESSION:</div><div class='del'>-		/*</div><div class='del'>-		 * If we connected with a large connect_seq but the peer</div><div class='del'>-		 * has no record of a session with us (no connection, or</div><div class='del'>-		 * connect_seq == 0), they will send RESETSESION to indicate</div><div class='del'>-		 * that they must have reset their session, and may have</div><div class='del'>-		 * dropped messages.</div><div class='del'>-		 */</div><div class='del'>-		dout("process_connect got RESET peer seq %u\n",</div><div class='del'>-		     le32_to_cpu(con-&gt;in_reply.connect_seq));</div><div class='del'>-		pr_err("%s%lld %s connection reset\n",</div><div class='del'>-		       ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-		       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr));</div><div class='del'>-		reset_connection(con);</div><div class='del'>-		con_out_kvec_reset(con);</div><div class='del'>-		ret = prepare_write_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		prepare_read_connect(con);</div><div class='del'>-</div><div class='del'>-		/* Tell ceph about it. */</div><div class='del'>-		mutex_unlock(&amp;con-&gt;mutex);</div><div class='del'>-		pr_info("reset on %s%lld\n", ENTITY_NAME(con-&gt;peer_name));</div><div class='del'>-		if (con-&gt;ops-&gt;peer_reset)</div><div class='del'>-			con-&gt;ops-&gt;peer_reset(con);</div><div class='del'>-		mutex_lock(&amp;con-&gt;mutex);</div><div class='del'>-		if (con-&gt;state != CON_STATE_NEGOTIATING)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_RETRY_SESSION:</div><div class='del'>-		/*</div><div class='del'>-		 * If we sent a smaller connect_seq than the peer has, try</div><div class='del'>-		 * again with a larger value.</div><div class='del'>-		 */</div><div class='del'>-		dout("process_connect got RETRY_SESSION my seq %u, peer %u\n",</div><div class='del'>-		     le32_to_cpu(con-&gt;out_connect.connect_seq),</div><div class='del'>-		     le32_to_cpu(con-&gt;in_reply.connect_seq));</div><div class='del'>-		con-&gt;connect_seq = le32_to_cpu(con-&gt;in_reply.connect_seq);</div><div class='del'>-		con_out_kvec_reset(con);</div><div class='del'>-		ret = prepare_write_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		prepare_read_connect(con);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_RETRY_GLOBAL:</div><div class='del'>-		/*</div><div class='del'>-		 * If we sent a smaller global_seq than the peer has, try</div><div class='del'>-		 * again with a larger value.</div><div class='del'>-		 */</div><div class='del'>-		dout("process_connect got RETRY_GLOBAL my %u peer_gseq %u\n",</div><div class='del'>-		     con-&gt;peer_global_seq,</div><div class='del'>-		     le32_to_cpu(con-&gt;in_reply.global_seq));</div><div class='del'>-		get_global_seq(con-&gt;msgr,</div><div class='del'>-			       le32_to_cpu(con-&gt;in_reply.global_seq));</div><div class='del'>-		con_out_kvec_reset(con);</div><div class='del'>-		ret = prepare_write_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		prepare_read_connect(con);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_SEQ:</div><div class='del'>-	case CEPH_MSGR_TAG_READY:</div><div class='del'>-		if (req_feat &amp; ~server_feat) {</div><div class='del'>-			pr_err("%s%lld %s protocol feature mismatch,"</div><div class='del'>-			       " my required %llx &gt; server's %llx, need %llx\n",</div><div class='del'>-			       ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-			       ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='del'>-			       req_feat, server_feat, req_feat &amp; ~server_feat);</div><div class='del'>-			con-&gt;error_msg = "missing required protocol features";</div><div class='del'>-			reset_connection(con);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		WARN_ON(con-&gt;state != CON_STATE_NEGOTIATING);</div><div class='del'>-		con-&gt;state = CON_STATE_OPEN;</div><div class='del'>-		con-&gt;auth_retry = 0;    /* we authenticated; clear flag */</div><div class='del'>-		con-&gt;peer_global_seq = le32_to_cpu(con-&gt;in_reply.global_seq);</div><div class='del'>-		con-&gt;connect_seq++;</div><div class='del'>-		con-&gt;peer_features = server_feat;</div><div class='del'>-		dout("process_connect got READY gseq %d cseq %d (%d)\n",</div><div class='del'>-		     con-&gt;peer_global_seq,</div><div class='del'>-		     le32_to_cpu(con-&gt;in_reply.connect_seq),</div><div class='del'>-		     con-&gt;connect_seq);</div><div class='del'>-		WARN_ON(con-&gt;connect_seq !=</div><div class='del'>-			le32_to_cpu(con-&gt;in_reply.connect_seq));</div><div class='del'>-</div><div class='del'>-		if (con-&gt;in_reply.flags &amp; CEPH_MSG_CONNECT_LOSSY)</div><div class='del'>-			con_flag_set(con, CON_FLAG_LOSSYTX);</div><div class='del'>-</div><div class='del'>-		con-&gt;delay = 0;      /* reset backoff memory */</div><div class='del'>-</div><div class='del'>-		if (con-&gt;in_reply.tag == CEPH_MSGR_TAG_SEQ) {</div><div class='del'>-			prepare_write_seq(con);</div><div class='del'>-			prepare_read_seq(con);</div><div class='del'>-		} else {</div><div class='del'>-			prepare_read_tag(con);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CEPH_MSGR_TAG_WAIT:</div><div class='del'>-		/*</div><div class='del'>-		 * If there is a connection race (we are opening</div><div class='del'>-		 * connections to each other), one of us may just have</div><div class='del'>-		 * to WAIT.  This shouldn't happen if we are the</div><div class='del'>-		 * client.</div><div class='del'>-		 */</div><div class='del'>-		con-&gt;error_msg = "protocol error, got WAIT as client";</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		con-&gt;error_msg = "protocol error, garbage tag during connect";</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read (part of) an ack</div><div class='del'>- */</div><div class='del'>-static int read_partial_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int size = sizeof (con-&gt;in_temp_ack);</div><div class='del'>-	int end = size;</div><div class='del'>-</div><div class='del'>-	return read_partial(con, end, size, &amp;con-&gt;in_temp_ack);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We can finally discard anything that's been acked.</div><div class='del'>- */</div><div class='del'>-static void process_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *m;</div><div class='del'>-	u64 ack = le64_to_cpu(con-&gt;in_temp_ack);</div><div class='del'>-	u64 seq;</div><div class='del'>-	bool reconnect = (con-&gt;in_tag == CEPH_MSGR_TAG_SEQ);</div><div class='del'>-	struct list_head *list = reconnect ? &amp;con-&gt;out_queue : &amp;con-&gt;out_sent;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In the reconnect case, con_fault() has requeued messages</div><div class='del'>-	 * in out_sent. We should cleanup old messages according to</div><div class='del'>-	 * the reconnect seq.</div><div class='del'>-	 */</div><div class='del'>-	while (!list_empty(list)) {</div><div class='del'>-		m = list_first_entry(list, struct ceph_msg, list_head);</div><div class='del'>-		if (reconnect &amp;&amp; m-&gt;needs_out_seq)</div><div class='del'>-			break;</div><div class='del'>-		seq = le64_to_cpu(m-&gt;hdr.seq);</div><div class='del'>-		if (seq &gt; ack)</div><div class='del'>-			break;</div><div class='del'>-		dout("got ack for seq %llu type %d at %p\n", seq,</div><div class='del'>-		     le16_to_cpu(m-&gt;hdr.type), m);</div><div class='del'>-		m-&gt;ack_stamp = jiffies;</div><div class='del'>-		ceph_msg_remove(m);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prepare_read_tag(con);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int read_partial_message_section(struct ceph_connection *con,</div><div class='del'>-					struct kvec *section,</div><div class='del'>-					unsigned int sec_len, u32 *crc)</div><div class='del'>-{</div><div class='del'>-	int ret, left;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!section);</div><div class='del'>-</div><div class='del'>-	while (section-&gt;iov_len &lt; sec_len) {</div><div class='del'>-		BUG_ON(section-&gt;iov_base == NULL);</div><div class='del'>-		left = sec_len - section-&gt;iov_len;</div><div class='del'>-		ret = ceph_tcp_recvmsg(con-&gt;sock, (char *)section-&gt;iov_base +</div><div class='del'>-				       section-&gt;iov_len, left);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			return ret;</div><div class='del'>-		section-&gt;iov_len += ret;</div><div class='del'>-	}</div><div class='del'>-	if (section-&gt;iov_len == sec_len)</div><div class='del'>-		*crc = crc32c(0, section-&gt;iov_base, section-&gt;iov_len);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_partial_msg_data(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *msg = con-&gt;in_msg;</div><div class='del'>-	struct ceph_msg_data_cursor *cursor = &amp;msg-&gt;cursor;</div><div class='del'>-	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='del'>-	struct page *page;</div><div class='del'>-	size_t page_offset;</div><div class='del'>-	size_t length;</div><div class='del'>-	u32 crc = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!msg);</div><div class='del'>-	if (list_empty(&amp;msg-&gt;data))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (do_datacrc)</div><div class='del'>-		crc = con-&gt;in_data_crc;</div><div class='del'>-	while (cursor-&gt;total_resid) {</div><div class='del'>-		if (!cursor-&gt;resid) {</div><div class='del'>-			ceph_msg_data_advance(cursor, 0);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		page = ceph_msg_data_next(cursor, &amp;page_offset, &amp;length, NULL);</div><div class='del'>-		ret = ceph_tcp_recvpage(con-&gt;sock, page, page_offset, length);</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			if (do_datacrc)</div><div class='del'>-				con-&gt;in_data_crc = crc;</div><div class='del'>-</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (do_datacrc)</div><div class='del'>-			crc = ceph_crc32c_page(crc, page, page_offset, ret);</div><div class='del'>-		ceph_msg_data_advance(cursor, (size_t)ret);</div><div class='del'>-	}</div><div class='del'>-	if (do_datacrc)</div><div class='del'>-		con-&gt;in_data_crc = crc;</div><div class='del'>-</div><div class='del'>-	return 1;	/* must return &gt; 0 to indicate success */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read (part of) a message.</div><div class='del'>- */</div><div class='del'>-static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip);</div><div class='del'>-</div><div class='del'>-static int read_partial_message(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_msg *m = con-&gt;in_msg;</div><div class='del'>-	int size;</div><div class='del'>-	int end;</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int front_len, middle_len, data_len;</div><div class='del'>-	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='del'>-	bool need_sign = (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH);</div><div class='del'>-	u64 seq;</div><div class='del'>-	u32 crc;</div><div class='del'>-</div><div class='del'>-	dout("read_partial_message con %p msg %p\n", con, m);</div><div class='del'>-</div><div class='del'>-	/* header */</div><div class='del'>-	size = sizeof (con-&gt;in_hdr);</div><div class='del'>-	end = size;</div><div class='del'>-	ret = read_partial(con, end, size, &amp;con-&gt;in_hdr);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	crc = crc32c(0, &amp;con-&gt;in_hdr, offsetof(struct ceph_msg_header, crc));</div><div class='del'>-	if (cpu_to_le32(crc) != con-&gt;in_hdr.crc) {</div><div class='del'>-		pr_err("read_partial_message bad hdr crc %u != expected %u\n",</div><div class='del'>-		       crc, con-&gt;in_hdr.crc);</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	front_len = le32_to_cpu(con-&gt;in_hdr.front_len);</div><div class='del'>-	if (front_len &gt; CEPH_MSG_MAX_FRONT_LEN)</div><div class='del'>-		return -EIO;</div><div class='del'>-	middle_len = le32_to_cpu(con-&gt;in_hdr.middle_len);</div><div class='del'>-	if (middle_len &gt; CEPH_MSG_MAX_MIDDLE_LEN)</div><div class='del'>-		return -EIO;</div><div class='del'>-	data_len = le32_to_cpu(con-&gt;in_hdr.data_len);</div><div class='del'>-	if (data_len &gt; CEPH_MSG_MAX_DATA_LEN)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* verify seq# */</div><div class='del'>-	seq = le64_to_cpu(con-&gt;in_hdr.seq);</div><div class='del'>-	if ((s64)seq - (s64)con-&gt;in_seq &lt; 1) {</div><div class='del'>-		pr_info("skipping %s%lld %s seq %lld expected %lld\n",</div><div class='del'>-			ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-			ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr),</div><div class='del'>-			seq, con-&gt;in_seq + 1);</div><div class='del'>-		con-&gt;in_base_pos = -front_len - middle_len - data_len -</div><div class='del'>-			sizeof_footer(con);</div><div class='del'>-		con-&gt;in_tag = CEPH_MSGR_TAG_READY;</div><div class='del'>-		return 1;</div><div class='del'>-	} else if ((s64)seq - (s64)con-&gt;in_seq &gt; 1) {</div><div class='del'>-		pr_err("read_partial_message bad seq %lld expected %lld\n",</div><div class='del'>-		       seq, con-&gt;in_seq + 1);</div><div class='del'>-		con-&gt;error_msg = "bad message sequence # for incoming message";</div><div class='del'>-		return -EBADE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate message? */</div><div class='del'>-	if (!con-&gt;in_msg) {</div><div class='del'>-		int skip = 0;</div><div class='del'>-</div><div class='del'>-		dout("got hdr type %d front %d data %d\n", con-&gt;in_hdr.type,</div><div class='del'>-		     front_len, data_len);</div><div class='del'>-		ret = ceph_con_in_msg_alloc(con, &amp;skip);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		BUG_ON(!con-&gt;in_msg ^ skip);</div><div class='del'>-		if (skip) {</div><div class='del'>-			/* skip this message */</div><div class='del'>-			dout("alloc_msg said skip message\n");</div><div class='del'>-			con-&gt;in_base_pos = -front_len - middle_len - data_len -</div><div class='del'>-				sizeof_footer(con);</div><div class='del'>-			con-&gt;in_tag = CEPH_MSGR_TAG_READY;</div><div class='del'>-			con-&gt;in_seq++;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		BUG_ON(!con-&gt;in_msg);</div><div class='del'>-		BUG_ON(con-&gt;in_msg-&gt;con != con);</div><div class='del'>-		m = con-&gt;in_msg;</div><div class='del'>-		m-&gt;front.iov_len = 0;    /* haven't read it yet */</div><div class='del'>-		if (m-&gt;middle)</div><div class='del'>-			m-&gt;middle-&gt;vec.iov_len = 0;</div><div class='del'>-</div><div class='del'>-		/* prepare for data payload, if any */</div><div class='del'>-</div><div class='del'>-		if (data_len)</div><div class='del'>-			prepare_message_data(con-&gt;in_msg, data_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* front */</div><div class='del'>-	ret = read_partial_message_section(con, &amp;m-&gt;front, front_len,</div><div class='del'>-					   &amp;con-&gt;in_front_crc);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* middle */</div><div class='del'>-	if (m-&gt;middle) {</div><div class='del'>-		ret = read_partial_message_section(con, &amp;m-&gt;middle-&gt;vec,</div><div class='del'>-						   middle_len,</div><div class='del'>-						   &amp;con-&gt;in_middle_crc);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* (page) data */</div><div class='del'>-	if (data_len) {</div><div class='del'>-		ret = read_partial_msg_data(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* footer */</div><div class='del'>-	size = sizeof_footer(con);</div><div class='del'>-	end += size;</div><div class='del'>-	ret = read_partial(con, end, size, &amp;m-&gt;footer);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!need_sign) {</div><div class='del'>-		m-&gt;footer.flags = m-&gt;old_footer.flags;</div><div class='del'>-		m-&gt;footer.sig = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("read_partial_message got msg %p %d (%u) + %d (%u) + %d (%u)\n",</div><div class='del'>-	     m, front_len, m-&gt;footer.front_crc, middle_len,</div><div class='del'>-	     m-&gt;footer.middle_crc, data_len, m-&gt;footer.data_crc);</div><div class='del'>-</div><div class='del'>-	/* crc ok? */</div><div class='del'>-	if (con-&gt;in_front_crc != le32_to_cpu(m-&gt;footer.front_crc)) {</div><div class='del'>-		pr_err("read_partial_message %p front crc %u != exp. %u\n",</div><div class='del'>-		       m, con-&gt;in_front_crc, m-&gt;footer.front_crc);</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;in_middle_crc != le32_to_cpu(m-&gt;footer.middle_crc)) {</div><div class='del'>-		pr_err("read_partial_message %p middle crc %u != exp %u\n",</div><div class='del'>-		       m, con-&gt;in_middle_crc, m-&gt;footer.middle_crc);</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-	if (do_datacrc &amp;&amp;</div><div class='del'>-	    (m-&gt;footer.flags &amp; CEPH_MSG_FOOTER_NOCRC) == 0 &amp;&amp;</div><div class='del'>-	    con-&gt;in_data_crc != le32_to_cpu(m-&gt;footer.data_crc)) {</div><div class='del'>-		pr_err("read_partial_message %p data crc %u != exp. %u\n", m,</div><div class='del'>-		       con-&gt;in_data_crc, le32_to_cpu(m-&gt;footer.data_crc));</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (need_sign &amp;&amp; con-&gt;ops-&gt;check_message_signature &amp;&amp;</div><div class='del'>-	    con-&gt;ops-&gt;check_message_signature(m)) {</div><div class='del'>-		pr_err("read_partial_message %p signature check failed\n", m);</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1; /* done! */</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Process message.  This happens in the worker thread.  The callback should</div><div class='ctx'>  * be careful not to do anything that waits on other incoming messages or it</div><div class='ctx'>  * may deadlock.</div><div class='ctx'>  */</div><div class='del'>-static void process_message(struct ceph_connection *con)</div><div class='add'>+void ceph_con_process_message(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg *msg = con-&gt;in_msg;</div><div class='ctx'> </div><div class='hunk'>@@ -2558,12 +1413,13 @@ static void process_message(struct ceph_connection *con)</div><div class='ctx'> 	con-&gt;in_seq++;</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	dout("===== %p %llu from %s%lld %d=%s len %d+%d (%u %u %u) =====\n",</div><div class='add'>+	dout("===== %p %llu from %s%lld %d=%s len %d+%d+%d (%u %u %u) =====\n",</div><div class='ctx'> 	     msg, le64_to_cpu(msg-&gt;hdr.seq),</div><div class='ctx'> 	     ENTITY_NAME(msg-&gt;hdr.src),</div><div class='ctx'> 	     le16_to_cpu(msg-&gt;hdr.type),</div><div class='ctx'> 	     ceph_msg_type_name(le16_to_cpu(msg-&gt;hdr.type)),</div><div class='ctx'> 	     le32_to_cpu(msg-&gt;hdr.front_len),</div><div class='add'>+	     le32_to_cpu(msg-&gt;hdr.middle_len),</div><div class='ctx'> 	     le32_to_cpu(msg-&gt;hdr.data_len),</div><div class='ctx'> 	     con-&gt;in_front_crc, con-&gt;in_middle_crc, con-&gt;in_data_crc);</div><div class='ctx'> 	con-&gt;ops-&gt;dispatch(con, msg);</div><div class='hunk'>@@ -2571,264 +1427,6 @@ static void process_message(struct ceph_connection *con)</div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int read_keepalive_ack(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	struct ceph_timespec ceph_ts;</div><div class='del'>-	size_t size = sizeof(ceph_ts);</div><div class='del'>-	int ret = read_partial(con, size, size, &amp;ceph_ts);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ceph_decode_timespec64(&amp;con-&gt;last_keepalive_ack, &amp;ceph_ts);</div><div class='del'>-	prepare_read_tag(con);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write something to the socket.  Called in a worker thread when the</div><div class='del'>- * socket appears to be writeable and we have something ready to send.</div><div class='del'>- */</div><div class='del'>-static int try_write(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int ret = 1;</div><div class='del'>-</div><div class='del'>-	dout("try_write start %p state %lu\n", con, con-&gt;state);</div><div class='del'>-	if (con-&gt;state != CON_STATE_PREOPEN &amp;&amp;</div><div class='del'>-	    con-&gt;state != CON_STATE_CONNECTING &amp;&amp;</div><div class='del'>-	    con-&gt;state != CON_STATE_NEGOTIATING &amp;&amp;</div><div class='del'>-	    con-&gt;state != CON_STATE_OPEN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* open the socket first? */</div><div class='del'>-	if (con-&gt;state == CON_STATE_PREOPEN) {</div><div class='del'>-		BUG_ON(con-&gt;sock);</div><div class='del'>-		con-&gt;state = CON_STATE_CONNECTING;</div><div class='del'>-</div><div class='del'>-		con_out_kvec_reset(con);</div><div class='del'>-		prepare_write_banner(con);</div><div class='del'>-		prepare_read_banner(con);</div><div class='del'>-</div><div class='del'>-		BUG_ON(con-&gt;in_msg);</div><div class='del'>-		con-&gt;in_tag = CEPH_MSGR_TAG_READY;</div><div class='del'>-		dout("try_write initiating connect on %p new state %lu\n",</div><div class='del'>-		     con, con-&gt;state);</div><div class='del'>-		ret = ceph_tcp_connect(con);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			con-&gt;error_msg = "connect error";</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-more:</div><div class='del'>-	dout("try_write out_kvec_bytes %d\n", con-&gt;out_kvec_bytes);</div><div class='del'>-	BUG_ON(!con-&gt;sock);</div><div class='del'>-</div><div class='del'>-	/* kvec data queued? */</div><div class='del'>-	if (con-&gt;out_kvec_left) {</div><div class='del'>-		ret = write_partial_kvec(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;out_skip) {</div><div class='del'>-		ret = write_partial_skip(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* msg pages? */</div><div class='del'>-	if (con-&gt;out_msg) {</div><div class='del'>-		if (con-&gt;out_msg_done) {</div><div class='del'>-			ceph_msg_put(con-&gt;out_msg);</div><div class='del'>-			con-&gt;out_msg = NULL;   /* we're done with this one */</div><div class='del'>-			goto do_next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = write_partial_message_data(con);</div><div class='del'>-		if (ret == 1)</div><div class='del'>-			goto more;  /* we need to send the footer, too! */</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			goto out;</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dout("try_write write_partial_message_data err %d\n",</div><div class='del'>-			     ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-do_next:</div><div class='del'>-	if (con-&gt;state == CON_STATE_OPEN) {</div><div class='del'>-		if (con_flag_test_and_clear(con, CON_FLAG_KEEPALIVE_PENDING)) {</div><div class='del'>-			prepare_write_keepalive(con);</div><div class='del'>-			goto more;</div><div class='del'>-		}</div><div class='del'>-		/* is anything else pending? */</div><div class='del'>-		if (!list_empty(&amp;con-&gt;out_queue)) {</div><div class='del'>-			prepare_write_message(con);</div><div class='del'>-			goto more;</div><div class='del'>-		}</div><div class='del'>-		if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='del'>-			prepare_write_ack(con);</div><div class='del'>-			goto more;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Nothing to do! */</div><div class='del'>-	con_flag_clear(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-	dout("try_write nothing else to write.\n");</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	dout("try_write done on %p ret %d\n", con, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read what we can from the socket.</div><div class='del'>- */</div><div class='del'>-static int try_read(struct ceph_connection *con)</div><div class='del'>-{</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-more:</div><div class='del'>-	dout("try_read start on %p state %lu\n", con, con-&gt;state);</div><div class='del'>-	if (con-&gt;state != CON_STATE_CONNECTING &amp;&amp;</div><div class='del'>-	    con-&gt;state != CON_STATE_NEGOTIATING &amp;&amp;</div><div class='del'>-	    con-&gt;state != CON_STATE_OPEN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!con-&gt;sock);</div><div class='del'>-</div><div class='del'>-	dout("try_read tag %d in_base_pos %d\n", (int)con-&gt;in_tag,</div><div class='del'>-	     con-&gt;in_base_pos);</div><div class='del'>-</div><div class='del'>-	if (con-&gt;state == CON_STATE_CONNECTING) {</div><div class='del'>-		dout("try_read connecting\n");</div><div class='del'>-		ret = read_partial_banner(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		ret = process_banner(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		con-&gt;state = CON_STATE_NEGOTIATING;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Received banner is good, exchange connection info.</div><div class='del'>-		 * Do not reset out_kvec, as sending our banner raced</div><div class='del'>-		 * with receiving peer banner after connect completed.</div><div class='del'>-		 */</div><div class='del'>-		ret = prepare_write_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		prepare_read_connect(con);</div><div class='del'>-</div><div class='del'>-		/* Send connection info before awaiting response */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (con-&gt;state == CON_STATE_NEGOTIATING) {</div><div class='del'>-		dout("try_read negotiating\n");</div><div class='del'>-		ret = read_partial_connect(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		ret = process_connect(con);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		goto more;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(con-&gt;state != CON_STATE_OPEN);</div><div class='del'>-</div><div class='del'>-	if (con-&gt;in_base_pos &lt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * skipping + discarding content.</div><div class='del'>-		 */</div><div class='del'>-		ret = ceph_tcp_recvmsg(con-&gt;sock, NULL, -con-&gt;in_base_pos);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		dout("skipped %d / %d bytes\n", ret, -con-&gt;in_base_pos);</div><div class='del'>-		con-&gt;in_base_pos += ret;</div><div class='del'>-		if (con-&gt;in_base_pos)</div><div class='del'>-			goto more;</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;in_tag == CEPH_MSGR_TAG_READY) {</div><div class='del'>-		/*</div><div class='del'>-		 * what's next?</div><div class='del'>-		 */</div><div class='del'>-		ret = ceph_tcp_recvmsg(con-&gt;sock, &amp;con-&gt;in_tag, 1);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		dout("try_read got tag %d\n", (int)con-&gt;in_tag);</div><div class='del'>-		switch (con-&gt;in_tag) {</div><div class='del'>-		case CEPH_MSGR_TAG_MSG:</div><div class='del'>-			prepare_read_message(con);</div><div class='del'>-			break;</div><div class='del'>-		case CEPH_MSGR_TAG_ACK:</div><div class='del'>-			prepare_read_ack(con);</div><div class='del'>-			break;</div><div class='del'>-		case CEPH_MSGR_TAG_KEEPALIVE2_ACK:</div><div class='del'>-			prepare_read_keepalive_ack(con);</div><div class='del'>-			break;</div><div class='del'>-		case CEPH_MSGR_TAG_CLOSE:</div><div class='del'>-			con_close_socket(con);</div><div class='del'>-			con-&gt;state = CON_STATE_CLOSED;</div><div class='del'>-			goto out;</div><div class='del'>-		default:</div><div class='del'>-			goto bad_tag;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;in_tag == CEPH_MSGR_TAG_MSG) {</div><div class='del'>-		ret = read_partial_message(con);</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			switch (ret) {</div><div class='del'>-			case -EBADMSG:</div><div class='del'>-				con-&gt;error_msg = "bad crc/signature";</div><div class='del'>-				/* fall through */</div><div class='del'>-			case -EBADE:</div><div class='del'>-				ret = -EIO;</div><div class='del'>-				break;</div><div class='del'>-			case -EIO:</div><div class='del'>-				con-&gt;error_msg = "io error";</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (con-&gt;in_tag == CEPH_MSGR_TAG_READY)</div><div class='del'>-			goto more;</div><div class='del'>-		process_message(con);</div><div class='del'>-		if (con-&gt;state == CON_STATE_OPEN)</div><div class='del'>-			prepare_read_tag(con);</div><div class='del'>-		goto more;</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;in_tag == CEPH_MSGR_TAG_ACK ||</div><div class='del'>-	    con-&gt;in_tag == CEPH_MSGR_TAG_SEQ) {</div><div class='del'>-		/*</div><div class='del'>-		 * the final handshake seq exchange is semantically</div><div class='del'>-		 * equivalent to an ACK</div><div class='del'>-		 */</div><div class='del'>-		ret = read_partial_ack(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		process_ack(con);</div><div class='del'>-		goto more;</div><div class='del'>-	}</div><div class='del'>-	if (con-&gt;in_tag == CEPH_MSGR_TAG_KEEPALIVE2_ACK) {</div><div class='del'>-		ret = read_keepalive_ack(con);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto out;</div><div class='del'>-		goto more;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	dout("try_read done on %p ret %d\n", con, ret);</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-bad_tag:</div><div class='del'>-	pr_err("try_read bad con-&gt;in_tag = %d\n", (int)con-&gt;in_tag);</div><div class='del'>-	con-&gt;error_msg = "protocol error, garbage tag";</div><div class='del'>-	ret = -1;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Atomically queue work on a connection after the specified delay.</div><div class='ctx'>  * Bump @con reference to avoid races with connection teardown.</div><div class='hunk'>@@ -2841,13 +1439,16 @@ static int queue_con_delay(struct ceph_connection *con, unsigned long delay)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (delay &gt;= HZ)</div><div class='add'>+		delay = round_jiffies_relative(delay);</div><div class='add'>+</div><div class='add'>+	dout("%s %p %lu\n", __func__, con, delay);</div><div class='ctx'> 	if (!queue_delayed_work(ceph_msgr_wq, &amp;con-&gt;work, delay)) {</div><div class='ctx'> 		dout("%s %p - already queued\n", __func__, con);</div><div class='ctx'> 		con-&gt;ops-&gt;put(con);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dout("%s %p %lu\n", __func__, con, delay);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2866,27 +1467,30 @@ static void cancel_con(struct ceph_connection *con)</div><div class='ctx'> </div><div class='ctx'> static bool con_sock_closed(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='del'>-	if (!con_flag_test_and_clear(con, CON_FLAG_SOCK_CLOSED))</div><div class='add'>+	if (!ceph_con_flag_test_and_clear(con, CEPH_CON_F_SOCK_CLOSED))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> #define CASE(x)								\</div><div class='del'>-	case CON_STATE_ ## x:						\</div><div class='add'>+	case CEPH_CON_S_ ## x:						\</div><div class='ctx'> 		con-&gt;error_msg = "socket closed (con state " #x ")";	\</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	switch (con-&gt;state) {</div><div class='ctx'> 	CASE(CLOSED);</div><div class='ctx'> 	CASE(PREOPEN);</div><div class='del'>-	CASE(CONNECTING);</div><div class='del'>-	CASE(NEGOTIATING);</div><div class='add'>+	CASE(V1_BANNER);</div><div class='add'>+	CASE(V1_CONNECT_MSG);</div><div class='add'>+	CASE(V2_BANNER_PREFIX);</div><div class='add'>+	CASE(V2_BANNER_PAYLOAD);</div><div class='add'>+	CASE(V2_HELLO);</div><div class='add'>+	CASE(V2_AUTH);</div><div class='add'>+	CASE(V2_AUTH_SIGNATURE);</div><div class='add'>+	CASE(V2_SESSION_CONNECT);</div><div class='add'>+	CASE(V2_SESSION_RECONNECT);</div><div class='ctx'> 	CASE(OPEN);</div><div class='ctx'> 	CASE(STANDBY);</div><div class='ctx'> 	default:</div><div class='del'>-		pr_warn("%s con %p unrecognized state %lu\n",</div><div class='del'>-			__func__, con, con-&gt;state);</div><div class='del'>-		con-&gt;error_msg = "unrecognized con state";</div><div class='ctx'> 		BUG();</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> #undef CASE</div><div class='ctx'> </div><div class='hunk'>@@ -2897,15 +1501,15 @@ static bool con_backoff(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!con_flag_test_and_clear(con, CON_FLAG_BACKOFF))</div><div class='add'>+	if (!ceph_con_flag_test_and_clear(con, CEPH_CON_F_BACKOFF))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ret = queue_con_delay(con, round_jiffies_relative(con-&gt;delay));</div><div class='add'>+	ret = queue_con_delay(con, con-&gt;delay);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dout("%s: con %p FAILED to back off %lu\n", __func__,</div><div class='ctx'> 			con, con-&gt;delay);</div><div class='ctx'> 		BUG_ON(ret == -ENOENT);</div><div class='del'>-		con_flag_set(con, CON_FLAG_BACKOFF);</div><div class='add'>+		ceph_con_flag_set(con, CEPH_CON_F_BACKOFF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -2921,11 +1525,11 @@ static void con_fault_finish(struct ceph_connection *con)</div><div class='ctx'> 	 * in case we faulted due to authentication, invalidate our</div><div class='ctx'> 	 * current tickets so that we can get new ones.</div><div class='ctx'> 	 */</div><div class='del'>-	if (con-&gt;auth_retry) {</div><div class='del'>-		dout("auth_retry %d, invalidating\n", con-&gt;auth_retry);</div><div class='add'>+	if (!ceph_msgr2(from_msgr(con-&gt;msgr)) &amp;&amp; con-&gt;v1.auth_retry) {</div><div class='add'>+		dout("auth_retry %d, invalidating\n", con-&gt;v1.auth_retry);</div><div class='ctx'> 		if (con-&gt;ops-&gt;invalidate_authorizer)</div><div class='ctx'> 			con-&gt;ops-&gt;invalidate_authorizer(con);</div><div class='del'>-		con-&gt;auth_retry = 0;</div><div class='add'>+		con-&gt;v1.auth_retry = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (con-&gt;ops-&gt;fault)</div><div class='hunk'>@@ -2953,21 +1557,24 @@ static void ceph_con_workfn(struct work_struct *work)</div><div class='ctx'> 			dout("%s: con %p BACKOFF\n", __func__, con);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (con-&gt;state == CON_STATE_STANDBY) {</div><div class='add'>+		if (con-&gt;state == CEPH_CON_S_STANDBY) {</div><div class='ctx'> 			dout("%s: con %p STANDBY\n", __func__, con);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (con-&gt;state == CON_STATE_CLOSED) {</div><div class='add'>+		if (con-&gt;state == CEPH_CON_S_CLOSED) {</div><div class='ctx'> 			dout("%s: con %p CLOSED\n", __func__, con);</div><div class='ctx'> 			BUG_ON(con-&gt;sock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (con-&gt;state == CON_STATE_PREOPEN) {</div><div class='add'>+		if (con-&gt;state == CEPH_CON_S_PREOPEN) {</div><div class='ctx'> 			dout("%s: con %p PREOPEN\n", __func__, con);</div><div class='ctx'> 			BUG_ON(con-&gt;sock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = try_read(con);</div><div class='add'>+		if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+			ret = ceph_con_v2_try_read(con);</div><div class='add'>+		else</div><div class='add'>+			ret = ceph_con_v1_try_read(con);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			if (ret == -EAGAIN)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -2977,7 +1584,10 @@ static void ceph_con_workfn(struct work_struct *work)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = try_write(con);</div><div class='add'>+		if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+			ret = ceph_con_v2_try_write(con);</div><div class='add'>+		else</div><div class='add'>+			ret = ceph_con_v1_try_write(con);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			if (ret == -EAGAIN)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -3004,54 +1614,55 @@ static void ceph_con_workfn(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static void con_fault(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='del'>-	dout("fault %p state %lu to peer %s\n",</div><div class='del'>-	     con, con-&gt;state, ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr));</div><div class='add'>+	dout("fault %p state %d to peer %s\n",</div><div class='add'>+	     con, con-&gt;state, ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='ctx'> </div><div class='ctx'> 	pr_warn("%s%lld %s %s\n", ENTITY_NAME(con-&gt;peer_name),</div><div class='del'>-		ceph_pr_addr(&amp;con-&gt;peer_addr.in_addr), con-&gt;error_msg);</div><div class='add'>+		ceph_pr_addr(&amp;con-&gt;peer_addr), con-&gt;error_msg);</div><div class='ctx'> 	con-&gt;error_msg = NULL;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(con-&gt;state != CON_STATE_CONNECTING &amp;&amp;</div><div class='del'>-	       con-&gt;state != CON_STATE_NEGOTIATING &amp;&amp;</div><div class='del'>-	       con-&gt;state != CON_STATE_OPEN);</div><div class='add'>+	WARN_ON(con-&gt;state == CEPH_CON_S_STANDBY ||</div><div class='add'>+		con-&gt;state == CEPH_CON_S_CLOSED);</div><div class='ctx'> </div><div class='del'>-	con_close_socket(con);</div><div class='add'>+	ceph_con_reset_protocol(con);</div><div class='ctx'> </div><div class='del'>-	if (con_flag_test(con, CON_FLAG_LOSSYTX)) {</div><div class='add'>+	if (ceph_con_flag_test(con, CEPH_CON_F_LOSSYTX)) {</div><div class='ctx'> 		dout("fault on LOSSYTX channel, marking CLOSED\n");</div><div class='del'>-		con-&gt;state = CON_STATE_CLOSED;</div><div class='add'>+		con-&gt;state = CEPH_CON_S_CLOSED;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (con-&gt;in_msg) {</div><div class='del'>-		BUG_ON(con-&gt;in_msg-&gt;con != con);</div><div class='del'>-		ceph_msg_put(con-&gt;in_msg);</div><div class='del'>-		con-&gt;in_msg = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Requeue anything that hasn't been acked */</div><div class='ctx'> 	list_splice_init(&amp;con-&gt;out_sent, &amp;con-&gt;out_queue);</div><div class='ctx'> </div><div class='ctx'> 	/* If there are no messages queued or keepalive pending, place</div><div class='ctx'> 	 * the connection in a STANDBY state */</div><div class='ctx'> 	if (list_empty(&amp;con-&gt;out_queue) &amp;&amp;</div><div class='del'>-	    !con_flag_test(con, CON_FLAG_KEEPALIVE_PENDING)) {</div><div class='add'>+	    !ceph_con_flag_test(con, CEPH_CON_F_KEEPALIVE_PENDING)) {</div><div class='ctx'> 		dout("fault %p setting STANDBY clearing WRITE_PENDING\n", con);</div><div class='del'>-		con_flag_clear(con, CON_FLAG_WRITE_PENDING);</div><div class='del'>-		con-&gt;state = CON_STATE_STANDBY;</div><div class='add'>+		ceph_con_flag_clear(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+		con-&gt;state = CEPH_CON_S_STANDBY;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* retry after a delay. */</div><div class='del'>-		con-&gt;state = CON_STATE_PREOPEN;</div><div class='del'>-		if (con-&gt;delay == 0)</div><div class='add'>+		con-&gt;state = CEPH_CON_S_PREOPEN;</div><div class='add'>+		if (!con-&gt;delay) {</div><div class='ctx'> 			con-&gt;delay = BASE_DELAY_INTERVAL;</div><div class='del'>-		else if (con-&gt;delay &lt; MAX_DELAY_INTERVAL)</div><div class='add'>+		} else if (con-&gt;delay &lt; MAX_DELAY_INTERVAL) {</div><div class='ctx'> 			con-&gt;delay *= 2;</div><div class='del'>-		con_flag_set(con, CON_FLAG_BACKOFF);</div><div class='add'>+			if (con-&gt;delay &gt; MAX_DELAY_INTERVAL)</div><div class='add'>+				con-&gt;delay = MAX_DELAY_INTERVAL;</div><div class='add'>+		}</div><div class='add'>+		ceph_con_flag_set(con, CEPH_CON_F_BACKOFF);</div><div class='ctx'> 		queue_con(con);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+void ceph_messenger_reset_nonce(struct ceph_messenger *msgr)</div><div class='add'>+{</div><div class='add'>+	u32 nonce = le32_to_cpu(msgr-&gt;inst.addr.nonce) + 1000000;</div><div class='add'>+	msgr-&gt;inst.addr.nonce = cpu_to_le32(nonce);</div><div class='add'>+	ceph_encode_my_addr(msgr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * initialize a new messenger instance</div><div class='hunk'>@@ -3061,26 +1672,35 @@ void ceph_messenger_init(struct ceph_messenger *msgr,</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_init(&amp;msgr-&gt;global_seq_lock);</div><div class='ctx'> </div><div class='del'>-	if (myaddr)</div><div class='del'>-		msgr-&gt;inst.addr = *myaddr;</div><div class='add'>+	if (myaddr) {</div><div class='add'>+		memcpy(&amp;msgr-&gt;inst.addr.in_addr, &amp;myaddr-&gt;in_addr,</div><div class='add'>+		       sizeof(msgr-&gt;inst.addr.in_addr));</div><div class='add'>+		ceph_addr_set_port(&amp;msgr-&gt;inst.addr, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since nautilus, clients are identified using type ANY.</div><div class='add'>+	 * For msgr1, ceph_encode_banner_addr() munges it to NONE.</div><div class='add'>+	 */</div><div class='add'>+	msgr-&gt;inst.addr.type = CEPH_ENTITY_ADDR_TYPE_ANY;</div><div class='ctx'> </div><div class='del'>-	/* select a random nonce */</div><div class='del'>-	msgr-&gt;inst.addr.type = 0;</div><div class='del'>-	get_random_bytes(&amp;msgr-&gt;inst.addr.nonce, sizeof(msgr-&gt;inst.addr.nonce));</div><div class='del'>-	encode_my_addr(msgr);</div><div class='add'>+	/* generate a random non-zero nonce */</div><div class='add'>+	do {</div><div class='add'>+		get_random_bytes(&amp;msgr-&gt;inst.addr.nonce,</div><div class='add'>+				 sizeof(msgr-&gt;inst.addr.nonce));</div><div class='add'>+	} while (!msgr-&gt;inst.addr.nonce);</div><div class='add'>+	ceph_encode_my_addr(msgr);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;msgr-&gt;stopping, 0);</div><div class='ctx'> 	write_pnet(&amp;msgr-&gt;net, get_net(current-&gt;nsproxy-&gt;net_ns));</div><div class='ctx'> </div><div class='ctx'> 	dout("%s %p\n", __func__, msgr);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_messenger_init);</div><div class='ctx'> </div><div class='ctx'> void ceph_messenger_fini(struct ceph_messenger *msgr)</div><div class='ctx'> {</div><div class='ctx'> 	put_net(read_pnet(&amp;msgr-&gt;net));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_messenger_fini);</div><div class='ctx'> </div><div class='ctx'> static void msg_con_set(struct ceph_msg *msg, struct ceph_connection *con)</div><div class='ctx'> {</div><div class='hunk'>@@ -3094,17 +1714,20 @@ static void msg_con_set(struct ceph_msg *msg, struct ceph_connection *con)</div><div class='ctx'> static void clear_standby(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	/* come back from STANDBY? */</div><div class='del'>-	if (con-&gt;state == CON_STATE_STANDBY) {</div><div class='del'>-		dout("clear_standby %p and ++connect_seq\n", con);</div><div class='del'>-		con-&gt;state = CON_STATE_PREOPEN;</div><div class='del'>-		con-&gt;connect_seq++;</div><div class='del'>-		WARN_ON(con_flag_test(con, CON_FLAG_WRITE_PENDING));</div><div class='del'>-		WARN_ON(con_flag_test(con, CON_FLAG_KEEPALIVE_PENDING));</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_STANDBY) {</div><div class='add'>+		dout("clear_standby %p\n", con);</div><div class='add'>+		con-&gt;state = CEPH_CON_S_PREOPEN;</div><div class='add'>+		if (!ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+			con-&gt;v1.connect_seq++;</div><div class='add'>+		WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_WRITE_PENDING));</div><div class='add'>+		WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_KEEPALIVE_PENDING));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Queue up an outgoing message on the given connection.</div><div class='add'>+ *</div><div class='add'>+ * Consumes a ref on @msg.</div><div class='ctx'>  */</div><div class='ctx'> void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='hunk'>@@ -3115,7 +1738,7 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (con-&gt;state == CON_STATE_CLOSED) {</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_CLOSED) {</div><div class='ctx'> 		dout("con_send %p closed, dropping %p\n", con, msg);</div><div class='ctx'> 		ceph_msg_put(msg);</div><div class='ctx'> 		mutex_unlock(&amp;con-&gt;mutex);</div><div class='hunk'>@@ -3138,7 +1761,7 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	/* if there wasn't anything waiting to send before, queue</div><div class='ctx'> 	 * new work */</div><div class='del'>-	if (con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)</div><div class='add'>+	if (!ceph_con_flag_test_and_set(con, CEPH_CON_F_WRITE_PENDING))</div><div class='ctx'> 		queue_con(con);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_con_send);</div><div class='hunk'>@@ -3156,36 +1779,30 @@ void ceph_msg_revoke(struct ceph_msg *msg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='del'>-	if (!list_empty(&amp;msg-&gt;list_head)) {</div><div class='del'>-		dout("%s %p msg %p - was on queue\n", __func__, con, msg);</div><div class='del'>-		list_del_init(&amp;msg-&gt;list_head);</div><div class='del'>-		msg-&gt;hdr.seq = 0;</div><div class='del'>-</div><div class='del'>-		ceph_msg_put(msg);</div><div class='add'>+	if (list_empty(&amp;msg-&gt;list_head)) {</div><div class='add'>+		WARN_ON(con-&gt;out_msg == msg);</div><div class='add'>+		dout("%s con %p msg %p not linked\n", __func__, con, msg);</div><div class='add'>+		mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p msg %p was linked\n", __func__, con, msg);</div><div class='add'>+	msg-&gt;hdr.seq = 0;</div><div class='add'>+	ceph_msg_remove(msg);</div><div class='add'>+</div><div class='ctx'> 	if (con-&gt;out_msg == msg) {</div><div class='del'>-		BUG_ON(con-&gt;out_skip);</div><div class='del'>-		/* footer */</div><div class='del'>-		if (con-&gt;out_msg_done) {</div><div class='del'>-			con-&gt;out_skip += con_out_kvec_skip(con);</div><div class='del'>-		} else {</div><div class='del'>-			BUG_ON(!msg-&gt;data_length);</div><div class='del'>-			con-&gt;out_skip += sizeof_footer(con);</div><div class='del'>-		}</div><div class='del'>-		/* data, middle, front */</div><div class='del'>-		if (msg-&gt;data_length)</div><div class='del'>-			con-&gt;out_skip += msg-&gt;cursor.total_resid;</div><div class='del'>-		if (msg-&gt;middle)</div><div class='del'>-			con-&gt;out_skip += con_out_kvec_skip(con);</div><div class='del'>-		con-&gt;out_skip += con_out_kvec_skip(con);</div><div class='del'>-</div><div class='del'>-		dout("%s %p msg %p - was sending, will write %d skip %d\n",</div><div class='del'>-		     __func__, con, msg, con-&gt;out_kvec_bytes, con-&gt;out_skip);</div><div class='del'>-		msg-&gt;hdr.seq = 0;</div><div class='add'>+		WARN_ON(con-&gt;state != CEPH_CON_S_OPEN);</div><div class='add'>+		dout("%s con %p msg %p was sending\n", __func__, con, msg);</div><div class='add'>+		if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+			ceph_con_v2_revoke(con, msg);</div><div class='add'>+		else</div><div class='add'>+			ceph_con_v1_revoke(con, msg);</div><div class='add'>+		ceph_msg_put(con-&gt;out_msg);</div><div class='ctx'> 		con-&gt;out_msg = NULL;</div><div class='del'>-		ceph_msg_put(msg);</div><div class='add'>+	} else {</div><div class='add'>+		dout("%s con %p msg %p not current, out_msg %p\n", __func__,</div><div class='add'>+		     con, msg, con-&gt;out_msg);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3203,25 +1820,17 @@ void ceph_msg_revoke_incoming(struct ceph_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='ctx'> 	if (con-&gt;in_msg == msg) {</div><div class='del'>-		unsigned int front_len = le32_to_cpu(con-&gt;in_hdr.front_len);</div><div class='del'>-		unsigned int middle_len = le32_to_cpu(con-&gt;in_hdr.middle_len);</div><div class='del'>-		unsigned int data_len = le32_to_cpu(con-&gt;in_hdr.data_len);</div><div class='del'>-</div><div class='del'>-		/* skip rest of message */</div><div class='del'>-		dout("%s %p msg %p revoked\n", __func__, con, msg);</div><div class='del'>-		con-&gt;in_base_pos = con-&gt;in_base_pos -</div><div class='del'>-				sizeof(struct ceph_msg_header) -</div><div class='del'>-				front_len -</div><div class='del'>-				middle_len -</div><div class='del'>-				data_len -</div><div class='del'>-				sizeof(struct ceph_msg_footer);</div><div class='add'>+		WARN_ON(con-&gt;state != CEPH_CON_S_OPEN);</div><div class='add'>+		dout("%s con %p msg %p was recving\n", __func__, con, msg);</div><div class='add'>+		if (ceph_msgr2(from_msgr(con-&gt;msgr)))</div><div class='add'>+			ceph_con_v2_revoke_incoming(con);</div><div class='add'>+		else</div><div class='add'>+			ceph_con_v1_revoke_incoming(con);</div><div class='ctx'> 		ceph_msg_put(con-&gt;in_msg);</div><div class='ctx'> 		con-&gt;in_msg = NULL;</div><div class='del'>-		con-&gt;in_tag = CEPH_MSGR_TAG_READY;</div><div class='del'>-		con-&gt;in_seq++;</div><div class='ctx'> 	} else {</div><div class='del'>-		dout("%s %p in_msg %p msg %p no-op\n",</div><div class='del'>-		     __func__, con, con-&gt;in_msg, msg);</div><div class='add'>+		dout("%s con %p msg %p not current, in_msg %p\n", __func__,</div><div class='add'>+		     con, msg, con-&gt;in_msg);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -3234,9 +1843,10 @@ void ceph_con_keepalive(struct ceph_connection *con)</div><div class='ctx'> 	dout("con_keepalive %p\n", con);</div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='ctx'> 	clear_standby(con);</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_KEEPALIVE_PENDING);</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='del'>-	if (con_flag_test_and_set(con, CON_FLAG_KEEPALIVE_PENDING) == 0 &amp;&amp;</div><div class='del'>-	    con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)</div><div class='add'>+</div><div class='add'>+	if (!ceph_con_flag_test_and_set(con, CEPH_CON_F_WRITE_PENDING))</div><div class='ctx'> 		queue_con(con);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_con_keepalive);</div><div class='hunk'>@@ -3256,49 +1866,37 @@ bool ceph_con_keepalive_expired(struct ceph_connection *con,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ceph_msg_data *ceph_msg_data_create(enum ceph_msg_data_type type)</div><div class='add'>+static struct ceph_msg_data *ceph_msg_data_add(struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_msg_data *data;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!ceph_msg_data_type_valid(type)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	data = kmem_cache_zalloc(ceph_msg_data_cache, GFP_NOFS);</div><div class='del'>-	if (!data)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	data-&gt;type = type;</div><div class='del'>-	INIT_LIST_HEAD(&amp;data-&gt;links);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='add'>+	BUG_ON(msg-&gt;num_data_items &gt;= msg-&gt;max_data_items);</div><div class='add'>+	return &amp;msg-&gt;data[msg-&gt;num_data_items++];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_msg_data_destroy(struct ceph_msg_data *data)</div><div class='ctx'> {</div><div class='del'>-	if (!data)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!list_empty(&amp;data-&gt;links));</div><div class='del'>-	if (data-&gt;type == CEPH_MSG_DATA_PAGELIST)</div><div class='add'>+	if (data-&gt;type == CEPH_MSG_DATA_PAGES &amp;&amp; data-&gt;own_pages) {</div><div class='add'>+		int num_pages = calc_pages_for(data-&gt;alignment, data-&gt;length);</div><div class='add'>+		ceph_release_page_vector(data-&gt;pages, num_pages);</div><div class='add'>+	} else if (data-&gt;type == CEPH_MSG_DATA_PAGELIST) {</div><div class='ctx'> 		ceph_pagelist_release(data-&gt;pagelist);</div><div class='del'>-	kmem_cache_free(ceph_msg_data_cache, data);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ceph_msg_data_add_pages(struct ceph_msg *msg, struct page **pages,</div><div class='del'>-		size_t length, size_t alignment)</div><div class='add'>+			     size_t length, size_t alignment, bool own_pages)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg_data *data;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!pages);</div><div class='ctx'> 	BUG_ON(!length);</div><div class='ctx'> </div><div class='del'>-	data = ceph_msg_data_create(CEPH_MSG_DATA_PAGES);</div><div class='del'>-	BUG_ON(!data);</div><div class='add'>+	data = ceph_msg_data_add(msg);</div><div class='add'>+	data-&gt;type = CEPH_MSG_DATA_PAGES;</div><div class='ctx'> 	data-&gt;pages = pages;</div><div class='ctx'> 	data-&gt;length = length;</div><div class='ctx'> 	data-&gt;alignment = alignment &amp; ~PAGE_MASK;</div><div class='add'>+	data-&gt;own_pages = own_pages;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;data-&gt;links, &amp;msg-&gt;data);</div><div class='ctx'> 	msg-&gt;data_length += length;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_msg_data_add_pages);</div><div class='hunk'>@@ -3311,11 +1909,11 @@ void ceph_msg_data_add_pagelist(struct ceph_msg *msg,</div><div class='ctx'> 	BUG_ON(!pagelist);</div><div class='ctx'> 	BUG_ON(!pagelist-&gt;length);</div><div class='ctx'> </div><div class='del'>-	data = ceph_msg_data_create(CEPH_MSG_DATA_PAGELIST);</div><div class='del'>-	BUG_ON(!data);</div><div class='add'>+	data = ceph_msg_data_add(msg);</div><div class='add'>+	data-&gt;type = CEPH_MSG_DATA_PAGELIST;</div><div class='add'>+	refcount_inc(&amp;pagelist-&gt;refcnt);</div><div class='ctx'> 	data-&gt;pagelist = pagelist;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;data-&gt;links, &amp;msg-&gt;data);</div><div class='ctx'> 	msg-&gt;data_length += pagelist-&gt;length;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_msg_data_add_pagelist);</div><div class='hunk'>@@ -3326,12 +1924,11 @@ void ceph_msg_data_add_bio(struct ceph_msg *msg, struct ceph_bio_iter *bio_pos,</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg_data *data;</div><div class='ctx'> </div><div class='del'>-	data = ceph_msg_data_create(CEPH_MSG_DATA_BIO);</div><div class='del'>-	BUG_ON(!data);</div><div class='add'>+	data = ceph_msg_data_add(msg);</div><div class='add'>+	data-&gt;type = CEPH_MSG_DATA_BIO;</div><div class='ctx'> 	data-&gt;bio_pos = *bio_pos;</div><div class='ctx'> 	data-&gt;bio_length = length;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;data-&gt;links, &amp;msg-&gt;data);</div><div class='ctx'> 	msg-&gt;data_length += length;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_msg_data_add_bio);</div><div class='hunk'>@@ -3342,21 +1939,32 @@ void ceph_msg_data_add_bvecs(struct ceph_msg *msg,</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg_data *data;</div><div class='ctx'> </div><div class='del'>-	data = ceph_msg_data_create(CEPH_MSG_DATA_BVECS);</div><div class='del'>-	BUG_ON(!data);</div><div class='add'>+	data = ceph_msg_data_add(msg);</div><div class='add'>+	data-&gt;type = CEPH_MSG_DATA_BVECS;</div><div class='ctx'> 	data-&gt;bvec_pos = *bvec_pos;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;data-&gt;links, &amp;msg-&gt;data);</div><div class='ctx'> 	msg-&gt;data_length += bvec_pos-&gt;iter.bi_size;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_msg_data_add_bvecs);</div><div class='ctx'> </div><div class='add'>+void ceph_msg_data_add_iter(struct ceph_msg *msg,</div><div class='add'>+			    struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data *data;</div><div class='add'>+</div><div class='add'>+	data = ceph_msg_data_add(msg);</div><div class='add'>+	data-&gt;type = CEPH_MSG_DATA_ITER;</div><div class='add'>+	data-&gt;iter = *iter;</div><div class='add'>+</div><div class='add'>+	msg-&gt;data_length += iov_iter_count(&amp;data-&gt;iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * construct a new message with given type, size</div><div class='ctx'>  * the new msg has a ref count of 1.</div><div class='ctx'>  */</div><div class='del'>-struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,</div><div class='del'>-			      bool can_fail)</div><div class='add'>+struct ceph_msg *ceph_msg_new2(int type, int front_len, int max_data_items,</div><div class='add'>+			       gfp_t flags, bool can_fail)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg *m;</div><div class='ctx'> </div><div class='hunk'>@@ -3370,11 +1978,10 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;m-&gt;list_head);</div><div class='ctx'> 	kref_init(&amp;m-&gt;kref);</div><div class='del'>-	INIT_LIST_HEAD(&amp;m-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	/* front */</div><div class='ctx'> 	if (front_len) {</div><div class='del'>-		m-&gt;front.iov_base = ceph_kvmalloc(front_len, flags);</div><div class='add'>+		m-&gt;front.iov_base = kvmalloc(front_len, flags);</div><div class='ctx'> 		if (m-&gt;front.iov_base == NULL) {</div><div class='ctx'> 			dout("ceph_msg_new can't allocate %d bytes\n",</div><div class='ctx'> 			     front_len);</div><div class='hunk'>@@ -3385,6 +1992,15 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,</div><div class='ctx'> 	}</div><div class='ctx'> 	m-&gt;front_alloc_len = m-&gt;front.iov_len = front_len;</div><div class='ctx'> </div><div class='add'>+	if (max_data_items) {</div><div class='add'>+		m-&gt;data = kmalloc_array(max_data_items, sizeof(*m-&gt;data),</div><div class='add'>+					flags);</div><div class='add'>+		if (!m-&gt;data)</div><div class='add'>+			goto out2;</div><div class='add'>+</div><div class='add'>+		m-&gt;max_data_items = max_data_items;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dout("ceph_msg_new %p front %d\n", m, front_len);</div><div class='ctx'> 	return m;</div><div class='ctx'> </div><div class='hunk'>@@ -3401,6 +2017,13 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ceph_msg_new2);</div><div class='add'>+</div><div class='add'>+struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,</div><div class='add'>+			      bool can_fail)</div><div class='add'>+{</div><div class='add'>+	return ceph_msg_new2(type, front_len, 0, flags, can_fail);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ceph_msg_new);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3441,9 +2064,9 @@ static int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'>  * On error (ENOMEM, EAGAIN, ...),</div><div class='ctx'>  *  - con-&gt;in_msg == NULL</div><div class='ctx'>  */</div><div class='del'>-static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)</div><div class='add'>+int ceph_con_in_msg_alloc(struct ceph_connection *con,</div><div class='add'>+			  struct ceph_msg_header *hdr, int *skip)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_msg_header *hdr = &amp;con-&gt;in_hdr;</div><div class='ctx'> 	int middle_len = le32_to_cpu(hdr-&gt;middle_len);</div><div class='ctx'> 	struct ceph_msg *msg;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -3454,7 +2077,7 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)</div><div class='ctx'> 	mutex_unlock(&amp;con-&gt;mutex);</div><div class='ctx'> 	msg = con-&gt;ops-&gt;alloc_msg(con, hdr, skip);</div><div class='ctx'> 	mutex_lock(&amp;con-&gt;mutex);</div><div class='del'>-	if (con-&gt;state != CON_STATE_OPEN) {</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_OPEN) {</div><div class='ctx'> 		if (msg)</div><div class='ctx'> 			ceph_msg_put(msg);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -3475,7 +2098,7 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)</div><div class='ctx'> 		con-&gt;error_msg = "error allocating memory for incoming message";</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(&amp;con-&gt;in_msg-&gt;hdr, &amp;con-&gt;in_hdr, sizeof(con-&gt;in_hdr));</div><div class='add'>+	memcpy(&amp;con-&gt;in_msg-&gt;hdr, hdr, sizeof(*hdr));</div><div class='ctx'> </div><div class='ctx'> 	if (middle_len &amp;&amp; !con-&gt;in_msg-&gt;middle) {</div><div class='ctx'> 		ret = ceph_alloc_middle(con, con-&gt;in_msg);</div><div class='hunk'>@@ -3488,6 +2111,41 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ceph_msg *ceph_con_get_out_msg(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;con-&gt;out_queue))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	msg = list_first_entry(&amp;con-&gt;out_queue, struct ceph_msg, list_head);</div><div class='add'>+	WARN_ON(msg-&gt;con != con);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Put the message on "sent" list using a ref from ceph_con_send().</div><div class='add'>+	 * It is put when the message is acked or revoked.</div><div class='add'>+	 */</div><div class='add'>+	list_move_tail(&amp;msg-&gt;list_head, &amp;con-&gt;out_sent);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only assign outgoing seq # if we haven't sent this message</div><div class='add'>+	 * yet.  If it is requeued, resend with it's original seq.</div><div class='add'>+	 */</div><div class='add'>+	if (msg-&gt;needs_out_seq) {</div><div class='add'>+		msg-&gt;hdr.seq = cpu_to_le64(++con-&gt;out_seq);</div><div class='add'>+		msg-&gt;needs_out_seq = false;</div><div class='add'>+</div><div class='add'>+		if (con-&gt;ops-&gt;reencode_message)</div><div class='add'>+			con-&gt;ops-&gt;reencode_message(msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get a ref for out_msg.  It is put when we are done sending the</div><div class='add'>+	 * message or in case of a fault.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(con-&gt;out_msg);</div><div class='add'>+	return con-&gt;out_msg = ceph_msg_get(msg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Free a generically kmalloc'd message.</div><div class='hunk'>@@ -3496,13 +2154,14 @@ static void ceph_msg_free(struct ceph_msg *m)</div><div class='ctx'> {</div><div class='ctx'> 	dout("%s %p\n", __func__, m);</div><div class='ctx'> 	kvfree(m-&gt;front.iov_base);</div><div class='add'>+	kfree(m-&gt;data);</div><div class='ctx'> 	kmem_cache_free(ceph_msg_cache, m);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_msg_release(struct kref *kref)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg *m = container_of(kref, struct ceph_msg, kref);</div><div class='del'>-	struct ceph_msg_data *data, *next;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	dout("%s %p\n", __func__, m);</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;m-&gt;list_head));</div><div class='hunk'>@@ -3515,11 +2174,8 @@ static void ceph_msg_release(struct kref *kref)</div><div class='ctx'> 		m-&gt;middle = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(data, next, &amp;m-&gt;data, links) {</div><div class='del'>-		list_del_init(&amp;data-&gt;links);</div><div class='del'>-		ceph_msg_data_destroy(data);</div><div class='del'>-	}</div><div class='del'>-	m-&gt;data_length = 0;</div><div class='add'>+	for (i = 0; i &lt; m-&gt;num_data_items; i++)</div><div class='add'>+		ceph_msg_data_destroy(&amp;m-&gt;data[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (m-&gt;pool)</div><div class='ctx'> 		ceph_msgpool_put(m-&gt;pool, m);</div><div class='head'>diff --git a/net/ceph/messenger_v1.c b/net/ceph/messenger_v1.c<br/>new file mode 100644<br/>index 000000000000..c9e002d96319<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/messenger_v1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/messenger_v1.c</a></div><div class='hunk'>@@ -0,0 +1,1620 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bvec.h&gt;</div><div class='add'>+#include &lt;linux/crc32c.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ceph/ceph_features.h&gt;</div><div class='add'>+#include &lt;linux/ceph/decode.h&gt;</div><div class='add'>+#include &lt;linux/ceph/libceph.h&gt;</div><div class='add'>+#include &lt;linux/ceph/messenger.h&gt;</div><div class='add'>+</div><div class='add'>+/* static tag bytes (protocol control messages) */</div><div class='add'>+static char tag_msg = CEPH_MSGR_TAG_MSG;</div><div class='add'>+static char tag_ack = CEPH_MSGR_TAG_ACK;</div><div class='add'>+static char tag_keepalive = CEPH_MSGR_TAG_KEEPALIVE;</div><div class='add'>+static char tag_keepalive2 = CEPH_MSGR_TAG_KEEPALIVE2;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If @buf is NULL, discard up to @len bytes.</div><div class='add'>+ */</div><div class='add'>+static int ceph_tcp_recvmsg(struct socket *sock, void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct kvec iov = {buf, len};</div><div class='add'>+	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		msg.msg_flags |= MSG_TRUNC;</div><div class='add'>+</div><div class='add'>+	iov_iter_kvec(&amp;msg.msg_iter, ITER_DEST, &amp;iov, 1, len);</div><div class='add'>+	r = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='add'>+	if (r == -EAGAIN)</div><div class='add'>+		r = 0;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ceph_tcp_recvpage(struct socket *sock, struct page *page,</div><div class='add'>+		     int page_offset, size_t length)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bvec;</div><div class='add'>+	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	BUG_ON(page_offset + length &gt; PAGE_SIZE);</div><div class='add'>+	bvec_set_page(&amp;bvec, page, length, page_offset);</div><div class='add'>+	iov_iter_bvec(&amp;msg.msg_iter, ITER_DEST, &amp;bvec, 1, length);</div><div class='add'>+	r = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='add'>+	if (r == -EAGAIN)</div><div class='add'>+		r = 0;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write something.  @more is true if caller will be sending more data</div><div class='add'>+ * shortly.</div><div class='add'>+ */</div><div class='add'>+static int ceph_tcp_sendmsg(struct socket *sock, struct kvec *iov,</div><div class='add'>+			    size_t kvlen, size_t len, bool more)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL };</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (more)</div><div class='add'>+		msg.msg_flags |= MSG_MORE;</div><div class='add'>+	else</div><div class='add'>+		msg.msg_flags |= MSG_EOR;  /* superfluous, but what the hell */</div><div class='add'>+</div><div class='add'>+	r = kernel_sendmsg(sock, &amp;msg, iov, kvlen, len);</div><div class='add'>+	if (r == -EAGAIN)</div><div class='add'>+		r = 0;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @more: MSG_MORE or 0.</div><div class='add'>+ */</div><div class='add'>+static int ceph_tcp_sendpage(struct socket *sock, struct page *page,</div><div class='add'>+			     int offset, size_t size, int more)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = {</div><div class='add'>+		.msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL | more,</div><div class='add'>+	};</div><div class='add'>+	struct bio_vec bvec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MSG_SPLICE_PAGES cannot properly handle pages with page_count == 0,</div><div class='add'>+	 * we need to fall back to sendmsg if that's the case.</div><div class='add'>+	 *</div><div class='add'>+	 * Same goes for slab pages: skb_can_coalesce() allows</div><div class='add'>+	 * coalescing neighboring slab objects into a single frag which</div><div class='add'>+	 * triggers one of hardened usercopy checks.</div><div class='add'>+	 */</div><div class='add'>+	if (sendpage_ok(page))</div><div class='add'>+		msg.msg_flags |= MSG_SPLICE_PAGES;</div><div class='add'>+</div><div class='add'>+	bvec_set_page(&amp;bvec, page, size, offset);</div><div class='add'>+	iov_iter_bvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;bvec, 1, size);</div><div class='add'>+</div><div class='add'>+	ret = sock_sendmsg(sock, &amp;msg);</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void con_out_kvec_reset(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(con-&gt;v1.out_skip);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_kvec_left = 0;</div><div class='add'>+	con-&gt;v1.out_kvec_bytes = 0;</div><div class='add'>+	con-&gt;v1.out_kvec_cur = &amp;con-&gt;v1.out_kvec[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void con_out_kvec_add(struct ceph_connection *con,</div><div class='add'>+				size_t size, void *data)</div><div class='add'>+{</div><div class='add'>+	int index = con-&gt;v1.out_kvec_left;</div><div class='add'>+</div><div class='add'>+	BUG_ON(con-&gt;v1.out_skip);</div><div class='add'>+	BUG_ON(index &gt;= ARRAY_SIZE(con-&gt;v1.out_kvec));</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_kvec[index].iov_len = size;</div><div class='add'>+	con-&gt;v1.out_kvec[index].iov_base = data;</div><div class='add'>+	con-&gt;v1.out_kvec_left++;</div><div class='add'>+	con-&gt;v1.out_kvec_bytes += size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chop off a kvec from the end.  Return residual number of bytes for</div><div class='add'>+ * that kvec, i.e. how many bytes would have been written if the kvec</div><div class='add'>+ * hadn't been nuked.</div><div class='add'>+ */</div><div class='add'>+static int con_out_kvec_skip(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int skip = 0;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v1.out_kvec_bytes &gt; 0) {</div><div class='add'>+		skip = con-&gt;v1.out_kvec_cur[con-&gt;v1.out_kvec_left - 1].iov_len;</div><div class='add'>+		BUG_ON(con-&gt;v1.out_kvec_bytes &lt; skip);</div><div class='add'>+		BUG_ON(!con-&gt;v1.out_kvec_left);</div><div class='add'>+		con-&gt;v1.out_kvec_bytes -= skip;</div><div class='add'>+		con-&gt;v1.out_kvec_left--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sizeof_footer(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	return (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH) ?</div><div class='add'>+	    sizeof(struct ceph_msg_footer) :</div><div class='add'>+	    sizeof(struct ceph_msg_footer_old);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_message_data(struct ceph_msg *msg, u32 data_len)</div><div class='add'>+{</div><div class='add'>+	/* Initialize data cursor if it's not a sparse read */</div><div class='add'>+	u64 len = msg-&gt;sparse_read_total ? : data_len;</div><div class='add'>+</div><div class='add'>+	ceph_msg_data_cursor_init(&amp;msg-&gt;cursor, msg, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare footer for currently outgoing message, and finish things</div><div class='add'>+ * off.  Assumes out_kvec* are already valid.. we just add on to the end.</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_message_footer(struct ceph_connection *con,</div><div class='add'>+					 struct ceph_msg *m)</div><div class='add'>+{</div><div class='add'>+	m-&gt;footer.flags |= CEPH_MSG_FOOTER_COMPLETE;</div><div class='add'>+</div><div class='add'>+	dout("prepare_write_message_footer %p\n", con);</div><div class='add'>+	con_out_kvec_add(con, sizeof_footer(con), &amp;m-&gt;footer);</div><div class='add'>+	if (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH) {</div><div class='add'>+		if (con-&gt;ops-&gt;sign_message)</div><div class='add'>+			con-&gt;ops-&gt;sign_message(m);</div><div class='add'>+		else</div><div class='add'>+			m-&gt;footer.sig = 0;</div><div class='add'>+	} else {</div><div class='add'>+		m-&gt;old_footer.flags = m-&gt;footer.flags;</div><div class='add'>+	}</div><div class='add'>+	con-&gt;v1.out_more = m-&gt;more_to_follow;</div><div class='add'>+	con-&gt;v1.out_msg_done = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare headers for the next outgoing message.</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_message(struct ceph_connection *con,</div><div class='add'>+				  struct ceph_msg *m)</div><div class='add'>+{</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	con_out_kvec_reset(con);</div><div class='add'>+	con-&gt;v1.out_msg_done = false;</div><div class='add'>+</div><div class='add'>+	/* Sneak an ack in there first?  If we can get it into the same</div><div class='add'>+	 * TCP packet that's a good thing. */</div><div class='add'>+	if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='add'>+		con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='add'>+		con_out_kvec_add(con, sizeof (tag_ack), &amp;tag_ack);</div><div class='add'>+		con-&gt;v1.out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='add'>+		con_out_kvec_add(con, sizeof(con-&gt;v1.out_temp_ack),</div><div class='add'>+			&amp;con-&gt;v1.out_temp_ack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("prepare_write_message %p seq %lld type %d len %d+%d+%zd\n",</div><div class='add'>+	     m, con-&gt;out_seq, le16_to_cpu(m-&gt;hdr.type),</div><div class='add'>+	     le32_to_cpu(m-&gt;hdr.front_len), le32_to_cpu(m-&gt;hdr.middle_len),</div><div class='add'>+	     m-&gt;data_length);</div><div class='add'>+	WARN_ON(m-&gt;front.iov_len != le32_to_cpu(m-&gt;hdr.front_len));</div><div class='add'>+	WARN_ON(m-&gt;data_length != le32_to_cpu(m-&gt;hdr.data_len));</div><div class='add'>+</div><div class='add'>+	/* tag + hdr + front + middle */</div><div class='add'>+	con_out_kvec_add(con, sizeof (tag_msg), &amp;tag_msg);</div><div class='add'>+	con_out_kvec_add(con, sizeof(con-&gt;v1.out_hdr), &amp;con-&gt;v1.out_hdr);</div><div class='add'>+	con_out_kvec_add(con, m-&gt;front.iov_len, m-&gt;front.iov_base);</div><div class='add'>+</div><div class='add'>+	if (m-&gt;middle)</div><div class='add'>+		con_out_kvec_add(con, m-&gt;middle-&gt;vec.iov_len,</div><div class='add'>+			m-&gt;middle-&gt;vec.iov_base);</div><div class='add'>+</div><div class='add'>+	/* fill in hdr crc and finalize hdr */</div><div class='add'>+	crc = crc32c(0, &amp;m-&gt;hdr, offsetof(struct ceph_msg_header, crc));</div><div class='add'>+	m-&gt;hdr.crc = cpu_to_le32(crc);</div><div class='add'>+	memcpy(&amp;con-&gt;v1.out_hdr, &amp;m-&gt;hdr, sizeof(con-&gt;v1.out_hdr));</div><div class='add'>+</div><div class='add'>+	/* fill in front and middle crc, footer */</div><div class='add'>+	crc = crc32c(0, m-&gt;front.iov_base, m-&gt;front.iov_len);</div><div class='add'>+	m-&gt;footer.front_crc = cpu_to_le32(crc);</div><div class='add'>+	if (m-&gt;middle) {</div><div class='add'>+		crc = crc32c(0, m-&gt;middle-&gt;vec.iov_base,</div><div class='add'>+				m-&gt;middle-&gt;vec.iov_len);</div><div class='add'>+		m-&gt;footer.middle_crc = cpu_to_le32(crc);</div><div class='add'>+	} else</div><div class='add'>+		m-&gt;footer.middle_crc = 0;</div><div class='add'>+	dout("%s front_crc %u middle_crc %u\n", __func__,</div><div class='add'>+	     le32_to_cpu(m-&gt;footer.front_crc),</div><div class='add'>+	     le32_to_cpu(m-&gt;footer.middle_crc));</div><div class='add'>+	m-&gt;footer.flags = 0;</div><div class='add'>+</div><div class='add'>+	/* is there a data payload? */</div><div class='add'>+	m-&gt;footer.data_crc = 0;</div><div class='add'>+	if (m-&gt;data_length) {</div><div class='add'>+		prepare_message_data(m, m-&gt;data_length);</div><div class='add'>+		con-&gt;v1.out_more = 1;  /* data + footer will follow */</div><div class='add'>+	} else {</div><div class='add'>+		/* no, queue up footer too and be done */</div><div class='add'>+		prepare_write_message_footer(con, m);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare an ack.</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_write_ack %p %llu -&gt; %llu\n", con,</div><div class='add'>+	     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='add'>+	con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='add'>+</div><div class='add'>+	con_out_kvec_reset(con);</div><div class='add'>+</div><div class='add'>+	con_out_kvec_add(con, sizeof (tag_ack), &amp;tag_ack);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='add'>+	con_out_kvec_add(con, sizeof(con-&gt;v1.out_temp_ack),</div><div class='add'>+			 &amp;con-&gt;v1.out_temp_ack);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_more = 1;  /* more will follow.. eventually.. */</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare to share the seq during handshake</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_seq(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_write_seq %p %llu -&gt; %llu\n", con,</div><div class='add'>+	     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='add'>+	con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='add'>+</div><div class='add'>+	con_out_kvec_reset(con);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_temp_ack = cpu_to_le64(con-&gt;in_seq_acked);</div><div class='add'>+	con_out_kvec_add(con, sizeof(con-&gt;v1.out_temp_ack),</div><div class='add'>+			 &amp;con-&gt;v1.out_temp_ack);</div><div class='add'>+</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare to write keepalive byte.</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_keepalive(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_write_keepalive %p\n", con);</div><div class='add'>+	con_out_kvec_reset(con);</div><div class='add'>+	if (con-&gt;peer_features &amp; CEPH_FEATURE_MSGR_KEEPALIVE2) {</div><div class='add'>+		struct timespec64 now;</div><div class='add'>+</div><div class='add'>+		ktime_get_real_ts64(&amp;now);</div><div class='add'>+		con_out_kvec_add(con, sizeof(tag_keepalive2), &amp;tag_keepalive2);</div><div class='add'>+		ceph_encode_timespec64(&amp;con-&gt;v1.out_temp_keepalive2, &amp;now);</div><div class='add'>+		con_out_kvec_add(con, sizeof(con-&gt;v1.out_temp_keepalive2),</div><div class='add'>+				 &amp;con-&gt;v1.out_temp_keepalive2);</div><div class='add'>+	} else {</div><div class='add'>+		con_out_kvec_add(con, sizeof(tag_keepalive), &amp;tag_keepalive);</div><div class='add'>+	}</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Connection negotiation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int get_connect_authorizer(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_auth_handshake *auth;</div><div class='add'>+	int auth_proto;</div><div class='add'>+</div><div class='add'>+	if (!con-&gt;ops-&gt;get_authorizer) {</div><div class='add'>+		con-&gt;v1.auth = NULL;</div><div class='add'>+		con-&gt;v1.out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN;</div><div class='add'>+		con-&gt;v1.out_connect.authorizer_len = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	auth = con-&gt;ops-&gt;get_authorizer(con, &amp;auth_proto, con-&gt;v1.auth_retry);</div><div class='add'>+	if (IS_ERR(auth))</div><div class='add'>+		return PTR_ERR(auth);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.auth = auth;</div><div class='add'>+	con-&gt;v1.out_connect.authorizer_protocol = cpu_to_le32(auth_proto);</div><div class='add'>+	con-&gt;v1.out_connect.authorizer_len =</div><div class='add'>+		cpu_to_le32(auth-&gt;authorizer_buf_len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We connected to a peer and are saying hello.</div><div class='add'>+ */</div><div class='add'>+static void prepare_write_banner(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);</div><div class='add'>+	con_out_kvec_add(con, sizeof (con-&gt;msgr-&gt;my_enc_addr),</div><div class='add'>+					&amp;con-&gt;msgr-&gt;my_enc_addr);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_more = 0;</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __prepare_write_connect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con_out_kvec_add(con, sizeof(con-&gt;v1.out_connect),</div><div class='add'>+			 &amp;con-&gt;v1.out_connect);</div><div class='add'>+	if (con-&gt;v1.auth)</div><div class='add'>+		con_out_kvec_add(con, con-&gt;v1.auth-&gt;authorizer_buf_len,</div><div class='add'>+				 con-&gt;v1.auth-&gt;authorizer_buf);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_more = 0;</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_write_connect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	unsigned int global_seq = ceph_get_global_seq(con-&gt;msgr, 0);</div><div class='add'>+	int proto;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (con-&gt;peer_name.type) {</div><div class='add'>+	case CEPH_ENTITY_TYPE_MON:</div><div class='add'>+		proto = CEPH_MONC_PROTOCOL;</div><div class='add'>+		break;</div><div class='add'>+	case CEPH_ENTITY_TYPE_OSD:</div><div class='add'>+		proto = CEPH_OSDC_PROTOCOL;</div><div class='add'>+		break;</div><div class='add'>+	case CEPH_ENTITY_TYPE_MDS:</div><div class='add'>+		proto = CEPH_MDSC_PROTOCOL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("prepare_write_connect %p cseq=%d gseq=%d proto=%d\n", con,</div><div class='add'>+	     con-&gt;v1.connect_seq, global_seq, proto);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.out_connect.features =</div><div class='add'>+		cpu_to_le64(from_msgr(con-&gt;msgr)-&gt;supported_features);</div><div class='add'>+	con-&gt;v1.out_connect.host_type = cpu_to_le32(CEPH_ENTITY_TYPE_CLIENT);</div><div class='add'>+	con-&gt;v1.out_connect.connect_seq = cpu_to_le32(con-&gt;v1.connect_seq);</div><div class='add'>+	con-&gt;v1.out_connect.global_seq = cpu_to_le32(global_seq);</div><div class='add'>+	con-&gt;v1.out_connect.protocol_version = cpu_to_le32(proto);</div><div class='add'>+	con-&gt;v1.out_connect.flags = 0;</div><div class='add'>+</div><div class='add'>+	ret = get_connect_authorizer(con);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	__prepare_write_connect(con);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write as much of pending kvecs to the socket as we can.</div><div class='add'>+ *  1 -&gt; done</div><div class='add'>+ *  0 -&gt; socket full, but more to do</div><div class='add'>+ * &lt;0 -&gt; error</div><div class='add'>+ */</div><div class='add'>+static int write_partial_kvec(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("write_partial_kvec %p %d left\n", con, con-&gt;v1.out_kvec_bytes);</div><div class='add'>+	while (con-&gt;v1.out_kvec_bytes &gt; 0) {</div><div class='add'>+		ret = ceph_tcp_sendmsg(con-&gt;sock, con-&gt;v1.out_kvec_cur,</div><div class='add'>+				       con-&gt;v1.out_kvec_left,</div><div class='add'>+				       con-&gt;v1.out_kvec_bytes,</div><div class='add'>+				       con-&gt;v1.out_more);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		con-&gt;v1.out_kvec_bytes -= ret;</div><div class='add'>+		if (!con-&gt;v1.out_kvec_bytes)</div><div class='add'>+			break;            /* done */</div><div class='add'>+</div><div class='add'>+		/* account for full iov entries consumed */</div><div class='add'>+		while (ret &gt;= con-&gt;v1.out_kvec_cur-&gt;iov_len) {</div><div class='add'>+			BUG_ON(!con-&gt;v1.out_kvec_left);</div><div class='add'>+			ret -= con-&gt;v1.out_kvec_cur-&gt;iov_len;</div><div class='add'>+			con-&gt;v1.out_kvec_cur++;</div><div class='add'>+			con-&gt;v1.out_kvec_left--;</div><div class='add'>+		}</div><div class='add'>+		/* and for a partially-consumed entry */</div><div class='add'>+		if (ret) {</div><div class='add'>+			con-&gt;v1.out_kvec_cur-&gt;iov_len -= ret;</div><div class='add'>+			con-&gt;v1.out_kvec_cur-&gt;iov_base += ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	con-&gt;v1.out_kvec_left = 0;</div><div class='add'>+	ret = 1;</div><div class='add'>+out:</div><div class='add'>+	dout("write_partial_kvec %p %d left in %d kvecs ret = %d\n", con,</div><div class='add'>+	     con-&gt;v1.out_kvec_bytes, con-&gt;v1.out_kvec_left, ret);</div><div class='add'>+	return ret;  /* done! */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write as much message data payload as we can.  If we finish, queue</div><div class='add'>+ * up the footer.</div><div class='add'>+ *  1 -&gt; done, footer is now queued in out_kvec[].</div><div class='add'>+ *  0 -&gt; socket full, but more to do</div><div class='add'>+ * &lt;0 -&gt; error</div><div class='add'>+ */</div><div class='add'>+static int write_partial_message_data(struct ceph_connection *con,</div><div class='add'>+				      struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;msg-&gt;cursor;</div><div class='add'>+	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	dout("%s %p msg %p\n", __func__, con, msg);</div><div class='add'>+</div><div class='add'>+	if (!msg-&gt;num_data_items)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Iterate through each page that contains data to be</div><div class='add'>+	 * written, and send as much as possible for each.</div><div class='add'>+	 *</div><div class='add'>+	 * If we are calculating the data crc (the default), we will</div><div class='add'>+	 * need to map the page.  If we have no pages, they have</div><div class='add'>+	 * been revoked, so use the zero page.</div><div class='add'>+	 */</div><div class='add'>+	crc = do_datacrc ? le32_to_cpu(msg-&gt;footer.data_crc) : 0;</div><div class='add'>+	while (cursor-&gt;total_resid) {</div><div class='add'>+		struct page *page;</div><div class='add'>+		size_t page_offset;</div><div class='add'>+		size_t length;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (!cursor-&gt;resid) {</div><div class='add'>+			ceph_msg_data_advance(cursor, 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page = ceph_msg_data_next(cursor, &amp;page_offset, &amp;length);</div><div class='add'>+		ret = ceph_tcp_sendpage(con-&gt;sock, page, page_offset, length,</div><div class='add'>+					MSG_MORE);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (do_datacrc)</div><div class='add'>+				msg-&gt;footer.data_crc = cpu_to_le32(crc);</div><div class='add'>+</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		if (do_datacrc &amp;&amp; cursor-&gt;need_crc)</div><div class='add'>+			crc = ceph_crc32c_page(crc, page, page_offset, length);</div><div class='add'>+		ceph_msg_data_advance(cursor, (size_t)ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s %p msg %p done\n", __func__, con, msg);</div><div class='add'>+</div><div class='add'>+	/* prepare and queue up footer, too */</div><div class='add'>+	if (do_datacrc)</div><div class='add'>+		msg-&gt;footer.data_crc = cpu_to_le32(crc);</div><div class='add'>+	else</div><div class='add'>+		msg-&gt;footer.flags |= CEPH_MSG_FOOTER_NOCRC;</div><div class='add'>+	con_out_kvec_reset(con);</div><div class='add'>+	prepare_write_message_footer(con, msg);</div><div class='add'>+</div><div class='add'>+	return 1;	/* must return &gt; 0 to indicate success */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write some zeros</div><div class='add'>+ */</div><div class='add'>+static int write_partial_skip(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s %p %d left\n", __func__, con, con-&gt;v1.out_skip);</div><div class='add'>+	while (con-&gt;v1.out_skip &gt; 0) {</div><div class='add'>+		size_t size = min(con-&gt;v1.out_skip, (int)PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		ret = ceph_tcp_sendpage(con-&gt;sock, ceph_zero_page, 0, size,</div><div class='add'>+					MSG_MORE);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		con-&gt;v1.out_skip -= ret;</div><div class='add'>+	}</div><div class='add'>+	ret = 1;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare to read connection handshake, or an ack.</div><div class='add'>+ */</div><div class='add'>+static void prepare_read_banner(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_banner %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_connect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_connect %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_ack %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_seq(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_seq %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+	con-&gt;v1.in_tag = CEPH_MSGR_TAG_SEQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_tag(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_tag %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+	con-&gt;v1.in_tag = CEPH_MSGR_TAG_READY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_keepalive_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_keepalive_ack %p\n", con);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare to read a message.</div><div class='add'>+ */</div><div class='add'>+static int prepare_read_message(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("prepare_read_message %p\n", con);</div><div class='add'>+	BUG_ON(con-&gt;in_msg != NULL);</div><div class='add'>+	con-&gt;v1.in_base_pos = 0;</div><div class='add'>+	con-&gt;in_front_crc = con-&gt;in_middle_crc = con-&gt;in_data_crc = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial(struct ceph_connection *con,</div><div class='add'>+			int end, int size, void *object)</div><div class='add'>+{</div><div class='add'>+	while (con-&gt;v1.in_base_pos &lt; end) {</div><div class='add'>+		int left = end - con-&gt;v1.in_base_pos;</div><div class='add'>+		int have = size - left;</div><div class='add'>+		int ret = ceph_tcp_recvmsg(con-&gt;sock, object + have, left);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+		con-&gt;v1.in_base_pos += ret;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read all or part of the connect-side handshake on a new connection</div><div class='add'>+ */</div><div class='add'>+static int read_partial_banner(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int size;</div><div class='add'>+	int end;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("read_partial_banner %p at %d\n", con, con-&gt;v1.in_base_pos);</div><div class='add'>+</div><div class='add'>+	/* peer's banner */</div><div class='add'>+	size = strlen(CEPH_BANNER);</div><div class='add'>+	end = size;</div><div class='add'>+	ret = read_partial(con, end, size, con-&gt;v1.in_banner);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	size = sizeof(con-&gt;v1.actual_peer_addr);</div><div class='add'>+	end += size;</div><div class='add'>+	ret = read_partial(con, end, size, &amp;con-&gt;v1.actual_peer_addr);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+	ceph_decode_banner_addr(&amp;con-&gt;v1.actual_peer_addr);</div><div class='add'>+</div><div class='add'>+	size = sizeof(con-&gt;v1.peer_addr_for_me);</div><div class='add'>+	end += size;</div><div class='add'>+	ret = read_partial(con, end, size, &amp;con-&gt;v1.peer_addr_for_me);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+	ceph_decode_banner_addr(&amp;con-&gt;v1.peer_addr_for_me);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_connect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int size;</div><div class='add'>+	int end;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("read_partial_connect %p at %d\n", con, con-&gt;v1.in_base_pos);</div><div class='add'>+</div><div class='add'>+	size = sizeof(con-&gt;v1.in_reply);</div><div class='add'>+	end = size;</div><div class='add'>+	ret = read_partial(con, end, size, &amp;con-&gt;v1.in_reply);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v1.auth) {</div><div class='add'>+		size = le32_to_cpu(con-&gt;v1.in_reply.authorizer_len);</div><div class='add'>+		if (size &gt; con-&gt;v1.auth-&gt;authorizer_reply_buf_len) {</div><div class='add'>+			pr_err("authorizer reply too big: %d &gt; %zu\n", size,</div><div class='add'>+			       con-&gt;v1.auth-&gt;authorizer_reply_buf_len);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		end += size;</div><div class='add'>+		ret = read_partial(con, end, size,</div><div class='add'>+				   con-&gt;v1.auth-&gt;authorizer_reply_buf);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("read_partial_connect %p tag %d, con_seq = %u, g_seq = %u\n",</div><div class='add'>+	     con, con-&gt;v1.in_reply.tag,</div><div class='add'>+	     le32_to_cpu(con-&gt;v1.in_reply.connect_seq),</div><div class='add'>+	     le32_to_cpu(con-&gt;v1.in_reply.global_seq));</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Verify the hello banner looks okay.</div><div class='add'>+ */</div><div class='add'>+static int verify_hello(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	if (memcmp(con-&gt;v1.in_banner, CEPH_BANNER, strlen(CEPH_BANNER))) {</div><div class='add'>+		pr_err("connect to %s got bad banner\n",</div><div class='add'>+		       ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='add'>+		con-&gt;error_msg = "protocol error, bad banner";</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_banner(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_entity_addr *my_addr = &amp;con-&gt;msgr-&gt;inst.addr;</div><div class='add'>+</div><div class='add'>+	dout("process_banner on %p\n", con);</div><div class='add'>+</div><div class='add'>+	if (verify_hello(con) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the other end is who we wanted.  note that the other</div><div class='add'>+	 * end may not yet know their ip address, so if it's 0.0.0.0, give</div><div class='add'>+	 * them the benefit of the doubt.</div><div class='add'>+	 */</div><div class='add'>+	if (memcmp(&amp;con-&gt;peer_addr, &amp;con-&gt;v1.actual_peer_addr,</div><div class='add'>+		   sizeof(con-&gt;peer_addr)) != 0 &amp;&amp;</div><div class='add'>+	    !(ceph_addr_is_blank(&amp;con-&gt;v1.actual_peer_addr) &amp;&amp;</div><div class='add'>+	      con-&gt;v1.actual_peer_addr.nonce == con-&gt;peer_addr.nonce)) {</div><div class='add'>+		pr_warn("wrong peer, want %s/%u, got %s/%u\n",</div><div class='add'>+			ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+			le32_to_cpu(con-&gt;peer_addr.nonce),</div><div class='add'>+			ceph_pr_addr(&amp;con-&gt;v1.actual_peer_addr),</div><div class='add'>+			le32_to_cpu(con-&gt;v1.actual_peer_addr.nonce));</div><div class='add'>+		con-&gt;error_msg = "wrong peer at address";</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * did we learn our address?</div><div class='add'>+	 */</div><div class='add'>+	if (ceph_addr_is_blank(my_addr)) {</div><div class='add'>+		memcpy(&amp;my_addr-&gt;in_addr,</div><div class='add'>+		       &amp;con-&gt;v1.peer_addr_for_me.in_addr,</div><div class='add'>+		       sizeof(con-&gt;v1.peer_addr_for_me.in_addr));</div><div class='add'>+		ceph_addr_set_port(my_addr, 0);</div><div class='add'>+		ceph_encode_my_addr(con-&gt;msgr);</div><div class='add'>+		dout("process_banner learned my addr is %s\n",</div><div class='add'>+		     ceph_pr_addr(my_addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_connect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	u64 sup_feat = from_msgr(con-&gt;msgr)-&gt;supported_features;</div><div class='add'>+	u64 req_feat = from_msgr(con-&gt;msgr)-&gt;required_features;</div><div class='add'>+	u64 server_feat = le64_to_cpu(con-&gt;v1.in_reply.features);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("process_connect on %p tag %d\n", con, con-&gt;v1.in_tag);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v1.auth) {</div><div class='add'>+		int len = le32_to_cpu(con-&gt;v1.in_reply.authorizer_len);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Any connection that defines -&gt;get_authorizer()</div><div class='add'>+		 * should also define -&gt;add_authorizer_challenge() and</div><div class='add'>+		 * -&gt;verify_authorizer_reply().</div><div class='add'>+		 *</div><div class='add'>+		 * See get_connect_authorizer().</div><div class='add'>+		 */</div><div class='add'>+		if (con-&gt;v1.in_reply.tag ==</div><div class='add'>+				CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) {</div><div class='add'>+			ret = con-&gt;ops-&gt;add_authorizer_challenge(</div><div class='add'>+				con, con-&gt;v1.auth-&gt;authorizer_reply_buf, len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			con_out_kvec_reset(con);</div><div class='add'>+			__prepare_write_connect(con);</div><div class='add'>+			prepare_read_connect(con);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (len) {</div><div class='add'>+			ret = con-&gt;ops-&gt;verify_authorizer_reply(con);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				con-&gt;error_msg = "bad authorize reply";</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (con-&gt;v1.in_reply.tag) {</div><div class='add'>+	case CEPH_MSGR_TAG_FEATURES:</div><div class='add'>+		pr_err("%s%lld %s feature set mismatch,"</div><div class='add'>+		       " my %llx &lt; server's %llx, missing %llx\n",</div><div class='add'>+		       ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+		       ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+		       sup_feat, server_feat, server_feat &amp; ~sup_feat);</div><div class='add'>+		con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_BADPROTOVER:</div><div class='add'>+		pr_err("%s%lld %s protocol version mismatch,"</div><div class='add'>+		       " my %d != server's %d\n",</div><div class='add'>+		       ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+		       ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+		       le32_to_cpu(con-&gt;v1.out_connect.protocol_version),</div><div class='add'>+		       le32_to_cpu(con-&gt;v1.in_reply.protocol_version));</div><div class='add'>+		con-&gt;error_msg = "protocol version mismatch";</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_BADAUTHORIZER:</div><div class='add'>+		con-&gt;v1.auth_retry++;</div><div class='add'>+		dout("process_connect %p got BADAUTHORIZER attempt %d\n", con,</div><div class='add'>+		     con-&gt;v1.auth_retry);</div><div class='add'>+		if (con-&gt;v1.auth_retry == 2) {</div><div class='add'>+			con-&gt;error_msg = "connect authorization failure";</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		con_out_kvec_reset(con);</div><div class='add'>+		ret = prepare_write_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		prepare_read_connect(con);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_RESETSESSION:</div><div class='add'>+		/*</div><div class='add'>+		 * If we connected with a large connect_seq but the peer</div><div class='add'>+		 * has no record of a session with us (no connection, or</div><div class='add'>+		 * connect_seq == 0), they will send RESETSESION to indicate</div><div class='add'>+		 * that they must have reset their session, and may have</div><div class='add'>+		 * dropped messages.</div><div class='add'>+		 */</div><div class='add'>+		dout("process_connect got RESET peer seq %u\n",</div><div class='add'>+		     le32_to_cpu(con-&gt;v1.in_reply.connect_seq));</div><div class='add'>+		pr_info("%s%lld %s session reset\n",</div><div class='add'>+			ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+			ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='add'>+		ceph_con_reset_session(con);</div><div class='add'>+		con_out_kvec_reset(con);</div><div class='add'>+		ret = prepare_write_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		prepare_read_connect(con);</div><div class='add'>+</div><div class='add'>+		/* Tell ceph about it. */</div><div class='add'>+		mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+		if (con-&gt;ops-&gt;peer_reset)</div><div class='add'>+			con-&gt;ops-&gt;peer_reset(con);</div><div class='add'>+		mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+		if (con-&gt;state != CEPH_CON_S_V1_CONNECT_MSG)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_RETRY_SESSION:</div><div class='add'>+		/*</div><div class='add'>+		 * If we sent a smaller connect_seq than the peer has, try</div><div class='add'>+		 * again with a larger value.</div><div class='add'>+		 */</div><div class='add'>+		dout("process_connect got RETRY_SESSION my seq %u, peer %u\n",</div><div class='add'>+		     le32_to_cpu(con-&gt;v1.out_connect.connect_seq),</div><div class='add'>+		     le32_to_cpu(con-&gt;v1.in_reply.connect_seq));</div><div class='add'>+		con-&gt;v1.connect_seq = le32_to_cpu(con-&gt;v1.in_reply.connect_seq);</div><div class='add'>+		con_out_kvec_reset(con);</div><div class='add'>+		ret = prepare_write_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		prepare_read_connect(con);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_RETRY_GLOBAL:</div><div class='add'>+		/*</div><div class='add'>+		 * If we sent a smaller global_seq than the peer has, try</div><div class='add'>+		 * again with a larger value.</div><div class='add'>+		 */</div><div class='add'>+		dout("process_connect got RETRY_GLOBAL my %u peer_gseq %u\n",</div><div class='add'>+		     con-&gt;v1.peer_global_seq,</div><div class='add'>+		     le32_to_cpu(con-&gt;v1.in_reply.global_seq));</div><div class='add'>+		ceph_get_global_seq(con-&gt;msgr,</div><div class='add'>+				    le32_to_cpu(con-&gt;v1.in_reply.global_seq));</div><div class='add'>+		con_out_kvec_reset(con);</div><div class='add'>+		ret = prepare_write_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		prepare_read_connect(con);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_SEQ:</div><div class='add'>+	case CEPH_MSGR_TAG_READY:</div><div class='add'>+		if (req_feat &amp; ~server_feat) {</div><div class='add'>+			pr_err("%s%lld %s protocol feature mismatch,"</div><div class='add'>+			       " my required %llx &gt; server's %llx, need %llx\n",</div><div class='add'>+			       ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+			       ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+			       req_feat, server_feat, req_feat &amp; ~server_feat);</div><div class='add'>+			con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON(con-&gt;state != CEPH_CON_S_V1_CONNECT_MSG);</div><div class='add'>+		con-&gt;state = CEPH_CON_S_OPEN;</div><div class='add'>+		con-&gt;v1.auth_retry = 0;    /* we authenticated; clear flag */</div><div class='add'>+		con-&gt;v1.peer_global_seq =</div><div class='add'>+			le32_to_cpu(con-&gt;v1.in_reply.global_seq);</div><div class='add'>+		con-&gt;v1.connect_seq++;</div><div class='add'>+		con-&gt;peer_features = server_feat;</div><div class='add'>+		dout("process_connect got READY gseq %d cseq %d (%d)\n",</div><div class='add'>+		     con-&gt;v1.peer_global_seq,</div><div class='add'>+		     le32_to_cpu(con-&gt;v1.in_reply.connect_seq),</div><div class='add'>+		     con-&gt;v1.connect_seq);</div><div class='add'>+		WARN_ON(con-&gt;v1.connect_seq !=</div><div class='add'>+			le32_to_cpu(con-&gt;v1.in_reply.connect_seq));</div><div class='add'>+</div><div class='add'>+		if (con-&gt;v1.in_reply.flags &amp; CEPH_MSG_CONNECT_LOSSY)</div><div class='add'>+			ceph_con_flag_set(con, CEPH_CON_F_LOSSYTX);</div><div class='add'>+</div><div class='add'>+		con-&gt;delay = 0;      /* reset backoff memory */</div><div class='add'>+</div><div class='add'>+		if (con-&gt;v1.in_reply.tag == CEPH_MSGR_TAG_SEQ) {</div><div class='add'>+			prepare_write_seq(con);</div><div class='add'>+			prepare_read_seq(con);</div><div class='add'>+		} else {</div><div class='add'>+			prepare_read_tag(con);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CEPH_MSGR_TAG_WAIT:</div><div class='add'>+		/*</div><div class='add'>+		 * If there is a connection race (we are opening</div><div class='add'>+		 * connections to each other), one of us may just have</div><div class='add'>+		 * to WAIT.  This shouldn't happen if we are the</div><div class='add'>+		 * client.</div><div class='add'>+		 */</div><div class='add'>+		con-&gt;error_msg = "protocol error, got WAIT as client";</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		con-&gt;error_msg = "protocol error, garbage tag during connect";</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * read (part of) an ack</div><div class='add'>+ */</div><div class='add'>+static int read_partial_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int size = sizeof(con-&gt;v1.in_temp_ack);</div><div class='add'>+	int end = size;</div><div class='add'>+</div><div class='add'>+	return read_partial(con, end, size, &amp;con-&gt;v1.in_temp_ack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We can finally discard anything that's been acked.</div><div class='add'>+ */</div><div class='add'>+static void process_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	u64 ack = le64_to_cpu(con-&gt;v1.in_temp_ack);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_ACK)</div><div class='add'>+		ceph_con_discard_sent(con, ack);</div><div class='add'>+	else</div><div class='add'>+		ceph_con_discard_requeued(con, ack);</div><div class='add'>+</div><div class='add'>+	prepare_read_tag(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_message_chunk(struct ceph_connection *con,</div><div class='add'>+				      struct kvec *section,</div><div class='add'>+				      unsigned int sec_len, u32 *crc)</div><div class='add'>+{</div><div class='add'>+	int ret, left;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!section);</div><div class='add'>+</div><div class='add'>+	while (section-&gt;iov_len &lt; sec_len) {</div><div class='add'>+		BUG_ON(section-&gt;iov_base == NULL);</div><div class='add'>+		left = sec_len - section-&gt;iov_len;</div><div class='add'>+		ret = ceph_tcp_recvmsg(con-&gt;sock, (char *)section-&gt;iov_base +</div><div class='add'>+				       section-&gt;iov_len, left);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+		section-&gt;iov_len += ret;</div><div class='add'>+	}</div><div class='add'>+	if (section-&gt;iov_len == sec_len)</div><div class='add'>+		*crc = crc32c(*crc, section-&gt;iov_base, section-&gt;iov_len);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int read_partial_message_section(struct ceph_connection *con,</div><div class='add'>+					       struct kvec *section,</div><div class='add'>+					       unsigned int sec_len, u32 *crc)</div><div class='add'>+{</div><div class='add'>+	*crc = 0;</div><div class='add'>+	return read_partial_message_chunk(con, section, sec_len, crc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_sparse_msg_extent(struct ceph_connection *con, u32 *crc)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;con-&gt;in_msg-&gt;cursor;</div><div class='add'>+	bool do_bounce = ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE);</div><div class='add'>+</div><div class='add'>+	if (do_bounce &amp;&amp; unlikely(!con-&gt;bounce_page)) {</div><div class='add'>+		con-&gt;bounce_page = alloc_page(GFP_NOIO);</div><div class='add'>+		if (!con-&gt;bounce_page) {</div><div class='add'>+			pr_err("failed to allocate bounce page\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (cursor-&gt;sr_resid &gt; 0) {</div><div class='add'>+		struct page *page, *rpage;</div><div class='add'>+		size_t off, len;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		page = ceph_msg_data_next(cursor, &amp;off, &amp;len);</div><div class='add'>+		rpage = do_bounce ? con-&gt;bounce_page : page;</div><div class='add'>+</div><div class='add'>+		/* clamp to what remains in extent */</div><div class='add'>+		len = min_t(int, len, cursor-&gt;sr_resid);</div><div class='add'>+		ret = ceph_tcp_recvpage(con-&gt;sock, rpage, (int)off, len);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+		*crc = ceph_crc32c_page(*crc, rpage, off, ret);</div><div class='add'>+		ceph_msg_data_advance(cursor, (size_t)ret);</div><div class='add'>+		cursor-&gt;sr_resid -= ret;</div><div class='add'>+		if (do_bounce)</div><div class='add'>+			memcpy_page(page, off, rpage, off, ret);</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_sparse_msg_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;con-&gt;in_msg-&gt;cursor;</div><div class='add'>+	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='add'>+	u32 crc = 0;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	if (do_datacrc)</div><div class='add'>+		crc = con-&gt;in_data_crc;</div><div class='add'>+</div><div class='add'>+	while (cursor-&gt;total_resid) {</div><div class='add'>+		if (con-&gt;v1.in_sr_kvec.iov_base)</div><div class='add'>+			ret = read_partial_message_chunk(con,</div><div class='add'>+							 &amp;con-&gt;v1.in_sr_kvec,</div><div class='add'>+							 con-&gt;v1.in_sr_len,</div><div class='add'>+							 &amp;crc);</div><div class='add'>+		else if (cursor-&gt;sr_resid &gt; 0)</div><div class='add'>+			ret = read_partial_sparse_msg_extent(con, &amp;crc);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memset(&amp;con-&gt;v1.in_sr_kvec, 0, sizeof(con-&gt;v1.in_sr_kvec));</div><div class='add'>+		ret = con-&gt;ops-&gt;sparse_read(con, cursor,</div><div class='add'>+				(char **)&amp;con-&gt;v1.in_sr_kvec.iov_base);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			ret = ret ? ret : 1;  /* must return &gt; 0 to indicate success */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		con-&gt;v1.in_sr_len = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (do_datacrc)</div><div class='add'>+		con-&gt;in_data_crc = crc;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_msg_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;con-&gt;in_msg-&gt;cursor;</div><div class='add'>+	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='add'>+	struct page *page;</div><div class='add'>+	size_t page_offset;</div><div class='add'>+	size_t length;</div><div class='add'>+	u32 crc = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (do_datacrc)</div><div class='add'>+		crc = con-&gt;in_data_crc;</div><div class='add'>+	while (cursor-&gt;total_resid) {</div><div class='add'>+		if (!cursor-&gt;resid) {</div><div class='add'>+			ceph_msg_data_advance(cursor, 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page = ceph_msg_data_next(cursor, &amp;page_offset, &amp;length);</div><div class='add'>+		ret = ceph_tcp_recvpage(con-&gt;sock, page, page_offset, length);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (do_datacrc)</div><div class='add'>+				con-&gt;in_data_crc = crc;</div><div class='add'>+</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (do_datacrc)</div><div class='add'>+			crc = ceph_crc32c_page(crc, page, page_offset, ret);</div><div class='add'>+		ceph_msg_data_advance(cursor, (size_t)ret);</div><div class='add'>+	}</div><div class='add'>+	if (do_datacrc)</div><div class='add'>+		con-&gt;in_data_crc = crc;</div><div class='add'>+</div><div class='add'>+	return 1;	/* must return &gt; 0 to indicate success */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_partial_msg_data_bounce(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;con-&gt;in_msg-&gt;cursor;</div><div class='add'>+	struct page *page;</div><div class='add'>+	size_t off, len;</div><div class='add'>+	u32 crc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!con-&gt;bounce_page)) {</div><div class='add'>+		con-&gt;bounce_page = alloc_page(GFP_NOIO);</div><div class='add'>+		if (!con-&gt;bounce_page) {</div><div class='add'>+			pr_err("failed to allocate bounce page\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crc = con-&gt;in_data_crc;</div><div class='add'>+	while (cursor-&gt;total_resid) {</div><div class='add'>+		if (!cursor-&gt;resid) {</div><div class='add'>+			ceph_msg_data_advance(cursor, 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page = ceph_msg_data_next(cursor, &amp;off, &amp;len);</div><div class='add'>+		ret = ceph_tcp_recvpage(con-&gt;sock, con-&gt;bounce_page, 0, len);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			con-&gt;in_data_crc = crc;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		crc = crc32c(crc, page_address(con-&gt;bounce_page), ret);</div><div class='add'>+		memcpy_to_page(page, off, page_address(con-&gt;bounce_page), ret);</div><div class='add'>+</div><div class='add'>+		ceph_msg_data_advance(cursor, ret);</div><div class='add'>+	}</div><div class='add'>+	con-&gt;in_data_crc = crc;</div><div class='add'>+</div><div class='add'>+	return 1;	/* must return &gt; 0 to indicate success */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * read (part of) a message.</div><div class='add'>+ */</div><div class='add'>+static int read_partial_message(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *m = con-&gt;in_msg;</div><div class='add'>+	int size;</div><div class='add'>+	int end;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int front_len, middle_len, data_len;</div><div class='add'>+	bool do_datacrc = !ceph_test_opt(from_msgr(con-&gt;msgr), NOCRC);</div><div class='add'>+	bool need_sign = (con-&gt;peer_features &amp; CEPH_FEATURE_MSG_AUTH);</div><div class='add'>+	u64 seq;</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	dout("read_partial_message con %p msg %p\n", con, m);</div><div class='add'>+</div><div class='add'>+	/* header */</div><div class='add'>+	size = sizeof(con-&gt;v1.in_hdr);</div><div class='add'>+	end = size;</div><div class='add'>+	ret = read_partial(con, end, size, &amp;con-&gt;v1.in_hdr);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	crc = crc32c(0, &amp;con-&gt;v1.in_hdr, offsetof(struct ceph_msg_header, crc));</div><div class='add'>+	if (cpu_to_le32(crc) != con-&gt;v1.in_hdr.crc) {</div><div class='add'>+		pr_err("read_partial_message bad hdr crc %u != expected %u\n",</div><div class='add'>+		       crc, con-&gt;v1.in_hdr.crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	front_len = le32_to_cpu(con-&gt;v1.in_hdr.front_len);</div><div class='add'>+	if (front_len &gt; CEPH_MSG_MAX_FRONT_LEN)</div><div class='add'>+		return -EIO;</div><div class='add'>+	middle_len = le32_to_cpu(con-&gt;v1.in_hdr.middle_len);</div><div class='add'>+	if (middle_len &gt; CEPH_MSG_MAX_MIDDLE_LEN)</div><div class='add'>+		return -EIO;</div><div class='add'>+	data_len = le32_to_cpu(con-&gt;v1.in_hdr.data_len);</div><div class='add'>+	if (data_len &gt; CEPH_MSG_MAX_DATA_LEN)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* verify seq# */</div><div class='add'>+	seq = le64_to_cpu(con-&gt;v1.in_hdr.seq);</div><div class='add'>+	if ((s64)seq - (s64)con-&gt;in_seq &lt; 1) {</div><div class='add'>+		pr_info("skipping %s%lld %s seq %lld expected %lld\n",</div><div class='add'>+			ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+			ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+			seq, con-&gt;in_seq + 1);</div><div class='add'>+		con-&gt;v1.in_base_pos = -front_len - middle_len - data_len -</div><div class='add'>+				      sizeof_footer(con);</div><div class='add'>+		con-&gt;v1.in_tag = CEPH_MSGR_TAG_READY;</div><div class='add'>+		return 1;</div><div class='add'>+	} else if ((s64)seq - (s64)con-&gt;in_seq &gt; 1) {</div><div class='add'>+		pr_err("read_partial_message bad seq %lld expected %lld\n",</div><div class='add'>+		       seq, con-&gt;in_seq + 1);</div><div class='add'>+		con-&gt;error_msg = "bad message sequence # for incoming message";</div><div class='add'>+		return -EBADE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate message? */</div><div class='add'>+	if (!con-&gt;in_msg) {</div><div class='add'>+		int skip = 0;</div><div class='add'>+</div><div class='add'>+		dout("got hdr type %d front %d data %d\n", con-&gt;v1.in_hdr.type,</div><div class='add'>+		     front_len, data_len);</div><div class='add'>+		ret = ceph_con_in_msg_alloc(con, &amp;con-&gt;v1.in_hdr, &amp;skip);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		BUG_ON((!con-&gt;in_msg) ^ skip);</div><div class='add'>+		if (skip) {</div><div class='add'>+			/* skip this message */</div><div class='add'>+			dout("alloc_msg said skip message\n");</div><div class='add'>+			con-&gt;v1.in_base_pos = -front_len - middle_len -</div><div class='add'>+					      data_len - sizeof_footer(con);</div><div class='add'>+			con-&gt;v1.in_tag = CEPH_MSGR_TAG_READY;</div><div class='add'>+			con-&gt;in_seq++;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		BUG_ON(!con-&gt;in_msg);</div><div class='add'>+		BUG_ON(con-&gt;in_msg-&gt;con != con);</div><div class='add'>+		m = con-&gt;in_msg;</div><div class='add'>+		m-&gt;front.iov_len = 0;    /* haven't read it yet */</div><div class='add'>+		if (m-&gt;middle)</div><div class='add'>+			m-&gt;middle-&gt;vec.iov_len = 0;</div><div class='add'>+</div><div class='add'>+		/* prepare for data payload, if any */</div><div class='add'>+</div><div class='add'>+		if (data_len)</div><div class='add'>+			prepare_message_data(con-&gt;in_msg, data_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* front */</div><div class='add'>+	ret = read_partial_message_section(con, &amp;m-&gt;front, front_len,</div><div class='add'>+					   &amp;con-&gt;in_front_crc);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* middle */</div><div class='add'>+	if (m-&gt;middle) {</div><div class='add'>+		ret = read_partial_message_section(con, &amp;m-&gt;middle-&gt;vec,</div><div class='add'>+						   middle_len,</div><div class='add'>+						   &amp;con-&gt;in_middle_crc);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* (page) data */</div><div class='add'>+	if (data_len) {</div><div class='add'>+		if (!m-&gt;num_data_items)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		if (m-&gt;sparse_read_total)</div><div class='add'>+			ret = read_partial_sparse_msg_data(con);</div><div class='add'>+		else if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE))</div><div class='add'>+			ret = read_partial_msg_data_bounce(con);</div><div class='add'>+		else</div><div class='add'>+			ret = read_partial_msg_data(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* footer */</div><div class='add'>+	size = sizeof_footer(con);</div><div class='add'>+	end += size;</div><div class='add'>+	ret = read_partial(con, end, size, &amp;m-&gt;footer);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!need_sign) {</div><div class='add'>+		m-&gt;footer.flags = m-&gt;old_footer.flags;</div><div class='add'>+		m-&gt;footer.sig = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("read_partial_message got msg %p %d (%u) + %d (%u) + %d (%u)\n",</div><div class='add'>+	     m, front_len, m-&gt;footer.front_crc, middle_len,</div><div class='add'>+	     m-&gt;footer.middle_crc, data_len, m-&gt;footer.data_crc);</div><div class='add'>+</div><div class='add'>+	/* crc ok? */</div><div class='add'>+	if (con-&gt;in_front_crc != le32_to_cpu(m-&gt;footer.front_crc)) {</div><div class='add'>+		pr_err("read_partial_message %p front crc %u != exp. %u\n",</div><div class='add'>+		       m, con-&gt;in_front_crc, m-&gt;footer.front_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;in_middle_crc != le32_to_cpu(m-&gt;footer.middle_crc)) {</div><div class='add'>+		pr_err("read_partial_message %p middle crc %u != exp %u\n",</div><div class='add'>+		       m, con-&gt;in_middle_crc, m-&gt;footer.middle_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	if (do_datacrc &amp;&amp;</div><div class='add'>+	    (m-&gt;footer.flags &amp; CEPH_MSG_FOOTER_NOCRC) == 0 &amp;&amp;</div><div class='add'>+	    con-&gt;in_data_crc != le32_to_cpu(m-&gt;footer.data_crc)) {</div><div class='add'>+		pr_err("read_partial_message %p data crc %u != exp. %u\n", m,</div><div class='add'>+		       con-&gt;in_data_crc, le32_to_cpu(m-&gt;footer.data_crc));</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_sign &amp;&amp; con-&gt;ops-&gt;check_message_signature &amp;&amp;</div><div class='add'>+	    con-&gt;ops-&gt;check_message_signature(m)) {</div><div class='add'>+		pr_err("read_partial_message %p signature check failed\n", m);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1; /* done! */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_keepalive_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_timespec ceph_ts;</div><div class='add'>+	size_t size = sizeof(ceph_ts);</div><div class='add'>+	int ret = read_partial(con, size, size, &amp;ceph_ts);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ceph_decode_timespec64(&amp;con-&gt;last_keepalive_ack, &amp;ceph_ts);</div><div class='add'>+	prepare_read_tag(con);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read what we can from the socket.</div><div class='add'>+ */</div><div class='add'>+int ceph_con_v1_try_read(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+more:</div><div class='add'>+	dout("try_read start %p state %d\n", con, con-&gt;state);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V1_BANNER &amp;&amp;</div><div class='add'>+	    con-&gt;state != CEPH_CON_S_V1_CONNECT_MSG &amp;&amp;</div><div class='add'>+	    con-&gt;state != CEPH_CON_S_OPEN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!con-&gt;sock);</div><div class='add'>+</div><div class='add'>+	dout("try_read tag %d in_base_pos %d\n", con-&gt;v1.in_tag,</div><div class='add'>+	     con-&gt;v1.in_base_pos);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_V1_BANNER) {</div><div class='add'>+		ret = read_partial_banner(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = process_banner(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		con-&gt;state = CEPH_CON_S_V1_CONNECT_MSG;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Received banner is good, exchange connection info.</div><div class='add'>+		 * Do not reset out_kvec, as sending our banner raced</div><div class='add'>+		 * with receiving peer banner after connect completed.</div><div class='add'>+		 */</div><div class='add'>+		ret = prepare_write_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		prepare_read_connect(con);</div><div class='add'>+</div><div class='add'>+		/* Send connection info before awaiting response */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_V1_CONNECT_MSG) {</div><div class='add'>+		ret = read_partial_connect(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = process_connect(con);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		goto more;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;state != CEPH_CON_S_OPEN);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v1.in_base_pos &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * skipping + discarding content.</div><div class='add'>+		 */</div><div class='add'>+		ret = ceph_tcp_recvmsg(con-&gt;sock, NULL, -con-&gt;v1.in_base_pos);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		dout("skipped %d / %d bytes\n", ret, -con-&gt;v1.in_base_pos);</div><div class='add'>+		con-&gt;v1.in_base_pos += ret;</div><div class='add'>+		if (con-&gt;v1.in_base_pos)</div><div class='add'>+			goto more;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_READY) {</div><div class='add'>+		/*</div><div class='add'>+		 * what's next?</div><div class='add'>+		 */</div><div class='add'>+		ret = ceph_tcp_recvmsg(con-&gt;sock, &amp;con-&gt;v1.in_tag, 1);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		dout("try_read got tag %d\n", con-&gt;v1.in_tag);</div><div class='add'>+		switch (con-&gt;v1.in_tag) {</div><div class='add'>+		case CEPH_MSGR_TAG_MSG:</div><div class='add'>+			prepare_read_message(con);</div><div class='add'>+			break;</div><div class='add'>+		case CEPH_MSGR_TAG_ACK:</div><div class='add'>+			prepare_read_ack(con);</div><div class='add'>+			break;</div><div class='add'>+		case CEPH_MSGR_TAG_KEEPALIVE2_ACK:</div><div class='add'>+			prepare_read_keepalive_ack(con);</div><div class='add'>+			break;</div><div class='add'>+		case CEPH_MSGR_TAG_CLOSE:</div><div class='add'>+			ceph_con_close_socket(con);</div><div class='add'>+			con-&gt;state = CEPH_CON_S_CLOSED;</div><div class='add'>+			goto out;</div><div class='add'>+		default:</div><div class='add'>+			goto bad_tag;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_MSG) {</div><div class='add'>+		ret = read_partial_message(con);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			switch (ret) {</div><div class='add'>+			case -EBADMSG:</div><div class='add'>+				con-&gt;error_msg = "bad crc/signature";</div><div class='add'>+				fallthrough;</div><div class='add'>+			case -EBADE:</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			case -EIO:</div><div class='add'>+				con-&gt;error_msg = "io error";</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_READY)</div><div class='add'>+			goto more;</div><div class='add'>+		ceph_con_process_message(con);</div><div class='add'>+		if (con-&gt;state == CEPH_CON_S_OPEN)</div><div class='add'>+			prepare_read_tag(con);</div><div class='add'>+		goto more;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_ACK ||</div><div class='add'>+	    con-&gt;v1.in_tag == CEPH_MSGR_TAG_SEQ) {</div><div class='add'>+		/*</div><div class='add'>+		 * the final handshake seq exchange is semantically</div><div class='add'>+		 * equivalent to an ACK</div><div class='add'>+		 */</div><div class='add'>+		ret = read_partial_ack(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		process_ack(con);</div><div class='add'>+		goto more;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v1.in_tag == CEPH_MSGR_TAG_KEEPALIVE2_ACK) {</div><div class='add'>+		ret = read_keepalive_ack(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		goto more;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dout("try_read done on %p ret %d\n", con, ret);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+bad_tag:</div><div class='add'>+	pr_err("try_read bad tag %d\n", con-&gt;v1.in_tag);</div><div class='add'>+	con-&gt;error_msg = "protocol error, garbage tag";</div><div class='add'>+	ret = -1;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write something to the socket.  Called in a worker thread when the</div><div class='add'>+ * socket appears to be writeable and we have something ready to send.</div><div class='add'>+ */</div><div class='add'>+int ceph_con_v1_try_write(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	dout("try_write start %p state %d\n", con, con-&gt;state);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_PREOPEN &amp;&amp;</div><div class='add'>+	    con-&gt;state != CEPH_CON_S_V1_BANNER &amp;&amp;</div><div class='add'>+	    con-&gt;state != CEPH_CON_S_V1_CONNECT_MSG &amp;&amp;</div><div class='add'>+	    con-&gt;state != CEPH_CON_S_OPEN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* open the socket first? */</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_PREOPEN) {</div><div class='add'>+		BUG_ON(con-&gt;sock);</div><div class='add'>+		con-&gt;state = CEPH_CON_S_V1_BANNER;</div><div class='add'>+</div><div class='add'>+		con_out_kvec_reset(con);</div><div class='add'>+		prepare_write_banner(con);</div><div class='add'>+		prepare_read_banner(con);</div><div class='add'>+</div><div class='add'>+		BUG_ON(con-&gt;in_msg);</div><div class='add'>+		con-&gt;v1.in_tag = CEPH_MSGR_TAG_READY;</div><div class='add'>+		dout("try_write initiating connect on %p new state %d\n",</div><div class='add'>+		     con, con-&gt;state);</div><div class='add'>+		ret = ceph_tcp_connect(con);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			con-&gt;error_msg = "connect error";</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+more:</div><div class='add'>+	dout("try_write out_kvec_bytes %d\n", con-&gt;v1.out_kvec_bytes);</div><div class='add'>+	BUG_ON(!con-&gt;sock);</div><div class='add'>+</div><div class='add'>+	/* kvec data queued? */</div><div class='add'>+	if (con-&gt;v1.out_kvec_left) {</div><div class='add'>+		ret = write_partial_kvec(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v1.out_skip) {</div><div class='add'>+		ret = write_partial_skip(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* msg pages? */</div><div class='add'>+	msg = con-&gt;out_msg;</div><div class='add'>+	if (msg) {</div><div class='add'>+		if (con-&gt;v1.out_msg_done) {</div><div class='add'>+			ceph_msg_put(msg);</div><div class='add'>+			con-&gt;out_msg = NULL;   /* we're done with this one */</div><div class='add'>+			goto do_next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = write_partial_message_data(con, msg);</div><div class='add'>+		if (ret == 1)</div><div class='add'>+			goto more;  /* we need to send the footer, too! */</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			goto out;</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dout("try_write write_partial_message_data err %d\n",</div><div class='add'>+			     ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+do_next:</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_OPEN) {</div><div class='add'>+		if (ceph_con_flag_test_and_clear(con,</div><div class='add'>+				CEPH_CON_F_KEEPALIVE_PENDING)) {</div><div class='add'>+			prepare_write_keepalive(con);</div><div class='add'>+			goto more;</div><div class='add'>+		}</div><div class='add'>+		/* is anything else pending? */</div><div class='add'>+		if ((msg = ceph_con_get_out_msg(con)) != NULL) {</div><div class='add'>+			prepare_write_message(con, msg);</div><div class='add'>+			goto more;</div><div class='add'>+		}</div><div class='add'>+		if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='add'>+			prepare_write_ack(con);</div><div class='add'>+			goto more;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Nothing to do! */</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	dout("try_write nothing else to write.\n");</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	dout("try_write done on %p ret %d\n", con, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v1_revoke(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(con-&gt;v1.out_skip);</div><div class='add'>+	/* footer */</div><div class='add'>+	if (con-&gt;v1.out_msg_done) {</div><div class='add'>+		con-&gt;v1.out_skip += con_out_kvec_skip(con);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(!msg-&gt;data_length);</div><div class='add'>+		con-&gt;v1.out_skip += sizeof_footer(con);</div><div class='add'>+	}</div><div class='add'>+	/* data, middle, front */</div><div class='add'>+	if (msg-&gt;data_length)</div><div class='add'>+		con-&gt;v1.out_skip += msg-&gt;cursor.total_resid;</div><div class='add'>+	if (msg-&gt;middle)</div><div class='add'>+		con-&gt;v1.out_skip += con_out_kvec_skip(con);</div><div class='add'>+	con-&gt;v1.out_skip += con_out_kvec_skip(con);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p out_kvec_bytes %d out_skip %d\n", __func__, con,</div><div class='add'>+	     con-&gt;v1.out_kvec_bytes, con-&gt;v1.out_skip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v1_revoke_incoming(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	unsigned int front_len = le32_to_cpu(con-&gt;v1.in_hdr.front_len);</div><div class='add'>+	unsigned int middle_len = le32_to_cpu(con-&gt;v1.in_hdr.middle_len);</div><div class='add'>+	unsigned int data_len = le32_to_cpu(con-&gt;v1.in_hdr.data_len);</div><div class='add'>+</div><div class='add'>+	/* skip rest of message */</div><div class='add'>+	con-&gt;v1.in_base_pos = con-&gt;v1.in_base_pos -</div><div class='add'>+			sizeof(struct ceph_msg_header) -</div><div class='add'>+			front_len -</div><div class='add'>+			middle_len -</div><div class='add'>+			data_len -</div><div class='add'>+			sizeof(struct ceph_msg_footer);</div><div class='add'>+</div><div class='add'>+	con-&gt;v1.in_tag = CEPH_MSGR_TAG_READY;</div><div class='add'>+	con-&gt;in_seq++;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p in_base_pos %d\n", __func__, con, con-&gt;v1.in_base_pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ceph_con_v1_opened(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	return con-&gt;v1.connect_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v1_reset_session(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v1.connect_seq = 0;</div><div class='add'>+	con-&gt;v1.peer_global_seq = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v1_reset_protocol(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v1.out_skip = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c<br/>new file mode 100644<br/>index 000000000000..833e57849c1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/messenger_v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/messenger_v2.c</a></div><div class='hunk'>@@ -0,0 +1,3804 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Ceph msgr2 protocol implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2020 Ilya Dryomov &lt;idryomov@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='add'>+#include &lt;crypto/utils.h&gt;</div><div class='add'>+#include &lt;linux/bvec.h&gt;</div><div class='add'>+#include &lt;linux/crc32c.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ceph/ceph_features.h&gt;</div><div class='add'>+#include &lt;linux/ceph/decode.h&gt;</div><div class='add'>+#include &lt;linux/ceph/libceph.h&gt;</div><div class='add'>+#include &lt;linux/ceph/messenger.h&gt;</div><div class='add'>+</div><div class='add'>+#include "crypto.h"  /* for CEPH_KEY_LEN and CEPH_MAX_CON_SECRET_LEN */</div><div class='add'>+</div><div class='add'>+#define FRAME_TAG_HELLO			1</div><div class='add'>+#define FRAME_TAG_AUTH_REQUEST		2</div><div class='add'>+#define FRAME_TAG_AUTH_BAD_METHOD	3</div><div class='add'>+#define FRAME_TAG_AUTH_REPLY_MORE	4</div><div class='add'>+#define FRAME_TAG_AUTH_REQUEST_MORE	5</div><div class='add'>+#define FRAME_TAG_AUTH_DONE		6</div><div class='add'>+#define FRAME_TAG_AUTH_SIGNATURE	7</div><div class='add'>+#define FRAME_TAG_CLIENT_IDENT		8</div><div class='add'>+#define FRAME_TAG_SERVER_IDENT		9</div><div class='add'>+#define FRAME_TAG_IDENT_MISSING_FEATURES 10</div><div class='add'>+#define FRAME_TAG_SESSION_RECONNECT	11</div><div class='add'>+#define FRAME_TAG_SESSION_RESET		12</div><div class='add'>+#define FRAME_TAG_SESSION_RETRY		13</div><div class='add'>+#define FRAME_TAG_SESSION_RETRY_GLOBAL	14</div><div class='add'>+#define FRAME_TAG_SESSION_RECONNECT_OK	15</div><div class='add'>+#define FRAME_TAG_WAIT			16</div><div class='add'>+#define FRAME_TAG_MESSAGE		17</div><div class='add'>+#define FRAME_TAG_KEEPALIVE2		18</div><div class='add'>+#define FRAME_TAG_KEEPALIVE2_ACK	19</div><div class='add'>+#define FRAME_TAG_ACK			20</div><div class='add'>+</div><div class='add'>+#define FRAME_LATE_STATUS_ABORTED	0x1</div><div class='add'>+#define FRAME_LATE_STATUS_COMPLETE	0xe</div><div class='add'>+#define FRAME_LATE_STATUS_ABORTED_MASK	0xf</div><div class='add'>+</div><div class='add'>+#define IN_S_HANDLE_PREAMBLE			1</div><div class='add'>+#define IN_S_HANDLE_CONTROL			2</div><div class='add'>+#define IN_S_HANDLE_CONTROL_REMAINDER		3</div><div class='add'>+#define IN_S_PREPARE_READ_DATA			4</div><div class='add'>+#define IN_S_PREPARE_READ_DATA_CONT		5</div><div class='add'>+#define IN_S_PREPARE_READ_ENC_PAGE		6</div><div class='add'>+#define IN_S_PREPARE_SPARSE_DATA		7</div><div class='add'>+#define IN_S_PREPARE_SPARSE_DATA_CONT		8</div><div class='add'>+#define IN_S_HANDLE_EPILOGUE			9</div><div class='add'>+#define IN_S_FINISH_SKIP			10</div><div class='add'>+</div><div class='add'>+#define OUT_S_QUEUE_DATA		1</div><div class='add'>+#define OUT_S_QUEUE_DATA_CONT		2</div><div class='add'>+#define OUT_S_QUEUE_ENC_PAGE		3</div><div class='add'>+#define OUT_S_QUEUE_ZEROS		4</div><div class='add'>+#define OUT_S_FINISH_MESSAGE		5</div><div class='add'>+#define OUT_S_GET_NEXT			6</div><div class='add'>+</div><div class='add'>+#define CTRL_BODY(p)	((void *)(p) + CEPH_PREAMBLE_LEN)</div><div class='add'>+#define FRONT_PAD(p)	((void *)(p) + CEPH_EPILOGUE_SECURE_LEN)</div><div class='add'>+#define MIDDLE_PAD(p)	(FRONT_PAD(p) + CEPH_GCM_BLOCK_LEN)</div><div class='add'>+#define DATA_PAD(p)	(MIDDLE_PAD(p) + CEPH_GCM_BLOCK_LEN)</div><div class='add'>+</div><div class='add'>+#define CEPH_MSG_FLAGS (MSG_DONTWAIT | MSG_NOSIGNAL)</div><div class='add'>+</div><div class='add'>+static int do_recvmsg(struct socket *sock, struct iov_iter *it)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = CEPH_MSG_FLAGS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg.msg_iter = *it;</div><div class='add'>+	while (iov_iter_count(it)) {</div><div class='add'>+		ret = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret == -EAGAIN)</div><div class='add'>+				ret = 0;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iov_iter_advance(it, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(msg_data_left(&amp;msg));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read as much as possible.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   1 - done, nothing (else) to read</div><div class='add'>+ *   0 - socket is empty, need to wait</div><div class='add'>+ *  &lt;0 - error</div><div class='add'>+ */</div><div class='add'>+static int ceph_tcp_recv(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p %s %zu\n", __func__, con,</div><div class='add'>+	     iov_iter_is_discard(&amp;con-&gt;v2.in_iter) ? "discard" : "need",</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	ret = do_recvmsg(con-&gt;sock, &amp;con-&gt;v2.in_iter);</div><div class='add'>+	dout("%s con %p ret %d left %zu\n", __func__, con, ret,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_sendmsg(struct socket *sock, struct iov_iter *it)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = CEPH_MSG_FLAGS };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg.msg_iter = *it;</div><div class='add'>+	while (iov_iter_count(it)) {</div><div class='add'>+		ret = sock_sendmsg(sock, &amp;msg);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret == -EAGAIN)</div><div class='add'>+				ret = 0;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iov_iter_advance(it, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(msg_data_left(&amp;msg));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_try_sendpage(struct socket *sock, struct iov_iter *it)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = CEPH_MSG_FLAGS };</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!iov_iter_is_bvec(it)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (iov_iter_count(it)) {</div><div class='add'>+		/* iov_iter_iovec() for ITER_BVEC */</div><div class='add'>+		bvec_set_page(&amp;bv, it-&gt;bvec-&gt;bv_page,</div><div class='add'>+			      min(iov_iter_count(it),</div><div class='add'>+				  it-&gt;bvec-&gt;bv_len - it-&gt;iov_offset),</div><div class='add'>+			      it-&gt;bvec-&gt;bv_offset + it-&gt;iov_offset);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * MSG_SPLICE_PAGES cannot properly handle pages with</div><div class='add'>+		 * page_count == 0, we need to fall back to sendmsg if</div><div class='add'>+		 * that's the case.</div><div class='add'>+		 *</div><div class='add'>+		 * Same goes for slab pages: skb_can_coalesce() allows</div><div class='add'>+		 * coalescing neighboring slab objects into a single frag</div><div class='add'>+		 * which triggers one of hardened usercopy checks.</div><div class='add'>+		 */</div><div class='add'>+		if (sendpage_ok(bv.bv_page))</div><div class='add'>+			msg.msg_flags |= MSG_SPLICE_PAGES;</div><div class='add'>+		else</div><div class='add'>+			msg.msg_flags &amp;= ~MSG_SPLICE_PAGES;</div><div class='add'>+</div><div class='add'>+		iov_iter_bvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;bv, 1, bv.bv_len);</div><div class='add'>+		ret = sock_sendmsg(sock, &amp;msg);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret == -EAGAIN)</div><div class='add'>+				ret = 0;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iov_iter_advance(it, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write as much as possible.  The socket is expected to be corked,</div><div class='add'>+ * so we don't bother with MSG_MORE here.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   1 - done, nothing (else) to write</div><div class='add'>+ *   0 - socket is full, need to wait</div><div class='add'>+ *  &lt;0 - error</div><div class='add'>+ */</div><div class='add'>+static int ceph_tcp_send(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p have %zu try_sendpage %d\n", __func__, con,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.out_iter), con-&gt;v2.out_iter_sendpage);</div><div class='add'>+	if (con-&gt;v2.out_iter_sendpage)</div><div class='add'>+		ret = do_try_sendpage(con-&gt;sock, &amp;con-&gt;v2.out_iter);</div><div class='add'>+	else</div><div class='add'>+		ret = do_sendmsg(con-&gt;sock, &amp;con-&gt;v2.out_iter);</div><div class='add'>+	dout("%s con %p ret %d left %zu\n", __func__, con, ret,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_in_kvec(struct ceph_connection *con, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(con-&gt;v2.in_kvec_cnt &gt;= ARRAY_SIZE(con-&gt;v2.in_kvecs));</div><div class='add'>+	WARN_ON(!iov_iter_is_kvec(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.in_kvecs[con-&gt;v2.in_kvec_cnt].iov_base = buf;</div><div class='add'>+	con-&gt;v2.in_kvecs[con-&gt;v2.in_kvec_cnt].iov_len = len;</div><div class='add'>+	con-&gt;v2.in_kvec_cnt++;</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.in_iter.nr_segs++;</div><div class='add'>+	con-&gt;v2.in_iter.count += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_in_kvecs(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.in_kvec_cnt = 0;</div><div class='add'>+	iov_iter_kvec(&amp;con-&gt;v2.in_iter, ITER_DEST, con-&gt;v2.in_kvecs, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_in_bvec(struct ceph_connection *con, const struct bio_vec *bv)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.in_bvec = *bv;</div><div class='add'>+	iov_iter_bvec(&amp;con-&gt;v2.in_iter, ITER_DEST, &amp;con-&gt;v2.in_bvec, 1, bv-&gt;bv_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_in_skip(struct ceph_connection *con, int len)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	dout("%s con %p len %d\n", __func__, con, len);</div><div class='add'>+	iov_iter_discard(&amp;con-&gt;v2.in_iter, ITER_DEST, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_out_kvec(struct ceph_connection *con, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(con-&gt;v2.out_kvec_cnt &gt;= ARRAY_SIZE(con-&gt;v2.out_kvecs));</div><div class='add'>+	WARN_ON(!iov_iter_is_kvec(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	WARN_ON(con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_kvecs[con-&gt;v2.out_kvec_cnt].iov_base = buf;</div><div class='add'>+	con-&gt;v2.out_kvecs[con-&gt;v2.out_kvec_cnt].iov_len = len;</div><div class='add'>+	con-&gt;v2.out_kvec_cnt++;</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_iter.nr_segs++;</div><div class='add'>+	con-&gt;v2.out_iter.count += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_out_kvecs(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	WARN_ON(con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_kvec_cnt = 0;</div><div class='add'>+</div><div class='add'>+	iov_iter_kvec(&amp;con-&gt;v2.out_iter, ITER_SOURCE, con-&gt;v2.out_kvecs, 0, 0);</div><div class='add'>+	con-&gt;v2.out_iter_sendpage = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_out_bvec(struct ceph_connection *con, const struct bio_vec *bv,</div><div class='add'>+			 bool zerocopy)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	WARN_ON(con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_bvec = *bv;</div><div class='add'>+	con-&gt;v2.out_iter_sendpage = zerocopy;</div><div class='add'>+	iov_iter_bvec(&amp;con-&gt;v2.out_iter, ITER_SOURCE, &amp;con-&gt;v2.out_bvec, 1,</div><div class='add'>+		      con-&gt;v2.out_bvec.bv_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_out_bvec_zero(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	WARN_ON(!con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	bvec_set_page(&amp;con-&gt;v2.out_bvec, ceph_zero_page,</div><div class='add'>+		      min(con-&gt;v2.out_zero, (int)PAGE_SIZE), 0);</div><div class='add'>+	con-&gt;v2.out_iter_sendpage = true;</div><div class='add'>+	iov_iter_bvec(&amp;con-&gt;v2.out_iter, ITER_SOURCE, &amp;con-&gt;v2.out_bvec, 1,</div><div class='add'>+		      con-&gt;v2.out_bvec.bv_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void out_zero_add(struct ceph_connection *con, int len)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p len %d\n", __func__, con, len);</div><div class='add'>+	con-&gt;v2.out_zero += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *alloc_conn_buf(struct ceph_connection *con, int len)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p len %d\n", __func__, con, len);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(con-&gt;v2.conn_buf_cnt &gt;= ARRAY_SIZE(con-&gt;v2.conn_bufs)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	buf = kvmalloc(len, GFP_NOIO);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.conn_bufs[con-&gt;v2.conn_buf_cnt++] = buf;</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_conn_bufs(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	while (con-&gt;v2.conn_buf_cnt)</div><div class='add'>+		kvfree(con-&gt;v2.conn_bufs[--con-&gt;v2.conn_buf_cnt]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_in_sign_kvec(struct ceph_connection *con, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(con-&gt;v2.in_sign_kvec_cnt &gt;= ARRAY_SIZE(con-&gt;v2.in_sign_kvecs));</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.in_sign_kvecs[con-&gt;v2.in_sign_kvec_cnt].iov_base = buf;</div><div class='add'>+	con-&gt;v2.in_sign_kvecs[con-&gt;v2.in_sign_kvec_cnt].iov_len = len;</div><div class='add'>+	con-&gt;v2.in_sign_kvec_cnt++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_in_sign_kvecs(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v2.in_sign_kvec_cnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_out_sign_kvec(struct ceph_connection *con, void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(con-&gt;v2.out_sign_kvec_cnt &gt;= ARRAY_SIZE(con-&gt;v2.out_sign_kvecs));</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_sign_kvecs[con-&gt;v2.out_sign_kvec_cnt].iov_base = buf;</div><div class='add'>+	con-&gt;v2.out_sign_kvecs[con-&gt;v2.out_sign_kvec_cnt].iov_len = len;</div><div class='add'>+	con-&gt;v2.out_sign_kvec_cnt++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_out_sign_kvecs(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v2.out_sign_kvec_cnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool con_secure(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	return con-&gt;v2.con_mode == CEPH_CON_MODE_SECURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int front_len(const struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(msg-&gt;hdr.front_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int middle_len(const struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(msg-&gt;hdr.middle_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int data_len(const struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(msg-&gt;hdr.data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool need_padding(int len)</div><div class='add'>+{</div><div class='add'>+	return !IS_ALIGNED(len, CEPH_GCM_BLOCK_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int padded_len(int len)</div><div class='add'>+{</div><div class='add'>+	return ALIGN(len, CEPH_GCM_BLOCK_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int padding_len(int len)</div><div class='add'>+{</div><div class='add'>+	return padded_len(len) - len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* preamble + control segment */</div><div class='add'>+static int head_onwire_len(int ctrl_len, bool secure)</div><div class='add'>+{</div><div class='add'>+	int head_len;</div><div class='add'>+	int rem_len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ctrl_len &lt; 0 || ctrl_len &gt; CEPH_MSG_MAX_CONTROL_LEN);</div><div class='add'>+</div><div class='add'>+	if (secure) {</div><div class='add'>+		head_len = CEPH_PREAMBLE_SECURE_LEN;</div><div class='add'>+		if (ctrl_len &gt; CEPH_PREAMBLE_INLINE_LEN) {</div><div class='add'>+			rem_len = ctrl_len - CEPH_PREAMBLE_INLINE_LEN;</div><div class='add'>+			head_len += padded_len(rem_len) + CEPH_GCM_TAG_LEN;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		head_len = CEPH_PREAMBLE_PLAIN_LEN;</div><div class='add'>+		if (ctrl_len)</div><div class='add'>+			head_len += ctrl_len + CEPH_CRC_LEN;</div><div class='add'>+	}</div><div class='add'>+	return head_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* front, middle and data segments + epilogue */</div><div class='add'>+static int __tail_onwire_len(int front_len, int middle_len, int data_len,</div><div class='add'>+			     bool secure)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(front_len &lt; 0 || front_len &gt; CEPH_MSG_MAX_FRONT_LEN ||</div><div class='add'>+	       middle_len &lt; 0 || middle_len &gt; CEPH_MSG_MAX_MIDDLE_LEN ||</div><div class='add'>+	       data_len &lt; 0 || data_len &gt; CEPH_MSG_MAX_DATA_LEN);</div><div class='add'>+</div><div class='add'>+	if (!front_len &amp;&amp; !middle_len &amp;&amp; !data_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!secure)</div><div class='add'>+		return front_len + middle_len + data_len +</div><div class='add'>+		       CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+</div><div class='add'>+	return padded_len(front_len) + padded_len(middle_len) +</div><div class='add'>+	       padded_len(data_len) + CEPH_EPILOGUE_SECURE_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tail_onwire_len(const struct ceph_msg *msg, bool secure)</div><div class='add'>+{</div><div class='add'>+	return __tail_onwire_len(front_len(msg), middle_len(msg),</div><div class='add'>+				 data_len(msg), secure);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* head_onwire_len(sizeof(struct ceph_msg_header2), false) */</div><div class='add'>+#define MESSAGE_HEAD_PLAIN_LEN	(CEPH_PREAMBLE_PLAIN_LEN +		\</div><div class='add'>+				 sizeof(struct ceph_msg_header2) +	\</div><div class='add'>+				 CEPH_CRC_LEN)</div><div class='add'>+</div><div class='add'>+static const int frame_aligns[] = {</div><div class='add'>+	sizeof(void *),</div><div class='add'>+	sizeof(void *),</div><div class='add'>+	sizeof(void *),</div><div class='add'>+	PAGE_SIZE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Discards trailing empty segments, unless there is just one segment.</div><div class='add'>+ * A frame always has at least one (possibly empty) segment.</div><div class='add'>+ */</div><div class='add'>+static int calc_segment_count(const int *lens, int len_cnt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = len_cnt - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (lens[i])</div><div class='add'>+			return i + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_frame_desc(struct ceph_frame_desc *desc, int tag,</div><div class='add'>+			    const int *lens, int len_cnt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(desc, 0, sizeof(*desc));</div><div class='add'>+</div><div class='add'>+	desc-&gt;fd_tag = tag;</div><div class='add'>+	desc-&gt;fd_seg_cnt = calc_segment_count(lens, len_cnt);</div><div class='add'>+	BUG_ON(desc-&gt;fd_seg_cnt &gt; CEPH_FRAME_MAX_SEGMENT_COUNT);</div><div class='add'>+	for (i = 0; i &lt; desc-&gt;fd_seg_cnt; i++) {</div><div class='add'>+		desc-&gt;fd_lens[i] = lens[i];</div><div class='add'>+		desc-&gt;fd_aligns[i] = frame_aligns[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Preamble crc covers everything up to itself (28 bytes) and</div><div class='add'>+ * is calculated and verified irrespective of the connection mode</div><div class='add'>+ * (i.e. even if the frame is encrypted).</div><div class='add'>+ */</div><div class='add'>+static void encode_preamble(const struct ceph_frame_desc *desc, void *p)</div><div class='add'>+{</div><div class='add'>+	void *crcp = p + CEPH_PREAMBLE_LEN - CEPH_CRC_LEN;</div><div class='add'>+	void *start = p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, CEPH_PREAMBLE_LEN);</div><div class='add'>+</div><div class='add'>+	ceph_encode_8(&amp;p, desc-&gt;fd_tag);</div><div class='add'>+	ceph_encode_8(&amp;p, desc-&gt;fd_seg_cnt);</div><div class='add'>+	for (i = 0; i &lt; desc-&gt;fd_seg_cnt; i++) {</div><div class='add'>+		ceph_encode_32(&amp;p, desc-&gt;fd_lens[i]);</div><div class='add'>+		ceph_encode_16(&amp;p, desc-&gt;fd_aligns[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(crc32c(0, start, crcp - start), crcp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_preamble(void *p, struct ceph_frame_desc *desc)</div><div class='add'>+{</div><div class='add'>+	void *crcp = p + CEPH_PREAMBLE_LEN - CEPH_CRC_LEN;</div><div class='add'>+	u32 crc, expected_crc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	crc = crc32c(0, p, crcp - p);</div><div class='add'>+	expected_crc = get_unaligned_le32(crcp);</div><div class='add'>+	if (crc != expected_crc) {</div><div class='add'>+		pr_err("bad preamble crc, calculated %u, expected %u\n",</div><div class='add'>+		       crc, expected_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(desc, 0, sizeof(*desc));</div><div class='add'>+</div><div class='add'>+	desc-&gt;fd_tag = ceph_decode_8(&amp;p);</div><div class='add'>+	desc-&gt;fd_seg_cnt = ceph_decode_8(&amp;p);</div><div class='add'>+	if (desc-&gt;fd_seg_cnt &lt; 1 ||</div><div class='add'>+	    desc-&gt;fd_seg_cnt &gt; CEPH_FRAME_MAX_SEGMENT_COUNT) {</div><div class='add'>+		pr_err("bad segment count %d\n", desc-&gt;fd_seg_cnt);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; desc-&gt;fd_seg_cnt; i++) {</div><div class='add'>+		desc-&gt;fd_lens[i] = ceph_decode_32(&amp;p);</div><div class='add'>+		desc-&gt;fd_aligns[i] = ceph_decode_16(&amp;p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;fd_lens[0] &lt; 0 ||</div><div class='add'>+	    desc-&gt;fd_lens[0] &gt; CEPH_MSG_MAX_CONTROL_LEN) {</div><div class='add'>+		pr_err("bad control segment length %d\n", desc-&gt;fd_lens[0]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (desc-&gt;fd_lens[1] &lt; 0 ||</div><div class='add'>+	    desc-&gt;fd_lens[1] &gt; CEPH_MSG_MAX_FRONT_LEN) {</div><div class='add'>+		pr_err("bad front segment length %d\n", desc-&gt;fd_lens[1]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (desc-&gt;fd_lens[2] &lt; 0 ||</div><div class='add'>+	    desc-&gt;fd_lens[2] &gt; CEPH_MSG_MAX_MIDDLE_LEN) {</div><div class='add'>+		pr_err("bad middle segment length %d\n", desc-&gt;fd_lens[2]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (desc-&gt;fd_lens[3] &lt; 0 ||</div><div class='add'>+	    desc-&gt;fd_lens[3] &gt; CEPH_MSG_MAX_DATA_LEN) {</div><div class='add'>+		pr_err("bad data segment length %d\n", desc-&gt;fd_lens[3]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This would fire for FRAME_TAG_WAIT (it has one empty</div><div class='add'>+	 * segment), but we should never get it as client.</div><div class='add'>+	 */</div><div class='add'>+	if (!desc-&gt;fd_lens[desc-&gt;fd_seg_cnt - 1]) {</div><div class='add'>+		pr_err("last segment empty, segment count %d\n",</div><div class='add'>+		       desc-&gt;fd_seg_cnt);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void encode_epilogue_plain(struct ceph_connection *con, bool aborted)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v2.out_epil.late_status = aborted ? FRAME_LATE_STATUS_ABORTED :</div><div class='add'>+						 FRAME_LATE_STATUS_COMPLETE;</div><div class='add'>+	cpu_to_le32s(&amp;con-&gt;v2.out_epil.front_crc);</div><div class='add'>+	cpu_to_le32s(&amp;con-&gt;v2.out_epil.middle_crc);</div><div class='add'>+	cpu_to_le32s(&amp;con-&gt;v2.out_epil.data_crc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void encode_epilogue_secure(struct ceph_connection *con, bool aborted)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;con-&gt;v2.out_epil, 0, sizeof(con-&gt;v2.out_epil));</div><div class='add'>+	con-&gt;v2.out_epil.late_status = aborted ? FRAME_LATE_STATUS_ABORTED :</div><div class='add'>+						 FRAME_LATE_STATUS_COMPLETE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_epilogue(void *p, u32 *front_crc, u32 *middle_crc,</div><div class='add'>+			   u32 *data_crc)</div><div class='add'>+{</div><div class='add'>+	u8 late_status;</div><div class='add'>+</div><div class='add'>+	late_status = ceph_decode_8(&amp;p);</div><div class='add'>+	if ((late_status &amp; FRAME_LATE_STATUS_ABORTED_MASK) !=</div><div class='add'>+			FRAME_LATE_STATUS_COMPLETE) {</div><div class='add'>+		/* we should never get an aborted message as client */</div><div class='add'>+		pr_err("bad late_status 0x%x\n", late_status);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (front_crc &amp;&amp; middle_crc &amp;&amp; data_crc) {</div><div class='add'>+		*front_crc = ceph_decode_32(&amp;p);</div><div class='add'>+		*middle_crc = ceph_decode_32(&amp;p);</div><div class='add'>+		*data_crc = ceph_decode_32(&amp;p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_header(struct ceph_msg_header *hdr,</div><div class='add'>+			const struct ceph_msg_header2 *hdr2,</div><div class='add'>+			int front_len, int middle_len, int data_len,</div><div class='add'>+			const struct ceph_entity_name *peer_name)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;seq = hdr2-&gt;seq;</div><div class='add'>+	hdr-&gt;tid = hdr2-&gt;tid;</div><div class='add'>+	hdr-&gt;type = hdr2-&gt;type;</div><div class='add'>+	hdr-&gt;priority = hdr2-&gt;priority;</div><div class='add'>+	hdr-&gt;version = hdr2-&gt;version;</div><div class='add'>+	hdr-&gt;front_len = cpu_to_le32(front_len);</div><div class='add'>+	hdr-&gt;middle_len = cpu_to_le32(middle_len);</div><div class='add'>+	hdr-&gt;data_len = cpu_to_le32(data_len);</div><div class='add'>+	hdr-&gt;data_off = hdr2-&gt;data_off;</div><div class='add'>+	hdr-&gt;src = *peer_name;</div><div class='add'>+	hdr-&gt;compat_version = hdr2-&gt;compat_version;</div><div class='add'>+	hdr-&gt;reserved = 0;</div><div class='add'>+	hdr-&gt;crc = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_header2(struct ceph_msg_header2 *hdr2,</div><div class='add'>+			 const struct ceph_msg_header *hdr, u64 ack_seq)</div><div class='add'>+{</div><div class='add'>+	hdr2-&gt;seq = hdr-&gt;seq;</div><div class='add'>+	hdr2-&gt;tid = hdr-&gt;tid;</div><div class='add'>+	hdr2-&gt;type = hdr-&gt;type;</div><div class='add'>+	hdr2-&gt;priority = hdr-&gt;priority;</div><div class='add'>+	hdr2-&gt;version = hdr-&gt;version;</div><div class='add'>+	hdr2-&gt;data_pre_padding_len = 0;</div><div class='add'>+	hdr2-&gt;data_off = hdr-&gt;data_off;</div><div class='add'>+	hdr2-&gt;ack_seq = cpu_to_le64(ack_seq);</div><div class='add'>+	hdr2-&gt;flags = 0;</div><div class='add'>+	hdr2-&gt;compat_version = hdr-&gt;compat_version;</div><div class='add'>+	hdr2-&gt;reserved = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int verify_control_crc(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len = con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	u32 crc, expected_crc;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.in_kvecs[0].iov_len != ctrl_len);</div><div class='add'>+	WARN_ON(con-&gt;v2.in_kvecs[1].iov_len != CEPH_CRC_LEN);</div><div class='add'>+</div><div class='add'>+	crc = crc32c(-1, con-&gt;v2.in_kvecs[0].iov_base, ctrl_len);</div><div class='add'>+	expected_crc = get_unaligned_le32(con-&gt;v2.in_kvecs[1].iov_base);</div><div class='add'>+	if (crc != expected_crc) {</div><div class='add'>+		pr_err("bad control crc, calculated %u, expected %u\n",</div><div class='add'>+		       crc, expected_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int verify_epilogue_crcs(struct ceph_connection *con, u32 front_crc,</div><div class='add'>+				u32 middle_crc, u32 data_crc)</div><div class='add'>+{</div><div class='add'>+	if (front_len(con-&gt;in_msg)) {</div><div class='add'>+		con-&gt;in_front_crc = crc32c(-1, con-&gt;in_msg-&gt;front.iov_base,</div><div class='add'>+					   front_len(con-&gt;in_msg));</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(!middle_len(con-&gt;in_msg) &amp;&amp; !data_len(con-&gt;in_msg));</div><div class='add'>+		con-&gt;in_front_crc = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (middle_len(con-&gt;in_msg))</div><div class='add'>+		con-&gt;in_middle_crc = crc32c(-1,</div><div class='add'>+					    con-&gt;in_msg-&gt;middle-&gt;vec.iov_base,</div><div class='add'>+					    middle_len(con-&gt;in_msg));</div><div class='add'>+	else if (data_len(con-&gt;in_msg))</div><div class='add'>+		con-&gt;in_middle_crc = -1;</div><div class='add'>+	else</div><div class='add'>+		con-&gt;in_middle_crc = 0;</div><div class='add'>+</div><div class='add'>+	if (!data_len(con-&gt;in_msg))</div><div class='add'>+		con-&gt;in_data_crc = 0;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p msg %p crcs %u %u %u\n", __func__, con, con-&gt;in_msg,</div><div class='add'>+	     con-&gt;in_front_crc, con-&gt;in_middle_crc, con-&gt;in_data_crc);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;in_front_crc != front_crc) {</div><div class='add'>+		pr_err("bad front crc, calculated %u, expected %u\n",</div><div class='add'>+		       con-&gt;in_front_crc, front_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;in_middle_crc != middle_crc) {</div><div class='add'>+		pr_err("bad middle crc, calculated %u, expected %u\n",</div><div class='add'>+		       con-&gt;in_middle_crc, middle_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;in_data_crc != data_crc) {</div><div class='add'>+		pr_err("bad data crc, calculated %u, expected %u\n",</div><div class='add'>+		       con-&gt;in_data_crc, data_crc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_crypto(struct ceph_connection *con,</div><div class='add'>+			const u8 *session_key, int session_key_len,</div><div class='add'>+			const u8 *con_secret, int con_secret_len)</div><div class='add'>+{</div><div class='add'>+	unsigned int noio_flag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p con_mode %d session_key_len %d con_secret_len %d\n",</div><div class='add'>+	     __func__, con, con-&gt;v2.con_mode, session_key_len, con_secret_len);</div><div class='add'>+	WARN_ON(con-&gt;v2.hmac_key_set || con-&gt;v2.gcm_tfm || con-&gt;v2.gcm_req);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.con_mode != CEPH_CON_MODE_CRC &amp;&amp;</div><div class='add'>+	    con-&gt;v2.con_mode != CEPH_CON_MODE_SECURE) {</div><div class='add'>+		pr_err("bad con_mode %d\n", con-&gt;v2.con_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!session_key_len) {</div><div class='add'>+		WARN_ON(con-&gt;v2.con_mode != CEPH_CON_MODE_CRC);</div><div class='add'>+		WARN_ON(con_secret_len);</div><div class='add'>+		return 0;  /* auth_none */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hmac_sha256_preparekey(&amp;con-&gt;v2.hmac_key, session_key, session_key_len);</div><div class='add'>+	con-&gt;v2.hmac_key_set = true;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.con_mode == CEPH_CON_MODE_CRC) {</div><div class='add'>+		WARN_ON(con_secret_len);</div><div class='add'>+		return 0;  /* auth_x, plain mode */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (con_secret_len &lt; CEPH_GCM_KEY_LEN + 2 * CEPH_GCM_IV_LEN) {</div><div class='add'>+		pr_err("con_secret too small %d\n", con_secret_len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	noio_flag = memalloc_noio_save();</div><div class='add'>+	con-&gt;v2.gcm_tfm = crypto_alloc_aead("gcm(aes)", 0, 0);</div><div class='add'>+	memalloc_noio_restore(noio_flag);</div><div class='add'>+	if (IS_ERR(con-&gt;v2.gcm_tfm)) {</div><div class='add'>+		ret = PTR_ERR(con-&gt;v2.gcm_tfm);</div><div class='add'>+		con-&gt;v2.gcm_tfm = NULL;</div><div class='add'>+		pr_err("failed to allocate gcm tfm context: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON((unsigned long)con_secret &amp;</div><div class='add'>+		crypto_aead_alignmask(con-&gt;v2.gcm_tfm));</div><div class='add'>+	ret = crypto_aead_setkey(con-&gt;v2.gcm_tfm, con_secret, CEPH_GCM_KEY_LEN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to set gcm key: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(crypto_aead_ivsize(con-&gt;v2.gcm_tfm) != CEPH_GCM_IV_LEN);</div><div class='add'>+	ret = crypto_aead_setauthsize(con-&gt;v2.gcm_tfm, CEPH_GCM_TAG_LEN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to set gcm tag size: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.gcm_req = aead_request_alloc(con-&gt;v2.gcm_tfm, GFP_NOIO);</div><div class='add'>+	if (!con-&gt;v2.gcm_req) {</div><div class='add'>+		pr_err("failed to allocate gcm request\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crypto_init_wait(&amp;con-&gt;v2.gcm_wait);</div><div class='add'>+	aead_request_set_callback(con-&gt;v2.gcm_req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				  crypto_req_done, &amp;con-&gt;v2.gcm_wait);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;con-&gt;v2.in_gcm_nonce, con_secret + CEPH_GCM_KEY_LEN,</div><div class='add'>+	       CEPH_GCM_IV_LEN);</div><div class='add'>+	memcpy(&amp;con-&gt;v2.out_gcm_nonce,</div><div class='add'>+	       con_secret + CEPH_GCM_KEY_LEN + CEPH_GCM_IV_LEN,</div><div class='add'>+	       CEPH_GCM_IV_LEN);</div><div class='add'>+	return 0;  /* auth_x, secure mode */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ceph_hmac_sha256(struct ceph_connection *con,</div><div class='add'>+			     const struct kvec *kvecs, int kvec_cnt,</div><div class='add'>+			     u8 hmac[SHA256_DIGEST_SIZE])</div><div class='add'>+{</div><div class='add'>+	struct hmac_sha256_ctx ctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p hmac_key_set %d kvec_cnt %d\n", __func__, con,</div><div class='add'>+	     con-&gt;v2.hmac_key_set, kvec_cnt);</div><div class='add'>+</div><div class='add'>+	if (!con-&gt;v2.hmac_key_set) {</div><div class='add'>+		memset(hmac, 0, SHA256_DIGEST_SIZE);</div><div class='add'>+		return;  /* auth_none */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* auth_x, both plain and secure modes */</div><div class='add'>+	hmac_sha256_init(&amp;ctx, &amp;con-&gt;v2.hmac_key);</div><div class='add'>+	for (i = 0; i &lt; kvec_cnt; i++)</div><div class='add'>+		hmac_sha256_update(&amp;ctx, kvecs[i].iov_base, kvecs[i].iov_len);</div><div class='add'>+	hmac_sha256_final(&amp;ctx, hmac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gcm_inc_nonce(struct ceph_gcm_nonce *nonce)</div><div class='add'>+{</div><div class='add'>+	u64 counter;</div><div class='add'>+</div><div class='add'>+	counter = le64_to_cpu(nonce-&gt;counter);</div><div class='add'>+	nonce-&gt;counter = cpu_to_le64(counter + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gcm_crypt(struct ceph_connection *con, bool encrypt,</div><div class='add'>+		     struct scatterlist *src, struct scatterlist *dst,</div><div class='add'>+		     int src_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_gcm_nonce *nonce;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nonce = encrypt ? &amp;con-&gt;v2.out_gcm_nonce : &amp;con-&gt;v2.in_gcm_nonce;</div><div class='add'>+</div><div class='add'>+	aead_request_set_ad(con-&gt;v2.gcm_req, 0);  /* no AAD */</div><div class='add'>+	aead_request_set_crypt(con-&gt;v2.gcm_req, src, dst, src_len, (u8 *)nonce);</div><div class='add'>+	ret = crypto_wait_req(encrypt ? crypto_aead_encrypt(con-&gt;v2.gcm_req) :</div><div class='add'>+					crypto_aead_decrypt(con-&gt;v2.gcm_req),</div><div class='add'>+			      &amp;con-&gt;v2.gcm_wait);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	gcm_inc_nonce(nonce);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void get_bvec_at(struct ceph_msg_data_cursor *cursor,</div><div class='add'>+			struct bio_vec *bv)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	size_t off, len;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!cursor-&gt;total_resid);</div><div class='add'>+</div><div class='add'>+	/* skip zero-length data items */</div><div class='add'>+	while (!cursor-&gt;resid)</div><div class='add'>+		ceph_msg_data_advance(cursor, 0);</div><div class='add'>+</div><div class='add'>+	/* get a piece of data, cursor isn't advanced */</div><div class='add'>+	page = ceph_msg_data_next(cursor, &amp;off, &amp;len);</div><div class='add'>+	bvec_set_page(bv, page, len, off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int calc_sg_cnt(void *buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	int sg_cnt;</div><div class='add'>+</div><div class='add'>+	if (!buf_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sg_cnt = need_padding(buf_len) ? 1 : 0;</div><div class='add'>+	if (is_vmalloc_addr(buf)) {</div><div class='add'>+		WARN_ON(offset_in_page(buf));</div><div class='add'>+		sg_cnt += PAGE_ALIGN(buf_len) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		sg_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sg_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int calc_sg_cnt_cursor(struct ceph_msg_data_cursor *cursor)</div><div class='add'>+{</div><div class='add'>+	int data_len = cursor-&gt;total_resid;</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+	int sg_cnt;</div><div class='add'>+</div><div class='add'>+	if (!data_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sg_cnt = need_padding(data_len) ? 1 : 0;</div><div class='add'>+	do {</div><div class='add'>+		get_bvec_at(cursor, &amp;bv);</div><div class='add'>+		sg_cnt++;</div><div class='add'>+</div><div class='add'>+		ceph_msg_data_advance(cursor, bv.bv_len);</div><div class='add'>+	} while (cursor-&gt;total_resid);</div><div class='add'>+</div><div class='add'>+	return sg_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_sgs(struct scatterlist **sg, void *buf, int buf_len, u8 *pad)</div><div class='add'>+{</div><div class='add'>+	void *end = buf + buf_len;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int len;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (!buf_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (is_vmalloc_addr(buf)) {</div><div class='add'>+		p = buf;</div><div class='add'>+		do {</div><div class='add'>+			page = vmalloc_to_page(p);</div><div class='add'>+			len = min_t(int, end - p, PAGE_SIZE);</div><div class='add'>+			WARN_ON(!page || !len || offset_in_page(p));</div><div class='add'>+			sg_set_page(*sg, page, len, 0);</div><div class='add'>+			*sg = sg_next(*sg);</div><div class='add'>+			p += len;</div><div class='add'>+		} while (p != end);</div><div class='add'>+	} else {</div><div class='add'>+		sg_set_buf(*sg, buf, buf_len);</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_padding(buf_len)) {</div><div class='add'>+		sg_set_buf(*sg, pad, padding_len(buf_len));</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_sgs_cursor(struct scatterlist **sg,</div><div class='add'>+			    struct ceph_msg_data_cursor *cursor, u8 *pad)</div><div class='add'>+{</div><div class='add'>+	int data_len = cursor-&gt;total_resid;</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	if (!data_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		get_bvec_at(cursor, &amp;bv);</div><div class='add'>+		sg_set_page(*sg, bv.bv_page, bv.bv_len, bv.bv_offset);</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+</div><div class='add'>+		ceph_msg_data_advance(cursor, bv.bv_len);</div><div class='add'>+	} while (cursor-&gt;total_resid);</div><div class='add'>+</div><div class='add'>+	if (need_padding(data_len)) {</div><div class='add'>+		sg_set_buf(*sg, pad, padding_len(data_len));</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * init_sgs_pages: set up scatterlist on an array of page pointers</div><div class='add'>+ * @sg:		scatterlist to populate</div><div class='add'>+ * @pages:	pointer to page array</div><div class='add'>+ * @dpos:	position in the array to start (bytes)</div><div class='add'>+ * @dlen:	len to add to sg (bytes)</div><div class='add'>+ * @pad:	pointer to pad destination (if any)</div><div class='add'>+ *</div><div class='add'>+ * Populate the scatterlist from the page array, starting at an arbitrary</div><div class='add'>+ * byte in the array and running for a specified length.</div><div class='add'>+ */</div><div class='add'>+static void init_sgs_pages(struct scatterlist **sg, struct page **pages,</div><div class='add'>+			   int dpos, int dlen, u8 *pad)</div><div class='add'>+{</div><div class='add'>+	int idx = dpos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	int off = offset_in_page(dpos);</div><div class='add'>+	int resid = dlen;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		int len = min(resid, (int)PAGE_SIZE - off);</div><div class='add'>+</div><div class='add'>+		sg_set_page(*sg, pages[idx], len, off);</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+		off = 0;</div><div class='add'>+		++idx;</div><div class='add'>+		resid -= len;</div><div class='add'>+	} while (resid);</div><div class='add'>+</div><div class='add'>+	if (need_padding(dlen)) {</div><div class='add'>+		sg_set_buf(*sg, pad, padding_len(dlen));</div><div class='add'>+		*sg = sg_next(*sg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_message_sgs(struct sg_table *sgt, struct ceph_msg *msg,</div><div class='add'>+			     u8 *front_pad, u8 *middle_pad, u8 *data_pad,</div><div class='add'>+			     void *epilogue, struct page **pages, int dpos,</div><div class='add'>+			     bool add_tag)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor cursor;</div><div class='add'>+	struct scatterlist *cur_sg;</div><div class='add'>+	int dlen = data_len(msg);</div><div class='add'>+	int sg_cnt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!front_len(msg) &amp;&amp; !middle_len(msg) &amp;&amp; !data_len(msg))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sg_cnt = 1;  /* epilogue + [auth tag] */</div><div class='add'>+	if (front_len(msg))</div><div class='add'>+		sg_cnt += calc_sg_cnt(msg-&gt;front.iov_base,</div><div class='add'>+				      front_len(msg));</div><div class='add'>+	if (middle_len(msg))</div><div class='add'>+		sg_cnt += calc_sg_cnt(msg-&gt;middle-&gt;vec.iov_base,</div><div class='add'>+				      middle_len(msg));</div><div class='add'>+	if (dlen) {</div><div class='add'>+		if (pages) {</div><div class='add'>+			sg_cnt += calc_pages_for(dpos, dlen);</div><div class='add'>+			if (need_padding(dlen))</div><div class='add'>+				sg_cnt++;</div><div class='add'>+		} else {</div><div class='add'>+			ceph_msg_data_cursor_init(&amp;cursor, msg, dlen);</div><div class='add'>+			sg_cnt += calc_sg_cnt_cursor(&amp;cursor);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sg_alloc_table(sgt, sg_cnt, GFP_NOIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cur_sg = sgt-&gt;sgl;</div><div class='add'>+	if (front_len(msg))</div><div class='add'>+		init_sgs(&amp;cur_sg, msg-&gt;front.iov_base, front_len(msg),</div><div class='add'>+			 front_pad);</div><div class='add'>+	if (middle_len(msg))</div><div class='add'>+		init_sgs(&amp;cur_sg, msg-&gt;middle-&gt;vec.iov_base, middle_len(msg),</div><div class='add'>+			 middle_pad);</div><div class='add'>+	if (dlen) {</div><div class='add'>+		if (pages) {</div><div class='add'>+			init_sgs_pages(&amp;cur_sg, pages, dpos, dlen, data_pad);</div><div class='add'>+		} else {</div><div class='add'>+			ceph_msg_data_cursor_init(&amp;cursor, msg, dlen);</div><div class='add'>+			init_sgs_cursor(&amp;cur_sg, &amp;cursor, data_pad);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(!sg_is_last(cur_sg));</div><div class='add'>+	sg_set_buf(cur_sg, epilogue,</div><div class='add'>+		   CEPH_GCM_BLOCK_LEN + (add_tag ? CEPH_GCM_TAG_LEN : 0));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decrypt_preamble(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, con-&gt;v2.in_buf, CEPH_PREAMBLE_SECURE_LEN);</div><div class='add'>+	return gcm_crypt(con, false, &amp;sg, &amp;sg, CEPH_PREAMBLE_SECURE_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decrypt_control_remainder(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len = con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	int rem_len = ctrl_len - CEPH_PREAMBLE_INLINE_LEN;</div><div class='add'>+	int pt_len = padding_len(rem_len) + CEPH_GCM_TAG_LEN;</div><div class='add'>+	struct scatterlist sgs[2];</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.in_kvecs[0].iov_len != rem_len);</div><div class='add'>+	WARN_ON(con-&gt;v2.in_kvecs[1].iov_len != pt_len);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sgs, 2);</div><div class='add'>+	sg_set_buf(&amp;sgs[0], con-&gt;v2.in_kvecs[0].iov_base, rem_len);</div><div class='add'>+	sg_set_buf(&amp;sgs[1], con-&gt;v2.in_buf, pt_len);</div><div class='add'>+</div><div class='add'>+	return gcm_crypt(con, false, sgs, sgs,</div><div class='add'>+			 padded_len(rem_len) + CEPH_GCM_TAG_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process sparse read data that lives in a buffer */</div><div class='add'>+static int process_v2_sparse_read(struct ceph_connection *con,</div><div class='add'>+				  struct page **pages, int spos)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg_data_cursor cursor;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ceph_msg_data_cursor_init(&amp;cursor, con-&gt;in_msg,</div><div class='add'>+				  con-&gt;in_msg-&gt;sparse_read_total);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		char *buf = NULL;</div><div class='add'>+</div><div class='add'>+		ret = con-&gt;ops-&gt;sparse_read(con, &amp;cursor, &amp;buf);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dout("%s: sparse_read return %x buf %p\n", __func__, ret, buf);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			int idx = spos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			int soff = offset_in_page(spos);</div><div class='add'>+			struct page *spage = con-&gt;v2.in_enc_pages[idx];</div><div class='add'>+			int len = min_t(int, ret, PAGE_SIZE - soff);</div><div class='add'>+</div><div class='add'>+			if (buf) {</div><div class='add'>+				memcpy_from_page(buf, spage, soff, len);</div><div class='add'>+				buf += len;</div><div class='add'>+			} else {</div><div class='add'>+				struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+				get_bvec_at(&amp;cursor, &amp;bv);</div><div class='add'>+				len = min_t(int, len, bv.bv_len);</div><div class='add'>+				memcpy_page(bv.bv_page, bv.bv_offset,</div><div class='add'>+					    spage, soff, len);</div><div class='add'>+				ceph_msg_data_advance(&amp;cursor, len);</div><div class='add'>+			}</div><div class='add'>+			spos += len;</div><div class='add'>+			ret -= len;</div><div class='add'>+		} while (ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decrypt_tail(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct sg_table enc_sgt = {};</div><div class='add'>+	struct sg_table sgt = {};</div><div class='add'>+	struct page **pages = NULL;</div><div class='add'>+	bool sparse = !!con-&gt;in_msg-&gt;sparse_read_total;</div><div class='add'>+	int dpos = 0;</div><div class='add'>+	int tail_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tail_len = tail_onwire_len(con-&gt;in_msg, true);</div><div class='add'>+	ret = sg_alloc_table_from_pages(&amp;enc_sgt, con-&gt;v2.in_enc_pages,</div><div class='add'>+					con-&gt;v2.in_enc_page_cnt, 0, tail_len,</div><div class='add'>+					GFP_NOIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sparse) {</div><div class='add'>+		dpos = padded_len(front_len(con-&gt;in_msg) + padded_len(middle_len(con-&gt;in_msg)));</div><div class='add'>+		pages = con-&gt;v2.in_enc_pages;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setup_message_sgs(&amp;sgt, con-&gt;in_msg, FRONT_PAD(con-&gt;v2.in_buf),</div><div class='add'>+				MIDDLE_PAD(con-&gt;v2.in_buf), DATA_PAD(con-&gt;v2.in_buf),</div><div class='add'>+				con-&gt;v2.in_buf, pages, dpos, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p msg %p enc_page_cnt %d sg_cnt %d\n", __func__, con,</div><div class='add'>+	     con-&gt;in_msg, con-&gt;v2.in_enc_page_cnt, sgt.orig_nents);</div><div class='add'>+	ret = gcm_crypt(con, false, enc_sgt.sgl, sgt.sgl, tail_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sparse &amp;&amp; data_len(con-&gt;in_msg)) {</div><div class='add'>+		ret = process_v2_sparse_read(con, con-&gt;v2.in_enc_pages, dpos);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+	ceph_release_page_vector(con-&gt;v2.in_enc_pages,</div><div class='add'>+				 con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+	con-&gt;v2.in_enc_pages = NULL;</div><div class='add'>+	con-&gt;v2.in_enc_page_cnt = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	sg_free_table(&amp;sgt);</div><div class='add'>+	sg_free_table(&amp;enc_sgt);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_banner(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int buf_len = CEPH_BANNER_V2_LEN + 2 + 8 + 8;</div><div class='add'>+	void *buf, *p;</div><div class='add'>+</div><div class='add'>+	buf = alloc_conn_buf(con, buf_len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p = buf;</div><div class='add'>+	ceph_encode_copy(&amp;p, CEPH_BANNER_V2, CEPH_BANNER_V2_LEN);</div><div class='add'>+	ceph_encode_16(&amp;p, sizeof(u64) + sizeof(u64));</div><div class='add'>+	ceph_encode_64(&amp;p, CEPH_MSGR2_SUPPORTED_FEATURES);</div><div class='add'>+	ceph_encode_64(&amp;p, CEPH_MSGR2_REQUIRED_FEATURES);</div><div class='add'>+	WARN_ON(p != buf + buf_len);</div><div class='add'>+</div><div class='add'>+	add_out_kvec(con, buf, buf_len);</div><div class='add'>+	add_out_sign_kvec(con, buf, buf_len);</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * base:</div><div class='add'>+ *   preamble</div><div class='add'>+ *   control body (ctrl_len bytes)</div><div class='add'>+ *   space for control crc</div><div class='add'>+ *</div><div class='add'>+ * extdata (optional):</div><div class='add'>+ *   control body (extdata_len bytes)</div><div class='add'>+ *</div><div class='add'>+ * Compute control crc and gather base and extdata into:</div><div class='add'>+ *</div><div class='add'>+ *   preamble</div><div class='add'>+ *   control body (ctrl_len + extdata_len bytes)</div><div class='add'>+ *   control crc</div><div class='add'>+ *</div><div class='add'>+ * Preamble should already be encoded at the start of base.</div><div class='add'>+ */</div><div class='add'>+static void prepare_head_plain(struct ceph_connection *con, void *base,</div><div class='add'>+			       int ctrl_len, void *extdata, int extdata_len,</div><div class='add'>+			       bool to_be_signed)</div><div class='add'>+{</div><div class='add'>+	int base_len = CEPH_PREAMBLE_LEN + ctrl_len + CEPH_CRC_LEN;</div><div class='add'>+	void *crcp = base + base_len - CEPH_CRC_LEN;</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	crc = crc32c(-1, CTRL_BODY(base), ctrl_len);</div><div class='add'>+	if (extdata_len)</div><div class='add'>+		crc = crc32c(crc, extdata, extdata_len);</div><div class='add'>+	put_unaligned_le32(crc, crcp);</div><div class='add'>+</div><div class='add'>+	if (!extdata_len) {</div><div class='add'>+		add_out_kvec(con, base, base_len);</div><div class='add'>+		if (to_be_signed)</div><div class='add'>+			add_out_sign_kvec(con, base, base_len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_out_kvec(con, base, crcp - base);</div><div class='add'>+	add_out_kvec(con, extdata, extdata_len);</div><div class='add'>+	add_out_kvec(con, crcp, CEPH_CRC_LEN);</div><div class='add'>+	if (to_be_signed) {</div><div class='add'>+		add_out_sign_kvec(con, base, crcp - base);</div><div class='add'>+		add_out_sign_kvec(con, extdata, extdata_len);</div><div class='add'>+		add_out_sign_kvec(con, crcp, CEPH_CRC_LEN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_head_secure_small(struct ceph_connection *con,</div><div class='add'>+				     void *base, int ctrl_len)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* inline buffer padding? */</div><div class='add'>+	if (ctrl_len &lt; CEPH_PREAMBLE_INLINE_LEN)</div><div class='add'>+		memset(CTRL_BODY(base) + ctrl_len, 0,</div><div class='add'>+		       CEPH_PREAMBLE_INLINE_LEN - ctrl_len);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, base, CEPH_PREAMBLE_SECURE_LEN);</div><div class='add'>+	ret = gcm_crypt(con, true, &amp;sg, &amp;sg,</div><div class='add'>+			CEPH_PREAMBLE_SECURE_LEN - CEPH_GCM_TAG_LEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	add_out_kvec(con, base, CEPH_PREAMBLE_SECURE_LEN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * base:</div><div class='add'>+ *   preamble</div><div class='add'>+ *   control body (ctrl_len bytes)</div><div class='add'>+ *   space for padding, if needed</div><div class='add'>+ *   space for control remainder auth tag</div><div class='add'>+ *   space for preamble auth tag</div><div class='add'>+ *</div><div class='add'>+ * Encrypt preamble and the inline portion, then encrypt the remainder</div><div class='add'>+ * and gather into:</div><div class='add'>+ *</div><div class='add'>+ *   preamble</div><div class='add'>+ *   control body (48 bytes)</div><div class='add'>+ *   preamble auth tag</div><div class='add'>+ *   control body (ctrl_len - 48 bytes)</div><div class='add'>+ *   zero padding, if needed</div><div class='add'>+ *   control remainder auth tag</div><div class='add'>+ *</div><div class='add'>+ * Preamble should already be encoded at the start of base.</div><div class='add'>+ */</div><div class='add'>+static int prepare_head_secure_big(struct ceph_connection *con,</div><div class='add'>+				   void *base, int ctrl_len)</div><div class='add'>+{</div><div class='add'>+	int rem_len = ctrl_len - CEPH_PREAMBLE_INLINE_LEN;</div><div class='add'>+	void *rem = CTRL_BODY(base) + CEPH_PREAMBLE_INLINE_LEN;</div><div class='add'>+	void *rem_tag = rem + padded_len(rem_len);</div><div class='add'>+	void *pmbl_tag = rem_tag + CEPH_GCM_TAG_LEN;</div><div class='add'>+	struct scatterlist sgs[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sg_init_table(sgs, 2);</div><div class='add'>+	sg_set_buf(&amp;sgs[0], base, rem - base);</div><div class='add'>+	sg_set_buf(&amp;sgs[1], pmbl_tag, CEPH_GCM_TAG_LEN);</div><div class='add'>+	ret = gcm_crypt(con, true, sgs, sgs, rem - base);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* control remainder padding? */</div><div class='add'>+	if (need_padding(rem_len))</div><div class='add'>+		memset(rem + rem_len, 0, padding_len(rem_len));</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sgs[0], rem, pmbl_tag - rem);</div><div class='add'>+	ret = gcm_crypt(con, true, sgs, sgs, rem_tag - rem);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	add_out_kvec(con, base, rem - base);</div><div class='add'>+	add_out_kvec(con, pmbl_tag, CEPH_GCM_TAG_LEN);</div><div class='add'>+	add_out_kvec(con, rem, pmbl_tag - rem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __prepare_control(struct ceph_connection *con, int tag,</div><div class='add'>+			     void *base, int ctrl_len, void *extdata,</div><div class='add'>+			     int extdata_len, bool to_be_signed)</div><div class='add'>+{</div><div class='add'>+	int total_len = ctrl_len + extdata_len;</div><div class='add'>+	struct ceph_frame_desc desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p tag %d len %d (%d+%d)\n", __func__, con, tag,</div><div class='add'>+	     total_len, ctrl_len, extdata_len);</div><div class='add'>+</div><div class='add'>+	/* extdata may be vmalloc'ed but not base */</div><div class='add'>+	if (WARN_ON(is_vmalloc_addr(base) || !ctrl_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	init_frame_desc(&amp;desc, tag, &amp;total_len, 1);</div><div class='add'>+	encode_preamble(&amp;desc, base);</div><div class='add'>+</div><div class='add'>+	if (con_secure(con)) {</div><div class='add'>+		if (WARN_ON(extdata_len || to_be_signed))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ctrl_len &lt;= CEPH_PREAMBLE_INLINE_LEN)</div><div class='add'>+			/* fully inlined, inline buffer may need padding */</div><div class='add'>+			ret = prepare_head_secure_small(con, base, ctrl_len);</div><div class='add'>+		else</div><div class='add'>+			/* partially inlined, inline buffer is full */</div><div class='add'>+			ret = prepare_head_secure_big(con, base, ctrl_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		prepare_head_plain(con, base, ctrl_len, extdata, extdata_len,</div><div class='add'>+				   to_be_signed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_control(struct ceph_connection *con, int tag,</div><div class='add'>+			   void *base, int ctrl_len)</div><div class='add'>+{</div><div class='add'>+	return __prepare_control(con, tag, base, ctrl_len, NULL, 0, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_hello(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *buf, *p;</div><div class='add'>+	int ctrl_len;</div><div class='add'>+</div><div class='add'>+	ctrl_len = 1 + ceph_entity_addr_encoding_len(&amp;con-&gt;peer_addr);</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(ctrl_len, false));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p = CTRL_BODY(buf);</div><div class='add'>+	ceph_encode_8(&amp;p, CEPH_ENTITY_TYPE_CLIENT);</div><div class='add'>+	ceph_encode_entity_addr(&amp;p, &amp;con-&gt;peer_addr);</div><div class='add'>+	WARN_ON(p != CTRL_BODY(buf) + ctrl_len);</div><div class='add'>+</div><div class='add'>+	return __prepare_control(con, FRAME_TAG_HELLO, buf, ctrl_len,</div><div class='add'>+				 NULL, 0, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* so that head_onwire_len(AUTH_BUF_LEN, false) is 512 */</div><div class='add'>+#define AUTH_BUF_LEN	(512 - CEPH_CRC_LEN - CEPH_PREAMBLE_PLAIN_LEN)</div><div class='add'>+</div><div class='add'>+static int prepare_auth_request(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *authorizer, *authorizer_copy;</div><div class='add'>+	int ctrl_len, authorizer_len;</div><div class='add'>+	void *buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ctrl_len = AUTH_BUF_LEN;</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(ctrl_len, false));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+	ret = con-&gt;ops-&gt;get_auth_request(con, CTRL_BODY(buf), &amp;ctrl_len,</div><div class='add'>+					 &amp;authorizer, &amp;authorizer_len);</div><div class='add'>+	mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_HELLO) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p get_auth_request ret %d\n", __func__, con, ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	authorizer_copy = alloc_conn_buf(con, authorizer_len);</div><div class='add'>+	if (!authorizer_copy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(authorizer_copy, authorizer, authorizer_len);</div><div class='add'>+</div><div class='add'>+	return __prepare_control(con, FRAME_TAG_AUTH_REQUEST, buf, ctrl_len,</div><div class='add'>+				 authorizer_copy, authorizer_len, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_auth_request_more(struct ceph_connection *con,</div><div class='add'>+				     void *reply, int reply_len)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len, authorizer_len;</div><div class='add'>+	void *authorizer;</div><div class='add'>+	void *buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ctrl_len = AUTH_BUF_LEN;</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(ctrl_len, false));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+	ret = con-&gt;ops-&gt;handle_auth_reply_more(con, reply, reply_len,</div><div class='add'>+					       CTRL_BODY(buf), &amp;ctrl_len,</div><div class='add'>+					       &amp;authorizer, &amp;authorizer_len);</div><div class='add'>+	mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p handle_auth_reply_more ret %d\n", __func__, con, ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return __prepare_control(con, FRAME_TAG_AUTH_REQUEST_MORE, buf,</div><div class='add'>+				 ctrl_len, authorizer, authorizer_len, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_auth_signature(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(SHA256_DIGEST_SIZE,</div><div class='add'>+						  con_secure(con)));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ceph_hmac_sha256(con, con-&gt;v2.in_sign_kvecs, con-&gt;v2.in_sign_kvec_cnt,</div><div class='add'>+			 CTRL_BODY(buf));</div><div class='add'>+</div><div class='add'>+	return prepare_control(con, FRAME_TAG_AUTH_SIGNATURE, buf,</div><div class='add'>+			       SHA256_DIGEST_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_client_ident(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_entity_addr *my_addr = &amp;con-&gt;msgr-&gt;inst.addr;</div><div class='add'>+	struct ceph_client *client = from_msgr(con-&gt;msgr);</div><div class='add'>+	u64 global_id = ceph_client_gid(client);</div><div class='add'>+	void *buf, *p;</div><div class='add'>+	int ctrl_len;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.server_cookie);</div><div class='add'>+	WARN_ON(con-&gt;v2.connect_seq);</div><div class='add'>+	WARN_ON(con-&gt;v2.peer_global_seq);</div><div class='add'>+</div><div class='add'>+	if (!con-&gt;v2.client_cookie) {</div><div class='add'>+		do {</div><div class='add'>+			get_random_bytes(&amp;con-&gt;v2.client_cookie,</div><div class='add'>+					 sizeof(con-&gt;v2.client_cookie));</div><div class='add'>+		} while (!con-&gt;v2.client_cookie);</div><div class='add'>+		dout("%s con %p generated cookie 0x%llx\n", __func__, con,</div><div class='add'>+		     con-&gt;v2.client_cookie);</div><div class='add'>+	} else {</div><div class='add'>+		dout("%s con %p cookie already set 0x%llx\n", __func__, con,</div><div class='add'>+		     con-&gt;v2.client_cookie);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p my_addr %s/%u peer_addr %s/%u global_id %llu global_seq %llu features 0x%llx required_features 0x%llx cookie 0x%llx\n",</div><div class='add'>+	     __func__, con, ceph_pr_addr(my_addr), le32_to_cpu(my_addr-&gt;nonce),</div><div class='add'>+	     ceph_pr_addr(&amp;con-&gt;peer_addr), le32_to_cpu(con-&gt;peer_addr.nonce),</div><div class='add'>+	     global_id, con-&gt;v2.global_seq, client-&gt;supported_features,</div><div class='add'>+	     client-&gt;required_features, con-&gt;v2.client_cookie);</div><div class='add'>+</div><div class='add'>+	ctrl_len = 1 + 4 + ceph_entity_addr_encoding_len(my_addr) +</div><div class='add'>+		   ceph_entity_addr_encoding_len(&amp;con-&gt;peer_addr) + 6 * 8;</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(ctrl_len, con_secure(con)));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p = CTRL_BODY(buf);</div><div class='add'>+	ceph_encode_8(&amp;p, 2);  /* addrvec marker */</div><div class='add'>+	ceph_encode_32(&amp;p, 1);  /* addr_cnt */</div><div class='add'>+	ceph_encode_entity_addr(&amp;p, my_addr);</div><div class='add'>+	ceph_encode_entity_addr(&amp;p, &amp;con-&gt;peer_addr);</div><div class='add'>+	ceph_encode_64(&amp;p, global_id);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.global_seq);</div><div class='add'>+	ceph_encode_64(&amp;p, client-&gt;supported_features);</div><div class='add'>+	ceph_encode_64(&amp;p, client-&gt;required_features);</div><div class='add'>+	ceph_encode_64(&amp;p, 0);  /* flags */</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.client_cookie);</div><div class='add'>+	WARN_ON(p != CTRL_BODY(buf) + ctrl_len);</div><div class='add'>+</div><div class='add'>+	return prepare_control(con, FRAME_TAG_CLIENT_IDENT, buf, ctrl_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_session_reconnect(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_entity_addr *my_addr = &amp;con-&gt;msgr-&gt;inst.addr;</div><div class='add'>+	void *buf, *p;</div><div class='add'>+	int ctrl_len;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con-&gt;v2.client_cookie);</div><div class='add'>+	WARN_ON(!con-&gt;v2.server_cookie);</div><div class='add'>+	WARN_ON(!con-&gt;v2.connect_seq);</div><div class='add'>+	WARN_ON(!con-&gt;v2.peer_global_seq);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p my_addr %s/%u client_cookie 0x%llx server_cookie 0x%llx global_seq %llu connect_seq %llu in_seq %llu\n",</div><div class='add'>+	     __func__, con, ceph_pr_addr(my_addr), le32_to_cpu(my_addr-&gt;nonce),</div><div class='add'>+	     con-&gt;v2.client_cookie, con-&gt;v2.server_cookie, con-&gt;v2.global_seq,</div><div class='add'>+	     con-&gt;v2.connect_seq, con-&gt;in_seq);</div><div class='add'>+</div><div class='add'>+	ctrl_len = 1 + 4 + ceph_entity_addr_encoding_len(my_addr) + 5 * 8;</div><div class='add'>+	buf = alloc_conn_buf(con, head_onwire_len(ctrl_len, con_secure(con)));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p = CTRL_BODY(buf);</div><div class='add'>+	ceph_encode_8(&amp;p, 2);  /* entity_addrvec_t marker */</div><div class='add'>+	ceph_encode_32(&amp;p, 1);  /* my_addrs len */</div><div class='add'>+	ceph_encode_entity_addr(&amp;p, my_addr);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.client_cookie);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.server_cookie);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.global_seq);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;v2.connect_seq);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;in_seq);</div><div class='add'>+	WARN_ON(p != CTRL_BODY(buf) + ctrl_len);</div><div class='add'>+</div><div class='add'>+	return prepare_control(con, FRAME_TAG_SESSION_RECONNECT, buf, ctrl_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_keepalive2(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_timespec *ts = CTRL_BODY(con-&gt;v2.out_buf);</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+</div><div class='add'>+	ktime_get_real_ts64(&amp;now);</div><div class='add'>+	dout("%s con %p timestamp %ptSp\n", __func__, con, &amp;now);</div><div class='add'>+</div><div class='add'>+	ceph_encode_timespec64(ts, &amp;now);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	return prepare_control(con, FRAME_TAG_KEEPALIVE2, con-&gt;v2.out_buf,</div><div class='add'>+			       sizeof(struct ceph_timespec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_ack(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p in_seq_acked %llu -&gt; %llu\n", __func__, con,</div><div class='add'>+	     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='add'>+	con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='add'>+</div><div class='add'>+	p = CTRL_BODY(con-&gt;v2.out_buf);</div><div class='add'>+	ceph_encode_64(&amp;p, con-&gt;in_seq_acked);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	return prepare_control(con, FRAME_TAG_ACK, con-&gt;v2.out_buf, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_epilogue_plain(struct ceph_connection *con,</div><div class='add'>+				   struct ceph_msg *msg, bool aborted)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p msg %p aborted %d crcs %u %u %u\n", __func__, con,</div><div class='add'>+	     msg, aborted, con-&gt;v2.out_epil.front_crc,</div><div class='add'>+	     con-&gt;v2.out_epil.middle_crc, con-&gt;v2.out_epil.data_crc);</div><div class='add'>+</div><div class='add'>+	encode_epilogue_plain(con, aborted);</div><div class='add'>+	add_out_kvec(con, &amp;con-&gt;v2.out_epil, CEPH_EPILOGUE_PLAIN_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For "used" empty segments, crc is -1.  For unused (trailing)</div><div class='add'>+ * segments, crc is 0.</div><div class='add'>+ */</div><div class='add'>+static void prepare_message_plain(struct ceph_connection *con,</div><div class='add'>+				  struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	prepare_head_plain(con, con-&gt;v2.out_buf,</div><div class='add'>+			   sizeof(struct ceph_msg_header2), NULL, 0, false);</div><div class='add'>+</div><div class='add'>+	if (!front_len(msg) &amp;&amp; !middle_len(msg)) {</div><div class='add'>+		if (!data_len(msg)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Empty message: once the head is written,</div><div class='add'>+			 * we are done -- there is no epilogue.</div><div class='add'>+			 */</div><div class='add'>+			con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		con-&gt;v2.out_epil.front_crc = -1;</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc = -1;</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_QUEUE_DATA;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (front_len(msg)) {</div><div class='add'>+		con-&gt;v2.out_epil.front_crc = crc32c(-1, msg-&gt;front.iov_base,</div><div class='add'>+						    front_len(msg));</div><div class='add'>+		add_out_kvec(con, msg-&gt;front.iov_base, front_len(msg));</div><div class='add'>+	} else {</div><div class='add'>+		/* middle (at least) is there, checked above */</div><div class='add'>+		con-&gt;v2.out_epil.front_crc = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (middle_len(msg)) {</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc =</div><div class='add'>+			crc32c(-1, msg-&gt;middle-&gt;vec.iov_base, middle_len(msg));</div><div class='add'>+		add_out_kvec(con, msg-&gt;middle-&gt;vec.iov_base, middle_len(msg));</div><div class='add'>+	} else {</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc = data_len(msg) ? -1 : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_len(msg)) {</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_QUEUE_DATA;</div><div class='add'>+	} else {</div><div class='add'>+		con-&gt;v2.out_epil.data_crc = 0;</div><div class='add'>+		prepare_epilogue_plain(con, msg, false);</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unfortunately the kernel crypto API doesn't support streaming</div><div class='add'>+ * (piecewise) operation for AEAD algorithms, so we can't get away</div><div class='add'>+ * with a fixed size buffer and a couple sgs.  Instead, we have to</div><div class='add'>+ * allocate pages for the entire tail of the message (currently up</div><div class='add'>+ * to ~32M) and two sgs arrays (up to ~256K each)...</div><div class='add'>+ */</div><div class='add'>+static int prepare_message_secure(struct ceph_connection *con,</div><div class='add'>+				  struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	void *zerop = page_address(ceph_zero_page);</div><div class='add'>+	struct sg_table enc_sgt = {};</div><div class='add'>+	struct sg_table sgt = {};</div><div class='add'>+	struct page **enc_pages;</div><div class='add'>+	int enc_page_cnt;</div><div class='add'>+	int tail_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = prepare_head_secure_small(con, con-&gt;v2.out_buf,</div><div class='add'>+					sizeof(struct ceph_msg_header2));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tail_len = tail_onwire_len(msg, true);</div><div class='add'>+	if (!tail_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * Empty message: once the head is written,</div><div class='add'>+		 * we are done -- there is no epilogue.</div><div class='add'>+		 */</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	encode_epilogue_secure(con, false);</div><div class='add'>+	ret = setup_message_sgs(&amp;sgt, msg, zerop, zerop, zerop,</div><div class='add'>+				&amp;con-&gt;v2.out_epil, NULL, 0, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	enc_page_cnt = calc_pages_for(0, tail_len);</div><div class='add'>+	enc_pages = ceph_alloc_page_vector(enc_page_cnt, GFP_NOIO);</div><div class='add'>+	if (IS_ERR(enc_pages)) {</div><div class='add'>+		ret = PTR_ERR(enc_pages);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.out_enc_pages || con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+	con-&gt;v2.out_enc_pages = enc_pages;</div><div class='add'>+	con-&gt;v2.out_enc_page_cnt = enc_page_cnt;</div><div class='add'>+	con-&gt;v2.out_enc_resid = tail_len;</div><div class='add'>+	con-&gt;v2.out_enc_i = 0;</div><div class='add'>+</div><div class='add'>+	ret = sg_alloc_table_from_pages(&amp;enc_sgt, enc_pages, enc_page_cnt,</div><div class='add'>+					0, tail_len, GFP_NOIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = gcm_crypt(con, true, sgt.sgl, enc_sgt.sgl,</div><div class='add'>+			tail_len - CEPH_GCM_TAG_LEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p msg %p sg_cnt %d enc_page_cnt %d\n", __func__, con,</div><div class='add'>+	     msg, sgt.orig_nents, enc_page_cnt);</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_QUEUE_ENC_PAGE;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	sg_free_table(&amp;sgt);</div><div class='add'>+	sg_free_table(&amp;enc_sgt);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_message(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int lens[] = {</div><div class='add'>+		sizeof(struct ceph_msg_header2),</div><div class='add'>+		front_len(msg),</div><div class='add'>+		middle_len(msg),</div><div class='add'>+		data_len(msg)</div><div class='add'>+	};</div><div class='add'>+	struct ceph_frame_desc desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p msg %p logical %d+%d+%d+%d\n", __func__, con,</div><div class='add'>+	     msg, lens[0], lens[1], lens[2], lens[3]);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='add'>+		dout("%s con %p in_seq_acked %llu -&gt; %llu\n", __func__, con,</div><div class='add'>+		     con-&gt;in_seq_acked, con-&gt;in_seq);</div><div class='add'>+		con-&gt;in_seq_acked = con-&gt;in_seq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	init_frame_desc(&amp;desc, FRAME_TAG_MESSAGE, lens, 4);</div><div class='add'>+	encode_preamble(&amp;desc, con-&gt;v2.out_buf);</div><div class='add'>+	fill_header2(CTRL_BODY(con-&gt;v2.out_buf), &amp;msg-&gt;hdr,</div><div class='add'>+		     con-&gt;in_seq_acked);</div><div class='add'>+</div><div class='add'>+	if (con_secure(con)) {</div><div class='add'>+		ret = prepare_message_secure(con, msg);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		prepare_message_plain(con, msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_con_flag_set(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_banner_prefix(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	buf = alloc_conn_buf(con, CEPH_BANNER_V2_PREFIX_LEN);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	add_in_kvec(con, buf, CEPH_BANNER_V2_PREFIX_LEN);</div><div class='add'>+	add_in_sign_kvec(con, buf, CEPH_BANNER_V2_PREFIX_LEN);</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_BANNER_PREFIX;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_banner_payload(struct ceph_connection *con,</div><div class='add'>+				       int payload_len)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	buf = alloc_conn_buf(con, payload_len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	add_in_kvec(con, buf, payload_len);</div><div class='add'>+	add_in_sign_kvec(con, buf, payload_len);</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_BANNER_PAYLOAD;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_preamble(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	add_in_kvec(con, con-&gt;v2.in_buf,</div><div class='add'>+		    con_secure(con) ? CEPH_PREAMBLE_SECURE_LEN :</div><div class='add'>+				      CEPH_PREAMBLE_PLAIN_LEN);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_HANDLE_PREAMBLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_control(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len = con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	int head_len;</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_V2_HELLO ||</div><div class='add'>+	    con-&gt;state == CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		head_len = head_onwire_len(ctrl_len, false);</div><div class='add'>+		buf = alloc_conn_buf(con, head_len);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		/* preserve preamble */</div><div class='add'>+		memcpy(buf, con-&gt;v2.in_buf, CEPH_PREAMBLE_LEN);</div><div class='add'>+</div><div class='add'>+		add_in_kvec(con, CTRL_BODY(buf), ctrl_len);</div><div class='add'>+		add_in_kvec(con, CTRL_BODY(buf) + ctrl_len, CEPH_CRC_LEN);</div><div class='add'>+		add_in_sign_kvec(con, buf, head_len);</div><div class='add'>+	} else {</div><div class='add'>+		if (ctrl_len &gt; CEPH_PREAMBLE_INLINE_LEN) {</div><div class='add'>+			buf = alloc_conn_buf(con, ctrl_len);</div><div class='add'>+			if (!buf)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			add_in_kvec(con, buf, ctrl_len);</div><div class='add'>+		} else {</div><div class='add'>+			add_in_kvec(con, CTRL_BODY(con-&gt;v2.in_buf), ctrl_len);</div><div class='add'>+		}</div><div class='add'>+		add_in_kvec(con, con-&gt;v2.in_buf, CEPH_CRC_LEN);</div><div class='add'>+	}</div><div class='add'>+	con-&gt;v2.in_state = IN_S_HANDLE_CONTROL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_control_remainder(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len = con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	int rem_len = ctrl_len - CEPH_PREAMBLE_INLINE_LEN;</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	buf = alloc_conn_buf(con, ctrl_len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, CTRL_BODY(con-&gt;v2.in_buf), CEPH_PREAMBLE_INLINE_LEN);</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	add_in_kvec(con, buf + CEPH_PREAMBLE_INLINE_LEN, rem_len);</div><div class='add'>+	add_in_kvec(con, con-&gt;v2.in_buf,</div><div class='add'>+		    padding_len(rem_len) + CEPH_GCM_TAG_LEN);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_HANDLE_CONTROL_REMAINDER;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	con-&gt;in_data_crc = -1;</div><div class='add'>+	ceph_msg_data_cursor_init(&amp;con-&gt;v2.in_cursor, con-&gt;in_msg,</div><div class='add'>+				  data_len(con-&gt;in_msg));</div><div class='add'>+</div><div class='add'>+	get_bvec_at(&amp;con-&gt;v2.in_cursor, &amp;bv);</div><div class='add'>+	if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+		if (unlikely(!con-&gt;bounce_page)) {</div><div class='add'>+			con-&gt;bounce_page = alloc_page(GFP_NOIO);</div><div class='add'>+			if (!con-&gt;bounce_page) {</div><div class='add'>+				pr_err("failed to allocate bounce page\n");</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bv.bv_page = con-&gt;bounce_page;</div><div class='add'>+		bv.bv_offset = 0;</div><div class='add'>+	}</div><div class='add'>+	set_in_bvec(con, &amp;bv);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_PREPARE_READ_DATA_CONT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_data_cont(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+		con-&gt;in_data_crc = crc32c(con-&gt;in_data_crc,</div><div class='add'>+					  page_address(con-&gt;bounce_page),</div><div class='add'>+					  con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+</div><div class='add'>+		get_bvec_at(&amp;con-&gt;v2.in_cursor, &amp;bv);</div><div class='add'>+		memcpy_to_page(bv.bv_page, bv.bv_offset,</div><div class='add'>+			       page_address(con-&gt;bounce_page),</div><div class='add'>+			       con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+	} else {</div><div class='add'>+		con-&gt;in_data_crc = ceph_crc32c_page(con-&gt;in_data_crc,</div><div class='add'>+						    con-&gt;v2.in_bvec.bv_page,</div><div class='add'>+						    con-&gt;v2.in_bvec.bv_offset,</div><div class='add'>+						    con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_msg_data_advance(&amp;con-&gt;v2.in_cursor, con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+	if (con-&gt;v2.in_cursor.total_resid) {</div><div class='add'>+		get_bvec_at(&amp;con-&gt;v2.in_cursor, &amp;bv);</div><div class='add'>+		if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+			bv.bv_page = con-&gt;bounce_page;</div><div class='add'>+			bv.bv_offset = 0;</div><div class='add'>+		}</div><div class='add'>+		set_in_bvec(con, &amp;bv);</div><div class='add'>+		WARN_ON(con-&gt;v2.in_state != IN_S_PREPARE_READ_DATA_CONT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We've read all data.  Prepare to read epilogue.</div><div class='add'>+	 */</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	add_in_kvec(con, con-&gt;v2.in_buf, CEPH_EPILOGUE_PLAIN_LEN);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_HANDLE_EPILOGUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_sparse_read_cont(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+	char *buf = NULL;</div><div class='add'>+	struct ceph_msg_data_cursor *cursor = &amp;con-&gt;v2.in_cursor;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.in_state != IN_S_PREPARE_SPARSE_DATA_CONT);</div><div class='add'>+</div><div class='add'>+	if (iov_iter_is_bvec(&amp;con-&gt;v2.in_iter)) {</div><div class='add'>+		if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+			con-&gt;in_data_crc = crc32c(con-&gt;in_data_crc,</div><div class='add'>+						  page_address(con-&gt;bounce_page),</div><div class='add'>+						  con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+			get_bvec_at(cursor, &amp;bv);</div><div class='add'>+			memcpy_to_page(bv.bv_page, bv.bv_offset,</div><div class='add'>+				       page_address(con-&gt;bounce_page),</div><div class='add'>+				       con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+		} else {</div><div class='add'>+			con-&gt;in_data_crc = ceph_crc32c_page(con-&gt;in_data_crc,</div><div class='add'>+							    con-&gt;v2.in_bvec.bv_page,</div><div class='add'>+							    con-&gt;v2.in_bvec.bv_offset,</div><div class='add'>+							    con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ceph_msg_data_advance(cursor, con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+		cursor-&gt;sr_resid -= con-&gt;v2.in_bvec.bv_len;</div><div class='add'>+		dout("%s: advance by 0x%x sr_resid 0x%x\n", __func__,</div><div class='add'>+		     con-&gt;v2.in_bvec.bv_len, cursor-&gt;sr_resid);</div><div class='add'>+		WARN_ON_ONCE(cursor-&gt;sr_resid &gt; cursor-&gt;total_resid);</div><div class='add'>+		if (cursor-&gt;sr_resid) {</div><div class='add'>+			get_bvec_at(cursor, &amp;bv);</div><div class='add'>+			if (bv.bv_len &gt; cursor-&gt;sr_resid)</div><div class='add'>+				bv.bv_len = cursor-&gt;sr_resid;</div><div class='add'>+			if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+				bv.bv_page = con-&gt;bounce_page;</div><div class='add'>+				bv.bv_offset = 0;</div><div class='add'>+			}</div><div class='add'>+			set_in_bvec(con, &amp;bv);</div><div class='add'>+			con-&gt;v2.data_len_remain -= bv.bv_len;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (iov_iter_is_kvec(&amp;con-&gt;v2.in_iter)) {</div><div class='add'>+		/* On first call, we have no kvec so don't compute crc */</div><div class='add'>+		if (con-&gt;v2.in_kvec_cnt) {</div><div class='add'>+			WARN_ON_ONCE(con-&gt;v2.in_kvec_cnt &gt; 1);</div><div class='add'>+			con-&gt;in_data_crc = crc32c(con-&gt;in_data_crc,</div><div class='add'>+						  con-&gt;v2.in_kvecs[0].iov_base,</div><div class='add'>+						  con-&gt;v2.in_kvecs[0].iov_len);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get next extent */</div><div class='add'>+	ret = con-&gt;ops-&gt;sparse_read(con, cursor, &amp;buf);</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		reset_in_kvecs(con);</div><div class='add'>+		add_in_kvec(con, con-&gt;v2.in_buf, CEPH_EPILOGUE_PLAIN_LEN);</div><div class='add'>+		con-&gt;v2.in_state = IN_S_HANDLE_EPILOGUE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buf) {</div><div class='add'>+		/* receive into buffer */</div><div class='add'>+		reset_in_kvecs(con);</div><div class='add'>+		add_in_kvec(con, buf, ret);</div><div class='add'>+		con-&gt;v2.data_len_remain -= ret;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &gt; cursor-&gt;total_resid) {</div><div class='add'>+		pr_warn("%s: ret 0x%x total_resid 0x%zx resid 0x%zx\n",</div><div class='add'>+			__func__, ret, cursor-&gt;total_resid, cursor-&gt;resid);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	get_bvec_at(cursor, &amp;bv);</div><div class='add'>+	if (bv.bv_len &gt; cursor-&gt;sr_resid)</div><div class='add'>+		bv.bv_len = cursor-&gt;sr_resid;</div><div class='add'>+	if (ceph_test_opt(from_msgr(con-&gt;msgr), RXBOUNCE)) {</div><div class='add'>+		if (unlikely(!con-&gt;bounce_page)) {</div><div class='add'>+			con-&gt;bounce_page = alloc_page(GFP_NOIO);</div><div class='add'>+			if (!con-&gt;bounce_page) {</div><div class='add'>+				pr_err("failed to allocate bounce page\n");</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bv.bv_page = con-&gt;bounce_page;</div><div class='add'>+		bv.bv_offset = 0;</div><div class='add'>+	}</div><div class='add'>+	set_in_bvec(con, &amp;bv);</div><div class='add'>+	con-&gt;v2.data_len_remain -= ret;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_sparse_read_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *msg = con-&gt;in_msg;</div><div class='add'>+</div><div class='add'>+	dout("%s: starting sparse read\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!con-&gt;ops-&gt;sparse_read))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!con_secure(con))</div><div class='add'>+		con-&gt;in_data_crc = -1;</div><div class='add'>+</div><div class='add'>+	ceph_msg_data_cursor_init(&amp;con-&gt;v2.in_cursor, msg,</div><div class='add'>+				  msg-&gt;sparse_read_total);</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_PREPARE_SPARSE_DATA_CONT;</div><div class='add'>+	con-&gt;v2.data_len_remain = data_len(msg);</div><div class='add'>+	return prepare_sparse_read_cont(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_tail_plain(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *msg = con-&gt;in_msg;</div><div class='add'>+</div><div class='add'>+	if (!front_len(msg) &amp;&amp; !middle_len(msg)) {</div><div class='add'>+		WARN_ON(!data_len(msg));</div><div class='add'>+		return prepare_read_data(con);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reset_in_kvecs(con);</div><div class='add'>+	if (front_len(msg)) {</div><div class='add'>+		add_in_kvec(con, msg-&gt;front.iov_base, front_len(msg));</div><div class='add'>+		WARN_ON(msg-&gt;front.iov_len != front_len(msg));</div><div class='add'>+	}</div><div class='add'>+	if (middle_len(msg)) {</div><div class='add'>+		add_in_kvec(con, msg-&gt;middle-&gt;vec.iov_base, middle_len(msg));</div><div class='add'>+		WARN_ON(msg-&gt;middle-&gt;vec.iov_len != middle_len(msg));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_len(msg)) {</div><div class='add'>+		if (msg-&gt;sparse_read_total)</div><div class='add'>+			con-&gt;v2.in_state = IN_S_PREPARE_SPARSE_DATA;</div><div class='add'>+		else</div><div class='add'>+			con-&gt;v2.in_state = IN_S_PREPARE_READ_DATA;</div><div class='add'>+	} else {</div><div class='add'>+		add_in_kvec(con, con-&gt;v2.in_buf, CEPH_EPILOGUE_PLAIN_LEN);</div><div class='add'>+		con-&gt;v2.in_state = IN_S_HANDLE_EPILOGUE;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_enc_page(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p i %d resid %d\n", __func__, con, con-&gt;v2.in_enc_i,</div><div class='add'>+	     con-&gt;v2.in_enc_resid);</div><div class='add'>+	WARN_ON(!con-&gt;v2.in_enc_resid);</div><div class='add'>+</div><div class='add'>+	bvec_set_page(&amp;bv, con-&gt;v2.in_enc_pages[con-&gt;v2.in_enc_i],</div><div class='add'>+		      min(con-&gt;v2.in_enc_resid, (int)PAGE_SIZE), 0);</div><div class='add'>+</div><div class='add'>+	set_in_bvec(con, &amp;bv);</div><div class='add'>+	con-&gt;v2.in_enc_i++;</div><div class='add'>+	con-&gt;v2.in_enc_resid -= bv.bv_len;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.in_enc_resid) {</div><div class='add'>+		con-&gt;v2.in_state = IN_S_PREPARE_READ_ENC_PAGE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are set to read the last piece of ciphertext (ending</div><div class='add'>+	 * with epilogue) + auth tag.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(con-&gt;v2.in_enc_i != con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_HANDLE_EPILOGUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prepare_read_tail_secure(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct page **enc_pages;</div><div class='add'>+	int enc_page_cnt;</div><div class='add'>+	int tail_len;</div><div class='add'>+</div><div class='add'>+	tail_len = tail_onwire_len(con-&gt;in_msg, true);</div><div class='add'>+	WARN_ON(!tail_len);</div><div class='add'>+</div><div class='add'>+	enc_page_cnt = calc_pages_for(0, tail_len);</div><div class='add'>+	enc_pages = ceph_alloc_page_vector(enc_page_cnt, GFP_NOIO);</div><div class='add'>+	if (IS_ERR(enc_pages))</div><div class='add'>+		return PTR_ERR(enc_pages);</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.in_enc_pages || con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+	con-&gt;v2.in_enc_pages = enc_pages;</div><div class='add'>+	con-&gt;v2.in_enc_page_cnt = enc_page_cnt;</div><div class='add'>+	con-&gt;v2.in_enc_resid = tail_len;</div><div class='add'>+	con-&gt;v2.in_enc_i = 0;</div><div class='add'>+</div><div class='add'>+	prepare_read_enc_page(con);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __finish_skip(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;in_seq++;</div><div class='add'>+	prepare_read_preamble(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_skip_message(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_frame_desc *desc = &amp;con-&gt;v2.in_desc;</div><div class='add'>+	int tail_len;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p %d+%d+%d\n", __func__, con, desc-&gt;fd_lens[1],</div><div class='add'>+	     desc-&gt;fd_lens[2], desc-&gt;fd_lens[3]);</div><div class='add'>+</div><div class='add'>+	tail_len = __tail_onwire_len(desc-&gt;fd_lens[1], desc-&gt;fd_lens[2],</div><div class='add'>+				     desc-&gt;fd_lens[3], con_secure(con));</div><div class='add'>+	if (!tail_len) {</div><div class='add'>+		__finish_skip(con);</div><div class='add'>+	} else {</div><div class='add'>+		set_in_skip(con, tail_len);</div><div class='add'>+		con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_banner_prefix(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int payload_len;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.in_kvecs[0].iov_len != CEPH_BANNER_V2_PREFIX_LEN);</div><div class='add'>+</div><div class='add'>+	p = con-&gt;v2.in_kvecs[0].iov_base;</div><div class='add'>+	if (memcmp(p, CEPH_BANNER_V2, CEPH_BANNER_V2_LEN)) {</div><div class='add'>+		if (!memcmp(p, CEPH_BANNER, CEPH_BANNER_LEN))</div><div class='add'>+			con-&gt;error_msg = "server is speaking msgr1 protocol";</div><div class='add'>+		else</div><div class='add'>+			con-&gt;error_msg = "protocol error, bad banner";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p += CEPH_BANNER_V2_LEN;</div><div class='add'>+	payload_len = ceph_decode_16(&amp;p);</div><div class='add'>+	dout("%s con %p payload_len %d\n", __func__, con, payload_len);</div><div class='add'>+</div><div class='add'>+	return prepare_read_banner_payload(con, payload_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_banner_payload(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	void *end = con-&gt;v2.in_kvecs[0].iov_base + con-&gt;v2.in_kvecs[0].iov_len;</div><div class='add'>+	u64 feat = CEPH_MSGR2_SUPPORTED_FEATURES;</div><div class='add'>+	u64 req_feat = CEPH_MSGR2_REQUIRED_FEATURES;</div><div class='add'>+	u64 server_feat, server_req_feat;</div><div class='add'>+	void *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	p = con-&gt;v2.in_kvecs[0].iov_base;</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, server_feat, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, server_req_feat, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p server_feat 0x%llx server_req_feat 0x%llx\n",</div><div class='add'>+	     __func__, con, server_feat, server_req_feat);</div><div class='add'>+</div><div class='add'>+	if (req_feat &amp; ~server_feat) {</div><div class='add'>+		pr_err("msgr2 feature set mismatch: my required &gt; server's supported 0x%llx, need 0x%llx\n",</div><div class='add'>+		       server_feat, req_feat &amp; ~server_feat);</div><div class='add'>+		con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (server_req_feat &amp; ~feat) {</div><div class='add'>+		pr_err("msgr2 feature set mismatch: server's required &gt; my supported 0x%llx, missing 0x%llx\n",</div><div class='add'>+		       feat, server_req_feat &amp; ~feat);</div><div class='add'>+		con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no reset_out_kvecs() as our banner may still be pending */</div><div class='add'>+	ret = prepare_hello(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("prepare_hello failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_HELLO;</div><div class='add'>+	prepare_read_preamble(con);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode banner payload\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_hello(struct ceph_connection *con, void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	struct ceph_entity_addr *my_addr = &amp;con-&gt;msgr-&gt;inst.addr;</div><div class='add'>+	struct ceph_entity_addr addr_for_me;</div><div class='add'>+	u8 entity_type;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_HELLO) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected hello";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_8_safe(&amp;p, end, entity_type, bad);</div><div class='add'>+	ret = ceph_decode_entity_addr(&amp;p, end, &amp;addr_for_me);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to decode addr_for_me: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p entity_type %d addr_for_me %s\n", __func__, con,</div><div class='add'>+	     entity_type, ceph_pr_addr(&amp;addr_for_me));</div><div class='add'>+</div><div class='add'>+	if (entity_type != con-&gt;peer_name.type) {</div><div class='add'>+		pr_err("bad peer type, want %d, got %d\n",</div><div class='add'>+		       con-&gt;peer_name.type, entity_type);</div><div class='add'>+		con-&gt;error_msg = "wrong peer at address";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set our address to the address our first peer (i.e. monitor)</div><div class='add'>+	 * sees that we are connecting from.  If we are behind some sort</div><div class='add'>+	 * of NAT and want to be identified by some private (not NATed)</div><div class='add'>+	 * address, ip option should be used.</div><div class='add'>+	 */</div><div class='add'>+	if (ceph_addr_is_blank(my_addr)) {</div><div class='add'>+		memcpy(&amp;my_addr-&gt;in_addr, &amp;addr_for_me.in_addr,</div><div class='add'>+		       sizeof(my_addr-&gt;in_addr));</div><div class='add'>+		ceph_addr_set_port(my_addr, 0);</div><div class='add'>+		dout("%s con %p set my addr %s, as seen by peer %s\n",</div><div class='add'>+		     __func__, con, ceph_pr_addr(my_addr),</div><div class='add'>+		     ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='add'>+	} else {</div><div class='add'>+		dout("%s con %p my addr already set %s\n",</div><div class='add'>+		     __func__, con, ceph_pr_addr(my_addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(ceph_addr_is_blank(my_addr) || ceph_addr_port(my_addr));</div><div class='add'>+	WARN_ON(my_addr-&gt;type != CEPH_ENTITY_ADDR_TYPE_ANY);</div><div class='add'>+	WARN_ON(!my_addr-&gt;nonce);</div><div class='add'>+</div><div class='add'>+	/* no reset_out_kvecs() as our hello may still be pending */</div><div class='add'>+	ret = prepare_auth_request(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret != -EAGAIN)</div><div class='add'>+			pr_err("prepare_auth_request failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_AUTH;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode hello\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_auth_bad_method(struct ceph_connection *con,</div><div class='add'>+				   void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	int allowed_protos[8], allowed_modes[8];</div><div class='add'>+	int allowed_proto_cnt, allowed_mode_cnt;</div><div class='add'>+	int used_proto, result;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected auth_bad_method";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, used_proto, bad);</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, result, bad);</div><div class='add'>+	dout("%s con %p used_proto %d result %d\n", __func__, con, used_proto,</div><div class='add'>+	     result);</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, allowed_proto_cnt, bad);</div><div class='add'>+	if (allowed_proto_cnt &gt; ARRAY_SIZE(allowed_protos)) {</div><div class='add'>+		pr_err("allowed_protos too big %d\n", allowed_proto_cnt);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; allowed_proto_cnt; i++) {</div><div class='add'>+		ceph_decode_32_safe(&amp;p, end, allowed_protos[i], bad);</div><div class='add'>+		dout("%s con %p allowed_protos[%d] %d\n", __func__, con,</div><div class='add'>+		     i, allowed_protos[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, allowed_mode_cnt, bad);</div><div class='add'>+	if (allowed_mode_cnt &gt; ARRAY_SIZE(allowed_modes)) {</div><div class='add'>+		pr_err("allowed_modes too big %d\n", allowed_mode_cnt);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; allowed_mode_cnt; i++) {</div><div class='add'>+		ceph_decode_32_safe(&amp;p, end, allowed_modes[i], bad);</div><div class='add'>+		dout("%s con %p allowed_modes[%d] %d\n", __func__, con,</div><div class='add'>+		     i, allowed_modes[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+	ret = con-&gt;ops-&gt;handle_auth_bad_method(con, used_proto, result,</div><div class='add'>+					       allowed_protos,</div><div class='add'>+					       allowed_proto_cnt,</div><div class='add'>+					       allowed_modes,</div><div class='add'>+					       allowed_mode_cnt);</div><div class='add'>+	mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p handle_auth_bad_method ret %d\n", __func__, con, ret);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode auth_bad_method\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_auth_reply_more(struct ceph_connection *con,</div><div class='add'>+				   void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	int payload_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected auth_reply_more";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, payload_len, bad);</div><div class='add'>+	ceph_decode_need(&amp;p, end, payload_len, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p payload_len %d\n", __func__, con, payload_len);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	ret = prepare_auth_request_more(con, p, payload_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret != -EAGAIN)</div><div class='add'>+			pr_err("prepare_auth_request_more failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode auth_reply_more\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Align session_key and con_secret to avoid GFP_ATOMIC allocation</div><div class='add'>+ * inside crypto_shash_setkey() and crypto_aead_setkey() called from</div><div class='add'>+ * setup_crypto().  __aligned(16) isn't guaranteed to work for stack</div><div class='add'>+ * objects, so do it by hand.</div><div class='add'>+ */</div><div class='add'>+static int process_auth_done(struct ceph_connection *con, void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u8 session_key_buf[CEPH_KEY_LEN + 16];</div><div class='add'>+	u8 con_secret_buf[CEPH_MAX_CON_SECRET_LEN + 16];</div><div class='add'>+	u8 *session_key = PTR_ALIGN(&amp;session_key_buf[0], 16);</div><div class='add'>+	u8 *con_secret = PTR_ALIGN(&amp;con_secret_buf[0], 16);</div><div class='add'>+	int session_key_len, con_secret_len;</div><div class='add'>+	int payload_len;</div><div class='add'>+	u64 global_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected auth_done";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, global_id, bad);</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, con-&gt;v2.con_mode, bad);</div><div class='add'>+	ceph_decode_32_safe(&amp;p, end, payload_len, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p global_id %llu con_mode %d payload_len %d\n",</div><div class='add'>+	     __func__, con, global_id, con-&gt;v2.con_mode, payload_len);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+	session_key_len = 0;</div><div class='add'>+	con_secret_len = 0;</div><div class='add'>+	ret = con-&gt;ops-&gt;handle_auth_done(con, global_id, p, payload_len,</div><div class='add'>+					 session_key, &amp;session_key_len,</div><div class='add'>+					 con_secret, &amp;con_secret_len);</div><div class='add'>+	mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p handle_auth_done ret %d\n", __func__, con, ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = setup_crypto(con, session_key, session_key_len, con_secret,</div><div class='add'>+			   con_secret_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	ret = prepare_auth_signature(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("prepare_auth_signature failed: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_AUTH_SIGNATURE;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(session_key_buf, sizeof(session_key_buf));</div><div class='add'>+	memzero_explicit(con_secret_buf, sizeof(con_secret_buf));</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode auth_done\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_auth_signature(struct ceph_connection *con,</div><div class='add'>+				  void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u8 hmac[SHA256_DIGEST_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_AUTH_SIGNATURE) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected auth_signature";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_hmac_sha256(con, con-&gt;v2.out_sign_kvecs, con-&gt;v2.out_sign_kvec_cnt,</div><div class='add'>+			 hmac);</div><div class='add'>+</div><div class='add'>+	ceph_decode_need(&amp;p, end, SHA256_DIGEST_SIZE, bad);</div><div class='add'>+	if (crypto_memneq(p, hmac, SHA256_DIGEST_SIZE)) {</div><div class='add'>+		con-&gt;error_msg = "integrity error, bad auth signature";</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p auth signature ok\n", __func__, con);</div><div class='add'>+</div><div class='add'>+	/* no reset_out_kvecs() as our auth_signature may still be pending */</div><div class='add'>+	if (!con-&gt;v2.server_cookie) {</div><div class='add'>+		ret = prepare_client_ident(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_client_ident failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		con-&gt;state = CEPH_CON_S_V2_SESSION_CONNECT;</div><div class='add'>+	} else {</div><div class='add'>+		ret = prepare_session_reconnect(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_session_reconnect failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		con-&gt;state = CEPH_CON_S_V2_SESSION_RECONNECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode auth_signature\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_server_ident(struct ceph_connection *con,</div><div class='add'>+				void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	struct ceph_client *client = from_msgr(con-&gt;msgr);</div><div class='add'>+	u64 features, required_features;</div><div class='add'>+	struct ceph_entity_addr addr;</div><div class='add'>+	u64 global_seq;</div><div class='add'>+	u64 global_id;</div><div class='add'>+	u64 cookie;</div><div class='add'>+	u64 flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_CONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected server_ident";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ceph_decode_entity_addrvec(&amp;p, end, true, &amp;addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to decode server addrs: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, global_id, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, global_seq, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, features, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, required_features, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, flags, bad);</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, cookie, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p addr %s/%u global_id %llu global_seq %llu features 0x%llx required_features 0x%llx flags 0x%llx cookie 0x%llx\n",</div><div class='add'>+	     __func__, con, ceph_pr_addr(&amp;addr), le32_to_cpu(addr.nonce),</div><div class='add'>+	     global_id, global_seq, features, required_features, flags, cookie);</div><div class='add'>+</div><div class='add'>+	/* is this who we intended to talk to? */</div><div class='add'>+	if (memcmp(&amp;addr, &amp;con-&gt;peer_addr, sizeof(con-&gt;peer_addr))) {</div><div class='add'>+		pr_err("bad peer addr/nonce, want %s/%u, got %s/%u\n",</div><div class='add'>+		       ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+		       le32_to_cpu(con-&gt;peer_addr.nonce),</div><div class='add'>+		       ceph_pr_addr(&amp;addr), le32_to_cpu(addr.nonce));</div><div class='add'>+		con-&gt;error_msg = "wrong peer at address";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client-&gt;required_features &amp; ~features) {</div><div class='add'>+		pr_err("RADOS feature set mismatch: my required &gt; server's supported 0x%llx, need 0x%llx\n",</div><div class='add'>+		       features, client-&gt;required_features &amp; ~features);</div><div class='add'>+		con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Both name-&gt;type and name-&gt;num are set in ceph_con_open() but</div><div class='add'>+	 * name-&gt;num may be bogus in the initial monmap.  name-&gt;type is</div><div class='add'>+	 * verified in handle_hello().</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!con-&gt;peer_name.type);</div><div class='add'>+	con-&gt;peer_name.num = cpu_to_le64(global_id);</div><div class='add'>+	con-&gt;v2.peer_global_seq = global_seq;</div><div class='add'>+	con-&gt;peer_features = features;</div><div class='add'>+	WARN_ON(required_features &amp; ~client-&gt;supported_features);</div><div class='add'>+	con-&gt;v2.server_cookie = cookie;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CEPH_MSG_CONNECT_LOSSY) {</div><div class='add'>+		ceph_con_flag_set(con, CEPH_CON_F_LOSSYTX);</div><div class='add'>+		WARN_ON(con-&gt;v2.server_cookie);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(!con-&gt;v2.server_cookie);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_in_sign_kvecs(con);</div><div class='add'>+	clear_out_sign_kvecs(con);</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+	con-&gt;delay = 0;  /* reset backoff memory */</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_OPEN;</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_GET_NEXT;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode server_ident\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_ident_missing_features(struct ceph_connection *con,</div><div class='add'>+					  void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	struct ceph_client *client = from_msgr(con-&gt;msgr);</div><div class='add'>+	u64 missing_features;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_CONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected ident_missing_features";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, missing_features, bad);</div><div class='add'>+	pr_err("RADOS feature set mismatch: server's required &gt; my supported 0x%llx, missing 0x%llx\n",</div><div class='add'>+	       client-&gt;supported_features, missing_features);</div><div class='add'>+	con-&gt;error_msg = "missing required protocol features";</div><div class='add'>+	return -EINVAL;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode ident_missing_features\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_session_reconnect_ok(struct ceph_connection *con,</div><div class='add'>+					void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u64 seq;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_RECONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected session_reconnect_ok";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, seq, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p seq %llu\n", __func__, con, seq);</div><div class='add'>+	ceph_con_discard_requeued(con, seq);</div><div class='add'>+</div><div class='add'>+	clear_in_sign_kvecs(con);</div><div class='add'>+	clear_out_sign_kvecs(con);</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+	con-&gt;delay = 0;  /* reset backoff memory */</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_OPEN;</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_GET_NEXT;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode session_reconnect_ok\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_session_retry(struct ceph_connection *con,</div><div class='add'>+				 void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u64 connect_seq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_RECONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected session_retry";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, connect_seq, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p connect_seq %llu\n", __func__, con, connect_seq);</div><div class='add'>+	WARN_ON(connect_seq &lt;= con-&gt;v2.connect_seq);</div><div class='add'>+	con-&gt;v2.connect_seq = connect_seq + 1;</div><div class='add'>+</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	ret = prepare_session_reconnect(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("prepare_session_reconnect (cseq) failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode session_retry\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_session_retry_global(struct ceph_connection *con,</div><div class='add'>+					void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u64 global_seq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_RECONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected session_retry_global";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, global_seq, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p global_seq %llu\n", __func__, con, global_seq);</div><div class='add'>+	WARN_ON(global_seq &lt;= con-&gt;v2.global_seq);</div><div class='add'>+	con-&gt;v2.global_seq = ceph_get_global_seq(con-&gt;msgr, global_seq);</div><div class='add'>+</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	ret = prepare_session_reconnect(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("prepare_session_reconnect (gseq) failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode session_retry_global\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_session_reset(struct ceph_connection *con,</div><div class='add'>+				 void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	bool full;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_RECONNECT) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected session_reset";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_8_safe(&amp;p, end, full, bad);</div><div class='add'>+	if (!full) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, bad session_reset";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("%s%lld %s session reset\n", ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+		ceph_pr_addr(&amp;con-&gt;peer_addr));</div><div class='add'>+	ceph_con_reset_session(con);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;ops-&gt;peer_reset)</div><div class='add'>+		con-&gt;ops-&gt;peer_reset(con);</div><div class='add'>+	mutex_lock(&amp;con-&gt;mutex);</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_V2_SESSION_RECONNECT) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	ret = prepare_client_ident(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("prepare_client_ident (rst) failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;state = CEPH_CON_S_V2_SESSION_CONNECT;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode session_reset\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_keepalive2_ack(struct ceph_connection *con,</div><div class='add'>+				  void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_OPEN) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected keepalive2_ack";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_need(&amp;p, end, sizeof(struct ceph_timespec), bad);</div><div class='add'>+	ceph_decode_timespec64(&amp;con-&gt;last_keepalive_ack, p);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p timestamp %ptSp\n", __func__, con, &amp;con-&gt;last_keepalive_ack);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode keepalive2_ack\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_ack(struct ceph_connection *con, void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	u64 seq;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_OPEN) {</div><div class='add'>+		con-&gt;error_msg = "protocol error, unexpected ack";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_decode_64_safe(&amp;p, end, seq, bad);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p seq %llu\n", __func__, con, seq);</div><div class='add'>+	ceph_con_discard_sent(con, seq);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	pr_err("failed to decode ack\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_control(struct ceph_connection *con, void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	int tag = con-&gt;v2.in_desc.fd_tag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p tag %d len %d\n", __func__, con, tag, (int)(end - p));</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case FRAME_TAG_HELLO:</div><div class='add'>+		ret = process_hello(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_AUTH_BAD_METHOD:</div><div class='add'>+		ret = process_auth_bad_method(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_AUTH_REPLY_MORE:</div><div class='add'>+		ret = process_auth_reply_more(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_AUTH_DONE:</div><div class='add'>+		ret = process_auth_done(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_AUTH_SIGNATURE:</div><div class='add'>+		ret = process_auth_signature(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_SERVER_IDENT:</div><div class='add'>+		ret = process_server_ident(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_IDENT_MISSING_FEATURES:</div><div class='add'>+		ret = process_ident_missing_features(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_SESSION_RECONNECT_OK:</div><div class='add'>+		ret = process_session_reconnect_ok(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_SESSION_RETRY:</div><div class='add'>+		ret = process_session_retry(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_SESSION_RETRY_GLOBAL:</div><div class='add'>+		ret = process_session_retry_global(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_SESSION_RESET:</div><div class='add'>+		ret = process_session_reset(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_KEEPALIVE2_ACK:</div><div class='add'>+		ret = process_keepalive2_ack(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	case FRAME_TAG_ACK:</div><div class='add'>+		ret = process_ack(con, p, end);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("bad tag %d\n", tag);</div><div class='add'>+		con-&gt;error_msg = "protocol error, bad tag";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		dout("%s con %p error %d\n", __func__, con, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prepare_read_preamble(con);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return:</div><div class='add'>+ *   1 - con-&gt;in_msg set, read message</div><div class='add'>+ *   0 - skip message</div><div class='add'>+ *  &lt;0 - error</div><div class='add'>+ */</div><div class='add'>+static int process_message_header(struct ceph_connection *con,</div><div class='add'>+				  void *p, void *end)</div><div class='add'>+{</div><div class='add'>+	struct ceph_frame_desc *desc = &amp;con-&gt;v2.in_desc;</div><div class='add'>+	struct ceph_msg_header2 *hdr2 = p;</div><div class='add'>+	struct ceph_msg_header hdr;</div><div class='add'>+	int skip;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 seq;</div><div class='add'>+</div><div class='add'>+	/* verify seq# */</div><div class='add'>+	seq = le64_to_cpu(hdr2-&gt;seq);</div><div class='add'>+	if ((s64)seq - (s64)con-&gt;in_seq &lt; 1) {</div><div class='add'>+		pr_info("%s%lld %s skipping old message: seq %llu, expected %llu\n",</div><div class='add'>+			ENTITY_NAME(con-&gt;peer_name),</div><div class='add'>+			ceph_pr_addr(&amp;con-&gt;peer_addr),</div><div class='add'>+			seq, con-&gt;in_seq + 1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if ((s64)seq - (s64)con-&gt;in_seq &gt; 1) {</div><div class='add'>+		pr_err("bad seq %llu, expected %llu\n", seq, con-&gt;in_seq + 1);</div><div class='add'>+		con-&gt;error_msg = "bad message sequence # for incoming message";</div><div class='add'>+		return -EBADE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_con_discard_sent(con, le64_to_cpu(hdr2-&gt;ack_seq));</div><div class='add'>+</div><div class='add'>+	fill_header(&amp;hdr, hdr2, desc-&gt;fd_lens[1], desc-&gt;fd_lens[2],</div><div class='add'>+		    desc-&gt;fd_lens[3], &amp;con-&gt;peer_name);</div><div class='add'>+	ret = ceph_con_in_msg_alloc(con, &amp;hdr, &amp;skip);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con-&gt;in_msg ^ skip);</div><div class='add'>+	if (skip)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con-&gt;in_msg);</div><div class='add'>+	WARN_ON(con-&gt;in_msg-&gt;con != con);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int process_message(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	ceph_con_process_message(con);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could have been closed by ceph_con_close() because</div><div class='add'>+	 * ceph_con_process_message() temporarily drops con-&gt;mutex.</div><div class='add'>+	 */</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_OPEN) {</div><div class='add'>+		dout("%s con %p state changed to %d\n", __func__, con,</div><div class='add'>+		     con-&gt;state);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prepare_read_preamble(con);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __handle_control(struct ceph_connection *con, void *p)</div><div class='add'>+{</div><div class='add'>+	void *end = p + con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.in_desc.fd_tag != FRAME_TAG_MESSAGE)</div><div class='add'>+		return process_control(con, p, end);</div><div class='add'>+</div><div class='add'>+	ret = process_message_header(con, p, end);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		prepare_skip_message(con);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = con-&gt;in_msg;  /* set in process_message_header() */</div><div class='add'>+	if (front_len(msg)) {</div><div class='add'>+		WARN_ON(front_len(msg) &gt; msg-&gt;front_alloc_len);</div><div class='add'>+		msg-&gt;front.iov_len = front_len(msg);</div><div class='add'>+	} else {</div><div class='add'>+		msg-&gt;front.iov_len = 0;</div><div class='add'>+	}</div><div class='add'>+	if (middle_len(msg)) {</div><div class='add'>+		WARN_ON(middle_len(msg) &gt; msg-&gt;middle-&gt;alloc_len);</div><div class='add'>+		msg-&gt;middle-&gt;vec.iov_len = middle_len(msg);</div><div class='add'>+	} else if (msg-&gt;middle) {</div><div class='add'>+		msg-&gt;middle-&gt;vec.iov_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!front_len(msg) &amp;&amp; !middle_len(msg) &amp;&amp; !data_len(msg))</div><div class='add'>+		return process_message(con);</div><div class='add'>+</div><div class='add'>+	if (con_secure(con))</div><div class='add'>+		return prepare_read_tail_secure(con);</div><div class='add'>+</div><div class='add'>+	return prepare_read_tail_plain(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_preamble(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_frame_desc *desc = &amp;con-&gt;v2.in_desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con_secure(con)) {</div><div class='add'>+		ret = decrypt_preamble(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret == -EBADMSG)</div><div class='add'>+				con-&gt;error_msg = "integrity error, bad preamble auth tag";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = decode_preamble(con-&gt;v2.in_buf, desc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -EBADMSG)</div><div class='add'>+			con-&gt;error_msg = "integrity error, bad crc";</div><div class='add'>+		else</div><div class='add'>+			con-&gt;error_msg = "protocol error, bad preamble";</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dout("%s con %p tag %d seg_cnt %d %d+%d+%d+%d\n", __func__,</div><div class='add'>+	     con, desc-&gt;fd_tag, desc-&gt;fd_seg_cnt, desc-&gt;fd_lens[0],</div><div class='add'>+	     desc-&gt;fd_lens[1], desc-&gt;fd_lens[2], desc-&gt;fd_lens[3]);</div><div class='add'>+</div><div class='add'>+	if (!con_secure(con))</div><div class='add'>+		return prepare_read_control(con);</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;fd_lens[0] &gt; CEPH_PREAMBLE_INLINE_LEN)</div><div class='add'>+		return prepare_read_control_remainder(con);</div><div class='add'>+</div><div class='add'>+	return __handle_control(con, CTRL_BODY(con-&gt;v2.in_buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_control(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ctrl_len = con-&gt;v2.in_desc.fd_lens[0];</div><div class='add'>+	void *buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con_secure(con));</div><div class='add'>+</div><div class='add'>+	ret = verify_control_crc(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		con-&gt;error_msg = "integrity error, bad crc";</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_V2_AUTH) {</div><div class='add'>+		buf = alloc_conn_buf(con, ctrl_len);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		memcpy(buf, con-&gt;v2.in_kvecs[0].iov_base, ctrl_len);</div><div class='add'>+		return __handle_control(con, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __handle_control(con, con-&gt;v2.in_kvecs[0].iov_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_control_remainder(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con_secure(con));</div><div class='add'>+</div><div class='add'>+	ret = decrypt_control_remainder(con);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -EBADMSG)</div><div class='add'>+			con-&gt;error_msg = "integrity error, bad control remainder auth tag";</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __handle_control(con, con-&gt;v2.in_kvecs[0].iov_base -</div><div class='add'>+				     CEPH_PREAMBLE_INLINE_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_epilogue(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	u32 front_crc, middle_crc, data_crc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (con_secure(con)) {</div><div class='add'>+		ret = decrypt_tail(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret == -EBADMSG)</div><div class='add'>+				con-&gt;error_msg = "integrity error, bad epilogue auth tag";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* just late_status */</div><div class='add'>+		ret = decode_epilogue(con-&gt;v2.in_buf, NULL, NULL, NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			con-&gt;error_msg = "protocol error, bad epilogue";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = decode_epilogue(con-&gt;v2.in_buf, &amp;front_crc,</div><div class='add'>+				      &amp;middle_crc, &amp;data_crc);</div><div class='add'>+		if (ret) {</div><div class='add'>+			con-&gt;error_msg = "protocol error, bad epilogue";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = verify_epilogue_crcs(con, front_crc, middle_crc,</div><div class='add'>+					   data_crc);</div><div class='add'>+		if (ret) {</div><div class='add'>+			con-&gt;error_msg = "integrity error, bad crc";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return process_message(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_skip(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p\n", __func__, con);</div><div class='add'>+</div><div class='add'>+	if (con_secure(con))</div><div class='add'>+		gcm_inc_nonce(&amp;con-&gt;v2.in_gcm_nonce);</div><div class='add'>+</div><div class='add'>+	__finish_skip(con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int populate_in_iter(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p state %d in_state %d\n", __func__, con, con-&gt;state,</div><div class='add'>+	     con-&gt;v2.in_state);</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_V2_BANNER_PREFIX) {</div><div class='add'>+		ret = process_banner_prefix(con);</div><div class='add'>+	} else if (con-&gt;state == CEPH_CON_S_V2_BANNER_PAYLOAD) {</div><div class='add'>+		ret = process_banner_payload(con);</div><div class='add'>+	} else if ((con-&gt;state &gt;= CEPH_CON_S_V2_HELLO &amp;&amp;</div><div class='add'>+		    con-&gt;state &lt;= CEPH_CON_S_V2_SESSION_RECONNECT) ||</div><div class='add'>+		   con-&gt;state == CEPH_CON_S_OPEN) {</div><div class='add'>+		switch (con-&gt;v2.in_state) {</div><div class='add'>+		case IN_S_HANDLE_PREAMBLE:</div><div class='add'>+			ret = handle_preamble(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_HANDLE_CONTROL:</div><div class='add'>+			ret = handle_control(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_HANDLE_CONTROL_REMAINDER:</div><div class='add'>+			ret = handle_control_remainder(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_PREPARE_READ_DATA:</div><div class='add'>+			ret = prepare_read_data(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_PREPARE_READ_DATA_CONT:</div><div class='add'>+			prepare_read_data_cont(con);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_PREPARE_READ_ENC_PAGE:</div><div class='add'>+			prepare_read_enc_page(con);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_PREPARE_SPARSE_DATA:</div><div class='add'>+			ret = prepare_sparse_read_data(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_PREPARE_SPARSE_DATA_CONT:</div><div class='add'>+			ret = prepare_sparse_read_cont(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_HANDLE_EPILOGUE:</div><div class='add'>+			ret = handle_epilogue(con);</div><div class='add'>+			break;</div><div class='add'>+		case IN_S_FINISH_SKIP:</div><div class='add'>+			finish_skip(con);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN(1, "bad in_state %d", con-&gt;v2.in_state);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		WARN(1, "bad state %d", con-&gt;state);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		dout("%s con %p error %d\n", __func__, con, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!iov_iter_count(&amp;con-&gt;v2.in_iter)))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	dout("%s con %p populated %zu\n", __func__, con,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_con_v2_try_read(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p state %d need %zu\n", __func__, con, con-&gt;state,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.in_iter));</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_PREOPEN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We should always have something pending here.  If not,</div><div class='add'>+	 * avoid calling populate_in_iter() as if we read something</div><div class='add'>+	 * (ceph_tcp_recv() would immediately return 1).</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(!iov_iter_count(&amp;con-&gt;v2.in_iter)))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		ret = ceph_tcp_recv(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = populate_in_iter(con);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret &amp;&amp; ret != -EAGAIN &amp;&amp; !con-&gt;error_msg)</div><div class='add'>+				con-&gt;error_msg = "read processing error";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_data(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_epil.data_crc = -1;</div><div class='add'>+	ceph_msg_data_cursor_init(&amp;con-&gt;v2.out_cursor, msg,</div><div class='add'>+				  data_len(msg));</div><div class='add'>+</div><div class='add'>+	get_bvec_at(&amp;con-&gt;v2.out_cursor, &amp;bv);</div><div class='add'>+	set_out_bvec(con, &amp;bv, true);</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_QUEUE_DATA_CONT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_data_cont(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_epil.data_crc = ceph_crc32c_page(</div><div class='add'>+		con-&gt;v2.out_epil.data_crc, con-&gt;v2.out_bvec.bv_page,</div><div class='add'>+		con-&gt;v2.out_bvec.bv_offset, con-&gt;v2.out_bvec.bv_len);</div><div class='add'>+</div><div class='add'>+	ceph_msg_data_advance(&amp;con-&gt;v2.out_cursor, con-&gt;v2.out_bvec.bv_len);</div><div class='add'>+	if (con-&gt;v2.out_cursor.total_resid) {</div><div class='add'>+		get_bvec_at(&amp;con-&gt;v2.out_cursor, &amp;bv);</div><div class='add'>+		set_out_bvec(con, &amp;bv, true);</div><div class='add'>+		WARN_ON(con-&gt;v2.out_state != OUT_S_QUEUE_DATA_CONT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We've written all data.  Queue epilogue.  Once it's written,</div><div class='add'>+	 * we are done.</div><div class='add'>+	 */</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	prepare_epilogue_plain(con, msg, false);</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_enc_page(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p i %d resid %d\n", __func__, con, con-&gt;v2.out_enc_i,</div><div class='add'>+	     con-&gt;v2.out_enc_resid);</div><div class='add'>+	WARN_ON(!con-&gt;v2.out_enc_resid);</div><div class='add'>+</div><div class='add'>+	bvec_set_page(&amp;bv, con-&gt;v2.out_enc_pages[con-&gt;v2.out_enc_i],</div><div class='add'>+		      min(con-&gt;v2.out_enc_resid, (int)PAGE_SIZE), 0);</div><div class='add'>+</div><div class='add'>+	set_out_bvec(con, &amp;bv, false);</div><div class='add'>+	con-&gt;v2.out_enc_i++;</div><div class='add'>+	con-&gt;v2.out_enc_resid -= bv.bv_len;</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.out_enc_resid) {</div><div class='add'>+		WARN_ON(con-&gt;v2.out_state != OUT_S_QUEUE_ENC_PAGE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We've queued the last piece of ciphertext (ending with</div><div class='add'>+	 * epilogue) + auth tag.  Once it's written, we are done.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(con-&gt;v2.out_enc_i != con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_zeros(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p out_zero %d\n", __func__, con, con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.out_zero) {</div><div class='add'>+		set_out_bvec_zero(con);</div><div class='add'>+		con-&gt;v2.out_zero -= con-&gt;v2.out_bvec.bv_len;</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_QUEUE_ZEROS;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We've zero-filled everything up to epilogue.  Queue epilogue</div><div class='add'>+	 * with late_status set to ABORTED and crcs adjusted for zeros.</div><div class='add'>+	 * Once it's written, we are done patching up for the revoke.</div><div class='add'>+	 */</div><div class='add'>+	reset_out_kvecs(con);</div><div class='add'>+	prepare_epilogue_plain(con, msg, true);</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_FINISH_MESSAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_message(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p msg %p\n", __func__, con, con-&gt;out_msg);</div><div class='add'>+</div><div class='add'>+	/* we end up here both plain and secure modes */</div><div class='add'>+	if (con-&gt;v2.out_enc_pages) {</div><div class='add'>+		WARN_ON(!con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+		ceph_release_page_vector(con-&gt;v2.out_enc_pages,</div><div class='add'>+					 con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+		con-&gt;v2.out_enc_pages = NULL;</div><div class='add'>+		con-&gt;v2.out_enc_page_cnt = 0;</div><div class='add'>+	}</div><div class='add'>+	/* message may have been revoked */</div><div class='add'>+	if (con-&gt;out_msg) {</div><div class='add'>+		ceph_msg_put(con-&gt;out_msg);</div><div class='add'>+		con-&gt;out_msg = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_state = OUT_S_GET_NEXT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int populate_out_iter(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	struct ceph_msg *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p state %d out_state %d\n", __func__, con, con-&gt;state,</div><div class='add'>+	     con-&gt;v2.out_state);</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+</div><div class='add'>+	if (con-&gt;state != CEPH_CON_S_OPEN) {</div><div class='add'>+		WARN_ON(con-&gt;state &lt; CEPH_CON_S_V2_BANNER_PREFIX ||</div><div class='add'>+			con-&gt;state &gt; CEPH_CON_S_V2_SESSION_RECONNECT);</div><div class='add'>+		goto nothing_pending;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (con-&gt;v2.out_state) {</div><div class='add'>+	case OUT_S_QUEUE_DATA:</div><div class='add'>+		WARN_ON(!con-&gt;out_msg);</div><div class='add'>+		queue_data(con, con-&gt;out_msg);</div><div class='add'>+		goto populated;</div><div class='add'>+	case OUT_S_QUEUE_DATA_CONT:</div><div class='add'>+		WARN_ON(!con-&gt;out_msg);</div><div class='add'>+		queue_data_cont(con, con-&gt;out_msg);</div><div class='add'>+		goto populated;</div><div class='add'>+	case OUT_S_QUEUE_ENC_PAGE:</div><div class='add'>+		queue_enc_page(con);</div><div class='add'>+		goto populated;</div><div class='add'>+	case OUT_S_QUEUE_ZEROS:</div><div class='add'>+		WARN_ON(con-&gt;out_msg);  /* revoked */</div><div class='add'>+		queue_zeros(con, con-&gt;out_msg);</div><div class='add'>+		goto populated;</div><div class='add'>+	case OUT_S_FINISH_MESSAGE:</div><div class='add'>+		finish_message(con);</div><div class='add'>+		break;</div><div class='add'>+	case OUT_S_GET_NEXT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "bad out_state %d", con-&gt;v2.out_state);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(con-&gt;v2.out_state != OUT_S_GET_NEXT);</div><div class='add'>+	if (ceph_con_flag_test_and_clear(con, CEPH_CON_F_KEEPALIVE_PENDING)) {</div><div class='add'>+		ret = prepare_keepalive2(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_keepalive2 failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else if ((msg = ceph_con_get_out_msg(con)) != NULL) {</div><div class='add'>+		ret = prepare_message(con, msg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_message failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else if (con-&gt;in_seq &gt; con-&gt;in_seq_acked) {</div><div class='add'>+		ret = prepare_ack(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_ack failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		goto nothing_pending;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+populated:</div><div class='add'>+	if (WARN_ON(!iov_iter_count(&amp;con-&gt;v2.out_iter)))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	dout("%s con %p populated %zu\n", __func__, con,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+nothing_pending:</div><div class='add'>+	WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	dout("%s con %p nothing pending\n", __func__, con);</div><div class='add'>+	ceph_con_flag_clear(con, CEPH_CON_F_WRITE_PENDING);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_con_v2_try_write(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dout("%s con %p state %d have %zu\n", __func__, con, con-&gt;state,</div><div class='add'>+	     iov_iter_count(&amp;con-&gt;v2.out_iter));</div><div class='add'>+</div><div class='add'>+	/* open the socket first? */</div><div class='add'>+	if (con-&gt;state == CEPH_CON_S_PREOPEN) {</div><div class='add'>+		WARN_ON(con-&gt;peer_addr.type != CEPH_ENTITY_ADDR_TYPE_MSGR2);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Always bump global_seq.  Bump connect_seq only if</div><div class='add'>+		 * there is a session (i.e. we are reconnecting and will</div><div class='add'>+		 * send session_reconnect instead of client_ident).</div><div class='add'>+		 */</div><div class='add'>+		con-&gt;v2.global_seq = ceph_get_global_seq(con-&gt;msgr, 0);</div><div class='add'>+		if (con-&gt;v2.server_cookie)</div><div class='add'>+			con-&gt;v2.connect_seq++;</div><div class='add'>+</div><div class='add'>+		ret = prepare_read_banner_prefix(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_read_banner_prefix failed: %d\n", ret);</div><div class='add'>+			con-&gt;error_msg = "connect error";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reset_out_kvecs(con);</div><div class='add'>+		ret = prepare_banner(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("prepare_banner failed: %d\n", ret);</div><div class='add'>+			con-&gt;error_msg = "connect error";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ceph_tcp_connect(con);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("ceph_tcp_connect failed: %d\n", ret);</div><div class='add'>+			con-&gt;error_msg = "connect error";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iov_iter_count(&amp;con-&gt;v2.out_iter)) {</div><div class='add'>+		ret = populate_out_iter(con);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret &amp;&amp; ret != -EAGAIN &amp;&amp; !con-&gt;error_msg)</div><div class='add'>+				con-&gt;error_msg = "write processing error";</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcp_sock_set_cork(con-&gt;sock-&gt;sk, true);</div><div class='add'>+	for (;;) {</div><div class='add'>+		ret = ceph_tcp_send(con);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = populate_out_iter(con);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret &amp;&amp; ret != -EAGAIN &amp;&amp; !con-&gt;error_msg)</div><div class='add'>+				con-&gt;error_msg = "write processing error";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcp_sock_set_cork(con-&gt;sock-&gt;sk, false);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 crc32c_zeros(u32 crc, int zero_len)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	while (zero_len) {</div><div class='add'>+		len = min(zero_len, (int)PAGE_SIZE);</div><div class='add'>+		crc = crc32c(crc, page_address(ceph_zero_page), len);</div><div class='add'>+		zero_len -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_zero_front(struct ceph_connection *con,</div><div class='add'>+			       struct ceph_msg *msg, int resid)</div><div class='add'>+{</div><div class='add'>+	int sent;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!resid || resid &gt; front_len(msg));</div><div class='add'>+	sent = front_len(msg) - resid;</div><div class='add'>+	dout("%s con %p sent %d resid %d\n", __func__, con, sent, resid);</div><div class='add'>+</div><div class='add'>+	if (sent) {</div><div class='add'>+		con-&gt;v2.out_epil.front_crc =</div><div class='add'>+			crc32c(-1, msg-&gt;front.iov_base, sent);</div><div class='add'>+		con-&gt;v2.out_epil.front_crc =</div><div class='add'>+			crc32c_zeros(con-&gt;v2.out_epil.front_crc, resid);</div><div class='add'>+	} else {</div><div class='add'>+		con-&gt;v2.out_epil.front_crc = crc32c_zeros(-1, resid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_iter.count -= resid;</div><div class='add'>+	out_zero_add(con, resid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_zero_middle(struct ceph_connection *con,</div><div class='add'>+				struct ceph_msg *msg, int resid)</div><div class='add'>+{</div><div class='add'>+	int sent;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!resid || resid &gt; middle_len(msg));</div><div class='add'>+	sent = middle_len(msg) - resid;</div><div class='add'>+	dout("%s con %p sent %d resid %d\n", __func__, con, sent, resid);</div><div class='add'>+</div><div class='add'>+	if (sent) {</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc =</div><div class='add'>+			crc32c(-1, msg-&gt;middle-&gt;vec.iov_base, sent);</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc =</div><div class='add'>+			crc32c_zeros(con-&gt;v2.out_epil.middle_crc, resid);</div><div class='add'>+	} else {</div><div class='add'>+		con-&gt;v2.out_epil.middle_crc = crc32c_zeros(-1, resid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_iter.count -= resid;</div><div class='add'>+	out_zero_add(con, resid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_zero_data(struct ceph_connection *con,</div><div class='add'>+			      struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	dout("%s con %p\n", __func__, con);</div><div class='add'>+	con-&gt;v2.out_epil.data_crc = crc32c_zeros(-1, data_len(msg));</div><div class='add'>+	out_zero_add(con, data_len(msg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_queue_data(struct ceph_connection *con,</div><div class='add'>+				 struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int boundary;</div><div class='add'>+	int resid;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!data_len(msg));</div><div class='add'>+	WARN_ON(!iov_iter_is_kvec(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.out_iter);</div><div class='add'>+</div><div class='add'>+	boundary = front_len(msg) + middle_len(msg);</div><div class='add'>+	if (resid &gt; boundary) {</div><div class='add'>+		resid -= boundary;</div><div class='add'>+		WARN_ON(resid &gt; MESSAGE_HEAD_PLAIN_LEN);</div><div class='add'>+		dout("%s con %p was sending head\n", __func__, con);</div><div class='add'>+		if (front_len(msg))</div><div class='add'>+			prepare_zero_front(con, msg, front_len(msg));</div><div class='add'>+		if (middle_len(msg))</div><div class='add'>+			prepare_zero_middle(con, msg, middle_len(msg));</div><div class='add'>+		prepare_zero_data(con, msg);</div><div class='add'>+		WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter) != resid);</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_QUEUE_ZEROS;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	boundary = middle_len(msg);</div><div class='add'>+	if (resid &gt; boundary) {</div><div class='add'>+		resid -= boundary;</div><div class='add'>+		dout("%s con %p was sending front\n", __func__, con);</div><div class='add'>+		prepare_zero_front(con, msg, resid);</div><div class='add'>+		if (middle_len(msg))</div><div class='add'>+			prepare_zero_middle(con, msg, middle_len(msg));</div><div class='add'>+		prepare_zero_data(con, msg);</div><div class='add'>+		queue_zeros(con, msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(!resid);</div><div class='add'>+	dout("%s con %p was sending middle\n", __func__, con);</div><div class='add'>+	prepare_zero_middle(con, msg, resid);</div><div class='add'>+	prepare_zero_data(con, msg);</div><div class='add'>+	queue_zeros(con, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_queue_data_cont(struct ceph_connection *con,</div><div class='add'>+				      struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int sent, resid;  /* current piece of data */</div><div class='add'>+</div><div class='add'>+	WARN_ON(!data_len(msg));</div><div class='add'>+	WARN_ON(!iov_iter_is_bvec(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.out_iter);</div><div class='add'>+	WARN_ON(!resid || resid &gt; con-&gt;v2.out_bvec.bv_len);</div><div class='add'>+	sent = con-&gt;v2.out_bvec.bv_len - resid;</div><div class='add'>+	dout("%s con %p sent %d resid %d\n", __func__, con, sent, resid);</div><div class='add'>+</div><div class='add'>+	if (sent) {</div><div class='add'>+		con-&gt;v2.out_epil.data_crc = ceph_crc32c_page(</div><div class='add'>+			con-&gt;v2.out_epil.data_crc, con-&gt;v2.out_bvec.bv_page,</div><div class='add'>+			con-&gt;v2.out_bvec.bv_offset, sent);</div><div class='add'>+		ceph_msg_data_advance(&amp;con-&gt;v2.out_cursor, sent);</div><div class='add'>+	}</div><div class='add'>+	WARN_ON(resid &gt; con-&gt;v2.out_cursor.total_resid);</div><div class='add'>+	con-&gt;v2.out_epil.data_crc = crc32c_zeros(con-&gt;v2.out_epil.data_crc,</div><div class='add'>+						con-&gt;v2.out_cursor.total_resid);</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.out_iter.count -= resid;</div><div class='add'>+	out_zero_add(con, con-&gt;v2.out_cursor.total_resid);</div><div class='add'>+	queue_zeros(con, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_finish_message(struct ceph_connection *con,</div><div class='add'>+				     struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int boundary;</div><div class='add'>+	int resid;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!iov_iter_is_kvec(&amp;con-&gt;v2.out_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.out_iter);</div><div class='add'>+</div><div class='add'>+	if (!front_len(msg) &amp;&amp; !middle_len(msg) &amp;&amp;</div><div class='add'>+	    !data_len(msg)) {</div><div class='add'>+		WARN_ON(!resid || resid &gt; MESSAGE_HEAD_PLAIN_LEN);</div><div class='add'>+		dout("%s con %p was sending head (empty message) - noop\n",</div><div class='add'>+		     __func__, con);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	boundary = front_len(msg) + middle_len(msg) +</div><div class='add'>+		   CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+	if (resid &gt; boundary) {</div><div class='add'>+		resid -= boundary;</div><div class='add'>+		WARN_ON(resid &gt; MESSAGE_HEAD_PLAIN_LEN);</div><div class='add'>+		dout("%s con %p was sending head\n", __func__, con);</div><div class='add'>+		if (front_len(msg))</div><div class='add'>+			prepare_zero_front(con, msg, front_len(msg));</div><div class='add'>+		if (middle_len(msg))</div><div class='add'>+			prepare_zero_middle(con, msg, middle_len(msg));</div><div class='add'>+		con-&gt;v2.out_iter.count -= CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+		WARN_ON(iov_iter_count(&amp;con-&gt;v2.out_iter) != resid);</div><div class='add'>+		con-&gt;v2.out_state = OUT_S_QUEUE_ZEROS;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	boundary = middle_len(msg) + CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+	if (resid &gt; boundary) {</div><div class='add'>+		resid -= boundary;</div><div class='add'>+		dout("%s con %p was sending front\n", __func__, con);</div><div class='add'>+		prepare_zero_front(con, msg, resid);</div><div class='add'>+		if (middle_len(msg))</div><div class='add'>+			prepare_zero_middle(con, msg, middle_len(msg));</div><div class='add'>+		con-&gt;v2.out_iter.count -= CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+		queue_zeros(con, msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	boundary = CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+	if (resid &gt; boundary) {</div><div class='add'>+		resid -= boundary;</div><div class='add'>+		dout("%s con %p was sending middle\n", __func__, con);</div><div class='add'>+		prepare_zero_middle(con, msg, resid);</div><div class='add'>+		con-&gt;v2.out_iter.count -= CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+		queue_zeros(con, msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(!resid);</div><div class='add'>+	dout("%s con %p was sending epilogue - noop\n", __func__, con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v2_revoke(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(con-&gt;v2.out_zero);</div><div class='add'>+</div><div class='add'>+	if (con_secure(con)) {</div><div class='add'>+		WARN_ON(con-&gt;v2.out_state != OUT_S_QUEUE_ENC_PAGE &amp;&amp;</div><div class='add'>+			con-&gt;v2.out_state != OUT_S_FINISH_MESSAGE);</div><div class='add'>+		dout("%s con %p secure - noop\n", __func__, con);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (con-&gt;v2.out_state) {</div><div class='add'>+	case OUT_S_QUEUE_DATA:</div><div class='add'>+		revoke_at_queue_data(con, msg);</div><div class='add'>+		break;</div><div class='add'>+	case OUT_S_QUEUE_DATA_CONT:</div><div class='add'>+		revoke_at_queue_data_cont(con, msg);</div><div class='add'>+		break;</div><div class='add'>+	case OUT_S_FINISH_MESSAGE:</div><div class='add'>+		revoke_at_finish_message(con, msg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "bad out_state %d", con-&gt;v2.out_state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_prepare_read_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int remaining;</div><div class='add'>+	int resid;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con_secure(con));</div><div class='add'>+	WARN_ON(!data_len(con-&gt;in_msg));</div><div class='add'>+	WARN_ON(!iov_iter_is_kvec(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.in_iter);</div><div class='add'>+	WARN_ON(!resid);</div><div class='add'>+</div><div class='add'>+	remaining = data_len(con-&gt;in_msg) + CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+	dout("%s con %p resid %d remaining %d\n", __func__, con, resid,</div><div class='add'>+	     remaining);</div><div class='add'>+	con-&gt;v2.in_iter.count -= resid;</div><div class='add'>+	set_in_skip(con, resid + remaining);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_prepare_read_data_cont(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int recved, resid;  /* current piece of data */</div><div class='add'>+	int remaining;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con_secure(con));</div><div class='add'>+	WARN_ON(!data_len(con-&gt;in_msg));</div><div class='add'>+	WARN_ON(!iov_iter_is_bvec(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.in_iter);</div><div class='add'>+	WARN_ON(!resid || resid &gt; con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+	recved = con-&gt;v2.in_bvec.bv_len - resid;</div><div class='add'>+	dout("%s con %p recved %d resid %d\n", __func__, con, recved, resid);</div><div class='add'>+</div><div class='add'>+	if (recved)</div><div class='add'>+		ceph_msg_data_advance(&amp;con-&gt;v2.in_cursor, recved);</div><div class='add'>+	WARN_ON(resid &gt; con-&gt;v2.in_cursor.total_resid);</div><div class='add'>+</div><div class='add'>+	remaining = CEPH_EPILOGUE_PLAIN_LEN;</div><div class='add'>+	dout("%s con %p total_resid %zu remaining %d\n", __func__, con,</div><div class='add'>+	     con-&gt;v2.in_cursor.total_resid, remaining);</div><div class='add'>+	con-&gt;v2.in_iter.count -= resid;</div><div class='add'>+	set_in_skip(con, con-&gt;v2.in_cursor.total_resid + remaining);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_prepare_read_enc_page(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int resid;  /* current enc page (not necessarily data) */</div><div class='add'>+</div><div class='add'>+	WARN_ON(!con_secure(con));</div><div class='add'>+	WARN_ON(!iov_iter_is_bvec(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.in_iter);</div><div class='add'>+	WARN_ON(!resid || resid &gt; con-&gt;v2.in_bvec.bv_len);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p resid %d enc_resid %d\n", __func__, con, resid,</div><div class='add'>+	     con-&gt;v2.in_enc_resid);</div><div class='add'>+	con-&gt;v2.in_iter.count -= resid;</div><div class='add'>+	set_in_skip(con, resid + con-&gt;v2.in_enc_resid);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_prepare_sparse_data(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int resid;  /* current piece of data */</div><div class='add'>+	int remaining;</div><div class='add'>+</div><div class='add'>+	WARN_ON(con_secure(con));</div><div class='add'>+	WARN_ON(!data_len(con-&gt;in_msg));</div><div class='add'>+	WARN_ON(!iov_iter_is_bvec(&amp;con-&gt;v2.in_iter));</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.in_iter);</div><div class='add'>+	dout("%s con %p resid %d\n", __func__, con, resid);</div><div class='add'>+</div><div class='add'>+	remaining = CEPH_EPILOGUE_PLAIN_LEN + con-&gt;v2.data_len_remain;</div><div class='add'>+	con-&gt;v2.in_iter.count -= resid;</div><div class='add'>+	set_in_skip(con, resid + remaining);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void revoke_at_handle_epilogue(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	int resid;</div><div class='add'>+</div><div class='add'>+	resid = iov_iter_count(&amp;con-&gt;v2.in_iter);</div><div class='add'>+	WARN_ON(!resid);</div><div class='add'>+</div><div class='add'>+	dout("%s con %p resid %d\n", __func__, con, resid);</div><div class='add'>+	con-&gt;v2.in_iter.count -= resid;</div><div class='add'>+	set_in_skip(con, resid);</div><div class='add'>+	con-&gt;v2.in_state = IN_S_FINISH_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v2_revoke_incoming(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	switch (con-&gt;v2.in_state) {</div><div class='add'>+	case IN_S_PREPARE_SPARSE_DATA:</div><div class='add'>+	case IN_S_PREPARE_READ_DATA:</div><div class='add'>+		revoke_at_prepare_read_data(con);</div><div class='add'>+		break;</div><div class='add'>+	case IN_S_PREPARE_READ_DATA_CONT:</div><div class='add'>+		revoke_at_prepare_read_data_cont(con);</div><div class='add'>+		break;</div><div class='add'>+	case IN_S_PREPARE_READ_ENC_PAGE:</div><div class='add'>+		revoke_at_prepare_read_enc_page(con);</div><div class='add'>+		break;</div><div class='add'>+	case IN_S_PREPARE_SPARSE_DATA_CONT:</div><div class='add'>+		revoke_at_prepare_sparse_data(con);</div><div class='add'>+		break;</div><div class='add'>+	case IN_S_HANDLE_EPILOGUE:</div><div class='add'>+		revoke_at_handle_epilogue(con);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "bad in_state %d", con-&gt;v2.in_state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ceph_con_v2_opened(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	return con-&gt;v2.peer_global_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v2_reset_session(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	con-&gt;v2.client_cookie = 0;</div><div class='add'>+	con-&gt;v2.server_cookie = 0;</div><div class='add'>+	con-&gt;v2.global_seq = 0;</div><div class='add'>+	con-&gt;v2.connect_seq = 0;</div><div class='add'>+	con-&gt;v2.peer_global_seq = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_con_v2_reset_protocol(struct ceph_connection *con)</div><div class='add'>+{</div><div class='add'>+	iov_iter_truncate(&amp;con-&gt;v2.in_iter, 0);</div><div class='add'>+	iov_iter_truncate(&amp;con-&gt;v2.out_iter, 0);</div><div class='add'>+	con-&gt;v2.out_zero = 0;</div><div class='add'>+</div><div class='add'>+	clear_in_sign_kvecs(con);</div><div class='add'>+	clear_out_sign_kvecs(con);</div><div class='add'>+	free_conn_bufs(con);</div><div class='add'>+</div><div class='add'>+	if (con-&gt;v2.in_enc_pages) {</div><div class='add'>+		WARN_ON(!con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+		ceph_release_page_vector(con-&gt;v2.in_enc_pages,</div><div class='add'>+					 con-&gt;v2.in_enc_page_cnt);</div><div class='add'>+		con-&gt;v2.in_enc_pages = NULL;</div><div class='add'>+		con-&gt;v2.in_enc_page_cnt = 0;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v2.out_enc_pages) {</div><div class='add'>+		WARN_ON(!con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+		ceph_release_page_vector(con-&gt;v2.out_enc_pages,</div><div class='add'>+					 con-&gt;v2.out_enc_page_cnt);</div><div class='add'>+		con-&gt;v2.out_enc_pages = NULL;</div><div class='add'>+		con-&gt;v2.out_enc_page_cnt = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	con-&gt;v2.con_mode = CEPH_CON_MODE_UNKNOWN;</div><div class='add'>+	memzero_explicit(&amp;con-&gt;v2.in_gcm_nonce, CEPH_GCM_IV_LEN);</div><div class='add'>+	memzero_explicit(&amp;con-&gt;v2.out_gcm_nonce, CEPH_GCM_IV_LEN);</div><div class='add'>+</div><div class='add'>+	memzero_explicit(&amp;con-&gt;v2.hmac_key, sizeof(con-&gt;v2.hmac_key));</div><div class='add'>+	con-&gt;v2.hmac_key_set = false;</div><div class='add'>+	if (con-&gt;v2.gcm_req) {</div><div class='add'>+		aead_request_free(con-&gt;v2.gcm_req);</div><div class='add'>+		con-&gt;v2.gcm_req = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (con-&gt;v2.gcm_tfm) {</div><div class='add'>+		crypto_free_aead(con-&gt;v2.gcm_tfm);</div><div class='add'>+		con-&gt;v2.gcm_tfm = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c<br/>index 18deb3d889c4..c227ececa925 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/mon_client.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/mon_client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/mon_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/mon_client.c</a></div><div class='hunk'>@@ -36,53 +36,122 @@ static const struct ceph_connection_operations mon_con_ops;</div><div class='ctx'> </div><div class='ctx'> static int __validate_auth(struct ceph_mon_client *monc);</div><div class='ctx'> </div><div class='add'>+static int decode_mon_info(void **p, void *end, bool msgr2,</div><div class='add'>+			   struct ceph_entity_addr *addr)</div><div class='add'>+{</div><div class='add'>+	void *mon_info_end;</div><div class='add'>+	u32 struct_len;</div><div class='add'>+	u8 struct_v;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ceph_start_decoding(p, end, 1, "mon_info_t", &amp;struct_v,</div><div class='add'>+				  &amp;struct_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mon_info_end = *p + struct_len;</div><div class='add'>+	ceph_decode_skip_string(p, end, e_inval);  /* skip mon name */</div><div class='add'>+	ret = ceph_decode_entity_addrvec(p, end, msgr2, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*p = mon_info_end;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Decode a monmap blob (e.g., during mount).</div><div class='add'>+ *</div><div class='add'>+ * Assume MonMap v3 (i.e. encoding with MONNAMES and MONENC).</div><div class='ctx'>  */</div><div class='del'>-struct ceph_monmap *ceph_monmap_decode(void *p, void *end)</div><div class='add'>+static struct ceph_monmap *ceph_monmap_decode(void **p, void *end, bool msgr2)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_monmap *m = NULL;</div><div class='del'>-	int i, err = -EINVAL;</div><div class='add'>+	struct ceph_monmap *monmap = NULL;</div><div class='ctx'> 	struct ceph_fsid fsid;</div><div class='del'>-	u32 epoch, num_mon;</div><div class='del'>-	u32 len;</div><div class='add'>+	u32 struct_len;</div><div class='add'>+	int blob_len;</div><div class='add'>+	int num_mon;</div><div class='add'>+	u8 struct_v;</div><div class='add'>+	u32 epoch;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(p, end, blob_len, e_inval);</div><div class='add'>+	ceph_decode_need(p, end, blob_len, e_inval);</div><div class='add'>+</div><div class='add'>+	ret = ceph_start_decoding(p, end, 6, "monmap", &amp;struct_v, &amp;struct_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	dout("%s struct_v %d\n", __func__, struct_v);</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;fsid, sizeof(fsid), e_inval);</div><div class='add'>+	ceph_decode_32_safe(p, end, epoch, e_inval);</div><div class='add'>+	if (struct_v &gt;= 6) {</div><div class='add'>+		u32 feat_struct_len;</div><div class='add'>+		u8 feat_struct_v;</div><div class='add'>+</div><div class='add'>+		*p += sizeof(struct ceph_timespec);  /* skip last_changed */</div><div class='add'>+		*p += sizeof(struct ceph_timespec);  /* skip created */</div><div class='ctx'> </div><div class='del'>-	ceph_decode_32_safe(&amp;p, end, len, bad);</div><div class='del'>-	ceph_decode_need(&amp;p, end, len, bad);</div><div class='add'>+		ret = ceph_start_decoding(p, end, 1, "mon_feature_t",</div><div class='add'>+					  &amp;feat_struct_v, &amp;feat_struct_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='del'>-	dout("monmap_decode %p %p len %d\n", p, end, (int)(end-p));</div><div class='del'>-	p += sizeof(u16);  /* skip version */</div><div class='add'>+		*p += feat_struct_len;  /* skip persistent_features */</div><div class='ctx'> </div><div class='del'>-	ceph_decode_need(&amp;p, end, sizeof(fsid) + 2*sizeof(u32), bad);</div><div class='del'>-	ceph_decode_copy(&amp;p, &amp;fsid, sizeof(fsid));</div><div class='del'>-	epoch = ceph_decode_32(&amp;p);</div><div class='add'>+		ret = ceph_start_decoding(p, end, 1, "mon_feature_t",</div><div class='add'>+					  &amp;feat_struct_v, &amp;feat_struct_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='del'>-	num_mon = ceph_decode_32(&amp;p);</div><div class='del'>-	ceph_decode_need(&amp;p, end, num_mon*sizeof(m-&gt;mon_inst[0]), bad);</div><div class='add'>+		*p += feat_struct_len;  /* skip optional_features */</div><div class='add'>+	}</div><div class='add'>+	ceph_decode_32_safe(p, end, num_mon, e_inval);</div><div class='ctx'> </div><div class='add'>+	dout("%s fsid %pU epoch %u num_mon %d\n", __func__, &amp;fsid, epoch,</div><div class='add'>+	     num_mon);</div><div class='ctx'> 	if (num_mon &gt; CEPH_MAX_MON)</div><div class='del'>-		goto bad;</div><div class='del'>-	m = kmalloc(struct_size(m, mon_inst, num_mon), GFP_NOFS);</div><div class='del'>-	if (m == NULL)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	m-&gt;fsid = fsid;</div><div class='del'>-	m-&gt;epoch = epoch;</div><div class='del'>-	m-&gt;num_mon = num_mon;</div><div class='del'>-	ceph_decode_copy(&amp;p, m-&gt;mon_inst, num_mon*sizeof(m-&gt;mon_inst[0]));</div><div class='del'>-	for (i = 0; i &lt; num_mon; i++)</div><div class='del'>-		ceph_decode_addr(&amp;m-&gt;mon_inst[i].addr);</div><div class='del'>-</div><div class='del'>-	dout("monmap_decode epoch %d, num_mon %d\n", m-&gt;epoch,</div><div class='del'>-	     m-&gt;num_mon);</div><div class='del'>-	for (i = 0; i &lt; m-&gt;num_mon; i++)</div><div class='del'>-		dout("monmap_decode  mon%d is %s\n", i,</div><div class='del'>-		     ceph_pr_addr(&amp;m-&gt;mon_inst[i].addr.in_addr));</div><div class='del'>-	return m;</div><div class='add'>+		goto e_inval;</div><div class='ctx'> </div><div class='del'>-bad:</div><div class='del'>-	dout("monmap_decode failed with %d\n", err);</div><div class='del'>-	kfree(m);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+	monmap = kmalloc(struct_size(monmap, mon_inst, num_mon), GFP_NOIO);</div><div class='add'>+	if (!monmap) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	monmap-&gt;fsid = fsid;</div><div class='add'>+	monmap-&gt;epoch = epoch;</div><div class='add'>+	monmap-&gt;num_mon = num_mon;</div><div class='add'>+</div><div class='add'>+	/* legacy_mon_addr map or mon_info map */</div><div class='add'>+	for (i = 0; i &lt; num_mon; i++) {</div><div class='add'>+		struct ceph_entity_inst *inst = &amp;monmap-&gt;mon_inst[i];</div><div class='add'>+</div><div class='add'>+		ceph_decode_skip_string(p, end, e_inval);  /* skip mon name */</div><div class='add'>+		inst-&gt;name.type = CEPH_ENTITY_TYPE_MON;</div><div class='add'>+		inst-&gt;name.num = cpu_to_le64(i);</div><div class='add'>+</div><div class='add'>+		if (struct_v &gt;= 6)</div><div class='add'>+			ret = decode_mon_info(p, end, msgr2, &amp;inst-&gt;addr);</div><div class='add'>+		else</div><div class='add'>+			ret = ceph_decode_entity_addr(p, end, &amp;inst-&gt;addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		dout("%s mon%d addr %s\n", __func__, i,</div><div class='add'>+		     ceph_pr_addr(&amp;inst-&gt;addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return monmap;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+fail:</div><div class='add'>+	kfree(monmap);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -92,9 +161,11 @@ int ceph_monmap_contains(struct ceph_monmap *m, struct ceph_entity_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; m-&gt;num_mon; i++)</div><div class='del'>-		if (memcmp(addr, &amp;m-&gt;mon_inst[i].addr, sizeof(*addr)) == 0)</div><div class='add'>+	for (i = 0; i &lt; m-&gt;num_mon; i++) {</div><div class='add'>+		if (ceph_addr_equal_no_type(addr, &amp;m-&gt;mon_inst[i].addr))</div><div class='ctx'> 			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +222,7 @@ static void pick_new_mon(struct ceph_mon_client *monc)</div><div class='ctx'> 				max--;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		n = prandom_u32() % max;</div><div class='add'>+		n = get_random_u32_below(max);</div><div class='ctx'> 		if (o &gt;= 0 &amp;&amp; n &gt;= o)</div><div class='ctx'> 			n++;</div><div class='ctx'> </div><div class='hunk'>@@ -186,10 +257,16 @@ static void __open_session(struct ceph_mon_client *monc)</div><div class='ctx'> 		      &amp;monc-&gt;monmap-&gt;mon_inst[monc-&gt;cur_mon].addr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * send an initial keepalive to ensure our timestamp is valid</div><div class='del'>-	 * by the time we are in an OPENED state</div><div class='add'>+	 * Queue a keepalive to ensure that in case of an early fault</div><div class='add'>+	 * the messenger doesn't put us into STANDBY state and instead</div><div class='add'>+	 * retries.  This also ensures that our timestamp is valid by</div><div class='add'>+	 * the time we finish hunting and delayed_work() checks it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ceph_con_keepalive(&amp;monc-&gt;con);</div><div class='add'>+	if (ceph_msgr2(monc-&gt;client)) {</div><div class='add'>+		monc-&gt;pending_auth = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* initiate authentication handshake */</div><div class='ctx'> 	ret = ceph_auth_build_hello(monc-&gt;auth,</div><div class='hunk'>@@ -203,12 +280,19 @@ static void reopen_session(struct ceph_mon_client *monc)</div><div class='ctx'> {</div><div class='ctx'> 	if (!monc-&gt;hunting)</div><div class='ctx'> 		pr_info("mon%d %s session lost, hunting for new mon\n",</div><div class='del'>-		    monc-&gt;cur_mon, ceph_pr_addr(&amp;monc-&gt;con.peer_addr.in_addr));</div><div class='add'>+		    monc-&gt;cur_mon, ceph_pr_addr(&amp;monc-&gt;con.peer_addr));</div><div class='ctx'> </div><div class='ctx'> 	__close_session(monc);</div><div class='ctx'> 	__open_session(monc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ceph_monc_reopen_session(struct ceph_mon_client *monc)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	reopen_session(monc);</div><div class='add'>+	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void un_backoff(struct ceph_mon_client *monc)</div><div class='ctx'> {</div><div class='ctx'> 	monc-&gt;hunt_mult /= 2; /* reduce by 50% */</div><div class='hunk'>@@ -230,7 +314,7 @@ static void __schedule_delayed(struct ceph_mon_client *monc)</div><div class='ctx'> 		delay = CEPH_MONC_PING_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	dout("__schedule_delayed after %lu\n", delay);</div><div class='del'>-	mod_delayed_work(system_wq, &amp;monc-&gt;delayed_work,</div><div class='add'>+	mod_delayed_work(system_percpu_wq, &amp;monc-&gt;delayed_work,</div><div class='ctx'> 			 round_jiffies_relative(delay));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,7 +540,7 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,</div><div class='ctx'> 				 struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *client = monc-&gt;client;</div><div class='del'>-	struct ceph_monmap *monmap = NULL, *old = monc-&gt;monmap;</div><div class='add'>+	struct ceph_monmap *monmap;</div><div class='ctx'> 	void *p, *end;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;monc-&gt;mutex);</div><div class='hunk'>@@ -465,20 +549,21 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,</div><div class='ctx'> 	p = msg-&gt;front.iov_base;</div><div class='ctx'> 	end = p + msg-&gt;front.iov_len;</div><div class='ctx'> </div><div class='del'>-	monmap = ceph_monmap_decode(p, end);</div><div class='add'>+	monmap = ceph_monmap_decode(&amp;p, end, ceph_msgr2(client));</div><div class='ctx'> 	if (IS_ERR(monmap)) {</div><div class='ctx'> 		pr_err("problem decoding monmap, %d\n",</div><div class='ctx'> 		       (int)PTR_ERR(monmap));</div><div class='add'>+		ceph_msg_dump(msg);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ceph_check_fsid(monc-&gt;client, &amp;monmap-&gt;fsid) &lt; 0) {</div><div class='add'>+	if (ceph_check_fsid(client, &amp;monmap-&gt;fsid) &lt; 0) {</div><div class='ctx'> 		kfree(monmap);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	client-&gt;monc.monmap = monmap;</div><div class='del'>-	kfree(old);</div><div class='add'>+	kfree(monc-&gt;monmap);</div><div class='add'>+	monc-&gt;monmap = monmap;</div><div class='ctx'> </div><div class='ctx'> 	__ceph_monc_got_map(monc, CEPH_SUB_MONMAP, monc-&gt;monmap-&gt;epoch);</div><div class='ctx'> 	client-&gt;have_fsid = true;</div><div class='hunk'>@@ -884,8 +969,9 @@ bad:</div><div class='ctx'> 	ceph_msg_dump(msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_monc_blacklist_add(struct ceph_mon_client *monc,</div><div class='del'>-			    struct ceph_entity_addr *client_addr)</div><div class='add'>+static __printf(2, 0)</div><div class='add'>+int do_mon_command_vargs(struct ceph_mon_client *monc, const char *fmt,</div><div class='add'>+			 va_list ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_mon_generic_request *req;</div><div class='ctx'> 	struct ceph_mon_command *h;</div><div class='hunk'>@@ -913,10 +999,7 @@ int ceph_monc_blacklist_add(struct ceph_mon_client *monc,</div><div class='ctx'> 	h-&gt;monhdr.session_mon_tid = 0;</div><div class='ctx'> 	h-&gt;fsid = monc-&gt;monmap-&gt;fsid;</div><div class='ctx'> 	h-&gt;num_strs = cpu_to_le32(1);</div><div class='del'>-	len = sprintf(h-&gt;str, "{ \"prefix\": \"osd blacklist\", \</div><div class='del'>-		                 \"blacklistop\": \"add\", \</div><div class='del'>-				 \"addr\": \"%pISpc/%u\" }",</div><div class='del'>-		      &amp;client_addr-&gt;in_addr, le32_to_cpu(client_addr-&gt;nonce));</div><div class='add'>+	len = vsprintf(h-&gt;str, fmt, ap);</div><div class='ctx'> 	h-&gt;str_len = cpu_to_le32(len);</div><div class='ctx'> 	send_generic_request(monc, req);</div><div class='ctx'> 	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='hunk'>@@ -926,7 +1009,55 @@ out:</div><div class='ctx'> 	put_generic_request(req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_monc_blacklist_add);</div><div class='add'>+</div><div class='add'>+static __printf(2, 3)</div><div class='add'>+int do_mon_command(struct ceph_mon_client *monc, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list ap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	ret = do_mon_command_vargs(monc, fmt, ap);</div><div class='add'>+	va_end(ap);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_monc_blocklist_add(struct ceph_mon_client *monc,</div><div class='add'>+			    struct ceph_entity_addr *client_addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = do_mon_command(monc,</div><div class='add'>+			     "{ \"prefix\": \"osd blocklist\", \</div><div class='add'>+				\"blocklistop\": \"add\", \</div><div class='add'>+				\"addr\": \"%pISpc/%u\" }",</div><div class='add'>+			     &amp;client_addr-&gt;in_addr,</div><div class='add'>+			     le32_to_cpu(client_addr-&gt;nonce));</div><div class='add'>+	if (ret == -EINVAL) {</div><div class='add'>+		/*</div><div class='add'>+		 * The monitor returns EINVAL on an unrecognized command.</div><div class='add'>+		 * Try the legacy command -- it is exactly the same except</div><div class='add'>+		 * for the name.</div><div class='add'>+		 */</div><div class='add'>+		ret = do_mon_command(monc,</div><div class='add'>+				     "{ \"prefix\": \"osd blacklist\", \</div><div class='add'>+					\"blacklistop\": \"add\", \</div><div class='add'>+					\"addr\": \"%pISpc/%u\" }",</div><div class='add'>+				     &amp;client_addr-&gt;in_addr,</div><div class='add'>+				     le32_to_cpu(client_addr-&gt;nonce));</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we have the osdmap that includes the blocklist</div><div class='add'>+	 * entry.  This is needed to ensure that the OSDs pick up the</div><div class='add'>+	 * new blocklist before processing any future requests from</div><div class='add'>+	 * this client.</div><div class='add'>+	 */</div><div class='add'>+	return ceph_wait_for_latest_osdmap(monc-&gt;client, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_monc_blocklist_add);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Resend pending generic requests.</div><div class='hunk'>@@ -954,13 +1085,19 @@ static void delayed_work(struct work_struct *work)</div><div class='ctx'> 	struct ceph_mon_client *monc =</div><div class='ctx'> 		container_of(work, struct ceph_mon_client, delayed_work.work);</div><div class='ctx'> </div><div class='del'>-	dout("monc delayed_work\n");</div><div class='ctx'> 	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	dout("%s mon%d\n", __func__, monc-&gt;cur_mon);</div><div class='add'>+	if (monc-&gt;cur_mon &lt; 0) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (monc-&gt;hunting) {</div><div class='ctx'> 		dout("%s continuing hunt\n", __func__);</div><div class='ctx'> 		reopen_session(monc);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int is_auth = ceph_auth_is_authenticated(monc-&gt;auth);</div><div class='add'>+</div><div class='add'>+		dout("%s is_authed %d\n", __func__, is_auth);</div><div class='ctx'> 		if (ceph_con_keepalive_expired(&amp;monc-&gt;con,</div><div class='ctx'> 					       CEPH_MONC_PING_TIMEOUT)) {</div><div class='ctx'> 			dout("monc keepalive timeout\n");</div><div class='hunk'>@@ -985,6 +1122,8 @@ static void delayed_work(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	__schedule_delayed(monc);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -994,8 +1133,9 @@ static void delayed_work(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static int build_initial_monmap(struct ceph_mon_client *monc)</div><div class='ctx'> {</div><div class='add'>+	__le32 my_type = ceph_msgr2(monc-&gt;client) ?</div><div class='add'>+		CEPH_ENTITY_ADDR_TYPE_MSGR2 : CEPH_ENTITY_ADDR_TYPE_LEGACY;</div><div class='ctx'> 	struct ceph_options *opt = monc-&gt;client-&gt;options;</div><div class='del'>-	struct ceph_entity_addr *mon_addr = opt-&gt;mon_addr;</div><div class='ctx'> 	int num_mon = opt-&gt;num_mon;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1004,25 +1144,28 @@ static int build_initial_monmap(struct ceph_mon_client *monc)</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!monc-&gt;monmap)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	monc-&gt;monmap-&gt;num_mon = num_mon;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; num_mon; i++) {</div><div class='del'>-		monc-&gt;monmap-&gt;mon_inst[i].addr = mon_addr[i];</div><div class='del'>-		monc-&gt;monmap-&gt;mon_inst[i].addr.nonce = 0;</div><div class='del'>-		monc-&gt;monmap-&gt;mon_inst[i].name.type =</div><div class='del'>-			CEPH_ENTITY_TYPE_MON;</div><div class='del'>-		monc-&gt;monmap-&gt;mon_inst[i].name.num = cpu_to_le64(i);</div><div class='add'>+		struct ceph_entity_inst *inst = &amp;monc-&gt;monmap-&gt;mon_inst[i];</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;inst-&gt;addr.in_addr, &amp;opt-&gt;mon_addr[i].in_addr,</div><div class='add'>+		       sizeof(inst-&gt;addr.in_addr));</div><div class='add'>+		inst-&gt;addr.type = my_type;</div><div class='add'>+		inst-&gt;addr.nonce = 0;</div><div class='add'>+		inst-&gt;name.type = CEPH_ENTITY_TYPE_MON;</div><div class='add'>+		inst-&gt;name.num = cpu_to_le64(i);</div><div class='ctx'> 	}</div><div class='del'>-	monc-&gt;monmap-&gt;num_mon = num_mon;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dout("init\n");</div><div class='ctx'> 	memset(monc, 0, sizeof(*monc));</div><div class='ctx'> 	monc-&gt;client = cl;</div><div class='del'>-	monc-&gt;monmap = NULL;</div><div class='ctx'> 	mutex_init(&amp;monc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	err = build_initial_monmap(monc);</div><div class='hunk'>@@ -1031,8 +1174,8 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)</div><div class='ctx'> </div><div class='ctx'> 	/* connection */</div><div class='ctx'> 	/* authentication */</div><div class='del'>-	monc-&gt;auth = ceph_auth_init(cl-&gt;options-&gt;name,</div><div class='del'>-				    cl-&gt;options-&gt;key);</div><div class='add'>+	monc-&gt;auth = ceph_auth_init(cl-&gt;options-&gt;name, cl-&gt;options-&gt;key,</div><div class='add'>+				    cl-&gt;options-&gt;con_modes);</div><div class='ctx'> 	if (IS_ERR(monc-&gt;auth)) {</div><div class='ctx'> 		err = PTR_ERR(monc-&gt;auth);</div><div class='ctx'> 		goto out_monmap;</div><div class='hunk'>@@ -1097,13 +1240,15 @@ EXPORT_SYMBOL(ceph_monc_init);</div><div class='ctx'> void ceph_monc_stop(struct ceph_mon_client *monc)</div><div class='ctx'> {</div><div class='ctx'> 	dout("stop\n");</div><div class='del'>-	cancel_delayed_work_sync(&amp;monc-&gt;delayed_work);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;monc-&gt;mutex);</div><div class='ctx'> 	__close_session(monc);</div><div class='add'>+	monc-&gt;hunting = false;</div><div class='ctx'> 	monc-&gt;cur_mon = -1;</div><div class='ctx'> 	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	cancel_delayed_work_sync(&amp;monc-&gt;delayed_work);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * flush msgr queue before we destroy ourselves to ensure that:</div><div class='ctx'> 	 *  - any work that references our embedded con is finished.</div><div class='hunk'>@@ -1136,30 +1281,22 @@ static void finish_hunting(struct ceph_mon_client *monc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_auth_reply(struct ceph_mon_client *monc,</div><div class='del'>-			      struct ceph_msg *msg)</div><div class='add'>+static void finish_auth(struct ceph_mon_client *monc, int auth_err,</div><div class='add'>+			bool was_authed)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	int was_auth = 0;</div><div class='add'>+	dout("%s auth_err %d was_authed %d\n", __func__, auth_err, was_authed);</div><div class='add'>+	WARN_ON(auth_err &gt; 0);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;monc-&gt;mutex);</div><div class='del'>-	was_auth = ceph_auth_is_authenticated(monc-&gt;auth);</div><div class='ctx'> 	monc-&gt;pending_auth = 0;</div><div class='del'>-	ret = ceph_handle_auth_reply(monc-&gt;auth, msg-&gt;front.iov_base,</div><div class='del'>-				     msg-&gt;front.iov_len,</div><div class='del'>-				     monc-&gt;m_auth-&gt;front.iov_base,</div><div class='del'>-				     monc-&gt;m_auth-&gt;front_alloc_len);</div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		__send_prepared_auth_request(monc, ret);</div><div class='del'>-		goto out;</div><div class='add'>+	if (auth_err) {</div><div class='add'>+		monc-&gt;client-&gt;auth_err = auth_err;</div><div class='add'>+		wake_up_all(&amp;monc-&gt;client-&gt;auth_wq);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	finish_hunting(monc);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		monc-&gt;client-&gt;auth_err = ret;</div><div class='del'>-	} else if (!was_auth &amp;&amp; ceph_auth_is_authenticated(monc-&gt;auth)) {</div><div class='del'>-		dout("authenticated, starting session\n");</div><div class='add'>+	if (!was_authed &amp;&amp; ceph_auth_is_authenticated(monc-&gt;auth)) {</div><div class='add'>+		dout("%s authenticated, starting session global_id %llu\n",</div><div class='add'>+		     __func__, monc-&gt;auth-&gt;global_id);</div><div class='ctx'> </div><div class='ctx'> 		monc-&gt;client-&gt;msgr.inst.name.type = CEPH_ENTITY_TYPE_CLIENT;</div><div class='ctx'> 		monc-&gt;client-&gt;msgr.inst.name.num =</div><div class='hunk'>@@ -1169,13 +1306,29 @@ static void handle_auth_reply(struct ceph_mon_client *monc,</div><div class='ctx'> 		__resend_generic_request(monc);</div><div class='ctx'> </div><div class='ctx'> 		pr_info("mon%d %s session established\n", monc-&gt;cur_mon,</div><div class='del'>-			ceph_pr_addr(&amp;monc-&gt;con.peer_addr.in_addr));</div><div class='add'>+			ceph_pr_addr(&amp;monc-&gt;con.peer_addr));</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='add'>+static void handle_auth_reply(struct ceph_mon_client *monc,</div><div class='add'>+			      struct ceph_msg *msg)</div><div class='add'>+{</div><div class='add'>+	bool was_authed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	was_authed = ceph_auth_is_authenticated(monc-&gt;auth);</div><div class='add'>+	ret = ceph_handle_auth_reply(monc-&gt;auth, msg-&gt;front.iov_base,</div><div class='add'>+				     msg-&gt;front.iov_len,</div><div class='add'>+				     monc-&gt;m_auth-&gt;front.iov_base,</div><div class='add'>+				     monc-&gt;m_auth-&gt;front_alloc_len);</div><div class='add'>+	if (ret &gt; 0) {</div><div class='add'>+		__send_prepared_auth_request(monc, ret);</div><div class='add'>+	} else {</div><div class='add'>+		finish_auth(monc, ret, was_authed);</div><div class='add'>+		finish_hunting(monc);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='del'>-	if (monc-&gt;client-&gt;auth_err &lt; 0)</div><div class='del'>-		wake_up_all(&amp;monc-&gt;client-&gt;auth_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __validate_auth(struct ceph_mon_client *monc)</div><div class='hunk'>@@ -1204,17 +1357,96 @@ int ceph_monc_validate_auth(struct ceph_mon_client *monc)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_monc_validate_auth);</div><div class='ctx'> </div><div class='add'>+static int mon_get_auth_request(struct ceph_connection *con,</div><div class='add'>+				void *buf, int *buf_len,</div><div class='add'>+				void **authorizer, int *authorizer_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mon_client *monc = con-&gt;private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	ret = ceph_auth_get_request(monc-&gt;auth, buf, *buf_len);</div><div class='add'>+	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*buf_len = ret;</div><div class='add'>+	*authorizer = NULL;</div><div class='add'>+	*authorizer_len = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mon_handle_auth_reply_more(struct ceph_connection *con,</div><div class='add'>+				      void *reply, int reply_len,</div><div class='add'>+				      void *buf, int *buf_len,</div><div class='add'>+				      void **authorizer, int *authorizer_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mon_client *monc = con-&gt;private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	ret = ceph_auth_handle_reply_more(monc-&gt;auth, reply, reply_len,</div><div class='add'>+					  buf, *buf_len);</div><div class='add'>+	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*buf_len = ret;</div><div class='add'>+	*authorizer = NULL;</div><div class='add'>+	*authorizer_len = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mon_handle_auth_done(struct ceph_connection *con,</div><div class='add'>+				u64 global_id, void *reply, int reply_len,</div><div class='add'>+				u8 *session_key, int *session_key_len,</div><div class='add'>+				u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mon_client *monc = con-&gt;private;</div><div class='add'>+	bool was_authed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	WARN_ON(!monc-&gt;hunting);</div><div class='add'>+	was_authed = ceph_auth_is_authenticated(monc-&gt;auth);</div><div class='add'>+	ret = ceph_auth_handle_reply_done(monc-&gt;auth, global_id,</div><div class='add'>+					  reply, reply_len,</div><div class='add'>+					  session_key, session_key_len,</div><div class='add'>+					  con_secret, con_secret_len);</div><div class='add'>+	finish_auth(monc, ret, was_authed);</div><div class='add'>+	if (!ret)</div><div class='add'>+		finish_hunting(monc);</div><div class='add'>+	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mon_handle_auth_bad_method(struct ceph_connection *con,</div><div class='add'>+				      int used_proto, int result,</div><div class='add'>+				      const int *allowed_protos, int proto_cnt,</div><div class='add'>+				      const int *allowed_modes, int mode_cnt)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mon_client *monc = con-&gt;private;</div><div class='add'>+	bool was_authed;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;monc-&gt;mutex);</div><div class='add'>+	WARN_ON(!monc-&gt;hunting);</div><div class='add'>+	was_authed = ceph_auth_is_authenticated(monc-&gt;auth);</div><div class='add'>+	ceph_auth_handle_bad_method(monc-&gt;auth, used_proto, result,</div><div class='add'>+				    allowed_protos, proto_cnt,</div><div class='add'>+				    allowed_modes, mode_cnt);</div><div class='add'>+	finish_auth(monc, -EACCES, was_authed);</div><div class='add'>+	mutex_unlock(&amp;monc-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * handle incoming message</div><div class='ctx'>  */</div><div class='del'>-static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+static void mon_dispatch(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_mon_client *monc = con-&gt;private;</div><div class='ctx'> 	int type = le16_to_cpu(msg-&gt;hdr.type);</div><div class='ctx'> </div><div class='del'>-	if (!monc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case CEPH_MSG_AUTH_REPLY:</div><div class='ctx'> 		handle_auth_reply(monc, msg);</div><div class='hunk'>@@ -1285,11 +1517,11 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,</div><div class='ctx'> 			return get_generic_reply(con, hdr, skip);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Older OSDs don't set reply tid even if the orignal</div><div class='add'>+		 * Older OSDs don't set reply tid even if the original</div><div class='ctx'> 		 * request had a non-zero tid.  Work around this weirdness</div><div class='ctx'> 		 * by allocating a new message.</div><div class='ctx'> 		 */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case CEPH_MSG_MON_MAP:</div><div class='ctx'> 	case CEPH_MSG_MDS_MAP:</div><div class='ctx'> 	case CEPH_MSG_OSD_MAP:</div><div class='hunk'>@@ -1342,19 +1574,23 @@ static void mon_fault(struct ceph_connection *con)</div><div class='ctx'>  * will come from the messenger workqueue, which is drained prior to</div><div class='ctx'>  * mon_client destruction.</div><div class='ctx'>  */</div><div class='del'>-static struct ceph_connection *con_get(struct ceph_connection *con)</div><div class='add'>+static struct ceph_connection *mon_get_con(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	return con;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void con_put(struct ceph_connection *con)</div><div class='add'>+static void mon_put_con(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ceph_connection_operations mon_con_ops = {</div><div class='del'>-	.get = con_get,</div><div class='del'>-	.put = con_put,</div><div class='del'>-	.dispatch = dispatch,</div><div class='del'>-	.fault = mon_fault,</div><div class='add'>+	.get = mon_get_con,</div><div class='add'>+	.put = mon_put_con,</div><div class='ctx'> 	.alloc_msg = mon_alloc_msg,</div><div class='add'>+	.dispatch = mon_dispatch,</div><div class='add'>+	.fault = mon_fault,</div><div class='add'>+	.get_auth_request = mon_get_auth_request,</div><div class='add'>+	.handle_auth_reply_more = mon_handle_auth_reply_more,</div><div class='add'>+	.handle_auth_done = mon_handle_auth_done,</div><div class='add'>+	.handle_auth_bad_method = mon_handle_auth_bad_method,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c<br/>index 72571535883f..e3ecb80cd182 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/msgpool.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/msgpool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/msgpool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/msgpool.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@ static void *msgpool_alloc(gfp_t gfp_mask, void *arg)</div><div class='ctx'> 	struct ceph_msgpool *pool = arg;</div><div class='ctx'> 	struct ceph_msg *msg;</div><div class='ctx'> </div><div class='del'>-	msg = ceph_msg_new(pool-&gt;type, pool-&gt;front_len, gfp_mask, true);</div><div class='add'>+	msg = ceph_msg_new2(pool-&gt;type, pool-&gt;front_len, pool-&gt;max_data_items,</div><div class='add'>+			    gfp_mask, true);</div><div class='ctx'> 	if (!msg) {</div><div class='ctx'> 		dout("msgpool_alloc %s failed\n", pool-&gt;name);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -35,11 +36,13 @@ static void msgpool_free(void *element, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ceph_msgpool_init(struct ceph_msgpool *pool, int type,</div><div class='del'>-		      int front_len, int size, bool blocking, const char *name)</div><div class='add'>+		      int front_len, int max_data_items, int size,</div><div class='add'>+		      const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	dout("msgpool %s init\n", name);</div><div class='ctx'> 	pool-&gt;type = type;</div><div class='ctx'> 	pool-&gt;front_len = front_len;</div><div class='add'>+	pool-&gt;max_data_items = max_data_items;</div><div class='ctx'> 	pool-&gt;pool = mempool_create(size, msgpool_alloc, msgpool_free, pool);</div><div class='ctx'> 	if (!pool-&gt;pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -53,18 +56,21 @@ void ceph_msgpool_destroy(struct ceph_msgpool *pool)</div><div class='ctx'> 	mempool_destroy(pool-&gt;pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool,</div><div class='del'>-				  int front_len)</div><div class='add'>+struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, int front_len,</div><div class='add'>+				  int max_data_items)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg *msg;</div><div class='ctx'> </div><div class='del'>-	if (front_len &gt; pool-&gt;front_len) {</div><div class='del'>-		dout("msgpool_get %s need front %d, pool size is %d\n",</div><div class='del'>-		       pool-&gt;name, front_len, pool-&gt;front_len);</div><div class='del'>-		WARN_ON(1);</div><div class='add'>+	if (front_len &gt; pool-&gt;front_len ||</div><div class='add'>+	    max_data_items &gt; pool-&gt;max_data_items) {</div><div class='add'>+		pr_warn_ratelimited("%s need %d/%d, pool %s has %d/%d\n",</div><div class='add'>+		    __func__, front_len, max_data_items, pool-&gt;name,</div><div class='add'>+		    pool-&gt;front_len, pool-&gt;max_data_items);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> </div><div class='ctx'> 		/* try to alloc a fresh message */</div><div class='del'>-		return ceph_msg_new(pool-&gt;type, front_len, GFP_NOFS, false);</div><div class='add'>+		return ceph_msg_new2(pool-&gt;type, front_len, max_data_items,</div><div class='add'>+				     GFP_NOFS, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msg = mempool_alloc(pool-&gt;pool, GFP_NOFS);</div><div class='hunk'>@@ -80,6 +86,9 @@ void ceph_msgpool_put(struct ceph_msgpool *pool, struct ceph_msg *msg)</div><div class='ctx'> 	msg-&gt;front.iov_len = pool-&gt;front_len;</div><div class='ctx'> 	msg-&gt;hdr.front_len = cpu_to_le32(pool-&gt;front_len);</div><div class='ctx'> </div><div class='add'>+	msg-&gt;data_length = 0;</div><div class='add'>+	msg-&gt;num_data_items = 0;</div><div class='add'>+</div><div class='ctx'> 	kref_init(&amp;msg-&gt;kref);  /* retake single ref */</div><div class='ctx'> 	mempool_free(msg, pool-&gt;pool);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c<br/>index 60934bd8796c..6664ea73ccf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/osd_client.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/osd_client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/osd_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/osd_client.c</a></div><div class='hunk'>@@ -126,6 +126,9 @@ static void ceph_osd_data_init(struct ceph_osd_data *osd_data)</div><div class='ctx'> 	osd_data-&gt;type = CEPH_OSD_DATA_TYPE_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Consumes @pages if @own_pages is true.</div><div class='add'>+ */</div><div class='ctx'> static void ceph_osd_data_pages_init(struct ceph_osd_data *osd_data,</div><div class='ctx'> 			struct page **pages, u64 length, u32 alignment,</div><div class='ctx'> 			bool pages_from_pool, bool own_pages)</div><div class='hunk'>@@ -138,6 +141,9 @@ static void ceph_osd_data_pages_init(struct ceph_osd_data *osd_data,</div><div class='ctx'> 	osd_data-&gt;own_pages = own_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Consumes a ref on @pagelist.</div><div class='add'>+ */</div><div class='ctx'> static void ceph_osd_data_pagelist_init(struct ceph_osd_data *osd_data,</div><div class='ctx'> 			struct ceph_pagelist *pagelist)</div><div class='ctx'> {</div><div class='hunk'>@@ -165,13 +171,12 @@ static void ceph_osd_data_bvecs_init(struct ceph_osd_data *osd_data,</div><div class='ctx'> 	osd_data-&gt;num_bvecs = num_bvecs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define osd_req_op_data(oreq, whch, typ, fld)				\</div><div class='del'>-({									\</div><div class='del'>-	struct ceph_osd_request *__oreq = (oreq);			\</div><div class='del'>-	unsigned int __whch = (whch);					\</div><div class='del'>-	BUG_ON(__whch &gt;= __oreq-&gt;r_num_ops);				\</div><div class='del'>-	&amp;__oreq-&gt;r_ops[__whch].typ.fld;					\</div><div class='del'>-})</div><div class='add'>+static void ceph_osd_iter_init(struct ceph_osd_data *osd_data,</div><div class='add'>+			       struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	osd_data-&gt;type = CEPH_OSD_DATA_TYPE_ITER;</div><div class='add'>+	osd_data-&gt;iter = *iter;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct ceph_osd_data *</div><div class='ctx'> osd_req_op_raw_data_in(struct ceph_osd_request *osd_req, unsigned int which)</div><div class='hunk'>@@ -215,16 +220,6 @@ void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *osd_req,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_extent_osd_data_pages);</div><div class='ctx'> </div><div class='del'>-void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *osd_req,</div><div class='del'>-			unsigned int which, struct ceph_pagelist *pagelist)</div><div class='del'>-{</div><div class='del'>-	struct ceph_osd_data *osd_data;</div><div class='del'>-</div><div class='del'>-	osd_data = osd_req_op_data(osd_req, which, extent, osd_data);</div><div class='del'>-	ceph_osd_data_pagelist_init(osd_data, pagelist);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(osd_req_op_extent_osd_data_pagelist);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,</div><div class='ctx'> 				    unsigned int which,</div><div class='hunk'>@@ -266,28 +261,31 @@ void osd_req_op_extent_osd_data_bvec_pos(struct ceph_osd_request *osd_req,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_extent_osd_data_bvec_pos);</div><div class='ctx'> </div><div class='del'>-static void osd_req_op_cls_request_info_pagelist(</div><div class='del'>-			struct ceph_osd_request *osd_req,</div><div class='del'>-			unsigned int which, struct ceph_pagelist *pagelist)</div><div class='add'>+/**</div><div class='add'>+ * osd_req_op_extent_osd_iter - Set up an operation with an iterator buffer</div><div class='add'>+ * @osd_req: The request to set up</div><div class='add'>+ * @which: Index of the operation in which to set the iter</div><div class='add'>+ * @iter: The buffer iterator</div><div class='add'>+ */</div><div class='add'>+void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,</div><div class='add'>+				unsigned int which, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_data *osd_data;</div><div class='ctx'> </div><div class='del'>-	osd_data = osd_req_op_data(osd_req, which, cls, request_info);</div><div class='del'>-	ceph_osd_data_pagelist_init(osd_data, pagelist);</div><div class='add'>+	osd_data = osd_req_op_data(osd_req, which, extent, osd_data);</div><div class='add'>+	ceph_osd_iter_init(osd_data, iter);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(osd_req_op_extent_osd_iter);</div><div class='ctx'> </div><div class='del'>-void osd_req_op_cls_request_data_pagelist(</div><div class='add'>+static void osd_req_op_cls_request_info_pagelist(</div><div class='ctx'> 			struct ceph_osd_request *osd_req,</div><div class='ctx'> 			unsigned int which, struct ceph_pagelist *pagelist)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_data *osd_data;</div><div class='ctx'> </div><div class='del'>-	osd_data = osd_req_op_data(osd_req, which, cls, request_data);</div><div class='add'>+	osd_data = osd_req_op_data(osd_req, which, cls, request_info);</div><div class='ctx'> 	ceph_osd_data_pagelist_init(osd_data, pagelist);</div><div class='del'>-	osd_req-&gt;r_ops[which].cls.indata_len += pagelist-&gt;length;</div><div class='del'>-	osd_req-&gt;r_ops[which].indata_len += pagelist-&gt;length;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(osd_req_op_cls_request_data_pagelist);</div><div class='ctx'> </div><div class='ctx'> void osd_req_op_cls_request_data_pages(struct ceph_osd_request *osd_req,</div><div class='ctx'> 			unsigned int which, struct page **pages, u64 length,</div><div class='hunk'>@@ -348,6 +346,8 @@ static u64 ceph_osd_data_length(struct ceph_osd_data *osd_data)</div><div class='ctx'> #endif /* CONFIG_BLOCK */</div><div class='ctx'> 	case CEPH_OSD_DATA_TYPE_BVECS:</div><div class='ctx'> 		return osd_data-&gt;bvec_pos.iter.bi_size;</div><div class='add'>+	case CEPH_OSD_DATA_TYPE_ITER:</div><div class='add'>+		return iov_iter_count(&amp;osd_data-&gt;iter);</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN(true, "unrecognized data type %d\n", (int)osd_data-&gt;type);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -362,6 +362,8 @@ static void ceph_osd_data_release(struct ceph_osd_data *osd_data)</div><div class='ctx'> 		num_pages = calc_pages_for((u64)osd_data-&gt;alignment,</div><div class='ctx'> 						(u64)osd_data-&gt;length);</div><div class='ctx'> 		ceph_release_page_vector(osd_data-&gt;pages, num_pages);</div><div class='add'>+	} else if (osd_data-&gt;type == CEPH_OSD_DATA_TYPE_PAGELIST) {</div><div class='add'>+		ceph_pagelist_release(osd_data-&gt;pagelist);</div><div class='ctx'> 	}</div><div class='ctx'> 	ceph_osd_data_init(osd_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -376,8 +378,10 @@ static void osd_req_op_data_release(struct ceph_osd_request *osd_req,</div><div class='ctx'> </div><div class='ctx'> 	switch (op-&gt;op) {</div><div class='ctx'> 	case CEPH_OSD_OP_READ:</div><div class='add'>+	case CEPH_OSD_OP_SPARSE_READ:</div><div class='ctx'> 	case CEPH_OSD_OP_WRITE:</div><div class='ctx'> 	case CEPH_OSD_OP_WRITEFULL:</div><div class='add'>+		kfree(op-&gt;extent.sparse_ext);</div><div class='ctx'> 		ceph_osd_data_release(&amp;op-&gt;extent.osd_data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CEPH_OSD_OP_CALL:</div><div class='hunk'>@@ -402,6 +406,9 @@ static void osd_req_op_data_release(struct ceph_osd_request *osd_req,</div><div class='ctx'> 	case CEPH_OSD_OP_LIST_WATCHERS:</div><div class='ctx'> 		ceph_osd_data_release(&amp;op-&gt;list_watchers.response_data);</div><div class='ctx'> 		break;</div><div class='add'>+	case CEPH_OSD_OP_COPY_FROM2:</div><div class='add'>+		ceph_osd_data_release(&amp;op-&gt;copy_from.osd_data);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -442,8 +449,10 @@ static void target_copy(struct ceph_osd_request_target *dest,</div><div class='ctx'> 	dest-&gt;size = src-&gt;size;</div><div class='ctx'> 	dest-&gt;min_size = src-&gt;min_size;</div><div class='ctx'> 	dest-&gt;sort_bitwise = src-&gt;sort_bitwise;</div><div class='add'>+	dest-&gt;recovery_deletes = src-&gt;recovery_deletes;</div><div class='ctx'> </div><div class='ctx'> 	dest-&gt;flags = src-&gt;flags;</div><div class='add'>+	dest-&gt;used_replica = src-&gt;used_replica;</div><div class='ctx'> 	dest-&gt;paused = src-&gt;paused;</div><div class='ctx'> </div><div class='ctx'> 	dest-&gt;epoch = src-&gt;epoch;</div><div class='hunk'>@@ -467,7 +476,7 @@ static void request_release_checks(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!RB_EMPTY_NODE(&amp;req-&gt;r_node));</div><div class='ctx'> 	WARN_ON(!RB_EMPTY_NODE(&amp;req-&gt;r_mc_node));</div><div class='del'>-	WARN_ON(!list_empty(&amp;req-&gt;r_unsafe_item));</div><div class='add'>+	WARN_ON(!list_empty(&amp;req-&gt;r_private_item));</div><div class='ctx'> 	WARN_ON(req-&gt;r_osd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -520,55 +529,18 @@ EXPORT_SYMBOL(ceph_osdc_put_request);</div><div class='ctx'> </div><div class='ctx'> static void request_init(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='del'>-	/* req only, each op is zeroed in _osd_req_op_init() */</div><div class='add'>+	/* req only, each op is zeroed in osd_req_op_init() */</div><div class='ctx'> 	memset(req, 0, sizeof(*req));</div><div class='ctx'> </div><div class='ctx'> 	kref_init(&amp;req-&gt;r_kref);</div><div class='ctx'> 	init_completion(&amp;req-&gt;r_completion);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;req-&gt;r_node);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;req-&gt;r_mc_node);</div><div class='del'>-	INIT_LIST_HEAD(&amp;req-&gt;r_unsafe_item);</div><div class='add'>+	INIT_LIST_HEAD(&amp;req-&gt;r_private_item);</div><div class='ctx'> </div><div class='ctx'> 	target_init(&amp;req-&gt;r_t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is ugly, but it allows us to reuse linger registration and ping</div><div class='del'>- * requests, keeping the structure of the code around send_linger{_ping}()</div><div class='del'>- * reasonable.  Setting up a min_nr=2 mempool for each linger request</div><div class='del'>- * and dealing with copying ops (this blasts req only, watch op remains</div><div class='del'>- * intact) isn't any better.</div><div class='del'>- */</div><div class='del'>-static void request_reinit(struct ceph_osd_request *req)</div><div class='del'>-{</div><div class='del'>-	struct ceph_osd_client *osdc = req-&gt;r_osdc;</div><div class='del'>-	bool mempool = req-&gt;r_mempool;</div><div class='del'>-	unsigned int num_ops = req-&gt;r_num_ops;</div><div class='del'>-	u64 snapid = req-&gt;r_snapid;</div><div class='del'>-	struct ceph_snap_context *snapc = req-&gt;r_snapc;</div><div class='del'>-	bool linger = req-&gt;r_linger;</div><div class='del'>-	struct ceph_msg *request_msg = req-&gt;r_request;</div><div class='del'>-	struct ceph_msg *reply_msg = req-&gt;r_reply;</div><div class='del'>-</div><div class='del'>-	dout("%s req %p\n", __func__, req);</div><div class='del'>-	WARN_ON(kref_read(&amp;req-&gt;r_kref) != 1);</div><div class='del'>-	request_release_checks(req);</div><div class='del'>-</div><div class='del'>-	WARN_ON(kref_read(&amp;request_msg-&gt;kref) != 1);</div><div class='del'>-	WARN_ON(kref_read(&amp;reply_msg-&gt;kref) != 1);</div><div class='del'>-	target_destroy(&amp;req-&gt;r_t);</div><div class='del'>-</div><div class='del'>-	request_init(req);</div><div class='del'>-	req-&gt;r_osdc = osdc;</div><div class='del'>-	req-&gt;r_mempool = mempool;</div><div class='del'>-	req-&gt;r_num_ops = num_ops;</div><div class='del'>-	req-&gt;r_snapid = snapid;</div><div class='del'>-	req-&gt;r_snapc = snapc;</div><div class='del'>-	req-&gt;r_linger = linger;</div><div class='del'>-	req-&gt;r_request = request_msg;</div><div class='del'>-	req-&gt;r_reply = reply_msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,</div><div class='ctx'> 					       struct ceph_snap_context *snapc,</div><div class='ctx'> 					       unsigned int num_ops,</div><div class='hunk'>@@ -606,12 +578,15 @@ static int ceph_oloc_encoding_size(const struct ceph_object_locator *oloc)</div><div class='ctx'> 	return 8 + 4 + 4 + 4 + (oloc-&gt;pool_ns ? oloc-&gt;pool_ns-&gt;len : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp)</div><div class='add'>+static int __ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp,</div><div class='add'>+				      int num_request_data_items,</div><div class='add'>+				      int num_reply_data_items)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_client *osdc = req-&gt;r_osdc;</div><div class='ctx'> 	struct ceph_msg *msg;</div><div class='ctx'> 	int msg_size;</div><div class='ctx'> </div><div class='add'>+	WARN_ON(req-&gt;r_request || req-&gt;r_reply);</div><div class='ctx'> 	WARN_ON(ceph_oid_empty(&amp;req-&gt;r_base_oid));</div><div class='ctx'> 	WARN_ON(ceph_oloc_empty(&amp;req-&gt;r_base_oloc));</div><div class='ctx'> </div><div class='hunk'>@@ -633,9 +608,11 @@ int ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp)</div><div class='ctx'> 	msg_size += 4 + 8; /* retry_attempt, features */</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;r_mempool)</div><div class='del'>-		msg = ceph_msgpool_get(&amp;osdc-&gt;msgpool_op, 0);</div><div class='add'>+		msg = ceph_msgpool_get(&amp;osdc-&gt;msgpool_op, msg_size,</div><div class='add'>+				       num_request_data_items);</div><div class='ctx'> 	else</div><div class='del'>-		msg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size, gfp, true);</div><div class='add'>+		msg = ceph_msg_new2(CEPH_MSG_OSD_OP, msg_size,</div><div class='add'>+				    num_request_data_items, gfp, true);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -648,9 +625,11 @@ int ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp)</div><div class='ctx'> 	msg_size += req-&gt;r_num_ops * sizeof(struct ceph_osd_op);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;r_mempool)</div><div class='del'>-		msg = ceph_msgpool_get(&amp;osdc-&gt;msgpool_op_reply, 0);</div><div class='add'>+		msg = ceph_msgpool_get(&amp;osdc-&gt;msgpool_op_reply, msg_size,</div><div class='add'>+				       num_reply_data_items);</div><div class='ctx'> 	else</div><div class='del'>-		msg = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, msg_size, gfp, true);</div><div class='add'>+		msg = ceph_msg_new2(CEPH_MSG_OSD_OPREPLY, msg_size,</div><div class='add'>+				    num_reply_data_items, gfp, true);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -658,7 +637,6 @@ int ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_osdc_alloc_messages);</div><div class='ctx'> </div><div class='ctx'> static bool osd_req_opcode_valid(u16 opcode)</div><div class='ctx'> {</div><div class='hunk'>@@ -671,13 +649,73 @@ __CEPH_FORALL_OSD_OPS(GENERATE_CASE)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void get_num_data_items(struct ceph_osd_request *req,</div><div class='add'>+			       int *num_request_data_items,</div><div class='add'>+			       int *num_reply_data_items)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='add'>+</div><div class='add'>+	*num_request_data_items = 0;</div><div class='add'>+	*num_reply_data_items = 0;</div><div class='add'>+</div><div class='add'>+	for (op = req-&gt;r_ops; op != &amp;req-&gt;r_ops[req-&gt;r_num_ops]; op++) {</div><div class='add'>+		switch (op-&gt;op) {</div><div class='add'>+		/* request */</div><div class='add'>+		case CEPH_OSD_OP_WRITE:</div><div class='add'>+		case CEPH_OSD_OP_WRITEFULL:</div><div class='add'>+		case CEPH_OSD_OP_SETXATTR:</div><div class='add'>+		case CEPH_OSD_OP_CMPXATTR:</div><div class='add'>+		case CEPH_OSD_OP_NOTIFY_ACK:</div><div class='add'>+		case CEPH_OSD_OP_COPY_FROM2:</div><div class='add'>+			*num_request_data_items += 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* reply */</div><div class='add'>+		case CEPH_OSD_OP_STAT:</div><div class='add'>+		case CEPH_OSD_OP_READ:</div><div class='add'>+		case CEPH_OSD_OP_SPARSE_READ:</div><div class='add'>+		case CEPH_OSD_OP_LIST_WATCHERS:</div><div class='add'>+			*num_reply_data_items += 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* both */</div><div class='add'>+		case CEPH_OSD_OP_NOTIFY:</div><div class='add'>+			*num_request_data_items += 1;</div><div class='add'>+			*num_reply_data_items += 1;</div><div class='add'>+			break;</div><div class='add'>+		case CEPH_OSD_OP_CALL:</div><div class='add'>+			*num_request_data_items += 2;</div><div class='add'>+			*num_reply_data_items += 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON(!osd_req_opcode_valid(op-&gt;op));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * oid, oloc and OSD op opcode(s) must be filled in before this function</div><div class='add'>+ * is called.</div><div class='add'>+ */</div><div class='add'>+int ceph_osdc_alloc_messages(struct ceph_osd_request *req, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	int num_request_data_items, num_reply_data_items;</div><div class='add'>+</div><div class='add'>+	get_num_data_items(req, &amp;num_request_data_items, &amp;num_reply_data_items);</div><div class='add'>+	return __ceph_osdc_alloc_messages(req, gfp, num_request_data_items,</div><div class='add'>+					  num_reply_data_items);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_osdc_alloc_messages);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is an osd op init function for opcodes that have no data or</div><div class='ctx'>  * other information associated with them.  It also serves as a</div><div class='ctx'>  * common init routine for all the other init functions, below.</div><div class='ctx'>  */</div><div class='del'>-static struct ceph_osd_req_op *</div><div class='del'>-_osd_req_op_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='add'>+struct ceph_osd_req_op *</div><div class='add'>+osd_req_op_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='ctx'> 		 u16 opcode, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_req_op *op;</div><div class='hunk'>@@ -692,12 +730,6 @@ _osd_req_op_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='ctx'> </div><div class='ctx'> 	return op;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void osd_req_op_init(struct ceph_osd_request *osd_req,</div><div class='del'>-		     unsigned int which, u16 opcode, u32 flags)</div><div class='del'>-{</div><div class='del'>-	(void)_osd_req_op_init(osd_req, which, opcode, flags);</div><div class='del'>-}</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_init);</div><div class='ctx'> </div><div class='ctx'> void osd_req_op_extent_init(struct ceph_osd_request *osd_req,</div><div class='hunk'>@@ -705,13 +737,13 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req,</div><div class='ctx'> 				u64 offset, u64 length,</div><div class='ctx'> 				u64 truncate_size, u32 truncate_seq)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which,</div><div class='del'>-						      opcode, 0);</div><div class='add'>+	struct ceph_osd_req_op *op = osd_req_op_init(osd_req, which,</div><div class='add'>+						     opcode, 0);</div><div class='ctx'> 	size_t payload_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(opcode != CEPH_OSD_OP_READ &amp;&amp; opcode != CEPH_OSD_OP_WRITE &amp;&amp;</div><div class='ctx'> 	       opcode != CEPH_OSD_OP_WRITEFULL &amp;&amp; opcode != CEPH_OSD_OP_ZERO &amp;&amp;</div><div class='del'>-	       opcode != CEPH_OSD_OP_TRUNCATE);</div><div class='add'>+	       opcode != CEPH_OSD_OP_TRUNCATE &amp;&amp; opcode != CEPH_OSD_OP_SPARSE_READ);</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;extent.offset = offset;</div><div class='ctx'> 	op-&gt;extent.length = length;</div><div class='hunk'>@@ -752,7 +784,7 @@ void osd_req_op_extent_dup_last(struct ceph_osd_request *osd_req,</div><div class='ctx'> 	BUG_ON(which + 1 &gt;= osd_req-&gt;r_num_ops);</div><div class='ctx'> </div><div class='ctx'> 	prev_op = &amp;osd_req-&gt;r_ops[which];</div><div class='del'>-	op = _osd_req_op_init(osd_req, which + 1, prev_op-&gt;op, prev_op-&gt;flags);</div><div class='add'>+	op = osd_req_op_init(osd_req, which + 1, prev_op-&gt;op, prev_op-&gt;flags);</div><div class='ctx'> 	/* dup previous one */</div><div class='ctx'> 	op-&gt;indata_len = prev_op-&gt;indata_len;</div><div class='ctx'> 	op-&gt;outdata_len = prev_op-&gt;outdata_len;</div><div class='hunk'>@@ -767,40 +799,45 @@ void osd_req_op_extent_dup_last(struct ceph_osd_request *osd_req,</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_extent_dup_last);</div><div class='ctx'> </div><div class='ctx'> int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='del'>-			u16 opcode, const char *class, const char *method)</div><div class='add'>+			const char *class, const char *method)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which,</div><div class='del'>-						      opcode, 0);</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='ctx'> 	struct ceph_pagelist *pagelist;</div><div class='ctx'> 	size_t payload_len = 0;</div><div class='ctx'> 	size_t size;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(opcode != CEPH_OSD_OP_CALL);</div><div class='add'>+	op = osd_req_op_init(osd_req, which, CEPH_OSD_OP_CALL, 0);</div><div class='ctx'> </div><div class='del'>-	pagelist = kmalloc(sizeof (*pagelist), GFP_NOFS);</div><div class='add'>+	pagelist = ceph_pagelist_alloc(GFP_NOFS);</div><div class='ctx'> 	if (!pagelist)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ceph_pagelist_init(pagelist);</div><div class='del'>-</div><div class='ctx'> 	op-&gt;cls.class_name = class;</div><div class='ctx'> 	size = strlen(class);</div><div class='ctx'> 	BUG_ON(size &gt; (size_t) U8_MAX);</div><div class='ctx'> 	op-&gt;cls.class_len = size;</div><div class='del'>-	ceph_pagelist_append(pagelist, class, size);</div><div class='add'>+	ret = ceph_pagelist_append(pagelist, class, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pagelist_free;</div><div class='ctx'> 	payload_len += size;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;cls.method_name = method;</div><div class='ctx'> 	size = strlen(method);</div><div class='ctx'> 	BUG_ON(size &gt; (size_t) U8_MAX);</div><div class='ctx'> 	op-&gt;cls.method_len = size;</div><div class='del'>-	ceph_pagelist_append(pagelist, method, size);</div><div class='add'>+	ret = ceph_pagelist_append(pagelist, method, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pagelist_free;</div><div class='ctx'> 	payload_len += size;</div><div class='ctx'> </div><div class='ctx'> 	osd_req_op_cls_request_info_pagelist(osd_req, which, pagelist);</div><div class='del'>-</div><div class='ctx'> 	op-&gt;indata_len = payload_len;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_pagelist_free:</div><div class='add'>+	ceph_pagelist_release(pagelist);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_cls_init);</div><div class='ctx'> </div><div class='hunk'>@@ -808,25 +845,28 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='ctx'> 			  u16 opcode, const char *name, const void *value,</div><div class='ctx'> 			  size_t size, u8 cmp_op, u8 cmp_mode)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which,</div><div class='del'>-						      opcode, 0);</div><div class='add'>+	struct ceph_osd_req_op *op = osd_req_op_init(osd_req, which,</div><div class='add'>+						     opcode, 0);</div><div class='ctx'> 	struct ceph_pagelist *pagelist;</div><div class='ctx'> 	size_t payload_len;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(opcode != CEPH_OSD_OP_SETXATTR &amp;&amp; opcode != CEPH_OSD_OP_CMPXATTR);</div><div class='ctx'> </div><div class='del'>-	pagelist = kmalloc(sizeof(*pagelist), GFP_NOFS);</div><div class='add'>+	pagelist = ceph_pagelist_alloc(GFP_NOFS);</div><div class='ctx'> 	if (!pagelist)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ceph_pagelist_init(pagelist);</div><div class='del'>-</div><div class='ctx'> 	payload_len = strlen(name);</div><div class='ctx'> 	op-&gt;xattr.name_len = payload_len;</div><div class='del'>-	ceph_pagelist_append(pagelist, name, payload_len);</div><div class='add'>+	ret = ceph_pagelist_append(pagelist, name, payload_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pagelist_free;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;xattr.value_len = size;</div><div class='del'>-	ceph_pagelist_append(pagelist, value, size);</div><div class='add'>+	ret = ceph_pagelist_append(pagelist, value, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pagelist_free;</div><div class='ctx'> 	payload_len += size;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;xattr.cmp_op = cmp_op;</div><div class='hunk'>@@ -835,6 +875,10 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,</div><div class='ctx'> 	ceph_osd_data_pagelist_init(&amp;op-&gt;xattr.osd_data, pagelist);</div><div class='ctx'> 	op-&gt;indata_len = payload_len;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_pagelist_free:</div><div class='add'>+	ceph_pagelist_release(pagelist);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(osd_req_op_xattr_init);</div><div class='ctx'> </div><div class='hunk'>@@ -842,27 +886,47 @@ EXPORT_SYMBOL(osd_req_op_xattr_init);</div><div class='ctx'>  * @watch_opcode: CEPH_OSD_WATCH_OP_*</div><div class='ctx'>  */</div><div class='ctx'> static void osd_req_op_watch_init(struct ceph_osd_request *req, int which,</div><div class='del'>-				  u64 cookie, u8 watch_opcode)</div><div class='add'>+				  u8 watch_opcode, u64 cookie, u32 gen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_req_op *op;</div><div class='ctx'> </div><div class='del'>-	op = _osd_req_op_init(req, which, CEPH_OSD_OP_WATCH, 0);</div><div class='add'>+	op = osd_req_op_init(req, which, CEPH_OSD_OP_WATCH, 0);</div><div class='ctx'> 	op-&gt;watch.cookie = cookie;</div><div class='ctx'> 	op-&gt;watch.op = watch_opcode;</div><div class='del'>-	op-&gt;watch.gen = 0;</div><div class='add'>+	op-&gt;watch.gen = gen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * prot_ver, timeout and notify payload (may be empty) should already be</div><div class='add'>+ * encoded in @request_pl</div><div class='add'>+ */</div><div class='add'>+static void osd_req_op_notify_init(struct ceph_osd_request *req, int which,</div><div class='add'>+				   u64 cookie, struct ceph_pagelist *request_pl)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='add'>+</div><div class='add'>+	op = osd_req_op_init(req, which, CEPH_OSD_OP_NOTIFY, 0);</div><div class='add'>+	op-&gt;notify.cookie = cookie;</div><div class='add'>+</div><div class='add'>+	ceph_osd_data_pagelist_init(&amp;op-&gt;notify.request_data, request_pl);</div><div class='add'>+	op-&gt;indata_len = request_pl-&gt;length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @flags: CEPH_OSD_OP_ALLOC_HINT_FLAG_*</div><div class='add'>+ */</div><div class='ctx'> void osd_req_op_alloc_hint_init(struct ceph_osd_request *osd_req,</div><div class='ctx'> 				unsigned int which,</div><div class='ctx'> 				u64 expected_object_size,</div><div class='del'>-				u64 expected_write_size)</div><div class='add'>+				u64 expected_write_size,</div><div class='add'>+				u32 flags)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which,</div><div class='del'>-						      CEPH_OSD_OP_SETALLOCHINT,</div><div class='del'>-						      0);</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='ctx'> </div><div class='add'>+	op = osd_req_op_init(osd_req, which, CEPH_OSD_OP_SETALLOCHINT, 0);</div><div class='ctx'> 	op-&gt;alloc_hint.expected_object_size = expected_object_size;</div><div class='ctx'> 	op-&gt;alloc_hint.expected_write_size = expected_write_size;</div><div class='add'>+	op-&gt;alloc_hint.flags = flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CEPH_OSD_OP_SETALLOCHINT op is advisory and therefore deemed</div><div class='hunk'>@@ -882,7 +946,7 @@ static void ceph_osdc_msg_data_add(struct ceph_msg *msg,</div><div class='ctx'> 		BUG_ON(length &gt; (u64) SIZE_MAX);</div><div class='ctx'> 		if (length)</div><div class='ctx'> 			ceph_msg_data_add_pages(msg, osd_data-&gt;pages,</div><div class='del'>-					length, osd_data-&gt;alignment);</div><div class='add'>+					length, osd_data-&gt;alignment, false);</div><div class='ctx'> 	} else if (osd_data-&gt;type == CEPH_OSD_DATA_TYPE_PAGELIST) {</div><div class='ctx'> 		BUG_ON(!length);</div><div class='ctx'> 		ceph_msg_data_add_pagelist(msg, osd_data-&gt;pagelist);</div><div class='hunk'>@@ -892,6 +956,8 @@ static void ceph_osdc_msg_data_add(struct ceph_msg *msg,</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (osd_data-&gt;type == CEPH_OSD_DATA_TYPE_BVECS) {</div><div class='ctx'> 		ceph_msg_data_add_bvecs(msg, &amp;osd_data-&gt;bvec_pos);</div><div class='add'>+	} else if (osd_data-&gt;type == CEPH_OSD_DATA_TYPE_ITER) {</div><div class='add'>+		ceph_msg_data_add_iter(msg, &amp;osd_data-&gt;iter);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		BUG_ON(osd_data-&gt;type != CEPH_OSD_DATA_TYPE_NONE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -900,16 +966,11 @@ static void ceph_osdc_msg_data_add(struct ceph_msg *msg,</div><div class='ctx'> static u32 osd_req_encode_op(struct ceph_osd_op *dst,</div><div class='ctx'> 			     const struct ceph_osd_req_op *src)</div><div class='ctx'> {</div><div class='del'>-	if (WARN_ON(!osd_req_opcode_valid(src-&gt;op))) {</div><div class='del'>-		pr_err("unrecognized osd opcode %d\n", src-&gt;op);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	switch (src-&gt;op) {</div><div class='ctx'> 	case CEPH_OSD_OP_STAT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CEPH_OSD_OP_READ:</div><div class='add'>+	case CEPH_OSD_OP_SPARSE_READ:</div><div class='ctx'> 	case CEPH_OSD_OP_WRITE:</div><div class='ctx'> 	case CEPH_OSD_OP_WRITEFULL:</div><div class='ctx'> 	case CEPH_OSD_OP_ZERO:</div><div class='hunk'>@@ -944,6 +1005,7 @@ static u32 osd_req_encode_op(struct ceph_osd_op *dst,</div><div class='ctx'> 		    cpu_to_le64(src-&gt;alloc_hint.expected_object_size);</div><div class='ctx'> 		dst-&gt;alloc_hint.expected_write_size =</div><div class='ctx'> 		    cpu_to_le64(src-&gt;alloc_hint.expected_write_size);</div><div class='add'>+		dst-&gt;alloc_hint.flags = cpu_to_le32(src-&gt;alloc_hint.flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CEPH_OSD_OP_SETXATTR:</div><div class='ctx'> 	case CEPH_OSD_OP_CMPXATTR:</div><div class='hunk'>@@ -955,6 +1017,18 @@ static u32 osd_req_encode_op(struct ceph_osd_op *dst,</div><div class='ctx'> 	case CEPH_OSD_OP_CREATE:</div><div class='ctx'> 	case CEPH_OSD_OP_DELETE:</div><div class='ctx'> 		break;</div><div class='add'>+	case CEPH_OSD_OP_COPY_FROM2:</div><div class='add'>+		dst-&gt;copy_from.snapid = cpu_to_le64(src-&gt;copy_from.snapid);</div><div class='add'>+		dst-&gt;copy_from.src_version =</div><div class='add'>+			cpu_to_le64(src-&gt;copy_from.src_version);</div><div class='add'>+		dst-&gt;copy_from.flags = src-&gt;copy_from.flags;</div><div class='add'>+		dst-&gt;copy_from.src_fadvise_flags =</div><div class='add'>+			cpu_to_le32(src-&gt;copy_from.src_fadvise_flags);</div><div class='add'>+		break;</div><div class='add'>+	case CEPH_OSD_OP_ASSERT_VER:</div><div class='add'>+		dst-&gt;assert_ver.unused = cpu_to_le64(0);</div><div class='add'>+		dst-&gt;assert_ver.ver = cpu_to_le64(src-&gt;assert_ver.ver);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_err("unsupported osd opcode %s\n",</div><div class='ctx'> 			ceph_osd_op_name(src-&gt;op));</div><div class='hunk'>@@ -997,7 +1071,8 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(opcode != CEPH_OSD_OP_READ &amp;&amp; opcode != CEPH_OSD_OP_WRITE &amp;&amp;</div><div class='ctx'> 	       opcode != CEPH_OSD_OP_ZERO &amp;&amp; opcode != CEPH_OSD_OP_TRUNCATE &amp;&amp;</div><div class='del'>-	       opcode != CEPH_OSD_OP_CREATE &amp;&amp; opcode != CEPH_OSD_OP_DELETE);</div><div class='add'>+	       opcode != CEPH_OSD_OP_CREATE &amp;&amp; opcode != CEPH_OSD_OP_DELETE &amp;&amp;</div><div class='add'>+	       opcode != CEPH_OSD_OP_SPARSE_READ);</div><div class='ctx'> </div><div class='ctx'> 	req = ceph_osdc_alloc_request(osdc, snapc, num_ops, use_mempool,</div><div class='ctx'> 					GFP_NOFS);</div><div class='hunk'>@@ -1029,16 +1104,39 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,</div><div class='ctx'> 				       truncate_size, truncate_seq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;r_flags = flags;</div><div class='ctx'> 	req-&gt;r_base_oloc.pool = layout-&gt;pool_id;</div><div class='ctx'> 	req-&gt;r_base_oloc.pool_ns = ceph_try_get_string(layout-&gt;pool_ns);</div><div class='ctx'> 	ceph_oid_printf(&amp;req-&gt;r_base_oid, "%llx.%08llx", vino.ino, objnum);</div><div class='add'>+	req-&gt;r_flags = flags | osdc-&gt;client-&gt;options-&gt;read_from_replica;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;r_snapid = vino.snap;</div><div class='ctx'> 	if (flags &amp; CEPH_OSD_FLAG_WRITE)</div><div class='ctx'> 		req-&gt;r_data_offset = off;</div><div class='ctx'> </div><div class='del'>-	r = ceph_osdc_alloc_messages(req, GFP_NOFS);</div><div class='add'>+	if (num_ops &gt; 1) {</div><div class='add'>+		int num_req_ops, num_rep_ops;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a multi-op write request, assume that we'll need</div><div class='add'>+		 * request ops. If it's a multi-op read then assume we'll need</div><div class='add'>+		 * reply ops. Anything else and call it -EINVAL.</div><div class='add'>+		 */</div><div class='add'>+		if (flags &amp; CEPH_OSD_FLAG_WRITE) {</div><div class='add'>+			num_req_ops = num_ops;</div><div class='add'>+			num_rep_ops = 0;</div><div class='add'>+		} else if (flags &amp; CEPH_OSD_FLAG_READ) {</div><div class='add'>+			num_req_ops = 0;</div><div class='add'>+			num_rep_ops = num_ops;</div><div class='add'>+		} else {</div><div class='add'>+			r = -EINVAL;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = __ceph_osdc_alloc_messages(req, GFP_NOFS, num_req_ops,</div><div class='add'>+					       num_rep_ops);</div><div class='add'>+	} else {</div><div class='add'>+		r = ceph_osdc_alloc_messages(req, GFP_NOFS);</div><div class='add'>+	}</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -1050,6 +1148,20 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_new_request);</div><div class='ctx'> </div><div class='add'>+int __ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op, int cnt)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(op-&gt;op != CEPH_OSD_OP_SPARSE_READ);</div><div class='add'>+</div><div class='add'>+	op-&gt;extent.sparse_ext_cnt = cnt;</div><div class='add'>+	op-&gt;extent.sparse_ext = kmalloc_array(cnt,</div><div class='add'>+					      sizeof(*op-&gt;extent.sparse_ext),</div><div class='add'>+					      GFP_NOFS);</div><div class='add'>+	if (!op-&gt;extent.sparse_ext)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__ceph_alloc_sparse_ext_map);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We keep osd requests in an rbtree, sorted by -&gt;r_tid.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1107,6 +1219,7 @@ static void osd_init(struct ceph_osd *osd)</div><div class='ctx'> {</div><div class='ctx'> 	refcount_set(&amp;osd-&gt;o_ref, 1);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;osd-&gt;o_node);</div><div class='add'>+	spin_lock_init(&amp;osd-&gt;o_requests_lock);</div><div class='ctx'> 	osd-&gt;o_requests = RB_ROOT;</div><div class='ctx'> 	osd-&gt;o_linger_requests = RB_ROOT;</div><div class='ctx'> 	osd-&gt;o_backoff_mappings = RB_ROOT;</div><div class='hunk'>@@ -1117,6 +1230,13 @@ static void osd_init(struct ceph_osd *osd)</div><div class='ctx'> 	mutex_init(&amp;osd-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ceph_init_sparse_read(struct ceph_sparse_read *sr)</div><div class='add'>+{</div><div class='add'>+	kfree(sr-&gt;sr_extent);</div><div class='add'>+	memset(sr, '\0', sizeof(*sr));</div><div class='add'>+	sr-&gt;sr_state = CEPH_SPARSE_READ_HDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void osd_cleanup(struct ceph_osd *osd)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!RB_EMPTY_NODE(&amp;osd-&gt;o_node));</div><div class='hunk'>@@ -1127,6 +1247,8 @@ static void osd_cleanup(struct ceph_osd *osd)</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;osd-&gt;o_osd_lru));</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;osd-&gt;o_keepalive_item));</div><div class='ctx'> </div><div class='add'>+	ceph_init_sparse_read(&amp;osd-&gt;o_sparse_read);</div><div class='add'>+</div><div class='ctx'> 	if (osd-&gt;o_auth.authorizer) {</div><div class='ctx'> 		WARN_ON(osd_homeless(osd));</div><div class='ctx'> 		ceph_auth_destroy_authorizer(osd-&gt;o_auth.authorizer);</div><div class='hunk'>@@ -1146,6 +1268,9 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)</div><div class='ctx'> 	osd_init(osd);</div><div class='ctx'> 	osd-&gt;o_osdc = osdc;</div><div class='ctx'> 	osd-&gt;o_osd = onum;</div><div class='add'>+	osd-&gt;o_sparse_op_idx = -1;</div><div class='add'>+</div><div class='add'>+	ceph_init_sparse_read(&amp;osd-&gt;o_sparse_read);</div><div class='ctx'> </div><div class='ctx'> 	ceph_con_init(&amp;osd-&gt;o_con, osd, &amp;osd_con_ops, &amp;osdc-&gt;client-&gt;msgr);</div><div class='ctx'> </div><div class='hunk'>@@ -1336,7 +1461,9 @@ static void link_request(struct ceph_osd *osd, struct ceph_osd_request *req)</div><div class='ctx'> 		atomic_inc(&amp;osd-&gt;o_osdc-&gt;num_homeless);</div><div class='ctx'> </div><div class='ctx'> 	get_osd(osd);</div><div class='add'>+	spin_lock(&amp;osd-&gt;o_requests_lock);</div><div class='ctx'> 	insert_request(&amp;osd-&gt;o_requests, req);</div><div class='add'>+	spin_unlock(&amp;osd-&gt;o_requests_lock);</div><div class='ctx'> 	req-&gt;r_osd = osd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1348,7 +1475,9 @@ static void unlink_request(struct ceph_osd *osd, struct ceph_osd_request *req)</div><div class='ctx'> 	     req, req-&gt;r_tid);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;r_osd = NULL;</div><div class='add'>+	spin_lock(&amp;osd-&gt;o_requests_lock);</div><div class='ctx'> 	erase_request(&amp;osd-&gt;o_requests, req);</div><div class='add'>+	spin_unlock(&amp;osd-&gt;o_requests_lock);</div><div class='ctx'> 	put_osd(osd);</div><div class='ctx'> </div><div class='ctx'> 	if (!osd_homeless(osd))</div><div class='hunk'>@@ -1407,6 +1536,45 @@ static bool target_should_be_paused(struct ceph_osd_client *osdc,</div><div class='ctx'> 	       (osdc-&gt;osdmap-&gt;epoch &lt; osdc-&gt;epoch_barrier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pick_random_replica(const struct ceph_osds *acting)</div><div class='add'>+{</div><div class='add'>+	int i = get_random_u32_below(acting-&gt;size);</div><div class='add'>+</div><div class='add'>+	dout("%s picked osd%d, primary osd%d\n", __func__,</div><div class='add'>+	     acting-&gt;osds[i], acting-&gt;primary);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Picks the closest replica based on client's location given by</div><div class='add'>+ * crush_location option.  Prefers the primary if the locality is</div><div class='add'>+ * the same.</div><div class='add'>+ */</div><div class='add'>+static int pick_closest_replica(struct ceph_osd_client *osdc,</div><div class='add'>+				const struct ceph_osds *acting)</div><div class='add'>+{</div><div class='add'>+	struct ceph_options *opt = osdc-&gt;client-&gt;options;</div><div class='add'>+	int best_i, best_locality;</div><div class='add'>+	int i = 0, locality;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		locality = ceph_get_crush_locality(osdc-&gt;osdmap,</div><div class='add'>+						   acting-&gt;osds[i],</div><div class='add'>+						   &amp;opt-&gt;crush_locs);</div><div class='add'>+		if (i == 0 ||</div><div class='add'>+		    (locality &gt;= 0 &amp;&amp; best_locality &lt; 0) ||</div><div class='add'>+		    (locality &gt;= 0 &amp;&amp; best_locality &gt;= 0 &amp;&amp;</div><div class='add'>+		     locality &lt; best_locality)) {</div><div class='add'>+			best_i = i;</div><div class='add'>+			best_locality = locality;</div><div class='add'>+		}</div><div class='add'>+	} while (++i &lt; acting-&gt;size);</div><div class='add'>+</div><div class='add'>+	dout("%s picked osd%d with locality %d, primary osd%d\n", __func__,</div><div class='add'>+	     acting-&gt;osds[best_i], best_locality, acting-&gt;primary);</div><div class='add'>+	return best_i;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum calc_target_result {</div><div class='ctx'> 	CALC_TARGET_NO_ACTION = 0,</div><div class='ctx'> 	CALC_TARGET_NEED_RESEND,</div><div class='hunk'>@@ -1415,15 +1583,16 @@ enum calc_target_result {</div><div class='ctx'> </div><div class='ctx'> static enum calc_target_result calc_target(struct ceph_osd_client *osdc,</div><div class='ctx'> 					   struct ceph_osd_request_target *t,</div><div class='del'>-					   struct ceph_connection *con,</div><div class='ctx'> 					   bool any_change)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_pg_pool_info *pi;</div><div class='ctx'> 	struct ceph_pg pgid, last_pgid;</div><div class='ctx'> 	struct ceph_osds up, acting;</div><div class='add'>+	bool is_read = t-&gt;flags &amp; CEPH_OSD_FLAG_READ;</div><div class='add'>+	bool is_write = t-&gt;flags &amp; CEPH_OSD_FLAG_WRITE;</div><div class='ctx'> 	bool force_resend = false;</div><div class='ctx'> 	bool unpaused = false;</div><div class='del'>-	bool legacy_change;</div><div class='add'>+	bool legacy_change = false;</div><div class='ctx'> 	bool split = false;</div><div class='ctx'> 	bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);</div><div class='ctx'> 	bool recovery_deletes = ceph_osdmap_flag(osdc,</div><div class='hunk'>@@ -1451,9 +1620,9 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,</div><div class='ctx'> 	ceph_oid_copy(&amp;t-&gt;target_oid, &amp;t-&gt;base_oid);</div><div class='ctx'> 	ceph_oloc_copy(&amp;t-&gt;target_oloc, &amp;t-&gt;base_oloc);</div><div class='ctx'> 	if ((t-&gt;flags &amp; CEPH_OSD_FLAG_IGNORE_OVERLAY) == 0) {</div><div class='del'>-		if (t-&gt;flags &amp; CEPH_OSD_FLAG_READ &amp;&amp; pi-&gt;read_tier &gt;= 0)</div><div class='add'>+		if (is_read &amp;&amp; pi-&gt;read_tier &gt;= 0)</div><div class='ctx'> 			t-&gt;target_oloc.pool = pi-&gt;read_tier;</div><div class='del'>-		if (t-&gt;flags &amp; CEPH_OSD_FLAG_WRITE &amp;&amp; pi-&gt;write_tier &gt;= 0)</div><div class='add'>+		if (is_write &amp;&amp; pi-&gt;write_tier &gt;= 0)</div><div class='ctx'> 			t-&gt;target_oloc.pool = pi-&gt;write_tier;</div><div class='ctx'> </div><div class='ctx'> 		pi = ceph_pg_pool_by_id(osdc-&gt;osdmap, t-&gt;target_oloc.pool);</div><div class='hunk'>@@ -1492,7 +1661,8 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,</div><div class='ctx'> 		unpaused = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	legacy_change = ceph_pg_compare(&amp;t-&gt;pgid, &amp;pgid) ||</div><div class='del'>-			ceph_osds_changed(&amp;t-&gt;acting, &amp;acting, any_change);</div><div class='add'>+			ceph_osds_changed(&amp;t-&gt;acting, &amp;acting,</div><div class='add'>+					  t-&gt;used_replica || any_change);</div><div class='ctx'> 	if (t-&gt;pg_num)</div><div class='ctx'> 		split = ceph_pg_is_split(&amp;last_pgid, t-&gt;pg_num, pi-&gt;pg_num);</div><div class='ctx'> </div><div class='hunk'>@@ -1508,18 +1678,34 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,</div><div class='ctx'> 		t-&gt;sort_bitwise = sort_bitwise;</div><div class='ctx'> 		t-&gt;recovery_deletes = recovery_deletes;</div><div class='ctx'> </div><div class='del'>-		t-&gt;osd = acting.primary;</div><div class='add'>+		if ((t-&gt;flags &amp; (CEPH_OSD_FLAG_BALANCE_READS |</div><div class='add'>+				 CEPH_OSD_FLAG_LOCALIZE_READS)) &amp;&amp;</div><div class='add'>+		    !is_write &amp;&amp; pi-&gt;type == CEPH_POOL_TYPE_REP &amp;&amp;</div><div class='add'>+		    acting.size &gt; 1) {</div><div class='add'>+			int pos;</div><div class='add'>+</div><div class='add'>+			WARN_ON(!is_read || acting.osds[0] != acting.primary);</div><div class='add'>+			if (t-&gt;flags &amp; CEPH_OSD_FLAG_BALANCE_READS) {</div><div class='add'>+				pos = pick_random_replica(&amp;acting);</div><div class='add'>+			} else {</div><div class='add'>+				pos = pick_closest_replica(osdc, &amp;acting);</div><div class='add'>+			}</div><div class='add'>+			t-&gt;osd = acting.osds[pos];</div><div class='add'>+			t-&gt;used_replica = pos &gt; 0;</div><div class='add'>+		} else {</div><div class='add'>+			t-&gt;osd = acting.primary;</div><div class='add'>+			t-&gt;used_replica = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unpaused || legacy_change || force_resend ||</div><div class='del'>-	    (split &amp;&amp; con &amp;&amp; CEPH_HAVE_FEATURE(con-&gt;peer_features,</div><div class='del'>-					       RESEND_ON_SPLIT)))</div><div class='add'>+	if (unpaused || legacy_change || force_resend || split)</div><div class='ctx'> 		ct_res = CALC_TARGET_NEED_RESEND;</div><div class='ctx'> 	else</div><div class='ctx'> 		ct_res = CALC_TARGET_NO_ACTION;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	dout("%s t %p -&gt; ct_res %d osd %d\n", __func__, t, ct_res, t-&gt;osd);</div><div class='add'>+	dout("%s t %p -&gt; %d%d%d%d ct_res %d osd%d\n", __func__, t, unpaused,</div><div class='add'>+	     legacy_change, force_resend, split, ct_res, t-&gt;osd);</div><div class='ctx'> 	return ct_res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1845,48 +2031,56 @@ static bool should_plug_request(struct ceph_osd_request *req)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setup_request_data(struct ceph_osd_request *req,</div><div class='del'>-			       struct ceph_msg *msg)</div><div class='add'>+/*</div><div class='add'>+ * Keep get_num_data_items() in sync with this function.</div><div class='add'>+ */</div><div class='add'>+static void setup_request_data(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='del'>-	u32 data_len = 0;</div><div class='del'>-	int i;</div><div class='add'>+	struct ceph_msg *request_msg = req-&gt;r_request;</div><div class='add'>+	struct ceph_msg *reply_msg = req-&gt;r_reply;</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;msg-&gt;data))</div><div class='add'>+	if (req-&gt;r_request-&gt;num_data_items || req-&gt;r_reply-&gt;num_data_items)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(msg-&gt;data_length);</div><div class='del'>-	for (i = 0; i &lt; req-&gt;r_num_ops; i++) {</div><div class='del'>-		struct ceph_osd_req_op *op = &amp;req-&gt;r_ops[i];</div><div class='del'>-</div><div class='add'>+	WARN_ON(request_msg-&gt;data_length || reply_msg-&gt;data_length);</div><div class='add'>+	for (op = req-&gt;r_ops; op != &amp;req-&gt;r_ops[req-&gt;r_num_ops]; op++) {</div><div class='ctx'> 		switch (op-&gt;op) {</div><div class='ctx'> 		/* request */</div><div class='ctx'> 		case CEPH_OSD_OP_WRITE:</div><div class='ctx'> 		case CEPH_OSD_OP_WRITEFULL:</div><div class='ctx'> 			WARN_ON(op-&gt;indata_len != op-&gt;extent.length);</div><div class='del'>-			ceph_osdc_msg_data_add(msg, &amp;op-&gt;extent.osd_data);</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='add'>+					       &amp;op-&gt;extent.osd_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CEPH_OSD_OP_SETXATTR:</div><div class='ctx'> 		case CEPH_OSD_OP_CMPXATTR:</div><div class='ctx'> 			WARN_ON(op-&gt;indata_len != op-&gt;xattr.name_len +</div><div class='ctx'> 						  op-&gt;xattr.value_len);</div><div class='del'>-			ceph_osdc_msg_data_add(msg, &amp;op-&gt;xattr.osd_data);</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='add'>+					       &amp;op-&gt;xattr.osd_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CEPH_OSD_OP_NOTIFY_ACK:</div><div class='del'>-			ceph_osdc_msg_data_add(msg,</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='ctx'> 					       &amp;op-&gt;notify_ack.request_data);</div><div class='ctx'> 			break;</div><div class='add'>+		case CEPH_OSD_OP_COPY_FROM2:</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='add'>+					       &amp;op-&gt;copy_from.osd_data);</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		/* reply */</div><div class='ctx'> 		case CEPH_OSD_OP_STAT:</div><div class='del'>-			ceph_osdc_msg_data_add(req-&gt;r_reply,</div><div class='add'>+			ceph_osdc_msg_data_add(reply_msg,</div><div class='ctx'> 					       &amp;op-&gt;raw_data_in);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CEPH_OSD_OP_READ:</div><div class='del'>-			ceph_osdc_msg_data_add(req-&gt;r_reply,</div><div class='add'>+		case CEPH_OSD_OP_SPARSE_READ:</div><div class='add'>+			ceph_osdc_msg_data_add(reply_msg,</div><div class='ctx'> 					       &amp;op-&gt;extent.osd_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CEPH_OSD_OP_LIST_WATCHERS:</div><div class='del'>-			ceph_osdc_msg_data_add(req-&gt;r_reply,</div><div class='add'>+			ceph_osdc_msg_data_add(reply_msg,</div><div class='ctx'> 					       &amp;op-&gt;list_watchers.response_data);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1895,25 +2089,23 @@ static void setup_request_data(struct ceph_osd_request *req,</div><div class='ctx'> 			WARN_ON(op-&gt;indata_len != op-&gt;cls.class_len +</div><div class='ctx'> 						  op-&gt;cls.method_len +</div><div class='ctx'> 						  op-&gt;cls.indata_len);</div><div class='del'>-			ceph_osdc_msg_data_add(msg, &amp;op-&gt;cls.request_info);</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='add'>+					       &amp;op-&gt;cls.request_info);</div><div class='ctx'> 			/* optional, can be NONE */</div><div class='del'>-			ceph_osdc_msg_data_add(msg, &amp;op-&gt;cls.request_data);</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='add'>+					       &amp;op-&gt;cls.request_data);</div><div class='ctx'> 			/* optional, can be NONE */</div><div class='del'>-			ceph_osdc_msg_data_add(req-&gt;r_reply,</div><div class='add'>+			ceph_osdc_msg_data_add(reply_msg,</div><div class='ctx'> 					       &amp;op-&gt;cls.response_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CEPH_OSD_OP_NOTIFY:</div><div class='del'>-			ceph_osdc_msg_data_add(msg,</div><div class='add'>+			ceph_osdc_msg_data_add(request_msg,</div><div class='ctx'> 					       &amp;op-&gt;notify.request_data);</div><div class='del'>-			ceph_osdc_msg_data_add(req-&gt;r_reply,</div><div class='add'>+			ceph_osdc_msg_data_add(reply_msg,</div><div class='ctx'> 					       &amp;op-&gt;notify.response_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		data_len += op-&gt;indata_len;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(data_len != msg-&gt;data_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void encode_pgid(void **p, const struct ceph_pg *pgid)</div><div class='hunk'>@@ -1961,7 +2153,7 @@ static void encode_request_partial(struct ceph_osd_request *req,</div><div class='ctx'> 			req-&gt;r_data_offset || req-&gt;r_snapc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	setup_request_data(req, msg);</div><div class='add'>+	setup_request_data(req);</div><div class='ctx'> </div><div class='ctx'> 	encode_spgid(&amp;p, &amp;req-&gt;r_t.spgid); /* actual spg */</div><div class='ctx'> 	ceph_encode_32(&amp;p, req-&gt;r_t.pgid.seed); /* raw hash */</div><div class='hunk'>@@ -2195,7 +2387,7 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked)</div><div class='ctx'> 	dout("%s req %p wrlocked %d\n", __func__, req, wrlocked);</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	ct_res = calc_target(osdc, &amp;req-&gt;r_t, NULL, false);</div><div class='add'>+	ct_res = calc_target(osdc, &amp;req-&gt;r_t, false);</div><div class='ctx'> 	if (ct_res == CALC_TARGET_POOL_DNE &amp;&amp; !wrlocked)</div><div class='ctx'> 		goto promote;</div><div class='ctx'> </div><div class='hunk'>@@ -2229,10 +2421,14 @@ again:</div><div class='ctx'> 		   (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||</div><div class='ctx'> 		    pool_full(osdc, req-&gt;r_t.base_oloc.pool))) {</div><div class='ctx'> 		dout("req %p full/pool_full\n", req);</div><div class='del'>-		if (osdc-&gt;abort_on_full) {</div><div class='add'>+		if (ceph_test_opt(osdc-&gt;client, ABORT_ON_FULL)) {</div><div class='ctx'> 			err = -ENOSPC;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_warn_ratelimited("FULL or reached pool quota\n");</div><div class='add'>+			if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL))</div><div class='add'>+				pr_warn_ratelimited("cluster is full (osdmap FULL)\n");</div><div class='add'>+			else</div><div class='add'>+				pr_warn_ratelimited("pool %lld is full or reached quota\n",</div><div class='add'>+						    req-&gt;r_t.base_oloc.pool);</div><div class='ctx'> 			req-&gt;r_t.paused = true;</div><div class='ctx'> 			maybe_request_map(osdc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2280,6 +2476,7 @@ static void account_request(struct ceph_osd_request *req)</div><div class='ctx'> 	atomic_inc(&amp;req-&gt;r_osdc-&gt;num_requests);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;r_start_stamp = jiffies;</div><div class='add'>+	req-&gt;r_start_latency = ktime_get();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void submit_request(struct ceph_osd_request *req, bool wrlocked)</div><div class='hunk'>@@ -2296,8 +2493,12 @@ static void finish_request(struct ceph_osd_request *req)</div><div class='ctx'> 	WARN_ON(lookup_request_mc(&amp;osdc-&gt;map_checks, req-&gt;r_tid));</div><div class='ctx'> 	dout("%s req %p tid %llu\n", __func__, req, req-&gt;r_tid);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;r_osd)</div><div class='add'>+	req-&gt;r_end_latency = ktime_get();</div><div class='add'>+</div><div class='add'>+	if (req-&gt;r_osd) {</div><div class='add'>+		ceph_init_sparse_read(&amp;req-&gt;r_osd-&gt;o_sparse_read);</div><div class='ctx'> 		unlink_request(req-&gt;r_osd, req);</div><div class='add'>+	}</div><div class='ctx'> 	atomic_dec(&amp;osdc-&gt;num_requests);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2312,7 +2513,7 @@ static void finish_request(struct ceph_osd_request *req)</div><div class='ctx'> </div><div class='ctx'> static void __complete_request(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='del'>-	dout("%s req %p tid %llu cb %pf result %d\n", __func__, req,</div><div class='add'>+	dout("%s req %p tid %llu cb %ps result %d\n", __func__, req,</div><div class='ctx'> 	     req-&gt;r_tid, req-&gt;r_callback, req-&gt;r_result);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;r_callback)</div><div class='hunk'>@@ -2399,6 +2600,14 @@ void ceph_osdc_abort_requests(struct ceph_osd_client *osdc, int err)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_abort_requests);</div><div class='ctx'> </div><div class='add'>+void ceph_osdc_clear_abort_err(struct ceph_osd_client *osdc)</div><div class='add'>+{</div><div class='add'>+	down_write(&amp;osdc-&gt;lock);</div><div class='add'>+	osdc-&gt;abort_err = 0;</div><div class='add'>+	up_write(&amp;osdc-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_osdc_clear_abort_err);</div><div class='add'>+</div><div class='ctx'> static void update_epoch_barrier(struct ceph_osd_client *osdc, u32 eb)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(eb &gt; osdc-&gt;epoch_barrier)) {</div><div class='hunk'>@@ -2459,7 +2668,7 @@ static void ceph_osdc_abort_on_full(struct ceph_osd_client *osdc)</div><div class='ctx'> {</div><div class='ctx'> 	bool victims = false;</div><div class='ctx'> </div><div class='del'>-	if (osdc-&gt;abort_on_full &amp;&amp;</div><div class='add'>+	if (ceph_test_opt(osdc-&gt;client, ABORT_ON_FULL) &amp;&amp;</div><div class='ctx'> 	    (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || have_pool_full(osdc)))</div><div class='ctx'> 		for_each_request(osdc, abort_on_full_fn, &amp;victims);</div><div class='ctx'> }</div><div class='hunk'>@@ -2563,10 +2772,13 @@ static void linger_release(struct kref *kref)</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;lreq-&gt;pending_lworks));</div><div class='ctx'> 	WARN_ON(lreq-&gt;osd);</div><div class='ctx'> </div><div class='del'>-	if (lreq-&gt;reg_req)</div><div class='del'>-		ceph_osdc_put_request(lreq-&gt;reg_req);</div><div class='del'>-	if (lreq-&gt;ping_req)</div><div class='del'>-		ceph_osdc_put_request(lreq-&gt;ping_req);</div><div class='add'>+	if (lreq-&gt;request_pl)</div><div class='add'>+		ceph_pagelist_release(lreq-&gt;request_pl);</div><div class='add'>+	if (lreq-&gt;notify_id_pages)</div><div class='add'>+		ceph_release_page_vector(lreq-&gt;notify_id_pages, 1);</div><div class='add'>+</div><div class='add'>+	ceph_osdc_put_request(lreq-&gt;reg_req);</div><div class='add'>+	ceph_osdc_put_request(lreq-&gt;ping_req);</div><div class='ctx'> 	target_destroy(&amp;lreq-&gt;t);</div><div class='ctx'> 	kfree(lreq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2835,6 +3047,12 @@ static void linger_commit_cb(struct ceph_osd_request *req)</div><div class='ctx'> 	struct ceph_osd_linger_request *lreq = req-&gt;r_priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lreq-&gt;lock);</div><div class='add'>+	if (req != lreq-&gt;reg_req) {</div><div class='add'>+		dout("%s lreq %p linger_id %llu unknown req (%p != %p)\n",</div><div class='add'>+		     __func__, lreq, lreq-&gt;linger_id, req, lreq-&gt;reg_req);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dout("%s lreq %p linger_id %llu result %d\n", __func__, lreq,</div><div class='ctx'> 	     lreq-&gt;linger_id, req-&gt;r_result);</div><div class='ctx'> 	linger_reg_commit_complete(lreq, req-&gt;r_result);</div><div class='hunk'>@@ -2858,6 +3076,7 @@ static void linger_commit_cb(struct ceph_osd_request *req)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='ctx'> 	linger_put(lreq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2880,6 +3099,12 @@ static void linger_reconnect_cb(struct ceph_osd_request *req)</div><div class='ctx'> 	struct ceph_osd_linger_request *lreq = req-&gt;r_priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lreq-&gt;lock);</div><div class='add'>+	if (req != lreq-&gt;reg_req) {</div><div class='add'>+		dout("%s lreq %p linger_id %llu unknown req (%p != %p)\n",</div><div class='add'>+		     __func__, lreq, lreq-&gt;linger_id, req, lreq-&gt;reg_req);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dout("%s lreq %p linger_id %llu result %d last_error %d\n", __func__,</div><div class='ctx'> 	     lreq, lreq-&gt;linger_id, req-&gt;r_result, lreq-&gt;last_error);</div><div class='ctx'> 	if (req-&gt;r_result &lt; 0) {</div><div class='hunk'>@@ -2889,48 +3114,64 @@ static void linger_reconnect_cb(struct ceph_osd_request *req)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='ctx'> 	linger_put(lreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void send_linger(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_request *req = lreq-&gt;reg_req;</div><div class='del'>-	struct ceph_osd_req_op *op = &amp;req-&gt;r_ops[0];</div><div class='add'>+	struct ceph_osd_client *osdc = lreq-&gt;osdc;</div><div class='add'>+	struct ceph_osd_request *req;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	verify_osdc_wrlocked(req-&gt;r_osdc);</div><div class='add'>+	verify_osdc_wrlocked(osdc);</div><div class='add'>+	mutex_lock(&amp;lreq-&gt;lock);</div><div class='ctx'> 	dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq-&gt;linger_id);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;r_osd)</div><div class='del'>-		cancel_linger_request(req);</div><div class='add'>+	if (lreq-&gt;reg_req) {</div><div class='add'>+		if (lreq-&gt;reg_req-&gt;r_osd)</div><div class='add'>+			cancel_linger_request(lreq-&gt;reg_req);</div><div class='add'>+		ceph_osdc_put_request(lreq-&gt;reg_req);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	request_reinit(req);</div><div class='del'>-	ceph_oid_copy(&amp;req-&gt;r_base_oid, &amp;lreq-&gt;t.base_oid);</div><div class='del'>-	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, &amp;lreq-&gt;t.base_oloc);</div><div class='del'>-	req-&gt;r_flags = lreq-&gt;t.flags;</div><div class='add'>+	req = ceph_osdc_alloc_request(osdc, NULL, 1, true, GFP_NOIO);</div><div class='add'>+	BUG_ON(!req);</div><div class='add'>+</div><div class='add'>+	target_copy(&amp;req-&gt;r_t, &amp;lreq-&gt;t);</div><div class='ctx'> 	req-&gt;r_mtime = lreq-&gt;mtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lreq-&gt;lock);</div><div class='ctx'> 	if (lreq-&gt;is_watch &amp;&amp; lreq-&gt;committed) {</div><div class='del'>-		WARN_ON(op-&gt;op != CEPH_OSD_OP_WATCH ||</div><div class='del'>-			op-&gt;watch.cookie != lreq-&gt;linger_id);</div><div class='del'>-		op-&gt;watch.op = CEPH_OSD_WATCH_OP_RECONNECT;</div><div class='del'>-		op-&gt;watch.gen = ++lreq-&gt;register_gen;</div><div class='add'>+		osd_req_op_watch_init(req, 0, CEPH_OSD_WATCH_OP_RECONNECT,</div><div class='add'>+				      lreq-&gt;linger_id, ++lreq-&gt;register_gen);</div><div class='ctx'> 		dout("lreq %p reconnect register_gen %u\n", lreq,</div><div class='del'>-		     op-&gt;watch.gen);</div><div class='add'>+		     req-&gt;r_ops[0].watch.gen);</div><div class='ctx'> 		req-&gt;r_callback = linger_reconnect_cb;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!lreq-&gt;is_watch)</div><div class='add'>+		if (lreq-&gt;is_watch) {</div><div class='add'>+			osd_req_op_watch_init(req, 0, CEPH_OSD_WATCH_OP_WATCH,</div><div class='add'>+					      lreq-&gt;linger_id, 0);</div><div class='add'>+		} else {</div><div class='ctx'> 			lreq-&gt;notify_id = 0;</div><div class='del'>-		else</div><div class='del'>-			WARN_ON(op-&gt;watch.op != CEPH_OSD_WATCH_OP_WATCH);</div><div class='add'>+</div><div class='add'>+			refcount_inc(&amp;lreq-&gt;request_pl-&gt;refcnt);</div><div class='add'>+			osd_req_op_notify_init(req, 0, lreq-&gt;linger_id,</div><div class='add'>+					       lreq-&gt;request_pl);</div><div class='add'>+			ceph_osd_data_pages_init(</div><div class='add'>+			    osd_req_op_data(req, 0, notify, response_data),</div><div class='add'>+			    lreq-&gt;notify_id_pages, PAGE_SIZE, 0, false, false);</div><div class='add'>+		}</div><div class='ctx'> 		dout("lreq %p register\n", lreq);</div><div class='ctx'> 		req-&gt;r_callback = linger_commit_cb;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='add'>+	BUG_ON(ret);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;r_priv = linger_get(lreq);</div><div class='ctx'> 	req-&gt;r_linger = true;</div><div class='add'>+	lreq-&gt;reg_req = req;</div><div class='add'>+	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	submit_request(req, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -2940,6 +3181,12 @@ static void linger_ping_cb(struct ceph_osd_request *req)</div><div class='ctx'> 	struct ceph_osd_linger_request *lreq = req-&gt;r_priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lreq-&gt;lock);</div><div class='add'>+	if (req != lreq-&gt;ping_req) {</div><div class='add'>+		dout("%s lreq %p linger_id %llu unknown req (%p != %p)\n",</div><div class='add'>+		     __func__, lreq, lreq-&gt;linger_id, req, lreq-&gt;ping_req);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dout("%s lreq %p linger_id %llu result %d ping_sent %lu last_error %d\n",</div><div class='ctx'> 	     __func__, lreq, lreq-&gt;linger_id, req-&gt;r_result, lreq-&gt;ping_sent,</div><div class='ctx'> 	     lreq-&gt;last_error);</div><div class='hunk'>@@ -2955,6 +3202,7 @@ static void linger_ping_cb(struct ceph_osd_request *req)</div><div class='ctx'> 		     lreq-&gt;register_gen, req-&gt;r_ops[0].watch.gen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='ctx'> 	linger_put(lreq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2962,8 +3210,8 @@ static void linger_ping_cb(struct ceph_osd_request *req)</div><div class='ctx'> static void send_linger_ping(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_client *osdc = lreq-&gt;osdc;</div><div class='del'>-	struct ceph_osd_request *req = lreq-&gt;ping_req;</div><div class='del'>-	struct ceph_osd_req_op *op = &amp;req-&gt;r_ops[0];</div><div class='add'>+	struct ceph_osd_request *req;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD)) {</div><div class='ctx'> 		dout("%s PAUSERD\n", __func__);</div><div class='hunk'>@@ -2975,19 +3223,26 @@ static void send_linger_ping(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> 	     __func__, lreq, lreq-&gt;linger_id, lreq-&gt;ping_sent,</div><div class='ctx'> 	     lreq-&gt;register_gen);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;r_osd)</div><div class='del'>-		cancel_linger_request(req);</div><div class='add'>+	if (lreq-&gt;ping_req) {</div><div class='add'>+		if (lreq-&gt;ping_req-&gt;r_osd)</div><div class='add'>+			cancel_linger_request(lreq-&gt;ping_req);</div><div class='add'>+		ceph_osdc_put_request(lreq-&gt;ping_req);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	request_reinit(req);</div><div class='del'>-	target_copy(&amp;req-&gt;r_t, &amp;lreq-&gt;t);</div><div class='add'>+	req = ceph_osdc_alloc_request(osdc, NULL, 1, true, GFP_NOIO);</div><div class='add'>+	BUG_ON(!req);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(op-&gt;op != CEPH_OSD_OP_WATCH ||</div><div class='del'>-		op-&gt;watch.cookie != lreq-&gt;linger_id ||</div><div class='del'>-		op-&gt;watch.op != CEPH_OSD_WATCH_OP_PING);</div><div class='del'>-	op-&gt;watch.gen = lreq-&gt;register_gen;</div><div class='add'>+	target_copy(&amp;req-&gt;r_t, &amp;lreq-&gt;t);</div><div class='add'>+	osd_req_op_watch_init(req, 0, CEPH_OSD_WATCH_OP_PING, lreq-&gt;linger_id,</div><div class='add'>+			      lreq-&gt;register_gen);</div><div class='ctx'> 	req-&gt;r_callback = linger_ping_cb;</div><div class='add'>+</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='add'>+	BUG_ON(ret);</div><div class='add'>+</div><div class='ctx'> 	req-&gt;r_priv = linger_get(lreq);</div><div class='ctx'> 	req-&gt;r_linger = true;</div><div class='add'>+	lreq-&gt;ping_req = req;</div><div class='ctx'> </div><div class='ctx'> 	ceph_osdc_get_request(req);</div><div class='ctx'> 	account_request(req);</div><div class='hunk'>@@ -3001,11 +3256,15 @@ static void linger_submit(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> 	struct ceph_osd_client *osdc = lreq-&gt;osdc;</div><div class='ctx'> 	struct ceph_osd *osd;</div><div class='ctx'> </div><div class='del'>-	calc_target(osdc, &amp;lreq-&gt;t, NULL, false);</div><div class='add'>+	down_write(&amp;osdc-&gt;lock);</div><div class='add'>+	linger_register(lreq);</div><div class='add'>+</div><div class='add'>+	calc_target(osdc, &amp;lreq-&gt;t, false);</div><div class='ctx'> 	osd = lookup_create_osd(osdc, lreq-&gt;t.osd, true);</div><div class='ctx'> 	link_linger(osd, lreq);</div><div class='ctx'> </div><div class='ctx'> 	send_linger(lreq);</div><div class='add'>+	up_write(&amp;osdc-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cancel_linger_map_check(struct ceph_osd_linger_request *lreq)</div><div class='hunk'>@@ -3030,9 +3289,9 @@ static void cancel_linger_map_check(struct ceph_osd_linger_request *lreq)</div><div class='ctx'>  */</div><div class='ctx'> static void __linger_cancel(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> {</div><div class='del'>-	if (lreq-&gt;is_watch &amp;&amp; lreq-&gt;ping_req-&gt;r_osd)</div><div class='add'>+	if (lreq-&gt;ping_req &amp;&amp; lreq-&gt;ping_req-&gt;r_osd)</div><div class='ctx'> 		cancel_linger_request(lreq-&gt;ping_req);</div><div class='del'>-	if (lreq-&gt;reg_req-&gt;r_osd)</div><div class='add'>+	if (lreq-&gt;reg_req &amp;&amp; lreq-&gt;reg_req-&gt;r_osd)</div><div class='ctx'> 		cancel_linger_request(lreq-&gt;reg_req);</div><div class='ctx'> 	cancel_linger_map_check(lreq);</div><div class='ctx'> 	unlink_linger(lreq-&gt;osd, lreq);</div><div class='hunk'>@@ -3137,17 +3396,24 @@ static int linger_reg_commit_wait(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq-&gt;linger_id);</div><div class='del'>-	ret = wait_for_completion_interruptible(&amp;lreq-&gt;reg_commit_wait);</div><div class='add'>+	ret = wait_for_completion_killable(&amp;lreq-&gt;reg_commit_wait);</div><div class='ctx'> 	return ret ?: lreq-&gt;reg_commit_error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int linger_notify_finish_wait(struct ceph_osd_linger_request *lreq)</div><div class='add'>+static int linger_notify_finish_wait(struct ceph_osd_linger_request *lreq,</div><div class='add'>+				     unsigned long timeout)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	long left;</div><div class='ctx'> </div><div class='ctx'> 	dout("%s lreq %p linger_id %llu\n", __func__, lreq, lreq-&gt;linger_id);</div><div class='del'>-	ret = wait_for_completion_interruptible(&amp;lreq-&gt;notify_finish_wait);</div><div class='del'>-	return ret ?: lreq-&gt;notify_finish_error;</div><div class='add'>+	left = wait_for_completion_killable_timeout(&amp;lreq-&gt;notify_finish_wait,</div><div class='add'>+						ceph_timeout_jiffies(timeout));</div><div class='add'>+	if (left &lt;= 0)</div><div class='add'>+		left = left ?: -ETIMEDOUT;</div><div class='add'>+	else</div><div class='add'>+		left = lreq-&gt;notify_finish_error; /* completed */</div><div class='add'>+</div><div class='add'>+	return left;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3372,9 +3638,6 @@ static int ceph_redirect_decode(void **p, void *end,</div><div class='ctx'> 		goto e_inval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = ceph_decode_32(p);</div><div class='del'>-	*p += len; /* skip osd_instructions */</div><div class='del'>-</div><div class='ctx'> 	/* skip the rest */</div><div class='ctx'> 	*p = struct_end;</div><div class='ctx'> out:</div><div class='hunk'>@@ -3541,7 +3804,29 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)</div><div class='ctx'> 		 * supported.</div><div class='ctx'> 		 */</div><div class='ctx'> 		req-&gt;r_t.target_oloc.pool = m.redirect.oloc.pool;</div><div class='del'>-		req-&gt;r_flags |= CEPH_OSD_FLAG_REDIRECTED;</div><div class='add'>+		req-&gt;r_flags |= CEPH_OSD_FLAG_REDIRECTED |</div><div class='add'>+				CEPH_OSD_FLAG_IGNORE_OVERLAY |</div><div class='add'>+				CEPH_OSD_FLAG_IGNORE_CACHE;</div><div class='add'>+		req-&gt;r_tid = 0;</div><div class='add'>+		__submit_request(req, false);</div><div class='add'>+		goto out_unlock_osdc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (m.result == -EAGAIN) {</div><div class='add'>+		dout("req %p tid %llu EAGAIN\n", req, req-&gt;r_tid);</div><div class='add'>+		unlink_request(osd, req);</div><div class='add'>+		mutex_unlock(&amp;osd-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The object is missing on the replica or not (yet)</div><div class='add'>+		 * readable.  Clear pgid to force a resend to the primary</div><div class='add'>+		 * via legacy_change.</div><div class='add'>+		 */</div><div class='add'>+		req-&gt;r_t.pgid.pool = 0;</div><div class='add'>+		req-&gt;r_t.pgid.seed = 0;</div><div class='add'>+		WARN_ON(!req-&gt;r_t.used_replica);</div><div class='add'>+		req-&gt;r_flags &amp;= ~(CEPH_OSD_FLAG_BALANCE_READS |</div><div class='add'>+				  CEPH_OSD_FLAG_LOCALIZE_READS);</div><div class='ctx'> 		req-&gt;r_tid = 0;</div><div class='ctx'> 		__submit_request(req, false);</div><div class='ctx'> 		goto out_unlock_osdc;</div><div class='hunk'>@@ -3572,6 +3857,7 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)</div><div class='ctx'> 	 * one (type of) reply back.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(!(m.flags &amp; CEPH_OSD_FLAG_ONDISK));</div><div class='add'>+	req-&gt;r_version = m.user_version;</div><div class='ctx'> 	req-&gt;r_result = m.result ?: data_len;</div><div class='ctx'> 	finish_request(req);</div><div class='ctx'> 	mutex_unlock(&amp;osd-&gt;lock);</div><div class='hunk'>@@ -3617,7 +3903,7 @@ recalc_linger_target(struct ceph_osd_linger_request *lreq)</div><div class='ctx'> 	struct ceph_osd_client *osdc = lreq-&gt;osdc;</div><div class='ctx'> 	enum calc_target_result ct_res;</div><div class='ctx'> </div><div class='del'>-	ct_res = calc_target(osdc, &amp;lreq-&gt;t, NULL, true);</div><div class='add'>+	ct_res = calc_target(osdc, &amp;lreq-&gt;t, true);</div><div class='ctx'> 	if (ct_res == CALC_TARGET_NEED_RESEND) {</div><div class='ctx'> 		struct ceph_osd *osd;</div><div class='ctx'> </div><div class='hunk'>@@ -3663,7 +3949,7 @@ static void scan_requests(struct ceph_osd *osd,</div><div class='ctx'> 			if (!force_resend &amp;&amp; !force_resend_writes)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case CALC_TARGET_NEED_RESEND:</div><div class='ctx'> 			cancel_linger_map_check(lreq);</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3689,8 +3975,7 @@ static void scan_requests(struct ceph_osd *osd,</div><div class='ctx'> 		n = rb_next(n); /* unlink_request(), check_pool_dne() */</div><div class='ctx'> </div><div class='ctx'> 		dout("%s req %p tid %llu\n", __func__, req, req-&gt;r_tid);</div><div class='del'>-		ct_res = calc_target(osdc, &amp;req-&gt;r_t, &amp;req-&gt;r_osd-&gt;o_con,</div><div class='del'>-				     false);</div><div class='add'>+		ct_res = calc_target(osdc, &amp;req-&gt;r_t, false);</div><div class='ctx'> 		switch (ct_res) {</div><div class='ctx'> 		case CALC_TARGET_NO_ACTION:</div><div class='ctx'> 			force_resend_writes = cleared_full ||</div><div class='hunk'>@@ -3701,7 +3986,7 @@ static void scan_requests(struct ceph_osd *osd,</div><div class='ctx'> 			     !force_resend_writes))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case CALC_TARGET_NEED_RESEND:</div><div class='ctx'> 			cancel_map_check(req);</div><div class='ctx'> 			unlink_request(osd, req);</div><div class='hunk'>@@ -3728,9 +4013,11 @@ static int handle_one_map(struct ceph_osd_client *osdc,</div><div class='ctx'> 	set_pool_was_full(osdc);</div><div class='ctx'> </div><div class='ctx'> 	if (incremental)</div><div class='del'>-		newmap = osdmap_apply_incremental(&amp;p, end, osdc-&gt;osdmap);</div><div class='add'>+		newmap = osdmap_apply_incremental(&amp;p, end,</div><div class='add'>+						  ceph_msgr2(osdc-&gt;client),</div><div class='add'>+						  osdc-&gt;osdmap);</div><div class='ctx'> 	else</div><div class='del'>-		newmap = ceph_osdmap_decode(&amp;p, end);</div><div class='add'>+		newmap = ceph_osdmap_decode(&amp;p, end, ceph_msgr2(osdc-&gt;client));</div><div class='ctx'> 	if (IS_ERR(newmap))</div><div class='ctx'> 		return PTR_ERR(newmap);</div><div class='ctx'> </div><div class='hunk'>@@ -3799,7 +4086,7 @@ static void kick_requests(struct ceph_osd_client *osdc,</div><div class='ctx'> 		n = rb_next(n);</div><div class='ctx'> </div><div class='ctx'> 		if (req-&gt;r_t.epoch &lt; osdc-&gt;osdmap-&gt;epoch) {</div><div class='del'>-			ct_res = calc_target(osdc, &amp;req-&gt;r_t, NULL, false);</div><div class='add'>+			ct_res = calc_target(osdc, &amp;req-&gt;r_t, false);</div><div class='ctx'> 			if (ct_res == CALC_TARGET_POOL_DNE) {</div><div class='ctx'> 				erase_request(need_resend, req);</div><div class='ctx'> 				check_pool_dne(req);</div><div class='hunk'>@@ -4318,9 +4605,7 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,</div><div class='ctx'> 			     lreq-&gt;notify_id, notify_id);</div><div class='ctx'> 		} else if (!completion_done(&amp;lreq-&gt;notify_finish_wait)) {</div><div class='ctx'> 			struct ceph_msg_data *data =</div><div class='del'>-			    list_first_entry_or_null(&amp;msg-&gt;data,</div><div class='del'>-						     struct ceph_msg_data,</div><div class='del'>-						     links);</div><div class='add'>+			    msg-&gt;num_data_items ? &amp;msg-&gt;data[0] : NULL;</div><div class='ctx'> </div><div class='ctx'> 			if (data) {</div><div class='ctx'> 				if (lreq-&gt;preply_pages) {</div><div class='hunk'>@@ -4328,9 +4613,7 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,</div><div class='ctx'> 							CEPH_MSG_DATA_PAGES);</div><div class='ctx'> 					*lreq-&gt;preply_pages = data-&gt;pages;</div><div class='ctx'> 					*lreq-&gt;preply_len = data-&gt;length;</div><div class='del'>-				} else {</div><div class='del'>-					ceph_release_page_vector(data-&gt;pages,</div><div class='del'>-					       calc_pages_for(0, data-&gt;length));</div><div class='add'>+					data-&gt;own_pages = false;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			lreq-&gt;notify_finish_error = return_code;</div><div class='hunk'>@@ -4365,21 +4648,23 @@ bad:</div><div class='ctx'> /*</div><div class='ctx'>  * Register request, send initial attempt.</div><div class='ctx'>  */</div><div class='del'>-int ceph_osdc_start_request(struct ceph_osd_client *osdc,</div><div class='del'>-			    struct ceph_osd_request *req,</div><div class='del'>-			    bool nofail)</div><div class='add'>+void ceph_osdc_start_request(struct ceph_osd_client *osdc,</div><div class='add'>+			     struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	down_read(&amp;osdc-&gt;lock);</div><div class='ctx'> 	submit_request(req, false);</div><div class='ctx'> 	up_read(&amp;osdc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_start_request);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Unregister a registered request.  The request is not completed:</div><div class='del'>- * -&gt;r_result isn't set and __complete_request() isn't called.</div><div class='add'>+ * Unregister request.  If @req was registered, it isn't completed:</div><div class='add'>+ * r_result isn't set and __complete_request() isn't invoked.</div><div class='add'>+ *</div><div class='add'>+ * If @req wasn't registered, this call may have raced with</div><div class='add'>+ * handle_reply(), in which case r_result would already be set and</div><div class='add'>+ * __complete_request() would be getting invoked, possibly even</div><div class='add'>+ * concurrently with this call.</div><div class='ctx'>  */</div><div class='ctx'> void ceph_osdc_cancel_request(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='hunk'>@@ -4465,26 +4750,6 @@ again:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_sync);</div><div class='ctx'> </div><div class='del'>-static struct ceph_osd_request *</div><div class='del'>-alloc_linger_request(struct ceph_osd_linger_request *lreq)</div><div class='del'>-{</div><div class='del'>-	struct ceph_osd_request *req;</div><div class='del'>-</div><div class='del'>-	req = ceph_osdc_alloc_request(lreq-&gt;osdc, NULL, 1, false, GFP_NOIO);</div><div class='del'>-	if (!req)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ceph_oid_copy(&amp;req-&gt;r_base_oid, &amp;lreq-&gt;t.base_oid);</div><div class='del'>-	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, &amp;lreq-&gt;t.base_oloc);</div><div class='del'>-</div><div class='del'>-	if (ceph_osdc_alloc_messages(req, GFP_NOIO)) {</div><div class='del'>-		ceph_osdc_put_request(req);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Returns a handle, caller owns a ref.</div><div class='ctx'>  */</div><div class='hunk'>@@ -4514,27 +4779,7 @@ ceph_osdc_watch(struct ceph_osd_client *osdc,</div><div class='ctx'> 	lreq-&gt;t.flags = CEPH_OSD_FLAG_WRITE;</div><div class='ctx'> 	ktime_get_real_ts64(&amp;lreq-&gt;mtime);</div><div class='ctx'> </div><div class='del'>-	lreq-&gt;reg_req = alloc_linger_request(lreq);</div><div class='del'>-	if (!lreq-&gt;reg_req) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_put_lreq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lreq-&gt;ping_req = alloc_linger_request(lreq);</div><div class='del'>-	if (!lreq-&gt;ping_req) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_put_lreq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;osdc-&gt;lock);</div><div class='del'>-	linger_register(lreq); /* before osd_req_op_* */</div><div class='del'>-	osd_req_op_watch_init(lreq-&gt;reg_req, 0, lreq-&gt;linger_id,</div><div class='del'>-			      CEPH_OSD_WATCH_OP_WATCH);</div><div class='del'>-	osd_req_op_watch_init(lreq-&gt;ping_req, 0, lreq-&gt;linger_id,</div><div class='del'>-			      CEPH_OSD_WATCH_OP_PING);</div><div class='ctx'> 	linger_submit(lreq);</div><div class='del'>-	up_write(&amp;osdc-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	ret = linger_reg_commit_wait(lreq);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		linger_cancel(lreq);</div><div class='hunk'>@@ -4571,14 +4816,14 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc,</div><div class='ctx'> 	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, &amp;lreq-&gt;t.base_oloc);</div><div class='ctx'> 	req-&gt;r_flags = CEPH_OSD_FLAG_WRITE;</div><div class='ctx'> 	ktime_get_real_ts64(&amp;req-&gt;r_mtime);</div><div class='del'>-	osd_req_op_watch_init(req, 0, lreq-&gt;linger_id,</div><div class='del'>-			      CEPH_OSD_WATCH_OP_UNWATCH);</div><div class='add'>+	osd_req_op_watch_init(req, 0, CEPH_OSD_WATCH_OP_UNWATCH,</div><div class='add'>+			      lreq-&gt;linger_id, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put_req;</div><div class='ctx'> </div><div class='del'>-	ceph_osdc_start_request(osdc, req, false);</div><div class='add'>+	ceph_osdc_start_request(osdc, req);</div><div class='ctx'> 	linger_cancel(lreq);</div><div class='ctx'> 	linger_put(lreq);</div><div class='ctx'> 	ret = wait_request_timeout(req, opts-&gt;mount_timeout);</div><div class='hunk'>@@ -4597,13 +4842,12 @@ static int osd_req_op_notify_ack_init(struct ceph_osd_request *req, int which,</div><div class='ctx'> 	struct ceph_pagelist *pl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	op = _osd_req_op_init(req, which, CEPH_OSD_OP_NOTIFY_ACK, 0);</div><div class='add'>+	op = osd_req_op_init(req, which, CEPH_OSD_OP_NOTIFY_ACK, 0);</div><div class='ctx'> </div><div class='del'>-	pl = kmalloc(sizeof(*pl), GFP_NOIO);</div><div class='add'>+	pl = ceph_pagelist_alloc(GFP_NOIO);</div><div class='ctx'> 	if (!pl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ceph_pagelist_init(pl);</div><div class='ctx'> 	ret = ceph_pagelist_encode_64(pl, notify_id);</div><div class='ctx'> 	ret |= ceph_pagelist_encode_64(pl, cookie);</div><div class='ctx'> 	if (payload) {</div><div class='hunk'>@@ -4641,16 +4885,16 @@ int ceph_osdc_notify_ack(struct ceph_osd_client *osdc,</div><div class='ctx'> 	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, oloc);</div><div class='ctx'> 	req-&gt;r_flags = CEPH_OSD_FLAG_READ;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='add'>+	ret = osd_req_op_notify_ack_init(req, 0, notify_id, cookie, payload,</div><div class='add'>+					 payload_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put_req;</div><div class='ctx'> </div><div class='del'>-	ret = osd_req_op_notify_ack_init(req, 0, notify_id, cookie, payload,</div><div class='del'>-					 payload_len);</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put_req;</div><div class='ctx'> </div><div class='del'>-	ceph_osdc_start_request(osdc, req, false);</div><div class='add'>+	ceph_osdc_start_request(osdc, req);</div><div class='ctx'> 	ret = ceph_osdc_wait_request(osdc, req);</div><div class='ctx'> </div><div class='ctx'> out_put_req:</div><div class='hunk'>@@ -4659,36 +4903,6 @@ out_put_req:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_notify_ack);</div><div class='ctx'> </div><div class='del'>-static int osd_req_op_notify_init(struct ceph_osd_request *req, int which,</div><div class='del'>-				  u64 cookie, u32 prot_ver, u32 timeout,</div><div class='del'>-				  void *payload, u32 payload_len)</div><div class='del'>-{</div><div class='del'>-	struct ceph_osd_req_op *op;</div><div class='del'>-	struct ceph_pagelist *pl;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	op = _osd_req_op_init(req, which, CEPH_OSD_OP_NOTIFY, 0);</div><div class='del'>-	op-&gt;notify.cookie = cookie;</div><div class='del'>-</div><div class='del'>-	pl = kmalloc(sizeof(*pl), GFP_NOIO);</div><div class='del'>-	if (!pl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ceph_pagelist_init(pl);</div><div class='del'>-	ret = ceph_pagelist_encode_32(pl, 1); /* prot_ver */</div><div class='del'>-	ret |= ceph_pagelist_encode_32(pl, timeout);</div><div class='del'>-	ret |= ceph_pagelist_encode_32(pl, payload_len);</div><div class='del'>-	ret |= ceph_pagelist_append(pl, payload, payload_len);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ceph_pagelist_release(pl);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ceph_osd_data_pagelist_init(&amp;op-&gt;notify.request_data, pl);</div><div class='del'>-	op-&gt;indata_len = pl-&gt;length;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * @timeout: in seconds</div><div class='ctx'>  *</div><div class='hunk'>@@ -4707,7 +4921,6 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,</div><div class='ctx'> 		     size_t *preply_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_linger_request *lreq;</div><div class='del'>-	struct page **pages;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!timeout);</div><div class='hunk'>@@ -4720,45 +4933,41 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,</div><div class='ctx'> 	if (!lreq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	lreq-&gt;preply_pages = preply_pages;</div><div class='del'>-	lreq-&gt;preply_len = preply_len;</div><div class='del'>-</div><div class='del'>-	ceph_oid_copy(&amp;lreq-&gt;t.base_oid, oid);</div><div class='del'>-	ceph_oloc_copy(&amp;lreq-&gt;t.base_oloc, oloc);</div><div class='del'>-	lreq-&gt;t.flags = CEPH_OSD_FLAG_READ;</div><div class='del'>-</div><div class='del'>-	lreq-&gt;reg_req = alloc_linger_request(lreq);</div><div class='del'>-	if (!lreq-&gt;reg_req) {</div><div class='add'>+	lreq-&gt;request_pl = ceph_pagelist_alloc(GFP_NOIO);</div><div class='add'>+	if (!lreq-&gt;request_pl) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_put_lreq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* for notify_id */</div><div class='del'>-	pages = ceph_alloc_page_vector(1, GFP_NOIO);</div><div class='del'>-	if (IS_ERR(pages)) {</div><div class='del'>-		ret = PTR_ERR(pages);</div><div class='add'>+	ret = ceph_pagelist_encode_32(lreq-&gt;request_pl, 1); /* prot_ver */</div><div class='add'>+	ret |= ceph_pagelist_encode_32(lreq-&gt;request_pl, timeout);</div><div class='add'>+	ret |= ceph_pagelist_encode_32(lreq-&gt;request_pl, payload_len);</div><div class='add'>+	ret |= ceph_pagelist_append(lreq-&gt;request_pl, payload, payload_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out_put_lreq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;osdc-&gt;lock);</div><div class='del'>-	linger_register(lreq); /* before osd_req_op_* */</div><div class='del'>-	ret = osd_req_op_notify_init(lreq-&gt;reg_req, 0, lreq-&gt;linger_id, 1,</div><div class='del'>-				     timeout, payload, payload_len);</div><div class='del'>-	if (ret) {</div><div class='del'>-		linger_unregister(lreq);</div><div class='del'>-		up_write(&amp;osdc-&gt;lock);</div><div class='del'>-		ceph_release_page_vector(pages, 1);</div><div class='add'>+	/* for notify_id */</div><div class='add'>+	lreq-&gt;notify_id_pages = ceph_alloc_page_vector(1, GFP_NOIO);</div><div class='add'>+	if (IS_ERR(lreq-&gt;notify_id_pages)) {</div><div class='add'>+		ret = PTR_ERR(lreq-&gt;notify_id_pages);</div><div class='add'>+		lreq-&gt;notify_id_pages = NULL;</div><div class='ctx'> 		goto out_put_lreq;</div><div class='ctx'> 	}</div><div class='del'>-	ceph_osd_data_pages_init(osd_req_op_data(lreq-&gt;reg_req, 0, notify,</div><div class='del'>-						 response_data),</div><div class='del'>-				 pages, PAGE_SIZE, 0, false, true);</div><div class='del'>-	linger_submit(lreq);</div><div class='del'>-	up_write(&amp;osdc-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	lreq-&gt;preply_pages = preply_pages;</div><div class='add'>+	lreq-&gt;preply_len = preply_len;</div><div class='add'>+</div><div class='add'>+	ceph_oid_copy(&amp;lreq-&gt;t.base_oid, oid);</div><div class='add'>+	ceph_oloc_copy(&amp;lreq-&gt;t.base_oloc, oloc);</div><div class='add'>+	lreq-&gt;t.flags = CEPH_OSD_FLAG_READ;</div><div class='add'>+</div><div class='add'>+	linger_submit(lreq);</div><div class='ctx'> 	ret = linger_reg_commit_wait(lreq);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = linger_notify_finish_wait(lreq);</div><div class='add'>+		ret = linger_notify_finish_wait(lreq,</div><div class='add'>+				 msecs_to_jiffies(2 * timeout * MSEC_PER_SEC));</div><div class='ctx'> 	else</div><div class='ctx'> 		dout("lreq %p failed to initiate notify %d\n", lreq, ret);</div><div class='ctx'> </div><div class='hunk'>@@ -4769,40 +4978,6 @@ out_put_lreq:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_notify);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Return the number of milliseconds since the watch was last</div><div class='del'>- * confirmed, or an error.  If there is an error, the watch is no</div><div class='del'>- * longer valid, and should be destroyed with ceph_osdc_unwatch().</div><div class='del'>- */</div><div class='del'>-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,</div><div class='del'>-			  struct ceph_osd_linger_request *lreq)</div><div class='del'>-{</div><div class='del'>-	unsigned long stamp, age;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_read(&amp;osdc-&gt;lock);</div><div class='del'>-	mutex_lock(&amp;lreq-&gt;lock);</div><div class='del'>-	stamp = lreq-&gt;watch_valid_thru;</div><div class='del'>-	if (!list_empty(&amp;lreq-&gt;pending_lworks)) {</div><div class='del'>-		struct linger_work *lwork =</div><div class='del'>-		    list_first_entry(&amp;lreq-&gt;pending_lworks,</div><div class='del'>-				     struct linger_work,</div><div class='del'>-				     pending_item);</div><div class='del'>-</div><div class='del'>-		if (time_before(lwork-&gt;queued_stamp, stamp))</div><div class='del'>-			stamp = lwork-&gt;queued_stamp;</div><div class='del'>-	}</div><div class='del'>-	age = jiffies - stamp;</div><div class='del'>-	dout("%s lreq %p linger_id %llu age %lu last_error %d\n", __func__,</div><div class='del'>-	     lreq, lreq-&gt;linger_id, age, lreq-&gt;last_error);</div><div class='del'>-	/* we are truncating to msecs, so return a safe upper bound */</div><div class='del'>-	ret = lreq-&gt;last_error ?: 1 + jiffies_to_msecs(age);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;lreq-&gt;lock);</div><div class='del'>-	up_read(&amp;osdc-&gt;lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int decode_watcher(void **p, void *end, struct ceph_watch_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	u8 struct_v;</div><div class='hunk'>@@ -4812,20 +4987,26 @@ static int decode_watcher(void **p, void *end, struct ceph_watch_item *item)</div><div class='ctx'> 	ret = ceph_start_decoding(p, end, 2, "watch_item_t",</div><div class='ctx'> 				  &amp;struct_v, &amp;struct_len);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	ceph_decode_copy_safe(p, end, &amp;item-&gt;name, sizeof(item-&gt;name), bad);</div><div class='add'>+	ceph_decode_64_safe(p, end, item-&gt;cookie, bad);</div><div class='add'>+	ceph_decode_skip_32(p, end, bad); /* skip timeout seconds */</div><div class='ctx'> </div><div class='del'>-	ceph_decode_copy(p, &amp;item-&gt;name, sizeof(item-&gt;name));</div><div class='del'>-	item-&gt;cookie = ceph_decode_64(p);</div><div class='del'>-	*p += 4; /* skip timeout_seconds */</div><div class='ctx'> 	if (struct_v &gt;= 2) {</div><div class='del'>-		ceph_decode_copy(p, &amp;item-&gt;addr, sizeof(item-&gt;addr));</div><div class='del'>-		ceph_decode_addr(&amp;item-&gt;addr);</div><div class='add'>+		ret = ceph_decode_entity_addr(p, end, &amp;item-&gt;addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto bad;</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dout("%s %s%llu cookie %llu addr %s\n", __func__,</div><div class='ctx'> 	     ENTITY_NAME(item-&gt;name), item-&gt;cookie,</div><div class='del'>-	     ceph_pr_addr(&amp;item-&gt;addr.in_addr));</div><div class='del'>-	return 0;</div><div class='add'>+	     ceph_pr_addr(&amp;item-&gt;addr));</div><div class='add'>+bad:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int decode_watchers(void **p, void *end,</div><div class='hunk'>@@ -4881,10 +5062,6 @@ int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,</div><div class='ctx'> 	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, oloc);</div><div class='ctx'> 	req-&gt;r_flags = CEPH_OSD_FLAG_READ;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_put_req;</div><div class='del'>-</div><div class='ctx'> 	pages = ceph_alloc_page_vector(1, GFP_NOIO);</div><div class='ctx'> 	if (IS_ERR(pages)) {</div><div class='ctx'> 		ret = PTR_ERR(pages);</div><div class='hunk'>@@ -4896,7 +5073,11 @@ int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,</div><div class='ctx'> 						 response_data),</div><div class='ctx'> 				 pages, PAGE_SIZE, 0, false, true);</div><div class='ctx'> </div><div class='del'>-	ceph_osdc_start_request(osdc, req, false);</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_put_req;</div><div class='add'>+</div><div class='add'>+	ceph_osdc_start_request(osdc, req);</div><div class='ctx'> 	ret = ceph_osdc_wait_request(osdc, req);</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='ctx'> 		void *p = page_address(pages[0]);</div><div class='hunk'>@@ -4942,12 +5123,12 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,</div><div class='ctx'> 		   const char *class, const char *method,</div><div class='ctx'> 		   unsigned int flags,</div><div class='ctx'> 		   struct page *req_page, size_t req_len,</div><div class='del'>-		   struct page *resp_page, size_t *resp_len)</div><div class='add'>+		   struct page **resp_pages, size_t *resp_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_request *req;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (req_len &gt; PAGE_SIZE || (resp_page &amp;&amp; *resp_len &gt; PAGE_SIZE))</div><div class='add'>+	if (req_len &gt; PAGE_SIZE)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	req = ceph_osdc_alloc_request(osdc, NULL, 1, false, GFP_NOIO);</div><div class='hunk'>@@ -4958,26 +5139,26 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,</div><div class='ctx'> 	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, oloc);</div><div class='ctx'> 	req-&gt;r_flags = flags;</div><div class='ctx'> </div><div class='del'>-	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_put_req;</div><div class='del'>-</div><div class='del'>-	ret = osd_req_op_cls_init(req, 0, CEPH_OSD_OP_CALL, class, method);</div><div class='add'>+	ret = osd_req_op_cls_init(req, 0, class, method);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put_req;</div><div class='ctx'> </div><div class='ctx'> 	if (req_page)</div><div class='ctx'> 		osd_req_op_cls_request_data_pages(req, 0, &amp;req_page, req_len,</div><div class='ctx'> 						  0, false, false);</div><div class='del'>-	if (resp_page)</div><div class='del'>-		osd_req_op_cls_response_data_pages(req, 0, &amp;resp_page,</div><div class='add'>+	if (resp_pages)</div><div class='add'>+		osd_req_op_cls_response_data_pages(req, 0, resp_pages,</div><div class='ctx'> 						   *resp_len, 0, false, false);</div><div class='ctx'> </div><div class='del'>-	ceph_osdc_start_request(osdc, req, false);</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_NOIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_put_req;</div><div class='add'>+</div><div class='add'>+	ceph_osdc_start_request(osdc, req);</div><div class='ctx'> 	ret = ceph_osdc_wait_request(osdc, req);</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='ctx'> 		ret = req-&gt;r_ops[0].rval;</div><div class='del'>-		if (resp_page)</div><div class='add'>+		if (resp_pages)</div><div class='ctx'> 			*resp_len = req-&gt;r_ops[0].outdata_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4988,6 +5169,24 @@ out_put_req:</div><div class='ctx'> EXPORT_SYMBOL(ceph_osdc_call);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * reset all osd connections</div><div class='add'>+ */</div><div class='add'>+void ceph_osdc_reopen_osds(struct ceph_osd_client *osdc)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;osdc-&gt;lock);</div><div class='add'>+	for (n = rb_first(&amp;osdc-&gt;osds); n; ) {</div><div class='add'>+		struct ceph_osd *osd = rb_entry(n, struct ceph_osd, o_node);</div><div class='add'>+</div><div class='add'>+		n = rb_next(n);</div><div class='add'>+		if (!reopen_osd(osd))</div><div class='add'>+			kick_osd_requests(osd);</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;osdc-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * init, shutdown</div><div class='ctx'>  */</div><div class='ctx'> int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)</div><div class='hunk'>@@ -5021,11 +5220,12 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)</div><div class='ctx'> 		goto out_map;</div><div class='ctx'> </div><div class='ctx'> 	err = ceph_msgpool_init(&amp;osdc-&gt;msgpool_op, CEPH_MSG_OSD_OP,</div><div class='del'>-				PAGE_SIZE, 10, true, "osd_op");</div><div class='add'>+				PAGE_SIZE, CEPH_OSD_SLAB_OPS, 10, "osd_op");</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_mempool;</div><div class='ctx'> 	err = ceph_msgpool_init(&amp;osdc-&gt;msgpool_op_reply, CEPH_MSG_OSD_OPREPLY,</div><div class='del'>-				PAGE_SIZE, 10, true, "osd_op_reply");</div><div class='add'>+				PAGE_SIZE, CEPH_OSD_SLAB_OPS, 10,</div><div class='add'>+				"osd_op_reply");</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_msgpool;</div><div class='ctx'> </div><div class='hunk'>@@ -5089,84 +5289,43 @@ void ceph_osdc_stop(struct ceph_osd_client *osdc)</div><div class='ctx'> 	ceph_msgpool_destroy(&amp;osdc-&gt;msgpool_op_reply);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Read some contiguous pages.  If we cross a stripe boundary, shorten</div><div class='del'>- * *plen.  Return number of bytes read, or error.</div><div class='del'>- */</div><div class='del'>-int ceph_osdc_readpages(struct ceph_osd_client *osdc,</div><div class='del'>-			struct ceph_vino vino, struct ceph_file_layout *layout,</div><div class='del'>-			u64 off, u64 *plen,</div><div class='del'>-			u32 truncate_seq, u64 truncate_size,</div><div class='del'>-			struct page **pages, int num_pages, int page_align)</div><div class='del'>-{</div><div class='del'>-	struct ceph_osd_request *req;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	dout("readpages on ino %llx.%llx on %llu~%llu\n", vino.ino,</div><div class='del'>-	     vino.snap, off, *plen);</div><div class='del'>-	req = ceph_osdc_new_request(osdc, layout, vino, off, plen, 0, 1,</div><div class='del'>-				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,</div><div class='del'>-				    NULL, truncate_seq, truncate_size,</div><div class='del'>-				    false);</div><div class='del'>-	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='del'>-</div><div class='del'>-	/* it may be a short read due to an object boundary */</div><div class='del'>-	osd_req_op_extent_osd_data_pages(req, 0,</div><div class='del'>-				pages, *plen, page_align, false, false);</div><div class='del'>-</div><div class='del'>-	dout("readpages  final extent is %llu~%llu (%llu bytes align %d)\n",</div><div class='del'>-	     off, *plen, *plen, page_align);</div><div class='del'>-</div><div class='del'>-	rc = ceph_osdc_start_request(osdc, req, false);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = ceph_osdc_wait_request(osdc, req);</div><div class='del'>-</div><div class='del'>-	ceph_osdc_put_request(req);</div><div class='del'>-	dout("readpages result %d\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_osdc_readpages);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * do a synchronous write on N pages</div><div class='del'>- */</div><div class='del'>-int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,</div><div class='del'>-			 struct ceph_file_layout *layout,</div><div class='del'>-			 struct ceph_snap_context *snapc,</div><div class='del'>-			 u64 off, u64 len,</div><div class='del'>-			 u32 truncate_seq, u64 truncate_size,</div><div class='del'>-			 struct timespec64 *mtime,</div><div class='del'>-			 struct page **pages, int num_pages)</div><div class='add'>+int osd_req_op_copy_from_init(struct ceph_osd_request *req,</div><div class='add'>+			      u64 src_snapid, u64 src_version,</div><div class='add'>+			      struct ceph_object_id *src_oid,</div><div class='add'>+			      struct ceph_object_locator *src_oloc,</div><div class='add'>+			      u32 src_fadvise_flags,</div><div class='add'>+			      u32 dst_fadvise_flags,</div><div class='add'>+			      u32 truncate_seq, u64 truncate_size,</div><div class='add'>+			      u8 copy_from_flags)</div><div class='ctx'> {</div><div class='del'>-	struct ceph_osd_request *req;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int page_align = off &amp; ~PAGE_MASK;</div><div class='del'>-</div><div class='del'>-	req = ceph_osdc_new_request(osdc, layout, vino, off, &amp;len, 0, 1,</div><div class='del'>-				    CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,</div><div class='del'>-				    snapc, truncate_seq, truncate_size,</div><div class='del'>-				    true);</div><div class='del'>-	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='del'>-</div><div class='del'>-	/* it may be a short write due to an object boundary */</div><div class='del'>-	osd_req_op_extent_osd_data_pages(req, 0, pages, len, page_align,</div><div class='del'>-				false, false);</div><div class='del'>-	dout("writepages %llu~%llu (%llu bytes)\n", off, len, len);</div><div class='del'>-</div><div class='del'>-	req-&gt;r_mtime = *mtime;</div><div class='del'>-	rc = ceph_osdc_start_request(osdc, req, true);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = ceph_osdc_wait_request(osdc, req);</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	void *p, *end;</div><div class='ctx'> </div><div class='del'>-	ceph_osdc_put_request(req);</div><div class='del'>-	if (rc == 0)</div><div class='del'>-		rc = len;</div><div class='del'>-	dout("writepages result %d\n", rc);</div><div class='del'>-	return rc;</div><div class='add'>+	pages = ceph_alloc_page_vector(1, GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(pages))</div><div class='add'>+		return PTR_ERR(pages);</div><div class='add'>+</div><div class='add'>+	op = osd_req_op_init(req, 0, CEPH_OSD_OP_COPY_FROM2,</div><div class='add'>+			     dst_fadvise_flags);</div><div class='add'>+	op-&gt;copy_from.snapid = src_snapid;</div><div class='add'>+	op-&gt;copy_from.src_version = src_version;</div><div class='add'>+	op-&gt;copy_from.flags = copy_from_flags;</div><div class='add'>+	op-&gt;copy_from.src_fadvise_flags = src_fadvise_flags;</div><div class='add'>+</div><div class='add'>+	p = page_address(pages[0]);</div><div class='add'>+	end = p + PAGE_SIZE;</div><div class='add'>+	ceph_encode_string(&amp;p, end, src_oid-&gt;name, src_oid-&gt;name_len);</div><div class='add'>+	encode_oloc(&amp;p, end, src_oloc);</div><div class='add'>+	ceph_encode_32(&amp;p, truncate_seq);</div><div class='add'>+	ceph_encode_64(&amp;p, truncate_size);</div><div class='add'>+	op-&gt;indata_len = PAGE_SIZE - (end - p);</div><div class='add'>+</div><div class='add'>+	ceph_osd_data_pages_init(&amp;op-&gt;copy_from.osd_data, pages,</div><div class='add'>+				 op-&gt;indata_len, 0, false, true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ceph_osdc_writepages);</div><div class='add'>+EXPORT_SYMBOL(osd_req_op_copy_from_init);</div><div class='ctx'> </div><div class='ctx'> int __init ceph_osdc_setup(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -5190,7 +5349,7 @@ void ceph_osdc_cleanup(void)</div><div class='ctx'> /*</div><div class='ctx'>  * handle incoming message</div><div class='ctx'>  */</div><div class='del'>-static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='add'>+static void osd_dispatch(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *osd = con-&gt;private;</div><div class='ctx'> 	struct ceph_osd_client *osdc = osd-&gt;o_osdc;</div><div class='hunk'>@@ -5218,6 +5377,24 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)</div><div class='ctx'> 	ceph_msg_put(msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* How much sparse data was requested? */</div><div class='add'>+static u64 sparse_data_requested(struct ceph_osd_request *req)</div><div class='add'>+{</div><div class='add'>+	u64 len = 0;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;r_flags &amp; CEPH_OSD_FLAG_READ) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; req-&gt;r_num_ops; ++i) {</div><div class='add'>+			struct ceph_osd_req_op *op = &amp;req-&gt;r_ops[i];</div><div class='add'>+</div><div class='add'>+			if (op-&gt;op == CEPH_OSD_OP_SPARSE_READ)</div><div class='add'>+				len += op-&gt;extent.length;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Lookup and return message for incoming reply.  Don't try to do</div><div class='ctx'>  * anything about a larger than preallocated data portion of the</div><div class='hunk'>@@ -5234,6 +5411,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,</div><div class='ctx'> 	int front_len = le32_to_cpu(hdr-&gt;front_len);</div><div class='ctx'> 	int data_len = le32_to_cpu(hdr-&gt;data_len);</div><div class='ctx'> 	u64 tid = le64_to_cpu(hdr-&gt;tid);</div><div class='add'>+	u64 srlen;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;osdc-&gt;lock);</div><div class='ctx'> 	if (!osd_registered(osd)) {</div><div class='hunk'>@@ -5266,7 +5444,8 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,</div><div class='ctx'> 		req-&gt;r_reply = m;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data_len &gt; req-&gt;r_reply-&gt;data_length) {</div><div class='add'>+	srlen = sparse_data_requested(req);</div><div class='add'>+	if (!srlen &amp;&amp; data_len &gt; req-&gt;r_reply-&gt;data_length) {</div><div class='ctx'> 		pr_warn("%s osd%d tid %llu data %d &gt; preallocated %zu, skipping\n",</div><div class='ctx'> 			__func__, osd-&gt;o_osd, req-&gt;r_tid, data_len,</div><div class='ctx'> 			req-&gt;r_reply-&gt;data_length);</div><div class='hunk'>@@ -5276,6 +5455,8 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	m = ceph_msg_get(req-&gt;r_reply);</div><div class='add'>+	m-&gt;sparse_read_total = srlen;</div><div class='add'>+</div><div class='ctx'> 	dout("get_reply tid %lld %p\n", tid, m);</div><div class='ctx'> </div><div class='ctx'> out_unlock_session:</div><div class='hunk'>@@ -5285,9 +5466,6 @@ out_unlock_osdc:</div><div class='ctx'> 	return m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TODO: switch to a msg-owned pagelist</div><div class='del'>- */</div><div class='ctx'> static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_msg *m;</div><div class='hunk'>@@ -5295,13 +5473,12 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr)</div><div class='ctx'> 	u32 front_len = le32_to_cpu(hdr-&gt;front_len);</div><div class='ctx'> 	u32 data_len = le32_to_cpu(hdr-&gt;data_len);</div><div class='ctx'> </div><div class='del'>-	m = ceph_msg_new(type, front_len, GFP_NOIO, false);</div><div class='add'>+	m = ceph_msg_new2(type, front_len, 1, GFP_NOIO, false);</div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (data_len) {</div><div class='ctx'> 		struct page **pages;</div><div class='del'>-		struct ceph_osd_data osd_data;</div><div class='ctx'> </div><div class='ctx'> 		pages = ceph_alloc_page_vector(calc_pages_for(0, data_len),</div><div class='ctx'> 					       GFP_NOIO);</div><div class='hunk'>@@ -5310,17 +5487,15 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ceph_osd_data_pages_init(&amp;osd_data, pages, data_len, 0, false,</div><div class='del'>-					 false);</div><div class='del'>-		ceph_osdc_msg_data_add(m, &amp;osd_data);</div><div class='add'>+		ceph_msg_data_add_pages(m, pages, data_len, 0, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ceph_msg *alloc_msg(struct ceph_connection *con,</div><div class='del'>-				  struct ceph_msg_header *hdr,</div><div class='del'>-				  int *skip)</div><div class='add'>+static struct ceph_msg *osd_alloc_msg(struct ceph_connection *con,</div><div class='add'>+				      struct ceph_msg_header *hdr,</div><div class='add'>+				      int *skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *osd = con-&gt;private;</div><div class='ctx'> 	int type = le16_to_cpu(hdr-&gt;type);</div><div class='hunk'>@@ -5344,7 +5519,7 @@ static struct ceph_msg *alloc_msg(struct ceph_connection *con,</div><div class='ctx'> /*</div><div class='ctx'>  * Wrappers to refcount containing ceph_osd struct</div><div class='ctx'>  */</div><div class='del'>-static struct ceph_connection *get_osd_con(struct ceph_connection *con)</div><div class='add'>+static struct ceph_connection *osd_get_con(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *osd = con-&gt;private;</div><div class='ctx'> 	if (get_osd(osd))</div><div class='hunk'>@@ -5352,7 +5527,7 @@ static struct ceph_connection *get_osd_con(struct ceph_connection *con)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void put_osd_con(struct ceph_connection *con)</div><div class='add'>+static void osd_put_con(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *osd = con-&gt;private;</div><div class='ctx'> 	put_osd(osd);</div><div class='hunk'>@@ -5361,39 +5536,29 @@ static void put_osd_con(struct ceph_connection *con)</div><div class='ctx'> /*</div><div class='ctx'>  * authentication</div><div class='ctx'>  */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Note: returned pointer is the address of a structure that's</div><div class='ctx'>  * managed separately.  Caller must *not* attempt to free it.</div><div class='ctx'>  */</div><div class='del'>-static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,</div><div class='del'>-					int *proto, int force_new)</div><div class='add'>+static struct ceph_auth_handshake *</div><div class='add'>+osd_get_authorizer(struct ceph_connection *con, int *proto, int force_new)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *o = con-&gt;private;</div><div class='ctx'> 	struct ceph_osd_client *osdc = o-&gt;o_osdc;</div><div class='ctx'> 	struct ceph_auth_client *ac = osdc-&gt;client-&gt;monc.auth;</div><div class='ctx'> 	struct ceph_auth_handshake *auth = &amp;o-&gt;o_auth;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (force_new &amp;&amp; auth-&gt;authorizer) {</div><div class='del'>-		ceph_auth_destroy_authorizer(auth-&gt;authorizer);</div><div class='del'>-		auth-&gt;authorizer = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (!auth-&gt;authorizer) {</div><div class='del'>-		int ret = ceph_auth_create_authorizer(ac, CEPH_ENTITY_TYPE_OSD,</div><div class='del'>-						      auth);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	} else {</div><div class='del'>-		int ret = ceph_auth_update_authorizer(ac, CEPH_ENTITY_TYPE_OSD,</div><div class='del'>-						     auth);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-	*proto = ac-&gt;protocol;</div><div class='add'>+	ret = __ceph_auth_get_authorizer(ac, auth, CEPH_ENTITY_TYPE_OSD,</div><div class='add'>+					 force_new, proto, NULL, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	return auth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int add_authorizer_challenge(struct ceph_connection *con,</div><div class='add'>+static int osd_add_authorizer_challenge(struct ceph_connection *con,</div><div class='ctx'> 				    void *challenge_buf, int challenge_buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *o = con-&gt;private;</div><div class='hunk'>@@ -5404,16 +5569,19 @@ static int add_authorizer_challenge(struct ceph_connection *con,</div><div class='ctx'> 					    challenge_buf, challenge_buf_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int verify_authorizer_reply(struct ceph_connection *con)</div><div class='add'>+static int osd_verify_authorizer_reply(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *o = con-&gt;private;</div><div class='ctx'> 	struct ceph_osd_client *osdc = o-&gt;o_osdc;</div><div class='ctx'> 	struct ceph_auth_client *ac = osdc-&gt;client-&gt;monc.auth;</div><div class='add'>+	struct ceph_auth_handshake *auth = &amp;o-&gt;o_auth;</div><div class='ctx'> </div><div class='del'>-	return ceph_auth_verify_authorizer_reply(ac, o-&gt;o_auth.authorizer);</div><div class='add'>+	return ceph_auth_verify_authorizer_reply(ac, auth-&gt;authorizer,</div><div class='add'>+		auth-&gt;authorizer_reply_buf, auth-&gt;authorizer_reply_buf_len,</div><div class='add'>+		NULL, NULL, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int invalidate_authorizer(struct ceph_connection *con)</div><div class='add'>+static int osd_invalidate_authorizer(struct ceph_connection *con)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd *o = con-&gt;private;</div><div class='ctx'> 	struct ceph_osd_client *osdc = o-&gt;o_osdc;</div><div class='hunk'>@@ -5423,6 +5591,80 @@ static int invalidate_authorizer(struct ceph_connection *con)</div><div class='ctx'> 	return ceph_monc_validate_auth(&amp;osdc-&gt;client-&gt;monc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int osd_get_auth_request(struct ceph_connection *con,</div><div class='add'>+				void *buf, int *buf_len,</div><div class='add'>+				void **authorizer, int *authorizer_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_auth_client *ac = o-&gt;o_osdc-&gt;client-&gt;monc.auth;</div><div class='add'>+	struct ceph_auth_handshake *auth = &amp;o-&gt;o_auth;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ceph_auth_get_authorizer(ac, auth, CEPH_ENTITY_TYPE_OSD,</div><div class='add'>+				       buf, buf_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*authorizer = auth-&gt;authorizer_buf;</div><div class='add'>+	*authorizer_len = auth-&gt;authorizer_buf_len;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int osd_handle_auth_reply_more(struct ceph_connection *con,</div><div class='add'>+				      void *reply, int reply_len,</div><div class='add'>+				      void *buf, int *buf_len,</div><div class='add'>+				      void **authorizer, int *authorizer_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_auth_client *ac = o-&gt;o_osdc-&gt;client-&gt;monc.auth;</div><div class='add'>+	struct ceph_auth_handshake *auth = &amp;o-&gt;o_auth;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ceph_auth_handle_svc_reply_more(ac, auth, reply, reply_len,</div><div class='add'>+					      buf, buf_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*authorizer = auth-&gt;authorizer_buf;</div><div class='add'>+	*authorizer_len = auth-&gt;authorizer_buf_len;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int osd_handle_auth_done(struct ceph_connection *con,</div><div class='add'>+				u64 global_id, void *reply, int reply_len,</div><div class='add'>+				u8 *session_key, int *session_key_len,</div><div class='add'>+				u8 *con_secret, int *con_secret_len)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_auth_client *ac = o-&gt;o_osdc-&gt;client-&gt;monc.auth;</div><div class='add'>+	struct ceph_auth_handshake *auth = &amp;o-&gt;o_auth;</div><div class='add'>+</div><div class='add'>+	return ceph_auth_handle_svc_reply_done(ac, auth, reply, reply_len,</div><div class='add'>+					       session_key, session_key_len,</div><div class='add'>+					       con_secret, con_secret_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int osd_handle_auth_bad_method(struct ceph_connection *con,</div><div class='add'>+				      int used_proto, int result,</div><div class='add'>+				      const int *allowed_protos, int proto_cnt,</div><div class='add'>+				      const int *allowed_modes, int mode_cnt)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_mon_client *monc = &amp;o-&gt;o_osdc-&gt;client-&gt;monc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ceph_auth_handle_bad_authorizer(monc-&gt;auth, CEPH_ENTITY_TYPE_OSD,</div><div class='add'>+					    used_proto, result,</div><div class='add'>+					    allowed_protos, proto_cnt,</div><div class='add'>+					    allowed_modes, mode_cnt)) {</div><div class='add'>+		ret = ceph_monc_validate_auth(monc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EACCES;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void osd_reencode_message(struct ceph_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	int type = le16_to_cpu(msg-&gt;hdr.type);</div><div class='hunk'>@@ -5447,17 +5689,229 @@ static int osd_check_message_signature(struct ceph_msg *msg)</div><div class='ctx'> 	return ceph_auth_check_message_signature(auth, msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void advance_cursor(struct ceph_msg_data_cursor *cursor, size_t len,</div><div class='add'>+			   bool zero)</div><div class='add'>+{</div><div class='add'>+	while (len) {</div><div class='add'>+		struct page *page;</div><div class='add'>+		size_t poff, plen;</div><div class='add'>+</div><div class='add'>+		page = ceph_msg_data_next(cursor, &amp;poff, &amp;plen);</div><div class='add'>+		if (plen &gt; len)</div><div class='add'>+			plen = len;</div><div class='add'>+		if (zero)</div><div class='add'>+			zero_user_segment(page, poff, poff + plen);</div><div class='add'>+		len -= plen;</div><div class='add'>+		ceph_msg_data_advance(cursor, plen);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prep_next_sparse_read(struct ceph_connection *con,</div><div class='add'>+				 struct ceph_msg_data_cursor *cursor)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_sparse_read *sr = &amp;o-&gt;o_sparse_read;</div><div class='add'>+	struct ceph_osd_request *req;</div><div class='add'>+	struct ceph_osd_req_op *op;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;o-&gt;o_requests_lock);</div><div class='add'>+	req = lookup_request(&amp;o-&gt;o_requests, le64_to_cpu(con-&gt;in_msg-&gt;hdr.tid));</div><div class='add'>+	if (!req) {</div><div class='add'>+		spin_unlock(&amp;o-&gt;o_requests_lock);</div><div class='add'>+		return -EBADR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (o-&gt;o_sparse_op_idx &lt; 0) {</div><div class='add'>+		dout("%s: [%d] starting new sparse read req\n",</div><div class='add'>+		     __func__, o-&gt;o_osd);</div><div class='add'>+	} else {</div><div class='add'>+		u64 end;</div><div class='add'>+</div><div class='add'>+		op = &amp;req-&gt;r_ops[o-&gt;o_sparse_op_idx];</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(op-&gt;extent.sparse_ext);</div><div class='add'>+</div><div class='add'>+		/* hand back buffer we took earlier */</div><div class='add'>+		op-&gt;extent.sparse_ext = sr-&gt;sr_extent;</div><div class='add'>+		sr-&gt;sr_extent = NULL;</div><div class='add'>+		op-&gt;extent.sparse_ext_cnt = sr-&gt;sr_count;</div><div class='add'>+		sr-&gt;sr_ext_len = 0;</div><div class='add'>+		dout("%s: [%d] completed extent array len %d cursor-&gt;resid %zd\n",</div><div class='add'>+		     __func__, o-&gt;o_osd, op-&gt;extent.sparse_ext_cnt, cursor-&gt;resid);</div><div class='add'>+		/* Advance to end of data for this operation */</div><div class='add'>+		end = ceph_sparse_ext_map_end(op);</div><div class='add'>+		if (end &lt; sr-&gt;sr_req_len)</div><div class='add'>+			advance_cursor(cursor, sr-&gt;sr_req_len - end, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_init_sparse_read(sr);</div><div class='add'>+</div><div class='add'>+	/* find next op in this request (if any) */</div><div class='add'>+	while (++o-&gt;o_sparse_op_idx &lt; req-&gt;r_num_ops) {</div><div class='add'>+		op = &amp;req-&gt;r_ops[o-&gt;o_sparse_op_idx];</div><div class='add'>+		if (op-&gt;op == CEPH_OSD_OP_SPARSE_READ)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset for next sparse read request */</div><div class='add'>+	spin_unlock(&amp;o-&gt;o_requests_lock);</div><div class='add'>+	o-&gt;o_sparse_op_idx = -1;</div><div class='add'>+	return 0;</div><div class='add'>+found:</div><div class='add'>+	sr-&gt;sr_req_off = op-&gt;extent.offset;</div><div class='add'>+	sr-&gt;sr_req_len = op-&gt;extent.length;</div><div class='add'>+	sr-&gt;sr_pos = sr-&gt;sr_req_off;</div><div class='add'>+	dout("%s: [%d] new sparse read op at idx %d 0x%llx~0x%llx\n", __func__,</div><div class='add'>+	     o-&gt;o_osd, o-&gt;o_sparse_op_idx, sr-&gt;sr_req_off, sr-&gt;sr_req_len);</div><div class='add'>+</div><div class='add'>+	/* hand off request's sparse extent map buffer */</div><div class='add'>+	sr-&gt;sr_ext_len = op-&gt;extent.sparse_ext_cnt;</div><div class='add'>+	op-&gt;extent.sparse_ext_cnt = 0;</div><div class='add'>+	sr-&gt;sr_extent = op-&gt;extent.sparse_ext;</div><div class='add'>+	op-&gt;extent.sparse_ext = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;o-&gt;o_requests_lock);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+static inline void convert_extent_map(struct ceph_sparse_read *sr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sr-&gt;sr_count; i++) {</div><div class='add'>+		struct ceph_sparse_extent *ext = &amp;sr-&gt;sr_extent[i];</div><div class='add'>+</div><div class='add'>+		ext-&gt;off = le64_to_cpu((__force __le64)ext-&gt;off);</div><div class='add'>+		ext-&gt;len = le64_to_cpu((__force __le64)ext-&gt;len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void convert_extent_map(struct ceph_sparse_read *sr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int osd_sparse_read(struct ceph_connection *con,</div><div class='add'>+			   struct ceph_msg_data_cursor *cursor,</div><div class='add'>+			   char **pbuf)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd *o = con-&gt;private;</div><div class='add'>+	struct ceph_sparse_read *sr = &amp;o-&gt;o_sparse_read;</div><div class='add'>+	u32 count = sr-&gt;sr_count;</div><div class='add'>+	u64 eoff, elen, len = 0;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	switch (sr-&gt;sr_state) {</div><div class='add'>+	case CEPH_SPARSE_READ_HDR:</div><div class='add'>+next_op:</div><div class='add'>+		ret = prep_next_sparse_read(con, cursor);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* number of extents */</div><div class='add'>+		ret = sizeof(sr-&gt;sr_count);</div><div class='add'>+		*pbuf = (char *)&amp;sr-&gt;sr_count;</div><div class='add'>+		sr-&gt;sr_state = CEPH_SPARSE_READ_EXTENTS;</div><div class='add'>+		break;</div><div class='add'>+	case CEPH_SPARSE_READ_EXTENTS:</div><div class='add'>+		/* Convert sr_count to host-endian */</div><div class='add'>+		count = le32_to_cpu((__force __le32)sr-&gt;sr_count);</div><div class='add'>+		sr-&gt;sr_count = count;</div><div class='add'>+		dout("[%d] got %u extents\n", o-&gt;o_osd, count);</div><div class='add'>+</div><div class='add'>+		if (count &gt; 0) {</div><div class='add'>+			if (!sr-&gt;sr_extent || count &gt; sr-&gt;sr_ext_len) {</div><div class='add'>+				/* no extent array provided, or too short */</div><div class='add'>+				kfree(sr-&gt;sr_extent);</div><div class='add'>+				sr-&gt;sr_extent = kmalloc_array(count,</div><div class='add'>+							      sizeof(*sr-&gt;sr_extent),</div><div class='add'>+							      GFP_NOIO);</div><div class='add'>+				if (!sr-&gt;sr_extent) {</div><div class='add'>+					pr_err("%s: failed to allocate %u extents\n",</div><div class='add'>+					       __func__, count);</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				}</div><div class='add'>+				sr-&gt;sr_ext_len = count;</div><div class='add'>+			}</div><div class='add'>+			ret = count * sizeof(*sr-&gt;sr_extent);</div><div class='add'>+			*pbuf = (char *)sr-&gt;sr_extent;</div><div class='add'>+			sr-&gt;sr_state = CEPH_SPARSE_READ_DATA_LEN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* No extents? Read data len */</div><div class='add'>+		fallthrough;</div><div class='add'>+	case CEPH_SPARSE_READ_DATA_LEN:</div><div class='add'>+		convert_extent_map(sr);</div><div class='add'>+		ret = sizeof(sr-&gt;sr_datalen);</div><div class='add'>+		*pbuf = (char *)&amp;sr-&gt;sr_datalen;</div><div class='add'>+		sr-&gt;sr_state = CEPH_SPARSE_READ_DATA_PRE;</div><div class='add'>+		break;</div><div class='add'>+	case CEPH_SPARSE_READ_DATA_PRE:</div><div class='add'>+		/* Convert sr_datalen to host-endian */</div><div class='add'>+		sr-&gt;sr_datalen = le32_to_cpu((__force __le32)sr-&gt;sr_datalen);</div><div class='add'>+		for (i = 0; i &lt; count; i++)</div><div class='add'>+			len += sr-&gt;sr_extent[i].len;</div><div class='add'>+		if (sr-&gt;sr_datalen != len) {</div><div class='add'>+			pr_warn_ratelimited("data len %u != extent len %llu\n",</div><div class='add'>+					    sr-&gt;sr_datalen, len);</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		}</div><div class='add'>+		sr-&gt;sr_state = CEPH_SPARSE_READ_DATA;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case CEPH_SPARSE_READ_DATA:</div><div class='add'>+		if (sr-&gt;sr_index &gt;= count) {</div><div class='add'>+			sr-&gt;sr_state = CEPH_SPARSE_READ_HDR;</div><div class='add'>+			goto next_op;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		eoff = sr-&gt;sr_extent[sr-&gt;sr_index].off;</div><div class='add'>+		elen = sr-&gt;sr_extent[sr-&gt;sr_index].len;</div><div class='add'>+</div><div class='add'>+		dout("[%d] ext %d off 0x%llx len 0x%llx\n",</div><div class='add'>+		     o-&gt;o_osd, sr-&gt;sr_index, eoff, elen);</div><div class='add'>+</div><div class='add'>+		if (elen &gt; INT_MAX) {</div><div class='add'>+			dout("Sparse read extent length too long (0x%llx)\n",</div><div class='add'>+			     elen);</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* zero out anything from sr_pos to start of extent */</div><div class='add'>+		if (sr-&gt;sr_pos &lt; eoff)</div><div class='add'>+			advance_cursor(cursor, eoff - sr-&gt;sr_pos, true);</div><div class='add'>+</div><div class='add'>+		/* Set position to end of extent */</div><div class='add'>+		sr-&gt;sr_pos = eoff + elen;</div><div class='add'>+</div><div class='add'>+		/* send back the new length and nullify the ptr */</div><div class='add'>+		cursor-&gt;sr_resid = elen;</div><div class='add'>+		ret = elen;</div><div class='add'>+		*pbuf = NULL;</div><div class='add'>+</div><div class='add'>+		/* Bump the array index */</div><div class='add'>+		++sr-&gt;sr_index;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ceph_connection_operations osd_con_ops = {</div><div class='del'>-	.get = get_osd_con,</div><div class='del'>-	.put = put_osd_con,</div><div class='del'>-	.dispatch = dispatch,</div><div class='del'>-	.get_authorizer = get_authorizer,</div><div class='del'>-	.add_authorizer_challenge = add_authorizer_challenge,</div><div class='del'>-	.verify_authorizer_reply = verify_authorizer_reply,</div><div class='del'>-	.invalidate_authorizer = invalidate_authorizer,</div><div class='del'>-	.alloc_msg = alloc_msg,</div><div class='add'>+	.get = osd_get_con,</div><div class='add'>+	.put = osd_put_con,</div><div class='add'>+	.sparse_read = osd_sparse_read,</div><div class='add'>+	.alloc_msg = osd_alloc_msg,</div><div class='add'>+	.dispatch = osd_dispatch,</div><div class='add'>+	.fault = osd_fault,</div><div class='ctx'> 	.reencode_message = osd_reencode_message,</div><div class='add'>+	.get_authorizer = osd_get_authorizer,</div><div class='add'>+	.add_authorizer_challenge = osd_add_authorizer_challenge,</div><div class='add'>+	.verify_authorizer_reply = osd_verify_authorizer_reply,</div><div class='add'>+	.invalidate_authorizer = osd_invalidate_authorizer,</div><div class='ctx'> 	.sign_message = osd_sign_message,</div><div class='ctx'> 	.check_message_signature = osd_check_message_signature,</div><div class='del'>-	.fault = osd_fault,</div><div class='add'>+	.get_auth_request = osd_get_auth_request,</div><div class='add'>+	.handle_auth_reply_more = osd_handle_auth_reply_more,</div><div class='add'>+	.handle_auth_done = osd_handle_auth_done,</div><div class='add'>+	.handle_auth_bad_method = osd_handle_auth_bad_method,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c<br/>index 98c0ff3d6441..d245fa508e1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/osdmap.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/osdmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/osdmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/osdmap.c</a></div><div class='hunk'>@@ -11,6 +11,22 @@</div><div class='ctx'> #include &lt;linux/crush/hash.h&gt;</div><div class='ctx'> #include &lt;linux/crush/mapper.h&gt;</div><div class='ctx'> </div><div class='add'>+static __printf(2, 3)</div><div class='add'>+void osdmap_info(const struct ceph_osdmap *map, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s (%pU e%u): %pV", KBUILD_MODNAME, &amp;map-&gt;fsid,</div><div class='add'>+	       map-&gt;epoch, &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char *ceph_osdmap_state_str(char *str, int len, u32 state)</div><div class='ctx'> {</div><div class='ctx'> 	if (!len)</div><div class='hunk'>@@ -138,6 +154,79 @@ bad:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct crush_name_node {</div><div class='add'>+	struct rb_node cn_node;</div><div class='add'>+	int cn_id;</div><div class='add'>+	char cn_name[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct crush_name_node *alloc_crush_name(size_t name_len)</div><div class='add'>+{</div><div class='add'>+	struct crush_name_node *cn;</div><div class='add'>+</div><div class='add'>+	cn = kmalloc(sizeof(*cn) + name_len + 1, GFP_NOIO);</div><div class='add'>+	if (!cn)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	RB_CLEAR_NODE(&amp;cn-&gt;cn_node);</div><div class='add'>+	return cn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_crush_name(struct crush_name_node *cn)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!RB_EMPTY_NODE(&amp;cn-&gt;cn_node));</div><div class='add'>+</div><div class='add'>+	kfree(cn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_RB_FUNCS(crush_name, struct crush_name_node, cn_id, cn_node)</div><div class='add'>+</div><div class='add'>+static int decode_crush_names(void **p, void *end, struct rb_root *root)</div><div class='add'>+{</div><div class='add'>+	u32 n;</div><div class='add'>+</div><div class='add'>+	ceph_decode_32_safe(p, end, n, e_inval);</div><div class='add'>+	while (n--) {</div><div class='add'>+		struct crush_name_node *cn;</div><div class='add'>+		int id;</div><div class='add'>+		u32 name_len;</div><div class='add'>+</div><div class='add'>+		ceph_decode_32_safe(p, end, id, e_inval);</div><div class='add'>+		ceph_decode_32_safe(p, end, name_len, e_inval);</div><div class='add'>+		ceph_decode_need(p, end, name_len, e_inval);</div><div class='add'>+</div><div class='add'>+		cn = alloc_crush_name(name_len);</div><div class='add'>+		if (!cn)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cn-&gt;cn_id = id;</div><div class='add'>+		memcpy(cn-&gt;cn_name, *p, name_len);</div><div class='add'>+		cn-&gt;cn_name[name_len] = '\0';</div><div class='add'>+		*p += name_len;</div><div class='add'>+</div><div class='add'>+		if (!__insert_crush_name(root, cn)) {</div><div class='add'>+			free_crush_name(cn);</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+e_inval:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clear_crush_names(struct rb_root *root)</div><div class='add'>+{</div><div class='add'>+	while (!RB_EMPTY_ROOT(root)) {</div><div class='add'>+		struct crush_name_node *cn =</div><div class='add'>+		    rb_entry(rb_first(root), struct crush_name_node, cn_node);</div><div class='add'>+</div><div class='add'>+		erase_crush_name(root, cn);</div><div class='add'>+		free_crush_name(cn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct crush_choose_arg_map *alloc_choose_arg_map(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct crush_choose_arg_map *arg_map;</div><div class='hunk'>@@ -354,6 +443,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)</div><div class='ctx'> 	if (c == NULL)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	c-&gt;type_names = RB_ROOT;</div><div class='add'>+	c-&gt;names = RB_ROOT;</div><div class='ctx'> 	c-&gt;choose_args = RB_ROOT;</div><div class='ctx'> </div><div class='ctx'>         /* set tunables to default values */</div><div class='hunk'>@@ -495,12 +586,11 @@ static struct crush_map *crush_decode(void *pbyval, void *end)</div><div class='ctx'> 			  / sizeof(struct crush_rule_step))</div><div class='ctx'> 			goto bad;</div><div class='ctx'> #endif</div><div class='del'>-		r = c-&gt;rules[i] = kmalloc(sizeof(*r) +</div><div class='del'>-					  yes*sizeof(struct crush_rule_step),</div><div class='del'>-					  GFP_NOFS);</div><div class='add'>+		r = kmalloc(struct_size(r, steps, yes), GFP_NOFS);</div><div class='ctx'> 		if (r == NULL)</div><div class='ctx'> 			goto badmem;</div><div class='ctx'> 		dout(" rule %d is at %p\n", i, r);</div><div class='add'>+		c-&gt;rules[i] = r;</div><div class='ctx'> 		r-&gt;len = yes;</div><div class='ctx'> 		ceph_decode_copy_safe(p, end, &amp;r-&gt;mask, 4, bad); /* 4 u8's */</div><div class='ctx'> 		ceph_decode_need(p, end, r-&gt;len*3*sizeof(u32), bad);</div><div class='hunk'>@@ -511,8 +601,14 @@ static struct crush_map *crush_decode(void *pbyval, void *end)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ceph_decode_skip_map(p, end, 32, string, bad); /* type_map */</div><div class='del'>-	ceph_decode_skip_map(p, end, 32, string, bad); /* name_map */</div><div class='add'>+	err = decode_crush_names(p, end, &amp;c-&gt;type_names);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = decode_crush_names(p, end, &amp;c-&gt;names);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='ctx'> 	ceph_decode_skip_map(p, end, 32, string, bad); /* rule_name_map */</div><div class='ctx'> </div><div class='ctx'>         /* tunables */</div><div class='hunk'>@@ -637,48 +733,11 @@ DEFINE_RB_FUNCS2(pg_mapping, struct ceph_pg_mapping, pgid, ceph_pg_compare,</div><div class='ctx'> /*</div><div class='ctx'>  * rbtree of pg pool info</div><div class='ctx'>  */</div><div class='del'>-static int __insert_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *new)</div><div class='del'>-{</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct ceph_pg_pool_info *pi = NULL;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		pi = rb_entry(parent, struct ceph_pg_pool_info, node);</div><div class='del'>-		if (new-&gt;id &lt; pi-&gt;id)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else if (new-&gt;id &gt; pi-&gt;id)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(&amp;new-&gt;node, parent, p);</div><div class='del'>-	rb_insert_color(&amp;new-&gt;node, root);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ceph_pg_pool_info *__lookup_pg_pool(struct rb_root *root, u64 id)</div><div class='del'>-{</div><div class='del'>-	struct ceph_pg_pool_info *pi;</div><div class='del'>-	struct rb_node *n = root-&gt;rb_node;</div><div class='del'>-</div><div class='del'>-	while (n) {</div><div class='del'>-		pi = rb_entry(n, struct ceph_pg_pool_info, node);</div><div class='del'>-		if (id &lt; pi-&gt;id)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else if (id &gt; pi-&gt;id)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return pi;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+DEFINE_RB_FUNCS(pg_pool, struct ceph_pg_pool_info, id, node)</div><div class='ctx'> </div><div class='ctx'> struct ceph_pg_pool_info *ceph_pg_pool_by_id(struct ceph_osdmap *map, u64 id)</div><div class='ctx'> {</div><div class='del'>-	return __lookup_pg_pool(&amp;map-&gt;pg_pools, id);</div><div class='add'>+	return lookup_pg_pool(&amp;map-&gt;pg_pools, id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id)</div><div class='hunk'>@@ -691,8 +750,7 @@ const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id)</div><div class='ctx'> 	if (WARN_ON_ONCE(id &gt; (u64) INT_MAX))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	pi = __lookup_pg_pool(&amp;map-&gt;pg_pools, (int) id);</div><div class='del'>-</div><div class='add'>+	pi = lookup_pg_pool(&amp;map-&gt;pg_pools, id);</div><div class='ctx'> 	return pi ? pi-&gt;name : NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_pg_pool_name_by_id);</div><div class='hunk'>@@ -711,9 +769,18 @@ int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_pg_poolid_by_name);</div><div class='ctx'> </div><div class='add'>+u64 ceph_pg_pool_flags(struct ceph_osdmap *map, u64 id)</div><div class='add'>+{</div><div class='add'>+	struct ceph_pg_pool_info *pi;</div><div class='add'>+</div><div class='add'>+	pi = lookup_pg_pool(&amp;map-&gt;pg_pools, id);</div><div class='add'>+	return pi ? pi-&gt;flags : 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_pg_pool_flags);</div><div class='add'>+</div><div class='ctx'> static void __remove_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *pi)</div><div class='ctx'> {</div><div class='del'>-	rb_erase(&amp;pi-&gt;node, root);</div><div class='add'>+	erase_pg_pool(root, pi);</div><div class='ctx'> 	kfree(pi-&gt;name);</div><div class='ctx'> 	kfree(pi);</div><div class='ctx'> }</div><div class='hunk'>@@ -895,7 +962,7 @@ static int decode_pool_names(void **p, void *end, struct ceph_osdmap *map)</div><div class='ctx'> 		ceph_decode_32_safe(p, end, len, bad);</div><div class='ctx'> 		dout("  pool %llu len %d\n", pool, len);</div><div class='ctx'> 		ceph_decode_need(p, end, len, bad);</div><div class='del'>-		pi = __lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='add'>+		pi = lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='ctx'> 		if (pi) {</div><div class='ctx'> 			char *name = kstrndup(*p, len, GFP_NOFS);</div><div class='ctx'> </div><div class='hunk'>@@ -914,6 +981,143 @@ bad:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * CRUSH workspaces</div><div class='add'>+ *</div><div class='add'>+ * workspace_manager framework borrowed from fs/btrfs/compression.c.</div><div class='add'>+ * Two simplifications: there is only one type of workspace and there</div><div class='add'>+ * is always at least one workspace.</div><div class='add'>+ */</div><div class='add'>+static struct crush_work *alloc_workspace(const struct crush_map *c)</div><div class='add'>+{</div><div class='add'>+	struct crush_work *work;</div><div class='add'>+	size_t work_size;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!c-&gt;working_size);</div><div class='add'>+	work_size = crush_work_size(c, CEPH_PG_MAX_SIZE);</div><div class='add'>+	dout("%s work_size %zu bytes\n", __func__, work_size);</div><div class='add'>+</div><div class='add'>+	work = kvmalloc(work_size, GFP_NOIO);</div><div class='add'>+	if (!work)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;work-&gt;item);</div><div class='add'>+	crush_init_workspace(c, work);</div><div class='add'>+	return work;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_workspace(struct crush_work *work)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;work-&gt;item));</div><div class='add'>+	kvfree(work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_workspace_manager(struct workspace_manager *wsm)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;wsm-&gt;idle_ws);</div><div class='add'>+	spin_lock_init(&amp;wsm-&gt;ws_lock);</div><div class='add'>+	atomic_set(&amp;wsm-&gt;total_ws, 0);</div><div class='add'>+	wsm-&gt;free_ws = 0;</div><div class='add'>+	init_waitqueue_head(&amp;wsm-&gt;ws_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_initial_workspace(struct workspace_manager *wsm,</div><div class='add'>+				  struct crush_work *work)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;wsm-&gt;idle_ws));</div><div class='add'>+</div><div class='add'>+	list_add(&amp;work-&gt;item, &amp;wsm-&gt;idle_ws);</div><div class='add'>+	atomic_set(&amp;wsm-&gt;total_ws, 1);</div><div class='add'>+	wsm-&gt;free_ws = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_workspace_manager(struct workspace_manager *wsm)</div><div class='add'>+{</div><div class='add'>+	struct crush_work *work;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;wsm-&gt;idle_ws)) {</div><div class='add'>+		work = list_first_entry(&amp;wsm-&gt;idle_ws, struct crush_work,</div><div class='add'>+					item);</div><div class='add'>+		list_del_init(&amp;work-&gt;item);</div><div class='add'>+		free_workspace(work);</div><div class='add'>+	}</div><div class='add'>+	atomic_set(&amp;wsm-&gt;total_ws, 0);</div><div class='add'>+	wsm-&gt;free_ws = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Finds an available workspace or allocates a new one.  If it's not</div><div class='add'>+ * possible to allocate a new one, waits until there is one.</div><div class='add'>+ */</div><div class='add'>+static struct crush_work *get_workspace(struct workspace_manager *wsm,</div><div class='add'>+					const struct crush_map *c)</div><div class='add'>+{</div><div class='add'>+	struct crush_work *work;</div><div class='add'>+	int cpus = num_online_cpus();</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	spin_lock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+	if (!list_empty(&amp;wsm-&gt;idle_ws)) {</div><div class='add'>+		work = list_first_entry(&amp;wsm-&gt;idle_ws, struct crush_work,</div><div class='add'>+					item);</div><div class='add'>+		list_del_init(&amp;work-&gt;item);</div><div class='add'>+		wsm-&gt;free_ws--;</div><div class='add'>+		spin_unlock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+		return work;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (atomic_read(&amp;wsm-&gt;total_ws) &gt; cpus) {</div><div class='add'>+		DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+		prepare_to_wait(&amp;wsm-&gt;ws_wait, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		if (atomic_read(&amp;wsm-&gt;total_ws) &gt; cpus &amp;&amp; !wsm-&gt;free_ws)</div><div class='add'>+			schedule();</div><div class='add'>+		finish_wait(&amp;wsm-&gt;ws_wait, &amp;wait);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	atomic_inc(&amp;wsm-&gt;total_ws);</div><div class='add'>+	spin_unlock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+</div><div class='add'>+	work = alloc_workspace(c);</div><div class='add'>+	if (!work) {</div><div class='add'>+		atomic_dec(&amp;wsm-&gt;total_ws);</div><div class='add'>+		wake_up(&amp;wsm-&gt;ws_wait);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Do not return the error but go back to waiting.  We</div><div class='add'>+		 * have the initial workspace and the CRUSH computation</div><div class='add'>+		 * time is bounded so we will get it eventually.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(atomic_read(&amp;wsm-&gt;total_ws) &lt; 1);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	return work;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Puts a workspace back on the list or frees it if we have enough</div><div class='add'>+ * idle ones sitting around.</div><div class='add'>+ */</div><div class='add'>+static void put_workspace(struct workspace_manager *wsm,</div><div class='add'>+			  struct crush_work *work)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+	if (wsm-&gt;free_ws &lt;= num_online_cpus()) {</div><div class='add'>+		list_add(&amp;work-&gt;item, &amp;wsm-&gt;idle_ws);</div><div class='add'>+		wsm-&gt;free_ws++;</div><div class='add'>+		spin_unlock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+		goto wake;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;wsm-&gt;ws_lock);</div><div class='add'>+</div><div class='add'>+	free_workspace(work);</div><div class='add'>+	atomic_dec(&amp;wsm-&gt;total_ws);</div><div class='add'>+wake:</div><div class='add'>+	if (wq_has_sleeper(&amp;wsm-&gt;ws_wait))</div><div class='add'>+		wake_up(&amp;wsm-&gt;ws_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * osd map</div><div class='ctx'>  */</div><div class='ctx'> struct ceph_osdmap *ceph_osdmap_alloc(void)</div><div class='hunk'>@@ -930,7 +1134,8 @@ struct ceph_osdmap *ceph_osdmap_alloc(void)</div><div class='ctx'> 	map-&gt;primary_temp = RB_ROOT;</div><div class='ctx'> 	map-&gt;pg_upmap = RB_ROOT;</div><div class='ctx'> 	map-&gt;pg_upmap_items = RB_ROOT;</div><div class='del'>-	mutex_init(&amp;map-&gt;crush_workspace_mutex);</div><div class='add'>+</div><div class='add'>+	init_workspace_manager(&amp;map-&gt;crush_wsm);</div><div class='ctx'> </div><div class='ctx'> 	return map;</div><div class='ctx'> }</div><div class='hunk'>@@ -938,8 +1143,11 @@ struct ceph_osdmap *ceph_osdmap_alloc(void)</div><div class='ctx'> void ceph_osdmap_destroy(struct ceph_osdmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	dout("osdmap_destroy %p\n", map);</div><div class='add'>+</div><div class='ctx'> 	if (map-&gt;crush)</div><div class='ctx'> 		crush_destroy(map-&gt;crush);</div><div class='add'>+	cleanup_workspace_manager(&amp;map-&gt;crush_wsm);</div><div class='add'>+</div><div class='ctx'> 	while (!RB_EMPTY_ROOT(&amp;map-&gt;pg_temp)) {</div><div class='ctx'> 		struct ceph_pg_mapping *pg =</div><div class='ctx'> 			rb_entry(rb_first(&amp;map-&gt;pg_temp),</div><div class='hunk'>@@ -974,11 +1182,10 @@ void ceph_osdmap_destroy(struct ceph_osdmap *map)</div><div class='ctx'> 				 struct ceph_pg_pool_info, node);</div><div class='ctx'> 		__remove_pg_pool(&amp;map-&gt;pg_pools, pi);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(map-&gt;osd_state);</div><div class='del'>-	kfree(map-&gt;osd_weight);</div><div class='del'>-	kfree(map-&gt;osd_addr);</div><div class='del'>-	kfree(map-&gt;osd_primary_affinity);</div><div class='del'>-	kfree(map-&gt;crush_workspace);</div><div class='add'>+	kvfree(map-&gt;osd_state);</div><div class='add'>+	kvfree(map-&gt;osd_weight);</div><div class='add'>+	kvfree(map-&gt;osd_addr);</div><div class='add'>+	kvfree(map-&gt;osd_primary_affinity);</div><div class='ctx'> 	kfree(map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -987,28 +1194,41 @@ void ceph_osdmap_destroy(struct ceph_osdmap *map)</div><div class='ctx'>  *</div><div class='ctx'>  * The new elements are properly initialized.</div><div class='ctx'>  */</div><div class='del'>-static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)</div><div class='add'>+static int osdmap_set_max_osd(struct ceph_osdmap *map, u32 max)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *state;</div><div class='ctx'> 	u32 *weight;</div><div class='ctx'> 	struct ceph_entity_addr *addr;</div><div class='add'>+	u32 to_copy;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	state = krealloc(map-&gt;osd_state, max*sizeof(*state), GFP_NOFS);</div><div class='del'>-	if (!state)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	map-&gt;osd_state = state;</div><div class='add'>+	dout("%s old %u new %u\n", __func__, map-&gt;max_osd, max);</div><div class='add'>+	if (max == map-&gt;max_osd)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	weight = krealloc(map-&gt;osd_weight, max*sizeof(*weight), GFP_NOFS);</div><div class='del'>-	if (!weight)</div><div class='add'>+	state = kvmalloc(array_size(max, sizeof(*state)), GFP_NOFS);</div><div class='add'>+	weight = kvmalloc(array_size(max, sizeof(*weight)), GFP_NOFS);</div><div class='add'>+	addr = kvmalloc(array_size(max, sizeof(*addr)), GFP_NOFS);</div><div class='add'>+	if (!state || !weight || !addr) {</div><div class='add'>+		kvfree(state);</div><div class='add'>+		kvfree(weight);</div><div class='add'>+		kvfree(addr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	map-&gt;osd_weight = weight;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	addr = krealloc(map-&gt;osd_addr, max*sizeof(*addr), GFP_NOFS);</div><div class='del'>-	if (!addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	map-&gt;osd_addr = addr;</div><div class='add'>+	to_copy = min(map-&gt;max_osd, max);</div><div class='add'>+	if (map-&gt;osd_state) {</div><div class='add'>+		memcpy(state, map-&gt;osd_state, to_copy * sizeof(*state));</div><div class='add'>+		memcpy(weight, map-&gt;osd_weight, to_copy * sizeof(*weight));</div><div class='add'>+		memcpy(addr, map-&gt;osd_addr, to_copy * sizeof(*addr));</div><div class='add'>+		kvfree(map-&gt;osd_state);</div><div class='add'>+		kvfree(map-&gt;osd_weight);</div><div class='add'>+		kvfree(map-&gt;osd_addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	map-&gt;osd_state = state;</div><div class='add'>+	map-&gt;osd_weight = weight;</div><div class='add'>+	map-&gt;osd_addr = addr;</div><div class='ctx'> 	for (i = map-&gt;max_osd; i &lt; max; i++) {</div><div class='ctx'> 		map-&gt;osd_state[i] = 0;</div><div class='ctx'> 		map-&gt;osd_weight[i] = CEPH_OSD_OUT;</div><div class='hunk'>@@ -1018,12 +1238,16 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)</div><div class='ctx'> 	if (map-&gt;osd_primary_affinity) {</div><div class='ctx'> 		u32 *affinity;</div><div class='ctx'> </div><div class='del'>-		affinity = krealloc(map-&gt;osd_primary_affinity,</div><div class='del'>-				    max*sizeof(*affinity), GFP_NOFS);</div><div class='add'>+		affinity = kvmalloc(array_size(max, sizeof(*affinity)),</div><div class='add'>+					 GFP_NOFS);</div><div class='ctx'> 		if (!affinity)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		map-&gt;osd_primary_affinity = affinity;</div><div class='ctx'> </div><div class='add'>+		memcpy(affinity, map-&gt;osd_primary_affinity,</div><div class='add'>+		       to_copy * sizeof(*affinity));</div><div class='add'>+		kvfree(map-&gt;osd_primary_affinity);</div><div class='add'>+</div><div class='add'>+		map-&gt;osd_primary_affinity = affinity;</div><div class='ctx'> 		for (i = map-&gt;max_osd; i &lt; max; i++)</div><div class='ctx'> 			map-&gt;osd_primary_affinity[i] =</div><div class='ctx'> 			    CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;</div><div class='hunk'>@@ -1036,26 +1260,22 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)</div><div class='ctx'> </div><div class='ctx'> static int osdmap_set_crush(struct ceph_osdmap *map, struct crush_map *crush)</div><div class='ctx'> {</div><div class='del'>-	void *workspace;</div><div class='del'>-	size_t work_size;</div><div class='add'>+	struct crush_work *work;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(crush))</div><div class='ctx'> 		return PTR_ERR(crush);</div><div class='ctx'> </div><div class='del'>-	work_size = crush_work_size(crush, CEPH_PG_MAX_SIZE);</div><div class='del'>-	dout("%s work_size %zu bytes\n", __func__, work_size);</div><div class='del'>-	workspace = kmalloc(work_size, GFP_NOIO);</div><div class='del'>-	if (!workspace) {</div><div class='add'>+	work = alloc_workspace(crush);</div><div class='add'>+	if (!work) {</div><div class='ctx'> 		crush_destroy(crush);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	crush_init_workspace(crush, workspace);</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;crush)</div><div class='ctx'> 		crush_destroy(map-&gt;crush);</div><div class='del'>-	kfree(map-&gt;crush_workspace);</div><div class='add'>+	cleanup_workspace_manager(&amp;map-&gt;crush_wsm);</div><div class='ctx'> 	map-&gt;crush = crush;</div><div class='del'>-	map-&gt;crush_workspace = workspace;</div><div class='add'>+	add_initial_workspace(&amp;map-&gt;crush_wsm, work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1105,7 +1325,7 @@ static int get_osdmap_client_data_v(void **p, void *end,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* old osdmap enconding */</div><div class='add'>+		/* old osdmap encoding */</div><div class='ctx'> 		struct_v = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1129,18 +1349,18 @@ static int __decode_pools(void **p, void *end, struct ceph_osdmap *map,</div><div class='ctx'> </div><div class='ctx'> 		ceph_decode_64_safe(p, end, pool, e_inval);</div><div class='ctx'> </div><div class='del'>-		pi = __lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='add'>+		pi = lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='ctx'> 		if (!incremental || !pi) {</div><div class='ctx'> 			pi = kzalloc(sizeof(*pi), GFP_NOFS);</div><div class='ctx'> 			if (!pi)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+			RB_CLEAR_NODE(&amp;pi-&gt;node);</div><div class='ctx'> 			pi-&gt;id = pool;</div><div class='ctx'> </div><div class='del'>-			ret = __insert_pg_pool(&amp;map-&gt;pg_pools, pi);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (!__insert_pg_pool(&amp;map-&gt;pg_pools, pi)) {</div><div class='ctx'> 				kfree(pi);</div><div class='del'>-				return ret;</div><div class='add'>+				return -EEXIST;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1284,8 +1504,6 @@ static int decode_new_primary_temp(void **p, void *end,</div><div class='ctx'> </div><div class='ctx'> u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(osd &gt;= map-&gt;max_osd);</div><div class='del'>-</div><div class='ctx'> 	if (!map-&gt;osd_primary_affinity)</div><div class='ctx'> 		return CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;</div><div class='ctx'> </div><div class='hunk'>@@ -1294,14 +1512,12 @@ u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd)</div><div class='ctx'> </div><div class='ctx'> static int set_primary_affinity(struct ceph_osdmap *map, int osd, u32 aff)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(osd &gt;= map-&gt;max_osd);</div><div class='del'>-</div><div class='ctx'> 	if (!map-&gt;osd_primary_affinity) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		map-&gt;osd_primary_affinity = kmalloc_array(map-&gt;max_osd,</div><div class='del'>-							  sizeof(u32),</div><div class='del'>-							  GFP_NOFS);</div><div class='add'>+		map-&gt;osd_primary_affinity = kvmalloc(</div><div class='add'>+		    array_size(map-&gt;max_osd, sizeof(*map-&gt;osd_primary_affinity)),</div><div class='add'>+		    GFP_NOFS);</div><div class='ctx'> 		if (!map-&gt;osd_primary_affinity)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1322,7 +1538,7 @@ static int decode_primary_affinity(void **p, void *end,</div><div class='ctx'> </div><div class='ctx'> 	ceph_decode_32_safe(p, end, len, e_inval);</div><div class='ctx'> 	if (len == 0) {</div><div class='del'>-		kfree(map-&gt;osd_primary_affinity);</div><div class='add'>+		kvfree(map-&gt;osd_primary_affinity);</div><div class='ctx'> 		map-&gt;osd_primary_affinity = NULL;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1357,12 +1573,14 @@ static int decode_new_primary_affinity(void **p, void *end,</div><div class='ctx'> </div><div class='ctx'> 		ceph_decode_32_safe(p, end, osd, e_inval);</div><div class='ctx'> 		ceph_decode_32_safe(p, end, aff, e_inval);</div><div class='add'>+		if (osd &gt;= map-&gt;max_osd)</div><div class='add'>+			goto e_inval;</div><div class='ctx'> </div><div class='ctx'> 		ret = set_primary_affinity(map, osd, aff);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		pr_info("osd%d primary-affinity 0x%x\n", osd, aff);</div><div class='add'>+		osdmap_info(map, "osd%d primary-affinity 0x%x\n", osd, aff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1443,7 +1661,8 @@ static int decode_old_pg_upmap_items(void **p, void *end,</div><div class='ctx'> /*</div><div class='ctx'>  * decode a full map.</div><div class='ctx'>  */</div><div class='del'>-static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)</div><div class='add'>+static int osdmap_decode(void **p, void *end, bool msgr2,</div><div class='add'>+			 struct ceph_osdmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	u8 struct_v;</div><div class='ctx'> 	u32 epoch = 0;</div><div class='hunk'>@@ -1490,11 +1709,9 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)</div><div class='ctx'> </div><div class='ctx'> 	/* osd_state, osd_weight, osd_addrs-&gt;client_addr */</div><div class='ctx'> 	ceph_decode_need(p, end, 3*sizeof(u32) +</div><div class='del'>-			 map-&gt;max_osd*((struct_v &gt;= 5 ? sizeof(u32) :</div><div class='del'>-							sizeof(u8)) +</div><div class='del'>-				       sizeof(*map-&gt;osd_weight) +</div><div class='del'>-				       sizeof(*map-&gt;osd_addr)), e_inval);</div><div class='del'>-</div><div class='add'>+			 map-&gt;max_osd*(struct_v &gt;= 5 ? sizeof(u32) :</div><div class='add'>+						       sizeof(u8)) +</div><div class='add'>+				       sizeof(*map-&gt;osd_weight), e_inval);</div><div class='ctx'> 	if (ceph_decode_32(p) != map-&gt;max_osd)</div><div class='ctx'> 		goto e_inval;</div><div class='ctx'> </div><div class='hunk'>@@ -1515,9 +1732,18 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)</div><div class='ctx'> 	if (ceph_decode_32(p) != map-&gt;max_osd)</div><div class='ctx'> 		goto e_inval;</div><div class='ctx'> </div><div class='del'>-	ceph_decode_copy(p, map-&gt;osd_addr, map-&gt;max_osd*sizeof(*map-&gt;osd_addr));</div><div class='del'>-	for (i = 0; i &lt; map-&gt;max_osd; i++)</div><div class='del'>-		ceph_decode_addr(&amp;map-&gt;osd_addr[i]);</div><div class='add'>+	for (i = 0; i &lt; map-&gt;max_osd; i++) {</div><div class='add'>+		struct ceph_entity_addr *addr = &amp;map-&gt;osd_addr[i];</div><div class='add'>+</div><div class='add'>+		if (struct_v &gt;= 8)</div><div class='add'>+			err = ceph_decode_entity_addrvec(p, end, msgr2, addr);</div><div class='add'>+		else</div><div class='add'>+			err = ceph_decode_entity_addr(p, end, addr);</div><div class='add'>+		if (err)</div><div class='add'>+			goto bad;</div><div class='add'>+</div><div class='add'>+		dout("%s osd%d addr %s\n", __func__, i, ceph_pr_addr(addr));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* pg_temp */</div><div class='ctx'> 	err = decode_pg_temp(p, end, map);</div><div class='hunk'>@@ -1586,7 +1812,7 @@ bad:</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate and decode a full map.</div><div class='ctx'>  */</div><div class='del'>-struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end)</div><div class='add'>+struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end, bool msgr2)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osdmap *map;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1595,7 +1821,7 @@ struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end)</div><div class='ctx'> 	if (!map)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	ret = osdmap_decode(p, end, map);</div><div class='add'>+	ret = osdmap_decode(p, end, msgr2, map);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ceph_osdmap_destroy(map);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -1613,18 +1839,28 @@ struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end)</div><div class='ctx'>  *     new_state: { osd=6, xorstate=EXISTS } # clear osd_state</div><div class='ctx'>  */</div><div class='ctx'> static int decode_new_up_state_weight(void **p, void *end, u8 struct_v,</div><div class='del'>-				      struct ceph_osdmap *map)</div><div class='add'>+				      bool msgr2, struct ceph_osdmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	void *new_up_client;</div><div class='ctx'> 	void *new_state;</div><div class='ctx'> 	void *new_weight_end;</div><div class='ctx'> 	u32 len;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	new_up_client = *p;</div><div class='ctx'> 	ceph_decode_32_safe(p, end, len, e_inval);</div><div class='del'>-	len *= sizeof(u32) + sizeof(struct ceph_entity_addr);</div><div class='del'>-	ceph_decode_need(p, end, len, e_inval);</div><div class='del'>-	*p += len;</div><div class='add'>+	for (i = 0; i &lt; len; ++i) {</div><div class='add'>+		struct ceph_entity_addr addr;</div><div class='add'>+</div><div class='add'>+		ceph_decode_skip_32(p, end, e_inval);</div><div class='add'>+		if (struct_v &gt;= 7)</div><div class='add'>+			ret = ceph_decode_entity_addrvec(p, end, msgr2, &amp;addr);</div><div class='add'>+		else</div><div class='add'>+			ret = ceph_decode_entity_addr(p, end, &amp;addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	new_state = *p;</div><div class='ctx'> 	ceph_decode_32_safe(p, end, len, e_inval);</div><div class='hunk'>@@ -1641,10 +1877,12 @@ static int decode_new_up_state_weight(void **p, void *end, u8 struct_v,</div><div class='ctx'> 		ceph_decode_need(p, end, 2*sizeof(u32), e_inval);</div><div class='ctx'> 		osd = ceph_decode_32(p);</div><div class='ctx'> 		w = ceph_decode_32(p);</div><div class='del'>-		BUG_ON(osd &gt;= map-&gt;max_osd);</div><div class='del'>-		pr_info("osd%d weight 0x%x %s\n", osd, w,</div><div class='del'>-		     w == CEPH_OSD_IN ? "(in)" :</div><div class='del'>-		     (w == CEPH_OSD_OUT ? "(out)" : ""));</div><div class='add'>+		if (osd &gt;= map-&gt;max_osd)</div><div class='add'>+			goto e_inval;</div><div class='add'>+</div><div class='add'>+		osdmap_info(map, "osd%d weight 0x%x %s\n", osd, w,</div><div class='add'>+			    w == CEPH_OSD_IN ? "(in)" :</div><div class='add'>+			    (w == CEPH_OSD_OUT ? "(out)" : ""));</div><div class='ctx'> 		map-&gt;osd_weight[osd] = w;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1665,22 +1903,23 @@ static int decode_new_up_state_weight(void **p, void *end, u8 struct_v,</div><div class='ctx'> 	while (len--) {</div><div class='ctx'> 		s32 osd;</div><div class='ctx'> 		u32 xorstate;</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='ctx'> 		osd = ceph_decode_32(p);</div><div class='add'>+		if (osd &gt;= map-&gt;max_osd)</div><div class='add'>+			goto e_inval;</div><div class='add'>+</div><div class='ctx'> 		if (struct_v &gt;= 5)</div><div class='ctx'> 			xorstate = ceph_decode_32(p);</div><div class='ctx'> 		else</div><div class='ctx'> 			xorstate = ceph_decode_8(p);</div><div class='ctx'> 		if (xorstate == 0)</div><div class='ctx'> 			xorstate = CEPH_OSD_UP;</div><div class='del'>-		BUG_ON(osd &gt;= map-&gt;max_osd);</div><div class='ctx'> 		if ((map-&gt;osd_state[osd] &amp; CEPH_OSD_UP) &amp;&amp;</div><div class='ctx'> 		    (xorstate &amp; CEPH_OSD_UP))</div><div class='del'>-			pr_info("osd%d down\n", osd);</div><div class='add'>+			osdmap_info(map, "osd%d down\n", osd);</div><div class='ctx'> 		if ((map-&gt;osd_state[osd] &amp; CEPH_OSD_EXISTS) &amp;&amp;</div><div class='ctx'> 		    (xorstate &amp; CEPH_OSD_EXISTS)) {</div><div class='del'>-			pr_info("osd%d does not exist\n", osd);</div><div class='add'>+			osdmap_info(map, "osd%d does not exist\n", osd);</div><div class='ctx'> 			ret = set_primary_affinity(map, osd,</div><div class='ctx'> 						   CEPH_OSD_DEFAULT_PRIMARY_AFFINITY);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -1700,10 +1939,19 @@ static int decode_new_up_state_weight(void **p, void *end, u8 struct_v,</div><div class='ctx'> 		struct ceph_entity_addr addr;</div><div class='ctx'> </div><div class='ctx'> 		osd = ceph_decode_32(p);</div><div class='del'>-		ceph_decode_copy(p, &amp;addr, sizeof(addr));</div><div class='del'>-		ceph_decode_addr(&amp;addr);</div><div class='del'>-		BUG_ON(osd &gt;= map-&gt;max_osd);</div><div class='del'>-		pr_info("osd%d up\n", osd);</div><div class='add'>+		if (osd &gt;= map-&gt;max_osd)</div><div class='add'>+			goto e_inval;</div><div class='add'>+</div><div class='add'>+		if (struct_v &gt;= 7)</div><div class='add'>+			ret = ceph_decode_entity_addrvec(p, end, msgr2, &amp;addr);</div><div class='add'>+		else</div><div class='add'>+			ret = ceph_decode_entity_addr(p, end, &amp;addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dout("%s osd%d addr %s\n", __func__, osd, ceph_pr_addr(&amp;addr));</div><div class='add'>+</div><div class='add'>+		osdmap_info(map, "osd%d up\n", osd);</div><div class='ctx'> 		map-&gt;osd_state[osd] |= CEPH_OSD_EXISTS | CEPH_OSD_UP;</div><div class='ctx'> 		map-&gt;osd_addr[osd] = addr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1718,7 +1966,7 @@ e_inval:</div><div class='ctx'> /*</div><div class='ctx'>  * decode and apply an incremental map update.</div><div class='ctx'>  */</div><div class='del'>-struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,</div><div class='add'>+struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, bool msgr2,</div><div class='ctx'> 					     struct ceph_osdmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_fsid fsid;</div><div class='hunk'>@@ -1753,7 +2001,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,</div><div class='ctx'> 	if (len &gt; 0) {</div><div class='ctx'> 		dout("apply_incremental full map len %d, %p to %p\n",</div><div class='ctx'> 		     len, *p, end);</div><div class='del'>-		return ceph_osdmap_decode(p, min(*p+len, end));</div><div class='add'>+		return ceph_osdmap_decode(p, min(*p+len, end), msgr2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* new crush? */</div><div class='hunk'>@@ -1799,13 +2047,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,</div><div class='ctx'> 		struct ceph_pg_pool_info *pi;</div><div class='ctx'> </div><div class='ctx'> 		ceph_decode_64_safe(p, end, pool, e_inval);</div><div class='del'>-		pi = __lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='add'>+		pi = lookup_pg_pool(&amp;map-&gt;pg_pools, pool);</div><div class='ctx'> 		if (pi)</div><div class='ctx'> 			__remove_pg_pool(&amp;map-&gt;pg_pools, pi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* new_up_client, new_state, new_weight */</div><div class='del'>-	err = decode_new_up_state_weight(p, end, struct_v, map);</div><div class='add'>+	err = decode_new_up_state_weight(p, end, struct_v, msgr2, map);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='hunk'>@@ -2249,6 +2497,7 @@ static int do_crush(struct ceph_osdmap *map, int ruleno, int x,</div><div class='ctx'> 		    s64 choose_args_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct crush_choose_arg_map *arg_map;</div><div class='add'>+	struct crush_work *work;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(result_max &gt; CEPH_PG_MAX_SIZE);</div><div class='hunk'>@@ -2259,12 +2508,11 @@ static int do_crush(struct ceph_osdmap *map, int ruleno, int x,</div><div class='ctx'> 		arg_map = lookup_choose_arg_map(&amp;map-&gt;crush-&gt;choose_args,</div><div class='ctx'> 						CEPH_DEFAULT_CHOOSE_ARGS);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;map-&gt;crush_workspace_mutex);</div><div class='add'>+	work = get_workspace(&amp;map-&gt;crush_wsm, map-&gt;crush);</div><div class='ctx'> 	r = crush_do_rule(map-&gt;crush, ruleno, x, result, result_max,</div><div class='del'>-			  weight, weight_max, map-&gt;crush_workspace,</div><div class='add'>+			  weight, weight_max, work,</div><div class='ctx'> 			  arg_map ? arg_map-&gt;args : NULL);</div><div class='del'>-	mutex_unlock(&amp;map-&gt;crush_workspace_mutex);</div><div class='del'>-</div><div class='add'>+	put_workspace(&amp;map-&gt;crush_wsm, work);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2642,3 +2890,221 @@ int ceph_pg_to_acting_primary(struct ceph_osdmap *osdmap,</div><div class='ctx'> 	return acting.primary;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_pg_to_acting_primary);</div><div class='add'>+</div><div class='add'>+static struct crush_loc_node *alloc_crush_loc(size_t type_name_len,</div><div class='add'>+					      size_t name_len)</div><div class='add'>+{</div><div class='add'>+	struct crush_loc_node *loc;</div><div class='add'>+</div><div class='add'>+	loc = kmalloc(sizeof(*loc) + type_name_len + name_len + 2, GFP_NOIO);</div><div class='add'>+	if (!loc)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	RB_CLEAR_NODE(&amp;loc-&gt;cl_node);</div><div class='add'>+	return loc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_crush_loc(struct crush_loc_node *loc)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!RB_EMPTY_NODE(&amp;loc-&gt;cl_node));</div><div class='add'>+</div><div class='add'>+	kfree(loc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crush_loc_compare(const struct crush_loc *loc1,</div><div class='add'>+			     const struct crush_loc *loc2)</div><div class='add'>+{</div><div class='add'>+	return strcmp(loc1-&gt;cl_type_name, loc2-&gt;cl_type_name) ?:</div><div class='add'>+	       strcmp(loc1-&gt;cl_name, loc2-&gt;cl_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_RB_FUNCS2(crush_loc, struct crush_loc_node, cl_loc, crush_loc_compare,</div><div class='add'>+		 RB_BYPTR, const struct crush_loc *, cl_node)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parses a set of &lt;bucket type name&gt;':'&lt;bucket name&gt; pairs separated</div><div class='add'>+ * by '|', e.g. "rack:foo1|rack:foo2|datacenter:bar".</div><div class='add'>+ *</div><div class='add'>+ * Note that @crush_location is modified by strsep().</div><div class='add'>+ */</div><div class='add'>+int ceph_parse_crush_location(char *crush_location, struct rb_root *locs)</div><div class='add'>+{</div><div class='add'>+	struct crush_loc_node *loc;</div><div class='add'>+	const char *type_name, *name, *colon;</div><div class='add'>+	size_t type_name_len, name_len;</div><div class='add'>+</div><div class='add'>+	dout("%s '%s'\n", __func__, crush_location);</div><div class='add'>+	while ((type_name = strsep(&amp;crush_location, "|"))) {</div><div class='add'>+		colon = strchr(type_name, ':');</div><div class='add'>+		if (!colon)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		type_name_len = colon - type_name;</div><div class='add'>+		if (type_name_len == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		name = colon + 1;</div><div class='add'>+		name_len = strlen(name);</div><div class='add'>+		if (name_len == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		loc = alloc_crush_loc(type_name_len, name_len);</div><div class='add'>+		if (!loc)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		loc-&gt;cl_loc.cl_type_name = loc-&gt;cl_data;</div><div class='add'>+		memcpy(loc-&gt;cl_loc.cl_type_name, type_name, type_name_len);</div><div class='add'>+		loc-&gt;cl_loc.cl_type_name[type_name_len] = '\0';</div><div class='add'>+</div><div class='add'>+		loc-&gt;cl_loc.cl_name = loc-&gt;cl_data + type_name_len + 1;</div><div class='add'>+		memcpy(loc-&gt;cl_loc.cl_name, name, name_len);</div><div class='add'>+		loc-&gt;cl_loc.cl_name[name_len] = '\0';</div><div class='add'>+</div><div class='add'>+		if (!__insert_crush_loc(locs, loc)) {</div><div class='add'>+			free_crush_loc(loc);</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dout("%s type_name '%s' name '%s'\n", __func__,</div><div class='add'>+		     loc-&gt;cl_loc.cl_type_name, loc-&gt;cl_loc.cl_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_compare_crush_locs(struct rb_root *locs1, struct rb_root *locs2)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n1 = rb_first(locs1);</div><div class='add'>+	struct rb_node *n2 = rb_first(locs2);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for ( ; n1 &amp;&amp; n2; n1 = rb_next(n1), n2 = rb_next(n2)) {</div><div class='add'>+		struct crush_loc_node *loc1 =</div><div class='add'>+		    rb_entry(n1, struct crush_loc_node, cl_node);</div><div class='add'>+		struct crush_loc_node *loc2 =</div><div class='add'>+		    rb_entry(n2, struct crush_loc_node, cl_node);</div><div class='add'>+</div><div class='add'>+		ret = crush_loc_compare(&amp;loc1-&gt;cl_loc, &amp;loc2-&gt;cl_loc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!n1 &amp;&amp; n2)</div><div class='add'>+		return -1;</div><div class='add'>+	if (n1 &amp;&amp; !n2)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_clear_crush_locs(struct rb_root *locs)</div><div class='add'>+{</div><div class='add'>+	while (!RB_EMPTY_ROOT(locs)) {</div><div class='add'>+		struct crush_loc_node *loc =</div><div class='add'>+		    rb_entry(rb_first(locs), struct crush_loc_node, cl_node);</div><div class='add'>+</div><div class='add'>+		erase_crush_loc(locs, loc);</div><div class='add'>+		free_crush_loc(loc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [a-zA-Z0-9-_.]+</div><div class='add'>+ */</div><div class='add'>+static bool is_valid_crush_name(const char *name)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		if (!('a' &lt;= *name &amp;&amp; *name &lt;= 'z') &amp;&amp;</div><div class='add'>+		    !('A' &lt;= *name &amp;&amp; *name &lt;= 'Z') &amp;&amp;</div><div class='add'>+		    !('0' &lt;= *name &amp;&amp; *name &lt;= '9') &amp;&amp;</div><div class='add'>+		    *name != '-' &amp;&amp; *name != '_' &amp;&amp; *name != '.')</div><div class='add'>+			return false;</div><div class='add'>+	} while (*++name != '\0');</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Gets the parent of an item.  Returns its id (&lt;0 because the</div><div class='add'>+ * parent is always a bucket), type id (&gt;0 for the same reason,</div><div class='add'>+ * via @parent_type_id) and location (via @parent_loc).  If no</div><div class='add'>+ * parent, returns 0.</div><div class='add'>+ *</div><div class='add'>+ * Does a linear search, as there are no parent pointers of any</div><div class='add'>+ * kind.  Note that the result is ambiguous for items that occur</div><div class='add'>+ * multiple times in the map.</div><div class='add'>+ */</div><div class='add'>+static int get_immediate_parent(struct crush_map *c, int id,</div><div class='add'>+				u16 *parent_type_id,</div><div class='add'>+				struct crush_loc *parent_loc)</div><div class='add'>+{</div><div class='add'>+	struct crush_bucket *b;</div><div class='add'>+	struct crush_name_node *type_cn, *cn;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; c-&gt;max_buckets; i++) {</div><div class='add'>+		b = c-&gt;buckets[i];</div><div class='add'>+		if (!b)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* ignore per-class shadow hierarchy */</div><div class='add'>+		cn = lookup_crush_name(&amp;c-&gt;names, b-&gt;id);</div><div class='add'>+		if (!cn || !is_valid_crush_name(cn-&gt;cn_name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; b-&gt;size; j++) {</div><div class='add'>+			if (b-&gt;items[j] != id)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			*parent_type_id = b-&gt;type;</div><div class='add'>+			type_cn = lookup_crush_name(&amp;c-&gt;type_names, b-&gt;type);</div><div class='add'>+			parent_loc-&gt;cl_type_name = type_cn-&gt;cn_name;</div><div class='add'>+			parent_loc-&gt;cl_name = cn-&gt;cn_name;</div><div class='add'>+			return b-&gt;id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;  /* no parent */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculates the locality/distance from an item to a client</div><div class='add'>+ * location expressed in terms of CRUSH hierarchy as a set of</div><div class='add'>+ * (bucket type name, bucket name) pairs.  Specifically, looks</div><div class='add'>+ * for the lowest-valued bucket type for which the location of</div><div class='add'>+ * @id matches one of the locations in @locs, so for standard</div><div class='add'>+ * bucket types (host = 1, rack = 3, datacenter = 8, zone = 9)</div><div class='add'>+ * a matching host is closer than a matching rack and a matching</div><div class='add'>+ * data center is closer than a matching zone.</div><div class='add'>+ *</div><div class='add'>+ * Specifying multiple locations (a "multipath" location) such</div><div class='add'>+ * as "rack=foo1 rack=foo2 datacenter=bar" is allowed -- @locs</div><div class='add'>+ * is a multimap.  The locality will be:</div><div class='add'>+ *</div><div class='add'>+ * - 3 for OSDs in racks foo1 and foo2</div><div class='add'>+ * - 8 for OSDs in data center bar</div><div class='add'>+ * - -1 for all other OSDs</div><div class='add'>+ *</div><div class='add'>+ * The lowest possible bucket type is 1, so the best locality</div><div class='add'>+ * for an OSD is 1 (i.e. a matching host).  Locality 0 would be</div><div class='add'>+ * the OSD itself.</div><div class='add'>+ */</div><div class='add'>+int ceph_get_crush_locality(struct ceph_osdmap *osdmap, int id,</div><div class='add'>+			    struct rb_root *locs)</div><div class='add'>+{</div><div class='add'>+	struct crush_loc loc;</div><div class='add'>+	u16 type_id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Instead of repeated get_immediate_parent() calls,</div><div class='add'>+	 * the location of @id could be obtained with a single</div><div class='add'>+	 * depth-first traversal.</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		id = get_immediate_parent(osdmap-&gt;crush, id, &amp;type_id, &amp;loc);</div><div class='add'>+		if (id &gt;= 0)</div><div class='add'>+			return -1;  /* not local */</div><div class='add'>+</div><div class='add'>+		if (lookup_crush_loc(locs, &amp;loc))</div><div class='add'>+			return type_id;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c<br/>index 2ea0564771d2..5a9c4be5f222 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/pagelist.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/pagelist.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/pagelist.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/pagelist.c</a></div><div class='hunk'>@@ -6,6 +6,26 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/pagelist.h&gt;</div><div class='ctx'> </div><div class='add'>+struct ceph_pagelist *ceph_pagelist_alloc(gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct ceph_pagelist *pl;</div><div class='add'>+</div><div class='add'>+	pl = kmalloc(sizeof(*pl), gfp_flags);</div><div class='add'>+	if (!pl)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;pl-&gt;head);</div><div class='add'>+	pl-&gt;mapped_tail = NULL;</div><div class='add'>+	pl-&gt;length = 0;</div><div class='add'>+	pl-&gt;room = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;pl-&gt;free_list);</div><div class='add'>+	pl-&gt;num_pages_free = 0;</div><div class='add'>+	refcount_set(&amp;pl-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+	return pl;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_pagelist_alloc);</div><div class='add'>+</div><div class='ctx'> static void ceph_pagelist_unmap_tail(struct ceph_pagelist *pl)</div><div class='ctx'> {</div><div class='ctx'> 	if (pl-&gt;mapped_tail) {</div><div class='hunk'>@@ -76,7 +96,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len)</div><div class='ctx'> EXPORT_SYMBOL(ceph_pagelist_append);</div><div class='ctx'> </div><div class='ctx'> /* Allocate enough pages for a pagelist to append the given amount</div><div class='del'>- * of data without without allocating.</div><div class='add'>+ * of data without allocating.</div><div class='ctx'>  * Returns: 0 on success, -ENOMEM on error.</div><div class='ctx'>  */</div><div class='ctx'> int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space)</div><div class='hunk'>@@ -111,41 +131,3 @@ int ceph_pagelist_free_reserve(struct ceph_pagelist *pl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_pagelist_free_reserve);</div><div class='del'>-</div><div class='del'>-/* Create a truncation point. */</div><div class='del'>-void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,</div><div class='del'>-			      struct ceph_pagelist_cursor *c)</div><div class='del'>-{</div><div class='del'>-	c-&gt;pl = pl;</div><div class='del'>-	c-&gt;page_lru = pl-&gt;head.prev;</div><div class='del'>-	c-&gt;room = pl-&gt;room;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_pagelist_set_cursor);</div><div class='del'>-</div><div class='del'>-/* Truncate a pagelist to the given point. Move extra pages to reserve.</div><div class='del'>- * This won't sleep.</div><div class='del'>- * Returns: 0 on success,</div><div class='del'>- *          -EINVAL if the pagelist doesn't match the trunc point pagelist</div><div class='del'>- */</div><div class='del'>-int ceph_pagelist_truncate(struct ceph_pagelist *pl,</div><div class='del'>-			   struct ceph_pagelist_cursor *c)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	if (pl != c-&gt;pl)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	ceph_pagelist_unmap_tail(pl);</div><div class='del'>-	while (pl-&gt;head.prev != c-&gt;page_lru) {</div><div class='del'>-		page = list_entry(pl-&gt;head.prev, struct page, lru);</div><div class='del'>-		/* move from pagelist to reserve */</div><div class='del'>-		list_move_tail(&amp;page-&gt;lru, &amp;pl-&gt;free_list);</div><div class='del'>-		++pl-&gt;num_pages_free;</div><div class='del'>-	}</div><div class='del'>-	pl-&gt;room = c-&gt;room;</div><div class='del'>-	if (!list_empty(&amp;pl-&gt;head)) {</div><div class='del'>-		page = list_entry(pl-&gt;head.prev, struct page, lru);</div><div class='del'>-		pl-&gt;mapped_tail = kmap(page);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_pagelist_truncate);</div><div class='head'>diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c<br/>index d3736f5bffec..4509757d8b3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/pagevec.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/pagevec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/pagevec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/pagevec.c</a></div><div class='hunk'>@@ -10,39 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/libceph.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * build a vector of user pages</div><div class='del'>- */</div><div class='del'>-struct page **ceph_get_direct_page_vector(const void __user *data,</div><div class='del'>-					  int num_pages, bool write_page)</div><div class='del'>-{</div><div class='del'>-	struct page **pages;</div><div class='del'>-	int got = 0;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	pages = kmalloc_array(num_pages, sizeof(*pages), GFP_NOFS);</div><div class='del'>-	if (!pages)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	while (got &lt; num_pages) {</div><div class='del'>-		rc = get_user_pages_fast(</div><div class='del'>-		    (unsigned long)data + ((unsigned long)got * PAGE_SIZE),</div><div class='del'>-		    num_pages - got, write_page, pages + got);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		BUG_ON(rc == 0);</div><div class='del'>-		got += rc;</div><div class='del'>-	}</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	return pages;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	ceph_put_page_vector(pages, got, false);</div><div class='del'>-	return ERR_PTR(rc);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_get_direct_page_vector);</div><div class='del'>-</div><div class='ctx'> void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -88,58 +55,6 @@ struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_alloc_page_vector);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * copy user data into a page vector</div><div class='del'>- */</div><div class='del'>-int ceph_copy_user_to_page_vector(struct page **pages,</div><div class='del'>-					 const void __user *data,</div><div class='del'>-					 loff_t off, size_t len)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	int po = off &amp; ~PAGE_MASK;</div><div class='del'>-	int left = len;</div><div class='del'>-	int l, bad;</div><div class='del'>-</div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		l = min_t(int, PAGE_SIZE-po, left);</div><div class='del'>-		bad = copy_from_user(page_address(pages[i]) + po, data, l);</div><div class='del'>-		if (bad == l)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		data += l - bad;</div><div class='del'>-		left -= l - bad;</div><div class='del'>-		po += l - bad;</div><div class='del'>-		if (po == PAGE_SIZE) {</div><div class='del'>-			po = 0;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_copy_user_to_page_vector);</div><div class='del'>-</div><div class='del'>-void ceph_copy_to_page_vector(struct page **pages,</div><div class='del'>-				    const void *data,</div><div class='del'>-				    loff_t off, size_t len)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	size_t po = off &amp; ~PAGE_MASK;</div><div class='del'>-	size_t left = len;</div><div class='del'>-</div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		size_t l = min_t(size_t, PAGE_SIZE-po, left);</div><div class='del'>-</div><div class='del'>-		memcpy(page_address(pages[i]) + po, data, l);</div><div class='del'>-		data += l;</div><div class='del'>-		left -= l;</div><div class='del'>-		po += l;</div><div class='del'>-		if (po == PAGE_SIZE) {</div><div class='del'>-			po = 0;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ceph_copy_to_page_vector);</div><div class='del'>-</div><div class='ctx'> void ceph_copy_from_page_vector(struct page **pages,</div><div class='ctx'> 				    void *data,</div><div class='ctx'> 				    loff_t off, size_t len)</div><div class='head'>diff --git a/net/ceph/snapshot.c b/net/ceph/snapshot.c<br/>index e14a5d038656..e24315937c45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/snapshot.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/snapshot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/snapshot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/snapshot.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * snapshot.c    Ceph snapshot context utility routines (part of libceph)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2013 Inktank Storage, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/net/ceph/striper.c b/net/ceph/striper.c<br/>index c36462dc86b7..3b3fa75d1189 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ceph/striper.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ceph/striper.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ceph/striper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ceph/striper.c</a></div><div class='hunk'>@@ -259,3 +259,20 @@ int ceph_extent_to_file(struct ceph_file_layout *l,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ceph_extent_to_file);</div><div class='add'>+</div><div class='add'>+u64 ceph_get_num_objects(struct ceph_file_layout *l, u64 size)</div><div class='add'>+{</div><div class='add'>+	u64 period = (u64)l-&gt;stripe_count * l-&gt;object_size;</div><div class='add'>+	u64 num_periods = DIV64_U64_ROUND_UP(size, period);</div><div class='add'>+	u64 remainder_bytes;</div><div class='add'>+	u64 remainder_objs = 0;</div><div class='add'>+</div><div class='add'>+	div64_u64_rem(size, period, &amp;remainder_bytes);</div><div class='add'>+	if (remainder_bytes &gt; 0 &amp;&amp;</div><div class='add'>+	    remainder_bytes &lt; (u64)l-&gt;stripe_count * l-&gt;stripe_unit)</div><div class='add'>+		remainder_objs = l-&gt;stripe_count -</div><div class='add'>+			    DIV_ROUND_UP_ULL(remainder_bytes, l-&gt;stripe_unit);</div><div class='add'>+</div><div class='add'>+	return num_periods * l-&gt;stripe_count - remainder_objs;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ceph_get_num_objects);</div><div class='head'>diff --git a/net/compat.c b/net/compat.c<br/>index 3b2105f6549d..2c9bd0edac99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/compat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/compat.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * 32bit Socket syscall emulation. Based on arch/sparc64/kernel/sys_sparc32.c.</div><div class='ctx'>  *</div><div class='hunk'>@@ -32,21 +33,16 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;net/compat.h&gt;</div><div class='ctx'> </div><div class='del'>-int get_compat_msghdr(struct msghdr *kmsg,</div><div class='del'>-		      struct compat_msghdr __user *umsg,</div><div class='del'>-		      struct sockaddr __user **save_addr,</div><div class='del'>-		      struct iovec **iov)</div><div class='add'>+int __get_compat_msghdr(struct msghdr *kmsg,</div><div class='add'>+			struct compat_msghdr *msg,</div><div class='add'>+			struct sockaddr __user **save_addr)</div><div class='ctx'> {</div><div class='del'>-	struct compat_msghdr msg;</div><div class='ctx'> 	ssize_t err;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;msg, umsg, sizeof(*umsg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	kmsg-&gt;msg_flags = msg.msg_flags;</div><div class='del'>-	kmsg-&gt;msg_namelen = msg.msg_namelen;</div><div class='add'>+	kmsg-&gt;msg_flags = msg-&gt;msg_flags;</div><div class='add'>+	kmsg-&gt;msg_namelen = msg-&gt;msg_namelen;</div><div class='ctx'> </div><div class='del'>-	if (!msg.msg_name)</div><div class='add'>+	if (!msg-&gt;msg_name)</div><div class='ctx'> 		kmsg-&gt;msg_namelen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (kmsg-&gt;msg_namelen &lt; 0)</div><div class='hunk'>@@ -55,15 +51,17 @@ int get_compat_msghdr(struct msghdr *kmsg,</div><div class='ctx'> 	if (kmsg-&gt;msg_namelen &gt; sizeof(struct sockaddr_storage))</div><div class='ctx'> 		kmsg-&gt;msg_namelen = sizeof(struct sockaddr_storage);</div><div class='ctx'> </div><div class='del'>-	kmsg-&gt;msg_control = compat_ptr(msg.msg_control);</div><div class='del'>-	kmsg-&gt;msg_controllen = msg.msg_controllen;</div><div class='add'>+	kmsg-&gt;msg_control_is_user = true;</div><div class='add'>+	kmsg-&gt;msg_get_inq = 0;</div><div class='add'>+	kmsg-&gt;msg_control_user = compat_ptr(msg-&gt;msg_control);</div><div class='add'>+	kmsg-&gt;msg_controllen = msg-&gt;msg_controllen;</div><div class='ctx'> </div><div class='ctx'> 	if (save_addr)</div><div class='del'>-		*save_addr = compat_ptr(msg.msg_name);</div><div class='add'>+		*save_addr = compat_ptr(msg-&gt;msg_name);</div><div class='ctx'> </div><div class='del'>-	if (msg.msg_name &amp;&amp; kmsg-&gt;msg_namelen) {</div><div class='add'>+	if (msg-&gt;msg_name &amp;&amp; kmsg-&gt;msg_namelen) {</div><div class='ctx'> 		if (!save_addr) {</div><div class='del'>-			err = move_addr_to_kernel(compat_ptr(msg.msg_name),</div><div class='add'>+			err = move_addr_to_kernel(compat_ptr(msg-&gt;msg_name),</div><div class='ctx'> 						  kmsg-&gt;msg_namelen,</div><div class='ctx'> 						  kmsg-&gt;msg_name);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -74,14 +72,33 @@ int get_compat_msghdr(struct msghdr *kmsg,</div><div class='ctx'> 		kmsg-&gt;msg_namelen = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (msg.msg_iovlen &gt; UIO_MAXIOV)</div><div class='add'>+	if (msg-&gt;msg_iovlen &gt; UIO_MAXIOV)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	kmsg-&gt;msg_iocb = NULL;</div><div class='add'>+	kmsg-&gt;msg_ubuf = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return compat_import_iovec(save_addr ? READ : WRITE,</div><div class='del'>-				   compat_ptr(msg.msg_iov), msg.msg_iovlen,</div><div class='del'>-				   UIO_FASTIOV, iov, &amp;kmsg-&gt;msg_iter);</div><div class='add'>+int get_compat_msghdr(struct msghdr *kmsg,</div><div class='add'>+		      struct compat_msghdr __user *umsg,</div><div class='add'>+		      struct sockaddr __user **save_addr,</div><div class='add'>+		      struct iovec **iov)</div><div class='add'>+{</div><div class='add'>+	struct compat_msghdr msg;</div><div class='add'>+	ssize_t err;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;msg, umsg, sizeof(*umsg)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	err = __get_compat_msghdr(kmsg, &amp;msg, save_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = import_iovec(save_addr ? ITER_DEST : ITER_SOURCE,</div><div class='add'>+			   compat_ptr(msg.msg_iov), msg.msg_iovlen,</div><div class='add'>+			   UIO_FASTIOV, iov, &amp;kmsg-&gt;msg_iter);</div><div class='add'>+	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Bleech... */</div><div class='hunk'>@@ -96,20 +113,20 @@ int get_compat_msghdr(struct msghdr *kmsg,</div><div class='ctx'> </div><div class='ctx'> #define CMSG_COMPAT_FIRSTHDR(msg)			\</div><div class='ctx'> 	(((msg)-&gt;msg_controllen) &gt;= sizeof(struct compat_cmsghdr) ?	\</div><div class='del'>-	 (struct compat_cmsghdr __user *)((msg)-&gt;msg_control) :		\</div><div class='add'>+	 (struct compat_cmsghdr __user *)((msg)-&gt;msg_control_user) :	\</div><div class='ctx'> 	 (struct compat_cmsghdr __user *)NULL)</div><div class='ctx'> </div><div class='ctx'> #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \</div><div class='ctx'> 	((ucmlen) &gt;= sizeof(struct compat_cmsghdr) &amp;&amp; \</div><div class='ctx'> 	 (ucmlen) &lt;= (unsigned long) \</div><div class='ctx'> 	 ((mhdr)-&gt;msg_controllen - \</div><div class='del'>-	  ((char *)(ucmsg) - (char *)(mhdr)-&gt;msg_control)))</div><div class='add'>+	  ((char __user *)(ucmsg) - (char __user *)(mhdr)-&gt;msg_control_user)))</div><div class='ctx'> </div><div class='ctx'> static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,</div><div class='ctx'> 		struct compat_cmsghdr __user *cmsg, int cmsg_len)</div><div class='ctx'> {</div><div class='ctx'> 	char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);</div><div class='del'>-	if ((unsigned long)(ptr + 1 - (char __user *)msg-&gt;msg_control) &gt;</div><div class='add'>+	if ((unsigned long)(ptr + 1 - (char __user *)msg-&gt;msg_control_user) &gt;</div><div class='ctx'> 			msg-&gt;msg_controllen)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return (struct compat_cmsghdr __user *)ptr;</div><div class='hunk'>@@ -158,31 +175,32 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk,</div><div class='ctx'> 	if (kcmlen &gt; stackbuf_size)</div><div class='ctx'> 		kcmsg_base = kcmsg = sock_kmalloc(sk, kcmlen, GFP_KERNEL);</div><div class='ctx'> 	if (kcmsg == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Now copy them over neatly. */</div><div class='ctx'> 	memset(kcmsg, 0, kcmlen);</div><div class='ctx'> 	ucmsg = CMSG_COMPAT_FIRSTHDR(kmsg);</div><div class='ctx'> 	while (ucmsg != NULL) {</div><div class='del'>-		if (__get_user(ucmlen, &amp;ucmsg-&gt;cmsg_len))</div><div class='add'>+		struct compat_cmsghdr cmsg;</div><div class='add'>+		if (copy_from_user(&amp;cmsg, ucmsg, sizeof(cmsg)))</div><div class='ctx'> 			goto Efault;</div><div class='del'>-		if (!CMSG_COMPAT_OK(ucmlen, ucmsg, kmsg))</div><div class='add'>+		if (!CMSG_COMPAT_OK(cmsg.cmsg_len, ucmsg, kmsg))</div><div class='ctx'> 			goto Einval;</div><div class='del'>-		tmp = ((ucmlen - sizeof(*ucmsg)) + sizeof(struct cmsghdr));</div><div class='add'>+		tmp = ((cmsg.cmsg_len - sizeof(*ucmsg)) + sizeof(struct cmsghdr));</div><div class='ctx'> 		if ((char *)kcmsg_base + kcmlen - (char *)kcmsg &lt; CMSG_ALIGN(tmp))</div><div class='ctx'> 			goto Einval;</div><div class='ctx'> 		kcmsg-&gt;cmsg_len = tmp;</div><div class='add'>+		kcmsg-&gt;cmsg_level = cmsg.cmsg_level;</div><div class='add'>+		kcmsg-&gt;cmsg_type = cmsg.cmsg_type;</div><div class='ctx'> 		tmp = CMSG_ALIGN(tmp);</div><div class='del'>-		if (__get_user(kcmsg-&gt;cmsg_level, &amp;ucmsg-&gt;cmsg_level) ||</div><div class='del'>-		    __get_user(kcmsg-&gt;cmsg_type, &amp;ucmsg-&gt;cmsg_type) ||</div><div class='del'>-		    copy_from_user(CMSG_DATA(kcmsg),</div><div class='add'>+		if (copy_from_user(CMSG_DATA(kcmsg),</div><div class='ctx'> 				   CMSG_COMPAT_DATA(ucmsg),</div><div class='del'>-				   (ucmlen - sizeof(*ucmsg))))</div><div class='add'>+				   (cmsg.cmsg_len - sizeof(*ucmsg))))</div><div class='ctx'> 			goto Efault;</div><div class='ctx'> </div><div class='ctx'> 		/* Advance. */</div><div class='ctx'> 		kcmsg = (struct cmsghdr *)((char *)kcmsg + tmp);</div><div class='del'>-		ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, ucmlen);</div><div class='add'>+		ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, cmsg.cmsg_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -193,6 +211,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk,</div><div class='ctx'> 		goto Einval;</div><div class='ctx'> </div><div class='ctx'> 	/* Ok, looks like we made it.  Hook it up and return success. */</div><div class='add'>+	kmsg-&gt;msg_control_is_user = false;</div><div class='ctx'> 	kmsg-&gt;msg_control = kcmsg_base;</div><div class='ctx'> 	kmsg-&gt;msg_controllen = kcmlen;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -207,10 +226,10 @@ Efault:</div><div class='ctx'> </div><div class='ctx'> int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg-&gt;msg_control;</div><div class='add'>+	struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg-&gt;msg_control_user;</div><div class='ctx'> 	struct compat_cmsghdr cmhdr;</div><div class='del'>-	struct compat_timeval ctv;</div><div class='del'>-	struct compat_timespec cts[3];</div><div class='add'>+	struct old_timeval32 ctv;</div><div class='add'>+	struct old_timespec32 cts[3];</div><div class='ctx'> 	int cmlen;</div><div class='ctx'> </div><div class='ctx'> 	if (cm == NULL || kmsg-&gt;msg_controllen &lt; sizeof(*cm)) {</div><div class='hunk'>@@ -219,18 +238,18 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!COMPAT_USE_64BIT_TIME) {</div><div class='del'>-		if (level == SOL_SOCKET &amp;&amp; type == SCM_TIMESTAMP) {</div><div class='del'>-			struct timeval *tv = (struct timeval *)data;</div><div class='add'>+		if (level == SOL_SOCKET &amp;&amp; type == SO_TIMESTAMP_OLD) {</div><div class='add'>+			struct __kernel_old_timeval *tv = (struct __kernel_old_timeval *)data;</div><div class='ctx'> 			ctv.tv_sec = tv-&gt;tv_sec;</div><div class='ctx'> 			ctv.tv_usec = tv-&gt;tv_usec;</div><div class='ctx'> 			data = &amp;ctv;</div><div class='ctx'> 			len = sizeof(ctv);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (level == SOL_SOCKET &amp;&amp;</div><div class='del'>-		    (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {</div><div class='del'>-			int count = type == SCM_TIMESTAMPNS ? 1 : 3;</div><div class='add'>+		    (type == SO_TIMESTAMPNS_OLD || type == SO_TIMESTAMPING_OLD)) {</div><div class='add'>+			int count = type == SO_TIMESTAMPNS_OLD ? 1 : 3;</div><div class='ctx'> 			int i;</div><div class='del'>-			struct timespec *ts = (struct timespec *)data;</div><div class='add'>+			struct __kernel_old_timespec *ts = data;</div><div class='ctx'> 			for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 				cts[i].tv_sec = ts[i].tv_sec;</div><div class='ctx'> 				cts[i].tv_nsec = ts[i].tv_nsec;</div><div class='hunk'>@@ -256,44 +275,36 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat</div><div class='ctx'> 	cmlen = CMSG_COMPAT_SPACE(len);</div><div class='ctx'> 	if (kmsg-&gt;msg_controllen &lt; cmlen)</div><div class='ctx'> 		cmlen = kmsg-&gt;msg_controllen;</div><div class='del'>-	kmsg-&gt;msg_control += cmlen;</div><div class='add'>+	kmsg-&gt;msg_control_user += cmlen;</div><div class='ctx'> 	kmsg-&gt;msg_controllen -= cmlen;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)</div><div class='add'>+static int scm_max_fds_compat(struct msghdr *msg)</div><div class='ctx'> {</div><div class='del'>-	struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg-&gt;msg_control;</div><div class='del'>-	int fdmax = (kmsg-&gt;msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);</div><div class='del'>-	int fdnum = scm-&gt;fp-&gt;count;</div><div class='del'>-	struct file **fp = scm-&gt;fp-&gt;fp;</div><div class='del'>-	int __user *cmfptr;</div><div class='del'>-	int err = 0, i;</div><div class='add'>+	if (msg-&gt;msg_controllen &lt;= sizeof(struct compat_cmsghdr))</div><div class='add'>+		return 0;</div><div class='add'>+	return (msg-&gt;msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (fdnum &lt; fdmax)</div><div class='del'>-		fdmax = fdnum;</div><div class='add'>+void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+{</div><div class='add'>+	struct compat_cmsghdr __user *cm =</div><div class='add'>+		(struct compat_cmsghdr __user *)msg-&gt;msg_control_user;</div><div class='add'>+	unsigned int o_flags = (msg-&gt;msg_flags &amp; MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0;</div><div class='add'>+	int fdmax = min_t(int, scm_max_fds_compat(msg), scm-&gt;fp-&gt;count);</div><div class='add'>+	int __user *cmsg_data = CMSG_COMPAT_DATA(cm);</div><div class='add'>+	int err = 0, i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, cmfptr = (int __user *) CMSG_COMPAT_DATA(cm); i &lt; fdmax; i++, cmfptr++) {</div><div class='del'>-		int new_fd;</div><div class='del'>-		err = security_file_receive(fp[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		err = get_unused_fd_flags(MSG_CMSG_CLOEXEC &amp; kmsg-&gt;msg_flags</div><div class='del'>-					  ? O_CLOEXEC : 0);</div><div class='add'>+	for (i = 0; i &lt; fdmax; i++) {</div><div class='add'>+		err = scm_recv_one_fd(scm-&gt;fp-&gt;fp[i], cmsg_data + i, o_flags);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		new_fd = err;</div><div class='del'>-		err = put_user(new_fd, cmfptr);</div><div class='del'>-		if (err) {</div><div class='del'>-			put_unused_fd(new_fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* Bump the usage count and install the file. */</div><div class='del'>-		fd_install(new_fd, get_file(fp[i]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt; 0) {</div><div class='ctx'> 		int cmlen = CMSG_COMPAT_LEN(i * sizeof(int));</div><div class='add'>+</div><div class='ctx'> 		err = put_user(SOL_SOCKET, &amp;cm-&gt;cmsg_level);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = put_user(SCM_RIGHTS, &amp;cm-&gt;cmsg_type);</div><div class='hunk'>@@ -301,442 +312,23 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)</div><div class='ctx'> 			err = put_user(cmlen, &amp;cm-&gt;cmsg_len);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			cmlen = CMSG_COMPAT_SPACE(i * sizeof(int));</div><div class='del'>-			kmsg-&gt;msg_control += cmlen;</div><div class='del'>-			kmsg-&gt;msg_controllen -= cmlen;</div><div class='add'>+			if (msg-&gt;msg_controllen &lt; cmlen)</div><div class='add'>+				cmlen = msg-&gt;msg_controllen;</div><div class='add'>+			msg-&gt;msg_control_user += cmlen;</div><div class='add'>+			msg-&gt;msg_controllen -= cmlen;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (i &lt; fdnum)</div><div class='del'>-		kmsg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='add'>+</div><div class='add'>+	if (i &lt; scm-&gt;fp-&gt;count || (scm-&gt;fp-&gt;count &amp;&amp; fdmax &lt;= 0))</div><div class='add'>+		msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * All of the files that fit in the message have had their</div><div class='del'>-	 * usage counts incremented, so we just free the list.</div><div class='add'>+	 * All of the files that fit in the message have had their usage counts</div><div class='add'>+	 * incremented, so we just free the list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__scm_destroy(scm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* allocate a 64-bit sock_fprog on the user stack for duration of syscall. */</div><div class='del'>-struct sock_fprog __user *get_compat_bpf_fprog(char __user *optval)</div><div class='del'>-{</div><div class='del'>-	struct compat_sock_fprog __user *fprog32 = (struct compat_sock_fprog __user *)optval;</div><div class='del'>-	struct sock_fprog __user *kfprog = compat_alloc_user_space(sizeof(struct sock_fprog));</div><div class='del'>-	struct compat_sock_fprog f32;</div><div class='del'>-	struct sock_fprog f;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;f32, fprog32, sizeof(*fprog32)))</div><div class='del'>-		return NULL;</div><div class='del'>-	memset(&amp;f, 0, sizeof(f));</div><div class='del'>-	f.len = f32.len;</div><div class='del'>-	f.filter = compat_ptr(f32.filter);</div><div class='del'>-	if (copy_to_user(kfprog, &amp;f, sizeof(struct sock_fprog)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return kfprog;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(get_compat_bpf_fprog);</div><div class='del'>-</div><div class='del'>-static int do_set_attach_filter(struct socket *sock, int level, int optname,</div><div class='del'>-				char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct sock_fprog __user *kfprog;</div><div class='del'>-</div><div class='del'>-	kfprog = get_compat_bpf_fprog(optval);</div><div class='del'>-	if (!kfprog)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return sock_setsockopt(sock, level, optname, (char __user *)kfprog,</div><div class='del'>-			      sizeof(struct sock_fprog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_set_sock_timeout(struct socket *sock, int level,</div><div class='del'>-		int optname, char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct compat_timeval __user *up = (struct compat_timeval __user *)optval;</div><div class='del'>-	struct timeval ktime;</div><div class='del'>-	mm_segment_t old_fs;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (optlen &lt; sizeof(*up))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!access_ok(VERIFY_READ, up, sizeof(*up)) ||</div><div class='del'>-	    __get_user(ktime.tv_sec, &amp;up-&gt;tv_sec) ||</div><div class='del'>-	    __get_user(ktime.tv_usec, &amp;up-&gt;tv_usec))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	old_fs = get_fs();</div><div class='del'>-	set_fs(KERNEL_DS);</div><div class='del'>-	err = sock_setsockopt(sock, level, optname, (char *)&amp;ktime, sizeof(ktime));</div><div class='del'>-	set_fs(old_fs);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int compat_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (optname == SO_ATTACH_FILTER ||</div><div class='del'>-	    optname == SO_ATTACH_REUSEPORT_CBPF)</div><div class='del'>-		return do_set_attach_filter(sock, level, optname,</div><div class='del'>-					    optval, optlen);</div><div class='del'>-	if (!COMPAT_USE_64BIT_TIME &amp;&amp;</div><div class='del'>-	    (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))</div><div class='del'>-		return do_set_sock_timeout(sock, level, optname, optval, optlen);</div><div class='del'>-</div><div class='del'>-	return sock_setsockopt(sock, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __compat_sys_setsockopt(int fd, int level, int optname,</div><div class='del'>-				   char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct socket *sock = sockfd_lookup(fd, &amp;err);</div><div class='del'>-</div><div class='del'>-	if (sock) {</div><div class='del'>-		err = security_socket_setsockopt(sock, level, optname);</div><div class='del'>-		if (err) {</div><div class='del'>-			sockfd_put(sock);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (level == SOL_SOCKET)</div><div class='del'>-			err = compat_sock_setsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		else if (sock-&gt;ops-&gt;compat_setsockopt)</div><div class='del'>-			err = sock-&gt;ops-&gt;compat_setsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		else</div><div class='del'>-			err = sock-&gt;ops-&gt;setsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		sockfd_put(sock);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,</div><div class='del'>-		       char __user *, optval, unsigned int, optlen)</div><div class='del'>-{</div><div class='del'>-	return __compat_sys_setsockopt(fd, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_get_sock_timeout(struct socket *sock, int level, int optname,</div><div class='del'>-		char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	struct compat_timeval __user *up;</div><div class='del'>-	struct timeval ktime;</div><div class='del'>-	mm_segment_t old_fs;</div><div class='del'>-	int len, err;</div><div class='del'>-</div><div class='del'>-	up = (struct compat_timeval __user *) optval;</div><div class='del'>-	if (get_user(len, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (len &lt; sizeof(*up))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	len = sizeof(ktime);</div><div class='del'>-	old_fs = get_fs();</div><div class='del'>-	set_fs(KERNEL_DS);</div><div class='del'>-	err = sock_getsockopt(sock, level, optname, (char *) &amp;ktime, &amp;len);</div><div class='del'>-	set_fs(old_fs);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (put_user(sizeof(*up), optlen) ||</div><div class='del'>-		    !access_ok(VERIFY_WRITE, up, sizeof(*up)) ||</div><div class='del'>-		    __put_user(ktime.tv_sec, &amp;up-&gt;tv_sec) ||</div><div class='del'>-		    __put_user(ktime.tv_usec, &amp;up-&gt;tv_usec))</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int compat_sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (!COMPAT_USE_64BIT_TIME &amp;&amp;</div><div class='del'>-	    (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))</div><div class='del'>-		return do_get_sock_timeout(sock, level, optname, optval, optlen);</div><div class='del'>-	return sock_getsockopt(sock, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)</div><div class='del'>-{</div><div class='del'>-	struct compat_timeval __user *ctv;</div><div class='del'>-	int err;</div><div class='del'>-	struct timeval tv;</div><div class='del'>-</div><div class='del'>-	if (COMPAT_USE_64BIT_TIME)</div><div class='del'>-		return sock_get_timestamp(sk, userstamp);</div><div class='del'>-</div><div class='del'>-	ctv = (struct compat_timeval __user *) userstamp;</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-	sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='del'>-	tv = ktime_to_timeval(sk-&gt;sk_stamp);</div><div class='del'>-	if (tv.tv_sec == -1)</div><div class='del'>-		return err;</div><div class='del'>-	if (tv.tv_sec == 0) {</div><div class='del'>-		sk-&gt;sk_stamp = ktime_get_real();</div><div class='del'>-		tv = ktime_to_timeval(sk-&gt;sk_stamp);</div><div class='del'>-	}</div><div class='del'>-	err = 0;</div><div class='del'>-	if (put_user(tv.tv_sec, &amp;ctv-&gt;tv_sec) ||</div><div class='del'>-			put_user(tv.tv_usec, &amp;ctv-&gt;tv_usec))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_sock_get_timestamp);</div><div class='del'>-</div><div class='del'>-int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)</div><div class='del'>-{</div><div class='del'>-	struct compat_timespec __user *ctv;</div><div class='del'>-	int err;</div><div class='del'>-	struct timespec ts;</div><div class='del'>-</div><div class='del'>-	if (COMPAT_USE_64BIT_TIME)</div><div class='del'>-		return sock_get_timestampns (sk, userstamp);</div><div class='del'>-</div><div class='del'>-	ctv = (struct compat_timespec __user *) userstamp;</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-	sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='del'>-	ts = ktime_to_timespec(sk-&gt;sk_stamp);</div><div class='del'>-	if (ts.tv_sec == -1)</div><div class='del'>-		return err;</div><div class='del'>-	if (ts.tv_sec == 0) {</div><div class='del'>-		sk-&gt;sk_stamp = ktime_get_real();</div><div class='del'>-		ts = ktime_to_timespec(sk-&gt;sk_stamp);</div><div class='del'>-	}</div><div class='del'>-	err = 0;</div><div class='del'>-	if (put_user(ts.tv_sec, &amp;ctv-&gt;tv_sec) ||</div><div class='del'>-			put_user(ts.tv_nsec, &amp;ctv-&gt;tv_nsec))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_sock_get_timestampns);</div><div class='del'>-</div><div class='del'>-static int __compat_sys_getsockopt(int fd, int level, int optname,</div><div class='del'>-				   char __user *optval,</div><div class='del'>-				   int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct socket *sock = sockfd_lookup(fd, &amp;err);</div><div class='del'>-</div><div class='del'>-	if (sock) {</div><div class='del'>-		err = security_socket_getsockopt(sock, level, optname);</div><div class='del'>-		if (err) {</div><div class='del'>-			sockfd_put(sock);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (level == SOL_SOCKET)</div><div class='del'>-			err = compat_sock_getsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		else if (sock-&gt;ops-&gt;compat_getsockopt)</div><div class='del'>-			err = sock-&gt;ops-&gt;compat_getsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		else</div><div class='del'>-			err = sock-&gt;ops-&gt;getsockopt(sock, level,</div><div class='del'>-					optname, optval, optlen);</div><div class='del'>-		sockfd_put(sock);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-COMPAT_SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname,</div><div class='del'>-		       char __user *, optval, int __user *, optlen)</div><div class='del'>-{</div><div class='del'>-	return __compat_sys_getsockopt(fd, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct compat_group_req {</div><div class='del'>-	__u32				 gr_interface;</div><div class='del'>-	struct __kernel_sockaddr_storage gr_group</div><div class='del'>-		__aligned(4);</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct compat_group_source_req {</div><div class='del'>-	__u32				 gsr_interface;</div><div class='del'>-	struct __kernel_sockaddr_storage gsr_group</div><div class='del'>-		__aligned(4);</div><div class='del'>-	struct __kernel_sockaddr_storage gsr_source</div><div class='del'>-		__aligned(4);</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct compat_group_filter {</div><div class='del'>-	__u32				 gf_interface;</div><div class='del'>-	struct __kernel_sockaddr_storage gf_group</div><div class='del'>-		__aligned(4);</div><div class='del'>-	__u32				 gf_fmode;</div><div class='del'>-	__u32				 gf_numsrc;</div><div class='del'>-	struct __kernel_sockaddr_storage gf_slist[1]</div><div class='del'>-		__aligned(4);</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \</div><div class='del'>-			sizeof(struct __kernel_sockaddr_storage))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int compat_mc_setsockopt(struct sock *sock, int level, int optname,</div><div class='del'>-	char __user *optval, unsigned int optlen,</div><div class='del'>-	int (*setsockopt)(struct sock *, int, int, char __user *, unsigned int))</div><div class='del'>-{</div><div class='del'>-	char __user	*koptval = optval;</div><div class='del'>-	int		koptlen = optlen;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case MCAST_JOIN_GROUP:</div><div class='del'>-	case MCAST_LEAVE_GROUP:</div><div class='del'>-	{</div><div class='del'>-		struct compat_group_req __user *gr32 = (void *)optval;</div><div class='del'>-		struct group_req __user *kgr =</div><div class='del'>-			compat_alloc_user_space(sizeof(struct group_req));</div><div class='del'>-		u32 interface;</div><div class='del'>-</div><div class='del'>-		if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) ||</div><div class='del'>-		    !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) ||</div><div class='del'>-		    __get_user(interface, &amp;gr32-&gt;gr_interface) ||</div><div class='del'>-		    __put_user(interface, &amp;kgr-&gt;gr_interface) ||</div><div class='del'>-		    copy_in_user(&amp;kgr-&gt;gr_group, &amp;gr32-&gt;gr_group,</div><div class='del'>-				sizeof(kgr-&gt;gr_group)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		koptval = (char __user *)kgr;</div><div class='del'>-		koptlen = sizeof(struct group_req);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case MCAST_JOIN_SOURCE_GROUP:</div><div class='del'>-	case MCAST_LEAVE_SOURCE_GROUP:</div><div class='del'>-	case MCAST_BLOCK_SOURCE:</div><div class='del'>-	case MCAST_UNBLOCK_SOURCE:</div><div class='del'>-	{</div><div class='del'>-		struct compat_group_source_req __user *gsr32 = (void *)optval;</div><div class='del'>-		struct group_source_req __user *kgsr = compat_alloc_user_space(</div><div class='del'>-			sizeof(struct group_source_req));</div><div class='del'>-		u32 interface;</div><div class='del'>-</div><div class='del'>-		if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) ||</div><div class='del'>-		    !access_ok(VERIFY_WRITE, kgsr,</div><div class='del'>-			sizeof(struct group_source_req)) ||</div><div class='del'>-		    __get_user(interface, &amp;gsr32-&gt;gsr_interface) ||</div><div class='del'>-		    __put_user(interface, &amp;kgsr-&gt;gsr_interface) ||</div><div class='del'>-		    copy_in_user(&amp;kgsr-&gt;gsr_group, &amp;gsr32-&gt;gsr_group,</div><div class='del'>-				sizeof(kgsr-&gt;gsr_group)) ||</div><div class='del'>-		    copy_in_user(&amp;kgsr-&gt;gsr_source, &amp;gsr32-&gt;gsr_source,</div><div class='del'>-				sizeof(kgsr-&gt;gsr_source)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		koptval = (char __user *)kgsr;</div><div class='del'>-		koptlen = sizeof(struct group_source_req);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case MCAST_MSFILTER:</div><div class='del'>-	{</div><div class='del'>-		struct compat_group_filter __user *gf32 = (void *)optval;</div><div class='del'>-		struct group_filter __user *kgf;</div><div class='del'>-		u32 interface, fmode, numsrc;</div><div class='del'>-</div><div class='del'>-		if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) ||</div><div class='del'>-		    __get_user(interface, &amp;gf32-&gt;gf_interface) ||</div><div class='del'>-		    __get_user(fmode, &amp;gf32-&gt;gf_fmode) ||</div><div class='del'>-		    __get_user(numsrc, &amp;gf32-&gt;gf_numsrc))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		koptlen = optlen + sizeof(struct group_filter) -</div><div class='del'>-				sizeof(struct compat_group_filter);</div><div class='del'>-		if (koptlen &lt; GROUP_FILTER_SIZE(numsrc))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		kgf = compat_alloc_user_space(koptlen);</div><div class='del'>-		if (!access_ok(VERIFY_WRITE, kgf, koptlen) ||</div><div class='del'>-		    __put_user(interface, &amp;kgf-&gt;gf_interface) ||</div><div class='del'>-		    __put_user(fmode, &amp;kgf-&gt;gf_fmode) ||</div><div class='del'>-		    __put_user(numsrc, &amp;kgf-&gt;gf_numsrc) ||</div><div class='del'>-		    copy_in_user(&amp;kgf-&gt;gf_group, &amp;gf32-&gt;gf_group,</div><div class='del'>-				sizeof(kgf-&gt;gf_group)) ||</div><div class='del'>-		    (numsrc &amp;&amp; copy_in_user(kgf-&gt;gf_slist, gf32-&gt;gf_slist,</div><div class='del'>-				numsrc * sizeof(kgf-&gt;gf_slist[0]))))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		koptval = (char __user *)kgf;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return setsockopt(sock, level, optname, koptval, koptlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_mc_setsockopt);</div><div class='del'>-</div><div class='del'>-int compat_mc_getsockopt(struct sock *sock, int level, int optname,</div><div class='del'>-	char __user *optval, int __user *optlen,</div><div class='del'>-	int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))</div><div class='del'>-{</div><div class='del'>-	struct compat_group_filter __user *gf32 = (void *)optval;</div><div class='del'>-	struct group_filter __user *kgf;</div><div class='del'>-	int __user	*koptlen;</div><div class='del'>-	u32 interface, fmode, numsrc;</div><div class='del'>-	int klen, ulen, err;</div><div class='del'>-</div><div class='del'>-	if (optname != MCAST_MSFILTER)</div><div class='del'>-		return getsockopt(sock, level, optname, optval, optlen);</div><div class='del'>-</div><div class='del'>-	koptlen = compat_alloc_user_space(sizeof(*koptlen));</div><div class='del'>-	if (!access_ok(VERIFY_READ, optlen, sizeof(*optlen)) ||</div><div class='del'>-	    __get_user(ulen, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* adjust len for pad */</div><div class='del'>-	klen = ulen + sizeof(*kgf) - sizeof(*gf32);</div><div class='del'>-</div><div class='del'>-	if (klen &lt; GROUP_FILTER_SIZE(0))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, koptlen, sizeof(*koptlen)) ||</div><div class='del'>-	    __put_user(klen, koptlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* have to allow space for previous compat_alloc_user_space, too */</div><div class='del'>-	kgf = compat_alloc_user_space(klen+sizeof(*optlen));</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) ||</div><div class='del'>-	    __get_user(interface, &amp;gf32-&gt;gf_interface) ||</div><div class='del'>-	    __get_user(fmode, &amp;gf32-&gt;gf_fmode) ||</div><div class='del'>-	    __get_user(numsrc, &amp;gf32-&gt;gf_numsrc) ||</div><div class='del'>-	    __put_user(interface, &amp;kgf-&gt;gf_interface) ||</div><div class='del'>-	    __put_user(fmode, &amp;kgf-&gt;gf_fmode) ||</div><div class='del'>-	    __put_user(numsrc, &amp;kgf-&gt;gf_numsrc) ||</div><div class='del'>-	    copy_in_user(&amp;kgf-&gt;gf_group, &amp;gf32-&gt;gf_group, sizeof(kgf-&gt;gf_group)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	err = getsockopt(sock, level, optname, (char __user *)kgf, koptlen);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, koptlen, sizeof(*koptlen)) ||</div><div class='del'>-	    __get_user(klen, koptlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	ulen = klen - (sizeof(*kgf)-sizeof(*gf32));</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, optlen, sizeof(*optlen)) ||</div><div class='del'>-	    __put_user(ulen, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, kgf, klen) ||</div><div class='del'>-	    !access_ok(VERIFY_WRITE, gf32, ulen) ||</div><div class='del'>-	    __get_user(interface, &amp;kgf-&gt;gf_interface) ||</div><div class='del'>-	    __get_user(fmode, &amp;kgf-&gt;gf_fmode) ||</div><div class='del'>-	    __get_user(numsrc, &amp;kgf-&gt;gf_numsrc) ||</div><div class='del'>-	    __put_user(interface, &amp;gf32-&gt;gf_interface) ||</div><div class='del'>-	    __put_user(fmode, &amp;gf32-&gt;gf_fmode) ||</div><div class='del'>-	    __put_user(numsrc, &amp;gf32-&gt;gf_numsrc))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (numsrc) {</div><div class='del'>-		int copylen;</div><div class='del'>-</div><div class='del'>-		klen -= GROUP_FILTER_SIZE(0);</div><div class='del'>-		copylen = numsrc * sizeof(gf32-&gt;gf_slist[0]);</div><div class='del'>-		if (copylen &gt; klen)</div><div class='del'>-			copylen = klen;</div><div class='del'>-		if (copy_in_user(gf32-&gt;gf_slist, kgf-&gt;gf_slist, copylen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_mc_getsockopt);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Argument list sizes for compat_sys_socketcall */</div><div class='ctx'> #define AL(x) ((x) * sizeof(u32))</div><div class='ctx'> static unsigned char nas[21] = {</div><div class='hunk'>@@ -810,34 +402,23 @@ COMPAT_SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, buf, compat_size_t, len</div><div class='ctx'> 	return __compat_sys_recvfrom(fd, buf, len, flags, addr, addrlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,</div><div class='del'>-				 unsigned int vlen, unsigned int flags,</div><div class='del'>-				 struct compat_timespec __user *timeout)</div><div class='add'>+COMPAT_SYSCALL_DEFINE5(recvmmsg_time64, int, fd, struct compat_mmsghdr __user *, mmsg,</div><div class='add'>+		       unsigned int, vlen, unsigned int, flags,</div><div class='add'>+		       struct __kernel_timespec __user *, timeout)</div><div class='ctx'> {</div><div class='del'>-	int datagrams;</div><div class='del'>-	struct timespec ktspec;</div><div class='del'>-</div><div class='del'>-	if (timeout == NULL)</div><div class='del'>-		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,</div><div class='del'>-				      flags | MSG_CMSG_COMPAT, NULL);</div><div class='del'>-</div><div class='del'>-	if (compat_get_timespec(&amp;ktspec, timeout))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,</div><div class='del'>-				   flags | MSG_CMSG_COMPAT, &amp;ktspec);</div><div class='del'>-	if (datagrams &gt; 0 &amp;&amp; compat_put_timespec(&amp;ktspec, timeout))</div><div class='del'>-		datagrams = -EFAULT;</div><div class='del'>-</div><div class='del'>-	return datagrams;</div><div class='add'>+	return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,</div><div class='add'>+			      flags | MSG_CMSG_COMPAT, timeout, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg,</div><div class='add'>+#ifdef CONFIG_COMPAT_32BIT_TIME</div><div class='add'>+COMPAT_SYSCALL_DEFINE5(recvmmsg_time32, int, fd, struct compat_mmsghdr __user *, mmsg,</div><div class='ctx'> 		       unsigned int, vlen, unsigned int, flags,</div><div class='del'>-		       struct compat_timespec __user *, timeout)</div><div class='add'>+		       struct old_timespec32 __user *, timeout)</div><div class='ctx'> {</div><div class='del'>-	return __compat_sys_recvmmsg(fd, mmsg, vlen, flags, timeout);</div><div class='add'>+	return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,</div><div class='add'>+			      flags | MSG_CMSG_COMPAT, NULL, timeout);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)</div><div class='ctx'> {</div><div class='hunk'>@@ -879,10 +460,10 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)</div><div class='ctx'> 		ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_GETSOCKNAME:</div><div class='del'>-		ret = __sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2]));</div><div class='add'>+		ret = __sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2]), 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_GETPEERNAME:</div><div class='del'>-		ret = __sys_getpeername(a0, compat_ptr(a1), compat_ptr(a[2]));</div><div class='add'>+		ret = __sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2]), 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_SOCKETPAIR:</div><div class='ctx'> 		ret = __sys_socketpair(a0, a1, a[2], compat_ptr(a[3]));</div><div class='hunk'>@@ -907,13 +488,11 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)</div><div class='ctx'> 		ret = __sys_shutdown(a0, a1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_SETSOCKOPT:</div><div class='del'>-		ret = __compat_sys_setsockopt(a0, a1, a[2],</div><div class='del'>-					      compat_ptr(a[3]), a[4]);</div><div class='add'>+		ret = __sys_setsockopt(a0, a1, a[2], compat_ptr(a[3]), a[4]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_GETSOCKOPT:</div><div class='del'>-		ret = __compat_sys_getsockopt(a0, a1, a[2],</div><div class='del'>-					      compat_ptr(a[3]),</div><div class='del'>-					      compat_ptr(a[4]));</div><div class='add'>+		ret = __sys_getsockopt(a0, a1, a[2], compat_ptr(a[3]),</div><div class='add'>+				       compat_ptr(a[4]));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_SENDMSG:</div><div class='ctx'> 		ret = __compat_sys_sendmsg(a0, compat_ptr(a1), a[2]);</div><div class='hunk'>@@ -925,8 +504,9 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)</div><div class='ctx'> 		ret = __compat_sys_recvmsg(a0, compat_ptr(a1), a[2]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_RECVMMSG:</div><div class='del'>-		ret = __compat_sys_recvmmsg(a0, compat_ptr(a1), a[2], a[3],</div><div class='del'>-					    compat_ptr(a[4]));</div><div class='add'>+		ret = __sys_recvmmsg(a0, compat_ptr(a1), a[2],</div><div class='add'>+				     a[3] | MSG_CMSG_COMPAT, NULL,</div><div class='add'>+				     compat_ptr(a[4]));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_ACCEPT4:</div><div class='ctx'> 		ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), a[3]);</div><div class='head'>diff --git a/net/core/Makefile b/net/core/Makefile<br/>index 80175e6a2eb8..9ef2099c5426 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/Makefile</a></div><div class='hunk'>@@ -4,23 +4,32 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y := sock.o request_sock.o skbuff.o datagram.o stream.o scm.o \</div><div class='del'>-	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o flow_dissector.o</div><div class='add'>+	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o \</div><div class='add'>+	 flow_dissector.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SYSCTL) += sysctl_net_core.o</div><div class='ctx'> </div><div class='del'>-obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \</div><div class='add'>+obj-y		     += dev.o dev_api.o dev_addr_lists.o dst.o netevent.o \</div><div class='ctx'> 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \</div><div class='ctx'> 			sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \</div><div class='del'>-			fib_notifier.o xdp.o</div><div class='add'>+			fib_notifier.o xdp.o flow_offload.o gro.o \</div><div class='add'>+			netdev-genl.o netdev-genl-gen.o gso.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o</div><div class='ctx'> </div><div class='ctx'> obj-y += net-sysfs.o</div><div class='del'>-obj-$(CONFIG_PAGE_POOL) += page_pool.o</div><div class='add'>+obj-y += hotdata.o</div><div class='add'>+obj-y += netdev_rx_queue.o</div><div class='add'>+obj-y += netdev_queues.o</div><div class='add'>+obj-$(CONFIG_PAGE_POOL) += page_pool.o page_pool_user.o</div><div class='ctx'> obj-$(CONFIG_PROC_FS) += net-procfs.o</div><div class='ctx'> obj-$(CONFIG_NET_PKTGEN) += pktgen.o</div><div class='ctx'> obj-$(CONFIG_NETPOLL) += netpoll.o</div><div class='ctx'> obj-$(CONFIG_FIB_RULES) += fib_rules.o</div><div class='ctx'> obj-$(CONFIG_TRACEPOINTS) += net-traces.o</div><div class='ctx'> obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o</div><div class='add'>+obj-$(CONFIG_NET_IEEE8021Q_HELPERS) += ieee8021q_helpers.o</div><div class='add'>+obj-$(CONFIG_NET_SELFTESTS) += selftests.o</div><div class='ctx'> obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += timestamping.o</div><div class='ctx'> obj-$(CONFIG_NET_PTP_CLASSIFY) += ptp_classifier.o</div><div class='ctx'> obj-$(CONFIG_CGROUP_NET_PRIO) += netprio_cgroup.o</div><div class='hunk'>@@ -29,6 +38,13 @@ obj-$(CONFIG_LWTUNNEL) += lwtunnel.o</div><div class='ctx'> obj-$(CONFIG_LWTUNNEL_BPF) += lwt_bpf.o</div><div class='ctx'> obj-$(CONFIG_DST_CACHE) += dst_cache.o</div><div class='ctx'> obj-$(CONFIG_HWBM) += hwbm.o</div><div class='del'>-obj-$(CONFIG_NET_DEVLINK) += devlink.o</div><div class='ctx'> obj-$(CONFIG_GRO_CELLS) += gro_cells.o</div><div class='ctx'> obj-$(CONFIG_FAILOVER) += failover.o</div><div class='add'>+obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL) += sock_map.o</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o</div><div class='add'>+obj-$(CONFIG_OF)	+= of_net.o</div><div class='add'>+obj-$(CONFIG_NET_TEST) += net_test.o</div><div class='add'>+obj-$(CONFIG_NET_DEVMEM) += devmem.o</div><div class='add'>+obj-$(CONFIG_DEBUG_NET) += lock_debug.o</div><div class='add'>+obj-$(CONFIG_FAIL_SKB_REALLOC) += skb_fault_injection.o</div><div class='head'>diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c<br/>new file mode 100644<br/>index 000000000000..850dd736ccd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/bpf_sk_storage.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/bpf_sk_storage.c</a></div><div class='hunk'>@@ -0,0 +1,914 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019 Facebook  */</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;linux/bpf_local_storage.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sock_diag.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate_trace.h&gt;</div><div class='add'>+</div><div class='add'>+DEFINE_BPF_STORAGE_CACHE(sk_cache);</div><div class='add'>+</div><div class='add'>+static struct bpf_local_storage_data *</div><div class='add'>+bpf_sk_storage_lookup(struct sock *sk, struct bpf_map *map, bool cacheit_lockit)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_local_storage_map *smap;</div><div class='add'>+</div><div class='add'>+	sk_storage =</div><div class='add'>+		rcu_dereference_check(sk-&gt;sk_bpf_storage, bpf_rcu_lock_held());</div><div class='add'>+	if (!sk_storage)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	smap = (struct bpf_local_storage_map *)map;</div><div class='add'>+	return bpf_local_storage_lookup(sk_storage, smap, cacheit_lockit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_sk_storage_del(struct sock *sk, struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_data *sdata;</div><div class='add'>+</div><div class='add'>+	sdata = bpf_sk_storage_lookup(sk, map, false);</div><div class='add'>+	if (!sdata)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	bpf_selem_unlink(SELEM(sdata), false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called by __sk_destruct() &amp; bpf_sk_storage_clone() */</div><div class='add'>+void bpf_sk_storage_free(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_dont_migrate();</div><div class='add'>+	sk_storage = rcu_dereference(sk-&gt;sk_bpf_storage);</div><div class='add'>+	if (!sk_storage)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_local_storage_destroy(sk_storage);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock_migrate();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_sk_storage_map_free(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	bpf_local_storage_map_free(map, &amp;sk_cache, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_map *bpf_sk_storage_map_alloc(union bpf_attr *attr)</div><div class='add'>+{</div><div class='add'>+	return bpf_local_storage_map_alloc(attr, &amp;sk_cache, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int notsupp_get_next_key(struct bpf_map *map, void *key,</div><div class='add'>+				void *next_key)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_fd_sk_storage_lookup_elem(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_data *sdata;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = *(int *)key;</div><div class='add'>+	sock = sockfd_lookup(fd, &amp;err);</div><div class='add'>+	if (sock) {</div><div class='add'>+		sdata = bpf_sk_storage_lookup(sock-&gt;sk, map, true);</div><div class='add'>+		sockfd_put(sock);</div><div class='add'>+		return sdata ? sdata-&gt;data : NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long bpf_fd_sk_storage_update_elem(struct bpf_map *map, void *key,</div><div class='add'>+					  void *value, u64 map_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_data *sdata;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = *(int *)key;</div><div class='add'>+	sock = sockfd_lookup(fd, &amp;err);</div><div class='add'>+	if (sock) {</div><div class='add'>+		sdata = bpf_local_storage_update(</div><div class='add'>+			sock-&gt;sk, (struct bpf_local_storage_map *)map, value,</div><div class='add'>+			map_flags, false, GFP_ATOMIC);</div><div class='add'>+		sockfd_put(sock);</div><div class='add'>+		return PTR_ERR_OR_ZERO(sdata);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long bpf_fd_sk_storage_delete_elem(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = *(int *)key;</div><div class='add'>+	sock = sockfd_lookup(fd, &amp;err);</div><div class='add'>+	if (sock) {</div><div class='add'>+		err = bpf_sk_storage_del(sock-&gt;sk, map);</div><div class='add'>+		sockfd_put(sock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_local_storage_elem *</div><div class='add'>+bpf_sk_storage_clone_elem(struct sock *newsk,</div><div class='add'>+			  struct bpf_local_storage_map *smap,</div><div class='add'>+			  struct bpf_local_storage_elem *selem)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_elem *copy_selem;</div><div class='add'>+</div><div class='add'>+	copy_selem = bpf_selem_alloc(smap, newsk, NULL, false, GFP_ATOMIC);</div><div class='add'>+	if (!copy_selem)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (btf_record_has_field(smap-&gt;map.record, BPF_SPIN_LOCK))</div><div class='add'>+		copy_map_value_locked(&amp;smap-&gt;map, SDATA(copy_selem)-&gt;data,</div><div class='add'>+				      SDATA(selem)-&gt;data, true);</div><div class='add'>+	else</div><div class='add'>+		copy_map_value(&amp;smap-&gt;map, SDATA(copy_selem)-&gt;data,</div><div class='add'>+			       SDATA(selem)-&gt;data);</div><div class='add'>+</div><div class='add'>+	return copy_selem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_sk_storage_clone(const struct sock *sk, struct sock *newsk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage *new_sk_storage = NULL;</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_local_storage_elem *selem;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(newsk-&gt;sk_bpf_storage, NULL);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_dont_migrate();</div><div class='add'>+	sk_storage = rcu_dereference(sk-&gt;sk_bpf_storage);</div><div class='add'>+</div><div class='add'>+	if (!sk_storage || hlist_empty(&amp;sk_storage-&gt;list))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(selem, &amp;sk_storage-&gt;list, snode) {</div><div class='add'>+		struct bpf_local_storage_elem *copy_selem;</div><div class='add'>+		struct bpf_local_storage_map *smap;</div><div class='add'>+		struct bpf_map *map;</div><div class='add'>+</div><div class='add'>+		smap = rcu_dereference(SDATA(selem)-&gt;smap);</div><div class='add'>+		if (!(smap-&gt;map.map_flags &amp; BPF_F_CLONE))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Note that for lockless listeners adding new element</div><div class='add'>+		 * here can race with cleanup in bpf_local_storage_map_free.</div><div class='add'>+		 * Try to grab map refcnt to make sure that it's still</div><div class='add'>+		 * alive and prevent concurrent removal.</div><div class='add'>+		 */</div><div class='add'>+		map = bpf_map_inc_not_zero(&amp;smap-&gt;map);</div><div class='add'>+		if (IS_ERR(map))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		copy_selem = bpf_sk_storage_clone_elem(newsk, smap, selem);</div><div class='add'>+		if (!copy_selem) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			bpf_map_put(map);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (new_sk_storage) {</div><div class='add'>+			bpf_selem_link_map(smap, copy_selem);</div><div class='add'>+			bpf_selem_link_storage_nolock(new_sk_storage, copy_selem);</div><div class='add'>+		} else {</div><div class='add'>+			ret = bpf_local_storage_alloc(newsk, smap, copy_selem, GFP_ATOMIC);</div><div class='add'>+			if (ret) {</div><div class='add'>+				bpf_selem_free(copy_selem, true);</div><div class='add'>+				atomic_sub(smap-&gt;elem_size,</div><div class='add'>+					   &amp;newsk-&gt;sk_omem_alloc);</div><div class='add'>+				bpf_map_put(map);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			new_sk_storage =</div><div class='add'>+				rcu_dereference(copy_selem-&gt;local_storage);</div><div class='add'>+		}</div><div class='add'>+		bpf_map_put(map);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock_migrate();</div><div class='add'>+</div><div class='add'>+	/* In case of an error, don't free anything explicitly here, the</div><div class='add'>+	 * caller is responsible to call bpf_sk_storage_free.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* *gfp_flags* is a hidden argument provided by the verifier */</div><div class='add'>+BPF_CALL_5(bpf_sk_storage_get, struct bpf_map *, map, struct sock *, sk,</div><div class='add'>+	   void *, value, u64, flags, gfp_t, gfp_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_data *sdata;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!bpf_rcu_lock_held());</div><div class='add'>+	if (!sk || !sk_fullsock(sk) || flags &gt; BPF_SK_STORAGE_GET_F_CREATE)</div><div class='add'>+		return (unsigned long)NULL;</div><div class='add'>+</div><div class='add'>+	sdata = bpf_sk_storage_lookup(sk, map, true);</div><div class='add'>+	if (sdata)</div><div class='add'>+		return (unsigned long)sdata-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (flags == BPF_SK_STORAGE_GET_F_CREATE &amp;&amp;</div><div class='add'>+	    /* Cannot add new elem to a going away sk.</div><div class='add'>+	     * Otherwise, the new elem may become a leak</div><div class='add'>+	     * (and also other memory issues during map</div><div class='add'>+	     *  destruction).</div><div class='add'>+	     */</div><div class='add'>+	    refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)) {</div><div class='add'>+		sdata = bpf_local_storage_update(</div><div class='add'>+			sk, (struct bpf_local_storage_map *)map, value,</div><div class='add'>+			BPF_NOEXIST, false, gfp_flags);</div><div class='add'>+		/* sk must be a fullsock (guaranteed by verifier),</div><div class='add'>+		 * so sock_gen_put() is unnecessary.</div><div class='add'>+		 */</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return IS_ERR(sdata) ?</div><div class='add'>+			(unsigned long)NULL : (unsigned long)sdata-&gt;data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_sk_storage_delete, struct bpf_map *, map, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!bpf_rcu_lock_held());</div><div class='add'>+	if (!sk || !sk_fullsock(sk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = bpf_sk_storage_del(sk, map);</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_sk_storage_charge(struct bpf_local_storage_map *smap,</div><div class='add'>+				 void *owner, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)owner;</div><div class='add'>+	int optmem_max;</div><div class='add'>+</div><div class='add'>+	optmem_max = READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max);</div><div class='add'>+	/* same check as in sock_kmalloc() */</div><div class='add'>+	if (size &lt;= optmem_max &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;sk-&gt;sk_omem_alloc) + size &lt; optmem_max) {</div><div class='add'>+		atomic_add(size, &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_sk_storage_uncharge(struct bpf_local_storage_map *smap,</div><div class='add'>+				    void *owner, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = owner;</div><div class='add'>+</div><div class='add'>+	atomic_sub(size, &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_local_storage __rcu **</div><div class='add'>+bpf_sk_storage_ptr(void *owner)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = owner;</div><div class='add'>+</div><div class='add'>+	return &amp;sk-&gt;sk_bpf_storage;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_map_ops sk_storage_map_ops = {</div><div class='add'>+	.map_meta_equal = bpf_map_meta_equal,</div><div class='add'>+	.map_alloc_check = bpf_local_storage_map_alloc_check,</div><div class='add'>+	.map_alloc = bpf_sk_storage_map_alloc,</div><div class='add'>+	.map_free = bpf_sk_storage_map_free,</div><div class='add'>+	.map_get_next_key = notsupp_get_next_key,</div><div class='add'>+	.map_lookup_elem = bpf_fd_sk_storage_lookup_elem,</div><div class='add'>+	.map_update_elem = bpf_fd_sk_storage_update_elem,</div><div class='add'>+	.map_delete_elem = bpf_fd_sk_storage_delete_elem,</div><div class='add'>+	.map_check_btf = bpf_local_storage_map_check_btf,</div><div class='add'>+	.map_btf_id = &amp;bpf_local_storage_map_btf_id[0],</div><div class='add'>+	.map_local_storage_charge = bpf_sk_storage_charge,</div><div class='add'>+	.map_local_storage_uncharge = bpf_sk_storage_uncharge,</div><div class='add'>+	.map_owner_storage_ptr = bpf_sk_storage_ptr,</div><div class='add'>+	.map_mem_usage = bpf_local_storage_map_mem_usage,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_get_proto = {</div><div class='add'>+	.func		= bpf_sk_storage_get,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_get_cg_sock_proto = {</div><div class='add'>+	.func		= bpf_sk_storage_get,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_CTX, /* context is 'struct sock' */</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_delete_proto = {</div><div class='add'>+	.func		= bpf_sk_storage_delete,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool bpf_sk_storage_tracing_allowed(const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	if (prog-&gt;aux-&gt;dst_prog)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Ensure the tracing program is not tracing</div><div class='add'>+	 * any bpf_sk_storage*() function and also</div><div class='add'>+	 * use the bpf_sk_storage_(get|delete) helper.</div><div class='add'>+	 */</div><div class='add'>+	switch (prog-&gt;expected_attach_type) {</div><div class='add'>+	case BPF_TRACE_ITER:</div><div class='add'>+	case BPF_TRACE_RAW_TP:</div><div class='add'>+		/* bpf_sk_storage has no trace point */</div><div class='add'>+		return true;</div><div class='add'>+	case BPF_TRACE_FENTRY:</div><div class='add'>+	case BPF_TRACE_FEXIT:</div><div class='add'>+		return !!strncmp(prog-&gt;aux-&gt;attach_func_name, "bpf_sk_storage",</div><div class='add'>+				 strlen("bpf_sk_storage"));</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* *gfp_flags* is a hidden argument provided by the verifier */</div><div class='add'>+BPF_CALL_5(bpf_sk_storage_get_tracing, struct bpf_map *, map, struct sock *, sk,</div><div class='add'>+	   void *, value, u64, flags, gfp_t, gfp_flags)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!bpf_rcu_lock_held());</div><div class='add'>+	if (in_hardirq() || in_nmi())</div><div class='add'>+		return (unsigned long)NULL;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)____bpf_sk_storage_get(map, sk, value, flags,</div><div class='add'>+						     gfp_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_sk_storage_delete_tracing, struct bpf_map *, map,</div><div class='add'>+	   struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!bpf_rcu_lock_held());</div><div class='add'>+	if (in_hardirq() || in_nmi())</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return ____bpf_sk_storage_delete(map, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_get_tracing_proto = {</div><div class='add'>+	.func		= bpf_sk_storage_get_tracing,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg2_btf_id	= &amp;btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON],</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MAP_VALUE_OR_NULL,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.allowed	= bpf_sk_storage_tracing_allowed,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_delete_tracing_proto = {</div><div class='add'>+	.func		= bpf_sk_storage_delete_tracing,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg2_btf_id	= &amp;btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON],</div><div class='add'>+	.allowed	= bpf_sk_storage_tracing_allowed,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_sk_storage_diag {</div><div class='add'>+	u32 nr_maps;</div><div class='add'>+	struct bpf_map *maps[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The reply will be like:</div><div class='add'>+ * INET_DIAG_BPF_SK_STORAGES (nla_nest)</div><div class='add'>+ *	SK_DIAG_BPF_STORAGE (nla_nest)</div><div class='add'>+ *		SK_DIAG_BPF_STORAGE_MAP_ID (nla_put_u32)</div><div class='add'>+ *		SK_DIAG_BPF_STORAGE_MAP_VALUE (nla_reserve_64bit)</div><div class='add'>+ *	SK_DIAG_BPF_STORAGE (nla_nest)</div><div class='add'>+ *		SK_DIAG_BPF_STORAGE_MAP_ID (nla_put_u32)</div><div class='add'>+ *		SK_DIAG_BPF_STORAGE_MAP_VALUE (nla_reserve_64bit)</div><div class='add'>+ *	....</div><div class='add'>+ */</div><div class='add'>+static int nla_value_size(u32 value_size)</div><div class='add'>+{</div><div class='add'>+	/* SK_DIAG_BPF_STORAGE (nla_nest)</div><div class='add'>+	 *	SK_DIAG_BPF_STORAGE_MAP_ID (nla_put_u32)</div><div class='add'>+	 *	SK_DIAG_BPF_STORAGE_MAP_VALUE (nla_reserve_64bit)</div><div class='add'>+	 */</div><div class='add'>+	return nla_total_size(0) + nla_total_size(sizeof(u32)) +</div><div class='add'>+		nla_total_size_64bit(value_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bpf_sk_storage_diag_free(struct bpf_sk_storage_diag *diag)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (!diag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; diag-&gt;nr_maps; i++)</div><div class='add'>+		bpf_map_put(diag-&gt;maps[i]);</div><div class='add'>+</div><div class='add'>+	kfree(diag);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bpf_sk_storage_diag_free);</div><div class='add'>+</div><div class='add'>+static bool diag_check_dup(const struct bpf_sk_storage_diag *diag,</div><div class='add'>+			   const struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; diag-&gt;nr_maps; i++) {</div><div class='add'>+		if (diag-&gt;maps[i] == map)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_sk_storage_diag *</div><div class='add'>+bpf_sk_storage_diag_alloc(const struct nlattr *nla_stgs)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sk_storage_diag *diag;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	u32 nr_maps = 0;</div><div class='add'>+	int rem, err;</div><div class='add'>+</div><div class='add'>+	/* bpf_local_storage_map is currently limited to CAP_SYS_ADMIN as</div><div class='add'>+	 * the map_alloc_check() side also does.</div><div class='add'>+	 */</div><div class='add'>+	if (!bpf_capable())</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested_type(nla, SK_DIAG_BPF_STORAGE_REQ_MAP_FD,</div><div class='add'>+				 nla_stgs, rem) {</div><div class='add'>+		if (nla_len(nla) != sizeof(u32))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+		nr_maps++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	diag = kzalloc(struct_size(diag, maps, nr_maps), GFP_KERNEL);</div><div class='add'>+	if (!diag)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested_type(nla, SK_DIAG_BPF_STORAGE_REQ_MAP_FD,</div><div class='add'>+				 nla_stgs, rem) {</div><div class='add'>+		int map_fd = nla_get_u32(nla);</div><div class='add'>+		struct bpf_map *map = bpf_map_get(map_fd);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(map)) {</div><div class='add'>+			err = PTR_ERR(map);</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+		if (map-&gt;map_type != BPF_MAP_TYPE_SK_STORAGE) {</div><div class='add'>+			bpf_map_put(map);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+		if (diag_check_dup(diag, map)) {</div><div class='add'>+			bpf_map_put(map);</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+		diag-&gt;maps[diag-&gt;nr_maps++] = map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return diag;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	bpf_sk_storage_diag_free(diag);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bpf_sk_storage_diag_alloc);</div><div class='add'>+</div><div class='add'>+static int diag_get(struct bpf_local_storage_data *sdata, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla_stg, *nla_value;</div><div class='add'>+	struct bpf_local_storage_map *smap;</div><div class='add'>+</div><div class='add'>+	/* It cannot exceed max nlattr's payload */</div><div class='add'>+	BUILD_BUG_ON(U16_MAX - NLA_HDRLEN &lt; BPF_LOCAL_STORAGE_MAX_VALUE_SIZE);</div><div class='add'>+</div><div class='add'>+	nla_stg = nla_nest_start(skb, SK_DIAG_BPF_STORAGE);</div><div class='add'>+	if (!nla_stg)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	smap = rcu_dereference(sdata-&gt;smap);</div><div class='add'>+	if (nla_put_u32(skb, SK_DIAG_BPF_STORAGE_MAP_ID, smap-&gt;map.id))</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	nla_value = nla_reserve_64bit(skb, SK_DIAG_BPF_STORAGE_MAP_VALUE,</div><div class='add'>+				      smap-&gt;map.value_size,</div><div class='add'>+				      SK_DIAG_BPF_STORAGE_PAD);</div><div class='add'>+	if (!nla_value)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	if (btf_record_has_field(smap-&gt;map.record, BPF_SPIN_LOCK))</div><div class='add'>+		copy_map_value_locked(&amp;smap-&gt;map, nla_data(nla_value),</div><div class='add'>+				      sdata-&gt;data, true);</div><div class='add'>+	else</div><div class='add'>+		copy_map_value(&amp;smap-&gt;map, nla_data(nla_value), sdata-&gt;data);</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nla_stg);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	nla_nest_cancel(skb, nla_stg);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_sk_storage_diag_put_all(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				       int stg_array_type,</div><div class='add'>+				       unsigned int *res_diag_size)</div><div class='add'>+{</div><div class='add'>+	/* stg_array_type (e.g. INET_DIAG_BPF_SK_STORAGES) */</div><div class='add'>+	unsigned int diag_size = nla_total_size(0);</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_local_storage_elem *selem;</div><div class='add'>+	struct bpf_local_storage_map *smap;</div><div class='add'>+	struct nlattr *nla_stgs;</div><div class='add'>+	unsigned int saved_len;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sk_storage = rcu_dereference(sk-&gt;sk_bpf_storage);</div><div class='add'>+	if (!sk_storage || hlist_empty(&amp;sk_storage-&gt;list)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_stgs = nla_nest_start(skb, stg_array_type);</div><div class='add'>+	if (!nla_stgs)</div><div class='add'>+		/* Continue to learn diag_size */</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	saved_len = skb-&gt;len;</div><div class='add'>+	hlist_for_each_entry_rcu(selem, &amp;sk_storage-&gt;list, snode) {</div><div class='add'>+		smap = rcu_dereference(SDATA(selem)-&gt;smap);</div><div class='add'>+		diag_size += nla_value_size(smap-&gt;map.value_size);</div><div class='add'>+</div><div class='add'>+		if (nla_stgs &amp;&amp; diag_get(SDATA(selem), skb))</div><div class='add'>+			/* Continue to learn diag_size */</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (nla_stgs) {</div><div class='add'>+		if (saved_len == skb-&gt;len)</div><div class='add'>+			nla_nest_cancel(skb, nla_stgs);</div><div class='add'>+		else</div><div class='add'>+			nla_nest_end(skb, nla_stgs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (diag_size == nla_total_size(0)) {</div><div class='add'>+		*res_diag_size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*res_diag_size = diag_size;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_sk_storage_diag_put(struct bpf_sk_storage_diag *diag,</div><div class='add'>+			    struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			    int stg_array_type,</div><div class='add'>+			    unsigned int *res_diag_size)</div><div class='add'>+{</div><div class='add'>+	/* stg_array_type (e.g. INET_DIAG_BPF_SK_STORAGES) */</div><div class='add'>+	unsigned int diag_size = nla_total_size(0);</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_local_storage_data *sdata;</div><div class='add'>+	struct nlattr *nla_stgs;</div><div class='add'>+	unsigned int saved_len;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	*res_diag_size = 0;</div><div class='add'>+</div><div class='add'>+	/* No map has been specified.  Dump all. */</div><div class='add'>+	if (!diag-&gt;nr_maps)</div><div class='add'>+		return bpf_sk_storage_diag_put_all(sk, skb, stg_array_type,</div><div class='add'>+						   res_diag_size);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_storage = rcu_dereference(sk-&gt;sk_bpf_storage);</div><div class='add'>+	if (!sk_storage || hlist_empty(&amp;sk_storage-&gt;list)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_stgs = nla_nest_start(skb, stg_array_type);</div><div class='add'>+	if (!nla_stgs)</div><div class='add'>+		/* Continue to learn diag_size */</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	saved_len = skb-&gt;len;</div><div class='add'>+	for (i = 0; i &lt; diag-&gt;nr_maps; i++) {</div><div class='add'>+		sdata = bpf_local_storage_lookup(sk_storage,</div><div class='add'>+				(struct bpf_local_storage_map *)diag-&gt;maps[i],</div><div class='add'>+				false);</div><div class='add'>+</div><div class='add'>+		if (!sdata)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		diag_size += nla_value_size(diag-&gt;maps[i]-&gt;value_size);</div><div class='add'>+</div><div class='add'>+		if (nla_stgs &amp;&amp; diag_get(sdata, skb))</div><div class='add'>+			/* Continue to learn diag_size */</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (nla_stgs) {</div><div class='add'>+		if (saved_len == skb-&gt;len)</div><div class='add'>+			nla_nest_cancel(skb, nla_stgs);</div><div class='add'>+		else</div><div class='add'>+			nla_nest_end(skb, nla_stgs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (diag_size == nla_total_size(0)) {</div><div class='add'>+		*res_diag_size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*res_diag_size = diag_size;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bpf_sk_storage_diag_put);</div><div class='add'>+</div><div class='add'>+struct bpf_iter_seq_sk_storage_map_info {</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	unsigned int bucket_id;</div><div class='add'>+	unsigned skip_elems;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bpf_local_storage_elem *</div><div class='add'>+bpf_sk_storage_map_seq_find_next(struct bpf_iter_seq_sk_storage_map_info *info,</div><div class='add'>+				 struct bpf_local_storage_elem *prev_selem)</div><div class='add'>+	__acquires(RCU) __releases(RCU)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_local_storage_elem *selem;</div><div class='add'>+	u32 skip_elems = info-&gt;skip_elems;</div><div class='add'>+	struct bpf_local_storage_map *smap;</div><div class='add'>+	u32 bucket_id = info-&gt;bucket_id;</div><div class='add'>+	u32 i, count, n_buckets;</div><div class='add'>+	struct bpf_local_storage_map_bucket *b;</div><div class='add'>+</div><div class='add'>+	smap = (struct bpf_local_storage_map *)info-&gt;map;</div><div class='add'>+	n_buckets = 1U &lt;&lt; smap-&gt;bucket_log;</div><div class='add'>+	if (bucket_id &gt;= n_buckets)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* try to find next selem in the same bucket */</div><div class='add'>+	selem = prev_selem;</div><div class='add'>+	count = 0;</div><div class='add'>+	while (selem) {</div><div class='add'>+		selem = hlist_entry_safe(rcu_dereference(hlist_next_rcu(&amp;selem-&gt;map_node)),</div><div class='add'>+					 struct bpf_local_storage_elem, map_node);</div><div class='add'>+		if (!selem) {</div><div class='add'>+			/* not found, unlock and go to the next bucket */</div><div class='add'>+			b = &amp;smap-&gt;buckets[bucket_id++];</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			skip_elems = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		sk_storage = rcu_dereference(selem-&gt;local_storage);</div><div class='add'>+		if (sk_storage) {</div><div class='add'>+			info-&gt;skip_elems = skip_elems + count;</div><div class='add'>+			return selem;</div><div class='add'>+		}</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = bucket_id; i &lt; (1U &lt;&lt; smap-&gt;bucket_log); i++) {</div><div class='add'>+		b = &amp;smap-&gt;buckets[i];</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		count = 0;</div><div class='add'>+		hlist_for_each_entry_rcu(selem, &amp;b-&gt;list, map_node) {</div><div class='add'>+			sk_storage = rcu_dereference(selem-&gt;local_storage);</div><div class='add'>+			if (sk_storage &amp;&amp; count &gt;= skip_elems) {</div><div class='add'>+				info-&gt;bucket_id = i;</div><div class='add'>+				info-&gt;skip_elems = count;</div><div class='add'>+				return selem;</div><div class='add'>+			}</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		skip_elems = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;bucket_id = i;</div><div class='add'>+	info-&gt;skip_elems = 0;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_sk_storage_map_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bpf_local_storage_elem *selem;</div><div class='add'>+</div><div class='add'>+	selem = bpf_sk_storage_map_seq_find_next(seq-&gt;private, NULL);</div><div class='add'>+	if (!selem)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (*pos == 0)</div><div class='add'>+		++*pos;</div><div class='add'>+	return selem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_sk_storage_map_seq_next(struct seq_file *seq, void *v,</div><div class='add'>+					 loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_seq_sk_storage_map_info *info = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	++*pos;</div><div class='add'>+	++info-&gt;skip_elems;</div><div class='add'>+	return bpf_sk_storage_map_seq_find_next(seq-&gt;private, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_iter__bpf_sk_storage_map {</div><div class='add'>+	__bpf_md_ptr(struct bpf_iter_meta *, meta);</div><div class='add'>+	__bpf_md_ptr(struct bpf_map *, map);</div><div class='add'>+	__bpf_md_ptr(struct sock *, sk);</div><div class='add'>+	__bpf_md_ptr(void *, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DEFINE_BPF_ITER_FUNC(bpf_sk_storage_map, struct bpf_iter_meta *meta,</div><div class='add'>+		     struct bpf_map *map, struct sock *sk,</div><div class='add'>+		     void *value)</div><div class='add'>+</div><div class='add'>+static int __bpf_sk_storage_map_seq_show(struct seq_file *seq,</div><div class='add'>+					 struct bpf_local_storage_elem *selem)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_seq_sk_storage_map_info *info = seq-&gt;private;</div><div class='add'>+	struct bpf_iter__bpf_sk_storage_map ctx = {};</div><div class='add'>+	struct bpf_local_storage *sk_storage;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, selem == NULL);</div><div class='add'>+	if (prog) {</div><div class='add'>+		ctx.meta = &amp;meta;</div><div class='add'>+		ctx.map = info-&gt;map;</div><div class='add'>+		if (selem) {</div><div class='add'>+			sk_storage = rcu_dereference(selem-&gt;local_storage);</div><div class='add'>+			ctx.sk = sk_storage-&gt;owner;</div><div class='add'>+			ctx.value = SDATA(selem)-&gt;data;</div><div class='add'>+		}</div><div class='add'>+		ret = bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_sk_storage_map_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	return __bpf_sk_storage_map_seq_show(seq, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_sk_storage_map_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+	__releases(RCU)</div><div class='add'>+{</div><div class='add'>+	if (!v)</div><div class='add'>+		(void)__bpf_sk_storage_map_seq_show(seq, v);</div><div class='add'>+	else</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_iter_init_sk_storage_map(void *priv_data,</div><div class='add'>+					struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_seq_sk_storage_map_info *seq_info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_inc_with_uref(aux-&gt;map);</div><div class='add'>+	seq_info-&gt;map = aux-&gt;map;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_fini_sk_storage_map(void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_seq_sk_storage_map_info *seq_info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_put_with_uref(seq_info-&gt;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_iter_attach_map(struct bpf_prog *prog,</div><div class='add'>+			       union bpf_iter_link_info *linfo,</div><div class='add'>+			       struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!linfo-&gt;map.map_fd)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	map = bpf_map_get_with_uref(linfo-&gt;map.map_fd);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+	if (map-&gt;map_type != BPF_MAP_TYPE_SK_STORAGE)</div><div class='add'>+		goto put_map;</div><div class='add'>+</div><div class='add'>+	if (prog-&gt;aux-&gt;max_rdwr_access &gt; map-&gt;value_size) {</div><div class='add'>+		err = -EACCES;</div><div class='add'>+		goto put_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aux-&gt;map = map;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+put_map:</div><div class='add'>+	bpf_map_put_with_uref(map);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_detach_map(struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	bpf_map_put_with_uref(aux-&gt;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations bpf_sk_storage_map_seq_ops = {</div><div class='add'>+	.start  = bpf_sk_storage_map_seq_start,</div><div class='add'>+	.next   = bpf_sk_storage_map_seq_next,</div><div class='add'>+	.stop   = bpf_sk_storage_map_seq_stop,</div><div class='add'>+	.show   = bpf_sk_storage_map_seq_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info iter_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;bpf_sk_storage_map_seq_ops,</div><div class='add'>+	.init_seq_private	= bpf_iter_init_sk_storage_map,</div><div class='add'>+	.fini_seq_private	= bpf_iter_fini_sk_storage_map,</div><div class='add'>+	.seq_priv_size		= sizeof(struct bpf_iter_seq_sk_storage_map_info),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bpf_iter_reg bpf_sk_storage_map_reg_info = {</div><div class='add'>+	.target			= "bpf_sk_storage_map",</div><div class='add'>+	.attach_target		= bpf_iter_attach_map,</div><div class='add'>+	.detach_target		= bpf_iter_detach_map,</div><div class='add'>+	.show_fdinfo		= bpf_iter_map_show_fdinfo,</div><div class='add'>+	.fill_link_info		= bpf_iter_map_fill_link_info,</div><div class='add'>+	.ctx_arg_info_size	= 2,</div><div class='add'>+	.ctx_arg_info		= {</div><div class='add'>+		{ offsetof(struct bpf_iter__bpf_sk_storage_map, sk),</div><div class='add'>+		  PTR_TO_BTF_ID_OR_NULL },</div><div class='add'>+		{ offsetof(struct bpf_iter__bpf_sk_storage_map, value),</div><div class='add'>+		  PTR_TO_BUF | PTR_MAYBE_NULL },</div><div class='add'>+	},</div><div class='add'>+	.seq_info		= &amp;iter_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_sk_storage_map_iter_init(void)</div><div class='add'>+{</div><div class='add'>+	bpf_sk_storage_map_reg_info.ctx_arg_info[0].btf_id =</div><div class='add'>+		btf_sock_ids[BTF_SOCK_TYPE_SOCK];</div><div class='add'>+	return bpf_iter_reg_target(&amp;bpf_sk_storage_map_reg_info);</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_sk_storage_map_iter_init);</div><div class='head'>diff --git a/net/core/datagram.c b/net/core/datagram.c<br/>index 9aac0d63d53e..c285c6465923 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/datagram.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/datagram.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/datagram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/datagram.c</a></div><div class='hunk'>@@ -50,7 +50,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/iov_iter.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -61,6 +63,8 @@</div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "devmem.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Is a socket 'connection oriented' ?</div><div class='ctx'>  */</div><div class='hunk'>@@ -82,7 +86,8 @@ static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, i</div><div class='ctx'> /*</div><div class='ctx'>  * Wait for the last received packet to be different from skb</div><div class='ctx'>  */</div><div class='del'>-int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,</div><div class='add'>+int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,</div><div class='add'>+				int *err, long *timeo_p,</div><div class='ctx'> 				const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -95,7 +100,7 @@ int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_receive_queue.prev != skb)</div><div class='add'>+	if (READ_ONCE(queue-&gt;prev) != skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Socket shut down? */</div><div class='hunk'>@@ -160,12 +165,9 @@ done:</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,</div><div class='del'>-					  struct sk_buff_head *queue,</div><div class='add'>+struct sk_buff *__skb_try_recv_from_queue(struct sk_buff_head *queue,</div><div class='ctx'> 					  unsigned int flags,</div><div class='del'>-					  void (*destructor)(struct sock *sk,</div><div class='del'>-							   struct sk_buff *skb),</div><div class='del'>-					  int *peeked, int *off, int *err,</div><div class='add'>+					  int *off, int *err,</div><div class='ctx'> 					  struct sk_buff **last)</div><div class='ctx'> {</div><div class='ctx'> 	bool peek_at_off = false;</div><div class='hunk'>@@ -192,12 +194,9 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,</div><div class='ctx'> 					return NULL;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			*peeked = 1;</div><div class='ctx'> 			refcount_inc(&amp;skb-&gt;users);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			__skb_unlink(skb, queue);</div><div class='del'>-			if (destructor)</div><div class='del'>-				destructor(sk, skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		*off = _off;</div><div class='ctx'> 		return skb;</div><div class='hunk'>@@ -208,9 +207,8 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,</div><div class='ctx'> /**</div><div class='ctx'>  *	__skb_try_recv_datagram - Receive a datagram skbuff</div><div class='ctx'>  *	@sk: socket</div><div class='add'>+ *	@queue: socket queue from which to receive</div><div class='ctx'>  *	@flags: MSG\_ flags</div><div class='del'>- *	@destructor: invoked under the receive lock on successful dequeue</div><div class='del'>- *	@peeked: returns non-zero if this packet has been seen before</div><div class='ctx'>  *	@off: an offset in bytes to peek skb from. Returns an offset</div><div class='ctx'>  *	      within an skb where data actually starts</div><div class='ctx'>  *	@err: error code returned</div><div class='hunk'>@@ -241,13 +239,11 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,</div><div class='ctx'>  *	quite explicitly by POSIX 1003.1g, don't change them without having</div><div class='ctx'>  *	the standard around please.</div><div class='ctx'>  */</div><div class='del'>-struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='del'>-					void (*destructor)(struct sock *sk,</div><div class='del'>-							   struct sk_buff *skb),</div><div class='del'>-					int *peeked, int *off, int *err,</div><div class='add'>+struct sk_buff *__skb_try_recv_datagram(struct sock *sk,</div><div class='add'>+					struct sk_buff_head *queue,</div><div class='add'>+					unsigned int flags, int *off, int *err,</div><div class='ctx'> 					struct sk_buff **last)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff_head *queue = &amp;sk-&gt;sk_receive_queue;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned long cpu_flags;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -258,7 +254,6 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto no_packet;</div><div class='ctx'> </div><div class='del'>-	*peeked = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Again only user level code calls this function, so nothing</div><div class='ctx'> 		 * interrupt level will suddenly eat the receive_queue.</div><div class='hunk'>@@ -267,8 +262,8 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='ctx'> 		 * However, this function was correct in any case. 8)</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock_irqsave(&amp;queue-&gt;lock, cpu_flags);</div><div class='del'>-		skb = __skb_try_recv_from_queue(sk, queue, flags, destructor,</div><div class='del'>-						peeked, off, &amp;error, last);</div><div class='add'>+		skb = __skb_try_recv_from_queue(queue, flags, off, &amp;error,</div><div class='add'>+						last);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;queue-&gt;lock, cpu_flags);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto no_packet;</div><div class='hunk'>@@ -279,7 +274,7 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		sk_busy_loop(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-	} while (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue));</div><div class='add'>+	} while (READ_ONCE(queue-&gt;prev) != *last);</div><div class='ctx'> </div><div class='ctx'> 	error = -EAGAIN;</div><div class='ctx'> </div><div class='hunk'>@@ -289,10 +284,9 @@ no_packet:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__skb_try_recv_datagram);</div><div class='ctx'> </div><div class='del'>-struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='del'>-				    void (*destructor)(struct sock *sk,</div><div class='del'>-						       struct sk_buff *skb),</div><div class='del'>-				    int *peeked, int *off, int *err)</div><div class='add'>+struct sk_buff *__skb_recv_datagram(struct sock *sk,</div><div class='add'>+				    struct sk_buff_head *sk_queue,</div><div class='add'>+				    unsigned int flags, int *off, int *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *last;</div><div class='ctx'> 	long timeo;</div><div class='hunk'>@@ -300,57 +294,37 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='ctx'> 	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		skb = __skb_try_recv_datagram(sk, flags, destructor, peeked,</div><div class='del'>-					      off, err, &amp;last);</div><div class='add'>+		skb = __skb_try_recv_datagram(sk, sk_queue, flags, off, err,</div><div class='add'>+					      &amp;last);</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			return skb;</div><div class='ctx'> </div><div class='ctx'> 		if (*err != -EAGAIN)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (timeo &amp;&amp;</div><div class='del'>-		!__skb_wait_for_more_packets(sk, err, &amp;timeo, last));</div><div class='add'>+		 !__skb_wait_for_more_packets(sk, sk_queue, err,</div><div class='add'>+					      &amp;timeo, last));</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__skb_recv_datagram);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags,</div><div class='del'>-				  int noblock, int *err)</div><div class='add'>+				  int *err)</div><div class='ctx'> {</div><div class='del'>-	int peeked, off = 0;</div><div class='add'>+	int off = 0;</div><div class='ctx'> </div><div class='del'>-	return __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),</div><div class='del'>-				   NULL, &amp;peeked, &amp;off, err);</div><div class='add'>+	return __skb_recv_datagram(sk, &amp;sk-&gt;sk_receive_queue, flags,</div><div class='add'>+				   &amp;off, err);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_recv_datagram);</div><div class='ctx'> </div><div class='ctx'> void skb_free_datagram(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	consume_skb(skb);</div><div class='del'>-	sk_mem_reclaim_partial(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_free_datagram);</div><div class='ctx'> </div><div class='del'>-void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len)</div><div class='del'>-{</div><div class='del'>-	bool slow;</div><div class='del'>-</div><div class='del'>-	if (!skb_unref(skb)) {</div><div class='del'>-		sk_peek_offset_bwd(sk, len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slow = lock_sock_fast(sk);</div><div class='del'>-	sk_peek_offset_bwd(sk, len);</div><div class='del'>-	skb_orphan(skb);</div><div class='del'>-	sk_mem_reclaim_partial(sk);</div><div class='del'>-	unlock_sock_fast(sk, slow);</div><div class='del'>-</div><div class='del'>-	/* skb is now orphaned, can be freed outside of locked section */</div><div class='del'>-	__kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__skb_free_datagram_locked);</div><div class='del'>-</div><div class='ctx'> int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue,</div><div class='ctx'> 			struct sk_buff *skb, unsigned int flags,</div><div class='ctx'> 			void (*destructor)(struct sock *sk,</div><div class='hunk'>@@ -371,7 +345,7 @@ int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue,</div><div class='ctx'> 		spin_unlock_bh(&amp;sk_queue-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+	sk_drops_inc(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sk_queue_drop_skb);</div><div class='hunk'>@@ -403,32 +377,30 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)</div><div class='ctx'> 				      NULL);</div><div class='ctx'> </div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	sk_mem_reclaim_partial(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_kill_datagram);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	skb_copy_datagram_iter - Copy a datagram to an iovec iterator.</div><div class='del'>- *	@skb: buffer to copy</div><div class='del'>- *	@offset: offset in the buffer to start copying from</div><div class='del'>- *	@to: iovec iterator to copy to</div><div class='del'>- *	@len: amount of data to copy from buffer to iovec</div><div class='del'>- */</div><div class='del'>-int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='del'>-			   struct iov_iter *to, int len)</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(static size_t simple_copy_to_iter(const void *addr,</div><div class='add'>+						size_t bytes,</div><div class='add'>+						void *data __always_unused,</div><div class='add'>+						struct iov_iter *i));</div><div class='add'>+</div><div class='add'>+static int __skb_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='add'>+			       struct iov_iter *to, int len, bool fault_short,</div><div class='add'>+			       size_t (*cb)(const void *, size_t, void *,</div><div class='add'>+					    struct iov_iter *), void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int start = skb_headlen(skb);</div><div class='ctx'> 	int i, copy = start - offset, start_off = offset, n;</div><div class='ctx'> 	struct sk_buff *frag_iter;</div><div class='ctx'> </div><div class='del'>-	trace_skb_copy_datagram_iovec(skb, len);</div><div class='del'>-</div><div class='ctx'> 	/* Copy header. */</div><div class='ctx'> 	if (copy &gt; 0) {</div><div class='ctx'> 		if (copy &gt; len)</div><div class='ctx'> 			copy = len;</div><div class='del'>-		n = copy_to_iter(skb-&gt;data + offset, copy, to);</div><div class='add'>+		n = INDIRECT_CALL_1(cb, simple_copy_to_iter,</div><div class='add'>+				    skb-&gt;data + offset, copy, data, to);</div><div class='ctx'> 		offset += n;</div><div class='ctx'> 		if (n != copy)</div><div class='ctx'> 			goto short_copy;</div><div class='hunk'>@@ -436,6 +408,9 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		goto short_copy;</div><div class='add'>+</div><div class='ctx'> 	/* Copy paged appendix. Hmm... why does this look so complicated? */</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		int end;</div><div class='hunk'>@@ -445,11 +420,23 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='ctx'> </div><div class='ctx'> 		end = start + skb_frag_size(frag);</div><div class='ctx'> 		if ((copy = end - offset) &gt; 0) {</div><div class='add'>+			u32 p_off, p_len, copied;</div><div class='add'>+			struct page *p;</div><div class='add'>+			u8 *vaddr;</div><div class='add'>+</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='del'>-			n = copy_page_to_iter(skb_frag_page(frag),</div><div class='del'>-					      frag-&gt;page_offset + offset -</div><div class='del'>-					      start, copy, to);</div><div class='add'>+</div><div class='add'>+			n = 0;</div><div class='add'>+			skb_frag_foreach_page(frag,</div><div class='add'>+					      skb_frag_off(frag) + offset - start,</div><div class='add'>+					      copy, p, p_off, p_len, copied) {</div><div class='add'>+				vaddr = kmap_local_page(p);</div><div class='add'>+				n += INDIRECT_CALL_1(cb, simple_copy_to_iter,</div><div class='add'>+					vaddr + p_off, p_len, data, to);</div><div class='add'>+				kunmap_local(vaddr);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			offset += n;</div><div class='ctx'> 			if (n != copy)</div><div class='ctx'> 				goto short_copy;</div><div class='hunk'>@@ -468,8 +455,8 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='ctx'> 		if ((copy = end - offset) &gt; 0) {</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='del'>-			if (skb_copy_datagram_iter(frag_iter, offset - start,</div><div class='del'>-						   to, copy))</div><div class='add'>+			if (__skb_datagram_iter(frag_iter, offset - start,</div><div class='add'>+						to, copy, fault_short, cb, data))</div><div class='ctx'> 				goto fault;</div><div class='ctx'> 			if ((len -= copy) == 0)</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -490,11 +477,64 @@ fault:</div><div class='ctx'> 	return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> short_copy:</div><div class='del'>-	if (iov_iter_count(to))</div><div class='add'>+	if (fault_short || iov_iter_count(to))</div><div class='ctx'> 		goto fault;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_CRC32C</div><div class='add'>+static size_t crc32c_and_copy_to_iter(const void *addr, size_t bytes,</div><div class='add'>+				      void *_crcp, struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	u32 *crcp = _crcp;</div><div class='add'>+	size_t copied;</div><div class='add'>+</div><div class='add'>+	copied = copy_to_iter(addr, bytes, i);</div><div class='add'>+	*crcp = crc32c(*crcp, addr, copied);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	skb_copy_and_crc32c_datagram_iter - Copy datagram to an iovec iterator</div><div class='add'>+ *		and update a CRC32C value.</div><div class='add'>+ *	@skb: buffer to copy</div><div class='add'>+ *	@offset: offset in the buffer to start copying from</div><div class='add'>+ *	@to: iovec iterator to copy to</div><div class='add'>+ *	@len: amount of data to copy from buffer to iovec</div><div class='add'>+ *	@crcp: pointer to CRC32C value to update</div><div class='add'>+ *</div><div class='add'>+ *	Return: 0 on success, -EFAULT if there was a fault during copy.</div><div class='add'>+ */</div><div class='add'>+int skb_copy_and_crc32c_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='add'>+				      struct iov_iter *to, int len, u32 *crcp)</div><div class='add'>+{</div><div class='add'>+	return __skb_datagram_iter(skb, offset, to, len, true,</div><div class='add'>+				   crc32c_and_copy_to_iter, crcp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_copy_and_crc32c_datagram_iter);</div><div class='add'>+#endif /* CONFIG_NET_CRC32C */</div><div class='add'>+</div><div class='add'>+static size_t simple_copy_to_iter(const void *addr, size_t bytes,</div><div class='add'>+		void *data __always_unused, struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	return copy_to_iter(addr, bytes, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	skb_copy_datagram_iter - Copy a datagram to an iovec iterator.</div><div class='add'>+ *	@skb: buffer to copy</div><div class='add'>+ *	@offset: offset in the buffer to start copying from</div><div class='add'>+ *	@to: iovec iterator to copy to</div><div class='add'>+ *	@len: amount of data to copy from buffer to iovec</div><div class='add'>+ */</div><div class='add'>+int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='add'>+			   struct iov_iter *to, int len)</div><div class='add'>+{</div><div class='add'>+	trace_skb_copy_datagram_iovec(skb, len);</div><div class='add'>+	return __skb_datagram_iter(skb, offset, to, len, false,</div><div class='add'>+			simple_copy_to_iter, NULL);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(skb_copy_datagram_iter);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -539,7 +579,7 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='ctx'> 			copied = copy_page_from_iter(skb_frag_page(frag),</div><div class='del'>-					  frag-&gt;page_offset + offset - start,</div><div class='add'>+					  skb_frag_off(frag) + offset - start,</div><div class='ctx'> 					  copy, from);</div><div class='ctx'> 			if (copied != copy)</div><div class='ctx'> 				goto fault;</div><div class='hunk'>@@ -578,49 +618,157 @@ fault:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_copy_datagram_from_iter);</div><div class='ctx'> </div><div class='del'>-int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			    struct iov_iter *from, size_t length)</div><div class='add'>+int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,</div><div class='add'>+				     struct iov_iter *from, int len)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter_state state;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iov_iter_save_state(from, &amp;state);</div><div class='add'>+	ret = skb_copy_datagram_from_iter(skb, offset, from, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		iov_iter_restore(from, &amp;state);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_copy_datagram_from_iter_full);</div><div class='add'>+</div><div class='add'>+int zerocopy_fill_skb_from_iter(struct sk_buff *skb,</div><div class='add'>+				struct iov_iter *from, size_t length)</div><div class='ctx'> {</div><div class='ctx'> 	int frag = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	while (length &amp;&amp; iov_iter_count(from)) {</div><div class='add'>+		struct page *head, *last_head = NULL;</div><div class='ctx'> 		struct page *pages[MAX_SKB_FRAGS];</div><div class='add'>+		int refs, order, n = 0;</div><div class='ctx'> 		size_t start;</div><div class='ctx'> 		ssize_t copied;</div><div class='del'>-		unsigned long truesize;</div><div class='del'>-		int n = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (frag == MAX_SKB_FRAGS)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-		copied = iov_iter_get_pages(from, pages, length,</div><div class='add'>+		copied = iov_iter_get_pages2(from, pages, length,</div><div class='ctx'> 					    MAX_SKB_FRAGS - frag, &amp;start);</div><div class='ctx'> 		if (copied &lt; 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		iov_iter_advance(from, copied);</div><div class='ctx'> 		length -= copied;</div><div class='ctx'> </div><div class='del'>-		truesize = PAGE_ALIGN(copied + start);</div><div class='ctx'> 		skb-&gt;data_len += copied;</div><div class='ctx'> 		skb-&gt;len += copied;</div><div class='del'>-		skb-&gt;truesize += truesize;</div><div class='del'>-		if (sk &amp;&amp; sk-&gt;sk_type == SOCK_STREAM) {</div><div class='del'>-			sk-&gt;sk_wmem_queued += truesize;</div><div class='del'>-			sk_mem_charge(sk, truesize);</div><div class='del'>-		} else {</div><div class='del'>-			refcount_add(truesize, &amp;skb-&gt;sk-&gt;sk_wmem_alloc);</div><div class='del'>-		}</div><div class='del'>-		while (copied) {</div><div class='add'>+		skb-&gt;truesize += PAGE_ALIGN(copied + start);</div><div class='add'>+</div><div class='add'>+		head = compound_head(pages[n]);</div><div class='add'>+		order = compound_order(head);</div><div class='add'>+</div><div class='add'>+		for (refs = 0; copied != 0; start = 0) {</div><div class='ctx'> 			int size = min_t(int, copied, PAGE_SIZE - start);</div><div class='del'>-			skb_fill_page_desc(skb, frag++, pages[n], start, size);</div><div class='del'>-			start = 0;</div><div class='add'>+</div><div class='add'>+			if (pages[n] - head &gt; (1UL &lt;&lt; order) - 1) {</div><div class='add'>+				head = compound_head(pages[n]);</div><div class='add'>+				order = compound_order(head);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			start += (pages[n] - head) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 			copied -= size;</div><div class='ctx'> 			n++;</div><div class='add'>+			if (frag) {</div><div class='add'>+				skb_frag_t *last = &amp;skb_shinfo(skb)-&gt;frags[frag - 1];</div><div class='add'>+</div><div class='add'>+				if (head == skb_frag_page(last) &amp;&amp;</div><div class='add'>+				    start == skb_frag_off(last) + skb_frag_size(last)) {</div><div class='add'>+					skb_frag_size_add(last, size);</div><div class='add'>+					/* We combined this page, we need to release</div><div class='add'>+					 * a reference. Since compound pages refcount</div><div class='add'>+					 * is shared among many pages, batch the refcount</div><div class='add'>+					 * adjustments to limit false sharing.</div><div class='add'>+					 */</div><div class='add'>+					last_head = head;</div><div class='add'>+					refs++;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (refs) {</div><div class='add'>+				page_ref_sub(last_head, refs);</div><div class='add'>+				refs = 0;</div><div class='add'>+			}</div><div class='add'>+			skb_fill_page_desc_noacc(skb, frag++, head, start, size);</div><div class='ctx'> 		}</div><div class='add'>+		if (refs)</div><div class='add'>+			page_ref_sub(last_head, refs);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+zerocopy_fill_skb_from_devmem(struct sk_buff *skb, struct iov_iter *from,</div><div class='add'>+			      int length,</div><div class='add'>+			      struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	size_t virt_addr, size, off;</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+</div><div class='add'>+	/* Devmem filling works by taking an IOVEC from the user where the</div><div class='add'>+	 * iov_addrs are interpreted as an offset in bytes into the dma-buf to</div><div class='add'>+	 * send from. We do not support other iter types.</div><div class='add'>+	 */</div><div class='add'>+	if (iov_iter_type(from) != ITER_IOVEC &amp;&amp;</div><div class='add'>+	    iov_iter_type(from) != ITER_UBUF)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	while (length &amp;&amp; iov_iter_count(from)) {</div><div class='add'>+		if (i == MAX_SKB_FRAGS)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		virt_addr = (size_t)iter_iov_addr(from);</div><div class='add'>+		niov = net_devmem_get_niov_at(binding, virt_addr, &amp;off, &amp;size);</div><div class='add'>+		if (!niov)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		size = min_t(size_t, size, length);</div><div class='add'>+		size = min_t(size_t, size, iter_iov_len(from));</div><div class='add'>+</div><div class='add'>+		get_netmem(net_iov_to_netmem(niov));</div><div class='add'>+		skb_add_rx_frag_netmem(skb, i, net_iov_to_netmem(niov), off,</div><div class='add'>+				       size, PAGE_SIZE);</div><div class='add'>+		iov_iter_advance(from, size);</div><div class='add'>+		length -= size;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk,</div><div class='add'>+			    struct sk_buff *skb, struct iov_iter *from,</div><div class='add'>+			    size_t length,</div><div class='add'>+			    struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	unsigned long orig_size = skb-&gt;truesize;</div><div class='add'>+	unsigned long truesize;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (msg &amp;&amp; msg-&gt;msg_ubuf &amp;&amp; msg-&gt;sg_from_iter)</div><div class='add'>+		ret = msg-&gt;sg_from_iter(skb, from, length);</div><div class='add'>+	else if (binding)</div><div class='add'>+		ret = zerocopy_fill_skb_from_devmem(skb, from, length, binding);</div><div class='add'>+	else</div><div class='add'>+		ret = zerocopy_fill_skb_from_iter(skb, from, length);</div><div class='add'>+</div><div class='add'>+	truesize = skb-&gt;truesize - orig_size;</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_type == SOCK_STREAM) {</div><div class='add'>+		sk_wmem_queued_add(sk, truesize);</div><div class='add'>+		if (!skb_zcopy_pure(skb))</div><div class='add'>+			sk_mem_charge(sk, truesize);</div><div class='add'>+	} else {</div><div class='add'>+		refcount_add(truesize, &amp;skb-&gt;sk-&gt;sk_wmem_alloc);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(__zerocopy_sg_from_iter);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -641,135 +789,88 @@ int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *from)</div><div class='ctx'> 	if (skb_copy_datagram_from_iter(skb, 0, from, copy))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return __zerocopy_sg_from_iter(NULL, skb, from, ~0U);</div><div class='add'>+	return __zerocopy_sg_from_iter(NULL, NULL, skb, from, ~0U, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(zerocopy_sg_from_iter);</div><div class='ctx'> </div><div class='del'>-static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,</div><div class='del'>-				      struct iov_iter *to, int len,</div><div class='del'>-				      __wsum *csump)</div><div class='add'>+static __always_inline</div><div class='add'>+size_t copy_to_user_iter_csum(void __user *iter_to, size_t progress,</div><div class='add'>+			      size_t len, void *from, void *priv2)</div><div class='ctx'> {</div><div class='del'>-	int start = skb_headlen(skb);</div><div class='del'>-	int i, copy = start - offset, start_off = offset;</div><div class='del'>-	struct sk_buff *frag_iter;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	/* Copy header. */</div><div class='del'>-	if (copy &gt; 0) {</div><div class='del'>-		if (copy &gt; len)</div><div class='del'>-			copy = len;</div><div class='del'>-		n = csum_and_copy_to_iter(skb-&gt;data + offset, copy, csump, to);</div><div class='del'>-		offset += n;</div><div class='del'>-		if (n != copy)</div><div class='del'>-			goto fault;</div><div class='del'>-		if ((len -= copy) == 0)</div><div class='del'>-			return 0;</div><div class='del'>-		pos = copy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-		int end;</div><div class='del'>-		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+	__wsum next, *csum = priv2;</div><div class='ctx'> </div><div class='del'>-		WARN_ON(start &gt; offset + len);</div><div class='add'>+	next = csum_and_copy_to_user(from + progress, iter_to, len);</div><div class='add'>+	*csum = csum_block_add(*csum, next, progress);</div><div class='add'>+	return next ? 0 : len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		end = start + skb_frag_size(frag);</div><div class='del'>-		if ((copy = end - offset) &gt; 0) {</div><div class='del'>-			__wsum csum2 = 0;</div><div class='del'>-			struct page *page = skb_frag_page(frag);</div><div class='del'>-			u8  *vaddr = kmap(page);</div><div class='add'>+static __always_inline</div><div class='add'>+size_t memcpy_to_iter_csum(void *iter_to, size_t progress,</div><div class='add'>+			   size_t len, void *from, void *priv2)</div><div class='add'>+{</div><div class='add'>+	__wsum *csum = priv2;</div><div class='add'>+	__wsum next = csum_partial_copy_nocheck(from + progress, iter_to, len);</div><div class='ctx'> </div><div class='del'>-			if (copy &gt; len)</div><div class='del'>-				copy = len;</div><div class='del'>-			n = csum_and_copy_to_iter(vaddr + frag-&gt;page_offset +</div><div class='del'>-						  offset - start, copy,</div><div class='del'>-						  &amp;csum2, to);</div><div class='del'>-			kunmap(page);</div><div class='del'>-			offset += n;</div><div class='del'>-			if (n != copy)</div><div class='del'>-				goto fault;</div><div class='del'>-			*csump = csum_block_add(*csump, csum2, pos);</div><div class='del'>-			if (!(len -= copy))</div><div class='del'>-				return 0;</div><div class='del'>-			pos += copy;</div><div class='del'>-		}</div><div class='del'>-		start = end;</div><div class='del'>-	}</div><div class='add'>+	*csum = csum_block_add(*csum, next, progress);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	skb_walk_frags(skb, frag_iter) {</div><div class='del'>-		int end;</div><div class='add'>+struct csum_state {</div><div class='add'>+	__wsum csum;</div><div class='add'>+	size_t off;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		WARN_ON(start &gt; offset + len);</div><div class='add'>+static size_t csum_and_copy_to_iter(const void *addr, size_t bytes, void *_csstate,</div><div class='add'>+				    struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	struct csum_state *csstate = _csstate;</div><div class='add'>+	__wsum sum;</div><div class='ctx'> </div><div class='del'>-		end = start + frag_iter-&gt;len;</div><div class='del'>-		if ((copy = end - offset) &gt; 0) {</div><div class='del'>-			__wsum csum2 = 0;</div><div class='del'>-			if (copy &gt; len)</div><div class='del'>-				copy = len;</div><div class='del'>-			if (skb_copy_and_csum_datagram(frag_iter,</div><div class='del'>-						       offset - start,</div><div class='del'>-						       to, copy,</div><div class='del'>-						       &amp;csum2))</div><div class='del'>-				goto fault;</div><div class='del'>-			*csump = csum_block_add(*csump, csum2, pos);</div><div class='del'>-			if ((len -= copy) == 0)</div><div class='del'>-				return 0;</div><div class='del'>-			offset += copy;</div><div class='del'>-			pos += copy;</div><div class='del'>-		}</div><div class='del'>-		start = end;</div><div class='del'>-	}</div><div class='del'>-	if (!len)</div><div class='add'>+	if (WARN_ON_ONCE(i-&gt;data_source))</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (unlikely(iov_iter_is_discard(i))) {</div><div class='add'>+		// can't use csum_memcpy() for that one - data is not copied</div><div class='add'>+		csstate-&gt;csum = csum_block_add(csstate-&gt;csum,</div><div class='add'>+					       csum_partial(addr, bytes, 0),</div><div class='add'>+					       csstate-&gt;off);</div><div class='add'>+		csstate-&gt;off += bytes;</div><div class='add'>+		return bytes;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-fault:</div><div class='del'>-	iov_iter_revert(to, offset - start_off);</div><div class='del'>-	return -EFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)</div><div class='del'>-{</div><div class='del'>-	__sum16 sum;</div><div class='add'>+	sum = csum_shift(csstate-&gt;csum, csstate-&gt;off);</div><div class='ctx'> </div><div class='del'>-	sum = csum_fold(skb_checksum(skb, 0, len, skb-&gt;csum));</div><div class='del'>-	if (likely(!sum)) {</div><div class='del'>-		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='del'>-		    !skb-&gt;csum_complete_sw)</div><div class='del'>-			netdev_rx_csum_fault(skb-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-	if (!skb_shared(skb))</div><div class='del'>-		skb-&gt;csum_valid = !sum;</div><div class='del'>-	return sum;</div><div class='add'>+	bytes = iterate_and_advance2(i, bytes, (void *)addr, &amp;sum,</div><div class='add'>+				     copy_to_user_iter_csum,</div><div class='add'>+				     memcpy_to_iter_csum);</div><div class='add'>+	csstate-&gt;csum = csum_shift(sum, csstate-&gt;off);</div><div class='add'>+	csstate-&gt;off += bytes;</div><div class='add'>+	return bytes;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_checksum_complete_head);</div><div class='ctx'> </div><div class='del'>-__sum16 __skb_checksum_complete(struct sk_buff *skb)</div><div class='add'>+/**</div><div class='add'>+ *	skb_copy_and_csum_datagram - Copy datagram to an iovec iterator</div><div class='add'>+ *          and update a checksum.</div><div class='add'>+ *	@skb: buffer to copy</div><div class='add'>+ *	@offset: offset in the buffer to start copying from</div><div class='add'>+ *	@to: iovec iterator to copy to</div><div class='add'>+ *	@len: amount of data to copy from buffer to iovec</div><div class='add'>+ *      @csump: checksum pointer</div><div class='add'>+ */</div><div class='add'>+static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,</div><div class='add'>+				      struct iov_iter *to, int len,</div><div class='add'>+				      __wsum *csump)</div><div class='ctx'> {</div><div class='del'>-	__wsum csum;</div><div class='del'>-	__sum16 sum;</div><div class='add'>+	struct csum_state csdata = { .csum = *csump };</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	csum = skb_checksum(skb, 0, skb-&gt;len, 0);</div><div class='add'>+	ret = __skb_datagram_iter(skb, offset, to, len, true,</div><div class='add'>+				  csum_and_copy_to_iter, &amp;csdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/* skb-&gt;csum holds pseudo checksum */</div><div class='del'>-	sum = csum_fold(csum_add(skb-&gt;csum, csum));</div><div class='del'>-	if (likely(!sum)) {</div><div class='del'>-		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='del'>-		    !skb-&gt;csum_complete_sw)</div><div class='del'>-			netdev_rx_csum_fault(skb-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!skb_shared(skb)) {</div><div class='del'>-		/* Save full packet checksum */</div><div class='del'>-		skb-&gt;csum = csum;</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='del'>-		skb-&gt;csum_complete_sw = 1;</div><div class='del'>-		skb-&gt;csum_valid = !sum;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sum;</div><div class='add'>+	*csump = csdata.csum;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_checksum_complete);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	skb_copy_and_csum_datagram_msg - Copy and checksum skb to user iovec.</div><div class='hunk'>@@ -808,8 +909,9 @@ int skb_copy_and_csum_datagram_msg(struct sk_buff *skb,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE))</div><div class='del'>-			netdev_rx_csum_fault(skb-&gt;dev);</div><div class='add'>+		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='add'>+		    !skb-&gt;csum_complete_sw)</div><div class='add'>+			netdev_rx_csum_fault(NULL, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> fault:</div><div class='hunk'>@@ -818,48 +920,54 @@ fault:</div><div class='ctx'> EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * 	datagram_poll - generic datagram poll</div><div class='add'>+ *	datagram_poll_queue - same as datagram_poll, but on a specific receive</div><div class='add'>+ *		queue</div><div class='ctx'>  *	@file: file struct</div><div class='ctx'>  *	@sock: socket</div><div class='ctx'>  *	@wait: poll table</div><div class='add'>+ *	@rcv_queue: receive queue to poll</div><div class='ctx'>  *</div><div class='del'>- *	Datagram poll: Again totally generic. This also handles</div><div class='del'>- *	sequenced packet sockets providing the socket receive queue</div><div class='del'>- *	is only ever holding data ready to receive.</div><div class='add'>+ *	Performs polling on the given receive queue, handling shutdown, error,</div><div class='add'>+ *	and connection state. This is useful for protocols that deliver</div><div class='add'>+ *	userspace-bound packets through a custom queue instead of</div><div class='add'>+ *	sk-&gt;sk_receive_queue.</div><div class='ctx'>  *</div><div class='del'>- *	Note: when you *don't* use this routine for this protocol,</div><div class='del'>- *	and you use a different write policy from sock_writeable()</div><div class='del'>- *	then please supply your own write_space callback.</div><div class='add'>+ *	Return: poll bitmask indicating the socket's current state</div><div class='ctx'>  */</div><div class='del'>-__poll_t datagram_poll(struct file *file, struct socket *sock,</div><div class='del'>-			   poll_table *wait)</div><div class='add'>+__poll_t datagram_poll_queue(struct file *file, struct socket *sock,</div><div class='add'>+			     poll_table *wait, struct sk_buff_head *rcv_queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	__poll_t mask;</div><div class='add'>+	u8 shutdown;</div><div class='ctx'> </div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='add'>+	sock_poll_wait(file, sock, wait);</div><div class='ctx'> 	mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* exceptional events? */</div><div class='del'>-	if (sk-&gt;sk_err || !skb_queue_empty(&amp;sk-&gt;sk_error_queue))</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_err) ||</div><div class='add'>+	    !skb_queue_empty_lockless(&amp;sk-&gt;sk_error_queue))</div><div class='ctx'> 		mask |= EPOLLERR |</div><div class='ctx'> 			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+	shutdown = READ_ONCE(sk-&gt;sk_shutdown);</div><div class='add'>+	if (shutdown &amp; RCV_SHUTDOWN)</div><div class='ctx'> 		mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;</div><div class='del'>-	if (sk-&gt;sk_shutdown == SHUTDOWN_MASK)</div><div class='add'>+	if (shutdown == SHUTDOWN_MASK)</div><div class='ctx'> 		mask |= EPOLLHUP;</div><div class='ctx'> </div><div class='ctx'> 	/* readable? */</div><div class='del'>-	if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+	if (!skb_queue_empty_lockless(rcv_queue))</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='ctx'> 	/* Connection-based need to check for termination and startup */</div><div class='ctx'> 	if (connection_based(sk)) {</div><div class='del'>-		if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+		int state = READ_ONCE(sk-&gt;sk_state);</div><div class='add'>+</div><div class='add'>+		if (state == TCP_CLOSE)</div><div class='ctx'> 			mask |= EPOLLHUP;</div><div class='ctx'> 		/* connection hasn't started yet? */</div><div class='del'>-		if (sk-&gt;sk_state == TCP_SYN_SENT)</div><div class='add'>+		if (state == TCP_SYN_SENT)</div><div class='ctx'> 			return mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -871,4 +979,27 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(datagram_poll_queue);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	datagram_poll - generic datagram poll</div><div class='add'>+ *	@file: file struct</div><div class='add'>+ *	@sock: socket</div><div class='add'>+ *	@wait: poll table</div><div class='add'>+ *</div><div class='add'>+ *	Datagram poll: Again totally generic. This also handles</div><div class='add'>+ *	sequenced packet sockets providing the socket receive queue</div><div class='add'>+ *	is only ever holding data ready to receive.</div><div class='add'>+ *</div><div class='add'>+ *	Note: when you *don't* use this routine for this protocol,</div><div class='add'>+ *	and you use a different write policy from sock_writeable()</div><div class='add'>+ *	then please supply your own write_space callback.</div><div class='add'>+ *</div><div class='add'>+ *	Return: poll bitmask indicating the socket's current state</div><div class='add'>+ */</div><div class='add'>+__poll_t datagram_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	return datagram_poll_queue(file, sock, wait,</div><div class='add'>+				   &amp;sock-&gt;sk-&gt;sk_receive_queue);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(datagram_poll);</div><div class='head'>diff --git a/net/core/dev.c b/net/core/dev.c<br/>index 82114e1111e6..9094c0fb8c68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *      NET3    Protocol independent device support routines.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Derived from the non IP parts of dev.c 1.0.19</div><div class='ctx'>  *              Authors:	Ross Biro</div><div class='ctx'>  *				Fred N. van Kempen, &lt;waltje@uWalt.NL.Mugnet.ORG&gt;</div><div class='hunk'>@@ -73,7 +69,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -81,8 +77,11 @@</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/isolation.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/smpboot.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -93,7 +92,9 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='hunk'>@@ -101,12 +102,16 @@</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> #include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/tcx.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -131,7 +136,8 @@</div><div class='ctx'> #include &lt;trace/events/napi.h&gt;</div><div class='ctx'> #include &lt;trace/events/net.h&gt;</div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;trace/events/qdisc.h&gt;</div><div class='add'>+#include &lt;trace/events/xdp.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/cpu_rmap.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='hunk'>@@ -140,51 +146,35 @@</div><div class='ctx'> #include &lt;linux/if_macvlan.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ingress.h&gt;</div><div class='add'>+#include &lt;linux/netfilter_netdev.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;linux/sctp.h&gt;</div><div class='ctx'> #include &lt;net/udp_tunnel.h&gt;</div><div class='ctx'> #include &lt;linux/net_namespace.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/prandom.h&gt;</div><div class='add'>+#include &lt;linux/once_lite.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/page_pool/types.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='add'>+#include &lt;linux/phy_link_topology.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+#include "devmem.h"</div><div class='ctx'> #include "net-sysfs.h"</div><div class='ctx'> </div><div class='del'>-#define MAX_GRO_SKBS 8</div><div class='del'>-</div><div class='del'>-/* This should be increased if a protocol with a bigger head is added. */</div><div class='del'>-#define GRO_MAX_HEAD (MAX_HEADER + 128)</div><div class='del'>-</div><div class='ctx'> static DEFINE_SPINLOCK(ptype_lock);</div><div class='del'>-static DEFINE_SPINLOCK(offload_lock);</div><div class='ctx'> struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly;</div><div class='del'>-struct list_head ptype_all __read_mostly;	/* Taps */</div><div class='del'>-static struct list_head offload_base __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static int netif_rx_internal(struct sk_buff *skb);</div><div class='del'>-static int call_netdevice_notifiers_info(unsigned long val,</div><div class='del'>-					 struct netdev_notifier_info *info);</div><div class='del'>-static struct napi_struct *napi_by_id(unsigned int napi_id);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The @dev_base_head list is protected by @dev_base_lock and the rtnl</div><div class='del'>- * semaphore.</div><div class='del'>- *</div><div class='del'>- * Pure readers hold dev_base_lock for reading, or rcu_read_lock()</div><div class='del'>- *</div><div class='del'>- * Writers must hold the rtnl semaphore while they loop through the</div><div class='del'>- * dev_base_head list, and hold dev_base_lock for writing when they do the</div><div class='del'>- * actual updates.  This allows pure readers to access the list even</div><div class='del'>- * while a writer is preparing to update it.</div><div class='del'>- *</div><div class='del'>- * To put it another way, dev_base_lock is held for writing only to</div><div class='del'>- * protect against pure readers; the rtnl semaphore provides the</div><div class='del'>- * protection against other writers.</div><div class='del'>- *</div><div class='del'>- * See, for example usages, register_netdevice() and</div><div class='del'>- * unregister_netdevice(), which must be called with the rtnl</div><div class='del'>- * semaphore held.</div><div class='del'>- */</div><div class='del'>-DEFINE_RWLOCK(dev_base_lock);</div><div class='del'>-EXPORT_SYMBOL(dev_base_lock);</div><div class='add'>+static int call_netdevice_notifiers_extack(unsigned long val,</div><div class='add'>+					   struct net_device *dev,</div><div class='add'>+					   struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(ifalias_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -194,12 +184,11 @@ static DEFINE_SPINLOCK(napi_hash_lock);</div><div class='ctx'> static unsigned int napi_gen_id = NR_CPUS;</div><div class='ctx'> static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);</div><div class='ctx'> </div><div class='del'>-static seqcount_t devnet_rename_seq;</div><div class='del'>-</div><div class='ctx'> static inline void dev_base_seq_inc(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	while (++net-&gt;dev_base_seq == 0)</div><div class='del'>-		;</div><div class='add'>+	unsigned int val = net-&gt;dev_base_seq + 1;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(net-&gt;dev_base_seq, val ?: 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct hlist_head *dev_name_hash(struct net *net, const char *name)</div><div class='hunk'>@@ -214,33 +203,218 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)</div><div class='ctx'> 	return &amp;net-&gt;dev_index_head[ifindex &amp; (NETDEV_HASHENTRIES - 1)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void rps_lock(struct softnet_data *sd)</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='add'>+</div><div class='add'>+static DEFINE_STATIC_KEY_FALSE(use_backlog_threads_key);</div><div class='add'>+</div><div class='add'>+static int __init setup_backlog_napi_threads(char *arg)</div><div class='add'>+{</div><div class='add'>+	static_branch_enable(&amp;use_backlog_threads_key);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("thread_backlog_napi", setup_backlog_napi_threads);</div><div class='add'>+</div><div class='add'>+static bool use_backlog_threads(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RPS</div><div class='del'>-	spin_lock(&amp;sd-&gt;input_pkt_queue.lock);</div><div class='del'>-#endif</div><div class='add'>+	return static_branch_unlikely(&amp;use_backlog_threads_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void rps_unlock(struct softnet_data *sd)</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static bool use_backlog_threads(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RPS</div><div class='del'>-	spin_unlock(&amp;sd-&gt;input_pkt_queue.lock);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static inline void backlog_lock_irq_save(struct softnet_data *sd,</div><div class='add'>+					 unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())</div><div class='add'>+		spin_lock_irqsave(&amp;sd-&gt;input_pkt_queue.lock, *flags);</div><div class='add'>+	else</div><div class='add'>+		local_irq_save(*flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void backlog_lock_irq_disable(struct softnet_data *sd)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())</div><div class='add'>+		spin_lock_irq(&amp;sd-&gt;input_pkt_queue.lock);</div><div class='add'>+	else</div><div class='add'>+		local_irq_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void backlog_unlock_irq_restore(struct softnet_data *sd,</div><div class='add'>+					      unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())</div><div class='add'>+		spin_unlock_irqrestore(&amp;sd-&gt;input_pkt_queue.lock, *flags);</div><div class='add'>+	else</div><div class='add'>+		local_irq_restore(*flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void backlog_unlock_irq_enable(struct softnet_data *sd)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())</div><div class='add'>+		spin_unlock_irq(&amp;sd-&gt;input_pkt_queue.lock);</div><div class='add'>+	else</div><div class='add'>+		local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_name_node *netdev_name_node_alloc(struct net_device *dev,</div><div class='add'>+						       const char *name)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+</div><div class='add'>+	name_node = kmalloc(sizeof(*name_node), GFP_KERNEL);</div><div class='add'>+	if (!name_node)</div><div class='add'>+		return NULL;</div><div class='add'>+	INIT_HLIST_NODE(&amp;name_node-&gt;hlist);</div><div class='add'>+	name_node-&gt;dev = dev;</div><div class='add'>+	name_node-&gt;name = name;</div><div class='add'>+	return name_node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_name_node *</div><div class='add'>+netdev_name_node_head_alloc(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+</div><div class='add'>+	name_node = netdev_name_node_alloc(dev, dev-&gt;name);</div><div class='add'>+	if (!name_node)</div><div class='add'>+		return NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;name_node-&gt;list);</div><div class='add'>+	return name_node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_name_node_free(struct netdev_name_node *name_node)</div><div class='add'>+{</div><div class='add'>+	kfree(name_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_name_node_add(struct net *net,</div><div class='add'>+				 struct netdev_name_node *name_node)</div><div class='add'>+{</div><div class='add'>+	hlist_add_head_rcu(&amp;name_node-&gt;hlist,</div><div class='add'>+			   dev_name_hash(net, name_node-&gt;name));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_name_node_del(struct netdev_name_node *name_node)</div><div class='add'>+{</div><div class='add'>+	hlist_del_rcu(&amp;name_node-&gt;hlist);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_name_node *netdev_name_node_lookup(struct net *net,</div><div class='add'>+							const char *name)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = dev_name_hash(net, name);</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(name_node, head, hlist)</div><div class='add'>+		if (!strcmp(name_node-&gt;name, name))</div><div class='add'>+			return name_node;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_name_node *netdev_name_node_lookup_rcu(struct net *net,</div><div class='add'>+							    const char *name)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = dev_name_hash(net, name);</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(name_node, head, hlist)</div><div class='add'>+		if (!strcmp(name_node-&gt;name, name))</div><div class='add'>+			return name_node;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool netdev_name_in_use(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	return netdev_name_node_lookup(net, name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_name_in_use);</div><div class='add'>+</div><div class='add'>+int netdev_name_node_alt_create(struct net_device *dev, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	name_node = netdev_name_node_lookup(net, name);</div><div class='add'>+	if (name_node)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	name_node = netdev_name_node_alloc(dev, name);</div><div class='add'>+	if (!name_node)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	netdev_name_node_add(net, name_node);</div><div class='add'>+	/* The node that holds dev-&gt;name acts as a head of per-device list. */</div><div class='add'>+	list_add_tail_rcu(&amp;name_node-&gt;list, &amp;dev-&gt;name_node-&gt;list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_name_node_alt_free(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node =</div><div class='add'>+		container_of(head, struct netdev_name_node, rcu);</div><div class='add'>+</div><div class='add'>+	kfree(name_node-&gt;name);</div><div class='add'>+	netdev_name_node_free(name_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __netdev_name_node_alt_destroy(struct netdev_name_node *name_node)</div><div class='add'>+{</div><div class='add'>+	netdev_name_node_del(name_node);</div><div class='add'>+	list_del(&amp;name_node-&gt;list);</div><div class='add'>+	call_rcu(&amp;name_node-&gt;rcu, netdev_name_node_alt_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_name_node_alt_destroy(struct net_device *dev, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	name_node = netdev_name_node_lookup(net, name);</div><div class='add'>+	if (!name_node)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	/* lookup might have found our primary name or a name belonging</div><div class='add'>+	 * to another device.</div><div class='add'>+	 */</div><div class='add'>+	if (name_node == dev-&gt;name_node || name_node-&gt;dev != dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	__netdev_name_node_alt_destroy(name_node);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_name_node_alt_flush(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(name_node, tmp, &amp;dev-&gt;name_node-&gt;list, list) {</div><div class='add'>+		list_del(&amp;name_node-&gt;list);</div><div class='add'>+		netdev_name_node_alt_free(&amp;name_node-&gt;rcu);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Device list insertion */</div><div class='ctx'> static void list_netdevice(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='ctx'> 	list_add_tail_rcu(&amp;dev-&gt;dev_list, &amp;net-&gt;dev_base_head);</div><div class='del'>-	hlist_add_head_rcu(&amp;dev-&gt;name_hlist, dev_name_hash(net, dev-&gt;name));</div><div class='add'>+	netdev_name_node_add(net, dev-&gt;name_node);</div><div class='ctx'> 	hlist_add_head_rcu(&amp;dev-&gt;index_hlist,</div><div class='ctx'> 			   dev_index_hash(net, dev-&gt;ifindex));</div><div class='del'>-	write_unlock_bh(&amp;dev_base_lock);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_altname(dev, name_node)</div><div class='add'>+		netdev_name_node_add(net, name_node);</div><div class='add'>+</div><div class='add'>+	/* We reserved the ifindex, this can't fail */</div><div class='add'>+	WARN_ON(xa_store(&amp;net-&gt;dev_by_index, dev-&gt;ifindex, dev, GFP_KERNEL));</div><div class='ctx'> </div><div class='ctx'> 	dev_base_seq_inc(net);</div><div class='ctx'> }</div><div class='hunk'>@@ -250,14 +424,20 @@ static void list_netdevice(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static void unlist_netdevice(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='add'>+	xa_erase(&amp;net-&gt;dev_by_index, dev-&gt;ifindex);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_altname(dev, name_node)</div><div class='add'>+		netdev_name_node_del(name_node);</div><div class='add'>+</div><div class='ctx'> 	/* Unlink dev from the device chain */</div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='ctx'> 	list_del_rcu(&amp;dev-&gt;dev_list);</div><div class='del'>-	hlist_del_rcu(&amp;dev-&gt;name_hlist);</div><div class='add'>+	netdev_name_node_del(dev-&gt;name_node);</div><div class='ctx'> 	hlist_del_rcu(&amp;dev-&gt;index_hlist);</div><div class='del'>-	write_unlock_bh(&amp;dev_base_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev_base_seq_inc(dev_net(dev));</div><div class='ctx'> }</div><div class='hunk'>@@ -273,9 +453,19 @@ static RAW_NOTIFIER_HEAD(netdev_chain);</div><div class='ctx'>  *	queue in the local softnet handler.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);</div><div class='add'>+DEFINE_PER_CPU_ALIGNED(struct softnet_data, softnet_data) = {</div><div class='add'>+	.process_queue_bh_lock = INIT_LOCAL_LOCK(process_queue_bh_lock),</div><div class='add'>+};</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(softnet_data);</div><div class='ctx'> </div><div class='add'>+/* Page_pool has a lockless array/stack to alloc/recycle pages.</div><div class='add'>+ * PP consumers must pay attention to run APIs in the appropriate context</div><div class='add'>+ * (e.g. NAPI context).</div><div class='add'>+ */</div><div class='add'>+DEFINE_PER_CPU(struct page_pool_bh, system_page_pool) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='ctx'> /*</div><div class='ctx'>  * register_netdevice() inits txq-&gt;_xmit_lock and sets lockdep class</div><div class='hunk'>@@ -353,6 +543,7 @@ static inline void netdev_set_xmit_lockdep_class(spinlock_t *lock,</div><div class='ctx'> 						 unsigned short dev_type)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static inline void netdev_set_addr_lockdep_class(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -383,10 +574,18 @@ static inline void netdev_set_addr_lockdep_class(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static inline struct list_head *ptype_head(const struct packet_type *pt)</div><div class='ctx'> {</div><div class='del'>-	if (pt-&gt;type == htons(ETH_P_ALL))</div><div class='del'>-		return pt-&gt;dev ? &amp;pt-&gt;dev-&gt;ptype_all : &amp;ptype_all;</div><div class='del'>-	else</div><div class='del'>-		return pt-&gt;dev ? &amp;pt-&gt;dev-&gt;ptype_specific :</div><div class='add'>+	if (pt-&gt;type == htons(ETH_P_ALL)) {</div><div class='add'>+		if (!pt-&gt;af_packet_net &amp;&amp; !pt-&gt;dev)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		return pt-&gt;dev ? &amp;pt-&gt;dev-&gt;ptype_all :</div><div class='add'>+				 &amp;pt-&gt;af_packet_net-&gt;ptype_all;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pt-&gt;dev)</div><div class='add'>+		return &amp;pt-&gt;dev-&gt;ptype_specific;</div><div class='add'>+</div><div class='add'>+	return pt-&gt;af_packet_net ? &amp;pt-&gt;af_packet_net-&gt;ptype_specific :</div><div class='ctx'> 				 &amp;ptype_base[ntohs(pt-&gt;type) &amp; PTYPE_HASH_MASK];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -407,6 +606,9 @@ void dev_add_pack(struct packet_type *pt)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *head = ptype_head(pt);</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!head))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;ptype_lock);</div><div class='ctx'> 	list_add_rcu(&amp;pt-&gt;list, head);</div><div class='ctx'> 	spin_unlock(&amp;ptype_lock);</div><div class='hunk'>@@ -431,6 +633,9 @@ void __dev_remove_pack(struct packet_type *pt)</div><div class='ctx'> 	struct list_head *head = ptype_head(pt);</div><div class='ctx'> 	struct packet_type *pt1;</div><div class='ctx'> </div><div class='add'>+	if (!head)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;ptype_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(pt1, head, list) {</div><div class='hunk'>@@ -467,280 +672,197 @@ void dev_remove_pack(struct packet_type *pt)</div><div class='ctx'> EXPORT_SYMBOL(dev_remove_pack);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_add_offload - register offload handlers</div><div class='del'>- *	@po: protocol offload declaration</div><div class='add'>+/*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- *	Add protocol offload handlers to the networking stack. The passed</div><div class='del'>- *	&amp;proto_offload is linked into kernel lists and may not be freed until</div><div class='del'>- *	it has been removed from the kernel lists.</div><div class='add'>+ *			    Device Interface Subroutines</div><div class='ctx'>  *</div><div class='del'>- *	This call does not sleep therefore it can not</div><div class='del'>- *	guarantee all CPU's that are in middle of receiving packets</div><div class='del'>- *	will see the new offload handlers (until the next received packet).</div><div class='del'>- */</div><div class='del'>-void dev_add_offload(struct packet_offload *po)</div><div class='del'>-{</div><div class='del'>-	struct packet_offload *elem;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;offload_lock);</div><div class='del'>-	list_for_each_entry(elem, &amp;offload_base, list) {</div><div class='del'>-		if (po-&gt;priority &lt; elem-&gt;priority)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	list_add_rcu(&amp;po-&gt;list, elem-&gt;list.prev);</div><div class='del'>-	spin_unlock(&amp;offload_lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_add_offload);</div><div class='add'>+ *******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__dev_remove_offload	 - remove offload handler</div><div class='del'>- *	@po: packet offload declaration</div><div class='del'>- *</div><div class='del'>- *	Remove a protocol offload handler that was previously added to the</div><div class='del'>- *	kernel offload handlers by dev_add_offload(). The passed &amp;offload_type</div><div class='del'>- *	is removed from the kernel lists and can be freed or reused once this</div><div class='del'>- *	function returns.</div><div class='add'>+ *	dev_get_iflink	- get 'iflink' value of a interface</div><div class='add'>+ *	@dev: targeted interface</div><div class='ctx'>  *</div><div class='del'>- *      The packet type might still be in use by receivers</div><div class='del'>- *	and must not be freed until after all the CPU's have gone</div><div class='del'>- *	through a quiescent state.</div><div class='add'>+ *	Indicates the ifindex the interface is linked to.</div><div class='add'>+ *	Physical interfaces have the same 'ifindex' and 'iflink' values.</div><div class='ctx'>  */</div><div class='del'>-static void __dev_remove_offload(struct packet_offload *po)</div><div class='del'>-{</div><div class='del'>-	struct list_head *head = &amp;offload_base;</div><div class='del'>-	struct packet_offload *po1;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;offload_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(po1, head, list) {</div><div class='del'>-		if (po == po1) {</div><div class='del'>-			list_del_rcu(&amp;po-&gt;list);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+int dev_get_iflink(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;netdev_ops &amp;&amp; dev-&gt;netdev_ops-&gt;ndo_get_iflink)</div><div class='add'>+		return dev-&gt;netdev_ops-&gt;ndo_get_iflink(dev);</div><div class='ctx'> </div><div class='del'>-	pr_warn("dev_remove_offload: %p not found\n", po);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;offload_lock);</div><div class='add'>+	return READ_ONCE(dev-&gt;ifindex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dev_get_iflink);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_remove_offload	 - remove packet offload handler</div><div class='del'>- *	@po: packet offload declaration</div><div class='del'>- *</div><div class='del'>- *	Remove a packet offload handler that was previously added to the kernel</div><div class='del'>- *	offload handlers by dev_add_offload(). The passed &amp;offload_type is</div><div class='del'>- *	removed from the kernel lists and can be freed or reused once this</div><div class='del'>- *	function returns.</div><div class='add'>+ *	dev_fill_metadata_dst - Retrieve tunnel egress information.</div><div class='add'>+ *	@dev: targeted interface</div><div class='add'>+ *	@skb: The packet.</div><div class='ctx'>  *</div><div class='del'>- *	This call sleeps to guarantee that no CPU is looking at the packet</div><div class='del'>- *	type after return.</div><div class='add'>+ *	For better visibility of tunnel traffic OVS needs to retrieve</div><div class='add'>+ *	egress tunnel information for a packet. Following API allows</div><div class='add'>+ *	user to get this info.</div><div class='ctx'>  */</div><div class='del'>-void dev_remove_offload(struct packet_offload *po)</div><div class='add'>+int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__dev_remove_offload(po);</div><div class='add'>+	struct ip_tunnel_info *info;</div><div class='ctx'> </div><div class='del'>-	synchronize_net();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_remove_offload);</div><div class='add'>+	if (!dev-&gt;netdev_ops  || !dev-&gt;netdev_ops-&gt;ndo_fill_metadata_dst)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- *		      Device Boot-time Settings Routines</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='add'>+	info = skb_tunnel_info_unclone(skb);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (unlikely(!(info-&gt;mode &amp; IP_TUNNEL_INFO_TX)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-/* Boot time configuration table */</div><div class='del'>-static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX];</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_fill_metadata_dst(dev, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_fill_metadata_dst);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	netdev_boot_setup_add	- add new setup entry</div><div class='del'>- *	@name: name of the device</div><div class='del'>- *	@map: configured settings for the device</div><div class='del'>- *</div><div class='del'>- *	Adds new setup entry to the dev_boot_setup list.  The function</div><div class='del'>- *	returns 0 on error and 1 on success.  This is a generic routine to</div><div class='del'>- *	all netdevices.</div><div class='del'>- */</div><div class='del'>-static int netdev_boot_setup_add(char *name, struct ifmap *map)</div><div class='add'>+static struct net_device_path *dev_fwd_path(struct net_device_path_stack *stack)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_boot_setup *s;</div><div class='del'>-	int i;</div><div class='add'>+	int k = stack-&gt;num_paths++;</div><div class='ctx'> </div><div class='del'>-	s = dev_boot_setup;</div><div class='del'>-	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++) {</div><div class='del'>-		if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {</div><div class='del'>-			memset(s[i].name, 0, sizeof(s[i].name));</div><div class='del'>-			strlcpy(s[i].name, name, IFNAMSIZ);</div><div class='del'>-			memcpy(&amp;s[i].map, map, sizeof(s[i].map));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON_ONCE(k &gt;= NET_DEVICE_PATH_STACK_MAX))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return i &gt;= NETDEV_BOOT_SETUP_MAX ? 0 : 1;</div><div class='add'>+	return &amp;stack-&gt;path[k];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * netdev_boot_setup_check	- check boot time settings</div><div class='del'>- * @dev: the netdevice</div><div class='del'>- *</div><div class='del'>- * Check boot time settings for the device.</div><div class='del'>- * The found settings are set for the device to be used</div><div class='del'>- * later in the device probing.</div><div class='del'>- * Returns 0 if no settings found, 1 if they are.</div><div class='del'>- */</div><div class='del'>-int netdev_boot_setup_check(struct net_device *dev)</div><div class='add'>+int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,</div><div class='add'>+			  struct net_device_path_stack *stack)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_boot_setup *s = dev_boot_setup;</div><div class='del'>-	int i;</div><div class='add'>+	const struct net_device *last_dev;</div><div class='add'>+	struct net_device_path_ctx ctx = {</div><div class='add'>+		.dev	= dev,</div><div class='add'>+	};</div><div class='add'>+	struct net_device_path *path;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++) {</div><div class='del'>-		if (s[i].name[0] != '\0' &amp;&amp; s[i].name[0] != ' ' &amp;&amp;</div><div class='del'>-		    !strcmp(dev-&gt;name, s[i].name)) {</div><div class='del'>-			dev-&gt;irq = s[i].map.irq;</div><div class='del'>-			dev-&gt;base_addr = s[i].map.base_addr;</div><div class='del'>-			dev-&gt;mem_start = s[i].map.mem_start;</div><div class='del'>-			dev-&gt;mem_end = s[i].map.mem_end;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netdev_boot_setup_check);</div><div class='add'>+	memcpy(ctx.daddr, daddr, sizeof(ctx.daddr));</div><div class='add'>+	stack-&gt;num_paths = 0;</div><div class='add'>+	while (ctx.dev &amp;&amp; ctx.dev-&gt;netdev_ops-&gt;ndo_fill_forward_path) {</div><div class='add'>+		last_dev = ctx.dev;</div><div class='add'>+		path = dev_fwd_path(stack);</div><div class='add'>+		if (!path)</div><div class='add'>+			return -1;</div><div class='ctx'> </div><div class='add'>+		memset(path, 0, sizeof(struct net_device_path));</div><div class='add'>+		ret = ctx.dev-&gt;netdev_ops-&gt;ndo_fill_forward_path(&amp;ctx, path);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return -1;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * netdev_boot_base	- get address from boot time settings</div><div class='del'>- * @prefix: prefix for network device</div><div class='del'>- * @unit: id for network device</div><div class='del'>- *</div><div class='del'>- * Check boot time settings for the base address of device.</div><div class='del'>- * The found settings are set for the device to be used</div><div class='del'>- * later in the device probing.</div><div class='del'>- * Returns 0 if no settings found.</div><div class='del'>- */</div><div class='del'>-unsigned long netdev_boot_base(const char *prefix, int unit)</div><div class='del'>-{</div><div class='del'>-	const struct netdev_boot_setup *s = dev_boot_setup;</div><div class='del'>-	char name[IFNAMSIZ];</div><div class='del'>-	int i;</div><div class='add'>+		if (WARN_ON_ONCE(last_dev == ctx.dev))</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sprintf(name, "%s%d", prefix, unit);</div><div class='add'>+	if (!ctx.dev)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If device already registered then return base of 1</div><div class='del'>-	 * to indicate not to probe for this interface</div><div class='del'>-	 */</div><div class='del'>-	if (__dev_get_by_name(&amp;init_net, name))</div><div class='del'>-		return 1;</div><div class='add'>+	path = dev_fwd_path(stack);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -1;</div><div class='add'>+	path-&gt;type = DEV_PATH_ETHERNET;</div><div class='add'>+	path-&gt;dev = ctx.dev;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++)</div><div class='del'>-		if (!strcmp(name, s[i].name))</div><div class='del'>-			return s[i].map.base_addr;</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_fill_forward_path);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Saves at boot time configured settings for any netdevice.</div><div class='del'>- */</div><div class='del'>-int __init netdev_boot_setup(char *str)</div><div class='add'>+/* must be called under rcu_read_lock(), as we dont take a reference */</div><div class='add'>+static struct napi_struct *napi_by_id(unsigned int napi_id)</div><div class='ctx'> {</div><div class='del'>-	int ints[5];</div><div class='del'>-	struct ifmap map;</div><div class='del'>-</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	if (!str || !*str)</div><div class='del'>-		return 0;</div><div class='add'>+	unsigned int hash = napi_id % HASH_SIZE(napi_hash);</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> </div><div class='del'>-	/* Save settings */</div><div class='del'>-	memset(&amp;map, 0, sizeof(map));</div><div class='del'>-	if (ints[0] &gt; 0)</div><div class='del'>-		map.irq = ints[1];</div><div class='del'>-	if (ints[0] &gt; 1)</div><div class='del'>-		map.base_addr = ints[2];</div><div class='del'>-	if (ints[0] &gt; 2)</div><div class='del'>-		map.mem_start = ints[3];</div><div class='del'>-	if (ints[0] &gt; 3)</div><div class='del'>-		map.mem_end = ints[4];</div><div class='add'>+	hlist_for_each_entry_rcu(napi, &amp;napi_hash[hash], napi_hash_node)</div><div class='add'>+		if (napi-&gt;napi_id == napi_id)</div><div class='add'>+			return napi;</div><div class='ctx'> </div><div class='del'>-	/* Add new entry to the list */</div><div class='del'>-	return netdev_boot_setup_add(str, &amp;map);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__setup("netdev=", netdev_boot_setup);</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- *			    Device Interface Subroutines</div><div class='del'>- *</div><div class='del'>- *******************************************************************************/</div><div class='add'>+/* must be called under rcu_read_lock(), as we dont take a reference */</div><div class='add'>+static struct napi_struct *</div><div class='add'>+netdev_napi_by_id(struct net *net, unsigned int napi_id)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_get_iflink	- get 'iflink' value of a interface</div><div class='del'>- *	@dev: targeted interface</div><div class='del'>- *</div><div class='del'>- *	Indicates the ifindex the interface is linked to.</div><div class='del'>- *	Physical interfaces have the same 'ifindex' and 'iflink' values.</div><div class='del'>- */</div><div class='add'>+	napi = napi_by_id(napi_id);</div><div class='add'>+	if (!napi)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-int dev_get_iflink(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;netdev_ops &amp;&amp; dev-&gt;netdev_ops-&gt;ndo_get_iflink)</div><div class='del'>-		return dev-&gt;netdev_ops-&gt;ndo_get_iflink(dev);</div><div class='add'>+	if (WARN_ON_ONCE(!napi-&gt;dev))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (!net_eq(net, dev_net(napi-&gt;dev)))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ifindex;</div><div class='add'>+	return napi;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_iflink);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_fill_metadata_dst - Retrieve tunnel egress information.</div><div class='del'>- *	@dev: targeted interface</div><div class='del'>- *	@skb: The packet.</div><div class='add'>+ *	netdev_napi_by_id_lock() - find a device by NAPI ID and lock it</div><div class='add'>+ *	@net: the applicable net namespace</div><div class='add'>+ *	@napi_id: ID of a NAPI of a target device</div><div class='ctx'>  *</div><div class='del'>- *	For better visibility of tunnel traffic OVS needs to retrieve</div><div class='del'>- *	egress tunnel information for a packet. Following API allows</div><div class='del'>- *	user to get this info.</div><div class='add'>+ *	Find a NAPI instance with @napi_id. Lock its device.</div><div class='add'>+ *	The device must be in %NETREG_REGISTERED state for lookup to succeed.</div><div class='add'>+ *	netdev_unlock() must be called to release it.</div><div class='add'>+ *</div><div class='add'>+ *	Return: pointer to NAPI, its device with lock held, NULL if not found.</div><div class='ctx'>  */</div><div class='del'>-int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+struct napi_struct *</div><div class='add'>+netdev_napi_by_id_lock(struct net *net, unsigned int napi_id)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_info *info;</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;netdev_ops  || !dev-&gt;netdev_ops-&gt;ndo_fill_metadata_dst)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	napi = netdev_napi_by_id(net, napi_id);</div><div class='add'>+	if (!napi || READ_ONCE(napi-&gt;dev-&gt;reg_state) != NETREG_REGISTERED) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	info = skb_tunnel_info_unclone(skb);</div><div class='del'>-	if (!info)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (unlikely(!(info-&gt;mode &amp; IP_TUNNEL_INFO_TX)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	dev = napi-&gt;dev;</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;netdev_ops-&gt;ndo_fill_metadata_dst(dev, skb);</div><div class='add'>+	dev = __netdev_put_lock(dev, net);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	napi = netdev_napi_by_id(net, napi_id);</div><div class='add'>+	if (napi &amp;&amp; napi-&gt;dev != dev)</div><div class='add'>+		napi = NULL;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (!napi)</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+	return napi;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_fill_metadata_dst);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	__dev_get_by_name	- find a device by its name</div><div class='ctx'>  *	@net: the applicable net namespace</div><div class='ctx'>  *	@name: name to find</div><div class='ctx'>  *</div><div class='del'>- *	Find an interface by name. Must be called under RTNL semaphore</div><div class='del'>- *	or @dev_base_lock. If the name is found a pointer to the device</div><div class='del'>- *	is returned. If the name is not found then %NULL is returned. The</div><div class='add'>+ *	Find an interface by name. Must be called under RTNL semaphore.</div><div class='add'>+ *	If the name is found a pointer to the device is returned.</div><div class='add'>+ *	If the name is not found then %NULL is returned. The</div><div class='ctx'>  *	reference counters are not incremented so the caller must be</div><div class='ctx'>  *	careful with locks.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct net_device *__dev_get_by_name(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hlist_head *head = dev_name_hash(net, name);</div><div class='add'>+	struct netdev_name_node *node_name;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry(dev, head, name_hlist)</div><div class='del'>-		if (!strncmp(dev-&gt;name, name, IFNAMSIZ))</div><div class='del'>-			return dev;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+	node_name = netdev_name_node_lookup(net, name);</div><div class='add'>+	return node_name ? node_name-&gt;dev : NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__dev_get_by_name);</div><div class='ctx'> </div><div class='hunk'>@@ -758,41 +880,50 @@ EXPORT_SYMBOL(__dev_get_by_name);</div><div class='ctx'> </div><div class='ctx'> struct net_device *dev_get_by_name_rcu(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hlist_head *head = dev_name_hash(net, name);</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(dev, head, name_hlist)</div><div class='del'>-		if (!strncmp(dev-&gt;name, name, IFNAMSIZ))</div><div class='del'>-			return dev;</div><div class='add'>+	struct netdev_name_node *node_name;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	node_name = netdev_name_node_lookup_rcu(net, name);</div><div class='add'>+	return node_name ? node_name-&gt;dev : NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_get_by_name_rcu);</div><div class='ctx'> </div><div class='add'>+/* Deprecated for new users, call netdev_get_by_name() instead */</div><div class='add'>+struct net_device *dev_get_by_name(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dev_get_by_name_rcu(net, name);</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_get_by_name);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- *	dev_get_by_name		- find a device by its name</div><div class='add'>+ *	netdev_get_by_name() - find a device by its name</div><div class='ctx'>  *	@net: the applicable net namespace</div><div class='ctx'>  *	@name: name to find</div><div class='add'>+ *	@tracker: tracking object for the acquired reference</div><div class='add'>+ *	@gfp: allocation flags for the tracker</div><div class='ctx'>  *</div><div class='ctx'>  *	Find an interface by name. This can be called from any</div><div class='ctx'>  *	context and does its own locking. The returned handle has</div><div class='del'>- *	the usage count incremented and the caller must use dev_put() to</div><div class='add'>+ *	the usage count incremented and the caller must use netdev_put() to</div><div class='ctx'>  *	release it when it is no longer needed. %NULL is returned if no</div><div class='ctx'>  *	matching device is found.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct net_device *dev_get_by_name(struct net *net, const char *name)</div><div class='add'>+struct net_device *netdev_get_by_name(struct net *net, const char *name,</div><div class='add'>+				      netdevice_tracker *tracker, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dev = dev_get_by_name_rcu(net, name);</div><div class='add'>+	dev = dev_get_by_name(net, name);</div><div class='ctx'> 	if (dev)</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		netdev_tracker_alloc(dev, tracker, gfp);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_by_name);</div><div class='add'>+EXPORT_SYMBOL(netdev_get_by_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	__dev_get_by_index - find a device by its ifindex</div><div class='hunk'>@@ -802,8 +933,7 @@ EXPORT_SYMBOL(dev_get_by_name);</div><div class='ctx'>  *	Search for an interface by index. Returns %NULL if the device</div><div class='ctx'>  *	is not found or a pointer to the device. The device has not</div><div class='ctx'>  *	had its reference counter increased so the caller must be careful</div><div class='del'>- *	about locking. The caller must hold either the RTNL semaphore</div><div class='del'>- *	or @dev_base_lock.</div><div class='add'>+ *	about locking. The caller must hold the RTNL semaphore.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct net_device *__dev_get_by_index(struct net *net, int ifindex)</div><div class='hunk'>@@ -843,30 +973,42 @@ struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_get_by_index_rcu);</div><div class='ctx'> </div><div class='add'>+/* Deprecated for new users, call netdev_get_by_index() instead */</div><div class='add'>+struct net_device *dev_get_by_index(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dev_get_by_index_rcu(net, ifindex);</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_get_by_index);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_get_by_index - find a device by its ifindex</div><div class='add'>+ *	netdev_get_by_index() - find a device by its ifindex</div><div class='ctx'>  *	@net: the applicable net namespace</div><div class='ctx'>  *	@ifindex: index of device</div><div class='add'>+ *	@tracker: tracking object for the acquired reference</div><div class='add'>+ *	@gfp: allocation flags for the tracker</div><div class='ctx'>  *</div><div class='ctx'>  *	Search for an interface by index. Returns NULL if the device</div><div class='ctx'>  *	is not found or a pointer to the device. The device returned has</div><div class='ctx'>  *	had a reference added and the pointer is safe until the user calls</div><div class='del'>- *	dev_put to indicate they have finished with it.</div><div class='add'>+ *	netdev_put() to indicate they have finished with it.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct net_device *dev_get_by_index(struct net *net, int ifindex)</div><div class='add'>+struct net_device *netdev_get_by_index(struct net *net, int ifindex,</div><div class='add'>+				       netdevice_tracker *tracker, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dev = dev_get_by_index_rcu(net, ifindex);</div><div class='add'>+	dev = dev_get_by_index(net, ifindex);</div><div class='ctx'> 	if (dev)</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		netdev_tracker_alloc(dev, tracker, gfp);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_by_index);</div><div class='add'>+EXPORT_SYMBOL(netdev_get_by_index);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_get_by_napi_id - find a device by napi_id</div><div class='hunk'>@@ -877,54 +1019,183 @@ EXPORT_SYMBOL(dev_get_by_index);</div><div class='ctx'>  *	its reference counter increased so the caller must be careful</div><div class='ctx'>  *	about locking. The caller must hold RCU lock.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct net_device *dev_get_by_napi_id(unsigned int napi_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct napi_struct *napi;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='ctx'> </div><div class='del'>-	if (napi_id &lt; MIN_NAPI_ID)</div><div class='add'>+	if (!napi_id_valid(napi_id))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	napi = napi_by_id(napi_id);</div><div class='ctx'> </div><div class='ctx'> 	return napi ? napi-&gt;dev : NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_by_napi_id);</div><div class='add'>+</div><div class='add'>+/* Release the held reference on the net_device, and if the net_device</div><div class='add'>+ * is still registered try to lock the instance lock. If device is being</div><div class='add'>+ * unregistered NULL will be returned (but the reference has been released,</div><div class='add'>+ * either way!)</div><div class='add'>+ *</div><div class='add'>+ * This helper is intended for locking net_device after it has been looked up</div><div class='add'>+ * using a lockless lookup helper. Lock prevents the instance from going away.</div><div class='add'>+ */</div><div class='add'>+struct net_device *__netdev_put_lock(struct net_device *dev, struct net *net)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	if (dev-&gt;reg_state &gt; NETREG_REGISTERED ||</div><div class='add'>+	    dev-&gt;moving_ns || !net_eq(dev_net(dev), net)) {</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *</div><div class='add'>+__netdev_put_lock_ops_compat(struct net_device *dev, struct net *net)</div><div class='add'>+{</div><div class='add'>+	netdev_lock_ops_compat(dev);</div><div class='add'>+	if (dev-&gt;reg_state &gt; NETREG_REGISTERED ||</div><div class='add'>+	    dev-&gt;moving_ns || !net_eq(dev_net(dev), net)) {</div><div class='add'>+		netdev_unlock_ops_compat(dev);</div><div class='add'>+		dev_put(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	netdev_get_by_index_lock() - find a device by its ifindex</div><div class='add'>+ *	@net: the applicable net namespace</div><div class='add'>+ *	@ifindex: index of device</div><div class='add'>+ *</div><div class='add'>+ *	Search for an interface by index. If a valid device</div><div class='add'>+ *	with @ifindex is found it will be returned with netdev-&gt;lock held.</div><div class='add'>+ *	netdev_unlock() must be called to release it.</div><div class='add'>+ *</div><div class='add'>+ *	Return: pointer to a device with lock held, NULL if not found.</div><div class='add'>+ */</div><div class='add'>+struct net_device *netdev_get_by_index_lock(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(net, ifindex);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return __netdev_put_lock(dev, net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_get_by_index_lock_ops_compat(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(net, ifindex);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return __netdev_put_lock_ops_compat(dev, net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_xa_find_lock(struct net *net, struct net_device *dev,</div><div class='add'>+		    unsigned long *index)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = xa_find(&amp;net-&gt;dev_by_index, index, ULONG_MAX, XA_PRESENT);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		dev_hold(dev);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		dev = __netdev_put_lock(dev, net);</div><div class='add'>+		if (dev)</div><div class='add'>+			return dev;</div><div class='add'>+</div><div class='add'>+		(*index)++;</div><div class='add'>+	} while (true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_xa_find_lock_ops_compat(struct net *net, struct net_device *dev,</div><div class='add'>+			       unsigned long *index)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		netdev_unlock_ops_compat(dev);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = xa_find(&amp;net-&gt;dev_by_index, index, ULONG_MAX, XA_PRESENT);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		dev_hold(dev);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		dev = __netdev_put_lock_ops_compat(dev, net);</div><div class='add'>+		if (dev)</div><div class='add'>+			return dev;</div><div class='add'>+</div><div class='add'>+		(*index)++;</div><div class='add'>+	} while (true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SEQLOCK(netdev_rename_lock);</div><div class='add'>+</div><div class='add'>+void netdev_copy_name(struct net_device *dev, char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned int seq;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqbegin(&amp;netdev_rename_lock);</div><div class='add'>+		strscpy(name, dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	} while (read_seqretry(&amp;netdev_rename_lock, seq));</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(netdev_copy_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	netdev_get_name - get a netdevice name, knowing its ifindex.</div><div class='ctx'>  *	@net: network namespace</div><div class='ctx'>  *	@name: a pointer to the buffer where the name will be stored.</div><div class='ctx'>  *	@ifindex: the ifindex of the interface to get the name from.</div><div class='del'>- *</div><div class='del'>- *	The use of raw_seqcount_begin() and cond_resched() before</div><div class='del'>- *	retrying is required as we want to give the writers a chance</div><div class='del'>- *	to complete when CONFIG_PREEMPT is not set.</div><div class='ctx'>  */</div><div class='ctx'> int netdev_get_name(struct net *net, char *name, int ifindex)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	unsigned int seq;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-retry:</div><div class='del'>-	seq = raw_seqcount_begin(&amp;devnet_rename_seq);</div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 	dev = dev_get_by_index_rcu(net, ifindex);</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(name, dev-&gt;name);</div><div class='add'>+	netdev_copy_name(dev, name);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	if (read_seqcount_retry(&amp;devnet_rename_seq, seq)) {</div><div class='del'>-		cond_resched();</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static bool dev_addr_cmp(struct net_device *dev, unsigned short type,</div><div class='add'>+			 const char *ha)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;type == type &amp;&amp; !memcmp(dev-&gt;dev_addr, ha, dev-&gt;addr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -935,7 +1206,7 @@ retry:</div><div class='ctx'>  *</div><div class='ctx'>  *	Search for an interface by MAC address. Returns NULL if the device</div><div class='ctx'>  *	is not found or a pointer to the device.</div><div class='del'>- *	The caller must hold RCU or RTNL.</div><div class='add'>+ *	The caller must hold RCU.</div><div class='ctx'>  *	The returned device has not had its ref count increased</div><div class='ctx'>  *	and the caller must therefore be careful about locking</div><div class='ctx'>  *</div><div class='hunk'>@@ -947,26 +1218,38 @@ struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	for_each_netdev_rcu(net, dev)</div><div class='del'>-		if (dev-&gt;type == type &amp;&amp;</div><div class='del'>-		    !memcmp(dev-&gt;dev_addr, ha, dev-&gt;addr_len))</div><div class='add'>+		if (dev_addr_cmp(dev, type, ha))</div><div class='ctx'> 			return dev;</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_getbyhwaddr_rcu);</div><div class='ctx'> </div><div class='del'>-struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type)</div><div class='add'>+/**</div><div class='add'>+ * dev_getbyhwaddr() - find a device by its hardware address</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @type: media type of device</div><div class='add'>+ * @ha: hardware address</div><div class='add'>+ *</div><div class='add'>+ * Similar to dev_getbyhwaddr_rcu(), but the owner needs to hold</div><div class='add'>+ * rtnl_lock.</div><div class='add'>+ *</div><div class='add'>+ * Context: rtnl_lock() must be held.</div><div class='add'>+ * Return: pointer to the net_device, or NULL if not found</div><div class='add'>+ */</div><div class='add'>+struct net_device *dev_getbyhwaddr(struct net *net, unsigned short type,</div><div class='add'>+				   const char *ha)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> 	for_each_netdev(net, dev)</div><div class='del'>-		if (dev-&gt;type == type)</div><div class='add'>+		if (dev_addr_cmp(dev, type, ha))</div><div class='ctx'> 			return dev;</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__dev_getfirstbyhwtype);</div><div class='add'>+EXPORT_SYMBOL(dev_getbyhwaddr);</div><div class='ctx'> </div><div class='ctx'> struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)</div><div class='ctx'> {</div><div class='hunk'>@@ -985,40 +1268,39 @@ struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)</div><div class='ctx'> EXPORT_SYMBOL(dev_getfirstbyhwtype);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__dev_get_by_flags - find any device with given flags</div><div class='del'>- *	@net: the applicable net namespace</div><div class='del'>- *	@if_flags: IFF_* values</div><div class='del'>- *	@mask: bitmask of bits in if_flags to check</div><div class='add'>+ * netdev_get_by_flags_rcu - find any device with given flags</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @tracker: tracking object for the acquired reference</div><div class='add'>+ * @if_flags: IFF_* values</div><div class='add'>+ * @mask: bitmask of bits in if_flags to check</div><div class='ctx'>  *</div><div class='del'>- *	Search for any interface with the given flags. Returns NULL if a device</div><div class='del'>- *	is not found or a pointer to the device. Must be called inside</div><div class='del'>- *	rtnl_lock(), and result refcount is unchanged.</div><div class='add'>+ * Search for any interface with the given flags.</div><div class='add'>+ *</div><div class='add'>+ * Context: rcu_read_lock() must be held.</div><div class='add'>+ * Returns: NULL if a device is not found or a pointer to the device.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct net_device *__dev_get_by_flags(struct net *net, unsigned short if_flags,</div><div class='del'>-				      unsigned short mask)</div><div class='add'>+struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,</div><div class='add'>+					   unsigned short if_flags, unsigned short mask)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev, *ret;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	ret = NULL;</div><div class='del'>-	for_each_netdev(net, dev) {</div><div class='del'>-		if (((dev-&gt;flags ^ if_flags) &amp; mask) == 0) {</div><div class='del'>-			ret = dev;</div><div class='del'>-			break;</div><div class='add'>+	for_each_netdev_rcu(net, dev) {</div><div class='add'>+		if (((READ_ONCE(dev-&gt;flags) ^ if_flags) &amp; mask) == 0) {</div><div class='add'>+			netdev_hold(dev, tracker, GFP_ATOMIC);</div><div class='add'>+			return dev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__dev_get_by_flags);</div><div class='add'>+EXPORT_IPV6_MOD(netdev_get_by_flags_rcu);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_valid_name - check if name is okay for network device</div><div class='ctx'>  *	@name: name string</div><div class='ctx'>  *</div><div class='ctx'>  *	Network device names need to be valid file names to</div><div class='del'>- *	to allow sysfs to work.  We also disallow any kind of</div><div class='add'>+ *	allow sysfs to work.  We also disallow any kind of</div><div class='ctx'>  *	whitespace.</div><div class='ctx'>  */</div><div class='ctx'> bool dev_valid_name(const char *name)</div><div class='hunk'>@@ -1043,7 +1325,7 @@ EXPORT_SYMBOL(dev_valid_name);</div><div class='ctx'>  *	__dev_alloc_name - allocate a name for a device</div><div class='ctx'>  *	@net: network namespace to allocate the device name in</div><div class='ctx'>  *	@name: name format string</div><div class='del'>- *	@buf:  scratch buffer and result name string</div><div class='add'>+ *	@res: result name string</div><div class='ctx'>  *</div><div class='ctx'>  *	Passed a format string - eg "lt%d" it will try and find a suitable</div><div class='ctx'>  *	id. It scans list of devices to build up a free map, then chooses</div><div class='hunk'>@@ -1054,71 +1336,79 @@ EXPORT_SYMBOL(dev_valid_name);</div><div class='ctx'>  *	Returns the number of the unit assigned or a negative errno code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __dev_alloc_name(struct net *net, const char *name, char *buf)</div><div class='add'>+static int __dev_alloc_name(struct net *net, const char *name, char *res)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	const char *p;</div><div class='ctx'> 	const int max_netdevices = 8*PAGE_SIZE;</div><div class='ctx'> 	unsigned long *inuse;</div><div class='ctx'> 	struct net_device *d;</div><div class='add'>+	char buf[IFNAMSIZ];</div><div class='ctx'> </div><div class='del'>-	if (!dev_valid_name(name))</div><div class='add'>+	/* Verify the string as this thing may have come from the user.</div><div class='add'>+	 * There must be one "%d" and no other "%" characters.</div><div class='add'>+	 */</div><div class='add'>+	p = strchr(name, '%');</div><div class='add'>+	if (!p || p[1] != 'd' || strchr(p + 2, '%'))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	p = strchr(name, '%');</div><div class='del'>-	if (p) {</div><div class='del'>-		/*</div><div class='del'>-		 * Verify the string as this thing may have come from</div><div class='del'>-		 * the user.  There must be either one "%d" and no other "%"</div><div class='del'>-		 * characters.</div><div class='del'>-		 */</div><div class='del'>-		if (p[1] != 'd' || strchr(p + 2, '%'))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	/* Use one page as a bit array of possible slots */</div><div class='add'>+	inuse = bitmap_zalloc(max_netdevices, GFP_ATOMIC);</div><div class='add'>+	if (!inuse)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		/* Use one page as a bit array of possible slots */</div><div class='del'>-		inuse = (unsigned long *) get_zeroed_page(GFP_ATOMIC);</div><div class='del'>-		if (!inuse)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	for_each_netdev(net, d) {</div><div class='add'>+		struct netdev_name_node *name_node;</div><div class='ctx'> </div><div class='del'>-		for_each_netdev(net, d) {</div><div class='del'>-			if (!sscanf(d-&gt;name, name, &amp;i))</div><div class='add'>+		netdev_for_each_altname(d, name_node) {</div><div class='add'>+			if (!sscanf(name_node-&gt;name, name, &amp;i))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (i &lt; 0 || i &gt;= max_netdevices)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			/*  avoid cases where sscanf is not exact inverse of printf */</div><div class='add'>+			/* avoid cases where sscanf is not exact inverse of printf */</div><div class='ctx'> 			snprintf(buf, IFNAMSIZ, name, i);</div><div class='del'>-			if (!strncmp(buf, d-&gt;name, IFNAMSIZ))</div><div class='del'>-				set_bit(i, inuse);</div><div class='add'>+			if (!strncmp(buf, name_node-&gt;name, IFNAMSIZ))</div><div class='add'>+				__set_bit(i, inuse);</div><div class='ctx'> 		}</div><div class='add'>+		if (!sscanf(d-&gt;name, name, &amp;i))</div><div class='add'>+			continue;</div><div class='add'>+		if (i &lt; 0 || i &gt;= max_netdevices)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		i = find_first_zero_bit(inuse, max_netdevices);</div><div class='del'>-		free_page((unsigned long) inuse);</div><div class='add'>+		/* avoid cases where sscanf is not exact inverse of printf */</div><div class='add'>+		snprintf(buf, IFNAMSIZ, name, i);</div><div class='add'>+		if (!strncmp(buf, d-&gt;name, IFNAMSIZ))</div><div class='add'>+			__set_bit(i, inuse);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(buf, IFNAMSIZ, name, i);</div><div class='del'>-	if (!__dev_get_by_name(net, buf))</div><div class='del'>-		return i;</div><div class='add'>+	i = find_first_zero_bit(inuse, max_netdevices);</div><div class='add'>+	bitmap_free(inuse);</div><div class='add'>+	if (i == max_netdevices)</div><div class='add'>+		return -ENFILE;</div><div class='ctx'> </div><div class='del'>-	/* It is possible to run out of possible slots</div><div class='del'>-	 * when the name is long and there isn't enough space left</div><div class='del'>-	 * for the digits, or if all bits are used.</div><div class='del'>-	 */</div><div class='del'>-	return -ENFILE;</div><div class='add'>+	/* 'res' and 'name' could overlap, use 'buf' as an intermediate buffer */</div><div class='add'>+	strscpy(buf, name, IFNAMSIZ);</div><div class='add'>+	snprintf(res, IFNAMSIZ, buf, i);</div><div class='add'>+	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dev_alloc_name_ns(struct net *net,</div><div class='del'>-			     struct net_device *dev,</div><div class='del'>-			     const char *name)</div><div class='add'>+/* Returns negative errno or allocated unit id (see __dev_alloc_name()) */</div><div class='add'>+static int dev_prep_valid_name(struct net *net, struct net_device *dev,</div><div class='add'>+			       const char *want_name, char *out_name,</div><div class='add'>+			       int dup_errno)</div><div class='ctx'> {</div><div class='del'>-	char buf[IFNAMSIZ];</div><div class='del'>-	int ret;</div><div class='add'>+	if (!dev_valid_name(want_name))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!net);</div><div class='del'>-	ret = __dev_alloc_name(net, name, buf);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		strlcpy(dev-&gt;name, buf, IFNAMSIZ);</div><div class='del'>-	return ret;</div><div class='add'>+	if (strchr(want_name, '%'))</div><div class='add'>+		return __dev_alloc_name(net, want_name, out_name);</div><div class='add'>+</div><div class='add'>+	if (netdev_name_in_use(net, want_name))</div><div class='add'>+		return -dup_errno;</div><div class='add'>+	if (out_name != want_name)</div><div class='add'>+		strscpy(out_name, want_name, IFNAMSIZ);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1137,95 +1427,65 @@ static int dev_alloc_name_ns(struct net *net,</div><div class='ctx'> </div><div class='ctx'> int dev_alloc_name(struct net_device *dev, const char *name)</div><div class='ctx'> {</div><div class='del'>-	return dev_alloc_name_ns(dev_net(dev), dev, name);</div><div class='add'>+	return dev_prep_valid_name(dev_net(dev), dev, name, dev-&gt;name, ENFILE);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_alloc_name);</div><div class='ctx'> </div><div class='del'>-int dev_get_valid_name(struct net *net, struct net_device *dev,</div><div class='del'>-		       const char *name)</div><div class='add'>+static int dev_get_valid_name(struct net *net, struct net_device *dev,</div><div class='add'>+			      const char *name)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(!net);</div><div class='del'>-</div><div class='del'>-	if (!dev_valid_name(name))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (strchr(name, '%'))</div><div class='del'>-		return dev_alloc_name_ns(net, dev, name);</div><div class='del'>-	else if (__dev_get_by_name(net, name))</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	else if (dev-&gt;name != name)</div><div class='del'>-		strlcpy(dev-&gt;name, name, IFNAMSIZ);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = dev_prep_valid_name(net, dev, name, dev-&gt;name, EEXIST);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_valid_name);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_name - change name of a device</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@newname: name (or format string) must be at least IFNAMSIZ</div><div class='del'>- *</div><div class='del'>- *	Change name of a device, can pass format strings "eth%d".</div><div class='del'>- *	for wildcarding.</div><div class='del'>- */</div><div class='del'>-int dev_change_name(struct net_device *dev, const char *newname)</div><div class='add'>+int netif_change_name(struct net_device *dev, const char *newname)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='ctx'> 	unsigned char old_assign_type;</div><div class='ctx'> 	char oldname[IFNAMSIZ];</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct net *net;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	BUG_ON(!dev_net(dev));</div><div class='del'>-</div><div class='del'>-	net = dev_net(dev);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='ctx'> </div><div class='del'>-	write_seqcount_begin(&amp;devnet_rename_seq);</div><div class='del'>-</div><div class='del'>-	if (strncmp(newname, dev-&gt;name, IFNAMSIZ) == 0) {</div><div class='del'>-		write_seqcount_end(&amp;devnet_rename_seq);</div><div class='add'>+	if (!strncmp(newname, dev-&gt;name, IFNAMSIZ))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(oldname, dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> </div><div class='add'>+	write_seqlock_bh(&amp;netdev_rename_lock);</div><div class='ctx'> 	err = dev_get_valid_name(net, dev, newname);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		write_seqcount_end(&amp;devnet_rename_seq);</div><div class='add'>+	write_sequnlock_bh(&amp;netdev_rename_lock);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (oldname[0] &amp;&amp; !strchr(oldname, '%'))</div><div class='del'>-		netdev_info(dev, "renamed from %s\n", oldname);</div><div class='add'>+		netdev_info(dev, "renamed from %s%s\n", oldname,</div><div class='add'>+			    dev-&gt;flags &amp; IFF_UP ? " (while UP)" : "");</div><div class='ctx'> </div><div class='ctx'> 	old_assign_type = dev-&gt;name_assign_type;</div><div class='del'>-	dev-&gt;name_assign_type = NET_NAME_RENAMED;</div><div class='add'>+	WRITE_ONCE(dev-&gt;name_assign_type, NET_NAME_RENAMED);</div><div class='ctx'> </div><div class='ctx'> rollback:</div><div class='ctx'> 	ret = device_rename(&amp;dev-&gt;dev, dev-&gt;name);</div><div class='ctx'> 	if (ret) {</div><div class='add'>+		write_seqlock_bh(&amp;netdev_rename_lock);</div><div class='ctx'> 		memcpy(dev-&gt;name, oldname, IFNAMSIZ);</div><div class='del'>-		dev-&gt;name_assign_type = old_assign_type;</div><div class='del'>-		write_seqcount_end(&amp;devnet_rename_seq);</div><div class='add'>+		write_sequnlock_bh(&amp;netdev_rename_lock);</div><div class='add'>+		WRITE_ONCE(dev-&gt;name_assign_type, old_assign_type);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_seqcount_end(&amp;devnet_rename_seq);</div><div class='del'>-</div><div class='ctx'> 	netdev_adjacent_rename_links(dev, oldname);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='del'>-	hlist_del_rcu(&amp;dev-&gt;name_hlist);</div><div class='del'>-	write_unlock_bh(&amp;dev_base_lock);</div><div class='add'>+	netdev_name_node_del(dev-&gt;name_node);</div><div class='ctx'> </div><div class='del'>-	synchronize_rcu();</div><div class='add'>+	synchronize_net();</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='del'>-	hlist_add_head_rcu(&amp;dev-&gt;name_hlist, dev_name_hash(net, dev-&gt;name));</div><div class='del'>-	write_unlock_bh(&amp;dev_base_lock);</div><div class='add'>+	netdev_name_node_add(net, dev-&gt;name_node);</div><div class='ctx'> </div><div class='ctx'> 	ret = call_netdevice_notifiers(NETDEV_CHANGENAME, dev);</div><div class='ctx'> 	ret = notifier_to_errno(ret);</div><div class='hunk'>@@ -1234,30 +1494,23 @@ rollback:</div><div class='ctx'> 		/* err &gt;= 0 after dev_alloc_name() or stores the first errno */</div><div class='ctx'> 		if (err &gt;= 0) {</div><div class='ctx'> 			err = ret;</div><div class='del'>-			write_seqcount_begin(&amp;devnet_rename_seq);</div><div class='add'>+			write_seqlock_bh(&amp;netdev_rename_lock);</div><div class='ctx'> 			memcpy(dev-&gt;name, oldname, IFNAMSIZ);</div><div class='add'>+			write_sequnlock_bh(&amp;netdev_rename_lock);</div><div class='ctx'> 			memcpy(oldname, newname, IFNAMSIZ);</div><div class='del'>-			dev-&gt;name_assign_type = old_assign_type;</div><div class='add'>+			WRITE_ONCE(dev-&gt;name_assign_type, old_assign_type);</div><div class='ctx'> 			old_assign_type = NET_NAME_RENAMED;</div><div class='ctx'> 			goto rollback;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_err("%s: name change rollback failed: %d\n",</div><div class='del'>-			       dev-&gt;name, ret);</div><div class='add'>+			netdev_err(dev, "name change rollback failed: %d\n",</div><div class='add'>+				   ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_set_alias - change ifalias of a device</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@alias: name up to IFALIASZ</div><div class='del'>- *	@len: limit of bytes to copy from info</div><div class='del'>- *</div><div class='del'>- *	Set ifalias for a device,</div><div class='del'>- */</div><div class='del'>-int dev_set_alias(struct net_device *dev, const char *alias, size_t len)</div><div class='add'>+int netif_set_alias(struct net_device *dev, const char *alias, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_ifalias *new_alias = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1274,8 +1527,8 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ifalias_mutex);</div><div class='del'>-	rcu_swap_protected(dev-&gt;ifalias, new_alias,</div><div class='del'>-			   mutex_is_locked(&amp;ifalias_mutex));</div><div class='add'>+	new_alias = rcu_replace_pointer(dev-&gt;ifalias, new_alias,</div><div class='add'>+					mutex_is_locked(&amp;ifalias_mutex));</div><div class='ctx'> 	mutex_unlock(&amp;ifalias_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (new_alias)</div><div class='hunk'>@@ -1283,7 +1536,6 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_set_alias);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_get_alias - get ifalias of a device</div><div class='hunk'>@@ -1320,16 +1572,10 @@ void netdev_features_change(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_features_change);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	netdev_state_change - device changes state</div><div class='del'>- *	@dev: device to cause notification</div><div class='del'>- *</div><div class='del'>- *	Called to indicate a device has changed state. This function calls</div><div class='del'>- *	the notifier chains for netdev_chain and sends a NEWLINK message</div><div class='del'>- *	to the routing socket.</div><div class='del'>- */</div><div class='del'>-void netdev_state_change(struct net_device *dev)</div><div class='add'>+void netif_state_change(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	netdev_ops_assert_locked_or_invisible(dev);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='ctx'> 		struct netdev_notifier_change_info change_info = {</div><div class='ctx'> 			.info.dev = dev,</div><div class='hunk'>@@ -1337,10 +1583,28 @@ void netdev_state_change(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		call_netdevice_notifiers_info(NETDEV_CHANGE,</div><div class='ctx'> 					      &amp;change_info.info);</div><div class='del'>-		rtmsg_ifinfo(RTM_NEWLINK, dev, 0, GFP_KERNEL);</div><div class='add'>+		rtmsg_ifinfo(RTM_NEWLINK, dev, 0, GFP_KERNEL, 0, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netdev_state_change);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __netdev_notify_peers - notify network peers about existence of @dev,</div><div class='add'>+ * to be called when rtnl lock is already held.</div><div class='add'>+ * @dev: network device</div><div class='add'>+ *</div><div class='add'>+ * Generate traffic such that interested network peers are aware of</div><div class='add'>+ * @dev, such as by generating a gratuitous ARP. This may be used when</div><div class='add'>+ * a device wants to inform the rest of the network about some sort of</div><div class='add'>+ * reconfiguration such as a failover event or virtual machine</div><div class='add'>+ * migration.</div><div class='add'>+ */</div><div class='add'>+void __netdev_notify_peers(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev);</div><div class='add'>+	call_netdevice_notifiers(NETDEV_RESEND_IGMP, dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__netdev_notify_peers);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * netdev_notify_peers - notify network peers about existence of @dev</div><div class='hunk'>@@ -1355,21 +1619,47 @@ EXPORT_SYMBOL(netdev_state_change);</div><div class='ctx'> void netdev_notify_peers(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev);</div><div class='del'>-	call_netdevice_notifiers(NETDEV_RESEND_IGMP, dev);</div><div class='add'>+	__netdev_notify_peers(dev);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_notify_peers);</div><div class='ctx'> </div><div class='del'>-static int __dev_open(struct net_device *dev)</div><div class='add'>+static int napi_threaded_poll(void *data);</div><div class='add'>+</div><div class='add'>+static int napi_kthread_create(struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Create and wake up the kthread once to put it in</div><div class='add'>+	 * TASK_INTERRUPTIBLE mode to avoid the blocked task</div><div class='add'>+	 * warning and work with loadavg.</div><div class='add'>+	 */</div><div class='add'>+	n-&gt;thread = kthread_run(napi_threaded_poll, n, "napi/%s-%d",</div><div class='add'>+				n-&gt;dev-&gt;name, n-&gt;napi_id);</div><div class='add'>+	if (IS_ERR(n-&gt;thread)) {</div><div class='add'>+		err = PTR_ERR(n-&gt;thread);</div><div class='add'>+		pr_err("kthread_run failed with err %d\n", err);</div><div class='add'>+		n-&gt;thread = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='add'>+	dev_addr_check(dev);</div><div class='ctx'> </div><div class='del'>-	if (!netif_device_present(dev))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!netif_device_present(dev)) {</div><div class='add'>+		/* may be detached because parent is runtime-suspended */</div><div class='add'>+		if (dev-&gt;dev.parent)</div><div class='add'>+			pm_runtime_resume(dev-&gt;dev.parent);</div><div class='add'>+		if (!netif_device_present(dev))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Block netpoll from trying to do any rx path servicing.</div><div class='ctx'> 	 * If we don't do this there is a chance ndo_poll_controller</div><div class='hunk'>@@ -1377,13 +1667,15 @@ static int __dev_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	netpoll_poll_disable(dev);</div><div class='ctx'> </div><div class='del'>-	ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev);</div><div class='add'>+	ret = call_netdevice_notifiers_extack(NETDEV_PRE_UP, dev, extack);</div><div class='ctx'> 	ret = notifier_to_errno(ret);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(__LINK_STATE_START, &amp;dev-&gt;state);</div><div class='ctx'> </div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='ctx'> 	if (ops-&gt;ndo_validate_addr)</div><div class='ctx'> 		ret = ops-&gt;ndo_validate_addr(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1395,7 +1687,7 @@ static int __dev_open(struct net_device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		clear_bit(__LINK_STATE_START, &amp;dev-&gt;state);</div><div class='ctx'> 	else {</div><div class='del'>-		dev-&gt;flags |= IFF_UP;</div><div class='add'>+		netif_set_up(dev, true);</div><div class='ctx'> 		dev_set_rx_mode(dev);</div><div class='ctx'> 		dev_activate(dev);</div><div class='ctx'> 		add_device_randomness(dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='hunk'>@@ -1404,35 +1696,22 @@ static int __dev_open(struct net_device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_open	- prepare an interface for use.</div><div class='del'>- *	@dev:	device to open</div><div class='del'>- *</div><div class='del'>- *	Takes a device from down to up state. The device's private open</div><div class='del'>- *	function is invoked and then the multicast lists are loaded. Finally</div><div class='del'>- *	the device is moved into the up state and a %NETDEV_UP message is</div><div class='del'>- *	sent to the netdev notifier chain.</div><div class='del'>- *</div><div class='del'>- *	Calling this function on an active interface is a nop. On a failure</div><div class='del'>- *	a negative errno code is returned.</div><div class='del'>- */</div><div class='del'>-int dev_open(struct net_device *dev)</div><div class='add'>+int netif_open(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = __dev_open(dev);</div><div class='add'>+	ret = __dev_open(dev, extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING, GFP_KERNEL);</div><div class='add'>+	rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP | IFF_RUNNING, GFP_KERNEL, 0, NULL);</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_UP, dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_open);</div><div class='ctx'> </div><div class='ctx'> static void __dev_close_many(struct list_head *head)</div><div class='ctx'> {</div><div class='hunk'>@@ -1470,10 +1749,13 @@ static void __dev_close_many(struct list_head *head)</div><div class='ctx'> 		 *	We allow it to be called even after a DETACH hot-plug</div><div class='ctx'> 		 *	event.</div><div class='ctx'> 		 */</div><div class='add'>+</div><div class='add'>+		netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='ctx'> 		if (ops-&gt;ndo_stop)</div><div class='ctx'> 			ops-&gt;ndo_stop(dev);</div><div class='ctx'> </div><div class='del'>-		dev-&gt;flags &amp;= ~IFF_UP;</div><div class='add'>+		netif_set_up(dev, false);</div><div class='ctx'> 		netpoll_poll_enable(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1487,7 +1769,7 @@ static void __dev_close(struct net_device *dev)</div><div class='ctx'> 	list_del(&amp;single);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dev_close_many(struct list_head *head, bool unlink)</div><div class='add'>+void netif_close_many(struct list_head *head, bool unlink)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev, *tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -1499,45 +1781,27 @@ void dev_close_many(struct list_head *head, bool unlink)</div><div class='ctx'> 	__dev_close_many(head);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(dev, tmp, head, close_list) {</div><div class='del'>-		rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING, GFP_KERNEL);</div><div class='add'>+		rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP | IFF_RUNNING, GFP_KERNEL, 0, NULL);</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_DOWN, dev);</div><div class='ctx'> 		if (unlink)</div><div class='ctx'> 			list_del_init(&amp;dev-&gt;close_list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_close_many);</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(netif_close_many, "NETDEV_INTERNAL");</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_close - shutdown an interface.</div><div class='del'>- *	@dev: device to shutdown</div><div class='del'>- *</div><div class='del'>- *	This function moves an active device into down state. A</div><div class='del'>- *	%NETDEV_GOING_DOWN is sent to the netdev notifier chain. The device</div><div class='del'>- *	is then deactivated and finally a %NETDEV_DOWN is sent to the notifier</div><div class='del'>- *	chain.</div><div class='del'>- */</div><div class='del'>-void dev_close(struct net_device *dev)</div><div class='add'>+void netif_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='ctx'> 		LIST_HEAD(single);</div><div class='ctx'> </div><div class='ctx'> 		list_add(&amp;dev-&gt;close_list, &amp;single);</div><div class='del'>-		dev_close_many(&amp;single, true);</div><div class='add'>+		netif_close_many(&amp;single, true);</div><div class='ctx'> 		list_del(&amp;single);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_close);</div><div class='add'>+EXPORT_SYMBOL(netif_close);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	dev_disable_lro - disable Large Receive Offload on a device</div><div class='del'>- *	@dev: device</div><div class='del'>- *</div><div class='del'>- *	Disable Large Receive Offload (LRO) on a net device.  Must be</div><div class='del'>- *	called under RTNL.  This is needed if received packets may be</div><div class='del'>- *	forwarded to another interface.</div><div class='del'>- */</div><div class='del'>-void dev_disable_lro(struct net_device *dev)</div><div class='add'>+void netif_disable_lro(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *lower_dev;</div><div class='ctx'> 	struct list_head *iter;</div><div class='hunk'>@@ -1548,10 +1812,13 @@ void dev_disable_lro(struct net_device *dev)</div><div class='ctx'> 	if (unlikely(dev-&gt;features &amp; NETIF_F_LRO))</div><div class='ctx'> 		netdev_WARN(dev, "failed to disable LRO!\n");</div><div class='ctx'> </div><div class='del'>-	netdev_for_each_lower_dev(dev, lower_dev, iter)</div><div class='del'>-		dev_disable_lro(lower_dev);</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower_dev, iter) {</div><div class='add'>+		netdev_lock_ops(lower_dev);</div><div class='add'>+		netif_disable_lro(lower_dev);</div><div class='add'>+		netdev_unlock_ops(lower_dev);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_disable_lro);</div><div class='add'>+EXPORT_IPV6_MOD(netif_disable_lro);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_disable_gro_hw - disable HW Generic Receive Offload on a device</div><div class='hunk'>@@ -1579,12 +1846,15 @@ const char *netdev_cmd_to_name(enum netdev_cmd cmd)</div><div class='ctx'> 	N(UP) N(DOWN) N(REBOOT) N(CHANGE) N(REGISTER) N(UNREGISTER)</div><div class='ctx'> 	N(CHANGEMTU) N(CHANGEADDR) N(GOING_DOWN) N(CHANGENAME) N(FEAT_CHANGE)</div><div class='ctx'> 	N(BONDING_FAILOVER) N(PRE_UP) N(PRE_TYPE_CHANGE) N(POST_TYPE_CHANGE)</div><div class='del'>-	N(POST_INIT) N(RELEASE) N(NOTIFY_PEERS) N(JOIN) N(CHANGEUPPER)</div><div class='del'>-	N(RESEND_IGMP) N(PRECHANGEMTU) N(CHANGEINFODATA) N(BONDING_INFO)</div><div class='del'>-	N(PRECHANGEUPPER) N(CHANGELOWERSTATE) N(UDP_TUNNEL_PUSH_INFO)</div><div class='del'>-	N(UDP_TUNNEL_DROP_INFO) N(CHANGE_TX_QUEUE_LEN)</div><div class='add'>+	N(POST_INIT) N(PRE_UNINIT) N(RELEASE) N(NOTIFY_PEERS) N(JOIN)</div><div class='add'>+	N(CHANGEUPPER) N(RESEND_IGMP) N(PRECHANGEMTU) N(CHANGEINFODATA)</div><div class='add'>+	N(BONDING_INFO) N(PRECHANGEUPPER) N(CHANGELOWERSTATE)</div><div class='add'>+	N(UDP_TUNNEL_PUSH_INFO) N(UDP_TUNNEL_DROP_INFO) N(CHANGE_TX_QUEUE_LEN)</div><div class='ctx'> 	N(CVLAN_FILTER_PUSH_INFO) N(CVLAN_FILTER_DROP_INFO)</div><div class='ctx'> 	N(SVLAN_FILTER_PUSH_INFO) N(SVLAN_FILTER_DROP_INFO)</div><div class='add'>+	N(PRE_CHANGEADDR) N(OFFLOAD_XSTATS_ENABLE) N(OFFLOAD_XSTATS_DISABLE)</div><div class='add'>+	N(OFFLOAD_XSTATS_REPORT_USED) N(OFFLOAD_XSTATS_REPORT_DELTA)</div><div class='add'>+	N(XDP_FEAT_CHANGE)</div><div class='ctx'> 	}</div><div class='ctx'> #undef N</div><div class='ctx'> 	return "UNKNOWN_NETDEV_EVENT";</div><div class='hunk'>@@ -1601,6 +1871,64 @@ static int call_netdevice_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> 	return nb-&gt;notifier_call(nb, val, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int call_netdevice_register_notifiers(struct notifier_block *nb,</div><div class='add'>+					     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = call_netdevice_notifier(nb, NETDEV_REGISTER, dev);</div><div class='add'>+	err = notifier_to_errno(err);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	call_netdevice_notifier(nb, NETDEV_UP, dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void call_netdevice_unregister_notifiers(struct notifier_block *nb,</div><div class='add'>+						struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		call_netdevice_notifier(nb, NETDEV_GOING_DOWN,</div><div class='add'>+					dev);</div><div class='add'>+		call_netdevice_notifier(nb, NETDEV_DOWN, dev);</div><div class='add'>+	}</div><div class='add'>+	call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_netdevice_register_net_notifiers(struct notifier_block *nb,</div><div class='add'>+						 struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for_each_netdev(net, dev) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = call_netdevice_register_notifiers(nb, dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto rollback;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	for_each_netdev_continue_reverse(net, dev)</div><div class='add'>+		call_netdevice_unregister_notifiers(nb, dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void call_netdevice_unregister_net_notifiers(struct notifier_block *nb,</div><div class='add'>+						    struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	for_each_netdev(net, dev)</div><div class='add'>+		call_netdevice_unregister_notifiers(nb, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dev_boot_phase = 1;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1619,31 +1947,26 @@ static int dev_boot_phase = 1;</div><div class='ctx'> </div><div class='ctx'> int register_netdevice_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct net_device *last;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Close race with setup_net() and cleanup_net() */</div><div class='ctx'> 	down_write(&amp;pernet_ops_rwsem);</div><div class='add'>+</div><div class='add'>+	/* When RTNL is removed, we need protection for netdev_chain. */</div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+</div><div class='ctx'> 	err = raw_notifier_chain_register(&amp;netdev_chain, nb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	if (dev_boot_phase)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	for_each_net(net) {</div><div class='del'>-		for_each_netdev(net, dev) {</div><div class='del'>-			err = call_netdevice_notifier(nb, NETDEV_REGISTER, dev);</div><div class='del'>-			err = notifier_to_errno(err);</div><div class='del'>-			if (err)</div><div class='del'>-				goto rollback;</div><div class='del'>-</div><div class='del'>-			if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			call_netdevice_notifier(nb, NETDEV_UP, dev);</div><div class='del'>-		}</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+		err = call_netdevice_register_net_notifiers(nb, net);</div><div class='add'>+		__rtnl_net_unlock(net);</div><div class='add'>+		if (err)</div><div class='add'>+			goto rollback;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -1652,22 +1975,12 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> rollback:</div><div class='del'>-	last = dev;</div><div class='del'>-	for_each_net(net) {</div><div class='del'>-		for_each_netdev(net, dev) {</div><div class='del'>-			if (dev == last)</div><div class='del'>-				goto outroll;</div><div class='del'>-</div><div class='del'>-			if (dev-&gt;flags &amp; IFF_UP) {</div><div class='del'>-				call_netdevice_notifier(nb, NETDEV_GOING_DOWN,</div><div class='del'>-							dev);</div><div class='del'>-				call_netdevice_notifier(nb, NETDEV_DOWN, dev);</div><div class='del'>-			}</div><div class='del'>-			call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);</div><div class='del'>-		}</div><div class='add'>+	for_each_net_continue_reverse(net) {</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+		call_netdevice_unregister_net_notifiers(nb, net);</div><div class='add'>+		__rtnl_net_unlock(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-outroll:</div><div class='ctx'> 	raw_notifier_chain_unregister(&amp;netdev_chain, nb);</div><div class='ctx'> 	goto unlock;</div><div class='ctx'> }</div><div class='hunk'>@@ -1689,7 +2002,6 @@ EXPORT_SYMBOL(register_netdevice_notifier);</div><div class='ctx'> </div><div class='ctx'> int unregister_netdevice_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1701,15 +2013,11 @@ int unregister_netdevice_notifier(struct notifier_block *nb)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	for_each_net(net) {</div><div class='del'>-		for_each_netdev(net, dev) {</div><div class='del'>-			if (dev-&gt;flags &amp; IFF_UP) {</div><div class='del'>-				call_netdevice_notifier(nb, NETDEV_GOING_DOWN,</div><div class='del'>-							dev);</div><div class='del'>-				call_netdevice_notifier(nb, NETDEV_DOWN, dev);</div><div class='del'>-			}</div><div class='del'>-			call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);</div><div class='del'>-		}</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+		call_netdevice_unregister_net_notifiers(nb, net);</div><div class='add'>+		__rtnl_net_unlock(net);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> unlock:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	up_write(&amp;pernet_ops_rwsem);</div><div class='hunk'>@@ -1717,6 +2025,184 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_netdevice_notifier);</div><div class='ctx'> </div><div class='add'>+static int __register_netdevice_notifier_net(struct net *net,</div><div class='add'>+					     struct notifier_block *nb,</div><div class='add'>+					     bool ignore_call_fail)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = raw_notifier_chain_register(&amp;net-&gt;netdev_chain, nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (dev_boot_phase)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = call_netdevice_register_net_notifiers(nb, net);</div><div class='add'>+	if (err &amp;&amp; !ignore_call_fail)</div><div class='add'>+		goto chain_unregister;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+chain_unregister:</div><div class='add'>+	raw_notifier_chain_unregister(&amp;net-&gt;netdev_chain, nb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __unregister_netdevice_notifier_net(struct net *net,</div><div class='add'>+					       struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = raw_notifier_chain_unregister(&amp;net-&gt;netdev_chain, nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	call_netdevice_unregister_net_notifiers(nb, net);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * register_netdevice_notifier_net - register a per-netns network notifier block</div><div class='add'>+ * @net: network namespace</div><div class='add'>+ * @nb: notifier</div><div class='add'>+ *</div><div class='add'>+ * Register a notifier to be called when network device events occur.</div><div class='add'>+ * The notifier passed is linked into the kernel structures and must</div><div class='add'>+ * not be reused until it has been unregistered. A negative errno code</div><div class='add'>+ * is returned on a failure.</div><div class='add'>+ *</div><div class='add'>+ * When registered all registration and up events are replayed</div><div class='add'>+ * to the new notifier to allow device to have a race free</div><div class='add'>+ * view of the network device list.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int register_netdevice_notifier_net(struct net *net, struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+	err = __register_netdevice_notifier_net(net, nb, false);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(register_netdevice_notifier_net);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * unregister_netdevice_notifier_net - unregister a per-netns</div><div class='add'>+ *                                     network notifier block</div><div class='add'>+ * @net: network namespace</div><div class='add'>+ * @nb: notifier</div><div class='add'>+ *</div><div class='add'>+ * Unregister a notifier previously registered by</div><div class='add'>+ * register_netdevice_notifier_net(). The notifier is unlinked from the</div><div class='add'>+ * kernel structures and may then be reused. A negative errno code</div><div class='add'>+ * is returned on a failure.</div><div class='add'>+ *</div><div class='add'>+ * After unregistering unregister and down device events are synthesized</div><div class='add'>+ * for all devices on the device list to the removed notifier to remove</div><div class='add'>+ * the need for special case cleanup code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int unregister_netdevice_notifier_net(struct net *net,</div><div class='add'>+				      struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+	err = __unregister_netdevice_notifier_net(net, nb);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(unregister_netdevice_notifier_net);</div><div class='add'>+</div><div class='add'>+static void __move_netdevice_notifier_net(struct net *src_net,</div><div class='add'>+					  struct net *dst_net,</div><div class='add'>+					  struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	__unregister_netdevice_notifier_net(src_net, nb);</div><div class='add'>+	__register_netdevice_notifier_net(dst_net, nb, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_net_dev_lock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	bool again;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct net *net;</div><div class='add'>+</div><div class='add'>+		again = false;</div><div class='add'>+</div><div class='add'>+		/* netns might be being dismantled. */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		net = dev_net_rcu(dev);</div><div class='add'>+		net_passive_inc(net);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_NS</div><div class='add'>+		/* dev might have been moved to another netns. */</div><div class='add'>+		if (!net_eq(net, rcu_access_pointer(dev-&gt;nd_net.net))) {</div><div class='add'>+			rtnl_net_unlock(net);</div><div class='add'>+			net_passive_dec(net);</div><div class='add'>+			again = true;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	} while (again);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_net_dev_unlock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+	net_passive_dec(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int register_netdevice_notifier_dev_net(struct net_device *dev,</div><div class='add'>+					struct notifier_block *nb,</div><div class='add'>+					struct netdev_net_notifier *nn)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_dev_lock(dev);</div><div class='add'>+	err = __register_netdevice_notifier_net(dev_net(dev), nb, false);</div><div class='add'>+	if (!err) {</div><div class='add'>+		nn-&gt;nb = nb;</div><div class='add'>+		list_add(&amp;nn-&gt;list, &amp;dev-&gt;net_notifier_list);</div><div class='add'>+	}</div><div class='add'>+	rtnl_net_dev_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(register_netdevice_notifier_dev_net);</div><div class='add'>+</div><div class='add'>+int unregister_netdevice_notifier_dev_net(struct net_device *dev,</div><div class='add'>+					  struct notifier_block *nb,</div><div class='add'>+					  struct netdev_net_notifier *nn)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_dev_lock(dev);</div><div class='add'>+	list_del(&amp;nn-&gt;list);</div><div class='add'>+	err = __unregister_netdevice_notifier_net(dev_net(dev), nb);</div><div class='add'>+	rtnl_net_dev_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(unregister_netdevice_notifier_dev_net);</div><div class='add'>+</div><div class='add'>+static void move_netdevice_notifiers_dev_net(struct net_device *dev,</div><div class='add'>+					     struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct netdev_net_notifier *nn;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nn, &amp;dev-&gt;net_notifier_list, list)</div><div class='add'>+		__move_netdevice_notifier_net(dev_net(dev), net, nn-&gt;nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	call_netdevice_notifiers_info - call all network notifier blocks</div><div class='ctx'>  *	@val: value passed unmodified to notifier function</div><div class='hunk'>@@ -1726,14 +2212,63 @@ EXPORT_SYMBOL(unregister_netdevice_notifier);</div><div class='ctx'>  *	are as for raw_notifier_call_chain().</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int call_netdevice_notifiers_info(unsigned long val,</div><div class='del'>-					 struct netdev_notifier_info *info)</div><div class='add'>+int call_netdevice_notifiers_info(unsigned long val,</div><div class='add'>+				  struct netdev_notifier_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net(info-&gt;dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* Run per-netns notifier block chain first, then run the global one.</div><div class='add'>+	 * Hopefully, one day, the global one is going to be removed after</div><div class='add'>+	 * all notifier block registrators get converted to be per-netns.</div><div class='add'>+	 */</div><div class='add'>+	ret = raw_notifier_call_chain(&amp;net-&gt;netdev_chain, val, info);</div><div class='add'>+	if (ret &amp; NOTIFY_STOP_MASK)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return raw_notifier_call_chain(&amp;netdev_chain, val, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	call_netdevice_notifiers_info_robust - call per-netns notifier blocks</div><div class='add'>+ *	                                       for and rollback on error</div><div class='add'>+ *	@val_up: value passed unmodified to notifier function</div><div class='add'>+ *	@val_down: value passed unmodified to the notifier function when</div><div class='add'>+ *	           recovering from an error on @val_up</div><div class='add'>+ *	@info: notifier information data</div><div class='add'>+ *</div><div class='add'>+ *	Call all per-netns network notifier blocks, but not notifier blocks on</div><div class='add'>+ *	the global notifier chain. Parameters and return value are as for</div><div class='add'>+ *	raw_notifier_call_chain_robust().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+call_netdevice_notifiers_info_robust(unsigned long val_up,</div><div class='add'>+				     unsigned long val_down,</div><div class='add'>+				     struct netdev_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net(info-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	return raw_notifier_call_chain_robust(&amp;net-&gt;netdev_chain,</div><div class='add'>+					      val_up, val_down, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_netdevice_notifiers_extack(unsigned long val,</div><div class='add'>+					   struct net_device *dev,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_info info = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.extack = extack,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return call_netdevice_notifiers_info(val, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	call_netdevice_notifiers - call all network notifier blocks</div><div class='ctx'>  *      @val: value passed unmodified to notifier function</div><div class='ctx'>  *      @dev: net_device pointer passed unmodified to notifier function</div><div class='hunk'>@@ -1744,13 +2279,31 @@ static int call_netdevice_notifiers_info(unsigned long val,</div><div class='ctx'> </div><div class='ctx'> int call_netdevice_notifiers(unsigned long val, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_notifier_info info = {</div><div class='del'>-		.dev = dev,</div><div class='add'>+	return call_netdevice_notifiers_extack(val, dev, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(call_netdevice_notifiers);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	call_netdevice_notifiers_mtu - call all network notifier blocks</div><div class='add'>+ *	@val: value passed unmodified to notifier function</div><div class='add'>+ *	@dev: net_device pointer passed unmodified to notifier function</div><div class='add'>+ *	@arg: additional u32 argument passed to the notifier function</div><div class='add'>+ *</div><div class='add'>+ *	Call all network notifier blocks.  Parameters and return value</div><div class='add'>+ *	are as for raw_notifier_call_chain().</div><div class='add'>+ */</div><div class='add'>+static int call_netdevice_notifiers_mtu(unsigned long val,</div><div class='add'>+					struct net_device *dev, u32 arg)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_info_ext info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.ext.mtu = arg,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return call_netdevice_notifiers_info(val, &amp;info);</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct netdev_notifier_info_ext, info) != 0);</div><div class='add'>+</div><div class='add'>+	return call_netdevice_notifiers_info(val, &amp;info.info);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(call_netdevice_notifiers);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_INGRESS</div><div class='ctx'> static DEFINE_STATIC_KEY_FALSE(ingress_needed_key);</div><div class='hunk'>@@ -1784,8 +2337,14 @@ void net_dec_egress_queue(void)</div><div class='ctx'> EXPORT_SYMBOL_GPL(net_dec_egress_queue);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static DEFINE_STATIC_KEY_FALSE(netstamp_needed_key);</div><div class='del'>-#ifdef HAVE_JUMP_LABEL</div><div class='add'>+#ifdef CONFIG_NET_CLS_ACT</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(tcf_sw_enabled_key);</div><div class='add'>+EXPORT_SYMBOL(tcf_sw_enabled_key);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(netstamp_needed_key);</div><div class='add'>+EXPORT_SYMBOL(netstamp_needed_key);</div><div class='add'>+#ifdef CONFIG_JUMP_LABEL</div><div class='ctx'> static atomic_t netstamp_needed_deferred;</div><div class='ctx'> static atomic_t netstamp_wanted;</div><div class='ctx'> static void netstamp_clear(struct work_struct *work)</div><div class='hunk'>@@ -1804,14 +2363,11 @@ static DECLARE_WORK(netstamp_work, netstamp_clear);</div><div class='ctx'> </div><div class='ctx'> void net_enable_timestamp(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef HAVE_JUMP_LABEL</div><div class='del'>-	int wanted;</div><div class='add'>+#ifdef CONFIG_JUMP_LABEL</div><div class='add'>+	int wanted = atomic_read(&amp;netstamp_wanted);</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		wanted = atomic_read(&amp;netstamp_wanted);</div><div class='del'>-		if (wanted &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		if (atomic_cmpxchg(&amp;netstamp_wanted, wanted, wanted + 1) == wanted)</div><div class='add'>+	while (wanted &gt; 0) {</div><div class='add'>+		if (atomic_try_cmpxchg(&amp;netstamp_wanted, &amp;wanted, wanted + 1))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_inc(&amp;netstamp_needed_deferred);</div><div class='hunk'>@@ -1824,14 +2380,11 @@ EXPORT_SYMBOL(net_enable_timestamp);</div><div class='ctx'> </div><div class='ctx'> void net_disable_timestamp(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef HAVE_JUMP_LABEL</div><div class='del'>-	int wanted;</div><div class='add'>+#ifdef CONFIG_JUMP_LABEL</div><div class='add'>+	int wanted = atomic_read(&amp;netstamp_wanted);</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		wanted = atomic_read(&amp;netstamp_wanted);</div><div class='del'>-		if (wanted &lt;= 1)</div><div class='del'>-			break;</div><div class='del'>-		if (atomic_cmpxchg(&amp;netstamp_wanted, wanted, wanted - 1) == wanted)</div><div class='add'>+	while (wanted &gt; 1) {</div><div class='add'>+		if (atomic_try_cmpxchg(&amp;netstamp_wanted, &amp;wanted, wanted - 1))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_dec(&amp;netstamp_needed_deferred);</div><div class='hunk'>@@ -1845,40 +2398,27 @@ EXPORT_SYMBOL(net_disable_timestamp);</div><div class='ctx'> static inline void net_timestamp_set(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;tstamp = 0;</div><div class='add'>+	skb-&gt;tstamp_type = SKB_CLOCK_REALTIME;</div><div class='ctx'> 	if (static_branch_unlikely(&amp;netstamp_needed_key))</div><div class='del'>-		__net_timestamp(skb);</div><div class='add'>+		skb-&gt;tstamp = ktime_get_real();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define net_timestamp_check(COND, SKB)				\</div><div class='ctx'> 	if (static_branch_unlikely(&amp;netstamp_needed_key)) {	\</div><div class='ctx'> 		if ((COND) &amp;&amp; !(SKB)-&gt;tstamp)			\</div><div class='del'>-			__net_timestamp(SKB);			\</div><div class='add'>+			(SKB)-&gt;tstamp = ktime_get_real();	\</div><div class='ctx'> 	}							\</div><div class='ctx'> </div><div class='ctx'> bool is_skb_forwardable(const struct net_device *dev, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len;</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	len = dev-&gt;mtu + dev-&gt;hard_header_len + VLAN_HLEN;</div><div class='del'>-	if (skb-&gt;len &lt;= len)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* if TSO is enabled, we don't care about the length as the packet</div><div class='del'>-	 * could be forwarded without being segmented before</div><div class='del'>-	 */</div><div class='del'>-	if (skb_is_gso(skb))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	return __is_skb_forwardable(dev, skb, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(is_skb_forwardable);</div><div class='ctx'> </div><div class='del'>-int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+static int __dev_forward_skb2(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			      bool check_mtu)</div><div class='ctx'> {</div><div class='del'>-	int ret = ____dev_forward_skb(dev, skb);</div><div class='add'>+	int ret = ____dev_forward_skb(dev, skb, check_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!ret)) {</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='hunk'>@@ -1887,6 +2427,11 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return __dev_forward_skb2(dev, skb, true);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(__dev_forward_skb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1913,9 +2458,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_forward_skb);</div><div class='ctx'> </div><div class='del'>-static inline int deliver_skb(struct sk_buff *skb,</div><div class='del'>-			      struct packet_type *pt_prev,</div><div class='del'>-			      struct net_device *orig_dev)</div><div class='add'>+int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return __dev_forward_skb2(dev, skb, false) ?: netif_rx_internal(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int deliver_skb(struct sk_buff *skb,</div><div class='add'>+		       struct packet_type *pt_prev,</div><div class='add'>+		       struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1934,7 +2484,7 @@ static inline void deliver_ptype_list_skb(struct sk_buff *skb,</div><div class='ctx'> 	list_for_each_entry_rcu(ptype, ptype_list, list) {</div><div class='ctx'> 		if (ptype-&gt;type != type)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (pt_prev)</div><div class='add'>+		if (unlikely(pt_prev))</div><div class='ctx'> 			deliver_skb(skb, pt_prev, orig_dev);</div><div class='ctx'> 		pt_prev = ptype;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1954,6 +2504,23 @@ static inline bool skb_loop_sk(struct packet_type *ptype, struct sk_buff *skb)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_nit_active_rcu - return true if any network interface taps are in use</div><div class='add'>+ *</div><div class='add'>+ * The caller must hold the RCU lock</div><div class='add'>+ *</div><div class='add'>+ * @dev: network device to check for the presence of taps</div><div class='add'>+ */</div><div class='add'>+bool dev_nit_active_rcu(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Callers may hold either RCU or RCU BH lock */</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held() &amp;&amp; !rcu_read_lock_bh_held());</div><div class='add'>+</div><div class='add'>+	return !list_empty(&amp;dev_net(dev)-&gt;ptype_all) ||</div><div class='add'>+	       !list_empty(&amp;dev-&gt;ptype_all);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_nit_active_rcu);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Support routine. Sends outgoing frames to any network</div><div class='ctx'>  *	taps currently in use.</div><div class='hunk'>@@ -1961,21 +2528,24 @@ static inline bool skb_loop_sk(struct packet_type *ptype, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct packet_type *ptype;</div><div class='add'>+	struct packet_type *ptype, *pt_prev = NULL;</div><div class='add'>+	struct list_head *ptype_list;</div><div class='ctx'> 	struct sk_buff *skb2 = NULL;</div><div class='del'>-	struct packet_type *pt_prev = NULL;</div><div class='del'>-	struct list_head *ptype_list = &amp;ptype_all;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	ptype_list = &amp;dev_net_rcu(dev)-&gt;ptype_all;</div><div class='ctx'> again:</div><div class='ctx'> 	list_for_each_entry_rcu(ptype, ptype_list, list) {</div><div class='add'>+		if (READ_ONCE(ptype-&gt;ignore_outgoing))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		/* Never send packets back to the socket</div><div class='ctx'> 		 * they originated from - MvS (miquels@drinkel.ow.org)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (skb_loop_sk(ptype, skb))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (pt_prev) {</div><div class='add'>+		if (unlikely(pt_prev)) {</div><div class='ctx'> 			deliver_skb(skb2, pt_prev, skb-&gt;dev);</div><div class='ctx'> 			pt_prev = ptype;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2007,7 +2577,7 @@ again:</div><div class='ctx'> 		pt_prev = ptype;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ptype_list == &amp;ptype_all) {</div><div class='add'>+	if (ptype_list != &amp;dev-&gt;ptype_all) {</div><div class='ctx'> 		ptype_list = &amp;dev-&gt;ptype_all;</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2042,7 +2612,7 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)</div><div class='ctx'> </div><div class='ctx'> 	/* If TC0 is invalidated disable TC mapping */</div><div class='ctx'> 	if (tc-&gt;offset + tc-&gt;count &gt; txq) {</div><div class='del'>-		pr_warn("Number of in use tx queues changed invalidating tc mappings. Priority traffic classification disabled!\n");</div><div class='add'>+		netdev_warn(dev, "Number of in use tx queues changed invalidating tc mappings. Priority traffic classification disabled!\n");</div><div class='ctx'> 		dev-&gt;num_tc = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2053,8 +2623,8 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)</div><div class='ctx'> </div><div class='ctx'> 		tc = &amp;dev-&gt;tc_to_txq[q];</div><div class='ctx'> 		if (tc-&gt;offset + tc-&gt;count &gt; txq) {</div><div class='del'>-			pr_warn("Number of in use tx queues changed. Priority %i to tc mapping %i is no longer valid. Setting map to 0\n",</div><div class='del'>-				i, q);</div><div class='add'>+			netdev_warn(dev, "Number of in use tx queues changed. Priority %i to tc mapping %i is no longer valid. Setting map to 0\n",</div><div class='add'>+				    i, q);</div><div class='ctx'> 			netdev_set_prio_tc_map(dev, i, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2081,22 +2651,19 @@ int netdev_txq_to_tc(struct net_device *dev, unsigned int txq)</div><div class='ctx'> EXPORT_SYMBOL(netdev_txq_to_tc);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XPS</div><div class='del'>-struct static_key xps_needed __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(xps_needed);</div><div class='del'>-struct static_key xps_rxqs_needed __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(xps_rxqs_needed);</div><div class='add'>+static struct static_key xps_needed __read_mostly;</div><div class='add'>+static struct static_key xps_rxqs_needed __read_mostly;</div><div class='ctx'> static DEFINE_MUTEX(xps_map_mutex);</div><div class='ctx'> #define xmap_dereference(P)		\</div><div class='ctx'> 	rcu_dereference_protected((P), lockdep_is_held(&amp;xps_map_mutex))</div><div class='ctx'> </div><div class='ctx'> static bool remove_xps_queue(struct xps_dev_maps *dev_maps,</div><div class='del'>-			     int tci, u16 index)</div><div class='add'>+			     struct xps_dev_maps *old_maps, int tci, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct xps_map *map = NULL;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	if (dev_maps)</div><div class='del'>-		map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='add'>+	map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='ctx'> 	if (!map)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -2109,6 +2676,8 @@ static bool remove_xps_queue(struct xps_dev_maps *dev_maps,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (old_maps)</div><div class='add'>+			RCU_INIT_POINTER(old_maps-&gt;attr_map[tci], NULL);</div><div class='ctx'> 		RCU_INIT_POINTER(dev_maps-&gt;attr_map[tci], NULL);</div><div class='ctx'> 		kfree_rcu(map, rcu);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2121,7 +2690,7 @@ static bool remove_xps_queue_cpu(struct net_device *dev,</div><div class='ctx'> 				 struct xps_dev_maps *dev_maps,</div><div class='ctx'> 				 int cpu, u16 offset, u16 count)</div><div class='ctx'> {</div><div class='del'>-	int num_tc = dev-&gt;num_tc ? : 1;</div><div class='add'>+	int num_tc = dev_maps-&gt;num_tc;</div><div class='ctx'> 	bool active = false;</div><div class='ctx'> 	int tci;</div><div class='ctx'> </div><div class='hunk'>@@ -2129,7 +2698,7 @@ static bool remove_xps_queue_cpu(struct net_device *dev,</div><div class='ctx'> 		int i, j;</div><div class='ctx'> </div><div class='ctx'> 		for (i = count, j = offset; i--; j++) {</div><div class='del'>-			if (!remove_xps_queue(dev_maps, tci, j))</div><div class='add'>+			if (!remove_xps_queue(dev_maps, NULL, tci, j))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2139,69 +2708,56 @@ static bool remove_xps_queue_cpu(struct net_device *dev,</div><div class='ctx'> 	return active;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clean_xps_maps(struct net_device *dev, const unsigned long *mask,</div><div class='del'>-			   struct xps_dev_maps *dev_maps, unsigned int nr_ids,</div><div class='del'>-			   u16 offset, u16 count, bool is_rxqs_map)</div><div class='add'>+static void reset_xps_maps(struct net_device *dev,</div><div class='add'>+			   struct xps_dev_maps *dev_maps,</div><div class='add'>+			   enum xps_map_type type)</div><div class='add'>+{</div><div class='add'>+	static_key_slow_dec_cpuslocked(&amp;xps_needed);</div><div class='add'>+	if (type == XPS_RXQS)</div><div class='add'>+		static_key_slow_dec_cpuslocked(&amp;xps_rxqs_needed);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(dev-&gt;xps_maps[type], NULL);</div><div class='add'>+</div><div class='add'>+	kfree_rcu(dev_maps, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clean_xps_maps(struct net_device *dev, enum xps_map_type type,</div><div class='add'>+			   u16 offset, u16 count)</div><div class='ctx'> {</div><div class='add'>+	struct xps_dev_maps *dev_maps;</div><div class='ctx'> 	bool active = false;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, mask, nr_ids),</div><div class='del'>-	     j &lt; nr_ids;)</div><div class='del'>-		active |= remove_xps_queue_cpu(dev, dev_maps, j, offset,</div><div class='del'>-					       count);</div><div class='del'>-	if (!active) {</div><div class='del'>-		if (is_rxqs_map) {</div><div class='del'>-			RCU_INIT_POINTER(dev-&gt;xps_rxqs_map, NULL);</div><div class='del'>-		} else {</div><div class='del'>-			RCU_INIT_POINTER(dev-&gt;xps_cpus_map, NULL);</div><div class='add'>+	dev_maps = xmap_dereference(dev-&gt;xps_maps[type]);</div><div class='add'>+	if (!dev_maps)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			for (i = offset + (count - 1); count--; i--)</div><div class='del'>-				netdev_queue_numa_node_write(</div><div class='del'>-					netdev_get_tx_queue(dev, i),</div><div class='del'>-							NUMA_NO_NODE);</div><div class='del'>-		}</div><div class='del'>-		kfree_rcu(dev_maps, rcu);</div><div class='add'>+	for (j = 0; j &lt; dev_maps-&gt;nr_ids; j++)</div><div class='add'>+		active |= remove_xps_queue_cpu(dev, dev_maps, j, offset, count);</div><div class='add'>+	if (!active)</div><div class='add'>+		reset_xps_maps(dev, dev_maps, type);</div><div class='add'>+</div><div class='add'>+	if (type == XPS_CPUS) {</div><div class='add'>+		for (i = offset + (count - 1); count--; i--)</div><div class='add'>+			netdev_queue_numa_node_write(</div><div class='add'>+				netdev_get_tx_queue(dev, i), NUMA_NO_NODE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void netif_reset_xps_queues(struct net_device *dev, u16 offset,</div><div class='ctx'> 				   u16 count)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long *possible_mask = NULL;</div><div class='del'>-	struct xps_dev_maps *dev_maps;</div><div class='del'>-	unsigned int nr_ids;</div><div class='del'>-</div><div class='ctx'> 	if (!static_key_false(&amp;xps_needed))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cpus_read_lock();</div><div class='ctx'> 	mutex_lock(&amp;xps_map_mutex);</div><div class='ctx'> </div><div class='del'>-	if (static_key_false(&amp;xps_rxqs_needed)) {</div><div class='del'>-		dev_maps = xmap_dereference(dev-&gt;xps_rxqs_map);</div><div class='del'>-		if (dev_maps) {</div><div class='del'>-			nr_ids = dev-&gt;num_rx_queues;</div><div class='del'>-			clean_xps_maps(dev, possible_mask, dev_maps, nr_ids,</div><div class='del'>-				       offset, count, true);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (static_key_false(&amp;xps_rxqs_needed))</div><div class='add'>+		clean_xps_maps(dev, XPS_RXQS, offset, count);</div><div class='ctx'> </div><div class='del'>-	dev_maps = xmap_dereference(dev-&gt;xps_cpus_map);</div><div class='del'>-	if (!dev_maps)</div><div class='del'>-		goto out_no_maps;</div><div class='del'>-</div><div class='del'>-	if (num_possible_cpus() &gt; 1)</div><div class='del'>-		possible_mask = cpumask_bits(cpu_possible_mask);</div><div class='del'>-	nr_ids = nr_cpu_ids;</div><div class='del'>-	clean_xps_maps(dev, possible_mask, dev_maps, nr_ids, offset, count,</div><div class='del'>-		       false);</div><div class='add'>+	clean_xps_maps(dev, XPS_CPUS, offset, count);</div><div class='ctx'> </div><div class='del'>-out_no_maps:</div><div class='del'>-	if (static_key_enabled(&amp;xps_rxqs_needed))</div><div class='del'>-		static_key_slow_dec_cpuslocked(&amp;xps_rxqs_needed);</div><div class='del'>-</div><div class='del'>-	static_key_slow_dec_cpuslocked(&amp;xps_needed);</div><div class='ctx'> 	mutex_unlock(&amp;xps_map_mutex);</div><div class='ctx'> 	cpus_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -2251,18 +2807,39 @@ static struct xps_map *expand_xps_map(struct xps_map *map, int attr_index,</div><div class='ctx'> 	return new_map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Copy xps maps at a given index */</div><div class='add'>+static void xps_copy_dev_maps(struct xps_dev_maps *dev_maps,</div><div class='add'>+			      struct xps_dev_maps *new_dev_maps, int index,</div><div class='add'>+			      int tc, bool skip_tc)</div><div class='add'>+{</div><div class='add'>+	int i, tci = index * dev_maps-&gt;num_tc;</div><div class='add'>+	struct xps_map *map;</div><div class='add'>+</div><div class='add'>+	/* copy maps belonging to foreign traffic classes */</div><div class='add'>+	for (i = 0; i &lt; dev_maps-&gt;num_tc; i++, tci++) {</div><div class='add'>+		if (i == tc &amp;&amp; skip_tc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* fill in the new device map from the old device map */</div><div class='add'>+		map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='add'>+		RCU_INIT_POINTER(new_dev_maps-&gt;attr_map[tci], map);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Must be called under cpus_read_lock */</div><div class='ctx'> int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,</div><div class='del'>-			  u16 index, bool is_rxqs_map)</div><div class='add'>+			  u16 index, enum xps_map_type type)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long *online_mask = NULL, *possible_mask = NULL;</div><div class='del'>-	struct xps_dev_maps *dev_maps, *new_dev_maps = NULL;</div><div class='add'>+	struct xps_dev_maps *dev_maps, *new_dev_maps = NULL, *old_dev_maps = NULL;</div><div class='add'>+	const unsigned long *online_mask = NULL;</div><div class='add'>+	bool active = false, copy = false;</div><div class='ctx'> 	int i, j, tci, numa_node_id = -2;</div><div class='ctx'> 	int maps_sz, num_tc = 1, tc = 0;</div><div class='ctx'> 	struct xps_map *map, *new_map;</div><div class='del'>-	bool active = false;</div><div class='ctx'> 	unsigned int nr_ids;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(index &gt;= dev-&gt;num_tx_queues);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;num_tc) {</div><div class='ctx'> 		/* Do not allow XPS on subordinate device directly */</div><div class='ctx'> 		num_tc = dev-&gt;num_tc;</div><div class='hunk'>@@ -2278,38 +2855,48 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;xps_map_mutex);</div><div class='del'>-	if (is_rxqs_map) {</div><div class='add'>+</div><div class='add'>+	dev_maps = xmap_dereference(dev-&gt;xps_maps[type]);</div><div class='add'>+	if (type == XPS_RXQS) {</div><div class='ctx'> 		maps_sz = XPS_RXQ_DEV_MAPS_SIZE(num_tc, dev-&gt;num_rx_queues);</div><div class='del'>-		dev_maps = xmap_dereference(dev-&gt;xps_rxqs_map);</div><div class='ctx'> 		nr_ids = dev-&gt;num_rx_queues;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		maps_sz = XPS_CPU_DEV_MAPS_SIZE(num_tc);</div><div class='del'>-		if (num_possible_cpus() &gt; 1) {</div><div class='add'>+		if (num_possible_cpus() &gt; 1)</div><div class='ctx'> 			online_mask = cpumask_bits(cpu_online_mask);</div><div class='del'>-			possible_mask = cpumask_bits(cpu_possible_mask);</div><div class='del'>-		}</div><div class='del'>-		dev_maps = xmap_dereference(dev-&gt;xps_cpus_map);</div><div class='ctx'> 		nr_ids = nr_cpu_ids;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (maps_sz &lt; L1_CACHE_BYTES)</div><div class='ctx'> 		maps_sz = L1_CACHE_BYTES;</div><div class='ctx'> </div><div class='add'>+	/* The old dev_maps could be larger or smaller than the one we're</div><div class='add'>+	 * setting up now, as dev-&gt;num_tc or nr_ids could have been updated in</div><div class='add'>+	 * between. We could try to be smart, but let's be safe instead and only</div><div class='add'>+	 * copy foreign traffic classes if the two map sizes match.</div><div class='add'>+	 */</div><div class='add'>+	if (dev_maps &amp;&amp;</div><div class='add'>+	    dev_maps-&gt;num_tc == num_tc &amp;&amp; dev_maps-&gt;nr_ids == nr_ids)</div><div class='add'>+		copy = true;</div><div class='add'>+</div><div class='ctx'> 	/* allocate memory for queue storage */</div><div class='ctx'> 	for (j = -1; j = netif_attrmask_next_and(j, online_mask, mask, nr_ids),</div><div class='ctx'> 	     j &lt; nr_ids;) {</div><div class='del'>-		if (!new_dev_maps)</div><div class='del'>-			new_dev_maps = kzalloc(maps_sz, GFP_KERNEL);</div><div class='ctx'> 		if (!new_dev_maps) {</div><div class='del'>-			mutex_unlock(&amp;xps_map_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			new_dev_maps = kzalloc(maps_sz, GFP_KERNEL);</div><div class='add'>+			if (!new_dev_maps) {</div><div class='add'>+				mutex_unlock(&amp;xps_map_mutex);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			new_dev_maps-&gt;nr_ids = nr_ids;</div><div class='add'>+			new_dev_maps-&gt;num_tc = num_tc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tci = j * num_tc + tc;</div><div class='del'>-		map = dev_maps ? xmap_dereference(dev_maps-&gt;attr_map[tci]) :</div><div class='del'>-				 NULL;</div><div class='add'>+		map = copy ? xmap_dereference(dev_maps-&gt;attr_map[tci]) : NULL;</div><div class='ctx'> </div><div class='del'>-		map = expand_xps_map(map, j, index, is_rxqs_map);</div><div class='add'>+		map = expand_xps_map(map, j, index, type == XPS_RXQS);</div><div class='ctx'> 		if (!map)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -2319,29 +2906,24 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,</div><div class='ctx'> 	if (!new_dev_maps)</div><div class='ctx'> 		goto out_no_new_maps;</div><div class='ctx'> </div><div class='del'>-	static_key_slow_inc_cpuslocked(&amp;xps_needed);</div><div class='del'>-	if (is_rxqs_map)</div><div class='del'>-		static_key_slow_inc_cpuslocked(&amp;xps_rxqs_needed);</div><div class='add'>+	if (!dev_maps) {</div><div class='add'>+		/* Increment static keys at most once per type */</div><div class='add'>+		static_key_slow_inc_cpuslocked(&amp;xps_needed);</div><div class='add'>+		if (type == XPS_RXQS)</div><div class='add'>+			static_key_slow_inc_cpuslocked(&amp;xps_rxqs_needed);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, possible_mask, nr_ids),</div><div class='del'>-	     j &lt; nr_ids;) {</div><div class='del'>-		/* copy maps belonging to foreign traffic classes */</div><div class='del'>-		for (i = tc, tci = j * num_tc; dev_maps &amp;&amp; i--; tci++) {</div><div class='del'>-			/* fill in the new device map from the old device map */</div><div class='del'>-			map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			RCU_INIT_POINTER(new_dev_maps-&gt;attr_map[tci], map);</div><div class='del'>-		}</div><div class='add'>+	for (j = 0; j &lt; nr_ids; j++) {</div><div class='add'>+		bool skip_tc = false;</div><div class='ctx'> </div><div class='del'>-		/* We need to explicitly update tci as prevous loop</div><div class='del'>-		 * could break out early if dev_maps is NULL.</div><div class='del'>-		 */</div><div class='ctx'> 		tci = j * num_tc + tc;</div><div class='del'>-</div><div class='ctx'> 		if (netif_attr_test_mask(j, mask, nr_ids) &amp;&amp;</div><div class='ctx'> 		    netif_attr_test_online(j, online_mask, nr_ids)) {</div><div class='ctx'> 			/* add tx-queue to CPU/rx-queue maps */</div><div class='ctx'> 			int pos = 0;</div><div class='ctx'> </div><div class='add'>+			skip_tc = true;</div><div class='add'>+</div><div class='ctx'> 			map = xmap_dereference(new_dev_maps-&gt;attr_map[tci]);</div><div class='ctx'> 			while ((pos &lt; map-&gt;len) &amp;&amp; (map-&gt;queues[pos] != index))</div><div class='ctx'> 				pos++;</div><div class='hunk'>@@ -2349,83 +2931,81 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,</div><div class='ctx'> 			if (pos == map-&gt;len)</div><div class='ctx'> 				map-&gt;queues[map-&gt;len++] = index;</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-			if (!is_rxqs_map) {</div><div class='add'>+			if (type == XPS_CPUS) {</div><div class='ctx'> 				if (numa_node_id == -2)</div><div class='ctx'> 					numa_node_id = cpu_to_node(j);</div><div class='ctx'> 				else if (numa_node_id != cpu_to_node(j))</div><div class='ctx'> 					numa_node_id = -1;</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='del'>-		} else if (dev_maps) {</div><div class='del'>-			/* fill in the new device map from the old device map */</div><div class='del'>-			map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			RCU_INIT_POINTER(new_dev_maps-&gt;attr_map[tci], map);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* copy maps belonging to foreign traffic classes */</div><div class='del'>-		for (i = num_tc - tc, tci++; dev_maps &amp;&amp; --i; tci++) {</div><div class='del'>-			/* fill in the new device map from the old device map */</div><div class='del'>-			map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			RCU_INIT_POINTER(new_dev_maps-&gt;attr_map[tci], map);</div><div class='del'>-		}</div><div class='add'>+		if (copy)</div><div class='add'>+			xps_copy_dev_maps(dev_maps, new_dev_maps, j, tc,</div><div class='add'>+					  skip_tc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_rxqs_map)</div><div class='del'>-		rcu_assign_pointer(dev-&gt;xps_rxqs_map, new_dev_maps);</div><div class='del'>-	else</div><div class='del'>-		rcu_assign_pointer(dev-&gt;xps_cpus_map, new_dev_maps);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;xps_maps[type], new_dev_maps);</div><div class='ctx'> </div><div class='ctx'> 	/* Cleanup old maps */</div><div class='ctx'> 	if (!dev_maps)</div><div class='ctx'> 		goto out_no_old_maps;</div><div class='ctx'> </div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, possible_mask, nr_ids),</div><div class='del'>-	     j &lt; nr_ids;) {</div><div class='del'>-		for (i = num_tc, tci = j * num_tc; i--; tci++) {</div><div class='del'>-			new_map = xmap_dereference(new_dev_maps-&gt;attr_map[tci]);</div><div class='add'>+	for (j = 0; j &lt; dev_maps-&gt;nr_ids; j++) {</div><div class='add'>+		for (i = num_tc, tci = j * dev_maps-&gt;num_tc; i--; tci++) {</div><div class='ctx'> 			map = xmap_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			if (map &amp;&amp; map != new_map)</div><div class='del'>-				kfree_rcu(map, rcu);</div><div class='add'>+			if (!map)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (copy) {</div><div class='add'>+				new_map = xmap_dereference(new_dev_maps-&gt;attr_map[tci]);</div><div class='add'>+				if (map == new_map)</div><div class='add'>+					continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			RCU_INIT_POINTER(dev_maps-&gt;attr_map[tci], NULL);</div><div class='add'>+			kfree_rcu(map, rcu);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree_rcu(dev_maps, rcu);</div><div class='add'>+	old_dev_maps = dev_maps;</div><div class='ctx'> </div><div class='ctx'> out_no_old_maps:</div><div class='ctx'> 	dev_maps = new_dev_maps;</div><div class='ctx'> 	active = true;</div><div class='ctx'> </div><div class='ctx'> out_no_new_maps:</div><div class='del'>-	if (!is_rxqs_map) {</div><div class='add'>+	if (type == XPS_CPUS)</div><div class='ctx'> 		/* update Tx queue numa node */</div><div class='ctx'> 		netdev_queue_numa_node_write(netdev_get_tx_queue(dev, index),</div><div class='ctx'> 					     (numa_node_id &gt;= 0) ?</div><div class='ctx'> 					     numa_node_id : NUMA_NO_NODE);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_maps)</div><div class='ctx'> 		goto out_no_maps;</div><div class='ctx'> </div><div class='ctx'> 	/* removes tx-queue from unused CPUs/rx-queues */</div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, possible_mask, nr_ids),</div><div class='del'>-	     j &lt; nr_ids;) {</div><div class='del'>-		for (i = tc, tci = j * num_tc; i--; tci++)</div><div class='del'>-			active |= remove_xps_queue(dev_maps, tci, index);</div><div class='del'>-		if (!netif_attr_test_mask(j, mask, nr_ids) ||</div><div class='del'>-		    !netif_attr_test_online(j, online_mask, nr_ids))</div><div class='del'>-			active |= remove_xps_queue(dev_maps, tci, index);</div><div class='del'>-		for (i = num_tc - tc, tci++; --i; tci++)</div><div class='del'>-			active |= remove_xps_queue(dev_maps, tci, index);</div><div class='add'>+	for (j = 0; j &lt; dev_maps-&gt;nr_ids; j++) {</div><div class='add'>+		tci = j * dev_maps-&gt;num_tc;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; dev_maps-&gt;num_tc; i++, tci++) {</div><div class='add'>+			if (i == tc &amp;&amp;</div><div class='add'>+			    netif_attr_test_mask(j, mask, dev_maps-&gt;nr_ids) &amp;&amp;</div><div class='add'>+			    netif_attr_test_online(j, online_mask, dev_maps-&gt;nr_ids))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			active |= remove_xps_queue(dev_maps,</div><div class='add'>+						   copy ? old_dev_maps : NULL,</div><div class='add'>+						   tci, index);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (old_dev_maps)</div><div class='add'>+		kfree_rcu(old_dev_maps, rcu);</div><div class='add'>+</div><div class='ctx'> 	/* free map if not active */</div><div class='del'>-	if (!active) {</div><div class='del'>-		if (is_rxqs_map)</div><div class='del'>-			RCU_INIT_POINTER(dev-&gt;xps_rxqs_map, NULL);</div><div class='del'>-		else</div><div class='del'>-			RCU_INIT_POINTER(dev-&gt;xps_cpus_map, NULL);</div><div class='del'>-		kfree_rcu(dev_maps, rcu);</div><div class='del'>-	}</div><div class='add'>+	if (!active)</div><div class='add'>+		reset_xps_maps(dev, dev_maps, type);</div><div class='ctx'> </div><div class='ctx'> out_no_maps:</div><div class='ctx'> 	mutex_unlock(&amp;xps_map_mutex);</div><div class='hunk'>@@ -2433,11 +3013,10 @@ out_no_maps:</div><div class='ctx'> 	return 0;</div><div class='ctx'> error:</div><div class='ctx'> 	/* remove any maps that we added */</div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, possible_mask, nr_ids),</div><div class='del'>-	     j &lt; nr_ids;) {</div><div class='add'>+	for (j = 0; j &lt; nr_ids; j++) {</div><div class='ctx'> 		for (i = num_tc, tci = j * num_tc; i--; tci++) {</div><div class='ctx'> 			new_map = xmap_dereference(new_dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			map = dev_maps ?</div><div class='add'>+			map = copy ?</div><div class='ctx'> 			      xmap_dereference(dev_maps-&gt;attr_map[tci]) :</div><div class='ctx'> 			      NULL;</div><div class='ctx'> 			if (new_map &amp;&amp; new_map != map)</div><div class='hunk'>@@ -2458,7 +3037,7 @@ int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	cpus_read_lock();</div><div class='del'>-	ret =  __netif_set_xps_queue(dev, cpumask_bits(mask), index, false);</div><div class='add'>+	ret =  __netif_set_xps_queue(dev, cpumask_bits(mask), index, XPS_CPUS);</div><div class='ctx'> 	cpus_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2600,7 +3179,7 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;reg_state == NETREG_REGISTERED ||</div><div class='ctx'> 	    dev-&gt;reg_state == NETREG_UNREGISTERING) {</div><div class='del'>-		ASSERT_RTNL();</div><div class='add'>+		netdev_ops_assert_locked(dev);</div><div class='ctx'> </div><div class='ctx'> 		rc = netdev_queue_update_kobjects(dev, dev-&gt;real_num_tx_queues,</div><div class='ctx'> 						  txq);</div><div class='hunk'>@@ -2610,6 +3189,10 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)</div><div class='ctx'> 		if (dev-&gt;num_tc)</div><div class='ctx'> 			netif_setup_tc(dev, txq);</div><div class='ctx'> </div><div class='add'>+		net_shaper_set_real_num_tx_queues(dev, txq);</div><div class='add'>+</div><div class='add'>+		dev_qdisc_change_real_num_tx(dev, txq);</div><div class='add'>+</div><div class='ctx'> 		dev-&gt;real_num_tx_queues = txq;</div><div class='ctx'> </div><div class='ctx'> 		if (disabling) {</div><div class='hunk'>@@ -2627,7 +3210,6 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_set_real_num_tx_queues);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SYSFS</div><div class='ctx'> /**</div><div class='ctx'>  *	netif_set_real_num_rx_queues - set actual number of RX queues used</div><div class='ctx'>  *	@dev: Network device</div><div class='hunk'>@@ -2646,7 +3228,7 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;reg_state == NETREG_REGISTERED) {</div><div class='del'>-		ASSERT_RTNL();</div><div class='add'>+		netdev_ops_assert_locked(dev);</div><div class='ctx'> </div><div class='ctx'> 		rc = net_rx_queue_update_kobjects(dev, dev-&gt;real_num_rx_queues,</div><div class='ctx'> 						  rxq);</div><div class='hunk'>@@ -2658,18 +3240,121 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_set_real_num_rx_queues);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	netif_set_real_num_queues - set actual number of RX and TX queues used</div><div class='add'>+ *	@dev: Network device</div><div class='add'>+ *	@txq: Actual number of TX queues</div><div class='add'>+ *	@rxq: Actual number of RX queues</div><div class='add'>+ *</div><div class='add'>+ *	Set the real number of both TX and RX queues.</div><div class='add'>+ *	Does nothing if the number of queues is already correct.</div><div class='add'>+ */</div><div class='add'>+int netif_set_real_num_queues(struct net_device *dev,</div><div class='add'>+			      unsigned int txq, unsigned int rxq)</div><div class='add'>+{</div><div class='add'>+	unsigned int old_rxq = dev-&gt;real_num_rx_queues;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (txq &lt; 1 || txq &gt; dev-&gt;num_tx_queues ||</div><div class='add'>+	    rxq &lt; 1 || rxq &gt; dev-&gt;num_rx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Start from increases, so the error path only does decreases -</div><div class='add'>+	 * decreases can't fail.</div><div class='add'>+	 */</div><div class='add'>+	if (rxq &gt; dev-&gt;real_num_rx_queues) {</div><div class='add'>+		err = netif_set_real_num_rx_queues(dev, rxq);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (txq &gt; dev-&gt;real_num_tx_queues) {</div><div class='add'>+		err = netif_set_real_num_tx_queues(dev, txq);</div><div class='add'>+		if (err)</div><div class='add'>+			goto undo_rx;</div><div class='add'>+	}</div><div class='add'>+	if (rxq &lt; dev-&gt;real_num_rx_queues)</div><div class='add'>+		WARN_ON(netif_set_real_num_rx_queues(dev, rxq));</div><div class='add'>+	if (txq &lt; dev-&gt;real_num_tx_queues)</div><div class='add'>+		WARN_ON(netif_set_real_num_tx_queues(dev, txq));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+undo_rx:</div><div class='add'>+	WARN_ON(netif_set_real_num_rx_queues(dev, old_rxq));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_set_real_num_queues);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_set_tso_max_size() - set the max size of TSO frames supported</div><div class='add'>+ * @dev:	netdev to update</div><div class='add'>+ * @size:	max skb-&gt;len of a TSO frame</div><div class='add'>+ *</div><div class='add'>+ * Set the limit on the size of TSO super-frames the device can handle.</div><div class='add'>+ * Unless explicitly set the stack will assume the value of</div><div class='add'>+ * %GSO_LEGACY_MAX_SIZE.</div><div class='add'>+ */</div><div class='add'>+void netif_set_tso_max_size(struct net_device *dev, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;tso_max_size = min(GSO_MAX_SIZE, size);</div><div class='add'>+	if (size &lt; READ_ONCE(dev-&gt;gso_max_size))</div><div class='add'>+		netif_set_gso_max_size(dev, size);</div><div class='add'>+	if (size &lt; READ_ONCE(dev-&gt;gso_ipv4_max_size))</div><div class='add'>+		netif_set_gso_ipv4_max_size(dev, size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_set_tso_max_size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_set_tso_max_segs() - set the max number of segs supported for TSO</div><div class='add'>+ * @dev:	netdev to update</div><div class='add'>+ * @segs:	max number of TCP segments</div><div class='add'>+ *</div><div class='add'>+ * Set the limit on the number of TCP segments the device can generate from</div><div class='add'>+ * a single TSO super-frame.</div><div class='add'>+ * Unless explicitly set the stack will assume the value of %GSO_MAX_SEGS.</div><div class='add'>+ */</div><div class='add'>+void netif_set_tso_max_segs(struct net_device *dev, unsigned int segs)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;tso_max_segs = segs;</div><div class='add'>+	if (segs &lt; READ_ONCE(dev-&gt;gso_max_segs))</div><div class='add'>+		netif_set_gso_max_segs(dev, segs);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_set_tso_max_segs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_inherit_tso_max() - copy all TSO limits from a lower device to an upper</div><div class='add'>+ * @to:		netdev to update</div><div class='add'>+ * @from:	netdev from which to copy the limits</div><div class='add'>+ */</div><div class='add'>+void netif_inherit_tso_max(struct net_device *to, const struct net_device *from)</div><div class='add'>+{</div><div class='add'>+	netif_set_tso_max_size(to, from-&gt;tso_max_size);</div><div class='add'>+	netif_set_tso_max_segs(to, from-&gt;tso_max_segs);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_inherit_tso_max);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * netif_get_num_default_rss_queues - default number of RSS queues</div><div class='ctx'>  *</div><div class='del'>- * This routine should set an upper limit on the number of RSS queues</div><div class='del'>- * used by default by multiqueue devices.</div><div class='add'>+ * Default value is the number of physical cores if there are only 1 or 2, or</div><div class='add'>+ * divided by 2 if there are more.</div><div class='ctx'>  */</div><div class='ctx'> int netif_get_num_default_rss_queues(void)</div><div class='ctx'> {</div><div class='del'>-	return is_kdump_kernel() ?</div><div class='del'>-		1 : min_t(int, DEFAULT_MAX_NUM_RSS_QUEUES, num_online_cpus());</div><div class='add'>+	cpumask_var_t cpus;</div><div class='add'>+	int cpu, count = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(is_kdump_kernel() || !zalloc_cpumask_var(&amp;cpus, GFP_KERNEL)))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	cpumask_copy(cpus, cpu_online_mask);</div><div class='add'>+	for_each_cpu(cpu, cpus) {</div><div class='add'>+		++count;</div><div class='add'>+		cpumask_andnot(cpus, cpus, topology_sibling_cpumask(cpu));</div><div class='add'>+	}</div><div class='add'>+	free_cpumask_var(cpus);</div><div class='add'>+</div><div class='add'>+	return count &gt; 2 ? DIV_ROUND_UP(count, 2) : count;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_get_num_default_rss_queues);</div><div class='ctx'> </div><div class='hunk'>@@ -2689,13 +3374,20 @@ static void __netif_reschedule(struct Qdisc *q)</div><div class='ctx'> </div><div class='ctx'> void __netif_schedule(struct Qdisc *q)</div><div class='ctx'> {</div><div class='add'>+	/* If q-&gt;defer_list is not empty, at least one thread is</div><div class='add'>+	 * in __dev_xmit_skb() before llist_del_all(&amp;q-&gt;defer_list).</div><div class='add'>+	 * This thread will attempt to run the queue.</div><div class='add'>+	 */</div><div class='add'>+	if (!llist_empty(&amp;q-&gt;defer_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_set_bit(__QDISC_STATE_SCHED, &amp;q-&gt;state))</div><div class='ctx'> 		__netif_reschedule(q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__netif_schedule);</div><div class='ctx'> </div><div class='ctx'> struct dev_kfree_skb_cb {</div><div class='del'>-	enum skb_free_reason reason;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dev_kfree_skb_cb *get_kfree_skb_cb(const struct sk_buff *skb)</div><div class='hunk'>@@ -2706,7 +3398,7 @@ static struct dev_kfree_skb_cb *get_kfree_skb_cb(const struct sk_buff *skb)</div><div class='ctx'> void netif_schedule_queue(struct netdev_queue *txq)</div><div class='ctx'> {</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (!(txq-&gt;state &amp; QUEUE_STATE_ANY_XOFF)) {</div><div class='add'>+	if (!netif_xmit_stopped(txq)) {</div><div class='ctx'> 		struct Qdisc *q = rcu_dereference(txq-&gt;qdisc);</div><div class='ctx'> </div><div class='ctx'> 		__netif_schedule(q);</div><div class='hunk'>@@ -2728,7 +3420,7 @@ void netif_tx_wake_queue(struct netdev_queue *dev_queue)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_tx_wake_queue);</div><div class='ctx'> </div><div class='del'>-void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)</div><div class='add'>+void dev_kfree_skb_irq_reason(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2748,16 +3440,16 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)</div><div class='ctx'> 	raise_softirq_irqoff(NET_TX_SOFTIRQ);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__dev_kfree_skb_irq);</div><div class='add'>+EXPORT_SYMBOL(dev_kfree_skb_irq_reason);</div><div class='ctx'> </div><div class='del'>-void __dev_kfree_skb_any(struct sk_buff *skb, enum skb_free_reason reason)</div><div class='add'>+void dev_kfree_skb_any_reason(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	if (in_irq() || irqs_disabled())</div><div class='del'>-		__dev_kfree_skb_irq(skb, reason);</div><div class='add'>+	if (in_hardirq() || irqs_disabled())</div><div class='add'>+		dev_kfree_skb_irq_reason(skb, reason);</div><div class='ctx'> 	else</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__dev_kfree_skb_any);</div><div class='add'>+EXPORT_SYMBOL(dev_kfree_skb_any_reason);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2786,7 +3478,7 @@ void netif_device_attach(struct net_device *dev)</div><div class='ctx'> 	if (!test_and_set_bit(__LINK_STATE_PRESENT, &amp;dev-&gt;state) &amp;&amp;</div><div class='ctx'> 	    netif_running(dev)) {</div><div class='ctx'> 		netif_tx_wake_all_queues(dev);</div><div class='del'>-		__netdev_watchdog_up(dev);</div><div class='add'>+		netdev_watchdog_up(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_device_attach);</div><div class='hunk'>@@ -2808,10 +3500,19 @@ static u16 skb_tx_hash(const struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		qoffset = sb_dev-&gt;tc_to_txq[tc].offset;</div><div class='ctx'> 		qcount = sb_dev-&gt;tc_to_txq[tc].count;</div><div class='add'>+		if (unlikely(!qcount)) {</div><div class='add'>+			net_warn_ratelimited("%s: invalid qcount, qoffset %u for tc %u\n",</div><div class='add'>+					     sb_dev-&gt;name, qoffset, tc);</div><div class='add'>+			qoffset = 0;</div><div class='add'>+			qcount = dev-&gt;real_num_tx_queues;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_rx_queue_recorded(skb)) {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(qcount == 0);</div><div class='ctx'> 		hash = skb_get_rx_queue(skb);</div><div class='add'>+		if (hash &gt;= qoffset)</div><div class='add'>+			hash -= qoffset;</div><div class='ctx'> 		while (unlikely(hash &gt;= qcount))</div><div class='ctx'> 			hash -= qcount;</div><div class='ctx'> 		return hash + qoffset;</div><div class='hunk'>@@ -2820,7 +3521,7 @@ static u16 skb_tx_hash(const struct net_device *dev,</div><div class='ctx'> 	return (u16) reciprocal_scale(skb_get_hash(skb), qcount) + qoffset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void skb_warn_bad_offload(const struct sk_buff *skb)</div><div class='add'>+void skb_warn_bad_offload(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	static const netdev_features_t null_features;</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='hunk'>@@ -2835,12 +3536,10 @@ static void skb_warn_bad_offload(const struct sk_buff *skb)</div><div class='ctx'> 		else</div><div class='ctx'> 			name = netdev_name(dev);</div><div class='ctx'> 	}</div><div class='del'>-	WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d "</div><div class='del'>-	     "gso_type=%d ip_summed=%d\n",</div><div class='add'>+	skb_dump(KERN_WARNING, skb, false);</div><div class='add'>+	WARN(1, "%s: caps=(%pNF, %pNF)\n",</div><div class='ctx'> 	     name, dev ? &amp;dev-&gt;features : &amp;null_features,</div><div class='del'>-	     skb-&gt;sk ? &amp;skb-&gt;sk-&gt;sk_route_caps : &amp;null_features,</div><div class='del'>-	     skb-&gt;len, skb-&gt;data_len, skb_shinfo(skb)-&gt;gso_size,</div><div class='del'>-	     skb_shinfo(skb)-&gt;gso_type, skb-&gt;ip_summed);</div><div class='add'>+	     skb-&gt;sk ? &amp;skb-&gt;sk-&gt;sk_route_caps : &amp;null_features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2855,11 +3554,15 @@ int skb_checksum_help(struct sk_buff *skb)</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='ctx'> 		goto out_set_summed;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(skb_shinfo(skb)-&gt;gso_size)) {</div><div class='add'>+	if (unlikely(skb_is_gso(skb))) {</div><div class='ctx'> 		skb_warn_bad_offload(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb)) {</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Before computing a checksum, we should make sure no frag could</div><div class='ctx'> 	 * be modified by an external entity : checksum could be wrong.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2870,18 +3573,25 @@ int skb_checksum_help(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	offset = skb_checksum_start_offset(skb);</div><div class='del'>-	BUG_ON(offset &gt;= skb_headlen(skb));</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (unlikely(offset &gt;= skb_headlen(skb))) {</div><div class='add'>+		DO_ONCE_LITE(skb_dump, KERN_ERR, skb, false);</div><div class='add'>+		WARN_ONCE(true, "offset (%d) &gt;= skb_headlen() (%u)\n",</div><div class='add'>+			  offset, skb_headlen(skb));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	csum = skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='ctx'> </div><div class='ctx'> 	offset += skb-&gt;csum_offset;</div><div class='del'>-	BUG_ON(offset + sizeof(__sum16) &gt; skb_headlen(skb));</div><div class='del'>-</div><div class='del'>-	if (skb_cloned(skb) &amp;&amp;</div><div class='del'>-	    !skb_clone_writable(skb, offset + sizeof(__sum16))) {</div><div class='del'>-		ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+	if (unlikely(offset + sizeof(__sum16) &gt; skb_headlen(skb))) {</div><div class='add'>+		DO_ONCE_LITE(skb_dump, KERN_ERR, skb, false);</div><div class='add'>+		WARN_ONCE(true, "offset+2 (%zu) &gt; skb_headlen() (%u)\n",</div><div class='add'>+			  offset + sizeof(__sum16), skb_headlen(skb));</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	ret = skb_ensure_writable(skb, offset + sizeof(__sum16));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	*(__sum16 *)(skb-&gt;data + offset) = csum_fold(csum) ?: CSUM_MANGLED_0;</div><div class='ctx'> out_set_summed:</div><div class='hunk'>@@ -2891,9 +3601,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_checksum_help);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_CRC32C</div><div class='ctx'> int skb_crc32c_csum_help(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__le32 crc32c_csum;</div><div class='add'>+	u32 crc;</div><div class='ctx'> 	int ret = 0, offset, start;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='hunk'>@@ -2916,21 +3627,19 @@ int skb_crc32c_csum_help(struct sk_buff *skb)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (skb_cloned(skb) &amp;&amp;</div><div class='del'>-	    !skb_clone_writable(skb, offset + sizeof(__le32))) {</div><div class='del'>-		ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	crc32c_csum = cpu_to_le32(~__skb_checksum(skb, start,</div><div class='del'>-						  skb-&gt;len - start, ~(__u32)0,</div><div class='del'>-						  crc32c_csum_stub));</div><div class='del'>-	*(__le32 *)(skb-&gt;data + offset) = crc32c_csum;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	skb-&gt;csum_not_inet = 0;</div><div class='add'>+</div><div class='add'>+	ret = skb_ensure_writable(skb, offset + sizeof(__le32));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	crc = ~skb_crc32c(skb, start, skb-&gt;len - start, ~0);</div><div class='add'>+	*(__le32 *)(skb-&gt;data + offset) = cpu_to_le32(crc);</div><div class='add'>+	skb_reset_csum_not_inet(skb);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(skb_crc32c_csum_help);</div><div class='add'>+#endif /* CONFIG_NET_CRC32C */</div><div class='ctx'> </div><div class='ctx'> __be16 skb_network_protocol(struct sk_buff *skb, int *depth)</div><div class='ctx'> {</div><div class='hunk'>@@ -2947,120 +3656,22 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth)</div><div class='ctx'> 		type = eth-&gt;h_proto;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __vlan_get_protocol(skb, type, depth);</div><div class='add'>+	return vlan_get_protocol_and_depth(skb, type, depth);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	skb_mac_gso_segment - mac layer segmentation handler.</div><div class='del'>- *	@skb: buffer to segment</div><div class='del'>- *	@features: features for the output path (see dev-&gt;features)</div><div class='del'>- */</div><div class='del'>-struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,</div><div class='del'>-				    netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-	int vlan_depth = skb-&gt;mac_len;</div><div class='del'>-	__be16 type = skb_network_protocol(skb, &amp;vlan_depth);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!type))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	__skb_pull(skb, vlan_depth);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(ptype, &amp;offload_base, list) {</div><div class='del'>-		if (ptype-&gt;type == type &amp;&amp; ptype-&gt;callbacks.gso_segment) {</div><div class='del'>-			segs = ptype-&gt;callbacks.gso_segment(skb, features);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	__skb_push(skb, skb-&gt;data - skb_mac_header(skb));</div><div class='del'>-</div><div class='del'>-	return segs;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(skb_mac_gso_segment);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* openvswitch calls this on rx path, so we need a different check.</div><div class='del'>- */</div><div class='del'>-static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)</div><div class='del'>-{</div><div class='del'>-	if (tx_path)</div><div class='del'>-		return skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp;</div><div class='del'>-		       skb-&gt;ip_summed != CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;ip_summed == CHECKSUM_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	__skb_gso_segment - Perform segmentation on skb.</div><div class='del'>- *	@skb: buffer to segment</div><div class='del'>- *	@features: features for the output path (see dev-&gt;features)</div><div class='del'>- *	@tx_path: whether it is called in TX path</div><div class='del'>- *</div><div class='del'>- *	This function segments the given skb and returns a list of segments.</div><div class='del'>- *</div><div class='del'>- *	It may return NULL if the skb requires no segmentation.  This is</div><div class='del'>- *	only possible when GSO is used for verifying header integrity.</div><div class='del'>- *</div><div class='del'>- *	Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb.</div><div class='del'>- */</div><div class='del'>-struct sk_buff *__skb_gso_segment(struct sk_buff *skb,</div><div class='del'>-				  netdev_features_t features, bool tx_path)</div><div class='add'>+/* Take action when hardware reception checksum errors are detected. */</div><div class='add'>+#ifdef CONFIG_BUG</div><div class='add'>+static void do_netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *segs;</div><div class='del'>-</div><div class='del'>-	if (unlikely(skb_needs_check(skb, tx_path))) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		/* We're going to init -&gt;check field in TCP or UDP header */</div><div class='del'>-		err = skb_cow_head(skb, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only report GSO partial support if it will enable us to</div><div class='del'>-	 * support segmentation on this frame without needing additional</div><div class='del'>-	 * work.</div><div class='del'>-	 */</div><div class='del'>-	if (features &amp; NETIF_F_GSO_PARTIAL) {</div><div class='del'>-		netdev_features_t partial_features = NETIF_F_GSO_ROBUST;</div><div class='del'>-		struct net_device *dev = skb-&gt;dev;</div><div class='del'>-</div><div class='del'>-		partial_features |= dev-&gt;features &amp; dev-&gt;gso_partial_features;</div><div class='del'>-		if (!skb_gso_ok(skb, features | partial_features))</div><div class='del'>-			features &amp;= ~NETIF_F_GSO_PARTIAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(SKB_SGO_CB_OFFSET +</div><div class='del'>-		     sizeof(*SKB_GSO_CB(skb)) &gt; sizeof(skb-&gt;cb));</div><div class='del'>-</div><div class='del'>-	SKB_GSO_CB(skb)-&gt;mac_offset = skb_headroom(skb);</div><div class='del'>-	SKB_GSO_CB(skb)-&gt;encap_level = 0;</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_reset_mac_len(skb);</div><div class='del'>-</div><div class='del'>-	segs = skb_mac_gso_segment(skb, features);</div><div class='del'>-</div><div class='del'>-	if (unlikely(skb_needs_check(skb, tx_path) &amp;&amp; !IS_ERR(segs)))</div><div class='del'>-		skb_warn_bad_offload(skb);</div><div class='del'>-</div><div class='del'>-	return segs;</div><div class='add'>+	netdev_err(dev, "hw csum failure\n");</div><div class='add'>+	skb_dump(KERN_ERR, skb, true);</div><div class='add'>+	dump_stack();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_gso_segment);</div><div class='ctx'> </div><div class='del'>-/* Take action when hardware reception checksum errors are detected. */</div><div class='del'>-#ifdef CONFIG_BUG</div><div class='del'>-void netdev_rx_csum_fault(struct net_device *dev)</div><div class='add'>+void netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (net_ratelimit()) {</div><div class='del'>-		pr_err("%s: hw csum failure\n", dev ? dev-&gt;name : "&lt;unknown&gt;");</div><div class='del'>-		dump_stack();</div><div class='del'>-	}</div><div class='add'>+	DO_ONCE_LITE(do_netdev_rx_csum_fault, dev, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_rx_csum_fault);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3074,8 +3685,9 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (!(dev-&gt;features &amp; NETIF_F_HIGHDMA)) {</div><div class='ctx'> 		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+			struct page *page = skb_frag_page(frag);</div><div class='ctx'> </div><div class='del'>-			if (PageHighMem(skb_frag_page(frag)))</div><div class='add'>+			if (page &amp;&amp; PageHighMem(page))</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3108,10 +3720,9 @@ static netdev_features_t net_mpls_features(struct sk_buff *skb,</div><div class='ctx'> static netdev_features_t harmonize_features(struct sk_buff *skb,</div><div class='ctx'> 	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	int tmp;</div><div class='ctx'> 	__be16 type;</div><div class='ctx'> </div><div class='del'>-	type = skb_network_protocol(skb, &amp;tmp);</div><div class='add'>+	type = skb_network_protocol(skb, NULL);</div><div class='ctx'> 	features = net_mpls_features(skb, features, type);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed != CHECKSUM_NONE &amp;&amp;</div><div class='hunk'>@@ -3145,9 +3756,17 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	u16 gso_segs = skb_shinfo(skb)-&gt;gso_segs;</div><div class='ctx'> </div><div class='del'>-	if (gso_segs &gt; dev-&gt;gso_max_segs)</div><div class='add'>+	if (gso_segs &gt; READ_ONCE(dev-&gt;gso_max_segs))</div><div class='add'>+		return features &amp; ~NETIF_F_GSO_MASK;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;len &gt;= netif_get_gso_max_size(dev, skb)))</div><div class='ctx'> 		return features &amp; ~NETIF_F_GSO_MASK;</div><div class='ctx'> </div><div class='add'>+	if (!skb_shinfo(skb)-&gt;gso_type) {</div><div class='add'>+		skb_warn_bad_offload(skb);</div><div class='add'>+		return features &amp; ~NETIF_F_GSO_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Support for GSO partial features requires software</div><div class='ctx'> 	 * intervention before we can actually process the packets</div><div class='ctx'> 	 * so we need to strip support for any partial features now</div><div class='hunk'>@@ -3157,8 +3776,14 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,</div><div class='ctx'> 	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_PARTIAL))</div><div class='ctx'> 		features &amp;= ~dev-&gt;gso_partial_features;</div><div class='ctx'> </div><div class='del'>-	/* Make sure to clear the IPv4 ID mangling feature if the</div><div class='del'>-	 * IPv4 header has the potential to be fragmented.</div><div class='add'>+	/* Make sure to clear the IPv4 ID mangling feature if the IPv4 header</div><div class='add'>+	 * has the potential to be fragmented so that TSO does not generate</div><div class='add'>+	 * segments with the same ID. For encapsulated packets, the ID mangling</div><div class='add'>+	 * feature is guaranteed not to use the same ID for the outer IPv4</div><div class='add'>+	 * headers of the generated segments if the headers have the potential</div><div class='add'>+	 * to be fragmented, so there is no need to clear the IPv4 ID mangling</div><div class='add'>+	 * feature (see the section about NETIF_F_TSO_MANGLEID in</div><div class='add'>+	 * segmentation-offloads.rst).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TCPV4) {</div><div class='ctx'> 		struct iphdr *iph = skb-&gt;encapsulation ?</div><div class='hunk'>@@ -3168,6 +3793,18 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,</div><div class='ctx'> 			features &amp;= ~NETIF_F_TSO_MANGLEID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* NETIF_F_IPV6_CSUM does not support IPv6 extension headers,</div><div class='add'>+	 * so neither does TSO that depends on it.</div><div class='add'>+	 */</div><div class='add'>+	if (features &amp; NETIF_F_IPV6_CSUM &amp;&amp;</div><div class='add'>+	    (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TCPV6 ||</div><div class='add'>+	     (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4 &amp;&amp;</div><div class='add'>+	      vlan_get_protocol(skb) == htons(ETH_P_IPV6))) &amp;&amp;</div><div class='add'>+	    skb_transport_header_was_set(skb) &amp;&amp;</div><div class='add'>+	    skb_network_header_len(skb) != sizeof(struct ipv6hdr) &amp;&amp;</div><div class='add'>+	    !ipv6_has_hopopt_jumbo(skb))</div><div class='add'>+		features &amp;= ~(NETIF_F_IPV6_CSUM | NETIF_F_TSO6 | NETIF_F_GSO_UDP_L4);</div><div class='add'>+</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3208,7 +3845,7 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;ptype_all) || !list_empty(&amp;dev-&gt;ptype_all))</div><div class='add'>+	if (dev_nit_active_rcu(dev))</div><div class='ctx'> 		dev_queue_xmit_nit(skb, dev);</div><div class='ctx'> </div><div class='ctx'> 	len = skb-&gt;len;</div><div class='hunk'>@@ -3228,7 +3865,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de</div><div class='ctx'> 	while (skb) {</div><div class='ctx'> 		struct sk_buff *next = skb-&gt;next;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+		skb_mark_not_on_list(skb);</div><div class='ctx'> 		rc = xmit_one(skb, dev, txq, next != NULL);</div><div class='ctx'> 		if (unlikely(!dev_xmit_complete(rc))) {</div><div class='ctx'> 			skb-&gt;next = next;</div><div class='hunk'>@@ -3236,7 +3873,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		skb = next;</div><div class='del'>-		if (netif_xmit_stopped(txq) &amp;&amp; skb) {</div><div class='add'>+		if (netif_tx_queue_stopped(txq) &amp;&amp; skb) {</div><div class='ctx'> 			rc = NETDEV_TX_BUSY;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3259,18 +3896,100 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,</div><div class='ctx'> int skb_csum_hwoffload_help(struct sk_buff *skb,</div><div class='ctx'> 			    const netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(skb-&gt;csum_not_inet))</div><div class='add'>+	if (unlikely(skb_csum_is_sctp(skb)))</div><div class='ctx'> 		return !!(features &amp; NETIF_F_SCTP_CRC) ? 0 :</div><div class='ctx'> 			skb_crc32c_csum_help(skb);</div><div class='ctx'> </div><div class='del'>-	return !!(features &amp; NETIF_F_CSUM_MASK) ? 0 : skb_checksum_help(skb);</div><div class='add'>+	if (features &amp; NETIF_F_HW_CSUM)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (features &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) {</div><div class='add'>+		if (vlan_get_protocol(skb) == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+		    skb_network_header_len(skb) != sizeof(struct ipv6hdr) &amp;&amp;</div><div class='add'>+		    !ipv6_has_hopopt_jumbo(skb))</div><div class='add'>+			goto sw_checksum;</div><div class='add'>+</div><div class='add'>+		switch (skb-&gt;csum_offset) {</div><div class='add'>+		case offsetof(struct tcphdr, check):</div><div class='add'>+		case offsetof(struct udphdr, check):</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+sw_checksum:</div><div class='add'>+	return skb_checksum_help(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_csum_hwoffload_help);</div><div class='ctx'> </div><div class='add'>+/* Checks if this SKB belongs to an HW offloaded socket</div><div class='add'>+ * and whether any SW fallbacks are required based on dev.</div><div class='add'>+ * Check decrypted mark in case skb_orphan() cleared socket.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,</div><div class='add'>+					    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SOCK_VALIDATE_XMIT</div><div class='add'>+	struct sk_buff *(*sk_validate)(struct sock *sk, struct net_device *dev,</div><div class='add'>+				       struct sk_buff *skb);</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+</div><div class='add'>+	sk_validate = NULL;</div><div class='add'>+	if (sk) {</div><div class='add'>+		if (sk_fullsock(sk))</div><div class='add'>+			sk_validate = sk-&gt;sk_validate_xmit_skb;</div><div class='add'>+		else if (sk_is_inet(sk) &amp;&amp; sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+			sk_validate = inet_twsk(sk)-&gt;tw_validate_xmit_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk_validate) {</div><div class='add'>+		skb = sk_validate(sk, dev, skb);</div><div class='add'>+	} else if (unlikely(skb_is_decrypted(skb))) {</div><div class='add'>+		pr_warn_ratelimited("unencrypted skb with no associated socket - dropping\n");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb,</div><div class='add'>+						    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+</div><div class='add'>+	if (likely(skb_frags_readable(skb)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netmem_tx)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	if (shinfo-&gt;nr_frags &gt; 0) {</div><div class='add'>+		niov = netmem_to_net_iov(skb_frag_netmem(&amp;shinfo-&gt;frags[0]));</div><div class='add'>+		if (net_is_devmem_iov(niov) &amp;&amp;</div><div class='add'>+		    net_devmem_iov_binding(niov)-&gt;dev != dev)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev, bool *again)</div><div class='ctx'> {</div><div class='ctx'> 	netdev_features_t features;</div><div class='ctx'> </div><div class='add'>+	skb = validate_xmit_unreadable_skb(skb, dev);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		goto out_null;</div><div class='add'>+</div><div class='ctx'> 	features = netif_skb_features(skb);</div><div class='ctx'> 	skb = validate_xmit_vlan(skb, features);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='hunk'>@@ -3318,7 +4037,7 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device</div><div class='ctx'> out_kfree_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> out_null:</div><div class='del'>-	atomic_long_inc(&amp;dev-&gt;tx_dropped);</div><div class='add'>+	dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3328,9 +4047,9 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d</div><div class='ctx'> </div><div class='ctx'> 	for (; skb != NULL; skb = next) {</div><div class='ctx'> 		next = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+		skb_mark_not_on_list(skb);</div><div class='ctx'> </div><div class='del'>-		/* in case skb wont be segmented, point to itself */</div><div class='add'>+		/* in case skb won't be segmented, point to itself */</div><div class='ctx'> 		skb-&gt;prev = skb;</div><div class='ctx'> </div><div class='ctx'> 		skb = validate_xmit_skb(skb, dev, again);</div><div class='hunk'>@@ -3350,122 +4069,194 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(validate_xmit_skb_list);</div><div class='ctx'> </div><div class='del'>-static void qdisc_pkt_len_init(struct sk_buff *skb)</div><div class='add'>+static void qdisc_pkt_len_segs_init(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	const struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+	u16 gso_segs;</div><div class='ctx'> </div><div class='ctx'> 	qdisc_skb_cb(skb)-&gt;pkt_len = skb-&gt;len;</div><div class='add'>+	if (!shinfo-&gt;gso_size) {</div><div class='add'>+		qdisc_skb_cb(skb)-&gt;pkt_segs = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qdisc_skb_cb(skb)-&gt;pkt_segs = gso_segs = shinfo-&gt;gso_segs;</div><div class='ctx'> </div><div class='ctx'> 	/* To get more precise estimation of bytes sent on wire,</div><div class='ctx'> 	 * we add to pkt_len the headers size of all segments</div><div class='ctx'> 	 */</div><div class='del'>-	if (shinfo-&gt;gso_size)  {</div><div class='add'>+	if (skb_transport_header_was_set(skb)) {</div><div class='ctx'> 		unsigned int hdr_len;</div><div class='del'>-		u16 gso_segs = shinfo-&gt;gso_segs;</div><div class='ctx'> </div><div class='ctx'> 		/* mac layer + network layer */</div><div class='del'>-		hdr_len = skb_transport_header(skb) - skb_mac_header(skb);</div><div class='add'>+		if (!skb-&gt;encapsulation)</div><div class='add'>+			hdr_len = skb_transport_offset(skb);</div><div class='add'>+		else</div><div class='add'>+			hdr_len = skb_inner_transport_offset(skb);</div><div class='ctx'> </div><div class='ctx'> 		/* + transport layer */</div><div class='ctx'> 		if (likely(shinfo-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {</div><div class='ctx'> 			const struct tcphdr *th;</div><div class='ctx'> 			struct tcphdr _tcphdr;</div><div class='ctx'> </div><div class='del'>-			th = skb_header_pointer(skb, skb_transport_offset(skb),</div><div class='add'>+			th = skb_header_pointer(skb, hdr_len,</div><div class='ctx'> 						sizeof(_tcphdr), &amp;_tcphdr);</div><div class='ctx'> 			if (likely(th))</div><div class='ctx'> 				hdr_len += __tcp_hdrlen(th);</div><div class='del'>-		} else {</div><div class='add'>+		} else if (shinfo-&gt;gso_type &amp; SKB_GSO_UDP_L4) {</div><div class='ctx'> 			struct udphdr _udphdr;</div><div class='ctx'> </div><div class='del'>-			if (skb_header_pointer(skb, skb_transport_offset(skb),</div><div class='add'>+			if (skb_header_pointer(skb, hdr_len,</div><div class='ctx'> 					       sizeof(_udphdr), &amp;_udphdr))</div><div class='ctx'> 				hdr_len += sizeof(struct udphdr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (shinfo-&gt;gso_type &amp; SKB_GSO_DODGY)</div><div class='del'>-			gso_segs = DIV_ROUND_UP(skb-&gt;len - hdr_len,</div><div class='del'>-						shinfo-&gt;gso_size);</div><div class='add'>+		if (unlikely(shinfo-&gt;gso_type &amp; SKB_GSO_DODGY)) {</div><div class='add'>+			int payload = skb-&gt;len - hdr_len;</div><div class='ctx'> </div><div class='add'>+			/* Malicious packet. */</div><div class='add'>+			if (payload &lt;= 0)</div><div class='add'>+				return;</div><div class='add'>+			gso_segs = DIV_ROUND_UP(payload, shinfo-&gt;gso_size);</div><div class='add'>+			shinfo-&gt;gso_segs = gso_segs;</div><div class='add'>+			qdisc_skb_cb(skb)-&gt;pkt_segs = gso_segs;</div><div class='add'>+		}</div><div class='ctx'> 		qdisc_skb_cb(skb)-&gt;pkt_len += (gso_segs - 1) * hdr_len;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dev_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *q,</div><div class='add'>+			     struct sk_buff **to_free,</div><div class='add'>+			     struct netdev_queue *txq)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = q-&gt;enqueue(skb, q, to_free) &amp; NET_XMIT_MASK;</div><div class='add'>+	if (rc == NET_XMIT_SUCCESS)</div><div class='add'>+		trace_qdisc_enqueue(q, txq, skb);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,</div><div class='ctx'> 				 struct net_device *dev,</div><div class='ctx'> 				 struct netdev_queue *txq)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *next, *to_free = NULL, *to_free2 = NULL;</div><div class='ctx'> 	spinlock_t *root_lock = qdisc_lock(q);</div><div class='del'>-	struct sk_buff *to_free = NULL;</div><div class='del'>-	bool contended;</div><div class='add'>+	struct llist_node *ll_list, *first_n;</div><div class='add'>+	unsigned long defer_count = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	qdisc_calculate_pkt_len(skb, q);</div><div class='ctx'> </div><div class='add'>+	tcf_set_drop_reason(skb, SKB_DROP_REASON_QDISC_DROP);</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;flags &amp; TCQ_F_NOLOCK) {</div><div class='del'>-		if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &amp;q-&gt;state))) {</div><div class='del'>-			__qdisc_drop(skb, &amp;to_free);</div><div class='del'>-			rc = NET_XMIT_DROP;</div><div class='del'>-		} else {</div><div class='del'>-			rc = q-&gt;enqueue(skb, q, &amp;to_free) &amp; NET_XMIT_MASK;</div><div class='del'>-			qdisc_run(q);</div><div class='add'>+		if (q-&gt;flags &amp; TCQ_F_CAN_BYPASS &amp;&amp; nolock_qdisc_is_empty(q) &amp;&amp;</div><div class='add'>+		    qdisc_run_begin(q)) {</div><div class='add'>+			/* Retest nolock_qdisc_is_empty() within the protection</div><div class='add'>+			 * of q-&gt;seqlock to protect from racing with requeuing.</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(!nolock_qdisc_is_empty(q))) {</div><div class='add'>+				rc = dev_qdisc_enqueue(skb, q, &amp;to_free, txq);</div><div class='add'>+				__qdisc_run(q);</div><div class='add'>+				to_free2 = qdisc_run_end(q);</div><div class='add'>+</div><div class='add'>+				goto free_skbs;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			qdisc_bstats_cpu_update(q, skb);</div><div class='add'>+			if (sch_direct_xmit(skb, q, dev, txq, NULL, true) &amp;&amp;</div><div class='add'>+			    !nolock_qdisc_is_empty(q))</div><div class='add'>+				__qdisc_run(q);</div><div class='add'>+</div><div class='add'>+			to_free2 = qdisc_run_end(q);</div><div class='add'>+			rc = NET_XMIT_SUCCESS;</div><div class='add'>+			goto free_skbs;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(to_free))</div><div class='del'>-			kfree_skb_list(to_free);</div><div class='del'>-		return rc;</div><div class='add'>+		rc = dev_qdisc_enqueue(skb, q, &amp;to_free, txq);</div><div class='add'>+		to_free2 = qdisc_run(q);</div><div class='add'>+		goto free_skbs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Heuristic to force contended enqueues to serialize on a</div><div class='del'>-	 * separate lock before trying to get qdisc main lock.</div><div class='del'>-	 * This permits qdisc-&gt;running owner to get the lock more</div><div class='del'>-	 * often and dequeue packets faster.</div><div class='add'>+	/* Open code llist_add(&amp;skb-&gt;ll_node, &amp;q-&gt;defer_list) + queue limit.</div><div class='add'>+	 * In the try_cmpxchg() loop, we want to increment q-&gt;defer_count</div><div class='add'>+	 * at most once to limit the number of skbs in defer_list.</div><div class='add'>+	 * We perform the defer_count increment only if the list is not empty,</div><div class='add'>+	 * because some arches have slow atomic_long_inc_return().</div><div class='ctx'> 	 */</div><div class='del'>-	contended = qdisc_is_running(q);</div><div class='del'>-	if (unlikely(contended))</div><div class='del'>-		spin_lock(&amp;q-&gt;busylock);</div><div class='add'>+	first_n = READ_ONCE(q-&gt;defer_list.first);</div><div class='add'>+	do {</div><div class='add'>+		if (first_n &amp;&amp; !defer_count) {</div><div class='add'>+			defer_count = atomic_long_inc_return(&amp;q-&gt;defer_count);</div><div class='add'>+			if (unlikely(defer_count &gt; READ_ONCE(q-&gt;limit))) {</div><div class='add'>+				kfree_skb_reason(skb, SKB_DROP_REASON_QDISC_DROP);</div><div class='add'>+				return NET_XMIT_DROP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		skb-&gt;ll_node.next = first_n;</div><div class='add'>+	} while (!try_cmpxchg(&amp;q-&gt;defer_list.first, &amp;first_n, &amp;skb-&gt;ll_node));</div><div class='add'>+</div><div class='add'>+	/* If defer_list was not empty, we know the cpu which queued</div><div class='add'>+	 * the first skb will process the whole list for us.</div><div class='add'>+	 */</div><div class='add'>+	if (first_n)</div><div class='add'>+		return NET_XMIT_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(root_lock);</div><div class='add'>+</div><div class='add'>+	ll_list = llist_del_all(&amp;q-&gt;defer_list);</div><div class='add'>+	/* There is a small race because we clear defer_count not atomically</div><div class='add'>+	 * with the prior llist_del_all(). This means defer_list could grow</div><div class='add'>+	 * over q-&gt;limit.</div><div class='add'>+	 */</div><div class='add'>+	atomic_long_set(&amp;q-&gt;defer_count, 0);</div><div class='add'>+</div><div class='add'>+	ll_list = llist_reverse_order(ll_list);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &amp;q-&gt;state))) {</div><div class='del'>-		__qdisc_drop(skb, &amp;to_free);</div><div class='add'>+		llist_for_each_entry_safe(skb, next, ll_list, ll_node)</div><div class='add'>+			__qdisc_drop(skb, &amp;to_free);</div><div class='ctx'> 		rc = NET_XMIT_DROP;</div><div class='del'>-	} else if ((q-&gt;flags &amp; TCQ_F_CAN_BYPASS) &amp;&amp; !qdisc_qlen(q) &amp;&amp;</div><div class='del'>-		   qdisc_run_begin(q)) {</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	if ((q-&gt;flags &amp; TCQ_F_CAN_BYPASS) &amp;&amp; !qdisc_qlen(q) &amp;&amp;</div><div class='add'>+	    !llist_next(ll_list) &amp;&amp; qdisc_run_begin(q)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This is a work-conserving queue; there are no old skbs</div><div class='ctx'> 		 * waiting to be sent out; and the qdisc is not running -</div><div class='ctx'> 		 * xmit the skb directly.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(skb != llist_entry(ll_list,</div><div class='add'>+							  struct sk_buff,</div><div class='add'>+							  ll_node));</div><div class='ctx'> 		qdisc_bstats_update(q, skb);</div><div class='del'>-</div><div class='del'>-		if (sch_direct_xmit(skb, q, dev, txq, root_lock, true)) {</div><div class='del'>-			if (unlikely(contended)) {</div><div class='del'>-				spin_unlock(&amp;q-&gt;busylock);</div><div class='del'>-				contended = false;</div><div class='del'>-			}</div><div class='add'>+		if (sch_direct_xmit(skb, q, dev, txq, root_lock, true))</div><div class='ctx'> 			__qdisc_run(q);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		qdisc_run_end(q);</div><div class='add'>+		to_free2 = qdisc_run_end(q);</div><div class='ctx'> 		rc = NET_XMIT_SUCCESS;</div><div class='ctx'> 	} else {</div><div class='del'>-		rc = q-&gt;enqueue(skb, q, &amp;to_free) &amp; NET_XMIT_MASK;</div><div class='del'>-		if (qdisc_run_begin(q)) {</div><div class='del'>-			if (unlikely(contended)) {</div><div class='del'>-				spin_unlock(&amp;q-&gt;busylock);</div><div class='del'>-				contended = false;</div><div class='del'>-			}</div><div class='del'>-			__qdisc_run(q);</div><div class='del'>-			qdisc_run_end(q);</div><div class='add'>+		int count = 0;</div><div class='add'>+</div><div class='add'>+		llist_for_each_entry_safe(skb, next, ll_list, ll_node) {</div><div class='add'>+			prefetch(next);</div><div class='add'>+			prefetch(&amp;next-&gt;priority);</div><div class='add'>+			skb_mark_not_on_list(skb);</div><div class='add'>+			rc = dev_qdisc_enqueue(skb, q, &amp;to_free, txq);</div><div class='add'>+			count++;</div><div class='ctx'> 		}</div><div class='add'>+		to_free2 = qdisc_run(q);</div><div class='add'>+		if (count != 1)</div><div class='add'>+			rc = NET_XMIT_SUCCESS;</div><div class='ctx'> 	}</div><div class='add'>+unlock:</div><div class='ctx'> 	spin_unlock(root_lock);</div><div class='del'>-	if (unlikely(to_free))</div><div class='del'>-		kfree_skb_list(to_free);</div><div class='del'>-	if (unlikely(contended))</div><div class='del'>-		spin_unlock(&amp;q-&gt;busylock);</div><div class='add'>+</div><div class='add'>+free_skbs:</div><div class='add'>+	tcf_kfree_skb_list(to_free);</div><div class='add'>+	tcf_kfree_skb_list(to_free2);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3494,9 +4285,6 @@ static void skb_update_prio(struct sk_buff *skb)</div><div class='ctx'> #define skb_update_prio(skb)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(int, xmit_recursion);</div><div class='del'>-EXPORT_SYMBOL(xmit_recursion);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	dev_loopback_xmit - loop back @skb</div><div class='ctx'>  *	@net: network namespace this loopback is happening in</div><div class='hunk'>@@ -3508,67 +4296,266 @@ int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	__skb_pull(skb, skb_network_offset(skb));</div><div class='ctx'> 	skb-&gt;pkt_type = PACKET_LOOPBACK;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-	WARN_ON(!skb_dst(skb));</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_NONE)</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!skb_dst(skb));</div><div class='ctx'> 	skb_dst_force(skb);</div><div class='del'>-	netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_loopback_xmit);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_EGRESS</div><div class='del'>-static struct sk_buff *</div><div class='del'>-sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)</div><div class='add'>+static struct netdev_queue *</div><div class='add'>+netdev_tx_queue_mapping(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int qm = skb_get_queue_mapping(skb);</div><div class='add'>+</div><div class='add'>+	return netdev_get_tx_queue(dev, netdev_cap_txqueue(dev, qm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='add'>+static bool netdev_xmit_txqueue_skipped(void)</div><div class='add'>+{</div><div class='add'>+	return __this_cpu_read(softnet_data.xmit.skip_txqueue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netdev_xmit_skip_txqueue(bool skip)</div><div class='ctx'> {</div><div class='del'>-	struct mini_Qdisc *miniq = rcu_dereference_bh(dev-&gt;miniq_egress);</div><div class='del'>-	struct tcf_result cl_res;</div><div class='add'>+	__this_cpu_write(softnet_data.xmit.skip_txqueue, skip);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(netdev_xmit_skip_txqueue);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static bool netdev_xmit_txqueue_skipped(void)</div><div class='add'>+{</div><div class='add'>+	return current-&gt;net_xmit.skip_txqueue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netdev_xmit_skip_txqueue(bool skip)</div><div class='add'>+{</div><div class='add'>+	current-&gt;net_xmit.skip_txqueue = skip;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(netdev_xmit_skip_txqueue);</div><div class='add'>+#endif</div><div class='add'>+#endif /* CONFIG_NET_EGRESS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_XGRESS</div><div class='add'>+static int tc_run(struct tcx_entry *entry, struct sk_buff *skb,</div><div class='add'>+		  enum skb_drop_reason *drop_reason)</div><div class='add'>+{</div><div class='add'>+	int ret = TC_ACT_UNSPEC;</div><div class='add'>+#ifdef CONFIG_NET_CLS_ACT</div><div class='add'>+	struct mini_Qdisc *miniq = rcu_dereference_bh(entry-&gt;miniq);</div><div class='add'>+	struct tcf_result res;</div><div class='ctx'> </div><div class='ctx'> 	if (!miniq)</div><div class='del'>-		return skb;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/* qdisc_skb_cb(skb)-&gt;pkt_len was already set by the caller. */</div><div class='del'>-	mini_qdisc_bstats_cpu_update(miniq, skb);</div><div class='add'>+	/* Global bypass */</div><div class='add'>+	if (!static_branch_likely(&amp;tcf_sw_enabled_key))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Block-wise bypass */</div><div class='add'>+	if (tcf_block_bypass_sw(miniq-&gt;block))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tc_skb_cb(skb)-&gt;mru = 0;</div><div class='add'>+	qdisc_skb_cb(skb)-&gt;post_ct = false;</div><div class='add'>+	tcf_set_drop_reason(skb, *drop_reason);</div><div class='ctx'> </div><div class='del'>-	switch (tcf_classify(skb, miniq-&gt;filter_list, &amp;cl_res, false)) {</div><div class='add'>+	mini_qdisc_bstats_cpu_update(miniq, skb);</div><div class='add'>+	ret = tcf_classify(skb, miniq-&gt;block, miniq-&gt;filter_list, &amp;res, false);</div><div class='add'>+	/* Only tcf related quirks below. */</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case TC_ACT_SHOT:</div><div class='add'>+		*drop_reason = tcf_get_drop_reason(skb);</div><div class='add'>+		mini_qdisc_qstats_cpu_drop(miniq);</div><div class='add'>+		break;</div><div class='ctx'> 	case TC_ACT_OK:</div><div class='ctx'> 	case TC_ACT_RECLASSIFY:</div><div class='del'>-		skb-&gt;tc_index = TC_H_MIN(cl_res.classid);</div><div class='add'>+		skb-&gt;tc_index = TC_H_MIN(res.classid);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_NET_CLS_ACT */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_STATIC_KEY_FALSE(tcx_needed_key);</div><div class='add'>+</div><div class='add'>+void tcx_inc(void)</div><div class='add'>+{</div><div class='add'>+	static_branch_inc(&amp;tcx_needed_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcx_dec(void)</div><div class='add'>+{</div><div class='add'>+	static_branch_dec(&amp;tcx_needed_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline enum tcx_action_base</div><div class='add'>+tcx_run(const struct bpf_mprog_entry *entry, struct sk_buff *skb,</div><div class='add'>+	const bool needs_mac)</div><div class='add'>+{</div><div class='add'>+	const struct bpf_mprog_fp *fp;</div><div class='add'>+	const struct bpf_prog *prog;</div><div class='add'>+	int ret = TCX_NEXT;</div><div class='add'>+</div><div class='add'>+	if (needs_mac)</div><div class='add'>+		__skb_push(skb, skb-&gt;mac_len);</div><div class='add'>+	bpf_mprog_foreach_prog(entry, fp, prog) {</div><div class='add'>+		bpf_compute_data_pointers(skb);</div><div class='add'>+		ret = bpf_prog_run(prog, skb);</div><div class='add'>+		if (ret != TCX_NEXT)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (needs_mac)</div><div class='add'>+		__skb_pull(skb, skb-&gt;mac_len);</div><div class='add'>+	return tcx_action_code(skb, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline struct sk_buff *</div><div class='add'>+sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,</div><div class='add'>+		   struct net_device *orig_dev, bool *another)</div><div class='add'>+{</div><div class='add'>+	struct bpf_mprog_entry *entry = rcu_dereference_bh(skb-&gt;dev-&gt;tcx_ingress);</div><div class='add'>+	enum skb_drop_reason drop_reason = SKB_DROP_REASON_TC_INGRESS;</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	int sch_ret;</div><div class='add'>+</div><div class='add'>+	if (!entry)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+	if (unlikely(*pt_prev)) {</div><div class='add'>+		*ret = deliver_skb(skb, *pt_prev, orig_dev);</div><div class='add'>+		*pt_prev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qdisc_pkt_len_segs_init(skb);</div><div class='add'>+	tcx_set_ingress(skb, true);</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;tcx_needed_key)) {</div><div class='add'>+		sch_ret = tcx_run(entry, skb, true);</div><div class='add'>+		if (sch_ret != TC_ACT_UNSPEC)</div><div class='add'>+			goto ingress_verdict;</div><div class='add'>+	}</div><div class='add'>+	sch_ret = tc_run(tcx_entry(entry), skb, &amp;drop_reason);</div><div class='add'>+ingress_verdict:</div><div class='add'>+	switch (sch_ret) {</div><div class='add'>+	case TC_ACT_REDIRECT:</div><div class='add'>+		/* skb_mac_header check was done by BPF, so we can safely</div><div class='add'>+		 * push the L2 header back before redirecting to another</div><div class='add'>+		 * netdev.</div><div class='add'>+		 */</div><div class='add'>+		__skb_push(skb, skb-&gt;mac_len);</div><div class='add'>+		if (skb_do_redirect(skb) == -EAGAIN) {</div><div class='add'>+			__skb_pull(skb, skb-&gt;mac_len);</div><div class='add'>+			*another = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		*ret = NET_RX_SUCCESS;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	case TC_ACT_SHOT:</div><div class='del'>-		mini_qdisc_qstats_cpu_drop(miniq);</div><div class='del'>-		*ret = NET_XMIT_DROP;</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, drop_reason);</div><div class='add'>+		*ret = NET_RX_DROP;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	/* used by tc_run */</div><div class='ctx'> 	case TC_ACT_STOLEN:</div><div class='ctx'> 	case TC_ACT_QUEUED:</div><div class='ctx'> 	case TC_ACT_TRAP:</div><div class='del'>-		*ret = NET_XMIT_SUCCESS;</div><div class='ctx'> 		consume_skb(skb);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case TC_ACT_CONSUMED:</div><div class='add'>+		*ret = NET_RX_SUCCESS;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline struct sk_buff *</div><div class='add'>+sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bpf_mprog_entry *entry = rcu_dereference_bh(dev-&gt;tcx_egress);</div><div class='add'>+	enum skb_drop_reason drop_reason = SKB_DROP_REASON_TC_EGRESS;</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	int sch_ret;</div><div class='add'>+</div><div class='add'>+	if (!entry)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+	/* qdisc_skb_cb(skb)-&gt;pkt_len &amp; tcx_set_ingress() was</div><div class='add'>+	 * already set by the caller.</div><div class='add'>+	 */</div><div class='add'>+	if (static_branch_unlikely(&amp;tcx_needed_key)) {</div><div class='add'>+		sch_ret = tcx_run(entry, skb, false);</div><div class='add'>+		if (sch_ret != TC_ACT_UNSPEC)</div><div class='add'>+			goto egress_verdict;</div><div class='add'>+	}</div><div class='add'>+	sch_ret = tc_run(tcx_entry(entry), skb, &amp;drop_reason);</div><div class='add'>+egress_verdict:</div><div class='add'>+	switch (sch_ret) {</div><div class='ctx'> 	case TC_ACT_REDIRECT:</div><div class='ctx'> 		/* No need to push/pop skb's mac_header here on egress! */</div><div class='ctx'> 		skb_do_redirect(skb);</div><div class='ctx'> 		*ret = NET_XMIT_SUCCESS;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+		return NULL;</div><div class='add'>+	case TC_ACT_SHOT:</div><div class='add'>+		kfree_skb_reason(skb, drop_reason);</div><div class='add'>+		*ret = NET_XMIT_DROP;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+		return NULL;</div><div class='add'>+	/* used by tc_run */</div><div class='add'>+	case TC_ACT_STOLEN:</div><div class='add'>+	case TC_ACT_QUEUED:</div><div class='add'>+	case TC_ACT_TRAP:</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case TC_ACT_CONSUMED:</div><div class='add'>+		*ret = NET_XMIT_SUCCESS;</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 		return NULL;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_NET_EGRESS */</div><div class='add'>+#else</div><div class='add'>+static __always_inline struct sk_buff *</div><div class='add'>+sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,</div><div class='add'>+		   struct net_device *orig_dev, bool *another)</div><div class='add'>+{</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline struct sk_buff *</div><div class='add'>+sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NET_XGRESS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XPS</div><div class='ctx'> static int __get_xps_queue_idx(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 			       struct xps_dev_maps *dev_maps, unsigned int tci)</div><div class='ctx'> {</div><div class='add'>+	int tc = netdev_get_prio_tc_map(dev, skb-&gt;priority);</div><div class='ctx'> 	struct xps_map *map;</div><div class='ctx'> 	int queue_index = -1;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;num_tc) {</div><div class='del'>-		tci *= dev-&gt;num_tc;</div><div class='del'>-		tci += netdev_get_prio_tc_map(dev, skb-&gt;priority);</div><div class='del'>-	}</div><div class='add'>+	if (tc &gt;= dev_maps-&gt;num_tc || tci &gt;= dev_maps-&gt;nr_ids)</div><div class='add'>+		return queue_index;</div><div class='add'>+</div><div class='add'>+	tci *= dev_maps-&gt;num_tc;</div><div class='add'>+	tci += tc;</div><div class='ctx'> </div><div class='ctx'> 	map = rcu_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='ctx'> 	if (map) {</div><div class='hunk'>@@ -3599,18 +4586,18 @@ static int get_xps_queue(struct net_device *dev, struct net_device *sb_dev,</div><div class='ctx'> 	if (!static_key_false(&amp;xps_rxqs_needed))</div><div class='ctx'> 		goto get_cpus_map;</div><div class='ctx'> </div><div class='del'>-	dev_maps = rcu_dereference(sb_dev-&gt;xps_rxqs_map);</div><div class='add'>+	dev_maps = rcu_dereference(sb_dev-&gt;xps_maps[XPS_RXQS]);</div><div class='ctx'> 	if (dev_maps) {</div><div class='ctx'> 		int tci = sk_rx_queue_get(sk);</div><div class='ctx'> </div><div class='del'>-		if (tci &gt;= 0 &amp;&amp; tci &lt; dev-&gt;num_rx_queues)</div><div class='add'>+		if (tci &gt;= 0)</div><div class='ctx'> 			queue_index = __get_xps_queue_idx(dev, skb, dev_maps,</div><div class='ctx'> 							  tci);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> get_cpus_map:</div><div class='ctx'> 	if (queue_index &lt; 0) {</div><div class='del'>-		dev_maps = rcu_dereference(sb_dev-&gt;xps_cpus_map);</div><div class='add'>+		dev_maps = rcu_dereference(sb_dev-&gt;xps_maps[XPS_CPUS]);</div><div class='ctx'> 		if (dev_maps) {</div><div class='ctx'> 			unsigned int tci = skb-&gt;sender_cpu - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -3627,23 +4614,40 @@ get_cpus_map:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		     struct net_device *sb_dev,</div><div class='del'>-		     select_queue_fallback_t fallback)</div><div class='add'>+		     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_pick_tx_zero);</div><div class='ctx'> </div><div class='del'>-u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev,</div><div class='del'>-		       select_queue_fallback_t fallback)</div><div class='add'>+int sk_tx_queue_get(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return (u16)raw_smp_processor_id() % dev-&gt;real_num_tx_queues;</div><div class='add'>+	int resel, val;</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -1;</div><div class='add'>+	/* Paired with WRITE_ONCE() in sk_tx_queue_clear()</div><div class='add'>+	 * and sk_tx_queue_set().</div><div class='add'>+	 */</div><div class='add'>+	val = READ_ONCE(sk-&gt;sk_tx_queue_mapping);</div><div class='add'>+</div><div class='add'>+	if (val == NO_QUEUE_MAPPING)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!sk_fullsock(sk))</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	resel = READ_ONCE(sock_net(sk)-&gt;core.sysctl_txq_reselection);</div><div class='add'>+	if (resel &amp;&amp; time_is_before_jiffies(</div><div class='add'>+			READ_ONCE(sk-&gt;sk_tx_queue_mapping_jiffies) + resel))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_pick_tx_cpu_id);</div><div class='add'>+EXPORT_SYMBOL(sk_tx_queue_get);</div><div class='ctx'> </div><div class='del'>-static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev)</div><div class='add'>+u16 netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+		     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> 	int queue_index = sk_tx_queue_get(sk);</div><div class='hunk'>@@ -3657,8 +4661,7 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		if (new_index &lt; 0)</div><div class='ctx'> 			new_index = skb_tx_hash(dev, sb_dev, skb);</div><div class='ctx'> </div><div class='del'>-		if (queue_index != new_index &amp;&amp; sk &amp;&amp;</div><div class='del'>-		    sk_fullsock(sk) &amp;&amp;</div><div class='add'>+		if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp;</div><div class='ctx'> 		    rcu_access_pointer(sk-&gt;sk_dst_cache))</div><div class='ctx'> 			sk_tx_queue_set(sk, new_index);</div><div class='ctx'> </div><div class='hunk'>@@ -3667,10 +4670,11 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	return queue_index;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netdev_pick_tx);</div><div class='ctx'> </div><div class='del'>-struct netdev_queue *netdev_pick_tx(struct net_device *dev,</div><div class='del'>-				    struct sk_buff *skb,</div><div class='del'>-				    struct net_device *sb_dev)</div><div class='add'>+struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int queue_index = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3685,10 +4689,9 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,</div><div class='ctx'> 		const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 		if (ops-&gt;ndo_select_queue)</div><div class='del'>-			queue_index = ops-&gt;ndo_select_queue(dev, skb, sb_dev,</div><div class='del'>-							    __netdev_pick_tx);</div><div class='add'>+			queue_index = ops-&gt;ndo_select_queue(dev, skb, sb_dev);</div><div class='ctx'> 		else</div><div class='del'>-			queue_index = __netdev_pick_tx(dev, skb, sb_dev);</div><div class='add'>+			queue_index = netdev_pick_tx(dev, skb, sb_dev);</div><div class='ctx'> </div><div class='ctx'> 		queue_index = netdev_cap_txqueue(dev, queue_index);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3698,43 +4701,40 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__dev_queue_xmit - transmit a buffer</div><div class='del'>- *	@skb: buffer to transmit</div><div class='del'>- *	@sb_dev: suboordinate device used for L2 forwarding offload</div><div class='add'>+ * __dev_queue_xmit() - transmit a buffer</div><div class='add'>+ * @skb:	buffer to transmit</div><div class='add'>+ * @sb_dev:	suboordinate device used for L2 forwarding offload</div><div class='ctx'>  *</div><div class='del'>- *	Queue a buffer for transmission to a network device. The caller must</div><div class='del'>- *	have set the device and priority and built the buffer before calling</div><div class='del'>- *	this function. The function can be called from an interrupt.</div><div class='add'>+ * Queue a buffer for transmission to a network device. The caller must</div><div class='add'>+ * have set the device and priority and built the buffer before calling</div><div class='add'>+ * this function. The function can be called from an interrupt.</div><div class='ctx'>  *</div><div class='del'>- *	A negative errno code is returned on a failure. A success does not</div><div class='del'>- *	guarantee the frame will be transmitted as it may be dropped due</div><div class='del'>- *	to congestion or traffic shaping.</div><div class='add'>+ * When calling this method, interrupts MUST be enabled. This is because</div><div class='add'>+ * the BH enable code must have IRQs enabled so that it will not deadlock.</div><div class='ctx'>  *</div><div class='del'>- * -----------------------------------------------------------------------------------</div><div class='del'>- *      I notice this method can also return errors from the queue disciplines,</div><div class='del'>- *      including NET_XMIT_DROP, which is a positive value.  So, errors can also</div><div class='del'>- *      be positive.</div><div class='add'>+ * Regardless of the return value, the skb is consumed, so it is currently</div><div class='add'>+ * difficult to retry a send to this method. (You can bump the ref count</div><div class='add'>+ * before sending to hold a reference for retry if you are careful.)</div><div class='ctx'>  *</div><div class='del'>- *      Regardless of the return value, the skb is consumed, so it is currently</div><div class='del'>- *      difficult to retry a send to this method.  (You can bump the ref count</div><div class='del'>- *      before sending to hold a reference for retry if you are careful.)</div><div class='del'>- *</div><div class='del'>- *      When calling this method, interrupts MUST be enabled.  This is because</div><div class='del'>- *      the BH enable code must have IRQs enabled so that it will not deadlock.</div><div class='del'>- *          --BLG</div><div class='add'>+ * Return:</div><div class='add'>+ * * 0				- buffer successfully transmitted</div><div class='add'>+ * * positive qdisc return code	- NET_XMIT_DROP etc.</div><div class='add'>+ * * negative errno		- other errors</div><div class='ctx'>  */</div><div class='del'>-static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='add'>+int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	struct netdev_queue *txq;</div><div class='add'>+	struct netdev_queue *txq = NULL;</div><div class='ctx'> 	struct Qdisc *q;</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> 	bool again = false;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='add'>+	skb_assert_len(skb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_SCHED_TSTAMP))</div><div class='del'>-		__skb_tstamp_tx(skb, NULL, skb-&gt;sk, SCM_TSTAMP_SCHED);</div><div class='add'>+	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp;</div><div class='add'>+		     (SKBTX_SCHED_TSTAMP | SKBTX_BPF)))</div><div class='add'>+		__skb_tstamp_tx(skb, NULL, NULL, skb-&gt;sk, SCM_TSTAMP_SCHED);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable soft irqs for various locks below. Also</div><div class='ctx'> 	 * stops preemption for RCU.</div><div class='hunk'>@@ -3743,16 +4743,27 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='ctx'> </div><div class='ctx'> 	skb_update_prio(skb);</div><div class='ctx'> </div><div class='del'>-	qdisc_pkt_len_init(skb);</div><div class='del'>-#ifdef CONFIG_NET_CLS_ACT</div><div class='del'>-	skb-&gt;tc_at_ingress = 0;</div><div class='del'>-# ifdef CONFIG_NET_EGRESS</div><div class='add'>+	qdisc_pkt_len_segs_init(skb);</div><div class='add'>+	tcx_set_ingress(skb, false);</div><div class='add'>+#ifdef CONFIG_NET_EGRESS</div><div class='ctx'> 	if (static_branch_unlikely(&amp;egress_needed_key)) {</div><div class='add'>+		if (nf_hook_egress_active()) {</div><div class='add'>+			skb = nf_hook_egress(skb, &amp;rc, dev);</div><div class='add'>+			if (!skb)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_xmit_skip_txqueue(false);</div><div class='add'>+</div><div class='add'>+		nf_skip_egress(skb, true);</div><div class='ctx'> 		skb = sch_handle_egress(skb, &amp;rc, dev);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto out;</div><div class='add'>+		nf_skip_egress(skb, false);</div><div class='add'>+</div><div class='add'>+		if (netdev_xmit_txqueue_skipped())</div><div class='add'>+			txq = netdev_tx_queue_mapping(dev, skb);</div><div class='ctx'> 	}</div><div class='del'>-# endif</div><div class='ctx'> #endif</div><div class='ctx'> 	/* If device/qdisc don't need skb-&gt;dst, release it right now while</div><div class='ctx'> 	 * its hot in this cpu cache.</div><div class='hunk'>@@ -3762,7 +4773,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		skb_dst_force(skb);</div><div class='ctx'> </div><div class='del'>-	txq = netdev_pick_tx(dev, skb, sb_dev);</div><div class='add'>+	if (!txq)</div><div class='add'>+		txq = netdev_core_pick_tx(dev, skb, sb_dev);</div><div class='add'>+</div><div class='ctx'> 	q = rcu_dereference_bh(txq-&gt;qdisc);</div><div class='ctx'> </div><div class='ctx'> 	trace_net_dev_queue(skb);</div><div class='hunk'>@@ -3786,9 +4799,11 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='ctx'> 		int cpu = smp_processor_id(); /* ok because BHs are off */</div><div class='ctx'> </div><div class='del'>-		if (txq-&gt;xmit_lock_owner != cpu) {</div><div class='del'>-			if (unlikely(__this_cpu_read(xmit_recursion) &gt;</div><div class='del'>-				     XMIT_RECURSION_LIMIT))</div><div class='add'>+		/* Other cpus might concurrently change txq-&gt;xmit_lock_owner</div><div class='add'>+		 * to -1 or to their cpu id, but not to our id.</div><div class='add'>+		 */</div><div class='add'>+		if (READ_ONCE(txq-&gt;xmit_lock_owner) != cpu) {</div><div class='add'>+			if (dev_xmit_recursion())</div><div class='ctx'> 				goto recursion_alert;</div><div class='ctx'> </div><div class='ctx'> 			skb = validate_xmit_skb(skb, dev, &amp;again);</div><div class='hunk'>@@ -3798,9 +4813,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='ctx'> 			HARD_TX_LOCK(dev, txq, cpu);</div><div class='ctx'> </div><div class='ctx'> 			if (!netif_xmit_stopped(txq)) {</div><div class='del'>-				__this_cpu_inc(xmit_recursion);</div><div class='add'>+				dev_xmit_recursion_inc();</div><div class='ctx'> 				skb = dev_hard_start_xmit(skb, dev, txq, &amp;rc);</div><div class='del'>-				__this_cpu_dec(xmit_recursion);</div><div class='add'>+				dev_xmit_recursion_dec();</div><div class='ctx'> 				if (dev_xmit_complete(rc)) {</div><div class='ctx'> 					HARD_TX_UNLOCK(dev, txq);</div><div class='ctx'> 					goto out;</div><div class='hunk'>@@ -3822,27 +4837,16 @@ recursion_alert:</div><div class='ctx'> 	rc = -ENETDOWN;</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='del'>-	atomic_long_inc(&amp;dev-&gt;tx_dropped);</div><div class='add'>+	dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 	kfree_skb_list(skb);</div><div class='ctx'> 	return rc;</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__dev_queue_xmit);</div><div class='ctx'> </div><div class='del'>-int dev_queue_xmit(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return __dev_queue_xmit(skb, NULL);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_queue_xmit);</div><div class='del'>-</div><div class='del'>-int dev_queue_xmit_accel(struct sk_buff *skb, struct net_device *sb_dev)</div><div class='del'>-{</div><div class='del'>-	return __dev_queue_xmit(skb, sb_dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_queue_xmit_accel);</div><div class='del'>-</div><div class='del'>-int dev_direct_xmit(struct sk_buff *skb, u16 queue_id)</div><div class='add'>+int __dev_direct_xmit(struct sk_buff *skb, u16 queue_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 	struct sk_buff *orig_skb = skb;</div><div class='hunk'>@@ -3863,71 +4867,123 @@ int dev_direct_xmit(struct sk_buff *skb, u16 queue_id)</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> </div><div class='add'>+	dev_xmit_recursion_inc();</div><div class='ctx'> 	HARD_TX_LOCK(dev, txq, smp_processor_id());</div><div class='ctx'> 	if (!netif_xmit_frozen_or_drv_stopped(txq))</div><div class='ctx'> 		ret = netdev_start_xmit(skb, dev, txq, false);</div><div class='ctx'> 	HARD_TX_UNLOCK(dev, txq);</div><div class='add'>+	dev_xmit_recursion_dec();</div><div class='ctx'> </div><div class='ctx'> 	local_bh_enable();</div><div class='del'>-</div><div class='del'>-	if (!dev_xmit_complete(ret))</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> drop:</div><div class='del'>-	atomic_long_inc(&amp;dev-&gt;tx_dropped);</div><div class='add'>+	dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 	kfree_skb_list(skb);</div><div class='ctx'> 	return NET_XMIT_DROP;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_direct_xmit);</div><div class='add'>+EXPORT_SYMBOL(__dev_direct_xmit);</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  *			Receiver routines</div><div class='ctx'>  *************************************************************************/</div><div class='add'>+static DEFINE_PER_CPU(struct task_struct *, backlog_napi);</div><div class='ctx'> </div><div class='del'>-int netdev_max_backlog __read_mostly = 1000;</div><div class='del'>-EXPORT_SYMBOL(netdev_max_backlog);</div><div class='del'>-</div><div class='del'>-int netdev_tstamp_prequeue __read_mostly = 1;</div><div class='del'>-int netdev_budget __read_mostly = 300;</div><div class='del'>-unsigned int __read_mostly netdev_budget_usecs = 2000;</div><div class='ctx'> int weight_p __read_mostly = 64;           /* old backlog weight */</div><div class='ctx'> int dev_weight_rx_bias __read_mostly = 1;  /* bias for backlog weight */</div><div class='ctx'> int dev_weight_tx_bias __read_mostly = 1;  /* bias for output_queue quota */</div><div class='del'>-int dev_rx_weight __read_mostly = 64;</div><div class='del'>-int dev_tx_weight __read_mostly = 64;</div><div class='ctx'> </div><div class='ctx'> /* Called with irq disabled */</div><div class='ctx'> static inline void ____napi_schedule(struct softnet_data *sd,</div><div class='ctx'> 				     struct napi_struct *napi)</div><div class='ctx'> {</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+</div><div class='add'>+	if (test_bit(NAPI_STATE_THREADED, &amp;napi-&gt;state)) {</div><div class='add'>+		/* Paired with smp_mb__before_atomic() in</div><div class='add'>+		 * napi_enable()/netif_set_threaded().</div><div class='add'>+		 * Use READ_ONCE() to guarantee a complete</div><div class='add'>+		 * read on napi-&gt;thread. Only call</div><div class='add'>+		 * wake_up_process() when it's not NULL.</div><div class='add'>+		 */</div><div class='add'>+		thread = READ_ONCE(napi-&gt;thread);</div><div class='add'>+		if (thread) {</div><div class='add'>+			if (use_backlog_threads() &amp;&amp; thread == raw_cpu_read(backlog_napi))</div><div class='add'>+				goto use_local_napi;</div><div class='add'>+</div><div class='add'>+			set_bit(NAPI_STATE_SCHED_THREADED, &amp;napi-&gt;state);</div><div class='add'>+			wake_up_process(thread);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+use_local_napi:</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!list_empty(&amp;napi-&gt;poll_list));</div><div class='ctx'> 	list_add_tail(&amp;napi-&gt;poll_list, &amp;sd-&gt;poll_list);</div><div class='del'>-	__raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='add'>+	WRITE_ONCE(napi-&gt;list_owner, smp_processor_id());</div><div class='add'>+	/* If not called from net_rx_action()</div><div class='add'>+	 * we have to raise NET_RX_SOFTIRQ.</div><div class='add'>+	 */</div><div class='add'>+	if (!sd-&gt;in_net_rx_action)</div><div class='add'>+		raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='ctx'> </div><div class='del'>-/* One global table that all flow-based protocols share. */</div><div class='del'>-struct rps_sock_flow_table __rcu *rps_sock_flow_table __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(rps_sock_flow_table);</div><div class='del'>-u32 rps_cpu_mask __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(rps_cpu_mask);</div><div class='del'>-</div><div class='del'>-struct static_key rps_needed __read_mostly;</div><div class='add'>+struct static_key_false rps_needed __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(rps_needed);</div><div class='del'>-struct static_key rfs_needed __read_mostly;</div><div class='add'>+struct static_key_false rfs_needed __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(rfs_needed);</div><div class='ctx'> </div><div class='add'>+static u32 rfs_slot(u32 hash, const struct rps_dev_flow_table *flow_table)</div><div class='add'>+{</div><div class='add'>+	return hash_32(hash, flow_table-&gt;log);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+/**</div><div class='add'>+ * rps_flow_is_active - check whether the flow is recently active.</div><div class='add'>+ * @rflow: Specific flow to check activity.</div><div class='add'>+ * @flow_table: per-queue flowtable that @rflow belongs to.</div><div class='add'>+ * @cpu: CPU saved in @rflow.</div><div class='add'>+ *</div><div class='add'>+ * If the CPU has processed many packets since the flow's last activity</div><div class='add'>+ * (beyond 10 times the table size), the flow is considered stale.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if flow was recently active.</div><div class='add'>+ */</div><div class='add'>+static bool rps_flow_is_active(struct rps_dev_flow *rflow,</div><div class='add'>+			       struct rps_dev_flow_table *flow_table,</div><div class='add'>+			       unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int flow_last_active;</div><div class='add'>+	unsigned int sd_input_head;</div><div class='add'>+</div><div class='add'>+	if (cpu &gt;= nr_cpu_ids)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	sd_input_head = READ_ONCE(per_cpu(softnet_data, cpu).input_queue_head);</div><div class='add'>+	flow_last_active = READ_ONCE(rflow-&gt;last_qtail);</div><div class='add'>+</div><div class='add'>+	return (int)(sd_input_head - flow_last_active) &lt;</div><div class='add'>+		(int)(10 &lt;&lt; flow_table-&gt;log);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct rps_dev_flow *</div><div class='ctx'> set_rps_cpu(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-	    struct rps_dev_flow *rflow, u16 next_cpu)</div><div class='add'>+	    struct rps_dev_flow *rflow, u16 next_cpu, u32 hash,</div><div class='add'>+	    u32 flow_id)</div><div class='ctx'> {</div><div class='ctx'> 	if (next_cpu &lt; nr_cpu_ids) {</div><div class='add'>+		u32 head;</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 		struct netdev_rx_queue *rxqueue;</div><div class='ctx'> 		struct rps_dev_flow_table *flow_table;</div><div class='ctx'> 		struct rps_dev_flow *old_rflow;</div><div class='del'>-		u32 flow_id;</div><div class='add'>+		struct rps_dev_flow *tmp_rflow;</div><div class='add'>+		unsigned int tmp_cpu;</div><div class='ctx'> 		u16 rxq_index;</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3943,23 +4999,38 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		flow_table = rcu_dereference(rxqueue-&gt;rps_flow_table);</div><div class='ctx'> 		if (!flow_table)</div><div class='ctx'> 			goto out;</div><div class='del'>-		flow_id = skb_get_hash(skb) &amp; flow_table-&gt;mask;</div><div class='add'>+</div><div class='add'>+		tmp_rflow = &amp;flow_table-&gt;flows[flow_id];</div><div class='add'>+		tmp_cpu = READ_ONCE(tmp_rflow-&gt;cpu);</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(tmp_rflow-&gt;filter) != RPS_NO_FILTER) {</div><div class='add'>+			if (rps_flow_is_active(tmp_rflow, flow_table,</div><div class='add'>+					       tmp_cpu)) {</div><div class='add'>+				if (hash != READ_ONCE(tmp_rflow-&gt;hash) ||</div><div class='add'>+				    next_cpu == tmp_cpu)</div><div class='add'>+					goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		rc = dev-&gt;netdev_ops-&gt;ndo_rx_flow_steer(dev, skb,</div><div class='ctx'> 							rxq_index, flow_id);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='add'>+</div><div class='ctx'> 		old_rflow = rflow;</div><div class='del'>-		rflow = &amp;flow_table-&gt;flows[flow_id];</div><div class='del'>-		rflow-&gt;filter = rc;</div><div class='del'>-		if (old_rflow-&gt;filter == rflow-&gt;filter)</div><div class='del'>-			old_rflow-&gt;filter = RPS_NO_FILTER;</div><div class='add'>+		rflow = tmp_rflow;</div><div class='add'>+		WRITE_ONCE(rflow-&gt;filter, rc);</div><div class='add'>+		WRITE_ONCE(rflow-&gt;hash, hash);</div><div class='add'>+</div><div class='add'>+		if (old_rflow-&gt;filter == rc)</div><div class='add'>+			WRITE_ONCE(old_rflow-&gt;filter, RPS_NO_FILTER);</div><div class='ctx'> 	out:</div><div class='ctx'> #endif</div><div class='del'>-		rflow-&gt;last_qtail =</div><div class='del'>-			per_cpu(softnet_data, next_cpu).input_queue_head;</div><div class='add'>+		head = READ_ONCE(per_cpu(softnet_data, next_cpu).input_queue_head);</div><div class='add'>+		rps_input_queue_tail_save(&amp;rflow-&gt;last_qtail, head);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rflow-&gt;cpu = next_cpu;</div><div class='add'>+	WRITE_ONCE(rflow-&gt;cpu, next_cpu);</div><div class='ctx'> 	return rflow;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3976,6 +5047,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	struct rps_dev_flow_table *flow_table;</div><div class='ctx'> 	struct rps_map *map;</div><div class='ctx'> 	int cpu = -1;</div><div class='add'>+	u32 flow_id;</div><div class='ctx'> 	u32 tcpu;</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> </div><div class='hunk'>@@ -4004,23 +5076,26 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	if (!hash)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	sock_flow_table = rcu_dereference(rps_sock_flow_table);</div><div class='add'>+	sock_flow_table = rcu_dereference(net_hotdata.rps_sock_flow_table);</div><div class='ctx'> 	if (flow_table &amp;&amp; sock_flow_table) {</div><div class='ctx'> 		struct rps_dev_flow *rflow;</div><div class='ctx'> 		u32 next_cpu;</div><div class='ctx'> 		u32 ident;</div><div class='ctx'> </div><div class='del'>-		/* First check into global flow table if there is a match */</div><div class='del'>-		ident = sock_flow_table-&gt;ents[hash &amp; sock_flow_table-&gt;mask];</div><div class='del'>-		if ((ident ^ hash) &amp; ~rps_cpu_mask)</div><div class='add'>+		/* First check into global flow table if there is a match.</div><div class='add'>+		 * This READ_ONCE() pairs with WRITE_ONCE() from rps_record_sock_flow().</div><div class='add'>+		 */</div><div class='add'>+		ident = READ_ONCE(sock_flow_table-&gt;ents[hash &amp; sock_flow_table-&gt;mask]);</div><div class='add'>+		if ((ident ^ hash) &amp; ~net_hotdata.rps_cpu_mask)</div><div class='ctx'> 			goto try_rps;</div><div class='ctx'> </div><div class='del'>-		next_cpu = ident &amp; rps_cpu_mask;</div><div class='add'>+		next_cpu = ident &amp; net_hotdata.rps_cpu_mask;</div><div class='ctx'> </div><div class='ctx'> 		/* OK, now we know there is a match,</div><div class='ctx'> 		 * we can look at the local (per receive queue) flow table</div><div class='ctx'> 		 */</div><div class='del'>-		rflow = &amp;flow_table-&gt;flows[hash &amp; flow_table-&gt;mask];</div><div class='add'>+		flow_id = rfs_slot(hash, flow_table);</div><div class='add'>+		rflow = &amp;flow_table-&gt;flows[flow_id];</div><div class='ctx'> 		tcpu = rflow-&gt;cpu;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -4036,10 +5111,11 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(tcpu != next_cpu) &amp;&amp;</div><div class='ctx'> 		    (tcpu &gt;= nr_cpu_ids || !cpu_online(tcpu) ||</div><div class='del'>-		     ((int)(per_cpu(softnet_data, tcpu).input_queue_head -</div><div class='add'>+		     ((int)(READ_ONCE(per_cpu(softnet_data, tcpu).input_queue_head) -</div><div class='ctx'> 		      rflow-&gt;last_qtail)) &gt;= 0)) {</div><div class='ctx'> 			tcpu = next_cpu;</div><div class='del'>-			rflow = set_rps_cpu(dev, skb, rflow, next_cpu);</div><div class='add'>+			rflow = set_rps_cpu(dev, skb, rflow, next_cpu, hash,</div><div class='add'>+					    flow_id);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tcpu &lt; nr_cpu_ids &amp;&amp; cpu_online(tcpu)) {</div><div class='hunk'>@@ -4083,17 +5159,16 @@ bool rps_may_expire_flow(struct net_device *dev, u16 rxq_index,</div><div class='ctx'> 	struct rps_dev_flow_table *flow_table;</div><div class='ctx'> 	struct rps_dev_flow *rflow;</div><div class='ctx'> 	bool expire = true;</div><div class='del'>-	unsigned int cpu;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	flow_table = rcu_dereference(rxqueue-&gt;rps_flow_table);</div><div class='del'>-	if (flow_table &amp;&amp; flow_id &lt;= flow_table-&gt;mask) {</div><div class='add'>+	if (flow_table &amp;&amp; flow_id &lt; (1UL &lt;&lt; flow_table-&gt;log)) {</div><div class='add'>+		unsigned int cpu;</div><div class='add'>+</div><div class='ctx'> 		rflow = &amp;flow_table-&gt;flows[flow_id];</div><div class='ctx'> 		cpu = READ_ONCE(rflow-&gt;cpu);</div><div class='del'>-		if (rflow-&gt;filter == filter_id &amp;&amp; cpu &lt; nr_cpu_ids &amp;&amp;</div><div class='del'>-		    ((int)(per_cpu(softnet_data, cpu).input_queue_head -</div><div class='del'>-			   rflow-&gt;last_qtail) &lt;</div><div class='del'>-		     (int)(10 * flow_table-&gt;mask)))</div><div class='add'>+		if (READ_ONCE(rflow-&gt;filter) == filter_id &amp;&amp;</div><div class='add'>+		    rps_flow_is_active(rflow, flow_table, cpu))</div><div class='ctx'> 			expire = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -4109,44 +5184,87 @@ static void rps_trigger_softirq(void *data)</div><div class='ctx'> 	struct softnet_data *sd = data;</div><div class='ctx'> </div><div class='ctx'> 	____napi_schedule(sd, &amp;sd-&gt;backlog);</div><div class='del'>-	sd-&gt;received_rps++;</div><div class='add'>+	/* Pairs with READ_ONCE() in softnet_seq_show() */</div><div class='add'>+	WRITE_ONCE(sd-&gt;received_rps, sd-&gt;received_rps + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_RPS */</div><div class='ctx'> </div><div class='add'>+/* Called from hardirq (IPI) context */</div><div class='add'>+static void trigger_rx_softirq(void *data)</div><div class='add'>+{</div><div class='add'>+	struct softnet_data *sd = data;</div><div class='add'>+</div><div class='add'>+	__raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='add'>+	smp_store_release(&amp;sd-&gt;defer_ipi_scheduled, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Check if this softnet_data structure is another cpu one</div><div class='del'>- * If yes, queue it to our IPI list and return 1</div><div class='del'>- * If no, return 0</div><div class='add'>+ * After we queued a packet into sd-&gt;input_pkt_queue,</div><div class='add'>+ * we need to make sure this queue is serviced soon.</div><div class='add'>+ *</div><div class='add'>+ * - If this is another cpu queue, link it to our rps_ipi_list,</div><div class='add'>+ *   and make sure we will process rps_ipi_list from net_rx_action().</div><div class='add'>+ *</div><div class='add'>+ * - If this is our own queue, NAPI schedule our backlog.</div><div class='add'>+ *   Note that this also raises NET_RX_SOFTIRQ.</div><div class='ctx'>  */</div><div class='del'>-static int rps_ipi_queued(struct softnet_data *sd)</div><div class='add'>+static void napi_schedule_rps(struct softnet_data *sd)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RPS</div><div class='ctx'> 	struct softnet_data *mysd = this_cpu_ptr(&amp;softnet_data);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RPS</div><div class='ctx'> 	if (sd != mysd) {</div><div class='add'>+		if (use_backlog_threads()) {</div><div class='add'>+			__napi_schedule_irqoff(&amp;sd-&gt;backlog);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		sd-&gt;rps_ipi_next = mysd-&gt;rps_ipi_list;</div><div class='ctx'> 		mysd-&gt;rps_ipi_list = sd;</div><div class='ctx'> </div><div class='del'>-		__raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='del'>-		return 1;</div><div class='add'>+		/* If not called from net_rx_action() or napi_threaded_poll()</div><div class='add'>+		 * we have to raise NET_RX_SOFTIRQ.</div><div class='add'>+		 */</div><div class='add'>+		if (!mysd-&gt;in_net_rx_action &amp;&amp; !mysd-&gt;in_napi_threaded_poll)</div><div class='add'>+			__raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_RPS */</div><div class='del'>-	return 0;</div><div class='add'>+	__napi_schedule_irqoff(&amp;mysd-&gt;backlog);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kick_defer_list_purge(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct softnet_data *sd = &amp;per_cpu(softnet_data, cpu);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (use_backlog_threads()) {</div><div class='add'>+		backlog_lock_irq_save(sd, &amp;flags);</div><div class='add'>+</div><div class='add'>+		if (!__test_and_set_bit(NAPI_STATE_SCHED, &amp;sd-&gt;backlog.state))</div><div class='add'>+			__napi_schedule_irqoff(&amp;sd-&gt;backlog);</div><div class='add'>+</div><div class='add'>+		backlog_unlock_irq_restore(sd, &amp;flags);</div><div class='add'>+</div><div class='add'>+	} else if (!cmpxchg(&amp;sd-&gt;defer_ipi_scheduled, 0, 1)) {</div><div class='add'>+		smp_call_function_single_async(cpu, &amp;sd-&gt;defer_csd);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_FLOW_LIMIT</div><div class='ctx'> int netdev_flow_limit_table_len __read_mostly = (1 &lt;&lt; 12);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)</div><div class='add'>+static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen,</div><div class='add'>+			   int max_backlog)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_NET_FLOW_LIMIT</div><div class='del'>-	struct sd_flow_limit *fl;</div><div class='del'>-	struct softnet_data *sd;</div><div class='ctx'> 	unsigned int old_flow, new_flow;</div><div class='add'>+	const struct softnet_data *sd;</div><div class='add'>+	struct sd_flow_limit *fl;</div><div class='ctx'> </div><div class='del'>-	if (qlen &lt; (netdev_max_backlog &gt;&gt; 1))</div><div class='add'>+	if (likely(qlen &lt; (max_backlog &gt;&gt; 1)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	sd = this_cpu_ptr(&amp;softnet_data);</div><div class='hunk'>@@ -4154,7 +5272,7 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	fl = rcu_dereference(sd-&gt;flow_limit);</div><div class='ctx'> 	if (fl) {</div><div class='del'>-		new_flow = skb_get_hash(skb) &amp; (fl-&gt;num_buckets - 1);</div><div class='add'>+		new_flow = hash_32(skb_get_hash(skb), fl-&gt;log_buckets);</div><div class='ctx'> 		old_flow = fl-&gt;history[fl-&gt;history_head];</div><div class='ctx'> 		fl-&gt;history[fl-&gt;history_head] = new_flow;</div><div class='ctx'> </div><div class='hunk'>@@ -4165,7 +5283,8 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)</div><div class='ctx'> 			fl-&gt;buckets[old_flow]--;</div><div class='ctx'> </div><div class='ctx'> 		if (++fl-&gt;buckets[new_flow] &gt; (FLOW_LIMIT_HISTORY &gt;&gt; 1)) {</div><div class='del'>-			fl-&gt;count++;</div><div class='add'>+			/* Pairs with READ_ONCE() in softnet_seq_show() */</div><div class='add'>+			WRITE_ONCE(fl-&gt;count, fl-&gt;count + 1);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4182,46 +5301,52 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)</div><div class='ctx'> static int enqueue_to_backlog(struct sk_buff *skb, int cpu,</div><div class='ctx'> 			      unsigned int *qtail)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct softnet_data *sd;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int qlen;</div><div class='add'>+	int max_backlog;</div><div class='add'>+	u32 tail;</div><div class='ctx'> </div><div class='del'>-	sd = &amp;per_cpu(softnet_data, cpu);</div><div class='add'>+	reason = SKB_DROP_REASON_DEV_READY;</div><div class='add'>+	if (unlikely(!netif_running(skb-&gt;dev)))</div><div class='add'>+		goto bad_dev;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	sd = &amp;per_cpu(softnet_data, cpu);</div><div class='ctx'> </div><div class='del'>-	rps_lock(sd);</div><div class='del'>-	if (!netif_running(skb-&gt;dev))</div><div class='del'>-		goto drop;</div><div class='add'>+	qlen = skb_queue_len_lockless(&amp;sd-&gt;input_pkt_queue);</div><div class='add'>+	max_backlog = READ_ONCE(net_hotdata.max_backlog);</div><div class='add'>+	if (unlikely(qlen &gt; max_backlog) ||</div><div class='add'>+	    skb_flow_limit(skb, qlen, max_backlog))</div><div class='add'>+		goto cpu_backlog_drop;</div><div class='add'>+	backlog_lock_irq_save(sd, &amp;flags);</div><div class='ctx'> 	qlen = skb_queue_len(&amp;sd-&gt;input_pkt_queue);</div><div class='del'>-	if (qlen &lt;= netdev_max_backlog &amp;&amp; !skb_flow_limit(skb, qlen)) {</div><div class='del'>-		if (qlen) {</div><div class='del'>-enqueue:</div><div class='del'>-			__skb_queue_tail(&amp;sd-&gt;input_pkt_queue, skb);</div><div class='del'>-			input_queue_tail_incr_save(sd, qtail);</div><div class='del'>-			rps_unlock(sd);</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-			return NET_RX_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Schedule NAPI for backlog device</div><div class='del'>-		 * We can use non atomic operation since we own the queue lock</div><div class='del'>-		 */</div><div class='del'>-		if (!__test_and_set_bit(NAPI_STATE_SCHED, &amp;sd-&gt;backlog.state)) {</div><div class='del'>-			if (!rps_ipi_queued(sd))</div><div class='del'>-				____napi_schedule(sd, &amp;sd-&gt;backlog);</div><div class='add'>+	if (likely(qlen &lt;= max_backlog)) {</div><div class='add'>+		if (!qlen) {</div><div class='add'>+			/* Schedule NAPI for backlog device. We can use</div><div class='add'>+			 * non atomic operation as we own the queue lock.</div><div class='add'>+			 */</div><div class='add'>+			if (!__test_and_set_bit(NAPI_STATE_SCHED,</div><div class='add'>+						&amp;sd-&gt;backlog.state))</div><div class='add'>+				napi_schedule_rps(sd);</div><div class='ctx'> 		}</div><div class='del'>-		goto enqueue;</div><div class='del'>-	}</div><div class='add'>+		__skb_queue_tail(&amp;sd-&gt;input_pkt_queue, skb);</div><div class='add'>+		tail = rps_input_queue_tail_incr(sd);</div><div class='add'>+		backlog_unlock_irq_restore(sd, &amp;flags);</div><div class='ctx'> </div><div class='del'>-drop:</div><div class='del'>-	sd-&gt;dropped++;</div><div class='del'>-	rps_unlock(sd);</div><div class='add'>+		/* save the tail outside of the critical section */</div><div class='add'>+		rps_input_queue_tail_save(qtail, tail);</div><div class='add'>+		return NET_RX_SUCCESS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	backlog_unlock_irq_restore(sd, &amp;flags);</div><div class='ctx'> </div><div class='del'>-	atomic_long_inc(&amp;skb-&gt;dev-&gt;rx_dropped);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+cpu_backlog_drop:</div><div class='add'>+	reason = SKB_DROP_REASON_CPU_BACKLOG;</div><div class='add'>+	numa_drop_add(&amp;sd-&gt;drop_counters, 1);</div><div class='add'>+bad_dev:</div><div class='add'>+	dev_core_stats_rx_dropped_inc(skb-&gt;dev);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4248,76 +5373,93 @@ static struct netdev_rx_queue *netif_get_rxqueue(struct sk_buff *skb)</div><div class='ctx'> 	return rxqueue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 netif_receive_generic_xdp(struct sk_buff *skb,</div><div class='del'>-				     struct xdp_buff *xdp,</div><div class='del'>-				     struct bpf_prog *xdp_prog)</div><div class='add'>+u32 bpf_prog_run_generic_xdp(struct sk_buff *skb, struct xdp_buff *xdp,</div><div class='add'>+			     const struct bpf_prog *xdp_prog)</div><div class='ctx'> {</div><div class='add'>+	void *orig_data, *orig_data_end, *hard_start;</div><div class='ctx'> 	struct netdev_rx_queue *rxqueue;</div><div class='del'>-	void *orig_data, *orig_data_end;</div><div class='del'>-	u32 metalen, act = XDP_DROP;</div><div class='del'>-	int hlen, off;</div><div class='del'>-	u32 mac_len;</div><div class='add'>+	bool orig_bcast, orig_host;</div><div class='add'>+	u32 mac_len, frame_sz;</div><div class='add'>+	__be16 orig_eth_type;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	u32 metalen, act;</div><div class='add'>+	int off;</div><div class='ctx'> </div><div class='del'>-	/* Reinjected packets coming from act_mirred or similar should</div><div class='del'>-	 * not get XDP generic processing.</div><div class='add'>+	/* The XDP program wants to see the packet starting at the MAC</div><div class='add'>+	 * header.</div><div class='ctx'> 	 */</div><div class='del'>-	if (skb_cloned(skb) || skb_is_tc_redirected(skb))</div><div class='del'>-		return XDP_PASS;</div><div class='add'>+	mac_len = skb-&gt;data - skb_mac_header(skb);</div><div class='add'>+	hard_start = skb-&gt;data - skb_headroom(skb);</div><div class='ctx'> </div><div class='del'>-	/* XDP packets must be linear and must have sufficient headroom</div><div class='del'>-	 * of XDP_PACKET_HEADROOM bytes. This is the guarantee that also</div><div class='del'>-	 * native XDP provides, thus we need to do it here as well.</div><div class='del'>-	 */</div><div class='del'>-	if (skb_is_nonlinear(skb) ||</div><div class='del'>-	    skb_headroom(skb) &lt; XDP_PACKET_HEADROOM) {</div><div class='del'>-		int hroom = XDP_PACKET_HEADROOM - skb_headroom(skb);</div><div class='del'>-		int troom = skb-&gt;tail + skb-&gt;data_len - skb-&gt;end;</div><div class='add'>+	/* SKB "head" area always have tailroom for skb_shared_info */</div><div class='add'>+	frame_sz = (void *)skb_end_pointer(skb) - hard_start;</div><div class='add'>+	frame_sz += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> </div><div class='del'>-		/* In case we have to go down the path and also linearize,</div><div class='del'>-		 * then lets do the pskb_expand_head() work just once here.</div><div class='del'>-		 */</div><div class='del'>-		if (pskb_expand_head(skb,</div><div class='del'>-				     hroom &gt; 0 ? ALIGN(hroom, NET_SKB_PAD) : 0,</div><div class='del'>-				     troom &gt; 0 ? troom + 128 : 0, GFP_ATOMIC))</div><div class='del'>-			goto do_drop;</div><div class='del'>-		if (skb_linearize(skb))</div><div class='del'>-			goto do_drop;</div><div class='add'>+	rxqueue = netif_get_rxqueue(skb);</div><div class='add'>+	xdp_init_buff(xdp, frame_sz, &amp;rxqueue-&gt;xdp_rxq);</div><div class='add'>+	xdp_prepare_buff(xdp, hard_start, skb_headroom(skb) - mac_len,</div><div class='add'>+			 skb_headlen(skb) + mac_len, true);</div><div class='add'>+	if (skb_is_nonlinear(skb)) {</div><div class='add'>+		skb_shinfo(skb)-&gt;xdp_frags_size = skb-&gt;data_len;</div><div class='add'>+		xdp_buff_set_frags_flag(xdp);</div><div class='add'>+	} else {</div><div class='add'>+		xdp_buff_clear_frags_flag(xdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The XDP program wants to see the packet starting at the MAC</div><div class='del'>-	 * header.</div><div class='del'>-	 */</div><div class='del'>-	mac_len = skb-&gt;data - skb_mac_header(skb);</div><div class='del'>-	hlen = skb_headlen(skb) + mac_len;</div><div class='del'>-	xdp-&gt;data = skb-&gt;data - mac_len;</div><div class='del'>-	xdp-&gt;data_meta = xdp-&gt;data;</div><div class='del'>-	xdp-&gt;data_end = xdp-&gt;data + hlen;</div><div class='del'>-	xdp-&gt;data_hard_start = skb-&gt;data - skb_headroom(skb);</div><div class='ctx'> 	orig_data_end = xdp-&gt;data_end;</div><div class='ctx'> 	orig_data = xdp-&gt;data;</div><div class='del'>-</div><div class='del'>-	rxqueue = netif_get_rxqueue(skb);</div><div class='del'>-	xdp-&gt;rxq = &amp;rxqueue-&gt;xdp_rxq;</div><div class='add'>+	eth = (struct ethhdr *)xdp-&gt;data;</div><div class='add'>+	orig_host = ether_addr_equal_64bits(eth-&gt;h_dest, skb-&gt;dev-&gt;dev_addr);</div><div class='add'>+	orig_bcast = is_multicast_ether_addr_64bits(eth-&gt;h_dest);</div><div class='add'>+	orig_eth_type = eth-&gt;h_proto;</div><div class='ctx'> </div><div class='ctx'> 	act = bpf_prog_run_xdp(xdp_prog, xdp);</div><div class='ctx'> </div><div class='add'>+	/* check if bpf_xdp_adjust_head was used */</div><div class='ctx'> 	off = xdp-&gt;data - orig_data;</div><div class='del'>-	if (off &gt; 0)</div><div class='del'>-		__skb_pull(skb, off);</div><div class='del'>-	else if (off &lt; 0)</div><div class='del'>-		__skb_push(skb, -off);</div><div class='del'>-	skb-&gt;mac_header += off;</div><div class='del'>-</div><div class='del'>-	/* check if bpf_xdp_adjust_tail was used. it can only "shrink"</div><div class='del'>-	 * pckt.</div><div class='del'>-	 */</div><div class='del'>-	off = orig_data_end - xdp-&gt;data_end;</div><div class='add'>+	if (off) {</div><div class='add'>+		if (off &gt; 0)</div><div class='add'>+			__skb_pull(skb, off);</div><div class='add'>+		else if (off &lt; 0)</div><div class='add'>+			__skb_push(skb, -off);</div><div class='add'>+</div><div class='add'>+		skb-&gt;mac_header += off;</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if bpf_xdp_adjust_tail was used */</div><div class='add'>+	off = xdp-&gt;data_end - orig_data_end;</div><div class='ctx'> 	if (off != 0) {</div><div class='ctx'> 		skb_set_tail_pointer(skb, xdp-&gt;data_end - xdp-&gt;data);</div><div class='del'>-		skb-&gt;len -= off;</div><div class='add'>+		skb-&gt;len += off; /* positive on grow, negative on shrink */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* XDP frag metadata (e.g. nr_frags) are updated in eBPF helpers</div><div class='add'>+	 * (e.g. bpf_xdp_adjust_tail), we need to update data_len here.</div><div class='add'>+	 */</div><div class='add'>+	if (xdp_buff_has_frags(xdp))</div><div class='add'>+		skb-&gt;data_len = skb_shinfo(skb)-&gt;xdp_frags_size;</div><div class='add'>+	else</div><div class='add'>+		skb-&gt;data_len = 0;</div><div class='add'>+</div><div class='add'>+	/* check if XDP changed eth hdr such SKB needs update */</div><div class='add'>+	eth = (struct ethhdr *)xdp-&gt;data;</div><div class='add'>+	if ((orig_eth_type != eth-&gt;h_proto) ||</div><div class='add'>+	    (orig_host != ether_addr_equal_64bits(eth-&gt;h_dest,</div><div class='add'>+						  skb-&gt;dev-&gt;dev_addr)) ||</div><div class='add'>+	    (orig_bcast != is_multicast_ether_addr_64bits(eth-&gt;h_dest))) {</div><div class='add'>+		__skb_push(skb, ETH_HLEN);</div><div class='add'>+		skb-&gt;pkt_type = PACKET_HOST;</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Redirect/Tx gives L2 packet, code that will reuse skb must __skb_pull</div><div class='add'>+	 * before calling us again on redirect path. We do not call do_redirect</div><div class='add'>+	 * as we leave that up to the caller.</div><div class='add'>+	 *</div><div class='add'>+	 * Caller is responsible for managing lifetime of skb (i.e. calling</div><div class='add'>+	 * kfree_skb in response to actions it cannot handle/XDP_DROP).</div><div class='add'>+	 */</div><div class='ctx'> 	switch (act) {</div><div class='ctx'> 	case XDP_REDIRECT:</div><div class='ctx'> 	case XDP_TX:</div><div class='hunk'>@@ -4328,15 +5470,80 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,</div><div class='ctx'> 		if (metalen)</div><div class='ctx'> 			skb_metadata_set(skb, metalen);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return act;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netif_skb_check_for_xdp(struct sk_buff **pskb, const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = *pskb;</div><div class='add'>+	int err, hroom, troom;</div><div class='add'>+</div><div class='add'>+	local_lock_nested_bh(&amp;system_page_pool.bh_lock);</div><div class='add'>+	err = skb_cow_data_for_xdp(this_cpu_read(system_page_pool.pool), pskb, prog);</div><div class='add'>+	local_unlock_nested_bh(&amp;system_page_pool.bh_lock);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* In case we have to go down the path and also linearize,</div><div class='add'>+	 * then lets do the pskb_expand_head() work just once here.</div><div class='add'>+	 */</div><div class='add'>+	hroom = XDP_PACKET_HEADROOM - skb_headroom(skb);</div><div class='add'>+	troom = skb-&gt;tail + skb-&gt;data_len - skb-&gt;end;</div><div class='add'>+	err = pskb_expand_head(skb,</div><div class='add'>+			       hroom &gt; 0 ? ALIGN(hroom, NET_SKB_PAD) : 0,</div><div class='add'>+			       troom &gt; 0 ? troom + 128 : 0, GFP_ATOMIC);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return skb_linearize(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 netif_receive_generic_xdp(struct sk_buff **pskb,</div><div class='add'>+				     struct xdp_buff *xdp,</div><div class='add'>+				     const struct bpf_prog *xdp_prog)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = *pskb;</div><div class='add'>+	u32 mac_len, act = XDP_DROP;</div><div class='add'>+</div><div class='add'>+	/* Reinjected packets coming from act_mirred or similar should</div><div class='add'>+	 * not get XDP generic processing.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_is_redirected(skb))</div><div class='add'>+		return XDP_PASS;</div><div class='add'>+</div><div class='add'>+	/* XDP packets must have sufficient headroom of XDP_PACKET_HEADROOM</div><div class='add'>+	 * bytes. This is the guarantee that also native XDP provides,</div><div class='add'>+	 * thus we need to do it here as well.</div><div class='add'>+	 */</div><div class='add'>+	mac_len = skb-&gt;data - skb_mac_header(skb);</div><div class='add'>+	__skb_push(skb, mac_len);</div><div class='add'>+</div><div class='add'>+	if (skb_cloned(skb) || skb_is_nonlinear(skb) ||</div><div class='add'>+	    skb_headroom(skb) &lt; XDP_PACKET_HEADROOM) {</div><div class='add'>+		if (netif_skb_check_for_xdp(pskb, xdp_prog))</div><div class='add'>+			goto do_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__skb_pull(*pskb, mac_len);</div><div class='add'>+</div><div class='add'>+	act = bpf_prog_run_generic_xdp(*pskb, xdp, xdp_prog);</div><div class='add'>+	switch (act) {</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+	case XDP_TX:</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		bpf_warn_invalid_xdp_action(act);</div><div class='del'>-		/* fall through */</div><div class='add'>+		bpf_warn_invalid_xdp_action((*pskb)-&gt;dev, xdp_prog, act);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_ABORTED:</div><div class='del'>-		trace_xdp_exception(skb-&gt;dev, xdp_prog, act);</div><div class='del'>-		/* fall through */</div><div class='add'>+		trace_xdp_exception((*pskb)-&gt;dev, xdp_prog, act);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_DROP:</div><div class='ctx'> 	do_drop:</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb(*pskb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4344,19 +5551,22 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When doing generic XDP we have to bypass the qdisc layer and the</div><div class='del'>- * network taps in order to match in-driver-XDP behavior.</div><div class='add'>+ * network taps in order to match in-driver-XDP behavior. This also means</div><div class='add'>+ * that XDP packets are able to starve other packets going through a qdisc,</div><div class='add'>+ * and DDOS attacks will be more effective. In-driver-XDP use dedicated TX</div><div class='add'>+ * queues, so they do not have this starvation issue.</div><div class='ctx'>  */</div><div class='del'>-void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)</div><div class='add'>+void generic_xdp_tx(struct sk_buff *skb, const struct bpf_prog *xdp_prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	bool free_skb = true;</div><div class='ctx'> 	int cpu, rc;</div><div class='ctx'> </div><div class='del'>-	txq = netdev_pick_tx(dev, skb, NULL);</div><div class='add'>+	txq = netdev_core_pick_tx(dev, skb, NULL);</div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='ctx'> 	HARD_TX_LOCK(dev, txq, cpu);</div><div class='del'>-	if (!netif_xmit_stopped(txq)) {</div><div class='add'>+	if (!netif_xmit_frozen_or_drv_stopped(txq)) {</div><div class='ctx'> 		rc = netdev_start_xmit(skb, dev, txq, 0);</div><div class='ctx'> 		if (dev_xmit_complete(rc))</div><div class='ctx'> 			free_skb = false;</div><div class='hunk'>@@ -4364,39 +5574,45 @@ void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)</div><div class='ctx'> 	HARD_TX_UNLOCK(dev, txq);</div><div class='ctx'> 	if (free_skb) {</div><div class='ctx'> 		trace_xdp_exception(dev, xdp_prog, XDP_TX);</div><div class='add'>+		dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(generic_xdp_tx);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key);</div><div class='ctx'> </div><div class='del'>-int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb)</div><div class='add'>+int do_xdp_generic(const struct bpf_prog *xdp_prog, struct sk_buff **pskb)</div><div class='ctx'> {</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+</div><div class='ctx'> 	if (xdp_prog) {</div><div class='ctx'> 		struct xdp_buff xdp;</div><div class='ctx'> 		u32 act;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		act = netif_receive_generic_xdp(skb, &amp;xdp, xdp_prog);</div><div class='add'>+		bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+		act = netif_receive_generic_xdp(pskb, &amp;xdp, xdp_prog);</div><div class='ctx'> 		if (act != XDP_PASS) {</div><div class='ctx'> 			switch (act) {</div><div class='ctx'> 			case XDP_REDIRECT:</div><div class='del'>-				err = xdp_do_generic_redirect(skb-&gt;dev, skb,</div><div class='add'>+				err = xdp_do_generic_redirect((*pskb)-&gt;dev, *pskb,</div><div class='ctx'> 							      &amp;xdp, xdp_prog);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					goto out_redir;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case XDP_TX:</div><div class='del'>-				generic_xdp_tx(skb, xdp_prog);</div><div class='add'>+				generic_xdp_tx(*pskb, xdp_prog);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 			return XDP_DROP;</div><div class='ctx'> 		}</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 	}</div><div class='ctx'> 	return XDP_PASS;</div><div class='ctx'> out_redir:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+	kfree_skb_reason(*pskb, SKB_DROP_REASON_XDP);</div><div class='ctx'> 	return XDP_DROP;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(do_xdp_generic);</div><div class='hunk'>@@ -4405,33 +5621,15 @@ static int netif_rx_internal(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	net_timestamp_check(netdev_tstamp_prequeue, skb);</div><div class='add'>+	net_timestamp_check(READ_ONCE(net_hotdata.tstamp_prequeue), skb);</div><div class='ctx'> </div><div class='ctx'> 	trace_netif_rx(skb);</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;generic_xdp_needed_key)) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ret = do_xdp_generic(rcu_dereference(skb-&gt;dev-&gt;xdp_prog), skb);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		preempt_enable();</div><div class='del'>-</div><div class='del'>-		/* Consider XDP consuming the packet a success from</div><div class='del'>-		 * the netdev point of view we do not want to count</div><div class='del'>-		 * this as an error.</div><div class='del'>-		 */</div><div class='del'>-		if (ret != XDP_PASS)</div><div class='del'>-			return NET_RX_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	if (static_key_false(&amp;rps_needed)) {</div><div class='add'>+	if (static_branch_unlikely(&amp;rps_needed)) {</div><div class='ctx'> 		struct rps_dev_flow voidflow, *rflow = &amp;voidflow;</div><div class='ctx'> 		int cpu;</div><div class='ctx'> </div><div class='del'>-		preempt_disable();</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 		cpu = get_rps_cpu(skb-&gt;dev, skb, &amp;rflow);</div><div class='hunk'>@@ -4441,58 +5639,73 @@ static int netif_rx_internal(struct sk_buff *skb)</div><div class='ctx'> 		ret = enqueue_to_backlog(skb, cpu, &amp;rflow-&gt;last_qtail);</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		preempt_enable();</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned int qtail;</div><div class='ctx'> </div><div class='del'>-		ret = enqueue_to_backlog(skb, get_cpu(), &amp;qtail);</div><div class='del'>-		put_cpu();</div><div class='add'>+		ret = enqueue_to_backlog(skb, smp_processor_id(), &amp;qtail);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	__netif_rx	-	Slightly optimized version of netif_rx</div><div class='add'>+ *	@skb: buffer to post</div><div class='add'>+ *</div><div class='add'>+ *	This behaves as netif_rx except that it does not disable bottom halves.</div><div class='add'>+ *	As a result this function may only be invoked from the interrupt context</div><div class='add'>+ *	(either hard or soft interrupt).</div><div class='add'>+ */</div><div class='add'>+int __netif_rx(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_once(hardirq_count() | softirq_count());</div><div class='add'>+</div><div class='add'>+	trace_netif_rx_entry(skb);</div><div class='add'>+	ret = netif_rx_internal(skb);</div><div class='add'>+	trace_netif_rx_exit(ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__netif_rx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	netif_rx	-	post buffer to the network code</div><div class='ctx'>  *	@skb: buffer to post</div><div class='ctx'>  *</div><div class='ctx'>  *	This function receives a packet from a device driver and queues it for</div><div class='del'>- *	the upper (protocol) levels to process.  It always succeeds. The buffer</div><div class='del'>- *	may be dropped during processing for congestion control or by the</div><div class='del'>- *	protocol layers.</div><div class='add'>+ *	the upper (protocol) levels to process via the backlog NAPI device. It</div><div class='add'>+ *	always succeeds. The buffer may be dropped during processing for</div><div class='add'>+ *	congestion control or by the protocol layers.</div><div class='add'>+ *	The network buffer is passed via the backlog NAPI device. Modern NIC</div><div class='add'>+ *	driver should use NAPI and GRO.</div><div class='add'>+ *	This function can used from interrupt and from process context. The</div><div class='add'>+ *	caller from process context must not disable interrupts before invoking</div><div class='add'>+ *	this function.</div><div class='ctx'>  *</div><div class='ctx'>  *	return values:</div><div class='ctx'>  *	NET_RX_SUCCESS	(no congestion)</div><div class='ctx'>  *	NET_RX_DROP     (packet was dropped)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int netif_rx(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	trace_netif_rx_entry(skb);</div><div class='add'>+	bool need_bh_off = !(hardirq_count() | softirq_count());</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return netif_rx_internal(skb);</div><div class='add'>+	if (need_bh_off)</div><div class='add'>+		local_bh_disable();</div><div class='add'>+	trace_netif_rx_entry(skb);</div><div class='add'>+	ret = netif_rx_internal(skb);</div><div class='add'>+	trace_netif_rx_exit(ret);</div><div class='add'>+	if (need_bh_off)</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_rx);</div><div class='ctx'> </div><div class='del'>-int netif_rx_ni(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	trace_netif_rx_ni_entry(skb);</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	err = netif_rx_internal(skb);</div><div class='del'>-	if (local_softirq_pending())</div><div class='del'>-		do_softirq();</div><div class='del'>-	preempt_enable();</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netif_rx_ni);</div><div class='del'>-</div><div class='del'>-static __latent_entropy void net_tx_action(struct softirq_action *h)</div><div class='add'>+static __latent_entropy void net_tx_action(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct softnet_data *sd = this_cpu_ptr(&amp;softnet_data);</div><div class='ctx'> </div><div class='hunk'>@@ -4510,18 +5723,18 @@ static __latent_entropy void net_tx_action(struct softirq_action *h)</div><div class='ctx'> 			clist = clist-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 			WARN_ON(refcount_read(&amp;skb-&gt;users));</div><div class='del'>-			if (likely(get_kfree_skb_cb(skb)-&gt;reason == SKB_REASON_CONSUMED))</div><div class='del'>-				trace_consume_skb(skb);</div><div class='add'>+			if (likely(get_kfree_skb_cb(skb)-&gt;reason == SKB_CONSUMED))</div><div class='add'>+				trace_consume_skb(skb, net_tx_action);</div><div class='ctx'> 			else</div><div class='del'>-				trace_kfree_skb(skb, net_tx_action);</div><div class='add'>+				trace_kfree_skb(skb, net_tx_action,</div><div class='add'>+						get_kfree_skb_cb(skb)-&gt;reason, NULL);</div><div class='ctx'> </div><div class='ctx'> 			if (skb-&gt;fclone != SKB_FCLONE_UNAVAILABLE)</div><div class='ctx'> 				__kfree_skb(skb);</div><div class='ctx'> 			else</div><div class='del'>-				__kfree_skb_defer(skb);</div><div class='add'>+				__napi_kfree_skb(skb,</div><div class='add'>+						 get_kfree_skb_cb(skb)-&gt;reason);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		__kfree_skb_flush();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sd-&gt;output_queue) {</div><div class='hunk'>@@ -4533,25 +5746,45 @@ static __latent_entropy void net_tx_action(struct softirq_action *h)</div><div class='ctx'> 		sd-&gt;output_queue_tailp = &amp;sd-&gt;output_queue;</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> </div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 		while (head) {</div><div class='del'>-			struct Qdisc *q = head;</div><div class='ctx'> 			spinlock_t *root_lock = NULL;</div><div class='add'>+			struct sk_buff *to_free;</div><div class='add'>+			struct Qdisc *q = head;</div><div class='ctx'> </div><div class='ctx'> 			head = head-&gt;next_sched;</div><div class='ctx'> </div><div class='del'>-			if (!(q-&gt;flags &amp; TCQ_F_NOLOCK)) {</div><div class='del'>-				root_lock = qdisc_lock(q);</div><div class='del'>-				spin_lock(root_lock);</div><div class='del'>-			}</div><div class='ctx'> 			/* We need to make sure head-&gt;next_sched is read</div><div class='ctx'> 			 * before clearing __QDISC_STATE_SCHED</div><div class='ctx'> 			 */</div><div class='ctx'> 			smp_mb__before_atomic();</div><div class='add'>+</div><div class='add'>+			if (!(q-&gt;flags &amp; TCQ_F_NOLOCK)) {</div><div class='add'>+				root_lock = qdisc_lock(q);</div><div class='add'>+				spin_lock(root_lock);</div><div class='add'>+			} else if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED,</div><div class='add'>+						     &amp;q-&gt;state))) {</div><div class='add'>+				/* There is a synchronize_net() between</div><div class='add'>+				 * STATE_DEACTIVATED flag being set and</div><div class='add'>+				 * qdisc_reset()/some_qdisc_is_busy() in</div><div class='add'>+				 * dev_deactivate(), so we can safely bail out</div><div class='add'>+				 * early here to avoid data race between</div><div class='add'>+				 * qdisc_deactivate() and some_qdisc_is_busy()</div><div class='add'>+				 * for lockless qdisc.</div><div class='add'>+				 */</div><div class='add'>+				clear_bit(__QDISC_STATE_SCHED, &amp;q-&gt;state);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			clear_bit(__QDISC_STATE_SCHED, &amp;q-&gt;state);</div><div class='del'>-			qdisc_run(q);</div><div class='add'>+			to_free = qdisc_run(q);</div><div class='ctx'> 			if (root_lock)</div><div class='ctx'> 				spin_unlock(root_lock);</div><div class='add'>+			tcf_kfree_skb_list(to_free);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xfrm_dev_backlog(sd);</div><div class='hunk'>@@ -4564,64 +5797,6 @@ int (*br_fdb_test_addr_hook)(struct net_device *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline struct sk_buff *</div><div class='del'>-sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,</div><div class='del'>-		   struct net_device *orig_dev)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NET_CLS_ACT</div><div class='del'>-	struct mini_Qdisc *miniq = rcu_dereference_bh(skb-&gt;dev-&gt;miniq_ingress);</div><div class='del'>-	struct tcf_result cl_res;</div><div class='del'>-</div><div class='del'>-	/* If there's at least one ingress present somewhere (so</div><div class='del'>-	 * we get here via enabled static key), remaining devices</div><div class='del'>-	 * that are not configured with an ingress qdisc will bail</div><div class='del'>-	 * out here.</div><div class='del'>-	 */</div><div class='del'>-	if (!miniq)</div><div class='del'>-		return skb;</div><div class='del'>-</div><div class='del'>-	if (*pt_prev) {</div><div class='del'>-		*ret = deliver_skb(skb, *pt_prev, orig_dev);</div><div class='del'>-		*pt_prev = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qdisc_skb_cb(skb)-&gt;pkt_len = skb-&gt;len;</div><div class='del'>-	skb-&gt;tc_at_ingress = 1;</div><div class='del'>-	mini_qdisc_bstats_cpu_update(miniq, skb);</div><div class='del'>-</div><div class='del'>-	switch (tcf_classify(skb, miniq-&gt;filter_list, &amp;cl_res, false)) {</div><div class='del'>-	case TC_ACT_OK:</div><div class='del'>-	case TC_ACT_RECLASSIFY:</div><div class='del'>-		skb-&gt;tc_index = TC_H_MIN(cl_res.classid);</div><div class='del'>-		break;</div><div class='del'>-	case TC_ACT_SHOT:</div><div class='del'>-		mini_qdisc_qstats_cpu_drop(miniq);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	case TC_ACT_STOLEN:</div><div class='del'>-	case TC_ACT_QUEUED:</div><div class='del'>-	case TC_ACT_TRAP:</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	case TC_ACT_REDIRECT:</div><div class='del'>-		/* skb_mac_header check was done by cls/act_bpf, so</div><div class='del'>-		 * we can safely push the L2 header back before</div><div class='del'>-		 * redirecting to another netdev</div><div class='del'>-		 */</div><div class='del'>-		__skb_push(skb, skb-&gt;mac_len);</div><div class='del'>-		skb_do_redirect(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	case TC_ACT_REINSERT:</div><div class='del'>-		/* this does not scrub the packet, and updates stats on error */</div><div class='del'>-		skb_tc_reinsert(skb, &amp;cl_res);</div><div class='del'>-		return NULL;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_NET_CLS_ACT */</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	netdev_is_rx_handler_busy - check if receive handler is registered</div><div class='ctx'>  *	@dev: device to check</div><div class='hunk'>@@ -4713,11 +5888,10 @@ static bool skb_pfmemalloc_protocol(struct sk_buff *skb)</div><div class='ctx'> static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,</div><div class='ctx'> 			     int *ret, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_NETFILTER_INGRESS</div><div class='ctx'> 	if (nf_hook_ingress_active(skb)) {</div><div class='ctx'> 		int ingress_retval;</div><div class='ctx'> </div><div class='del'>-		if (*pt_prev) {</div><div class='add'>+		if (unlikely(*pt_prev)) {</div><div class='ctx'> 			*ret = deliver_skb(skb, *pt_prev, orig_dev);</div><div class='ctx'> 			*pt_prev = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4727,29 +5901,36 @@ static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return ingress_retval;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_NETFILTER_INGRESS */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc,</div><div class='add'>+static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,</div><div class='ctx'> 				    struct packet_type **ppt_prev)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason drop_reason = SKB_DROP_REASON_UNHANDLED_PROTO;</div><div class='ctx'> 	struct packet_type *ptype, *pt_prev;</div><div class='ctx'> 	rx_handler_func_t *rx_handler;</div><div class='add'>+	struct sk_buff *skb = *pskb;</div><div class='ctx'> 	struct net_device *orig_dev;</div><div class='ctx'> 	bool deliver_exact = false;</div><div class='ctx'> 	int ret = NET_RX_DROP;</div><div class='ctx'> 	__be16 type;</div><div class='ctx'> </div><div class='del'>-	net_timestamp_check(!netdev_tstamp_prequeue, skb);</div><div class='add'>+	net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb);</div><div class='ctx'> </div><div class='ctx'> 	trace_netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	orig_dev = skb-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='add'>+#if !defined(CONFIG_DEBUG_NET)</div><div class='add'>+	/* We plan to no longer reset the transport header here.</div><div class='add'>+	 * Give some time to fuzzers and dev build to catch bugs</div><div class='add'>+	 * in network stacks.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!skb_transport_header_was_set(skb))</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='add'>+#endif</div><div class='ctx'> 	skb_reset_mac_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	pt_prev = NULL;</div><div class='hunk'>@@ -4759,8 +5940,21 @@ another_round:</div><div class='ctx'> </div><div class='ctx'> 	__this_cpu_inc(softnet_data.processed);</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;protocol == cpu_to_be16(ETH_P_8021Q) ||</div><div class='del'>-	    skb-&gt;protocol == cpu_to_be16(ETH_P_8021AD)) {</div><div class='add'>+	if (static_branch_unlikely(&amp;generic_xdp_needed_key)) {</div><div class='add'>+		int ret2;</div><div class='add'>+</div><div class='add'>+		migrate_disable();</div><div class='add'>+		ret2 = do_xdp_generic(rcu_dereference(skb-&gt;dev-&gt;xdp_prog),</div><div class='add'>+				      &amp;skb);</div><div class='add'>+		migrate_enable();</div><div class='add'>+</div><div class='add'>+		if (ret2 != XDP_PASS) {</div><div class='add'>+			ret = NET_RX_DROP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eth_type_vlan(skb-&gt;protocol)) {</div><div class='ctx'> 		skb = skb_vlan_untag(skb);</div><div class='ctx'> 		if (unlikely(!skb))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -4772,14 +5966,15 @@ another_round:</div><div class='ctx'> 	if (pfmemalloc)</div><div class='ctx'> 		goto skip_taps;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(ptype, &amp;ptype_all, list) {</div><div class='del'>-		if (pt_prev)</div><div class='add'>+	list_for_each_entry_rcu(ptype, &amp;dev_net_rcu(skb-&gt;dev)-&gt;ptype_all,</div><div class='add'>+				list) {</div><div class='add'>+		if (unlikely(pt_prev))</div><div class='ctx'> 			ret = deliver_skb(skb, pt_prev, orig_dev);</div><div class='ctx'> 		pt_prev = ptype;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(ptype, &amp;skb-&gt;dev-&gt;ptype_all, list) {</div><div class='del'>-		if (pt_prev)</div><div class='add'>+		if (unlikely(pt_prev))</div><div class='ctx'> 			ret = deliver_skb(skb, pt_prev, orig_dev);</div><div class='ctx'> 		pt_prev = ptype;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4787,21 +5982,30 @@ another_round:</div><div class='ctx'> skip_taps:</div><div class='ctx'> #ifdef CONFIG_NET_INGRESS</div><div class='ctx'> 	if (static_branch_unlikely(&amp;ingress_needed_key)) {</div><div class='del'>-		skb = sch_handle_ingress(skb, &amp;pt_prev, &amp;ret, orig_dev);</div><div class='add'>+		bool another = false;</div><div class='add'>+</div><div class='add'>+		nf_skip_egress(skb, true);</div><div class='add'>+		skb = sch_handle_ingress(skb, &amp;pt_prev, &amp;ret, orig_dev,</div><div class='add'>+					 &amp;another);</div><div class='add'>+		if (another)</div><div class='add'>+			goto another_round;</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='add'>+		nf_skip_egress(skb, false);</div><div class='ctx'> 		if (nf_ingress(skb, &amp;pt_prev, &amp;ret, orig_dev) &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	skb_reset_tc(skb);</div><div class='add'>+	skb_reset_redirect(skb);</div><div class='ctx'> skip_classify:</div><div class='del'>-	if (pfmemalloc &amp;&amp; !skb_pfmemalloc_protocol(skb))</div><div class='add'>+	if (pfmemalloc &amp;&amp; !skb_pfmemalloc_protocol(skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_PFMEMALLOC;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_vlan_tag_present(skb)) {</div><div class='del'>-		if (pt_prev) {</div><div class='add'>+		if (unlikely(pt_prev)) {</div><div class='ctx'> 			ret = deliver_skb(skb, pt_prev, orig_dev);</div><div class='ctx'> 			pt_prev = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4813,7 +6017,7 @@ skip_classify:</div><div class='ctx'> </div><div class='ctx'> 	rx_handler = rcu_dereference(skb-&gt;dev-&gt;rx_handler);</div><div class='ctx'> 	if (rx_handler) {</div><div class='del'>-		if (pt_prev) {</div><div class='add'>+		if (unlikely(pt_prev)) {</div><div class='ctx'> 			ret = deliver_skb(skb, pt_prev, orig_dev);</div><div class='ctx'> 			pt_prev = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4825,6 +6029,7 @@ skip_classify:</div><div class='ctx'> 			goto another_round;</div><div class='ctx'> 		case RX_HANDLER_EXACT:</div><div class='ctx'> 			deliver_exact = true;</div><div class='add'>+			break;</div><div class='ctx'> 		case RX_HANDLER_PASS:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -4832,14 +6037,41 @@ skip_classify:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(skb_vlan_tag_present(skb))) {</div><div class='del'>-		if (skb_vlan_tag_get_id(skb))</div><div class='add'>+	if (unlikely(skb_vlan_tag_present(skb)) &amp;&amp; !netdev_uses_dsa(skb-&gt;dev)) {</div><div class='add'>+check_vlan_id:</div><div class='add'>+		if (skb_vlan_tag_get_id(skb)) {</div><div class='add'>+			/* Vlan id is non 0 and vlan_do_receive() above couldn't</div><div class='add'>+			 * find vlan device.</div><div class='add'>+			 */</div><div class='ctx'> 			skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+		} else if (eth_type_vlan(skb-&gt;protocol)) {</div><div class='add'>+			/* Outer header is 802.1P with vlan 0, inner header is</div><div class='add'>+			 * 802.1Q or 802.1AD and vlan_do_receive() above could</div><div class='add'>+			 * not find vlan dev for vlan id 0.</div><div class='add'>+			 */</div><div class='add'>+			__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+			skb = skb_vlan_untag(skb);</div><div class='add'>+			if (unlikely(!skb))</div><div class='add'>+				goto out;</div><div class='add'>+			if (vlan_do_receive(&amp;skb))</div><div class='add'>+				/* After stripping off 802.1P header with vlan 0</div><div class='add'>+				 * vlan dev is found for inner header.</div><div class='add'>+				 */</div><div class='add'>+				goto another_round;</div><div class='add'>+			else if (unlikely(!skb))</div><div class='add'>+				goto out;</div><div class='add'>+			else</div><div class='add'>+				/* We have stripped outer 802.1P vlan 0 header.</div><div class='add'>+				 * But could not find vlan dev.</div><div class='add'>+				 * check again for vlan id to set OTHERHOST.</div><div class='add'>+				 */</div><div class='add'>+				goto check_vlan_id;</div><div class='add'>+		}</div><div class='ctx'> 		/* Note: we might in the future use prio bits</div><div class='ctx'> 		 * and set skb-&gt;priority like in vlan_do_receive()</div><div class='ctx'> 		 * For the time being, just ignore Priority Code Point</div><div class='ctx'> 		 */</div><div class='del'>-		skb-&gt;vlan_tci = 0;</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	type = skb-&gt;protocol;</div><div class='hunk'>@@ -4849,6 +6081,14 @@ skip_classify:</div><div class='ctx'> 		deliver_ptype_list_skb(skb, &amp;pt_prev, orig_dev, type,</div><div class='ctx'> 				       &amp;ptype_base[ntohs(type) &amp;</div><div class='ctx'> 						   PTYPE_HASH_MASK]);</div><div class='add'>+</div><div class='add'>+		/* orig_dev and skb-&gt;dev could belong to different netns;</div><div class='add'>+		 * Even in such case we need to traverse only the list</div><div class='add'>+		 * coming from skb-&gt;dev, as the ptype owner (packet socket)</div><div class='add'>+		 * will use dev_net(skb-&gt;dev) to do namespace filtering.</div><div class='add'>+		 */</div><div class='add'>+		deliver_ptype_list_skb(skb, &amp;pt_prev, orig_dev, type,</div><div class='add'>+				       &amp;dev_net_rcu(skb-&gt;dev)-&gt;ptype_specific);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	deliver_ptype_list_skb(skb, &amp;pt_prev, orig_dev, type,</div><div class='hunk'>@@ -4860,16 +6100,15 @@ skip_classify:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pt_prev) {</div><div class='del'>-		if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC)))</div><div class='del'>-			goto drop;</div><div class='ctx'> 		*ppt_prev = pt_prev;</div><div class='ctx'> 	} else {</div><div class='ctx'> drop:</div><div class='ctx'> 		if (!deliver_exact)</div><div class='del'>-			atomic_long_inc(&amp;skb-&gt;dev-&gt;rx_dropped);</div><div class='add'>+			dev_core_stats_rx_dropped_inc(skb-&gt;dev);</div><div class='ctx'> 		else</div><div class='del'>-			atomic_long_inc(&amp;skb-&gt;dev-&gt;rx_nohandler);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+			dev_core_stats_rx_nohandler_inc(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+		kfree_skb_reason(skb, drop_reason);</div><div class='ctx'> 		/* Jamal, now you will not able to escape explaining</div><div class='ctx'> 		 * me how you were going to use this. :-)</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -4877,6 +6116,13 @@ drop:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	/* The invariant here is that if *ppt_prev is not NULL</div><div class='add'>+	 * then skb should also be non-NULL.</div><div class='add'>+	 *</div><div class='add'>+	 * Apparently *ppt_prev assignment above holds this invariant due to</div><div class='add'>+	 * skb dereferencing near it.</div><div class='add'>+	 */</div><div class='add'>+	*pskb = skb;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4886,9 +6132,10 @@ static int __netif_receive_skb_one_core(struct sk_buff *skb, bool pfmemalloc)</div><div class='ctx'> 	struct packet_type *pt_prev = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __netif_receive_skb_core(skb, pfmemalloc, &amp;pt_prev);</div><div class='add'>+	ret = __netif_receive_skb_core(&amp;skb, pfmemalloc, &amp;pt_prev);</div><div class='ctx'> 	if (pt_prev)</div><div class='del'>-		ret = pt_prev-&gt;func(skb, skb-&gt;dev, pt_prev, orig_dev);</div><div class='add'>+		ret = INDIRECT_CALL_INET(pt_prev-&gt;func, ipv6_rcv, ip_rcv, skb,</div><div class='add'>+					 skb-&gt;dev, pt_prev, orig_dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4898,7 +6145,7 @@ static int __netif_receive_skb_one_core(struct sk_buff *skb, bool pfmemalloc)</div><div class='ctx'>  *</div><div class='ctx'>  *	More direct receive version of netif_receive_skb().  It should</div><div class='ctx'>  *	only be used by callers that have a need to skip RPS and Generic XDP.</div><div class='del'>- *	Caller must also take care of handling if (page_is_)pfmemalloc.</div><div class='add'>+ *	Caller must also take care of handling if ``(page_is_)pfmemalloc``.</div><div class='ctx'>  *</div><div class='ctx'>  *	This function may only be called from softirq context and interrupts</div><div class='ctx'>  *	should be enabled.</div><div class='hunk'>@@ -4930,10 +6177,13 @@ static inline void __netif_receive_skb_list_ptype(struct list_head *head,</div><div class='ctx'> 	if (list_empty(head))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (pt_prev-&gt;list_func != NULL)</div><div class='del'>-		pt_prev-&gt;list_func(head, pt_prev, orig_dev);</div><div class='add'>+		INDIRECT_CALL_INET(pt_prev-&gt;list_func, ipv6_list_rcv,</div><div class='add'>+				   ip_list_rcv, head, pt_prev, orig_dev);</div><div class='ctx'> 	else</div><div class='del'>-		list_for_each_entry_safe(skb, next, head, list)</div><div class='add'>+		list_for_each_entry_safe(skb, next, head, list) {</div><div class='add'>+			skb_list_del_init(skb);</div><div class='ctx'> 			pt_prev-&gt;func(skb, skb-&gt;dev, pt_prev, orig_dev);</div><div class='add'>+		}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __netif_receive_skb_list_core(struct list_head *head, bool pfmemalloc)</div><div class='hunk'>@@ -4951,16 +6201,15 @@ static void __netif_receive_skb_list_core(struct list_head *head, bool pfmemallo</div><div class='ctx'> 	struct packet_type *pt_curr = NULL;</div><div class='ctx'> 	/* Current (common) orig_dev of sublist */</div><div class='ctx'> 	struct net_device *od_curr = NULL;</div><div class='del'>-	struct list_head sublist;</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='ctx'> 		struct net_device *orig_dev = skb-&gt;dev;</div><div class='ctx'> 		struct packet_type *pt_prev = NULL;</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='del'>-		__netif_receive_skb_core(skb, pfmemalloc, &amp;pt_prev);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='add'>+		__netif_receive_skb_core(&amp;skb, pfmemalloc, &amp;pt_prev);</div><div class='ctx'> 		if (!pt_prev)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (pt_curr != pt_prev || od_curr != orig_dev) {</div><div class='hunk'>@@ -5049,15 +6298,11 @@ static int generic_xdp_install(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='ctx'> 			static_branch_dec(&amp;generic_xdp_needed_key);</div><div class='ctx'> 		} else if (new &amp;&amp; !old) {</div><div class='ctx'> 			static_branch_inc(&amp;generic_xdp_needed_key);</div><div class='del'>-			dev_disable_lro(dev);</div><div class='add'>+			netif_disable_lro(dev);</div><div class='ctx'> 			dev_disable_gro_hw(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case XDP_QUERY_PROG:</div><div class='del'>-		xdp-&gt;prog_id = old ? old-&gt;aux-&gt;id : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5070,27 +6315,14 @@ static int netif_receive_skb_internal(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	net_timestamp_check(netdev_tstamp_prequeue, skb);</div><div class='add'>+	net_timestamp_check(READ_ONCE(net_hotdata.tstamp_prequeue), skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb_defer_rx_timestamp(skb))</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;generic_xdp_needed_key)) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ret = do_xdp_generic(rcu_dereference(skb-&gt;dev-&gt;xdp_prog), skb);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		preempt_enable();</div><div class='del'>-</div><div class='del'>-		if (ret != XDP_PASS)</div><div class='del'>-			return NET_RX_DROP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	if (static_key_false(&amp;rps_needed)) {</div><div class='add'>+	if (static_branch_unlikely(&amp;rps_needed)) {</div><div class='ctx'> 		struct rps_dev_flow voidflow, *rflow = &amp;voidflow;</div><div class='ctx'> 		int cpu = get_rps_cpu(skb-&gt;dev, skb, &amp;rflow);</div><div class='ctx'> </div><div class='hunk'>@@ -5106,46 +6338,30 @@ static int netif_receive_skb_internal(struct sk_buff *skb)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netif_receive_skb_list_internal(struct list_head *head)</div><div class='add'>+void netif_receive_skb_list_internal(struct list_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_prog *xdp_prog = NULL;</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='del'>-	struct list_head sublist;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='del'>-		net_timestamp_check(netdev_tstamp_prequeue, skb);</div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='add'>+		net_timestamp_check(READ_ONCE(net_hotdata.tstamp_prequeue),</div><div class='add'>+				    skb);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		if (!skb_defer_rx_timestamp(skb))</div><div class='ctx'> 			list_add_tail(&amp;skb-&gt;list, &amp;sublist);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_splice_init(&amp;sublist, head);</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;generic_xdp_needed_key)) {</div><div class='del'>-		preempt_disable();</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		list_for_each_entry_safe(skb, next, head, list) {</div><div class='del'>-			xdp_prog = rcu_dereference(skb-&gt;dev-&gt;xdp_prog);</div><div class='del'>-			list_del(&amp;skb-&gt;list);</div><div class='del'>-			if (do_xdp_generic(xdp_prog, skb) == XDP_PASS)</div><div class='del'>-				list_add_tail(&amp;skb-&gt;list, &amp;sublist);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		preempt_enable();</div><div class='del'>-		/* Put passed packets back on main list */</div><div class='del'>-		list_splice_init(&amp;sublist, head);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	if (static_key_false(&amp;rps_needed)) {</div><div class='add'>+	if (static_branch_unlikely(&amp;rps_needed)) {</div><div class='ctx'> 		list_for_each_entry_safe(skb, next, head, list) {</div><div class='ctx'> 			struct rps_dev_flow voidflow, *rflow = &amp;voidflow;</div><div class='ctx'> 			int cpu = get_rps_cpu(skb-&gt;dev, skb, &amp;rflow);</div><div class='ctx'> </div><div class='ctx'> 			if (cpu &gt;= 0) {</div><div class='ctx'> 				/* Will be handled, remove from list */</div><div class='del'>-				list_del(&amp;skb-&gt;list);</div><div class='add'>+				skb_list_del_init(skb);</div><div class='ctx'> 				enqueue_to_backlog(skb, cpu, &amp;rflow-&gt;last_qtail);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5172,9 +6388,14 @@ static void netif_receive_skb_list_internal(struct list_head *head)</div><div class='ctx'>  */</div><div class='ctx'> int netif_receive_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	trace_netif_receive_skb_entry(skb);</div><div class='ctx'> </div><div class='del'>-	return netif_receive_skb_internal(skb);</div><div class='add'>+	ret = netif_receive_skb_internal(skb);</div><div class='add'>+	trace_netif_receive_skb_exit(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_receive_skb);</div><div class='ctx'> </div><div class='hunk'>@@ -5194,552 +6415,124 @@ void netif_receive_skb_list(struct list_head *head)</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(head))</div><div class='ctx'> 		return;</div><div class='del'>-	list_for_each_entry(skb, head, list)</div><div class='del'>-		trace_netif_receive_skb_list_entry(skb);</div><div class='add'>+	if (trace_netif_receive_skb_list_entry_enabled()) {</div><div class='add'>+		list_for_each_entry(skb, head, list)</div><div class='add'>+			trace_netif_receive_skb_list_entry(skb);</div><div class='add'>+	}</div><div class='ctx'> 	netif_receive_skb_list_internal(head);</div><div class='add'>+	trace_netif_receive_skb_list_exit(0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_receive_skb_list);</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct work_struct, flush_works);</div><div class='del'>-</div><div class='ctx'> /* Network device is going away, flush any packets still pending */</div><div class='ctx'> static void flush_backlog(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *tmp;</div><div class='add'>+	struct sk_buff_head list;</div><div class='ctx'> 	struct softnet_data *sd;</div><div class='ctx'> </div><div class='add'>+	__skb_queue_head_init(&amp;list);</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	sd = this_cpu_ptr(&amp;softnet_data);</div><div class='ctx'> </div><div class='del'>-	local_irq_disable();</div><div class='del'>-	rps_lock(sd);</div><div class='add'>+	backlog_lock_irq_disable(sd);</div><div class='ctx'> 	skb_queue_walk_safe(&amp;sd-&gt;input_pkt_queue, skb, tmp) {</div><div class='del'>-		if (skb-&gt;dev-&gt;reg_state == NETREG_UNREGISTERING) {</div><div class='add'>+		if (READ_ONCE(skb-&gt;dev-&gt;reg_state) == NETREG_UNREGISTERING) {</div><div class='ctx'> 			__skb_unlink(skb, &amp;sd-&gt;input_pkt_queue);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			input_queue_head_incr(sd);</div><div class='add'>+			__skb_queue_tail(&amp;list, skb);</div><div class='add'>+			rps_input_queue_head_incr(sd);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rps_unlock(sd);</div><div class='del'>-	local_irq_enable();</div><div class='add'>+	backlog_unlock_irq_enable(sd);</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 	skb_queue_walk_safe(&amp;sd-&gt;process_queue, skb, tmp) {</div><div class='del'>-		if (skb-&gt;dev-&gt;reg_state == NETREG_UNREGISTERING) {</div><div class='add'>+		if (READ_ONCE(skb-&gt;dev-&gt;reg_state) == NETREG_UNREGISTERING) {</div><div class='ctx'> 			__skb_unlink(skb, &amp;sd-&gt;process_queue);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			input_queue_head_incr(sd);</div><div class='add'>+			__skb_queue_tail(&amp;list, skb);</div><div class='add'>+			rps_input_queue_head_incr(sd);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	local_unlock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void flush_all_backlogs(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu;</div><div class='del'>-</div><div class='del'>-	get_online_cpus();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		queue_work_on(cpu, system_highpri_wq,</div><div class='del'>-			      per_cpu_ptr(&amp;flush_works, cpu));</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		flush_work(per_cpu_ptr(&amp;flush_works, cpu));</div><div class='del'>-</div><div class='del'>-	put_online_cpus();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int napi_gro_complete(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-	__be16 type = skb-&gt;protocol;</div><div class='del'>-	struct list_head *head = &amp;offload_base;</div><div class='del'>-	int err = -ENOENT;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct napi_gro_cb) &gt; sizeof(skb-&gt;cb));</div><div class='del'>-</div><div class='del'>-	if (NAPI_GRO_CB(skb)-&gt;count == 1) {</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_size = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(ptype, head, list) {</div><div class='del'>-		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_complete)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		err = ptype-&gt;callbacks.gro_complete(skb, 0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		WARN_ON(&amp;ptype-&gt;list == head);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NET_RX_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return netif_receive_skb_internal(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,</div><div class='del'>-				   bool flush_old)</div><div class='del'>-{</div><div class='del'>-	struct list_head *head = &amp;napi-&gt;gro_hash[index].list;</div><div class='del'>-	struct sk_buff *skb, *p;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe_reverse(skb, p, head, list) {</div><div class='del'>-		if (flush_old &amp;&amp; NAPI_GRO_CB(skb)-&gt;age == jiffies)</div><div class='del'>-			return;</div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='del'>-		napi_gro_complete(skb);</div><div class='del'>-		napi-&gt;gro_hash[index].count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!napi-&gt;gro_hash[index].count)</div><div class='del'>-		__clear_bit(index, &amp;napi-&gt;gro_bitmask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* napi-&gt;gro_hash[].list contains packets ordered by age.</div><div class='del'>- * youngest packets at the head of it.</div><div class='del'>- * Complete skbs in reverse order to reduce latencies.</div><div class='del'>- */</div><div class='del'>-void napi_gro_flush(struct napi_struct *napi, bool flush_old)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; GRO_HASH_BUCKETS; i++) {</div><div class='del'>-		if (test_bit(i, &amp;napi-&gt;gro_bitmask))</div><div class='del'>-			__napi_gro_flush_chain(napi, i, flush_old);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(napi_gro_flush);</div><div class='del'>-</div><div class='del'>-static struct list_head *gro_list_prepare(struct napi_struct *napi,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	unsigned int maclen = skb-&gt;dev-&gt;hard_header_len;</div><div class='del'>-	u32 hash = skb_get_hash_raw(skb);</div><div class='del'>-	struct list_head *head;</div><div class='del'>-	struct sk_buff *p;</div><div class='del'>-</div><div class='del'>-	head = &amp;napi-&gt;gro_hash[hash &amp; (GRO_HASH_BUCKETS - 1)].list;</div><div class='del'>-	list_for_each_entry(p, head, list) {</div><div class='del'>-		unsigned long diffs;</div><div class='del'>-</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;flush = 0;</div><div class='del'>-</div><div class='del'>-		if (hash != skb_get_hash_raw(p)) {</div><div class='del'>-			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		diffs = (unsigned long)p-&gt;dev ^ (unsigned long)skb-&gt;dev;</div><div class='del'>-		diffs |= p-&gt;vlan_tci ^ skb-&gt;vlan_tci;</div><div class='del'>-		diffs |= skb_metadata_dst_cmp(p, skb);</div><div class='del'>-		diffs |= skb_metadata_differs(p, skb);</div><div class='del'>-		if (maclen == ETH_HLEN)</div><div class='del'>-			diffs |= compare_ether_header(skb_mac_header(p),</div><div class='del'>-						      skb_mac_header(skb));</div><div class='del'>-		else if (!diffs)</div><div class='del'>-			diffs = memcmp(skb_mac_header(p),</div><div class='del'>-				       skb_mac_header(skb),</div><div class='del'>-				       maclen);</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;same_flow = !diffs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void skb_gro_reset_offset(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct skb_shared_info *pinfo = skb_shinfo(skb);</div><div class='del'>-	const skb_frag_t *frag0 = &amp;pinfo-&gt;frags[0];</div><div class='del'>-</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;data_offset = 0;</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;frag0 = NULL;</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;frag0_len = 0;</div><div class='del'>-</div><div class='del'>-	if (skb_mac_header(skb) == skb_tail_pointer(skb) &amp;&amp;</div><div class='del'>-	    pinfo-&gt;nr_frags &amp;&amp;</div><div class='del'>-	    !PageHighMem(skb_frag_page(frag0))) {</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;frag0 = skb_frag_address(frag0);</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;frag0_len = min_t(unsigned int,</div><div class='del'>-						    skb_frag_size(frag0),</div><div class='del'>-						    skb-&gt;end - skb-&gt;tail);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gro_pull_from_frag0(struct sk_buff *skb, int grow)</div><div class='del'>-{</div><div class='del'>-	struct skb_shared_info *pinfo = skb_shinfo(skb);</div><div class='del'>-</div><div class='del'>-	BUG_ON(skb-&gt;end - skb-&gt;tail &lt; grow);</div><div class='del'>-</div><div class='del'>-	memcpy(skb_tail_pointer(skb), NAPI_GRO_CB(skb)-&gt;frag0, grow);</div><div class='del'>-</div><div class='del'>-	skb-&gt;data_len -= grow;</div><div class='del'>-	skb-&gt;tail += grow;</div><div class='del'>-</div><div class='del'>-	pinfo-&gt;frags[0].page_offset += grow;</div><div class='del'>-	skb_frag_size_sub(&amp;pinfo-&gt;frags[0], grow);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!skb_frag_size(&amp;pinfo-&gt;frags[0]))) {</div><div class='del'>-		skb_frag_unref(skb, 0);</div><div class='del'>-		memmove(pinfo-&gt;frags, pinfo-&gt;frags + 1,</div><div class='del'>-			--pinfo-&gt;nr_frags * sizeof(pinfo-&gt;frags[0]));</div><div class='del'>-	}</div><div class='add'>+	__skb_queue_purge_reason(&amp;list, SKB_DROP_REASON_DEV_READY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gro_flush_oldest(struct list_head *head)</div><div class='add'>+static bool flush_required(int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *oldest;</div><div class='add'>+#if IS_ENABLED(CONFIG_RPS)</div><div class='add'>+	struct softnet_data *sd = &amp;per_cpu(softnet_data, cpu);</div><div class='add'>+	bool do_flush;</div><div class='ctx'> </div><div class='del'>-	oldest = list_last_entry(head, struct sk_buff, list);</div><div class='add'>+	backlog_lock_irq_disable(sd);</div><div class='ctx'> </div><div class='del'>-	/* We are called with head length &gt;= MAX_GRO_SKBS, so this is</div><div class='del'>-	 * impossible.</div><div class='add'>+	/* as insertion into process_queue happens with the rps lock held,</div><div class='add'>+	 * process_queue access may race only with dequeue</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE(!oldest))</div><div class='del'>-		return;</div><div class='add'>+	do_flush = !skb_queue_empty(&amp;sd-&gt;input_pkt_queue) ||</div><div class='add'>+		   !skb_queue_empty_lockless(&amp;sd-&gt;process_queue);</div><div class='add'>+	backlog_unlock_irq_enable(sd);</div><div class='ctx'> </div><div class='del'>-	/* Do not adjust napi-&gt;gro_hash[].count, caller is adding a new</div><div class='del'>-	 * SKB to the chain.</div><div class='add'>+	return do_flush;</div><div class='add'>+#endif</div><div class='add'>+	/* without RPS we can't safely check input_pkt_queue: during a</div><div class='add'>+	 * concurrent remote skb_queue_splice() we can detect as empty both</div><div class='add'>+	 * input_pkt_queue and process_queue even if the latter could end-up</div><div class='add'>+	 * containing a lot of packets.</div><div class='ctx'> 	 */</div><div class='del'>-	list_del(&amp;oldest-&gt;list);</div><div class='del'>-	napi_gro_complete(oldest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u32 hash = skb_get_hash_raw(skb) &amp; (GRO_HASH_BUCKETS - 1);</div><div class='del'>-	struct list_head *head = &amp;offload_base;</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-	__be16 type = skb-&gt;protocol;</div><div class='del'>-	struct list_head *gro_head;</div><div class='del'>-	struct sk_buff *pp = NULL;</div><div class='del'>-	enum gro_result ret;</div><div class='del'>-	int same_flow;</div><div class='del'>-	int grow;</div><div class='del'>-</div><div class='del'>-	if (netif_elide_gro(skb-&gt;dev))</div><div class='del'>-		goto normal;</div><div class='del'>-</div><div class='del'>-	gro_head = gro_list_prepare(napi, skb);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(ptype, head, list) {</div><div class='del'>-		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_receive)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		skb_set_network_header(skb, skb_gro_offset(skb));</div><div class='del'>-		skb_reset_mac_len(skb);</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;same_flow = 0;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;flush = skb_is_gso(skb) || skb_has_frag_list(skb);</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;free = 0;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;encap_mark = 0;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;recursion_counter = 0;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;is_fou = 0;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;is_atomic = 1;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;gro_remcsum_start = 0;</div><div class='del'>-</div><div class='del'>-		/* Setup for GRO checksum validation */</div><div class='del'>-		switch (skb-&gt;ip_summed) {</div><div class='del'>-		case CHECKSUM_COMPLETE:</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum = skb-&gt;csum;</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_valid = 1;</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_cnt = 0;</div><div class='del'>-			break;</div><div class='del'>-		case CHECKSUM_UNNECESSARY:</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_cnt = skb-&gt;csum_level + 1;</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_valid = 0;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_cnt = 0;</div><div class='del'>-			NAPI_GRO_CB(skb)-&gt;csum_valid = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pp = ptype-&gt;callbacks.gro_receive(gro_head, skb);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (&amp;ptype-&gt;list == head)</div><div class='del'>-		goto normal;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(pp) &amp;&amp; PTR_ERR(pp) == -EINPROGRESS) {</div><div class='del'>-		ret = GRO_CONSUMED;</div><div class='del'>-		goto ok;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	same_flow = NAPI_GRO_CB(skb)-&gt;same_flow;</div><div class='del'>-	ret = NAPI_GRO_CB(skb)-&gt;free ? GRO_MERGED_FREE : GRO_MERGED;</div><div class='del'>-</div><div class='del'>-	if (pp) {</div><div class='del'>-		list_del(&amp;pp-&gt;list);</div><div class='del'>-		pp-&gt;next = NULL;</div><div class='del'>-		napi_gro_complete(pp);</div><div class='del'>-		napi-&gt;gro_hash[hash].count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (same_flow)</div><div class='del'>-		goto ok;</div><div class='del'>-</div><div class='del'>-	if (NAPI_GRO_CB(skb)-&gt;flush)</div><div class='del'>-		goto normal;</div><div class='del'>-</div><div class='del'>-	if (unlikely(napi-&gt;gro_hash[hash].count &gt;= MAX_GRO_SKBS)) {</div><div class='del'>-		gro_flush_oldest(gro_head);</div><div class='del'>-	} else {</div><div class='del'>-		napi-&gt;gro_hash[hash].count++;</div><div class='del'>-	}</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;count = 1;</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;age = jiffies;</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;last = skb;</div><div class='del'>-	skb_shinfo(skb)-&gt;gso_size = skb_gro_len(skb);</div><div class='del'>-	list_add(&amp;skb-&gt;list, gro_head);</div><div class='del'>-	ret = GRO_HELD;</div><div class='del'>-</div><div class='del'>-pull:</div><div class='del'>-	grow = skb_gro_offset(skb) - skb_headlen(skb);</div><div class='del'>-	if (grow &gt; 0)</div><div class='del'>-		gro_pull_from_frag0(skb, grow);</div><div class='del'>-ok:</div><div class='del'>-	if (napi-&gt;gro_hash[hash].count) {</div><div class='del'>-		if (!test_bit(hash, &amp;napi-&gt;gro_bitmask))</div><div class='del'>-			__set_bit(hash, &amp;napi-&gt;gro_bitmask);</div><div class='del'>-	} else if (test_bit(hash, &amp;napi-&gt;gro_bitmask)) {</div><div class='del'>-		__clear_bit(hash, &amp;napi-&gt;gro_bitmask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-normal:</div><div class='del'>-	ret = GRO_NORMAL;</div><div class='del'>-	goto pull;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct packet_offload *gro_find_receive_by_type(__be16 type)</div><div class='del'>-{</div><div class='del'>-	struct list_head *offload_head = &amp;offload_base;</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(ptype, offload_head, list) {</div><div class='del'>-		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_receive)</div><div class='del'>-			continue;</div><div class='del'>-		return ptype;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gro_find_receive_by_type);</div><div class='del'>-</div><div class='del'>-struct packet_offload *gro_find_complete_by_type(__be16 type)</div><div class='del'>-{</div><div class='del'>-	struct list_head *offload_head = &amp;offload_base;</div><div class='del'>-	struct packet_offload *ptype;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(ptype, offload_head, list) {</div><div class='del'>-		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_complete)</div><div class='del'>-			continue;</div><div class='del'>-		return ptype;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gro_find_complete_by_type);</div><div class='del'>-</div><div class='del'>-static void napi_skb_free_stolen_head(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	skb_dst_drop(skb);</div><div class='del'>-	secpath_reset(skb);</div><div class='del'>-	kmem_cache_free(skbuff_head_cache, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case GRO_NORMAL:</div><div class='del'>-		if (netif_receive_skb_internal(skb))</div><div class='del'>-			ret = GRO_DROP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GRO_DROP:</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GRO_MERGED_FREE:</div><div class='del'>-		if (NAPI_GRO_CB(skb)-&gt;free == NAPI_GRO_FREE_STOLEN_HEAD)</div><div class='del'>-			napi_skb_free_stolen_head(skb);</div><div class='del'>-		else</div><div class='del'>-			__kfree_skb(skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GRO_HELD:</div><div class='del'>-	case GRO_MERGED:</div><div class='del'>-	case GRO_CONSUMED:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	skb_mark_napi_id(skb, napi);</div><div class='del'>-	trace_napi_gro_receive_entry(skb);</div><div class='del'>-</div><div class='del'>-	skb_gro_reset_offset(skb);</div><div class='del'>-</div><div class='del'>-	return napi_skb_finish(dev_gro_receive(napi, skb), skb);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(napi_gro_receive);</div><div class='add'>+struct flush_backlogs {</div><div class='add'>+	cpumask_t		flush_cpus;</div><div class='add'>+	struct work_struct	w[];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)</div><div class='add'>+static struct flush_backlogs *flush_backlogs_alloc(void)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(skb-&gt;pfmemalloc)) {</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	__skb_pull(skb, skb_headlen(skb));</div><div class='del'>-	/* restore the reserve we had after netdev_alloc_skb_ip_align() */</div><div class='del'>-	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));</div><div class='del'>-	skb-&gt;vlan_tci = 0;</div><div class='del'>-	skb-&gt;dev = napi-&gt;dev;</div><div class='del'>-	skb-&gt;skb_iif = 0;</div><div class='del'>-	skb-&gt;encapsulation = 0;</div><div class='del'>-	skb_shinfo(skb)-&gt;gso_type = 0;</div><div class='del'>-	skb-&gt;truesize = SKB_TRUESIZE(skb_end_offset(skb));</div><div class='del'>-	secpath_reset(skb);</div><div class='del'>-</div><div class='del'>-	napi-&gt;skb = skb;</div><div class='add'>+	return kmalloc(struct_size_t(struct flush_backlogs, w, nr_cpu_ids),</div><div class='add'>+		       GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *napi_get_frags(struct napi_struct *napi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = napi-&gt;skb;</div><div class='add'>+static struct flush_backlogs *flush_backlogs_fallback;</div><div class='add'>+static DEFINE_MUTEX(flush_backlogs_mutex);</div><div class='ctx'> </div><div class='del'>-	if (!skb) {</div><div class='del'>-		skb = napi_alloc_skb(napi, GRO_MAX_HEAD);</div><div class='del'>-		if (skb) {</div><div class='del'>-			napi-&gt;skb = skb;</div><div class='del'>-			skb_mark_napi_id(skb, napi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(napi_get_frags);</div><div class='del'>-</div><div class='del'>-static gro_result_t napi_frags_finish(struct napi_struct *napi,</div><div class='del'>-				      struct sk_buff *skb,</div><div class='del'>-				      gro_result_t ret)</div><div class='add'>+static void flush_all_backlogs(void)</div><div class='ctx'> {</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case GRO_NORMAL:</div><div class='del'>-	case GRO_HELD:</div><div class='del'>-		__skb_push(skb, ETH_HLEN);</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='del'>-		if (ret == GRO_NORMAL &amp;&amp; netif_receive_skb_internal(skb))</div><div class='del'>-			ret = GRO_DROP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GRO_DROP:</div><div class='del'>-		napi_reuse_skb(napi, skb);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GRO_MERGED_FREE:</div><div class='del'>-		if (NAPI_GRO_CB(skb)-&gt;free == NAPI_GRO_FREE_STOLEN_HEAD)</div><div class='del'>-			napi_skb_free_stolen_head(skb);</div><div class='del'>-		else</div><div class='del'>-			napi_reuse_skb(napi, skb);</div><div class='del'>-		break;</div><div class='add'>+	struct flush_backlogs *ptr = flush_backlogs_alloc();</div><div class='add'>+	unsigned int cpu;</div><div class='ctx'> </div><div class='del'>-	case GRO_MERGED:</div><div class='del'>-	case GRO_CONSUMED:</div><div class='del'>-		break;</div><div class='add'>+	if (!ptr) {</div><div class='add'>+		mutex_lock(&amp;flush_backlogs_mutex);</div><div class='add'>+		ptr = flush_backlogs_fallback;</div><div class='ctx'> 	}</div><div class='add'>+	cpumask_clear(&amp;ptr-&gt;flush_cpus);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Upper GRO stack assumes network header starts at gro_offset=0</div><div class='del'>- * Drivers could call both napi_gro_frags() and napi_gro_receive()</div><div class='del'>- * We copy ethernet header into skb-&gt;data to have a common layout.</div><div class='del'>- */</div><div class='del'>-static struct sk_buff *napi_frags_skb(struct napi_struct *napi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = napi-&gt;skb;</div><div class='del'>-	const struct ethhdr *eth;</div><div class='del'>-	unsigned int hlen = sizeof(*eth);</div><div class='del'>-</div><div class='del'>-	napi-&gt;skb = NULL;</div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> </div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_gro_reset_offset(skb);</div><div class='del'>-</div><div class='del'>-	eth = skb_gro_header_fast(skb, 0);</div><div class='del'>-	if (unlikely(skb_gro_header_hard(skb, hlen))) {</div><div class='del'>-		eth = skb_gro_header_slow(skb, hlen, 0);</div><div class='del'>-		if (unlikely(!eth)) {</div><div class='del'>-			net_warn_ratelimited("%s: dropping impossible skb from %s\n",</div><div class='del'>-					     __func__, napi-&gt;dev-&gt;name);</div><div class='del'>-			napi_reuse_skb(napi, skb);</div><div class='del'>-			return NULL;</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		if (flush_required(cpu)) {</div><div class='add'>+			INIT_WORK(&amp;ptr-&gt;w[cpu], flush_backlog);</div><div class='add'>+			queue_work_on(cpu, system_highpri_wq, &amp;ptr-&gt;w[cpu]);</div><div class='add'>+			__cpumask_set_cpu(cpu, &amp;ptr-&gt;flush_cpus);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		gro_pull_from_frag0(skb, hlen);</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;frag0 += hlen;</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;frag0_len -= hlen;</div><div class='ctx'> 	}</div><div class='del'>-	__skb_pull(skb, hlen);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This works because the only protocols we care about don't require</div><div class='del'>-	 * special handling.</div><div class='del'>-	 * We'll fix it up properly in napi_frags_finish()</div><div class='add'>+	/* we can have in flight packet[s] on the cpus we are not flushing,</div><div class='add'>+	 * synchronize_net() in unregister_netdevice_many() will take care of</div><div class='add'>+	 * them.</div><div class='ctx'> 	 */</div><div class='del'>-	skb-&gt;protocol = eth-&gt;h_proto;</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gro_result_t napi_gro_frags(struct napi_struct *napi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = napi_frags_skb(napi);</div><div class='del'>-</div><div class='del'>-	if (!skb)</div><div class='del'>-		return GRO_DROP;</div><div class='del'>-</div><div class='del'>-	trace_napi_gro_frags_entry(skb);</div><div class='del'>-</div><div class='del'>-	return napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(napi_gro_frags);</div><div class='del'>-</div><div class='del'>-/* Compute the checksum from gro_offset and return the folded value</div><div class='del'>- * after adding in any pseudo checksum.</div><div class='del'>- */</div><div class='del'>-__sum16 __skb_gro_checksum_complete(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	__wsum wsum;</div><div class='del'>-	__sum16 sum;</div><div class='del'>-</div><div class='del'>-	wsum = skb_checksum(skb, skb_gro_offset(skb), skb_gro_len(skb), 0);</div><div class='del'>-</div><div class='del'>-	/* NAPI_GRO_CB(skb)-&gt;csum holds pseudo checksum */</div><div class='del'>-	sum = csum_fold(csum_add(NAPI_GRO_CB(skb)-&gt;csum, wsum));</div><div class='del'>-	if (likely(!sum)) {</div><div class='del'>-		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='del'>-		    !skb-&gt;csum_complete_sw)</div><div class='del'>-			netdev_rx_csum_fault(skb-&gt;dev);</div><div class='del'>-	}</div><div class='add'>+	for_each_cpu(cpu, &amp;ptr-&gt;flush_cpus)</div><div class='add'>+		flush_work(&amp;ptr-&gt;w[cpu]);</div><div class='ctx'> </div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;csum = wsum;</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;csum_valid = 1;</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return sum;</div><div class='add'>+	if (ptr != flush_backlogs_fallback)</div><div class='add'>+		kfree(ptr);</div><div class='add'>+	else</div><div class='add'>+		mutex_unlock(&amp;flush_backlogs_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_gro_checksum_complete);</div><div class='ctx'> </div><div class='ctx'> static void net_rps_send_ipi(struct softnet_data *remsd)</div><div class='ctx'> {</div><div class='hunk'>@@ -5763,7 +6556,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='ctx'> 	struct softnet_data *remsd = sd-&gt;rps_ipi_list;</div><div class='ctx'> </div><div class='del'>-	if (remsd) {</div><div class='add'>+	if (!use_backlog_threads() &amp;&amp; remsd) {</div><div class='ctx'> 		sd-&gt;rps_ipi_list = NULL;</div><div class='ctx'> </div><div class='ctx'> 		local_irq_enable();</div><div class='hunk'>@@ -5778,7 +6571,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)</div><div class='ctx'> static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	return sd-&gt;rps_ipi_list != NULL;</div><div class='add'>+	return !use_backlog_threads() &amp;&amp; sd-&gt;rps_ipi_list;</div><div class='ctx'> #else</div><div class='ctx'> 	return false;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -5798,22 +6591,26 @@ static int process_backlog(struct napi_struct *napi, int quota)</div><div class='ctx'> 		net_rps_action_and_irq_enable(sd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	napi-&gt;weight = dev_rx_weight;</div><div class='add'>+	napi-&gt;weight = READ_ONCE(net_hotdata.dev_rx_weight);</div><div class='ctx'> 	while (again) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+		local_lock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 		while ((skb = __skb_dequeue(&amp;sd-&gt;process_queue))) {</div><div class='add'>+			local_unlock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			__netif_receive_skb(skb);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-			input_queue_head_incr(sd);</div><div class='del'>-			if (++work &gt;= quota)</div><div class='add'>+			if (++work &gt;= quota) {</div><div class='add'>+				rps_input_queue_head_add(sd, work);</div><div class='ctx'> 				return work;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='add'>+			local_lock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 		}</div><div class='add'>+		local_unlock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> </div><div class='del'>-		local_irq_disable();</div><div class='del'>-		rps_lock(sd);</div><div class='add'>+		backlog_lock_irq_disable(sd);</div><div class='ctx'> 		if (skb_queue_empty(&amp;sd-&gt;input_pkt_queue)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Inline a custom version of __napi_complete().</div><div class='hunk'>@@ -5823,16 +6620,19 @@ static int process_backlog(struct napi_struct *napi, int quota)</div><div class='ctx'> 			 * We can use a plain write instead of clear_bit(),</div><div class='ctx'> 			 * and we dont need an smp_mb() memory barrier.</div><div class='ctx'> 			 */</div><div class='del'>-			napi-&gt;state = 0;</div><div class='add'>+			napi-&gt;state &amp;= NAPIF_STATE_THREADED;</div><div class='ctx'> 			again = false;</div><div class='ctx'> 		} else {</div><div class='add'>+			local_lock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 			skb_queue_splice_tail_init(&amp;sd-&gt;input_pkt_queue,</div><div class='ctx'> 						   &amp;sd-&gt;process_queue);</div><div class='add'>+			local_unlock_nested_bh(&amp;softnet_data.process_queue_bh_lock);</div><div class='ctx'> 		}</div><div class='del'>-		rps_unlock(sd);</div><div class='del'>-		local_irq_enable();</div><div class='add'>+		backlog_unlock_irq_enable(sd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (work)</div><div class='add'>+		rps_input_queue_head_add(sd, work);</div><div class='ctx'> 	return work;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5858,16 +6658,15 @@ EXPORT_SYMBOL(__napi_schedule);</div><div class='ctx'>  *	@n: napi context</div><div class='ctx'>  *</div><div class='ctx'>  * Test if NAPI routine is already running, and if not mark</div><div class='del'>- * it as running.  This is used as a condition variable</div><div class='add'>+ * it as running.  This is used as a condition variable to</div><div class='ctx'>  * insure only one NAPI poll instance runs.  We also make</div><div class='ctx'>  * sure there is no pending NAPI disable.</div><div class='ctx'>  */</div><div class='ctx'> bool napi_schedule_prep(struct napi_struct *n)</div><div class='ctx'> {</div><div class='del'>-	unsigned long val, new;</div><div class='add'>+	unsigned long new, val = READ_ONCE(n-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		val = READ_ONCE(n-&gt;state);</div><div class='ctx'> 		if (unlikely(val &amp; NAPIF_STATE_DISABLE))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		new = val | NAPIF_STATE_SCHED;</div><div class='hunk'>@@ -5880,7 +6679,7 @@ bool napi_schedule_prep(struct napi_struct *n)</div><div class='ctx'> 		 */</div><div class='ctx'> 		new |= (val &amp; NAPIF_STATE_SCHED) / NAPIF_STATE_SCHED *</div><div class='ctx'> 						   NAPIF_STATE_MISSED;</div><div class='del'>-	} while (cmpxchg(&amp;n-&gt;state, val, new) != val);</div><div class='add'>+	} while (!try_cmpxchg(&amp;n-&gt;state, &amp;val, new));</div><div class='ctx'> </div><div class='ctx'> 	return !(val &amp; NAPIF_STATE_SCHED);</div><div class='ctx'> }</div><div class='hunk'>@@ -5890,17 +6689,25 @@ EXPORT_SYMBOL(napi_schedule_prep);</div><div class='ctx'>  * __napi_schedule_irqoff - schedule for receive</div><div class='ctx'>  * @n: entry to schedule</div><div class='ctx'>  *</div><div class='del'>- * Variant of __napi_schedule() assuming hard irqs are masked</div><div class='add'>+ * Variant of __napi_schedule() assuming hard irqs are masked.</div><div class='add'>+ *</div><div class='add'>+ * On PREEMPT_RT enabled kernels this maps to __napi_schedule()</div><div class='add'>+ * because the interrupt disabled assumption might not be true</div><div class='add'>+ * due to force-threaded interrupts and spinlock substitution.</div><div class='ctx'>  */</div><div class='ctx'> void __napi_schedule_irqoff(struct napi_struct *n)</div><div class='ctx'> {</div><div class='del'>-	____napi_schedule(this_cpu_ptr(&amp;softnet_data), n);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+		____napi_schedule(this_cpu_ptr(&amp;softnet_data), n);</div><div class='add'>+	else</div><div class='add'>+		__napi_schedule(n);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__napi_schedule_irqoff);</div><div class='ctx'> </div><div class='ctx'> bool napi_complete_done(struct napi_struct *n, int work_done)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags, val, new;</div><div class='add'>+	unsigned long flags, val, new, timeout = 0;</div><div class='add'>+	bool ret = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1) Don't let napi dequeue from the cpu poll list</div><div class='hunk'>@@ -5912,31 +6719,40 @@ bool napi_complete_done(struct napi_struct *n, int work_done)</div><div class='ctx'> 				 NAPIF_STATE_IN_BUSY_POLL)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (n-&gt;gro_bitmask) {</div><div class='del'>-		unsigned long timeout = 0;</div><div class='del'>-</div><div class='del'>-		if (work_done)</div><div class='del'>-			timeout = n-&gt;dev-&gt;gro_flush_timeout;</div><div class='del'>-</div><div class='add'>+	if (work_done) {</div><div class='add'>+		if (n-&gt;gro.bitmask)</div><div class='add'>+			timeout = napi_get_gro_flush_timeout(n);</div><div class='add'>+		n-&gt;defer_hard_irqs_count = napi_get_defer_hard_irqs(n);</div><div class='add'>+	}</div><div class='add'>+	if (n-&gt;defer_hard_irqs_count &gt; 0) {</div><div class='add'>+		n-&gt;defer_hard_irqs_count--;</div><div class='add'>+		timeout = napi_get_gro_flush_timeout(n);</div><div class='ctx'> 		if (timeout)</div><div class='del'>-			hrtimer_start(&amp;n-&gt;timer, ns_to_ktime(timeout),</div><div class='del'>-				      HRTIMER_MODE_REL_PINNED);</div><div class='del'>-		else</div><div class='del'>-			napi_gro_flush(n, false);</div><div class='add'>+			ret = false;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When the NAPI instance uses a timeout and keeps postponing</div><div class='add'>+	 * it, we need to bound somehow the time packets are kept in</div><div class='add'>+	 * the GRO layer.</div><div class='add'>+	 */</div><div class='add'>+	gro_flush_normal(&amp;n-&gt;gro, !!timeout);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!list_empty(&amp;n-&gt;poll_list))) {</div><div class='ctx'> 		/* If n-&gt;poll_list is not empty, we need to mask irqs */</div><div class='ctx'> 		local_irq_save(flags);</div><div class='ctx'> 		list_del_init(&amp;n-&gt;poll_list);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 	}</div><div class='add'>+	WRITE_ONCE(n-&gt;list_owner, -1);</div><div class='ctx'> </div><div class='add'>+	val = READ_ONCE(n-&gt;state);</div><div class='ctx'> 	do {</div><div class='del'>-		val = READ_ONCE(n-&gt;state);</div><div class='del'>-</div><div class='ctx'> 		WARN_ON_ONCE(!(val &amp; NAPIF_STATE_SCHED));</div><div class='ctx'> </div><div class='del'>-		new = val &amp; ~(NAPIF_STATE_MISSED | NAPIF_STATE_SCHED);</div><div class='add'>+		new = val &amp; ~(NAPIF_STATE_MISSED | NAPIF_STATE_SCHED |</div><div class='add'>+			      NAPIF_STATE_SCHED_THREADED |</div><div class='add'>+			      NAPIF_STATE_PREFER_BUSY_POLL);</div><div class='ctx'> </div><div class='ctx'> 		/* If STATE_MISSED was set, leave STATE_SCHED set,</div><div class='ctx'> 		 * because we will call napi-&gt;poll() one more time.</div><div class='hunk'>@@ -5944,36 +6760,69 @@ bool napi_complete_done(struct napi_struct *n, int work_done)</div><div class='ctx'> 		 */</div><div class='ctx'> 		new |= (val &amp; NAPIF_STATE_MISSED) / NAPIF_STATE_MISSED *</div><div class='ctx'> 						    NAPIF_STATE_SCHED;</div><div class='del'>-	} while (cmpxchg(&amp;n-&gt;state, val, new) != val);</div><div class='add'>+	} while (!try_cmpxchg(&amp;n-&gt;state, &amp;val, new));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(val &amp; NAPIF_STATE_MISSED)) {</div><div class='ctx'> 		__napi_schedule(n);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	if (timeout)</div><div class='add'>+		hrtimer_start(&amp;n-&gt;timer, ns_to_ktime(timeout),</div><div class='add'>+			      HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(napi_complete_done);</div><div class='ctx'> </div><div class='del'>-/* must be called under rcu_read_lock(), as we dont take a reference */</div><div class='del'>-static struct napi_struct *napi_by_id(unsigned int napi_id)</div><div class='add'>+static void skb_defer_free_flush(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hash = napi_id % HASH_SIZE(napi_hash);</div><div class='del'>-	struct napi_struct *napi;</div><div class='add'>+	struct llist_node *free_list;</div><div class='add'>+	struct sk_buff *skb, *next;</div><div class='add'>+	struct skb_defer_node *sdn;</div><div class='add'>+	int node;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(napi, &amp;napi_hash[hash], napi_hash_node)</div><div class='del'>-		if (napi-&gt;napi_id == napi_id)</div><div class='del'>-			return napi;</div><div class='add'>+	for_each_node(node) {</div><div class='add'>+		sdn = this_cpu_ptr(net_hotdata.skb_defer_nodes) + node;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+		if (llist_empty(&amp;sdn-&gt;defer_list))</div><div class='add'>+			continue;</div><div class='add'>+		atomic_long_set(&amp;sdn-&gt;defer_count, 0);</div><div class='add'>+		free_list = llist_del_all(&amp;sdn-&gt;defer_list);</div><div class='add'>+</div><div class='add'>+		llist_for_each_entry_safe(skb, next, free_list, ll_node) {</div><div class='add'>+			prefetch(next);</div><div class='add'>+			napi_consume_skb(skb, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NET_RX_BUSY_POLL)</div><div class='ctx'> </div><div class='del'>-#define BUSY_POLL_BUDGET 8</div><div class='add'>+static void __busy_poll_stop(struct napi_struct *napi, bool skip_schedule)</div><div class='add'>+{</div><div class='add'>+	if (!skip_schedule) {</div><div class='add'>+		gro_normal_list(&amp;napi-&gt;gro);</div><div class='add'>+		__napi_schedule(napi);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush too old packets. If HZ &lt; 1000, flush all packets */</div><div class='add'>+	gro_flush_normal(&amp;napi-&gt;gro, HZ &gt;= 1000);</div><div class='ctx'> </div><div class='del'>-static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock)</div><div class='add'>+	clear_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NAPI_F_PREFER_BUSY_POLL	= 1,</div><div class='add'>+	NAPI_F_END_ON_RESCHED	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock,</div><div class='add'>+			   unsigned flags, u16 budget)</div><div class='ctx'> {</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	bool skip_schedule = false;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Busy polling means there is a high chance device driver hard irq</div><div class='hunk'>@@ -5989,41 +6838,59 @@ static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock)</div><div class='ctx'> 	clear_bit(NAPI_STATE_IN_BUSY_POLL, &amp;napi-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; NAPI_F_PREFER_BUSY_POLL) {</div><div class='add'>+		napi-&gt;defer_hard_irqs_count = napi_get_defer_hard_irqs(napi);</div><div class='add'>+		timeout = napi_get_gro_flush_timeout(napi);</div><div class='add'>+		if (napi-&gt;defer_hard_irqs_count &amp;&amp; timeout) {</div><div class='add'>+			hrtimer_start(&amp;napi-&gt;timer, ns_to_ktime(timeout), HRTIMER_MODE_REL_PINNED);</div><div class='add'>+			skip_schedule = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* All we really want here is to re-enable device interrupts.</div><div class='ctx'> 	 * Ideally, a new ndo_busy_poll_stop() could avoid another round.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = napi-&gt;poll(napi, BUSY_POLL_BUDGET);</div><div class='del'>-	trace_napi_poll(napi, rc, BUSY_POLL_BUDGET);</div><div class='add'>+	rc = napi-&gt;poll(napi, budget);</div><div class='add'>+	/* We can't gro_normal_list() here, because napi-&gt;poll() might have</div><div class='add'>+	 * rearmed the napi (napi_complete_done()) in which case it could</div><div class='add'>+	 * already be running on another CPU.</div><div class='add'>+	 */</div><div class='add'>+	trace_napi_poll(napi, rc, budget);</div><div class='ctx'> 	netpoll_poll_unlock(have_poll_lock);</div><div class='del'>-	if (rc == BUSY_POLL_BUDGET)</div><div class='del'>-		__napi_schedule(napi);</div><div class='add'>+	if (rc == budget)</div><div class='add'>+		__busy_poll_stop(napi, skip_schedule);</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void napi_busy_loop(unsigned int napi_id,</div><div class='del'>-		    bool (*loop_end)(void *, unsigned long),</div><div class='del'>-		    void *loop_end_arg)</div><div class='add'>+static void __napi_busy_loop(unsigned int napi_id,</div><div class='add'>+		      bool (*loop_end)(void *, unsigned long),</div><div class='add'>+		      void *loop_end_arg, unsigned flags, u16 budget)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long start_time = loop_end ? busy_loop_current_time() : 0;</div><div class='ctx'> 	int (*napi_poll)(struct napi_struct *napi, int budget);</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='ctx'> 	void *have_poll_lock = NULL;</div><div class='ctx'> 	struct napi_struct *napi;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='ctx'> restart:</div><div class='ctx'> 	napi_poll = NULL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	napi = napi_by_id(napi_id);</div><div class='ctx'> 	if (!napi)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+		preempt_disable();</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		int work = 0;</div><div class='ctx'> </div><div class='ctx'> 		local_bh_disable();</div><div class='add'>+		bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='ctx'> 		if (!napi_poll) {</div><div class='ctx'> 			unsigned long val = READ_ONCE(napi-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -6031,32 +6898,45 @@ restart:</div><div class='ctx'> 			 * we avoid dirtying napi-&gt;state as much as we can.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (val &amp; (NAPIF_STATE_DISABLE | NAPIF_STATE_SCHED |</div><div class='del'>-				   NAPIF_STATE_IN_BUSY_POLL))</div><div class='add'>+				   NAPIF_STATE_IN_BUSY_POLL)) {</div><div class='add'>+				if (flags &amp; NAPI_F_PREFER_BUSY_POLL)</div><div class='add'>+					set_bit(NAPI_STATE_PREFER_BUSY_POLL, &amp;napi-&gt;state);</div><div class='ctx'> 				goto count;</div><div class='add'>+			}</div><div class='ctx'> 			if (cmpxchg(&amp;napi-&gt;state, val,</div><div class='ctx'> 				    val | NAPIF_STATE_IN_BUSY_POLL |</div><div class='del'>-					  NAPIF_STATE_SCHED) != val)</div><div class='add'>+					  NAPIF_STATE_SCHED) != val) {</div><div class='add'>+				if (flags &amp; NAPI_F_PREFER_BUSY_POLL)</div><div class='add'>+					set_bit(NAPI_STATE_PREFER_BUSY_POLL, &amp;napi-&gt;state);</div><div class='ctx'> 				goto count;</div><div class='add'>+			}</div><div class='ctx'> 			have_poll_lock = netpoll_poll_lock(napi);</div><div class='ctx'> 			napi_poll = napi-&gt;poll;</div><div class='ctx'> 		}</div><div class='del'>-		work = napi_poll(napi, BUSY_POLL_BUDGET);</div><div class='del'>-		trace_napi_poll(napi, work, BUSY_POLL_BUDGET);</div><div class='add'>+		work = napi_poll(napi, budget);</div><div class='add'>+		trace_napi_poll(napi, work, budget);</div><div class='add'>+		gro_normal_list(&amp;napi-&gt;gro);</div><div class='ctx'> count:</div><div class='ctx'> 		if (work &gt; 0)</div><div class='ctx'> 			__NET_ADD_STATS(dev_net(napi-&gt;dev),</div><div class='ctx'> 					LINUX_MIB_BUSYPOLLRXPACKETS, work);</div><div class='add'>+		skb_defer_free_flush();</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> 		local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 		if (!loop_end || loop_end(loop_end_arg, start_time))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(need_resched())) {</div><div class='add'>+			if (flags &amp; NAPI_F_END_ON_RESCHED)</div><div class='add'>+				break;</div><div class='ctx'> 			if (napi_poll)</div><div class='del'>-				busy_poll_stop(napi, have_poll_lock);</div><div class='del'>-			preempt_enable();</div><div class='add'>+				busy_poll_stop(napi, have_poll_lock, flags, budget);</div><div class='add'>+			if (!IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+				preempt_enable();</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			cond_resched();</div><div class='add'>+			rcu_read_lock();</div><div class='ctx'> 			if (loop_end(loop_end_arg, start_time))</div><div class='ctx'> 				return;</div><div class='ctx'> 			goto restart;</div><div class='hunk'>@@ -6064,53 +6944,128 @@ count:</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='ctx'> 	if (napi_poll)</div><div class='del'>-		busy_poll_stop(napi, have_poll_lock);</div><div class='del'>-	preempt_enable();</div><div class='del'>-out:</div><div class='add'>+		busy_poll_stop(napi, have_poll_lock, flags, budget);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+		preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void napi_busy_loop_rcu(unsigned int napi_id,</div><div class='add'>+			bool (*loop_end)(void *, unsigned long),</div><div class='add'>+			void *loop_end_arg, bool prefer_busy_poll, u16 budget)</div><div class='add'>+{</div><div class='add'>+	unsigned flags = NAPI_F_END_ON_RESCHED;</div><div class='add'>+</div><div class='add'>+	if (prefer_busy_poll)</div><div class='add'>+		flags |= NAPI_F_PREFER_BUSY_POLL;</div><div class='add'>+</div><div class='add'>+	__napi_busy_loop(napi_id, loop_end, loop_end_arg, flags, budget);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void napi_busy_loop(unsigned int napi_id,</div><div class='add'>+		    bool (*loop_end)(void *, unsigned long),</div><div class='add'>+		    void *loop_end_arg, bool prefer_busy_poll, u16 budget)</div><div class='add'>+{</div><div class='add'>+	unsigned flags = prefer_busy_poll ? NAPI_F_PREFER_BUSY_POLL : 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	__napi_busy_loop(napi_id, loop_end, loop_end_arg, flags, budget);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(napi_busy_loop);</div><div class='ctx'> </div><div class='add'>+void napi_suspend_irqs(unsigned int napi_id)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	napi = napi_by_id(napi_id);</div><div class='add'>+	if (napi) {</div><div class='add'>+		unsigned long timeout = napi_get_irq_suspend_timeout(napi);</div><div class='add'>+</div><div class='add'>+		if (timeout)</div><div class='add'>+			hrtimer_start(&amp;napi-&gt;timer, ns_to_ktime(timeout),</div><div class='add'>+				      HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void napi_resume_irqs(unsigned int napi_id)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	napi = napi_by_id(napi_id);</div><div class='add'>+	if (napi) {</div><div class='add'>+		/* If irq_suspend_timeout is set to 0 between the call to</div><div class='add'>+		 * napi_suspend_irqs and now, the original value still</div><div class='add'>+		 * determines the safety timeout as intended and napi_watchdog</div><div class='add'>+		 * will resume irq processing.</div><div class='add'>+		 */</div><div class='add'>+		if (napi_get_irq_suspend_timeout(napi)) {</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			napi_schedule(napi);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_NET_RX_BUSY_POLL */</div><div class='ctx'> </div><div class='add'>+static void __napi_hash_add_with_id(struct napi_struct *napi,</div><div class='add'>+				    unsigned int napi_id)</div><div class='add'>+{</div><div class='add'>+	napi-&gt;gro.cached_napi_id = napi_id;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(napi-&gt;napi_id, napi_id);</div><div class='add'>+	hlist_add_head_rcu(&amp;napi-&gt;napi_hash_node,</div><div class='add'>+			   &amp;napi_hash[napi-&gt;napi_id % HASH_SIZE(napi_hash)]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void napi_hash_add_with_id(struct napi_struct *napi,</div><div class='add'>+				  unsigned int napi_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;napi_hash_lock, flags);</div><div class='add'>+	WARN_ON_ONCE(napi_by_id(napi_id));</div><div class='add'>+	__napi_hash_add_with_id(napi, napi_id);</div><div class='add'>+	spin_unlock_irqrestore(&amp;napi_hash_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void napi_hash_add(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(NAPI_STATE_NO_BUSY_POLL, &amp;napi-&gt;state) ||</div><div class='del'>-	    test_and_set_bit(NAPI_STATE_HASHED, &amp;napi-&gt;state))</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (test_bit(NAPI_STATE_NO_BUSY_POLL, &amp;napi-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;napi_hash_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;napi_hash_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* 0..NR_CPUS range is reserved for sender_cpu use */</div><div class='ctx'> 	do {</div><div class='del'>-		if (unlikely(++napi_gen_id &lt; MIN_NAPI_ID))</div><div class='add'>+		if (unlikely(!napi_id_valid(++napi_gen_id)))</div><div class='ctx'> 			napi_gen_id = MIN_NAPI_ID;</div><div class='ctx'> 	} while (napi_by_id(napi_gen_id));</div><div class='del'>-	napi-&gt;napi_id = napi_gen_id;</div><div class='ctx'> </div><div class='del'>-	hlist_add_head_rcu(&amp;napi-&gt;napi_hash_node,</div><div class='del'>-			   &amp;napi_hash[napi-&gt;napi_id % HASH_SIZE(napi_hash)]);</div><div class='add'>+	__napi_hash_add_with_id(napi, napi_gen_id);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;napi_hash_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;napi_hash_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Warning : caller is responsible to make sure rcu grace period</div><div class='ctx'>  * is respected before freeing memory containing @napi</div><div class='ctx'>  */</div><div class='del'>-bool napi_hash_del(struct napi_struct *napi)</div><div class='add'>+static void napi_hash_del(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='del'>-	bool rcu_sync_needed = false;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;napi_hash_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;napi_hash_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(NAPI_STATE_HASHED, &amp;napi-&gt;state)) {</div><div class='del'>-		rcu_sync_needed = true;</div><div class='del'>-		hlist_del_rcu(&amp;napi-&gt;napi_hash_node);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;napi_hash_lock);</div><div class='del'>-	return rcu_sync_needed;</div><div class='add'>+	hlist_del_init_rcu(&amp;napi-&gt;napi_hash_node);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;napi_hash_lock, flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(napi_hash_del);</div><div class='ctx'> </div><div class='ctx'> static enum hrtimer_restart napi_watchdog(struct hrtimer *timer)</div><div class='ctx'> {</div><div class='hunk'>@@ -6121,99 +7076,583 @@ static enum hrtimer_restart napi_watchdog(struct hrtimer *timer)</div><div class='ctx'> 	/* Note : we use a relaxed variant of napi_schedule_prep() not setting</div><div class='ctx'> 	 * NAPI_STATE_MISSED, since we do not react to a device IRQ.</div><div class='ctx'> 	 */</div><div class='del'>-	if (napi-&gt;gro_bitmask &amp;&amp; !napi_disable_pending(napi) &amp;&amp;</div><div class='del'>-	    !test_and_set_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state))</div><div class='add'>+	if (!napi_disable_pending(napi) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state)) {</div><div class='add'>+		clear_bit(NAPI_STATE_PREFER_BUSY_POLL, &amp;napi-&gt;state);</div><div class='ctx'> 		__napi_schedule_irqoff(napi);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void init_gro_hash(struct napi_struct *napi)</div><div class='add'>+static void napi_stop_kthread(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	unsigned long val, new;</div><div class='add'>+</div><div class='add'>+	/* Wait until the napi STATE_THREADED is unset. */</div><div class='add'>+	while (true) {</div><div class='add'>+		val = READ_ONCE(napi-&gt;state);</div><div class='add'>+</div><div class='add'>+		/* If napi kthread own this napi or the napi is idle,</div><div class='add'>+		 * STATE_THREADED can be unset here.</div><div class='add'>+		 */</div><div class='add'>+		if ((val &amp; NAPIF_STATE_SCHED_THREADED) ||</div><div class='add'>+		    !(val &amp; NAPIF_STATE_SCHED)) {</div><div class='add'>+			new = val &amp; (~(NAPIF_STATE_THREADED |</div><div class='add'>+				       NAPIF_STATE_THREADED_BUSY_POLL));</div><div class='add'>+		} else {</div><div class='add'>+			msleep(20);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (try_cmpxchg(&amp;napi-&gt;state, &amp;val, new))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Once STATE_THREADED is unset, wait for SCHED_THREADED to be unset by</div><div class='add'>+	 * the kthread.</div><div class='add'>+	 */</div><div class='add'>+	while (true) {</div><div class='add'>+		if (!test_bit(NAPI_STATE_SCHED_THREADED, &amp;napi-&gt;state))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kthread_stop(napi-&gt;thread);</div><div class='add'>+	napi-&gt;thread = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void napi_set_threaded_state(struct napi_struct *napi,</div><div class='add'>+				    enum netdev_napi_threaded threaded_mode)</div><div class='add'>+{</div><div class='add'>+	bool threaded = threaded_mode != NETDEV_NAPI_THREADED_DISABLED;</div><div class='add'>+	bool busy_poll = threaded_mode == NETDEV_NAPI_THREADED_BUSY_POLL;</div><div class='add'>+</div><div class='add'>+	assign_bit(NAPI_STATE_THREADED, &amp;napi-&gt;state, threaded);</div><div class='add'>+	assign_bit(NAPI_STATE_THREADED_BUSY_POLL, &amp;napi-&gt;state, busy_poll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int napi_set_threaded(struct napi_struct *napi,</div><div class='add'>+		      enum netdev_napi_threaded threaded)</div><div class='add'>+{</div><div class='add'>+	if (threaded) {</div><div class='add'>+		if (!napi-&gt;thread) {</div><div class='add'>+			int err = napi_kthread_create(napi);</div><div class='add'>+</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;config)</div><div class='add'>+		napi-&gt;config-&gt;threaded = threaded;</div><div class='add'>+</div><div class='add'>+	/* Setting/unsetting threaded mode on a napi might not immediately</div><div class='add'>+	 * take effect, if the current napi instance is actively being</div><div class='add'>+	 * polled. In this case, the switch between threaded mode and</div><div class='add'>+	 * softirq mode will happen in the next round of napi_schedule().</div><div class='add'>+	 * This should not cause hiccups/stalls to the live traffic.</div><div class='add'>+	 */</div><div class='add'>+	if (!threaded &amp;&amp; napi-&gt;thread) {</div><div class='add'>+		napi_stop_kthread(napi);</div><div class='add'>+	} else {</div><div class='add'>+		/* Make sure kthread is created before THREADED bit is set. */</div><div class='add'>+		smp_mb__before_atomic();</div><div class='add'>+		napi_set_threaded_state(napi, threaded);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netif_set_threaded(struct net_device *dev,</div><div class='add'>+		       enum netdev_napi_threaded threaded)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked_or_invisible(dev);</div><div class='add'>+</div><div class='add'>+	if (threaded) {</div><div class='add'>+		list_for_each_entry(napi, &amp;dev-&gt;napi_list, dev_list) {</div><div class='add'>+			if (!napi-&gt;thread) {</div><div class='add'>+				err = napi_kthread_create(napi);</div><div class='add'>+				if (err) {</div><div class='add'>+					threaded = NETDEV_NAPI_THREADED_DISABLED;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dev-&gt;threaded, threaded);</div><div class='add'>+</div><div class='add'>+	/* The error should not occur as the kthreads are already created. */</div><div class='add'>+	list_for_each_entry(napi, &amp;dev-&gt;napi_list, dev_list)</div><div class='add'>+		WARN_ON_ONCE(napi_set_threaded(napi, threaded));</div><div class='add'>+</div><div class='add'>+	/* Override the config for all NAPIs even if currently not listed */</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_napi_configs; i++)</div><div class='add'>+		dev-&gt;napi_config[i].threaded = threaded;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_threaded_enable() - enable threaded NAPIs</div><div class='add'>+ * @dev: net_device instance</div><div class='add'>+ *</div><div class='add'>+ * Enable threaded mode for the NAPI instances of the device. This may be useful</div><div class='add'>+ * for devices where multiple NAPI instances get scheduled by a single</div><div class='add'>+ * interrupt. Threaded NAPI allows moving the NAPI processing to cores other</div><div class='add'>+ * than the core where IRQ is mapped.</div><div class='add'>+ *</div><div class='add'>+ * This function should be called before @dev is registered.</div><div class='add'>+ */</div><div class='add'>+void netif_threaded_enable(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(netif_set_threaded(dev, NETDEV_NAPI_THREADED_ENABLED));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_threaded_enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_queue_set_napi - Associate queue with the napi</div><div class='add'>+ * @dev: device to which NAPI and queue belong</div><div class='add'>+ * @queue_index: Index of queue</div><div class='add'>+ * @type: queue type as RX or TX</div><div class='add'>+ * @napi: NAPI context, pass NULL to clear previously set NAPI</div><div class='add'>+ *</div><div class='add'>+ * Set queue with its corresponding napi context. This should be done after</div><div class='add'>+ * registering the NAPI handler for the queue-vector and the queues have been</div><div class='add'>+ * mapped to the corresponding interrupt vector.</div><div class='add'>+ */</div><div class='add'>+void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index,</div><div class='add'>+			  enum netdev_queue_type type, struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(napi &amp;&amp; !napi-&gt;dev))</div><div class='add'>+		return;</div><div class='add'>+	netdev_ops_assert_locked_or_invisible(dev);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NETDEV_QUEUE_TYPE_RX:</div><div class='add'>+		rxq = __netif_get_rx_queue(dev, queue_index);</div><div class='add'>+		rxq-&gt;napi = napi;</div><div class='add'>+		return;</div><div class='add'>+	case NETDEV_QUEUE_TYPE_TX:</div><div class='add'>+		txq = netdev_get_tx_queue(dev, queue_index);</div><div class='add'>+		txq-&gt;napi = napi;</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_queue_set_napi);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netif_napi_irq_notify(struct irq_affinity_notify *notify,</div><div class='add'>+		      const cpumask_t *mask)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi =</div><div class='add'>+		container_of(notify, struct napi_struct, notify);</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	struct cpu_rmap *rmap = napi-&gt;dev-&gt;rx_cpu_rmap;</div><div class='add'>+	int err;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;config &amp;&amp; napi-&gt;dev-&gt;irq_affinity_auto)</div><div class='add'>+		cpumask_copy(&amp;napi-&gt;config-&gt;affinity_mask, mask);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	if (napi-&gt;dev-&gt;rx_cpu_rmap_auto) {</div><div class='add'>+		err = cpu_rmap_update(rmap, napi-&gt;napi_rmap_idx, mask);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_warn(napi-&gt;dev, "RMAP update failed (%d)\n",</div><div class='add'>+				    err);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+static void netif_napi_affinity_release(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi =</div><div class='add'>+		container_of(ref, struct napi_struct, notify.kref);</div><div class='add'>+	struct cpu_rmap *rmap = napi-&gt;dev-&gt;rx_cpu_rmap;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked(napi-&gt;dev);</div><div class='add'>+	WARN_ON(test_and_clear_bit(NAPI_STATE_HAS_NOTIFIER,</div><div class='add'>+				   &amp;napi-&gt;state));</div><div class='add'>+</div><div class='add'>+	if (!napi-&gt;dev-&gt;rx_cpu_rmap_auto)</div><div class='add'>+		return;</div><div class='add'>+	rmap-&gt;obj[napi-&gt;napi_rmap_idx] = NULL;</div><div class='add'>+	napi-&gt;napi_rmap_idx = -1;</div><div class='add'>+	cpu_rmap_put(rmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netif_enable_cpu_rmap(struct net_device *dev, unsigned int num_irqs)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;rx_cpu_rmap_auto)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;rx_cpu_rmap = alloc_irq_cpu_rmap(num_irqs);</div><div class='add'>+	if (!dev-&gt;rx_cpu_rmap)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;rx_cpu_rmap_auto = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_enable_cpu_rmap);</div><div class='add'>+</div><div class='add'>+static void netif_del_cpu_rmap(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cpu_rmap *rmap = dev-&gt;rx_cpu_rmap;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;rx_cpu_rmap_auto)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Free the rmap */</div><div class='add'>+	cpu_rmap_put(rmap);</div><div class='add'>+	dev-&gt;rx_cpu_rmap = NULL;</div><div class='add'>+	dev-&gt;rx_cpu_rmap_auto = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static void netif_napi_affinity_release(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netif_enable_cpu_rmap(struct net_device *dev, unsigned int num_irqs)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_enable_cpu_rmap);</div><div class='add'>+</div><div class='add'>+static void netif_del_cpu_rmap(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void netif_set_affinity_auto(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, maxqs, numa;</div><div class='add'>+</div><div class='add'>+	maxqs = max(dev-&gt;num_tx_queues, dev-&gt;num_rx_queues);</div><div class='add'>+	numa = dev_to_node(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; maxqs; i++)</div><div class='add'>+		cpumask_set_cpu(cpumask_local_spread(i, numa),</div><div class='add'>+				&amp;dev-&gt;napi_config[i].affinity_mask);</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq_affinity_auto = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_set_affinity_auto);</div><div class='add'>+</div><div class='add'>+void netif_napi_set_irq_locked(struct napi_struct *napi, int irq)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; GRO_HASH_BUCKETS; i++) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;napi-&gt;gro_hash[i].list);</div><div class='del'>-		napi-&gt;gro_hash[i].count = 0;</div><div class='add'>+	netdev_assert_locked_or_invisible(napi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;irq == irq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Remove existing resources */</div><div class='add'>+	if (test_and_clear_bit(NAPI_STATE_HAS_NOTIFIER, &amp;napi-&gt;state))</div><div class='add'>+		irq_set_affinity_notifier(napi-&gt;irq, NULL);</div><div class='add'>+</div><div class='add'>+	napi-&gt;irq = irq;</div><div class='add'>+	if (irq &lt; 0 ||</div><div class='add'>+	    (!napi-&gt;dev-&gt;rx_cpu_rmap_auto &amp;&amp; !napi-&gt;dev-&gt;irq_affinity_auto))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Abort for buggy drivers */</div><div class='add'>+	if (napi-&gt;dev-&gt;irq_affinity_auto &amp;&amp; WARN_ON_ONCE(!napi-&gt;config))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	if (napi-&gt;dev-&gt;rx_cpu_rmap_auto) {</div><div class='add'>+		rc = cpu_rmap_add(napi-&gt;dev-&gt;rx_cpu_rmap, napi);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		cpu_rmap_get(napi-&gt;dev-&gt;rx_cpu_rmap);</div><div class='add'>+		napi-&gt;napi_rmap_idx = rc;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Use core IRQ notifier */</div><div class='add'>+	napi-&gt;notify.notify = netif_napi_irq_notify;</div><div class='add'>+	napi-&gt;notify.release = netif_napi_affinity_release;</div><div class='add'>+	rc = irq_set_affinity_notifier(irq, &amp;napi-&gt;notify);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_warn(napi-&gt;dev, "Unable to set IRQ notifier (%d)\n",</div><div class='add'>+			    rc);</div><div class='add'>+		goto put_rmap;</div><div class='ctx'> 	}</div><div class='del'>-	napi-&gt;gro_bitmask = 0;</div><div class='add'>+</div><div class='add'>+	set_bit(NAPI_STATE_HAS_NOTIFIER, &amp;napi-&gt;state);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+put_rmap:</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	if (napi-&gt;dev-&gt;rx_cpu_rmap_auto) {</div><div class='add'>+		napi-&gt;dev-&gt;rx_cpu_rmap-&gt;obj[napi-&gt;napi_rmap_idx] = NULL;</div><div class='add'>+		cpu_rmap_put(napi-&gt;dev-&gt;rx_cpu_rmap);</div><div class='add'>+		napi-&gt;napi_rmap_idx = -1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	napi-&gt;notify.notify = NULL;</div><div class='add'>+	napi-&gt;notify.release = NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netif_napi_set_irq_locked);</div><div class='ctx'> </div><div class='del'>-void netif_napi_add(struct net_device *dev, struct napi_struct *napi,</div><div class='del'>-		    int (*poll)(struct napi_struct *, int), int weight)</div><div class='add'>+static void napi_restore_config(struct napi_struct *n)</div><div class='ctx'> {</div><div class='add'>+	n-&gt;defer_hard_irqs = n-&gt;config-&gt;defer_hard_irqs;</div><div class='add'>+	n-&gt;gro_flush_timeout = n-&gt;config-&gt;gro_flush_timeout;</div><div class='add'>+	n-&gt;irq_suspend_timeout = n-&gt;config-&gt;irq_suspend_timeout;</div><div class='add'>+</div><div class='add'>+	if (n-&gt;dev-&gt;irq_affinity_auto &amp;&amp;</div><div class='add'>+	    test_bit(NAPI_STATE_HAS_NOTIFIER, &amp;n-&gt;state))</div><div class='add'>+		irq_set_affinity(n-&gt;irq, &amp;n-&gt;config-&gt;affinity_mask);</div><div class='add'>+</div><div class='add'>+	/* a NAPI ID might be stored in the config, if so use it. if not, use</div><div class='add'>+	 * napi_hash_add to generate one for us.</div><div class='add'>+	 */</div><div class='add'>+	if (n-&gt;config-&gt;napi_id) {</div><div class='add'>+		napi_hash_add_with_id(n, n-&gt;config-&gt;napi_id);</div><div class='add'>+	} else {</div><div class='add'>+		napi_hash_add(n);</div><div class='add'>+		n-&gt;config-&gt;napi_id = n-&gt;napi_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(napi_set_threaded(n, n-&gt;config-&gt;threaded));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void napi_save_config(struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	n-&gt;config-&gt;defer_hard_irqs = n-&gt;defer_hard_irqs;</div><div class='add'>+	n-&gt;config-&gt;gro_flush_timeout = n-&gt;gro_flush_timeout;</div><div class='add'>+	n-&gt;config-&gt;irq_suspend_timeout = n-&gt;irq_suspend_timeout;</div><div class='add'>+	napi_hash_del(n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Netlink wants the NAPI list to be sorted by ID, if adding a NAPI which will</div><div class='add'>+ * inherit an existing ID try to insert it at the right position.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+netif_napi_dev_list_add(struct net_device *dev, struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	unsigned int new_id, pos_id;</div><div class='add'>+	struct list_head *higher;</div><div class='add'>+	struct napi_struct *pos;</div><div class='add'>+</div><div class='add'>+	new_id = UINT_MAX;</div><div class='add'>+	if (napi-&gt;config &amp;&amp; napi-&gt;config-&gt;napi_id)</div><div class='add'>+		new_id = napi-&gt;config-&gt;napi_id;</div><div class='add'>+</div><div class='add'>+	higher = &amp;dev-&gt;napi_list;</div><div class='add'>+	list_for_each_entry(pos, &amp;dev-&gt;napi_list, dev_list) {</div><div class='add'>+		if (napi_id_valid(pos-&gt;napi_id))</div><div class='add'>+			pos_id = pos-&gt;napi_id;</div><div class='add'>+		else if (pos-&gt;config)</div><div class='add'>+			pos_id = pos-&gt;config-&gt;napi_id;</div><div class='add'>+		else</div><div class='add'>+			pos_id = UINT_MAX;</div><div class='add'>+</div><div class='add'>+		if (pos_id &lt;= new_id)</div><div class='add'>+			break;</div><div class='add'>+		higher = &amp;pos-&gt;dev_list;</div><div class='add'>+	}</div><div class='add'>+	list_add_rcu(&amp;napi-&gt;dev_list, higher); /* adds after higher */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Double check that napi_get_frags() allocates skbs with</div><div class='add'>+ * skb-&gt;head being backed by slab, not a page fragment.</div><div class='add'>+ * This is to make sure bug fixed in 3226b158e67c</div><div class='add'>+ * ("net: avoid 32 x truesize under-estimation for tiny skbs")</div><div class='add'>+ * does not accidentally come back.</div><div class='add'>+ */</div><div class='add'>+static void napi_get_frags_check(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	skb = napi_get_frags(napi);</div><div class='add'>+	WARN_ON_ONCE(skb &amp;&amp; skb-&gt;head_frag);</div><div class='add'>+	napi_free_frags(napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netif_napi_add_weight_locked(struct net_device *dev,</div><div class='add'>+				  struct napi_struct *napi,</div><div class='add'>+				  int (*poll)(struct napi_struct *, int),</div><div class='add'>+				  int weight)</div><div class='add'>+{</div><div class='add'>+	netdev_assert_locked(dev);</div><div class='add'>+	if (WARN_ON(test_and_set_bit(NAPI_STATE_LISTED, &amp;napi-&gt;state)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;napi-&gt;poll_list);</div><div class='del'>-	hrtimer_init(&amp;napi-&gt;timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);</div><div class='del'>-	napi-&gt;timer.function = napi_watchdog;</div><div class='del'>-	init_gro_hash(napi);</div><div class='add'>+	INIT_HLIST_NODE(&amp;napi-&gt;napi_hash_node);</div><div class='add'>+	hrtimer_setup(&amp;napi-&gt;timer, napi_watchdog, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	gro_init(&amp;napi-&gt;gro);</div><div class='ctx'> 	napi-&gt;skb = NULL;</div><div class='ctx'> 	napi-&gt;poll = poll;</div><div class='ctx'> 	if (weight &gt; NAPI_POLL_WEIGHT)</div><div class='del'>-		pr_err_once("netif_napi_add() called with weight %d on device %s\n",</div><div class='del'>-			    weight, dev-&gt;name);</div><div class='add'>+		netdev_err_once(dev, "%s() called with weight %d\n", __func__,</div><div class='add'>+				weight);</div><div class='ctx'> 	napi-&gt;weight = weight;</div><div class='del'>-	list_add(&amp;napi-&gt;dev_list, &amp;dev-&gt;napi_list);</div><div class='ctx'> 	napi-&gt;dev = dev;</div><div class='ctx'> #ifdef CONFIG_NETPOLL</div><div class='ctx'> 	napi-&gt;poll_owner = -1;</div><div class='ctx'> #endif</div><div class='add'>+	napi-&gt;list_owner = -1;</div><div class='ctx'> 	set_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state);</div><div class='del'>-	napi_hash_add(napi);</div><div class='add'>+	set_bit(NAPI_STATE_NPSVC, &amp;napi-&gt;state);</div><div class='add'>+	netif_napi_dev_list_add(dev, napi);</div><div class='add'>+</div><div class='add'>+	/* default settings from sysfs are applied to all NAPIs. any per-NAPI</div><div class='add'>+	 * configuration will be loaded in napi_enable</div><div class='add'>+	 */</div><div class='add'>+	napi_set_defer_hard_irqs(napi, READ_ONCE(dev-&gt;napi_defer_hard_irqs));</div><div class='add'>+	napi_set_gro_flush_timeout(napi, READ_ONCE(dev-&gt;gro_flush_timeout));</div><div class='add'>+</div><div class='add'>+	napi_get_frags_check(napi);</div><div class='add'>+	/* Create kthread for this napi if dev-&gt;threaded is set.</div><div class='add'>+	 * Clear dev-&gt;threaded if kthread creation failed so that</div><div class='add'>+	 * threaded mode will not be enabled in napi_enable().</div><div class='add'>+	 */</div><div class='add'>+	if (napi_get_threaded_config(dev, napi))</div><div class='add'>+		if (napi_kthread_create(napi))</div><div class='add'>+			dev-&gt;threaded = NETDEV_NAPI_THREADED_DISABLED;</div><div class='add'>+	netif_napi_set_irq_locked(napi, -1);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netif_napi_add);</div><div class='add'>+EXPORT_SYMBOL(netif_napi_add_weight_locked);</div><div class='ctx'> </div><div class='del'>-void napi_disable(struct napi_struct *n)</div><div class='add'>+void napi_disable_locked(struct napi_struct *n)</div><div class='ctx'> {</div><div class='add'>+	unsigned long val, new;</div><div class='add'>+</div><div class='ctx'> 	might_sleep();</div><div class='add'>+	netdev_assert_locked(n-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	set_bit(NAPI_STATE_DISABLE, &amp;n-&gt;state);</div><div class='ctx'> </div><div class='del'>-	while (test_and_set_bit(NAPI_STATE_SCHED, &amp;n-&gt;state))</div><div class='del'>-		msleep(1);</div><div class='del'>-	while (test_and_set_bit(NAPI_STATE_NPSVC, &amp;n-&gt;state))</div><div class='del'>-		msleep(1);</div><div class='add'>+	val = READ_ONCE(n-&gt;state);</div><div class='add'>+	do {</div><div class='add'>+		while (val &amp; (NAPIF_STATE_SCHED | NAPIF_STATE_NPSVC)) {</div><div class='add'>+			usleep_range(20, 200);</div><div class='add'>+			val = READ_ONCE(n-&gt;state);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new = val | NAPIF_STATE_SCHED | NAPIF_STATE_NPSVC;</div><div class='add'>+		new &amp;= ~(NAPIF_STATE_THREADED |</div><div class='add'>+			 NAPIF_STATE_THREADED_BUSY_POLL |</div><div class='add'>+			 NAPIF_STATE_PREFER_BUSY_POLL);</div><div class='add'>+	} while (!try_cmpxchg(&amp;n-&gt;state, &amp;val, new));</div><div class='ctx'> </div><div class='ctx'> 	hrtimer_cancel(&amp;n-&gt;timer);</div><div class='ctx'> </div><div class='add'>+	if (n-&gt;config)</div><div class='add'>+		napi_save_config(n);</div><div class='add'>+	else</div><div class='add'>+		napi_hash_del(n);</div><div class='add'>+</div><div class='ctx'> 	clear_bit(NAPI_STATE_DISABLE, &amp;n-&gt;state);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(napi_disable_locked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_disable() - prevent NAPI from scheduling</div><div class='add'>+ * @n: NAPI context</div><div class='add'>+ *</div><div class='add'>+ * Stop NAPI from being scheduled on this context.</div><div class='add'>+ * Waits till any outstanding processing completes.</div><div class='add'>+ * Takes netdev_lock() for associated net_device.</div><div class='add'>+ */</div><div class='add'>+void napi_disable(struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(n-&gt;dev);</div><div class='add'>+	napi_disable_locked(n);</div><div class='add'>+	netdev_unlock(n-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(napi_disable);</div><div class='ctx'> </div><div class='del'>-static void flush_gro_hash(struct napi_struct *napi)</div><div class='add'>+void napi_enable_locked(struct napi_struct *n)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	unsigned long new, val = READ_ONCE(n-&gt;state);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; GRO_HASH_BUCKETS; i++) {</div><div class='del'>-		struct sk_buff *skb, *n;</div><div class='add'>+	if (n-&gt;config)</div><div class='add'>+		napi_restore_config(n);</div><div class='add'>+	else</div><div class='add'>+		napi_hash_add(n);</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(skb, n, &amp;napi-&gt;gro_hash[i].list, list)</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		napi-&gt;gro_hash[i].count = 0;</div><div class='del'>-	}</div><div class='add'>+	do {</div><div class='add'>+		BUG_ON(!test_bit(NAPI_STATE_SCHED, &amp;val));</div><div class='add'>+</div><div class='add'>+		new = val &amp; ~(NAPIF_STATE_SCHED | NAPIF_STATE_NPSVC);</div><div class='add'>+		if (n-&gt;dev-&gt;threaded &amp;&amp; n-&gt;thread)</div><div class='add'>+			new |= NAPIF_STATE_THREADED;</div><div class='add'>+	} while (!try_cmpxchg(&amp;n-&gt;state, &amp;val, new));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(napi_enable_locked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_enable() - enable NAPI scheduling</div><div class='add'>+ * @n: NAPI context</div><div class='add'>+ *</div><div class='add'>+ * Enable scheduling of a NAPI instance.</div><div class='add'>+ * Must be paired with napi_disable().</div><div class='add'>+ * Takes netdev_lock() for associated net_device.</div><div class='add'>+ */</div><div class='add'>+void napi_enable(struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(n-&gt;dev);</div><div class='add'>+	napi_enable_locked(n);</div><div class='add'>+	netdev_unlock(n-&gt;dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(napi_enable);</div><div class='ctx'> </div><div class='ctx'> /* Must be called in process context */</div><div class='del'>-void netif_napi_del(struct napi_struct *napi)</div><div class='add'>+void __netif_napi_del_locked(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='del'>-	might_sleep();</div><div class='del'>-	if (napi_hash_del(napi))</div><div class='del'>-		synchronize_net();</div><div class='del'>-	list_del_init(&amp;napi-&gt;dev_list);</div><div class='add'>+	netdev_assert_locked(napi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(NAPI_STATE_LISTED, &amp;napi-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Make sure NAPI is disabled (or was never enabled). */</div><div class='add'>+	WARN_ON(!test_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state));</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(NAPI_STATE_HAS_NOTIFIER, &amp;napi-&gt;state))</div><div class='add'>+		irq_set_affinity_notifier(napi-&gt;irq, NULL);</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;config) {</div><div class='add'>+		napi-&gt;index = -1;</div><div class='add'>+		napi-&gt;config = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del_rcu(&amp;napi-&gt;dev_list);</div><div class='ctx'> 	napi_free_frags(napi);</div><div class='ctx'> </div><div class='del'>-	flush_gro_hash(napi);</div><div class='del'>-	napi-&gt;gro_bitmask = 0;</div><div class='add'>+	gro_cleanup(&amp;napi-&gt;gro);</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;thread) {</div><div class='add'>+		kthread_stop(napi-&gt;thread);</div><div class='add'>+		napi-&gt;thread = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netif_napi_del);</div><div class='add'>+EXPORT_SYMBOL(__netif_napi_del_locked);</div><div class='ctx'> </div><div class='del'>-static int napi_poll(struct napi_struct *n, struct list_head *repoll)</div><div class='add'>+static int __napi_poll(struct napi_struct *n, bool *repoll)</div><div class='ctx'> {</div><div class='del'>-	void *have;</div><div class='ctx'> 	int work, weight;</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;n-&gt;poll_list);</div><div class='del'>-</div><div class='del'>-	have = netpoll_poll_lock(n);</div><div class='del'>-</div><div class='ctx'> 	weight = n-&gt;weight;</div><div class='ctx'> </div><div class='ctx'> 	/* This NAPI_STATE_SCHED test is for avoiding a race</div><div class='hunk'>@@ -6223,15 +7662,19 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)</div><div class='ctx'> 	 * accidentally calling -&gt;poll() when NAPI is not scheduled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	work = 0;</div><div class='del'>-	if (test_bit(NAPI_STATE_SCHED, &amp;n-&gt;state)) {</div><div class='add'>+	if (napi_is_scheduled(n)) {</div><div class='ctx'> 		work = n-&gt;poll(n, weight);</div><div class='ctx'> 		trace_napi_poll(n, work, weight);</div><div class='add'>+</div><div class='add'>+		xdp_do_check_flushed(n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(work &gt; weight);</div><div class='add'>+	if (unlikely(work &gt; weight))</div><div class='add'>+		netdev_err_once(n-&gt;dev, "NAPI poll function %pS returned %d, exceeding its budget of %d.\n",</div><div class='add'>+				n-&gt;poll, work, weight);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(work &lt; weight))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return work;</div><div class='ctx'> </div><div class='ctx'> 	/* Drivers must not modify the NAPI state if they</div><div class='ctx'> 	 * consume the entire weight.  In such cases this code</div><div class='hunk'>@@ -6240,42 +7683,175 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(napi_disable_pending(n))) {</div><div class='ctx'> 		napi_complete(n);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return work;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (n-&gt;gro_bitmask) {</div><div class='del'>-		/* flush too old packets</div><div class='del'>-		 * If HZ &lt; 1000, flush all packets.</div><div class='del'>-		 */</div><div class='del'>-		napi_gro_flush(n, HZ &gt;= 1000);</div><div class='add'>+	/* The NAPI context has more processing work, but busy-polling</div><div class='add'>+	 * is preferred. Exit early.</div><div class='add'>+	 */</div><div class='add'>+	if (napi_prefer_busy_poll(n)) {</div><div class='add'>+		if (napi_complete_done(n, work)) {</div><div class='add'>+			/* If timeout is not set, we need to make sure</div><div class='add'>+			 * that the NAPI is re-scheduled.</div><div class='add'>+			 */</div><div class='add'>+			napi_schedule(n);</div><div class='add'>+		}</div><div class='add'>+		return work;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Flush too old packets. If HZ &lt; 1000, flush all packets */</div><div class='add'>+	gro_flush_normal(&amp;n-&gt;gro, HZ &gt;= 1000);</div><div class='add'>+</div><div class='ctx'> 	/* Some drivers may have called napi_schedule</div><div class='ctx'> 	 * prior to exhausting their budget.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(!list_empty(&amp;n-&gt;poll_list))) {</div><div class='ctx'> 		pr_warn_once("%s: Budget exhausted after napi rescheduled\n",</div><div class='ctx'> 			     n-&gt;dev ? n-&gt;dev-&gt;name : "backlog");</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return work;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;n-&gt;poll_list, repoll);</div><div class='add'>+	*repoll = true;</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='add'>+	return work;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int napi_poll(struct napi_struct *n, struct list_head *repoll)</div><div class='add'>+{</div><div class='add'>+	bool do_repoll = false;</div><div class='add'>+	void *have;</div><div class='add'>+	int work;</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;n-&gt;poll_list);</div><div class='add'>+</div><div class='add'>+	have = netpoll_poll_lock(n);</div><div class='add'>+</div><div class='add'>+	work = __napi_poll(n, &amp;do_repoll);</div><div class='add'>+</div><div class='add'>+	if (do_repoll) {</div><div class='add'>+#if defined(CONFIG_DEBUG_NET)</div><div class='add'>+		if (unlikely(!napi_is_scheduled(n)))</div><div class='add'>+			pr_crit("repoll requested for device %s %ps but napi is not scheduled.\n",</div><div class='add'>+				n-&gt;dev-&gt;name, n-&gt;poll);</div><div class='add'>+#endif</div><div class='add'>+		list_add_tail(&amp;n-&gt;poll_list, repoll);</div><div class='add'>+	}</div><div class='ctx'> 	netpoll_poll_unlock(have);</div><div class='ctx'> </div><div class='ctx'> 	return work;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __latent_entropy void net_rx_action(struct softirq_action *h)</div><div class='add'>+static int napi_thread_wait(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		/* Testing SCHED_THREADED bit here to make sure the current</div><div class='add'>+		 * kthread owns this napi and could poll on this napi.</div><div class='add'>+		 * Testing SCHED bit is not enough because SCHED bit might be</div><div class='add'>+		 * set by some other busy poll thread or by napi_disable().</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(NAPI_STATE_SCHED_THREADED, &amp;napi-&gt;state)) {</div><div class='add'>+			WARN_ON(!list_empty(&amp;napi-&gt;poll_list));</div><div class='add'>+			__set_current_state(TASK_RUNNING);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		schedule();</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+	}</div><div class='add'>+	__set_current_state(TASK_RUNNING);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void napi_threaded_poll_loop(struct napi_struct *napi, bool busy_poll)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	struct softnet_data *sd;</div><div class='add'>+	unsigned long last_qs = jiffies;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		bool repoll = false;</div><div class='add'>+		void *have;</div><div class='add'>+</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+		sd = this_cpu_ptr(&amp;softnet_data);</div><div class='add'>+		sd-&gt;in_napi_threaded_poll = true;</div><div class='add'>+</div><div class='add'>+		have = netpoll_poll_lock(napi);</div><div class='add'>+		__napi_poll(napi, &amp;repoll);</div><div class='add'>+		netpoll_poll_unlock(have);</div><div class='add'>+</div><div class='add'>+		sd-&gt;in_napi_threaded_poll = false;</div><div class='add'>+		barrier();</div><div class='add'>+</div><div class='add'>+		if (sd_has_rps_ipi_waiting(sd)) {</div><div class='add'>+			local_irq_disable();</div><div class='add'>+			net_rps_action_and_irq_enable(sd);</div><div class='add'>+		}</div><div class='add'>+		skb_defer_free_flush();</div><div class='add'>+		bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+</div><div class='add'>+		/* When busy poll is enabled, the old packets are not flushed in</div><div class='add'>+		 * napi_complete_done. So flush them here.</div><div class='add'>+		 */</div><div class='add'>+		if (busy_poll)</div><div class='add'>+			gro_flush_normal(&amp;napi-&gt;gro, HZ &gt;= 1000);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+</div><div class='add'>+		/* Call cond_resched here to avoid watchdog warnings. */</div><div class='add'>+		if (repoll || busy_poll) {</div><div class='add'>+			rcu_softirq_qs_periodic(last_qs);</div><div class='add'>+			cond_resched();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!repoll)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int napi_threaded_poll(void *data)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi = data;</div><div class='add'>+	bool want_busy_poll;</div><div class='add'>+	bool in_busy_poll;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	while (!napi_thread_wait(napi)) {</div><div class='add'>+		val = READ_ONCE(napi-&gt;state);</div><div class='add'>+</div><div class='add'>+		want_busy_poll = val &amp; NAPIF_STATE_THREADED_BUSY_POLL;</div><div class='add'>+		in_busy_poll = val &amp; NAPIF_STATE_IN_BUSY_POLL;</div><div class='add'>+</div><div class='add'>+		if (unlikely(val &amp; NAPIF_STATE_DISABLE))</div><div class='add'>+			want_busy_poll = false;</div><div class='add'>+</div><div class='add'>+		if (want_busy_poll != in_busy_poll)</div><div class='add'>+			assign_bit(NAPI_STATE_IN_BUSY_POLL, &amp;napi-&gt;state,</div><div class='add'>+				   want_busy_poll);</div><div class='add'>+</div><div class='add'>+		napi_threaded_poll_loop(napi, want_busy_poll);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __latent_entropy void net_rx_action(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct softnet_data *sd = this_cpu_ptr(&amp;softnet_data);</div><div class='ctx'> 	unsigned long time_limit = jiffies +</div><div class='del'>-		usecs_to_jiffies(netdev_budget_usecs);</div><div class='del'>-	int budget = netdev_budget;</div><div class='add'>+		usecs_to_jiffies(READ_ONCE(net_hotdata.netdev_budget_usecs));</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='add'>+	int budget = READ_ONCE(net_hotdata.netdev_budget);</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	LIST_HEAD(repoll);</div><div class='ctx'> </div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='add'>+start:</div><div class='add'>+	sd-&gt;in_net_rx_action = true;</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	list_splice_init(&amp;sd-&gt;poll_list, &amp;list);</div><div class='ctx'> 	local_irq_enable();</div><div class='hunk'>@@ -6283,9 +7859,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct napi_struct *n;</div><div class='ctx'> </div><div class='add'>+		skb_defer_free_flush();</div><div class='add'>+</div><div class='ctx'> 		if (list_empty(&amp;list)) {</div><div class='del'>-			if (!sd_has_rps_ipi_waiting(sd) &amp;&amp; list_empty(&amp;repoll))</div><div class='del'>-				goto out;</div><div class='add'>+			if (list_empty(&amp;repoll)) {</div><div class='add'>+				sd-&gt;in_net_rx_action = false;</div><div class='add'>+				barrier();</div><div class='add'>+				/* We need to check if ____napi_schedule()</div><div class='add'>+				 * had refilled poll_list while</div><div class='add'>+				 * sd-&gt;in_net_rx_action was true.</div><div class='add'>+				 */</div><div class='add'>+				if (!list_empty(&amp;sd-&gt;poll_list))</div><div class='add'>+					goto start;</div><div class='add'>+				if (!sd_has_rps_ipi_waiting(sd))</div><div class='add'>+					goto end;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -6298,7 +7886,8 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(budget &lt;= 0 ||</div><div class='ctx'> 			     time_after_eq(jiffies, time_limit))) {</div><div class='del'>-			sd-&gt;time_squeeze++;</div><div class='add'>+			/* Pairs with READ_ONCE() in softnet_seq_show() */</div><div class='add'>+			WRITE_ONCE(sd-&gt;time_squeeze, sd-&gt;time_squeeze + 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6310,18 +7899,24 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)</div><div class='ctx'> 	list_splice(&amp;list, &amp;sd-&gt;poll_list);</div><div class='ctx'> 	if (!list_empty(&amp;sd-&gt;poll_list))</div><div class='ctx'> 		__raise_softirq_irqoff(NET_RX_SOFTIRQ);</div><div class='add'>+	else</div><div class='add'>+		sd-&gt;in_net_rx_action = false;</div><div class='ctx'> </div><div class='ctx'> 	net_rps_action_and_irq_enable(sd);</div><div class='del'>-out:</div><div class='del'>-	__kfree_skb_flush();</div><div class='add'>+end:</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct netdev_adjacent {</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> </div><div class='ctx'> 	/* upper master flag, there can only be one master device per list */</div><div class='ctx'> 	bool master;</div><div class='ctx'> </div><div class='add'>+	/* lookup ignore flag */</div><div class='add'>+	bool ignore;</div><div class='add'>+</div><div class='ctx'> 	/* counter for the number of times this device was added to us */</div><div class='ctx'> 	u16 ref_nr;</div><div class='ctx'> </div><div class='hunk'>@@ -6344,9 +7939,10 @@ static struct netdev_adjacent *__netdev_find_adj(struct net_device *adj_dev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __netdev_has_upper_dev(struct net_device *upper_dev, void *data)</div><div class='add'>+static int ____netdev_has_upper_dev(struct net_device *upper_dev,</div><div class='add'>+				    struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = data;</div><div class='add'>+	struct net_device *dev = (struct net_device *)priv-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	return upper_dev == dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -6363,15 +7959,19 @@ static int __netdev_has_upper_dev(struct net_device *upper_dev, void *data)</div><div class='ctx'> bool netdev_has_upper_dev(struct net_device *dev,</div><div class='ctx'> 			  struct net_device *upper_dev)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)upper_dev,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	return netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,</div><div class='del'>-					     upper_dev);</div><div class='add'>+	return netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,</div><div class='add'>+					     &amp;priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_has_upper_dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * netdev_has_upper_dev_all - Check if device is linked to an upper device</div><div class='add'>+ * netdev_has_upper_dev_all_rcu - Check if device is linked to an upper device</div><div class='ctx'>  * @dev: device</div><div class='ctx'>  * @upper_dev: upper device to check</div><div class='ctx'>  *</div><div class='hunk'>@@ -6383,8 +7983,12 @@ EXPORT_SYMBOL(netdev_has_upper_dev);</div><div class='ctx'> bool netdev_has_upper_dev_all_rcu(struct net_device *dev,</div><div class='ctx'> 				  struct net_device *upper_dev)</div><div class='ctx'> {</div><div class='del'>-	return !!netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,</div><div class='del'>-					       upper_dev);</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)upper_dev,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return !!netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,</div><div class='add'>+					       &amp;priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_has_upper_dev_all_rcu);</div><div class='ctx'> </div><div class='hunk'>@@ -6427,6 +8031,22 @@ struct net_device *netdev_master_upper_dev_get(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_master_upper_dev_get);</div><div class='ctx'> </div><div class='add'>+static struct net_device *__netdev_master_upper_dev_get(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_adjacent *upper;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;dev-&gt;adj_list.upper))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	upper = list_first_entry(&amp;dev-&gt;adj_list.upper,</div><div class='add'>+				 struct netdev_adjacent, list);</div><div class='add'>+	if (likely(upper-&gt;master) &amp;&amp; !upper-&gt;ignore)</div><div class='add'>+		return upper-&gt;dev;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netdev_has_any_lower_dev - Check if device is linked to some device</div><div class='ctx'>  * @dev: device</div><div class='hunk'>@@ -6477,6 +8097,23 @@ struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_upper_get_next_dev_rcu);</div><div class='ctx'> </div><div class='add'>+static struct net_device *__netdev_next_upper_dev(struct net_device *dev,</div><div class='add'>+						  struct list_head **iter,</div><div class='add'>+						  bool *ignore)</div><div class='add'>+{</div><div class='add'>+	struct netdev_adjacent *upper;</div><div class='add'>+</div><div class='add'>+	upper = list_entry((*iter)-&gt;next, struct netdev_adjacent, list);</div><div class='add'>+</div><div class='add'>+	if (&amp;upper-&gt;list == &amp;dev-&gt;adj_list.upper)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*iter = &amp;upper-&gt;list;</div><div class='add'>+	*ignore = upper-&gt;ignore;</div><div class='add'>+</div><div class='add'>+	return upper-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct net_device *netdev_next_upper_dev_rcu(struct net_device *dev,</div><div class='ctx'> 						    struct list_head **iter)</div><div class='ctx'> {</div><div class='hunk'>@@ -6494,34 +8131,116 @@ static struct net_device *netdev_next_upper_dev_rcu(struct net_device *dev,</div><div class='ctx'> 	return upper-&gt;dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __netdev_walk_all_upper_dev(struct net_device *dev,</div><div class='add'>+				       int (*fn)(struct net_device *dev,</div><div class='add'>+					 struct netdev_nested_priv *priv),</div><div class='add'>+				       struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *udev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int ret, cur = 0;</div><div class='add'>+	bool ignore;</div><div class='add'>+</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.upper;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (now != dev) {</div><div class='add'>+			ret = fn(now, priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			udev = __netdev_next_upper_dev(now, &amp;iter, &amp;ignore);</div><div class='add'>+			if (!udev)</div><div class='add'>+				break;</div><div class='add'>+			if (ignore)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			next = udev;</div><div class='add'>+			niter = &amp;udev-&gt;adj_list.upper;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return 0;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int netdev_walk_all_upper_dev_rcu(struct net_device *dev,</div><div class='ctx'> 				  int (*fn)(struct net_device *dev,</div><div class='del'>-					    void *data),</div><div class='del'>-				  void *data)</div><div class='add'>+					    struct netdev_nested_priv *priv),</div><div class='add'>+				  struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *udev;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-	int ret;</div><div class='add'>+	struct net_device *udev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int ret, cur = 0;</div><div class='ctx'> </div><div class='del'>-	for (iter = &amp;dev-&gt;adj_list.upper,</div><div class='del'>-	     udev = netdev_next_upper_dev_rcu(dev, &amp;iter);</div><div class='del'>-	     udev;</div><div class='del'>-	     udev = netdev_next_upper_dev_rcu(dev, &amp;iter)) {</div><div class='del'>-		/* first is the upper device itself */</div><div class='del'>-		ret = fn(udev, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.upper;</div><div class='ctx'> </div><div class='del'>-		/* then look at all of its upper devices */</div><div class='del'>-		ret = netdev_walk_all_upper_dev_rcu(udev, fn, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (now != dev) {</div><div class='add'>+			ret = fn(now, priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			udev = netdev_next_upper_dev_rcu(now, &amp;iter);</div><div class='add'>+			if (!udev)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			next = udev;</div><div class='add'>+			niter = &amp;udev-&gt;adj_list.upper;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return 0;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(netdev_walk_all_upper_dev_rcu);</div><div class='ctx'> </div><div class='add'>+static bool __netdev_has_upper_dev(struct net_device *dev,</div><div class='add'>+				   struct net_device *upper_dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.data = (void *)upper_dev,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	return __netdev_walk_all_upper_dev(dev, ____netdev_has_upper_dev,</div><div class='add'>+					   &amp;priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netdev_lower_get_next_private - Get the next -&gt;private from the</div><div class='ctx'>  *				   lower neighbour list</div><div class='hunk'>@@ -6564,7 +8283,7 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_adjacent *lower;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held() &amp;&amp; !rcu_read_lock_bh_held());</div><div class='ctx'> </div><div class='ctx'> 	lower = list_entry_rcu((*iter)-&gt;next, struct netdev_adjacent, list);</div><div class='ctx'> </div><div class='hunk'>@@ -6618,36 +8337,121 @@ static struct net_device *netdev_next_lower_dev(struct net_device *dev,</div><div class='ctx'> 	return lower-&gt;dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *__netdev_next_lower_dev(struct net_device *dev,</div><div class='add'>+						  struct list_head **iter,</div><div class='add'>+						  bool *ignore)</div><div class='add'>+{</div><div class='add'>+	struct netdev_adjacent *lower;</div><div class='add'>+</div><div class='add'>+	lower = list_entry((*iter)-&gt;next, struct netdev_adjacent, list);</div><div class='add'>+</div><div class='add'>+	if (&amp;lower-&gt;list == &amp;dev-&gt;adj_list.lower)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*iter = &amp;lower-&gt;list;</div><div class='add'>+	*ignore = lower-&gt;ignore;</div><div class='add'>+</div><div class='add'>+	return lower-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int netdev_walk_all_lower_dev(struct net_device *dev,</div><div class='ctx'> 			      int (*fn)(struct net_device *dev,</div><div class='del'>-					void *data),</div><div class='del'>-			      void *data)</div><div class='add'>+					struct netdev_nested_priv *priv),</div><div class='add'>+			      struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ldev;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-	int ret;</div><div class='add'>+	struct net_device *ldev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int ret, cur = 0;</div><div class='ctx'> </div><div class='del'>-	for (iter = &amp;dev-&gt;adj_list.lower,</div><div class='del'>-	     ldev = netdev_next_lower_dev(dev, &amp;iter);</div><div class='del'>-	     ldev;</div><div class='del'>-	     ldev = netdev_next_lower_dev(dev, &amp;iter)) {</div><div class='del'>-		/* first is the lower device itself */</div><div class='del'>-		ret = fn(ldev, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.lower;</div><div class='ctx'> </div><div class='del'>-		/* then look at all of its lower devices */</div><div class='del'>-		ret = netdev_walk_all_lower_dev(ldev, fn, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (now != dev) {</div><div class='add'>+			ret = fn(now, priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			ldev = netdev_next_lower_dev(now, &amp;iter);</div><div class='add'>+			if (!ldev)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			next = ldev;</div><div class='add'>+			niter = &amp;ldev-&gt;adj_list.lower;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return 0;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(netdev_walk_all_lower_dev);</div><div class='ctx'> </div><div class='del'>-static struct net_device *netdev_next_lower_dev_rcu(struct net_device *dev,</div><div class='del'>-						    struct list_head **iter)</div><div class='add'>+static int __netdev_walk_all_lower_dev(struct net_device *dev,</div><div class='add'>+				       int (*fn)(struct net_device *dev,</div><div class='add'>+					 struct netdev_nested_priv *priv),</div><div class='add'>+				       struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ldev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int ret, cur = 0;</div><div class='add'>+	bool ignore;</div><div class='add'>+</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.lower;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (now != dev) {</div><div class='add'>+			ret = fn(now, priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			ldev = __netdev_next_lower_dev(now, &amp;iter, &amp;ignore);</div><div class='add'>+			if (!ldev)</div><div class='add'>+				break;</div><div class='add'>+			if (ignore)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			next = ldev;</div><div class='add'>+			niter = &amp;ldev-&gt;adj_list.lower;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return 0;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *netdev_next_lower_dev_rcu(struct net_device *dev,</div><div class='add'>+					     struct list_head **iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_adjacent *lower;</div><div class='ctx'> </div><div class='hunk'>@@ -6659,29 +8463,123 @@ static struct net_device *netdev_next_lower_dev_rcu(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	return lower-&gt;dev;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netdev_next_lower_dev_rcu);</div><div class='ctx'> </div><div class='del'>-int netdev_walk_all_lower_dev_rcu(struct net_device *dev,</div><div class='del'>-				  int (*fn)(struct net_device *dev,</div><div class='del'>-					    void *data),</div><div class='del'>-				  void *data)</div><div class='add'>+static u8 __netdev_upper_depth(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *udev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	u8 max_depth = 0;</div><div class='add'>+	bool ignore;</div><div class='add'>+</div><div class='add'>+	for (iter = &amp;dev-&gt;adj_list.upper,</div><div class='add'>+	     udev = __netdev_next_upper_dev(dev, &amp;iter, &amp;ignore);</div><div class='add'>+	     udev;</div><div class='add'>+	     udev = __netdev_next_upper_dev(dev, &amp;iter, &amp;ignore)) {</div><div class='add'>+		if (ignore)</div><div class='add'>+			continue;</div><div class='add'>+		if (max_depth &lt; udev-&gt;upper_level)</div><div class='add'>+			max_depth = udev-&gt;upper_level;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_depth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 __netdev_lower_depth(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ldev;</div><div class='ctx'> 	struct list_head *iter;</div><div class='del'>-	int ret;</div><div class='add'>+	u8 max_depth = 0;</div><div class='add'>+	bool ignore;</div><div class='ctx'> </div><div class='ctx'> 	for (iter = &amp;dev-&gt;adj_list.lower,</div><div class='del'>-	     ldev = netdev_next_lower_dev_rcu(dev, &amp;iter);</div><div class='add'>+	     ldev = __netdev_next_lower_dev(dev, &amp;iter, &amp;ignore);</div><div class='ctx'> 	     ldev;</div><div class='del'>-	     ldev = netdev_next_lower_dev_rcu(dev, &amp;iter)) {</div><div class='del'>-		/* first is the lower device itself */</div><div class='del'>-		ret = fn(ldev, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	     ldev = __netdev_next_lower_dev(dev, &amp;iter, &amp;ignore)) {</div><div class='add'>+		if (ignore)</div><div class='add'>+			continue;</div><div class='add'>+		if (max_depth &lt; ldev-&gt;lower_level)</div><div class='add'>+			max_depth = ldev-&gt;lower_level;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* then look at all of its lower devices */</div><div class='del'>-		ret = netdev_walk_all_lower_dev_rcu(ldev, fn, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	return max_depth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __netdev_update_upper_level(struct net_device *dev,</div><div class='add'>+				       struct netdev_nested_priv *__unused)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;upper_level = __netdev_upper_depth(dev) + 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+static LIST_HEAD(net_unlink_list);</div><div class='add'>+</div><div class='add'>+static void net_unlink_todo(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (list_empty(&amp;dev-&gt;unlink_list))</div><div class='add'>+		list_add_tail(&amp;dev-&gt;unlink_list, &amp;net_unlink_list);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __netdev_update_lower_level(struct net_device *dev,</div><div class='add'>+				       struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;lower_level = __netdev_lower_depth(dev) + 1;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	if (!priv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;flags &amp; NESTED_SYNC_IMM)</div><div class='add'>+		dev-&gt;nested_level = dev-&gt;lower_level - 1;</div><div class='add'>+	if (priv-&gt;flags &amp; NESTED_SYNC_TODO)</div><div class='add'>+		net_unlink_todo(dev);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_walk_all_lower_dev_rcu(struct net_device *dev,</div><div class='add'>+				  int (*fn)(struct net_device *dev,</div><div class='add'>+					    struct netdev_nested_priv *priv),</div><div class='add'>+				  struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ldev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int ret, cur = 0;</div><div class='add'>+</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.lower;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (now != dev) {</div><div class='add'>+			ret = fn(now, priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			ldev = netdev_next_lower_dev_rcu(now, &amp;iter);</div><div class='add'>+			if (!ldev)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			next = ldev;</div><div class='add'>+			niter = &amp;ldev-&gt;adj_list.lower;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return 0;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -6785,7 +8683,8 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,</div><div class='ctx'> 	adj-&gt;master = master;</div><div class='ctx'> 	adj-&gt;ref_nr = 1;</div><div class='ctx'> 	adj-&gt;private = private;</div><div class='del'>-	dev_hold(adj_dev);</div><div class='add'>+	adj-&gt;ignore = false;</div><div class='add'>+	netdev_hold(adj_dev, &amp;adj-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Insert adjacency: dev %s adj_dev %s adj-&gt;ref_nr %d; dev_hold on %s\n",</div><div class='ctx'> 		 dev-&gt;name, adj_dev-&gt;name, adj-&gt;ref_nr, adj_dev-&gt;name);</div><div class='hunk'>@@ -6814,8 +8713,8 @@ remove_symlinks:</div><div class='ctx'> 	if (netdev_adjacent_is_neigh_list(dev, adj_dev, dev_list))</div><div class='ctx'> 		netdev_adjacent_sysfs_del(dev, adj_dev-&gt;name, dev_list);</div><div class='ctx'> free_adj:</div><div class='add'>+	netdev_put(adj_dev, &amp;adj-&gt;dev_tracker);</div><div class='ctx'> 	kfree(adj);</div><div class='del'>-	dev_put(adj_dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -6856,7 +8755,7 @@ static void __netdev_adjacent_dev_remove(struct net_device *dev,</div><div class='ctx'> 	list_del_rcu(&amp;adj-&gt;list);</div><div class='ctx'> 	pr_debug("adjacency: dev_put for %s, because link removed from %s to %s\n",</div><div class='ctx'> 		 adj_dev-&gt;name, dev-&gt;name, adj_dev-&gt;name);</div><div class='del'>-	dev_put(adj_dev);</div><div class='add'>+	netdev_put(adj_dev, &amp;adj-&gt;dev_tracker);</div><div class='ctx'> 	kfree_rcu(adj, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6914,6 +8813,7 @@ static void __netdev_adjacent_dev_unlink_neighbour(struct net_device *dev,</div><div class='ctx'> static int __netdev_upper_dev_link(struct net_device *dev,</div><div class='ctx'> 				   struct net_device *upper_dev, bool master,</div><div class='ctx'> 				   void *upper_priv, void *upper_info,</div><div class='add'>+				   struct netdev_nested_priv *priv,</div><div class='ctx'> 				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_notifier_changeupper_info changeupper_info = {</div><div class='hunk'>@@ -6935,14 +8835,17 @@ static int __netdev_upper_dev_link(struct net_device *dev,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* To prevent loops, check if dev is not upper device to upper_dev. */</div><div class='del'>-	if (netdev_has_upper_dev(upper_dev, dev))</div><div class='add'>+	if (__netdev_has_upper_dev(upper_dev, dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='add'>+	if ((dev-&gt;lower_level + upper_dev-&gt;upper_level) &gt; MAX_NEST_DEV)</div><div class='add'>+		return -EMLINK;</div><div class='add'>+</div><div class='ctx'> 	if (!master) {</div><div class='del'>-		if (netdev_has_upper_dev(dev, upper_dev))</div><div class='add'>+		if (__netdev_has_upper_dev(dev, upper_dev))</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 	} else {</div><div class='del'>-		master_dev = netdev_master_upper_dev_get(dev);</div><div class='add'>+		master_dev = __netdev_master_upper_dev_get(dev);</div><div class='ctx'> 		if (master_dev)</div><div class='ctx'> 			return master_dev == upper_dev ? -EEXIST : -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6964,6 +8867,13 @@ static int __netdev_upper_dev_link(struct net_device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto rollback;</div><div class='ctx'> </div><div class='add'>+	__netdev_update_upper_level(dev, NULL);</div><div class='add'>+	__netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);</div><div class='add'>+</div><div class='add'>+	__netdev_update_lower_level(upper_dev, priv);</div><div class='add'>+	__netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,</div><div class='add'>+				    priv);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> rollback:</div><div class='hunk'>@@ -6987,8 +8897,13 @@ int netdev_upper_dev_link(struct net_device *dev,</div><div class='ctx'> 			  struct net_device *upper_dev,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = NESTED_SYNC_IMM | NESTED_SYNC_TODO,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	return __netdev_upper_dev_link(dev, upper_dev, false,</div><div class='del'>-				       NULL, NULL, extack);</div><div class='add'>+				       NULL, NULL, &amp;priv, extack);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_upper_dev_link);</div><div class='ctx'> </div><div class='hunk'>@@ -7011,21 +8926,19 @@ int netdev_master_upper_dev_link(struct net_device *dev,</div><div class='ctx'> 				 void *upper_priv, void *upper_info,</div><div class='ctx'> 				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = NESTED_SYNC_IMM | NESTED_SYNC_TODO,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	return __netdev_upper_dev_link(dev, upper_dev, true,</div><div class='del'>-				       upper_priv, upper_info, extack);</div><div class='add'>+				       upper_priv, upper_info, &amp;priv, extack);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_master_upper_dev_link);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * netdev_upper_dev_unlink - Removes a link to upper device</div><div class='del'>- * @dev: device</div><div class='del'>- * @upper_dev: new upper device</div><div class='del'>- *</div><div class='del'>- * Removes a link to device which is upper to this one. The caller must hold</div><div class='del'>- * the RTNL lock.</div><div class='del'>- */</div><div class='del'>-void netdev_upper_dev_unlink(struct net_device *dev,</div><div class='del'>-			     struct net_device *upper_dev)</div><div class='add'>+static void __netdev_upper_dev_unlink(struct net_device *dev,</div><div class='add'>+				      struct net_device *upper_dev,</div><div class='add'>+				      struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_notifier_changeupper_info changeupper_info = {</div><div class='ctx'> 		.info = {</div><div class='hunk'>@@ -7046,9 +8959,129 @@ void netdev_upper_dev_unlink(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,</div><div class='ctx'> 				      &amp;changeupper_info.info);</div><div class='add'>+</div><div class='add'>+	__netdev_update_upper_level(dev, NULL);</div><div class='add'>+	__netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);</div><div class='add'>+</div><div class='add'>+	__netdev_update_lower_level(upper_dev, priv);</div><div class='add'>+	__netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,</div><div class='add'>+				    priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_upper_dev_unlink - Removes a link to upper device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @upper_dev: new upper device</div><div class='add'>+ *</div><div class='add'>+ * Removes a link to device which is upper to this one. The caller must hold</div><div class='add'>+ * the RTNL lock.</div><div class='add'>+ */</div><div class='add'>+void netdev_upper_dev_unlink(struct net_device *dev,</div><div class='add'>+			     struct net_device *upper_dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = NESTED_SYNC_TODO,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	__netdev_upper_dev_unlink(dev, upper_dev, &amp;priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_upper_dev_unlink);</div><div class='ctx'> </div><div class='add'>+static void __netdev_adjacent_dev_set(struct net_device *upper_dev,</div><div class='add'>+				      struct net_device *lower_dev,</div><div class='add'>+				      bool val)</div><div class='add'>+{</div><div class='add'>+	struct netdev_adjacent *adj;</div><div class='add'>+</div><div class='add'>+	adj = __netdev_find_adj(lower_dev, &amp;upper_dev-&gt;adj_list.lower);</div><div class='add'>+	if (adj)</div><div class='add'>+		adj-&gt;ignore = val;</div><div class='add'>+</div><div class='add'>+	adj = __netdev_find_adj(upper_dev, &amp;lower_dev-&gt;adj_list.upper);</div><div class='add'>+	if (adj)</div><div class='add'>+		adj-&gt;ignore = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_adjacent_dev_disable(struct net_device *upper_dev,</div><div class='add'>+					struct net_device *lower_dev)</div><div class='add'>+{</div><div class='add'>+	__netdev_adjacent_dev_set(upper_dev, lower_dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_adjacent_dev_enable(struct net_device *upper_dev,</div><div class='add'>+				       struct net_device *lower_dev)</div><div class='add'>+{</div><div class='add'>+	__netdev_adjacent_dev_set(upper_dev, lower_dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_adjacent_change_prepare(struct net_device *old_dev,</div><div class='add'>+				   struct net_device *new_dev,</div><div class='add'>+				   struct net_device *dev,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!new_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (old_dev &amp;&amp; new_dev != old_dev)</div><div class='add'>+		netdev_adjacent_dev_disable(dev, old_dev);</div><div class='add'>+	err = __netdev_upper_dev_link(new_dev, dev, false, NULL, NULL, &amp;priv,</div><div class='add'>+				      extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (old_dev &amp;&amp; new_dev != old_dev)</div><div class='add'>+			netdev_adjacent_dev_enable(dev, old_dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_adjacent_change_prepare);</div><div class='add'>+</div><div class='add'>+void netdev_adjacent_change_commit(struct net_device *old_dev,</div><div class='add'>+				   struct net_device *new_dev,</div><div class='add'>+				   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = NESTED_SYNC_IMM | NESTED_SYNC_TODO,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!new_dev || !old_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (new_dev == old_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_adjacent_dev_enable(dev, old_dev);</div><div class='add'>+	__netdev_upper_dev_unlink(old_dev, dev, &amp;priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_adjacent_change_commit);</div><div class='add'>+</div><div class='add'>+void netdev_adjacent_change_abort(struct net_device *old_dev,</div><div class='add'>+				  struct net_device *new_dev,</div><div class='add'>+				  struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.data = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!new_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (old_dev &amp;&amp; new_dev != old_dev)</div><div class='add'>+		netdev_adjacent_dev_enable(dev, old_dev);</div><div class='add'>+</div><div class='add'>+	__netdev_upper_dev_unlink(new_dev, dev, &amp;priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_adjacent_change_abort);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netdev_bonding_info_change - Dispatch event about slave change</div><div class='ctx'>  * @dev: device</div><div class='hunk'>@@ -7071,6 +9104,298 @@ void netdev_bonding_info_change(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_bonding_info_change);</div><div class='ctx'> </div><div class='add'>+static int netdev_offload_xstats_enable_l3(struct net_device *dev,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_offload_xstats_info info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.type = NETDEV_OFFLOAD_XSTATS_TYPE_L3,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev-&gt;offload_xstats_l3 = kzalloc(sizeof(*dev-&gt;offload_xstats_l3),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;offload_xstats_l3)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = call_netdevice_notifiers_info_robust(NETDEV_OFFLOAD_XSTATS_ENABLE,</div><div class='add'>+						  NETDEV_OFFLOAD_XSTATS_DISABLE,</div><div class='add'>+						  &amp;info.info);</div><div class='add'>+	err = notifier_to_errno(rc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_stats;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_stats:</div><div class='add'>+	kfree(dev-&gt;offload_xstats_l3);</div><div class='add'>+	dev-&gt;offload_xstats_l3 = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_offload_xstats_enable(struct net_device *dev,</div><div class='add'>+				 enum netdev_offload_xstats_type type,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (netdev_offload_xstats_enabled(dev, type))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_TYPE_L3:</div><div class='add'>+		return netdev_offload_xstats_enable_l3(dev, extack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_enable);</div><div class='add'>+</div><div class='add'>+static void netdev_offload_xstats_disable_l3(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_offload_xstats_info info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.type = NETDEV_OFFLOAD_XSTATS_TYPE_L3,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	call_netdevice_notifiers_info(NETDEV_OFFLOAD_XSTATS_DISABLE,</div><div class='add'>+				      &amp;info.info);</div><div class='add'>+	kfree(dev-&gt;offload_xstats_l3);</div><div class='add'>+	dev-&gt;offload_xstats_l3 = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_offload_xstats_disable(struct net_device *dev,</div><div class='add'>+				  enum netdev_offload_xstats_type type)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!netdev_offload_xstats_enabled(dev, type))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_TYPE_L3:</div><div class='add'>+		netdev_offload_xstats_disable_l3(dev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_disable);</div><div class='add'>+</div><div class='add'>+static void netdev_offload_xstats_disable_all(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_offload_xstats_disable(dev, NETDEV_OFFLOAD_XSTATS_TYPE_L3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_hw_stats64 *</div><div class='add'>+netdev_offload_xstats_get_ptr(const struct net_device *dev,</div><div class='add'>+			      enum netdev_offload_xstats_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_TYPE_L3:</div><div class='add'>+		return dev-&gt;offload_xstats_l3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool netdev_offload_xstats_enabled(const struct net_device *dev,</div><div class='add'>+				   enum netdev_offload_xstats_type type)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	return netdev_offload_xstats_get_ptr(dev, type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_enabled);</div><div class='add'>+</div><div class='add'>+struct netdev_notifier_offload_xstats_ru {</div><div class='add'>+	bool used;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct netdev_notifier_offload_xstats_rd {</div><div class='add'>+	struct rtnl_hw_stats64 stats;</div><div class='add'>+	bool used;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void netdev_hw_stats64_add(struct rtnl_hw_stats64 *dest,</div><div class='add'>+				  const struct rtnl_hw_stats64 *src)</div><div class='add'>+{</div><div class='add'>+	dest-&gt;rx_packets	  += src-&gt;rx_packets;</div><div class='add'>+	dest-&gt;tx_packets	  += src-&gt;tx_packets;</div><div class='add'>+	dest-&gt;rx_bytes		  += src-&gt;rx_bytes;</div><div class='add'>+	dest-&gt;tx_bytes		  += src-&gt;tx_bytes;</div><div class='add'>+	dest-&gt;rx_errors		  += src-&gt;rx_errors;</div><div class='add'>+	dest-&gt;tx_errors		  += src-&gt;tx_errors;</div><div class='add'>+	dest-&gt;rx_dropped	  += src-&gt;rx_dropped;</div><div class='add'>+	dest-&gt;tx_dropped	  += src-&gt;tx_dropped;</div><div class='add'>+	dest-&gt;multicast		  += src-&gt;multicast;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_offload_xstats_get_used(struct net_device *dev,</div><div class='add'>+					  enum netdev_offload_xstats_type type,</div><div class='add'>+					  bool *p_used,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_offload_xstats_ru report_used = {};</div><div class='add'>+	struct netdev_notifier_offload_xstats_info info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.type = type,</div><div class='add'>+		.report_used = &amp;report_used,</div><div class='add'>+	};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!netdev_offload_xstats_enabled(dev, type));</div><div class='add'>+	rc = call_netdevice_notifiers_info(NETDEV_OFFLOAD_XSTATS_REPORT_USED,</div><div class='add'>+					   &amp;info.info);</div><div class='add'>+	*p_used = report_used.used;</div><div class='add'>+	return notifier_to_errno(rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_offload_xstats_get_stats(struct net_device *dev,</div><div class='add'>+					   enum netdev_offload_xstats_type type,</div><div class='add'>+					   struct rtnl_hw_stats64 *p_stats,</div><div class='add'>+					   bool *p_used,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_offload_xstats_rd report_delta = {};</div><div class='add'>+	struct netdev_notifier_offload_xstats_info info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.type = type,</div><div class='add'>+		.report_delta = &amp;report_delta,</div><div class='add'>+	};</div><div class='add'>+	struct rtnl_hw_stats64 *stats;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	stats = netdev_offload_xstats_get_ptr(dev, type);</div><div class='add'>+	if (WARN_ON(!stats))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = call_netdevice_notifiers_info(NETDEV_OFFLOAD_XSTATS_REPORT_DELTA,</div><div class='add'>+					   &amp;info.info);</div><div class='add'>+</div><div class='add'>+	/* Cache whatever we got, even if there was an error, otherwise the</div><div class='add'>+	 * successful stats retrievals would get lost.</div><div class='add'>+	 */</div><div class='add'>+	netdev_hw_stats64_add(stats, &amp;report_delta.stats);</div><div class='add'>+</div><div class='add'>+	if (p_stats)</div><div class='add'>+		*p_stats = *stats;</div><div class='add'>+	*p_used = report_delta.used;</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_offload_xstats_get(struct net_device *dev,</div><div class='add'>+			      enum netdev_offload_xstats_type type,</div><div class='add'>+			      struct rtnl_hw_stats64 *p_stats, bool *p_used,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (p_stats)</div><div class='add'>+		return netdev_offload_xstats_get_stats(dev, type, p_stats,</div><div class='add'>+						       p_used, extack);</div><div class='add'>+	else</div><div class='add'>+		return netdev_offload_xstats_get_used(dev, type, p_used,</div><div class='add'>+						      extack);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_get);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+netdev_offload_xstats_report_delta(struct netdev_notifier_offload_xstats_rd *report_delta,</div><div class='add'>+				   const struct rtnl_hw_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	report_delta-&gt;used = true;</div><div class='add'>+	netdev_hw_stats64_add(&amp;report_delta-&gt;stats, stats);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_report_delta);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+netdev_offload_xstats_report_used(struct netdev_notifier_offload_xstats_ru *report_used)</div><div class='add'>+{</div><div class='add'>+	report_used-&gt;used = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_report_used);</div><div class='add'>+</div><div class='add'>+void netdev_offload_xstats_push_delta(struct net_device *dev,</div><div class='add'>+				      enum netdev_offload_xstats_type type,</div><div class='add'>+				      const struct rtnl_hw_stats64 *p_stats)</div><div class='add'>+{</div><div class='add'>+	struct rtnl_hw_stats64 *stats;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	stats = netdev_offload_xstats_get_ptr(dev, type);</div><div class='add'>+	if (WARN_ON(!stats))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_hw_stats64_add(stats, p_stats);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_offload_xstats_push_delta);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_get_xmit_slave - Get the xmit slave of master device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @skb: The packet</div><div class='add'>+ * @all_slaves: assume all the slaves are active</div><div class='add'>+ *</div><div class='add'>+ * The reference counters are not incremented so the caller must be</div><div class='add'>+ * careful with locks. The caller must hold RCU lock.</div><div class='add'>+ * %NULL is returned if no slave is found.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct net_device *netdev_get_xmit_slave(struct net_device *dev,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 bool all_slaves)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_get_xmit_slave)</div><div class='add'>+		return NULL;</div><div class='add'>+	return ops-&gt;ndo_get_xmit_slave(dev, skb, all_slaves);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_get_xmit_slave);</div><div class='add'>+</div><div class='add'>+static struct net_device *netdev_sk_get_lower_dev(struct net_device *dev,</div><div class='add'>+						  struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_sk_get_lower_dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	return ops-&gt;ndo_sk_get_lower_dev(dev, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_sk_get_lowest_dev - Get the lowest device in chain given device and socket</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @sk: the socket</div><div class='add'>+ *</div><div class='add'>+ * %NULL is returned if no lower device is found.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct net_device *netdev_sk_get_lowest_dev(struct net_device *dev,</div><div class='add'>+					    struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+</div><div class='add'>+	lower = netdev_sk_get_lower_dev(dev, sk);</div><div class='add'>+	while (lower) {</div><div class='add'>+		dev = lower;</div><div class='add'>+		lower = netdev_sk_get_lower_dev(dev, sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_sk_get_lowest_dev);</div><div class='add'>+</div><div class='ctx'> static void netdev_adjacent_add_links(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_adjacent *iter;</div><div class='hunk'>@@ -7162,27 +9487,8 @@ void *netdev_lower_dev_get_private(struct net_device *dev,</div><div class='ctx'> EXPORT_SYMBOL(netdev_lower_dev_get_private);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int dev_get_nest_level(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *lower = NULL;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-	int max_nest = -1;</div><div class='del'>-	int nest;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	netdev_for_each_lower_dev(dev, lower, iter) {</div><div class='del'>-		nest = dev_get_nest_level(lower);</div><div class='del'>-		if (max_nest &lt; nest)</div><div class='del'>-			max_nest = nest;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return max_nest + 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_get_nest_level);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * netdev_lower_change - Dispatch event about lower device state change</div><div class='add'>+ * netdev_lower_state_changed - Dispatch event about lower device state change</div><div class='ctx'>  * @lower_dev: device</div><div class='ctx'>  * @lower_state_info: state to dispatch</div><div class='ctx'>  *</div><div class='hunk'>@@ -7214,31 +9520,31 @@ static void dev_change_rx_flags(struct net_device *dev, int flags)</div><div class='ctx'> static int __dev_set_promiscuity(struct net_device *dev, int inc, bool notify)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_flags = dev-&gt;flags;</div><div class='add'>+	unsigned int promiscuity, flags;</div><div class='ctx'> 	kuid_t uid;</div><div class='ctx'> 	kgid_t gid;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	dev-&gt;flags |= IFF_PROMISC;</div><div class='del'>-	dev-&gt;promiscuity += inc;</div><div class='del'>-	if (dev-&gt;promiscuity == 0) {</div><div class='add'>+	promiscuity = dev-&gt;promiscuity + inc;</div><div class='add'>+	if (promiscuity == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Avoid overflow.</div><div class='ctx'> 		 * If inc causes overflow, untouch promisc and return error.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inc &lt; 0)</div><div class='del'>-			dev-&gt;flags &amp;= ~IFF_PROMISC;</div><div class='del'>-		else {</div><div class='del'>-			dev-&gt;promiscuity -= inc;</div><div class='del'>-			pr_warn("%s: promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken.\n",</div><div class='del'>-				dev-&gt;name);</div><div class='add'>+		if (unlikely(inc &gt; 0)) {</div><div class='add'>+			netdev_warn(dev, "promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken.\n");</div><div class='ctx'> 			return -EOVERFLOW;</div><div class='ctx'> 		}</div><div class='add'>+		flags = old_flags &amp; ~IFF_PROMISC;</div><div class='add'>+	} else {</div><div class='add'>+		flags = old_flags | IFF_PROMISC;</div><div class='ctx'> 	}</div><div class='del'>-	if (dev-&gt;flags != old_flags) {</div><div class='del'>-		pr_info("device %s %s promiscuous mode\n",</div><div class='del'>-			dev-&gt;name,</div><div class='del'>-			dev-&gt;flags &amp; IFF_PROMISC ? "entered" : "left");</div><div class='add'>+	WRITE_ONCE(dev-&gt;promiscuity, promiscuity);</div><div class='add'>+	if (flags != old_flags) {</div><div class='add'>+		WRITE_ONCE(dev-&gt;flags, flags);</div><div class='add'>+		netdev_info(dev, "%s promiscuous mode\n",</div><div class='add'>+			    dev-&gt;flags &amp; IFF_PROMISC ? "entered" : "left");</div><div class='ctx'> 		if (audit_enabled) {</div><div class='ctx'> 			current_uid_gid(&amp;uid, &amp;gid);</div><div class='ctx'> 			audit_log(audit_context(), GFP_ATOMIC,</div><div class='hunk'>@@ -7254,23 +9560,20 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc, bool notify)</div><div class='ctx'> </div><div class='ctx'> 		dev_change_rx_flags(dev, IFF_PROMISC);</div><div class='ctx'> 	}</div><div class='del'>-	if (notify)</div><div class='del'>-		__dev_notify_flags(dev, old_flags, IFF_PROMISC);</div><div class='add'>+	if (notify) {</div><div class='add'>+		/* The ops lock is only required to ensure consistent locking</div><div class='add'>+		 * for `NETDEV_CHANGE` notifiers. This function is sometimes</div><div class='add'>+		 * called without the lock, even for devices that are ops</div><div class='add'>+		 * locked, such as in `dev_uc_sync_multiple` when using</div><div class='add'>+		 * bonding or teaming.</div><div class='add'>+		 */</div><div class='add'>+		netdev_ops_assert_locked(dev);</div><div class='add'>+		__dev_notify_flags(dev, old_flags, IFF_PROMISC, 0, NULL);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_set_promiscuity	- update promiscuity count on a device</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@inc: modifier</div><div class='del'>- *</div><div class='del'>- *	Add or remove promiscuity from a device. While the count in the device</div><div class='del'>- *	remains above zero the interface remains promiscuous. Once it hits zero</div><div class='del'>- *	the device reverts back to normal filtering operation. A negative inc</div><div class='del'>- *	value is used to drop promiscuity on the device.</div><div class='del'>- *	Return 0 if successful or a negative errno code on error.</div><div class='del'>- */</div><div class='del'>-int dev_set_promiscuity(struct net_device *dev, int inc)</div><div class='add'>+int netif_set_promiscuity(struct net_device *dev, int inc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_flags = dev-&gt;flags;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -7282,59 +9585,42 @@ int dev_set_promiscuity(struct net_device *dev, int inc)</div><div class='ctx'> 		dev_set_rx_mode(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_set_promiscuity);</div><div class='ctx'> </div><div class='del'>-static int __dev_set_allmulti(struct net_device *dev, int inc, bool notify)</div><div class='add'>+int netif_set_allmulti(struct net_device *dev, int inc, bool notify)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_flags = dev-&gt;flags, old_gflags = dev-&gt;gflags;</div><div class='add'>+	unsigned int allmulti, flags;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	dev-&gt;flags |= IFF_ALLMULTI;</div><div class='del'>-	dev-&gt;allmulti += inc;</div><div class='del'>-	if (dev-&gt;allmulti == 0) {</div><div class='add'>+	allmulti = dev-&gt;allmulti + inc;</div><div class='add'>+	if (allmulti == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Avoid overflow.</div><div class='ctx'> 		 * If inc causes overflow, untouch allmulti and return error.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inc &lt; 0)</div><div class='del'>-			dev-&gt;flags &amp;= ~IFF_ALLMULTI;</div><div class='del'>-		else {</div><div class='del'>-			dev-&gt;allmulti -= inc;</div><div class='del'>-			pr_warn("%s: allmulti touches roof, set allmulti failed. allmulti feature of device might be broken.\n",</div><div class='del'>-				dev-&gt;name);</div><div class='add'>+		if (unlikely(inc &gt; 0)) {</div><div class='add'>+			netdev_warn(dev, "allmulti touches roof, set allmulti failed. allmulti feature of device might be broken.\n");</div><div class='ctx'> 			return -EOVERFLOW;</div><div class='ctx'> 		}</div><div class='add'>+		flags = old_flags &amp; ~IFF_ALLMULTI;</div><div class='add'>+	} else {</div><div class='add'>+		flags = old_flags | IFF_ALLMULTI;</div><div class='ctx'> 	}</div><div class='del'>-	if (dev-&gt;flags ^ old_flags) {</div><div class='add'>+	WRITE_ONCE(dev-&gt;allmulti, allmulti);</div><div class='add'>+	if (flags != old_flags) {</div><div class='add'>+		WRITE_ONCE(dev-&gt;flags, flags);</div><div class='add'>+		netdev_info(dev, "%s allmulticast mode\n",</div><div class='add'>+			    dev-&gt;flags &amp; IFF_ALLMULTI ? "entered" : "left");</div><div class='ctx'> 		dev_change_rx_flags(dev, IFF_ALLMULTI);</div><div class='ctx'> 		dev_set_rx_mode(dev);</div><div class='ctx'> 		if (notify)</div><div class='ctx'> 			__dev_notify_flags(dev, old_flags,</div><div class='del'>-					   dev-&gt;gflags ^ old_gflags);</div><div class='add'>+					   dev-&gt;gflags ^ old_gflags, 0, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_set_allmulti	- update allmulti count on a device</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@inc: modifier</div><div class='del'>- *</div><div class='del'>- *	Add or remove reception of all multicast frames to a device. While the</div><div class='del'>- *	count in the device remains above zero the interface remains listening</div><div class='del'>- *	to all interfaces. Once it hits zero the device reverts back to normal</div><div class='del'>- *	filtering operation. A negative @inc value is used to drop the counter</div><div class='del'>- *	when releasing a resource needing all multicasts.</div><div class='del'>- *	Return 0 if successful or a negative errno code on error.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int dev_set_allmulti(struct net_device *dev, int inc)</div><div class='del'>-{</div><div class='del'>-	return __dev_set_allmulti(dev, inc, true);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dev_set_allmulti);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Upload unicast and multicast address lists to device and</div><div class='ctx'>  *	configure RX filtering. When the device doesn't support unicast</div><div class='hunk'>@@ -7377,21 +9663,21 @@ void dev_set_rx_mode(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_get_flags - get flags reported to userspace</div><div class='del'>- *	@dev: device</div><div class='add'>+ * netif_get_flags() - get flags reported to userspace</div><div class='add'>+ * @dev: device</div><div class='ctx'>  *</div><div class='del'>- *	Get the combination of flag bits exported through APIs to userspace.</div><div class='add'>+ * Get the combination of flag bits exported through APIs to userspace.</div><div class='ctx'>  */</div><div class='del'>-unsigned int dev_get_flags(const struct net_device *dev)</div><div class='add'>+unsigned int netif_get_flags(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> </div><div class='del'>-	flags = (dev-&gt;flags &amp; ~(IFF_PROMISC |</div><div class='add'>+	flags = (READ_ONCE(dev-&gt;flags) &amp; ~(IFF_PROMISC |</div><div class='ctx'> 				IFF_ALLMULTI |</div><div class='ctx'> 				IFF_RUNNING |</div><div class='ctx'> 				IFF_LOWER_UP |</div><div class='ctx'> 				IFF_DORMANT)) |</div><div class='del'>-		(dev-&gt;gflags &amp; (IFF_PROMISC |</div><div class='add'>+		(READ_ONCE(dev-&gt;gflags) &amp; (IFF_PROMISC |</div><div class='ctx'> 				IFF_ALLMULTI));</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='hunk'>@@ -7405,9 +9691,10 @@ unsigned int dev_get_flags(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_flags);</div><div class='add'>+EXPORT_SYMBOL(netif_get_flags);</div><div class='ctx'> </div><div class='del'>-int __dev_change_flags(struct net_device *dev, unsigned int flags)</div><div class='add'>+int __dev_change_flags(struct net_device *dev, unsigned int flags,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_flags = dev-&gt;flags;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -7444,12 +9731,12 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags)</div><div class='ctx'> 		if (old_flags &amp; IFF_UP)</div><div class='ctx'> 			__dev_close(dev);</div><div class='ctx'> 		else</div><div class='del'>-			ret = __dev_open(dev);</div><div class='add'>+			ret = __dev_open(dev, extack);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((flags ^ dev-&gt;gflags) &amp; IFF_PROMISC) {</div><div class='ctx'> 		int inc = (flags &amp; IFF_PROMISC) ? 1 : -1;</div><div class='del'>-		unsigned int old_flags = dev-&gt;flags;</div><div class='add'>+		old_flags = dev-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;gflags ^= IFF_PROMISC;</div><div class='ctx'> </div><div class='hunk'>@@ -7466,19 +9753,20 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags)</div><div class='ctx'> 		int inc = (flags &amp; IFF_ALLMULTI) ? 1 : -1;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;gflags ^= IFF_ALLMULTI;</div><div class='del'>-		__dev_set_allmulti(dev, inc, false);</div><div class='add'>+		netif_set_allmulti(dev, inc, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __dev_notify_flags(struct net_device *dev, unsigned int old_flags,</div><div class='del'>-			unsigned int gchanges)</div><div class='add'>+			unsigned int gchanges, u32 portid,</div><div class='add'>+			const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int changes = dev-&gt;flags ^ old_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (gchanges)</div><div class='del'>-		rtmsg_ifinfo(RTM_NEWLINK, dev, gchanges, GFP_ATOMIC);</div><div class='add'>+		rtmsg_ifinfo(RTM_NEWLINK, dev, gchanges, GFP_ATOMIC, portid, nlh);</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; IFF_UP) {</div><div class='ctx'> 		if (dev-&gt;flags &amp; IFF_UP)</div><div class='hunk'>@@ -7500,57 +9788,37 @@ void __dev_notify_flags(struct net_device *dev, unsigned int old_flags,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_flags - change device settings</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@flags: device state flags</div><div class='del'>- *</div><div class='del'>- *	Change settings on device based state flags. The flags are</div><div class='del'>- *	in the userspace exported format.</div><div class='del'>- */</div><div class='del'>-int dev_change_flags(struct net_device *dev, unsigned int flags)</div><div class='add'>+int netif_change_flags(struct net_device *dev, unsigned int flags,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int changes, old_flags = dev-&gt;flags, old_gflags = dev-&gt;gflags;</div><div class='ctx'> </div><div class='del'>-	ret = __dev_change_flags(dev, flags);</div><div class='add'>+	ret = __dev_change_flags(dev, flags, extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	changes = (old_flags ^ dev-&gt;flags) | (old_gflags ^ dev-&gt;gflags);</div><div class='del'>-	__dev_notify_flags(dev, old_flags, changes);</div><div class='add'>+	__dev_notify_flags(dev, old_flags, changes, 0, NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_change_flags);</div><div class='ctx'> </div><div class='del'>-int __dev_set_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+int __netif_set_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;ndo_change_mtu)</div><div class='ctx'> 		return ops-&gt;ndo_change_mtu(dev, new_mtu);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	/* Pairs with all the lockless reads of dev-&gt;mtu in the stack */</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__dev_set_mtu);</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(__netif_set_mtu, "NETDEV_INTERNAL");</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_set_mtu_ext - Change maximum transfer unit</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@new_mtu: new transfer unit</div><div class='del'>- *	@extack: netlink extended ack</div><div class='del'>- *</div><div class='del'>- *	Change the maximum transfer size of the network device.</div><div class='del'>- */</div><div class='del'>-int dev_set_mtu_ext(struct net_device *dev, int new_mtu,</div><div class='del'>-		    struct netlink_ext_ack *extack)</div><div class='add'>+int dev_validate_mtu(struct net_device *dev, int new_mtu,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int err, orig_mtu;</div><div class='del'>-</div><div class='del'>-	if (new_mtu == dev-&gt;mtu)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* MTU must be positive, and in range */</div><div class='ctx'> 	if (new_mtu &lt; 0 || new_mtu &lt; dev-&gt;min_mtu) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "mtu less than device minimum");</div><div class='hunk'>@@ -7561,6 +9829,32 @@ int dev_set_mtu_ext(struct net_device *dev, int new_mtu,</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "mtu greater than device maximum");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_set_mtu_ext() - Change maximum transfer unit</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @new_mtu: new transfer unit</div><div class='add'>+ * @extack: netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Change the maximum transfer size of the network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int netif_set_mtu_ext(struct net_device *dev, int new_mtu,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err, orig_mtu;</div><div class='add'>+</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	if (new_mtu == dev-&gt;mtu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dev_validate_mtu(dev, new_mtu, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_device_present(dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -7571,41 +9865,38 @@ int dev_set_mtu_ext(struct net_device *dev, int new_mtu,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	orig_mtu = dev-&gt;mtu;</div><div class='del'>-	err = __dev_set_mtu(dev, new_mtu);</div><div class='add'>+	err = __netif_set_mtu(dev, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (!err) {</div><div class='del'>-		err = call_netdevice_notifiers(NETDEV_CHANGEMTU, dev);</div><div class='add'>+		err = call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,</div><div class='add'>+						   orig_mtu);</div><div class='ctx'> 		err = notifier_to_errno(err);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			/* setting mtu back and notifying everyone again,</div><div class='ctx'> 			 * so that they have a chance to revert changes.</div><div class='ctx'> 			 */</div><div class='del'>-			__dev_set_mtu(dev, orig_mtu);</div><div class='del'>-			call_netdevice_notifiers(NETDEV_CHANGEMTU, dev);</div><div class='add'>+			__netif_set_mtu(dev, orig_mtu);</div><div class='add'>+			call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,</div><div class='add'>+						     new_mtu);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dev_set_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+int netif_set_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct netlink_ext_ack extack;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;extack, 0, sizeof(extack));</div><div class='del'>-	err = dev_set_mtu_ext(dev, new_mtu, &amp;extack);</div><div class='add'>+	err = netif_set_mtu_ext(dev, new_mtu, &amp;extack);</div><div class='ctx'> 	if (err &amp;&amp; extack._msg)</div><div class='ctx'> 		net_err_ratelimited("%s: %s\n", dev-&gt;name, extack._msg);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_set_mtu);</div><div class='add'>+EXPORT_SYMBOL(netif_set_mtu);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_tx_queue_len - Change TX queue length of a netdevice</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@new_len: new tx queue length</div><div class='del'>- */</div><div class='del'>-int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)</div><div class='add'>+int netif_change_tx_queue_len(struct net_device *dev, unsigned long new_len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int orig_len = dev-&gt;tx_queue_len;</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -7614,7 +9905,7 @@ int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (new_len != orig_len) {</div><div class='del'>-		dev-&gt;tx_queue_len = new_len;</div><div class='add'>+		WRITE_ONCE(dev-&gt;tx_queue_len, new_len);</div><div class='ctx'> 		res = call_netdevice_notifiers(NETDEV_CHANGE_TX_QUEUE_LEN, dev);</div><div class='ctx'> 		res = notifier_to_errno(res);</div><div class='ctx'> 		if (res)</div><div class='hunk'>@@ -7628,57 +9919,96 @@ int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)</div><div class='ctx'> </div><div class='ctx'> err_rollback:</div><div class='ctx'> 	netdev_err(dev, "refused to change device tx_queue_len\n");</div><div class='del'>-	dev-&gt;tx_queue_len = orig_len;</div><div class='add'>+	WRITE_ONCE(dev-&gt;tx_queue_len, orig_len);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_set_group - Change group this device belongs to</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@new_group: group this device should belong to</div><div class='del'>- */</div><div class='del'>-void dev_set_group(struct net_device *dev, int new_group)</div><div class='add'>+void netif_set_group(struct net_device *dev, int new_group)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;group = new_group;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_set_group);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_set_mac_address - Change Media Access Control Address</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@sa: new address</div><div class='add'>+ * netif_pre_changeaddr_notify() - Call NETDEV_PRE_CHANGEADDR.</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @addr: new address</div><div class='add'>+ * @extack: netlink extended ack</div><div class='ctx'>  *</div><div class='del'>- *	Change the hardware (MAC) address of the device</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='ctx'>  */</div><div class='del'>-int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa)</div><div class='add'>+int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_pre_changeaddr_info info = {</div><div class='add'>+		.info.dev = dev,</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.dev_addr = addr,</div><div class='add'>+	};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = call_netdevice_notifiers_info(NETDEV_PRE_CHANGEADDR, &amp;info.info);</div><div class='add'>+	return notifier_to_errno(rc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(netif_pre_changeaddr_notify, "NETDEV_INTERNAL");</div><div class='add'>+</div><div class='add'>+int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ops-&gt;ndo_set_mac_address)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	if (sa-&gt;sa_family != dev-&gt;type)</div><div class='add'>+	if (ss-&gt;ss_family != dev-&gt;type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!netif_device_present(dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	err = ops-&gt;ndo_set_mac_address(dev, sa);</div><div class='add'>+	err = netif_pre_changeaddr_notify(dev, ss-&gt;__data, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+	if (memcmp(dev-&gt;dev_addr, ss-&gt;__data, dev-&gt;addr_len)) {</div><div class='add'>+		err = ops-&gt;ndo_set_mac_address(dev, ss);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> 	dev-&gt;addr_assign_type = NET_ADDR_SET;</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);</div><div class='ctx'> 	add_device_randomness(dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_set_mac_address);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_carrier - Change device carrier</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@new_carrier: new value</div><div class='del'>- *</div><div class='del'>- *	Change device carrier</div><div class='del'>- */</div><div class='del'>-int dev_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='add'>+DECLARE_RWSEM(dev_addr_sem);</div><div class='add'>+</div><div class='add'>+/* "sa" is a true struct sockaddr with limited "sa_data" member. */</div><div class='add'>+int netif_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name)</div><div class='add'>+{</div><div class='add'>+	size_t size = sizeof(sa-&gt;sa_data);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;dev_addr_sem);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_name_rcu(net, dev_name);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	if (!dev-&gt;addr_len)</div><div class='add'>+		memset(sa-&gt;sa_data, 0, size);</div><div class='add'>+	else</div><div class='add'>+		memcpy(sa-&gt;sa_data, dev-&gt;dev_addr,</div><div class='add'>+		       min_t(size_t, size, dev-&gt;addr_len));</div><div class='add'>+	sa-&gt;sa_family = dev-&gt;type;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	up_read(&amp;dev_addr_sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(netif_get_mac_address, "NETDEV_INTERNAL");</div><div class='add'>+</div><div class='add'>+int netif_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -7688,7 +10018,6 @@ int dev_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	return ops-&gt;ndo_change_carrier(dev, new_carrier);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_change_carrier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_get_phys_port_id - Get device physical port ID</div><div class='hunk'>@@ -7706,7 +10035,6 @@ int dev_get_phys_port_id(struct net_device *dev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	return ops-&gt;ndo_get_phys_port_id(dev, ppid);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_phys_port_id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_get_phys_port_name - Get device physical port name</div><div class='hunk'>@@ -7720,279 +10048,755 @@ int dev_get_phys_port_name(struct net_device *dev,</div><div class='ctx'> 			   char *name, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!ops-&gt;ndo_get_phys_port_name)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return ops-&gt;ndo_get_phys_port_name(dev, name, len);</div><div class='add'>+	if (ops-&gt;ndo_get_phys_port_name) {</div><div class='add'>+		err = ops-&gt;ndo_get_phys_port_name(dev, name, len);</div><div class='add'>+		if (err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return devlink_compat_phys_port_name_get(dev, name, len);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_get_phys_port_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_change_proto_down - update protocol port state information</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@proto_down: new value</div><div class='add'>+ * netif_get_port_parent_id() - Get the device's port parent identifier</div><div class='add'>+ * @dev: network device</div><div class='add'>+ * @ppid: pointer to a storage for the port's parent identifier</div><div class='add'>+ * @recurse: allow/disallow recursion to lower devices</div><div class='add'>+ *</div><div class='add'>+ * Get the devices's port parent identifier.</div><div class='ctx'>  *</div><div class='del'>- *	This info can be used by switch drivers to set the phys state of the</div><div class='del'>- *	port.</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='ctx'>  */</div><div class='del'>-int dev_change_proto_down(struct net_device *dev, bool proto_down)</div><div class='add'>+int netif_get_port_parent_id(struct net_device *dev,</div><div class='add'>+			     struct netdev_phys_item_id *ppid, bool recurse)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	struct netdev_phys_item_id first = { };</div><div class='add'>+	struct net_device *lower_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!ops-&gt;ndo_change_proto_down)</div><div class='add'>+	if (ops-&gt;ndo_get_port_parent_id) {</div><div class='add'>+		err = ops-&gt;ndo_get_port_parent_id(dev, ppid);</div><div class='add'>+		if (err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_compat_switch_id_get(dev, ppid);</div><div class='add'>+	if (!recurse || err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower_dev, iter) {</div><div class='add'>+		err = netif_get_port_parent_id(lower_dev, ppid, true);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		if (!first.id_len)</div><div class='add'>+			first = *ppid;</div><div class='add'>+		else if (memcmp(&amp;first, ppid, sizeof(*ppid)))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_get_port_parent_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	netdev_port_same_parent_id - Indicate if two network devices have</div><div class='add'>+ *	the same port parent identifier</div><div class='add'>+ *	@a: first network device</div><div class='add'>+ *	@b: second network device</div><div class='add'>+ */</div><div class='add'>+bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b)</div><div class='add'>+{</div><div class='add'>+	struct netdev_phys_item_id a_id = { };</div><div class='add'>+	struct netdev_phys_item_id b_id = { };</div><div class='add'>+</div><div class='add'>+	if (netif_get_port_parent_id(a, &amp;a_id, true) ||</div><div class='add'>+	    netif_get_port_parent_id(b, &amp;b_id, true))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return netdev_phys_item_id_same(&amp;a_id, &amp;b_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_port_same_parent_id);</div><div class='add'>+</div><div class='add'>+int netif_change_proto_down(struct net_device *dev, bool proto_down)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;change_proto_down)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!netif_device_present(dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	return ops-&gt;ndo_change_proto_down(dev, proto_down);</div><div class='add'>+	if (proto_down)</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_on(dev);</div><div class='add'>+	WRITE_ONCE(dev-&gt;proto_down, proto_down);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_change_proto_down);</div><div class='ctx'> </div><div class='del'>-u32 __dev_xdp_query(struct net_device *dev, bpf_op_t bpf_op,</div><div class='del'>-		    enum bpf_netdev_command cmd)</div><div class='add'>+/**</div><div class='add'>+ *	netdev_change_proto_down_reason_locked - proto down reason</div><div class='add'>+ *</div><div class='add'>+ *	@dev: device</div><div class='add'>+ *	@mask: proto down mask</div><div class='add'>+ *	@value: proto down value</div><div class='add'>+ */</div><div class='add'>+void netdev_change_proto_down_reason_locked(struct net_device *dev,</div><div class='add'>+					    unsigned long mask, u32 value)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_bpf xdp;</div><div class='add'>+	u32 proto_down_reason;</div><div class='add'>+	int b;</div><div class='ctx'> </div><div class='del'>-	if (!bpf_op)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!mask) {</div><div class='add'>+		proto_down_reason = value;</div><div class='add'>+	} else {</div><div class='add'>+		proto_down_reason = dev-&gt;proto_down_reason;</div><div class='add'>+		for_each_set_bit(b, &amp;mask, 32) {</div><div class='add'>+			if (value &amp; (1 &lt;&lt; b))</div><div class='add'>+				proto_down_reason |= BIT(b);</div><div class='add'>+			else</div><div class='add'>+				proto_down_reason &amp;= ~BIT(b);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(dev-&gt;proto_down_reason, proto_down_reason);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;xdp, 0, sizeof(xdp));</div><div class='del'>-	xdp.command = cmd;</div><div class='add'>+struct bpf_xdp_link {</div><div class='add'>+	struct bpf_link link;</div><div class='add'>+	struct net_device *dev; /* protected by rtnl_lock, no refcnt held */</div><div class='add'>+	int flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum bpf_xdp_mode dev_xdp_mode(struct net_device *dev, u32 flags)</div><div class='add'>+{</div><div class='add'>+	if (flags &amp; XDP_FLAGS_HW_MODE)</div><div class='add'>+		return XDP_MODE_HW;</div><div class='add'>+	if (flags &amp; XDP_FLAGS_DRV_MODE)</div><div class='add'>+		return XDP_MODE_DRV;</div><div class='add'>+	if (flags &amp; XDP_FLAGS_SKB_MODE)</div><div class='add'>+		return XDP_MODE_SKB;</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_bpf ? XDP_MODE_DRV : XDP_MODE_SKB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bpf_op_t dev_xdp_bpf_op(struct net_device *dev, enum bpf_xdp_mode mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case XDP_MODE_SKB:</div><div class='add'>+		return generic_xdp_install;</div><div class='add'>+	case XDP_MODE_DRV:</div><div class='add'>+	case XDP_MODE_HW:</div><div class='add'>+		return dev-&gt;netdev_ops-&gt;ndo_bpf;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_xdp_link *dev_xdp_link(struct net_device *dev,</div><div class='add'>+					 enum bpf_xdp_mode mode)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;xdp_state[mode].link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_prog *dev_xdp_prog(struct net_device *dev,</div><div class='add'>+				     enum bpf_xdp_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct bpf_xdp_link *link = dev_xdp_link(dev, mode);</div><div class='add'>+</div><div class='add'>+	if (link)</div><div class='add'>+		return link-&gt;link.prog;</div><div class='add'>+	return dev-&gt;xdp_state[mode].prog;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 dev_xdp_prog_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __MAX_XDP_MODE; i++)</div><div class='add'>+		if (dev-&gt;xdp_state[i].prog || dev-&gt;xdp_state[i].link)</div><div class='add'>+			count++;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_xdp_prog_count);</div><div class='add'>+</div><div class='add'>+u8 dev_xdp_sb_prog_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __MAX_XDP_MODE; i++)</div><div class='add'>+		if (dev-&gt;xdp_state[i].prog &amp;&amp;</div><div class='add'>+		    !dev-&gt;xdp_state[i].prog-&gt;aux-&gt;xdp_has_frags)</div><div class='add'>+			count++;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netif_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_bpf)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Query must always succeed. */</div><div class='del'>-	WARN_ON(bpf_op(dev, &amp;xdp) &lt; 0 &amp;&amp; cmd == XDP_QUERY_PROG);</div><div class='add'>+	if (dev-&gt;cfg-&gt;hds_config == ETHTOOL_TCP_DATA_SPLIT_ENABLED &amp;&amp;</div><div class='add'>+	    bpf-&gt;command == XDP_SETUP_PROG &amp;&amp;</div><div class='add'>+	    bpf-&gt;prog &amp;&amp; !bpf-&gt;prog-&gt;aux-&gt;xdp_has_frags) {</div><div class='add'>+		NL_SET_ERR_MSG(bpf-&gt;extack,</div><div class='add'>+			       "unable to propagate XDP to device using tcp-data-split");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_get_min_mp_channel_count(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(bpf-&gt;extack, "unable to propagate XDP to device using memory provider");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return xdp.prog_id;</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_bpf(dev, bpf);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(netif_xdp_propagate);</div><div class='ctx'> </div><div class='del'>-static int dev_xdp_install(struct net_device *dev, bpf_op_t bpf_op,</div><div class='del'>-			   struct netlink_ext_ack *extack, u32 flags,</div><div class='del'>-			   struct bpf_prog *prog)</div><div class='add'>+u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *prog = dev_xdp_prog(dev, mode);</div><div class='add'>+</div><div class='add'>+	return prog ? prog-&gt;aux-&gt;id : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_xdp_set_link(struct net_device *dev, enum bpf_xdp_mode mode,</div><div class='add'>+			     struct bpf_xdp_link *link)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;xdp_state[mode].link = link;</div><div class='add'>+	dev-&gt;xdp_state[mode].prog = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_xdp_set_prog(struct net_device *dev, enum bpf_xdp_mode mode,</div><div class='add'>+			     struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;xdp_state[mode].link = NULL;</div><div class='add'>+	dev-&gt;xdp_state[mode].prog = prog;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_xdp_install(struct net_device *dev, enum bpf_xdp_mode mode,</div><div class='add'>+			   bpf_op_t bpf_op, struct netlink_ext_ack *extack,</div><div class='add'>+			   u32 flags, struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_bpf xdp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;cfg-&gt;hds_config == ETHTOOL_TCP_DATA_SPLIT_ENABLED &amp;&amp;</div><div class='add'>+	    prog &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "unable to install XDP to device using tcp-data-split");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_get_min_mp_channel_count(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "unable to install XDP to device using memory provider");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;xdp, 0, sizeof(xdp));</div><div class='del'>-	if (flags &amp; XDP_FLAGS_HW_MODE)</div><div class='del'>-		xdp.command = XDP_SETUP_PROG_HW;</div><div class='del'>-	else</div><div class='del'>-		xdp.command = XDP_SETUP_PROG;</div><div class='add'>+	xdp.command = mode == XDP_MODE_HW ? XDP_SETUP_PROG_HW : XDP_SETUP_PROG;</div><div class='ctx'> 	xdp.extack = extack;</div><div class='ctx'> 	xdp.flags = flags;</div><div class='ctx'> 	xdp.prog = prog;</div><div class='ctx'> </div><div class='del'>-	return bpf_op(dev, &amp;xdp);</div><div class='add'>+	/* Drivers assume refcnt is already incremented (i.e, prog pointer is</div><div class='add'>+	 * "moved" into driver), so they don't increment it on their own, but</div><div class='add'>+	 * they do decrement refcnt when program is detached or replaced.</div><div class='add'>+	 * Given net_device also owns link/prog, we need to bump refcnt here</div><div class='add'>+	 * to prevent drivers from underflowing it.</div><div class='add'>+	 */</div><div class='add'>+	if (prog)</div><div class='add'>+		bpf_prog_inc(prog);</div><div class='add'>+	err = bpf_op(dev, &amp;xdp);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (prog)</div><div class='add'>+			bpf_prog_put(prog);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode != XDP_MODE_HW)</div><div class='add'>+		bpf_prog_change_xdp(dev_xdp_prog(dev, mode), prog);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dev_xdp_uninstall(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_bpf xdp;</div><div class='del'>-	bpf_op_t ndo_bpf;</div><div class='add'>+	struct bpf_xdp_link *link;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	enum bpf_xdp_mode mode;</div><div class='add'>+	bpf_op_t bpf_op;</div><div class='ctx'> </div><div class='del'>-	/* Remove generic XDP */</div><div class='del'>-	WARN_ON(dev_xdp_install(dev, generic_xdp_install, NULL, 0, NULL));</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	/* Remove from the driver */</div><div class='del'>-	ndo_bpf = dev-&gt;netdev_ops-&gt;ndo_bpf;</div><div class='del'>-	if (!ndo_bpf)</div><div class='del'>-		return;</div><div class='add'>+	for (mode = XDP_MODE_SKB; mode &lt; __MAX_XDP_MODE; mode++) {</div><div class='add'>+		prog = dev_xdp_prog(dev, mode);</div><div class='add'>+		if (!prog)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;xdp, 0, sizeof(xdp));</div><div class='del'>-	xdp.command = XDP_QUERY_PROG;</div><div class='del'>-	WARN_ON(ndo_bpf(dev, &amp;xdp));</div><div class='del'>-	if (xdp.prog_id)</div><div class='del'>-		WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,</div><div class='del'>-					NULL));</div><div class='add'>+		bpf_op = dev_xdp_bpf_op(dev, mode);</div><div class='add'>+		if (!bpf_op)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	/* Remove HW offload */</div><div class='del'>-	memset(&amp;xdp, 0, sizeof(xdp));</div><div class='del'>-	xdp.command = XDP_QUERY_PROG_HW;</div><div class='del'>-	if (!ndo_bpf(dev, &amp;xdp) &amp;&amp; xdp.prog_id)</div><div class='del'>-		WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,</div><div class='del'>-					NULL));</div><div class='add'>+		WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));</div><div class='add'>+</div><div class='add'>+		/* auto-detach link from net device */</div><div class='add'>+		link = dev_xdp_link(dev, mode);</div><div class='add'>+		if (link)</div><div class='add'>+			link-&gt;dev = NULL;</div><div class='add'>+		else</div><div class='add'>+			bpf_prog_put(prog);</div><div class='add'>+</div><div class='add'>+		dev_xdp_set_link(dev, mode, NULL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_xdp_fd - set or clear a bpf program for a device rx path</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@extack: netlink extended ack</div><div class='del'>- *	@fd: new program fd or negative value to clear</div><div class='del'>- *	@flags: xdp-related flags</div><div class='del'>- *</div><div class='del'>- *	Set or clear a bpf program for a device</div><div class='del'>- */</div><div class='del'>-int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,</div><div class='del'>-		      int fd, u32 flags)</div><div class='add'>+static int dev_xdp_attach(struct net_device *dev, struct netlink_ext_ack *extack,</div><div class='add'>+			  struct bpf_xdp_link *link, struct bpf_prog *new_prog,</div><div class='add'>+			  struct bpf_prog *old_prog, u32 flags)</div><div class='ctx'> {</div><div class='del'>-	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='del'>-	enum bpf_netdev_command query;</div><div class='del'>-	struct bpf_prog *prog = NULL;</div><div class='del'>-	bpf_op_t bpf_op, bpf_chk;</div><div class='add'>+	unsigned int num_modes = hweight32(flags &amp; XDP_FLAGS_MODES);</div><div class='add'>+	struct bpf_prog *cur_prog;</div><div class='add'>+	struct net_device *upper;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	enum bpf_xdp_mode mode;</div><div class='add'>+	bpf_op_t bpf_op;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	query = flags &amp; XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;</div><div class='add'>+	/* either link or prog attachment, never both */</div><div class='add'>+	if (link &amp;&amp; (new_prog || old_prog))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* link supports only XDP mode flags */</div><div class='add'>+	if (link &amp;&amp; (flags &amp; ~XDP_FLAGS_MODES)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid XDP flags for BPF link attachment");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* just one XDP mode bit should be set, zero defaults to drv/skb mode */</div><div class='add'>+	if (num_modes &gt; 1) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Only one XDP mode flag can be set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* avoid ambiguity if offload + drv/skb mode progs are both loaded */</div><div class='add'>+	if (!num_modes &amp;&amp; dev_xdp_prog_count(dev) &gt; 1) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "More than one program loaded, unset mode is ambiguous");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* old_prog != NULL implies XDP_FLAGS_REPLACE is set */</div><div class='add'>+	if (old_prog &amp;&amp; !(flags &amp; XDP_FLAGS_REPLACE)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "XDP_FLAGS_REPLACE is not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bpf_op = bpf_chk = ops-&gt;ndo_bpf;</div><div class='del'>-	if (!bpf_op &amp;&amp; (flags &amp; (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	if (!bpf_op || (flags &amp; XDP_FLAGS_SKB_MODE))</div><div class='del'>-		bpf_op = generic_xdp_install;</div><div class='del'>-	if (bpf_op == bpf_chk)</div><div class='del'>-		bpf_chk = generic_xdp_install;</div><div class='add'>+	mode = dev_xdp_mode(dev, flags);</div><div class='add'>+	/* can't replace attached link */</div><div class='add'>+	if (dev_xdp_link(dev, mode)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can't replace active BPF XDP link");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (fd &gt;= 0) {</div><div class='del'>-		if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) ||</div><div class='del'>-		    __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW))</div><div class='add'>+	/* don't allow if an upper device already has a program */</div><div class='add'>+	netdev_for_each_upper_dev_rcu(dev, upper, iter) {</div><div class='add'>+		if (dev_xdp_prog_count(upper) &gt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Cannot attach when an upper device already has a program");</div><div class='ctx'> 			return -EEXIST;</div><div class='del'>-		if ((flags &amp; XDP_FLAGS_UPDATE_IF_NOEXIST) &amp;&amp;</div><div class='del'>-		    __dev_xdp_query(dev, bpf_op, query))</div><div class='del'>-			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,</div><div class='del'>-					     bpf_op == ops-&gt;ndo_bpf);</div><div class='del'>-		if (IS_ERR(prog))</div><div class='del'>-			return PTR_ERR(prog);</div><div class='add'>+	cur_prog = dev_xdp_prog(dev, mode);</div><div class='add'>+	/* can't replace attached prog with link */</div><div class='add'>+	if (link &amp;&amp; cur_prog) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can't replace active XDP program with BPF link");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	if ((flags &amp; XDP_FLAGS_REPLACE) &amp;&amp; cur_prog != old_prog) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Active program does not match expected");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!(flags &amp; XDP_FLAGS_HW_MODE) &amp;&amp;</div><div class='del'>-		    bpf_prog_is_dev_bound(prog-&gt;aux)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "using device-bound program without HW_MODE flag is not supported");</div><div class='del'>-			bpf_prog_put(prog);</div><div class='add'>+	/* put effective new program into new_prog */</div><div class='add'>+	if (link)</div><div class='add'>+		new_prog = link-&gt;link.prog;</div><div class='add'>+</div><div class='add'>+	if (new_prog) {</div><div class='add'>+		bool offload = mode == XDP_MODE_HW;</div><div class='add'>+		enum bpf_xdp_mode other_mode = mode == XDP_MODE_SKB</div><div class='add'>+					       ? XDP_MODE_DRV : XDP_MODE_SKB;</div><div class='add'>+</div><div class='add'>+		if ((flags &amp; XDP_FLAGS_UPDATE_IF_NOEXIST) &amp;&amp; cur_prog) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "XDP program already attached");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		if (!offload &amp;&amp; dev_xdp_prog(dev, other_mode)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Native and generic XDP can't be active at the same time");</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+		if (!offload &amp;&amp; bpf_prog_is_offloaded(new_prog-&gt;aux)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Using offloaded program without HW_MODE flag is not supported");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (bpf_prog_is_dev_bound(new_prog-&gt;aux) &amp;&amp; !bpf_offload_dev_match(new_prog, dev)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Program bound to different device");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (bpf_prog_is_dev_bound(new_prog-&gt;aux) &amp;&amp; mode == XDP_MODE_SKB) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Can't attach device-bound programs in generic mode");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (new_prog-&gt;expected_attach_type == BPF_XDP_DEVMAP) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "BPF_XDP_DEVMAP programs can not be attached to a device");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (new_prog-&gt;expected_attach_type == BPF_XDP_CPUMAP) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "BPF_XDP_CPUMAP programs can not be attached to a device");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = dev_xdp_install(dev, bpf_op, extack, flags, prog);</div><div class='del'>-	if (err &lt; 0 &amp;&amp; prog)</div><div class='del'>-		bpf_prog_put(prog);</div><div class='add'>+	/* don't call drivers if the effective program didn't change */</div><div class='add'>+	if (new_prog != cur_prog) {</div><div class='add'>+		bpf_op = dev_xdp_bpf_op(dev, mode);</div><div class='add'>+		if (!bpf_op) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Underlying driver does not support XDP in native mode");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+		err = dev_xdp_install(dev, mode, bpf_op, extack, flags, new_prog);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link)</div><div class='add'>+		dev_xdp_set_link(dev, mode, link);</div><div class='add'>+	else</div><div class='add'>+		dev_xdp_set_prog(dev, mode, new_prog);</div><div class='add'>+	if (cur_prog)</div><div class='add'>+		bpf_prog_put(cur_prog);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_new_index	-	allocate an ifindex</div><div class='del'>- *	@net: the applicable net namespace</div><div class='del'>- *</div><div class='del'>- *	Returns a suitable unique value for a new device interface</div><div class='del'>- *	number.  The caller must hold the rtnl semaphore or the</div><div class='del'>- *	dev_base_lock to be sure it remains unique.</div><div class='del'>- */</div><div class='del'>-static int dev_new_index(struct net *net)</div><div class='add'>+static int dev_xdp_attach_link(struct net_device *dev,</div><div class='add'>+			       struct netlink_ext_ack *extack,</div><div class='add'>+			       struct bpf_xdp_link *link)</div><div class='ctx'> {</div><div class='del'>-	int ifindex = net-&gt;ifindex;</div><div class='add'>+	return dev_xdp_attach(dev, extack, link, NULL, NULL, link-&gt;flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		if (++ifindex &lt;= 0)</div><div class='del'>-			ifindex = 1;</div><div class='del'>-		if (!__dev_get_by_index(net, ifindex))</div><div class='del'>-			return net-&gt;ifindex = ifindex;</div><div class='add'>+static int dev_xdp_detach_link(struct net_device *dev,</div><div class='add'>+			       struct netlink_ext_ack *extack,</div><div class='add'>+			       struct bpf_xdp_link *link)</div><div class='add'>+{</div><div class='add'>+	enum bpf_xdp_mode mode;</div><div class='add'>+	bpf_op_t bpf_op;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mode = dev_xdp_mode(dev, link-&gt;flags);</div><div class='add'>+	if (dev_xdp_link(dev, mode) != link)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bpf_op = dev_xdp_bpf_op(dev, mode);</div><div class='add'>+	WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));</div><div class='add'>+	dev_xdp_set_link(dev, mode, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_xdp_link_release(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	/* if racing with net_device's tear down, xdp_link-&gt;dev might be</div><div class='add'>+	 * already NULL, in which case link was already auto-detached</div><div class='add'>+	 */</div><div class='add'>+	if (xdp_link-&gt;dev) {</div><div class='add'>+		netdev_lock_ops(xdp_link-&gt;dev);</div><div class='add'>+		WARN_ON(dev_xdp_detach_link(xdp_link-&gt;dev, NULL, xdp_link));</div><div class='add'>+		netdev_unlock_ops(xdp_link-&gt;dev);</div><div class='add'>+		xdp_link-&gt;dev = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Delayed registration/unregisteration */</div><div class='del'>-static LIST_HEAD(net_todo_list);</div><div class='del'>-DECLARE_WAIT_QUEUE_HEAD(netdev_unregistering_wq);</div><div class='add'>+static int bpf_xdp_link_detach(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	bpf_xdp_link_release(link);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void net_set_todo(struct net_device *dev)</div><div class='add'>+static void bpf_xdp_link_dealloc(struct bpf_link *link)</div><div class='ctx'> {</div><div class='del'>-	list_add_tail(&amp;dev-&gt;todo_list, &amp;net_todo_list);</div><div class='del'>-	dev_net(dev)-&gt;dev_unreg_count++;</div><div class='add'>+	struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);</div><div class='add'>+</div><div class='add'>+	kfree(xdp_link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rollback_registered_many(struct list_head *head)</div><div class='add'>+static void bpf_xdp_link_show_fdinfo(const struct bpf_link *link,</div><div class='add'>+				     struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev, *tmp;</div><div class='del'>-	LIST_HEAD(close_head);</div><div class='add'>+	struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);</div><div class='add'>+	u32 ifindex = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dev_boot_phase);</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (xdp_link-&gt;dev)</div><div class='add'>+		ifindex = xdp_link-&gt;dev-&gt;ifindex;</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(dev, tmp, head, unreg_list) {</div><div class='del'>-		/* Some devices call without registering</div><div class='del'>-		 * for initialization unwind. Remove those</div><div class='del'>-		 * devices and proceed with the remaining.</div><div class='del'>-		 */</div><div class='del'>-		if (dev-&gt;reg_state == NETREG_UNINITIALIZED) {</div><div class='del'>-			pr_debug("unregister_netdevice: device %s/%p never was registered\n",</div><div class='del'>-				 dev-&gt;name, dev);</div><div class='add'>+	seq_printf(seq, "ifindex:\t%u\n", ifindex);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			WARN_ON(1);</div><div class='del'>-			list_del(&amp;dev-&gt;unreg_list);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;dismantle = true;</div><div class='del'>-		BUG_ON(dev-&gt;reg_state != NETREG_REGISTERED);</div><div class='add'>+static int bpf_xdp_link_fill_link_info(const struct bpf_link *link,</div><div class='add'>+				       struct bpf_link_info *info)</div><div class='add'>+{</div><div class='add'>+	struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);</div><div class='add'>+	u32 ifindex = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (xdp_link-&gt;dev)</div><div class='add'>+		ifindex = xdp_link-&gt;dev-&gt;ifindex;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	info-&gt;xdp.ifindex = ifindex;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_xdp_link_update(struct bpf_link *link, struct bpf_prog *new_prog,</div><div class='add'>+			       struct bpf_prog *old_prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);</div><div class='add'>+	enum bpf_xdp_mode mode;</div><div class='add'>+	bpf_op_t bpf_op;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	/* link might have been auto-released already, so fail */</div><div class='add'>+	if (!xdp_link-&gt;dev) {</div><div class='add'>+		err = -ENOLINK;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If device is running, close it first. */</div><div class='del'>-	list_for_each_entry(dev, head, unreg_list)</div><div class='del'>-		list_add_tail(&amp;dev-&gt;close_list, &amp;close_head);</div><div class='del'>-	dev_close_many(&amp;close_head, true);</div><div class='add'>+	if (old_prog &amp;&amp; link-&gt;prog != old_prog) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	old_prog = link-&gt;prog;</div><div class='add'>+	if (old_prog-&gt;type != new_prog-&gt;type ||</div><div class='add'>+	    old_prog-&gt;expected_attach_type != new_prog-&gt;expected_attach_type) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(dev, head, unreg_list) {</div><div class='del'>-		/* And unlink it from device chain. */</div><div class='del'>-		unlist_netdevice(dev);</div><div class='add'>+	if (old_prog == new_prog) {</div><div class='add'>+		/* no-op, don't disturb drivers */</div><div class='add'>+		bpf_prog_put(new_prog);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;reg_state = NETREG_UNREGISTERING;</div><div class='add'>+	netdev_lock_ops(xdp_link-&gt;dev);</div><div class='add'>+	mode = dev_xdp_mode(xdp_link-&gt;dev, xdp_link-&gt;flags);</div><div class='add'>+	bpf_op = dev_xdp_bpf_op(xdp_link-&gt;dev, mode);</div><div class='add'>+	err = dev_xdp_install(xdp_link-&gt;dev, mode, bpf_op, NULL,</div><div class='add'>+			      xdp_link-&gt;flags, new_prog);</div><div class='add'>+	netdev_unlock_ops(xdp_link-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	old_prog = xchg(&amp;link-&gt;prog, new_prog);</div><div class='add'>+	bpf_prog_put(old_prog);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_link_ops bpf_xdp_link_lops = {</div><div class='add'>+	.release = bpf_xdp_link_release,</div><div class='add'>+	.dealloc = bpf_xdp_link_dealloc,</div><div class='add'>+	.detach = bpf_xdp_link_detach,</div><div class='add'>+	.show_fdinfo = bpf_xdp_link_show_fdinfo,</div><div class='add'>+	.fill_link_info = bpf_xdp_link_fill_link_info,</div><div class='add'>+	.update_prog = bpf_xdp_link_update,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct net *net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	struct bpf_link_primer link_primer;</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	struct bpf_xdp_link *link;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err, fd;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dev = dev_get_by_index(net, attr-&gt;link_create.target_ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	flush_all_backlogs();</div><div class='ctx'> </div><div class='del'>-	synchronize_net();</div><div class='add'>+	link = kzalloc(sizeof(*link), GFP_USER);</div><div class='add'>+	if (!link) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(dev, head, unreg_list) {</div><div class='del'>-		struct sk_buff *skb = NULL;</div><div class='add'>+	bpf_link_init(&amp;link-&gt;link, BPF_LINK_TYPE_XDP, &amp;bpf_xdp_link_lops, prog,</div><div class='add'>+		      attr-&gt;link_create.attach_type);</div><div class='add'>+	link-&gt;dev = dev;</div><div class='add'>+	link-&gt;flags = attr-&gt;link_create.flags;</div><div class='ctx'> </div><div class='del'>-		/* Shutdown queueing discipline. */</div><div class='del'>-		dev_shutdown(dev);</div><div class='add'>+	err = bpf_link_prime(&amp;link-&gt;link, &amp;link_primer);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(link);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dev_xdp_uninstall(dev);</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	err = dev_xdp_attach_link(dev, &amp;extack, link);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-		/* Notify protocols, that we are about to destroy</div><div class='del'>-		 * this device. They should clean all the things.</div><div class='del'>-		 */</div><div class='del'>-		call_netdevice_notifiers(NETDEV_UNREGISTER, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		link-&gt;dev = NULL;</div><div class='add'>+		bpf_link_cleanup(&amp;link_primer);</div><div class='add'>+		trace_bpf_xdp_link_attach_failed(extack._msg);</div><div class='add'>+		goto out_put_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!dev-&gt;rtnl_link_ops ||</div><div class='del'>-		    dev-&gt;rtnl_link_state == RTNL_LINK_INITIALIZED)</div><div class='del'>-			skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,</div><div class='del'>-						     GFP_KERNEL, NULL, 0);</div><div class='add'>+	fd = bpf_link_settle(&amp;link_primer);</div><div class='add'>+	/* link itself doesn't hold dev's refcnt to not complicate shutdown */</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return fd;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 *	Flush the unicast and multicast chains</div><div class='del'>-		 */</div><div class='del'>-		dev_uc_flush(dev);</div><div class='del'>-		dev_mc_flush(dev);</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;netdev_ops-&gt;ndo_uninit)</div><div class='del'>-			dev-&gt;netdev_ops-&gt;ndo_uninit(dev);</div><div class='add'>+out_put_dev:</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (skb)</div><div class='del'>-			rtmsg_ifinfo_send(skb, dev, GFP_KERNEL);</div><div class='add'>+/**</div><div class='add'>+ *	dev_change_xdp_fd - set or clear a bpf program for a device rx path</div><div class='add'>+ *	@dev: device</div><div class='add'>+ *	@extack: netlink extended ack</div><div class='add'>+ *	@fd: new program fd or negative value to clear</div><div class='add'>+ *	@expected_fd: old program fd that userspace expects to replace or clear</div><div class='add'>+ *	@flags: xdp-related flags</div><div class='add'>+ *</div><div class='add'>+ *	Set or clear a bpf program for a device</div><div class='add'>+ */</div><div class='add'>+int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,</div><div class='add'>+		      int fd, int expected_fd, u32 flags)</div><div class='add'>+{</div><div class='add'>+	enum bpf_xdp_mode mode = dev_xdp_mode(dev, flags);</div><div class='add'>+	struct bpf_prog *new_prog = NULL, *old_prog = NULL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		/* Notifier chain MUST detach us all upper devices. */</div><div class='del'>-		WARN_ON(netdev_has_any_upper_dev(dev));</div><div class='del'>-		WARN_ON(netdev_has_any_lower_dev(dev));</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-		/* Remove entries from kobject tree */</div><div class='del'>-		netdev_unregister_kobject(dev);</div><div class='del'>-#ifdef CONFIG_XPS</div><div class='del'>-		/* Remove XPS queueing entries */</div><div class='del'>-		netif_reset_xps_queues_gt(dev, 0);</div><div class='del'>-#endif</div><div class='add'>+	if (fd &gt;= 0) {</div><div class='add'>+		new_prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,</div><div class='add'>+						 mode != XDP_MODE_SKB);</div><div class='add'>+		if (IS_ERR(new_prog))</div><div class='add'>+			return PTR_ERR(new_prog);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (expected_fd &gt;= 0) {</div><div class='add'>+		old_prog = bpf_prog_get_type_dev(expected_fd, BPF_PROG_TYPE_XDP,</div><div class='add'>+						 mode != XDP_MODE_SKB);</div><div class='add'>+		if (IS_ERR(old_prog)) {</div><div class='add'>+			err = PTR_ERR(old_prog);</div><div class='add'>+			old_prog = NULL;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	synchronize_net();</div><div class='add'>+	err = dev_xdp_attach(dev, extack, NULL, new_prog, old_prog, flags);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(dev, head, unreg_list)</div><div class='del'>-		dev_put(dev);</div><div class='add'>+err_out:</div><div class='add'>+	if (err &amp;&amp; new_prog)</div><div class='add'>+		bpf_prog_put(new_prog);</div><div class='add'>+	if (old_prog)</div><div class='add'>+		bpf_prog_put(old_prog);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rollback_registered(struct net_device *dev)</div><div class='add'>+u32 dev_get_min_mp_channel_count(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	LIST_HEAD(single);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;dev-&gt;unreg_list, &amp;single);</div><div class='del'>-	rollback_registered_many(&amp;single);</div><div class='del'>-	list_del(&amp;single);</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	for (i = dev-&gt;real_num_rx_queues - 1; i &gt;= 0; i--)</div><div class='add'>+		if (dev-&gt;_rx[i].mp_params.mp_priv)</div><div class='add'>+			/* The channel count is the idx plus 1. */</div><div class='add'>+			return i + 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_index_reserve() - allocate an ifindex in a namespace</div><div class='add'>+ * @net: the applicable net namespace</div><div class='add'>+ * @ifindex: requested ifindex, pass %0 to get one allocated</div><div class='add'>+ *</div><div class='add'>+ * Allocate a ifindex for a new device. Caller must either use the ifindex</div><div class='add'>+ * to store the device (via list_netdevice()) or call dev_index_release()</div><div class='add'>+ * to give the index up.</div><div class='add'>+ *</div><div class='add'>+ * Return: a suitable unique value for a new device interface number or -errno.</div><div class='add'>+ */</div><div class='add'>+static int dev_index_reserve(struct net *net, u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ifindex &gt; INT_MAX) {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ifindex)</div><div class='add'>+		err = xa_alloc_cyclic(&amp;net-&gt;dev_by_index, &amp;ifindex, NULL,</div><div class='add'>+				      xa_limit_31b, &amp;net-&gt;ifindex, GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		err = xa_insert(&amp;net-&gt;dev_by_index, ifindex, NULL, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return ifindex;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_index_release(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	/* Expect only unused indexes, unlist_netdevice() removes the used */</div><div class='add'>+	WARN_ON(xa_erase(&amp;net-&gt;dev_by_index, ifindex));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool from_cleanup_net(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_NS</div><div class='add'>+	return current == READ_ONCE(cleanup_net_task);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Delayed registration/unregisteration */</div><div class='add'>+LIST_HEAD(net_todo_list);</div><div class='add'>+DECLARE_WAIT_QUEUE_HEAD(netdev_unregistering_wq);</div><div class='add'>+atomic_t dev_unreg_count = ATOMIC_INIT(0);</div><div class='add'>+</div><div class='add'>+static void net_set_todo(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	list_add_tail(&amp;dev-&gt;todo_list, &amp;net_todo_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_features_t netdev_sync_upper_features(struct net_device *lower,</div><div class='hunk'>@@ -8002,7 +10806,7 @@ static netdev_features_t netdev_sync_upper_features(struct net_device *lower,</div><div class='ctx'> 	netdev_features_t feature;</div><div class='ctx'> 	int feature_bit;</div><div class='ctx'> </div><div class='del'>-	for_each_netdev_feature(&amp;upper_disables, feature_bit) {</div><div class='add'>+	for_each_netdev_feature(upper_disables, feature_bit) {</div><div class='ctx'> 		feature = __NETIF_F_BIT(feature_bit);</div><div class='ctx'> 		if (!(upper-&gt;wanted_features &amp; feature)</div><div class='ctx'> 		    &amp;&amp; (features &amp; feature)) {</div><div class='hunk'>@@ -8022,21 +10826,34 @@ static void netdev_sync_lower_features(struct net_device *upper,</div><div class='ctx'> 	netdev_features_t feature;</div><div class='ctx'> 	int feature_bit;</div><div class='ctx'> </div><div class='del'>-	for_each_netdev_feature(&amp;upper_disables, feature_bit) {</div><div class='add'>+	for_each_netdev_feature(upper_disables, feature_bit) {</div><div class='ctx'> 		feature = __NETIF_F_BIT(feature_bit);</div><div class='ctx'> 		if (!(features &amp; feature) &amp;&amp; (lower-&gt;features &amp; feature)) {</div><div class='ctx'> 			netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n",</div><div class='ctx'> 				   &amp;feature, lower-&gt;name);</div><div class='add'>+			netdev_lock_ops(lower);</div><div class='ctx'> 			lower-&gt;wanted_features &amp;= ~feature;</div><div class='del'>-			netdev_update_features(lower);</div><div class='add'>+			__netdev_update_features(lower);</div><div class='ctx'> </div><div class='ctx'> 			if (unlikely(lower-&gt;features &amp; feature))</div><div class='ctx'> 				netdev_WARN(upper, "failed to disable %pNF on %s!\n",</div><div class='ctx'> 					    &amp;feature, lower-&gt;name);</div><div class='add'>+			else</div><div class='add'>+				netdev_features_change(lower);</div><div class='add'>+			netdev_unlock_ops(lower);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool netdev_has_ip_or_hw_csum(netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	netdev_features_t ip_csum_mask = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;</div><div class='add'>+	bool ip_csum = (features &amp; ip_csum_mask) == ip_csum_mask;</div><div class='add'>+	bool hw_csum = features &amp; NETIF_F_HW_CSUM;</div><div class='add'>+</div><div class='add'>+	return ip_csum || hw_csum;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_features_t netdev_fix_features(struct net_device *dev,</div><div class='ctx'> 	netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -8113,6 +10930,26 @@ static netdev_features_t netdev_fix_features(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((features &amp; NETIF_F_GRO_HW) &amp;&amp; (features &amp; NETIF_F_LRO)) {</div><div class='add'>+		netdev_dbg(dev, "Dropping LRO feature since HW-GRO is requested.\n");</div><div class='add'>+		features &amp;= ~NETIF_F_LRO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((features &amp; NETIF_F_HW_TLS_TX) &amp;&amp; !netdev_has_ip_or_hw_csum(features)) {</div><div class='add'>+		netdev_dbg(dev, "Dropping TLS TX HW offload feature since no CSUM feature.\n");</div><div class='add'>+		features &amp;= ~NETIF_F_HW_TLS_TX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((features &amp; NETIF_F_HW_TLS_RX) &amp;&amp; !(features &amp; NETIF_F_RXCSUM)) {</div><div class='add'>+		netdev_dbg(dev, "Dropping TLS RX HW offload feature since no RXCSUM feature.\n");</div><div class='add'>+		features &amp;= ~NETIF_F_HW_TLS_RX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((features &amp; NETIF_F_GSO_UDP_L4) &amp;&amp; !netdev_has_ip_or_hw_csum(features)) {</div><div class='add'>+		netdev_dbg(dev, "Dropping USO feature since no CSUM feature.\n");</div><div class='add'>+		features &amp;= ~NETIF_F_GSO_UDP_L4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8124,6 +10961,7 @@ int __netdev_update_features(struct net_device *dev)</div><div class='ctx'> 	int err = -1;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='ctx'> </div><div class='ctx'> 	features = netdev_get_wanted_features(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -8133,7 +10971,7 @@ int __netdev_update_features(struct net_device *dev)</div><div class='ctx'> 	/* driver might be less strict about feature dependencies */</div><div class='ctx'> 	features = netdev_fix_features(dev, features);</div><div class='ctx'> </div><div class='del'>-	/* some features can't be enabled if they're off an an upper device */</div><div class='add'>+	/* some features can't be enabled if they're off on an upper device */</div><div class='ctx'> 	netdev_for_each_upper_dev_rcu(dev, upper, iter)</div><div class='ctx'> 		features = netdev_sync_upper_features(dev, upper, features);</div><div class='ctx'> </div><div class='hunk'>@@ -8176,12 +11014,14 @@ sync_lower:</div><div class='ctx'> 			 * *before* calling udp_tunnel_get_rx_info,</div><div class='ctx'> 			 * but *after* calling udp_tunnel_drop_rx_info.</div><div class='ctx'> 			 */</div><div class='add'>+			udp_tunnel_nic_lock(dev);</div><div class='ctx'> 			if (features &amp; NETIF_F_RX_UDP_TUNNEL_PORT) {</div><div class='ctx'> 				dev-&gt;features = features;</div><div class='ctx'> 				udp_tunnel_get_rx_info(dev);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				udp_tunnel_drop_rx_info(dev);</div><div class='ctx'> 			}</div><div class='add'>+			udp_tunnel_nic_unlock(dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (diff &amp; NETIF_F_HW_VLAN_CTAG_FILTER) {</div><div class='hunk'>@@ -8257,6 +11097,11 @@ void netif_stacked_transfer_operstate(const struct net_device *rootdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		netif_dormant_off(dev);</div><div class='ctx'> </div><div class='add'>+	if (rootdev-&gt;operstate == IF_OPER_TESTING)</div><div class='add'>+		netif_testing_on(dev);</div><div class='add'>+	else</div><div class='add'>+		netif_testing_off(dev);</div><div class='add'>+</div><div class='ctx'> 	if (netif_carrier_ok(rootdev))</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -8273,7 +11118,7 @@ static int netif_alloc_rx_queues(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(count &lt; 1);</div><div class='ctx'> </div><div class='del'>-	rx = kvzalloc(sz, GFP_KERNEL | __GFP_RETRY_MAYFAIL);</div><div class='add'>+	rx = kvzalloc(sz, GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL);</div><div class='ctx'> 	if (!rx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -8283,7 +11128,7 @@ static int netif_alloc_rx_queues(struct net_device *dev)</div><div class='ctx'> 		rx[i].dev = dev;</div><div class='ctx'> </div><div class='ctx'> 		/* XDP RX-queue setup */</div><div class='del'>-		err = xdp_rxq_info_reg(&amp;rx[i].xdp_rxq, dev, i);</div><div class='add'>+		err = xdp_rxq_info_reg(&amp;rx[i].xdp_rxq, dev, i, 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_rxq_info;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8340,7 +11185,7 @@ static int netif_alloc_netdev_queues(struct net_device *dev)</div><div class='ctx'> 	if (count &lt; 1 || count &gt; 0xffff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tx = kvzalloc(sz, GFP_KERNEL | __GFP_RETRY_MAYFAIL);</div><div class='add'>+	tx = kvzalloc(sz, GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL);</div><div class='ctx'> 	if (!tx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -8364,23 +11209,74 @@ void netif_tx_stop_all_queues(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netif_tx_stop_all_queues);</div><div class='ctx'> </div><div class='add'>+static int netdev_do_alloc_pcpu_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	void __percpu *v;</div><div class='add'>+</div><div class='add'>+	/* Drivers implementing ndo_get_peer_dev must support tstat</div><div class='add'>+	 * accounting, so that skb_do_redirect() can bump the dev's</div><div class='add'>+	 * RX stats upon network namespace switch.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;netdev_ops-&gt;ndo_get_peer_dev &amp;&amp;</div><div class='add'>+	    dev-&gt;pcpu_stat_type != NETDEV_PCPU_STAT_TSTATS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;pcpu_stat_type) {</div><div class='add'>+	case NETDEV_PCPU_STAT_NONE:</div><div class='add'>+		return 0;</div><div class='add'>+	case NETDEV_PCPU_STAT_LSTATS:</div><div class='add'>+		v = dev-&gt;lstats = netdev_alloc_pcpu_stats(struct pcpu_lstats);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PCPU_STAT_TSTATS:</div><div class='add'>+		v = dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PCPU_STAT_DSTATS:</div><div class='add'>+		v = dev-&gt;dstats = netdev_alloc_pcpu_stats(struct pcpu_dstats);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return v ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_do_free_pcpu_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	switch (dev-&gt;pcpu_stat_type) {</div><div class='add'>+	case NETDEV_PCPU_STAT_NONE:</div><div class='add'>+		return;</div><div class='add'>+	case NETDEV_PCPU_STAT_LSTATS:</div><div class='add'>+		free_percpu(dev-&gt;lstats);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PCPU_STAT_TSTATS:</div><div class='add'>+		free_percpu(dev-&gt;tstats);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PCPU_STAT_DSTATS:</div><div class='add'>+		free_percpu(dev-&gt;dstats);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_free_phy_link_topology(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct phy_link_topology *topo = dev-&gt;link_topo;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_PHYLIB) &amp;&amp; topo) {</div><div class='add'>+		xa_destroy(&amp;topo-&gt;phys);</div><div class='add'>+		kfree(topo);</div><div class='add'>+		dev-&gt;link_topo = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- *	register_netdevice	- register a network device</div><div class='del'>- *	@dev: device to register</div><div class='add'>+ * register_netdevice() - register a network device</div><div class='add'>+ * @dev: device to register</div><div class='ctx'>  *</div><div class='del'>- *	Take a completed network device structure and add it to the kernel</div><div class='del'>- *	interfaces. A %NETDEV_REGISTER message is sent to the netdev notifier</div><div class='del'>- *	chain. 0 is returned on success. A negative errno code is returned</div><div class='del'>- *	on a failure to set up the device, or if the name is a duplicate.</div><div class='del'>- *</div><div class='del'>- *	Callers must hold the rtnl semaphore. You may want</div><div class='del'>- *	register_netdev() instead of this.</div><div class='del'>- *</div><div class='del'>- *	BUGS:</div><div class='del'>- *	The locking appears insufficient to guarantee two parallel registers</div><div class='del'>- *	will not get the same name.</div><div class='add'>+ * Take a prepared network device structure and make it externally accessible.</div><div class='add'>+ * A %NETDEV_REGISTER message is sent to the netdev notifier chain.</div><div class='add'>+ * Callers must hold the rtnl lock - you may want register_netdev()</div><div class='add'>+ * instead of this.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int register_netdevice(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -8397,6 +11293,14 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 	BUG_ON(dev-&gt;reg_state != NETREG_UNINITIALIZED);</div><div class='ctx'> 	BUG_ON(!net);</div><div class='ctx'> </div><div class='add'>+	ret = ethtool_check_ops(dev-&gt;ethtool_ops);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* rss ctx ID 0 is reserved for the default context, start from 1 */</div><div class='add'>+	xa_init_flags(&amp;dev-&gt;ethtool-&gt;rss_ctx, XA_FLAGS_ALLOC1);</div><div class='add'>+	mutex_init(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;addr_list_lock);</div><div class='ctx'> 	netdev_set_addr_lockdep_class(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -8404,13 +11308,18 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	dev-&gt;name_node = netdev_name_node_head_alloc(dev);</div><div class='add'>+	if (!dev-&gt;name_node)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Init, if this function is available */</div><div class='ctx'> 	if (dev-&gt;netdev_ops-&gt;ndo_init) {</div><div class='ctx'> 		ret = dev-&gt;netdev_ops-&gt;ndo_init(dev);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			if (ret &gt; 0)</div><div class='ctx'> 				ret = -EIO;</div><div class='del'>-			goto out;</div><div class='add'>+			goto err_free_name;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8423,19 +11332,22 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 		goto err_uninit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = -EBUSY;</div><div class='del'>-	if (!dev-&gt;ifindex)</div><div class='del'>-		dev-&gt;ifindex = dev_new_index(net);</div><div class='del'>-	else if (__dev_get_by_index(net, dev-&gt;ifindex))</div><div class='add'>+	ret = netdev_do_alloc_pcpu_stats(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto err_uninit;</div><div class='ctx'> </div><div class='add'>+	ret = dev_index_reserve(net, dev-&gt;ifindex);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_pcpu;</div><div class='add'>+	dev-&gt;ifindex = ret;</div><div class='add'>+</div><div class='ctx'> 	/* Transfer changeable features to wanted_features and enable</div><div class='ctx'> 	 * software offloads (GSO and GRO).</div><div class='ctx'> 	 */</div><div class='del'>-	dev-&gt;hw_features |= NETIF_F_SOFT_FEATURES;</div><div class='add'>+	dev-&gt;hw_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_SOFT_FEATURES_OFF);</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_SOFT_FEATURES;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_add) {</div><div class='add'>+	if (dev-&gt;udp_tunnel_nic_info) {</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='ctx'> 		dev-&gt;hw_features |= NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8474,14 +11386,20 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 	ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);</div><div class='ctx'> 	ret = notifier_to_errno(ret);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_uninit;</div><div class='add'>+		goto err_ifindex_release;</div><div class='ctx'> </div><div class='ctx'> 	ret = netdev_register_kobject(dev);</div><div class='add'>+</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	WRITE_ONCE(dev-&gt;reg_state, ret ? NETREG_UNREGISTERED : NETREG_REGISTERED);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_uninit;</div><div class='del'>-	dev-&gt;reg_state = NETREG_REGISTERED;</div><div class='add'>+		goto err_uninit_notify;</div><div class='ctx'> </div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	__netdev_update_features(dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Default initial state at registry is that the</div><div class='hunk'>@@ -8493,8 +11411,10 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 	linkwatch_init_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev_init_scheduler(dev);</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+</div><div class='add'>+	netdev_hold(dev, &amp;dev-&gt;dev_registered_tracker, GFP_KERNEL);</div><div class='ctx'> 	list_netdevice(dev);</div><div class='add'>+</div><div class='ctx'> 	add_device_randomness(dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	/* If the device has permanent device address, driver should</div><div class='hunk'>@@ -8505,59 +11425,54 @@ int register_netdevice(struct net_device *dev)</div><div class='ctx'> 		memcpy(dev-&gt;perm_addr, dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify protocols, that a new device appeared. */</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> 	ret = notifier_to_errno(ret);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		rollback_registered(dev);</div><div class='del'>-		dev-&gt;reg_state = NETREG_UNREGISTERED;</div><div class='add'>+		/* Expect explicit free_netdev() on failure */</div><div class='add'>+		dev-&gt;needs_free_netdev = false;</div><div class='add'>+		unregister_netdevice_queue(dev, NULL);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Prevent userspace races by waiting until the network</div><div class='ctx'> 	 *	device is fully setup before sending notifications.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!dev-&gt;rtnl_link_ops ||</div><div class='del'>-	    dev-&gt;rtnl_link_state == RTNL_LINK_INITIALIZED)</div><div class='del'>-		rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL);</div><div class='add'>+	if (!(dev-&gt;rtnl_link_ops &amp;&amp; dev-&gt;rtnl_link_initializing))</div><div class='add'>+		rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+err_uninit_notify:</div><div class='add'>+	call_netdevice_notifiers(NETDEV_PRE_UNINIT, dev);</div><div class='add'>+err_ifindex_release:</div><div class='add'>+	dev_index_release(net, dev-&gt;ifindex);</div><div class='add'>+err_free_pcpu:</div><div class='add'>+	netdev_do_free_pcpu_stats(dev);</div><div class='ctx'> err_uninit:</div><div class='ctx'> 	if (dev-&gt;netdev_ops-&gt;ndo_uninit)</div><div class='ctx'> 		dev-&gt;netdev_ops-&gt;ndo_uninit(dev);</div><div class='ctx'> 	if (dev-&gt;priv_destructor)</div><div class='ctx'> 		dev-&gt;priv_destructor(dev);</div><div class='add'>+err_free_name:</div><div class='add'>+	netdev_name_node_free(dev-&gt;name_node);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(register_netdevice);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	init_dummy_netdev	- init a dummy network device for NAPI</div><div class='del'>- *	@dev: device to init</div><div class='del'>- *</div><div class='del'>- *	This takes a network device structure and initialize the minimum</div><div class='del'>- *	amount of fields so it can be used to schedule NAPI polls without</div><div class='del'>- *	registering a full blown interface. This is to be used by drivers</div><div class='del'>- *	that need to tie several hardware interfaces to a single NAPI</div><div class='del'>- *	poll scheduler due to HW limitations.</div><div class='add'>+/* Initialize the core of a dummy net device.</div><div class='add'>+ * The setup steps dummy netdevs need which normal netdevs get by going</div><div class='add'>+ * through register_netdevice().</div><div class='ctx'>  */</div><div class='del'>-int init_dummy_netdev(struct net_device *dev)</div><div class='add'>+static void init_dummy_netdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* Clear everything. Note we don't initialize spinlocks</div><div class='del'>-	 * are they aren't supposed to be taken by any of the</div><div class='del'>-	 * NAPI code and this dummy netdev is supposed to be</div><div class='del'>-	 * only ever used for NAPI polls</div><div class='del'>-	 */</div><div class='del'>-	memset(dev, 0, sizeof(struct net_device));</div><div class='del'>-</div><div class='ctx'> 	/* make sure we BUG if trying to hit standard</div><div class='ctx'> 	 * register/unregister code path</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev-&gt;reg_state = NETREG_DUMMY;</div><div class='ctx'> </div><div class='del'>-	/* NAPI wants this */</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;napi_list);</div><div class='del'>-</div><div class='ctx'> 	/* a dummy interface is started by default */</div><div class='ctx'> 	set_bit(__LINK_STATE_PRESENT, &amp;dev-&gt;state);</div><div class='ctx'> 	set_bit(__LINK_STATE_START, &amp;dev-&gt;state);</div><div class='hunk'>@@ -8566,11 +11481,7 @@ int init_dummy_netdev(struct net_device *dev)</div><div class='ctx'> 	 * because users of this 'device' dont need to change</div><div class='ctx'> 	 * its refcount.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(init_dummy_netdev);</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	register_netdev	- register a network device</div><div class='hunk'>@@ -8587,29 +11498,41 @@ EXPORT_SYMBOL_GPL(init_dummy_netdev);</div><div class='ctx'>  */</div><div class='ctx'> int register_netdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rtnl_lock_killable())</div><div class='add'>+	if (rtnl_net_lock_killable(net))</div><div class='ctx'> 		return -EINTR;</div><div class='add'>+</div><div class='ctx'> 	err = register_netdevice(dev);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(register_netdev);</div><div class='ctx'> </div><div class='ctx'> int netdev_refcnt_read(const struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_PCPU_DEV_REFCNT</div><div class='ctx'> 	int i, refcnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i)</div><div class='ctx'> 		refcnt += *per_cpu_ptr(dev-&gt;pcpu_refcnt, i);</div><div class='ctx'> 	return refcnt;</div><div class='add'>+#else</div><div class='add'>+	return refcount_read(&amp;dev-&gt;dev_refcnt);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_refcnt_read);</div><div class='ctx'> </div><div class='add'>+int netdev_unregister_timeout_secs __read_mostly = 10;</div><div class='add'>+</div><div class='add'>+#define WAIT_REFS_MIN_MSECS 1</div><div class='add'>+#define WAIT_REFS_MAX_MSECS 250</div><div class='ctx'> /**</div><div class='del'>- * netdev_wait_allrefs - wait until all references are gone.</div><div class='del'>- * @dev: target net_device</div><div class='add'>+ * netdev_wait_allrefs_any - wait until all references are gone.</div><div class='add'>+ * @list: list of net_devices to wait on</div><div class='ctx'>  *</div><div class='ctx'>  * This is called when unregistering network devices.</div><div class='ctx'>  *</div><div class='hunk'>@@ -8619,50 +11542,69 @@ EXPORT_SYMBOL(netdev_refcnt_read);</div><div class='ctx'>  * We can get stuck here if buggy protocols don't correctly</div><div class='ctx'>  * call dev_put.</div><div class='ctx'>  */</div><div class='del'>-static void netdev_wait_allrefs(struct net_device *dev)</div><div class='add'>+static struct net_device *netdev_wait_allrefs_any(struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rebroadcast_time, warning_time;</div><div class='del'>-	int refcnt;</div><div class='del'>-</div><div class='del'>-	linkwatch_forget_dev(dev);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int wait = 0;</div><div class='ctx'> </div><div class='ctx'> 	rebroadcast_time = warning_time = jiffies;</div><div class='del'>-	refcnt = netdev_refcnt_read(dev);</div><div class='ctx'> </div><div class='del'>-	while (refcnt != 0) {</div><div class='add'>+	list_for_each_entry(dev, list, todo_list)</div><div class='add'>+		if (netdev_refcnt_read(dev) == 1)</div><div class='add'>+			return dev;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='ctx'> 		if (time_after(jiffies, rebroadcast_time + 1 * HZ)) {</div><div class='ctx'> 			rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 			/* Rebroadcast unregister notification */</div><div class='del'>-			call_netdevice_notifiers(NETDEV_UNREGISTER, dev);</div><div class='add'>+			list_for_each_entry(dev, list, todo_list)</div><div class='add'>+				call_netdevice_notifiers(NETDEV_UNREGISTER, dev);</div><div class='ctx'> </div><div class='ctx'> 			__rtnl_unlock();</div><div class='ctx'> 			rcu_barrier();</div><div class='ctx'> 			rtnl_lock();</div><div class='ctx'> </div><div class='del'>-			if (test_bit(__LINK_STATE_LINKWATCH_PENDING,</div><div class='del'>-				     &amp;dev-&gt;state)) {</div><div class='del'>-				/* We must not have linkwatch events</div><div class='del'>-				 * pending on unregister. If this</div><div class='del'>-				 * happens, we simply run the queue</div><div class='del'>-				 * unscheduled, resulting in a noop</div><div class='del'>-				 * for this device.</div><div class='del'>-				 */</div><div class='del'>-				linkwatch_run_queue();</div><div class='del'>-			}</div><div class='add'>+			list_for_each_entry(dev, list, todo_list)</div><div class='add'>+				if (test_bit(__LINK_STATE_LINKWATCH_PENDING,</div><div class='add'>+					     &amp;dev-&gt;state)) {</div><div class='add'>+					/* We must not have linkwatch events</div><div class='add'>+					 * pending on unregister. If this</div><div class='add'>+					 * happens, we simply run the queue</div><div class='add'>+					 * unscheduled, resulting in a noop</div><div class='add'>+					 * for this device.</div><div class='add'>+					 */</div><div class='add'>+					linkwatch_run_queue();</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='ctx'> 			__rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 			rebroadcast_time = jiffies;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msleep(250);</div><div class='add'>+		rcu_barrier();</div><div class='ctx'> </div><div class='del'>-		refcnt = netdev_refcnt_read(dev);</div><div class='add'>+		if (!wait) {</div><div class='add'>+			wait = WAIT_REFS_MIN_MSECS;</div><div class='add'>+		} else {</div><div class='add'>+			msleep(wait);</div><div class='add'>+			wait = min(wait &lt;&lt; 1, WAIT_REFS_MAX_MSECS);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(dev, list, todo_list)</div><div class='add'>+			if (netdev_refcnt_read(dev) == 1)</div><div class='add'>+				return dev;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, warning_time +</div><div class='add'>+			       READ_ONCE(netdev_unregister_timeout_secs) * HZ)) {</div><div class='add'>+			list_for_each_entry(dev, list, todo_list) {</div><div class='add'>+				pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",</div><div class='add'>+					 dev-&gt;name, netdev_refcnt_read(dev));</div><div class='add'>+				ref_tracker_dir_print(&amp;dev-&gt;refcnt_tracker, 10);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, warning_time + 10 * HZ)) {</div><div class='del'>-			pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",</div><div class='del'>-				 dev-&gt;name, refcnt);</div><div class='ctx'> 			warning_time = jiffies;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8694,57 +11636,117 @@ static void netdev_wait_allrefs(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> void netdev_run_todo(void)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev, *tmp;</div><div class='ctx'> 	struct list_head list;</div><div class='add'>+	int cnt;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	struct list_head unlink_list;</div><div class='add'>+</div><div class='add'>+	list_replace_init(&amp;net_unlink_list, &amp;unlink_list);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;unlink_list)) {</div><div class='add'>+		dev = list_first_entry(&amp;unlink_list, struct net_device,</div><div class='add'>+				       unlink_list);</div><div class='add'>+		list_del_init(&amp;dev-&gt;unlink_list);</div><div class='add'>+		dev-&gt;nested_level = dev-&gt;lower_level - 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Snapshot list, allow later requests */</div><div class='ctx'> 	list_replace_init(&amp;net_todo_list, &amp;list);</div><div class='ctx'> </div><div class='ctx'> 	__rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* Wait for rcu callbacks to finish before next phase */</div><div class='ctx'> 	if (!list_empty(&amp;list))</div><div class='ctx'> 		rcu_barrier();</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;list)) {</div><div class='del'>-		struct net_device *dev</div><div class='del'>-			= list_first_entry(&amp;list, struct net_device, todo_list);</div><div class='del'>-		list_del(&amp;dev-&gt;todo_list);</div><div class='del'>-</div><div class='add'>+	list_for_each_entry_safe(dev, tmp, &amp;list, todo_list) {</div><div class='ctx'> 		if (unlikely(dev-&gt;reg_state != NETREG_UNREGISTERING)) {</div><div class='del'>-			pr_err("network todo '%s' but state %d\n",</div><div class='del'>-			       dev-&gt;name, dev-&gt;reg_state);</div><div class='del'>-			dump_stack();</div><div class='add'>+			netdev_WARN(dev, "run_todo but not unregistering\n");</div><div class='add'>+			list_del(&amp;dev-&gt;todo_list);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;reg_state = NETREG_UNREGISTERED;</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+		WRITE_ONCE(dev-&gt;reg_state, NETREG_UNREGISTERED);</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+		linkwatch_sync_dev(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		netdev_wait_allrefs(dev);</div><div class='add'>+	cnt = 0;</div><div class='add'>+	while (!list_empty(&amp;list)) {</div><div class='add'>+		dev = netdev_wait_allrefs_any(&amp;list);</div><div class='add'>+		list_del(&amp;dev-&gt;todo_list);</div><div class='ctx'> </div><div class='ctx'> 		/* paranoia */</div><div class='del'>-		BUG_ON(netdev_refcnt_read(dev));</div><div class='add'>+		BUG_ON(netdev_refcnt_read(dev) != 1);</div><div class='ctx'> 		BUG_ON(!list_empty(&amp;dev-&gt;ptype_all));</div><div class='ctx'> 		BUG_ON(!list_empty(&amp;dev-&gt;ptype_specific));</div><div class='ctx'> 		WARN_ON(rcu_access_pointer(dev-&gt;ip_ptr));</div><div class='ctx'> 		WARN_ON(rcu_access_pointer(dev-&gt;ip6_ptr));</div><div class='del'>-#if IS_ENABLED(CONFIG_DECNET)</div><div class='del'>-		WARN_ON(dev-&gt;dn_ptr);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+		netdev_do_free_pcpu_stats(dev);</div><div class='ctx'> 		if (dev-&gt;priv_destructor)</div><div class='ctx'> 			dev-&gt;priv_destructor(dev);</div><div class='ctx'> 		if (dev-&gt;needs_free_netdev)</div><div class='ctx'> 			free_netdev(dev);</div><div class='ctx'> </div><div class='del'>-		/* Report a network device has been unregistered */</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		dev_net(dev)-&gt;dev_unreg_count--;</div><div class='del'>-		__rtnl_unlock();</div><div class='del'>-		wake_up(&amp;netdev_unregistering_wq);</div><div class='add'>+		cnt++;</div><div class='ctx'> </div><div class='ctx'> 		/* Free network device */</div><div class='ctx'> 		kobject_put(&amp;dev-&gt;dev.kobj);</div><div class='ctx'> 	}</div><div class='add'>+	if (cnt &amp;&amp; atomic_sub_and_test(cnt, &amp;dev_unreg_count))</div><div class='add'>+		wake_up(&amp;netdev_unregistering_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Collate per-cpu network dstats statistics</div><div class='add'>+ *</div><div class='add'>+ * Read per-cpu network statistics from dev-&gt;dstats and populate the related</div><div class='add'>+ * fields in @s.</div><div class='add'>+ */</div><div class='add'>+static void dev_fetch_dstats(struct rtnl_link_stats64 *s,</div><div class='add'>+			     const struct pcpu_dstats __percpu *dstats)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		u64 rx_packets, rx_bytes, rx_drops;</div><div class='add'>+		u64 tx_packets, tx_bytes, tx_drops;</div><div class='add'>+		const struct pcpu_dstats *stats;</div><div class='add'>+		unsigned int start;</div><div class='add'>+</div><div class='add'>+		stats = per_cpu_ptr(dstats, cpu);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;stats-&gt;syncp);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;stats-&gt;rx_packets);</div><div class='add'>+			rx_bytes   = u64_stats_read(&amp;stats-&gt;rx_bytes);</div><div class='add'>+			rx_drops   = u64_stats_read(&amp;stats-&gt;rx_drops);</div><div class='add'>+			tx_packets = u64_stats_read(&amp;stats-&gt;tx_packets);</div><div class='add'>+			tx_bytes   = u64_stats_read(&amp;stats-&gt;tx_bytes);</div><div class='add'>+			tx_drops   = u64_stats_read(&amp;stats-&gt;tx_drops);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		s-&gt;rx_packets += rx_packets;</div><div class='add'>+		s-&gt;rx_bytes   += rx_bytes;</div><div class='add'>+		s-&gt;rx_dropped += rx_drops;</div><div class='add'>+		s-&gt;tx_packets += tx_packets;</div><div class='add'>+		s-&gt;tx_bytes   += tx_bytes;</div><div class='add'>+		s-&gt;tx_dropped += tx_drops;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ndo_get_stats64 implementation for dtstats-based accounting.</div><div class='add'>+ *</div><div class='add'>+ * Populate @s from dev-&gt;stats and dev-&gt;dstats. This is used internally by the</div><div class='add'>+ * core for NETDEV_PCPU_STAT_DSTAT-type stats collection.</div><div class='add'>+ */</div><div class='add'>+static void dev_get_dstats64(const struct net_device *dev,</div><div class='add'>+			     struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	netdev_stats_to_stats64(s, &amp;dev-&gt;stats);</div><div class='add'>+	dev_fetch_dstats(s, dev-&gt;dstats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Convert net_device_stats to rtnl_link_stats64. rtnl_link_stats64 has</div><div class='hunk'>@@ -8755,27 +11757,51 @@ void netdev_run_todo(void)</div><div class='ctx'> void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,</div><div class='ctx'> 			     const struct net_device_stats *netdev_stats)</div><div class='ctx'> {</div><div class='del'>-#if BITS_PER_LONG == 64</div><div class='del'>-	BUILD_BUG_ON(sizeof(*stats64) &lt; sizeof(*netdev_stats));</div><div class='del'>-	memcpy(stats64, netdev_stats, sizeof(*netdev_stats));</div><div class='del'>-	/* zero out counters that only exist in rtnl_link_stats64 */</div><div class='del'>-	memset((char *)stats64 + sizeof(*netdev_stats), 0,</div><div class='del'>-	       sizeof(*stats64) - sizeof(*netdev_stats));</div><div class='del'>-#else</div><div class='del'>-	size_t i, n = sizeof(*netdev_stats) / sizeof(unsigned long);</div><div class='del'>-	const unsigned long *src = (const unsigned long *)netdev_stats;</div><div class='add'>+	size_t i, n = sizeof(*netdev_stats) / sizeof(atomic_long_t);</div><div class='add'>+	const atomic_long_t *src = (atomic_long_t *)netdev_stats;</div><div class='ctx'> 	u64 *dst = (u64 *)stats64;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(n &gt; sizeof(*stats64) / sizeof(u64));</div><div class='ctx'> 	for (i = 0; i &lt; n; i++)</div><div class='del'>-		dst[i] = src[i];</div><div class='add'>+		dst[i] = (unsigned long)atomic_long_read(&amp;src[i]);</div><div class='ctx'> 	/* zero out counters that only exist in rtnl_link_stats64 */</div><div class='ctx'> 	memset((char *)stats64 + n * sizeof(u64), 0,</div><div class='ctx'> 	       sizeof(*stats64) - n * sizeof(u64));</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_stats_to_stats64);</div><div class='ctx'> </div><div class='add'>+static __cold struct net_device_core_stats __percpu *netdev_core_stats_alloc(</div><div class='add'>+		struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device_core_stats __percpu *p;</div><div class='add'>+</div><div class='add'>+	p = alloc_percpu_gfp(struct net_device_core_stats,</div><div class='add'>+			     GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+</div><div class='add'>+	if (p &amp;&amp; cmpxchg(&amp;dev-&gt;core_stats, NULL, p))</div><div class='add'>+		free_percpu(p);</div><div class='add'>+</div><div class='add'>+	/* This READ_ONCE() pairs with the cmpxchg() above */</div><div class='add'>+	return READ_ONCE(dev-&gt;core_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline void netdev_core_stats_inc(struct net_device *dev, u32 offset)</div><div class='add'>+{</div><div class='add'>+	/* This READ_ONCE() pairs with the write in netdev_core_stats_alloc() */</div><div class='add'>+	struct net_device_core_stats __percpu *p = READ_ONCE(dev-&gt;core_stats);</div><div class='add'>+	unsigned long __percpu *field;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p)) {</div><div class='add'>+		p = netdev_core_stats_alloc(dev);</div><div class='add'>+		if (!p)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	field = (unsigned long __percpu *)((void __percpu *)p + offset);</div><div class='add'>+	this_cpu_inc(*field);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(netdev_core_stats_inc);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	dev_get_stats	- get network device statistics</div><div class='ctx'>  *	@dev: device to get statistics from</div><div class='hunk'>@@ -8790,22 +11816,102 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,</div><div class='ctx'> 					struct rtnl_link_stats64 *storage)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	const struct net_device_core_stats __percpu *p;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IPv{4,6} and udp tunnels share common stat helpers and use</div><div class='add'>+	 * different stat type (NETDEV_PCPU_STAT_TSTATS vs</div><div class='add'>+	 * NETDEV_PCPU_STAT_DSTATS). Ensure the accounting is consistent.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct pcpu_sw_netstats, rx_bytes) !=</div><div class='add'>+		     offsetof(struct pcpu_dstats, rx_bytes));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct pcpu_sw_netstats, rx_packets) !=</div><div class='add'>+		     offsetof(struct pcpu_dstats, rx_packets));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct pcpu_sw_netstats, tx_bytes) !=</div><div class='add'>+		     offsetof(struct pcpu_dstats, tx_bytes));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct pcpu_sw_netstats, tx_packets) !=</div><div class='add'>+		     offsetof(struct pcpu_dstats, tx_packets));</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;ndo_get_stats64) {</div><div class='ctx'> 		memset(storage, 0, sizeof(*storage));</div><div class='ctx'> 		ops-&gt;ndo_get_stats64(dev, storage);</div><div class='ctx'> 	} else if (ops-&gt;ndo_get_stats) {</div><div class='ctx'> 		netdev_stats_to_stats64(storage, ops-&gt;ndo_get_stats(dev));</div><div class='add'>+	} else if (dev-&gt;pcpu_stat_type == NETDEV_PCPU_STAT_TSTATS) {</div><div class='add'>+		dev_get_tstats64(dev, storage);</div><div class='add'>+	} else if (dev-&gt;pcpu_stat_type == NETDEV_PCPU_STAT_DSTATS) {</div><div class='add'>+		dev_get_dstats64(dev, storage);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_stats_to_stats64(storage, &amp;dev-&gt;stats);</div><div class='ctx'> 	}</div><div class='del'>-	storage-&gt;rx_dropped += (unsigned long)atomic_long_read(&amp;dev-&gt;rx_dropped);</div><div class='del'>-	storage-&gt;tx_dropped += (unsigned long)atomic_long_read(&amp;dev-&gt;tx_dropped);</div><div class='del'>-	storage-&gt;rx_nohandler += (unsigned long)atomic_long_read(&amp;dev-&gt;rx_nohandler);</div><div class='add'>+</div><div class='add'>+	/* This READ_ONCE() pairs with the write in netdev_core_stats_alloc() */</div><div class='add'>+	p = READ_ONCE(dev-&gt;core_stats);</div><div class='add'>+	if (p) {</div><div class='add'>+		const struct net_device_core_stats *core_stats;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			core_stats = per_cpu_ptr(p, i);</div><div class='add'>+			storage-&gt;rx_dropped += READ_ONCE(core_stats-&gt;rx_dropped);</div><div class='add'>+			storage-&gt;tx_dropped += READ_ONCE(core_stats-&gt;tx_dropped);</div><div class='add'>+			storage-&gt;rx_nohandler += READ_ONCE(core_stats-&gt;rx_nohandler);</div><div class='add'>+			storage-&gt;rx_otherhost_dropped += READ_ONCE(core_stats-&gt;rx_otherhost_dropped);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return storage;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dev_get_stats);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	dev_fetch_sw_netstats - get per-cpu network device statistics</div><div class='add'>+ *	@s: place to store stats</div><div class='add'>+ *	@netstats: per-cpu network stats to read from</div><div class='add'>+ *</div><div class='add'>+ *	Read per-cpu network statistics and populate the related fields in @s.</div><div class='add'>+ */</div><div class='add'>+void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,</div><div class='add'>+			   const struct pcpu_sw_netstats __percpu *netstats)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		u64 rx_packets, rx_bytes, tx_packets, tx_bytes;</div><div class='add'>+		const struct pcpu_sw_netstats *stats;</div><div class='add'>+		unsigned int start;</div><div class='add'>+</div><div class='add'>+		stats = per_cpu_ptr(netstats, cpu);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;stats-&gt;syncp);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;stats-&gt;rx_packets);</div><div class='add'>+			rx_bytes   = u64_stats_read(&amp;stats-&gt;rx_bytes);</div><div class='add'>+			tx_packets = u64_stats_read(&amp;stats-&gt;tx_packets);</div><div class='add'>+			tx_bytes   = u64_stats_read(&amp;stats-&gt;tx_bytes);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		s-&gt;rx_packets += rx_packets;</div><div class='add'>+		s-&gt;rx_bytes   += rx_bytes;</div><div class='add'>+		s-&gt;tx_packets += tx_packets;</div><div class='add'>+		s-&gt;tx_bytes   += tx_bytes;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_fetch_sw_netstats);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	dev_get_tstats64 - ndo_get_stats64 implementation</div><div class='add'>+ *	@dev: device to get statistics from</div><div class='add'>+ *	@s: place to store stats</div><div class='add'>+ *</div><div class='add'>+ *	Populate @s from dev-&gt;stats and dev-&gt;tstats. Can be used as</div><div class='add'>+ *	ndo_get_stats64() callback.</div><div class='add'>+ */</div><div class='add'>+void dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	netdev_stats_to_stats64(s, &amp;dev-&gt;stats);</div><div class='add'>+	dev_fetch_sw_netstats(s, dev-&gt;tstats);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_get_tstats64);</div><div class='add'>+</div><div class='ctx'> struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *queue = dev_ingress_queue(dev);</div><div class='hunk'>@@ -8818,7 +11924,7 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	netdev_init_one_queue(dev, queue, NULL);</div><div class='ctx'> 	RCU_INIT_POINTER(queue-&gt;qdisc, &amp;noop_qdisc);</div><div class='del'>-	queue-&gt;qdisc_sleeping = &amp;noop_qdisc;</div><div class='add'>+	RCU_INIT_POINTER(queue-&gt;qdisc_sleeping, &amp;noop_qdisc);</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;ingress_queue, queue);</div><div class='ctx'> #endif</div><div class='ctx'> 	return queue;</div><div class='hunk'>@@ -8834,12 +11940,23 @@ void netdev_set_default_ethtool_ops(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);</div><div class='ctx'> </div><div class='del'>-void netdev_freemem(struct net_device *dev)</div><div class='add'>+/**</div><div class='add'>+ * netdev_sw_irq_coalesce_default_on() - enable SW IRQ coalescing by default</div><div class='add'>+ * @dev: netdev to enable the IRQ coalescing on</div><div class='add'>+ *</div><div class='add'>+ * Sets a conservative default for SW IRQ coalescing. Users can use</div><div class='add'>+ * sysfs attributes to override the default values.</div><div class='add'>+ */</div><div class='add'>+void netdev_sw_irq_coalesce_default_on(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	char *addr = (char *)dev - dev-&gt;padded;</div><div class='add'>+	WARN_ON(dev-&gt;reg_state == NETREG_REGISTERED);</div><div class='ctx'> </div><div class='del'>-	kvfree(addr);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT)) {</div><div class='add'>+		netdev_set_gro_flush_timeout(dev, 20000);</div><div class='add'>+		netdev_set_defer_hard_irqs(dev, 1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(netdev_sw_irq_coalesce_default_on);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * alloc_netdev_mqs - allocate network device</div><div class='hunk'>@@ -8860,8 +11977,8 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> 		unsigned int txqs, unsigned int rxqs)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	unsigned int alloc_size;</div><div class='del'>-	struct net_device *p;</div><div class='add'>+	size_t napi_config_sz;</div><div class='add'>+	unsigned int maxqs;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(strlen(name) &gt;= sizeof(dev-&gt;name));</div><div class='ctx'> </div><div class='hunk'>@@ -8875,25 +11992,24 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	alloc_size = sizeof(struct net_device);</div><div class='del'>-	if (sizeof_priv) {</div><div class='del'>-		/* ensure 32-byte alignment of private area */</div><div class='del'>-		alloc_size = ALIGN(alloc_size, NETDEV_ALIGN);</div><div class='del'>-		alloc_size += sizeof_priv;</div><div class='del'>-	}</div><div class='del'>-	/* ensure 32-byte alignment of whole construct */</div><div class='del'>-	alloc_size += NETDEV_ALIGN - 1;</div><div class='add'>+	maxqs = max(txqs, rxqs);</div><div class='ctx'> </div><div class='del'>-	p = kvzalloc(alloc_size, GFP_KERNEL | __GFP_RETRY_MAYFAIL);</div><div class='del'>-	if (!p)</div><div class='add'>+	dev = kvzalloc(struct_size(dev, priv, sizeof_priv),</div><div class='add'>+		       GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	dev = PTR_ALIGN(p, NETDEV_ALIGN);</div><div class='del'>-	dev-&gt;padded = (char *)dev - (char *)p;</div><div class='add'>+	dev-&gt;priv_len = sizeof_priv;</div><div class='ctx'> </div><div class='add'>+	ref_tracker_dir_init(&amp;dev-&gt;refcnt_tracker, 128, "netdev");</div><div class='add'>+#ifdef CONFIG_PCPU_DEV_REFCNT</div><div class='ctx'> 	dev-&gt;pcpu_refcnt = alloc_percpu(int);</div><div class='ctx'> 	if (!dev-&gt;pcpu_refcnt)</div><div class='ctx'> 		goto free_dev;</div><div class='add'>+	__dev_hold(dev);</div><div class='add'>+#else</div><div class='add'>+	refcount_set(&amp;dev-&gt;dev_refcnt, 1);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (dev_addr_init(dev))</div><div class='ctx'> 		goto free_pcpu;</div><div class='hunk'>@@ -8903,8 +12019,20 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> </div><div class='ctx'> 	dev_net_set(dev, &amp;init_net);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;gso_max_size = GSO_MAX_SIZE;</div><div class='add'>+	dev-&gt;gso_max_size = GSO_LEGACY_MAX_SIZE;</div><div class='add'>+	dev-&gt;xdp_zc_max_segs = 1;</div><div class='ctx'> 	dev-&gt;gso_max_segs = GSO_MAX_SEGS;</div><div class='add'>+	dev-&gt;gro_max_size = GRO_LEGACY_MAX_SIZE;</div><div class='add'>+	dev-&gt;gso_ipv4_max_size = GSO_LEGACY_MAX_SIZE;</div><div class='add'>+	dev-&gt;gro_ipv4_max_size = GRO_LEGACY_MAX_SIZE;</div><div class='add'>+	dev-&gt;tso_max_size = TSO_LEGACY_MAX_SIZE;</div><div class='add'>+	dev-&gt;tso_max_segs = TSO_MAX_SEGS;</div><div class='add'>+	dev-&gt;upper_level = 1;</div><div class='add'>+	dev-&gt;lower_level = 1;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	dev-&gt;nested_level = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;unlink_list);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;napi_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;unreg_list);</div><div class='hunk'>@@ -8914,9 +12042,13 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;adj_list.lower);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;ptype_all);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;ptype_specific);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;net_notifier_list);</div><div class='ctx'> #ifdef CONFIG_NET_SCHED</div><div class='ctx'> 	hash_init(dev-&gt;qdisc_hash);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;priv_flags = IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM;</div><div class='ctx'> 	setup(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -8934,14 +12066,28 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> 	dev-&gt;real_num_rx_queues = rxqs;</div><div class='ctx'> 	if (netif_alloc_rx_queues(dev))</div><div class='ctx'> 		goto free_all;</div><div class='add'>+	dev-&gt;ethtool = kzalloc(sizeof(*dev-&gt;ethtool), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!dev-&gt;ethtool)</div><div class='add'>+		goto free_all;</div><div class='ctx'> </div><div class='del'>-	strcpy(dev-&gt;name, name);</div><div class='add'>+	dev-&gt;cfg = kzalloc(sizeof(*dev-&gt;cfg), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!dev-&gt;cfg)</div><div class='add'>+		goto free_all;</div><div class='add'>+	dev-&gt;cfg_pending = dev-&gt;cfg;</div><div class='add'>+</div><div class='add'>+	dev-&gt;num_napi_configs = maxqs;</div><div class='add'>+	napi_config_sz = array_size(maxqs, sizeof(*dev-&gt;napi_config));</div><div class='add'>+	dev-&gt;napi_config = kvzalloc(napi_config_sz, GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!dev-&gt;napi_config)</div><div class='add'>+		goto free_all;</div><div class='add'>+</div><div class='add'>+	strscpy(dev-&gt;name, name);</div><div class='ctx'> 	dev-&gt;name_assign_type = name_assign_type;</div><div class='ctx'> 	dev-&gt;group = INIT_NETDEV_GROUP;</div><div class='ctx'> 	if (!dev-&gt;ethtool_ops)</div><div class='ctx'> 		dev-&gt;ethtool_ops = &amp;default_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	nf_hook_ingress_init(dev);</div><div class='add'>+	nf_hook_netdev_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> </div><div class='hunk'>@@ -8950,13 +12096,31 @@ free_all:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'> free_pcpu:</div><div class='add'>+#ifdef CONFIG_PCPU_DEV_REFCNT</div><div class='ctx'> 	free_percpu(dev-&gt;pcpu_refcnt);</div><div class='ctx'> free_dev:</div><div class='del'>-	netdev_freemem(dev);</div><div class='add'>+#endif</div><div class='add'>+	kvfree(dev);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(alloc_netdev_mqs);</div><div class='ctx'> </div><div class='add'>+static void netdev_napi_exit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(&amp;dev-&gt;napi_list)) {</div><div class='add'>+		struct napi_struct *p, *n;</div><div class='add'>+</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+		list_for_each_entry_safe(p, n, &amp;dev-&gt;napi_list, dev_list)</div><div class='add'>+			__netif_napi_del_locked(p);</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+</div><div class='add'>+		synchronize_net();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvfree(dev-&gt;napi_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * free_netdev - free network device</div><div class='ctx'>  * @dev: device</div><div class='hunk'>@@ -8968,9 +12132,21 @@ EXPORT_SYMBOL(alloc_netdev_mqs);</div><div class='ctx'>  */</div><div class='ctx'> void free_netdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct napi_struct *p, *n;</div><div class='del'>-</div><div class='ctx'> 	might_sleep();</div><div class='add'>+</div><div class='add'>+	/* When called immediately after register_netdevice() failed the unwind</div><div class='add'>+	 * handling may still be dismantling the device. Handle that case by</div><div class='add'>+	 * deferring the free.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;reg_state == NETREG_UNREGISTERING) {</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+		dev-&gt;needs_free_netdev = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(dev-&gt;cfg != dev-&gt;cfg_pending);</div><div class='add'>+	kfree(dev-&gt;cfg);</div><div class='add'>+	kfree(dev-&gt;ethtool);</div><div class='ctx'> 	netif_free_tx_queues(dev);</div><div class='ctx'> 	netif_free_rx_queues(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -8979,20 +12155,33 @@ void free_netdev(struct net_device *dev)</div><div class='ctx'> 	/* Flush device addresses */</div><div class='ctx'> 	dev_addr_flush(dev);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(p, n, &amp;dev-&gt;napi_list, dev_list)</div><div class='del'>-		netif_napi_del(p);</div><div class='add'>+	netdev_napi_exit(dev);</div><div class='ctx'> </div><div class='add'>+	netif_del_cpu_rmap(dev);</div><div class='add'>+</div><div class='add'>+	ref_tracker_dir_exit(&amp;dev-&gt;refcnt_tracker);</div><div class='add'>+#ifdef CONFIG_PCPU_DEV_REFCNT</div><div class='ctx'> 	free_percpu(dev-&gt;pcpu_refcnt);</div><div class='ctx'> 	dev-&gt;pcpu_refcnt = NULL;</div><div class='add'>+#endif</div><div class='add'>+	free_percpu(dev-&gt;core_stats);</div><div class='add'>+	dev-&gt;core_stats = NULL;</div><div class='add'>+	free_percpu(dev-&gt;xdp_bulkq);</div><div class='add'>+	dev-&gt;xdp_bulkq = NULL;</div><div class='add'>+</div><div class='add'>+	netdev_free_phy_link_topology(dev);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*  Compatibility with error handling in drivers */</div><div class='del'>-	if (dev-&gt;reg_state == NETREG_UNINITIALIZED) {</div><div class='del'>-		netdev_freemem(dev);</div><div class='add'>+	if (dev-&gt;reg_state == NETREG_UNINITIALIZED ||</div><div class='add'>+	    dev-&gt;reg_state == NETREG_DUMMY) {</div><div class='add'>+		kvfree(dev);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dev-&gt;reg_state != NETREG_UNREGISTERED);</div><div class='del'>-	dev-&gt;reg_state = NETREG_RELEASED;</div><div class='add'>+	WRITE_ONCE(dev-&gt;reg_state, NETREG_RELEASED);</div><div class='ctx'> </div><div class='ctx'> 	/* will free via device release */</div><div class='ctx'> 	put_device(&amp;dev-&gt;dev);</div><div class='hunk'>@@ -9000,6 +12189,19 @@ void free_netdev(struct net_device *dev)</div><div class='ctx'> EXPORT_SYMBOL(free_netdev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * alloc_netdev_dummy - Allocate and initialize a dummy net device.</div><div class='add'>+ * @sizeof_priv: size of private data to allocate space for</div><div class='add'>+ *</div><div class='add'>+ * Return: the allocated net_device on success, NULL otherwise</div><div class='add'>+ */</div><div class='add'>+struct net_device *alloc_netdev_dummy(int sizeof_priv)</div><div class='add'>+{</div><div class='add'>+	return alloc_netdev(sizeof_priv, "dummy#", NET_NAME_UNKNOWN,</div><div class='add'>+			    init_dummy_netdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_netdev_dummy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	synchronize_net -  Synchronize with packet receive processing</div><div class='ctx'>  *</div><div class='ctx'>  *	Wait for packets currently being received to be done.</div><div class='hunk'>@@ -9008,13 +12210,28 @@ EXPORT_SYMBOL(free_netdev);</div><div class='ctx'> void synchronize_net(void)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='del'>-	if (rtnl_is_locked())</div><div class='add'>+	if (from_cleanup_net() || rtnl_is_locked())</div><div class='ctx'> 		synchronize_rcu_expedited();</div><div class='ctx'> 	else</div><div class='ctx'> 		synchronize_rcu();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(synchronize_net);</div><div class='ctx'> </div><div class='add'>+static void netdev_rss_contexts_free(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	unsigned long context;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	xa_for_each(&amp;dev-&gt;ethtool-&gt;rss_ctx, context, ctx) {</div><div class='add'>+		xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, context);</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;remove_rxfh_context(dev, ctx, context, NULL);</div><div class='add'>+		kfree(ctx);</div><div class='add'>+	}</div><div class='add'>+	xa_destroy(&amp;dev-&gt;ethtool-&gt;rss_ctx);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	unregister_netdevice_queue - remove device from the kernel</div><div class='ctx'>  *	@dev: device</div><div class='hunk'>@@ -9035,30 +12252,196 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)</div><div class='ctx'> 	if (head) {</div><div class='ctx'> 		list_move_tail(&amp;dev-&gt;unreg_list, head);</div><div class='ctx'> 	} else {</div><div class='del'>-		rollback_registered(dev);</div><div class='del'>-		/* Finish processing unregister after unlock */</div><div class='del'>-		net_set_todo(dev);</div><div class='add'>+		LIST_HEAD(single);</div><div class='add'>+</div><div class='add'>+		list_add(&amp;dev-&gt;unreg_list, &amp;single);</div><div class='add'>+		unregister_netdevice_many(&amp;single);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_netdevice_queue);</div><div class='ctx'> </div><div class='add'>+static void dev_memory_provider_uninstall(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;real_num_rx_queues; i++) {</div><div class='add'>+		struct netdev_rx_queue *rxq = &amp;dev-&gt;_rx[i];</div><div class='add'>+		struct pp_memory_provider_params *p = &amp;rxq-&gt;mp_params;</div><div class='add'>+</div><div class='add'>+		if (p-&gt;mp_ops &amp;&amp; p-&gt;mp_ops-&gt;uninstall)</div><div class='add'>+			p-&gt;mp_ops-&gt;uninstall(rxq-&gt;mp_params.mp_priv, rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* devices must be UP and netdev_lock()'d */</div><div class='add'>+static void netif_close_many_and_unlock(struct list_head *close_head)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev, *tmp;</div><div class='add'>+</div><div class='add'>+	netif_close_many(close_head, false);</div><div class='add'>+</div><div class='add'>+	/* ... now unlock them */</div><div class='add'>+	list_for_each_entry_safe(dev, tmp, close_head, close_list) {</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+		list_del_init(&amp;dev-&gt;close_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netif_close_many_and_unlock_cond(struct list_head *close_head)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	/* We can only track up to MAX_LOCK_DEPTH locks per task.</div><div class='add'>+	 *</div><div class='add'>+	 * Reserve half the available slots for additional locks possibly</div><div class='add'>+	 * taken by notifiers and (soft)irqs.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int limit = MAX_LOCK_DEPTH / 2;</div><div class='add'>+</div><div class='add'>+	if (lockdep_depth(current) &gt; limit)</div><div class='add'>+		netif_close_many_and_unlock(close_head);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unregister_netdevice_many_notify(struct list_head *head,</div><div class='add'>+				      u32 portid, const struct nlmsghdr *nlh)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev, *tmp;</div><div class='add'>+	LIST_HEAD(close_head);</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(dev_boot_phase);</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (list_empty(head))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(dev, tmp, head, unreg_list) {</div><div class='add'>+		/* Some devices call without registering</div><div class='add'>+		 * for initialization unwind. Remove those</div><div class='add'>+		 * devices and proceed with the remaining.</div><div class='add'>+		 */</div><div class='add'>+		if (dev-&gt;reg_state == NETREG_UNINITIALIZED) {</div><div class='add'>+			pr_debug("unregister_netdevice: device %s/%p never was registered\n",</div><div class='add'>+				 dev-&gt;name, dev);</div><div class='add'>+</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			list_del(&amp;dev-&gt;unreg_list);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;dismantle = true;</div><div class='add'>+		BUG_ON(dev-&gt;reg_state != NETREG_REGISTERED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If device is running, close it first. Start with ops locked... */</div><div class='add'>+	list_for_each_entry(dev, head, unreg_list) {</div><div class='add'>+		if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			continue;</div><div class='add'>+		if (netdev_need_ops_lock(dev)) {</div><div class='add'>+			list_add_tail(&amp;dev-&gt;close_list, &amp;close_head);</div><div class='add'>+			netdev_lock(dev);</div><div class='add'>+		}</div><div class='add'>+		netif_close_many_and_unlock_cond(&amp;close_head);</div><div class='add'>+	}</div><div class='add'>+	netif_close_many_and_unlock(&amp;close_head);</div><div class='add'>+	/* ... now go over the rest. */</div><div class='add'>+	list_for_each_entry(dev, head, unreg_list) {</div><div class='add'>+		if (!netdev_need_ops_lock(dev))</div><div class='add'>+			list_add_tail(&amp;dev-&gt;close_list, &amp;close_head);</div><div class='add'>+	}</div><div class='add'>+	netif_close_many(&amp;close_head, true);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, head, unreg_list) {</div><div class='add'>+		/* And unlink it from device chain. */</div><div class='add'>+		unlist_netdevice(dev);</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+		WRITE_ONCE(dev-&gt;reg_state, NETREG_UNREGISTERING);</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+	}</div><div class='add'>+	flush_all_backlogs();</div><div class='add'>+</div><div class='add'>+	synchronize_net();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, head, unreg_list) {</div><div class='add'>+		struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+		/* Shutdown queueing discipline. */</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		dev_shutdown(dev);</div><div class='add'>+		dev_tcx_uninstall(dev);</div><div class='add'>+		dev_xdp_uninstall(dev);</div><div class='add'>+		dev_memory_provider_uninstall(dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		bpf_dev_bound_netdev_unregister(dev);</div><div class='add'>+</div><div class='add'>+		netdev_offload_xstats_disable_all(dev);</div><div class='add'>+</div><div class='add'>+		/* Notify protocols, that we are about to destroy</div><div class='add'>+		 * this device. They should clean all the things.</div><div class='add'>+		 */</div><div class='add'>+		call_netdevice_notifiers(NETDEV_UNREGISTER, dev);</div><div class='add'>+</div><div class='add'>+		if (!(dev-&gt;rtnl_link_ops &amp;&amp; dev-&gt;rtnl_link_initializing))</div><div class='add'>+			skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,</div><div class='add'>+						     GFP_KERNEL, NULL, 0,</div><div class='add'>+						     portid, nlh);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 *	Flush the unicast and multicast chains</div><div class='add'>+		 */</div><div class='add'>+		dev_uc_flush(dev);</div><div class='add'>+		dev_mc_flush(dev);</div><div class='add'>+</div><div class='add'>+		netdev_name_node_alt_flush(dev);</div><div class='add'>+		netdev_name_node_free(dev-&gt;name_node);</div><div class='add'>+</div><div class='add'>+		netdev_rss_contexts_free(dev);</div><div class='add'>+</div><div class='add'>+		call_netdevice_notifiers(NETDEV_PRE_UNINIT, dev);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;netdev_ops-&gt;ndo_uninit)</div><div class='add'>+			dev-&gt;netdev_ops-&gt;ndo_uninit(dev);</div><div class='add'>+</div><div class='add'>+		mutex_destroy(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+</div><div class='add'>+		net_shaper_flush_netdev(dev);</div><div class='add'>+</div><div class='add'>+		if (skb)</div><div class='add'>+			rtmsg_ifinfo_send(skb, dev, GFP_KERNEL, portid, nlh);</div><div class='add'>+</div><div class='add'>+		/* Notifier chain MUST detach us all upper devices. */</div><div class='add'>+		WARN_ON(netdev_has_any_upper_dev(dev));</div><div class='add'>+		WARN_ON(netdev_has_any_lower_dev(dev));</div><div class='add'>+</div><div class='add'>+		/* Remove entries from kobject tree */</div><div class='add'>+		netdev_unregister_kobject(dev);</div><div class='add'>+#ifdef CONFIG_XPS</div><div class='add'>+		/* Remove XPS queueing entries */</div><div class='add'>+		netif_reset_xps_queues_gt(dev, 0);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	synchronize_net();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, head, unreg_list) {</div><div class='add'>+		netdev_put(dev, &amp;dev-&gt;dev_registered_tracker);</div><div class='add'>+		net_set_todo(dev);</div><div class='add'>+		cnt++;</div><div class='add'>+	}</div><div class='add'>+	atomic_add(cnt, &amp;dev_unreg_count);</div><div class='add'>+</div><div class='add'>+	list_del(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	unregister_netdevice_many - unregister many devices</div><div class='ctx'>  *	@head: list of devices</div><div class='ctx'>  *</div><div class='ctx'>  *  Note: As most callers use a stack allocated list_head,</div><div class='del'>- *  we force a list_del() to make sure stack wont be corrupted later.</div><div class='add'>+ *  we force a list_del() to make sure stack won't be corrupted later.</div><div class='ctx'>  */</div><div class='ctx'> void unregister_netdevice_many(struct list_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	if (!list_empty(head)) {</div><div class='del'>-		rollback_registered_many(head);</div><div class='del'>-		list_for_each_entry(dev, head, unreg_list)</div><div class='del'>-			net_set_todo(dev);</div><div class='del'>-		list_del(head);</div><div class='del'>-	}</div><div class='add'>+	unregister_netdevice_many_notify(head, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_netdevice_many);</div><div class='ctx'> </div><div class='hunk'>@@ -9075,73 +12458,114 @@ EXPORT_SYMBOL(unregister_netdevice_many);</div><div class='ctx'>  */</div><div class='ctx'> void unregister_netdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rtnl_net_dev_lock(dev);</div><div class='ctx'> 	unregister_netdevice(dev);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_dev_unlock(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_netdev);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	dev_change_net_namespace - move device to different nethost namespace</div><div class='del'>- *	@dev: device</div><div class='del'>- *	@net: network namespace</div><div class='del'>- *	@pat: If not NULL name pattern to try if the current device name</div><div class='del'>- *	      is already taken in the destination network namespace.</div><div class='del'>- *</div><div class='del'>- *	This function shuts down a device interface and moves it</div><div class='del'>- *	to a new network namespace. On success 0 is returned, on</div><div class='del'>- *	a failure a netagive errno code is returned.</div><div class='del'>- *</div><div class='del'>- *	Callers must hold the rtnl semaphore.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int dev_change_net_namespace(struct net_device *dev, struct net *net, const char *pat)</div><div class='add'>+int __dev_change_net_namespace(struct net_device *dev, struct net *net,</div><div class='add'>+			       const char *pat, int new_ifindex,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int err, new_nsid, new_ifindex;</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	struct net *net_old = dev_net(dev);</div><div class='add'>+	char new_name[IFNAMSIZ] = {};</div><div class='add'>+	int err, new_nsid;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	/* Don't allow namespace local devices to be moved. */</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (dev-&gt;features &amp; NETIF_F_NETNS_LOCAL)</div><div class='add'>+	if (dev-&gt;netns_immutable) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "The interface netns is immutable");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Ensure the device has been registrered */</div><div class='del'>-	if (dev-&gt;reg_state != NETREG_REGISTERED)</div><div class='add'>+	/* Ensure the device has been registered */</div><div class='add'>+	if (dev-&gt;reg_state != NETREG_REGISTERED) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "The interface isn't registered");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get out if there is nothing todo */</div><div class='ctx'> 	err = 0;</div><div class='del'>-	if (net_eq(dev_net(dev), net))</div><div class='add'>+	if (net_eq(net_old, net))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Pick the destination device name, and ensure</div><div class='ctx'> 	 * we can use it in the destination network namespace.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = -EEXIST;</div><div class='del'>-	if (__dev_get_by_name(net, dev-&gt;name)) {</div><div class='add'>+	if (netdev_name_in_use(net, dev-&gt;name)) {</div><div class='ctx'> 		/* We get here if we can't use the current device name */</div><div class='del'>-		if (!pat)</div><div class='add'>+		if (!pat) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "An interface with the same name exists in the target netns");</div><div class='ctx'> 			goto out;</div><div class='del'>-		err = dev_get_valid_name(net, dev, pat);</div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		}</div><div class='add'>+		err = dev_prep_valid_name(net, dev, pat, new_name, EEXIST);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "Unable to use '%s' for the new interface name in the target netns",</div><div class='add'>+					   pat);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Check that none of the altnames conflicts. */</div><div class='add'>+	err = -EEXIST;</div><div class='add'>+	netdev_for_each_altname(dev, name_node) {</div><div class='add'>+		if (netdev_name_in_use(net, name_node-&gt;name)) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "An interface with the altname %s exists in the target netns",</div><div class='add'>+					   name_node-&gt;name);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that new_ifindex isn't used yet. */</div><div class='add'>+	if (new_ifindex) {</div><div class='add'>+		err = dev_index_reserve(net, new_ifindex);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "The ifindex %d is not available in the target netns",</div><div class='add'>+					   new_ifindex);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* If there is an ifindex conflict assign a new one */</div><div class='add'>+		err = dev_index_reserve(net, dev-&gt;ifindex);</div><div class='add'>+		if (err == -EBUSY)</div><div class='add'>+			err = dev_index_reserve(net, 0);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Unable to allocate a new ifindex in the target netns");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		new_ifindex = err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * And now a mini version of register_netdevice unregister_netdevice.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	/* If device is running close it first. */</div><div class='del'>-	dev_close(dev);</div><div class='del'>-</div><div class='add'>+	netif_close(dev);</div><div class='ctx'> 	/* And unlink it from device chain */</div><div class='ctx'> 	unlist_netdevice(dev);</div><div class='ctx'> </div><div class='add'>+	if (!netdev_need_ops_lock(dev))</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+	dev-&gt;moving_ns = true;</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+</div><div class='ctx'> 	synchronize_net();</div><div class='ctx'> </div><div class='ctx'> 	/* Shutdown queueing discipline. */</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	dev_shutdown(dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify protocols, that we are about to destroy</div><div class='ctx'> 	 * this device. They should clean all the things.</div><div class='hunk'>@@ -9153,12 +12577,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_UNREGISTER, dev);</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> </div><div class='del'>-	new_nsid = peernet2id_alloc(dev_net(dev), net);</div><div class='del'>-	/* If there is an ifindex conflict assign a new one */</div><div class='del'>-	if (__dev_get_by_index(net, dev-&gt;ifindex))</div><div class='del'>-		new_ifindex = dev_new_index(net);</div><div class='del'>-	else</div><div class='del'>-		new_ifindex = dev-&gt;ifindex;</div><div class='add'>+	new_nsid = peernet2id_alloc(dev_net(dev), net, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	rtmsg_ifinfo_newnet(RTM_DELLINK, dev, ~0U, GFP_KERNEL, &amp;new_nsid,</div><div class='ctx'> 			    new_ifindex);</div><div class='hunk'>@@ -9173,36 +12592,60 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char</div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;dev.kobj, KOBJ_REMOVE);</div><div class='ctx'> 	netdev_adjacent_del_links(dev);</div><div class='ctx'> </div><div class='add'>+	/* Move per-net netdevice notifiers that are following the netdevice */</div><div class='add'>+	move_netdevice_notifiers_dev_net(dev, net);</div><div class='add'>+</div><div class='ctx'> 	/* Actually switch the network namespace */</div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	dev_net_set(dev, net);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> 	dev-&gt;ifindex = new_ifindex;</div><div class='ctx'> </div><div class='add'>+	if (new_name[0]) {</div><div class='add'>+		/* Rename the netdev to prepared name */</div><div class='add'>+		write_seqlock_bh(&amp;netdev_rename_lock);</div><div class='add'>+		strscpy(dev-&gt;name, new_name, IFNAMSIZ);</div><div class='add'>+		write_sequnlock_bh(&amp;netdev_rename_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fixup kobjects */</div><div class='add'>+	dev_set_uevent_suppress(&amp;dev-&gt;dev, 1);</div><div class='add'>+	err = device_rename(&amp;dev-&gt;dev, dev-&gt;name);</div><div class='add'>+	dev_set_uevent_suppress(&amp;dev-&gt;dev, 0);</div><div class='add'>+	WARN_ON(err);</div><div class='add'>+</div><div class='ctx'> 	/* Send a netdev-add uevent to the new namespace */</div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;dev.kobj, KOBJ_ADD);</div><div class='ctx'> 	netdev_adjacent_add_links(dev);</div><div class='ctx'> </div><div class='del'>-	/* Fixup kobjects */</div><div class='del'>-	err = device_rename(&amp;dev-&gt;dev, dev-&gt;name);</div><div class='add'>+	/* Adapt owner in case owning user namespace of target network</div><div class='add'>+	 * namespace is different from the original one.</div><div class='add'>+	 */</div><div class='add'>+	err = netdev_change_owner(dev, net_old, net);</div><div class='ctx'> 	WARN_ON(err);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	dev-&gt;moving_ns = false;</div><div class='add'>+	if (!netdev_need_ops_lock(dev))</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+</div><div class='ctx'> 	/* Add the device back in the hashes */</div><div class='ctx'> 	list_netdevice(dev);</div><div class='del'>-</div><div class='ctx'> 	/* Notify protocols, that a new device appeared. */</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_REGISTER, dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Prevent userspace races by waiting until the network</div><div class='ctx'> 	 *	device is fully setup before sending notifications.</div><div class='ctx'> 	 */</div><div class='del'>-	rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL);</div><div class='add'>+	rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	synchronize_net();</div><div class='ctx'> 	err = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_change_net_namespace);</div><div class='ctx'> </div><div class='ctx'> static int dev_cpu_dead(unsigned int oldcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -9242,7 +12685,7 @@ static int dev_cpu_dead(unsigned int oldcpu)</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;napi-&gt;poll_list);</div><div class='ctx'> 		if (napi-&gt;poll == process_backlog)</div><div class='del'>-			napi-&gt;state = 0;</div><div class='add'>+			napi-&gt;state &amp;= NAPIF_STATE_THREADED;</div><div class='ctx'> 		else</div><div class='ctx'> 			____napi_schedule(sd, napi);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -9250,21 +12693,23 @@ static int dev_cpu_dead(unsigned int oldcpu)</div><div class='ctx'> 	raise_softirq_irqoff(NET_TX_SOFTIRQ);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='add'>+	if (!use_backlog_threads()) {</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	remsd = oldsd-&gt;rps_ipi_list;</div><div class='del'>-	oldsd-&gt;rps_ipi_list = NULL;</div><div class='add'>+		remsd = oldsd-&gt;rps_ipi_list;</div><div class='add'>+		oldsd-&gt;rps_ipi_list = NULL;</div><div class='ctx'> #endif</div><div class='del'>-	/* send out pending IPI's on offline CPU */</div><div class='del'>-	net_rps_send_ipi(remsd);</div><div class='add'>+		/* send out pending IPI's on offline CPU */</div><div class='add'>+		net_rps_send_ipi(remsd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Process offline CPU's input_pkt_queue */</div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;oldsd-&gt;process_queue))) {</div><div class='del'>-		netif_rx_ni(skb);</div><div class='del'>-		input_queue_head_incr(oldsd);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+		rps_input_queue_head_incr(oldsd);</div><div class='ctx'> 	}</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;oldsd-&gt;input_pkt_queue))) {</div><div class='del'>-		netif_rx_ni(skb);</div><div class='del'>-		input_queue_head_incr(oldsd);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+		rps_input_queue_head_incr(oldsd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -9298,6 +12743,94 @@ netdev_features_t netdev_increment_features(netdev_features_t all,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_increment_features);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	netdev_compute_master_upper_features - compute feature from lowers</div><div class='add'>+ *	@dev: the upper device</div><div class='add'>+ *	@update_header: whether to update upper device's header_len/headroom/tailroom</div><div class='add'>+ *</div><div class='add'>+ *	Recompute the upper device's feature based on all lower devices.</div><div class='add'>+ */</div><div class='add'>+void netdev_compute_master_upper_features(struct net_device *dev, bool update_header)</div><div class='add'>+{</div><div class='add'>+	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM;</div><div class='add'>+	netdev_features_t gso_partial_features = MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES;</div><div class='add'>+	netdev_features_t xfrm_features = MASTER_UPPER_DEV_XFRM_FEATURES;</div><div class='add'>+	netdev_features_t mpls_features = MASTER_UPPER_DEV_MPLS_FEATURES;</div><div class='add'>+	netdev_features_t vlan_features = MASTER_UPPER_DEV_VLAN_FEATURES;</div><div class='add'>+	netdev_features_t enc_features = MASTER_UPPER_DEV_ENC_FEATURES;</div><div class='add'>+	unsigned short max_header_len = ETH_HLEN;</div><div class='add'>+	unsigned int tso_max_size = TSO_MAX_SIZE;</div><div class='add'>+	unsigned short max_headroom = 0;</div><div class='add'>+	unsigned short max_tailroom = 0;</div><div class='add'>+	u16 tso_max_segs = TSO_MAX_SEGS;</div><div class='add'>+	struct net_device *lower_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	mpls_features = netdev_base_features(mpls_features);</div><div class='add'>+	vlan_features = netdev_base_features(vlan_features);</div><div class='add'>+	enc_features = netdev_base_features(enc_features);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower_dev, iter) {</div><div class='add'>+		gso_partial_features = netdev_increment_features(gso_partial_features,</div><div class='add'>+								 lower_dev-&gt;gso_partial_features,</div><div class='add'>+								 MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES);</div><div class='add'>+</div><div class='add'>+		vlan_features = netdev_increment_features(vlan_features,</div><div class='add'>+							  lower_dev-&gt;vlan_features,</div><div class='add'>+							  MASTER_UPPER_DEV_VLAN_FEATURES);</div><div class='add'>+</div><div class='add'>+		enc_features = netdev_increment_features(enc_features,</div><div class='add'>+							 lower_dev-&gt;hw_enc_features,</div><div class='add'>+							 MASTER_UPPER_DEV_ENC_FEATURES);</div><div class='add'>+</div><div class='add'>+		if (IS_ENABLED(CONFIG_XFRM_OFFLOAD))</div><div class='add'>+			xfrm_features = netdev_increment_features(xfrm_features,</div><div class='add'>+								  lower_dev-&gt;hw_enc_features,</div><div class='add'>+								  MASTER_UPPER_DEV_XFRM_FEATURES);</div><div class='add'>+</div><div class='add'>+		mpls_features = netdev_increment_features(mpls_features,</div><div class='add'>+							  lower_dev-&gt;mpls_features,</div><div class='add'>+							  MASTER_UPPER_DEV_MPLS_FEATURES);</div><div class='add'>+</div><div class='add'>+		dst_release_flag &amp;= lower_dev-&gt;priv_flags;</div><div class='add'>+</div><div class='add'>+		if (update_header) {</div><div class='add'>+			max_header_len = max(max_header_len, lower_dev-&gt;hard_header_len);</div><div class='add'>+			max_headroom = max(max_headroom, lower_dev-&gt;needed_headroom);</div><div class='add'>+			max_tailroom = max(max_tailroom, lower_dev-&gt;needed_tailroom);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tso_max_size = min(tso_max_size, lower_dev-&gt;tso_max_size);</div><div class='add'>+		tso_max_segs = min(tso_max_segs, lower_dev-&gt;tso_max_segs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;gso_partial_features = gso_partial_features;</div><div class='add'>+	dev-&gt;vlan_features = vlan_features;</div><div class='add'>+	dev-&gt;hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |</div><div class='add'>+			       NETIF_F_HW_VLAN_CTAG_TX |</div><div class='add'>+			       NETIF_F_HW_VLAN_STAG_TX;</div><div class='add'>+	if (IS_ENABLED(CONFIG_XFRM_OFFLOAD))</div><div class='add'>+		dev-&gt;hw_enc_features |= xfrm_features;</div><div class='add'>+	dev-&gt;mpls_features = mpls_features;</div><div class='add'>+</div><div class='add'>+	dev-&gt;priv_flags &amp;= ~IFF_XMIT_DST_RELEASE;</div><div class='add'>+	if ((dev-&gt;priv_flags &amp; IFF_XMIT_DST_RELEASE_PERM) &amp;&amp;</div><div class='add'>+	    dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))</div><div class='add'>+		dev-&gt;priv_flags |= IFF_XMIT_DST_RELEASE;</div><div class='add'>+</div><div class='add'>+	if (update_header) {</div><div class='add'>+		dev-&gt;hard_header_len = max_header_len;</div><div class='add'>+		dev-&gt;needed_headroom = max_headroom;</div><div class='add'>+		dev-&gt;needed_tailroom = max_tailroom;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_set_tso_max_segs(dev, tso_max_segs);</div><div class='add'>+	netif_set_tso_max_size(dev, tso_max_size);</div><div class='add'>+</div><div class='add'>+	netdev_change_features(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_compute_master_upper_features);</div><div class='add'>+</div><div class='ctx'> static struct hlist_head * __net_init netdev_create_hash(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -9315,10 +12848,9 @@ static struct hlist_head * __net_init netdev_create_hash(void)</div><div class='ctx'> static int __net_init netdev_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(GRO_HASH_BUCKETS &gt;</div><div class='del'>-		     8 * FIELD_SIZEOF(struct napi_struct, gro_bitmask));</div><div class='add'>+		     BITS_PER_BYTE * sizeof_field(struct gro_node, bitmask));</div><div class='ctx'> </div><div class='del'>-	if (net != &amp;init_net)</div><div class='del'>-		INIT_LIST_HEAD(&amp;net-&gt;dev_base_head);</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;dev_base_head);</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;dev_name_head = netdev_create_hash();</div><div class='ctx'> 	if (net-&gt;dev_name_head == NULL)</div><div class='hunk'>@@ -9328,6 +12860,10 @@ static int __net_init netdev_init(struct net *net)</div><div class='ctx'> 	if (net-&gt;dev_index_head == NULL)</div><div class='ctx'> 		goto err_idx;</div><div class='ctx'> </div><div class='add'>+	xa_init_flags(&amp;net-&gt;dev_by_index, XA_FLAGS_ALLOC1);</div><div class='add'>+</div><div class='add'>+	RAW_INIT_NOTIFIER_HEAD(&amp;net-&gt;netdev_chain);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_idx:</div><div class='hunk'>@@ -9423,6 +12959,7 @@ static void __net_exit netdev_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(net-&gt;dev_name_head);</div><div class='ctx'> 	kfree(net-&gt;dev_index_head);</div><div class='add'>+	xa_destroy(&amp;net-&gt;dev_by_index);</div><div class='ctx'> 	if (net != &amp;init_net)</div><div class='ctx'> 		WARN_ON_ONCE(!list_empty(&amp;net-&gt;dev_base_head));</div><div class='ctx'> }</div><div class='hunk'>@@ -9432,28 +12969,36 @@ static struct pernet_operations __net_initdata netdev_net_ops = {</div><div class='ctx'> 	.exit = netdev_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __net_exit default_device_exit(struct net *net)</div><div class='add'>+static void __net_exit default_device_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_name_node *name_node, *tmp;</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Push all migratable network devices back to the</div><div class='ctx'> 	 * initial network namespace</div><div class='ctx'> 	 */</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	for_each_netdev_safe(net, dev, aux) {</div><div class='ctx'> 		int err;</div><div class='ctx'> 		char fb_name[IFNAMSIZ];</div><div class='ctx'> </div><div class='ctx'> 		/* Ignore unmoveable devices (i.e. loopback) */</div><div class='del'>-		if (dev-&gt;features &amp; NETIF_F_NETNS_LOCAL)</div><div class='add'>+		if (dev-&gt;netns_immutable)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Leave virtual devices for the generic cleanup */</div><div class='del'>-		if (dev-&gt;rtnl_link_ops)</div><div class='add'>+		if (dev-&gt;rtnl_link_ops &amp;&amp; !dev-&gt;rtnl_link_ops-&gt;netns_refund)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Push remaining network devices to init_net */</div><div class='ctx'> 		snprintf(fb_name, IFNAMSIZ, "dev%d", dev-&gt;ifindex);</div><div class='add'>+		if (netdev_name_in_use(&amp;init_net, fb_name))</div><div class='add'>+			snprintf(fb_name, IFNAMSIZ, "dev%%d");</div><div class='add'>+</div><div class='add'>+		netdev_for_each_altname_safe(dev, name_node, tmp)</div><div class='add'>+			if (netdev_name_in_use(&amp;init_net, name_node-&gt;name))</div><div class='add'>+				__netdev_name_node_alt_destroy(name_node);</div><div class='add'>+</div><div class='ctx'> 		err = dev_change_net_namespace(dev, &amp;init_net, fb_name);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			pr_emerg("%s: failed to move %s to init_net: %d\n",</div><div class='hunk'>@@ -9461,35 +13006,6 @@ static void __net_exit default_device_exit(struct net *net)</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit rtnl_lock_unregistering(struct list_head *net_list)</div><div class='del'>-{</div><div class='del'>-	/* Return with the rtnl_lock held when there are no network</div><div class='del'>-	 * devices unregistering in any network namespace in net_list.</div><div class='del'>-	 */</div><div class='del'>-	struct net *net;</div><div class='del'>-	bool unregistering;</div><div class='del'>-	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='del'>-</div><div class='del'>-	add_wait_queue(&amp;netdev_unregistering_wq, &amp;wait);</div><div class='del'>-	for (;;) {</div><div class='del'>-		unregistering = false;</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		list_for_each_entry(net, net_list, exit_list) {</div><div class='del'>-			if (net-&gt;dev_unreg_count &gt; 0) {</div><div class='del'>-				unregistering = true;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!unregistering)</div><div class='del'>-			break;</div><div class='del'>-		__rtnl_unlock();</div><div class='del'>-</div><div class='del'>-		wait_woken(&amp;wait, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);</div><div class='del'>-	}</div><div class='del'>-	remove_wait_queue(&amp;netdev_unregistering_wq, &amp;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit default_device_exit_batch(struct list_head *net_list)</div><div class='hunk'>@@ -9503,18 +13019,12 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	LIST_HEAD(dev_kill_list);</div><div class='ctx'> </div><div class='del'>-	/* To prevent network device cleanup code from dereferencing</div><div class='del'>-	 * loopback devices or network devices that have been freed</div><div class='del'>-	 * wait here for all pending unregistrations to complete,</div><div class='del'>-	 * before unregistring the loopback device and allowing the</div><div class='del'>-	 * network namespace be freed.</div><div class='del'>-	 *</div><div class='del'>-	 * The netdev todo list containing all network devices</div><div class='del'>-	 * unregistrations that happen in default_device_exit_batch</div><div class='del'>-	 * will run in the rtnl_unlock() at the end of</div><div class='del'>-	 * default_device_exit_batch.</div><div class='del'>-	 */</div><div class='del'>-	rtnl_lock_unregistering(net_list);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list) {</div><div class='add'>+		default_device_exit_net(net);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(net, net_list, exit_list) {</div><div class='ctx'> 		for_each_netdev_reverse(net, dev) {</div><div class='ctx'> 			if (dev-&gt;rtnl_link_ops &amp;&amp; dev-&gt;rtnl_link_ops-&gt;dellink)</div><div class='hunk'>@@ -9528,10 +13038,64 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations __net_initdata default_device_ops = {</div><div class='del'>-	.exit = default_device_exit,</div><div class='ctx'> 	.exit_batch = default_device_exit_batch,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __init net_dev_struct_check(void)</div><div class='add'>+{</div><div class='add'>+	/* TX read-mostly hotpath */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, priv_flags_fast);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, netdev_ops);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, header_ops);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, _tx);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, real_num_tx_queues);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, gso_max_size);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, gso_ipv4_max_size);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, gso_max_segs);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, gso_partial_features);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, num_tc);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, mtu);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, needed_headroom);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, tc_to_txq);</div><div class='add'>+#ifdef CONFIG_XPS</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, xps_maps);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_NETFILTER_EGRESS</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, nf_hooks_egress);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_NET_XGRESS</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, tcx_egress);</div><div class='add'>+#endif</div><div class='add'>+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 160);</div><div class='add'>+</div><div class='add'>+	/* TXRX read-mostly hotpath */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, lstats);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, state);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, flags);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, hard_header_len);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, features);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, ip6_ptr);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_txrx, 46);</div><div class='add'>+</div><div class='add'>+	/* RX read-mostly hotpath */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, ptype_specific);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, ifindex);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, real_num_rx_queues);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, _rx);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, gro_max_size);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, gro_ipv4_max_size);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, rx_handler);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, rx_handler_data);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, nd_net);</div><div class='add'>+#ifdef CONFIG_NETPOLL</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, npinfo);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_NET_XGRESS</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, tcx_ingress);</div><div class='add'>+#endif</div><div class='add'>+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_rx, 92);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Initialize the DEV module. At boot time this walks the device list and</div><div class='ctx'>  *	unhooks any devices that fail to initialise (normally hardware not</div><div class='hunk'>@@ -9539,6 +13103,67 @@ static struct pernet_operations __net_initdata default_device_ops = {</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* We allocate 256 pages for each CPU if PAGE_SHIFT is 12 */</div><div class='add'>+#define SYSTEM_PERCPU_PAGE_POOL_SIZE	((1 &lt;&lt; 20) / PAGE_SIZE)</div><div class='add'>+</div><div class='add'>+static int net_page_pool_create(int cpuid)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_PAGE_POOL)</div><div class='add'>+	struct page_pool_params page_pool_params = {</div><div class='add'>+		.pool_size = SYSTEM_PERCPU_PAGE_POOL_SIZE,</div><div class='add'>+		.flags = PP_FLAG_SYSTEM_POOL,</div><div class='add'>+		.nid = cpu_to_mem(cpuid),</div><div class='add'>+	};</div><div class='add'>+	struct page_pool *pp_ptr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pp_ptr = page_pool_create_percpu(&amp;page_pool_params, cpuid);</div><div class='add'>+	if (IS_ERR(pp_ptr))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = xdp_reg_page_pool(pp_ptr);</div><div class='add'>+	if (err) {</div><div class='add'>+		page_pool_destroy(pp_ptr);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	per_cpu(system_page_pool.pool, cpuid) = pp_ptr;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int backlog_napi_should_run(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct softnet_data *sd = per_cpu_ptr(&amp;softnet_data, cpu);</div><div class='add'>+	struct napi_struct *napi = &amp;sd-&gt;backlog;</div><div class='add'>+</div><div class='add'>+	return test_bit(NAPI_STATE_SCHED_THREADED, &amp;napi-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_backlog_napi(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct softnet_data *sd = per_cpu_ptr(&amp;softnet_data, cpu);</div><div class='add'>+</div><div class='add'>+	napi_threaded_poll_loop(&amp;sd-&gt;backlog, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void backlog_napi_setup(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct softnet_data *sd = per_cpu_ptr(&amp;softnet_data, cpu);</div><div class='add'>+	struct napi_struct *napi = &amp;sd-&gt;backlog;</div><div class='add'>+</div><div class='add'>+	napi-&gt;thread = this_cpu_read(backlog_napi);</div><div class='add'>+	set_bit(NAPI_STATE_THREADED, &amp;napi-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct smp_hotplug_thread backlog_threads = {</div><div class='add'>+	.store			= &amp;backlog_napi,</div><div class='add'>+	.thread_should_run	= backlog_napi_should_run,</div><div class='add'>+	.thread_fn		= run_backlog_napi,</div><div class='add'>+	.thread_comm		= "backlog_napi/%u",</div><div class='add'>+	.setup			= backlog_napi_setup,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *       This is called single threaded during boot, so no need</div><div class='ctx'>  *       to take the rtnl semaphore.</div><div class='hunk'>@@ -9549,18 +13174,17 @@ static int __init net_dev_init(void)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!dev_boot_phase);</div><div class='ctx'> </div><div class='add'>+	net_dev_struct_check();</div><div class='add'>+</div><div class='ctx'> 	if (dev_proc_init())</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (netdev_kobject_init())</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;ptype_all);</div><div class='ctx'> 	for (i = 0; i &lt; PTYPE_HASH_SIZE; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;ptype_base[i]);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;offload_base);</div><div class='del'>-</div><div class='ctx'> 	if (register_pernet_subsys(&amp;netdev_net_ops))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -9568,12 +13192,13 @@ static int __init net_dev_init(void)</div><div class='ctx'> 	 *	Initialise the packet receive queues.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	flush_backlogs_fallback = flush_backlogs_alloc();</div><div class='add'>+	if (!flush_backlogs_fallback)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='del'>-		struct work_struct *flush = per_cpu_ptr(&amp;flush_works, i);</div><div class='ctx'> 		struct softnet_data *sd = &amp;per_cpu(softnet_data, i);</div><div class='ctx'> </div><div class='del'>-		INIT_WORK(flush, flush_backlog);</div><div class='del'>-</div><div class='ctx'> 		skb_queue_head_init(&amp;sd-&gt;input_pkt_queue);</div><div class='ctx'> 		skb_queue_head_init(&amp;sd-&gt;process_queue);</div><div class='ctx'> #ifdef CONFIG_XFRM_OFFLOAD</div><div class='hunk'>@@ -9582,15 +13207,26 @@ static int __init net_dev_init(void)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;sd-&gt;poll_list);</div><div class='ctx'> 		sd-&gt;output_queue_tailp = &amp;sd-&gt;output_queue;</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-		sd-&gt;csd.func = rps_trigger_softirq;</div><div class='del'>-		sd-&gt;csd.info = sd;</div><div class='add'>+		INIT_CSD(&amp;sd-&gt;csd, rps_trigger_softirq, sd);</div><div class='ctx'> 		sd-&gt;cpu = i;</div><div class='ctx'> #endif</div><div class='add'>+		INIT_CSD(&amp;sd-&gt;defer_csd, trigger_rx_softirq, sd);</div><div class='ctx'> </div><div class='del'>-		init_gro_hash(&amp;sd-&gt;backlog);</div><div class='add'>+		gro_init(&amp;sd-&gt;backlog.gro);</div><div class='ctx'> 		sd-&gt;backlog.poll = process_backlog;</div><div class='ctx'> 		sd-&gt;backlog.weight = weight_p;</div><div class='add'>+		INIT_LIST_HEAD(&amp;sd-&gt;backlog.poll_list);</div><div class='add'>+</div><div class='add'>+		if (net_page_pool_create(i))</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='add'>+	net_hotdata.skb_defer_nodes =</div><div class='add'>+		 __alloc_percpu(sizeof(struct skb_defer_node) * nr_node_ids,</div><div class='add'>+				__alignof__(struct skb_defer_node));</div><div class='add'>+	if (!net_hotdata.skb_defer_nodes)</div><div class='add'>+		goto out;</div><div class='add'>+	if (use_backlog_threads())</div><div class='add'>+		smpboot_register_percpu_thread(&amp;backlog_threads);</div><div class='ctx'> </div><div class='ctx'> 	dev_boot_phase = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -9616,7 +13252,25 @@ static int __init net_dev_init(void)</div><div class='ctx'> 				       NULL, dev_cpu_dead);</div><div class='ctx'> 	WARN_ON(rc &lt; 0);</div><div class='ctx'> 	rc = 0;</div><div class='add'>+</div><div class='add'>+	/* avoid static key IPIs to isolated CPUs */</div><div class='add'>+	if (housekeeping_enabled(HK_TYPE_MISC))</div><div class='add'>+		net_enable_timestamp();</div><div class='ctx'> out:</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			struct page_pool *pp_ptr;</div><div class='add'>+</div><div class='add'>+			pp_ptr = per_cpu(system_page_pool.pool, i);</div><div class='add'>+			if (!pp_ptr)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			xdp_unreg_page_pool(pp_ptr);</div><div class='add'>+			page_pool_destroy(pp_ptr);</div><div class='add'>+			per_cpu(system_page_pool.pool, i) = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/dev.h b/net/core/dev.h<br/>new file mode 100644<br/>index 000000000000..da18536cbd35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev.h</a></div><div class='hunk'>@@ -0,0 +1,406 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _NET_CORE_DEV_H</div><div class='add'>+#define _NET_CORE_DEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+struct net;</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+struct cpumask;</div><div class='add'>+</div><div class='add'>+/* Random bits of netdevice that don't need to be exposed */</div><div class='add'>+#define FLOW_LIMIT_HISTORY	(1 &lt;&lt; 7)  /* must be ^2 and !overflow buckets */</div><div class='add'>+struct sd_flow_limit {</div><div class='add'>+	struct rcu_head		rcu;</div><div class='add'>+	unsigned int		count;</div><div class='add'>+	u8			log_buckets;</div><div class='add'>+	unsigned int		history_head;</div><div class='add'>+	u16			history[FLOW_LIMIT_HISTORY];</div><div class='add'>+	u8			buckets[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int netdev_flow_limit_table_len;</div><div class='add'>+</div><div class='add'>+struct napi_struct *</div><div class='add'>+netdev_napi_by_id_lock(struct net *net, unsigned int napi_id);</div><div class='add'>+struct net_device *dev_get_by_napi_id(unsigned int napi_id);</div><div class='add'>+</div><div class='add'>+struct net_device *__netdev_put_lock(struct net_device *dev, struct net *net);</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_xa_find_lock(struct net *net, struct net_device *dev,</div><div class='add'>+		    unsigned long *index);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(netdev_unlock, struct net_device *, if (_T) netdev_unlock(_T));</div><div class='add'>+</div><div class='add'>+#define for_each_netdev_lock_scoped(net, var_name, ifindex)		\</div><div class='add'>+	for (struct net_device *var_name __free(netdev_unlock) = NULL;	\</div><div class='add'>+	     (var_name = netdev_xa_find_lock(net, var_name, &amp;ifindex)); \</div><div class='add'>+	     ifindex++)</div><div class='add'>+</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_get_by_index_lock_ops_compat(struct net *net, int ifindex);</div><div class='add'>+struct net_device *</div><div class='add'>+netdev_xa_find_lock_ops_compat(struct net *net, struct net_device *dev,</div><div class='add'>+			       unsigned long *index);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(netdev_unlock_ops_compat, struct net_device *,</div><div class='add'>+	    if (_T) netdev_unlock_ops_compat(_T));</div><div class='add'>+</div><div class='add'>+#define for_each_netdev_lock_ops_compat_scoped(net, var_name, ifindex)	\</div><div class='add'>+	for (struct net_device *var_name __free(netdev_unlock_ops_compat) = NULL; \</div><div class='add'>+	     (var_name = netdev_xa_find_lock_ops_compat(net, var_name,	\</div><div class='add'>+							&amp;ifindex));	\</div><div class='add'>+	     ifindex++)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+int __init dev_proc_init(void);</div><div class='add'>+#else</div><div class='add'>+#define dev_proc_init() 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void linkwatch_init_dev(struct net_device *dev);</div><div class='add'>+void linkwatch_run_queue(void);</div><div class='add'>+</div><div class='add'>+void dev_addr_flush(struct net_device *dev);</div><div class='add'>+int dev_addr_init(struct net_device *dev);</div><div class='add'>+void dev_addr_check(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_SHAPER)</div><div class='add'>+void net_shaper_flush_netdev(struct net_device *dev);</div><div class='add'>+void net_shaper_set_real_num_tx_queues(struct net_device *dev,</div><div class='add'>+				       unsigned int txq);</div><div class='add'>+#else</div><div class='add'>+static inline void net_shaper_flush_netdev(struct net_device *dev) {}</div><div class='add'>+static inline void net_shaper_set_real_num_tx_queues(struct net_device *dev,</div><div class='add'>+						     unsigned int txq) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* sysctls not referred to from outside net/core/ */</div><div class='add'>+extern int		netdev_unregister_timeout_secs;</div><div class='add'>+extern int		weight_p;</div><div class='add'>+extern int		dev_weight_rx_bias;</div><div class='add'>+extern int		dev_weight_tx_bias;</div><div class='add'>+</div><div class='add'>+extern struct rw_semaphore dev_addr_sem;</div><div class='add'>+</div><div class='add'>+/* rtnl helpers */</div><div class='add'>+extern struct list_head net_todo_list;</div><div class='add'>+void netdev_run_todo(void);</div><div class='add'>+</div><div class='add'>+/* netdev management, shared between various uAPI entry points */</div><div class='add'>+struct netdev_name_node {</div><div class='add'>+	struct hlist_node hlist;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int netdev_get_name(struct net *net, char *name, int ifindex);</div><div class='add'>+int netif_change_name(struct net_device *dev, const char *newname);</div><div class='add'>+int dev_change_name(struct net_device *dev, const char *newname);</div><div class='add'>+</div><div class='add'>+#define netdev_for_each_altname(dev, namenode)				\</div><div class='add'>+	list_for_each_entry((namenode), &amp;(dev)-&gt;name_node-&gt;list, list)</div><div class='add'>+#define netdev_for_each_altname_safe(dev, namenode, next)		\</div><div class='add'>+	list_for_each_entry_safe((namenode), (next), &amp;(dev)-&gt;name_node-&gt;list, \</div><div class='add'>+				 list)</div><div class='add'>+</div><div class='add'>+int netdev_name_node_alt_create(struct net_device *dev, const char *name);</div><div class='add'>+int netdev_name_node_alt_destroy(struct net_device *dev, const char *name);</div><div class='add'>+</div><div class='add'>+int dev_validate_mtu(struct net_device *dev, int mtu,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+int netif_set_mtu_ext(struct net_device *dev, int new_mtu,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int dev_get_phys_port_id(struct net_device *dev,</div><div class='add'>+			 struct netdev_phys_item_id *ppid);</div><div class='add'>+int dev_get_phys_port_name(struct net_device *dev,</div><div class='add'>+			   char *name, size_t len);</div><div class='add'>+</div><div class='add'>+int netif_change_proto_down(struct net_device *dev, bool proto_down);</div><div class='add'>+int dev_change_proto_down(struct net_device *dev, bool proto_down);</div><div class='add'>+void netdev_change_proto_down_reason_locked(struct net_device *dev,</div><div class='add'>+					    unsigned long mask, u32 value);</div><div class='add'>+</div><div class='add'>+typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf);</div><div class='add'>+int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,</div><div class='add'>+		      int fd, int expected_fd, u32 flags);</div><div class='add'>+</div><div class='add'>+int netif_change_tx_queue_len(struct net_device *dev, unsigned long new_len);</div><div class='add'>+int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len);</div><div class='add'>+void netif_set_group(struct net_device *dev, int new_group);</div><div class='add'>+void dev_set_group(struct net_device *dev, int new_group);</div><div class='add'>+int netif_change_carrier(struct net_device *dev, bool new_carrier);</div><div class='add'>+int dev_change_carrier(struct net_device *dev, bool new_carrier);</div><div class='add'>+</div><div class='add'>+void __dev_set_rx_mode(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+void __dev_notify_flags(struct net_device *dev, unsigned int old_flags,</div><div class='add'>+			unsigned int gchanges, u32 portid,</div><div class='add'>+			const struct nlmsghdr *nlh);</div><div class='add'>+</div><div class='add'>+void unregister_netdevice_many_notify(struct list_head *head,</div><div class='add'>+				      u32 portid, const struct nlmsghdr *nlh);</div><div class='add'>+</div><div class='add'>+static inline void netif_set_up(struct net_device *dev, bool value)</div><div class='add'>+{</div><div class='add'>+	if (value)</div><div class='add'>+		dev-&gt;flags |= IFF_UP;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;flags &amp;= ~IFF_UP;</div><div class='add'>+</div><div class='add'>+	if (!netdev_need_ops_lock(dev))</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+	dev-&gt;up = value;</div><div class='add'>+	if (!netdev_need_ops_lock(dev))</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_set_gso_max_size(struct net_device *dev,</div><div class='add'>+					  unsigned int size)</div><div class='add'>+{</div><div class='add'>+	/* dev-&gt;gso_max_size is read locklessly from sk_setup_caps() */</div><div class='add'>+	WRITE_ONCE(dev-&gt;gso_max_size, size);</div><div class='add'>+	if (size &lt;= GSO_LEGACY_MAX_SIZE)</div><div class='add'>+		WRITE_ONCE(dev-&gt;gso_ipv4_max_size, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_set_gso_max_segs(struct net_device *dev,</div><div class='add'>+					  unsigned int segs)</div><div class='add'>+{</div><div class='add'>+	/* dev-&gt;gso_max_segs is read locklessly from sk_setup_caps() */</div><div class='add'>+	WRITE_ONCE(dev-&gt;gso_max_segs, segs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_set_gro_max_size(struct net_device *dev,</div><div class='add'>+					  unsigned int size)</div><div class='add'>+{</div><div class='add'>+	/* This pairs with the READ_ONCE() in skb_gro_receive() */</div><div class='add'>+	WRITE_ONCE(dev-&gt;gro_max_size, size);</div><div class='add'>+	if (size &lt;= GRO_LEGACY_MAX_SIZE)</div><div class='add'>+		WRITE_ONCE(dev-&gt;gro_ipv4_max_size, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_set_gso_ipv4_max_size(struct net_device *dev,</div><div class='add'>+					       unsigned int size)</div><div class='add'>+{</div><div class='add'>+	/* dev-&gt;gso_ipv4_max_size is read locklessly from sk_setup_caps() */</div><div class='add'>+	WRITE_ONCE(dev-&gt;gso_ipv4_max_size, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_set_gro_ipv4_max_size(struct net_device *dev,</div><div class='add'>+					       unsigned int size)</div><div class='add'>+{</div><div class='add'>+	/* This pairs with the READ_ONCE() in skb_gro_receive() */</div><div class='add'>+	WRITE_ONCE(dev-&gt;gro_ipv4_max_size, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_get_defer_hard_irqs - get the NAPI's defer_hard_irqs</div><div class='add'>+ * @n: napi struct to get the defer_hard_irqs field from</div><div class='add'>+ *</div><div class='add'>+ * Return: the per-NAPI value of the defar_hard_irqs field.</div><div class='add'>+ */</div><div class='add'>+static inline u32 napi_get_defer_hard_irqs(const struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(n-&gt;defer_hard_irqs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_set_defer_hard_irqs - set the defer_hard_irqs for a napi</div><div class='add'>+ * @n: napi_struct to set the defer_hard_irqs field</div><div class='add'>+ * @defer: the value the field should be set to</div><div class='add'>+ */</div><div class='add'>+static inline void napi_set_defer_hard_irqs(struct napi_struct *n, u32 defer)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(n-&gt;defer_hard_irqs, defer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_set_defer_hard_irqs - set defer_hard_irqs for all NAPIs of a netdev</div><div class='add'>+ * @netdev: the net_device for which all NAPIs will have defer_hard_irqs set</div><div class='add'>+ * @defer: the defer_hard_irqs value to set</div><div class='add'>+ */</div><div class='add'>+static inline void netdev_set_defer_hard_irqs(struct net_device *netdev,</div><div class='add'>+					      u32 defer)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = max(netdev-&gt;num_rx_queues,</div><div class='add'>+				 netdev-&gt;num_tx_queues);</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(netdev-&gt;napi_defer_hard_irqs, defer);</div><div class='add'>+	list_for_each_entry(napi, &amp;netdev-&gt;napi_list, dev_list)</div><div class='add'>+		napi_set_defer_hard_irqs(napi, defer);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		netdev-&gt;napi_config[i].defer_hard_irqs = defer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_get_gro_flush_timeout - get the gro_flush_timeout</div><div class='add'>+ * @n: napi struct to get the gro_flush_timeout from</div><div class='add'>+ *</div><div class='add'>+ * Return: the per-NAPI value of the gro_flush_timeout field.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+napi_get_gro_flush_timeout(const struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(n-&gt;gro_flush_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_set_gro_flush_timeout - set the gro_flush_timeout for a napi</div><div class='add'>+ * @n: napi struct to set the gro_flush_timeout</div><div class='add'>+ * @timeout: timeout value to set</div><div class='add'>+ *</div><div class='add'>+ * napi_set_gro_flush_timeout sets the per-NAPI gro_flush_timeout</div><div class='add'>+ */</div><div class='add'>+static inline void napi_set_gro_flush_timeout(struct napi_struct *n,</div><div class='add'>+					      unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(n-&gt;gro_flush_timeout, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_set_gro_flush_timeout - set gro_flush_timeout of a netdev's NAPIs</div><div class='add'>+ * @netdev: the net_device for which all NAPIs will have gro_flush_timeout set</div><div class='add'>+ * @timeout: the timeout value to set</div><div class='add'>+ */</div><div class='add'>+static inline void netdev_set_gro_flush_timeout(struct net_device *netdev,</div><div class='add'>+						unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = max(netdev-&gt;num_rx_queues,</div><div class='add'>+				 netdev-&gt;num_tx_queues);</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(netdev-&gt;gro_flush_timeout, timeout);</div><div class='add'>+	list_for_each_entry(napi, &amp;netdev-&gt;napi_list, dev_list)</div><div class='add'>+		napi_set_gro_flush_timeout(napi, timeout);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		netdev-&gt;napi_config[i].gro_flush_timeout = timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_get_irq_suspend_timeout - get the irq_suspend_timeout</div><div class='add'>+ * @n: napi struct to get the irq_suspend_timeout from</div><div class='add'>+ *</div><div class='add'>+ * Return: the per-NAPI value of the irq_suspend_timeout field.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+napi_get_irq_suspend_timeout(const struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(n-&gt;irq_suspend_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * napi_set_irq_suspend_timeout - set the irq_suspend_timeout for a napi</div><div class='add'>+ * @n: napi struct to set the irq_suspend_timeout</div><div class='add'>+ * @timeout: timeout value to set</div><div class='add'>+ *</div><div class='add'>+ * napi_set_irq_suspend_timeout sets the per-NAPI irq_suspend_timeout</div><div class='add'>+ */</div><div class='add'>+static inline void napi_set_irq_suspend_timeout(struct napi_struct *n,</div><div class='add'>+						unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(n-&gt;irq_suspend_timeout, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum netdev_napi_threaded napi_get_threaded(struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(NAPI_STATE_THREADED_BUSY_POLL, &amp;n-&gt;state))</div><div class='add'>+		return NETDEV_NAPI_THREADED_BUSY_POLL;</div><div class='add'>+</div><div class='add'>+	if (test_bit(NAPI_STATE_THREADED, &amp;n-&gt;state))</div><div class='add'>+		return NETDEV_NAPI_THREADED_ENABLED;</div><div class='add'>+</div><div class='add'>+	return NETDEV_NAPI_THREADED_DISABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum netdev_napi_threaded</div><div class='add'>+napi_get_threaded_config(struct net_device *dev, struct napi_struct *n)</div><div class='add'>+{</div><div class='add'>+	if (n-&gt;config)</div><div class='add'>+		return n-&gt;config-&gt;threaded;</div><div class='add'>+	return dev-&gt;threaded;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int napi_set_threaded(struct napi_struct *n,</div><div class='add'>+		      enum netdev_napi_threaded threaded);</div><div class='add'>+</div><div class='add'>+int netif_set_threaded(struct net_device *dev,</div><div class='add'>+		       enum netdev_napi_threaded threaded);</div><div class='add'>+</div><div class='add'>+int rps_cpumask_housekeeping(struct cpumask *mask);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DEBUG_NET) &amp;&amp; defined(CONFIG_BPF_SYSCALL)</div><div class='add'>+void xdp_do_check_flushed(struct napi_struct *napi);</div><div class='add'>+#else</div><div class='add'>+static inline void xdp_do_check_flushed(struct napi_struct *napi) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Best effort check that NAPI is not idle (can't be scheduled to run) */</div><div class='add'>+static inline void napi_assert_will_not_race(const struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	/* uninitialized instance, can't race */</div><div class='add'>+	if (!napi-&gt;poll_list.next)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* SCHED bit is set on disabled instances */</div><div class='add'>+	WARN_ON(!test_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state));</div><div class='add'>+	WARN_ON(READ_ONCE(napi-&gt;list_owner) != -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kick_defer_list_purge(unsigned int cpu);</div><div class='add'>+</div><div class='add'>+#define XMIT_RECURSION_LIMIT	8</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='add'>+static inline bool dev_xmit_recursion(void)</div><div class='add'>+{</div><div class='add'>+	return unlikely(__this_cpu_read(softnet_data.xmit.recursion) &gt;</div><div class='add'>+			XMIT_RECURSION_LIMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_xmit_recursion_inc(void)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_inc(softnet_data.xmit.recursion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_xmit_recursion_dec(void)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_dec(softnet_data.xmit.recursion);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool dev_xmit_recursion(void)</div><div class='add'>+{</div><div class='add'>+	return unlikely(current-&gt;net_xmit.recursion &gt; XMIT_RECURSION_LIMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_xmit_recursion_inc(void)</div><div class='add'>+{</div><div class='add'>+	current-&gt;net_xmit.recursion++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_xmit_recursion_dec(void)</div><div class='add'>+{</div><div class='add'>+	current-&gt;net_xmit.recursion--;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int dev_set_hwtstamp_phylib(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+int dev_get_hwtstamp_phylib(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *cfg);</div><div class='add'>+int net_hwtstamp_validate(const struct kernel_hwtstamp_config *cfg);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c<br/>index d884d8f5f0e5..76c91f224886 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/dev_addr_lists.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_addr_lists.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev_addr_lists.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev_addr_lists.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/dev_addr_lists.c - Functions for handling net device lists</div><div class='ctx'>  * Copyright (c) 2010 Jiri Pirko &lt;jpirko@redhat.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains functions for working with unicast, multicast and device</div><div class='ctx'>  * addresses lists.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -16,14 +12,44 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * General list handling functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __hw_addr_create_ex(struct netdev_hw_addr_list *list,</div><div class='del'>-			       const unsigned char *addr, int addr_len,</div><div class='del'>-			       unsigned char addr_type, bool global,</div><div class='del'>-			       bool sync)</div><div class='add'>+static int __hw_addr_insert(struct netdev_hw_addr_list *list,</div><div class='add'>+			    struct netdev_hw_addr *new, int addr_len)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **ins_point = &amp;list-&gt;tree.rb_node, *parent = NULL;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+	while (*ins_point) {</div><div class='add'>+		int diff;</div><div class='add'>+</div><div class='add'>+		ha = rb_entry(*ins_point, struct netdev_hw_addr, node);</div><div class='add'>+		diff = memcmp(new-&gt;addr, ha-&gt;addr, addr_len);</div><div class='add'>+		if (diff == 0)</div><div class='add'>+			diff = memcmp(&amp;new-&gt;type, &amp;ha-&gt;type, sizeof(new-&gt;type));</div><div class='add'>+</div><div class='add'>+		parent = *ins_point;</div><div class='add'>+		if (diff &lt; 0)</div><div class='add'>+			ins_point = &amp;parent-&gt;rb_left;</div><div class='add'>+		else if (diff &gt; 0)</div><div class='add'>+			ins_point = &amp;parent-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_link_node_rcu(&amp;new-&gt;node, parent, ins_point);</div><div class='add'>+	rb_insert_color(&amp;new-&gt;node, &amp;list-&gt;tree);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_hw_addr*</div><div class='add'>+__hw_addr_create(const unsigned char *addr, int addr_len,</div><div class='add'>+		 unsigned char addr_type, bool global, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int alloc_size;</div><div class='hunk'>@@ -33,32 +59,44 @@ static int __hw_addr_create_ex(struct netdev_hw_addr_list *list,</div><div class='ctx'> 		alloc_size = L1_CACHE_BYTES;</div><div class='ctx'> 	ha = kmalloc(alloc_size, GFP_ATOMIC);</div><div class='ctx'> 	if (!ha)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	memcpy(ha-&gt;addr, addr, addr_len);</div><div class='ctx'> 	ha-&gt;type = addr_type;</div><div class='ctx'> 	ha-&gt;refcount = 1;</div><div class='ctx'> 	ha-&gt;global_use = global;</div><div class='ctx'> 	ha-&gt;synced = sync ? 1 : 0;</div><div class='ctx'> 	ha-&gt;sync_cnt = 0;</div><div class='del'>-	list_add_tail_rcu(&amp;ha-&gt;list, &amp;list-&gt;list);</div><div class='del'>-	list-&gt;count++;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ha;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __hw_addr_add_ex(struct netdev_hw_addr_list *list,</div><div class='ctx'> 			    const unsigned char *addr, int addr_len,</div><div class='ctx'> 			    unsigned char addr_type, bool global, bool sync,</div><div class='del'>-			    int sync_count)</div><div class='add'>+			    int sync_count, bool exclusive)</div><div class='ctx'> {</div><div class='add'>+	struct rb_node **ins_point = &amp;list-&gt;tree.rb_node, *parent = NULL;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &gt; MAX_ADDR_LEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(ha, &amp;list-&gt;list, list) {</div><div class='del'>-		if (ha-&gt;type == addr_type &amp;&amp;</div><div class='del'>-		    !memcmp(ha-&gt;addr, addr, addr_len)) {</div><div class='add'>+	while (*ins_point) {</div><div class='add'>+		int diff;</div><div class='add'>+</div><div class='add'>+		ha = rb_entry(*ins_point, struct netdev_hw_addr, node);</div><div class='add'>+		diff = memcmp(addr, ha-&gt;addr, addr_len);</div><div class='add'>+		if (diff == 0)</div><div class='add'>+			diff = memcmp(&amp;addr_type, &amp;ha-&gt;type, sizeof(addr_type));</div><div class='add'>+</div><div class='add'>+		parent = *ins_point;</div><div class='add'>+		if (diff &lt; 0) {</div><div class='add'>+			ins_point = &amp;parent-&gt;rb_left;</div><div class='add'>+		} else if (diff &gt; 0) {</div><div class='add'>+			ins_point = &amp;parent-&gt;rb_right;</div><div class='add'>+		} else {</div><div class='add'>+			if (exclusive)</div><div class='add'>+				return -EEXIST;</div><div class='ctx'> 			if (global) {</div><div class='ctx'> 				/* check if addr is already used as global */</div><div class='ctx'> 				if (ha-&gt;global_use)</div><div class='hunk'>@@ -77,8 +115,17 @@ static int __hw_addr_add_ex(struct netdev_hw_addr_list *list,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __hw_addr_create_ex(list, addr, addr_len, addr_type, global,</div><div class='del'>-				   sync);</div><div class='add'>+	ha = __hw_addr_create(addr, addr_len, addr_type, global, sync);</div><div class='add'>+	if (!ha)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rb_link_node(&amp;ha-&gt;node, parent, ins_point);</div><div class='add'>+	rb_insert_color(&amp;ha-&gt;node, &amp;list-&gt;tree);</div><div class='add'>+</div><div class='add'>+	list_add_tail_rcu(&amp;ha-&gt;list, &amp;list-&gt;list);</div><div class='add'>+	list-&gt;count++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __hw_addr_add(struct netdev_hw_addr_list *list,</div><div class='hunk'>@@ -86,7 +133,7 @@ static int __hw_addr_add(struct netdev_hw_addr_list *list,</div><div class='ctx'> 			 unsigned char addr_type)</div><div class='ctx'> {</div><div class='ctx'> 	return __hw_addr_add_ex(list, addr, addr_len, addr_type, false, false,</div><div class='del'>-				0);</div><div class='add'>+				0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __hw_addr_del_entry(struct netdev_hw_addr_list *list,</div><div class='hunk'>@@ -107,24 +154,50 @@ static int __hw_addr_del_entry(struct netdev_hw_addr_list *list,</div><div class='ctx'> </div><div class='ctx'> 	if (--ha-&gt;refcount)</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;ha-&gt;node, &amp;list-&gt;tree);</div><div class='add'>+</div><div class='ctx'> 	list_del_rcu(&amp;ha-&gt;list);</div><div class='ctx'> 	kfree_rcu(ha, rcu_head);</div><div class='ctx'> 	list-&gt;count--;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct netdev_hw_addr *__hw_addr_lookup(struct netdev_hw_addr_list *list,</div><div class='add'>+					       const unsigned char *addr, int addr_len,</div><div class='add'>+					       unsigned char addr_type)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	node = list-&gt;tree.rb_node;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		struct netdev_hw_addr *ha = rb_entry(node, struct netdev_hw_addr, node);</div><div class='add'>+		int diff = memcmp(addr, ha-&gt;addr, addr_len);</div><div class='add'>+</div><div class='add'>+		if (diff == 0 &amp;&amp; addr_type)</div><div class='add'>+			diff = memcmp(&amp;addr_type, &amp;ha-&gt;type, sizeof(addr_type));</div><div class='add'>+</div><div class='add'>+		if (diff &lt; 0)</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		else if (diff &gt; 0)</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return ha;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __hw_addr_del_ex(struct netdev_hw_addr_list *list,</div><div class='ctx'> 			    const unsigned char *addr, int addr_len,</div><div class='ctx'> 			    unsigned char addr_type, bool global, bool sync)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_hw_addr *ha;</div><div class='add'>+	struct netdev_hw_addr *ha = __hw_addr_lookup(list, addr, addr_len, addr_type);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(ha, &amp;list-&gt;list, list) {</div><div class='del'>-		if (!memcmp(ha-&gt;addr, addr, addr_len) &amp;&amp;</div><div class='del'>-		    (ha-&gt;type == addr_type || !addr_type))</div><div class='del'>-			return __hw_addr_del_entry(list, ha, global, sync);</div><div class='del'>-	}</div><div class='del'>-	return -ENOENT;</div><div class='add'>+	if (!ha)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	return __hw_addr_del_entry(list, ha, global, sync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __hw_addr_del(struct netdev_hw_addr_list *list,</div><div class='hunk'>@@ -141,7 +214,7 @@ static int __hw_addr_sync_one(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = __hw_addr_add_ex(to_list, ha-&gt;addr, addr_len, ha-&gt;type,</div><div class='del'>-			       false, true, ha-&gt;sync_cnt);</div><div class='add'>+			       false, true, ha-&gt;sync_cnt, false);</div><div class='ctx'> 	if (err &amp;&amp; err != -EEXIST)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -169,9 +242,9 @@ static void __hw_addr_unsync_one(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> 	__hw_addr_del_entry(from_list, ha, false, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,</div><div class='del'>-				   struct netdev_hw_addr_list *from_list,</div><div class='del'>-				   int addr_len)</div><div class='add'>+int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,</div><div class='add'>+			    struct netdev_hw_addr_list *from_list,</div><div class='add'>+			    int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct netdev_hw_addr *ha, *tmp;</div><div class='hunk'>@@ -187,9 +260,10 @@ static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__hw_addr_sync_multiple);</div><div class='ctx'> </div><div class='ctx'> /* This function only works where there is a strict 1-1 relationship</div><div class='del'>- * between source and destionation of they synch. If you ever need to</div><div class='add'>+ * between source and destination of they synch. If you ever need to</div><div class='ctx'>  * sync addresses to more then 1 destination, you need to use</div><div class='ctx'>  * __hw_addr_sync_multiple().</div><div class='ctx'>  */</div><div class='hunk'>@@ -226,13 +300,13 @@ void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> EXPORT_SYMBOL(__hw_addr_unsync);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  __hw_addr_sync_dev - Synchonize device's multicast list</div><div class='del'>- *  @list: address list to syncronize</div><div class='add'>+ *  __hw_addr_sync_dev - Synchronize device's multicast list</div><div class='add'>+ *  @list: address list to synchronize</div><div class='ctx'>  *  @dev:  device to sync</div><div class='ctx'>  *  @sync: function to call if address should be added</div><div class='ctx'>  *  @unsync: function to call if address should be removed</div><div class='ctx'>  *</div><div class='del'>- *  This funciton is intended to be called from the ndo_set_rx_mode</div><div class='add'>+ *  This function is intended to be called from the ndo_set_rx_mode</div><div class='ctx'>  *  function of devices that require explicit address add/remove</div><div class='ctx'>  *  notifications.  The unsync function may be NULL in which case</div><div class='ctx'>  *  the addresses requiring removal will simply be removed without</div><div class='hunk'>@@ -278,6 +352,103 @@ int __hw_addr_sync_dev(struct netdev_hw_addr_list *list,</div><div class='ctx'> EXPORT_SYMBOL(__hw_addr_sync_dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  __hw_addr_ref_sync_dev - Synchronize device's multicast address list taking</div><div class='add'>+ *  into account references</div><div class='add'>+ *  @list: address list to synchronize</div><div class='add'>+ *  @dev:  device to sync</div><div class='add'>+ *  @sync: function to call if address or reference on it should be added</div><div class='add'>+ *  @unsync: function to call if address or some reference on it should removed</div><div class='add'>+ *</div><div class='add'>+ *  This function is intended to be called from the ndo_set_rx_mode</div><div class='add'>+ *  function of devices that require explicit address or references on it</div><div class='add'>+ *  add/remove notifications. The unsync function may be NULL in which case</div><div class='add'>+ *  the addresses or references on it requiring removal will simply be</div><div class='add'>+ *  removed without any notification to the device. That is responsibility of</div><div class='add'>+ *  the driver to identify and distribute address or references on it between</div><div class='add'>+ *  internal address tables.</div><div class='add'>+ **/</div><div class='add'>+int __hw_addr_ref_sync_dev(struct netdev_hw_addr_list *list,</div><div class='add'>+			   struct net_device *dev,</div><div class='add'>+			   int (*sync)(struct net_device *,</div><div class='add'>+				       const unsigned char *, int),</div><div class='add'>+			   int (*unsync)(struct net_device *,</div><div class='add'>+					 const unsigned char *, int))</div><div class='add'>+{</div><div class='add'>+	struct netdev_hw_addr *ha, *tmp;</div><div class='add'>+	int err, ref_cnt;</div><div class='add'>+</div><div class='add'>+	/* first go through and flush out any unsynced/stale entries */</div><div class='add'>+	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='add'>+		/* sync if address is not used */</div><div class='add'>+		if ((ha-&gt;sync_cnt &lt;&lt; 1) &lt;= ha-&gt;refcount)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* if fails defer unsyncing address */</div><div class='add'>+		ref_cnt = ha-&gt;refcount - ha-&gt;sync_cnt;</div><div class='add'>+		if (unsync &amp;&amp; unsync(dev, ha-&gt;addr, ref_cnt))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ha-&gt;refcount = (ref_cnt &lt;&lt; 1) + 1;</div><div class='add'>+		ha-&gt;sync_cnt = ref_cnt;</div><div class='add'>+		__hw_addr_del_entry(list, ha, false, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* go through and sync updated/new entries to the list */</div><div class='add'>+	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='add'>+		/* sync if address added or reused */</div><div class='add'>+		if ((ha-&gt;sync_cnt &lt;&lt; 1) &gt;= ha-&gt;refcount)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ref_cnt = ha-&gt;refcount - ha-&gt;sync_cnt;</div><div class='add'>+		err = sync(dev, ha-&gt;addr, ref_cnt);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		ha-&gt;refcount = ref_cnt &lt;&lt; 1;</div><div class='add'>+		ha-&gt;sync_cnt = ref_cnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hw_addr_ref_sync_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  __hw_addr_ref_unsync_dev - Remove synchronized addresses and references on</div><div class='add'>+ *  it from device</div><div class='add'>+ *  @list: address list to remove synchronized addresses (references on it) from</div><div class='add'>+ *  @dev:  device to sync</div><div class='add'>+ *  @unsync: function to call if address and references on it should be removed</div><div class='add'>+ *</div><div class='add'>+ *  Remove all addresses that were added to the device by</div><div class='add'>+ *  __hw_addr_ref_sync_dev(). This function is intended to be called from the</div><div class='add'>+ *  ndo_stop or ndo_open functions on devices that require explicit address (or</div><div class='add'>+ *  references on it) add/remove notifications. If the unsync function pointer</div><div class='add'>+ *  is NULL then this function can be used to just reset the sync_cnt for the</div><div class='add'>+ *  addresses in the list.</div><div class='add'>+ **/</div><div class='add'>+void __hw_addr_ref_unsync_dev(struct netdev_hw_addr_list *list,</div><div class='add'>+			      struct net_device *dev,</div><div class='add'>+			      int (*unsync)(struct net_device *,</div><div class='add'>+					    const unsigned char *, int))</div><div class='add'>+{</div><div class='add'>+	struct netdev_hw_addr *ha, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='add'>+		if (!ha-&gt;sync_cnt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* if fails defer unsyncing address */</div><div class='add'>+		if (unsync &amp;&amp; unsync(dev, ha-&gt;addr, ha-&gt;sync_cnt))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ha-&gt;refcount -= ha-&gt;sync_cnt - 1;</div><div class='add'>+		ha-&gt;sync_cnt = 0;</div><div class='add'>+		__hw_addr_del_entry(list, ha, false, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__hw_addr_ref_unsync_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  __hw_addr_unsync_dev - Remove synchronized addresses from device</div><div class='ctx'>  *  @list: address list to remove synchronized addresses from</div><div class='ctx'>  *  @dev:  device to sync</div><div class='hunk'>@@ -314,6 +485,7 @@ static void __hw_addr_flush(struct netdev_hw_addr_list *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_hw_addr *ha, *tmp;</div><div class='ctx'> </div><div class='add'>+	list-&gt;tree = RB_ROOT;</div><div class='ctx'> 	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='ctx'> 		list_del_rcu(&amp;ha-&gt;list);</div><div class='ctx'> 		kfree_rcu(ha, rcu_head);</div><div class='hunk'>@@ -325,6 +497,7 @@ void __hw_addr_init(struct netdev_hw_addr_list *list)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;list-&gt;list);</div><div class='ctx'> 	list-&gt;count = 0;</div><div class='add'>+	list-&gt;tree = RB_ROOT;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__hw_addr_init);</div><div class='ctx'> </div><div class='hunk'>@@ -332,6 +505,21 @@ EXPORT_SYMBOL(__hw_addr_init);</div><div class='ctx'>  * Device addresses handling functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Check that netdev-&gt;dev_addr is not written to directly as this would</div><div class='add'>+ * break the rbtree layout. All changes should go thru dev_addr_set() and co.</div><div class='add'>+ * Remove this check in mid-2024.</div><div class='add'>+ */</div><div class='add'>+void dev_addr_check(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!memcmp(dev-&gt;dev_addr, dev-&gt;dev_addr_shadow, MAX_ADDR_LEN))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_warn(dev, "Current addr:  %*ph\n", MAX_ADDR_LEN, dev-&gt;dev_addr);</div><div class='add'>+	netdev_warn(dev, "Expected addr: %*ph\n",</div><div class='add'>+		    MAX_ADDR_LEN, dev-&gt;dev_addr_shadow);</div><div class='add'>+	netdev_WARN(dev, "Incorrect netdev-&gt;dev_addr\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	dev_addr_flush - Flush device address list</div><div class='ctx'>  *	@dev: device</div><div class='hunk'>@@ -343,11 +531,11 @@ EXPORT_SYMBOL(__hw_addr_init);</div><div class='ctx'> void dev_addr_flush(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* rtnl_mutex must be held here */</div><div class='add'>+	dev_addr_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	__hw_addr_flush(&amp;dev-&gt;dev_addrs);</div><div class='ctx'> 	dev-&gt;dev_addr = NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_addr_flush);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_addr_init - Init device address list</div><div class='hunk'>@@ -381,7 +569,21 @@ int dev_addr_init(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dev_addr_init);</div><div class='add'>+</div><div class='add'>+void dev_addr_mod(struct net_device *dev, unsigned int offset,</div><div class='add'>+		  const void *addr, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+	dev_addr_check(dev);</div><div class='add'>+</div><div class='add'>+	ha = container_of(dev-&gt;dev_addr, struct netdev_hw_addr, addr[0]);</div><div class='add'>+	rb_erase(&amp;ha-&gt;node, &amp;dev-&gt;dev_addrs.tree);</div><div class='add'>+	memcpy(&amp;ha-&gt;addr[offset], addr, len);</div><div class='add'>+	memcpy(&amp;dev-&gt;dev_addr_shadow[offset], addr, len);</div><div class='add'>+	WARN_ON(__hw_addr_insert(&amp;dev-&gt;dev_addrs, ha, dev-&gt;addr_len));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_addr_mod);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dev_addr_add - Add a device address</div><div class='hunk'>@@ -401,6 +603,9 @@ int dev_addr_add(struct net_device *dev, const unsigned char *addr,</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='add'>+	err = netif_pre_changeaddr_notify(dev, addr, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	err = __hw_addr_add(&amp;dev-&gt;dev_addrs, addr, dev-&gt;addr_len, addr_type);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);</div><div class='hunk'>@@ -456,22 +661,14 @@ EXPORT_SYMBOL(dev_addr_del);</div><div class='ctx'>  */</div><div class='ctx'> int dev_uc_add_excl(struct net_device *dev, const unsigned char *addr)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	netif_addr_lock_bh(dev);</div><div class='del'>-	list_for_each_entry(ha, &amp;dev-&gt;uc.list, list) {</div><div class='del'>-		if (!memcmp(ha-&gt;addr, addr, dev-&gt;addr_len) &amp;&amp;</div><div class='del'>-		    ha-&gt;type == NETDEV_HW_ADDR_T_UNICAST) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = __hw_addr_create_ex(&amp;dev-&gt;uc, addr, dev-&gt;addr_len,</div><div class='del'>-				  NETDEV_HW_ADDR_T_UNICAST, true, false);</div><div class='add'>+	err = __hw_addr_add_ex(&amp;dev-&gt;uc, addr, dev-&gt;addr_len,</div><div class='add'>+			       NETDEV_HW_ADDR_T_UNICAST, true, false,</div><div class='add'>+			       0, true);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(dev);</div><div class='del'>-out:</div><div class='ctx'> 	netif_addr_unlock_bh(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -541,7 +738,7 @@ int dev_uc_sync(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	err = __hw_addr_sync(&amp;to-&gt;uc, &amp;from-&gt;uc, to-&gt;addr_len);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(to);</div><div class='hunk'>@@ -571,7 +768,7 @@ int dev_uc_sync_multiple(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	err = __hw_addr_sync_multiple(&amp;to-&gt;uc, &amp;from-&gt;uc, to-&gt;addr_len);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(to);</div><div class='hunk'>@@ -594,8 +791,17 @@ void dev_uc_unsync(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* netif_addr_lock_bh() uses lockdep subclass 0, this is okay for two</div><div class='add'>+	 * reasons:</div><div class='add'>+	 * 1) This is always called without any addr_list_lock, so as the</div><div class='add'>+	 *    outermost one here, it must be 0.</div><div class='add'>+	 * 2) This is called by some callers after unlinking the upper device,</div><div class='add'>+	 *    so the dev-&gt;lower_level becomes 1 again.</div><div class='add'>+	 * Therefore, the subclass for 'from' is 0, for 'to' is either 1 or</div><div class='add'>+	 * larger.</div><div class='add'>+	 */</div><div class='ctx'> 	netif_addr_lock_bh(from);</div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	__hw_addr_unsync(&amp;to-&gt;uc, &amp;from-&gt;uc, to-&gt;addr_len);</div><div class='ctx'> 	__dev_set_rx_mode(to);</div><div class='ctx'> 	netif_addr_unlock(to);</div><div class='hunk'>@@ -618,7 +824,7 @@ void dev_uc_flush(struct net_device *dev)</div><div class='ctx'> EXPORT_SYMBOL(dev_uc_flush);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	dev_uc_flush - Init unicast address list</div><div class='add'>+ *	dev_uc_init - Init unicast address list</div><div class='ctx'>  *	@dev: device</div><div class='ctx'>  *</div><div class='ctx'>  *	Init unicast address list.</div><div class='hunk'>@@ -640,22 +846,14 @@ EXPORT_SYMBOL(dev_uc_init);</div><div class='ctx'>  */</div><div class='ctx'> int dev_mc_add_excl(struct net_device *dev, const unsigned char *addr)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	netif_addr_lock_bh(dev);</div><div class='del'>-	list_for_each_entry(ha, &amp;dev-&gt;mc.list, list) {</div><div class='del'>-		if (!memcmp(ha-&gt;addr, addr, dev-&gt;addr_len) &amp;&amp;</div><div class='del'>-		    ha-&gt;type == NETDEV_HW_ADDR_T_MULTICAST) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = __hw_addr_create_ex(&amp;dev-&gt;mc, addr, dev-&gt;addr_len,</div><div class='del'>-				  NETDEV_HW_ADDR_T_MULTICAST, true, false);</div><div class='add'>+	err = __hw_addr_add_ex(&amp;dev-&gt;mc, addr, dev-&gt;addr_len,</div><div class='add'>+			       NETDEV_HW_ADDR_T_MULTICAST, true, false,</div><div class='add'>+			       0, true);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(dev);</div><div class='del'>-out:</div><div class='ctx'> 	netif_addr_unlock_bh(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -668,7 +866,8 @@ static int __dev_mc_add(struct net_device *dev, const unsigned char *addr,</div><div class='ctx'> </div><div class='ctx'> 	netif_addr_lock_bh(dev);</div><div class='ctx'> 	err = __hw_addr_add_ex(&amp;dev-&gt;mc, addr, dev-&gt;addr_len,</div><div class='del'>-			       NETDEV_HW_ADDR_T_MULTICAST, global, false, 0);</div><div class='add'>+			       NETDEV_HW_ADDR_T_MULTICAST, global, false,</div><div class='add'>+			       0, false);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(dev);</div><div class='ctx'> 	netif_addr_unlock_bh(dev);</div><div class='hunk'>@@ -762,7 +961,7 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	err = __hw_addr_sync(&amp;to-&gt;mc, &amp;from-&gt;mc, to-&gt;addr_len);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(to);</div><div class='hunk'>@@ -792,7 +991,7 @@ int dev_mc_sync_multiple(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	err = __hw_addr_sync_multiple(&amp;to-&gt;mc, &amp;from-&gt;mc, to-&gt;addr_len);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		__dev_set_rx_mode(to);</div><div class='hunk'>@@ -815,8 +1014,9 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)</div><div class='ctx'> 	if (to-&gt;addr_len != from-&gt;addr_len)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* See the above comments inside dev_uc_unsync(). */</div><div class='ctx'> 	netif_addr_lock_bh(from);</div><div class='del'>-	netif_addr_lock_nested(to);</div><div class='add'>+	netif_addr_lock(to);</div><div class='ctx'> 	__hw_addr_unsync(&amp;to-&gt;mc, &amp;from-&gt;mc, to-&gt;addr_len);</div><div class='ctx'> 	__dev_set_rx_mode(to);</div><div class='ctx'> 	netif_addr_unlock(to);</div><div class='head'>diff --git a/net/core/dev_addr_lists_test.c b/net/core/dev_addr_lists_test.c<br/>new file mode 100644<br/>index 000000000000..8e1dba825e94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev_addr_lists_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev_addr_lists_test.c</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops dummy_netdev_ops = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dev_addr_test_priv {</div><div class='add'>+	u32 addr_seen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dev_addr_test_sync(struct net_device *netdev, const unsigned char *a)</div><div class='add'>+{</div><div class='add'>+	struct dev_addr_test_priv *datp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (a[0] &lt; 31 &amp;&amp; !memchr_inv(a, a[0], ETH_ALEN))</div><div class='add'>+		datp-&gt;addr_seen |= 1 &lt;&lt; a[0];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_addr_test_unsync(struct net_device *netdev,</div><div class='add'>+				const unsigned char *a)</div><div class='add'>+{</div><div class='add'>+	struct dev_addr_test_priv *datp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (a[0] &lt; 31 &amp;&amp; !memchr_inv(a, a[0], ETH_ALEN))</div><div class='add'>+		datp-&gt;addr_seen &amp;= ~(1 &lt;&lt; a[0]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_addr_test_init(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct dev_addr_test_priv *datp;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_etherdev(sizeof(*datp));</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, !!netdev);</div><div class='add'>+</div><div class='add'>+	test-&gt;priv = netdev;</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;dummy_netdev_ops;</div><div class='add'>+</div><div class='add'>+	err = register_netdev(netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_netdev(netdev);</div><div class='add'>+		KUNIT_FAIL(test, "Can't register netdev %d", err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_exit(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_basic(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	KUNIT_EXPECT_TRUE(test, !!netdev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	memset(addr, 2, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+	KUNIT_EXPECT_MEMEQ(test, netdev-&gt;dev_addr, addr, sizeof(addr));</div><div class='add'>+</div><div class='add'>+	memset(addr, 3, sizeof(addr));</div><div class='add'>+	dev_addr_set(netdev, addr);</div><div class='add'>+	KUNIT_EXPECT_MEMEQ(test, netdev-&gt;dev_addr, addr, sizeof(addr));</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_sync_one(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	struct dev_addr_test_priv *datp;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	datp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	memset(addr, 1, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 2, datp-&gt;addr_seen);</div><div class='add'>+</div><div class='add'>+	memset(addr, 2, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+</div><div class='add'>+	datp-&gt;addr_seen = 0;</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	/* It's not going to sync anything because the main address is</div><div class='add'>+	 * considered synced and we overwrite in place.</div><div class='add'>+	 */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, datp-&gt;addr_seen);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_add_del(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	struct dev_addr_test_priv *datp;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	datp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	for (i = 1; i &lt; 4; i++) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,</div><div class='add'>+						      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	}</div><div class='add'>+	/* Add 3 again */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,</div><div class='add'>+					      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0xf, datp-&gt;addr_seen);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, dev_addr_del(netdev, addr,</div><div class='add'>+					      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0xf, datp-&gt;addr_seen);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; 4; i++) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 0, dev_addr_del(netdev, addr,</div><div class='add'>+						      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, datp-&gt;addr_seen);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_del_main(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	memset(addr, 1, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENOENT, dev_addr_del(netdev, addr,</div><div class='add'>+						    NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,</div><div class='add'>+					      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, dev_addr_del(netdev, addr,</div><div class='add'>+					      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENOENT, dev_addr_del(netdev, addr,</div><div class='add'>+						    NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_add_set(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	struct dev_addr_test_priv *datp;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	datp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	/* There is no external API like dev_addr_add_excl(),</div><div class='add'>+	 * so shuffle the tree a little bit and exploit aliasing.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1; i &lt; 16; i++) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,</div><div class='add'>+						      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(addr, i, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,</div><div class='add'>+					      NETDEV_HW_ADDR_T_LAN));</div><div class='add'>+	memset(addr, 0, sizeof(addr));</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='add'>+</div><div class='add'>+	__hw_addr_sync_dev(&amp;netdev-&gt;dev_addrs, netdev, dev_addr_test_sync,</div><div class='add'>+			   dev_addr_test_unsync);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0xffff, datp-&gt;addr_seen);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dev_addr_test_add_excl(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = test-&gt;priv;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 0, dev_uc_add_excl(netdev, addr));</div><div class='add'>+	}</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -EEXIST, dev_uc_add_excl(netdev, addr));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 0, dev_uc_del(netdev, addr));</div><div class='add'>+	}</div><div class='add'>+	for (i = 1; i &lt; 10; i += 2) {</div><div class='add'>+		memset(addr, i, sizeof(addr));</div><div class='add'>+		KUNIT_EXPECT_EQ(test, -EEXIST, dev_uc_add_excl(netdev, addr));</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case dev_addr_test_cases[] = {</div><div class='add'>+	KUNIT_CASE(dev_addr_test_basic),</div><div class='add'>+	KUNIT_CASE(dev_addr_test_sync_one),</div><div class='add'>+	KUNIT_CASE(dev_addr_test_add_del),</div><div class='add'>+	KUNIT_CASE(dev_addr_test_del_main),</div><div class='add'>+	KUNIT_CASE(dev_addr_test_add_set),</div><div class='add'>+	KUNIT_CASE(dev_addr_test_add_excl),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite dev_addr_test_suite = {</div><div class='add'>+	.name = "dev-addr-list-test",</div><div class='add'>+	.test_cases = dev_addr_test_cases,</div><div class='add'>+	.init = dev_addr_test_init,</div><div class='add'>+	.exit = dev_addr_test_exit,</div><div class='add'>+};</div><div class='add'>+kunit_test_suite(dev_addr_test_suite);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for struct netdev_hw_addr_list");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/core/dev_api.c b/net/core/dev_api.c<br/>new file mode 100644<br/>index 000000000000..f28852078aa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev_api.c</a></div><div class='hunk'>@@ -0,0 +1,382 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_name() - change name of a device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @newname: name (or format string) must be at least IFNAMSIZ</div><div class='add'>+ *</div><div class='add'>+ * Change name of a device, can pass format strings "eth%d".</div><div class='add'>+ * for wildcarding.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_name(struct net_device *dev, const char *newname)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_change_name(dev, newname);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_alias() - change ifalias of a device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @alias: name up to IFALIASZ</div><div class='add'>+ * @len: limit of bytes to copy from info</div><div class='add'>+ *</div><div class='add'>+ * Set ifalias for a device.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_set_alias(struct net_device *dev, const char *alias, size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_alias(dev, alias, len);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_alias);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_flags() - change device settings</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @flags: device state flags</div><div class='add'>+ * @extack: netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Change settings on device based state flags. The flags are</div><div class='add'>+ * in the userspace exported format.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_flags(struct net_device *dev, unsigned int flags,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_change_flags(dev, flags, extack);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_change_flags);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_group() - change group this device belongs to</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @new_group: group this device should belong to</div><div class='add'>+ */</div><div class='add'>+void dev_set_group(struct net_device *dev, int new_group)</div><div class='add'>+{</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	netif_set_group(dev, new_group);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dev_set_mac_address_user(struct net_device *dev,</div><div class='add'>+			     struct sockaddr_storage *ss,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;dev_addr_sem);</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_mac_address(dev, ss, extack);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	up_write(&amp;dev_addr_sem);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_mac_address_user);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_net_namespace() - move device to different nethost namespace</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @net: network namespace</div><div class='add'>+ * @pat: If not NULL name pattern to try if the current device name</div><div class='add'>+ *       is already taken in the destination network namespace.</div><div class='add'>+ *</div><div class='add'>+ * This function shuts down a device interface and moves it</div><div class='add'>+ * to a new network namespace. On success 0 is returned, on</div><div class='add'>+ * a failure a netagive errno code is returned.</div><div class='add'>+ *</div><div class='add'>+ * Callers must hold the rtnl semaphore.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_net_namespace(struct net_device *dev, struct net *net,</div><div class='add'>+			     const char *pat)</div><div class='add'>+{</div><div class='add'>+	return __dev_change_net_namespace(dev, net, pat, 0, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_change_net_namespace);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_carrier() - change device carrier</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @new_carrier: new value</div><div class='add'>+ *</div><div class='add'>+ * Change device carrier</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_change_carrier(dev, new_carrier);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_tx_queue_len() - change TX queue length of a netdevice</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @new_len: new tx queue length</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_change_tx_queue_len(dev, new_len);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_change_proto_down() - set carrier according to proto_down</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @proto_down: new value</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_change_proto_down(struct net_device *dev, bool proto_down)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_change_proto_down(dev, proto_down);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_open() - prepare an interface for use</div><div class='add'>+ * @dev: device to open</div><div class='add'>+ * @extack: netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Takes a device from down to up state. The device's private open</div><div class='add'>+ * function is invoked and then the multicast lists are loaded. Finally</div><div class='add'>+ * the device is moved into the up state and a %NETDEV_UP message is</div><div class='add'>+ * sent to the netdev notifier chain.</div><div class='add'>+ *</div><div class='add'>+ * Calling this function on an active interface is a nop. On a failure</div><div class='add'>+ * a negative errno code is returned.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_open(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_open(dev, extack);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_open);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_close() - shutdown an interface</div><div class='add'>+ * @dev: device to shutdown</div><div class='add'>+ *</div><div class='add'>+ * This function moves an active device into down state. A</div><div class='add'>+ * %NETDEV_GOING_DOWN is sent to the netdev notifier chain. The device</div><div class='add'>+ * is then deactivated and finally a %NETDEV_DOWN is sent to the notifier</div><div class='add'>+ * chain.</div><div class='add'>+ */</div><div class='add'>+void dev_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	netif_close(dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_close);</div><div class='add'>+</div><div class='add'>+int dev_eth_ioctl(struct net_device *dev,</div><div class='add'>+		  struct ifreq *ifr, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_eth_ioctl)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	if (netif_device_present(dev))</div><div class='add'>+		ret = ops-&gt;ndo_eth_ioctl(dev, ifr, cmd);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_eth_ioctl);</div><div class='add'>+</div><div class='add'>+int dev_set_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_mtu(dev, new_mtu);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_mtu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_disable_lro() - disable Large Receive Offload on a device</div><div class='add'>+ * @dev: device</div><div class='add'>+ *</div><div class='add'>+ * Disable Large Receive Offload (LRO) on a net device.  Must be</div><div class='add'>+ * called under RTNL.  This is needed if received packets may be</div><div class='add'>+ * forwarded to another interface.</div><div class='add'>+ */</div><div class='add'>+void dev_disable_lro(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	netif_disable_lro(dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_disable_lro);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_promiscuity() - update promiscuity count on a device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @inc: modifier</div><div class='add'>+ *</div><div class='add'>+ * Add or remove promiscuity from a device. While the count in the device</div><div class='add'>+ * remains above zero the interface remains promiscuous. Once it hits zero</div><div class='add'>+ * the device reverts back to normal filtering operation. A negative inc</div><div class='add'>+ * value is used to drop promiscuity on the device.</div><div class='add'>+ * Return 0 if successful or a negative errno code on error.</div><div class='add'>+ */</div><div class='add'>+int dev_set_promiscuity(struct net_device *dev, int inc)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_promiscuity(dev, inc);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_promiscuity);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_allmulti() - update allmulti count on a device</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @inc: modifier</div><div class='add'>+ *</div><div class='add'>+ * Add or remove reception of all multicast frames to a device. While the</div><div class='add'>+ * count in the device remains above zero the interface remains listening</div><div class='add'>+ * to all interfaces. Once it hits zero the device reverts back to normal</div><div class='add'>+ * filtering operation. A negative @inc value is used to drop the counter</div><div class='add'>+ * when releasing a resource needing all multicasts.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int dev_set_allmulti(struct net_device *dev, int inc)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_allmulti(dev, inc, true);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_allmulti);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_mac_address() - change Media Access Control Address</div><div class='add'>+ * @dev: device</div><div class='add'>+ * @ss: new address</div><div class='add'>+ * @extack: netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Change the hardware (MAC) address of the device</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_set_mac_address(dev, ss, extack);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_mac_address);</div><div class='add'>+</div><div class='add'>+int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = netif_xdp_propagate(dev, bpf);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_xdp_propagate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_state_change() - device changes state</div><div class='add'>+ * @dev: device to cause notification</div><div class='add'>+ *</div><div class='add'>+ * Called to indicate a device has changed state. This function calls</div><div class='add'>+ * the notifier chains for netdev_chain and sends a NEWLINK message</div><div class='add'>+ * to the routing socket.</div><div class='add'>+ */</div><div class='add'>+void netdev_state_change(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	netif_state_change(dev);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_state_change);</div><div class='add'>+</div><div class='add'>+int dev_set_threaded(struct net_device *dev,</div><div class='add'>+		     enum netdev_napi_threaded threaded)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	ret = netif_set_threaded(dev, threaded);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_set_threaded);</div><div class='head'>diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c<br/>index 90e8aa36881e..53a53357cfef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/dev_ioctl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dev_ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dev_ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dev_ioctl.c</a></div><div class='hunk'>@@ -1,12 +1,20 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/phylib_stubs.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;net/dsa_stubs.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/wext.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Map an interface index to its name (SIOCGIFNAME)</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,79 +32,108 @@ static int dev_ifname(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 	return netdev_get_name(net, ifr-&gt;ifr_name, ifr-&gt;ifr_ifindex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static gifconf_func_t *gifconf_list[NPROTO];</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	register_gifconf	-	register a SIOCGIF handler</div><div class='del'>- *	@family: Address family</div><div class='del'>- *	@gifconf: Function handler</div><div class='del'>- *</div><div class='del'>- *	Register protocol dependent address dumping routines. The handler</div><div class='del'>- *	that is passed must not be freed or reused until it has been replaced</div><div class='del'>- *	by another handler.</div><div class='del'>- */</div><div class='del'>-int register_gifconf(unsigned int family, gifconf_func_t *gifconf)</div><div class='del'>-{</div><div class='del'>-	if (family &gt;= NPROTO)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	gifconf_list[family] = gifconf;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(register_gifconf);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Perform a SIOCGIFCONF call. This structure will change</div><div class='ctx'>  *	size eventually, and there is nothing I can do about it.</div><div class='ctx'>  *	Thus we will need a 'compatibility mode'.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-int dev_ifconf(struct net *net, struct ifconf *ifc, int size)</div><div class='add'>+int dev_ifconf(struct net *net, struct ifconf __user *uifc)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	char __user *pos;</div><div class='del'>-	int len;</div><div class='del'>-	int total;</div><div class='del'>-	int i;</div><div class='add'>+	void __user *pos;</div><div class='add'>+	size_t size;</div><div class='add'>+	int len, total = 0, done;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Fetch the caller's info block.</div><div class='del'>-	 */</div><div class='add'>+	/* both the ifconf and the ifreq structures are slightly different */</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct compat_ifconf ifc32;</div><div class='ctx'> </div><div class='del'>-	pos = ifc-&gt;ifc_buf;</div><div class='del'>-	len = ifc-&gt;ifc_len;</div><div class='add'>+		if (copy_from_user(&amp;ifc32, uifc, sizeof(struct compat_ifconf)))</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Loop over the interfaces, and write an info block for each.</div><div class='del'>-	 */</div><div class='add'>+		pos = compat_ptr(ifc32.ifcbuf);</div><div class='add'>+		len = ifc32.ifc_len;</div><div class='add'>+		size = sizeof(struct compat_ifreq);</div><div class='add'>+	} else {</div><div class='add'>+		struct ifconf ifc;</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(&amp;ifc, uifc, sizeof(struct ifconf)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		pos = ifc.ifc_buf;</div><div class='add'>+		len = ifc.ifc_len;</div><div class='add'>+		size = sizeof(struct ifreq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	total = 0;</div><div class='add'>+	/* Loop over the interfaces, and write an info block for each. */</div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> 	for_each_netdev(net, dev) {</div><div class='del'>-		for (i = 0; i &lt; NPROTO; i++) {</div><div class='del'>-			if (gifconf_list[i]) {</div><div class='del'>-				int done;</div><div class='del'>-				if (!pos)</div><div class='del'>-					done = gifconf_list[i](dev, NULL, 0, size);</div><div class='del'>-				else</div><div class='del'>-					done = gifconf_list[i](dev, pos + total,</div><div class='del'>-							       len - total, size);</div><div class='del'>-				if (done &lt; 0)</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				total += done;</div><div class='del'>-			}</div><div class='add'>+		if (!pos)</div><div class='add'>+			done = inet_gifconf(dev, NULL, 0, size);</div><div class='add'>+		else</div><div class='add'>+			done = inet_gifconf(dev, pos + total,</div><div class='add'>+					    len - total, size);</div><div class='add'>+		if (done &lt; 0) {</div><div class='add'>+			rtnl_net_unlock(net);</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='add'>+		total += done;</div><div class='ctx'> 	}</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	All done.  Write the updated control block back to the caller.</div><div class='del'>-	 */</div><div class='del'>-	ifc-&gt;ifc_len = total;</div><div class='add'>+	return put_user(total, &amp;uifc-&gt;ifc_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_getifmap(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+{</div><div class='add'>+	struct ifmap *ifmap = &amp;ifr-&gt;ifr_map;</div><div class='add'>+</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct compat_ifmap *cifmap = (struct compat_ifmap *)ifmap;</div><div class='add'>+</div><div class='add'>+		cifmap-&gt;mem_start = dev-&gt;mem_start;</div><div class='add'>+		cifmap-&gt;mem_end   = dev-&gt;mem_end;</div><div class='add'>+		cifmap-&gt;base_addr = dev-&gt;base_addr;</div><div class='add'>+		cifmap-&gt;irq       = dev-&gt;irq;</div><div class='add'>+		cifmap-&gt;dma       = dev-&gt;dma;</div><div class='add'>+		cifmap-&gt;port      = dev-&gt;if_port;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ifmap-&gt;mem_start  = dev-&gt;mem_start;</div><div class='add'>+	ifmap-&gt;mem_end    = dev-&gt;mem_end;</div><div class='add'>+	ifmap-&gt;base_addr  = dev-&gt;base_addr;</div><div class='add'>+	ifmap-&gt;irq        = dev-&gt;irq;</div><div class='add'>+	ifmap-&gt;dma        = dev-&gt;dma;</div><div class='add'>+	ifmap-&gt;port       = dev-&gt;if_port;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * 	Both BSD and Solaris return 0 here, so we do too.</div><div class='del'>-	 */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int netif_setifmap(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+{</div><div class='add'>+	struct compat_ifmap *cifmap = (struct compat_ifmap *)&amp;ifr-&gt;ifr_map;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_set_config)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct ifmap ifmap = {</div><div class='add'>+			.mem_start  = cifmap-&gt;mem_start,</div><div class='add'>+			.mem_end    = cifmap-&gt;mem_end,</div><div class='add'>+			.base_addr  = cifmap-&gt;base_addr,</div><div class='add'>+			.irq        = cifmap-&gt;irq,</div><div class='add'>+			.dma        = cifmap-&gt;dma,</div><div class='add'>+			.port       = cifmap-&gt;port,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		return dev-&gt;netdev_ops-&gt;ndo_set_config(dev, &amp;ifmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_set_config(dev, &amp;ifr-&gt;ifr_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Perform the SIOCxIFxxx calls, inside rcu_read_lock()</div><div class='ctx'>  */</div><div class='hunk'>@@ -110,7 +147,7 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGIFFLAGS:	/* Get interface flags */</div><div class='del'>-		ifr-&gt;ifr_flags = (short) dev_get_flags(dev);</div><div class='add'>+		ifr-&gt;ifr_flags = (short)netif_get_flags(dev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCGIFMETRIC:	/* Get the metric on the interface</div><div class='hunk'>@@ -122,29 +159,12 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm</div><div class='ctx'> 		ifr-&gt;ifr_mtu = dev-&gt;mtu;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	case SIOCGIFHWADDR:</div><div class='del'>-		if (!dev-&gt;addr_len)</div><div class='del'>-			memset(ifr-&gt;ifr_hwaddr.sa_data, 0,</div><div class='del'>-			       sizeof(ifr-&gt;ifr_hwaddr.sa_data));</div><div class='del'>-		else</div><div class='del'>-			memcpy(ifr-&gt;ifr_hwaddr.sa_data, dev-&gt;dev_addr,</div><div class='del'>-			       min(sizeof(ifr-&gt;ifr_hwaddr.sa_data),</div><div class='del'>-				   (size_t)dev-&gt;addr_len));</div><div class='del'>-		ifr-&gt;ifr_hwaddr.sa_family = dev-&gt;type;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	case SIOCGIFSLAVE:</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCGIFMAP:</div><div class='del'>-		ifr-&gt;ifr_map.mem_start = dev-&gt;mem_start;</div><div class='del'>-		ifr-&gt;ifr_map.mem_end   = dev-&gt;mem_end;</div><div class='del'>-		ifr-&gt;ifr_map.base_addr = dev-&gt;base_addr;</div><div class='del'>-		ifr-&gt;ifr_map.irq       = dev-&gt;irq;</div><div class='del'>-		ifr-&gt;ifr_map.dma       = dev-&gt;dma;</div><div class='del'>-		ifr-&gt;ifr_map.port      = dev-&gt;if_port;</div><div class='del'>-		return 0;</div><div class='add'>+		return dev_getifmap(dev, ifr);</div><div class='ctx'> </div><div class='ctx'> 	case SIOCGIFINDEX:</div><div class='ctx'> 		ifr-&gt;ifr_ifindex = dev-&gt;ifindex;</div><div class='hunk'>@@ -166,29 +186,29 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int net_hwtstamp_validate(struct ifreq *ifr)</div><div class='add'>+int net_hwtstamp_validate(const struct kernel_hwtstamp_config *cfg)</div><div class='ctx'> {</div><div class='del'>-	struct hwtstamp_config cfg;</div><div class='ctx'> 	enum hwtstamp_tx_types tx_type;</div><div class='ctx'> 	enum hwtstamp_rx_filters rx_filter;</div><div class='ctx'> 	int tx_type_valid = 0;</div><div class='ctx'> 	int rx_filter_valid = 0;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;cfg, ifr-&gt;ifr_data, sizeof(cfg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (cfg.flags) /* reserved for future extensions */</div><div class='add'>+	if (cfg-&gt;flags &amp; ~HWTSTAMP_FLAG_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tx_type = cfg.tx_type;</div><div class='del'>-	rx_filter = cfg.rx_filter;</div><div class='add'>+	tx_type = cfg-&gt;tx_type;</div><div class='add'>+	rx_filter = cfg-&gt;rx_filter;</div><div class='ctx'> </div><div class='ctx'> 	switch (tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 	case HWTSTAMP_TX_ONESTEP_SYNC:</div><div class='add'>+	case HWTSTAMP_TX_ONESTEP_P2P:</div><div class='ctx'> 		tx_type_valid = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case __HWTSTAMP_TX_CNT:</div><div class='add'>+		/* not a real value */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (rx_filter) {</div><div class='hunk'>@@ -210,6 +230,9 @@ static int net_hwtstamp_validate(struct ifreq *ifr)</div><div class='ctx'> 	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='ctx'> 		rx_filter_valid = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case __HWTSTAMP_FILTER_CNT:</div><div class='add'>+		/* not a real value */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tx_type_valid || !rx_filter_valid)</div><div class='hunk'>@@ -218,10 +241,333 @@ static int net_hwtstamp_validate(struct ifreq *ifr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_get_hwtstamp_phylib() - Get hardware timestamping settings of NIC</div><div class='add'>+ *	or of attached phylib PHY</div><div class='add'>+ * @dev: Network device</div><div class='add'>+ * @cfg: Timestamping configuration structure</div><div class='add'>+ *</div><div class='add'>+ * Helper for calling the default hardware provider timestamping.</div><div class='add'>+ *</div><div class='add'>+ * Note: phy_mii_ioctl() only handles SIOCSHWTSTAMP (not SIOCGHWTSTAMP), but</div><div class='add'>+ * phydev-&gt;mii_ts has both hwtstamp_get() and hwtstamp_set() methods. So this</div><div class='add'>+ * will return -EOPNOTSUPP for phylib only if hwtstamp_get() is not</div><div class='add'>+ * implemented for now, which is still more accurate than letting the netdev</div><div class='add'>+ * handle the GET request.</div><div class='add'>+ */</div><div class='add'>+int dev_get_hwtstamp_phylib(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+</div><div class='add'>+	hwprov = rtnl_dereference(dev-&gt;hwprov);</div><div class='add'>+	if (hwprov) {</div><div class='add'>+		cfg-&gt;qualifier = hwprov-&gt;desc.qualifier;</div><div class='add'>+		if (hwprov-&gt;source == HWTSTAMP_SOURCE_PHYLIB &amp;&amp;</div><div class='add'>+		    hwprov-&gt;phydev)</div><div class='add'>+			return phy_hwtstamp_get(hwprov-&gt;phydev, cfg);</div><div class='add'>+</div><div class='add'>+		if (hwprov-&gt;source == HWTSTAMP_SOURCE_NETDEV)</div><div class='add'>+			return dev-&gt;netdev_ops-&gt;ndo_hwtstamp_get(dev, cfg);</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_is_default_hwtstamp(dev-&gt;phydev))</div><div class='add'>+		return phy_hwtstamp_get(dev-&gt;phydev, cfg);</div><div class='add'>+</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_hwtstamp_get(dev, cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	struct kernel_hwtstamp_config kernel_cfg = {};</div><div class='add'>+	struct hwtstamp_config cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_hwtstamp_get)</div><div class='add'>+		return dev_eth_ioctl(dev, ifr, SIOCGHWTSTAMP); /* legacy */</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	kernel_cfg.ifr = ifr;</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	err = dev_get_hwtstamp_phylib(dev, &amp;kernel_cfg);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If the request was resolved through an unconverted driver, omit</div><div class='add'>+	 * the copy_to_user(), since the implementation has already done that</div><div class='add'>+	 */</div><div class='add'>+	if (!kernel_cfg.copied_to_user) {</div><div class='add'>+		hwtstamp_config_from_kernel(&amp;cfg, &amp;kernel_cfg);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(ifr-&gt;ifr_data, &amp;cfg, sizeof(cfg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_hwtstamp_phylib() - Change hardware timestamping of NIC</div><div class='add'>+ *	or of attached phylib PHY</div><div class='add'>+ * @dev: Network device</div><div class='add'>+ * @cfg: Timestamping configuration structure</div><div class='add'>+ * @extack: Netlink extended ack message structure, for error reporting</div><div class='add'>+ *</div><div class='add'>+ * Helper for enforcing a common policy that phylib timestamping, if available,</div><div class='add'>+ * should take precedence in front of hardware timestamping provided by the</div><div class='add'>+ * netdev. If the netdev driver needs to perform specific actions even for PHY</div><div class='add'>+ * timestamping to work properly (a switch port must trap the timestamped</div><div class='add'>+ * frames and not forward them), it must set dev-&gt;see_all_hwtstamp_requests.</div><div class='add'>+ */</div><div class='add'>+int dev_set_hwtstamp_phylib(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	struct kernel_hwtstamp_config old_cfg = {};</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	bool phy_ts;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hwprov = rtnl_dereference(dev-&gt;hwprov);</div><div class='add'>+	if (hwprov) {</div><div class='add'>+		if (hwprov-&gt;source == HWTSTAMP_SOURCE_PHYLIB &amp;&amp;</div><div class='add'>+		    hwprov-&gt;phydev) {</div><div class='add'>+			phy_ts = true;</div><div class='add'>+			phydev = hwprov-&gt;phydev;</div><div class='add'>+		} else if (hwprov-&gt;source == HWTSTAMP_SOURCE_NETDEV) {</div><div class='add'>+			phy_ts = false;</div><div class='add'>+		} else {</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfg-&gt;qualifier = hwprov-&gt;desc.qualifier;</div><div class='add'>+	} else {</div><div class='add'>+		phy_ts = phy_is_default_hwtstamp(dev-&gt;phydev);</div><div class='add'>+		if (phy_ts)</div><div class='add'>+			phydev = dev-&gt;phydev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg-&gt;source = phy_ts ? HWTSTAMP_SOURCE_PHYLIB : HWTSTAMP_SOURCE_NETDEV;</div><div class='add'>+</div><div class='add'>+	if (phy_ts &amp;&amp; dev-&gt;see_all_hwtstamp_requests) {</div><div class='add'>+		err = ops-&gt;ndo_hwtstamp_get(dev, &amp;old_cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phy_ts || dev-&gt;see_all_hwtstamp_requests) {</div><div class='add'>+		err = ops-&gt;ndo_hwtstamp_set(dev, cfg, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (extack-&gt;_msg)</div><div class='add'>+				netdev_err(dev, "%s\n", extack-&gt;_msg);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_ts &amp;&amp; dev-&gt;see_all_hwtstamp_requests)</div><div class='add'>+		changed = kernel_hwtstamp_config_changed(&amp;old_cfg, cfg);</div><div class='add'>+</div><div class='add'>+	if (phy_ts) {</div><div class='add'>+		err = phy_hwtstamp_set(phydev, cfg, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (changed)</div><div class='add'>+				ops-&gt;ndo_hwtstamp_set(dev, &amp;old_cfg, NULL);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	struct kernel_hwtstamp_config kernel_cfg = {};</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	struct hwtstamp_config cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;cfg, ifr-&gt;ifr_data, sizeof(cfg)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	hwtstamp_config_to_kernel(&amp;kernel_cfg, &amp;cfg);</div><div class='add'>+	kernel_cfg.ifr = ifr;</div><div class='add'>+</div><div class='add'>+	err = net_hwtstamp_validate(&amp;kernel_cfg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_conduit_hwtstamp_validate(dev, &amp;kernel_cfg, &amp;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_hwtstamp_set)</div><div class='add'>+		return dev_eth_ioctl(dev, ifr, SIOCSHWTSTAMP); /* legacy */</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	err = dev_set_hwtstamp_phylib(dev, &amp;kernel_cfg, &amp;extack);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* The driver may have modified the configuration, so copy the</div><div class='add'>+	 * updated version of it back to user space</div><div class='add'>+	 */</div><div class='add'>+	if (!kernel_cfg.copied_to_user) {</div><div class='add'>+		hwtstamp_config_from_kernel(&amp;cfg, &amp;kernel_cfg);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(ifr-&gt;ifr_data, &amp;cfg, sizeof(cfg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_hwtstamp_ioctl_lower(struct net_device *dev, int cmd,</div><div class='add'>+					struct kernel_hwtstamp_config *kernel_cfg)</div><div class='add'>+{</div><div class='add'>+	struct ifreq ifrr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!kernel_cfg-&gt;ifr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strscpy_pad(ifrr.ifr_name, dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	ifrr.ifr_ifru = kernel_cfg-&gt;ifr-&gt;ifr_ifru;</div><div class='add'>+</div><div class='add'>+	err = dev_eth_ioctl(dev, &amp;ifrr, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	kernel_cfg-&gt;ifr-&gt;ifr_ifru = ifrr.ifr_ifru;</div><div class='add'>+	kernel_cfg-&gt;copied_to_user = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int generic_hwtstamp_get_lower(struct net_device *dev,</div><div class='add'>+			       struct kernel_hwtstamp_config *kernel_cfg)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_hwtstamp_get) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = dev_get_hwtstamp_phylib(dev, kernel_cfg);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Legacy path: unconverted lower driver */</div><div class='add'>+	return generic_hwtstamp_ioctl_lower(dev, SIOCGHWTSTAMP, kernel_cfg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(generic_hwtstamp_get_lower);</div><div class='add'>+</div><div class='add'>+int generic_hwtstamp_set_lower(struct net_device *dev,</div><div class='add'>+			       struct kernel_hwtstamp_config *kernel_cfg,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_hwtstamp_set) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = dev_set_hwtstamp_phylib(dev, kernel_cfg, extack);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Legacy path: unconverted lower driver */</div><div class='add'>+	return generic_hwtstamp_ioctl_lower(dev, SIOCSHWTSTAMP, kernel_cfg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(generic_hwtstamp_set_lower);</div><div class='add'>+</div><div class='add'>+static int dev_siocbond(struct net_device *dev,</div><div class='add'>+			struct ifreq *ifr, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_siocbond) {</div><div class='add'>+		int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		if (netif_device_present(dev))</div><div class='add'>+			ret = ops-&gt;ndo_siocbond(dev, ifr, cmd);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+			      void __user *data, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_siocdevprivate) {</div><div class='add'>+		int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		if (netif_device_present(dev))</div><div class='add'>+			ret = ops-&gt;ndo_siocdevprivate(dev, ifr, data, cmd);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_siocwandev(struct net_device *dev, struct if_settings *ifs)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;ndo_siocwandev) {</div><div class='add'>+		int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		if (netif_device_present(dev))</div><div class='add'>+			ret = ops-&gt;ndo_siocwandev(dev, ifs);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- *	Perform the SIOCxIFxxx calls, inside rtnl_lock()</div><div class='add'>+ *	Perform the SIOCxIFxxx calls, inside rtnl_net_lock()</div><div class='ctx'>  */</div><div class='del'>-static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='add'>+static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data,</div><div class='add'>+		      unsigned int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct net_device *dev = __dev_get_by_name(net, ifr-&gt;ifr_name);</div><div class='hunk'>@@ -234,7 +580,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSIFFLAGS:	/* Set interface flags */</div><div class='del'>-		return dev_change_flags(dev, ifr-&gt;ifr_flags);</div><div class='add'>+		return dev_change_flags(dev, ifr-&gt;ifr_flags, NULL);</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFMETRIC:	/* Set the metric on the interface</div><div class='ctx'> 				   (currently unused) */</div><div class='hunk'>@@ -244,9 +590,11 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> 		return dev_set_mtu(dev, ifr-&gt;ifr_mtu);</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFHWADDR:</div><div class='del'>-		if (dev-&gt;addr_len &gt; sizeof(struct sockaddr))</div><div class='add'>+		if (dev-&gt;addr_len &gt; sizeof(ifr-&gt;ifr_hwaddr))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		return dev_set_mac_address(dev, &amp;ifr-&gt;ifr_hwaddr);</div><div class='add'>+		return dev_set_mac_address_user(dev,</div><div class='add'>+						(struct sockaddr_storage *)&amp;ifr-&gt;ifr_hwaddr,</div><div class='add'>+						NULL);</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFHWBROADCAST:</div><div class='ctx'> 		if (ifr-&gt;ifr_hwaddr.sa_family != dev-&gt;type)</div><div class='hunk'>@@ -254,16 +602,16 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> 		memcpy(dev-&gt;broadcast, ifr-&gt;ifr_hwaddr.sa_data,</div><div class='ctx'> 		       min(sizeof(ifr-&gt;ifr_hwaddr.sa_data),</div><div class='ctx'> 			   (size_t)dev-&gt;addr_len));</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFMAP:</div><div class='del'>-		if (ops-&gt;ndo_set_config) {</div><div class='del'>-			if (!netif_device_present(dev))</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			return ops-&gt;ndo_set_config(dev, &amp;ifr-&gt;ifr_map);</div><div class='del'>-		}</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = netif_setifmap(dev, ifr);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCADDMULTI:</div><div class='ctx'> 		if (!ops-&gt;ndo_set_rx_mode ||</div><div class='hunk'>@@ -271,7 +619,10 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (!netif_device_present(dev))</div><div class='ctx'> 			return -ENODEV;</div><div class='del'>-		return dev_mc_add_global(dev, ifr-&gt;ifr_hwaddr.sa_data);</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = dev_mc_add_global(dev, ifr-&gt;ifr_hwaddr.sa_data);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCDELMULTI:</div><div class='ctx'> 		if (!ops-&gt;ndo_set_rx_mode ||</div><div class='hunk'>@@ -279,7 +630,10 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (!netif_device_present(dev))</div><div class='ctx'> 			return -ENODEV;</div><div class='del'>-		return dev_mc_del_global(dev, ifr-&gt;ifr_hwaddr.sa_data);</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = dev_mc_del_global(dev, ifr-&gt;ifr_hwaddr.sa_data);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFTXQLEN:</div><div class='ctx'> 		if (ifr-&gt;ifr_qlen &lt; 0)</div><div class='hunk'>@@ -290,42 +644,34 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)</div><div class='ctx'> 		ifr-&gt;ifr_newname[IFNAMSIZ-1] = '\0';</div><div class='ctx'> 		return dev_change_name(dev, ifr-&gt;ifr_newname);</div><div class='ctx'> </div><div class='add'>+	case SIOCWANDEV:</div><div class='add'>+		return dev_siocwandev(dev, &amp;ifr-&gt;ifr_settings);</div><div class='add'>+</div><div class='add'>+	case SIOCDEVPRIVATE ... SIOCDEVPRIVATE + 15:</div><div class='add'>+		return dev_siocdevprivate(dev, ifr, data, cmd);</div><div class='add'>+</div><div class='ctx'> 	case SIOCSHWTSTAMP:</div><div class='del'>-		err = net_hwtstamp_validate(ifr);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		/* fall through */</div><div class='add'>+		return dev_set_hwtstamp(dev, ifr);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Unknown or private ioctl</div><div class='del'>-	 */</div><div class='del'>-	default:</div><div class='del'>-		if ((cmd &gt;= SIOCDEVPRIVATE &amp;&amp;</div><div class='del'>-		    cmd &lt;= SIOCDEVPRIVATE + 15) ||</div><div class='del'>-		    cmd == SIOCBONDENSLAVE ||</div><div class='del'>-		    cmd == SIOCBONDRELEASE ||</div><div class='del'>-		    cmd == SIOCBONDSETHWADDR ||</div><div class='del'>-		    cmd == SIOCBONDSLAVEINFOQUERY ||</div><div class='del'>-		    cmd == SIOCBONDINFOQUERY ||</div><div class='del'>-		    cmd == SIOCBONDCHANGEACTIVE ||</div><div class='del'>-		    cmd == SIOCGMIIPHY ||</div><div class='del'>-		    cmd == SIOCGMIIREG ||</div><div class='del'>-		    cmd == SIOCSMIIREG ||</div><div class='del'>-		    cmd == SIOCBRADDIF ||</div><div class='del'>-		    cmd == SIOCBRDELIF ||</div><div class='del'>-		    cmd == SIOCSHWTSTAMP ||</div><div class='del'>-		    cmd == SIOCGHWTSTAMP ||</div><div class='del'>-		    cmd == SIOCWANDEV) {</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			if (ops-&gt;ndo_do_ioctl) {</div><div class='del'>-				if (netif_device_present(dev))</div><div class='del'>-					err = ops-&gt;ndo_do_ioctl(dev, ifr, cmd);</div><div class='del'>-				else</div><div class='del'>-					err = -ENODEV;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+	case SIOCGHWTSTAMP:</div><div class='add'>+		return dev_get_hwtstamp(dev, ifr);</div><div class='add'>+</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		return dev_eth_ioctl(dev, ifr, cmd);</div><div class='add'>+</div><div class='add'>+	case SIOCBONDENSLAVE:</div><div class='add'>+	case SIOCBONDRELEASE:</div><div class='add'>+	case SIOCBONDSETHWADDR:</div><div class='add'>+	case SIOCBONDSLAVEINFOQUERY:</div><div class='add'>+	case SIOCBONDINFOQUERY:</div><div class='add'>+	case SIOCBONDCHANGEACTIVE:</div><div class='add'>+		return dev_siocbond(dev, ifr, cmd);</div><div class='ctx'> </div><div class='add'>+	/* Unknown ioctl */</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -366,7 +712,9 @@ EXPORT_SYMBOL(dev_load);</div><div class='ctx'>  *	dev_ioctl	-	network device ioctl</div><div class='ctx'>  *	@net: the applicable net namespace</div><div class='ctx'>  *	@cmd: command to issue</div><div class='del'>- *	@arg: pointer to a struct ifreq in user space</div><div class='add'>+ *	@ifr: pointer to a struct ifreq in user space</div><div class='add'>+ *	@data: data exchanged with userspace</div><div class='add'>+ *	@need_copyout: whether or not copy_to_user() should be called</div><div class='ctx'>  *</div><div class='ctx'>  *	Issue ioctl functions to devices. This is normally called by the</div><div class='ctx'>  *	user space syscall interfaces but can sometimes be useful for</div><div class='hunk'>@@ -374,7 +722,8 @@ EXPORT_SYMBOL(dev_load);</div><div class='ctx'>  *	positive or a negative errno code on error.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_copyout)</div><div class='add'>+int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr,</div><div class='add'>+	      void __user *data, bool *need_copyout)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char *colon;</div><div class='hunk'>@@ -395,6 +744,13 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case SIOCGIFHWADDR:</div><div class='add'>+		dev_load(net, ifr-&gt;ifr_name);</div><div class='add'>+		ret = netif_get_mac_address(&amp;ifr-&gt;ifr_hwaddr, net,</div><div class='add'>+					    ifr-&gt;ifr_name);</div><div class='add'>+		if (colon)</div><div class='add'>+			*colon = ':';</div><div class='add'>+		return ret;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	These ioctl calls:</div><div class='ctx'> 	 *	- can be done by all.</div><div class='hunk'>@@ -404,7 +760,6 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 	case SIOCGIFFLAGS:</div><div class='ctx'> 	case SIOCGIFMETRIC:</div><div class='ctx'> 	case SIOCGIFMTU:</div><div class='del'>-	case SIOCGIFHWADDR:</div><div class='ctx'> 	case SIOCGIFSLAVE:</div><div class='ctx'> 	case SIOCGIFMAP:</div><div class='ctx'> 	case SIOCGIFINDEX:</div><div class='hunk'>@@ -419,9 +774,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> </div><div class='ctx'> 	case SIOCETHTOOL:</div><div class='ctx'> 		dev_load(net, ifr-&gt;ifr_name);</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		ret = dev_ethtool(net, ifr);</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		ret = dev_ethtool(net, ifr, data);</div><div class='ctx'> 		if (colon)</div><div class='ctx'> 			*colon = ':';</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -438,9 +791,11 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 		dev_load(net, ifr-&gt;ifr_name);</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		ret = dev_ifsioc(net, ifr, cmd);</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+		ret = dev_ifsioc(net, ifr, data, cmd);</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='add'>+</div><div class='ctx'> 		if (colon)</div><div class='ctx'> 			*colon = ':';</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -455,7 +810,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 	case SIOCSIFTXQLEN:</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	These ioctl calls:</div><div class='ctx'> 	 *	- require local superuser power.</div><div class='hunk'>@@ -475,18 +830,18 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 	case SIOCBONDRELEASE:</div><div class='ctx'> 	case SIOCBONDSETHWADDR:</div><div class='ctx'> 	case SIOCBONDCHANGEACTIVE:</div><div class='del'>-	case SIOCBRADDIF:</div><div class='del'>-	case SIOCBRDELIF:</div><div class='ctx'> 	case SIOCSHWTSTAMP:</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCBONDSLAVEINFOQUERY:</div><div class='ctx'> 	case SIOCBONDINFOQUERY:</div><div class='ctx'> 		dev_load(net, ifr-&gt;ifr_name);</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		ret = dev_ifsioc(net, ifr, cmd);</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+		ret = dev_ifsioc(net, ifr, data, cmd);</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='add'>+</div><div class='ctx'> 		if (need_copyout)</div><div class='ctx'> 			*need_copyout = false;</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -509,9 +864,10 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c</div><div class='ctx'> 		    (cmd &gt;= SIOCDEVPRIVATE &amp;&amp;</div><div class='ctx'> 		     cmd &lt;= SIOCDEVPRIVATE + 15)) {</div><div class='ctx'> 			dev_load(net, ifr-&gt;ifr_name);</div><div class='del'>-			rtnl_lock();</div><div class='del'>-			ret = dev_ifsioc(net, ifr, cmd);</div><div class='del'>-			rtnl_unlock();</div><div class='add'>+</div><div class='add'>+			rtnl_net_lock(net);</div><div class='add'>+			ret = dev_ifsioc(net, ifr, data, cmd);</div><div class='add'>+			rtnl_net_unlock(net);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		return -ENOTTY;</div><div class='head'>diff --git a/net/core/devlink.c b/net/core/devlink.c<br/>deleted file mode 100644<br/>index 6bc42933be4a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/devlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/devlink.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4805 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/core/devlink.c - Network physical/parent device Netlink interface</div><div class='del'>- *</div><div class='del'>- * Heavily inspired by net/wireless/</div><div class='del'>- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='del'>- * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;rdma/ib_verbs.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/genetlink.h&gt;</div><div class='del'>-#include &lt;net/rtnetlink.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/devlink.h&gt;</div><div class='del'>-#define CREATE_TRACE_POINTS</div><div class='del'>-#include &lt;trace/events/devlink.h&gt;</div><div class='del'>-</div><div class='del'>-static struct devlink_dpipe_field devlink_dpipe_fields_ethernet[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "destination mac",</div><div class='del'>-		.id = DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC,</div><div class='del'>-		.bitwidth = 48,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devlink_dpipe_header devlink_dpipe_header_ethernet = {</div><div class='del'>-	.name = "ethernet",</div><div class='del'>-	.id = DEVLINK_DPIPE_HEADER_ETHERNET,</div><div class='del'>-	.fields = devlink_dpipe_fields_ethernet,</div><div class='del'>-	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ethernet),</div><div class='del'>-	.global = true,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(devlink_dpipe_header_ethernet);</div><div class='del'>-</div><div class='del'>-static struct devlink_dpipe_field devlink_dpipe_fields_ipv4[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "destination ip",</div><div class='del'>-		.id = DEVLINK_DPIPE_FIELD_IPV4_DST_IP,</div><div class='del'>-		.bitwidth = 32,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devlink_dpipe_header devlink_dpipe_header_ipv4 = {</div><div class='del'>-	.name = "ipv4",</div><div class='del'>-	.id = DEVLINK_DPIPE_HEADER_IPV4,</div><div class='del'>-	.fields = devlink_dpipe_fields_ipv4,</div><div class='del'>-	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ipv4),</div><div class='del'>-	.global = true,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(devlink_dpipe_header_ipv4);</div><div class='del'>-</div><div class='del'>-static struct devlink_dpipe_field devlink_dpipe_fields_ipv6[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "destination ip",</div><div class='del'>-		.id = DEVLINK_DPIPE_FIELD_IPV6_DST_IP,</div><div class='del'>-		.bitwidth = 128,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devlink_dpipe_header devlink_dpipe_header_ipv6 = {</div><div class='del'>-	.name = "ipv6",</div><div class='del'>-	.id = DEVLINK_DPIPE_HEADER_IPV6,</div><div class='del'>-	.fields = devlink_dpipe_fields_ipv6,</div><div class='del'>-	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ipv6),</div><div class='del'>-	.global = true,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(devlink_dpipe_header_ipv6);</div><div class='del'>-</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwmsg);</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(devlink_list);</div><div class='del'>-</div><div class='del'>-/* devlink_mutex</div><div class='del'>- *</div><div class='del'>- * An overall lock guarding every operation coming from userspace.</div><div class='del'>- * It also guards devlink devices list and it is taken when</div><div class='del'>- * driver registers/unregisters it.</div><div class='del'>- */</div><div class='del'>-static DEFINE_MUTEX(devlink_mutex);</div><div class='del'>-</div><div class='del'>-static struct net *devlink_net(const struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	return read_pnet(&amp;devlink-&gt;_net);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_net_set(struct devlink *devlink, struct net *net)</div><div class='del'>-{</div><div class='del'>-	write_pnet(&amp;devlink-&gt;_net, net);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink *devlink_get_from_attrs(struct net *net,</div><div class='del'>-					      struct nlattr **attrs)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	char *busname;</div><div class='del'>-	char *devname;</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_BUS_NAME] || !attrs[DEVLINK_ATTR_DEV_NAME])</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	busname = nla_data(attrs[DEVLINK_ATTR_BUS_NAME]);</div><div class='del'>-	devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (strcmp(devlink-&gt;dev-&gt;bus-&gt;name, busname) == 0 &amp;&amp;</div><div class='del'>-		    strcmp(dev_name(devlink-&gt;dev), devname) == 0 &amp;&amp;</div><div class='del'>-		    net_eq(devlink_net(devlink), net))</div><div class='del'>-			return devlink;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink *devlink_get_from_info(struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	return devlink_get_from_attrs(genl_info_net(info), info-&gt;attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_port *devlink_port_get_by_index(struct devlink *devlink,</div><div class='del'>-						      int port_index)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(devlink_port, &amp;devlink-&gt;port_list, list) {</div><div class='del'>-		if (devlink_port-&gt;index == port_index)</div><div class='del'>-			return devlink_port;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool devlink_port_index_exists(struct devlink *devlink, int port_index)</div><div class='del'>-{</div><div class='del'>-	return devlink_port_get_by_index(devlink, port_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_port *devlink_port_get_from_attrs(struct devlink *devlink,</div><div class='del'>-							struct nlattr **attrs)</div><div class='del'>-{</div><div class='del'>-	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='del'>-		u32 port_index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='del'>-		struct devlink_port *devlink_port;</div><div class='del'>-</div><div class='del'>-		devlink_port = devlink_port_get_by_index(devlink, port_index);</div><div class='del'>-		if (!devlink_port)</div><div class='del'>-			return ERR_PTR(-ENODEV);</div><div class='del'>-		return devlink_port;</div><div class='del'>-	}</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_port *devlink_port_get_from_info(struct devlink *devlink,</div><div class='del'>-						       struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	return devlink_port_get_from_attrs(devlink, info-&gt;attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct devlink_sb {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	unsigned int index;</div><div class='del'>-	u32 size;</div><div class='del'>-	u16 ingress_pools_count;</div><div class='del'>-	u16 egress_pools_count;</div><div class='del'>-	u16 ingress_tc_count;</div><div class='del'>-	u16 egress_tc_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u16 devlink_sb_pool_count(struct devlink_sb *devlink_sb)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb-&gt;ingress_pools_count + devlink_sb-&gt;egress_pools_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_sb *devlink_sb_get_by_index(struct devlink *devlink,</div><div class='del'>-						  unsigned int sb_index)</div><div class='del'>-{</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='del'>-		if (devlink_sb-&gt;index == sb_index)</div><div class='del'>-			return devlink_sb;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool devlink_sb_index_exists(struct devlink *devlink,</div><div class='del'>-				    unsigned int sb_index)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_get_by_index(devlink, sb_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_sb *devlink_sb_get_from_attrs(struct devlink *devlink,</div><div class='del'>-						    struct nlattr **attrs)</div><div class='del'>-{</div><div class='del'>-	if (attrs[DEVLINK_ATTR_SB_INDEX]) {</div><div class='del'>-		u32 sb_index = nla_get_u32(attrs[DEVLINK_ATTR_SB_INDEX]);</div><div class='del'>-		struct devlink_sb *devlink_sb;</div><div class='del'>-</div><div class='del'>-		devlink_sb = devlink_sb_get_by_index(devlink, sb_index);</div><div class='del'>-		if (!devlink_sb)</div><div class='del'>-			return ERR_PTR(-ENODEV);</div><div class='del'>-		return devlink_sb;</div><div class='del'>-	}</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_sb *devlink_sb_get_from_info(struct devlink *devlink,</div><div class='del'>-						   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_get_from_attrs(devlink, info-&gt;attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_sb_pool_index_get_from_attrs(struct devlink_sb *devlink_sb,</div><div class='del'>-						struct nlattr **attrs,</div><div class='del'>-						u16 *p_pool_index)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_SB_POOL_INDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = nla_get_u16(attrs[DEVLINK_ATTR_SB_POOL_INDEX]);</div><div class='del'>-	if (val &gt;= devlink_sb_pool_count(devlink_sb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*p_pool_index = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_sb_pool_index_get_from_info(struct devlink_sb *devlink_sb,</div><div class='del'>-					       struct genl_info *info,</div><div class='del'>-					       u16 *p_pool_index)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_pool_index_get_from_attrs(devlink_sb, info-&gt;attrs,</div><div class='del'>-						    p_pool_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_pool_type_get_from_attrs(struct nlattr **attrs,</div><div class='del'>-				    enum devlink_sb_pool_type *p_pool_type)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_SB_POOL_TYPE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = nla_get_u8(attrs[DEVLINK_ATTR_SB_POOL_TYPE]);</div><div class='del'>-	if (val != DEVLINK_SB_POOL_TYPE_INGRESS &amp;&amp;</div><div class='del'>-	    val != DEVLINK_SB_POOL_TYPE_EGRESS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*p_pool_type = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_pool_type_get_from_info(struct genl_info *info,</div><div class='del'>-				   enum devlink_sb_pool_type *p_pool_type)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_pool_type_get_from_attrs(info-&gt;attrs, p_pool_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_th_type_get_from_attrs(struct nlattr **attrs,</div><div class='del'>-				  enum devlink_sb_threshold_type *p_th_type)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = nla_get_u8(attrs[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE]);</div><div class='del'>-	if (val != DEVLINK_SB_THRESHOLD_TYPE_STATIC &amp;&amp;</div><div class='del'>-	    val != DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*p_th_type = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_th_type_get_from_info(struct genl_info *info,</div><div class='del'>-				 enum devlink_sb_threshold_type *p_th_type)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_th_type_get_from_attrs(info-&gt;attrs, p_th_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_tc_index_get_from_attrs(struct devlink_sb *devlink_sb,</div><div class='del'>-				   struct nlattr **attrs,</div><div class='del'>-				   enum devlink_sb_pool_type pool_type,</div><div class='del'>-				   u16 *p_tc_index)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_SB_TC_INDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = nla_get_u16(attrs[DEVLINK_ATTR_SB_TC_INDEX]);</div><div class='del'>-	if (pool_type == DEVLINK_SB_POOL_TYPE_INGRESS &amp;&amp;</div><div class='del'>-	    val &gt;= devlink_sb-&gt;ingress_tc_count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (pool_type == DEVLINK_SB_POOL_TYPE_EGRESS &amp;&amp;</div><div class='del'>-	    val &gt;= devlink_sb-&gt;egress_tc_count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*p_tc_index = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_sb_tc_index_get_from_info(struct devlink_sb *devlink_sb,</div><div class='del'>-				  struct genl_info *info,</div><div class='del'>-				  enum devlink_sb_pool_type pool_type,</div><div class='del'>-				  u16 *p_tc_index)</div><div class='del'>-{</div><div class='del'>-	return devlink_sb_tc_index_get_from_attrs(devlink_sb, info-&gt;attrs,</div><div class='del'>-						  pool_type, p_tc_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct devlink_region {</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct list_head list;</div><div class='del'>-	const char *name;</div><div class='del'>-	struct list_head snapshot_list;</div><div class='del'>-	u32 max_snapshots;</div><div class='del'>-	u32 cur_snapshots;</div><div class='del'>-	u64 size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devlink_snapshot {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	devlink_snapshot_data_dest_t *data_destructor;</div><div class='del'>-	u64 data_len;</div><div class='del'>-	u8 *data;</div><div class='del'>-	u32 id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct devlink_region *</div><div class='del'>-devlink_region_get_by_name(struct devlink *devlink, const char *region_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(region, &amp;devlink-&gt;region_list, list)</div><div class='del'>-		if (!strcmp(region-&gt;name, region_name))</div><div class='del'>-			return region;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_snapshot *</div><div class='del'>-devlink_region_snapshot_get_by_id(struct devlink_region *region, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct devlink_snapshot *snapshot;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(snapshot, &amp;region-&gt;snapshot_list, list)</div><div class='del'>-		if (snapshot-&gt;id == id)</div><div class='del'>-			return snapshot;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_region_snapshot_del(struct devlink_snapshot *snapshot)</div><div class='del'>-{</div><div class='del'>-	snapshot-&gt;region-&gt;cur_snapshots--;</div><div class='del'>-	list_del(&amp;snapshot-&gt;list);</div><div class='del'>-	(*snapshot-&gt;data_destructor)(snapshot-&gt;data);</div><div class='del'>-	kfree(snapshot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEVLINK_NL_FLAG_NEED_DEVLINK	BIT(0)</div><div class='del'>-#define DEVLINK_NL_FLAG_NEED_PORT	BIT(1)</div><div class='del'>-#define DEVLINK_NL_FLAG_NEED_SB		BIT(2)</div><div class='del'>-</div><div class='del'>-/* The per devlink instance lock is taken by default in the pre-doit</div><div class='del'>- * operation, yet several commands do not require this. The global</div><div class='del'>- * devlink lock is taken and protects from disruption by user-calls.</div><div class='del'>- */</div><div class='del'>-#define DEVLINK_NL_FLAG_NO_LOCK		BIT(3)</div><div class='del'>-</div><div class='del'>-static int devlink_nl_pre_doit(const struct genl_ops *ops,</div><div class='del'>-			       struct sk_buff *skb, struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	devlink = devlink_get_from_info(info);</div><div class='del'>-	if (IS_ERR(devlink)) {</div><div class='del'>-		mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-		return PTR_ERR(devlink);</div><div class='del'>-	}</div><div class='del'>-	if (~ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NO_LOCK)</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	if (ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NEED_DEVLINK) {</div><div class='del'>-		info-&gt;user_ptr[0] = devlink;</div><div class='del'>-	} else if (ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NEED_PORT) {</div><div class='del'>-		struct devlink_port *devlink_port;</div><div class='del'>-</div><div class='del'>-		devlink_port = devlink_port_get_from_info(devlink, info);</div><div class='del'>-		if (IS_ERR(devlink_port)) {</div><div class='del'>-			err = PTR_ERR(devlink_port);</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='del'>-		info-&gt;user_ptr[0] = devlink_port;</div><div class='del'>-	}</div><div class='del'>-	if (ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NEED_SB) {</div><div class='del'>-		struct devlink_sb *devlink_sb;</div><div class='del'>-</div><div class='del'>-		devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='del'>-		if (IS_ERR(devlink_sb)) {</div><div class='del'>-			err = PTR_ERR(devlink_sb);</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='del'>-		info-&gt;user_ptr[1] = devlink_sb;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	if (~ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NO_LOCK)</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_nl_post_doit(const struct genl_ops *ops,</div><div class='del'>-				 struct sk_buff *skb, struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-</div><div class='del'>-	devlink = devlink_get_from_info(info);</div><div class='del'>-	if (~ops-&gt;internal_flags &amp; DEVLINK_NL_FLAG_NO_LOCK)</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct genl_family devlink_nl_family;</div><div class='del'>-</div><div class='del'>-enum devlink_multicast_groups {</div><div class='del'>-	DEVLINK_MCGRP_CONFIG,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct genl_multicast_group devlink_nl_mcgrps[] = {</div><div class='del'>-	[DEVLINK_MCGRP_CONFIG] = { .name = DEVLINK_GENL_MCGRP_CONFIG_NAME },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	if (nla_put_string(msg, DEVLINK_ATTR_BUS_NAME, devlink-&gt;dev-&gt;bus-&gt;name))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (nla_put_string(msg, DEVLINK_ATTR_DEV_NAME, dev_name(devlink-&gt;dev)))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-			   enum devlink_command cmd, u32 portid,</div><div class='del'>-			   u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	void *hdr;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	WARN_ON(cmd != DEVLINK_CMD_NEW &amp;&amp; cmd != DEVLINK_CMD_DEL);</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_fill(msg, devlink, cmd, 0, 0, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_multicast_netns(&amp;devlink_nl_family, devlink_net(devlink),</div><div class='del'>-				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_port_attrs_put(struct sk_buff *msg,</div><div class='del'>-				     struct devlink_port *devlink_port)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='del'>-</div><div class='del'>-	if (!attrs-&gt;set)</div><div class='del'>-		return 0;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_FLAVOUR, attrs-&gt;flavour))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER, attrs-&gt;port_number))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (!attrs-&gt;split)</div><div class='del'>-		return 0;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP, attrs-&gt;port_number))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER,</div><div class='del'>-			attrs-&gt;split_subport_number))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				struct devlink_port *devlink_port,</div><div class='del'>-				enum devlink_command cmd, u32 portid,</div><div class='del'>-				u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	void *hdr;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_TYPE, devlink_port-&gt;type))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (devlink_port-&gt;desired_type != DEVLINK_PORT_TYPE_NOTSET &amp;&amp;</div><div class='del'>-	    nla_put_u16(msg, DEVLINK_ATTR_PORT_DESIRED_TYPE,</div><div class='del'>-			devlink_port-&gt;desired_type))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (devlink_port-&gt;type == DEVLINK_PORT_TYPE_ETH) {</div><div class='del'>-		struct net_device *netdev = devlink_port-&gt;type_dev;</div><div class='del'>-</div><div class='del'>-		if (netdev &amp;&amp;</div><div class='del'>-		    (nla_put_u32(msg, DEVLINK_ATTR_PORT_NETDEV_IFINDEX,</div><div class='del'>-				 netdev-&gt;ifindex) ||</div><div class='del'>-		     nla_put_string(msg, DEVLINK_ATTR_PORT_NETDEV_NAME,</div><div class='del'>-				    netdev-&gt;name)))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-	if (devlink_port-&gt;type == DEVLINK_PORT_TYPE_IB) {</div><div class='del'>-		struct ib_device *ibdev = devlink_port-&gt;type_dev;</div><div class='del'>-</div><div class='del'>-		if (ibdev &amp;&amp;</div><div class='del'>-		    nla_put_string(msg, DEVLINK_ATTR_PORT_IBDEV_NAME,</div><div class='del'>-				   ibdev-&gt;name))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-	if (devlink_nl_port_attrs_put(msg, devlink_port))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_port_notify(struct devlink_port *devlink_port,</div><div class='del'>-				enum devlink_command cmd)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!devlink_port-&gt;registered)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	WARN_ON(cmd != DEVLINK_CMD_PORT_NEW &amp;&amp; cmd != DEVLINK_CMD_PORT_DEL);</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_port_fill(msg, devlink, devlink_port, cmd, 0, 0, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_multicast_netns(&amp;devlink_nl_family, devlink_net(devlink),</div><div class='del'>-				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,</div><div class='del'>-			      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg,</div><div class='del'>-				     struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)))</div><div class='del'>-			continue;</div><div class='del'>-		if (idx &lt; start) {</div><div class='del'>-			idx++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,</div><div class='del'>-				      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				      cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		idx++;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,</div><div class='del'>-					struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_port_fill(msg, devlink, devlink_port,</div><div class='del'>-				   DEVLINK_CMD_PORT_NEW,</div><div class='del'>-				   info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_port_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					  struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct devlink_port *devlink_port;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)))</div><div class='del'>-			continue;</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(devlink_port, &amp;devlink-&gt;port_list, list) {</div><div class='del'>-			if (idx &lt; start) {</div><div class='del'>-				idx++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_port_fill(msg, devlink, devlink_port,</div><div class='del'>-						   DEVLINK_CMD_NEW,</div><div class='del'>-						   NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						   cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						   NLM_F_MULTI);</div><div class='del'>-			if (err) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_port_type_set(struct devlink *devlink,</div><div class='del'>-				 struct devlink_port *devlink_port,</div><div class='del'>-				 enum devlink_port_type port_type)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (devlink-&gt;ops &amp;&amp; devlink-&gt;ops-&gt;port_type_set) {</div><div class='del'>-		if (port_type == DEVLINK_PORT_TYPE_NOTSET)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (port_type == devlink_port-&gt;type)</div><div class='del'>-			return 0;</div><div class='del'>-		err = devlink-&gt;ops-&gt;port_type_set(devlink_port, port_type);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		devlink_port-&gt;desired_type = port_type;</div><div class='del'>-		devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_port_set_doit(struct sk_buff *skb,</div><div class='del'>-					struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;attrs[DEVLINK_ATTR_PORT_TYPE]) {</div><div class='del'>-		enum devlink_port_type port_type;</div><div class='del'>-</div><div class='del'>-		port_type = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PORT_TYPE]);</div><div class='del'>-		err = devlink_port_type_set(devlink, devlink_port, port_type);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_port_split(struct devlink *devlink, u32 port_index,</div><div class='del'>-			      u32 count, struct netlink_ext_ack *extack)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (devlink-&gt;ops &amp;&amp; devlink-&gt;ops-&gt;port_split)</div><div class='del'>-		return devlink-&gt;ops-&gt;port_split(devlink, port_index, count,</div><div class='del'>-						extack);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_port_split_doit(struct sk_buff *skb,</div><div class='del'>-					  struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	u32 port_index;</div><div class='del'>-	u32 count;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX] ||</div><div class='del'>-	    !info-&gt;attrs[DEVLINK_ATTR_PORT_SPLIT_COUNT])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	port_index = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='del'>-	count = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_SPLIT_COUNT]);</div><div class='del'>-	return devlink_port_split(devlink, port_index, count, info-&gt;extack);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_port_unsplit(struct devlink *devlink, u32 port_index,</div><div class='del'>-				struct netlink_ext_ack *extack)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (devlink-&gt;ops &amp;&amp; devlink-&gt;ops-&gt;port_unsplit)</div><div class='del'>-		return devlink-&gt;ops-&gt;port_unsplit(devlink, port_index, extack);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,</div><div class='del'>-					    struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	u32 port_index;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	port_index = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='del'>-	return devlink_port_unsplit(devlink, port_index, info-&gt;extack);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_sb_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-			      struct devlink_sb *devlink_sb,</div><div class='del'>-			      enum devlink_command cmd, u32 portid,</div><div class='del'>-			      u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	void *hdr;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_SIZE, devlink_sb-&gt;size))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,</div><div class='del'>-			devlink_sb-&gt;ingress_pools_count))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,</div><div class='del'>-			devlink_sb-&gt;egress_pools_count))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_INGRESS_TC_COUNT,</div><div class='del'>-			devlink_sb-&gt;ingress_tc_count))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_EGRESS_TC_COUNT,</div><div class='del'>-			devlink_sb-&gt;egress_tc_count))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_get_doit(struct sk_buff *skb,</div><div class='del'>-				      struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_sb_fill(msg, devlink, devlink_sb,</div><div class='del'>-				 DEVLINK_CMD_SB_NEW,</div><div class='del'>-				 info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)))</div><div class='del'>-			continue;</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='del'>-			if (idx &lt; start) {</div><div class='del'>-				idx++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_sb_fill(msg, devlink, devlink_sb,</div><div class='del'>-						 DEVLINK_CMD_SB_NEW,</div><div class='del'>-						 NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						 cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						 NLM_F_MULTI);</div><div class='del'>-			if (err) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_sb_pool_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				   struct devlink_sb *devlink_sb,</div><div class='del'>-				   u16 pool_index, enum devlink_command cmd,</div><div class='del'>-				   u32 portid, u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	struct devlink_sb_pool_info pool_info;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink-&gt;ops-&gt;sb_pool_get(devlink, devlink_sb-&gt;index,</div><div class='del'>-					pool_index, &amp;pool_info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_TYPE, pool_info.pool_type))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_POOL_SIZE, pool_info.size))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,</div><div class='del'>-		       pool_info.threshold_type))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_pool_get_doit(struct sk_buff *skb,</div><div class='del'>-					   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='del'>-						  &amp;pool_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_pool_get)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_sb_pool_fill(msg, devlink, devlink_sb, pool_index,</div><div class='del'>-				      DEVLINK_CMD_SB_POOL_NEW,</div><div class='del'>-				      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __sb_pool_get_dumpit(struct sk_buff *msg, int start, int *p_idx,</div><div class='del'>-				struct devlink *devlink,</div><div class='del'>-				struct devlink_sb *devlink_sb,</div><div class='del'>-				u32 portid, u32 seq)</div><div class='del'>-{</div><div class='del'>-	u16 pool_count = devlink_sb_pool_count(devlink_sb);</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (pool_index = 0; pool_index &lt; pool_count; pool_index++) {</div><div class='del'>-		if (*p_idx &lt; start) {</div><div class='del'>-			(*p_idx)++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		err = devlink_nl_sb_pool_fill(msg, devlink,</div><div class='del'>-					      devlink_sb,</div><div class='del'>-					      pool_index,</div><div class='del'>-					      DEVLINK_CMD_SB_POOL_NEW,</div><div class='del'>-					      portid, seq, NLM_F_MULTI);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		(*p_idx)++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					     struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)) ||</div><div class='del'>-		    !devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_pool_get)</div><div class='del'>-			continue;</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='del'>-			err = __sb_pool_get_dumpit(msg, start, &amp;idx, devlink,</div><div class='del'>-						   devlink_sb,</div><div class='del'>-						   NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						   cb-&gt;nlh-&gt;nlmsg_seq);</div><div class='del'>-			if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_sb_pool_set(struct devlink *devlink, unsigned int sb_index,</div><div class='del'>-			       u16 pool_index, u32 size,</div><div class='del'>-			       enum devlink_sb_threshold_type threshold_type)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;sb_pool_set)</div><div class='del'>-		return ops-&gt;sb_pool_set(devlink, sb_index, pool_index,</div><div class='del'>-					size, threshold_type);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb,</div><div class='del'>-					   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	enum devlink_sb_threshold_type threshold_type;</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	u32 size;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='del'>-						  &amp;pool_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_th_type_get_from_info(info, &amp;threshold_type);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_SB_POOL_SIZE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	size = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_POOL_SIZE]);</div><div class='del'>-	return devlink_sb_pool_set(devlink, devlink_sb-&gt;index,</div><div class='del'>-				   pool_index, size, threshold_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_sb_port_pool_fill(struct sk_buff *msg,</div><div class='del'>-					struct devlink *devlink,</div><div class='del'>-					struct devlink_port *devlink_port,</div><div class='del'>-					struct devlink_sb *devlink_sb,</div><div class='del'>-					u16 pool_index,</div><div class='del'>-					enum devlink_command cmd,</div><div class='del'>-					u32 portid, u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-	u32 threshold;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = ops-&gt;sb_port_pool_get(devlink_port, devlink_sb-&gt;index,</div><div class='del'>-				    pool_index, &amp;threshold);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_THRESHOLD, threshold))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;sb_occ_port_pool_get) {</div><div class='del'>-		u32 cur;</div><div class='del'>-		u32 max;</div><div class='del'>-</div><div class='del'>-		err = ops-&gt;sb_occ_port_pool_get(devlink_port, devlink_sb-&gt;index,</div><div class='del'>-						pool_index, &amp;cur, &amp;max);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			return err;</div><div class='del'>-		if (!err) {</div><div class='del'>-			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_CUR, cur))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_MAX, max))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,</div><div class='del'>-						struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='del'>-						  &amp;pool_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_port_pool_get)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_sb_port_pool_fill(msg, devlink, devlink_port,</div><div class='del'>-					   devlink_sb, pool_index,</div><div class='del'>-					   DEVLINK_CMD_SB_PORT_POOL_NEW,</div><div class='del'>-					   info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __sb_port_pool_get_dumpit(struct sk_buff *msg, int start, int *p_idx,</div><div class='del'>-				     struct devlink *devlink,</div><div class='del'>-				     struct devlink_sb *devlink_sb,</div><div class='del'>-				     u32 portid, u32 seq)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port;</div><div class='del'>-	u16 pool_count = devlink_sb_pool_count(devlink_sb);</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(devlink_port, &amp;devlink-&gt;port_list, list) {</div><div class='del'>-		for (pool_index = 0; pool_index &lt; pool_count; pool_index++) {</div><div class='del'>-			if (*p_idx &lt; start) {</div><div class='del'>-				(*p_idx)++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_sb_port_pool_fill(msg, devlink,</div><div class='del'>-							   devlink_port,</div><div class='del'>-							   devlink_sb,</div><div class='del'>-							   pool_index,</div><div class='del'>-							   DEVLINK_CMD_SB_PORT_POOL_NEW,</div><div class='del'>-							   portid, seq,</div><div class='del'>-							   NLM_F_MULTI);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-			(*p_idx)++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg,</div><div class='del'>-						  struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)) ||</div><div class='del'>-		    !devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_port_pool_get)</div><div class='del'>-			continue;</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='del'>-			err = __sb_port_pool_get_dumpit(msg, start, &amp;idx,</div><div class='del'>-							devlink, devlink_sb,</div><div class='del'>-							NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-							cb-&gt;nlh-&gt;nlmsg_seq);</div><div class='del'>-			if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_sb_port_pool_set(struct devlink_port *devlink_port,</div><div class='del'>-				    unsigned int sb_index, u16 pool_index,</div><div class='del'>-				    u32 threshold)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink_port-&gt;devlink-&gt;ops;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;sb_port_pool_set)</div><div class='del'>-		return ops-&gt;sb_port_pool_set(devlink_port, sb_index,</div><div class='del'>-					     pool_index, threshold);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,</div><div class='del'>-						struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	u32 threshold;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='del'>-						  &amp;pool_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	threshold = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD]);</div><div class='del'>-	return devlink_sb_port_pool_set(devlink_port, devlink_sb-&gt;index,</div><div class='del'>-					pool_index, threshold);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_nl_sb_tc_pool_bind_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				struct devlink_port *devlink_port,</div><div class='del'>-				struct devlink_sb *devlink_sb, u16 tc_index,</div><div class='del'>-				enum devlink_sb_pool_type pool_type,</div><div class='del'>-				enum devlink_command cmd,</div><div class='del'>-				u32 portid, u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	u32 threshold;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = ops-&gt;sb_tc_pool_bind_get(devlink_port, devlink_sb-&gt;index,</div><div class='del'>-				       tc_index, pool_type,</div><div class='del'>-				       &amp;pool_index, &amp;threshold);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_TC_INDEX, tc_index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_TYPE, pool_type))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u32(msg, DEVLINK_ATTR_SB_THRESHOLD, threshold))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;sb_occ_tc_port_bind_get) {</div><div class='del'>-		u32 cur;</div><div class='del'>-		u32 max;</div><div class='del'>-</div><div class='del'>-		err = ops-&gt;sb_occ_tc_port_bind_get(devlink_port,</div><div class='del'>-						   devlink_sb-&gt;index,</div><div class='del'>-						   tc_index, pool_type,</div><div class='del'>-						   &amp;cur, &amp;max);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			return err;</div><div class='del'>-		if (!err) {</div><div class='del'>-			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_CUR, cur))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_MAX, max))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_tc_pool_bind_get_doit(struct sk_buff *skb,</div><div class='del'>-						   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	enum devlink_sb_pool_type pool_type;</div><div class='del'>-	u16 tc_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_type_get_from_info(info, &amp;pool_type);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_tc_index_get_from_info(devlink_sb, info,</div><div class='del'>-						pool_type, &amp;tc_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_tc_pool_bind_get)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink, devlink_port,</div><div class='del'>-					      devlink_sb, tc_index, pool_type,</div><div class='del'>-					      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='del'>-					      info-&gt;snd_portid,</div><div class='del'>-					      info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __sb_tc_pool_bind_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					int start, int *p_idx,</div><div class='del'>-					struct devlink *devlink,</div><div class='del'>-					struct devlink_sb *devlink_sb,</div><div class='del'>-					u32 portid, u32 seq)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port;</div><div class='del'>-	u16 tc_index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(devlink_port, &amp;devlink-&gt;port_list, list) {</div><div class='del'>-		for (tc_index = 0;</div><div class='del'>-		     tc_index &lt; devlink_sb-&gt;ingress_tc_count; tc_index++) {</div><div class='del'>-			if (*p_idx &lt; start) {</div><div class='del'>-				(*p_idx)++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink,</div><div class='del'>-							      devlink_port,</div><div class='del'>-							      devlink_sb,</div><div class='del'>-							      tc_index,</div><div class='del'>-							      DEVLINK_SB_POOL_TYPE_INGRESS,</div><div class='del'>-							      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='del'>-							      portid, seq,</div><div class='del'>-							      NLM_F_MULTI);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-			(*p_idx)++;</div><div class='del'>-		}</div><div class='del'>-		for (tc_index = 0;</div><div class='del'>-		     tc_index &lt; devlink_sb-&gt;egress_tc_count; tc_index++) {</div><div class='del'>-			if (*p_idx &lt; start) {</div><div class='del'>-				(*p_idx)++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink,</div><div class='del'>-							      devlink_port,</div><div class='del'>-							      devlink_sb,</div><div class='del'>-							      tc_index,</div><div class='del'>-							      DEVLINK_SB_POOL_TYPE_EGRESS,</div><div class='del'>-							      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='del'>-							      portid, seq,</div><div class='del'>-							      NLM_F_MULTI);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-			(*p_idx)++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_nl_cmd_sb_tc_pool_bind_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					  struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)) ||</div><div class='del'>-		    !devlink-&gt;ops || !devlink-&gt;ops-&gt;sb_tc_pool_bind_get)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='del'>-			err = __sb_tc_pool_bind_get_dumpit(msg, start, &amp;idx,</div><div class='del'>-							   devlink,</div><div class='del'>-							   devlink_sb,</div><div class='del'>-							   NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-							   cb-&gt;nlh-&gt;nlmsg_seq);</div><div class='del'>-			if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port,</div><div class='del'>-				       unsigned int sb_index, u16 tc_index,</div><div class='del'>-				       enum devlink_sb_pool_type pool_type,</div><div class='del'>-				       u16 pool_index, u32 threshold)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink_port-&gt;devlink-&gt;ops;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;sb_tc_pool_bind_set)</div><div class='del'>-		return ops-&gt;sb_tc_pool_bind_set(devlink_port, sb_index,</div><div class='del'>-						tc_index, pool_type,</div><div class='del'>-						pool_index, threshold);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,</div><div class='del'>-						   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port *devlink_port = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	enum devlink_sb_pool_type pool_type;</div><div class='del'>-	u16 tc_index;</div><div class='del'>-	u16 pool_index;</div><div class='del'>-	u32 threshold;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_type_get_from_info(info, &amp;pool_type);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_tc_index_get_from_info(devlink_sb, info,</div><div class='del'>-						pool_type, &amp;tc_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='del'>-						  &amp;pool_index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	threshold = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD]);</div><div class='del'>-	return devlink_sb_tc_pool_bind_set(devlink_port, devlink_sb-&gt;index,</div><div class='del'>-					   tc_index, pool_type,</div><div class='del'>-					   pool_index, threshold);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb,</div><div class='del'>-					       struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;sb_occ_snapshot)</div><div class='del'>-		return ops-&gt;sb_occ_snapshot(devlink, devlink_sb-&gt;index);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb,</div><div class='del'>-						struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_sb *devlink_sb = info-&gt;user_ptr[1];</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;sb_occ_max_clear)</div><div class='del'>-		return ops-&gt;sb_occ_max_clear(devlink, devlink_sb-&gt;index);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				   enum devlink_command cmd, u32 portid,</div><div class='del'>-				   u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-	u8 inline_mode, encap_mode;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 mode;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_put_handle(msg, devlink);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;eswitch_mode_get) {</div><div class='del'>-		err = ops-&gt;eswitch_mode_get(devlink, &amp;mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		err = nla_put_u16(msg, DEVLINK_ATTR_ESWITCH_MODE, mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;eswitch_inline_mode_get) {</div><div class='del'>-		err = ops-&gt;eswitch_inline_mode_get(devlink, &amp;inline_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_INLINE_MODE,</div><div class='del'>-				 inline_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;eswitch_encap_mode_get) {</div><div class='del'>-		err = ops-&gt;eswitch_encap_mode_get(devlink, &amp;encap_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_ENCAP_MODE, encap_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb,</div><div class='del'>-					   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!ops)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_eswitch_fill(msg, devlink, DEVLINK_CMD_ESWITCH_GET,</div><div class='del'>-				      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb,</div><div class='del'>-					   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='del'>-	u8 inline_mode, encap_mode;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 mode;</div><div class='del'>-</div><div class='del'>-	if (!ops)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_MODE]) {</div><div class='del'>-		if (!ops-&gt;eswitch_mode_set)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		mode = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_ESWITCH_MODE]);</div><div class='del'>-		err = ops-&gt;eswitch_mode_set(devlink, mode);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_INLINE_MODE]) {</div><div class='del'>-		if (!ops-&gt;eswitch_inline_mode_set)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		inline_mode = nla_get_u8(</div><div class='del'>-				info-&gt;attrs[DEVLINK_ATTR_ESWITCH_INLINE_MODE]);</div><div class='del'>-		err = ops-&gt;eswitch_inline_mode_set(devlink, inline_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]) {</div><div class='del'>-		if (!ops-&gt;eswitch_encap_mode_set)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		encap_mode = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]);</div><div class='del'>-		err = ops-&gt;eswitch_encap_mode_set(devlink, encap_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int devlink_dpipe_match_put(struct sk_buff *skb,</div><div class='del'>-			    struct devlink_dpipe_match *match)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_header *header = match-&gt;header;</div><div class='del'>-	struct devlink_dpipe_field *field = &amp;header-&gt;fields[match-&gt;field_id];</div><div class='del'>-	struct nlattr *match_attr;</div><div class='del'>-</div><div class='del'>-	match_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_MATCH);</div><div class='del'>-	if (!match_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_MATCH_TYPE, match-&gt;type) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_INDEX, match-&gt;header_index) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='del'>-	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, match_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, match_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_match_put);</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_matches_put(struct devlink_dpipe_table *table,</div><div class='del'>-				     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *matches_attr;</div><div class='del'>-</div><div class='del'>-	matches_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_TABLE_MATCHES);</div><div class='del'>-	if (!matches_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (table-&gt;table_ops-&gt;matches_dump(table-&gt;priv, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, matches_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, matches_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int devlink_dpipe_action_put(struct sk_buff *skb,</div><div class='del'>-			     struct devlink_dpipe_action *action)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_header *header = action-&gt;header;</div><div class='del'>-	struct devlink_dpipe_field *field = &amp;header-&gt;fields[action-&gt;field_id];</div><div class='del'>-	struct nlattr *action_attr;</div><div class='del'>-</div><div class='del'>-	action_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_ACTION);</div><div class='del'>-	if (!action_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_ACTION_TYPE, action-&gt;type) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_INDEX, action-&gt;header_index) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='del'>-	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, action_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, action_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_action_put);</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_actions_put(struct devlink_dpipe_table *table,</div><div class='del'>-				     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *actions_attr;</div><div class='del'>-</div><div class='del'>-	actions_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_TABLE_ACTIONS);</div><div class='del'>-	if (!actions_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (table-&gt;table_ops-&gt;actions_dump(table-&gt;priv, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, actions_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, actions_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_table_put(struct sk_buff *skb,</div><div class='del'>-				   struct devlink_dpipe_table *table)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *table_attr;</div><div class='del'>-	u64 table_size;</div><div class='del'>-</div><div class='del'>-	table_size = table-&gt;table_ops-&gt;size_get(table-&gt;priv);</div><div class='del'>-	table_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_TABLE);</div><div class='del'>-	if (!table_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_TABLE_NAME, table-&gt;name) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_SIZE, table_size,</div><div class='del'>-			      DEVLINK_ATTR_PAD))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (nla_put_u8(skb, DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,</div><div class='del'>-		       table-&gt;counters_enabled))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (table-&gt;resource_valid) {</div><div class='del'>-		if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,</div><div class='del'>-				      table-&gt;resource_id, DEVLINK_ATTR_PAD) ||</div><div class='del'>-		    nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,</div><div class='del'>-				      table-&gt;resource_units, DEVLINK_ATTR_PAD))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-	if (devlink_dpipe_matches_put(table, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (devlink_dpipe_actions_put(table, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, table_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, table_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_send_and_alloc_skb(struct sk_buff **pskb,</div><div class='del'>-					    struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (*pskb) {</div><div class='del'>-		err = genlmsg_reply(*pskb, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	*pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!*pskb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_tables_fill(struct genl_info *info,</div><div class='del'>-				     enum devlink_command cmd, int flags,</div><div class='del'>-				     struct list_head *dpipe_tables,</div><div class='del'>-				     const char *table_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-	struct nlattr *tables_attr;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	bool incomplete;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	table = list_first_entry(dpipe_tables,</div><div class='del'>-				 struct devlink_dpipe_table, list);</div><div class='del'>-start_again:</div><div class='del'>-	err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='del'>-	if (!hdr) {</div><div class='del'>-		nlmsg_free(skb);</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(skb, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	tables_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_TABLES);</div><div class='del'>-	if (!tables_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	incomplete = false;</div><div class='del'>-	list_for_each_entry_from(table, dpipe_tables, list) {</div><div class='del'>-		if (!table_name) {</div><div class='del'>-			err = devlink_dpipe_table_put(skb, table);</div><div class='del'>-			if (err) {</div><div class='del'>-				if (!i)</div><div class='del'>-					goto err_table_put;</div><div class='del'>-				incomplete = true;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (!strcmp(table-&gt;name, table_name)) {</div><div class='del'>-				err = devlink_dpipe_table_put(skb, table);</div><div class='del'>-				if (err)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, tables_attr);</div><div class='del'>-	genlmsg_end(skb, hdr);</div><div class='del'>-	if (incomplete)</div><div class='del'>-		goto start_again;</div><div class='del'>-</div><div class='del'>-send_done:</div><div class='del'>-	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		goto send_done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(skb, info);</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-err_table_put:</div><div class='del'>-	nlmsg_free(skb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb,</div><div class='del'>-					  struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	const char *table_name =  NULL;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME])</div><div class='del'>-		table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='del'>-</div><div class='del'>-	return devlink_dpipe_tables_fill(info, DEVLINK_CMD_DPIPE_TABLE_GET, 0,</div><div class='del'>-					 &amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_value_put(struct sk_buff *skb,</div><div class='del'>-				   struct devlink_dpipe_value *value)</div><div class='del'>-{</div><div class='del'>-	if (nla_put(skb, DEVLINK_ATTR_DPIPE_VALUE,</div><div class='del'>-		    value-&gt;value_size, value-&gt;value))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (value-&gt;mask)</div><div class='del'>-		if (nla_put(skb, DEVLINK_ATTR_DPIPE_VALUE_MASK,</div><div class='del'>-			    value-&gt;value_size, value-&gt;mask))</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-	if (value-&gt;mapping_valid)</div><div class='del'>-		if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_VALUE_MAPPING,</div><div class='del'>-				value-&gt;mapping_value))</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_action_value_put(struct sk_buff *skb,</div><div class='del'>-					  struct devlink_dpipe_value *value)</div><div class='del'>-{</div><div class='del'>-	if (!value-&gt;action)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (devlink_dpipe_action_put(skb, value-&gt;action))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (devlink_dpipe_value_put(skb, value))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_action_values_put(struct sk_buff *skb,</div><div class='del'>-					   struct devlink_dpipe_value *values,</div><div class='del'>-					   unsigned int values_count)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *action_attr;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; values_count; i++) {</div><div class='del'>-		action_attr = nla_nest_start(skb,</div><div class='del'>-					     DEVLINK_ATTR_DPIPE_ACTION_VALUE);</div><div class='del'>-		if (!action_attr)</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-		err = devlink_dpipe_action_value_put(skb, &amp;values[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_action_value_put;</div><div class='del'>-		nla_nest_end(skb, action_attr);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_action_value_put:</div><div class='del'>-	nla_nest_cancel(skb, action_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_match_value_put(struct sk_buff *skb,</div><div class='del'>-					 struct devlink_dpipe_value *value)</div><div class='del'>-{</div><div class='del'>-	if (!value-&gt;match)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (devlink_dpipe_match_put(skb, value-&gt;match))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	if (devlink_dpipe_value_put(skb, value))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_match_values_put(struct sk_buff *skb,</div><div class='del'>-					  struct devlink_dpipe_value *values,</div><div class='del'>-					  unsigned int values_count)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *match_attr;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; values_count; i++) {</div><div class='del'>-		match_attr = nla_nest_start(skb,</div><div class='del'>-					    DEVLINK_ATTR_DPIPE_MATCH_VALUE);</div><div class='del'>-		if (!match_attr)</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-		err = devlink_dpipe_match_value_put(skb, &amp;values[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_match_value_put;</div><div class='del'>-		nla_nest_end(skb, match_attr);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_match_value_put:</div><div class='del'>-	nla_nest_cancel(skb, match_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_entry_put(struct sk_buff *skb,</div><div class='del'>-				   struct devlink_dpipe_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *entry_attr, *matches_attr, *actions_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	entry_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_ENTRY);</div><div class='del'>-	if (!entry_attr)</div><div class='del'>-		return  -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_ENTRY_INDEX, entry-&gt;index,</div><div class='del'>-			      DEVLINK_ATTR_PAD))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (entry-&gt;counter_valid)</div><div class='del'>-		if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,</div><div class='del'>-				      entry-&gt;counter, DEVLINK_ATTR_PAD))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	matches_attr = nla_nest_start(skb,</div><div class='del'>-				      DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES);</div><div class='del'>-	if (!matches_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = devlink_dpipe_match_values_put(skb, entry-&gt;match_values,</div><div class='del'>-					     entry-&gt;match_values_count);</div><div class='del'>-	if (err) {</div><div class='del'>-		nla_nest_cancel(skb, matches_attr);</div><div class='del'>-		goto err_match_values_put;</div><div class='del'>-	}</div><div class='del'>-	nla_nest_end(skb, matches_attr);</div><div class='del'>-</div><div class='del'>-	actions_attr = nla_nest_start(skb,</div><div class='del'>-				      DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES);</div><div class='del'>-	if (!actions_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = devlink_dpipe_action_values_put(skb, entry-&gt;action_values,</div><div class='del'>-					      entry-&gt;action_values_count);</div><div class='del'>-	if (err) {</div><div class='del'>-		nla_nest_cancel(skb, actions_attr);</div><div class='del'>-		goto err_action_values_put;</div><div class='del'>-	}</div><div class='del'>-	nla_nest_end(skb, actions_attr);</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, entry_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-err_match_values_put:</div><div class='del'>-err_action_values_put:</div><div class='del'>-	nla_nest_cancel(skb, entry_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_dpipe_table *</div><div class='del'>-devlink_dpipe_table_find(struct list_head *dpipe_tables,</div><div class='del'>-			 const char *table_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(table, dpipe_tables, list) {</div><div class='del'>-		if (!strcmp(table-&gt;name, table_name))</div><div class='del'>-			return table;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devlink_dpipe_send_and_alloc_skb(&amp;dump_ctx-&gt;skb,</div><div class='del'>-					       dump_ctx-&gt;info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	dump_ctx-&gt;hdr = genlmsg_put(dump_ctx-&gt;skb,</div><div class='del'>-				    dump_ctx-&gt;info-&gt;snd_portid,</div><div class='del'>-				    dump_ctx-&gt;info-&gt;snd_seq,</div><div class='del'>-				    &amp;devlink_nl_family, NLM_F_MULTI,</div><div class='del'>-				    dump_ctx-&gt;cmd);</div><div class='del'>-	if (!dump_ctx-&gt;hdr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	devlink = dump_ctx-&gt;info-&gt;user_ptr[0];</div><div class='del'>-	if (devlink_nl_put_handle(dump_ctx-&gt;skb, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	dump_ctx-&gt;nest = nla_nest_start(dump_ctx-&gt;skb,</div><div class='del'>-					DEVLINK_ATTR_DPIPE_ENTRIES);</div><div class='del'>-	if (!dump_ctx-&gt;nest)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nlmsg_free(dump_ctx-&gt;skb);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_prepare);</div><div class='del'>-</div><div class='del'>-int devlink_dpipe_entry_ctx_append(struct devlink_dpipe_dump_ctx *dump_ctx,</div><div class='del'>-				   struct devlink_dpipe_entry *entry)</div><div class='del'>-{</div><div class='del'>-	return devlink_dpipe_entry_put(dump_ctx-&gt;skb, entry);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_append);</div><div class='del'>-</div><div class='del'>-int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx)</div><div class='del'>-{</div><div class='del'>-	nla_nest_end(dump_ctx-&gt;skb, dump_ctx-&gt;nest);</div><div class='del'>-	genlmsg_end(dump_ctx-&gt;skb, dump_ctx-&gt;hdr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_close);</div><div class='del'>-</div><div class='del'>-void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	unsigned int value_count, value_index;</div><div class='del'>-	struct devlink_dpipe_value *value;</div><div class='del'>-</div><div class='del'>-	value = entry-&gt;action_values;</div><div class='del'>-	value_count = entry-&gt;action_values_count;</div><div class='del'>-	for (value_index = 0; value_index &lt; value_count; value_index++) {</div><div class='del'>-		kfree(value[value_index].value);</div><div class='del'>-		kfree(value[value_index].mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value = entry-&gt;match_values;</div><div class='del'>-	value_count = entry-&gt;match_values_count;</div><div class='del'>-	for (value_index = 0; value_index &lt; value_count; value_index++) {</div><div class='del'>-		kfree(value[value_index].value);</div><div class='del'>-		kfree(value[value_index].mask);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(devlink_dpipe_entry_clear);</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_entries_fill(struct genl_info *info,</div><div class='del'>-				      enum devlink_command cmd, int flags,</div><div class='del'>-				      struct devlink_dpipe_table *table)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_dump_ctx dump_ctx;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dump_ctx.skb = NULL;</div><div class='del'>-	dump_ctx.cmd = cmd;</div><div class='del'>-	dump_ctx.info = info;</div><div class='del'>-</div><div class='del'>-	err = table-&gt;table_ops-&gt;entries_dump(table-&gt;priv,</div><div class='del'>-					     table-&gt;counters_enabled,</div><div class='del'>-					     &amp;dump_ctx);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-send_done:</div><div class='del'>-	nlh = nlmsg_put(dump_ctx.skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		err = devlink_dpipe_send_and_alloc_skb(&amp;dump_ctx.skb, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		goto send_done;</div><div class='del'>-	}</div><div class='del'>-	return genlmsg_reply(dump_ctx.skb, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,</div><div class='del'>-					    struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-	const char *table_name;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='del'>-	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-	if (!table)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!table-&gt;table_ops-&gt;entries_dump)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return devlink_dpipe_entries_fill(info, DEVLINK_CMD_DPIPE_ENTRIES_GET,</div><div class='del'>-					  0, table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_fields_put(struct sk_buff *skb,</div><div class='del'>-				    const struct devlink_dpipe_header *header)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_field *field;</div><div class='del'>-	struct nlattr *field_attr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; header-&gt;fields_count; i++) {</div><div class='del'>-		field = &amp;header-&gt;fields[i];</div><div class='del'>-		field_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_FIELD);</div><div class='del'>-		if (!field_attr)</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-		if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_FIELD_NAME, field-&gt;name) ||</div><div class='del'>-		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='del'>-		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH, field-&gt;bitwidth) ||</div><div class='del'>-		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE, field-&gt;mapping_type))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		nla_nest_end(skb, field_attr);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, field_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_header_put(struct sk_buff *skb,</div><div class='del'>-				    struct devlink_dpipe_header *header)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *fields_attr, *header_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	header_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADER);</div><div class='del'>-	if (!header_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_HEADER_NAME, header-&gt;name) ||</div><div class='del'>-	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='del'>-	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	fields_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADER_FIELDS);</div><div class='del'>-	if (!fields_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = devlink_dpipe_fields_put(skb, header);</div><div class='del'>-	if (err) {</div><div class='del'>-		nla_nest_cancel(skb, fields_attr);</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-	nla_nest_end(skb, fields_attr);</div><div class='del'>-	nla_nest_end(skb, header_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-	nla_nest_cancel(skb, header_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_headers_fill(struct genl_info *info,</div><div class='del'>-				      enum devlink_command cmd, int flags,</div><div class='del'>-				      struct devlink_dpipe_headers *</div><div class='del'>-				      dpipe_headers)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct nlattr *headers_attr;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int i, j;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-start_again:</div><div class='del'>-	err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='del'>-	if (!hdr) {</div><div class='del'>-		nlmsg_free(skb);</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(skb, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	headers_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADERS);</div><div class='del'>-	if (!headers_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (; i &lt; dpipe_headers-&gt;headers_count; i++) {</div><div class='del'>-		err = devlink_dpipe_header_put(skb, dpipe_headers-&gt;headers[i]);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (!j)</div><div class='del'>-				goto err_table_put;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		j++;</div><div class='del'>-	}</div><div class='del'>-	nla_nest_end(skb, headers_attr);</div><div class='del'>-	genlmsg_end(skb, hdr);</div><div class='del'>-	if (i != dpipe_headers-&gt;headers_count)</div><div class='del'>-		goto start_again;</div><div class='del'>-</div><div class='del'>-send_done:</div><div class='del'>-	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		goto send_done;</div><div class='del'>-	}</div><div class='del'>-	return genlmsg_reply(skb, info);</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-err_table_put:</div><div class='del'>-	nlmsg_free(skb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb,</div><div class='del'>-					    struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;dpipe_headers)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return devlink_dpipe_headers_fill(info, DEVLINK_CMD_DPIPE_HEADERS_GET,</div><div class='del'>-					  0, devlink-&gt;dpipe_headers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_dpipe_table_counters_set(struct devlink *devlink,</div><div class='del'>-					    const char *table_name,</div><div class='del'>-					    bool enable)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-</div><div class='del'>-	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-	if (!table)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (table-&gt;counter_control_extern)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!(table-&gt;counters_enabled ^ enable))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	table-&gt;counters_enabled = enable;</div><div class='del'>-	if (table-&gt;table_ops-&gt;counters_set_update)</div><div class='del'>-		table-&gt;table_ops-&gt;counters_set_update(table-&gt;priv, enable);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb,</div><div class='del'>-						   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	const char *table_name;</div><div class='del'>-	bool counters_enable;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME] ||</div><div class='del'>-	    !info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='del'>-	counters_enable = !!nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]);</div><div class='del'>-</div><div class='del'>-	return devlink_dpipe_table_counters_set(devlink, table_name,</div><div class='del'>-						counters_enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_resource *</div><div class='del'>-devlink_resource_find(struct devlink *devlink,</div><div class='del'>-		      struct devlink_resource *resource, u64 resource_id)</div><div class='del'>-{</div><div class='del'>-	struct list_head *resource_list;</div><div class='del'>-</div><div class='del'>-	if (resource)</div><div class='del'>-		resource_list = &amp;resource-&gt;resource_list;</div><div class='del'>-	else</div><div class='del'>-		resource_list = &amp;devlink-&gt;resource_list;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(resource, resource_list, list) {</div><div class='del'>-		struct devlink_resource *child_resource;</div><div class='del'>-</div><div class='del'>-		if (resource-&gt;id == resource_id)</div><div class='del'>-			return resource;</div><div class='del'>-</div><div class='del'>-		child_resource = devlink_resource_find(devlink, resource,</div><div class='del'>-						       resource_id);</div><div class='del'>-		if (child_resource)</div><div class='del'>-			return child_resource;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-devlink_resource_validate_children(struct devlink_resource *resource)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *child_resource;</div><div class='del'>-	bool size_valid = true;</div><div class='del'>-	u64 parts_size = 0;</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;resource-&gt;resource_list))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(child_resource, &amp;resource-&gt;resource_list, list)</div><div class='del'>-		parts_size += child_resource-&gt;size_new;</div><div class='del'>-</div><div class='del'>-	if (parts_size &gt; resource-&gt;size_new)</div><div class='del'>-		size_valid = false;</div><div class='del'>-out:</div><div class='del'>-	resource-&gt;size_valid = size_valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_resource_validate_size(struct devlink_resource *resource, u64 size,</div><div class='del'>-			       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	u64 reminder;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (size &gt; resource-&gt;size_params.size_max) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(extack, "Size larger than maximum");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (size &lt; resource-&gt;size_params.size_min) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(extack, "Size smaller than minimum");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	div64_u64_rem(size, resource-&gt;size_params.size_granularity, &amp;reminder);</div><div class='del'>-	if (reminder) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(extack, "Wrong granularity");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_resource_set(struct sk_buff *skb,</div><div class='del'>-				       struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-	u64 resource_id;</div><div class='del'>-	u64 size;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_RESOURCE_ID] ||</div><div class='del'>-	    !info-&gt;attrs[DEVLINK_ATTR_RESOURCE_SIZE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	resource_id = nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_RESOURCE_ID]);</div><div class='del'>-</div><div class='del'>-	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='del'>-	if (!resource)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	size = nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_RESOURCE_SIZE]);</div><div class='del'>-	err = devlink_resource_validate_size(resource, size, info-&gt;extack);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	resource-&gt;size_new = size;</div><div class='del'>-	devlink_resource_validate_children(resource);</div><div class='del'>-	if (resource-&gt;parent)</div><div class='del'>-		devlink_resource_validate_children(resource-&gt;parent);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_resource_size_params_put(struct devlink_resource *resource,</div><div class='del'>-				 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource_size_params *size_params;</div><div class='del'>-</div><div class='del'>-	size_params = &amp;resource-&gt;size_params;</div><div class='del'>-	if (nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,</div><div class='del'>-			      size_params-&gt;size_granularity, DEVLINK_ATTR_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,</div><div class='del'>-			      size_params-&gt;size_max, DEVLINK_ATTR_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,</div><div class='del'>-			      size_params-&gt;size_min, DEVLINK_ATTR_PAD) ||</div><div class='del'>-	    nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_UNIT, size_params-&gt;unit))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_resource_occ_put(struct devlink_resource *resource,</div><div class='del'>-				    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (!resource-&gt;occ_get)</div><div class='del'>-		return 0;</div><div class='del'>-	return nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_OCC,</div><div class='del'>-				 resource-&gt;occ_get(resource-&gt;occ_get_priv),</div><div class='del'>-				 DEVLINK_ATTR_PAD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,</div><div class='del'>-				struct devlink_resource *resource)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *child_resource;</div><div class='del'>-	struct nlattr *child_resource_attr;</div><div class='del'>-	struct nlattr *resource_attr;</div><div class='del'>-</div><div class='del'>-	resource_attr = nla_nest_start(skb, DEVLINK_ATTR_RESOURCE);</div><div class='del'>-	if (!resource_attr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (nla_put_string(skb, DEVLINK_ATTR_RESOURCE_NAME, resource-&gt;name) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource-&gt;size,</div><div class='del'>-			      DEVLINK_ATTR_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_ID, resource-&gt;id,</div><div class='del'>-			      DEVLINK_ATTR_PAD))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (resource-&gt;size != resource-&gt;size_new)</div><div class='del'>-		nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,</div><div class='del'>-				  resource-&gt;size_new, DEVLINK_ATTR_PAD);</div><div class='del'>-	if (devlink_resource_occ_put(resource, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (devlink_resource_size_params_put(resource, skb))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	if (list_empty(&amp;resource-&gt;resource_list))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_SIZE_VALID,</div><div class='del'>-		       resource-&gt;size_valid))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	child_resource_attr = nla_nest_start(skb, DEVLINK_ATTR_RESOURCE_LIST);</div><div class='del'>-	if (!child_resource_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(child_resource, &amp;resource-&gt;resource_list, list) {</div><div class='del'>-		if (devlink_resource_put(devlink, skb, child_resource))</div><div class='del'>-			goto resource_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, child_resource_attr);</div><div class='del'>-out:</div><div class='del'>-	nla_nest_end(skb, resource_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-resource_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, child_resource_attr);</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(skb, resource_attr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_resource_fill(struct genl_info *info,</div><div class='del'>-				 enum devlink_command cmd, int flags)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-	struct nlattr *resources_attr;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	bool incomplete;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	resource = list_first_entry(&amp;devlink-&gt;resource_list,</div><div class='del'>-				    struct devlink_resource, list);</div><div class='del'>-start_again:</div><div class='del'>-	err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='del'>-	if (!hdr) {</div><div class='del'>-		nlmsg_free(skb);</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(skb, devlink))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	resources_attr = nla_nest_start(skb, DEVLINK_ATTR_RESOURCE_LIST);</div><div class='del'>-	if (!resources_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	incomplete = false;</div><div class='del'>-	i = 0;</div><div class='del'>-	list_for_each_entry_from(resource, &amp;devlink-&gt;resource_list, list) {</div><div class='del'>-		err = devlink_resource_put(devlink, skb, resource);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (!i)</div><div class='del'>-				goto err_resource_put;</div><div class='del'>-			incomplete = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	nla_nest_end(skb, resources_attr);</div><div class='del'>-	genlmsg_end(skb, hdr);</div><div class='del'>-	if (incomplete)</div><div class='del'>-		goto start_again;</div><div class='del'>-send_done:</div><div class='del'>-	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='del'>-			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		goto send_done;</div><div class='del'>-	}</div><div class='del'>-	return genlmsg_reply(skb, info);</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-err_resource_put:</div><div class='del'>-	nlmsg_free(skb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_resource_dump(struct sk_buff *skb,</div><div class='del'>-					struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;devlink-&gt;resource_list))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return devlink_resource_fill(info, DEVLINK_CMD_RESOURCE_DUMP, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_resources_validate(struct devlink *devlink,</div><div class='del'>-			   struct devlink_resource *resource,</div><div class='del'>-			   struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct list_head *resource_list;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (resource)</div><div class='del'>-		resource_list = &amp;resource-&gt;resource_list;</div><div class='del'>-	else</div><div class='del'>-		resource_list = &amp;devlink-&gt;resource_list;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(resource, resource_list, list) {</div><div class='del'>-		if (!resource-&gt;size_valid)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		err = devlink_resources_validate(devlink, resource, info);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;ops-&gt;reload)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	err = devlink_resources_validate(devlink, NULL, info);</div><div class='del'>-	if (err) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(info-&gt;extack, "resources size validation failed");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	return devlink-&gt;ops-&gt;reload(devlink, info-&gt;extack);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct devlink_param devlink_param_generic[] = {</div><div class='del'>-	{</div><div class='del'>-		.id = DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET,</div><div class='del'>-		.name = DEVLINK_PARAM_GENERIC_INT_ERR_RESET_NAME,</div><div class='del'>-		.type = DEVLINK_PARAM_GENERIC_INT_ERR_RESET_TYPE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.id = DEVLINK_PARAM_GENERIC_ID_MAX_MACS,</div><div class='del'>-		.name = DEVLINK_PARAM_GENERIC_MAX_MACS_NAME,</div><div class='del'>-		.type = DEVLINK_PARAM_GENERIC_MAX_MACS_TYPE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV,</div><div class='del'>-		.name = DEVLINK_PARAM_GENERIC_ENABLE_SRIOV_NAME,</div><div class='del'>-		.type = DEVLINK_PARAM_GENERIC_ENABLE_SRIOV_TYPE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.id = DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT,</div><div class='del'>-		.name = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_NAME,</div><div class='del'>-		.type = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_TYPE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int devlink_param_generic_verify(const struct devlink_param *param)</div><div class='del'>-{</div><div class='del'>-	/* verify it match generic parameter by id and name */</div><div class='del'>-	if (param-&gt;id &gt; DEVLINK_PARAM_GENERIC_ID_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (strcmp(param-&gt;name, devlink_param_generic[param-&gt;id].name))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	WARN_ON(param-&gt;type != devlink_param_generic[param-&gt;id].type);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_param_driver_verify(const struct devlink_param *param)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (param-&gt;id &lt;= DEVLINK_PARAM_GENERIC_ID_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/* verify no such name in generic params */</div><div class='del'>-	for (i = 0; i &lt;= DEVLINK_PARAM_GENERIC_ID_MAX; i++)</div><div class='del'>-		if (!strcmp(param-&gt;name, devlink_param_generic[i].name))</div><div class='del'>-			return -EEXIST;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_param_item *</div><div class='del'>-devlink_param_find_by_name(struct list_head *param_list,</div><div class='del'>-			   const char *param_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(param_item, param_list, list)</div><div class='del'>-		if (!strcmp(param_item-&gt;param-&gt;name, param_name))</div><div class='del'>-			return param_item;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_param_item *</div><div class='del'>-devlink_param_find_by_id(struct list_head *param_list, u32 param_id)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(param_item, param_list, list)</div><div class='del'>-		if (param_item-&gt;param-&gt;id == param_id)</div><div class='del'>-			return param_item;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-devlink_param_cmode_is_supported(const struct devlink_param *param,</div><div class='del'>-				 enum devlink_param_cmode cmode)</div><div class='del'>-{</div><div class='del'>-	return test_bit(cmode, &amp;param-&gt;supported_cmodes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_param_get(struct devlink *devlink,</div><div class='del'>-			     const struct devlink_param *param,</div><div class='del'>-			     struct devlink_param_gset_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	if (!param-&gt;get)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return param-&gt;get(devlink, param-&gt;id, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_param_set(struct devlink *devlink,</div><div class='del'>-			     const struct devlink_param *param,</div><div class='del'>-			     struct devlink_param_gset_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	if (!param-&gt;set)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return param-&gt;set(devlink, param-&gt;id, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_param_type_to_nla_type(enum devlink_param_type param_type)</div><div class='del'>-{</div><div class='del'>-	switch (param_type) {</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U8:</div><div class='del'>-		return NLA_U8;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U16:</div><div class='del'>-		return NLA_U16;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U32:</div><div class='del'>-		return NLA_U32;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_STRING:</div><div class='del'>-		return NLA_STRING;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_BOOL:</div><div class='del'>-		return NLA_FLAG;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_nl_param_value_fill_one(struct sk_buff *msg,</div><div class='del'>-				enum devlink_param_type type,</div><div class='del'>-				enum devlink_param_cmode cmode,</div><div class='del'>-				union devlink_param_value val)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *param_value_attr;</div><div class='del'>-</div><div class='del'>-	param_value_attr = nla_nest_start(msg, DEVLINK_ATTR_PARAM_VALUE);</div><div class='del'>-	if (!param_value_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u8(msg, DEVLINK_ATTR_PARAM_VALUE_CMODE, cmode))</div><div class='del'>-		goto value_nest_cancel;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U8:</div><div class='del'>-		if (nla_put_u8(msg, DEVLINK_ATTR_PARAM_VALUE_DATA, val.vu8))</div><div class='del'>-			goto value_nest_cancel;</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U16:</div><div class='del'>-		if (nla_put_u16(msg, DEVLINK_ATTR_PARAM_VALUE_DATA, val.vu16))</div><div class='del'>-			goto value_nest_cancel;</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U32:</div><div class='del'>-		if (nla_put_u32(msg, DEVLINK_ATTR_PARAM_VALUE_DATA, val.vu32))</div><div class='del'>-			goto value_nest_cancel;</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_STRING:</div><div class='del'>-		if (nla_put_string(msg, DEVLINK_ATTR_PARAM_VALUE_DATA,</div><div class='del'>-				   val.vstr))</div><div class='del'>-			goto value_nest_cancel;</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_BOOL:</div><div class='del'>-		if (val.vbool &amp;&amp;</div><div class='del'>-		    nla_put_flag(msg, DEVLINK_ATTR_PARAM_VALUE_DATA))</div><div class='del'>-			goto value_nest_cancel;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nla_nest_end(msg, param_value_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-value_nest_cancel:</div><div class='del'>-	nla_nest_cancel(msg, param_value_attr);</div><div class='del'>-nla_put_failure:</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				 struct devlink_param_item *param_item,</div><div class='del'>-				 enum devlink_command cmd,</div><div class='del'>-				 u32 portid, u32 seq, int flags)</div><div class='del'>-{</div><div class='del'>-	union devlink_param_value param_value[DEVLINK_PARAM_CMODE_MAX + 1];</div><div class='del'>-	const struct devlink_param *param = param_item-&gt;param;</div><div class='del'>-	struct devlink_param_gset_ctx ctx;</div><div class='del'>-	struct nlattr *param_values_list;</div><div class='del'>-	struct nlattr *param_attr;</div><div class='del'>-	int nla_type;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Get value from driver part to driverinit configuration mode */</div><div class='del'>-	for (i = 0; i &lt;= DEVLINK_PARAM_CMODE_MAX; i++) {</div><div class='del'>-		if (!devlink_param_cmode_is_supported(param, i))</div><div class='del'>-			continue;</div><div class='del'>-		if (i == DEVLINK_PARAM_CMODE_DRIVERINIT) {</div><div class='del'>-			if (!param_item-&gt;driverinit_value_valid)</div><div class='del'>-				return -EOPNOTSUPP;</div><div class='del'>-			param_value[i] = param_item-&gt;driverinit_value;</div><div class='del'>-		} else {</div><div class='del'>-			ctx.cmode = i;</div><div class='del'>-			err = devlink_param_get(devlink, param, &amp;ctx);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-			param_value[i] = ctx.val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	if (devlink_nl_put_handle(msg, devlink))</div><div class='del'>-		goto genlmsg_cancel;</div><div class='del'>-	param_attr = nla_nest_start(msg, DEVLINK_ATTR_PARAM);</div><div class='del'>-	if (!param_attr)</div><div class='del'>-		goto genlmsg_cancel;</div><div class='del'>-	if (nla_put_string(msg, DEVLINK_ATTR_PARAM_NAME, param-&gt;name))</div><div class='del'>-		goto param_nest_cancel;</div><div class='del'>-	if (param-&gt;generic &amp;&amp; nla_put_flag(msg, DEVLINK_ATTR_PARAM_GENERIC))</div><div class='del'>-		goto param_nest_cancel;</div><div class='del'>-</div><div class='del'>-	nla_type = devlink_param_type_to_nla_type(param-&gt;type);</div><div class='del'>-	if (nla_type &lt; 0)</div><div class='del'>-		goto param_nest_cancel;</div><div class='del'>-	if (nla_put_u8(msg, DEVLINK_ATTR_PARAM_TYPE, nla_type))</div><div class='del'>-		goto param_nest_cancel;</div><div class='del'>-</div><div class='del'>-	param_values_list = nla_nest_start(msg, DEVLINK_ATTR_PARAM_VALUES_LIST);</div><div class='del'>-	if (!param_values_list)</div><div class='del'>-		goto param_nest_cancel;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= DEVLINK_PARAM_CMODE_MAX; i++) {</div><div class='del'>-		if (!devlink_param_cmode_is_supported(param, i))</div><div class='del'>-			continue;</div><div class='del'>-		err = devlink_nl_param_value_fill_one(msg, param-&gt;type,</div><div class='del'>-						      i, param_value[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			goto values_list_nest_cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nla_nest_end(msg, param_values_list);</div><div class='del'>-	nla_nest_end(msg, param_attr);</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-values_list_nest_cancel:</div><div class='del'>-	nla_nest_end(msg, param_values_list);</div><div class='del'>-param_nest_cancel:</div><div class='del'>-	nla_nest_cancel(msg, param_attr);</div><div class='del'>-genlmsg_cancel:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_param_notify(struct devlink *devlink,</div><div class='del'>-				 struct devlink_param_item *param_item,</div><div class='del'>-				 enum devlink_command cmd)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	WARN_ON(cmd != DEVLINK_CMD_PARAM_NEW &amp;&amp; cmd != DEVLINK_CMD_PARAM_DEL);</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-	err = devlink_nl_param_fill(msg, devlink, param_item, cmd, 0, 0, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genlmsg_multicast_netns(&amp;devlink_nl_family, devlink_net(devlink),</div><div class='del'>-				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_param_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					   struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)))</div><div class='del'>-			continue;</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(param_item, &amp;devlink-&gt;param_list, list) {</div><div class='del'>-			if (idx &lt; start) {</div><div class='del'>-				idx++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_param_fill(msg, devlink, param_item,</div><div class='del'>-						    DEVLINK_CMD_PARAM_GET,</div><div class='del'>-						    NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						    cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						    NLM_F_MULTI);</div><div class='del'>-			if (err) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_param_type_get_from_info(struct genl_info *info,</div><div class='del'>-				 enum devlink_param_type *param_type)</div><div class='del'>-{</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_PARAM_TYPE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_PARAM_TYPE])) {</div><div class='del'>-	case NLA_U8:</div><div class='del'>-		*param_type = DEVLINK_PARAM_TYPE_U8;</div><div class='del'>-		break;</div><div class='del'>-	case NLA_U16:</div><div class='del'>-		*param_type = DEVLINK_PARAM_TYPE_U16;</div><div class='del'>-		break;</div><div class='del'>-	case NLA_U32:</div><div class='del'>-		*param_type = DEVLINK_PARAM_TYPE_U32;</div><div class='del'>-		break;</div><div class='del'>-	case NLA_STRING:</div><div class='del'>-		*param_type = DEVLINK_PARAM_TYPE_STRING;</div><div class='del'>-		break;</div><div class='del'>-	case NLA_FLAG:</div><div class='del'>-		*param_type = DEVLINK_PARAM_TYPE_BOOL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devlink_param_value_get_from_info(const struct devlink_param *param,</div><div class='del'>-				  struct genl_info *info,</div><div class='del'>-				  union devlink_param_value *value)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (param-&gt;type != DEVLINK_PARAM_TYPE_BOOL &amp;&amp;</div><div class='del'>-	    !info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;type) {</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U8:</div><div class='del'>-		value-&gt;vu8 = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U16:</div><div class='del'>-		value-&gt;vu16 = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_U32:</div><div class='del'>-		value-&gt;vu32 = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_STRING:</div><div class='del'>-		len = strnlen(nla_data(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]),</div><div class='del'>-			      nla_len(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));</div><div class='del'>-		if (len == nla_len(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]) ||</div><div class='del'>-		    len &gt;= __DEVLINK_PARAM_MAX_STRING_VALUE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		strcpy(value-&gt;vstr,</div><div class='del'>-		       nla_data(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PARAM_TYPE_BOOL:</div><div class='del'>-		value-&gt;vbool = info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA] ?</div><div class='del'>-			       true : false;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct devlink_param_item *</div><div class='del'>-devlink_param_get_from_info(struct devlink *devlink,</div><div class='del'>-			    struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	char *param_name;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_PARAM_NAME])</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	param_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_PARAM_NAME]);</div><div class='del'>-	return devlink_param_find_by_name(&amp;devlink-&gt;param_list, param_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_param_get_doit(struct sk_buff *skb,</div><div class='del'>-					 struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_get_from_info(devlink, info);</div><div class='del'>-	if (!param_item)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_param_fill(msg, devlink, param_item,</div><div class='del'>-				    DEVLINK_CMD_PARAM_GET,</div><div class='del'>-				    info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_param_set_doit(struct sk_buff *skb,</div><div class='del'>-					 struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	enum devlink_param_type param_type;</div><div class='del'>-	struct devlink_param_gset_ctx ctx;</div><div class='del'>-	enum devlink_param_cmode cmode;</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-	const struct devlink_param *param;</div><div class='del'>-	union devlink_param_value value;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_get_from_info(devlink, info);</div><div class='del'>-	if (!param_item)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	param = param_item-&gt;param;</div><div class='del'>-	err = devlink_param_type_get_from_info(info, &amp;param_type);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	if (param_type != param-&gt;type)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	err = devlink_param_value_get_from_info(param, info, &amp;value);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	if (param-&gt;validate) {</div><div class='del'>-		err = param-&gt;validate(devlink, param-&gt;id, value, info-&gt;extack);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_CMODE])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	cmode = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_CMODE]);</div><div class='del'>-	if (!devlink_param_cmode_is_supported(param, cmode))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (cmode == DEVLINK_PARAM_CMODE_DRIVERINIT) {</div><div class='del'>-		if (param-&gt;type == DEVLINK_PARAM_TYPE_STRING)</div><div class='del'>-			strcpy(param_item-&gt;driverinit_value.vstr, value.vstr);</div><div class='del'>-		else</div><div class='del'>-			param_item-&gt;driverinit_value = value;</div><div class='del'>-		param_item-&gt;driverinit_value_valid = true;</div><div class='del'>-	} else {</div><div class='del'>-		if (!param-&gt;set)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		ctx.val = value;</div><div class='del'>-		ctx.cmode = cmode;</div><div class='del'>-		err = devlink_param_set(devlink, param, &amp;ctx);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devlink_param_notify(devlink, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_param_register_one(struct devlink *devlink,</div><div class='del'>-				      const struct devlink_param *param)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	if (devlink_param_find_by_name(&amp;devlink-&gt;param_list,</div><div class='del'>-				       param-&gt;name))</div><div class='del'>-		return -EEXIST;</div><div class='del'>-</div><div class='del'>-	if (param-&gt;supported_cmodes == BIT(DEVLINK_PARAM_CMODE_DRIVERINIT))</div><div class='del'>-		WARN_ON(param-&gt;get || param-&gt;set);</div><div class='del'>-	else</div><div class='del'>-		WARN_ON(!param-&gt;get || !param-&gt;set);</div><div class='del'>-</div><div class='del'>-	param_item = kzalloc(sizeof(*param_item), GFP_KERNEL);</div><div class='del'>-	if (!param_item)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	param_item-&gt;param = param;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;param_item-&gt;list, &amp;devlink-&gt;param_list);</div><div class='del'>-	devlink_param_notify(devlink, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_param_unregister_one(struct devlink *devlink,</div><div class='del'>-					 const struct devlink_param *param)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_find_by_name(&amp;devlink-&gt;param_list,</div><div class='del'>-						param-&gt;name);</div><div class='del'>-	WARN_ON(!param_item);</div><div class='del'>-	devlink_param_notify(devlink, param_item, DEVLINK_CMD_PARAM_DEL);</div><div class='del'>-	list_del(&amp;param_item-&gt;list);</div><div class='del'>-	kfree(param_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_region_snapshot_id_put(struct sk_buff *msg,</div><div class='del'>-					     struct devlink *devlink,</div><div class='del'>-					     struct devlink_snapshot *snapshot)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *snap_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	snap_attr = nla_nest_start(msg, DEVLINK_ATTR_REGION_SNAPSHOT);</div><div class='del'>-	if (!snap_attr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nla_put_u32(msg, DEVLINK_ATTR_REGION_SNAPSHOT_ID, snapshot-&gt;id);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(msg, snap_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(msg, snap_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_region_snapshots_id_put(struct sk_buff *msg,</div><div class='del'>-					      struct devlink *devlink,</div><div class='del'>-					      struct devlink_region *region)</div><div class='del'>-{</div><div class='del'>-	struct devlink_snapshot *snapshot;</div><div class='del'>-	struct nlattr *snapshots_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	snapshots_attr = nla_nest_start(msg, DEVLINK_ATTR_REGION_SNAPSHOTS);</div><div class='del'>-	if (!snapshots_attr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(snapshot, &amp;region-&gt;snapshot_list, list) {</div><div class='del'>-		err = devlink_nl_region_snapshot_id_put(msg, devlink, snapshot);</div><div class='del'>-		if (err)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nla_nest_end(msg, snapshots_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(msg, snapshots_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='del'>-				  enum devlink_command cmd, u32 portid,</div><div class='del'>-				  u32 seq, int flags,</div><div class='del'>-				  struct devlink_region *region)</div><div class='del'>-{</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_put_handle(msg, devlink);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, region-&gt;name);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_SIZE,</div><div class='del'>-				region-&gt;size,</div><div class='del'>-				DEVLINK_ATTR_PAD);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_region_snapshots_id_put(msg, devlink, region);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void devlink_nl_region_notify(struct devlink_region *region,</div><div class='del'>-				     struct devlink_snapshot *snapshot,</div><div class='del'>-				     enum devlink_command cmd)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = region-&gt;devlink;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	WARN_ON(cmd != DEVLINK_CMD_REGION_NEW &amp;&amp; cmd != DEVLINK_CMD_REGION_DEL);</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(msg, 0, 0, &amp;devlink_nl_family, 0, cmd);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		goto out_free_msg;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_put_handle(msg, devlink);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_cancel_msg;</div><div class='del'>-</div><div class='del'>-	err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME,</div><div class='del'>-			     region-&gt;name);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_cancel_msg;</div><div class='del'>-</div><div class='del'>-	if (snapshot) {</div><div class='del'>-		err = nla_put_u32(msg, DEVLINK_ATTR_REGION_SNAPSHOT_ID,</div><div class='del'>-				  snapshot-&gt;id);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_cancel_msg;</div><div class='del'>-	} else {</div><div class='del'>-		err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_SIZE,</div><div class='del'>-					region-&gt;size, DEVLINK_ATTR_PAD);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_cancel_msg;</div><div class='del'>-	}</div><div class='del'>-	genlmsg_end(msg, hdr);</div><div class='del'>-</div><div class='del'>-	genlmsg_multicast_netns(&amp;devlink_nl_family, devlink_net(devlink),</div><div class='del'>-				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-out_cancel_msg:</div><div class='del'>-	genlmsg_cancel(msg, hdr);</div><div class='del'>-out_free_msg:</div><div class='del'>-	nlmsg_free(msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_region_get_doit(struct sk_buff *skb,</div><div class='del'>-					  struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	const char *region_name;</div><div class='del'>-	struct sk_buff *msg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_REGION_NAME])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	region_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='del'>-	region = devlink_region_get_by_name(devlink, region_name);</div><div class='del'>-	if (!region)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_region_fill(msg, devlink, DEVLINK_CMD_REGION_GET,</div><div class='del'>-				     info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='del'>-				     region);</div><div class='del'>-	if (err) {</div><div class='del'>-		nlmsg_free(msg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return genlmsg_reply(msg, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_region_get_dumpit(struct sk_buff *msg,</div><div class='del'>-					    struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int start = cb-&gt;args[0];</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	list_for_each_entry(devlink, &amp;devlink_list, list) {</div><div class='del'>-		if (!net_eq(devlink_net(devlink), sock_net(msg-&gt;sk)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-		list_for_each_entry(region, &amp;devlink-&gt;region_list, list) {</div><div class='del'>-			if (idx &lt; start) {</div><div class='del'>-				idx++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			err = devlink_nl_region_fill(msg, devlink,</div><div class='del'>-						     DEVLINK_CMD_REGION_GET,</div><div class='del'>-						     NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						     cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						     NLM_F_MULTI, region);</div><div class='del'>-			if (err) {</div><div class='del'>-				mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	return msg-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_region_del(struct sk_buff *skb,</div><div class='del'>-				     struct genl_info *info)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='del'>-	struct devlink_snapshot *snapshot;</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	const char *region_name;</div><div class='del'>-	u32 snapshot_id;</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;attrs[DEVLINK_ATTR_REGION_NAME] ||</div><div class='del'>-	    !info-&gt;attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	region_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='del'>-	snapshot_id = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);</div><div class='del'>-</div><div class='del'>-	region = devlink_region_get_by_name(devlink, region_name);</div><div class='del'>-	if (!region)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);</div><div class='del'>-	if (!snapshot)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_DEL);</div><div class='del'>-	devlink_region_snapshot_del(snapshot);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_region_read_chunk_fill(struct sk_buff *msg,</div><div class='del'>-						 struct devlink *devlink,</div><div class='del'>-						 u8 *chunk, u32 chunk_size,</div><div class='del'>-						 u64 addr)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *chunk_attr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	chunk_attr = nla_nest_start(msg, DEVLINK_ATTR_REGION_CHUNK);</div><div class='del'>-	if (!chunk_attr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nla_put(msg, DEVLINK_ATTR_REGION_CHUNK_DATA, chunk_size, chunk);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_CHUNK_ADDR, addr,</div><div class='del'>-				DEVLINK_ATTR_PAD);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(msg, chunk_attr);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nla_nest_cancel(msg, chunk_attr);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEVLINK_REGION_READ_CHUNK_SIZE 256</div><div class='del'>-</div><div class='del'>-static int devlink_nl_region_read_snapshot_fill(struct sk_buff *skb,</div><div class='del'>-						struct devlink *devlink,</div><div class='del'>-						struct devlink_region *region,</div><div class='del'>-						struct nlattr **attrs,</div><div class='del'>-						u64 start_offset,</div><div class='del'>-						u64 end_offset,</div><div class='del'>-						bool dump,</div><div class='del'>-						u64 *new_offset)</div><div class='del'>-{</div><div class='del'>-	struct devlink_snapshot *snapshot;</div><div class='del'>-	u64 curr_offset = start_offset;</div><div class='del'>-	u32 snapshot_id;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	*new_offset = start_offset;</div><div class='del'>-</div><div class='del'>-	snapshot_id = nla_get_u32(attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);</div><div class='del'>-	snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);</div><div class='del'>-	if (!snapshot)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (end_offset &gt; snapshot-&gt;data_len || dump)</div><div class='del'>-		end_offset = snapshot-&gt;data_len;</div><div class='del'>-</div><div class='del'>-	while (curr_offset &lt; end_offset) {</div><div class='del'>-		u32 data_size;</div><div class='del'>-		u8 *data;</div><div class='del'>-</div><div class='del'>-		if (end_offset - curr_offset &lt; DEVLINK_REGION_READ_CHUNK_SIZE)</div><div class='del'>-			data_size = end_offset - curr_offset;</div><div class='del'>-		else</div><div class='del'>-			data_size = DEVLINK_REGION_READ_CHUNK_SIZE;</div><div class='del'>-</div><div class='del'>-		data = &amp;snapshot-&gt;data[curr_offset];</div><div class='del'>-		err = devlink_nl_cmd_region_read_chunk_fill(skb, devlink,</div><div class='del'>-							    data, data_size,</div><div class='del'>-							    curr_offset);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		curr_offset += data_size;</div><div class='del'>-	}</div><div class='del'>-	*new_offset = curr_offset;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,</div><div class='del'>-					     struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	u64 ret_offset, start_offset, end_offset = 0;</div><div class='del'>-	struct nlattr *attrs[DEVLINK_ATTR_MAX + 1];</div><div class='del'>-	const struct genl_ops *ops = cb-&gt;data;</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	struct nlattr *chunks_attr;</div><div class='del'>-	const char *region_name;</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	bool dump = true;</div><div class='del'>-	void *hdr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	start_offset = *((u64 *)&amp;cb-&gt;args[0]);</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(cb-&gt;nlh, GENL_HDRLEN + devlink_nl_family.hdrsize,</div><div class='del'>-			  attrs, DEVLINK_ATTR_MAX, ops-&gt;policy, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	devlink = devlink_get_from_attrs(sock_net(cb-&gt;skb-&gt;sk), attrs);</div><div class='del'>-	if (IS_ERR(devlink))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!attrs[DEVLINK_ATTR_REGION_NAME] ||</div><div class='del'>-	    !attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID])</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	region_name = nla_data(attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='del'>-	region = devlink_region_get_by_name(devlink, region_name);</div><div class='del'>-	if (!region)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	hdr = genlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-			  &amp;devlink_nl_family, NLM_F_ACK | NLM_F_MULTI,</div><div class='del'>-			  DEVLINK_CMD_REGION_READ);</div><div class='del'>-	if (!hdr)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_put_handle(skb, devlink);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	err = nla_put_string(skb, DEVLINK_ATTR_REGION_NAME, region_name);</div><div class='del'>-	if (err)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	chunks_attr = nla_nest_start(skb, DEVLINK_ATTR_REGION_CHUNKS);</div><div class='del'>-	if (!chunks_attr)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR] &amp;&amp;</div><div class='del'>-	    attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]) {</div><div class='del'>-		if (!start_offset)</div><div class='del'>-			start_offset =</div><div class='del'>-				nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR]);</div><div class='del'>-</div><div class='del'>-		end_offset = nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR]);</div><div class='del'>-		end_offset += nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]);</div><div class='del'>-		dump = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = devlink_nl_region_read_snapshot_fill(skb, devlink,</div><div class='del'>-						   region, attrs,</div><div class='del'>-						   start_offset,</div><div class='del'>-						   end_offset, dump,</div><div class='del'>-						   &amp;ret_offset);</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; err != -EMSGSIZE)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	/* Check if there was any progress done to prevent infinite loop */</div><div class='del'>-	if (ret_offset == start_offset)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	*((u64 *)&amp;cb-&gt;args[0]) = ret_offset;</div><div class='del'>-</div><div class='del'>-	nla_nest_end(skb, chunks_attr);</div><div class='del'>-	genlmsg_end(skb, hdr);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	genlmsg_cancel(skb, hdr);</div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-out:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {</div><div class='del'>-	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING },</div><div class='del'>-	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING },</div><div class='del'>-	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32 },</div><div class='del'>-	[DEVLINK_ATTR_PORT_TYPE] = { .type = NLA_U16 },</div><div class='del'>-	[DEVLINK_ATTR_PORT_SPLIT_COUNT] = { .type = NLA_U32 },</div><div class='del'>-	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32 },</div><div class='del'>-	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16 },</div><div class='del'>-	[DEVLINK_ATTR_SB_POOL_TYPE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_SB_POOL_SIZE] = { .type = NLA_U32 },</div><div class='del'>-	[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_SB_THRESHOLD] = { .type = NLA_U32 },</div><div class='del'>-	[DEVLINK_ATTR_SB_TC_INDEX] = { .type = NLA_U16 },</div><div class='del'>-	[DEVLINK_ATTR_ESWITCH_MODE] = { .type = NLA_U16 },</div><div class='del'>-	[DEVLINK_ATTR_ESWITCH_INLINE_MODE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING },</div><div class='del'>-	[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_RESOURCE_ID] = { .type = NLA_U64},</div><div class='del'>-	[DEVLINK_ATTR_RESOURCE_SIZE] = { .type = NLA_U64},</div><div class='del'>-	[DEVLINK_ATTR_PARAM_NAME] = { .type = NLA_NUL_STRING },</div><div class='del'>-	[DEVLINK_ATTR_PARAM_TYPE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 },</div><div class='del'>-	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING },</div><div class='del'>-	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct genl_ops devlink_nl_ops[] = {</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PORT_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_port_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_port_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PORT_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_port_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PORT_SPLIT,</div><div class='del'>-		.doit = devlink_nl_cmd_port_split_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NO_LOCK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PORT_UNSPLIT,</div><div class='del'>-		.doit = devlink_nl_cmd_port_unsplit_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NO_LOCK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_sb_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_POOL_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_pool_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_sb_pool_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_POOL_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_pool_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_PORT_POOL_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_port_pool_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_sb_port_pool_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_PORT_POOL_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_port_pool_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_sb_tc_pool_bind_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_occ_snapshot_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,</div><div class='del'>-		.doit = devlink_nl_cmd_sb_occ_max_clear_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NEED_SB,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_ESWITCH_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_eswitch_get_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_ESWITCH_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_eswitch_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NO_LOCK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_DPIPE_TABLE_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_dpipe_table_get,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_dpipe_entries_get,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_dpipe_headers_get,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_dpipe_table_counters_set,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_RESOURCE_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_resource_set,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_RESOURCE_DUMP,</div><div class='del'>-		.doit = devlink_nl_cmd_resource_dump,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_RELOAD,</div><div class='del'>-		.doit = devlink_nl_cmd_reload,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |</div><div class='del'>-				  DEVLINK_NL_FLAG_NO_LOCK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PARAM_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_param_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_param_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-		/* can be retrieved by unprivileged users */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_PARAM_SET,</div><div class='del'>-		.doit = devlink_nl_cmd_param_set_doit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_REGION_GET,</div><div class='del'>-		.doit = devlink_nl_cmd_region_get_doit,</div><div class='del'>-		.dumpit = devlink_nl_cmd_region_get_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_REGION_DEL,</div><div class='del'>-		.doit = devlink_nl_cmd_region_del,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = DEVLINK_CMD_REGION_READ,</div><div class='del'>-		.dumpit = devlink_nl_cmd_region_read_dumpit,</div><div class='del'>-		.policy = devlink_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct genl_family devlink_nl_family __ro_after_init = {</div><div class='del'>-	.name		= DEVLINK_GENL_NAME,</div><div class='del'>-	.version	= DEVLINK_GENL_VERSION,</div><div class='del'>-	.maxattr	= DEVLINK_ATTR_MAX,</div><div class='del'>-	.netnsok	= true,</div><div class='del'>-	.pre_doit	= devlink_nl_pre_doit,</div><div class='del'>-	.post_doit	= devlink_nl_post_doit,</div><div class='del'>-	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= devlink_nl_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(devlink_nl_ops),</div><div class='del'>-	.mcgrps		= devlink_nl_mcgrps,</div><div class='del'>-	.n_mcgrps	= ARRAY_SIZE(devlink_nl_mcgrps),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_alloc - Allocate new devlink instance resources</div><div class='del'>- *</div><div class='del'>- *	@ops: ops</div><div class='del'>- *	@priv_size: size of user private data</div><div class='del'>- *</div><div class='del'>- *	Allocate new devlink instance resources, including devlink index</div><div class='del'>- *	and name.</div><div class='del'>- */</div><div class='del'>-struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-</div><div class='del'>-	devlink = kzalloc(sizeof(*devlink) + priv_size, GFP_KERNEL);</div><div class='del'>-	if (!devlink)</div><div class='del'>-		return NULL;</div><div class='del'>-	devlink-&gt;ops = ops;</div><div class='del'>-	devlink_net_set(devlink, &amp;init_net);</div><div class='del'>-	INIT_LIST_HEAD(&amp;devlink-&gt;port_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;devlink-&gt;sb_list);</div><div class='del'>-	INIT_LIST_HEAD_RCU(&amp;devlink-&gt;dpipe_table_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;devlink-&gt;resource_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;devlink-&gt;param_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;devlink-&gt;region_list);</div><div class='del'>-	mutex_init(&amp;devlink-&gt;lock);</div><div class='del'>-	return devlink;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_alloc);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_register - Register devlink instance</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- */</div><div class='del'>-int devlink_register(struct devlink *devlink, struct device *dev)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	devlink-&gt;dev = dev;</div><div class='del'>-	list_add_tail(&amp;devlink-&gt;list, &amp;devlink_list);</div><div class='del'>-	devlink_notify(devlink, DEVLINK_CMD_NEW);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_unregister - Unregister devlink instance</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- */</div><div class='del'>-void devlink_unregister(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;devlink_mutex);</div><div class='del'>-	devlink_notify(devlink, DEVLINK_CMD_DEL);</div><div class='del'>-	list_del(&amp;devlink-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;devlink_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_free - Free devlink instance resources</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- */</div><div class='del'>-void devlink_free(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	kfree(devlink);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_free);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_register - Register devlink port</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- *	@port_index</div><div class='del'>- *</div><div class='del'>- *	Register devlink port with provided port index. User can use</div><div class='del'>- *	any indexing, even hw-related one. devlink_port structure</div><div class='del'>- *	is convenient to be embedded inside user driver private structure.</div><div class='del'>- *	Note that the caller should take care of zeroing the devlink_port</div><div class='del'>- *	structure.</div><div class='del'>- */</div><div class='del'>-int devlink_port_register(struct devlink *devlink,</div><div class='del'>-			  struct devlink_port *devlink_port,</div><div class='del'>-			  unsigned int port_index)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	if (devlink_port_index_exists(devlink, port_index)) {</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-	devlink_port-&gt;devlink = devlink;</div><div class='del'>-	devlink_port-&gt;index = port_index;</div><div class='del'>-	devlink_port-&gt;registered = true;</div><div class='del'>-	list_add_tail(&amp;devlink_port-&gt;list, &amp;devlink-&gt;port_list);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_unregister - Unregister devlink port</div><div class='del'>- *</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- */</div><div class='del'>-void devlink_port_unregister(struct devlink_port *devlink_port)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='del'>-</div><div class='del'>-	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_DEL);</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	list_del(&amp;devlink_port-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_unregister);</div><div class='del'>-</div><div class='del'>-static void __devlink_port_type_set(struct devlink_port *devlink_port,</div><div class='del'>-				    enum devlink_port_type type,</div><div class='del'>-				    void *type_dev)</div><div class='del'>-{</div><div class='del'>-	devlink_port-&gt;type = type;</div><div class='del'>-	devlink_port-&gt;type_dev = type_dev;</div><div class='del'>-	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_type_eth_set - Set port type to Ethernet</div><div class='del'>- *</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- *	@netdev: related netdevice</div><div class='del'>- */</div><div class='del'>-void devlink_port_type_eth_set(struct devlink_port *devlink_port,</div><div class='del'>-			       struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	return __devlink_port_type_set(devlink_port,</div><div class='del'>-				       DEVLINK_PORT_TYPE_ETH, netdev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_type_ib_set - Set port type to InfiniBand</div><div class='del'>- *</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- *	@ibdev: related IB device</div><div class='del'>- */</div><div class='del'>-void devlink_port_type_ib_set(struct devlink_port *devlink_port,</div><div class='del'>-			      struct ib_device *ibdev)</div><div class='del'>-{</div><div class='del'>-	return __devlink_port_type_set(devlink_port,</div><div class='del'>-				       DEVLINK_PORT_TYPE_IB, ibdev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_type_clear - Clear port type</div><div class='del'>- *</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- */</div><div class='del'>-void devlink_port_type_clear(struct devlink_port *devlink_port)</div><div class='del'>-{</div><div class='del'>-	return __devlink_port_type_set(devlink_port,</div><div class='del'>-				       DEVLINK_PORT_TYPE_NOTSET, NULL);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_type_clear);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_port_attrs_set - Set port attributes</div><div class='del'>- *</div><div class='del'>- *	@devlink_port: devlink port</div><div class='del'>- *	@flavour: flavour of the port</div><div class='del'>- *	@port_number: number of the port that is facing user, for example</div><div class='del'>- *	              the front panel port number</div><div class='del'>- *	@split: indicates if this is split port</div><div class='del'>- *	@split_subport_number: if the port is split, this is the number</div><div class='del'>- *	                       of subport.</div><div class='del'>- */</div><div class='del'>-void devlink_port_attrs_set(struct devlink_port *devlink_port,</div><div class='del'>-			    enum devlink_port_flavour flavour,</div><div class='del'>-			    u32 port_number, bool split,</div><div class='del'>-			    u32 split_subport_number)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='del'>-</div><div class='del'>-	attrs-&gt;set = true;</div><div class='del'>-	attrs-&gt;flavour = flavour;</div><div class='del'>-	attrs-&gt;port_number = port_number;</div><div class='del'>-	attrs-&gt;split = split;</div><div class='del'>-	attrs-&gt;split_subport_number = split_subport_number;</div><div class='del'>-	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_attrs_set);</div><div class='del'>-</div><div class='del'>-int devlink_port_get_phys_port_name(struct devlink_port *devlink_port,</div><div class='del'>-				    char *name, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='del'>-	int n = 0;</div><div class='del'>-</div><div class='del'>-	if (!attrs-&gt;set)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (attrs-&gt;flavour) {</div><div class='del'>-	case DEVLINK_PORT_FLAVOUR_PHYSICAL:</div><div class='del'>-		if (!attrs-&gt;split)</div><div class='del'>-			n = snprintf(name, len, "p%u", attrs-&gt;port_number);</div><div class='del'>-		else</div><div class='del'>-			n = snprintf(name, len, "p%us%u", attrs-&gt;port_number,</div><div class='del'>-				     attrs-&gt;split_subport_number);</div><div class='del'>-		break;</div><div class='del'>-	case DEVLINK_PORT_FLAVOUR_CPU:</div><div class='del'>-	case DEVLINK_PORT_FLAVOUR_DSA:</div><div class='del'>-		/* As CPU and DSA ports do not have a netdevice associated</div><div class='del'>-		 * case should not ever happen.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (n &gt;= len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_port_get_phys_port_name);</div><div class='del'>-</div><div class='del'>-int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,</div><div class='del'>-			u32 size, u16 ingress_pools_count,</div><div class='del'>-			u16 egress_pools_count, u16 ingress_tc_count,</div><div class='del'>-			u16 egress_tc_count)</div><div class='del'>-{</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	if (devlink_sb_index_exists(devlink, sb_index)) {</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devlink_sb = kzalloc(sizeof(*devlink_sb), GFP_KERNEL);</div><div class='del'>-	if (!devlink_sb) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-	devlink_sb-&gt;index = sb_index;</div><div class='del'>-	devlink_sb-&gt;size = size;</div><div class='del'>-	devlink_sb-&gt;ingress_pools_count = ingress_pools_count;</div><div class='del'>-	devlink_sb-&gt;egress_pools_count = egress_pools_count;</div><div class='del'>-	devlink_sb-&gt;ingress_tc_count = ingress_tc_count;</div><div class='del'>-	devlink_sb-&gt;egress_tc_count = egress_tc_count;</div><div class='del'>-	list_add_tail(&amp;devlink_sb-&gt;list, &amp;devlink-&gt;sb_list);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_sb_register);</div><div class='del'>-</div><div class='del'>-void devlink_sb_unregister(struct devlink *devlink, unsigned int sb_index)</div><div class='del'>-{</div><div class='del'>-	struct devlink_sb *devlink_sb;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	devlink_sb = devlink_sb_get_by_index(devlink, sb_index);</div><div class='del'>-	WARN_ON(!devlink_sb);</div><div class='del'>-	list_del(&amp;devlink_sb-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	kfree(devlink_sb);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_sb_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_headers_register - register dpipe headers</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@dpipe_headers: dpipe header array</div><div class='del'>- *</div><div class='del'>- *	Register the headers supported by hardware.</div><div class='del'>- */</div><div class='del'>-int devlink_dpipe_headers_register(struct devlink *devlink,</div><div class='del'>-				   struct devlink_dpipe_headers *dpipe_headers)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	devlink-&gt;dpipe_headers = dpipe_headers;</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_headers_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_headers_unregister - unregister dpipe headers</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *</div><div class='del'>- *	Unregister the headers supported by hardware.</div><div class='del'>- */</div><div class='del'>-void devlink_dpipe_headers_unregister(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	devlink-&gt;dpipe_headers = NULL;</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_headers_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_table_counter_enabled - check if counter allocation</div><div class='del'>- *					      required</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@table_name: tables name</div><div class='del'>- *</div><div class='del'>- *	Used by driver to check if counter allocation is required.</div><div class='del'>- *	After counter allocation is turned on the table entries</div><div class='del'>- *	are updated to include counter statistics.</div><div class='del'>- *</div><div class='del'>- *	After that point on the driver must respect the counter</div><div class='del'>- *	state so that each entry added to the table is added</div><div class='del'>- *	with a counter.</div><div class='del'>- */</div><div class='del'>-bool devlink_dpipe_table_counter_enabled(struct devlink *devlink,</div><div class='del'>-					 const char *table_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-	bool enabled;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-	enabled = false;</div><div class='del'>-	if (table)</div><div class='del'>-		enabled = table-&gt;counters_enabled;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return enabled;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_table_counter_enabled);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_table_register - register dpipe table</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@table_name: table name</div><div class='del'>- *	@table_ops: table ops</div><div class='del'>- *	@priv: priv</div><div class='del'>- *	@counter_control_extern: external control for counters</div><div class='del'>- */</div><div class='del'>-int devlink_dpipe_table_register(struct devlink *devlink,</div><div class='del'>-				 const char *table_name,</div><div class='del'>-				 struct devlink_dpipe_table_ops *table_ops,</div><div class='del'>-				 void *priv, bool counter_control_extern)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-</div><div class='del'>-	if (devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list, table_name))</div><div class='del'>-		return -EEXIST;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!table_ops-&gt;size_get))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	table = kzalloc(sizeof(*table), GFP_KERNEL);</div><div class='del'>-	if (!table)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	table-&gt;name = table_name;</div><div class='del'>-	table-&gt;table_ops = table_ops;</div><div class='del'>-	table-&gt;priv = priv;</div><div class='del'>-	table-&gt;counter_control_extern = counter_control_extern;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	list_add_tail_rcu(&amp;table-&gt;list, &amp;devlink-&gt;dpipe_table_list);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_table_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_table_unregister - unregister dpipe table</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@table_name: table name</div><div class='del'>- */</div><div class='del'>-void devlink_dpipe_table_unregister(struct devlink *devlink,</div><div class='del'>-				    const char *table_name)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-	if (!table)</div><div class='del'>-		goto unlock;</div><div class='del'>-	list_del_rcu(&amp;table-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	kfree_rcu(table, rcu);</div><div class='del'>-	return;</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_table_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_resource_register - devlink resource register</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@resource_name: resource's name</div><div class='del'>- *	@top_hierarchy: top hierarchy</div><div class='del'>- *	@reload_required: reload is required for new configuration to</div><div class='del'>- *			  apply</div><div class='del'>- *	@resource_size: resource's size</div><div class='del'>- *	@resource_id: resource's id</div><div class='del'>- *	@parent_reosurce_id: resource's parent id</div><div class='del'>- *	@size params: size parameters</div><div class='del'>- */</div><div class='del'>-int devlink_resource_register(struct devlink *devlink,</div><div class='del'>-			      const char *resource_name,</div><div class='del'>-			      u64 resource_size,</div><div class='del'>-			      u64 resource_id,</div><div class='del'>-			      u64 parent_resource_id,</div><div class='del'>-			      const struct devlink_resource_size_params *size_params)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-	struct list_head *resource_list;</div><div class='del'>-	bool top_hierarchy;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	top_hierarchy = parent_resource_id == DEVLINK_RESOURCE_ID_PARENT_TOP;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='del'>-	if (resource) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	resource = kzalloc(sizeof(*resource), GFP_KERNEL);</div><div class='del'>-	if (!resource) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (top_hierarchy) {</div><div class='del'>-		resource_list = &amp;devlink-&gt;resource_list;</div><div class='del'>-	} else {</div><div class='del'>-		struct devlink_resource *parent_resource;</div><div class='del'>-</div><div class='del'>-		parent_resource = devlink_resource_find(devlink, NULL,</div><div class='del'>-							parent_resource_id);</div><div class='del'>-		if (parent_resource) {</div><div class='del'>-			resource_list = &amp;parent_resource-&gt;resource_list;</div><div class='del'>-			resource-&gt;parent = parent_resource;</div><div class='del'>-		} else {</div><div class='del'>-			kfree(resource);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	resource-&gt;name = resource_name;</div><div class='del'>-	resource-&gt;size = resource_size;</div><div class='del'>-	resource-&gt;size_new = resource_size;</div><div class='del'>-	resource-&gt;id = resource_id;</div><div class='del'>-	resource-&gt;size_valid = true;</div><div class='del'>-	memcpy(&amp;resource-&gt;size_params, size_params,</div><div class='del'>-	       sizeof(resource-&gt;size_params));</div><div class='del'>-	INIT_LIST_HEAD(&amp;resource-&gt;resource_list);</div><div class='del'>-	list_add_tail(&amp;resource-&gt;list, resource_list);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_resource_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_resources_unregister - free all resources</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@resource: resource</div><div class='del'>- */</div><div class='del'>-void devlink_resources_unregister(struct devlink *devlink,</div><div class='del'>-				  struct devlink_resource *resource)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *tmp, *child_resource;</div><div class='del'>-	struct list_head *resource_list;</div><div class='del'>-</div><div class='del'>-	if (resource)</div><div class='del'>-		resource_list = &amp;resource-&gt;resource_list;</div><div class='del'>-	else</div><div class='del'>-		resource_list = &amp;devlink-&gt;resource_list;</div><div class='del'>-</div><div class='del'>-	if (!resource)</div><div class='del'>-		mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(child_resource, tmp, resource_list, list) {</div><div class='del'>-		devlink_resources_unregister(devlink, child_resource);</div><div class='del'>-		list_del(&amp;child_resource-&gt;list);</div><div class='del'>-		kfree(child_resource);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!resource)</div><div class='del'>-		mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_resources_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_resource_size_get - get and update size</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@resource_id: the requested resource id</div><div class='del'>- *	@p_resource_size: ptr to update</div><div class='del'>- */</div><div class='del'>-int devlink_resource_size_get(struct devlink *devlink,</div><div class='del'>-			      u64 resource_id,</div><div class='del'>-			      u64 *p_resource_size)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='del'>-	if (!resource) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	*p_resource_size = resource-&gt;size_new;</div><div class='del'>-	resource-&gt;size = resource-&gt;size_new;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_resource_size_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_dpipe_table_resource_set - set the resource id</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@table_name: table name</div><div class='del'>- *	@resource_id: resource id</div><div class='del'>- *	@resource_units: number of resource's units consumed per table's entry</div><div class='del'>- */</div><div class='del'>-int devlink_dpipe_table_resource_set(struct devlink *devlink,</div><div class='del'>-				     const char *table_name, u64 resource_id,</div><div class='del'>-				     u64 resource_units)</div><div class='del'>-{</div><div class='del'>-	struct devlink_dpipe_table *table;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='del'>-					 table_name);</div><div class='del'>-	if (!table) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	table-&gt;resource_id = resource_id;</div><div class='del'>-	table-&gt;resource_units = resource_units;</div><div class='del'>-	table-&gt;resource_valid = true;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_dpipe_table_resource_set);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_resource_occ_get_register - register occupancy getter</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@resource_id: resource id</div><div class='del'>- *	@occ_get: occupancy getter callback</div><div class='del'>- *	@occ_get_priv: occupancy getter callback priv</div><div class='del'>- */</div><div class='del'>-void devlink_resource_occ_get_register(struct devlink *devlink,</div><div class='del'>-				       u64 resource_id,</div><div class='del'>-				       devlink_resource_occ_get_t *occ_get,</div><div class='del'>-				       void *occ_get_priv)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='del'>-	if (WARN_ON(!resource))</div><div class='del'>-		goto out;</div><div class='del'>-	WARN_ON(resource-&gt;occ_get);</div><div class='del'>-</div><div class='del'>-	resource-&gt;occ_get = occ_get;</div><div class='del'>-	resource-&gt;occ_get_priv = occ_get_priv;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_resource_occ_get_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_resource_occ_get_unregister - unregister occupancy getter</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@resource_id: resource id</div><div class='del'>- */</div><div class='del'>-void devlink_resource_occ_get_unregister(struct devlink *devlink,</div><div class='del'>-					 u64 resource_id)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource *resource;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='del'>-	if (WARN_ON(!resource))</div><div class='del'>-		goto out;</div><div class='del'>-	WARN_ON(!resource-&gt;occ_get);</div><div class='del'>-</div><div class='del'>-	resource-&gt;occ_get = NULL;</div><div class='del'>-	resource-&gt;occ_get_priv = NULL;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_resource_occ_get_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_params_register - register configuration parameters</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@params: configuration parameters array</div><div class='del'>- *	@params_count: number of parameters provided</div><div class='del'>- *</div><div class='del'>- *	Register the configuration parameters supported by the driver.</div><div class='del'>- */</div><div class='del'>-int devlink_params_register(struct devlink *devlink,</div><div class='del'>-			    const struct devlink_param *params,</div><div class='del'>-			    size_t params_count)</div><div class='del'>-{</div><div class='del'>-	const struct devlink_param *param = params;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	for (i = 0; i &lt; params_count; i++, param++) {</div><div class='del'>-		if (!param || !param-&gt;name || !param-&gt;supported_cmodes) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto rollback;</div><div class='del'>-		}</div><div class='del'>-		if (param-&gt;generic) {</div><div class='del'>-			err = devlink_param_generic_verify(param);</div><div class='del'>-			if (err)</div><div class='del'>-				goto rollback;</div><div class='del'>-		} else {</div><div class='del'>-			err = devlink_param_driver_verify(param);</div><div class='del'>-			if (err)</div><div class='del'>-				goto rollback;</div><div class='del'>-		}</div><div class='del'>-		err = devlink_param_register_one(devlink, param);</div><div class='del'>-		if (err)</div><div class='del'>-			goto rollback;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-rollback:</div><div class='del'>-	if (!i)</div><div class='del'>-		goto unlock;</div><div class='del'>-	for (param--; i &gt; 0; i--, param--)</div><div class='del'>-		devlink_param_unregister_one(devlink, param);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_params_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_params_unregister - unregister configuration parameters</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@params: configuration parameters to unregister</div><div class='del'>- *	@params_count: number of parameters provided</div><div class='del'>- */</div><div class='del'>-void devlink_params_unregister(struct devlink *devlink,</div><div class='del'>-			       const struct devlink_param *params,</div><div class='del'>-			       size_t params_count)</div><div class='del'>-{</div><div class='del'>-	const struct devlink_param *param = params;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	for (i = 0; i &lt; params_count; i++, param++)</div><div class='del'>-		devlink_param_unregister_one(devlink, param);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_params_unregister);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_param_driverinit_value_get - get configuration parameter</div><div class='del'>- *					     value for driver initializing</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@param_id: parameter ID</div><div class='del'>- *	@init_val: value of parameter in driverinit configuration mode</div><div class='del'>- *</div><div class='del'>- *	This function should be used by the driver to get driverinit</div><div class='del'>- *	configuration for initialization after reload command.</div><div class='del'>- */</div><div class='del'>-int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,</div><div class='del'>-				       union devlink_param_value *init_val)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	if (!devlink-&gt;ops || !devlink-&gt;ops-&gt;reload)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_find_by_id(&amp;devlink-&gt;param_list, param_id);</div><div class='del'>-	if (!param_item)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!param_item-&gt;driverinit_value_valid ||</div><div class='del'>-	    !devlink_param_cmode_is_supported(param_item-&gt;param,</div><div class='del'>-					      DEVLINK_PARAM_CMODE_DRIVERINIT))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (param_item-&gt;param-&gt;type == DEVLINK_PARAM_TYPE_STRING)</div><div class='del'>-		strcpy(init_val-&gt;vstr, param_item-&gt;driverinit_value.vstr);</div><div class='del'>-	else</div><div class='del'>-		*init_val = param_item-&gt;driverinit_value;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_param_driverinit_value_set - set value of configuration</div><div class='del'>- *					     parameter for driverinit</div><div class='del'>- *					     configuration mode</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@param_id: parameter ID</div><div class='del'>- *	@init_val: value of parameter to set for driverinit configuration mode</div><div class='del'>- *</div><div class='del'>- *	This function should be used by the driver to set driverinit</div><div class='del'>- *	configuration mode default value.</div><div class='del'>- */</div><div class='del'>-int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,</div><div class='del'>-				       union devlink_param_value init_val)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_find_by_id(&amp;devlink-&gt;param_list, param_id);</div><div class='del'>-	if (!param_item)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!devlink_param_cmode_is_supported(param_item-&gt;param,</div><div class='del'>-					      DEVLINK_PARAM_CMODE_DRIVERINIT))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (param_item-&gt;param-&gt;type == DEVLINK_PARAM_TYPE_STRING)</div><div class='del'>-		strcpy(param_item-&gt;driverinit_value.vstr, init_val.vstr);</div><div class='del'>-	else</div><div class='del'>-		param_item-&gt;driverinit_value = init_val;</div><div class='del'>-	param_item-&gt;driverinit_value_valid = true;</div><div class='del'>-</div><div class='del'>-	devlink_param_notify(devlink, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_param_value_changed - notify devlink on a parameter's value</div><div class='del'>- *				      change. Should be called by the driver</div><div class='del'>- *				      right after the change.</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@param_id: parameter ID</div><div class='del'>- *</div><div class='del'>- *	This function should be used by the driver to notify devlink on value</div><div class='del'>- *	change, excluding driverinit configuration mode.</div><div class='del'>- *	For driverinit configuration mode driver should use the function</div><div class='del'>- *	devlink_param_driverinit_value_set() instead.</div><div class='del'>- */</div><div class='del'>-void devlink_param_value_changed(struct devlink *devlink, u32 param_id)</div><div class='del'>-{</div><div class='del'>-	struct devlink_param_item *param_item;</div><div class='del'>-</div><div class='del'>-	param_item = devlink_param_find_by_id(&amp;devlink-&gt;param_list, param_id);</div><div class='del'>-	WARN_ON(!param_item);</div><div class='del'>-</div><div class='del'>-	devlink_param_notify(devlink, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_param_value_changed);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_param_value_str_fill - Safely fill-up the string preventing</div><div class='del'>- *				       from overflow of the preallocated buffer</div><div class='del'>- *</div><div class='del'>- *	@dst_val: destination devlink_param_value</div><div class='del'>- *	@src: source buffer</div><div class='del'>- */</div><div class='del'>-void devlink_param_value_str_fill(union devlink_param_value *dst_val,</div><div class='del'>-				  const char *src)</div><div class='del'>-{</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	len = strlcpy(dst_val-&gt;vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE);</div><div class='del'>-	WARN_ON(len &gt;= __DEVLINK_PARAM_MAX_STRING_VALUE);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_param_value_str_fill);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_region_create - create a new address region</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- *	@region_name: region name</div><div class='del'>- *	@region_max_snapshots: Maximum supported number of snapshots for region</div><div class='del'>- *	@region_size: size of region</div><div class='del'>- */</div><div class='del'>-struct devlink_region *devlink_region_create(struct devlink *devlink,</div><div class='del'>-					     const char *region_name,</div><div class='del'>-					     u32 region_max_snapshots,</div><div class='del'>-					     u64 region_size)</div><div class='del'>-{</div><div class='del'>-	struct devlink_region *region;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (devlink_region_get_by_name(devlink, region_name)) {</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	region = kzalloc(sizeof(*region), GFP_KERNEL);</div><div class='del'>-	if (!region) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	region-&gt;devlink = devlink;</div><div class='del'>-	region-&gt;max_snapshots = region_max_snapshots;</div><div class='del'>-	region-&gt;name = region_name;</div><div class='del'>-	region-&gt;size = region_size;</div><div class='del'>-	INIT_LIST_HEAD(&amp;region-&gt;snapshot_list);</div><div class='del'>-	list_add_tail(&amp;region-&gt;list, &amp;devlink-&gt;region_list);</div><div class='del'>-	devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return region;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_region_create);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_region_destroy - destroy address region</div><div class='del'>- *</div><div class='del'>- *	@region: devlink region to destroy</div><div class='del'>- */</div><div class='del'>-void devlink_region_destroy(struct devlink_region *region)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = region-&gt;devlink;</div><div class='del'>-	struct devlink_snapshot *snapshot, *ts;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Free all snapshots of region */</div><div class='del'>-	list_for_each_entry_safe(snapshot, ts, &amp;region-&gt;snapshot_list, list)</div><div class='del'>-		devlink_region_snapshot_del(snapshot);</div><div class='del'>-</div><div class='del'>-	list_del(&amp;region-&gt;list);</div><div class='del'>-</div><div class='del'>-	devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_DEL);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	kfree(region);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_region_destroy);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_region_shapshot_id_get - get snapshot ID</div><div class='del'>- *</div><div class='del'>- *	This callback should be called when adding a new snapshot,</div><div class='del'>- *	Driver should use the same id for multiple snapshots taken</div><div class='del'>- *	on multiple regions at the same time/by the same trigger.</div><div class='del'>- *</div><div class='del'>- *	@devlink: devlink</div><div class='del'>- */</div><div class='del'>-u32 devlink_region_shapshot_id_get(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	u32 id;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-	id = ++devlink-&gt;snapshot_id;</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_region_shapshot_id_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devlink_region_snapshot_create - create a new snapshot</div><div class='del'>- *	This will add a new snapshot of a region. The snapshot</div><div class='del'>- *	will be stored on the region struct and can be accessed</div><div class='del'>- *	from devlink. This is useful for future	analyses of snapshots.</div><div class='del'>- *	Multiple snapshots can be created on a region.</div><div class='del'>- *	The @snapshot_id should be obtained using the getter function.</div><div class='del'>- *</div><div class='del'>- *	@devlink_region: devlink region of the snapshot</div><div class='del'>- *	@data_len: size of snapshot data</div><div class='del'>- *	@data: snapshot data</div><div class='del'>- *	@snapshot_id: snapshot id to be created</div><div class='del'>- *	@data_destructor: pointer to destructor function to free data</div><div class='del'>- */</div><div class='del'>-int devlink_region_snapshot_create(struct devlink_region *region, u64 data_len,</div><div class='del'>-				   u8 *data, u32 snapshot_id,</div><div class='del'>-				   devlink_snapshot_data_dest_t *data_destructor)</div><div class='del'>-{</div><div class='del'>-	struct devlink *devlink = region-&gt;devlink;</div><div class='del'>-	struct devlink_snapshot *snapshot;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devlink-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* check if region can hold one more snapshot */</div><div class='del'>-	if (region-&gt;cur_snapshots == region-&gt;max_snapshots) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devlink_region_snapshot_get_by_id(region, snapshot_id)) {</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snapshot = kzalloc(sizeof(*snapshot), GFP_KERNEL);</div><div class='del'>-	if (!snapshot) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snapshot-&gt;id = snapshot_id;</div><div class='del'>-	snapshot-&gt;region = region;</div><div class='del'>-	snapshot-&gt;data = data;</div><div class='del'>-	snapshot-&gt;data_len = data_len;</div><div class='del'>-	snapshot-&gt;data_destructor = data_destructor;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;snapshot-&gt;list, &amp;region-&gt;snapshot_list);</div><div class='del'>-</div><div class='del'>-	region-&gt;cur_snapshots++;</div><div class='del'>-</div><div class='del'>-	devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_NEW);</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devlink_region_snapshot_create);</div><div class='del'>-</div><div class='del'>-static int __init devlink_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return genl_register_family(&amp;devlink_nl_family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit devlink_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	genl_unregister_family(&amp;devlink_nl_family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(devlink_module_init);</div><div class='del'>-module_exit(devlink_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_AUTHOR("Jiri Pirko &lt;jiri@mellanox.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Network physical device Netlink interface");</div><div class='del'>-MODULE_ALIAS_GENL_FAMILY(DEVLINK_GENL_NAME);</div><div class='head'>diff --git a/net/core/devmem.c b/net/core/devmem.c<br/>new file mode 100644<br/>index 000000000000..ec4217d6c0b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/devmem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/devmem.c</a></div><div class='hunk'>@@ -0,0 +1,522 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *      Devmem TCP</div><div class='add'>+ *</div><div class='add'>+ *      Authors:	Mina Almasry &lt;almasrymina@google.com&gt;</div><div class='add'>+ *			Willem de Bruijn &lt;willemdebruijn.kernel@gmail.com&gt;</div><div class='add'>+ *			Kaiyuan Zhang &lt;kaiyuanz@google.com</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/genalloc.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;trace/events/page_pool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "devmem.h"</div><div class='add'>+#include "mp_dmabuf_devmem.h"</div><div class='add'>+#include "page_pool_priv.h"</div><div class='add'>+</div><div class='add'>+/* Device memory support */</div><div class='add'>+</div><div class='add'>+static DEFINE_XARRAY_FLAGS(net_devmem_dmabuf_bindings, XA_FLAGS_ALLOC1);</div><div class='add'>+</div><div class='add'>+static const struct memory_provider_ops dmabuf_devmem_ops;</div><div class='add'>+</div><div class='add'>+bool net_is_devmem_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return niov-&gt;type == NET_IOV_DMABUF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_devmem_dmabuf_free_chunk_owner(struct gen_pool *genpool,</div><div class='add'>+					       struct gen_pool_chunk *chunk,</div><div class='add'>+					       void *not_used)</div><div class='add'>+{</div><div class='add'>+	struct dmabuf_genpool_chunk_owner *owner = chunk-&gt;owner;</div><div class='add'>+</div><div class='add'>+	kvfree(owner-&gt;area.niovs);</div><div class='add'>+	kfree(owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t net_devmem_get_dma_addr(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	struct dmabuf_genpool_chunk_owner *owner;</div><div class='add'>+</div><div class='add'>+	owner = net_devmem_iov_to_chunk_owner(niov);</div><div class='add'>+	return owner-&gt;base_dma_addr +</div><div class='add'>+	       ((dma_addr_t)net_iov_idx(niov) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __net_devmem_dmabuf_binding_free(struct work_struct *wq)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = container_of(wq, typeof(*binding), unbind_w);</div><div class='add'>+</div><div class='add'>+	size_t size, avail;</div><div class='add'>+</div><div class='add'>+	gen_pool_for_each_chunk(binding-&gt;chunk_pool,</div><div class='add'>+				net_devmem_dmabuf_free_chunk_owner, NULL);</div><div class='add'>+</div><div class='add'>+	size = gen_pool_size(binding-&gt;chunk_pool);</div><div class='add'>+	avail = gen_pool_avail(binding-&gt;chunk_pool);</div><div class='add'>+</div><div class='add'>+	if (!WARN(size != avail, "can't destroy genpool. size=%zu, avail=%zu",</div><div class='add'>+		  size, avail))</div><div class='add'>+		gen_pool_destroy(binding-&gt;chunk_pool);</div><div class='add'>+</div><div class='add'>+	dma_buf_unmap_attachment_unlocked(binding-&gt;attachment, binding-&gt;sgt,</div><div class='add'>+					  binding-&gt;direction);</div><div class='add'>+	dma_buf_detach(binding-&gt;dmabuf, binding-&gt;attachment);</div><div class='add'>+	dma_buf_put(binding-&gt;dmabuf);</div><div class='add'>+	xa_destroy(&amp;binding-&gt;bound_rxqs);</div><div class='add'>+	kvfree(binding-&gt;tx_vec);</div><div class='add'>+	kfree(binding);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_iov *</div><div class='add'>+net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	struct dmabuf_genpool_chunk_owner *owner;</div><div class='add'>+	unsigned long dma_addr;</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+	ssize_t offset;</div><div class='add'>+	ssize_t index;</div><div class='add'>+</div><div class='add'>+	dma_addr = gen_pool_alloc_owner(binding-&gt;chunk_pool, PAGE_SIZE,</div><div class='add'>+					(void **)&amp;owner);</div><div class='add'>+	if (!dma_addr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	offset = dma_addr - owner-&gt;base_dma_addr;</div><div class='add'>+	index = offset / PAGE_SIZE;</div><div class='add'>+	niov = &amp;owner-&gt;area.niovs[index];</div><div class='add'>+</div><div class='add'>+	niov-&gt;desc.pp_magic = 0;</div><div class='add'>+	niov-&gt;desc.pp = NULL;</div><div class='add'>+	atomic_long_set(&amp;niov-&gt;desc.pp_ref_count, 0);</div><div class='add'>+</div><div class='add'>+	return niov;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_devmem_free_dmabuf(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = net_devmem_iov_binding(niov);</div><div class='add'>+	unsigned long dma_addr = net_devmem_get_dma_addr(niov);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!gen_pool_has_addr(binding-&gt;chunk_pool, dma_addr,</div><div class='add'>+				       PAGE_SIZE)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gen_pool_free(binding-&gt;chunk_pool, dma_addr, PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	unsigned long xa_idx;</div><div class='add'>+	unsigned int rxq_idx;</div><div class='add'>+</div><div class='add'>+	xa_erase(&amp;net_devmem_dmabuf_bindings, binding-&gt;id);</div><div class='add'>+</div><div class='add'>+	/* Ensure no tx net_devmem_lookup_dmabuf() are in flight after the</div><div class='add'>+	 * erase.</div><div class='add'>+	 */</div><div class='add'>+	synchronize_net();</div><div class='add'>+</div><div class='add'>+	if (binding-&gt;list.next)</div><div class='add'>+		list_del(&amp;binding-&gt;list);</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;binding-&gt;bound_rxqs, xa_idx, rxq) {</div><div class='add'>+		const struct pp_memory_provider_params mp_params = {</div><div class='add'>+			.mp_priv	= binding,</div><div class='add'>+			.mp_ops		= &amp;dmabuf_devmem_ops,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rxq_idx = get_netdev_rx_queue_index(rxq);</div><div class='add'>+</div><div class='add'>+		__net_mp_close_rxq(binding-&gt;dev, rxq_idx, &amp;mp_params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net_devmem_dmabuf_binding_put(binding);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,</div><div class='add'>+				    struct net_devmem_dmabuf_binding *binding,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pp_memory_provider_params mp_params = {</div><div class='add'>+		.mp_priv	= binding,</div><div class='add'>+		.mp_ops		= &amp;dmabuf_devmem_ops,</div><div class='add'>+	};</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	u32 xa_idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __net_mp_open_rxq(dev, rxq_idx, &amp;mp_params, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rxq = __netif_get_rx_queue(dev, rxq_idx);</div><div class='add'>+	err = xa_alloc(&amp;binding-&gt;bound_rxqs, &amp;xa_idx, rxq, xa_limit_32b,</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_close_rxq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_close_rxq:</div><div class='add'>+	__net_mp_close_rxq(dev, rxq_idx, &amp;mp_params);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_bind_dmabuf(struct net_device *dev,</div><div class='add'>+		       struct device *dma_dev,</div><div class='add'>+		       enum dma_data_direction direction,</div><div class='add'>+		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+	static u32 id_alloc_next;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	struct dma_buf *dmabuf;</div><div class='add'>+	unsigned int sg_idx, i;</div><div class='add'>+	unsigned long virtual;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dma_dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device doesn't support DMA");</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dmabuf = dma_buf_get(dmabuf_fd);</div><div class='add'>+	if (IS_ERR(dmabuf))</div><div class='add'>+		return ERR_CAST(dmabuf);</div><div class='add'>+</div><div class='add'>+	binding = kzalloc_node(sizeof(*binding), GFP_KERNEL,</div><div class='add'>+			       dev_to_node(&amp;dev-&gt;dev));</div><div class='add'>+	if (!binding) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_put_dmabuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binding-&gt;dev = dev;</div><div class='add'>+	xa_init_flags(&amp;binding-&gt;bound_rxqs, XA_FLAGS_ALLOC);</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;binding-&gt;ref, 1);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;binding-&gt;lock);</div><div class='add'>+</div><div class='add'>+	binding-&gt;dmabuf = dmabuf;</div><div class='add'>+	binding-&gt;direction = direction;</div><div class='add'>+</div><div class='add'>+	binding-&gt;attachment = dma_buf_attach(binding-&gt;dmabuf, dma_dev);</div><div class='add'>+	if (IS_ERR(binding-&gt;attachment)) {</div><div class='add'>+		err = PTR_ERR(binding-&gt;attachment);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Failed to bind dmabuf to device");</div><div class='add'>+		goto err_free_binding;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binding-&gt;sgt = dma_buf_map_attachment_unlocked(binding-&gt;attachment,</div><div class='add'>+						       direction);</div><div class='add'>+	if (IS_ERR(binding-&gt;sgt)) {</div><div class='add'>+		err = PTR_ERR(binding-&gt;sgt);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Failed to map dmabuf attachment");</div><div class='add'>+		goto err_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (direction == DMA_TO_DEVICE) {</div><div class='add'>+		binding-&gt;tx_vec = kvmalloc_array(dmabuf-&gt;size / PAGE_SIZE,</div><div class='add'>+						 sizeof(struct net_iov *),</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+		if (!binding-&gt;tx_vec) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_unmap;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For simplicity we expect to make PAGE_SIZE allocations, but the</div><div class='add'>+	 * binding can be much more flexible than that. We may be able to</div><div class='add'>+	 * allocate MTU sized chunks here. Leave that for future work...</div><div class='add'>+	 */</div><div class='add'>+	binding-&gt;chunk_pool = gen_pool_create(PAGE_SHIFT,</div><div class='add'>+					      dev_to_node(&amp;dev-&gt;dev));</div><div class='add'>+	if (!binding-&gt;chunk_pool) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_tx_vec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	virtual = 0;</div><div class='add'>+	for_each_sgtable_dma_sg(binding-&gt;sgt, sg, sg_idx) {</div><div class='add'>+		dma_addr_t dma_addr = sg_dma_address(sg);</div><div class='add'>+		struct dmabuf_genpool_chunk_owner *owner;</div><div class='add'>+		size_t len = sg_dma_len(sg);</div><div class='add'>+		struct net_iov *niov;</div><div class='add'>+</div><div class='add'>+		owner = kzalloc_node(sizeof(*owner), GFP_KERNEL,</div><div class='add'>+				     dev_to_node(&amp;dev-&gt;dev));</div><div class='add'>+		if (!owner) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_chunks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		owner-&gt;area.base_virtual = virtual;</div><div class='add'>+		owner-&gt;base_dma_addr = dma_addr;</div><div class='add'>+		owner-&gt;area.num_niovs = len / PAGE_SIZE;</div><div class='add'>+		owner-&gt;binding = binding;</div><div class='add'>+</div><div class='add'>+		err = gen_pool_add_owner(binding-&gt;chunk_pool, dma_addr,</div><div class='add'>+					 dma_addr, len, dev_to_node(&amp;dev-&gt;dev),</div><div class='add'>+					 owner);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(owner);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_free_chunks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		owner-&gt;area.niovs = kvmalloc_array(owner-&gt;area.num_niovs,</div><div class='add'>+						   sizeof(*owner-&gt;area.niovs),</div><div class='add'>+						   GFP_KERNEL);</div><div class='add'>+		if (!owner-&gt;area.niovs) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_chunks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; owner-&gt;area.num_niovs; i++) {</div><div class='add'>+			niov = &amp;owner-&gt;area.niovs[i];</div><div class='add'>+			niov-&gt;type = NET_IOV_DMABUF;</div><div class='add'>+			niov-&gt;owner = &amp;owner-&gt;area;</div><div class='add'>+			page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov),</div><div class='add'>+						      net_devmem_get_dma_addr(niov));</div><div class='add'>+			if (direction == DMA_TO_DEVICE)</div><div class='add'>+				binding-&gt;tx_vec[owner-&gt;area.base_virtual / PAGE_SIZE + i] = niov;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		virtual += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = xa_alloc_cyclic(&amp;net_devmem_dmabuf_bindings, &amp;binding-&gt;id,</div><div class='add'>+			      binding, xa_limit_32b, &amp;id_alloc_next,</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_free_chunks;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;binding-&gt;list, &amp;priv-&gt;bindings);</div><div class='add'>+</div><div class='add'>+	return binding;</div><div class='add'>+</div><div class='add'>+err_free_chunks:</div><div class='add'>+	gen_pool_for_each_chunk(binding-&gt;chunk_pool,</div><div class='add'>+				net_devmem_dmabuf_free_chunk_owner, NULL);</div><div class='add'>+	gen_pool_destroy(binding-&gt;chunk_pool);</div><div class='add'>+err_tx_vec:</div><div class='add'>+	kvfree(binding-&gt;tx_vec);</div><div class='add'>+err_unmap:</div><div class='add'>+	dma_buf_unmap_attachment_unlocked(binding-&gt;attachment, binding-&gt;sgt,</div><div class='add'>+					  direction);</div><div class='add'>+err_detach:</div><div class='add'>+	dma_buf_detach(dmabuf, binding-&gt;attachment);</div><div class='add'>+err_free_binding:</div><div class='add'>+	kfree(binding);</div><div class='add'>+err_put_dmabuf:</div><div class='add'>+	dma_buf_put(dmabuf);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	binding = xa_load(&amp;net_devmem_dmabuf_bindings, id);</div><div class='add'>+	if (binding) {</div><div class='add'>+		if (!net_devmem_dmabuf_binding_get(binding))</div><div class='add'>+			binding = NULL;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return binding;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_devmem_get_net_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	net_devmem_dmabuf_binding_get(net_devmem_iov_binding(niov));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_devmem_put_net_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	net_devmem_dmabuf_binding_put(net_devmem_iov_binding(niov));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_devmem_dmabuf_binding *net_devmem_get_binding(struct sock *sk,</div><div class='add'>+							 unsigned int dmabuf_id)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+	struct net_device *dst_dev;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	binding = net_devmem_lookup_dmabuf(dmabuf_id);</div><div class='add'>+	if (!binding || !binding-&gt;tx_vec) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dst = __sk_dst_get(sk);</div><div class='add'>+	/* If dst is NULL (route expired), attempt to rebuild it. */</div><div class='add'>+	if (unlikely(!dst)) {</div><div class='add'>+		if (inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk)) {</div><div class='add'>+			err = -EHOSTUNREACH;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+		dst = __sk_dst_get(sk);</div><div class='add'>+		if (unlikely(!dst)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The dma-addrs in this binding are only reachable to the corresponding</div><div class='add'>+	 * net_device.</div><div class='add'>+	 */</div><div class='add'>+	dst_dev = dst_dev_rcu(dst);</div><div class='add'>+	if (unlikely(!dst_dev) || unlikely(dst_dev != binding-&gt;dev)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return binding;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out_err:</div><div class='add'>+	if (binding)</div><div class='add'>+		net_devmem_dmabuf_binding_put(binding);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_iov *</div><div class='add'>+net_devmem_get_niov_at(struct net_devmem_dmabuf_binding *binding,</div><div class='add'>+		       size_t virt_addr, size_t *off, size_t *size)</div><div class='add'>+{</div><div class='add'>+	if (virt_addr &gt;= binding-&gt;dmabuf-&gt;size)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*off = virt_addr % PAGE_SIZE;</div><div class='add'>+	*size = PAGE_SIZE - *off;</div><div class='add'>+</div><div class='add'>+	return binding-&gt;tx_vec[virt_addr / PAGE_SIZE];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*** "Dmabuf devmem memory provider" ***/</div><div class='add'>+</div><div class='add'>+int mp_dmabuf_devmem_init(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = pool-&gt;mp_priv;</div><div class='add'>+</div><div class='add'>+	if (!binding)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* dma-buf dma addresses do not need and should not be used with</div><div class='add'>+	 * dma_sync_for_cpu/device. Force disable dma_sync.</div><div class='add'>+	 */</div><div class='add'>+	pool-&gt;dma_sync = false;</div><div class='add'>+	pool-&gt;dma_sync_for_cpu = false;</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;p.order != 0)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	net_devmem_dmabuf_binding_get(binding);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netmem_ref mp_dmabuf_devmem_alloc_netmems(struct page_pool *pool, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = pool-&gt;mp_priv;</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	niov = net_devmem_alloc_dmabuf(binding);</div><div class='add'>+	if (!niov)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netmem = net_iov_to_netmem(niov);</div><div class='add'>+</div><div class='add'>+	page_pool_set_pp_info(pool, netmem);</div><div class='add'>+</div><div class='add'>+	pool-&gt;pages_state_hold_cnt++;</div><div class='add'>+	trace_page_pool_state_hold(pool, netmem, pool-&gt;pages_state_hold_cnt);</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mp_dmabuf_devmem_destroy(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = pool-&gt;mp_priv;</div><div class='add'>+</div><div class='add'>+	net_devmem_dmabuf_binding_put(binding);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	long refcount = atomic_long_read(netmem_get_pp_ref_count_ref(netmem));</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!netmem_is_net_iov(netmem)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(refcount != 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	page_pool_clear_pp_info(netmem);</div><div class='add'>+</div><div class='add'>+	net_devmem_free_dmabuf(netmem_to_net_iov(netmem));</div><div class='add'>+</div><div class='add'>+	/* We don't want the page pool put_page()ing our net_iovs. */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mp_dmabuf_devmem_nl_fill(void *mp_priv, struct sk_buff *rsp,</div><div class='add'>+				    struct netdev_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	const struct net_devmem_dmabuf_binding *binding = mp_priv;</div><div class='add'>+	int type = rxq ? NETDEV_A_QUEUE_DMABUF : NETDEV_A_PAGE_POOL_DMABUF;</div><div class='add'>+</div><div class='add'>+	return nla_put_u32(rsp, type, binding-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mp_dmabuf_devmem_uninstall(void *mp_priv,</div><div class='add'>+				       struct netdev_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = mp_priv;</div><div class='add'>+	struct netdev_rx_queue *bound_rxq;</div><div class='add'>+	unsigned long xa_idx;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;binding-&gt;bound_rxqs, xa_idx, bound_rxq) {</div><div class='add'>+		if (bound_rxq == rxq) {</div><div class='add'>+			xa_erase(&amp;binding-&gt;bound_rxqs, xa_idx);</div><div class='add'>+			if (xa_empty(&amp;binding-&gt;bound_rxqs)) {</div><div class='add'>+				mutex_lock(&amp;binding-&gt;lock);</div><div class='add'>+				binding-&gt;dev = NULL;</div><div class='add'>+				mutex_unlock(&amp;binding-&gt;lock);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct memory_provider_ops dmabuf_devmem_ops = {</div><div class='add'>+	.init			= mp_dmabuf_devmem_init,</div><div class='add'>+	.destroy		= mp_dmabuf_devmem_destroy,</div><div class='add'>+	.alloc_netmems		= mp_dmabuf_devmem_alloc_netmems,</div><div class='add'>+	.release_netmem		= mp_dmabuf_devmem_release_page,</div><div class='add'>+	.nl_fill		= mp_dmabuf_devmem_nl_fill,</div><div class='add'>+	.uninstall		= mp_dmabuf_devmem_uninstall,</div><div class='add'>+};</div><div class='head'>diff --git a/net/core/devmem.h b/net/core/devmem.h<br/>new file mode 100644<br/>index 000000000000..0b43a648cd2e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/devmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/devmem.h</a></div><div class='hunk'>@@ -0,0 +1,246 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Device memory TCP support</div><div class='add'>+ *</div><div class='add'>+ * Authors:	Mina Almasry &lt;almasrymina@google.com&gt;</div><div class='add'>+ *		Willem de Bruijn &lt;willemb@google.com&gt;</div><div class='add'>+ *		Kaiyuan Zhang &lt;kaiyuanz@google.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _NET_DEVMEM_H</div><div class='add'>+#define _NET_DEVMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netmem.h&gt;</div><div class='add'>+#include &lt;net/netdev_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+</div><div class='add'>+struct net_devmem_dmabuf_binding {</div><div class='add'>+	struct dma_buf *dmabuf;</div><div class='add'>+	struct dma_buf_attachment *attachment;</div><div class='add'>+	struct sg_table *sgt;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct gen_pool *chunk_pool;</div><div class='add'>+	/* Protect dev */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	/* The user holds a ref (via the netlink API) for as long as they want</div><div class='add'>+	 * the binding to remain alive. Each page pool using this binding holds</div><div class='add'>+	 * a ref to keep the binding alive. The page_pool does not release the</div><div class='add'>+	 * ref until all the net_iovs allocated from this binding are released</div><div class='add'>+	 * back to the page_pool.</div><div class='add'>+	 *</div><div class='add'>+	 * The binding undos itself and unmaps the underlying dmabuf once all</div><div class='add'>+	 * those refs are dropped and the binding is no longer desired or in</div><div class='add'>+	 * use.</div><div class='add'>+	 *</div><div class='add'>+	 * net_devmem_get_net_iov() on dmabuf net_iovs will increment this</div><div class='add'>+	 * reference, making sure that the binding remains alive until all the</div><div class='add'>+	 * net_iovs are no longer used. net_iovs allocated from this binding</div><div class='add'>+	 * that are stuck in the TX path for any reason (such as awaiting</div><div class='add'>+	 * retransmits) hold a reference to the binding until the skb holding</div><div class='add'>+	 * them is freed.</div><div class='add'>+	 */</div><div class='add'>+	refcount_t ref;</div><div class='add'>+</div><div class='add'>+	/* The list of bindings currently active. Used for netlink to notify us</div><div class='add'>+	 * of the user dropping the bind.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/* rxq's this binding is active on. */</div><div class='add'>+	struct xarray bound_rxqs;</div><div class='add'>+</div><div class='add'>+	/* ID of this binding. Globally unique to all bindings currently</div><div class='add'>+	 * active.</div><div class='add'>+	 */</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	/* DMA direction, FROM_DEVICE for Rx binding, TO_DEVICE for Tx. */</div><div class='add'>+	enum dma_data_direction direction;</div><div class='add'>+</div><div class='add'>+	/* Array of net_iov pointers for this binding, sorted by virtual</div><div class='add'>+	 * address. This array is convenient to map the virtual addresses to</div><div class='add'>+	 * net_iovs in the TX path.</div><div class='add'>+	 */</div><div class='add'>+	struct net_iov **tx_vec;</div><div class='add'>+</div><div class='add'>+	struct work_struct unbind_w;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_NET_DEVMEM)</div><div class='add'>+/* Owner of the dma-buf chunks inserted into the gen pool. Each scatterlist</div><div class='add'>+ * entry from the dmabuf is inserted into the genpool as a chunk, and needs</div><div class='add'>+ * this owner struct to keep track of some metadata necessary to create</div><div class='add'>+ * allocations from this chunk.</div><div class='add'>+ */</div><div class='add'>+struct dmabuf_genpool_chunk_owner {</div><div class='add'>+	struct net_iov_area area;</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+</div><div class='add'>+	/* dma_addr of the start of the chunk.  */</div><div class='add'>+	dma_addr_t base_dma_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __net_devmem_dmabuf_binding_free(struct work_struct *wq);</div><div class='add'>+struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_bind_dmabuf(struct net_device *dev,</div><div class='add'>+		       struct device *dma_dev,</div><div class='add'>+		       enum dma_data_direction direction,</div><div class='add'>+		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id);</div><div class='add'>+void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding);</div><div class='add'>+int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,</div><div class='add'>+				    struct net_devmem_dmabuf_binding *binding,</div><div class='add'>+				    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static inline struct dmabuf_genpool_chunk_owner *</div><div class='add'>+net_devmem_iov_to_chunk_owner(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	struct net_iov_area *owner = net_iov_owner(niov);</div><div class='add'>+</div><div class='add'>+	return container_of(owner, struct dmabuf_genpool_chunk_owner, area);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_iov_binding(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return net_devmem_iov_to_chunk_owner(niov)-&gt;binding;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 net_devmem_iov_binding_id(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return net_devmem_iov_binding(niov)-&gt;id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	struct net_iov_area *owner = net_iov_owner(niov);</div><div class='add'>+</div><div class='add'>+	return owner-&gt;base_virtual +</div><div class='add'>+	       ((unsigned long)net_iov_idx(niov) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+net_devmem_dmabuf_binding_get(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	return refcount_inc_not_zero(&amp;binding-&gt;ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	if (!refcount_dec_and_test(&amp;binding-&gt;ref))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;binding-&gt;unbind_w, __net_devmem_dmabuf_binding_free);</div><div class='add'>+	schedule_work(&amp;binding-&gt;unbind_w);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_devmem_get_net_iov(struct net_iov *niov);</div><div class='add'>+void net_devmem_put_net_iov(struct net_iov *niov);</div><div class='add'>+</div><div class='add'>+struct net_iov *</div><div class='add'>+net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding);</div><div class='add'>+void net_devmem_free_dmabuf(struct net_iov *ppiov);</div><div class='add'>+</div><div class='add'>+bool net_is_devmem_iov(struct net_iov *niov);</div><div class='add'>+struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_get_binding(struct sock *sk, unsigned int dmabuf_id);</div><div class='add'>+struct net_iov *</div><div class='add'>+net_devmem_get_niov_at(struct net_devmem_dmabuf_binding *binding, size_t addr,</div><div class='add'>+		       size_t *off, size_t *size);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+struct net_devmem_dmabuf_binding;</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void net_devmem_get_net_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void net_devmem_put_net_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_bind_dmabuf(struct net_device *dev,</div><div class='add'>+		       struct device *dma_dev,</div><div class='add'>+		       enum dma_data_direction direction,</div><div class='add'>+		       unsigned int dmabuf_fd,</div><div class='add'>+		       struct netdev_nl_sock *priv,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,</div><div class='add'>+				struct net_devmem_dmabuf_binding *binding,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_iov *</div><div class='add'>+net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void net_devmem_free_dmabuf(struct net_iov *ppiov)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 net_devmem_iov_binding_id(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool net_is_devmem_iov(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_get_binding(struct sock *sk, unsigned int dmabuf_id)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_iov *</div><div class='add'>+net_devmem_get_niov_at(struct net_devmem_dmabuf_binding *binding, size_t addr,</div><div class='add'>+		       size_t *off, size_t *size)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_devmem_dmabuf_binding *</div><div class='add'>+net_devmem_iov_binding(const struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _NET_DEVMEM_H */</div><div class='head'>diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c<br/>index c7785efeea57..60d31c2feed3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/drop_monitor.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/drop_monitor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/drop_monitor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/drop_monitor.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Monitoring code for network dropped packet alerts</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/net_dropmon.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -27,11 +29,15 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='add'>+#include &lt;net/flow_offload.h&gt;</div><div class='add'>+#include &lt;net/dropreason.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='ctx'> #include &lt;trace/events/napi.h&gt;</div><div class='add'>+#include &lt;trace/events/devlink.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TRACE_ON 1</div><div class='ctx'> #define TRACE_OFF 0</div><div class='hunk'>@@ -42,31 +48,87 @@</div><div class='ctx'>  * netlink alerts</div><div class='ctx'>  */</div><div class='ctx'> static int trace_state = TRACE_OFF;</div><div class='del'>-static DEFINE_MUTEX(trace_state_mutex);</div><div class='add'>+static bool monitor_hw;</div><div class='add'>+</div><div class='add'>+/* net_dm_mutex</div><div class='add'>+ *</div><div class='add'>+ * An overall lock guarding every operation coming from userspace.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(net_dm_mutex);</div><div class='add'>+</div><div class='add'>+struct net_dm_stats {</div><div class='add'>+	u64_stats_t dropped;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NET_DM_MAX_HW_TRAP_NAME_LEN 40</div><div class='add'>+</div><div class='add'>+struct net_dm_hw_entry {</div><div class='add'>+	char trap_name[NET_DM_MAX_HW_TRAP_NAME_LEN];</div><div class='add'>+	u32 count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_dm_hw_entries {</div><div class='add'>+	u32 num_entries;</div><div class='add'>+	struct net_dm_hw_entry entries[];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct per_cpu_dm_data {</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	struct sk_buff		*skb;</div><div class='add'>+	raw_spinlock_t		lock;	/* Protects 'skb', 'hw_entries' and</div><div class='add'>+					 * 'send_timer'</div><div class='add'>+					 */</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff			*skb;</div><div class='add'>+		struct net_dm_hw_entries	*hw_entries;</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff_head	drop_queue;</div><div class='ctx'> 	struct work_struct	dm_alert_work;</div><div class='ctx'> 	struct timer_list	send_timer;</div><div class='add'>+	struct net_dm_stats	stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dm_hw_stat_delta {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	unsigned long last_rx;</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct rcu_head rcu;</div><div class='ctx'> 	unsigned long last_drop_val;</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct genl_family net_drop_monitor_family;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct per_cpu_dm_data, dm_cpu_data);</div><div class='add'>+static DEFINE_PER_CPU(struct per_cpu_dm_data, dm_hw_cpu_data);</div><div class='ctx'> </div><div class='ctx'> static int dm_hit_limit = 64;</div><div class='ctx'> static int dm_delay = 1;</div><div class='ctx'> static unsigned long dm_hw_check_delta = 2*HZ;</div><div class='del'>-static LIST_HEAD(hw_stats_list);</div><div class='add'>+</div><div class='add'>+static enum net_dm_alert_mode net_dm_alert_mode = NET_DM_ALERT_MODE_SUMMARY;</div><div class='add'>+static u32 net_dm_trunc_len;</div><div class='add'>+static u32 net_dm_queue_len = 1000;</div><div class='add'>+</div><div class='add'>+struct net_dm_alert_ops {</div><div class='add'>+	void (*kfree_skb_probe)(void *ignore, struct sk_buff *skb,</div><div class='add'>+				void *location,</div><div class='add'>+				enum skb_drop_reason reason,</div><div class='add'>+				struct sock *rx_sk);</div><div class='add'>+	void (*napi_poll_probe)(void *ignore, struct napi_struct *napi,</div><div class='add'>+				int work, int budget);</div><div class='add'>+	void (*work_item_func)(struct work_struct *work);</div><div class='add'>+	void (*hw_work_item_func)(struct work_struct *work);</div><div class='add'>+	void (*hw_trap_probe)(void *ignore, const struct devlink *devlink,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      const struct devlink_trap_metadata *metadata);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_dm_skb_cb {</div><div class='add'>+	union {</div><div class='add'>+		struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+		void *pc;</div><div class='add'>+	};</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NET_DM_SKB_CB(__skb) ((struct net_dm_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -107,9 +169,9 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)</div><div class='ctx'> err:</div><div class='ctx'> 	mod_timer(&amp;data-&gt;send_timer, jiffies + HZ / 10);</div><div class='ctx'> out:</div><div class='del'>-	spin_lock_irqsave(&amp;data-&gt;lock, flags);</div><div class='add'>+	raw_spin_lock_irqsave(&amp;data-&gt;lock, flags);</div><div class='ctx'> 	swap(data-&gt;skb, skb);</div><div class='del'>-	spin_unlock_irqrestore(&amp;data-&gt;lock, flags);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;data-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (skb) {</div><div class='ctx'> 		struct nlmsghdr *nlh = (struct nlmsghdr *)skb-&gt;data;</div><div class='hunk'>@@ -122,7 +184,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct genl_multicast_group dropmon_mcgrps[] = {</div><div class='del'>-	{ .name = "events", },</div><div class='add'>+	{ .name = "events", .flags = GENL_MCAST_CAP_SYS_ADMIN, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void send_dm_alert(struct work_struct *work)</div><div class='hunk'>@@ -146,7 +208,7 @@ static void send_dm_alert(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static void sched_send_work(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct per_cpu_dm_data *data = from_timer(data, t, send_timer);</div><div class='add'>+	struct per_cpu_dm_data *data = timer_container_of(data, t, send_timer);</div><div class='ctx'> </div><div class='ctx'> 	schedule_work(&amp;data-&gt;dm_alert_work);</div><div class='ctx'> }</div><div class='hunk'>@@ -154,6 +216,7 @@ static void sched_send_work(struct timer_list *t)</div><div class='ctx'> static void trace_drop_common(struct sk_buff *skb, void *location)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_dm_alert_msg *msg;</div><div class='add'>+	struct net_dm_drop_point *point;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct nlattr *nla;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -163,7 +226,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	data = this_cpu_ptr(&amp;dm_cpu_data);</div><div class='del'>-	spin_lock(&amp;data-&gt;lock);</div><div class='add'>+	raw_spin_lock(&amp;data-&gt;lock);</div><div class='ctx'> 	dskb = data-&gt;skb;</div><div class='ctx'> </div><div class='ctx'> 	if (!dskb)</div><div class='hunk'>@@ -172,11 +235,13 @@ static void trace_drop_common(struct sk_buff *skb, void *location)</div><div class='ctx'> 	nlh = (struct nlmsghdr *)dskb-&gt;data;</div><div class='ctx'> 	nla = genlmsg_data(nlmsg_data(nlh));</div><div class='ctx'> 	msg = nla_data(nla);</div><div class='add'>+	point = msg-&gt;points;</div><div class='ctx'> 	for (i = 0; i &lt; msg-&gt;entries; i++) {</div><div class='del'>-		if (!memcmp(&amp;location, msg-&gt;points[i].pc, sizeof(void *))) {</div><div class='del'>-			msg-&gt;points[i].count++;</div><div class='add'>+		if (!memcmp(&amp;location, &amp;point-&gt;pc, sizeof(void *))) {</div><div class='add'>+			point-&gt;count++;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		point++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (msg-&gt;entries == dm_hit_limit)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -185,8 +250,8 @@ static void trace_drop_common(struct sk_buff *skb, void *location)</div><div class='ctx'> 	 */</div><div class='ctx'> 	__nla_reserve_nohdr(dskb, sizeof(struct net_dm_drop_point));</div><div class='ctx'> 	nla-&gt;nla_len += NLA_ALIGN(sizeof(struct net_dm_drop_point));</div><div class='del'>-	memcpy(msg-&gt;points[msg-&gt;entries].pc, &amp;location, sizeof(void *));</div><div class='del'>-	msg-&gt;points[msg-&gt;entries].count = 1;</div><div class='add'>+	memcpy(point-&gt;pc, &amp;location, sizeof(void *));</div><div class='add'>+	point-&gt;count = 1;</div><div class='ctx'> 	msg-&gt;entries++;</div><div class='ctx'> </div><div class='ctx'> 	if (!timer_pending(&amp;data-&gt;send_timer)) {</div><div class='hunk'>@@ -195,10 +260,13 @@ static void trace_drop_common(struct sk_buff *skb, void *location)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;data-&gt;lock, flags);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;data-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *location)</div><div class='add'>+static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb,</div><div class='add'>+				void *location,</div><div class='add'>+				enum skb_drop_reason reason,</div><div class='add'>+				struct sock *rx_sk)</div><div class='ctx'> {</div><div class='ctx'> 	trace_drop_common(skb, location);</div><div class='ctx'> }</div><div class='hunk'>@@ -206,76 +274,967 @@ static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *locatio</div><div class='ctx'> static void trace_napi_poll_hit(void *ignore, struct napi_struct *napi,</div><div class='ctx'> 				int work, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct dm_hw_stat_delta *new_stat;</div><div class='del'>-</div><div class='add'>+	struct net_device *dev = napi-&gt;dev;</div><div class='add'>+	struct dm_hw_stat_delta *stat;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't check napi structures with no associated device</div><div class='ctx'> 	 */</div><div class='del'>-	if (!napi-&gt;dev)</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(new_stat, &amp;hw_stats_list, list) {</div><div class='add'>+	stat = rcu_dereference(dev-&gt;dm_private);</div><div class='add'>+	if (stat) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * only add a note to our monitor buffer if:</div><div class='del'>-		 * 1) this is the dev we received on</div><div class='del'>-		 * 2) its after the last_rx delta</div><div class='del'>-		 * 3) our rx_dropped count has gone up</div><div class='add'>+		 * 1) its after the last_rx delta</div><div class='add'>+		 * 2) our rx_dropped count has gone up</div><div class='ctx'> 		 */</div><div class='del'>-		if ((new_stat-&gt;dev == napi-&gt;dev)  &amp;&amp;</div><div class='del'>-		    (time_after(jiffies, new_stat-&gt;last_rx + dm_hw_check_delta)) &amp;&amp;</div><div class='del'>-		    (napi-&gt;dev-&gt;stats.rx_dropped != new_stat-&gt;last_drop_val)) {</div><div class='add'>+		if (time_after(jiffies, stat-&gt;last_rx + dm_hw_check_delta) &amp;&amp;</div><div class='add'>+		    (dev-&gt;stats.rx_dropped != stat-&gt;last_drop_val)) {</div><div class='ctx'> 			trace_drop_common(NULL, NULL);</div><div class='del'>-			new_stat-&gt;last_drop_val = napi-&gt;dev-&gt;stats.rx_dropped;</div><div class='del'>-			new_stat-&gt;last_rx = jiffies;</div><div class='del'>-			break;</div><div class='add'>+			stat-&gt;last_drop_val = dev-&gt;stats.rx_dropped;</div><div class='add'>+			stat-&gt;last_rx = jiffies;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_all_monitor_traces(int state)</div><div class='add'>+static struct net_dm_hw_entries *</div><div class='add'>+net_dm_hw_reset_per_cpu_data(struct per_cpu_dm_data *hw_data)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct dm_hw_stat_delta *new_stat = NULL;</div><div class='del'>-	struct dm_hw_stat_delta *temp;</div><div class='add'>+	struct net_dm_hw_entries *hw_entries;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;trace_state_mutex);</div><div class='add'>+	hw_entries = kzalloc(struct_size(hw_entries, entries, dm_hit_limit),</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!hw_entries) {</div><div class='add'>+		/* If the memory allocation failed, we try to perform another</div><div class='add'>+		 * allocation in 1/10 second. Otherwise, the probe function</div><div class='add'>+		 * will constantly bail out.</div><div class='add'>+		 */</div><div class='add'>+		mod_timer(&amp;hw_data-&gt;send_timer, jiffies + HZ / 10);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (state == trace_state) {</div><div class='del'>-		rc = -EAGAIN;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	raw_spin_lock_irqsave(&amp;hw_data-&gt;lock, flags);</div><div class='add'>+	swap(hw_data-&gt;hw_entries, hw_entries);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;hw_data-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return hw_entries;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_hw_entry_put(struct sk_buff *msg,</div><div class='add'>+			       const struct net_dm_hw_entry *hw_entry)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, NET_DM_ATTR_HW_ENTRY);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, NET_DM_ATTR_HW_TRAP_NAME, hw_entry-&gt;trap_name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NET_DM_ATTR_HW_TRAP_COUNT, hw_entry-&gt;count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_hw_entries_put(struct sk_buff *msg,</div><div class='add'>+				 const struct net_dm_hw_entries *hw_entries)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, NET_DM_ATTR_HW_ENTRIES);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hw_entries-&gt;num_entries; i++) {</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = net_dm_hw_entry_put(msg, &amp;hw_entries-&gt;entries[i]);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (state) {</div><div class='del'>-	case TRACE_ON:</div><div class='del'>-		if (!try_module_get(THIS_MODULE)) {</div><div class='del'>-			rc = -ENODEV;</div><div class='del'>-			break;</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+net_dm_hw_summary_report_fill(struct sk_buff *msg,</div><div class='add'>+			      const struct net_dm_hw_entries *hw_entries)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_alert_msg anc_hdr = { 0 };</div><div class='add'>+	void *hdr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, 0, 0, &amp;net_drop_monitor_family, 0,</div><div class='add'>+			  NET_DM_CMD_ALERT);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	/* We need to put the ancillary header in order not to break user</div><div class='add'>+	 * space.</div><div class='add'>+	 */</div><div class='add'>+	if (nla_put(msg, NLA_UNSPEC, sizeof(anc_hdr), &amp;anc_hdr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_hw_entries_put(msg, hw_entries);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_summary_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_hw_entries *hw_entries;</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hw_data = container_of(work, struct per_cpu_dm_data, dm_alert_work);</div><div class='add'>+</div><div class='add'>+	hw_entries = net_dm_hw_reset_per_cpu_data(hw_data);</div><div class='add'>+	if (!hw_entries)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_hw_summary_report_fill(msg, hw_entries);</div><div class='add'>+	if (rc) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast(&amp;net_drop_monitor_family, msg, 0, 0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(hw_entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     const struct devlink_trap_metadata *metadata)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_hw_entries *hw_entries;</div><div class='add'>+	struct net_dm_hw_entry *hw_entry;</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (metadata-&gt;trap_type == DEVLINK_TRAP_TYPE_CONTROL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hw_data = this_cpu_ptr(&amp;dm_hw_cpu_data);</div><div class='add'>+	raw_spin_lock_irqsave(&amp;hw_data-&gt;lock, flags);</div><div class='add'>+	hw_entries = hw_data-&gt;hw_entries;</div><div class='add'>+</div><div class='add'>+	if (!hw_entries)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hw_entries-&gt;num_entries; i++) {</div><div class='add'>+		hw_entry = &amp;hw_entries-&gt;entries[i];</div><div class='add'>+		if (!strncmp(hw_entry-&gt;trap_name, metadata-&gt;trap_name,</div><div class='add'>+			     NET_DM_MAX_HW_TRAP_NAME_LEN - 1)) {</div><div class='add'>+			hw_entry-&gt;count++;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+	if (WARN_ON_ONCE(hw_entries-&gt;num_entries == dm_hit_limit))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		rc |= register_trace_kfree_skb(trace_kfree_skb_hit, NULL);</div><div class='del'>-		rc |= register_trace_napi_poll(trace_napi_poll_hit, NULL);</div><div class='del'>-		break;</div><div class='add'>+	hw_entry = &amp;hw_entries-&gt;entries[hw_entries-&gt;num_entries];</div><div class='add'>+	strscpy(hw_entry-&gt;trap_name, metadata-&gt;trap_name,</div><div class='add'>+		NET_DM_MAX_HW_TRAP_NAME_LEN - 1);</div><div class='add'>+	hw_entry-&gt;count = 1;</div><div class='add'>+	hw_entries-&gt;num_entries++;</div><div class='ctx'> </div><div class='del'>-	case TRACE_OFF:</div><div class='del'>-		rc |= unregister_trace_kfree_skb(trace_kfree_skb_hit, NULL);</div><div class='del'>-		rc |= unregister_trace_napi_poll(trace_napi_poll_hit, NULL);</div><div class='add'>+	if (!timer_pending(&amp;hw_data-&gt;send_timer)) {</div><div class='add'>+		hw_data-&gt;send_timer.expires = jiffies + dm_delay * HZ;</div><div class='add'>+		add_timer(&amp;hw_data-&gt;send_timer);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		tracepoint_synchronize_unregister();</div><div class='add'>+out:</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;hw_data-&gt;lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Clean the device list</div><div class='del'>-		 */</div><div class='del'>-		list_for_each_entry_safe(new_stat, temp, &amp;hw_stats_list, list) {</div><div class='del'>-			if (new_stat-&gt;dev == NULL) {</div><div class='del'>-				list_del_rcu(&amp;new_stat-&gt;list);</div><div class='del'>-				kfree_rcu(new_stat, rcu);</div><div class='del'>-			}</div><div class='add'>+static const struct net_dm_alert_ops net_dm_alert_summary_ops = {</div><div class='add'>+	.kfree_skb_probe	= trace_kfree_skb_hit,</div><div class='add'>+	.napi_poll_probe	= trace_napi_poll_hit,</div><div class='add'>+	.work_item_func		= send_dm_alert,</div><div class='add'>+	.hw_work_item_func	= net_dm_hw_summary_work,</div><div class='add'>+	.hw_trap_probe		= net_dm_hw_trap_summary_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void net_dm_packet_trace_kfree_skb_hit(void *ignore,</div><div class='add'>+					      struct sk_buff *skb,</div><div class='add'>+					      void *location,</div><div class='add'>+					      enum skb_drop_reason reason,</div><div class='add'>+					      struct sock *rx_sk)</div><div class='add'>+{</div><div class='add'>+	ktime_t tstamp = ktime_get_real();</div><div class='add'>+	struct per_cpu_dm_data *data;</div><div class='add'>+	struct net_dm_skb_cb *cb;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!skb_mac_header_was_set(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cb = NET_DM_SKB_CB(nskb);</div><div class='add'>+	cb-&gt;reason = reason;</div><div class='add'>+	cb-&gt;pc = location;</div><div class='add'>+	/* Override the timestamp because we care about the time when the</div><div class='add'>+	 * packet was dropped.</div><div class='add'>+	 */</div><div class='add'>+	nskb-&gt;tstamp = tstamp;</div><div class='add'>+</div><div class='add'>+	data = this_cpu_ptr(&amp;dm_cpu_data);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;data-&gt;drop_queue.lock, flags);</div><div class='add'>+	if (skb_queue_len(&amp;data-&gt;drop_queue) &lt; net_dm_queue_len)</div><div class='add'>+		__skb_queue_tail(&amp;data-&gt;drop_queue, nskb);</div><div class='add'>+	else</div><div class='add'>+		goto unlock_free;</div><div class='add'>+	spin_unlock_irqrestore(&amp;data-&gt;drop_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;data-&gt;dm_alert_work);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+unlock_free:</div><div class='add'>+	spin_unlock_irqrestore(&amp;data-&gt;drop_queue.lock, flags);</div><div class='add'>+	u64_stats_update_begin(&amp;data-&gt;stats.syncp);</div><div class='add'>+	u64_stats_inc(&amp;data-&gt;stats.dropped);</div><div class='add'>+	u64_stats_update_end(&amp;data-&gt;stats.syncp);</div><div class='add'>+	consume_skb(nskb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_packet_trace_napi_poll_hit(void *ignore,</div><div class='add'>+					      struct napi_struct *napi,</div><div class='add'>+					      int work, int budget)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t net_dm_in_port_size(void)</div><div class='add'>+{</div><div class='add'>+	       /* NET_DM_ATTR_IN_PORT nest */</div><div class='add'>+	return nla_total_size(0) +</div><div class='add'>+	       /* NET_DM_ATTR_PORT_NETDEV_IFINDEX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +</div><div class='add'>+	       /* NET_DM_ATTR_PORT_NETDEV_NAME */</div><div class='add'>+	       nla_total_size(IFNAMSIZ + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NET_DM_MAX_SYMBOL_LEN 40</div><div class='add'>+#define NET_DM_MAX_REASON_LEN 50</div><div class='add'>+</div><div class='add'>+static size_t net_dm_packet_report_size(size_t payload_len)</div><div class='add'>+{</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	size = nlmsg_msg_size(GENL_HDRLEN + net_drop_monitor_family.hdrsize);</div><div class='add'>+</div><div class='add'>+	return NLMSG_ALIGN(size) +</div><div class='add'>+	       /* NET_DM_ATTR_ORIGIN */</div><div class='add'>+	       nla_total_size(sizeof(u16)) +</div><div class='add'>+	       /* NET_DM_ATTR_PC */</div><div class='add'>+	       nla_total_size(sizeof(u64)) +</div><div class='add'>+	       /* NET_DM_ATTR_SYMBOL */</div><div class='add'>+	       nla_total_size(NET_DM_MAX_SYMBOL_LEN + 1) +</div><div class='add'>+	       /* NET_DM_ATTR_IN_PORT */</div><div class='add'>+	       net_dm_in_port_size() +</div><div class='add'>+	       /* NET_DM_ATTR_TIMESTAMP */</div><div class='add'>+	       nla_total_size(sizeof(u64)) +</div><div class='add'>+	       /* NET_DM_ATTR_ORIG_LEN */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +</div><div class='add'>+	       /* NET_DM_ATTR_PROTO */</div><div class='add'>+	       nla_total_size(sizeof(u16)) +</div><div class='add'>+	       /* NET_DM_ATTR_REASON */</div><div class='add'>+	       nla_total_size(NET_DM_MAX_REASON_LEN + 1) +</div><div class='add'>+	       /* NET_DM_ATTR_PAYLOAD */</div><div class='add'>+	       nla_total_size(payload_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_packet_report_in_port_put(struct sk_buff *msg, int ifindex,</div><div class='add'>+					    const char *name)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, NET_DM_ATTR_IN_PORT);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (ifindex &amp;&amp;</div><div class='add'>+	    nla_put_u32(msg, NET_DM_ATTR_PORT_NETDEV_IFINDEX, ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (name &amp;&amp; nla_put_string(msg, NET_DM_ATTR_PORT_NETDEV_NAME, name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb,</div><div class='add'>+				     size_t payload_len)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_skb_cb *cb = NET_DM_SKB_CB(skb);</div><div class='add'>+	const struct drop_reason_list *list = NULL;</div><div class='add'>+	unsigned int subsys, subsys_reason;</div><div class='add'>+	char buf[NET_DM_MAX_SYMBOL_LEN];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, 0, 0, &amp;net_drop_monitor_family, 0,</div><div class='add'>+			  NET_DM_CMD_PACKET_ALERT);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, NET_DM_ATTR_ORIGIN, NET_DM_ORIGIN_SW))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, (u64)(uintptr_t)cb-&gt;pc,</div><div class='add'>+			      NET_DM_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	subsys = u32_get_bits(cb-&gt;reason, SKB_DROP_REASON_SUBSYS_MASK);</div><div class='add'>+	if (subsys &lt; SKB_DROP_REASON_SUBSYS_NUM)</div><div class='add'>+		list = rcu_dereference(drop_reasons_by_subsys[subsys]);</div><div class='add'>+	subsys_reason = cb-&gt;reason &amp; ~SKB_DROP_REASON_SUBSYS_MASK;</div><div class='add'>+	if (!list ||</div><div class='add'>+	    subsys_reason &gt;= list-&gt;n_reasons ||</div><div class='add'>+	    !list-&gt;reasons[subsys_reason] ||</div><div class='add'>+	    strlen(list-&gt;reasons[subsys_reason]) &gt; NET_DM_MAX_REASON_LEN) {</div><div class='add'>+		list = rcu_dereference(drop_reasons_by_subsys[SKB_DROP_REASON_SUBSYS_CORE]);</div><div class='add'>+		subsys_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+	}</div><div class='add'>+	if (nla_put_string(msg, NET_DM_ATTR_REASON,</div><div class='add'>+			   list-&gt;reasons[subsys_reason])) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "%pS", cb-&gt;pc);</div><div class='add'>+	if (nla_put_string(msg, NET_DM_ATTR_SYMBOL, buf))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_packet_report_in_port_put(msg, skb-&gt;skb_iif, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NET_DM_ATTR_TIMESTAMP,</div><div class='add'>+			      ktime_to_ns(skb-&gt;tstamp), NET_DM_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NET_DM_ATTR_ORIG_LEN, skb-&gt;len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (!payload_len)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, NET_DM_ATTR_PROTO, be16_to_cpu(skb-&gt;protocol)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	attr = skb_put(msg, nla_total_size(payload_len));</div><div class='add'>+	attr-&gt;nla_type = NET_DM_ATTR_PAYLOAD;</div><div class='add'>+	attr-&gt;nla_len = nla_attr_size(payload_len);</div><div class='add'>+	if (skb_copy_bits(skb, 0, nla_data(attr), payload_len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NET_DM_MAX_PACKET_SIZE (0xffff - NLA_HDRLEN - NLA_ALIGNTO)</div><div class='add'>+</div><div class='add'>+static void net_dm_packet_report(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	size_t payload_len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Make sure we start copying the packet from the MAC header */</div><div class='add'>+	if (skb-&gt;data &gt; skb_mac_header(skb))</div><div class='add'>+		skb_push(skb, skb-&gt;data - skb_mac_header(skb));</div><div class='add'>+	else</div><div class='add'>+		skb_pull(skb, skb_mac_header(skb) - skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	/* Ensure packet fits inside a single netlink attribute */</div><div class='add'>+	payload_len = min_t(size_t, skb-&gt;len, NET_DM_MAX_PACKET_SIZE);</div><div class='add'>+	if (net_dm_trunc_len)</div><div class='add'>+		payload_len = min_t(size_t, net_dm_trunc_len, payload_len);</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(net_dm_packet_report_size(payload_len), GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_packet_report_fill(msg, skb, payload_len);</div><div class='add'>+	if (rc) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast(&amp;net_drop_monitor_family, msg, 0, 0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_packet_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct per_cpu_dm_data *data;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	data = container_of(work, struct per_cpu_dm_data, dm_alert_work);</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;list);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;data-&gt;drop_queue.lock, flags);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;data-&gt;drop_queue, &amp;list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;data-&gt;drop_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;list)))</div><div class='add'>+		net_dm_packet_report(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+net_dm_flow_action_cookie_size(const struct devlink_trap_metadata *hw_metadata)</div><div class='add'>+{</div><div class='add'>+	return hw_metadata-&gt;fa_cookie ?</div><div class='add'>+	       nla_total_size(hw_metadata-&gt;fa_cookie-&gt;cookie_len) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+net_dm_hw_packet_report_size(size_t payload_len,</div><div class='add'>+			     const struct devlink_trap_metadata *hw_metadata)</div><div class='add'>+{</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	size = nlmsg_msg_size(GENL_HDRLEN + net_drop_monitor_family.hdrsize);</div><div class='add'>+</div><div class='add'>+	return NLMSG_ALIGN(size) +</div><div class='add'>+	       /* NET_DM_ATTR_ORIGIN */</div><div class='add'>+	       nla_total_size(sizeof(u16)) +</div><div class='add'>+	       /* NET_DM_ATTR_HW_TRAP_GROUP_NAME */</div><div class='add'>+	       nla_total_size(strlen(hw_metadata-&gt;trap_group_name) + 1) +</div><div class='add'>+	       /* NET_DM_ATTR_HW_TRAP_NAME */</div><div class='add'>+	       nla_total_size(strlen(hw_metadata-&gt;trap_name) + 1) +</div><div class='add'>+	       /* NET_DM_ATTR_IN_PORT */</div><div class='add'>+	       net_dm_in_port_size() +</div><div class='add'>+	       /* NET_DM_ATTR_FLOW_ACTION_COOKIE */</div><div class='add'>+	       net_dm_flow_action_cookie_size(hw_metadata) +</div><div class='add'>+	       /* NET_DM_ATTR_TIMESTAMP */</div><div class='add'>+	       nla_total_size(sizeof(u64)) +</div><div class='add'>+	       /* NET_DM_ATTR_ORIG_LEN */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +</div><div class='add'>+	       /* NET_DM_ATTR_PROTO */</div><div class='add'>+	       nla_total_size(sizeof(u16)) +</div><div class='add'>+	       /* NET_DM_ATTR_PAYLOAD */</div><div class='add'>+	       nla_total_size(payload_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_hw_packet_report_fill(struct sk_buff *msg,</div><div class='add'>+					struct sk_buff *skb, size_t payload_len)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hw_metadata = NET_DM_SKB_CB(skb)-&gt;hw_metadata;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, 0, 0, &amp;net_drop_monitor_family, 0,</div><div class='add'>+			  NET_DM_CMD_PACKET_ALERT);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, NET_DM_ATTR_ORIGIN, NET_DM_ORIGIN_HW))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, NET_DM_ATTR_HW_TRAP_GROUP_NAME,</div><div class='add'>+			   hw_metadata-&gt;trap_group_name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, NET_DM_ATTR_HW_TRAP_NAME,</div><div class='add'>+			   hw_metadata-&gt;trap_name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (hw_metadata-&gt;input_dev) {</div><div class='add'>+		struct net_device *dev = hw_metadata-&gt;input_dev;</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = net_dm_packet_report_in_port_put(msg, dev-&gt;ifindex,</div><div class='add'>+						      dev-&gt;name);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_metadata-&gt;fa_cookie &amp;&amp;</div><div class='add'>+	    nla_put(msg, NET_DM_ATTR_FLOW_ACTION_COOKIE,</div><div class='add'>+		    hw_metadata-&gt;fa_cookie-&gt;cookie_len,</div><div class='add'>+		    hw_metadata-&gt;fa_cookie-&gt;cookie))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NET_DM_ATTR_TIMESTAMP,</div><div class='add'>+			      ktime_to_ns(skb-&gt;tstamp), NET_DM_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NET_DM_ATTR_ORIG_LEN, skb-&gt;len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (!payload_len)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, NET_DM_ATTR_PROTO, be16_to_cpu(skb-&gt;protocol)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	attr = skb_put(msg, nla_total_size(payload_len));</div><div class='add'>+	attr-&gt;nla_type = NET_DM_ATTR_PAYLOAD;</div><div class='add'>+	attr-&gt;nla_len = nla_attr_size(payload_len);</div><div class='add'>+	if (skb_copy_bits(skb, 0, nla_data(attr), payload_len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_metadata *</div><div class='add'>+net_dm_hw_metadata_copy(const struct devlink_trap_metadata *metadata)</div><div class='add'>+{</div><div class='add'>+	const struct flow_action_cookie *fa_cookie;</div><div class='add'>+	struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+	const char *trap_group_name;</div><div class='add'>+	const char *trap_name;</div><div class='add'>+</div><div class='add'>+	hw_metadata = kzalloc(sizeof(*hw_metadata), GFP_ATOMIC);</div><div class='add'>+	if (!hw_metadata)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	trap_group_name = kstrdup(metadata-&gt;trap_group_name, GFP_ATOMIC);</div><div class='add'>+	if (!trap_group_name)</div><div class='add'>+		goto free_hw_metadata;</div><div class='add'>+	hw_metadata-&gt;trap_group_name = trap_group_name;</div><div class='add'>+</div><div class='add'>+	trap_name = kstrdup(metadata-&gt;trap_name, GFP_ATOMIC);</div><div class='add'>+	if (!trap_name)</div><div class='add'>+		goto free_trap_group;</div><div class='add'>+	hw_metadata-&gt;trap_name = trap_name;</div><div class='add'>+</div><div class='add'>+	if (metadata-&gt;fa_cookie) {</div><div class='add'>+		size_t cookie_size = sizeof(*fa_cookie) +</div><div class='add'>+				     metadata-&gt;fa_cookie-&gt;cookie_len;</div><div class='add'>+</div><div class='add'>+		fa_cookie = kmemdup(metadata-&gt;fa_cookie, cookie_size,</div><div class='add'>+				    GFP_ATOMIC);</div><div class='add'>+		if (!fa_cookie)</div><div class='add'>+			goto free_trap_name;</div><div class='add'>+		hw_metadata-&gt;fa_cookie = fa_cookie;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_metadata-&gt;input_dev = metadata-&gt;input_dev;</div><div class='add'>+	netdev_hold(hw_metadata-&gt;input_dev, &amp;hw_metadata-&gt;dev_tracker,</div><div class='add'>+		    GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	return hw_metadata;</div><div class='add'>+</div><div class='add'>+free_trap_name:</div><div class='add'>+	kfree(trap_name);</div><div class='add'>+free_trap_group:</div><div class='add'>+	kfree(trap_group_name);</div><div class='add'>+free_hw_metadata:</div><div class='add'>+	kfree(hw_metadata);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+net_dm_hw_metadata_free(struct devlink_trap_metadata *hw_metadata)</div><div class='add'>+{</div><div class='add'>+	netdev_put(hw_metadata-&gt;input_dev, &amp;hw_metadata-&gt;dev_tracker);</div><div class='add'>+	kfree(hw_metadata-&gt;fa_cookie);</div><div class='add'>+	kfree(hw_metadata-&gt;trap_name);</div><div class='add'>+	kfree(hw_metadata-&gt;trap_group_name);</div><div class='add'>+	kfree(hw_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_packet_report(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	size_t payload_len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;data &gt; skb_mac_header(skb))</div><div class='add'>+		skb_push(skb, skb-&gt;data - skb_mac_header(skb));</div><div class='add'>+	else</div><div class='add'>+		skb_pull(skb, skb_mac_header(skb) - skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	payload_len = min_t(size_t, skb-&gt;len, NET_DM_MAX_PACKET_SIZE);</div><div class='add'>+	if (net_dm_trunc_len)</div><div class='add'>+		payload_len = min_t(size_t, net_dm_trunc_len, payload_len);</div><div class='add'>+</div><div class='add'>+	hw_metadata = NET_DM_SKB_CB(skb)-&gt;hw_metadata;</div><div class='add'>+	msg = nlmsg_new(net_dm_hw_packet_report_size(payload_len, hw_metadata),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_hw_packet_report_fill(msg, skb, payload_len);</div><div class='add'>+	if (rc) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast(&amp;net_drop_monitor_family, msg, 0, 0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	net_dm_hw_metadata_free(NET_DM_SKB_CB(skb)-&gt;hw_metadata);</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_packet_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	hw_data = container_of(work, struct per_cpu_dm_data, dm_alert_work);</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;list);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw_data-&gt;drop_queue.lock, flags);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;hw_data-&gt;drop_queue, &amp;list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw_data-&gt;drop_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;list)))</div><div class='add'>+		net_dm_hw_packet_report(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+net_dm_hw_trap_packet_probe(void *ignore, const struct devlink *devlink,</div><div class='add'>+			    struct sk_buff *skb,</div><div class='add'>+			    const struct devlink_trap_metadata *metadata)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_metadata *n_hw_metadata;</div><div class='add'>+	ktime_t tstamp = ktime_get_real();</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (metadata-&gt;trap_type == DEVLINK_TRAP_TYPE_CONTROL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!skb_mac_header_was_set(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	n_hw_metadata = net_dm_hw_metadata_copy(metadata);</div><div class='add'>+	if (!n_hw_metadata)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	NET_DM_SKB_CB(nskb)-&gt;hw_metadata = n_hw_metadata;</div><div class='add'>+	nskb-&gt;tstamp = tstamp;</div><div class='add'>+</div><div class='add'>+	hw_data = this_cpu_ptr(&amp;dm_hw_cpu_data);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hw_data-&gt;drop_queue.lock, flags);</div><div class='add'>+	if (skb_queue_len(&amp;hw_data-&gt;drop_queue) &lt; net_dm_queue_len)</div><div class='add'>+		__skb_queue_tail(&amp;hw_data-&gt;drop_queue, nskb);</div><div class='add'>+	else</div><div class='add'>+		goto unlock_free;</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw_data-&gt;drop_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;hw_data-&gt;dm_alert_work);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+unlock_free:</div><div class='add'>+	spin_unlock_irqrestore(&amp;hw_data-&gt;drop_queue.lock, flags);</div><div class='add'>+	u64_stats_update_begin(&amp;hw_data-&gt;stats.syncp);</div><div class='add'>+	u64_stats_inc(&amp;hw_data-&gt;stats.dropped);</div><div class='add'>+	u64_stats_update_end(&amp;hw_data-&gt;stats.syncp);</div><div class='add'>+	net_dm_hw_metadata_free(n_hw_metadata);</div><div class='add'>+free:</div><div class='add'>+	consume_skb(nskb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_dm_alert_ops net_dm_alert_packet_ops = {</div><div class='add'>+	.kfree_skb_probe	= net_dm_packet_trace_kfree_skb_hit,</div><div class='add'>+	.napi_poll_probe	= net_dm_packet_trace_napi_poll_hit,</div><div class='add'>+	.work_item_func		= net_dm_packet_work,</div><div class='add'>+	.hw_work_item_func	= net_dm_hw_packet_work,</div><div class='add'>+	.hw_trap_probe		= net_dm_hw_trap_packet_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct net_dm_alert_ops *net_dm_alert_ops_arr[] = {</div><div class='add'>+	[NET_DM_ALERT_MODE_SUMMARY]	= &amp;net_dm_alert_summary_ops,</div><div class='add'>+	[NET_DM_ALERT_MODE_PACKET]	= &amp;net_dm_alert_packet_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DEVLINK)</div><div class='add'>+static int net_dm_hw_probe_register(const struct net_dm_alert_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return register_trace_devlink_trap_report(ops-&gt;hw_trap_probe, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_probe_unregister(const struct net_dm_alert_ops *ops)</div><div class='add'>+{</div><div class='add'>+	unregister_trace_devlink_trap_report(ops-&gt;hw_trap_probe, NULL);</div><div class='add'>+	tracepoint_synchronize_unregister();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int net_dm_hw_probe_register(const struct net_dm_alert_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_probe_unregister(const struct net_dm_alert_ops *ops)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int net_dm_hw_monitor_start(struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_dm_alert_ops *ops;</div><div class='add'>+	int cpu, rc;</div><div class='add'>+</div><div class='add'>+	if (monitor_hw) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Hardware monitoring already enabled");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = net_dm_alert_ops_arr[net_dm_alert_mode];</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to take reference on module");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+		struct net_dm_hw_entries *hw_entries;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;hw_data-&gt;dm_alert_work, ops-&gt;hw_work_item_func);</div><div class='add'>+		timer_setup(&amp;hw_data-&gt;send_timer, sched_send_work, 0);</div><div class='add'>+		hw_entries = net_dm_hw_reset_per_cpu_data(hw_data);</div><div class='add'>+		kfree(hw_entries);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = net_dm_hw_probe_register(ops);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to connect probe to devlink_trap_probe() tracepoint");</div><div class='add'>+		goto err_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	monitor_hw = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_module_put:</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		timer_delete_sync(&amp;hw_data-&gt;send_timer);</div><div class='add'>+		cancel_work_sync(&amp;hw_data-&gt;dm_alert_work);</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;hw_data-&gt;drop_queue))) {</div><div class='add'>+			struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+</div><div class='add'>+			hw_metadata = NET_DM_SKB_CB(skb)-&gt;hw_metadata;</div><div class='add'>+			net_dm_hw_metadata_free(hw_metadata);</div><div class='add'>+			consume_skb(skb);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_monitor_stop(struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_dm_alert_ops *ops;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!monitor_hw) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Hardware monitoring already disabled");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = net_dm_alert_ops_arr[net_dm_alert_mode];</div><div class='add'>+</div><div class='add'>+	monitor_hw = false;</div><div class='add'>+</div><div class='add'>+	net_dm_hw_probe_unregister(ops);</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		timer_delete_sync(&amp;hw_data-&gt;send_timer);</div><div class='add'>+		cancel_work_sync(&amp;hw_data-&gt;dm_alert_work);</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;hw_data-&gt;drop_queue))) {</div><div class='add'>+			struct devlink_trap_metadata *hw_metadata;</div><div class='add'>+</div><div class='add'>+			hw_metadata = NET_DM_SKB_CB(skb)-&gt;hw_metadata;</div><div class='add'>+			net_dm_hw_metadata_free(hw_metadata);</div><div class='add'>+			consume_skb(skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_trace_on_set(struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct net_dm_alert_ops *ops;</div><div class='add'>+	int cpu, rc;</div><div class='add'>+</div><div class='add'>+	ops = net_dm_alert_ops_arr[net_dm_alert_mode];</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to take reference on module");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;data-&gt;dm_alert_work, ops-&gt;work_item_func);</div><div class='add'>+		timer_setup(&amp;data-&gt;send_timer, sched_send_work, 0);</div><div class='add'>+		/* Allocate a new per-CPU skb for the summary alert message and</div><div class='add'>+		 * free the old one which might contain stale data from</div><div class='add'>+		 * previous tracing.</div><div class='add'>+		 */</div><div class='add'>+		skb = reset_per_cpu_data(data);</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = register_trace_kfree_skb(ops-&gt;kfree_skb_probe, NULL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to connect probe to kfree_skb() tracepoint");</div><div class='add'>+		goto err_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = register_trace_napi_poll(ops-&gt;napi_poll_probe, NULL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to connect probe to napi_poll() tracepoint");</div><div class='add'>+		goto err_unregister_trace;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_trace:</div><div class='add'>+	unregister_trace_kfree_skb(ops-&gt;kfree_skb_probe, NULL);</div><div class='add'>+err_module_put:</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		timer_delete_sync(&amp;data-&gt;send_timer);</div><div class='add'>+		cancel_work_sync(&amp;data-&gt;dm_alert_work);</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;data-&gt;drop_queue)))</div><div class='add'>+			consume_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_trace_off_set(void)</div><div class='add'>+{</div><div class='add'>+	const struct net_dm_alert_ops *ops;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	ops = net_dm_alert_ops_arr[net_dm_alert_mode];</div><div class='add'>+</div><div class='add'>+	unregister_trace_napi_poll(ops-&gt;napi_poll_probe, NULL);</div><div class='add'>+	unregister_trace_kfree_skb(ops-&gt;kfree_skb_probe, NULL);</div><div class='add'>+</div><div class='add'>+	tracepoint_synchronize_unregister();</div><div class='add'>+</div><div class='add'>+	/* Make sure we do not send notifications to user space after request</div><div class='add'>+	 * to stop tracing returns.</div><div class='add'>+	 */</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		timer_delete_sync(&amp;data-&gt;send_timer);</div><div class='add'>+		cancel_work_sync(&amp;data-&gt;dm_alert_work);</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;data-&gt;drop_queue)))</div><div class='add'>+			consume_skb(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		module_put(THIS_MODULE);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_all_monitor_traces(int state, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (state == trace_state) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Trace state already set to requested state");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	switch (state) {</div><div class='add'>+	case TRACE_ON:</div><div class='add'>+		rc = net_dm_trace_on_set(extack);</div><div class='add'>+		break;</div><div class='add'>+	case TRACE_OFF:</div><div class='add'>+		net_dm_trace_off_set();</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		rc = 1;</div><div class='hunk'>@@ -287,93 +1246,426 @@ static int set_all_monitor_traces(int state)</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = -EINPROGRESS;</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;trace_state_mutex);</div><div class='del'>-</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool net_dm_is_monitoring(void)</div><div class='add'>+{</div><div class='add'>+	return trace_state == TRACE_ON || monitor_hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_alert_mode_get_from_info(struct genl_info *info,</div><div class='add'>+					   enum net_dm_alert_mode *p_alert_mode)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u8(info-&gt;attrs[NET_DM_ATTR_ALERT_MODE]);</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case NET_DM_ALERT_MODE_SUMMARY:</div><div class='add'>+	case NET_DM_ALERT_MODE_PACKET:</div><div class='add'>+		*p_alert_mode = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_alert_mode_set(struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	enum net_dm_alert_mode alert_mode;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NET_DM_ATTR_ALERT_MODE])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_alert_mode_get_from_info(info, &amp;alert_mode);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid alert mode");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net_dm_alert_mode = alert_mode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_trunc_len_set(struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	if (!info-&gt;attrs[NET_DM_ATTR_TRUNC_LEN])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	net_dm_trunc_len = nla_get_u32(info-&gt;attrs[NET_DM_ATTR_TRUNC_LEN]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_queue_len_set(struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	if (!info-&gt;attrs[NET_DM_ATTR_QUEUE_LEN])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	net_dm_queue_len = nla_get_u32(info-&gt;attrs[NET_DM_ATTR_QUEUE_LEN]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int net_dm_cmd_config(struct sk_buff *skb,</div><div class='ctx'> 			struct genl_info *info)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (net_dm_is_monitoring()) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot configure drop monitor during monitoring");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = net_dm_alert_mode_set(info);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	net_dm_trunc_len_set(info);</div><div class='add'>+</div><div class='add'>+	net_dm_queue_len_set(info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_monitor_start(bool set_sw, bool set_hw,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool sw_set = false;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (set_sw) {</div><div class='add'>+		rc = set_all_monitor_traces(TRACE_ON, extack);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		sw_set = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_hw) {</div><div class='add'>+		rc = net_dm_hw_monitor_start(extack);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_monitor_hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_monitor_hw:</div><div class='add'>+	if (sw_set)</div><div class='add'>+		set_all_monitor_traces(TRACE_OFF, extack);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_monitor_stop(bool set_sw, bool set_hw,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (set_hw)</div><div class='add'>+		net_dm_hw_monitor_stop(extack);</div><div class='add'>+	if (set_sw)</div><div class='add'>+		set_all_monitor_traces(TRACE_OFF, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int net_dm_cmd_trace(struct sk_buff *skb,</div><div class='ctx'> 			struct genl_info *info)</div><div class='ctx'> {</div><div class='add'>+	bool set_sw = !!info-&gt;attrs[NET_DM_ATTR_SW_DROPS];</div><div class='add'>+	bool set_hw = !!info-&gt;attrs[NET_DM_ATTR_HW_DROPS];</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+</div><div class='add'>+	/* To maintain backward compatibility, we start / stop monitoring of</div><div class='add'>+	 * software drops if no flag is specified.</div><div class='add'>+	 */</div><div class='add'>+	if (!set_sw &amp;&amp; !set_hw)</div><div class='add'>+		set_sw = true;</div><div class='add'>+</div><div class='ctx'> 	switch (info-&gt;genlhdr-&gt;cmd) {</div><div class='ctx'> 	case NET_DM_CMD_START:</div><div class='del'>-		return set_all_monitor_traces(TRACE_ON);</div><div class='add'>+		return net_dm_monitor_start(set_sw, set_hw, extack);</div><div class='ctx'> 	case NET_DM_CMD_STOP:</div><div class='del'>-		return set_all_monitor_traces(TRACE_OFF);</div><div class='add'>+		net_dm_monitor_stop(set_sw, set_hw, extack);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_config_fill(struct sk_buff *msg, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;net_drop_monitor_family, 0, NET_DM_CMD_CONFIG_NEW);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NET_DM_ATTR_ALERT_MODE, net_dm_alert_mode))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NET_DM_ATTR_TRUNC_LEN, net_dm_trunc_len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NET_DM_ATTR_QUEUE_LEN, net_dm_queue_len))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_cmd_config_get(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_config_fill(msg, info);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto free_msg;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_stats_read(struct net_dm_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	memset(stats, 0, sizeof(*stats));</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+		struct net_dm_stats *cpu_stats = &amp;data-&gt;stats;</div><div class='add'>+		unsigned int start;</div><div class='add'>+		u64 dropped;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			dropped = u64_stats_read(&amp;cpu_stats-&gt;dropped);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;dropped, dropped);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_stats_put(struct sk_buff *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_stats stats;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	net_dm_stats_read(&amp;stats);</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, NET_DM_ATTR_STATS);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NET_DM_ATTR_STATS_DROPPED,</div><div class='add'>+			      u64_stats_read(&amp;stats.dropped), NET_DM_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_stats_read(struct net_dm_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	memset(stats, 0, sizeof(*stats));</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct per_cpu_dm_data *hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+		struct net_dm_stats *cpu_stats = &amp;hw_data-&gt;stats;</div><div class='add'>+		unsigned int start;</div><div class='add'>+		u64 dropped;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			dropped = u64_stats_read(&amp;cpu_stats-&gt;dropped);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;dropped, dropped);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_hw_stats_put(struct sk_buff *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_dm_stats stats;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	net_dm_hw_stats_read(&amp;stats);</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, NET_DM_ATTR_HW_STATS);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NET_DM_ATTR_STATS_DROPPED,</div><div class='add'>+			      u64_stats_read(&amp;stats.dropped), NET_DM_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_stats_fill(struct sk_buff *msg, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;net_drop_monitor_family, 0, NET_DM_CMD_STATS_NEW);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_stats_put(msg);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_hw_stats_put(msg);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_dm_cmd_stats_get(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = net_dm_stats_fill(msg, info);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto free_msg;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dropmon_net_event(struct notifier_block *ev_block,</div><div class='ctx'> 			     unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct dm_hw_stat_delta *new_stat = NULL;</div><div class='del'>-	struct dm_hw_stat_delta *tmp;</div><div class='add'>+	struct dm_hw_stat_delta *stat;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_REGISTER:</div><div class='del'>-		new_stat = kzalloc(sizeof(struct dm_hw_stat_delta), GFP_KERNEL);</div><div class='add'>+		if (WARN_ON_ONCE(rtnl_dereference(dev-&gt;dm_private)))</div><div class='add'>+			break;</div><div class='add'>+		stat = kzalloc(sizeof(*stat), GFP_KERNEL);</div><div class='add'>+		if (!stat)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		if (!new_stat)</div><div class='del'>-			goto out;</div><div class='add'>+		stat-&gt;last_rx = jiffies;</div><div class='add'>+		rcu_assign_pointer(dev-&gt;dm_private, stat);</div><div class='ctx'> </div><div class='del'>-		new_stat-&gt;dev = dev;</div><div class='del'>-		new_stat-&gt;last_rx = jiffies;</div><div class='del'>-		mutex_lock(&amp;trace_state_mutex);</div><div class='del'>-		list_add_rcu(&amp;new_stat-&gt;list, &amp;hw_stats_list);</div><div class='del'>-		mutex_unlock(&amp;trace_state_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='del'>-		mutex_lock(&amp;trace_state_mutex);</div><div class='del'>-		list_for_each_entry_safe(new_stat, tmp, &amp;hw_stats_list, list) {</div><div class='del'>-			if (new_stat-&gt;dev == dev) {</div><div class='del'>-				new_stat-&gt;dev = NULL;</div><div class='del'>-				if (trace_state == TRACE_OFF) {</div><div class='del'>-					list_del_rcu(&amp;new_stat-&gt;list);</div><div class='del'>-					kfree_rcu(new_stat, rcu);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		stat = rtnl_dereference(dev-&gt;dm_private);</div><div class='add'>+		if (stat) {</div><div class='add'>+			rcu_assign_pointer(dev-&gt;dm_private, NULL);</div><div class='add'>+			kfree_rcu(stat, rcu);</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;trace_state_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops dropmon_ops[] = {</div><div class='add'>+static const struct nla_policy net_dm_nl_policy[NET_DM_ATTR_MAX + 1] = {</div><div class='add'>+	[NET_DM_ATTR_UNSPEC] = { .strict_start_type = NET_DM_ATTR_UNSPEC + 1 },</div><div class='add'>+	[NET_DM_ATTR_ALERT_MODE] = { .type = NLA_U8 },</div><div class='add'>+	[NET_DM_ATTR_TRUNC_LEN] = { .type = NLA_U32 },</div><div class='add'>+	[NET_DM_ATTR_QUEUE_LEN] = { .type = NLA_U32 },</div><div class='add'>+	[NET_DM_ATTR_SW_DROPS]	= {. type = NLA_FLAG },</div><div class='add'>+	[NET_DM_ATTR_HW_DROPS]	= {. type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct genl_small_ops dropmon_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NET_DM_CMD_CONFIG,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = net_dm_cmd_config,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NET_DM_CMD_START,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = net_dm_cmd_trace,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NET_DM_CMD_STOP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = net_dm_cmd_trace,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NET_DM_CMD_CONFIG_GET,</div><div class='add'>+		.doit = net_dm_cmd_config_get,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NET_DM_CMD_STATS_GET,</div><div class='add'>+		.doit = net_dm_cmd_stats_get,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int net_dm_nl_pre_doit(const struct genl_split_ops *ops,</div><div class='add'>+			      struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;net_dm_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_nl_post_doit(const struct genl_split_ops *ops,</div><div class='add'>+				struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;net_dm_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct genl_family net_drop_monitor_family __ro_after_init = {</div><div class='ctx'> 	.hdrsize        = 0,</div><div class='ctx'> 	.name           = "NET_DM",</div><div class='ctx'> 	.version        = 2,</div><div class='add'>+	.maxattr	= NET_DM_ATTR_MAX,</div><div class='add'>+	.policy		= net_dm_nl_policy,</div><div class='add'>+	.pre_doit	= net_dm_nl_pre_doit,</div><div class='add'>+	.post_doit	= net_dm_nl_post_doit,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= dropmon_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(dropmon_ops),</div><div class='add'>+	.small_ops	= dropmon_ops,</div><div class='add'>+	.n_small_ops	= ARRAY_SIZE(dropmon_ops),</div><div class='add'>+	.resv_start_op	= NET_DM_CMD_STATS_GET + 1,</div><div class='ctx'> 	.mcgrps		= dropmon_mcgrps,</div><div class='ctx'> 	.n_mcgrps	= ARRAY_SIZE(dropmon_mcgrps),</div><div class='ctx'> };</div><div class='hunk'>@@ -382,9 +1674,57 @@ static struct notifier_block dropmon_net_notifier = {</div><div class='ctx'> 	.notifier_call = dropmon_net_event</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init init_net_drop_monitor(void)</div><div class='add'>+static void __net_dm_cpu_data_init(struct per_cpu_dm_data *data)</div><div class='add'>+{</div><div class='add'>+	raw_spin_lock_init(&amp;data-&gt;lock);</div><div class='add'>+	skb_queue_head_init(&amp;data-&gt;drop_queue);</div><div class='add'>+	u64_stats_init(&amp;data-&gt;stats.syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_dm_cpu_data_fini(struct per_cpu_dm_data *data)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!skb_queue_empty(&amp;data-&gt;drop_queue));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_cpu_data_init(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct per_cpu_dm_data *data;</div><div class='add'>+</div><div class='add'>+	data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+	__net_dm_cpu_data_init(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_cpu_data_fini(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct per_cpu_dm_data *data;</div><div class='add'>+</div><div class='add'>+	data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='add'>+	/* At this point, we should have exclusive access</div><div class='add'>+	 * to this struct and can free the skb inside it.</div><div class='add'>+	 */</div><div class='add'>+	consume_skb(data-&gt;skb);</div><div class='add'>+	__net_dm_cpu_data_fini(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_cpu_data_init(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+</div><div class='add'>+	hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+	__net_dm_cpu_data_init(hw_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void net_dm_hw_cpu_data_fini(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct per_cpu_dm_data *hw_data;</div><div class='add'>+</div><div class='add'>+	hw_data = &amp;per_cpu(dm_hw_cpu_data, cpu);</div><div class='add'>+	kfree(hw_data-&gt;hw_entries);</div><div class='add'>+	__net_dm_cpu_data_fini(hw_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init init_net_drop_monitor(void)</div><div class='add'>+{</div><div class='ctx'> 	int cpu, rc;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Initializing network drop monitor service\n");</div><div class='hunk'>@@ -394,64 +1734,50 @@ static int __init init_net_drop_monitor(void)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = genl_register_family(&amp;net_drop_monitor_family);</div><div class='del'>-	if (rc) {</div><div class='del'>-		pr_err("Could not create drop monitor netlink family\n");</div><div class='del'>-		return rc;</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		net_dm_cpu_data_init(cpu);</div><div class='add'>+		net_dm_hw_cpu_data_init(cpu);</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON(net_drop_monitor_family.mcgrp_offset != NET_DM_GRP_ALERT);</div><div class='ctx'> </div><div class='ctx'> 	rc = register_netdevice_notifier(&amp;dropmon_net_notifier);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		pr_crit("Failed to register netdevice notifier\n");</div><div class='del'>-		goto out_unreg;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = 0;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='del'>-		INIT_WORK(&amp;data-&gt;dm_alert_work, send_dm_alert);</div><div class='del'>-		timer_setup(&amp;data-&gt;send_timer, sched_send_work, 0);</div><div class='del'>-		spin_lock_init(&amp;data-&gt;lock);</div><div class='del'>-		reset_per_cpu_data(data);</div><div class='add'>+	rc = genl_register_family(&amp;net_drop_monitor_family);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("Could not create drop monitor netlink family\n");</div><div class='add'>+		goto out_unreg;</div><div class='ctx'> 	}</div><div class='add'>+	WARN_ON(net_drop_monitor_family.mcgrp_offset != NET_DM_GRP_ALERT);</div><div class='ctx'> </div><div class='add'>+	rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_unreg:</div><div class='del'>-	genl_unregister_family(&amp;net_drop_monitor_family);</div><div class='add'>+	WARN_ON(unregister_netdevice_notifier(&amp;dropmon_net_notifier));</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exit_net_drop_monitor(void)</div><div class='ctx'> {</div><div class='del'>-	struct per_cpu_dm_data *data;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(unregister_netdevice_notifier(&amp;dropmon_net_notifier));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Because of the module_get/put we do in the trace state change path</div><div class='del'>-	 * we are guarnateed not to have any current users when we get here</div><div class='del'>-	 * all we need to do is make sure that we don't have any running timers</div><div class='del'>-	 * or pending schedule calls</div><div class='add'>+	 * we are guaranteed not to have any current users when we get here</div><div class='ctx'> 	 */</div><div class='add'>+	BUG_ON(genl_unregister_family(&amp;net_drop_monitor_family));</div><div class='add'>+</div><div class='add'>+	BUG_ON(unregister_netdevice_notifier(&amp;dropmon_net_notifier));</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		data = &amp;per_cpu(dm_cpu_data, cpu);</div><div class='del'>-		del_timer_sync(&amp;data-&gt;send_timer);</div><div class='del'>-		cancel_work_sync(&amp;data-&gt;dm_alert_work);</div><div class='del'>-		/*</div><div class='del'>-		 * At this point, we should have exclusive access</div><div class='del'>-		 * to this struct and can free the skb inside it</div><div class='del'>-		 */</div><div class='del'>-		kfree_skb(data-&gt;skb);</div><div class='add'>+		net_dm_hw_cpu_data_fini(cpu);</div><div class='add'>+		net_dm_cpu_data_fini(cpu);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(genl_unregister_family(&amp;net_drop_monitor_family));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(init_net_drop_monitor);</div><div class='hunk'>@@ -460,3 +1786,4 @@ module_exit(exit_net_drop_monitor);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Neil Horman &lt;nhorman@tuxdriver.com&gt;");</div><div class='ctx'> MODULE_ALIAS_GENL_FAMILY("NET_DM");</div><div class='add'>+MODULE_DESCRIPTION("Monitoring code for network dropped packet alerts");</div><div class='head'>diff --git a/net/core/dst.c b/net/core/dst.c<br/>index 81ccf20e2826..e9d35f49c9e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/dst.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dst.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dst.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dst.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/dst.c	Protocol independent destination cache.</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,23 +27,6 @@</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Theory of operations:</div><div class='del'>- * 1) We use a list, protected by a spinlock, to add</div><div class='del'>- *    new entries from both BH and non-BH context.</div><div class='del'>- * 2) In order to keep spinlock held for a small delay,</div><div class='del'>- *    we use a second list where are stored long lived</div><div class='del'>- *    entries, that are handled by the garbage collect thread</div><div class='del'>- *    fired by a workqueue.</div><div class='del'>- * 3) This list is guarded by a mutex,</div><div class='del'>- *    so that the gc_task and dst_dev_event() can be synchronized.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We want to keep lock &amp; list close together</div><div class='del'>- * to dirty as few cache lines as possible in __dst_free().</div><div class='del'>- * As this is not a very strong hint, we dont force an alignment on SMP.</div><div class='del'>- */</div><div class='ctx'> int dst_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -61,12 +45,11 @@ const struct dst_metrics dst_default_metrics = {</div><div class='ctx'> EXPORT_SYMBOL(dst_default_metrics);</div><div class='ctx'> </div><div class='ctx'> void dst_init(struct dst_entry *dst, struct dst_ops *ops,</div><div class='del'>-	      struct net_device *dev, int initial_ref, int initial_obsolete,</div><div class='add'>+	      struct net_device *dev, int initial_obsolete,</div><div class='ctx'> 	      unsigned short flags)</div><div class='ctx'> {</div><div class='ctx'> 	dst-&gt;dev = dev;</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;dst-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 	dst-&gt;ops = ops;</div><div class='ctx'> 	dst_init_metrics(dst, dst_default_metrics.metrics, true);</div><div class='ctx'> 	dst-&gt;expires = 0UL;</div><div class='hunk'>@@ -83,7 +66,8 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,</div><div class='ctx'> 	dst-&gt;tclassid = 0;</div><div class='ctx'> #endif</div><div class='ctx'> 	dst-&gt;lwtstate = NULL;</div><div class='del'>-	atomic_set(&amp;dst-&gt;__refcnt, initial_ref);</div><div class='add'>+	rcuref_init(&amp;dst-&gt;__rcuref, 1);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dst-&gt;rt_uncached);</div><div class='ctx'> 	dst-&gt;__use = 0;</div><div class='ctx'> 	dst-&gt;lastuse = jiffies;</div><div class='ctx'> 	dst-&gt;flags = flags;</div><div class='hunk'>@@ -93,26 +77,26 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,</div><div class='ctx'> EXPORT_SYMBOL(dst_init);</div><div class='ctx'> </div><div class='ctx'> void *dst_alloc(struct dst_ops *ops, struct net_device *dev,</div><div class='del'>-		int initial_ref, int initial_obsolete, unsigned short flags)</div><div class='add'>+		int initial_obsolete, unsigned short flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;gc &amp;&amp; dst_entries_get_fast(ops) &gt; ops-&gt;gc_thresh) {</div><div class='del'>-		if (ops-&gt;gc(ops))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (ops-&gt;gc &amp;&amp;</div><div class='add'>+	    !(flags &amp; DST_NOCOUNT) &amp;&amp;</div><div class='add'>+	    dst_entries_get_fast(ops) &gt; ops-&gt;gc_thresh)</div><div class='add'>+		ops-&gt;gc(ops);</div><div class='ctx'> </div><div class='ctx'> 	dst = kmem_cache_alloc(ops-&gt;kmem_cachep, GFP_ATOMIC);</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	dst_init(dst, ops, dev, initial_ref, initial_obsolete, flags);</div><div class='add'>+	dst_init(dst, ops, dev, initial_obsolete, flags);</div><div class='ctx'> </div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dst_alloc);</div><div class='ctx'> </div><div class='del'>-struct dst_entry *dst_destroy(struct dst_entry * dst)</div><div class='add'>+static void dst_destroy(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *child = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -125,13 +109,9 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)</div><div class='ctx'> 		child = xdst-&gt;child;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (!(dst-&gt;flags &amp; DST_NOCOUNT))</div><div class='del'>-		dst_entries_add(dst-&gt;ops, -1);</div><div class='del'>-</div><div class='ctx'> 	if (dst-&gt;ops-&gt;destroy)</div><div class='ctx'> 		dst-&gt;ops-&gt;destroy(dst);</div><div class='del'>-	if (dst-&gt;dev)</div><div class='del'>-		dev_put(dst-&gt;dev);</div><div class='add'>+	netdev_put(dst-&gt;dev, &amp;dst-&gt;dev_tracker);</div><div class='ctx'> </div><div class='ctx'> 	lwtstate_put(dst-&gt;lwtstate);</div><div class='ctx'> </div><div class='hunk'>@@ -143,20 +123,18 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)</div><div class='ctx'> 	dst = child;</div><div class='ctx'> 	if (dst)</div><div class='ctx'> 		dst_release_immediate(dst);</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dst_destroy);</div><div class='ctx'> </div><div class='ctx'> static void dst_destroy_rcu(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);</div><div class='ctx'> </div><div class='del'>-	dst = dst_destroy(dst);</div><div class='add'>+	dst_destroy(dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Operations to mark dst as DEAD and clean up the net device referenced</div><div class='ctx'>  * by dst:</div><div class='del'>- * 1. put the dst under loopback interface and discard all tx/rx packets</div><div class='add'>+ * 1. put the dst under blackhole interface and discard all tx/rx packets</div><div class='ctx'>  *    on this route.</div><div class='ctx'>  * 2. release the net_device</div><div class='ctx'>  * This function should be called when removing routes from the fib tree</div><div class='hunk'>@@ -167,43 +145,45 @@ void dst_dev_put(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dst-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	dst-&gt;obsolete = DST_OBSOLETE_DEAD;</div><div class='add'>+	WRITE_ONCE(dst-&gt;obsolete, DST_OBSOLETE_DEAD);</div><div class='ctx'> 	if (dst-&gt;ops-&gt;ifdown)</div><div class='del'>-		dst-&gt;ops-&gt;ifdown(dst, dev, true);</div><div class='del'>-	dst-&gt;input = dst_discard;</div><div class='del'>-	dst-&gt;output = dst_discard_out;</div><div class='del'>-	dst-&gt;dev = dev_net(dst-&gt;dev)-&gt;loopback_dev;</div><div class='del'>-	dev_hold(dst-&gt;dev);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+		dst-&gt;ops-&gt;ifdown(dst, dev);</div><div class='add'>+	WRITE_ONCE(dst-&gt;input, dst_discard);</div><div class='add'>+	WRITE_ONCE(dst-&gt;output, dst_discard_out);</div><div class='add'>+	rcu_assign_pointer(dst-&gt;dev_rcu, blackhole_netdev);</div><div class='add'>+	netdev_ref_replace(dev, blackhole_netdev, &amp;dst-&gt;dev_tracker,</div><div class='add'>+			   GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dst_dev_put);</div><div class='ctx'> </div><div class='add'>+static void dst_count_dec(struct dst_entry *dst)</div><div class='add'>+{</div><div class='add'>+	if (!(dst-&gt;flags &amp; DST_NOCOUNT))</div><div class='add'>+		dst_entries_add(dst-&gt;ops, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void dst_release(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	if (dst) {</div><div class='del'>-		int newrefcnt;</div><div class='del'>-</div><div class='del'>-		newrefcnt = atomic_dec_return(&amp;dst-&gt;__refcnt);</div><div class='del'>-		if (unlikely(newrefcnt &lt; 0))</div><div class='del'>-			net_warn_ratelimited("%s: dst:%p refcnt:%d\n",</div><div class='del'>-					     __func__, dst, newrefcnt);</div><div class='del'>-		if (!newrefcnt)</div><div class='del'>-			call_rcu(&amp;dst-&gt;rcu_head, dst_destroy_rcu);</div><div class='add'>+	if (dst &amp;&amp; rcuref_put(&amp;dst-&gt;__rcuref)) {</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+		if (dst-&gt;flags &amp; DST_METADATA) {</div><div class='add'>+			struct metadata_dst *md_dst = (struct metadata_dst *)dst;</div><div class='add'>+</div><div class='add'>+			if (md_dst-&gt;type == METADATA_IP_TUNNEL)</div><div class='add'>+				dst_cache_reset_now(&amp;md_dst-&gt;u.tun_info.dst_cache);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		dst_count_dec(dst);</div><div class='add'>+		call_rcu_hurry(&amp;dst-&gt;rcu_head, dst_destroy_rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dst_release);</div><div class='ctx'> </div><div class='ctx'> void dst_release_immediate(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	if (dst) {</div><div class='del'>-		int newrefcnt;</div><div class='del'>-</div><div class='del'>-		newrefcnt = atomic_dec_return(&amp;dst-&gt;__refcnt);</div><div class='del'>-		if (unlikely(newrefcnt &lt; 0))</div><div class='del'>-			net_warn_ratelimited("%s: dst:%p refcnt:%d\n",</div><div class='del'>-					     __func__, dst, newrefcnt);</div><div class='del'>-		if (!newrefcnt)</div><div class='del'>-			dst_destroy(dst);</div><div class='add'>+	if (dst &amp;&amp; rcuref_put(&amp;dst-&gt;__rcuref)) {</div><div class='add'>+		dst_count_dec(dst);</div><div class='add'>+		dst_destroy(dst);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dst_release_immediate);</div><div class='hunk'>@@ -249,37 +229,62 @@ void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__dst_destroy_metrics_generic);</div><div class='ctx'> </div><div class='del'>-static struct dst_ops md_dst_ops = {</div><div class='del'>-	.family =		AF_UNSPEC,</div><div class='del'>-};</div><div class='add'>+struct dst_entry *dst_blackhole_check(struct dst_entry *dst, u32 cookie)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int dst_md_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+u32 *dst_blackhole_cow_metrics(struct dst_entry *dst, unsigned long old)</div><div class='ctx'> {</div><div class='del'>-	WARN_ONCE(1, "Attempting to call output on metadata dst\n");</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dst_md_discard(struct sk_buff *skb)</div><div class='add'>+struct neighbour *dst_blackhole_neigh_lookup(const struct dst_entry *dst,</div><div class='add'>+					     struct sk_buff *skb,</div><div class='add'>+					     const void *daddr)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dst_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='add'>+			       struct sk_buff *skb, u32 mtu,</div><div class='add'>+			       bool confirm_neigh)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dst_blackhole_update_pmtu);</div><div class='add'>+</div><div class='add'>+void dst_blackhole_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	WARN_ONCE(1, "Attempting to call input on metadata dst\n");</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dst_blackhole_redirect);</div><div class='add'>+</div><div class='add'>+unsigned int dst_blackhole_mtu(const struct dst_entry *dst)</div><div class='add'>+{</div><div class='add'>+	unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='add'>+</div><div class='add'>+	return mtu ? : dst_dev(dst)-&gt;mtu;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dst_blackhole_mtu);</div><div class='add'>+</div><div class='add'>+static struct dst_ops dst_blackhole_ops = {</div><div class='add'>+	.family		= AF_UNSPEC,</div><div class='add'>+	.neigh_lookup	= dst_blackhole_neigh_lookup,</div><div class='add'>+	.check		= dst_blackhole_check,</div><div class='add'>+	.cow_metrics	= dst_blackhole_cow_metrics,</div><div class='add'>+	.update_pmtu	= dst_blackhole_update_pmtu,</div><div class='add'>+	.redirect	= dst_blackhole_redirect,</div><div class='add'>+	.mtu		= dst_blackhole_mtu,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __metadata_dst_init(struct metadata_dst *md_dst,</div><div class='ctx'> 				enum metadata_type type, u8 optslen)</div><div class='del'>-</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> </div><div class='ctx'> 	dst = &amp;md_dst-&gt;dst;</div><div class='del'>-	dst_init(dst, &amp;md_dst_ops, NULL, 1, DST_OBSOLETE_NONE,</div><div class='add'>+	dst_init(dst, &amp;dst_blackhole_ops, NULL, DST_OBSOLETE_NONE,</div><div class='ctx'> 		 DST_METADATA | DST_NOCOUNT);</div><div class='del'>-</div><div class='del'>-	dst-&gt;input = dst_md_discard;</div><div class='del'>-	dst-&gt;output = dst_md_discard_out;</div><div class='del'>-</div><div class='ctx'> 	memset(dst + 1, 0, sizeof(*md_dst) + optslen - sizeof(*dst));</div><div class='ctx'> 	md_dst-&gt;type = type;</div><div class='ctx'> }</div><div class='hunk'>@@ -289,7 +294,8 @@ struct metadata_dst *metadata_dst_alloc(u8 optslen, enum metadata_type type,</div><div class='ctx'> {</div><div class='ctx'> 	struct metadata_dst *md_dst;</div><div class='ctx'> </div><div class='del'>-	md_dst = kmalloc(sizeof(*md_dst) + optslen, flags);</div><div class='add'>+	md_dst = kmalloc(struct_size(md_dst, u.tun_info.options, optslen),</div><div class='add'>+			 flags);</div><div class='ctx'> 	if (!md_dst)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -305,6 +311,8 @@ void metadata_dst_free(struct metadata_dst *md_dst)</div><div class='ctx'> 	if (md_dst-&gt;type == METADATA_IP_TUNNEL)</div><div class='ctx'> 		dst_cache_destroy(&amp;md_dst-&gt;u.tun_info.dst_cache);</div><div class='ctx'> #endif</div><div class='add'>+	if (md_dst-&gt;type == METADATA_XFRM)</div><div class='add'>+		dst_release(md_dst-&gt;u.xfrm_info.dst_orig);</div><div class='ctx'> 	kfree(md_dst);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(metadata_dst_free);</div><div class='hunk'>@@ -315,7 +323,8 @@ metadata_dst_alloc_percpu(u8 optslen, enum metadata_type type, gfp_t flags)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	struct metadata_dst __percpu *md_dst;</div><div class='ctx'> </div><div class='del'>-	md_dst = __alloc_percpu_gfp(sizeof(struct metadata_dst) + optslen,</div><div class='add'>+	md_dst = __alloc_percpu_gfp(struct_size(md_dst, u.tun_info.options,</div><div class='add'>+						optslen),</div><div class='ctx'> 				    __alignof__(struct metadata_dst), flags);</div><div class='ctx'> 	if (!md_dst)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -329,16 +338,18 @@ EXPORT_SYMBOL_GPL(metadata_dst_alloc_percpu);</div><div class='ctx'> </div><div class='ctx'> void metadata_dst_free_percpu(struct metadata_dst __percpu *md_dst)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_DST_CACHE</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct metadata_dst *one_md_dst = per_cpu_ptr(md_dst, cpu);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='ctx'> 		if (one_md_dst-&gt;type == METADATA_IP_TUNNEL)</div><div class='ctx'> 			dst_cache_destroy(&amp;one_md_dst-&gt;u.tun_info.dst_cache);</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='add'>+		if (one_md_dst-&gt;type == METADATA_XFRM)</div><div class='add'>+			dst_release(one_md_dst-&gt;u.xfrm_info.dst_orig);</div><div class='add'>+	}</div><div class='ctx'> 	free_percpu(md_dst);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(metadata_dst_free_percpu);</div><div class='head'>diff --git a/net/core/dst_cache.c b/net/core/dst_cache.c<br/>index 64cef977484a..9ab4902324e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/dst_cache.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/dst_cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/dst_cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/dst_cache.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/dst_cache.c - dst entry cache</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Paolo Abeni &lt;pabeni@redhat.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -21,6 +17,7 @@</div><div class='ctx'> struct dst_cache_pcpu {</div><div class='ctx'> 	unsigned long refresh_ts;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	local_lock_t bh_lock;</div><div class='ctx'> 	u32 cookie;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct in_addr in_saddr;</div><div class='hunk'>@@ -31,6 +28,7 @@ struct dst_cache_pcpu {</div><div class='ctx'> static void dst_cache_per_cpu_dst_set(struct dst_cache_pcpu *dst_cache,</div><div class='ctx'> 				      struct dst_entry *dst, u32 cookie)</div><div class='ctx'> {</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!in_softirq());</div><div class='ctx'> 	dst_release(dst_cache-&gt;dst);</div><div class='ctx'> 	if (dst)</div><div class='ctx'> 		dst_hold(dst);</div><div class='hunk'>@@ -44,6 +42,7 @@ static struct dst_entry *dst_cache_per_cpu_get(struct dst_cache *dst_cache,</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> </div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!in_softirq());</div><div class='ctx'> 	dst = idst-&gt;dst;</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -51,8 +50,9 @@ static struct dst_entry *dst_cache_per_cpu_get(struct dst_cache *dst_cache,</div><div class='ctx'> 	/* the cache already hold a dst reference; it can't go away */</div><div class='ctx'> 	dst_hold(dst);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!time_after(idst-&gt;refresh_ts, dst_cache-&gt;reset_ts) ||</div><div class='del'>-		     (dst-&gt;obsolete &amp;&amp; !dst-&gt;ops-&gt;check(dst, idst-&gt;cookie)))) {</div><div class='add'>+	if (unlikely(!time_after(idst-&gt;refresh_ts,</div><div class='add'>+				 READ_ONCE(dst_cache-&gt;reset_ts)) ||</div><div class='add'>+		     (READ_ONCE(dst-&gt;obsolete) &amp;&amp; !dst-&gt;ops-&gt;check(dst, idst-&gt;cookie)))) {</div><div class='ctx'> 		dst_cache_per_cpu_dst_set(idst, NULL, 0);</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -66,10 +66,15 @@ fail:</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *dst_cache_get(struct dst_cache *dst_cache)</div><div class='ctx'> {</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return dst_cache_per_cpu_get(dst_cache, this_cpu_ptr(dst_cache-&gt;cache));</div><div class='add'>+	local_lock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='add'>+	dst = dst_cache_per_cpu_get(dst_cache, this_cpu_ptr(dst_cache-&gt;cache));</div><div class='add'>+	local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='add'>+	return dst;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_get);</div><div class='ctx'> </div><div class='hunk'>@@ -81,13 +86,17 @@ struct rtable *dst_cache_get_ip4(struct dst_cache *dst_cache, __be32 *saddr)</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> 	idst = this_cpu_ptr(dst_cache-&gt;cache);</div><div class='ctx'> 	dst = dst_cache_per_cpu_get(dst_cache, idst);</div><div class='del'>-	if (!dst)</div><div class='add'>+	if (!dst) {</div><div class='add'>+		local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*saddr = idst-&gt;in_saddr.s_addr;</div><div class='del'>-	return container_of(dst, struct rtable, dst);</div><div class='add'>+	local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='add'>+	return dst_rtable(dst);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_get_ip4);</div><div class='ctx'> </div><div class='hunk'>@@ -99,9 +108,11 @@ void dst_cache_set_ip4(struct dst_cache *dst_cache, struct dst_entry *dst,</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> 	idst = this_cpu_ptr(dst_cache-&gt;cache);</div><div class='ctx'> 	dst_cache_per_cpu_dst_set(idst, dst, 0);</div><div class='ctx'> 	idst-&gt;in_saddr.s_addr = saddr;</div><div class='add'>+	local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_set_ip4);</div><div class='ctx'> </div><div class='hunk'>@@ -114,10 +125,13 @@ void dst_cache_set_ip6(struct dst_cache *dst_cache, struct dst_entry *dst,</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='add'>+</div><div class='ctx'> 	idst = this_cpu_ptr(dst_cache-&gt;cache);</div><div class='del'>-	dst_cache_per_cpu_dst_set(this_cpu_ptr(dst_cache-&gt;cache), dst,</div><div class='del'>-				  rt6_get_cookie((struct rt6_info *)dst));</div><div class='add'>+	dst_cache_per_cpu_dst_set(idst, dst,</div><div class='add'>+				  rt6_get_cookie(dst_rt6_info(dst)));</div><div class='ctx'> 	idst-&gt;in6_saddr = *saddr;</div><div class='add'>+	local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_set_ip6);</div><div class='ctx'> </div><div class='hunk'>@@ -130,12 +144,17 @@ struct dst_entry *dst_cache_get_ip6(struct dst_cache *dst_cache,</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='add'>+</div><div class='ctx'> 	idst = this_cpu_ptr(dst_cache-&gt;cache);</div><div class='ctx'> 	dst = dst_cache_per_cpu_get(dst_cache, idst);</div><div class='del'>-	if (!dst)</div><div class='add'>+	if (!dst) {</div><div class='add'>+		local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*saddr = idst-&gt;in6_saddr;</div><div class='add'>+	local_unlock_nested_bh(&amp;dst_cache-&gt;cache-&gt;bh_lock);</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_get_ip6);</div><div class='hunk'>@@ -143,10 +162,14 @@ EXPORT_SYMBOL_GPL(dst_cache_get_ip6);</div><div class='ctx'> </div><div class='ctx'> int dst_cache_init(struct dst_cache *dst_cache, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='ctx'> 	dst_cache-&gt;cache = alloc_percpu_gfp(struct dst_cache_pcpu,</div><div class='ctx'> 					    gfp | __GFP_ZERO);</div><div class='ctx'> 	if (!dst_cache-&gt;cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		local_lock_init(&amp;per_cpu_ptr(dst_cache-&gt;cache, i)-&gt;bh_lock);</div><div class='ctx'> </div><div class='ctx'> 	dst_cache_reset(dst_cache);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -166,3 +189,22 @@ void dst_cache_destroy(struct dst_cache *dst_cache)</div><div class='ctx'> 	free_percpu(dst_cache-&gt;cache);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dst_cache_destroy);</div><div class='add'>+</div><div class='add'>+void dst_cache_reset_now(struct dst_cache *dst_cache)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!dst_cache-&gt;cache)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dst_cache_reset(dst_cache);</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		struct dst_cache_pcpu *idst = per_cpu_ptr(dst_cache-&gt;cache, i);</div><div class='add'>+		struct dst_entry *dst = idst-&gt;dst;</div><div class='add'>+</div><div class='add'>+		idst-&gt;cookie = 0;</div><div class='add'>+		idst-&gt;dst = NULL;</div><div class='add'>+		dst_release(dst);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dst_cache_reset_now);</div><div class='head'>diff --git a/net/core/failover.c b/net/core/failover.c<br/>index 4a92a98ccce9..2a140b3ea669 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/failover.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/failover.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/failover.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/failover.c</a></div><div class='hunk'>@@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev)</div><div class='ctx'> 		goto err_upper_link;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	slave_dev-&gt;priv_flags |= IFF_FAILOVER_SLAVE;</div><div class='add'>+	slave_dev-&gt;priv_flags |= (IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);</div><div class='ctx'> </div><div class='ctx'> 	if (fops &amp;&amp; fops-&gt;slave_register &amp;&amp;</div><div class='ctx'> 	    !fops-&gt;slave_register(slave_dev, failover_dev))</div><div class='ctx'> 		return NOTIFY_OK;</div><div class='ctx'> </div><div class='ctx'> 	netdev_upper_dev_unlink(slave_dev, failover_dev);</div><div class='del'>-	slave_dev-&gt;priv_flags &amp;= ~IFF_FAILOVER_SLAVE;</div><div class='add'>+	slave_dev-&gt;priv_flags &amp;= ~(IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);</div><div class='ctx'> err_upper_link:</div><div class='ctx'> 	netdev_rx_handler_unregister(slave_dev);</div><div class='ctx'> done:</div><div class='hunk'>@@ -121,7 +121,7 @@ int failover_slave_unregister(struct net_device *slave_dev)</div><div class='ctx'> </div><div class='ctx'> 	netdev_rx_handler_unregister(slave_dev);</div><div class='ctx'> 	netdev_upper_dev_unlink(slave_dev, failover_dev);</div><div class='del'>-	slave_dev-&gt;priv_flags &amp;= ~IFF_FAILOVER_SLAVE;</div><div class='add'>+	slave_dev-&gt;priv_flags &amp;= ~(IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);</div><div class='ctx'> </div><div class='ctx'> 	if (fops &amp;&amp; fops-&gt;slave_unregister &amp;&amp;</div><div class='ctx'> 	    !fops-&gt;slave_unregister(slave_dev, failover_dev))</div><div class='hunk'>@@ -252,7 +252,7 @@ struct failover *failover_register(struct net_device *dev,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(failover-&gt;ops, ops);</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;failover-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_FAILOVER;</div><div class='ctx'> 	rcu_assign_pointer(failover-&gt;failover_dev, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +285,7 @@ void failover_unregister(struct failover *failover)</div><div class='ctx'> 		    failover_dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	failover_dev-&gt;priv_flags &amp;= ~IFF_FAILOVER;</div><div class='del'>-	dev_put(failover_dev);</div><div class='add'>+	netdev_put(failover_dev, &amp;failover-&gt;dev_tracker);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;failover_lock);</div><div class='ctx'> 	list_del(&amp;failover-&gt;list);</div><div class='head'>diff --git a/net/core/fib_notifier.c b/net/core/fib_notifier.c<br/>index 13a40b831d6d..5cdca49b1d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/fib_notifier.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/fib_notifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/fib_notifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/fib_notifier.c</a></div><div class='hunk'>@@ -5,17 +5,22 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;net/fib_notifier.h&gt;</div><div class='ctx'> </div><div class='del'>-static ATOMIC_NOTIFIER_HEAD(fib_chain);</div><div class='add'>+static unsigned int fib_notifier_net_id;</div><div class='ctx'> </div><div class='del'>-int call_fib_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+struct fib_notifier_net {</div><div class='add'>+	struct list_head fib_notifier_ops;</div><div class='add'>+	struct atomic_notifier_head fib_chain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int call_fib_notifier(struct notifier_block *nb,</div><div class='ctx'> 		      enum fib_event_type event_type,</div><div class='ctx'> 		      struct fib_notifier_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	info-&gt;net = net;</div><div class='ctx'> 	err = nb-&gt;notifier_call(nb, event_type, info);</div><div class='ctx'> 	return notifier_to_errno(err);</div><div class='ctx'> }</div><div class='hunk'>@@ -24,115 +29,111 @@ EXPORT_SYMBOL(call_fib_notifier);</div><div class='ctx'> int call_fib_notifiers(struct net *net, enum fib_event_type event_type,</div><div class='ctx'> 		       struct fib_notifier_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	info-&gt;net = net;</div><div class='del'>-	err = atomic_notifier_call_chain(&amp;fib_chain, event_type, info);</div><div class='add'>+	err = atomic_notifier_call_chain(&amp;fn_net-&gt;fib_chain, event_type, info);</div><div class='ctx'> 	return notifier_to_errno(err);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(call_fib_notifiers);</div><div class='ctx'> </div><div class='del'>-static unsigned int fib_seq_sum(void)</div><div class='add'>+static unsigned int fib_seq_sum(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='ctx'> 	struct fib_notifier_ops *ops;</div><div class='ctx'> 	unsigned int fib_seq = 0;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	down_read(&amp;net_rwsem);</div><div class='del'>-	for_each_net(net) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		list_for_each_entry_rcu(ops, &amp;net-&gt;fib_notifier_ops, list) {</div><div class='del'>-			if (!try_module_get(ops-&gt;owner))</div><div class='del'>-				continue;</div><div class='del'>-			fib_seq += ops-&gt;fib_seq_read(net);</div><div class='del'>-			module_put(ops-&gt;owner);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ops, &amp;fn_net-&gt;fib_notifier_ops, list) {</div><div class='add'>+		if (!try_module_get(ops-&gt;owner))</div><div class='add'>+			continue;</div><div class='add'>+		fib_seq += ops-&gt;fib_seq_read(net);</div><div class='add'>+		module_put(ops-&gt;owner);</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;net_rwsem);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return fib_seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib_net_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int fib_net_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='ctx'> 	struct fib_notifier_ops *ops;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(ops, &amp;net-&gt;fib_notifier_ops, list) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ops, &amp;fn_net-&gt;fib_notifier_ops, list) {</div><div class='ctx'> 		if (!try_module_get(ops-&gt;owner))</div><div class='ctx'> 			continue;</div><div class='del'>-		err = ops-&gt;fib_dump(net, nb);</div><div class='add'>+		err = ops-&gt;fib_dump(net, nb, extack);</div><div class='ctx'> 		module_put(ops-&gt;owner);</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fib_dump_is_consistent(struct notifier_block *nb,</div><div class='add'>+static bool fib_dump_is_consistent(struct net *net, struct notifier_block *nb,</div><div class='ctx'> 				   void (*cb)(struct notifier_block *nb),</div><div class='ctx'> 				   unsigned int fib_seq)</div><div class='ctx'> {</div><div class='del'>-	atomic_notifier_chain_register(&amp;fib_chain, nb);</div><div class='del'>-	if (fib_seq == fib_seq_sum())</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='add'>+</div><div class='add'>+	atomic_notifier_chain_register(&amp;fn_net-&gt;fib_chain, nb);</div><div class='add'>+	if (fib_seq == fib_seq_sum(net))</div><div class='ctx'> 		return true;</div><div class='del'>-	atomic_notifier_chain_unregister(&amp;fib_chain, nb);</div><div class='add'>+	atomic_notifier_chain_unregister(&amp;fn_net-&gt;fib_chain, nb);</div><div class='ctx'> 	if (cb)</div><div class='ctx'> 		cb(nb);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define FIB_DUMP_MAX_RETRIES 5</div><div class='del'>-int register_fib_notifier(struct notifier_block *nb,</div><div class='del'>-			  void (*cb)(struct notifier_block *nb))</div><div class='add'>+int register_fib_notifier(struct net *net, struct notifier_block *nb,</div><div class='add'>+			  void (*cb)(struct notifier_block *nb),</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int retries = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		unsigned int fib_seq = fib_seq_sum();</div><div class='del'>-		struct net *net;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		for_each_net_rcu(net) {</div><div class='del'>-			err = fib_net_dump(net, nb);</div><div class='del'>-			if (err)</div><div class='del'>-				goto err_fib_net_dump;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (fib_dump_is_consistent(nb, cb, fib_seq))</div><div class='add'>+		unsigned int fib_seq = fib_seq_sum(net);</div><div class='add'>+</div><div class='add'>+		err = fib_net_dump(net, nb, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (fib_dump_is_consistent(net, nb, cb, fib_seq))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	} while (++retries &lt; FIB_DUMP_MAX_RETRIES);</div><div class='ctx'> </div><div class='ctx'> 	return -EBUSY;</div><div class='del'>-</div><div class='del'>-err_fib_net_dump:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(register_fib_notifier);</div><div class='ctx'> </div><div class='del'>-int unregister_fib_notifier(struct notifier_block *nb)</div><div class='add'>+int unregister_fib_notifier(struct net *net, struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	return atomic_notifier_chain_unregister(&amp;fib_chain, nb);</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='add'>+</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;fn_net-&gt;fib_chain, nb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unregister_fib_notifier);</div><div class='ctx'> </div><div class='ctx'> static int __fib_notifier_ops_register(struct fib_notifier_ops *ops,</div><div class='ctx'> 				       struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='ctx'> 	struct fib_notifier_ops *o;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(o, &amp;net-&gt;fib_notifier_ops, list)</div><div class='add'>+	list_for_each_entry(o, &amp;fn_net-&gt;fib_notifier_ops, list)</div><div class='ctx'> 		if (ops-&gt;family == o-&gt;family)</div><div class='ctx'> 			return -EEXIST;</div><div class='del'>-	list_add_tail_rcu(&amp;ops-&gt;list, &amp;net-&gt;fib_notifier_ops);</div><div class='add'>+	list_add_tail_rcu(&amp;ops-&gt;list, &amp;fn_net-&gt;fib_notifier_ops);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,18 +168,25 @@ EXPORT_SYMBOL(fib_notifier_ops_unregister);</div><div class='ctx'> </div><div class='ctx'> static int __net_init fib_notifier_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	INIT_LIST_HEAD(&amp;net-&gt;fib_notifier_ops);</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;fn_net-&gt;fib_notifier_ops);</div><div class='add'>+	ATOMIC_INIT_NOTIFIER_HEAD(&amp;fn_net-&gt;fib_chain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit fib_notifier_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(!list_empty(&amp;net-&gt;fib_notifier_ops));</div><div class='add'>+	struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;fn_net-&gt;fib_notifier_ops));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations fib_notifier_net_ops = {</div><div class='ctx'> 	.init = fib_notifier_net_init,</div><div class='ctx'> 	.exit = fib_notifier_net_exit,</div><div class='add'>+	.id = &amp;fib_notifier_net_id,</div><div class='add'>+	.size = sizeof(struct fib_notifier_net),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init fib_notifier_init(void)</div><div class='head'>diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c<br/>index 0ff3953f64aa..8ca634964e36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/fib_rules.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/fib_rules.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/fib_rules.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/fib_rules.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/fib_rules.c		Generic Routing Rules</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License as</div><div class='del'>- *	published by the Free Software Foundation, version 2.</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -14,9 +11,24 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='ctx'> #include &lt;net/ip_tunnels.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_IPV6) &amp;&amp; defined(CONFIG_IPV6_MULTIPLE_TABLES)</div><div class='add'>+#ifdef CONFIG_IP_MULTIPLE_TABLES</div><div class='add'>+#define INDIRECT_CALL_MT(f, f2, f1, ...) \</div><div class='add'>+	INDIRECT_CALL_INET(f, f2, f1, __VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)</div><div class='add'>+#endif</div><div class='add'>+#elif defined(CONFIG_IP_MULTIPLE_TABLES)</div><div class='add'>+#define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define INDIRECT_CALL_MT(f, f2, f1, ...) f(__VA_ARGS__)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static const struct fib_kuid_range fib_kuid_range_unset = {</div><div class='ctx'> 	KUIDT_INIT(0),</div><div class='hunk'>@@ -25,8 +37,8 @@ static const struct fib_kuid_range fib_kuid_range_unset = {</div><div class='ctx'> </div><div class='ctx'> bool fib_rule_matchall(const struct fib_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	if (rule-&gt;iifindex || rule-&gt;oifindex || rule-&gt;mark || rule-&gt;tun_id ||</div><div class='del'>-	    rule-&gt;flags)</div><div class='add'>+	if (READ_ONCE(rule-&gt;iifindex) || READ_ONCE(rule-&gt;oifindex) ||</div><div class='add'>+	    rule-&gt;mark || rule-&gt;tun_id || rule-&gt;flags)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (rule-&gt;suppress_ifgroup != -1 || rule-&gt;suppress_prefixlen != -1)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -42,11 +54,11 @@ bool fib_rule_matchall(const struct fib_rule *rule)</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib_rule_matchall);</div><div class='ctx'> </div><div class='ctx'> int fib_default_rule_add(struct fib_rules_ops *ops,</div><div class='del'>-			 u32 pref, u32 table, u32 flags)</div><div class='add'>+			 u32 pref, u32 table)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_rule *r;</div><div class='ctx'> </div><div class='del'>-	r = kzalloc(ops-&gt;rule_size, GFP_KERNEL);</div><div class='add'>+	r = kzalloc(ops-&gt;rule_size, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (r == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +66,6 @@ int fib_default_rule_add(struct fib_rules_ops *ops,</div><div class='ctx'> 	r-&gt;action = FR_ACT_TO_TBL;</div><div class='ctx'> 	r-&gt;pref = pref;</div><div class='ctx'> 	r-&gt;table = table;</div><div class='del'>-	r-&gt;flags = flags;</div><div class='ctx'> 	r-&gt;proto = RTPROT_KERNEL;</div><div class='ctx'> 	r-&gt;fr_net = ops-&gt;fro_net;</div><div class='ctx'> 	r-&gt;uid_range = fib_kuid_range_unset;</div><div class='hunk'>@@ -62,7 +73,7 @@ int fib_default_rule_add(struct fib_rules_ops *ops,</div><div class='ctx'> 	r-&gt;suppress_prefixlen = -1;</div><div class='ctx'> 	r-&gt;suppress_ifgroup = -1;</div><div class='ctx'> </div><div class='del'>-	/* The lock is not required here, the list in unreacheable</div><div class='add'>+	/* The lock is not required here, the list in unreachable</div><div class='ctx'> 	 * at the moment this function is called */</div><div class='ctx'> 	list_add_tail(&amp;r-&gt;list, &amp;ops-&gt;rules_list);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -90,7 +101,8 @@ static void notify_rule_change(int event, struct fib_rule *rule,</div><div class='ctx'> 			       struct fib_rules_ops *ops, struct nlmsghdr *nlh,</div><div class='ctx'> 			       u32 pid);</div><div class='ctx'> </div><div class='del'>-static struct fib_rules_ops *lookup_rules_ops(struct net *net, int family)</div><div class='add'>+static struct fib_rules_ops *lookup_rules_ops(const struct net *net,</div><div class='add'>+					      int family)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_rules_ops *ops;</div><div class='ctx'> </div><div class='hunk'>@@ -245,16 +257,36 @@ static int nla_put_port_range(struct sk_buff *skb, int attrtype,</div><div class='ctx'> 	return nla_put(skb, attrtype, sizeof(*range), range);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool fib_rule_iif_match(const struct fib_rule *rule, int iifindex,</div><div class='add'>+			       const struct flowi *fl)</div><div class='add'>+{</div><div class='add'>+	u8 iif_is_l3_master = READ_ONCE(rule-&gt;iif_is_l3_master);</div><div class='add'>+</div><div class='add'>+	return iif_is_l3_master ? l3mdev_fib_rule_iif_match(fl, iifindex) :</div><div class='add'>+				  fl-&gt;flowi_iif == iifindex;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fib_rule_oif_match(const struct fib_rule *rule, int oifindex,</div><div class='add'>+			       const struct flowi *fl)</div><div class='add'>+{</div><div class='add'>+	u8 oif_is_l3_master = READ_ONCE(rule-&gt;oif_is_l3_master);</div><div class='add'>+</div><div class='add'>+	return oif_is_l3_master ? l3mdev_fib_rule_oif_match(fl, oifindex) :</div><div class='add'>+				  fl-&gt;flowi_oif == oifindex;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,</div><div class='ctx'> 			  struct flowi *fl, int flags,</div><div class='ctx'> 			  struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int iifindex, oifindex, ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (rule-&gt;iifindex &amp;&amp; (rule-&gt;iifindex != fl-&gt;flowi_iif))</div><div class='add'>+	iifindex = READ_ONCE(rule-&gt;iifindex);</div><div class='add'>+	if (iifindex &amp;&amp; !fib_rule_iif_match(rule, iifindex, fl))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (rule-&gt;oifindex &amp;&amp; (rule-&gt;oifindex != fl-&gt;flowi_oif))</div><div class='add'>+	oifindex = READ_ONCE(rule-&gt;oifindex);</div><div class='add'>+	if (oifindex &amp;&amp; !fib_rule_oif_match(rule, oifindex, fl))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if ((rule-&gt;mark ^ fl-&gt;flowi_mark) &amp; rule-&gt;mark_mask)</div><div class='hunk'>@@ -270,7 +302,10 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,</div><div class='ctx'> 	    uid_gt(fl-&gt;flowi_uid, rule-&gt;uid_range.end))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = ops-&gt;match(rule, fl, flags);</div><div class='add'>+	ret = INDIRECT_CALL_MT(ops-&gt;match,</div><div class='add'>+			       fib6_rule_match,</div><div class='add'>+			       fib4_rule_match,</div><div class='add'>+			       rule, fl, flags);</div><div class='ctx'> out:</div><div class='ctx'> 	return (rule-&gt;flags &amp; FIB_RULE_INVERT) ? !ret : ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -301,9 +336,15 @@ jumped:</div><div class='ctx'> 		} else if (rule-&gt;action == FR_ACT_NOP)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		else</div><div class='del'>-			err = ops-&gt;action(rule, fl, flags, arg);</div><div class='del'>-</div><div class='del'>-		if (!err &amp;&amp; ops-&gt;suppress &amp;&amp; ops-&gt;suppress(rule, arg))</div><div class='add'>+			err = INDIRECT_CALL_MT(ops-&gt;action,</div><div class='add'>+					       fib6_rule_action,</div><div class='add'>+					       fib4_rule_action,</div><div class='add'>+					       rule, fl, flags, arg);</div><div class='add'>+</div><div class='add'>+		if (!err &amp;&amp; ops-&gt;suppress &amp;&amp; INDIRECT_CALL_MT(ops-&gt;suppress,</div><div class='add'>+							      fib6_rule_suppress,</div><div class='add'>+							      fib4_rule_suppress,</div><div class='add'>+							      rule, flags, arg))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (err != -EAGAIN) {</div><div class='hunk'>@@ -324,16 +365,18 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib_rules_lookup);</div><div class='ctx'> </div><div class='del'>-static int call_fib_rule_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+static int call_fib_rule_notifier(struct notifier_block *nb,</div><div class='ctx'> 				  enum fib_event_type event_type,</div><div class='del'>-				  struct fib_rule *rule, int family)</div><div class='add'>+				  struct fib_rule *rule, int family,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_rule_notifier_info info = {</div><div class='ctx'> 		.info.family = family,</div><div class='add'>+		.info.extack = extack,</div><div class='ctx'> 		.rule = rule,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return call_fib_notifier(nb, net, event_type, &amp;info.info);</div><div class='add'>+	return call_fib_notifier(nb, event_type, &amp;info.info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int call_fib_rule_notifiers(struct net *net,</div><div class='hunk'>@@ -348,39 +391,46 @@ static int call_fib_rule_notifiers(struct net *net,</div><div class='ctx'> 		.rule = rule,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ops-&gt;fib_rules_seq++;</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='add'>+</div><div class='add'>+	/* Paired with READ_ONCE() in fib_rules_seq() */</div><div class='add'>+	WRITE_ONCE(ops-&gt;fib_rules_seq, ops-&gt;fib_rules_seq + 1);</div><div class='ctx'> 	return call_fib_notifiers(net, event_type, &amp;info.info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with rcu_read_lock() */</div><div class='del'>-int fib_rules_dump(struct net *net, struct notifier_block *nb, int family)</div><div class='add'>+int fib_rules_dump(struct net *net, struct notifier_block *nb, int family,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_rules_ops *ops;</div><div class='ctx'> 	struct fib_rule *rule;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	ops = lookup_rules_ops(net, family);</div><div class='ctx'> 	if (!ops)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='del'>-	list_for_each_entry_rcu(rule, &amp;ops-&gt;rules_list, list)</div><div class='del'>-		call_fib_rule_notifier(nb, net, FIB_EVENT_RULE_ADD, rule,</div><div class='del'>-				       family);</div><div class='add'>+	list_for_each_entry_rcu(rule, &amp;ops-&gt;rules_list, list) {</div><div class='add'>+		err = call_fib_rule_notifier(nb, FIB_EVENT_RULE_ADD,</div><div class='add'>+					     rule, family, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib_rules_dump);</div><div class='ctx'> </div><div class='del'>-unsigned int fib_rules_seq_read(struct net *net, int family)</div><div class='add'>+unsigned int fib_rules_seq_read(const struct net *net, int family)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int fib_rules_seq;</div><div class='ctx'> 	struct fib_rules_ops *ops;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='ctx'> 	ops = lookup_rules_ops(net, family);</div><div class='ctx'> 	if (!ops)</div><div class='ctx'> 		return 0;</div><div class='del'>-	fib_rules_seq = ops-&gt;fib_rules_seq;</div><div class='add'>+	/* Paired with WRITE_ONCE() in call_fib_rule_notifiers() */</div><div class='add'>+	fib_rules_seq = READ_ONCE(ops-&gt;fib_rules_seq);</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> </div><div class='ctx'> 	return fib_rules_seq;</div><div class='hunk'>@@ -430,9 +480,6 @@ static struct fib_rule *rule_find(struct fib_rules_ops *ops,</div><div class='ctx'> 		if (rule-&gt;tun_id &amp;&amp; r-&gt;tun_id != rule-&gt;tun_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (r-&gt;fr_net != rule-&gt;fr_net)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (rule-&gt;l3mdev &amp;&amp; r-&gt;l3mdev != rule-&gt;l3mdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -452,11 +499,17 @@ static struct fib_rule *rule_find(struct fib_rules_ops *ops,</div><div class='ctx'> 						 &amp;rule-&gt;sport_range))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (rule-&gt;sport_mask &amp;&amp; r-&gt;sport_mask != rule-&gt;sport_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (fib_rule_port_range_set(&amp;rule-&gt;dport_range) &amp;&amp;</div><div class='ctx'> 		    !fib_rule_port_range_compare(&amp;r-&gt;dport_range,</div><div class='ctx'> 						 &amp;rule-&gt;dport_range))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (rule-&gt;dport_mask &amp;&amp; r-&gt;dport_mask != rule-&gt;dport_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (!ops-&gt;compare(r, frh, tb))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		return r;</div><div class='hunk'>@@ -486,14 +539,40 @@ static int fib_nl2rule_l3mdev(struct nlattr *nla, struct fib_rule *nlrule,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+static int fib_nl2rule_port_mask(const struct nlattr *mask_attr,</div><div class='add'>+				 const struct fib_rule_port_range *range,</div><div class='add'>+				 u16 *port_mask,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!fib_rule_port_range_valid(range)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, mask_attr,</div><div class='add'>+				    "Cannot specify port mask without port value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fib_rule_port_is_range(range)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, mask_attr,</div><div class='add'>+				    "Cannot specify port mask for port range");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (range-&gt;start &amp; ~nla_get_u16(mask_attr)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, mask_attr, "Invalid port mask");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*port_mask = nla_get_u16(mask_attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib_nl2rule(struct net *net, struct nlmsghdr *nlh,</div><div class='ctx'> 		       struct netlink_ext_ack *extack,</div><div class='ctx'> 		       struct fib_rules_ops *ops,</div><div class='ctx'> 		       struct nlattr *tb[],</div><div class='ctx'> 		       struct fib_rule **rule,</div><div class='ctx'> 		       bool *user_priority)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct fib_rule_hdr *frh = nlmsg_data(nlh);</div><div class='ctx'> 	struct fib_rule *nlrule = NULL;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='hunk'>@@ -514,7 +593,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nlrule = kzalloc(ops-&gt;rule_size, GFP_KERNEL);</div><div class='add'>+	nlrule = kzalloc(ops-&gt;rule_size, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!nlrule) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -525,31 +604,18 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (tb[FRA_PRIORITY]) {</div><div class='ctx'> 		nlrule-&gt;pref = nla_get_u32(tb[FRA_PRIORITY]);</div><div class='ctx'> 		*user_priority = true;</div><div class='del'>-	} else {</div><div class='del'>-		nlrule-&gt;pref = fib_default_rule_pref(ops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nlrule-&gt;proto = tb[FRA_PROTOCOL] ?</div><div class='del'>-		nla_get_u8(tb[FRA_PROTOCOL]) : RTPROT_UNSPEC;</div><div class='add'>+	nlrule-&gt;proto = nla_get_u8_default(tb[FRA_PROTOCOL], RTPROT_UNSPEC);</div><div class='ctx'> </div><div class='ctx'> 	if (tb[FRA_IIFNAME]) {</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-</div><div class='ctx'> 		nlrule-&gt;iifindex = -1;</div><div class='del'>-		nla_strlcpy(nlrule-&gt;iifname, tb[FRA_IIFNAME], IFNAMSIZ);</div><div class='del'>-		dev = __dev_get_by_name(net, nlrule-&gt;iifname);</div><div class='del'>-		if (dev)</div><div class='del'>-			nlrule-&gt;iifindex = dev-&gt;ifindex;</div><div class='add'>+		nla_strscpy(nlrule-&gt;iifname, tb[FRA_IIFNAME], IFNAMSIZ);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[FRA_OIFNAME]) {</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-</div><div class='ctx'> 		nlrule-&gt;oifindex = -1;</div><div class='del'>-		nla_strlcpy(nlrule-&gt;oifname, tb[FRA_OIFNAME], IFNAMSIZ);</div><div class='del'>-		dev = __dev_get_by_name(net, nlrule-&gt;oifname);</div><div class='del'>-		if (dev)</div><div class='del'>-			nlrule-&gt;oifindex = dev-&gt;ifindex;</div><div class='add'>+		nla_strscpy(nlrule-&gt;oifname, tb[FRA_OIFNAME], IFNAMSIZ);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[FRA_FWMARK]) {</div><div class='hunk'>@@ -567,7 +633,6 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (tb[FRA_TUN_ID])</div><div class='ctx'> 		nlrule-&gt;tun_id = nla_get_be64(tb[FRA_TUN_ID]);</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (tb[FRA_L3MDEV] &amp;&amp;</div><div class='ctx'> 	    fib_nl2rule_l3mdev(tb[FRA_L3MDEV], nlrule, extack) &lt; 0)</div><div class='ctx'> 		goto errout_free;</div><div class='hunk'>@@ -592,11 +657,6 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		nlrule-&gt;target = nla_get_u32(tb[FRA_GOTO]);</div><div class='del'>-		/* Backward jumps are prohibited to avoid endless loops */</div><div class='del'>-		if (nlrule-&gt;target &lt;= nlrule-&gt;pref) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "Backward goto not supported");</div><div class='del'>-			goto errout_free;</div><div class='del'>-		}</div><div class='ctx'> 	} else if (nlrule-&gt;action == FR_ACT_GOTO) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Missing goto target for action goto");</div><div class='ctx'> 		goto errout_free;</div><div class='hunk'>@@ -635,6 +695,16 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			NL_SET_ERR_MSG(extack, "Invalid sport range");</div><div class='ctx'> 			goto errout_free;</div><div class='ctx'> 		}</div><div class='add'>+		if (!fib_rule_port_is_range(&amp;nlrule-&gt;sport_range))</div><div class='add'>+			nlrule-&gt;sport_mask = U16_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_SPORT_MASK]) {</div><div class='add'>+		err = fib_nl2rule_port_mask(tb[FRA_SPORT_MASK],</div><div class='add'>+					    &amp;nlrule-&gt;sport_range,</div><div class='add'>+					    &amp;nlrule-&gt;sport_mask, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto errout_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[FRA_DPORT_RANGE]) {</div><div class='hunk'>@@ -644,6 +714,16 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			NL_SET_ERR_MSG(extack, "Invalid dport range");</div><div class='ctx'> 			goto errout_free;</div><div class='ctx'> 		}</div><div class='add'>+		if (!fib_rule_port_is_range(&amp;nlrule-&gt;dport_range))</div><div class='add'>+			nlrule-&gt;dport_mask = U16_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DPORT_MASK]) {</div><div class='add'>+		err = fib_nl2rule_port_mask(tb[FRA_DPORT_MASK],</div><div class='add'>+					    &amp;nlrule-&gt;dport_range,</div><div class='add'>+					    &amp;nlrule-&gt;dport_mask, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto errout_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*rule = nlrule;</div><div class='hunk'>@@ -656,6 +736,43 @@ errout:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fib_nl2rule_rtnl(struct fib_rule *nlrule,</div><div class='add'>+			    struct fib_rules_ops *ops,</div><div class='add'>+			    struct nlattr *tb[],</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!tb[FRA_PRIORITY])</div><div class='add'>+		nlrule-&gt;pref = fib_default_rule_pref(ops);</div><div class='add'>+</div><div class='add'>+	/* Backward jumps are prohibited to avoid endless loops */</div><div class='add'>+	if (tb[FRA_GOTO] &amp;&amp; nlrule-&gt;target &lt;= nlrule-&gt;pref) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Backward goto not supported");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_IIFNAME]) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = __dev_get_by_name(nlrule-&gt;fr_net, nlrule-&gt;iifname);</div><div class='add'>+		if (dev) {</div><div class='add'>+			nlrule-&gt;iifindex = dev-&gt;ifindex;</div><div class='add'>+			nlrule-&gt;iif_is_l3_master = netif_is_l3_master(dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_OIFNAME]) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = __dev_get_by_name(nlrule-&gt;fr_net, nlrule-&gt;oifname);</div><div class='add'>+		if (dev) {</div><div class='add'>+			nlrule-&gt;oifindex = dev-&gt;ifindex;</div><div class='add'>+			nlrule-&gt;oif_is_l3_master = netif_is_l3_master(dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh,</div><div class='ctx'> 		       struct nlattr **tb, struct fib_rule *rule)</div><div class='ctx'> {</div><div class='hunk'>@@ -692,9 +809,6 @@ static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh,</div><div class='ctx'> 		if (r-&gt;tun_id != rule-&gt;tun_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (r-&gt;fr_net != rule-&gt;fr_net)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (r-&gt;l3mdev != rule-&gt;l3mdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -712,10 +826,16 @@ static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh,</div><div class='ctx'> 						 &amp;rule-&gt;sport_range))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (r-&gt;sport_mask != rule-&gt;sport_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (!fib_rule_port_range_compare(&amp;r-&gt;dport_range,</div><div class='ctx'> 						 &amp;rule-&gt;dport_range))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (r-&gt;dport_mask != rule-&gt;dport_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (!ops-&gt;compare(r, frh, tb))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -723,18 +843,45 @@ static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-		   struct netlink_ext_ack *extack)</div><div class='add'>+static const struct nla_policy fib_rule_policy[FRA_MAX + 1] = {</div><div class='add'>+	[FRA_UNSPEC]	= { .strict_start_type = FRA_DPORT_RANGE + 1 },</div><div class='add'>+	[FRA_IIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },</div><div class='add'>+	[FRA_OIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },</div><div class='add'>+	[FRA_PRIORITY]	= { .type = NLA_U32 },</div><div class='add'>+	[FRA_FWMARK]	= { .type = NLA_U32 },</div><div class='add'>+	[FRA_FLOW]	= { .type = NLA_U32 },</div><div class='add'>+	[FRA_TUN_ID]	= { .type = NLA_U64 },</div><div class='add'>+	[FRA_FWMASK]	= { .type = NLA_U32 },</div><div class='add'>+	[FRA_TABLE]     = { .type = NLA_U32 },</div><div class='add'>+	[FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 },</div><div class='add'>+	[FRA_SUPPRESS_IFGROUP] = { .type = NLA_U32 },</div><div class='add'>+	[FRA_GOTO]	= { .type = NLA_U32 },</div><div class='add'>+	[FRA_L3MDEV]	= { .type = NLA_U8 },</div><div class='add'>+	[FRA_UID_RANGE]	= { .len = sizeof(struct fib_rule_uid_range) },</div><div class='add'>+	[FRA_PROTOCOL]  = { .type = NLA_U8 },</div><div class='add'>+	[FRA_IP_PROTO]  = { .type = NLA_U8 },</div><div class='add'>+	[FRA_SPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) },</div><div class='add'>+	[FRA_DPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) },</div><div class='add'>+	[FRA_DSCP]	= NLA_POLICY_MAX(NLA_U8, INET_DSCP_MASK &gt;&gt; 2),</div><div class='add'>+	[FRA_FLOWLABEL] = { .type = NLA_BE32 },</div><div class='add'>+	[FRA_FLOWLABEL_MASK] = { .type = NLA_BE32 },</div><div class='add'>+	[FRA_SPORT_MASK] = { .type = NLA_U16 },</div><div class='add'>+	[FRA_DPORT_MASK] = { .type = NLA_U16 },</div><div class='add'>+	[FRA_DSCP_MASK] = NLA_POLICY_MASK(NLA_U8, INET_DSCP_MASK &gt;&gt; 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int fib_newrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+		struct netlink_ext_ack *extack, bool rtnl_held)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct fib_rule_hdr *frh = nlmsg_data(nlh);</div><div class='del'>-	struct fib_rules_ops *ops = NULL;</div><div class='ctx'> 	struct fib_rule *rule = NULL, *r, *last = NULL;</div><div class='del'>-	struct nlattr *tb[FRA_MAX + 1];</div><div class='ctx'> 	int err = -EINVAL, unresolved = 0;</div><div class='add'>+	struct fib_rules_ops *ops = NULL;</div><div class='add'>+	struct nlattr *tb[FRA_MAX + 1];</div><div class='ctx'> 	bool user_priority = false;</div><div class='add'>+	struct fib_rule_hdr *frh;</div><div class='ctx'> </div><div class='del'>-	if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(*frh))) {</div><div class='add'>+	frh = nlmsg_payload(nlh, sizeof(*frh));</div><div class='add'>+	if (!frh) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid msg length");</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -746,16 +893,24 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*frh), tb, FRA_MAX, ops-&gt;policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,</div><div class='add'>+				     fib_rule_policy, extack);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Error parsing msg");</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fib_nl2rule(skb, nlh, extack, ops, tb, &amp;rule, &amp;user_priority);</div><div class='add'>+	err = fib_nl2rule(net, nlh, extack, ops, tb, &amp;rule, &amp;user_priority);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	err = fib_nl2rule_rtnl(rule, ops, tb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto errout_free;</div><div class='add'>+</div><div class='ctx'> 	if ((nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL) &amp;&amp;</div><div class='ctx'> 	    rule_exists(ops, frh, tb, rule)) {</div><div class='ctx'> 		err = -EEXIST;</div><div class='hunk'>@@ -817,31 +972,45 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (rule-&gt;tun_id)</div><div class='ctx'> 		ip_tunnel_need_metadata();</div><div class='ctx'> </div><div class='add'>+	fib_rule_get(rule);</div><div class='add'>+</div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='add'>+</div><div class='ctx'> 	notify_rule_change(RTM_NEWRULE, rule, ops, nlh, NETLINK_CB(skb).portid);</div><div class='add'>+	fib_rule_put(rule);</div><div class='ctx'> 	flush_route_cache(ops);</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> errout_free:</div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 	kfree(rule);</div><div class='ctx'> errout:</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(fib_nl_newrule);</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_newrule);</div><div class='ctx'> </div><div class='del'>-int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-		   struct netlink_ext_ack *extack)</div><div class='add'>+static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct fib_rule_hdr *frh = nlmsg_data(nlh);</div><div class='add'>+	return fib_newrule(sock_net(skb-&gt;sk), skb, nlh, extack, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+		struct netlink_ext_ack *extack, bool rtnl_held)</div><div class='add'>+{</div><div class='add'>+	struct fib_rule *rule = NULL, *nlrule = NULL;</div><div class='ctx'> 	struct fib_rules_ops *ops = NULL;</div><div class='del'>-	struct fib_rule *rule = NULL, *r, *nlrule = NULL;</div><div class='ctx'> 	struct nlattr *tb[FRA_MAX+1];</div><div class='del'>-	int err = -EINVAL;</div><div class='ctx'> 	bool user_priority = false;</div><div class='add'>+	struct fib_rule_hdr *frh;</div><div class='add'>+	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(*frh))) {</div><div class='add'>+	frh = nlmsg_payload(nlh, sizeof(*frh));</div><div class='add'>+	if (!frh) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid msg length");</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -853,31 +1022,39 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*frh), tb, FRA_MAX, ops-&gt;policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,</div><div class='add'>+				     fib_rule_policy, extack);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Error parsing msg");</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fib_nl2rule(skb, nlh, extack, ops, tb, &amp;nlrule, &amp;user_priority);</div><div class='add'>+	err = fib_nl2rule(net, nlh, extack, ops, tb, &amp;nlrule, &amp;user_priority);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	err = fib_nl2rule_rtnl(nlrule, ops, tb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto errout_free;</div><div class='add'>+</div><div class='ctx'> 	rule = rule_find(ops, frh, tb, nlrule, user_priority);</div><div class='ctx'> 	if (!rule) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-		goto errout;</div><div class='add'>+		goto errout_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;flags &amp; FIB_RULE_PERMANENT) {</div><div class='ctx'> 		err = -EPERM;</div><div class='del'>-		goto errout;</div><div class='add'>+		goto errout_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;delete) {</div><div class='ctx'> 		err = ops-&gt;delete(rule);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto errout;</div><div class='add'>+			goto errout_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;tun_id)</div><div class='hunk'>@@ -899,7 +1076,7 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	 * current if it is goto rule, have actually been added.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ops-&gt;nr_goto_rules &gt; 0) {</div><div class='del'>-		struct fib_rule *n;</div><div class='add'>+		struct fib_rule *n, *r;</div><div class='ctx'> </div><div class='ctx'> 		n = list_next_entry(rule, list);</div><div class='ctx'> 		if (&amp;n-&gt;list == &amp;ops-&gt;rules_list || n-&gt;pref != rule-&gt;pref)</div><div class='hunk'>@@ -913,22 +1090,33 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	call_fib_rule_notifiers(net, FIB_EVENT_RULE_DEL, rule, ops,</div><div class='del'>-				NULL);</div><div class='del'>-	notify_rule_change(RTM_DELRULE, rule, ops, nlh,</div><div class='del'>-			   NETLINK_CB(skb).portid);</div><div class='add'>+	call_fib_rule_notifiers(net, FIB_EVENT_RULE_DEL, rule, ops, NULL);</div><div class='add'>+</div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	notify_rule_change(RTM_DELRULE, rule, ops, nlh, NETLINK_CB(skb).portid);</div><div class='ctx'> 	fib_rule_put(rule);</div><div class='ctx'> 	flush_route_cache(ops);</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> 	kfree(nlrule);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-errout:</div><div class='add'>+errout_free:</div><div class='add'>+	if (!rtnl_held)</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 	kfree(nlrule);</div><div class='add'>+errout:</div><div class='ctx'> 	rules_ops_put(ops);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(fib_nl_delrule);</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_delrule);</div><div class='add'>+</div><div class='add'>+static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return fib_delrule(sock_net(skb-&gt;sk), skb, nlh, extack, false);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,</div><div class='ctx'> 					 struct fib_rule *rule)</div><div class='hunk'>@@ -947,7 +1135,9 @@ static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,</div><div class='ctx'> 			 + nla_total_size(1) /* FRA_PROTOCOL */</div><div class='ctx'> 			 + nla_total_size(1) /* FRA_IP_PROTO */</div><div class='ctx'> 			 + nla_total_size(sizeof(struct fib_rule_port_range)) /* FRA_SPORT_RANGE */</div><div class='del'>-			 + nla_total_size(sizeof(struct fib_rule_port_range)); /* FRA_DPORT_RANGE */</div><div class='add'>+			 + nla_total_size(sizeof(struct fib_rule_port_range)) /* FRA_DPORT_RANGE */</div><div class='add'>+			 + nla_total_size(2) /* FRA_SPORT_MASK */</div><div class='add'>+			 + nla_total_size(2); /* FRA_DPORT_MASK */</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;nlmsg_payload)</div><div class='ctx'> 		payload += ops-&gt;nlmsg_payload(rule);</div><div class='hunk'>@@ -968,7 +1158,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,</div><div class='ctx'> </div><div class='ctx'> 	frh = nlmsg_data(nlh);</div><div class='ctx'> 	frh-&gt;family = ops-&gt;family;</div><div class='del'>-	frh-&gt;table = rule-&gt;table;</div><div class='add'>+	frh-&gt;table = rule-&gt;table &lt; 256 ? rule-&gt;table : RT_TABLE_COMPAT;</div><div class='ctx'> 	if (nla_put_u32(skb, FRA_TABLE, rule-&gt;table))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (nla_put_u32(skb, FRA_SUPPRESS_PREFIXLEN, rule-&gt;suppress_prefixlen))</div><div class='hunk'>@@ -988,14 +1178,14 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,</div><div class='ctx'> 	if (rule-&gt;iifname[0]) {</div><div class='ctx'> 		if (nla_put_string(skb, FRA_IIFNAME, rule-&gt;iifname))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='del'>-		if (rule-&gt;iifindex == -1)</div><div class='add'>+		if (READ_ONCE(rule-&gt;iifindex) == -1)</div><div class='ctx'> 			frh-&gt;flags |= FIB_RULE_IIF_DETACHED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;oifname[0]) {</div><div class='ctx'> 		if (nla_put_string(skb, FRA_OIFNAME, rule-&gt;oifname))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='del'>-		if (rule-&gt;oifindex == -1)</div><div class='add'>+		if (READ_ONCE(rule-&gt;oifindex) == -1)</div><div class='ctx'> 			frh-&gt;flags |= FIB_RULE_OIF_DETACHED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1015,8 +1205,12 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,</div><div class='ctx'> 	     nla_put_uid_range(skb, &amp;rule-&gt;uid_range)) ||</div><div class='ctx'> 	    (fib_rule_port_range_set(&amp;rule-&gt;sport_range) &amp;&amp;</div><div class='ctx'> 	     nla_put_port_range(skb, FRA_SPORT_RANGE, &amp;rule-&gt;sport_range)) ||</div><div class='add'>+	    (rule-&gt;sport_mask &amp;&amp; nla_put_u16(skb, FRA_SPORT_MASK,</div><div class='add'>+					     rule-&gt;sport_mask)) ||</div><div class='ctx'> 	    (fib_rule_port_range_set(&amp;rule-&gt;dport_range) &amp;&amp;</div><div class='ctx'> 	     nla_put_port_range(skb, FRA_DPORT_RANGE, &amp;rule-&gt;dport_range)) ||</div><div class='add'>+	    (rule-&gt;dport_mask &amp;&amp; nla_put_u16(skb, FRA_DPORT_MASK,</div><div class='add'>+					     rule-&gt;dport_mask)) ||</div><div class='ctx'> 	    (rule-&gt;ip_proto &amp;&amp; nla_put_u8(skb, FRA_IP_PROTO, rule-&gt;ip_proto)))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1063,30 +1257,64 @@ skip:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fib_valid_dumprule_req(const struct nlmsghdr *nlh,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib_rule_hdr *frh;</div><div class='add'>+</div><div class='add'>+	frh = nlmsg_payload(nlh, sizeof(*frh));</div><div class='add'>+	if (!frh) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for fib rule dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frh-&gt;dst_len || frh-&gt;src_len || frh-&gt;tos || frh-&gt;table ||</div><div class='add'>+	    frh-&gt;res1 || frh-&gt;res2 || frh-&gt;action || frh-&gt;flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid values in header for fib rule dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*frh))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid data after header in fib rule dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct fib_rules_ops *ops;</div><div class='del'>-	int idx = 0, family;</div><div class='add'>+	int err, idx = 0, family;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = fib_valid_dumprule_req(nlh, cb-&gt;extack);</div><div class='ctx'> </div><div class='del'>-	family = rtnl_msg_family(cb-&gt;nlh);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	family = rtnl_msg_family(nlh);</div><div class='ctx'> 	if (family != AF_UNSPEC) {</div><div class='ctx'> 		/* Protocol specific dump request */</div><div class='ctx'> 		ops = lookup_rules_ops(net, family);</div><div class='ctx'> 		if (ops == NULL)</div><div class='ctx'> 			return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-		dump_rules(skb, cb, ops);</div><div class='del'>-</div><div class='del'>-		return skb-&gt;len;</div><div class='add'>+		return dump_rules(skb, cb, ops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = 0;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(ops, &amp;net-&gt;rules_ops, list) {</div><div class='ctx'> 		if (idx &lt; cb-&gt;args[0] || !try_module_get(ops-&gt;owner))</div><div class='ctx'> 			goto skip;</div><div class='ctx'> </div><div class='del'>-		if (dump_rules(skb, cb, ops) &lt; 0)</div><div class='add'>+		err = dump_rules(skb, cb, ops);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		cb-&gt;args[1] = 0;</div><div class='hunk'>@@ -1096,7 +1324,7 @@ skip:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	cb-&gt;args[0] = idx;</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void notify_rule_change(int event, struct fib_rule *rule,</div><div class='hunk'>@@ -1105,7 +1333,7 @@ static void notify_rule_change(int event, struct fib_rule *rule,</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int err = -ENOBUFS;</div><div class='add'>+	int err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	net = ops-&gt;fro_net;</div><div class='ctx'> 	skb = nlmsg_new(fib_rule_nlmsg_size(ops, rule), GFP_KERNEL);</div><div class='hunk'>@@ -1123,8 +1351,7 @@ static void notify_rule_change(int event, struct fib_rule *rule,</div><div class='ctx'> 	rtnl_notify(skb, net, pid, ops-&gt;nlgroup, nlh, GFP_KERNEL);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, ops-&gt;nlgroup, err);</div><div class='add'>+	rtnl_set_sk_err(net, ops-&gt;nlgroup, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void attach_rules(struct list_head *rules, struct net_device *dev)</div><div class='hunk'>@@ -1133,11 +1360,17 @@ static void attach_rules(struct list_head *rules, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(rule, rules, list) {</div><div class='ctx'> 		if (rule-&gt;iifindex == -1 &amp;&amp;</div><div class='del'>-		    strcmp(dev-&gt;name, rule-&gt;iifname) == 0)</div><div class='del'>-			rule-&gt;iifindex = dev-&gt;ifindex;</div><div class='add'>+		    strcmp(dev-&gt;name, rule-&gt;iifname) == 0) {</div><div class='add'>+			WRITE_ONCE(rule-&gt;iifindex, dev-&gt;ifindex);</div><div class='add'>+			WRITE_ONCE(rule-&gt;iif_is_l3_master,</div><div class='add'>+				   netif_is_l3_master(dev));</div><div class='add'>+		}</div><div class='ctx'> 		if (rule-&gt;oifindex == -1 &amp;&amp;</div><div class='del'>-		    strcmp(dev-&gt;name, rule-&gt;oifname) == 0)</div><div class='del'>-			rule-&gt;oifindex = dev-&gt;ifindex;</div><div class='add'>+		    strcmp(dev-&gt;name, rule-&gt;oifname) == 0) {</div><div class='add'>+			WRITE_ONCE(rule-&gt;oifindex, dev-&gt;ifindex);</div><div class='add'>+			WRITE_ONCE(rule-&gt;oif_is_l3_master,</div><div class='add'>+				   netif_is_l3_master(dev));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1146,10 +1379,14 @@ static void detach_rules(struct list_head *rules, struct net_device *dev)</div><div class='ctx'> 	struct fib_rule *rule;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(rule, rules, list) {</div><div class='del'>-		if (rule-&gt;iifindex == dev-&gt;ifindex)</div><div class='del'>-			rule-&gt;iifindex = -1;</div><div class='del'>-		if (rule-&gt;oifindex == dev-&gt;ifindex)</div><div class='del'>-			rule-&gt;oifindex = -1;</div><div class='add'>+		if (rule-&gt;iifindex == dev-&gt;ifindex) {</div><div class='add'>+			WRITE_ONCE(rule-&gt;iifindex, -1);</div><div class='add'>+			WRITE_ONCE(rule-&gt;iif_is_l3_master, false);</div><div class='add'>+		}</div><div class='add'>+		if (rule-&gt;oifindex == dev-&gt;ifindex) {</div><div class='add'>+			WRITE_ONCE(rule-&gt;oifindex, -1);</div><div class='add'>+			WRITE_ONCE(rule-&gt;oif_is_l3_master, false);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1206,12 +1443,20 @@ static struct pernet_operations fib_rules_net_ops = {</div><div class='ctx'> 	.exit = fib_rules_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler fib_rules_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_NEWRULE, .doit = fib_nl_newrule,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.msgtype = RTM_DELRULE, .doit = fib_nl_delrule,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.msgtype = RTM_GETRULE, .dumpit = fib_nl_dumprule,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init fib_rules_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule, 0);</div><div class='add'>+</div><div class='add'>+	rtnl_register_many(fib_rules_rtnl_msg_handlers);</div><div class='ctx'> </div><div class='ctx'> 	err = register_pernet_subsys(&amp;fib_rules_net_ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1226,9 +1471,7 @@ static int __init fib_rules_init(void)</div><div class='ctx'> fail_unregister:</div><div class='ctx'> 	unregister_pernet_subsys(&amp;fib_rules_net_ops);</div><div class='ctx'> fail:</div><div class='del'>-	rtnl_unregister(PF_UNSPEC, RTM_NEWRULE);</div><div class='del'>-	rtnl_unregister(PF_UNSPEC, RTM_DELRULE);</div><div class='del'>-	rtnl_unregister(PF_UNSPEC, RTM_GETRULE);</div><div class='add'>+	rtnl_unregister_many(fib_rules_rtnl_msg_handlers);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/filter.c b/net/core/filter.c<br/>index 5e00f2b85a56..616e0520a0bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/filter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/filter.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Linux Socket Filter - Kernel level socket filtering</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,15 +13,12 @@</div><div class='ctx'>  *	Alexei Starovoitov &lt;ast@plumgrid.com&gt;</div><div class='ctx'>  *	Daniel Borkmann &lt;dborkman@redhat.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Andi Kleen - Fix a few bad bugs and races.</div><div class='ctx'>  * Kris Katterjohn - Added many additional checks in bpf_check_classic()</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/bpf_verifier.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -38,18 +36,19 @@</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/skmsg.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/flow_dissector.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;asm/cmpxchg.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/seccomp.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='ctx'> #include &lt;net/sch_generic.h&gt;</div><div class='ctx'> #include &lt;net/cls_cgroup.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='hunk'>@@ -58,31 +57,82 @@</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include &lt;net/xdp_sock.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;net/inet_hashtables.h&gt;</div><div class='add'>+#include &lt;net/inet6_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='ctx'> #include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/seg6_local.h&gt;</div><div class='ctx'> #include &lt;net/seg6.h&gt;</div><div class='ctx'> #include &lt;net/seg6_local.h&gt;</div><div class='add'>+#include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='add'>+#include &lt;net/transp_v6.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_bpf.h&gt;</div><div class='add'>+#include &lt;net/netkit.h&gt;</div><div class='add'>+#include &lt;linux/un.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='add'>+/* Keep the struct bpf_fib_lookup small so that it fits into a cacheline */</div><div class='add'>+static_assert(sizeof(struct bpf_fib_lookup) == 64, "struct bpf_fib_lookup size check");</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+bpf_sk_base_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog);</div><div class='add'>+</div><div class='add'>+int copy_bpf_fprog_from_user(struct sock_fprog *dst, sockptr_t src, int len)</div><div class='add'>+{</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct compat_sock_fprog f32;</div><div class='add'>+</div><div class='add'>+		if (len != sizeof(f32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;f32, src, sizeof(f32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		memset(dst, 0, sizeof(*dst));</div><div class='add'>+		dst-&gt;len = f32.len;</div><div class='add'>+		dst-&gt;filter = compat_ptr(f32.filter);</div><div class='add'>+	} else {</div><div class='add'>+		if (len != sizeof(*dst))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(dst, src, sizeof(*dst)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(copy_bpf_fprog_from_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	sk_filter_trim_cap - run a packet through a socket filter</div><div class='ctx'>  *	@sk: sock associated with &amp;sk_buff</div><div class='ctx'>  *	@skb: buffer to filter</div><div class='ctx'>  *	@cap: limit on how short the eBPF program may trim the packet</div><div class='add'>+ *	@reason: record drop reason on errors (negative return value)</div><div class='ctx'>  *</div><div class='ctx'>  * Run the eBPF program and then cut skb-&gt;data to correct size returned by</div><div class='ctx'>  * the program. If pkt_len is 0 we toss packet. If skb-&gt;len is smaller</div><div class='ctx'>  * than pkt_len we keep whole skb-&gt;data. This is the socket level</div><div class='del'>- * wrapper to BPF_PROG_RUN. It returns 0 if the packet should</div><div class='add'>+ * wrapper to bpf_prog_run. It returns 0 if the packet should</div><div class='ctx'>  * be accepted or -EPERM if the packet should be tossed.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap)</div><div class='add'>+int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+		       unsigned int cap, enum skb_drop_reason *reason)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct sk_filter *filter;</div><div class='hunk'>@@ -94,15 +144,20 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (skb_pfmemalloc(skb) &amp;&amp; !sock_flag(sk, SOCK_MEMALLOC)) {</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_PFMEMALLOCDROP);</div><div class='add'>+		*reason = SKB_DROP_REASON_PFMEMALLOC;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = BPF_CGROUP_RUN_PROG_INET_INGRESS(sk, skb);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		*reason = SKB_DROP_REASON_SOCKET_FILTER;</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = security_sock_rcv_skb(sk, skb);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		*reason = SKB_DROP_REASON_SECURITY_HOOK;</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	filter = rcu_dereference(sk-&gt;sk_filter);</div><div class='hunk'>@@ -114,6 +169,8 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap)</div><div class='ctx'> 		pkt_len = bpf_prog_run_save_cb(filter-&gt;prog, skb);</div><div class='ctx'> 		skb-&gt;sk = save_sk;</div><div class='ctx'> 		err = pkt_len ? pskb_trim(skb, max(cap, pkt_len)) : -EPERM;</div><div class='add'>+		if (err)</div><div class='add'>+			*reason = SKB_DROP_REASON_SOCKET_FILTER;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +217,7 @@ BPF_CALL_3(bpf_skb_get_nlattr_nest, struct sk_buff *, skb, u32, a, u32, x)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	nla = (struct nlattr *) &amp;skb-&gt;data[a];</div><div class='del'>-	if (nla-&gt;nla_len &gt; skb-&gt;len - a)</div><div class='add'>+	if (!nla_ok(nla, skb-&gt;len - a))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	nla = nla_find_nested(nla, x);</div><div class='hunk'>@@ -170,24 +227,36 @@ BPF_CALL_3(bpf_skb_get_nlattr_nest, struct sk_buff *, skb, u32, a, u32, x)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bpf_skb_load_helper_convert_offset(const struct sk_buff *skb, int offset)</div><div class='add'>+{</div><div class='add'>+	if (likely(offset &gt;= 0))</div><div class='add'>+		return offset;</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= SKF_NET_OFF)</div><div class='add'>+		return offset - SKF_NET_OFF + skb_network_offset(skb);</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= SKF_LL_OFF &amp;&amp; skb_mac_header_was_set(skb))</div><div class='add'>+		return offset - SKF_LL_OFF + skb_mac_offset(skb);</div><div class='add'>+</div><div class='add'>+	return INT_MIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> BPF_CALL_4(bpf_skb_load_helper_8, const struct sk_buff *, skb, const void *,</div><div class='ctx'> 	   data, int, headlen, int, offset)</div><div class='ctx'> {</div><div class='del'>-	u8 tmp, *ptr;</div><div class='add'>+	u8 tmp;</div><div class='ctx'> 	const int len = sizeof(tmp);</div><div class='ctx'> </div><div class='del'>-	if (offset &gt;= 0) {</div><div class='del'>-		if (headlen - offset &gt;= len)</div><div class='del'>-			return *(u8 *)(data + offset);</div><div class='del'>-		if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='del'>-			return tmp;</div><div class='del'>-	} else {</div><div class='del'>-		ptr = bpf_internal_load_pointer_neg_helper(skb, offset, len);</div><div class='del'>-		if (likely(ptr))</div><div class='del'>-			return *(u8 *)ptr;</div><div class='del'>-	}</div><div class='add'>+	offset = bpf_skb_load_helper_convert_offset(skb, offset);</div><div class='add'>+	if (offset == INT_MIN)</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return -EFAULT;</div><div class='add'>+	if (headlen - offset &gt;= len)</div><div class='add'>+		return *(u8 *)(data + offset);</div><div class='add'>+	if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='add'>+		return tmp;</div><div class='add'>+	else</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb,</div><div class='hunk'>@@ -200,21 +269,19 @@ BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb,</div><div class='ctx'> BPF_CALL_4(bpf_skb_load_helper_16, const struct sk_buff *, skb, const void *,</div><div class='ctx'> 	   data, int, headlen, int, offset)</div><div class='ctx'> {</div><div class='del'>-	u16 tmp, *ptr;</div><div class='add'>+	__be16 tmp;</div><div class='ctx'> 	const int len = sizeof(tmp);</div><div class='ctx'> </div><div class='del'>-	if (offset &gt;= 0) {</div><div class='del'>-		if (headlen - offset &gt;= len)</div><div class='del'>-			return get_unaligned_be16(data + offset);</div><div class='del'>-		if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='del'>-			return be16_to_cpu(tmp);</div><div class='del'>-	} else {</div><div class='del'>-		ptr = bpf_internal_load_pointer_neg_helper(skb, offset, len);</div><div class='del'>-		if (likely(ptr))</div><div class='del'>-			return get_unaligned_be16(ptr);</div><div class='del'>-	}</div><div class='add'>+	offset = bpf_skb_load_helper_convert_offset(skb, offset);</div><div class='add'>+	if (offset == INT_MIN)</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return -EFAULT;</div><div class='add'>+	if (headlen - offset &gt;= len)</div><div class='add'>+		return get_unaligned_be16(data + offset);</div><div class='add'>+	if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='add'>+		return be16_to_cpu(tmp);</div><div class='add'>+	else</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb,</div><div class='hunk'>@@ -227,21 +294,19 @@ BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb,</div><div class='ctx'> BPF_CALL_4(bpf_skb_load_helper_32, const struct sk_buff *, skb, const void *,</div><div class='ctx'> 	   data, int, headlen, int, offset)</div><div class='ctx'> {</div><div class='del'>-	u32 tmp, *ptr;</div><div class='add'>+	__be32 tmp;</div><div class='ctx'> 	const int len = sizeof(tmp);</div><div class='ctx'> </div><div class='del'>-	if (likely(offset &gt;= 0)) {</div><div class='del'>-		if (headlen - offset &gt;= len)</div><div class='del'>-			return get_unaligned_be32(data + offset);</div><div class='del'>-		if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='del'>-			return be32_to_cpu(tmp);</div><div class='del'>-	} else {</div><div class='del'>-		ptr = bpf_internal_load_pointer_neg_helper(skb, offset, len);</div><div class='del'>-		if (likely(ptr))</div><div class='del'>-			return get_unaligned_be32(ptr);</div><div class='del'>-	}</div><div class='add'>+	offset = bpf_skb_load_helper_convert_offset(skb, offset);</div><div class='add'>+	if (offset == INT_MIN)</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return -EFAULT;</div><div class='add'>+	if (headlen - offset &gt;= len)</div><div class='add'>+		return get_unaligned_be32(data + offset);</div><div class='add'>+	if (!skb_copy_bits(skb, offset, &amp;tmp, sizeof(tmp)))</div><div class='add'>+		return be32_to_cpu(tmp);</div><div class='add'>+	else</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_2(bpf_skb_load_helper_32_no_cache, const struct sk_buff *, skb,</div><div class='hunk'>@@ -251,17 +316,6 @@ BPF_CALL_2(bpf_skb_load_helper_32_no_cache, const struct sk_buff *, skb,</div><div class='ctx'> 					  offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-BPF_CALL_0(bpf_get_raw_cpu_id)</div><div class='del'>-{</div><div class='del'>-	return raw_smp_processor_id();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct bpf_func_proto bpf_get_raw_smp_processor_id_proto = {</div><div class='del'>-	.func		= bpf_get_raw_cpu_id,</div><div class='del'>-	.gpl_only	= false,</div><div class='del'>-	.ret_type	= RET_INTEGER,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg,</div><div class='ctx'> 			      struct bpf_insn *insn_buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -269,14 +323,14 @@ static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg,</div><div class='ctx'> </div><div class='ctx'> 	switch (skb_field) {</div><div class='ctx'> 	case SKF_AD_MARK:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, mark) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, dst_reg, src_reg,</div><div class='ctx'> 				      offsetof(struct sk_buff, mark));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_PKTTYPE:</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_TYPE_OFFSET());</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_TYPE_OFFSET);</div><div class='ctx'> 		*insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, PKT_TYPE_MAX);</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 		*insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, 5);</div><div class='hunk'>@@ -284,29 +338,25 @@ static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_QUEUE:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, queue_mapping) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, queue_mapping) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, dst_reg, src_reg,</div><div class='ctx'> 				      offsetof(struct sk_buff, queue_mapping));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_VLAN_TAG:</div><div class='del'>-	case SKF_AD_VLAN_TAG_PRESENT:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);</div><div class='del'>-		BUILD_BUG_ON(VLAN_TAG_PRESENT != 0x1000);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, vlan_tci) != 2);</div><div class='ctx'> </div><div class='ctx'> 		/* dst_reg = *(u16 *) (src_reg + offsetof(vlan_tci)) */</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, dst_reg, src_reg,</div><div class='ctx'> 				      offsetof(struct sk_buff, vlan_tci));</div><div class='del'>-		if (skb_field == SKF_AD_VLAN_TAG) {</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg,</div><div class='del'>-						~VLAN_TAG_PRESENT);</div><div class='del'>-		} else {</div><div class='del'>-			/* dst_reg &gt;&gt;= 12 */</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, 12);</div><div class='del'>-			/* dst_reg &amp;= 1 */</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, 1);</div><div class='del'>-		}</div><div class='add'>+		break;</div><div class='add'>+	case SKF_AD_VLAN_TAG_PRESENT:</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, vlan_all) != 4);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, dst_reg, src_reg,</div><div class='add'>+				      offsetof(struct sk_buff, vlan_all));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_ALU32_IMM(BPF_MOV, dst_reg, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -321,7 +371,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,</div><div class='ctx'> </div><div class='ctx'> 	switch (fp-&gt;k) {</div><div class='ctx'> 	case SKF_AD_OFF + SKF_AD_PROTOCOL:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, protocol) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, protocol) != 2);</div><div class='ctx'> </div><div class='ctx'> 		/* A = *(u16 *) (CTX + offsetof(protocol)) */</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, BPF_REG_A, BPF_REG_CTX,</div><div class='hunk'>@@ -337,8 +387,8 @@ static bool convert_bpf_extensions(struct sock_filter *fp,</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_OFF + SKF_AD_IFINDEX:</div><div class='ctx'> 	case SKF_AD_OFF + SKF_AD_HATYPE:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4);</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct net_device, ifindex) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct net_device, type) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, dev),</div><div class='ctx'> 				      BPF_REG_TMP, BPF_REG_CTX,</div><div class='hunk'>@@ -360,7 +410,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_OFF + SKF_AD_RXHASH:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, hash) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn = BPF_LDX_MEM(BPF_W, BPF_REG_A, BPF_REG_CTX,</div><div class='ctx'> 				    offsetof(struct sk_buff, hash));</div><div class='hunk'>@@ -384,7 +434,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SKF_AD_OFF + SKF_AD_VLAN_TPID:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_proto) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, vlan_proto) != 2);</div><div class='ctx'> </div><div class='ctx'> 		/* A = *(u16 *) (CTX + offsetof(vlan_proto)) */</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, BPF_REG_A, BPF_REG_CTX,</div><div class='hunk'>@@ -462,7 +512,8 @@ static bool convert_bpf_ld_abs(struct sock_filter *fp, struct bpf_insn **insnp)</div><div class='ctx'> 		bool ldx_off_ok = offset &lt;= S16_MAX;</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_MOV64_REG(BPF_REG_TMP, BPF_REG_H);</div><div class='del'>-		*insn++ = BPF_ALU64_IMM(BPF_SUB, BPF_REG_TMP, offset);</div><div class='add'>+		if (offset)</div><div class='add'>+			*insn++ = BPF_ALU64_IMM(BPF_SUB, BPF_REG_TMP, offset);</div><div class='ctx'> 		*insn++ = BPF_JMP_IMM(BPF_JSLT, BPF_REG_TMP,</div><div class='ctx'> 				      size, 2 + endian + (!ldx_off_ok * 2));</div><div class='ctx'> 		if (ldx_off_ok) {</div><div class='hunk'>@@ -748,7 +799,7 @@ jmp_rest:</div><div class='ctx'> 			BPF_EMIT_JMP;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* ldxb 4 * ([14] &amp; 0xf) is remaped into 6 insns. */</div><div class='add'>+		/* ldxb 4 * ([14] &amp; 0xf) is remapped into 6 insns. */</div><div class='ctx'> 		case BPF_LDX | BPF_MSH | BPF_B: {</div><div class='ctx'> 			struct sock_filter tmp = {</div><div class='ctx'> 				.code	= BPF_LD | BPF_ABS | BPF_B,</div><div class='hunk'>@@ -774,7 +825,7 @@ jmp_rest:</div><div class='ctx'> 			*insn = BPF_MOV64_REG(BPF_REG_A, BPF_REG_TMP);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* RET_K is remaped into 2 insns. RET_A case doesn't need an</div><div class='add'>+		/* RET_K is remapped into 2 insns. RET_A case doesn't need an</div><div class='ctx'> 		 * extra mov as BPF_REG_0 is already mapped into BPF_REG_A.</div><div class='ctx'> 		 */</div><div class='ctx'> 		case BPF_RET | BPF_A:</div><div class='hunk'>@@ -1190,11 +1241,12 @@ void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp)</div><div class='ctx'>  */</div><div class='ctx'> static bool __sk_filter_charge(struct sock *sk, struct sk_filter *fp)</div><div class='ctx'> {</div><div class='add'>+	int optmem_max = READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max);</div><div class='ctx'> 	u32 filter_size = bpf_prog_size(fp-&gt;prog-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* same check as in sock_kmalloc() */</div><div class='del'>-	if (filter_size &lt;= sysctl_optmem_max &amp;&amp;</div><div class='del'>-	    atomic_read(&amp;sk-&gt;sk_omem_alloc) + filter_size &lt; sysctl_optmem_max) {</div><div class='add'>+	if (filter_size &lt;= optmem_max &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;sk-&gt;sk_omem_alloc) + filter_size &lt; optmem_max) {</div><div class='ctx'> 		atomic_add(filter_size, &amp;sk-&gt;sk_omem_alloc);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1220,10 +1272,9 @@ static struct bpf_prog *bpf_migrate_filter(struct bpf_prog *fp)</div><div class='ctx'> 	int err, new_len, old_len = fp-&gt;len;</div><div class='ctx'> 	bool seen_ld_abs = false;</div><div class='ctx'> </div><div class='del'>-	/* We are free to overwrite insns et al right here as it</div><div class='del'>-	 * won't be used at this point in time anymore internally</div><div class='del'>-	 * after the migration to the internal BPF instruction</div><div class='del'>-	 * representation.</div><div class='add'>+	/* We are free to overwrite insns et al right here as it won't be used at</div><div class='add'>+	 * this point in time anymore internally after the migration to the eBPF</div><div class='add'>+	 * instruction representation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct sock_filter) !=</div><div class='ctx'> 		     sizeof(struct bpf_insn));</div><div class='hunk'>@@ -1232,8 +1283,8 @@ static struct bpf_prog *bpf_migrate_filter(struct bpf_prog *fp)</div><div class='ctx'> 	 * so we need to keep the user BPF around until the 2nd</div><div class='ctx'> 	 * pass. At this time, the user BPF is stored in fp-&gt;insns.</div><div class='ctx'> 	 */</div><div class='del'>-	old_prog = kmemdup(fp-&gt;insns, old_len * sizeof(struct sock_filter),</div><div class='del'>-			   GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	old_prog = kmemdup_array(fp-&gt;insns, old_len, sizeof(struct sock_filter),</div><div class='add'>+				 GFP_KERNEL | __GFP_NOWARN);</div><div class='ctx'> 	if (!old_prog) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -1314,8 +1365,8 @@ static struct bpf_prog *bpf_prepare_filter(struct bpf_prog *fp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	bpf_jit_compile(fp);</div><div class='ctx'> </div><div class='del'>-	/* JIT compiler couldn't process this filter, so do the</div><div class='del'>-	 * internal BPF translation for the optimized interpreter.</div><div class='add'>+	/* JIT compiler couldn't process this filter, so do the eBPF translation</div><div class='add'>+	 * for the optimized interpreter.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!fp-&gt;jited)</div><div class='ctx'> 		fp = bpf_migrate_filter(fp);</div><div class='hunk'>@@ -1521,12 +1572,13 @@ EXPORT_SYMBOL_GPL(sk_attach_filter);</div><div class='ctx'> int sk_reuseport_attach_filter(struct sock_fprog *fprog, struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_prog *prog = __get_filter(fprog, sk);</div><div class='del'>-	int err;</div><div class='add'>+	int err, optmem_max;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(prog))</div><div class='ctx'> 		return PTR_ERR(prog);</div><div class='ctx'> </div><div class='del'>-	if (bpf_prog_size(prog-&gt;len) &gt; sysctl_optmem_max)</div><div class='add'>+	optmem_max = READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max);</div><div class='add'>+	if (bpf_prog_size(prog-&gt;len) &gt; optmem_max)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 	else</div><div class='ctx'> 		err = reuseport_attach_prog(sk, prog);</div><div class='hunk'>@@ -1565,13 +1617,13 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)</div><div class='ctx'> int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='del'>-	int err;</div><div class='add'>+	int err, optmem_max;</div><div class='ctx'> </div><div class='ctx'> 	if (sock_flag(sk, SOCK_FILTER_LOCKED))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	prog = bpf_prog_get_type(ufd, BPF_PROG_TYPE_SOCKET_FILTER);</div><div class='del'>-	if (IS_ERR(prog) &amp;&amp; PTR_ERR(prog) == -EINVAL)</div><div class='add'>+	if (PTR_ERR(prog) == -EINVAL)</div><div class='ctx'> 		prog = bpf_prog_get_type(ufd, BPF_PROG_TYPE_SK_REUSEPORT);</div><div class='ctx'> 	if (IS_ERR(prog))</div><div class='ctx'> 		return PTR_ERR(prog);</div><div class='hunk'>@@ -1593,7 +1645,8 @@ int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* BPF_PROG_TYPE_SOCKET_FILTER */</div><div class='del'>-		if (bpf_prog_size(prog-&gt;len) &gt; sysctl_optmem_max) {</div><div class='add'>+		optmem_max = READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max);</div><div class='add'>+		if (bpf_prog_size(prog-&gt;len) &gt; optmem_max) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto err_prog_put;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1618,18 +1671,14 @@ void sk_reuseport_prog_free(struct bpf_prog *prog)</div><div class='ctx'> 		bpf_prog_destroy(prog);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bpf_scratchpad {</div><div class='del'>-	union {</div><div class='del'>-		__be32 diff[MAX_BPF_STACK / sizeof(__be32)];</div><div class='del'>-		u8     buff[MAX_BPF_STACK];</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct bpf_scratchpad, bpf_sp);</div><div class='del'>-</div><div class='ctx'> static inline int __bpf_try_make_writable(struct sk_buff *skb,</div><div class='ctx'> 					  unsigned int write_len)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_DEBUG_NET</div><div class='add'>+	/* Avoid a splat in pskb_may_pull_reason() */</div><div class='add'>+	if (write_len &gt; INT_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+#endif</div><div class='ctx'> 	return skb_ensure_writable(skb, write_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1666,7 +1715,7 @@ BPF_CALL_5(bpf_skb_store_bytes, struct sk_buff *, skb, u32, offset,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~(BPF_F_RECOMPUTE_CSUM | BPF_F_INVALIDATE_HASH)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (unlikely(offset &gt; 0xffff))</div><div class='add'>+	if (unlikely(offset &gt; INT_MAX))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (unlikely(bpf_try_make_writable(skb, offset + len)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1691,17 +1740,23 @@ static const struct bpf_func_proto bpf_skb_store_bytes_proto = {</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='del'>-	.arg3_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE,</div><div class='ctx'> 	.arg5_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int __bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from,</div><div class='add'>+			  u32 len, u64 flags)</div><div class='add'>+{</div><div class='add'>+	return ____bpf_skb_store_bytes(skb, offset, from, len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> BPF_CALL_4(bpf_skb_load_bytes, const struct sk_buff *, skb, u32, offset,</div><div class='ctx'> 	   void *, to, u32, len)</div><div class='ctx'> {</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(offset &gt; 0xffff))</div><div class='add'>+	if (unlikely(offset &gt; INT_MAX))</div><div class='ctx'> 		goto err_clear;</div><div class='ctx'> </div><div class='ctx'> 	ptr = skb_header_pointer(skb, offset, len, to);</div><div class='hunk'>@@ -1726,29 +1781,70 @@ static const struct bpf_func_proto bpf_skb_load_bytes_proto = {</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int __bpf_skb_load_bytes(const struct sk_buff *skb, u32 offset, void *to, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ____bpf_skb_load_bytes(skb, offset, to, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_flow_dissector_load_bytes,</div><div class='add'>+	   const struct bpf_flow_dissector *, ctx, u32, offset,</div><div class='add'>+	   void *, to, u32, len)</div><div class='add'>+{</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset &gt; 0xffff))</div><div class='add'>+		goto err_clear;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ctx-&gt;skb))</div><div class='add'>+		goto err_clear;</div><div class='add'>+</div><div class='add'>+	ptr = skb_header_pointer(ctx-&gt;skb, offset, len, to);</div><div class='add'>+	if (unlikely(!ptr))</div><div class='add'>+		goto err_clear;</div><div class='add'>+	if (ptr != to)</div><div class='add'>+		memcpy(to, ptr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_clear:</div><div class='add'>+	memset(to, 0, len);</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_flow_dissector_load_bytes_proto = {</div><div class='add'>+	.func		= bpf_flow_dissector_load_bytes,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg4_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> BPF_CALL_5(bpf_skb_load_bytes_relative, const struct sk_buff *, skb,</div><div class='ctx'> 	   u32, offset, void *, to, u32, len, u32, start_header)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *end = skb_tail_pointer(skb);</div><div class='del'>-	u8 *net = skb_network_header(skb);</div><div class='del'>-	u8 *mac = skb_mac_header(skb);</div><div class='del'>-	u8 *ptr;</div><div class='add'>+	u8 *start, *ptr;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(offset &gt; 0xffff || len &gt; (end - mac)))</div><div class='add'>+	if (unlikely(offset &gt; 0xffff))</div><div class='ctx'> 		goto err_clear;</div><div class='ctx'> </div><div class='ctx'> 	switch (start_header) {</div><div class='ctx'> 	case BPF_HDR_START_MAC:</div><div class='del'>-		ptr = mac + offset;</div><div class='add'>+		if (unlikely(!skb_mac_header_was_set(skb)))</div><div class='add'>+			goto err_clear;</div><div class='add'>+		start = skb_mac_header(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BPF_HDR_START_NET:</div><div class='del'>-		ptr = net + offset;</div><div class='add'>+		start = skb_network_header(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto err_clear;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (likely(ptr &gt;= mac &amp;&amp; ptr + len &lt;= end)) {</div><div class='add'>+	ptr = start + offset;</div><div class='add'>+</div><div class='add'>+	if (likely(ptr + len &lt;= end)) {</div><div class='ctx'> 		memcpy(to, ptr, len);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1791,13 +1887,22 @@ static const struct bpf_func_proto bpf_skb_pull_data_proto = {</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BPF_CALL_1(bpf_sk_fullsock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	return sk_fullsock(sk) ? (unsigned long)sk : (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_fullsock_proto = {</div><div class='add'>+	.func		= bpf_sk_fullsock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_SOCK_COMMON,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline int sk_skb_try_make_writable(struct sk_buff *skb,</div><div class='ctx'> 					   unsigned int write_len)</div><div class='ctx'> {</div><div class='del'>-	int err = __bpf_try_make_writable(skb, write_len);</div><div class='del'>-</div><div class='del'>-	bpf_compute_data_end_sk_skb(skb);</div><div class='del'>-	return err;</div><div class='add'>+	return __bpf_try_make_writable(skb, write_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_2(sk_skb_pull_data, struct sk_buff *, skb, u32, len)</div><div class='hunk'>@@ -1872,10 +1977,11 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sk_buff *, skb, u32, offset,</div><div class='ctx'> 	bool is_pseudo = flags &amp; BPF_F_PSEUDO_HDR;</div><div class='ctx'> 	bool is_mmzero = flags &amp; BPF_F_MARK_MANGLED_0;</div><div class='ctx'> 	bool do_mforce = flags &amp; BPF_F_MARK_ENFORCE;</div><div class='add'>+	bool is_ipv6   = flags &amp; BPF_F_IPV6;</div><div class='ctx'> 	__sum16 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~(BPF_F_MARK_MANGLED_0 | BPF_F_MARK_ENFORCE |</div><div class='del'>-			       BPF_F_PSEUDO_HDR | BPF_F_HDR_FIELD_MASK)))</div><div class='add'>+			       BPF_F_PSEUDO_HDR | BPF_F_HDR_FIELD_MASK | BPF_F_IPV6)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (unlikely(offset &gt; 0xffff || offset &amp; 1))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1891,7 +1997,7 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sk_buff *, skb, u32, offset,</div><div class='ctx'> 		if (unlikely(from != 0))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		inet_proto_csum_replace_by_diff(ptr, skb, to, is_pseudo);</div><div class='add'>+		inet_proto_csum_replace_by_diff(ptr, skb, to, is_pseudo, is_ipv6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		inet_proto_csum_replace2(ptr, skb, from, to, is_pseudo);</div><div class='hunk'>@@ -1922,10 +2028,6 @@ static const struct bpf_func_proto bpf_l4_csum_replace_proto = {</div><div class='ctx'> BPF_CALL_5(bpf_csum_diff, __be32 *, from, u32, from_size,</div><div class='ctx'> 	   __be32 *, to, u32, to_size, __wsum, seed)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_scratchpad *sp = this_cpu_ptr(&amp;bpf_sp);</div><div class='del'>-	u32 diff_size = from_size + to_size;</div><div class='del'>-	int i, j = 0;</div><div class='del'>-</div><div class='ctx'> 	/* This is quite flexible, some examples:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * from_size == 0, to_size &gt; 0,  seed := csum --&gt; pushing data</div><div class='hunk'>@@ -1934,16 +2036,19 @@ BPF_CALL_5(bpf_csum_diff, __be32 *, from, u32, from_size,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Even for diffing, from_size and to_size don't need to be equal.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(((from_size | to_size) &amp; (sizeof(__be32) - 1)) ||</div><div class='del'>-		     diff_size &gt; sizeof(sp-&gt;diff)))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; from_size / sizeof(__be32); i++, j++)</div><div class='del'>-		sp-&gt;diff[j] = ~from[i];</div><div class='del'>-	for (i = 0; i &lt;   to_size / sizeof(__be32); i++, j++)</div><div class='del'>-		sp-&gt;diff[j] = to[i];</div><div class='add'>+	__wsum ret = seed;</div><div class='ctx'> </div><div class='del'>-	return csum_partial(sp-&gt;diff, diff_size, seed);</div><div class='add'>+	if (from_size &amp;&amp; to_size)</div><div class='add'>+		ret = csum_sub(csum_partial(to, to_size, ret),</div><div class='add'>+			       csum_partial(from, from_size, 0));</div><div class='add'>+	else if (to_size)</div><div class='add'>+		ret = csum_partial(to, to_size, ret);</div><div class='add'>+</div><div class='add'>+	else if (from_size)</div><div class='add'>+		ret = ~csum_partial(from, from_size, ~ret);</div><div class='add'>+</div><div class='add'>+	return csum_from32to16((__force unsigned int)ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_csum_diff_proto = {</div><div class='hunk'>@@ -1951,9 +2056,9 @@ static const struct bpf_func_proto bpf_csum_diff_proto = {</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.pkt_access	= true,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='del'>-	.arg1_type	= ARG_PTR_TO_MEM_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_MEM | PTR_MAYBE_NULL | MEM_RDONLY,</div><div class='ctx'> 	.arg2_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='del'>-	.arg3_type	= ARG_PTR_TO_MEM_OR_NULL,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | PTR_MAYBE_NULL | MEM_RDONLY,</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='ctx'> 	.arg5_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='hunk'>@@ -1978,15 +2083,49 @@ static const struct bpf_func_proto bpf_csum_update_proto = {</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BPF_CALL_2(bpf_csum_level, struct sk_buff *, skb, u64, level)</div><div class='add'>+{</div><div class='add'>+	/* The interface is to be used in combination with bpf_skb_adjust_room()</div><div class='add'>+	 * for encap/decap of packet headers when BPF_F_ADJ_ROOM_NO_CSUM_RESET</div><div class='add'>+	 * is passed as flags, for example.</div><div class='add'>+	 */</div><div class='add'>+	switch (level) {</div><div class='add'>+	case BPF_CSUM_LEVEL_INC:</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_CSUM_LEVEL_DEC:</div><div class='add'>+		__skb_decr_checksum_unnecessary(skb);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_CSUM_LEVEL_RESET:</div><div class='add'>+		__skb_reset_checksum_unnecessary(skb);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_CSUM_LEVEL_QUERY:</div><div class='add'>+		return skb-&gt;ip_summed == CHECKSUM_UNNECESSARY ?</div><div class='add'>+		       skb-&gt;csum_level : -EACCES;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_csum_level_proto = {</div><div class='add'>+	.func		= bpf_csum_level,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline int __bpf_rx_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return dev_forward_skb(dev, skb);</div><div class='add'>+	return dev_forward_skb_nomtu(dev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int __bpf_rx_skb_no_mac(struct net_device *dev,</div><div class='ctx'> 				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int ret = ____dev_forward_skb(dev, skb);</div><div class='add'>+	int ret = ____dev_forward_skb(dev, skb, false);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!ret)) {</div><div class='ctx'> 		skb-&gt;dev = dev;</div><div class='hunk'>@@ -2000,17 +2139,19 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(__this_cpu_read(xmit_recursion) &gt; XMIT_RECURSION_LIMIT)) {</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='ctx'> 		net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -ENETDOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='add'>+	skb_set_redirected_noclear(skb, skb_at_tc_ingress(skb));</div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='ctx'> </div><div class='del'>-	__this_cpu_inc(xmit_recursion);</div><div class='add'>+	dev_xmit_recursion_inc();</div><div class='ctx'> 	ret = dev_queue_xmit(skb);</div><div class='del'>-	__this_cpu_dec(xmit_recursion);</div><div class='add'>+	dev_xmit_recursion_dec();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2018,18 +2159,24 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> static int __bpf_redirect_no_mac(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 				 u32 flags)</div><div class='ctx'> {</div><div class='del'>-	/* skb-&gt;mac_len is not set on normal egress */</div><div class='del'>-	unsigned int mlen = skb-&gt;network_header - skb-&gt;mac_header;</div><div class='add'>+	unsigned int mlen = skb_network_offset(skb);</div><div class='ctx'> </div><div class='del'>-	__skb_pull(skb, mlen);</div><div class='add'>+	if (unlikely(skb-&gt;len &lt;= mlen)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* At ingress, the mac header has already been pulled once.</div><div class='del'>-	 * At egress, skb_pospull_rcsum has to be done in case that</div><div class='del'>-	 * the skb is originated from ingress (i.e. a forwarded skb)</div><div class='del'>-	 * to ensure that rcsum starts at net header.</div><div class='del'>-	 */</div><div class='del'>-	if (!skb_at_tc_ingress(skb))</div><div class='del'>-		skb_postpull_rcsum(skb, skb_mac_header(skb), mlen);</div><div class='add'>+	if (mlen) {</div><div class='add'>+		__skb_pull(skb, mlen);</div><div class='add'>+</div><div class='add'>+		/* At ingress, the mac header has already been pulled once.</div><div class='add'>+		 * At egress, skb_pospull_rcsum has to be done in case that</div><div class='add'>+		 * the skb is originated from ingress (i.e. a forwarded skb)</div><div class='add'>+		 * to ensure that rcsum starts at net header.</div><div class='add'>+		 */</div><div class='add'>+		if (!skb_at_tc_ingress(skb))</div><div class='add'>+			skb_postpull_rcsum(skb, skb_mac_header(skb), mlen);</div><div class='add'>+	}</div><div class='ctx'> 	skb_pop_mac_header(skb);</div><div class='ctx'> 	skb_reset_mac_len(skb);</div><div class='ctx'> 	return flags &amp; BPF_F_INGRESS ?</div><div class='hunk'>@@ -2040,7 +2187,7 @@ static int __bpf_redirect_common(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 				 u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	/* Verify that a link layer header is carried */</div><div class='del'>-	if (unlikely(skb-&gt;mac_header &gt;= skb-&gt;network_header)) {</div><div class='add'>+	if (unlikely(skb-&gt;mac_header &gt;= skb-&gt;network_header || skb-&gt;len == 0)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2059,15 +2206,265 @@ static int __bpf_redirect(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		return __bpf_redirect_no_mac(skb, dev, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static int bpf_out_neigh_v6(struct net *net, struct sk_buff *skb,</div><div class='add'>+			    struct net_device *dev, struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	u32 hh_len = LL_RESERVED_SPACE(dev);</div><div class='add'>+	const struct in6_addr *nexthop;</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='add'>+		net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; hh_len &amp;&amp; dev-&gt;header_ops)) {</div><div class='add'>+		skb = skb_expand_head(skb, hh_len);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!nh) {</div><div class='add'>+		dst = skb_dst(skb);</div><div class='add'>+		nexthop = rt6_nexthop(dst_rt6_info(dst),</div><div class='add'>+				      &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='add'>+	} else {</div><div class='add'>+		nexthop = &amp;nh-&gt;ipv6_nh;</div><div class='add'>+	}</div><div class='add'>+	neigh = ip_neigh_gw6(dev, nexthop);</div><div class='add'>+	if (likely(!IS_ERR(neigh))) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		sock_confirm_neigh(skb, neigh);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		dev_xmit_recursion_inc();</div><div class='add'>+		ret = neigh_output(neigh, skb, false);</div><div class='add'>+		dev_xmit_recursion_dec();</div><div class='add'>+		local_bh_enable();</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (dst)</div><div class='add'>+		IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);</div><div class='add'>+out_drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -ENETDOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bpf_redirect_neigh_v6(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	int err, ret = NET_XMIT_DROP;</div><div class='add'>+</div><div class='add'>+	if (!nh) {</div><div class='add'>+		struct dst_entry *dst;</div><div class='add'>+		struct flowi6 fl6 = {</div><div class='add'>+			.flowi6_flags = FLOWI_FLAG_ANYSRC,</div><div class='add'>+			.flowi6_mark  = skb-&gt;mark,</div><div class='add'>+			.flowlabel    = ip6_flowinfo(ip6h),</div><div class='add'>+			.flowi6_oif   = dev-&gt;ifindex,</div><div class='add'>+			.flowi6_proto = ip6h-&gt;nexthdr,</div><div class='add'>+			.daddr	      = ip6h-&gt;daddr,</div><div class='add'>+			.saddr	      = ip6h-&gt;saddr,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dst = ipv6_stub-&gt;ipv6_dst_lookup_flow(net, NULL, &amp;fl6, NULL);</div><div class='add'>+		if (IS_ERR(dst))</div><div class='add'>+			goto out_drop;</div><div class='add'>+</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_dst_set(skb, dst);</div><div class='add'>+	} else if (nh-&gt;nh_family != AF_INET6) {</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bpf_out_neigh_v6(net, skb, dev, nh);</div><div class='add'>+	if (unlikely(net_xmit_eval(err)))</div><div class='add'>+		DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	else</div><div class='add'>+		ret = NET_XMIT_SUCCESS;</div><div class='add'>+	goto out_xmit;</div><div class='add'>+out_drop:</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+out_xmit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int __bpf_redirect_neigh_v6(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IPV6 */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_INET)</div><div class='add'>+static int bpf_out_neigh_v4(struct net *net, struct sk_buff *skb,</div><div class='add'>+			    struct net_device *dev, struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	u32 hh_len = LL_RESERVED_SPACE(dev);</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+	bool is_v6gw = false;</div><div class='add'>+</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='add'>+		net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; hh_len &amp;&amp; dev-&gt;header_ops)) {</div><div class='add'>+		skb = skb_expand_head(skb, hh_len);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!nh) {</div><div class='add'>+		struct rtable *rt = skb_rtable(skb);</div><div class='add'>+</div><div class='add'>+		neigh = ip_neigh_for_gw(rt, skb, &amp;is_v6gw);</div><div class='add'>+	} else if (nh-&gt;nh_family == AF_INET6) {</div><div class='add'>+		neigh = ip_neigh_gw6(dev, &amp;nh-&gt;ipv6_nh);</div><div class='add'>+		is_v6gw = true;</div><div class='add'>+	} else if (nh-&gt;nh_family == AF_INET) {</div><div class='add'>+		neigh = ip_neigh_gw4(dev, nh-&gt;ipv4_nh);</div><div class='add'>+	} else {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!IS_ERR(neigh))) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		sock_confirm_neigh(skb, neigh);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		dev_xmit_recursion_inc();</div><div class='add'>+		ret = neigh_output(neigh, skb, is_v6gw);</div><div class='add'>+		dev_xmit_recursion_dec();</div><div class='add'>+		local_bh_enable();</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out_drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -ENETDOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *ip4h = ip_hdr(skb);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	int err, ret = NET_XMIT_DROP;</div><div class='add'>+</div><div class='add'>+	if (!nh) {</div><div class='add'>+		struct flowi4 fl4 = {</div><div class='add'>+			.flowi4_flags = FLOWI_FLAG_ANYSRC,</div><div class='add'>+			.flowi4_mark  = skb-&gt;mark,</div><div class='add'>+			.flowi4_dscp  = ip4h_dscp(ip4h),</div><div class='add'>+			.flowi4_oif   = dev-&gt;ifindex,</div><div class='add'>+			.flowi4_proto = ip4h-&gt;protocol,</div><div class='add'>+			.daddr	      = ip4h-&gt;daddr,</div><div class='add'>+			.saddr	      = ip4h-&gt;saddr,</div><div class='add'>+		};</div><div class='add'>+		struct rtable *rt;</div><div class='add'>+</div><div class='add'>+		rt = ip_route_output_flow(net, &amp;fl4, NULL);</div><div class='add'>+		if (IS_ERR(rt))</div><div class='add'>+			goto out_drop;</div><div class='add'>+		if (rt-&gt;rt_type != RTN_UNICAST &amp;&amp; rt-&gt;rt_type != RTN_LOCAL) {</div><div class='add'>+			ip_rt_put(rt);</div><div class='add'>+			goto out_drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bpf_out_neigh_v4(net, skb, dev, nh);</div><div class='add'>+	if (unlikely(net_xmit_eval(err)))</div><div class='add'>+		DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	else</div><div class='add'>+		ret = NET_XMIT_SUCCESS;</div><div class='add'>+	goto out_xmit;</div><div class='add'>+out_drop:</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+out_xmit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+static int __bpf_redirect_neigh(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				struct bpf_nh_params *nh)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *ethh = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;mac_header &gt;= skb-&gt;network_header))</div><div class='add'>+		goto out;</div><div class='add'>+	bpf_push_mac_rcsum(skb);</div><div class='add'>+	if (is_multicast_ether_addr(ethh-&gt;h_dest))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(*ethh));</div><div class='add'>+	skb_unset_mac_header(skb);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		return __bpf_redirect_neigh_v4(skb, dev, nh);</div><div class='add'>+	else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		return __bpf_redirect_neigh_v6(skb, dev, nh);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Internal, non-exposed redirect flags. */</div><div class='add'>+enum {</div><div class='add'>+	BPF_F_NEIGH	= (1ULL &lt;&lt; 16),</div><div class='add'>+	BPF_F_PEER	= (1ULL &lt;&lt; 17),</div><div class='add'>+	BPF_F_NEXTHOP	= (1ULL &lt;&lt; 18),</div><div class='add'>+#define BPF_F_REDIRECT_INTERNAL	(BPF_F_NEIGH | BPF_F_PEER | BPF_F_NEXTHOP)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct sk_buff *clone;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='add'>+	BUILD_BUG_ON(BPF_F_REDIRECT_INTERNAL &amp; BPF_F_REDIRECT_FLAGS);</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; (~(BPF_F_INGRESS) | BPF_F_REDIRECT_INTERNAL)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* BPF test infra's convert___skb_to_skb() can create type-less</div><div class='add'>+	 * GSO packets. gso_features_check() will detect this as a bad</div><div class='add'>+	 * offload. However, lets not leak them out in the first place.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb_is_gso(skb) &amp;&amp; !skb_shinfo(skb)-&gt;gso_type))</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='ctx'> 	dev = dev_get_by_index_rcu(dev_net(skb-&gt;dev), ifindex);</div><div class='ctx'> 	if (unlikely(!dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2099,162 +2496,121 @@ static const struct bpf_func_proto bpf_clone_redirect_proto = {</div><div class='ctx'> 	.arg3_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct bpf_redirect_info, bpf_redirect_info);</div><div class='del'>-EXPORT_PER_CPU_SYMBOL_GPL(bpf_redirect_info);</div><div class='del'>-</div><div class='del'>-BPF_CALL_2(bpf_redirect, u32, ifindex, u64, flags)</div><div class='add'>+static struct net_device *skb_get_peer_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='del'>-		return TC_ACT_SHOT;</div><div class='del'>-</div><div class='del'>-	ri-&gt;ifindex = ifindex;</div><div class='del'>-	ri-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	return TC_ACT_REDIRECT;</div><div class='add'>+	if (likely(ops-&gt;ndo_get_peer_dev))</div><div class='add'>+		return INDIRECT_CALL_1(ops-&gt;ndo_get_peer_dev,</div><div class='add'>+				       netkit_peer_dev, dev);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int skb_do_redirect(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	u32 flags = ri-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	dev = dev_get_by_index_rcu(dev_net(skb-&gt;dev), ri-&gt;ifindex);</div><div class='del'>-	ri-&gt;ifindex = 0;</div><div class='del'>-	if (unlikely(!dev)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	dev = dev_get_by_index_rcu(net, ri-&gt;tgt_index);</div><div class='add'>+	ri-&gt;tgt_index = 0;</div><div class='add'>+	ri-&gt;flags = 0;</div><div class='add'>+	if (unlikely(!dev))</div><div class='add'>+		goto out_drop;</div><div class='add'>+	if (flags &amp; BPF_F_PEER) {</div><div class='add'>+		if (unlikely(!skb_at_tc_ingress(skb)))</div><div class='add'>+			goto out_drop;</div><div class='add'>+		dev = skb_get_peer_dev(dev);</div><div class='add'>+		if (unlikely(!dev ||</div><div class='add'>+			     !(dev-&gt;flags &amp; IFF_UP) ||</div><div class='add'>+			     net_eq(net, dev_net(dev))))</div><div class='add'>+			goto out_drop;</div><div class='add'>+		skb-&gt;dev = dev;</div><div class='add'>+		dev_sw_netstats_rx_add(dev, skb-&gt;len);</div><div class='add'>+		skb_scrub_packet(skb, false);</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return __bpf_redirect(skb, dev, ri-&gt;flags);</div><div class='add'>+	return flags &amp; BPF_F_NEIGH ?</div><div class='add'>+	       __bpf_redirect_neigh(skb, dev, flags &amp; BPF_F_NEXTHOP ?</div><div class='add'>+				    &amp;ri-&gt;nh : NULL) :</div><div class='add'>+	       __bpf_redirect(skb, dev, flags);</div><div class='add'>+out_drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_redirect_proto = {</div><div class='del'>-	.func           = bpf_redirect,</div><div class='del'>-	.gpl_only       = false,</div><div class='del'>-	.ret_type       = RET_INTEGER,</div><div class='del'>-	.arg1_type      = ARG_ANYTHING,</div><div class='del'>-	.arg2_type      = ARG_ANYTHING,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,</div><div class='del'>-	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+BPF_CALL_2(bpf_redirect, u32, ifindex, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='del'>-	/* If user passes invalid input drop the packet. */</div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='del'>-		return SK_DROP;</div><div class='add'>+	if (unlikely(flags &amp; (~(BPF_F_INGRESS) | BPF_F_REDIRECT_INTERNAL)))</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='del'>-	tcb-&gt;bpf.flags = flags;</div><div class='del'>-	tcb-&gt;bpf.sk_redir = __sock_hash_lookup_elem(map, key);</div><div class='del'>-	if (!tcb-&gt;bpf.sk_redir)</div><div class='del'>-		return SK_DROP;</div><div class='add'>+	ri-&gt;flags = flags;</div><div class='add'>+	ri-&gt;tgt_index = ifindex;</div><div class='ctx'> </div><div class='del'>-	return SK_PASS;</div><div class='add'>+	return TC_ACT_REDIRECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_sk_redirect_hash_proto = {</div><div class='del'>-	.func           = bpf_sk_redirect_hash,</div><div class='add'>+static const struct bpf_func_proto bpf_redirect_proto = {</div><div class='add'>+	.func           = bpf_redirect,</div><div class='ctx'> 	.gpl_only       = false,</div><div class='ctx'> 	.ret_type       = RET_INTEGER,</div><div class='del'>-	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='del'>-	.arg3_type      = ARG_PTR_TO_MAP_KEY,</div><div class='del'>-	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg1_type      = ARG_ANYTHING,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,</div><div class='del'>-	   struct bpf_map *, map, u32, key, u64, flags)</div><div class='add'>+BPF_CALL_2(bpf_redirect_peer, u32, ifindex, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='del'>-	/* If user passes invalid input drop the packet. */</div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='del'>-		return SK_DROP;</div><div class='del'>-</div><div class='del'>-	tcb-&gt;bpf.flags = flags;</div><div class='del'>-	tcb-&gt;bpf.sk_redir = __sock_map_lookup_elem(map, key);</div><div class='del'>-	if (!tcb-&gt;bpf.sk_redir)</div><div class='del'>-		return SK_DROP;</div><div class='del'>-</div><div class='del'>-	return SK_PASS;</div><div class='del'>-}</div><div class='add'>+	if (unlikely(flags))</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='del'>-struct sock *do_sk_redirect_map(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='add'>+	ri-&gt;flags = BPF_F_PEER;</div><div class='add'>+	ri-&gt;tgt_index = ifindex;</div><div class='ctx'> </div><div class='del'>-	return tcb-&gt;bpf.sk_redir;</div><div class='add'>+	return TC_ACT_REDIRECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_sk_redirect_map_proto = {</div><div class='del'>-	.func           = bpf_sk_redirect_map,</div><div class='add'>+static const struct bpf_func_proto bpf_redirect_peer_proto = {</div><div class='add'>+	.func           = bpf_redirect_peer,</div><div class='ctx'> 	.gpl_only       = false,</div><div class='ctx'> 	.ret_type       = RET_INTEGER,</div><div class='del'>-	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='del'>-	.arg3_type      = ARG_ANYTHING,</div><div class='del'>-	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg1_type      = ARG_ANYTHING,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_4(bpf_msg_redirect_hash, struct sk_msg_buff *, msg,</div><div class='del'>-	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+BPF_CALL_4(bpf_redirect_neigh, u32, ifindex, struct bpf_redir_neigh *, params,</div><div class='add'>+	   int, plen, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	/* If user passes invalid input drop the packet. */</div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='del'>-		return SK_DROP;</div><div class='del'>-</div><div class='del'>-	msg-&gt;flags = flags;</div><div class='del'>-	msg-&gt;sk_redir = __sock_hash_lookup_elem(map, key);</div><div class='del'>-	if (!msg-&gt;sk_redir)</div><div class='del'>-		return SK_DROP;</div><div class='del'>-</div><div class='del'>-	return SK_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct bpf_func_proto bpf_msg_redirect_hash_proto = {</div><div class='del'>-	.func           = bpf_msg_redirect_hash,</div><div class='del'>-	.gpl_only       = false,</div><div class='del'>-	.ret_type       = RET_INTEGER,</div><div class='del'>-	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='del'>-	.arg3_type      = ARG_PTR_TO_MAP_KEY,</div><div class='del'>-	.arg4_type      = ARG_ANYTHING,</div><div class='del'>-};</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='del'>-BPF_CALL_4(bpf_msg_redirect_map, struct sk_msg_buff *, msg,</div><div class='del'>-	   struct bpf_map *, map, u32, key, u64, flags)</div><div class='del'>-{</div><div class='del'>-	/* If user passes invalid input drop the packet. */</div><div class='del'>-	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='del'>-		return SK_DROP;</div><div class='add'>+	if (unlikely((plen &amp;&amp; plen &lt; sizeof(*params)) || flags))</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='del'>-	msg-&gt;flags = flags;</div><div class='del'>-	msg-&gt;sk_redir = __sock_map_lookup_elem(map, key);</div><div class='del'>-	if (!msg-&gt;sk_redir)</div><div class='del'>-		return SK_DROP;</div><div class='add'>+	ri-&gt;flags = BPF_F_NEIGH | (plen ? BPF_F_NEXTHOP : 0);</div><div class='add'>+	ri-&gt;tgt_index = ifindex;</div><div class='ctx'> </div><div class='del'>-	return SK_PASS;</div><div class='del'>-}</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct bpf_redir_neigh) != sizeof(struct bpf_nh_params));</div><div class='add'>+	if (plen)</div><div class='add'>+		memcpy(&amp;ri-&gt;nh, params, sizeof(ri-&gt;nh));</div><div class='ctx'> </div><div class='del'>-struct sock *do_msg_redirect_map(struct sk_msg_buff *msg)</div><div class='del'>-{</div><div class='del'>-	return msg-&gt;sk_redir;</div><div class='add'>+	return TC_ACT_REDIRECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_msg_redirect_map_proto = {</div><div class='del'>-	.func           = bpf_msg_redirect_map,</div><div class='del'>-	.gpl_only       = false,</div><div class='del'>-	.ret_type       = RET_INTEGER,</div><div class='del'>-	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='del'>-	.arg3_type      = ARG_ANYTHING,</div><div class='del'>-	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+static const struct bpf_func_proto bpf_redirect_neigh_proto = {</div><div class='add'>+	.func		= bpf_redirect_neigh,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_ANYTHING,</div><div class='add'>+	.arg2_type      = ARG_PTR_TO_MEM | PTR_MAYBE_NULL | MEM_RDONLY,</div><div class='add'>+	.arg3_type      = ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_2(bpf_msg_apply_bytes, struct sk_msg_buff *, msg, u32, bytes)</div><div class='add'>+BPF_CALL_2(bpf_msg_apply_bytes, struct sk_msg *, msg, u32, bytes)</div><div class='ctx'> {</div><div class='ctx'> 	msg-&gt;apply_bytes = bytes;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2268,12 +2624,26 @@ static const struct bpf_func_proto bpf_msg_apply_bytes_proto = {</div><div class='ctx'> 	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_2(bpf_msg_cork_bytes, struct sk_msg_buff *, msg, u32, bytes)</div><div class='add'>+BPF_CALL_2(bpf_msg_cork_bytes, struct sk_msg *, msg, u32, bytes)</div><div class='ctx'> {</div><div class='ctx'> 	msg-&gt;cork_bytes = bytes;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sk_msg_reset_curr(struct sk_msg *msg)</div><div class='add'>+{</div><div class='add'>+	if (!msg-&gt;sg.size) {</div><div class='add'>+		msg-&gt;sg.curr = msg-&gt;sg.start;</div><div class='add'>+		msg-&gt;sg.copybreak = 0;</div><div class='add'>+	} else {</div><div class='add'>+		u32 i = msg-&gt;sg.end;</div><div class='add'>+</div><div class='add'>+		sk_msg_iter_var_prev(i);</div><div class='add'>+		msg-&gt;sg.curr = i;</div><div class='add'>+		msg-&gt;sg.copybreak = msg-&gt;sg.data[i].length;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto bpf_msg_cork_bytes_proto = {</div><div class='ctx'> 	.func           = bpf_msg_cork_bytes,</div><div class='ctx'> 	.gpl_only       = false,</div><div class='hunk'>@@ -2282,45 +2652,37 @@ static const struct bpf_func_proto bpf_msg_cork_bytes_proto = {</div><div class='ctx'> 	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define sk_msg_iter_var(var)			\</div><div class='del'>-	do {					\</div><div class='del'>-		var++;				\</div><div class='del'>-		if (var == MAX_SKB_FRAGS)	\</div><div class='del'>-			var = 0;		\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-BPF_CALL_4(bpf_msg_pull_data,</div><div class='del'>-	   struct sk_msg_buff *, msg, u32, start, u32, end, u64, flags)</div><div class='add'>+BPF_CALL_4(bpf_msg_pull_data, struct sk_msg *, msg, u32, start,</div><div class='add'>+	   u32, end, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = 0, offset = 0, copy = 0, poffset = 0;</div><div class='del'>-	int bytes = end - start, bytes_sg_total;</div><div class='del'>-	struct scatterlist *sg = msg-&gt;sg_data;</div><div class='del'>-	int first_sg, last_sg, i, shift;</div><div class='del'>-	unsigned char *p, *to, *from;</div><div class='add'>+	u32 len = 0, offset = 0, copy = 0, poffset = 0, bytes = end - start;</div><div class='add'>+	u32 first_sge, last_sge, i, shift, bytes_sg_total;</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	u8 *raw, *to, *from;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags || end &lt;= start))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* First find the starting scatterlist element */</div><div class='del'>-	i = msg-&gt;sg_start;</div><div class='add'>+	i = msg-&gt;sg.start;</div><div class='ctx'> 	do {</div><div class='del'>-		len = sg[i].length;</div><div class='add'>+		offset += len;</div><div class='add'>+		len = sk_msg_elem(msg, i)-&gt;length;</div><div class='ctx'> 		if (start &lt; offset + len)</div><div class='ctx'> 			break;</div><div class='del'>-		offset += len;</div><div class='del'>-		sk_msg_iter_var(i);</div><div class='del'>-	} while (i != msg-&gt;sg_end);</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(start &gt;= offset + len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	first_sg = i;</div><div class='add'>+	first_sge = i;</div><div class='ctx'> 	/* The start may point into the sg element so we need to also</div><div class='ctx'> 	 * account for the headroom.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bytes_sg_total = start - offset + bytes;</div><div class='del'>-	if (!msg-&gt;sg_copy[i] &amp;&amp; bytes_sg_total &lt;= len)</div><div class='add'>+	if (!test_bit(i, msg-&gt;sg.copy) &amp;&amp; bytes_sg_total &lt;= len)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* At this point we need to linearize multiple scatterlist</div><div class='hunk'>@@ -2334,12 +2696,12 @@ BPF_CALL_4(bpf_msg_pull_data,</div><div class='ctx'> 	 * will copy the entire sg entry.</div><div class='ctx'> 	 */</div><div class='ctx'> 	do {</div><div class='del'>-		copy += sg[i].length;</div><div class='del'>-		sk_msg_iter_var(i);</div><div class='add'>+		copy += sk_msg_elem(msg, i)-&gt;length;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='ctx'> 		if (bytes_sg_total &lt;= copy)</div><div class='ctx'> 			break;</div><div class='del'>-	} while (i != msg-&gt;sg_end);</div><div class='del'>-	last_sg = i;</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+	last_sge = i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bytes_sg_total &gt; copy))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2348,63 +2710,62 @@ BPF_CALL_4(bpf_msg_pull_data,</div><div class='ctx'> 			   get_order(copy));</div><div class='ctx'> 	if (unlikely(!page))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	p = page_address(page);</div><div class='ctx'> </div><div class='del'>-	i = first_sg;</div><div class='add'>+	raw = page_address(page);</div><div class='add'>+	i = first_sge;</div><div class='ctx'> 	do {</div><div class='del'>-		from = sg_virt(&amp;sg[i]);</div><div class='del'>-		len = sg[i].length;</div><div class='del'>-		to = p + poffset;</div><div class='add'>+		sge = sk_msg_elem(msg, i);</div><div class='add'>+		from = sg_virt(sge);</div><div class='add'>+		len = sge-&gt;length;</div><div class='add'>+		to = raw + poffset;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(to, from, len);</div><div class='ctx'> 		poffset += len;</div><div class='del'>-		sg[i].length = 0;</div><div class='del'>-		put_page(sg_page(&amp;sg[i]));</div><div class='add'>+		sge-&gt;length = 0;</div><div class='add'>+		put_page(sg_page(sge));</div><div class='ctx'> </div><div class='del'>-		sk_msg_iter_var(i);</div><div class='del'>-	} while (i != last_sg);</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != last_sge);</div><div class='ctx'> </div><div class='del'>-	sg[first_sg].length = copy;</div><div class='del'>-	sg_set_page(&amp;sg[first_sg], page, copy, 0);</div><div class='add'>+	sg_set_page(&amp;msg-&gt;sg.data[first_sge], page, copy, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* To repair sg ring we need to shift entries. If we only</div><div class='ctx'> 	 * had a single entry though we can just replace it and</div><div class='ctx'> 	 * be done. Otherwise walk the ring and shift the entries.</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON_ONCE(last_sg == first_sg);</div><div class='del'>-	shift = last_sg &gt; first_sg ?</div><div class='del'>-		last_sg - first_sg - 1 :</div><div class='del'>-		MAX_SKB_FRAGS - first_sg + last_sg - 1;</div><div class='add'>+	WARN_ON_ONCE(last_sge == first_sge);</div><div class='add'>+	shift = last_sge &gt; first_sge ?</div><div class='add'>+		last_sge - first_sge - 1 :</div><div class='add'>+		NR_MSG_FRAG_IDS - first_sge + last_sge - 1;</div><div class='ctx'> 	if (!shift)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	i = first_sg;</div><div class='del'>-	sk_msg_iter_var(i);</div><div class='add'>+	i = first_sge;</div><div class='add'>+	sk_msg_iter_var_next(i);</div><div class='ctx'> 	do {</div><div class='del'>-		int move_from;</div><div class='add'>+		u32 move_from;</div><div class='ctx'> </div><div class='del'>-		if (i + shift &gt;= MAX_SKB_FRAGS)</div><div class='del'>-			move_from = i + shift - MAX_SKB_FRAGS;</div><div class='add'>+		if (i + shift &gt;= NR_MSG_FRAG_IDS)</div><div class='add'>+			move_from = i + shift - NR_MSG_FRAG_IDS;</div><div class='ctx'> 		else</div><div class='ctx'> 			move_from = i + shift;</div><div class='del'>-</div><div class='del'>-		if (move_from == msg-&gt;sg_end)</div><div class='add'>+		if (move_from == msg-&gt;sg.end)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		sg[i] = sg[move_from];</div><div class='del'>-		sg[move_from].length = 0;</div><div class='del'>-		sg[move_from].page_link = 0;</div><div class='del'>-		sg[move_from].offset = 0;</div><div class='del'>-</div><div class='del'>-		sk_msg_iter_var(i);</div><div class='add'>+		msg-&gt;sg.data[i] = msg-&gt;sg.data[move_from];</div><div class='add'>+		msg-&gt;sg.data[move_from].length = 0;</div><div class='add'>+		msg-&gt;sg.data[move_from].page_link = 0;</div><div class='add'>+		msg-&gt;sg.data[move_from].offset = 0;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='ctx'> 	} while (1);</div><div class='del'>-	msg-&gt;sg_end -= shift;</div><div class='del'>-	if (msg-&gt;sg_end &lt; 0)</div><div class='del'>-		msg-&gt;sg_end += MAX_SKB_FRAGS;</div><div class='add'>+</div><div class='add'>+	msg-&gt;sg.end = msg-&gt;sg.end - shift &gt; msg-&gt;sg.end ?</div><div class='add'>+		      msg-&gt;sg.end - shift + NR_MSG_FRAG_IDS :</div><div class='add'>+		      msg-&gt;sg.end - shift;</div><div class='ctx'> out:</div><div class='del'>-	msg-&gt;data = sg_virt(&amp;sg[first_sg]) + start - offset;</div><div class='add'>+	sk_msg_reset_curr(msg);</div><div class='add'>+	msg-&gt;data = sg_virt(&amp;msg-&gt;sg.data[first_sge]) + start - offset;</div><div class='ctx'> 	msg-&gt;data_end = msg-&gt;data + bytes;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2418,6 +2779,357 @@ static const struct bpf_func_proto bpf_msg_pull_data_proto = {</div><div class='ctx'> 	.arg4_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BPF_CALL_4(bpf_msg_push_data, struct sk_msg *, msg, u32, start,</div><div class='add'>+	   u32, len, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sge, nsge, nnsge, rsge = {0}, *psge;</div><div class='add'>+	u32 new, i = 0, l = 0, space, copy = 0, offset = 0;</div><div class='add'>+	u8 *raw, *to, *from;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len == 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* First find the starting scatterlist element */</div><div class='add'>+	i = msg-&gt;sg.start;</div><div class='add'>+	do {</div><div class='add'>+		offset += l;</div><div class='add'>+		l = sk_msg_elem(msg, i)-&gt;length;</div><div class='add'>+</div><div class='add'>+		if (start &lt; offset + l)</div><div class='add'>+			break;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+</div><div class='add'>+	if (start &gt; offset + l)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	space = MAX_MSG_FRAGS - sk_msg_elem_used(msg);</div><div class='add'>+</div><div class='add'>+	/* If no space available will fallback to copy, we need at</div><div class='add'>+	 * least one scatterlist elem available to push data into</div><div class='add'>+	 * when start aligns to the beginning of an element or two</div><div class='add'>+	 * when it falls inside an element. We handle the start equals</div><div class='add'>+	 * offset case because its the common case for inserting a</div><div class='add'>+	 * header.</div><div class='add'>+	 */</div><div class='add'>+	if (!space || (space == 1 &amp;&amp; start != offset))</div><div class='add'>+		copy = msg-&gt;sg.data[i].length;</div><div class='add'>+</div><div class='add'>+	page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC | __GFP_COMP,</div><div class='add'>+			   get_order(copy + len));</div><div class='add'>+	if (unlikely(!page))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (copy) {</div><div class='add'>+		int front, back;</div><div class='add'>+</div><div class='add'>+		raw = page_address(page);</div><div class='add'>+</div><div class='add'>+		if (i == msg-&gt;sg.end)</div><div class='add'>+			sk_msg_iter_var_prev(i);</div><div class='add'>+		psge = sk_msg_elem(msg, i);</div><div class='add'>+		front = start - offset;</div><div class='add'>+		back = psge-&gt;length - front;</div><div class='add'>+		from = sg_virt(psge);</div><div class='add'>+</div><div class='add'>+		if (front)</div><div class='add'>+			memcpy(raw, from, front);</div><div class='add'>+</div><div class='add'>+		if (back) {</div><div class='add'>+			from += front;</div><div class='add'>+			to = raw + front + len;</div><div class='add'>+</div><div class='add'>+			memcpy(to, from, back);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		put_page(sg_page(psge));</div><div class='add'>+		new = i;</div><div class='add'>+		goto place_new;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (start - offset) {</div><div class='add'>+		if (i == msg-&gt;sg.end)</div><div class='add'>+			sk_msg_iter_var_prev(i);</div><div class='add'>+		psge = sk_msg_elem(msg, i);</div><div class='add'>+		rsge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+</div><div class='add'>+		psge-&gt;length = start - offset;</div><div class='add'>+		rsge.length -= psge-&gt;length;</div><div class='add'>+		rsge.offset += start;</div><div class='add'>+</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		sg_unmark_end(psge);</div><div class='add'>+		sg_unmark_end(&amp;rsge);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Slot(s) to place newly allocated data */</div><div class='add'>+	sk_msg_iter_next(msg, end);</div><div class='add'>+	new = i;</div><div class='add'>+	sk_msg_iter_var_next(i);</div><div class='add'>+</div><div class='add'>+	if (i == msg-&gt;sg.end) {</div><div class='add'>+		if (!rsge.length)</div><div class='add'>+			goto place_new;</div><div class='add'>+		sk_msg_iter_next(msg, end);</div><div class='add'>+		goto place_new;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Shift one or two slots as needed */</div><div class='add'>+	sge = sk_msg_elem_cpy(msg, new);</div><div class='add'>+	sg_unmark_end(&amp;sge);</div><div class='add'>+</div><div class='add'>+	nsge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+	if (rsge.length) {</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		nnsge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+		sk_msg_iter_next(msg, end);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (i != msg-&gt;sg.end) {</div><div class='add'>+		msg-&gt;sg.data[i] = sge;</div><div class='add'>+		sge = nsge;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		if (rsge.length) {</div><div class='add'>+			nsge = nnsge;</div><div class='add'>+			nnsge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+		} else {</div><div class='add'>+			nsge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+place_new:</div><div class='add'>+	/* Place newly allocated data buffer */</div><div class='add'>+	sk_mem_charge(msg-&gt;sk, len);</div><div class='add'>+	msg-&gt;sg.size += len;</div><div class='add'>+	__clear_bit(new, msg-&gt;sg.copy);</div><div class='add'>+	sg_set_page(&amp;msg-&gt;sg.data[new], page, len + copy, 0);</div><div class='add'>+	if (rsge.length) {</div><div class='add'>+		get_page(sg_page(&amp;rsge));</div><div class='add'>+		sk_msg_iter_var_next(new);</div><div class='add'>+		msg-&gt;sg.data[new] = rsge;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_msg_reset_curr(msg);</div><div class='add'>+	sk_msg_compute_data_pointers(msg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_msg_push_data_proto = {</div><div class='add'>+	.func		= bpf_msg_push_data,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void sk_msg_shift_left(struct sk_msg *msg, int i)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sge = sk_msg_elem(msg, i);</div><div class='add'>+	int prev;</div><div class='add'>+</div><div class='add'>+	put_page(sg_page(sge));</div><div class='add'>+	do {</div><div class='add'>+		prev = i;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		msg-&gt;sg.data[prev] = msg-&gt;sg.data[i];</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+</div><div class='add'>+	sk_msg_iter_prev(msg, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_msg_shift_right(struct sk_msg *msg, int i)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist tmp, sge;</div><div class='add'>+</div><div class='add'>+	sk_msg_iter_next(msg, end);</div><div class='add'>+	sge = sk_msg_elem_cpy(msg, i);</div><div class='add'>+	sk_msg_iter_var_next(i);</div><div class='add'>+	tmp = sk_msg_elem_cpy(msg, i);</div><div class='add'>+</div><div class='add'>+	while (i != msg-&gt;sg.end) {</div><div class='add'>+		msg-&gt;sg.data[i] = sge;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		sge = tmp;</div><div class='add'>+		tmp = sk_msg_elem_cpy(msg, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_msg_pop_data, struct sk_msg *, msg, u32, start,</div><div class='add'>+	   u32, len, u64, flags)</div><div class='add'>+{</div><div class='add'>+	u32 i = 0, l = 0, space, offset = 0;</div><div class='add'>+	u64 last = start + len;</div><div class='add'>+	int pop;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len == 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* First find the starting scatterlist element */</div><div class='add'>+	i = msg-&gt;sg.start;</div><div class='add'>+	do {</div><div class='add'>+		offset += l;</div><div class='add'>+		l = sk_msg_elem(msg, i)-&gt;length;</div><div class='add'>+</div><div class='add'>+		if (start &lt; offset + l)</div><div class='add'>+			break;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+</div><div class='add'>+	/* Bounds checks: start and pop must be inside message */</div><div class='add'>+	if (start &gt;= offset + l || last &gt; msg-&gt;sg.size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	space = MAX_MSG_FRAGS - sk_msg_elem_used(msg);</div><div class='add'>+</div><div class='add'>+	pop = len;</div><div class='add'>+	/* --------------| offset</div><div class='add'>+	 * -| start      |-------- len -------|</div><div class='add'>+	 *</div><div class='add'>+	 *  |----- a ----|-------- pop -------|----- b ----|</div><div class='add'>+	 *  |______________________________________________| length</div><div class='add'>+	 *</div><div class='add'>+	 *</div><div class='add'>+	 * a:   region at front of scatter element to save</div><div class='add'>+	 * b:   region at back of scatter element to save when length &gt; A + pop</div><div class='add'>+	 * pop: region to pop from element, same as input 'pop' here will be</div><div class='add'>+	 *      decremented below per iteration.</div><div class='add'>+	 *</div><div class='add'>+	 * Two top-level cases to handle when start != offset, first B is non</div><div class='add'>+	 * zero and second B is zero corresponding to when a pop includes more</div><div class='add'>+	 * than one element.</div><div class='add'>+	 *</div><div class='add'>+	 * Then if B is non-zero AND there is no space allocate space and</div><div class='add'>+	 * compact A, B regions into page. If there is space shift ring to</div><div class='add'>+	 * the right free'ing the next element in ring to place B, leaving</div><div class='add'>+	 * A untouched except to reduce length.</div><div class='add'>+	 */</div><div class='add'>+	if (start != offset) {</div><div class='add'>+		struct scatterlist *nsge, *sge = sk_msg_elem(msg, i);</div><div class='add'>+		int a = start - offset;</div><div class='add'>+		int b = sge-&gt;length - pop - a;</div><div class='add'>+</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+</div><div class='add'>+		if (b &gt; 0) {</div><div class='add'>+			if (space) {</div><div class='add'>+				sge-&gt;length = a;</div><div class='add'>+				sk_msg_shift_right(msg, i);</div><div class='add'>+				nsge = sk_msg_elem(msg, i);</div><div class='add'>+				get_page(sg_page(sge));</div><div class='add'>+				sg_set_page(nsge,</div><div class='add'>+					    sg_page(sge),</div><div class='add'>+					    b, sge-&gt;offset + pop + a);</div><div class='add'>+			} else {</div><div class='add'>+				struct page *page, *orig;</div><div class='add'>+				u8 *to, *from;</div><div class='add'>+</div><div class='add'>+				page = alloc_pages(__GFP_NOWARN |</div><div class='add'>+						   __GFP_COMP   | GFP_ATOMIC,</div><div class='add'>+						   get_order(a + b));</div><div class='add'>+				if (unlikely(!page))</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+</div><div class='add'>+				orig = sg_page(sge);</div><div class='add'>+				from = sg_virt(sge);</div><div class='add'>+				to = page_address(page);</div><div class='add'>+				memcpy(to, from, a);</div><div class='add'>+				memcpy(to + a, from + a + pop, b);</div><div class='add'>+				sg_set_page(sge, page, a + b, 0);</div><div class='add'>+				put_page(orig);</div><div class='add'>+			}</div><div class='add'>+			pop = 0;</div><div class='add'>+		} else {</div><div class='add'>+			pop -= (sge-&gt;length - a);</div><div class='add'>+			sge-&gt;length = a;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* From above the current layout _must_ be as follows,</div><div class='add'>+	 *</div><div class='add'>+	 * -| offset</div><div class='add'>+	 * -| start</div><div class='add'>+	 *</div><div class='add'>+	 *  |---- pop ---|---------------- b ------------|</div><div class='add'>+	 *  |____________________________________________| length</div><div class='add'>+	 *</div><div class='add'>+	 * Offset and start of the current msg elem are equal because in the</div><div class='add'>+	 * previous case we handled offset != start and either consumed the</div><div class='add'>+	 * entire element and advanced to the next element OR pop == 0.</div><div class='add'>+	 *</div><div class='add'>+	 * Two cases to handle here are first pop is less than the length</div><div class='add'>+	 * leaving some remainder b above. Simply adjust the element's layout</div><div class='add'>+	 * in this case. Or pop &gt;= length of the element so that b = 0. In this</div><div class='add'>+	 * case advance to next element decrementing pop.</div><div class='add'>+	 */</div><div class='add'>+	while (pop) {</div><div class='add'>+		struct scatterlist *sge = sk_msg_elem(msg, i);</div><div class='add'>+</div><div class='add'>+		if (pop &lt; sge-&gt;length) {</div><div class='add'>+			sge-&gt;length -= pop;</div><div class='add'>+			sge-&gt;offset += pop;</div><div class='add'>+			pop = 0;</div><div class='add'>+		} else {</div><div class='add'>+			pop -= sge-&gt;length;</div><div class='add'>+			sk_msg_shift_left(msg, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_mem_uncharge(msg-&gt;sk, len - pop);</div><div class='add'>+	msg-&gt;sg.size -= (len - pop);</div><div class='add'>+	sk_msg_reset_curr(msg);</div><div class='add'>+	sk_msg_compute_data_pointers(msg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_msg_pop_data_proto = {</div><div class='add'>+	.func		= bpf_msg_pop_data,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='add'>+BPF_CALL_0(bpf_get_cgroup_classid_curr)</div><div class='add'>+{</div><div class='add'>+	return __task_get_classid(current);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_get_cgroup_classid_curr_proto = {</div><div class='add'>+	.func		= bpf_get_cgroup_classid_curr,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skb_cgroup_classid, const struct sk_buff *, skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = skb_to_full_sk(skb);</div><div class='add'>+</div><div class='add'>+	if (!sk || !sk_fullsock(sk))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return sock_cgroup_classid(&amp;sk-&gt;sk_cgrp_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_skb_cgroup_classid_proto = {</div><div class='add'>+	.func		= bpf_skb_cgroup_classid,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> BPF_CALL_1(bpf_get_cgroup_classid, const struct sk_buff *, skb)</div><div class='ctx'> {</div><div class='ctx'> 	return task_get_classid(skb);</div><div class='hunk'>@@ -2505,6 +3217,7 @@ BPF_CALL_3(bpf_skb_vlan_push, struct sk_buff *, skb, __be16, vlan_proto,</div><div class='ctx'> 	bpf_push_mac_rcsum(skb);</div><div class='ctx'> 	ret = skb_vlan_push(skb, vlan_proto, vlan_tci);</div><div class='ctx'> 	bpf_pull_mac_rcsum(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	bpf_compute_data_pointers(skb);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2538,13 +3251,20 @@ static const struct bpf_func_proto bpf_skb_vlan_pop_proto = {</div><div class='ctx'> 	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void bpf_skb_change_protocol(struct sk_buff *skb, u16 proto)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;protocol = htons(proto);</div><div class='add'>+	if (skb_valid_dst(skb))</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bpf_skb_generic_push(struct sk_buff *skb, u32 off, u32 len)</div><div class='ctx'> {</div><div class='del'>-	/* Caller already did skb_cow() with len as headroom,</div><div class='add'>+	/* Caller already did skb_cow() with meta_len+len as headroom,</div><div class='ctx'> 	 * so no need to do it here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_push(skb, len);</div><div class='del'>-	memmove(skb-&gt;data, skb-&gt;data + len, off);</div><div class='add'>+	skb_postpush_data_move(skb, len, off);</div><div class='ctx'> 	memset(skb-&gt;data + off, 0, len);</div><div class='ctx'> </div><div class='ctx'> 	/* No skb_postpush_rcsum(skb, skb-&gt;data + off, len)</div><div class='hunk'>@@ -2557,15 +3277,18 @@ static int bpf_skb_generic_push(struct sk_buff *skb, u32 off, u32 len)</div><div class='ctx'> </div><div class='ctx'> static int bpf_skb_generic_pop(struct sk_buff *skb, u32 off, u32 len)</div><div class='ctx'> {</div><div class='add'>+	void *old_data;</div><div class='add'>+</div><div class='ctx'> 	/* skb_ensure_writable() is not needed here, as we're</div><div class='ctx'> 	 * already working on an uncloned skb.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, off + len)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	skb_postpull_rcsum(skb, skb-&gt;data + off, len);</div><div class='del'>-	memmove(skb-&gt;data + len, skb-&gt;data, off);</div><div class='add'>+	old_data = skb-&gt;data;</div><div class='ctx'> 	__skb_pull(skb, len);</div><div class='add'>+	skb_postpull_rcsum(skb, old_data + off, len);</div><div class='add'>+	skb_postpull_data_move(skb, len, off);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2610,14 +3333,11 @@ static int bpf_skb_net_hdr_pop(struct sk_buff *skb, u32 off, u32 len)</div><div class='ctx'> static int bpf_skb_proto_4_to_6(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 len_diff = sizeof(struct ipv6hdr) - sizeof(struct iphdr);</div><div class='add'>+	const u8 meta_len = skb_metadata_len(skb);</div><div class='ctx'> 	u32 off = skb_mac_header_len(skb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* SCTP uses GSO_BY_FRAGS, thus cannot adjust it. */</div><div class='del'>-	if (skb_is_gso(skb) &amp;&amp; unlikely(skb_is_gso_sctp(skb)))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='del'>-	ret = skb_cow(skb, len_diff);</div><div class='add'>+	ret = skb_cow(skb, meta_len + len_diff);</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2628,22 +3348,14 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb)</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> </div><div class='del'>-		/* SKB_GSO_TCPV4 needs to be changed into</div><div class='del'>-		 * SKB_GSO_TCPV6.</div><div class='del'>-		 */</div><div class='add'>+		/* SKB_GSO_TCPV4 needs to be changed into SKB_GSO_TCPV6. */</div><div class='ctx'> 		if (shinfo-&gt;gso_type &amp; SKB_GSO_TCPV4) {</div><div class='ctx'> 			shinfo-&gt;gso_type &amp;= ~SKB_GSO_TCPV4;</div><div class='ctx'> 			shinfo-&gt;gso_type |=  SKB_GSO_TCPV6;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Due to IPv6 header, MSS needs to be downgraded. */</div><div class='del'>-		skb_decrease_gso_size(shinfo, len_diff);</div><div class='del'>-		/* Header must be checked, and gso_segs recomputed. */</div><div class='del'>-		shinfo-&gt;gso_type |= SKB_GSO_DODGY;</div><div class='del'>-		shinfo-&gt;gso_segs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	bpf_skb_change_protocol(skb, ETH_P_IPV6);</div><div class='ctx'> 	skb_clear_hash(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2655,10 +3367,6 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)</div><div class='ctx'> 	u32 off = skb_mac_header_len(skb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* SCTP uses GSO_BY_FRAGS, thus cannot adjust it. */</div><div class='del'>-	if (skb_is_gso(skb) &amp;&amp; unlikely(skb_is_gso_sctp(skb)))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	ret = skb_unclone(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2670,22 +3378,14 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> </div><div class='del'>-		/* SKB_GSO_TCPV6 needs to be changed into</div><div class='del'>-		 * SKB_GSO_TCPV4.</div><div class='del'>-		 */</div><div class='add'>+		/* SKB_GSO_TCPV6 needs to be changed into SKB_GSO_TCPV4. */</div><div class='ctx'> 		if (shinfo-&gt;gso_type &amp; SKB_GSO_TCPV6) {</div><div class='ctx'> 			shinfo-&gt;gso_type &amp;= ~SKB_GSO_TCPV6;</div><div class='ctx'> 			shinfo-&gt;gso_type |=  SKB_GSO_TCPV4;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Due to IPv4 header, MSS can be upgraded. */</div><div class='del'>-		skb_increase_gso_size(shinfo, len_diff);</div><div class='del'>-		/* Header must be checked, and gso_segs recomputed. */</div><div class='del'>-		shinfo-&gt;gso_type |= SKB_GSO_DODGY;</div><div class='del'>-		shinfo-&gt;gso_segs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	bpf_skb_change_protocol(skb, ETH_P_IP);</div><div class='ctx'> 	skb_clear_hash(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2776,44 +3476,151 @@ static u32 bpf_skb_net_base_len(const struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bpf_skb_net_grow(struct sk_buff *skb, u32 len_diff)</div><div class='add'>+#define BPF_F_ADJ_ROOM_ENCAP_L3_MASK	(BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)</div><div class='add'>+</div><div class='add'>+#define BPF_F_ADJ_ROOM_DECAP_L3_MASK	(BPF_F_ADJ_ROOM_DECAP_L3_IPV4 | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_DECAP_L3_IPV6)</div><div class='add'>+</div><div class='add'>+#define BPF_F_ADJ_ROOM_MASK		(BPF_F_ADJ_ROOM_FIXED_GSO | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L3_MASK | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L4_GRE | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L4_UDP | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L2_ETH | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_ENCAP_L2( \</div><div class='add'>+					  BPF_ADJ_ROOM_ENCAP_L2_MASK) | \</div><div class='add'>+					 BPF_F_ADJ_ROOM_DECAP_L3_MASK)</div><div class='add'>+</div><div class='add'>+static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff,</div><div class='add'>+			    u64 flags)</div><div class='ctx'> {</div><div class='del'>-	u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb);</div><div class='add'>+	u8 inner_mac_len = flags &gt;&gt; BPF_ADJ_ROOM_ENCAP_L2_SHIFT;</div><div class='add'>+	bool encap = flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_MASK;</div><div class='add'>+	u16 mac_len = 0, inner_net = 0, inner_trans = 0;</div><div class='add'>+	const u8 meta_len = skb_metadata_len(skb);</div><div class='add'>+	unsigned int gso_type = SKB_GSO_DODGY;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* SCTP uses GSO_BY_FRAGS, thus cannot adjust it. */</div><div class='del'>-	if (skb_is_gso(skb) &amp;&amp; unlikely(skb_is_gso_sctp(skb)))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+	if (skb_is_gso(skb) &amp;&amp; !skb_is_gso_tcp(skb)) {</div><div class='add'>+		/* udp gso_size delineates datagrams, only allow if fixed */</div><div class='add'>+		if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4) ||</div><div class='add'>+		    !(flags &amp; BPF_F_ADJ_ROOM_FIXED_GSO))</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = skb_cow(skb, len_diff);</div><div class='add'>+	ret = skb_cow_head(skb, meta_len + len_diff);</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (encap) {</div><div class='add'>+		if (skb-&gt;protocol != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+		    skb-&gt;protocol != htons(ETH_P_IPV6))</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 &amp;&amp;</div><div class='add'>+		    flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_GRE &amp;&amp;</div><div class='add'>+		    flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_UDP)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L2_ETH &amp;&amp;</div><div class='add'>+		    inner_mac_len &lt; ETH_HLEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;encapsulation)</div><div class='add'>+			return -EALREADY;</div><div class='add'>+</div><div class='add'>+		mac_len = skb-&gt;network_header - skb-&gt;mac_header;</div><div class='add'>+		inner_net = skb-&gt;network_header;</div><div class='add'>+		if (inner_mac_len &gt; len_diff)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inner_trans = skb-&gt;transport_header;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = bpf_skb_net_hdr_push(skb, off, len_diff);</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (encap) {</div><div class='add'>+		skb-&gt;inner_mac_header = inner_net - inner_mac_len;</div><div class='add'>+		skb-&gt;inner_network_header = inner_net;</div><div class='add'>+		skb-&gt;inner_transport_header = inner_trans;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L2_ETH)</div><div class='add'>+			skb_set_inner_protocol(skb, htons(ETH_P_TEB));</div><div class='add'>+		else</div><div class='add'>+			skb_set_inner_protocol(skb, skb-&gt;protocol);</div><div class='add'>+</div><div class='add'>+		skb-&gt;encapsulation = 1;</div><div class='add'>+		skb_set_network_header(skb, mac_len);</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_UDP)</div><div class='add'>+			gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='add'>+		else if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_GRE)</div><div class='add'>+			gso_type |= SKB_GSO_GRE;</div><div class='add'>+		else if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)</div><div class='add'>+			gso_type |= SKB_GSO_IPXIP6;</div><div class='add'>+		else if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV4)</div><div class='add'>+			gso_type |= SKB_GSO_IPXIP4;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_GRE ||</div><div class='add'>+		    flags &amp; BPF_F_ADJ_ROOM_ENCAP_L4_UDP) {</div><div class='add'>+			int nh_len = flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 ?</div><div class='add'>+					sizeof(struct ipv6hdr) :</div><div class='add'>+					sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+			skb_set_transport_header(skb, mac_len + nh_len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Match skb-&gt;protocol to new outer l3 protocol */</div><div class='add'>+		if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+		    flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)</div><div class='add'>+			bpf_skb_change_protocol(skb, ETH_P_IPV6);</div><div class='add'>+		else if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+			 flags &amp; BPF_F_ADJ_ROOM_ENCAP_L3_IPV4)</div><div class='add'>+			bpf_skb_change_protocol(skb, ETH_P_IP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> </div><div class='del'>-		/* Due to header grow, MSS needs to be downgraded. */</div><div class='del'>-		skb_decrease_gso_size(shinfo, len_diff);</div><div class='ctx'> 		/* Header must be checked, and gso_segs recomputed. */</div><div class='del'>-		shinfo-&gt;gso_type |= SKB_GSO_DODGY;</div><div class='add'>+		shinfo-&gt;gso_type |= gso_type;</div><div class='ctx'> 		shinfo-&gt;gso_segs = 0;</div><div class='add'>+</div><div class='add'>+		/* Due to header growth, MSS needs to be downgraded.</div><div class='add'>+		 * There is a BUG_ON() when segmenting the frag_list with</div><div class='add'>+		 * head_frag true, so linearize the skb after downgrading</div><div class='add'>+		 * the MSS.</div><div class='add'>+		 */</div><div class='add'>+		if (!(flags &amp; BPF_F_ADJ_ROOM_FIXED_GSO)) {</div><div class='add'>+			skb_decrease_gso_size(shinfo, len_diff);</div><div class='add'>+			if (shinfo-&gt;frag_list)</div><div class='add'>+				return skb_linearize(skb);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff)</div><div class='add'>+static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff,</div><div class='add'>+			      u64 flags)</div><div class='ctx'> {</div><div class='del'>-	u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* SCTP uses GSO_BY_FRAGS, thus cannot adjust it. */</div><div class='del'>-	if (skb_is_gso(skb) &amp;&amp; unlikely(skb_is_gso_sctp(skb)))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_ADJ_ROOM_FIXED_GSO |</div><div class='add'>+			       BPF_F_ADJ_ROOM_DECAP_L3_MASK |</div><div class='add'>+			       BPF_F_ADJ_ROOM_NO_CSUM_RESET)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb_is_gso(skb) &amp;&amp; !skb_is_gso_tcp(skb)) {</div><div class='add'>+		/* udp gso_size delineates datagrams, only allow if fixed */</div><div class='add'>+		if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4) ||</div><div class='add'>+		    !(flags &amp; BPF_F_ADJ_ROOM_FIXED_GSO))</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = skb_unclone(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='hunk'>@@ -2823,11 +3630,21 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff)</div><div class='ctx'> 	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/* Match skb-&gt;protocol to new outer l3 protocol */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	    flags &amp; BPF_F_ADJ_ROOM_DECAP_L3_IPV6)</div><div class='add'>+		bpf_skb_change_protocol(skb, ETH_P_IPV6);</div><div class='add'>+	else if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+		 flags &amp; BPF_F_ADJ_ROOM_DECAP_L3_IPV4)</div><div class='add'>+		bpf_skb_change_protocol(skb, ETH_P_IP);</div><div class='add'>+</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> </div><div class='ctx'> 		/* Due to header shrink, MSS can be upgraded. */</div><div class='del'>-		skb_increase_gso_size(shinfo, len_diff);</div><div class='add'>+		if (!(flags &amp; BPF_F_ADJ_ROOM_FIXED_GSO))</div><div class='add'>+			skb_increase_gso_size(shinfo, len_diff);</div><div class='add'>+</div><div class='ctx'> 		/* Header must be checked, and gso_segs recomputed. */</div><div class='ctx'> 		shinfo-&gt;gso_type |= SKB_GSO_DODGY;</div><div class='ctx'> 		shinfo-&gt;gso_segs = 0;</div><div class='hunk'>@@ -2836,55 +3653,112 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 __bpf_skb_max_len(const struct sk_buff *skb)</div><div class='add'>+#define BPF_SKB_MAX_LEN SKB_MAX_ALLOC</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(sk_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,</div><div class='add'>+	   u32, mode, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	return skb-&gt;dev ? skb-&gt;dev-&gt;mtu + skb-&gt;dev-&gt;hard_header_len :</div><div class='del'>-			  SKB_MAX_ALLOC;</div><div class='add'>+	u32 len_diff_abs = abs(len_diff);</div><div class='add'>+	bool shrink = len_diff &lt; 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags || mode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (unlikely(len_diff_abs &gt; 0xfffU))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (!shrink) {</div><div class='add'>+		ret = skb_cow(skb, len_diff);</div><div class='add'>+		if (unlikely(ret &lt; 0))</div><div class='add'>+			return ret;</div><div class='add'>+		__skb_push(skb, len_diff_abs);</div><div class='add'>+		memset(skb-&gt;data, 0, len_diff_abs);</div><div class='add'>+	} else {</div><div class='add'>+		if (unlikely(!pskb_may_pull(skb, len_diff_abs)))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		__skb_pull(skb, len_diff_abs);</div><div class='add'>+	}</div><div class='add'>+	if (tls_sw_has_ctx_rx(skb-&gt;sk)) {</div><div class='add'>+		struct strp_msg *rxm = strp_msg(skb);</div><div class='add'>+</div><div class='add'>+		rxm-&gt;full_len += len_diff;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff)</div><div class='add'>+static const struct bpf_func_proto sk_skb_adjust_room_proto = {</div><div class='add'>+	.func		= sk_skb_adjust_room,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,</div><div class='add'>+	   u32, mode, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	bool trans_same = skb-&gt;transport_header == skb-&gt;network_header;</div><div class='ctx'> 	u32 len_cur, len_diff_abs = abs(len_diff);</div><div class='ctx'> 	u32 len_min = bpf_skb_net_base_len(skb);</div><div class='del'>-	u32 len_max = __bpf_skb_max_len(skb);</div><div class='add'>+	u32 len_max = BPF_SKB_MAX_LEN;</div><div class='ctx'> 	__be16 proto = skb-&gt;protocol;</div><div class='ctx'> 	bool shrink = len_diff &lt; 0;</div><div class='add'>+	u32 off;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_ADJ_ROOM_MASK |</div><div class='add'>+			       BPF_F_ADJ_ROOM_NO_CSUM_RESET)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (unlikely(len_diff_abs &gt; 0xfffU))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (unlikely(proto != htons(ETH_P_IP) &amp;&amp;</div><div class='ctx'> 		     proto != htons(ETH_P_IPV6)))</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='add'>+	off = skb_mac_header_len(skb);</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case BPF_ADJ_ROOM_NET:</div><div class='add'>+		off += bpf_skb_net_base_len(skb);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_ADJ_ROOM_MAC:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BPF_F_ADJ_ROOM_DECAP_L3_MASK) {</div><div class='add'>+		if (!shrink)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		switch (flags &amp; BPF_F_ADJ_ROOM_DECAP_L3_MASK) {</div><div class='add'>+		case BPF_F_ADJ_ROOM_DECAP_L3_IPV4:</div><div class='add'>+			len_min = sizeof(struct iphdr);</div><div class='add'>+			break;</div><div class='add'>+		case BPF_F_ADJ_ROOM_DECAP_L3_IPV6:</div><div class='add'>+			len_min = sizeof(struct ipv6hdr);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	len_cur = skb-&gt;len - skb_network_offset(skb);</div><div class='del'>-	if (skb_transport_header_was_set(skb) &amp;&amp; !trans_same)</div><div class='del'>-		len_cur = skb_network_header_len(skb);</div><div class='ctx'> 	if ((shrink &amp;&amp; (len_diff_abs &gt;= len_cur ||</div><div class='ctx'> 			len_cur - len_diff_abs &lt; len_min)) ||</div><div class='ctx'> 	    (!shrink &amp;&amp; (skb-&gt;len + len_diff_abs &gt; len_max &amp;&amp;</div><div class='ctx'> 			 !skb_is_gso(skb))))</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = shrink ? bpf_skb_net_shrink(skb, len_diff_abs) :</div><div class='del'>-		       bpf_skb_net_grow(skb, len_diff_abs);</div><div class='add'>+	ret = shrink ? bpf_skb_net_shrink(skb, off, len_diff_abs, flags) :</div><div class='add'>+		       bpf_skb_net_grow(skb, off, len_diff_abs, flags);</div><div class='add'>+	if (!ret &amp;&amp; !(flags &amp; BPF_F_ADJ_ROOM_NO_CSUM_RESET))</div><div class='add'>+		__skb_reset_checksum_unnecessary(skb);</div><div class='ctx'> </div><div class='ctx'> 	bpf_compute_data_pointers(skb);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,</div><div class='del'>-	   u32, mode, u64, flags)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(flags))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (likely(mode == BPF_ADJ_ROOM_NET))</div><div class='del'>-		return bpf_skb_adjust_net(skb, len_diff);</div><div class='del'>-</div><div class='del'>-	return -ENOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct bpf_func_proto bpf_skb_adjust_room_proto = {</div><div class='ctx'> 	.func		= bpf_skb_adjust_room,</div><div class='ctx'> 	.gpl_only	= false,</div><div class='hunk'>@@ -2897,13 +3771,22 @@ static const struct bpf_func_proto bpf_skb_adjust_room_proto = {</div><div class='ctx'> </div><div class='ctx'> static u32 __bpf_skb_min_len(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u32 min_len = skb_network_offset(skb);</div><div class='add'>+	int offset = skb_network_offset(skb);</div><div class='add'>+	u32 min_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (skb_transport_header_was_set(skb))</div><div class='del'>-		min_len = skb_transport_offset(skb);</div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='del'>-		min_len = skb_checksum_start_offset(skb) +</div><div class='del'>-			  skb-&gt;csum_offset + sizeof(__sum16);</div><div class='add'>+	if (offset &gt; 0)</div><div class='add'>+		min_len = offset;</div><div class='add'>+	if (skb_transport_header_was_set(skb)) {</div><div class='add'>+		offset = skb_transport_offset(skb);</div><div class='add'>+		if (offset &gt; 0)</div><div class='add'>+			min_len = offset;</div><div class='add'>+	}</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+		offset = skb_checksum_start_offset(skb) +</div><div class='add'>+			 skb-&gt;csum_offset + sizeof(__sum16);</div><div class='add'>+		if (offset &gt; 0)</div><div class='add'>+			min_len = offset;</div><div class='add'>+	}</div><div class='ctx'> 	return min_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2926,7 +3809,7 @@ static int bpf_skb_trim_rcsum(struct sk_buff *skb, unsigned int new_len)</div><div class='ctx'> static inline int __bpf_skb_change_tail(struct sk_buff *skb, u32 new_len,</div><div class='ctx'> 					u64 flags)</div><div class='ctx'> {</div><div class='del'>-	u32 max_len = __bpf_skb_max_len(skb);</div><div class='add'>+	u32 max_len = BPF_SKB_MAX_LEN;</div><div class='ctx'> 	u32 min_len = __bpf_skb_min_len(skb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2984,10 +3867,7 @@ static const struct bpf_func_proto bpf_skb_change_tail_proto = {</div><div class='ctx'> BPF_CALL_3(sk_skb_change_tail, struct sk_buff *, skb, u32, new_len,</div><div class='ctx'> 	   u64, flags)</div><div class='ctx'> {</div><div class='del'>-	int ret = __bpf_skb_change_tail(skb, new_len, flags);</div><div class='del'>-</div><div class='del'>-	bpf_compute_data_end_sk_skb(skb);</div><div class='del'>-	return ret;</div><div class='add'>+	return __bpf_skb_change_tail(skb, new_len, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto sk_skb_change_tail_proto = {</div><div class='hunk'>@@ -3002,15 +3882,17 @@ static const struct bpf_func_proto sk_skb_change_tail_proto = {</div><div class='ctx'> static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room,</div><div class='ctx'> 					u64 flags)</div><div class='ctx'> {</div><div class='del'>-	u32 max_len = __bpf_skb_max_len(skb);</div><div class='add'>+	const u8 meta_len = skb_metadata_len(skb);</div><div class='add'>+	u32 max_len = BPF_SKB_MAX_LEN;</div><div class='ctx'> 	u32 new_len = skb-&gt;len + head_room;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(flags || (!skb_is_gso(skb) &amp;&amp; new_len &gt; max_len) ||</div><div class='add'>+	if (unlikely(flags || (int)head_room &lt; 0 ||</div><div class='add'>+		     (!skb_is_gso(skb) &amp;&amp; new_len &gt; max_len) ||</div><div class='ctx'> 		     new_len &lt; skb-&gt;len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = skb_cow(skb, head_room);</div><div class='add'>+	ret = skb_cow(skb, meta_len + head_room);</div><div class='ctx'> 	if (likely(!ret)) {</div><div class='ctx'> 		/* Idea for this helper is that we currently only</div><div class='ctx'> 		 * allow to expand on mac header. This means that</div><div class='hunk'>@@ -3022,8 +3904,10 @@ static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room,</div><div class='ctx'> 		 * for redirection into L2 device.</div><div class='ctx'> 		 */</div><div class='ctx'> 		__skb_push(skb, head_room);</div><div class='add'>+		skb_postpush_data_move(skb, head_room, 0);</div><div class='ctx'> 		memset(skb-&gt;data, 0, head_room);</div><div class='ctx'> 		skb_reset_mac_header(skb);</div><div class='add'>+		skb_reset_mac_len(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3050,10 +3934,7 @@ static const struct bpf_func_proto bpf_skb_change_head_proto = {</div><div class='ctx'> BPF_CALL_3(sk_skb_change_head, struct sk_buff *, skb, u32, head_room,</div><div class='ctx'> 	   u64, flags)</div><div class='ctx'> {</div><div class='del'>-	int ret = __bpf_skb_change_head(skb, head_room, flags);</div><div class='del'>-</div><div class='del'>-	bpf_compute_data_end_sk_skb(skb);</div><div class='del'>-	return ret;</div><div class='add'>+	return __bpf_skb_change_head(skb, head_room, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto sk_skb_change_head_proto = {</div><div class='hunk'>@@ -3064,6 +3945,28 @@ static const struct bpf_func_proto sk_skb_change_head_proto = {</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> 	.arg3_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_xdp_get_buff_len, struct xdp_buff*, xdp)</div><div class='add'>+{</div><div class='add'>+	return xdp_get_buff_len(xdp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_get_buff_len_proto = {</div><div class='add'>+	.func		= bpf_xdp_get_buff_len,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(bpf_xdp_get_buff_len_bpf_ids, struct, xdp_buff)</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_xdp_get_buff_len_trace_proto = {</div><div class='add'>+	.func		= bpf_xdp_get_buff_len,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID,</div><div class='add'>+	.arg1_btf_id	= &amp;bpf_xdp_get_buff_len_bpf_ids[0],</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned long xdp_get_metalen(const struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='ctx'> 	return xdp_data_meta_unsupported(xdp) ? 0 :</div><div class='hunk'>@@ -3098,17 +4001,266 @@ static const struct bpf_func_proto bpf_xdp_adjust_head_proto = {</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off,</div><div class='add'>+		      void *buf, unsigned long len, bool flush)</div><div class='add'>+{</div><div class='add'>+	unsigned long ptr_len, ptr_off = 0;</div><div class='add'>+	skb_frag_t *next_frag, *end_frag;</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+	void *src, *dst;</div><div class='add'>+	u8 *ptr_buf;</div><div class='add'>+</div><div class='add'>+	if (likely(xdp-&gt;data_end - xdp-&gt;data &gt;= off + len)) {</div><div class='add'>+		src = flush ? buf : xdp-&gt;data + off;</div><div class='add'>+		dst = flush ? xdp-&gt;data + off : buf;</div><div class='add'>+		memcpy(dst, src, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	end_frag = &amp;sinfo-&gt;frags[sinfo-&gt;nr_frags];</div><div class='add'>+	next_frag = &amp;sinfo-&gt;frags[0];</div><div class='add'>+</div><div class='add'>+	ptr_len = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	ptr_buf = xdp-&gt;data;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		if (off &lt; ptr_off + ptr_len) {</div><div class='add'>+			unsigned long copy_off = off - ptr_off;</div><div class='add'>+			unsigned long copy_len = min(len, ptr_len - copy_off);</div><div class='add'>+</div><div class='add'>+			src = flush ? buf : ptr_buf + copy_off;</div><div class='add'>+			dst = flush ? ptr_buf + copy_off : buf;</div><div class='add'>+			memcpy(dst, src, copy_len);</div><div class='add'>+</div><div class='add'>+			off += copy_len;</div><div class='add'>+			len -= copy_len;</div><div class='add'>+			buf += copy_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!len || next_frag == end_frag)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ptr_off += ptr_len;</div><div class='add'>+		ptr_buf = skb_frag_address(next_frag);</div><div class='add'>+		ptr_len = skb_frag_size(next_frag);</div><div class='add'>+		next_frag++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *bpf_xdp_pointer(struct xdp_buff *xdp, u32 offset, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 size = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+	void *addr = xdp-&gt;data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset &gt; 0xffff || len &gt; 0xffff))</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset + len &gt; xdp_get_buff_len(xdp)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (likely(offset &lt; size)) /* linear area */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	offset -= size;</div><div class='add'>+	for (i = 0; i &lt; sinfo-&gt;nr_frags; i++) { /* paged area */</div><div class='add'>+		u32 frag_size = skb_frag_size(&amp;sinfo-&gt;frags[i]);</div><div class='add'>+</div><div class='add'>+		if  (offset &lt; frag_size) {</div><div class='add'>+			addr = skb_frag_address(&amp;sinfo-&gt;frags[i]);</div><div class='add'>+			size = frag_size;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		offset -= frag_size;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return offset + len &lt;= size ? addr + offset : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_xdp_load_bytes, struct xdp_buff *, xdp, u32, offset,</div><div class='add'>+	   void *, buf, u32, len)</div><div class='add'>+{</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	ptr = bpf_xdp_pointer(xdp, offset, len);</div><div class='add'>+	if (IS_ERR(ptr))</div><div class='add'>+		return PTR_ERR(ptr);</div><div class='add'>+</div><div class='add'>+	if (!ptr)</div><div class='add'>+		bpf_xdp_copy_buf(xdp, offset, buf, len, false);</div><div class='add'>+	else</div><div class='add'>+		memcpy(buf, ptr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_load_bytes_proto = {</div><div class='add'>+	.func		= bpf_xdp_load_bytes,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg4_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __bpf_xdp_load_bytes(struct xdp_buff *xdp, u32 offset, void *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ____bpf_xdp_load_bytes(xdp, offset, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_xdp_store_bytes, struct xdp_buff *, xdp, u32, offset,</div><div class='add'>+	   void *, buf, u32, len)</div><div class='add'>+{</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	ptr = bpf_xdp_pointer(xdp, offset, len);</div><div class='add'>+	if (IS_ERR(ptr))</div><div class='add'>+		return PTR_ERR(ptr);</div><div class='add'>+</div><div class='add'>+	if (!ptr)</div><div class='add'>+		bpf_xdp_copy_buf(xdp, offset, buf, len, true);</div><div class='add'>+	else</div><div class='add'>+		memcpy(ptr, buf, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_store_bytes_proto = {</div><div class='add'>+	.func		= bpf_xdp_store_bytes,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg4_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __bpf_xdp_store_bytes(struct xdp_buff *xdp, u32 offset, void *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ____bpf_xdp_store_bytes(xdp, offset, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_xdp_frags_increase_tail(struct xdp_buff *xdp, int offset)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	skb_frag_t *frag = &amp;sinfo-&gt;frags[sinfo-&gt;nr_frags - 1];</div><div class='add'>+	struct xdp_rxq_info *rxq = xdp-&gt;rxq;</div><div class='add'>+	unsigned int tailroom;</div><div class='add'>+</div><div class='add'>+	if (!rxq-&gt;frag_size || rxq-&gt;frag_size &gt; xdp-&gt;frame_sz)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	tailroom = rxq-&gt;frag_size - skb_frag_size(frag) - skb_frag_off(frag);</div><div class='add'>+	if (unlikely(offset &gt; tailroom))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(skb_frag_address(frag) + skb_frag_size(frag), 0, offset);</div><div class='add'>+	skb_frag_size_add(frag, offset);</div><div class='add'>+	sinfo-&gt;xdp_frags_size += offset;</div><div class='add'>+	if (rxq-&gt;mem.type == MEM_TYPE_XSK_BUFF_POOL)</div><div class='add'>+		xsk_buff_get_tail(xdp)-&gt;data_end += offset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct xdp_buff *bpf_xdp_shrink_data_zc(struct xdp_buff *xdp, int shrink,</div><div class='add'>+					       bool tail, bool release)</div><div class='add'>+{</div><div class='add'>+	struct xdp_buff *zc_frag = tail ? xsk_buff_get_tail(xdp) :</div><div class='add'>+					  xsk_buff_get_head(xdp);</div><div class='add'>+</div><div class='add'>+	if (release) {</div><div class='add'>+		xsk_buff_del_frag(zc_frag);</div><div class='add'>+	} else {</div><div class='add'>+		if (tail)</div><div class='add'>+			zc_frag-&gt;data_end -= shrink;</div><div class='add'>+		else</div><div class='add'>+			zc_frag-&gt;data += shrink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return zc_frag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_xdp_shrink_data(struct xdp_buff *xdp, skb_frag_t *frag,</div><div class='add'>+				int shrink, bool tail)</div><div class='add'>+{</div><div class='add'>+	enum xdp_mem_type mem_type = xdp-&gt;rxq-&gt;mem.type;</div><div class='add'>+	bool release = skb_frag_size(frag) == shrink;</div><div class='add'>+	netmem_ref netmem = skb_frag_netmem(frag);</div><div class='add'>+	struct xdp_buff *zc_frag = NULL;</div><div class='add'>+</div><div class='add'>+	if (mem_type == MEM_TYPE_XSK_BUFF_POOL) {</div><div class='add'>+		netmem = 0;</div><div class='add'>+		zc_frag = bpf_xdp_shrink_data_zc(xdp, shrink, tail, release);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (release) {</div><div class='add'>+		__xdp_return(netmem, mem_type, false, zc_frag);</div><div class='add'>+	} else {</div><div class='add'>+		if (!tail)</div><div class='add'>+			skb_frag_off_add(frag, shrink);</div><div class='add'>+		skb_frag_size_sub(frag, shrink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return release;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_xdp_frags_shrink_tail(struct xdp_buff *xdp, int offset)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	int i, n_frags_free = 0, len_free = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset &gt; (int)xdp_get_buff_len(xdp) - ETH_HLEN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = sinfo-&gt;nr_frags - 1; i &gt;= 0 &amp;&amp; offset &gt; 0; i--) {</div><div class='add'>+		skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+		int shrink = min_t(int, offset, skb_frag_size(frag));</div><div class='add'>+</div><div class='add'>+		len_free += shrink;</div><div class='add'>+		offset -= shrink;</div><div class='add'>+		if (bpf_xdp_shrink_data(xdp, frag, shrink, true))</div><div class='add'>+			n_frags_free++;</div><div class='add'>+	}</div><div class='add'>+	sinfo-&gt;nr_frags -= n_frags_free;</div><div class='add'>+	sinfo-&gt;xdp_frags_size -= len_free;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!sinfo-&gt;nr_frags)) {</div><div class='add'>+		xdp_buff_clear_frags_flag(xdp);</div><div class='add'>+		xdp_buff_clear_frag_pfmemalloc(xdp);</div><div class='add'>+		xdp-&gt;data_end -= offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> BPF_CALL_2(bpf_xdp_adjust_tail, struct xdp_buff *, xdp, int, offset)</div><div class='ctx'> {</div><div class='add'>+	void *data_hard_end = xdp_data_hard_end(xdp); /* use xdp-&gt;frame_sz */</div><div class='ctx'> 	void *data_end = xdp-&gt;data_end + offset;</div><div class='ctx'> </div><div class='del'>-	/* only shrinking is allowed for now. */</div><div class='del'>-	if (unlikely(offset &gt;= 0))</div><div class='add'>+	if (unlikely(xdp_buff_has_frags(xdp))) { /* non-linear xdp buff */</div><div class='add'>+		if (offset &lt; 0)</div><div class='add'>+			return bpf_xdp_frags_shrink_tail(xdp, -offset);</div><div class='add'>+</div><div class='add'>+		return bpf_xdp_frags_increase_tail(xdp, offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Notice that xdp_data_hard_end have reserved some tailroom */</div><div class='add'>+	if (unlikely(data_end &gt; data_hard_end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(data_end &lt; xdp-&gt;data + ETH_HLEN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Clear memory area on grow, can contain uninit kernel memory */</div><div class='add'>+	if (offset &gt; 0)</div><div class='add'>+		memset(xdp-&gt;data_end, 0, offset);</div><div class='add'>+</div><div class='ctx'> 	xdp-&gt;data_end = data_end;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3133,8 +4285,7 @@ BPF_CALL_2(bpf_xdp_adjust_meta, struct xdp_buff *, xdp, int, offset)</div><div class='ctx'> 	if (unlikely(meta &lt; xdp_frame_end ||</div><div class='ctx'> 		     meta &gt; xdp-&gt;data))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (unlikely((metalen &amp; (sizeof(__u32) - 1)) ||</div><div class='del'>-		     (metalen &gt; 32)))</div><div class='add'>+	if (unlikely(xdp_metalen_invalid(metalen)))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	xdp-&gt;data_meta = meta;</div><div class='hunk'>@@ -3150,276 +4301,338 @@ static const struct bpf_func_proto bpf_xdp_adjust_meta_proto = {</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __bpf_tx_xdp(struct net_device *dev,</div><div class='del'>-			struct bpf_map *map,</div><div class='del'>-			struct xdp_buff *xdp,</div><div class='del'>-			u32 index)</div><div class='add'>+/**</div><div class='add'>+ * DOC: xdp redirect</div><div class='add'>+ *</div><div class='add'>+ * XDP_REDIRECT works by a three-step process, implemented in the functions</div><div class='add'>+ * below:</div><div class='add'>+ *</div><div class='add'>+ * 1. The bpf_redirect() and bpf_redirect_map() helpers will lookup the target</div><div class='add'>+ *    of the redirect and store it (along with some other metadata) in a per-CPU</div><div class='add'>+ *    struct bpf_redirect_info.</div><div class='add'>+ *</div><div class='add'>+ * 2. When the program returns the XDP_REDIRECT return code, the driver will</div><div class='add'>+ *    call xdp_do_redirect() which will use the information in struct</div><div class='add'>+ *    bpf_redirect_info to actually enqueue the frame into a map type-specific</div><div class='add'>+ *    bulk queue structure.</div><div class='add'>+ *</div><div class='add'>+ * 3. Before exiting its NAPI poll loop, the driver will call</div><div class='add'>+ *    xdp_do_flush(), which will flush all the different bulk queues,</div><div class='add'>+ *    thus completing the redirect. Note that xdp_do_flush() must be</div><div class='add'>+ *    called before napi_complete_done() in the driver, as the</div><div class='add'>+ *    XDP_REDIRECT logic relies on being inside a single NAPI instance</div><div class='add'>+ *    through to the xdp_do_flush() call for RCU protection of all</div><div class='add'>+ *    in-kernel data structures.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Pointers to the map entries will be kept around for this whole sequence of</div><div class='add'>+ * steps, protected by RCU. However, there is no top-level rcu_read_lock() in</div><div class='add'>+ * the core code; instead, the RCU protection relies on everything happening</div><div class='add'>+ * inside a single NAPI poll sequence, which means it's between a pair of calls</div><div class='add'>+ * to local_bh_disable()/local_bh_enable().</div><div class='add'>+ *</div><div class='add'>+ * The map entries are marked as __rcu and the map code makes sure to</div><div class='add'>+ * dereference those pointers with rcu_dereference_check() in a way that works</div><div class='add'>+ * for both sections that to hold an rcu_read_lock() and sections that are</div><div class='add'>+ * called from NAPI without a separate rcu_read_lock(). The code below does not</div><div class='add'>+ * use RCU annotations, but relies on those in the map code.</div><div class='add'>+ */</div><div class='add'>+void xdp_do_flush(void)</div><div class='ctx'> {</div><div class='del'>-	struct xdp_frame *xdpf;</div><div class='del'>-	int err, sent;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;netdev_ops-&gt;ndo_xdp_xmit) {</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = xdp_ok_fwd_dev(dev, xdp-&gt;data_end - xdp-&gt;data);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	xdpf = convert_to_xdp_frame(xdp);</div><div class='del'>-	if (unlikely(!xdpf))</div><div class='del'>-		return -EOVERFLOW;</div><div class='add'>+	struct list_head *lh_map, *lh_dev, *lh_xsk;</div><div class='ctx'> </div><div class='del'>-	sent = dev-&gt;netdev_ops-&gt;ndo_xdp_xmit(dev, 1, &amp;xdpf, XDP_XMIT_FLUSH);</div><div class='del'>-	if (sent &lt;= 0)</div><div class='del'>-		return sent;</div><div class='del'>-	return 0;</div><div class='add'>+	bpf_net_ctx_get_all_used_flush_lists(&amp;lh_map, &amp;lh_dev, &amp;lh_xsk);</div><div class='add'>+	if (lh_dev)</div><div class='add'>+		__dev_flush(lh_dev);</div><div class='add'>+	if (lh_map)</div><div class='add'>+		__cpu_map_flush(lh_map);</div><div class='add'>+	if (lh_xsk)</div><div class='add'>+		__xsk_map_flush(lh_xsk);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_do_flush);</div><div class='ctx'> </div><div class='del'>-static int __bpf_tx_xdp_map(struct net_device *dev_rx, void *fwd,</div><div class='del'>-			    struct bpf_map *map,</div><div class='del'>-			    struct xdp_buff *xdp,</div><div class='del'>-			    u32 index)</div><div class='add'>+#if defined(CONFIG_DEBUG_NET) &amp;&amp; defined(CONFIG_BPF_SYSCALL)</div><div class='add'>+void xdp_do_check_flushed(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	struct list_head *lh_map, *lh_dev, *lh_xsk;</div><div class='add'>+	bool missed = false;</div><div class='ctx'> </div><div class='del'>-	switch (map-&gt;map_type) {</div><div class='del'>-	case BPF_MAP_TYPE_DEVMAP: {</div><div class='del'>-		struct bpf_dtab_netdev *dst = fwd;</div><div class='del'>-</div><div class='del'>-		err = dev_map_enqueue(dst, xdp, dev_rx);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		__dev_map_insert_ctx(map, index);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BPF_MAP_TYPE_CPUMAP: {</div><div class='del'>-		struct bpf_cpu_map_entry *rcpu = fwd;</div><div class='del'>-</div><div class='del'>-		err = cpu_map_enqueue(rcpu, xdp, dev_rx);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		__cpu_map_insert_ctx(map, index);</div><div class='del'>-		break;</div><div class='add'>+	bpf_net_ctx_get_all_used_flush_lists(&amp;lh_map, &amp;lh_dev, &amp;lh_xsk);</div><div class='add'>+	if (lh_dev) {</div><div class='add'>+		__dev_flush(lh_dev);</div><div class='add'>+		missed = true;</div><div class='ctx'> 	}</div><div class='del'>-	case BPF_MAP_TYPE_XSKMAP: {</div><div class='del'>-		struct xdp_sock *xs = fwd;</div><div class='del'>-</div><div class='del'>-		err = __xsk_map_redirect(map, xdp, xs);</div><div class='del'>-		return err;</div><div class='add'>+	if (lh_map) {</div><div class='add'>+		__cpu_map_flush(lh_map);</div><div class='add'>+		missed = true;</div><div class='ctx'> 	}</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (lh_xsk) {</div><div class='add'>+		__xsk_map_flush(lh_xsk);</div><div class='add'>+		missed = true;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-void xdp_do_flush_map(void)</div><div class='del'>-{</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-	struct bpf_map *map = ri-&gt;map_to_flush;</div><div class='del'>-</div><div class='del'>-	ri-&gt;map_to_flush = NULL;</div><div class='del'>-	if (map) {</div><div class='del'>-		switch (map-&gt;map_type) {</div><div class='del'>-		case BPF_MAP_TYPE_DEVMAP:</div><div class='del'>-			__dev_map_flush(map);</div><div class='del'>-			break;</div><div class='del'>-		case BPF_MAP_TYPE_CPUMAP:</div><div class='del'>-			__cpu_map_flush(map);</div><div class='del'>-			break;</div><div class='del'>-		case BPF_MAP_TYPE_XSKMAP:</div><div class='del'>-			__xsk_map_flush(map);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	WARN_ONCE(missed, "Missing xdp_do_flush() invocation after NAPI by %ps\n",</div><div class='add'>+		  napi-&gt;poll);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_do_flush_map);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void *__xdp_map_lookup_elem(struct bpf_map *map, u32 index)</div><div class='del'>-{</div><div class='del'>-	switch (map-&gt;map_type) {</div><div class='del'>-	case BPF_MAP_TYPE_DEVMAP:</div><div class='del'>-		return __dev_map_lookup_elem(map, index);</div><div class='del'>-	case BPF_MAP_TYPE_CPUMAP:</div><div class='del'>-		return __cpu_map_lookup_elem(map, index);</div><div class='del'>-	case BPF_MAP_TYPE_XSKMAP:</div><div class='del'>-		return __xsk_map_lookup_elem(map, index);</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(bpf_master_redirect_enabled_key);</div><div class='add'>+EXPORT_SYMBOL_GPL(bpf_master_redirect_enabled_key);</div><div class='ctx'> </div><div class='del'>-void bpf_clear_redirect_map(struct bpf_map *map)</div><div class='add'>+u32 xdp_master_redirect(struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri;</div><div class='del'>-	int cpu;</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	struct net_device *master, *slave;</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		ri = per_cpu_ptr(&amp;bpf_redirect_info, cpu);</div><div class='del'>-		/* Avoid polluting remote cacheline due to writes if</div><div class='del'>-		 * not needed. Once we pass this test, we need the</div><div class='del'>-		 * cmpxchg() to make sure it hasn't been changed in</div><div class='del'>-		 * the meantime by remote CPU.</div><div class='add'>+	master = netdev_master_upper_dev_get_rcu(xdp-&gt;rxq-&gt;dev);</div><div class='add'>+	slave = master-&gt;netdev_ops-&gt;ndo_xdp_get_xmit_slave(master, xdp);</div><div class='add'>+	if (slave &amp;&amp; slave != xdp-&gt;rxq-&gt;dev) {</div><div class='add'>+		/* The target device is different from the receiving device, so</div><div class='add'>+		 * redirect it to the new device.</div><div class='add'>+		 * Using XDP_REDIRECT gets the correct behaviour from XDP enabled</div><div class='add'>+		 * drivers to unmap the packet from their rx ring.</div><div class='ctx'> 		 */</div><div class='del'>-		if (unlikely(READ_ONCE(ri-&gt;map) == map))</div><div class='del'>-			cmpxchg(&amp;ri-&gt;map, map, NULL);</div><div class='add'>+		ri-&gt;tgt_index = slave-&gt;ifindex;</div><div class='add'>+		ri-&gt;map_id = INT_MAX;</div><div class='add'>+		ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='add'>+		return XDP_REDIRECT;</div><div class='ctx'> 	}</div><div class='add'>+	return XDP_TX;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_master_redirect);</div><div class='ctx'> </div><div class='del'>-static int xdp_do_redirect_map(struct net_device *dev, struct xdp_buff *xdp,</div><div class='del'>-			       struct bpf_prog *xdp_prog, struct bpf_map *map)</div><div class='add'>+static inline int __xdp_do_redirect_xsk(struct bpf_redirect_info *ri,</div><div class='add'>+					const struct net_device *dev,</div><div class='add'>+					struct xdp_buff *xdp,</div><div class='add'>+					const struct bpf_prog *xdp_prog)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-	u32 index = ri-&gt;ifindex;</div><div class='del'>-	void *fwd = NULL;</div><div class='add'>+	enum bpf_map_type map_type = ri-&gt;map_type;</div><div class='add'>+	void *fwd = ri-&gt;tgt_value;</div><div class='add'>+	u32 map_id = ri-&gt;map_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ri-&gt;ifindex = 0;</div><div class='del'>-	WRITE_ONCE(ri-&gt;map, NULL);</div><div class='del'>-</div><div class='del'>-	fwd = __xdp_map_lookup_elem(map, index);</div><div class='del'>-	if (!fwd) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	if (ri-&gt;map_to_flush &amp;&amp; ri-&gt;map_to_flush != map)</div><div class='del'>-		xdp_do_flush_map();</div><div class='add'>+	ri-&gt;map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */</div><div class='add'>+	ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='ctx'> </div><div class='del'>-	err = __bpf_tx_xdp_map(dev, fwd, map, xdp, index);</div><div class='add'>+	err = __xsk_map_redirect(fwd, xdp);</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	ri-&gt;map_to_flush = map;</div><div class='del'>-	_trace_xdp_redirect_map(dev, xdp_prog, fwd, map, index);</div><div class='add'>+	_trace_xdp_redirect_map(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map, index, err);</div><div class='add'>+	_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,</div><div class='del'>-		    struct bpf_prog *xdp_prog)</div><div class='add'>+static __always_inline int</div><div class='add'>+__xdp_do_redirect_frame(struct bpf_redirect_info *ri, struct net_device *dev,</div><div class='add'>+			struct xdp_frame *xdpf,</div><div class='add'>+			const struct bpf_prog *xdp_prog)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-	struct bpf_map *map = READ_ONCE(ri-&gt;map);</div><div class='del'>-	struct net_device *fwd;</div><div class='del'>-	u32 index = ri-&gt;ifindex;</div><div class='add'>+	enum bpf_map_type map_type = ri-&gt;map_type;</div><div class='add'>+	void *fwd = ri-&gt;tgt_value;</div><div class='add'>+	u32 map_id = ri-&gt;map_id;</div><div class='add'>+	u32 flags = ri-&gt;flags;</div><div class='add'>+	struct bpf_map *map;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (map)</div><div class='del'>-		return xdp_do_redirect_map(dev, xdp, xdp_prog, map);</div><div class='add'>+	ri-&gt;map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */</div><div class='add'>+	ri-&gt;flags = 0;</div><div class='add'>+	ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='ctx'> </div><div class='del'>-	fwd = dev_get_by_index_rcu(dev_net(dev), index);</div><div class='del'>-	ri-&gt;ifindex = 0;</div><div class='del'>-	if (unlikely(!fwd)) {</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+	if (unlikely(!xdpf)) {</div><div class='add'>+		err = -EOVERFLOW;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = __bpf_tx_xdp(fwd, NULL, xdp, 0);</div><div class='add'>+	switch (map_type) {</div><div class='add'>+	case BPF_MAP_TYPE_DEVMAP:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BPF_MAP_TYPE_DEVMAP_HASH:</div><div class='add'>+		if (unlikely(flags &amp; BPF_F_BROADCAST)) {</div><div class='add'>+			map = READ_ONCE(ri-&gt;map);</div><div class='add'>+</div><div class='add'>+			/* The map pointer is cleared when the map is being torn</div><div class='add'>+			 * down by dev_map_free()</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(!map)) {</div><div class='add'>+				err = -ENOENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(ri-&gt;map, NULL);</div><div class='add'>+			err = dev_map_enqueue_multi(xdpf, dev, map,</div><div class='add'>+						    flags &amp; BPF_F_EXCLUDE_INGRESS);</div><div class='add'>+		} else {</div><div class='add'>+			err = dev_map_enqueue(fwd, xdpf, dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BPF_MAP_TYPE_CPUMAP:</div><div class='add'>+		err = cpu_map_enqueue(fwd, xdpf, dev);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_MAP_TYPE_UNSPEC:</div><div class='add'>+		if (map_id == INT_MAX) {</div><div class='add'>+			fwd = dev_get_by_index_rcu(dev_net(dev), ri-&gt;tgt_index);</div><div class='add'>+			if (unlikely(!fwd)) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			err = dev_xdp_enqueue(fwd, xdpf, dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		err = -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	_trace_xdp_redirect(dev, xdp_prog, index);</div><div class='add'>+	_trace_xdp_redirect_map(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	_trace_xdp_redirect_err(dev, xdp_prog, index, err);</div><div class='add'>+	_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,</div><div class='add'>+		    const struct bpf_prog *xdp_prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	enum bpf_map_type map_type = ri-&gt;map_type;</div><div class='add'>+</div><div class='add'>+	if (map_type == BPF_MAP_TYPE_XSKMAP)</div><div class='add'>+		return __xdp_do_redirect_xsk(ri, dev, xdp, xdp_prog);</div><div class='add'>+</div><div class='add'>+	return __xdp_do_redirect_frame(ri, dev, xdp_convert_buff_to_frame(xdp),</div><div class='add'>+				       xdp_prog);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_do_redirect);</div><div class='ctx'> </div><div class='add'>+int xdp_do_redirect_frame(struct net_device *dev, struct xdp_buff *xdp,</div><div class='add'>+			  struct xdp_frame *xdpf,</div><div class='add'>+			  const struct bpf_prog *xdp_prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	enum bpf_map_type map_type = ri-&gt;map_type;</div><div class='add'>+</div><div class='add'>+	if (map_type == BPF_MAP_TYPE_XSKMAP)</div><div class='add'>+		return __xdp_do_redirect_xsk(ri, dev, xdp, xdp_prog);</div><div class='add'>+</div><div class='add'>+	return __xdp_do_redirect_frame(ri, dev, xdpf, xdp_prog);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_do_redirect_frame);</div><div class='add'>+</div><div class='ctx'> static int xdp_do_generic_redirect_map(struct net_device *dev,</div><div class='ctx'> 				       struct sk_buff *skb,</div><div class='ctx'> 				       struct xdp_buff *xdp,</div><div class='del'>-				       struct bpf_prog *xdp_prog,</div><div class='del'>-				       struct bpf_map *map)</div><div class='add'>+				       const struct bpf_prog *xdp_prog,</div><div class='add'>+				       void *fwd, enum bpf_map_type map_type,</div><div class='add'>+				       u32 map_id, u32 flags)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-	u32 index = ri-&gt;ifindex;</div><div class='del'>-	void *fwd = NULL;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ri-&gt;ifindex = 0;</div><div class='del'>-	WRITE_ONCE(ri-&gt;map, NULL);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	fwd = __xdp_map_lookup_elem(map, index);</div><div class='del'>-	if (unlikely(!fwd)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='add'>+	switch (map_type) {</div><div class='add'>+	case BPF_MAP_TYPE_DEVMAP:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BPF_MAP_TYPE_DEVMAP_HASH:</div><div class='add'>+		if (unlikely(flags &amp; BPF_F_BROADCAST)) {</div><div class='add'>+			map = READ_ONCE(ri-&gt;map);</div><div class='ctx'> </div><div class='del'>-	if (map-&gt;map_type == BPF_MAP_TYPE_DEVMAP) {</div><div class='del'>-		struct bpf_dtab_netdev *dst = fwd;</div><div class='add'>+			/* The map pointer is cleared when the map is being torn</div><div class='add'>+			 * down by dev_map_free()</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(!map)) {</div><div class='add'>+				err = -ENOENT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		err = dev_map_generic_redirect(dst, skb, xdp_prog);</div><div class='add'>+			WRITE_ONCE(ri-&gt;map, NULL);</div><div class='add'>+			err = dev_map_redirect_multi(dev, skb, xdp_prog, map,</div><div class='add'>+						     flags &amp; BPF_F_EXCLUDE_INGRESS);</div><div class='add'>+		} else {</div><div class='add'>+			err = dev_map_generic_redirect(fwd, skb, xdp_prog);</div><div class='add'>+		}</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			goto err;</div><div class='del'>-	} else if (map-&gt;map_type == BPF_MAP_TYPE_XSKMAP) {</div><div class='del'>-		struct xdp_sock *xs = fwd;</div><div class='del'>-</div><div class='del'>-		err = xsk_generic_rcv(xs, xdp);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_MAP_TYPE_XSKMAP:</div><div class='add'>+		err = xsk_generic_rcv(fwd, xdp);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		consume_skb(skb);</div><div class='del'>-	} else {</div><div class='del'>-		/* TODO: Handle BPF_MAP_TYPE_CPUMAP */</div><div class='add'>+		break;</div><div class='add'>+	case BPF_MAP_TYPE_CPUMAP:</div><div class='add'>+		err = cpu_map_generic_redirect(fwd, skb);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		err = -EBADRQC;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_trace_xdp_redirect_map(dev, xdp_prog, fwd, map, index);</div><div class='add'>+	_trace_xdp_redirect_map(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map, index, err);</div><div class='add'>+	_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map_type, map_id, ri-&gt;tgt_index, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct xdp_buff *xdp, struct bpf_prog *xdp_prog)</div><div class='del'>-{</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-	struct bpf_map *map = READ_ONCE(ri-&gt;map);</div><div class='del'>-	u32 index = ri-&gt;ifindex;</div><div class='del'>-	struct net_device *fwd;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (map)</div><div class='del'>-		return xdp_do_generic_redirect_map(dev, skb, xdp, xdp_prog,</div><div class='del'>-						   map);</div><div class='del'>-	ri-&gt;ifindex = 0;</div><div class='del'>-	fwd = dev_get_by_index_rcu(dev_net(dev), index);</div><div class='del'>-	if (unlikely(!fwd)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='add'>+			    struct xdp_buff *xdp,</div><div class='add'>+			    const struct bpf_prog *xdp_prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='add'>+	enum bpf_map_type map_type = ri-&gt;map_type;</div><div class='add'>+	void *fwd = ri-&gt;tgt_value;</div><div class='add'>+	u32 map_id = ri-&gt;map_id;</div><div class='add'>+	u32 flags = ri-&gt;flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = xdp_ok_fwd_dev(fwd, skb-&gt;len);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto err;</div><div class='add'>+	ri-&gt;map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */</div><div class='add'>+	ri-&gt;flags = 0;</div><div class='add'>+	ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = fwd;</div><div class='del'>-	_trace_xdp_redirect(dev, xdp_prog, index);</div><div class='del'>-	generic_xdp_tx(skb, xdp_prog);</div><div class='del'>-	return 0;</div><div class='add'>+	if (map_type == BPF_MAP_TYPE_UNSPEC &amp;&amp; map_id == INT_MAX) {</div><div class='add'>+		fwd = dev_get_by_index_rcu(dev_net(dev), ri-&gt;tgt_index);</div><div class='add'>+		if (unlikely(!fwd)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = xdp_ok_fwd_dev(fwd, skb-&gt;len);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = fwd;</div><div class='add'>+		_trace_xdp_redirect(dev, xdp_prog, ri-&gt;tgt_index);</div><div class='add'>+		generic_xdp_tx(skb, xdp_prog);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xdp_do_generic_redirect_map(dev, skb, xdp, xdp_prog, fwd, map_type, map_id, flags);</div><div class='ctx'> err:</div><div class='del'>-	_trace_xdp_redirect_err(dev, xdp_prog, index, err);</div><div class='add'>+	_trace_xdp_redirect_err(dev, xdp_prog, ri-&gt;tgt_index, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_do_generic_redirect);</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_2(bpf_xdp_redirect, u32, ifindex, u64, flags)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags))</div><div class='ctx'> 		return XDP_ABORTED;</div><div class='ctx'> </div><div class='del'>-	ri-&gt;ifindex = ifindex;</div><div class='del'>-	ri-&gt;flags = flags;</div><div class='del'>-	WRITE_ONCE(ri-&gt;map, NULL);</div><div class='add'>+	/* NB! Map type UNSPEC and map_id == INT_MAX (never generated</div><div class='add'>+	 * by map_idr) is used for ifindex based XDP redirect.</div><div class='add'>+	 */</div><div class='add'>+	ri-&gt;tgt_index = ifindex;</div><div class='add'>+	ri-&gt;map_id = INT_MAX;</div><div class='add'>+	ri-&gt;map_type = BPF_MAP_TYPE_UNSPEC;</div><div class='ctx'> </div><div class='ctx'> 	return XDP_REDIRECT;</div><div class='ctx'> }</div><div class='hunk'>@@ -3432,19 +4645,10 @@ static const struct bpf_func_proto bpf_xdp_redirect_proto = {</div><div class='ctx'> 	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_3(bpf_xdp_redirect_map, struct bpf_map *, map, u32, ifindex,</div><div class='add'>+BPF_CALL_3(bpf_xdp_redirect_map, struct bpf_map *, map, u64, key,</div><div class='ctx'> 	   u64, flags)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='del'>-</div><div class='del'>-	if (unlikely(flags))</div><div class='del'>-		return XDP_ABORTED;</div><div class='del'>-</div><div class='del'>-	ri-&gt;ifindex = ifindex;</div><div class='del'>-	ri-&gt;flags = flags;</div><div class='del'>-	WRITE_ONCE(ri-&gt;map, map);</div><div class='del'>-</div><div class='del'>-	return XDP_REDIRECT;</div><div class='add'>+	return map-&gt;ops-&gt;map_redirect(map, key, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_xdp_redirect_map_proto = {</div><div class='hunk'>@@ -3476,7 +4680,7 @@ BPF_CALL_5(bpf_skb_event_output, struct sk_buff *, skb, struct bpf_map *, map,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~(BPF_F_CTXLEN_MASK | BPF_F_INDEX_MASK)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (unlikely(skb_size &gt; skb-&gt;len))</div><div class='add'>+	if (unlikely(!skb || skb_size &gt; skb-&gt;len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return bpf_event_output(map, flags, meta, meta_size, skb, skb_size,</div><div class='hunk'>@@ -3490,7 +4694,21 @@ static const struct bpf_func_proto bpf_skb_event_output_proto = {</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='ctx'> 	.arg3_type	= ARG_ANYTHING,</div><div class='del'>-	.arg4_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(bpf_skb_output_btf_ids, struct, sk_buff)</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skb_output_proto = {</div><div class='add'>+	.func		= bpf_skb_event_output,</div><div class='add'>+	.gpl_only	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID,</div><div class='add'>+	.arg1_btf_id	= &amp;bpf_skb_output_btf_ids[0],</div><div class='add'>+	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg5_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3507,7 +4725,8 @@ BPF_CALL_4(bpf_skb_get_tunnel_key, struct sk_buff *, skb, struct bpf_tunnel_key</div><div class='ctx'> 	void *to_orig = to;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!info || (flags &amp; ~(BPF_F_TUNINFO_IPV6)))) {</div><div class='add'>+	if (unlikely(!info || (flags &amp; ~(BPF_F_TUNINFO_IPV6 |</div><div class='add'>+					 BPF_F_TUNINFO_FLAGS)))) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_clear;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3518,6 +4737,7 @@ BPF_CALL_4(bpf_skb_get_tunnel_key, struct sk_buff *, skb, struct bpf_tunnel_key</div><div class='ctx'> 	if (unlikely(size != sizeof(struct bpf_tunnel_key))) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		switch (size) {</div><div class='add'>+		case offsetof(struct bpf_tunnel_key, local_ipv6[0]):</div><div class='ctx'> 		case offsetof(struct bpf_tunnel_key, tunnel_label):</div><div class='ctx'> 		case offsetof(struct bpf_tunnel_key, tunnel_ext):</div><div class='ctx'> 			goto set_compat;</div><div class='hunk'>@@ -3538,15 +4758,22 @@ set_compat:</div><div class='ctx'> 	to-&gt;tunnel_id = be64_to_cpu(info-&gt;key.tun_id);</div><div class='ctx'> 	to-&gt;tunnel_tos = info-&gt;key.tos;</div><div class='ctx'> 	to-&gt;tunnel_ttl = info-&gt;key.ttl;</div><div class='del'>-	to-&gt;tunnel_ext = 0;</div><div class='add'>+	if (flags &amp; BPF_F_TUNINFO_FLAGS)</div><div class='add'>+		to-&gt;tunnel_flags = ip_tunnel_flags_to_be16(info-&gt;key.tun_flags);</div><div class='add'>+	else</div><div class='add'>+		to-&gt;tunnel_ext = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BPF_F_TUNINFO_IPV6) {</div><div class='ctx'> 		memcpy(to-&gt;remote_ipv6, &amp;info-&gt;key.u.ipv6.src,</div><div class='ctx'> 		       sizeof(to-&gt;remote_ipv6));</div><div class='add'>+		memcpy(to-&gt;local_ipv6, &amp;info-&gt;key.u.ipv6.dst,</div><div class='add'>+		       sizeof(to-&gt;local_ipv6));</div><div class='ctx'> 		to-&gt;tunnel_label = be32_to_cpu(info-&gt;key.label);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		to-&gt;remote_ipv4 = be32_to_cpu(info-&gt;key.u.ipv4.src);</div><div class='ctx'> 		memset(&amp;to-&gt;remote_ipv6[1], 0, sizeof(__u32) * 3);</div><div class='add'>+		to-&gt;local_ipv4 = be32_to_cpu(info-&gt;key.u.ipv4.dst);</div><div class='add'>+		memset(&amp;to-&gt;local_ipv6[1], 0, sizeof(__u32) * 3);</div><div class='ctx'> 		to-&gt;tunnel_label = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3575,7 +4802,7 @@ BPF_CALL_3(bpf_skb_get_tunnel_opt, struct sk_buff *, skb, u8 *, to, u32, size)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!info ||</div><div class='del'>-		     !(info-&gt;key.tun_flags &amp; TUNNEL_OPTIONS_PRESENT))) {</div><div class='add'>+		     !ip_tunnel_is_options_present(info-&gt;key.tun_flags))) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto err_clear;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3613,10 +4840,12 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,</div><div class='ctx'> 	struct ip_tunnel_info *info;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~(BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX |</div><div class='del'>-			       BPF_F_DONT_FRAGMENT | BPF_F_SEQ_NUMBER)))</div><div class='add'>+			       BPF_F_DONT_FRAGMENT | BPF_F_SEQ_NUMBER |</div><div class='add'>+			       BPF_F_NO_TUNNEL_KEY)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (unlikely(size != sizeof(struct bpf_tunnel_key))) {</div><div class='ctx'> 		switch (size) {</div><div class='add'>+		case offsetof(struct bpf_tunnel_key, local_ipv6[0]):</div><div class='ctx'> 		case offsetof(struct bpf_tunnel_key, tunnel_label):</div><div class='ctx'> 		case offsetof(struct bpf_tunnel_key, tunnel_ext):</div><div class='ctx'> 		case offsetof(struct bpf_tunnel_key, remote_ipv6[1]):</div><div class='hunk'>@@ -3643,13 +4872,15 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,</div><div class='ctx'> 	memset(info, 0, sizeof(*info));</div><div class='ctx'> 	info-&gt;mode = IP_TUNNEL_INFO_TX;</div><div class='ctx'> </div><div class='del'>-	info-&gt;key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_NOCACHE;</div><div class='del'>-	if (flags &amp; BPF_F_DONT_FRAGMENT)</div><div class='del'>-		info-&gt;key.tun_flags |= TUNNEL_DONT_FRAGMENT;</div><div class='del'>-	if (flags &amp; BPF_F_ZERO_CSUM_TX)</div><div class='del'>-		info-&gt;key.tun_flags &amp;= ~TUNNEL_CSUM;</div><div class='del'>-	if (flags &amp; BPF_F_SEQ_NUMBER)</div><div class='del'>-		info-&gt;key.tun_flags |= TUNNEL_SEQ;</div><div class='add'>+	__set_bit(IP_TUNNEL_NOCACHE_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	__assign_bit(IP_TUNNEL_DONT_FRAGMENT_BIT, info-&gt;key.tun_flags,</div><div class='add'>+		     flags &amp; BPF_F_DONT_FRAGMENT);</div><div class='add'>+	__assign_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags,</div><div class='add'>+		     !(flags &amp; BPF_F_ZERO_CSUM_TX));</div><div class='add'>+	__assign_bit(IP_TUNNEL_SEQ_BIT, info-&gt;key.tun_flags,</div><div class='add'>+		     flags &amp; BPF_F_SEQ_NUMBER);</div><div class='add'>+	__assign_bit(IP_TUNNEL_KEY_BIT, info-&gt;key.tun_flags,</div><div class='add'>+		     !(flags &amp; BPF_F_NO_TUNNEL_KEY));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;key.tun_id = cpu_to_be64(from-&gt;tunnel_id);</div><div class='ctx'> 	info-&gt;key.tos = from-&gt;tunnel_tos;</div><div class='hunk'>@@ -3659,10 +4890,14 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,</div><div class='ctx'> 		info-&gt;mode |= IP_TUNNEL_INFO_IPV6;</div><div class='ctx'> 		memcpy(&amp;info-&gt;key.u.ipv6.dst, from-&gt;remote_ipv6,</div><div class='ctx'> 		       sizeof(from-&gt;remote_ipv6));</div><div class='add'>+		memcpy(&amp;info-&gt;key.u.ipv6.src, from-&gt;local_ipv6,</div><div class='add'>+		       sizeof(from-&gt;local_ipv6));</div><div class='ctx'> 		info-&gt;key.label = cpu_to_be32(from-&gt;tunnel_label) &amp;</div><div class='ctx'> 				  IPV6_FLOWLABEL_MASK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		info-&gt;key.u.ipv4.dst = cpu_to_be32(from-&gt;remote_ipv4);</div><div class='add'>+		info-&gt;key.u.ipv4.src = cpu_to_be32(from-&gt;local_ipv4);</div><div class='add'>+		info-&gt;key.flow_flags = FLOWI_FLAG_ANYSRC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3673,7 +4908,7 @@ static const struct bpf_func_proto bpf_skb_set_tunnel_key_proto = {</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg3_type	= ARG_CONST_SIZE,</div><div class='ctx'> 	.arg4_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='hunk'>@@ -3683,13 +4918,15 @@ BPF_CALL_3(bpf_skb_set_tunnel_opt, struct sk_buff *, skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel_info *info = skb_tunnel_info(skb);</div><div class='ctx'> 	const struct metadata_dst *md = this_cpu_ptr(md_dst);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(present) = { };</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(info != &amp;md-&gt;u.tun_info || (size &amp; (sizeof(u32) - 1))))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (unlikely(size &gt; IP_TUNNEL_OPTS_MAX))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ip_tunnel_info_opts_set(info, from, size, TUNNEL_OPTIONS_PRESENT);</div><div class='add'>+	ip_tunnel_set_options_present(present);</div><div class='add'>+	ip_tunnel_info_opts_set(info, from, size, present);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3699,7 +4936,7 @@ static const struct bpf_func_proto bpf_skb_set_tunnel_opt_proto = {</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg3_type	= ARG_CONST_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3758,16 +4995,21 @@ static const struct bpf_func_proto bpf_skb_under_cgroup_proto = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='del'>-BPF_CALL_1(bpf_skb_cgroup_id, const struct sk_buff *, skb)</div><div class='add'>+static inline u64 __bpf_sk_cgroup_id(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = skb_to_full_sk(skb);</div><div class='ctx'> 	struct cgroup *cgrp;</div><div class='ctx'> </div><div class='add'>+	sk = sk_to_full_sk(sk);</div><div class='ctx'> 	if (!sk || !sk_fullsock(sk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cgrp = sock_cgroup_ptr(&amp;sk-&gt;sk_cgrp_data);</div><div class='del'>-	return cgrp-&gt;kn-&gt;id.id;</div><div class='add'>+	return cgroup_id(cgrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skb_cgroup_id, const struct sk_buff *, skb)</div><div class='add'>+{</div><div class='add'>+	return __bpf_sk_cgroup_id(skb-&gt;sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_skb_cgroup_id_proto = {</div><div class='hunk'>@@ -3777,13 +5019,13 @@ static const struct bpf_func_proto bpf_skb_cgroup_id_proto = {</div><div class='ctx'> 	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_2(bpf_skb_ancestor_cgroup_id, const struct sk_buff *, skb, int,</div><div class='del'>-	   ancestor_level)</div><div class='add'>+static inline u64 __bpf_sk_ancestor_cgroup_id(struct sock *sk,</div><div class='add'>+					      int ancestor_level)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = skb_to_full_sk(skb);</div><div class='ctx'> 	struct cgroup *ancestor;</div><div class='ctx'> 	struct cgroup *cgrp;</div><div class='ctx'> </div><div class='add'>+	sk = sk_to_full_sk(sk);</div><div class='ctx'> 	if (!sk || !sk_fullsock(sk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3792,7 +5034,13 @@ BPF_CALL_2(bpf_skb_ancestor_cgroup_id, const struct sk_buff *, skb, int,</div><div class='ctx'> 	if (!ancestor)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return ancestor-&gt;kn-&gt;id.id;</div><div class='add'>+	return cgroup_id(ancestor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_skb_ancestor_cgroup_id, const struct sk_buff *, skb, int,</div><div class='add'>+	   ancestor_level)</div><div class='add'>+{</div><div class='add'>+	return __bpf_sk_ancestor_cgroup_id(skb-&gt;sk, ancestor_level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_skb_ancestor_cgroup_id_proto = {</div><div class='hunk'>@@ -3802,12 +5050,39 @@ static const struct bpf_func_proto bpf_skb_ancestor_cgroup_id_proto = {</div><div class='ctx'> 	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type      = ARG_ANYTHING,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_sk_cgroup_id, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	return __bpf_sk_cgroup_id(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_cgroup_id_proto = {</div><div class='add'>+	.func           = bpf_sk_cgroup_id,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_sk_ancestor_cgroup_id, struct sock *, sk, int, ancestor_level)</div><div class='add'>+{</div><div class='add'>+	return __bpf_sk_ancestor_cgroup_id(sk, ancestor_level);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_ancestor_cgroup_id_proto = {</div><div class='add'>+	.func           = bpf_sk_ancestor_cgroup_id,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff,</div><div class='add'>+static unsigned long bpf_xdp_copy(void *dst, const void *ctx,</div><div class='ctx'> 				  unsigned long off, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	memcpy(dst_buff, src_buff + off, len);</div><div class='add'>+	struct xdp_buff *xdp = (struct xdp_buff *)ctx;</div><div class='add'>+</div><div class='add'>+	bpf_xdp_copy_buf(xdp, off, dst, len, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3818,10 +5093,11 @@ BPF_CALL_5(bpf_xdp_event_output, struct xdp_buff *, xdp, struct bpf_map *, map,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~(BPF_F_CTXLEN_MASK | BPF_F_INDEX_MASK)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (unlikely(xdp_size &gt; (unsigned long)(xdp-&gt;data_end - xdp-&gt;data)))</div><div class='add'>+</div><div class='add'>+	if (unlikely(!xdp || xdp_size &gt; xdp_get_buff_len(xdp)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return bpf_event_output(map, flags, meta, meta_size, xdp-&gt;data,</div><div class='add'>+	return bpf_event_output(map, flags, meta, meta_size, xdp,</div><div class='ctx'> 				xdp_size, bpf_xdp_copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3832,13 +5108,27 @@ static const struct bpf_func_proto bpf_xdp_event_output_proto = {</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='ctx'> 	.arg3_type	= ARG_ANYTHING,</div><div class='del'>-	.arg4_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(bpf_xdp_output_btf_ids, struct, xdp_buff)</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_xdp_output_proto = {</div><div class='add'>+	.func		= bpf_xdp_event_output,</div><div class='add'>+	.gpl_only	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID,</div><div class='add'>+	.arg1_btf_id	= &amp;bpf_xdp_output_btf_ids[0],</div><div class='add'>+	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg5_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_1(bpf_get_socket_cookie, struct sk_buff *, skb)</div><div class='ctx'> {</div><div class='del'>-	return skb-&gt;sk ? sock_gen_cookie(skb-&gt;sk) : 0;</div><div class='add'>+	return skb-&gt;sk ? __sock_gen_cookie(skb-&gt;sk) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_get_socket_cookie_proto = {</div><div class='hunk'>@@ -3850,7 +5140,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_proto = {</div><div class='ctx'> </div><div class='ctx'> BPF_CALL_1(bpf_get_socket_cookie_sock_addr, struct bpf_sock_addr_kern *, ctx)</div><div class='ctx'> {</div><div class='del'>-	return sock_gen_cookie(ctx-&gt;sk);</div><div class='add'>+	return __sock_gen_cookie(ctx-&gt;sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = {</div><div class='hunk'>@@ -3860,9 +5150,33 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = {</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BPF_CALL_1(bpf_get_socket_cookie_sock, struct sock *, ctx)</div><div class='add'>+{</div><div class='add'>+	return __sock_gen_cookie(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = {</div><div class='add'>+	.func		= bpf_get_socket_cookie_sock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_socket_ptr_cookie, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	return sk ? sock_gen_cookie(sk) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_get_socket_ptr_cookie_proto = {</div><div class='add'>+	.func		= bpf_get_socket_ptr_cookie,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON | PTR_MAYBE_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> BPF_CALL_1(bpf_get_socket_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx)</div><div class='ctx'> {</div><div class='del'>-	return sock_gen_cookie(ctx-&gt;sk);</div><div class='add'>+	return __sock_gen_cookie(ctx-&gt;sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = {</div><div class='hunk'>@@ -3872,6 +5186,72 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = {</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u64 __bpf_get_netns_cookie(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	const struct net *net = sk ? sock_net(sk) : &amp;init_net;</div><div class='add'>+</div><div class='add'>+	return net-&gt;net_cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_netns_cookie, struct sk_buff *, skb)</div><div class='add'>+{</div><div class='add'>+	return __bpf_get_netns_cookie(skb &amp;&amp; skb-&gt;sk ? skb-&gt;sk : NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_netns_cookie_proto = {</div><div class='add'>+	.func           = bpf_get_netns_cookie,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX_OR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_netns_cookie_sock, struct sock *, ctx)</div><div class='add'>+{</div><div class='add'>+	return __bpf_get_netns_cookie(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_netns_cookie_sock_proto = {</div><div class='add'>+	.func		= bpf_get_netns_cookie_sock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_netns_cookie_sock_addr, struct bpf_sock_addr_kern *, ctx)</div><div class='add'>+{</div><div class='add'>+	return __bpf_get_netns_cookie(ctx ? ctx-&gt;sk : NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_netns_cookie_sock_addr_proto = {</div><div class='add'>+	.func		= bpf_get_netns_cookie_sock_addr,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_netns_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx)</div><div class='add'>+{</div><div class='add'>+	return __bpf_get_netns_cookie(ctx ? ctx-&gt;sk : NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_netns_cookie_sock_ops_proto = {</div><div class='add'>+	.func		= bpf_get_netns_cookie_sock_ops,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_netns_cookie_sk_msg, struct sk_msg *, ctx)</div><div class='add'>+{</div><div class='add'>+	return __bpf_get_netns_cookie(ctx ? ctx-&gt;sk : NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_netns_cookie_sk_msg_proto = {</div><div class='add'>+	.func		= bpf_get_netns_cookie_sk_msg,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> BPF_CALL_1(bpf_get_socket_uid, struct sk_buff *, skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sk_to_full_sk(skb-&gt;sk);</div><div class='hunk'>@@ -3890,213 +5270,673 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = {</div><div class='ctx'> 	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='del'>-	   int, level, int, optname, char *, optval, int, optlen)</div><div class='add'>+static int sk_bpf_set_get_cb_flags(struct sock *sk, char *optval, bool getopt)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = bpf_sock-&gt;sk;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int val;</div><div class='add'>+	u32 sk_bpf_cb_flags;</div><div class='ctx'> </div><div class='del'>-	if (!sk_fullsock(sk))</div><div class='add'>+	if (getopt) {</div><div class='add'>+		*(u32 *)optval = sk-&gt;sk_bpf_cb_flags;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_bpf_cb_flags = *(u32 *)optval;</div><div class='add'>+</div><div class='add'>+	if (sk_bpf_cb_flags &amp; ~SK_BPF_CB_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (level == SOL_SOCKET) {</div><div class='del'>-		if (optlen != sizeof(int))</div><div class='add'>+	sk-&gt;sk_bpf_cb_flags = sk_bpf_cb_flags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sol_socket_sockopt(struct sock *sk, int optname,</div><div class='add'>+			      char *optval, int *optlen,</div><div class='add'>+			      bool getopt)</div><div class='add'>+{</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case SO_REUSEADDR:</div><div class='add'>+	case SO_SNDBUF:</div><div class='add'>+	case SO_RCVBUF:</div><div class='add'>+	case SO_KEEPALIVE:</div><div class='add'>+	case SO_PRIORITY:</div><div class='add'>+	case SO_REUSEPORT:</div><div class='add'>+	case SO_RCVLOWAT:</div><div class='add'>+	case SO_MARK:</div><div class='add'>+	case SO_MAX_PACING_RATE:</div><div class='add'>+	case SO_BINDTOIFINDEX:</div><div class='add'>+	case SO_TXREHASH:</div><div class='add'>+	case SK_BPF_CB_FLAGS:</div><div class='add'>+		if (*optlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		val = *((int *)optval);</div><div class='add'>+		break;</div><div class='add'>+	case SO_BINDTODEVICE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Only some socketops are supported */</div><div class='del'>-		switch (optname) {</div><div class='del'>-		case SO_RCVBUF:</div><div class='del'>-			sk-&gt;sk_userlocks |= SOCK_RCVBUF_LOCK;</div><div class='del'>-			sk-&gt;sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF);</div><div class='del'>-			break;</div><div class='del'>-		case SO_SNDBUF:</div><div class='del'>-			sk-&gt;sk_userlocks |= SOCK_SNDBUF_LOCK;</div><div class='del'>-			sk-&gt;sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);</div><div class='del'>-			break;</div><div class='del'>-		case SO_MAX_PACING_RATE:</div><div class='del'>-			sk-&gt;sk_max_pacing_rate = val;</div><div class='del'>-			sk-&gt;sk_pacing_rate = min(sk-&gt;sk_pacing_rate,</div><div class='del'>-						 sk-&gt;sk_max_pacing_rate);</div><div class='del'>-			break;</div><div class='del'>-		case SO_PRIORITY:</div><div class='del'>-			sk-&gt;sk_priority = val;</div><div class='del'>-			break;</div><div class='del'>-		case SO_RCVLOWAT:</div><div class='del'>-			if (val &lt; 0)</div><div class='del'>-				val = INT_MAX;</div><div class='del'>-			sk-&gt;sk_rcvlowat = val ? : 1;</div><div class='del'>-			break;</div><div class='del'>-		case SO_MARK:</div><div class='del'>-			sk-&gt;sk_mark = val;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-	} else if (level == SOL_IP) {</div><div class='del'>-		if (optlen != sizeof(int) || sk-&gt;sk_family != AF_INET)</div><div class='add'>+	if (optname == SK_BPF_CB_FLAGS)</div><div class='add'>+		return sk_bpf_set_get_cb_flags(sk, optval, getopt);</div><div class='add'>+</div><div class='add'>+	if (getopt) {</div><div class='add'>+		if (optname == SO_BINDTODEVICE)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		return sk_getsockopt(sk, SOL_SOCKET, optname,</div><div class='add'>+				     KERNEL_SOCKPTR(optval),</div><div class='add'>+				     KERNEL_SOCKPTR(optlen));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		val = *((int *)optval);</div><div class='del'>-		/* Only some options are supported */</div><div class='del'>-		switch (optname) {</div><div class='del'>-		case IP_TOS:</div><div class='del'>-			if (val &lt; -1 || val &gt; 0xff) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			} else {</div><div class='del'>-				struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	return sk_setsockopt(sk, SOL_SOCKET, optname,</div><div class='add'>+			     KERNEL_SOCKPTR(optval), *optlen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				if (val == -1)</div><div class='del'>-					val = 0;</div><div class='del'>-				inet-&gt;tos = val;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	} else if (level == SOL_IPV6) {</div><div class='del'>-		if (optlen != sizeof(int) || sk-&gt;sk_family != AF_INET6)</div><div class='add'>+static int bpf_sol_tcp_getsockopt(struct sock *sk, int optname,</div><div class='add'>+				  char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (optlen != sizeof(int))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case TCP_BPF_SOCK_OPS_CB_FLAGS: {</div><div class='add'>+		int cb_flags = tcp_sk(sk)-&gt;bpf_sock_ops_cb_flags;</div><div class='add'>+</div><div class='add'>+		memcpy(optval, &amp;cb_flags, optlen);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TCP_BPF_RTO_MIN: {</div><div class='add'>+		int rto_min_us = jiffies_to_usecs(inet_csk(sk)-&gt;icsk_rto_min);</div><div class='add'>+</div><div class='add'>+		memcpy(optval, &amp;rto_min_us, optlen);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TCP_BPF_DELACK_MAX: {</div><div class='add'>+		int delack_max_us = jiffies_to_usecs(inet_csk(sk)-&gt;icsk_delack_max);</div><div class='add'>+</div><div class='add'>+		memcpy(optval, &amp;delack_max_us, optlen);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_sol_tcp_setsockopt(struct sock *sk, int optname,</div><div class='add'>+				  char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (optlen != sizeof(int))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = *(int *)optval;</div><div class='add'>+</div><div class='add'>+	/* Only some options are supported */</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case TCP_BPF_IW:</div><div class='add'>+		if (val &lt;= 0 || tp-&gt;data_segs_out &gt; tp-&gt;syn_data)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tcp_snd_cwnd_set(tp, val);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_BPF_SNDCWND_CLAMP:</div><div class='add'>+		if (val &lt;= 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tp-&gt;snd_cwnd_clamp = val;</div><div class='add'>+		tp-&gt;snd_ssthresh = val;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_BPF_DELACK_MAX:</div><div class='add'>+		timeout = usecs_to_jiffies(val);</div><div class='add'>+		if (timeout &gt; TCP_DELACK_MAX ||</div><div class='add'>+		    timeout &lt; TCP_TIMEOUT_MIN)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		inet_csk(sk)-&gt;icsk_delack_max = timeout;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_BPF_RTO_MIN:</div><div class='add'>+		timeout = usecs_to_jiffies(val);</div><div class='add'>+		if (timeout &gt; TCP_RTO_MIN ||</div><div class='add'>+		    timeout &lt; TCP_TIMEOUT_MIN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_csk(sk)-&gt;icsk_rto_min = timeout;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_BPF_SOCK_OPS_CB_FLAGS:</div><div class='add'>+		if (val &amp; ~(BPF_SOCK_OPS_ALL_CB_FLAGS))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tp-&gt;bpf_sock_ops_cb_flags = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		val = *((int *)optval);</div><div class='del'>-		/* Only some options are supported */</div><div class='del'>-		switch (optname) {</div><div class='del'>-		case IPV6_TCLASS:</div><div class='del'>-			if (val &lt; -1 || val &gt; 0xff) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			} else {</div><div class='del'>-				struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				if (val == -1)</div><div class='del'>-					val = 0;</div><div class='del'>-				np-&gt;tclass = val;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	} else if (level == SOL_TCP &amp;&amp;</div><div class='del'>-		   sk-&gt;sk_prot-&gt;setsockopt == tcp_setsockopt) {</div><div class='del'>-		if (optname == TCP_CONGESTION) {</div><div class='del'>-			char name[TCP_CA_NAME_MAX];</div><div class='del'>-			bool reinit = bpf_sock-&gt;op &gt; BPF_SOCK_OPS_NEEDS_ECN;</div><div class='del'>-</div><div class='del'>-			strncpy(name, optval, min_t(long, optlen,</div><div class='del'>-						    TCP_CA_NAME_MAX-1));</div><div class='del'>-			name[TCP_CA_NAME_MAX-1] = 0;</div><div class='del'>-			ret = tcp_set_congestion_control(sk, name, false,</div><div class='del'>-							 reinit);</div><div class='del'>-		} else {</div><div class='add'>+static int sol_tcp_sockopt_congestion(struct sock *sk, char *optval,</div><div class='add'>+				      int *optlen, bool getopt)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (*optlen &lt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (getopt) {</div><div class='add'>+		if (!inet_csk(sk)-&gt;icsk_ca_ops)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* BPF expects NULL-terminated tcp-cc string */</div><div class='add'>+		optval[--(*optlen)] = '\0';</div><div class='add'>+		return do_tcp_getsockopt(sk, SOL_TCP, TCP_CONGESTION,</div><div class='add'>+					 KERNEL_SOCKPTR(optval),</div><div class='add'>+					 KERNEL_SOCKPTR(optlen));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* "cdg" is the only cc that alloc a ptr</div><div class='add'>+	 * in inet_csk_ca area.  The bpf-tcp-cc may</div><div class='add'>+	 * overwrite this ptr after switching to cdg.</div><div class='add'>+	 */</div><div class='add'>+	if (*optlen &gt;= sizeof("cdg") - 1 &amp;&amp; !strncmp("cdg", optval, *optlen))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* It stops this looping</div><div class='add'>+	 *</div><div class='add'>+	 * .init =&gt; bpf_setsockopt(tcp_cc) =&gt; .init =&gt;</div><div class='add'>+	 * bpf_setsockopt(tcp_cc)" =&gt; .init =&gt; ....</div><div class='add'>+	 *</div><div class='add'>+	 * The second bpf_setsockopt(tcp_cc) is not allowed</div><div class='add'>+	 * in order to break the loop when both .init</div><div class='add'>+	 * are the same bpf prog.</div><div class='add'>+	 *</div><div class='add'>+	 * This applies even the second bpf_setsockopt(tcp_cc)</div><div class='add'>+	 * does not cause a loop.  This limits only the first</div><div class='add'>+	 * '.init' can call bpf_setsockopt(TCP_CONGESTION) to</div><div class='add'>+	 * pick a fallback cc (eg. peer does not support ECN)</div><div class='add'>+	 * and the second '.init' cannot fallback to</div><div class='add'>+	 * another.</div><div class='add'>+	 */</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	if (tp-&gt;bpf_chg_cc_inprogress)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	tp-&gt;bpf_chg_cc_inprogress = 1;</div><div class='add'>+	ret = do_tcp_setsockopt(sk, SOL_TCP, TCP_CONGESTION,</div><div class='add'>+				KERNEL_SOCKPTR(optval), *optlen);</div><div class='add'>+	tp-&gt;bpf_chg_cc_inprogress = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sol_tcp_sockopt(struct sock *sk, int optname,</div><div class='add'>+			   char *optval, int *optlen,</div><div class='add'>+			   bool getopt)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case TCP_NODELAY:</div><div class='add'>+	case TCP_MAXSEG:</div><div class='add'>+	case TCP_KEEPIDLE:</div><div class='add'>+	case TCP_KEEPINTVL:</div><div class='add'>+	case TCP_KEEPCNT:</div><div class='add'>+	case TCP_SYNCNT:</div><div class='add'>+	case TCP_WINDOW_CLAMP:</div><div class='add'>+	case TCP_THIN_LINEAR_TIMEOUTS:</div><div class='add'>+	case TCP_USER_TIMEOUT:</div><div class='add'>+	case TCP_NOTSENT_LOWAT:</div><div class='add'>+	case TCP_SAVE_SYN:</div><div class='add'>+	case TCP_RTO_MAX_MS:</div><div class='add'>+		if (*optlen != sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_CONGESTION:</div><div class='add'>+		return sol_tcp_sockopt_congestion(sk, optval, optlen, getopt);</div><div class='add'>+	case TCP_SAVED_SYN:</div><div class='add'>+		if (*optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (getopt)</div><div class='add'>+			return bpf_sol_tcp_getsockopt(sk, optname, optval, *optlen);</div><div class='add'>+		return bpf_sol_tcp_setsockopt(sk, optname, optval, *optlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (getopt) {</div><div class='add'>+		if (optname == TCP_SAVED_SYN) {</div><div class='ctx'> 			struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-			if (optlen != sizeof(int))</div><div class='add'>+			if (!tp-&gt;saved_syn ||</div><div class='add'>+			    *optlen &gt; tcp_saved_syn_len(tp-&gt;saved_syn))</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			val = *((int *)optval);</div><div class='del'>-			/* Only some options are supported */</div><div class='del'>-			switch (optname) {</div><div class='del'>-			case TCP_BPF_IW:</div><div class='del'>-				if (val &lt;= 0 || tp-&gt;data_segs_out &gt; 0)</div><div class='del'>-					ret = -EINVAL;</div><div class='del'>-				else</div><div class='del'>-					tp-&gt;snd_cwnd = val;</div><div class='del'>-				break;</div><div class='del'>-			case TCP_BPF_SNDCWND_CLAMP:</div><div class='del'>-				if (val &lt;= 0) {</div><div class='del'>-					ret = -EINVAL;</div><div class='del'>-				} else {</div><div class='del'>-					tp-&gt;snd_cwnd_clamp = val;</div><div class='del'>-					tp-&gt;snd_ssthresh = val;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			}</div><div class='add'>+			memcpy(optval, tp-&gt;saved_syn-&gt;data, *optlen);</div><div class='add'>+			/* It cannot free tp-&gt;saved_syn here because it</div><div class='add'>+			 * does not know if the user space still needs it.</div><div class='add'>+			 */</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+		return do_tcp_getsockopt(sk, SOL_TCP, optname,</div><div class='add'>+					 KERNEL_SOCKPTR(optval),</div><div class='add'>+					 KERNEL_SOCKPTR(optlen));</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return do_tcp_setsockopt(sk, SOL_TCP, optname,</div><div class='add'>+				 KERNEL_SOCKPTR(optval), *optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sol_ip_sockopt(struct sock *sk, int optname,</div><div class='add'>+			  char *optval, int *optlen,</div><div class='add'>+			  bool getopt)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_family != AF_INET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case IP_TOS:</div><div class='add'>+		if (*optlen != sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (getopt)</div><div class='add'>+		return do_ip_getsockopt(sk, SOL_IP, optname,</div><div class='add'>+					KERNEL_SOCKPTR(optval),</div><div class='add'>+					KERNEL_SOCKPTR(optlen));</div><div class='add'>+</div><div class='add'>+	return do_ip_setsockopt(sk, SOL_IP, optname,</div><div class='add'>+				KERNEL_SOCKPTR(optval), *optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sol_ipv6_sockopt(struct sock *sk, int optname,</div><div class='add'>+			    char *optval, int *optlen,</div><div class='add'>+			    bool getopt)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_family != AF_INET6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case IPV6_TCLASS:</div><div class='add'>+	case IPV6_AUTOFLOWLABEL:</div><div class='add'>+		if (*optlen != sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (getopt)</div><div class='add'>+		return ipv6_bpf_stub-&gt;ipv6_getsockopt(sk, SOL_IPV6, optname,</div><div class='add'>+						      KERNEL_SOCKPTR(optval),</div><div class='add'>+						      KERNEL_SOCKPTR(optlen));</div><div class='add'>+</div><div class='add'>+	return ipv6_bpf_stub-&gt;ipv6_setsockopt(sk, SOL_IPV6, optname,</div><div class='add'>+					      KERNEL_SOCKPTR(optval), *optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bpf_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			    char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (!sk_fullsock(sk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (level == SOL_SOCKET)</div><div class='add'>+		return sol_socket_sockopt(sk, optname, optval, &amp;optlen, false);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_INET) &amp;&amp; level == SOL_IP)</div><div class='add'>+		return sol_ip_sockopt(sk, optname, optval, &amp;optlen, false);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; level == SOL_IPV6)</div><div class='add'>+		return sol_ipv6_sockopt(sk, optname, optval, &amp;optlen, false);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_INET) &amp;&amp; level == SOL_TCP)</div><div class='add'>+		return sol_tcp_sockopt(sk, optname, optval, &amp;optlen, false);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_locked_tcp_sock_ops(struct bpf_sock_ops_kern *bpf_sock)</div><div class='add'>+{</div><div class='add'>+	return bpf_sock-&gt;op &lt;= BPF_SOCK_OPS_WRITE_HDR_OPT_CB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _bpf_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			   char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (sk_fullsock(sk))</div><div class='add'>+		sock_owned_by_me(sk);</div><div class='add'>+	return __bpf_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bpf_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			    char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	int err, saved_optlen = optlen;</div><div class='add'>+</div><div class='add'>+	if (!sk_fullsock(sk)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (level == SOL_SOCKET)</div><div class='add'>+		err = sol_socket_sockopt(sk, optname, optval, &amp;optlen, true);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_INET) &amp;&amp; level == SOL_TCP)</div><div class='add'>+		err = sol_tcp_sockopt(sk, optname, optval, &amp;optlen, true);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_INET) &amp;&amp; level == SOL_IP)</div><div class='add'>+		err = sol_ip_sockopt(sk, optname, optval, &amp;optlen, true);</div><div class='add'>+	else if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; level == SOL_IPV6)</div><div class='add'>+		err = sol_ipv6_sockopt(sk, optname, optval, &amp;optlen, true);</div><div class='add'>+	else</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (err)</div><div class='add'>+		optlen = 0;</div><div class='add'>+	if (optlen &lt; saved_optlen)</div><div class='add'>+		memset(optval + optlen, 0, saved_optlen - optlen);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _bpf_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			   char *optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (sk_fullsock(sk))</div><div class='add'>+		sock_owned_by_me(sk);</div><div class='add'>+	return __bpf_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sk_setsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	return _bpf_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_setsockopt_proto = {</div><div class='add'>+	.func		= bpf_sk_setsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sk_getsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	return _bpf_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_setsockopt_proto = {</div><div class='del'>-	.func		= bpf_setsockopt,</div><div class='add'>+const struct bpf_func_proto bpf_sk_getsockopt_proto = {</div><div class='add'>+	.func		= bpf_sk_getsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_unlocked_sk_setsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	return __bpf_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_unlocked_sk_setsockopt_proto = {</div><div class='add'>+	.func		= bpf_unlocked_sk_setsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_unlocked_sk_getsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	return __bpf_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_unlocked_sk_getsockopt_proto = {</div><div class='add'>+	.func		= bpf_unlocked_sk_getsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx,</div><div class='add'>+	   int, level, int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	return _bpf_setsockopt(ctx-&gt;sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_addr_setsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_addr_setsockopt,</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='ctx'> 	.arg3_type	= ARG_ANYTHING,</div><div class='del'>-	.arg4_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg5_type	= ARG_CONST_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-BPF_CALL_5(bpf_getsockopt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+BPF_CALL_5(bpf_sock_addr_getsockopt, struct bpf_sock_addr_kern *, ctx,</div><div class='ctx'> 	   int, level, int, optname, char *, optval, int, optlen)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = bpf_sock-&gt;sk;</div><div class='add'>+	return _bpf_getsockopt(ctx-&gt;sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!sk_fullsock(sk))</div><div class='del'>-		goto err_clear;</div><div class='add'>+static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_addr_getsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-	if (level == SOL_TCP &amp;&amp; sk-&gt;sk_prot-&gt;getsockopt == tcp_getsockopt) {</div><div class='del'>-		if (optname == TCP_CONGESTION) {</div><div class='del'>-			struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+static int sk_bpf_set_get_bypass_prot_mem(struct sock *sk,</div><div class='add'>+					  char *optval, int optlen,</div><div class='add'>+					  bool getopt)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='ctx'> </div><div class='del'>-			if (!icsk-&gt;icsk_ca_ops || optlen &lt;= 1)</div><div class='del'>-				goto err_clear;</div><div class='del'>-			strncpy(optval, icsk-&gt;icsk_ca_ops-&gt;name, optlen);</div><div class='del'>-			optval[optlen - 1] = 0;</div><div class='add'>+	if (optlen != sizeof(int))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sk_has_account(sk))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (getopt) {</div><div class='add'>+		*(int *)optval = sk-&gt;sk_bypass_prot_mem;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = *(int *)optval;</div><div class='add'>+	if (val &lt; 0 || val &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_bypass_prot_mem = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_create_setsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	if (level == SOL_SOCKET &amp;&amp; optname == SK_BPF_BYPASS_PROT_MEM)</div><div class='add'>+		return sk_bpf_set_get_bypass_prot_mem(sk, optval, optlen, false);</div><div class='add'>+</div><div class='add'>+	return __bpf_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_create_setsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_create_setsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_create_getsockopt, struct sock *, sk, int, level,</div><div class='add'>+	   int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	if (level == SOL_SOCKET &amp;&amp; optname == SK_BPF_BYPASS_PROT_MEM) {</div><div class='add'>+		int err = sk_bpf_set_get_bypass_prot_mem(sk, optval, optlen, true);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			memset(optval, 0, optlen);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __bpf_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_create_getsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_create_getsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_UNINIT_MEM,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+	   int, level, int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	if (!is_locked_tcp_sock_ops(bpf_sock))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return _bpf_setsockopt(bpf_sock-&gt;sk, level, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_ops_setsockopt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bpf_sock_ops_get_syn(struct bpf_sock_ops_kern *bpf_sock,</div><div class='add'>+				int optname, const u8 **start)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *syn_skb = bpf_sock-&gt;syn_skb;</div><div class='add'>+	const u8 *hdr_start;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (syn_skb) {</div><div class='add'>+		/* sk is a request_sock here */</div><div class='add'>+</div><div class='add'>+		if (optname == TCP_BPF_SYN) {</div><div class='add'>+			hdr_start = syn_skb-&gt;data;</div><div class='add'>+			ret = tcp_hdrlen(syn_skb);</div><div class='add'>+		} else if (optname == TCP_BPF_SYN_IP) {</div><div class='add'>+			hdr_start = skb_network_header(syn_skb);</div><div class='add'>+			ret = skb_network_header_len(syn_skb) +</div><div class='add'>+				tcp_hdrlen(syn_skb);</div><div class='ctx'> 		} else {</div><div class='del'>-			goto err_clear;</div><div class='add'>+			/* optname == TCP_BPF_SYN_MAC */</div><div class='add'>+			hdr_start = skb_mac_header(syn_skb);</div><div class='add'>+			ret = skb_mac_header_len(syn_skb) +</div><div class='add'>+				skb_network_header_len(syn_skb) +</div><div class='add'>+				tcp_hdrlen(syn_skb);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (level == SOL_IP) {</div><div class='del'>-		struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	} else {</div><div class='add'>+		struct sock *sk = bpf_sock-&gt;sk;</div><div class='add'>+		struct saved_syn *saved_syn;</div><div class='ctx'> </div><div class='del'>-		if (optlen != sizeof(int) || sk-&gt;sk_family != AF_INET)</div><div class='del'>-			goto err_clear;</div><div class='add'>+		if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='add'>+			/* synack retransmit. bpf_sock-&gt;syn_skb will</div><div class='add'>+			 * not be available.  It has to resort to</div><div class='add'>+			 * saved_syn (if it is saved).</div><div class='add'>+			 */</div><div class='add'>+			saved_syn = inet_reqsk(sk)-&gt;saved_syn;</div><div class='add'>+		else</div><div class='add'>+			saved_syn = tcp_sk(sk)-&gt;saved_syn;</div><div class='ctx'> </div><div class='del'>-		/* Only some options are supported */</div><div class='del'>-		switch (optname) {</div><div class='del'>-		case IP_TOS:</div><div class='del'>-			*((int *)optval) = (int)inet-&gt;tos;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto err_clear;</div><div class='add'>+		if (!saved_syn)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		if (optname == TCP_BPF_SYN) {</div><div class='add'>+			hdr_start = saved_syn-&gt;data +</div><div class='add'>+				saved_syn-&gt;mac_hdrlen +</div><div class='add'>+				saved_syn-&gt;network_hdrlen;</div><div class='add'>+			ret = saved_syn-&gt;tcp_hdrlen;</div><div class='add'>+		} else if (optname == TCP_BPF_SYN_IP) {</div><div class='add'>+			hdr_start = saved_syn-&gt;data +</div><div class='add'>+				saved_syn-&gt;mac_hdrlen;</div><div class='add'>+			ret = saved_syn-&gt;network_hdrlen +</div><div class='add'>+				saved_syn-&gt;tcp_hdrlen;</div><div class='add'>+		} else {</div><div class='add'>+			/* optname == TCP_BPF_SYN_MAC */</div><div class='add'>+</div><div class='add'>+			/* TCP_SAVE_SYN may not have saved the mac hdr */</div><div class='add'>+			if (!saved_syn-&gt;mac_hdrlen)</div><div class='add'>+				return -ENOENT;</div><div class='add'>+</div><div class='add'>+			hdr_start = saved_syn-&gt;data;</div><div class='add'>+			ret = saved_syn-&gt;mac_hdrlen +</div><div class='add'>+				saved_syn-&gt;network_hdrlen +</div><div class='add'>+				saved_syn-&gt;tcp_hdrlen;</div><div class='ctx'> 		}</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	} else if (level == SOL_IPV6) {</div><div class='del'>-		struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (optlen != sizeof(int) || sk-&gt;sk_family != AF_INET6)</div><div class='del'>-			goto err_clear;</div><div class='add'>+	*start = hdr_start;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Only some options are supported */</div><div class='del'>-		switch (optname) {</div><div class='del'>-		case IPV6_TCLASS:</div><div class='del'>-			*((int *)optval) = (int)np-&gt;tclass;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto err_clear;</div><div class='add'>+BPF_CALL_5(bpf_sock_ops_getsockopt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+	   int, level, int, optname, char *, optval, int, optlen)</div><div class='add'>+{</div><div class='add'>+	if (!is_locked_tcp_sock_ops(bpf_sock))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_INET) &amp;&amp; level == SOL_TCP &amp;&amp;</div><div class='add'>+	    optname &gt;= TCP_BPF_SYN &amp;&amp; optname &lt;= TCP_BPF_SYN_MAC) {</div><div class='add'>+		int ret, copy_len = 0;</div><div class='add'>+		const u8 *start;</div><div class='add'>+</div><div class='add'>+		ret = bpf_sock_ops_get_syn(bpf_sock, optname, &amp;start);</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			copy_len = ret;</div><div class='add'>+			if (optlen &lt; copy_len) {</div><div class='add'>+				copy_len = optlen;</div><div class='add'>+				ret = -ENOSPC;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(optval, start, copy_len);</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		goto err_clear;</div><div class='add'>+</div><div class='add'>+		/* Zero out unused buffer at the end */</div><div class='add'>+		memset(optval + copy_len, 0, optlen - copy_len);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-err_clear:</div><div class='del'>-	memset(optval, 0, optlen);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return _bpf_getsockopt(bpf_sock-&gt;sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_getsockopt_proto = {</div><div class='del'>-	.func		= bpf_getsockopt,</div><div class='add'>+static const struct bpf_func_proto bpf_sock_ops_getsockopt_proto = {</div><div class='add'>+	.func		= bpf_sock_ops_getsockopt,</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='hunk'>@@ -4112,11 +5952,13 @@ BPF_CALL_2(bpf_sock_ops_cb_flags_set, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='ctx'> 	struct sock *sk = bpf_sock-&gt;sk;</div><div class='ctx'> 	int val = argval &amp; BPF_SOCK_OPS_ALL_CB_FLAGS;</div><div class='ctx'> </div><div class='add'>+	if (!is_locked_tcp_sock_ops(bpf_sock))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_INET) || !sk_fullsock(sk))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (val)</div><div class='del'>-		tcp_sk(sk)-&gt;bpf_sock_ops_cb_flags = val;</div><div class='add'>+	tcp_sk(sk)-&gt;bpf_sock_ops_cb_flags = val;</div><div class='ctx'> </div><div class='ctx'> 	return argval &amp; (~BPF_SOCK_OPS_ALL_CB_FLAGS);</div><div class='ctx'> }</div><div class='hunk'>@@ -4137,28 +5979,29 @@ BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ctx, struct sockaddr *, addr,</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_INET</div><div class='ctx'> 	struct sock *sk = ctx-&gt;sk;</div><div class='add'>+	u32 flags = BIND_FROM_BPF;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Binding to port can be expensive so it's prohibited in the helper.</div><div class='del'>-	 * Only binding to IP is supported.</div><div class='del'>-	 */</div><div class='ctx'> 	err = -EINVAL;</div><div class='add'>+	if (addr_len &lt; offsetofend(struct sockaddr, sa_family))</div><div class='add'>+		return err;</div><div class='ctx'> 	if (addr-&gt;sa_family == AF_INET) {</div><div class='ctx'> 		if (addr_len &lt; sizeof(struct sockaddr_in))</div><div class='ctx'> 			return err;</div><div class='del'>-		if (((struct sockaddr_in *)addr)-&gt;sin_port != htons(0))</div><div class='del'>-			return err;</div><div class='del'>-		return __inet_bind(sk, addr, addr_len, true, false);</div><div class='add'>+		if (((struct sockaddr_in *)addr)-&gt;sin_port == htons(0))</div><div class='add'>+			flags |= BIND_FORCE_ADDRESS_NO_PORT;</div><div class='add'>+		return __inet_bind(sk, (struct sockaddr_unsized *)addr, addr_len, flags);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	} else if (addr-&gt;sa_family == AF_INET6) {</div><div class='ctx'> 		if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='ctx'> 			return err;</div><div class='del'>-		if (((struct sockaddr_in6 *)addr)-&gt;sin6_port != htons(0))</div><div class='del'>-			return err;</div><div class='add'>+		if (((struct sockaddr_in6 *)addr)-&gt;sin6_port == htons(0))</div><div class='add'>+			flags |= BIND_FORCE_ADDRESS_NO_PORT;</div><div class='ctx'> 		/* ipv6_bpf_stub cannot be NULL, since it's called from</div><div class='ctx'> 		 * bpf_cgroup_inet6_connect hook and ipv6 is already loaded</div><div class='ctx'> 		 */</div><div class='del'>-		return ipv6_bpf_stub-&gt;inet6_bind(sk, addr, addr_len, true, false);</div><div class='add'>+		return ipv6_bpf_stub-&gt;inet6_bind(sk, (struct sockaddr_unsized *)addr,</div><div class='add'>+						 addr_len, flags);</div><div class='ctx'> #endif /* CONFIG_IPV6 */</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_INET */</div><div class='hunk'>@@ -4171,11 +6014,20 @@ static const struct bpf_func_proto bpf_bind_proto = {</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='del'>-	.arg2_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg3_type	= ARG_CONST_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='add'>+</div><div class='add'>+#if (IS_BUILTIN(CONFIG_XFRM_INTERFACE) &amp;&amp; IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) || \</div><div class='add'>+    (IS_MODULE(CONFIG_XFRM_INTERFACE) &amp;&amp; IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))</div><div class='add'>+</div><div class='add'>+struct metadata_dst __percpu *xfrm_bpf_md_dst;</div><div class='add'>+EXPORT_SYMBOL_GPL(xfrm_bpf_md_dst);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> BPF_CALL_5(bpf_skb_get_xfrm_state, struct sk_buff *, skb, u32, index,</div><div class='ctx'> 	   struct bpf_xfrm_state *, to, u32, size, u64, flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -4222,15 +6074,12 @@ static const struct bpf_func_proto bpf_skb_get_xfrm_state_proto = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params,</div><div class='del'>-				  const struct neighbour *neigh,</div><div class='del'>-				  const struct net_device *dev)</div><div class='add'>+static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, u32 mtu)</div><div class='ctx'> {</div><div class='del'>-	memcpy(params-&gt;dmac, neigh-&gt;ha, ETH_ALEN);</div><div class='del'>-	memcpy(params-&gt;smac, dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> 	params-&gt;h_vlan_TCI = 0;</div><div class='ctx'> 	params-&gt;h_vlan_proto = 0;</div><div class='del'>-	params-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+	if (mtu)</div><div class='add'>+		params-&gt;mtu_result = mtu; /* union with tot_len */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4240,14 +6089,14 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params,</div><div class='ctx'> static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 			       u32 flags, bool check_mtu)</div><div class='ctx'> {</div><div class='add'>+	struct fib_nh_common *nhc;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct fib_result res;</div><div class='del'>-	struct fib_nh *nh;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='add'>+	u32 mtu = 0;</div><div class='ctx'> 	int err;</div><div class='del'>-	u32 mtu;</div><div class='ctx'> </div><div class='ctx'> 	dev = dev_get_by_index_rcu(net, params-&gt;ifindex);</div><div class='ctx'> 	if (unlikely(!dev))</div><div class='hunk'>@@ -4265,7 +6114,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 		fl4.flowi4_iif = params-&gt;ifindex;</div><div class='ctx'> 		fl4.flowi4_oif = 0;</div><div class='ctx'> 	}</div><div class='del'>-	fl4.flowi4_tos = params-&gt;tos &amp; IPTOS_RT_MASK;</div><div class='add'>+	fl4.flowi4_dscp = inet_dsfield_to_dscp(params-&gt;tos);</div><div class='ctx'> 	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	fl4.flowi4_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4274,18 +6123,28 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 	fl4.saddr = params-&gt;ipv4_src;</div><div class='ctx'> 	fl4.fl4_sport = params-&gt;sport;</div><div class='ctx'> 	fl4.fl4_dport = params-&gt;dport;</div><div class='add'>+	fl4.flowi4_multipath_hash = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BPF_FIB_LOOKUP_DIRECT) {</div><div class='ctx'> 		u32 tbid = l3mdev_fib_table_rcu(dev) ? : RT_TABLE_MAIN;</div><div class='ctx'> 		struct fib_table *tb;</div><div class='ctx'> </div><div class='add'>+		if (flags &amp; BPF_FIB_LOOKUP_TBID) {</div><div class='add'>+			tbid = params-&gt;tbid;</div><div class='add'>+			/* zero out for vlan output */</div><div class='add'>+			params-&gt;tbid = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		tb = fib_get_table(net, tbid);</div><div class='ctx'> 		if (unlikely(!tb))</div><div class='ctx'> 			return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='ctx'> </div><div class='ctx'> 		err = fib_table_lookup(tb, &amp;fl4, &amp;res, FIB_LOOKUP_NOREF);</div><div class='ctx'> 	} else {</div><div class='del'>-		fl4.flowi4_mark = 0;</div><div class='add'>+		if (flags &amp; BPF_FIB_LOOKUP_MARK)</div><div class='add'>+			fl4.flowi4_mark = params-&gt;mark;</div><div class='add'>+		else</div><div class='add'>+			fl4.flowi4_mark = 0;</div><div class='ctx'> 		fl4.flowi4_secid = 0;</div><div class='ctx'> 		fl4.flowi4_tun_key.tun_id = 0;</div><div class='ctx'> 		fl4.flowi4_uid = sock_net_uid(net, NULL);</div><div class='hunk'>@@ -4308,35 +6167,60 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 	if (res.type != RTN_UNICAST)</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='ctx'> </div><div class='del'>-	if (res.fi-&gt;fib_nhs &gt; 1)</div><div class='add'>+	if (fib_info_num_path(res.fi) &gt; 1)</div><div class='ctx'> 		fib_select_path(net, &amp;res, &amp;fl4, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (check_mtu) {</div><div class='ctx'> 		mtu = ip_mtu_from_fib_result(&amp;res, params-&gt;ipv4_dst);</div><div class='del'>-		if (params-&gt;tot_len &gt; mtu)</div><div class='add'>+		if (params-&gt;tot_len &gt; mtu) {</div><div class='add'>+			params-&gt;mtu_result = mtu; /* union with tot_len */</div><div class='ctx'> 			return BPF_FIB_LKUP_RET_FRAG_NEEDED;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nh = &amp;res.fi-&gt;fib_nh[res.nh_sel];</div><div class='add'>+	nhc = res.nhc;</div><div class='ctx'> </div><div class='ctx'> 	/* do not handle lwt encaps right now */</div><div class='del'>-	if (nh-&gt;nh_lwtstate)</div><div class='add'>+	if (nhc-&gt;nhc_lwtstate)</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_UNSUPP_LWT;</div><div class='ctx'> </div><div class='del'>-	dev = nh-&gt;nh_dev;</div><div class='del'>-	if (nh-&gt;nh_gw)</div><div class='del'>-		params-&gt;ipv4_dst = nh-&gt;nh_gw;</div><div class='add'>+	dev = nhc-&gt;nhc_dev;</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;rt_metric = res.fi-&gt;fib_priority;</div><div class='add'>+	params-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BPF_FIB_LOOKUP_SRC)</div><div class='add'>+		params-&gt;ipv4_src = fib_result_prefsrc(net, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	/* xdp and cls_bpf programs are run in RCU-bh so</div><div class='ctx'> 	 * rcu_read_lock_bh is not needed here</div><div class='ctx'> 	 */</div><div class='del'>-	neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)params-&gt;ipv4_dst);</div><div class='del'>-	if (!neigh)</div><div class='add'>+	if (likely(nhc-&gt;nhc_gw_family != AF_INET6)) {</div><div class='add'>+		if (nhc-&gt;nhc_gw_family)</div><div class='add'>+			params-&gt;ipv4_dst = nhc-&gt;nhc_gw.ipv4;</div><div class='add'>+	} else {</div><div class='add'>+		struct in6_addr *dst = (struct in6_addr *)params-&gt;ipv6_dst;</div><div class='add'>+</div><div class='add'>+		params-&gt;family = AF_INET6;</div><div class='add'>+		*dst = nhc-&gt;nhc_gw.ipv6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BPF_FIB_LOOKUP_SKIP_NEIGH)</div><div class='add'>+		goto set_fwd_params;</div><div class='add'>+</div><div class='add'>+	if (likely(nhc-&gt;nhc_gw_family != AF_INET6))</div><div class='add'>+		neigh = __ipv4_neigh_lookup_noref(dev,</div><div class='add'>+						  (__force u32)params-&gt;ipv4_dst);</div><div class='add'>+	else</div><div class='add'>+		neigh = __ipv6_neigh_lookup_noref_stub(dev, params-&gt;ipv6_dst);</div><div class='add'>+</div><div class='add'>+	if (!neigh || !(READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID))</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_NO_NEIGH;</div><div class='add'>+	memcpy(params-&gt;dmac, neigh-&gt;ha, ETH_ALEN);</div><div class='add'>+	memcpy(params-&gt;smac, dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	return bpf_fib_set_fwd_params(params, neigh, dev);</div><div class='add'>+set_fwd_params:</div><div class='add'>+	return bpf_fib_set_fwd_params(params, mtu);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -4346,14 +6230,14 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr *src = (struct in6_addr *) params-&gt;ipv6_src;</div><div class='ctx'> 	struct in6_addr *dst = (struct in6_addr *) params-&gt;ipv6_dst;</div><div class='add'>+	struct fib6_result res = {};</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct fib6_info *f6i;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	int strict = 0;</div><div class='del'>-	int oif;</div><div class='del'>-	u32 mtu;</div><div class='add'>+	int oif, err;</div><div class='add'>+	u32 mtu = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* link local addresses are never forwarded */</div><div class='ctx'> 	if (rt6_need_strict(dst) || rt6_need_strict(src))</div><div class='hunk'>@@ -4364,7 +6248,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	idev = __in6_dev_get_safely(dev);</div><div class='del'>-	if (unlikely(!idev || !net-&gt;ipv6.devconf_all-&gt;forwarding))</div><div class='add'>+	if (unlikely(!idev || !READ_ONCE(idev-&gt;cnf.forwarding)))</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_FWD_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BPF_FIB_LOOKUP_OUTPUT) {</div><div class='hunk'>@@ -4390,79 +6274,109 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,</div><div class='ctx'> 		u32 tbid = l3mdev_fib_table_rcu(dev) ? : RT_TABLE_MAIN;</div><div class='ctx'> 		struct fib6_table *tb;</div><div class='ctx'> </div><div class='add'>+		if (flags &amp; BPF_FIB_LOOKUP_TBID) {</div><div class='add'>+			tbid = params-&gt;tbid;</div><div class='add'>+			/* zero out for vlan output */</div><div class='add'>+			params-&gt;tbid = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		tb = ipv6_stub-&gt;fib6_get_table(net, tbid);</div><div class='ctx'> 		if (unlikely(!tb))</div><div class='ctx'> 			return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='ctx'> </div><div class='del'>-		f6i = ipv6_stub-&gt;fib6_table_lookup(net, tb, oif, &amp;fl6, strict);</div><div class='add'>+		err = ipv6_stub-&gt;fib6_table_lookup(net, tb, oif, &amp;fl6, &amp;res,</div><div class='add'>+						   strict);</div><div class='ctx'> 	} else {</div><div class='del'>-		fl6.flowi6_mark = 0;</div><div class='add'>+		if (flags &amp; BPF_FIB_LOOKUP_MARK)</div><div class='add'>+			fl6.flowi6_mark = params-&gt;mark;</div><div class='add'>+		else</div><div class='add'>+			fl6.flowi6_mark = 0;</div><div class='ctx'> 		fl6.flowi6_secid = 0;</div><div class='ctx'> 		fl6.flowi6_tun_key.tun_id = 0;</div><div class='ctx'> 		fl6.flowi6_uid = sock_net_uid(net, NULL);</div><div class='ctx'> </div><div class='del'>-		f6i = ipv6_stub-&gt;fib6_lookup(net, oif, &amp;fl6, strict);</div><div class='add'>+		err = ipv6_stub-&gt;fib6_lookup(net, oif, &amp;fl6, &amp;res, strict);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(IS_ERR_OR_NULL(f6i) || f6i == net-&gt;ipv6.fib6_null_entry))</div><div class='add'>+	if (unlikely(err || IS_ERR_OR_NULL(res.f6i) ||</div><div class='add'>+		     res.f6i == net-&gt;ipv6.fib6_null_entry))</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f6i-&gt;fib6_flags &amp; RTF_REJECT)) {</div><div class='del'>-		switch (f6i-&gt;fib6_type) {</div><div class='del'>-		case RTN_BLACKHOLE:</div><div class='del'>-			return BPF_FIB_LKUP_RET_BLACKHOLE;</div><div class='del'>-		case RTN_UNREACHABLE:</div><div class='del'>-			return BPF_FIB_LKUP_RET_UNREACHABLE;</div><div class='del'>-		case RTN_PROHIBIT:</div><div class='del'>-			return BPF_FIB_LKUP_RET_PROHIBIT;</div><div class='del'>-		default:</div><div class='del'>-			return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (f6i-&gt;fib6_type != RTN_UNICAST)</div><div class='add'>+	switch (res.fib6_type) {</div><div class='add'>+	/* only unicast is forwarded */</div><div class='add'>+	case RTN_UNICAST:</div><div class='add'>+		break;</div><div class='add'>+	case RTN_BLACKHOLE:</div><div class='add'>+		return BPF_FIB_LKUP_RET_BLACKHOLE;</div><div class='add'>+	case RTN_UNREACHABLE:</div><div class='add'>+		return BPF_FIB_LKUP_RET_UNREACHABLE;</div><div class='add'>+	case RTN_PROHIBIT:</div><div class='add'>+		return BPF_FIB_LKUP_RET_PROHIBIT;</div><div class='add'>+	default:</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_NOT_FWDED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (f6i-&gt;fib6_nsiblings &amp;&amp; fl6.flowi6_oif == 0)</div><div class='del'>-		f6i = ipv6_stub-&gt;fib6_multipath_select(net, f6i, &amp;fl6,</div><div class='del'>-						       fl6.flowi6_oif, NULL,</div><div class='del'>-						       strict);</div><div class='add'>+	ipv6_stub-&gt;fib6_select_path(net, &amp;res, &amp;fl6, fl6.flowi6_oif,</div><div class='add'>+				    fl6.flowi6_oif != 0, NULL, strict);</div><div class='ctx'> </div><div class='ctx'> 	if (check_mtu) {</div><div class='del'>-		mtu = ipv6_stub-&gt;ip6_mtu_from_fib6(f6i, dst, src);</div><div class='del'>-		if (params-&gt;tot_len &gt; mtu)</div><div class='add'>+		mtu = ipv6_stub-&gt;ip6_mtu_from_fib6(&amp;res, dst, src);</div><div class='add'>+		if (params-&gt;tot_len &gt; mtu) {</div><div class='add'>+			params-&gt;mtu_result = mtu; /* union with tot_len */</div><div class='ctx'> 			return BPF_FIB_LKUP_RET_FRAG_NEEDED;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f6i-&gt;fib6_nh.nh_lwtstate)</div><div class='add'>+	if (res.nh-&gt;fib_nh_lws)</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_UNSUPP_LWT;</div><div class='ctx'> </div><div class='del'>-	if (f6i-&gt;fib6_flags &amp; RTF_GATEWAY)</div><div class='del'>-		*dst = f6i-&gt;fib6_nh.nh_gw;</div><div class='add'>+	if (res.nh-&gt;fib_nh_gw_family)</div><div class='add'>+		*dst = res.nh-&gt;fib_nh_gw6;</div><div class='ctx'> </div><div class='del'>-	dev = f6i-&gt;fib6_nh.nh_dev;</div><div class='del'>-	params-&gt;rt_metric = f6i-&gt;fib6_metric;</div><div class='add'>+	dev = res.nh-&gt;fib_nh_dev;</div><div class='add'>+	params-&gt;rt_metric = res.f6i-&gt;fib6_metric;</div><div class='add'>+	params-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BPF_FIB_LOOKUP_SRC) {</div><div class='add'>+		if (res.f6i-&gt;fib6_prefsrc.plen) {</div><div class='add'>+			*src = res.f6i-&gt;fib6_prefsrc.addr;</div><div class='add'>+		} else {</div><div class='add'>+			err = ipv6_bpf_stub-&gt;ipv6_dev_get_saddr(net, dev,</div><div class='add'>+								&amp;fl6.daddr, 0,</div><div class='add'>+								src);</div><div class='add'>+			if (err)</div><div class='add'>+				return BPF_FIB_LKUP_RET_NO_SRC_ADDR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BPF_FIB_LOOKUP_SKIP_NEIGH)</div><div class='add'>+		goto set_fwd_params;</div><div class='ctx'> </div><div class='ctx'> 	/* xdp and cls_bpf programs are run in RCU-bh so rcu_read_lock_bh is</div><div class='del'>-	 * not needed here. Can not use __ipv6_neigh_lookup_noref here</div><div class='del'>-	 * because we need to get nd_tbl via the stub</div><div class='add'>+	 * not needed here.</div><div class='ctx'> 	 */</div><div class='del'>-	neigh = ___neigh_lookup_noref(ipv6_stub-&gt;nd_tbl, neigh_key_eq128,</div><div class='del'>-				      ndisc_hashfn, dst, dev);</div><div class='del'>-	if (!neigh)</div><div class='add'>+	neigh = __ipv6_neigh_lookup_noref_stub(dev, dst);</div><div class='add'>+	if (!neigh || !(READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID))</div><div class='ctx'> 		return BPF_FIB_LKUP_RET_NO_NEIGH;</div><div class='add'>+	memcpy(params-&gt;dmac, neigh-&gt;ha, ETH_ALEN);</div><div class='add'>+	memcpy(params-&gt;smac, dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	return bpf_fib_set_fwd_params(params, neigh, dev);</div><div class='add'>+set_fwd_params:</div><div class='add'>+	return bpf_fib_set_fwd_params(params, mtu);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define BPF_FIB_LOOKUP_MASK (BPF_FIB_LOOKUP_DIRECT | BPF_FIB_LOOKUP_OUTPUT | \</div><div class='add'>+			     BPF_FIB_LOOKUP_SKIP_NEIGH | BPF_FIB_LOOKUP_TBID | \</div><div class='add'>+			     BPF_FIB_LOOKUP_SRC | BPF_FIB_LOOKUP_MARK)</div><div class='add'>+</div><div class='ctx'> BPF_CALL_4(bpf_xdp_fib_lookup, struct xdp_buff *, ctx,</div><div class='ctx'> 	   struct bpf_fib_lookup *, params, int, plen, u32, flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (plen &lt; sizeof(*params))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ~(BPF_FIB_LOOKUP_DIRECT | BPF_FIB_LOOKUP_OUTPUT))</div><div class='add'>+	if (flags &amp; ~BPF_FIB_LOOKUP_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (params-&gt;family) {</div><div class='hunk'>@@ -4495,32 +6409,41 @@ BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	int rc = -EAFNOSUPPORT;</div><div class='add'>+	bool check_mtu = false;</div><div class='ctx'> </div><div class='ctx'> 	if (plen &lt; sizeof(*params))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ~(BPF_FIB_LOOKUP_DIRECT | BPF_FIB_LOOKUP_OUTPUT))</div><div class='add'>+	if (flags &amp; ~BPF_FIB_LOOKUP_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;tot_len)</div><div class='add'>+		check_mtu = true;</div><div class='add'>+</div><div class='ctx'> 	switch (params-&gt;family) {</div><div class='ctx'> #if IS_ENABLED(CONFIG_INET)</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		rc = bpf_ipv4_fib_lookup(net, params, flags, false);</div><div class='add'>+		rc = bpf_ipv4_fib_lookup(net, params, flags, check_mtu);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		rc = bpf_ipv6_fib_lookup(net, params, flags, false);</div><div class='add'>+		rc = bpf_ipv6_fib_lookup(net, params, flags, check_mtu);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!rc) {</div><div class='add'>+	if (rc == BPF_FIB_LKUP_RET_SUCCESS &amp;&amp; !check_mtu) {</div><div class='ctx'> 		struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+		/* When tot_len isn't provided by user, check skb</div><div class='add'>+		 * against MTU of FIB lookup resulting net_device</div><div class='add'>+		 */</div><div class='ctx'> 		dev = dev_get_by_index_rcu(net, params-&gt;ifindex);</div><div class='ctx'> 		if (!is_skb_forwardable(dev, skb))</div><div class='ctx'> 			rc = BPF_FIB_LKUP_RET_FRAG_NEEDED;</div><div class='add'>+</div><div class='add'>+		params-&gt;mtu_result = dev-&gt;mtu; /* union with tot_len */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -4536,13 +6459,126 @@ static const struct bpf_func_proto bpf_skb_fib_lookup_proto = {</div><div class='ctx'> 	.arg4_type	= ARG_ANYTHING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct net_device *__dev_via_ifindex(struct net_device *dev_curr,</div><div class='add'>+					    u32 ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net *netns = dev_net(dev_curr);</div><div class='add'>+</div><div class='add'>+	/* Non-redirect use-cases can use ifindex=0 and save ifindex lookup */</div><div class='add'>+	if (ifindex == 0)</div><div class='add'>+		return dev_curr;</div><div class='add'>+</div><div class='add'>+	return dev_get_by_index_rcu(netns, ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_skb_check_mtu, struct sk_buff *, skb,</div><div class='add'>+	   u32, ifindex, u32 *, mtu_len, s32, len_diff, u64, flags)</div><div class='add'>+{</div><div class='add'>+	int ret = BPF_MTU_CHK_RET_FRAG_NEEDED;</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	int mtu, dev_len, skb_len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_MTU_CHK_SEGS)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (unlikely(flags &amp; BPF_MTU_CHK_SEGS &amp;&amp; (len_diff || *mtu_len)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = __dev_via_ifindex(dev, ifindex);</div><div class='add'>+	if (unlikely(!dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mtu = READ_ONCE(dev-&gt;mtu);</div><div class='add'>+	dev_len = mtu + dev-&gt;hard_header_len;</div><div class='add'>+</div><div class='add'>+	/* If set use *mtu_len as input, L3 as iph-&gt;tot_len (like fib_lookup) */</div><div class='add'>+	skb_len = *mtu_len ? *mtu_len + dev-&gt;hard_header_len : skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	skb_len += len_diff; /* minus result pass check */</div><div class='add'>+	if (skb_len &lt;= dev_len) {</div><div class='add'>+		ret = BPF_MTU_CHK_RET_SUCCESS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* At this point, skb-&gt;len exceed MTU, but as it include length of all</div><div class='add'>+	 * segments, it can still be below MTU.  The SKB can possibly get</div><div class='add'>+	 * re-segmented in transmit path (see validate_xmit_skb).  Thus, user</div><div class='add'>+	 * must choose if segs are to be MTU checked.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		ret = BPF_MTU_CHK_RET_SUCCESS;</div><div class='add'>+		if (flags &amp; BPF_MTU_CHK_SEGS) {</div><div class='add'>+			if (!skb_transport_header_was_set(skb))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (!skb_gso_validate_network_len(skb, mtu))</div><div class='add'>+				ret = BPF_MTU_CHK_RET_SEGS_TOOBIG;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	*mtu_len = mtu;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_xdp_check_mtu, struct xdp_buff *, xdp,</div><div class='add'>+	   u32, ifindex, u32 *, mtu_len, s32, len_diff, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = xdp-&gt;rxq-&gt;dev;</div><div class='add'>+	int xdp_len = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	int ret = BPF_MTU_CHK_RET_SUCCESS;</div><div class='add'>+	int mtu, dev_len;</div><div class='add'>+</div><div class='add'>+	/* XDP variant doesn't support multi-buffer segment check (yet) */</div><div class='add'>+	if (unlikely(flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = __dev_via_ifindex(dev, ifindex);</div><div class='add'>+	if (unlikely(!dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mtu = READ_ONCE(dev-&gt;mtu);</div><div class='add'>+	dev_len = mtu + dev-&gt;hard_header_len;</div><div class='add'>+</div><div class='add'>+	/* Use *mtu_len as input, L3 as iph-&gt;tot_len (like fib_lookup) */</div><div class='add'>+	if (*mtu_len)</div><div class='add'>+		xdp_len = *mtu_len + dev-&gt;hard_header_len;</div><div class='add'>+</div><div class='add'>+	xdp_len += len_diff; /* minus result pass check */</div><div class='add'>+	if (xdp_len &gt; dev_len)</div><div class='add'>+		ret = BPF_MTU_CHK_RET_FRAG_NEEDED;</div><div class='add'>+</div><div class='add'>+	*mtu_len = mtu;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_skb_check_mtu_proto = {</div><div class='add'>+	.func		= bpf_skb_check_mtu,</div><div class='add'>+	.gpl_only	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='add'>+	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,</div><div class='add'>+	.arg3_size	= sizeof(u32),</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg5_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_check_mtu_proto = {</div><div class='add'>+	.func		= bpf_xdp_check_mtu,</div><div class='add'>+	.gpl_only	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='add'>+	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,</div><div class='add'>+	.arg3_size	= sizeof(u32),</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg5_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)</div><div class='ctx'> static int bpf_push_seg6_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ipv6_sr_hdr *srh = (struct ipv6_sr_hdr *)hdr;</div><div class='ctx'> </div><div class='del'>-	if (!seg6_validate_srh(srh, len))</div><div class='add'>+	if (!seg6_validate_srh(srh, len, false))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -4565,14 +6601,21 @@ static int bpf_push_seg6_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='ctx'> </div><div class='ctx'> 	return seg6_lookup_nexthop(skb, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IPV6_SEG6_BPF */</div><div class='ctx'> </div><div class='del'>-BPF_CALL_4(bpf_lwt_push_encap, struct sk_buff *, skb, u32, type, void *, hdr,</div><div class='add'>+#if IS_ENABLED(CONFIG_LWTUNNEL_BPF)</div><div class='add'>+static int bpf_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len,</div><div class='add'>+			     bool ingress)</div><div class='add'>+{</div><div class='add'>+	return bpf_lwt_push_ip_encap(skb, hdr, len, ingress);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_lwt_in_push_encap, struct sk_buff *, skb, u32, type, void *, hdr,</div><div class='ctx'> 	   u32, len)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -4581,18 +6624,45 @@ BPF_CALL_4(bpf_lwt_push_encap, struct sk_buff *, skb, u32, type, void *, hdr,</div><div class='ctx'> 	case BPF_LWT_ENCAP_SEG6_INLINE:</div><div class='ctx'> 		return bpf_push_seg6_encap(skb, type, hdr, len);</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_LWTUNNEL_BPF)</div><div class='add'>+	case BPF_LWT_ENCAP_IP:</div><div class='add'>+		return bpf_push_ip_encap(skb, hdr, len, true /* ingress */);</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto bpf_lwt_push_encap_proto = {</div><div class='del'>-	.func		= bpf_lwt_push_encap,</div><div class='add'>+BPF_CALL_4(bpf_lwt_xmit_push_encap, struct sk_buff *, skb, u32, type,</div><div class='add'>+	   void *, hdr, u32, len)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+#if IS_ENABLED(CONFIG_LWTUNNEL_BPF)</div><div class='add'>+	case BPF_LWT_ENCAP_IP:</div><div class='add'>+		return bpf_push_ip_encap(skb, hdr, len, false /* egress */);</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_lwt_in_push_encap_proto = {</div><div class='add'>+	.func		= bpf_lwt_in_push_encap,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg4_type	= ARG_CONST_SIZE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_lwt_xmit_push_encap_proto = {</div><div class='add'>+	.func		= bpf_lwt_xmit_push_encap,</div><div class='ctx'> 	.gpl_only	= false,</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='del'>-	.arg3_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4606,6 +6676,7 @@ BPF_CALL_4(bpf_lwt_seg6_store_bytes, struct sk_buff *, skb, u32, offset,</div><div class='ctx'> 	void *srh_tlvs, *srh_end, *ptr;</div><div class='ctx'> 	int srhoff = 0;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;srh_state-&gt;bh_lock);</div><div class='ctx'> 	if (srh == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -4635,7 +6706,7 @@ static const struct bpf_func_proto bpf_lwt_seg6_store_bytes_proto = {</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='del'>-	.arg3_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4662,6 +6733,7 @@ BPF_CALL_4(bpf_lwt_seg6_action, struct sk_buff *, skb,</div><div class='ctx'> 	int hdroff = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;srh_state-&gt;bh_lock);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case SEG6_LOCAL_ACTION_END_X:</div><div class='ctx'> 		if (!seg6_bpf_has_valid_srh(skb))</div><div class='hunk'>@@ -4723,7 +6795,7 @@ static const struct bpf_func_proto bpf_lwt_seg6_action_proto = {</div><div class='ctx'> 	.ret_type	= RET_INTEGER,</div><div class='ctx'> 	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='ctx'> 	.arg2_type	= ARG_ANYTHING,</div><div class='del'>-	.arg3_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='ctx'> 	.arg4_type	= ARG_CONST_SIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4738,6 +6810,7 @@ BPF_CALL_3(bpf_lwt_seg6_adjust_srh, struct sk_buff *, skb, u32, offset,</div><div class='ctx'> 	int srhoff = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;srh_state-&gt;bh_lock);</div><div class='ctx'> 	if (unlikely(srh == NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -4787,91 +6860,1324 @@ static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_IPV6_SEG6_BPF */</div><div class='ctx'> </div><div class='del'>-bool bpf_helper_changes_pkt_data(void *func)</div><div class='del'>-{</div><div class='del'>-	if (func == bpf_skb_vlan_push ||</div><div class='del'>-	    func == bpf_skb_vlan_pop ||</div><div class='del'>-	    func == bpf_skb_store_bytes ||</div><div class='del'>-	    func == bpf_skb_change_proto ||</div><div class='del'>-	    func == bpf_skb_change_head ||</div><div class='del'>-	    func == sk_skb_change_head ||</div><div class='del'>-	    func == bpf_skb_change_tail ||</div><div class='del'>-	    func == sk_skb_change_tail ||</div><div class='del'>-	    func == bpf_skb_adjust_room ||</div><div class='del'>-	    func == bpf_skb_pull_data ||</div><div class='del'>-	    func == sk_skb_pull_data ||</div><div class='del'>-	    func == bpf_clone_redirect ||</div><div class='del'>-	    func == bpf_l3_csum_replace ||</div><div class='del'>-	    func == bpf_l4_csum_replace ||</div><div class='del'>-	    func == bpf_xdp_adjust_head ||</div><div class='del'>-	    func == bpf_xdp_adjust_meta ||</div><div class='del'>-	    func == bpf_msg_pull_data ||</div><div class='del'>-	    func == bpf_xdp_adjust_tail ||</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)</div><div class='del'>-	    func == bpf_lwt_seg6_store_bytes ||</div><div class='del'>-	    func == bpf_lwt_seg6_adjust_srh ||</div><div class='del'>-	    func == bpf_lwt_seg6_action ||</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,</div><div class='add'>+			      int dif, int sdif, u8 family, u8 proto)</div><div class='add'>+{</div><div class='add'>+	bool refcounted = false;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		__be32 src4 = tuple-&gt;ipv4.saddr;</div><div class='add'>+		__be32 dst4 = tuple-&gt;ipv4.daddr;</div><div class='add'>+</div><div class='add'>+		if (proto == IPPROTO_TCP)</div><div class='add'>+			sk = __inet_lookup(net, NULL, 0,</div><div class='add'>+					   src4, tuple-&gt;ipv4.sport,</div><div class='add'>+					   dst4, tuple-&gt;ipv4.dport,</div><div class='add'>+					   dif, sdif, &amp;refcounted);</div><div class='add'>+		else</div><div class='add'>+			sk = __udp4_lib_lookup(net, src4, tuple-&gt;ipv4.sport,</div><div class='add'>+					       dst4, tuple-&gt;ipv4.dport,</div><div class='add'>+					       dif, sdif, net-&gt;ipv4.udp_table, NULL);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		struct in6_addr *src6 = (struct in6_addr *)&amp;tuple-&gt;ipv6.saddr;</div><div class='add'>+		struct in6_addr *dst6 = (struct in6_addr *)&amp;tuple-&gt;ipv6.daddr;</div><div class='add'>+</div><div class='add'>+		if (proto == IPPROTO_TCP)</div><div class='add'>+			sk = __inet6_lookup(net, NULL, 0,</div><div class='add'>+					    src6, tuple-&gt;ipv6.sport,</div><div class='add'>+					    dst6, ntohs(tuple-&gt;ipv6.dport),</div><div class='add'>+					    dif, sdif, &amp;refcounted);</div><div class='add'>+		else if (likely(ipv6_bpf_stub))</div><div class='add'>+			sk = ipv6_bpf_stub-&gt;udp6_lib_lookup(net,</div><div class='add'>+							    src6, tuple-&gt;ipv6.sport,</div><div class='add'>+							    dst6, tuple-&gt;ipv6.dport,</div><div class='add'>+							    dif, sdif,</div><div class='add'>+							    net-&gt;ipv4.udp_table, NULL);</div><div class='ctx'> #endif</div><div class='del'>-	    func == bpf_lwt_push_encap)</div><div class='del'>-		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	if (unlikely(sk &amp;&amp; !refcounted &amp;&amp; !sock_flag(sk, SOCK_RCU_FREE))) {</div><div class='add'>+		WARN_ONCE(1, "Found non-RCU, unreferenced socket!");</div><div class='add'>+		sk = NULL;</div><div class='add'>+	}</div><div class='add'>+	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bpf_func_proto *</div><div class='del'>-bpf_base_func_proto(enum bpf_func_id func_id)</div><div class='add'>+/* bpf_skc_lookup performs the core lookup for different types of sockets,</div><div class='add'>+ * taking a reference on the socket if it doesn't have the flag SOCK_RCU_FREE.</div><div class='add'>+ */</div><div class='add'>+static struct sock *</div><div class='add'>+__bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,</div><div class='add'>+		 struct net *caller_net, u32 ifindex, u8 proto, u64 netns_id,</div><div class='add'>+		 u64 flags, int sdif)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+	struct net *net;</div><div class='add'>+	u8 family;</div><div class='add'>+</div><div class='add'>+	if (len == sizeof(tuple-&gt;ipv4))</div><div class='add'>+		family = AF_INET;</div><div class='add'>+	else if (len == sizeof(tuple-&gt;ipv6))</div><div class='add'>+		family = AF_INET6;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags || !((s32)netns_id &lt; 0 || netns_id &lt;= S32_MAX)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sdif &lt; 0) {</div><div class='add'>+		if (family == AF_INET)</div><div class='add'>+			sdif = inet_sdif(skb);</div><div class='add'>+		else</div><div class='add'>+			sdif = inet6_sdif(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((s32)netns_id &lt; 0) {</div><div class='add'>+		net = caller_net;</div><div class='add'>+		sk = sk_lookup(net, tuple, ifindex, sdif, family, proto);</div><div class='add'>+	} else {</div><div class='add'>+		net = get_net_ns_by_id(caller_net, netns_id);</div><div class='add'>+		if (unlikely(!net))</div><div class='add'>+			goto out;</div><div class='add'>+		sk = sk_lookup(net, tuple, ifindex, sdif, family, proto);</div><div class='add'>+		put_net(net);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *</div><div class='add'>+__bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,</div><div class='add'>+		struct net *caller_net, u32 ifindex, u8 proto, u64 netns_id,</div><div class='add'>+		u64 flags, int sdif)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = __bpf_skc_lookup(skb, tuple, len, caller_net,</div><div class='add'>+					   ifindex, proto, netns_id, flags,</div><div class='add'>+					   sdif);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		struct sock *sk2 = sk_to_full_sk(sk);</div><div class='add'>+</div><div class='add'>+		/* sk_to_full_sk() may return (sk)-&gt;rsk_listener, so make sure the original sk</div><div class='add'>+		 * sock refcnt is decremented to prevent a request_sock leak.</div><div class='add'>+		 */</div><div class='add'>+		if (sk2 != sk) {</div><div class='add'>+			sock_gen_put(sk);</div><div class='add'>+			/* Ensure there is no need to bump sk2 refcnt */</div><div class='add'>+			if (unlikely(sk2 &amp;&amp; !sock_flag(sk2, SOCK_RCU_FREE))) {</div><div class='add'>+				WARN_ONCE(1, "Found non-RCU, unreferenced socket!");</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			sk = sk2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *</div><div class='add'>+bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,</div><div class='add'>+	       u8 proto, u64 netns_id, u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct net *caller_net;</div><div class='add'>+	int ifindex;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;dev) {</div><div class='add'>+		caller_net = dev_net(skb-&gt;dev);</div><div class='add'>+		ifindex = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	} else {</div><div class='add'>+		caller_net = sock_net(skb-&gt;sk);</div><div class='add'>+		ifindex = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __bpf_skc_lookup(skb, tuple, len, caller_net, ifindex, proto,</div><div class='add'>+				netns_id, flags, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *</div><div class='add'>+bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,</div><div class='add'>+	      u8 proto, u64 netns_id, u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = bpf_skc_lookup(skb, tuple, len, proto, netns_id,</div><div class='add'>+					 flags);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		struct sock *sk2 = sk_to_full_sk(sk);</div><div class='add'>+</div><div class='add'>+		/* sk_to_full_sk() may return (sk)-&gt;rsk_listener, so make sure the original sk</div><div class='add'>+		 * sock refcnt is decremented to prevent a request_sock leak.</div><div class='add'>+		 */</div><div class='add'>+		if (sk2 != sk) {</div><div class='add'>+			sock_gen_put(sk);</div><div class='add'>+			/* Ensure there is no need to bump sk2 refcnt */</div><div class='add'>+			if (unlikely(sk2 &amp;&amp; !sock_flag(sk2, SOCK_RCU_FREE))) {</div><div class='add'>+				WARN_ONCE(1, "Found non-RCU, unreferenced socket!");</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			sk = sk2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_skc_lookup_tcp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)bpf_skc_lookup(skb, tuple, len, IPPROTO_TCP,</div><div class='add'>+					     netns_id, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_skc_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_skc_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCK_COMMON_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sk_lookup_tcp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)bpf_sk_lookup(skb, tuple, len, IPPROTO_TCP,</div><div class='add'>+					    netns_id, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_sk_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sk_lookup_udp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)bpf_sk_lookup(skb, tuple, len, IPPROTO_UDP,</div><div class='add'>+					    netns_id, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_lookup_udp_proto = {</div><div class='add'>+	.func		= bpf_sk_lookup_udp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_skc_lookup(skb, tuple, len, caller_net,</div><div class='add'>+					       ifindex, IPPROTO_TCP, netns_id,</div><div class='add'>+					       flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_tc_skc_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCK_COMMON_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,</div><div class='add'>+					      ifindex, IPPROTO_TCP, netns_id,</div><div class='add'>+					      flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_tc_sk_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,</div><div class='add'>+					      ifindex, IPPROTO_UDP, netns_id,</div><div class='add'>+					      flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tc_sk_lookup_udp_proto = {</div><div class='add'>+	.func		= bpf_tc_sk_lookup_udp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_sk_release, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	if (sk &amp;&amp; sk_is_refcounted(sk))</div><div class='add'>+		sock_gen_put(sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_release_proto = {</div><div class='add'>+	.func		= bpf_sk_release,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON | OBJ_RELEASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_xdp_sk_lookup_udp, struct xdp_buff *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = ctx-&gt;rxq-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net,</div><div class='add'>+					      ifindex, IPPROTO_UDP, netns_id,</div><div class='add'>+					      flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_sk_lookup_udp_proto = {</div><div class='add'>+	.func           = bpf_xdp_sk_lookup_udp,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.pkt_access     = true,</div><div class='add'>+	.ret_type       = RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type      = ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg5_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_xdp_skc_lookup_tcp, struct xdp_buff *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = ctx-&gt;rxq-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_skc_lookup(NULL, tuple, len, caller_net,</div><div class='add'>+					       ifindex, IPPROTO_TCP, netns_id,</div><div class='add'>+					       flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_skc_lookup_tcp_proto = {</div><div class='add'>+	.func           = bpf_xdp_skc_lookup_tcp,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.pkt_access     = true,</div><div class='add'>+	.ret_type       = RET_PTR_TO_SOCK_COMMON_OR_NULL,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type      = ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg5_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_xdp_sk_lookup_tcp, struct xdp_buff *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = ctx-&gt;rxq-&gt;dev;</div><div class='add'>+	int ifindex = dev-&gt;ifindex, sdif = dev_sdif(dev);</div><div class='add'>+	struct net *caller_net = dev_net(dev);</div><div class='add'>+</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net,</div><div class='add'>+					      ifindex, IPPROTO_TCP, netns_id,</div><div class='add'>+					      flags, sdif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_xdp_sk_lookup_tcp_proto = {</div><div class='add'>+	.func           = bpf_xdp_sk_lookup_tcp,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.pkt_access     = true,</div><div class='add'>+	.ret_type       = RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type      = ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+	.arg5_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_addr_skc_lookup_tcp, struct bpf_sock_addr_kern *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)__bpf_skc_lookup(NULL, tuple, len,</div><div class='add'>+					       sock_net(ctx-&gt;sk), 0,</div><div class='add'>+					       IPPROTO_TCP, netns_id, flags,</div><div class='add'>+					       -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_addr_skc_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_sock_addr_skc_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCK_COMMON_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_addr_sk_lookup_tcp, struct bpf_sock_addr_kern *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(NULL, tuple, len,</div><div class='add'>+					      sock_net(ctx-&gt;sk), 0, IPPROTO_TCP,</div><div class='add'>+					      netns_id, flags, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_addr_sk_lookup_tcp_proto = {</div><div class='add'>+	.func		= bpf_sock_addr_sk_lookup_tcp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_sock_addr_sk_lookup_udp, struct bpf_sock_addr_kern *, ctx,</div><div class='add'>+	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)__bpf_sk_lookup(NULL, tuple, len,</div><div class='add'>+					      sock_net(ctx-&gt;sk), 0, IPPROTO_UDP,</div><div class='add'>+					      netns_id, flags, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_addr_sk_lookup_udp_proto = {</div><div class='add'>+	.func		= bpf_sock_addr_sk_lookup_udp,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+	.arg5_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool bpf_tcp_sock_is_valid_access(int off, int size, enum bpf_access_type type,</div><div class='add'>+				  struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	if (off &lt; 0 || off &gt;= offsetofend(struct bpf_tcp_sock,</div><div class='add'>+					  icsk_retransmits))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (off % size != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, bytes_received):</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, bytes_acked):</div><div class='add'>+		return size == sizeof(__u64);</div><div class='add'>+	default:</div><div class='add'>+		return size == sizeof(__u32);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='add'>+				    const struct bpf_insn *si,</div><div class='add'>+				    struct bpf_insn *insn_buf,</div><div class='add'>+				    struct bpf_prog *prog, u32 *target_size)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+#define BPF_TCP_SOCK_GET_COMMON(FIELD)					\</div><div class='add'>+	do {								\</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct tcp_sock, FIELD) &gt;	\</div><div class='add'>+			     sizeof_field(struct bpf_tcp_sock, FIELD));	\</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct tcp_sock, FIELD),\</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,		\</div><div class='add'>+				      offsetof(struct tcp_sock, FIELD)); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define BPF_INET_SOCK_GET_COMMON(FIELD)					\</div><div class='add'>+	do {								\</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct inet_connection_sock,	\</div><div class='add'>+					  FIELD) &gt;			\</div><div class='add'>+			     sizeof_field(struct bpf_tcp_sock, FIELD));	\</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			\</div><div class='add'>+					struct inet_connection_sock,	\</div><div class='add'>+					FIELD),				\</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,		\</div><div class='add'>+				      offsetof(				\</div><div class='add'>+					struct inet_connection_sock,	\</div><div class='add'>+					FIELD));			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	BTF_TYPE_EMIT(struct bpf_tcp_sock);</div><div class='add'>+</div><div class='add'>+	switch (si-&gt;off) {</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, rtt_min):</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct tcp_sock, rtt_min) !=</div><div class='add'>+			     sizeof(struct minmax));</div><div class='add'>+		BUILD_BUG_ON(sizeof(struct minmax) &lt;</div><div class='add'>+			     sizeof(struct minmax_sample));</div><div class='add'>+</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct tcp_sock, rtt_min) +</div><div class='add'>+				      offsetof(struct minmax_sample, v));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, snd_cwnd):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(snd_cwnd);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, srtt_us):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(srtt_us);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, snd_ssthresh):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(snd_ssthresh);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, rcv_nxt):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(rcv_nxt);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, snd_nxt):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(snd_nxt);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, snd_una):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(snd_una);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, mss_cache):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(mss_cache);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, ecn_flags):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(ecn_flags);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, rate_delivered):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(rate_delivered);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, rate_interval_us):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(rate_interval_us);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, packets_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(packets_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, retrans_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(retrans_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, total_retrans):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(total_retrans);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, segs_in):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(segs_in);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, data_segs_in):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(data_segs_in);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, segs_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(segs_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, data_segs_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(data_segs_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, lost_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(lost_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, sacked_out):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(sacked_out);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, bytes_received):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(bytes_received);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, bytes_acked):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(bytes_acked);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, dsack_dups):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(dsack_dups);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, delivered):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(delivered);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, delivered_ce):</div><div class='add'>+		BPF_TCP_SOCK_GET_COMMON(delivered_ce);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_tcp_sock, icsk_retransmits):</div><div class='add'>+		BPF_INET_SOCK_GET_COMMON(icsk_retransmits);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_tcp_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	if (sk_fullsock(sk) &amp;&amp; sk-&gt;sk_protocol == IPPROTO_TCP)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_tcp_sock_proto = {</div><div class='add'>+	.func		= bpf_tcp_sock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_TCP_SOCK_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_SOCK_COMMON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_get_listener_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	sk = sk_to_full_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_state == TCP_LISTEN &amp;&amp; sock_flag(sk, SOCK_RCU_FREE))</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_get_listener_sock_proto = {</div><div class='add'>+	.func		= bpf_get_listener_sock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_SOCK_COMMON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skb_ecn_set_ce, struct sk_buff *, skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int iphdr_len;</div><div class='add'>+</div><div class='add'>+	switch (skb_protocol(skb, true)) {</div><div class='add'>+	case cpu_to_be16(ETH_P_IP):</div><div class='add'>+		iphdr_len = sizeof(struct iphdr);</div><div class='add'>+		break;</div><div class='add'>+	case cpu_to_be16(ETH_P_IPV6):</div><div class='add'>+		iphdr_len = sizeof(struct ipv6hdr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_headlen(skb) &lt; iphdr_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (skb_cloned(skb) &amp;&amp; !skb_clone_writable(skb, iphdr_len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return INET_ECN_set_ce(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bpf_xdp_sock_is_valid_access(int off, int size, enum bpf_access_type type,</div><div class='add'>+				  struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	if (off &lt; 0 || off &gt;= offsetofend(struct bpf_xdp_sock, queue_id))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (off % size != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	default:</div><div class='add'>+		return size == sizeof(__u32);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='add'>+				    const struct bpf_insn *si,</div><div class='add'>+				    struct bpf_insn *insn_buf,</div><div class='add'>+				    struct bpf_prog *prog, u32 *target_size)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+#define BPF_XDP_SOCK_GET(FIELD)						\</div><div class='add'>+	do {								\</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct xdp_sock, FIELD) &gt;	\</div><div class='add'>+			     sizeof_field(struct bpf_xdp_sock, FIELD));	\</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct xdp_sock, FIELD),\</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,		\</div><div class='add'>+				      offsetof(struct xdp_sock, FIELD)); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	BTF_TYPE_EMIT(struct bpf_xdp_sock);</div><div class='add'>+</div><div class='add'>+	switch (si-&gt;off) {</div><div class='add'>+	case offsetof(struct bpf_xdp_sock, queue_id):</div><div class='add'>+		BPF_XDP_SOCK_GET(queue_id);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_skb_ecn_set_ce_proto = {</div><div class='add'>+	.func           = bpf_skb_ecn_set_ce,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_tcp_check_syncookie, struct sock *, sk, void *, iph, u32, iph_len,</div><div class='add'>+	   struct tcphdr *, th, u32, th_len)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!sk || th_len &lt; sizeof(*th)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* sk_listener() allows TCP_NEW_SYN_RECV, which makes no sense here. */</div><div class='add'>+	if (sk-&gt;sk_protocol != IPPROTO_TCP || sk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_syncookies))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!th-&gt;ack || th-&gt;rst || th-&gt;syn)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (unlikely(iph_len &lt; sizeof(struct iphdr)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tcp_synq_no_recent_overflow(sk))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Both struct iphdr and struct ipv6hdr have the version field at the</div><div class='add'>+	 * same offset so we can cast to the shorter header (struct iphdr).</div><div class='add'>+	 */</div><div class='add'>+	switch (((struct iphdr *)iph)-&gt;version) {</div><div class='add'>+	case 4:</div><div class='add'>+		if (sk-&gt;sk_family == AF_INET6 &amp;&amp; ipv6_only_sock(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = __cookie_v4_check((struct iphdr *)iph, th);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	case 6:</div><div class='add'>+		if (unlikely(iph_len &lt; sizeof(struct ipv6hdr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_family != AF_INET6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = __cookie_v6_check((struct ipv6hdr *)iph, th);</div><div class='add'>+		break;</div><div class='add'>+#endif /* CONFIG_IPV6 */</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+#else</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_check_syncookie_proto = {</div><div class='add'>+	.func		= bpf_tcp_check_syncookie,</div><div class='add'>+	.gpl_only	= true,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_5(bpf_tcp_gen_syncookie, struct sock *, sk, void *, iph, u32, iph_len,</div><div class='add'>+	   struct tcphdr *, th, u32, th_len)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u16 mss;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!sk || th_len &lt; sizeof(*th) || th_len != th-&gt;doff * 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_protocol != IPPROTO_TCP || sk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_syncookies))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!th-&gt;syn || th-&gt;ack || th-&gt;fin || th-&gt;rst)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(iph_len &lt; sizeof(struct iphdr)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Both struct iphdr and struct ipv6hdr have the version field at the</div><div class='add'>+	 * same offset so we can cast to the shorter header (struct iphdr).</div><div class='add'>+	 */</div><div class='add'>+	switch (((struct iphdr *)iph)-&gt;version) {</div><div class='add'>+	case 4:</div><div class='add'>+		if (sk-&gt;sk_family == AF_INET6 &amp;&amp; ipv6_only_sock(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mss = tcp_v4_get_syncookie(sk, iph, th, &amp;cookie);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	case 6:</div><div class='add'>+		if (unlikely(iph_len &lt; sizeof(struct ipv6hdr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_family != AF_INET6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mss = tcp_v6_get_syncookie(sk, iph, th, &amp;cookie);</div><div class='add'>+		break;</div><div class='add'>+#endif /* CONFIG_IPV6 */</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+	if (mss == 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return cookie | ((u64)mss &lt;&lt; 32);</div><div class='add'>+#else</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+#endif /* CONFIG_SYN_COOKIES */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_gen_syncookie_proto = {</div><div class='add'>+	.func		= bpf_tcp_gen_syncookie,</div><div class='add'>+	.gpl_only	= true, /* __cookie_v*_init_sequence() is GPL */</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE,</div><div class='add'>+	.arg4_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg5_type	= ARG_CONST_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_3(bpf_sk_assign, struct sk_buff *, skb, struct sock *, sk, u64, flags)</div><div class='add'>+{</div><div class='add'>+	if (!sk || flags != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!skb_at_tc_ingress(skb))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (unlikely(dev_net(skb-&gt;dev) != sock_net(sk)))</div><div class='add'>+		return -ENETUNREACH;</div><div class='add'>+	if (sk_unhashed(sk))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (sk_is_refcounted(sk) &amp;&amp;</div><div class='add'>+	    unlikely(!refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	skb_orphan(skb);</div><div class='add'>+	skb-&gt;sk = sk;</div><div class='add'>+	skb-&gt;destructor = sock_pfree;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_assign_proto = {</div><div class='add'>+	.func		= bpf_sk_assign,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 *bpf_search_tcp_opt(const u8 *op, const u8 *opend,</div><div class='add'>+				    u8 search_kind, const u8 *magic,</div><div class='add'>+				    u8 magic_len, bool *eol)</div><div class='add'>+{</div><div class='add'>+	u8 kind, kind_len;</div><div class='add'>+</div><div class='add'>+	*eol = false;</div><div class='add'>+</div><div class='add'>+	while (op &lt; opend) {</div><div class='add'>+		kind = op[0];</div><div class='add'>+</div><div class='add'>+		if (kind == TCPOPT_EOL) {</div><div class='add'>+			*eol = true;</div><div class='add'>+			return ERR_PTR(-ENOMSG);</div><div class='add'>+		} else if (kind == TCPOPT_NOP) {</div><div class='add'>+			op++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (opend - op &lt; 2 || opend - op &lt; op[1] || op[1] &lt; 2)</div><div class='add'>+			/* Something is wrong in the received header.</div><div class='add'>+			 * Follow the TCP stack's tcp_parse_options()</div><div class='add'>+			 * and just bail here.</div><div class='add'>+			 */</div><div class='add'>+			return ERR_PTR(-EFAULT);</div><div class='add'>+</div><div class='add'>+		kind_len = op[1];</div><div class='add'>+		if (search_kind == kind) {</div><div class='add'>+			if (!magic_len)</div><div class='add'>+				return op;</div><div class='add'>+</div><div class='add'>+			if (magic_len &gt; kind_len - 2)</div><div class='add'>+				return ERR_PTR(-ENOMSG);</div><div class='add'>+</div><div class='add'>+			if (!memcmp(&amp;op[2], magic, magic_len))</div><div class='add'>+				return op;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		op += kind_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENOMSG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sock_ops_load_hdr_opt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+	   void *, search_res, u32, len, u64, flags)</div><div class='add'>+{</div><div class='add'>+	bool eol, load_syn = flags &amp; BPF_LOAD_HDR_OPT_TCP_SYN;</div><div class='add'>+	const u8 *op, *opend, *magic, *search = search_res;</div><div class='add'>+	u8 search_kind, search_len, copy_len, magic_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_locked_tcp_sock_ops(bpf_sock))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* 2 byte is the minimal option len except TCPOPT_NOP and</div><div class='add'>+	 * TCPOPT_EOL which are useless for the bpf prog to learn</div><div class='add'>+	 * and this helper disallow loading them also.</div><div class='add'>+	 */</div><div class='add'>+	if (len &lt; 2 || flags &amp; ~BPF_LOAD_HDR_OPT_TCP_SYN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	search_kind = search[0];</div><div class='add'>+	search_len = search[1];</div><div class='add'>+</div><div class='add'>+	if (search_len &gt; len || search_kind == TCPOPT_NOP ||</div><div class='add'>+	    search_kind == TCPOPT_EOL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (search_kind == TCPOPT_EXP || search_kind == 253) {</div><div class='add'>+		/* 16 or 32 bit magic.  +2 for kind and kind length */</div><div class='add'>+		if (search_len != 4 &amp;&amp; search_len != 6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		magic = &amp;search[2];</div><div class='add'>+		magic_len = search_len - 2;</div><div class='add'>+	} else {</div><div class='add'>+		if (search_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		magic = NULL;</div><div class='add'>+		magic_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (load_syn) {</div><div class='add'>+		ret = bpf_sock_ops_get_syn(bpf_sock, TCP_BPF_SYN, &amp;op);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		opend = op + ret;</div><div class='add'>+		op += sizeof(struct tcphdr);</div><div class='add'>+	} else {</div><div class='add'>+		if (!bpf_sock-&gt;skb ||</div><div class='add'>+		    bpf_sock-&gt;op == BPF_SOCK_OPS_HDR_OPT_LEN_CB)</div><div class='add'>+			/* This bpf_sock-&gt;op cannot call this helper */</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		opend = bpf_sock-&gt;skb_data_end;</div><div class='add'>+		op = bpf_sock-&gt;skb-&gt;data + sizeof(struct tcphdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	op = bpf_search_tcp_opt(op, opend, search_kind, magic, magic_len,</div><div class='add'>+				&amp;eol);</div><div class='add'>+	if (IS_ERR(op))</div><div class='add'>+		return PTR_ERR(op);</div><div class='add'>+</div><div class='add'>+	copy_len = op[1];</div><div class='add'>+	ret = copy_len;</div><div class='add'>+	if (copy_len &gt; len) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		copy_len = len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(search_res, op, copy_len);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_ops_load_hdr_opt_proto = {</div><div class='add'>+	.func		= bpf_sock_ops_load_hdr_opt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_WRITE,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sock_ops_store_hdr_opt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+	   const void *, from, u32, len, u64, flags)</div><div class='add'>+{</div><div class='add'>+	u8 new_kind, new_kind_len, magic_len = 0, *opend;</div><div class='add'>+	const u8 *op, *new_op, *magic = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool eol;</div><div class='add'>+</div><div class='add'>+	if (bpf_sock-&gt;op != BPF_SOCK_OPS_WRITE_HDR_OPT_CB)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 2 || flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	new_op = from;</div><div class='add'>+	new_kind = new_op[0];</div><div class='add'>+	new_kind_len = new_op[1];</div><div class='add'>+</div><div class='add'>+	if (new_kind_len &gt; len || new_kind == TCPOPT_NOP ||</div><div class='add'>+	    new_kind == TCPOPT_EOL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (new_kind_len &gt; bpf_sock-&gt;remaining_opt_len)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* 253 is another experimental kind */</div><div class='add'>+	if (new_kind == TCPOPT_EXP || new_kind == 253)  {</div><div class='add'>+		if (new_kind_len &lt; 4)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* Match for the 2 byte magic also.</div><div class='add'>+		 * RFC 6994: the magic could be 2 or 4 bytes.</div><div class='add'>+		 * Hence, matching by 2 byte only is on the</div><div class='add'>+		 * conservative side but it is the right</div><div class='add'>+		 * thing to do for the 'search-for-duplication'</div><div class='add'>+		 * purpose.</div><div class='add'>+		 */</div><div class='add'>+		magic = &amp;new_op[2];</div><div class='add'>+		magic_len = 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for duplication */</div><div class='add'>+	skb = bpf_sock-&gt;skb;</div><div class='add'>+	op = skb-&gt;data + sizeof(struct tcphdr);</div><div class='add'>+	opend = bpf_sock-&gt;skb_data_end;</div><div class='add'>+</div><div class='add'>+	op = bpf_search_tcp_opt(op, opend, new_kind, magic, magic_len,</div><div class='add'>+				&amp;eol);</div><div class='add'>+	if (!IS_ERR(op))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(op) != -ENOMSG)</div><div class='add'>+		return PTR_ERR(op);</div><div class='add'>+</div><div class='add'>+	if (eol)</div><div class='add'>+		/* The option has been ended.  Treat it as no more</div><div class='add'>+		 * header option can be written.</div><div class='add'>+		 */</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* No duplication found.  Store the header option. */</div><div class='add'>+	memcpy(opend, from, new_kind_len);</div><div class='add'>+</div><div class='add'>+	bpf_sock-&gt;remaining_opt_len -= new_kind_len;</div><div class='add'>+	bpf_sock-&gt;skb_data_end += new_kind_len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_ops_store_hdr_opt_proto = {</div><div class='add'>+	.func		= bpf_sock_ops_store_hdr_opt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM | MEM_RDONLY,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_3(bpf_sock_ops_reserve_hdr_opt, struct bpf_sock_ops_kern *, bpf_sock,</div><div class='add'>+	   u32, len, u64, flags)</div><div class='add'>+{</div><div class='add'>+	if (bpf_sock-&gt;op != BPF_SOCK_OPS_HDR_OPT_LEN_CB)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (flags || len &lt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (len &gt; bpf_sock-&gt;remaining_opt_len)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	bpf_sock-&gt;remaining_opt_len -= len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sock_ops_reserve_hdr_opt_proto = {</div><div class='add'>+	.func		= bpf_sock_ops_reserve_hdr_opt,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_3(bpf_skb_set_tstamp, struct sk_buff *, skb,</div><div class='add'>+	   u64, tstamp, u32, tstamp_type)</div><div class='add'>+{</div><div class='add'>+	/* skb_clear_delivery_time() is done for inet protocol */</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	    skb-&gt;protocol != htons(ETH_P_IPV6))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (tstamp_type) {</div><div class='add'>+	case BPF_SKB_CLOCK_REALTIME:</div><div class='add'>+		skb-&gt;tstamp = tstamp;</div><div class='add'>+		skb-&gt;tstamp_type = SKB_CLOCK_REALTIME;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SKB_CLOCK_MONOTONIC:</div><div class='add'>+		if (!tstamp)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		skb-&gt;tstamp = tstamp;</div><div class='add'>+		skb-&gt;tstamp_type = SKB_CLOCK_MONOTONIC;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SKB_CLOCK_TAI:</div><div class='add'>+		if (!tstamp)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		skb-&gt;tstamp = tstamp;</div><div class='add'>+		skb-&gt;tstamp_type = SKB_CLOCK_TAI;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_skb_set_tstamp_proto = {</div><div class='add'>+	.func           = bpf_skb_set_tstamp,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type      = ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_ANYTHING,</div><div class='add'>+	.arg3_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+BPF_CALL_3(bpf_tcp_raw_gen_syncookie_ipv4, struct iphdr *, iph,</div><div class='add'>+	   struct tcphdr *, th, u32, th_len)</div><div class='add'>+{</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u16 mss;</div><div class='add'>+</div><div class='add'>+	if (unlikely(th_len &lt; sizeof(*th) || th_len != th-&gt;doff * 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mss = tcp_parse_mss_option(th, 0) ?: TCP_MSS_DEFAULT;</div><div class='add'>+	cookie = __cookie_v4_init_sequence(iph, th, &amp;mss);</div><div class='add'>+</div><div class='add'>+	return cookie | ((u64)mss &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_raw_gen_syncookie_ipv4_proto = {</div><div class='add'>+	.func		= bpf_tcp_raw_gen_syncookie_ipv4,</div><div class='add'>+	.gpl_only	= true, /* __cookie_v4_init_sequence() is GPL */</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg1_size	= sizeof(struct iphdr),</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_3(bpf_tcp_raw_gen_syncookie_ipv6, struct ipv6hdr *, iph,</div><div class='add'>+	   struct tcphdr *, th, u32, th_len)</div><div class='add'>+{</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	const u16 mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) -</div><div class='add'>+		sizeof(struct ipv6hdr);</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u16 mss;</div><div class='add'>+</div><div class='add'>+	if (unlikely(th_len &lt; sizeof(*th) || th_len != th-&gt;doff * 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mss = tcp_parse_mss_option(th, 0) ?: mss_clamp;</div><div class='add'>+	cookie = __cookie_v6_init_sequence(iph, th, &amp;mss);</div><div class='add'>+</div><div class='add'>+	return cookie | ((u64)mss &lt;&lt; 32);</div><div class='add'>+#else</div><div class='add'>+	return -EPROTONOSUPPORT;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_raw_gen_syncookie_ipv6_proto = {</div><div class='add'>+	.func		= bpf_tcp_raw_gen_syncookie_ipv6,</div><div class='add'>+	.gpl_only	= true, /* __cookie_v6_init_sequence() is GPL */</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg1_size	= sizeof(struct ipv6hdr),</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_MEM,</div><div class='add'>+	.arg3_type	= ARG_CONST_SIZE_OR_ZERO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_tcp_raw_check_syncookie_ipv4, struct iphdr *, iph,</div><div class='add'>+	   struct tcphdr *, th)</div><div class='add'>+{</div><div class='add'>+	if (__cookie_v4_check(iph, th) &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -EACCES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_raw_check_syncookie_ipv4_proto = {</div><div class='add'>+	.func		= bpf_tcp_raw_check_syncookie_ipv4,</div><div class='add'>+	.gpl_only	= true, /* __cookie_v4_check is GPL */</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg1_size	= sizeof(struct iphdr),</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg2_size	= sizeof(struct tcphdr),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_tcp_raw_check_syncookie_ipv6, struct ipv6hdr *, iph,</div><div class='add'>+	   struct tcphdr *, th)</div><div class='add'>+{</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	if (__cookie_v6_check(iph, th) &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -EACCES;</div><div class='add'>+#else</div><div class='add'>+	return -EPROTONOSUPPORT;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_raw_check_syncookie_ipv6_proto = {</div><div class='add'>+	.func		= bpf_tcp_raw_check_syncookie_ipv6,</div><div class='add'>+	.gpl_only	= true, /* __cookie_v6_check is GPL */</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg1_size	= sizeof(struct ipv6hdr),</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM,</div><div class='add'>+	.arg2_size	= sizeof(struct tcphdr),</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_SYN_COOKIES */</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+bool bpf_helper_changes_pkt_data(enum bpf_func_id func_id)</div><div class='ctx'> {</div><div class='ctx'> 	switch (func_id) {</div><div class='del'>-	case BPF_FUNC_map_lookup_elem:</div><div class='del'>-		return &amp;bpf_map_lookup_elem_proto;</div><div class='del'>-	case BPF_FUNC_map_update_elem:</div><div class='del'>-		return &amp;bpf_map_update_elem_proto;</div><div class='del'>-	case BPF_FUNC_map_delete_elem:</div><div class='del'>-		return &amp;bpf_map_delete_elem_proto;</div><div class='del'>-	case BPF_FUNC_get_prandom_u32:</div><div class='del'>-		return &amp;bpf_get_prandom_u32_proto;</div><div class='del'>-	case BPF_FUNC_get_smp_processor_id:</div><div class='del'>-		return &amp;bpf_get_raw_smp_processor_id_proto;</div><div class='del'>-	case BPF_FUNC_get_numa_node_id:</div><div class='del'>-		return &amp;bpf_get_numa_node_id_proto;</div><div class='add'>+	case BPF_FUNC_clone_redirect:</div><div class='add'>+	case BPF_FUNC_l3_csum_replace:</div><div class='add'>+	case BPF_FUNC_l4_csum_replace:</div><div class='add'>+	case BPF_FUNC_lwt_push_encap:</div><div class='add'>+	case BPF_FUNC_lwt_seg6_action:</div><div class='add'>+	case BPF_FUNC_lwt_seg6_adjust_srh:</div><div class='add'>+	case BPF_FUNC_lwt_seg6_store_bytes:</div><div class='add'>+	case BPF_FUNC_msg_pop_data:</div><div class='add'>+	case BPF_FUNC_msg_pull_data:</div><div class='add'>+	case BPF_FUNC_msg_push_data:</div><div class='add'>+	case BPF_FUNC_skb_adjust_room:</div><div class='add'>+	case BPF_FUNC_skb_change_head:</div><div class='add'>+	case BPF_FUNC_skb_change_proto:</div><div class='add'>+	case BPF_FUNC_skb_change_tail:</div><div class='add'>+	case BPF_FUNC_skb_pull_data:</div><div class='add'>+	case BPF_FUNC_skb_store_bytes:</div><div class='add'>+	case BPF_FUNC_skb_vlan_pop:</div><div class='add'>+	case BPF_FUNC_skb_vlan_push:</div><div class='add'>+	case BPF_FUNC_store_hdr_opt:</div><div class='add'>+	case BPF_FUNC_xdp_adjust_head:</div><div class='add'>+	case BPF_FUNC_xdp_adjust_meta:</div><div class='add'>+	case BPF_FUNC_xdp_adjust_tail:</div><div class='add'>+	/* tail-called program could call any of the above */</div><div class='ctx'> 	case BPF_FUNC_tail_call:</div><div class='del'>-		return &amp;bpf_tail_call_proto;</div><div class='del'>-	case BPF_FUNC_ktime_get_ns:</div><div class='del'>-		return &amp;bpf_ktime_get_ns_proto;</div><div class='del'>-	case BPF_FUNC_trace_printk:</div><div class='del'>-		if (capable(CAP_SYS_ADMIN))</div><div class='del'>-			return bpf_get_trace_printk_proto();</div><div class='del'>-		/* else: fall through */</div><div class='add'>+		return true;</div><div class='ctx'> 	default:</div><div class='del'>-		return NULL;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto bpf_event_output_data_proto __weak;</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_get_cg_sock_proto __weak;</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='add'>+	const struct bpf_func_proto *func_proto;</div><div class='add'>+</div><div class='add'>+	func_proto = cgroup_common_func_proto(func_id, prog);</div><div class='add'>+	if (func_proto)</div><div class='add'>+		return func_proto;</div><div class='add'>+</div><div class='ctx'> 	switch (func_id) {</div><div class='del'>-	/* inet and inet6 sockets are created in a process</div><div class='del'>-	 * context so there is always a valid uid/gid</div><div class='del'>-	 */</div><div class='del'>-	case BPF_FUNC_get_current_uid_gid:</div><div class='del'>-		return &amp;bpf_get_current_uid_gid_proto;</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_get_socket_cookie:</div><div class='add'>+		return &amp;bpf_get_socket_cookie_sock_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_sock_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_event_output_data_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_cg_sock_proto;</div><div class='add'>+	case BPF_FUNC_ktime_get_coarse_ns:</div><div class='add'>+		return &amp;bpf_ktime_get_coarse_ns_proto;</div><div class='add'>+	case BPF_FUNC_setsockopt:</div><div class='add'>+		switch (prog-&gt;expected_attach_type) {</div><div class='add'>+		case BPF_CGROUP_INET_SOCK_CREATE:</div><div class='add'>+			return &amp;bpf_sock_create_setsockopt_proto;</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	case BPF_FUNC_getsockopt:</div><div class='add'>+		switch (prog-&gt;expected_attach_type) {</div><div class='add'>+		case BPF_CGROUP_INET_SOCK_CREATE:</div><div class='add'>+			return &amp;bpf_sock_create_getsockopt_proto;</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='add'>+	const struct bpf_func_proto *func_proto;</div><div class='add'>+</div><div class='add'>+	func_proto = cgroup_common_func_proto(func_id, prog);</div><div class='add'>+	if (func_proto)</div><div class='add'>+		return func_proto;</div><div class='add'>+</div><div class='ctx'> 	switch (func_id) {</div><div class='del'>-	/* inet and inet6 sockets are created in a process</div><div class='del'>-	 * context so there is always a valid uid/gid</div><div class='del'>-	 */</div><div class='del'>-	case BPF_FUNC_get_current_uid_gid:</div><div class='del'>-		return &amp;bpf_get_current_uid_gid_proto;</div><div class='ctx'> 	case BPF_FUNC_bind:</div><div class='ctx'> 		switch (prog-&gt;expected_attach_type) {</div><div class='ctx'> 		case BPF_CGROUP_INET4_CONNECT:</div><div class='hunk'>@@ -4882,10 +8188,72 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		}</div><div class='ctx'> 	case BPF_FUNC_get_socket_cookie:</div><div class='ctx'> 		return &amp;bpf_get_socket_cookie_sock_addr_proto;</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_sock_addr_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_event_output_data_proto;</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_sk_lookup_tcp:</div><div class='add'>+		return &amp;bpf_sock_addr_sk_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_sk_lookup_udp:</div><div class='add'>+		return &amp;bpf_sock_addr_sk_lookup_udp_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	case BPF_FUNC_skc_lookup_tcp:</div><div class='add'>+		return &amp;bpf_sock_addr_skc_lookup_tcp_proto;</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='add'>+	case BPF_FUNC_setsockopt:</div><div class='add'>+		switch (prog-&gt;expected_attach_type) {</div><div class='add'>+		case BPF_CGROUP_INET4_BIND:</div><div class='add'>+		case BPF_CGROUP_INET6_BIND:</div><div class='add'>+		case BPF_CGROUP_INET4_CONNECT:</div><div class='add'>+		case BPF_CGROUP_INET6_CONNECT:</div><div class='add'>+		case BPF_CGROUP_UNIX_CONNECT:</div><div class='add'>+		case BPF_CGROUP_UDP4_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UDP6_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UNIX_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UDP4_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UDP6_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UNIX_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_INET4_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET6_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_UNIX_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET4_GETSOCKNAME:</div><div class='add'>+		case BPF_CGROUP_INET6_GETSOCKNAME:</div><div class='add'>+		case BPF_CGROUP_UNIX_GETSOCKNAME:</div><div class='add'>+			return &amp;bpf_sock_addr_setsockopt_proto;</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	case BPF_FUNC_getsockopt:</div><div class='add'>+		switch (prog-&gt;expected_attach_type) {</div><div class='add'>+		case BPF_CGROUP_INET4_BIND:</div><div class='add'>+		case BPF_CGROUP_INET6_BIND:</div><div class='add'>+		case BPF_CGROUP_INET4_CONNECT:</div><div class='add'>+		case BPF_CGROUP_INET6_CONNECT:</div><div class='add'>+		case BPF_CGROUP_UNIX_CONNECT:</div><div class='add'>+		case BPF_CGROUP_UDP4_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UDP6_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UNIX_RECVMSG:</div><div class='add'>+		case BPF_CGROUP_UDP4_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UDP6_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UNIX_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_INET4_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET6_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_UNIX_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET4_GETSOCKNAME:</div><div class='add'>+		case BPF_CGROUP_INET6_GETSOCKNAME:</div><div class='add'>+		case BPF_CGROUP_UNIX_GETSOCKNAME:</div><div class='add'>+			return &amp;bpf_sock_addr_getsockopt_proto;</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4899,19 +8267,64 @@ sk_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_skb_load_bytes_relative_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_cookie:</div><div class='ctx'> 		return &amp;bpf_get_socket_cookie_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_uid:</div><div class='ctx'> 		return &amp;bpf_get_socket_uid_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_skb_event_output_proto;</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_get_proto __weak;</div><div class='add'>+const struct bpf_func_proto bpf_sk_storage_delete_proto __weak;</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> cg_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='add'>+	const struct bpf_func_proto *func_proto;</div><div class='add'>+</div><div class='add'>+	func_proto = cgroup_common_func_proto(func_id, prog);</div><div class='add'>+	if (func_proto)</div><div class='add'>+		return func_proto;</div><div class='add'>+</div><div class='ctx'> 	switch (func_id) {</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_sk_fullsock:</div><div class='add'>+		return &amp;bpf_sk_fullsock_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_skb_event_output_proto;</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+	case BPF_FUNC_skb_cgroup_id:</div><div class='add'>+		return &amp;bpf_skb_cgroup_id_proto;</div><div class='add'>+	case BPF_FUNC_skb_ancestor_cgroup_id:</div><div class='add'>+		return &amp;bpf_skb_ancestor_cgroup_id_proto;</div><div class='add'>+	case BPF_FUNC_sk_cgroup_id:</div><div class='add'>+		return &amp;bpf_sk_cgroup_id_proto;</div><div class='add'>+	case BPF_FUNC_sk_ancestor_cgroup_id:</div><div class='add'>+		return &amp;bpf_sk_ancestor_cgroup_id_proto;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_sk_lookup_tcp:</div><div class='add'>+		return &amp;bpf_sk_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_sk_lookup_udp:</div><div class='add'>+		return &amp;bpf_sk_lookup_udp_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	case BPF_FUNC_skc_lookup_tcp:</div><div class='add'>+		return &amp;bpf_skc_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_tcp_sock:</div><div class='add'>+		return &amp;bpf_tcp_sock_proto;</div><div class='add'>+	case BPF_FUNC_get_listener_sock:</div><div class='add'>+		return &amp;bpf_get_listener_sock_proto;</div><div class='add'>+	case BPF_FUNC_skb_ecn_set_ce:</div><div class='add'>+		return &amp;bpf_skb_ecn_set_ce_proto;</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		return sk_filter_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4933,6 +8346,8 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_csum_diff_proto;</div><div class='ctx'> 	case BPF_FUNC_csum_update:</div><div class='ctx'> 		return &amp;bpf_csum_update_proto;</div><div class='add'>+	case BPF_FUNC_csum_level:</div><div class='add'>+		return &amp;bpf_csum_level_proto;</div><div class='ctx'> 	case BPF_FUNC_l3_csum_replace:</div><div class='ctx'> 		return &amp;bpf_l3_csum_replace_proto;</div><div class='ctx'> 	case BPF_FUNC_l4_csum_replace:</div><div class='hunk'>@@ -4953,6 +8368,8 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_skb_adjust_room_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_change_tail:</div><div class='ctx'> 		return &amp;bpf_skb_change_tail_proto;</div><div class='add'>+	case BPF_FUNC_skb_change_head:</div><div class='add'>+		return &amp;bpf_skb_change_head_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_get_tunnel_key:</div><div class='ctx'> 		return &amp;bpf_skb_get_tunnel_key_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_set_tunnel_key:</div><div class='hunk'>@@ -4963,6 +8380,10 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return bpf_get_skb_set_tunnel_proto(func_id);</div><div class='ctx'> 	case BPF_FUNC_redirect:</div><div class='ctx'> 		return &amp;bpf_redirect_proto;</div><div class='add'>+	case BPF_FUNC_redirect_neigh:</div><div class='add'>+		return &amp;bpf_redirect_neigh_proto;</div><div class='add'>+	case BPF_FUNC_redirect_peer:</div><div class='add'>+		return &amp;bpf_redirect_peer_proto;</div><div class='ctx'> 	case BPF_FUNC_get_route_realm:</div><div class='ctx'> 		return &amp;bpf_get_route_realm_proto;</div><div class='ctx'> 	case BPF_FUNC_get_hash_recalc:</div><div class='hunk'>@@ -4979,22 +8400,70 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_skb_under_cgroup_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_cookie:</div><div class='ctx'> 		return &amp;bpf_get_socket_cookie_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_uid:</div><div class='ctx'> 		return &amp;bpf_get_socket_uid_proto;</div><div class='ctx'> 	case BPF_FUNC_fib_lookup:</div><div class='ctx'> 		return &amp;bpf_skb_fib_lookup_proto;</div><div class='add'>+	case BPF_FUNC_check_mtu:</div><div class='add'>+		return &amp;bpf_skb_check_mtu_proto;</div><div class='add'>+	case BPF_FUNC_sk_fullsock:</div><div class='add'>+		return &amp;bpf_sk_fullsock_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> 	case BPF_FUNC_skb_get_xfrm_state:</div><div class='ctx'> 		return &amp;bpf_skb_get_xfrm_state_proto;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='add'>+	case BPF_FUNC_skb_cgroup_classid:</div><div class='add'>+		return &amp;bpf_skb_cgroup_classid_proto;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='ctx'> 	case BPF_FUNC_skb_cgroup_id:</div><div class='ctx'> 		return &amp;bpf_skb_cgroup_id_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_ancestor_cgroup_id:</div><div class='ctx'> 		return &amp;bpf_skb_ancestor_cgroup_id_proto;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_sk_lookup_tcp:</div><div class='add'>+		return &amp;bpf_tc_sk_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_sk_lookup_udp:</div><div class='add'>+		return &amp;bpf_tc_sk_lookup_udp_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	case BPF_FUNC_tcp_sock:</div><div class='add'>+		return &amp;bpf_tcp_sock_proto;</div><div class='add'>+	case BPF_FUNC_get_listener_sock:</div><div class='add'>+		return &amp;bpf_get_listener_sock_proto;</div><div class='add'>+	case BPF_FUNC_skc_lookup_tcp:</div><div class='add'>+		return &amp;bpf_tc_skc_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_tcp_check_syncookie:</div><div class='add'>+		return &amp;bpf_tcp_check_syncookie_proto;</div><div class='add'>+	case BPF_FUNC_skb_ecn_set_ce:</div><div class='add'>+		return &amp;bpf_skb_ecn_set_ce_proto;</div><div class='add'>+	case BPF_FUNC_tcp_gen_syncookie:</div><div class='add'>+		return &amp;bpf_tcp_gen_syncookie_proto;</div><div class='add'>+	case BPF_FUNC_sk_assign:</div><div class='add'>+		return &amp;bpf_sk_assign_proto;</div><div class='add'>+	case BPF_FUNC_skb_set_tstamp:</div><div class='add'>+		return &amp;bpf_skb_set_tstamp_proto;</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	case BPF_FUNC_tcp_raw_gen_syncookie_ipv4:</div><div class='add'>+		return &amp;bpf_tcp_raw_gen_syncookie_ipv4_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_gen_syncookie_ipv6:</div><div class='add'>+		return &amp;bpf_tcp_raw_gen_syncookie_ipv6_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_check_syncookie_ipv4:</div><div class='add'>+		return &amp;bpf_tcp_raw_check_syncookie_ipv4_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_check_syncookie_ipv6:</div><div class='add'>+		return &amp;bpf_tcp_raw_check_syncookie_ipv6_proto;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5018,21 +8487,75 @@ xdp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_xdp_redirect_map_proto;</div><div class='ctx'> 	case BPF_FUNC_xdp_adjust_tail:</div><div class='ctx'> 		return &amp;bpf_xdp_adjust_tail_proto;</div><div class='add'>+	case BPF_FUNC_xdp_get_buff_len:</div><div class='add'>+		return &amp;bpf_xdp_get_buff_len_proto;</div><div class='add'>+	case BPF_FUNC_xdp_load_bytes:</div><div class='add'>+		return &amp;bpf_xdp_load_bytes_proto;</div><div class='add'>+	case BPF_FUNC_xdp_store_bytes:</div><div class='add'>+		return &amp;bpf_xdp_store_bytes_proto;</div><div class='ctx'> 	case BPF_FUNC_fib_lookup:</div><div class='ctx'> 		return &amp;bpf_xdp_fib_lookup_proto;</div><div class='add'>+	case BPF_FUNC_check_mtu:</div><div class='add'>+		return &amp;bpf_xdp_check_mtu_proto;</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_sk_lookup_udp:</div><div class='add'>+		return &amp;bpf_xdp_sk_lookup_udp_proto;</div><div class='add'>+	case BPF_FUNC_sk_lookup_tcp:</div><div class='add'>+		return &amp;bpf_xdp_sk_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	case BPF_FUNC_skc_lookup_tcp:</div><div class='add'>+		return &amp;bpf_xdp_skc_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_tcp_check_syncookie:</div><div class='add'>+		return &amp;bpf_tcp_check_syncookie_proto;</div><div class='add'>+	case BPF_FUNC_tcp_gen_syncookie:</div><div class='add'>+		return &amp;bpf_tcp_gen_syncookie_proto;</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	case BPF_FUNC_tcp_raw_gen_syncookie_ipv4:</div><div class='add'>+		return &amp;bpf_tcp_raw_gen_syncookie_ipv4_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_gen_syncookie_ipv6:</div><div class='add'>+		return &amp;bpf_tcp_raw_gen_syncookie_ipv6_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_check_syncookie_ipv4:</div><div class='add'>+		return &amp;bpf_tcp_raw_check_syncookie_ipv4_proto;</div><div class='add'>+	case BPF_FUNC_tcp_raw_check_syncookie_ipv6:</div><div class='add'>+		return &amp;bpf_tcp_raw_check_syncookie_ipv6_proto;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='del'>-	}</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if IS_MODULE(CONFIG_NF_CONNTRACK) &amp;&amp; IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)</div><div class='add'>+	/* The nf_conn___init type is used in the NF_CONNTRACK kfuncs. The</div><div class='add'>+	 * kfuncs are defined in two different modules, and we want to be able</div><div class='add'>+	 * to use them interchangeably with the same BTF type ID. Because modules</div><div class='add'>+	 * can't de-duplicate BTF IDs between each other, we need the type to be</div><div class='add'>+	 * referenced in the vmlinux BTF or the verifier will get confused about</div><div class='add'>+	 * the different types. So we add this dummy type reference which will</div><div class='add'>+	 * be included in vmlinux BTF, allowing both modules to refer to the</div><div class='add'>+	 * same type ID.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT(struct nf_conn___init);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto bpf_sock_map_update_proto __weak;</div><div class='add'>+const struct bpf_func_proto bpf_sock_hash_update_proto __weak;</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='add'>+	const struct bpf_func_proto *func_proto;</div><div class='add'>+</div><div class='add'>+	func_proto = cgroup_common_func_proto(func_id, prog);</div><div class='add'>+	if (func_proto)</div><div class='add'>+		return func_proto;</div><div class='add'>+</div><div class='ctx'> 	switch (func_id) {</div><div class='ctx'> 	case BPF_FUNC_setsockopt:</div><div class='del'>-		return &amp;bpf_setsockopt_proto;</div><div class='add'>+		return &amp;bpf_sock_ops_setsockopt_proto;</div><div class='ctx'> 	case BPF_FUNC_getsockopt:</div><div class='del'>-		return &amp;bpf_getsockopt_proto;</div><div class='add'>+		return &amp;bpf_sock_ops_getsockopt_proto;</div><div class='ctx'> 	case BPF_FUNC_sock_ops_cb_flags_set:</div><div class='ctx'> 		return &amp;bpf_sock_ops_cb_flags_set_proto;</div><div class='ctx'> 	case BPF_FUNC_sock_map_update:</div><div class='hunk'>@@ -5041,13 +8564,32 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_sock_hash_update_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_cookie:</div><div class='ctx'> 		return &amp;bpf_get_socket_cookie_sock_ops_proto;</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_event_output_data_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_sock_ops_proto;</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_load_hdr_opt:</div><div class='add'>+		return &amp;bpf_sock_ops_load_hdr_opt_proto;</div><div class='add'>+	case BPF_FUNC_store_hdr_opt:</div><div class='add'>+		return &amp;bpf_sock_ops_store_hdr_opt_proto;</div><div class='add'>+	case BPF_FUNC_reserve_hdr_opt:</div><div class='add'>+		return &amp;bpf_sock_ops_reserve_hdr_opt_proto;</div><div class='add'>+	case BPF_FUNC_tcp_sock:</div><div class='add'>+		return &amp;bpf_tcp_sock_proto;</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto bpf_msg_redirect_map_proto __weak;</div><div class='add'>+const struct bpf_func_proto bpf_msg_redirect_hash_proto __weak;</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='hunk'>@@ -5062,13 +8604,26 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_msg_cork_bytes_proto;</div><div class='ctx'> 	case BPF_FUNC_msg_pull_data:</div><div class='ctx'> 		return &amp;bpf_msg_pull_data_proto;</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_msg_push_data:</div><div class='add'>+		return &amp;bpf_msg_push_data_proto;</div><div class='add'>+	case BPF_FUNC_msg_pop_data:</div><div class='add'>+		return &amp;bpf_msg_pop_data_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_event_output_data_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='add'>+	case BPF_FUNC_get_netns_cookie:</div><div class='add'>+		return &amp;bpf_get_netns_cookie_sk_msg_proto;</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto bpf_sk_redirect_map_proto __weak;</div><div class='add'>+const struct bpf_func_proto bpf_sk_redirect_hash_proto __weak;</div><div class='add'>+</div><div class='ctx'> static const struct bpf_func_proto *</div><div class='ctx'> sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='hunk'>@@ -5083,6 +8638,8 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;sk_skb_change_tail_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_change_head:</div><div class='ctx'> 		return &amp;sk_skb_change_head_proto;</div><div class='add'>+	case BPF_FUNC_skb_adjust_room:</div><div class='add'>+		return &amp;sk_skb_adjust_room_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_cookie:</div><div class='ctx'> 		return &amp;bpf_get_socket_cookie_proto;</div><div class='ctx'> 	case BPF_FUNC_get_socket_uid:</div><div class='hunk'>@@ -5091,10 +8648,31 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_sk_redirect_map_proto;</div><div class='ctx'> 	case BPF_FUNC_sk_redirect_hash:</div><div class='ctx'> 		return &amp;bpf_sk_redirect_hash_proto;</div><div class='del'>-	case BPF_FUNC_get_local_storage:</div><div class='del'>-		return &amp;bpf_get_local_storage_proto;</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_skb_event_output_proto;</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	case BPF_FUNC_sk_lookup_tcp:</div><div class='add'>+		return &amp;bpf_sk_lookup_tcp_proto;</div><div class='add'>+	case BPF_FUNC_sk_lookup_udp:</div><div class='add'>+		return &amp;bpf_sk_lookup_udp_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	case BPF_FUNC_skc_lookup_tcp:</div><div class='add'>+		return &amp;bpf_skc_lookup_tcp_proto;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+flow_dissector_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	switch (func_id) {</div><div class='add'>+	case BPF_FUNC_skb_load_bytes:</div><div class='add'>+		return &amp;bpf_flow_dissector_load_bytes_proto;</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5121,7 +8699,7 @@ lwt_out_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 	case BPF_FUNC_skb_under_cgroup:</div><div class='ctx'> 		return &amp;bpf_skb_under_cgroup_proto;</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5130,7 +8708,7 @@ lwt_in_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	switch (func_id) {</div><div class='ctx'> 	case BPF_FUNC_lwt_push_encap:</div><div class='del'>-		return &amp;bpf_lwt_push_encap_proto;</div><div class='add'>+		return &amp;bpf_lwt_in_push_encap_proto;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return lwt_out_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5160,12 +8738,16 @@ lwt_xmit_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_skb_store_bytes_proto;</div><div class='ctx'> 	case BPF_FUNC_csum_update:</div><div class='ctx'> 		return &amp;bpf_csum_update_proto;</div><div class='add'>+	case BPF_FUNC_csum_level:</div><div class='add'>+		return &amp;bpf_csum_level_proto;</div><div class='ctx'> 	case BPF_FUNC_l3_csum_replace:</div><div class='ctx'> 		return &amp;bpf_l3_csum_replace_proto;</div><div class='ctx'> 	case BPF_FUNC_l4_csum_replace:</div><div class='ctx'> 		return &amp;bpf_l4_csum_replace_proto;</div><div class='ctx'> 	case BPF_FUNC_set_hash_invalid:</div><div class='ctx'> 		return &amp;bpf_set_hash_invalid_proto;</div><div class='add'>+	case BPF_FUNC_lwt_push_encap:</div><div class='add'>+		return &amp;bpf_lwt_xmit_push_encap_proto;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return lwt_out_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5206,16 +8788,39 @@ static bool bpf_skb_is_valid_access(int off, int size, enum bpf_access_type type</div><div class='ctx'> 		if (off + size &gt; offsetofend(struct __sk_buff, cb[4]))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='add'>+		if (info-&gt;is_ldsx || size != size_default)</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, remote_ip6[0], remote_ip6[3]):</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, local_ip6[0], local_ip6[3]):</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, remote_ip4, remote_ip4):</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, local_ip4, local_ip4):</div><div class='del'>-	case bpf_ctx_range(struct __sk_buff, data):</div><div class='del'>-	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='del'>-	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='ctx'> 		if (size != size_default)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='add'>+	case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):</div><div class='add'>+		return false;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, hwtstamp):</div><div class='add'>+		if (type == BPF_WRITE || size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+		if (size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range_ptr(struct __sk_buff, sk):</div><div class='add'>+		if (type == BPF_WRITE || size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCK_COMMON_OR_NULL;</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct __sk_buff, tstamp_type):</div><div class='add'>+		return false;</div><div class='add'>+	case offsetofend(struct __sk_buff, tstamp_type) ... offsetof(struct __sk_buff, hwtstamp) - 1:</div><div class='add'>+		/* Explicitly prohibit access to padding in __sk_buff. */</div><div class='add'>+		return false;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Only narrow read access allowed for now. */</div><div class='ctx'> 		if (type == BPF_WRITE) {</div><div class='hunk'>@@ -5242,6 +8847,9 @@ static bool sk_filter_is_valid_access(int off, int size,</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, family, local_port):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, wire_len):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, hwtstamp):</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5257,6 +8865,50 @@ static bool sk_filter_is_valid_access(int off, int size,</div><div class='ctx'> 	return bpf_skb_is_valid_access(off, size, type, prog, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool cg_skb_is_valid_access(int off, int size,</div><div class='add'>+				   enum bpf_access_type type,</div><div class='add'>+				   const struct bpf_prog *prog,</div><div class='add'>+				   struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	switch (off) {</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, tc_classid):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, wire_len):</div><div class='add'>+		return false;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='add'>+		if (!bpf_token_capable(prog-&gt;aux-&gt;token, CAP_BPF))</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == BPF_WRITE) {</div><div class='add'>+		switch (off) {</div><div class='add'>+		case bpf_ctx_range(struct __sk_buff, mark):</div><div class='add'>+		case bpf_ctx_range(struct __sk_buff, priority):</div><div class='add'>+		case bpf_ctx_range_till(struct __sk_buff, cb[0], cb[4]):</div><div class='add'>+			break;</div><div class='add'>+		case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+			if (!bpf_token_capable(prog-&gt;aux-&gt;token, CAP_BPF))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data):</div><div class='add'>+		info-&gt;reg_type = PTR_TO_PACKET;</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='add'>+		info-&gt;reg_type = PTR_TO_PACKET_END;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bpf_skb_is_valid_access(off, size, type, prog, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool lwt_is_valid_access(int off, int size,</div><div class='ctx'> 				enum bpf_access_type type,</div><div class='ctx'> 				const struct bpf_prog *prog,</div><div class='hunk'>@@ -5266,6 +8918,9 @@ static bool lwt_is_valid_access(int off, int size,</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, tc_classid):</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, family, local_port):</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, wire_len):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, hwtstamp):</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5303,6 +8958,7 @@ static bool __sock_filter_check_attach_type(int off,</div><div class='ctx'> 	case offsetof(struct bpf_sock, priority):</div><div class='ctx'> 		switch (attach_type) {</div><div class='ctx'> 		case BPF_CGROUP_INET_SOCK_CREATE:</div><div class='add'>+		case BPF_CGROUP_INET_SOCK_RELEASE:</div><div class='ctx'> 			goto full_access;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -5336,16 +8992,50 @@ full_access:</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __sock_filter_check_size(int off, int size,</div><div class='add'>+bool bpf_sock_common_is_valid_access(int off, int size,</div><div class='add'>+				     enum bpf_access_type type,</div><div class='ctx'> 				     struct bpf_insn_access_aux *info)</div><div class='ctx'> {</div><div class='add'>+	switch (off) {</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sock, type, priority):</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return bpf_sock_is_valid_access(off, size, type, info);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type,</div><div class='add'>+			      struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='ctx'> 	const int size_default = sizeof(__u32);</div><div class='add'>+	int field_size;</div><div class='add'>+</div><div class='add'>+	if (off &lt; 0 || off &gt;= sizeof(struct bpf_sock))</div><div class='add'>+		return false;</div><div class='add'>+	if (off % size != 0)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (off) {</div><div class='add'>+	case offsetof(struct bpf_sock, state):</div><div class='add'>+	case offsetof(struct bpf_sock, family):</div><div class='add'>+	case offsetof(struct bpf_sock, type):</div><div class='add'>+	case offsetof(struct bpf_sock, protocol):</div><div class='add'>+	case offsetof(struct bpf_sock, src_port):</div><div class='add'>+	case offsetof(struct bpf_sock, rx_queue_mapping):</div><div class='ctx'> 	case bpf_ctx_range(struct bpf_sock, src_ip4):</div><div class='ctx'> 	case bpf_ctx_range_till(struct bpf_sock, src_ip6[0], src_ip6[3]):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock, dst_ip4):</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sock, dst_ip6[0], dst_ip6[3]):</div><div class='ctx'> 		bpf_ctx_record_field_size(info, size_default);</div><div class='ctx'> 		return bpf_ctx_narrow_access_ok(off, size, size_default);</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock, dst_port):</div><div class='add'>+		field_size = size == size_default ?</div><div class='add'>+			size_default : sizeof_field(struct bpf_sock, dst_port);</div><div class='add'>+		bpf_ctx_record_field_size(info, field_size);</div><div class='add'>+		return bpf_ctx_narrow_access_ok(off, size, field_size);</div><div class='add'>+	case offsetofend(struct bpf_sock, dst_port) ...</div><div class='add'>+	     offsetof(struct bpf_sock, dst_ip4) - 1:</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return size == size_default;</div><div class='hunk'>@@ -5356,16 +9046,19 @@ static bool sock_filter_is_valid_access(int off, int size,</div><div class='ctx'> 					const struct bpf_prog *prog,</div><div class='ctx'> 					struct bpf_insn_access_aux *info)</div><div class='ctx'> {</div><div class='del'>-	if (off &lt; 0 || off &gt;= sizeof(struct bpf_sock))</div><div class='del'>-		return false;</div><div class='del'>-	if (off % size != 0)</div><div class='add'>+	if (!bpf_sock_is_valid_access(off, size, type, info))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!__sock_filter_check_attach_type(off, type,</div><div class='del'>-					     prog-&gt;expected_attach_type))</div><div class='del'>-		return false;</div><div class='del'>-	if (!__sock_filter_check_size(off, size, info))</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='add'>+	return __sock_filter_check_attach_type(off, type,</div><div class='add'>+					       prog-&gt;expected_attach_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_noop_prologue(struct bpf_insn *insn_buf, bool direct_write,</div><div class='add'>+			     const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	/* Neither direct read nor direct write requires any preliminary</div><div class='add'>+	 * action.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bpf_unclone_prologue(struct bpf_insn *insn_buf, bool direct_write,</div><div class='hunk'>@@ -5382,7 +9075,7 @@ static int bpf_unclone_prologue(struct bpf_insn *insn_buf, bool direct_write,</div><div class='ctx'> 	 * (Fast-path, otherwise approximation that we might be</div><div class='ctx'> 	 *  a clone, do the rest in helper.)</div><div class='ctx'> 	 */</div><div class='del'>-	*insn++ = BPF_LDX_MEM(BPF_B, BPF_REG_6, BPF_REG_1, CLONED_OFFSET());</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_B, BPF_REG_6, BPF_REG_1, CLONED_OFFSET);</div><div class='ctx'> 	*insn++ = BPF_ALU32_IMM(BPF_AND, BPF_REG_6, CLONED_MASK);</div><div class='ctx'> 	*insn++ = BPF_JMP_IMM(BPF_JEQ, BPF_REG_6, 0, 7);</div><div class='ctx'> </div><div class='hunk'>@@ -5413,8 +9106,6 @@ static int bpf_gen_ld_abs(const struct bpf_insn *orig,</div><div class='ctx'> 	bool indirect = BPF_MODE(orig-&gt;code) == BPF_IND;</div><div class='ctx'> 	struct bpf_insn *insn = insn_buf;</div><div class='ctx'> </div><div class='del'>-	/* We're guaranteed here that CTX is in R6. */</div><div class='del'>-	*insn++ = BPF_MOV64_REG(BPF_REG_1, BPF_REG_CTX);</div><div class='ctx'> 	if (!indirect) {</div><div class='ctx'> 		*insn++ = BPF_MOV64_IMM(BPF_REG_2, orig-&gt;imm);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -5422,6 +9113,8 @@ static int bpf_gen_ld_abs(const struct bpf_insn *orig,</div><div class='ctx'> 		if (orig-&gt;imm)</div><div class='ctx'> 			*insn++ = BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, orig-&gt;imm);</div><div class='ctx'> 	}</div><div class='add'>+	/* We're guaranteed here that CTX is in R6. */</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_1, BPF_REG_CTX);</div><div class='ctx'> </div><div class='ctx'> 	switch (BPF_SIZE(orig-&gt;code)) {</div><div class='ctx'> 	case BPF_B:</div><div class='hunk'>@@ -5460,6 +9153,8 @@ static bool tc_cls_act_is_valid_access(int off, int size,</div><div class='ctx'> 		case bpf_ctx_range(struct __sk_buff, priority):</div><div class='ctx'> 		case bpf_ctx_range(struct __sk_buff, tc_classid):</div><div class='ctx'> 		case bpf_ctx_range_till(struct __sk_buff, cb[0], cb[4]):</div><div class='add'>+		case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+		case bpf_ctx_range(struct __sk_buff, queue_mapping):</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -5478,11 +9173,42 @@ static bool tc_cls_act_is_valid_access(int off, int size,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case bpf_ctx_range_till(struct __sk_buff, family, local_port):</div><div class='ctx'> 		return false;</div><div class='add'>+	case offsetof(struct __sk_buff, tstamp_type):</div><div class='add'>+		/* The convert_ctx_access() on reading and writing</div><div class='add'>+		 * __sk_buff-&gt;tstamp depends on whether the bpf prog</div><div class='add'>+		 * has used __sk_buff-&gt;tstamp_type or not.</div><div class='add'>+		 * Thus, we need to set prog-&gt;tstamp_type_access</div><div class='add'>+		 * earlier during is_valid_access() here.</div><div class='add'>+		 */</div><div class='add'>+		((struct bpf_prog *)prog)-&gt;tstamp_type_access = 1;</div><div class='add'>+		return size == sizeof(__u8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bpf_skb_is_valid_access(off, size, type, prog, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_MUTEX(nf_conn_btf_access_lock);</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_conn_btf_access_lock);</div><div class='add'>+</div><div class='add'>+int (*nfct_btf_struct_access)(struct bpf_verifier_log *log,</div><div class='add'>+			      const struct bpf_reg_state *reg,</div><div class='add'>+			      int off, int size);</div><div class='add'>+EXPORT_SYMBOL_GPL(nfct_btf_struct_access);</div><div class='add'>+</div><div class='add'>+static int tc_cls_act_btf_struct_access(struct bpf_verifier_log *log,</div><div class='add'>+					const struct bpf_reg_state *reg,</div><div class='add'>+					int off, int size)</div><div class='add'>+{</div><div class='add'>+	int ret = -EACCES;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nf_conn_btf_access_lock);</div><div class='add'>+	if (nfct_btf_struct_access)</div><div class='add'>+		ret = nfct_btf_struct_access(log, reg, off, size);</div><div class='add'>+	mutex_unlock(&amp;nf_conn_btf_access_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool __is_valid_xdp_access(int off, int size)</div><div class='ctx'> {</div><div class='ctx'> 	if (off &lt; 0 || off &gt;= sizeof(struct xdp_md))</div><div class='hunk'>@@ -5500,14 +9226,29 @@ static bool xdp_is_valid_access(int off, int size,</div><div class='ctx'> 				const struct bpf_prog *prog,</div><div class='ctx'> 				struct bpf_insn_access_aux *info)</div><div class='ctx'> {</div><div class='add'>+	if (prog-&gt;expected_attach_type != BPF_XDP_DEVMAP) {</div><div class='add'>+		switch (off) {</div><div class='add'>+		case offsetof(struct xdp_md, egress_ifindex):</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (type == BPF_WRITE) {</div><div class='del'>-		if (bpf_prog_is_dev_bound(prog-&gt;aux)) {</div><div class='add'>+		if (bpf_prog_is_offloaded(prog-&gt;aux)) {</div><div class='ctx'> 			switch (off) {</div><div class='ctx'> 			case offsetof(struct xdp_md, rx_queue_index):</div><div class='ctx'> 				return __is_valid_xdp_access(off, size);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		return false;</div><div class='add'>+	} else {</div><div class='add'>+		switch (off) {</div><div class='add'>+		case offsetof(struct xdp_md, data_meta):</div><div class='add'>+		case offsetof(struct xdp_md, data):</div><div class='add'>+		case offsetof(struct xdp_md, data_end):</div><div class='add'>+			if (info-&gt;is_ldsx)</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (off) {</div><div class='hunk'>@@ -5525,16 +9266,31 @@ static bool xdp_is_valid_access(int off, int size,</div><div class='ctx'> 	return __is_valid_xdp_access(off, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bpf_warn_invalid_xdp_action(u32 act)</div><div class='add'>+void bpf_warn_invalid_xdp_action(const struct net_device *dev,</div><div class='add'>+				 const struct bpf_prog *prog, u32 act)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 act_max = XDP_REDIRECT;</div><div class='ctx'> </div><div class='del'>-	WARN_ONCE(1, "%s XDP return value %u, expect packet loss!\n",</div><div class='del'>-		  act &gt; act_max ? "Illegal" : "Driver unsupported",</div><div class='del'>-		  act);</div><div class='add'>+	pr_warn_once("%s XDP return value %u on prog %s (id %d) dev %s, expect packet loss!\n",</div><div class='add'>+		     act &gt; act_max ? "Illegal" : "Driver unsupported",</div><div class='add'>+		     act, prog-&gt;aux-&gt;name, prog-&gt;aux-&gt;id, dev ? dev-&gt;name : "N/A");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bpf_warn_invalid_xdp_action);</div><div class='ctx'> </div><div class='add'>+static int xdp_btf_struct_access(struct bpf_verifier_log *log,</div><div class='add'>+				 const struct bpf_reg_state *reg,</div><div class='add'>+				 int off, int size)</div><div class='add'>+{</div><div class='add'>+	int ret = -EACCES;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nf_conn_btf_access_lock);</div><div class='add'>+	if (nfct_btf_struct_access)</div><div class='add'>+		ret = nfct_btf_struct_access(log, reg, off, size);</div><div class='add'>+	mutex_unlock(&amp;nf_conn_btf_access_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool sock_addr_is_valid_access(int off, int size,</div><div class='ctx'> 				      enum bpf_access_type type,</div><div class='ctx'> 				      const struct bpf_prog *prog,</div><div class='hunk'>@@ -5547,15 +9303,18 @@ static bool sock_addr_is_valid_access(int off, int size,</div><div class='ctx'> 	if (off % size != 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* Disallow access to IPv6 fields from IPv4 contex and vise</div><div class='del'>-	 * versa.</div><div class='add'>+	/* Disallow access to fields not belonging to the attach type's address</div><div class='add'>+	 * family.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (off) {</div><div class='ctx'> 	case bpf_ctx_range(struct bpf_sock_addr, user_ip4):</div><div class='ctx'> 		switch (prog-&gt;expected_attach_type) {</div><div class='ctx'> 		case BPF_CGROUP_INET4_BIND:</div><div class='ctx'> 		case BPF_CGROUP_INET4_CONNECT:</div><div class='add'>+		case BPF_CGROUP_INET4_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET4_GETSOCKNAME:</div><div class='ctx'> 		case BPF_CGROUP_UDP4_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UDP4_RECVMSG:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -5565,7 +9324,10 @@ static bool sock_addr_is_valid_access(int off, int size,</div><div class='ctx'> 		switch (prog-&gt;expected_attach_type) {</div><div class='ctx'> 		case BPF_CGROUP_INET6_BIND:</div><div class='ctx'> 		case BPF_CGROUP_INET6_CONNECT:</div><div class='add'>+		case BPF_CGROUP_INET6_GETPEERNAME:</div><div class='add'>+		case BPF_CGROUP_INET6_GETSOCKNAME:</div><div class='ctx'> 		case BPF_CGROUP_UDP6_SENDMSG:</div><div class='add'>+		case BPF_CGROUP_UDP6_RECVMSG:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -5596,27 +9358,55 @@ static bool sock_addr_is_valid_access(int off, int size,</div><div class='ctx'> 	case bpf_ctx_range(struct bpf_sock_addr, msg_src_ip4):</div><div class='ctx'> 	case bpf_ctx_range_till(struct bpf_sock_addr, msg_src_ip6[0],</div><div class='ctx'> 				msg_src_ip6[3]):</div><div class='del'>-		/* Only narrow read access allowed for now. */</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock_addr, user_port):</div><div class='ctx'> 		if (type == BPF_READ) {</div><div class='ctx'> 			bpf_ctx_record_field_size(info, size_default);</div><div class='add'>+</div><div class='add'>+			if (bpf_ctx_wide_access_ok(off, size,</div><div class='add'>+						   struct bpf_sock_addr,</div><div class='add'>+						   user_ip6))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='add'>+			if (bpf_ctx_wide_access_ok(off, size,</div><div class='add'>+						   struct bpf_sock_addr,</div><div class='add'>+						   msg_src_ip6))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='ctx'> 			if (!bpf_ctx_narrow_access_ok(off, size, size_default))</div><div class='ctx'> 				return false;</div><div class='ctx'> 		} else {</div><div class='add'>+			if (bpf_ctx_wide_access_ok(off, size,</div><div class='add'>+						   struct bpf_sock_addr,</div><div class='add'>+						   user_ip6))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='add'>+			if (bpf_ctx_wide_access_ok(off, size,</div><div class='add'>+						   struct bpf_sock_addr,</div><div class='add'>+						   msg_src_ip6))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='ctx'> 			if (size != size_default)</div><div class='ctx'> 				return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case bpf_ctx_range(struct bpf_sock_addr, user_port):</div><div class='add'>+	case bpf_ctx_range_ptr(struct bpf_sock_addr, sk):</div><div class='add'>+		if (type != BPF_READ)</div><div class='add'>+			return false;</div><div class='add'>+		if (size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCKET;</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock_addr, user_family):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock_addr, family):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock_addr, type):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sock_addr, protocol):</div><div class='add'>+		if (type != BPF_READ)</div><div class='add'>+			return false;</div><div class='ctx'> 		if (size != size_default)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (type == BPF_READ) {</div><div class='del'>-			if (size != size_default)</div><div class='del'>-				return false;</div><div class='del'>-		} else {</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -5653,6 +9443,29 @@ static bool sock_ops_is_valid_access(int off, int size,</div><div class='ctx'> 			if (size != sizeof(__u64))</div><div class='ctx'> 				return false;</div><div class='ctx'> 			break;</div><div class='add'>+		case bpf_ctx_range_ptr(struct bpf_sock_ops, sk):</div><div class='add'>+			if (size != sizeof(__u64))</div><div class='add'>+				return false;</div><div class='add'>+			info-&gt;reg_type = PTR_TO_SOCKET_OR_NULL;</div><div class='add'>+			break;</div><div class='add'>+		case bpf_ctx_range_ptr(struct bpf_sock_ops, skb_data):</div><div class='add'>+			if (size != sizeof(__u64))</div><div class='add'>+				return false;</div><div class='add'>+			info-&gt;reg_type = PTR_TO_PACKET;</div><div class='add'>+			break;</div><div class='add'>+		case bpf_ctx_range_ptr(struct bpf_sock_ops, skb_data_end):</div><div class='add'>+			if (size != sizeof(__u64))</div><div class='add'>+				return false;</div><div class='add'>+			info-&gt;reg_type = PTR_TO_PACKET_END;</div><div class='add'>+			break;</div><div class='add'>+		case offsetof(struct bpf_sock_ops, skb_tcp_flags):</div><div class='add'>+			bpf_ctx_record_field_size(info, size_default);</div><div class='add'>+			return bpf_ctx_narrow_access_ok(off, size,</div><div class='add'>+							size_default);</div><div class='add'>+		case bpf_ctx_range(struct bpf_sock_ops, skb_hwtstamp):</div><div class='add'>+			if (size != sizeof(__u64))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (size != size_default)</div><div class='ctx'> 				return false;</div><div class='hunk'>@@ -5677,6 +9490,9 @@ static bool sk_skb_is_valid_access(int off, int size,</div><div class='ctx'> 	switch (off) {</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, tc_classid):</div><div class='ctx'> 	case bpf_ctx_range(struct __sk_buff, data_meta):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, tstamp):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, wire_len):</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, hwtstamp):</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5712,30 +9528,225 @@ static bool sk_msg_is_valid_access(int off, int size,</div><div class='ctx'> 	if (type == BPF_WRITE)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	if (off % size != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	switch (off) {</div><div class='del'>-	case offsetof(struct sk_msg_md, data):</div><div class='add'>+	case bpf_ctx_range_ptr(struct sk_msg_md, data):</div><div class='ctx'> 		info-&gt;reg_type = PTR_TO_PACKET;</div><div class='ctx'> 		if (size != sizeof(__u64))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='del'>-	case offsetof(struct sk_msg_md, data_end):</div><div class='add'>+	case bpf_ctx_range_ptr(struct sk_msg_md, data_end):</div><div class='ctx'> 		info-&gt;reg_type = PTR_TO_PACKET_END;</div><div class='ctx'> 		if (size != sizeof(__u64))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='add'>+	case bpf_ctx_range_ptr(struct sk_msg_md, sk):</div><div class='add'>+		if (size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCKET;</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, family):</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, remote_ip4):</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, local_ip4):</div><div class='add'>+	case bpf_ctx_range_till(struct sk_msg_md, remote_ip6[0], remote_ip6[3]):</div><div class='add'>+	case bpf_ctx_range_till(struct sk_msg_md, local_ip6[0], local_ip6[3]):</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, remote_port):</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, local_port):</div><div class='add'>+	case bpf_ctx_range(struct sk_msg_md, size):</div><div class='ctx'> 		if (size != sizeof(__u32))</div><div class='ctx'> 			return false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool flow_dissector_is_valid_access(int off, int size,</div><div class='add'>+					   enum bpf_access_type type,</div><div class='add'>+					   const struct bpf_prog *prog,</div><div class='add'>+					   struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	const int size_default = sizeof(__u32);</div><div class='ctx'> </div><div class='del'>-	if (off &lt; 0 || off &gt;= sizeof(struct sk_msg_md))</div><div class='add'>+	if (off &lt; 0 || off &gt;= sizeof(struct __sk_buff))</div><div class='ctx'> 		return false;</div><div class='add'>+</div><div class='ctx'> 	if (off % size != 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	if (type == BPF_WRITE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data):</div><div class='add'>+		if (info-&gt;is_ldsx || size != size_default)</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_PACKET;</div><div class='add'>+		return true;</div><div class='add'>+	case bpf_ctx_range(struct __sk_buff, data_end):</div><div class='add'>+		if (info-&gt;is_ldsx || size != size_default)</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_PACKET_END;</div><div class='add'>+		return true;</div><div class='add'>+	case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):</div><div class='add'>+		if (size != sizeof(__u64))</div><div class='add'>+			return false;</div><div class='add'>+		info-&gt;reg_type = PTR_TO_FLOW_KEYS;</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 flow_dissector_convert_ctx_access(enum bpf_access_type type,</div><div class='add'>+					     const struct bpf_insn *si,</div><div class='add'>+					     struct bpf_insn *insn_buf,</div><div class='add'>+					     struct bpf_prog *prog,</div><div class='add'>+					     u32 *target_size)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+	switch (si-&gt;off) {</div><div class='add'>+	case offsetof(struct __sk_buff, data):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_flow_dissector, data),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_flow_dissector, data));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, data_end):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_flow_dissector, data_end),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_flow_dissector, data_end));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, flow_keys):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_flow_dissector, flow_keys),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_flow_dissector, flow_keys));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_insn *bpf_convert_tstamp_type_read(const struct bpf_insn *si,</div><div class='add'>+						     struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	__u8 value_reg = si-&gt;dst_reg;</div><div class='add'>+	__u8 skb_reg = si-&gt;src_reg;</div><div class='add'>+	BUILD_BUG_ON(__SKB_CLOCK_MAX != (int)BPF_SKB_CLOCK_TAI);</div><div class='add'>+	BUILD_BUG_ON(SKB_CLOCK_REALTIME != (int)BPF_SKB_CLOCK_REALTIME);</div><div class='add'>+	BUILD_BUG_ON(SKB_CLOCK_MONOTONIC != (int)BPF_SKB_CLOCK_MONOTONIC);</div><div class='add'>+	BUILD_BUG_ON(SKB_CLOCK_TAI != (int)BPF_SKB_CLOCK_TAI);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_B, value_reg, skb_reg, SKB_BF_MONO_TC_OFFSET);</div><div class='add'>+	*insn++ = BPF_ALU32_IMM(BPF_AND, value_reg, SKB_TSTAMP_TYPE_MASK);</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	*insn++ = BPF_ALU32_IMM(BPF_RSH, value_reg, SKB_TSTAMP_TYPE_RSHIFT);</div><div class='add'>+#else</div><div class='add'>+	BUILD_BUG_ON(!(SKB_TSTAMP_TYPE_MASK &amp; 0x1));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return insn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_insn *bpf_convert_shinfo_access(__u8 dst_reg, __u8 skb_reg,</div><div class='add'>+						  struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	/* si-&gt;dst_reg = skb_shinfo(SKB); */</div><div class='add'>+#ifdef NET_SKBUFF_DATA_USES_OFFSET</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),</div><div class='add'>+			      BPF_REG_AX, skb_reg,</div><div class='add'>+			      offsetof(struct sk_buff, end));</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, head),</div><div class='add'>+			      dst_reg, skb_reg,</div><div class='add'>+			      offsetof(struct sk_buff, head));</div><div class='add'>+	*insn++ = BPF_ALU64_REG(BPF_ADD, dst_reg, BPF_REG_AX);</div><div class='add'>+#else</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),</div><div class='add'>+			      dst_reg, skb_reg,</div><div class='add'>+			      offsetof(struct sk_buff, end));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return insn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_insn *bpf_convert_tstamp_read(const struct bpf_prog *prog,</div><div class='add'>+						const struct bpf_insn *si,</div><div class='add'>+						struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	__u8 value_reg = si-&gt;dst_reg;</div><div class='add'>+	__u8 skb_reg = si-&gt;src_reg;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_XGRESS</div><div class='add'>+	/* If the tstamp_type is read,</div><div class='add'>+	 * the bpf prog is aware the tstamp could have delivery time.</div><div class='add'>+	 * Thus, read skb-&gt;tstamp as is if tstamp_type_access is true.</div><div class='add'>+	 */</div><div class='add'>+	if (!prog-&gt;tstamp_type_access) {</div><div class='add'>+		/* AX is needed because src_reg and dst_reg could be the same */</div><div class='add'>+		__u8 tmp_reg = BPF_REG_AX;</div><div class='add'>+</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, SKB_BF_MONO_TC_OFFSET);</div><div class='add'>+		/* check if ingress mask bits is set */</div><div class='add'>+		*insn++ = BPF_JMP32_IMM(BPF_JSET, tmp_reg, TC_AT_INGRESS_MASK, 1);</div><div class='add'>+		*insn++ = BPF_JMP_A(4);</div><div class='add'>+		*insn++ = BPF_JMP32_IMM(BPF_JSET, tmp_reg, SKB_TSTAMP_TYPE_MASK, 1);</div><div class='add'>+		*insn++ = BPF_JMP_A(2);</div><div class='add'>+		/* skb-&gt;tc_at_ingress &amp;&amp; skb-&gt;tstamp_type,</div><div class='add'>+		 * read 0 as the (rcv) timestamp.</div><div class='add'>+		 */</div><div class='add'>+		*insn++ = BPF_MOV64_IMM(value_reg, 0);</div><div class='add'>+		*insn++ = BPF_JMP_A(1);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, value_reg, skb_reg,</div><div class='add'>+			      offsetof(struct sk_buff, tstamp));</div><div class='add'>+	return insn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_insn *bpf_convert_tstamp_write(const struct bpf_prog *prog,</div><div class='add'>+						 const struct bpf_insn *si,</div><div class='add'>+						 struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	__u8 value_reg = si-&gt;src_reg;</div><div class='add'>+	__u8 skb_reg = si-&gt;dst_reg;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_XGRESS</div><div class='add'>+	/* If the tstamp_type is read,</div><div class='add'>+	 * the bpf prog is aware the tstamp could have delivery time.</div><div class='add'>+	 * Thus, write skb-&gt;tstamp as is if tstamp_type_access is true.</div><div class='add'>+	 * Otherwise, writing at ingress will have to clear the</div><div class='add'>+	 * skb-&gt;tstamp_type bit also.</div><div class='add'>+	 */</div><div class='add'>+	if (!prog-&gt;tstamp_type_access) {</div><div class='add'>+		__u8 tmp_reg = BPF_REG_AX;</div><div class='add'>+</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, SKB_BF_MONO_TC_OFFSET);</div><div class='add'>+		/* Writing __sk_buff-&gt;tstamp as ingress, goto &lt;clear&gt; */</div><div class='add'>+		*insn++ = BPF_JMP32_IMM(BPF_JSET, tmp_reg, TC_AT_INGRESS_MASK, 1);</div><div class='add'>+		/* goto &lt;store&gt; */</div><div class='add'>+		*insn++ = BPF_JMP_A(2);</div><div class='add'>+		/* &lt;clear&gt;: skb-&gt;tstamp_type */</div><div class='add'>+		*insn++ = BPF_ALU32_IMM(BPF_AND, tmp_reg, ~SKB_TSTAMP_TYPE_MASK);</div><div class='add'>+		*insn++ = BPF_STX_MEM(BPF_B, skb_reg, tmp_reg, SKB_BF_MONO_TC_OFFSET);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* &lt;store&gt;: skb-&gt;tstamp = tstamp */</div><div class='add'>+	*insn++ = BPF_RAW_INSN(BPF_CLASS(si-&gt;code) | BPF_DW | BPF_MEM,</div><div class='add'>+			       skb_reg, value_reg, offsetof(struct sk_buff, tstamp), si-&gt;imm);</div><div class='add'>+	return insn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BPF_EMIT_STORE(size, si, off)					\</div><div class='add'>+	BPF_RAW_INSN(BPF_CLASS((si)-&gt;code) | (size) | BPF_MEM,		\</div><div class='add'>+		     (si)-&gt;dst_reg, (si)-&gt;src_reg, (off), (si)-&gt;imm)</div><div class='add'>+</div><div class='ctx'> static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				  const struct bpf_insn *si,</div><div class='ctx'> 				  struct bpf_insn *insn_buf,</div><div class='hunk'>@@ -5765,9 +9776,9 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, priority):</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					      bpf_target_off(struct sk_buff, priority, 4,</div><div class='del'>-							     target_size));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si,</div><div class='add'>+						 bpf_target_off(struct sk_buff, priority, 4,</div><div class='add'>+								target_size));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 					      bpf_target_off(struct sk_buff, priority, 4,</div><div class='hunk'>@@ -5798,9 +9809,9 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, mark):</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					      bpf_target_off(struct sk_buff, mark, 4,</div><div class='del'>-							     target_size));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si,</div><div class='add'>+						 bpf_target_off(struct sk_buff, mark, 4,</div><div class='add'>+								target_size));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 					      bpf_target_off(struct sk_buff, mark, 4,</div><div class='hunk'>@@ -5810,7 +9821,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct __sk_buff, pkt_type):</div><div class='ctx'> 		*target_size = 1;</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_B, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      PKT_TYPE_OFFSET());</div><div class='add'>+				      PKT_TYPE_OFFSET);</div><div class='ctx'> 		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, PKT_TYPE_MAX);</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg, 5);</div><div class='hunk'>@@ -5818,30 +9829,42 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, queue_mapping):</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      bpf_target_off(struct sk_buff, queue_mapping, 2,</div><div class='del'>-						     target_size));</div><div class='add'>+		if (type == BPF_WRITE) {</div><div class='add'>+			u32 offset = bpf_target_off(struct sk_buff, queue_mapping, 2, target_size);</div><div class='add'>+</div><div class='add'>+			if (BPF_CLASS(si-&gt;code) == BPF_ST &amp;&amp; si-&gt;imm &gt;= NO_QUEUE_MAPPING) {</div><div class='add'>+				*insn++ = BPF_JMP_A(0); /* noop */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (BPF_CLASS(si-&gt;code) == BPF_STX)</div><div class='add'>+				*insn++ = BPF_JMP_IMM(BPF_JGE, si-&gt;src_reg, NO_QUEUE_MAPPING, 1);</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_H, si, offset);</div><div class='add'>+		} else {</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+					      bpf_target_off(struct sk_buff,</div><div class='add'>+							     queue_mapping,</div><div class='add'>+							     2, target_size));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, vlan_present):</div><div class='del'>-	case offsetof(struct __sk_buff, vlan_tci):</div><div class='del'>-		BUILD_BUG_ON(VLAN_TAG_PRESENT != 0x1000);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct sk_buff,</div><div class='add'>+						     vlan_all, 4, target_size));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_ALU32_IMM(BPF_MOV, si-&gt;dst_reg, 1);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='add'>+	case offsetof(struct __sk_buff, vlan_tci):</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 				      bpf_target_off(struct sk_buff, vlan_tci, 2,</div><div class='ctx'> 						     target_size));</div><div class='del'>-		if (si-&gt;off == offsetof(struct __sk_buff, vlan_tci)) {</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg,</div><div class='del'>-						~VLAN_TAG_PRESENT);</div><div class='del'>-		} else {</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg, 12);</div><div class='del'>-			*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, 1);</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, cb[0]) ...</div><div class='ctx'> 	     offsetofend(struct __sk_buff, cb[4]) - 1:</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct qdisc_skb_cb, data) &lt; 20);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, data) &lt; 20);</div><div class='ctx'> 		BUILD_BUG_ON((offsetof(struct sk_buff, cb) +</div><div class='ctx'> 			      offsetof(struct qdisc_skb_cb, data)) %</div><div class='ctx'> 			     sizeof(__u64));</div><div class='hunk'>@@ -5852,15 +9875,14 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		off += offsetof(struct sk_buff, cb);</div><div class='ctx'> 		off += offsetof(struct qdisc_skb_cb, data);</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_SIZE(si-&gt;code), si-&gt;dst_reg,</div><div class='del'>-					      si-&gt;src_reg, off);</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_SIZE(si-&gt;code), si, off);</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_SIZE(si-&gt;code), si-&gt;dst_reg,</div><div class='ctx'> 					      si-&gt;src_reg, off);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, tc_classid):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct qdisc_skb_cb, tc_classid) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, tc_classid) != 2);</div><div class='ctx'> </div><div class='ctx'> 		off  = si-&gt;off;</div><div class='ctx'> 		off -= offsetof(struct __sk_buff, tc_classid);</div><div class='hunk'>@@ -5868,8 +9890,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		off += offsetof(struct qdisc_skb_cb, tc_classid);</div><div class='ctx'> 		*target_size = 2;</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_H, si-&gt;dst_reg,</div><div class='del'>-					      si-&gt;src_reg, off);</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_H, si, off);</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg,</div><div class='ctx'> 					      si-&gt;src_reg, off);</div><div class='hunk'>@@ -5902,9 +9923,9 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct __sk_buff, tc_index):</div><div class='ctx'> #ifdef CONFIG_NET_SCHED</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					      bpf_target_off(struct sk_buff, tc_index, 2,</div><div class='del'>-							     target_size));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_H, si,</div><div class='add'>+						 bpf_target_off(struct sk_buff, tc_index, 2,</div><div class='add'>+								target_size));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 					      bpf_target_off(struct sk_buff, tc_index, 2,</div><div class='hunk'>@@ -5931,7 +9952,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case offsetof(struct __sk_buff, family):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_family) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_family) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='hunk'>@@ -5942,7 +9963,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 						     2, target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case offsetof(struct __sk_buff, remote_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_daddr) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_daddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='hunk'>@@ -5953,7 +9974,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 						     4, target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case offsetof(struct __sk_buff, local_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_rcv_saddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='hunk'>@@ -5967,7 +9988,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct __sk_buff, remote_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct __sk_buff, remote_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_daddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='hunk'>@@ -5987,7 +10008,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct __sk_buff, local_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct __sk_buff, local_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_rcv_saddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='hunk'>@@ -6006,7 +10027,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, remote_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_dport) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_dport) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='hunk'>@@ -6021,7 +10042,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct __sk_buff, local_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_num) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_num) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='hunk'>@@ -6030,83 +10051,157 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				      bpf_target_off(struct sock_common,</div><div class='ctx'> 						     skc_num, 2, target_size));</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, tstamp):</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_buff, tstamp) != 8);</div><div class='add'>+</div><div class='add'>+		if (type == BPF_WRITE)</div><div class='add'>+			insn = bpf_convert_tstamp_write(prog, si, insn);</div><div class='add'>+		else</div><div class='add'>+			insn = bpf_convert_tstamp_read(prog, si, insn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, tstamp_type):</div><div class='add'>+		insn = bpf_convert_tstamp_type_read(si, insn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, gso_segs):</div><div class='add'>+		insn = bpf_convert_shinfo_access(si-&gt;dst_reg, si-&gt;src_reg, insn);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct skb_shared_info, gso_segs),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      bpf_target_off(struct skb_shared_info,</div><div class='add'>+						     gso_segs, 2,</div><div class='add'>+						     target_size));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct __sk_buff, gso_size):</div><div class='add'>+		insn = bpf_convert_shinfo_access(si-&gt;dst_reg, si-&gt;src_reg, insn);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct skb_shared_info, gso_size),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      bpf_target_off(struct skb_shared_info,</div><div class='add'>+						     gso_size, 2,</div><div class='add'>+						     target_size));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct __sk_buff, wire_len):</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, pkt_len) != 4);</div><div class='add'>+</div><div class='add'>+		off = si-&gt;off;</div><div class='add'>+		off -= offsetof(struct __sk_buff, wire_len);</div><div class='add'>+		off += offsetof(struct sk_buff, cb);</div><div class='add'>+		off += offsetof(struct qdisc_skb_cb, pkt_len);</div><div class='add'>+		*target_size = 4;</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg, off);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct __sk_buff, sk):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, sk),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct sk_buff, sk));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct __sk_buff, hwtstamp):</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct skb_shared_hwtstamps, hwtstamp) != 8);</div><div class='add'>+		BUILD_BUG_ON(offsetof(struct skb_shared_hwtstamps, hwtstamp) != 0);</div><div class='add'>+</div><div class='add'>+		insn = bpf_convert_shinfo_access(si-&gt;dst_reg, si-&gt;src_reg, insn);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_DW,</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      bpf_target_off(struct skb_shared_info,</div><div class='add'>+						     hwtstamps, 8,</div><div class='add'>+						     target_size));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 sock_filter_convert_ctx_access(enum bpf_access_type type,</div><div class='del'>-					  const struct bpf_insn *si,</div><div class='del'>-					  struct bpf_insn *insn_buf,</div><div class='del'>-					  struct bpf_prog *prog, u32 *target_size)</div><div class='add'>+u32 bpf_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='add'>+				const struct bpf_insn *si,</div><div class='add'>+				struct bpf_insn *insn_buf,</div><div class='add'>+				struct bpf_prog *prog, u32 *target_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_insn *insn = insn_buf;</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='ctx'> 	switch (si-&gt;off) {</div><div class='ctx'> 	case offsetof(struct bpf_sock, bound_dev_if):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_bound_dev_if) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock, sk_bound_dev_if) != 4);</div><div class='ctx'> </div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					offsetof(struct sock, sk_bound_dev_if));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si,</div><div class='add'>+						 offsetof(struct sock, sk_bound_dev_if));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 				      offsetof(struct sock, sk_bound_dev_if));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, mark):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_mark) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock, sk_mark) != 4);</div><div class='ctx'> </div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					offsetof(struct sock, sk_mark));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si,</div><div class='add'>+						 offsetof(struct sock, sk_mark));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 				      offsetof(struct sock, sk_mark));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, priority):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_priority) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock, sk_priority) != 4);</div><div class='ctx'> </div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					offsetof(struct sock, sk_priority));</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si,</div><div class='add'>+						 offsetof(struct sock, sk_priority));</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 				      offsetof(struct sock, sk_priority));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, family):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_family) != 2);</div><div class='del'>-</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sock, sk_family));</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock_common, skc_family),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock_common,</div><div class='add'>+				       skc_family,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='add'>+						    skc_family),</div><div class='add'>+				       target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, type):</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sock, __sk_flags_offset));</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, SK_FL_TYPE_MASK);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg, SK_FL_TYPE_SHIFT);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock, sk_type),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock, sk_type,</div><div class='add'>+				       sizeof_field(struct sock, sk_type),</div><div class='add'>+				       target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, protocol):</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sock, __sk_flags_offset));</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, SK_FL_PROTO_MASK);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg, SK_FL_PROTO_SHIFT);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock, sk_protocol),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock, sk_protocol,</div><div class='add'>+				       sizeof_field(struct sock, sk_protocol),</div><div class='add'>+				       target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock, src_ip4):</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(</div><div class='ctx'> 			BPF_SIZE(si-&gt;code), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 			bpf_target_off(struct sock_common, skc_rcv_saddr,</div><div class='del'>-				       FIELD_SIZEOF(struct sock_common,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='ctx'> 						    skc_rcv_saddr),</div><div class='ctx'> 				       target_size));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case offsetof(struct bpf_sock, dst_ip4):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_SIZE(si-&gt;code), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock_common, skc_daddr,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='add'>+						    skc_daddr),</div><div class='add'>+				       target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case bpf_ctx_range_till(struct bpf_sock, src_ip6[0], src_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 		off = si-&gt;off;</div><div class='hunk'>@@ -6116,7 +10211,7 @@ static u32 sock_filter_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 			bpf_target_off(</div><div class='ctx'> 				struct sock_common,</div><div class='ctx'> 				skc_v6_rcv_saddr.s6_addr32[0],</div><div class='del'>-				FIELD_SIZEOF(struct sock_common,</div><div class='add'>+				sizeof_field(struct sock_common,</div><div class='ctx'> 					     skc_v6_rcv_saddr.s6_addr32[0]),</div><div class='ctx'> 				target_size) + off);</div><div class='ctx'> #else</div><div class='hunk'>@@ -6125,15 +10220,69 @@ static u32 sock_filter_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sock, dst_ip6[0], dst_ip6[3]):</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		off = si-&gt;off;</div><div class='add'>+		off -= offsetof(struct bpf_sock, dst_ip6[0]);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_SIZE(si-&gt;code), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock_common,</div><div class='add'>+				       skc_v6_daddr.s6_addr32[0],</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='add'>+						    skc_v6_daddr.s6_addr32[0]),</div><div class='add'>+				       target_size) + off);</div><div class='add'>+#else</div><div class='add'>+		*insn++ = BPF_MOV32_IMM(si-&gt;dst_reg, 0);</div><div class='add'>+		*target_size = 4;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case offsetof(struct bpf_sock, src_port):</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(</div><div class='ctx'> 			BPF_FIELD_SIZEOF(struct sock_common, skc_num),</div><div class='ctx'> 			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 			bpf_target_off(struct sock_common, skc_num,</div><div class='del'>-				       FIELD_SIZEOF(struct sock_common,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='ctx'> 						    skc_num),</div><div class='ctx'> 				       target_size));</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sock, dst_port):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock_common, skc_dport),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock_common, skc_dport,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='add'>+						    skc_dport),</div><div class='add'>+				       target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sock, state):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock_common, skc_state),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock_common, skc_state,</div><div class='add'>+				       sizeof_field(struct sock_common,</div><div class='add'>+						    skc_state),</div><div class='add'>+				       target_size));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock, rx_queue_mapping):</div><div class='add'>+#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING</div><div class='add'>+		*insn++ = BPF_LDX_MEM(</div><div class='add'>+			BPF_FIELD_SIZEOF(struct sock, sk_rx_queue_mapping),</div><div class='add'>+			si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+			bpf_target_off(struct sock, sk_rx_queue_mapping,</div><div class='add'>+				       sizeof_field(struct sock,</div><div class='add'>+						    sk_rx_queue_mapping),</div><div class='add'>+				       target_size));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JNE, si-&gt;dst_reg, NO_QUEUE_MAPPING,</div><div class='add'>+				      1);</div><div class='add'>+		*insn++ = BPF_MOV64_IMM(si-&gt;dst_reg, -1);</div><div class='add'>+#else</div><div class='add'>+		*insn++ = BPF_MOV64_IMM(si-&gt;dst_reg, -1);</div><div class='add'>+		*target_size = 2;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='hunk'>@@ -6204,6 +10353,16 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				      offsetof(struct xdp_rxq_info,</div><div class='ctx'> 					       queue_index));</div><div class='ctx'> 		break;</div><div class='add'>+	case offsetof(struct xdp_md, egress_ifindex):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct xdp_buff, txq),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct xdp_buff, txq));</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct xdp_txq_info, dev),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      offsetof(struct xdp_txq_info, dev));</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      offsetof(struct net_device, ifindex));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='hunk'>@@ -6225,7 +10384,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				      si-&gt;src_reg, offsetof(S, F));	       \</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(					       \</div><div class='ctx'> 			SIZE, si-&gt;dst_reg, si-&gt;dst_reg,			       \</div><div class='del'>-			bpf_target_off(NS, NF, FIELD_SIZEOF(NS, NF),	       \</div><div class='add'>+			bpf_target_off(NS, NF, sizeof_field(NS, NF),	       \</div><div class='ctx'> 				       target_size)			       \</div><div class='ctx'> 				+ OFF);					       \</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -6237,9 +10396,6 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> /* SOCK_ADDR_STORE_NESTED_FIELD_OFF() has semantic similar to</div><div class='ctx'>  * SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF() but for store operation.</div><div class='ctx'>  *</div><div class='del'>- * It doesn't support SIZE argument though since narrow stores are not</div><div class='del'>- * supported for now.</div><div class='del'>- *</div><div class='ctx'>  * In addition it uses Temporary Field TF (member of struct S) as the 3rd</div><div class='ctx'>  * "register" since two registers available in convert_ctx_access are not</div><div class='ctx'>  * enough: we can't override neither SRC, since it contains value to store, nor</div><div class='hunk'>@@ -6247,7 +10403,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'>  * instructions. But we need a temporary place to save pointer to nested</div><div class='ctx'>  * structure whose field we want to store to.</div><div class='ctx'>  */</div><div class='del'>-#define SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, TF)		       \</div><div class='add'>+#define SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, OFF, TF)	       \</div><div class='ctx'> 	do {								       \</div><div class='ctx'> 		int tmp_reg = BPF_REG_9;				       \</div><div class='ctx'> 		if (si-&gt;src_reg == tmp_reg || si-&gt;dst_reg == tmp_reg)	       \</div><div class='hunk'>@@ -6258,11 +10414,12 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				      offsetof(S, TF));			       \</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(S, F), tmp_reg,	       \</div><div class='ctx'> 				      si-&gt;dst_reg, offsetof(S, F));	       \</div><div class='del'>-		*insn++ = BPF_STX_MEM(					       \</div><div class='del'>-			BPF_FIELD_SIZEOF(NS, NF), tmp_reg, si-&gt;src_reg,	       \</div><div class='del'>-			bpf_target_off(NS, NF, FIELD_SIZEOF(NS, NF),	       \</div><div class='add'>+		*insn++ = BPF_RAW_INSN(SIZE | BPF_MEM | BPF_CLASS(si-&gt;code),   \</div><div class='add'>+				       tmp_reg, si-&gt;src_reg,		       \</div><div class='add'>+			bpf_target_off(NS, NF, sizeof_field(NS, NF),	       \</div><div class='ctx'> 				       target_size)			       \</div><div class='del'>-				+ OFF);					       \</div><div class='add'>+				       + OFF,				       \</div><div class='add'>+				       si-&gt;imm);			       \</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_DW, tmp_reg, si-&gt;dst_reg,	       \</div><div class='ctx'> 				      offsetof(S, TF));			       \</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -6271,25 +10428,21 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 						      TF)		       \</div><div class='ctx'> 	do {								       \</div><div class='ctx'> 		if (type == BPF_WRITE) {				       \</div><div class='del'>-			SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF,    \</div><div class='del'>-							 TF);		       \</div><div class='add'>+			SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE,   \</div><div class='add'>+							 OFF, TF);	       \</div><div class='ctx'> 		} else {						       \</div><div class='ctx'> 			SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF(		       \</div><div class='ctx'> 				S, NS, F, NF, SIZE, OFF);  \</div><div class='ctx'> 		}							       \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define SOCK_ADDR_LOAD_OR_STORE_NESTED_FIELD(S, NS, F, NF, TF)		       \</div><div class='del'>-	SOCK_ADDR_LOAD_OR_STORE_NESTED_FIELD_SIZE_OFF(			       \</div><div class='del'>-		S, NS, F, NF, BPF_FIELD_SIZEOF(NS, NF), 0, TF)</div><div class='del'>-</div><div class='ctx'> static u32 sock_addr_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 					const struct bpf_insn *si,</div><div class='ctx'> 					struct bpf_insn *insn_buf,</div><div class='ctx'> 					struct bpf_prog *prog, u32 *target_size)</div><div class='ctx'> {</div><div class='add'>+	int off, port_size = sizeof_field(struct sockaddr_in6, sin6_port);</div><div class='ctx'> 	struct bpf_insn *insn = insn_buf;</div><div class='del'>-	int off;</div><div class='ctx'> </div><div class='ctx'> 	switch (si-&gt;off) {</div><div class='ctx'> 	case offsetof(struct bpf_sock_addr, user_family):</div><div class='hunk'>@@ -6322,11 +10475,13 @@ static u32 sock_addr_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUILD_BUG_ON(offsetof(struct sockaddr_in, sin_port) !=</div><div class='ctx'> 			     offsetof(struct sockaddr_in6, sin6_port));</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sockaddr_in, sin_port) !=</div><div class='del'>-			     FIELD_SIZEOF(struct sockaddr_in6, sin6_port));</div><div class='del'>-		SOCK_ADDR_LOAD_OR_STORE_NESTED_FIELD(struct bpf_sock_addr_kern,</div><div class='del'>-						     struct sockaddr_in6, uaddr,</div><div class='del'>-						     sin6_port, tmp_reg);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sockaddr_in, sin_port) !=</div><div class='add'>+			     sizeof_field(struct sockaddr_in6, sin6_port));</div><div class='add'>+		/* Account for sin6_port being smaller than user_port. */</div><div class='add'>+		port_size = min(port_size, BPF_LDST_BYTES(si));</div><div class='add'>+		SOCK_ADDR_LOAD_OR_STORE_NESTED_FIELD_SIZE_OFF(</div><div class='add'>+			struct bpf_sock_addr_kern, struct sockaddr_in6, uaddr,</div><div class='add'>+			sin6_port, bytes_to_bpf_size(port_size), 0, tmp_reg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_addr, family):</div><div class='hunk'>@@ -6335,20 +10490,13 @@ static u32 sock_addr_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_addr, type):</div><div class='del'>-		SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF(</div><div class='del'>-			struct bpf_sock_addr_kern, struct sock, sk,</div><div class='del'>-			__sk_flags_offset, BPF_W, 0);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, SK_FL_TYPE_MASK);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg, SK_FL_TYPE_SHIFT);</div><div class='add'>+		SOCK_ADDR_LOAD_NESTED_FIELD(struct bpf_sock_addr_kern,</div><div class='add'>+					    struct sock, sk, sk_type);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_addr, protocol):</div><div class='del'>-		SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF(</div><div class='del'>-			struct bpf_sock_addr_kern, struct sock, sk,</div><div class='del'>-			__sk_flags_offset, BPF_W, 0);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, SK_FL_PROTO_MASK);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg,</div><div class='del'>-					SK_FL_PROTO_SHIFT);</div><div class='add'>+		SOCK_ADDR_LOAD_NESTED_FIELD(struct bpf_sock_addr_kern,</div><div class='add'>+					    struct sock, sk, sk_protocol);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_addr, msg_src_ip4):</div><div class='hunk'>@@ -6367,6 +10515,11 @@ static u32 sock_addr_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 			struct bpf_sock_addr_kern, struct in6_addr, t_ctx,</div><div class='ctx'> 			s6_addr32[0], BPF_SIZE(si-&gt;code), off, tmp_reg);</div><div class='ctx'> 		break;</div><div class='add'>+	case offsetof(struct bpf_sock_addr, sk):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_addr_kern, sk),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_addr_kern, sk));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='hunk'>@@ -6381,28 +10534,166 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	struct bpf_insn *insn = insn_buf;</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='add'>+/* Helper macro for adding read access to tcp_sock or sock fields. */</div><div class='add'>+#define SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ)			      \</div><div class='add'>+	do {								      \</div><div class='add'>+		int fullsock_reg = si-&gt;dst_reg, reg = BPF_REG_9, jmp = 2;     \</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(OBJ, OBJ_FIELD) &gt;		      \</div><div class='add'>+			     sizeof_field(struct bpf_sock_ops, BPF_FIELD));   \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg) {			      \</div><div class='add'>+			*insn++ = BPF_STX_MEM(BPF_DW, si-&gt;src_reg, reg,	      \</div><div class='add'>+					  offsetof(struct bpf_sock_ops_kern,  \</div><div class='add'>+					  temp));			      \</div><div class='add'>+			fullsock_reg = reg;				      \</div><div class='add'>+			jmp += 2;					      \</div><div class='add'>+		}							      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern,     \</div><div class='add'>+						is_locked_tcp_sock),	      \</div><div class='add'>+				      fullsock_reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+					       is_locked_tcp_sock));	      \</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, fullsock_reg, 0, jmp);	      \</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg)				      \</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+				      temp));				      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern, sk),\</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,		      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern, sk));\</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(OBJ,		      \</div><div class='add'>+						       OBJ_FIELD),	      \</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,		      \</div><div class='add'>+				      offsetof(OBJ, OBJ_FIELD));	      \</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg)	{			      \</div><div class='add'>+			*insn++ = BPF_JMP_A(1);				      \</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+				      temp));				      \</div><div class='add'>+		}							      \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define SOCK_OPS_GET_SK()							      \</div><div class='add'>+	do {								      \</div><div class='add'>+		int fullsock_reg = si-&gt;dst_reg, reg = BPF_REG_9, jmp = 1;     \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg) {			      \</div><div class='add'>+			*insn++ = BPF_STX_MEM(BPF_DW, si-&gt;src_reg, reg,	      \</div><div class='add'>+					  offsetof(struct bpf_sock_ops_kern,  \</div><div class='add'>+					  temp));			      \</div><div class='add'>+			fullsock_reg = reg;				      \</div><div class='add'>+			jmp += 2;					      \</div><div class='add'>+		}							      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern,     \</div><div class='add'>+						is_fullsock),		      \</div><div class='add'>+				      fullsock_reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+					       is_fullsock));		      \</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, fullsock_reg, 0, jmp);	      \</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg)				      \</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+				      temp));				      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern, sk),\</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,		      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern, sk));\</div><div class='add'>+		if (si-&gt;dst_reg == si-&gt;src_reg)	{			      \</div><div class='add'>+			*insn++ = BPF_JMP_A(1);				      \</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;src_reg,	      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+				      temp));				      \</div><div class='add'>+		}							      \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define SOCK_OPS_GET_TCP_SOCK_FIELD(FIELD) \</div><div class='add'>+		SOCK_OPS_GET_FIELD(FIELD, FIELD, struct tcp_sock)</div><div class='add'>+</div><div class='add'>+/* Helper macro for adding write access to tcp_sock or sock fields.</div><div class='add'>+ * The macro is called with two registers, dst_reg which contains a pointer</div><div class='add'>+ * to ctx (context) and src_reg which contains the value that should be</div><div class='add'>+ * stored. However, we need an additional register since we cannot overwrite</div><div class='add'>+ * dst_reg because it may be used later in the program.</div><div class='add'>+ * Instead we "borrow" one of the other register. We first save its value</div><div class='add'>+ * into a new (temp) field in bpf_sock_ops_kern, use it, and then restore</div><div class='add'>+ * it at the end of the macro.</div><div class='add'>+ */</div><div class='add'>+#define SOCK_OPS_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ)			      \</div><div class='add'>+	do {								      \</div><div class='add'>+		int reg = BPF_REG_9;					      \</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(OBJ, OBJ_FIELD) &gt;		      \</div><div class='add'>+			     sizeof_field(struct bpf_sock_ops, BPF_FIELD));   \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='add'>+			reg--;						      \</div><div class='add'>+		*insn++ = BPF_STX_MEM(BPF_DW, si-&gt;dst_reg, reg,		      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+					       temp));			      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern,     \</div><div class='add'>+						is_locked_tcp_sock),	      \</div><div class='add'>+				      reg, si-&gt;dst_reg,			      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+					       is_locked_tcp_sock));	      \</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, reg, 0, 2);		      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='add'>+						struct bpf_sock_ops_kern, sk),\</div><div class='add'>+				      reg, si-&gt;dst_reg,			      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern, sk));\</div><div class='add'>+		*insn++ = BPF_RAW_INSN(BPF_FIELD_SIZEOF(OBJ, OBJ_FIELD) |     \</div><div class='add'>+				       BPF_MEM | BPF_CLASS(si-&gt;code),	      \</div><div class='add'>+				       reg, si-&gt;src_reg,		      \</div><div class='add'>+				       offsetof(OBJ, OBJ_FIELD),	      \</div><div class='add'>+				       si-&gt;imm);			      \</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;dst_reg,		      \</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='add'>+					       temp));			      \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define SOCK_OPS_GET_OR_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ, TYPE)	      \</div><div class='add'>+	do {								      \</div><div class='add'>+		if (TYPE == BPF_WRITE)					      \</div><div class='add'>+			SOCK_OPS_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);	      \</div><div class='add'>+		else							      \</div><div class='add'>+			SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);	      \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> 	switch (si-&gt;off) {</div><div class='del'>-	case offsetof(struct bpf_sock_ops, op) ...</div><div class='add'>+	case offsetof(struct bpf_sock_ops, op):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       op),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern, op));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sock_ops, replylong[0]) ...</div><div class='ctx'> 	     offsetof(struct bpf_sock_ops, replylong[3]):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct bpf_sock_ops, op) !=</div><div class='del'>-			     FIELD_SIZEOF(struct bpf_sock_ops_kern, op));</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct bpf_sock_ops, reply) !=</div><div class='del'>-			     FIELD_SIZEOF(struct bpf_sock_ops_kern, reply));</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct bpf_sock_ops, replylong) !=</div><div class='del'>-			     FIELD_SIZEOF(struct bpf_sock_ops_kern, replylong));</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct bpf_sock_ops, reply) !=</div><div class='add'>+			     sizeof_field(struct bpf_sock_ops_kern, reply));</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct bpf_sock_ops, replylong) !=</div><div class='add'>+			     sizeof_field(struct bpf_sock_ops_kern, replylong));</div><div class='ctx'> 		off = si-&gt;off;</div><div class='del'>-		off -= offsetof(struct bpf_sock_ops, op);</div><div class='del'>-		off += offsetof(struct bpf_sock_ops_kern, op);</div><div class='add'>+		off -= offsetof(struct bpf_sock_ops, replylong[0]);</div><div class='add'>+		off += offsetof(struct bpf_sock_ops_kern, replylong[0]);</div><div class='ctx'> 		if (type == BPF_WRITE)</div><div class='del'>-			*insn++ = BPF_STX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-					      off);</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_W, si, off);</div><div class='ctx'> 		else</div><div class='ctx'> 			*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='ctx'> 					      off);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, family):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_family) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_family) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='ctx'> 					      struct bpf_sock_ops_kern, sk),</div><div class='hunk'>@@ -6413,7 +10704,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, remote_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_daddr) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_daddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='ctx'> 						struct bpf_sock_ops_kern, sk),</div><div class='hunk'>@@ -6424,7 +10715,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, local_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_rcv_saddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='hunk'>@@ -6439,7 +10730,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, remote_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct bpf_sock_ops, remote_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_daddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='hunk'>@@ -6460,7 +10751,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, local_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct bpf_sock_ops, local_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_rcv_saddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='hunk'>@@ -6479,7 +10770,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, remote_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_dport) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_dport) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='ctx'> 						struct bpf_sock_ops_kern, sk),</div><div class='hunk'>@@ -6493,7 +10784,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, local_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_num) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_num) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='ctx'> 						struct bpf_sock_ops_kern, sk),</div><div class='hunk'>@@ -6513,7 +10804,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, state):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_state) != 1);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_state) != 1);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='ctx'> 						struct bpf_sock_ops_kern, sk),</div><div class='hunk'>@@ -6524,7 +10815,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, rtt_min):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct tcp_sock, rtt_min) !=</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct tcp_sock, rtt_min) !=</div><div class='ctx'> 			     sizeof(struct minmax));</div><div class='ctx'> 		BUILD_BUG_ON(sizeof(struct minmax) &lt;</div><div class='ctx'> 			     sizeof(struct minmax_sample));</div><div class='hunk'>@@ -6535,85 +10826,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				      offsetof(struct bpf_sock_ops_kern, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct tcp_sock, rtt_min) +</div><div class='del'>-				      FIELD_SIZEOF(struct minmax_sample, t));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-/* Helper macro for adding read access to tcp_sock or sock fields. */</div><div class='del'>-#define SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ)			      \</div><div class='del'>-	do {								      \</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(OBJ, OBJ_FIELD) &gt;		      \</div><div class='del'>-			     FIELD_SIZEOF(struct bpf_sock_ops, BPF_FIELD));   \</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='del'>-						struct bpf_sock_ops_kern,     \</div><div class='del'>-						is_fullsock),		      \</div><div class='del'>-				      si-&gt;dst_reg, si-&gt;src_reg,		      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='del'>-					       is_fullsock));		      \</div><div class='del'>-		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 2);	      \</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='del'>-						struct bpf_sock_ops_kern, sk),\</div><div class='del'>-				      si-&gt;dst_reg, si-&gt;src_reg,		      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern, sk));\</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(OBJ,		      \</div><div class='del'>-						       OBJ_FIELD),	      \</div><div class='del'>-				      si-&gt;dst_reg, si-&gt;dst_reg,		      \</div><div class='del'>-				      offsetof(OBJ, OBJ_FIELD));	      \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* Helper macro for adding write access to tcp_sock or sock fields.</div><div class='del'>- * The macro is called with two registers, dst_reg which contains a pointer</div><div class='del'>- * to ctx (context) and src_reg which contains the value that should be</div><div class='del'>- * stored. However, we need an additional register since we cannot overwrite</div><div class='del'>- * dst_reg because it may be used later in the program.</div><div class='del'>- * Instead we "borrow" one of the other register. We first save its value</div><div class='del'>- * into a new (temp) field in bpf_sock_ops_kern, use it, and then restore</div><div class='del'>- * it at the end of the macro.</div><div class='del'>- */</div><div class='del'>-#define SOCK_OPS_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ)			      \</div><div class='del'>-	do {								      \</div><div class='del'>-		int reg = BPF_REG_9;					      \</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(OBJ, OBJ_FIELD) &gt;		      \</div><div class='del'>-			     FIELD_SIZEOF(struct bpf_sock_ops, BPF_FIELD));   \</div><div class='del'>-		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='del'>-			reg--;						      \</div><div class='del'>-		if (si-&gt;dst_reg == reg || si-&gt;src_reg == reg)		      \</div><div class='del'>-			reg--;						      \</div><div class='del'>-		*insn++ = BPF_STX_MEM(BPF_DW, si-&gt;dst_reg, reg,		      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='del'>-					       temp));			      \</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='del'>-						struct bpf_sock_ops_kern,     \</div><div class='del'>-						is_fullsock),		      \</div><div class='del'>-				      reg, si-&gt;dst_reg,			      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='del'>-					       is_fullsock));		      \</div><div class='del'>-		*insn++ = BPF_JMP_IMM(BPF_JEQ, reg, 0, 2);		      \</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(			      \</div><div class='del'>-						struct bpf_sock_ops_kern, sk),\</div><div class='del'>-				      reg, si-&gt;dst_reg,			      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern, sk));\</div><div class='del'>-		*insn++ = BPF_STX_MEM(BPF_FIELD_SIZEOF(OBJ, OBJ_FIELD),	      \</div><div class='del'>-				      reg, si-&gt;src_reg,			      \</div><div class='del'>-				      offsetof(OBJ, OBJ_FIELD));	      \</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_DW, reg, si-&gt;dst_reg,		      \</div><div class='del'>-				      offsetof(struct bpf_sock_ops_kern,      \</div><div class='del'>-					       temp));			      \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define SOCK_OPS_GET_OR_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ, TYPE)	      \</div><div class='del'>-	do {								      \</div><div class='del'>-		if (TYPE == BPF_WRITE)					      \</div><div class='del'>-			SOCK_OPS_SET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);	      \</div><div class='del'>-		else							      \</div><div class='del'>-			SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);	      \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-	case offsetof(struct bpf_sock_ops, snd_cwnd):</div><div class='del'>-		SOCK_OPS_GET_FIELD(snd_cwnd, snd_cwnd, struct tcp_sock);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case offsetof(struct bpf_sock_ops, srtt_us):</div><div class='del'>-		SOCK_OPS_GET_FIELD(srtt_us, srtt_us, struct tcp_sock);</div><div class='add'>+				      sizeof_field(struct minmax_sample, t));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, bpf_sock_ops_cb_flags):</div><div class='hunk'>@@ -6621,96 +10834,190 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				   struct tcp_sock);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case offsetof(struct bpf_sock_ops, sk_txhash):</div><div class='add'>+		SOCK_OPS_GET_OR_SET_FIELD(sk_txhash, sk_txhash,</div><div class='add'>+					  struct sock, type);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, snd_cwnd):</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(snd_cwnd);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, srtt_us):</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(srtt_us);</div><div class='add'>+		break;</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, snd_ssthresh):</div><div class='del'>-		SOCK_OPS_GET_FIELD(snd_ssthresh, snd_ssthresh, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(snd_ssthresh);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, rcv_nxt):</div><div class='del'>-		SOCK_OPS_GET_FIELD(rcv_nxt, rcv_nxt, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(rcv_nxt);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, snd_nxt):</div><div class='del'>-		SOCK_OPS_GET_FIELD(snd_nxt, snd_nxt, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(snd_nxt);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, snd_una):</div><div class='del'>-		SOCK_OPS_GET_FIELD(snd_una, snd_una, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(snd_una);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, mss_cache):</div><div class='del'>-		SOCK_OPS_GET_FIELD(mss_cache, mss_cache, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(mss_cache);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, ecn_flags):</div><div class='del'>-		SOCK_OPS_GET_FIELD(ecn_flags, ecn_flags, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(ecn_flags);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, rate_delivered):</div><div class='del'>-		SOCK_OPS_GET_FIELD(rate_delivered, rate_delivered,</div><div class='del'>-				   struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(rate_delivered);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, rate_interval_us):</div><div class='del'>-		SOCK_OPS_GET_FIELD(rate_interval_us, rate_interval_us,</div><div class='del'>-				   struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(rate_interval_us);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, packets_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(packets_out, packets_out, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(packets_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, retrans_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(retrans_out, retrans_out, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(retrans_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, total_retrans):</div><div class='del'>-		SOCK_OPS_GET_FIELD(total_retrans, total_retrans,</div><div class='del'>-				   struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(total_retrans);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, segs_in):</div><div class='del'>-		SOCK_OPS_GET_FIELD(segs_in, segs_in, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(segs_in);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, data_segs_in):</div><div class='del'>-		SOCK_OPS_GET_FIELD(data_segs_in, data_segs_in, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(data_segs_in);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, segs_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(segs_out, segs_out, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(segs_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, data_segs_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(data_segs_out, data_segs_out,</div><div class='del'>-				   struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(data_segs_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, lost_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(lost_out, lost_out, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(lost_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, sacked_out):</div><div class='del'>-		SOCK_OPS_GET_FIELD(sacked_out, sacked_out, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(sacked_out);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	case offsetof(struct bpf_sock_ops, sk_txhash):</div><div class='del'>-		SOCK_OPS_GET_OR_SET_FIELD(sk_txhash, sk_txhash,</div><div class='del'>-					  struct sock, type);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, bytes_received):</div><div class='del'>-		SOCK_OPS_GET_FIELD(bytes_received, bytes_received,</div><div class='del'>-				   struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(bytes_received);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case offsetof(struct bpf_sock_ops, bytes_acked):</div><div class='del'>-		SOCK_OPS_GET_FIELD(bytes_acked, bytes_acked, struct tcp_sock);</div><div class='add'>+		SOCK_OPS_GET_TCP_SOCK_FIELD(bytes_acked);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, sk):</div><div class='add'>+		SOCK_OPS_GET_SK();</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, skb_data_end):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       skb_data_end),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,</div><div class='add'>+					       skb_data_end));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, skb_data):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       skb),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,</div><div class='add'>+					       skb));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, data),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      offsetof(struct sk_buff, data));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, skb_len):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       skb),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,</div><div class='add'>+					       skb));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, len),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      offsetof(struct sk_buff, len));</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, skb_tcp_flags):</div><div class='add'>+		off = offsetof(struct sk_buff, cb);</div><div class='add'>+		off += offsetof(struct tcp_skb_cb, tcp_flags);</div><div class='add'>+		*target_size = sizeof_field(struct tcp_skb_cb, tcp_flags);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       skb),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,</div><div class='add'>+					       skb));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct tcp_skb_cb,</div><div class='add'>+						       tcp_flags),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;dst_reg, off);</div><div class='ctx'> 		break;</div><div class='add'>+	case offsetof(struct bpf_sock_ops, skb_hwtstamp): {</div><div class='add'>+		struct bpf_insn *jmp_on_null_skb;</div><div class='ctx'> </div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,</div><div class='add'>+						       skb),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sock_ops_kern,</div><div class='add'>+					       skb));</div><div class='add'>+		/* Reserve one insn to test skb == NULL */</div><div class='add'>+		jmp_on_null_skb = insn++;</div><div class='add'>+		insn = bpf_convert_shinfo_access(si-&gt;dst_reg, si-&gt;dst_reg, insn);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_DW, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='add'>+				      bpf_target_off(struct skb_shared_info,</div><div class='add'>+						     hwtstamps, 8,</div><div class='add'>+						     target_size));</div><div class='add'>+		*jmp_on_null_skb = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0,</div><div class='add'>+					       insn - jmp_on_null_skb - 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	}</div><div class='ctx'> 	return insn - insn_buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* data_end = skb-&gt;data + skb_headlen() */</div><div class='add'>+static struct bpf_insn *bpf_convert_data_end_access(const struct bpf_insn *si,</div><div class='add'>+						    struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='add'>+	int temp_reg_off = offsetof(struct sk_buff, cb) +</div><div class='add'>+			   offsetof(struct sk_skb_cb, temp_reg);</div><div class='add'>+</div><div class='add'>+	if (si-&gt;src_reg == si-&gt;dst_reg) {</div><div class='add'>+		/* We need an extra register, choose and save a register. */</div><div class='add'>+		reg = BPF_REG_9;</div><div class='add'>+		if (si-&gt;src_reg == reg || si-&gt;dst_reg == reg)</div><div class='add'>+			reg--;</div><div class='add'>+		if (si-&gt;src_reg == reg || si-&gt;dst_reg == reg)</div><div class='add'>+			reg--;</div><div class='add'>+		*insn++ = BPF_STX_MEM(BPF_DW, si-&gt;src_reg, reg, temp_reg_off);</div><div class='add'>+	} else {</div><div class='add'>+		reg = si-&gt;dst_reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reg = skb-&gt;data */</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, data),</div><div class='add'>+			      reg, si-&gt;src_reg,</div><div class='add'>+			      offsetof(struct sk_buff, data));</div><div class='add'>+	/* AX = skb-&gt;len */</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, len),</div><div class='add'>+			      BPF_REG_AX, si-&gt;src_reg,</div><div class='add'>+			      offsetof(struct sk_buff, len));</div><div class='add'>+	/* reg = skb-&gt;data + skb-&gt;len */</div><div class='add'>+	*insn++ = BPF_ALU64_REG(BPF_ADD, reg, BPF_REG_AX);</div><div class='add'>+	/* AX = skb-&gt;data_len */</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, data_len),</div><div class='add'>+			      BPF_REG_AX, si-&gt;src_reg,</div><div class='add'>+			      offsetof(struct sk_buff, data_len));</div><div class='add'>+</div><div class='add'>+	/* reg = skb-&gt;data + skb-&gt;len - skb-&gt;data_len */</div><div class='add'>+	*insn++ = BPF_ALU64_REG(BPF_SUB, reg, BPF_REG_AX);</div><div class='add'>+</div><div class='add'>+	if (si-&gt;src_reg == si-&gt;dst_reg) {</div><div class='add'>+		/* Restore the saved register */</div><div class='add'>+		*insn++ = BPF_MOV64_REG(BPF_REG_AX, si-&gt;src_reg);</div><div class='add'>+		*insn++ = BPF_MOV64_REG(si-&gt;dst_reg, reg);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_DW, reg, BPF_REG_AX, temp_reg_off);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return insn;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 sk_skb_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				     const struct bpf_insn *si,</div><div class='ctx'> 				     struct bpf_insn *insn_buf,</div><div class='hunk'>@@ -6721,13 +11028,28 @@ static u32 sk_skb_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> </div><div class='ctx'> 	switch (si-&gt;off) {</div><div class='ctx'> 	case offsetof(struct __sk_buff, data_end):</div><div class='add'>+		insn = bpf_convert_data_end_access(si, insn);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct __sk_buff, cb[0]) ...</div><div class='add'>+	     offsetofend(struct __sk_buff, cb[4]) - 1:</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sk_skb_cb, data) &lt; 20);</div><div class='add'>+		BUILD_BUG_ON((offsetof(struct sk_buff, cb) +</div><div class='add'>+			      offsetof(struct sk_skb_cb, data)) %</div><div class='add'>+			     sizeof(__u64));</div><div class='add'>+</div><div class='add'>+		prog-&gt;cb_access = 1;</div><div class='ctx'> 		off  = si-&gt;off;</div><div class='del'>-		off -= offsetof(struct __sk_buff, data_end);</div><div class='add'>+		off -= offsetof(struct __sk_buff, cb[0]);</div><div class='ctx'> 		off += offsetof(struct sk_buff, cb);</div><div class='del'>-		off += offsetof(struct tcp_skb_cb, bpf.data_end);</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_SIZEOF(void *), si-&gt;dst_reg,</div><div class='del'>-				      si-&gt;src_reg, off);</div><div class='add'>+		off += offsetof(struct sk_skb_cb, data);</div><div class='add'>+		if (type == BPF_WRITE)</div><div class='add'>+			*insn++ = BPF_EMIT_STORE(BPF_SIZE(si-&gt;code), si, off);</div><div class='add'>+		else</div><div class='add'>+			*insn++ = BPF_LDX_MEM(BPF_SIZE(si-&gt;code), si-&gt;dst_reg,</div><div class='add'>+					      si-&gt;src_reg, off);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return bpf_convert_ctx_access(type, si, insn_buf, prog,</div><div class='ctx'> 					      target_size);</div><div class='hunk'>@@ -6746,47 +11068,50 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	int off;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* convert ctx uses the fact sg element is first in struct */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct sk_msg, sg) != 0);</div><div class='add'>+</div><div class='ctx'> 	switch (si-&gt;off) {</div><div class='ctx'> 	case offsetof(struct sk_msg_md, data):</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg_buff, data),</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg, data),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, data));</div><div class='add'>+				      offsetof(struct sk_msg, data));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case offsetof(struct sk_msg_md, data_end):</div><div class='del'>-		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg_buff, data_end),</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg, data_end),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, data_end));</div><div class='add'>+				      offsetof(struct sk_msg, data_end));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case offsetof(struct sk_msg_md, family):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_family) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_family) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-					      struct sk_msg_buff, sk),</div><div class='add'>+					      struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common, skc_family));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_msg_md, remote_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_daddr) != 4);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_daddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-						struct sk_msg_buff, sk),</div><div class='add'>+						struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common, skc_daddr));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_msg_md, local_ip4):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_rcv_saddr) != 4);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-					      struct sk_msg_buff, sk),</div><div class='add'>+					      struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common,</div><div class='ctx'> 					       skc_rcv_saddr));</div><div class='hunk'>@@ -6795,15 +11120,15 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct sk_msg_md, remote_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct sk_msg_md, remote_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_daddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='ctx'> 		off -= offsetof(struct sk_msg_md, remote_ip6[0]);</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-						struct sk_msg_buff, sk),</div><div class='add'>+						struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common,</div><div class='ctx'> 					       skc_v6_daddr.s6_addr32[0]) +</div><div class='hunk'>@@ -6816,15 +11141,15 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct sk_msg_md, local_ip6[0]) ...</div><div class='ctx'> 	     offsetof(struct sk_msg_md, local_ip6[3]):</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common,</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common,</div><div class='ctx'> 					  skc_v6_rcv_saddr.s6_addr32[0]) != 4);</div><div class='ctx'> </div><div class='ctx'> 		off = si-&gt;off;</div><div class='ctx'> 		off -= offsetof(struct sk_msg_md, local_ip6[0]);</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-						struct sk_msg_buff, sk),</div><div class='add'>+						struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common,</div><div class='ctx'> 					       skc_v6_rcv_saddr.s6_addr32[0]) +</div><div class='hunk'>@@ -6835,12 +11160,12 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_msg_md, remote_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_dport) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_dport) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-						struct sk_msg_buff, sk),</div><div class='add'>+						struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common, skc_dport));</div><div class='ctx'> #ifndef __BIG_ENDIAN_BITFIELD</div><div class='hunk'>@@ -6849,15 +11174,27 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_msg_md, local_port):</div><div class='del'>-		BUILD_BUG_ON(FIELD_SIZEOF(struct sock_common, skc_num) != 2);</div><div class='add'>+		BUILD_BUG_ON(sizeof_field(struct sock_common, skc_num) != 2);</div><div class='ctx'> </div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(</div><div class='del'>-						struct sk_msg_buff, sk),</div><div class='add'>+						struct sk_msg, sk),</div><div class='ctx'> 				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='del'>-				      offsetof(struct sk_msg_buff, sk));</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='ctx'> 		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;dst_reg,</div><div class='ctx'> 				      offsetof(struct sock_common, skc_num));</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct sk_msg_md, size):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg_sg, size),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct sk_msg_sg, size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct sk_msg_md, sk):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg, sk),</div><div class='add'>+				      si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct sk_msg, sk));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='hunk'>@@ -6880,6 +11217,7 @@ const struct bpf_verifier_ops tc_cls_act_verifier_ops = {</div><div class='ctx'> 	.convert_ctx_access	= tc_cls_act_convert_ctx_access,</div><div class='ctx'> 	.gen_prologue		= tc_cls_act_prologue,</div><div class='ctx'> 	.gen_ld_abs		= bpf_gen_ld_abs,</div><div class='add'>+	.btf_struct_access	= tc_cls_act_btf_struct_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops tc_cls_act_prog_ops = {</div><div class='hunk'>@@ -6890,6 +11228,8 @@ const struct bpf_verifier_ops xdp_verifier_ops = {</div><div class='ctx'> 	.get_func_proto		= xdp_func_proto,</div><div class='ctx'> 	.is_valid_access	= xdp_is_valid_access,</div><div class='ctx'> 	.convert_ctx_access	= xdp_convert_ctx_access,</div><div class='add'>+	.gen_prologue		= bpf_noop_prologue,</div><div class='add'>+	.btf_struct_access	= xdp_btf_struct_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops xdp_prog_ops = {</div><div class='hunk'>@@ -6898,7 +11238,7 @@ const struct bpf_prog_ops xdp_prog_ops = {</div><div class='ctx'> </div><div class='ctx'> const struct bpf_verifier_ops cg_skb_verifier_ops = {</div><div class='ctx'> 	.get_func_proto		= cg_skb_func_proto,</div><div class='del'>-	.is_valid_access	= sk_filter_is_valid_access,</div><div class='add'>+	.is_valid_access	= cg_skb_is_valid_access,</div><div class='ctx'> 	.convert_ctx_access	= bpf_convert_ctx_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -6944,13 +11284,12 @@ const struct bpf_verifier_ops lwt_seg6local_verifier_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops lwt_seg6local_prog_ops = {</div><div class='del'>-	.test_run		= bpf_prog_test_run_skb,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_verifier_ops cg_sock_verifier_ops = {</div><div class='ctx'> 	.get_func_proto		= sock_filter_func_proto,</div><div class='ctx'> 	.is_valid_access	= sock_filter_is_valid_access,</div><div class='del'>-	.convert_ctx_access	= sock_filter_convert_ctx_access,</div><div class='add'>+	.convert_ctx_access	= bpf_sock_convert_ctx_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops cg_sock_prog_ops = {</div><div class='hunk'>@@ -6988,11 +11327,22 @@ const struct bpf_verifier_ops sk_msg_verifier_ops = {</div><div class='ctx'> 	.get_func_proto		= sk_msg_func_proto,</div><div class='ctx'> 	.is_valid_access	= sk_msg_is_valid_access,</div><div class='ctx'> 	.convert_ctx_access	= sk_msg_convert_ctx_access,</div><div class='add'>+	.gen_prologue		= bpf_noop_prologue,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops sk_msg_prog_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct bpf_verifier_ops flow_dissector_verifier_ops = {</div><div class='add'>+	.get_func_proto		= flow_dissector_func_proto,</div><div class='add'>+	.is_valid_access	= flow_dissector_is_valid_access,</div><div class='add'>+	.convert_ctx_access	= flow_dissector_convert_ctx_access,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_prog_ops flow_dissector_prog_ops = {</div><div class='add'>+	.test_run		= bpf_prog_test_run_flow_dissector,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int sk_detach_filter(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='hunk'>@@ -7013,14 +11363,13 @@ int sk_detach_filter(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sk_detach_filter);</div><div class='ctx'> </div><div class='del'>-int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,</div><div class='del'>-		  unsigned int len)</div><div class='add'>+int sk_get_filter(struct sock *sk, sockptr_t optval, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock_fprog_kern *fprog;</div><div class='ctx'> 	struct sk_filter *filter;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='ctx'> 	filter = rcu_dereference_protected(sk-&gt;sk_filter,</div><div class='ctx'> 					   lockdep_sock_is_held(sk));</div><div class='ctx'> 	if (!filter)</div><div class='hunk'>@@ -7045,7 +11394,7 @@ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='del'>-	if (copy_to_user(ubuf, fprog-&gt;filter, bpf_classic_proglen(fprog)))</div><div class='add'>+	if (copy_to_sockptr(optval, fprog-&gt;filter, bpf_classic_proglen(fprog)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Instead of bytes, the API requests to return the number</div><div class='hunk'>@@ -7053,29 +11402,21 @@ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = fprog-&gt;len;</div><div class='ctx'> out:</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INET</div><div class='del'>-struct sk_reuseport_kern {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct sock *selected_sk;</div><div class='del'>-	void *data_end;</div><div class='del'>-	u32 hash;</div><div class='del'>-	u32 reuseport_id;</div><div class='del'>-	bool bind_inany;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void bpf_init_reuseport_kern(struct sk_reuseport_kern *reuse_kern,</div><div class='ctx'> 				    struct sock_reuseport *reuse,</div><div class='ctx'> 				    struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				    struct sock *migrating_sk,</div><div class='ctx'> 				    u32 hash)</div><div class='ctx'> {</div><div class='ctx'> 	reuse_kern-&gt;skb = skb;</div><div class='ctx'> 	reuse_kern-&gt;sk = sk;</div><div class='ctx'> 	reuse_kern-&gt;selected_sk = NULL;</div><div class='add'>+	reuse_kern-&gt;migrating_sk = migrating_sk;</div><div class='ctx'> 	reuse_kern-&gt;data_end = skb-&gt;data + skb_headlen(skb);</div><div class='ctx'> 	reuse_kern-&gt;hash = hash;</div><div class='ctx'> 	reuse_kern-&gt;reuseport_id = reuse-&gt;reuseport_id;</div><div class='hunk'>@@ -7084,13 +11425,14 @@ static void bpf_init_reuseport_kern(struct sk_reuseport_kern *reuse_kern,</div><div class='ctx'> </div><div class='ctx'> struct sock *bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk,</div><div class='ctx'> 				  struct bpf_prog *prog, struct sk_buff *skb,</div><div class='add'>+				  struct sock *migrating_sk,</div><div class='ctx'> 				  u32 hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_reuseport_kern reuse_kern;</div><div class='ctx'> 	enum sk_action action;</div><div class='ctx'> </div><div class='del'>-	bpf_init_reuseport_kern(&amp;reuse_kern, reuse, sk, skb, hash);</div><div class='del'>-	action = BPF_PROG_RUN(prog, &amp;reuse_kern);</div><div class='add'>+	bpf_init_reuseport_kern(&amp;reuse_kern, reuse, sk, skb, migrating_sk, hash);</div><div class='add'>+	action = bpf_prog_run(prog, &amp;reuse_kern);</div><div class='ctx'> </div><div class='ctx'> 	if (action == SK_PASS)</div><div class='ctx'> 		return reuse_kern.selected_sk;</div><div class='hunk'>@@ -7101,46 +11443,51 @@ struct sock *bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk,</div><div class='ctx'> BPF_CALL_4(sk_select_reuseport, struct sk_reuseport_kern *, reuse_kern,</div><div class='ctx'> 	   struct bpf_map *, map, void *, key, u32, flags)</div><div class='ctx'> {</div><div class='add'>+	bool is_sockarray = map-&gt;map_type == BPF_MAP_TYPE_REUSEPORT_SOCKARRAY;</div><div class='ctx'> 	struct sock_reuseport *reuse;</div><div class='ctx'> 	struct sock *selected_sk;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	selected_sk = map-&gt;ops-&gt;map_lookup_elem(map, key);</div><div class='ctx'> 	if (!selected_sk)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	reuse = rcu_dereference(selected_sk-&gt;sk_reuseport_cb);</div><div class='del'>-	if (!reuse)</div><div class='del'>-		/* selected_sk is unhashed (e.g. by close()) after the</div><div class='del'>-		 * above map_lookup_elem().  Treat selected_sk has already</div><div class='del'>-		 * been removed from the map.</div><div class='add'>+	if (!reuse) {</div><div class='add'>+		/* reuseport_array has only sk with non NULL sk_reuseport_cb.</div><div class='add'>+		 * The only (!reuse) case here is - the sk has already been</div><div class='add'>+		 * unhashed (e.g. by close()), so treat it as -ENOENT.</div><div class='add'>+		 *</div><div class='add'>+		 * Other maps (e.g. sock_map) do not provide this guarantee and</div><div class='add'>+		 * the sk may never be in the reuseport group to begin with.</div><div class='ctx'> 		 */</div><div class='del'>-		return -ENOENT;</div><div class='add'>+		err = is_sockarray ? -ENOENT : -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(reuse-&gt;reuseport_id != reuse_kern-&gt;reuseport_id)) {</div><div class='del'>-		struct sock *sk;</div><div class='del'>-</div><div class='del'>-		if (unlikely(!reuse_kern-&gt;reuseport_id))</div><div class='del'>-			/* There is a small race between adding the</div><div class='del'>-			 * sk to the map and setting the</div><div class='del'>-			 * reuse_kern-&gt;reuseport_id.</div><div class='del'>-			 * Treat it as the sk has not been added to</div><div class='del'>-			 * the bpf map yet.</div><div class='del'>-			 */</div><div class='del'>-			return -ENOENT;</div><div class='del'>-</div><div class='del'>-		sk = reuse_kern-&gt;sk;</div><div class='del'>-		if (sk-&gt;sk_protocol != selected_sk-&gt;sk_protocol)</div><div class='del'>-			return -EPROTOTYPE;</div><div class='del'>-		else if (sk-&gt;sk_family != selected_sk-&gt;sk_family)</div><div class='del'>-			return -EAFNOSUPPORT;</div><div class='add'>+		struct sock *sk = reuse_kern-&gt;sk;</div><div class='ctx'> </div><div class='del'>-		/* Catch all. Likely bound to a different sockaddr. */</div><div class='del'>-		return -EBADFD;</div><div class='add'>+		if (sk-&gt;sk_protocol != selected_sk-&gt;sk_protocol) {</div><div class='add'>+			err = -EPROTOTYPE;</div><div class='add'>+		} else if (sk-&gt;sk_family != selected_sk-&gt;sk_family) {</div><div class='add'>+			err = -EAFNOSUPPORT;</div><div class='add'>+		} else {</div><div class='add'>+			/* Catch all. Likely bound to a different sockaddr. */</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+		}</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	reuse_kern-&gt;selected_sk = selected_sk;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+error:</div><div class='add'>+	/* Lookup in sock_map can return TCP ESTABLISHED sockets. */</div><div class='add'>+	if (sk_is_refcounted(selected_sk))</div><div class='add'>+		sock_put(selected_sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_func_proto sk_select_reuseport_proto = {</div><div class='hunk'>@@ -7200,8 +11547,12 @@ sk_reuseport_func_proto(enum bpf_func_id func_id,</div><div class='ctx'> 		return &amp;sk_reuseport_load_bytes_proto;</div><div class='ctx'> 	case BPF_FUNC_skb_load_bytes_relative:</div><div class='ctx'> 		return &amp;sk_reuseport_load_bytes_relative_proto;</div><div class='add'>+	case BPF_FUNC_get_socket_cookie:</div><div class='add'>+		return &amp;bpf_get_socket_ptr_cookie_proto;</div><div class='add'>+	case BPF_FUNC_ktime_get_coarse_ns:</div><div class='add'>+		return &amp;bpf_ktime_get_coarse_ns_proto;</div><div class='ctx'> 	default:</div><div class='del'>-		return bpf_base_func_proto(func_id);</div><div class='add'>+		return bpf_base_func_proto(func_id, prog);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7229,14 +11580,22 @@ sk_reuseport_is_valid_access(int off, int size,</div><div class='ctx'> 	case offsetof(struct sk_reuseport_md, hash):</div><div class='ctx'> 		return size == size_default;</div><div class='ctx'> </div><div class='add'>+	case offsetof(struct sk_reuseport_md, sk):</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCKET;</div><div class='add'>+		return size == sizeof(__u64);</div><div class='add'>+</div><div class='add'>+	case offsetof(struct sk_reuseport_md, migrating_sk):</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCK_COMMON_OR_NULL;</div><div class='add'>+		return size == sizeof(__u64);</div><div class='add'>+</div><div class='ctx'> 	/* Fields that allow narrowing */</div><div class='del'>-	case offsetof(struct sk_reuseport_md, eth_protocol):</div><div class='del'>-		if (size &lt; FIELD_SIZEOF(struct sk_buff, protocol))</div><div class='add'>+	case bpf_ctx_range(struct sk_reuseport_md, eth_protocol):</div><div class='add'>+		if (size &lt; sizeof_field(struct sk_buff, protocol))</div><div class='ctx'> 			return false;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case offsetof(struct sk_reuseport_md, ip_protocol):</div><div class='del'>-	case offsetof(struct sk_reuseport_md, bind_inany):</div><div class='del'>-	case offsetof(struct sk_reuseport_md, len):</div><div class='add'>+		fallthrough;</div><div class='add'>+	case bpf_ctx_range(struct sk_reuseport_md, ip_protocol):</div><div class='add'>+	case bpf_ctx_range(struct sk_reuseport_md, bind_inany):</div><div class='add'>+	case bpf_ctx_range(struct sk_reuseport_md, len):</div><div class='ctx'> 		bpf_ctx_record_field_size(info, size_default);</div><div class='ctx'> 		return bpf_ctx_narrow_access_ok(off, size, size_default);</div><div class='ctx'> </div><div class='hunk'>@@ -7249,7 +11608,7 @@ sk_reuseport_is_valid_access(int off, int size,</div><div class='ctx'> 	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_reuseport_kern, F), \</div><div class='ctx'> 			      si-&gt;dst_reg, si-&gt;src_reg,			\</div><div class='ctx'> 			      bpf_target_off(struct sk_reuseport_kern, F, \</div><div class='del'>-					     FIELD_SIZEOF(struct sk_reuseport_kern, F), \</div><div class='add'>+					     sizeof_field(struct sk_reuseport_kern, F), \</div><div class='ctx'> 					     target_size));		\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='hunk'>@@ -7259,11 +11618,11 @@ sk_reuseport_is_valid_access(int off, int size,</div><div class='ctx'> 				    skb,				\</div><div class='ctx'> 				    SKB_FIELD)</div><div class='ctx'> </div><div class='del'>-#define SK_REUSEPORT_LOAD_SK_FIELD_SIZE_OFF(SK_FIELD, BPF_SIZE, EXTRA_OFF) \</div><div class='del'>-	SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF(struct sk_reuseport_kern,	\</div><div class='del'>-					     struct sock,		\</div><div class='del'>-					     sk,			\</div><div class='del'>-					     SK_FIELD, BPF_SIZE, EXTRA_OFF)</div><div class='add'>+#define SK_REUSEPORT_LOAD_SK_FIELD(SK_FIELD)				\</div><div class='add'>+	SOCK_ADDR_LOAD_NESTED_FIELD(struct sk_reuseport_kern,		\</div><div class='add'>+				    struct sock,			\</div><div class='add'>+				    sk,					\</div><div class='add'>+				    SK_FIELD)</div><div class='ctx'> </div><div class='ctx'> static u32 sk_reuseport_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 					   const struct bpf_insn *si,</div><div class='hunk'>@@ -7287,16 +11646,7 @@ static u32 sk_reuseport_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_reuseport_md, ip_protocol):</div><div class='del'>-		BUILD_BUG_ON(HWEIGHT32(SK_FL_PROTO_MASK) != BITS_PER_BYTE);</div><div class='del'>-		SK_REUSEPORT_LOAD_SK_FIELD_SIZE_OFF(__sk_flags_offset,</div><div class='del'>-						    BPF_W, 0);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_AND, si-&gt;dst_reg, SK_FL_PROTO_MASK);</div><div class='del'>-		*insn++ = BPF_ALU32_IMM(BPF_RSH, si-&gt;dst_reg,</div><div class='del'>-					SK_FL_PROTO_SHIFT);</div><div class='del'>-		/* SK_FL_PROTO_MASK and SK_FL_PROTO_SHIFT are endian</div><div class='del'>-		 * aware.  No further narrowing or masking is needed.</div><div class='del'>-		 */</div><div class='del'>-		*target_size = 1;</div><div class='add'>+		SK_REUSEPORT_LOAD_SK_FIELD(sk_protocol);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case offsetof(struct sk_reuseport_md, data_end):</div><div class='hunk'>@@ -7310,6 +11660,14 @@ static u32 sk_reuseport_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 	case offsetof(struct sk_reuseport_md, bind_inany):</div><div class='ctx'> 		SK_REUSEPORT_LOAD_FIELD(bind_inany);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct sk_reuseport_md, sk):</div><div class='add'>+		SK_REUSEPORT_LOAD_FIELD(sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct sk_reuseport_md, migrating_sk):</div><div class='add'>+		SK_REUSEPORT_LOAD_FIELD(migrating_sk);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return insn - insn_buf;</div><div class='hunk'>@@ -7323,4 +11681,898 @@ const struct bpf_verifier_ops sk_reuseport_verifier_ops = {</div><div class='ctx'> </div><div class='ctx'> const struct bpf_prog_ops sk_reuseport_prog_ops = {</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(bpf_sk_lookup_enabled);</div><div class='add'>+EXPORT_SYMBOL(bpf_sk_lookup_enabled);</div><div class='add'>+</div><div class='add'>+BPF_CALL_3(bpf_sk_lookup_assign, struct bpf_sk_lookup_kern *, ctx,</div><div class='add'>+	   struct sock *, sk, u64, flags)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_SK_LOOKUP_F_REPLACE |</div><div class='add'>+			       BPF_SK_LOOKUP_F_NO_REUSEPORT)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (unlikely(sk &amp;&amp; sk_is_refcounted(sk)))</div><div class='add'>+		return -ESOCKTNOSUPPORT; /* reject non-RCU freed sockets */</div><div class='add'>+	if (unlikely(sk &amp;&amp; sk_is_tcp(sk) &amp;&amp; sk-&gt;sk_state != TCP_LISTEN))</div><div class='add'>+		return -ESOCKTNOSUPPORT; /* only accept TCP socket in LISTEN */</div><div class='add'>+	if (unlikely(sk &amp;&amp; sk_is_udp(sk) &amp;&amp; sk-&gt;sk_state != TCP_CLOSE))</div><div class='add'>+		return -ESOCKTNOSUPPORT; /* only accept UDP socket in CLOSE */</div><div class='add'>+</div><div class='add'>+	/* Check if socket is suitable for packet L3/L4 protocol */</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_protocol != ctx-&gt;protocol)</div><div class='add'>+		return -EPROTOTYPE;</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_family != ctx-&gt;family &amp;&amp;</div><div class='add'>+	    (sk-&gt;sk_family == AF_INET || ipv6_only_sock(sk)))</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;selected_sk &amp;&amp; !(flags &amp; BPF_SK_LOOKUP_F_REPLACE))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/* Select socket as lookup result */</div><div class='add'>+	ctx-&gt;selected_sk = sk;</div><div class='add'>+	ctx-&gt;no_reuseport = flags &amp; BPF_SK_LOOKUP_F_NO_REUSEPORT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_sk_lookup_assign_proto = {</div><div class='add'>+	.func		= bpf_sk_lookup_assign,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_PTR_TO_SOCKET_OR_NULL,</div><div class='add'>+	.arg3_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+sk_lookup_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	switch (func_id) {</div><div class='add'>+	case BPF_FUNC_perf_event_output:</div><div class='add'>+		return &amp;bpf_event_output_data_proto;</div><div class='add'>+	case BPF_FUNC_sk_assign:</div><div class='add'>+		return &amp;bpf_sk_lookup_assign_proto;</div><div class='add'>+	case BPF_FUNC_sk_release:</div><div class='add'>+		return &amp;bpf_sk_release_proto;</div><div class='add'>+	default:</div><div class='add'>+		return bpf_sk_base_func_proto(func_id, prog);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sk_lookup_is_valid_access(int off, int size,</div><div class='add'>+				      enum bpf_access_type type,</div><div class='add'>+				      const struct bpf_prog *prog,</div><div class='add'>+				      struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	if (off &lt; 0 || off &gt;= sizeof(struct bpf_sk_lookup))</div><div class='add'>+		return false;</div><div class='add'>+	if (off % size != 0)</div><div class='add'>+		return false;</div><div class='add'>+	if (type != BPF_READ)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	case bpf_ctx_range_ptr(struct bpf_sk_lookup, sk):</div><div class='add'>+		info-&gt;reg_type = PTR_TO_SOCKET_OR_NULL;</div><div class='add'>+		return size == sizeof(__u64);</div><div class='add'>+</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, family):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, protocol):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, remote_ip4):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, local_ip4):</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sk_lookup, remote_ip6[0], remote_ip6[3]):</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sk_lookup, local_ip6[0], local_ip6[3]):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, local_port):</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, ingress_ifindex):</div><div class='add'>+		bpf_ctx_record_field_size(info, sizeof(__u32));</div><div class='add'>+		return bpf_ctx_narrow_access_ok(off, size, sizeof(__u32));</div><div class='add'>+</div><div class='add'>+	case bpf_ctx_range(struct bpf_sk_lookup, remote_port):</div><div class='add'>+		/* Allow 4-byte access to 2-byte field for backward compatibility */</div><div class='add'>+		if (size == sizeof(__u32))</div><div class='add'>+			return true;</div><div class='add'>+		bpf_ctx_record_field_size(info, sizeof(__be16));</div><div class='add'>+		return bpf_ctx_narrow_access_ok(off, size, sizeof(__be16));</div><div class='add'>+</div><div class='add'>+	case offsetofend(struct bpf_sk_lookup, remote_port) ...</div><div class='add'>+	     offsetof(struct bpf_sk_lookup, local_ip4) - 1:</div><div class='add'>+		/* Allow access to zero padding for backward compatibility */</div><div class='add'>+		bpf_ctx_record_field_size(info, sizeof(__u16));</div><div class='add'>+		return bpf_ctx_narrow_access_ok(off, size, sizeof(__u16));</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 sk_lookup_convert_ctx_access(enum bpf_access_type type,</div><div class='add'>+					const struct bpf_insn *si,</div><div class='add'>+					struct bpf_insn *insn_buf,</div><div class='add'>+					struct bpf_prog *prog,</div><div class='add'>+					u32 *target_size)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+	switch (si-&gt;off) {</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, sk):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_SIZEOF(void *), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sk_lookup_kern, selected_sk));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, family):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     family, 2, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, protocol):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     protocol, 2, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, remote_ip4):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     v4.saddr, 4, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, local_ip4):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     v4.daddr, 4, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sk_lookup,</div><div class='add'>+				remote_ip6[0], remote_ip6[3]): {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		int off = si-&gt;off;</div><div class='add'>+</div><div class='add'>+		off -= offsetof(struct bpf_sk_lookup, remote_ip6[0]);</div><div class='add'>+		off += bpf_target_off(struct in6_addr, s6_addr32[0], 4, target_size);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_SIZEOF(void *), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sk_lookup_kern, v6.saddr));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg, off);</div><div class='add'>+#else</div><div class='add'>+		*insn++ = BPF_MOV32_IMM(si-&gt;dst_reg, 0);</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case bpf_ctx_range_till(struct bpf_sk_lookup,</div><div class='add'>+				local_ip6[0], local_ip6[3]): {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		int off = si-&gt;off;</div><div class='add'>+</div><div class='add'>+		off -= offsetof(struct bpf_sk_lookup, local_ip6[0]);</div><div class='add'>+		off += bpf_target_off(struct in6_addr, s6_addr32[0], 4, target_size);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_SIZEOF(void *), si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      offsetof(struct bpf_sk_lookup_kern, v6.daddr));</div><div class='add'>+		*insn++ = BPF_JMP_IMM(BPF_JEQ, si-&gt;dst_reg, 0, 1);</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;dst_reg, off);</div><div class='add'>+#else</div><div class='add'>+		*insn++ = BPF_MOV32_IMM(si-&gt;dst_reg, 0);</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, remote_port):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     sport, 2, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetofend(struct bpf_sk_lookup, remote_port):</div><div class='add'>+		*target_size = 2;</div><div class='add'>+		*insn++ = BPF_MOV32_IMM(si-&gt;dst_reg, 0);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, local_port):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_H, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     dport, 2, target_size));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case offsetof(struct bpf_sk_lookup, ingress_ifindex):</div><div class='add'>+		*insn++ = BPF_LDX_MEM(BPF_W, si-&gt;dst_reg, si-&gt;src_reg,</div><div class='add'>+				      bpf_target_off(struct bpf_sk_lookup_kern,</div><div class='add'>+						     ingress_ifindex, 4, target_size));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_prog_ops sk_lookup_prog_ops = {</div><div class='add'>+	.test_run = bpf_prog_test_run_sk_lookup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bpf_verifier_ops sk_lookup_verifier_ops = {</div><div class='add'>+	.get_func_proto		= sk_lookup_func_proto,</div><div class='add'>+	.is_valid_access	= sk_lookup_is_valid_access,</div><div class='add'>+	.convert_ctx_access	= sk_lookup_convert_ctx_access,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+DEFINE_BPF_DISPATCHER(xdp)</div><div class='add'>+</div><div class='add'>+void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	bpf_dispatcher_change_prog(BPF_DISPATCHER_PTR(xdp), prev_prog, prog);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_GLOBAL(btf_sock_ids, MAX_BTF_SOCK_TYPE)</div><div class='add'>+#define BTF_SOCK_TYPE(name, type) BTF_ID(struct, type)</div><div class='add'>+BTF_SOCK_TYPE_xxx</div><div class='add'>+#undef BTF_SOCK_TYPE</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_tcp6_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	/* tcp6_sock type is not generated in dwarf and hence btf,</div><div class='add'>+	 * trigger an explicit type generation here.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT(struct tcp6_sock);</div><div class='add'>+	if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp; sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_tcp6_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_tcp6_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_TCP6],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_tcp_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp; sk-&gt;sk_protocol == IPPROTO_TCP)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_tcp_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_tcp_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_TCP],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_tcp_timewait_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	/* BTF types for tcp_timewait_sock and inet_timewait_sock are not</div><div class='add'>+	 * generated if CONFIG_INET=n. Trigger an explicit generation here.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT(struct inet_timewait_sock);</div><div class='add'>+	BTF_TYPE_EMIT(struct tcp_timewait_sock);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_prot == &amp;tcp_prot &amp;&amp; sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_prot == &amp;tcpv6_prot &amp;&amp; sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_tcp_timewait_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_tcp_timewait_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_TCP_TW],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_tcp_request_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_prot == &amp;tcp_prot &amp;&amp; sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_prot == &amp;tcpv6_prot &amp;&amp; sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_tcp_request_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_TCP_REQ],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_udp6_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	/* udp6_sock type is not generated in dwarf and hence btf,</div><div class='add'>+	 * trigger an explicit type generation here.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT(struct udp6_sock);</div><div class='add'>+	if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp; sk-&gt;sk_protocol == IPPROTO_UDP &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_type == SOCK_DGRAM &amp;&amp; sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_udp6_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_udp6_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_UDP6],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_unix_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	/* unix_sock type is not generated in dwarf and hence btf,</div><div class='add'>+	 * trigger an explicit type generation here.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT(struct unix_sock);</div><div class='add'>+	if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp; sk-&gt;sk_family == AF_UNIX)</div><div class='add'>+		return (unsigned long)sk;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_unix_sock_proto = {</div><div class='add'>+	.func			= bpf_skc_to_unix_sock,</div><div class='add'>+	.gpl_only		= false,</div><div class='add'>+	.ret_type		= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type		= ARG_PTR_TO_BTF_ID_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id		= &amp;btf_sock_ids[BTF_SOCK_TYPE_UNIX],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_skc_to_mptcp_sock, struct sock *, sk)</div><div class='add'>+{</div><div class='add'>+	BTF_TYPE_EMIT(struct mptcp_sock);</div><div class='add'>+	return (unsigned long)bpf_mptcp_sock_from_subflow(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto = {</div><div class='add'>+	.func		= bpf_skc_to_mptcp_sock,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_SOCK_COMMON,</div><div class='add'>+	.ret_btf_id	= &amp;btf_sock_ids[BTF_SOCK_TYPE_MPTCP],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_1(bpf_sock_from_file, struct file *, file)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)sock_from_file(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST(bpf_sock_from_file_btf_ids)</div><div class='add'>+BTF_ID(struct, socket)</div><div class='add'>+BTF_ID(struct, file)</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sock_from_file_proto = {</div><div class='add'>+	.func		= bpf_sock_from_file,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.ret_type	= RET_PTR_TO_BTF_ID_OR_NULL,</div><div class='add'>+	.ret_btf_id	= &amp;bpf_sock_from_file_btf_ids[0],</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID,</div><div class='add'>+	.arg1_btf_id	= &amp;bpf_sock_from_file_btf_ids[1],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+bpf_sk_base_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	const struct bpf_func_proto *func;</div><div class='add'>+</div><div class='add'>+	switch (func_id) {</div><div class='add'>+	case BPF_FUNC_skc_to_tcp6_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_tcp6_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_tcp_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_tcp_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_tcp_timewait_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_tcp_timewait_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_tcp_request_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_tcp_request_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_udp6_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_udp6_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_unix_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_unix_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_skc_to_mptcp_sock:</div><div class='add'>+		func = &amp;bpf_skc_to_mptcp_sock_proto;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_FUNC_ktime_get_coarse_ns:</div><div class='add'>+		return &amp;bpf_ktime_get_coarse_ns_proto;</div><div class='add'>+	default:</div><div class='add'>+		return bpf_base_func_proto(func_id, prog);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bpf_token_capable(prog-&gt;aux-&gt;token, CAP_PERFMON))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return func;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_skb_meta_pointer() - Gets a mutable pointer within the skb metadata area.</div><div class='add'>+ * @skb: socket buffer carrying the metadata</div><div class='add'>+ * @offset: offset into the metadata area, must be &lt;= skb_metadata_len()</div><div class='add'>+ */</div><div class='add'>+void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return skb_metadata_end(skb) - skb_metadata_len(skb) + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset,</div><div class='add'>+			       const void *from, u32 len, u64 flags)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (unlikely(bpf_try_make_writable(skb, 0)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	memmove(bpf_skb_meta_pointer(skb, offset), from, len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+__bpf_kfunc int bpf_dynptr_from_skb(struct __sk_buff *s, u64 flags,</div><div class='add'>+				    struct bpf_dynptr *ptr__uninit)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)ptr__uninit;</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)s;</div><div class='add'>+</div><div class='add'>+	if (flags) {</div><div class='add'>+		bpf_dynptr_set_null(ptr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_init(ptr, skb, BPF_DYNPTR_TYPE_SKB, 0, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_dynptr_from_skb_meta() - Initialize a dynptr to the skb metadata area.</div><div class='add'>+ * @skb_: socket buffer carrying the metadata</div><div class='add'>+ * @flags: future use, must be zero</div><div class='add'>+ * @ptr__uninit: dynptr to initialize</div><div class='add'>+ *</div><div class='add'>+ * Set up a dynptr for access to the metadata area earlier allocated from the</div><div class='add'>+ * XDP context with bpf_xdp_adjust_meta(). Serves as an alternative to</div><div class='add'>+ * &amp;__sk_buff-&gt;data_meta.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * %0         - dynptr ready to use</div><div class='add'>+ * * %-EINVAL   - invalid flags, dynptr set to null</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_dynptr_from_skb_meta(struct __sk_buff *skb_, u64 flags,</div><div class='add'>+					 struct bpf_dynptr *ptr__uninit)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)ptr__uninit;</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)skb_;</div><div class='add'>+</div><div class='add'>+	if (flags) {</div><div class='add'>+		bpf_dynptr_set_null(ptr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_init(ptr, skb, BPF_DYNPTR_TYPE_SKB_META, 0, skb_metadata_len(skb));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_md *x, u64 flags,</div><div class='add'>+				    struct bpf_dynptr *ptr__uninit)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)ptr__uninit;</div><div class='add'>+	struct xdp_buff *xdp = (struct xdp_buff *)x;</div><div class='add'>+</div><div class='add'>+	if (flags) {</div><div class='add'>+		bpf_dynptr_set_null(ptr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_init(ptr, xdp, BPF_DYNPTR_TYPE_XDP, 0, xdp_get_buff_len(xdp));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_sock_addr_set_sun_path(struct bpf_sock_addr_kern *sa_kern,</div><div class='add'>+					   const u8 *sun_path, u32 sun_path__sz)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_un *un;</div><div class='add'>+</div><div class='add'>+	if (sa_kern-&gt;sk-&gt;sk_family != AF_UNIX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We do not allow changing the address to unnamed or larger than the</div><div class='add'>+	 * maximum allowed address size for a unix sockaddr.</div><div class='add'>+	 */</div><div class='add'>+	if (sun_path__sz == 0 || sun_path__sz &gt; UNIX_PATH_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	un = (struct sockaddr_un *)sa_kern-&gt;uaddr;</div><div class='add'>+	memcpy(un-&gt;sun_path, sun_path, sun_path__sz);</div><div class='add'>+	sa_kern-&gt;uaddrlen = offsetof(struct sockaddr_un, sun_path) + sun_path__sz;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_sk_assign_tcp_reqsk(struct __sk_buff *s, struct sock *sk,</div><div class='add'>+					struct bpf_tcp_req_attrs *attrs, int attrs__sz)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_SYN_COOKIES)</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)s;</div><div class='add'>+	const struct request_sock_ops *ops;</div><div class='add'>+	struct inet_request_sock *ireq;</div><div class='add'>+	struct tcp_request_sock *treq;</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	struct net *net;</div><div class='add'>+	__u16 min_mss;</div><div class='add'>+	u32 tsoff = 0;</div><div class='add'>+</div><div class='add'>+	if (attrs__sz != sizeof(*attrs) ||</div><div class='add'>+	    attrs-&gt;reserved[0] || attrs-&gt;reserved[1] || attrs-&gt;reserved[2])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!skb_at_tc_ingress(skb))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	net = dev_net(skb-&gt;dev);</div><div class='add'>+	if (net != sock_net(sk))</div><div class='add'>+		return -ENETUNREACH;</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		ops = &amp;tcp_request_sock_ops;</div><div class='add'>+		min_mss = 536;</div><div class='add'>+		break;</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		ops = &amp;tcp6_request_sock_ops;</div><div class='add'>+		min_mss = IPV6_MIN_MTU - 60;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type != SOCK_STREAM || sk-&gt;sk_state != TCP_LISTEN ||</div><div class='add'>+	    sk_is_mptcp(sk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;mss &lt; min_mss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;wscale_ok) {</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_window_scaling))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (attrs-&gt;snd_wscale &gt; TCP_MAX_WSCALE ||</div><div class='add'>+		    attrs-&gt;rcv_wscale &gt; TCP_MAX_WSCALE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;sack_ok &amp;&amp; !READ_ONCE(net-&gt;ipv4.sysctl_tcp_sack))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (attrs-&gt;tstamp_ok) {</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_timestamps))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tsoff = attrs-&gt;rcv_tsecr - tcp_ns_to_ts(attrs-&gt;usec_ts_ok, tcp_clock_ns());</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = inet_reqsk_alloc(ops, sk, false);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ireq = inet_rsk(req);</div><div class='add'>+	treq = tcp_rsk(req);</div><div class='add'>+</div><div class='add'>+	req-&gt;rsk_listener = sk;</div><div class='add'>+	req-&gt;syncookie = 1;</div><div class='add'>+	req-&gt;mss = attrs-&gt;mss;</div><div class='add'>+	req-&gt;ts_recent = attrs-&gt;rcv_tsval;</div><div class='add'>+</div><div class='add'>+	ireq-&gt;snd_wscale = attrs-&gt;snd_wscale;</div><div class='add'>+	ireq-&gt;rcv_wscale = attrs-&gt;rcv_wscale;</div><div class='add'>+	ireq-&gt;tstamp_ok	= !!attrs-&gt;tstamp_ok;</div><div class='add'>+	ireq-&gt;sack_ok = !!attrs-&gt;sack_ok;</div><div class='add'>+	ireq-&gt;wscale_ok = !!attrs-&gt;wscale_ok;</div><div class='add'>+	ireq-&gt;ecn_ok = !!attrs-&gt;ecn_ok;</div><div class='add'>+</div><div class='add'>+	treq-&gt;req_usec_ts = !!attrs-&gt;usec_ts_ok;</div><div class='add'>+	treq-&gt;ts_off = tsoff;</div><div class='add'>+</div><div class='add'>+	skb_orphan(skb);</div><div class='add'>+	skb-&gt;sk = req_to_sk(req);</div><div class='add'>+	skb-&gt;destructor = sock_pfree;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int bpf_sock_ops_enable_tx_tstamp(struct bpf_sock_ops_kern *skops,</div><div class='add'>+					      u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (skops-&gt;op != BPF_SOCK_OPS_TSTAMP_SENDMSG_CB)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	skb = skops-&gt;skb;</div><div class='add'>+	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_BPF;</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;txstamp_ack |= TSTAMP_ACK_BPF;</div><div class='add'>+	skb_shinfo(skb)-&gt;tskey = TCP_SKB_CB(skb)-&gt;seq + skb-&gt;len - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_xdp_pull_data() - Pull in non-linear xdp data.</div><div class='add'>+ * @x: &amp;xdp_md associated with the XDP buffer</div><div class='add'>+ * @len: length of data to be made directly accessible in the linear part</div><div class='add'>+ *</div><div class='add'>+ * Pull in data in case the XDP buffer associated with @x is non-linear and</div><div class='add'>+ * not all @len are in the linear data area.</div><div class='add'>+ *</div><div class='add'>+ * Direct packet access allows reading and writing linear XDP data through</div><div class='add'>+ * packet pointers (i.e., &amp;xdp_md-&gt;data + offsets). The amount of data which</div><div class='add'>+ * ends up in the linear part of the xdp_buff depends on the NIC and its</div><div class='add'>+ * configuration. When a frag-capable XDP program wants to directly access</div><div class='add'>+ * headers that may be in the non-linear area, call this kfunc to make sure</div><div class='add'>+ * the data is available in the linear area. Alternatively, use dynptr or</div><div class='add'>+ * bpf_xdp_{load,store}_bytes() to access data without pulling.</div><div class='add'>+ *</div><div class='add'>+ * This kfunc can also be used with bpf_xdp_adjust_head() to decapsulate</div><div class='add'>+ * headers in the non-linear data area.</div><div class='add'>+ *</div><div class='add'>+ * A call to this kfunc may reduce headroom. If there is not enough tailroom</div><div class='add'>+ * in the linear data area, metadata and data will be shifted down.</div><div class='add'>+ *</div><div class='add'>+ * A call to this kfunc is susceptible to change the buffer geometry.</div><div class='add'>+ * Therefore, at load time, all checks on pointers previously done by the</div><div class='add'>+ * verifier are invalidated and must be performed again, if the kfunc is used</div><div class='add'>+ * in combination with direct packet access.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * %0         - success</div><div class='add'>+ * * %-EINVAL   - invalid len</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_xdp_pull_data(struct xdp_md *x, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct xdp_buff *xdp = (struct xdp_buff *)x;</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	int i, delta, shift, headroom, tailroom, n_frags_free = 0;</div><div class='add'>+	void *data_hard_end = xdp_data_hard_end(xdp);</div><div class='add'>+	int data_len = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	void *start;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= data_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len &gt; xdp_get_buff_len(xdp)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	start = xdp_data_meta_unsupported(xdp) ? xdp-&gt;data : xdp-&gt;data_meta;</div><div class='add'>+</div><div class='add'>+	headroom = start - xdp-&gt;data_hard_start - sizeof(struct xdp_frame);</div><div class='add'>+	tailroom = data_hard_end - xdp-&gt;data_end;</div><div class='add'>+</div><div class='add'>+	delta = len - data_len;</div><div class='add'>+	if (unlikely(delta &gt; tailroom + headroom))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shift = delta - tailroom;</div><div class='add'>+	if (shift &gt; 0) {</div><div class='add'>+		memmove(start - shift, start, xdp-&gt;data_end - start);</div><div class='add'>+</div><div class='add'>+		xdp-&gt;data_meta -= shift;</div><div class='add'>+		xdp-&gt;data -= shift;</div><div class='add'>+		xdp-&gt;data_end -= shift;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sinfo-&gt;nr_frags &amp;&amp; delta; i++) {</div><div class='add'>+		skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+		u32 shrink = min_t(u32, delta, skb_frag_size(frag));</div><div class='add'>+</div><div class='add'>+		memcpy(xdp-&gt;data_end, skb_frag_address(frag), shrink);</div><div class='add'>+</div><div class='add'>+		xdp-&gt;data_end += shrink;</div><div class='add'>+		sinfo-&gt;xdp_frags_size -= shrink;</div><div class='add'>+		delta -= shrink;</div><div class='add'>+		if (bpf_xdp_shrink_data(xdp, frag, shrink, false))</div><div class='add'>+			n_frags_free++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(n_frags_free)) {</div><div class='add'>+		memmove(sinfo-&gt;frags, sinfo-&gt;frags + n_frags_free,</div><div class='add'>+			(sinfo-&gt;nr_frags - n_frags_free) * sizeof(skb_frag_t));</div><div class='add'>+</div><div class='add'>+		sinfo-&gt;nr_frags -= n_frags_free;</div><div class='add'>+</div><div class='add'>+		if (!sinfo-&gt;nr_frags) {</div><div class='add'>+			xdp_buff_clear_frags_flag(xdp);</div><div class='add'>+			xdp_buff_clear_frag_pfmemalloc(xdp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+int bpf_dynptr_from_skb_rdonly(struct __sk_buff *skb, u64 flags,</div><div class='add'>+			       struct bpf_dynptr *ptr__uninit)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)ptr__uninit;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_skb(skb, flags, ptr__uninit);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_set_rdonly(ptr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_skb)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_dynptr_from_skb, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_skb)</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_skb_meta)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_dynptr_from_skb_meta, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_skb_meta)</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_xdp)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_dynptr_from_xdp)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_xdp_pull_data)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_xdp)</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_sock_addr)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_sock_addr_set_sun_path)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_sock_addr)</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_tcp_reqsk)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_sk_assign_tcp_reqsk, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_tcp_reqsk)</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_kfunc_check_set_sock_ops)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_sock_ops_enable_tx_tstamp, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_kfunc_check_set_sock_ops)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_skb = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_skb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_skb_meta = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_skb_meta,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_xdp = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_xdp,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_sock_addr = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_sock_addr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_tcp_reqsk = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_tcp_reqsk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_kfunc_set_sock_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_kfunc_check_set_sock_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_kfunc_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_ACT, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SK_SKB, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SOCKET_FILTER, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SKB, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_OUT, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_IN, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_XMIT, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_SEG6LOCAL, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_NETFILTER, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &amp;bpf_kfunc_set_skb);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &amp;bpf_kfunc_set_skb_meta);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_ACT, &amp;bpf_kfunc_set_skb_meta);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &amp;bpf_kfunc_set_xdp);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCK_ADDR,</div><div class='add'>+					       &amp;bpf_kfunc_set_sock_addr);</div><div class='add'>+	ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &amp;bpf_kfunc_set_tcp_reqsk);</div><div class='add'>+	return ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SOCK_OPS, &amp;bpf_kfunc_set_sock_ops);</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_kfunc_init);</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+/* bpf_sock_destroy: Destroy the given socket with ECONNABORTED error code.</div><div class='add'>+ *</div><div class='add'>+ * The function expects a non-NULL pointer to a socket, and invokes the</div><div class='add'>+ * protocol specific socket destroy handlers.</div><div class='add'>+ *</div><div class='add'>+ * The helper can only be called from BPF contexts that have acquired the socket</div><div class='add'>+ * locks.</div><div class='add'>+ *</div><div class='add'>+ * Parameters:</div><div class='add'>+ * @sock: Pointer to socket to be destroyed</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * On error, may return EPROTONOSUPPORT, EINVAL.</div><div class='add'>+ * EPROTONOSUPPORT if protocol specific destroy handler is not supported.</div><div class='add'>+ * 0 otherwise</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_sock_destroy(struct sock_common *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)sock;</div><div class='add'>+</div><div class='add'>+	/* The locking semantics that allow for synchronous execution of the</div><div class='add'>+	 * destroy handlers are only supported for TCP and UDP.</div><div class='add'>+	 * Supporting protocols will need to acquire sock lock in the BPF context</div><div class='add'>+	 * prior to invoking this kfunc.</div><div class='add'>+	 */</div><div class='add'>+	if (!sk-&gt;sk_prot-&gt;diag_destroy || (sk-&gt;sk_protocol != IPPROTO_TCP &amp;&amp;</div><div class='add'>+					   sk-&gt;sk_protocol != IPPROTO_UDP))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return sk-&gt;sk_prot-&gt;diag_destroy(sk, ECONNABORTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_sk_iter_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_sock_destroy, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_sk_iter_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static int tracing_iter_filter(const struct bpf_prog *prog, u32 kfunc_id)</div><div class='add'>+{</div><div class='add'>+	if (btf_id_set8_contains(&amp;bpf_sk_iter_kfunc_ids, kfunc_id) &amp;&amp;</div><div class='add'>+	    prog-&gt;expected_attach_type != BPF_TRACE_ITER)</div><div class='add'>+		return -EACCES;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_sk_iter_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;bpf_sk_iter_kfunc_ids,</div><div class='add'>+	.filter = tracing_iter_filter,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int init_subsystem(void)</div><div class='add'>+{</div><div class='add'>+	return register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &amp;bpf_sk_iter_kfunc_set);</div><div class='add'>+}</div><div class='add'>+late_initcall(init_subsystem);</div><div class='head'>diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c<br/>index ce9eeeb7c024..1b61bb25ba0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/flow_dissector.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/flow_dissector.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/flow_dissector.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/flow_dissector.c</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='hunk'>@@ -20,16 +22,25 @@</div><div class='ctx'> #include &lt;linux/ppp_defs.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='ctx'> #include &lt;linux/mpls.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='ctx'> #include &lt;net/flow_dissector.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;scsi/fc/fc_fcoe.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/batadv_packet.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_core.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_labels.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;linux/bpf-netns.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void dissector_set_key(struct flow_dissector *flow_dissector,</div><div class='ctx'> 			      enum flow_dissector_key_id key_id)</div><div class='ctx'> {</div><div class='del'>-	flow_dissector-&gt;used_keys |= (1 &lt;&lt; key_id);</div><div class='add'>+	flow_dissector-&gt;used_keys |= (1ULL &lt;&lt; key_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void skb_flow_dissector_init(struct flow_dissector *flow_dissector,</div><div class='hunk'>@@ -41,7 +52,7 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector,</div><div class='ctx'> 	memset(flow_dissector, 0, sizeof(*flow_dissector));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; key_count; i++, key++) {</div><div class='del'>-		/* User should make sure that every key target offset is withing</div><div class='add'>+		/* User should make sure that every key target offset is within</div><div class='ctx'> 		 * boundaries of unsigned short.</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUG_ON(key-&gt;offset &gt; USHRT_MAX);</div><div class='hunk'>@@ -62,30 +73,40 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_flow_dissector_init);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * skb_flow_get_be16 - extract be16 entity</div><div class='del'>- * @skb: sk_buff to extract from</div><div class='del'>- * @poff: offset to extract at</div><div class='del'>- * @data: raw buffer pointer to the packet</div><div class='del'>- * @hlen: packet header length</div><div class='del'>- *</div><div class='del'>- * The function will try to retrieve a be32 entity at</div><div class='del'>- * offset poff</div><div class='del'>- */</div><div class='del'>-static __be16 skb_flow_get_be16(const struct sk_buff *skb, int poff,</div><div class='del'>-				void *data, int hlen)</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+int flow_dissector_bpf_prog_attach_check(struct net *net,</div><div class='add'>+					 struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='del'>-	__be16 *u, _u;</div><div class='add'>+	enum netns_bpf_attach_type type = NETNS_BPF_FLOW_DISSECTOR;</div><div class='ctx'> </div><div class='del'>-	u = __skb_header_pointer(skb, poff, sizeof(_u), data, hlen, &amp;_u);</div><div class='del'>-	if (u)</div><div class='del'>-		return *u;</div><div class='add'>+	if (net == &amp;init_net) {</div><div class='add'>+		/* BPF flow dissector in the root namespace overrides</div><div class='add'>+		 * any per-net-namespace one. When attaching to root,</div><div class='add'>+		 * make sure we don't have any BPF program attached</div><div class='add'>+		 * to the non-root namespaces.</div><div class='add'>+		 */</div><div class='add'>+		struct net *ns;</div><div class='add'>+</div><div class='add'>+		for_each_net(ns) {</div><div class='add'>+			if (ns == &amp;init_net)</div><div class='add'>+				continue;</div><div class='add'>+			if (rcu_access_pointer(ns-&gt;bpf.run_array[type]))</div><div class='add'>+				return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Make sure root flow dissector is not attached</div><div class='add'>+		 * when attaching to the non-root namespace.</div><div class='add'>+		 */</div><div class='add'>+		if (rcu_access_pointer(init_net.bpf.run_array[type]))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_BPF_SYSCALL */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __skb_flow_get_ports - extract the upper layer ports and return them</div><div class='add'>+ * skb_flow_get_ports - extract the upper layer ports and return them</div><div class='ctx'>  * @skb: sk_buff to extract the ports from</div><div class='ctx'>  * @thoff: transport header offset</div><div class='ctx'>  * @ip_proto: protocol for which to get port offset</div><div class='hunk'>@@ -95,8 +116,8 @@ static __be16 skb_flow_get_be16(const struct sk_buff *skb, int poff,</div><div class='ctx'>  * The function will try to retrieve the ports at offset thoff + poff where poff</div><div class='ctx'>  * is the protocol port offset returned from proto_ports_offset</div><div class='ctx'>  */</div><div class='del'>-__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,</div><div class='del'>-			    void *data, int hlen)</div><div class='add'>+__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,</div><div class='add'>+			  const void *data, int hlen)</div><div class='ctx'> {</div><div class='ctx'> 	int poff = proto_ports_offset(ip_proto);</div><div class='ctx'> </div><div class='hunk'>@@ -116,12 +137,172 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_flow_get_ports);</div><div class='add'>+EXPORT_SYMBOL(skb_flow_get_ports);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-skb_flow_dissect_set_enc_addr_type(enum flow_dissector_key_id type,</div><div class='add'>+static bool icmp_has_id(u8 type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ICMP_ECHO:</div><div class='add'>+	case ICMP_ECHOREPLY:</div><div class='add'>+	case ICMP_TIMESTAMP:</div><div class='add'>+	case ICMP_TIMESTAMPREPLY:</div><div class='add'>+	case ICMPV6_ECHO_REQUEST:</div><div class='add'>+	case ICMPV6_ECHO_REPLY:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_flow_get_icmp_tci - extract ICMP(6) Type, Code and Identifier fields</div><div class='add'>+ * @skb: sk_buff to extract from</div><div class='add'>+ * @key_icmp: struct flow_dissector_key_icmp to fill</div><div class='add'>+ * @data: raw buffer pointer to the packet</div><div class='add'>+ * @thoff: offset to extract at</div><div class='add'>+ * @hlen: packet header length</div><div class='add'>+ */</div><div class='add'>+void skb_flow_get_icmp_tci(const struct sk_buff *skb,</div><div class='add'>+			   struct flow_dissector_key_icmp *key_icmp,</div><div class='add'>+			   const void *data, int thoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct icmphdr *ih, _ih;</div><div class='add'>+</div><div class='add'>+	ih = __skb_header_pointer(skb, thoff, sizeof(_ih), data, hlen, &amp;_ih);</div><div class='add'>+	if (!ih)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_icmp-&gt;type = ih-&gt;type;</div><div class='add'>+	key_icmp-&gt;code = ih-&gt;code;</div><div class='add'>+</div><div class='add'>+	/* As we use 0 to signal that the Id field is not present,</div><div class='add'>+	 * avoid confusion with packets without such field</div><div class='add'>+	 */</div><div class='add'>+	if (icmp_has_id(ih-&gt;type))</div><div class='add'>+		key_icmp-&gt;id = ih-&gt;un.echo.id ? ntohs(ih-&gt;un.echo.id) : 1;</div><div class='add'>+	else</div><div class='add'>+		key_icmp-&gt;id = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_flow_get_icmp_tci);</div><div class='add'>+</div><div class='add'>+/* If FLOW_DISSECTOR_KEY_ICMP is set, dissect an ICMP packet</div><div class='add'>+ * using skb_flow_get_icmp_tci().</div><div class='add'>+ */</div><div class='add'>+static void __skb_flow_dissect_icmp(const struct sk_buff *skb,</div><div class='add'>+				    struct flow_dissector *flow_dissector,</div><div class='add'>+				    void *target_container, const void *data,</div><div class='add'>+				    int thoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_icmp *key_icmp;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ICMP))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_icmp = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					     FLOW_DISSECTOR_KEY_ICMP,</div><div class='add'>+					     target_container);</div><div class='add'>+</div><div class='add'>+	skb_flow_get_icmp_tci(skb, key_icmp, data, thoff, hlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __skb_flow_dissect_ah(const struct sk_buff *skb,</div><div class='add'>+				  struct flow_dissector *flow_dissector,</div><div class='add'>+				  void *target_container, const void *data,</div><div class='add'>+				  int nhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_ipsec *key_ah;</div><div class='add'>+	struct ip_auth_hdr _hdr, *hdr;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_IPSEC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen, &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_ah = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					   FLOW_DISSECTOR_KEY_IPSEC,</div><div class='add'>+					   target_container);</div><div class='add'>+</div><div class='add'>+	key_ah-&gt;spi = hdr-&gt;spi;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __skb_flow_dissect_esp(const struct sk_buff *skb,</div><div class='ctx'> 				   struct flow_dissector *flow_dissector,</div><div class='del'>-				   void *target_container)</div><div class='add'>+				   void *target_container, const void *data,</div><div class='add'>+				   int nhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_ipsec *key_esp;</div><div class='add'>+	struct ip_esp_hdr _hdr, *hdr;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_IPSEC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen, &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_esp = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					    FLOW_DISSECTOR_KEY_IPSEC,</div><div class='add'>+					    target_container);</div><div class='add'>+</div><div class='add'>+	key_esp-&gt;spi = hdr-&gt;spi;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __skb_flow_dissect_l2tpv3(const struct sk_buff *skb,</div><div class='add'>+				      struct flow_dissector *flow_dissector,</div><div class='add'>+				      void *target_container, const void *data,</div><div class='add'>+				      int nhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_l2tpv3 *key_l2tpv3;</div><div class='add'>+	struct {</div><div class='add'>+		__be32 session_id;</div><div class='add'>+	} *hdr, _hdr;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_L2TPV3))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen, &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_l2tpv3 = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					       FLOW_DISSECTOR_KEY_L2TPV3,</div><div class='add'>+					       target_container);</div><div class='add'>+</div><div class='add'>+	key_l2tpv3-&gt;session_id = hdr-&gt;session_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void skb_flow_dissect_meta(const struct sk_buff *skb,</div><div class='add'>+			   struct flow_dissector *flow_dissector,</div><div class='add'>+			   void *target_container)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_meta *meta;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_META))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	meta = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					 FLOW_DISSECTOR_KEY_META,</div><div class='add'>+					 target_container);</div><div class='add'>+	meta-&gt;ingress_ifindex = skb-&gt;skb_iif;</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)</div><div class='add'>+	if (tc_skb_ext_tc_enabled()) {</div><div class='add'>+		struct tc_skb_ext *ext;</div><div class='add'>+</div><div class='add'>+		ext = skb_ext_find(skb, TC_SKB_EXT);</div><div class='add'>+		if (ext)</div><div class='add'>+			meta-&gt;l2_miss = ext-&gt;l2_miss;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_flow_dissect_meta);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+skb_flow_dissect_set_enc_control(enum flow_dissector_key_id type,</div><div class='add'>+				 u32 ctrl_flags,</div><div class='add'>+				 struct flow_dissector *flow_dissector,</div><div class='add'>+				 void *target_container)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_control *ctrl;</div><div class='ctx'> </div><div class='hunk'>@@ -132,15 +313,63 @@ skb_flow_dissect_set_enc_addr_type(enum flow_dissector_key_id type,</div><div class='ctx'> 					 FLOW_DISSECTOR_KEY_ENC_CONTROL,</div><div class='ctx'> 					 target_container);</div><div class='ctx'> 	ctrl-&gt;addr_type = type;</div><div class='add'>+	ctrl-&gt;flags = ctrl_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='add'>+skb_flow_dissect_ct(const struct sk_buff *skb,</div><div class='add'>+		    struct flow_dissector *flow_dissector,</div><div class='add'>+		    void *target_container, u16 *ctinfo_map,</div><div class='add'>+		    size_t mapsize, bool post_ct, u16 zone)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+	struct flow_dissector_key_ct *key;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	struct nf_conn_labels *cl;</div><div class='add'>+	struct nf_conn *ct;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_CT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='add'>+	if (!ct &amp;&amp; !post_ct)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					FLOW_DISSECTOR_KEY_CT,</div><div class='add'>+					target_container);</div><div class='add'>+</div><div class='add'>+	if (!ct) {</div><div class='add'>+		key-&gt;ct_state = TCA_FLOWER_KEY_CT_FLAGS_TRACKED |</div><div class='add'>+				TCA_FLOWER_KEY_CT_FLAGS_INVALID;</div><div class='add'>+		key-&gt;ct_zone = zone;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctinfo &lt; mapsize)</div><div class='add'>+		key-&gt;ct_state = ctinfo_map[ctinfo];</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK_ZONES)</div><div class='add'>+	key-&gt;ct_zone = ct-&gt;zone.id;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK_MARK)</div><div class='add'>+	key-&gt;ct_mark = READ_ONCE(ct-&gt;mark);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cl = nf_ct_labels_find(ct);</div><div class='add'>+	if (cl)</div><div class='add'>+		memcpy(key-&gt;ct_labels, cl-&gt;bits, sizeof(key-&gt;ct_labels));</div><div class='add'>+#endif /* CONFIG_NF_CONNTRACK */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_flow_dissect_ct);</div><div class='add'>+</div><div class='add'>+void</div><div class='ctx'> skb_flow_dissect_tunnel_info(const struct sk_buff *skb,</div><div class='ctx'> 			     struct flow_dissector *flow_dissector,</div><div class='ctx'> 			     void *target_container)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel_info *info;</div><div class='ctx'> 	struct ip_tunnel_key *key;</div><div class='add'>+	u32 ctrl_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* A quick check to see if there might be something to do. */</div><div class='ctx'> 	if (!dissector_uses_key(flow_dissector,</div><div class='hunk'>@@ -165,11 +394,20 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	key = &amp;info-&gt;key;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, key-&gt;tun_flags))</div><div class='add'>+		ctrl_flags |= FLOW_DIS_F_TUNNEL_CSUM;</div><div class='add'>+	if (test_bit(IP_TUNNEL_DONT_FRAGMENT_BIT, key-&gt;tun_flags))</div><div class='add'>+		ctrl_flags |= FLOW_DIS_F_TUNNEL_DONT_FRAGMENT;</div><div class='add'>+	if (test_bit(IP_TUNNEL_OAM_BIT, key-&gt;tun_flags))</div><div class='add'>+		ctrl_flags |= FLOW_DIS_F_TUNNEL_OAM;</div><div class='add'>+	if (test_bit(IP_TUNNEL_CRIT_OPT_BIT, key-&gt;tun_flags))</div><div class='add'>+		ctrl_flags |= FLOW_DIS_F_TUNNEL_CRIT_OPT;</div><div class='add'>+</div><div class='ctx'> 	switch (ip_tunnel_info_af(info)) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		skb_flow_dissect_set_enc_addr_type(FLOW_DISSECTOR_KEY_IPV4_ADDRS,</div><div class='del'>-						   flow_dissector,</div><div class='del'>-						   target_container);</div><div class='add'>+		skb_flow_dissect_set_enc_control(FLOW_DISSECTOR_KEY_IPV4_ADDRS,</div><div class='add'>+						 ctrl_flags, flow_dissector,</div><div class='add'>+						 target_container);</div><div class='ctx'> 		if (dissector_uses_key(flow_dissector,</div><div class='ctx'> 				       FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS)) {</div><div class='ctx'> 			struct flow_dissector_key_ipv4_addrs *ipv4;</div><div class='hunk'>@@ -182,9 +420,9 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		skb_flow_dissect_set_enc_addr_type(FLOW_DISSECTOR_KEY_IPV6_ADDRS,</div><div class='del'>-						   flow_dissector,</div><div class='del'>-						   target_container);</div><div class='add'>+		skb_flow_dissect_set_enc_control(FLOW_DISSECTOR_KEY_IPV6_ADDRS,</div><div class='add'>+						 ctrl_flags, flow_dissector,</div><div class='add'>+						 target_container);</div><div class='ctx'> 		if (dissector_uses_key(flow_dissector,</div><div class='ctx'> 				       FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS)) {</div><div class='ctx'> 			struct flow_dissector_key_ipv6_addrs *ipv6;</div><div class='hunk'>@@ -196,6 +434,10 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,</div><div class='ctx'> 			ipv6-&gt;dst = key-&gt;u.ipv6.dst;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		skb_flow_dissect_set_enc_control(0, ctrl_flags, flow_dissector,</div><div class='add'>+						 target_container);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ENC_KEYID)) {</div><div class='hunk'>@@ -229,71 +471,109 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ENC_OPTS)) {</div><div class='ctx'> 		struct flow_dissector_key_enc_opts *enc_opt;</div><div class='add'>+		IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='add'>+		u32 val;</div><div class='ctx'> </div><div class='ctx'> 		enc_opt = skb_flow_dissector_target(flow_dissector,</div><div class='ctx'> 						    FLOW_DISSECTOR_KEY_ENC_OPTS,</div><div class='ctx'> 						    target_container);</div><div class='ctx'> </div><div class='del'>-		if (info-&gt;options_len) {</div><div class='del'>-			enc_opt-&gt;len = info-&gt;options_len;</div><div class='del'>-			ip_tunnel_info_opts_get(enc_opt-&gt;data, info);</div><div class='del'>-			enc_opt-&gt;dst_opt_type = info-&gt;key.tun_flags &amp;</div><div class='del'>-						TUNNEL_OPTIONS_PRESENT;</div><div class='del'>-		}</div><div class='add'>+		if (!info-&gt;options_len)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		enc_opt-&gt;len = info-&gt;options_len;</div><div class='add'>+		ip_tunnel_info_opts_get(enc_opt-&gt;data, info);</div><div class='add'>+</div><div class='add'>+		ip_tunnel_set_options_present(flags);</div><div class='add'>+		ip_tunnel_flags_and(flags, info-&gt;key.tun_flags, flags);</div><div class='add'>+</div><div class='add'>+		val = find_next_bit(flags, __IP_TUNNEL_FLAG_NUM,</div><div class='add'>+				    IP_TUNNEL_GENEVE_OPT_BIT);</div><div class='add'>+		enc_opt-&gt;dst_opt_type = val &lt; __IP_TUNNEL_FLAG_NUM ? val : 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_flow_dissect_tunnel_info);</div><div class='ctx'> </div><div class='add'>+void skb_flow_dissect_hash(const struct sk_buff *skb,</div><div class='add'>+			   struct flow_dissector *flow_dissector,</div><div class='add'>+			   void *target_container)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_hash *key;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_HASH))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					FLOW_DISSECTOR_KEY_HASH,</div><div class='add'>+					target_container);</div><div class='add'>+</div><div class='add'>+	key-&gt;hash = skb_get_hash_raw(skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_flow_dissect_hash);</div><div class='add'>+</div><div class='ctx'> static enum flow_dissect_ret</div><div class='ctx'> __skb_flow_dissect_mpls(const struct sk_buff *skb,</div><div class='ctx'> 			struct flow_dissector *flow_dissector,</div><div class='del'>-			void *target_container, void *data, int nhoff, int hlen)</div><div class='add'>+			void *target_container, const void *data, int nhoff,</div><div class='add'>+			int hlen, int lse_index, bool *entropy_label)</div><div class='ctx'> {</div><div class='del'>-	struct flow_dissector_key_keyid *key_keyid;</div><div class='del'>-	struct mpls_label *hdr, _hdr[2];</div><div class='del'>-	u32 entry, label;</div><div class='add'>+	struct mpls_label *hdr, _hdr;</div><div class='add'>+	u32 entry, label, bos;</div><div class='ctx'> </div><div class='ctx'> 	if (!dissector_uses_key(flow_dissector,</div><div class='ctx'> 				FLOW_DISSECTOR_KEY_MPLS_ENTROPY) &amp;&amp;</div><div class='ctx'> 	    !dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_MPLS))</div><div class='ctx'> 		return FLOW_DISSECT_RET_OUT_GOOD;</div><div class='ctx'> </div><div class='add'>+	if (lse_index &gt;= FLOW_DIS_MPLS_MAX)</div><div class='add'>+		return FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+</div><div class='ctx'> 	hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data,</div><div class='ctx'> 				   hlen, &amp;_hdr);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return FLOW_DISSECT_RET_OUT_BAD;</div><div class='ctx'> </div><div class='del'>-	entry = ntohl(hdr[0].entry);</div><div class='add'>+	entry = ntohl(hdr-&gt;entry);</div><div class='ctx'> 	label = (entry &amp; MPLS_LS_LABEL_MASK) &gt;&gt; MPLS_LS_LABEL_SHIFT;</div><div class='add'>+	bos = (entry &amp; MPLS_LS_S_MASK) &gt;&gt; MPLS_LS_S_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_MPLS)) {</div><div class='ctx'> 		struct flow_dissector_key_mpls *key_mpls;</div><div class='add'>+		struct flow_dissector_mpls_lse *lse;</div><div class='ctx'> </div><div class='ctx'> 		key_mpls = skb_flow_dissector_target(flow_dissector,</div><div class='ctx'> 						     FLOW_DISSECTOR_KEY_MPLS,</div><div class='ctx'> 						     target_container);</div><div class='del'>-		key_mpls-&gt;mpls_label = label;</div><div class='del'>-		key_mpls-&gt;mpls_ttl = (entry &amp; MPLS_LS_TTL_MASK)</div><div class='del'>-					&gt;&gt; MPLS_LS_TTL_SHIFT;</div><div class='del'>-		key_mpls-&gt;mpls_tc = (entry &amp; MPLS_LS_TC_MASK)</div><div class='del'>-					&gt;&gt; MPLS_LS_TC_SHIFT;</div><div class='del'>-		key_mpls-&gt;mpls_bos = (entry &amp; MPLS_LS_S_MASK)</div><div class='del'>-					&gt;&gt; MPLS_LS_S_SHIFT;</div><div class='add'>+		lse = &amp;key_mpls-&gt;ls[lse_index];</div><div class='add'>+</div><div class='add'>+		lse-&gt;mpls_ttl = (entry &amp; MPLS_LS_TTL_MASK) &gt;&gt; MPLS_LS_TTL_SHIFT;</div><div class='add'>+		lse-&gt;mpls_bos = bos;</div><div class='add'>+		lse-&gt;mpls_tc = (entry &amp; MPLS_LS_TC_MASK) &gt;&gt; MPLS_LS_TC_SHIFT;</div><div class='add'>+		lse-&gt;mpls_label = label;</div><div class='add'>+		dissector_set_mpls_lse(key_mpls, lse_index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (label == MPLS_LABEL_ENTROPY) {</div><div class='add'>+	if (*entropy_label &amp;&amp;</div><div class='add'>+	    dissector_uses_key(flow_dissector,</div><div class='add'>+			       FLOW_DISSECTOR_KEY_MPLS_ENTROPY)) {</div><div class='add'>+		struct flow_dissector_key_keyid *key_keyid;</div><div class='add'>+</div><div class='ctx'> 		key_keyid = skb_flow_dissector_target(flow_dissector,</div><div class='ctx'> 						      FLOW_DISSECTOR_KEY_MPLS_ENTROPY,</div><div class='ctx'> 						      target_container);</div><div class='del'>-		key_keyid-&gt;keyid = hdr[1].entry &amp; htonl(MPLS_LS_LABEL_MASK);</div><div class='add'>+		key_keyid-&gt;keyid = cpu_to_be32(label);</div><div class='ctx'> 	}</div><div class='del'>-	return FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+</div><div class='add'>+	*entropy_label = label == MPLS_LABEL_ENTROPY;</div><div class='add'>+</div><div class='add'>+	return bos ? FLOW_DISSECT_RET_OUT_GOOD : FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum flow_dissect_ret</div><div class='ctx'> __skb_flow_dissect_arp(const struct sk_buff *skb,</div><div class='ctx'> 		       struct flow_dissector *flow_dissector,</div><div class='del'>-		       void *target_container, void *data, int nhoff, int hlen)</div><div class='add'>+		       void *target_container, const void *data,</div><div class='add'>+		       int nhoff, int hlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_arp *key_arp;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -346,10 +626,34 @@ __skb_flow_dissect_arp(const struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum flow_dissect_ret</div><div class='add'>+__skb_flow_dissect_cfm(const struct sk_buff *skb,</div><div class='add'>+		       struct flow_dissector *flow_dissector,</div><div class='add'>+		       void *target_container, const void *data,</div><div class='add'>+		       int nhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_cfm *key, *hdr, _hdr;</div><div class='add'>+</div><div class='add'>+	if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_CFM))</div><div class='add'>+		return FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+</div><div class='add'>+	hdr = __skb_header_pointer(skb, nhoff, sizeof(*key), data, hlen, &amp;_hdr);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return FLOW_DISSECT_RET_OUT_BAD;</div><div class='add'>+</div><div class='add'>+	key = skb_flow_dissector_target(flow_dissector, FLOW_DISSECTOR_KEY_CFM,</div><div class='add'>+					target_container);</div><div class='add'>+</div><div class='add'>+	key-&gt;mdl_ver = hdr-&gt;mdl_ver;</div><div class='add'>+	key-&gt;opcode = hdr-&gt;opcode;</div><div class='add'>+</div><div class='add'>+	return FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum flow_dissect_ret</div><div class='ctx'> __skb_flow_dissect_gre(const struct sk_buff *skb,</div><div class='ctx'> 		       struct flow_dissector_key_control *key_control,</div><div class='ctx'> 		       struct flow_dissector *flow_dissector,</div><div class='del'>-		       void *target_container, void *data,</div><div class='add'>+		       void *target_container, const void *data,</div><div class='ctx'> 		       __be16 *p_proto, int *p_nhoff, int *p_hlen,</div><div class='ctx'> 		       unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -382,8 +686,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,</div><div class='ctx'> 	offset += sizeof(struct gre_base_hdr);</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;flags &amp; GRE_CSUM)</div><div class='del'>-		offset += sizeof(((struct gre_full_hdr *) 0)-&gt;csum) +</div><div class='del'>-			  sizeof(((struct gre_full_hdr *) 0)-&gt;reserved1);</div><div class='add'>+		offset += sizeof_field(struct gre_full_hdr, csum) +</div><div class='add'>+			  sizeof_field(struct gre_full_hdr, reserved1);</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;flags &amp; GRE_KEY) {</div><div class='ctx'> 		const __be32 *keyid;</div><div class='hunk'>@@ -405,11 +709,11 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,</div><div class='ctx'> 			else</div><div class='ctx'> 				key_keyid-&gt;keyid = *keyid &amp; GRE_PPTP_KEY_MASK;</div><div class='ctx'> 		}</div><div class='del'>-		offset += sizeof(((struct gre_full_hdr *) 0)-&gt;key);</div><div class='add'>+		offset += sizeof_field(struct gre_full_hdr, key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;flags &amp; GRE_SEQ)</div><div class='del'>-		offset += sizeof(((struct pptp_gre_header *) 0)-&gt;seq);</div><div class='add'>+		offset += sizeof_field(struct pptp_gre_header, seq);</div><div class='ctx'> </div><div class='ctx'> 	if (gre_ver == 0) {</div><div class='ctx'> 		if (*p_proto == htons(ETH_P_TEB)) {</div><div class='hunk'>@@ -436,7 +740,7 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,</div><div class='ctx'> 		u8 *ppp_hdr;</div><div class='ctx'> </div><div class='ctx'> 		if (hdr-&gt;flags &amp; GRE_ACK)</div><div class='del'>-			offset += sizeof(((struct pptp_gre_header *) 0)-&gt;ack);</div><div class='add'>+			offset += sizeof_field(struct pptp_gre_header, ack);</div><div class='ctx'> </div><div class='ctx'> 		ppp_hdr = __skb_header_pointer(skb, *p_nhoff + offset,</div><div class='ctx'> 					       sizeof(_ppp_hdr),</div><div class='hunk'>@@ -489,8 +793,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,</div><div class='ctx'> static enum flow_dissect_ret</div><div class='ctx'> __skb_flow_dissect_batadv(const struct sk_buff *skb,</div><div class='ctx'> 			  struct flow_dissector_key_control *key_control,</div><div class='del'>-			  void *data, __be16 *p_proto, int *p_nhoff, int hlen,</div><div class='del'>-			  unsigned int flags)</div><div class='add'>+			  const void *data, __be16 *p_proto, int *p_nhoff,</div><div class='add'>+			  int hlen, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct batadv_unicast_packet batadv_unicast;</div><div class='hunk'>@@ -521,7 +825,8 @@ __skb_flow_dissect_batadv(const struct sk_buff *skb,</div><div class='ctx'> static void</div><div class='ctx'> __skb_flow_dissect_tcp(const struct sk_buff *skb,</div><div class='ctx'> 		       struct flow_dissector *flow_dissector,</div><div class='del'>-		       void *target_container, void *data, int thoff, int hlen)</div><div class='add'>+		       void *target_container, const void *data,</div><div class='add'>+		       int thoff, int hlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_tcp *key_tcp;</div><div class='ctx'> 	struct tcphdr *th, _th;</div><div class='hunk'>@@ -543,9 +848,42 @@ __skb_flow_dissect_tcp(const struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+__skb_flow_dissect_ports(const struct sk_buff *skb,</div><div class='add'>+			 struct flow_dissector *flow_dissector,</div><div class='add'>+			 void *target_container, const void *data,</div><div class='add'>+			 int nhoff, u8 ip_proto, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_ports_range *key_ports_range = NULL;</div><div class='add'>+	struct flow_dissector_key_ports *key_ports = NULL;</div><div class='add'>+	__be32 ports;</div><div class='add'>+</div><div class='add'>+	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS))</div><div class='add'>+		key_ports = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						      FLOW_DISSECTOR_KEY_PORTS,</div><div class='add'>+						      target_container);</div><div class='add'>+</div><div class='add'>+	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS_RANGE))</div><div class='add'>+		key_ports_range = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+							    FLOW_DISSECTOR_KEY_PORTS_RANGE,</div><div class='add'>+							    target_container);</div><div class='add'>+</div><div class='add'>+	if (!key_ports &amp;&amp; !key_ports_range)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ports = skb_flow_get_ports(skb, nhoff, ip_proto, data, hlen);</div><div class='add'>+</div><div class='add'>+	if (key_ports)</div><div class='add'>+		key_ports-&gt;ports = ports;</div><div class='add'>+</div><div class='add'>+	if (key_ports_range)</div><div class='add'>+		key_ports_range-&gt;tp.ports = ports;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> __skb_flow_dissect_ipv4(const struct sk_buff *skb,</div><div class='ctx'> 			struct flow_dissector *flow_dissector,</div><div class='del'>-			void *target_container, void *data, const struct iphdr *iph)</div><div class='add'>+			void *target_container, const void *data,</div><div class='add'>+			const struct iphdr *iph)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_ip *key_ip;</div><div class='ctx'> </div><div class='hunk'>@@ -562,7 +900,8 @@ __skb_flow_dissect_ipv4(const struct sk_buff *skb,</div><div class='ctx'> static void</div><div class='ctx'> __skb_flow_dissect_ipv6(const struct sk_buff *skb,</div><div class='ctx'> 			struct flow_dissector *flow_dissector,</div><div class='del'>-			void *target_container, void *data, const struct ipv6hdr *iph)</div><div class='add'>+			void *target_container, const void *data,</div><div class='add'>+			const struct ipv6hdr *iph)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_ip *key_ip;</div><div class='ctx'> </div><div class='hunk'>@@ -588,8 +927,117 @@ static bool skb_flow_dissect_allowed(int *num_hdrs)</div><div class='ctx'> 	return (*num_hdrs &lt;= MAX_FLOW_DISSECT_HDRS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys,</div><div class='add'>+				     struct flow_dissector *flow_dissector,</div><div class='add'>+				     void *target_container)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector_key_ports_range *key_ports_range = NULL;</div><div class='add'>+	struct flow_dissector_key_ports *key_ports = NULL;</div><div class='add'>+	struct flow_dissector_key_control *key_control;</div><div class='add'>+	struct flow_dissector_key_basic *key_basic;</div><div class='add'>+	struct flow_dissector_key_addrs *key_addrs;</div><div class='add'>+	struct flow_dissector_key_tags *key_tags;</div><div class='add'>+</div><div class='add'>+	key_control = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						FLOW_DISSECTOR_KEY_CONTROL,</div><div class='add'>+						target_container);</div><div class='add'>+	key_control-&gt;thoff = flow_keys-&gt;thoff;</div><div class='add'>+	if (flow_keys-&gt;is_frag)</div><div class='add'>+		key_control-&gt;flags |= FLOW_DIS_IS_FRAGMENT;</div><div class='add'>+	if (flow_keys-&gt;is_first_frag)</div><div class='add'>+		key_control-&gt;flags |= FLOW_DIS_FIRST_FRAG;</div><div class='add'>+	if (flow_keys-&gt;is_encap)</div><div class='add'>+		key_control-&gt;flags |= FLOW_DIS_ENCAPSULATION;</div><div class='add'>+</div><div class='add'>+	key_basic = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+					      FLOW_DISSECTOR_KEY_BASIC,</div><div class='add'>+					      target_container);</div><div class='add'>+	key_basic-&gt;n_proto = flow_keys-&gt;n_proto;</div><div class='add'>+	key_basic-&gt;ip_proto = flow_keys-&gt;ip_proto;</div><div class='add'>+</div><div class='add'>+	if (flow_keys-&gt;addr_proto == ETH_P_IP &amp;&amp;</div><div class='add'>+	    dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) {</div><div class='add'>+		key_addrs = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						      FLOW_DISSECTOR_KEY_IPV4_ADDRS,</div><div class='add'>+						      target_container);</div><div class='add'>+		key_addrs-&gt;v4addrs.src = flow_keys-&gt;ipv4_src;</div><div class='add'>+		key_addrs-&gt;v4addrs.dst = flow_keys-&gt;ipv4_dst;</div><div class='add'>+		key_control-&gt;addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+	} else if (flow_keys-&gt;addr_proto == ETH_P_IPV6 &amp;&amp;</div><div class='add'>+		   dissector_uses_key(flow_dissector,</div><div class='add'>+				      FLOW_DISSECTOR_KEY_IPV6_ADDRS)) {</div><div class='add'>+		key_addrs = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						      FLOW_DISSECTOR_KEY_IPV6_ADDRS,</div><div class='add'>+						      target_container);</div><div class='add'>+		memcpy(&amp;key_addrs-&gt;v6addrs.src, &amp;flow_keys-&gt;ipv6_src,</div><div class='add'>+		       sizeof(key_addrs-&gt;v6addrs.src));</div><div class='add'>+		memcpy(&amp;key_addrs-&gt;v6addrs.dst, &amp;flow_keys-&gt;ipv6_dst,</div><div class='add'>+		       sizeof(key_addrs-&gt;v6addrs.dst));</div><div class='add'>+		key_control-&gt;addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS)) {</div><div class='add'>+		key_ports = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						      FLOW_DISSECTOR_KEY_PORTS,</div><div class='add'>+						      target_container);</div><div class='add'>+		key_ports-&gt;src = flow_keys-&gt;sport;</div><div class='add'>+		key_ports-&gt;dst = flow_keys-&gt;dport;</div><div class='add'>+	}</div><div class='add'>+	if (dissector_uses_key(flow_dissector,</div><div class='add'>+			       FLOW_DISSECTOR_KEY_PORTS_RANGE)) {</div><div class='add'>+		key_ports_range = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+							    FLOW_DISSECTOR_KEY_PORTS_RANGE,</div><div class='add'>+							    target_container);</div><div class='add'>+		key_ports_range-&gt;tp.src = flow_keys-&gt;sport;</div><div class='add'>+		key_ports_range-&gt;tp.dst = flow_keys-&gt;dport;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dissector_uses_key(flow_dissector,</div><div class='add'>+			       FLOW_DISSECTOR_KEY_FLOW_LABEL)) {</div><div class='add'>+		key_tags = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+						     FLOW_DISSECTOR_KEY_FLOW_LABEL,</div><div class='add'>+						     target_container);</div><div class='add'>+		key_tags-&gt;flow_label = ntohl(flow_keys-&gt;flow_label);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bpf_flow_dissect(struct bpf_prog *prog, struct bpf_flow_dissector *ctx,</div><div class='add'>+		     __be16 proto, int nhoff, int hlen, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_flow_keys *flow_keys = ctx-&gt;flow_keys;</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	/* Pass parameters to the BPF program */</div><div class='add'>+	memset(flow_keys, 0, sizeof(*flow_keys));</div><div class='add'>+	flow_keys-&gt;n_proto = proto;</div><div class='add'>+	flow_keys-&gt;nhoff = nhoff;</div><div class='add'>+	flow_keys-&gt;thoff = flow_keys-&gt;nhoff;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON((int)BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG !=</div><div class='add'>+		     (int)FLOW_DISSECTOR_F_PARSE_1ST_FRAG);</div><div class='add'>+	BUILD_BUG_ON((int)BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL !=</div><div class='add'>+		     (int)FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL);</div><div class='add'>+	BUILD_BUG_ON((int)BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP !=</div><div class='add'>+		     (int)FLOW_DISSECTOR_F_STOP_AT_ENCAP);</div><div class='add'>+	flow_keys-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	result = bpf_prog_run_pin_on_cpu(prog, ctx);</div><div class='add'>+</div><div class='add'>+	flow_keys-&gt;nhoff = clamp_t(u16, flow_keys-&gt;nhoff, nhoff, hlen);</div><div class='add'>+	flow_keys-&gt;thoff = clamp_t(u16, flow_keys-&gt;thoff,</div><div class='add'>+				   flow_keys-&gt;nhoff, hlen);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_pppoe_ses_hdr_valid(const struct pppoe_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	return hdr-&gt;ver == 1 &amp;&amp; hdr-&gt;type == 1 &amp;&amp; hdr-&gt;code == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * __skb_flow_dissect - extract the flow_keys struct and return it</div><div class='add'>+ * @net: associated network namespace, derived from @skb if NULL</div><div class='ctx'>  * @skb: sk_buff to extract the flow from, can be NULL if the rest are specified</div><div class='ctx'>  * @flow_dissector: list of keys to dissect</div><div class='ctx'>  * @target_container: target structure to put dissected values into</div><div class='hunk'>@@ -597,6 +1045,8 @@ static bool skb_flow_dissect_allowed(int *num_hdrs)</div><div class='ctx'>  * @proto: protocol for which to get the flow, if @data is NULL use skb-&gt;protocol</div><div class='ctx'>  * @nhoff: network header offset, if @data is NULL use skb_network_offset(skb)</div><div class='ctx'>  * @hlen: packet header length, if @data is NULL use skb_headlen(skb)</div><div class='add'>+ * @flags: flags that control the dissection process, e.g.</div><div class='add'>+ *         FLOW_DISSECTOR_F_STOP_AT_ENCAP.</div><div class='ctx'>  *</div><div class='ctx'>  * The function will try to retrieve individual keys into target specified</div><div class='ctx'>  * by flow_dissector from either the skbuff or a raw buffer specified by the</div><div class='hunk'>@@ -604,21 +1054,21 @@ static bool skb_flow_dissect_allowed(int *num_hdrs)</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must take care of zeroing target container memory.</div><div class='ctx'>  */</div><div class='del'>-bool __skb_flow_dissect(const struct sk_buff *skb,</div><div class='add'>+bool __skb_flow_dissect(const struct net *net,</div><div class='add'>+			const struct sk_buff *skb,</div><div class='ctx'> 			struct flow_dissector *flow_dissector,</div><div class='del'>-			void *target_container,</div><div class='del'>-			void *data, __be16 proto, int nhoff, int hlen,</div><div class='del'>-			unsigned int flags)</div><div class='add'>+			void *target_container, const void *data,</div><div class='add'>+			__be16 proto, int nhoff, int hlen, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_dissector_key_control *key_control;</div><div class='ctx'> 	struct flow_dissector_key_basic *key_basic;</div><div class='ctx'> 	struct flow_dissector_key_addrs *key_addrs;</div><div class='del'>-	struct flow_dissector_key_ports *key_ports;</div><div class='del'>-	struct flow_dissector_key_icmp *key_icmp;</div><div class='ctx'> 	struct flow_dissector_key_tags *key_tags;</div><div class='ctx'> 	struct flow_dissector_key_vlan *key_vlan;</div><div class='ctx'> 	enum flow_dissect_ret fdret;</div><div class='ctx'> 	enum flow_dissector_key_id dissector_vlan = FLOW_DISSECTOR_KEY_MAX;</div><div class='add'>+	bool mpls_el = false;</div><div class='add'>+	int mpls_lse = 0;</div><div class='ctx'> 	int num_hdrs = 0;</div><div class='ctx'> 	u8 ip_proto = 0;</div><div class='ctx'> 	bool ret;</div><div class='hunk'>@@ -630,13 +1080,22 @@ bool __skb_flow_dissect(const struct sk_buff *skb,</div><div class='ctx'> 		nhoff = skb_network_offset(skb);</div><div class='ctx'> 		hlen = skb_headlen(skb);</div><div class='ctx'> #if IS_ENABLED(CONFIG_NET_DSA)</div><div class='del'>-		if (unlikely(skb-&gt;dev &amp;&amp; netdev_uses_dsa(skb-&gt;dev))) {</div><div class='add'>+		if (unlikely(skb-&gt;dev &amp;&amp; netdev_uses_dsa(skb-&gt;dev) &amp;&amp;</div><div class='add'>+			     proto == htons(ETH_P_XDSA))) {</div><div class='add'>+			struct metadata_dst *md_dst = skb_metadata_dst(skb);</div><div class='ctx'> 			const struct dsa_device_ops *ops;</div><div class='del'>-			int offset;</div><div class='add'>+			int offset = 0;</div><div class='ctx'> </div><div class='ctx'> 			ops = skb-&gt;dev-&gt;dsa_ptr-&gt;tag_ops;</div><div class='del'>-			if (ops-&gt;flow_dissect &amp;&amp;</div><div class='del'>-			    !ops-&gt;flow_dissect(skb, &amp;proto, &amp;offset)) {</div><div class='add'>+			/* Only DSA header taggers break flow dissection */</div><div class='add'>+			if (ops-&gt;needed_headroom &amp;&amp;</div><div class='add'>+			    (!md_dst || md_dst-&gt;type != METADATA_HW_PORT_MUX)) {</div><div class='add'>+				if (ops-&gt;flow_dissect)</div><div class='add'>+					ops-&gt;flow_dissect(skb, &amp;proto, &amp;offset);</div><div class='add'>+				else</div><div class='add'>+					dsa_tag_generic_flow_dissect(skb,</div><div class='add'>+								     &amp;proto,</div><div class='add'>+								     &amp;offset);</div><div class='ctx'> 				hlen -= offset;</div><div class='ctx'> 				nhoff += offset;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -658,6 +1117,60 @@ bool __skb_flow_dissect(const struct sk_buff *skb,</div><div class='ctx'> 					      FLOW_DISSECTOR_KEY_BASIC,</div><div class='ctx'> 					      target_container);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		if (!net) {</div><div class='add'>+			if (skb-&gt;dev)</div><div class='add'>+				net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+			else if (skb-&gt;sk)</div><div class='add'>+				net = sock_net(skb-&gt;sk);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!net);</div><div class='add'>+	if (net) {</div><div class='add'>+		enum netns_bpf_attach_type type = NETNS_BPF_FLOW_DISSECTOR;</div><div class='add'>+		struct bpf_prog_array *run_array;</div><div class='add'>+</div><div class='add'>+		run_array = rcu_dereference(init_net.bpf.run_array[type]);</div><div class='add'>+		if (!run_array)</div><div class='add'>+			run_array = rcu_dereference(net-&gt;bpf.run_array[type]);</div><div class='add'>+</div><div class='add'>+		if (run_array) {</div><div class='add'>+			struct bpf_flow_keys flow_keys;</div><div class='add'>+			struct bpf_flow_dissector ctx = {</div><div class='add'>+				.flow_keys = &amp;flow_keys,</div><div class='add'>+				.data = data,</div><div class='add'>+				.data_end = data + hlen,</div><div class='add'>+			};</div><div class='add'>+			__be16 n_proto = proto;</div><div class='add'>+			struct bpf_prog *prog;</div><div class='add'>+			u32 result;</div><div class='add'>+</div><div class='add'>+			if (skb) {</div><div class='add'>+				ctx.skb = skb;</div><div class='add'>+				/* we can't use 'proto' in the skb case</div><div class='add'>+				 * because it might be set to skb-&gt;vlan_proto</div><div class='add'>+				 * which has been pulled from the data</div><div class='add'>+				 */</div><div class='add'>+				n_proto = skb-&gt;protocol;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			prog = READ_ONCE(run_array-&gt;items[0].prog);</div><div class='add'>+			result = bpf_flow_dissect(prog, &amp;ctx, n_proto, nhoff,</div><div class='add'>+						  hlen, flags);</div><div class='add'>+			if (result != BPF_FLOW_DISSECTOR_CONTINUE) {</div><div class='add'>+				__skb_flow_bpf_to_target(&amp;flow_keys, flow_dissector,</div><div class='add'>+							 target_container);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return result == BPF_OK;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (dissector_uses_key(flow_dissector,</div><div class='ctx'> 			       FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='ctx'> 		struct ethhdr *eth = eth_hdr(skb);</div><div class='hunk'>@@ -666,7 +1179,17 @@ bool __skb_flow_dissect(const struct sk_buff *skb,</div><div class='ctx'> 		key_eth_addrs = skb_flow_dissector_target(flow_dissector,</div><div class='ctx'> 							  FLOW_DISSECTOR_KEY_ETH_ADDRS,</div><div class='ctx'> 							  target_container);</div><div class='del'>-		memcpy(key_eth_addrs, &amp;eth-&gt;h_dest, sizeof(*key_eth_addrs));</div><div class='add'>+		memcpy(key_eth_addrs, eth, sizeof(*key_eth_addrs));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dissector_uses_key(flow_dissector,</div><div class='add'>+			       FLOW_DISSECTOR_KEY_NUM_OF_VLANS)) {</div><div class='add'>+		struct flow_dissector_key_num_of_vlans *key_num_of_vlans;</div><div class='add'>+</div><div class='add'>+		key_num_of_vlans = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+							     FLOW_DISSECTOR_KEY_NUM_OF_VLANS,</div><div class='add'>+							     target_container);</div><div class='add'>+		key_num_of_vlans-&gt;num_of_vlans = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> proto_again:</div><div class='hunk'>@@ -693,11 +1216,16 @@ proto_again:</div><div class='ctx'> 							      FLOW_DISSECTOR_KEY_IPV4_ADDRS,</div><div class='ctx'> 							      target_container);</div><div class='ctx'> </div><div class='del'>-			memcpy(&amp;key_addrs-&gt;v4addrs, &amp;iph-&gt;saddr,</div><div class='del'>-			       sizeof(key_addrs-&gt;v4addrs));</div><div class='add'>+			memcpy(&amp;key_addrs-&gt;v4addrs.src, &amp;iph-&gt;saddr,</div><div class='add'>+			       sizeof(key_addrs-&gt;v4addrs.src));</div><div class='add'>+			memcpy(&amp;key_addrs-&gt;v4addrs.dst, &amp;iph-&gt;daddr,</div><div class='add'>+			       sizeof(key_addrs-&gt;v4addrs.dst));</div><div class='ctx'> 			key_control-&gt;addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		__skb_flow_dissect_ipv4(skb, flow_dissector,</div><div class='add'>+					target_container, data, iph);</div><div class='add'>+</div><div class='ctx'> 		if (ip_is_fragment(iph)) {</div><div class='ctx'> 			key_control-&gt;flags |= FLOW_DIS_IS_FRAGMENT;</div><div class='ctx'> </div><div class='hunk'>@@ -714,14 +1242,6 @@ proto_again:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		__skb_flow_dissect_ipv4(skb, flow_dissector,</div><div class='del'>-					target_container, data, iph);</div><div class='del'>-</div><div class='del'>-		if (flags &amp; FLOW_DISSECTOR_F_STOP_AT_L3) {</div><div class='del'>-			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case htons(ETH_P_IPV6): {</div><div class='hunk'>@@ -743,8 +1263,10 @@ proto_again:</div><div class='ctx'> 							      FLOW_DISSECTOR_KEY_IPV6_ADDRS,</div><div class='ctx'> 							      target_container);</div><div class='ctx'> </div><div class='del'>-			memcpy(&amp;key_addrs-&gt;v6addrs, &amp;iph-&gt;saddr,</div><div class='del'>-			       sizeof(key_addrs-&gt;v6addrs));</div><div class='add'>+			memcpy(&amp;key_addrs-&gt;v6addrs.src, &amp;iph-&gt;saddr,</div><div class='add'>+			       sizeof(key_addrs-&gt;v6addrs.src));</div><div class='add'>+			memcpy(&amp;key_addrs-&gt;v6addrs.dst, &amp;iph-&gt;daddr,</div><div class='add'>+			       sizeof(key_addrs-&gt;v6addrs.dst));</div><div class='ctx'> 			key_control-&gt;addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -770,9 +1292,6 @@ proto_again:</div><div class='ctx'> 		__skb_flow_dissect_ipv6(skb, flow_dissector,</div><div class='ctx'> 					target_container, data, iph);</div><div class='ctx'> </div><div class='del'>-		if (flags &amp; FLOW_DISSECTOR_F_STOP_AT_L3)</div><div class='del'>-			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case htons(ETH_P_8021AD):</div><div class='hunk'>@@ -796,6 +1315,16 @@ proto_again:</div><div class='ctx'> 			nhoff += sizeof(*vlan);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_NUM_OF_VLANS) &amp;&amp;</div><div class='add'>+		    !(key_control-&gt;flags &amp; FLOW_DIS_ENCAPSULATION)) {</div><div class='add'>+			struct flow_dissector_key_num_of_vlans *key_nvs;</div><div class='add'>+</div><div class='add'>+			key_nvs = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+							    FLOW_DISSECTOR_KEY_NUM_OF_VLANS,</div><div class='add'>+							    target_container);</div><div class='add'>+			key_nvs-&gt;num_of_vlans++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX) {</div><div class='ctx'> 			dissector_vlan = FLOW_DISSECTOR_KEY_VLAN;</div><div class='ctx'> 		} else if (dissector_vlan == FLOW_DISSECTOR_KEY_VLAN) {</div><div class='hunk'>@@ -812,8 +1341,7 @@ proto_again:</div><div class='ctx'> </div><div class='ctx'> 			if (!vlan) {</div><div class='ctx'> 				key_vlan-&gt;vlan_id = skb_vlan_tag_get_id(skb);</div><div class='del'>-				key_vlan-&gt;vlan_priority =</div><div class='del'>-					(skb_vlan_tag_get_prio(skb) &gt;&gt; VLAN_PRIO_SHIFT);</div><div class='add'>+				key_vlan-&gt;vlan_priority = skb_vlan_tag_get_prio(skb);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				key_vlan-&gt;vlan_id = ntohs(vlan-&gt;h_vlan_TCI) &amp;</div><div class='ctx'> 					VLAN_VID_MASK;</div><div class='hunk'>@@ -822,6 +1350,7 @@ proto_again:</div><div class='ctx'> 					 VLAN_PRIO_MASK) &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='ctx'> 			}</div><div class='ctx'> 			key_vlan-&gt;vlan_tpid = saved_vlan_tpid;</div><div class='add'>+			key_vlan-&gt;vlan_eth_type = proto;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='hunk'>@@ -832,27 +1361,60 @@ proto_again:</div><div class='ctx'> 			struct pppoe_hdr hdr;</div><div class='ctx'> 			__be16 proto;</div><div class='ctx'> 		} *hdr, _hdr;</div><div class='add'>+		u16 ppp_proto;</div><div class='add'>+</div><div class='ctx'> 		hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen, &amp;_hdr);</div><div class='ctx'> 		if (!hdr) {</div><div class='ctx'> 			fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		proto = hdr-&gt;proto;</div><div class='del'>-		nhoff += PPPOE_SES_HLEN;</div><div class='del'>-		switch (proto) {</div><div class='del'>-		case htons(PPP_IP):</div><div class='add'>+		if (!is_pppoe_ses_hdr_valid(&amp;hdr-&gt;hdr)) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* least significant bit of the most significant octet</div><div class='add'>+		 * indicates if protocol field was compressed</div><div class='add'>+		 */</div><div class='add'>+		ppp_proto = ntohs(hdr-&gt;proto);</div><div class='add'>+		if (ppp_proto &amp; 0x0100) {</div><div class='add'>+			ppp_proto = ppp_proto &gt;&gt; 8;</div><div class='add'>+			nhoff += PPPOE_SES_HLEN - 1;</div><div class='add'>+		} else {</div><div class='add'>+			nhoff += PPPOE_SES_HLEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppp_proto == PPP_IP) {</div><div class='ctx'> 			proto = htons(ETH_P_IP);</div><div class='ctx'> 			fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='del'>-			break;</div><div class='del'>-		case htons(PPP_IPV6):</div><div class='add'>+		} else if (ppp_proto == PPP_IPV6) {</div><div class='ctx'> 			proto = htons(ETH_P_IPV6);</div><div class='ctx'> 			fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='add'>+		} else if (ppp_proto == PPP_MPLS_UC) {</div><div class='add'>+			proto = htons(ETH_P_MPLS_UC);</div><div class='add'>+			fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='add'>+		} else if (ppp_proto == PPP_MPLS_MC) {</div><div class='add'>+			proto = htons(ETH_P_MPLS_MC);</div><div class='add'>+			fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='add'>+		} else if (ppp_proto_is_valid(ppp_proto)) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+		} else {</div><div class='ctx'> 			fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (dissector_uses_key(flow_dissector,</div><div class='add'>+				       FLOW_DISSECTOR_KEY_PPPOE)) {</div><div class='add'>+			struct flow_dissector_key_pppoe *key_pppoe;</div><div class='add'>+</div><div class='add'>+			key_pppoe = skb_flow_dissector_target(flow_dissector,</div><div class='add'>+							      FLOW_DISSECTOR_KEY_PPPOE,</div><div class='add'>+							      target_container);</div><div class='add'>+			key_pppoe-&gt;session_id = hdr-&gt;hdr.sid;</div><div class='add'>+			key_pppoe-&gt;ppp_proto = htons(ppp_proto);</div><div class='add'>+			key_pppoe-&gt;type = htons(ETH_P_PPP_SES);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case htons(ETH_P_TIPC): {</div><div class='hunk'>@@ -881,7 +1443,10 @@ proto_again:</div><div class='ctx'> 	case htons(ETH_P_MPLS_MC):</div><div class='ctx'> 		fdret = __skb_flow_dissect_mpls(skb, flow_dissector,</div><div class='ctx'> 						target_container, data,</div><div class='del'>-						nhoff, hlen);</div><div class='add'>+						nhoff, hlen, mpls_lse,</div><div class='add'>+						&amp;mpls_el);</div><div class='add'>+		nhoff += sizeof(struct mpls_label);</div><div class='add'>+		mpls_lse++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case htons(ETH_P_FCOE):</div><div class='ctx'> 		if ((hlen - nhoff) &lt; FCOE_HEADER_LEN) {</div><div class='hunk'>@@ -905,6 +1470,44 @@ proto_again:</div><div class='ctx'> 						  &amp;proto, &amp;nhoff, hlen, flags);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case htons(ETH_P_1588): {</div><div class='add'>+		struct ptp_header *hdr, _hdr;</div><div class='add'>+</div><div class='add'>+		hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data,</div><div class='add'>+					   hlen, &amp;_hdr);</div><div class='add'>+		if (!hdr) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nhoff += sizeof(struct ptp_header);</div><div class='add'>+		fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case htons(ETH_P_PRP):</div><div class='add'>+	case htons(ETH_P_HSR): {</div><div class='add'>+		struct hsr_tag *hdr, _hdr;</div><div class='add'>+</div><div class='add'>+		hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen,</div><div class='add'>+					   &amp;_hdr);</div><div class='add'>+		if (!hdr) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		proto = hdr-&gt;encap_proto;</div><div class='add'>+		nhoff += HSR_HLEN;</div><div class='add'>+		fdret = FLOW_DISSECT_RET_PROTO_AGAIN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case htons(ETH_P_CFM):</div><div class='add'>+		fdret = __skb_flow_dissect_cfm(skb, flow_dissector,</div><div class='add'>+					       target_container, data,</div><div class='add'>+					       nhoff, hlen);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		fdret = FLOW_DISSECT_RET_OUT_BAD;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -931,6 +1534,11 @@ ip_proto_again:</div><div class='ctx'> </div><div class='ctx'> 	switch (ip_proto) {</div><div class='ctx'> 	case IPPROTO_GRE:</div><div class='add'>+		if (flags &amp; FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		fdret = __skb_flow_dissect_gre(skb, key_control, flow_dissector,</div><div class='ctx'> 					       target_container, data,</div><div class='ctx'> 					       &amp;proto, &amp;nhoff, &amp;hlen, flags);</div><div class='hunk'>@@ -988,6 +1596,11 @@ ip_proto_again:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case IPPROTO_IPIP:</div><div class='add'>+		if (flags &amp; FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		proto = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='ctx'> 		key_control-&gt;flags |= FLOW_DIS_ENCAPSULATION;</div><div class='hunk'>@@ -1000,6 +1613,11 @@ ip_proto_again:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPPROTO_IPV6:</div><div class='add'>+		if (flags &amp; FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP) {</div><div class='add'>+			fdret = FLOW_DISSECT_RET_OUT_GOOD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		proto = htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='ctx'> 		key_control-&gt;flags |= FLOW_DIS_ENCAPSULATION;</div><div class='hunk'>@@ -1022,26 +1640,30 @@ ip_proto_again:</div><div class='ctx'> 				       data, nhoff, hlen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IPPROTO_ICMP:</div><div class='add'>+	case IPPROTO_ICMPV6:</div><div class='add'>+		__skb_flow_dissect_icmp(skb, flow_dissector, target_container,</div><div class='add'>+					data, nhoff, hlen);</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_L2TP:</div><div class='add'>+		__skb_flow_dissect_l2tpv3(skb, flow_dissector, target_container,</div><div class='add'>+					  data, nhoff, hlen);</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_ESP:</div><div class='add'>+		__skb_flow_dissect_esp(skb, flow_dissector, target_container,</div><div class='add'>+				       data, nhoff, hlen);</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_AH:</div><div class='add'>+		__skb_flow_dissect_ah(skb, flow_dissector, target_container,</div><div class='add'>+				      data, nhoff, hlen);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dissector_uses_key(flow_dissector,</div><div class='del'>-			       FLOW_DISSECTOR_KEY_PORTS)) {</div><div class='del'>-		key_ports = skb_flow_dissector_target(flow_dissector,</div><div class='del'>-						      FLOW_DISSECTOR_KEY_PORTS,</div><div class='del'>-						      target_container);</div><div class='del'>-		key_ports-&gt;ports = __skb_flow_get_ports(skb, nhoff, ip_proto,</div><div class='del'>-							data, hlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dissector_uses_key(flow_dissector,</div><div class='del'>-			       FLOW_DISSECTOR_KEY_ICMP)) {</div><div class='del'>-		key_icmp = skb_flow_dissector_target(flow_dissector,</div><div class='del'>-						     FLOW_DISSECTOR_KEY_ICMP,</div><div class='del'>-						     target_container);</div><div class='del'>-		key_icmp-&gt;icmp = skb_flow_get_be16(skb, nhoff, data, hlen);</div><div class='del'>-	}</div><div class='add'>+	if (!(key_control-&gt;flags &amp; FLOW_DIS_IS_FRAGMENT))</div><div class='add'>+		__skb_flow_dissect_ports(skb, flow_dissector, target_container,</div><div class='add'>+					 data, nhoff, ip_proto, hlen);</div><div class='ctx'> </div><div class='ctx'> 	/* Process result of IP proto processing */</div><div class='ctx'> 	switch (fdret) {</div><div class='hunk'>@@ -1077,32 +1699,23 @@ out_bad:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__skb_flow_dissect);</div><div class='ctx'> </div><div class='del'>-static u32 hashrnd __read_mostly;</div><div class='add'>+static siphash_aligned_key_t hashrnd;</div><div class='ctx'> static __always_inline void __flow_hash_secret_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	net_get_random_once(&amp;hashrnd, sizeof(hashrnd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline u32 __flow_hash_words(const u32 *words, u32 length,</div><div class='del'>-					     u32 keyval)</div><div class='add'>+static const void *flow_keys_hash_start(const struct flow_keys *flow)</div><div class='ctx'> {</div><div class='del'>-	return jhash2(words, length, keyval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const u32 *flow_keys_hash_start(const struct flow_keys *flow)</div><div class='del'>-{</div><div class='del'>-	const void *p = flow;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(FLOW_KEYS_HASH_OFFSET % sizeof(u32));</div><div class='del'>-	return (const u32 *)(p + FLOW_KEYS_HASH_OFFSET);</div><div class='add'>+	BUILD_BUG_ON(FLOW_KEYS_HASH_OFFSET % SIPHASH_ALIGNMENT);</div><div class='add'>+	return &amp;flow-&gt;FLOW_KEYS_HASH_START_FIELD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline size_t flow_keys_hash_length(const struct flow_keys *flow)</div><div class='ctx'> {</div><div class='ctx'> 	size_t diff = FLOW_KEYS_HASH_OFFSET + sizeof(flow-&gt;addrs);</div><div class='add'>+</div><div class='ctx'> 	BUILD_BUG_ON((sizeof(*flow) - FLOW_KEYS_HASH_OFFSET) % sizeof(u32));</div><div class='del'>-	BUILD_BUG_ON(offsetof(typeof(*flow), addrs) !=</div><div class='del'>-		     sizeof(*flow) - sizeof(flow-&gt;addrs));</div><div class='ctx'> </div><div class='ctx'> 	switch (flow-&gt;control.addr_type) {</div><div class='ctx'> 	case FLOW_DISSECTOR_KEY_IPV4_ADDRS:</div><div class='hunk'>@@ -1115,7 +1728,7 @@ static inline size_t flow_keys_hash_length(const struct flow_keys *flow)</div><div class='ctx'> 		diff -= sizeof(flow-&gt;addrs.tipckey);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return (sizeof(*flow) - diff) / sizeof(u32);</div><div class='add'>+	return sizeof(*flow) - diff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __be32 flow_get_u32_src(const struct flow_keys *flow)</div><div class='hunk'>@@ -1148,19 +1761,21 @@ __be32 flow_get_u32_dst(const struct flow_keys *flow)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(flow_get_u32_dst);</div><div class='ctx'> </div><div class='add'>+/* Sort the source and destination IP and the ports,</div><div class='add'>+ * to have consistent hash within the two directions</div><div class='add'>+ */</div><div class='ctx'> static inline void __flow_hash_consistentify(struct flow_keys *keys)</div><div class='ctx'> {</div><div class='ctx'> 	int addr_diff, i;</div><div class='ctx'> </div><div class='ctx'> 	switch (keys-&gt;control.addr_type) {</div><div class='ctx'> 	case FLOW_DISSECTOR_KEY_IPV4_ADDRS:</div><div class='del'>-		addr_diff = (__force u32)keys-&gt;addrs.v4addrs.dst -</div><div class='del'>-			    (__force u32)keys-&gt;addrs.v4addrs.src;</div><div class='del'>-		if ((addr_diff &lt; 0) ||</div><div class='del'>-		    (addr_diff == 0 &amp;&amp;</div><div class='del'>-		     ((__force u16)keys-&gt;ports.dst &lt;</div><div class='del'>-		      (__force u16)keys-&gt;ports.src))) {</div><div class='add'>+		if ((__force u32)keys-&gt;addrs.v4addrs.dst &lt;</div><div class='add'>+		    (__force u32)keys-&gt;addrs.v4addrs.src)</div><div class='ctx'> 			swap(keys-&gt;addrs.v4addrs.src, keys-&gt;addrs.v4addrs.dst);</div><div class='add'>+</div><div class='add'>+		if ((__force u16)keys-&gt;ports.dst &lt;</div><div class='add'>+		    (__force u16)keys-&gt;ports.src) {</div><div class='ctx'> 			swap(keys-&gt;ports.src, keys-&gt;ports.dst);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1168,27 +1783,28 @@ static inline void __flow_hash_consistentify(struct flow_keys *keys)</div><div class='ctx'> 		addr_diff = memcmp(&amp;keys-&gt;addrs.v6addrs.dst,</div><div class='ctx'> 				   &amp;keys-&gt;addrs.v6addrs.src,</div><div class='ctx'> 				   sizeof(keys-&gt;addrs.v6addrs.dst));</div><div class='del'>-		if ((addr_diff &lt; 0) ||</div><div class='del'>-		    (addr_diff == 0 &amp;&amp;</div><div class='del'>-		     ((__force u16)keys-&gt;ports.dst &lt;</div><div class='del'>-		      (__force u16)keys-&gt;ports.src))) {</div><div class='add'>+		if (addr_diff &lt; 0) {</div><div class='ctx'> 			for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 				swap(keys-&gt;addrs.v6addrs.src.s6_addr32[i],</div><div class='ctx'> 				     keys-&gt;addrs.v6addrs.dst.s6_addr32[i]);</div><div class='add'>+		}</div><div class='add'>+		if ((__force u16)keys-&gt;ports.dst &lt;</div><div class='add'>+		    (__force u16)keys-&gt;ports.src) {</div><div class='ctx'> 			swap(keys-&gt;ports.src, keys-&gt;ports.dst);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 __flow_hash_from_keys(struct flow_keys *keys, u32 keyval)</div><div class='add'>+static inline u32 __flow_hash_from_keys(struct flow_keys *keys,</div><div class='add'>+					const siphash_key_t *keyval)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> </div><div class='ctx'> 	__flow_hash_consistentify(keys);</div><div class='ctx'> </div><div class='del'>-	hash = __flow_hash_words(flow_keys_hash_start(keys),</div><div class='del'>-				 flow_keys_hash_length(keys), keyval);</div><div class='add'>+	hash = siphash(flow_keys_hash_start(keys),</div><div class='add'>+		       flow_keys_hash_length(keys), keyval);</div><div class='ctx'> 	if (!hash)</div><div class='ctx'> 		hash = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1198,12 +1814,20 @@ static inline u32 __flow_hash_from_keys(struct flow_keys *keys, u32 keyval)</div><div class='ctx'> u32 flow_hash_from_keys(struct flow_keys *keys)</div><div class='ctx'> {</div><div class='ctx'> 	__flow_hash_secret_init();</div><div class='del'>-	return __flow_hash_from_keys(keys, hashrnd);</div><div class='add'>+	return __flow_hash_from_keys(keys, &amp;hashrnd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(flow_hash_from_keys);</div><div class='ctx'> </div><div class='add'>+u32 flow_hash_from_keys_seed(struct flow_keys *keys,</div><div class='add'>+			     const siphash_key_t *keyval)</div><div class='add'>+{</div><div class='add'>+	return __flow_hash_from_keys(keys, keyval);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_hash_from_keys_seed);</div><div class='add'>+</div><div class='ctx'> static inline u32 ___skb_get_hash(const struct sk_buff *skb,</div><div class='del'>-				  struct flow_keys *keys, u32 keyval)</div><div class='add'>+				  struct flow_keys *keys,</div><div class='add'>+				  const siphash_key_t *keyval)</div><div class='ctx'> {</div><div class='ctx'> 	skb_flow_dissect_flow_keys(skb, keys,</div><div class='ctx'> 				   FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL);</div><div class='hunk'>@@ -1240,23 +1864,23 @@ EXPORT_SYMBOL(make_flow_keys_digest);</div><div class='ctx'> </div><div class='ctx'> static struct flow_dissector flow_keys_dissector_symmetric __read_mostly;</div><div class='ctx'> </div><div class='del'>-u32 __skb_get_hash_symmetric(const struct sk_buff *skb)</div><div class='add'>+u32 __skb_get_hash_symmetric_net(const struct net *net, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_keys keys;</div><div class='ctx'> </div><div class='ctx'> 	__flow_hash_secret_init();</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;keys, 0, sizeof(keys));</div><div class='del'>-	__skb_flow_dissect(skb, &amp;flow_keys_dissector_symmetric, &amp;keys,</div><div class='del'>-			   NULL, 0, 0, 0,</div><div class='del'>-			   FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL);</div><div class='add'>+	__skb_flow_dissect(net, skb, &amp;flow_keys_dissector_symmetric,</div><div class='add'>+			   &amp;keys, NULL, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	return __flow_hash_from_keys(&amp;keys, hashrnd);</div><div class='add'>+	return __flow_hash_from_keys(&amp;keys, &amp;hashrnd);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__skb_get_hash_symmetric);</div><div class='add'>+EXPORT_SYMBOL_GPL(__skb_get_hash_symmetric_net);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __skb_get_hash: calculate a flow hash</div><div class='add'>+ * __skb_get_hash_net: calculate a flow hash</div><div class='add'>+ * @net: associated network namespace, derived from @skb if NULL</div><div class='ctx'>  * @skb: sk_buff to calculate flow hash from</div><div class='ctx'>  *</div><div class='ctx'>  * This function calculates a flow hash based on src/dst addresses</div><div class='hunk'>@@ -1264,20 +1888,27 @@ EXPORT_SYMBOL_GPL(__skb_get_hash_symmetric);</div><div class='ctx'>  * on success, zero indicates no valid hash.  Also, sets l4_hash in skb</div><div class='ctx'>  * if hash is a canonical 4-tuple hash over transport ports.</div><div class='ctx'>  */</div><div class='del'>-void __skb_get_hash(struct sk_buff *skb)</div><div class='add'>+void __skb_get_hash_net(const struct net *net, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_keys keys;</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;keys, 0, sizeof(keys));</div><div class='add'>+</div><div class='add'>+	__skb_flow_dissect(net, skb, &amp;flow_keys_dissector,</div><div class='add'>+			   &amp;keys, NULL, 0, 0, 0,</div><div class='add'>+			   FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL);</div><div class='add'>+</div><div class='ctx'> 	__flow_hash_secret_init();</div><div class='ctx'> </div><div class='del'>-	hash = ___skb_get_hash(skb, &amp;keys, hashrnd);</div><div class='add'>+	hash = __flow_hash_from_keys(&amp;keys, &amp;hashrnd);</div><div class='ctx'> </div><div class='ctx'> 	__skb_set_sw_hash(skb, hash, flow_keys_have_l4(&amp;keys));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_get_hash);</div><div class='add'>+EXPORT_SYMBOL(__skb_get_hash_net);</div><div class='ctx'> </div><div class='del'>-__u32 skb_get_hash_perturb(const struct sk_buff *skb, u32 perturb)</div><div class='add'>+__u32 skb_get_hash_perturb(const struct sk_buff *skb,</div><div class='add'>+			   const siphash_key_t *perturb)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_keys keys;</div><div class='ctx'> </div><div class='hunk'>@@ -1285,7 +1916,7 @@ __u32 skb_get_hash_perturb(const struct sk_buff *skb, u32 perturb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_get_hash_perturb);</div><div class='ctx'> </div><div class='del'>-u32 __skb_get_poff(const struct sk_buff *skb, void *data,</div><div class='add'>+u32 __skb_get_poff(const struct sk_buff *skb, const void *data,</div><div class='ctx'> 		   const struct flow_keys_basic *keys, int hlen)</div><div class='ctx'> {</div><div class='ctx'> 	u32 poff = keys-&gt;control.thoff;</div><div class='hunk'>@@ -1349,7 +1980,8 @@ u32 skb_get_poff(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_keys_basic keys;</div><div class='ctx'> </div><div class='del'>-	if (!skb_flow_dissect_flow_keys_basic(skb, &amp;keys, NULL, 0, 0, 0, 0))</div><div class='add'>+	if (!skb_flow_dissect_flow_keys_basic(NULL, skb, &amp;keys,</div><div class='add'>+					      NULL, 0, 0, 0, 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return __skb_get_poff(skb, skb-&gt;data, &amp;keys, skb_headlen(skb));</div><div class='hunk'>@@ -1466,5 +2098,4 @@ static int __init init_default_flow_dissectors(void)</div><div class='ctx'> 				ARRAY_SIZE(flow_keys_basic_dissector_keys));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> core_initcall(init_default_flow_dissectors);</div><div class='head'>diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c<br/>new file mode 100644<br/>index 000000000000..bc5169482710<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/flow_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/flow_offload.c</a></div><div class='hunk'>@@ -0,0 +1,638 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/act_api.h&gt;</div><div class='add'>+#include &lt;net/flow_offload.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+</div><div class='add'>+struct flow_rule *flow_rule_alloc(unsigned int num_actions)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rule = kzalloc(struct_size(rule, action.entries, num_actions),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (!rule)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rule-&gt;action.num_entries = num_actions;</div><div class='add'>+	/* Pre-fill each action hw_stats with DONT_CARE.</div><div class='add'>+	 * Caller can override this if it wants stats for a given action.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_actions; i++)</div><div class='add'>+		rule-&gt;action.entries[i].hw_stats = FLOW_ACTION_HW_STATS_DONT_CARE;</div><div class='add'>+</div><div class='add'>+	return rule;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_alloc);</div><div class='add'>+</div><div class='add'>+struct flow_offload_action *offload_action_alloc(unsigned int num_actions)</div><div class='add'>+{</div><div class='add'>+	struct flow_offload_action *fl_action;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	fl_action = kzalloc(struct_size(fl_action, action.entries, num_actions),</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!fl_action)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	fl_action-&gt;action.num_entries = num_actions;</div><div class='add'>+	/* Pre-fill each action hw_stats with DONT_CARE.</div><div class='add'>+	 * Caller can override this if it wants stats for a given action.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_actions; i++)</div><div class='add'>+		fl_action-&gt;action.entries[i].hw_stats = FLOW_ACTION_HW_STATS_DONT_CARE;</div><div class='add'>+</div><div class='add'>+	return fl_action;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FLOW_DISSECTOR_MATCH(__rule, __type, __out)				\</div><div class='add'>+	const struct flow_match *__m = &amp;(__rule)-&gt;match;			\</div><div class='add'>+	struct flow_dissector *__d = (__m)-&gt;dissector;				\</div><div class='add'>+										\</div><div class='add'>+	(__out)-&gt;key = skb_flow_dissector_target(__d, __type, (__m)-&gt;key);	\</div><div class='add'>+	(__out)-&gt;mask = skb_flow_dissector_target(__d, __type, (__m)-&gt;mask);	\</div><div class='add'>+</div><div class='add'>+void flow_rule_match_meta(const struct flow_rule *rule,</div><div class='add'>+			  struct flow_match_meta *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_META, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_meta);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_basic(const struct flow_rule *rule,</div><div class='add'>+			   struct flow_match_basic *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_BASIC, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_basic);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_control(const struct flow_rule *rule,</div><div class='add'>+			     struct flow_match_control *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_CONTROL, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_control);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_eth_addrs(const struct flow_rule *rule,</div><div class='add'>+			       struct flow_match_eth_addrs *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_eth_addrs);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_vlan(const struct flow_rule *rule,</div><div class='add'>+			  struct flow_match_vlan *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_VLAN, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_vlan);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_cvlan(const struct flow_rule *rule,</div><div class='add'>+			   struct flow_match_vlan *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_CVLAN, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_cvlan);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_arp(const struct flow_rule *rule,</div><div class='add'>+			 struct flow_match_arp *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ARP, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_arp);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ipv4_addrs(const struct flow_rule *rule,</div><div class='add'>+				struct flow_match_ipv4_addrs *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ipv4_addrs);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ipv6_addrs(const struct flow_rule *rule,</div><div class='add'>+				struct flow_match_ipv6_addrs *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_IPV6_ADDRS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ipv6_addrs);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ip(const struct flow_rule *rule,</div><div class='add'>+			struct flow_match_ip *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_IP, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ip);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ports(const struct flow_rule *rule,</div><div class='add'>+			   struct flow_match_ports *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_PORTS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ports);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ports_range(const struct flow_rule *rule,</div><div class='add'>+				 struct flow_match_ports_range *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_PORTS_RANGE, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ports_range);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_tcp(const struct flow_rule *rule,</div><div class='add'>+			 struct flow_match_tcp *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_TCP, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_tcp);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ipsec(const struct flow_rule *rule,</div><div class='add'>+			   struct flow_match_ipsec *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_IPSEC, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ipsec);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_icmp(const struct flow_rule *rule,</div><div class='add'>+			  struct flow_match_icmp *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ICMP, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_icmp);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_mpls(const struct flow_rule *rule,</div><div class='add'>+			  struct flow_match_mpls *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_MPLS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_mpls);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_control(const struct flow_rule *rule,</div><div class='add'>+				 struct flow_match_control *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_CONTROL, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_control);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_ipv4_addrs(const struct flow_rule *rule,</div><div class='add'>+				    struct flow_match_ipv4_addrs *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_ipv4_addrs);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_ipv6_addrs(const struct flow_rule *rule,</div><div class='add'>+				    struct flow_match_ipv6_addrs *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_ipv6_addrs);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_ip(const struct flow_rule *rule,</div><div class='add'>+			    struct flow_match_ip *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_IP, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_ip);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_ports(const struct flow_rule *rule,</div><div class='add'>+			       struct flow_match_ports *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_PORTS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_ports);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_keyid(const struct flow_rule *rule,</div><div class='add'>+			       struct flow_match_enc_keyid *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_KEYID, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_keyid);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_enc_opts(const struct flow_rule *rule,</div><div class='add'>+			      struct flow_match_enc_opts *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_ENC_OPTS, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_enc_opts);</div><div class='add'>+</div><div class='add'>+struct flow_action_cookie *flow_action_cookie_create(void *data,</div><div class='add'>+						     unsigned int len,</div><div class='add'>+						     gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct flow_action_cookie *cookie;</div><div class='add'>+</div><div class='add'>+	cookie = kmalloc(sizeof(*cookie) + len, gfp);</div><div class='add'>+	if (!cookie)</div><div class='add'>+		return NULL;</div><div class='add'>+	cookie-&gt;cookie_len = len;</div><div class='add'>+	memcpy(cookie-&gt;cookie, data, len);</div><div class='add'>+	return cookie;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_action_cookie_create);</div><div class='add'>+</div><div class='add'>+void flow_action_cookie_destroy(struct flow_action_cookie *cookie)</div><div class='add'>+{</div><div class='add'>+	kfree(cookie);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_action_cookie_destroy);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_ct(const struct flow_rule *rule,</div><div class='add'>+			struct flow_match_ct *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_CT, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_ct);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_pppoe(const struct flow_rule *rule,</div><div class='add'>+			   struct flow_match_pppoe *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_PPPOE, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_pppoe);</div><div class='add'>+</div><div class='add'>+void flow_rule_match_l2tpv3(const struct flow_rule *rule,</div><div class='add'>+			    struct flow_match_l2tpv3 *out)</div><div class='add'>+{</div><div class='add'>+	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_L2TPV3, out);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_rule_match_l2tpv3);</div><div class='add'>+</div><div class='add'>+struct flow_block_cb *flow_block_cb_alloc(flow_setup_cb_t *cb,</div><div class='add'>+					  void *cb_ident, void *cb_priv,</div><div class='add'>+					  void (*release)(void *cb_priv))</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	block_cb = kzalloc(sizeof(*block_cb), GFP_KERNEL);</div><div class='add'>+	if (!block_cb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	block_cb-&gt;cb = cb;</div><div class='add'>+	block_cb-&gt;cb_ident = cb_ident;</div><div class='add'>+	block_cb-&gt;cb_priv = cb_priv;</div><div class='add'>+	block_cb-&gt;release = release;</div><div class='add'>+</div><div class='add'>+	return block_cb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_alloc);</div><div class='add'>+</div><div class='add'>+void flow_block_cb_free(struct flow_block_cb *block_cb)</div><div class='add'>+{</div><div class='add'>+	if (block_cb-&gt;release)</div><div class='add'>+		block_cb-&gt;release(block_cb-&gt;cb_priv);</div><div class='add'>+</div><div class='add'>+	kfree(block_cb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_free);</div><div class='add'>+</div><div class='add'>+struct flow_block_cb *flow_block_cb_lookup(struct flow_block *block,</div><div class='add'>+					   flow_setup_cb_t *cb, void *cb_ident)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(block_cb, &amp;block-&gt;cb_list, list) {</div><div class='add'>+		if (block_cb-&gt;cb == cb &amp;&amp;</div><div class='add'>+		    block_cb-&gt;cb_ident == cb_ident)</div><div class='add'>+			return block_cb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_lookup);</div><div class='add'>+</div><div class='add'>+void *flow_block_cb_priv(struct flow_block_cb *block_cb)</div><div class='add'>+{</div><div class='add'>+	return block_cb-&gt;cb_priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_priv);</div><div class='add'>+</div><div class='add'>+void flow_block_cb_incref(struct flow_block_cb *block_cb)</div><div class='add'>+{</div><div class='add'>+	block_cb-&gt;refcnt++;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_incref);</div><div class='add'>+</div><div class='add'>+unsigned int flow_block_cb_decref(struct flow_block_cb *block_cb)</div><div class='add'>+{</div><div class='add'>+	return --block_cb-&gt;refcnt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_decref);</div><div class='add'>+</div><div class='add'>+bool flow_block_cb_is_busy(flow_setup_cb_t *cb, void *cb_ident,</div><div class='add'>+			   struct list_head *driver_block_list)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(block_cb, driver_block_list, driver_list) {</div><div class='add'>+		if (block_cb-&gt;cb == cb &amp;&amp;</div><div class='add'>+		    block_cb-&gt;cb_ident == cb_ident)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_is_busy);</div><div class='add'>+</div><div class='add'>+int flow_block_cb_setup_simple(struct flow_block_offload *f,</div><div class='add'>+			       struct list_head *driver_block_list,</div><div class='add'>+			       flow_setup_cb_t *cb,</div><div class='add'>+			       void *cb_ident, void *cb_priv,</div><div class='add'>+			       bool ingress_only)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	if (ingress_only &amp;&amp;</div><div class='add'>+	    f-&gt;binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	f-&gt;driver_block_list = driver_block_list;</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_BLOCK_BIND:</div><div class='add'>+		if (flow_block_cb_is_busy(cb, cb_ident, driver_block_list))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		block_cb = flow_block_cb_alloc(cb, cb_ident, cb_priv, NULL);</div><div class='add'>+		if (IS_ERR(block_cb))</div><div class='add'>+			return PTR_ERR(block_cb);</div><div class='add'>+</div><div class='add'>+		flow_block_cb_add(block_cb, f);</div><div class='add'>+		list_add_tail(&amp;block_cb-&gt;driver_list, driver_block_list);</div><div class='add'>+		return 0;</div><div class='add'>+	case FLOW_BLOCK_UNBIND:</div><div class='add'>+		block_cb = flow_block_cb_lookup(f-&gt;block, cb, cb_ident);</div><div class='add'>+		if (!block_cb)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		flow_block_cb_remove(block_cb, f);</div><div class='add'>+		list_del(&amp;block_cb-&gt;driver_list);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_block_cb_setup_simple);</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(flow_indr_block_lock);</div><div class='add'>+static LIST_HEAD(flow_block_indr_list);</div><div class='add'>+static LIST_HEAD(flow_block_indr_dev_list);</div><div class='add'>+static LIST_HEAD(flow_indir_dev_list);</div><div class='add'>+</div><div class='add'>+struct flow_indr_dev {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	flow_indr_block_bind_cb_t	*cb;</div><div class='add'>+	void				*cb_priv;</div><div class='add'>+	refcount_t			refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flow_indr_dev *flow_indr_dev_alloc(flow_indr_block_bind_cb_t *cb,</div><div class='add'>+						 void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct flow_indr_dev *indr_dev;</div><div class='add'>+</div><div class='add'>+	indr_dev = kmalloc(sizeof(*indr_dev), GFP_KERNEL);</div><div class='add'>+	if (!indr_dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	indr_dev-&gt;cb		= cb;</div><div class='add'>+	indr_dev-&gt;cb_priv	= cb_priv;</div><div class='add'>+	refcount_set(&amp;indr_dev-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+	return indr_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct flow_indir_dev_info {</div><div class='add'>+	void *data;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct Qdisc *sch;</div><div class='add'>+	enum tc_setup_type type;</div><div class='add'>+	void (*cleanup)(struct flow_block_cb *block_cb);</div><div class='add'>+	struct list_head list;</div><div class='add'>+	enum flow_block_command command;</div><div class='add'>+	enum flow_block_binder_type binder_type;</div><div class='add'>+	struct list_head *cb_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void existing_qdiscs_register(flow_indr_block_bind_cb_t *cb, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_offload bo;</div><div class='add'>+	struct flow_indir_dev_info *cur;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur, &amp;flow_indir_dev_list, list) {</div><div class='add'>+		memset(&amp;bo, 0, sizeof(bo));</div><div class='add'>+		bo.command = cur-&gt;command;</div><div class='add'>+		bo.binder_type = cur-&gt;binder_type;</div><div class='add'>+		INIT_LIST_HEAD(&amp;bo.cb_list);</div><div class='add'>+		cb(cur-&gt;dev, cur-&gt;sch, cb_priv, cur-&gt;type, &amp;bo, cur-&gt;data, cur-&gt;cleanup);</div><div class='add'>+		list_splice(&amp;bo.cb_list, cur-&gt;cb_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int flow_indr_dev_register(flow_indr_block_bind_cb_t *cb, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct flow_indr_dev *indr_dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;flow_indr_block_lock);</div><div class='add'>+	list_for_each_entry(indr_dev, &amp;flow_block_indr_dev_list, list) {</div><div class='add'>+		if (indr_dev-&gt;cb == cb &amp;&amp;</div><div class='add'>+		    indr_dev-&gt;cb_priv == cb_priv) {</div><div class='add'>+			refcount_inc(&amp;indr_dev-&gt;refcnt);</div><div class='add'>+			mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	indr_dev = flow_indr_dev_alloc(cb, cb_priv);</div><div class='add'>+	if (!indr_dev) {</div><div class='add'>+		mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;indr_dev-&gt;list, &amp;flow_block_indr_dev_list);</div><div class='add'>+	existing_qdiscs_register(cb, cb_priv);</div><div class='add'>+	mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+</div><div class='add'>+	tcf_action_reoffload_cb(cb, cb_priv, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_indr_dev_register);</div><div class='add'>+</div><div class='add'>+static void __flow_block_indr_cleanup(void (*release)(void *cb_priv),</div><div class='add'>+				      void *cb_priv,</div><div class='add'>+				      struct list_head *cleanup_list)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *this, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(this, next, &amp;flow_block_indr_list, indr.list) {</div><div class='add'>+		if (this-&gt;release == release &amp;&amp;</div><div class='add'>+		    this-&gt;indr.cb_priv == cb_priv)</div><div class='add'>+			list_move(&amp;this-&gt;indr.list, cleanup_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flow_block_indr_notify(struct list_head *cleanup_list)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *this, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(this, next, cleanup_list, indr.list) {</div><div class='add'>+		list_del(&amp;this-&gt;indr.list);</div><div class='add'>+		this-&gt;indr.cleanup(this);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void flow_indr_dev_unregister(flow_indr_block_bind_cb_t *cb, void *cb_priv,</div><div class='add'>+			      void (*release)(void *cb_priv))</div><div class='add'>+{</div><div class='add'>+	struct flow_indr_dev *this, *next, *indr_dev = NULL;</div><div class='add'>+	LIST_HEAD(cleanup_list);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;flow_indr_block_lock);</div><div class='add'>+	list_for_each_entry_safe(this, next, &amp;flow_block_indr_dev_list, list) {</div><div class='add'>+		if (this-&gt;cb == cb &amp;&amp;</div><div class='add'>+		    this-&gt;cb_priv == cb_priv &amp;&amp;</div><div class='add'>+		    refcount_dec_and_test(&amp;this-&gt;refcnt)) {</div><div class='add'>+			indr_dev = this;</div><div class='add'>+			list_del(&amp;indr_dev-&gt;list);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!indr_dev) {</div><div class='add'>+		mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__flow_block_indr_cleanup(release, cb_priv, &amp;cleanup_list);</div><div class='add'>+	mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+</div><div class='add'>+	tcf_action_reoffload_cb(cb, cb_priv, false);</div><div class='add'>+	flow_block_indr_notify(&amp;cleanup_list);</div><div class='add'>+	kfree(indr_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_indr_dev_unregister);</div><div class='add'>+</div><div class='add'>+static void flow_block_indr_init(struct flow_block_cb *flow_block,</div><div class='add'>+				 struct flow_block_offload *bo,</div><div class='add'>+				 struct net_device *dev, struct Qdisc *sch, void *data,</div><div class='add'>+				 void *cb_priv,</div><div class='add'>+				 void (*cleanup)(struct flow_block_cb *block_cb))</div><div class='add'>+{</div><div class='add'>+	flow_block-&gt;indr.binder_type = bo-&gt;binder_type;</div><div class='add'>+	flow_block-&gt;indr.data = data;</div><div class='add'>+	flow_block-&gt;indr.cb_priv = cb_priv;</div><div class='add'>+	flow_block-&gt;indr.dev = dev;</div><div class='add'>+	flow_block-&gt;indr.sch = sch;</div><div class='add'>+	flow_block-&gt;indr.cleanup = cleanup;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct flow_block_cb *flow_indr_block_cb_alloc(flow_setup_cb_t *cb,</div><div class='add'>+					       void *cb_ident, void *cb_priv,</div><div class='add'>+					       void (*release)(void *cb_priv),</div><div class='add'>+					       struct flow_block_offload *bo,</div><div class='add'>+					       struct net_device *dev,</div><div class='add'>+					       struct Qdisc *sch, void *data,</div><div class='add'>+					       void *indr_cb_priv,</div><div class='add'>+					       void (*cleanup)(struct flow_block_cb *block_cb))</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	block_cb = flow_block_cb_alloc(cb, cb_ident, cb_priv, release);</div><div class='add'>+	if (IS_ERR(block_cb))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	flow_block_indr_init(block_cb, bo, dev, sch, data, indr_cb_priv, cleanup);</div><div class='add'>+	list_add(&amp;block_cb-&gt;indr.list, &amp;flow_block_indr_list);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return block_cb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_indr_block_cb_alloc);</div><div class='add'>+</div><div class='add'>+static struct flow_indir_dev_info *find_indir_dev(void *data)</div><div class='add'>+{</div><div class='add'>+	struct flow_indir_dev_info *cur;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur, &amp;flow_indir_dev_list, list) {</div><div class='add'>+		if (cur-&gt;data == data)</div><div class='add'>+			return cur;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int indir_dev_add(void *data, struct net_device *dev, struct Qdisc *sch,</div><div class='add'>+			 enum tc_setup_type type, void (*cleanup)(struct flow_block_cb *block_cb),</div><div class='add'>+			 struct flow_block_offload *bo)</div><div class='add'>+{</div><div class='add'>+	struct flow_indir_dev_info *info;</div><div class='add'>+</div><div class='add'>+	info = find_indir_dev(data);</div><div class='add'>+	if (info)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;data = data;</div><div class='add'>+	info-&gt;dev = dev;</div><div class='add'>+	info-&gt;sch = sch;</div><div class='add'>+	info-&gt;type = type;</div><div class='add'>+	info-&gt;cleanup = cleanup;</div><div class='add'>+	info-&gt;command = bo-&gt;command;</div><div class='add'>+	info-&gt;binder_type = bo-&gt;binder_type;</div><div class='add'>+	info-&gt;cb_list = bo-&gt;cb_list_head;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;info-&gt;list, &amp;flow_indir_dev_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int indir_dev_remove(void *data)</div><div class='add'>+{</div><div class='add'>+	struct flow_indir_dev_info *info;</div><div class='add'>+</div><div class='add'>+	info = find_indir_dev(data);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;info-&gt;list);</div><div class='add'>+</div><div class='add'>+	kfree(info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int flow_indr_dev_setup_offload(struct net_device *dev,	struct Qdisc *sch,</div><div class='add'>+				enum tc_setup_type type, void *data,</div><div class='add'>+				struct flow_block_offload *bo,</div><div class='add'>+				void (*cleanup)(struct flow_block_cb *block_cb))</div><div class='add'>+{</div><div class='add'>+	struct flow_indr_dev *this;</div><div class='add'>+	u32 count = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;flow_indr_block_lock);</div><div class='add'>+	if (bo) {</div><div class='add'>+		if (bo-&gt;command == FLOW_BLOCK_BIND)</div><div class='add'>+			indir_dev_add(data, dev, sch, type, cleanup, bo);</div><div class='add'>+		else if (bo-&gt;command == FLOW_BLOCK_UNBIND)</div><div class='add'>+			indir_dev_remove(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(this, &amp;flow_block_indr_dev_list, list) {</div><div class='add'>+		err = this-&gt;cb(dev, sch, this-&gt;cb_priv, type, bo, data, cleanup);</div><div class='add'>+		if (!err)</div><div class='add'>+			count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;flow_indr_block_lock);</div><div class='add'>+</div><div class='add'>+	return (bo &amp;&amp; list_empty(&amp;bo-&gt;cb_list)) ? -EOPNOTSUPP : count;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_indr_dev_setup_offload);</div><div class='add'>+</div><div class='add'>+bool flow_indr_dev_exists(void)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;flow_block_indr_dev_list);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flow_indr_dev_exists);</div><div class='head'>diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c<br/>index e4e442d70c2d..f112156db587 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/gen_estimator.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gen_estimator.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/gen_estimator.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/gen_estimator.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/sched/gen_estimator.c	Simple rate estimator.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *		Eric Dumazet &lt;edumazet@google.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -44,15 +40,15 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct net_rate_estimator {</div><div class='del'>-	struct gnet_stats_basic_packed	*bstats;</div><div class='add'>+	struct gnet_stats_basic_sync	*bstats;</div><div class='ctx'> 	spinlock_t		*stats_lock;</div><div class='del'>-	seqcount_t		*running;</div><div class='del'>-	struct gnet_stats_basic_cpu __percpu *cpu_bstats;</div><div class='add'>+	bool			running;</div><div class='add'>+	struct gnet_stats_basic_sync __percpu *cpu_bstats;</div><div class='ctx'> 	u8			ewma_log;</div><div class='ctx'> 	u8			intvl_log; /* period : (250ms &lt;&lt; intvl_log) */</div><div class='ctx'> </div><div class='ctx'> 	seqcount_t		seq;</div><div class='del'>-	u32			last_packets;</div><div class='add'>+	u64			last_packets;</div><div class='ctx'> 	u64			last_bytes;</div><div class='ctx'> </div><div class='ctx'> 	u64			avpps;</div><div class='hunk'>@@ -64,13 +60,13 @@ struct net_rate_estimator {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void est_fetch_counters(struct net_rate_estimator *e,</div><div class='del'>-			       struct gnet_stats_basic_packed *b)</div><div class='add'>+			       struct gnet_stats_basic_sync *b)</div><div class='ctx'> {</div><div class='del'>-	memset(b, 0, sizeof(*b));</div><div class='add'>+	gnet_stats_basic_sync_init(b);</div><div class='ctx'> 	if (e-&gt;stats_lock)</div><div class='ctx'> 		spin_lock(e-&gt;stats_lock);</div><div class='ctx'> </div><div class='del'>-	__gnet_stats_copy_basic(e-&gt;running, b, e-&gt;cpu_bstats, e-&gt;bstats);</div><div class='add'>+	gnet_stats_add_basic(b, e-&gt;cpu_bstats, e-&gt;bstats, e-&gt;running);</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;stats_lock)</div><div class='ctx'> 		spin_unlock(e-&gt;stats_lock);</div><div class='hunk'>@@ -79,24 +75,30 @@ static void est_fetch_counters(struct net_rate_estimator *e,</div><div class='ctx'> </div><div class='ctx'> static void est_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_rate_estimator *est = from_timer(est, t, timer);</div><div class='del'>-	struct gnet_stats_basic_packed b;</div><div class='add'>+	struct net_rate_estimator *est = timer_container_of(est, t, timer);</div><div class='add'>+	struct gnet_stats_basic_sync b;</div><div class='add'>+	u64 b_bytes, b_packets;</div><div class='ctx'> 	u64 rate, brate;</div><div class='ctx'> </div><div class='ctx'> 	est_fetch_counters(est, &amp;b);</div><div class='del'>-	brate = (b.bytes - est-&gt;last_bytes) &lt;&lt; (10 - est-&gt;ewma_log - est-&gt;intvl_log);</div><div class='del'>-	brate -= (est-&gt;avbps &gt;&gt; est-&gt;ewma_log);</div><div class='add'>+	b_bytes = u64_stats_read(&amp;b.bytes);</div><div class='add'>+	b_packets = u64_stats_read(&amp;b.packets);</div><div class='add'>+</div><div class='add'>+	brate = (b_bytes - est-&gt;last_bytes) &lt;&lt; (10 - est-&gt;intvl_log);</div><div class='add'>+	brate = (brate &gt;&gt; est-&gt;ewma_log) - (est-&gt;avbps &gt;&gt; est-&gt;ewma_log);</div><div class='ctx'> </div><div class='del'>-	rate = (u64)(b.packets - est-&gt;last_packets) &lt;&lt; (10 - est-&gt;ewma_log - est-&gt;intvl_log);</div><div class='del'>-	rate -= (est-&gt;avpps &gt;&gt; est-&gt;ewma_log);</div><div class='add'>+	rate = (b_packets - est-&gt;last_packets) &lt;&lt; (10 - est-&gt;intvl_log);</div><div class='add'>+	rate = (rate &gt;&gt; est-&gt;ewma_log) - (est-&gt;avpps &gt;&gt; est-&gt;ewma_log);</div><div class='ctx'> </div><div class='add'>+	preempt_disable_nested();</div><div class='ctx'> 	write_seqcount_begin(&amp;est-&gt;seq);</div><div class='ctx'> 	est-&gt;avbps += brate;</div><div class='ctx'> 	est-&gt;avpps += rate;</div><div class='ctx'> 	write_seqcount_end(&amp;est-&gt;seq);</div><div class='add'>+	preempt_enable_nested();</div><div class='ctx'> </div><div class='del'>-	est-&gt;last_bytes = b.bytes;</div><div class='del'>-	est-&gt;last_packets = b.packets;</div><div class='add'>+	est-&gt;last_bytes = b_bytes;</div><div class='add'>+	est-&gt;last_packets = b_packets;</div><div class='ctx'> </div><div class='ctx'> 	est-&gt;next_jiffies += ((HZ/4) &lt;&lt; est-&gt;intvl_log);</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +115,9 @@ static void est_timer(struct timer_list *t)</div><div class='ctx'>  * @cpu_bstats: bstats per cpu</div><div class='ctx'>  * @rate_est: rate estimator statistics</div><div class='ctx'>  * @lock: lock for statistics and control path</div><div class='del'>- * @running: qdisc running seqcount</div><div class='add'>+ * @running: true if @bstats represents a running qdisc, thus @bstats'</div><div class='add'>+ *           internal values might change during basic reads. Only used</div><div class='add'>+ *           if @bstats_cpu is NULL</div><div class='ctx'>  * @opt: rate estimator configuration TLV</div><div class='ctx'>  *</div><div class='ctx'>  * Creates a new rate estimator with &amp;bstats as source and &amp;rate_est</div><div class='hunk'>@@ -125,16 +129,16 @@ static void est_timer(struct timer_list *t)</div><div class='ctx'>  * Returns 0 on success or a negative error code.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int gen_new_estimator(struct gnet_stats_basic_packed *bstats,</div><div class='del'>-		      struct gnet_stats_basic_cpu __percpu *cpu_bstats,</div><div class='add'>+int gen_new_estimator(struct gnet_stats_basic_sync *bstats,</div><div class='add'>+		      struct gnet_stats_basic_sync __percpu *cpu_bstats,</div><div class='ctx'> 		      struct net_rate_estimator __rcu **rate_est,</div><div class='ctx'> 		      spinlock_t *lock,</div><div class='del'>-		      seqcount_t *running,</div><div class='add'>+		      bool running,</div><div class='ctx'> 		      struct nlattr *opt)</div><div class='ctx'> {</div><div class='ctx'> 	struct gnet_estimator *parm = nla_data(opt);</div><div class='ctx'> 	struct net_rate_estimator *old, *est;</div><div class='del'>-	struct gnet_stats_basic_packed b;</div><div class='add'>+	struct gnet_stats_basic_sync b;</div><div class='ctx'> 	int intvl_log;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_len(opt) &lt; sizeof(*parm))</div><div class='hunk'>@@ -147,6 +151,9 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,</div><div class='ctx'> 	if (parm-&gt;interval &lt; -2 || parm-&gt;interval &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (parm-&gt;ewma_log == 0 || parm-&gt;ewma_log &gt;= 31)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	est = kzalloc(sizeof(*est), GFP_KERNEL);</div><div class='ctx'> 	if (!est)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='hunk'>@@ -165,14 +172,14 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,</div><div class='ctx'> 	est_fetch_counters(est, &amp;b);</div><div class='ctx'> 	if (lock)</div><div class='ctx'> 		local_bh_enable();</div><div class='del'>-	est-&gt;last_bytes = b.bytes;</div><div class='del'>-	est-&gt;last_packets = b.packets;</div><div class='add'>+	est-&gt;last_bytes = u64_stats_read(&amp;b.bytes);</div><div class='add'>+	est-&gt;last_packets = u64_stats_read(&amp;b.packets);</div><div class='ctx'> </div><div class='ctx'> 	if (lock)</div><div class='ctx'> 		spin_lock_bh(lock);</div><div class='ctx'> 	old = rcu_dereference_protected(*rate_est, 1);</div><div class='ctx'> 	if (old) {</div><div class='del'>-		del_timer_sync(&amp;old-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;old-&gt;timer);</div><div class='ctx'> 		est-&gt;avbps = old-&gt;avbps;</div><div class='ctx'> 		est-&gt;avpps = old-&gt;avpps;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,9 +208,9 @@ void gen_kill_estimator(struct net_rate_estimator __rcu **rate_est)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_rate_estimator *est;</div><div class='ctx'> </div><div class='del'>-	est = xchg((__force struct net_rate_estimator **)rate_est, NULL);</div><div class='add'>+	est = unrcu_pointer(xchg(rate_est, NULL));</div><div class='ctx'> 	if (est) {</div><div class='del'>-		del_timer_sync(&amp;est-&gt;timer);</div><div class='add'>+		timer_shutdown_sync(&amp;est-&gt;timer);</div><div class='ctx'> 		kfree_rcu(est, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -215,7 +222,9 @@ EXPORT_SYMBOL(gen_kill_estimator);</div><div class='ctx'>  * @cpu_bstats: bstats per cpu</div><div class='ctx'>  * @rate_est: rate estimator statistics</div><div class='ctx'>  * @lock: lock for statistics and control path</div><div class='del'>- * @running: qdisc running seqcount (might be NULL)</div><div class='add'>+ * @running: true if @bstats represents a running qdisc, thus @bstats'</div><div class='add'>+ *           internal values might change during basic reads. Only used</div><div class='add'>+ *           if @cpu_bstats is NULL</div><div class='ctx'>  * @opt: rate estimator configuration TLV</div><div class='ctx'>  *</div><div class='ctx'>  * Replaces the configuration of a rate estimator by calling</div><div class='hunk'>@@ -223,11 +232,11 @@ EXPORT_SYMBOL(gen_kill_estimator);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,</div><div class='del'>-			  struct gnet_stats_basic_cpu __percpu *cpu_bstats,</div><div class='add'>+int gen_replace_estimator(struct gnet_stats_basic_sync *bstats,</div><div class='add'>+			  struct gnet_stats_basic_sync __percpu *cpu_bstats,</div><div class='ctx'> 			  struct net_rate_estimator __rcu **rate_est,</div><div class='ctx'> 			  spinlock_t *lock,</div><div class='del'>-			  seqcount_t *running, struct nlattr *opt)</div><div class='add'>+			  bool running, struct nlattr *opt)</div><div class='ctx'> {</div><div class='ctx'> 	return gen_new_estimator(bstats, cpu_bstats, rate_est,</div><div class='ctx'> 				 lock, running, opt);</div><div class='head'>diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c<br/>index 188d693cb251..b71ccaec0991 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/gen_stats.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gen_stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/gen_stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/gen_stats.c</a></div><div class='hunk'>@@ -1,16 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/gen_stats.c</div><div class='ctx'>  *</div><div class='del'>- *             This program is free software; you can redistribute it and/or</div><div class='del'>- *             modify it under the terms of the GNU General Public License</div><div class='del'>- *             as published by the Free Software Foundation; either version</div><div class='del'>- *             2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Authors:  Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'>  *           Jamal Hadi Salim</div><div class='ctx'>  *           Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *</div><div class='del'>- * See Documentation/networking/gen_stats.txt</div><div class='add'>+ * See Documentation/networking/gen_stats.rst</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -22,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/gen_stats.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/gen_stats.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;net/sch_generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> gnet_stats_copy(struct gnet_dump *d, int type, void *buf, int size, int padattr)</div><div class='hunk'>@@ -118,56 +114,141 @@ gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gnet_stats_start_copy);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-__gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,</div><div class='del'>-			    struct gnet_stats_basic_cpu __percpu *cpu)</div><div class='add'>+/* Must not be inlined, due to u64_stats seqcount_t lockdep key */</div><div class='add'>+void gnet_stats_basic_sync_init(struct gnet_stats_basic_sync *b)</div><div class='add'>+{</div><div class='add'>+	u64_stats_set(&amp;b-&gt;bytes, 0);</div><div class='add'>+	u64_stats_set(&amp;b-&gt;packets, 0);</div><div class='add'>+	u64_stats_init(&amp;b-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gnet_stats_basic_sync_init);</div><div class='add'>+</div><div class='add'>+static void gnet_stats_add_basic_cpu(struct gnet_stats_basic_sync *bstats,</div><div class='add'>+				     struct gnet_stats_basic_sync __percpu *cpu)</div><div class='ctx'> {</div><div class='add'>+	u64 t_bytes = 0, t_packets = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='del'>-		struct gnet_stats_basic_cpu *bcpu = per_cpu_ptr(cpu, i);</div><div class='add'>+		struct gnet_stats_basic_sync *bcpu = per_cpu_ptr(cpu, i);</div><div class='ctx'> 		unsigned int start;</div><div class='del'>-		u64 bytes;</div><div class='del'>-		u32 packets;</div><div class='add'>+		u64 bytes, packets;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;bcpu-&gt;syncp);</div><div class='del'>-			bytes = bcpu-&gt;bstats.bytes;</div><div class='del'>-			packets = bcpu-&gt;bstats.packets;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;bcpu-&gt;syncp, start));</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;bcpu-&gt;syncp);</div><div class='add'>+			bytes = u64_stats_read(&amp;bcpu-&gt;bytes);</div><div class='add'>+			packets = u64_stats_read(&amp;bcpu-&gt;packets);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;bcpu-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		t_bytes += bytes;</div><div class='add'>+		t_packets += packets;</div><div class='add'>+	}</div><div class='add'>+	_bstats_update(bstats, t_bytes, t_packets);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		bstats-&gt;bytes += bytes;</div><div class='del'>-		bstats-&gt;packets += packets;</div><div class='add'>+void gnet_stats_add_basic(struct gnet_stats_basic_sync *bstats,</div><div class='add'>+			  struct gnet_stats_basic_sync __percpu *cpu,</div><div class='add'>+			  struct gnet_stats_basic_sync *b, bool running)</div><div class='add'>+{</div><div class='add'>+	unsigned int start;</div><div class='add'>+	u64 bytes = 0;</div><div class='add'>+	u64 packets = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE((cpu || running) &amp;&amp; in_hardirq());</div><div class='add'>+</div><div class='add'>+	if (cpu) {</div><div class='add'>+		gnet_stats_add_basic_cpu(bstats, cpu);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	do {</div><div class='add'>+		if (running)</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;b-&gt;syncp);</div><div class='add'>+		bytes = u64_stats_read(&amp;b-&gt;bytes);</div><div class='add'>+		packets = u64_stats_read(&amp;b-&gt;packets);</div><div class='add'>+	} while (running &amp;&amp; u64_stats_fetch_retry(&amp;b-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+	_bstats_update(bstats, bytes, packets);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(gnet_stats_add_basic);</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-__gnet_stats_copy_basic(const seqcount_t *running,</div><div class='del'>-			struct gnet_stats_basic_packed *bstats,</div><div class='del'>-			struct gnet_stats_basic_cpu __percpu *cpu,</div><div class='del'>-			struct gnet_stats_basic_packed *b)</div><div class='add'>+static void gnet_stats_read_basic(u64 *ret_bytes, u64 *ret_packets,</div><div class='add'>+				  struct gnet_stats_basic_sync __percpu *cpu,</div><div class='add'>+				  struct gnet_stats_basic_sync *b, bool running)</div><div class='ctx'> {</div><div class='del'>-	unsigned int seq;</div><div class='add'>+	unsigned int start;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu) {</div><div class='del'>-		__gnet_stats_copy_basic_cpu(bstats, cpu);</div><div class='add'>+		u64 t_bytes = 0, t_packets = 0;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			struct gnet_stats_basic_sync *bcpu = per_cpu_ptr(cpu, i);</div><div class='add'>+			unsigned int start;</div><div class='add'>+			u64 bytes, packets;</div><div class='add'>+</div><div class='add'>+			do {</div><div class='add'>+				start = u64_stats_fetch_begin(&amp;bcpu-&gt;syncp);</div><div class='add'>+				bytes = u64_stats_read(&amp;bcpu-&gt;bytes);</div><div class='add'>+				packets = u64_stats_read(&amp;bcpu-&gt;packets);</div><div class='add'>+			} while (u64_stats_fetch_retry(&amp;bcpu-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+			t_bytes += bytes;</div><div class='add'>+			t_packets += packets;</div><div class='add'>+		}</div><div class='add'>+		*ret_bytes = t_bytes;</div><div class='add'>+		*ret_packets = t_packets;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (running)</div><div class='del'>-			seq = read_seqcount_begin(running);</div><div class='del'>-		bstats-&gt;bytes = b-&gt;bytes;</div><div class='del'>-		bstats-&gt;packets = b-&gt;packets;</div><div class='del'>-	} while (running &amp;&amp; read_seqcount_retry(running, seq));</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;b-&gt;syncp);</div><div class='add'>+		*ret_bytes = u64_stats_read(&amp;b-&gt;bytes);</div><div class='add'>+		*ret_packets = u64_stats_read(&amp;b-&gt;packets);</div><div class='add'>+	} while (running &amp;&amp; u64_stats_fetch_retry(&amp;b-&gt;syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+___gnet_stats_copy_basic(struct gnet_dump *d,</div><div class='add'>+			 struct gnet_stats_basic_sync __percpu *cpu,</div><div class='add'>+			 struct gnet_stats_basic_sync *b,</div><div class='add'>+			 int type, bool running)</div><div class='add'>+{</div><div class='add'>+	u64 bstats_bytes, bstats_packets;</div><div class='add'>+</div><div class='add'>+	gnet_stats_read_basic(&amp;bstats_bytes, &amp;bstats_packets, cpu, b, running);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;compat_tc_stats &amp;&amp; type == TCA_STATS_BASIC) {</div><div class='add'>+		d-&gt;tc_stats.bytes = bstats_bytes;</div><div class='add'>+		d-&gt;tc_stats.packets = bstats_packets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d-&gt;tail) {</div><div class='add'>+		struct gnet_stats_basic sb;</div><div class='add'>+		int res;</div><div class='add'>+</div><div class='add'>+		memset(&amp;sb, 0, sizeof(sb));</div><div class='add'>+		sb.bytes = bstats_bytes;</div><div class='add'>+		sb.packets = bstats_packets;</div><div class='add'>+		res = gnet_stats_copy(d, type, &amp;sb, sizeof(sb), TCA_STATS_PAD);</div><div class='add'>+		if (res &lt; 0 || sb.packets == bstats_packets)</div><div class='add'>+			return res;</div><div class='add'>+		/* emit 64bit stats only if needed */</div><div class='add'>+		return gnet_stats_copy(d, TCA_STATS_PKT64, &amp;bstats_packets,</div><div class='add'>+				       sizeof(bstats_packets), TCA_STATS_PAD);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__gnet_stats_copy_basic);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * gnet_stats_copy_basic - copy basic statistics into statistic TLV</div><div class='del'>- * @running: seqcount_t pointer</div><div class='ctx'>  * @d: dumping handle</div><div class='ctx'>  * @cpu: copy statistic per cpu</div><div class='ctx'>  * @b: basic statistics</div><div class='add'>+ * @running: true if @b represents a running qdisc, thus @b's</div><div class='add'>+ *           internal values might change during basic reads.</div><div class='add'>+ *           Only used if @cpu is NULL</div><div class='add'>+ *</div><div class='add'>+ * Context: task; must not be run from IRQ or BH contexts</div><div class='ctx'>  *</div><div class='ctx'>  * Appends the basic statistics to the top level TLV created by</div><div class='ctx'>  * gnet_stats_start_copy().</div><div class='hunk'>@@ -176,34 +257,43 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);</div><div class='ctx'>  * if the room in the socket buffer was not sufficient.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-gnet_stats_copy_basic(const seqcount_t *running,</div><div class='del'>-		      struct gnet_dump *d,</div><div class='del'>-		      struct gnet_stats_basic_cpu __percpu *cpu,</div><div class='del'>-		      struct gnet_stats_basic_packed *b)</div><div class='add'>+gnet_stats_copy_basic(struct gnet_dump *d,</div><div class='add'>+		      struct gnet_stats_basic_sync __percpu *cpu,</div><div class='add'>+		      struct gnet_stats_basic_sync *b,</div><div class='add'>+		      bool running)</div><div class='ctx'> {</div><div class='del'>-	struct gnet_stats_basic_packed bstats = {0};</div><div class='del'>-</div><div class='del'>-	__gnet_stats_copy_basic(running, &amp;bstats, cpu, b);</div><div class='del'>-</div><div class='del'>-	if (d-&gt;compat_tc_stats) {</div><div class='del'>-		d-&gt;tc_stats.bytes = bstats.bytes;</div><div class='del'>-		d-&gt;tc_stats.packets = bstats.packets;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d-&gt;tail) {</div><div class='del'>-		struct gnet_stats_basic sb;</div><div class='del'>-</div><div class='del'>-		memset(&amp;sb, 0, sizeof(sb));</div><div class='del'>-		sb.bytes = bstats.bytes;</div><div class='del'>-		sb.packets = bstats.packets;</div><div class='del'>-		return gnet_stats_copy(d, TCA_STATS_BASIC, &amp;sb, sizeof(sb),</div><div class='del'>-				       TCA_STATS_PAD);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ___gnet_stats_copy_basic(d, cpu, b, TCA_STATS_BASIC, running);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gnet_stats_copy_basic);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * gnet_stats_copy_basic_hw - copy basic hw statistics into statistic TLV</div><div class='add'>+ * @d: dumping handle</div><div class='add'>+ * @cpu: copy statistic per cpu</div><div class='add'>+ * @b: basic statistics</div><div class='add'>+ * @running: true if @b represents a running qdisc, thus @b's</div><div class='add'>+ *           internal values might change during basic reads.</div><div class='add'>+ *           Only used if @cpu is NULL</div><div class='add'>+ *</div><div class='add'>+ * Context: task; must not be run from IRQ or BH contexts</div><div class='add'>+ *</div><div class='add'>+ * Appends the basic statistics to the top level TLV created by</div><div class='add'>+ * gnet_stats_start_copy().</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -1 with the statistic lock released</div><div class='add'>+ * if the room in the socket buffer was not sufficient.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+gnet_stats_copy_basic_hw(struct gnet_dump *d,</div><div class='add'>+			 struct gnet_stats_basic_sync __percpu *cpu,</div><div class='add'>+			 struct gnet_stats_basic_sync *b,</div><div class='add'>+			 bool running)</div><div class='add'>+{</div><div class='add'>+	return ___gnet_stats_copy_basic(d, cpu, b, TCA_STATS_BASIC_HW, running);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gnet_stats_copy_basic_hw);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * gnet_stats_copy_rate_est - copy rate estimator statistics into statistics TLV</div><div class='ctx'>  * @d: dumping handle</div><div class='ctx'>  * @rate_est: rate estimator</div><div class='hunk'>@@ -247,16 +337,15 @@ gnet_stats_copy_rate_est(struct gnet_dump *d,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gnet_stats_copy_rate_est);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-__gnet_stats_copy_queue_cpu(struct gnet_stats_queue *qstats,</div><div class='del'>-			    const struct gnet_stats_queue __percpu *q)</div><div class='add'>+static void gnet_stats_add_queue_cpu(struct gnet_stats_queue *qstats,</div><div class='add'>+				     const struct gnet_stats_queue __percpu *q)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		const struct gnet_stats_queue *qcpu = per_cpu_ptr(q, i);</div><div class='ctx'> </div><div class='del'>-		qstats-&gt;qlen = 0;</div><div class='add'>+		qstats-&gt;qlen += qcpu-&gt;qlen;</div><div class='ctx'> 		qstats-&gt;backlog += qcpu-&gt;backlog;</div><div class='ctx'> 		qstats-&gt;drops += qcpu-&gt;drops;</div><div class='ctx'> 		qstats-&gt;requeues += qcpu-&gt;requeues;</div><div class='hunk'>@@ -264,24 +353,21 @@ __gnet_stats_copy_queue_cpu(struct gnet_stats_queue *qstats,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,</div><div class='del'>-			     const struct gnet_stats_queue __percpu *cpu,</div><div class='del'>-			     const struct gnet_stats_queue *q,</div><div class='del'>-			     __u32 qlen)</div><div class='add'>+void gnet_stats_add_queue(struct gnet_stats_queue *qstats,</div><div class='add'>+			  const struct gnet_stats_queue __percpu *cpu,</div><div class='add'>+			  const struct gnet_stats_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu) {</div><div class='del'>-		__gnet_stats_copy_queue_cpu(qstats, cpu);</div><div class='add'>+		gnet_stats_add_queue_cpu(qstats, cpu);</div><div class='ctx'> 	} else {</div><div class='del'>-		qstats-&gt;qlen = q-&gt;qlen;</div><div class='del'>-		qstats-&gt;backlog = q-&gt;backlog;</div><div class='del'>-		qstats-&gt;drops = q-&gt;drops;</div><div class='del'>-		qstats-&gt;requeues = q-&gt;requeues;</div><div class='del'>-		qstats-&gt;overlimits = q-&gt;overlimits;</div><div class='add'>+		qstats-&gt;qlen += q-&gt;qlen;</div><div class='add'>+		qstats-&gt;backlog += q-&gt;backlog;</div><div class='add'>+		qstats-&gt;drops += q-&gt;drops;</div><div class='add'>+		qstats-&gt;requeues += q-&gt;requeues;</div><div class='add'>+		qstats-&gt;overlimits += q-&gt;overlimits;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	qstats-&gt;qlen = qlen;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__gnet_stats_copy_queue);</div><div class='add'>+EXPORT_SYMBOL(gnet_stats_add_queue);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * gnet_stats_copy_queue - copy queue statistics into statistics TLV</div><div class='hunk'>@@ -304,7 +390,8 @@ gnet_stats_copy_queue(struct gnet_dump *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct gnet_stats_queue qstats = {0};</div><div class='ctx'> </div><div class='del'>-	__gnet_stats_copy_queue(&amp;qstats, cpu_q, q, qlen);</div><div class='add'>+	gnet_stats_add_queue(&amp;qstats, cpu_q, q);</div><div class='add'>+	qstats.qlen = qlen;</div><div class='ctx'> </div><div class='ctx'> 	if (d-&gt;compat_tc_stats) {</div><div class='ctx'> 		d-&gt;tc_stats.drops = qstats.drops;</div><div class='head'>diff --git a/net/core/gro.c b/net/core/gro.c<br/>new file mode 100644<br/>index 000000000000..76f9c3712422<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/gro.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/gro.c</a></div><div class='hunk'>@@ -0,0 +1,835 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;trace/events/net.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_GRO_SKBS 8</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(offload_lock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	dev_add_offload - register offload handlers</div><div class='add'>+ *	@po: protocol offload declaration</div><div class='add'>+ *</div><div class='add'>+ *	Add protocol offload handlers to the networking stack. The passed</div><div class='add'>+ *	&amp;proto_offload is linked into kernel lists and may not be freed until</div><div class='add'>+ *	it has been removed from the kernel lists.</div><div class='add'>+ *</div><div class='add'>+ *	This call does not sleep therefore it can not</div><div class='add'>+ *	guarantee all CPU's that are in middle of receiving packets</div><div class='add'>+ *	will see the new offload handlers (until the next received packet).</div><div class='add'>+ */</div><div class='add'>+void dev_add_offload(struct packet_offload *po)</div><div class='add'>+{</div><div class='add'>+	struct packet_offload *elem;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;offload_lock);</div><div class='add'>+	list_for_each_entry(elem, &amp;net_hotdata.offload_base, list) {</div><div class='add'>+		if (po-&gt;priority &lt; elem-&gt;priority)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	list_add_rcu(&amp;po-&gt;list, elem-&gt;list.prev);</div><div class='add'>+	spin_unlock(&amp;offload_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_add_offload);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__dev_remove_offload	 - remove offload handler</div><div class='add'>+ *	@po: packet offload declaration</div><div class='add'>+ *</div><div class='add'>+ *	Remove a protocol offload handler that was previously added to the</div><div class='add'>+ *	kernel offload handlers by dev_add_offload(). The passed &amp;offload_type</div><div class='add'>+ *	is removed from the kernel lists and can be freed or reused once this</div><div class='add'>+ *	function returns.</div><div class='add'>+ *</div><div class='add'>+ *      The packet type might still be in use by receivers</div><div class='add'>+ *	and must not be freed until after all the CPU's have gone</div><div class='add'>+ *	through a quiescent state.</div><div class='add'>+ */</div><div class='add'>+static void __dev_remove_offload(struct packet_offload *po)</div><div class='add'>+{</div><div class='add'>+	struct list_head *head = &amp;net_hotdata.offload_base;</div><div class='add'>+	struct packet_offload *po1;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;offload_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(po1, head, list) {</div><div class='add'>+		if (po == po1) {</div><div class='add'>+			list_del_rcu(&amp;po-&gt;list);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_warn("dev_remove_offload: %p not found\n", po);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;offload_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	dev_remove_offload	 - remove packet offload handler</div><div class='add'>+ *	@po: packet offload declaration</div><div class='add'>+ *</div><div class='add'>+ *	Remove a packet offload handler that was previously added to the kernel</div><div class='add'>+ *	offload handlers by dev_add_offload(). The passed &amp;offload_type is</div><div class='add'>+ *	removed from the kernel lists and can be freed or reused once this</div><div class='add'>+ *	function returns.</div><div class='add'>+ *</div><div class='add'>+ *	This call sleeps to guarantee that no CPU is looking at the packet</div><div class='add'>+ *	type after return.</div><div class='add'>+ */</div><div class='add'>+void dev_remove_offload(struct packet_offload *po)</div><div class='add'>+{</div><div class='add'>+	__dev_remove_offload(po);</div><div class='add'>+</div><div class='add'>+	synchronize_net();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_remove_offload);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *pinfo, *skbinfo = skb_shinfo(skb);</div><div class='add'>+	unsigned int offset = skb_gro_offset(skb);</div><div class='add'>+	unsigned int headlen = skb_headlen(skb);</div><div class='add'>+	unsigned int len = skb_gro_len(skb);</div><div class='add'>+	unsigned int delta_truesize;</div><div class='add'>+	unsigned int new_truesize;</div><div class='add'>+	struct sk_buff *lp;</div><div class='add'>+	int segs;</div><div class='add'>+</div><div class='add'>+	/* Do not splice page pool based packets w/ non-page pool</div><div class='add'>+	 * packets. This can result in reference count issues as page</div><div class='add'>+	 * pool pages will not decrement the reference count and will</div><div class='add'>+	 * instead be immediately returned to the pool or have frag</div><div class='add'>+	 * count decremented.</div><div class='add'>+	 */</div><div class='add'>+	if (p-&gt;pp_recycle != skb-&gt;pp_recycle)</div><div class='add'>+		return -ETOOMANYREFS;</div><div class='add'>+</div><div class='add'>+	if (unlikely(p-&gt;len + len &gt;= netif_get_gro_max_size(p-&gt;dev, p) ||</div><div class='add'>+		     NAPI_GRO_CB(skb)-&gt;flush))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (unlikely(p-&gt;len + len &gt;= GRO_LEGACY_MAX_SIZE)) {</div><div class='add'>+		if (NAPI_GRO_CB(skb)-&gt;proto != IPPROTO_TCP ||</div><div class='add'>+		    (p-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+		     skb_headroom(p) &lt; sizeof(struct hop_jumbo_hdr)) ||</div><div class='add'>+		    p-&gt;encapsulation)</div><div class='add'>+			return -E2BIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+	lp = NAPI_GRO_CB(p)-&gt;last;</div><div class='add'>+	pinfo = skb_shinfo(lp);</div><div class='add'>+</div><div class='add'>+	if (headlen &lt;= offset) {</div><div class='add'>+		skb_frag_t *frag;</div><div class='add'>+		skb_frag_t *frag2;</div><div class='add'>+		int i = skbinfo-&gt;nr_frags;</div><div class='add'>+		int nr_frags = pinfo-&gt;nr_frags + i;</div><div class='add'>+</div><div class='add'>+		if (nr_frags &gt; MAX_SKB_FRAGS)</div><div class='add'>+			goto merge;</div><div class='add'>+</div><div class='add'>+		offset -= headlen;</div><div class='add'>+		pinfo-&gt;nr_frags = nr_frags;</div><div class='add'>+		skbinfo-&gt;nr_frags = 0;</div><div class='add'>+</div><div class='add'>+		frag = pinfo-&gt;frags + nr_frags;</div><div class='add'>+		frag2 = skbinfo-&gt;frags + i;</div><div class='add'>+		do {</div><div class='add'>+			*--frag = *--frag2;</div><div class='add'>+		} while (--i);</div><div class='add'>+</div><div class='add'>+		skb_frag_off_add(frag, offset);</div><div class='add'>+		skb_frag_size_sub(frag, offset);</div><div class='add'>+</div><div class='add'>+		/* all fragments truesize : remove (head size + sk_buff) */</div><div class='add'>+		new_truesize = SKB_TRUESIZE(skb_end_offset(skb));</div><div class='add'>+		delta_truesize = skb-&gt;truesize - new_truesize;</div><div class='add'>+</div><div class='add'>+		skb-&gt;truesize = new_truesize;</div><div class='add'>+		skb-&gt;len -= skb-&gt;data_len;</div><div class='add'>+		skb-&gt;data_len = 0;</div><div class='add'>+</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;free = NAPI_GRO_FREE;</div><div class='add'>+		goto done;</div><div class='add'>+	} else if (skb-&gt;head_frag) {</div><div class='add'>+		int nr_frags = pinfo-&gt;nr_frags;</div><div class='add'>+		skb_frag_t *frag = pinfo-&gt;frags + nr_frags;</div><div class='add'>+		struct page *page = virt_to_head_page(skb-&gt;head);</div><div class='add'>+		unsigned int first_size = headlen - offset;</div><div class='add'>+		unsigned int first_offset;</div><div class='add'>+</div><div class='add'>+		if (nr_frags + 1 + skbinfo-&gt;nr_frags &gt; MAX_SKB_FRAGS)</div><div class='add'>+			goto merge;</div><div class='add'>+</div><div class='add'>+		first_offset = skb-&gt;data -</div><div class='add'>+			       (unsigned char *)page_address(page) +</div><div class='add'>+			       offset;</div><div class='add'>+</div><div class='add'>+		pinfo-&gt;nr_frags = nr_frags + 1 + skbinfo-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+		skb_frag_fill_page_desc(frag, page, first_offset, first_size);</div><div class='add'>+</div><div class='add'>+		memcpy(frag + 1, skbinfo-&gt;frags, sizeof(*frag) * skbinfo-&gt;nr_frags);</div><div class='add'>+		/* We dont need to clear skbinfo-&gt;nr_frags here */</div><div class='add'>+</div><div class='add'>+		new_truesize = SKB_DATA_ALIGN(sizeof(struct sk_buff));</div><div class='add'>+		delta_truesize = skb-&gt;truesize - new_truesize;</div><div class='add'>+		skb-&gt;truesize = new_truesize;</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;free = NAPI_GRO_FREE_STOLEN_HEAD;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+merge:</div><div class='add'>+	/* sk ownership - if any - completely transferred to the aggregated packet */</div><div class='add'>+	skb-&gt;destructor = NULL;</div><div class='add'>+	skb-&gt;sk = NULL;</div><div class='add'>+	delta_truesize = skb-&gt;truesize;</div><div class='add'>+	if (offset &gt; headlen) {</div><div class='add'>+		unsigned int eat = offset - headlen;</div><div class='add'>+</div><div class='add'>+		skb_frag_off_add(&amp;skbinfo-&gt;frags[0], eat);</div><div class='add'>+		skb_frag_size_sub(&amp;skbinfo-&gt;frags[0], eat);</div><div class='add'>+		skb-&gt;data_len -= eat;</div><div class='add'>+		skb-&gt;len -= eat;</div><div class='add'>+		offset = headlen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, offset);</div><div class='add'>+</div><div class='add'>+	if (NAPI_GRO_CB(p)-&gt;last == p)</div><div class='add'>+		skb_shinfo(p)-&gt;frag_list = skb;</div><div class='add'>+	else</div><div class='add'>+		NAPI_GRO_CB(p)-&gt;last-&gt;next = skb;</div><div class='add'>+	NAPI_GRO_CB(p)-&gt;last = skb;</div><div class='add'>+	__skb_header_release(skb);</div><div class='add'>+	lp = p;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	NAPI_GRO_CB(p)-&gt;count += segs;</div><div class='add'>+	p-&gt;data_len += len;</div><div class='add'>+	p-&gt;truesize += delta_truesize;</div><div class='add'>+	p-&gt;len += len;</div><div class='add'>+	if (lp != p) {</div><div class='add'>+		lp-&gt;data_len += len;</div><div class='add'>+		lp-&gt;truesize += delta_truesize;</div><div class='add'>+		lp-&gt;len += len;</div><div class='add'>+	}</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;same_flow = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(p-&gt;len + skb-&gt;len &gt;= 65536))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (NAPI_GRO_CB(p)-&gt;last == p)</div><div class='add'>+		skb_shinfo(p)-&gt;frag_list = skb;</div><div class='add'>+	else</div><div class='add'>+		NAPI_GRO_CB(p)-&gt;last-&gt;next = skb;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, skb_gro_offset(skb));</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(p)-&gt;last = skb;</div><div class='add'>+	NAPI_GRO_CB(p)-&gt;count++;</div><div class='add'>+	p-&gt;data_len += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* sk ownership - if any - completely transferred to the aggregated packet */</div><div class='add'>+	skb-&gt;destructor = NULL;</div><div class='add'>+	skb-&gt;sk = NULL;</div><div class='add'>+	p-&gt;truesize += skb-&gt;truesize;</div><div class='add'>+	p-&gt;len += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;same_flow = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gro_complete(struct gro_node *gro, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct list_head *head = &amp;net_hotdata.offload_base;</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+	__be16 type = skb-&gt;protocol;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct napi_gro_cb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;count == 1) {</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_size = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ptype, head, list) {</div><div class='add'>+		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_complete)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = INDIRECT_CALL_INET(ptype-&gt;callbacks.gro_complete,</div><div class='add'>+					 ipv6_gro_complete, inet_gro_complete,</div><div class='add'>+					 skb, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		WARN_ON(&amp;ptype-&gt;list == head);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	gro_normal_one(gro, skb, NAPI_GRO_CB(skb)-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __gro_flush_chain(struct gro_node *gro, u32 index, bool flush_old)</div><div class='add'>+{</div><div class='add'>+	struct list_head *head = &amp;gro-&gt;hash[index].list;</div><div class='add'>+	struct sk_buff *skb, *p;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(skb, p, head, list) {</div><div class='add'>+		if (flush_old &amp;&amp; NAPI_GRO_CB(skb)-&gt;age == jiffies)</div><div class='add'>+			return;</div><div class='add'>+		skb_list_del_init(skb);</div><div class='add'>+		gro_complete(gro, skb);</div><div class='add'>+		gro-&gt;hash[index].count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gro-&gt;hash[index].count)</div><div class='add'>+		__clear_bit(index, &amp;gro-&gt;bitmask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gro-&gt;hash[].list contains packets ordered by age.</div><div class='add'>+ * youngest packets at the head of it.</div><div class='add'>+ * Complete skbs in reverse order to reduce latencies.</div><div class='add'>+ */</div><div class='add'>+void __gro_flush(struct gro_node *gro, bool flush_old)</div><div class='add'>+{</div><div class='add'>+	unsigned long bitmask = gro-&gt;bitmask;</div><div class='add'>+	unsigned int i, base = ~0U;</div><div class='add'>+</div><div class='add'>+	while ((i = ffs(bitmask)) != 0) {</div><div class='add'>+		bitmask &gt;&gt;= i;</div><div class='add'>+		base += i;</div><div class='add'>+		__gro_flush_chain(gro, base, flush_old);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__gro_flush);</div><div class='add'>+</div><div class='add'>+static unsigned long gro_list_prepare_tc_ext(const struct sk_buff *skb,</div><div class='add'>+					     const struct sk_buff *p,</div><div class='add'>+					     unsigned long diffs)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)</div><div class='add'>+	struct tc_skb_ext *skb_ext;</div><div class='add'>+	struct tc_skb_ext *p_ext;</div><div class='add'>+</div><div class='add'>+	skb_ext = skb_ext_find(skb, TC_SKB_EXT);</div><div class='add'>+	p_ext = skb_ext_find(p, TC_SKB_EXT);</div><div class='add'>+</div><div class='add'>+	diffs |= (!!p_ext) ^ (!!skb_ext);</div><div class='add'>+	if (!diffs &amp;&amp; unlikely(skb_ext))</div><div class='add'>+		diffs |= p_ext-&gt;chain ^ skb_ext-&gt;chain;</div><div class='add'>+#endif</div><div class='add'>+	return diffs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gro_list_prepare(const struct list_head *head,</div><div class='add'>+			     const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int maclen = skb-&gt;dev-&gt;hard_header_len;</div><div class='add'>+	u32 hash = skb_get_hash_raw(skb);</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, head, list) {</div><div class='add'>+		unsigned long diffs;</div><div class='add'>+</div><div class='add'>+		if (hash != skb_get_hash_raw(p)) {</div><div class='add'>+			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		diffs = (unsigned long)p-&gt;dev ^ (unsigned long)skb-&gt;dev;</div><div class='add'>+		diffs |= p-&gt;vlan_all ^ skb-&gt;vlan_all;</div><div class='add'>+		diffs |= skb_metadata_differs(p, skb);</div><div class='add'>+		if (maclen == ETH_HLEN)</div><div class='add'>+			diffs |= compare_ether_header(skb_mac_header(p),</div><div class='add'>+						      skb_mac_header(skb));</div><div class='add'>+		else if (!diffs)</div><div class='add'>+			diffs = memcmp(skb_mac_header(p),</div><div class='add'>+				       skb_mac_header(skb),</div><div class='add'>+				       maclen);</div><div class='add'>+</div><div class='add'>+		/* in most common scenarios 'slow_gro' is 0</div><div class='add'>+		 * otherwise we are already on some slower paths</div><div class='add'>+		 * either skip all the infrequent tests altogether or</div><div class='add'>+		 * avoid trying too hard to skip each of them individually</div><div class='add'>+		 */</div><div class='add'>+		if (!diffs &amp;&amp; unlikely(skb-&gt;slow_gro | p-&gt;slow_gro)) {</div><div class='add'>+			diffs |= p-&gt;sk != skb-&gt;sk;</div><div class='add'>+			diffs |= skb_metadata_dst_cmp(p, skb);</div><div class='add'>+			diffs |= skb_get_nfct(p) ^ skb_get_nfct(skb);</div><div class='add'>+</div><div class='add'>+			diffs |= gro_list_prepare_tc_ext(skb, p, diffs);</div><div class='add'>+			diffs |= __psp_skb_coalesce_diff(skb, p, diffs);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		NAPI_GRO_CB(p)-&gt;same_flow = !diffs;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)</div><div class='add'>+{</div><div class='add'>+	const struct skb_shared_info *pinfo;</div><div class='add'>+	const skb_frag_t *frag0;</div><div class='add'>+	unsigned int headlen;</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;network_offset = 0;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;data_offset = 0;</div><div class='add'>+	headlen = skb_headlen(skb);</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;frag0 = skb-&gt;data;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;frag0_len = headlen;</div><div class='add'>+	if (headlen)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pinfo = skb_shinfo(skb);</div><div class='add'>+	frag0 = &amp;pinfo-&gt;frags[0];</div><div class='add'>+</div><div class='add'>+	if (pinfo-&gt;nr_frags &amp;&amp; skb_frag_page(frag0) &amp;&amp;</div><div class='add'>+	    !PageHighMem(skb_frag_page(frag0)) &amp;&amp;</div><div class='add'>+	    (!NET_IP_ALIGN || !((skb_frag_off(frag0) + nhoff) &amp; 3))) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;frag0 = skb_frag_address(frag0);</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;frag0_len = min_t(unsigned int,</div><div class='add'>+						    skb_frag_size(frag0),</div><div class='add'>+						    skb-&gt;end - skb-&gt;tail);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gro_pull_from_frag0(struct sk_buff *skb, int grow)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *pinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	BUG_ON(skb-&gt;end - skb-&gt;tail &lt; grow);</div><div class='add'>+</div><div class='add'>+	memcpy(skb_tail_pointer(skb), NAPI_GRO_CB(skb)-&gt;frag0, grow);</div><div class='add'>+</div><div class='add'>+	skb-&gt;data_len -= grow;</div><div class='add'>+	skb-&gt;tail += grow;</div><div class='add'>+</div><div class='add'>+	skb_frag_off_add(&amp;pinfo-&gt;frags[0], grow);</div><div class='add'>+	skb_frag_size_sub(&amp;pinfo-&gt;frags[0], grow);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb_frag_size(&amp;pinfo-&gt;frags[0]))) {</div><div class='add'>+		skb_frag_unref(skb, 0);</div><div class='add'>+		memmove(pinfo-&gt;frags, pinfo-&gt;frags + 1,</div><div class='add'>+			--pinfo-&gt;nr_frags * sizeof(pinfo-&gt;frags[0]));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gro_try_pull_from_frag0(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int grow = skb_gro_offset(skb) - skb_headlen(skb);</div><div class='add'>+</div><div class='add'>+	if (grow &gt; 0)</div><div class='add'>+		gro_pull_from_frag0(skb, grow);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gro_flush_oldest(struct gro_node *gro, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *oldest;</div><div class='add'>+</div><div class='add'>+	oldest = list_last_entry(head, struct sk_buff, list);</div><div class='add'>+</div><div class='add'>+	/* We are called with head length &gt;= MAX_GRO_SKBS, so this is</div><div class='add'>+	 * impossible.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!oldest))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Do not adjust napi-&gt;gro_hash[].count, caller is adding a new</div><div class='add'>+	 * SKB to the chain.</div><div class='add'>+	 */</div><div class='add'>+	skb_list_del_init(oldest);</div><div class='add'>+	gro_complete(gro, oldest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum gro_result dev_gro_receive(struct gro_node *gro,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 bucket = skb_get_hash_raw(skb) &amp; (GRO_HASH_BUCKETS - 1);</div><div class='add'>+	struct list_head *head = &amp;net_hotdata.offload_base;</div><div class='add'>+	struct gro_list *gro_list = &amp;gro-&gt;hash[bucket];</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+	__be16 type = skb-&gt;protocol;</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	enum gro_result ret;</div><div class='add'>+	int same_flow;</div><div class='add'>+</div><div class='add'>+	if (netif_elide_gro(skb-&gt;dev))</div><div class='add'>+		goto normal;</div><div class='add'>+</div><div class='add'>+	gro_list_prepare(&amp;gro_list-&gt;list, skb);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ptype, head, list) {</div><div class='add'>+		if (ptype-&gt;type == type &amp;&amp; ptype-&gt;callbacks.gro_receive)</div><div class='add'>+			goto found_ptype;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	goto normal;</div><div class='add'>+</div><div class='add'>+found_ptype:</div><div class='add'>+	skb_set_network_header(skb, skb_gro_offset(skb));</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+	BUILD_BUG_ON(sizeof_field(struct napi_gro_cb, zeroed) != sizeof(u32));</div><div class='add'>+	BUILD_BUG_ON(!IS_ALIGNED(offsetof(struct napi_gro_cb, zeroed),</div><div class='add'>+					sizeof(u32))); /* Avoid slow unaligned acc */</div><div class='add'>+	*(u32 *)&amp;NAPI_GRO_CB(skb)-&gt;zeroed = 0;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = skb_has_frag_list(skb);</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;count = 1;</div><div class='add'>+	if (unlikely(skb_is_gso(skb))) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;count = skb_shinfo(skb)-&gt;gso_segs;</div><div class='add'>+		/* Only support TCP and non DODGY users. */</div><div class='add'>+		if (!skb_is_gso_tcp(skb) ||</div><div class='add'>+		    (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_DODGY))</div><div class='add'>+			NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup for GRO checksum validation */</div><div class='add'>+	switch (skb-&gt;ip_summed) {</div><div class='add'>+	case CHECKSUM_COMPLETE:</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;csum = skb-&gt;csum;</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;csum_valid = 1;</div><div class='add'>+		break;</div><div class='add'>+	case CHECKSUM_UNNECESSARY:</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;csum_cnt = skb-&gt;csum_level + 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pp = INDIRECT_CALL_INET(ptype-&gt;callbacks.gro_receive,</div><div class='add'>+				ipv6_gro_receive, inet_gro_receive,</div><div class='add'>+				&amp;gro_list-&gt;list, skb);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(pp) == -EINPROGRESS) {</div><div class='add'>+		ret = GRO_CONSUMED;</div><div class='add'>+		goto ok;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	same_flow = NAPI_GRO_CB(skb)-&gt;same_flow;</div><div class='add'>+	ret = NAPI_GRO_CB(skb)-&gt;free ? GRO_MERGED_FREE : GRO_MERGED;</div><div class='add'>+</div><div class='add'>+	if (pp) {</div><div class='add'>+		skb_list_del_init(pp);</div><div class='add'>+		gro_complete(gro, pp);</div><div class='add'>+		gro_list-&gt;count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (same_flow)</div><div class='add'>+		goto ok;</div><div class='add'>+</div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;flush)</div><div class='add'>+		goto normal;</div><div class='add'>+</div><div class='add'>+	if (unlikely(gro_list-&gt;count &gt;= MAX_GRO_SKBS))</div><div class='add'>+		gro_flush_oldest(gro, &amp;gro_list-&gt;list);</div><div class='add'>+	else</div><div class='add'>+		gro_list-&gt;count++;</div><div class='add'>+</div><div class='add'>+	/* Must be called before setting NAPI_GRO_CB(skb)-&gt;{age|last} */</div><div class='add'>+	gro_try_pull_from_frag0(skb);</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;age = jiffies;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;last = skb;</div><div class='add'>+	if (!skb_is_gso(skb))</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_size = skb_gro_len(skb);</div><div class='add'>+	list_add(&amp;skb-&gt;list, &amp;gro_list-&gt;list);</div><div class='add'>+	ret = GRO_HELD;</div><div class='add'>+ok:</div><div class='add'>+	if (gro_list-&gt;count) {</div><div class='add'>+		if (!test_bit(bucket, &amp;gro-&gt;bitmask))</div><div class='add'>+			__set_bit(bucket, &amp;gro-&gt;bitmask);</div><div class='add'>+	} else if (test_bit(bucket, &amp;gro-&gt;bitmask)) {</div><div class='add'>+		__clear_bit(bucket, &amp;gro-&gt;bitmask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+normal:</div><div class='add'>+	ret = GRO_NORMAL;</div><div class='add'>+	gro_try_pull_from_frag0(skb);</div><div class='add'>+	goto ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct packet_offload *gro_find_receive_by_type(__be16 type)</div><div class='add'>+{</div><div class='add'>+	struct list_head *offload_head = &amp;net_hotdata.offload_base;</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(ptype, offload_head, list) {</div><div class='add'>+		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_receive)</div><div class='add'>+			continue;</div><div class='add'>+		return ptype;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gro_find_receive_by_type);</div><div class='add'>+</div><div class='add'>+struct packet_offload *gro_find_complete_by_type(__be16 type)</div><div class='add'>+{</div><div class='add'>+	struct list_head *offload_head = &amp;net_hotdata.offload_base;</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(ptype, offload_head, list) {</div><div class='add'>+		if (ptype-&gt;type != type || !ptype-&gt;callbacks.gro_complete)</div><div class='add'>+			continue;</div><div class='add'>+		return ptype;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gro_find_complete_by_type);</div><div class='add'>+</div><div class='add'>+static gro_result_t gro_skb_finish(struct gro_node *gro, struct sk_buff *skb,</div><div class='add'>+				   gro_result_t ret)</div><div class='add'>+{</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case GRO_NORMAL:</div><div class='add'>+		gro_normal_one(gro, skb, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case GRO_MERGED_FREE:</div><div class='add'>+		if (NAPI_GRO_CB(skb)-&gt;free == NAPI_GRO_FREE_STOLEN_HEAD)</div><div class='add'>+			napi_skb_free_stolen_head(skb);</div><div class='add'>+		else if (skb-&gt;fclone != SKB_FCLONE_UNAVAILABLE)</div><div class='add'>+			__kfree_skb(skb);</div><div class='add'>+		else</div><div class='add'>+			__napi_kfree_skb(skb, SKB_CONSUMED);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case GRO_HELD:</div><div class='add'>+	case GRO_MERGED:</div><div class='add'>+	case GRO_CONSUMED:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+gro_result_t gro_receive_skb(struct gro_node *gro, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	gro_result_t ret;</div><div class='add'>+</div><div class='add'>+	__skb_mark_napi_id(skb, gro);</div><div class='add'>+	trace_napi_gro_receive_entry(skb);</div><div class='add'>+</div><div class='add'>+	skb_gro_reset_offset(skb, 0);</div><div class='add'>+</div><div class='add'>+	ret = gro_skb_finish(gro, skb, dev_gro_receive(gro, skb));</div><div class='add'>+	trace_napi_gro_receive_exit(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gro_receive_skb);</div><div class='add'>+</div><div class='add'>+static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;pfmemalloc)) {</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__skb_pull(skb, skb_headlen(skb));</div><div class='add'>+	/* restore the reserve we had after netdev_alloc_skb_ip_align() */</div><div class='add'>+	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));</div><div class='add'>+	__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+	skb-&gt;dev = napi-&gt;dev;</div><div class='add'>+	skb-&gt;skb_iif = 0;</div><div class='add'>+</div><div class='add'>+	/* eth_type_trans() assumes pkt_type is PACKET_HOST */</div><div class='add'>+	skb-&gt;pkt_type = PACKET_HOST;</div><div class='add'>+</div><div class='add'>+	skb-&gt;encapsulation = 0;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+	shinfo-&gt;gso_type = 0;</div><div class='add'>+	shinfo-&gt;gso_size = 0;</div><div class='add'>+	shinfo-&gt;hwtstamps.hwtstamp = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;slow_gro)) {</div><div class='add'>+		skb_orphan(skb);</div><div class='add'>+		skb_ext_reset(skb);</div><div class='add'>+		nf_reset_ct(skb);</div><div class='add'>+		skb-&gt;slow_gro = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	napi-&gt;skb = skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *napi_get_frags(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = napi-&gt;skb;</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		skb = napi_alloc_skb(napi, GRO_MAX_HEAD);</div><div class='add'>+		if (skb) {</div><div class='add'>+			napi-&gt;skb = skb;</div><div class='add'>+			skb_mark_napi_id(skb, napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(napi_get_frags);</div><div class='add'>+</div><div class='add'>+static gro_result_t napi_frags_finish(struct napi_struct *napi,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      gro_result_t ret)</div><div class='add'>+{</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case GRO_NORMAL:</div><div class='add'>+	case GRO_HELD:</div><div class='add'>+		__skb_push(skb, ETH_HLEN);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+		if (ret == GRO_NORMAL)</div><div class='add'>+			gro_normal_one(&amp;napi-&gt;gro, skb, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case GRO_MERGED_FREE:</div><div class='add'>+		if (NAPI_GRO_CB(skb)-&gt;free == NAPI_GRO_FREE_STOLEN_HEAD)</div><div class='add'>+			napi_skb_free_stolen_head(skb);</div><div class='add'>+		else</div><div class='add'>+			napi_reuse_skb(napi, skb);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case GRO_MERGED:</div><div class='add'>+	case GRO_CONSUMED:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Upper GRO stack assumes network header starts at gro_offset=0</div><div class='add'>+ * Drivers could call both napi_gro_frags() and napi_gro_receive()</div><div class='add'>+ * We copy ethernet header into skb-&gt;data to have a common layout.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *napi_frags_skb(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = napi-&gt;skb;</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	unsigned int hlen = sizeof(*eth);</div><div class='add'>+</div><div class='add'>+	napi-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_gro_reset_offset(skb, hlen);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb_gro_may_pull(skb, hlen))) {</div><div class='add'>+		eth = skb_gro_header_slow(skb, hlen, 0);</div><div class='add'>+		if (unlikely(!eth)) {</div><div class='add'>+			net_warn_ratelimited("%s: dropping impossible skb from %s\n",</div><div class='add'>+					     __func__, napi-&gt;dev-&gt;name);</div><div class='add'>+			napi_reuse_skb(napi, skb);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		eth = (const struct ethhdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (NAPI_GRO_CB(skb)-&gt;frag0 != skb-&gt;data)</div><div class='add'>+			gro_pull_from_frag0(skb, hlen);</div><div class='add'>+</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;frag0 += hlen;</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;frag0_len -= hlen;</div><div class='add'>+	}</div><div class='add'>+	__skb_pull(skb, hlen);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This works because the only protocols we care about don't require</div><div class='add'>+	 * special handling.</div><div class='add'>+	 * We'll fix it up properly in napi_frags_finish()</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;protocol = eth-&gt;h_proto;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+gro_result_t napi_gro_frags(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	gro_result_t ret;</div><div class='add'>+	struct sk_buff *skb = napi_frags_skb(napi);</div><div class='add'>+</div><div class='add'>+	trace_napi_gro_frags_entry(skb);</div><div class='add'>+</div><div class='add'>+	ret = napi_frags_finish(napi, skb, dev_gro_receive(&amp;napi-&gt;gro, skb));</div><div class='add'>+	trace_napi_gro_frags_exit(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(napi_gro_frags);</div><div class='add'>+</div><div class='add'>+/* Compute the checksum from gro_offset and return the folded value</div><div class='add'>+ * after adding in any pseudo checksum.</div><div class='add'>+ */</div><div class='add'>+__sum16 __skb_gro_checksum_complete(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__wsum wsum;</div><div class='add'>+	__sum16 sum;</div><div class='add'>+</div><div class='add'>+	wsum = skb_checksum(skb, skb_gro_offset(skb), skb_gro_len(skb), 0);</div><div class='add'>+</div><div class='add'>+	/* NAPI_GRO_CB(skb)-&gt;csum holds pseudo checksum */</div><div class='add'>+	sum = csum_fold(csum_add(NAPI_GRO_CB(skb)-&gt;csum, wsum));</div><div class='add'>+	/* See comments in __skb_checksum_complete(). */</div><div class='add'>+	if (likely(!sum)) {</div><div class='add'>+		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='add'>+		    !skb-&gt;csum_complete_sw)</div><div class='add'>+			netdev_rx_csum_fault(skb-&gt;dev, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;csum = wsum;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;csum_valid = 1;</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__skb_gro_checksum_complete);</div><div class='add'>+</div><div class='add'>+void gro_init(struct gro_node *gro)</div><div class='add'>+{</div><div class='add'>+	for (u32 i = 0; i &lt; GRO_HASH_BUCKETS; i++) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;gro-&gt;hash[i].list);</div><div class='add'>+		gro-&gt;hash[i].count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gro-&gt;bitmask = 0;</div><div class='add'>+	gro-&gt;cached_napi_id = 0;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;gro-&gt;rx_list);</div><div class='add'>+	gro-&gt;rx_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gro_cleanup(struct gro_node *gro)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *n;</div><div class='add'>+</div><div class='add'>+	for (u32 i = 0; i &lt; GRO_HASH_BUCKETS; i++) {</div><div class='add'>+		list_for_each_entry_safe(skb, n, &amp;gro-&gt;hash[i].list, list)</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+		gro-&gt;hash[i].count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gro-&gt;bitmask = 0;</div><div class='add'>+	gro-&gt;cached_napi_id = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(skb, n, &amp;gro-&gt;rx_list, list)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	gro-&gt;rx_count = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/core/gro_cells.c b/net/core/gro_cells.c<br/>index 4b54e5f107c6..a725d21159a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/gro_cells.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/gro_cells.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/gro_cells.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/gro_cells.c</a></div><div class='hunk'>@@ -3,32 +3,53 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;net/gro_cells.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct gro_cell {</div><div class='ctx'> 	struct sk_buff_head	napi_skbs;</div><div class='ctx'> 	struct napi_struct	napi;</div><div class='add'>+	local_lock_t		bh_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int gro_cells_receive(struct gro_cells *gcells, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	bool have_bh_lock = false;</div><div class='ctx'> 	struct gro_cell *cell;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-	if (!gcells-&gt;cells || skb_cloned(skb) || netif_elide_gro(dev))</div><div class='del'>-		return netif_rx(skb);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (unlikely(!(dev-&gt;flags &amp; IFF_UP)))</div><div class='add'>+		goto drop;</div><div class='ctx'> </div><div class='add'>+	if (!gcells-&gt;cells || skb_cloned(skb) || netif_elide_gro(dev)) {</div><div class='add'>+		res = netif_rx(skb);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_lock_nested_bh(&amp;gcells-&gt;cells-&gt;bh_lock);</div><div class='add'>+	have_bh_lock = true;</div><div class='ctx'> 	cell = this_cpu_ptr(gcells-&gt;cells);</div><div class='ctx'> </div><div class='del'>-	if (skb_queue_len(&amp;cell-&gt;napi_skbs) &gt; netdev_max_backlog) {</div><div class='del'>-		atomic_long_inc(&amp;dev-&gt;rx_dropped);</div><div class='add'>+	if (skb_queue_len(&amp;cell-&gt;napi_skbs) &gt; READ_ONCE(net_hotdata.max_backlog)) {</div><div class='add'>+drop:</div><div class='add'>+		dev_core_stats_rx_dropped_inc(dev);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-		return NET_RX_DROP;</div><div class='add'>+		res = NET_RX_DROP;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_tail(&amp;cell-&gt;napi_skbs, skb);</div><div class='ctx'> 	if (skb_queue_len(&amp;cell-&gt;napi_skbs) == 1)</div><div class='ctx'> 		napi_schedule(&amp;cell-&gt;napi);</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='add'>+</div><div class='add'>+	res = NET_RX_SUCCESS;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	if (have_bh_lock)</div><div class='add'>+		local_unlock_nested_bh(&amp;gcells-&gt;cells-&gt;bh_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gro_cells_receive);</div><div class='ctx'> </div><div class='hunk'>@@ -40,7 +61,9 @@ static int gro_cell_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (work_done &lt; budget) {</div><div class='add'>+		__local_lock_nested_bh(&amp;cell-&gt;bh_lock);</div><div class='ctx'> 		skb = __skb_dequeue(&amp;cell-&gt;napi_skbs);</div><div class='add'>+		__local_unlock_nested_bh(&amp;cell-&gt;bh_lock);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		napi_gro_receive(napi, skb);</div><div class='hunk'>@@ -64,19 +87,34 @@ int gro_cells_init(struct gro_cells *gcells, struct net_device *dev)</div><div class='ctx'> 		struct gro_cell *cell = per_cpu_ptr(gcells-&gt;cells, i);</div><div class='ctx'> </div><div class='ctx'> 		__skb_queue_head_init(&amp;cell-&gt;napi_skbs);</div><div class='add'>+		local_lock_init(&amp;cell-&gt;bh_lock);</div><div class='ctx'> </div><div class='ctx'> 		set_bit(NAPI_STATE_NO_BUSY_POLL, &amp;cell-&gt;napi.state);</div><div class='ctx'> </div><div class='del'>-		netif_napi_add(dev, &amp;cell-&gt;napi, gro_cell_poll,</div><div class='del'>-			       NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(dev, &amp;cell-&gt;napi, gro_cell_poll);</div><div class='ctx'> 		napi_enable(&amp;cell-&gt;napi);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gro_cells_init);</div><div class='ctx'> </div><div class='add'>+struct percpu_free_defer {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	void __percpu	*ptr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void percpu_free_defer_callback(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct percpu_free_defer *defer;</div><div class='add'>+</div><div class='add'>+	defer = container_of(head, struct percpu_free_defer, rcu);</div><div class='add'>+	free_percpu(defer-&gt;ptr);</div><div class='add'>+	kfree(defer);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void gro_cells_destroy(struct gro_cells *gcells)</div><div class='ctx'> {</div><div class='add'>+	struct percpu_free_defer *defer;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!gcells-&gt;cells)</div><div class='hunk'>@@ -84,10 +122,27 @@ void gro_cells_destroy(struct gro_cells *gcells)</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		struct gro_cell *cell = per_cpu_ptr(gcells-&gt;cells, i);</div><div class='ctx'> </div><div class='del'>-		netif_napi_del(&amp;cell-&gt;napi);</div><div class='add'>+		napi_disable(&amp;cell-&gt;napi);</div><div class='add'>+		__netif_napi_del(&amp;cell-&gt;napi);</div><div class='ctx'> 		__skb_queue_purge(&amp;cell-&gt;napi_skbs);</div><div class='ctx'> 	}</div><div class='del'>-	free_percpu(gcells-&gt;cells);</div><div class='add'>+	/* We need to observe an rcu grace period before freeing -&gt;cells,</div><div class='add'>+	 * because netpoll could access dev-&gt;napi_list under rcu protection.</div><div class='add'>+	 * Try hard using call_rcu() instead of synchronize_rcu(),</div><div class='add'>+	 * because we might be called from cleanup_net(), and we</div><div class='add'>+	 * definitely do not want to block this critical task.</div><div class='add'>+	 */</div><div class='add'>+	defer = kmalloc(sizeof(*defer), GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	if (likely(defer)) {</div><div class='add'>+		defer-&gt;ptr = gcells-&gt;cells;</div><div class='add'>+		call_rcu(&amp;defer-&gt;rcu, percpu_free_defer_callback);</div><div class='add'>+	} else {</div><div class='add'>+		/* We do not hold RTNL at this point, synchronize_net()</div><div class='add'>+		 * would not be able to expedite this sync.</div><div class='add'>+		 */</div><div class='add'>+		synchronize_rcu_expedited();</div><div class='add'>+		free_percpu(gcells-&gt;cells);</div><div class='add'>+	}</div><div class='ctx'> 	gcells-&gt;cells = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gro_cells_destroy);</div><div class='head'>diff --git a/net/core/gso.c b/net/core/gso.c<br/>new file mode 100644<br/>index 000000000000..bcd156372f4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/gso.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/gso.c</a></div><div class='hunk'>@@ -0,0 +1,273 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/sctp.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	skb_eth_gso_segment - segmentation handler for ethernet protocols.</div><div class='add'>+ *	@skb: buffer to segment</div><div class='add'>+ *	@features: features for the output path (see dev-&gt;features)</div><div class='add'>+ *	@type: Ethernet Protocol ID</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb,</div><div class='add'>+				    netdev_features_t features, __be16 type)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ptype, &amp;net_hotdata.offload_base, list) {</div><div class='add'>+		if (ptype-&gt;type == type &amp;&amp; ptype-&gt;callbacks.gso_segment) {</div><div class='add'>+			segs = ptype-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_eth_gso_segment);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	skb_mac_gso_segment - mac layer segmentation handler.</div><div class='add'>+ *	@skb: buffer to segment</div><div class='add'>+ *	@features: features for the output path (see dev-&gt;features)</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,</div><div class='add'>+				    netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);</div><div class='add'>+	struct packet_offload *ptype;</div><div class='add'>+	int vlan_depth = skb-&gt;mac_len;</div><div class='add'>+	__be16 type = skb_network_protocol(skb, &amp;vlan_depth);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!type))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, vlan_depth);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(ptype, &amp;net_hotdata.offload_base, list) {</div><div class='add'>+		if (ptype-&gt;type == type &amp;&amp; ptype-&gt;callbacks.gso_segment) {</div><div class='add'>+			segs = ptype-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	__skb_push(skb, skb-&gt;data - skb_mac_header(skb));</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_mac_gso_segment);</div><div class='add'>+/* openvswitch calls this on rx path, so we need a different check.</div><div class='add'>+ */</div><div class='add'>+static bool skb_needs_check(const struct sk_buff *skb, bool tx_path)</div><div class='add'>+{</div><div class='add'>+	if (tx_path)</div><div class='add'>+		return skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+		       skb-&gt;ip_summed != CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	return skb-&gt;ip_summed == CHECKSUM_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__skb_gso_segment - Perform segmentation on skb.</div><div class='add'>+ *	@skb: buffer to segment</div><div class='add'>+ *	@features: features for the output path (see dev-&gt;features)</div><div class='add'>+ *	@tx_path: whether it is called in TX path</div><div class='add'>+ *</div><div class='add'>+ *	This function segments the given skb and returns a list of segments.</div><div class='add'>+ *</div><div class='add'>+ *	It may return NULL if the skb requires no segmentation.  This is</div><div class='add'>+ *	only possible when GSO is used for verifying header integrity.</div><div class='add'>+ *</div><div class='add'>+ *	Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb.</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *__skb_gso_segment(struct sk_buff *skb,</div><div class='add'>+				  netdev_features_t features, bool tx_path)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *segs;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_needs_check(skb, tx_path))) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/* We're going to init -&gt;check field in TCP or UDP header */</div><div class='add'>+		err = skb_cow_head(skb, 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only report GSO partial support if it will enable us to</div><div class='add'>+	 * support segmentation on this frame without needing additional</div><div class='add'>+	 * work.</div><div class='add'>+	 */</div><div class='add'>+	if (features &amp; NETIF_F_GSO_PARTIAL) {</div><div class='add'>+		netdev_features_t partial_features = NETIF_F_GSO_ROBUST;</div><div class='add'>+		struct net_device *dev = skb-&gt;dev;</div><div class='add'>+</div><div class='add'>+		partial_features |= dev-&gt;features &amp; dev-&gt;gso_partial_features;</div><div class='add'>+		if (!skb_gso_ok(skb, features | partial_features))</div><div class='add'>+			features &amp;= ~NETIF_F_GSO_PARTIAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(SKB_GSO_CB_OFFSET +</div><div class='add'>+		     sizeof(*SKB_GSO_CB(skb)) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	SKB_GSO_CB(skb)-&gt;mac_offset = skb_headroom(skb);</div><div class='add'>+	SKB_GSO_CB(skb)-&gt;encap_level = 0;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	segs = skb_mac_gso_segment(skb, features);</div><div class='add'>+</div><div class='add'>+	if (segs != skb &amp;&amp; unlikely(skb_needs_check(skb, tx_path) &amp;&amp; !IS_ERR(segs)))</div><div class='add'>+		skb_warn_bad_offload(skb);</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__skb_gso_segment);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_transport_seglen - Return length of individual segments of a gso packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ *</div><div class='add'>+ * skb_gso_transport_seglen is used to determine the real size of the</div><div class='add'>+ * individual segments, including Layer4 headers (TCP/UDP).</div><div class='add'>+ *</div><div class='add'>+ * The MAC/L2 or network (IP, IPv6) headers are not accounted for.</div><div class='add'>+ */</div><div class='add'>+static unsigned int skb_gso_transport_seglen(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+	unsigned int thlen = 0;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;encapsulation) {</div><div class='add'>+		thlen = skb_inner_transport_header(skb) -</div><div class='add'>+			skb_transport_header(skb);</div><div class='add'>+</div><div class='add'>+		if (likely(shinfo-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))</div><div class='add'>+			thlen += inner_tcp_hdrlen(skb);</div><div class='add'>+	} else if (likely(shinfo-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {</div><div class='add'>+		thlen = tcp_hdrlen(skb);</div><div class='add'>+	} else if (unlikely(skb_is_gso_sctp(skb))) {</div><div class='add'>+		thlen = sizeof(struct sctphdr);</div><div class='add'>+	} else if (shinfo-&gt;gso_type &amp; SKB_GSO_UDP_L4) {</div><div class='add'>+		thlen = sizeof(struct udphdr);</div><div class='add'>+	}</div><div class='add'>+	/* UFO sets gso_size to the size of the fragmentation</div><div class='add'>+	 * payload, i.e. the size of the L4 (UDP) header is already</div><div class='add'>+	 * accounted for.</div><div class='add'>+	 */</div><div class='add'>+	return thlen + shinfo-&gt;gso_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_network_seglen - Return length of individual segments of a gso packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ *</div><div class='add'>+ * skb_gso_network_seglen is used to determine the real size of the</div><div class='add'>+ * individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP).</div><div class='add'>+ *</div><div class='add'>+ * The MAC/L2 header is not accounted for.</div><div class='add'>+ */</div><div class='add'>+static unsigned int skb_gso_network_seglen(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int hdr_len = skb_transport_header(skb) -</div><div class='add'>+			       skb_network_header(skb);</div><div class='add'>+</div><div class='add'>+	return hdr_len + skb_gso_transport_seglen(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_mac_seglen - Return length of individual segments of a gso packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ *</div><div class='add'>+ * skb_gso_mac_seglen is used to determine the real size of the</div><div class='add'>+ * individual segments, including MAC/L2, Layer3 (IP, IPv6) and L4</div><div class='add'>+ * headers (TCP/UDP).</div><div class='add'>+ */</div><div class='add'>+static unsigned int skb_gso_mac_seglen(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int hdr_len = skb_transport_header(skb) - skb_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	return hdr_len + skb_gso_transport_seglen(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_size_check - check the skb size, considering GSO_BY_FRAGS</div><div class='add'>+ *</div><div class='add'>+ * There are a couple of instances where we have a GSO skb, and we</div><div class='add'>+ * want to determine what size it would be after it is segmented.</div><div class='add'>+ *</div><div class='add'>+ * We might want to check:</div><div class='add'>+ * -    L3+L4+payload size (e.g. IP forwarding)</div><div class='add'>+ * - L2+L3+L4+payload size (e.g. sanity check before passing to driver)</div><div class='add'>+ *</div><div class='add'>+ * This is a helper to do that correctly considering GSO_BY_FRAGS.</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ *</div><div class='add'>+ * @seg_len: The segmented length (from skb_gso_*_seglen). In the</div><div class='add'>+ *           GSO_BY_FRAGS case this will be [header sizes + GSO_BY_FRAGS].</div><div class='add'>+ *</div><div class='add'>+ * @max_len: The maximum permissible length.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the segmented length &lt;= max length.</div><div class='add'>+ */</div><div class='add'>+static inline bool skb_gso_size_check(const struct sk_buff *skb,</div><div class='add'>+				      unsigned int seg_len,</div><div class='add'>+				      unsigned int max_len) {</div><div class='add'>+	const struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+	const struct sk_buff *iter;</div><div class='add'>+</div><div class='add'>+	if (shinfo-&gt;gso_size != GSO_BY_FRAGS)</div><div class='add'>+		return seg_len &lt;= max_len;</div><div class='add'>+</div><div class='add'>+	/* Undo this so we can re-use header sizes */</div><div class='add'>+	seg_len -= GSO_BY_FRAGS;</div><div class='add'>+</div><div class='add'>+	skb_walk_frags(skb, iter) {</div><div class='add'>+		if (seg_len + skb_headlen(iter) &gt; max_len)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_validate_network_len - Will a split GSO skb fit into a given MTU?</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ * @mtu: MTU to validate against</div><div class='add'>+ *</div><div class='add'>+ * skb_gso_validate_network_len validates if a given skb will fit a</div><div class='add'>+ * wanted MTU once split. It considers L3 headers, L4 headers, and the</div><div class='add'>+ * payload.</div><div class='add'>+ */</div><div class='add'>+bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu)</div><div class='add'>+{</div><div class='add'>+	return skb_gso_size_check(skb, skb_gso_network_seglen(skb), mtu);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_gso_validate_network_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_gso_validate_mac_len - Will a split GSO skb fit in a given length?</div><div class='add'>+ *</div><div class='add'>+ * @skb: GSO skb</div><div class='add'>+ * @len: length to validate against</div><div class='add'>+ *</div><div class='add'>+ * skb_gso_validate_mac_len validates if a given skb will fit a wanted</div><div class='add'>+ * length once split, including L2, L3 and L4 headers and the payload.</div><div class='add'>+ */</div><div class='add'>+bool skb_gso_validate_mac_len(const struct sk_buff *skb, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return skb_gso_size_check(skb, skb_gso_mac_seglen(skb), len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_gso_validate_mac_len);</div><div class='add'>+</div><div class='head'>diff --git a/net/core/hotdata.c b/net/core/hotdata.c<br/>new file mode 100644<br/>index 000000000000..dddd5c287cf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/hotdata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/hotdata.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='add'>+</div><div class='add'>+struct net_hotdata net_hotdata __cacheline_aligned = {</div><div class='add'>+	.offload_base = LIST_HEAD_INIT(net_hotdata.offload_base),</div><div class='add'>+	.gro_normal_batch = 8,</div><div class='add'>+</div><div class='add'>+	.netdev_budget = 300,</div><div class='add'>+	/* Must be at least 2 jiffes to guarantee 1 jiffy timeout */</div><div class='add'>+	.netdev_budget_usecs = 2 * USEC_PER_SEC / HZ,</div><div class='add'>+</div><div class='add'>+	.tstamp_prequeue = 1,</div><div class='add'>+	.max_backlog = 1000,</div><div class='add'>+	.dev_tx_weight = 64,</div><div class='add'>+	.dev_rx_weight = 64,</div><div class='add'>+	.sysctl_max_skb_frags = MAX_SKB_FRAGS,</div><div class='add'>+	.sysctl_skb_defer_max = 128,</div><div class='add'>+	.sysctl_mem_pcpu_rsv = SK_MEMORY_PCPU_RESERVE</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(net_hotdata);</div><div class='add'>+</div><div class='add'>+struct net_aligned_data net_aligned_data;</div><div class='add'>+EXPORT_IPV6_MOD(net_aligned_data);</div><div class='head'>diff --git a/net/core/hwbm.c b/net/core/hwbm.c<br/>index 2cab489ae62e..ac1a66df9adc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/hwbm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/hwbm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/hwbm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/hwbm.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* Support for hardware buffer manager.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016 Marvell</div><div class='ctx'>  *</div><div class='ctx'>  * Gregory CLEMENT &lt;gregory.clement@free-electrons.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='hunk'>@@ -47,34 +43,33 @@ int hwbm_pool_refill(struct hwbm_pool *bm_pool, gfp_t gfp)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hwbm_pool_refill);</div><div class='ctx'> </div><div class='del'>-int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num, gfp_t gfp)</div><div class='add'>+int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;bm_pool-&gt;lock, flags);</div><div class='add'>+	mutex_lock(&amp;bm_pool-&gt;buf_lock);</div><div class='ctx'> 	if (bm_pool-&gt;buf_num == bm_pool-&gt;size) {</div><div class='ctx'> 		pr_warn("pool already filled\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;bm_pool-&gt;lock, flags);</div><div class='add'>+		mutex_unlock(&amp;bm_pool-&gt;buf_lock);</div><div class='ctx'> 		return bm_pool-&gt;buf_num;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (buf_num + bm_pool-&gt;buf_num &gt; bm_pool-&gt;size) {</div><div class='ctx'> 		pr_warn("cannot allocate %d buffers for pool\n",</div><div class='ctx'> 			buf_num);</div><div class='del'>-		spin_unlock_irqrestore(&amp;bm_pool-&gt;lock, flags);</div><div class='add'>+		mutex_unlock(&amp;bm_pool-&gt;buf_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((buf_num + bm_pool-&gt;buf_num) &lt; bm_pool-&gt;buf_num) {</div><div class='ctx'> 		pr_warn("Adding %d buffers to the %d current buffers will overflow\n",</div><div class='ctx'> 			buf_num,  bm_pool-&gt;buf_num);</div><div class='del'>-		spin_unlock_irqrestore(&amp;bm_pool-&gt;lock, flags);</div><div class='add'>+		mutex_unlock(&amp;bm_pool-&gt;buf_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; buf_num; i++) {</div><div class='del'>-		err = hwbm_pool_refill(bm_pool, gfp);</div><div class='add'>+		err = hwbm_pool_refill(bm_pool, GFP_KERNEL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -83,7 +78,7 @@ int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num, gfp_t gfp)</div><div class='ctx'> 	bm_pool-&gt;buf_num += i;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("hwpm pool: %d of %d buffers added\n", i, buf_num);</div><div class='del'>-	spin_unlock_irqrestore(&amp;bm_pool-&gt;lock, flags);</div><div class='add'>+	mutex_unlock(&amp;bm_pool-&gt;buf_lock);</div><div class='ctx'> </div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/ieee8021q_helpers.c b/net/core/ieee8021q_helpers.c<br/>new file mode 100644<br/>index 000000000000..669b357b73b2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/ieee8021q_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/ieee8021q_helpers.c</a></div><div class='hunk'>@@ -0,0 +1,224 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2024 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/dscp.h&gt;</div><div class='add'>+#include &lt;net/ieee8021q.h&gt;</div><div class='add'>+</div><div class='add'>+/* verify that table covers all 8 traffic types */</div><div class='add'>+#define TT_MAP_SIZE_OK(tbl)                                 \</div><div class='add'>+	compiletime_assert(ARRAY_SIZE(tbl) == IEEE8021Q_TT_MAX, \</div><div class='add'>+			   #tbl " size mismatch")</div><div class='add'>+</div><div class='add'>+/* The following arrays map Traffic Types (TT) to traffic classes (TC) for</div><div class='add'>+ * different number of queues as shown in the example provided by</div><div class='add'>+ * IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic class mapping" and</div><div class='add'>+ * Table I-1 "Traffic type to traffic class mapping".</div><div class='add'>+ */</div><div class='add'>+static const u8 ieee8021q_8queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0,</div><div class='add'>+	[IEEE8021Q_TT_BE] = 1,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 2,</div><div class='add'>+	[IEEE8021Q_TT_CA] = 3,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 4,</div><div class='add'>+	[IEEE8021Q_TT_VO] = 5,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 6,</div><div class='add'>+	[IEEE8021Q_TT_NC] = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_7queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0,</div><div class='add'>+	[IEEE8021Q_TT_BE] = 1,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 2,</div><div class='add'>+	[IEEE8021Q_TT_CA] = 3,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 4,	[IEEE8021Q_TT_VO] = 4,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 5,</div><div class='add'>+	[IEEE8021Q_TT_NC] = 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_6queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0,</div><div class='add'>+	[IEEE8021Q_TT_BE] = 1,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 2,	[IEEE8021Q_TT_CA] = 2,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 3,	[IEEE8021Q_TT_VO] = 3,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 4,</div><div class='add'>+	[IEEE8021Q_TT_NC] = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_5queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 1, [IEEE8021Q_TT_CA] = 1,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 2, [IEEE8021Q_TT_VO] = 2,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 3,</div><div class='add'>+	[IEEE8021Q_TT_NC] = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_4queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 1, [IEEE8021Q_TT_CA] = 1,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 2, [IEEE8021Q_TT_VO] = 2,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 3, [IEEE8021Q_TT_NC] = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_3queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 1, [IEEE8021Q_TT_VO] = 1,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 2, [IEEE8021Q_TT_NC] = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_2queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 1, [IEEE8021Q_TT_VO] = 1,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 1, [IEEE8021Q_TT_NC] = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ieee8021q_1queue_tt_tc_map[] = {</div><div class='add'>+	[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,</div><div class='add'>+	[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,</div><div class='add'>+	[IEEE8021Q_TT_VI] = 0, [IEEE8021Q_TT_VO] = 0,</div><div class='add'>+	[IEEE8021Q_TT_IC] = 0, [IEEE8021Q_TT_NC] = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee8021q_tt_to_tc - Map IEEE 802.1Q Traffic Type to Traffic Class</div><div class='add'>+ * @tt: IEEE 802.1Q Traffic Type</div><div class='add'>+ * @num_queues: Number of queues</div><div class='add'>+ *</div><div class='add'>+ * This function maps an IEEE 802.1Q Traffic Type to a Traffic Class (TC) based</div><div class='add'>+ * on the number of queues configured on the NIC. The mapping is based on the</div><div class='add'>+ * example provided by IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic</div><div class='add'>+ * class mapping" and Table I-1 "Traffic type to traffic class mapping".</div><div class='add'>+ *</div><div class='add'>+ * Return: Traffic Class corresponding to the given Traffic Type or negative</div><div class='add'>+ * value in case of error.</div><div class='add'>+ */</div><div class='add'>+int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt, unsigned int num_queues)</div><div class='add'>+{</div><div class='add'>+	if (tt &lt; 0 || tt &gt;= IEEE8021Q_TT_MAX) {</div><div class='add'>+		pr_err("Requested Traffic Type (%d) is out of range (%d)\n", tt,</div><div class='add'>+		       IEEE8021Q_TT_MAX);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (num_queues) {</div><div class='add'>+	case 8:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_8queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_8queue_tt_tc_map[tt];</div><div class='add'>+	case 7:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_7queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_7queue_tt_tc_map[tt];</div><div class='add'>+	case 6:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_6queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_6queue_tt_tc_map[tt];</div><div class='add'>+	case 5:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_5queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_5queue_tt_tc_map[tt];</div><div class='add'>+	case 4:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_4queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_4queue_tt_tc_map[tt];</div><div class='add'>+	case 3:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_3queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_3queue_tt_tc_map[tt];</div><div class='add'>+	case 2:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_2queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_2queue_tt_tc_map[tt];</div><div class='add'>+	case 1:</div><div class='add'>+		TT_MAP_SIZE_OK(ieee8021q_1queue_tt_tc_map);</div><div class='add'>+		return ieee8021q_1queue_tt_tc_map[tt];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_err("Invalid number of queues %d\n", num_queues);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee8021q_tt_to_tc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ietf_dscp_to_ieee8021q_tt - Map IETF DSCP to IEEE 802.1Q Traffic Type</div><div class='add'>+ * @dscp: IETF DSCP value</div><div class='add'>+ *</div><div class='add'>+ * This function maps an IETF DSCP value to an IEEE 802.1Q Traffic Type (TT).</div><div class='add'>+ * Since there is no corresponding mapping between DSCP and IEEE 802.1Q Traffic</div><div class='add'>+ * Type, this function is inspired by the RFC8325 documentation which describe</div><div class='add'>+ * the mapping between DSCP and 802.11 User Priority (UP) values.</div><div class='add'>+ *</div><div class='add'>+ * Return: IEEE 802.1Q Traffic Type corresponding to the given DSCP value</div><div class='add'>+ */</div><div class='add'>+int ietf_dscp_to_ieee8021q_tt(u8 dscp)</div><div class='add'>+{</div><div class='add'>+	switch (dscp) {</div><div class='add'>+	case DSCP_CS0:</div><div class='add'>+	/* Comment from RFC8325:</div><div class='add'>+	 * [RFC4594], Section 4.8, recommends High-Throughput Data be marked</div><div class='add'>+	 * AF1x (that is, AF11, AF12, and AF13, according to the rules defined</div><div class='add'>+	 * in [RFC2475]).</div><div class='add'>+	 *</div><div class='add'>+	 * By default (as described in Section 2.3), High-Throughput Data will</div><div class='add'>+	 * map to UP 1 and, thus, to the Background Access Category (AC_BK),</div><div class='add'>+	 * which is contrary to the intent expressed in [RFC4594].</div><div class='add'>+</div><div class='add'>+	 * Unfortunately, there really is no corresponding fit for the High-</div><div class='add'>+	 * Throughput Data service class within the constrained 4 Access</div><div class='add'>+	 * Category [IEEE.802.11-2016] model.  If the High-Throughput Data</div><div class='add'>+	 * service class is assigned to the Best Effort Access Category (AC_BE),</div><div class='add'>+	 * then it would contend with Low-Latency Data (while [RFC4594]</div><div class='add'>+	 * recommends a distinction in servicing between these service classes)</div><div class='add'>+	 * as well as with the default service class; alternatively, if it is</div><div class='add'>+	 * assigned to the Background Access Category (AC_BK), then it would</div><div class='add'>+	 * receive a less-then-best-effort service and contend with Low-Priority</div><div class='add'>+	 * Data (as discussed in Section 4.2.10).</div><div class='add'>+	 *</div><div class='add'>+	 * As such, since there is no directly corresponding fit for the High-</div><div class='add'>+	 * Throughout Data service class within the [IEEE.802.11-2016] model, it</div><div class='add'>+	 * is generally RECOMMENDED to map High-Throughput Data to UP 0, thereby</div><div class='add'>+	 * admitting it to the Best Effort Access Category (AC_BE).</div><div class='add'>+	 *</div><div class='add'>+	 * Note: The above text is from RFC8325 which is describing the mapping</div><div class='add'>+	 * between DSCP and 802.11 User Priority (UP) values. The mapping</div><div class='add'>+	 * between UP and IEEE 802.1Q Traffic Type is not defined in the RFC but</div><div class='add'>+	 * the 802.11 AC_BK and AC_BE are closely related to the IEEE 802.1Q</div><div class='add'>+	 * Traffic Types BE and BK.</div><div class='add'>+	 */</div><div class='add'>+	case DSCP_AF11:</div><div class='add'>+	case DSCP_AF12:</div><div class='add'>+	case DSCP_AF13:</div><div class='add'>+		return IEEE8021Q_TT_BE;</div><div class='add'>+	/* Comment from RFC8325:</div><div class='add'>+	 * RFC3662 and RFC4594 both recommend Low-Priority Data be marked</div><div class='add'>+	 * with DSCP CS1. The Low-Priority Data service class loosely</div><div class='add'>+	 * corresponds to the [IEEE.802.11-2016] Background Access Category</div><div class='add'>+	 */</div><div class='add'>+	case DSCP_CS1:</div><div class='add'>+		return IEEE8021Q_TT_BK;</div><div class='add'>+	case DSCP_CS2:</div><div class='add'>+	case DSCP_AF21:</div><div class='add'>+	case DSCP_AF22:</div><div class='add'>+	case DSCP_AF23:</div><div class='add'>+		return IEEE8021Q_TT_EE;</div><div class='add'>+	case DSCP_CS3:</div><div class='add'>+	case DSCP_AF31:</div><div class='add'>+	case DSCP_AF32:</div><div class='add'>+	case DSCP_AF33:</div><div class='add'>+		return IEEE8021Q_TT_CA;</div><div class='add'>+	case DSCP_CS4:</div><div class='add'>+	case DSCP_AF41:</div><div class='add'>+	case DSCP_AF42:</div><div class='add'>+	case DSCP_AF43:</div><div class='add'>+		return IEEE8021Q_TT_VI;</div><div class='add'>+	case DSCP_CS5:</div><div class='add'>+	case DSCP_EF:</div><div class='add'>+	case DSCP_VOICE_ADMIT:</div><div class='add'>+		return IEEE8021Q_TT_VO;</div><div class='add'>+	case DSCP_CS6:</div><div class='add'>+		return IEEE8021Q_TT_IC;</div><div class='add'>+	case DSCP_CS7:</div><div class='add'>+		return IEEE8021Q_TT_NC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return SIMPLE_IETF_DSCP_TO_IEEE8021Q_TT(dscp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ietf_dscp_to_ieee8021q_tt);</div><div class='head'>diff --git a/net/core/link_watch.c b/net/core/link_watch.c<br/>index e38e641e98d5..212cde35affa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/link_watch.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/link_watch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/link_watch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/link_watch.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Linux network device link state notification</div><div class='ctx'>  *</div><div class='ctx'>  * Author:</div><div class='ctx'>  *     Stefan Rompf &lt;sux@loplof.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -23,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "dev.h"</div><div class='ctx'> </div><div class='ctx'> enum lw_bits {</div><div class='ctx'> 	LW_URGENT = 0,</div><div class='hunk'>@@ -37,11 +33,37 @@ static DECLARE_DELAYED_WORK(linkwatch_work, linkwatch_event);</div><div class='ctx'> static LIST_HEAD(lweventlist);</div><div class='ctx'> static DEFINE_SPINLOCK(lweventlist_lock);</div><div class='ctx'> </div><div class='del'>-static unsigned char default_operstate(const struct net_device *dev)</div><div class='add'>+static unsigned int default_operstate(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (!netif_carrier_ok(dev))</div><div class='del'>-		return (dev-&gt;ifindex != dev_get_iflink(dev) ?</div><div class='del'>-			IF_OPER_LOWERLAYERDOWN : IF_OPER_DOWN);</div><div class='add'>+	if (netif_testing(dev))</div><div class='add'>+		return IF_OPER_TESTING;</div><div class='add'>+</div><div class='add'>+	/* Some uppers (DSA) have additional sources for being down, so</div><div class='add'>+	 * first check whether lower is indeed the source of its down state.</div><div class='add'>+	 */</div><div class='add'>+	if (!netif_carrier_ok(dev)) {</div><div class='add'>+		struct net_device *peer;</div><div class='add'>+		int iflink;</div><div class='add'>+</div><div class='add'>+		/* If called from netdev_run_todo()/linkwatch_sync_dev(),</div><div class='add'>+		 * dev_net(dev) can be already freed, and RTNL is not held.</div><div class='add'>+		 */</div><div class='add'>+		if (dev-&gt;reg_state &lt;= NETREG_REGISTERED)</div><div class='add'>+			iflink = dev_get_iflink(dev);</div><div class='add'>+		else</div><div class='add'>+			iflink = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+		if (iflink == dev-&gt;ifindex)</div><div class='add'>+			return IF_OPER_DOWN;</div><div class='add'>+</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+		peer = __dev_get_by_index(dev_net(dev), iflink);</div><div class='add'>+		if (!peer)</div><div class='add'>+			return IF_OPER_DOWN;</div><div class='add'>+</div><div class='add'>+		return netif_carrier_ok(peer) ? IF_OPER_DOWN :</div><div class='add'>+						IF_OPER_LOWERLAYERDOWN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (netif_dormant(dev))</div><div class='ctx'> 		return IF_OPER_DORMANT;</div><div class='hunk'>@@ -49,37 +71,37 @@ static unsigned char default_operstate(const struct net_device *dev)</div><div class='ctx'> 	return IF_OPER_UP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void rfc2863_policy(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned char operstate = default_operstate(dev);</div><div class='add'>+	unsigned int operstate = default_operstate(dev);</div><div class='ctx'> </div><div class='del'>-	if (operstate == dev-&gt;operstate)</div><div class='add'>+	if (operstate == READ_ONCE(dev-&gt;operstate))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='del'>-</div><div class='ctx'> 	switch(dev-&gt;link_mode) {</div><div class='add'>+	case IF_LINK_MODE_TESTING:</div><div class='add'>+		if (operstate == IF_OPER_UP)</div><div class='add'>+			operstate = IF_OPER_TESTING;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case IF_LINK_MODE_DORMANT:</div><div class='ctx'> 		if (operstate == IF_OPER_UP)</div><div class='ctx'> 			operstate = IF_OPER_DORMANT;</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case IF_LINK_MODE_DEFAULT:</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;operstate = operstate;</div><div class='del'>-</div><div class='del'>-	write_unlock_bh(&amp;dev_base_lock);</div><div class='add'>+	WRITE_ONCE(dev-&gt;operstate, operstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void linkwatch_init_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Handle pre-registration link state changes */</div><div class='del'>-	if (!netif_carrier_ok(dev) || netif_dormant(dev))</div><div class='add'>+	if (!netif_carrier_ok(dev) || netif_dormant(dev) ||</div><div class='add'>+	    netif_testing(dev))</div><div class='ctx'> 		rfc2863_policy(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +128,7 @@ static void linkwatch_add_event(struct net_device *dev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;lweventlist_lock, flags);</div><div class='ctx'> 	if (list_empty(&amp;dev-&gt;link_watch_list)) {</div><div class='ctx'> 		list_add_tail(&amp;dev-&gt;link_watch_list, &amp;lweventlist);</div><div class='del'>-		dev_hold(dev);</div><div class='add'>+		netdev_hold(dev, &amp;dev-&gt;linkwatch_dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lweventlist_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -135,9 +157,9 @@ static void linkwatch_schedule_work(int urgent)</div><div class='ctx'> 	 * override the existing timer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(LW_URGENT, &amp;linkwatch_flags))</div><div class='del'>-		mod_delayed_work(system_wq, &amp;linkwatch_work, 0);</div><div class='add'>+		mod_delayed_work(system_dfl_wq, &amp;linkwatch_work, 0);</div><div class='ctx'> 	else</div><div class='del'>-		schedule_delayed_work(&amp;linkwatch_work, delay);</div><div class='add'>+		queue_delayed_work(system_dfl_wq, &amp;linkwatch_work, delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -161,16 +183,29 @@ static void linkwatch_do_dev(struct net_device *dev)</div><div class='ctx'> 		else</div><div class='ctx'> 			dev_deactivate(dev);</div><div class='ctx'> </div><div class='del'>-		netdev_state_change(dev);</div><div class='add'>+		netif_state_change(dev);</div><div class='ctx'> 	}</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	/* Note: our callers are responsible for calling netdev_tracker_free().</div><div class='add'>+	 * This is the reason we use __dev_put() instead of dev_put().</div><div class='add'>+	 */</div><div class='add'>+	__dev_put(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __linkwatch_run_queue(int urgent_only)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='add'>+#define MAX_DO_DEV_PER_LOOP	100</div><div class='add'>+</div><div class='add'>+	int do_dev = MAX_DO_DEV_PER_LOOP;</div><div class='add'>+	/* Use a local list here since we add non-urgent</div><div class='add'>+	 * events back to the global one when called with</div><div class='add'>+	 * urgent_only=1.</div><div class='add'>+	 */</div><div class='ctx'> 	LIST_HEAD(wrk);</div><div class='ctx'> </div><div class='add'>+	/* Give urgent case more budget */</div><div class='add'>+	if (urgent_only)</div><div class='add'>+		do_dev += MAX_DO_DEV_PER_LOOP;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Limit the number of linkwatch events to one</div><div class='ctx'> 	 * per second so that a runaway driver does not</div><div class='hunk'>@@ -189,40 +224,72 @@ static void __linkwatch_run_queue(int urgent_only)</div><div class='ctx'> 	spin_lock_irq(&amp;lweventlist_lock);</div><div class='ctx'> 	list_splice_init(&amp;lweventlist, &amp;wrk);</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;wrk)) {</div><div class='add'>+	while (!list_empty(&amp;wrk) &amp;&amp; do_dev &gt; 0) {</div><div class='add'>+		struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 		dev = list_first_entry(&amp;wrk, struct net_device, link_watch_list);</div><div class='ctx'> 		list_del_init(&amp;dev-&gt;link_watch_list);</div><div class='ctx'> </div><div class='del'>-		if (urgent_only &amp;&amp; !linkwatch_urgent_event(dev)) {</div><div class='add'>+		if (!netif_device_present(dev) ||</div><div class='add'>+		    (urgent_only &amp;&amp; !linkwatch_urgent_event(dev))) {</div><div class='ctx'> 			list_add_tail(&amp;dev-&gt;link_watch_list, &amp;lweventlist);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+		/* We must free netdev tracker under</div><div class='add'>+		 * the spinlock protection.</div><div class='add'>+		 */</div><div class='add'>+		netdev_tracker_free(dev, &amp;dev-&gt;linkwatch_dev_tracker);</div><div class='ctx'> 		spin_unlock_irq(&amp;lweventlist_lock);</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='ctx'> 		linkwatch_do_dev(dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		do_dev--;</div><div class='ctx'> 		spin_lock_irq(&amp;lweventlist_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Add the remaining work back to lweventlist */</div><div class='add'>+	list_splice_init(&amp;wrk, &amp;lweventlist);</div><div class='add'>+</div><div class='ctx'> 	if (!list_empty(&amp;lweventlist))</div><div class='ctx'> 		linkwatch_schedule_work(0);</div><div class='ctx'> 	spin_unlock_irq(&amp;lweventlist_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void linkwatch_forget_dev(struct net_device *dev)</div><div class='add'>+static bool linkwatch_clean_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int clean = 0;</div><div class='add'>+	bool clean = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lweventlist_lock, flags);</div><div class='ctx'> 	if (!list_empty(&amp;dev-&gt;link_watch_list)) {</div><div class='ctx'> 		list_del_init(&amp;dev-&gt;link_watch_list);</div><div class='del'>-		clean = 1;</div><div class='add'>+		clean = true;</div><div class='add'>+		/* We must release netdev tracker under</div><div class='add'>+		 * the spinlock protection.</div><div class='add'>+		 */</div><div class='add'>+		netdev_tracker_free(dev, &amp;dev-&gt;linkwatch_dev_tracker);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lweventlist_lock, flags);</div><div class='del'>-	if (clean)</div><div class='add'>+</div><div class='add'>+	return clean;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __linkwatch_sync_dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	if (linkwatch_clean_dev(dev))</div><div class='ctx'> 		linkwatch_do_dev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void linkwatch_sync_dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (linkwatch_clean_dev(dev)) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		linkwatch_do_dev(dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Must be called with the rtnl semaphore held */</div><div class='ctx'> void linkwatch_run_queue(void)</div><div class='head'>diff --git a/net/core/lock_debug.c b/net/core/lock_debug.c<br/>new file mode 100644<br/>index 000000000000..9e9fb25314b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/lock_debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/lock_debug.c</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Copyright Amazon.com Inc. or its affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='add'>+</div><div class='add'>+int netdev_debug_event(struct notifier_block *nb, unsigned long event,</div><div class='add'>+		       void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	enum netdev_cmd cmd = event;</div><div class='add'>+</div><div class='add'>+	/* Keep enum and don't add default to trigger -Werror=switch */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case NETDEV_XDP_FEAT_CHANGE:</div><div class='add'>+		netdev_assert_locked(dev);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+	case NETDEV_REGISTER:</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		netdev_ops_assert_locked(dev);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+	case NETDEV_REBOOT:</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+	case NETDEV_CHANGEMTU:</div><div class='add'>+	case NETDEV_CHANGEADDR:</div><div class='add'>+	case NETDEV_PRE_CHANGEADDR:</div><div class='add'>+	case NETDEV_GOING_DOWN:</div><div class='add'>+	case NETDEV_FEAT_CHANGE:</div><div class='add'>+	case NETDEV_BONDING_FAILOVER:</div><div class='add'>+	case NETDEV_PRE_UP:</div><div class='add'>+	case NETDEV_PRE_TYPE_CHANGE:</div><div class='add'>+	case NETDEV_POST_TYPE_CHANGE:</div><div class='add'>+	case NETDEV_POST_INIT:</div><div class='add'>+	case NETDEV_PRE_UNINIT:</div><div class='add'>+	case NETDEV_RELEASE:</div><div class='add'>+	case NETDEV_NOTIFY_PEERS:</div><div class='add'>+	case NETDEV_JOIN:</div><div class='add'>+	case NETDEV_CHANGEUPPER:</div><div class='add'>+	case NETDEV_RESEND_IGMP:</div><div class='add'>+	case NETDEV_PRECHANGEMTU:</div><div class='add'>+	case NETDEV_CHANGEINFODATA:</div><div class='add'>+	case NETDEV_BONDING_INFO:</div><div class='add'>+	case NETDEV_PRECHANGEUPPER:</div><div class='add'>+	case NETDEV_CHANGELOWERSTATE:</div><div class='add'>+	case NETDEV_UDP_TUNNEL_PUSH_INFO:</div><div class='add'>+	case NETDEV_UDP_TUNNEL_DROP_INFO:</div><div class='add'>+	case NETDEV_CHANGE_TX_QUEUE_LEN:</div><div class='add'>+	case NETDEV_CVLAN_FILTER_PUSH_INFO:</div><div class='add'>+	case NETDEV_CVLAN_FILTER_DROP_INFO:</div><div class='add'>+	case NETDEV_SVLAN_FILTER_PUSH_INFO:</div><div class='add'>+	case NETDEV_SVLAN_FILTER_DROP_INFO:</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_ENABLE:</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_DISABLE:</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_REPORT_USED:</div><div class='add'>+	case NETDEV_OFFLOAD_XSTATS_REPORT_DELTA:</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NETDEV_CHANGENAME:</div><div class='add'>+		ASSERT_RTNL_NET(net);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(netdev_debug_event, "NETDEV_INTERNAL");</div><div class='add'>+</div><div class='add'>+static int rtnl_net_debug_net_id;</div><div class='add'>+</div><div class='add'>+static int __net_init rtnl_net_debug_net_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct notifier_block *nb;</div><div class='add'>+</div><div class='add'>+	nb = net_generic(net, rtnl_net_debug_net_id);</div><div class='add'>+	nb-&gt;notifier_call = netdev_debug_event;</div><div class='add'>+</div><div class='add'>+	return register_netdevice_notifier_net(net, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit rtnl_net_debug_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct notifier_block *nb;</div><div class='add'>+</div><div class='add'>+	nb = net_generic(net, rtnl_net_debug_net_id);</div><div class='add'>+	unregister_netdevice_notifier_net(net, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations rtnl_net_debug_net_ops __net_initdata = {</div><div class='add'>+	.init = rtnl_net_debug_net_init,</div><div class='add'>+	.exit = rtnl_net_debug_net_exit,</div><div class='add'>+	.id = &amp;rtnl_net_debug_net_id,</div><div class='add'>+	.size = sizeof(struct notifier_block),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block rtnl_net_debug_block = {</div><div class='add'>+	.notifier_call = netdev_debug_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rtnl_net_debug_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_pernet_subsys(&amp;rtnl_net_debug_net_ops);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = register_netdevice_notifier(&amp;rtnl_net_debug_block);</div><div class='add'>+	if (ret)</div><div class='add'>+		unregister_pernet_subsys(&amp;rtnl_net_debug_net_ops);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(rtnl_net_debug_init);</div><div class='head'>diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c<br/>index 3e85437f7106..9f40be0c3e71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/lwt_bpf.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/lwt_bpf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/lwt_bpf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/lwt_bpf.c</a></div><div class='hunk'>@@ -1,21 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Copyright (c) 2016 Thomas Graf &lt;tgraf@tgraf.ch&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/gre.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct bpf_lwt_prog {</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='hunk'>@@ -42,19 +40,20 @@ static inline struct bpf_lwt *bpf_lwt_lwtunnel(struct lwtunnel_state *lwt)</div><div class='ctx'> static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,</div><div class='ctx'> 		       struct dst_entry *dst, bool can_redirect)</div><div class='ctx'> {</div><div class='add'>+	struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Preempt disable is needed to protect per-cpu redirect_info between</div><div class='del'>-	 * BPF prog and skb_do_redirect(). The call_rcu in bpf_prog_put() and</div><div class='del'>-	 * access to maps strictly require a rcu_read_lock() for protection,</div><div class='del'>-	 * mixing with BH RCU lock doesn't work.</div><div class='add'>+	/* Disabling BH is needed to protect per-CPU bpf_redirect_info between</div><div class='add'>+	 * BPF prog and skb_do_redirect().</div><div class='ctx'> 	 */</div><div class='del'>-	preempt_disable();</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	bpf_net_ctx = bpf_net_ctx_set(&amp;__bpf_net_ctx);</div><div class='ctx'> 	bpf_compute_data_pointers(skb);</div><div class='ctx'> 	ret = bpf_prog_run_save_cb(lwt-&gt;prog, skb);</div><div class='ctx'> </div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	case BPF_OK:</div><div class='add'>+	case BPF_LWT_REROUTE:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BPF_REDIRECT:</div><div class='hunk'>@@ -63,9 +62,9 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,</div><div class='ctx'> 				     lwt-&gt;name ? : "&lt;unknown&gt;");</div><div class='ctx'> 			ret = BPF_OK;</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = skb_do_redirect(skb);</div><div class='del'>-			if (ret == 0)</div><div class='del'>-				ret = BPF_REDIRECT;</div><div class='add'>+			skb_reset_mac_header(skb);</div><div class='add'>+			skb_do_redirect(skb);</div><div class='add'>+			ret = BPF_REDIRECT;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -81,11 +80,43 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	preempt_enable();</div><div class='add'>+	bpf_net_ctx_clear(bpf_net_ctx);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bpf_lwt_input_reroute(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		struct net_device *dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+		const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		dev_hold(dev);</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		reason = ip_route_input_noref(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+					      ip4h_dscp(iph), dev);</div><div class='add'>+		err = reason ? -EINVAL : 0;</div><div class='add'>+		dev_put(dev);</div><div class='add'>+	} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		err = ipv6_stub-&gt;ipv6_route_input(skb);</div><div class='add'>+	} else {</div><div class='add'>+		err = -EAFNOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bpf_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='hunk'>@@ -97,11 +128,11 @@ static int bpf_input(struct sk_buff *skb)</div><div class='ctx'> 		ret = run_lwt_bpf(skb, &amp;bpf-&gt;in, dst, NO_REDIRECT);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='add'>+		if (ret == BPF_LWT_REROUTE)</div><div class='add'>+			return bpf_lwt_input_reroute(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!dst-&gt;lwtstate-&gt;orig_input)) {</div><div class='del'>-		pr_warn_once("orig_input not set on dst for prog %s\n",</div><div class='del'>-			     bpf-&gt;out.name);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -132,10 +163,8 @@ static int bpf_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return dst-&gt;lwtstate-&gt;orig_output(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xmit_check_hhlen(struct sk_buff *skb)</div><div class='add'>+static int xmit_check_hhlen(struct sk_buff *skb, int hh_len)</div><div class='ctx'> {</div><div class='del'>-	int hh_len = skb_dst(skb)-&gt;dev-&gt;hard_header_len;</div><div class='del'>-</div><div class='ctx'> 	if (skb_headroom(skb) &lt; hh_len) {</div><div class='ctx'> 		int nhead = HH_DATA_ALIGN(hh_len - skb_headroom(skb));</div><div class='ctx'> </div><div class='hunk'>@@ -146,6 +175,100 @@ static int xmit_check_hhlen(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bpf_lwt_xmit_reroute(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *l3mdev = l3mdev_master_dev_rcu(skb_dst(skb)-&gt;dev);</div><div class='add'>+	int oif = l3mdev ? l3mdev-&gt;ifindex : 0;</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	int err = -EAFNOSUPPORT;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	bool ipv4;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		ipv4 = true;</div><div class='add'>+	else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		ipv4 = false;</div><div class='add'>+	else</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	sk = sk_to_full_sk(skb-&gt;sk);</div><div class='add'>+	if (sk) {</div><div class='add'>+		if (sk-&gt;sk_bound_dev_if)</div><div class='add'>+			oif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+		net = sock_net(sk);</div><div class='add'>+	} else {</div><div class='add'>+		net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ipv4) {</div><div class='add'>+		struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+		struct flowi4 fl4 = {};</div><div class='add'>+		struct rtable *rt;</div><div class='add'>+</div><div class='add'>+		fl4.flowi4_oif = oif;</div><div class='add'>+		fl4.flowi4_mark = skb-&gt;mark;</div><div class='add'>+		fl4.flowi4_uid = sock_net_uid(net, sk);</div><div class='add'>+		fl4.flowi4_dscp = ip4h_dscp(iph);</div><div class='add'>+		fl4.flowi4_flags = FLOWI_FLAG_ANYSRC;</div><div class='add'>+		fl4.flowi4_proto = iph-&gt;protocol;</div><div class='add'>+		fl4.daddr = iph-&gt;daddr;</div><div class='add'>+		fl4.saddr = iph-&gt;saddr;</div><div class='add'>+</div><div class='add'>+		rt = ip_route_output_key(net, &amp;fl4);</div><div class='add'>+		if (IS_ERR(rt)) {</div><div class='add'>+			err = PTR_ERR(rt);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		dst = &amp;rt-&gt;dst;</div><div class='add'>+	} else {</div><div class='add'>+		struct ipv6hdr *iph6 = ipv6_hdr(skb);</div><div class='add'>+		struct flowi6 fl6 = {};</div><div class='add'>+</div><div class='add'>+		fl6.flowi6_oif = oif;</div><div class='add'>+		fl6.flowi6_mark = skb-&gt;mark;</div><div class='add'>+		fl6.flowi6_uid = sock_net_uid(net, sk);</div><div class='add'>+		fl6.flowlabel = ip6_flowinfo(iph6);</div><div class='add'>+		fl6.flowi6_proto = iph6-&gt;nexthdr;</div><div class='add'>+		fl6.daddr = iph6-&gt;daddr;</div><div class='add'>+		fl6.saddr = iph6-&gt;saddr;</div><div class='add'>+</div><div class='add'>+		dst = ipv6_stub-&gt;ipv6_dst_lookup_flow(net, skb-&gt;sk, &amp;fl6, NULL);</div><div class='add'>+		if (IS_ERR(dst)) {</div><div class='add'>+			err = PTR_ERR(dst);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(dst-&gt;error)) {</div><div class='add'>+		err = dst-&gt;error;</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Although skb header was reserved in bpf_lwt_push_ip_encap(), it</div><div class='add'>+	 * was done for the previous dst, so we are doing it here again, in</div><div class='add'>+	 * case the new dst needs much more space. The call below is a noop</div><div class='add'>+	 * if there is enough header space in skb.</div><div class='add'>+	 */</div><div class='add'>+	err = skb_cow_head(skb, LL_RESERVED_SPACE(dst-&gt;dev));</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	skb_dst_drop(skb);</div><div class='add'>+	skb_dst_set(skb, dst);</div><div class='add'>+</div><div class='add'>+	err = dst_output(dev_net(skb_dst(skb)-&gt;dev), skb-&gt;sk, skb);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return net_xmit_errno(err);</div><div class='add'>+</div><div class='add'>+	/* ip[6]_finish_output2 understand LWTUNNEL_XMIT_DONE */</div><div class='add'>+	return LWTUNNEL_XMIT_DONE;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bpf_xmit(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='hunk'>@@ -153,21 +276,33 @@ static int bpf_xmit(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	bpf = bpf_lwt_lwtunnel(dst-&gt;lwtstate);</div><div class='ctx'> 	if (bpf-&gt;xmit.prog) {</div><div class='add'>+		int hh_len = dst-&gt;dev-&gt;hard_header_len;</div><div class='add'>+		__be16 proto = skb-&gt;protocol;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		ret = run_lwt_bpf(skb, &amp;bpf-&gt;xmit, dst, CAN_REDIRECT);</div><div class='ctx'> 		switch (ret) {</div><div class='ctx'> 		case BPF_OK:</div><div class='add'>+			/* If the header changed, e.g. via bpf_lwt_push_encap,</div><div class='add'>+			 * BPF_LWT_REROUTE below should have been used if the</div><div class='add'>+			 * protocol was also changed.</div><div class='add'>+			 */</div><div class='add'>+			if (skb-&gt;protocol != proto) {</div><div class='add'>+				kfree_skb(skb);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			/* If the header was expanded, headroom might be too</div><div class='ctx'> 			 * small for L2 header to come, expand as needed.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = xmit_check_hhlen(skb);</div><div class='add'>+			ret = xmit_check_hhlen(skb, hh_len);</div><div class='ctx'> 			if (unlikely(ret))</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='ctx'> 			return LWTUNNEL_XMIT_CONTINUE;</div><div class='ctx'> 		case BPF_REDIRECT:</div><div class='ctx'> 			return LWTUNNEL_XMIT_DONE;</div><div class='add'>+		case BPF_LWT_REROUTE:</div><div class='add'>+			return bpf_lwt_xmit_reroute(skb);</div><div class='ctx'> 		default:</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -207,8 +342,8 @@ static int bpf_parse_prog(struct nlattr *attr, struct bpf_lwt_prog *prog,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 fd;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(tb, LWT_BPF_PROG_MAX, attr, bpf_prog_policy,</div><div class='del'>-			       NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(tb, LWT_BPF_PROG_MAX, attr,</div><div class='add'>+					  bpf_prog_policy, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +371,7 @@ static const struct nla_policy bpf_nl_policy[LWT_BPF_MAX + 1] = {</div><div class='ctx'> 	[LWT_BPF_XMIT_HEADROOM]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bpf_build_state(struct nlattr *nla,</div><div class='add'>+static int bpf_build_state(struct net *net, struct nlattr *nla,</div><div class='ctx'> 			   unsigned int family, const void *cfg,</div><div class='ctx'> 			   struct lwtunnel_state **ts,</div><div class='ctx'> 			   struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -249,7 +384,8 @@ static int bpf_build_state(struct nlattr *nla,</div><div class='ctx'> 	if (family != AF_INET &amp;&amp; family != AF_INET6)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(tb, LWT_BPF_MAX, nla, bpf_nl_policy, extack);</div><div class='add'>+	ret = nla_parse_nested_deprecated(tb, LWT_BPF_MAX, nla, bpf_nl_policy,</div><div class='add'>+					  extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +453,7 @@ static int bpf_fill_lwt_prog(struct sk_buff *skb, int attr,</div><div class='ctx'> 	if (!prog-&gt;prog)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, attr);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, attr);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -389,6 +525,135 @@ static const struct lwtunnel_encap_ops bpf_encap_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int handle_gso_type(struct sk_buff *skb, unsigned int gso_type,</div><div class='add'>+			   int encap_len)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	gso_type |= SKB_GSO_DODGY;</div><div class='add'>+	shinfo-&gt;gso_type |= gso_type;</div><div class='add'>+	skb_decrease_gso_size(shinfo, encap_len);</div><div class='add'>+	shinfo-&gt;gso_segs = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_gso_encap(struct sk_buff *skb, bool ipv4, int encap_len)</div><div class='add'>+{</div><div class='add'>+	int next_hdr_offset;</div><div class='add'>+	void *next_hdr;</div><div class='add'>+	__u8 protocol;</div><div class='add'>+</div><div class='add'>+	/* SCTP and UDP_L4 gso need more nuanced handling than what</div><div class='add'>+	 * handle_gso_type() does above: skb_decrease_gso_size() is not enough.</div><div class='add'>+	 * So at the moment only TCP GSO packets are let through.</div><div class='add'>+	 */</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (ipv4) {</div><div class='add'>+		protocol = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+		next_hdr_offset = sizeof(struct iphdr);</div><div class='add'>+		next_hdr = skb_network_header(skb) + next_hdr_offset;</div><div class='add'>+	} else {</div><div class='add'>+		protocol = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+		next_hdr_offset = sizeof(struct ipv6hdr);</div><div class='add'>+		next_hdr = skb_network_header(skb) + next_hdr_offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (protocol) {</div><div class='add'>+	case IPPROTO_GRE:</div><div class='add'>+		next_hdr_offset += sizeof(struct gre_base_hdr);</div><div class='add'>+		if (next_hdr_offset &gt; encap_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (((struct gre_base_hdr *)next_hdr)-&gt;flags &amp; GRE_CSUM)</div><div class='add'>+			return handle_gso_type(skb, SKB_GSO_GRE_CSUM,</div><div class='add'>+					       encap_len);</div><div class='add'>+		return handle_gso_type(skb, SKB_GSO_GRE, encap_len);</div><div class='add'>+</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+		next_hdr_offset += sizeof(struct udphdr);</div><div class='add'>+		if (next_hdr_offset &gt; encap_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (((struct udphdr *)next_hdr)-&gt;check)</div><div class='add'>+			return handle_gso_type(skb, SKB_GSO_UDP_TUNNEL_CSUM,</div><div class='add'>+					       encap_len);</div><div class='add'>+		return handle_gso_type(skb, SKB_GSO_UDP_TUNNEL, encap_len);</div><div class='add'>+</div><div class='add'>+	case IPPROTO_IP:</div><div class='add'>+	case IPPROTO_IPV6:</div><div class='add'>+		if (ipv4)</div><div class='add'>+			return handle_gso_type(skb, SKB_GSO_IPXIP4, encap_len);</div><div class='add'>+		else</div><div class='add'>+			return handle_gso_type(skb, SKB_GSO_IPXIP6, encap_len);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_lwt_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	bool ipv4;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len &lt; sizeof(struct iphdr) || len &gt; LWT_BPF_MAX_HEADROOM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* validate protocol and length */</div><div class='add'>+	iph = (struct iphdr *)hdr;</div><div class='add'>+	if (iph-&gt;version == 4) {</div><div class='add'>+		ipv4 = true;</div><div class='add'>+		if (unlikely(len &lt; iph-&gt;ihl * 4))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (iph-&gt;version == 6) {</div><div class='add'>+		ipv4 = false;</div><div class='add'>+		if (unlikely(len &lt; sizeof(struct ipv6hdr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ingress)</div><div class='add'>+		err = skb_cow_head(skb, len + skb-&gt;mac_len);</div><div class='add'>+	else</div><div class='add'>+		err = skb_cow_head(skb,</div><div class='add'>+				   len + LL_RESERVED_SPACE(skb_dst(skb)-&gt;dev));</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* push the encap headers and fix pointers */</div><div class='add'>+	skb_reset_inner_headers(skb);</div><div class='add'>+	skb_reset_inner_mac_header(skb);  /* mac header is not yet set */</div><div class='add'>+	skb_set_inner_protocol(skb, skb-&gt;protocol);</div><div class='add'>+	skb-&gt;encapsulation = 1;</div><div class='add'>+	skb_push(skb, len);</div><div class='add'>+	if (ingress)</div><div class='add'>+		skb_postpush_rcsum(skb, iph, len);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	memcpy(skb_network_header(skb), hdr, len);</div><div class='add'>+	bpf_compute_data_pointers(skb);</div><div class='add'>+	skb_clear_hash(skb);</div><div class='add'>+</div><div class='add'>+	if (ipv4) {</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+		iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		if (!iph-&gt;check)</div><div class='add'>+			iph-&gt;check = ip_fast_csum((unsigned char *)iph,</div><div class='add'>+						  iph-&gt;ihl);</div><div class='add'>+	} else {</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='add'>+		return handle_gso_encap(skb, ipv4, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init bpf_lwt_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return lwtunnel_encap_add_ops(&amp;bpf_encap_ops, LWTUNNEL_ENCAP_BPF);</div><div class='head'>diff --git a/net/core/lwtunnel.c b/net/core/lwtunnel.c<br/>index 0b171756453c..f9d76d85d04f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/lwtunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/lwtunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/lwtunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/lwtunnel.c</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * lwtunnel	Infrastructure for light weight tunnels like mpls</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Roopa Prabhu, &lt;roopa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -26,7 +21,12 @@</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/ip6_fib.h&gt;</div><div class='del'>-#include &lt;net/nexthop.h&gt;</div><div class='add'>+#include &lt;net/rtnh.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(nf_hooks_lwtunnel_enabled);</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_hooks_lwtunnel_enabled);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +46,13 @@ static const char *lwtunnel_encap_str(enum lwtunnel_encap_types encap_type)</div><div class='ctx'> 		return "BPF";</div><div class='ctx'> 	case LWTUNNEL_ENCAP_SEG6_LOCAL:</div><div class='ctx'> 		return "SEG6LOCAL";</div><div class='add'>+	case LWTUNNEL_ENCAP_RPL:</div><div class='add'>+		return "RPL";</div><div class='add'>+	case LWTUNNEL_ENCAP_IOAM6:</div><div class='add'>+		return "IOAM6";</div><div class='add'>+	case LWTUNNEL_ENCAP_XFRM:</div><div class='add'>+		/* module autoload not supported for encap type */</div><div class='add'>+		return NULL;</div><div class='ctx'> 	case LWTUNNEL_ENCAP_IP6:</div><div class='ctx'> 	case LWTUNNEL_ENCAP_IP:</div><div class='ctx'> 	case LWTUNNEL_ENCAP_NONE:</div><div class='hunk'>@@ -103,7 +110,7 @@ int lwtunnel_encap_del_ops(const struct lwtunnel_encap_ops *ops,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lwtunnel_encap_del_ops);</div><div class='ctx'> </div><div class='del'>-int lwtunnel_build_state(u16 encap_type,</div><div class='add'>+int lwtunnel_build_state(struct net *net, u16 encap_type,</div><div class='ctx'> 			 struct nlattr *encap, unsigned int family,</div><div class='ctx'> 			 const void *cfg, struct lwtunnel_state **lws,</div><div class='ctx'> 			 struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -122,18 +129,18 @@ int lwtunnel_build_state(u16 encap_type,</div><div class='ctx'> 	ret = -EOPNOTSUPP;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(lwtun_encaps[encap_type]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;build_state &amp;&amp; try_module_get(ops-&gt;owner))) {</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;build_state &amp;&amp; try_module_get(ops-&gt;owner)))</div><div class='ctx'> 		found = true;</div><div class='del'>-		ret = ops-&gt;build_state(encap, family, cfg, lws, extack);</div><div class='del'>-		if (ret)</div><div class='del'>-			module_put(ops-&gt;owner);</div><div class='del'>-	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	/* don't rely on -EOPNOTSUPP to detect match as build_state</div><div class='del'>-	 * handlers could return it</div><div class='del'>-	 */</div><div class='del'>-	if (!found) {</div><div class='add'>+	if (found) {</div><div class='add'>+		ret = ops-&gt;build_state(net, encap, family, cfg, lws, extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			module_put(ops-&gt;owner);</div><div class='add'>+	} else {</div><div class='add'>+		/* don't rely on -EOPNOTSUPP to detect match as build_state</div><div class='add'>+		 * handlers could return it</div><div class='add'>+		 */</div><div class='ctx'> 		NL_SET_ERR_MSG_ATTR(extack, encap,</div><div class='ctx'> 				    "LWT encapsulation type not supported");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -153,21 +160,14 @@ int lwtunnel_valid_encap_type(u16 encap_type, struct netlink_ext_ack *extack)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ops = rcu_dereference(lwtun_encaps[encap_type]);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	ops = rcu_access_pointer(lwtun_encaps[encap_type]);</div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='ctx'> 	if (!ops) {</div><div class='ctx'> 		const char *encap_type_str = lwtunnel_encap_str(encap_type);</div><div class='ctx'> </div><div class='ctx'> 		if (encap_type_str) {</div><div class='del'>-			__rtnl_unlock();</div><div class='ctx'> 			request_module("rtnl-lwt-%s", encap_type_str);</div><div class='del'>-			rtnl_lock();</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			ops = rcu_dereference(lwtun_encaps[encap_type]);</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+			ops = rcu_access_pointer(lwtun_encaps[encap_type]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -195,10 +195,13 @@ int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int remaining,</div><div class='ctx'> 			nla_entype = nla_find(attrs, attrlen, RTA_ENCAP_TYPE);</div><div class='ctx'> </div><div class='ctx'> 			if (nla_entype) {</div><div class='add'>+				if (nla_len(nla_entype) &lt; sizeof(u16)) {</div><div class='add'>+					NL_SET_ERR_MSG(extack, "Invalid RTA_ENCAP_TYPE");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='ctx'> 				encap_type = nla_get_u16(nla_entype);</div><div class='ctx'> </div><div class='del'>-				if (lwtunnel_valid_encap_type(encap_type,</div><div class='del'>-							      extack) != 0)</div><div class='add'>+				if (lwtunnel_valid_encap_type(encap_type, extack))</div><div class='ctx'> 					return -EOPNOTSUPP;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -223,7 +226,8 @@ void lwtstate_free(struct lwtunnel_state *lws)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lwtstate_free);</div><div class='ctx'> </div><div class='del'>-int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate)</div><div class='add'>+int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate,</div><div class='add'>+			int encap_attr, int encap_type_attr)</div><div class='ctx'> {</div><div class='ctx'> 	const struct lwtunnel_encap_ops *ops;</div><div class='ctx'> 	struct nlattr *nest;</div><div class='hunk'>@@ -236,7 +240,7 @@ int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate)</div><div class='ctx'> 	    lwtstate-&gt;type &gt; LWTUNNEL_ENCAP_MAX)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, RTA_ENCAP);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, encap_attr);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +254,7 @@ int lwtunnel_fill_encap(struct sk_buff *skb, struct lwtunnel_state *lwtstate)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='del'>-	ret = nla_put_u16(skb, RTA_ENCAP_TYPE, lwtstate-&gt;type);</div><div class='add'>+	ret = nla_put_u16(skb, encap_type_attr, lwtstate-&gt;type);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -315,82 +319,132 @@ EXPORT_SYMBOL_GPL(lwtunnel_cmp_encap);</div><div class='ctx'> </div><div class='ctx'> int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	const struct lwtunnel_encap_ops *ops;</div><div class='ctx'> 	struct lwtunnel_state *lwtstate;</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='ctx'> </div><div class='del'>-	if (!dst)</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='add'>+		net_crit_ratelimited("%s(): recursion limit reached on datapath\n",</div><div class='add'>+				     __func__);</div><div class='add'>+		ret = -ENETDOWN;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst = skb_dst(skb);</div><div class='add'>+	if (!dst) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='ctx'> 	lwtstate = dst-&gt;lwtstate;</div><div class='ctx'> </div><div class='ctx'> 	if (lwtstate-&gt;type == LWTUNNEL_ENCAP_NONE ||</div><div class='del'>-	    lwtstate-&gt;type &gt; LWTUNNEL_ENCAP_MAX)</div><div class='del'>-		return 0;</div><div class='add'>+	    lwtstate-&gt;type &gt; LWTUNNEL_ENCAP_MAX) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EOPNOTSUPP;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(lwtun_encaps[lwtstate-&gt;type]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;output))</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;output)) {</div><div class='add'>+		dev_xmit_recursion_inc();</div><div class='ctx'> 		ret = ops-&gt;output(net, sk, skb);</div><div class='add'>+		dev_xmit_recursion_dec();</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EOPNOTSUPP)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lwtunnel_output);</div><div class='ctx'> </div><div class='ctx'> int lwtunnel_xmit(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	const struct lwtunnel_encap_ops *ops;</div><div class='ctx'> 	struct lwtunnel_state *lwtstate;</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='ctx'> </div><div class='del'>-	if (!dst)</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='add'>+		net_crit_ratelimited("%s(): recursion limit reached on datapath\n",</div><div class='add'>+				     __func__);</div><div class='add'>+		ret = -ENETDOWN;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst = skb_dst(skb);</div><div class='add'>+	if (!dst) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	lwtstate = dst-&gt;lwtstate;</div><div class='ctx'> </div><div class='ctx'> 	if (lwtstate-&gt;type == LWTUNNEL_ENCAP_NONE ||</div><div class='del'>-	    lwtstate-&gt;type &gt; LWTUNNEL_ENCAP_MAX)</div><div class='del'>-		return 0;</div><div class='add'>+	    lwtstate-&gt;type &gt; LWTUNNEL_ENCAP_MAX) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EOPNOTSUPP;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(lwtun_encaps[lwtstate-&gt;type]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;xmit))</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;xmit)) {</div><div class='add'>+		dev_xmit_recursion_inc();</div><div class='ctx'> 		ret = ops-&gt;xmit(skb);</div><div class='add'>+		dev_xmit_recursion_dec();</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EOPNOTSUPP)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lwtunnel_xmit);</div><div class='ctx'> </div><div class='ctx'> int lwtunnel_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	const struct lwtunnel_encap_ops *ops;</div><div class='ctx'> 	struct lwtunnel_state *lwtstate;</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!in_softirq());</div><div class='ctx'> </div><div class='del'>-	if (!dst)</div><div class='add'>+	if (dev_xmit_recursion()) {</div><div class='add'>+		net_crit_ratelimited("%s(): recursion limit reached on datapath\n",</div><div class='add'>+				     __func__);</div><div class='add'>+		ret = -ENETDOWN;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst = skb_dst(skb);</div><div class='add'>+	if (!dst) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='ctx'> 	lwtstate = dst-&gt;lwtstate;</div><div class='ctx'> </div><div class='ctx'> 	if (lwtstate-&gt;type == LWTUNNEL_ENCAP_NONE ||</div><div class='hunk'>@@ -400,8 +454,11 @@ int lwtunnel_input(struct sk_buff *skb)</div><div class='ctx'> 	ret = -EOPNOTSUPP;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(lwtun_encaps[lwtstate-&gt;type]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;input))</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;input)) {</div><div class='add'>+		dev_xmit_recursion_inc();</div><div class='ctx'> 		ret = ops-&gt;input(skb);</div><div class='add'>+		dev_xmit_recursion_dec();</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EOPNOTSUPP)</div><div class='head'>diff --git a/net/core/mp_dmabuf_devmem.h b/net/core/mp_dmabuf_devmem.h<br/>new file mode 100644<br/>index 000000000000..67cd0dd7319c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/mp_dmabuf_devmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/mp_dmabuf_devmem.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Dmabuf device memory provider.</div><div class='add'>+ *</div><div class='add'>+ * Authors:	Mina Almasry &lt;almasrymina@google.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _NET_MP_DMABUF_DEVMEM_H</div><div class='add'>+#define _NET_MP_DMABUF_DEVMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netmem.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_NET_DEVMEM)</div><div class='add'>+int mp_dmabuf_devmem_init(struct page_pool *pool);</div><div class='add'>+</div><div class='add'>+netmem_ref mp_dmabuf_devmem_alloc_netmems(struct page_pool *pool, gfp_t gfp);</div><div class='add'>+</div><div class='add'>+void mp_dmabuf_devmem_destroy(struct page_pool *pool);</div><div class='add'>+</div><div class='add'>+bool mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem);</div><div class='add'>+#else</div><div class='add'>+static inline int mp_dmabuf_devmem_init(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline netmem_ref</div><div class='add'>+mp_dmabuf_devmem_alloc_netmems(struct page_pool *pool, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mp_dmabuf_devmem_destroy(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _NET_MP_DMABUF_DEVMEM_H */</div><div class='head'>diff --git a/net/core/neighbour.c b/net/core/neighbour.c<br/>index 91592fceeaad..96a3b1a93252 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/neighbour.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/neighbour.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/neighbour.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/neighbour.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Generic address resolution entity</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *	Alexey Kuznetsov	&lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Fixes:</div><div class='ctx'>  *	Vitaly E. Lavrov	releasing NULL neighbor in neigh_add.</div><div class='ctx'>  *	Harald Welte		Add neighbour cache statistics like rtstat</div><div class='hunk'>@@ -30,7 +26,9 @@</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/neighbour.h&gt;</div><div class='add'>+#include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='hunk'>@@ -41,7 +39,8 @@</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEBUG</div><div class='add'>+#include &lt;trace/events/neigh.h&gt;</div><div class='add'>+</div><div class='ctx'> #define NEIGH_DEBUG 1</div><div class='ctx'> #define neigh_dbg(level, fmt, ...)		\</div><div class='ctx'> do {						\</div><div class='hunk'>@@ -55,15 +54,34 @@ static void neigh_timer_handler(struct timer_list *t);</div><div class='ctx'> static void __neigh_notify(struct neighbour *n, int type, int flags,</div><div class='ctx'> 			   u32 pid);</div><div class='ctx'> static void neigh_update_notify(struct neighbour *neigh, u32 nlmsg_pid);</div><div class='del'>-static int pneigh_ifdown_and_unlock(struct neigh_table *tbl,</div><div class='del'>-				    struct net_device *dev);</div><div class='add'>+static void pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev,</div><div class='add'>+			  bool skip_perm);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> static const struct seq_operations neigh_stat_seq_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static struct hlist_head *neigh_get_dev_table(struct net_device *dev, int family)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (family) {</div><div class='add'>+	default:</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(1);</div><div class='add'>+		fallthrough; /* to avoid panic by null-ptr-deref */</div><div class='add'>+	case AF_INET:</div><div class='add'>+		i = NEIGH_ARP_TABLE;</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		i = NEIGH_ND_TABLE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;dev-&gt;neighbours[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>-   Neighbour hash table buckets are protected with rwlock tbl-&gt;lock.</div><div class='add'>+   Neighbour hash table buckets are protected with tbl-&gt;lock.</div><div class='ctx'> </div><div class='ctx'>    - All the scans/updates to hash buckets MUST be made under this lock.</div><div class='ctx'>    - NOTHING clever should be made under this lock: no callbacks</div><div class='hunk'>@@ -98,9 +116,7 @@ static int neigh_blackhole(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static void neigh_cleanup_and_release(struct neighbour *neigh)</div><div class='ctx'> {</div><div class='del'>-	if (neigh-&gt;parms-&gt;neigh_cleanup)</div><div class='del'>-		neigh-&gt;parms-&gt;neigh_cleanup(neigh);</div><div class='del'>-</div><div class='add'>+	trace_neigh_cleanup_and_release(neigh, 0);</div><div class='ctx'> 	__neigh_notify(neigh, RTM_DELNEIGH, 0, 0);</div><div class='ctx'> 	call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, neigh);</div><div class='ctx'> 	neigh_release(neigh);</div><div class='hunk'>@@ -114,97 +130,186 @@ static void neigh_cleanup_and_release(struct neighbour *neigh)</div><div class='ctx'> </div><div class='ctx'> unsigned long neigh_rand_reach_time(unsigned long base)</div><div class='ctx'> {</div><div class='del'>-	return base ? (prandom_u32() % base) + (base &gt;&gt; 1) : 0;</div><div class='add'>+	return base ? get_random_u32_below(base) + (base &gt;&gt; 1) : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_rand_reach_time);</div><div class='ctx'> </div><div class='add'>+static void neigh_mark_dead(struct neighbour *n)</div><div class='add'>+{</div><div class='add'>+	n-&gt;dead = 1;</div><div class='add'>+	if (!list_empty(&amp;n-&gt;gc_list)) {</div><div class='add'>+		list_del_init(&amp;n-&gt;gc_list);</div><div class='add'>+		atomic_dec(&amp;n-&gt;tbl-&gt;gc_entries);</div><div class='add'>+	}</div><div class='add'>+	if (!list_empty(&amp;n-&gt;managed_list))</div><div class='add'>+		list_del_init(&amp;n-&gt;managed_list);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static bool neigh_del(struct neighbour *n, __u8 state, __u8 flags,</div><div class='del'>-		      struct neighbour __rcu **np, struct neigh_table *tbl)</div><div class='add'>+static void neigh_update_gc_list(struct neighbour *n)</div><div class='ctx'> {</div><div class='del'>-	bool retval = false;</div><div class='add'>+	bool on_gc_list, exempt_from_gc;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;n-&gt;tbl-&gt;lock);</div><div class='ctx'> 	write_lock(&amp;n-&gt;lock);</div><div class='del'>-	if (refcount_read(&amp;n-&gt;refcnt) == 1 &amp;&amp; !(n-&gt;nud_state &amp; state) &amp;&amp;</div><div class='del'>-	    !(n-&gt;flags &amp; flags)) {</div><div class='del'>-		struct neighbour *neigh;</div><div class='add'>+	if (n-&gt;dead)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		neigh = rcu_dereference_protected(n-&gt;next,</div><div class='del'>-						  lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='del'>-		rcu_assign_pointer(*np, neigh);</div><div class='del'>-		n-&gt;dead = 1;</div><div class='del'>-		retval = true;</div><div class='add'>+	/* remove from the gc list if new state is permanent or if neighbor is</div><div class='add'>+	 * externally learned / validated; otherwise entry should be on the gc</div><div class='add'>+	 * list</div><div class='add'>+	 */</div><div class='add'>+	exempt_from_gc = n-&gt;nud_state &amp; NUD_PERMANENT ||</div><div class='add'>+			 n-&gt;flags &amp; (NTF_EXT_LEARNED | NTF_EXT_VALIDATED);</div><div class='add'>+	on_gc_list = !list_empty(&amp;n-&gt;gc_list);</div><div class='add'>+</div><div class='add'>+	if (exempt_from_gc &amp;&amp; on_gc_list) {</div><div class='add'>+		list_del_init(&amp;n-&gt;gc_list);</div><div class='add'>+		atomic_dec(&amp;n-&gt;tbl-&gt;gc_entries);</div><div class='add'>+	} else if (!exempt_from_gc &amp;&amp; !on_gc_list) {</div><div class='add'>+		/* add entries to the tail; cleaning removes from the front */</div><div class='add'>+		list_add_tail(&amp;n-&gt;gc_list, &amp;n-&gt;tbl-&gt;gc_list);</div><div class='add'>+		atomic_inc(&amp;n-&gt;tbl-&gt;gc_entries);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	write_unlock(&amp;n-&gt;lock);</div><div class='del'>-	if (retval)</div><div class='del'>-		neigh_cleanup_and_release(n);</div><div class='del'>-	return retval;</div><div class='add'>+	spin_unlock_bh(&amp;n-&gt;tbl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool neigh_remove_one(struct neighbour *ndel, struct neigh_table *tbl)</div><div class='add'>+static void neigh_update_managed_list(struct neighbour *n)</div><div class='ctx'> {</div><div class='del'>-	struct neigh_hash_table *nht;</div><div class='del'>-	void *pkey = ndel-&gt;primary_key;</div><div class='del'>-	u32 hash_val;</div><div class='del'>-	struct neighbour *n;</div><div class='del'>-	struct neighbour __rcu **np;</div><div class='add'>+	bool on_managed_list, add_to_managed;</div><div class='ctx'> </div><div class='del'>-	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='del'>-					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='del'>-	hash_val = tbl-&gt;hash(pkey, ndel-&gt;dev, nht-&gt;hash_rnd);</div><div class='del'>-	hash_val = hash_val &gt;&gt; (32 - nht-&gt;hash_shift);</div><div class='add'>+	spin_lock_bh(&amp;n-&gt;tbl-&gt;lock);</div><div class='add'>+	write_lock(&amp;n-&gt;lock);</div><div class='add'>+	if (n-&gt;dead)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	add_to_managed = n-&gt;flags &amp; NTF_MANAGED;</div><div class='add'>+	on_managed_list = !list_empty(&amp;n-&gt;managed_list);</div><div class='add'>+</div><div class='add'>+	if (!add_to_managed &amp;&amp; on_managed_list)</div><div class='add'>+		list_del_init(&amp;n-&gt;managed_list);</div><div class='add'>+	else if (add_to_managed &amp;&amp; !on_managed_list)</div><div class='add'>+		list_add_tail(&amp;n-&gt;managed_list, &amp;n-&gt;tbl-&gt;managed_list);</div><div class='add'>+out:</div><div class='add'>+	write_unlock(&amp;n-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;n-&gt;tbl-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void neigh_update_flags(struct neighbour *neigh, u32 flags, int *notify,</div><div class='add'>+			       bool *gc_update, bool *managed_update)</div><div class='add'>+{</div><div class='add'>+	u32 ndm_flags, old_flags = neigh-&gt;flags;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; NEIGH_UPDATE_F_ADMIN))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	np = &amp;nht-&gt;hash_buckets[hash_val];</div><div class='del'>-	while ((n = rcu_dereference_protected(*np,</div><div class='del'>-					      lockdep_is_held(&amp;tbl-&gt;lock)))) {</div><div class='del'>-		if (n == ndel)</div><div class='del'>-			return neigh_del(n, 0, 0, np, tbl);</div><div class='del'>-		np = &amp;n-&gt;next;</div><div class='add'>+	ndm_flags  = (flags &amp; NEIGH_UPDATE_F_EXT_LEARNED) ? NTF_EXT_LEARNED : 0;</div><div class='add'>+	ndm_flags |= (flags &amp; NEIGH_UPDATE_F_MANAGED) ? NTF_MANAGED : 0;</div><div class='add'>+	ndm_flags |= (flags &amp; NEIGH_UPDATE_F_EXT_VALIDATED) ? NTF_EXT_VALIDATED : 0;</div><div class='add'>+</div><div class='add'>+	if ((old_flags ^ ndm_flags) &amp; NTF_EXT_LEARNED) {</div><div class='add'>+		if (ndm_flags &amp; NTF_EXT_LEARNED)</div><div class='add'>+			neigh-&gt;flags |= NTF_EXT_LEARNED;</div><div class='add'>+		else</div><div class='add'>+			neigh-&gt;flags &amp;= ~NTF_EXT_LEARNED;</div><div class='add'>+		*notify = 1;</div><div class='add'>+		*gc_update = true;</div><div class='add'>+	}</div><div class='add'>+	if ((old_flags ^ ndm_flags) &amp; NTF_MANAGED) {</div><div class='add'>+		if (ndm_flags &amp; NTF_MANAGED)</div><div class='add'>+			neigh-&gt;flags |= NTF_MANAGED;</div><div class='add'>+		else</div><div class='add'>+			neigh-&gt;flags &amp;= ~NTF_MANAGED;</div><div class='add'>+		*notify = 1;</div><div class='add'>+		*managed_update = true;</div><div class='add'>+	}</div><div class='add'>+	if ((old_flags ^ ndm_flags) &amp; NTF_EXT_VALIDATED) {</div><div class='add'>+		if (ndm_flags &amp; NTF_EXT_VALIDATED)</div><div class='add'>+			neigh-&gt;flags |= NTF_EXT_VALIDATED;</div><div class='add'>+		else</div><div class='add'>+			neigh-&gt;flags &amp;= ~NTF_EXT_VALIDATED;</div><div class='add'>+		*notify = 1;</div><div class='add'>+		*gc_update = true;</div><div class='ctx'> 	}</div><div class='del'>-	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool neigh_remove_one(struct neighbour *n)</div><div class='add'>+{</div><div class='add'>+	bool retval = false;</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;n-&gt;lock);</div><div class='add'>+	if (refcount_read(&amp;n-&gt;refcnt) == 1) {</div><div class='add'>+		hlist_del_rcu(&amp;n-&gt;hash);</div><div class='add'>+		hlist_del_rcu(&amp;n-&gt;dev_list);</div><div class='add'>+		neigh_mark_dead(n);</div><div class='add'>+		retval = true;</div><div class='add'>+	}</div><div class='add'>+	write_unlock(&amp;n-&gt;lock);</div><div class='add'>+	if (retval)</div><div class='add'>+		neigh_cleanup_and_release(n);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int neigh_forced_gc(struct neigh_table *tbl)</div><div class='ctx'> {</div><div class='add'>+	int max_clean = atomic_read(&amp;tbl-&gt;gc_entries) -</div><div class='add'>+			READ_ONCE(tbl-&gt;gc_thresh2);</div><div class='add'>+	u64 tmax = ktime_get_ns() + NSEC_PER_MSEC;</div><div class='add'>+	unsigned long tref = jiffies - 5 * HZ;</div><div class='add'>+	struct neighbour *n, *tmp;</div><div class='ctx'> 	int shrunk = 0;</div><div class='del'>-	int i;</div><div class='del'>-	struct neigh_hash_table *nht;</div><div class='add'>+	int loop = 0;</div><div class='ctx'> </div><div class='ctx'> 	NEIGH_CACHE_STAT_INC(tbl, forced_gc_runs);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='del'>-					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='del'>-	for (i = 0; i &lt; (1 &lt;&lt; nht-&gt;hash_shift); i++) {</div><div class='del'>-		struct neighbour *n;</div><div class='del'>-		struct neighbour __rcu **np;</div><div class='del'>-</div><div class='del'>-		np = &amp;nht-&gt;hash_buckets[i];</div><div class='del'>-		while ((n = rcu_dereference_protected(*np,</div><div class='del'>-					lockdep_is_held(&amp;tbl-&gt;lock))) != NULL) {</div><div class='del'>-			/* Neighbour record may be discarded if:</div><div class='del'>-			 * - nobody refers to it.</div><div class='del'>-			 * - it is not permanent</div><div class='del'>-			 */</div><div class='del'>-			if (neigh_del(n, NUD_PERMANENT, NTF_EXT_LEARNED, np,</div><div class='del'>-				      tbl)) {</div><div class='del'>-				shrunk = 1;</div><div class='del'>-				continue;</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(n, tmp, &amp;tbl-&gt;gc_list, gc_list) {</div><div class='add'>+		if (refcount_read(&amp;n-&gt;refcnt) == 1) {</div><div class='add'>+			bool remove = false;</div><div class='add'>+</div><div class='add'>+			write_lock(&amp;n-&gt;lock);</div><div class='add'>+			if ((n-&gt;nud_state == NUD_FAILED) ||</div><div class='add'>+			    (n-&gt;nud_state == NUD_NOARP) ||</div><div class='add'>+			    (tbl-&gt;is_multicast &amp;&amp;</div><div class='add'>+			     tbl-&gt;is_multicast(n-&gt;primary_key)) ||</div><div class='add'>+			    !time_in_range(n-&gt;updated, tref, jiffies))</div><div class='add'>+				remove = true;</div><div class='add'>+			write_unlock(&amp;n-&gt;lock);</div><div class='add'>+</div><div class='add'>+			if (remove &amp;&amp; neigh_remove_one(n))</div><div class='add'>+				shrunk++;</div><div class='add'>+			if (shrunk &gt;= max_clean)</div><div class='add'>+				break;</div><div class='add'>+			if (++loop == 16) {</div><div class='add'>+				if (ktime_get_ns() &gt; tmax)</div><div class='add'>+					goto unlock;</div><div class='add'>+				loop = 0;</div><div class='ctx'> 			}</div><div class='del'>-			np = &amp;n-&gt;next;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tbl-&gt;last_flush = jiffies;</div><div class='del'>-</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	WRITE_ONCE(tbl-&gt;last_flush, jiffies);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return shrunk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void neigh_add_timer(struct neighbour *n, unsigned long when)</div><div class='ctx'> {</div><div class='add'>+	/* Use safe distance from the jiffies - LONG_MAX point while timer</div><div class='add'>+	 * is running in DELAY/PROBE state but still show to user space</div><div class='add'>+	 * large times in the past.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long mint = jiffies - (LONG_MAX - 86400 * HZ);</div><div class='add'>+</div><div class='ctx'> 	neigh_hold(n);</div><div class='add'>+	if (!time_in_range(n-&gt;confirmed, mint, jiffies))</div><div class='add'>+		n-&gt;confirmed = mint;</div><div class='add'>+	if (time_before(n-&gt;used, n-&gt;confirmed))</div><div class='add'>+		n-&gt;used = n-&gt;confirmed;</div><div class='ctx'> 	if (unlikely(mod_timer(&amp;n-&gt;timer, when))) {</div><div class='ctx'> 		printk("NEIGH: BUG, double timer add, state is %x\n",</div><div class='ctx'> 		       n-&gt;nud_state);</div><div class='hunk'>@@ -215,105 +320,197 @@ static void neigh_add_timer(struct neighbour *n, unsigned long when)</div><div class='ctx'> static int neigh_del_timer(struct neighbour *n)</div><div class='ctx'> {</div><div class='ctx'> 	if ((n-&gt;nud_state &amp; NUD_IN_TIMER) &amp;&amp;</div><div class='del'>-	    del_timer(&amp;n-&gt;timer)) {</div><div class='add'>+	    timer_delete(&amp;n-&gt;timer)) {</div><div class='ctx'> 		neigh_release(n);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pneigh_queue_purge(struct sk_buff_head *list)</div><div class='add'>+static struct neigh_parms *neigh_get_dev_parms_rcu(struct net_device *dev,</div><div class='add'>+						   int family)</div><div class='add'>+{</div><div class='add'>+	switch (family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		return __in_dev_arp_parms_get_rcu(dev);</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		return __in6_dev_nd_parms_get_rcu(dev);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void neigh_parms_qlen_dec(struct net_device *dev, int family)</div><div class='ctx'> {</div><div class='add'>+	struct neigh_parms *p;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	p = neigh_get_dev_parms_rcu(dev, family);</div><div class='add'>+	if (p)</div><div class='add'>+		p-&gt;qlen--;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pneigh_queue_purge(struct sk_buff_head *list, struct net *net,</div><div class='add'>+			       int family)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head tmp;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	while ((skb = skb_dequeue(list)) != NULL) {</div><div class='add'>+	skb_queue_head_init(&amp;tmp);</div><div class='add'>+	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='add'>+	skb = skb_peek(list);</div><div class='add'>+	while (skb != NULL) {</div><div class='add'>+		struct sk_buff *skb_next = skb_peek_next(skb, list);</div><div class='add'>+		struct net_device *dev = skb-&gt;dev;</div><div class='add'>+</div><div class='add'>+		if (net == NULL || net_eq(dev_net(dev), net)) {</div><div class='add'>+			neigh_parms_qlen_dec(dev, family);</div><div class='add'>+			__skb_unlink(skb, list);</div><div class='add'>+			__skb_queue_tail(&amp;tmp, skb);</div><div class='add'>+		}</div><div class='add'>+		skb = skb_next;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;tmp))) {</div><div class='ctx'> 		dev_put(skb-&gt;dev);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev)</div><div class='add'>+static void neigh_flush_one(struct neighbour *n)</div><div class='add'>+{</div><div class='add'>+	hlist_del_rcu(&amp;n-&gt;hash);</div><div class='add'>+	hlist_del_rcu(&amp;n-&gt;dev_list);</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;n-&gt;lock);</div><div class='add'>+</div><div class='add'>+	neigh_del_timer(n);</div><div class='add'>+	neigh_mark_dead(n);</div><div class='add'>+</div><div class='add'>+	if (refcount_read(&amp;n-&gt;refcnt) != 1) {</div><div class='add'>+		/* The most unpleasant situation.</div><div class='add'>+		 * We must destroy neighbour entry,</div><div class='add'>+		 * but someone still uses it.</div><div class='add'>+		 *</div><div class='add'>+		 * The destroy will be delayed until</div><div class='add'>+		 * the last user releases us, but</div><div class='add'>+		 * we must kill timers etc. and move</div><div class='add'>+		 * it to safe state.</div><div class='add'>+		 */</div><div class='add'>+		__skb_queue_purge(&amp;n-&gt;arp_queue);</div><div class='add'>+		n-&gt;arp_queue_len_bytes = 0;</div><div class='add'>+		WRITE_ONCE(n-&gt;output, neigh_blackhole);</div><div class='add'>+</div><div class='add'>+		if (n-&gt;nud_state &amp; NUD_VALID)</div><div class='add'>+			n-&gt;nud_state = NUD_NOARP;</div><div class='add'>+		else</div><div class='add'>+			n-&gt;nud_state = NUD_NONE;</div><div class='add'>+</div><div class='add'>+		neigh_dbg(2, "neigh %p is stray\n", n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_unlock(&amp;n-&gt;lock);</div><div class='add'>+</div><div class='add'>+	neigh_cleanup_and_release(n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev,</div><div class='add'>+			    bool skip_perm)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *dev_head;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+</div><div class='add'>+	dev_head = neigh_get_dev_table(dev, tbl-&gt;family);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(n, tmp, dev_head, dev_list) {</div><div class='add'>+		if (skip_perm &amp;&amp;</div><div class='add'>+		    (n-&gt;nud_state &amp; NUD_PERMANENT ||</div><div class='add'>+		     n-&gt;flags &amp; NTF_EXT_VALIDATED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		neigh_flush_one(n);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void neigh_flush_table(struct neigh_table *tbl)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct neigh_hash_table *nht;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='ctx'> 					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; (1 &lt;&lt; nht-&gt;hash_shift); i++) {</div><div class='add'>+		struct hlist_node *tmp;</div><div class='ctx'> 		struct neighbour *n;</div><div class='del'>-		struct neighbour __rcu **np = &amp;nht-&gt;hash_buckets[i];</div><div class='ctx'> </div><div class='del'>-		while ((n = rcu_dereference_protected(*np,</div><div class='del'>-					lockdep_is_held(&amp;tbl-&gt;lock))) != NULL) {</div><div class='del'>-			if (dev &amp;&amp; n-&gt;dev != dev) {</div><div class='del'>-				np = &amp;n-&gt;next;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			rcu_assign_pointer(*np,</div><div class='del'>-				   rcu_dereference_protected(n-&gt;next,</div><div class='del'>-						lockdep_is_held(&amp;tbl-&gt;lock)));</div><div class='del'>-			write_lock(&amp;n-&gt;lock);</div><div class='del'>-			neigh_del_timer(n);</div><div class='del'>-			n-&gt;dead = 1;</div><div class='del'>-</div><div class='del'>-			if (refcount_read(&amp;n-&gt;refcnt) != 1) {</div><div class='del'>-				/* The most unpleasant situation.</div><div class='del'>-				   We must destroy neighbour entry,</div><div class='del'>-				   but someone still uses it.</div><div class='del'>-</div><div class='del'>-				   The destroy will be delayed until</div><div class='del'>-				   the last user releases us, but</div><div class='del'>-				   we must kill timers etc. and move</div><div class='del'>-				   it to safe state.</div><div class='del'>-				 */</div><div class='del'>-				__skb_queue_purge(&amp;n-&gt;arp_queue);</div><div class='del'>-				n-&gt;arp_queue_len_bytes = 0;</div><div class='del'>-				n-&gt;output = neigh_blackhole;</div><div class='del'>-				if (n-&gt;nud_state &amp; NUD_VALID)</div><div class='del'>-					n-&gt;nud_state = NUD_NOARP;</div><div class='del'>-				else</div><div class='del'>-					n-&gt;nud_state = NUD_NONE;</div><div class='del'>-				neigh_dbg(2, "neigh %p is stray\n", n);</div><div class='del'>-			}</div><div class='del'>-			write_unlock(&amp;n-&gt;lock);</div><div class='del'>-			neigh_cleanup_and_release(n);</div><div class='del'>-		}</div><div class='add'>+		neigh_for_each_in_bucket_safe(n, tmp, &amp;nht-&gt;hash_heads[i])</div><div class='add'>+			neigh_flush_one(n);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void neigh_changeaddr(struct neigh_table *tbl, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	neigh_flush_dev(tbl, dev);</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	neigh_flush_dev(tbl, dev, false);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_changeaddr);</div><div class='ctx'> </div><div class='del'>-int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev)</div><div class='add'>+static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev,</div><div class='add'>+			  bool skip_perm)</div><div class='ctx'> {</div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	neigh_flush_dev(tbl, dev);</div><div class='del'>-	pneigh_ifdown_and_unlock(tbl, dev);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	if (likely(dev)) {</div><div class='add'>+		neigh_flush_dev(tbl, dev, skip_perm);</div><div class='add'>+	} else {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(skip_perm);</div><div class='add'>+		neigh_flush_table(tbl);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	pneigh_ifdown(tbl, dev, skip_perm);</div><div class='add'>+	pneigh_queue_purge(&amp;tbl-&gt;proxy_queue, dev ? dev_net(dev) : NULL,</div><div class='add'>+			   tbl-&gt;family);</div><div class='add'>+	if (skb_queue_empty_lockless(&amp;tbl-&gt;proxy_queue))</div><div class='add'>+		timer_delete_sync(&amp;tbl-&gt;proxy_timer);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;tbl-&gt;proxy_timer);</div><div class='del'>-	pneigh_queue_purge(&amp;tbl-&gt;proxy_queue);</div><div class='add'>+int neigh_carrier_down(struct neigh_table *tbl, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	__neigh_ifdown(tbl, dev, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(neigh_carrier_down);</div><div class='add'>+</div><div class='add'>+int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	__neigh_ifdown(tbl, dev, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_ifdown);</div><div class='ctx'> </div><div class='del'>-static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_device *dev)</div><div class='add'>+static struct neighbour *neigh_alloc(struct neigh_table *tbl,</div><div class='add'>+				     struct net_device *dev,</div><div class='add'>+				     u32 flags, bool exempt_from_gc)</div><div class='ctx'> {</div><div class='ctx'> 	struct neighbour *n = NULL;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='del'>-	int entries;</div><div class='del'>-</div><div class='del'>-	entries = atomic_inc_return(&amp;tbl-&gt;entries) - 1;</div><div class='del'>-	if (entries &gt;= tbl-&gt;gc_thresh3 ||</div><div class='del'>-	    (entries &gt;= tbl-&gt;gc_thresh2 &amp;&amp;</div><div class='del'>-	     time_after(now, tbl-&gt;last_flush + 5 * HZ))) {</div><div class='del'>-		if (!neigh_forced_gc(tbl) &amp;&amp;</div><div class='del'>-		    entries &gt;= tbl-&gt;gc_thresh3) {</div><div class='add'>+	int entries, gc_thresh3;</div><div class='add'>+</div><div class='add'>+	if (exempt_from_gc)</div><div class='add'>+		goto do_alloc;</div><div class='add'>+</div><div class='add'>+	entries = atomic_inc_return(&amp;tbl-&gt;gc_entries) - 1;</div><div class='add'>+	gc_thresh3 = READ_ONCE(tbl-&gt;gc_thresh3);</div><div class='add'>+	if (entries &gt;= gc_thresh3 ||</div><div class='add'>+	    (entries &gt;= READ_ONCE(tbl-&gt;gc_thresh2) &amp;&amp;</div><div class='add'>+	     time_after(now, READ_ONCE(tbl-&gt;last_flush) + 5 * HZ))) {</div><div class='add'>+		if (!neigh_forced_gc(tbl) &amp;&amp; entries &gt;= gc_thresh3) {</div><div class='ctx'> 			net_info_ratelimited("%s: neighbor table overflow!\n",</div><div class='ctx'> 					     tbl-&gt;id);</div><div class='ctx'> 			NEIGH_CACHE_STAT_INC(tbl, table_fulls);</div><div class='hunk'>@@ -321,6 +518,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_device</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+do_alloc:</div><div class='ctx'> 	n = kzalloc(tbl-&gt;entry_size + dev-&gt;neigh_priv_len, GFP_ATOMIC);</div><div class='ctx'> 	if (!n)</div><div class='ctx'> 		goto out_entries;</div><div class='hunk'>@@ -331,6 +529,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_device</div><div class='ctx'> 	n-&gt;updated	  = n-&gt;used = now;</div><div class='ctx'> 	n-&gt;nud_state	  = NUD_NONE;</div><div class='ctx'> 	n-&gt;output	  = neigh_blackhole;</div><div class='add'>+	n-&gt;flags	  = flags;</div><div class='ctx'> 	seqlock_init(&amp;n-&gt;hh.hh_lock);</div><div class='ctx'> 	n-&gt;parms	  = neigh_parms_clone(&amp;tbl-&gt;parms);</div><div class='ctx'> 	timer_setup(&amp;n-&gt;timer, neigh_timer_handler, 0);</div><div class='hunk'>@@ -339,11 +538,16 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_device</div><div class='ctx'> 	n-&gt;tbl		  = tbl;</div><div class='ctx'> 	refcount_set(&amp;n-&gt;refcnt, 1);</div><div class='ctx'> 	n-&gt;dead		  = 1;</div><div class='add'>+	INIT_LIST_HEAD(&amp;n-&gt;gc_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;n-&gt;managed_list);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;tbl-&gt;entries);</div><div class='ctx'> out:</div><div class='ctx'> 	return n;</div><div class='ctx'> </div><div class='ctx'> out_entries:</div><div class='del'>-	atomic_dec(&amp;tbl-&gt;entries);</div><div class='add'>+	if (!exempt_from_gc)</div><div class='add'>+		atomic_dec(&amp;tbl-&gt;gc_entries);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,25 +558,21 @@ static void neigh_get_hash_rnd(u32 *x)</div><div class='ctx'> </div><div class='ctx'> static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift)</div><div class='ctx'> {</div><div class='del'>-	size_t size = (1 &lt;&lt; shift) * sizeof(struct neighbour *);</div><div class='add'>+	size_t size = (1 &lt;&lt; shift) * sizeof(struct hlist_head);</div><div class='add'>+	struct hlist_head *hash_heads;</div><div class='ctx'> 	struct neigh_hash_table *ret;</div><div class='del'>-	struct neighbour __rcu **buckets;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ret = kmalloc(sizeof(*ret), GFP_ATOMIC);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (size &lt;= PAGE_SIZE)</div><div class='del'>-		buckets = kzalloc(size, GFP_ATOMIC);</div><div class='del'>-	else</div><div class='del'>-		buckets = (struct neighbour __rcu **)</div><div class='del'>-			  __get_free_pages(GFP_ATOMIC | __GFP_ZERO,</div><div class='del'>-					   get_order(size));</div><div class='del'>-	if (!buckets) {</div><div class='add'>+</div><div class='add'>+	hash_heads = kzalloc(size, GFP_ATOMIC);</div><div class='add'>+	if (!hash_heads) {</div><div class='ctx'> 		kfree(ret);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	ret-&gt;hash_buckets = buckets;</div><div class='add'>+	ret-&gt;hash_heads = hash_heads;</div><div class='ctx'> 	ret-&gt;hash_shift = shift;</div><div class='ctx'> 	for (i = 0; i &lt; NEIGH_NUM_HASH_RND; i++)</div><div class='ctx'> 		neigh_get_hash_rnd(&amp;ret-&gt;hash_rnd[i]);</div><div class='hunk'>@@ -384,13 +584,8 @@ static void neigh_hash_free_rcu(struct rcu_head *head)</div><div class='ctx'> 	struct neigh_hash_table *nht = container_of(head,</div><div class='ctx'> 						    struct neigh_hash_table,</div><div class='ctx'> 						    rcu);</div><div class='del'>-	size_t size = (1 &lt;&lt; nht-&gt;hash_shift) * sizeof(struct neighbour *);</div><div class='del'>-	struct neighbour __rcu **buckets = nht-&gt;hash_buckets;</div><div class='ctx'> </div><div class='del'>-	if (size &lt;= PAGE_SIZE)</div><div class='del'>-		kfree(buckets);</div><div class='del'>-	else</div><div class='del'>-		free_pages((unsigned long)buckets, get_order(size));</div><div class='add'>+	kfree(nht-&gt;hash_heads);</div><div class='ctx'> 	kfree(nht);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -409,24 +604,17 @@ static struct neigh_hash_table *neigh_hash_grow(struct neigh_table *tbl,</div><div class='ctx'> 		return old_nht;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; (1 &lt;&lt; old_nht-&gt;hash_shift); i++) {</div><div class='del'>-		struct neighbour *n, *next;</div><div class='add'>+		struct hlist_node *tmp;</div><div class='add'>+		struct neighbour *n;</div><div class='ctx'> </div><div class='del'>-		for (n = rcu_dereference_protected(old_nht-&gt;hash_buckets[i],</div><div class='del'>-						   lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='del'>-		     n != NULL;</div><div class='del'>-		     n = next) {</div><div class='add'>+		neigh_for_each_in_bucket_safe(n, tmp, &amp;old_nht-&gt;hash_heads[i]) {</div><div class='ctx'> 			hash = tbl-&gt;hash(n-&gt;primary_key, n-&gt;dev,</div><div class='ctx'> 					 new_nht-&gt;hash_rnd);</div><div class='ctx'> </div><div class='ctx'> 			hash &gt;&gt;= (32 - new_nht-&gt;hash_shift);</div><div class='del'>-			next = rcu_dereference_protected(n-&gt;next,</div><div class='del'>-						lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> </div><div class='del'>-			rcu_assign_pointer(n-&gt;next,</div><div class='del'>-					   rcu_dereference_protected(</div><div class='del'>-						new_nht-&gt;hash_buckets[hash],</div><div class='del'>-						lockdep_is_held(&amp;tbl-&gt;lock)));</div><div class='del'>-			rcu_assign_pointer(new_nht-&gt;hash_buckets[hash], n);</div><div class='add'>+			hlist_del_rcu(&amp;n-&gt;hash);</div><div class='add'>+			hlist_add_head_rcu(&amp;n-&gt;hash, &amp;new_nht-&gt;hash_heads[hash]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +630,7 @@ struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> </div><div class='ctx'> 	NEIGH_CACHE_STAT_INC(tbl, lookups);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	n = __neigh_lookup_noref(tbl, pkey, dev);</div><div class='ctx'> 	if (n) {</div><div class='ctx'> 		if (!refcount_inc_not_zero(&amp;n-&gt;refcnt))</div><div class='hunk'>@@ -450,51 +638,23 @@ struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> 		NEIGH_CACHE_STAT_INC(tbl, hits);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_lookup);</div><div class='ctx'> </div><div class='del'>-struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net,</div><div class='del'>-				     const void *pkey)</div><div class='add'>+static struct neighbour *</div><div class='add'>+___neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='add'>+		struct net_device *dev, u32 flags,</div><div class='add'>+		bool exempt_from_gc, bool want_ref)</div><div class='ctx'> {</div><div class='del'>-	struct neighbour *n;</div><div class='del'>-	unsigned int key_len = tbl-&gt;key_len;</div><div class='del'>-	u32 hash_val;</div><div class='add'>+	u32 hash_val, key_len = tbl-&gt;key_len;</div><div class='add'>+	struct neighbour *n1, *rc, *n;</div><div class='ctx'> 	struct neigh_hash_table *nht;</div><div class='del'>-</div><div class='del'>-	NEIGH_CACHE_STAT_INC(tbl, lookups);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	nht = rcu_dereference_bh(tbl-&gt;nht);</div><div class='del'>-	hash_val = tbl-&gt;hash(pkey, NULL, nht-&gt;hash_rnd) &gt;&gt; (32 - nht-&gt;hash_shift);</div><div class='del'>-</div><div class='del'>-	for (n = rcu_dereference_bh(nht-&gt;hash_buckets[hash_val]);</div><div class='del'>-	     n != NULL;</div><div class='del'>-	     n = rcu_dereference_bh(n-&gt;next)) {</div><div class='del'>-		if (!memcmp(n-&gt;primary_key, pkey, key_len) &amp;&amp;</div><div class='del'>-		    net_eq(dev_net(n-&gt;dev), net)) {</div><div class='del'>-			if (!refcount_inc_not_zero(&amp;n-&gt;refcnt))</div><div class='del'>-				n = NULL;</div><div class='del'>-			NEIGH_CACHE_STAT_INC(tbl, hits);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(neigh_lookup_nodev);</div><div class='del'>-</div><div class='del'>-struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='del'>-				 struct net_device *dev, bool want_ref)</div><div class='del'>-{</div><div class='del'>-	u32 hash_val;</div><div class='del'>-	unsigned int key_len = tbl-&gt;key_len;</div><div class='ctx'> 	int error;</div><div class='del'>-	struct neighbour *n1, *rc, *n = neigh_alloc(tbl, dev);</div><div class='del'>-	struct neigh_hash_table *nht;</div><div class='ctx'> </div><div class='add'>+	n = neigh_alloc(tbl, dev, flags, exempt_from_gc);</div><div class='add'>+	trace_neigh_create(tbl, dev, pkey, n, exempt_from_gc);</div><div class='ctx'> 	if (!n) {</div><div class='ctx'> 		rc = ERR_PTR(-ENOBUFS);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -502,7 +662,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(n-&gt;primary_key, pkey, key_len);</div><div class='ctx'> 	n-&gt;dev = dev;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;n-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	/* Protocol specific setup. */</div><div class='ctx'> 	if (tbl-&gt;constructor &amp;&amp;	(error = tbl-&gt;constructor(n)) &lt; 0) {</div><div class='hunk'>@@ -527,7 +687,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> </div><div class='ctx'> 	n-&gt;confirmed = jiffies - (NEIGH_VAR(n-&gt;parms, BASE_REACHABLE_TIME) &lt;&lt; 1);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='ctx'> 					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> </div><div class='hunk'>@@ -541,11 +701,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> 		goto out_tbl_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (n1 = rcu_dereference_protected(nht-&gt;hash_buckets[hash_val],</div><div class='del'>-					    lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='del'>-	     n1 != NULL;</div><div class='del'>-	     n1 = rcu_dereference_protected(n1-&gt;next,</div><div class='del'>-			lockdep_is_held(&amp;tbl-&gt;lock))) {</div><div class='add'>+	neigh_for_each_in_bucket(n1, &amp;nht-&gt;hash_heads[hash_val]) {</div><div class='ctx'> 		if (dev == n1-&gt;dev &amp;&amp; !memcmp(n1-&gt;primary_key, n-&gt;primary_key, key_len)) {</div><div class='ctx'> 			if (want_ref)</div><div class='ctx'> 				neigh_hold(n1);</div><div class='hunk'>@@ -555,23 +711,38 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	n-&gt;dead = 0;</div><div class='add'>+	if (!exempt_from_gc)</div><div class='add'>+		list_add_tail(&amp;n-&gt;gc_list, &amp;n-&gt;tbl-&gt;gc_list);</div><div class='add'>+	if (n-&gt;flags &amp; NTF_MANAGED)</div><div class='add'>+		list_add_tail(&amp;n-&gt;managed_list, &amp;n-&gt;tbl-&gt;managed_list);</div><div class='ctx'> 	if (want_ref)</div><div class='ctx'> 		neigh_hold(n);</div><div class='del'>-	rcu_assign_pointer(n-&gt;next,</div><div class='del'>-			   rcu_dereference_protected(nht-&gt;hash_buckets[hash_val],</div><div class='del'>-						     lockdep_is_held(&amp;tbl-&gt;lock)));</div><div class='del'>-	rcu_assign_pointer(nht-&gt;hash_buckets[hash_val], n);</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	hlist_add_head_rcu(&amp;n-&gt;hash, &amp;nht-&gt;hash_heads[hash_val]);</div><div class='add'>+</div><div class='add'>+	hlist_add_head_rcu(&amp;n-&gt;dev_list,</div><div class='add'>+			   neigh_get_dev_table(dev, tbl-&gt;family));</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	neigh_dbg(2, "neigh %p is created\n", n);</div><div class='ctx'> 	rc = n;</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> out_tbl_unlock:</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> out_neigh_release:</div><div class='add'>+	if (!exempt_from_gc)</div><div class='add'>+		atomic_dec(&amp;tbl-&gt;gc_entries);</div><div class='ctx'> 	neigh_release(n);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,</div><div class='add'>+				 struct net_device *dev, bool want_ref)</div><div class='add'>+{</div><div class='add'>+	bool exempt_from_gc = !!(dev-&gt;flags &amp; IFF_LOOPBACK);</div><div class='add'>+</div><div class='add'>+	return ___neigh_create(tbl, pkey, dev, 0, exempt_from_gc, want_ref);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(__neigh_create);</div><div class='ctx'> </div><div class='ctx'> static u32 pneigh_hash(const void *pkey, unsigned int key_len)</div><div class='hunk'>@@ -584,142 +755,160 @@ static u32 pneigh_hash(const void *pkey, unsigned int key_len)</div><div class='ctx'> 	return hash_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pneigh_entry *__pneigh_lookup_1(struct pneigh_entry *n,</div><div class='del'>-					      struct net *net,</div><div class='del'>-					      const void *pkey,</div><div class='del'>-					      unsigned int key_len,</div><div class='del'>-					      struct net_device *dev)</div><div class='add'>+struct pneigh_entry *pneigh_lookup(struct neigh_table *tbl,</div><div class='add'>+				   struct net *net, const void *pkey,</div><div class='add'>+				   struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct pneigh_entry *n;</div><div class='add'>+	unsigned int key_len;</div><div class='add'>+	u32 hash_val;</div><div class='add'>+</div><div class='add'>+	key_len = tbl-&gt;key_len;</div><div class='add'>+	hash_val = pneigh_hash(pkey, key_len);</div><div class='add'>+	n = rcu_dereference_check(tbl-&gt;phash_buckets[hash_val],</div><div class='add'>+				  lockdep_is_held(&amp;tbl-&gt;phash_lock));</div><div class='add'>+</div><div class='ctx'> 	while (n) {</div><div class='ctx'> 		if (!memcmp(n-&gt;key, pkey, key_len) &amp;&amp;</div><div class='ctx'> 		    net_eq(pneigh_net(n), net) &amp;&amp;</div><div class='ctx'> 		    (n-&gt;dev == dev || !n-&gt;dev))</div><div class='ctx'> 			return n;</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl,</div><div class='del'>-		struct net *net, const void *pkey, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int key_len = tbl-&gt;key_len;</div><div class='del'>-	u32 hash_val = pneigh_hash(pkey, key_len);</div><div class='add'>+		n = rcu_dereference_check(n-&gt;next, lockdep_is_held(&amp;tbl-&gt;phash_lock));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return __pneigh_lookup_1(tbl-&gt;phash_buckets[hash_val],</div><div class='del'>-				 net, pkey, key_len, dev);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__pneigh_lookup);</div><div class='add'>+EXPORT_IPV6_MOD(pneigh_lookup);</div><div class='ctx'> </div><div class='del'>-struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl,</div><div class='del'>-				    struct net *net, const void *pkey,</div><div class='del'>-				    struct net_device *dev, int creat)</div><div class='add'>+int pneigh_create(struct neigh_table *tbl, struct net *net,</div><div class='add'>+		  const void *pkey, struct net_device *dev,</div><div class='add'>+		  u32 flags, u8 protocol, bool permanent)</div><div class='ctx'> {</div><div class='ctx'> 	struct pneigh_entry *n;</div><div class='del'>-	unsigned int key_len = tbl-&gt;key_len;</div><div class='del'>-	u32 hash_val = pneigh_hash(pkey, key_len);</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	n = __pneigh_lookup_1(tbl-&gt;phash_buckets[hash_val],</div><div class='del'>-			      net, pkey, key_len, dev);</div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	unsigned int key_len;</div><div class='add'>+	u32 hash_val;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (n || !creat)</div><div class='del'>-		goto out;</div><div class='add'>+	mutex_lock(&amp;tbl-&gt;phash_lock);</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	n = pneigh_lookup(tbl, net, pkey, dev);</div><div class='add'>+	if (n)</div><div class='add'>+		goto update;</div><div class='ctx'> </div><div class='del'>-	n = kmalloc(sizeof(*n) + key_len, GFP_KERNEL);</div><div class='del'>-	if (!n)</div><div class='add'>+	key_len = tbl-&gt;key_len;</div><div class='add'>+	n = kzalloc(sizeof(*n) + key_len, GFP_KERNEL);</div><div class='add'>+	if (!n) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	write_pnet(&amp;n-&gt;net, net);</div><div class='ctx'> 	memcpy(n-&gt;key, pkey, key_len);</div><div class='ctx'> 	n-&gt;dev = dev;</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;n-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (tbl-&gt;pconstructor &amp;&amp; tbl-&gt;pconstructor(n)) {</div><div class='del'>-		if (dev)</div><div class='del'>-			dev_put(dev);</div><div class='add'>+		netdev_put(dev, &amp;n-&gt;dev_tracker);</div><div class='ctx'> 		kfree(n);</div><div class='del'>-		n = NULL;</div><div class='add'>+		err = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	hash_val = pneigh_hash(pkey, key_len);</div><div class='ctx'> 	n-&gt;next = tbl-&gt;phash_buckets[hash_val];</div><div class='del'>-	tbl-&gt;phash_buckets[hash_val] = n;</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	rcu_assign_pointer(tbl-&gt;phash_buckets[hash_val], n);</div><div class='add'>+update:</div><div class='add'>+	WRITE_ONCE(n-&gt;flags, flags);</div><div class='add'>+	n-&gt;permanent = permanent;</div><div class='add'>+	WRITE_ONCE(n-&gt;protocol, protocol);</div><div class='ctx'> out:</div><div class='del'>-	return n;</div><div class='add'>+	mutex_unlock(&amp;tbl-&gt;phash_lock);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pneigh_lookup);</div><div class='ctx'> </div><div class='add'>+static void pneigh_destroy(struct rcu_head *rcu)</div><div class='add'>+{</div><div class='add'>+	struct pneigh_entry *n = container_of(rcu, struct pneigh_entry, rcu);</div><div class='add'>+</div><div class='add'>+	netdev_put(n-&gt;dev, &amp;n-&gt;dev_tracker);</div><div class='add'>+	kfree(n);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey,</div><div class='ctx'> 		  struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pneigh_entry *n, **np;</div><div class='del'>-	unsigned int key_len = tbl-&gt;key_len;</div><div class='del'>-	u32 hash_val = pneigh_hash(pkey, key_len);</div><div class='add'>+	struct pneigh_entry *n, __rcu **np;</div><div class='add'>+	unsigned int key_len;</div><div class='add'>+	u32 hash_val;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	for (np = &amp;tbl-&gt;phash_buckets[hash_val]; (n = *np) != NULL;</div><div class='add'>+	key_len = tbl-&gt;key_len;</div><div class='add'>+	hash_val = pneigh_hash(pkey, key_len);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;tbl-&gt;phash_lock);</div><div class='add'>+</div><div class='add'>+	for (np = &amp;tbl-&gt;phash_buckets[hash_val];</div><div class='add'>+	     (n = rcu_dereference_protected(*np, 1)) != NULL;</div><div class='ctx'> 	     np = &amp;n-&gt;next) {</div><div class='ctx'> 		if (!memcmp(n-&gt;key, pkey, key_len) &amp;&amp; n-&gt;dev == dev &amp;&amp;</div><div class='ctx'> 		    net_eq(pneigh_net(n), net)) {</div><div class='del'>-			*np = n-&gt;next;</div><div class='del'>-			write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+			rcu_assign_pointer(*np, n-&gt;next);</div><div class='add'>+</div><div class='add'>+			mutex_unlock(&amp;tbl-&gt;phash_lock);</div><div class='add'>+</div><div class='ctx'> 			if (tbl-&gt;pdestructor)</div><div class='ctx'> 				tbl-&gt;pdestructor(n);</div><div class='del'>-			if (n-&gt;dev)</div><div class='del'>-				dev_put(n-&gt;dev);</div><div class='del'>-			kfree(n);</div><div class='add'>+</div><div class='add'>+			call_rcu(&amp;n-&gt;rcu, pneigh_destroy);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;tbl-&gt;phash_lock);</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pneigh_ifdown_and_unlock(struct neigh_table *tbl,</div><div class='del'>-				    struct net_device *dev)</div><div class='add'>+static void pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev,</div><div class='add'>+			  bool skip_perm)</div><div class='ctx'> {</div><div class='del'>-	struct pneigh_entry *n, **np, *freelist = NULL;</div><div class='add'>+	struct pneigh_entry *n, __rcu **np;</div><div class='add'>+	LIST_HEAD(head);</div><div class='ctx'> 	u32 h;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;tbl-&gt;phash_lock);</div><div class='add'>+</div><div class='ctx'> 	for (h = 0; h &lt;= PNEIGH_HASHMASK; h++) {</div><div class='ctx'> 		np = &amp;tbl-&gt;phash_buckets[h];</div><div class='del'>-		while ((n = *np) != NULL) {</div><div class='add'>+		while ((n = rcu_dereference_protected(*np, 1)) != NULL) {</div><div class='add'>+			if (skip_perm &amp;&amp; n-&gt;permanent)</div><div class='add'>+				goto skip;</div><div class='ctx'> 			if (!dev || n-&gt;dev == dev) {</div><div class='del'>-				*np = n-&gt;next;</div><div class='del'>-				n-&gt;next = freelist;</div><div class='del'>-				freelist = n;</div><div class='add'>+				rcu_assign_pointer(*np, n-&gt;next);</div><div class='add'>+				list_add(&amp;n-&gt;free_node, &amp;head);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='add'>+skip:</div><div class='ctx'> 			np = &amp;n-&gt;next;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	while ((n = freelist)) {</div><div class='del'>-		freelist = n-&gt;next;</div><div class='del'>-		n-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;tbl-&gt;phash_lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;head)) {</div><div class='add'>+		n = list_first_entry(&amp;head, typeof(*n), free_node);</div><div class='add'>+		list_del(&amp;n-&gt;free_node);</div><div class='add'>+</div><div class='ctx'> 		if (tbl-&gt;pdestructor)</div><div class='ctx'> 			tbl-&gt;pdestructor(n);</div><div class='del'>-		if (n-&gt;dev)</div><div class='del'>-			dev_put(n-&gt;dev);</div><div class='del'>-		kfree(n);</div><div class='add'>+</div><div class='add'>+		call_rcu(&amp;n-&gt;rcu, pneigh_destroy);</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void neigh_parms_destroy(struct neigh_parms *parms);</div><div class='del'>-</div><div class='ctx'> static inline void neigh_parms_put(struct neigh_parms *parms)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;parms-&gt;refcnt))</div><div class='del'>-		neigh_parms_destroy(parms);</div><div class='add'>+		kfree(parms);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -749,7 +938,7 @@ void neigh_destroy(struct neighbour *neigh)</div><div class='ctx'> 	if (dev-&gt;netdev_ops-&gt;ndo_neigh_destroy)</div><div class='ctx'> 		dev-&gt;netdev_ops-&gt;ndo_neigh_destroy(dev, neigh);</div><div class='ctx'> </div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;neigh-&gt;dev_tracker);</div><div class='ctx'> 	neigh_parms_put(neigh-&gt;parms);</div><div class='ctx'> </div><div class='ctx'> 	neigh_dbg(2, "neigh %p is destroyed\n", neigh);</div><div class='hunk'>@@ -768,7 +957,7 @@ static void neigh_suspect(struct neighbour *neigh)</div><div class='ctx'> {</div><div class='ctx'> 	neigh_dbg(2, "neigh %p is suspected\n", neigh);</div><div class='ctx'> </div><div class='del'>-	neigh-&gt;output = neigh-&gt;ops-&gt;output;</div><div class='add'>+	WRITE_ONCE(neigh-&gt;output, neigh-&gt;ops-&gt;output);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Neighbour state is OK;</div><div class='hunk'>@@ -780,20 +969,20 @@ static void neigh_connect(struct neighbour *neigh)</div><div class='ctx'> {</div><div class='ctx'> 	neigh_dbg(2, "neigh %p is connected\n", neigh);</div><div class='ctx'> </div><div class='del'>-	neigh-&gt;output = neigh-&gt;ops-&gt;connected_output;</div><div class='add'>+	WRITE_ONCE(neigh-&gt;output, neigh-&gt;ops-&gt;connected_output);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void neigh_periodic_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct neigh_table *tbl = container_of(work, struct neigh_table, gc_work.work);</div><div class='add'>+	struct neigh_hash_table *nht;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='ctx'> 	struct neighbour *n;</div><div class='del'>-	struct neighbour __rcu **np;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct neigh_hash_table *nht;</div><div class='ctx'> </div><div class='ctx'> 	NEIGH_CACHE_STAT_INC(tbl, periodic_gc_runs);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='ctx'> 					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> </div><div class='hunk'>@@ -803,55 +992,53 @@ static void neigh_periodic_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if (time_after(jiffies, tbl-&gt;last_rand + 300 * HZ)) {</div><div class='ctx'> 		struct neigh_parms *p;</div><div class='del'>-		tbl-&gt;last_rand = jiffies;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(tbl-&gt;last_rand, jiffies);</div><div class='ctx'> 		list_for_each_entry(p, &amp;tbl-&gt;parms_list, list)</div><div class='del'>-			p-&gt;reachable_time =</div><div class='del'>-				neigh_rand_reach_time(NEIGH_VAR(p, BASE_REACHABLE_TIME));</div><div class='add'>+			neigh_set_reach_time(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;tbl-&gt;entries) &lt; tbl-&gt;gc_thresh1)</div><div class='add'>+	if (atomic_read(&amp;tbl-&gt;entries) &lt; READ_ONCE(tbl-&gt;gc_thresh1))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; (1 &lt;&lt; nht-&gt;hash_shift); i++) {</div><div class='del'>-		np = &amp;nht-&gt;hash_buckets[i];</div><div class='del'>-</div><div class='del'>-		while ((n = rcu_dereference_protected(*np,</div><div class='del'>-				lockdep_is_held(&amp;tbl-&gt;lock))) != NULL) {</div><div class='add'>+		neigh_for_each_in_bucket_safe(n, tmp, &amp;nht-&gt;hash_heads[i]) {</div><div class='ctx'> 			unsigned int state;</div><div class='ctx'> </div><div class='ctx'> 			write_lock(&amp;n-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 			state = n-&gt;nud_state;</div><div class='ctx'> 			if ((state &amp; (NUD_PERMANENT | NUD_IN_TIMER)) ||</div><div class='del'>-			    (n-&gt;flags &amp; NTF_EXT_LEARNED)) {</div><div class='add'>+			    (n-&gt;flags &amp;</div><div class='add'>+			     (NTF_EXT_LEARNED | NTF_EXT_VALIDATED))) {</div><div class='ctx'> 				write_unlock(&amp;n-&gt;lock);</div><div class='del'>-				goto next_elt;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (time_before(n-&gt;used, n-&gt;confirmed))</div><div class='add'>+			if (time_before(n-&gt;used, n-&gt;confirmed) &amp;&amp;</div><div class='add'>+			    time_is_before_eq_jiffies(n-&gt;confirmed))</div><div class='ctx'> 				n-&gt;used = n-&gt;confirmed;</div><div class='ctx'> </div><div class='ctx'> 			if (refcount_read(&amp;n-&gt;refcnt) == 1 &amp;&amp;</div><div class='ctx'> 			    (state == NUD_FAILED ||</div><div class='del'>-			     time_after(jiffies, n-&gt;used + NEIGH_VAR(n-&gt;parms, GC_STALETIME)))) {</div><div class='del'>-				*np = n-&gt;next;</div><div class='del'>-				n-&gt;dead = 1;</div><div class='add'>+			     !time_in_range_open(jiffies, n-&gt;used,</div><div class='add'>+						 n-&gt;used + NEIGH_VAR(n-&gt;parms, GC_STALETIME)))) {</div><div class='add'>+				hlist_del_rcu(&amp;n-&gt;hash);</div><div class='add'>+				hlist_del_rcu(&amp;n-&gt;dev_list);</div><div class='add'>+				neigh_mark_dead(n);</div><div class='ctx'> 				write_unlock(&amp;n-&gt;lock);</div><div class='ctx'> 				neigh_cleanup_and_release(n);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			write_unlock(&amp;n-&gt;lock);</div><div class='del'>-</div><div class='del'>-next_elt:</div><div class='del'>-			np = &amp;n-&gt;next;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * It's fine to release lock here, even if hash table</div><div class='ctx'> 		 * grows while we are preempted.</div><div class='ctx'> 		 */</div><div class='del'>-		write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 		cond_resched();</div><div class='del'>-		write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 		nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='ctx'> 						lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -862,7 +1049,7 @@ out:</div><div class='ctx'> 	 */</div><div class='ctx'> 	queue_delayed_work(system_power_efficient_wq, &amp;tbl-&gt;gc_work,</div><div class='ctx'> 			      NEIGH_VAR(&amp;tbl-&gt;parms, BASE_REACHABLE_TIME) &gt;&gt; 1);</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __inline__ int neigh_max_probes(struct neighbour *n)</div><div class='hunk'>@@ -909,7 +1096,7 @@ static void neigh_probe(struct neighbour *neigh)</div><div class='ctx'> 	if (neigh-&gt;ops-&gt;solicit)</div><div class='ctx'> 		neigh-&gt;ops-&gt;solicit(neigh, skb);</div><div class='ctx'> 	atomic_inc(&amp;neigh-&gt;probes);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	consume_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called when a timer expires for a neighbour entry. */</div><div class='hunk'>@@ -917,7 +1104,7 @@ static void neigh_probe(struct neighbour *neigh)</div><div class='ctx'> static void neigh_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now, next;</div><div class='del'>-	struct neighbour *neigh = from_timer(neigh, t, timer);</div><div class='add'>+	struct neighbour *neigh = timer_container_of(neigh, t, timer);</div><div class='ctx'> 	unsigned int state;</div><div class='ctx'> 	int notify = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -939,13 +1126,13 @@ static void neigh_timer_handler(struct timer_list *t)</div><div class='ctx'> 					  neigh-&gt;used +</div><div class='ctx'> 					  NEIGH_VAR(neigh-&gt;parms, DELAY_PROBE_TIME))) {</div><div class='ctx'> 			neigh_dbg(2, "neigh %p is delayed\n", neigh);</div><div class='del'>-			neigh-&gt;nud_state = NUD_DELAY;</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_DELAY);</div><div class='ctx'> 			neigh-&gt;updated = jiffies;</div><div class='ctx'> 			neigh_suspect(neigh);</div><div class='ctx'> 			next = now + NEIGH_VAR(neigh-&gt;parms, DELAY_PROBE_TIME);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			neigh_dbg(2, "neigh %p is suspected\n", neigh);</div><div class='del'>-			neigh-&gt;nud_state = NUD_STALE;</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_STALE);</div><div class='ctx'> 			neigh-&gt;updated = jiffies;</div><div class='ctx'> 			neigh_suspect(neigh);</div><div class='ctx'> 			notify = 1;</div><div class='hunk'>@@ -955,35 +1142,42 @@ static void neigh_timer_handler(struct timer_list *t)</div><div class='ctx'> 				   neigh-&gt;confirmed +</div><div class='ctx'> 				   NEIGH_VAR(neigh-&gt;parms, DELAY_PROBE_TIME))) {</div><div class='ctx'> 			neigh_dbg(2, "neigh %p is now reachable\n", neigh);</div><div class='del'>-			neigh-&gt;nud_state = NUD_REACHABLE;</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_REACHABLE);</div><div class='ctx'> 			neigh-&gt;updated = jiffies;</div><div class='ctx'> 			neigh_connect(neigh);</div><div class='ctx'> 			notify = 1;</div><div class='ctx'> 			next = neigh-&gt;confirmed + neigh-&gt;parms-&gt;reachable_time;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			neigh_dbg(2, "neigh %p is probed\n", neigh);</div><div class='del'>-			neigh-&gt;nud_state = NUD_PROBE;</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_PROBE);</div><div class='ctx'> 			neigh-&gt;updated = jiffies;</div><div class='ctx'> 			atomic_set(&amp;neigh-&gt;probes, 0);</div><div class='ctx'> 			notify = 1;</div><div class='del'>-			next = now + NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME);</div><div class='add'>+			next = now + max(NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME),</div><div class='add'>+					 HZ/100);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* NUD_PROBE|NUD_INCOMPLETE */</div><div class='del'>-		next = now + NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME);</div><div class='add'>+		next = now + max(NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME), HZ/100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((neigh-&gt;nud_state &amp; (NUD_INCOMPLETE | NUD_PROBE)) &amp;&amp;</div><div class='ctx'> 	    atomic_read(&amp;neigh-&gt;probes) &gt;= neigh_max_probes(neigh)) {</div><div class='del'>-		neigh-&gt;nud_state = NUD_FAILED;</div><div class='add'>+		if (neigh-&gt;nud_state == NUD_PROBE &amp;&amp;</div><div class='add'>+		    neigh-&gt;flags &amp; NTF_EXT_VALIDATED) {</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_STALE);</div><div class='add'>+			neigh-&gt;updated = jiffies;</div><div class='add'>+		} else {</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_FAILED);</div><div class='add'>+			neigh_invalidate(neigh);</div><div class='add'>+		}</div><div class='ctx'> 		notify = 1;</div><div class='del'>-		neigh_invalidate(neigh);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (neigh-&gt;nud_state &amp; NUD_IN_TIMER) {</div><div class='del'>-		if (time_before(next, jiffies + HZ/2))</div><div class='del'>-			next = jiffies + HZ/2;</div><div class='add'>+		if (time_before(next, jiffies + HZ/100))</div><div class='add'>+			next = jiffies + HZ/100;</div><div class='ctx'> 		if (!mod_timer(&amp;neigh-&gt;timer, next))</div><div class='ctx'> 			neigh_hold(neigh);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -997,10 +1191,13 @@ out:</div><div class='ctx'> 	if (notify)</div><div class='ctx'> 		neigh_update_notify(neigh, 0);</div><div class='ctx'> </div><div class='add'>+	trace_neigh_timer_handler(neigh, 0);</div><div class='add'>+</div><div class='ctx'> 	neigh_release(neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)</div><div class='add'>+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,</div><div class='add'>+		       const bool immediate_ok)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	bool immediate_probe = false;</div><div class='hunk'>@@ -1020,23 +1217,30 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 			atomic_set(&amp;neigh-&gt;probes,</div><div class='ctx'> 				   NEIGH_VAR(neigh-&gt;parms, UCAST_PROBES));</div><div class='del'>-			neigh-&gt;nud_state     = NUD_INCOMPLETE;</div><div class='add'>+			neigh_del_timer(neigh);</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_INCOMPLETE);</div><div class='ctx'> 			neigh-&gt;updated = now;</div><div class='del'>-			next = now + max(NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME),</div><div class='del'>-					 HZ/2);</div><div class='add'>+			if (!immediate_ok) {</div><div class='add'>+				next = now + 1;</div><div class='add'>+			} else {</div><div class='add'>+				immediate_probe = true;</div><div class='add'>+				next = now + max(NEIGH_VAR(neigh-&gt;parms,</div><div class='add'>+							   RETRANS_TIME),</div><div class='add'>+						 HZ / 100);</div><div class='add'>+			}</div><div class='ctx'> 			neigh_add_timer(neigh, next);</div><div class='del'>-			immediate_probe = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			neigh-&gt;nud_state = NUD_FAILED;</div><div class='add'>+			WRITE_ONCE(neigh-&gt;nud_state, NUD_FAILED);</div><div class='ctx'> 			neigh-&gt;updated = jiffies;</div><div class='ctx'> 			write_unlock_bh(&amp;neigh-&gt;lock);</div><div class='ctx'> </div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_FAILED);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (neigh-&gt;nud_state &amp; NUD_STALE) {</div><div class='ctx'> 		neigh_dbg(2, "neigh %p is delayed\n", neigh);</div><div class='del'>-		neigh-&gt;nud_state = NUD_DELAY;</div><div class='add'>+		neigh_del_timer(neigh);</div><div class='add'>+		WRITE_ONCE(neigh-&gt;nud_state, NUD_DELAY);</div><div class='ctx'> 		neigh-&gt;updated = jiffies;</div><div class='ctx'> 		neigh_add_timer(neigh, jiffies +</div><div class='ctx'> 				NEIGH_VAR(neigh-&gt;parms, DELAY_PROBE_TIME));</div><div class='hunk'>@@ -1052,7 +1256,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> 				if (!buff)</div><div class='ctx'> 					break;</div><div class='ctx'> 				neigh-&gt;arp_queue_len_bytes -= buff-&gt;truesize;</div><div class='del'>-				kfree_skb(buff);</div><div class='add'>+				kfree_skb_reason(buff, SKB_DROP_REASON_NEIGH_QUEUEFULL);</div><div class='ctx'> 				NEIGH_CACHE_STAT_INC(neigh-&gt;tbl, unres_discards);</div><div class='ctx'> 			}</div><div class='ctx'> 			skb_dst_force(skb);</div><div class='hunk'>@@ -1067,13 +1271,15 @@ out_unlock_bh:</div><div class='ctx'> 	else</div><div class='ctx'> 		write_unlock(&amp;neigh-&gt;lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='add'>+	trace_neigh_event_send_done(neigh, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='ctx'> out_dead:</div><div class='ctx'> 	if (neigh-&gt;nud_state &amp; NUD_STALE)</div><div class='ctx'> 		goto out_unlock_bh;</div><div class='ctx'> 	write_unlock_bh(&amp;neigh-&gt;lock);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_DEAD);</div><div class='add'>+	trace_neigh_event_send_dead(neigh, 1);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__neigh_event_send);</div><div class='hunk'>@@ -1089,7 +1295,7 @@ static void neigh_update_hhs(struct neighbour *neigh)</div><div class='ctx'> </div><div class='ctx'> 	if (update) {</div><div class='ctx'> 		hh = &amp;neigh-&gt;hh;</div><div class='del'>-		if (hh-&gt;hh_len) {</div><div class='add'>+		if (READ_ONCE(hh-&gt;hh_len)) {</div><div class='ctx'> 			write_seqlock_bh(&amp;hh-&gt;hh_lock);</div><div class='ctx'> 			update(hh, neigh-&gt;dev, neigh-&gt;ha);</div><div class='ctx'> 			write_sequnlock_bh(&amp;hh-&gt;hh_lock);</div><div class='hunk'>@@ -1097,8 +1303,6 @@ static void neigh_update_hhs(struct neighbour *neigh)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Generic update routine.</div><div class='ctx'>    -- lladdr is new lladdr or NULL, if it is not supplied.</div><div class='ctx'>    -- new    is new state.</div><div class='hunk'>@@ -1109,23 +1313,28 @@ static void neigh_update_hhs(struct neighbour *neigh)</div><div class='ctx'> 				lladdr instead of overriding it</div><div class='ctx'> 				if it is different.</div><div class='ctx'> 	NEIGH_UPDATE_F_ADMIN	means that the change is administrative.</div><div class='del'>-</div><div class='add'>+	NEIGH_UPDATE_F_USE	means that the entry is user triggered.</div><div class='add'>+	NEIGH_UPDATE_F_MANAGED	means that the entry will be auto-refreshed.</div><div class='ctx'> 	NEIGH_UPDATE_F_OVERRIDE_ISROUTER allows to override existing</div><div class='ctx'> 				NTF_ROUTER flag.</div><div class='ctx'> 	NEIGH_UPDATE_F_ISROUTER	indicates if the neighbour is known as</div><div class='ctx'> 				a router.</div><div class='add'>+	NEIGH_UPDATE_F_EXT_VALIDATED means that the entry will not be removed</div><div class='add'>+				or invalidated.</div><div class='ctx'> </div><div class='ctx'>    Caller MUST hold reference count on the entry.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='del'>-		 u32 flags, u32 nlmsg_pid)</div><div class='add'>+static int __neigh_update(struct neighbour *neigh, const u8 *lladdr,</div><div class='add'>+			  u8 new, u32 flags, u32 nlmsg_pid,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	u8 old;</div><div class='del'>-	int err;</div><div class='del'>-	int notify = 0;</div><div class='del'>-	struct net_device *dev;</div><div class='add'>+	bool gc_update = false, managed_update = false;</div><div class='ctx'> 	int update_isrouter = 0;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err, notify = 0;</div><div class='add'>+	u8 old;</div><div class='add'>+</div><div class='add'>+	trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid);</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;neigh-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1133,23 +1342,31 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='ctx'> 	old    = neigh-&gt;nud_state;</div><div class='ctx'> 	err    = -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (neigh-&gt;dead) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Neighbor entry is now dead");</div><div class='add'>+		new = old;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	if (!(flags &amp; NEIGH_UPDATE_F_ADMIN) &amp;&amp;</div><div class='ctx'> 	    (old &amp; (NUD_NOARP | NUD_PERMANENT)))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (neigh-&gt;dead)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	neigh_update_ext_learned(neigh, flags, &amp;notify);</div><div class='add'>+	neigh_update_flags(neigh, flags, &amp;notify, &amp;gc_update, &amp;managed_update);</div><div class='add'>+	if (flags &amp; (NEIGH_UPDATE_F_USE | NEIGH_UPDATE_F_MANAGED)) {</div><div class='add'>+		new = old &amp; ~NUD_PERMANENT;</div><div class='add'>+		WRITE_ONCE(neigh-&gt;nud_state, new);</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(new &amp; NUD_VALID)) {</div><div class='ctx'> 		neigh_del_timer(neigh);</div><div class='ctx'> 		if (old &amp; NUD_CONNECTED)</div><div class='ctx'> 			neigh_suspect(neigh);</div><div class='del'>-		neigh-&gt;nud_state = new;</div><div class='add'>+		WRITE_ONCE(neigh-&gt;nud_state, new);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		notify = old &amp; NUD_VALID;</div><div class='del'>-		if (((old &amp; (NUD_INCOMPLETE | NUD_PROBE)) ||</div><div class='del'>-		     (flags &amp; NEIGH_UPDATE_F_ADMIN)) &amp;&amp;</div><div class='add'>+		if ((old &amp; (NUD_INCOMPLETE | NUD_PROBE)) &amp;&amp;</div><div class='ctx'> 		    (new &amp; NUD_FAILED)) {</div><div class='ctx'> 			neigh_invalidate(neigh);</div><div class='ctx'> 			notify = 1;</div><div class='hunk'>@@ -1175,8 +1392,10 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='ctx'> 		   use it, otherwise discard the request.</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		if (!(old &amp; NUD_VALID))</div><div class='add'>+		if (!(old &amp; NUD_VALID)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "No link layer address given");</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		lladdr = neigh-&gt;ha;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1223,7 +1442,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='ctx'> 						((new &amp; NUD_REACHABLE) ?</div><div class='ctx'> 						 neigh-&gt;parms-&gt;reachable_time :</div><div class='ctx'> 						 0)));</div><div class='del'>-		neigh-&gt;nud_state = new;</div><div class='add'>+		WRITE_ONCE(neigh-&gt;nud_state, new);</div><div class='ctx'> 		notify = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1264,12 +1483,13 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='ctx'> 			 * we can reinject the packet there.</div><div class='ctx'> 			 */</div><div class='ctx'> 			n2 = NULL;</div><div class='del'>-			if (dst) {</div><div class='add'>+			if (dst &amp;&amp;</div><div class='add'>+			    READ_ONCE(dst-&gt;obsolete) != DST_OBSOLETE_DEAD) {</div><div class='ctx'> 				n2 = dst_neigh_lookup_skb(dst, skb);</div><div class='ctx'> 				if (n2)</div><div class='ctx'> 					n1 = n2;</div><div class='ctx'> 			}</div><div class='del'>-			n1-&gt;output(n1, skb);</div><div class='add'>+			READ_ONCE(n1-&gt;output)(n1, skb);</div><div class='ctx'> 			if (n2)</div><div class='ctx'> 				neigh_release(n2);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='hunk'>@@ -1280,18 +1500,24 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='ctx'> 		neigh-&gt;arp_queue_len_bytes = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (update_isrouter) {</div><div class='del'>-		neigh-&gt;flags = (flags &amp; NEIGH_UPDATE_F_ISROUTER) ?</div><div class='del'>-			(neigh-&gt;flags | NTF_ROUTER) :</div><div class='del'>-			(neigh-&gt;flags &amp; ~NTF_ROUTER);</div><div class='del'>-	}</div><div class='add'>+	if (update_isrouter)</div><div class='add'>+		neigh_update_is_router(neigh, flags, &amp;notify);</div><div class='ctx'> 	write_unlock_bh(&amp;neigh-&gt;lock);</div><div class='del'>-</div><div class='add'>+	if (((new ^ old) &amp; NUD_PERMANENT) || gc_update)</div><div class='add'>+		neigh_update_gc_list(neigh);</div><div class='add'>+	if (managed_update)</div><div class='add'>+		neigh_update_managed_list(neigh);</div><div class='ctx'> 	if (notify)</div><div class='ctx'> 		neigh_update_notify(neigh, nlmsg_pid);</div><div class='del'>-</div><div class='add'>+	trace_neigh_update_done(neigh, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,</div><div class='add'>+		 u32 flags, u32 nlmsg_pid)</div><div class='add'>+{</div><div class='add'>+	return __neigh_update(neigh, lladdr, new, flags, nlmsg_pid, NULL);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(neigh_update);</div><div class='ctx'> </div><div class='ctx'> /* Update the neigh to listen temporarily for probe responses, even if it is</div><div class='hunk'>@@ -1304,10 +1530,11 @@ void __neigh_set_probe_once(struct neighbour *neigh)</div><div class='ctx'> 	neigh-&gt;updated = jiffies;</div><div class='ctx'> 	if (!(neigh-&gt;nud_state &amp; NUD_FAILED))</div><div class='ctx'> 		return;</div><div class='del'>-	neigh-&gt;nud_state = NUD_INCOMPLETE;</div><div class='add'>+	WRITE_ONCE(neigh-&gt;nud_state, NUD_INCOMPLETE);</div><div class='ctx'> 	atomic_set(&amp;neigh-&gt;probes, neigh_max_probes(neigh));</div><div class='ctx'> 	neigh_add_timer(neigh,</div><div class='del'>-			jiffies + NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME));</div><div class='add'>+			jiffies + max(NEIGH_VAR(neigh-&gt;parms, RETRANS_TIME),</div><div class='add'>+				      HZ/100));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__neigh_set_probe_once);</div><div class='ctx'> </div><div class='hunk'>@@ -1353,7 +1580,7 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> 		struct net_device *dev = neigh-&gt;dev;</div><div class='ctx'> 		unsigned int seq;</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;header_ops-&gt;cache &amp;&amp; !neigh-&gt;hh.hh_len)</div><div class='add'>+		if (dev-&gt;header_ops-&gt;cache &amp;&amp; !READ_ONCE(neigh-&gt;hh.hh_len))</div><div class='ctx'> 			neigh_hh_init(neigh);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='hunk'>@@ -1372,7 +1599,7 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> out_kfree_skb:</div><div class='ctx'> 	rc = -EINVAL;</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_HH_FILLFAIL);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_resolve_output);</div><div class='hunk'>@@ -1396,7 +1623,7 @@ int neigh_connected_output(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> 		err = dev_queue_xmit(skb);</div><div class='ctx'> 	else {</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_HH_FILLFAIL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1408,9 +1635,23 @@ int neigh_direct_output(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_direct_output);</div><div class='ctx'> </div><div class='add'>+static void neigh_managed_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct neigh_table *tbl = container_of(work, struct neigh_table,</div><div class='add'>+					       managed_work.work);</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	list_for_each_entry(neigh, &amp;tbl-&gt;managed_list, managed_list)</div><div class='add'>+		neigh_event_send_probe(neigh, NULL, false);</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;tbl-&gt;managed_work,</div><div class='add'>+			   NEIGH_VAR(&amp;tbl-&gt;parms, INTERVAL_PROBE_TIME_MS));</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void neigh_proxy_process(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct neigh_table *tbl = from_timer(tbl, t, proxy_timer);</div><div class='add'>+	struct neigh_table *tbl = timer_container_of(tbl, t, proxy_timer);</div><div class='ctx'> 	long sched_next = 0;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	struct sk_buff *skb, *n;</div><div class='hunk'>@@ -1423,7 +1664,9 @@ static void neigh_proxy_process(struct timer_list *t)</div><div class='ctx'> 		if (tdif &lt;= 0) {</div><div class='ctx'> 			struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> </div><div class='add'>+			neigh_parms_qlen_dec(dev, tbl-&gt;family);</div><div class='ctx'> 			__skb_unlink(skb, &amp;tbl-&gt;proxy_queue);</div><div class='add'>+</div><div class='ctx'> 			if (tbl-&gt;proxy_redo &amp;&amp; netif_running(dev)) {</div><div class='ctx'> 				rcu_read_lock();</div><div class='ctx'> 				tbl-&gt;proxy_redo(skb);</div><div class='hunk'>@@ -1436,21 +1679,29 @@ static void neigh_proxy_process(struct timer_list *t)</div><div class='ctx'> 		} else if (!sched_next || tdif &lt; sched_next)</div><div class='ctx'> 			sched_next = tdif;</div><div class='ctx'> 	}</div><div class='del'>-	del_timer(&amp;tbl-&gt;proxy_timer);</div><div class='add'>+	timer_delete(&amp;tbl-&gt;proxy_timer);</div><div class='ctx'> 	if (sched_next)</div><div class='ctx'> 		mod_timer(&amp;tbl-&gt;proxy_timer, jiffies + sched_next);</div><div class='ctx'> 	spin_unlock(&amp;tbl-&gt;proxy_queue.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long neigh_proxy_delay(struct neigh_parms *p)</div><div class='add'>+{</div><div class='add'>+	/* If proxy_delay is zero, do not call get_random_u32_below()</div><div class='add'>+	 * as it is undefined behavior.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long proxy_delay = NEIGH_VAR(p, PROXY_DELAY);</div><div class='add'>+</div><div class='add'>+	return proxy_delay ?</div><div class='add'>+	       jiffies + get_random_u32_below(proxy_delay) : jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p,</div><div class='ctx'> 		    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long now = jiffies;</div><div class='add'>+	unsigned long sched_next = neigh_proxy_delay(p);</div><div class='ctx'> </div><div class='del'>-	unsigned long sched_next = now + (prandom_u32() %</div><div class='del'>-					  NEIGH_VAR(p, PROXY_DELAY));</div><div class='del'>-</div><div class='del'>-	if (tbl-&gt;proxy_queue.qlen &gt; NEIGH_VAR(p, PROXY_QLEN)) {</div><div class='add'>+	if (p-&gt;qlen &gt; NEIGH_VAR(p, PROXY_QLEN)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1459,13 +1710,14 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p,</div><div class='ctx'> 	NEIGH_CB(skb)-&gt;flags |= LOCALLY_ENQUEUED;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tbl-&gt;proxy_queue.lock);</div><div class='del'>-	if (del_timer(&amp;tbl-&gt;proxy_timer)) {</div><div class='add'>+	if (timer_delete(&amp;tbl-&gt;proxy_timer)) {</div><div class='ctx'> 		if (time_before(tbl-&gt;proxy_timer.expires, sched_next))</div><div class='ctx'> 			sched_next = tbl-&gt;proxy_timer.expires;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> 	dev_hold(skb-&gt;dev);</div><div class='ctx'> 	__skb_queue_tail(&amp;tbl-&gt;proxy_queue, skb);</div><div class='add'>+	p-&gt;qlen++;</div><div class='ctx'> 	mod_timer(&amp;tbl-&gt;proxy_timer, sched_next);</div><div class='ctx'> 	spin_unlock(&amp;tbl-&gt;proxy_queue.lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1496,22 +1748,22 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev,</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		p-&gt;tbl		  = tbl;</div><div class='ctx'> 		refcount_set(&amp;p-&gt;refcnt, 1);</div><div class='del'>-		p-&gt;reachable_time =</div><div class='del'>-				neigh_rand_reach_time(NEIGH_VAR(p, BASE_REACHABLE_TIME));</div><div class='del'>-		dev_hold(dev);</div><div class='add'>+		neigh_set_reach_time(p);</div><div class='add'>+		p-&gt;qlen = 0;</div><div class='add'>+		netdev_hold(dev, &amp;p-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 		p-&gt;dev = dev;</div><div class='ctx'> 		write_pnet(&amp;p-&gt;net, net);</div><div class='ctx'> 		p-&gt;sysctl_table = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (ops-&gt;ndo_neigh_setup &amp;&amp; ops-&gt;ndo_neigh_setup(dev, p)) {</div><div class='del'>-			dev_put(dev);</div><div class='add'>+			netdev_put(dev, &amp;p-&gt;dev_tracker);</div><div class='ctx'> 			kfree(p);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-		list_add(&amp;p-&gt;list, &amp;tbl-&gt;parms.list);</div><div class='del'>-		write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		list_add_rcu(&amp;p-&gt;list, &amp;tbl-&gt;parms.list);</div><div class='add'>+		spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		neigh_parms_data_state_cleanall(p);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1531,24 +1783,20 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms)</div><div class='ctx'> {</div><div class='ctx'> 	if (!parms || parms == &amp;tbl-&gt;parms)</div><div class='ctx'> 		return;</div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	list_del(&amp;parms-&gt;list);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	list_del_rcu(&amp;parms-&gt;list);</div><div class='ctx'> 	parms-&gt;dead = 1;</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	if (parms-&gt;dev)</div><div class='del'>-		dev_put(parms-&gt;dev);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netdev_put(parms-&gt;dev, &amp;parms-&gt;dev_tracker);</div><div class='ctx'> 	call_rcu(&amp;parms-&gt;rcu_head, neigh_rcu_free_parms);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_parms_release);</div><div class='ctx'> </div><div class='del'>-static void neigh_parms_destroy(struct neigh_parms *parms)</div><div class='del'>-{</div><div class='del'>-	kfree(parms);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct lock_class_key neigh_table_proxy_queue_class;</div><div class='ctx'> </div><div class='del'>-static struct neigh_table *neigh_tables[NEIGH_NR_TABLES] __read_mostly;</div><div class='add'>+static struct neigh_table __rcu *neigh_tables[NEIGH_NR_TABLES] __read_mostly;</div><div class='ctx'> </div><div class='ctx'> void neigh_table_init(int index, struct neigh_table *tbl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1556,11 +1804,14 @@ void neigh_table_init(int index, struct neigh_table *tbl)</div><div class='ctx'> 	unsigned long phsize;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tbl-&gt;parms_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;tbl-&gt;gc_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;tbl-&gt;managed_list);</div><div class='add'>+</div><div class='ctx'> 	list_add(&amp;tbl-&gt;parms.list, &amp;tbl-&gt;parms_list);</div><div class='ctx'> 	write_pnet(&amp;tbl-&gt;parms.net, &amp;init_net);</div><div class='ctx'> 	refcount_set(&amp;tbl-&gt;parms.refcnt, 1);</div><div class='del'>-	tbl-&gt;parms.reachable_time =</div><div class='del'>-			  neigh_rand_reach_time(NEIGH_VAR(&amp;tbl-&gt;parms, BASE_REACHABLE_TIME));</div><div class='add'>+	neigh_set_reach_time(&amp;tbl-&gt;parms);</div><div class='add'>+	tbl-&gt;parms.qlen = 0;</div><div class='ctx'> </div><div class='ctx'> 	tbl-&gt;stats = alloc_percpu(struct neigh_statistics);</div><div class='ctx'> 	if (!tbl-&gt;stats)</div><div class='hunk'>@@ -1586,10 +1837,15 @@ void neigh_table_init(int index, struct neigh_table *tbl)</div><div class='ctx'> 	else</div><div class='ctx'> 		WARN_ON(tbl-&gt;entry_size % NEIGH_PRIV_ALIGN);</div><div class='ctx'> </div><div class='del'>-	rwlock_init(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;tbl-&gt;lock);</div><div class='add'>+	mutex_init(&amp;tbl-&gt;phash_lock);</div><div class='add'>+</div><div class='ctx'> 	INIT_DEFERRABLE_WORK(&amp;tbl-&gt;gc_work, neigh_periodic_work);</div><div class='ctx'> 	queue_delayed_work(system_power_efficient_wq, &amp;tbl-&gt;gc_work,</div><div class='ctx'> 			tbl-&gt;parms.reachable_time);</div><div class='add'>+	INIT_DEFERRABLE_WORK(&amp;tbl-&gt;managed_work, neigh_managed_work);</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;tbl-&gt;managed_work, 0);</div><div class='add'>+</div><div class='ctx'> 	timer_setup(&amp;tbl-&gt;proxy_timer, neigh_proxy_process, 0);</div><div class='ctx'> 	skb_queue_head_init_class(&amp;tbl-&gt;proxy_queue,</div><div class='ctx'> 			&amp;neigh_table_proxy_queue_class);</div><div class='hunk'>@@ -1597,17 +1853,24 @@ void neigh_table_init(int index, struct neigh_table *tbl)</div><div class='ctx'> 	tbl-&gt;last_flush = now;</div><div class='ctx'> 	tbl-&gt;last_rand	= now + tbl-&gt;parms.reachable_time * 20;</div><div class='ctx'> </div><div class='del'>-	neigh_tables[index] = tbl;</div><div class='add'>+	rcu_assign_pointer(neigh_tables[index], tbl);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_table_init);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Only called from ndisc_cleanup(), which means this is dead code</div><div class='add'>+ * because we no longer can unload IPv6 module.</div><div class='add'>+ */</div><div class='ctx'> int neigh_table_clear(int index, struct neigh_table *tbl)</div><div class='ctx'> {</div><div class='del'>-	neigh_tables[index] = NULL;</div><div class='add'>+	RCU_INIT_POINTER(neigh_tables[index], NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='ctx'> 	/* It is not clean... Fix it to unload IPv6 module safely */</div><div class='add'>+	cancel_delayed_work_sync(&amp;tbl-&gt;managed_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;tbl-&gt;gc_work);</div><div class='del'>-	del_timer_sync(&amp;tbl-&gt;proxy_timer);</div><div class='del'>-	pneigh_queue_purge(&amp;tbl-&gt;proxy_queue);</div><div class='add'>+	timer_delete_sync(&amp;tbl-&gt;proxy_timer);</div><div class='add'>+	pneigh_queue_purge(&amp;tbl-&gt;proxy_queue, NULL, tbl-&gt;family);</div><div class='ctx'> 	neigh_ifdown(tbl, NULL);</div><div class='ctx'> 	if (atomic_read(&amp;tbl-&gt;entries))</div><div class='ctx'> 		pr_crit("neighbour leakage\n");</div><div class='hunk'>@@ -1634,19 +1897,33 @@ static struct neigh_table *neigh_find_table(int family)</div><div class='ctx'> </div><div class='ctx'> 	switch (family) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		tbl = neigh_tables[NEIGH_ARP_TABLE];</div><div class='add'>+		tbl = rcu_dereference_rtnl(neigh_tables[NEIGH_ARP_TABLE]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		tbl = neigh_tables[NEIGH_ND_TABLE];</div><div class='del'>-		break;</div><div class='del'>-	case AF_DECnet:</div><div class='del'>-		tbl = neigh_tables[NEIGH_DN_TABLE];</div><div class='add'>+		tbl = rcu_dereference_rtnl(neigh_tables[NEIGH_ND_TABLE]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return tbl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct nla_policy nda_policy[NDA_MAX+1] = {</div><div class='add'>+	[NDA_UNSPEC]		= { .strict_start_type = NDA_NH_ID },</div><div class='add'>+	[NDA_DST]		= { .type = NLA_BINARY, .len = MAX_ADDR_LEN },</div><div class='add'>+	[NDA_LLADDR]		= { .type = NLA_BINARY, .len = MAX_ADDR_LEN },</div><div class='add'>+	[NDA_CACHEINFO]		= { .len = sizeof(struct nda_cacheinfo) },</div><div class='add'>+	[NDA_PROBES]		= { .type = NLA_U32 },</div><div class='add'>+	[NDA_VLAN]		= { .type = NLA_U16 },</div><div class='add'>+	[NDA_PORT]		= { .type = NLA_U16 },</div><div class='add'>+	[NDA_VNI]		= { .type = NLA_U32 },</div><div class='add'>+	[NDA_IFINDEX]		= { .type = NLA_U32 },</div><div class='add'>+	[NDA_MASTER]		= { .type = NLA_U32 },</div><div class='add'>+	[NDA_PROTOCOL]		= { .type = NLA_U8 },</div><div class='add'>+	[NDA_NH_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[NDA_FLAGS_EXT]		= NLA_POLICY_MASK(NLA_U32, NTF_EXT_MASK),</div><div class='add'>+	[NDA_FDB_EXT_ATTRS]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -1663,8 +1940,10 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	dst_attr = nlmsg_find_attr(nlh, sizeof(*ndm), NDA_DST);</div><div class='del'>-	if (dst_attr == NULL)</div><div class='add'>+	if (!dst_attr) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Network address not specified");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ndm = nlmsg_data(nlh);</div><div class='ctx'> 	if (ndm-&gt;ndm_ifindex) {</div><div class='hunk'>@@ -1679,8 +1958,10 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (tbl == NULL)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (nla_len(dst_attr) &lt; (int)tbl-&gt;key_len)</div><div class='add'>+	if (nla_len(dst_attr) &lt; (int)tbl-&gt;key_len) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid network address");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ndm-&gt;ndm_flags &amp; NTF_PROXY) {</div><div class='ctx'> 		err = pneigh_delete(tbl, net, nla_data(dst_attr), dev);</div><div class='hunk'>@@ -1696,14 +1977,13 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = neigh_update(neigh, NULL, NUD_FAILED,</div><div class='del'>-			   NEIGH_UPDATE_F_OVERRIDE |</div><div class='del'>-			   NEIGH_UPDATE_F_ADMIN,</div><div class='del'>-			   NETLINK_CB(skb).portid);</div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	err = __neigh_update(neigh, NULL, NUD_FAILED,</div><div class='add'>+			     NEIGH_UPDATE_F_OVERRIDE | NEIGH_UPDATE_F_ADMIN,</div><div class='add'>+			     NETLINK_CB(skb).portid, extack);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	neigh_release(neigh);</div><div class='del'>-	neigh_remove_one(neigh, tbl);</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	neigh_remove_one(neigh);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1712,7 +1992,8 @@ out:</div><div class='ctx'> static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int flags = NEIGH_UPDATE_F_ADMIN | NEIGH_UPDATE_F_OVERRIDE;</div><div class='add'>+	int flags = NEIGH_UPDATE_F_ADMIN | NEIGH_UPDATE_F_OVERRIDE |</div><div class='add'>+		    NEIGH_UPDATE_F_OVERRIDE_ISROUTER;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct ndmsg *ndm;</div><div class='ctx'> 	struct nlattr *tb[NDA_MAX+1];</div><div class='hunk'>@@ -1720,18 +2001,32 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> 	void *dst, *lladdr;</div><div class='add'>+	u8 protocol = 0;</div><div class='add'>+	u32 ndm_flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX,</div><div class='add'>+				     nda_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (tb[NDA_DST] == NULL)</div><div class='add'>+	if (!tb[NDA_DST]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Network address not specified");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ndm = nlmsg_data(nlh);</div><div class='add'>+	ndm_flags = ndm-&gt;ndm_flags;</div><div class='add'>+	if (tb[NDA_FLAGS_EXT]) {</div><div class='add'>+		u32 ext = nla_get_u32(tb[NDA_FLAGS_EXT]);</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(neigh-&gt;flags) * BITS_PER_BYTE &lt;</div><div class='add'>+			     (sizeof(ndm-&gt;ndm_flags) * BITS_PER_BYTE +</div><div class='add'>+			      hweight32(NTF_EXT_MASK)));</div><div class='add'>+		ndm_flags |= (ext &lt;&lt; NTF_EXT_SHIFT);</div><div class='add'>+	}</div><div class='ctx'> 	if (ndm-&gt;ndm_ifindex) {</div><div class='ctx'> 		dev = __dev_get_by_index(net, ndm-&gt;ndm_ifindex);</div><div class='ctx'> 		if (dev == NULL) {</div><div class='hunk'>@@ -1739,42 +2034,85 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (tb[NDA_LLADDR] &amp;&amp; nla_len(tb[NDA_LLADDR]) &lt; dev-&gt;addr_len)</div><div class='add'>+		if (tb[NDA_LLADDR] &amp;&amp; nla_len(tb[NDA_LLADDR]) &lt; dev-&gt;addr_len) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid link address");</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tbl = neigh_find_table(ndm-&gt;ndm_family);</div><div class='ctx'> 	if (tbl == NULL)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (nla_len(tb[NDA_DST]) &lt; (int)tbl-&gt;key_len)</div><div class='add'>+	if (nla_len(tb[NDA_DST]) &lt; (int)tbl-&gt;key_len) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid network address");</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dst = nla_data(tb[NDA_DST]);</div><div class='ctx'> 	lladdr = tb[NDA_LLADDR] ? nla_data(tb[NDA_LLADDR]) : NULL;</div><div class='ctx'> </div><div class='del'>-	if (ndm-&gt;ndm_flags &amp; NTF_PROXY) {</div><div class='del'>-		struct pneigh_entry *pn;</div><div class='del'>-</div><div class='del'>-		err = -ENOBUFS;</div><div class='del'>-		pn = pneigh_lookup(tbl, net, dst, dev, 1);</div><div class='del'>-		if (pn) {</div><div class='del'>-			pn-&gt;flags = ndm-&gt;ndm_flags;</div><div class='del'>-			err = 0;</div><div class='add'>+	if (tb[NDA_PROTOCOL])</div><div class='add'>+		protocol = nla_get_u8(tb[NDA_PROTOCOL]);</div><div class='add'>+	if (ndm_flags &amp; NTF_PROXY) {</div><div class='add'>+		if (ndm_flags &amp; (NTF_MANAGED | NTF_EXT_VALIDATED)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid NTF_* flag combination");</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		err = pneigh_create(tbl, net, dst, dev, ndm_flags, protocol,</div><div class='add'>+				    !!(ndm-&gt;ndm_state &amp; NUD_PERMANENT));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL)</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device not specified");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tbl-&gt;allow_add &amp;&amp; !tbl-&gt;allow_add(dev, extack)) {</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	neigh = neigh_lookup(tbl, dst, dev);</div><div class='ctx'> 	if (neigh == NULL) {</div><div class='add'>+		bool ndm_permanent  = ndm-&gt;ndm_state &amp; NUD_PERMANENT;</div><div class='add'>+		bool exempt_from_gc = ndm_permanent ||</div><div class='add'>+				      ndm_flags &amp; (NTF_EXT_LEARNED |</div><div class='add'>+						   NTF_EXT_VALIDATED);</div><div class='add'>+</div><div class='ctx'> 		if (!(nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE)) {</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		if (ndm_permanent &amp;&amp; (ndm_flags &amp; NTF_MANAGED)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid NTF_* flag for permanent entry");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (ndm_flags &amp; NTF_EXT_VALIDATED) {</div><div class='add'>+			u8 state = ndm-&gt;ndm_state;</div><div class='add'>+</div><div class='add'>+			/* NTF_USE and NTF_MANAGED will result in the neighbor</div><div class='add'>+			 * being created with an invalid state (NUD_NONE).</div><div class='add'>+			 */</div><div class='add'>+			if (ndm_flags &amp; (NTF_USE | NTF_MANAGED))</div><div class='add'>+				state = NUD_NONE;</div><div class='add'>+</div><div class='add'>+			if (!(state &amp; NUD_VALID)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Cannot create externally validated neighbor with an invalid state");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		neigh = __neigh_lookup_errno(tbl, dst, dev);</div><div class='add'>+		neigh = ___neigh_create(tbl, dst, dev,</div><div class='add'>+					ndm_flags &amp;</div><div class='add'>+					(NTF_EXT_LEARNED | NTF_MANAGED |</div><div class='add'>+					 NTF_EXT_VALIDATED),</div><div class='add'>+					exempt_from_gc, true);</div><div class='ctx'> 		if (IS_ERR(neigh)) {</div><div class='ctx'> 			err = PTR_ERR(neigh);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1785,22 +2123,48 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			neigh_release(neigh);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		if (ndm_flags &amp; NTF_EXT_VALIDATED) {</div><div class='add'>+			u8 state = ndm-&gt;ndm_state;</div><div class='add'>+</div><div class='add'>+			/* NTF_USE and NTF_MANAGED do not update the existing</div><div class='add'>+			 * state other than clearing it if it was</div><div class='add'>+			 * NUD_PERMANENT.</div><div class='add'>+			 */</div><div class='add'>+			if (ndm_flags &amp; (NTF_USE | NTF_MANAGED))</div><div class='add'>+				state = READ_ONCE(neigh-&gt;nud_state) &amp; ~NUD_PERMANENT;</div><div class='add'>+</div><div class='add'>+			if (!(state &amp; NUD_VALID)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Cannot mark neighbor as externally validated with an invalid state");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				neigh_release(neigh);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE))</div><div class='del'>-			flags &amp;= ~NEIGH_UPDATE_F_OVERRIDE;</div><div class='add'>+			flags &amp;= ~(NEIGH_UPDATE_F_OVERRIDE |</div><div class='add'>+				   NEIGH_UPDATE_F_OVERRIDE_ISROUTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ndm-&gt;ndm_flags &amp; NTF_EXT_LEARNED)</div><div class='add'>+	if (protocol)</div><div class='add'>+		neigh-&gt;protocol = protocol;</div><div class='add'>+	if (ndm_flags &amp; NTF_EXT_LEARNED)</div><div class='ctx'> 		flags |= NEIGH_UPDATE_F_EXT_LEARNED;</div><div class='del'>-</div><div class='del'>-	if (ndm-&gt;ndm_flags &amp; NTF_USE) {</div><div class='add'>+	if (ndm_flags &amp; NTF_ROUTER)</div><div class='add'>+		flags |= NEIGH_UPDATE_F_ISROUTER;</div><div class='add'>+	if (ndm_flags &amp; NTF_MANAGED)</div><div class='add'>+		flags |= NEIGH_UPDATE_F_MANAGED;</div><div class='add'>+	if (ndm_flags &amp; NTF_USE)</div><div class='add'>+		flags |= NEIGH_UPDATE_F_USE;</div><div class='add'>+	if (ndm_flags &amp; NTF_EXT_VALIDATED)</div><div class='add'>+		flags |= NEIGH_UPDATE_F_EXT_VALIDATED;</div><div class='add'>+</div><div class='add'>+	err = __neigh_update(neigh, lladdr, ndm-&gt;ndm_state, flags,</div><div class='add'>+			     NETLINK_CB(skb).portid, extack);</div><div class='add'>+	if (!err &amp;&amp; ndm_flags &amp; (NTF_USE | NTF_MANAGED))</div><div class='ctx'> 		neigh_event_send(neigh, NULL);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else</div><div class='del'>-		err = neigh_update(neigh, lladdr, ndm-&gt;ndm_state, flags,</div><div class='del'>-				   NETLINK_CB(skb).portid);</div><div class='ctx'> 	neigh_release(neigh);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1809,12 +2173,12 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *nest;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, NDTA_PARMS);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, NDTA_PARMS);</div><div class='ctx'> 	if (nest == NULL)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if ((parms-&gt;dev &amp;&amp;</div><div class='del'>-	     nla_put_u32(skb, NDTPA_IFINDEX, parms-&gt;dev-&gt;ifindex)) ||</div><div class='add'>+	     nla_put_u32(skb, NDTPA_IFINDEX, READ_ONCE(parms-&gt;dev-&gt;ifindex))) ||</div><div class='ctx'> 	    nla_put_u32(skb, NDTPA_REFCNT, refcount_read(&amp;parms-&gt;refcnt)) ||</div><div class='ctx'> 	    nla_put_u32(skb, NDTPA_QUEUE_LENBYTES,</div><div class='ctx'> 			NEIGH_VAR(parms, QUEUE_LEN_BYTES)) ||</div><div class='hunk'>@@ -1829,7 +2193,7 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)</div><div class='ctx'> 			NEIGH_VAR(parms, MCAST_PROBES)) ||</div><div class='ctx'> 	    nla_put_u32(skb, NDTPA_MCAST_REPROBES,</div><div class='ctx'> 			NEIGH_VAR(parms, MCAST_REPROBES)) ||</div><div class='del'>-	    nla_put_msecs(skb, NDTPA_REACHABLE_TIME, parms-&gt;reachable_time,</div><div class='add'>+	    nla_put_msecs(skb, NDTPA_REACHABLE_TIME, READ_ONCE(parms-&gt;reachable_time),</div><div class='ctx'> 			  NDTPA_PAD) ||</div><div class='ctx'> 	    nla_put_msecs(skb, NDTPA_BASE_REACHABLE_TIME,</div><div class='ctx'> 			  NEIGH_VAR(parms, BASE_REACHABLE_TIME), NDTPA_PAD) ||</div><div class='hunk'>@@ -1844,7 +2208,9 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)</div><div class='ctx'> 	    nla_put_msecs(skb, NDTPA_PROXY_DELAY,</div><div class='ctx'> 			  NEIGH_VAR(parms, PROXY_DELAY), NDTPA_PAD) ||</div><div class='ctx'> 	    nla_put_msecs(skb, NDTPA_LOCKTIME,</div><div class='del'>-			  NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD))</div><div class='add'>+			  NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD) ||</div><div class='add'>+	    nla_put_msecs(skb, NDTPA_INTERVAL_PROBE_TIME_MS,</div><div class='add'>+			  NEIGH_VAR(parms, INTERVAL_PROBE_TIME_MS), NDTPA_PAD))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	return nla_nest_end(skb, nest);</div><div class='ctx'> </div><div class='hunk'>@@ -1864,22 +2230,21 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	ndtmsg = nlmsg_data(nlh);</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	ndtmsg-&gt;ndtm_family = tbl-&gt;family;</div><div class='ctx'> 	ndtmsg-&gt;ndtm_pad1   = 0;</div><div class='ctx'> 	ndtmsg-&gt;ndtm_pad2   = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(skb, NDTA_NAME, tbl-&gt;id) ||</div><div class='del'>-	    nla_put_msecs(skb, NDTA_GC_INTERVAL, tbl-&gt;gc_interval, NDTA_PAD) ||</div><div class='del'>-	    nla_put_u32(skb, NDTA_THRESH1, tbl-&gt;gc_thresh1) ||</div><div class='del'>-	    nla_put_u32(skb, NDTA_THRESH2, tbl-&gt;gc_thresh2) ||</div><div class='del'>-	    nla_put_u32(skb, NDTA_THRESH3, tbl-&gt;gc_thresh3))</div><div class='add'>+	    nla_put_msecs(skb, NDTA_GC_INTERVAL, READ_ONCE(tbl-&gt;gc_interval),</div><div class='add'>+			  NDTA_PAD) ||</div><div class='add'>+	    nla_put_u32(skb, NDTA_THRESH1, READ_ONCE(tbl-&gt;gc_thresh1)) ||</div><div class='add'>+	    nla_put_u32(skb, NDTA_THRESH2, READ_ONCE(tbl-&gt;gc_thresh2)) ||</div><div class='add'>+	    nla_put_u32(skb, NDTA_THRESH3, READ_ONCE(tbl-&gt;gc_thresh3)))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned long now = jiffies;</div><div class='del'>-		unsigned int flush_delta = now - tbl-&gt;last_flush;</div><div class='del'>-		unsigned int rand_delta = now - tbl-&gt;last_rand;</div><div class='add'>+		long flush_delta = now - READ_ONCE(tbl-&gt;last_flush);</div><div class='add'>+		long rand_delta = now - READ_ONCE(tbl-&gt;last_rand);</div><div class='ctx'> 		struct neigh_hash_table *nht;</div><div class='ctx'> 		struct ndt_config ndc = {</div><div class='ctx'> 			.ndtc_key_len		= tbl-&gt;key_len,</div><div class='hunk'>@@ -1887,14 +2252,12 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,</div><div class='ctx'> 			.ndtc_entries		= atomic_read(&amp;tbl-&gt;entries),</div><div class='ctx'> 			.ndtc_last_flush	= jiffies_to_msecs(flush_delta),</div><div class='ctx'> 			.ndtc_last_rand		= jiffies_to_msecs(rand_delta),</div><div class='del'>-			.ndtc_proxy_qlen	= tbl-&gt;proxy_queue.qlen,</div><div class='add'>+			.ndtc_proxy_qlen	= READ_ONCE(tbl-&gt;proxy_queue.qlen),</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		nht = rcu_dereference_bh(tbl-&gt;nht);</div><div class='add'>+		nht = rcu_dereference(tbl-&gt;nht);</div><div class='ctx'> 		ndc.ndtc_hash_rnd = nht-&gt;hash_rnd[0];</div><div class='ctx'> 		ndc.ndtc_hash_mask = ((1 &lt;&lt; nht-&gt;hash_shift) - 1);</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 		if (nla_put(skb, NDTA_CONFIG, sizeof(ndc), &amp;ndc))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='hunk'>@@ -1910,17 +2273,17 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,</div><div class='ctx'> 			struct neigh_statistics	*st;</div><div class='ctx'> </div><div class='ctx'> 			st = per_cpu_ptr(tbl-&gt;stats, cpu);</div><div class='del'>-			ndst.ndts_allocs		+= st-&gt;allocs;</div><div class='del'>-			ndst.ndts_destroys		+= st-&gt;destroys;</div><div class='del'>-			ndst.ndts_hash_grows		+= st-&gt;hash_grows;</div><div class='del'>-			ndst.ndts_res_failed		+= st-&gt;res_failed;</div><div class='del'>-			ndst.ndts_lookups		+= st-&gt;lookups;</div><div class='del'>-			ndst.ndts_hits			+= st-&gt;hits;</div><div class='del'>-			ndst.ndts_rcv_probes_mcast	+= st-&gt;rcv_probes_mcast;</div><div class='del'>-			ndst.ndts_rcv_probes_ucast	+= st-&gt;rcv_probes_ucast;</div><div class='del'>-			ndst.ndts_periodic_gc_runs	+= st-&gt;periodic_gc_runs;</div><div class='del'>-			ndst.ndts_forced_gc_runs	+= st-&gt;forced_gc_runs;</div><div class='del'>-			ndst.ndts_table_fulls		+= st-&gt;table_fulls;</div><div class='add'>+			ndst.ndts_allocs		+= READ_ONCE(st-&gt;allocs);</div><div class='add'>+			ndst.ndts_destroys		+= READ_ONCE(st-&gt;destroys);</div><div class='add'>+			ndst.ndts_hash_grows		+= READ_ONCE(st-&gt;hash_grows);</div><div class='add'>+			ndst.ndts_res_failed		+= READ_ONCE(st-&gt;res_failed);</div><div class='add'>+			ndst.ndts_lookups		+= READ_ONCE(st-&gt;lookups);</div><div class='add'>+			ndst.ndts_hits			+= READ_ONCE(st-&gt;hits);</div><div class='add'>+			ndst.ndts_rcv_probes_mcast	+= READ_ONCE(st-&gt;rcv_probes_mcast);</div><div class='add'>+			ndst.ndts_rcv_probes_ucast	+= READ_ONCE(st-&gt;rcv_probes_ucast);</div><div class='add'>+			ndst.ndts_periodic_gc_runs	+= READ_ONCE(st-&gt;periodic_gc_runs);</div><div class='add'>+			ndst.ndts_forced_gc_runs	+= READ_ONCE(st-&gt;forced_gc_runs);</div><div class='add'>+			ndst.ndts_table_fulls		+= READ_ONCE(st-&gt;table_fulls);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (nla_put_64bit(skb, NDTA_STATS, sizeof(ndst), &amp;ndst,</div><div class='hunk'>@@ -1932,12 +2295,10 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,</div><div class='ctx'> 	if (neightbl_fill_parms(skb, &amp;tbl-&gt;parms) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nlmsg_cancel(skb, nlh);</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1956,8 +2317,6 @@ static int neightbl_fill_param_info(struct sk_buff *skb,</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	ndtmsg = nlmsg_data(nlh);</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	ndtmsg-&gt;ndtm_family = tbl-&gt;family;</div><div class='ctx'> 	ndtmsg-&gt;ndtm_pad1   = 0;</div><div class='ctx'> 	ndtmsg-&gt;ndtm_pad2   = 0;</div><div class='hunk'>@@ -1966,11 +2325,9 @@ static int neightbl_fill_param_info(struct sk_buff *skb,</div><div class='ctx'> 	    neightbl_fill_parms(skb, parms) &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> errout:</div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	nlmsg_cancel(skb, nlh);</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1987,6 +2344,7 @@ static const struct nla_policy nl_neightbl_policy[NDTA_MAX+1] = {</div><div class='ctx'> static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = {</div><div class='ctx'> 	[NDTPA_IFINDEX]			= { .type = NLA_U32 },</div><div class='ctx'> 	[NDTPA_QUEUE_LEN]		= { .type = NLA_U32 },</div><div class='add'>+	[NDTPA_QUEUE_LENBYTES]		= { .type = NLA_U32 },</div><div class='ctx'> 	[NDTPA_PROXY_QLEN]		= { .type = NLA_U32 },</div><div class='ctx'> 	[NDTPA_APP_PROBES]		= { .type = NLA_U32 },</div><div class='ctx'> 	[NDTPA_UCAST_PROBES]		= { .type = NLA_U32 },</div><div class='hunk'>@@ -1999,20 +2357,21 @@ static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = {</div><div class='ctx'> 	[NDTPA_ANYCAST_DELAY]		= { .type = NLA_U64 },</div><div class='ctx'> 	[NDTPA_PROXY_DELAY]		= { .type = NLA_U64 },</div><div class='ctx'> 	[NDTPA_LOCKTIME]		= { .type = NLA_U64 },</div><div class='add'>+	[NDTPA_INTERVAL_PROBE_TIME_MS]	= { .type = NLA_U64, .min = 1 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct nlattr *tb[NDTA_MAX + 1];</div><div class='ctx'> 	struct neigh_table *tbl;</div><div class='ctx'> 	struct ndtmsg *ndtmsg;</div><div class='del'>-	struct nlattr *tb[NDTA_MAX+1];</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> 	int err, tidx;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ndtmsg), tb, NDTA_MAX,</div><div class='del'>-			  nl_neightbl_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ndtmsg), tb, NDTA_MAX,</div><div class='add'>+				     nl_neightbl_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -2023,34 +2382,42 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	ndtmsg = nlmsg_data(nlh);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 	for (tidx = 0; tidx &lt; NEIGH_NR_TABLES; tidx++) {</div><div class='del'>-		tbl = neigh_tables[tidx];</div><div class='add'>+		tbl = rcu_dereference(neigh_tables[tidx]);</div><div class='ctx'> 		if (!tbl)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		if (ndtmsg-&gt;ndtm_family &amp;&amp; tbl-&gt;family != ndtmsg-&gt;ndtm_family)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		if (nla_strcmp(tb[NDTA_NAME], tbl-&gt;id) == 0) {</div><div class='ctx'> 			found = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!found)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (!found) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We acquire tbl-&gt;lock to be nice to the periodic timers and</div><div class='ctx'> 	 * make sure they always see a consistent set of values.</div><div class='ctx'> 	 */</div><div class='del'>-	write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NDTA_PARMS]) {</div><div class='ctx'> 		struct nlattr *tbp[NDTPA_MAX+1];</div><div class='ctx'> 		struct neigh_parms *p;</div><div class='ctx'> 		int i, ifindex = 0;</div><div class='ctx'> </div><div class='del'>-		err = nla_parse_nested(tbp, NDTPA_MAX, tb[NDTA_PARMS],</div><div class='del'>-				       nl_ntbl_parm_policy, extack);</div><div class='add'>+		err = nla_parse_nested_deprecated(tbp, NDTPA_MAX,</div><div class='add'>+						  tb[NDTA_PARMS],</div><div class='add'>+						  nl_ntbl_parm_policy, extack);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout_tbl_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -2104,8 +2471,7 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 				 * only be effective after the next time neigh_periodic_work</div><div class='ctx'> 				 * decides to recompute it (can be multiple minutes)</div><div class='ctx'> 				 */</div><div class='del'>-				p-&gt;reachable_time =</div><div class='del'>-					neigh_rand_reach_time(NEIGH_VAR(p, BASE_REACHABLE_TIME));</div><div class='add'>+				neigh_set_reach_time(p);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case NDTPA_GC_STALETIME:</div><div class='ctx'> 				NEIGH_VAR_SET(p, GC_STALETIME,</div><div class='hunk'>@@ -2116,6 +2482,10 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 					      nla_get_msecs(tbp[i]));</div><div class='ctx'> 				call_netevent_notifiers(NETEVENT_DELAY_PROBE_TIME_UPDATE, p);</div><div class='ctx'> 				break;</div><div class='add'>+			case NDTPA_INTERVAL_PROBE_TIME_MS:</div><div class='add'>+				NEIGH_VAR_SET(p, INTERVAL_PROBE_TIME_MS,</div><div class='add'>+					      nla_get_msecs(tbp[i]));</div><div class='add'>+				break;</div><div class='ctx'> 			case NDTPA_RETRANS_TIME:</div><div class='ctx'> 				NEIGH_VAR_SET(p, RETRANS_TIME,</div><div class='ctx'> 					      nla_get_msecs(tbp[i]));</div><div class='hunk'>@@ -2143,39 +2513,74 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto errout_tbl_lock;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NDTA_THRESH1])</div><div class='del'>-		tbl-&gt;gc_thresh1 = nla_get_u32(tb[NDTA_THRESH1]);</div><div class='add'>+		WRITE_ONCE(tbl-&gt;gc_thresh1, nla_get_u32(tb[NDTA_THRESH1]));</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NDTA_THRESH2])</div><div class='del'>-		tbl-&gt;gc_thresh2 = nla_get_u32(tb[NDTA_THRESH2]);</div><div class='add'>+		WRITE_ONCE(tbl-&gt;gc_thresh2, nla_get_u32(tb[NDTA_THRESH2]));</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NDTA_THRESH3])</div><div class='del'>-		tbl-&gt;gc_thresh3 = nla_get_u32(tb[NDTA_THRESH3]);</div><div class='add'>+		WRITE_ONCE(tbl-&gt;gc_thresh3, nla_get_u32(tb[NDTA_THRESH3]));</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NDTA_GC_INTERVAL])</div><div class='del'>-		tbl-&gt;gc_interval = nla_get_msecs(tb[NDTA_GC_INTERVAL]);</div><div class='add'>+		WRITE_ONCE(tbl-&gt;gc_interval, nla_get_msecs(tb[NDTA_GC_INTERVAL]));</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> errout_tbl_lock:</div><div class='del'>-	write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> errout:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int neightbl_valid_dump_info(const struct nlmsghdr *nlh,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ndtmsg *ndtm;</div><div class='add'>+</div><div class='add'>+	ndtm = nlmsg_payload(nlh, sizeof(*ndtm));</div><div class='add'>+	if (!ndtm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for neighbor table dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndtm-&gt;ndtm_pad1  || ndtm-&gt;ndtm_pad2) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor table dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*ndtm))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid data after header in neighbor table dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	int family, tidx, nidx = 0;</div><div class='ctx'> 	int tbl_skip = cb-&gt;args[0];</div><div class='ctx'> 	int neigh_skip = cb-&gt;args[1];</div><div class='ctx'> 	struct neigh_table *tbl;</div><div class='ctx'> </div><div class='del'>-	family = ((struct rtgenmsg *) nlmsg_data(cb-&gt;nlh))-&gt;rtgen_family;</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		int err = neightbl_valid_dump_info(nlh, cb-&gt;extack);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	family = ((struct rtgenmsg *)nlmsg_data(nlh))-&gt;rtgen_family;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	for (tidx = 0; tidx &lt; NEIGH_NR_TABLES; tidx++) {</div><div class='ctx'> 		struct neigh_parms *p;</div><div class='ctx'> </div><div class='del'>-		tbl = neigh_tables[tidx];</div><div class='add'>+		tbl = rcu_dereference(neigh_tables[tidx]);</div><div class='ctx'> 		if (!tbl)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2183,13 +2588,13 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (neightbl_fill_info(skb, tbl, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				       cb-&gt;nlh-&gt;nlmsg_seq, RTM_NEWNEIGHTBL,</div><div class='add'>+				       nlh-&gt;nlmsg_seq, RTM_NEWNEIGHTBL,</div><div class='ctx'> 				       NLM_F_MULTI) &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		nidx = 0;</div><div class='ctx'> 		p = list_next_entry(&amp;tbl-&gt;parms, list);</div><div class='del'>-		list_for_each_entry_from(p, &amp;tbl-&gt;parms_list, list) {</div><div class='add'>+		list_for_each_entry_from_rcu(p, &amp;tbl-&gt;parms_list, list) {</div><div class='ctx'> 			if (!net_eq(neigh_parms_net(p), net))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2198,7 +2603,7 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> </div><div class='ctx'> 			if (neightbl_fill_param_info(skb, tbl, p,</div><div class='ctx'> 						     NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						     cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+						     nlh-&gt;nlmsg_seq,</div><div class='ctx'> 						     RTM_NEWNEIGHTBL,</div><div class='ctx'> 						     NLM_F_MULTI) &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -2209,6 +2614,8 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 		neigh_skip = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	cb-&gt;args[0] = tidx;</div><div class='ctx'> 	cb-&gt;args[1] = nidx;</div><div class='ctx'> </div><div class='hunk'>@@ -2218,6 +2625,7 @@ out:</div><div class='ctx'> static int neigh_fill_info(struct sk_buff *skb, struct neighbour *neigh,</div><div class='ctx'> 			   u32 pid, u32 seq, int type, unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	u32 neigh_flags, neigh_flags_ext;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	struct nda_cacheinfo ci;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='hunk'>@@ -2227,11 +2635,14 @@ static int neigh_fill_info(struct sk_buff *skb, struct neighbour *neigh,</div><div class='ctx'> 	if (nlh == NULL)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	neigh_flags_ext = neigh-&gt;flags &gt;&gt; NTF_EXT_SHIFT;</div><div class='add'>+	neigh_flags     = neigh-&gt;flags &amp; NTF_OLD_MASK;</div><div class='add'>+</div><div class='ctx'> 	ndm = nlmsg_data(nlh);</div><div class='ctx'> 	ndm-&gt;ndm_family	 = neigh-&gt;ops-&gt;family;</div><div class='ctx'> 	ndm-&gt;ndm_pad1    = 0;</div><div class='ctx'> 	ndm-&gt;ndm_pad2    = 0;</div><div class='del'>-	ndm-&gt;ndm_flags	 = neigh-&gt;flags;</div><div class='add'>+	ndm-&gt;ndm_flags	 = neigh_flags;</div><div class='ctx'> 	ndm-&gt;ndm_type	 = neigh-&gt;type;</div><div class='ctx'> 	ndm-&gt;ndm_ifindex = neigh-&gt;dev-&gt;ifindex;</div><div class='ctx'> </div><div class='hunk'>@@ -2260,6 +2671,11 @@ static int neigh_fill_info(struct sk_buff *skb, struct neighbour *neigh,</div><div class='ctx'> 	    nla_put(skb, NDA_CACHEINFO, sizeof(ci), &amp;ci))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	if (neigh-&gt;protocol &amp;&amp; nla_put_u8(skb, NDA_PROTOCOL, neigh-&gt;protocol))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (neigh_flags_ext &amp;&amp; nla_put_u32(skb, NDA_FLAGS_EXT, neigh_flags_ext))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2272,18 +2688,24 @@ static int pneigh_fill_info(struct sk_buff *skb, struct pneigh_entry *pn,</div><div class='ctx'> 			    u32 pid, u32 seq, int type, unsigned int flags,</div><div class='ctx'> 			    struct neigh_table *tbl)</div><div class='ctx'> {</div><div class='add'>+	u32 neigh_flags, neigh_flags_ext;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct ndmsg *ndm;</div><div class='add'>+	u8 protocol;</div><div class='ctx'> </div><div class='ctx'> 	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), flags);</div><div class='ctx'> 	if (nlh == NULL)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	neigh_flags = READ_ONCE(pn-&gt;flags);</div><div class='add'>+	neigh_flags_ext = neigh_flags &gt;&gt; NTF_EXT_SHIFT;</div><div class='add'>+	neigh_flags &amp;= NTF_OLD_MASK;</div><div class='add'>+</div><div class='ctx'> 	ndm = nlmsg_data(nlh);</div><div class='ctx'> 	ndm-&gt;ndm_family	 = tbl-&gt;family;</div><div class='ctx'> 	ndm-&gt;ndm_pad1    = 0;</div><div class='ctx'> 	ndm-&gt;ndm_pad2    = 0;</div><div class='del'>-	ndm-&gt;ndm_flags	 = pn-&gt;flags | NTF_PROXY;</div><div class='add'>+	ndm-&gt;ndm_flags	 = neigh_flags | NTF_PROXY;</div><div class='ctx'> 	ndm-&gt;ndm_type	 = RTN_UNICAST;</div><div class='ctx'> 	ndm-&gt;ndm_ifindex = pn-&gt;dev ? pn-&gt;dev-&gt;ifindex : 0;</div><div class='ctx'> 	ndm-&gt;ndm_state	 = NUD_NONE;</div><div class='hunk'>@@ -2291,6 +2713,12 @@ static int pneigh_fill_info(struct sk_buff *skb, struct pneigh_entry *pn,</div><div class='ctx'> 	if (nla_put(skb, NDA_DST, tbl-&gt;key_len, pn-&gt;key))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	protocol = READ_ONCE(pn-&gt;protocol);</div><div class='add'>+	if (protocol &amp;&amp; nla_put_u8(skb, NDA_PROTOCOL, protocol))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (neigh_flags_ext &amp;&amp; nla_put_u32(skb, NDA_FLAGS_EXT, neigh_flags_ext))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2312,7 +2740,14 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)</div><div class='ctx'> 	if (!master_idx)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	master = netdev_master_upper_dev_get(dev);</div><div class='add'>+	master = dev ? netdev_master_upper_dev_get_rcu(dev) : NULL;</div><div class='add'>+</div><div class='add'>+	/* 0 is already used to denote NDA_MASTER wasn't passed, therefore need another</div><div class='add'>+	 * invalid value for ifindex to denote "no master".</div><div class='add'>+	 */</div><div class='add'>+	if (master_idx == -1)</div><div class='add'>+		return !!master;</div><div class='add'>+</div><div class='ctx'> 	if (!master || master-&gt;ifindex != master_idx)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -2321,133 +2756,187 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)</div><div class='ctx'> </div><div class='ctx'> static bool neigh_ifindex_filtered(struct net_device *dev, int filter_idx)</div><div class='ctx'> {</div><div class='del'>-	if (filter_idx &amp;&amp; dev-&gt;ifindex != filter_idx)</div><div class='add'>+	if (filter_idx &amp;&amp; (!dev || dev-&gt;ifindex != filter_idx))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct neigh_dump_filter {</div><div class='add'>+	int master_idx;</div><div class='add'>+	int dev_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,</div><div class='del'>-			    struct netlink_callback *cb)</div><div class='add'>+			    struct netlink_callback *cb,</div><div class='add'>+			    struct neigh_dump_filter *filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='del'>-	struct nlattr *tb[NDA_MAX + 1];</div><div class='ctx'> 	struct neighbour *n;</div><div class='del'>-	int rc, h, s_h = cb-&gt;args[1];</div><div class='add'>+	int err = 0, h, s_h = cb-&gt;args[1];</div><div class='ctx'> 	int idx, s_idx = idx = cb-&gt;args[2];</div><div class='ctx'> 	struct neigh_hash_table *nht;</div><div class='del'>-	int filter_master_idx = 0, filter_idx = 0;</div><div class='ctx'> 	unsigned int flags = NLM_F_MULTI;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(struct ndmsg), tb, NDA_MAX, NULL, NULL);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (tb[NDA_IFINDEX]) {</div><div class='del'>-			if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			filter_idx = nla_get_u32(tb[NDA_IFINDEX]);</div><div class='del'>-		}</div><div class='del'>-		if (tb[NDA_MASTER]) {</div><div class='del'>-			if (nla_len(tb[NDA_MASTER]) != sizeof(u32))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			filter_master_idx = nla_get_u32(tb[NDA_MASTER]);</div><div class='del'>-		}</div><div class='del'>-		if (filter_idx || filter_master_idx)</div><div class='del'>-			flags |= NLM_F_DUMP_FILTERED;</div><div class='del'>-	}</div><div class='add'>+	if (filter-&gt;dev_idx || filter-&gt;master_idx)</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	nht = rcu_dereference_bh(tbl-&gt;nht);</div><div class='add'>+	nht = rcu_dereference(tbl-&gt;nht);</div><div class='ctx'> </div><div class='ctx'> 	for (h = s_h; h &lt; (1 &lt;&lt; nht-&gt;hash_shift); h++) {</div><div class='ctx'> 		if (h &gt; s_h)</div><div class='ctx'> 			s_idx = 0;</div><div class='del'>-		for (n = rcu_dereference_bh(nht-&gt;hash_buckets[h]), idx = 0;</div><div class='del'>-		     n != NULL;</div><div class='del'>-		     n = rcu_dereference_bh(n-&gt;next)) {</div><div class='add'>+		idx = 0;</div><div class='add'>+		neigh_for_each_in_bucket_rcu(n, &amp;nht-&gt;hash_heads[h]) {</div><div class='ctx'> 			if (idx &lt; s_idx || !net_eq(dev_net(n-&gt;dev), net))</div><div class='ctx'> 				goto next;</div><div class='del'>-			if (neigh_ifindex_filtered(n-&gt;dev, filter_idx) ||</div><div class='del'>-			    neigh_master_filtered(n-&gt;dev, filter_master_idx))</div><div class='add'>+			if (neigh_ifindex_filtered(n-&gt;dev, filter-&gt;dev_idx) ||</div><div class='add'>+			    neigh_master_filtered(n-&gt;dev, filter-&gt;master_idx))</div><div class='ctx'> 				goto next;</div><div class='del'>-			if (neigh_fill_info(skb, n, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					    cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					    RTM_NEWNEIGH,</div><div class='del'>-					    flags) &lt; 0) {</div><div class='del'>-				rc = -1;</div><div class='add'>+			err = neigh_fill_info(skb, n, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					      RTM_NEWNEIGH, flags);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='ctx'> next:</div><div class='ctx'> 			idx++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rc = skb-&gt;len;</div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='ctx'> 	cb-&gt;args[1] = h;</div><div class='ctx'> 	cb-&gt;args[2] = idx;</div><div class='del'>-	return rc;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pneigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,</div><div class='del'>-			     struct netlink_callback *cb)</div><div class='add'>+			     struct netlink_callback *cb,</div><div class='add'>+			     struct neigh_dump_filter *filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pneigh_entry *n;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int rc, h, s_h = cb-&gt;args[3];</div><div class='add'>+	int err = 0, h, s_h = cb-&gt;args[3];</div><div class='ctx'> 	int idx, s_idx = idx = cb-&gt;args[4];</div><div class='add'>+	unsigned int flags = NLM_F_MULTI;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	if (filter-&gt;dev_idx || filter-&gt;master_idx)</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='ctx'> </div><div class='ctx'> 	for (h = s_h; h &lt;= PNEIGH_HASHMASK; h++) {</div><div class='ctx'> 		if (h &gt; s_h)</div><div class='ctx'> 			s_idx = 0;</div><div class='del'>-		for (n = tbl-&gt;phash_buckets[h], idx = 0; n; n = n-&gt;next) {</div><div class='add'>+		for (n = rcu_dereference(tbl-&gt;phash_buckets[h]), idx = 0;</div><div class='add'>+		     n;</div><div class='add'>+		     n = rcu_dereference(n-&gt;next)) {</div><div class='ctx'> 			if (idx &lt; s_idx || pneigh_net(n) != net)</div><div class='ctx'> 				goto next;</div><div class='del'>-			if (pneigh_fill_info(skb, n, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					    cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					    RTM_NEWNEIGH,</div><div class='del'>-					    NLM_F_MULTI, tbl) &lt; 0) {</div><div class='del'>-				read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-				rc = -1;</div><div class='add'>+			if (neigh_ifindex_filtered(n-&gt;dev, filter-&gt;dev_idx) ||</div><div class='add'>+			    neigh_master_filtered(n-&gt;dev, filter-&gt;master_idx))</div><div class='add'>+				goto next;</div><div class='add'>+			err = pneigh_fill_info(skb, n, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					       cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					       RTM_NEWNEIGH, flags, tbl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='ctx'> 		next:</div><div class='ctx'> 			idx++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_unlock_bh(&amp;tbl-&gt;lock);</div><div class='del'>-	rc = skb-&gt;len;</div><div class='ctx'> out:</div><div class='ctx'> 	cb-&gt;args[3] = h;</div><div class='ctx'> 	cb-&gt;args[4] = idx;</div><div class='del'>-	return rc;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int neigh_valid_dump_req(const struct nlmsghdr *nlh,</div><div class='add'>+				bool strict_check,</div><div class='add'>+				struct neigh_dump_filter *filter,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NDA_MAX + 1];</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (strict_check) {</div><div class='add'>+		struct ndmsg *ndm;</div><div class='add'>+</div><div class='add'>+		ndm = nlmsg_payload(nlh, sizeof(*ndm));</div><div class='add'>+		if (!ndm) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid header for neighbor dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ndm-&gt;ndm_pad1  || ndm-&gt;ndm_pad2  || ndm-&gt;ndm_ifindex ||</div><div class='add'>+		    ndm-&gt;ndm_state || ndm-&gt;ndm_type) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (ndm-&gt;ndm_flags &amp; ~NTF_PROXY) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid flags in header for neighbor dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg),</div><div class='add'>+						    tb, NDA_MAX, nda_policy,</div><div class='add'>+						    extack);</div><div class='add'>+	} else {</div><div class='add'>+		err = nlmsg_parse_deprecated(nlh, sizeof(struct ndmsg), tb,</div><div class='add'>+					     NDA_MAX, nda_policy, extack);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NDA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* all new attributes should require strict_check */</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NDA_IFINDEX:</div><div class='add'>+			filter-&gt;dev_idx = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case NDA_MASTER:</div><div class='add'>+			filter-&gt;master_idx = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (strict_check) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Unsupported attribute in neighbor dump request");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct neigh_dump_filter filter = {};</div><div class='ctx'> 	struct neigh_table *tbl;</div><div class='ctx'> 	int t, family, s_t;</div><div class='ctx'> 	int proxy = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	family = ((struct rtgenmsg *) nlmsg_data(cb-&gt;nlh))-&gt;rtgen_family;</div><div class='add'>+	family = ((struct rtgenmsg *)nlmsg_data(nlh))-&gt;rtgen_family;</div><div class='ctx'> </div><div class='ctx'> 	/* check for full ndmsg structure presence, family member is</div><div class='ctx'> 	 * the same for both structures</div><div class='ctx'> 	 */</div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &gt;= sizeof(struct ndmsg) &amp;&amp;</div><div class='del'>-	    ((struct ndmsg *) nlmsg_data(cb-&gt;nlh))-&gt;ndm_flags == NTF_PROXY)</div><div class='add'>+	if (nlmsg_len(nlh) &gt;= sizeof(struct ndmsg) &amp;&amp;</div><div class='add'>+	    ((struct ndmsg *)nlmsg_data(nlh))-&gt;ndm_flags == NTF_PROXY)</div><div class='ctx'> 		proxy = 1;</div><div class='ctx'> </div><div class='add'>+	err = neigh_valid_dump_req(nlh, cb-&gt;strict_check, &amp;filter, cb-&gt;extack);</div><div class='add'>+	if (err &lt; 0 &amp;&amp; cb-&gt;strict_check)</div><div class='add'>+		return err;</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='ctx'> 	s_t = cb-&gt;args[0];</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (t = 0; t &lt; NEIGH_NR_TABLES; t++) {</div><div class='del'>-		tbl = neigh_tables[t];</div><div class='add'>+		tbl = rcu_dereference(neigh_tables[t]);</div><div class='ctx'> </div><div class='ctx'> 		if (!tbl)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2457,15 +2946,177 @@ static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 			memset(&amp;cb-&gt;args[1], 0, sizeof(cb-&gt;args) -</div><div class='ctx'> 						sizeof(cb-&gt;args[0]));</div><div class='ctx'> 		if (proxy)</div><div class='del'>-			err = pneigh_dump_table(tbl, skb, cb);</div><div class='add'>+			err = pneigh_dump_table(tbl, skb, cb, &amp;filter);</div><div class='ctx'> 		else</div><div class='del'>-			err = neigh_dump_table(tbl, skb, cb);</div><div class='add'>+			err = neigh_dump_table(tbl, skb, cb, &amp;filter);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = t;</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ndmsg *neigh_valid_get_req(const struct nlmsghdr *nlh,</div><div class='add'>+					 struct nlattr **tb,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_payload(nlh, sizeof(*ndm));</div><div class='add'>+	if (!ndm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for neighbor get request");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_pad1  || ndm-&gt;ndm_pad2  || ndm-&gt;ndm_state ||</div><div class='add'>+	    ndm-&gt;ndm_type) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor get request");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_flags &amp; ~NTF_PROXY) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid flags in header for neighbor get request");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(ndm-&gt;ndm_flags &amp; NTF_PROXY) &amp;&amp; !ndm-&gt;ndm_ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "No device specified");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,</div><div class='add'>+					    NDA_MAX, nda_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NDA_MAX; ++i) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NDA_DST:</div><div class='add'>+			if (!tb[i]) {</div><div class='add'>+				NL_SET_ERR_ATTR_MISS(extack, NULL, NDA_DST);</div><div class='add'>+				return ERR_PTR(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (!tb[i])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in neighbor get request");</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ndm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t neigh_nlmsg_size(void)</div><div class='add'>+{</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct ndmsg))</div><div class='add'>+	       + nla_total_size(MAX_ADDR_LEN) /* NDA_DST */</div><div class='add'>+	       + nla_total_size(MAX_ADDR_LEN) /* NDA_LLADDR */</div><div class='add'>+	       + nla_total_size(sizeof(struct nda_cacheinfo))</div><div class='add'>+	       + nla_total_size(4)  /* NDA_PROBES */</div><div class='add'>+	       + nla_total_size(4)  /* NDA_FLAGS_EXT */</div><div class='add'>+	       + nla_total_size(1); /* NDA_PROTOCOL */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t pneigh_nlmsg_size(void)</div><div class='add'>+{</div><div class='add'>+	return NLMSG_ALIGN(sizeof(struct ndmsg))</div><div class='add'>+	       + nla_total_size(MAX_ADDR_LEN) /* NDA_DST */</div><div class='add'>+	       + nla_total_size(4)  /* NDA_FLAGS_EXT */</div><div class='add'>+	       + nla_total_size(1); /* NDA_PROTOCOL */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int neigh_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	u32 pid = NETLINK_CB(in_skb).portid;</div><div class='add'>+	struct nlattr *tb[NDA_MAX + 1];</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	u32 seq = nlh-&gt;nlmsg_seq;</div><div class='add'>+	struct neigh_table *tbl;</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+	void *dst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ndm = neigh_valid_get_req(nlh, tb, extack);</div><div class='add'>+	if (IS_ERR(ndm))</div><div class='add'>+		return PTR_ERR(ndm);</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_flags &amp; NTF_PROXY)</div><div class='add'>+		skb = nlmsg_new(neigh_nlmsg_size(), GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		skb = nlmsg_new(pneigh_nlmsg_size(), GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	tbl = neigh_find_table(ndm-&gt;ndm_family);</div><div class='add'>+	if (!tbl) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported family in header for neighbor get request");</div><div class='add'>+		err = -EAFNOSUPPORT;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_len(tb[NDA_DST]) != (int)tbl-&gt;key_len) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid network address in neighbor get request");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst = nla_data(tb[NDA_DST]);</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_ifindex) {</div><div class='add'>+		dev = dev_get_by_index_rcu(net, ndm-&gt;ndm_ifindex);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unknown device ifindex");</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_flags &amp; NTF_PROXY) {</div><div class='add'>+		struct pneigh_entry *pn;</div><div class='add'>+</div><div class='add'>+		pn = pneigh_lookup(tbl, net, dst, dev);</div><div class='add'>+		if (!pn) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Proxy neighbour entry not found");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = pneigh_fill_info(skb, pn, pid, seq, RTM_NEWNEIGH, 0, tbl);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_unlock;</div><div class='add'>+	} else {</div><div class='add'>+		neigh = neigh_lookup(tbl, dst, dev);</div><div class='add'>+		if (!neigh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Neighbour entry not found");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = neigh_fill_info(skb, neigh, pid, seq, RTM_NEWNEIGH, 0);</div><div class='add'>+		neigh_release(neigh);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return rtnl_unicast(skb, net, pid);</div><div class='add'>+err_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void neigh_for_each(struct neigh_table *tbl, void (*cb)(struct neighbour *, void *), void *cookie)</div><div class='hunk'>@@ -2473,20 +3124,18 @@ void neigh_for_each(struct neigh_table *tbl, void (*cb)(struct neighbour *, void</div><div class='ctx'> 	int chain;</div><div class='ctx'> 	struct neigh_hash_table *nht;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	nht = rcu_dereference_bh(tbl-&gt;nht);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	nht = rcu_dereference(tbl-&gt;nht);</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;tbl-&gt;lock); /* avoid resizes */</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock); /* avoid resizes */</div><div class='ctx'> 	for (chain = 0; chain &lt; (1 &lt;&lt; nht-&gt;hash_shift); chain++) {</div><div class='ctx'> 		struct neighbour *n;</div><div class='ctx'> </div><div class='del'>-		for (n = rcu_dereference_bh(nht-&gt;hash_buckets[chain]);</div><div class='del'>-		     n != NULL;</div><div class='del'>-		     n = rcu_dereference_bh(n-&gt;next))</div><div class='add'>+		neigh_for_each_in_bucket(n, &amp;nht-&gt;hash_heads[chain])</div><div class='ctx'> 			cb(n, cookie);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;tbl-&gt;lock);</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_for_each);</div><div class='ctx'> </div><div class='hunk'>@@ -2494,29 +3143,25 @@ EXPORT_SYMBOL(neigh_for_each);</div><div class='ctx'> void __neigh_for_each_release(struct neigh_table *tbl,</div><div class='ctx'> 			      int (*cb)(struct neighbour *))</div><div class='ctx'> {</div><div class='del'>-	int chain;</div><div class='ctx'> 	struct neigh_hash_table *nht;</div><div class='add'>+	int chain;</div><div class='ctx'> </div><div class='ctx'> 	nht = rcu_dereference_protected(tbl-&gt;nht,</div><div class='ctx'> 					lockdep_is_held(&amp;tbl-&gt;lock));</div><div class='ctx'> 	for (chain = 0; chain &lt; (1 &lt;&lt; nht-&gt;hash_shift); chain++) {</div><div class='add'>+		struct hlist_node *tmp;</div><div class='ctx'> 		struct neighbour *n;</div><div class='del'>-		struct neighbour __rcu **np;</div><div class='ctx'> </div><div class='del'>-		np = &amp;nht-&gt;hash_buckets[chain];</div><div class='del'>-		while ((n = rcu_dereference_protected(*np,</div><div class='del'>-					lockdep_is_held(&amp;tbl-&gt;lock))) != NULL) {</div><div class='add'>+		neigh_for_each_in_bucket_safe(n, tmp, &amp;nht-&gt;hash_heads[chain]) {</div><div class='ctx'> 			int release;</div><div class='ctx'> </div><div class='ctx'> 			write_lock(&amp;n-&gt;lock);</div><div class='ctx'> 			release = cb(n);</div><div class='ctx'> 			if (release) {</div><div class='del'>-				rcu_assign_pointer(*np,</div><div class='del'>-					rcu_dereference_protected(n-&gt;next,</div><div class='del'>-						lockdep_is_held(&amp;tbl-&gt;lock)));</div><div class='del'>-				n-&gt;dead = 1;</div><div class='del'>-			} else</div><div class='del'>-				np = &amp;n-&gt;next;</div><div class='add'>+				hlist_del_rcu(&amp;n-&gt;hash);</div><div class='add'>+				hlist_del_rcu(&amp;n-&gt;dev_list);</div><div class='add'>+				neigh_mark_dead(n);</div><div class='add'>+			}</div><div class='ctx'> 			write_unlock(&amp;n-&gt;lock);</div><div class='ctx'> 			if (release)</div><div class='ctx'> 				neigh_cleanup_and_release(n);</div><div class='hunk'>@@ -2529,24 +3174,32 @@ int neigh_xmit(int index, struct net_device *dev,</div><div class='ctx'> 	       const void *addr, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EAFNOSUPPORT;</div><div class='add'>+</div><div class='ctx'> 	if (likely(index &lt; NEIGH_NR_TABLES)) {</div><div class='ctx'> 		struct neigh_table *tbl;</div><div class='ctx'> 		struct neighbour *neigh;</div><div class='ctx'> </div><div class='del'>-		tbl = neigh_tables[index];</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		tbl = rcu_dereference(neigh_tables[index]);</div><div class='ctx'> 		if (!tbl)</div><div class='del'>-			goto out;</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		neigh = __neigh_lookup_noref(tbl, addr, dev);</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		if (index == NEIGH_ARP_TABLE) {</div><div class='add'>+			u32 key = *((u32 *)addr);</div><div class='add'>+</div><div class='add'>+			neigh = __ipv4_neigh_lookup_noref(dev, key);</div><div class='add'>+		} else {</div><div class='add'>+			neigh = __neigh_lookup_noref(tbl, addr, dev);</div><div class='add'>+		}</div><div class='ctx'> 		if (!neigh)</div><div class='ctx'> 			neigh = __neigh_create(tbl, addr, dev, false);</div><div class='ctx'> 		err = PTR_ERR(neigh);</div><div class='ctx'> 		if (IS_ERR(neigh)) {</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			goto out_kfree_skb;</div><div class='ctx'> 		}</div><div class='del'>-		err = neigh-&gt;output(neigh, skb);</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='add'>+		err = READ_ONCE(neigh-&gt;output)(neigh, skb);</div><div class='add'>+out_unlock:</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (index == NEIGH_LINK_TABLE) {</div><div class='ctx'> 		err = dev_hard_header(skb, dev, ntohs(skb-&gt;protocol),</div><div class='hunk'>@@ -2565,43 +3218,53 @@ EXPORT_SYMBOL(neigh_xmit);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='del'>-static struct neighbour *neigh_get_first(struct seq_file *seq)</div><div class='add'>+static struct neighbour *neigh_get_valid(struct seq_file *seq,</div><div class='add'>+					 struct neighbour *n,</div><div class='add'>+					 loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct neigh_seq_state *state = seq-&gt;private;</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='add'>+</div><div class='add'>+	if (!net_eq(dev_net(n-&gt;dev), net))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;neigh_sub_iter) {</div><div class='add'>+		loff_t fakep = 0;</div><div class='add'>+		void *v;</div><div class='add'>+</div><div class='add'>+		v = state-&gt;neigh_sub_iter(state, n, pos ? pos : &amp;fakep);</div><div class='add'>+		if (!v)</div><div class='add'>+			return NULL;</div><div class='add'>+		if (pos)</div><div class='add'>+			return v;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(state-&gt;flags &amp; NEIGH_SEQ_SKIP_NOARP))</div><div class='add'>+		return n;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(n-&gt;nud_state) &amp; ~NUD_NOARP)</div><div class='add'>+		return n;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct neighbour *neigh_get_first(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct neigh_seq_state *state = seq-&gt;private;</div><div class='ctx'> 	struct neigh_hash_table *nht = state-&gt;nht;</div><div class='del'>-	struct neighbour *n = NULL;</div><div class='del'>-	int bucket = state-&gt;bucket;</div><div class='add'>+	struct neighbour *n, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;flags &amp;= ~NEIGH_SEQ_IS_PNEIGH;</div><div class='del'>-	for (bucket = 0; bucket &lt; (1 &lt;&lt; nht-&gt;hash_shift); bucket++) {</div><div class='del'>-		n = rcu_dereference_bh(nht-&gt;hash_buckets[bucket]);</div><div class='ctx'> </div><div class='del'>-		while (n) {</div><div class='del'>-			if (!net_eq(dev_net(n-&gt;dev), net))</div><div class='del'>-				goto next;</div><div class='del'>-			if (state-&gt;neigh_sub_iter) {</div><div class='del'>-				loff_t fakep = 0;</div><div class='del'>-				void *v;</div><div class='del'>-</div><div class='del'>-				v = state-&gt;neigh_sub_iter(state, n, &amp;fakep);</div><div class='del'>-				if (!v)</div><div class='del'>-					goto next;</div><div class='del'>-			}</div><div class='del'>-			if (!(state-&gt;flags &amp; NEIGH_SEQ_SKIP_NOARP))</div><div class='del'>-				break;</div><div class='del'>-			if (n-&gt;nud_state &amp; ~NUD_NOARP)</div><div class='del'>-				break;</div><div class='del'>-next:</div><div class='del'>-			n = rcu_dereference_bh(n-&gt;next);</div><div class='add'>+	while (++state-&gt;bucket &lt; (1 &lt;&lt; nht-&gt;hash_shift)) {</div><div class='add'>+		neigh_for_each_in_bucket(n, &amp;nht-&gt;hash_heads[state-&gt;bucket]) {</div><div class='add'>+			tmp = neigh_get_valid(seq, n, NULL);</div><div class='add'>+			if (tmp)</div><div class='add'>+				return tmp;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (n)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='del'>-	state-&gt;bucket = bucket;</div><div class='ctx'> </div><div class='del'>-	return n;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct neighbour *neigh_get_next(struct seq_file *seq,</div><div class='hunk'>@@ -2609,46 +3272,28 @@ static struct neighbour *neigh_get_next(struct seq_file *seq,</div><div class='ctx'> 					loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct neigh_seq_state *state = seq-&gt;private;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='del'>-	struct neigh_hash_table *nht = state-&gt;nht;</div><div class='add'>+	struct neighbour *tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;neigh_sub_iter) {</div><div class='ctx'> 		void *v = state-&gt;neigh_sub_iter(state, n, pos);</div><div class='add'>+</div><div class='ctx'> 		if (v)</div><div class='ctx'> 			return n;</div><div class='ctx'> 	}</div><div class='del'>-	n = rcu_dereference_bh(n-&gt;next);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		while (n) {</div><div class='del'>-			if (!net_eq(dev_net(n-&gt;dev), net))</div><div class='del'>-				goto next;</div><div class='del'>-			if (state-&gt;neigh_sub_iter) {</div><div class='del'>-				void *v = state-&gt;neigh_sub_iter(state, n, pos);</div><div class='del'>-				if (v)</div><div class='del'>-					return n;</div><div class='del'>-				goto next;</div><div class='del'>-			}</div><div class='del'>-			if (!(state-&gt;flags &amp; NEIGH_SEQ_SKIP_NOARP))</div><div class='del'>-				break;</div><div class='ctx'> </div><div class='del'>-			if (n-&gt;nud_state &amp; ~NUD_NOARP)</div><div class='del'>-				break;</div><div class='del'>-next:</div><div class='del'>-			n = rcu_dereference_bh(n-&gt;next);</div><div class='add'>+	hlist_for_each_entry_continue(n, hash) {</div><div class='add'>+		tmp = neigh_get_valid(seq, n, pos);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			n = tmp;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (n)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (++state-&gt;bucket &gt;= (1 &lt;&lt; nht-&gt;hash_shift))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		n = rcu_dereference_bh(nht-&gt;hash_buckets[state-&gt;bucket]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	n = neigh_get_first(seq);</div><div class='add'>+out:</div><div class='ctx'> 	if (n &amp;&amp; pos)</div><div class='ctx'> 		--(*pos);</div><div class='add'>+</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2673,13 +3318,14 @@ static struct pneigh_entry *pneigh_get_first(struct seq_file *seq)</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct neigh_table *tbl = state-&gt;tbl;</div><div class='ctx'> 	struct pneigh_entry *pn = NULL;</div><div class='del'>-	int bucket = state-&gt;bucket;</div><div class='add'>+	int bucket;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;flags |= NEIGH_SEQ_IS_PNEIGH;</div><div class='ctx'> 	for (bucket = 0; bucket &lt;= PNEIGH_HASHMASK; bucket++) {</div><div class='del'>-		pn = tbl-&gt;phash_buckets[bucket];</div><div class='add'>+		pn = rcu_dereference(tbl-&gt;phash_buckets[bucket]);</div><div class='add'>+</div><div class='ctx'> 		while (pn &amp;&amp; !net_eq(pneigh_net(pn), net))</div><div class='del'>-			pn = pn-&gt;next;</div><div class='add'>+			pn = rcu_dereference(pn-&gt;next);</div><div class='ctx'> 		if (pn)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2697,15 +3343,17 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,</div><div class='ctx'> 	struct neigh_table *tbl = state-&gt;tbl;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		pn = pn-&gt;next;</div><div class='add'>+		pn = rcu_dereference(pn-&gt;next);</div><div class='ctx'> 	} while (pn &amp;&amp; !net_eq(pneigh_net(pn), net));</div><div class='ctx'> </div><div class='ctx'> 	while (!pn) {</div><div class='ctx'> 		if (++state-&gt;bucket &gt; PNEIGH_HASHMASK)</div><div class='ctx'> 			break;</div><div class='del'>-		pn = tbl-&gt;phash_buckets[state-&gt;bucket];</div><div class='add'>+</div><div class='add'>+		pn = rcu_dereference(tbl-&gt;phash_buckets[state-&gt;bucket]);</div><div class='add'>+</div><div class='ctx'> 		while (pn &amp;&amp; !net_eq(pneigh_net(pn), net))</div><div class='del'>-			pn = pn-&gt;next;</div><div class='add'>+			pn = rcu_dereference(pn-&gt;next);</div><div class='ctx'> 		if (pn)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2745,16 +3393,18 @@ static void *neigh_get_idx_any(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *neigh_seq_start(struct seq_file *seq, loff_t *pos, struct neigh_table *tbl, unsigned int neigh_seq_flags)</div><div class='del'>-	__acquires(rcu_bh)</div><div class='add'>+	__acquires(tbl-&gt;lock)</div><div class='add'>+	__acquires(rcu)</div><div class='ctx'> {</div><div class='ctx'> 	struct neigh_seq_state *state = seq-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;tbl = tbl;</div><div class='del'>-	state-&gt;bucket = 0;</div><div class='add'>+	state-&gt;bucket = -1;</div><div class='ctx'> 	state-&gt;flags = (neigh_seq_flags &amp; ~NEIGH_SEQ_IS_PNEIGH);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	state-&gt;nht = rcu_dereference_bh(tbl-&gt;nht);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	state-&gt;nht = rcu_dereference(tbl-&gt;nht);</div><div class='add'>+	spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return *pos ? neigh_get_idx_any(seq, pos) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='hunk'>@@ -2788,9 +3438,14 @@ out:</div><div class='ctx'> EXPORT_SYMBOL(neigh_seq_next);</div><div class='ctx'> </div><div class='ctx'> void neigh_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-	__releases(rcu_bh)</div><div class='add'>+	__releases(tbl-&gt;lock)</div><div class='add'>+	__releases(rcu)</div><div class='ctx'> {</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	struct neigh_seq_state *state = seq-&gt;private;</div><div class='add'>+	struct neigh_table *tbl = state-&gt;tbl;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_seq_stop);</div><div class='ctx'> </div><div class='hunk'>@@ -2798,7 +3453,7 @@ EXPORT_SYMBOL(neigh_seq_stop);</div><div class='ctx'> </div><div class='ctx'> static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct neigh_table *tbl = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct neigh_table *tbl = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (*pos == 0)</div><div class='hunk'>@@ -2815,7 +3470,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct neigh_table *tbl = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct neigh_table *tbl = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for (cpu = *pos; cpu &lt; nr_cpu_ids; ++cpu) {</div><div class='hunk'>@@ -2824,6 +3479,7 @@ static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 		*pos = cpu+1;</div><div class='ctx'> 		return per_cpu_ptr(tbl-&gt;stats, cpu);</div><div class='ctx'> 	}</div><div class='add'>+	(*pos)++;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2834,16 +3490,17 @@ static void neigh_stat_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> static int neigh_stat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct neigh_table *tbl = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct neigh_table *tbl = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct neigh_statistics *st = v;</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_printf(seq, "entries  allocs destroys hash_grows  lookups hits  res_failed  rcv_probes_mcast rcv_probes_ucast  periodic_gc_runs forced_gc_runs unresolved_discards table_fulls\n");</div><div class='add'>+		seq_puts(seq, "entries  allocs   destroys hash_grows lookups  hits     res_failed rcv_probes_mcast rcv_probes_ucast periodic_gc_runs forced_gc_runs unresolved_discards table_fulls\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "%08x  %08lx %08lx %08lx  %08lx %08lx  %08lx  "</div><div class='del'>-			"%08lx %08lx  %08lx %08lx %08lx %08lx\n",</div><div class='add'>+	seq_printf(seq, "%08x %08lx %08lx %08lx   %08lx %08lx %08lx   "</div><div class='add'>+			"%08lx         %08lx         %08lx         "</div><div class='add'>+			"%08lx       %08lx            %08lx\n",</div><div class='ctx'> 		   atomic_read(&amp;tbl-&gt;entries),</div><div class='ctx'> </div><div class='ctx'> 		   st-&gt;allocs,</div><div class='hunk'>@@ -2875,22 +3532,15 @@ static const struct seq_operations neigh_stat_seq_ops = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='del'>-static inline size_t neigh_nlmsg_size(void)</div><div class='del'>-{</div><div class='del'>-	return NLMSG_ALIGN(sizeof(struct ndmsg))</div><div class='del'>-	       + nla_total_size(MAX_ADDR_LEN) /* NDA_DST */</div><div class='del'>-	       + nla_total_size(MAX_ADDR_LEN) /* NDA_LLADDR */</div><div class='del'>-	       + nla_total_size(sizeof(struct nda_cacheinfo))</div><div class='del'>-	       + nla_total_size(4); /* NDA_PROBES */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __neigh_notify(struct neighbour *n, int type, int flags,</div><div class='ctx'> 			   u32 pid)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(n-&gt;dev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	net = dev_net_rcu(n-&gt;dev);</div><div class='ctx'> 	skb = nlmsg_new(neigh_nlmsg_size(), GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -2903,10 +3553,11 @@ static void __neigh_notify(struct neighbour *n, int type, int flags,</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);</div><div class='del'>-	return;</div><div class='add'>+	goto out;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void neigh_app_ns(struct neighbour *n)</div><div class='hunk'>@@ -2916,17 +3567,15 @@ void neigh_app_ns(struct neighbour *n)</div><div class='ctx'> EXPORT_SYMBOL(neigh_app_ns);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static int zero;</div><div class='del'>-static int int_max = INT_MAX;</div><div class='ctx'> static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN);</div><div class='ctx'> </div><div class='del'>-static int proc_unres_qlen(struct ctl_table *ctl, int write,</div><div class='del'>-			   void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_unres_qlen(const struct ctl_table *ctl, int write,</div><div class='add'>+			   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int size, ret;</div><div class='ctx'> 	struct ctl_table tmp = *ctl;</div><div class='ctx'> </div><div class='del'>-	tmp.extra1 = &amp;zero;</div><div class='add'>+	tmp.extra1 = SYSCTL_ZERO;</div><div class='ctx'> 	tmp.extra2 = &amp;unres_qlen_max;</div><div class='ctx'> 	tmp.data = &amp;size;</div><div class='ctx'> </div><div class='hunk'>@@ -2938,18 +3587,6 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct neigh_parms *neigh_get_dev_parms_rcu(struct net_device *dev,</div><div class='del'>-						   int family)</div><div class='del'>-{</div><div class='del'>-	switch (family) {</div><div class='del'>-	case AF_INET:</div><div class='del'>-		return __in_dev_arp_parms_get_rcu(dev);</div><div class='del'>-	case AF_INET6:</div><div class='del'>-		return __in6_dev_nd_parms_get_rcu(dev);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void neigh_copy_dflt_parms(struct net *net, struct neigh_parms *p,</div><div class='ctx'> 				  int index)</div><div class='ctx'> {</div><div class='hunk'>@@ -2967,7 +3604,7 @@ static void neigh_copy_dflt_parms(struct net *net, struct neigh_parms *p,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void neigh_proc_update(struct ctl_table *ctl, int write)</div><div class='add'>+static void neigh_proc_update(const struct ctl_table *ctl, int write)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = ctl-&gt;extra1;</div><div class='ctx'> 	struct neigh_parms *p = ctl-&gt;extra2;</div><div class='hunk'>@@ -2984,23 +3621,39 @@ static void neigh_proc_update(struct ctl_table *ctl, int write)</div><div class='ctx'> 		neigh_copy_dflt_parms(net, p, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,</div><div class='del'>-					   void __user *buffer,</div><div class='del'>-					   size_t *lenp, loff_t *ppos)</div><div class='add'>+static int neigh_proc_dointvec_zero_intmax(const struct ctl_table *ctl, int write,</div><div class='add'>+					   void *buffer, size_t *lenp,</div><div class='add'>+					   loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table tmp = *ctl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tmp.extra1 = &amp;zero;</div><div class='del'>-	tmp.extra2 = &amp;int_max;</div><div class='add'>+	tmp.extra1 = SYSCTL_ZERO;</div><div class='add'>+	tmp.extra2 = SYSCTL_INT_MAX;</div><div class='ctx'> </div><div class='ctx'> 	ret = proc_dointvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='ctx'> 	neigh_proc_update(ctl, write);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int neigh_proc_dointvec(struct ctl_table *ctl, int write,</div><div class='del'>-			void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int neigh_proc_dointvec_ms_jiffies_positive(const struct ctl_table *ctl, int write,</div><div class='add'>+						   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ctl_table tmp = *ctl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	int min = msecs_to_jiffies(1);</div><div class='add'>+</div><div class='add'>+	tmp.extra1 = &amp;min;</div><div class='add'>+	tmp.extra2 = NULL;</div><div class='add'>+</div><div class='add'>+	ret = proc_dointvec_ms_jiffies_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='add'>+	neigh_proc_update(ctl, write);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int neigh_proc_dointvec(const struct ctl_table *ctl, int write, void *buffer,</div><div class='add'>+			size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='hunk'>@@ -3009,8 +3662,7 @@ int neigh_proc_dointvec(struct ctl_table *ctl, int write,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_proc_dointvec);</div><div class='ctx'> </div><div class='del'>-int neigh_proc_dointvec_jiffies(struct ctl_table *ctl, int write,</div><div class='del'>-				void __user *buffer,</div><div class='add'>+int neigh_proc_dointvec_jiffies(const struct ctl_table *ctl, int write, void *buffer,</div><div class='ctx'> 				size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = proc_dointvec_jiffies(ctl, write, buffer, lenp, ppos);</div><div class='hunk'>@@ -3020,9 +3672,9 @@ int neigh_proc_dointvec_jiffies(struct ctl_table *ctl, int write,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_proc_dointvec_jiffies);</div><div class='ctx'> </div><div class='del'>-static int neigh_proc_dointvec_userhz_jiffies(struct ctl_table *ctl, int write,</div><div class='del'>-					      void __user *buffer,</div><div class='del'>-					      size_t *lenp, loff_t *ppos)</div><div class='add'>+static int neigh_proc_dointvec_userhz_jiffies(const struct ctl_table *ctl, int write,</div><div class='add'>+					      void *buffer, size_t *lenp,</div><div class='add'>+					      loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = proc_dointvec_userhz_jiffies(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='hunk'>@@ -3030,9 +3682,8 @@ static int neigh_proc_dointvec_userhz_jiffies(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write,</div><div class='del'>-				   void __user *buffer,</div><div class='del'>-				   size_t *lenp, loff_t *ppos)</div><div class='add'>+int neigh_proc_dointvec_ms_jiffies(const struct ctl_table *ctl, int write,</div><div class='add'>+				   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = proc_dointvec_ms_jiffies(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='hunk'>@@ -3041,9 +3692,9 @@ int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(neigh_proc_dointvec_ms_jiffies);</div><div class='ctx'> </div><div class='del'>-static int neigh_proc_dointvec_unres_qlen(struct ctl_table *ctl, int write,</div><div class='del'>-					  void __user *buffer,</div><div class='del'>-					  size_t *lenp, loff_t *ppos)</div><div class='add'>+static int neigh_proc_dointvec_unres_qlen(const struct ctl_table *ctl, int write,</div><div class='add'>+					  void *buffer, size_t *lenp,</div><div class='add'>+					  loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = proc_unres_qlen(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='hunk'>@@ -3051,9 +3702,9 @@ static int neigh_proc_dointvec_unres_qlen(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write,</div><div class='del'>-					  void __user *buffer,</div><div class='del'>-					  size_t *lenp, loff_t *ppos)</div><div class='add'>+static int neigh_proc_base_reachable_time(const struct ctl_table *ctl, int write,</div><div class='add'>+					  void *buffer, size_t *lenp,</div><div class='add'>+					  loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct neigh_parms *p = ctl-&gt;extra2;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3070,8 +3721,7 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write,</div><div class='ctx'> 		 * only be effective after the next time neigh_periodic_work</div><div class='ctx'> 		 * decides to recompute it</div><div class='ctx'> 		 */</div><div class='del'>-		p-&gt;reachable_time =</div><div class='del'>-			neigh_rand_reach_time(NEIGH_VAR(p, BASE_REACHABLE_TIME));</div><div class='add'>+		neigh_set_reach_time(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3097,8 +3747,8 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write,</div><div class='ctx'> #define NEIGH_SYSCTL_USERHZ_JIFFIES_ENTRY(attr, name) \</div><div class='ctx'> 	NEIGH_SYSCTL_ENTRY(attr, attr, name, 0644, neigh_proc_dointvec_userhz_jiffies)</div><div class='ctx'> </div><div class='del'>-#define NEIGH_SYSCTL_MS_JIFFIES_ENTRY(attr, name) \</div><div class='del'>-	NEIGH_SYSCTL_ENTRY(attr, attr, name, 0644, neigh_proc_dointvec_ms_jiffies)</div><div class='add'>+#define NEIGH_SYSCTL_MS_JIFFIES_POSITIVE_ENTRY(attr, name) \</div><div class='add'>+	NEIGH_SYSCTL_ENTRY(attr, attr, name, 0644, neigh_proc_dointvec_ms_jiffies_positive)</div><div class='ctx'> </div><div class='ctx'> #define NEIGH_SYSCTL_MS_JIFFIES_REUSED_ENTRY(attr, data_attr, name) \</div><div class='ctx'> 	NEIGH_SYSCTL_ENTRY(attr, data_attr, name, 0644, neigh_proc_dointvec_ms_jiffies)</div><div class='hunk'>@@ -3108,7 +3758,7 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write,</div><div class='ctx'> </div><div class='ctx'> static struct neigh_sysctl_table {</div><div class='ctx'> 	struct ctl_table_header *sysctl_header;</div><div class='del'>-	struct ctl_table neigh_vars[NEIGH_VAR_MAX + 1];</div><div class='add'>+	struct ctl_table neigh_vars[NEIGH_VAR_MAX];</div><div class='ctx'> } neigh_sysctl_template __read_mostly = {</div><div class='ctx'> 	.neigh_vars = {</div><div class='ctx'> 		NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(MCAST_PROBES, "mcast_solicit"),</div><div class='hunk'>@@ -3118,6 +3768,8 @@ static struct neigh_sysctl_table {</div><div class='ctx'> 		NEIGH_SYSCTL_USERHZ_JIFFIES_ENTRY(RETRANS_TIME, "retrans_time"),</div><div class='ctx'> 		NEIGH_SYSCTL_JIFFIES_ENTRY(BASE_REACHABLE_TIME, "base_reachable_time"),</div><div class='ctx'> 		NEIGH_SYSCTL_JIFFIES_ENTRY(DELAY_PROBE_TIME, "delay_first_probe_time"),</div><div class='add'>+		NEIGH_SYSCTL_MS_JIFFIES_POSITIVE_ENTRY(INTERVAL_PROBE_TIME_MS,</div><div class='add'>+						       "interval_probe_time_ms"),</div><div class='ctx'> 		NEIGH_SYSCTL_JIFFIES_ENTRY(GC_STALETIME, "gc_stale_time"),</div><div class='ctx'> 		NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(QUEUE_LEN_BYTES, "unres_qlen_bytes"),</div><div class='ctx'> 		NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(PROXY_QLEN, "proxy_qlen"),</div><div class='hunk'>@@ -3137,27 +3789,26 @@ static struct neigh_sysctl_table {</div><div class='ctx'> 			.procname	= "gc_thresh1",</div><div class='ctx'> 			.maxlen		= sizeof(int),</div><div class='ctx'> 			.mode		= 0644,</div><div class='del'>-			.extra1 	= &amp;zero,</div><div class='del'>-			.extra2		= &amp;int_max,</div><div class='add'>+			.extra1		= SYSCTL_ZERO,</div><div class='add'>+			.extra2		= SYSCTL_INT_MAX,</div><div class='ctx'> 			.proc_handler	= proc_dointvec_minmax,</div><div class='ctx'> 		},</div><div class='ctx'> 		[NEIGH_VAR_GC_THRESH2] = {</div><div class='ctx'> 			.procname	= "gc_thresh2",</div><div class='ctx'> 			.maxlen		= sizeof(int),</div><div class='ctx'> 			.mode		= 0644,</div><div class='del'>-			.extra1 	= &amp;zero,</div><div class='del'>-			.extra2		= &amp;int_max,</div><div class='add'>+			.extra1		= SYSCTL_ZERO,</div><div class='add'>+			.extra2		= SYSCTL_INT_MAX,</div><div class='ctx'> 			.proc_handler	= proc_dointvec_minmax,</div><div class='ctx'> 		},</div><div class='ctx'> 		[NEIGH_VAR_GC_THRESH3] = {</div><div class='ctx'> 			.procname	= "gc_thresh3",</div><div class='ctx'> 			.maxlen		= sizeof(int),</div><div class='ctx'> 			.mode		= 0644,</div><div class='del'>-			.extra1 	= &amp;zero,</div><div class='del'>-			.extra2		= &amp;int_max,</div><div class='add'>+			.extra1		= SYSCTL_ZERO,</div><div class='add'>+			.extra2		= SYSCTL_INT_MAX,</div><div class='ctx'> 			.proc_handler	= proc_dointvec_minmax,</div><div class='ctx'> 		},</div><div class='del'>-		{},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3169,8 +3820,9 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,</div><div class='ctx'> 	const char *dev_name_source;</div><div class='ctx'> 	char neigh_path[ sizeof("net//neigh/") + IFNAMSIZ + IFNAMSIZ ];</div><div class='ctx'> 	char *p_name;</div><div class='add'>+	size_t neigh_vars_size;</div><div class='ctx'> </div><div class='del'>-	t = kmemdup(&amp;neigh_sysctl_template, sizeof(*t), GFP_KERNEL);</div><div class='add'>+	t = kmemdup(&amp;neigh_sysctl_template, sizeof(*t), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -3180,11 +3832,11 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,</div><div class='ctx'> 		t-&gt;neigh_vars[i].extra2 = p;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	neigh_vars_size = ARRAY_SIZE(t-&gt;neigh_vars);</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		dev_name_source = dev-&gt;name;</div><div class='ctx'> 		/* Terminate the table early */</div><div class='del'>-		memset(&amp;t-&gt;neigh_vars[NEIGH_VAR_GC_INTERVAL], 0,</div><div class='del'>-		       sizeof(t-&gt;neigh_vars[NEIGH_VAR_GC_INTERVAL]));</div><div class='add'>+		neigh_vars_size = NEIGH_VAR_BASE_REACHABLE_TIME_MS + 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct neigh_table *tbl = p-&gt;tbl;</div><div class='ctx'> 		dev_name_source = "default";</div><div class='hunk'>@@ -3218,10 +3870,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,</div><div class='ctx'> 			neigh_proc_base_reachable_time;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Don't export sysctls to unprivileged users */</div><div class='del'>-	if (neigh_parms_net(p)-&gt;user_ns != &amp;init_user_ns)</div><div class='del'>-		t-&gt;neigh_vars[0].procname = NULL;</div><div class='del'>-</div><div class='ctx'> 	switch (neigh_parms_family(p)) {</div><div class='ctx'> 	case AF_INET:</div><div class='ctx'> 	      p_name = "ipv4";</div><div class='hunk'>@@ -3235,8 +3883,9 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,</div><div class='ctx'> </div><div class='ctx'> 	snprintf(neigh_path, sizeof(neigh_path), "net/%s/neigh/%s",</div><div class='ctx'> 		p_name, dev_name_source);</div><div class='del'>-	t-&gt;sysctl_header =</div><div class='del'>-		register_net_sysctl(neigh_parms_net(p), neigh_path, t-&gt;neigh_vars);</div><div class='add'>+	t-&gt;sysctl_header = register_net_sysctl_sz(neigh_parms_net(p),</div><div class='add'>+						  neigh_path, t-&gt;neigh_vars,</div><div class='add'>+						  neigh_vars_size);</div><div class='ctx'> 	if (!t-&gt;sysctl_header)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='hunk'>@@ -3263,16 +3912,20 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_SYSCTL */</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler neigh_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_NEWNEIGH, .doit = neigh_add},</div><div class='add'>+	{.msgtype = RTM_DELNEIGH, .doit = neigh_delete},</div><div class='add'>+	{.msgtype = RTM_GETNEIGH, .doit = neigh_get, .dumpit = neigh_dump_info,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.msgtype = RTM_GETNEIGHTBL, .dumpit = neightbl_dump_info,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.msgtype = RTM_SETNEIGHTBL, .doit = neightbl_set,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init neigh_init(void)</div><div class='ctx'> {</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETNEIGH, NULL, neigh_dump_info, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETNEIGHTBL, NULL, neightbl_dump_info,</div><div class='del'>-		      0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, 0);</div><div class='del'>-</div><div class='add'>+	rtnl_register_many(neigh_rtnl_msg_handlers);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c<br/>index 63881f72ef71..70e0e9a3b650 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/net-procfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-procfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net-procfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net-procfs.c</a></div><div class='hunk'>@@ -3,53 +3,22 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;net/wext.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> </div><div class='del'>-#define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1)</div><div class='add'>+#include "dev.h"</div><div class='ctx'> </div><div class='del'>-#define get_bucket(x) ((x) &gt;&gt; BUCKET_SPACE)</div><div class='del'>-#define get_offset(x) ((x) &amp; ((1 &lt;&lt; BUCKET_SPACE) - 1))</div><div class='del'>-#define set_bucket_offset(b, o) ((b) &lt;&lt; BUCKET_SPACE | (o))</div><div class='del'>-</div><div class='del'>-extern struct list_head ptype_all __read_mostly;</div><div class='del'>-extern struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly;</div><div class='del'>-</div><div class='del'>-static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff_t *pos)</div><div class='add'>+static void *dev_seq_from_index(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='add'>+	unsigned long ifindex = *pos;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct hlist_head *h;</div><div class='del'>-	unsigned int count = 0, offset = get_offset(*pos);</div><div class='ctx'> </div><div class='del'>-	h = &amp;net-&gt;dev_name_head[get_bucket(*pos)];</div><div class='del'>-	hlist_for_each_entry_rcu(dev, h, name_hlist) {</div><div class='del'>-		if (++count == offset)</div><div class='del'>-			return dev;</div><div class='add'>+	for_each_netdev_dump(seq_file_net(seq), dev, ifindex) {</div><div class='add'>+		*pos = dev-&gt;ifindex;</div><div class='add'>+		return dev;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct net_device *dev_from_bucket(struct seq_file *seq, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned int bucket;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		dev = dev_from_same_bucket(seq, pos);</div><div class='del'>-		if (dev)</div><div class='del'>-			return dev;</div><div class='del'>-</div><div class='del'>-		bucket = get_bucket(*pos) + 1;</div><div class='del'>-		*pos = set_bucket_offset(bucket, 1);</div><div class='del'>-	} while (bucket &lt; NETDEV_HASHENTRIES);</div><div class='del'>-</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	This is invoked by the /proc filesystem handler to display a device</div><div class='del'>- *	in detail.</div><div class='del'>- */</div><div class='ctx'> static void *dev_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	__acquires(RCU)</div><div class='ctx'> {</div><div class='hunk'>@@ -57,16 +26,13 @@ static void *dev_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	if (!*pos)</div><div class='ctx'> 		return SEQ_START_TOKEN;</div><div class='ctx'> </div><div class='del'>-	if (get_bucket(*pos) &gt;= NETDEV_HASHENTRIES)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return dev_from_bucket(seq, pos);</div><div class='add'>+	return dev_seq_from_index(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	++*pos;</div><div class='del'>-	return dev_from_bucket(seq, pos);</div><div class='add'>+	return dev_seq_from_index(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dev_seq_stop(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -116,6 +82,16 @@ static int dev_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 softnet_input_pkt_queue_len(struct softnet_data *sd)</div><div class='add'>+{</div><div class='add'>+	return skb_queue_len_lockless(&amp;sd-&gt;input_pkt_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 softnet_process_queue_len(struct softnet_data *sd)</div><div class='add'>+{</div><div class='add'>+	return skb_queue_len_lockless(&amp;sd-&gt;process_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct softnet_data *softnet_get_online(loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct softnet_data *sd = NULL;</div><div class='hunk'>@@ -147,6 +123,8 @@ static void softnet_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> static int softnet_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct softnet_data *sd = v;</div><div class='add'>+	u32 input_qlen = softnet_input_pkt_queue_len(sd);</div><div class='add'>+	u32 process_qlen = softnet_process_queue_len(sd);</div><div class='ctx'> 	unsigned int flow_limit_count = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_FLOW_LIMIT</div><div class='hunk'>@@ -154,17 +132,27 @@ static int softnet_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	fl = rcu_dereference(sd-&gt;flow_limit);</div><div class='add'>+	/* Pairs with WRITE_ONCE() in skb_flow_limit() */</div><div class='ctx'> 	if (fl)</div><div class='del'>-		flow_limit_count = fl-&gt;count;</div><div class='add'>+		flow_limit_count = READ_ONCE(fl-&gt;count);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* the index is the CPU id owing this sd. Since offline CPUs are not</div><div class='add'>+	 * displayed, it would be othrwise not trivial for the user-space</div><div class='add'>+	 * mapping the data a specific CPU</div><div class='add'>+	 */</div><div class='ctx'> 	seq_printf(seq,</div><div class='del'>-		   "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",</div><div class='del'>-		   sd-&gt;processed, sd-&gt;dropped, sd-&gt;time_squeeze, 0,</div><div class='add'>+		   "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x "</div><div class='add'>+		   "%08x %08x\n",</div><div class='add'>+		   READ_ONCE(sd-&gt;processed),</div><div class='add'>+		   numa_drop_read(&amp;sd-&gt;drop_counters),</div><div class='add'>+		   READ_ONCE(sd-&gt;time_squeeze), 0,</div><div class='ctx'> 		   0, 0, 0, 0, /* was fastroute */</div><div class='ctx'> 		   0,	/* was cpu_collision */</div><div class='del'>-		   sd-&gt;received_rps, flow_limit_count);</div><div class='add'>+		   READ_ONCE(sd-&gt;received_rps), flow_limit_count,</div><div class='add'>+		   input_qlen + process_qlen, (int)seq-&gt;index,</div><div class='add'>+		   input_qlen, process_qlen);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,13 +170,30 @@ static const struct seq_operations softnet_seq_ops = {</div><div class='ctx'> 	.show  = softnet_seq_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void *ptype_get_idx(loff_t pos)</div><div class='add'>+static void *ptype_get_idx(struct seq_file *seq, loff_t pos)</div><div class='ctx'> {</div><div class='add'>+	struct list_head *ptype_list = NULL;</div><div class='ctx'> 	struct packet_type *pt = NULL;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	loff_t i = 0;</div><div class='ctx'> 	int t;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(pt, &amp;ptype_all, list) {</div><div class='add'>+	for_each_netdev_rcu(seq_file_net(seq), dev) {</div><div class='add'>+		ptype_list = &amp;dev-&gt;ptype_all;</div><div class='add'>+		list_for_each_entry_rcu(pt, ptype_list, list) {</div><div class='add'>+			if (i == pos)</div><div class='add'>+				return pt;</div><div class='add'>+			++i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(pt, &amp;seq_file_net(seq)-&gt;ptype_all, list) {</div><div class='add'>+		if (i == pos)</div><div class='add'>+			return pt;</div><div class='add'>+		++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(pt, &amp;seq_file_net(seq)-&gt;ptype_specific, list) {</div><div class='ctx'> 		if (i == pos)</div><div class='ctx'> 			return pt;</div><div class='ctx'> 		++i;</div><div class='hunk'>@@ -208,24 +213,50 @@ static void *ptype_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	__acquires(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	return *pos ? ptype_get_idx(*pos - 1) : SEQ_START_TOKEN;</div><div class='add'>+	return *pos ? ptype_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *ptype_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct packet_type *pt;</div><div class='ctx'> 	struct list_head *nxt;</div><div class='ctx'> 	int hash;</div><div class='ctx'> </div><div class='ctx'> 	++*pos;</div><div class='ctx'> 	if (v == SEQ_START_TOKEN)</div><div class='del'>-		return ptype_get_idx(0);</div><div class='add'>+		return ptype_get_idx(seq, 0);</div><div class='ctx'> </div><div class='ctx'> 	pt = v;</div><div class='ctx'> 	nxt = pt-&gt;list.next;</div><div class='del'>-	if (pt-&gt;type == htons(ETH_P_ALL)) {</div><div class='del'>-		if (nxt != &amp;ptype_all)</div><div class='add'>+	if (pt-&gt;dev) {</div><div class='add'>+		if (nxt != &amp;pt-&gt;dev-&gt;ptype_all)</div><div class='add'>+			goto found;</div><div class='add'>+</div><div class='add'>+		dev = pt-&gt;dev;</div><div class='add'>+		for_each_netdev_continue_rcu(seq_file_net(seq), dev) {</div><div class='add'>+			if (!list_empty(&amp;dev-&gt;ptype_all)) {</div><div class='add'>+				nxt = dev-&gt;ptype_all.next;</div><div class='add'>+				goto found;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		nxt = net-&gt;ptype_all.next;</div><div class='add'>+		goto net_ptype_all;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pt-&gt;af_packet_net) {</div><div class='add'>+net_ptype_all:</div><div class='add'>+		if (nxt != &amp;net-&gt;ptype_all &amp;&amp; nxt != &amp;net-&gt;ptype_specific)</div><div class='ctx'> 			goto found;</div><div class='add'>+</div><div class='add'>+		if (nxt == &amp;net-&gt;ptype_all) {</div><div class='add'>+			/* continue with -&gt;ptype_specific if it's not empty */</div><div class='add'>+			nxt = net-&gt;ptype_specific.next;</div><div class='add'>+			if (nxt != &amp;net-&gt;ptype_specific)</div><div class='add'>+				goto found;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hash = 0;</div><div class='ctx'> 		nxt = ptype_base[0].next;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -252,13 +283,14 @@ static int ptype_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN)</div><div class='ctx'> 		seq_puts(seq, "Type Device      Function\n");</div><div class='del'>-	else if (pt-&gt;dev == NULL || dev_net(pt-&gt;dev) == seq_file_net(seq)) {</div><div class='add'>+	else if ((!pt-&gt;af_packet_net || net_eq(pt-&gt;af_packet_net, seq_file_net(seq))) &amp;&amp;</div><div class='add'>+		 (!pt-&gt;dev || net_eq(dev_net(pt-&gt;dev), seq_file_net(seq)))) {</div><div class='ctx'> 		if (pt-&gt;type == htons(ETH_P_ALL))</div><div class='ctx'> 			seq_puts(seq, "ALL ");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_printf(seq, "%04x", ntohs(pt-&gt;type));</div><div class='ctx'> </div><div class='del'>-		seq_printf(seq, " %-8s %pf\n",</div><div class='add'>+		seq_printf(seq, " %-8s %ps\n",</div><div class='ctx'> 			   pt-&gt;dev ? pt-&gt;dev-&gt;name : "", pt-&gt;func);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c<br/>index bd67c4d0fcfd..ca878525ad7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/net-sysfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net-sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net-sysfs.c</a></div><div class='hunk'>@@ -1,21 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net-sysfs.c - network device class and attributes</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Stephen Hemminger &lt;shemminger@osdl.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/switchdev.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/isolation.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='hunk'>@@ -27,18 +23,105 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "dev.h"</div><div class='ctx'> #include "net-sysfs.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> static const char fmt_hex[] = "%#x\n";</div><div class='ctx'> static const char fmt_dec[] = "%d\n";</div><div class='add'>+static const char fmt_uint[] = "%u\n";</div><div class='ctx'> static const char fmt_ulong[] = "%lu\n";</div><div class='ctx'> static const char fmt_u64[] = "%llu\n";</div><div class='ctx'> </div><div class='add'>+/* Caller holds RTNL, netdev-&gt;lock or RCU */</div><div class='ctx'> static inline int dev_isalive(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return dev-&gt;reg_state &lt;= NETREG_REGISTERED;</div><div class='add'>+	return READ_ONCE(dev-&gt;reg_state) &lt;= NETREG_REGISTERED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There is a possible ABBA deadlock between rtnl_lock and kernfs_node-&gt;active,</div><div class='add'>+ * when unregistering a net device and accessing associated sysfs files. The</div><div class='add'>+ * potential deadlock is as follow:</div><div class='add'>+ *</div><div class='add'>+ *         CPU 0                                         CPU 1</div><div class='add'>+ *</div><div class='add'>+ *    rtnl_lock                                   vfs_read</div><div class='add'>+ *    unregister_netdevice_many                   kernfs_seq_start</div><div class='add'>+ *    device_del / kobject_put                      kernfs_get_active (kn-&gt;active++)</div><div class='add'>+ *    kernfs_drain                                sysfs_kf_seq_show</div><div class='add'>+ *    wait_event(                                 rtnl_lock</div><div class='add'>+ *       kn-&gt;active == KN_DEACTIVATED_BIAS)       -&gt; waits on CPU 0 to release</div><div class='add'>+ *    -&gt; waits on CPU 1 to decrease kn-&gt;active       the rtnl lock.</div><div class='add'>+ *</div><div class='add'>+ * The historical fix was to use rtnl_trylock with restart_syscall to bail out</div><div class='add'>+ * of sysfs operations when the lock couldn't be taken. This fixed the above</div><div class='add'>+ * issue as it allowed CPU 1 to bail out of the ABBA situation.</div><div class='add'>+ *</div><div class='add'>+ * But it came with performances issues, as syscalls are being restarted in</div><div class='add'>+ * loops when there was contention on the rtnl lock, with huge slow downs in</div><div class='add'>+ * specific scenarios (e.g. lots of virtual interfaces created and userspace</div><div class='add'>+ * daemons querying their attributes).</div><div class='add'>+ *</div><div class='add'>+ * The idea below is to bail out of the active kernfs_node protection</div><div class='add'>+ * (kn-&gt;active) while trying to take the rtnl lock.</div><div class='add'>+ *</div><div class='add'>+ * This replaces rtnl_lock() and still has to be used with rtnl_unlock(). The</div><div class='add'>+ * net device is guaranteed to be alive if this returns successfully.</div><div class='add'>+ */</div><div class='add'>+static int sysfs_rtnl_lock(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			   struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* First, we hold a reference to the net device as the unregistration</div><div class='add'>+	 * path might run in parallel. This will ensure the net device and the</div><div class='add'>+	 * associated sysfs objects won't be freed while we try to take the rtnl</div><div class='add'>+	 * lock.</div><div class='add'>+	 */</div><div class='add'>+	dev_hold(ndev);</div><div class='add'>+	/* sysfs_break_active_protection was introduced to allow self-removal of</div><div class='add'>+	 * devices and their associated sysfs files by bailing out of the</div><div class='add'>+	 * sysfs/kernfs protection. We do this here to allow the unregistration</div><div class='add'>+	 * path to complete in parallel. The following takes a reference on the</div><div class='add'>+	 * kobject and the kernfs_node being accessed.</div><div class='add'>+	 *</div><div class='add'>+	 * This works because we hold a reference onto the net device and the</div><div class='add'>+	 * unregistration path will wait for us eventually in netdev_run_todo</div><div class='add'>+	 * (outside an rtnl lock section).</div><div class='add'>+	 */</div><div class='add'>+	kn = sysfs_break_active_protection(kobj, attr);</div><div class='add'>+	/* We can now try to take the rtnl lock. This can't deadlock us as the</div><div class='add'>+	 * unregistration path is able to drain sysfs files (kernfs_node) thanks</div><div class='add'>+	 * to the above dance.</div><div class='add'>+	 */</div><div class='add'>+	if (rtnl_lock_interruptible()) {</div><div class='add'>+		ret = -ERESTARTSYS;</div><div class='add'>+		goto unbreak;</div><div class='add'>+	}</div><div class='add'>+	/* Check dismantle on the device hasn't started, otherwise deny the</div><div class='add'>+	 * operation.</div><div class='add'>+	 */</div><div class='add'>+	if (!dev_isalive(ndev)) {</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unbreak;</div><div class='add'>+	}</div><div class='add'>+	/* We are now sure the device dismantle hasn't started nor that it can</div><div class='add'>+	 * start before we exit the locking section as we hold the rtnl lock.</div><div class='add'>+	 * There's no need to keep unbreaking the sysfs protection nor to hold</div><div class='add'>+	 * a net device reference from that point; that was only needed to take</div><div class='add'>+	 * the rtnl lock.</div><div class='add'>+	 */</div><div class='add'>+unbreak:</div><div class='add'>+	sysfs_unbreak_active_protection(kn);</div><div class='add'>+	dev_put(ndev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* use same locking rules as GIF* ioctl's */</div><div class='hunk'>@@ -49,10 +132,10 @@ static ssize_t netdev_show(const struct device *dev,</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='ctx'> 	ssize_t ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;dev_base_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (dev_isalive(ndev))</div><div class='ctx'> 		ret = (*format)(ndev, buf);</div><div class='del'>-	read_unlock(&amp;dev_base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -61,7 +144,7 @@ static ssize_t netdev_show(const struct device *dev,</div><div class='ctx'> #define NETDEVICE_SHOW(field, format_string)				\</div><div class='ctx'> static ssize_t format_##field(const struct net_device *dev, char *buf)	\</div><div class='ctx'> {									\</div><div class='del'>-	return sprintf(buf, format_string, dev-&gt;field);			\</div><div class='add'>+	return sysfs_emit(buf, format_string, READ_ONCE(dev-&gt;field));		\</div><div class='ctx'> }									\</div><div class='ctx'> static ssize_t field##_show(struct device *dev,				\</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)	\</div><div class='hunk'>@@ -85,7 +168,7 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	struct net *net = dev_net(netdev);</div><div class='ctx'> 	unsigned long new;</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -94,16 +177,46 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = (*set)(netdev, new);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = len;</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+ err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Same as netdev_store() but takes netdev_lock() instead of rtnl_lock() */</div><div class='add'>+static ssize_t</div><div class='add'>+netdev_lock_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		  const char *buf, size_t len,</div><div class='add'>+		  int (*set)(struct net_device *, unsigned long))</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+	struct net *net = dev_net(netdev);</div><div class='add'>+	unsigned long new;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(buf, 0, &amp;new);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_isalive(netdev)) {</div><div class='ctx'> 		ret = (*set)(netdev, new);</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			ret = len;</div><div class='ctx'> 	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>- err:</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -120,13 +233,13 @@ static ssize_t iflink_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, fmt_dec, dev_get_iflink(ndev));</div><div class='add'>+	return sysfs_emit(buf, fmt_dec, dev_get_iflink(ndev));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(iflink);</div><div class='ctx'> </div><div class='ctx'> static ssize_t format_name_assign_type(const struct net_device *dev, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, fmt_dec, dev-&gt;name_assign_type);</div><div class='add'>+	return sysfs_emit(buf, fmt_dec, READ_ONCE(dev-&gt;name_assign_type));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t name_assign_type_show(struct device *dev,</div><div class='hunk'>@@ -136,24 +249,28 @@ static ssize_t name_assign_type_show(struct device *dev,</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='ctx'> 	ssize_t ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ndev-&gt;name_assign_type != NET_NAME_UNKNOWN)</div><div class='add'>+	if (READ_ONCE(ndev-&gt;name_assign_type) != NET_NAME_UNKNOWN)</div><div class='ctx'> 		ret = netdev_show(dev, attr, buf, format_name_assign_type);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(name_assign_type);</div><div class='ctx'> </div><div class='del'>-/* use same locking rules as GIFHWADDR ioctl's */</div><div class='add'>+/* use same locking rules as GIFHWADDR ioctl's (netif_get_mac_address()) */</div><div class='ctx'> static ssize_t address_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='ctx'> 	ssize_t ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;dev_base_lock);</div><div class='add'>+	down_read(&amp;dev_addr_sem);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (dev_isalive(ndev))</div><div class='ctx'> 		ret = sysfs_format_mac(buf, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='del'>-	read_unlock(&amp;dev_base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	up_read(&amp;dev_addr_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(address);</div><div class='hunk'>@@ -162,10 +279,13 @@ static ssize_t broadcast_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='add'>+	int ret = -EINVAL;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (dev_isalive(ndev))</div><div class='del'>-		return sysfs_format_mac(buf, ndev-&gt;broadcast, ndev-&gt;addr_len);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+		ret = sysfs_format_mac(buf, ndev-&gt;broadcast, ndev-&gt;addr_len);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(broadcast);</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +299,14 @@ static int change_carrier(struct net_device *dev, unsigned long new_carrier)</div><div class='ctx'> static ssize_t carrier_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t len)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+</div><div class='add'>+	/* The check is also done in change_carrier; this helps returning early</div><div class='add'>+	 * without hitting the locking section in netdev_store.</div><div class='add'>+	 */</div><div class='add'>+	if (!netdev-&gt;netdev_ops-&gt;ndo_change_carrier)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	return netdev_store(dev, attr, buf, len, change_carrier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -186,11 +314,24 @@ static ssize_t carrier_show(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev))</div><div class='del'>-		return sprintf(buf, fmt_dec, !!netif_carrier_ok(netdev));</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		/* Synchronize carrier state with link watch,</div><div class='add'>+		 * see also rtnl_getlink().</div><div class='add'>+		 */</div><div class='add'>+		linkwatch_sync_dev(netdev);</div><div class='add'>+</div><div class='add'>+		ret = sysfs_emit(buf, fmt_dec, !!netif_carrier_ok(netdev));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(carrier);</div><div class='ctx'> </div><div class='hunk'>@@ -200,14 +341,22 @@ static ssize_t speed_show(struct device *dev,</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	/* The check is also done in __ethtool_get_link_ksettings; this helps</div><div class='add'>+	 * returning early without hitting the locking section below.</div><div class='add'>+	 */</div><div class='add'>+	if (!netdev-&gt;ethtool_ops-&gt;get_link_ksettings)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		struct ethtool_link_ksettings cmd;</div><div class='ctx'> </div><div class='ctx'> 		if (!__ethtool_get_link_ksettings(netdev, &amp;cmd))</div><div class='del'>-			ret = sprintf(buf, fmt_dec, cmd.base.speed);</div><div class='add'>+			ret = sysfs_emit(buf, fmt_dec, cmd.base.speed);</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -220,9 +369,17 @@ static ssize_t duplex_show(struct device *dev,</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	/* The check is also done in __ethtool_get_link_ksettings; this helps</div><div class='add'>+	 * returning early without hitting the locking section below.</div><div class='add'>+	 */</div><div class='add'>+	if (!netdev-&gt;ethtool_ops-&gt;get_link_ksettings)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		struct ethtool_link_ksettings cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -240,7 +397,7 @@ static ssize_t duplex_show(struct device *dev,</div><div class='ctx'> 				duplex = "unknown";</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			ret = sprintf(buf, "%s\n", duplex);</div><div class='add'>+			ret = sysfs_emit(buf, "%s\n", duplex);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -248,13 +405,25 @@ static ssize_t duplex_show(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(duplex);</div><div class='ctx'> </div><div class='add'>+static ssize_t testing_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return sysfs_emit(buf, fmt_dec, !!netif_testing(netdev));</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(testing);</div><div class='add'>+</div><div class='ctx'> static ssize_t dormant_show(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev))</div><div class='del'>-		return sprintf(buf, fmt_dec, !!netif_dormant(netdev));</div><div class='add'>+		return sysfs_emit(buf, fmt_dec, !!netif_dormant(netdev));</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -265,7 +434,7 @@ static const char *const operstates[] = {</div><div class='ctx'> 	"notpresent", /* currently unused */</div><div class='ctx'> 	"down",</div><div class='ctx'> 	"lowerlayerdown",</div><div class='del'>-	"testing", /* currently unused */</div><div class='add'>+	"testing",</div><div class='ctx'> 	"dormant",</div><div class='ctx'> 	"up"</div><div class='ctx'> };</div><div class='hunk'>@@ -276,16 +445,14 @@ static ssize_t operstate_show(struct device *dev,</div><div class='ctx'> 	const struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	unsigned char operstate;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;dev_base_lock);</div><div class='del'>-	operstate = netdev-&gt;operstate;</div><div class='add'>+	operstate = READ_ONCE(netdev-&gt;operstate);</div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='ctx'> 		operstate = IF_OPER_DOWN;</div><div class='del'>-	read_unlock(&amp;dev_base_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (operstate &gt;= ARRAY_SIZE(operstates))</div><div class='ctx'> 		return -EINVAL; /* should not happen */</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", operstates[operstate]);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", operstates[operstate]);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(operstate);</div><div class='ctx'> </div><div class='hunk'>@@ -295,9 +462,9 @@ static ssize_t carrier_changes_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, fmt_dec,</div><div class='del'>-		       atomic_read(&amp;netdev-&gt;carrier_up_count) +</div><div class='del'>-		       atomic_read(&amp;netdev-&gt;carrier_down_count));</div><div class='add'>+	return sysfs_emit(buf, fmt_dec,</div><div class='add'>+			  atomic_read(&amp;netdev-&gt;carrier_up_count) +</div><div class='add'>+			  atomic_read(&amp;netdev-&gt;carrier_down_count));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(carrier_changes);</div><div class='ctx'> </div><div class='hunk'>@@ -307,7 +474,7 @@ static ssize_t carrier_up_count_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, fmt_dec, atomic_read(&amp;netdev-&gt;carrier_up_count));</div><div class='add'>+	return sysfs_emit(buf, fmt_dec, atomic_read(&amp;netdev-&gt;carrier_up_count));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(carrier_up_count);</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +484,7 @@ static ssize_t carrier_down_count_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, fmt_dec, atomic_read(&amp;netdev-&gt;carrier_down_count));</div><div class='add'>+	return sysfs_emit(buf, fmt_dec, atomic_read(&amp;netdev-&gt;carrier_down_count));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(carrier_down_count);</div><div class='ctx'> </div><div class='hunk'>@@ -337,7 +504,7 @@ NETDEVICE_SHOW_RW(mtu, fmt_dec);</div><div class='ctx'> </div><div class='ctx'> static int change_flags(struct net_device *dev, unsigned long new_flags)</div><div class='ctx'> {</div><div class='del'>-	return dev_change_flags(dev, (unsigned int)new_flags);</div><div class='add'>+	return dev_change_flags(dev, (unsigned int)new_flags, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t flags_store(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -360,7 +527,7 @@ NETDEVICE_SHOW_RW(tx_queue_len, fmt_dec);</div><div class='ctx'> </div><div class='ctx'> static int change_gro_flush_timeout(struct net_device *dev, unsigned long val)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;gro_flush_timeout = val;</div><div class='add'>+	netdev_set_gro_flush_timeout(dev, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -371,17 +538,38 @@ static ssize_t gro_flush_timeout_store(struct device *dev,</div><div class='ctx'> 	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	return netdev_store(dev, attr, buf, len, change_gro_flush_timeout);</div><div class='add'>+	return netdev_lock_store(dev, attr, buf, len, change_gro_flush_timeout);</div><div class='ctx'> }</div><div class='ctx'> NETDEVICE_SHOW_RW(gro_flush_timeout, fmt_ulong);</div><div class='ctx'> </div><div class='add'>+static int change_napi_defer_hard_irqs(struct net_device *dev, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	if (val &gt; S32_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	netdev_set_defer_hard_irqs(dev, (u32)val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t napi_defer_hard_irqs_store(struct device *dev,</div><div class='add'>+					  struct device_attribute *attr,</div><div class='add'>+					  const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return netdev_lock_store(dev, attr, buf, len,</div><div class='add'>+				 change_napi_defer_hard_irqs);</div><div class='add'>+}</div><div class='add'>+NETDEVICE_SHOW_RW(napi_defer_hard_irqs, fmt_uint);</div><div class='add'>+</div><div class='ctx'> static ssize_t ifalias_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	struct net *net = dev_net(netdev);</div><div class='ctx'> 	size_t count = len;</div><div class='del'>-	ssize_t ret = 0;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -390,16 +578,15 @@ static ssize_t ifalias_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (len &gt;  0 &amp;&amp; buf[len - 1] == '\n')</div><div class='ctx'> 		--count;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (dev_isalive(netdev)) {</div><div class='del'>-		ret = dev_set_alias(netdev, buf, count);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto err;</div><div class='del'>-		ret = len;</div><div class='del'>-		netdev_state_change(netdev);</div><div class='del'>-	}</div><div class='add'>+	ret = dev_set_alias(netdev, buf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	ret = len;</div><div class='add'>+	netdev_state_change(netdev);</div><div class='ctx'> err:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -411,11 +598,11 @@ static ssize_t ifalias_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device *netdev = to_net_dev(dev);</div><div class='ctx'> 	char tmp[IFALIASZ];</div><div class='del'>-	ssize_t ret = 0;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = dev_get_alias(netdev, tmp, sizeof(tmp));</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		ret = sprintf(buf, "%s\n", tmp);</div><div class='add'>+		ret = sysfs_emit(buf, "%s\n", tmp);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(ifalias);</div><div class='hunk'>@@ -451,18 +638,17 @@ static ssize_t phys_port_id_show(struct device *dev,</div><div class='ctx'> 				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='del'>-	ssize_t ret = -EINVAL;</div><div class='add'>+	struct netdev_phys_item_id ppid;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (dev_isalive(netdev)) {</div><div class='del'>-		struct netdev_phys_item_id ppid;</div><div class='add'>+	ret = dev_get_phys_port_id(netdev, &amp;ppid);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sysfs_emit(buf, "%*phN\n", ppid.id_len, ppid.id);</div><div class='ctx'> </div><div class='del'>-		ret = dev_get_phys_port_id(netdev, &amp;ppid);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);</div><div class='del'>-	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -473,18 +659,17 @@ static ssize_t phys_port_name_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='del'>-	ssize_t ret = -EINVAL;</div><div class='add'>+	char name[IFNAMSIZ];</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (dev_isalive(netdev)) {</div><div class='del'>-		char name[IFNAMSIZ];</div><div class='add'>+	ret = dev_get_phys_port_name(netdev, name, sizeof(name));</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sysfs_emit(buf, "%s\n", name);</div><div class='ctx'> </div><div class='del'>-		ret = dev_get_phys_port_name(netdev, name, sizeof(name));</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = sprintf(buf, "%s\n", name);</div><div class='del'>-	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -495,29 +680,96 @@ static ssize_t phys_switch_id_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = to_net_dev(dev);</div><div class='del'>-	ssize_t ret = -EINVAL;</div><div class='add'>+	struct netdev_phys_item_id ppid = { };</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_rtnl_lock(&amp;dev-&gt;kobj, &amp;attr-&gt;attr, netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	ret = netif_get_port_parent_id(netdev, &amp;ppid, false);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sysfs_emit(buf, "%*phN\n", ppid.id_len, ppid.id);</div><div class='ctx'> </div><div class='del'>-	if (dev_isalive(netdev)) {</div><div class='del'>-		struct switchdev_attr attr = {</div><div class='del'>-			.orig_dev = netdev,</div><div class='del'>-			.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,</div><div class='del'>-			.flags = SWITCHDEV_F_NO_RECURSE,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ret = switchdev_port_attr_get(netdev, &amp;attr);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = sprintf(buf, "%*phN\n", attr.u.ppid.id_len,</div><div class='del'>-				      attr.u.ppid.id);</div><div class='del'>-	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(phys_switch_id);</div><div class='ctx'> </div><div class='add'>+static struct attribute *netdev_phys_attrs[] __ro_after_init = {</div><div class='add'>+	&amp;dev_attr_phys_port_id.attr,</div><div class='add'>+	&amp;dev_attr_phys_port_name.attr,</div><div class='add'>+	&amp;dev_attr_phys_switch_id.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static umode_t netdev_phys_is_visible(struct kobject *kobj,</div><div class='add'>+				      struct attribute *attr, int index)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = kobj_to_dev(kobj);</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;dev_attr_phys_port_id.attr) {</div><div class='add'>+		if (!netdev-&gt;netdev_ops-&gt;ndo_get_phys_port_id)</div><div class='add'>+			return 0;</div><div class='add'>+	} else if (attr == &amp;dev_attr_phys_port_name.attr) {</div><div class='add'>+		if (!netdev-&gt;netdev_ops-&gt;ndo_get_phys_port_name &amp;&amp;</div><div class='add'>+		    !netdev-&gt;devlink_port)</div><div class='add'>+			return 0;</div><div class='add'>+	} else if (attr == &amp;dev_attr_phys_switch_id.attr) {</div><div class='add'>+		if (!netdev-&gt;netdev_ops-&gt;ndo_get_port_parent_id &amp;&amp;</div><div class='add'>+		    !netdev-&gt;devlink_port)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return attr-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct attribute_group netdev_phys_group = {</div><div class='add'>+	.attrs = netdev_phys_attrs,</div><div class='add'>+	.is_visible = netdev_phys_is_visible,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t threaded_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+	ssize_t ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if (dev_isalive(netdev))</div><div class='add'>+		ret = sysfs_emit(buf, fmt_dec, READ_ONCE(netdev-&gt;threaded));</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int modify_napi_threaded(struct net_device *dev, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;dev-&gt;napi_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (val != 0 &amp;&amp; val != 1)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = netif_set_threaded(dev, val);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t threaded_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return netdev_lock_store(dev, attr, buf, len, modify_napi_threaded);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RW(threaded);</div><div class='add'>+</div><div class='ctx'> static struct attribute *net_class_attrs[] __ro_after_init = {</div><div class='ctx'> 	&amp;dev_attr_netdev_group.attr,</div><div class='ctx'> 	&amp;dev_attr_type.attr,</div><div class='hunk'>@@ -534,6 +786,7 @@ static struct attribute *net_class_attrs[] __ro_after_init = {</div><div class='ctx'> 	&amp;dev_attr_speed.attr,</div><div class='ctx'> 	&amp;dev_attr_duplex.attr,</div><div class='ctx'> 	&amp;dev_attr_dormant.attr,</div><div class='add'>+	&amp;dev_attr_testing.attr,</div><div class='ctx'> 	&amp;dev_attr_operstate.attr,</div><div class='ctx'> 	&amp;dev_attr_carrier_changes.attr,</div><div class='ctx'> 	&amp;dev_attr_ifalias.attr,</div><div class='hunk'>@@ -542,12 +795,11 @@ static struct attribute *net_class_attrs[] __ro_after_init = {</div><div class='ctx'> 	&amp;dev_attr_flags.attr,</div><div class='ctx'> 	&amp;dev_attr_tx_queue_len.attr,</div><div class='ctx'> 	&amp;dev_attr_gro_flush_timeout.attr,</div><div class='del'>-	&amp;dev_attr_phys_port_id.attr,</div><div class='del'>-	&amp;dev_attr_phys_port_name.attr,</div><div class='del'>-	&amp;dev_attr_phys_switch_id.attr,</div><div class='add'>+	&amp;dev_attr_napi_defer_hard_irqs.attr,</div><div class='ctx'> 	&amp;dev_attr_proto_down.attr,</div><div class='ctx'> 	&amp;dev_attr_carrier_up_count.attr,</div><div class='ctx'> 	&amp;dev_attr_carrier_down_count.attr,</div><div class='add'>+	&amp;dev_attr_threaded.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(net_class);</div><div class='hunk'>@@ -563,14 +815,14 @@ static ssize_t netstat_show(const struct device *d,</div><div class='ctx'> 	WARN_ON(offset &gt; sizeof(struct rtnl_link_stats64) ||</div><div class='ctx'> 		offset % sizeof(u64) != 0);</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;dev_base_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (dev_isalive(dev)) {</div><div class='ctx'> 		struct rtnl_link_stats64 temp;</div><div class='ctx'> 		const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &amp;temp);</div><div class='ctx'> </div><div class='del'>-		ret = sprintf(buf, fmt_u64, *(u64 *)(((u8 *)stats) + offset));</div><div class='add'>+		ret = sysfs_emit(buf, fmt_u64, *(u64 *)(((u8 *)stats) + offset));</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;dev_base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -642,7 +894,6 @@ static const struct attribute_group netstat_group = {</div><div class='ctx'> 	.attrs  = netstat_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)</div><div class='ctx'> static struct attribute *wireless_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='hunk'>@@ -651,7 +902,19 @@ static const struct attribute_group wireless_group = {</div><div class='ctx'> 	.name = "wireless",</div><div class='ctx'> 	.attrs = wireless_attrs,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static bool wireless_group_needed(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_CFG80211)</div><div class='add'>+	if (ndev-&gt;ieee80211_ptr)</div><div class='add'>+		return true;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_WIRELESS_EXT)</div><div class='add'>+	if (ndev-&gt;wireless_handlers)</div><div class='add'>+		return true;</div><div class='ctx'> #endif</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SYSFS */</div><div class='ctx'> #define net_class_groups	NULL</div><div class='hunk'>@@ -708,40 +971,25 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue, char *buf)</div><div class='ctx'> 		for (i = 0; i &lt; map-&gt;len; i++)</div><div class='ctx'> 			cpumask_set_cpu(map-&gt;cpus[i], mask);</div><div class='ctx'> </div><div class='del'>-	len = snprintf(buf, PAGE_SIZE, "%*pb\n", cpumask_pr_args(mask));</div><div class='add'>+	len = sysfs_emit(buf, "%*pb\n", cpumask_pr_args(mask));</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	free_cpumask_var(mask);</div><div class='ctx'> </div><div class='ctx'> 	return len &lt; PAGE_SIZE ? len : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_rps_map(struct netdev_rx_queue *queue,</div><div class='del'>-			     const char *buf, size_t len)</div><div class='add'>+static int netdev_rx_queue_set_rps_mask(struct netdev_rx_queue *queue,</div><div class='add'>+					cpumask_var_t mask)</div><div class='ctx'> {</div><div class='del'>-	struct rps_map *old_map, *map;</div><div class='del'>-	cpumask_var_t mask;</div><div class='del'>-	int err, cpu, i;</div><div class='ctx'> 	static DEFINE_MUTEX(rps_map_mutex);</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!alloc_cpumask_var(&amp;mask, GFP_KERNEL))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = bitmap_parse(buf, len, cpumask_bits(mask), nr_cpumask_bits);</div><div class='del'>-	if (err) {</div><div class='del'>-		free_cpumask_var(mask);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	struct rps_map *old_map, *map;</div><div class='add'>+	int cpu, i;</div><div class='ctx'> </div><div class='ctx'> 	map = kzalloc(max_t(unsigned int,</div><div class='ctx'> 			    RPS_MAP_SIZE(cpumask_weight(mask)), L1_CACHE_BYTES),</div><div class='ctx'> 		      GFP_KERNEL);</div><div class='del'>-	if (!map) {</div><div class='del'>-		free_cpumask_var(mask);</div><div class='add'>+	if (!map)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	for_each_cpu_and(cpu, mask, cpu_online_mask)</div><div class='hunk'>@@ -760,17 +1008,53 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,</div><div class='ctx'> 	rcu_assign_pointer(queue-&gt;rps_map, map);</div><div class='ctx'> </div><div class='ctx'> 	if (map)</div><div class='del'>-		static_key_slow_inc(&amp;rps_needed);</div><div class='add'>+		static_branch_inc(&amp;rps_needed);</div><div class='ctx'> 	if (old_map)</div><div class='del'>-		static_key_slow_dec(&amp;rps_needed);</div><div class='add'>+		static_branch_dec(&amp;rps_needed);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;rps_map_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (old_map)</div><div class='ctx'> 		kfree_rcu(old_map, rcu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rps_cpumask_housekeeping(struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	if (!cpumask_empty(mask)) {</div><div class='add'>+		cpumask_and(mask, mask, housekeeping_cpumask(HK_TYPE_DOMAIN));</div><div class='add'>+		cpumask_and(mask, mask, housekeeping_cpumask(HK_TYPE_WQ));</div><div class='add'>+		if (cpumask_empty(mask))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static ssize_t store_rps_map(struct netdev_rx_queue *queue,</div><div class='add'>+			     const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	cpumask_var_t mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (!alloc_cpumask_var(&amp;mask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = bitmap_parse(buf, len, cpumask_bits(mask), nr_cpumask_bits);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = rps_cpumask_housekeeping(mask);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = netdev_rx_queue_set_rps_mask(queue, mask);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	free_cpumask_var(mask);</div><div class='del'>-	return len;</div><div class='add'>+	return err ? : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,</div><div class='hunk'>@@ -782,10 +1066,10 @@ static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	flow_table = rcu_dereference(queue-&gt;rps_flow_table);</div><div class='ctx'> 	if (flow_table)</div><div class='del'>-		val = (unsigned long)flow_table-&gt;mask + 1;</div><div class='add'>+		val = 1UL &lt;&lt; flow_table-&gt;log;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%lu\n", val);</div><div class='add'>+	return sysfs_emit(buf, "%lu\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rps_dev_flow_table_release(struct rcu_head *rcu)</div><div class='hunk'>@@ -835,9 +1119,11 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,</div><div class='ctx'> 		if (!table)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		table-&gt;mask = mask;</div><div class='del'>-		for (count = 0; count &lt;= mask; count++)</div><div class='add'>+		table-&gt;log = ilog2(mask) + 1;</div><div class='add'>+		for (count = 0; count &lt;= mask; count++) {</div><div class='ctx'> 			table-&gt;flows[count].cpu = RPS_NO_CPU;</div><div class='add'>+			table-&gt;flows[count].filter = RPS_NO_FILTER;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		table = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -869,6 +1155,7 @@ static struct attribute *rx_queue_default_attrs[] __ro_after_init = {</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(rx_queue_default);</div><div class='ctx'> </div><div class='ctx'> static void rx_queue_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='hunk'>@@ -891,22 +1178,22 @@ static void rx_queue_release(struct kobject *kobj)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	memset(kobj, 0, sizeof(*kobj));</div><div class='del'>-	dev_put(queue-&gt;dev);</div><div class='add'>+	netdev_put(queue-&gt;dev, &amp;queue-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const void *rx_queue_namespace(struct kobject *kobj)</div><div class='add'>+static const void *rx_queue_namespace(const struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_rx_queue *queue = to_rx_queue(kobj);</div><div class='ctx'> 	struct device *dev = &amp;queue-&gt;dev-&gt;dev;</div><div class='ctx'> 	const void *ns = NULL;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;ns_type)</div><div class='add'>+	if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;namespace)</div><div class='ctx'> 		ns = dev-&gt;class-&gt;namespace(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rx_queue_get_ownership(struct kobject *kobj,</div><div class='add'>+static void rx_queue_get_ownership(const struct kobject *kobj,</div><div class='ctx'> 				   kuid_t *uid, kgid_t *gid)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net *net = rx_queue_namespace(kobj);</div><div class='hunk'>@@ -914,36 +1201,107 @@ static void rx_queue_get_ownership(struct kobject *kobj,</div><div class='ctx'> 	net_ns_get_ownership(net, uid, gid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type rx_queue_ktype __ro_after_init = {</div><div class='add'>+static const struct kobj_type rx_queue_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;rx_queue_sysfs_ops,</div><div class='ctx'> 	.release = rx_queue_release,</div><div class='del'>-	.default_attrs = rx_queue_default_attrs,</div><div class='ctx'> 	.namespace = rx_queue_namespace,</div><div class='ctx'> 	.get_ownership = rx_queue_get_ownership,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int rx_queue_default_mask(struct net_device *dev,</div><div class='add'>+				 struct netdev_rx_queue *queue)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_RPS) &amp;&amp; IS_ENABLED(CONFIG_SYSCTL)</div><div class='add'>+	struct cpumask *rps_default_mask;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rps_default_mask_mutex);</div><div class='add'>+</div><div class='add'>+	rps_default_mask = dev_net(dev)-&gt;core.rps_default_mask;</div><div class='add'>+	if (rps_default_mask &amp;&amp; !cpumask_empty(rps_default_mask))</div><div class='add'>+		res = netdev_rx_queue_set_rps_mask(queue, rps_default_mask);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rps_default_mask_mutex);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rx_queue_add_kobject(struct net_device *dev, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_rx_queue *queue = dev-&gt;_rx + index;</div><div class='ctx'> 	struct kobject *kobj = &amp;queue-&gt;kobj;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	/* Rx queues are cleared in rx_queue_release to allow later</div><div class='add'>+	 * re-registration. This is triggered when their kobj refcount is</div><div class='add'>+	 * dropped.</div><div class='add'>+	 *</div><div class='add'>+	 * If a queue is removed while both a read (or write) operation and a</div><div class='add'>+	 * the re-addition of the same queue are pending (waiting on rntl_lock)</div><div class='add'>+	 * it might happen that the re-addition will execute before the read,</div><div class='add'>+	 * making the initial removal to never happen (queue's kobj refcount</div><div class='add'>+	 * won't drop enough because of the pending read). In such rare case,</div><div class='add'>+	 * return to allow the removal operation to complete.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(kobj-&gt;state_initialized)) {</div><div class='add'>+		netdev_warn_once(dev, "Cannot re-add rx queues before their removal completed");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Kobject_put later will trigger rx_queue_release call which</div><div class='add'>+	 * decreases dev refcount: Take that reference here</div><div class='add'>+	 */</div><div class='add'>+	netdev_hold(queue-&gt;dev, &amp;queue-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+</div><div class='ctx'> 	kobj-&gt;kset = dev-&gt;queues_kset;</div><div class='ctx'> 	error = kobject_init_and_add(kobj, &amp;rx_queue_ktype, NULL,</div><div class='ctx'> 				     "rx-%u", index);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return error;</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	queue-&gt;groups = rx_queue_default_groups;</div><div class='add'>+	error = sysfs_create_groups(kobj, queue-&gt;groups);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;sysfs_rx_queue_group) {</div><div class='ctx'> 		error = sysfs_create_group(kobj, dev-&gt;sysfs_rx_queue_group);</div><div class='del'>-		if (error) {</div><div class='del'>-			kobject_put(kobj);</div><div class='del'>-			return error;</div><div class='del'>-		}</div><div class='add'>+		if (error)</div><div class='add'>+			goto err_default_groups;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	error = rx_queue_default_mask(dev, queue);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_default_groups;</div><div class='add'>+</div><div class='ctx'> 	kobject_uevent(kobj, KOBJ_ADD);</div><div class='del'>-	dev_hold(queue-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+err_default_groups:</div><div class='add'>+	sysfs_remove_groups(kobj, queue-&gt;groups);</div><div class='add'>+err:</div><div class='add'>+	kobject_put(kobj);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rx_queue_change_owner(struct net_device *dev, int index, kuid_t kuid,</div><div class='add'>+				 kgid_t kgid)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *queue = dev-&gt;_rx + index;</div><div class='add'>+	struct kobject *kobj = &amp;queue-&gt;kobj;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = sysfs_change_owner(kobj, kuid, kgid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;sysfs_rx_queue_group)</div><div class='add'>+		error = sysfs_group_change_owner(</div><div class='add'>+			kobj, dev-&gt;sysfs_rx_queue_group, kuid, kgid);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -969,12 +1327,14 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (--i &gt;= new_num) {</div><div class='del'>-		struct kobject *kobj = &amp;dev-&gt;_rx[i].kobj;</div><div class='add'>+		struct netdev_rx_queue *queue = &amp;dev-&gt;_rx[i];</div><div class='add'>+		struct kobject *kobj = &amp;queue-&gt;kobj;</div><div class='ctx'> </div><div class='del'>-		if (!refcount_read(&amp;dev_net(dev)-&gt;count))</div><div class='add'>+		if (!check_net(dev_net(dev)))</div><div class='ctx'> 			kobj-&gt;uevent_suppress = 1;</div><div class='ctx'> 		if (dev-&gt;sysfs_rx_queue_group)</div><div class='ctx'> 			sysfs_remove_group(kobj, dev-&gt;sysfs_rx_queue_group);</div><div class='add'>+		sysfs_remove_groups(kobj, queue-&gt;groups);</div><div class='ctx'> 		kobject_put(kobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -984,15 +1344,40 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int net_rx_queue_change_owner(struct net_device *dev, int num,</div><div class='add'>+				     kuid_t kuid, kgid_t kgid)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	int error = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_RPS</div><div class='add'>+	if (!dev-&gt;sysfs_rx_queue_group)</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		error = rx_queue_change_owner(dev, i, kuid, kgid);</div><div class='add'>+		if (error)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> /*</div><div class='ctx'>  * netdev_queue sysfs structures and functions.</div><div class='ctx'>  */</div><div class='ctx'> struct netdev_queue_attribute {</div><div class='ctx'> 	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct netdev_queue *queue, char *buf);</div><div class='del'>-	ssize_t (*store)(struct netdev_queue *queue,</div><div class='del'>-			 const char *buf, size_t len);</div><div class='add'>+	ssize_t (*show)(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			struct netdev_queue *queue, char *buf);</div><div class='add'>+	ssize_t (*store)(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			 struct netdev_queue *queue, const char *buf,</div><div class='add'>+			 size_t len);</div><div class='ctx'> };</div><div class='ctx'> #define to_netdev_queue_attr(_attr) \</div><div class='ctx'> 	container_of(_attr, struct netdev_queue_attribute, attr)</div><div class='hunk'>@@ -1009,7 +1394,7 @@ static ssize_t netdev_queue_attr_show(struct kobject *kobj,</div><div class='ctx'> 	if (!attribute-&gt;show)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	return attribute-&gt;show(queue, buf);</div><div class='add'>+	return attribute-&gt;show(kobj, attr, queue, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t netdev_queue_attr_store(struct kobject *kobj,</div><div class='hunk'>@@ -1023,7 +1408,7 @@ static ssize_t netdev_queue_attr_store(struct kobject *kobj,</div><div class='ctx'> 	if (!attribute-&gt;store)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	return attribute-&gt;store(queue, buf, count);</div><div class='add'>+	return attribute-&gt;store(kobj, attr, queue, buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct sysfs_ops netdev_queue_sysfs_ops = {</div><div class='hunk'>@@ -1031,15 +1416,12 @@ static const struct sysfs_ops netdev_queue_sysfs_ops = {</div><div class='ctx'> 	.store = netdev_queue_attr_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t tx_timeout_show(struct netdev_queue *queue, char *buf)</div><div class='add'>+static ssize_t tx_timeout_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			       struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='del'>-	unsigned long trans_timeout;</div><div class='add'>+	unsigned long trans_timeout = atomic_long_read(&amp;queue-&gt;trans_timeout);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;queue-&gt;_xmit_lock);</div><div class='del'>-	trans_timeout = queue-&gt;trans_timeout;</div><div class='del'>-	spin_unlock_irq(&amp;queue-&gt;_xmit_lock);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%lu", trans_timeout);</div><div class='add'>+	return sysfs_emit(buf, fmt_ulong, trans_timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int get_netdev_queue_index(struct netdev_queue *queue)</div><div class='hunk'>@@ -1053,22 +1435,29 @@ static unsigned int get_netdev_queue_index(struct netdev_queue *queue)</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t traffic_class_show(struct netdev_queue *queue,</div><div class='del'>-				  char *buf)</div><div class='add'>+static ssize_t traffic_class_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = queue-&gt;dev;</div><div class='del'>-	int index;</div><div class='del'>-	int tc;</div><div class='add'>+	int num_tc, tc, index, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_is_multiqueue(dev))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='add'>+	ret = sysfs_rtnl_lock(kobj, attr, queue-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	index = get_netdev_queue_index(queue);</div><div class='ctx'> </div><div class='ctx'> 	/* If queue belongs to subordinate dev use its TC mapping */</div><div class='ctx'> 	dev = netdev_get_tx_queue(dev, index)-&gt;sb_dev ? : dev;</div><div class='ctx'> </div><div class='add'>+	num_tc = dev-&gt;num_tc;</div><div class='ctx'> 	tc = netdev_txq_to_tc(dev, index);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (tc &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1079,43 +1468,55 @@ static ssize_t traffic_class_show(struct netdev_queue *queue,</div><div class='ctx'> 	 * belongs to the root device it will be reported with just the</div><div class='ctx'> 	 * traffic class, so just "0" for TC 0 for example.</div><div class='ctx'> 	 */</div><div class='del'>-	return dev-&gt;num_tc &lt; 0 ? sprintf(buf, "%u%d\n", tc, dev-&gt;num_tc) :</div><div class='del'>-				 sprintf(buf, "%u\n", tc);</div><div class='add'>+	return num_tc &lt; 0 ? sysfs_emit(buf, "%d%d\n", tc, num_tc) :</div><div class='add'>+			    sysfs_emit(buf, "%d\n", tc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XPS</div><div class='del'>-static ssize_t tx_maxrate_show(struct netdev_queue *queue,</div><div class='del'>-			       char *buf)</div><div class='add'>+static ssize_t tx_maxrate_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			       struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%lu\n", queue-&gt;tx_maxrate);</div><div class='add'>+	return sysfs_emit(buf, "%lu\n", queue-&gt;tx_maxrate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t tx_maxrate_store(struct netdev_queue *queue,</div><div class='del'>-				const char *buf, size_t len)</div><div class='add'>+static ssize_t tx_maxrate_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				struct netdev_queue *queue, const char *buf,</div><div class='add'>+				size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = queue-&gt;dev;</div><div class='ctx'> 	int err, index = get_netdev_queue_index(queue);</div><div class='add'>+	struct net_device *dev = queue-&gt;dev;</div><div class='ctx'> 	u32 rate = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	/* The check is also done later; this helps returning early without</div><div class='add'>+	 * hitting the locking section below.</div><div class='add'>+	 */</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_set_tx_maxrate)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	err = kstrtou32(buf, 10, &amp;rate);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	err = sysfs_rtnl_lock(kobj, attr, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = -EOPNOTSUPP;</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	if (dev-&gt;netdev_ops-&gt;ndo_set_tx_maxrate)</div><div class='ctx'> 		err = dev-&gt;netdev_ops-&gt;ndo_set_tx_maxrate(dev, index, rate);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		queue-&gt;tx_maxrate = rate;</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 		return len;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1135,7 +1536,7 @@ static struct netdev_queue_attribute queue_traffic_class __ro_after_init</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t bql_show(char *buf, unsigned int value)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%u\n", value);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t bql_set(const char *buf, const size_t count,</div><div class='hunk'>@@ -1159,16 +1560,17 @@ static ssize_t bql_set(const char *buf, const size_t count,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t bql_show_hold_time(struct netdev_queue *queue,</div><div class='del'>-				  char *buf)</div><div class='add'>+static ssize_t bql_show_hold_time(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dql *dql = &amp;queue-&gt;dql;</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", jiffies_to_msecs(dql-&gt;slack_hold_time));</div><div class='add'>+	return sysfs_emit(buf, "%u\n", jiffies_to_msecs(dql-&gt;slack_hold_time));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t bql_set_hold_time(struct netdev_queue *queue,</div><div class='del'>-				 const char *buf, size_t len)</div><div class='add'>+static ssize_t bql_set_hold_time(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				 struct netdev_queue *queue, const char *buf,</div><div class='add'>+				 size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct dql *dql = &amp;queue-&gt;dql;</div><div class='ctx'> 	unsigned int value;</div><div class='hunk'>@@ -1187,25 +1589,92 @@ static struct netdev_queue_attribute bql_hold_time_attribute __ro_after_init</div><div class='ctx'> 	= __ATTR(hold_time, 0644,</div><div class='ctx'> 		 bql_show_hold_time, bql_set_hold_time);</div><div class='ctx'> </div><div class='del'>-static ssize_t bql_show_inflight(struct netdev_queue *queue,</div><div class='del'>-				 char *buf)</div><div class='add'>+static ssize_t bql_show_stall_thrs(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				   struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dql *dql = &amp;queue-&gt;dql;</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", dql-&gt;num_queued - dql-&gt;num_completed);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", jiffies_to_msecs(dql-&gt;stall_thrs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t bql_set_stall_thrs(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  struct netdev_queue *queue, const char *buf,</div><div class='add'>+				  size_t len)</div><div class='add'>+{</div><div class='add'>+	struct dql *dql = &amp;queue-&gt;dql;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	value = msecs_to_jiffies(value);</div><div class='add'>+	if (value &amp;&amp; (value &lt; 4 || value &gt; 4 / 2 * BITS_PER_LONG))</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (!dql-&gt;stall_thrs &amp;&amp; value)</div><div class='add'>+		dql-&gt;last_reap = jiffies;</div><div class='add'>+	/* Force last_reap to be live */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	dql-&gt;stall_thrs = value;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_queue_attribute bql_stall_thrs_attribute __ro_after_init =</div><div class='add'>+	__ATTR(stall_thrs, 0644, bql_show_stall_thrs, bql_set_stall_thrs);</div><div class='add'>+</div><div class='add'>+static ssize_t bql_show_stall_max(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  struct netdev_queue *queue, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sysfs_emit(buf, "%u\n", READ_ONCE(queue-&gt;dql.stall_max));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t bql_set_stall_max(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				 struct netdev_queue *queue, const char *buf,</div><div class='add'>+				 size_t len)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(queue-&gt;dql.stall_max, 0);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_queue_attribute bql_stall_max_attribute __ro_after_init =</div><div class='add'>+	__ATTR(stall_max, 0644, bql_show_stall_max, bql_set_stall_max);</div><div class='add'>+</div><div class='add'>+static ssize_t bql_show_stall_cnt(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  struct netdev_queue *queue, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dql *dql = &amp;queue-&gt;dql;</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%lu\n", dql-&gt;stall_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct netdev_queue_attribute bql_stall_cnt_attribute __ro_after_init =</div><div class='add'>+	__ATTR(stall_cnt, 0444, bql_show_stall_cnt, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t bql_show_inflight(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				 struct netdev_queue *queue, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dql *dql = &amp;queue-&gt;dql;</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", dql-&gt;num_queued - dql-&gt;num_completed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct netdev_queue_attribute bql_inflight_attribute __ro_after_init =</div><div class='ctx'> 	__ATTR(inflight, 0444, bql_show_inflight, NULL);</div><div class='ctx'> </div><div class='ctx'> #define BQL_ATTR(NAME, FIELD)						\</div><div class='del'>-static ssize_t bql_show_ ## NAME(struct netdev_queue *queue,		\</div><div class='del'>-				 char *buf)				\</div><div class='add'>+static ssize_t bql_show_ ## NAME(struct kobject *kobj,			\</div><div class='add'>+				 struct attribute *attr,		\</div><div class='add'>+				 struct netdev_queue *queue, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	return bql_show(buf, queue-&gt;dql.FIELD);				\</div><div class='ctx'> }									\</div><div class='ctx'> 									\</div><div class='del'>-static ssize_t bql_set_ ## NAME(struct netdev_queue *queue,		\</div><div class='add'>+static ssize_t bql_set_ ## NAME(struct kobject *kobj,			\</div><div class='add'>+				struct attribute *attr,			\</div><div class='add'>+				struct netdev_queue *queue,		\</div><div class='ctx'> 				const char *buf, size_t len)		\</div><div class='ctx'> {									\</div><div class='ctx'> 	return bql_set(buf, len, &amp;queue-&gt;dql.FIELD);			\</div><div class='hunk'>@@ -1225,6 +1694,9 @@ static struct attribute *dql_attrs[] __ro_after_init = {</div><div class='ctx'> 	&amp;bql_limit_min_attribute.attr,</div><div class='ctx'> 	&amp;bql_hold_time_attribute.attr,</div><div class='ctx'> 	&amp;bql_inflight_attribute.attr,</div><div class='add'>+	&amp;bql_stall_thrs_attribute.attr,</div><div class='add'>+	&amp;bql_stall_cnt_attribute.attr,</div><div class='add'>+	&amp;bql_stall_max_attribute.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1232,71 +1704,105 @@ static const struct attribute_group dql_group = {</div><div class='ctx'> 	.name  = "byte_queue_limits",</div><div class='ctx'> 	.attrs  = dql_attrs,</div><div class='ctx'> };</div><div class='add'>+#else</div><div class='add'>+/* Fake declaration, all the code using it should be dead */</div><div class='add'>+static const struct attribute_group dql_group = {};</div><div class='ctx'> #endif /* CONFIG_BQL */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XPS</div><div class='del'>-static ssize_t xps_cpus_show(struct netdev_queue *queue,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t xps_queue_show(struct net_device *dev, unsigned int index,</div><div class='add'>+			      int tc, char *buf, enum xps_map_type type)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = queue-&gt;dev;</div><div class='del'>-	int cpu, len, num_tc = 1, tc = 0;</div><div class='ctx'> 	struct xps_dev_maps *dev_maps;</div><div class='del'>-	cpumask_var_t mask;</div><div class='del'>-	unsigned long index;</div><div class='add'>+	unsigned long *mask;</div><div class='add'>+	unsigned int nr_ids;</div><div class='add'>+	int j, len;</div><div class='ctx'> </div><div class='del'>-	if (!netif_is_multiqueue(dev))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev_maps = rcu_dereference(dev-&gt;xps_maps[type]);</div><div class='ctx'> </div><div class='del'>-	index = get_netdev_queue_index(queue);</div><div class='add'>+	/* Default to nr_cpu_ids/dev-&gt;num_rx_queues and do not just return 0</div><div class='add'>+	 * when dev_maps hasn't been allocated yet, to be backward compatible.</div><div class='add'>+	 */</div><div class='add'>+	nr_ids = dev_maps ? dev_maps-&gt;nr_ids :</div><div class='add'>+		 (type == XPS_CPUS ? nr_cpu_ids : dev-&gt;num_rx_queues);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;num_tc) {</div><div class='del'>-		/* Do not allow XPS on subordinate device directly */</div><div class='del'>-		num_tc = dev-&gt;num_tc;</div><div class='del'>-		if (num_tc &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	mask = bitmap_zalloc(nr_ids, GFP_NOWAIT);</div><div class='add'>+	if (!mask) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* If queue belongs to subordinate dev use its map */</div><div class='del'>-		dev = netdev_get_tx_queue(dev, index)-&gt;sb_dev ? : dev;</div><div class='add'>+	if (!dev_maps || tc &gt;= dev_maps-&gt;num_tc)</div><div class='add'>+		goto out_no_maps;</div><div class='ctx'> </div><div class='del'>-		tc = netdev_txq_to_tc(dev, index);</div><div class='del'>-		if (tc &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	for (j = 0; j &lt; nr_ids; j++) {</div><div class='add'>+		int i, tci = j * dev_maps-&gt;num_tc + tc;</div><div class='add'>+		struct xps_map *map;</div><div class='ctx'> </div><div class='del'>-	if (!zalloc_cpumask_var(&amp;mask, GFP_KERNEL))</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		map = rcu_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='add'>+		if (!map)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dev_maps = rcu_dereference(dev-&gt;xps_cpus_map);</div><div class='del'>-	if (dev_maps) {</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			int i, tci = cpu * num_tc + tc;</div><div class='del'>-			struct xps_map *map;</div><div class='del'>-</div><div class='del'>-			map = rcu_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-			if (!map)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			for (i = map-&gt;len; i--;) {</div><div class='del'>-				if (map-&gt;queues[i] == index) {</div><div class='del'>-					cpumask_set_cpu(cpu, mask);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+		for (i = map-&gt;len; i--;) {</div><div class='add'>+			if (map-&gt;queues[i] == index) {</div><div class='add'>+				__set_bit(j, mask);</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+out_no_maps:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	len = snprintf(buf, PAGE_SIZE, "%*pb\n", cpumask_pr_args(mask));</div><div class='del'>-	free_cpumask_var(mask);</div><div class='add'>+	len = bitmap_print_to_pagebuf(false, buf, mask, nr_ids);</div><div class='add'>+	bitmap_free(mask);</div><div class='add'>+</div><div class='ctx'> 	return len &lt; PAGE_SIZE ? len : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t xps_cpus_store(struct netdev_queue *queue,</div><div class='del'>-			      const char *buf, size_t len)</div><div class='add'>+static ssize_t xps_cpus_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			     struct netdev_queue *queue, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = queue-&gt;dev;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int len, tc, ret;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_multiqueue(dev))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	index = get_netdev_queue_index(queue);</div><div class='add'>+</div><div class='add'>+	ret = sysfs_rtnl_lock(kobj, attr, queue-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If queue belongs to subordinate dev use its map */</div><div class='add'>+	dev = netdev_get_tx_queue(dev, index)-&gt;sb_dev ? : dev;</div><div class='add'>+</div><div class='add'>+	tc = netdev_txq_to_tc(dev, index);</div><div class='add'>+	if (tc &lt; 0) {</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Increase the net device refcnt to make sure it won't be freed while</div><div class='add'>+	 * xps_queue_show is running.</div><div class='add'>+	 */</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	len = xps_queue_show(dev, index, tc, buf, XPS_CPUS);</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t xps_cpus_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			      struct netdev_queue *queue, const char *buf,</div><div class='add'>+			      size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = queue-&gt;dev;</div><div class='del'>-	unsigned long index;</div><div class='add'>+	unsigned int index;</div><div class='ctx'> 	cpumask_var_t mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1317,7 +1823,14 @@ static ssize_t xps_cpus_store(struct netdev_queue *queue,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = sysfs_rtnl_lock(kobj, attr, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_cpumask_var(mask);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = netif_set_xps_queue(dev, mask, index);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	free_cpumask_var(mask);</div><div class='ctx'> </div><div class='hunk'>@@ -1327,69 +1840,46 @@ static ssize_t xps_cpus_store(struct netdev_queue *queue,</div><div class='ctx'> static struct netdev_queue_attribute xps_cpus_attribute __ro_after_init</div><div class='ctx'> 	= __ATTR_RW(xps_cpus);</div><div class='ctx'> </div><div class='del'>-static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf)</div><div class='add'>+static ssize_t xps_rxqs_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			     struct netdev_queue *queue, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = queue-&gt;dev;</div><div class='del'>-	struct xps_dev_maps *dev_maps;</div><div class='del'>-	unsigned long *mask, index;</div><div class='del'>-	int j, len, num_tc = 1, tc = 0;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int tc, ret;</div><div class='ctx'> </div><div class='ctx'> 	index = get_netdev_queue_index(queue);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;num_tc) {</div><div class='del'>-		num_tc = dev-&gt;num_tc;</div><div class='del'>-		tc = netdev_txq_to_tc(dev, index);</div><div class='del'>-		if (tc &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	mask = kcalloc(BITS_TO_LONGS(dev-&gt;num_rx_queues), sizeof(long),</div><div class='del'>-		       GFP_KERNEL);</div><div class='del'>-	if (!mask)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dev_maps = rcu_dereference(dev-&gt;xps_rxqs_map);</div><div class='del'>-	if (!dev_maps)</div><div class='del'>-		goto out_no_maps;</div><div class='del'>-</div><div class='del'>-	for (j = -1; j = netif_attrmask_next(j, NULL, dev-&gt;num_rx_queues),</div><div class='del'>-	     j &lt; dev-&gt;num_rx_queues;) {</div><div class='del'>-		int i, tci = j * num_tc + tc;</div><div class='del'>-		struct xps_map *map;</div><div class='del'>-</div><div class='del'>-		map = rcu_dereference(dev_maps-&gt;attr_map[tci]);</div><div class='del'>-		if (!map)</div><div class='del'>-			continue;</div><div class='add'>+	ret = sysfs_rtnl_lock(kobj, attr, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		for (i = map-&gt;len; i--;) {</div><div class='del'>-			if (map-&gt;queues[i] == index) {</div><div class='del'>-				set_bit(j, mask);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out_no_maps:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	tc = netdev_txq_to_tc(dev, index);</div><div class='ctx'> </div><div class='del'>-	len = bitmap_print_to_pagebuf(false, buf, mask, dev-&gt;num_rx_queues);</div><div class='del'>-	kfree(mask);</div><div class='add'>+	/* Increase the net device refcnt to make sure it won't be freed while</div><div class='add'>+	 * xps_queue_show is running.</div><div class='add'>+	 */</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	return len &lt; PAGE_SIZE ? len : -EINVAL;</div><div class='add'>+	ret = tc &gt;= 0 ? xps_queue_show(dev, index, tc, buf, XPS_RXQS) : -EINVAL;</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,</div><div class='add'>+static ssize_t xps_rxqs_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			      struct netdev_queue *queue, const char *buf,</div><div class='ctx'> 			      size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = queue-&gt;dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='del'>-	unsigned long *mask, index;</div><div class='add'>+	unsigned long *mask;</div><div class='add'>+	unsigned int index;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mask = kcalloc(BITS_TO_LONGS(dev-&gt;num_rx_queues), sizeof(long),</div><div class='del'>-		       GFP_KERNEL);</div><div class='add'>+	mask = bitmap_zalloc(dev-&gt;num_rx_queues, GFP_KERNEL);</div><div class='ctx'> 	if (!mask)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1397,15 +1887,23 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,</div><div class='ctx'> </div><div class='ctx'> 	err = bitmap_parse(buf, len, mask, dev-&gt;num_rx_queues);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		kfree(mask);</div><div class='add'>+		bitmap_free(mask);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = sysfs_rtnl_lock(kobj, attr, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		bitmap_free(mask);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpus_read_lock();</div><div class='del'>-	err = __netif_set_xps_queue(dev, mask, index, true);</div><div class='add'>+	err = __netif_set_xps_queue(dev, mask, index, XPS_RXQS);</div><div class='ctx'> 	cpus_read_unlock();</div><div class='ctx'> </div><div class='del'>-	kfree(mask);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	bitmap_free(mask);</div><div class='ctx'> 	return err ? : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1423,28 +1921,29 @@ static struct attribute *netdev_queue_default_attrs[] __ro_after_init = {</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(netdev_queue_default);</div><div class='ctx'> </div><div class='ctx'> static void netdev_queue_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *queue = to_netdev_queue(kobj);</div><div class='ctx'> </div><div class='ctx'> 	memset(kobj, 0, sizeof(*kobj));</div><div class='del'>-	dev_put(queue-&gt;dev);</div><div class='add'>+	netdev_put(queue-&gt;dev, &amp;queue-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const void *netdev_queue_namespace(struct kobject *kobj)</div><div class='add'>+static const void *netdev_queue_namespace(const struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *queue = to_netdev_queue(kobj);</div><div class='ctx'> 	struct device *dev = &amp;queue-&gt;dev-&gt;dev;</div><div class='ctx'> 	const void *ns = NULL;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;ns_type)</div><div class='add'>+	if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;namespace)</div><div class='ctx'> 		ns = dev-&gt;class-&gt;namespace(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netdev_queue_get_ownership(struct kobject *kobj,</div><div class='add'>+static void netdev_queue_get_ownership(const struct kobject *kobj,</div><div class='ctx'> 				       kuid_t *uid, kgid_t *gid)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net *net = netdev_queue_namespace(kobj);</div><div class='hunk'>@@ -1452,38 +1951,90 @@ static void netdev_queue_get_ownership(struct kobject *kobj,</div><div class='ctx'> 	net_ns_get_ownership(net, uid, gid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type netdev_queue_ktype __ro_after_init = {</div><div class='add'>+static const struct kobj_type netdev_queue_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;netdev_queue_sysfs_ops,</div><div class='ctx'> 	.release = netdev_queue_release,</div><div class='del'>-	.default_attrs = netdev_queue_default_attrs,</div><div class='ctx'> 	.namespace = netdev_queue_namespace,</div><div class='ctx'> 	.get_ownership = netdev_queue_get_ownership,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool netdev_uses_bql(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;lltx || (dev-&gt;priv_flags &amp; IFF_NO_QUEUE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return IS_ENABLED(CONFIG_BQL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int netdev_queue_add_kobject(struct net_device *dev, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *queue = dev-&gt;_tx + index;</div><div class='ctx'> 	struct kobject *kobj = &amp;queue-&gt;kobj;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	/* Tx queues are cleared in netdev_queue_release to allow later</div><div class='add'>+	 * re-registration. This is triggered when their kobj refcount is</div><div class='add'>+	 * dropped.</div><div class='add'>+	 *</div><div class='add'>+	 * If a queue is removed while both a read (or write) operation and a</div><div class='add'>+	 * the re-addition of the same queue are pending (waiting on rntl_lock)</div><div class='add'>+	 * it might happen that the re-addition will execute before the read,</div><div class='add'>+	 * making the initial removal to never happen (queue's kobj refcount</div><div class='add'>+	 * won't drop enough because of the pending read). In such rare case,</div><div class='add'>+	 * return to allow the removal operation to complete.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(kobj-&gt;state_initialized)) {</div><div class='add'>+		netdev_warn_once(dev, "Cannot re-add tx queues before their removal completed");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Kobject_put later will trigger netdev_queue_release call</div><div class='add'>+	 * which decreases dev refcount: Take that reference here</div><div class='add'>+	 */</div><div class='add'>+	netdev_hold(queue-&gt;dev, &amp;queue-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+</div><div class='ctx'> 	kobj-&gt;kset = dev-&gt;queues_kset;</div><div class='ctx'> 	error = kobject_init_and_add(kobj, &amp;netdev_queue_ktype, NULL,</div><div class='ctx'> 				     "tx-%u", index);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BQL</div><div class='del'>-	error = sysfs_create_group(kobj, &amp;dql_group);</div><div class='del'>-	if (error) {</div><div class='del'>-		kobject_put(kobj);</div><div class='del'>-		return error;</div><div class='add'>+	queue-&gt;groups = netdev_queue_default_groups;</div><div class='add'>+	error = sysfs_create_groups(kobj, queue-&gt;groups);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (netdev_uses_bql(dev)) {</div><div class='add'>+		error = sysfs_create_group(kobj, &amp;dql_group);</div><div class='add'>+		if (error)</div><div class='add'>+			goto err_default_groups;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(kobj, KOBJ_ADD);</div><div class='del'>-	dev_hold(queue-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_default_groups:</div><div class='add'>+	sysfs_remove_groups(kobj, queue-&gt;groups);</div><div class='add'>+err:</div><div class='add'>+	kobject_put(kobj);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tx_queue_change_owner(struct net_device *ndev, int index,</div><div class='add'>+				 kuid_t kuid, kgid_t kgid)</div><div class='add'>+{</div><div class='add'>+	struct netdev_queue *queue = ndev-&gt;_tx + index;</div><div class='add'>+	struct kobject *kobj = &amp;queue-&gt;kobj;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = sysfs_change_owner(kobj, kuid, kgid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	if (netdev_uses_bql(ndev))</div><div class='add'>+		error = sysfs_group_change_owner(kobj, &amp;dql_group, kuid, kgid);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SYSFS */</div><div class='ctx'> </div><div class='hunk'>@@ -1494,6 +2045,13 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	/* Tx queue kobjects are allowed to be updated when a device is being</div><div class='add'>+	 * unregistered, but solely to remove queues from qdiscs. Any path</div><div class='add'>+	 * adding queues should be fixed.</div><div class='add'>+	 */</div><div class='add'>+	WARN(dev-&gt;reg_state == NETREG_UNREGISTERING &amp;&amp; new_num &gt; old_num,</div><div class='add'>+	     "New queues can't be registered after device unregistration.");</div><div class='add'>+</div><div class='ctx'> 	for (i = old_num; i &lt; new_num; i++) {</div><div class='ctx'> 		error = netdev_queue_add_kobject(dev, i);</div><div class='ctx'> 		if (error) {</div><div class='hunk'>@@ -1505,11 +2063,13 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)</div><div class='ctx'> 	while (--i &gt;= new_num) {</div><div class='ctx'> 		struct netdev_queue *queue = dev-&gt;_tx + i;</div><div class='ctx'> </div><div class='del'>-		if (!refcount_read(&amp;dev_net(dev)-&gt;count))</div><div class='add'>+		if (!check_net(dev_net(dev)))</div><div class='ctx'> 			queue-&gt;kobj.uevent_suppress = 1;</div><div class='del'>-#ifdef CONFIG_BQL</div><div class='del'>-		sysfs_remove_group(&amp;queue-&gt;kobj, &amp;dql_group);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+		if (netdev_uses_bql(dev))</div><div class='add'>+			sysfs_remove_group(&amp;queue-&gt;kobj, &amp;dql_group);</div><div class='add'>+</div><div class='add'>+		sysfs_remove_groups(&amp;queue-&gt;kobj, queue-&gt;groups);</div><div class='ctx'> 		kobject_put(&amp;queue-&gt;kobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1519,6 +2079,25 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)</div><div class='ctx'> #endif /* CONFIG_SYSFS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int net_tx_queue_change_owner(struct net_device *dev, int num,</div><div class='add'>+				     kuid_t kuid, kgid_t kgid)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	int error = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		error = tx_queue_change_owner(dev, i, kuid, kgid);</div><div class='add'>+		if (error)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif /* CONFIG_SYSFS */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int register_queue_kobjects(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int error = 0, txq = 0, rxq = 0, real_rx = 0, real_tx = 0;</div><div class='hunk'>@@ -1547,9 +2126,37 @@ static int register_queue_kobjects(struct net_device *dev)</div><div class='ctx'> error:</div><div class='ctx'> 	netdev_queue_update_kobjects(dev, txq, 0);</div><div class='ctx'> 	net_rx_queue_update_kobjects(dev, rxq, 0);</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	kset_unregister(dev-&gt;queues_kset);</div><div class='add'>+#endif</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int queue_change_owner(struct net_device *ndev, kuid_t kuid, kgid_t kgid)</div><div class='add'>+{</div><div class='add'>+	int error = 0, real_rx = 0, real_tx = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	if (ndev-&gt;queues_kset) {</div><div class='add'>+		error = sysfs_change_owner(&amp;ndev-&gt;queues_kset-&gt;kobj, kuid, kgid);</div><div class='add'>+		if (error)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='add'>+	real_rx = ndev-&gt;real_num_rx_queues;</div><div class='add'>+#endif</div><div class='add'>+	real_tx = ndev-&gt;real_num_tx_queues;</div><div class='add'>+</div><div class='add'>+	error = net_rx_queue_change_owner(ndev, real_rx, kuid, kgid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = net_tx_queue_change_owner(ndev, real_tx, kuid, kgid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void remove_queue_kobjects(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int real_rx = 0, real_tx = 0;</div><div class='hunk'>@@ -1561,6 +2168,11 @@ static void remove_queue_kobjects(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	net_rx_queue_update_kobjects(dev, real_rx, 0);</div><div class='ctx'> 	netdev_queue_update_kobjects(dev, real_tx, 0);</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	dev-&gt;real_num_rx_queues = 0;</div><div class='add'>+	dev-&gt;real_num_tx_queues = 0;</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> 	kset_unregister(dev-&gt;queues_kset);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1603,9 +2215,9 @@ const struct kobj_ns_type_operations net_ns_type_operations = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(net_ns_type_operations);</div><div class='ctx'> </div><div class='del'>-static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)</div><div class='add'>+static int netdev_uevent(const struct device *d, struct kobj_uevent_env *env)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = to_net_dev(d);</div><div class='add'>+	const struct net_device *dev = to_net_dev(d);</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* pass interface to uevent. */</div><div class='hunk'>@@ -1637,25 +2249,25 @@ static void netdev_release(struct device *d)</div><div class='ctx'> 	 * device is dead and about to be freed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	kfree(rcu_access_pointer(dev-&gt;ifalias));</div><div class='del'>-	netdev_freemem(dev);</div><div class='add'>+	kvfree(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const void *net_namespace(struct device *d)</div><div class='add'>+static const void *net_namespace(const struct device *d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = to_net_dev(d);</div><div class='add'>+	const struct net_device *dev = to_net_dev(d);</div><div class='ctx'> </div><div class='ctx'> 	return dev_net(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void net_get_ownership(struct device *d, kuid_t *uid, kgid_t *gid)</div><div class='add'>+static void net_get_ownership(const struct device *d, kuid_t *uid, kgid_t *gid)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = to_net_dev(d);</div><div class='add'>+	const struct net_device *dev = to_net_dev(d);</div><div class='ctx'> 	const struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='ctx'> 	net_ns_get_ownership(net, uid, gid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct class net_class __ro_after_init = {</div><div class='add'>+static const struct class net_class = {</div><div class='ctx'> 	.name = "net",</div><div class='ctx'> 	.dev_release = netdev_release,</div><div class='ctx'> 	.dev_groups = net_class_groups,</div><div class='hunk'>@@ -1665,15 +2277,15 @@ static struct class net_class __ro_after_init = {</div><div class='ctx'> 	.get_ownership = net_get_ownership,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF_NET</div><div class='add'>+#ifdef CONFIG_OF</div><div class='ctx'> static int of_dev_node_match(struct device *dev, const void *data)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;parent)</div><div class='del'>-		ret = dev-&gt;parent-&gt;of_node == data;</div><div class='add'>+	for (; dev; dev = dev-&gt;parent) {</div><div class='add'>+		if (dev-&gt;of_node == data)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret == 0 ? dev-&gt;of_node == data : ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1705,7 +2317,7 @@ void netdev_unregister_kobject(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;ndev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (!refcount_read(&amp;dev_net(ndev)-&gt;count))</div><div class='add'>+	if (!check_net(dev_net(ndev)))</div><div class='ctx'> 		dev_set_uevent_suppress(dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	kobject_get(&amp;dev-&gt;kobj);</div><div class='hunk'>@@ -1737,15 +2349,10 @@ int netdev_register_kobject(struct net_device *ndev)</div><div class='ctx'> 		groups++;</div><div class='ctx'> </div><div class='ctx'> 	*groups++ = &amp;netstat_group;</div><div class='add'>+	*groups++ = &amp;netdev_phys_group;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)</div><div class='del'>-	if (ndev-&gt;ieee80211_ptr)</div><div class='del'>-		*groups++ = &amp;wireless_group;</div><div class='del'>-#if IS_ENABLED(CONFIG_WIRELESS_EXT)</div><div class='del'>-	else if (ndev-&gt;wireless_handlers)</div><div class='add'>+	if (wireless_group_needed(ndev))</div><div class='ctx'> 		*groups++ = &amp;wireless_group;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='ctx'> #endif /* CONFIG_SYSFS */</div><div class='ctx'> </div><div class='ctx'> 	error = device_add(dev);</div><div class='hunk'>@@ -1763,6 +2370,37 @@ int netdev_register_kobject(struct net_device *ndev)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Change owner for sysfs entries when moving network devices across network</div><div class='add'>+ * namespaces owned by different user namespaces.</div><div class='add'>+ */</div><div class='add'>+int netdev_change_owner(struct net_device *ndev, const struct net *net_old,</div><div class='add'>+			const struct net *net_new)</div><div class='add'>+{</div><div class='add'>+	kuid_t old_uid = GLOBAL_ROOT_UID, new_uid = GLOBAL_ROOT_UID;</div><div class='add'>+	kgid_t old_gid = GLOBAL_ROOT_GID, new_gid = GLOBAL_ROOT_GID;</div><div class='add'>+	struct device *dev = &amp;ndev-&gt;dev;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	net_ns_get_ownership(net_old, &amp;old_uid, &amp;old_gid);</div><div class='add'>+	net_ns_get_ownership(net_new, &amp;new_uid, &amp;new_gid);</div><div class='add'>+</div><div class='add'>+	/* The network namespace was changed but the owning user namespace is</div><div class='add'>+	 * identical so there's no need to change the owner of sysfs entries.</div><div class='add'>+	 */</div><div class='add'>+	if (uid_eq(old_uid, new_uid) &amp;&amp; gid_eq(old_gid, new_gid))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	error = device_change_owner(dev, new_uid, new_gid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = queue_change_owner(ndev, new_uid, new_gid);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int netdev_class_create_file_ns(const struct class_attribute *class_attr,</div><div class='ctx'> 				const void *ns)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h<br/>index 006876c7b78d..e938f25e8e86 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/net-sysfs.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-sysfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net-sysfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net-sysfs.h</a></div><div class='hunk'>@@ -8,5 +8,9 @@ void netdev_unregister_kobject(struct net_device *);</div><div class='ctx'> int net_rx_queue_update_kobjects(struct net_device *, int old_num, int new_num);</div><div class='ctx'> int netdev_queue_update_kobjects(struct net_device *net,</div><div class='ctx'> 				 int old_num, int new_num);</div><div class='add'>+int netdev_change_owner(struct net_device *, const struct net *net_old,</div><div class='add'>+			const struct net *net_new);</div><div class='add'>+</div><div class='add'>+extern struct mutex rps_default_mask_mutex;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/core/net-traces.c b/net/core/net-traces.c<br/>index 419af6dfe29f..f2fa34b1d78d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/net-traces.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net-traces.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net-traces.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net-traces.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/net_dropmon.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='hunk'>@@ -41,10 +41,28 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_add);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_external_learn_add);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(fdb_delete);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_update);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(br_mdb_full);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_PAGE_POOL)</div><div class='add'>+#include &lt;trace/events/page_pool.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/neigh.h&gt;</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_update);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_update_done);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_timer_handler);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_event_send_done);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_event_send_dead);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_cleanup_and_release);</div><div class='add'>+</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);</div><div class='ctx'> </div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);</div><div class='ctx'> </div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_send_reset);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_bad_csum);</div><div class='add'>+</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(udp_fail_queue_rcv_skb);</div><div class='add'>+</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(sk_data_ready);</div><div class='head'>diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c<br/>index 670c84b1bfc2..a6e6a964a287 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/net_namespace.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/net_namespace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net_namespace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net_namespace.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -18,7 +19,10 @@</div><div class='ctx'> #include &lt;linux/net_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/uidgid.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/nstree.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='hunk'>@@ -38,10 +42,11 @@ EXPORT_SYMBOL_GPL(net_namespace_list);</div><div class='ctx'> DECLARE_RWSEM(net_rwsem);</div><div class='ctx'> EXPORT_SYMBOL_GPL(net_rwsem);</div><div class='ctx'> </div><div class='del'>-struct net init_net = {</div><div class='del'>-	.count		= REFCOUNT_INIT(1),</div><div class='del'>-	.dev_base_head	= LIST_HEAD_INIT(init_net.dev_base_head),</div><div class='del'>-};</div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+static struct key_tag init_net_key_domain = { .usage = REFCOUNT_INIT(1) };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct net init_net;</div><div class='ctx'> EXPORT_SYMBOL(init_net);</div><div class='ctx'> </div><div class='ctx'> static bool init_net_initialized;</div><div class='hunk'>@@ -52,7 +57,6 @@ static bool init_net_initialized;</div><div class='ctx'>  * outside.</div><div class='ctx'>  */</div><div class='ctx'> DECLARE_RWSEM(pernet_ops_rwsem);</div><div class='del'>-EXPORT_SYMBOL_GPL(pernet_ops_rwsem);</div><div class='ctx'> </div><div class='ctx'> #define MIN_PERNET_OPS_ID	\</div><div class='ctx'> 	((sizeof(struct net_generic) + sizeof(void *) - 1) / sizeof(void *))</div><div class='hunk'>@@ -63,12 +67,15 @@ static unsigned int max_gen_ptrs = INITIAL_NET_GEN_PTRS;</div><div class='ctx'> </div><div class='ctx'> static struct net_generic *net_alloc_generic(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int gen_ptrs = READ_ONCE(max_gen_ptrs);</div><div class='add'>+	unsigned int generic_size;</div><div class='ctx'> 	struct net_generic *ng;</div><div class='del'>-	unsigned int generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]);</div><div class='add'>+</div><div class='add'>+	generic_size = offsetof(struct net_generic, ptr[gen_ptrs]);</div><div class='ctx'> </div><div class='ctx'> 	ng = kzalloc(generic_size, GFP_KERNEL);</div><div class='ctx'> 	if (ng)</div><div class='del'>-		ng-&gt;s.len = max_gen_ptrs;</div><div class='add'>+		ng-&gt;s.len = gen_ptrs;</div><div class='ctx'> </div><div class='ctx'> 	return ng;</div><div class='ctx'> }</div><div class='hunk'>@@ -87,7 +94,7 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ng = net_alloc_generic();</div><div class='del'>-	if (ng == NULL)</div><div class='add'>+	if (!ng)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -112,10 +119,11 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data)</div><div class='ctx'> </div><div class='ctx'> static int ops_init(const struct pernet_operations *ops, struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct net_generic *ng;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	void *data = NULL;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;id &amp;&amp; ops-&gt;size) {</div><div class='add'>+	if (ops-&gt;id) {</div><div class='ctx'> 		data = kzalloc(ops-&gt;size, GFP_KERNEL);</div><div class='ctx'> 		if (!data)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -130,6 +138,12 @@ static int ops_init(const struct pernet_operations *ops, struct net *net)</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (ops-&gt;id) {</div><div class='add'>+		ng = rcu_dereference_protected(net-&gt;gen,</div><div class='add'>+					       lockdep_is_held(&amp;pernet_ops_rwsem));</div><div class='add'>+		ng-&gt;ptr[*ops-&gt;id] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> cleanup:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='hunk'>@@ -137,21 +151,56 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ops_free(const struct pernet_operations *ops, struct net *net)</div><div class='add'>+static void ops_pre_exit_list(const struct pernet_operations *ops,</div><div class='add'>+			      struct list_head *net_exit_list)</div><div class='ctx'> {</div><div class='del'>-	if (ops-&gt;id &amp;&amp; ops-&gt;size) {</div><div class='del'>-		kfree(net_generic(net, *ops-&gt;id));</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;pre_exit) {</div><div class='add'>+		list_for_each_entry(net, net_exit_list, exit_list)</div><div class='add'>+			ops-&gt;pre_exit(net);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ops_exit_rtnl_list(const struct list_head *ops_list,</div><div class='add'>+			       const struct pernet_operations *ops,</div><div class='add'>+			       struct list_head *net_exit_list)</div><div class='add'>+{</div><div class='add'>+	const struct pernet_operations *saved_ops = ops;</div><div class='add'>+	LIST_HEAD(dev_kill_list);</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(net, net_exit_list, exit_list) {</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+		ops = saved_ops;</div><div class='add'>+		list_for_each_entry_continue_reverse(ops, ops_list, list) {</div><div class='add'>+			if (ops-&gt;exit_rtnl)</div><div class='add'>+				ops-&gt;exit_rtnl(net, &amp;dev_kill_list);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__rtnl_net_unlock(net);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_many(&amp;dev_kill_list);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ops_exit_list(const struct pernet_operations *ops,</div><div class='ctx'> 			  struct list_head *net_exit_list)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='ctx'> 	if (ops-&gt;exit) {</div><div class='del'>-		list_for_each_entry(net, net_exit_list, exit_list)</div><div class='add'>+		struct net *net;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(net, net_exit_list, exit_list) {</div><div class='ctx'> 			ops-&gt;exit(net);</div><div class='add'>+			cond_resched();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (ops-&gt;exit_batch)</div><div class='ctx'> 		ops-&gt;exit_batch(net_exit_list);</div><div class='ctx'> }</div><div class='hunk'>@@ -160,10 +209,61 @@ static void ops_free_list(const struct pernet_operations *ops,</div><div class='ctx'> 			  struct list_head *net_exit_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='del'>-	if (ops-&gt;size &amp;&amp; ops-&gt;id) {</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;id) {</div><div class='ctx'> 		list_for_each_entry(net, net_exit_list, exit_list)</div><div class='del'>-			ops_free(ops, net);</div><div class='add'>+			kfree(net_generic(net, *ops-&gt;id));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ops_undo_list(const struct list_head *ops_list,</div><div class='add'>+			  const struct pernet_operations *ops,</div><div class='add'>+			  struct list_head *net_exit_list,</div><div class='add'>+			  bool expedite_rcu)</div><div class='add'>+{</div><div class='add'>+	const struct pernet_operations *saved_ops;</div><div class='add'>+	bool hold_rtnl = false;</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		ops = list_entry(ops_list, typeof(*ops), list);</div><div class='add'>+</div><div class='add'>+	saved_ops = ops;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_continue_reverse(ops, ops_list, list) {</div><div class='add'>+		hold_rtnl |= !!ops-&gt;exit_rtnl;</div><div class='add'>+		ops_pre_exit_list(ops, net_exit_list);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Another CPU might be rcu-iterating the list, wait for it.</div><div class='add'>+	 * This needs to be before calling the exit() notifiers, so the</div><div class='add'>+	 * rcu_barrier() after ops_undo_list() isn't sufficient alone.</div><div class='add'>+	 * Also the pre_exit() and exit() methods need this barrier.</div><div class='add'>+	 */</div><div class='add'>+	if (expedite_rcu)</div><div class='add'>+		synchronize_rcu_expedited();</div><div class='add'>+	else</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	if (hold_rtnl)</div><div class='add'>+		ops_exit_rtnl_list(ops_list, saved_ops, net_exit_list);</div><div class='add'>+</div><div class='add'>+	ops = saved_ops;</div><div class='add'>+	list_for_each_entry_continue_reverse(ops, ops_list, list)</div><div class='add'>+		ops_exit_list(ops, net_exit_list);</div><div class='add'>+</div><div class='add'>+	ops = saved_ops;</div><div class='add'>+	list_for_each_entry_continue_reverse(ops, ops_list, list)</div><div class='add'>+		ops_free_list(ops, net_exit_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ops_undo_single(struct pernet_operations *ops,</div><div class='add'>+			    struct list_head *net_exit_list)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(ops_list);</div><div class='add'>+</div><div class='add'>+	list_add(&amp;ops-&gt;list, &amp;ops_list);</div><div class='add'>+	ops_undo_list(&amp;ops_list, NULL, net_exit_list, false);</div><div class='add'>+	list_del(&amp;ops-&gt;list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* should be called with nsid_lock held */</div><div class='hunk'>@@ -192,16 +292,10 @@ static int net_eq_idr(int id, void *net, void *peer)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Should be called with nsid_lock held. If a new id is assigned, the bool alloc</div><div class='del'>- * is set to true, thus the caller knows that the new id must be notified via</div><div class='del'>- * rtnl.</div><div class='del'>- */</div><div class='del'>-static int __peernet2id_alloc(struct net *net, struct net *peer, bool *alloc)</div><div class='add'>+/* Must be called from RCU-critical section or with nsid_lock held */</div><div class='add'>+static int __peernet2id(const struct net *net, struct net *peer)</div><div class='ctx'> {</div><div class='ctx'> 	int id = idr_for_each(&amp;net-&gt;netns_ids, net_eq_idr, peer);</div><div class='del'>-	bool alloc_it = *alloc;</div><div class='del'>-</div><div class='del'>-	*alloc = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Magic value for id 0. */</div><div class='ctx'> 	if (id == NET_ID_ZERO)</div><div class='hunk'>@@ -209,61 +303,60 @@ static int __peernet2id_alloc(struct net *net, struct net *peer, bool *alloc)</div><div class='ctx'> 	if (id &gt; 0)</div><div class='ctx'> 		return id;</div><div class='ctx'> </div><div class='del'>-	if (alloc_it) {</div><div class='del'>-		id = alloc_netid(net, peer, -1);</div><div class='del'>-		*alloc = true;</div><div class='del'>-		return id &gt;= 0 ? id : NETNSA_NSID_NOT_ASSIGNED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return NETNSA_NSID_NOT_ASSIGNED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* should be called with nsid_lock held */</div><div class='del'>-static int __peernet2id(struct net *net, struct net *peer)</div><div class='del'>-{</div><div class='del'>-	bool no = false;</div><div class='del'>-</div><div class='del'>-	return __peernet2id_alloc(net, peer, &amp;no);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtnl_net_notifyid(struct net *net, int cmd, int id);</div><div class='add'>+static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid,</div><div class='add'>+			      struct nlmsghdr *nlh, gfp_t gfp);</div><div class='ctx'> /* This function returns the id of a peer netns. If no id is assigned, one will</div><div class='ctx'>  * be allocated and returned.</div><div class='ctx'>  */</div><div class='del'>-int peernet2id_alloc(struct net *net, struct net *peer)</div><div class='add'>+int peernet2id_alloc(struct net *net, struct net *peer, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	bool alloc = false, alive = false;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='del'>-	if (refcount_read(&amp;net-&gt;count) == 0)</div><div class='add'>+	if (!check_net(net))</div><div class='ctx'> 		return NETNSA_NSID_NOT_ASSIGNED;</div><div class='del'>-	spin_lock_bh(&amp;net-&gt;nsid_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * When peer is obtained from RCU lists, we may race with</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;net-&gt;nsid_lock);</div><div class='add'>+	id = __peernet2id(net, peer);</div><div class='add'>+	if (id &gt;= 0) {</div><div class='add'>+		spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='add'>+		return id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When peer is obtained from RCU lists, we may race with</div><div class='ctx'> 	 * its cleanup. Check whether it's alive, and this guarantees</div><div class='ctx'> 	 * we never hash a peer back to net-&gt;netns_ids, after it has</div><div class='ctx'> 	 * just been idr_remove()'d from there in cleanup_net().</div><div class='ctx'> 	 */</div><div class='del'>-	if (maybe_get_net(peer))</div><div class='del'>-		alive = alloc = true;</div><div class='del'>-	id = __peernet2id_alloc(net, peer, &amp;alloc);</div><div class='del'>-	spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='del'>-	if (alloc &amp;&amp; id &gt;= 0)</div><div class='del'>-		rtnl_net_notifyid(net, RTM_NEWNSID, id);</div><div class='del'>-	if (alive)</div><div class='del'>-		put_net(peer);</div><div class='add'>+	if (!maybe_get_net(peer)) {</div><div class='add'>+		spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='add'>+		return NETNSA_NSID_NOT_ASSIGNED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = alloc_netid(net, peer, -1);</div><div class='add'>+	spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='add'>+</div><div class='add'>+	put_net(peer);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return NETNSA_NSID_NOT_ASSIGNED;</div><div class='add'>+</div><div class='add'>+	rtnl_net_notifyid(net, RTM_NEWNSID, id, 0, NULL, gfp);</div><div class='add'>+</div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(peernet2id_alloc);</div><div class='ctx'> </div><div class='ctx'> /* This function returns, if assigned, the id of a peer netns. */</div><div class='del'>-int peernet2id(struct net *net, struct net *peer)</div><div class='add'>+int peernet2id(const struct net *net, struct net *peer)</div><div class='ctx'> {</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	id = __peernet2id(net, peer);</div><div class='del'>-	spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(peernet2id);</div><div class='hunk'>@@ -271,12 +364,12 @@ EXPORT_SYMBOL(peernet2id);</div><div class='ctx'> /* This function returns true is the peer netns has an id assigned into the</div><div class='ctx'>  * current netns.</div><div class='ctx'>  */</div><div class='del'>-bool peernet_has_id(struct net *net, struct net *peer)</div><div class='add'>+bool peernet_has_id(const struct net *net, struct net *peer)</div><div class='ctx'> {</div><div class='ctx'> 	return peernet2id(net, peer) &gt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net *get_net_ns_by_id(struct net *net, int id)</div><div class='add'>+struct net *get_net_ns_by_id(const struct net *net, int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *peer;</div><div class='ctx'> </div><div class='hunk'>@@ -291,25 +384,64 @@ struct net *get_net_ns_by_id(struct net *net, int id)</div><div class='ctx'> </div><div class='ctx'> 	return peer;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(get_net_ns_by_id);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * setup_net runs the initializers for the network namespace object.</div><div class='del'>- */</div><div class='del'>-static __net_init int setup_net(struct net *net, struct user_namespace *user_ns)</div><div class='add'>+static __net_init void preinit_net_sysctl(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	/* Must be called with pernet_ops_rwsem held */</div><div class='del'>-	const struct pernet_operations *ops, *saved_ops;</div><div class='del'>-	int error = 0;</div><div class='del'>-	LIST_HEAD(net_exit_list);</div><div class='add'>+	net-&gt;core.sysctl_somaxconn = SOMAXCONN;</div><div class='add'>+	/* Limits per socket sk_omem_alloc usage.</div><div class='add'>+	 * TCP zerocopy regular usage needs 128 KB.</div><div class='add'>+	 */</div><div class='add'>+	net-&gt;core.sysctl_optmem_max = 128 * 1024;</div><div class='add'>+	net-&gt;core.sysctl_txrehash = SOCK_TXREHASH_ENABLED;</div><div class='add'>+	net-&gt;core.sysctl_tstamp_allow_data = 1;</div><div class='add'>+	net-&gt;core.sysctl_txq_reselection = msecs_to_jiffies(1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* init code that must occur even if setup_net() is not called. */</div><div class='add'>+static __net_init int preinit_net(struct net *net, struct user_namespace *user_ns)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ns_common_init(net);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	refcount_set(&amp;net-&gt;count, 1);</div><div class='ctx'> 	refcount_set(&amp;net-&gt;passive, 1);</div><div class='add'>+	ref_tracker_dir_init(&amp;net-&gt;refcnt_tracker, 128, "net_refcnt");</div><div class='add'>+	ref_tracker_dir_init(&amp;net-&gt;notrefcnt_tracker, 128, "net_notrefcnt");</div><div class='add'>+</div><div class='add'>+	get_random_bytes(&amp;net-&gt;hash_mix, sizeof(u32));</div><div class='ctx'> 	net-&gt;dev_base_seq = 1;</div><div class='ctx'> 	net-&gt;user_ns = user_ns;</div><div class='add'>+</div><div class='ctx'> 	idr_init(&amp;net-&gt;netns_ids);</div><div class='ctx'> 	spin_lock_init(&amp;net-&gt;nsid_lock);</div><div class='ctx'> 	mutex_init(&amp;net-&gt;ipv4.ra_mutex);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_NET_SMALL_RTNL</div><div class='add'>+	mutex_init(&amp;net-&gt;rtnl_mutex);</div><div class='add'>+	lock_set_cmp_fn(&amp;net-&gt;rtnl_mutex, rtnl_net_lock_cmp_fn, NULL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;ptype_all);</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;ptype_specific);</div><div class='add'>+	preinit_net_sysctl(net);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup_net runs the initializers for the network namespace object.</div><div class='add'>+ */</div><div class='add'>+static __net_init int setup_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	/* Must be called with pernet_ops_rwsem held */</div><div class='add'>+	const struct pernet_operations *ops;</div><div class='add'>+	LIST_HEAD(net_exit_list);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	net-&gt;net_cookie = ns_tree_gen_id(net);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(ops, &amp;pernet_list, list) {</div><div class='ctx'> 		error = ops_init(ops, net);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='hunk'>@@ -318,6 +450,7 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns)</div><div class='ctx'> 	down_write(&amp;net_rwsem);</div><div class='ctx'> 	list_add_tail_rcu(&amp;net-&gt;list, &amp;net_namespace_list);</div><div class='ctx'> 	up_write(&amp;net_rwsem);</div><div class='add'>+	ns_tree_add_raw(net);</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> </div><div class='hunk'>@@ -326,38 +459,11 @@ out_undo:</div><div class='ctx'> 	 * for the pernet modules whose init functions did not fail.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_add(&amp;net-&gt;exit_list, &amp;net_exit_list);</div><div class='del'>-	saved_ops = ops;</div><div class='del'>-	list_for_each_entry_continue_reverse(ops, &amp;pernet_list, list)</div><div class='del'>-		ops_exit_list(ops, &amp;net_exit_list);</div><div class='del'>-</div><div class='del'>-	ops = saved_ops;</div><div class='del'>-	list_for_each_entry_continue_reverse(ops, &amp;pernet_list, list)</div><div class='del'>-		ops_free_list(ops, &amp;net_exit_list);</div><div class='del'>-</div><div class='add'>+	ops_undo_list(&amp;pernet_list, ops, &amp;net_exit_list, false);</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init net_defaults_init_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	net-&gt;core.sysctl_somaxconn = SOMAXCONN;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations net_defaults_ops = {</div><div class='del'>-	.init = net_defaults_init_net,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static __init int net_defaults_init(void)</div><div class='del'>-{</div><div class='del'>-	if (register_pernet_subsys(&amp;net_defaults_ops))</div><div class='del'>-		panic("Cannot initialize net default settings");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-core_initcall(net_defaults_init);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NET_NS</div><div class='ctx'> static struct ucounts *inc_net_namespaces(struct user_namespace *ns)</div><div class='ctx'> {</div><div class='hunk'>@@ -385,29 +491,64 @@ static struct net *net_alloc(void)</div><div class='ctx'> 	if (!net)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+	net-&gt;key_domain = kzalloc(sizeof(struct key_tag), GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;key_domain)</div><div class='add'>+		goto out_free_2;</div><div class='add'>+	refcount_set(&amp;net-&gt;key_domain-&gt;usage, 1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	rcu_assign_pointer(net-&gt;gen, ng);</div><div class='ctx'> out:</div><div class='ctx'> 	return net;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+out_free_2:</div><div class='add'>+	kmem_cache_free(net_cachep, net);</div><div class='add'>+	net = NULL;</div><div class='add'>+#endif</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(ng);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void net_free(struct net *net)</div><div class='add'>+static LLIST_HEAD(defer_free_list);</div><div class='add'>+</div><div class='add'>+static void net_complete_free(void)</div><div class='ctx'> {</div><div class='del'>-	kfree(rcu_access_pointer(net-&gt;gen));</div><div class='del'>-	kmem_cache_free(net_cachep, net);</div><div class='add'>+	struct llist_node *kill_list;</div><div class='add'>+	struct net *net, *next;</div><div class='add'>+</div><div class='add'>+	/* Get the list of namespaces to free from last round. */</div><div class='add'>+	kill_list = llist_del_all(&amp;defer_free_list);</div><div class='add'>+</div><div class='add'>+	llist_for_each_entry_safe(net, next, kill_list, defer_free_list)</div><div class='add'>+		kmem_cache_free(net_cachep, net);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_passive_dec(struct net *net)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;net-&gt;passive)) {</div><div class='add'>+		kfree(rcu_access_pointer(net-&gt;gen));</div><div class='add'>+</div><div class='add'>+		/* There should not be any trackers left there. */</div><div class='add'>+		ref_tracker_dir_exit(&amp;net-&gt;notrefcnt_tracker);</div><div class='add'>+</div><div class='add'>+		/* Wait for an extra rcu_barrier() before final free. */</div><div class='add'>+		llist_add(&amp;net-&gt;defer_free_list, &amp;defer_free_list);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void net_drop_ns(void *p)</div><div class='ctx'> {</div><div class='del'>-	struct net *ns = p;</div><div class='del'>-	if (ns &amp;&amp; refcount_dec_and_test(&amp;ns-&gt;passive))</div><div class='del'>-		net_free(ns);</div><div class='add'>+	struct net *net = (struct net *)p;</div><div class='add'>+</div><div class='add'>+	if (net)</div><div class='add'>+		net_passive_dec(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net *copy_net_ns(unsigned long flags,</div><div class='add'>+struct net *copy_net_ns(u64 flags,</div><div class='ctx'> 			struct user_namespace *user_ns, struct net *old_net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucounts *ucounts;</div><div class='hunk'>@@ -426,7 +567,10 @@ struct net *copy_net_ns(unsigned long flags,</div><div class='ctx'> 		rv = -ENOMEM;</div><div class='ctx'> 		goto dec_ucounts;</div><div class='ctx'> 	}</div><div class='del'>-	refcount_set(&amp;net-&gt;passive, 1);</div><div class='add'>+</div><div class='add'>+	rv = preinit_net(net, user_ns);</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto dec_ucounts;</div><div class='ctx'> 	net-&gt;ucounts = ucounts;</div><div class='ctx'> 	get_user_ns(user_ns);</div><div class='ctx'> </div><div class='hunk'>@@ -434,14 +578,18 @@ struct net *copy_net_ns(unsigned long flags,</div><div class='ctx'> 	if (rv &lt; 0)</div><div class='ctx'> 		goto put_userns;</div><div class='ctx'> </div><div class='del'>-	rv = setup_net(net, user_ns);</div><div class='add'>+	rv = setup_net(net);</div><div class='ctx'> </div><div class='ctx'> 	up_read(&amp;pernet_ops_rwsem);</div><div class='ctx'> </div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='ctx'> put_userns:</div><div class='add'>+		ns_common_free(net);</div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+		key_remove_domain(net-&gt;key_domain);</div><div class='add'>+#endif</div><div class='ctx'> 		put_user_ns(user_ns);</div><div class='del'>-		net_drop_ns(net);</div><div class='add'>+		net_passive_dec(net);</div><div class='ctx'> dec_ucounts:</div><div class='ctx'> 		dec_net_namespaces(ucounts);</div><div class='ctx'> 		return ERR_PTR(rv);</div><div class='hunk'>@@ -488,30 +636,34 @@ static void unhash_nsid(struct net *net, struct net *last)</div><div class='ctx'> 	for_each_net(tmp) {</div><div class='ctx'> 		int id;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;tmp-&gt;nsid_lock);</div><div class='add'>+		spin_lock(&amp;tmp-&gt;nsid_lock);</div><div class='ctx'> 		id = __peernet2id(tmp, net);</div><div class='ctx'> 		if (id &gt;= 0)</div><div class='ctx'> 			idr_remove(&amp;tmp-&gt;netns_ids, id);</div><div class='del'>-		spin_unlock_bh(&amp;tmp-&gt;nsid_lock);</div><div class='add'>+		spin_unlock(&amp;tmp-&gt;nsid_lock);</div><div class='ctx'> 		if (id &gt;= 0)</div><div class='del'>-			rtnl_net_notifyid(tmp, RTM_DELNSID, id);</div><div class='add'>+			rtnl_net_notifyid(tmp, RTM_DELNSID, id, 0, NULL,</div><div class='add'>+					  GFP_KERNEL);</div><div class='ctx'> 		if (tmp == last)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	spin_lock(&amp;net-&gt;nsid_lock);</div><div class='ctx'> 	idr_destroy(&amp;net-&gt;netns_ids);</div><div class='del'>-	spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static LLIST_HEAD(cleanup_list);</div><div class='ctx'> </div><div class='add'>+struct task_struct *cleanup_net_task;</div><div class='add'>+</div><div class='ctx'> static void cleanup_net(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	const struct pernet_operations *ops;</div><div class='del'>-	struct net *net, *tmp, *last;</div><div class='ctx'> 	struct llist_node *net_kill_list;</div><div class='add'>+	struct net *net, *tmp, *last;</div><div class='ctx'> 	LIST_HEAD(net_exit_list);</div><div class='ctx'> </div><div class='add'>+	WRITE_ONCE(cleanup_net_task, current);</div><div class='add'>+</div><div class='ctx'> 	/* Atomically snapshot the list of namespaces to cleanup */</div><div class='ctx'> 	net_kill_list = llist_del_all(&amp;cleanup_list);</div><div class='ctx'> </div><div class='hunk'>@@ -519,8 +671,10 @@ static void cleanup_net(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* Don't let anyone else find us. */</div><div class='ctx'> 	down_write(&amp;net_rwsem);</div><div class='del'>-	llist_for_each_entry(net, net_kill_list, cleanup_list)</div><div class='add'>+	llist_for_each_entry(net, net_kill_list, cleanup_list) {</div><div class='add'>+		ns_tree_remove(net);</div><div class='ctx'> 		list_del_rcu(&amp;net-&gt;list);</div><div class='add'>+	}</div><div class='ctx'> 	/* Cache last net. After we unlock rtnl, no one new net</div><div class='ctx'> 	 * added to net_namespace_list can assign nsid pointer</div><div class='ctx'> 	 * to a net from net_kill_list (see peernet2id_alloc()).</div><div class='hunk'>@@ -539,20 +693,7 @@ static void cleanup_net(struct work_struct *work)</div><div class='ctx'> 		list_add_tail(&amp;net-&gt;exit_list, &amp;net_exit_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Another CPU might be rcu-iterating the list, wait for it.</div><div class='del'>-	 * This needs to be before calling the exit() notifiers, so</div><div class='del'>-	 * the rcu_barrier() below isn't sufficient alone.</div><div class='del'>-	 */</div><div class='del'>-	synchronize_rcu();</div><div class='del'>-</div><div class='del'>-	/* Run all of the network namespace exit methods */</div><div class='del'>-	list_for_each_entry_reverse(ops, &amp;pernet_list, list)</div><div class='del'>-		ops_exit_list(ops, &amp;net_exit_list);</div><div class='del'>-</div><div class='del'>-	/* Free the net generic variables */</div><div class='del'>-	list_for_each_entry_reverse(ops, &amp;pernet_list, list)</div><div class='del'>-		ops_free_list(ops, &amp;net_exit_list);</div><div class='add'>+	ops_undo_list(&amp;pernet_list, NULL, &amp;net_exit_list, true);</div><div class='ctx'> </div><div class='ctx'> 	up_read(&amp;pernet_ops_rwsem);</div><div class='ctx'> </div><div class='hunk'>@@ -561,13 +702,20 @@ static void cleanup_net(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> </div><div class='add'>+	net_complete_free();</div><div class='add'>+</div><div class='ctx'> 	/* Finally it is safe to free my network namespace structure */</div><div class='ctx'> 	list_for_each_entry_safe(net, tmp, &amp;net_exit_list, exit_list) {</div><div class='ctx'> 		list_del_init(&amp;net-&gt;exit_list);</div><div class='add'>+		ns_common_free(net);</div><div class='ctx'> 		dec_net_namespaces(net-&gt;ucounts);</div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+		key_remove_domain(net-&gt;key_domain);</div><div class='add'>+#endif</div><div class='ctx'> 		put_user_ns(net-&gt;user_ns);</div><div class='del'>-		net_drop_ns(net);</div><div class='add'>+		net_passive_dec(net);</div><div class='ctx'> 	}</div><div class='add'>+	WRITE_ONCE(cleanup_net_task, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -590,39 +738,47 @@ static DECLARE_WORK(net_cleanup_work, cleanup_net);</div><div class='ctx'> </div><div class='ctx'> void __put_net(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	ref_tracker_dir_exit(&amp;net-&gt;refcnt_tracker);</div><div class='ctx'> 	/* Cleanup the network namespace in process context */</div><div class='ctx'> 	if (llist_add(&amp;net-&gt;cleanup_list, &amp;cleanup_list))</div><div class='ctx'> 		queue_work(netns_wq, &amp;net_cleanup_work);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__put_net);</div><div class='ctx'> </div><div class='del'>-struct net *get_net_ns_by_fd(int fd)</div><div class='add'>+/**</div><div class='add'>+ * get_net_ns - increment the refcount of the network namespace</div><div class='add'>+ * @ns: common namespace (net)</div><div class='add'>+ *</div><div class='add'>+ * Returns the net's common namespace or ERR_PTR() if ref is zero.</div><div class='add'>+ */</div><div class='add'>+struct ns_common *get_net_ns(struct ns_common *ns)</div><div class='ctx'> {</div><div class='del'>-	struct file *file;</div><div class='del'>-	struct ns_common *ns;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> </div><div class='del'>-	file = proc_ns_fget(fd);</div><div class='del'>-	if (IS_ERR(file))</div><div class='del'>-		return ERR_CAST(file);</div><div class='del'>-</div><div class='del'>-	ns = get_proc_ns(file_inode(file));</div><div class='del'>-	if (ns-&gt;ops == &amp;netns_operations)</div><div class='del'>-		net = get_net(container_of(ns, struct net, ns));</div><div class='del'>-	else</div><div class='del'>-		net = ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	fput(file);</div><div class='del'>-	return net;</div><div class='add'>+	net = maybe_get_net(container_of(ns, struct net, ns));</div><div class='add'>+	if (net)</div><div class='add'>+		return &amp;net-&gt;ns;</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(get_net_ns);</div><div class='ctx'> </div><div class='del'>-#else</div><div class='ctx'> struct net *get_net_ns_by_fd(int fd)</div><div class='ctx'> {</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return ERR_PTR(-EBADF);</div><div class='add'>+</div><div class='add'>+	if (proc_ns_file(fd_file(f))) {</div><div class='add'>+		struct ns_common *ns = get_proc_ns(file_inode(fd_file(f)));</div><div class='add'>+		if (ns-&gt;ops == &amp;netns_operations)</div><div class='add'>+			return get_net(container_of(ns, struct net, ns));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> EXPORT_SYMBOL_GPL(get_net_ns_by_fd);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct net *get_net_ns_by_pid(pid_t pid)</div><div class='ctx'> {</div><div class='hunk'>@@ -646,22 +802,37 @@ struct net *get_net_ns_by_pid(pid_t pid)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(get_net_ns_by_pid);</div><div class='ctx'> </div><div class='del'>-static __net_init int net_ns_net_init(struct net *net)</div><div class='add'>+#ifdef CONFIG_NET_NS_REFCNT_TRACKER</div><div class='add'>+static void net_ns_net_debugfs(struct net *net)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_NET_NS</div><div class='del'>-	net-&gt;ns.ops = &amp;netns_operations;</div><div class='del'>-#endif</div><div class='del'>-	return ns_alloc_inum(&amp;net-&gt;ns);</div><div class='add'>+	ref_tracker_dir_symlink(&amp;net-&gt;refcnt_tracker, "netns-%llx-%u-refcnt",</div><div class='add'>+				net-&gt;net_cookie, net-&gt;ns.inum);</div><div class='add'>+	ref_tracker_dir_symlink(&amp;net-&gt;notrefcnt_tracker, "netns-%llx-%u-notrefcnt",</div><div class='add'>+				net-&gt;net_cookie, net-&gt;ns.inum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __net_exit void net_ns_net_exit(struct net *net)</div><div class='add'>+static int __init init_net_debugfs(void)</div><div class='ctx'> {</div><div class='del'>-	ns_free_inum(&amp;net-&gt;ns);</div><div class='add'>+	ref_tracker_dir_debugfs(&amp;init_net.refcnt_tracker);</div><div class='add'>+	ref_tracker_dir_debugfs(&amp;init_net.notrefcnt_tracker);</div><div class='add'>+	net_ns_net_debugfs(&amp;init_net);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(init_net_debugfs);</div><div class='add'>+#else</div><div class='add'>+static void net_ns_net_debugfs(struct net *net)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __net_init int net_ns_net_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	net_ns_net_debugfs(net);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations __net_initdata net_ns_ops = {</div><div class='ctx'> 	.init = net_ns_net_init,</div><div class='del'>-	.exit = net_ns_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = {</div><div class='hunk'>@@ -669,6 +840,7 @@ static const struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = {</div><div class='ctx'> 	[NETNSA_NSID]		= { .type = NLA_S32 },</div><div class='ctx'> 	[NETNSA_PID]		= { .type = NLA_U32 },</div><div class='ctx'> 	[NETNSA_FD]		= { .type = NLA_U32 },</div><div class='add'>+	[NETNSA_TARGET_NSID]	= { .type = NLA_S32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='hunk'>@@ -680,8 +852,8 @@ static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net *peer;</div><div class='ctx'> 	int nsid, err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,</div><div class='del'>-			  rtnl_net_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(struct rtgenmsg), tb,</div><div class='add'>+				     NETNSA_MAX, rtnl_net_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (!tb[NETNSA_NSID]) {</div><div class='hunk'>@@ -706,9 +878,9 @@ static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return PTR_ERR(peer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	spin_lock(&amp;net-&gt;nsid_lock);</div><div class='ctx'> 	if (__peernet2id(net, peer) &gt;= 0) {</div><div class='del'>-		spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+		spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='ctx'> 		err = -EEXIST;</div><div class='ctx'> 		NL_SET_BAD_ATTR(extack, nla);</div><div class='ctx'> 		NL_SET_ERR_MSG(extack,</div><div class='hunk'>@@ -717,9 +889,10 @@ static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = alloc_netid(net, peer, nsid);</div><div class='del'>-	spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	spin_unlock(&amp;net-&gt;nsid_lock);</div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='del'>-		rtnl_net_notifyid(net, RTM_NEWNSID, err);</div><div class='add'>+		rtnl_net_notifyid(net, RTM_NEWNSID, err, NETLINK_CB(skb).portid,</div><div class='add'>+				  nlh, GFP_KERNEL);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	} else if (err == -ENOSPC &amp;&amp; nsid &gt;= 0) {</div><div class='ctx'> 		err = -EEXIST;</div><div class='hunk'>@@ -735,23 +908,38 @@ static int rtnl_net_get_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	return NLMSG_ALIGN(sizeof(struct rtgenmsg))</div><div class='ctx'> 	       + nla_total_size(sizeof(s32)) /* NETNSA_NSID */</div><div class='add'>+	       + nla_total_size(sizeof(s32)) /* NETNSA_CURRENT_NSID */</div><div class='ctx'> 	       ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtnl_net_fill(struct sk_buff *skb, u32 portid, u32 seq, int flags,</div><div class='del'>-			 int cmd, struct net *net, int nsid)</div><div class='add'>+struct net_fill_args {</div><div class='add'>+	u32 portid;</div><div class='add'>+	u32 seq;</div><div class='add'>+	int flags;</div><div class='add'>+	int cmd;</div><div class='add'>+	int nsid;</div><div class='add'>+	bool add_ref;</div><div class='add'>+	int ref_nsid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_net_fill(struct sk_buff *skb, struct net_fill_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct rtgenmsg *rth;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rth), flags);</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;cmd, sizeof(*rth),</div><div class='add'>+			args-&gt;flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	rth = nlmsg_data(nlh);</div><div class='ctx'> 	rth-&gt;rtgen_family = AF_UNSPEC;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_s32(skb, NETNSA_NSID, nsid))</div><div class='add'>+	if (nla_put_s32(skb, NETNSA_NSID, args-&gt;nsid))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (args-&gt;add_ref &amp;&amp;</div><div class='add'>+	    nla_put_s32(skb, NETNSA_CURRENT_NSID, args-&gt;ref_nsid))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='hunk'>@@ -762,18 +950,59 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rtnl_net_valid_getid_req(struct sk_buff *skb,</div><div class='add'>+				    const struct nlmsghdr *nlh,</div><div class='add'>+				    struct nlattr **tb,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(struct rtgenmsg),</div><div class='add'>+					      tb, NETNSA_MAX, rtnl_net_policy,</div><div class='add'>+					      extack);</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct rtgenmsg), tb,</div><div class='add'>+					    NETNSA_MAX, rtnl_net_policy,</div><div class='add'>+					    extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NETNSA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NETNSA_PID:</div><div class='add'>+		case NETNSA_FD:</div><div class='add'>+		case NETNSA_NSID:</div><div class='add'>+		case NETNSA_TARGET_NSID:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in peer netns getid request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct nlattr *tb[NETNSA_MAX + 1];</div><div class='add'>+	struct net_fill_args fillargs = {</div><div class='add'>+		.portid = NETLINK_CB(skb).portid,</div><div class='add'>+		.seq = nlh-&gt;nlmsg_seq,</div><div class='add'>+		.cmd = RTM_NEWNSID,</div><div class='add'>+	};</div><div class='add'>+	struct net *peer, *target = net;</div><div class='ctx'> 	struct nlattr *nla;</div><div class='ctx'> 	struct sk_buff *msg;</div><div class='del'>-	struct net *peer;</div><div class='del'>-	int err, id;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,</div><div class='del'>-			  rtnl_net_policy, extack);</div><div class='add'>+	err = rtnl_net_valid_getid_req(skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (tb[NETNSA_PID]) {</div><div class='hunk'>@@ -782,6 +1011,11 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	} else if (tb[NETNSA_FD]) {</div><div class='ctx'> 		peer = get_net_ns_by_fd(nla_get_u32(tb[NETNSA_FD]));</div><div class='ctx'> 		nla = tb[NETNSA_FD];</div><div class='add'>+	} else if (tb[NETNSA_NSID]) {</div><div class='add'>+		peer = get_net_ns_by_id(net, nla_get_s32(tb[NETNSA_NSID]));</div><div class='add'>+		if (!peer)</div><div class='add'>+			peer = ERR_PTR(-ENOENT);</div><div class='add'>+		nla = tb[NETNSA_NSID];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Peer netns reference is missing");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -793,15 +1027,29 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return PTR_ERR(peer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (tb[NETNSA_TARGET_NSID]) {</div><div class='add'>+		int id = nla_get_s32(tb[NETNSA_TARGET_NSID]);</div><div class='add'>+</div><div class='add'>+		target = rtnl_get_net_ns_capable(NETLINK_CB(skb).sk, id);</div><div class='add'>+		if (IS_ERR(target)) {</div><div class='add'>+			NL_SET_BAD_ATTR(extack, tb[NETNSA_TARGET_NSID]);</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Target netns reference is invalid");</div><div class='add'>+			err = PTR_ERR(target);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		fillargs.add_ref = true;</div><div class='add'>+		fillargs.ref_nsid = peernet2id(net, peer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	msg = nlmsg_new(rtnl_net_get_size(), GFP_KERNEL);</div><div class='ctx'> 	if (!msg) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	id = peernet2id(net, peer);</div><div class='del'>-	err = rtnl_net_fill(msg, NETLINK_CB(skb).portid, nlh-&gt;nlmsg_seq, 0,</div><div class='del'>-			    RTM_NEWNSID, net, id);</div><div class='add'>+	fillargs.nsid = peernet2id(target, peer);</div><div class='add'>+	err = rtnl_net_fill(msg, &amp;fillargs);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -811,18 +1059,22 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> err_out:</div><div class='ctx'> 	nlmsg_free(msg);</div><div class='ctx'> out:</div><div class='add'>+	if (fillargs.add_ref)</div><div class='add'>+		put_net(target);</div><div class='ctx'> 	put_net(peer);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct rtnl_net_dump_cb {</div><div class='del'>-	struct net *net;</div><div class='add'>+	struct net *tgt_net;</div><div class='add'>+	struct net *ref_net;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct netlink_callback *cb;</div><div class='add'>+	struct net_fill_args fillargs;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int s_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Runs in RCU-critical section. */</div><div class='ctx'> static int rtnl_net_dumpid_one(int id, void *peer, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtnl_net_dump_cb *net_cb = (struct rtnl_net_dump_cb *)data;</div><div class='hunk'>@@ -831,9 +1083,10 @@ static int rtnl_net_dumpid_one(int id, void *peer, void *data)</div><div class='ctx'> 	if (net_cb-&gt;idx &lt; net_cb-&gt;s_idx)</div><div class='ctx'> 		goto cont;</div><div class='ctx'> </div><div class='del'>-	ret = rtnl_net_fill(net_cb-&gt;skb, NETLINK_CB(net_cb-&gt;cb-&gt;skb).portid,</div><div class='del'>-			    net_cb-&gt;cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='del'>-			    RTM_NEWNSID, net_cb-&gt;net, id);</div><div class='add'>+	net_cb-&gt;fillargs.nsid = id;</div><div class='add'>+	if (net_cb-&gt;fillargs.add_ref)</div><div class='add'>+		net_cb-&gt;fillargs.ref_nsid = __peernet2id(net_cb-&gt;ref_net, peer);</div><div class='add'>+	ret = rtnl_net_fill(net_cb-&gt;skb, &amp;net_cb-&gt;fillargs);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -842,39 +1095,102 @@ cont:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rtnl_valid_dump_net_req(const struct nlmsghdr *nlh, struct sock *sk,</div><div class='add'>+				   struct rtnl_net_dump_cb *net_cb,</div><div class='add'>+				   struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct nlattr *tb[NETNSA_MAX + 1];</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct rtgenmsg), tb,</div><div class='add'>+					    NETNSA_MAX, rtnl_net_policy,</div><div class='add'>+					    extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NETNSA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i == NETNSA_TARGET_NSID) {</div><div class='add'>+			struct net *net;</div><div class='add'>+</div><div class='add'>+			net = rtnl_get_net_ns_capable(sk, nla_get_s32(tb[i]));</div><div class='add'>+			if (IS_ERR(net)) {</div><div class='add'>+				NL_SET_BAD_ATTR(extack, tb[i]);</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Invalid target network namespace id");</div><div class='add'>+				return PTR_ERR(net);</div><div class='add'>+			}</div><div class='add'>+			net_cb-&gt;fillargs.add_ref = true;</div><div class='add'>+			net_cb-&gt;ref_net = net_cb-&gt;tgt_net;</div><div class='add'>+			net_cb-&gt;tgt_net = net;</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_BAD_ATTR(extack, tb[i]);</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Unsupported attribute in dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_net_dumpid(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct rtnl_net_dump_cb net_cb = {</div><div class='del'>-		.net = net,</div><div class='add'>+		.tgt_net = sock_net(skb-&gt;sk),</div><div class='ctx'> 		.skb = skb,</div><div class='del'>-		.cb = cb,</div><div class='add'>+		.fillargs = {</div><div class='add'>+			.portid = NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			.seq = cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			.flags = NLM_F_MULTI,</div><div class='add'>+			.cmd = RTM_NEWNSID,</div><div class='add'>+		},</div><div class='ctx'> 		.idx = 0,</div><div class='ctx'> 		.s_idx = cb-&gt;args[0],</div><div class='ctx'> 	};</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = rtnl_valid_dump_net_req(cb-&gt;nlh, skb-&gt;sk, &amp;net_cb, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto end;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;net-&gt;nsid_lock);</div><div class='del'>-	idr_for_each(&amp;net-&gt;netns_ids, rtnl_net_dumpid_one, &amp;net_cb);</div><div class='del'>-	spin_unlock_bh(&amp;net-&gt;nsid_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	idr_for_each(&amp;net_cb.tgt_net-&gt;netns_ids, rtnl_net_dumpid_one, &amp;net_cb);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = net_cb.idx;</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+end:</div><div class='add'>+	if (net_cb.fillargs.add_ref)</div><div class='add'>+		put_net(net_cb.tgt_net);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtnl_net_notifyid(struct net *net, int cmd, int id)</div><div class='add'>+static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid,</div><div class='add'>+			      struct nlmsghdr *nlh, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	struct net_fill_args fillargs = {</div><div class='add'>+		.portid = portid,</div><div class='add'>+		.seq = nlh ? nlh-&gt;nlmsg_seq : 0,</div><div class='add'>+		.cmd = cmd,</div><div class='add'>+		.nsid = id,</div><div class='add'>+	};</div><div class='ctx'> 	struct sk_buff *msg;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	msg = nlmsg_new(rtnl_net_get_size(), GFP_KERNEL);</div><div class='add'>+	msg = nlmsg_new(rtnl_net_get_size(), gfp);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = rtnl_net_fill(msg, 0, 0, 0, cmd, net, id);</div><div class='add'>+	err = rtnl_net_fill(msg, &amp;fillargs);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	rtnl_notify(msg, net, 0, RTNLGRP_NSID, NULL, 0);</div><div class='add'>+	rtnl_notify(msg, net, portid, RTNLGRP_NSID, nlh, gfp);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='hunk'>@@ -883,11 +1199,63 @@ out:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_NSID, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init net_ns_init(void)</div><div class='add'>+#ifdef CONFIG_NET_NS</div><div class='add'>+static void __init netns_ipv4_struct_check(void)</div><div class='add'>+{</div><div class='add'>+	/* TX readonly hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_early_retrans);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_tso_win_divisor);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_tso_rtt_log);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_autocorking);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_min_snd_mss);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_notsent_lowat);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_limit_output_bytes);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_min_rtt_wlen);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_tcp_wmem);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx,</div><div class='add'>+				      sysctl_ip_fwd_use_pmtu);</div><div class='add'>+</div><div class='add'>+	/* RX readonly hotpath cache line */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_moderate_rcvbuf);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_rcvbuf_low_rtt);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_ip_early_demux);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_early_demux);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_l3mdev_accept);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_reordering);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,</div><div class='add'>+				      sysctl_tcp_rmem);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler net_ns_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_NEWNSID, .doit = rtnl_net_newid,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+	{.msgtype = RTM_GETNSID, .doit = rtnl_net_getid,</div><div class='add'>+	 .dumpit = rtnl_net_dumpid,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init net_ns_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_generic *ng;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_NS</div><div class='add'>+	netns_ipv4_struct_check();</div><div class='ctx'> 	net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),</div><div class='ctx'> 					SMP_CACHE_BYTES,</div><div class='ctx'> 					SLAB_PANIC|SLAB_ACCOUNT, NULL);</div><div class='hunk'>@@ -904,35 +1272,39 @@ static int __init net_ns_init(void)</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(init_net.gen, ng);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+	init_net.key_domain = &amp;init_net_key_domain;</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * This currently cannot fail as the initial network namespace</div><div class='add'>+	 * has a static inode number.</div><div class='add'>+	 */</div><div class='add'>+	if (preinit_net(&amp;init_net, &amp;init_user_ns))</div><div class='add'>+		panic("Could not preinitialize the initial network namespace");</div><div class='add'>+</div><div class='ctx'> 	down_write(&amp;pernet_ops_rwsem);</div><div class='del'>-	if (setup_net(&amp;init_net, &amp;init_user_ns))</div><div class='add'>+	if (setup_net(&amp;init_net))</div><div class='ctx'> 		panic("Could not setup the initial network namespace");</div><div class='ctx'> </div><div class='ctx'> 	init_net_initialized = true;</div><div class='ctx'> 	up_write(&amp;pernet_ops_rwsem);</div><div class='ctx'> </div><div class='del'>-	register_pernet_subsys(&amp;net_ns_ops);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL,</div><div class='del'>-		      RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETNSID, rtnl_net_getid, rtnl_net_dumpid,</div><div class='del'>-		      RTNL_FLAG_DOIT_UNLOCKED);</div><div class='add'>+	if (register_pernet_subsys(&amp;net_ns_ops))</div><div class='add'>+		panic("Could not register network namespace subsystems");</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	rtnl_register_many(net_ns_rtnl_msg_handlers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-pure_initcall(net_ns_init);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NET_NS</div><div class='ctx'> static int __register_pernet_operations(struct list_head *list,</div><div class='ctx'> 					struct pernet_operations *ops)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(net_exit_list);</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int error;</div><div class='del'>-	LIST_HEAD(net_exit_list);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;ops-&gt;list, list);</div><div class='del'>-	if (ops-&gt;init || (ops-&gt;id &amp;&amp; ops-&gt;size)) {</div><div class='add'>+	if (ops-&gt;init || ops-&gt;id) {</div><div class='ctx'> 		/* We held write locked pernet_ops_rwsem, and parallel</div><div class='ctx'> 		 * setup_net() and cleanup_net() are not possible.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -948,22 +1320,21 @@ static int __register_pernet_operations(struct list_head *list,</div><div class='ctx'> out_undo:</div><div class='ctx'> 	/* If I have an error cleanup all namespaces I initialized */</div><div class='ctx'> 	list_del(&amp;ops-&gt;list);</div><div class='del'>-	ops_exit_list(ops, &amp;net_exit_list);</div><div class='del'>-	ops_free_list(ops, &amp;net_exit_list);</div><div class='add'>+	ops_undo_single(ops, &amp;net_exit_list);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __unregister_pernet_operations(struct pernet_operations *ops)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='ctx'> 	LIST_HEAD(net_exit_list);</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;ops-&gt;list);</div><div class='ctx'> 	/* See comment in __register_pernet_operations() */</div><div class='ctx'> 	for_each_net(net)</div><div class='ctx'> 		list_add_tail(&amp;net-&gt;exit_list, &amp;net_exit_list);</div><div class='del'>-	ops_exit_list(ops, &amp;net_exit_list);</div><div class='del'>-	ops_free_list(ops, &amp;net_exit_list);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;ops-&gt;list);</div><div class='add'>+	ops_undo_single(ops, &amp;net_exit_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -985,9 +1356,9 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)</div><div class='ctx'> 		list_del(&amp;ops-&gt;list);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		LIST_HEAD(net_exit_list);</div><div class='add'>+</div><div class='ctx'> 		list_add(&amp;init_net.exit_list, &amp;net_exit_list);</div><div class='del'>-		ops_exit_list(ops, &amp;net_exit_list);</div><div class='del'>-		ops_free_list(ops, &amp;net_exit_list);</div><div class='add'>+		ops_undo_single(ops, &amp;net_exit_list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1000,13 +1371,20 @@ static int register_pernet_operations(struct list_head *list,</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(!!ops-&gt;id ^ !!ops-&gt;size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (ops-&gt;id) {</div><div class='ctx'> 		error = ida_alloc_min(&amp;net_generic_ids, MIN_PERNET_OPS_ID,</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='ctx'> 			return error;</div><div class='ctx'> 		*ops-&gt;id = error;</div><div class='del'>-		max_gen_ptrs = max(max_gen_ptrs, *ops-&gt;id + 1);</div><div class='add'>+		/* This does not require READ_ONCE as writers already hold</div><div class='add'>+		 * pernet_ops_rwsem. But WRITE_ONCE is needed to protect</div><div class='add'>+		 * net_alloc_generic.</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(max_gen_ptrs, max(max_gen_ptrs, *ops-&gt;id + 1));</div><div class='ctx'> 	}</div><div class='ctx'> 	error = __register_pernet_operations(list, ops);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -1137,22 +1515,18 @@ static struct ns_common *netns_get(struct task_struct *task)</div><div class='ctx'> 	return net ? &amp;net-&gt;ns : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct net *to_net_ns(struct ns_common *ns)</div><div class='del'>-{</div><div class='del'>-	return container_of(ns, struct net, ns);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void netns_put(struct ns_common *ns)</div><div class='ctx'> {</div><div class='ctx'> 	put_net(to_net_ns(ns));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int netns_install(struct nsproxy *nsproxy, struct ns_common *ns)</div><div class='add'>+static int netns_install(struct nsset *nsset, struct ns_common *ns)</div><div class='ctx'> {</div><div class='add'>+	struct nsproxy *nsproxy = nsset-&gt;nsproxy;</div><div class='ctx'> 	struct net *net = to_net_ns(ns);</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_SYS_ADMIN) ||</div><div class='del'>-	    !ns_capable(current_user_ns(), CAP_SYS_ADMIN))</div><div class='add'>+	    !ns_capable(nsset-&gt;cred-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	put_net(nsproxy-&gt;net_ns);</div><div class='hunk'>@@ -1167,7 +1541,6 @@ static struct user_namespace *netns_owner(struct ns_common *ns)</div><div class='ctx'> </div><div class='ctx'> const struct proc_ns_operations netns_operations = {</div><div class='ctx'> 	.name		= "net",</div><div class='del'>-	.type		= CLONE_NEWNET,</div><div class='ctx'> 	.get		= netns_get,</div><div class='ctx'> 	.put		= netns_put,</div><div class='ctx'> 	.install	= netns_install,</div><div class='head'>diff --git a/net/core/net_test.c b/net/core/net_test.c<br/>new file mode 100644<br/>index 000000000000..9c3a590865d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/net_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/net_test.c</a></div><div class='hunk'>@@ -0,0 +1,387 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+/* GSO */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+static const char hdr[] = "abcdefgh";</div><div class='add'>+#define GSO_TEST_SIZE 1000</div><div class='add'>+</div><div class='add'>+static void __init_skb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	memcpy(skb_mac_header(skb), hdr, sizeof(hdr));</div><div class='add'>+</div><div class='add'>+	/* skb_segment expects skb-&gt;data at start of payload */</div><div class='add'>+	skb_pull(skb, sizeof(hdr));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	/* proto is arbitrary, as long as not ETH_P_TEB or vlan */</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_ATALK);</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_size = GSO_TEST_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum gso_test_nr {</div><div class='add'>+	GSO_TEST_LINEAR,</div><div class='add'>+	GSO_TEST_NO_GSO,</div><div class='add'>+	GSO_TEST_FRAGS,</div><div class='add'>+	GSO_TEST_FRAGS_PURE,</div><div class='add'>+	GSO_TEST_GSO_PARTIAL,</div><div class='add'>+	GSO_TEST_FRAG_LIST,</div><div class='add'>+	GSO_TEST_FRAG_LIST_PURE,</div><div class='add'>+	GSO_TEST_FRAG_LIST_NON_UNIFORM,</div><div class='add'>+	GSO_TEST_GSO_BY_FRAGS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gso_test_case {</div><div class='add'>+	enum gso_test_nr id;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	/* input */</div><div class='add'>+	unsigned int linear_len;</div><div class='add'>+	unsigned int nr_frags;</div><div class='add'>+	const unsigned int *frags;</div><div class='add'>+	unsigned int nr_frag_skbs;</div><div class='add'>+	const unsigned int *frag_skbs;</div><div class='add'>+</div><div class='add'>+	/* output as expected */</div><div class='add'>+	unsigned int nr_segs;</div><div class='add'>+	const unsigned int *segs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gso_test_case cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_NO_GSO,</div><div class='add'>+		.name = "no_gso",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE,</div><div class='add'>+		.nr_segs = 1,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_LINEAR,</div><div class='add'>+		.name = "linear",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE + GSO_TEST_SIZE + 1,</div><div class='add'>+		.nr_segs = 3,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, 1 },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_FRAGS,</div><div class='add'>+		.name = "frags",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE,</div><div class='add'>+		.nr_frags = 2,</div><div class='add'>+		.frags = (const unsigned int[]) { GSO_TEST_SIZE, 1 },</div><div class='add'>+		.nr_segs = 3,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, 1 },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_FRAGS_PURE,</div><div class='add'>+		.name = "frags_pure",</div><div class='add'>+		.nr_frags = 3,</div><div class='add'>+		.frags = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, 2 },</div><div class='add'>+		.nr_segs = 3,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, 2 },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_GSO_PARTIAL,</div><div class='add'>+		.name = "gso_partial",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE,</div><div class='add'>+		.nr_frags = 2,</div><div class='add'>+		.frags = (const unsigned int[]) { GSO_TEST_SIZE, 3 },</div><div class='add'>+		.nr_segs = 2,</div><div class='add'>+		.segs = (const unsigned int[]) { 2 * GSO_TEST_SIZE, 3 },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* commit 89319d3801d1: frag_list on mss boundaries */</div><div class='add'>+		.id = GSO_TEST_FRAG_LIST,</div><div class='add'>+		.name = "frag_list",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE,</div><div class='add'>+		.nr_frag_skbs = 2,</div><div class='add'>+		.frag_skbs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE },</div><div class='add'>+		.nr_segs = 3,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, GSO_TEST_SIZE },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = GSO_TEST_FRAG_LIST_PURE,</div><div class='add'>+		.name = "frag_list_pure",</div><div class='add'>+		.nr_frag_skbs = 2,</div><div class='add'>+		.frag_skbs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE },</div><div class='add'>+		.nr_segs = 2,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* commit 43170c4e0ba7: GRO of frag_list trains */</div><div class='add'>+		.id = GSO_TEST_FRAG_LIST_NON_UNIFORM,</div><div class='add'>+		.name = "frag_list_non_uniform",</div><div class='add'>+		.linear_len = GSO_TEST_SIZE,</div><div class='add'>+		.nr_frag_skbs = 4,</div><div class='add'>+		.frag_skbs = (const unsigned int[]) { GSO_TEST_SIZE, 1, GSO_TEST_SIZE, 2 },</div><div class='add'>+		.nr_segs = 4,</div><div class='add'>+		.segs = (const unsigned int[]) { GSO_TEST_SIZE, GSO_TEST_SIZE, GSO_TEST_SIZE, 3 },</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* commit 3953c46c3ac7 ("sk_buff: allow segmenting based on frag sizes") and</div><div class='add'>+		 * commit 90017accff61 ("sctp: Add GSO support")</div><div class='add'>+		 *</div><div class='add'>+		 * "there will be a cover skb with protocol headers and</div><div class='add'>+		 *  children ones containing the actual segments"</div><div class='add'>+		 */</div><div class='add'>+		.id = GSO_TEST_GSO_BY_FRAGS,</div><div class='add'>+		.name = "gso_by_frags",</div><div class='add'>+		.nr_frag_skbs = 4,</div><div class='add'>+		.frag_skbs = (const unsigned int[]) { 100, 200, 300, 400 },</div><div class='add'>+		.nr_segs = 4,</div><div class='add'>+		.segs = (const unsigned int[]) { 100, 200, 300, 400 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gso_test_case_to_desc(struct gso_test_case *t, char *desc)</div><div class='add'>+{</div><div class='add'>+	sprintf(desc, "%s", t-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM(gso_test, cases, gso_test_case_to_desc);</div><div class='add'>+</div><div class='add'>+static void gso_test_func(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const int shinfo_size = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	struct sk_buff *skb, *segs, *cur, *next, *last;</div><div class='add'>+	const struct gso_test_case *tcase;</div><div class='add'>+	netdev_features_t features;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tcase = test-&gt;param_value;</div><div class='add'>+</div><div class='add'>+	page = alloc_page(GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, page);</div><div class='add'>+	skb = build_skb(page_address(page), sizeof(hdr) + tcase-&gt;linear_len + shinfo_size);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, skb);</div><div class='add'>+	__skb_put(skb, sizeof(hdr) + tcase-&gt;linear_len);</div><div class='add'>+</div><div class='add'>+	__init_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (tcase-&gt;nr_frags) {</div><div class='add'>+		unsigned int pg_off = 0;</div><div class='add'>+</div><div class='add'>+		page = alloc_page(GFP_KERNEL);</div><div class='add'>+		KUNIT_ASSERT_NOT_NULL(test, page);</div><div class='add'>+		page_ref_add(page, tcase-&gt;nr_frags - 1);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tcase-&gt;nr_frags; i++) {</div><div class='add'>+			skb_fill_page_desc(skb, i, page, pg_off, tcase-&gt;frags[i]);</div><div class='add'>+			pg_off += tcase-&gt;frags[i];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		KUNIT_ASSERT_LE(test, pg_off, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		skb-&gt;data_len = pg_off;</div><div class='add'>+		skb-&gt;len += skb-&gt;data_len;</div><div class='add'>+		skb-&gt;truesize += skb-&gt;data_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tcase-&gt;frag_skbs) {</div><div class='add'>+		unsigned int total_size = 0, total_true_size = 0;</div><div class='add'>+		struct sk_buff *frag_skb, *prev = NULL;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tcase-&gt;nr_frag_skbs; i++) {</div><div class='add'>+			unsigned int frag_size;</div><div class='add'>+</div><div class='add'>+			page = alloc_page(GFP_KERNEL);</div><div class='add'>+			KUNIT_ASSERT_NOT_NULL(test, page);</div><div class='add'>+</div><div class='add'>+			frag_size = tcase-&gt;frag_skbs[i];</div><div class='add'>+			frag_skb = build_skb(page_address(page),</div><div class='add'>+					     frag_size + shinfo_size);</div><div class='add'>+			KUNIT_ASSERT_NOT_NULL(test, frag_skb);</div><div class='add'>+			__skb_put(frag_skb, frag_size);</div><div class='add'>+</div><div class='add'>+			if (prev)</div><div class='add'>+				prev-&gt;next = frag_skb;</div><div class='add'>+			else</div><div class='add'>+				skb_shinfo(skb)-&gt;frag_list = frag_skb;</div><div class='add'>+			prev = frag_skb;</div><div class='add'>+</div><div class='add'>+			total_size += frag_size;</div><div class='add'>+			total_true_size += frag_skb-&gt;truesize;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb-&gt;len += total_size;</div><div class='add'>+		skb-&gt;data_len += total_size;</div><div class='add'>+		skb-&gt;truesize += total_true_size;</div><div class='add'>+</div><div class='add'>+		if (tcase-&gt;id == GSO_TEST_GSO_BY_FRAGS)</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_size = GSO_BY_FRAGS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	features = NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='add'>+	if (tcase-&gt;id == GSO_TEST_GSO_PARTIAL)</div><div class='add'>+		features |= NETIF_F_GSO_PARTIAL;</div><div class='add'>+</div><div class='add'>+	/* TODO: this should also work with SG,</div><div class='add'>+	 * rather than hit BUG_ON(i &gt;= nfrags)</div><div class='add'>+	 */</div><div class='add'>+	if (tcase-&gt;id == GSO_TEST_FRAG_LIST_NON_UNIFORM)</div><div class='add'>+		features &amp;= ~NETIF_F_SG;</div><div class='add'>+</div><div class='add'>+	segs = skb_segment(skb, features);</div><div class='add'>+	if (IS_ERR(segs)) {</div><div class='add'>+		KUNIT_FAIL(test, "segs error %pe", segs);</div><div class='add'>+		goto free_gso_skb;</div><div class='add'>+	} else if (!segs) {</div><div class='add'>+		KUNIT_FAIL(test, "no segments");</div><div class='add'>+		goto free_gso_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last = segs-&gt;prev;</div><div class='add'>+	for (cur = segs, i = 0; cur; cur = next, i++) {</div><div class='add'>+		next = cur-&gt;next;</div><div class='add'>+</div><div class='add'>+		KUNIT_ASSERT_EQ(test, cur-&gt;len, sizeof(hdr) + tcase-&gt;segs[i]);</div><div class='add'>+</div><div class='add'>+		/* segs have skb-&gt;data pointing to the mac header */</div><div class='add'>+		KUNIT_ASSERT_PTR_EQ(test, skb_mac_header(cur), cur-&gt;data);</div><div class='add'>+		KUNIT_ASSERT_PTR_EQ(test, skb_network_header(cur), cur-&gt;data + sizeof(hdr));</div><div class='add'>+</div><div class='add'>+		/* header was copied to all segs */</div><div class='add'>+		KUNIT_ASSERT_EQ(test, memcmp(skb_mac_header(cur), hdr, sizeof(hdr)), 0);</div><div class='add'>+</div><div class='add'>+		/* last seg can be found through segs-&gt;prev pointer */</div><div class='add'>+		if (!next)</div><div class='add'>+			KUNIT_ASSERT_PTR_EQ(test, cur, last);</div><div class='add'>+</div><div class='add'>+		consume_skb(cur);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, i, tcase-&gt;nr_segs);</div><div class='add'>+</div><div class='add'>+free_gso_skb:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* IP tunnel flags */</div><div class='add'>+</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='add'>+</div><div class='add'>+struct ip_tunnel_flags_test {</div><div class='add'>+	const char	*name;</div><div class='add'>+</div><div class='add'>+	const u16	*src_bits;</div><div class='add'>+	const u16	*exp_bits;</div><div class='add'>+	u8		src_num;</div><div class='add'>+	u8		exp_num;</div><div class='add'>+</div><div class='add'>+	__be16		exp_val;</div><div class='add'>+	bool		exp_comp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IP_TUNNEL_FLAGS_TEST(n, src, comp, eval, exp) {	\</div><div class='add'>+	.name		= (n),				\</div><div class='add'>+	.src_bits	= (src),			\</div><div class='add'>+	.src_num	= ARRAY_SIZE(src),		\</div><div class='add'>+	.exp_comp	= (comp),			\</div><div class='add'>+	.exp_val	= (eval),			\</div><div class='add'>+	.exp_bits	= (exp),			\</div><div class='add'>+	.exp_num	= ARRAY_SIZE(exp),		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These are __be16-compatible and can be compared as is */</div><div class='add'>+static const u16 ip_tunnel_flags_1[] = {</div><div class='add'>+	IP_TUNNEL_KEY_BIT,</div><div class='add'>+	IP_TUNNEL_STRICT_BIT,</div><div class='add'>+	IP_TUNNEL_ERSPAN_OPT_BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Due to the previous flags design limitation, setting either</div><div class='add'>+ * ``IP_TUNNEL_CSUM_BIT`` (on Big Endian) or ``IP_TUNNEL_DONT_FRAGMENT_BIT``</div><div class='add'>+ * (on Little) also sets VTI/ISATAP bit. In the bitmap implementation, they</div><div class='add'>+ * correspond to ``BIT(16)``, which is bigger than ``U16_MAX``, but still is</div><div class='add'>+ * backward-compatible.</div><div class='add'>+ */</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+#define IP_TUNNEL_CONFLICT_BIT	IP_TUNNEL_DONT_FRAGMENT_BIT</div><div class='add'>+#else</div><div class='add'>+#define IP_TUNNEL_CONFLICT_BIT	IP_TUNNEL_CSUM_BIT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const u16 ip_tunnel_flags_2_src[] = {</div><div class='add'>+	IP_TUNNEL_CONFLICT_BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ip_tunnel_flags_2_exp[] = {</div><div class='add'>+	IP_TUNNEL_CONFLICT_BIT,</div><div class='add'>+	IP_TUNNEL_SIT_ISATAP_BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Bits 17 and higher are not compatible with __be16 flags */</div><div class='add'>+static const u16 ip_tunnel_flags_3_src[] = {</div><div class='add'>+	IP_TUNNEL_VXLAN_OPT_BIT,</div><div class='add'>+	17,</div><div class='add'>+	18,</div><div class='add'>+	20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ip_tunnel_flags_3_exp[] = {</div><div class='add'>+	IP_TUNNEL_VXLAN_OPT_BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ip_tunnel_flags_test ip_tunnel_flags_test[] = {</div><div class='add'>+	IP_TUNNEL_FLAGS_TEST("compat", ip_tunnel_flags_1, true,</div><div class='add'>+			     cpu_to_be16(BIT(IP_TUNNEL_KEY_BIT) |</div><div class='add'>+					 BIT(IP_TUNNEL_STRICT_BIT) |</div><div class='add'>+					 BIT(IP_TUNNEL_ERSPAN_OPT_BIT)),</div><div class='add'>+			     ip_tunnel_flags_1),</div><div class='add'>+	IP_TUNNEL_FLAGS_TEST("conflict", ip_tunnel_flags_2_src, true,</div><div class='add'>+			     VTI_ISVTI, ip_tunnel_flags_2_exp),</div><div class='add'>+	IP_TUNNEL_FLAGS_TEST("new", ip_tunnel_flags_3_src, false,</div><div class='add'>+			     cpu_to_be16(BIT(IP_TUNNEL_VXLAN_OPT_BIT)),</div><div class='add'>+			     ip_tunnel_flags_3_exp),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ip_tunnel_flags_test_case_to_desc(const struct ip_tunnel_flags_test *t,</div><div class='add'>+				  char *desc)</div><div class='add'>+{</div><div class='add'>+	strscpy(desc, t-&gt;name, KUNIT_PARAM_DESC_SIZE);</div><div class='add'>+}</div><div class='add'>+KUNIT_ARRAY_PARAM(ip_tunnel_flags_test, ip_tunnel_flags_test,</div><div class='add'>+		  ip_tunnel_flags_test_case_to_desc);</div><div class='add'>+</div><div class='add'>+static void ip_tunnel_flags_test_run(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct ip_tunnel_flags_test *t = test-&gt;param_value;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(src) = { };</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(exp) = { };</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(out);</div><div class='add'>+</div><div class='add'>+	for (u32 j = 0; j &lt; t-&gt;src_num; j++)</div><div class='add'>+		__set_bit(t-&gt;src_bits[j], src);</div><div class='add'>+	for (u32 j = 0; j &lt; t-&gt;exp_num; j++)</div><div class='add'>+		__set_bit(t-&gt;exp_bits[j], exp);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, t-&gt;exp_comp,</div><div class='add'>+			ip_tunnel_flags_is_be16_compat(src));</div><div class='add'>+	KUNIT_ASSERT_EQ(test, (__force u16)t-&gt;exp_val,</div><div class='add'>+			(__force u16)ip_tunnel_flags_to_be16(src));</div><div class='add'>+</div><div class='add'>+	ip_tunnel_flags_from_be16(out, t-&gt;exp_val);</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, __ipt_flag_op(bitmap_equal, exp, out));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case net_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(gso_test_func, gso_test_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(ip_tunnel_flags_test_run,</div><div class='add'>+			 ip_tunnel_flags_test_gen_params),</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite net_test_suite = {</div><div class='add'>+	.name		= "net_core",</div><div class='add'>+	.test_cases	= net_test_cases,</div><div class='add'>+};</div><div class='add'>+kunit_test_suite(net_test_suite);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for networking core");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c<br/>index 5e4f04004a49..dff66d8fb325 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/netclassid_cgroup.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netclassid_cgroup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netclassid_cgroup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netclassid_cgroup.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/netclassid_cgroup.c	Classid Cgroupfs Handling</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -25,7 +21,9 @@ static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state</div><div class='ctx'> struct cgroup_cls_state *task_cls_state(struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> 	return css_cls_state(task_css_check(p, net_cls_cgrp_id,</div><div class='del'>-					    rcu_read_lock_bh_held()));</div><div class='add'>+					    rcu_read_lock_held() ||</div><div class='add'>+					    rcu_read_lock_bh_held() ||</div><div class='add'>+					    rcu_read_lock_trace_held()));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(task_cls_state);</div><div class='ctx'> </div><div class='hunk'>@@ -57,30 +55,62 @@ static void cgrp_css_free(struct cgroup_subsys_state *css)</div><div class='ctx'> 	kfree(css_cls_state(css));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int update_classid_sock(const void *v, struct file *file, unsigned n)</div><div class='add'>+/*</div><div class='add'>+ * To avoid freezing of sockets creation for tasks with big number of threads</div><div class='add'>+ * and opened sockets lets release file_lock every 1000 iterated descriptors.</div><div class='add'>+ * New sockets will already have been created with new classid.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct update_classid_context {</div><div class='add'>+	u32 classid;</div><div class='add'>+	unsigned int batch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UPDATE_CLASSID_BATCH 1000</div><div class='add'>+</div><div class='add'>+static int update_classid_sock(const void *v, struct file *file, unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct socket *sock = sock_from_file(file, &amp;err);</div><div class='del'>-</div><div class='del'>-	if (sock) {</div><div class='del'>-		spin_lock(&amp;cgroup_sk_update_lock);</div><div class='del'>-		sock_cgroup_set_classid(&amp;sock-&gt;sk-&gt;sk_cgrp_data,</div><div class='del'>-					(unsigned long)v);</div><div class='del'>-		spin_unlock(&amp;cgroup_sk_update_lock);</div><div class='add'>+	struct update_classid_context *ctx = (void *)v;</div><div class='add'>+	struct socket *sock = sock_from_file(file);</div><div class='add'>+</div><div class='add'>+	if (sock)</div><div class='add'>+		sock_cgroup_set_classid(&amp;sock-&gt;sk-&gt;sk_cgrp_data, ctx-&gt;classid);</div><div class='add'>+	if (--ctx-&gt;batch == 0) {</div><div class='add'>+		ctx-&gt;batch = UPDATE_CLASSID_BATCH;</div><div class='add'>+		return n + 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void update_classid_task(struct task_struct *p, u32 classid)</div><div class='add'>+{</div><div class='add'>+	struct update_classid_context ctx = {</div><div class='add'>+		.classid = classid,</div><div class='add'>+		.batch = UPDATE_CLASSID_BATCH</div><div class='add'>+	};</div><div class='add'>+	unsigned int fd = 0;</div><div class='add'>+</div><div class='add'>+	/* Only update the leader task, when many threads in this task,</div><div class='add'>+	 * so it can avoid the useless traversal.</div><div class='add'>+	 */</div><div class='add'>+	if (p != p-&gt;group_leader)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		task_lock(p);</div><div class='add'>+		fd = iterate_fd(p-&gt;files, fd, update_classid_sock, &amp;ctx);</div><div class='add'>+		task_unlock(p);</div><div class='add'>+		cond_resched();</div><div class='add'>+	} while (fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cgrp_attach(struct cgroup_taskset *tset)</div><div class='ctx'> {</div><div class='ctx'> 	struct cgroup_subsys_state *css;</div><div class='ctx'> 	struct task_struct *p;</div><div class='ctx'> </div><div class='ctx'> 	cgroup_taskset_for_each(p, css, tset) {</div><div class='del'>-		task_lock(p);</div><div class='del'>-		iterate_fd(p-&gt;files, 0, update_classid_sock,</div><div class='del'>-			   (void *)(unsigned long)css_cls_state(css)-&gt;classid);</div><div class='del'>-		task_unlock(p);</div><div class='add'>+		update_classid_task(p, css_cls_state(css)-&gt;classid);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -96,17 +126,11 @@ static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft,</div><div class='ctx'> 	struct css_task_iter it;</div><div class='ctx'> 	struct task_struct *p;</div><div class='ctx'> </div><div class='del'>-	cgroup_sk_alloc_disable();</div><div class='del'>-</div><div class='ctx'> 	cs-&gt;classid = (u32)value;</div><div class='ctx'> </div><div class='ctx'> 	css_task_iter_start(css, 0, &amp;it);</div><div class='del'>-	while ((p = css_task_iter_next(&amp;it))) {</div><div class='del'>-		task_lock(p);</div><div class='del'>-		iterate_fd(p-&gt;files, 0, update_classid_sock,</div><div class='del'>-			   (void *)(unsigned long)cs-&gt;classid);</div><div class='del'>-		task_unlock(p);</div><div class='del'>-	}</div><div class='add'>+	while ((p = css_task_iter_next(&amp;it)))</div><div class='add'>+		update_classid_task(p, cs-&gt;classid);</div><div class='ctx'> 	css_task_iter_end(&amp;it);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/core/netdev-genl-gen.c b/net/core/netdev-genl-gen.c<br/>new file mode 100644<br/>index 000000000000..ba673e81716f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netdev-genl-gen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netdev-genl-gen.c</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/netdev.yaml */</div><div class='add'>+/* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netdev-genl-gen.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/netdev.h&gt;</div><div class='add'>+#include &lt;net/netdev_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+/* Integer value ranges */</div><div class='add'>+static const struct netlink_range_validation netdev_a_page_pool_id_range = {</div><div class='add'>+	.min	= 1ULL,</div><div class='add'>+	.max	= U32_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct netlink_range_validation netdev_a_page_pool_ifindex_range = {</div><div class='add'>+	.min	= 1ULL,</div><div class='add'>+	.max	= S32_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct netlink_range_validation netdev_a_napi_defer_hard_irqs_range = {</div><div class='add'>+	.max	= S32_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Common nested types */</div><div class='add'>+const struct nla_policy netdev_page_pool_info_nl_policy[NETDEV_A_PAGE_POOL_IFINDEX + 1] = {</div><div class='add'>+	[NETDEV_A_PAGE_POOL_ID] = NLA_POLICY_FULL_RANGE(NLA_UINT, &amp;netdev_a_page_pool_id_range),</div><div class='add'>+	[NETDEV_A_PAGE_POOL_IFINDEX] = NLA_POLICY_FULL_RANGE(NLA_U32, &amp;netdev_a_page_pool_ifindex_range),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy netdev_queue_id_nl_policy[NETDEV_A_QUEUE_TYPE + 1] = {</div><div class='add'>+	[NETDEV_A_QUEUE_ID] = { .type = NLA_U32, },</div><div class='add'>+	[NETDEV_A_QUEUE_TYPE] = NLA_POLICY_MAX(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_DEV_GET - do */</div><div class='add'>+static const struct nla_policy netdev_dev_get_nl_policy[NETDEV_A_DEV_IFINDEX + 1] = {</div><div class='add'>+	[NETDEV_A_DEV_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_PAGE_POOL_GET - do */</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+static const struct nla_policy netdev_page_pool_get_nl_policy[NETDEV_A_PAGE_POOL_ID + 1] = {</div><div class='add'>+	[NETDEV_A_PAGE_POOL_ID] = NLA_POLICY_FULL_RANGE(NLA_UINT, &amp;netdev_a_page_pool_id_range),</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_PAGE_POOL */</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_PAGE_POOL_STATS_GET - do */</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+static const struct nla_policy netdev_page_pool_stats_get_nl_policy[NETDEV_A_PAGE_POOL_STATS_INFO + 1] = {</div><div class='add'>+	[NETDEV_A_PAGE_POOL_STATS_INFO] = NLA_POLICY_NESTED(netdev_page_pool_info_nl_policy),</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_PAGE_POOL_STATS */</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_QUEUE_GET - do */</div><div class='add'>+static const struct nla_policy netdev_queue_get_do_nl_policy[NETDEV_A_QUEUE_TYPE + 1] = {</div><div class='add'>+	[NETDEV_A_QUEUE_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[NETDEV_A_QUEUE_TYPE] = NLA_POLICY_MAX(NLA_U32, 1),</div><div class='add'>+	[NETDEV_A_QUEUE_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_QUEUE_GET - dump */</div><div class='add'>+static const struct nla_policy netdev_queue_get_dump_nl_policy[NETDEV_A_QUEUE_IFINDEX + 1] = {</div><div class='add'>+	[NETDEV_A_QUEUE_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_NAPI_GET - do */</div><div class='add'>+static const struct nla_policy netdev_napi_get_do_nl_policy[NETDEV_A_NAPI_ID + 1] = {</div><div class='add'>+	[NETDEV_A_NAPI_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_NAPI_GET - dump */</div><div class='add'>+static const struct nla_policy netdev_napi_get_dump_nl_policy[NETDEV_A_NAPI_IFINDEX + 1] = {</div><div class='add'>+	[NETDEV_A_NAPI_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_QSTATS_GET - dump */</div><div class='add'>+static const struct nla_policy netdev_qstats_get_nl_policy[NETDEV_A_QSTATS_SCOPE + 1] = {</div><div class='add'>+	[NETDEV_A_QSTATS_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[NETDEV_A_QSTATS_SCOPE] = NLA_POLICY_MASK(NLA_UINT, 0x1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_BIND_RX - do */</div><div class='add'>+static const struct nla_policy netdev_bind_rx_nl_policy[NETDEV_A_DMABUF_FD + 1] = {</div><div class='add'>+	[NETDEV_A_DMABUF_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[NETDEV_A_DMABUF_FD] = { .type = NLA_U32, },</div><div class='add'>+	[NETDEV_A_DMABUF_QUEUES] = NLA_POLICY_NESTED(netdev_queue_id_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_NAPI_SET - do */</div><div class='add'>+static const struct nla_policy netdev_napi_set_nl_policy[NETDEV_A_NAPI_THREADED + 1] = {</div><div class='add'>+	[NETDEV_A_NAPI_ID] = { .type = NLA_U32, },</div><div class='add'>+	[NETDEV_A_NAPI_DEFER_HARD_IRQS] = NLA_POLICY_FULL_RANGE(NLA_U32, &amp;netdev_a_napi_defer_hard_irqs_range),</div><div class='add'>+	[NETDEV_A_NAPI_GRO_FLUSH_TIMEOUT] = { .type = NLA_UINT, },</div><div class='add'>+	[NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT] = { .type = NLA_UINT, },</div><div class='add'>+	[NETDEV_A_NAPI_THREADED] = NLA_POLICY_MAX(NLA_U32, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NETDEV_CMD_BIND_TX - do */</div><div class='add'>+static const struct nla_policy netdev_bind_tx_nl_policy[NETDEV_A_DMABUF_FD + 1] = {</div><div class='add'>+	[NETDEV_A_DMABUF_IFINDEX] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[NETDEV_A_DMABUF_FD] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ops table for netdev */</div><div class='add'>+static const struct genl_split_ops netdev_nl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_DEV_GET,</div><div class='add'>+		.doit		= netdev_nl_dev_get_doit,</div><div class='add'>+		.policy		= netdev_dev_get_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_DEV_IFINDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NETDEV_CMD_DEV_GET,</div><div class='add'>+		.dumpit	= netdev_nl_dev_get_dumpit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_PAGE_POOL_GET,</div><div class='add'>+		.doit		= netdev_nl_page_pool_get_doit,</div><div class='add'>+		.policy		= netdev_page_pool_get_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_PAGE_POOL_ID,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NETDEV_CMD_PAGE_POOL_GET,</div><div class='add'>+		.dumpit	= netdev_nl_page_pool_get_dumpit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+#endif /* CONFIG_PAGE_POOL */</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_PAGE_POOL_STATS_GET,</div><div class='add'>+		.doit		= netdev_nl_page_pool_stats_get_doit,</div><div class='add'>+		.policy		= netdev_page_pool_stats_get_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_PAGE_POOL_STATS_INFO,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NETDEV_CMD_PAGE_POOL_STATS_GET,</div><div class='add'>+		.dumpit	= netdev_nl_page_pool_stats_get_dumpit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+#endif /* CONFIG_PAGE_POOL_STATS */</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_QUEUE_GET,</div><div class='add'>+		.doit		= netdev_nl_queue_get_doit,</div><div class='add'>+		.policy		= netdev_queue_get_do_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_QUEUE_TYPE,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_QUEUE_GET,</div><div class='add'>+		.dumpit		= netdev_nl_queue_get_dumpit,</div><div class='add'>+		.policy		= netdev_queue_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_QUEUE_IFINDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_NAPI_GET,</div><div class='add'>+		.doit		= netdev_nl_napi_get_doit,</div><div class='add'>+		.policy		= netdev_napi_get_do_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_NAPI_ID,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_NAPI_GET,</div><div class='add'>+		.dumpit		= netdev_nl_napi_get_dumpit,</div><div class='add'>+		.policy		= netdev_napi_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_NAPI_IFINDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_QSTATS_GET,</div><div class='add'>+		.dumpit		= netdev_nl_qstats_get_dumpit,</div><div class='add'>+		.policy		= netdev_qstats_get_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_QSTATS_SCOPE,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_BIND_RX,</div><div class='add'>+		.doit		= netdev_nl_bind_rx_doit,</div><div class='add'>+		.policy		= netdev_bind_rx_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_DMABUF_FD,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_NAPI_SET,</div><div class='add'>+		.doit		= netdev_nl_napi_set_doit,</div><div class='add'>+		.policy		= netdev_napi_set_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_NAPI_THREADED,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NETDEV_CMD_BIND_TX,</div><div class='add'>+		.doit		= netdev_nl_bind_tx_doit,</div><div class='add'>+		.policy		= netdev_bind_tx_nl_policy,</div><div class='add'>+		.maxattr	= NETDEV_A_DMABUF_FD,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct genl_multicast_group netdev_nl_mcgrps[] = {</div><div class='add'>+	[NETDEV_NLGRP_MGMT] = { "mgmt", },</div><div class='add'>+	[NETDEV_NLGRP_PAGE_POOL] = { "page-pool", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __netdev_nl_sock_priv_init(void *priv)</div><div class='add'>+{</div><div class='add'>+	netdev_nl_sock_priv_init(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __netdev_nl_sock_priv_destroy(void *priv)</div><div class='add'>+{</div><div class='add'>+	netdev_nl_sock_priv_destroy(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct genl_family netdev_nl_family __ro_after_init = {</div><div class='add'>+	.name		= NETDEV_FAMILY_NAME,</div><div class='add'>+	.version	= NETDEV_FAMILY_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='add'>+	.split_ops	= netdev_nl_ops,</div><div class='add'>+	.n_split_ops	= ARRAY_SIZE(netdev_nl_ops),</div><div class='add'>+	.mcgrps		= netdev_nl_mcgrps,</div><div class='add'>+	.n_mcgrps	= ARRAY_SIZE(netdev_nl_mcgrps),</div><div class='add'>+	.sock_priv_size	= sizeof(struct netdev_nl_sock),</div><div class='add'>+	.sock_priv_init	= __netdev_nl_sock_priv_init,</div><div class='add'>+	.sock_priv_destroy = __netdev_nl_sock_priv_destroy,</div><div class='add'>+};</div><div class='head'>diff --git a/net/core/netdev-genl-gen.h b/net/core/netdev-genl-gen.h<br/>new file mode 100644<br/>index 000000000000..cffc08517a41<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netdev-genl-gen.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netdev-genl-gen.h</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/netdev.yaml */</div><div class='add'>+/* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_NETDEV_GEN_H</div><div class='add'>+#define _LINUX_NETDEV_GEN_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/netdev.h&gt;</div><div class='add'>+#include &lt;net/netdev_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+/* Common nested types */</div><div class='add'>+extern const struct nla_policy netdev_page_pool_info_nl_policy[NETDEV_A_PAGE_POOL_IFINDEX + 1];</div><div class='add'>+extern const struct nla_policy netdev_queue_id_nl_policy[NETDEV_A_QUEUE_TYPE + 1];</div><div class='add'>+</div><div class='add'>+int netdev_nl_dev_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_dev_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_page_pool_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_page_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_page_pool_stats_get_doit(struct sk_buff *skb,</div><div class='add'>+				       struct genl_info *info);</div><div class='add'>+int netdev_nl_page_pool_stats_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					 struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_queue_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_queue_get_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_napi_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_qstats_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb);</div><div class='add'>+int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NETDEV_NLGRP_MGMT,</div><div class='add'>+	NETDEV_NLGRP_PAGE_POOL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct genl_family netdev_nl_family;</div><div class='add'>+</div><div class='add'>+void netdev_nl_sock_priv_init(struct netdev_nl_sock *priv);</div><div class='add'>+void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NETDEV_GEN_H */</div><div class='head'>diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c<br/>new file mode 100644<br/>index 000000000000..470fabbeacd9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netdev-genl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netdev-genl.c</a></div><div class='hunk'>@@ -0,0 +1,1203 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+#include "devmem.h"</div><div class='add'>+#include "netdev-genl-gen.h"</div><div class='add'>+</div><div class='add'>+struct netdev_nl_dump_ctx {</div><div class='add'>+	unsigned long	ifindex;</div><div class='add'>+	unsigned int	rxq_idx;</div><div class='add'>+	unsigned int	txq_idx;</div><div class='add'>+	unsigned int	napi_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netdev_nl_dump_ctx *netdev_dump_ctx(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	NL_ASSERT_CTX_FITS(struct netdev_nl_dump_ctx);</div><div class='add'>+</div><div class='add'>+	return (struct netdev_nl_dump_ctx *)cb-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_dev_fill(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+		   const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u64 xsk_features = 0;</div><div class='add'>+	u64 xdp_rx_meta = 0;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked(netdev); /* note: rtnl_lock may not be held! */</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+#define XDP_METADATA_KFUNC(_, flag, __, xmo) \</div><div class='add'>+	if (netdev-&gt;xdp_metadata_ops &amp;&amp; netdev-&gt;xdp_metadata_ops-&gt;xmo) \</div><div class='add'>+		xdp_rx_meta |= flag;</div><div class='add'>+XDP_METADATA_KFUNC_xxx</div><div class='add'>+#undef XDP_METADATA_KFUNC</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;xsk_tx_metadata_ops) {</div><div class='add'>+		if (netdev-&gt;xsk_tx_metadata_ops-&gt;tmo_fill_timestamp)</div><div class='add'>+			xsk_features |= NETDEV_XSK_FLAGS_TX_TIMESTAMP;</div><div class='add'>+		if (netdev-&gt;xsk_tx_metadata_ops-&gt;tmo_request_checksum)</div><div class='add'>+			xsk_features |= NETDEV_XSK_FLAGS_TX_CHECKSUM;</div><div class='add'>+		if (netdev-&gt;xsk_tx_metadata_ops-&gt;tmo_request_launch_time)</div><div class='add'>+			xsk_features |= NETDEV_XSK_FLAGS_TX_LAUNCH_TIME_FIFO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_DEV_IFINDEX, netdev-&gt;ifindex) ||</div><div class='add'>+	    nla_put_u64_64bit(rsp, NETDEV_A_DEV_XDP_FEATURES,</div><div class='add'>+			      netdev-&gt;xdp_features, NETDEV_A_DEV_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(rsp, NETDEV_A_DEV_XDP_RX_METADATA_FEATURES,</div><div class='add'>+			      xdp_rx_meta, NETDEV_A_DEV_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(rsp, NETDEV_A_DEV_XSK_FEATURES,</div><div class='add'>+			      xsk_features, NETDEV_A_DEV_PAD))</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;xdp_features &amp; NETDEV_XDP_ACT_XSK_ZEROCOPY) {</div><div class='add'>+		if (nla_put_u32(rsp, NETDEV_A_DEV_XDP_ZC_MAX_SEGS,</div><div class='add'>+				netdev-&gt;xdp_zc_max_segs))</div><div class='add'>+			goto err_cancel_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_msg:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netdev_genl_dev_notify(struct net_device *netdev, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct genl_info info;</div><div class='add'>+	struct sk_buff *ntf;</div><div class='add'>+</div><div class='add'>+	if (!genl_has_listeners(&amp;netdev_nl_family, dev_net(netdev),</div><div class='add'>+				NETDEV_NLGRP_MGMT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	genl_info_init_ntf(&amp;info, &amp;netdev_nl_family, cmd);</div><div class='add'>+</div><div class='add'>+	ntf = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!ntf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (netdev_nl_dev_fill(netdev, ntf, &amp;info)) {</div><div class='add'>+		nlmsg_free(ntf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast_netns(&amp;netdev_nl_family, dev_net(netdev), ntf,</div><div class='add'>+				0, NETDEV_NLGRP_MGMT, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_dev_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	u32 ifindex;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_DEV_IFINDEX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_DEV_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	netdev = netdev_get_by_index_lock(genl_info_net(info), ifindex);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_nl_dev_fill(netdev, rsp, info);</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rsp, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_dev_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nl_dump_ctx *ctx = netdev_dump_ctx(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for_each_netdev_lock_scoped(net, netdev, ctx-&gt;ifindex) {</div><div class='add'>+		err = netdev_nl_dev_fill(netdev, skb, genl_info_dump(cb));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_napi_fill_one(struct sk_buff *rsp, struct napi_struct *napi,</div><div class='add'>+			const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_suspend_timeout;</div><div class='add'>+	unsigned long gro_flush_timeout;</div><div class='add'>+	u32 napi_defer_hard_irqs;</div><div class='add'>+	void *hdr;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	if (!napi-&gt;dev-&gt;up)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_NAPI_ID, napi-&gt;napi_id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_NAPI_IFINDEX, napi-&gt;dev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;irq &gt;= 0 &amp;&amp; nla_put_u32(rsp, NETDEV_A_NAPI_IRQ, napi-&gt;irq))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_NAPI_THREADED,</div><div class='add'>+			 napi_get_threaded(napi)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (napi-&gt;thread) {</div><div class='add'>+		pid = task_pid_nr(napi-&gt;thread);</div><div class='add'>+		if (nla_put_u32(rsp, NETDEV_A_NAPI_PID, pid))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	napi_defer_hard_irqs = napi_get_defer_hard_irqs(napi);</div><div class='add'>+	if (nla_put_s32(rsp, NETDEV_A_NAPI_DEFER_HARD_IRQS,</div><div class='add'>+			napi_defer_hard_irqs))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	irq_suspend_timeout = napi_get_irq_suspend_timeout(napi);</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT,</div><div class='add'>+			 irq_suspend_timeout))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	gro_flush_timeout = napi_get_gro_flush_timeout(napi);</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_NAPI_GRO_FLUSH_TIMEOUT,</div><div class='add'>+			 gro_flush_timeout))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	u32 napi_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_NAPI_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	napi_id = nla_get_u32(info-&gt;attrs[NETDEV_A_NAPI_ID]);</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	napi = netdev_napi_by_id_lock(genl_info_net(info), napi_id);</div><div class='add'>+	if (napi) {</div><div class='add'>+		err = netdev_nl_napi_fill_one(rsp, napi, info);</div><div class='add'>+		netdev_unlock(napi-&gt;dev);</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, info-&gt;attrs[NETDEV_A_NAPI_ID]);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	} else if (!rsp-&gt;len) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rsp, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_napi_dump_one(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+			const struct genl_info *info,</div><div class='add'>+			struct netdev_nl_dump_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	unsigned int prev_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!netdev-&gt;up)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	prev_id = UINT_MAX;</div><div class='add'>+	list_for_each_entry(napi, &amp;netdev-&gt;napi_list, dev_list) {</div><div class='add'>+		if (!napi_id_valid(napi-&gt;napi_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Dump continuation below depends on the list being sorted */</div><div class='add'>+		WARN_ON_ONCE(napi-&gt;napi_id &gt;= prev_id);</div><div class='add'>+		prev_id = napi-&gt;napi_id;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;napi_id &amp;&amp; napi-&gt;napi_id &gt;= ctx-&gt;napi_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = netdev_nl_napi_fill_one(rsp, napi, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		ctx-&gt;napi_id = napi-&gt;napi_id;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_napi_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nl_dump_ctx *ctx = netdev_dump_ctx(cb);</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	u32 ifindex = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_NAPI_IFINDEX])</div><div class='add'>+		ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_NAPI_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	if (ifindex) {</div><div class='add'>+		netdev = netdev_get_by_index_lock(net, ifindex);</div><div class='add'>+		if (netdev) {</div><div class='add'>+			err = netdev_nl_napi_dump_one(netdev, skb, info, ctx);</div><div class='add'>+			netdev_unlock(netdev);</div><div class='add'>+		} else {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for_each_netdev_lock_scoped(net, netdev, ctx-&gt;ifindex) {</div><div class='add'>+			err = netdev_nl_napi_dump_one(netdev, skb, info, ctx);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+			ctx-&gt;napi_id = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_napi_set_config(struct napi_struct *napi, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u64 irq_suspend_timeout = 0;</div><div class='add'>+	u64 gro_flush_timeout = 0;</div><div class='add'>+	u8 threaded = 0;</div><div class='add'>+	u32 defer = 0;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_NAPI_THREADED]) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		threaded = nla_get_uint(info-&gt;attrs[NETDEV_A_NAPI_THREADED]);</div><div class='add'>+		ret = napi_set_threaded(napi, threaded);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_NAPI_DEFER_HARD_IRQS]) {</div><div class='add'>+		defer = nla_get_u32(info-&gt;attrs[NETDEV_A_NAPI_DEFER_HARD_IRQS]);</div><div class='add'>+		napi_set_defer_hard_irqs(napi, defer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT]) {</div><div class='add'>+		irq_suspend_timeout = nla_get_uint(info-&gt;attrs[NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT]);</div><div class='add'>+		napi_set_irq_suspend_timeout(napi, irq_suspend_timeout);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_NAPI_GRO_FLUSH_TIMEOUT]) {</div><div class='add'>+		gro_flush_timeout = nla_get_uint(info-&gt;attrs[NETDEV_A_NAPI_GRO_FLUSH_TIMEOUT]);</div><div class='add'>+		napi_set_gro_flush_timeout(napi, gro_flush_timeout);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	unsigned int napi_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_NAPI_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	napi_id = nla_get_u32(info-&gt;attrs[NETDEV_A_NAPI_ID]);</div><div class='add'>+</div><div class='add'>+	napi = netdev_napi_by_id_lock(genl_info_net(info), napi_id);</div><div class='add'>+	if (napi) {</div><div class='add'>+		err = netdev_nl_napi_set_config(napi, info);</div><div class='add'>+		netdev_unlock(napi-&gt;dev);</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, info-&gt;attrs[NETDEV_A_NAPI_ID]);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_napi_id(struct sk_buff *skb, const struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	if (napi &amp;&amp; napi_id_valid(napi-&gt;napi_id))</div><div class='add'>+		return nla_put_u32(skb, NETDEV_A_QUEUE_NAPI_ID, napi-&gt;napi_id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,</div><div class='add'>+			 u32 q_idx, u32 q_type, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct pp_memory_provider_params *params;</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_QUEUE_ID, q_idx) ||</div><div class='add'>+	    nla_put_u32(rsp, NETDEV_A_QUEUE_TYPE, q_type) ||</div><div class='add'>+	    nla_put_u32(rsp, NETDEV_A_QUEUE_IFINDEX, netdev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	switch (q_type) {</div><div class='add'>+	case NETDEV_QUEUE_TYPE_RX:</div><div class='add'>+		rxq = __netif_get_rx_queue(netdev, q_idx);</div><div class='add'>+		if (nla_put_napi_id(rsp, rxq-&gt;napi))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		params = &amp;rxq-&gt;mp_params;</div><div class='add'>+		if (params-&gt;mp_ops &amp;&amp;</div><div class='add'>+		    params-&gt;mp_ops-&gt;nl_fill(params-&gt;mp_priv, rsp, rxq))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+#ifdef CONFIG_XDP_SOCKETS</div><div class='add'>+		if (rxq-&gt;pool)</div><div class='add'>+			if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_QUEUE_TYPE_TX:</div><div class='add'>+		txq = netdev_get_tx_queue(netdev, q_idx);</div><div class='add'>+		if (nla_put_napi_id(rsp, txq-&gt;napi))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+#ifdef CONFIG_XDP_SOCKETS</div><div class='add'>+		if (txq-&gt;pool)</div><div class='add'>+			if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_nl_queue_validate(struct net_device *netdev, u32 q_id,</div><div class='add'>+				    u32 q_type)</div><div class='add'>+{</div><div class='add'>+	switch (q_type) {</div><div class='add'>+	case NETDEV_QUEUE_TYPE_RX:</div><div class='add'>+		if (q_id &gt;= netdev-&gt;real_num_rx_queues)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return 0;</div><div class='add'>+	case NETDEV_QUEUE_TYPE_TX:</div><div class='add'>+		if (q_id &gt;= netdev-&gt;real_num_tx_queues)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_queue_fill(struct sk_buff *rsp, struct net_device *netdev, u32 q_idx,</div><div class='add'>+		     u32 q_type, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!netdev-&gt;up)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = netdev_nl_queue_validate(netdev, q_idx, q_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return netdev_nl_queue_fill_one(rsp, netdev, q_idx, q_type, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_queue_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 q_id, q_type, ifindex;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_QUEUE_ID) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, NETDEV_A_QUEUE_TYPE) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, NETDEV_A_QUEUE_IFINDEX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q_id = nla_get_u32(info-&gt;attrs[NETDEV_A_QUEUE_ID]);</div><div class='add'>+	q_type = nla_get_u32(info-&gt;attrs[NETDEV_A_QUEUE_TYPE]);</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_QUEUE_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	netdev = netdev_get_by_index_lock_ops_compat(genl_info_net(info),</div><div class='add'>+						     ifindex);</div><div class='add'>+	if (netdev) {</div><div class='add'>+		err = netdev_nl_queue_fill(rsp, netdev, q_id, q_type, info);</div><div class='add'>+		netdev_unlock_ops_compat(netdev);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rsp, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_queue_dump_one(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+			 const struct genl_info *info,</div><div class='add'>+			 struct netdev_nl_dump_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!netdev-&gt;up)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (; ctx-&gt;rxq_idx &lt; netdev-&gt;real_num_rx_queues; ctx-&gt;rxq_idx++) {</div><div class='add'>+		err = netdev_nl_queue_fill_one(rsp, netdev, ctx-&gt;rxq_idx,</div><div class='add'>+					       NETDEV_QUEUE_TYPE_RX, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (; ctx-&gt;txq_idx &lt; netdev-&gt;real_num_tx_queues; ctx-&gt;txq_idx++) {</div><div class='add'>+		err = netdev_nl_queue_fill_one(rsp, netdev, ctx-&gt;txq_idx,</div><div class='add'>+					       NETDEV_QUEUE_TYPE_TX, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_queue_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nl_dump_ctx *ctx = netdev_dump_ctx(cb);</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	u32 ifindex = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_QUEUE_IFINDEX])</div><div class='add'>+		ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_QUEUE_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	if (ifindex) {</div><div class='add'>+		netdev = netdev_get_by_index_lock_ops_compat(net, ifindex);</div><div class='add'>+		if (netdev) {</div><div class='add'>+			err = netdev_nl_queue_dump_one(netdev, skb, info, ctx);</div><div class='add'>+			netdev_unlock_ops_compat(netdev);</div><div class='add'>+		} else {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for_each_netdev_lock_ops_compat_scoped(net, netdev,</div><div class='add'>+						       ctx-&gt;ifindex) {</div><div class='add'>+			err = netdev_nl_queue_dump_one(netdev, skb, info, ctx);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+			ctx-&gt;rxq_idx = 0;</div><div class='add'>+			ctx-&gt;txq_idx = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NETDEV_STAT_NOT_SET		(~0ULL)</div><div class='add'>+</div><div class='add'>+static void netdev_nl_stats_add(void *_sum, const void *_add, size_t size)</div><div class='add'>+{</div><div class='add'>+	const u64 *add = _add;</div><div class='add'>+	u64 *sum = _sum;</div><div class='add'>+</div><div class='add'>+	while (size) {</div><div class='add'>+		if (*add != NETDEV_STAT_NOT_SET &amp;&amp; *sum != NETDEV_STAT_NOT_SET)</div><div class='add'>+			*sum += *add;</div><div class='add'>+		sum++;</div><div class='add'>+		add++;</div><div class='add'>+		size -= 8;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_stat_put(struct sk_buff *rsp, unsigned int attr_id, u64 value)</div><div class='add'>+{</div><div class='add'>+	if (value == NETDEV_STAT_NOT_SET)</div><div class='add'>+		return 0;</div><div class='add'>+	return nla_put_uint(rsp, attr_id, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_stats_write_rx(struct sk_buff *rsp, struct netdev_queue_stats_rx *rx)</div><div class='add'>+{</div><div class='add'>+	if (netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_PACKETS, rx-&gt;packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_BYTES, rx-&gt;bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_ALLOC_FAIL, rx-&gt;alloc_fail) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_DROPS, rx-&gt;hw_drops) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_DROP_OVERRUNS, rx-&gt;hw_drop_overruns) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_CSUM_COMPLETE, rx-&gt;csum_complete) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_CSUM_UNNECESSARY, rx-&gt;csum_unnecessary) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_CSUM_NONE, rx-&gt;csum_none) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_CSUM_BAD, rx-&gt;csum_bad) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_GRO_PACKETS, rx-&gt;hw_gro_packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_GRO_BYTES, rx-&gt;hw_gro_bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_GRO_WIRE_PACKETS, rx-&gt;hw_gro_wire_packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_GRO_WIRE_BYTES, rx-&gt;hw_gro_wire_bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_RX_HW_DROP_RATELIMITS, rx-&gt;hw_drop_ratelimits))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_stats_write_tx(struct sk_buff *rsp, struct netdev_queue_stats_tx *tx)</div><div class='add'>+{</div><div class='add'>+	if (netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_PACKETS, tx-&gt;packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_BYTES, tx-&gt;bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_DROPS, tx-&gt;hw_drops) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_DROP_ERRORS, tx-&gt;hw_drop_errors) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_CSUM_NONE, tx-&gt;csum_none) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_NEEDS_CSUM, tx-&gt;needs_csum) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_GSO_PACKETS, tx-&gt;hw_gso_packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_GSO_BYTES, tx-&gt;hw_gso_bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_GSO_WIRE_PACKETS, tx-&gt;hw_gso_wire_packets) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_GSO_WIRE_BYTES, tx-&gt;hw_gso_wire_bytes) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_HW_DROP_RATELIMITS, tx-&gt;hw_drop_ratelimits) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_STOP, tx-&gt;stop) ||</div><div class='add'>+	    netdev_stat_put(rsp, NETDEV_A_QSTATS_TX_WAKE, tx-&gt;wake))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_stats_queue(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+		      u32 q_type, int i, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct netdev_stat_ops *ops = netdev-&gt;stat_ops;</div><div class='add'>+	struct netdev_queue_stats_rx rx;</div><div class='add'>+	struct netdev_queue_stats_tx tx;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_QSTATS_IFINDEX, netdev-&gt;ifindex) ||</div><div class='add'>+	    nla_put_u32(rsp, NETDEV_A_QSTATS_QUEUE_TYPE, q_type) ||</div><div class='add'>+	    nla_put_u32(rsp, NETDEV_A_QSTATS_QUEUE_ID, i))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	switch (q_type) {</div><div class='add'>+	case NETDEV_QUEUE_TYPE_RX:</div><div class='add'>+		memset(&amp;rx, 0xff, sizeof(rx));</div><div class='add'>+		ops-&gt;get_queue_stats_rx(netdev, i, &amp;rx);</div><div class='add'>+		if (!memchr_inv(&amp;rx, 0xff, sizeof(rx)))</div><div class='add'>+			goto nla_cancel;</div><div class='add'>+		if (netdev_nl_stats_write_rx(rsp, &amp;rx))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_QUEUE_TYPE_TX:</div><div class='add'>+		memset(&amp;tx, 0xff, sizeof(tx));</div><div class='add'>+		ops-&gt;get_queue_stats_tx(netdev, i, &amp;tx);</div><div class='add'>+		if (!memchr_inv(&amp;tx, 0xff, sizeof(tx)))</div><div class='add'>+			goto nla_cancel;</div><div class='add'>+		if (netdev_nl_stats_write_tx(rsp, &amp;tx))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_cancel:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_stats_by_queue(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+			 const struct genl_info *info,</div><div class='add'>+			 struct netdev_nl_dump_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct netdev_stat_ops *ops = netdev-&gt;stat_ops;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!(netdev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	i = ctx-&gt;rxq_idx;</div><div class='add'>+	while (ops-&gt;get_queue_stats_rx &amp;&amp; i &lt; netdev-&gt;real_num_rx_queues) {</div><div class='add'>+		err = netdev_nl_stats_queue(netdev, rsp, NETDEV_QUEUE_TYPE_RX,</div><div class='add'>+					    i, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		ctx-&gt;rxq_idx = ++i;</div><div class='add'>+	}</div><div class='add'>+	i = ctx-&gt;txq_idx;</div><div class='add'>+	while (ops-&gt;get_queue_stats_tx &amp;&amp; i &lt; netdev-&gt;real_num_tx_queues) {</div><div class='add'>+		err = netdev_nl_stats_queue(netdev, rsp, NETDEV_QUEUE_TYPE_TX,</div><div class='add'>+					    i, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		ctx-&gt;txq_idx = ++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rxq_idx = 0;</div><div class='add'>+	ctx-&gt;txq_idx = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_stat_queue_sum() - add up queue stats from range of queues</div><div class='add'>+ * @netdev:	net_device</div><div class='add'>+ * @rx_start:	index of the first Rx queue to query</div><div class='add'>+ * @rx_end:	index after the last Rx queue (first *not* to query)</div><div class='add'>+ * @rx_sum:	output Rx stats, should be already initialized</div><div class='add'>+ * @tx_start:	index of the first Tx queue to query</div><div class='add'>+ * @tx_end:	index after the last Tx queue (first *not* to query)</div><div class='add'>+ * @tx_sum:	output Tx stats, should be already initialized</div><div class='add'>+ *</div><div class='add'>+ * Add stats from [start, end) range of queue IDs to *x_sum structs.</div><div class='add'>+ * The sum structs must be already initialized. Usually this</div><div class='add'>+ * helper is invoked from the .get_base_stats callbacks of drivers</div><div class='add'>+ * to account for stats of disabled queues. In that case the ranges</div><div class='add'>+ * are usually [netdev-&gt;real_num_*x_queues, netdev-&gt;num_*x_queues).</div><div class='add'>+ */</div><div class='add'>+void netdev_stat_queue_sum(struct net_device *netdev,</div><div class='add'>+			   int rx_start, int rx_end,</div><div class='add'>+			   struct netdev_queue_stats_rx *rx_sum,</div><div class='add'>+			   int tx_start, int tx_end,</div><div class='add'>+			   struct netdev_queue_stats_tx *tx_sum)</div><div class='add'>+{</div><div class='add'>+	const struct netdev_stat_ops *ops;</div><div class='add'>+	struct netdev_queue_stats_rx rx;</div><div class='add'>+	struct netdev_queue_stats_tx tx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ops = netdev-&gt;stat_ops;</div><div class='add'>+</div><div class='add'>+	for (i = rx_start; i &lt; rx_end; i++) {</div><div class='add'>+		memset(&amp;rx, 0xff, sizeof(rx));</div><div class='add'>+		if (ops-&gt;get_queue_stats_rx)</div><div class='add'>+			ops-&gt;get_queue_stats_rx(netdev, i, &amp;rx);</div><div class='add'>+		netdev_nl_stats_add(rx_sum, &amp;rx, sizeof(rx));</div><div class='add'>+	}</div><div class='add'>+	for (i = tx_start; i &lt; tx_end; i++) {</div><div class='add'>+		memset(&amp;tx, 0xff, sizeof(tx));</div><div class='add'>+		if (ops-&gt;get_queue_stats_tx)</div><div class='add'>+			ops-&gt;get_queue_stats_tx(netdev, i, &amp;tx);</div><div class='add'>+		netdev_nl_stats_add(tx_sum, &amp;tx, sizeof(tx));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_stat_queue_sum);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_stats_by_netdev(struct net_device *netdev, struct sk_buff *rsp,</div><div class='add'>+			  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netdev_queue_stats_rx rx_sum;</div><div class='add'>+	struct netdev_queue_stats_tx tx_sum;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	/* Netdev can't guarantee any complete counters */</div><div class='add'>+	if (!netdev-&gt;stat_ops-&gt;get_base_stats)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;rx_sum, 0xff, sizeof(rx_sum));</div><div class='add'>+	memset(&amp;tx_sum, 0xff, sizeof(tx_sum));</div><div class='add'>+</div><div class='add'>+	netdev-&gt;stat_ops-&gt;get_base_stats(netdev, &amp;rx_sum, &amp;tx_sum);</div><div class='add'>+</div><div class='add'>+	/* The op was there, but nothing reported, don't bother */</div><div class='add'>+	if (!memchr_inv(&amp;rx_sum, 0xff, sizeof(rx_sum)) &amp;&amp;</div><div class='add'>+	    !memchr_inv(&amp;tx_sum, 0xff, sizeof(tx_sum)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_u32(rsp, NETDEV_A_QSTATS_IFINDEX, netdev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	netdev_stat_queue_sum(netdev, 0, netdev-&gt;real_num_rx_queues, &amp;rx_sum,</div><div class='add'>+			      0, netdev-&gt;real_num_tx_queues, &amp;tx_sum);</div><div class='add'>+</div><div class='add'>+	if (netdev_nl_stats_write_rx(rsp, &amp;rx_sum) ||</div><div class='add'>+	    netdev_nl_stats_write_tx(rsp, &amp;tx_sum))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_qstats_get_dump_one(struct net_device *netdev, unsigned int scope,</div><div class='add'>+			      struct sk_buff *skb, const struct genl_info *info,</div><div class='add'>+			      struct netdev_nl_dump_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	if (!netdev-&gt;stat_ops)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (scope) {</div><div class='add'>+	case 0:</div><div class='add'>+		return netdev_nl_stats_by_netdev(netdev, skb, info);</div><div class='add'>+	case NETDEV_QSTATS_SCOPE_QUEUE:</div><div class='add'>+		return netdev_nl_stats_by_queue(netdev, skb, info, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;	/* Should not happen, per netlink policy */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_qstats_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nl_dump_ctx *ctx = netdev_dump_ctx(cb);</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	unsigned int ifindex;</div><div class='add'>+	unsigned int scope;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	scope = 0;</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_QSTATS_SCOPE])</div><div class='add'>+		scope = nla_get_uint(info-&gt;attrs[NETDEV_A_QSTATS_SCOPE]);</div><div class='add'>+</div><div class='add'>+	ifindex = 0;</div><div class='add'>+	if (info-&gt;attrs[NETDEV_A_QSTATS_IFINDEX])</div><div class='add'>+		ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_QSTATS_IFINDEX]);</div><div class='add'>+</div><div class='add'>+	if (ifindex) {</div><div class='add'>+		netdev = netdev_get_by_index_lock_ops_compat(net, ifindex);</div><div class='add'>+		if (!netdev) {</div><div class='add'>+			NL_SET_BAD_ATTR(info-&gt;extack,</div><div class='add'>+					info-&gt;attrs[NETDEV_A_QSTATS_IFINDEX]);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		if (netdev-&gt;stat_ops) {</div><div class='add'>+			err = netdev_nl_qstats_get_dump_one(netdev, scope, skb,</div><div class='add'>+							    info, ctx);</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_BAD_ATTR(info-&gt;extack,</div><div class='add'>+					info-&gt;attrs[NETDEV_A_QSTATS_IFINDEX]);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		netdev_unlock_ops_compat(netdev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_netdev_lock_ops_compat_scoped(net, netdev, ctx-&gt;ifindex) {</div><div class='add'>+		err = netdev_nl_qstats_get_dump_one(netdev, scope, skb,</div><div class='add'>+						    info, ctx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_nl_read_rxq_bitmap(struct genl_info *info,</div><div class='add'>+				     u32 rxq_bitmap_len,</div><div class='add'>+				     unsigned long *rxq_bitmap)</div><div class='add'>+{</div><div class='add'>+	const int maxtype = ARRAY_SIZE(netdev_queue_id_nl_policy) - 1;</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(netdev_queue_id_nl_policy)];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int rem, err = 0;</div><div class='add'>+	u32 rxq_idx;</div><div class='add'>+</div><div class='add'>+	nla_for_each_attr_type(attr, NETDEV_A_DMABUF_QUEUES,</div><div class='add'>+			       genlmsg_data(info-&gt;genlhdr),</div><div class='add'>+			       genlmsg_len(info-&gt;genlhdr), rem) {</div><div class='add'>+		err = nla_parse_nested(tb, maxtype, attr,</div><div class='add'>+				       netdev_queue_id_nl_policy, info-&gt;extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (NL_REQ_ATTR_CHECK(info-&gt;extack, attr, tb, NETDEV_A_QUEUE_ID) ||</div><div class='add'>+		    NL_REQ_ATTR_CHECK(info-&gt;extack, attr, tb, NETDEV_A_QUEUE_TYPE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (nla_get_u32(tb[NETDEV_A_QUEUE_TYPE]) != NETDEV_QUEUE_TYPE_RX) {</div><div class='add'>+			NL_SET_BAD_ATTR(info-&gt;extack, tb[NETDEV_A_QUEUE_TYPE]);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxq_idx = nla_get_u32(tb[NETDEV_A_QUEUE_ID]);</div><div class='add'>+		if (rxq_idx &gt;= rxq_bitmap_len) {</div><div class='add'>+			NL_SET_BAD_ATTR(info-&gt;extack, tb[NETDEV_A_QUEUE_ID]);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bitmap_set(rxq_bitmap, rxq_idx, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *</div><div class='add'>+netdev_nl_get_dma_dev(struct net_device *netdev, unsigned long *rxq_bitmap,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct device *dma_dev = NULL;</div><div class='add'>+	u32 rxq_idx, prev_rxq_idx;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(rxq_idx, rxq_bitmap, netdev-&gt;real_num_rx_queues) {</div><div class='add'>+		struct device *rxq_dma_dev;</div><div class='add'>+</div><div class='add'>+		rxq_dma_dev = netdev_queue_get_dma_dev(netdev, rxq_idx);</div><div class='add'>+		if (dma_dev &amp;&amp; rxq_dma_dev != dma_dev) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack, "DMA device mismatch between queue %u and %u (multi-PF device?)",</div><div class='add'>+					   rxq_idx, prev_rxq_idx);</div><div class='add'>+			return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_dev = rxq_dma_dev;</div><div class='add'>+		prev_rxq_idx = rxq_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dma_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+	u32 ifindex, dmabuf_fd, rxq_idx;</div><div class='add'>+	struct netdev_nl_sock *priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	unsigned long *rxq_bitmap;</div><div class='add'>+	struct device *dma_dev;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	int err = 0;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_DEV_IFINDEX) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, NETDEV_A_DMABUF_FD) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, NETDEV_A_DMABUF_QUEUES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_DEV_IFINDEX]);</div><div class='add'>+	dmabuf_fd = nla_get_u32(info-&gt;attrs[NETDEV_A_DMABUF_FD]);</div><div class='add'>+</div><div class='add'>+	priv = genl_sk_priv_get(&amp;netdev_nl_family, NETLINK_CB(skb).sk);</div><div class='add'>+	if (IS_ERR(priv))</div><div class='add'>+		return PTR_ERR(priv);</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_genlmsg_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	netdev = netdev_get_by_index_lock(genl_info_net(info), ifindex);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_unlock_sock;</div><div class='add'>+	}</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	else if (!netdev_need_ops_lock(netdev))</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack,</div><div class='add'>+				info-&gt;attrs[NETDEV_A_DEV_IFINDEX]);</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxq_bitmap = bitmap_zalloc(netdev-&gt;real_num_rx_queues, GFP_KERNEL);</div><div class='add'>+	if (!rxq_bitmap) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_nl_read_rxq_bitmap(info, netdev-&gt;real_num_rx_queues,</div><div class='add'>+					rxq_bitmap);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_rxq_bitmap;</div><div class='add'>+</div><div class='add'>+	dma_dev = netdev_nl_get_dma_dev(netdev, rxq_bitmap, info-&gt;extack);</div><div class='add'>+	if (IS_ERR(dma_dev)) {</div><div class='add'>+		err = PTR_ERR(dma_dev);</div><div class='add'>+		goto err_rxq_bitmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binding = net_devmem_bind_dmabuf(netdev, dma_dev, DMA_FROM_DEVICE,</div><div class='add'>+					 dmabuf_fd, priv, info-&gt;extack);</div><div class='add'>+	if (IS_ERR(binding)) {</div><div class='add'>+		err = PTR_ERR(binding);</div><div class='add'>+		goto err_rxq_bitmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(rxq_idx, rxq_bitmap, netdev-&gt;real_num_rx_queues) {</div><div class='add'>+		err = net_devmem_bind_dmabuf_to_queue(netdev, rxq_idx, binding,</div><div class='add'>+						      info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding-&gt;id);</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	err = genlmsg_reply(rsp, info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unbind;</div><div class='add'>+</div><div class='add'>+	bitmap_free(rxq_bitmap);</div><div class='add'>+</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unbind:</div><div class='add'>+	net_devmem_unbind_dmabuf(binding);</div><div class='add'>+err_rxq_bitmap:</div><div class='add'>+	bitmap_free(rxq_bitmap);</div><div class='add'>+err_unlock:</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+err_unlock_sock:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+err_genlmsg_free:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+	struct netdev_nl_sock *priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct device *dma_dev;</div><div class='add'>+	u32 ifindex, dmabuf_fd;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	int err = 0;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_DEV_IFINDEX) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, NETDEV_A_DMABUF_FD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[NETDEV_A_DEV_IFINDEX]);</div><div class='add'>+	dmabuf_fd = nla_get_u32(info-&gt;attrs[NETDEV_A_DMABUF_FD]);</div><div class='add'>+</div><div class='add'>+	priv = genl_sk_priv_get(&amp;netdev_nl_family, NETLINK_CB(skb).sk);</div><div class='add'>+	if (IS_ERR(priv))</div><div class='add'>+		return PTR_ERR(priv);</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_genlmsg_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netdev = netdev_get_by_index_lock(genl_info_net(info), ifindex);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_unlock_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_unlock_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netdev-&gt;netmem_tx) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "Driver does not support netmem TX");</div><div class='add'>+		goto err_unlock_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_dev = netdev_queue_get_dma_dev(netdev, 0);</div><div class='add'>+	binding = net_devmem_bind_dmabuf(netdev, dma_dev, DMA_TO_DEVICE,</div><div class='add'>+					 dmabuf_fd, priv, info-&gt;extack);</div><div class='add'>+	if (IS_ERR(binding)) {</div><div class='add'>+		err = PTR_ERR(binding);</div><div class='add'>+		goto err_unlock_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding-&gt;id);</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rsp, info);</div><div class='add'>+</div><div class='add'>+err_unlock_netdev:</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+err_unlock_sock:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+err_genlmsg_free:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netdev_nl_sock_priv_init(struct netdev_nl_sock *priv)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;bindings);</div><div class='add'>+	mutex_init(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding;</div><div class='add'>+	struct net_devmem_dmabuf_binding *temp;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	list_for_each_entry_safe(binding, temp, &amp;priv-&gt;bindings, list) {</div><div class='add'>+		mutex_lock(&amp;binding-&gt;lock);</div><div class='add'>+		dev = binding-&gt;dev;</div><div class='add'>+		if (!dev) {</div><div class='add'>+			mutex_unlock(&amp;binding-&gt;lock);</div><div class='add'>+			net_devmem_unbind_dmabuf(binding);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		netdev_hold(dev, &amp;dev_tracker, GFP_KERNEL);</div><div class='add'>+		mutex_unlock(&amp;binding-&gt;lock);</div><div class='add'>+</div><div class='add'>+		netdev_lock(dev);</div><div class='add'>+		net_devmem_unbind_dmabuf(binding);</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+		netdev_put(dev, &amp;dev_tracker);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_genl_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				       unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_REGISTER:</div><div class='add'>+		netdev_lock_ops_to_full(netdev);</div><div class='add'>+		netdev_genl_dev_notify(netdev, NETDEV_CMD_DEV_ADD_NTF);</div><div class='add'>+		netdev_unlock_full_to_ops(netdev);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		netdev_lock(netdev);</div><div class='add'>+		netdev_genl_dev_notify(netdev, NETDEV_CMD_DEV_DEL_NTF);</div><div class='add'>+		netdev_unlock(netdev);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_XDP_FEAT_CHANGE:</div><div class='add'>+		netdev_genl_dev_notify(netdev, NETDEV_CMD_DEV_CHANGE_NTF);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block netdev_genl_nb = {</div><div class='add'>+	.notifier_call	= netdev_genl_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init netdev_genl_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;netdev_genl_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = genl_register_family(&amp;netdev_nl_family);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unreg_ntf;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unreg_ntf:</div><div class='add'>+	unregister_netdevice_notifier(&amp;netdev_genl_nb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(netdev_genl_init);</div><div class='head'>diff --git a/net/core/netdev_queues.c b/net/core/netdev_queues.c<br/>new file mode 100644<br/>index 000000000000..251f27a8307f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netdev_queues.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netdev_queues.c</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_queue_get_dma_dev() - get dma device for zero-copy operations</div><div class='add'>+ * @dev:	net_device</div><div class='add'>+ * @idx:	queue index</div><div class='add'>+ *</div><div class='add'>+ * Get dma device for zero-copy operations to be used for this queue.</div><div class='add'>+ * When such device is not available or valid, the function will return NULL.</div><div class='add'>+ *</div><div class='add'>+ * Return: Device or NULL on error</div><div class='add'>+ */</div><div class='add'>+struct device *netdev_queue_get_dma_dev(struct net_device *dev, int idx)</div><div class='add'>+{</div><div class='add'>+	const struct netdev_queue_mgmt_ops *queue_ops = dev-&gt;queue_mgmt_ops;</div><div class='add'>+	struct device *dma_dev;</div><div class='add'>+</div><div class='add'>+	if (queue_ops &amp;&amp; queue_ops-&gt;ndo_queue_get_dma_dev)</div><div class='add'>+		dma_dev = queue_ops-&gt;ndo_queue_get_dma_dev(dev, idx);</div><div class='add'>+	else</div><div class='add'>+		dma_dev = dev-&gt;dev.parent;</div><div class='add'>+</div><div class='add'>+	return dma_dev &amp;&amp; dma_dev-&gt;dma_mask ? dma_dev : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/net/core/netdev_rx_queue.c b/net/core/netdev_rx_queue.c<br/>new file mode 100644<br/>index 000000000000..c7d9341b7630<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netdev_rx_queue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netdev_rx_queue.c</a></div><div class='hunk'>@@ -0,0 +1,194 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+</div><div class='add'>+#include "page_pool_priv.h"</div><div class='add'>+</div><div class='add'>+/* See also page_pool_is_unreadable() */</div><div class='add'>+bool netif_rxq_has_unreadable_mp(struct net_device *dev, int idx)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq = __netif_get_rx_queue(dev, idx);</div><div class='add'>+</div><div class='add'>+	return !!rxq-&gt;mp_params.mp_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_rxq_has_unreadable_mp);</div><div class='add'>+</div><div class='add'>+int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq_idx)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq = __netif_get_rx_queue(dev, rxq_idx);</div><div class='add'>+	const struct netdev_queue_mgmt_ops *qops = dev-&gt;queue_mgmt_ops;</div><div class='add'>+	void *new_mem, *old_mem;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!qops || !qops-&gt;ndo_queue_stop || !qops-&gt;ndo_queue_mem_free ||</div><div class='add'>+	    !qops-&gt;ndo_queue_mem_alloc || !qops-&gt;ndo_queue_start)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	new_mem = kvzalloc(qops-&gt;ndo_queue_mem_size, GFP_KERNEL);</div><div class='add'>+	if (!new_mem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	old_mem = kvzalloc(qops-&gt;ndo_queue_mem_size, GFP_KERNEL);</div><div class='add'>+	if (!old_mem) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_new_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = qops-&gt;ndo_queue_mem_alloc(dev, new_mem, rxq_idx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_old_mem;</div><div class='add'>+</div><div class='add'>+	err = page_pool_check_memory_provider(dev, rxq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_new_queue_mem;</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		err = qops-&gt;ndo_queue_stop(dev, old_mem, rxq_idx);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_new_queue_mem;</div><div class='add'>+</div><div class='add'>+		err = qops-&gt;ndo_queue_start(dev, new_mem, rxq_idx);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_start_queue;</div><div class='add'>+	} else {</div><div class='add'>+		swap(new_mem, old_mem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qops-&gt;ndo_queue_mem_free(dev, old_mem);</div><div class='add'>+</div><div class='add'>+	kvfree(old_mem);</div><div class='add'>+	kvfree(new_mem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_start_queue:</div><div class='add'>+	/* Restarting the queue with old_mem should be successful as we haven't</div><div class='add'>+	 * changed any of the queue configuration, and there is not much we can</div><div class='add'>+	 * do to recover from a failure here.</div><div class='add'>+	 *</div><div class='add'>+	 * WARN if we fail to recover the old rx queue, and at least free</div><div class='add'>+	 * old_mem so we don't also leak that.</div><div class='add'>+	 */</div><div class='add'>+	if (qops-&gt;ndo_queue_start(dev, old_mem, rxq_idx)) {</div><div class='add'>+		WARN(1,</div><div class='add'>+		     "Failed to restart old queue in error path. RX queue %d may be unhealthy.",</div><div class='add'>+		     rxq_idx);</div><div class='add'>+		qops-&gt;ndo_queue_mem_free(dev, old_mem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_free_new_queue_mem:</div><div class='add'>+	qops-&gt;ndo_queue_mem_free(dev, new_mem);</div><div class='add'>+</div><div class='add'>+err_free_old_mem:</div><div class='add'>+	kvfree(old_mem);</div><div class='add'>+</div><div class='add'>+err_free_new_mem:</div><div class='add'>+	kvfree(new_mem);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(netdev_rx_queue_restart, "NETDEV_INTERNAL");</div><div class='add'>+</div><div class='add'>+int __net_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx,</div><div class='add'>+		      const struct pp_memory_provider_params *p,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!netdev_need_ops_lock(dev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (rxq_idx &gt;= dev-&gt;real_num_rx_queues) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "rx queue index out of range");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+	rxq_idx = array_index_nospec(rxq_idx, dev-&gt;real_num_rx_queues);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;cfg-&gt;hds_config != ETHTOOL_TCP_DATA_SPLIT_ENABLED) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "tcp-data-split is disabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;cfg-&gt;hds_thresh) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "hds-thresh is not zero");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (dev_xdp_prog_count(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "unable to custom memory provider to device with XDP program attached");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxq = __netif_get_rx_queue(dev, rxq_idx);</div><div class='add'>+	if (rxq-&gt;mp_params.mp_ops) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "designated queue already memory provider bound");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_XDP_SOCKETS</div><div class='add'>+	if (rxq-&gt;pool) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "designated queue already in use by AF_XDP");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	rxq-&gt;mp_params = *p;</div><div class='add'>+	ret = netdev_rx_queue_restart(dev, rxq_idx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rxq-&gt;mp_params.mp_ops = NULL;</div><div class='add'>+		rxq-&gt;mp_params.mp_priv = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int net_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx,</div><div class='add'>+		    struct pp_memory_provider_params *p)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	ret = __net_mp_open_rxq(dev, rxq_idx, p, NULL);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __net_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,</div><div class='add'>+			const struct pp_memory_provider_params *old_p)</div><div class='add'>+{</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(ifq_idx &gt;= dev-&gt;real_num_rx_queues))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rxq = __netif_get_rx_queue(dev, ifq_idx);</div><div class='add'>+</div><div class='add'>+	/* Callers holding a netdev ref may get here after we already</div><div class='add'>+	 * went thru shutdown via dev_memory_provider_uninstall().</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;reg_state &gt; NETREG_REGISTERED &amp;&amp;</div><div class='add'>+	    !rxq-&gt;mp_params.mp_ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(rxq-&gt;mp_params.mp_ops != old_p-&gt;mp_ops ||</div><div class='add'>+			 rxq-&gt;mp_params.mp_priv != old_p-&gt;mp_priv))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rxq-&gt;mp_params.mp_ops = NULL;</div><div class='add'>+	rxq-&gt;mp_params.mp_priv = NULL;</div><div class='add'>+	err = netdev_rx_queue_restart(dev, ifq_idx);</div><div class='add'>+	WARN_ON(err &amp;&amp; err != -ENETDOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void net_mp_close_rxq(struct net_device *dev, unsigned ifq_idx,</div><div class='add'>+		      struct pp_memory_provider_params *old_p)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	__net_mp_close_rxq(dev, ifq_idx, old_p);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='head'>diff --git a/net/core/netevent.c b/net/core/netevent.c<br/>index 8b3bc4fac613..5bb615e963cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/netevent.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netevent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netevent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netevent.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Network event notifiers</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *      Tom Tucker             &lt;tom@opengridcomputing.com&gt;</div><div class='ctx'>  *      Steve Wise             &lt;swise@opengridcomputing.com&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Fixes:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -36,7 +32,7 @@ int register_netevent_notifier(struct notifier_block *nb)</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_netevent_notifier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	netevent_unregister_notifier - unregister a netevent notifier block</div><div class='add'>+ *	unregister_netevent_notifier - unregister a netevent notifier block</div><div class='ctx'>  *	@nb: notifier</div><div class='ctx'>  *</div><div class='ctx'>  *	Unregister a notifier previously registered by</div><div class='head'>diff --git a/net/core/netmem_priv.h b/net/core/netmem_priv.h<br/>new file mode 100644<br/>index 000000000000..23175cb2bd86<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netmem_priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netmem_priv.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __NETMEM_PRIV_H</div><div class='add'>+#define __NETMEM_PRIV_H</div><div class='add'>+</div><div class='add'>+static inline unsigned long netmem_get_pp_magic(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	return netmem_to_nmdesc(netmem)-&gt;pp_magic &amp; ~PP_DMA_INDEX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic)</div><div class='add'>+{</div><div class='add'>+	netmem_to_nmdesc(netmem)-&gt;pp_magic |= pp_magic;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netmem_clear_pp_magic(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(netmem_to_nmdesc(netmem)-&gt;pp_magic &amp; PP_DMA_INDEX_MASK);</div><div class='add'>+</div><div class='add'>+	netmem_to_nmdesc(netmem)-&gt;pp_magic = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool netmem_is_pp(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	return (netmem_get_pp_magic(netmem) &amp; PP_MAGIC_MASK) == PP_SIGNATURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netmem_set_pp(netmem_ref netmem, struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	netmem_to_nmdesc(netmem)-&gt;pp = pool;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netmem_set_dma_addr(netmem_ref netmem,</div><div class='add'>+				       unsigned long dma_addr)</div><div class='add'>+{</div><div class='add'>+	netmem_to_nmdesc(netmem)-&gt;dma_addr = dma_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long netmem_get_dma_index(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	unsigned long magic;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(netmem_is_net_iov(netmem)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	magic = netmem_to_nmdesc(netmem)-&gt;pp_magic;</div><div class='add'>+</div><div class='add'>+	return (magic &amp; PP_DMA_INDEX_MASK) &gt;&gt; PP_DMA_INDEX_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netmem_set_dma_index(netmem_ref netmem,</div><div class='add'>+					unsigned long id)</div><div class='add'>+{</div><div class='add'>+	unsigned long magic;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(netmem_is_net_iov(netmem)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	magic = netmem_get_pp_magic(netmem) | (id &lt;&lt; PP_DMA_INDEX_SHIFT);</div><div class='add'>+	netmem_to_nmdesc(netmem)-&gt;pp_magic = magic;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/core/netpoll.c b/net/core/netpoll.c<br/>index de1d1ba92f2d..09f72f10813c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/netpoll.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netpoll.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netpoll.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netpoll.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Common framework for low-level network console, dump, and debugger code</div><div class='ctx'>  *</div><div class='hunk'>@@ -33,8 +34,9 @@</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;trace/events/napi.h&gt;</div><div class='add'>+#include &lt;linux/kconfig.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We maintain a small pool of fully-sized skbs, to make sure the</div><div class='hunk'>@@ -43,11 +45,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_UDP_CHUNK 1460</div><div class='ctx'> #define MAX_SKBS 32</div><div class='del'>-</div><div class='del'>-static struct sk_buff_head skb_pool;</div><div class='del'>-</div><div class='del'>-DEFINE_STATIC_SRCU(netpoll_srcu);</div><div class='del'>-</div><div class='ctx'> #define USEC_PER_POLL	50</div><div class='ctx'> </div><div class='ctx'> #define MAX_SKB_SIZE							\</div><div class='hunk'>@@ -57,22 +54,15 @@ DEFINE_STATIC_SRCU(netpoll_srcu);</div><div class='ctx'> 	 MAX_UDP_CHUNK)</div><div class='ctx'> </div><div class='ctx'> static void zap_completion_queue(void);</div><div class='del'>-static void netpoll_async_cleanup(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> static unsigned int carrier_timeout = 4;</div><div class='ctx'> module_param(carrier_timeout, uint, 0644);</div><div class='ctx'> </div><div class='del'>-#define np_info(np, fmt, ...)				\</div><div class='del'>-	pr_info("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='del'>-#define np_err(np, fmt, ...)				\</div><div class='del'>-	pr_err("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='del'>-#define np_notice(np, fmt, ...)				\</div><div class='del'>-	pr_notice("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			      struct netdev_queue *txq)</div><div class='add'>+static netdev_tx_t netpoll_start_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      struct netdev_queue *txq)</div><div class='ctx'> {</div><div class='del'>-	int status = NETDEV_TX_OK;</div><div class='add'>+	netdev_tx_t status = NETDEV_TX_OK;</div><div class='ctx'> 	netdev_features_t features;</div><div class='ctx'> </div><div class='ctx'> 	features = netif_skb_features(skb);</div><div class='hunk'>@@ -122,7 +112,7 @@ static void queue_process(struct work_struct *work)</div><div class='ctx'> 		txq = netdev_get_tx_queue(dev, q_index);</div><div class='ctx'> 		HARD_TX_LOCK(dev, txq, smp_processor_id());</div><div class='ctx'> 		if (netif_xmit_frozen_or_stopped(txq) ||</div><div class='del'>-		    netpoll_start_xmit(skb, dev, txq) != NETDEV_TX_OK) {</div><div class='add'>+		    !dev_xmit_complete(netpoll_start_xmit(skb, dev, txq))) {</div><div class='ctx'> 			skb_queue_head(&amp;npinfo-&gt;txq, skb);</div><div class='ctx'> 			HARD_TX_UNLOCK(dev, txq);</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='hunk'>@@ -135,6 +125,20 @@ static void queue_process(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int netif_local_xmit_active(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++) {</div><div class='add'>+		struct netdev_queue *txq = netdev_get_tx_queue(dev, i);</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(txq-&gt;xmit_lock_owner) == smp_processor_id())</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void poll_one_napi(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='ctx'> 	int work;</div><div class='hunk'>@@ -146,11 +150,11 @@ static void poll_one_napi(struct napi_struct *napi)</div><div class='ctx'> 	if (test_and_set_bit(NAPI_STATE_NPSVC, &amp;napi-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* We explicilty pass the polling call a budget of 0 to</div><div class='add'>+	/* We explicitly pass the polling call a budget of 0 to</div><div class='ctx'> 	 * indicate that we are clearing the Tx path only.</div><div class='ctx'> 	 */</div><div class='ctx'> 	work = napi-&gt;poll(napi, 0);</div><div class='del'>-	WARN_ONCE(work, "%pF exceeded budget in poll\n", napi-&gt;poll);</div><div class='add'>+	WARN_ONCE(work, "%pS exceeded budget in poll\n", napi-&gt;poll);</div><div class='ctx'> 	trace_napi_poll(napi, work, 0);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(NAPI_STATE_NPSVC, &amp;napi-&gt;state);</div><div class='hunk'>@@ -161,7 +165,7 @@ static void poll_napi(struct net_device *dev)</div><div class='ctx'> 	struct napi_struct *napi;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(napi, &amp;dev-&gt;napi_list, dev_list) {</div><div class='add'>+	list_for_each_entry_rcu(napi, &amp;dev-&gt;napi_list, dev_list) {</div><div class='ctx'> 		if (cmpxchg(&amp;napi-&gt;poll_owner, -1, cpu) == -1) {</div><div class='ctx'> 			poll_one_napi(napi);</div><div class='ctx'> 			smp_store_release(&amp;napi-&gt;poll_owner, -1);</div><div class='hunk'>@@ -181,7 +185,10 @@ void netpoll_poll_dev(struct net_device *dev)</div><div class='ctx'> 	if (!ni || down_trylock(&amp;ni-&gt;dev_lock))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev)) {</div><div class='add'>+	/* Some drivers will take the same locks in poll and xmit,</div><div class='add'>+	 * we can't poll if local CPU is already in xmit.</div><div class='add'>+	 */</div><div class='add'>+	if (!netif_running(dev) || netif_local_xmit_active(dev)) {</div><div class='ctx'> 		up(&amp;ni-&gt;dev_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,41 +208,36 @@ EXPORT_SYMBOL(netpoll_poll_dev);</div><div class='ctx'> void netpoll_poll_disable(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netpoll_info *ni;</div><div class='del'>-	int idx;</div><div class='add'>+</div><div class='ctx'> 	might_sleep();</div><div class='del'>-	idx = srcu_read_lock(&amp;netpoll_srcu);</div><div class='del'>-	ni = srcu_dereference(dev-&gt;npinfo, &amp;netpoll_srcu);</div><div class='add'>+	ni = rtnl_dereference(dev-&gt;npinfo);</div><div class='ctx'> 	if (ni)</div><div class='ctx'> 		down(&amp;ni-&gt;dev_lock);</div><div class='del'>-	srcu_read_unlock(&amp;netpoll_srcu, idx);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_poll_disable);</div><div class='ctx'> </div><div class='ctx'> void netpoll_poll_enable(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netpoll_info *ni;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ni = rcu_dereference(dev-&gt;npinfo);</div><div class='add'>+</div><div class='add'>+	ni = rtnl_dereference(dev-&gt;npinfo);</div><div class='ctx'> 	if (ni)</div><div class='ctx'> 		up(&amp;ni-&gt;dev_lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_poll_enable);</div><div class='ctx'> </div><div class='del'>-static void refill_skbs(void)</div><div class='add'>+static void refill_skbs(struct netpoll *np)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff_head *skb_pool;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;skb_pool.lock, flags);</div><div class='del'>-	while (skb_pool.qlen &lt; MAX_SKBS) {</div><div class='add'>+	skb_pool = &amp;np-&gt;skb_pool;</div><div class='add'>+</div><div class='add'>+	while (READ_ONCE(skb_pool-&gt;qlen) &lt; MAX_SKBS) {</div><div class='ctx'> 		skb = alloc_skb(MAX_SKB_SIZE, GFP_ATOMIC);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		__skb_queue_tail(&amp;skb_pool, skb);</div><div class='add'>+		skb_queue_tail(skb_pool, skb);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;skb_pool.lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zap_completion_queue(void)</div><div class='hunk'>@@ -272,12 +274,13 @@ static struct sk_buff *find_skb(struct netpoll *np, int len, int reserve)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	zap_completion_queue();</div><div class='del'>-	refill_skbs();</div><div class='ctx'> repeat:</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(len, GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		skb = skb_dequeue(&amp;skb_pool);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		skb = skb_dequeue(&amp;np-&gt;skb_pool);</div><div class='add'>+		schedule_work(&amp;np-&gt;refill_wq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		if (++count &lt; 10) {</div><div class='hunk'>@@ -296,36 +299,39 @@ static int netpoll_owner_active(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct napi_struct *napi;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(napi, &amp;dev-&gt;napi_list, dev_list) {</div><div class='del'>-		if (napi-&gt;poll_owner == smp_processor_id())</div><div class='add'>+	list_for_each_entry_rcu(napi, &amp;dev-&gt;napi_list, dev_list) {</div><div class='add'>+		if (READ_ONCE(napi-&gt;poll_owner) == smp_processor_id())</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* call with IRQ disabled */</div><div class='del'>-void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *dev)</div><div class='add'>+static netdev_tx_t __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int status = NETDEV_TX_BUSY;</div><div class='add'>+	netdev_tx_t status = NETDEV_TX_BUSY;</div><div class='add'>+	netdev_tx_t ret = NET_XMIT_DROP;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	unsigned long tries;</div><div class='ctx'> 	/* It is up to the caller to keep npinfo alive. */</div><div class='ctx'> 	struct netpoll_info *npinfo;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='ctx'> 	lockdep_assert_irqs_disabled();</div><div class='ctx'> </div><div class='del'>-	npinfo = rcu_dereference_bh(np-&gt;dev-&gt;npinfo);</div><div class='add'>+	dev = np-&gt;dev;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	npinfo = rcu_dereference_bh(dev-&gt;npinfo);</div><div class='add'>+</div><div class='ctx'> 	if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {</div><div class='ctx'> 		dev_kfree_skb_irq(skb);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* don't get messages out of order, and no recursion */</div><div class='ctx'> 	if (skb_queue_len(&amp;npinfo-&gt;txq) == 0 &amp;&amp; !netpoll_owner_active(dev)) {</div><div class='ctx'> 		struct netdev_queue *txq;</div><div class='ctx'> </div><div class='del'>-		txq = netdev_pick_tx(dev, skb, NULL);</div><div class='add'>+		txq = netdev_core_pick_tx(dev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* try until next clock tick */</div><div class='ctx'> 		for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;</div><div class='hunk'>@@ -336,7 +342,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 				HARD_TX_UNLOCK(dev, txq);</div><div class='ctx'> </div><div class='del'>-				if (status == NETDEV_TX_OK)</div><div class='add'>+				if (dev_xmit_complete(status))</div><div class='ctx'> 					break;</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='hunk'>@@ -348,240 +354,198 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		WARN_ONCE(!irqs_disabled(),</div><div class='del'>-			"netpoll_send_skb_on_dev(): %s enabled interrupts in poll (%pF)\n",</div><div class='add'>+			"netpoll_send_skb_on_dev(): %s enabled interrupts in poll (%pS)\n",</div><div class='ctx'> 			dev-&gt;name, dev-&gt;netdev_ops-&gt;ndo_start_xmit);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status != NETDEV_TX_OK) {</div><div class='add'>+	if (!dev_xmit_complete(status)) {</div><div class='ctx'> 		skb_queue_tail(&amp;npinfo-&gt;txq, skb);</div><div class='ctx'> 		schedule_delayed_work(&amp;npinfo-&gt;tx_work,0);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	ret = NETDEV_TX_OK;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_send_skb_on_dev);</div><div class='ctx'> </div><div class='del'>-void netpoll_send_udp(struct netpoll *np, const char *msg, int len)</div><div class='add'>+static void netpoll_udp_checksum(struct netpoll *np, struct sk_buff *skb,</div><div class='add'>+				 int len)</div><div class='ctx'> {</div><div class='del'>-	int total_len, ip_len, udp_len;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	struct udphdr *udph;</div><div class='del'>-	struct iphdr *iph;</div><div class='del'>-	struct ethhdr *eth;</div><div class='del'>-	static atomic_t ip_ident;</div><div class='del'>-	struct ipv6hdr *ip6h;</div><div class='add'>+	int udp_len;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!irqs_disabled());</div><div class='add'>+	udp_len = len + sizeof(struct udphdr);</div><div class='add'>+	udph = udp_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	udp_len = len + sizeof(*udph);</div><div class='add'>+	/* check needs to be set, since it will be consumed in csum_partial */</div><div class='add'>+	udph-&gt;check = 0;</div><div class='ctx'> 	if (np-&gt;ipv6)</div><div class='del'>-		ip_len = udp_len + sizeof(*ip6h);</div><div class='add'>+		udph-&gt;check = csum_ipv6_magic(&amp;np-&gt;local_ip.in6,</div><div class='add'>+					      &amp;np-&gt;remote_ip.in6,</div><div class='add'>+					      udp_len, IPPROTO_UDP,</div><div class='add'>+					      csum_partial(udph, udp_len, 0));</div><div class='ctx'> 	else</div><div class='del'>-		ip_len = udp_len + sizeof(*iph);</div><div class='add'>+		udph-&gt;check = csum_tcpudp_magic(np-&gt;local_ip.ip,</div><div class='add'>+						np-&gt;remote_ip.ip,</div><div class='add'>+						udp_len, IPPROTO_UDP,</div><div class='add'>+						csum_partial(udph, udp_len, 0));</div><div class='add'>+	if (udph-&gt;check == 0)</div><div class='add'>+		udph-&gt;check = CSUM_MANGLED_0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	total_len = ip_len + LL_RESERVED_SPACE(np-&gt;dev);</div><div class='add'>+netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	netdev_tx_t ret;</div><div class='ctx'> </div><div class='del'>-	skb = find_skb(np, total_len + np-&gt;dev-&gt;needed_tailroom,</div><div class='del'>-		       total_len - len);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='add'>+	if (unlikely(!np)) {</div><div class='add'>+		dev_kfree_skb_irq(skb);</div><div class='add'>+		ret = NET_XMIT_DROP;</div><div class='add'>+	} else {</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		ret = __netpoll_send_skb(np, skb);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netpoll_send_skb);</div><div class='ctx'> </div><div class='del'>-	skb_copy_to_linear_data(skb, msg, len);</div><div class='del'>-	skb_put(skb, len);</div><div class='add'>+static void push_ipv6(struct netpoll *np, struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *ip6h;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(struct ipv6hdr));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	ip6h = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* ip6h-&gt;version = 6; ip6h-&gt;priority = 0; */</div><div class='add'>+	*(unsigned char *)ip6h = 0x60;</div><div class='add'>+	ip6h-&gt;flow_lbl[0] = 0;</div><div class='add'>+	ip6h-&gt;flow_lbl[1] = 0;</div><div class='add'>+	ip6h-&gt;flow_lbl[2] = 0;</div><div class='add'>+</div><div class='add'>+	ip6h-&gt;payload_len = htons(sizeof(struct udphdr) + len);</div><div class='add'>+	ip6h-&gt;nexthdr = IPPROTO_UDP;</div><div class='add'>+	ip6h-&gt;hop_limit = 32;</div><div class='add'>+	ip6h-&gt;saddr = np-&gt;local_ip.in6;</div><div class='add'>+	ip6h-&gt;daddr = np-&gt;remote_ip.in6;</div><div class='ctx'> </div><div class='del'>-	skb_push(skb, sizeof(*udph));</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void push_ipv4(struct netpoll *np, struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	static atomic_t ip_ident;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	int ip_len;</div><div class='add'>+</div><div class='add'>+	ip_len = len + sizeof(struct udphdr) + sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(struct iphdr));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* iph-&gt;version = 4; iph-&gt;ihl = 5; */</div><div class='add'>+	*(unsigned char *)iph = 0x45;</div><div class='add'>+	iph-&gt;tos = 0;</div><div class='add'>+	put_unaligned(htons(ip_len), &amp;iph-&gt;tot_len);</div><div class='add'>+	iph-&gt;id = htons(atomic_inc_return(&amp;ip_ident));</div><div class='add'>+	iph-&gt;frag_off = 0;</div><div class='add'>+	iph-&gt;ttl = 64;</div><div class='add'>+	iph-&gt;protocol = IPPROTO_UDP;</div><div class='add'>+	iph-&gt;check = 0;</div><div class='add'>+	put_unaligned(np-&gt;local_ip.ip, &amp;iph-&gt;saddr);</div><div class='add'>+	put_unaligned(np-&gt;remote_ip.ip, &amp;iph-&gt;daddr);</div><div class='add'>+	iph-&gt;check = ip_fast_csum((unsigned char *)iph, iph-&gt;ihl);</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void push_udp(struct netpoll *np, struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	int udp_len;</div><div class='add'>+</div><div class='add'>+	udp_len = len + sizeof(struct udphdr);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(struct udphdr));</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='ctx'> 	udph = udp_hdr(skb);</div><div class='ctx'> 	udph-&gt;source = htons(np-&gt;local_port);</div><div class='ctx'> 	udph-&gt;dest = htons(np-&gt;remote_port);</div><div class='ctx'> 	udph-&gt;len = htons(udp_len);</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;ipv6) {</div><div class='del'>-		udph-&gt;check = 0;</div><div class='del'>-		udph-&gt;check = csum_ipv6_magic(&amp;np-&gt;local_ip.in6,</div><div class='del'>-					      &amp;np-&gt;remote_ip.in6,</div><div class='del'>-					      udp_len, IPPROTO_UDP,</div><div class='del'>-					      csum_partial(udph, udp_len, 0));</div><div class='del'>-		if (udph-&gt;check == 0)</div><div class='del'>-			udph-&gt;check = CSUM_MANGLED_0;</div><div class='del'>-</div><div class='del'>-		skb_push(skb, sizeof(*ip6h));</div><div class='del'>-		skb_reset_network_header(skb);</div><div class='del'>-		ip6h = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-		/* ip6h-&gt;version = 6; ip6h-&gt;priority = 0; */</div><div class='del'>-		put_unaligned(0x60, (unsigned char *)ip6h);</div><div class='del'>-		ip6h-&gt;flow_lbl[0] = 0;</div><div class='del'>-		ip6h-&gt;flow_lbl[1] = 0;</div><div class='del'>-		ip6h-&gt;flow_lbl[2] = 0;</div><div class='del'>-</div><div class='del'>-		ip6h-&gt;payload_len = htons(sizeof(struct udphdr) + len);</div><div class='del'>-		ip6h-&gt;nexthdr = IPPROTO_UDP;</div><div class='del'>-		ip6h-&gt;hop_limit = 32;</div><div class='del'>-		ip6h-&gt;saddr = np-&gt;local_ip.in6;</div><div class='del'>-		ip6h-&gt;daddr = np-&gt;remote_ip.in6;</div><div class='del'>-</div><div class='del'>-		eth = skb_push(skb, ETH_HLEN);</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		skb-&gt;protocol = eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='del'>-	} else {</div><div class='del'>-		udph-&gt;check = 0;</div><div class='del'>-		udph-&gt;check = csum_tcpudp_magic(np-&gt;local_ip.ip,</div><div class='del'>-						np-&gt;remote_ip.ip,</div><div class='del'>-						udp_len, IPPROTO_UDP,</div><div class='del'>-						csum_partial(udph, udp_len, 0));</div><div class='del'>-		if (udph-&gt;check == 0)</div><div class='del'>-			udph-&gt;check = CSUM_MANGLED_0;</div><div class='del'>-</div><div class='del'>-		skb_push(skb, sizeof(*iph));</div><div class='del'>-		skb_reset_network_header(skb);</div><div class='del'>-		iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-		/* iph-&gt;version = 4; iph-&gt;ihl = 5; */</div><div class='del'>-		put_unaligned(0x45, (unsigned char *)iph);</div><div class='del'>-		iph-&gt;tos      = 0;</div><div class='del'>-		put_unaligned(htons(ip_len), &amp;(iph-&gt;tot_len));</div><div class='del'>-		iph-&gt;id       = htons(atomic_inc_return(&amp;ip_ident));</div><div class='del'>-		iph-&gt;frag_off = 0;</div><div class='del'>-		iph-&gt;ttl      = 64;</div><div class='del'>-		iph-&gt;protocol = IPPROTO_UDP;</div><div class='del'>-		iph-&gt;check    = 0;</div><div class='del'>-		put_unaligned(np-&gt;local_ip.ip, &amp;(iph-&gt;saddr));</div><div class='del'>-		put_unaligned(np-&gt;remote_ip.ip, &amp;(iph-&gt;daddr));</div><div class='del'>-		iph-&gt;check    = ip_fast_csum((unsigned char *)iph, iph-&gt;ihl);</div><div class='del'>-</div><div class='del'>-		eth = skb_push(skb, ETH_HLEN);</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		skb-&gt;protocol = eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='del'>-	}</div><div class='add'>+	netpoll_udp_checksum(np, skb, len);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void push_eth(struct netpoll *np, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+</div><div class='add'>+	eth = skb_push(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='ctx'> 	ether_addr_copy(eth-&gt;h_source, np-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	ether_addr_copy(eth-&gt;h_dest, np-&gt;remote_mac);</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = np-&gt;dev;</div><div class='del'>-</div><div class='del'>-	netpoll_send_skb(np, skb);</div><div class='add'>+	if (np-&gt;ipv6)</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='add'>+	else</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_send_udp);</div><div class='ctx'> </div><div class='del'>-void netpoll_print_options(struct netpoll *np)</div><div class='add'>+int netpoll_send_udp(struct netpoll *np, const char *msg, int len)</div><div class='ctx'> {</div><div class='del'>-	np_info(np, "local port %d\n", np-&gt;local_port);</div><div class='add'>+	int total_len, ip_len, udp_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+		WARN_ON_ONCE(!irqs_disabled());</div><div class='add'>+</div><div class='add'>+	udp_len = len + sizeof(struct udphdr);</div><div class='ctx'> 	if (np-&gt;ipv6)</div><div class='del'>-		np_info(np, "local IPv6 address %pI6c\n", &amp;np-&gt;local_ip.in6);</div><div class='add'>+		ip_len = udp_len + sizeof(struct ipv6hdr);</div><div class='ctx'> 	else</div><div class='del'>-		np_info(np, "local IPv4 address %pI4\n", &amp;np-&gt;local_ip.ip);</div><div class='del'>-	np_info(np, "interface '%s'\n", np-&gt;dev_name);</div><div class='del'>-	np_info(np, "remote port %d\n", np-&gt;remote_port);</div><div class='add'>+		ip_len = udp_len + sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+	total_len = ip_len + LL_RESERVED_SPACE(np-&gt;dev);</div><div class='add'>+</div><div class='add'>+	skb = find_skb(np, total_len + np-&gt;dev-&gt;needed_tailroom,</div><div class='add'>+		       total_len - len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_copy_to_linear_data(skb, msg, len);</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	push_udp(np, skb, len);</div><div class='ctx'> 	if (np-&gt;ipv6)</div><div class='del'>-		np_info(np, "remote IPv6 address %pI6c\n", &amp;np-&gt;remote_ip.in6);</div><div class='add'>+		push_ipv6(np, skb, len);</div><div class='ctx'> 	else</div><div class='del'>-		np_info(np, "remote IPv4 address %pI4\n", &amp;np-&gt;remote_ip.ip);</div><div class='del'>-	np_info(np, "remote ethernet address %pM\n", np-&gt;remote_mac);</div><div class='add'>+		push_ipv4(np, skb, len);</div><div class='add'>+	push_eth(np, skb);</div><div class='add'>+	skb-&gt;dev = np-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return (int)netpoll_send_skb(np, skb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_print_options);</div><div class='add'>+EXPORT_SYMBOL(netpoll_send_udp);</div><div class='ctx'> </div><div class='del'>-static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)</div><div class='add'>+</div><div class='add'>+static void skb_pool_flush(struct netpoll *np)</div><div class='ctx'> {</div><div class='del'>-	const char *end;</div><div class='add'>+	struct sk_buff_head *skb_pool;</div><div class='ctx'> </div><div class='del'>-	if (!strchr(str, ':') &amp;&amp;</div><div class='del'>-	    in4_pton(str, -1, (void *)addr, -1, &amp;end) &gt; 0) {</div><div class='del'>-		if (!*end)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	if (in6_pton(str, -1, addr-&gt;in6.s6_addr, -1, &amp;end) &gt; 0) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		if (!*end)</div><div class='del'>-			return 1;</div><div class='del'>-#else</div><div class='del'>-		return -1;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='add'>+	cancel_work_sync(&amp;np-&gt;refill_wq);</div><div class='add'>+	skb_pool = &amp;np-&gt;skb_pool;</div><div class='add'>+	skb_queue_purge_reason(skb_pool, SKB_CONSUMED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int netpoll_parse_options(struct netpoll *np, char *opt)</div><div class='add'>+static void refill_skbs_work_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	char *cur=opt, *delim;</div><div class='del'>-	int ipv6;</div><div class='del'>-	bool ipversion_set = false;</div><div class='add'>+	struct netpoll *np =</div><div class='add'>+		container_of(work, struct netpoll, refill_wq);</div><div class='ctx'> </div><div class='del'>-	if (*cur != '@') {</div><div class='del'>-		if ((delim = strchr(cur, '@')) == NULL)</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		*delim = 0;</div><div class='del'>-		if (kstrtou16(cur, 10, &amp;np-&gt;local_port))</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		cur = delim;</div><div class='del'>-	}</div><div class='del'>-	cur++;</div><div class='del'>-</div><div class='del'>-	if (*cur != '/') {</div><div class='del'>-		ipversion_set = true;</div><div class='del'>-		if ((delim = strchr(cur, '/')) == NULL)</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		*delim = 0;</div><div class='del'>-		ipv6 = netpoll_parse_ip_addr(cur, &amp;np-&gt;local_ip);</div><div class='del'>-		if (ipv6 &lt; 0)</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		else</div><div class='del'>-			np-&gt;ipv6 = (bool)ipv6;</div><div class='del'>-		cur = delim;</div><div class='del'>-	}</div><div class='del'>-	cur++;</div><div class='del'>-</div><div class='del'>-	if (*cur != ',') {</div><div class='del'>-		/* parse out dev name */</div><div class='del'>-		if ((delim = strchr(cur, ',')) == NULL)</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		*delim = 0;</div><div class='del'>-		strlcpy(np-&gt;dev_name, cur, sizeof(np-&gt;dev_name));</div><div class='del'>-		cur = delim;</div><div class='del'>-	}</div><div class='del'>-	cur++;</div><div class='del'>-</div><div class='del'>-	if (*cur != '@') {</div><div class='del'>-		/* dst port */</div><div class='del'>-		if ((delim = strchr(cur, '@')) == NULL)</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		*delim = 0;</div><div class='del'>-		if (*cur == ' ' || *cur == '\t')</div><div class='del'>-			np_info(np, "warning: whitespace is not allowed\n");</div><div class='del'>-		if (kstrtou16(cur, 10, &amp;np-&gt;remote_port))</div><div class='del'>-			goto parse_failed;</div><div class='del'>-		cur = delim;</div><div class='del'>-	}</div><div class='del'>-	cur++;</div><div class='del'>-</div><div class='del'>-	/* dst ip */</div><div class='del'>-	if ((delim = strchr(cur, '/')) == NULL)</div><div class='del'>-		goto parse_failed;</div><div class='del'>-	*delim = 0;</div><div class='del'>-	ipv6 = netpoll_parse_ip_addr(cur, &amp;np-&gt;remote_ip);</div><div class='del'>-	if (ipv6 &lt; 0)</div><div class='del'>-		goto parse_failed;</div><div class='del'>-	else if (ipversion_set &amp;&amp; np-&gt;ipv6 != (bool)ipv6)</div><div class='del'>-		goto parse_failed;</div><div class='del'>-	else</div><div class='del'>-		np-&gt;ipv6 = (bool)ipv6;</div><div class='del'>-	cur = delim + 1;</div><div class='del'>-</div><div class='del'>-	if (*cur != 0) {</div><div class='del'>-		/* MAC address */</div><div class='del'>-		if (!mac_pton(cur, np-&gt;remote_mac))</div><div class='del'>-			goto parse_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netpoll_print_options(np);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- parse_failed:</div><div class='del'>-	np_info(np, "couldn't parse config at '%s'!\n", cur);</div><div class='del'>-	return -1;</div><div class='add'>+	refill_skbs(np);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netpoll_parse_options);</div><div class='ctx'> </div><div class='ctx'> int __netpoll_setup(struct netpoll *np, struct net_device *ndev)</div><div class='ctx'> {</div><div class='hunk'>@@ -589,18 +553,18 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)</div><div class='ctx'> 	const struct net_device_ops *ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	np-&gt;dev = ndev;</div><div class='del'>-	strlcpy(np-&gt;dev_name, ndev-&gt;name, IFNAMSIZ);</div><div class='del'>-	INIT_WORK(&amp;np-&gt;cleanup_work, netpoll_async_cleanup);</div><div class='add'>+	skb_queue_head_init(&amp;np-&gt;skb_pool);</div><div class='add'>+	INIT_WORK(&amp;np-&gt;refill_wq, refill_skbs_work_handler);</div><div class='ctx'> </div><div class='ctx'> 	if (ndev-&gt;priv_flags &amp; IFF_DISABLE_NETPOLL) {</div><div class='ctx'> 		np_err(np, "%s doesn't support polling, aborting\n",</div><div class='del'>-		       np-&gt;dev_name);</div><div class='add'>+		       ndev-&gt;name);</div><div class='ctx'> 		err = -ENOTSUPP;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ndev-&gt;npinfo) {</div><div class='add'>+	npinfo = rtnl_dereference(ndev-&gt;npinfo);</div><div class='add'>+	if (!npinfo) {</div><div class='ctx'> 		npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);</div><div class='ctx'> 		if (!npinfo) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='hunk'>@@ -613,18 +577,21 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		refcount_set(&amp;npinfo-&gt;refcnt, 1);</div><div class='ctx'> </div><div class='del'>-		ops = np-&gt;dev-&gt;netdev_ops;</div><div class='add'>+		ops = ndev-&gt;netdev_ops;</div><div class='ctx'> 		if (ops-&gt;ndo_netpoll_setup) {</div><div class='del'>-			err = ops-&gt;ndo_netpoll_setup(ndev, npinfo);</div><div class='add'>+			err = ops-&gt;ndo_netpoll_setup(ndev);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto free_npinfo;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		npinfo = rtnl_dereference(ndev-&gt;npinfo);</div><div class='ctx'> 		refcount_inc(&amp;npinfo-&gt;refcnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	npinfo-&gt;netpoll = np;</div><div class='add'>+	np-&gt;dev = ndev;</div><div class='add'>+	strscpy(np-&gt;dev_name, ndev-&gt;name, IFNAMSIZ);</div><div class='add'>+</div><div class='add'>+	/* fill up the skb queue */</div><div class='add'>+	refill_skbs(np);</div><div class='ctx'> </div><div class='ctx'> 	/* last thing to do is link it to the net device structure */</div><div class='ctx'> 	rcu_assign_pointer(ndev-&gt;npinfo, npinfo);</div><div class='hunk'>@@ -638,137 +605,187 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__netpoll_setup);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns a pointer to a string representation of the identifier used</div><div class='add'>+ * to select the egress interface for the given netpoll instance. buf</div><div class='add'>+ * must be a buffer of length at least MAC_ADDR_STR_LEN + 1.</div><div class='add'>+ */</div><div class='add'>+static char *egress_dev(struct netpoll *np, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (np-&gt;dev_name[0])</div><div class='add'>+		return np-&gt;dev_name;</div><div class='add'>+</div><div class='add'>+	snprintf(buf, MAC_ADDR_STR_LEN, "%pM", np-&gt;dev_mac);</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netpoll_wait_carrier(struct netpoll *np, struct net_device *ndev,</div><div class='add'>+				 unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned long atmost;</div><div class='add'>+</div><div class='add'>+	atmost = jiffies + timeout * HZ;</div><div class='add'>+	while (!netif_carrier_ok(ndev)) {</div><div class='add'>+		if (time_after(jiffies, atmost)) {</div><div class='add'>+			np_notice(np, "timeout waiting for carrier\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Take the IPv6 from ndev and populate local_ip structure in netpoll</div><div class='add'>+ */</div><div class='add'>+static int netpoll_take_ipv6(struct netpoll *np, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	char buf[MAC_ADDR_STR_LEN + 1];</div><div class='add'>+	int err = -EDESTADDRREQ;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_IPV6)) {</div><div class='add'>+		np_err(np, "IPv6 is not supported %s, aborting\n",</div><div class='add'>+		       egress_dev(np, buf));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idev = __in6_dev_get(ndev);</div><div class='add'>+	if (idev) {</div><div class='add'>+		struct inet6_ifaddr *ifp;</div><div class='add'>+</div><div class='add'>+		read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		list_for_each_entry(ifp, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+			if (!!(ipv6_addr_type(&amp;ifp-&gt;addr) &amp; IPV6_ADDR_LINKLOCAL) !=</div><div class='add'>+				!!(ipv6_addr_type(&amp;np-&gt;remote_ip.in6) &amp; IPV6_ADDR_LINKLOCAL))</div><div class='add'>+				continue;</div><div class='add'>+			/* Got the IP, let's return */</div><div class='add'>+			np-&gt;local_ip.in6 = ifp-&gt;addr;</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='add'>+		np_err(np, "no IPv6 address for %s, aborting\n",</div><div class='add'>+		       egress_dev(np, buf));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	np_info(np, "local IPv6 %pI6c\n", &amp;np-&gt;local_ip.in6);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Take the IPv4 from ndev and populate local_ip structure in netpoll</div><div class='add'>+ */</div><div class='add'>+static int netpoll_take_ipv4(struct netpoll *np, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	char buf[MAC_ADDR_STR_LEN + 1];</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+</div><div class='add'>+	in_dev = __in_dev_get_rtnl(ndev);</div><div class='add'>+	if (!in_dev) {</div><div class='add'>+		np_err(np, "no IP address for %s, aborting\n",</div><div class='add'>+		       egress_dev(np, buf));</div><div class='add'>+		return -EDESTADDRREQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ifa = rtnl_dereference(in_dev-&gt;ifa_list);</div><div class='add'>+	if (!ifa) {</div><div class='add'>+		np_err(np, "no IP address for %s, aborting\n",</div><div class='add'>+		       egress_dev(np, buf));</div><div class='add'>+		return -EDESTADDRREQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	np-&gt;local_ip.ip = ifa-&gt;ifa_local;</div><div class='add'>+	np_info(np, "local IP %pI4\n", &amp;np-&gt;local_ip.ip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int netpoll_setup(struct netpoll *np)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	char buf[MAC_ADDR_STR_LEN + 1];</div><div class='ctx'> 	struct net_device *ndev = NULL;</div><div class='del'>-	struct in_device *in_dev;</div><div class='add'>+	bool ip_overwritten = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	if (np-&gt;dev_name[0]) {</div><div class='del'>-		struct net *net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	if (np-&gt;dev_name[0])</div><div class='ctx'> 		ndev = __dev_get_by_name(net, np-&gt;dev_name);</div><div class='del'>-	}</div><div class='add'>+	else if (is_valid_ether_addr(np-&gt;dev_mac))</div><div class='add'>+		ndev = dev_getbyhwaddr(net, ARPHRD_ETHER, np-&gt;dev_mac);</div><div class='add'>+</div><div class='ctx'> 	if (!ndev) {</div><div class='del'>-		np_err(np, "%s doesn't exist, aborting\n", np-&gt;dev_name);</div><div class='add'>+		np_err(np, "%s doesn't exist, aborting\n", egress_dev(np, buf));</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-	dev_hold(ndev);</div><div class='add'>+	netdev_hold(ndev, &amp;np-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (netdev_master_upper_dev_get(ndev)) {</div><div class='del'>-		np_err(np, "%s is a slave device, aborting\n", np-&gt;dev_name);</div><div class='add'>+		np_err(np, "%s is a slave device, aborting\n",</div><div class='add'>+		       egress_dev(np, buf));</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(ndev)) {</div><div class='del'>-		unsigned long atmost, atleast;</div><div class='del'>-</div><div class='del'>-		np_info(np, "device %s not up yet, forcing it\n", np-&gt;dev_name);</div><div class='del'>-</div><div class='del'>-		err = dev_open(ndev);</div><div class='add'>+		np_info(np, "device %s not up yet, forcing it\n",</div><div class='add'>+			egress_dev(np, buf));</div><div class='ctx'> </div><div class='add'>+		err = dev_open(ndev, NULL);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			np_err(np, "failed to open %s\n", ndev-&gt;name);</div><div class='ctx'> 			goto put;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rtnl_unlock();</div><div class='del'>-		atleast = jiffies + HZ/10;</div><div class='del'>-		atmost = jiffies + carrier_timeout * HZ;</div><div class='del'>-		while (!netif_carrier_ok(ndev)) {</div><div class='del'>-			if (time_after(jiffies, atmost)) {</div><div class='del'>-				np_notice(np, "timeout waiting for carrier\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			msleep(1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If carrier appears to come up instantly, we don't</div><div class='del'>-		 * trust it and pause so that we don't pump all our</div><div class='del'>-		 * queued console messages into the bitbucket.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (time_before(jiffies, atleast)) {</div><div class='del'>-			np_notice(np, "carrier detect appears untrustworthy, waiting 4 seconds\n");</div><div class='del'>-			msleep(4000);</div><div class='del'>-		}</div><div class='add'>+		netpoll_wait_carrier(np, ndev, carrier_timeout);</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!np-&gt;local_ip.ip) {</div><div class='ctx'> 		if (!np-&gt;ipv6) {</div><div class='del'>-			in_dev = __in_dev_get_rtnl(ndev);</div><div class='del'>-</div><div class='del'>-			if (!in_dev || !in_dev-&gt;ifa_list) {</div><div class='del'>-				np_err(np, "no IP address for %s, aborting\n",</div><div class='del'>-				       np-&gt;dev_name);</div><div class='del'>-				err = -EDESTADDRREQ;</div><div class='add'>+			err = netpoll_take_ipv4(np, ndev);</div><div class='add'>+			if (err)</div><div class='ctx'> 				goto put;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			np-&gt;local_ip.ip = in_dev-&gt;ifa_list-&gt;ifa_local;</div><div class='del'>-			np_info(np, "local IP %pI4\n", &amp;np-&gt;local_ip.ip);</div><div class='ctx'> 		} else {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-			struct inet6_dev *idev;</div><div class='del'>-</div><div class='del'>-			err = -EDESTADDRREQ;</div><div class='del'>-			idev = __in6_dev_get(ndev);</div><div class='del'>-			if (idev) {</div><div class='del'>-				struct inet6_ifaddr *ifp;</div><div class='del'>-</div><div class='del'>-				read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-				list_for_each_entry(ifp, &amp;idev-&gt;addr_list, if_list) {</div><div class='del'>-					if (ipv6_addr_type(&amp;ifp-&gt;addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='del'>-						continue;</div><div class='del'>-					np-&gt;local_ip.in6 = ifp-&gt;addr;</div><div class='del'>-					err = 0;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-			}</div><div class='del'>-			if (err) {</div><div class='del'>-				np_err(np, "no IPv6 address for %s, aborting\n",</div><div class='del'>-				       np-&gt;dev_name);</div><div class='add'>+			err = netpoll_take_ipv6(np, ndev);</div><div class='add'>+			if (err)</div><div class='ctx'> 				goto put;</div><div class='del'>-			} else</div><div class='del'>-				np_info(np, "local IPv6 %pI6c\n", &amp;np-&gt;local_ip.in6);</div><div class='del'>-#else</div><div class='del'>-			np_err(np, "IPv6 is not supported %s, aborting\n",</div><div class='del'>-			       np-&gt;dev_name);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto put;</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='add'>+		ip_overwritten = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* fill up the skb queue */</div><div class='del'>-	refill_skbs();</div><div class='del'>-</div><div class='ctx'> 	err = __netpoll_setup(np, ndev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto put;</div><div class='del'>-</div><div class='add'>+		goto flush;</div><div class='ctx'> 	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	/* Make sure all NAPI polls which started before dev-&gt;npinfo</div><div class='add'>+	 * was visible have exited before we start calling NAPI poll.</div><div class='add'>+	 * NAPI skips locking if dev-&gt;npinfo is NULL.</div><div class='add'>+	 */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+flush:</div><div class='add'>+	skb_pool_flush(np);</div><div class='ctx'> put:</div><div class='del'>-	dev_put(ndev);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(np-&gt;dev);</div><div class='add'>+	if (ip_overwritten)</div><div class='add'>+		memset(&amp;np-&gt;local_ip, 0, sizeof(np-&gt;local_ip));</div><div class='add'>+	netdev_put(ndev, &amp;np-&gt;dev_tracker);</div><div class='ctx'> unlock:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netpoll_setup);</div><div class='ctx'> </div><div class='del'>-static int __init netpoll_init(void)</div><div class='del'>-{</div><div class='del'>-	skb_queue_head_init(&amp;skb_pool);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-core_initcall(netpoll_init);</div><div class='del'>-</div><div class='ctx'> static void rcu_cleanup_netpoll_info(struct rcu_head *rcu_head)</div><div class='ctx'> {</div><div class='ctx'> 	struct netpoll_info *npinfo =</div><div class='hunk'>@@ -786,20 +803,18 @@ static void rcu_cleanup_netpoll_info(struct rcu_head *rcu_head)</div><div class='ctx'> 	kfree(npinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __netpoll_cleanup(struct netpoll *np)</div><div class='add'>+static void __netpoll_cleanup(struct netpoll *np)</div><div class='ctx'> {</div><div class='ctx'> 	struct netpoll_info *npinfo;</div><div class='ctx'> </div><div class='del'>-	/* rtnl_dereference would be preferable here but</div><div class='del'>-	 * rcu_cleanup_netpoll path can put us in here safely without</div><div class='del'>-	 * holding the rtnl, so plain rcu_dereference it is</div><div class='del'>-	 */</div><div class='ctx'> 	npinfo = rtnl_dereference(np-&gt;dev-&gt;npinfo);</div><div class='ctx'> 	if (!npinfo)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	synchronize_srcu(&amp;netpoll_srcu);</div><div class='del'>-</div><div class='add'>+	/* At this point, there is a single npinfo instance per netdevice, and</div><div class='add'>+	 * its refcnt tracks how many netpoll structures are linked to it. We</div><div class='add'>+	 * only perform npinfo cleanup when the refcnt decrements to zero.</div><div class='add'>+	 */</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;npinfo-&gt;refcnt)) {</div><div class='ctx'> 		const struct net_device_ops *ops;</div><div class='ctx'> </div><div class='hunk'>@@ -808,36 +823,37 @@ void __netpoll_cleanup(struct netpoll *np)</div><div class='ctx'> 			ops-&gt;ndo_netpoll_cleanup(np-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		RCU_INIT_POINTER(np-&gt;dev-&gt;npinfo, NULL);</div><div class='del'>-		call_rcu_bh(&amp;npinfo-&gt;rcu, rcu_cleanup_netpoll_info);</div><div class='del'>-	} else</div><div class='del'>-		RCU_INIT_POINTER(np-&gt;dev-&gt;npinfo, NULL);</div><div class='add'>+		call_rcu(&amp;npinfo-&gt;rcu, rcu_cleanup_netpoll_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pool_flush(np);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__netpoll_cleanup);</div><div class='ctx'> </div><div class='del'>-static void netpoll_async_cleanup(struct work_struct *work)</div><div class='add'>+void __netpoll_free(struct netpoll *np)</div><div class='ctx'> {</div><div class='del'>-	struct netpoll *np = container_of(work, struct netpoll, cleanup_work);</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	/* Wait for transmitting packets to finish before freeing. */</div><div class='add'>+	synchronize_net();</div><div class='ctx'> 	__netpoll_cleanup(np);</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> 	kfree(np);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__netpoll_free);</div><div class='ctx'> </div><div class='del'>-void __netpoll_free_async(struct netpoll *np)</div><div class='add'>+void do_netpoll_cleanup(struct netpoll *np)</div><div class='ctx'> {</div><div class='del'>-	schedule_work(&amp;np-&gt;cleanup_work);</div><div class='add'>+	__netpoll_cleanup(np);</div><div class='add'>+	netdev_put(np-&gt;dev, &amp;np-&gt;dev_tracker);</div><div class='add'>+	np-&gt;dev = NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__netpoll_free_async);</div><div class='add'>+EXPORT_SYMBOL(do_netpoll_cleanup);</div><div class='ctx'> </div><div class='ctx'> void netpoll_cleanup(struct netpoll *np)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (!np-&gt;dev)</div><div class='ctx'> 		goto out;</div><div class='del'>-	__netpoll_cleanup(np);</div><div class='del'>-	dev_put(np-&gt;dev);</div><div class='del'>-	np-&gt;dev = NULL;</div><div class='add'>+	do_netpoll_cleanup(np);</div><div class='ctx'> out:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c<br/>index b9057478d69c..8456dfbe2eb4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/netprio_cgroup.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/netprio_cgroup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/netprio_cgroup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/netprio_cgroup.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/netprio_cgroup.c	Priority Control Group</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +93,7 @@ static int extend_netdev_table(struct net_device *dev, u32 target_idx)</div><div class='ctx'> static u32 netprio_prio(struct cgroup_subsys_state *css, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netprio_map *map = rcu_dereference_rtnl(dev-&gt;priomap);</div><div class='del'>-	int id = css-&gt;cgroup-&gt;id;</div><div class='add'>+	int id = css-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	if (map &amp;&amp; id &lt; map-&gt;priomap_len)</div><div class='ctx'> 		return map-&gt;priomap[id];</div><div class='hunk'>@@ -117,7 +113,7 @@ static int netprio_set_prio(struct cgroup_subsys_state *css,</div><div class='ctx'> 			    struct net_device *dev, u32 prio)</div><div class='ctx'> {</div><div class='ctx'> 	struct netprio_map *map;</div><div class='del'>-	int id = css-&gt;cgroup-&gt;id;</div><div class='add'>+	int id = css-&gt;id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* avoid extending priomap for zero writes */</div><div class='hunk'>@@ -181,7 +177,7 @@ static void cgrp_css_free(struct cgroup_subsys_state *css)</div><div class='ctx'> </div><div class='ctx'> static u64 read_prioidx(struct cgroup_subsys_state *css, struct cftype *cft)</div><div class='ctx'> {</div><div class='del'>-	return css-&gt;cgroup-&gt;id;</div><div class='add'>+	return css-&gt;id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_priomap(struct seq_file *sf, void *v)</div><div class='hunk'>@@ -211,8 +207,6 @@ static ssize_t write_priomap(struct kernfs_open_file *of,</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	cgroup_sk_alloc_disable();</div><div class='del'>-</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 	ret = netprio_set_prio(of_css(of), dev, prio);</div><div class='hunk'>@@ -224,14 +218,11 @@ static ssize_t write_priomap(struct kernfs_open_file *of,</div><div class='ctx'> </div><div class='ctx'> static int update_netprio(const void *v, struct file *file, unsigned n)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct socket *sock = sock_from_file(file, &amp;err);</div><div class='del'>-	if (sock) {</div><div class='del'>-		spin_lock(&amp;cgroup_sk_update_lock);</div><div class='add'>+	struct socket *sock = sock_from_file(file);</div><div class='add'>+</div><div class='add'>+	if (sock)</div><div class='ctx'> 		sock_cgroup_set_prioidx(&amp;sock-&gt;sk-&gt;sk_cgrp_data,</div><div class='ctx'> 					(unsigned long)v);</div><div class='del'>-		spin_unlock(&amp;cgroup_sk_update_lock);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +232,7 @@ static void net_prio_attach(struct cgroup_taskset *tset)</div><div class='ctx'> 	struct cgroup_subsys_state *css;</div><div class='ctx'> </div><div class='ctx'> 	cgroup_taskset_for_each(p, css, tset) {</div><div class='del'>-		void *v = (void *)(unsigned long)css-&gt;cgroup-&gt;id;</div><div class='add'>+		void *v = (void *)(unsigned long)css-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 		task_lock(p);</div><div class='ctx'> 		iterate_fd(p-&gt;files, 0, update_netprio, v);</div><div class='hunk'>@@ -301,6 +292,4 @@ static int __init init_cgroup_netprio(void)</div><div class='ctx'> 	register_netdevice_notifier(&amp;netprio_device_notifier);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> subsys_initcall(init_cgroup_netprio);</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/net/core/of_net.c b/net/core/of_net.c<br/>new file mode 100644<br/>index 000000000000..93ea425b9248<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/of_net.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/of_net.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * OF helpers for network devices.</div><div class='add'>+ *</div><div class='add'>+ * Initially copied out of arch/powerpc/kernel/prom_parse.c</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_get_phy_mode - Get phy mode for given device_node</div><div class='add'>+ * @np:	Pointer to the given device_node</div><div class='add'>+ * @interface: Pointer to the result</div><div class='add'>+ *</div><div class='add'>+ * The function gets phy interface string from property 'phy-mode' or</div><div class='add'>+ * 'phy-connection-type'. The index in phy_modes table is set in</div><div class='add'>+ * interface and 0 returned. In case of error interface is set to</div><div class='add'>+ * PHY_INTERFACE_MODE_NA and an errno is returned, e.g. -ENODEV.</div><div class='add'>+ */</div><div class='add'>+int of_get_phy_mode(struct device_node *np, phy_interface_t *interface)</div><div class='add'>+{</div><div class='add'>+	const char *pm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	*interface = PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_string(np, "phy-mode", &amp;pm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		err = of_property_read_string(np, "phy-connection-type", &amp;pm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PHY_INTERFACE_MODE_MAX; i++)</div><div class='add'>+		if (!strcasecmp(pm, phy_modes(i))) {</div><div class='add'>+			*interface = i;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_get_phy_mode);</div><div class='add'>+</div><div class='add'>+static int of_get_mac_addr(struct device_node *np, const char *name, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct property *pp = of_find_property(np, name, NULL);</div><div class='add'>+</div><div class='add'>+	if (pp &amp;&amp; pp-&gt;length == ETH_ALEN &amp;&amp; is_valid_ether_addr(pp-&gt;value)) {</div><div class='add'>+		memcpy(addr, pp-&gt;value, ETH_ALEN);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int of_get_mac_address_nvmem(struct device_node *np, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = of_find_device_by_node(np);</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	const void *mac;</div><div class='add'>+	size_t len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Try lookup by device first, there might be a nvmem_cell_lookup</div><div class='add'>+	 * associated with a given device.</div><div class='add'>+	 */</div><div class='add'>+	if (pdev) {</div><div class='add'>+		ret = nvmem_get_mac_address(&amp;pdev-&gt;dev, addr);</div><div class='add'>+		put_device(&amp;pdev-&gt;dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cell = of_nvmem_cell_get(np, "mac-address");</div><div class='add'>+	if (IS_ERR(cell))</div><div class='add'>+		return PTR_ERR(cell);</div><div class='add'>+</div><div class='add'>+	mac = nvmem_cell_read(cell, &amp;len);</div><div class='add'>+	nvmem_cell_put(cell);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mac))</div><div class='add'>+		return PTR_ERR(mac);</div><div class='add'>+</div><div class='add'>+	if (len != ETH_ALEN || !is_valid_ether_addr(mac)) {</div><div class='add'>+		kfree(mac);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(addr, mac, ETH_ALEN);</div><div class='add'>+	kfree(mac);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_mac_address_nvmem);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_get_mac_address()</div><div class='add'>+ * @np:		Caller's Device Node</div><div class='add'>+ * @addr:	Pointer to a six-byte array for the result</div><div class='add'>+ *</div><div class='add'>+ * Search the device tree for the best MAC address to use.  'mac-address' is</div><div class='add'>+ * checked first, because that is supposed to contain to "most recent" MAC</div><div class='add'>+ * address. If that isn't set, then 'local-mac-address' is checked next,</div><div class='add'>+ * because that is the default address. If that isn't set, then the obsolete</div><div class='add'>+ * 'address' is checked, just in case we're using an old device tree. If any</div><div class='add'>+ * of the above isn't set, then try to get MAC address from nvmem cell named</div><div class='add'>+ * 'mac-address'.</div><div class='add'>+ *</div><div class='add'>+ * Note that the 'address' property is supposed to contain a virtual address of</div><div class='add'>+ * the register set, but some DTS files have redefined that property to be the</div><div class='add'>+ * MAC address.</div><div class='add'>+ *</div><div class='add'>+ * All-zero MAC addresses are rejected, because those could be properties that</div><div class='add'>+ * exist in the device tree, but were not set by U-Boot.  For example, the</div><div class='add'>+ * DTS could define 'mac-address' and 'local-mac-address', with zero MAC</div><div class='add'>+ * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In</div><div class='add'>+ * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists</div><div class='add'>+ * but is all zeros.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and errno in case of error.</div><div class='add'>+*/</div><div class='add'>+int of_get_mac_address(struct device_node *np, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = of_get_mac_addr(np, "mac-address", addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = of_get_mac_addr(np, "local-mac-address", addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = of_get_mac_addr(np, "address", addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return of_get_mac_address_nvmem(np, addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_mac_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_get_ethdev_address()</div><div class='add'>+ * @np:		Caller's Device Node</div><div class='add'>+ * @dev:	Pointer to netdevice which address will be updated</div><div class='add'>+ *</div><div class='add'>+ * Search the device tree for the best MAC address to use.</div><div class='add'>+ * If found set @dev-&gt;dev_addr to that address.</div><div class='add'>+ *</div><div class='add'>+ * See documentation of of_get_mac_address() for more information on how</div><div class='add'>+ * the best address is determined.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and errno in case of error.</div><div class='add'>+ */</div><div class='add'>+int of_get_ethdev_address(struct device_node *np, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = of_get_mac_address(np, addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_ethdev_address);</div><div class='head'>diff --git a/net/core/page_pool.c b/net/core/page_pool.c<br/>index 43a932cb609b..265a729431bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/page_pool.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/page_pool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/page_pool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/page_pool.c</a></div><div class='hunk'>@@ -4,208 +4,791 @@</div><div class='ctx'>  *	Author:	Jesper Dangaard Brouer &lt;netoptimizer@brouer.com&gt;</div><div class='ctx'>  *	Copyright (C) 2016 Red Hat, Inc.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/error-injection.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/page_pool.h&gt;</div><div class='ctx'> #include &lt;linux/dma-direction.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt; /* for __put_page() */</div><div class='add'>+#include &lt;linux/mm.h&gt; /* for put_page() */</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/page_pool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+#include "mp_dmabuf_devmem.h"</div><div class='add'>+#include "netmem_priv.h"</div><div class='add'>+#include "page_pool_priv.h"</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(page_pool_mem_providers);</div><div class='add'>+</div><div class='add'>+#define DEFER_TIME (msecs_to_jiffies(1000))</div><div class='add'>+#define DEFER_WARN_INTERVAL (60 * HZ)</div><div class='add'>+</div><div class='add'>+#define BIAS_MAX	(LONG_MAX &gt;&gt; 1)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+static DEFINE_PER_CPU(struct page_pool_recycle_stats, pp_system_recycle_stats);</div><div class='add'>+</div><div class='add'>+/* alloc_stat_inc is intended to be used in softirq context */</div><div class='add'>+#define alloc_stat_inc(pool, __stat)	(pool-&gt;alloc_stats.__stat++)</div><div class='add'>+/* recycle_stat_inc is safe to use when preemption is possible. */</div><div class='add'>+#define recycle_stat_inc(pool, __stat)							\</div><div class='add'>+	do {										\</div><div class='add'>+		struct page_pool_recycle_stats __percpu *s = pool-&gt;recycle_stats;	\</div><div class='add'>+		this_cpu_inc(s-&gt;__stat);						\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define recycle_stat_add(pool, __stat, val)						\</div><div class='add'>+	do {										\</div><div class='add'>+		struct page_pool_recycle_stats __percpu *s = pool-&gt;recycle_stats;	\</div><div class='add'>+		this_cpu_add(s-&gt;__stat, val);						\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static const char pp_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"rx_pp_alloc_fast",</div><div class='add'>+	"rx_pp_alloc_slow",</div><div class='add'>+	"rx_pp_alloc_slow_ho",</div><div class='add'>+	"rx_pp_alloc_empty",</div><div class='add'>+	"rx_pp_alloc_refill",</div><div class='add'>+	"rx_pp_alloc_waive",</div><div class='add'>+	"rx_pp_recycle_cached",</div><div class='add'>+	"rx_pp_recycle_cache_full",</div><div class='add'>+	"rx_pp_recycle_ring",</div><div class='add'>+	"rx_pp_recycle_ring_full",</div><div class='add'>+	"rx_pp_recycle_released_ref",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_pool_get_stats() - fetch page pool stats</div><div class='add'>+ * @pool:	pool from which page was allocated</div><div class='add'>+ * @stats:	struct page_pool_stats to fill in</div><div class='add'>+ *</div><div class='add'>+ * Retrieve statistics about the page_pool. This API is only available</div><div class='add'>+ * if the kernel has been configured with ``CONFIG_PAGE_POOL_STATS=y``.</div><div class='add'>+ * A pointer to a caller allocated struct page_pool_stats structure</div><div class='add'>+ * is passed to this API which is filled in. The caller can then report</div><div class='add'>+ * those stats to the user (perhaps via ethtool, debugfs, etc.).</div><div class='add'>+ */</div><div class='add'>+bool page_pool_get_stats(const struct page_pool *pool,</div><div class='add'>+			 struct page_pool_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int cpu = 0;</div><div class='add'>+</div><div class='add'>+	if (!stats)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* The caller is responsible to initialize stats. */</div><div class='add'>+	stats-&gt;alloc_stats.fast += pool-&gt;alloc_stats.fast;</div><div class='add'>+	stats-&gt;alloc_stats.slow += pool-&gt;alloc_stats.slow;</div><div class='add'>+	stats-&gt;alloc_stats.slow_high_order += pool-&gt;alloc_stats.slow_high_order;</div><div class='add'>+	stats-&gt;alloc_stats.empty += pool-&gt;alloc_stats.empty;</div><div class='add'>+	stats-&gt;alloc_stats.refill += pool-&gt;alloc_stats.refill;</div><div class='add'>+	stats-&gt;alloc_stats.waive += pool-&gt;alloc_stats.waive;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		const struct page_pool_recycle_stats *pcpu =</div><div class='add'>+			per_cpu_ptr(pool-&gt;recycle_stats, cpu);</div><div class='add'>+</div><div class='add'>+		stats-&gt;recycle_stats.cached += pcpu-&gt;cached;</div><div class='add'>+		stats-&gt;recycle_stats.cache_full += pcpu-&gt;cache_full;</div><div class='add'>+		stats-&gt;recycle_stats.ring += pcpu-&gt;ring;</div><div class='add'>+		stats-&gt;recycle_stats.ring_full += pcpu-&gt;ring_full;</div><div class='add'>+		stats-&gt;recycle_stats.released_refcnt += pcpu-&gt;released_refcnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_get_stats);</div><div class='add'>+</div><div class='add'>+u8 *page_pool_ethtool_stats_get_strings(u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pp_stats); i++) {</div><div class='add'>+		memcpy(data, pp_stats[i], ETH_GSTRING_LEN);</div><div class='add'>+		data += ETH_GSTRING_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_ethtool_stats_get_strings);</div><div class='add'>+</div><div class='add'>+int page_pool_ethtool_stats_get_count(void)</div><div class='add'>+{</div><div class='add'>+	return ARRAY_SIZE(pp_stats);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_ethtool_stats_get_count);</div><div class='add'>+</div><div class='add'>+u64 *page_pool_ethtool_stats_get(u64 *data, const void *stats)</div><div class='add'>+{</div><div class='add'>+	const struct page_pool_stats *pool_stats = stats;</div><div class='add'>+</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.fast;</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.slow;</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.slow_high_order;</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.empty;</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.refill;</div><div class='add'>+	*data++ = pool_stats-&gt;alloc_stats.waive;</div><div class='add'>+	*data++ = pool_stats-&gt;recycle_stats.cached;</div><div class='add'>+	*data++ = pool_stats-&gt;recycle_stats.cache_full;</div><div class='add'>+	*data++ = pool_stats-&gt;recycle_stats.ring;</div><div class='add'>+	*data++ = pool_stats-&gt;recycle_stats.ring_full;</div><div class='add'>+	*data++ = pool_stats-&gt;recycle_stats.released_refcnt;</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_ethtool_stats_get);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define alloc_stat_inc(...)	do { } while (0)</div><div class='add'>+#define recycle_stat_inc(...)	do { } while (0)</div><div class='add'>+#define recycle_stat_add(...)	do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool page_pool_producer_lock(struct page_pool *pool)</div><div class='add'>+	__acquires(&amp;pool-&gt;ring.producer_lock)</div><div class='add'>+{</div><div class='add'>+	bool in_softirq = in_softirq();</div><div class='add'>+</div><div class='add'>+	if (in_softirq)</div><div class='add'>+		spin_lock(&amp;pool-&gt;ring.producer_lock);</div><div class='add'>+	else</div><div class='add'>+		spin_lock_bh(&amp;pool-&gt;ring.producer_lock);</div><div class='add'>+</div><div class='add'>+	return in_softirq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_producer_unlock(struct page_pool *pool,</div><div class='add'>+				      bool in_softirq)</div><div class='add'>+	__releases(&amp;pool-&gt;ring.producer_lock)</div><div class='add'>+{</div><div class='add'>+	if (in_softirq)</div><div class='add'>+		spin_unlock(&amp;pool-&gt;ring.producer_lock);</div><div class='add'>+	else</div><div class='add'>+		spin_unlock_bh(&amp;pool-&gt;ring.producer_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_struct_check(void)</div><div class='add'>+{</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct page_pool, frag, frag_users);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct page_pool, frag, frag_page);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct page_pool, frag, frag_offset);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_SIZE(struct page_pool, frag,</div><div class='add'>+				    PAGE_POOL_FRAG_GROUP_ALIGN);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int page_pool_init(struct page_pool *pool,</div><div class='del'>-			  const struct page_pool_params *params)</div><div class='add'>+			  const struct page_pool_params *params,</div><div class='add'>+			  int cpuid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ring_qsize = 1024; /* Default */</div><div class='add'>+	struct netdev_rx_queue *rxq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	page_pool_struct_check();</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;pool-&gt;p, params, sizeof(pool-&gt;p));</div><div class='add'>+	memcpy(&amp;pool-&gt;p, &amp;params-&gt;fast, sizeof(pool-&gt;p));</div><div class='add'>+	memcpy(&amp;pool-&gt;slow, &amp;params-&gt;slow, sizeof(pool-&gt;slow));</div><div class='add'>+</div><div class='add'>+	pool-&gt;cpuid = cpuid;</div><div class='add'>+	pool-&gt;dma_sync_for_cpu = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Validate only known flags were used */</div><div class='del'>-	if (pool-&gt;p.flags &amp; ~(PP_FLAG_ALL))</div><div class='add'>+	if (pool-&gt;slow.flags &amp; ~PP_FLAG_ALL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (pool-&gt;p.pool_size)</div><div class='del'>-		ring_qsize = pool-&gt;p.pool_size;</div><div class='del'>-</div><div class='del'>-	/* Sanity limit mem that can be pinned down */</div><div class='del'>-	if (ring_qsize &gt; 32768)</div><div class='del'>-		return -E2BIG;</div><div class='add'>+		ring_qsize = min(pool-&gt;p.pool_size, 16384);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA direction is either DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.</div><div class='ctx'> 	 * DMA_BIDIRECTIONAL is for allowing page used for DMA sending,</div><div class='ctx'> 	 * which is the XDP_TX use-case.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((pool-&gt;p.dma_dir != DMA_FROM_DEVICE) &amp;&amp;</div><div class='del'>-	    (pool-&gt;p.dma_dir != DMA_BIDIRECTIONAL))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (pool-&gt;slow.flags &amp; PP_FLAG_DMA_MAP) {</div><div class='add'>+		if ((pool-&gt;p.dma_dir != DMA_FROM_DEVICE) &amp;&amp;</div><div class='add'>+		    (pool-&gt;p.dma_dir != DMA_BIDIRECTIONAL))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		pool-&gt;dma_map = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;slow.flags &amp; PP_FLAG_DMA_SYNC_DEV) {</div><div class='add'>+		/* In order to request DMA-sync-for-device the page</div><div class='add'>+		 * needs to be mapped</div><div class='add'>+		 */</div><div class='add'>+		if (!(pool-&gt;slow.flags &amp; PP_FLAG_DMA_MAP))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!pool-&gt;p.max_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		pool-&gt;dma_sync = true;</div><div class='add'>+</div><div class='add'>+		/* pool-&gt;p.offset has to be set according to the address</div><div class='add'>+		 * offset used by the DMA engine to start copying rx data</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pool-&gt;has_init_callback = !!pool-&gt;slow.init_callback;</div><div class='ctx'> </div><div class='del'>-	if (ptr_ring_init(&amp;pool-&gt;ring, ring_qsize, GFP_KERNEL) &lt; 0)</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	if (!(pool-&gt;slow.flags &amp; PP_FLAG_SYSTEM_POOL)) {</div><div class='add'>+		pool-&gt;recycle_stats = alloc_percpu(struct page_pool_recycle_stats);</div><div class='add'>+		if (!pool-&gt;recycle_stats)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		/* For system page pool instance we use a singular stats object</div><div class='add'>+		 * instead of allocating a separate percpu variable for each</div><div class='add'>+		 * (also percpu) page pool instance.</div><div class='add'>+		 */</div><div class='add'>+		pool-&gt;recycle_stats = &amp;pp_system_recycle_stats;</div><div class='add'>+		pool-&gt;system = true;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (ptr_ring_init(&amp;pool-&gt;ring, ring_qsize, GFP_KERNEL) &lt; 0) {</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+		if (!pool-&gt;system)</div><div class='add'>+			free_percpu(pool-&gt;recycle_stats);</div><div class='add'>+#endif</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;pool-&gt;pages_state_release_cnt, 0);</div><div class='add'>+</div><div class='add'>+	/* Driver calling page_pool_create() also call page_pool_destroy() */</div><div class='add'>+	refcount_set(&amp;pool-&gt;user_cnt, 1);</div><div class='add'>+</div><div class='add'>+	xa_init_flags(&amp;pool-&gt;dma_mapped, XA_FLAGS_ALLOC1);</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;slow.flags &amp; PP_FLAG_ALLOW_UNREADABLE_NETMEM) {</div><div class='add'>+		netdev_assert_locked(pool-&gt;slow.netdev);</div><div class='add'>+		rxq = __netif_get_rx_queue(pool-&gt;slow.netdev,</div><div class='add'>+					   pool-&gt;slow.queue_idx);</div><div class='add'>+		pool-&gt;mp_priv = rxq-&gt;mp_params.mp_priv;</div><div class='add'>+		pool-&gt;mp_ops = rxq-&gt;mp_params.mp_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;mp_ops) {</div><div class='add'>+		if (!pool-&gt;dma_map || !pool-&gt;dma_sync) {</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto free_ptr_ring;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!is_kernel_rodata((unsigned long)pool-&gt;mp_ops))) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto free_ptr_ring;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = pool-&gt;mp_ops-&gt;init(pool);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_warn("%s() mem-provider init failed %d\n", __func__,</div><div class='add'>+				err);</div><div class='add'>+			goto free_ptr_ring;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		static_branch_inc(&amp;page_pool_mem_providers);</div><div class='add'>+	} else if (pool-&gt;p.order &gt; MAX_PAGE_ORDER) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto free_ptr_ring;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_ptr_ring:</div><div class='add'>+	ptr_ring_cleanup(&amp;pool-&gt;ring, NULL);</div><div class='add'>+	xa_destroy(&amp;pool-&gt;dma_mapped);</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	if (!pool-&gt;system)</div><div class='add'>+		free_percpu(pool-&gt;recycle_stats);</div><div class='add'>+#endif</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page_pool *page_pool_create(const struct page_pool_params *params)</div><div class='add'>+static void page_pool_uninit(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	ptr_ring_cleanup(&amp;pool-&gt;ring, NULL);</div><div class='add'>+	xa_destroy(&amp;pool-&gt;dma_mapped);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	if (!pool-&gt;system)</div><div class='add'>+		free_percpu(pool-&gt;recycle_stats);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_pool_create_percpu() - create a page pool for a given cpu.</div><div class='add'>+ * @params: parameters, see struct page_pool_params</div><div class='add'>+ * @cpuid: cpu identifier</div><div class='add'>+ */</div><div class='add'>+struct page_pool *</div><div class='add'>+page_pool_create_percpu(const struct page_pool_params *params, int cpuid)</div><div class='ctx'> {</div><div class='ctx'> 	struct page_pool *pool;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	pool = kzalloc_node(sizeof(*pool), GFP_KERNEL, params-&gt;nid);</div><div class='ctx'> 	if (!pool)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	err = page_pool_init(pool, params);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pr_warn("%s() gave up with errno %d\n", __func__, err);</div><div class='del'>-		kfree(pool);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='add'>+	err = page_pool_init(pool, params, cpuid);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	err = page_pool_list(pool);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_uninit;</div><div class='add'>+</div><div class='ctx'> 	return pool;</div><div class='add'>+</div><div class='add'>+err_uninit:</div><div class='add'>+	page_pool_uninit(pool);</div><div class='add'>+err_free:</div><div class='add'>+	pr_warn("%s() gave up with errno %d\n", __func__, err);</div><div class='add'>+	kfree(pool);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_create_percpu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_pool_create() - create a page pool</div><div class='add'>+ * @params: parameters, see struct page_pool_params</div><div class='add'>+ */</div><div class='add'>+struct page_pool *page_pool_create(const struct page_pool_params *params)</div><div class='add'>+{</div><div class='add'>+	return page_pool_create_percpu(params, -1);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(page_pool_create);</div><div class='ctx'> </div><div class='del'>-/* fast path */</div><div class='del'>-static struct page *__page_pool_get_cached(struct page_pool *pool)</div><div class='add'>+static void page_pool_return_netmem(struct page_pool *pool, netmem_ref netmem);</div><div class='add'>+</div><div class='add'>+static noinline netmem_ref page_pool_refill_alloc_cache(struct page_pool *pool)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptr_ring *r = &amp;pool-&gt;ring;</div><div class='del'>-	struct page *page;</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+	int pref_nid; /* preferred NUMA node */</div><div class='ctx'> </div><div class='ctx'> 	/* Quicker fallback, avoid locks when ring is empty */</div><div class='del'>-	if (__ptr_ring_empty(r))</div><div class='del'>-		return NULL;</div><div class='add'>+	if (__ptr_ring_empty(r)) {</div><div class='add'>+		alloc_stat_inc(pool, empty);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Test for safe-context, caller should provide this guarantee */</div><div class='del'>-	if (likely(in_serving_softirq())) {</div><div class='del'>-		if (likely(pool-&gt;alloc.count)) {</div><div class='del'>-			/* Fast-path */</div><div class='del'>-			page = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='del'>-			return page;</div><div class='del'>-		}</div><div class='del'>-		/* Slower-path: Alloc array empty, time to refill</div><div class='del'>-		 *</div><div class='del'>-		 * Open-coded bulk ptr_ring consumer.</div><div class='del'>-		 *</div><div class='del'>-		 * Discussion: the ring consumer lock is not really</div><div class='del'>-		 * needed due to the softirq/NAPI protection, but</div><div class='del'>-		 * later need the ability to reclaim pages on the</div><div class='del'>-		 * ring. Thus, keeping the locks.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;r-&gt;consumer_lock);</div><div class='del'>-		while ((page = __ptr_ring_consume(r))) {</div><div class='del'>-			if (pool-&gt;alloc.count == PP_ALLOC_CACHE_REFILL)</div><div class='del'>-				break;</div><div class='del'>-			pool-&gt;alloc.cache[pool-&gt;alloc.count++] = page;</div><div class='add'>+	/* Softirq guarantee CPU and thus NUMA node is stable. This,</div><div class='add'>+	 * assumes CPU refilling driver RX-ring will also run RX-NAPI.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+	pref_nid = (pool-&gt;p.nid == NUMA_NO_NODE) ? numa_mem_id() : pool-&gt;p.nid;</div><div class='add'>+#else</div><div class='add'>+	/* Ignore pool-&gt;p.nid setting if !CONFIG_NUMA, helps compiler */</div><div class='add'>+	pref_nid = numa_mem_id(); /* will be zero like page_to_nid() */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Refill alloc array, but only if NUMA match */</div><div class='add'>+	do {</div><div class='add'>+		netmem = (__force netmem_ref)__ptr_ring_consume(r);</div><div class='add'>+		if (unlikely(!netmem))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (likely(netmem_is_pref_nid(netmem, pref_nid))) {</div><div class='add'>+			pool-&gt;alloc.cache[pool-&gt;alloc.count++] = netmem;</div><div class='add'>+		} else {</div><div class='add'>+			/* NUMA mismatch;</div><div class='add'>+			 * (1) release 1 page to page-allocator and</div><div class='add'>+			 * (2) break out to fallthrough to alloc_pages_node.</div><div class='add'>+			 * This limit stress on page buddy alloactor.</div><div class='add'>+			 */</div><div class='add'>+			page_pool_return_netmem(pool, netmem);</div><div class='add'>+			alloc_stat_inc(pool, waive);</div><div class='add'>+			netmem = 0;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;r-&gt;consumer_lock);</div><div class='del'>-		return page;</div><div class='add'>+	} while (pool-&gt;alloc.count &lt; PP_ALLOC_CACHE_REFILL);</div><div class='add'>+</div><div class='add'>+	/* Return last page */</div><div class='add'>+	if (likely(pool-&gt;alloc.count &gt; 0)) {</div><div class='add'>+		netmem = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+		alloc_stat_inc(pool, refill);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Slow-path: Get page from locked ring queue */</div><div class='del'>-	page = ptr_ring_consume(&amp;pool-&gt;ring);</div><div class='del'>-	return page;</div><div class='add'>+	return netmem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* slow path */</div><div class='del'>-noinline</div><div class='del'>-static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool,</div><div class='del'>-						 gfp_t _gfp)</div><div class='add'>+/* fast path */</div><div class='add'>+static netmem_ref __page_pool_get_cached(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	/* Caller MUST guarantee safe non-concurrent access, e.g. softirq */</div><div class='add'>+	if (likely(pool-&gt;alloc.count)) {</div><div class='add'>+		/* Fast-path */</div><div class='add'>+		netmem = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+		alloc_stat_inc(pool, fast);</div><div class='add'>+	} else {</div><div class='add'>+		netmem = page_pool_refill_alloc_cache(pool);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __page_pool_dma_sync_for_device(const struct page_pool *pool,</div><div class='add'>+					    netmem_ref netmem,</div><div class='add'>+					    u32 dma_sync_size)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_HAS_DMA) &amp;&amp; defined(CONFIG_DMA_NEED_SYNC)</div><div class='add'>+	dma_addr_t dma_addr = page_pool_get_dma_addr_netmem(netmem);</div><div class='add'>+</div><div class='add'>+	dma_sync_size = min(dma_sync_size, pool-&gt;p.max_len);</div><div class='add'>+	__dma_sync_single_for_device(pool-&gt;p.dev, dma_addr + pool-&gt;p.offset,</div><div class='add'>+				     dma_sync_size, pool-&gt;p.dma_dir);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void</div><div class='add'>+page_pool_dma_sync_for_device(const struct page_pool *pool,</div><div class='add'>+			      netmem_ref netmem,</div><div class='add'>+			      u32 dma_sync_size)</div><div class='add'>+{</div><div class='add'>+	if (pool-&gt;dma_sync &amp;&amp; dma_dev_need_sync(pool-&gt;p.dev)) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		/* re-check under rcu_read_lock() to sync with page_pool_scrub() */</div><div class='add'>+		if (pool-&gt;dma_sync)</div><div class='add'>+			__page_pool_dma_sync_for_device(pool, netmem,</div><div class='add'>+							dma_sync_size);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int page_pool_register_dma_index(struct page_pool *pool,</div><div class='add'>+					netmem_ref netmem, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!PP_DMA_INDEX_BITS))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (in_softirq())</div><div class='add'>+		err = xa_alloc(&amp;pool-&gt;dma_mapped, &amp;id, netmem_to_page(netmem),</div><div class='add'>+			       PP_DMA_INDEX_LIMIT, gfp);</div><div class='add'>+	else</div><div class='add'>+		err = xa_alloc_bh(&amp;pool-&gt;dma_mapped, &amp;id, netmem_to_page(netmem),</div><div class='add'>+				  PP_DMA_INDEX_LIMIT, gfp);</div><div class='add'>+	if (err) {</div><div class='add'>+		WARN_ONCE(err != -ENOMEM, "couldn't track DMA mapping, please report to netdev@");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netmem_set_dma_index(netmem, id);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int page_pool_release_dma_index(struct page_pool *pool,</div><div class='add'>+				       netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	struct page *old, *page = netmem_to_page(netmem);</div><div class='add'>+	unsigned long id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!PP_DMA_INDEX_BITS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	id = netmem_get_dma_index(netmem);</div><div class='add'>+	if (!id)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (in_softirq())</div><div class='add'>+		old = xa_cmpxchg(&amp;pool-&gt;dma_mapped, id, page, NULL, 0);</div><div class='add'>+	else</div><div class='add'>+		old = xa_cmpxchg_bh(&amp;pool-&gt;dma_mapped, id, page, NULL, 0);</div><div class='add'>+	if (old != page)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	netmem_set_dma_index(netmem, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool page_pool_dma_map(struct page_pool *pool, netmem_ref netmem, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='del'>-	gfp_t gfp = _gfp;</div><div class='ctx'> 	dma_addr_t dma;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* We could always set __GFP_COMP, and avoid this branch, as</div><div class='del'>-	 * prep_new_page() can handle order-0 with __GFP_COMP.</div><div class='add'>+	/* Setup DMA mapping: use 'struct page' area for storing DMA-addr</div><div class='add'>+	 * since dma_addr_t can be either 32 or 64 bits and does not always fit</div><div class='add'>+	 * into page private data (i.e 32bit cpu with 64bit DMA caps)</div><div class='add'>+	 * This mapping is kept for lifetime of page, until leaving pool.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pool-&gt;p.order)</div><div class='del'>-		gfp |= __GFP_COMP;</div><div class='add'>+	dma = dma_map_page_attrs(pool-&gt;p.dev, netmem_to_page(netmem), 0,</div><div class='add'>+				 (PAGE_SIZE &lt;&lt; pool-&gt;p.order), pool-&gt;p.dma_dir,</div><div class='add'>+				 DMA_ATTR_SKIP_CPU_SYNC |</div><div class='add'>+					 DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	if (dma_mapping_error(pool-&gt;p.dev, dma))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	/* FUTURE development:</div><div class='del'>-	 *</div><div class='del'>-	 * Current slow-path essentially falls back to single page</div><div class='del'>-	 * allocations, which doesn't improve performance.  This code</div><div class='del'>-	 * need bulk allocation support from the page allocator code.</div><div class='del'>-	 */</div><div class='add'>+	if (page_pool_set_dma_addr_netmem(netmem, dma)) {</div><div class='add'>+		WARN_ONCE(1, "unexpected DMA address, please report to netdev@");</div><div class='add'>+		goto unmap_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = page_pool_register_dma_index(pool, netmem, gfp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unset_failed;</div><div class='add'>+</div><div class='add'>+	page_pool_dma_sync_for_device(pool, netmem, pool-&gt;p.max_len);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> </div><div class='del'>-	/* Cache was empty, do real allocation */</div><div class='add'>+unset_failed:</div><div class='add'>+	page_pool_set_dma_addr_netmem(netmem, 0);</div><div class='add'>+unmap_failed:</div><div class='add'>+	dma_unmap_page_attrs(pool-&gt;p.dev, dma,</div><div class='add'>+			     PAGE_SIZE &lt;&lt; pool-&gt;p.order, pool-&gt;p.dma_dir,</div><div class='add'>+			     DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct page *__page_pool_alloc_page_order(struct page_pool *pool,</div><div class='add'>+						 gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	gfp |= __GFP_COMP;</div><div class='ctx'> 	page = alloc_pages_node(pool-&gt;p.nid, gfp, pool-&gt;p.order);</div><div class='del'>-	if (!page)</div><div class='add'>+	if (unlikely(!page))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (!(pool-&gt;p.flags &amp; PP_FLAG_DMA_MAP))</div><div class='del'>-		goto skip_dma_map;</div><div class='del'>-</div><div class='del'>-	/* Setup DMA mapping: use page-&gt;private for DMA-addr</div><div class='del'>-	 * This mapping is kept for lifetime of page, until leaving pool.</div><div class='del'>-	 */</div><div class='del'>-	dma = dma_map_page(pool-&gt;p.dev, page, 0,</div><div class='del'>-			   (PAGE_SIZE &lt;&lt; pool-&gt;p.order),</div><div class='del'>-			   pool-&gt;p.dma_dir);</div><div class='del'>-	if (dma_mapping_error(pool-&gt;p.dev, dma)) {</div><div class='add'>+	if (pool-&gt;dma_map &amp;&amp; unlikely(!page_pool_dma_map(pool, page_to_netmem(page), gfp))) {</div><div class='ctx'> 		put_page(page);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	set_page_private(page, dma); /* page-&gt;private = dma; */</div><div class='ctx'> </div><div class='del'>-skip_dma_map:</div><div class='del'>-	/* When page just alloc'ed is should/must have refcnt 1. */</div><div class='add'>+	alloc_stat_inc(pool, slow_high_order);</div><div class='add'>+	page_pool_set_pp_info(pool, page_to_netmem(page));</div><div class='add'>+</div><div class='add'>+	/* Track how many pages are held 'in-flight' */</div><div class='add'>+	pool-&gt;pages_state_hold_cnt++;</div><div class='add'>+	trace_page_pool_state_hold(pool, page_to_netmem(page),</div><div class='add'>+				   pool-&gt;pages_state_hold_cnt);</div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* slow path */</div><div class='add'>+static noinline netmem_ref __page_pool_alloc_netmems_slow(struct page_pool *pool,</div><div class='add'>+							  gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	const int bulk = PP_ALLOC_CACHE_REFILL;</div><div class='add'>+	unsigned int pp_order = pool-&gt;p.order;</div><div class='add'>+	bool dma_map = pool-&gt;dma_map;</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+	int i, nr_pages;</div><div class='add'>+</div><div class='add'>+	/* Unconditionally set NOWARN if allocating from NAPI.</div><div class='add'>+	 * Drivers forget to set it, and OOM reports on packet Rx are useless.</div><div class='add'>+	 */</div><div class='add'>+	if ((gfp &amp; GFP_ATOMIC) == GFP_ATOMIC)</div><div class='add'>+		gfp |= __GFP_NOWARN;</div><div class='add'>+</div><div class='add'>+	/* Don't support bulk alloc for high-order pages */</div><div class='add'>+	if (unlikely(pp_order))</div><div class='add'>+		return page_to_netmem(__page_pool_alloc_page_order(pool, gfp));</div><div class='add'>+</div><div class='add'>+	/* Unnecessary as alloc cache is empty, but guarantees zero count */</div><div class='add'>+	if (unlikely(pool-&gt;alloc.count &gt; 0))</div><div class='add'>+		return pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+</div><div class='add'>+	/* Mark empty alloc.cache slots "empty" for alloc_pages_bulk */</div><div class='add'>+	memset(&amp;pool-&gt;alloc.cache, 0, sizeof(void *) * bulk);</div><div class='add'>+</div><div class='add'>+	nr_pages = alloc_pages_bulk_node(gfp, pool-&gt;p.nid, bulk,</div><div class='add'>+					 (struct page **)pool-&gt;alloc.cache);</div><div class='add'>+	if (unlikely(!nr_pages))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Pages have been filled into alloc.cache array, but count is zero and</div><div class='add'>+	 * page element have not been (possibly) DMA mapped.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nr_pages; i++) {</div><div class='add'>+		netmem = pool-&gt;alloc.cache[i];</div><div class='add'>+		if (dma_map &amp;&amp; unlikely(!page_pool_dma_map(pool, netmem, gfp))) {</div><div class='add'>+			put_page(netmem_to_page(netmem));</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page_pool_set_pp_info(pool, netmem);</div><div class='add'>+		pool-&gt;alloc.cache[pool-&gt;alloc.count++] = netmem;</div><div class='add'>+		/* Track how many pages are held 'in-flight' */</div><div class='add'>+		pool-&gt;pages_state_hold_cnt++;</div><div class='add'>+		trace_page_pool_state_hold(pool, netmem,</div><div class='add'>+					   pool-&gt;pages_state_hold_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Return last page */</div><div class='add'>+	if (likely(pool-&gt;alloc.count &gt; 0)) {</div><div class='add'>+		netmem = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+		alloc_stat_inc(pool, slow);</div><div class='add'>+	} else {</div><div class='add'>+		netmem = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When page just alloc'ed is should/must have refcnt 1. */</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* For using page_pool replace: alloc_pages() API calls, but provide</div><div class='ctx'>  * synchronization guarantee for allocation side.</div><div class='ctx'>  */</div><div class='del'>-struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp)</div><div class='add'>+netmem_ref page_pool_alloc_netmems(struct page_pool *pool, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	netmem_ref netmem;</div><div class='ctx'> </div><div class='ctx'> 	/* Fast-path: Get a page from cache */</div><div class='del'>-	page = __page_pool_get_cached(pool);</div><div class='del'>-	if (page)</div><div class='del'>-		return page;</div><div class='add'>+	netmem = __page_pool_get_cached(pool);</div><div class='add'>+	if (netmem)</div><div class='add'>+		return netmem;</div><div class='ctx'> </div><div class='ctx'> 	/* Slow-path: cache empty, do real allocation */</div><div class='del'>-	page = __page_pool_alloc_pages_slow(pool, gfp);</div><div class='del'>-	return page;</div><div class='add'>+	if (static_branch_unlikely(&amp;page_pool_mem_providers) &amp;&amp; pool-&gt;mp_ops)</div><div class='add'>+		netmem = pool-&gt;mp_ops-&gt;alloc_netmems(pool, gfp);</div><div class='add'>+	else</div><div class='add'>+		netmem = __page_pool_alloc_netmems_slow(pool, gfp);</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_alloc_netmems);</div><div class='add'>+ALLOW_ERROR_INJECTION(page_pool_alloc_netmems, NULL);</div><div class='add'>+</div><div class='add'>+struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return netmem_to_page(page_pool_alloc_netmems(pool, gfp));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(page_pool_alloc_pages);</div><div class='ctx'> </div><div class='del'>-/* Cleanup page_pool state from page */</div><div class='del'>-static void __page_pool_clean_page(struct page_pool *pool,</div><div class='del'>-				   struct page *page)</div><div class='add'>+/* Calculate distance between two u32 values, valid if distance is below 2^(31)</div><div class='add'>+ *  https://en.wikipedia.org/wiki/Serial_number_arithmetic#General_Solution</div><div class='add'>+ */</div><div class='add'>+#define _distance(a, b)	(s32)((a) - (b))</div><div class='add'>+</div><div class='add'>+s32 page_pool_inflight(const struct page_pool *pool, bool strict)</div><div class='add'>+{</div><div class='add'>+	u32 release_cnt = atomic_read(&amp;pool-&gt;pages_state_release_cnt);</div><div class='add'>+	u32 hold_cnt = READ_ONCE(pool-&gt;pages_state_hold_cnt);</div><div class='add'>+	s32 inflight;</div><div class='add'>+</div><div class='add'>+	inflight = _distance(hold_cnt, release_cnt);</div><div class='add'>+</div><div class='add'>+	if (strict) {</div><div class='add'>+		trace_page_pool_release(pool, inflight, hold_cnt, release_cnt);</div><div class='add'>+		WARN(inflight &lt; 0, "Negative(%d) inflight packet-pages",</div><div class='add'>+		     inflight);</div><div class='add'>+	} else {</div><div class='add'>+		inflight = max(0, inflight);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return inflight;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_set_pp_info(struct page_pool *pool, netmem_ref netmem)</div><div class='ctx'> {</div><div class='del'>-	if (!(pool-&gt;p.flags &amp; PP_FLAG_DMA_MAP))</div><div class='add'>+	netmem_set_pp(netmem, pool);</div><div class='add'>+	netmem_or_pp_magic(netmem, PP_SIGNATURE);</div><div class='add'>+</div><div class='add'>+	/* Ensuring all pages have been split into one fragment initially:</div><div class='add'>+	 * page_pool_set_pp_info() is only called once for every page when it</div><div class='add'>+	 * is allocated from the page allocator and page_pool_fragment_page()</div><div class='add'>+	 * is dirtying the same cache line as the page-&gt;pp_magic above, so</div><div class='add'>+	 * the overhead is negligible.</div><div class='add'>+	 */</div><div class='add'>+	page_pool_fragment_netmem(netmem, 1);</div><div class='add'>+	if (pool-&gt;has_init_callback)</div><div class='add'>+		pool-&gt;slow.init_callback(netmem, pool-&gt;slow.init_arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_clear_pp_info(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	netmem_clear_pp_magic(netmem);</div><div class='add'>+	netmem_set_pp(netmem, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void __page_pool_release_netmem_dma(struct page_pool *pool,</div><div class='add'>+							   netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	if (!pool-&gt;dma_map)</div><div class='add'>+		/* Always account for inflight pages, even if we didn't</div><div class='add'>+		 * map them</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (page_pool_release_dma_index(pool, netmem))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* DMA unmap */</div><div class='del'>-	dma_unmap_page(pool-&gt;p.dev, page_private(page),</div><div class='del'>-		       PAGE_SIZE &lt;&lt; pool-&gt;p.order, pool-&gt;p.dma_dir);</div><div class='del'>-	set_page_private(page, 0);</div><div class='add'>+	dma = page_pool_get_dma_addr_netmem(netmem);</div><div class='add'>+</div><div class='add'>+	/* When page is unmapped, it cannot be returned to our pool */</div><div class='add'>+	dma_unmap_page_attrs(pool-&gt;p.dev, dma,</div><div class='add'>+			     PAGE_SIZE &lt;&lt; pool-&gt;p.order, pool-&gt;p.dma_dir,</div><div class='add'>+			     DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	page_pool_set_dma_addr_netmem(netmem, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return a page to the page allocator, cleaning up our state */</div><div class='del'>-static void __page_pool_return_page(struct page_pool *pool, struct page *page)</div><div class='add'>+/* Disconnects a page (from a page_pool).  API users can have a need</div><div class='add'>+ * to disconnect a page (from a page_pool), to allow it to be used as</div><div class='add'>+ * a regular page (that will eventually be returned to the normal</div><div class='add'>+ * page-allocator via put_page).</div><div class='add'>+ */</div><div class='add'>+static void page_pool_return_netmem(struct page_pool *pool, netmem_ref netmem)</div><div class='ctx'> {</div><div class='del'>-	__page_pool_clean_page(pool, page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	int count;</div><div class='add'>+	bool put;</div><div class='add'>+</div><div class='add'>+	put = true;</div><div class='add'>+	if (static_branch_unlikely(&amp;page_pool_mem_providers) &amp;&amp; pool-&gt;mp_ops)</div><div class='add'>+		put = pool-&gt;mp_ops-&gt;release_netmem(pool, netmem);</div><div class='add'>+	else</div><div class='add'>+		__page_pool_release_netmem_dma(pool, netmem);</div><div class='add'>+</div><div class='add'>+	/* This may be the last page returned, releasing the pool, so</div><div class='add'>+	 * it is not safe to reference pool afterwards.</div><div class='add'>+	 */</div><div class='add'>+	count = atomic_inc_return_relaxed(&amp;pool-&gt;pages_state_release_cnt);</div><div class='add'>+	trace_page_pool_state_release(pool, netmem, count);</div><div class='add'>+</div><div class='add'>+	if (put) {</div><div class='add'>+		page_pool_clear_pp_info(netmem);</div><div class='add'>+		put_page(netmem_to_page(netmem));</div><div class='add'>+	}</div><div class='ctx'> 	/* An optimization would be to call __free_pages(page, pool-&gt;p.order)</div><div class='ctx'> 	 * knowing page is not part of page-cache (thus avoiding a</div><div class='ctx'> 	 * __page_cache_release() call).</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __page_pool_recycle_into_ring(struct page_pool *pool,</div><div class='del'>-				   struct page *page)</div><div class='add'>+static bool page_pool_recycle_in_ring(struct page_pool *pool, netmem_ref netmem)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	/* BH protection not needed if current is serving softirq */</div><div class='del'>-	if (in_serving_softirq())</div><div class='del'>-		ret = ptr_ring_produce(&amp;pool-&gt;ring, page);</div><div class='del'>-	else</div><div class='del'>-		ret = ptr_ring_produce_bh(&amp;pool-&gt;ring, page);</div><div class='add'>+	bool in_softirq, ret;</div><div class='add'>+</div><div class='add'>+	/* BH protection not needed if current is softirq */</div><div class='add'>+	in_softirq = page_pool_producer_lock(pool);</div><div class='add'>+	ret = !__ptr_ring_produce(&amp;pool-&gt;ring, (__force void *)netmem);</div><div class='add'>+	if (ret)</div><div class='add'>+		recycle_stat_inc(pool, ring);</div><div class='add'>+	page_pool_producer_unlock(pool, in_softirq);</div><div class='ctx'> </div><div class='del'>-	return (ret == 0) ? true : false;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Only allow direct recycling in special circumstances, into the</div><div class='hunk'>@@ -213,39 +796,60 @@ static bool __page_pool_recycle_into_ring(struct page_pool *pool,</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must provide appropriate safe context.</div><div class='ctx'>  */</div><div class='del'>-static bool __page_pool_recycle_direct(struct page *page,</div><div class='add'>+static bool page_pool_recycle_in_cache(netmem_ref netmem,</div><div class='ctx'> 				       struct page_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(pool-&gt;alloc.count == PP_ALLOC_CACHE_SIZE))</div><div class='add'>+	if (unlikely(pool-&gt;alloc.count == PP_ALLOC_CACHE_SIZE)) {</div><div class='add'>+		recycle_stat_inc(pool, cache_full);</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Caller MUST have verified/know (page_ref_count(page) == 1) */</div><div class='del'>-	pool-&gt;alloc.cache[pool-&gt;alloc.count++] = page;</div><div class='add'>+	pool-&gt;alloc.cache[pool-&gt;alloc.count++] = netmem;</div><div class='add'>+	recycle_stat_inc(pool, cached);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __page_pool_put_page(struct page_pool *pool,</div><div class='del'>-			  struct page *page, bool allow_direct)</div><div class='add'>+static bool __page_pool_page_can_be_recycled(netmem_ref netmem)</div><div class='ctx'> {</div><div class='add'>+	return netmem_is_net_iov(netmem) ||</div><div class='add'>+	       (page_ref_count(netmem_to_page(netmem)) == 1 &amp;&amp;</div><div class='add'>+		!page_is_pfmemalloc(netmem_to_page(netmem)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If the page refcnt == 1, this will try to recycle the page.</div><div class='add'>+ * If pool-&gt;dma_sync is set, we'll try to sync the DMA area for</div><div class='add'>+ * the configured size min(dma_sync_size, pool-&gt;max_len).</div><div class='add'>+ * If the page refcnt != 1, then the page will be returned to memory</div><div class='add'>+ * subsystem.</div><div class='add'>+ */</div><div class='add'>+static __always_inline netmem_ref</div><div class='add'>+__page_pool_put_page(struct page_pool *pool, netmem_ref netmem,</div><div class='add'>+		     unsigned int dma_sync_size, bool allow_direct)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_no_hardirq();</div><div class='add'>+</div><div class='ctx'> 	/* This allocator is optimized for the XDP mode that uses</div><div class='ctx'> 	 * one-frame-per-page, but have fallbacks that act like the</div><div class='ctx'> 	 * regular page allocator APIs.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * refcnt == 1 means page_pool owns page, and can recycle it.</div><div class='add'>+	 *</div><div class='add'>+	 * page is NOT reusable when allocated when system is under</div><div class='add'>+	 * some pressure. (page_is_pfmemalloc)</div><div class='ctx'> 	 */</div><div class='del'>-	if (likely(page_ref_count(page) == 1)) {</div><div class='add'>+	if (likely(__page_pool_page_can_be_recycled(netmem))) {</div><div class='ctx'> 		/* Read barrier done in page_ref_count / READ_ONCE */</div><div class='ctx'> </div><div class='del'>-		if (allow_direct &amp;&amp; in_serving_softirq())</div><div class='del'>-			if (__page_pool_recycle_direct(page, pool))</div><div class='del'>-				return;</div><div class='add'>+		page_pool_dma_sync_for_device(pool, netmem, dma_sync_size);</div><div class='ctx'> </div><div class='del'>-		if (!__page_pool_recycle_into_ring(pool, page)) {</div><div class='del'>-			/* Cache full, fallback to free pages */</div><div class='del'>-			__page_pool_return_page(pool, page);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='add'>+		if (allow_direct &amp;&amp; page_pool_recycle_in_cache(netmem, pool))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Page found as candidate for recycling */</div><div class='add'>+		return netmem;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Fallback/non-XDP mode: API user have elevated refcnt.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Many drivers split up the page into fragments, and some</div><div class='hunk'>@@ -259,59 +863,492 @@ void __page_pool_put_page(struct page_pool *pool,</div><div class='ctx'> 	 * doing refcnt based recycle tricks, meaning another process</div><div class='ctx'> 	 * will be invoking put_page.</div><div class='ctx'> 	 */</div><div class='del'>-	__page_pool_clean_page(pool, page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	recycle_stat_inc(pool, released_refcnt);</div><div class='add'>+	page_pool_return_netmem(pool, netmem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__page_pool_put_page);</div><div class='ctx'> </div><div class='del'>-static void __page_pool_empty_ring(struct page_pool *pool)</div><div class='add'>+static bool page_pool_napi_local(const struct page_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	const struct napi_struct *napi;</div><div class='add'>+	u32 cpuid;</div><div class='add'>+</div><div class='add'>+	/* On PREEMPT_RT the softirq can be preempted by the consumer */</div><div class='add'>+	if (IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!in_softirq()))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Allow direct recycle if we have reasons to believe that we are</div><div class='add'>+	 * in the same context as the consumer would run, so there's</div><div class='add'>+	 * no possible race.</div><div class='add'>+	 * __page_pool_put_page() makes sure we're not in hardirq context</div><div class='add'>+	 * and interrupts are enabled prior to accessing the cache.</div><div class='add'>+	 */</div><div class='add'>+	cpuid = smp_processor_id();</div><div class='add'>+	if (READ_ONCE(pool-&gt;cpuid) == cpuid)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	napi = READ_ONCE(pool-&gt;p.napi);</div><div class='add'>+</div><div class='add'>+	return napi &amp;&amp; READ_ONCE(napi-&gt;list_owner) == cpuid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref netmem,</div><div class='add'>+				  unsigned int dma_sync_size, bool allow_direct)</div><div class='add'>+{</div><div class='add'>+	if (!allow_direct)</div><div class='add'>+		allow_direct = page_pool_napi_local(pool);</div><div class='add'>+</div><div class='add'>+	netmem = __page_pool_put_page(pool, netmem, dma_sync_size,</div><div class='add'>+				      allow_direct);</div><div class='add'>+	if (netmem &amp;&amp; !page_pool_recycle_in_ring(pool, netmem)) {</div><div class='add'>+		/* Cache full, fallback to free pages */</div><div class='add'>+		recycle_stat_inc(pool, ring_full);</div><div class='add'>+		page_pool_return_netmem(pool, netmem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_put_unrefed_netmem);</div><div class='add'>+</div><div class='add'>+void page_pool_put_unrefed_page(struct page_pool *pool, struct page *page,</div><div class='add'>+				unsigned int dma_sync_size, bool allow_direct)</div><div class='add'>+{</div><div class='add'>+	page_pool_put_unrefed_netmem(pool, page_to_netmem(page), dma_sync_size,</div><div class='add'>+				     allow_direct);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_put_unrefed_page);</div><div class='add'>+</div><div class='add'>+static void page_pool_recycle_ring_bulk(struct page_pool *pool,</div><div class='add'>+					netmem_ref *bulk,</div><div class='add'>+					u32 bulk_len)</div><div class='add'>+{</div><div class='add'>+	bool in_softirq;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	/* Bulk produce into ptr_ring page_pool cache */</div><div class='add'>+	in_softirq = page_pool_producer_lock(pool);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bulk_len; i++) {</div><div class='add'>+		if (__ptr_ring_produce(&amp;pool-&gt;ring, (__force void *)bulk[i])) {</div><div class='add'>+			/* ring full */</div><div class='add'>+			recycle_stat_inc(pool, ring_full);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page_pool_producer_unlock(pool, in_softirq);</div><div class='add'>+	recycle_stat_add(pool, ring, i);</div><div class='add'>+</div><div class='add'>+	/* Hopefully all pages were returned into ptr_ring */</div><div class='add'>+	if (likely(i == bulk_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ptr_ring cache is full, free remaining pages outside producer lock</div><div class='add'>+	 * since put_page() with refcnt == 1 can be an expensive operation.</div><div class='add'>+	 */</div><div class='add'>+	for (; i &lt; bulk_len; i++)</div><div class='add'>+		page_pool_return_netmem(pool, bulk[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_pool_put_netmem_bulk() - release references on multiple netmems</div><div class='add'>+ * @data:	array holding netmem references</div><div class='add'>+ * @count:	number of entries in @data</div><div class='add'>+ *</div><div class='add'>+ * Tries to refill a number of netmems into the ptr_ring cache holding ptr_ring</div><div class='add'>+ * producer lock. If the ptr_ring is full, page_pool_put_netmem_bulk()</div><div class='add'>+ * will release leftover netmems to the memory provider.</div><div class='add'>+ * page_pool_put_netmem_bulk() is suitable to be run inside the driver NAPI tx</div><div class='add'>+ * completion loop for the XDP_REDIRECT use case.</div><div class='add'>+ *</div><div class='add'>+ * Please note the caller must not use data area after running</div><div class='add'>+ * page_pool_put_netmem_bulk(), as this function overwrites it.</div><div class='add'>+ */</div><div class='add'>+void page_pool_put_netmem_bulk(netmem_ref *data, u32 count)</div><div class='add'>+{</div><div class='add'>+	u32 bulk_len = 0;</div><div class='add'>+</div><div class='add'>+	for (u32 i = 0; i &lt; count; i++) {</div><div class='add'>+		netmem_ref netmem = netmem_compound_head(data[i]);</div><div class='add'>+</div><div class='add'>+		if (page_pool_unref_and_test(netmem))</div><div class='add'>+			data[bulk_len++] = netmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = bulk_len;</div><div class='add'>+	while (count) {</div><div class='add'>+		netmem_ref bulk[XDP_BULK_QUEUE_SIZE];</div><div class='add'>+		struct page_pool *pool = NULL;</div><div class='add'>+		bool allow_direct;</div><div class='add'>+		u32 foreign = 0;</div><div class='add'>+</div><div class='add'>+		bulk_len = 0;</div><div class='add'>+</div><div class='add'>+		for (u32 i = 0; i &lt; count; i++) {</div><div class='add'>+			struct page_pool *netmem_pp;</div><div class='add'>+			netmem_ref netmem = data[i];</div><div class='add'>+</div><div class='add'>+			netmem_pp = netmem_get_pp(netmem);</div><div class='add'>+			if (unlikely(!pool)) {</div><div class='add'>+				pool = netmem_pp;</div><div class='add'>+				allow_direct = page_pool_napi_local(pool);</div><div class='add'>+			} else if (netmem_pp != pool) {</div><div class='add'>+				/*</div><div class='add'>+				 * If the netmem belongs to a different</div><div class='add'>+				 * page_pool, save it for another round.</div><div class='add'>+				 */</div><div class='add'>+				data[foreign++] = netmem;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			netmem = __page_pool_put_page(pool, netmem, -1,</div><div class='add'>+						      allow_direct);</div><div class='add'>+			/* Approved for bulk recycling in ptr_ring cache */</div><div class='add'>+			if (netmem)</div><div class='add'>+				bulk[bulk_len++] = netmem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bulk_len)</div><div class='add'>+			page_pool_recycle_ring_bulk(pool, bulk, bulk_len);</div><div class='add'>+</div><div class='add'>+		count = foreign;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_put_netmem_bulk);</div><div class='add'>+</div><div class='add'>+static netmem_ref page_pool_drain_frag(struct page_pool *pool,</div><div class='add'>+				       netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	long drain_count = BIAS_MAX - pool-&gt;frag_users;</div><div class='add'>+</div><div class='add'>+	/* Some user is still using the page frag */</div><div class='add'>+	if (likely(page_pool_unref_netmem(netmem, drain_count)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (__page_pool_page_can_be_recycled(netmem)) {</div><div class='add'>+		page_pool_dma_sync_for_device(pool, netmem, -1);</div><div class='add'>+		return netmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page_pool_return_netmem(pool, netmem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_free_frag(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	long drain_count = BIAS_MAX - pool-&gt;frag_users;</div><div class='add'>+	netmem_ref netmem = pool-&gt;frag_page;</div><div class='add'>+</div><div class='add'>+	pool-&gt;frag_page = 0;</div><div class='add'>+</div><div class='add'>+	if (!netmem || page_pool_unref_netmem(netmem, drain_count))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	page_pool_return_netmem(pool, netmem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netmem_ref page_pool_alloc_frag_netmem(struct page_pool *pool,</div><div class='add'>+				       unsigned int *offset, unsigned int size,</div><div class='add'>+				       gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_size = PAGE_SIZE &lt;&lt; pool-&gt;p.order;</div><div class='add'>+	netmem_ref netmem = pool-&gt;frag_page;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(size &gt; max_size))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = ALIGN(size, dma_get_cache_alignment());</div><div class='add'>+	*offset = pool-&gt;frag_offset;</div><div class='add'>+</div><div class='add'>+	if (netmem &amp;&amp; *offset + size &gt; max_size) {</div><div class='add'>+		netmem = page_pool_drain_frag(pool, netmem);</div><div class='add'>+		if (netmem) {</div><div class='add'>+			recycle_stat_inc(pool, cached);</div><div class='add'>+			alloc_stat_inc(pool, fast);</div><div class='add'>+			goto frag_reset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netmem) {</div><div class='add'>+		netmem = page_pool_alloc_netmems(pool, gfp);</div><div class='add'>+		if (unlikely(!netmem)) {</div><div class='add'>+			pool-&gt;frag_page = 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pool-&gt;frag_page = netmem;</div><div class='add'>+</div><div class='add'>+frag_reset:</div><div class='add'>+		pool-&gt;frag_users = 1;</div><div class='add'>+		*offset = 0;</div><div class='add'>+		pool-&gt;frag_offset = size;</div><div class='add'>+		page_pool_fragment_netmem(netmem, BIAS_MAX);</div><div class='add'>+		return netmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pool-&gt;frag_users++;</div><div class='add'>+	pool-&gt;frag_offset = *offset + size;</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_alloc_frag_netmem);</div><div class='add'>+</div><div class='add'>+struct page *page_pool_alloc_frag(struct page_pool *pool, unsigned int *offset,</div><div class='add'>+				  unsigned int size, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return netmem_to_page(page_pool_alloc_frag_netmem(pool, offset, size,</div><div class='add'>+							  gfp));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_alloc_frag);</div><div class='add'>+</div><div class='add'>+static void page_pool_empty_ring(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem;</div><div class='ctx'> </div><div class='ctx'> 	/* Empty recycle ring */</div><div class='del'>-	while ((page = ptr_ring_consume_bh(&amp;pool-&gt;ring))) {</div><div class='add'>+	while ((netmem = (__force netmem_ref)ptr_ring_consume_bh(&amp;pool-&gt;ring))) {</div><div class='ctx'> 		/* Verify the refcnt invariant of cached pages */</div><div class='del'>-		if (!(page_ref_count(page) == 1))</div><div class='add'>+		if (!(netmem_ref_count(netmem) == 1))</div><div class='ctx'> 			pr_crit("%s() page_pool refcnt %d violation\n",</div><div class='del'>-				__func__, page_ref_count(page));</div><div class='add'>+				__func__, netmem_ref_count(netmem));</div><div class='ctx'> </div><div class='del'>-		__page_pool_return_page(pool, page);</div><div class='add'>+		page_pool_return_netmem(pool, netmem);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __page_pool_destroy_rcu(struct rcu_head *rcu)</div><div class='add'>+static void __page_pool_destroy(struct page_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	struct page_pool *pool;</div><div class='add'>+	if (pool-&gt;disconnect)</div><div class='add'>+		pool-&gt;disconnect(pool);</div><div class='ctx'> </div><div class='del'>-	pool = container_of(rcu, struct page_pool, rcu);</div><div class='add'>+	page_pool_unlist(pool);</div><div class='add'>+	page_pool_uninit(pool);</div><div class='ctx'> </div><div class='del'>-	WARN(pool-&gt;alloc.count, "API usage violation");</div><div class='add'>+	if (pool-&gt;mp_ops) {</div><div class='add'>+		pool-&gt;mp_ops-&gt;destroy(pool);</div><div class='add'>+		static_branch_dec(&amp;page_pool_mem_providers);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	__page_pool_empty_ring(pool);</div><div class='del'>-	ptr_ring_cleanup(&amp;pool-&gt;ring, NULL);</div><div class='ctx'> 	kfree(pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Cleanup and release resources */</div><div class='del'>-void page_pool_destroy(struct page_pool *pool)</div><div class='add'>+static void page_pool_empty_alloc_cache_once(struct page_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;destroy_cnt)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Empty alloc cache, assume caller made sure this is</div><div class='ctx'> 	 * no-longer in use, and page_pool_alloc_pages() cannot be</div><div class='ctx'> 	 * call concurrently.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (pool-&gt;alloc.count) {</div><div class='del'>-		page = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='del'>-		__page_pool_return_page(pool, page);</div><div class='add'>+		netmem = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+		page_pool_return_netmem(pool, netmem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_scrub(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	unsigned long id;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	page_pool_empty_alloc_cache_once(pool);</div><div class='add'>+	if (!pool-&gt;destroy_cnt++ &amp;&amp; pool-&gt;dma_map) {</div><div class='add'>+		if (pool-&gt;dma_sync) {</div><div class='add'>+			/* Disable page_pool_dma_sync_for_device() */</div><div class='add'>+			pool-&gt;dma_sync = false;</div><div class='add'>+</div><div class='add'>+			/* Make sure all concurrent returns that may see the old</div><div class='add'>+			 * value of dma_sync (and thus perform a sync) have</div><div class='add'>+			 * finished before doing the unmapping below. Skip the</div><div class='add'>+			 * wait if the device doesn't actually need syncing, or</div><div class='add'>+			 * if there are no outstanding mapped pages.</div><div class='add'>+			 */</div><div class='add'>+			if (dma_dev_need_sync(pool-&gt;p.dev) &amp;&amp;</div><div class='add'>+			    !xa_empty(&amp;pool-&gt;dma_mapped))</div><div class='add'>+				synchronize_net();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xa_for_each(&amp;pool-&gt;dma_mapped, id, ptr)</div><div class='add'>+			__page_pool_release_netmem_dma(pool, page_to_netmem((struct page *)ptr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No more consumers should exist, but producers could still</div><div class='ctx'> 	 * be in-flight.</div><div class='ctx'> 	 */</div><div class='del'>-	__page_pool_empty_ring(pool);</div><div class='add'>+	page_pool_empty_ring(pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int page_pool_release(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	bool in_softirq;</div><div class='add'>+	int inflight;</div><div class='add'>+</div><div class='add'>+	page_pool_scrub(pool);</div><div class='add'>+	inflight = page_pool_inflight(pool, true);</div><div class='add'>+	/* Acquire producer lock to make sure producers have exited. */</div><div class='add'>+	in_softirq = page_pool_producer_lock(pool);</div><div class='add'>+	page_pool_producer_unlock(pool, in_softirq);</div><div class='add'>+	if (!inflight)</div><div class='add'>+		__page_pool_destroy(pool);</div><div class='ctx'> </div><div class='del'>-	/* An xdp_mem_allocator can still ref page_pool pointer */</div><div class='del'>-	call_rcu(&amp;pool-&gt;rcu, __page_pool_destroy_rcu);</div><div class='add'>+	return inflight;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_release_retry(struct work_struct *wq)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dwq = to_delayed_work(wq);</div><div class='add'>+	struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw);</div><div class='add'>+	void *netdev;</div><div class='add'>+	int inflight;</div><div class='add'>+</div><div class='add'>+	inflight = page_pool_release(pool);</div><div class='add'>+	/* In rare cases, a driver bug may cause inflight to go negative.</div><div class='add'>+	 * Don't reschedule release if inflight is 0 or negative.</div><div class='add'>+	 * - If 0, the page_pool has been destroyed</div><div class='add'>+	 * - if negative, we will never recover</div><div class='add'>+	 * in both cases no reschedule is necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (inflight &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Periodic warning for page pools the user can't see */</div><div class='add'>+	netdev = READ_ONCE(pool-&gt;slow.netdev);</div><div class='add'>+	if (time_after_eq(jiffies, pool-&gt;defer_warn) &amp;&amp;</div><div class='add'>+	    (!netdev || netdev == NET_PTR_POISON)) {</div><div class='add'>+		int sec = (s32)((u32)jiffies - (u32)pool-&gt;defer_start) / HZ;</div><div class='add'>+</div><div class='add'>+		pr_warn("%s() stalled pool shutdown: id %u, %d inflight %d sec\n",</div><div class='add'>+			__func__, pool-&gt;user.id, inflight, sec);</div><div class='add'>+		pool-&gt;defer_warn = jiffies + DEFER_WARN_INTERVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Still not ready to be disconnected, retry later */</div><div class='add'>+	schedule_delayed_work(&amp;pool-&gt;release_dw, DEFER_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *),</div><div class='add'>+			   const struct xdp_mem_info *mem)</div><div class='add'>+{</div><div class='add'>+	refcount_inc(&amp;pool-&gt;user_cnt);</div><div class='add'>+	pool-&gt;disconnect = disconnect;</div><div class='add'>+	pool-&gt;xdp_mem_id = mem-&gt;id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_pool_enable_direct_recycling() - mark page pool as owned by NAPI</div><div class='add'>+ * @pool: page pool to modify</div><div class='add'>+ * @napi: NAPI instance to associate the page pool with</div><div class='add'>+ *</div><div class='add'>+ * Associate a page pool with a NAPI instance for lockless page recycling.</div><div class='add'>+ * This is useful when a new page pool has to be added to a NAPI instance</div><div class='add'>+ * without disabling that NAPI instance, to mark the point at which control</div><div class='add'>+ * path "hands over" the page pool to the NAPI instance. In most cases driver</div><div class='add'>+ * can simply set the @napi field in struct page_pool_params, and does not</div><div class='add'>+ * have to call this helper.</div><div class='add'>+ *</div><div class='add'>+ * The function is idempotent, but does not implement any refcounting.</div><div class='add'>+ * Single page_pool_disable_direct_recycling() will disable recycling,</div><div class='add'>+ * no matter how many times enable was called.</div><div class='add'>+ */</div><div class='add'>+void page_pool_enable_direct_recycling(struct page_pool *pool,</div><div class='add'>+				       struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	if (READ_ONCE(pool-&gt;p.napi) == napi)</div><div class='add'>+		return;</div><div class='add'>+	WARN_ON(!napi || pool-&gt;p.napi);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	WRITE_ONCE(pool-&gt;p.napi, napi);</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_enable_direct_recycling);</div><div class='add'>+</div><div class='add'>+void page_pool_disable_direct_recycling(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	/* Disable direct recycling based on pool-&gt;cpuid.</div><div class='add'>+	 * Paired with READ_ONCE() in page_pool_napi_local().</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(pool-&gt;cpuid, -1);</div><div class='add'>+</div><div class='add'>+	if (!pool-&gt;p.napi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	napi_assert_will_not_race(pool-&gt;p.napi);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	WRITE_ONCE(pool-&gt;p.napi, NULL);</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_disable_direct_recycling);</div><div class='add'>+</div><div class='add'>+void page_pool_destroy(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	if (!pool)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!page_pool_put(pool))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	page_pool_disable_direct_recycling(pool);</div><div class='add'>+	page_pool_free_frag(pool);</div><div class='add'>+</div><div class='add'>+	if (!page_pool_release(pool))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	page_pool_detached(pool);</div><div class='add'>+	pool-&gt;defer_start = jiffies;</div><div class='add'>+	pool-&gt;defer_warn  = jiffies + DEFER_WARN_INTERVAL;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;pool-&gt;release_dw, page_pool_release_retry);</div><div class='add'>+	schedule_delayed_work(&amp;pool-&gt;release_dw, DEFER_TIME);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(page_pool_destroy);</div><div class='add'>+</div><div class='add'>+/* Caller must provide appropriate safe context, e.g. NAPI. */</div><div class='add'>+void page_pool_update_nid(struct page_pool *pool, int new_nid)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	trace_page_pool_update_nid(pool, new_nid);</div><div class='add'>+	pool-&gt;p.nid = new_nid;</div><div class='add'>+</div><div class='add'>+	/* Flush pool alloc cache, as refill will check NUMA node */</div><div class='add'>+	while (pool-&gt;alloc.count) {</div><div class='add'>+		netmem = pool-&gt;alloc.cache[--pool-&gt;alloc.count];</div><div class='add'>+		page_pool_return_netmem(pool, netmem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(page_pool_update_nid);</div><div class='add'>+</div><div class='add'>+bool net_mp_niov_set_dma_addr(struct net_iov *niov, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Associate a niov with a page pool. Should follow with a matching</div><div class='add'>+ * net_mp_niov_clear_page_pool()</div><div class='add'>+ */</div><div class='add'>+void net_mp_niov_set_page_pool(struct page_pool *pool, struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem = net_iov_to_netmem(niov);</div><div class='add'>+</div><div class='add'>+	page_pool_set_pp_info(pool, netmem);</div><div class='add'>+</div><div class='add'>+	pool-&gt;pages_state_hold_cnt++;</div><div class='add'>+	trace_page_pool_state_hold(pool, netmem, pool-&gt;pages_state_hold_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Disassociate a niov from a page pool. Should only be used in the</div><div class='add'>+ * -&gt;release_netmem() path.</div><div class='add'>+ */</div><div class='add'>+void net_mp_niov_clear_page_pool(struct net_iov *niov)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem = net_iov_to_netmem(niov);</div><div class='add'>+</div><div class='add'>+	page_pool_clear_pp_info(netmem);</div><div class='add'>+}</div><div class='head'>diff --git a/net/core/page_pool_priv.h b/net/core/page_pool_priv.h<br/>new file mode 100644<br/>index 000000000000..2fb06d5f6d55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/page_pool_priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/page_pool_priv.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __PAGE_POOL_PRIV_H</div><div class='add'>+#define __PAGE_POOL_PRIV_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netmem_priv.h"</div><div class='add'>+</div><div class='add'>+extern struct mutex page_pools_lock;</div><div class='add'>+</div><div class='add'>+s32 page_pool_inflight(const struct page_pool *pool, bool strict);</div><div class='add'>+</div><div class='add'>+int page_pool_list(struct page_pool *pool);</div><div class='add'>+void page_pool_detached(struct page_pool *pool);</div><div class='add'>+void page_pool_unlist(struct page_pool *pool);</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+page_pool_set_dma_addr_netmem(netmem_ref netmem, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	if (PAGE_POOL_32BIT_ARCH_WITH_64BIT_DMA) {</div><div class='add'>+		netmem_set_dma_addr(netmem, addr &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+		/* We assume page alignment to shave off bottom bits,</div><div class='add'>+		 * if this "compression" doesn't work we need to drop.</div><div class='add'>+		 */</div><div class='add'>+		return addr != (dma_addr_t)netmem_get_dma_addr(netmem)</div><div class='add'>+				       &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netmem_set_dma_addr(netmem, addr);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool page_pool_set_dma_addr(struct page *page, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return page_pool_set_dma_addr_netmem(page_to_netmem(page), addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PAGE_POOL)</div><div class='add'>+void page_pool_set_pp_info(struct page_pool *pool, netmem_ref netmem);</div><div class='add'>+void page_pool_clear_pp_info(netmem_ref netmem);</div><div class='add'>+int page_pool_check_memory_provider(struct net_device *dev,</div><div class='add'>+				    struct netdev_rx_queue *rxq);</div><div class='add'>+#else</div><div class='add'>+static inline void page_pool_set_pp_info(struct page_pool *pool,</div><div class='add'>+					 netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void page_pool_clear_pp_info(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int page_pool_check_memory_provider(struct net_device *dev,</div><div class='add'>+						  struct netdev_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/core/page_pool_user.c b/net/core/page_pool_user.c<br/>new file mode 100644<br/>index 000000000000..c82a95beceff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/page_pool_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/page_pool_user.c</a></div><div class='hunk'>@@ -0,0 +1,441 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/net_debug.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/page_pool/types.h&gt;</div><div class='add'>+#include &lt;net/page_pool/memory_provider.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "page_pool_priv.h"</div><div class='add'>+#include "netdev-genl-gen.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_XARRAY_FLAGS(page_pools, XA_FLAGS_ALLOC1);</div><div class='add'>+/* Protects: page_pools, netdevice-&gt;page_pools, pool-&gt;p.napi, pool-&gt;slow.netdev,</div><div class='add'>+ *	pool-&gt;user.</div><div class='add'>+ * Ordering: inside rtnl_lock</div><div class='add'>+ */</div><div class='add'>+DEFINE_MUTEX(page_pools_lock);</div><div class='add'>+</div><div class='add'>+/* Page pools are only reachable from user space (via netlink) if they are</div><div class='add'>+ * linked to a netdev at creation time. Following page pool "visibility"</div><div class='add'>+ * states are possible:</div><div class='add'>+ *  - normal</div><div class='add'>+ *    - user.list: linked to real netdev, netdev: real netdev</div><div class='add'>+ *  - orphaned - real netdev has disappeared</div><div class='add'>+ *    - user.list: linked to lo, netdev: lo</div><div class='add'>+ *  - invisible - either (a) created without netdev linking, (b) unlisted due</div><div class='add'>+ *      to error, or (c) the entire namespace which owned this pool disappeared</div><div class='add'>+ *    - user.list: unhashed, netdev: unknown</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef int (*pp_nl_fill_cb)(struct sk_buff *rsp, const struct page_pool *pool,</div><div class='add'>+			     const struct genl_info *info);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_page_pool_get_do(struct genl_info *info, u32 id, pp_nl_fill_cb fill)</div><div class='add'>+{</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	pool = xa_load(&amp;page_pools, id);</div><div class='add'>+	if (!pool || hlist_unhashed(&amp;pool-&gt;user.list) ||</div><div class='add'>+	    !net_eq(dev_net(pool-&gt;slow.netdev), genl_info_net(info))) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fill(rsp, pool, info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rsp, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+err_unlock:</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct page_pool_dump_cb {</div><div class='add'>+	unsigned long ifindex;</div><div class='add'>+	u32 pp_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netdev_nl_page_pool_get_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+			     pp_nl_fill_cb fill)</div><div class='add'>+{</div><div class='add'>+	struct page_pool_dump_cb *state = (void *)cb-&gt;ctx;</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	for_each_netdev_dump(net, netdev, state-&gt;ifindex) {</div><div class='add'>+		hlist_for_each_entry(pool, &amp;netdev-&gt;page_pools, user.list) {</div><div class='add'>+			if (state-&gt;pp_id &amp;&amp; state-&gt;pp_id &lt; pool-&gt;user.id)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			state-&gt;pp_id = pool-&gt;user.id;</div><div class='add'>+			err = fill(skb, pool, info);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		state-&gt;pp_id = 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+page_pool_nl_stats_fill(struct sk_buff *rsp, const struct page_pool *pool,</div><div class='add'>+			const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	struct page_pool_stats stats = {};</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	if (!page_pool_get_stats(pool, &amp;stats))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(rsp, NETDEV_A_PAGE_POOL_STATS_INFO);</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_PAGE_POOL_ID, pool-&gt;user.id) ||</div><div class='add'>+	    (pool-&gt;slow.netdev-&gt;ifindex != LOOPBACK_IFINDEX &amp;&amp;</div><div class='add'>+	     nla_put_u32(rsp, NETDEV_A_PAGE_POOL_IFINDEX,</div><div class='add'>+			 pool-&gt;slow.netdev-&gt;ifindex)))</div><div class='add'>+		goto err_cancel_nest;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(rsp, nest);</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_FAST,</div><div class='add'>+			 stats.alloc_stats.fast) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW,</div><div class='add'>+			 stats.alloc_stats.slow) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW_HIGH_ORDER,</div><div class='add'>+			 stats.alloc_stats.slow_high_order) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_EMPTY,</div><div class='add'>+			 stats.alloc_stats.empty) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_REFILL,</div><div class='add'>+			 stats.alloc_stats.refill) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_ALLOC_WAIVE,</div><div class='add'>+			 stats.alloc_stats.waive) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHED,</div><div class='add'>+			 stats.recycle_stats.cached) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHE_FULL,</div><div class='add'>+			 stats.recycle_stats.cache_full) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING,</div><div class='add'>+			 stats.recycle_stats.ring) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING_FULL,</div><div class='add'>+			 stats.recycle_stats.ring_full) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_STATS_RECYCLE_RELEASED_REFCNT,</div><div class='add'>+			 stats.recycle_stats.released_refcnt))</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_cancel_nest:</div><div class='add'>+	nla_nest_cancel(rsp, nest);</div><div class='add'>+err_cancel_msg:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+#else</div><div class='add'>+	GENL_SET_ERR_MSG(info, "kernel built without CONFIG_PAGE_POOL_STATS");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_page_pool_stats_get_doit(struct sk_buff *skb,</div><div class='add'>+				       struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(netdev_page_pool_info_nl_policy)];</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_PAGE_POOL_STATS_INFO))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	nest = info-&gt;attrs[NETDEV_A_PAGE_POOL_STATS_INFO];</div><div class='add'>+	err = nla_parse_nested(tb, ARRAY_SIZE(tb) - 1, nest,</div><div class='add'>+			       netdev_page_pool_info_nl_policy,</div><div class='add'>+			       info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(info-&gt;extack, nest, tb, NETDEV_A_PAGE_POOL_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (tb[NETDEV_A_PAGE_POOL_IFINDEX]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[NETDEV_A_PAGE_POOL_IFINDEX],</div><div class='add'>+				    "selecting by ifindex not supported");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = nla_get_uint(tb[NETDEV_A_PAGE_POOL_ID]);</div><div class='add'>+</div><div class='add'>+	return netdev_nl_page_pool_get_do(info, id, page_pool_nl_stats_fill);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_page_pool_stats_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					 struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return netdev_nl_page_pool_get_dump(skb, cb, page_pool_nl_stats_fill);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,</div><div class='add'>+		  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	size_t inflight, refsz;</div><div class='add'>+	unsigned int napi_id;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(rsp, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_PAGE_POOL_ID, pool-&gt;user.id))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;slow.netdev-&gt;ifindex != LOOPBACK_IFINDEX &amp;&amp;</div><div class='add'>+	    nla_put_u32(rsp, NETDEV_A_PAGE_POOL_IFINDEX,</div><div class='add'>+			pool-&gt;slow.netdev-&gt;ifindex))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	napi_id = pool-&gt;p.napi ? READ_ONCE(pool-&gt;p.napi-&gt;napi_id) : 0;</div><div class='add'>+	if (napi_id_valid(napi_id) &amp;&amp;</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_NAPI_ID, napi_id))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	inflight = page_pool_inflight(pool, false);</div><div class='add'>+	refsz =	PAGE_SIZE &lt;&lt; pool-&gt;p.order;</div><div class='add'>+	if (nla_put_uint(rsp, NETDEV_A_PAGE_POOL_INFLIGHT, inflight) ||</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_INFLIGHT_MEM,</div><div class='add'>+			 inflight * refsz))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+	if (pool-&gt;user.detach_time &amp;&amp;</div><div class='add'>+	    nla_put_uint(rsp, NETDEV_A_PAGE_POOL_DETACH_TIME,</div><div class='add'>+			 pool-&gt;user.detach_time))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (pool-&gt;mp_ops &amp;&amp; pool-&gt;mp_ops-&gt;nl_fill(pool-&gt;mp_priv, rsp, NULL))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_cancel:</div><div class='add'>+	genlmsg_cancel(rsp, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netdev_nl_page_pool_event(const struct page_pool *pool, u32 cmd)</div><div class='add'>+{</div><div class='add'>+	struct genl_info info;</div><div class='add'>+	struct sk_buff *ntf;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;page_pools_lock);</div><div class='add'>+</div><div class='add'>+	/* 'invisible' page pools don't matter */</div><div class='add'>+	if (hlist_unhashed(&amp;pool-&gt;user.list))</div><div class='add'>+		return;</div><div class='add'>+	net = dev_net(pool-&gt;slow.netdev);</div><div class='add'>+</div><div class='add'>+	if (!genl_has_listeners(&amp;netdev_nl_family, net, NETDEV_NLGRP_PAGE_POOL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	genl_info_init_ntf(&amp;info, &amp;netdev_nl_family, cmd);</div><div class='add'>+</div><div class='add'>+	ntf = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!ntf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (page_pool_nl_fill(ntf, pool, &amp;info)) {</div><div class='add'>+		nlmsg_free(ntf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_multicast_netns(&amp;netdev_nl_family, net, ntf,</div><div class='add'>+				0, NETDEV_NLGRP_PAGE_POOL, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_page_pool_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NETDEV_A_PAGE_POOL_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = nla_get_uint(info-&gt;attrs[NETDEV_A_PAGE_POOL_ID]);</div><div class='add'>+</div><div class='add'>+	return netdev_nl_page_pool_get_do(info, id, page_pool_nl_fill);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netdev_nl_page_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return netdev_nl_page_pool_get_dump(skb, cb, page_pool_nl_fill);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int page_pool_list(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	static u32 id_alloc_next;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	err = xa_alloc_cyclic(&amp;page_pools, &amp;pool-&gt;user.id, pool, xa_limit_32b,</div><div class='add'>+			      &amp;id_alloc_next, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_NODE(&amp;pool-&gt;user.list);</div><div class='add'>+	if (pool-&gt;slow.netdev) {</div><div class='add'>+		hlist_add_head(&amp;pool-&gt;user.list,</div><div class='add'>+			       &amp;pool-&gt;slow.netdev-&gt;page_pools);</div><div class='add'>+		netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_ADD_NTF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_detached(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	pool-&gt;user.detach_time = ktime_get_boottime_seconds();</div><div class='add'>+	netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_CHANGE_NTF);</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_pool_unlist(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_DEL_NTF);</div><div class='add'>+	xa_erase(&amp;page_pools, pool-&gt;user.id);</div><div class='add'>+	if (!hlist_unhashed(&amp;pool-&gt;user.list))</div><div class='add'>+		hlist_del(&amp;pool-&gt;user.list);</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int page_pool_check_memory_provider(struct net_device *dev,</div><div class='add'>+				    struct netdev_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	void *binding = rxq-&gt;mp_params.mp_priv;</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	if (!binding)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	hlist_for_each_entry_safe(pool, n, &amp;dev-&gt;page_pools, user.list) {</div><div class='add'>+		if (pool-&gt;mp_priv != binding)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pool-&gt;slow.queue_idx == get_netdev_rx_queue_index(rxq)) {</div><div class='add'>+			mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+	return -ENODATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_unreg_netdev_wipe(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	hlist_for_each_entry_safe(pool, n, &amp;netdev-&gt;page_pools, user.list) {</div><div class='add'>+		hlist_del_init(&amp;pool-&gt;user.list);</div><div class='add'>+		pool-&gt;slow.netdev = NET_PTR_POISON;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void page_pool_unreg_netdev(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct page_pool *pool, *last;</div><div class='add'>+	struct net_device *lo;</div><div class='add'>+</div><div class='add'>+	lo = dev_net(netdev)-&gt;loopback_dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;page_pools_lock);</div><div class='add'>+	last = NULL;</div><div class='add'>+	hlist_for_each_entry(pool, &amp;netdev-&gt;page_pools, user.list) {</div><div class='add'>+		pool-&gt;slow.netdev = lo;</div><div class='add'>+		netdev_nl_page_pool_event(pool,</div><div class='add'>+					  NETDEV_CMD_PAGE_POOL_CHANGE_NTF);</div><div class='add'>+		last = pool;</div><div class='add'>+	}</div><div class='add'>+	if (last)</div><div class='add'>+		hlist_splice_init(&amp;netdev-&gt;page_pools, &amp;last-&gt;user.list,</div><div class='add'>+				  &amp;lo-&gt;page_pools);</div><div class='add'>+	mutex_unlock(&amp;page_pools_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+page_pool_netdevice_event(struct notifier_block *nb,</div><div class='add'>+			  unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	if (event != NETDEV_UNREGISTER)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;netdev-&gt;page_pools))</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;ifindex != LOOPBACK_IFINDEX)</div><div class='add'>+		page_pool_unreg_netdev(netdev);</div><div class='add'>+	else</div><div class='add'>+		page_pool_unreg_netdev_wipe(netdev);</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block page_pool_netdevice_nb = {</div><div class='add'>+	.notifier_call = page_pool_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init page_pool_user_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_netdevice_notifier(&amp;page_pool_netdevice_nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(page_pool_user_init);</div><div class='head'>diff --git a/net/core/pktgen.c b/net/core/pktgen.c<br/>index 7f6938405fa1..d41b03fd1f63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/pktgen.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/pktgen.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/pktgen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/pktgen.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * Copyright 2001, 2002 by Robert Olsson &lt;robert.olsson@its.uu.se&gt;</div><div class='hunk'>@@ -8,12 +9,6 @@</div><div class='ctx'>  * Ben Greear &lt;greearb@candelatech.com&gt;</div><div class='ctx'>  * Jens Låås &lt;jens.laas@data.slu.se&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * A tool for loading the network with preconfigurated packets.</div><div class='ctx'>  * The tool is implemented as a linux module.  Parameters are output</div><div class='ctx'>  * device, delay (to hard_xmit), number of packets, and whether</div><div class='hunk'>@@ -60,9 +55,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Integrated to 2.5.x 021029 --Lucio Maciel (luciomaciel@zipmail.com.br)</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * 021124 Finished major redesign and rewrite for new functionality.</div><div class='del'>- * See Documentation/networking/pktgen.txt for how to use this.</div><div class='add'>+ * See Documentation/networking/pktgen.rst for how to use this.</div><div class='ctx'>  *</div><div class='ctx'>  * The new operation:</div><div class='ctx'>  * For each CPU one thread/process is created at start. This process checks</div><div class='hunk'>@@ -75,7 +69,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * By design there should only be *one* "controlling" process. In practice</div><div class='ctx'>  * multiple write accesses gives unpredictable result. Understood by "write"</div><div class='del'>- * to /proc gives result code thats should be read be the "writer".</div><div class='add'>+ * to /proc gives result code that should be read be the "writer".</div><div class='ctx'>  * For practical use this should be no problem.</div><div class='ctx'>  *</div><div class='ctx'>  * Note when adding devices to a specific CPU there good idea to also assign</div><div class='hunk'>@@ -114,13 +108,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Fixed src_mac command to set source mac of packet to value specified in</div><div class='ctx'>  * command by Adit Ranadive &lt;adit.262@gmail.com&gt;</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -158,15 +152,14 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='hunk'>@@ -181,8 +174,11 @@</div><div class='ctx'> #define IP_NAME_SZ 32</div><div class='ctx'> #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */</div><div class='ctx'> #define MPLS_STACK_BOTTOM htonl(0x00000100)</div><div class='add'>+/* Max number of internet mix entries that can be specified in imix_weights. */</div><div class='add'>+#define MAX_IMIX_ENTRIES 20</div><div class='add'>+#define IMIX_PRECISION 100 /* Precision of IMIX distribution */</div><div class='ctx'> </div><div class='del'>-#define func_enter() pr_debug("entering %s\n", __func__);</div><div class='add'>+#define func_enter() pr_debug("entering %s\n", __func__)</div><div class='ctx'> </div><div class='ctx'> #define PKT_FLAGS							\</div><div class='ctx'> 	pf(IPV6)		/* Interface in IPV6 Mode */		\</div><div class='hunk'>@@ -203,6 +199,7 @@</div><div class='ctx'> 	pf(VID_RND)		/* Random VLAN ID */			\</div><div class='ctx'> 	pf(SVID_RND)		/* Random SVLAN ID */			\</div><div class='ctx'> 	pf(NODE)		/* Node memory alloc*/			\</div><div class='add'>+	pf(SHARED)		/* Shared SKB */			\</div><div class='ctx'> </div><div class='ctx'> #define pf(flag)		flag##_SHIFT,</div><div class='ctx'> enum pkt_flags {</div><div class='hunk'>@@ -231,12 +228,12 @@ static char *pkt_flag_names[] = {</div><div class='ctx'> </div><div class='ctx'> /* Xmit modes */</div><div class='ctx'> #define M_START_XMIT		0	/* Default normal TX */</div><div class='del'>-#define M_NETIF_RECEIVE 	1	/* Inject packets into stack */</div><div class='add'>+#define M_NETIF_RECEIVE		1	/* Inject packets into stack */</div><div class='ctx'> #define M_QUEUE_XMIT		2	/* Inject packet into qdisc */</div><div class='ctx'> </div><div class='ctx'> /* If lock -- protects updating of if_list */</div><div class='del'>-#define   if_lock(t)           mutex_lock(&amp;(t-&gt;if_lock));</div><div class='del'>-#define   if_unlock(t)           mutex_unlock(&amp;(t-&gt;if_lock));</div><div class='add'>+#define   if_lock(t)      mutex_lock(&amp;(t-&gt;if_lock))</div><div class='add'>+#define   if_unlock(t)    mutex_unlock(&amp;(t-&gt;if_lock))</div><div class='ctx'> </div><div class='ctx'> /* Used to help with determining the pkts on receive */</div><div class='ctx'> #define PKTGEN_MAGIC 0xbe9be955</div><div class='hunk'>@@ -248,6 +245,12 @@ static char *pkt_flag_names[] = {</div><div class='ctx'> #define VLAN_TAG_SIZE(x) ((x)-&gt;vlan_id == 0xffff ? 0 : 4)</div><div class='ctx'> #define SVLAN_TAG_SIZE(x) ((x)-&gt;svlan_id == 0xffff ? 0 : 4)</div><div class='ctx'> </div><div class='add'>+struct imix_pkt {</div><div class='add'>+	u64 size;</div><div class='add'>+	u64 weight;</div><div class='add'>+	u64 count_so_far;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct flow_state {</div><div class='ctx'> 	__be32 cur_daddr;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -281,7 +284,8 @@ struct pktgen_dev {</div><div class='ctx'> 	int pkt_overhead;	/* overhead for MPLS, VLANs, IPSEC etc */</div><div class='ctx'> 	int nfrags;</div><div class='ctx'> 	int removal_mark;	/* non-zero =&gt; the device is marked for</div><div class='del'>-				 * removal by worker thread */</div><div class='add'>+				 * removal by worker thread</div><div class='add'>+				 */</div><div class='ctx'> </div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	u64 delay;		/* nano-seconds */</div><div class='hunk'>@@ -344,10 +348,18 @@ struct pktgen_dev {</div><div class='ctx'> 	__u16 udp_dst_max;	/* exclusive, dest UDP port */</div><div class='ctx'> </div><div class='ctx'> 	/* DSCP + ECN */</div><div class='del'>-	__u8 tos;            /* six MSB of (former) IPv4 TOS</div><div class='del'>-				are for dscp codepoint */</div><div class='del'>-	__u8 traffic_class;  /* ditto for the (former) Traffic Class in IPv6</div><div class='del'>-				(see RFC 3260, sec. 4) */</div><div class='add'>+	__u8 tos;		/* six MSB of (former) IPv4 TOS</div><div class='add'>+				 * are for dscp codepoint</div><div class='add'>+				 */</div><div class='add'>+	__u8 traffic_class;	/* ditto for the (former) Traffic Class in IPv6</div><div class='add'>+				 * (see RFC 3260, sec. 4)</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+	/* IMIX */</div><div class='add'>+	unsigned int n_imix_entries;</div><div class='add'>+	struct imix_pkt imix_entries[MAX_IMIX_ENTRIES];</div><div class='add'>+	/* Maps 0-IMIX_PRECISION range to imix_entry based on probability*/</div><div class='add'>+	__u8 imix_distribution[IMIX_PRECISION];</div><div class='ctx'> </div><div class='ctx'> 	/* MPLS */</div><div class='ctx'> 	unsigned int nr_labels;	/* Depth of stack, 0 = no MPLS */</div><div class='hunk'>@@ -381,12 +393,12 @@ struct pktgen_dev {</div><div class='ctx'> </div><div class='ctx'> 	__u8 hh[14];</div><div class='ctx'> 	/* = {</div><div class='del'>-	   0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,</div><div class='del'>-</div><div class='del'>-	   We fill in SRC address later</div><div class='del'>-	   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	   0x08, 0x00</div><div class='del'>-	   };</div><div class='add'>+	 * 0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,</div><div class='add'>+	 *</div><div class='add'>+	 * We fill in SRC address later</div><div class='add'>+	 * 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	 * 0x08, 0x00</div><div class='add'>+	 * };</div><div class='ctx'> 	 */</div><div class='ctx'> 	__u16 pad;		/* pad out the hh struct to an even 16 bytes */</div><div class='ctx'> </div><div class='hunk'>@@ -401,6 +413,7 @@ struct pktgen_dev {</div><div class='ctx'> 				  * device name (not when the inject is</div><div class='ctx'> 				  * started as it used to do.)</div><div class='ctx'> 				  */</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> 	char odevname[32];</div><div class='ctx'> 	struct flow_state *flows;</div><div class='ctx'> 	unsigned int cflows;	/* Concurrent flows (config) */</div><div class='hunk'>@@ -449,7 +462,8 @@ struct pktgen_thread {</div><div class='ctx'> 	char result[512];</div><div class='ctx'> </div><div class='ctx'> 	/* Field for thread to receive "posted" events terminate,</div><div class='del'>-	   stop ifs etc. */</div><div class='add'>+	 * stop ifs etc.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	u32 control;</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -463,8 +477,7 @@ struct pktgen_thread {</div><div class='ctx'> #define FIND   0</div><div class='ctx'> </div><div class='ctx'> static const char version[] =</div><div class='del'>-	"Packet Generator for packet performance testing. "</div><div class='del'>-	"Version: " VERSION "\n";</div><div class='add'>+	"Packet Generator for packet performance testing. Version: " VERSION "\n";</div><div class='ctx'> </div><div class='ctx'> static int pktgen_remove_device(struct pktgen_thread *t, struct pktgen_dev *i);</div><div class='ctx'> static int pktgen_add_device(struct pktgen_thread *t, const char *ifname);</div><div class='hunk'>@@ -473,10 +486,11 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t,</div><div class='ctx'> static int pktgen_device_event(struct notifier_block *, unsigned long, void *);</div><div class='ctx'> static void pktgen_run_all_threads(struct pktgen_net *pn);</div><div class='ctx'> static void pktgen_reset_all_threads(struct pktgen_net *pn);</div><div class='del'>-static void pktgen_stop_all_threads_ifs(struct pktgen_net *pn);</div><div class='add'>+static void pktgen_stop_all_threads(struct pktgen_net *pn);</div><div class='ctx'> </div><div class='ctx'> static void pktgen_stop(struct pktgen_thread *t);</div><div class='ctx'> static void pktgen_clear_counters(struct pktgen_dev *pkt_dev);</div><div class='add'>+static void fill_imix_distribution(struct pktgen_dev *pkt_dev);</div><div class='ctx'> </div><div class='ctx'> /* Module parameters, defaults. */</div><div class='ctx'> static int pg_count_d __read_mostly = 1000;</div><div class='hunk'>@@ -505,31 +519,30 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			    size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	char data[128];</div><div class='add'>+	size_t max;</div><div class='ctx'> 	struct pktgen_net *pn = net_generic(current-&gt;nsproxy-&gt;net_ns, pg_net_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (count == 0)</div><div class='add'>+	if (count &lt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (count &gt; sizeof(data))</div><div class='del'>-		count = sizeof(data);</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(data, buf, count))</div><div class='add'>+	max = min(count, sizeof(data) - 1);</div><div class='add'>+	if (copy_from_user(data, buf, max))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	data[count - 1] = 0;	/* Strip trailing '\n' and terminate string */</div><div class='add'>+	if (data[max - 1] == '\n')</div><div class='add'>+		data[max - 1] = 0; /* strip trailing '\n', terminate string */</div><div class='add'>+	else</div><div class='add'>+		data[max] = 0; /* terminate string */</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(data, "stop"))</div><div class='del'>-		pktgen_stop_all_threads_ifs(pn);</div><div class='del'>-</div><div class='add'>+		pktgen_stop_all_threads(pn);</div><div class='ctx'> 	else if (!strcmp(data, "start"))</div><div class='ctx'> 		pktgen_run_all_threads(pn);</div><div class='del'>-</div><div class='ctx'> 	else if (!strcmp(data, "reset"))</div><div class='ctx'> 		pktgen_reset_all_threads(pn);</div><div class='del'>-</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -538,15 +551,15 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> static int pgctrl_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return single_open(file, pgctrl_show, PDE_DATA(inode));</div><div class='add'>+	return single_open(file, pgctrl_show, pde_data(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations pktgen_fops = {</div><div class='del'>-	.open    = pgctrl_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.write   = pgctrl_write,</div><div class='del'>-	.release = single_release,</div><div class='add'>+static const struct proc_ops pktgen_proc_ops = {</div><div class='add'>+	.proc_open	= pgctrl_open,</div><div class='add'>+	.proc_read	= seq_read,</div><div class='add'>+	.proc_lseek	= seq_lseek,</div><div class='add'>+	.proc_write	= pgctrl_write,</div><div class='add'>+	.proc_release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -561,6 +574,16 @@ static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   (unsigned long long)pkt_dev-&gt;count, pkt_dev-&gt;min_pkt_size,</div><div class='ctx'> 		   pkt_dev-&gt;max_pkt_size);</div><div class='ctx'> </div><div class='add'>+	if (pkt_dev-&gt;n_imix_entries &gt; 0) {</div><div class='add'>+		seq_puts(seq, "     imix_weights: ");</div><div class='add'>+		for (i = 0; i &lt; pkt_dev-&gt;n_imix_entries; i++) {</div><div class='add'>+			seq_printf(seq, "%llu,%llu ",</div><div class='add'>+				   pkt_dev-&gt;imix_entries[i].size,</div><div class='add'>+				   pkt_dev-&gt;imix_entries[i].weight);</div><div class='add'>+		}</div><div class='add'>+		seq_puts(seq, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	seq_printf(seq,</div><div class='ctx'> 		   "     frags: %d  delay: %llu  clone_skb: %d  ifname: %s\n",</div><div class='ctx'> 		   pkt_dev-&gt;nfrags, (unsigned long long) pkt_dev-&gt;delay,</div><div class='hunk'>@@ -605,8 +628,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "%pM\n", pkt_dev-&gt;dst_mac);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq,</div><div class='del'>-		   "     udp_src_min: %d  udp_src_max: %d"</div><div class='del'>-		   "  udp_dst_min: %d  udp_dst_max: %d\n",</div><div class='add'>+		   "     udp_src_min: %d  udp_src_max: %d  udp_dst_min: %d  udp_dst_max: %d\n",</div><div class='ctx'> 		   pkt_dev-&gt;udp_src_min, pkt_dev-&gt;udp_src_max,</div><div class='ctx'> 		   pkt_dev-&gt;udp_dst_min, pkt_dev-&gt;udp_dst_max);</div><div class='ctx'> </div><div class='hunk'>@@ -651,19 +673,19 @@ static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_puts(seq, "     Flags: ");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_PKT_FLAGS; i++) {</div><div class='del'>-		if (i == F_FLOW_SEQ)</div><div class='add'>+		if (i == FLOW_SEQ_SHIFT)</div><div class='ctx'> 			if (!pkt_dev-&gt;cflows)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-		if (pkt_dev-&gt;flags &amp; (1 &lt;&lt; i))</div><div class='add'>+		if (pkt_dev-&gt;flags &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			seq_printf(seq, "%s  ", pkt_flag_names[i]);</div><div class='del'>-		else if (i == F_FLOW_SEQ)</div><div class='del'>-			seq_puts(seq, "FLOW_RND  ");</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='del'>-		if (i == F_IPSEC &amp;&amp; pkt_dev-&gt;spi)</div><div class='del'>-			seq_printf(seq, "spi:%u", pkt_dev-&gt;spi);</div><div class='add'>+			if (i == IPSEC_SHIFT &amp;&amp; pkt_dev-&gt;spi)</div><div class='add'>+				seq_printf(seq, "spi:%u  ", pkt_dev-&gt;spi);</div><div class='ctx'> #endif</div><div class='add'>+		} else if (i == FLOW_SEQ_SHIFT) {</div><div class='add'>+			seq_puts(seq, "FLOW_RND  ");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "\n");</div><div class='hunk'>@@ -678,6 +700,18 @@ static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   (unsigned long long)pkt_dev-&gt;sofar,</div><div class='ctx'> 		   (unsigned long long)pkt_dev-&gt;errors);</div><div class='ctx'> </div><div class='add'>+	if (pkt_dev-&gt;n_imix_entries &gt; 0) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		seq_puts(seq, "     imix_size_counts: ");</div><div class='add'>+		for (i = 0; i &lt; pkt_dev-&gt;n_imix_entries; i++) {</div><div class='add'>+			seq_printf(seq, "%llu,%llu ",</div><div class='add'>+				   pkt_dev-&gt;imix_entries[i].size,</div><div class='add'>+				   pkt_dev-&gt;imix_entries[i].count_so_far);</div><div class='add'>+		}</div><div class='add'>+		seq_puts(seq, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	seq_printf(seq,</div><div class='ctx'> 		   "     started: %lluus  stopped: %lluus idle: %lluus\n",</div><div class='ctx'> 		   (unsigned long long) ktime_to_us(pkt_dev-&gt;started_at),</div><div class='hunk'>@@ -713,34 +747,37 @@ static int pktgen_if_show(struct seq_file *seq, void *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int hex32_arg(const char __user *user_buffer, unsigned long maxlen,</div><div class='del'>-		     __u32 *num)</div><div class='add'>+static ssize_t hex32_arg(const char __user *user_buffer, size_t maxlen,</div><div class='add'>+			 __u32 *num)</div><div class='ctx'> {</div><div class='del'>-	int i = 0;</div><div class='add'>+	size_t i = 0;</div><div class='add'>+</div><div class='ctx'> 	*num = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (; i &lt; maxlen; i++) {</div><div class='ctx'> 		int value;</div><div class='ctx'> 		char c;</div><div class='del'>-		*num &lt;&lt;= 4;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(c, &amp;user_buffer[i]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		value = hex_to_bin(c);</div><div class='del'>-		if (value &gt;= 0)</div><div class='add'>+		if (value &gt;= 0) {</div><div class='add'>+			*num &lt;&lt;= 4;</div><div class='ctx'> 			*num |= value;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int count_trail_chars(const char __user * user_buffer,</div><div class='del'>-			     unsigned int maxlen)</div><div class='add'>+static ssize_t count_trail_chars(const char __user *user_buffer, size_t maxlen)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	size_t i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; maxlen; i++) {</div><div class='ctx'> 		char c;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(c, &amp;user_buffer[i]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (c) {</div><div class='hunk'>@@ -759,14 +796,15 @@ done:</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long num_arg(const char __user *user_buffer, unsigned long maxlen,</div><div class='del'>-				unsigned long *num)</div><div class='add'>+static ssize_t num_arg(const char __user *user_buffer, size_t maxlen,</div><div class='add'>+		       unsigned long *num)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	size_t i;</div><div class='ctx'> 	*num = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; maxlen; i++) {</div><div class='ctx'> 		char c;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(c, &amp;user_buffer[i]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if ((c &gt;= '0') &amp;&amp; (c &lt;= '9')) {</div><div class='hunk'>@@ -778,12 +816,13 @@ static long num_arg(const char __user *user_buffer, unsigned long maxlen,</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int strn_len(const char __user * user_buffer, unsigned int maxlen)</div><div class='add'>+static ssize_t strn_len(const char __user *user_buffer, size_t maxlen)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	size_t i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; maxlen; i++) {</div><div class='ctx'> 		char c;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(c, &amp;user_buffer[i]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (c) {</div><div class='hunk'>@@ -792,6 +831,7 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen)</div><div class='ctx'> 		case '\r':</div><div class='ctx'> 		case '\t':</div><div class='ctx'> 		case ' ':</div><div class='add'>+		case '=':</div><div class='ctx'> 			goto done_str;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -801,29 +841,110 @@ done_str:</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)</div><div class='add'>+/* Parses imix entries from user buffer.</div><div class='add'>+ * The user buffer should consist of imix entries separated by spaces</div><div class='add'>+ * where each entry consists of size and weight delimited by commas.</div><div class='add'>+ * "size1,weight_1 size2,weight_2 ... size_n,weight_n" for example.</div><div class='add'>+ */</div><div class='add'>+static ssize_t get_imix_entries(const char __user *buffer,</div><div class='add'>+				size_t maxlen,</div><div class='add'>+				struct pktgen_dev *pkt_dev)</div><div class='add'>+{</div><div class='add'>+	size_t i = 0, max;</div><div class='add'>+	ssize_t len;</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	pkt_dev-&gt;n_imix_entries = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		unsigned long weight;</div><div class='add'>+		unsigned long size;</div><div class='add'>+</div><div class='add'>+		if (pkt_dev-&gt;n_imix_entries &gt;= MAX_IMIX_ENTRIES)</div><div class='add'>+			return -E2BIG;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		max = min(10, maxlen - i);</div><div class='add'>+		len = num_arg(&amp;buffer[i], max, &amp;size);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+		i += len;</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (get_user(c, &amp;buffer[i]))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		/* Check for comma between size_i and weight_i */</div><div class='add'>+		if (c != ',')</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (size &lt; 14 + 20 + 8)</div><div class='add'>+			size = 14 + 20 + 8;</div><div class='add'>+</div><div class='add'>+		max = min(10, maxlen - i);</div><div class='add'>+		len = num_arg(&amp;buffer[i], max, &amp;weight);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+		if (weight &lt;= 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		pkt_dev-&gt;imix_entries[pkt_dev-&gt;n_imix_entries].size = size;</div><div class='add'>+		pkt_dev-&gt;imix_entries[pkt_dev-&gt;n_imix_entries].weight = weight;</div><div class='add'>+</div><div class='add'>+		i += len;</div><div class='add'>+		pkt_dev-&gt;n_imix_entries++;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			break;</div><div class='add'>+		if (get_user(c, &amp;buffer[i]))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		i++;</div><div class='add'>+	} while (c == ' ');</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t get_labels(const char __user *buffer,</div><div class='add'>+			  size_t maxlen, struct pktgen_dev *pkt_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int n = 0;</div><div class='add'>+	size_t i = 0, max;</div><div class='add'>+	ssize_t len;</div><div class='ctx'> 	char c;</div><div class='del'>-	ssize_t i = 0;</div><div class='del'>-	int len;</div><div class='ctx'> </div><div class='ctx'> 	pkt_dev-&gt;nr_labels = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		__u32 tmp;</div><div class='del'>-		len = hex32_arg(&amp;buffer[i], 8, &amp;tmp);</div><div class='del'>-		if (len &lt;= 0)</div><div class='add'>+</div><div class='add'>+		if (n &gt;= MAX_MPLS_LABELS)</div><div class='add'>+			return -E2BIG;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		max = min(8, maxlen - i);</div><div class='add'>+		len = hex32_arg(&amp;buffer[i], max, &amp;tmp);</div><div class='add'>+		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='add'>+</div><div class='add'>+		/* return empty list in case of invalid input or zero value */</div><div class='add'>+		if (len == 0 || tmp == 0)</div><div class='add'>+			return maxlen;</div><div class='add'>+</div><div class='ctx'> 		pkt_dev-&gt;labels[n] = htonl(tmp);</div><div class='ctx'> 		if (pkt_dev-&gt;labels[n] &amp; MPLS_STACK_BOTTOM)</div><div class='ctx'> 			pkt_dev-&gt;flags |= F_MPLS_RND;</div><div class='ctx'> 		i += len;</div><div class='add'>+		n++;</div><div class='add'>+		if (i &gt;= maxlen)</div><div class='add'>+			break;</div><div class='ctx'> 		if (get_user(c, &amp;buffer[i]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		i++;</div><div class='del'>-		n++;</div><div class='del'>-		if (n &gt;= MAX_MPLS_LABELS)</div><div class='del'>-			return -E2BIG;</div><div class='ctx'> 	} while (c == ',');</div><div class='ctx'> </div><div class='ctx'> 	pkt_dev-&gt;nr_labels = n;</div><div class='hunk'>@@ -860,16 +981,16 @@ static __u32 pktgen_read_flag(const char *f, bool *disable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t pktgen_if_write(struct file *file,</div><div class='del'>-			       const char __user * user_buffer, size_t count,</div><div class='del'>-			       loff_t * offset)</div><div class='add'>+			       const char __user *user_buffer, size_t count,</div><div class='add'>+			       loff_t *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_file *seq = file-&gt;private_data;</div><div class='ctx'> 	struct pktgen_dev *pkt_dev = seq-&gt;private;</div><div class='del'>-	int i, max, len;</div><div class='add'>+	size_t i, max;</div><div class='add'>+	ssize_t len;</div><div class='ctx'> 	char name[16], valstr[32];</div><div class='ctx'> 	unsigned long value = 0;</div><div class='ctx'> 	char *pg_result = NULL;</div><div class='del'>-	int tmp = 0;</div><div class='ctx'> 	char buf[128];</div><div class='ctx'> </div><div class='ctx'> 	pg_result = &amp;(pkt_dev-&gt;result[0]);</div><div class='hunk'>@@ -880,16 +1001,16 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	max = count;</div><div class='del'>-	tmp = count_trail_chars(user_buffer, max);</div><div class='del'>-	if (tmp &lt; 0) {</div><div class='add'>+	len = count_trail_chars(user_buffer, max);</div><div class='add'>+	if (len &lt; 0) {</div><div class='ctx'> 		pr_warn("illegal format\n");</div><div class='del'>-		return tmp;</div><div class='add'>+		return len;</div><div class='ctx'> 	}</div><div class='del'>-	i = tmp;</div><div class='add'>+	i = len;</div><div class='ctx'> </div><div class='ctx'> 	/* Read variable name */</div><div class='del'>-</div><div class='del'>-	len = strn_len(&amp;user_buffer[i], sizeof(name) - 1);</div><div class='add'>+	max = min(sizeof(name) - 1, count - i);</div><div class='add'>+	len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='hunk'>@@ -917,35 +1038,35 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "min_pkt_size")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value &lt; 14 + 20 + 8)</div><div class='ctx'> 			value = 14 + 20 + 8;</div><div class='ctx'> 		if (value != pkt_dev-&gt;min_pkt_size) {</div><div class='ctx'> 			pkt_dev-&gt;min_pkt_size = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_pkt_size = value;</div><div class='ctx'> 		}</div><div class='del'>-		sprintf(pg_result, "OK: min_pkt_size=%u",</div><div class='add'>+		sprintf(pg_result, "OK: min_pkt_size=%d",</div><div class='ctx'> 			pkt_dev-&gt;min_pkt_size);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "max_pkt_size")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value &lt; 14 + 20 + 8)</div><div class='ctx'> 			value = 14 + 20 + 8;</div><div class='ctx'> 		if (value != pkt_dev-&gt;max_pkt_size) {</div><div class='ctx'> 			pkt_dev-&gt;max_pkt_size = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_pkt_size = value;</div><div class='ctx'> 		}</div><div class='del'>-		sprintf(pg_result, "OK: max_pkt_size=%u",</div><div class='add'>+		sprintf(pg_result, "OK: max_pkt_size=%d",</div><div class='ctx'> 			pkt_dev-&gt;max_pkt_size);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -953,11 +1074,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	/* Shortcut for min = max */</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "pkt_size")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value &lt; 14 + 20 + 8)</div><div class='ctx'> 			value = 14 + 20 + 8;</div><div class='ctx'> 		if (value != pkt_dev-&gt;min_pkt_size) {</div><div class='hunk'>@@ -965,37 +1086,51 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			pkt_dev-&gt;max_pkt_size = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_pkt_size = value;</div><div class='ctx'> 		}</div><div class='del'>-		sprintf(pg_result, "OK: pkt_size=%u", pkt_dev-&gt;min_pkt_size);</div><div class='add'>+		sprintf(pg_result, "OK: pkt_size=%d", pkt_dev-&gt;min_pkt_size);</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(name, "imix_weights")) {</div><div class='add'>+		if (pkt_dev-&gt;clone_skb &gt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		max = count - i;</div><div class='add'>+		len = get_imix_entries(&amp;user_buffer[i], max, pkt_dev);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+</div><div class='add'>+		fill_imix_distribution(pkt_dev);</div><div class='add'>+</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "debug")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		debug = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: debug=%u", debug);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "frags")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;nfrags = value;</div><div class='del'>-		sprintf(pg_result, "OK: frags=%u", pkt_dev-&gt;nfrags);</div><div class='add'>+		sprintf(pg_result, "OK: frags=%d", pkt_dev-&gt;nfrags);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "delay")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value == 0x7FFFFFFF)</div><div class='ctx'> 			pkt_dev-&gt;delay = ULLONG_MAX;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1006,13 +1141,13 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "rate")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (!value)</div><div class='del'>-			return len;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		pkt_dev-&gt;delay = pkt_dev-&gt;min_pkt_size*8*NSEC_PER_USEC/value;</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_info("Delay set at: %llu ns\n", pkt_dev-&gt;delay);</div><div class='hunk'>@@ -1021,13 +1156,13 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "ratep")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (!value)</div><div class='del'>-			return len;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		pkt_dev-&gt;delay = NSEC_PER_SEC/value;</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_info("Delay set at: %llu ns\n", pkt_dev-&gt;delay);</div><div class='hunk'>@@ -1036,11 +1171,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "udp_src_min")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value != pkt_dev-&gt;udp_src_min) {</div><div class='ctx'> 			pkt_dev-&gt;udp_src_min = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_src = value;</div><div class='hunk'>@@ -1049,11 +1184,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "udp_dst_min")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value != pkt_dev-&gt;udp_dst_min) {</div><div class='ctx'> 			pkt_dev-&gt;udp_dst_min = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_dst = value;</div><div class='hunk'>@@ -1062,11 +1197,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "udp_src_max")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value != pkt_dev-&gt;udp_src_max) {</div><div class='ctx'> 			pkt_dev-&gt;udp_src_max = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_src = value;</div><div class='hunk'>@@ -1075,11 +1210,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "udp_dst_max")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value != pkt_dev-&gt;udp_dst_max) {</div><div class='ctx'> 			pkt_dev-&gt;udp_dst_max = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_dst = value;</div><div class='hunk'>@@ -1088,36 +1223,43 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "clone_skb")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='add'>+		/* clone_skb is not supported for netif_receive xmit_mode and</div><div class='add'>+		 * IMIX mode.</div><div class='add'>+		 */</div><div class='ctx'> 		if ((value &gt; 0) &amp;&amp;</div><div class='ctx'> 		    ((pkt_dev-&gt;xmit_mode == M_NETIF_RECEIVE) ||</div><div class='ctx'> 		     !(pkt_dev-&gt;odev-&gt;priv_flags &amp; IFF_TX_SKB_SHARING)))</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-		i += len;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (value &gt; 0 &amp;&amp; (pkt_dev-&gt;n_imix_entries &gt; 0 ||</div><div class='add'>+				  !(pkt_dev-&gt;flags &amp; F_SHARED)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		pkt_dev-&gt;clone_skb = value;</div><div class='ctx'> </div><div class='ctx'> 		sprintf(pg_result, "OK: clone_skb=%d", pkt_dev-&gt;clone_skb);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "count")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;count = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: count=%llu",</div><div class='ctx'> 			(unsigned long long)pkt_dev-&gt;count);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "src_mac_count")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (pkt_dev-&gt;src_mac_count != value) {</div><div class='ctx'> 			pkt_dev-&gt;src_mac_count = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_src_mac_offset = 0;</div><div class='hunk'>@@ -1127,11 +1269,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst_mac_count")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (pkt_dev-&gt;dst_mac_count != value) {</div><div class='ctx'> 			pkt_dev-&gt;dst_mac_count = value;</div><div class='ctx'> 			pkt_dev-&gt;cur_dst_mac_offset = 0;</div><div class='hunk'>@@ -1141,27 +1283,30 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "burst")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &gt; 1) &amp;&amp;</div><div class='ctx'> 		    ((pkt_dev-&gt;xmit_mode == M_QUEUE_XMIT) ||</div><div class='ctx'> 		     ((pkt_dev-&gt;xmit_mode == M_START_XMIT) &amp;&amp;</div><div class='ctx'> 		     (!(pkt_dev-&gt;odev-&gt;priv_flags &amp; IFF_TX_SKB_SHARING)))))</div><div class='del'>-			return -ENOTSUPP;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (value &gt; 1 &amp;&amp; !(pkt_dev-&gt;flags &amp; F_SHARED))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		pkt_dev-&gt;burst = value &lt; 1 ? 1 : value;</div><div class='del'>-		sprintf(pg_result, "OK: burst=%d", pkt_dev-&gt;burst);</div><div class='add'>+		sprintf(pg_result, "OK: burst=%u", pkt_dev-&gt;burst);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "node")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='del'>-</div><div class='ctx'> 		if (node_possible(value)) {</div><div class='ctx'> 			pkt_dev-&gt;node = value;</div><div class='ctx'> 			sprintf(pg_result, "OK: node=%d", pkt_dev-&gt;node);</div><div class='hunk'>@@ -1169,29 +1314,29 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 				put_page(pkt_dev-&gt;page);</div><div class='ctx'> 				pkt_dev-&gt;page = NULL;</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			sprintf(pg_result, "ERROR: node not possible");</div><div class='add'>+		}</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "xmit_mode")) {</div><div class='ctx'> 		char f[32];</div><div class='ctx'> </div><div class='del'>-		memset(f, 0, 32);</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(f) - 1);</div><div class='add'>+		max = min(sizeof(f) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='add'>+		memset(f, 0, sizeof(f));</div><div class='ctx'> 		if (copy_from_user(f, &amp;user_buffer[i], len))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		i += len;</div><div class='ctx'> </div><div class='ctx'> 		if (strcmp(f, "start_xmit") == 0) {</div><div class='ctx'> 			pkt_dev-&gt;xmit_mode = M_START_XMIT;</div><div class='ctx'> 		} else if (strcmp(f, "netif_receive") == 0) {</div><div class='ctx'> 			/* clone_skb set earlier, not supported in this mode */</div><div class='ctx'> 			if (pkt_dev-&gt;clone_skb &gt; 0)</div><div class='del'>-				return -ENOTSUPP;</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 			pkt_dev-&gt;xmit_mode = M_NETIF_RECEIVE;</div><div class='ctx'> </div><div class='hunk'>@@ -1199,11 +1344,6 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			 * pktgen_xmit() is called</div><div class='ctx'> 			 */</div><div class='ctx'> 			pkt_dev-&gt;last_ok = 1;</div><div class='del'>-</div><div class='del'>-			/* override clone_skb if user passed default value</div><div class='del'>-			 * at module loading time</div><div class='del'>-			 */</div><div class='del'>-			pkt_dev-&gt;clone_skb = 0;</div><div class='ctx'> 		} else if (strcmp(f, "queue_xmit") == 0) {</div><div class='ctx'> 			pkt_dev-&gt;xmit_mode = M_QUEUE_XMIT;</div><div class='ctx'> 			pkt_dev-&gt;last_ok = 1;</div><div class='hunk'>@@ -1217,46 +1357,62 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "flag")) {</div><div class='add'>+		bool disable = false;</div><div class='ctx'> 		__u32 flag;</div><div class='ctx'> 		char f[32];</div><div class='del'>-		bool disable = false;</div><div class='add'>+		char *end;</div><div class='ctx'> </div><div class='del'>-		memset(f, 0, 32);</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(f) - 1);</div><div class='add'>+		max = min(sizeof(f) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='add'>+		memset(f, 0, 32);</div><div class='ctx'> 		if (copy_from_user(f, &amp;user_buffer[i], len))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		i += len;</div><div class='ctx'> </div><div class='ctx'> 		flag = pktgen_read_flag(f, &amp;disable);</div><div class='del'>-</div><div class='ctx'> 		if (flag) {</div><div class='del'>-			if (disable)</div><div class='add'>+			if (disable) {</div><div class='add'>+				/* If "clone_skb", or "burst" parameters are</div><div class='add'>+				 * configured, it means that the skb still</div><div class='add'>+				 * needs to be referenced by the pktgen, so</div><div class='add'>+				 * the skb must be shared.</div><div class='add'>+				 */</div><div class='add'>+				if (flag == F_SHARED &amp;&amp; (pkt_dev-&gt;clone_skb ||</div><div class='add'>+							 pkt_dev-&gt;burst &gt; 1))</div><div class='add'>+					return -EINVAL;</div><div class='ctx'> 				pkt_dev-&gt;flags &amp;= ~flag;</div><div class='del'>-			else</div><div class='add'>+			} else {</div><div class='ctx'> 				pkt_dev-&gt;flags |= flag;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(pg_result,</div><div class='del'>-				"Flag -:%s:- unknown\nAvailable flags, (prepend ! to un-set flag):\n%s",</div><div class='del'>-				f,</div><div class='del'>-				"IPSRC_RND, IPDST_RND, UDPSRC_RND, UDPDST_RND, "</div><div class='del'>-				"MACSRC_RND, MACDST_RND, TXSIZE_RND, IPV6, "</div><div class='del'>-				"MPLS_RND, VID_RND, SVID_RND, FLOW_SEQ, "</div><div class='del'>-				"QUEUE_MAP_RND, QUEUE_MAP_CPU, UDPCSUM, "</div><div class='del'>-				"NO_TIMESTAMP, "</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-				"IPSEC, "</div><div class='del'>-#endif</div><div class='del'>-				"NODE_ALLOC\n");</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sprintf(pg_result, "OK: flags=0x%x", pkt_dev-&gt;flags);</div><div class='ctx'> 			return count;</div><div class='ctx'> 		}</div><div class='del'>-		sprintf(pg_result, "OK: flags=0x%x", pkt_dev-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Unknown flag */</div><div class='add'>+		end = pkt_dev-&gt;result + sizeof(pkt_dev-&gt;result);</div><div class='add'>+		pg_result += sprintf(pg_result,</div><div class='add'>+			"Flag -:%s:- unknown\n"</div><div class='add'>+			"Available flags, (prepend ! to un-set flag):\n", f);</div><div class='add'>+</div><div class='add'>+		for (int n = 0; n &lt; NR_PKT_FLAGS &amp;&amp; pg_result &lt; end; n++) {</div><div class='add'>+			if (!IS_ENABLED(CONFIG_XFRM) &amp;&amp; n == IPSEC_SHIFT)</div><div class='add'>+				continue;</div><div class='add'>+			pg_result += snprintf(pg_result, end - pg_result,</div><div class='add'>+					      "%s, ", pkt_flag_names[n]);</div><div class='add'>+		}</div><div class='add'>+		if (!WARN_ON_ONCE(pg_result &gt;= end)) {</div><div class='add'>+			/* Remove the comma and whitespace at the end */</div><div class='add'>+			*(pg_result - 2) = '\0';</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst_min") || !strcmp(name, "dst")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(pkt_dev-&gt;dst_min) - 1);</div><div class='add'>+		max = min(sizeof(pkt_dev-&gt;dst_min) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1264,19 +1420,19 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> 		if (strcmp(buf, pkt_dev-&gt;dst_min) != 0) {</div><div class='del'>-			memset(pkt_dev-&gt;dst_min, 0, sizeof(pkt_dev-&gt;dst_min));</div><div class='del'>-			strcpy(pkt_dev-&gt;dst_min, buf);</div><div class='add'>+			strscpy_pad(pkt_dev-&gt;dst_min, buf);</div><div class='ctx'> 			pkt_dev-&gt;daddr_min = in_aton(pkt_dev-&gt;dst_min);</div><div class='ctx'> 			pkt_dev-&gt;cur_daddr = pkt_dev-&gt;daddr_min;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("dst_min set to: %s\n", pkt_dev-&gt;dst_min);</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		sprintf(pg_result, "OK: dst_min=%s", pkt_dev-&gt;dst_min);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst_max")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(pkt_dev-&gt;dst_max) - 1);</div><div class='add'>+		max = min(sizeof(pkt_dev-&gt;dst_max) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1284,19 +1440,19 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> 		if (strcmp(buf, pkt_dev-&gt;dst_max) != 0) {</div><div class='del'>-			memset(pkt_dev-&gt;dst_max, 0, sizeof(pkt_dev-&gt;dst_max));</div><div class='del'>-			strcpy(pkt_dev-&gt;dst_max, buf);</div><div class='add'>+			strscpy_pad(pkt_dev-&gt;dst_max, buf);</div><div class='ctx'> 			pkt_dev-&gt;daddr_max = in_aton(pkt_dev-&gt;dst_max);</div><div class='ctx'> 			pkt_dev-&gt;cur_daddr = pkt_dev-&gt;daddr_max;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("dst_max set to: %s\n", pkt_dev-&gt;dst_max);</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		sprintf(pg_result, "OK: dst_max=%s", pkt_dev-&gt;dst_max);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst6")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(buf) - 1);</div><div class='add'>+		max = min(sizeof(buf) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1314,12 +1470,12 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("dst6 set to: %s\n", buf);</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		sprintf(pg_result, "OK: dst6=%s", buf);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst6_min")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(buf) - 1);</div><div class='add'>+		max = min(sizeof(buf) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1336,12 +1492,12 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("dst6_min set to: %s\n", buf);</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		sprintf(pg_result, "OK: dst6_min=%s", buf);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst6_max")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(buf) - 1);</div><div class='add'>+		max = min(sizeof(buf) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1357,12 +1513,12 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("dst6_max set to: %s\n", buf);</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		sprintf(pg_result, "OK: dst6_max=%s", buf);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "src6")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(buf) - 1);</div><div class='add'>+		max = min(sizeof(buf) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1380,12 +1536,12 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("src6 set to: %s\n", buf);</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		sprintf(pg_result, "OK: src6=%s", buf);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "src_min")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(pkt_dev-&gt;src_min) - 1);</div><div class='add'>+		max = min(sizeof(pkt_dev-&gt;src_min) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1393,19 +1549,19 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> 		if (strcmp(buf, pkt_dev-&gt;src_min) != 0) {</div><div class='del'>-			memset(pkt_dev-&gt;src_min, 0, sizeof(pkt_dev-&gt;src_min));</div><div class='del'>-			strcpy(pkt_dev-&gt;src_min, buf);</div><div class='add'>+			strscpy_pad(pkt_dev-&gt;src_min, buf);</div><div class='ctx'> 			pkt_dev-&gt;saddr_min = in_aton(pkt_dev-&gt;src_min);</div><div class='ctx'> 			pkt_dev-&gt;cur_saddr = pkt_dev-&gt;saddr_min;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("src_min set to: %s\n", pkt_dev-&gt;src_min);</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		sprintf(pg_result, "OK: src_min=%s", pkt_dev-&gt;src_min);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "src_max")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(pkt_dev-&gt;src_max) - 1);</div><div class='add'>+		max = min(sizeof(pkt_dev-&gt;src_max) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1413,19 +1569,19 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> 		if (strcmp(buf, pkt_dev-&gt;src_max) != 0) {</div><div class='del'>-			memset(pkt_dev-&gt;src_max, 0, sizeof(pkt_dev-&gt;src_max));</div><div class='del'>-			strcpy(pkt_dev-&gt;src_max, buf);</div><div class='add'>+			strscpy_pad(pkt_dev-&gt;src_max, buf);</div><div class='ctx'> 			pkt_dev-&gt;saddr_max = in_aton(pkt_dev-&gt;src_max);</div><div class='ctx'> 			pkt_dev-&gt;cur_saddr = pkt_dev-&gt;saddr_max;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (debug)</div><div class='ctx'> 			pr_debug("src_max set to: %s\n", pkt_dev-&gt;src_max);</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		sprintf(pg_result, "OK: src_max=%s", pkt_dev-&gt;src_max);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "dst_mac")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(valstr) - 1);</div><div class='add'>+		max = min(sizeof(valstr) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1442,7 +1598,8 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!strcmp(name, "src_mac")) {</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(valstr) - 1);</div><div class='add'>+		max = min(sizeof(valstr) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1466,11 +1623,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "flows")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value &gt; MAX_CFLOWS)</div><div class='ctx'> 			value = MAX_CFLOWS;</div><div class='ctx'> </div><div class='hunk'>@@ -1480,44 +1637,44 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> 	if (!strcmp(name, "spi")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;spi = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: spi=%u", pkt_dev-&gt;spi);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (!strcmp(name, "flowlen")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 10, &amp;value);</div><div class='add'>+		max = min(10, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;lflow = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: flowlen=%u", pkt_dev-&gt;lflow);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "queue_map_min")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 5, &amp;value);</div><div class='add'>+		max = min(5, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;queue_map_min = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: queue_map_min=%u", pkt_dev-&gt;queue_map_min);</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "queue_map_max")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 5, &amp;value);</div><div class='add'>+		max = min(5, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;queue_map_max = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: queue_map_max=%u", pkt_dev-&gt;queue_map_max);</div><div class='ctx'> 		return count;</div><div class='hunk'>@@ -1526,10 +1683,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	if (!strcmp(name, "mpls")) {</div><div class='ctx'> 		unsigned int n, cnt;</div><div class='ctx'> </div><div class='del'>-		len = get_labels(&amp;user_buffer[i], pkt_dev);</div><div class='add'>+		max = count - i;</div><div class='add'>+		len = get_labels(&amp;user_buffer[i], max, pkt_dev);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		cnt = sprintf(pg_result, "OK: mpls=");</div><div class='ctx'> 		for (n = 0; n &lt; pkt_dev-&gt;nr_labels; n++)</div><div class='ctx'> 			cnt += sprintf(pg_result + cnt,</div><div class='hunk'>@@ -1547,11 +1705,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "vlan_id")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 4, &amp;value);</div><div class='add'>+		max = min(4, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (value &lt;= 4095) {</div><div class='ctx'> 			pkt_dev-&gt;vlan_id = value;  /* turn on VLAN */</div><div class='ctx'> </div><div class='hunk'>@@ -1574,11 +1732,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "vlan_p")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 1, &amp;value);</div><div class='add'>+		max = min(1, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &lt;= 7) &amp;&amp; (pkt_dev-&gt;vlan_id != 0xffff)) {</div><div class='ctx'> 			pkt_dev-&gt;vlan_p = value;</div><div class='ctx'> 			sprintf(pg_result, "OK: vlan_p=%u", pkt_dev-&gt;vlan_p);</div><div class='hunk'>@@ -1589,11 +1747,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "vlan_cfi")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 1, &amp;value);</div><div class='add'>+		max = min(1, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &lt;= 1) &amp;&amp; (pkt_dev-&gt;vlan_id != 0xffff)) {</div><div class='ctx'> 			pkt_dev-&gt;vlan_cfi = value;</div><div class='ctx'> 			sprintf(pg_result, "OK: vlan_cfi=%u", pkt_dev-&gt;vlan_cfi);</div><div class='hunk'>@@ -1604,11 +1762,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "svlan_id")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 4, &amp;value);</div><div class='add'>+		max = min(4, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &lt;= 4095) &amp;&amp; ((pkt_dev-&gt;vlan_id != 0xffff))) {</div><div class='ctx'> 			pkt_dev-&gt;svlan_id = value;  /* turn on SVLAN */</div><div class='ctx'> </div><div class='hunk'>@@ -1631,11 +1789,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "svlan_p")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 1, &amp;value);</div><div class='add'>+		max = min(1, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &lt;= 7) &amp;&amp; (pkt_dev-&gt;svlan_id != 0xffff)) {</div><div class='ctx'> 			pkt_dev-&gt;svlan_p = value;</div><div class='ctx'> 			sprintf(pg_result, "OK: svlan_p=%u", pkt_dev-&gt;svlan_p);</div><div class='hunk'>@@ -1646,11 +1804,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "svlan_cfi")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 1, &amp;value);</div><div class='add'>+		max = min(1, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if ((value &lt;= 1) &amp;&amp; (pkt_dev-&gt;svlan_id != 0xffff)) {</div><div class='ctx'> 			pkt_dev-&gt;svlan_cfi = value;</div><div class='ctx'> 			sprintf(pg_result, "OK: svlan_cfi=%u", pkt_dev-&gt;svlan_cfi);</div><div class='hunk'>@@ -1661,12 +1819,13 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "tos")) {</div><div class='del'>-		__u32 tmp_value = 0;</div><div class='del'>-		len = hex32_arg(&amp;user_buffer[i], 2, &amp;tmp_value);</div><div class='add'>+		__u32 tmp_value;</div><div class='add'>+</div><div class='add'>+		max = min(2, count - i);</div><div class='add'>+		len = hex32_arg(&amp;user_buffer[i], max, &amp;tmp_value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (len == 2) {</div><div class='ctx'> 			pkt_dev-&gt;tos = tmp_value;</div><div class='ctx'> 			sprintf(pg_result, "OK: tos=0x%02x", pkt_dev-&gt;tos);</div><div class='hunk'>@@ -1677,12 +1836,13 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "traffic_class")) {</div><div class='del'>-		__u32 tmp_value = 0;</div><div class='del'>-		len = hex32_arg(&amp;user_buffer[i], 2, &amp;tmp_value);</div><div class='add'>+		__u32 tmp_value;</div><div class='add'>+</div><div class='add'>+		max = min(2, count - i);</div><div class='add'>+		len = hex32_arg(&amp;user_buffer[i], max, &amp;tmp_value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		if (len == 2) {</div><div class='ctx'> 			pkt_dev-&gt;traffic_class = tmp_value;</div><div class='ctx'> 			sprintf(pg_result, "OK: traffic_class=0x%02x", pkt_dev-&gt;traffic_class);</div><div class='hunk'>@@ -1693,11 +1853,11 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "skb_priority")) {</div><div class='del'>-		len = num_arg(&amp;user_buffer[i], 9, &amp;value);</div><div class='add'>+		max = min(9, count - i);</div><div class='add'>+		len = num_arg(&amp;user_buffer[i], max, &amp;value);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		i += len;</div><div class='ctx'> 		pkt_dev-&gt;skb_priority = value;</div><div class='ctx'> 		sprintf(pg_result, "OK: skb_priority=%i",</div><div class='ctx'> 			pkt_dev-&gt;skb_priority);</div><div class='hunk'>@@ -1710,15 +1870,15 @@ static ssize_t pktgen_if_write(struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int pktgen_if_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return single_open(file, pktgen_if_show, PDE_DATA(inode));</div><div class='add'>+	return single_open(file, pktgen_if_show, pde_data(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations pktgen_if_fops = {</div><div class='del'>-	.open    = pktgen_if_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.write   = pktgen_if_write,</div><div class='del'>-	.release = single_release,</div><div class='add'>+static const struct proc_ops pktgen_if_proc_ops = {</div><div class='add'>+	.proc_open	= pktgen_if_open,</div><div class='add'>+	.proc_read	= seq_read,</div><div class='add'>+	.proc_lseek	= seq_lseek,</div><div class='add'>+	.proc_write	= pktgen_if_write,</div><div class='add'>+	.proc_release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int pktgen_thread_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -1752,12 +1912,13 @@ static int pktgen_thread_show(struct seq_file *seq, void *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t pktgen_thread_write(struct file *file,</div><div class='del'>-				   const char __user * user_buffer,</div><div class='del'>-				   size_t count, loff_t * offset)</div><div class='add'>+				   const char __user *user_buffer,</div><div class='add'>+				   size_t count, loff_t *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_file *seq = file-&gt;private_data;</div><div class='ctx'> 	struct pktgen_thread *t = seq-&gt;private;</div><div class='del'>-	int i, max, len, ret;</div><div class='add'>+	size_t i, max;</div><div class='add'>+	ssize_t len, ret;</div><div class='ctx'> 	char name[40];</div><div class='ctx'> 	char *pg_result;</div><div class='ctx'> </div><div class='hunk'>@@ -1774,8 +1935,8 @@ static ssize_t pktgen_thread_write(struct file *file,</div><div class='ctx'> 	i = len;</div><div class='ctx'> </div><div class='ctx'> 	/* Read variable name */</div><div class='del'>-</div><div class='del'>-	len = strn_len(&amp;user_buffer[i], sizeof(name) - 1);</div><div class='add'>+	max = min(sizeof(name) - 1, count - i);</div><div class='add'>+	len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1804,15 +1965,17 @@ static ssize_t pktgen_thread_write(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(name, "add_device")) {</div><div class='ctx'> 		char f[32];</div><div class='add'>+</div><div class='ctx'> 		memset(f, 0, 32);</div><div class='del'>-		len = strn_len(&amp;user_buffer[i], sizeof(f) - 1);</div><div class='add'>+		max = min(sizeof(f) - 1, count - i);</div><div class='add'>+		len = strn_len(&amp;user_buffer[i], max);</div><div class='ctx'> 		if (len &lt; 0) {</div><div class='ctx'> 			ret = len;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (copy_from_user(f, &amp;user_buffer[i], len))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		i += len;</div><div class='add'>+</div><div class='ctx'> 		mutex_lock(&amp;pktgen_thread_lock);</div><div class='ctx'> 		ret = pktgen_add_device(t, f);</div><div class='ctx'> 		mutex_unlock(&amp;pktgen_thread_lock);</div><div class='hunk'>@@ -1847,15 +2010,15 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int pktgen_thread_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return single_open(file, pktgen_thread_show, PDE_DATA(inode));</div><div class='add'>+	return single_open(file, pktgen_thread_show, pde_data(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations pktgen_thread_fops = {</div><div class='del'>-	.open    = pktgen_thread_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.write   = pktgen_thread_write,</div><div class='del'>-	.release = single_release,</div><div class='add'>+static const struct proc_ops pktgen_thread_proc_ops = {</div><div class='add'>+	.proc_open	= pktgen_thread_open,</div><div class='add'>+	.proc_read	= seq_read,</div><div class='add'>+	.proc_lseek	= seq_lseek,</div><div class='add'>+	.proc_write	= pktgen_thread_write,</div><div class='add'>+	.proc_release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Think find or remove for NN */</div><div class='hunk'>@@ -1932,7 +2095,7 @@ static void pktgen_change_name(const struct pktgen_net *pn, struct net_device *d</div><div class='ctx'> </div><div class='ctx'> 			pkt_dev-&gt;entry = proc_create_data(dev-&gt;name, 0600,</div><div class='ctx'> 							  pn-&gt;proc_dir,</div><div class='del'>-							  &amp;pktgen_if_fops,</div><div class='add'>+							  &amp;pktgen_if_proc_ops,</div><div class='ctx'> 							  pkt_dev);</div><div class='ctx'> 			if (!pkt_dev-&gt;entry)</div><div class='ctx'> 				pr_err("can't move proc entry for '%s'\n",</div><div class='hunk'>@@ -1999,7 +2162,7 @@ static int pktgen_setup_dev(const struct pktgen_net *pn,</div><div class='ctx'> </div><div class='ctx'> 	/* Clean old setups */</div><div class='ctx'> 	if (pkt_dev-&gt;odev) {</div><div class='del'>-		dev_put(pkt_dev-&gt;odev);</div><div class='add'>+		netdev_put(pkt_dev-&gt;odev, &amp;pkt_dev-&gt;dev_tracker);</div><div class='ctx'> 		pkt_dev-&gt;odev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2009,14 +2172,15 @@ static int pktgen_setup_dev(const struct pktgen_net *pn,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (odev-&gt;type != ARPHRD_ETHER) {</div><div class='del'>-		pr_err("not an ethernet device: \"%s\"\n", ifname);</div><div class='add'>+	if (odev-&gt;type != ARPHRD_ETHER &amp;&amp; odev-&gt;type != ARPHRD_LOOPBACK) {</div><div class='add'>+		pr_err("not an ethernet or loopback device: \"%s\"\n", ifname);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 	} else if (!netif_running(odev)) {</div><div class='ctx'> 		pr_err("device is down: \"%s\"\n", ifname);</div><div class='ctx'> 		err = -ENETDOWN;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pkt_dev-&gt;odev = odev;</div><div class='add'>+		netdev_tracker_alloc(odev, &amp;pkt_dev-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2124,9 +2288,11 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			in_dev = __in_dev_get_rcu(pkt_dev-&gt;odev);</div><div class='ctx'> 			if (in_dev) {</div><div class='del'>-				if (in_dev-&gt;ifa_list) {</div><div class='del'>-					pkt_dev-&gt;saddr_min =</div><div class='del'>-					    in_dev-&gt;ifa_list-&gt;ifa_address;</div><div class='add'>+				const struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='add'>+				ifa = rcu_dereference(in_dev-&gt;ifa_list);</div><div class='add'>+				if (ifa) {</div><div class='add'>+					pkt_dev-&gt;saddr_min = ifa-&gt;ifa_address;</div><div class='ctx'> 					pkt_dev-&gt;saddr_max = pkt_dev-&gt;saddr_min;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2160,7 +2326,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)</div><div class='ctx'> 	s64 remaining;</div><div class='ctx'> 	struct hrtimer_sleeper t;</div><div class='ctx'> </div><div class='del'>-	hrtimer_init_on_stack(&amp;t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);</div><div class='add'>+	hrtimer_setup_sleeper_on_stack(&amp;t, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);</div><div class='ctx'> 	hrtimer_set_expires(&amp;t.timer, spin_until);</div><div class='ctx'> </div><div class='ctx'> 	remaining = ktime_to_ns(hrtimer_expires_remaining(&amp;t.timer));</div><div class='hunk'>@@ -2174,11 +2340,9 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)</div><div class='ctx'> 			end_time = ktime_get();</div><div class='ctx'> 		} while (ktime_compare(end_time, spin_until) &lt; 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* see do_nanosleep */</div><div class='del'>-		hrtimer_init_sleeper(&amp;t, current);</div><div class='ctx'> 		do {</div><div class='ctx'> 			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			hrtimer_start_expires(&amp;t.timer, HRTIMER_MODE_ABS);</div><div class='add'>+			hrtimer_sleeper_start_expires(&amp;t, HRTIMER_MODE_ABS);</div><div class='ctx'> </div><div class='ctx'> 			if (likely(t.task))</div><div class='ctx'> 				schedule();</div><div class='hunk'>@@ -2222,7 +2386,7 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 				pkt_dev-&gt;curfl = 0; /*reset */</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		flow = prandom_u32() % pkt_dev-&gt;cflows;</div><div class='add'>+		flow = get_random_u32_below(pkt_dev-&gt;cflows);</div><div class='ctx'> 		pkt_dev-&gt;curfl = flow;</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_dev-&gt;flows[flow].count &gt; pkt_dev-&gt;lflow) {</div><div class='hunk'>@@ -2235,24 +2399,25 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='ctx'> /* If there was already an IPSEC SA, we keep it as is, else</div><div class='ctx'>  * we go look for it ...</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> #define DUMMY_MARK 0</div><div class='ctx'> static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='ctx'> 	struct xfrm_state *x = pkt_dev-&gt;flows[flow].x;</div><div class='ctx'> 	struct pktgen_net *pn = net_generic(dev_net(pkt_dev-&gt;odev), pg_net_id);</div><div class='add'>+</div><div class='ctx'> 	if (!x) {</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_dev-&gt;spi) {</div><div class='ctx'> 			/* We need as quick as possible to find the right SA</div><div class='del'>-			 * Searching with minimum criteria to archieve this.</div><div class='add'>+			 * Searching with minimum criteria to achieve, this.</div><div class='ctx'> 			 */</div><div class='ctx'> 			x = xfrm_state_lookup_byspi(pn-&gt;net, htonl(pkt_dev-&gt;spi), AF_INET);</div><div class='ctx'> 		} else {</div><div class='del'>-			/* slow path: we dont already have xfrm_state */</div><div class='add'>+			/* slow path: we don't already have xfrm_state */</div><div class='ctx'> 			x = xfrm_stateonly_find(pn-&gt;net, DUMMY_MARK, 0,</div><div class='ctx'> 						(xfrm_address_t *)&amp;pkt_dev-&gt;cur_daddr,</div><div class='ctx'> 						(xfrm_address_t *)&amp;pkt_dev-&gt;cur_saddr,</div><div class='hunk'>@@ -2267,21 +2432,19 @@ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='ctx'> static void set_cur_queue_map(struct pktgen_dev *pkt_dev)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	if (pkt_dev-&gt;flags &amp; F_QUEUE_MAP_CPU)</div><div class='ctx'> 		pkt_dev-&gt;cur_queue_map = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	else if (pkt_dev-&gt;queue_map_min &lt;= pkt_dev-&gt;queue_map_max) {</div><div class='ctx'> 		__u16 t;</div><div class='add'>+</div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_QUEUE_MAP_RND) {</div><div class='del'>-			t = prandom_u32() %</div><div class='del'>-				(pkt_dev-&gt;queue_map_max -</div><div class='del'>-				 pkt_dev-&gt;queue_map_min + 1)</div><div class='del'>-				+ pkt_dev-&gt;queue_map_min;</div><div class='add'>+			t = get_random_u32_inclusive(pkt_dev-&gt;queue_map_min,</div><div class='add'>+						     pkt_dev-&gt;queue_map_max);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			t = pkt_dev-&gt;cur_queue_map + 1;</div><div class='ctx'> 			if (t &gt; pkt_dev-&gt;queue_map_max)</div><div class='hunk'>@@ -2310,7 +2473,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 		__u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_MACSRC_RND)</div><div class='del'>-			mc = prandom_u32() % pkt_dev-&gt;src_mac_count;</div><div class='add'>+			mc = get_random_u32_below(pkt_dev-&gt;src_mac_count);</div><div class='ctx'> 		else {</div><div class='ctx'> 			mc = pkt_dev-&gt;cur_src_mac_offset++;</div><div class='ctx'> 			if (pkt_dev-&gt;cur_src_mac_offset &gt;=</div><div class='hunk'>@@ -2336,7 +2499,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 		__u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_MACDST_RND)</div><div class='del'>-			mc = prandom_u32() % pkt_dev-&gt;dst_mac_count;</div><div class='add'>+			mc = get_random_u32_below(pkt_dev-&gt;dst_mac_count);</div><div class='ctx'> </div><div class='ctx'> 		else {</div><div class='ctx'> 			mc = pkt_dev-&gt;cur_dst_mac_offset++;</div><div class='hunk'>@@ -2360,26 +2523,26 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;flags &amp; F_MPLS_RND) {</div><div class='ctx'> 		unsigned int i;</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; pkt_dev-&gt;nr_labels; i++)</div><div class='ctx'> 			if (pkt_dev-&gt;labels[i] &amp; MPLS_STACK_BOTTOM)</div><div class='ctx'> 				pkt_dev-&gt;labels[i] = MPLS_STACK_BOTTOM |</div><div class='del'>-					     ((__force __be32)prandom_u32() &amp;</div><div class='add'>+					     ((__force __be32)get_random_u32() &amp;</div><div class='ctx'> 						      htonl(0x000fffff));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((pkt_dev-&gt;flags &amp; F_VID_RND) &amp;&amp; (pkt_dev-&gt;vlan_id != 0xffff)) {</div><div class='del'>-		pkt_dev-&gt;vlan_id = prandom_u32() &amp; (4096 - 1);</div><div class='add'>+		pkt_dev-&gt;vlan_id = get_random_u32_below(4096);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((pkt_dev-&gt;flags &amp; F_SVID_RND) &amp;&amp; (pkt_dev-&gt;svlan_id != 0xffff)) {</div><div class='del'>-		pkt_dev-&gt;svlan_id = prandom_u32() &amp; (4096 - 1);</div><div class='add'>+		pkt_dev-&gt;svlan_id = get_random_u32_below(4096);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;udp_src_min &lt; pkt_dev-&gt;udp_src_max) {</div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_UDPSRC_RND)</div><div class='del'>-			pkt_dev-&gt;cur_udp_src = prandom_u32() %</div><div class='del'>-				(pkt_dev-&gt;udp_src_max - pkt_dev-&gt;udp_src_min)</div><div class='del'>-				+ pkt_dev-&gt;udp_src_min;</div><div class='add'>+			pkt_dev-&gt;cur_udp_src = get_random_u32_inclusive(pkt_dev-&gt;udp_src_min,</div><div class='add'>+									pkt_dev-&gt;udp_src_max - 1);</div><div class='ctx'> </div><div class='ctx'> 		else {</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_src++;</div><div class='hunk'>@@ -2390,9 +2553,8 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;udp_dst_min &lt; pkt_dev-&gt;udp_dst_max) {</div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_UDPDST_RND) {</div><div class='del'>-			pkt_dev-&gt;cur_udp_dst = prandom_u32() %</div><div class='del'>-				(pkt_dev-&gt;udp_dst_max - pkt_dev-&gt;udp_dst_min)</div><div class='del'>-				+ pkt_dev-&gt;udp_dst_min;</div><div class='add'>+			pkt_dev-&gt;cur_udp_dst = get_random_u32_inclusive(pkt_dev-&gt;udp_dst_min,</div><div class='add'>+									pkt_dev-&gt;udp_dst_max - 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pkt_dev-&gt;cur_udp_dst++;</div><div class='ctx'> 			if (pkt_dev-&gt;cur_udp_dst &gt;= pkt_dev-&gt;udp_dst_max)</div><div class='hunk'>@@ -2406,8 +2568,9 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 		imx = ntohl(pkt_dev-&gt;saddr_max);</div><div class='ctx'> 		if (imn &lt; imx) {</div><div class='ctx'> 			__u32 t;</div><div class='add'>+</div><div class='ctx'> 			if (pkt_dev-&gt;flags &amp; F_IPSRC_RND)</div><div class='del'>-				t = prandom_u32() % (imx - imn) + imn;</div><div class='add'>+				t = get_random_u32_inclusive(imn, imx - 1);</div><div class='ctx'> 			else {</div><div class='ctx'> 				t = ntohl(pkt_dev-&gt;cur_saddr);</div><div class='ctx'> 				t++;</div><div class='hunk'>@@ -2426,11 +2589,11 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 			if (imn &lt; imx) {</div><div class='ctx'> 				__u32 t;</div><div class='ctx'> 				__be32 s;</div><div class='add'>+</div><div class='ctx'> 				if (pkt_dev-&gt;flags &amp; F_IPDST_RND) {</div><div class='ctx'> </div><div class='ctx'> 					do {</div><div class='del'>-						t = prandom_u32() %</div><div class='del'>-							(imx - imn) + imn;</div><div class='add'>+						t = get_random_u32_inclusive(imn, imx - 1);</div><div class='ctx'> 						s = htonl(t);</div><div class='ctx'> 					} while (ipv4_is_loopback(s) ||</div><div class='ctx'> 						ipv4_is_multicast(s) ||</div><div class='hunk'>@@ -2451,10 +2614,8 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 				pkt_dev-&gt;flows[flow].flags |= F_INIT;</div><div class='ctx'> 				pkt_dev-&gt;flows[flow].cur_daddr =</div><div class='ctx'> 				    pkt_dev-&gt;cur_daddr;</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='ctx'> 				if (pkt_dev-&gt;flags &amp; F_IPSEC)</div><div class='ctx'> 					get_ipsec_sa(pkt_dev, flow);</div><div class='del'>-#endif</div><div class='ctx'> 				pkt_dev-&gt;nflows++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2467,7 +2628,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 				pkt_dev-&gt;cur_in6_daddr.s6_addr32[i] =</div><div class='del'>-				    (((__force __be32)prandom_u32() |</div><div class='add'>+				    (((__force __be32)get_random_u32() |</div><div class='ctx'> 				      pkt_dev-&gt;min_in6_daddr.s6_addr32[i]) &amp;</div><div class='ctx'> 				     pkt_dev-&gt;max_in6_daddr.s6_addr32[i]);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2476,16 +2637,24 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;min_pkt_size &lt; pkt_dev-&gt;max_pkt_size) {</div><div class='ctx'> 		__u32 t;</div><div class='add'>+</div><div class='ctx'> 		if (pkt_dev-&gt;flags &amp; F_TXSIZE_RND) {</div><div class='del'>-			t = prandom_u32() %</div><div class='del'>-				(pkt_dev-&gt;max_pkt_size - pkt_dev-&gt;min_pkt_size)</div><div class='del'>-				+ pkt_dev-&gt;min_pkt_size;</div><div class='add'>+			t = get_random_u32_inclusive(pkt_dev-&gt;min_pkt_size,</div><div class='add'>+						     pkt_dev-&gt;max_pkt_size - 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			t = pkt_dev-&gt;cur_pkt_size + 1;</div><div class='ctx'> 			if (t &gt; pkt_dev-&gt;max_pkt_size)</div><div class='ctx'> 				t = pkt_dev-&gt;min_pkt_size;</div><div class='ctx'> 		}</div><div class='ctx'> 		pkt_dev-&gt;cur_pkt_size = t;</div><div class='add'>+	} else if (pkt_dev-&gt;n_imix_entries &gt; 0) {</div><div class='add'>+		struct imix_pkt *entry;</div><div class='add'>+		__u32 t = get_random_u32_below(IMIX_PRECISION);</div><div class='add'>+		__u8 entry_index = pkt_dev-&gt;imix_distribution[t];</div><div class='add'>+</div><div class='add'>+		entry = &amp;pkt_dev-&gt;imix_entries[entry_index];</div><div class='add'>+		entry-&gt;count_so_far++;</div><div class='add'>+		pkt_dev-&gt;cur_pkt_size = entry-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_cur_queue_map(pkt_dev);</div><div class='hunk'>@@ -2493,6 +2662,32 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 	pkt_dev-&gt;flows[flow].count++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fill_imix_distribution(struct pktgen_dev *pkt_dev)</div><div class='add'>+{</div><div class='add'>+	int cumulative_probabilites[MAX_IMIX_ENTRIES];</div><div class='add'>+	int j = 0;</div><div class='add'>+	__u64 cumulative_prob = 0;</div><div class='add'>+	__u64 total_weight = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pkt_dev-&gt;n_imix_entries; i++)</div><div class='add'>+		total_weight += pkt_dev-&gt;imix_entries[i].weight;</div><div class='add'>+</div><div class='add'>+	/* Fill cumulative_probabilites with sum of normalized probabilities */</div><div class='add'>+	for (i = 0; i &lt; pkt_dev-&gt;n_imix_entries - 1; i++) {</div><div class='add'>+		cumulative_prob += div64_u64(pkt_dev-&gt;imix_entries[i].weight *</div><div class='add'>+						     IMIX_PRECISION,</div><div class='add'>+					     total_weight);</div><div class='add'>+		cumulative_probabilites[i] = cumulative_prob;</div><div class='add'>+	}</div><div class='add'>+	cumulative_probabilites[pkt_dev-&gt;n_imix_entries - 1] = 100;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IMIX_PRECISION; i++) {</div><div class='add'>+		if (i == cumulative_probabilites[j])</div><div class='add'>+			j++;</div><div class='add'>+		pkt_dev-&gt;imix_distribution[i] = j;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> static u32 pktgen_dst_metrics[RTAX_MAX + 1] = {</div><div class='hunk'>@@ -2509,7 +2704,8 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)</div><div class='ctx'> 	if (!x)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* XXX: we dont support tunnel mode for now until</div><div class='del'>-	 * we resolve the dst issue */</div><div class='add'>+	 * we resolve the dst issue</div><div class='add'>+	 */</div><div class='ctx'> 	if ((x-&gt;props.mode != XFRM_MODE_TRANSPORT) &amp;&amp; (pkt_dev-&gt;spi == 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2520,7 +2716,7 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)</div><div class='ctx'> 		skb-&gt;_skb_refdst = (unsigned long)&amp;pkt_dev-&gt;xdst.u.dst | SKB_DST_NOREF;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	err = x-&gt;outer_mode-&gt;output(x, skb);</div><div class='add'>+	err = pktgen_xfrm_outer_mode_output(x, skb);</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEMODEERROR);</div><div class='hunk'>@@ -2544,8 +2740,10 @@ static void free_SAs(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 	if (pkt_dev-&gt;cflows) {</div><div class='ctx'> 		/* let go of the SAs if we have them */</div><div class='ctx'> 		int i;</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; pkt_dev-&gt;cflows; i++) {</div><div class='ctx'> 			struct xfrm_state *x = pkt_dev-&gt;flows[i].x;</div><div class='add'>+</div><div class='ctx'> 			if (x) {</div><div class='ctx'> 				xfrm_state_put(x);</div><div class='ctx'> 				pkt_dev-&gt;flows[i].x = NULL;</div><div class='hunk'>@@ -2560,6 +2758,7 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,</div><div class='ctx'> 	if (pkt_dev-&gt;flags &amp; F_IPSEC) {</div><div class='ctx'> 		struct xfrm_state *x = pkt_dev-&gt;flows[pkt_dev-&gt;curfl].x;</div><div class='ctx'> 		int nhead = 0;</div><div class='add'>+</div><div class='ctx'> 		if (x) {</div><div class='ctx'> 			struct ethhdr *eth;</div><div class='ctx'> 			struct iphdr *iph;</div><div class='hunk'>@@ -2603,6 +2802,7 @@ err:</div><div class='ctx'> static void mpls_push(__be32 *mpls, struct pktgen_dev *pkt_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; pkt_dev-&gt;nr_labels; i++)</div><div class='ctx'> 		*mpls++ = pkt_dev-&gt;labels[i] &amp; ~MPLS_STACK_BOTTOM;</div><div class='ctx'> </div><div class='hunk'>@@ -2642,8 +2842,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		i = 0;</div><div class='del'>-		frag_len = (datalen/frags) &lt; PAGE_SIZE ?</div><div class='del'>-			   (datalen/frags) : PAGE_SIZE;</div><div class='add'>+		frag_len = min_t(int, datalen / frags, PAGE_SIZE);</div><div class='ctx'> 		while (datalen &gt; 0) {</div><div class='ctx'> 			if (unlikely(!pkt_dev-&gt;page)) {</div><div class='ctx'> 				int node = numa_node_id();</div><div class='hunk'>@@ -2655,14 +2854,16 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 			get_page(pkt_dev-&gt;page);</div><div class='del'>-			skb_frag_set_page(skb, i, pkt_dev-&gt;page);</div><div class='del'>-			skb_shinfo(skb)-&gt;frags[i].page_offset = 0;</div><div class='add'>+</div><div class='ctx'> 			/*last fragment, fill rest of data*/</div><div class='ctx'> 			if (i == (frags - 1))</div><div class='del'>-				skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[i],</div><div class='del'>-				    (datalen &lt; PAGE_SIZE ? datalen : PAGE_SIZE));</div><div class='add'>+				skb_frag_fill_page_desc(&amp;skb_shinfo(skb)-&gt;frags[i],</div><div class='add'>+							pkt_dev-&gt;page, 0,</div><div class='add'>+							min(datalen, PAGE_SIZE));</div><div class='ctx'> 			else</div><div class='del'>-				skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[i], frag_len);</div><div class='add'>+				skb_frag_fill_page_desc(&amp;skb_shinfo(skb)-&gt;frags[i],</div><div class='add'>+							pkt_dev-&gt;page, 0, frag_len);</div><div class='add'>+</div><div class='ctx'> 			datalen -= skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='ctx'> 			skb-&gt;len += skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='ctx'> 			skb-&gt;data_len += skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='hunk'>@@ -2712,7 +2913,7 @@ static struct sk_buff *pktgen_alloc_skb(struct net_device *dev,</div><div class='ctx'> 			skb-&gt;dev = dev;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		 skb = __netdev_alloc_skb(dev, size, GFP_NOWAIT);</div><div class='add'>+		skb = __netdev_alloc_skb(dev, size, GFP_NOWAIT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* the caller pre-fetches from skb-&gt;data and reserves for the mac hdr */</div><div class='hunk'>@@ -2793,7 +2994,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,</div><div class='ctx'> 	skb-&gt;priority = pkt_dev-&gt;skb_priority;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(eth, pkt_dev-&gt;hh, 12);</div><div class='del'>-	*(__be16 *) &amp; eth[12] = protocol;</div><div class='add'>+	*(__be16 *)&amp;eth[12] = protocol;</div><div class='ctx'> </div><div class='ctx'> 	/* Eth + IPh + UDPh + mpls */</div><div class='ctx'> 	datalen = pkt_dev-&gt;cur_pkt_size - 14 - 20 - 8 -</div><div class='hunk'>@@ -3022,31 +3223,36 @@ static void pktgen_run(struct pktgen_thread *t)</div><div class='ctx'> </div><div class='ctx'> 			set_pkt_overhead(pkt_dev);</div><div class='ctx'> </div><div class='del'>-			strcpy(pkt_dev-&gt;result, "Starting");</div><div class='add'>+			strscpy(pkt_dev-&gt;result, "Starting");</div><div class='ctx'> 			pkt_dev-&gt;running = 1;	/* Cranke yeself! */</div><div class='ctx'> 			started++;</div><div class='ctx'> 		} else</div><div class='del'>-			strcpy(pkt_dev-&gt;result, "Error starting");</div><div class='add'>+			strscpy(pkt_dev-&gt;result, "Error starting");</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (started)</div><div class='ctx'> 		t-&gt;control &amp;= ~(T_STOP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pktgen_stop_all_threads_ifs(struct pktgen_net *pn)</div><div class='add'>+static void pktgen_handle_all_threads(struct pktgen_net *pn, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pktgen_thread *t;</div><div class='ctx'> </div><div class='del'>-	func_enter();</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;pktgen_thread_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(t, &amp;pn-&gt;pktgen_threads, th_list)</div><div class='del'>-		t-&gt;control |= T_STOP;</div><div class='add'>+		t-&gt;control |= (flags);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;pktgen_thread_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pktgen_stop_all_threads(struct pktgen_net *pn)</div><div class='add'>+{</div><div class='add'>+	func_enter();</div><div class='add'>+</div><div class='add'>+	pktgen_handle_all_threads(pn, T_STOP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int thread_is_running(const struct pktgen_thread *t)</div><div class='ctx'> {</div><div class='ctx'> 	const struct pktgen_dev *pkt_dev;</div><div class='hunk'>@@ -3065,7 +3271,13 @@ static int pktgen_wait_thread_run(struct pktgen_thread *t)</div><div class='ctx'> {</div><div class='ctx'> 	while (thread_is_running(t)) {</div><div class='ctx'> </div><div class='add'>+		/* note: 't' will still be around even after the unlock/lock</div><div class='add'>+		 * cycle because pktgen_thread threads are only cleared at</div><div class='add'>+		 * net exit</div><div class='add'>+		 */</div><div class='add'>+		mutex_unlock(&amp;pktgen_thread_lock);</div><div class='ctx'> 		msleep_interruptible(100);</div><div class='add'>+		mutex_lock(&amp;pktgen_thread_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			goto signal;</div><div class='hunk'>@@ -3080,6 +3292,10 @@ static int pktgen_wait_all_threads_run(struct pktgen_net *pn)</div><div class='ctx'> 	struct pktgen_thread *t;</div><div class='ctx'> 	int sig = 1;</div><div class='ctx'> </div><div class='add'>+	/* prevent from racing with rmmod */</div><div class='add'>+	if (!try_module_get(THIS_MODULE))</div><div class='add'>+		return sig;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;pktgen_thread_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(t, &amp;pn-&gt;pktgen_threads, th_list) {</div><div class='hunk'>@@ -3093,21 +3309,15 @@ static int pktgen_wait_all_threads_run(struct pktgen_net *pn)</div><div class='ctx'> 			t-&gt;control |= (T_STOP);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;pktgen_thread_lock);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='ctx'> 	return sig;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pktgen_run_all_threads(struct pktgen_net *pn)</div><div class='ctx'> {</div><div class='del'>-	struct pktgen_thread *t;</div><div class='del'>-</div><div class='ctx'> 	func_enter();</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pktgen_thread_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(t, &amp;pn-&gt;pktgen_threads, th_list)</div><div class='del'>-		t-&gt;control |= (T_RUN);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;pktgen_thread_lock);</div><div class='add'>+	pktgen_handle_all_threads(pn, T_RUN);</div><div class='ctx'> </div><div class='ctx'> 	/* Propagate thread-&gt;control  */</div><div class='ctx'> 	schedule_timeout_interruptible(msecs_to_jiffies(125));</div><div class='hunk'>@@ -3117,16 +3327,9 @@ static void pktgen_run_all_threads(struct pktgen_net *pn)</div><div class='ctx'> </div><div class='ctx'> static void pktgen_reset_all_threads(struct pktgen_net *pn)</div><div class='ctx'> {</div><div class='del'>-	struct pktgen_thread *t;</div><div class='del'>-</div><div class='ctx'> 	func_enter();</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pktgen_thread_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(t, &amp;pn-&gt;pktgen_threads, th_list)</div><div class='del'>-		t-&gt;control |= (T_REMDEVALL);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;pktgen_thread_lock);</div><div class='add'>+	pktgen_handle_all_threads(pn, T_REMDEVALL);</div><div class='ctx'> </div><div class='ctx'> 	/* Propagate thread-&gt;control  */</div><div class='ctx'> 	schedule_timeout_interruptible(msecs_to_jiffies(125));</div><div class='hunk'>@@ -3152,7 +3355,19 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags)</div><div class='ctx'> 	pps = div64_u64(pkt_dev-&gt;sofar * NSEC_PER_SEC,</div><div class='ctx'> 			ktime_to_ns(elapsed));</div><div class='ctx'> </div><div class='del'>-	bps = pps * 8 * pkt_dev-&gt;cur_pkt_size;</div><div class='add'>+	if (pkt_dev-&gt;n_imix_entries &gt; 0) {</div><div class='add'>+		int i;</div><div class='add'>+		struct imix_pkt *entry;</div><div class='add'>+</div><div class='add'>+		bps = 0;</div><div class='add'>+		for (i = 0; i &lt; pkt_dev-&gt;n_imix_entries; i++) {</div><div class='add'>+			entry = &amp;pkt_dev-&gt;imix_entries[i];</div><div class='add'>+			bps += entry-&gt;size * entry-&gt;count_so_far;</div><div class='add'>+		}</div><div class='add'>+		bps = div64_u64(bps * 8 * NSEC_PER_SEC, ktime_to_ns(elapsed));</div><div class='add'>+	} else {</div><div class='add'>+		bps = pps * 8 * pkt_dev-&gt;cur_pkt_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mbps = bps;</div><div class='ctx'> 	do_div(mbps, 1000000);</div><div class='hunk'>@@ -3271,6 +3486,7 @@ static void pktgen_rem_thread(struct pktgen_thread *t)</div><div class='ctx'> static void pktgen_resched(struct pktgen_dev *pkt_dev)</div><div class='ctx'> {</div><div class='ctx'> 	ktime_t idle_start = ktime_get();</div><div class='add'>+</div><div class='ctx'> 	schedule();</div><div class='ctx'> 	pkt_dev-&gt;idle_acc += ktime_to_ns(ktime_sub(ktime_get(), idle_start));</div><div class='ctx'> }</div><div class='hunk'>@@ -3293,12 +3509,24 @@ static void pktgen_wait_for_skb(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int burst = READ_ONCE(pkt_dev-&gt;burst);</div><div class='add'>+	bool skb_shared = !!(READ_ONCE(pkt_dev-&gt;flags) &amp; F_SHARED);</div><div class='ctx'> 	struct net_device *odev = pkt_dev-&gt;odev;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='add'>+	unsigned int burst = 1;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int clone_skb = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* If 'skb_shared' is false, the read of possible</div><div class='add'>+	 * new values (if any) for 'burst' and 'clone_skb' will be skipped to</div><div class='add'>+	 * prevent some concurrent changes from slipping in. And the stabilized</div><div class='add'>+	 * config will be read in during the next run of pktgen_xmit.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_shared) {</div><div class='add'>+		burst = READ_ONCE(pkt_dev-&gt;burst);</div><div class='add'>+		clone_skb = READ_ONCE(pkt_dev-&gt;clone_skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If device is offline, then don't send */</div><div class='ctx'> 	if (unlikely(!netif_running(odev) || !netif_carrier_ok(odev))) {</div><div class='ctx'> 		pktgen_stop_device(pkt_dev);</div><div class='hunk'>@@ -3315,7 +3543,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* If no skb or clone count exhausted then get new one */</div><div class='ctx'> 	if (!pkt_dev-&gt;skb || (pkt_dev-&gt;last_ok &amp;&amp;</div><div class='del'>-			      ++pkt_dev-&gt;clone_count &gt;= pkt_dev-&gt;clone_skb)) {</div><div class='add'>+			      ++pkt_dev-&gt;clone_count &gt;= clone_skb)) {</div><div class='ctx'> 		/* build a new pkt */</div><div class='ctx'> 		kfree_skb(pkt_dev-&gt;skb);</div><div class='ctx'> </div><div class='hunk'>@@ -3336,7 +3564,8 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 	if (pkt_dev-&gt;xmit_mode == M_NETIF_RECEIVE) {</div><div class='ctx'> 		skb = pkt_dev-&gt;skb;</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='del'>-		refcount_add(burst, &amp;skb-&gt;users);</div><div class='add'>+		if (skb_shared)</div><div class='add'>+			refcount_add(burst, &amp;skb-&gt;users);</div><div class='ctx'> 		local_bh_disable();</div><div class='ctx'> 		do {</div><div class='ctx'> 			ret = netif_receive_skb(skb);</div><div class='hunk'>@@ -3344,6 +3573,10 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 				pkt_dev-&gt;errors++;</div><div class='ctx'> 			pkt_dev-&gt;sofar++;</div><div class='ctx'> 			pkt_dev-&gt;seq_num++;</div><div class='add'>+			if (unlikely(!skb_shared)) {</div><div class='add'>+				pkt_dev-&gt;skb = NULL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			if (refcount_read(&amp;skb-&gt;users) != burst) {</div><div class='ctx'> 				/* skb was queued by rps/rfs or taps,</div><div class='ctx'> 				 * so cannot reuse this skb</div><div class='hunk'>@@ -3357,14 +3590,19 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 			/* skb was 'freed' by stack, so clean few</div><div class='ctx'> 			 * bits and reuse it</div><div class='ctx'> 			 */</div><div class='del'>-			skb_reset_tc(skb);</div><div class='add'>+			skb_reset_redirect(skb);</div><div class='ctx'> 		} while (--burst &gt; 0);</div><div class='ctx'> 		goto out; /* Skips xmit_mode M_START_XMIT */</div><div class='ctx'> 	} else if (pkt_dev-&gt;xmit_mode == M_QUEUE_XMIT) {</div><div class='ctx'> 		local_bh_disable();</div><div class='del'>-		refcount_inc(&amp;pkt_dev-&gt;skb-&gt;users);</div><div class='add'>+		if (skb_shared)</div><div class='add'>+			refcount_inc(&amp;pkt_dev-&gt;skb-&gt;users);</div><div class='ctx'> </div><div class='ctx'> 		ret = dev_queue_xmit(pkt_dev-&gt;skb);</div><div class='add'>+</div><div class='add'>+		if (!skb_shared &amp;&amp; dev_xmit_complete(ret))</div><div class='add'>+			pkt_dev-&gt;skb = NULL;</div><div class='add'>+</div><div class='ctx'> 		switch (ret) {</div><div class='ctx'> 		case NET_XMIT_SUCCESS:</div><div class='ctx'> 			pkt_dev-&gt;sofar++;</div><div class='hunk'>@@ -3399,15 +3637,18 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)</div><div class='ctx'> 	HARD_TX_LOCK(odev, txq, smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(netif_xmit_frozen_or_drv_stopped(txq))) {</div><div class='del'>-		ret = NETDEV_TX_BUSY;</div><div class='ctx'> 		pkt_dev-&gt;last_ok = 0;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-	refcount_add(burst, &amp;pkt_dev-&gt;skb-&gt;users);</div><div class='add'>+	if (skb_shared)</div><div class='add'>+		refcount_add(burst, &amp;pkt_dev-&gt;skb-&gt;users);</div><div class='ctx'> </div><div class='ctx'> xmit_more:</div><div class='ctx'> 	ret = netdev_start_xmit(pkt_dev-&gt;skb, odev, txq, --burst &gt; 0);</div><div class='ctx'> </div><div class='add'>+	if (!skb_shared &amp;&amp; dev_xmit_complete(ret))</div><div class='add'>+		pkt_dev-&gt;skb = NULL;</div><div class='add'>+</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	case NETDEV_TX_OK:</div><div class='ctx'> 		pkt_dev-&gt;last_ok = 1;</div><div class='hunk'>@@ -3426,10 +3667,11 @@ xmit_more:</div><div class='ctx'> 		net_info_ratelimited("%s xmit error: %d\n",</div><div class='ctx'> 				     pkt_dev-&gt;odevname, ret);</div><div class='ctx'> 		pkt_dev-&gt;errors++;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_TX_BUSY:</div><div class='ctx'> 		/* Retry it next time */</div><div class='del'>-		refcount_dec(&amp;(pkt_dev-&gt;skb-&gt;users));</div><div class='add'>+		if (skb_shared)</div><div class='add'>+			refcount_dec(&amp;pkt_dev-&gt;skb-&gt;users);</div><div class='ctx'> 		pkt_dev-&gt;last_ok = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(burst))</div><div class='hunk'>@@ -3442,7 +3684,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	/* If pkt_dev-&gt;count is zero, then run forever */</div><div class='ctx'> 	if ((pkt_dev-&gt;count != 0) &amp;&amp; (pkt_dev-&gt;sofar &gt;= pkt_dev-&gt;count)) {</div><div class='del'>-		pktgen_wait_for_skb(pkt_dev);</div><div class='add'>+		if (pkt_dev-&gt;skb)</div><div class='add'>+			pktgen_wait_for_skb(pkt_dev);</div><div class='ctx'> </div><div class='ctx'> 		/* Done with this */</div><div class='ctx'> 		pktgen_stop_device(pkt_dev);</div><div class='hunk'>@@ -3455,12 +3698,11 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int pktgen_thread_worker(void *arg)</div><div class='ctx'> {</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='ctx'> 	struct pktgen_thread *t = arg;</div><div class='ctx'> 	struct pktgen_dev *pkt_dev = NULL;</div><div class='ctx'> 	int cpu = t-&gt;cpu;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(smp_processor_id() != cpu);</div><div class='add'>+	WARN_ON_ONCE(smp_processor_id() != cpu);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;t-&gt;queue);</div><div class='ctx'> 	complete(&amp;t-&gt;start_done);</div><div class='hunk'>@@ -3475,10 +3717,8 @@ static int pktgen_thread_worker(void *arg)</div><div class='ctx'> 		if (unlikely(!pkt_dev &amp;&amp; t-&gt;control == 0)) {</div><div class='ctx'> 			if (t-&gt;net-&gt;pktgen_exiting)</div><div class='ctx'> 				break;</div><div class='del'>-			wait_event_interruptible_timeout(t-&gt;queue,</div><div class='del'>-							 t-&gt;control != 0,</div><div class='del'>-							 HZ/10);</div><div class='del'>-			try_to_freeze();</div><div class='add'>+			wait_event_freezable_timeout(t-&gt;queue,</div><div class='add'>+						     t-&gt;control != 0, HZ / 10);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3562,7 +3802,8 @@ static int add_dev_to_thread(struct pktgen_thread *t,</div><div class='ctx'> 	 * userspace on another CPU than the kthread.  The if_lock()</div><div class='ctx'> 	 * is used here to sync with concurrent instances of</div><div class='ctx'> 	 * _rem_dev_from_if_list() invoked via kthread, which is also</div><div class='del'>-	 * updating the if_list */</div><div class='add'>+	 * updating the if_list</div><div class='add'>+	 */</div><div class='ctx'> 	if_lock(t);</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;pg_thread) {</div><div class='hunk'>@@ -3600,7 +3841,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)</div><div class='ctx'> 	if (!pkt_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	strcpy(pkt_dev-&gt;odevname, ifname);</div><div class='add'>+	strscpy(pkt_dev-&gt;odevname, ifname);</div><div class='ctx'> 	pkt_dev-&gt;flows = vzalloc_node(array_size(MAX_CFLOWS,</div><div class='ctx'> 						 sizeof(struct flow_state)),</div><div class='ctx'> 				      node);</div><div class='hunk'>@@ -3625,7 +3866,8 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)</div><div class='ctx'> 	pkt_dev-&gt;svlan_cfi = 0;</div><div class='ctx'> 	pkt_dev-&gt;svlan_id = 0xffff;</div><div class='ctx'> 	pkt_dev-&gt;burst = 1;</div><div class='del'>-	pkt_dev-&gt;node = -1;</div><div class='add'>+	pkt_dev-&gt;node = NUMA_NO_NODE;</div><div class='add'>+	pkt_dev-&gt;flags = F_SHARED;	/* SKB shared by default */</div><div class='ctx'> </div><div class='ctx'> 	err = pktgen_setup_dev(t-&gt;net, pkt_dev, ifname);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3634,7 +3876,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)</div><div class='ctx'> 		pkt_dev-&gt;clone_skb = pg_clone_skb_d;</div><div class='ctx'> </div><div class='ctx'> 	pkt_dev-&gt;entry = proc_create_data(ifname, 0600, t-&gt;net-&gt;proc_dir,</div><div class='del'>-					  &amp;pktgen_if_fops, pkt_dev);</div><div class='add'>+					  &amp;pktgen_if_proc_ops, pkt_dev);</div><div class='ctx'> 	if (!pkt_dev-&gt;entry) {</div><div class='ctx'> 		pr_err("cannot create %s/%s procfs entry\n",</div><div class='ctx'> 		       PG_PROC_DIR, ifname);</div><div class='hunk'>@@ -3645,8 +3887,8 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)</div><div class='ctx'> 	pkt_dev-&gt;ipsmode = XFRM_MODE_TRANSPORT;</div><div class='ctx'> 	pkt_dev-&gt;ipsproto = IPPROTO_ESP;</div><div class='ctx'> </div><div class='del'>-	/* xfrm tunnel mode needs additional dst to extract outter</div><div class='del'>-	 * ip header protocol/ttl/id field, here creat a phony one.</div><div class='add'>+	/* xfrm tunnel mode needs additional dst to extract outer</div><div class='add'>+	 * ip header protocol/ttl/id field, here create a phony one.</div><div class='ctx'> 	 * instead of looking for a valid rt, which definitely hurting</div><div class='ctx'> 	 * performance under such circumstance.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3659,7 +3901,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)</div><div class='ctx'> </div><div class='ctx'> 	return add_dev_to_thread(t, pkt_dev);</div><div class='ctx'> out2:</div><div class='del'>-	dev_put(pkt_dev-&gt;odev);</div><div class='add'>+	netdev_put(pkt_dev-&gt;odev, &amp;pkt_dev-&gt;dev_tracker);</div><div class='ctx'> out1:</div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> 	free_SAs(pkt_dev);</div><div class='hunk'>@@ -3690,21 +3932,18 @@ static int __net_init pktgen_create_thread(int cpu, struct pktgen_net *pn)</div><div class='ctx'> 	list_add_tail(&amp;t-&gt;th_list, &amp;pn-&gt;pktgen_threads);</div><div class='ctx'> 	init_completion(&amp;t-&gt;start_done);</div><div class='ctx'> </div><div class='del'>-	p = kthread_create_on_node(pktgen_thread_worker,</div><div class='del'>-				   t,</div><div class='del'>-				   cpu_to_node(cpu),</div><div class='del'>-				   "kpktgend_%d", cpu);</div><div class='add'>+	p = kthread_create_on_cpu(pktgen_thread_worker, t, cpu, "kpktgend_%d");</div><div class='ctx'> 	if (IS_ERR(p)) {</div><div class='del'>-		pr_err("kernel_thread() failed for cpu %d\n", t-&gt;cpu);</div><div class='add'>+		pr_err("kthread_create_on_node() failed for cpu %d\n", t-&gt;cpu);</div><div class='ctx'> 		list_del(&amp;t-&gt;th_list);</div><div class='ctx'> 		kfree(t);</div><div class='ctx'> 		return PTR_ERR(p);</div><div class='ctx'> 	}</div><div class='del'>-	kthread_bind(p, cpu);</div><div class='add'>+</div><div class='ctx'> 	t-&gt;tsk = p;</div><div class='ctx'> </div><div class='ctx'> 	pe = proc_create_data(t-&gt;tsk-&gt;comm, 0600, pn-&gt;proc_dir,</div><div class='del'>-			      &amp;pktgen_thread_fops, t);</div><div class='add'>+			      &amp;pktgen_thread_proc_ops, t);</div><div class='ctx'> 	if (!pe) {</div><div class='ctx'> 		pr_err("cannot create %s/%s procfs entry\n",</div><div class='ctx'> 		       PG_PROC_DIR, t-&gt;tsk-&gt;comm);</div><div class='hunk'>@@ -3753,13 +3992,14 @@ static int pktgen_remove_device(struct pktgen_thread *t,</div><div class='ctx'> 	/* Dis-associate from the interface */</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_dev-&gt;odev) {</div><div class='del'>-		dev_put(pkt_dev-&gt;odev);</div><div class='add'>+		netdev_put(pkt_dev-&gt;odev, &amp;pkt_dev-&gt;dev_tracker);</div><div class='ctx'> 		pkt_dev-&gt;odev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Remove proc before if_list entry, because add_device uses</div><div class='ctx'> 	 * list to determine if interface already exist, avoid race</div><div class='del'>-	 * with proc_create_data() */</div><div class='add'>+	 * with proc_create_data()</div><div class='add'>+	 */</div><div class='ctx'> 	proc_remove(pkt_dev-&gt;entry);</div><div class='ctx'> </div><div class='ctx'> 	/* And update the thread if_list */</div><div class='hunk'>@@ -3789,13 +4029,14 @@ static int __net_init pg_net_init(struct net *net)</div><div class='ctx'> 		pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	pe = proc_create(PGCTRL, 0600, pn-&gt;proc_dir, &amp;pktgen_fops);</div><div class='add'>+	pe = proc_create(PGCTRL, 0600, pn-&gt;proc_dir, &amp;pktgen_proc_ops);</div><div class='ctx'> 	if (pe == NULL) {</div><div class='ctx'> 		pr_err("cannot create %s procfs entry\n", PGCTRL);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='hunk'>@@ -3804,6 +4045,7 @@ static int __net_init pg_net_init(struct net *net)</div><div class='ctx'> 			pr_warn("Cannot create thread for cpu %d (%d)\n",</div><div class='ctx'> 				   cpu, err);</div><div class='ctx'> 	}</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;pn-&gt;pktgen_threads)) {</div><div class='ctx'> 		pr_err("Initialization failed for all threads\n");</div><div class='hunk'>@@ -3837,8 +4079,7 @@ static void __net_exit pg_net_exit(struct net *net)</div><div class='ctx'> 	list_for_each_safe(q, n, &amp;list) {</div><div class='ctx'> 		t = list_entry(q, struct pktgen_thread, th_list);</div><div class='ctx'> 		list_del(&amp;t-&gt;th_list);</div><div class='del'>-		kthread_stop(t-&gt;tsk);</div><div class='del'>-		put_task_struct(t-&gt;tsk);</div><div class='add'>+		kthread_stop_put(t-&gt;tsk);</div><div class='ctx'> 		kfree(t);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/ptp_classifier.c b/net/core/ptp_classifier.c<br/>index 703cf76aa7c2..598041b0499e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/ptp_classifier.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/ptp_classifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/ptp_classifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/ptp_classifier.c</a></div><div class='hunk'>@@ -1,13 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* PTP classifier</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* The below program is the bpf_asm (tools/net/) representation of</div><div class='hunk'>@@ -111,10 +103,52 @@ static struct bpf_prog *ptp_insns __read_mostly;</div><div class='ctx'> </div><div class='ctx'> unsigned int ptp_classify_raw(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return BPF_PROG_RUN(ptp_insns, skb);</div><div class='add'>+	return bpf_prog_run(ptp_insns, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ptp_classify_raw);</div><div class='ctx'> </div><div class='add'>+struct ptp_header *ptp_parse_header(struct sk_buff *skb, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = skb_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	if (type &amp; PTP_CLASS_VLAN)</div><div class='add'>+		ptr += VLAN_HLEN;</div><div class='add'>+</div><div class='add'>+	switch (type &amp; PTP_CLASS_PMASK) {</div><div class='add'>+	case PTP_CLASS_IPV4:</div><div class='add'>+		ptr += IPV4_HLEN(ptr) + UDP_HLEN;</div><div class='add'>+		break;</div><div class='add'>+	case PTP_CLASS_IPV6:</div><div class='add'>+		ptr += IP6_HLEN + UDP_HLEN;</div><div class='add'>+		break;</div><div class='add'>+	case PTP_CLASS_L2:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	/* Ensure that the entire header is present in this packet. */</div><div class='add'>+	if (ptr + sizeof(struct ptp_header) &gt; skb-&gt;data + skb-&gt;len)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return (struct ptp_header *)ptr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ptp_parse_header);</div><div class='add'>+</div><div class='add'>+bool ptp_msg_is_sync(struct sk_buff *skb, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = ptp_parse_header(skb, type);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return ptp_get_msgtype(hdr, type) == PTP_MSGTYPE_SYNC;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ptp_msg_is_sync);</div><div class='add'>+</div><div class='ctx'> void __init ptp_classifier_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	static struct sock_filter ptp_filter[] __initdata = {</div><div class='hunk'>@@ -185,9 +219,10 @@ void __init ptp_classifier_init(void)</div><div class='ctx'> 		{ 0x16,  0,  0, 0x00000000 },</div><div class='ctx'> 		{ 0x06,  0,  0, 0x00000000 },</div><div class='ctx'> 	};</div><div class='del'>-	struct sock_fprog_kern ptp_prog = {</div><div class='del'>-		.len = ARRAY_SIZE(ptp_filter), .filter = ptp_filter,</div><div class='del'>-	};</div><div class='add'>+	struct sock_fprog_kern ptp_prog;</div><div class='add'>+</div><div class='add'>+	ptp_prog.len = ARRAY_SIZE(ptp_filter);</div><div class='add'>+	ptp_prog.filter = ptp_filter;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(bpf_prog_create(&amp;ptp_insns, &amp;ptp_prog));</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/request_sock.c b/net/core/request_sock.c<br/>index 9b8727c67b58..897a8f01a67b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/request_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/request_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/request_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/request_sock.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * NET		Generic infrastructure for Network protocols.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * 		From code originally in include/net/tcp.h</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -37,9 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> void reqsk_queue_alloc(struct request_sock_queue *queue)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_init(&amp;queue-&gt;rskq_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;queue-&gt;fastopenq.lock);</div><div class='ctx'> 	queue-&gt;fastopenq.rskq_rst_head = NULL;</div><div class='ctx'> 	queue-&gt;fastopenq.rskq_rst_tail = NULL;</div><div class='ctx'> 	queue-&gt;fastopenq.qlen = 0;</div><div class='hunk'>@@ -84,9 +77,7 @@ void reqsk_queue_alloc(struct request_sock_queue *queue)</div><div class='ctx'>  * a simple spin lock - one must consider sock_owned_by_user() and arrange</div><div class='ctx'>  * to use sk_add_backlog() stuff. But what really makes it infeasible is the</div><div class='ctx'>  * locking hierarchy violation. E.g., inet_csk_listen_stop() may try to</div><div class='del'>- * acquire a child's lock while holding listener's socket lock. A corner</div><div class='del'>- * case might also exist in tcp_v4_hnd_req() that will trigger this locking</div><div class='del'>- * order.</div><div class='add'>+ * acquire a child's lock while holding listener's socket lock.</div><div class='ctx'>  *</div><div class='ctx'>  * This function also sets "treq-&gt;tfo_listener" to false.</div><div class='ctx'>  * treq-&gt;tfo_listener is used by the listener so it is protected by the</div><div class='hunk'>@@ -100,7 +91,7 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,</div><div class='ctx'> </div><div class='ctx'> 	fastopenq = &amp;inet_csk(lsk)-&gt;icsk_accept_queue.fastopenq;</div><div class='ctx'> </div><div class='del'>-	tcp_sk(sk)-&gt;fastopen_rsk = NULL;</div><div class='add'>+	RCU_INIT_POINTER(tcp_sk(sk)-&gt;fastopen_rsk, NULL);</div><div class='ctx'> 	spin_lock_bh(&amp;fastopenq-&gt;lock);</div><div class='ctx'> 	fastopenq-&gt;qlen--;</div><div class='ctx'> 	tcp_rsk(req)-&gt;tfo_listener = false;</div><div class='head'>diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c<br/>index 37c7936124e6..b1ed55141d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/rtnetlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/rtnetlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/rtnetlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/rtnetlink.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -7,13 +8,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Fixes:</div><div class='del'>- *	Vitaly E. Lavrov		RTA_OK arithmetics was wrong.</div><div class='add'>+ *	Vitaly E. Lavrov		RTA_OK arithmetic was wrong.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -46,7 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/switchdev.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='hunk'>@@ -58,9 +53,17 @@</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;linux/dpll.h&gt;</div><div class='ctx'> </div><div class='del'>-#define RTNL_MAX_TYPE		48</div><div class='del'>-#define RTNL_SLAVE_MAX_TYPE	36</div><div class='add'>+#include "dev.h"</div><div class='add'>+</div><div class='add'>+#define RTNL_MAX_TYPE		50</div><div class='add'>+#define RTNL_SLAVE_MAX_TYPE	44</div><div class='ctx'> </div><div class='ctx'> struct rtnl_link {</div><div class='ctx'> 	rtnl_doit_func		doit;</div><div class='hunk'>@@ -78,11 +81,15 @@ void rtnl_lock(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_lock);</div><div class='ctx'> </div><div class='add'>+int rtnl_lock_interruptible(void)</div><div class='add'>+{</div><div class='add'>+	return mutex_lock_interruptible(&amp;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int rtnl_lock_killable(void)</div><div class='ctx'> {</div><div class='ctx'> 	return mutex_lock_killable(&amp;rtnl_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rtnl_lock_killable);</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *defer_kfree_skb_list;</div><div class='ctx'> void rtnl_kfree_skbs(struct sk_buff *head, struct sk_buff *tail)</div><div class='hunk'>@@ -100,6 +107,39 @@ void __rtnl_unlock(void)</div><div class='ctx'> </div><div class='ctx'> 	defer_kfree_skb_list = NULL;</div><div class='ctx'> </div><div class='add'>+	/* Ensure that we didn't actually add any TODO item when __rtnl_unlock()</div><div class='add'>+	 * is used. In some places, e.g. in cfg80211, we have code that will do</div><div class='add'>+	 * something like</div><div class='add'>+	 *   rtnl_lock()</div><div class='add'>+	 *   wiphy_lock()</div><div class='add'>+	 *   ...</div><div class='add'>+	 *   rtnl_unlock()</div><div class='add'>+	 *</div><div class='add'>+	 * and because netdev_run_todo() acquires the RTNL for items on the list</div><div class='add'>+	 * we could cause a situation such as this:</div><div class='add'>+	 * Thread 1			Thread 2</div><div class='add'>+	 *				  rtnl_lock()</div><div class='add'>+	 *				  unregister_netdevice()</div><div class='add'>+	 *				  __rtnl_unlock()</div><div class='add'>+	 * rtnl_lock()</div><div class='add'>+	 * wiphy_lock()</div><div class='add'>+	 * rtnl_unlock()</div><div class='add'>+	 *   netdev_run_todo()</div><div class='add'>+	 *     __rtnl_unlock()</div><div class='add'>+	 *</div><div class='add'>+	 *     // list not empty now</div><div class='add'>+	 *     // because of thread 2</div><div class='add'>+	 *				  rtnl_lock()</div><div class='add'>+	 *     while (!list_empty(...))</div><div class='add'>+	 *       rtnl_lock()</div><div class='add'>+	 *				  wiphy_lock()</div><div class='add'>+	 * **** DEADLOCK ****</div><div class='add'>+	 *</div><div class='add'>+	 * However, usage of __rtnl_unlock() is rare, and so we can ensure that</div><div class='add'>+	 * it's not used in cases where something is added to do the list.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!list_empty(&amp;net_todo_list));</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;rtnl_mutex);</div><div class='ctx'> </div><div class='ctx'> 	while (head) {</div><div class='hunk'>@@ -130,6 +170,12 @@ int rtnl_is_locked(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_is_locked);</div><div class='ctx'> </div><div class='add'>+bool refcount_dec_and_rtnl_lock(refcount_t *r)</div><div class='add'>+{</div><div class='add'>+	return refcount_dec_and_mutex_lock(r, &amp;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(refcount_dec_and_rtnl_lock);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROVE_LOCKING</div><div class='ctx'> bool lockdep_rtnl_is_held(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -138,7 +184,177 @@ bool lockdep_rtnl_is_held(void)</div><div class='ctx'> EXPORT_SYMBOL(lockdep_rtnl_is_held);</div><div class='ctx'> #endif /* #ifdef CONFIG_PROVE_LOCKING */</div><div class='ctx'> </div><div class='del'>-static struct rtnl_link *__rcu *rtnl_msg_handlers[RTNL_FAMILY_MAX + 1];</div><div class='add'>+#ifdef CONFIG_DEBUG_NET_SMALL_RTNL</div><div class='add'>+void __rtnl_net_lock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;net-&gt;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__rtnl_net_lock);</div><div class='add'>+</div><div class='add'>+void __rtnl_net_unlock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;net-&gt;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__rtnl_net_unlock);</div><div class='add'>+</div><div class='add'>+void rtnl_net_lock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	__rtnl_net_lock(net);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtnl_net_lock);</div><div class='add'>+</div><div class='add'>+void rtnl_net_unlock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	__rtnl_net_unlock(net);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtnl_net_unlock);</div><div class='add'>+</div><div class='add'>+int rtnl_net_trylock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	int ret = rtnl_trylock();</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtnl_net_trylock);</div><div class='add'>+</div><div class='add'>+int rtnl_net_lock_killable(struct net *net)</div><div class='add'>+{</div><div class='add'>+	int ret = rtnl_lock_killable();</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_net_cmp_locks(const struct net *net_a, const struct net *net_b)</div><div class='add'>+{</div><div class='add'>+	if (net_eq(net_a, net_b))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* always init_net first */</div><div class='add'>+	if (net_eq(net_a, &amp;init_net))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (net_eq(net_b, &amp;init_net))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* otherwise lock in ascending order */</div><div class='add'>+	return net_a &lt; net_b ? -1 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtnl_net_lock_cmp_fn(const struct lockdep_map *a, const struct lockdep_map *b)</div><div class='add'>+{</div><div class='add'>+	const struct net *net_a, *net_b;</div><div class='add'>+</div><div class='add'>+	net_a = container_of(a, struct net, rtnl_mutex.dep_map);</div><div class='add'>+	net_b = container_of(b, struct net, rtnl_mutex.dep_map);</div><div class='add'>+</div><div class='add'>+	return rtnl_net_cmp_locks(net_a, net_b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool rtnl_net_is_locked(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return rtnl_is_locked() &amp;&amp; mutex_is_locked(&amp;net-&gt;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtnl_net_is_locked);</div><div class='add'>+</div><div class='add'>+bool lockdep_rtnl_net_is_held(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return lockdep_rtnl_is_held() &amp;&amp; lockdep_is_held(&amp;net-&gt;rtnl_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lockdep_rtnl_net_is_held);</div><div class='add'>+#else</div><div class='add'>+static int rtnl_net_cmp_locks(const struct net *net_a, const struct net *net_b)</div><div class='add'>+{</div><div class='add'>+	/* No need to swap */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct rtnl_nets {</div><div class='add'>+	/* -&gt;newlink() needs to freeze 3 netns at most;</div><div class='add'>+	 * 2 for the new device, 1 for its peer.</div><div class='add'>+	 */</div><div class='add'>+	struct net *net[3];</div><div class='add'>+	unsigned char len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtnl_nets_init(struct rtnl_nets *rtnl_nets)</div><div class='add'>+{</div><div class='add'>+	memset(rtnl_nets, 0, sizeof(*rtnl_nets));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_nets_destroy(struct rtnl_nets *rtnl_nets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rtnl_nets-&gt;len; i++) {</div><div class='add'>+		put_net(rtnl_nets-&gt;net[i]);</div><div class='add'>+		rtnl_nets-&gt;net[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_nets-&gt;len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtnl_nets_add - Add netns to be locked before -&gt;newlink().</div><div class='add'>+ *</div><div class='add'>+ * @rtnl_nets: rtnl_nets pointer passed to -&gt;get_peer_net().</div><div class='add'>+ * @net: netns pointer with an extra refcnt held.</div><div class='add'>+ *</div><div class='add'>+ * The extra refcnt is released in rtnl_nets_destroy().</div><div class='add'>+ */</div><div class='add'>+static void rtnl_nets_add(struct rtnl_nets *rtnl_nets, struct net *net)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(rtnl_nets-&gt;len == ARRAY_SIZE(rtnl_nets-&gt;net));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rtnl_nets-&gt;len; i++) {</div><div class='add'>+		switch (rtnl_net_cmp_locks(rtnl_nets-&gt;net[i], net)) {</div><div class='add'>+		case 0:</div><div class='add'>+			put_net(net);</div><div class='add'>+			return;</div><div class='add'>+		case 1:</div><div class='add'>+			swap(rtnl_nets-&gt;net[i], net);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_nets-&gt;net[i] = net;</div><div class='add'>+	rtnl_nets-&gt;len++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_nets_lock(struct rtnl_nets *rtnl_nets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rtnl_nets-&gt;len; i++)</div><div class='add'>+		__rtnl_net_lock(rtnl_nets-&gt;net[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_nets_unlock(struct rtnl_nets *rtnl_nets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rtnl_nets-&gt;len; i++)</div><div class='add'>+		__rtnl_net_unlock(rtnl_nets-&gt;net[i]);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_link __rcu *__rcu *rtnl_msg_handlers[RTNL_FAMILY_MAX + 1];</div><div class='ctx'> </div><div class='ctx'> static inline int rtm_msgindex(int msgtype)</div><div class='ctx'> {</div><div class='hunk'>@@ -156,7 +372,7 @@ static inline int rtm_msgindex(int msgtype)</div><div class='ctx'> </div><div class='ctx'> static struct rtnl_link *rtnl_get_link(int protocol, int msgtype)</div><div class='ctx'> {</div><div class='del'>-	struct rtnl_link **tab;</div><div class='add'>+	struct rtnl_link __rcu **tab;</div><div class='ctx'> </div><div class='ctx'> 	if (protocol &gt;= ARRAY_SIZE(rtnl_msg_handlers))</div><div class='ctx'> 		protocol = PF_UNSPEC;</div><div class='hunk'>@@ -165,7 +381,7 @@ static struct rtnl_link *rtnl_get_link(int protocol, int msgtype)</div><div class='ctx'> 	if (!tab)</div><div class='ctx'> 		tab = rcu_dereference_rtnl(rtnl_msg_handlers[PF_UNSPEC]);</div><div class='ctx'> </div><div class='del'>-	return tab[msgtype];</div><div class='add'>+	return rcu_dereference_rtnl(tab[msgtype]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtnl_register_internal(struct module *owner,</div><div class='hunk'>@@ -182,7 +398,7 @@ static int rtnl_register_internal(struct module *owner,</div><div class='ctx'> 	msgindex = rtm_msgindex(msgtype);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	tab = rtnl_msg_handlers[protocol];</div><div class='add'>+	tab = rtnl_dereference(rtnl_msg_handlers[protocol]);</div><div class='ctx'> 	if (tab == NULL) {</div><div class='ctx'> 		tab = kcalloc(RTM_NR_MSGTYPES, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 		if (!tab)</div><div class='hunk'>@@ -213,6 +429,8 @@ static int rtnl_register_internal(struct module *owner,</div><div class='ctx'> 	if (dumpit)</div><div class='ctx'> 		link-&gt;dumpit = dumpit;</div><div class='ctx'> </div><div class='add'>+	WARN_ON(rtnl_msgtype_kind(msgtype) != RTNL_KIND_DEL &amp;&amp;</div><div class='add'>+		(flags &amp; RTNL_FLAG_BULK_DEL_SUPPORTED));</div><div class='ctx'> 	link-&gt;flags |= flags;</div><div class='ctx'> </div><div class='ctx'> 	/* publish protocol:msgtype */</div><div class='hunk'>@@ -226,66 +444,16 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * rtnl_register_module - Register a rtnetlink message type</div><div class='del'>- *</div><div class='del'>- * @owner: module registering the hook (THIS_MODULE)</div><div class='del'>- * @protocol: Protocol family or PF_UNSPEC</div><div class='del'>- * @msgtype: rtnetlink message type</div><div class='del'>- * @doit: Function pointer called for each request message</div><div class='del'>- * @dumpit: Function pointer called for each dump request (NLM_F_DUMP) message</div><div class='del'>- * @flags: rtnl_link_flags to modifiy behaviour of doit/dumpit functions</div><div class='del'>- *</div><div class='del'>- * Like rtnl_register, but for use by removable modules.</div><div class='del'>- */</div><div class='del'>-int rtnl_register_module(struct module *owner,</div><div class='del'>-			 int protocol, int msgtype,</div><div class='del'>-			 rtnl_doit_func doit, rtnl_dumpit_func dumpit,</div><div class='del'>-			 unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return rtnl_register_internal(owner, protocol, msgtype,</div><div class='del'>-				      doit, dumpit, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtnl_register_module);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rtnl_register - Register a rtnetlink message type</div><div class='del'>- * @protocol: Protocol family or PF_UNSPEC</div><div class='del'>- * @msgtype: rtnetlink message type</div><div class='del'>- * @doit: Function pointer called for each request message</div><div class='del'>- * @dumpit: Function pointer called for each dump request (NLM_F_DUMP) message</div><div class='del'>- * @flags: rtnl_link_flags to modifiy behaviour of doit/dumpit functions</div><div class='del'>- *</div><div class='del'>- * Registers the specified function pointers (at least one of them has</div><div class='del'>- * to be non-NULL) to be called whenever a request message for the</div><div class='del'>- * specified protocol family and message type is received.</div><div class='del'>- *</div><div class='del'>- * The special protocol family PF_UNSPEC may be used to define fallback</div><div class='del'>- * function pointers for the case when no entry for the specific protocol</div><div class='del'>- * family exists.</div><div class='del'>- */</div><div class='del'>-void rtnl_register(int protocol, int msgtype,</div><div class='del'>-		   rtnl_doit_func doit, rtnl_dumpit_func dumpit,</div><div class='del'>-		   unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = rtnl_register_internal(NULL, protocol, msgtype, doit, dumpit,</div><div class='del'>-				     flags);</div><div class='del'>-	if (err)</div><div class='del'>-		pr_err("Unable to register rtnetlink message handler, "</div><div class='del'>-		       "protocol = %d, message type = %d\n", protocol, msgtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * rtnl_unregister - Unregister a rtnetlink message type</div><div class='ctx'>  * @protocol: Protocol family or PF_UNSPEC</div><div class='ctx'>  * @msgtype: rtnetlink message type</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int rtnl_unregister(int protocol, int msgtype)</div><div class='add'>+static int rtnl_unregister(int protocol, int msgtype)</div><div class='ctx'> {</div><div class='del'>-	struct rtnl_link **tab, *link;</div><div class='add'>+	struct rtnl_link __rcu **tab;</div><div class='add'>+	struct rtnl_link *link;</div><div class='ctx'> 	int msgindex;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(protocol &lt; 0 || protocol &gt; RTNL_FAMILY_MAX);</div><div class='hunk'>@@ -298,43 +466,37 @@ int rtnl_unregister(int protocol, int msgtype)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	link = tab[msgindex];</div><div class='del'>-	rcu_assign_pointer(tab[msgindex], NULL);</div><div class='add'>+	link = rcu_replace_pointer_rtnl(tab[msgindex], NULL);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(link, rcu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(rtnl_unregister);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rtnl_unregister_all - Unregister all rtnetlink message type of a protocol</div><div class='ctx'>  * @protocol : Protocol family or PF_UNSPEC</div><div class='ctx'>  *</div><div class='del'>- * Identical to calling rtnl_unregster() for all registered message types</div><div class='add'>+ * Identical to calling rtnl_unregister() for all registered message types</div><div class='ctx'>  * of a certain protocol family.</div><div class='ctx'>  */</div><div class='ctx'> void rtnl_unregister_all(int protocol)</div><div class='ctx'> {</div><div class='del'>-	struct rtnl_link **tab, *link;</div><div class='add'>+	struct rtnl_link __rcu **tab;</div><div class='add'>+	struct rtnl_link *link;</div><div class='ctx'> 	int msgindex;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(protocol &lt; 0 || protocol &gt; RTNL_FAMILY_MAX);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	tab = rtnl_msg_handlers[protocol];</div><div class='add'>+	tab = rcu_replace_pointer_rtnl(rtnl_msg_handlers[protocol], NULL);</div><div class='ctx'> 	if (!tab) {</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	RCU_INIT_POINTER(rtnl_msg_handlers[protocol], NULL);</div><div class='ctx'> 	for (msgindex = 0; msgindex &lt; RTM_NR_MSGTYPES; msgindex++) {</div><div class='del'>-		link = tab[msgindex];</div><div class='del'>-		if (!link)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		rcu_assign_pointer(tab[msgindex], NULL);</div><div class='add'>+		link = rcu_replace_pointer_rtnl(tab[msgindex], NULL);</div><div class='ctx'> 		kfree_rcu(link, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -345,46 +507,86 @@ void rtnl_unregister_all(int protocol)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtnl_unregister_all);</div><div class='ctx'> </div><div class='del'>-static LIST_HEAD(link_ops);</div><div class='del'>-</div><div class='del'>-static const struct rtnl_link_ops *rtnl_link_ops_get(const char *kind)</div><div class='add'>+/**</div><div class='add'>+ * __rtnl_register_many - Register rtnetlink message types</div><div class='add'>+ * @handlers: Array of struct rtnl_msg_handlers</div><div class='add'>+ * @n: The length of @handlers</div><div class='add'>+ *</div><div class='add'>+ * Registers the specified function pointers (at least one of them has</div><div class='add'>+ * to be non-NULL) to be called whenever a request message for the</div><div class='add'>+ * specified protocol family and message type is received.</div><div class='add'>+ *</div><div class='add'>+ * The special protocol family PF_UNSPEC may be used to define fallback</div><div class='add'>+ * function pointers for the case when no entry for the specific protocol</div><div class='add'>+ * family exists.</div><div class='add'>+ *</div><div class='add'>+ * When one element of @handlers fails to register,</div><div class='add'>+ * 1) built-in: panics.</div><div class='add'>+ * 2) modules : the previous successful registrations are unwinded</div><div class='add'>+ *              and an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * Use rtnl_register_many().</div><div class='add'>+ */</div><div class='add'>+int __rtnl_register_many(const struct rtnl_msg_handler *handlers, int n)</div><div class='ctx'> {</div><div class='del'>-	const struct rtnl_link_ops *ops;</div><div class='add'>+	const struct rtnl_msg_handler *handler;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0, handler = handlers; i &lt; n; i++, handler++) {</div><div class='add'>+		err = rtnl_register_internal(handler-&gt;owner, handler-&gt;protocol,</div><div class='add'>+					     handler-&gt;msgtype, handler-&gt;doit,</div><div class='add'>+					     handler-&gt;dumpit, handler-&gt;flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (!handler-&gt;owner)</div><div class='add'>+				panic("Unable to register rtnetlink message "</div><div class='add'>+				      "handlers, %pS\n", handlers);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(ops, &amp;link_ops, list) {</div><div class='del'>-		if (!strcmp(ops-&gt;kind, kind))</div><div class='del'>-			return ops;</div><div class='add'>+			__rtnl_unregister_many(handlers, i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__rtnl_register_many);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * __rtnl_link_register - Register rtnl_link_ops with rtnetlink.</div><div class='del'>- * @ops: struct rtnl_link_ops * to register</div><div class='del'>- *</div><div class='del'>- * The caller must hold the rtnl_mutex. This function should be used</div><div class='del'>- * by drivers that create devices during module initialization. It</div><div class='del'>- * must be called before registering the devices.</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or a negative error code.</div><div class='del'>- */</div><div class='del'>-int __rtnl_link_register(struct rtnl_link_ops *ops)</div><div class='add'>+void __rtnl_unregister_many(const struct rtnl_msg_handler *handlers, int n)</div><div class='ctx'> {</div><div class='del'>-	if (rtnl_link_ops_get(ops-&gt;kind))</div><div class='del'>-		return -EEXIST;</div><div class='add'>+	const struct rtnl_msg_handler *handler;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* The check for setup is here because if ops</div><div class='del'>-	 * does not have that filled up, it is not possible</div><div class='del'>-	 * to use the ops for creating device. So do not</div><div class='del'>-	 * fill up dellink as well. That disables rtnl_dellink.</div><div class='del'>-	 */</div><div class='del'>-	if (ops-&gt;setup &amp;&amp; !ops-&gt;dellink)</div><div class='del'>-		ops-&gt;dellink = unregister_netdevice_queue;</div><div class='add'>+	for (i = n - 1, handler = handlers + n - 1; i &gt;= 0; i--, handler--)</div><div class='add'>+		rtnl_unregister(handler-&gt;protocol, handler-&gt;msgtype);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__rtnl_unregister_many);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;ops-&gt;list, &amp;link_ops);</div><div class='del'>-	return 0;</div><div class='add'>+static DEFINE_MUTEX(link_ops_mutex);</div><div class='add'>+static LIST_HEAD(link_ops);</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_ops *rtnl_link_ops_get(const char *kind, int *srcu_index)</div><div class='add'>+{</div><div class='add'>+	struct rtnl_link_ops *ops;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(ops, &amp;link_ops, list) {</div><div class='add'>+		if (!strcmp(ops-&gt;kind, kind)) {</div><div class='add'>+			*srcu_index = srcu_read_lock(&amp;ops-&gt;srcu);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = NULL;</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_link_ops_put(struct rtnl_link_ops *ops, int srcu_index)</div><div class='add'>+{</div><div class='add'>+	srcu_read_unlock(&amp;ops-&gt;srcu, srcu_index);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__rtnl_link_register);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rtnl_link_register - Register rtnl_link_ops with rtnetlink.</div><div class='hunk'>@@ -394,6 +596,7 @@ EXPORT_SYMBOL_GPL(__rtnl_link_register);</div><div class='ctx'>  */</div><div class='ctx'> int rtnl_link_register(struct rtnl_link_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	struct rtnl_link_ops *tmp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity-check max sizes to avoid stack buffer overflow. */</div><div class='hunk'>@@ -401,9 +604,31 @@ int rtnl_link_register(struct rtnl_link_ops *ops)</div><div class='ctx'> 		    ops-&gt;slave_maxtype &gt; RTNL_SLAVE_MAX_TYPE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	err = __rtnl_link_register(ops);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	/* The check for alloc/setup is here because if ops</div><div class='add'>+	 * does not have that filled up, it is not possible</div><div class='add'>+	 * to use the ops for creating device. So do not</div><div class='add'>+	 * fill up dellink as well. That disables rtnl_dellink.</div><div class='add'>+	 */</div><div class='add'>+	if ((ops-&gt;alloc || ops-&gt;setup) &amp;&amp; !ops-&gt;dellink)</div><div class='add'>+		ops-&gt;dellink = unregister_netdevice_queue;</div><div class='add'>+</div><div class='add'>+	err = init_srcu_struct(&amp;ops-&gt;srcu);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;link_ops_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;link_ops, list) {</div><div class='add'>+		if (!strcmp(ops-&gt;kind, tmp-&gt;kind)) {</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail_rcu(&amp;ops-&gt;list, &amp;link_ops);</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;link_ops_mutex);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtnl_link_register);</div><div class='hunk'>@@ -420,48 +645,20 @@ static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)</div><div class='ctx'> 	unregister_netdevice_many(&amp;list_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * __rtnl_link_unregister - Unregister rtnl_link_ops from rtnetlink.</div><div class='del'>- * @ops: struct rtnl_link_ops * to unregister</div><div class='del'>- *</div><div class='del'>- * The caller must hold the rtnl_mutex and guarantee net_namespace_list</div><div class='del'>- * integrity (hold pernet_ops_rwsem for writing to close the race</div><div class='del'>- * with setup_net() and cleanup_net()).</div><div class='del'>- */</div><div class='del'>-void __rtnl_link_unregister(struct rtnl_link_ops *ops)</div><div class='del'>-{</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	for_each_net(net) {</div><div class='del'>-		__rtnl_kill_links(net, ops);</div><div class='del'>-	}</div><div class='del'>-	list_del(&amp;ops-&gt;list);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(__rtnl_link_unregister);</div><div class='del'>-</div><div class='ctx'> /* Return with the rtnl_lock held when there are no network</div><div class='ctx'>  * devices unregistering in any network namespace.</div><div class='ctx'>  */</div><div class='ctx'> static void rtnl_lock_unregistering_all(void)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='del'>-	bool unregistering;</div><div class='ctx'> 	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(&amp;netdev_unregistering_wq, &amp;wait);</div><div class='ctx'> 	for (;;) {</div><div class='del'>-		unregistering = false;</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 		/* We held write locked pernet_ops_rwsem, and parallel</div><div class='ctx'> 		 * setup_net() and cleanup_net() are not possible.</div><div class='ctx'> 		 */</div><div class='del'>-		for_each_net(net) {</div><div class='del'>-			if (net-&gt;dev_unreg_count &gt; 0) {</div><div class='del'>-				unregistering = true;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!unregistering)</div><div class='add'>+		if (!atomic_read(&amp;dev_unreg_count))</div><div class='ctx'> 			break;</div><div class='ctx'> 		__rtnl_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -476,10 +673,22 @@ static void rtnl_lock_unregistering_all(void)</div><div class='ctx'>  */</div><div class='ctx'> void rtnl_link_unregister(struct rtnl_link_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;link_ops_mutex);</div><div class='add'>+	list_del_rcu(&amp;ops-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;link_ops_mutex);</div><div class='add'>+</div><div class='add'>+	synchronize_srcu(&amp;ops-&gt;srcu);</div><div class='add'>+	cleanup_srcu_struct(&amp;ops-&gt;srcu);</div><div class='add'>+</div><div class='ctx'> 	/* Close the race with setup_net() and cleanup_net() */</div><div class='ctx'> 	down_write(&amp;pernet_ops_rwsem);</div><div class='ctx'> 	rtnl_lock_unregistering_all();</div><div class='del'>-	__rtnl_link_unregister(ops);</div><div class='add'>+</div><div class='add'>+	for_each_net(net)</div><div class='add'>+		__rtnl_kill_links(net, ops);</div><div class='add'>+</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	up_write(&amp;pernet_ops_rwsem);</div><div class='ctx'> }</div><div class='hunk'>@@ -536,29 +745,51 @@ static size_t rtnl_link_get_size(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(rtnl_af_ops);</div><div class='ctx'> </div><div class='del'>-static const struct rtnl_af_ops *rtnl_af_lookup(const int family)</div><div class='add'>+static struct rtnl_af_ops *rtnl_af_lookup(const int family, int *srcu_index)</div><div class='ctx'> {</div><div class='del'>-	const struct rtnl_af_ops *ops;</div><div class='add'>+	struct rtnl_af_ops *ops;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(ops, &amp;rtnl_af_ops, list) {</div><div class='del'>-		if (ops-&gt;family == family)</div><div class='del'>-			return ops;</div><div class='add'>+		if (ops-&gt;family == family) {</div><div class='add'>+			*srcu_index = srcu_read_lock(&amp;ops-&gt;srcu);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	ops = NULL;</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtnl_af_put(struct rtnl_af_ops *ops, int srcu_index)</div><div class='add'>+{</div><div class='add'>+	srcu_read_unlock(&amp;ops-&gt;srcu, srcu_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rtnl_af_register - Register rtnl_af_ops with rtnetlink.</div><div class='ctx'>  * @ops: struct rtnl_af_ops * to register</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success or a negative error code.</div><div class='add'>+ * Return: 0 on success or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-void rtnl_af_register(struct rtnl_af_ops *ops)</div><div class='add'>+int rtnl_af_register(struct rtnl_af_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	int err = init_srcu_struct(&amp;ops-&gt;srcu);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	list_add_tail_rcu(&amp;ops-&gt;list, &amp;rtnl_af_ops);</div><div class='ctx'> 	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtnl_af_register);</div><div class='ctx'> </div><div class='hunk'>@@ -573,6 +804,8 @@ void rtnl_af_unregister(struct rtnl_af_ops *ops)</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	synchronize_rcu();</div><div class='add'>+	synchronize_srcu(&amp;ops-&gt;srcu);</div><div class='add'>+	cleanup_srcu_struct(&amp;ops-&gt;srcu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtnl_af_unregister);</div><div class='ctx'> </div><div class='hunk'>@@ -629,7 +862,7 @@ static int rtnl_link_slave_info_fill(struct sk_buff *skb,</div><div class='ctx'> 	if (nla_put_string(skb, IFLA_INFO_SLAVE_KIND, ops-&gt;kind) &lt; 0)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	if (ops-&gt;fill_slave_info) {</div><div class='del'>-		slave_data = nla_nest_start(skb, IFLA_INFO_SLAVE_DATA);</div><div class='add'>+		slave_data = nla_nest_start_noflag(skb, IFLA_INFO_SLAVE_DATA);</div><div class='ctx'> 		if (!slave_data)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> 		err = ops-&gt;fill_slave_info(skb, master_dev, dev);</div><div class='hunk'>@@ -661,7 +894,7 @@ static int rtnl_link_info_fill(struct sk_buff *skb,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ops-&gt;fill_info) {</div><div class='del'>-		data = nla_nest_start(skb, IFLA_INFO_DATA);</div><div class='add'>+		data = nla_nest_start_noflag(skb, IFLA_INFO_DATA);</div><div class='ctx'> 		if (data == NULL)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> 		err = ops-&gt;fill_info(skb, dev);</div><div class='hunk'>@@ -681,7 +914,7 @@ static int rtnl_link_fill(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 	struct nlattr *linkinfo;</div><div class='ctx'> 	int err = -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	linkinfo = nla_nest_start(skb, IFLA_LINKINFO);</div><div class='add'>+	linkinfo = nla_nest_start_noflag(skb, IFLA_LINKINFO);</div><div class='ctx'> 	if (linkinfo == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -705,15 +938,8 @@ out:</div><div class='ctx'> int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group, int echo)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *rtnl = net-&gt;rtnl;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	NETLINK_CB(skb).dst_group = group;</div><div class='del'>-	if (echo)</div><div class='del'>-		refcount_inc(&amp;skb-&gt;users);</div><div class='del'>-	netlink_broadcast(rtnl, skb, pid, group, GFP_KERNEL);</div><div class='del'>-	if (echo)</div><div class='del'>-		err = netlink_unicast(rtnl, skb, pid, MSG_DONTWAIT);</div><div class='del'>-	return err;</div><div class='add'>+	return nlmsg_notify(rtnl, skb, pid, group, echo, GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid)</div><div class='hunk'>@@ -725,15 +951,11 @@ int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid)</div><div class='ctx'> EXPORT_SYMBOL(rtnl_unicast);</div><div class='ctx'> </div><div class='ctx'> void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid, u32 group,</div><div class='del'>-		 struct nlmsghdr *nlh, gfp_t flags)</div><div class='add'>+		 const struct nlmsghdr *nlh, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *rtnl = net-&gt;rtnl;</div><div class='del'>-	int report = 0;</div><div class='ctx'> </div><div class='del'>-	if (nlh)</div><div class='del'>-		report = nlmsg_report(nlh);</div><div class='del'>-</div><div class='del'>-	nlmsg_notify(rtnl, skb, pid, group, report, flags);</div><div class='add'>+	nlmsg_notify(rtnl, skb, pid, group, nlmsg_report(nlh), flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_notify);</div><div class='ctx'> </div><div class='hunk'>@@ -750,7 +972,11 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics)</div><div class='ctx'> 	struct nlattr *mx;</div><div class='ctx'> 	int i, valid = 0;</div><div class='ctx'> </div><div class='del'>-	mx = nla_nest_start(skb, RTA_METRICS);</div><div class='add'>+	/* nothing is dumped for dst_default_metrics, so just skip the loop */</div><div class='add'>+	if (metrics == dst_default_metrics.metrics)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mx = nla_nest_start_noflag(skb, RTA_METRICS);</div><div class='ctx'> 	if (mx == NULL)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -800,11 +1026,13 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,</div><div class='ctx'> 		.rta_error = error,</div><div class='ctx'> 		.rta_id =  id,</div><div class='ctx'> 	};</div><div class='add'>+	unsigned long delta;</div><div class='ctx'> </div><div class='ctx'> 	if (dst) {</div><div class='del'>-		ci.rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst-&gt;lastuse);</div><div class='add'>+		delta = jiffies - READ_ONCE(dst-&gt;lastuse);</div><div class='add'>+		ci.rta_lastuse = jiffies_delta_to_clock_t(delta);</div><div class='ctx'> 		ci.rta_used = dst-&gt;__use;</div><div class='del'>-		ci.rta_clntref = atomic_read(&amp;dst-&gt;__refcnt);</div><div class='add'>+		ci.rta_clntref = rcuref_read(&amp;dst-&gt;__rcuref);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (expires) {</div><div class='ctx'> 		unsigned long clock;</div><div class='hunk'>@@ -817,31 +1045,44 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtnl_put_cacheinfo);</div><div class='ctx'> </div><div class='add'>+void netif_set_operstate(struct net_device *dev, int newstate)</div><div class='add'>+{</div><div class='add'>+	unsigned int old = READ_ONCE(dev-&gt;operstate);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (old == newstate)</div><div class='add'>+			return;</div><div class='add'>+	} while (!try_cmpxchg(&amp;dev-&gt;operstate, &amp;old, newstate));</div><div class='add'>+</div><div class='add'>+	netif_state_change(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netif_set_operstate);</div><div class='add'>+</div><div class='ctx'> static void set_operstate(struct net_device *dev, unsigned char transition)</div><div class='ctx'> {</div><div class='del'>-	unsigned char operstate = dev-&gt;operstate;</div><div class='add'>+	unsigned char operstate = READ_ONCE(dev-&gt;operstate);</div><div class='ctx'> </div><div class='ctx'> 	switch (transition) {</div><div class='ctx'> 	case IF_OPER_UP:</div><div class='ctx'> 		if ((operstate == IF_OPER_DORMANT ||</div><div class='add'>+		     operstate == IF_OPER_TESTING ||</div><div class='ctx'> 		     operstate == IF_OPER_UNKNOWN) &amp;&amp;</div><div class='del'>-		    !netif_dormant(dev))</div><div class='add'>+		    !netif_dormant(dev) &amp;&amp; !netif_testing(dev))</div><div class='ctx'> 			operstate = IF_OPER_UP;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IF_OPER_TESTING:</div><div class='add'>+		if (netif_oper_up(dev))</div><div class='add'>+			operstate = IF_OPER_TESTING;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case IF_OPER_DORMANT:</div><div class='del'>-		if (operstate == IF_OPER_UP ||</div><div class='del'>-		    operstate == IF_OPER_UNKNOWN)</div><div class='add'>+		if (netif_oper_up(dev))</div><div class='ctx'> 			operstate = IF_OPER_DORMANT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;operstate != operstate) {</div><div class='del'>-		write_lock_bh(&amp;dev_base_lock);</div><div class='del'>-		dev-&gt;operstate = operstate;</div><div class='del'>-		write_unlock_bh(&amp;dev_base_lock);</div><div class='del'>-		netdev_state_change(dev);</div><div class='del'>-	}</div><div class='add'>+	netif_set_operstate(dev, operstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int rtnl_dev_get_flags(const struct net_device *dev)</div><div class='hunk'>@@ -907,6 +1148,7 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,</div><div class='ctx'> 		size += num_vfs *</div><div class='ctx'> 			(nla_total_size(0) +</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_mac)) +</div><div class='add'>+			 nla_total_size(sizeof(struct ifla_vf_broadcast)) +</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_vlan)) +</div><div class='ctx'> 			 nla_total_size(0) + /* nest IFLA_VF_VLAN_LIST */</div><div class='ctx'> 			 nla_total_size(MAX_VLAN_LIST_LEN *</div><div class='hunk'>@@ -916,24 +1158,30 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_rate)) +</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_link_state)) +</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_rss_query_en)) +</div><div class='del'>-			 nla_total_size(0) + /* nest IFLA_VF_STATS */</div><div class='del'>-			 /* IFLA_VF_STATS_RX_PACKETS */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_TX_PACKETS */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_RX_BYTES */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_TX_BYTES */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_BROADCAST */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_MULTICAST */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_RX_DROPPED */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='del'>-			 /* IFLA_VF_STATS_TX_DROPPED */</div><div class='del'>-			 nla_total_size_64bit(sizeof(__u64)) +</div><div class='ctx'> 			 nla_total_size(sizeof(struct ifla_vf_trust)));</div><div class='add'>+		if (~ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS) {</div><div class='add'>+			size += num_vfs *</div><div class='add'>+				(nla_total_size(0) + /* nest IFLA_VF_STATS */</div><div class='add'>+				 /* IFLA_VF_STATS_RX_PACKETS */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_TX_PACKETS */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_RX_BYTES */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_TX_BYTES */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_BROADCAST */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_MULTICAST */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_RX_DROPPED */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+				 /* IFLA_VF_STATS_TX_DROPPED */</div><div class='add'>+				 nla_total_size_64bit(sizeof(__u64)));</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;netdev_ops-&gt;ndo_get_vf_guid)</div><div class='add'>+			size += num_vfs * 2 *</div><div class='add'>+				nla_total_size(sizeof(struct ifla_vf_guid));</div><div class='ctx'> 		return size;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -974,16 +1222,61 @@ static size_t rtnl_xdp_size(void)</div><div class='ctx'> 	return xdp_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t rtnl_prop_list_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	unsigned int cnt = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(name_node, &amp;dev-&gt;name_node-&gt;list, list)</div><div class='add'>+		cnt++;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (!cnt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return nla_total_size(0) + cnt * nla_total_size(ALTIFNAMSIZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rtnl_proto_down_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	size_t size = nla_total_size(1);</div><div class='add'>+</div><div class='add'>+	/* Assume dev-&gt;proto_down_reason is not zero. */</div><div class='add'>+	size += nla_total_size(0) + nla_total_size(4);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rtnl_devlink_port_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	size_t size = nla_total_size(0); /* nest IFLA_DEVLINK_PORT */</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;devlink_port)</div><div class='add'>+		size += devlink_nl_port_handle_size(dev-&gt;devlink_port);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rtnl_dpll_pin_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	size_t size = nla_total_size(0); /* nest IFLA_DPLL_PIN */</div><div class='add'>+</div><div class='add'>+	size += dpll_netdev_pin_handle_size(dev);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline size_t if_nlmsg_size(const struct net_device *dev,</div><div class='ctx'> 				     u32 ext_filter_mask)</div><div class='ctx'> {</div><div class='del'>-	return NLMSG_ALIGN(sizeof(struct ifinfomsg))</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	size = NLMSG_ALIGN(sizeof(struct ifinfomsg))</div><div class='ctx'> 	       + nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */</div><div class='ctx'> 	       + nla_total_size(IFALIASZ) /* IFLA_IFALIAS */</div><div class='ctx'> 	       + nla_total_size(IFNAMSIZ) /* IFLA_QDISC */</div><div class='ctx'> 	       + nla_total_size_64bit(sizeof(struct rtnl_link_ifmap))</div><div class='del'>-	       + nla_total_size(sizeof(struct rtnl_link_stats))</div><div class='del'>-	       + nla_total_size_64bit(sizeof(struct rtnl_link_stats64))</div><div class='ctx'> 	       + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */</div><div class='ctx'> 	       + nla_total_size(MAX_ADDR_LEN) /* IFLA_BROADCAST */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_TXQLEN */</div><div class='hunk'>@@ -993,12 +1286,19 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_MASTER */</div><div class='ctx'> 	       + nla_total_size(1) /* IFLA_CARRIER */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_PROMISCUITY */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_ALLMULTI */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_NUM_TX_QUEUES */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_NUM_RX_QUEUES */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_GSO_MAX_SEGS */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_GSO_MAX_SIZE */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_GRO_MAX_SIZE */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_GSO_IPV4_MAX_SIZE */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_GRO_IPV4_MAX_SIZE */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_TSO_MAX_SIZE */</div><div class='add'>+	       + nla_total_size(4) /* IFLA_TSO_MAX_SEGS */</div><div class='ctx'> 	       + nla_total_size(1) /* IFLA_OPERSTATE */</div><div class='ctx'> 	       + nla_total_size(1) /* IFLA_LINKMODE */</div><div class='add'>+	       + nla_total_size(1) /* IFLA_NETNS_IMMUTABLE */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_CARRIER_CHANGES */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_LINK_NETNSID */</div><div class='ctx'> 	       + nla_total_size(4) /* IFLA_GROUP */</div><div class='hunk'>@@ -1015,13 +1315,26 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_EVENT */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_NEW_NETNSID */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_NEW_IFINDEX */</div><div class='del'>-	       + nla_total_size(1)  /* IFLA_PROTO_DOWN */</div><div class='del'>-	       + nla_total_size(4)  /* IFLA_IF_NETNSID */</div><div class='add'>+	       + rtnl_proto_down_size(dev)  /* proto down */</div><div class='add'>+	       + nla_total_size(4)  /* IFLA_TARGET_NETNSID */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_CARRIER_UP_COUNT */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_CARRIER_DOWN_COUNT */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_MIN_MTU */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFLA_MAX_MTU */</div><div class='add'>+	       + rtnl_prop_list_size(dev)</div><div class='add'>+	       + nla_total_size(MAX_ADDR_LEN) /* IFLA_PERM_ADDRESS */</div><div class='add'>+	       + rtnl_devlink_port_size(dev)</div><div class='add'>+	       + rtnl_dpll_pin_size(dev)</div><div class='add'>+	       + nla_total_size(8)  /* IFLA_MAX_PACING_OFFLOAD_HORIZON */</div><div class='add'>+	       + nla_total_size(2)  /* IFLA_HEADROOM */</div><div class='add'>+	       + nla_total_size(2)  /* IFLA_TAILROOM */</div><div class='ctx'> 	       + 0;</div><div class='add'>+</div><div class='add'>+	if (!(ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS))</div><div class='add'>+		size += nla_total_size(sizeof(struct rtnl_link_stats)) +</div><div class='add'>+			nla_total_size_64bit(sizeof(struct rtnl_link_stats64));</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='hunk'>@@ -1031,12 +1344,12 @@ static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int vf;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	vf_ports = nla_nest_start(skb, IFLA_VF_PORTS);</div><div class='add'>+	vf_ports = nla_nest_start_noflag(skb, IFLA_VF_PORTS);</div><div class='ctx'> 	if (!vf_ports)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	for (vf = 0; vf &lt; dev_num_vf(dev-&gt;dev.parent); vf++) {</div><div class='del'>-		vf_port = nla_nest_start(skb, IFLA_VF_PORT);</div><div class='add'>+		vf_port = nla_nest_start_noflag(skb, IFLA_VF_PORT);</div><div class='ctx'> 		if (!vf_port)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		if (nla_put_u32(skb, IFLA_PORT_VF, vf))</div><div class='hunk'>@@ -1065,7 +1378,7 @@ static int rtnl_port_self_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct nlattr *port_self;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	port_self = nla_nest_start(skb, IFLA_PORT_SELF);</div><div class='add'>+	port_self = nla_nest_start_noflag(skb, IFLA_PORT_SELF);</div><div class='ctx'> 	if (!port_self)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1140,22 +1453,17 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_phys_item_id ppid = { };</div><div class='ctx'> 	int err;</div><div class='del'>-	struct switchdev_attr attr = {</div><div class='del'>-		.orig_dev = dev,</div><div class='del'>-		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,</div><div class='del'>-		.flags = SWITCHDEV_F_NO_RECURSE,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	err = switchdev_port_attr_get(dev, &amp;attr);</div><div class='add'>+	err = netif_get_port_parent_id(dev, &amp;ppid, false);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == -EOPNOTSUPP)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nla_put(skb, IFLA_PHYS_SWITCH_ID, attr.u.ppid.id_len,</div><div class='del'>-		    attr.u.ppid.id))</div><div class='add'>+	if (nla_put(skb, IFLA_PHYS_SWITCH_ID, ppid.id_len, ppid.id))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1188,7 +1496,7 @@ static noinline_for_stack int rtnl_fill_stats(struct sk_buff *skb,</div><div class='ctx'> static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 					       struct net_device *dev,</div><div class='ctx'> 					       int vfs_num,</div><div class='del'>-					       struct nlattr *vfinfo)</div><div class='add'>+					       u32 ext_filter_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifla_vf_rss_query_en vf_rss_query_en;</div><div class='ctx'> 	struct nlattr *vf, *vfstats, *vfvlanlist;</div><div class='hunk'>@@ -1201,7 +1509,10 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 	struct ifla_vf_vlan vf_vlan;</div><div class='ctx'> 	struct ifla_vf_rate vf_rate;</div><div class='ctx'> 	struct ifla_vf_mac vf_mac;</div><div class='add'>+	struct ifla_vf_broadcast vf_broadcast;</div><div class='ctx'> 	struct ifla_vf_info ivi;</div><div class='add'>+	struct ifla_vf_guid node_guid;</div><div class='add'>+	struct ifla_vf_guid port_guid;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ivi, 0, sizeof(ivi));</div><div class='ctx'> </div><div class='hunk'>@@ -1223,6 +1534,8 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;vf_vlan_info, 0, sizeof(vf_vlan_info));</div><div class='add'>+	memset(&amp;node_guid, 0, sizeof(node_guid));</div><div class='add'>+	memset(&amp;port_guid, 0, sizeof(port_guid));</div><div class='ctx'> </div><div class='ctx'> 	vf_mac.vf =</div><div class='ctx'> 		vf_vlan.vf =</div><div class='hunk'>@@ -1232,9 +1545,12 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 		vf_spoofchk.vf =</div><div class='ctx'> 		vf_linkstate.vf =</div><div class='ctx'> 		vf_rss_query_en.vf =</div><div class='del'>-		vf_trust.vf = ivi.vf;</div><div class='add'>+		vf_trust.vf =</div><div class='add'>+		node_guid.vf =</div><div class='add'>+		port_guid.vf = ivi.vf;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac));</div><div class='add'>+	memcpy(vf_broadcast.broadcast, dev-&gt;broadcast, dev-&gt;addr_len);</div><div class='ctx'> 	vf_vlan.vlan = ivi.vlan;</div><div class='ctx'> 	vf_vlan.qos = ivi.qos;</div><div class='ctx'> 	vf_vlan_info.vlan = ivi.vlan;</div><div class='hunk'>@@ -1247,10 +1563,11 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 	vf_linkstate.link_state = ivi.linkstate;</div><div class='ctx'> 	vf_rss_query_en.setting = ivi.rss_query_en;</div><div class='ctx'> 	vf_trust.setting = ivi.trusted;</div><div class='del'>-	vf = nla_nest_start(skb, IFLA_VF_INFO);</div><div class='add'>+	vf = nla_nest_start_noflag(skb, IFLA_VF_INFO);</div><div class='ctx'> 	if (!vf)</div><div class='del'>-		goto nla_put_vfinfo_failure;</div><div class='add'>+		return -EMSGSIZE;</div><div class='ctx'> 	if (nla_put(skb, IFLA_VF_MAC, sizeof(vf_mac), &amp;vf_mac) ||</div><div class='add'>+	    nla_put(skb, IFLA_VF_BROADCAST, sizeof(vf_broadcast), &amp;vf_broadcast) ||</div><div class='ctx'> 	    nla_put(skb, IFLA_VF_VLAN, sizeof(vf_vlan), &amp;vf_vlan) ||</div><div class='ctx'> 	    nla_put(skb, IFLA_VF_RATE, sizeof(vf_rate),</div><div class='ctx'> 		    &amp;vf_rate) ||</div><div class='hunk'>@@ -1266,7 +1583,17 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 	    nla_put(skb, IFLA_VF_TRUST,</div><div class='ctx'> 		    sizeof(vf_trust), &amp;vf_trust))</div><div class='ctx'> 		goto nla_put_vf_failure;</div><div class='del'>-	vfvlanlist = nla_nest_start(skb, IFLA_VF_VLAN_LIST);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;netdev_ops-&gt;ndo_get_vf_guid &amp;&amp;</div><div class='add'>+	    !dev-&gt;netdev_ops-&gt;ndo_get_vf_guid(dev, vfs_num, &amp;node_guid,</div><div class='add'>+					      &amp;port_guid)) {</div><div class='add'>+		if (nla_put(skb, IFLA_VF_IB_NODE_GUID, sizeof(node_guid),</div><div class='add'>+			    &amp;node_guid) ||</div><div class='add'>+		    nla_put(skb, IFLA_VF_IB_PORT_GUID, sizeof(port_guid),</div><div class='add'>+			    &amp;port_guid))</div><div class='add'>+			goto nla_put_vf_failure;</div><div class='add'>+	}</div><div class='add'>+	vfvlanlist = nla_nest_start_noflag(skb, IFLA_VF_VLAN_LIST);</div><div class='ctx'> 	if (!vfvlanlist)</div><div class='ctx'> 		goto nla_put_vf_failure;</div><div class='ctx'> 	if (nla_put(skb, IFLA_VF_VLAN_INFO, sizeof(vf_vlan_info),</div><div class='hunk'>@@ -1275,40 +1602,40 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,</div><div class='ctx'> 		goto nla_put_vf_failure;</div><div class='ctx'> 	}</div><div class='ctx'> 	nla_nest_end(skb, vfvlanlist);</div><div class='del'>-	memset(&amp;vf_stats, 0, sizeof(vf_stats));</div><div class='del'>-	if (dev-&gt;netdev_ops-&gt;ndo_get_vf_stats)</div><div class='del'>-		dev-&gt;netdev_ops-&gt;ndo_get_vf_stats(dev, vfs_num,</div><div class='del'>-						&amp;vf_stats);</div><div class='del'>-	vfstats = nla_nest_start(skb, IFLA_VF_STATS);</div><div class='del'>-	if (!vfstats)</div><div class='del'>-		goto nla_put_vf_failure;</div><div class='del'>-	if (nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_PACKETS,</div><div class='del'>-			      vf_stats.rx_packets, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_PACKETS,</div><div class='del'>-			      vf_stats.tx_packets, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_BYTES,</div><div class='del'>-			      vf_stats.rx_bytes, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_BYTES,</div><div class='del'>-			      vf_stats.tx_bytes, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_BROADCAST,</div><div class='del'>-			      vf_stats.broadcast, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_MULTICAST,</div><div class='del'>-			      vf_stats.multicast, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_DROPPED,</div><div class='del'>-			      vf_stats.rx_dropped, IFLA_VF_STATS_PAD) ||</div><div class='del'>-	    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_DROPPED,</div><div class='del'>-			      vf_stats.tx_dropped, IFLA_VF_STATS_PAD)) {</div><div class='del'>-		nla_nest_cancel(skb, vfstats);</div><div class='del'>-		goto nla_put_vf_failure;</div><div class='add'>+	if (~ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS) {</div><div class='add'>+		memset(&amp;vf_stats, 0, sizeof(vf_stats));</div><div class='add'>+		if (dev-&gt;netdev_ops-&gt;ndo_get_vf_stats)</div><div class='add'>+			dev-&gt;netdev_ops-&gt;ndo_get_vf_stats(dev, vfs_num,</div><div class='add'>+							  &amp;vf_stats);</div><div class='add'>+		vfstats = nla_nest_start_noflag(skb, IFLA_VF_STATS);</div><div class='add'>+		if (!vfstats)</div><div class='add'>+			goto nla_put_vf_failure;</div><div class='add'>+		if (nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_PACKETS,</div><div class='add'>+				      vf_stats.rx_packets, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_PACKETS,</div><div class='add'>+				      vf_stats.tx_packets, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_BYTES,</div><div class='add'>+				      vf_stats.rx_bytes, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_BYTES,</div><div class='add'>+				      vf_stats.tx_bytes, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_BROADCAST,</div><div class='add'>+				      vf_stats.broadcast, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_MULTICAST,</div><div class='add'>+				      vf_stats.multicast, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_DROPPED,</div><div class='add'>+				      vf_stats.rx_dropped, IFLA_VF_STATS_PAD) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_DROPPED,</div><div class='add'>+				      vf_stats.tx_dropped, IFLA_VF_STATS_PAD)) {</div><div class='add'>+			nla_nest_cancel(skb, vfstats);</div><div class='add'>+			goto nla_put_vf_failure;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, vfstats);</div><div class='ctx'> 	}</div><div class='del'>-	nla_nest_end(skb, vfstats);</div><div class='ctx'> 	nla_nest_end(skb, vf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nla_put_vf_failure:</div><div class='ctx'> 	nla_nest_cancel(skb, vf);</div><div class='del'>-nla_put_vfinfo_failure:</div><div class='del'>-	nla_nest_cancel(skb, vfinfo);</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1329,30 +1656,33 @@ static noinline_for_stack int rtnl_fill_vf(struct sk_buff *skb,</div><div class='ctx'> 	if (!dev-&gt;netdev_ops-&gt;ndo_get_vf_config)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	vfinfo = nla_nest_start(skb, IFLA_VFINFO_LIST);</div><div class='add'>+	vfinfo = nla_nest_start_noflag(skb, IFLA_VFINFO_LIST);</div><div class='ctx'> 	if (!vfinfo)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_vfs; i++) {</div><div class='del'>-		if (rtnl_fill_vfinfo(skb, dev, i, vfinfo))</div><div class='add'>+		if (rtnl_fill_vfinfo(skb, dev, i, ext_filter_mask)) {</div><div class='add'>+			nla_nest_cancel(skb, vfinfo);</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nla_nest_end(skb, vfinfo);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static int rtnl_fill_link_ifmap(struct sk_buff *skb,</div><div class='add'>+				const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtnl_link_ifmap map;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;map, 0, sizeof(map));</div><div class='del'>-	map.mem_start   = dev-&gt;mem_start;</div><div class='del'>-	map.mem_end     = dev-&gt;mem_end;</div><div class='del'>-	map.base_addr   = dev-&gt;base_addr;</div><div class='del'>-	map.irq         = dev-&gt;irq;</div><div class='del'>-	map.dma         = dev-&gt;dma;</div><div class='del'>-	map.port        = dev-&gt;if_port;</div><div class='add'>+	map.mem_start = READ_ONCE(dev-&gt;mem_start);</div><div class='add'>+	map.mem_end   = READ_ONCE(dev-&gt;mem_end);</div><div class='add'>+	map.base_addr = READ_ONCE(dev-&gt;base_addr);</div><div class='add'>+	map.irq       = READ_ONCE(dev-&gt;irq);</div><div class='add'>+	map.dma       = READ_ONCE(dev-&gt;dma);</div><div class='add'>+	map.port      = READ_ONCE(dev-&gt;if_port);</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_64bit(skb, IFLA_MAP, sizeof(map), &amp;map, IFLA_PAD))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='hunk'>@@ -1363,24 +1693,25 @@ static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> static u32 rtnl_xdp_prog_skb(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bpf_prog *generic_xdp_prog;</div><div class='add'>+	u32 res = 0;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	generic_xdp_prog = rcu_dereference(dev-&gt;xdp_prog);</div><div class='add'>+	if (generic_xdp_prog)</div><div class='add'>+		res = generic_xdp_prog-&gt;aux-&gt;id;</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	generic_xdp_prog = rtnl_dereference(dev-&gt;xdp_prog);</div><div class='del'>-	if (!generic_xdp_prog)</div><div class='del'>-		return 0;</div><div class='del'>-	return generic_xdp_prog-&gt;aux-&gt;id;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 rtnl_xdp_prog_drv(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __dev_xdp_query(dev, dev-&gt;netdev_ops-&gt;ndo_bpf, XDP_QUERY_PROG);</div><div class='add'>+	return dev_xdp_prog_id(dev, XDP_MODE_DRV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 rtnl_xdp_prog_hw(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __dev_xdp_query(dev, dev-&gt;netdev_ops-&gt;ndo_bpf,</div><div class='del'>-			       XDP_QUERY_PROG_HW);</div><div class='add'>+	return dev_xdp_prog_id(dev, XDP_MODE_HW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtnl_xdp_report_one(struct sk_buff *skb, struct net_device *dev,</div><div class='hunk'>@@ -1414,7 +1745,7 @@ static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 mode;</div><div class='ctx'> </div><div class='del'>-	xdp = nla_nest_start(skb, IFLA_XDP);</div><div class='add'>+	xdp = nla_nest_start_noflag(skb, IFLA_XDP);</div><div class='ctx'> 	if (!xdp)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1490,20 +1821,22 @@ static int put_master_ifindex(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	upper_dev = netdev_master_upper_dev_get_rcu(dev);</div><div class='ctx'> 	if (upper_dev)</div><div class='del'>-		ret = nla_put_u32(skb, IFLA_MASTER, upper_dev-&gt;ifindex);</div><div class='add'>+		ret = nla_put_u32(skb, IFLA_MASTER,</div><div class='add'>+				  READ_ONCE(upper_dev-&gt;ifindex));</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev,</div><div class='add'>+			  bool force)</div><div class='ctx'> {</div><div class='del'>-	int ifindex = dev_get_iflink(dev);</div><div class='add'>+	int iflink = dev_get_iflink(dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ifindex == ifindex)</div><div class='del'>-		return 0;</div><div class='add'>+	if (force || READ_ONCE(dev-&gt;ifindex) != iflink)</div><div class='add'>+		return nla_put_u32(skb, IFLA_LINK, iflink);</div><div class='ctx'> </div><div class='del'>-	return nla_put_u32(skb, IFLA_LINK, ifindex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack int nla_put_ifalias(struct sk_buff *skb,</div><div class='hunk'>@@ -1518,20 +1851,24 @@ static noinline_for_stack int nla_put_ifalias(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static int rtnl_fill_link_netnsid(struct sk_buff *skb,</div><div class='ctx'> 				  const struct net_device *dev,</div><div class='del'>-				  struct net *src_net)</div><div class='add'>+				  struct net *src_net, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	bool put_iflink = false;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;rtnl_link_ops &amp;&amp; dev-&gt;rtnl_link_ops-&gt;get_link_net) {</div><div class='ctx'> 		struct net *link_net = dev-&gt;rtnl_link_ops-&gt;get_link_net(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (!net_eq(dev_net(dev), link_net)) {</div><div class='del'>-			int id = peernet2id_alloc(src_net, link_net);</div><div class='add'>+			int id = peernet2id_alloc(src_net, link_net, gfp);</div><div class='ctx'> </div><div class='ctx'> 			if (nla_put_s32(skb, IFLA_LINK_NETNSID, id))</div><div class='ctx'> 				return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+			put_iflink = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return nla_put_iflink(skb, dev, put_iflink);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtnl_fill_link_af(struct sk_buff *skb,</div><div class='hunk'>@@ -1541,7 +1878,7 @@ static int rtnl_fill_link_af(struct sk_buff *skb,</div><div class='ctx'> 	const struct rtnl_af_ops *af_ops;</div><div class='ctx'> 	struct nlattr *af_spec;</div><div class='ctx'> </div><div class='del'>-	af_spec = nla_nest_start(skb, IFLA_AF_SPEC);</div><div class='add'>+	af_spec = nla_nest_start_noflag(skb, IFLA_AF_SPEC);</div><div class='ctx'> 	if (!af_spec)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1552,7 +1889,7 @@ static int rtnl_fill_link_af(struct sk_buff *skb,</div><div class='ctx'> 		if (!af_ops-&gt;fill_link_af)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		af = nla_nest_start(skb, af_ops-&gt;family);</div><div class='add'>+		af = nla_nest_start_noflag(skb, af_ops-&gt;family);</div><div class='ctx'> 		if (!af)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1575,15 +1912,129 @@ static int rtnl_fill_link_af(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rtnl_fill_alt_ifnames(struct sk_buff *skb,</div><div class='add'>+				 const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_name_node *name_node;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(name_node, &amp;dev-&gt;name_node-&gt;list, list) {</div><div class='add'>+		if (nla_put_string(skb, IFLA_ALT_IFNAME, name_node-&gt;name))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RCU protected. */</div><div class='add'>+static int rtnl_fill_prop_list(struct sk_buff *skb,</div><div class='add'>+			       const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *prop_list;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	prop_list = nla_nest_start(skb, IFLA_PROP_LIST);</div><div class='add'>+	if (!prop_list)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ret = rtnl_fill_alt_ifnames(skb, dev);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto nest_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, prop_list);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nest_cancel:</div><div class='add'>+	nla_nest_cancel(skb, prop_list);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_fill_proto_down(struct sk_buff *skb,</div><div class='add'>+				const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *pr;</div><div class='add'>+	u32 preason;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_PROTO_DOWN, READ_ONCE(dev-&gt;proto_down)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	preason = READ_ONCE(dev-&gt;proto_down_reason);</div><div class='add'>+	if (!preason)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pr = nla_nest_start(skb, IFLA_PROTO_DOWN_REASON);</div><div class='add'>+	if (!pr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_PROTO_DOWN_REASON_VALUE, preason)) {</div><div class='add'>+		nla_nest_cancel(skb, pr);</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, pr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_fill_devlink_port(struct sk_buff *skb,</div><div class='add'>+				  const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *devlink_port_nest;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	devlink_port_nest = nla_nest_start(skb, IFLA_DEVLINK_PORT);</div><div class='add'>+	if (!devlink_port_nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;devlink_port) {</div><div class='add'>+		ret = devlink_nl_port_handle_fill(skb, dev-&gt;devlink_port);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto nest_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, devlink_port_nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nest_cancel:</div><div class='add'>+	nla_nest_cancel(skb, devlink_port_nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_fill_dpll_pin(struct sk_buff *skb,</div><div class='add'>+			      const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *dpll_pin_nest;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dpll_pin_nest = nla_nest_start(skb, IFLA_DPLL_PIN);</div><div class='add'>+	if (!dpll_pin_nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ret = dpll_netdev_add_pin_handle(skb, dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto nest_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, dpll_pin_nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nest_cancel:</div><div class='add'>+	nla_nest_cancel(skb, dpll_pin_nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 			    struct net_device *dev, struct net *src_net,</div><div class='ctx'> 			    int type, u32 pid, u32 seq, u32 change,</div><div class='ctx'> 			    unsigned int flags, u32 ext_filter_mask,</div><div class='ctx'> 			    u32 event, int *new_nsid, int new_ifindex,</div><div class='del'>-			    int tgt_netnsid)</div><div class='add'>+			    int tgt_netnsid, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	char devname[IFNAMSIZ];</div><div class='ctx'> 	struct ifinfomsg *ifm;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='add'>+	struct Qdisc *qdisc;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> 	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ifm), flags);</div><div class='hunk'>@@ -1593,44 +2044,69 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 	ifm = nlmsg_data(nlh);</div><div class='ctx'> 	ifm-&gt;ifi_family = AF_UNSPEC;</div><div class='ctx'> 	ifm-&gt;__ifi_pad = 0;</div><div class='del'>-	ifm-&gt;ifi_type = dev-&gt;type;</div><div class='del'>-	ifm-&gt;ifi_index = dev-&gt;ifindex;</div><div class='del'>-	ifm-&gt;ifi_flags = dev_get_flags(dev);</div><div class='add'>+	ifm-&gt;ifi_type = READ_ONCE(dev-&gt;type);</div><div class='add'>+	ifm-&gt;ifi_index = READ_ONCE(dev-&gt;ifindex);</div><div class='add'>+	ifm-&gt;ifi_flags = netif_get_flags(dev);</div><div class='ctx'> 	ifm-&gt;ifi_change = change;</div><div class='ctx'> </div><div class='del'>-	if (tgt_netnsid &gt;= 0 &amp;&amp; nla_put_s32(skb, IFLA_IF_NETNSID, tgt_netnsid))</div><div class='add'>+	if (tgt_netnsid &gt;= 0 &amp;&amp; nla_put_s32(skb, IFLA_TARGET_NETNSID, tgt_netnsid))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_string(skb, IFLA_IFNAME, dev-&gt;name) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_TXQLEN, dev-&gt;tx_queue_len) ||</div><div class='add'>+	netdev_copy_name(dev, devname);</div><div class='add'>+	if (nla_put_string(skb, IFLA_IFNAME, devname))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_TXQLEN, READ_ONCE(dev-&gt;tx_queue_len)) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_OPERSTATE,</div><div class='del'>-		       netif_running(dev) ? dev-&gt;operstate : IF_OPER_DOWN) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_LINKMODE, dev-&gt;link_mode) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_MTU, dev-&gt;mtu) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_MIN_MTU, dev-&gt;min_mtu) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_MAX_MTU, dev-&gt;max_mtu) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_GROUP, dev-&gt;group) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_PROMISCUITY, dev-&gt;promiscuity) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_NUM_TX_QUEUES, dev-&gt;num_tx_queues) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_GSO_MAX_SEGS, dev-&gt;gso_max_segs) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_GSO_MAX_SIZE, dev-&gt;gso_max_size) ||</div><div class='add'>+		       netif_running(dev) ? READ_ONCE(dev-&gt;operstate) :</div><div class='add'>+					    IF_OPER_DOWN) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_LINKMODE, READ_ONCE(dev-&gt;link_mode)) ||</div><div class='add'>+	    nla_put_u8(skb, IFLA_NETNS_IMMUTABLE, dev-&gt;netns_immutable) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_MTU, READ_ONCE(dev-&gt;mtu)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_MIN_MTU, READ_ONCE(dev-&gt;min_mtu)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_MAX_MTU, READ_ONCE(dev-&gt;max_mtu)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GROUP, READ_ONCE(dev-&gt;group)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_PROMISCUITY, READ_ONCE(dev-&gt;promiscuity)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_ALLMULTI, READ_ONCE(dev-&gt;allmulti)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_NUM_TX_QUEUES,</div><div class='add'>+			READ_ONCE(dev-&gt;num_tx_queues)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GSO_MAX_SEGS,</div><div class='add'>+			READ_ONCE(dev-&gt;gso_max_segs)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GSO_MAX_SIZE,</div><div class='add'>+			READ_ONCE(dev-&gt;gso_max_size)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GRO_MAX_SIZE,</div><div class='add'>+			READ_ONCE(dev-&gt;gro_max_size)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GSO_IPV4_MAX_SIZE,</div><div class='add'>+			READ_ONCE(dev-&gt;gso_ipv4_max_size)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_GRO_IPV4_MAX_SIZE,</div><div class='add'>+			READ_ONCE(dev-&gt;gro_ipv4_max_size)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_TSO_MAX_SIZE,</div><div class='add'>+			READ_ONCE(dev-&gt;tso_max_size)) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_TSO_MAX_SEGS,</div><div class='add'>+			READ_ONCE(dev-&gt;tso_max_segs)) ||</div><div class='add'>+	    nla_put_uint(skb, IFLA_MAX_PACING_OFFLOAD_HORIZON,</div><div class='add'>+			 READ_ONCE(dev-&gt;max_pacing_offload_horizon)) ||</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	    nla_put_u32(skb, IFLA_NUM_RX_QUEUES, dev-&gt;num_rx_queues) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_NUM_RX_QUEUES,</div><div class='add'>+			READ_ONCE(dev-&gt;num_rx_queues)) ||</div><div class='ctx'> #endif</div><div class='del'>-	    nla_put_iflink(skb, dev) ||</div><div class='ctx'> 	    put_master_ifindex(skb, dev) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) ||</div><div class='del'>-	    (dev-&gt;qdisc &amp;&amp;</div><div class='del'>-	     nla_put_string(skb, IFLA_QDISC, dev-&gt;qdisc-&gt;ops-&gt;id)) ||</div><div class='ctx'> 	    nla_put_ifalias(skb, dev) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_CARRIER_CHANGES,</div><div class='ctx'> 			atomic_read(&amp;dev-&gt;carrier_up_count) +</div><div class='ctx'> 			atomic_read(&amp;dev-&gt;carrier_down_count)) ||</div><div class='del'>-	    nla_put_u8(skb, IFLA_PROTO_DOWN, dev-&gt;proto_down) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_CARRIER_UP_COUNT,</div><div class='ctx'> 			atomic_read(&amp;dev-&gt;carrier_up_count)) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_CARRIER_DOWN_COUNT,</div><div class='del'>-			atomic_read(&amp;dev-&gt;carrier_down_count)))</div><div class='add'>+			atomic_read(&amp;dev-&gt;carrier_down_count)) ||</div><div class='add'>+	    nla_put_u16(skb, IFLA_HEADROOM,</div><div class='add'>+			READ_ONCE(dev-&gt;needed_headroom)) ||</div><div class='add'>+	    nla_put_u16(skb, IFLA_TAILROOM,</div><div class='add'>+			READ_ONCE(dev-&gt;needed_tailroom)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (rtnl_fill_proto_down(skb, dev))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (event != IFLA_EVENT_NONE) {</div><div class='hunk'>@@ -1638,9 +2114,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rtnl_fill_link_ifmap(skb, dev))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;addr_len) {</div><div class='ctx'> 		if (nla_put(skb, IFLA_ADDRESS, dev-&gt;addr_len, dev-&gt;dev_addr) ||</div><div class='ctx'> 		    nla_put(skb, IFLA_BROADCAST, dev-&gt;addr_len, dev-&gt;broadcast))</div><div class='hunk'>@@ -1656,7 +2129,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 	if (rtnl_phys_switch_id_fill(skb, dev))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (rtnl_fill_stats(skb, dev))</div><div class='add'>+	if (!(ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS) &amp;&amp;</div><div class='add'>+	    rtnl_fill_stats(skb, dev))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (rtnl_fill_vf(skb, dev, ext_filter_mask))</div><div class='hunk'>@@ -1673,9 +2147,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rtnl_fill_link_netnsid(skb, dev, src_net))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='ctx'> 	if (new_nsid &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, IFLA_NEW_NETNSID, *new_nsid) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -1683,12 +2154,40 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,</div><div class='ctx'> 	    nla_put_s32(skb, IFLA_NEW_IFINDEX, new_ifindex) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	if (memchr_inv(dev-&gt;perm_addr, '\0', dev-&gt;addr_len) &amp;&amp;</div><div class='add'>+	    nla_put(skb, IFLA_PERM_ADDRESS, dev-&gt;addr_len, dev-&gt;perm_addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	if (rtnl_fill_link_netnsid(skb, dev, src_net, GFP_ATOMIC))</div><div class='add'>+		goto nla_put_failure_rcu;</div><div class='add'>+	qdisc = rcu_dereference(dev-&gt;qdisc);</div><div class='add'>+	if (qdisc &amp;&amp; nla_put_string(skb, IFLA_QDISC, qdisc-&gt;ops-&gt;id))</div><div class='add'>+		goto nla_put_failure_rcu;</div><div class='ctx'> 	if (rtnl_fill_link_af(skb, dev, ext_filter_mask))</div><div class='ctx'> 		goto nla_put_failure_rcu;</div><div class='add'>+	if (rtnl_fill_link_ifmap(skb, dev))</div><div class='add'>+		goto nla_put_failure_rcu;</div><div class='add'>+	if (rtnl_fill_prop_list(skb, dev))</div><div class='add'>+		goto nla_put_failure_rcu;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;dev.parent &amp;&amp;</div><div class='add'>+	    nla_put_string(skb, IFLA_PARENT_DEV_NAME,</div><div class='add'>+			   dev_name(dev-&gt;dev.parent)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev.parent &amp;&amp; dev-&gt;dev.parent-&gt;bus &amp;&amp;</div><div class='add'>+	    nla_put_string(skb, IFLA_PARENT_DEV_BUS_NAME,</div><div class='add'>+			   dev-&gt;dev.parent-&gt;bus-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (rtnl_fill_devlink_port(skb, dev))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (rtnl_fill_dpll_pin(skb, dev))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1700,6 +2199,7 @@ nla_put_failure:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ifla_policy[IFLA_MAX+1] = {</div><div class='add'>+	[IFLA_UNSPEC]		= { .strict_start_type = IFLA_DPLL_PIN },</div><div class='ctx'> 	[IFLA_IFNAME]		= { .type = NLA_STRING, .len = IFNAMSIZ-1 },</div><div class='ctx'> 	[IFLA_ADDRESS]		= { .type = NLA_BINARY, .len = MAX_ADDR_LEN },</div><div class='ctx'> 	[IFLA_BROADCAST]	= { .type = NLA_BINARY, .len = MAX_ADDR_LEN },</div><div class='hunk'>@@ -1728,7 +2228,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {</div><div class='ctx'> 	[IFLA_NUM_TX_QUEUES]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_NUM_RX_QUEUES]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_GSO_MAX_SEGS]	= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_GSO_MAX_SIZE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_GSO_MAX_SIZE]	= NLA_POLICY_MIN(NLA_U32, MAX_TCP_HEADER + 1),</div><div class='ctx'> 	[IFLA_PHYS_PORT_ID]	= { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },</div><div class='ctx'> 	[IFLA_CARRIER_CHANGES]	= { .type = NLA_U32 },  /* ignored */</div><div class='ctx'> 	[IFLA_PHYS_SWITCH_ID]	= { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },</div><div class='hunk'>@@ -1737,11 +2237,27 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {</div><div class='ctx'> 	[IFLA_XDP]		= { .type = NLA_NESTED },</div><div class='ctx'> 	[IFLA_EVENT]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_GROUP]		= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_IF_NETNSID]	= { .type = NLA_S32 },</div><div class='add'>+	[IFLA_TARGET_NETNSID]	= { .type = NLA_S32 },</div><div class='ctx'> 	[IFLA_CARRIER_UP_COUNT]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_CARRIER_DOWN_COUNT] = { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_MIN_MTU]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_MAX_MTU]		= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_PROP_LIST]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_ALT_IFNAME]	= { .type = NLA_STRING,</div><div class='add'>+				    .len = ALTIFNAMSIZ - 1 },</div><div class='add'>+	[IFLA_PERM_ADDRESS]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_PROTO_DOWN_REASON] = { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_NEW_IFINDEX]	= NLA_POLICY_MIN(NLA_S32, 1),</div><div class='add'>+	[IFLA_PARENT_DEV_NAME]	= { .type = NLA_NUL_STRING },</div><div class='add'>+	[IFLA_GRO_MAX_SIZE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_TSO_MAX_SIZE]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_TSO_MAX_SEGS]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_ALLMULTI]		= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_GSO_IPV4_MAX_SIZE]	= NLA_POLICY_MIN(NLA_U32, MAX_TCP_HEADER + 1),</div><div class='add'>+	[IFLA_GRO_IPV4_MAX_SIZE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_NETNS_IMMUTABLE]	= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_HEADROOM]		= { .type = NLA_REJECT },</div><div class='add'>+	[IFLA_TAILROOM]		= { .type = NLA_REJECT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {</div><div class='hunk'>@@ -1753,6 +2269,7 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {</div><div class='ctx'> 	[IFLA_VF_MAC]		= { .len = sizeof(struct ifla_vf_mac) },</div><div class='add'>+	[IFLA_VF_BROADCAST]	= { .type = NLA_REJECT },</div><div class='ctx'> 	[IFLA_VF_VLAN]		= { .len = sizeof(struct ifla_vf_vlan) },</div><div class='ctx'> 	[IFLA_VF_VLAN_LIST]     = { .type = NLA_NESTED },</div><div class='ctx'> 	[IFLA_VF_TX_RATE]	= { .len = sizeof(struct ifla_vf_tx_rate) },</div><div class='hunk'>@@ -1786,26 +2303,28 @@ static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ifla_xdp_policy[IFLA_XDP_MAX + 1] = {</div><div class='add'>+	[IFLA_XDP_UNSPEC]	= { .strict_start_type = IFLA_XDP_EXPECTED_FD },</div><div class='ctx'> 	[IFLA_XDP_FD]		= { .type = NLA_S32 },</div><div class='add'>+	[IFLA_XDP_EXPECTED_FD]	= { .type = NLA_S32 },</div><div class='ctx'> 	[IFLA_XDP_ATTACHED]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_XDP_FLAGS]	= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_XDP_PROG_ID]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nla)</div><div class='add'>+static struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nla,</div><div class='add'>+						  int *ops_srcu_index)</div><div class='ctx'> {</div><div class='del'>-	const struct rtnl_link_ops *ops = NULL;</div><div class='ctx'> 	struct nlattr *linfo[IFLA_INFO_MAX + 1];</div><div class='add'>+	struct rtnl_link_ops *ops = NULL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(linfo, IFLA_INFO_MAX, nla,</div><div class='del'>-			     ifla_info_policy, NULL) &lt; 0)</div><div class='add'>+	if (nla_parse_nested_deprecated(linfo, IFLA_INFO_MAX, nla, ifla_info_policy, NULL) &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (linfo[IFLA_INFO_KIND]) {</div><div class='ctx'> 		char kind[MODULE_NAME_LEN];</div><div class='ctx'> </div><div class='del'>-		nla_strlcpy(kind, linfo[IFLA_INFO_KIND], sizeof(kind));</div><div class='del'>-		ops = rtnl_link_ops_get(kind);</div><div class='add'>+		nla_strscpy(kind, linfo[IFLA_INFO_KIND], sizeof(kind));</div><div class='add'>+		ops = rtnl_link_ops_get(kind, ops_srcu_index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ops;</div><div class='hunk'>@@ -1819,6 +2338,13 @@ static bool link_master_filtered(struct net_device *dev, int master_idx)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	master = netdev_master_upper_dev_get(dev);</div><div class='add'>+</div><div class='add'>+	/* 0 is already used to denote IFLA_MASTER wasn't passed, therefore need</div><div class='add'>+	 * another invalid value for ifindex to denote "no master".</div><div class='add'>+	 */</div><div class='add'>+	if (master_idx == -1)</div><div class='add'>+		return !!master;</div><div class='add'>+</div><div class='ctx'> 	if (!master || master-&gt;ifindex != master_idx)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -1845,7 +2371,15 @@ static bool link_dump_filtered(struct net_device *dev,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net *get_target_net(struct sock *sk, int netnsid)</div><div class='add'>+/**</div><div class='add'>+ * rtnl_get_net_ns_capable - Get netns if sufficiently privileged.</div><div class='add'>+ * @sk: netlink socket</div><div class='add'>+ * @netnsid: network namespace identifier</div><div class='add'>+ *</div><div class='add'>+ * Returns the network namespace identified by netnsid on success or an error</div><div class='add'>+ * pointer on failure.</div><div class='add'>+ */</div><div class='add'>+struct net *rtnl_get_net_ns_capable(struct sock *sk, int netnsid)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> </div><div class='hunk'>@@ -1862,26 +2396,37 @@ static struct net *get_target_net(struct sock *sk, int netnsid)</div><div class='ctx'> 	}</div><div class='ctx'> 	return net;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(rtnl_get_net_ns_capable);</div><div class='ctx'> </div><div class='del'>-static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+static int rtnl_valid_dump_ifinfo_req(const struct nlmsghdr *nlh,</div><div class='add'>+				      bool strict_check, struct nlattr **tb,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct net *tgt_net = net;</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx = 0, s_idx;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct nlattr *tb[IFLA_MAX+1];</div><div class='del'>-	u32 ext_filter_mask = 0;</div><div class='del'>-	const struct rtnl_link_ops *kind_ops = NULL;</div><div class='del'>-	unsigned int flags = NLM_F_MULTI;</div><div class='del'>-	int master_idx = 0;</div><div class='del'>-	int netnsid = -1;</div><div class='del'>-	int err;</div><div class='ctx'> 	int hdrlen;</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = cb-&gt;args[1];</div><div class='add'>+	if (strict_check) {</div><div class='add'>+		struct ifinfomsg *ifm;</div><div class='add'>+</div><div class='add'>+		ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+		if (!ifm) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid header for link dump");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ifm-&gt;__ifi_pad || ifm-&gt;ifi_type || ifm-&gt;ifi_flags ||</div><div class='add'>+		    ifm-&gt;ifi_change) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid values in header for link dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (ifm-&gt;ifi_index) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Filter by device index not supported for link dumps");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb,</div><div class='add'>+						     IFLA_MAX, ifla_policy,</div><div class='add'>+						     extack);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* A hack to preserve kernel&lt;-&gt;userspace interface.</div><div class='ctx'> 	 * The correct header is ifinfomsg. It is consistent with rtnl_getlink.</div><div class='hunk'>@@ -1890,80 +2435,131 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	 * We can detect the old iproute2. Even including the IFLA_EXT_MASK</div><div class='ctx'> 	 * attribute, its netlink message is shorter than struct ifinfomsg.</div><div class='ctx'> 	 */</div><div class='del'>-	hdrlen = nlmsg_len(cb-&gt;nlh) &lt; sizeof(struct ifinfomsg) ?</div><div class='add'>+	hdrlen = nlmsg_len(nlh) &lt; sizeof(struct ifinfomsg) ?</div><div class='ctx'> 		 sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_parse(cb-&gt;nlh, hdrlen, tb, IFLA_MAX,</div><div class='del'>-			ifla_policy, NULL) &gt;= 0) {</div><div class='del'>-		if (tb[IFLA_IF_NETNSID]) {</div><div class='del'>-			netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);</div><div class='del'>-			tgt_net = get_target_net(skb-&gt;sk, netnsid);</div><div class='del'>-			if (IS_ERR(tgt_net))</div><div class='del'>-				return PTR_ERR(tgt_net);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tb[IFLA_EXT_MASK])</div><div class='del'>-			ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);</div><div class='add'>+	return nlmsg_parse_deprecated(nlh, hdrlen, tb, IFLA_MAX, ifla_policy,</div><div class='add'>+				      extack);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (tb[IFLA_MASTER])</div><div class='del'>-			master_idx = nla_get_u32(tb[IFLA_MASTER]);</div><div class='add'>+static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct rtnl_link_ops *kind_ops = NULL;</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	unsigned int flags = NLM_F_MULTI;</div><div class='add'>+	struct nlattr *tb[IFLA_MAX+1];</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct net *tgt_net = net;</div><div class='add'>+	u32 ext_filter_mask = 0;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ops_srcu_index;</div><div class='add'>+	int master_idx = 0;</div><div class='add'>+	int netnsid = -1;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-		if (tb[IFLA_LINKINFO])</div><div class='del'>-			kind_ops = linkinfo_to_kind_ops(tb[IFLA_LINKINFO]);</div><div class='add'>+	err = rtnl_valid_dump_ifinfo_req(nlh, cb-&gt;strict_check, tb, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (cb-&gt;strict_check)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		if (master_idx || kind_ops)</div><div class='del'>-			flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+		goto walk_entries;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;tgt_net-&gt;dev_index_head[h];</div><div class='del'>-		hlist_for_each_entry(dev, head, index_hlist) {</div><div class='del'>-			if (link_dump_filtered(dev, master_idx, kind_ops))</div><div class='del'>-				goto cont;</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			err = rtnl_fill_ifinfo(skb, dev, net,</div><div class='del'>-					       RTM_NEWLINK,</div><div class='del'>-					       NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					       cb-&gt;nlh-&gt;nlmsg_seq, 0,</div><div class='del'>-					       flags,</div><div class='del'>-					       ext_filter_mask, 0, NULL, 0,</div><div class='del'>-					       netnsid);</div><div class='del'>-</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				if (likely(skb-&gt;len))</div><div class='del'>-					goto out;</div><div class='add'>+	for (i = 0; i &lt;= IFLA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-				goto out_err;</div><div class='add'>+		/* new attributes should only be added with strict checking */</div><div class='add'>+		switch (i) {</div><div class='add'>+		case IFLA_TARGET_NETNSID:</div><div class='add'>+			netnsid = nla_get_s32(tb[i]);</div><div class='add'>+			tgt_net = rtnl_get_net_ns_capable(skb-&gt;sk, netnsid);</div><div class='add'>+			if (IS_ERR(tgt_net)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid target network namespace id");</div><div class='add'>+				err = PTR_ERR(tgt_net);</div><div class='add'>+				netnsid = -1;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_EXT_MASK:</div><div class='add'>+			ext_filter_mask = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_MASTER:</div><div class='add'>+			master_idx = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case IFLA_LINKINFO:</div><div class='add'>+			kind_ops = linkinfo_to_kind_ops(tb[i], &amp;ops_srcu_index);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (cb-&gt;strict_check) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Unsupported attribute in link dump request");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	err = skb-&gt;len;</div><div class='del'>-out_err:</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;seq = net-&gt;dev_base_seq;</div><div class='add'>+</div><div class='add'>+	if (master_idx || kind_ops)</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+</div><div class='add'>+walk_entries:</div><div class='add'>+	err = 0;</div><div class='add'>+	for_each_netdev_dump(tgt_net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		if (link_dump_filtered(dev, master_idx, kind_ops))</div><div class='add'>+			continue;</div><div class='add'>+		err = rtnl_fill_ifinfo(skb, dev, net, RTM_NEWLINK,</div><div class='add'>+				       NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+				       nlh-&gt;nlmsg_seq, 0, flags,</div><div class='add'>+				       ext_filter_mask, 0, NULL, 0,</div><div class='add'>+				       netnsid, GFP_KERNEL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	cb-&gt;seq = tgt_net-&gt;dev_base_seq;</div><div class='ctx'> 	nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	if (kind_ops)</div><div class='add'>+		rtnl_link_ops_put(kind_ops, ops_srcu_index);</div><div class='ctx'> 	if (netnsid &gt;= 0)</div><div class='ctx'> 		put_net(tgt_net);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rtnl_nla_parse_ifla(struct nlattr **tb, const struct nlattr *head, int len,</div><div class='del'>-			struct netlink_ext_ack *exterr)</div><div class='add'>+int rtnl_nla_parse_ifinfomsg(struct nlattr **tb, const struct nlattr *nla_peer,</div><div class='add'>+			     struct netlink_ext_ack *exterr)</div><div class='ctx'> {</div><div class='del'>-	return nla_parse(tb, IFLA_MAX, head, len, ifla_policy, exterr);</div><div class='add'>+	const struct ifinfomsg *ifmp;</div><div class='add'>+	const struct nlattr *attrs;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	ifmp = nla_data(nla_peer);</div><div class='add'>+	attrs = nla_data(nla_peer) + sizeof(struct ifinfomsg);</div><div class='add'>+	len = nla_len(nla_peer) - sizeof(struct ifinfomsg);</div><div class='add'>+</div><div class='add'>+	if (ifmp-&gt;ifi_index &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(exterr, nla_peer,</div><div class='add'>+				    "ifindex can't be negative");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nla_parse_deprecated(tb, IFLA_MAX, attrs, len, ifla_policy,</div><div class='add'>+				    exterr);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(rtnl_nla_parse_ifla);</div><div class='add'>+EXPORT_SYMBOL(rtnl_nla_parse_ifinfomsg);</div><div class='ctx'> </div><div class='del'>-struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])</div><div class='add'>+static struct net *rtnl_link_get_net_ifla(struct nlattr *tb[])</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='add'>+	struct net *net = NULL;</div><div class='add'>+</div><div class='ctx'> 	/* Examine the link attributes and figure out which</div><div class='ctx'> 	 * network namespace we are talking about.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1971,8 +2567,17 @@ struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])</div><div class='ctx'> 		net = get_net_ns_by_pid(nla_get_u32(tb[IFLA_NET_NS_PID]));</div><div class='ctx'> 	else if (tb[IFLA_NET_NS_FD])</div><div class='ctx'> 		net = get_net_ns_by_fd(nla_get_u32(tb[IFLA_NET_NS_FD]));</div><div class='del'>-	else</div><div class='add'>+</div><div class='add'>+	return net;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	struct net *net = rtnl_link_get_net_ifla(tb);</div><div class='add'>+</div><div class='add'>+	if (!net)</div><div class='ctx'> 		net = get_net(src_net);</div><div class='add'>+</div><div class='ctx'> 	return net;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_link_get_net);</div><div class='hunk'>@@ -1982,7 +2587,7 @@ EXPORT_SYMBOL(rtnl_link_get_net);</div><div class='ctx'>  *</div><div class='ctx'>  * 1. IFLA_NET_NS_PID</div><div class='ctx'>  * 2. IFLA_NET_NS_FD</div><div class='del'>- * 3. IFLA_IF_NETNSID</div><div class='add'>+ * 3. IFLA_TARGET_NETNSID</div><div class='ctx'>  */</div><div class='ctx'> static struct net *rtnl_link_get_net_by_nlattr(struct net *src_net,</div><div class='ctx'> 					       struct nlattr *tb[])</div><div class='hunk'>@@ -1992,10 +2597,10 @@ static struct net *rtnl_link_get_net_by_nlattr(struct net *src_net,</div><div class='ctx'> 	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD])</div><div class='ctx'> 		return rtnl_link_get_net(src_net, tb);</div><div class='ctx'> </div><div class='del'>-	if (!tb[IFLA_IF_NETNSID])</div><div class='add'>+	if (!tb[IFLA_TARGET_NETNSID])</div><div class='ctx'> 		return get_net(src_net);</div><div class='ctx'> </div><div class='del'>-	net = get_net_ns_by_id(src_net, nla_get_u32(tb[IFLA_IF_NETNSID]));</div><div class='add'>+	net = get_net_ns_by_id(src_net, nla_get_u32(tb[IFLA_TARGET_NETNSID]));</div><div class='ctx'> 	if (!net)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='hunk'>@@ -2036,13 +2641,13 @@ static int rtnl_ensure_unique_netns(struct nlattr *tb[],</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IF_NETNSID] &amp;&amp; (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]))</div><div class='add'>+	if (tb[IFLA_TARGET_NETNSID] &amp;&amp; (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]))</div><div class='ctx'> 		goto invalid_attr;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_NET_NS_PID] &amp;&amp; (tb[IFLA_IF_NETNSID] || tb[IFLA_NET_NS_FD]))</div><div class='add'>+	if (tb[IFLA_NET_NS_PID] &amp;&amp; (tb[IFLA_TARGET_NETNSID] || tb[IFLA_NET_NS_FD]))</div><div class='ctx'> 		goto invalid_attr;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_NET_NS_FD] &amp;&amp; (tb[IFLA_IF_NETNSID] || tb[IFLA_NET_NS_PID]))</div><div class='add'>+	if (tb[IFLA_NET_NS_FD] &amp;&amp; (tb[IFLA_TARGET_NETNSID] || tb[IFLA_NET_NS_PID]))</div><div class='ctx'> 		goto invalid_attr;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2052,16 +2657,59 @@ invalid_attr:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])</div><div class='add'>+static	int rtnl_set_vf_rate(struct net_device *dev, int vf, int min_tx_rate,</div><div class='add'>+			     int max_tx_rate)</div><div class='ctx'> {</div><div class='del'>-	if (dev) {</div><div class='del'>-		if (tb[IFLA_ADDRESS] &amp;&amp;</div><div class='del'>-		    nla_len(tb[IFLA_ADDRESS]) &lt; dev-&gt;addr_len)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='del'>-		if (tb[IFLA_BROADCAST] &amp;&amp;</div><div class='del'>-		    nla_len(tb[IFLA_BROADCAST]) &lt; dev-&gt;addr_len)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (!ops-&gt;ndo_set_vf_rate)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (max_tx_rate &amp;&amp; max_tx_rate &lt; min_tx_rate)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;ndo_set_vf_rate(dev, vf, min_tx_rate, max_tx_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (tb[IFLA_ADDRESS] &amp;&amp;</div><div class='add'>+	    nla_len(tb[IFLA_ADDRESS]) &lt; dev-&gt;addr_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_BROADCAST] &amp;&amp;</div><div class='add'>+	    nla_len(tb[IFLA_BROADCAST]) &lt; dev-&gt;addr_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GSO_MAX_SIZE] &amp;&amp;</div><div class='add'>+	    nla_get_u32(tb[IFLA_GSO_MAX_SIZE]) &gt; dev-&gt;tso_max_size) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "too big gso_max_size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GSO_MAX_SEGS] &amp;&amp;</div><div class='add'>+	    (nla_get_u32(tb[IFLA_GSO_MAX_SEGS]) &gt; GSO_MAX_SEGS ||</div><div class='add'>+	     nla_get_u32(tb[IFLA_GSO_MAX_SEGS]) &gt; dev-&gt;tso_max_segs)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "too big gso_max_segs");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GRO_MAX_SIZE] &amp;&amp;</div><div class='add'>+	    nla_get_u32(tb[IFLA_GRO_MAX_SIZE]) &gt; GRO_MAX_SIZE) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "too big gro_max_size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GSO_IPV4_MAX_SIZE] &amp;&amp;</div><div class='add'>+	    nla_get_u32(tb[IFLA_GSO_IPV4_MAX_SIZE]) &gt; dev-&gt;tso_max_size) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "too big gso_ipv4_max_size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GRO_IPV4_MAX_SIZE] &amp;&amp;</div><div class='add'>+	    nla_get_u32(tb[IFLA_GRO_IPV4_MAX_SIZE]) &gt; GRO_MAX_SIZE) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "too big gro_ipv4_max_size");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_AF_SPEC]) {</div><div class='hunk'>@@ -2069,29 +2717,24 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])</div><div class='ctx'> 		int rem, err;</div><div class='ctx'> </div><div class='ctx'> 		nla_for_each_nested(af, tb[IFLA_AF_SPEC], rem) {</div><div class='del'>-			const struct rtnl_af_ops *af_ops;</div><div class='add'>+			struct rtnl_af_ops *af_ops;</div><div class='add'>+			int af_ops_srcu_index;</div><div class='ctx'> </div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			af_ops = rtnl_af_lookup(nla_type(af));</div><div class='del'>-			if (!af_ops) {</div><div class='del'>-				rcu_read_unlock();</div><div class='add'>+			af_ops = rtnl_af_lookup(nla_type(af), &amp;af_ops_srcu_index);</div><div class='add'>+			if (!af_ops)</div><div class='ctx'> 				return -EAFNOSUPPORT;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			if (!af_ops-&gt;set_link_af) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				return -EOPNOTSUPP;</div><div class='del'>-			}</div><div class='add'>+			if (!af_ops-&gt;set_link_af)</div><div class='add'>+				err = -EOPNOTSUPP;</div><div class='add'>+			else if (af_ops-&gt;validate_link_af)</div><div class='add'>+				err = af_ops-&gt;validate_link_af(dev, af, extack);</div><div class='add'>+			else</div><div class='add'>+				err = 0;</div><div class='ctx'> </div><div class='del'>-			if (af_ops-&gt;validate_link_af) {</div><div class='del'>-				err = af_ops-&gt;validate_link_af(dev, af);</div><div class='del'>-				if (err &lt; 0) {</div><div class='del'>-					rcu_read_unlock();</div><div class='del'>-					return err;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			rtnl_af_put(af_ops, af_ops_srcu_index);</div><div class='ctx'> </div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2122,6 +2765,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_MAC]) {</div><div class='ctx'> 		struct ifla_vf_mac *ivm = nla_data(tb[IFLA_VF_MAC]);</div><div class='ctx'> </div><div class='add'>+		if (ivm-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_mac)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_mac(dev, ivm-&gt;vf,</div><div class='hunk'>@@ -2133,6 +2778,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_VLAN]) {</div><div class='ctx'> 		struct ifla_vf_vlan *ivv = nla_data(tb[IFLA_VF_VLAN]);</div><div class='ctx'> </div><div class='add'>+		if (ivv-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_vlan)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_vlan(dev, ivv-&gt;vf, ivv-&gt;vlan,</div><div class='hunk'>@@ -2153,7 +2800,7 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> </div><div class='ctx'> 		nla_for_each_nested(attr, tb[IFLA_VF_VLAN_LIST], rem) {</div><div class='ctx'> 			if (nla_type(attr) != IFLA_VF_VLAN_INFO ||</div><div class='del'>-			    nla_len(attr) &lt; NLA_HDRLEN) {</div><div class='add'>+			    nla_len(attr) &lt; sizeof(struct ifla_vf_vlan_info)) {</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (len &gt;= MAX_VLAN_LIST_LEN)</div><div class='hunk'>@@ -2165,6 +2812,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 		if (len == 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='add'>+		if (ivvl[0]-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = ops-&gt;ndo_set_vf_vlan(dev, ivvl[0]-&gt;vf, ivvl[0]-&gt;vlan,</div><div class='ctx'> 					   ivvl[0]-&gt;qos, ivvl[0]-&gt;vlan_proto);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -2175,17 +2824,16 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 		struct ifla_vf_tx_rate *ivt = nla_data(tb[IFLA_VF_TX_RATE]);</div><div class='ctx'> 		struct ifla_vf_info ivf;</div><div class='ctx'> </div><div class='add'>+		if (ivt-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_get_vf_config)</div><div class='ctx'> 			err = ops-&gt;ndo_get_vf_config(dev, ivt-&gt;vf, &amp;ivf);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		if (ops-&gt;ndo_set_vf_rate)</div><div class='del'>-			err = ops-&gt;ndo_set_vf_rate(dev, ivt-&gt;vf,</div><div class='del'>-						   ivf.min_tx_rate,</div><div class='del'>-						   ivt-&gt;rate);</div><div class='add'>+		err = rtnl_set_vf_rate(dev, ivt-&gt;vf,</div><div class='add'>+				       ivf.min_tx_rate, ivt-&gt;rate);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2193,11 +2841,11 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_RATE]) {</div><div class='ctx'> 		struct ifla_vf_rate *ivt = nla_data(tb[IFLA_VF_RATE]);</div><div class='ctx'> </div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		if (ops-&gt;ndo_set_vf_rate)</div><div class='del'>-			err = ops-&gt;ndo_set_vf_rate(dev, ivt-&gt;vf,</div><div class='del'>-						   ivt-&gt;min_tx_rate,</div><div class='del'>-						   ivt-&gt;max_tx_rate);</div><div class='add'>+		if (ivt-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = rtnl_set_vf_rate(dev, ivt-&gt;vf,</div><div class='add'>+				       ivt-&gt;min_tx_rate, ivt-&gt;max_tx_rate);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2205,6 +2853,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_SPOOFCHK]) {</div><div class='ctx'> 		struct ifla_vf_spoofchk *ivs = nla_data(tb[IFLA_VF_SPOOFCHK]);</div><div class='ctx'> </div><div class='add'>+		if (ivs-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_spoofchk)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_spoofchk(dev, ivs-&gt;vf,</div><div class='hunk'>@@ -2216,6 +2866,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_LINK_STATE]) {</div><div class='ctx'> 		struct ifla_vf_link_state *ivl = nla_data(tb[IFLA_VF_LINK_STATE]);</div><div class='ctx'> </div><div class='add'>+		if (ivl-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_link_state)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_link_state(dev, ivl-&gt;vf,</div><div class='hunk'>@@ -2229,6 +2881,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> </div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		ivrssq_en = nla_data(tb[IFLA_VF_RSS_QUERY_EN]);</div><div class='add'>+		if (ivrssq_en-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_rss_query_en)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_rss_query_en(dev, ivrssq_en-&gt;vf,</div><div class='ctx'> 							   ivrssq_en-&gt;setting);</div><div class='hunk'>@@ -2239,6 +2893,8 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_TRUST]) {</div><div class='ctx'> 		struct ifla_vf_trust *ivt = nla_data(tb[IFLA_VF_TRUST]);</div><div class='ctx'> </div><div class='add'>+		if (ivt-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		if (ops-&gt;ndo_set_vf_trust)</div><div class='ctx'> 			err = ops-&gt;ndo_set_vf_trust(dev, ivt-&gt;vf, ivt-&gt;setting);</div><div class='hunk'>@@ -2249,15 +2905,18 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)</div><div class='ctx'> 	if (tb[IFLA_VF_IB_NODE_GUID]) {</div><div class='ctx'> 		struct ifla_vf_guid *ivt = nla_data(tb[IFLA_VF_IB_NODE_GUID]);</div><div class='ctx'> </div><div class='add'>+		if (ivt-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		if (!ops-&gt;ndo_set_vf_guid)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 		return handle_vf_guid(dev, ivt, IFLA_VF_IB_NODE_GUID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_VF_IB_PORT_GUID]) {</div><div class='ctx'> 		struct ifla_vf_guid *ivt = nla_data(tb[IFLA_VF_IB_PORT_GUID]);</div><div class='ctx'> </div><div class='add'>+		if (ivt-&gt;vf &gt;= INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		if (!ops-&gt;ndo_set_vf_guid)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -2274,12 +2933,19 @@ static int do_set_master(struct net_device *dev, int ifindex,</div><div class='ctx'> 	const struct net_device_ops *ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Release the lower lock, the upper is responsible for locking</div><div class='add'>+	 * the lower if needed. None of the existing upper devices</div><div class='add'>+	 * use netdev instance lock, so don't grab it.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	if (upper_dev) {</div><div class='ctx'> 		if (upper_dev-&gt;ifindex == ifindex)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		ops = upper_dev-&gt;netdev_ops;</div><div class='ctx'> 		if (ops-&gt;ndo_del_slave) {</div><div class='add'>+			netdev_unlock_ops(dev);</div><div class='ctx'> 			err = ops-&gt;ndo_del_slave(upper_dev, dev);</div><div class='add'>+			netdev_lock_ops(dev);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2293,7 +2959,9 @@ static int do_set_master(struct net_device *dev, int ifindex,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		ops = upper_dev-&gt;netdev_ops;</div><div class='ctx'> 		if (ops-&gt;ndo_add_slave) {</div><div class='add'>+			netdev_unlock_ops(dev);</div><div class='ctx'> 			err = ops-&gt;ndo_add_slave(upper_dev, dev, extack);</div><div class='add'>+			netdev_lock_ops(dev);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2303,36 +2971,102 @@ static int do_set_master(struct net_device *dev, int ifindex,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nla_policy ifla_proto_down_reason_policy[IFLA_PROTO_DOWN_REASON_VALUE + 1] = {</div><div class='add'>+	[IFLA_PROTO_DOWN_REASON_MASK]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_PROTO_DOWN_REASON_VALUE]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int do_set_proto_down(struct net_device *dev,</div><div class='add'>+			     struct nlattr *nl_proto_down,</div><div class='add'>+			     struct nlattr *nl_proto_down_reason,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *pdreason[IFLA_PROTO_DOWN_REASON_MAX + 1];</div><div class='add'>+	unsigned long mask = 0;</div><div class='add'>+	u32 value;</div><div class='add'>+	bool proto_down;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;change_proto_down) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,  "Protodown not supported by device");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nl_proto_down_reason) {</div><div class='add'>+		err = nla_parse_nested_deprecated(pdreason,</div><div class='add'>+						  IFLA_PROTO_DOWN_REASON_MAX,</div><div class='add'>+						  nl_proto_down_reason,</div><div class='add'>+						  ifla_proto_down_reason_policy,</div><div class='add'>+						  NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (!pdreason[IFLA_PROTO_DOWN_REASON_VALUE]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid protodown reason value");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		value = nla_get_u32(pdreason[IFLA_PROTO_DOWN_REASON_VALUE]);</div><div class='add'>+</div><div class='add'>+		if (pdreason[IFLA_PROTO_DOWN_REASON_MASK])</div><div class='add'>+			mask = nla_get_u32(pdreason[IFLA_PROTO_DOWN_REASON_MASK]);</div><div class='add'>+</div><div class='add'>+		netdev_change_proto_down_reason_locked(dev, mask, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nl_proto_down) {</div><div class='add'>+		proto_down = nla_get_u8(nl_proto_down);</div><div class='add'>+</div><div class='add'>+		/* Don't turn off protodown if there are active reasons */</div><div class='add'>+		if (!proto_down &amp;&amp; dev-&gt;proto_down_reason) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Cannot clear protodown, active reasons");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		err = netif_change_proto_down(dev, proto_down);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define DO_SETLINK_MODIFIED	0x01</div><div class='ctx'> /* notify flag means notify + modified. */</div><div class='ctx'> #define DO_SETLINK_NOTIFY	0x03</div><div class='del'>-static int do_setlink(const struct sk_buff *skb,</div><div class='del'>-		      struct net_device *dev, struct ifinfomsg *ifm,</div><div class='add'>+static int do_setlink(const struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		      struct net *tgt_net, struct ifinfomsg *ifm,</div><div class='ctx'> 		      struct netlink_ext_ack *extack,</div><div class='del'>-		      struct nlattr **tb, char *ifname, int status)</div><div class='add'>+		      struct nlattr **tb, int status)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='add'>+	char ifname[IFNAMSIZ];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = validate_linkmsg(dev, tb);</div><div class='add'>+	err = validate_linkmsg(dev, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD] || tb[IFLA_IF_NETNSID]) {</div><div class='del'>-		struct net *net = rtnl_link_get_net_capable(skb, dev_net(dev),</div><div class='del'>-							    tb, CAP_NET_ADMIN);</div><div class='del'>-		if (IS_ERR(net)) {</div><div class='del'>-			err = PTR_ERR(net);</div><div class='del'>-			goto errout;</div><div class='del'>-		}</div><div class='add'>+	if (tb[IFLA_IFNAME])</div><div class='add'>+		nla_strscpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+	else</div><div class='add'>+		ifname[0] = '\0';</div><div class='ctx'> </div><div class='del'>-		err = dev_change_net_namespace(dev, net, ifname);</div><div class='del'>-		put_net(net);</div><div class='add'>+	if (!net_eq(tgt_net, dev_net(dev))) {</div><div class='add'>+		const char *pat = ifname[0] ? ifname : NULL;</div><div class='add'>+		int new_ifindex;</div><div class='add'>+</div><div class='add'>+		new_ifindex = nla_get_s32_default(tb[IFLA_NEW_IFINDEX], 0);</div><div class='add'>+</div><div class='add'>+		err = __dev_change_net_namespace(dev, tgt_net, pat,</div><div class='add'>+						 new_ifindex, extack);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto errout;</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+</div><div class='ctx'> 	if (tb[IFLA_MAP]) {</div><div class='ctx'> 		struct rtnl_link_ifmap *u_map;</div><div class='ctx'> 		struct ifmap k_map;</div><div class='hunk'>@@ -2363,35 +3097,35 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_ADDRESS]) {</div><div class='del'>-		struct sockaddr *sa;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		len = sizeof(sa_family_t) + max_t(size_t, dev-&gt;addr_len,</div><div class='del'>-						  sizeof(*sa));</div><div class='del'>-		sa = kmalloc(len, GFP_KERNEL);</div><div class='del'>-		if (!sa) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		struct sockaddr_storage ss = { };</div><div class='add'>+</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+		/* dev_addr_sem is an outer lock, enforce proper ordering */</div><div class='add'>+		down_write(&amp;dev_addr_sem);</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+</div><div class='add'>+		ss.ss_family = dev-&gt;type;</div><div class='add'>+		memcpy(ss.__data, nla_data(tb[IFLA_ADDRESS]), dev-&gt;addr_len);</div><div class='add'>+		err = netif_set_mac_address(dev, &amp;ss, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			up_write(&amp;dev_addr_sem);</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		}</div><div class='del'>-		sa-&gt;sa_family = dev-&gt;type;</div><div class='del'>-		memcpy(sa-&gt;sa_data, nla_data(tb[IFLA_ADDRESS]),</div><div class='del'>-		       dev-&gt;addr_len);</div><div class='del'>-		err = dev_set_mac_address(dev, sa);</div><div class='del'>-		kfree(sa);</div><div class='del'>-		if (err)</div><div class='del'>-			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='add'>+</div><div class='add'>+		up_write(&amp;dev_addr_sem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_MTU]) {</div><div class='del'>-		err = dev_set_mtu_ext(dev, nla_get_u32(tb[IFLA_MTU]), extack);</div><div class='add'>+		err = netif_set_mtu_ext(dev, nla_get_u32(tb[IFLA_MTU]), extack);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_GROUP]) {</div><div class='del'>-		dev_set_group(dev, nla_get_u32(tb[IFLA_GROUP]));</div><div class='add'>+		netif_set_group(dev, nla_get_u32(tb[IFLA_GROUP]));</div><div class='ctx'> 		status |= DO_SETLINK_NOTIFY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2401,15 +3135,15 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	 * requested.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ifm-&gt;ifi_index &gt; 0 &amp;&amp; ifname[0]) {</div><div class='del'>-		err = dev_change_name(dev, ifname);</div><div class='add'>+		err = netif_change_name(dev, ifname);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_IFALIAS]) {</div><div class='del'>-		err = dev_set_alias(dev, nla_data(tb[IFLA_IFALIAS]),</div><div class='del'>-				    nla_len(tb[IFLA_IFALIAS]));</div><div class='add'>+		err = netif_set_alias(dev, nla_data(tb[IFLA_IFALIAS]),</div><div class='add'>+				      nla_len(tb[IFLA_IFALIAS]));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_NOTIFY;</div><div class='hunk'>@@ -2421,7 +3155,8 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifm-&gt;ifi_flags || ifm-&gt;ifi_change) {</div><div class='del'>-		err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm));</div><div class='add'>+		err = netif_change_flags(dev, rtnl_dev_combine_flags(dev, ifm),</div><div class='add'>+					 extack);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2434,7 +3169,7 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_CARRIER]) {</div><div class='del'>-		err = dev_change_carrier(dev, nla_get_u8(tb[IFLA_CARRIER]));</div><div class='add'>+		err = netif_change_carrier(dev, nla_get_u8(tb[IFLA_CARRIER]));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='hunk'>@@ -2443,7 +3178,7 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	if (tb[IFLA_TXQLEN]) {</div><div class='ctx'> 		unsigned int value = nla_get_u32(tb[IFLA_TXQLEN]);</div><div class='ctx'> </div><div class='del'>-		err = dev_change_tx_queue_len(dev, value);</div><div class='add'>+		err = netif_change_tx_queue_len(dev, value);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_MODIFIED;</div><div class='hunk'>@@ -2452,11 +3187,6 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	if (tb[IFLA_GSO_MAX_SIZE]) {</div><div class='ctx'> 		u32 max_size = nla_get_u32(tb[IFLA_GSO_MAX_SIZE]);</div><div class='ctx'> </div><div class='del'>-		if (max_size &gt; GSO_MAX_SIZE) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto errout;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (dev-&gt;gso_max_size ^ max_size) {</div><div class='ctx'> 			netif_set_gso_max_size(dev, max_size);</div><div class='ctx'> 			status |= DO_SETLINK_MODIFIED;</div><div class='hunk'>@@ -2466,13 +3196,35 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	if (tb[IFLA_GSO_MAX_SEGS]) {</div><div class='ctx'> 		u32 max_segs = nla_get_u32(tb[IFLA_GSO_MAX_SEGS]);</div><div class='ctx'> </div><div class='del'>-		if (max_segs &gt; GSO_MAX_SEGS) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto errout;</div><div class='add'>+		if (dev-&gt;gso_max_segs ^ max_segs) {</div><div class='add'>+			netif_set_gso_max_segs(dev, max_segs);</div><div class='add'>+			status |= DO_SETLINK_MODIFIED;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;gso_max_segs ^ max_segs) {</div><div class='del'>-			dev-&gt;gso_max_segs = max_segs;</div><div class='add'>+	if (tb[IFLA_GRO_MAX_SIZE]) {</div><div class='add'>+		u32 gro_max_size = nla_get_u32(tb[IFLA_GRO_MAX_SIZE]);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;gro_max_size ^ gro_max_size) {</div><div class='add'>+			netif_set_gro_max_size(dev, gro_max_size);</div><div class='add'>+			status |= DO_SETLINK_MODIFIED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GSO_IPV4_MAX_SIZE]) {</div><div class='add'>+		u32 max_size = nla_get_u32(tb[IFLA_GSO_IPV4_MAX_SIZE]);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;gso_ipv4_max_size ^ max_size) {</div><div class='add'>+			netif_set_gso_ipv4_max_size(dev, max_size);</div><div class='add'>+			status |= DO_SETLINK_MODIFIED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_GRO_IPV4_MAX_SIZE]) {</div><div class='add'>+		u32 gro_max_size = nla_get_u32(tb[IFLA_GRO_IPV4_MAX_SIZE]);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;gro_ipv4_max_size ^ gro_max_size) {</div><div class='add'>+			netif_set_gro_ipv4_max_size(dev, gro_max_size);</div><div class='ctx'> 			status |= DO_SETLINK_MODIFIED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2483,11 +3235,9 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	if (tb[IFLA_LINKMODE]) {</div><div class='ctx'> 		unsigned char value = nla_get_u8(tb[IFLA_LINKMODE]);</div><div class='ctx'> </div><div class='del'>-		write_lock_bh(&amp;dev_base_lock);</div><div class='ctx'> 		if (dev-&gt;link_mode ^ value)</div><div class='ctx'> 			status |= DO_SETLINK_NOTIFY;</div><div class='del'>-		dev-&gt;link_mode = value;</div><div class='del'>-		write_unlock_bh(&amp;dev_base_lock);</div><div class='add'>+		WRITE_ONCE(dev-&gt;link_mode, value);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_VFINFO_LIST]) {</div><div class='hunk'>@@ -2501,8 +3251,10 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto errout;</div><div class='ctx'> 			}</div><div class='del'>-			err = nla_parse_nested(vfinfo, IFLA_VF_MAX, attr,</div><div class='del'>-					       ifla_vf_policy, NULL);</div><div class='add'>+			err = nla_parse_nested_deprecated(vfinfo, IFLA_VF_MAX,</div><div class='add'>+							  attr,</div><div class='add'>+							  ifla_vf_policy,</div><div class='add'>+							  NULL);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto errout;</div><div class='ctx'> 			err = do_setvfinfo(dev, vfinfo);</div><div class='hunk'>@@ -2529,8 +3281,10 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto errout;</div><div class='ctx'> 			}</div><div class='del'>-			err = nla_parse_nested(port, IFLA_PORT_MAX, attr,</div><div class='del'>-					       ifla_port_policy, NULL);</div><div class='add'>+			err = nla_parse_nested_deprecated(port, IFLA_PORT_MAX,</div><div class='add'>+							  attr,</div><div class='add'>+							  ifla_port_policy,</div><div class='add'>+							  NULL);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto errout;</div><div class='ctx'> 			if (!port[IFLA_PORT_VF]) {</div><div class='hunk'>@@ -2549,9 +3303,9 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 	if (tb[IFLA_PORT_SELF]) {</div><div class='ctx'> 		struct nlattr *port[IFLA_PORT_MAX+1];</div><div class='ctx'> </div><div class='del'>-		err = nla_parse_nested(port, IFLA_PORT_MAX,</div><div class='del'>-				       tb[IFLA_PORT_SELF], ifla_port_policy,</div><div class='del'>-				       NULL);</div><div class='add'>+		err = nla_parse_nested_deprecated(port, IFLA_PORT_MAX,</div><div class='add'>+						  tb[IFLA_PORT_SELF],</div><div class='add'>+						  ifla_port_policy, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -2568,27 +3322,29 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 		int rem;</div><div class='ctx'> </div><div class='ctx'> 		nla_for_each_nested(af, tb[IFLA_AF_SPEC], rem) {</div><div class='del'>-			const struct rtnl_af_ops *af_ops;</div><div class='add'>+			struct rtnl_af_ops *af_ops;</div><div class='add'>+			int af_ops_srcu_index;</div><div class='ctx'> </div><div class='del'>-			rcu_read_lock();</div><div class='add'>+			af_ops = rtnl_af_lookup(nla_type(af), &amp;af_ops_srcu_index);</div><div class='add'>+			if (!af_ops) {</div><div class='add'>+				err = -EAFNOSUPPORT;</div><div class='add'>+				goto errout;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			BUG_ON(!(af_ops = rtnl_af_lookup(nla_type(af))));</div><div class='add'>+			err = af_ops-&gt;set_link_af(dev, af, extack);</div><div class='add'>+			rtnl_af_put(af_ops, af_ops_srcu_index);</div><div class='ctx'> </div><div class='del'>-			err = af_ops-&gt;set_link_af(dev, af);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				rcu_read_unlock();</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				goto errout;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			rcu_read_unlock();</div><div class='ctx'> 			status |= DO_SETLINK_NOTIFY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_PROTO_DOWN]) {</div><div class='del'>-		err = dev_change_proto_down(dev,</div><div class='del'>-					    nla_get_u8(tb[IFLA_PROTO_DOWN]));</div><div class='add'>+	if (tb[IFLA_PROTO_DOWN] || tb[IFLA_PROTO_DOWN_REASON]) {</div><div class='add'>+		err = do_set_proto_down(dev, tb[IFLA_PROTO_DOWN],</div><div class='add'>+					tb[IFLA_PROTO_DOWN_REASON], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		status |= DO_SETLINK_NOTIFY;</div><div class='hunk'>@@ -2598,8 +3354,9 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 		struct nlattr *xdp[IFLA_XDP_MAX + 1];</div><div class='ctx'> 		u32 xdp_flags = 0;</div><div class='ctx'> </div><div class='del'>-		err = nla_parse_nested(xdp, IFLA_XDP_MAX, tb[IFLA_XDP],</div><div class='del'>-				       ifla_xdp_policy, NULL);</div><div class='add'>+		err = nla_parse_nested_deprecated(xdp, IFLA_XDP_MAX,</div><div class='add'>+						  tb[IFLA_XDP],</div><div class='add'>+						  ifla_xdp_policy, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -2621,8 +3378,20 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (xdp[IFLA_XDP_FD]) {</div><div class='add'>+			int expected_fd = -1;</div><div class='add'>+</div><div class='add'>+			if (xdp_flags &amp; XDP_FLAGS_REPLACE) {</div><div class='add'>+				if (!xdp[IFLA_XDP_EXPECTED_FD]) {</div><div class='add'>+					err = -EINVAL;</div><div class='add'>+					goto errout;</div><div class='add'>+				}</div><div class='add'>+				expected_fd =</div><div class='add'>+					nla_get_s32(xdp[IFLA_XDP_EXPECTED_FD]);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			err = dev_change_xdp_fd(dev, extack,</div><div class='ctx'> 						nla_get_s32(xdp[IFLA_XDP_FD]),</div><div class='add'>+						expected_fd,</div><div class='ctx'> 						xdp_flags);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto errout;</div><div class='hunk'>@@ -2633,28 +3402,46 @@ static int do_setlink(const struct sk_buff *skb,</div><div class='ctx'> errout:</div><div class='ctx'> 	if (status &amp; DO_SETLINK_MODIFIED) {</div><div class='ctx'> 		if ((status &amp; DO_SETLINK_NOTIFY) == DO_SETLINK_NOTIFY)</div><div class='del'>-			netdev_state_change(dev);</div><div class='add'>+			netif_state_change(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			net_warn_ratelimited("A link change request failed with some changes committed already. Interface %s may have been left with an inconsistent configuration, please check.\n",</div><div class='ctx'> 					     dev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *rtnl_dev_get(struct net *net,</div><div class='add'>+				       struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	char ifname[ALTIFNAMSIZ];</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_IFNAME])</div><div class='add'>+		nla_strscpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+	else if (tb[IFLA_ALT_IFNAME])</div><div class='add'>+		nla_strscpy(ifname, tb[IFLA_ALT_IFNAME], ALTIFNAMSIZ);</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return __dev_get_by_name(net, ifname);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct ifinfomsg *ifm = nlmsg_data(nlh);</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct ifinfomsg *ifm;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int err;</div><div class='ctx'> 	struct nlattr *tb[IFLA_MAX+1];</div><div class='del'>-	char ifname[IFNAMSIZ];</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	struct rtnl_nets rtnl_nets;</div><div class='add'>+	struct net *tgt_net;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,</div><div class='add'>+				     ifla_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -2662,26 +3449,32 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IFNAME])</div><div class='del'>-		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='del'>-	else</div><div class='del'>-		ifname[0] = '\0';</div><div class='add'>+	tgt_net = rtnl_link_get_net_capable(skb, net, tb, CAP_NET_ADMIN);</div><div class='add'>+	if (IS_ERR(tgt_net)) {</div><div class='add'>+		err = PTR_ERR(tgt_net);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_nets_init(&amp;rtnl_nets);</div><div class='add'>+	rtnl_nets_add(&amp;rtnl_nets, get_net(net));</div><div class='add'>+	rtnl_nets_add(&amp;rtnl_nets, tgt_net);</div><div class='add'>+</div><div class='add'>+	rtnl_nets_lock(&amp;rtnl_nets);</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='ctx'> 	if (ifm-&gt;ifi_index &gt; 0)</div><div class='ctx'> 		dev = __dev_get_by_index(net, ifm-&gt;ifi_index);</div><div class='del'>-	else if (tb[IFLA_IFNAME])</div><div class='del'>-		dev = __dev_get_by_name(net, ifname);</div><div class='add'>+	else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME])</div><div class='add'>+		dev = rtnl_dev_get(net, tb);</div><div class='ctx'> 	else</div><div class='del'>-		goto errout;</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL) {</div><div class='add'>+	if (dev)</div><div class='add'>+		err = do_setlink(skb, dev, tgt_net, ifm, extack, tb, 0);</div><div class='add'>+	else if (!err)</div><div class='ctx'> 		err = -ENODEV;</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = do_setlink(skb, dev, ifm, extack, tb, ifname, 0);</div><div class='add'>+	rtnl_nets_unlock(&amp;rtnl_nets);</div><div class='add'>+	rtnl_nets_destroy(&amp;rtnl_nets);</div><div class='ctx'> errout:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2722,7 +3515,7 @@ static int rtnl_group_dellink(const struct net *net, int group)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rtnl_delete_link(struct net_device *dev)</div><div class='add'>+int rtnl_delete_link(struct net_device *dev, u32 portid, const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rtnl_link_ops *ops;</div><div class='ctx'> 	LIST_HEAD(list_kill);</div><div class='hunk'>@@ -2732,7 +3525,7 @@ int rtnl_delete_link(struct net_device *dev)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	ops-&gt;dellink(dev, &amp;list_kill);</div><div class='del'>-	unregister_netdevice_many(&amp;list_kill);</div><div class='add'>+	unregister_netdevice_many_notify(&amp;list_kill, portid, nlh);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2741,16 +3534,17 @@ EXPORT_SYMBOL_GPL(rtnl_delete_link);</div><div class='ctx'> static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct ifinfomsg *ifm = nlmsg_data(nlh);</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct net *tgt_net = net;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct ifinfomsg *ifm;</div><div class='del'>-	char ifname[IFNAMSIZ];</div><div class='add'>+	u32 portid = NETLINK_CB(skb).portid;</div><div class='ctx'> 	struct nlattr *tb[IFLA_MAX+1];</div><div class='del'>-	int err;</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	struct net *tgt_net = net;</div><div class='ctx'> 	int netnsid = -1;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,</div><div class='add'>+				     ifla_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2758,72 +3552,72 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IFNAME])</div><div class='del'>-		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='del'>-</div><div class='del'>-	if (tb[IFLA_IF_NETNSID]) {</div><div class='del'>-		netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);</div><div class='del'>-		tgt_net = get_target_net(NETLINK_CB(skb).sk, netnsid);</div><div class='add'>+	if (tb[IFLA_TARGET_NETNSID]) {</div><div class='add'>+		netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);</div><div class='add'>+		tgt_net = rtnl_get_net_ns_capable(NETLINK_CB(skb).sk, netnsid);</div><div class='ctx'> 		if (IS_ERR(tgt_net))</div><div class='ctx'> 			return PTR_ERR(tgt_net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='add'>+	rtnl_net_lock(tgt_net);</div><div class='add'>+</div><div class='ctx'> 	if (ifm-&gt;ifi_index &gt; 0)</div><div class='ctx'> 		dev = __dev_get_by_index(tgt_net, ifm-&gt;ifi_index);</div><div class='del'>-	else if (tb[IFLA_IFNAME])</div><div class='del'>-		dev = __dev_get_by_name(tgt_net, ifname);</div><div class='add'>+	else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME])</div><div class='add'>+		dev = rtnl_dev_get(tgt_net, tb);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		err = rtnl_delete_link(dev, portid, nlh);</div><div class='add'>+	else if (ifm-&gt;ifi_index &gt; 0 || tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME])</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 	else if (tb[IFLA_GROUP])</div><div class='ctx'> 		err = rtnl_group_dellink(tgt_net, nla_get_u32(tb[IFLA_GROUP]));</div><div class='ctx'> 	else</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		if (tb[IFLA_IFNAME] || ifm-&gt;ifi_index &gt; 0)</div><div class='del'>-			err = -ENODEV;</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	rtnl_net_unlock(tgt_net);</div><div class='ctx'> </div><div class='del'>-	err = rtnl_delete_link(dev);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	if (netnsid &gt;= 0)</div><div class='ctx'> 		put_net(tgt_net);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm)</div><div class='add'>+int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm,</div><div class='add'>+			u32 portid, const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='del'>-	unsigned int old_flags;</div><div class='add'>+	unsigned int old_flags, changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	old_flags = dev-&gt;flags;</div><div class='ctx'> 	if (ifm &amp;&amp; (ifm-&gt;ifi_flags || ifm-&gt;ifi_change)) {</div><div class='del'>-		err = __dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm));</div><div class='add'>+		err = __dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm),</div><div class='add'>+					 NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;rtnl_link_state == RTNL_LINK_INITIALIZED) {</div><div class='del'>-		__dev_notify_flags(dev, old_flags, (old_flags ^ dev-&gt;flags));</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;rtnl_link_state = RTNL_LINK_INITIALIZED;</div><div class='del'>-		__dev_notify_flags(dev, old_flags, ~0U);</div><div class='add'>+	changed = old_flags ^ dev-&gt;flags;</div><div class='add'>+	if (dev-&gt;rtnl_link_initializing) {</div><div class='add'>+		dev-&gt;rtnl_link_initializing = false;</div><div class='add'>+		changed = ~0U;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	__dev_notify_flags(dev, old_flags, changed, portid, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_configure_link);</div><div class='ctx'> </div><div class='del'>-struct net_device *rtnl_create_link(struct net *net,</div><div class='del'>-	const char *ifname, unsigned char name_assign_type,</div><div class='del'>-	const struct rtnl_link_ops *ops, struct nlattr *tb[])</div><div class='add'>+struct net_device *rtnl_create_link(struct net *net, const char *ifname,</div><div class='add'>+				    unsigned char name_assign_type,</div><div class='add'>+				    const struct rtnl_link_ops *ops,</div><div class='add'>+				    struct nlattr *tb[],</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	unsigned int num_tx_queues = 1;</div><div class='ctx'> 	unsigned int num_rx_queues = 1;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_NUM_TX_QUEUES])</div><div class='ctx'> 		num_tx_queues = nla_get_u32(tb[IFLA_NUM_TX_QUEUES]);</div><div class='hunk'>@@ -2835,26 +3629,53 @@ struct net_device *rtnl_create_link(struct net *net,</div><div class='ctx'> 	else if (ops-&gt;get_num_rx_queues)</div><div class='ctx'> 		num_rx_queues = ops-&gt;get_num_rx_queues();</div><div class='ctx'> </div><div class='del'>-	if (num_tx_queues &lt; 1 || num_tx_queues &gt; 4096)</div><div class='add'>+	if (num_tx_queues &lt; 1 || num_tx_queues &gt; 4096) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid number of transmit queues");</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (num_rx_queues &lt; 1 || num_rx_queues &gt; 4096)</div><div class='add'>+	if (num_rx_queues &lt; 1 || num_rx_queues &gt; 4096) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid number of receive queues");</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;alloc) {</div><div class='add'>+		dev = ops-&gt;alloc(tb, ifname, name_assign_type,</div><div class='add'>+				 num_tx_queues, num_rx_queues);</div><div class='add'>+		if (IS_ERR(dev))</div><div class='add'>+			return dev;</div><div class='add'>+	} else {</div><div class='add'>+		dev = alloc_netdev_mqs(ops-&gt;priv_size, ifname,</div><div class='add'>+				       name_assign_type, ops-&gt;setup,</div><div class='add'>+				       num_tx_queues, num_rx_queues);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev = alloc_netdev_mqs(ops-&gt;priv_size, ifname, name_assign_type,</div><div class='del'>-			       ops-&gt;setup, num_tx_queues, num_rx_queues);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	err = validate_linkmsg(dev, tb, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev_net_set(dev, net);</div><div class='ctx'> 	dev-&gt;rtnl_link_ops = ops;</div><div class='del'>-	dev-&gt;rtnl_link_state = RTNL_LINK_INITIALIZING;</div><div class='add'>+	dev-&gt;rtnl_link_initializing = true;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_MTU]) {</div><div class='add'>+		u32 mtu = nla_get_u32(tb[IFLA_MTU]);</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_MTU])</div><div class='del'>-		dev-&gt;mtu = nla_get_u32(tb[IFLA_MTU]);</div><div class='add'>+		err = dev_validate_mtu(dev, mtu, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			free_netdev(dev);</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;mtu = mtu;</div><div class='add'>+	}</div><div class='ctx'> 	if (tb[IFLA_ADDRESS]) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, nla_data(tb[IFLA_ADDRESS]),</div><div class='del'>-				nla_len(tb[IFLA_ADDRESS]));</div><div class='add'>+		__dev_addr_set(dev, nla_data(tb[IFLA_ADDRESS]),</div><div class='add'>+			       nla_len(tb[IFLA_ADDRESS]));</div><div class='ctx'> 		dev-&gt;addr_assign_type = NET_ADDR_SET;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tb[IFLA_BROADCAST])</div><div class='hunk'>@@ -2867,28 +3688,106 @@ struct net_device *rtnl_create_link(struct net *net,</div><div class='ctx'> 	if (tb[IFLA_LINKMODE])</div><div class='ctx'> 		dev-&gt;link_mode = nla_get_u8(tb[IFLA_LINKMODE]);</div><div class='ctx'> 	if (tb[IFLA_GROUP])</div><div class='del'>-		dev_set_group(dev, nla_get_u32(tb[IFLA_GROUP]));</div><div class='add'>+		netif_set_group(dev, nla_get_u32(tb[IFLA_GROUP]));</div><div class='ctx'> 	if (tb[IFLA_GSO_MAX_SIZE])</div><div class='ctx'> 		netif_set_gso_max_size(dev, nla_get_u32(tb[IFLA_GSO_MAX_SIZE]));</div><div class='ctx'> 	if (tb[IFLA_GSO_MAX_SEGS])</div><div class='del'>-		dev-&gt;gso_max_segs = nla_get_u32(tb[IFLA_GSO_MAX_SEGS]);</div><div class='add'>+		netif_set_gso_max_segs(dev, nla_get_u32(tb[IFLA_GSO_MAX_SEGS]));</div><div class='add'>+	if (tb[IFLA_GRO_MAX_SIZE])</div><div class='add'>+		netif_set_gro_max_size(dev, nla_get_u32(tb[IFLA_GRO_MAX_SIZE]));</div><div class='add'>+	if (tb[IFLA_GSO_IPV4_MAX_SIZE])</div><div class='add'>+		netif_set_gso_ipv4_max_size(dev, nla_get_u32(tb[IFLA_GSO_IPV4_MAX_SIZE]));</div><div class='add'>+	if (tb[IFLA_GRO_IPV4_MAX_SIZE])</div><div class='add'>+		netif_set_gro_ipv4_max_size(dev, nla_get_u32(tb[IFLA_GRO_IPV4_MAX_SIZE]));</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtnl_create_link);</div><div class='ctx'> </div><div class='add'>+struct rtnl_newlink_tbs {</div><div class='add'>+	struct nlattr *tb[IFLA_MAX + 1];</div><div class='add'>+	struct nlattr *linkinfo[IFLA_INFO_MAX + 1];</div><div class='add'>+	struct nlattr *attr[RTNL_MAX_TYPE + 1];</div><div class='add'>+	struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_changelink(const struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			   const struct rtnl_link_ops *ops,</div><div class='add'>+			   struct net_device *dev, struct net *tgt_net,</div><div class='add'>+			   struct rtnl_newlink_tbs *tbs,</div><div class='add'>+			   struct nlattr **data,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr ** const linkinfo = tbs-&gt;linkinfo;</div><div class='add'>+	struct nlattr ** const tb = tbs-&gt;tb;</div><div class='add'>+	int status = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	if (nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (linkinfo[IFLA_INFO_DATA]) {</div><div class='add'>+		if (!ops || ops != dev-&gt;rtnl_link_ops || !ops-&gt;changelink)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;changelink(dev, tb, data, extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		status |= DO_SETLINK_NOTIFY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (linkinfo[IFLA_INFO_SLAVE_DATA]) {</div><div class='add'>+		const struct rtnl_link_ops *m_ops = NULL;</div><div class='add'>+		struct nlattr **slave_data = NULL;</div><div class='add'>+		struct net_device *master_dev;</div><div class='add'>+</div><div class='add'>+		master_dev = netdev_master_upper_dev_get(dev);</div><div class='add'>+		if (master_dev)</div><div class='add'>+			m_ops = master_dev-&gt;rtnl_link_ops;</div><div class='add'>+</div><div class='add'>+		if (!m_ops || !m_ops-&gt;slave_changelink)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (m_ops-&gt;slave_maxtype &gt; RTNL_SLAVE_MAX_TYPE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (m_ops-&gt;slave_maxtype) {</div><div class='add'>+			err = nla_parse_nested_deprecated(tbs-&gt;slave_attr,</div><div class='add'>+							  m_ops-&gt;slave_maxtype,</div><div class='add'>+							  linkinfo[IFLA_INFO_SLAVE_DATA],</div><div class='add'>+							  m_ops-&gt;slave_policy, extack);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			slave_data = tbs-&gt;slave_attr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = m_ops-&gt;slave_changelink(master_dev, dev, tb, slave_data, extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		status |= DO_SETLINK_NOTIFY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return do_setlink(skb, dev, tgt_net, nlmsg_data(nlh), extack, tb, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_group_changelink(const struct sk_buff *skb,</div><div class='del'>-		struct net *net, int group,</div><div class='del'>-		struct ifinfomsg *ifm,</div><div class='del'>-		struct netlink_ext_ack *extack,</div><div class='del'>-		struct nlattr **tb)</div><div class='add'>+				 struct net *net, struct net *tgt_net,</div><div class='add'>+				 int group, struct ifinfomsg *ifm,</div><div class='add'>+				 struct netlink_ext_ack *extack,</div><div class='add'>+				 struct nlattr **tb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	for_each_netdev_safe(net, dev, aux) {</div><div class='ctx'> 		if (dev-&gt;group == group) {</div><div class='del'>-			err = do_setlink(skb, dev, ifm, extack, tb, NULL, 0);</div><div class='add'>+			err = do_setlink(skb, dev, tgt_net, ifm, extack, tb, 0);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2897,262 +3796,338 @@ static int rtnl_group_changelink(const struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			struct netlink_ext_ack *extack)</div><div class='add'>+static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,</div><div class='add'>+			       const struct rtnl_link_ops *ops,</div><div class='add'>+			       struct net *tgt_net, struct net *link_net,</div><div class='add'>+			       struct net *peer_net,</div><div class='add'>+			       const struct nlmsghdr *nlh,</div><div class='add'>+			       struct nlattr **tb, struct nlattr **data,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	const struct rtnl_link_ops *ops;</div><div class='del'>-	const struct rtnl_link_ops *m_ops = NULL;</div><div class='add'>+	unsigned char name_assign_type = NET_NAME_USER;</div><div class='add'>+	struct rtnl_newlink_params params = {</div><div class='add'>+		.src_net = sock_net(skb-&gt;sk),</div><div class='add'>+		.link_net = link_net,</div><div class='add'>+		.peer_net = peer_net,</div><div class='add'>+		.tb = tb,</div><div class='add'>+		.data = data,</div><div class='add'>+	};</div><div class='add'>+	u32 portid = NETLINK_CB(skb).portid;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct net_device *master_dev = NULL;</div><div class='del'>-	struct ifinfomsg *ifm;</div><div class='del'>-	char kind[MODULE_NAME_LEN];</div><div class='ctx'> 	char ifname[IFNAMSIZ];</div><div class='del'>-	struct nlattr *tb[IFLA_MAX+1];</div><div class='del'>-	struct nlattr *linkinfo[IFLA_INFO_MAX+1];</div><div class='del'>-	unsigned char name_assign_type = NET_NAME_USER;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MODULES</div><div class='del'>-replay:</div><div class='del'>-#endif</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (!ops-&gt;alloc &amp;&amp; !ops-&gt;setup)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	err = rtnl_ensure_unique_netns(tb, extack, false);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (tb[IFLA_IFNAME]) {</div><div class='add'>+		nla_strscpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(ifname, IFNAMSIZ, "%s%%d", ops-&gt;kind);</div><div class='add'>+		name_assign_type = NET_NAME_ENUM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IFNAME])</div><div class='del'>-		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+	dev = rtnl_create_link(tgt_net, ifname, name_assign_type, ops, tb,</div><div class='add'>+			       extack);</div><div class='add'>+	if (IS_ERR(dev)) {</div><div class='add'>+		err = PTR_ERR(dev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;ifindex = ifm-&gt;ifi_index;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;newlink)</div><div class='add'>+		err = ops-&gt;newlink(dev, &amp;params, extack);</div><div class='ctx'> 	else</div><div class='del'>-		ifname[0] = '\0';</div><div class='add'>+		err = register_netdevice(dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='del'>-	if (ifm-&gt;ifi_index &gt; 0)</div><div class='del'>-		dev = __dev_get_by_index(net, ifm-&gt;ifi_index);</div><div class='del'>-	else {</div><div class='del'>-		if (ifname[0])</div><div class='del'>-			dev = __dev_get_by_name(net, ifname);</div><div class='del'>-		else</div><div class='del'>-			dev = NULL;</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+</div><div class='add'>+	err = rtnl_configure_link(dev, ifm, portid, nlh);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_unregister;</div><div class='add'>+	if (tb[IFLA_MASTER]) {</div><div class='add'>+		err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev) {</div><div class='del'>-		master_dev = netdev_master_upper_dev_get(dev);</div><div class='del'>-		if (master_dev)</div><div class='del'>-			m_ops = master_dev-&gt;rtnl_link_ops;</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+out_unregister:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	if (ops-&gt;newlink) {</div><div class='add'>+		LIST_HEAD(list_kill);</div><div class='add'>+</div><div class='add'>+		ops-&gt;dellink(dev, &amp;list_kill);</div><div class='add'>+		unregister_netdevice_many(&amp;list_kill);</div><div class='add'>+	} else {</div><div class='add'>+		unregister_netdevice(dev);</div><div class='ctx'> 	}</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net *rtnl_get_peer_net(const struct rtnl_link_ops *ops,</div><div class='add'>+				     struct nlattr *tbp[],</div><div class='add'>+				     struct nlattr *data[],</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!data || !data[ops-&gt;peer_type])</div><div class='add'>+		return rtnl_link_get_net_ifla(tbp);</div><div class='ctx'> </div><div class='del'>-	err = validate_linkmsg(dev, tb);</div><div class='add'>+	err = rtnl_nla_parse_ifinfomsg(tb, data[ops-&gt;peer_type], extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_LINKINFO]) {</div><div class='del'>-		err = nla_parse_nested(linkinfo, IFLA_INFO_MAX,</div><div class='del'>-				       tb[IFLA_LINKINFO], ifla_info_policy,</div><div class='del'>-				       NULL);</div><div class='add'>+	if (ops-&gt;validate) {</div><div class='add'>+		err = ops-&gt;validate(tb, NULL, extack);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	} else</div><div class='del'>-		memset(linkinfo, 0, sizeof(linkinfo));</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (linkinfo[IFLA_INFO_KIND]) {</div><div class='del'>-		nla_strlcpy(kind, linkinfo[IFLA_INFO_KIND], sizeof(kind));</div><div class='del'>-		ops = rtnl_link_ops_get(kind);</div><div class='add'>+	return rtnl_link_get_net_ifla(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			  const struct rtnl_link_ops *ops,</div><div class='add'>+			  struct net *tgt_net, struct net *link_net,</div><div class='add'>+			  struct net *peer_net,</div><div class='add'>+			  struct rtnl_newlink_tbs *tbs,</div><div class='add'>+			  struct nlattr **data,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr ** const tb = tbs-&gt;tb;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net *device_net;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct ifinfomsg *ifm;</div><div class='add'>+	bool link_specified;</div><div class='add'>+</div><div class='add'>+	/* When creating, lookup for existing device in target net namespace */</div><div class='add'>+	device_net = (nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE) &amp;&amp;</div><div class='add'>+		     (nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL) ?</div><div class='add'>+		     tgt_net : net;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_data(nlh);</div><div class='add'>+	if (ifm-&gt;ifi_index &gt; 0) {</div><div class='add'>+		link_specified = true;</div><div class='add'>+		dev = __dev_get_by_index(device_net, ifm-&gt;ifi_index);</div><div class='add'>+	} else if (ifm-&gt;ifi_index &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ifindex can't be negative");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) {</div><div class='add'>+		link_specified = true;</div><div class='add'>+		dev = rtnl_dev_get(device_net, tb);</div><div class='ctx'> 	} else {</div><div class='del'>-		kind[0] = '\0';</div><div class='del'>-		ops = NULL;</div><div class='add'>+		link_specified = false;</div><div class='add'>+		dev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (1) {</div><div class='del'>-		struct nlattr *attr[RTNL_MAX_TYPE + 1];</div><div class='del'>-		struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];</div><div class='del'>-		struct nlattr **data = NULL;</div><div class='del'>-		struct nlattr **slave_data = NULL;</div><div class='del'>-		struct net *dest_net, *link_net = NULL;</div><div class='add'>+	if (dev)</div><div class='add'>+		return rtnl_changelink(skb, nlh, ops, dev, tgt_net, tbs, data, extack);</div><div class='ctx'> </div><div class='del'>-		if (ops) {</div><div class='del'>-			if (ops-&gt;maxtype &gt; RTNL_MAX_TYPE)</div><div class='del'>-				return -EINVAL;</div><div class='add'>+	if (!(nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE)) {</div><div class='add'>+		/* No dev found and NLM_F_CREATE not set. Requested dev does not exist,</div><div class='add'>+		 * or it's for a group</div><div class='add'>+		*/</div><div class='add'>+		if (link_specified || !tb[IFLA_GROUP])</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> </div><div class='del'>-			if (ops-&gt;maxtype &amp;&amp; linkinfo[IFLA_INFO_DATA]) {</div><div class='del'>-				err = nla_parse_nested(attr, ops-&gt;maxtype,</div><div class='del'>-						       linkinfo[IFLA_INFO_DATA],</div><div class='del'>-						       ops-&gt;policy, NULL);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-				data = attr;</div><div class='del'>-			}</div><div class='del'>-			if (ops-&gt;validate) {</div><div class='del'>-				err = ops-&gt;validate(tb, data, extack);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		return rtnl_group_changelink(skb, net, tgt_net,</div><div class='add'>+					     nla_get_u32(tb[IFLA_GROUP]),</div><div class='add'>+					     ifm, extack, tb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (m_ops) {</div><div class='del'>-			if (m_ops-&gt;slave_maxtype &gt; RTNL_SLAVE_MAX_TYPE)</div><div class='del'>-				return -EINVAL;</div><div class='add'>+	if (tb[IFLA_MAP] || tb[IFLA_PROTINFO])</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-			if (m_ops-&gt;slave_maxtype &amp;&amp;</div><div class='del'>-			    linkinfo[IFLA_INFO_SLAVE_DATA]) {</div><div class='del'>-				err = nla_parse_nested(slave_attr,</div><div class='del'>-						       m_ops-&gt;slave_maxtype,</div><div class='del'>-						       linkinfo[IFLA_INFO_SLAVE_DATA],</div><div class='del'>-						       m_ops-&gt;slave_policy,</div><div class='del'>-						       NULL);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-				slave_data = slave_attr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	if (!ops) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unknown device type");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (dev) {</div><div class='del'>-			int status = 0;</div><div class='add'>+	return rtnl_newlink_create(skb, ifm, ops, tgt_net, link_net, peer_net, nlh,</div><div class='add'>+				   tb, data, extack);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL)</div><div class='del'>-				return -EEXIST;</div><div class='del'>-			if (nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE)</div><div class='del'>-				return -EOPNOTSUPP;</div><div class='add'>+static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *tgt_net, *link_net = NULL, *peer_net = NULL;</div><div class='add'>+	struct nlattr **tb, **linkinfo, **data = NULL;</div><div class='add'>+	struct rtnl_link_ops *ops = NULL;</div><div class='add'>+	struct rtnl_newlink_tbs *tbs;</div><div class='add'>+	struct rtnl_nets rtnl_nets;</div><div class='add'>+	int ops_srcu_index;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-			if (linkinfo[IFLA_INFO_DATA]) {</div><div class='del'>-				if (!ops || ops != dev-&gt;rtnl_link_ops ||</div><div class='del'>-				    !ops-&gt;changelink)</div><div class='del'>-					return -EOPNOTSUPP;</div><div class='add'>+	tbs = kmalloc(sizeof(*tbs), GFP_KERNEL);</div><div class='add'>+	if (!tbs)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-				err = ops-&gt;changelink(dev, tb, data, extack);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-				status |= DO_SETLINK_NOTIFY;</div><div class='del'>-			}</div><div class='add'>+	tb = tbs-&gt;tb;</div><div class='add'>+	ret = nlmsg_parse_deprecated(nlh, sizeof(struct ifinfomsg), tb,</div><div class='add'>+				     IFLA_MAX, ifla_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free;</div><div class='ctx'> </div><div class='del'>-			if (linkinfo[IFLA_INFO_SLAVE_DATA]) {</div><div class='del'>-				if (!m_ops || !m_ops-&gt;slave_changelink)</div><div class='del'>-					return -EOPNOTSUPP;</div><div class='add'>+	ret = rtnl_ensure_unique_netns(tb, extack, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free;</div><div class='ctx'> </div><div class='del'>-				err = m_ops-&gt;slave_changelink(master_dev, dev,</div><div class='del'>-							      tb, slave_data,</div><div class='del'>-							      extack);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-				status |= DO_SETLINK_NOTIFY;</div><div class='del'>-			}</div><div class='add'>+	linkinfo = tbs-&gt;linkinfo;</div><div class='add'>+	if (tb[IFLA_LINKINFO]) {</div><div class='add'>+		ret = nla_parse_nested_deprecated(linkinfo, IFLA_INFO_MAX,</div><div class='add'>+						  tb[IFLA_LINKINFO],</div><div class='add'>+						  ifla_info_policy, NULL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto free;</div><div class='add'>+	} else {</div><div class='add'>+		memset(linkinfo, 0, sizeof(tbs-&gt;linkinfo));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			return do_setlink(skb, dev, ifm, extack, tb, ifname,</div><div class='del'>-					  status);</div><div class='del'>-		}</div><div class='add'>+	if (linkinfo[IFLA_INFO_KIND]) {</div><div class='add'>+		char kind[MODULE_NAME_LEN];</div><div class='ctx'> </div><div class='del'>-		if (!(nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE)) {</div><div class='del'>-			if (ifm-&gt;ifi_index == 0 &amp;&amp; tb[IFLA_GROUP])</div><div class='del'>-				return rtnl_group_changelink(skb, net,</div><div class='del'>-						nla_get_u32(tb[IFLA_GROUP]),</div><div class='del'>-						ifm, extack, tb);</div><div class='del'>-			return -ENODEV;</div><div class='add'>+		nla_strscpy(kind, linkinfo[IFLA_INFO_KIND], sizeof(kind));</div><div class='add'>+		ops = rtnl_link_ops_get(kind, &amp;ops_srcu_index);</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+		if (!ops) {</div><div class='add'>+			request_module("rtnl-link-%s", kind);</div><div class='add'>+			ops = rtnl_link_ops_get(kind, &amp;ops_srcu_index);</div><div class='ctx'> 		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (tb[IFLA_MAP] || tb[IFLA_PROTINFO])</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+	rtnl_nets_init(&amp;rtnl_nets);</div><div class='ctx'> </div><div class='del'>-		if (!ops) {</div><div class='del'>-#ifdef CONFIG_MODULES</div><div class='del'>-			if (kind[0]) {</div><div class='del'>-				__rtnl_unlock();</div><div class='del'>-				request_module("rtnl-link-%s", kind);</div><div class='del'>-				rtnl_lock();</div><div class='del'>-				ops = rtnl_link_ops_get(kind);</div><div class='del'>-				if (ops)</div><div class='del'>-					goto replay;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+	if (ops) {</div><div class='add'>+		if (ops-&gt;maxtype &gt; RTNL_MAX_TYPE) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto put_ops;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!ops-&gt;setup)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+		if (ops-&gt;maxtype &amp;&amp; linkinfo[IFLA_INFO_DATA]) {</div><div class='add'>+			ret = nla_parse_nested_deprecated(tbs-&gt;attr, ops-&gt;maxtype,</div><div class='add'>+							  linkinfo[IFLA_INFO_DATA],</div><div class='add'>+							  ops-&gt;policy, extack);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto put_ops;</div><div class='ctx'> </div><div class='del'>-		if (!ifname[0]) {</div><div class='del'>-			snprintf(ifname, IFNAMSIZ, "%s%%d", ops-&gt;kind);</div><div class='del'>-			name_assign_type = NET_NAME_ENUM;</div><div class='add'>+			data = tbs-&gt;attr;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dest_net = rtnl_link_get_net_capable(skb, net, tb, CAP_NET_ADMIN);</div><div class='del'>-		if (IS_ERR(dest_net))</div><div class='del'>-			return PTR_ERR(dest_net);</div><div class='del'>-</div><div class='del'>-		if (tb[IFLA_LINK_NETNSID]) {</div><div class='del'>-			int id = nla_get_s32(tb[IFLA_LINK_NETNSID]);</div><div class='add'>+		if (ops-&gt;validate) {</div><div class='add'>+			ret = ops-&gt;validate(tb, data, extack);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto put_ops;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			link_net = get_net_ns_by_id(dest_net, id);</div><div class='del'>-			if (!link_net) {</div><div class='del'>-				err =  -EINVAL;</div><div class='del'>-				goto out;</div><div class='add'>+		if (ops-&gt;peer_type) {</div><div class='add'>+			peer_net = rtnl_get_peer_net(ops, tb, data, extack);</div><div class='add'>+			if (IS_ERR(peer_net)) {</div><div class='add'>+				ret = PTR_ERR(peer_net);</div><div class='add'>+				goto put_ops;</div><div class='ctx'> 			}</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			if (!netlink_ns_capable(skb, link_net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-				goto out;</div><div class='add'>+			if (peer_net)</div><div class='add'>+				rtnl_nets_add(&amp;rtnl_nets, peer_net);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dev = rtnl_create_link(link_net ? : dest_net, ifname,</div><div class='del'>-				       name_assign_type, ops, tb);</div><div class='del'>-		if (IS_ERR(dev)) {</div><div class='del'>-			err = PTR_ERR(dev);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	tgt_net = rtnl_link_get_net_capable(skb, sock_net(skb-&gt;sk), tb, CAP_NET_ADMIN);</div><div class='add'>+	if (IS_ERR(tgt_net)) {</div><div class='add'>+		ret = PTR_ERR(tgt_net);</div><div class='add'>+		goto put_net;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;ifindex = ifm-&gt;ifi_index;</div><div class='add'>+	rtnl_nets_add(&amp;rtnl_nets, tgt_net);</div><div class='ctx'> </div><div class='del'>-		if (ops-&gt;newlink) {</div><div class='del'>-			err = ops-&gt;newlink(link_net ? : net, dev, tb, data,</div><div class='del'>-					   extack);</div><div class='del'>-			/* Drivers should call free_netdev() in -&gt;destructor</div><div class='del'>-			 * and unregister it on failure after registration</div><div class='del'>-			 * so that device could be finally freed in rtnl_unlock.</div><div class='del'>-			 */</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				/* If device is not registered at all, free it now */</div><div class='del'>-				if (dev-&gt;reg_state == NETREG_UNINITIALIZED)</div><div class='del'>-					free_netdev(dev);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			err = register_netdevice(dev);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				free_netdev(dev);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		err = rtnl_configure_link(dev, ifm);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out_unregister;</div><div class='del'>-		if (link_net) {</div><div class='del'>-			err = dev_change_net_namespace(dev, dest_net, ifname);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out_unregister;</div><div class='add'>+	if (tb[IFLA_LINK_NETNSID]) {</div><div class='add'>+		int id = nla_get_s32(tb[IFLA_LINK_NETNSID]);</div><div class='add'>+</div><div class='add'>+		link_net = get_net_ns_by_id(tgt_net, id);</div><div class='add'>+		if (!link_net) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unknown network namespace id");</div><div class='add'>+			ret =  -EINVAL;</div><div class='add'>+			goto put_net;</div><div class='ctx'> 		}</div><div class='del'>-		if (tb[IFLA_MASTER]) {</div><div class='del'>-			err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]),</div><div class='del'>-					    extack);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out_unregister;</div><div class='add'>+</div><div class='add'>+		rtnl_nets_add(&amp;rtnl_nets, link_net);</div><div class='add'>+</div><div class='add'>+		if (!netlink_ns_capable(skb, link_net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+			goto put_net;</div><div class='ctx'> 		}</div><div class='del'>-out:</div><div class='del'>-		if (link_net)</div><div class='del'>-			put_net(link_net);</div><div class='del'>-		put_net(dest_net);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_nets_lock(&amp;rtnl_nets);</div><div class='add'>+	ret = __rtnl_newlink(skb, nlh, ops, tgt_net, link_net, peer_net, tbs, data, extack);</div><div class='add'>+	rtnl_nets_unlock(&amp;rtnl_nets);</div><div class='add'>+</div><div class='add'>+put_net:</div><div class='add'>+	rtnl_nets_destroy(&amp;rtnl_nets);</div><div class='add'>+put_ops:</div><div class='add'>+	if (ops)</div><div class='add'>+		rtnl_link_ops_put(ops, ops_srcu_index);</div><div class='add'>+free:</div><div class='add'>+	kfree(tbs);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_valid_getlink_req(struct sk_buff *skb,</div><div class='add'>+				  const struct nlmsghdr *nlh,</div><div class='add'>+				  struct nlattr **tb,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifinfomsg *ifm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for get link");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,</div><div class='add'>+					      ifla_policy, extack);</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;__ifi_pad || ifm-&gt;ifi_type || ifm-&gt;ifi_flags ||</div><div class='add'>+	    ifm-&gt;ifi_change) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for get link request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFLA_MAX,</div><div class='add'>+					    ifla_policy, extack);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-out_unregister:</div><div class='del'>-		if (ops-&gt;newlink) {</div><div class='del'>-			LIST_HEAD(list_kill);</div><div class='ctx'> </div><div class='del'>-			ops-&gt;dellink(dev, &amp;list_kill);</div><div class='del'>-			unregister_netdevice_many(&amp;list_kill);</div><div class='del'>-		} else {</div><div class='del'>-			unregister_netdevice(dev);</div><div class='add'>+	for (i = 0; i &lt;= IFLA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case IFLA_IFNAME:</div><div class='add'>+		case IFLA_ALT_IFNAME:</div><div class='add'>+		case IFLA_EXT_MASK:</div><div class='add'>+		case IFLA_TARGET_NETNSID:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in get link request");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='hunk'>@@ -3161,7 +4136,6 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct net *tgt_net = net;</div><div class='ctx'> 	struct ifinfomsg *ifm;</div><div class='del'>-	char ifname[IFNAMSIZ];</div><div class='ctx'> 	struct nlattr *tb[IFLA_MAX+1];</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='hunk'>@@ -3169,7 +4143,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 ext_filter_mask = 0;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);</div><div class='add'>+	err = rtnl_valid_getlink_req(skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3177,16 +4151,13 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IF_NETNSID]) {</div><div class='del'>-		netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);</div><div class='del'>-		tgt_net = get_target_net(NETLINK_CB(skb).sk, netnsid);</div><div class='add'>+	if (tb[IFLA_TARGET_NETNSID]) {</div><div class='add'>+		netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);</div><div class='add'>+		tgt_net = rtnl_get_net_ns_capable(NETLINK_CB(skb).sk, netnsid);</div><div class='ctx'> 		if (IS_ERR(tgt_net))</div><div class='ctx'> 			return PTR_ERR(tgt_net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tb[IFLA_IFNAME])</div><div class='del'>-		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='del'>-</div><div class='ctx'> 	if (tb[IFLA_EXT_MASK])</div><div class='ctx'> 		ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);</div><div class='ctx'> </div><div class='hunk'>@@ -3194,8 +4165,8 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	ifm = nlmsg_data(nlh);</div><div class='ctx'> 	if (ifm-&gt;ifi_index &gt; 0)</div><div class='ctx'> 		dev = __dev_get_by_index(tgt_net, ifm-&gt;ifi_index);</div><div class='del'>-	else if (tb[IFLA_IFNAME])</div><div class='del'>-		dev = __dev_get_by_name(tgt_net, ifname);</div><div class='add'>+	else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME])</div><div class='add'>+		dev = rtnl_dev_get(tgt_net, tb);</div><div class='ctx'> 	else</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3204,14 +4175,22 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOBUFS;</div><div class='del'>-	nskb = nlmsg_new(if_nlmsg_size(dev, ext_filter_mask), GFP_KERNEL);</div><div class='add'>+	nskb = nlmsg_new_large(if_nlmsg_size(dev, ext_filter_mask));</div><div class='ctx'> 	if (nskb == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Synchronize the carrier state so we don't report a state</div><div class='add'>+	 * that we're not actually going to honour immediately; if</div><div class='add'>+	 * the driver just did a carrier off-&gt;on transition, we can</div><div class='add'>+	 * only TX if link watch work has run, but without this we'd</div><div class='add'>+	 * already report carrier on, even if it doesn't work yet.</div><div class='add'>+	 */</div><div class='add'>+	linkwatch_sync_dev(dev);</div><div class='add'>+</div><div class='ctx'> 	err = rtnl_fill_ifinfo(nskb, dev, net,</div><div class='ctx'> 			       RTM_NEWLINK, NETLINK_CB(skb).portid,</div><div class='ctx'> 			       nlh-&gt;nlmsg_seq, 0, 0, ext_filter_mask,</div><div class='del'>-			       0, NULL, 0, netnsid);</div><div class='add'>+			       0, NULL, 0, netnsid, GFP_KERNEL);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in if_nlmsg_size */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -3225,22 +4204,130 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='add'>+static int rtnl_alt_ifname(int cmd, struct net_device *dev, struct nlattr *attr,</div><div class='add'>+			   bool *changed, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	char *alt_ifname;</div><div class='add'>+	size_t size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_validate(attr, attr-&gt;nla_len, IFLA_MAX, ifla_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cmd == RTM_NEWLINKPROP) {</div><div class='add'>+		size = rtnl_prop_list_size(dev);</div><div class='add'>+		size += nla_total_size(ALTIFNAMSIZ);</div><div class='add'>+		if (size &gt;= U16_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "effective property list too long");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alt_ifname = nla_strdup(attr, GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!alt_ifname)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (cmd == RTM_NEWLINKPROP) {</div><div class='add'>+		err = netdev_name_node_alt_create(dev, alt_ifname);</div><div class='add'>+		if (!err)</div><div class='add'>+			alt_ifname = NULL;</div><div class='add'>+	} else if (cmd == RTM_DELLINKPROP) {</div><div class='add'>+		err = netdev_name_node_alt_destroy(dev, alt_ifname);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(alt_ifname);</div><div class='add'>+	if (!err)</div><div class='add'>+		*changed = true;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_linkprop(int cmd, struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct nlattr *tb[IFLA_MAX + 1];</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct nlattr *tb[IFLA_MAX+1];</div><div class='add'>+	struct ifinfomsg *ifm;</div><div class='add'>+	bool changed = false;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int err, rem;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = rtnl_ensure_unique_netns(tb, extack, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_data(nlh);</div><div class='add'>+	if (ifm-&gt;ifi_index &gt; 0)</div><div class='add'>+		dev = __dev_get_by_index(net, ifm-&gt;ifi_index);</div><div class='add'>+	else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME])</div><div class='add'>+		dev = rtnl_dev_get(net, tb);</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_PROP_LIST])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(attr, tb[IFLA_PROP_LIST], rem) {</div><div class='add'>+		switch (nla_type(attr)) {</div><div class='add'>+		case IFLA_ALT_IFNAME:</div><div class='add'>+			err = rtnl_alt_ifname(cmd, dev, attr, &amp;changed, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		netdev_state_change(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_newlinkprop(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return rtnl_linkprop(RTM_NEWLINKPROP, skb, nlh, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_dellinkprop(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return rtnl_linkprop(RTM_DELLINKPROP, skb, nlh, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack u32 rtnl_calcit(struct sk_buff *skb,</div><div class='add'>+					  struct nlmsghdr *nlh)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	size_t min_ifinfo_dump_size = 0;</div><div class='ctx'> 	u32 ext_filter_mask = 0;</div><div class='del'>-	u16 min_ifinfo_dump_size = 0;</div><div class='del'>-	int hdrlen;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	int hdrlen, rem;</div><div class='ctx'> </div><div class='ctx'> 	/* Same kernel&lt;-&gt;userspace interface hack as in rtnl_dump_ifinfo. */</div><div class='ctx'> 	hdrlen = nlmsg_len(nlh) &lt; sizeof(struct ifinfomsg) ?</div><div class='ctx'> 		 sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_parse(nlh, hdrlen, tb, IFLA_MAX, ifla_policy, NULL) &gt;= 0) {</div><div class='del'>-		if (tb[IFLA_EXT_MASK])</div><div class='del'>-			ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);</div><div class='add'>+	if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(hdrlen))</div><div class='add'>+		return NLMSG_GOODSIZE;</div><div class='add'>+</div><div class='add'>+	nla_for_each_attr_type(nla, IFLA_EXT_MASK,</div><div class='add'>+			       nlmsg_attrdata(nlh, hdrlen),</div><div class='add'>+			       nlmsg_attrlen(nlh, hdrlen), rem) {</div><div class='add'>+		if (nla_len(nla) == sizeof(u32))</div><div class='add'>+			ext_filter_mask = nla_get_u32(nla);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ext_filter_mask)</div><div class='hunk'>@@ -3251,9 +4338,8 @@ static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		min_ifinfo_dump_size = max_t(u16, min_ifinfo_dump_size,</div><div class='del'>-					     if_nlmsg_size(dev,</div><div class='del'>-						           ext_filter_mask));</div><div class='add'>+		min_ifinfo_dump_size = max(min_ifinfo_dump_size,</div><div class='add'>+					   if_nlmsg_size(dev, ext_filter_mask));</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -3264,13 +4350,14 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int s_idx = cb-&gt;family;</div><div class='add'>+	int type = cb-&gt;nlh-&gt;nlmsg_type - RTM_BASE;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (s_idx == 0)</div><div class='ctx'> 		s_idx = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 1; idx &lt;= RTNL_FAMILY_MAX; idx++) {</div><div class='del'>-		struct rtnl_link **tab;</div><div class='del'>-		int type = cb-&gt;nlh-&gt;nlmsg_type-RTM_BASE;</div><div class='add'>+		struct rtnl_link __rcu **tab;</div><div class='ctx'> 		struct rtnl_link *link;</div><div class='ctx'> 		rtnl_dumpit_func dumpit;</div><div class='ctx'> </div><div class='hunk'>@@ -3284,7 +4371,7 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 		if (!tab)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		link = tab[type];</div><div class='add'>+		link = rcu_dereference_rtnl(tab[type]);</div><div class='ctx'> 		if (!link)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3297,31 +4384,38 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 			cb-&gt;prev_seq = 0;</div><div class='ctx'> 			cb-&gt;seq = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (dumpit(skb, cb))</div><div class='add'>+		ret = dumpit(skb, cb);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	cb-&gt;family = idx;</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return skb-&gt;len ? : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,</div><div class='ctx'> 				       unsigned int change,</div><div class='ctx'> 				       u32 event, gfp_t flags, int *new_nsid,</div><div class='del'>-				       int new_ifindex)</div><div class='add'>+				       int new_ifindex, u32 portid,</div><div class='add'>+				       const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='del'>-	size_t if_info_size;</div><div class='add'>+	u32 seq = 0;</div><div class='ctx'> </div><div class='del'>-	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags);</div><div class='add'>+	skb = nlmsg_new(if_nlmsg_size(dev, 0), flags);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	if (nlmsg_report(nlh))</div><div class='add'>+		seq = nlmsg_seq(nlh);</div><div class='add'>+	else</div><div class='add'>+		portid = 0;</div><div class='add'>+</div><div class='ctx'> 	err = rtnl_fill_ifinfo(skb, dev, dev_net(dev),</div><div class='del'>-			       type, 0, 0, change, 0, 0, event,</div><div class='del'>-			       new_nsid, new_ifindex, -1);</div><div class='add'>+			       type, portid, seq, change, 0, 0, event,</div><div class='add'>+			       new_nsid, new_ifindex, -1, flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in if_nlmsg_size() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -3330,21 +4424,22 @@ struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	return skb;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_LINK, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_LINK, err);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev, gfp_t flags)</div><div class='add'>+void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev, gfp_t flags,</div><div class='add'>+		       u32 portid, const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-	rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, flags);</div><div class='add'>+	rtnl_notify(skb, net, portid, RTNLGRP_LINK, nlh, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtmsg_ifinfo_event(int type, struct net_device *dev,</div><div class='ctx'> 			       unsigned int change, u32 event,</div><div class='del'>-			       gfp_t flags, int *new_nsid, int new_ifindex)</div><div class='add'>+			       gfp_t flags, int *new_nsid, int new_ifindex,</div><div class='add'>+			       u32 portid, const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -3352,23 +4447,23 @@ static void rtmsg_ifinfo_event(int type, struct net_device *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = rtmsg_ifinfo_build_skb(type, dev, change, event, flags, new_nsid,</div><div class='del'>-				     new_ifindex);</div><div class='add'>+				     new_ifindex, portid, nlh);</div><div class='ctx'> 	if (skb)</div><div class='del'>-		rtmsg_ifinfo_send(skb, dev, flags);</div><div class='add'>+		rtmsg_ifinfo_send(skb, dev, flags, portid, nlh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,</div><div class='del'>-		  gfp_t flags)</div><div class='add'>+		  gfp_t flags, u32 portid, const struct nlmsghdr *nlh)</div><div class='ctx'> {</div><div class='ctx'> 	rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags,</div><div class='del'>-			   NULL, 0);</div><div class='add'>+			   NULL, 0, portid, nlh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,</div><div class='ctx'> 			 gfp_t flags, int *new_nsid, int new_ifindex)</div><div class='ctx'> {</div><div class='ctx'> 	rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags,</div><div class='del'>-			   new_nsid, new_ifindex);</div><div class='add'>+			   new_nsid, new_ifindex, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nlmsg_populate_fdb_fill(struct sk_buff *skb,</div><div class='hunk'>@@ -3393,7 +4488,7 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb,</div><div class='ctx'> 	ndm-&gt;ndm_ifindex = dev-&gt;ifindex;</div><div class='ctx'> 	ndm-&gt;ndm_state   = ndm_state;</div><div class='ctx'> </div><div class='del'>-	if (nla_put(skb, NDA_LLADDR, ETH_ALEN, addr))</div><div class='add'>+	if (nla_put(skb, NDA_LLADDR, dev-&gt;addr_len, addr))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (vid)</div><div class='ctx'> 		if (nla_put(skb, NDA_VLAN, sizeof(u16), &amp;vid))</div><div class='hunk'>@@ -3407,10 +4502,10 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t rtnl_fdb_nlmsg_size(void)</div><div class='add'>+static inline size_t rtnl_fdb_nlmsg_size(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return NLMSG_ALIGN(sizeof(struct ndmsg)) +</div><div class='del'>-	       nla_total_size(ETH_ALEN) +	/* NDA_LLADDR */</div><div class='add'>+	       nla_total_size(dev-&gt;addr_len) +	/* NDA_LLADDR */</div><div class='ctx'> 	       nla_total_size(sizeof(u16)) +	/* NDA_VLAN */</div><div class='ctx'> 	       0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3422,7 +4517,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	skb = nlmsg_new(rtnl_fdb_nlmsg_size(), GFP_ATOMIC);</div><div class='add'>+	skb = nlmsg_new(rtnl_fdb_nlmsg_size(dev), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -3439,7 +4534,7 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * ndo_dflt_fdb_add - default netdevice operation to add an FDB entry</div><div class='ctx'>  */</div><div class='ctx'> int ndo_dflt_fdb_add(struct ndmsg *ndm,</div><div class='hunk'>@@ -3454,12 +4549,17 @@ int ndo_dflt_fdb_add(struct ndmsg *ndm,</div><div class='ctx'> 	 * implement its own handler for this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ndm-&gt;ndm_state &amp;&amp; !(ndm-&gt;ndm_state &amp; NUD_PERMANENT)) {</div><div class='del'>-		pr_info("%s: FDB only supports static addresses\n", dev-&gt;name);</div><div class='add'>+		netdev_info(dev, "default FDB implementation only supports local addresses\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NDA_FLAGS_EXT]) {</div><div class='add'>+		netdev_info(dev, "invalid flags given to default FDB implementation\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vid) {</div><div class='del'>-		pr_info("%s: vlans aren't supported yet for dev_uc|mc_add()\n", dev-&gt;name);</div><div class='add'>+		netdev_info(dev, "vlans aren't supported yet for dev_uc|mc_add()\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3509,7 +4609,8 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX, NULL,</div><div class='add'>+				     extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3530,6 +4631,11 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "FDB add only supported for Ethernet devices");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	addr = nla_data(tb[NDA_LLADDR]);</div><div class='ctx'> </div><div class='ctx'> 	err = fdb_vid_parse(tb[NDA_VLAN], &amp;vid, extack);</div><div class='hunk'>@@ -3540,12 +4646,13 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	/* Support fdb on master device the net/bridge default case */</div><div class='ctx'> 	if ((!ndm-&gt;ndm_flags || ndm-&gt;ndm_flags &amp; NTF_MASTER) &amp;&amp;</div><div class='del'>-	    (dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT)) {</div><div class='add'>+	    netif_is_bridge_port(dev)) {</div><div class='ctx'> 		struct net_device *br_dev = netdev_master_upper_dev_get(dev);</div><div class='ctx'> 		const struct net_device_ops *ops = br_dev-&gt;netdev_ops;</div><div class='add'>+		bool notified = false;</div><div class='ctx'> </div><div class='ctx'> 		err = ops-&gt;ndo_fdb_add(ndm, tb, dev, addr, vid,</div><div class='del'>-				       nlh-&gt;nlmsg_flags);</div><div class='add'>+				       nlh-&gt;nlmsg_flags, &amp;notified, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3554,15 +4661,18 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	/* Embedded bridge, macvlan, and any other device support */</div><div class='ctx'> 	if ((ndm-&gt;ndm_flags &amp; NTF_SELF)) {</div><div class='add'>+		bool notified = false;</div><div class='add'>+</div><div class='ctx'> 		if (dev-&gt;netdev_ops-&gt;ndo_fdb_add)</div><div class='ctx'> 			err = dev-&gt;netdev_ops-&gt;ndo_fdb_add(ndm, tb, dev, addr,</div><div class='ctx'> 							   vid,</div><div class='del'>-							   nlh-&gt;nlmsg_flags);</div><div class='add'>+							   nlh-&gt;nlmsg_flags,</div><div class='add'>+							   &amp;notified, extack);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = ndo_dflt_fdb_add(ndm, tb, dev, addr, vid,</div><div class='ctx'> 					       nlh-&gt;nlmsg_flags);</div><div class='ctx'> </div><div class='del'>-		if (!err) {</div><div class='add'>+		if (!err &amp;&amp; !notified) {</div><div class='ctx'> 			rtnl_fdb_notify(dev, addr, vid, RTM_NEWNEIGH,</div><div class='ctx'> 					ndm-&gt;ndm_state);</div><div class='ctx'> 			ndm-&gt;ndm_flags &amp;= ~NTF_SELF;</div><div class='hunk'>@@ -3572,7 +4682,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * ndo_dflt_fdb_del - default netdevice operation to delete an FDB entry</div><div class='ctx'>  */</div><div class='ctx'> int ndo_dflt_fdb_del(struct ndmsg *ndm,</div><div class='hunk'>@@ -3586,7 +4696,7 @@ int ndo_dflt_fdb_del(struct ndmsg *ndm,</div><div class='ctx'> 	 * implement its own handler for this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(ndm-&gt;ndm_state &amp; NUD_PERMANENT)) {</div><div class='del'>-		pr_info("%s: FDB only supports static addresses\n", dev-&gt;name);</div><div class='add'>+		netdev_info(dev, "default FDB implementation only supports local addresses\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3602,18 +4712,25 @@ EXPORT_SYMBOL(ndo_dflt_fdb_del);</div><div class='ctx'> static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	bool del_bulk = !!(nlh-&gt;nlmsg_flags &amp; NLM_F_BULK);</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	const struct net_device_ops *ops;</div><div class='ctx'> 	struct ndmsg *ndm;</div><div class='ctx'> 	struct nlattr *tb[NDA_MAX+1];</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	__u8 *addr;</div><div class='add'>+	__u8 *addr = NULL;</div><div class='add'>+	int err;</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> </div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);</div><div class='add'>+	if (!del_bulk) {</div><div class='add'>+		err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX,</div><div class='add'>+					     NULL, extack);</div><div class='add'>+	} else {</div><div class='add'>+		/* For bulk delete, the drivers will parse the message with</div><div class='add'>+		 * policy.</div><div class='add'>+		 */</div><div class='add'>+		err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);</div><div class='add'>+	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3629,27 +4746,40 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!tb[NDA_LLADDR] || nla_len(tb[NDA_LLADDR]) != ETH_ALEN) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "invalid address");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (!del_bulk) {</div><div class='add'>+		if (!tb[NDA_LLADDR] || nla_len(tb[NDA_LLADDR]) != ETH_ALEN) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "invalid address");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		addr = nla_data(tb[NDA_LLADDR]);</div><div class='ctx'> </div><div class='del'>-	addr = nla_data(tb[NDA_LLADDR]);</div><div class='add'>+		err = fdb_vid_parse(tb[NDA_VLAN], &amp;vid, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = fdb_vid_parse(tb[NDA_VLAN], &amp;vid, extack);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if (dev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "FDB delete only supported for Ethernet devices");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* Support fdb on master device the net/bridge default case */</div><div class='ctx'> 	if ((!ndm-&gt;ndm_flags || ndm-&gt;ndm_flags &amp; NTF_MASTER) &amp;&amp;</div><div class='del'>-	    (dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT)) {</div><div class='add'>+	    netif_is_bridge_port(dev)) {</div><div class='ctx'> 		struct net_device *br_dev = netdev_master_upper_dev_get(dev);</div><div class='del'>-		const struct net_device_ops *ops = br_dev-&gt;netdev_ops;</div><div class='add'>+		bool notified = false;</div><div class='ctx'> </div><div class='del'>-		if (ops-&gt;ndo_fdb_del)</div><div class='del'>-			err = ops-&gt;ndo_fdb_del(ndm, tb, dev, addr, vid);</div><div class='add'>+		ops = br_dev-&gt;netdev_ops;</div><div class='add'>+		if (!del_bulk) {</div><div class='add'>+			if (ops-&gt;ndo_fdb_del)</div><div class='add'>+				err = ops-&gt;ndo_fdb_del(ndm, tb, dev, addr, vid,</div><div class='add'>+						       &amp;notified, extack);</div><div class='add'>+		} else {</div><div class='add'>+			if (ops-&gt;ndo_fdb_del_bulk)</div><div class='add'>+				err = ops-&gt;ndo_fdb_del_bulk(nlh, dev, extack);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3659,15 +4789,26 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	/* Embedded bridge, macvlan, and any other device support */</div><div class='ctx'> 	if (ndm-&gt;ndm_flags &amp; NTF_SELF) {</div><div class='del'>-		if (dev-&gt;netdev_ops-&gt;ndo_fdb_del)</div><div class='del'>-			err = dev-&gt;netdev_ops-&gt;ndo_fdb_del(ndm, tb, dev, addr,</div><div class='del'>-							   vid);</div><div class='del'>-		else</div><div class='del'>-			err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);</div><div class='add'>+		bool notified = false;</div><div class='add'>+</div><div class='add'>+		ops = dev-&gt;netdev_ops;</div><div class='add'>+		if (!del_bulk) {</div><div class='add'>+			if (ops-&gt;ndo_fdb_del)</div><div class='add'>+				err = ops-&gt;ndo_fdb_del(ndm, tb, dev, addr, vid,</div><div class='add'>+						       &amp;notified, extack);</div><div class='add'>+			else</div><div class='add'>+				err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);</div><div class='add'>+		} else {</div><div class='add'>+			/* in case err was cleared by NTF_MASTER call */</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			if (ops-&gt;ndo_fdb_del_bulk)</div><div class='add'>+				err = ops-&gt;ndo_fdb_del_bulk(nlh, dev, extack);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!err) {</div><div class='del'>-			rtnl_fdb_notify(dev, addr, vid, RTM_DELNEIGH,</div><div class='del'>-					ndm-&gt;ndm_state);</div><div class='add'>+			if (!del_bulk &amp;&amp; !notified)</div><div class='add'>+				rtnl_fdb_notify(dev, addr, vid, RTM_DELNEIGH,</div><div class='add'>+						ndm-&gt;ndm_state);</div><div class='ctx'> 			ndm-&gt;ndm_flags &amp;= ~NTF_SELF;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3681,15 +4822,16 @@ static int nlmsg_populate_fdb(struct sk_buff *skb,</div><div class='ctx'> 			      int *idx,</div><div class='ctx'> 			      struct netdev_hw_addr_list *list)</div><div class='ctx'> {</div><div class='add'>+	struct ndo_fdb_dump_context *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='del'>-	int err;</div><div class='ctx'> 	u32 portid, seq;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='ctx'> 	seq = cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ha, &amp;list-&gt;list, list) {</div><div class='del'>-		if (*idx &lt; cb-&gt;args[2])</div><div class='add'>+		if (*idx &lt; ctx-&gt;fdb_idx)</div><div class='ctx'> 			goto skip;</div><div class='ctx'> </div><div class='ctx'> 		err = nlmsg_populate_fdb_fill(skb, dev, ha-&gt;addr, 0,</div><div class='hunk'>@@ -3706,8 +4848,11 @@ skip:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ndo_dflt_fdb_dump - default netdevice operation to dump an FDB table.</div><div class='del'>- * @nlh: netlink message header</div><div class='add'>+ * @skb: socket buffer to store message in</div><div class='add'>+ * @cb: netlink callback</div><div class='ctx'>  * @dev: netdevice</div><div class='add'>+ * @filter_dev: ignored</div><div class='add'>+ * @idx: the number of FDB table entries dumped is added to *@idx</div><div class='ctx'>  *</div><div class='ctx'>  * Default netdevice operation to dump the existing unicast address list.</div><div class='ctx'>  * Returns number of addresses from list put in skb.</div><div class='hunk'>@@ -3720,6 +4865,9 @@ int ndo_dflt_fdb_dump(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;type != ARPHRD_ETHER)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	netif_addr_lock_bh(dev);</div><div class='ctx'> 	err = nlmsg_populate_fdb(skb, cb, dev, idx, &amp;dev-&gt;uc);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3731,22 +4879,66 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ndo_dflt_fdb_dump);</div><div class='ctx'> </div><div class='del'>-static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+static int valid_fdb_dump_strict(const struct nlmsghdr *nlh,</div><div class='add'>+				 int *br_idx, int *brport_idx,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NDA_MAX + 1];</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_payload(nlh, sizeof(*ndm));</div><div class='add'>+	if (!ndm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for fdb dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_pad1  || ndm-&gt;ndm_pad2  || ndm-&gt;ndm_state ||</div><div class='add'>+	    ndm-&gt;ndm_flags || ndm-&gt;ndm_type) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for fdb dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,</div><div class='add'>+					    NDA_MAX, NULL, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*brport_idx = ndm-&gt;ndm_ifindex;</div><div class='add'>+	for (i = 0; i &lt;= NDA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NDA_IFINDEX:</div><div class='add'>+			if (nla_len(tb[i]) != sizeof(u32)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid IFINDEX attribute in fdb dump request");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			*brport_idx = nla_get_u32(tb[NDA_IFINDEX]);</div><div class='add'>+			break;</div><div class='add'>+		case NDA_MASTER:</div><div class='add'>+			if (nla_len(tb[i]) != sizeof(u32)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid MASTER attribute in fdb dump request");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			*br_idx = nla_get_u32(tb[NDA_MASTER]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in fdb dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int valid_fdb_dump_legacy(const struct nlmsghdr *nlh,</div><div class='add'>+				 int *br_idx, int *brport_idx,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct nlattr *tb[IFLA_MAX+1];</div><div class='del'>-	struct net_device *br_dev = NULL;</div><div class='del'>-	const struct net_device_ops *ops = NULL;</div><div class='del'>-	const struct net_device_ops *cops = NULL;</div><div class='del'>-	struct ifinfomsg *ifm = nlmsg_data(cb-&gt;nlh);</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	int brport_idx = 0;</div><div class='del'>-	int br_idx = 0;</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx = 0, s_idx;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int fidx = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* A hack to preserve kernel&lt;-&gt;userspace interface.</div><div class='ctx'> 	 * Before Linux v4.12 this code accepted ndmsg since iproute2 v3.3.0.</div><div class='hunk'>@@ -3755,20 +4947,48 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	 * Fortunately these sizes don't conflict with the size of ifinfomsg</div><div class='ctx'> 	 * with an optional attribute.</div><div class='ctx'> 	 */</div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) != sizeof(struct ndmsg) &amp;&amp;</div><div class='del'>-	    (nlmsg_len(cb-&gt;nlh) != sizeof(struct ndmsg) +</div><div class='add'>+	if (nlmsg_len(nlh) != sizeof(struct ndmsg) &amp;&amp;</div><div class='add'>+	    (nlmsg_len(nlh) != sizeof(struct ndmsg) +</div><div class='ctx'> 	     nla_attr_size(sizeof(u32)))) {</div><div class='del'>-		err = nlmsg_parse(cb-&gt;nlh, sizeof(struct ifinfomsg), tb,</div><div class='del'>-				  IFLA_MAX, ifla_policy, NULL);</div><div class='add'>+		struct ifinfomsg *ifm;</div><div class='add'>+</div><div class='add'>+		err = nlmsg_parse_deprecated(nlh, sizeof(struct ifinfomsg),</div><div class='add'>+					     tb, IFLA_MAX, ifla_policy,</div><div class='add'>+					     extack);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		} else if (err == 0) {</div><div class='ctx'> 			if (tb[IFLA_MASTER])</div><div class='del'>-				br_idx = nla_get_u32(tb[IFLA_MASTER]);</div><div class='add'>+				*br_idx = nla_get_u32(tb[IFLA_MASTER]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		brport_idx = ifm-&gt;ifi_index;</div><div class='add'>+		ifm = nlmsg_data(nlh);</div><div class='add'>+		*brport_idx = ifm-&gt;ifi_index;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = NULL, *cops = NULL;</div><div class='add'>+	struct ndo_fdb_dump_context *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct net_device *dev, *br_dev = NULL;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	int brport_idx = 0;</div><div class='add'>+	int br_idx = 0;</div><div class='add'>+	int fidx = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	NL_ASSERT_CTX_FITS(struct ndo_fdb_dump_context);</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check)</div><div class='add'>+		err = valid_fdb_dump_strict(cb-&gt;nlh, &amp;br_idx, &amp;brport_idx,</div><div class='add'>+					    cb-&gt;extack);</div><div class='add'>+	else</div><div class='add'>+		err = valid_fdb_dump_legacy(cb-&gt;nlh, &amp;br_idx, &amp;brport_idx,</div><div class='add'>+					    cb-&gt;extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (br_idx) {</div><div class='ctx'> 		br_dev = __dev_get_by_index(net, br_idx);</div><div class='hunk'>@@ -3778,72 +4998,212 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 		ops = br_dev-&gt;netdev_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = cb-&gt;args[1];</div><div class='del'>-</div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		hlist_for_each_entry(dev, head, index_hlist) {</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		if (brport_idx &amp;&amp; (dev-&gt;ifindex != brport_idx))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			if (brport_idx &amp;&amp; (dev-&gt;ifindex != brport_idx))</div><div class='add'>+		if (!br_idx) { /* user did not specify a specific bridge */</div><div class='add'>+			if (netif_is_bridge_port(dev)) {</div><div class='add'>+				br_dev = netdev_master_upper_dev_get(dev);</div><div class='add'>+				cops = br_dev-&gt;netdev_ops;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (dev != br_dev &amp;&amp;</div><div class='add'>+			    !netif_is_bridge_port(dev))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (!br_idx) { /* user did not specify a specific bridge */</div><div class='del'>-				if (dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT) {</div><div class='del'>-					br_dev = netdev_master_upper_dev_get(dev);</div><div class='del'>-					cops = br_dev-&gt;netdev_ops;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (dev != br_dev &amp;&amp;</div><div class='del'>-				    !(dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT))</div><div class='del'>-					continue;</div><div class='add'>+			if (br_dev != netdev_master_upper_dev_get(dev) &amp;&amp;</div><div class='add'>+			    !netif_is_bridge_master(dev))</div><div class='add'>+				continue;</div><div class='add'>+			cops = ops;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-				if (br_dev != netdev_master_upper_dev_get(dev) &amp;&amp;</div><div class='del'>-				    !(dev-&gt;priv_flags &amp; IFF_EBRIDGE))</div><div class='del'>-					continue;</div><div class='del'>-				cops = ops;</div><div class='add'>+		if (netif_is_bridge_port(dev)) {</div><div class='add'>+			if (cops &amp;&amp; cops-&gt;ndo_fdb_dump) {</div><div class='add'>+				err = cops-&gt;ndo_fdb_dump(skb, cb, br_dev, dev,</div><div class='add'>+							&amp;fidx);</div><div class='add'>+				if (err == -EMSGSIZE)</div><div class='add'>+					break;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='add'>+		if (dev-&gt;netdev_ops-&gt;ndo_fdb_dump)</div><div class='add'>+			err = dev-&gt;netdev_ops-&gt;ndo_fdb_dump(skb, cb, dev, NULL,</div><div class='add'>+							    &amp;fidx);</div><div class='add'>+		else</div><div class='add'>+			err = ndo_dflt_fdb_dump(skb, cb, dev, NULL, &amp;fidx);</div><div class='add'>+		if (err == -EMSGSIZE)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			if (dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT) {</div><div class='del'>-				if (cops &amp;&amp; cops-&gt;ndo_fdb_dump) {</div><div class='del'>-					err = cops-&gt;ndo_fdb_dump(skb, cb,</div><div class='del'>-								br_dev, dev,</div><div class='del'>-								&amp;fidx);</div><div class='del'>-					if (err == -EMSGSIZE)</div><div class='del'>-						goto out;</div><div class='del'>-				}</div><div class='add'>+		cops = NULL;</div><div class='add'>+</div><div class='add'>+		/* reset fdb offset to 0 for rest of the interfaces */</div><div class='add'>+		ctx-&gt;fdb_idx = 0;</div><div class='add'>+		fidx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;fdb_idx = fidx;</div><div class='add'>+</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int valid_fdb_get_strict(const struct nlmsghdr *nlh,</div><div class='add'>+				struct nlattr **tb, u8 *ndm_flags,</div><div class='add'>+				int *br_idx, int *brport_idx, u8 **addr,</div><div class='add'>+				u16 *vid, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_payload(nlh, sizeof(*ndm));</div><div class='add'>+	if (!ndm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for fdb get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_pad1  || ndm-&gt;ndm_pad2  || ndm-&gt;ndm_state ||</div><div class='add'>+	    ndm-&gt;ndm_type) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for fdb get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndm-&gt;ndm_flags &amp; ~(NTF_MASTER | NTF_SELF)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid flags in header for fdb get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,</div><div class='add'>+					    NDA_MAX, nda_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*ndm_flags = ndm-&gt;ndm_flags;</div><div class='add'>+	*brport_idx = ndm-&gt;ndm_ifindex;</div><div class='add'>+	for (i = 0; i &lt;= NDA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NDA_MASTER:</div><div class='add'>+			*br_idx = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case NDA_LLADDR:</div><div class='add'>+			if (nla_len(tb[i]) != ETH_ALEN) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid address in fdb get request");</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='add'>+			*addr = nla_data(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case NDA_VLAN:</div><div class='add'>+			err = fdb_vid_parse(tb[i], vid, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			break;</div><div class='add'>+		case NDA_VNI:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in fdb get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (dev-&gt;netdev_ops-&gt;ndo_fdb_dump)</div><div class='del'>-				err = dev-&gt;netdev_ops-&gt;ndo_fdb_dump(skb, cb,</div><div class='del'>-								    dev, NULL,</div><div class='del'>-								    &amp;fidx);</div><div class='del'>-			else</div><div class='del'>-				err = ndo_dflt_fdb_dump(skb, cb, dev, NULL,</div><div class='del'>-							&amp;fidx);</div><div class='del'>-			if (err == -EMSGSIZE)</div><div class='del'>-				goto out;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_fdb_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = NULL, *br_dev = NULL;</div><div class='add'>+	const struct net_device_ops *ops = NULL;</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct nlattr *tb[NDA_MAX + 1];</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int brport_idx = 0;</div><div class='add'>+	u8 ndm_flags = 0;</div><div class='add'>+	int br_idx = 0;</div><div class='add'>+	u8 *addr = NULL;</div><div class='add'>+	u16 vid = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-			cops = NULL;</div><div class='add'>+	err = valid_fdb_get_strict(nlh, tb, &amp;ndm_flags, &amp;br_idx,</div><div class='add'>+				   &amp;brport_idx, &amp;addr, &amp;vid, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-			/* reset fdb offset to 0 for rest of the interfaces */</div><div class='del'>-			cb-&gt;args[2] = 0;</div><div class='del'>-			fidx = 0;</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='add'>+	if (!addr) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Missing lookup address for fdb get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (brport_idx) {</div><div class='add'>+		dev = __dev_get_by_index(net, brport_idx);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unknown device ifindex");</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[2] = fidx;</div><div class='add'>+	if (br_idx) {</div><div class='add'>+		if (dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Master and device are mutually exclusive");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+		br_dev = __dev_get_by_index(net, br_idx);</div><div class='add'>+		if (!br_dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid master ifindex");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ops = br_dev-&gt;netdev_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		if (!ndm_flags || (ndm_flags &amp; NTF_MASTER)) {</div><div class='add'>+			if (!netif_is_bridge_port(dev)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Device is not a bridge port");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			br_dev = netdev_master_upper_dev_get(dev);</div><div class='add'>+			if (!br_dev) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Master of device not found");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			ops = br_dev-&gt;netdev_ops;</div><div class='add'>+		} else {</div><div class='add'>+			if (!(ndm_flags &amp; NTF_SELF)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Missing NTF_SELF");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			ops = dev-&gt;netdev_ops;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!br_dev &amp;&amp; !dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "No device specified");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;ndo_fdb_get) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Fdb get operation not supported by device");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (br_dev)</div><div class='add'>+		dev = br_dev;</div><div class='add'>+	err = ops-&gt;ndo_fdb_get(skb, tb, dev, addr, vid,</div><div class='add'>+			       NETLINK_CB(in_skb).portid,</div><div class='add'>+			       nlh-&gt;nlmsg_seq, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brport_nla_put_flag(struct sk_buff *skb, u32 flags, u32 mask,</div><div class='hunk'>@@ -3879,7 +5239,7 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 	ifm-&gt;__ifi_pad = 0;</div><div class='ctx'> 	ifm-&gt;ifi_type = dev-&gt;type;</div><div class='ctx'> 	ifm-&gt;ifi_index = dev-&gt;ifindex;</div><div class='del'>-	ifm-&gt;ifi_flags = dev_get_flags(dev);</div><div class='add'>+	ifm-&gt;ifi_flags = netif_get_flags(dev);</div><div class='ctx'> 	ifm-&gt;ifi_change = 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3894,7 +5254,7 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 	     nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev))))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	br_afspec = nla_nest_start(skb, IFLA_AF_SPEC);</div><div class='add'>+	br_afspec = nla_nest_start_noflag(skb, IFLA_AF_SPEC);</div><div class='ctx'> 	if (!br_afspec)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -3918,7 +5278,7 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 	}</div><div class='ctx'> 	nla_nest_end(skb, br_afspec);</div><div class='ctx'> </div><div class='del'>-	protinfo = nla_nest_start(skb, IFLA_PROTINFO | NLA_F_NESTED);</div><div class='add'>+	protinfo = nla_nest_start(skb, IFLA_PROTINFO);</div><div class='ctx'> 	if (!protinfo)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -3938,7 +5298,11 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 	    brport_nla_put_flag(skb, flags, mask,</div><div class='ctx'> 				IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD) ||</div><div class='ctx'> 	    brport_nla_put_flag(skb, flags, mask,</div><div class='del'>-				IFLA_BRPORT_PROXYARP, BR_PROXYARP)) {</div><div class='add'>+				IFLA_BRPORT_PROXYARP, BR_PROXYARP) ||</div><div class='add'>+	    brport_nla_put_flag(skb, flags, mask,</div><div class='add'>+				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||</div><div class='add'>+	    brport_nla_put_flag(skb, flags, mask,</div><div class='add'>+				IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD)) {</div><div class='ctx'> 		nla_nest_cancel(skb, protinfo);</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3953,28 +5317,75 @@ nla_put_failure:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ndo_dflt_bridge_getlink);</div><div class='ctx'> </div><div class='add'>+static int valid_bridge_getlink_req(const struct nlmsghdr *nlh,</div><div class='add'>+				    bool strict_check, u32 *filter_mask,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_MAX+1];</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (strict_check) {</div><div class='add'>+		struct ifinfomsg *ifm;</div><div class='add'>+</div><div class='add'>+		ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+		if (!ifm) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid header for bridge link dump");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ifm-&gt;__ifi_pad || ifm-&gt;ifi_type || ifm-&gt;ifi_flags ||</div><div class='add'>+		    ifm-&gt;ifi_change || ifm-&gt;ifi_index) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid values in header for bridge link dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = nlmsg_parse_deprecated_strict(nlh,</div><div class='add'>+						    sizeof(struct ifinfomsg),</div><div class='add'>+						    tb, IFLA_MAX, ifla_policy,</div><div class='add'>+						    extack);</div><div class='add'>+	} else {</div><div class='add'>+		err = nlmsg_parse_deprecated(nlh, sizeof(struct ifinfomsg),</div><div class='add'>+					     tb, IFLA_MAX, ifla_policy,</div><div class='add'>+					     extack);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* new attributes should only be added with strict checking */</div><div class='add'>+	for (i = 0; i &lt;= IFLA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case IFLA_EXT_MASK:</div><div class='add'>+			*filter_mask = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (strict_check) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Unsupported attribute in bridge link dump request");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> 	u32 portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='del'>-	u32 seq = cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='add'>+	u32 seq = nlh-&gt;nlmsg_seq;</div><div class='ctx'> 	u32 filter_mask = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &gt; sizeof(struct ifinfomsg)) {</div><div class='del'>-		struct nlattr *extfilt;</div><div class='del'>-</div><div class='del'>-		extfilt = nlmsg_find_attr(cb-&gt;nlh, sizeof(struct ifinfomsg),</div><div class='del'>-					  IFLA_EXT_MASK);</div><div class='del'>-		if (extfilt) {</div><div class='del'>-			if (nla_len(extfilt) &lt; sizeof(filter_mask))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			filter_mask = nla_get_u32(extfilt);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err = valid_bridge_getlink_req(nlh, cb-&gt;strict_check, &amp;filter_mask,</div><div class='add'>+				       cb-&gt;extack);</div><div class='add'>+	if (err &lt; 0 &amp;&amp; cb-&gt;strict_check)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for_each_netdev_rcu(net, dev) {</div><div class='hunk'>@@ -4054,6 +5465,10 @@ static int rtnl_bridge_notify(struct net_device *dev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	/* Notification info is only filled for bridge ports, not the bridge</div><div class='add'>+	 * device itself. Therefore, a zero notification length is valid and</div><div class='add'>+	 * should not result in an error.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!skb-&gt;len)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='hunk'>@@ -4073,10 +5488,9 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct ifinfomsg *ifm;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct nlattr *br_spec, *attr = NULL;</div><div class='add'>+	struct nlattr *br_spec, *attr, *br_flags_attr = NULL;</div><div class='ctx'> 	int rem, err = -EOPNOTSUPP;</div><div class='ctx'> 	u16 flags = 0;</div><div class='del'>-	bool have_flags = false;</div><div class='ctx'> </div><div class='ctx'> 	if (nlmsg_len(nlh) &lt; sizeof(*ifm))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -4094,13 +5508,17 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);</div><div class='ctx'> 	if (br_spec) {</div><div class='ctx'> 		nla_for_each_nested(attr, br_spec, rem) {</div><div class='del'>-			if (nla_type(attr) == IFLA_BRIDGE_FLAGS) {</div><div class='add'>+			if (nla_type(attr) == IFLA_BRIDGE_FLAGS &amp;&amp; !br_flags_attr) {</div><div class='ctx'> 				if (nla_len(attr) &lt; sizeof(flags))</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> </div><div class='del'>-				have_flags = true;</div><div class='add'>+				br_flags_attr = attr;</div><div class='ctx'> 				flags = nla_get_u16(attr);</div><div class='del'>-				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (nla_type(attr) == IFLA_BRIDGE_MODE) {</div><div class='add'>+				if (nla_len(attr) &lt; sizeof(u16))</div><div class='add'>+					return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4113,7 +5531,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = br_dev-&gt;netdev_ops-&gt;ndo_bridge_setlink(dev, nlh, flags);</div><div class='add'>+		err = br_dev-&gt;netdev_ops-&gt;ndo_bridge_setlink(dev, nlh, flags,</div><div class='add'>+							     extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -4125,7 +5544,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 		else</div><div class='ctx'> 			err = dev-&gt;netdev_ops-&gt;ndo_bridge_setlink(dev, nlh,</div><div class='del'>-								  flags);</div><div class='add'>+								  flags,</div><div class='add'>+								  extack);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			flags &amp;= ~BRIDGE_FLAGS_SELF;</div><div class='ctx'> </div><div class='hunk'>@@ -4136,8 +5556,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (have_flags)</div><div class='del'>-		memcpy(nla_data(attr), &amp;flags, sizeof(flags));</div><div class='add'>+	if (br_flags_attr)</div><div class='add'>+		memcpy(nla_data(br_flags_attr), &amp;flags, sizeof(flags));</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -4168,15 +5588,14 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);</div><div class='ctx'> 	if (br_spec) {</div><div class='del'>-		nla_for_each_nested(attr, br_spec, rem) {</div><div class='del'>-			if (nla_type(attr) == IFLA_BRIDGE_FLAGS) {</div><div class='del'>-				if (nla_len(attr) &lt; sizeof(flags))</div><div class='del'>-					return -EINVAL;</div><div class='add'>+		nla_for_each_nested_type(attr, IFLA_BRIDGE_FLAGS, br_spec,</div><div class='add'>+					 rem) {</div><div class='add'>+			if (nla_len(attr) &lt; sizeof(flags))</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-				have_flags = true;</div><div class='del'>-				flags = nla_get_u16(attr);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+			have_flags = true;</div><div class='add'>+			flags = nla_get_u16(attr);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4224,82 +5643,257 @@ static bool stats_attr_valid(unsigned int mask, int attrid, int idxattr)</div><div class='ctx'> 	       (!idxattr || idxattr == attrid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IFLA_OFFLOAD_XSTATS_FIRST (IFLA_OFFLOAD_XSTATS_UNSPEC + 1)</div><div class='del'>-static int rtnl_get_offload_stats_attr_size(int attr_id)</div><div class='add'>+static bool</div><div class='add'>+rtnl_offload_xstats_have_ndo(const struct net_device *dev, int attr_id)</div><div class='ctx'> {</div><div class='del'>-	switch (attr_id) {</div><div class='del'>-	case IFLA_OFFLOAD_XSTATS_CPU_HIT:</div><div class='del'>-		return sizeof(struct rtnl_link_stats64);</div><div class='del'>-	}</div><div class='add'>+	return dev-&gt;netdev_ops &amp;&amp;</div><div class='add'>+	       dev-&gt;netdev_ops-&gt;ndo_has_offload_stats &amp;&amp;</div><div class='add'>+	       dev-&gt;netdev_ops-&gt;ndo_get_offload_stats &amp;&amp;</div><div class='add'>+	       dev-&gt;netdev_ops-&gt;ndo_has_offload_stats(dev, attr_id);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static unsigned int</div><div class='add'>+rtnl_offload_xstats_get_size_ndo(const struct net_device *dev, int attr_id)</div><div class='add'>+{</div><div class='add'>+	return rtnl_offload_xstats_have_ndo(dev, attr_id) ?</div><div class='add'>+	       sizeof(struct rtnl_link_stats64) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtnl_get_offload_stats(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				  int *prividx)</div><div class='add'>+static int</div><div class='add'>+rtnl_offload_xstats_fill_ndo(struct net_device *dev, int attr_id,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	unsigned int size = rtnl_offload_xstats_get_size_ndo(dev, attr_id);</div><div class='ctx'> 	struct nlattr *attr = NULL;</div><div class='del'>-	int attr_id, size;</div><div class='ctx'> 	void *attr_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;netdev_ops &amp;&amp; dev-&gt;netdev_ops-&gt;ndo_has_offload_stats &amp;&amp;</div><div class='del'>-	      dev-&gt;netdev_ops-&gt;ndo_get_offload_stats))</div><div class='add'>+	if (!size)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> </div><div class='del'>-	for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;</div><div class='del'>-	     attr_id &lt;= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {</div><div class='del'>-		if (attr_id &lt; *prividx)</div><div class='del'>-			continue;</div><div class='add'>+	attr = nla_reserve_64bit(skb, attr_id, size,</div><div class='add'>+				 IFLA_OFFLOAD_XSTATS_UNSPEC);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-		size = rtnl_get_offload_stats_attr_size(attr_id);</div><div class='del'>-		if (!size)</div><div class='del'>-			continue;</div><div class='add'>+	attr_data = nla_data(attr);</div><div class='add'>+	memset(attr_data, 0, size);</div><div class='ctx'> </div><div class='del'>-		if (!dev-&gt;netdev_ops-&gt;ndo_has_offload_stats(dev, attr_id))</div><div class='del'>-			continue;</div><div class='add'>+	err = dev-&gt;netdev_ops-&gt;ndo_get_offload_stats(attr_id, dev, attr_data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+rtnl_offload_xstats_get_size_stats(const struct net_device *dev,</div><div class='add'>+				   enum netdev_offload_xstats_type type)</div><div class='add'>+{</div><div class='add'>+	bool enabled = netdev_offload_xstats_enabled(dev, type);</div><div class='add'>+</div><div class='add'>+	return enabled ? sizeof(struct rtnl_hw_stats64) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtnl_offload_xstats_request_used {</div><div class='add'>+	bool request;</div><div class='add'>+	bool used;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtnl_offload_xstats_get_stats(struct net_device *dev,</div><div class='add'>+			      enum netdev_offload_xstats_type type,</div><div class='add'>+			      struct rtnl_offload_xstats_request_used *ru,</div><div class='add'>+			      struct rtnl_hw_stats64 *stats,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool request;</div><div class='add'>+	bool used;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	request = netdev_offload_xstats_enabled(dev, type);</div><div class='add'>+	if (!request) {</div><div class='add'>+		used = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_offload_xstats_get(dev, type, stats, &amp;used, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ru) {</div><div class='add'>+		ru-&gt;request = request;</div><div class='add'>+		ru-&gt;used = used;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtnl_offload_xstats_fill_hw_s_info_one(struct sk_buff *skb, int attr_id,</div><div class='add'>+				       struct rtnl_offload_xstats_request_used *ru)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, attr_id);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST, ru-&gt;request))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED, ru-&gt;used))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtnl_offload_xstats_fill_hw_s_info(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum netdev_offload_xstats_type t_l3 = NETDEV_OFFLOAD_XSTATS_TYPE_L3;</div><div class='add'>+	struct rtnl_offload_xstats_request_used ru_l3;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtnl_offload_xstats_get_stats(dev, t_l3, &amp;ru_l3, NULL, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		attr = nla_reserve_64bit(skb, attr_id, size,</div><div class='add'>+	nest = nla_nest_start(skb, IFLA_OFFLOAD_XSTATS_HW_S_INFO);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (rtnl_offload_xstats_fill_hw_s_info_one(skb,</div><div class='add'>+						   IFLA_OFFLOAD_XSTATS_L3_STATS,</div><div class='add'>+						   &amp;ru_l3))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_offload_xstats_fill(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				    int *prividx, u32 off_filter_mask,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum netdev_offload_xstats_type t_l3 = NETDEV_OFFLOAD_XSTATS_TYPE_L3;</div><div class='add'>+	int attr_id_hw_s_info = IFLA_OFFLOAD_XSTATS_HW_S_INFO;</div><div class='add'>+	int attr_id_l3_stats = IFLA_OFFLOAD_XSTATS_L3_STATS;</div><div class='add'>+	int attr_id_cpu_hit = IFLA_OFFLOAD_XSTATS_CPU_HIT;</div><div class='add'>+	bool have_data = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (*prividx &lt;= attr_id_cpu_hit &amp;&amp;</div><div class='add'>+	    (off_filter_mask &amp;</div><div class='add'>+	     IFLA_STATS_FILTER_BIT(attr_id_cpu_hit))) {</div><div class='add'>+		err = rtnl_offload_xstats_fill_ndo(dev, attr_id_cpu_hit, skb);</div><div class='add'>+		if (!err) {</div><div class='add'>+			have_data = true;</div><div class='add'>+		} else if (err != -ENODATA) {</div><div class='add'>+			*prividx = attr_id_cpu_hit;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*prividx &lt;= attr_id_hw_s_info &amp;&amp;</div><div class='add'>+	    (off_filter_mask &amp; IFLA_STATS_FILTER_BIT(attr_id_hw_s_info))) {</div><div class='add'>+		*prividx = attr_id_hw_s_info;</div><div class='add'>+</div><div class='add'>+		err = rtnl_offload_xstats_fill_hw_s_info(skb, dev, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		have_data = true;</div><div class='add'>+		*prividx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*prividx &lt;= attr_id_l3_stats &amp;&amp;</div><div class='add'>+	    (off_filter_mask &amp; IFLA_STATS_FILTER_BIT(attr_id_l3_stats))) {</div><div class='add'>+		unsigned int size_l3;</div><div class='add'>+		struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+		*prividx = attr_id_l3_stats;</div><div class='add'>+</div><div class='add'>+		size_l3 = rtnl_offload_xstats_get_size_stats(dev, t_l3);</div><div class='add'>+		if (!size_l3)</div><div class='add'>+			goto skip_l3_stats;</div><div class='add'>+		attr = nla_reserve_64bit(skb, attr_id_l3_stats, size_l3,</div><div class='ctx'> 					 IFLA_OFFLOAD_XSTATS_UNSPEC);</div><div class='ctx'> 		if (!attr)</div><div class='del'>-			goto nla_put_failure;</div><div class='add'>+			return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-		attr_data = nla_data(attr);</div><div class='del'>-		memset(attr_data, 0, size);</div><div class='del'>-		err = dev-&gt;netdev_ops-&gt;ndo_get_offload_stats(attr_id, dev,</div><div class='del'>-							     attr_data);</div><div class='add'>+		err = rtnl_offload_xstats_get_stats(dev, t_l3, NULL,</div><div class='add'>+						    nla_data(attr), extack);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto get_offload_stats_failure;</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		have_data = true;</div><div class='add'>+skip_l3_stats:</div><div class='add'>+		*prividx = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!attr)</div><div class='add'>+	if (!have_data)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	*prividx = 0;</div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-nla_put_failure:</div><div class='del'>-	err = -EMSGSIZE;</div><div class='del'>-get_offload_stats_failure:</div><div class='del'>-	*prividx = attr_id;</div><div class='del'>-	return err;</div><div class='add'>+static unsigned int</div><div class='add'>+rtnl_offload_xstats_get_size_hw_s_info_one(const struct net_device *dev,</div><div class='add'>+					   enum netdev_offload_xstats_type type)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(0) +</div><div class='add'>+		/* IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST */</div><div class='add'>+		nla_total_size(sizeof(u8)) +</div><div class='add'>+		/* IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED */</div><div class='add'>+		nla_total_size(sizeof(u8)) +</div><div class='add'>+		0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtnl_get_offload_stats_size(const struct net_device *dev)</div><div class='add'>+static unsigned int</div><div class='add'>+rtnl_offload_xstats_get_size_hw_s_info(const struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	enum netdev_offload_xstats_type t_l3 = NETDEV_OFFLOAD_XSTATS_TYPE_L3;</div><div class='add'>+</div><div class='add'>+	return nla_total_size(0) +</div><div class='add'>+		/* IFLA_OFFLOAD_XSTATS_L3_STATS */</div><div class='add'>+		rtnl_offload_xstats_get_size_hw_s_info_one(dev, t_l3) +</div><div class='add'>+		0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_offload_xstats_get_size(const struct net_device *dev,</div><div class='add'>+					u32 off_filter_mask)</div><div class='add'>+{</div><div class='add'>+	enum netdev_offload_xstats_type t_l3 = NETDEV_OFFLOAD_XSTATS_TYPE_L3;</div><div class='add'>+	int attr_id_cpu_hit = IFLA_OFFLOAD_XSTATS_CPU_HIT;</div><div class='ctx'> 	int nla_size = 0;</div><div class='del'>-	int attr_id;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;netdev_ops &amp;&amp; dev-&gt;netdev_ops-&gt;ndo_has_offload_stats &amp;&amp;</div><div class='del'>-	      dev-&gt;netdev_ops-&gt;ndo_get_offload_stats))</div><div class='del'>-		return 0;</div><div class='add'>+	if (off_filter_mask &amp;</div><div class='add'>+	    IFLA_STATS_FILTER_BIT(attr_id_cpu_hit)) {</div><div class='add'>+		size = rtnl_offload_xstats_get_size_ndo(dev, attr_id_cpu_hit);</div><div class='add'>+		nla_size += nla_total_size_64bit(size);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;</div><div class='del'>-	     attr_id &lt;= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {</div><div class='del'>-		if (!dev-&gt;netdev_ops-&gt;ndo_has_offload_stats(dev, attr_id))</div><div class='del'>-			continue;</div><div class='del'>-		size = rtnl_get_offload_stats_attr_size(attr_id);</div><div class='add'>+	if (off_filter_mask &amp;</div><div class='add'>+	    IFLA_STATS_FILTER_BIT(IFLA_OFFLOAD_XSTATS_HW_S_INFO))</div><div class='add'>+		nla_size += rtnl_offload_xstats_get_size_hw_s_info(dev);</div><div class='add'>+</div><div class='add'>+	if (off_filter_mask &amp;</div><div class='add'>+	    IFLA_STATS_FILTER_BIT(IFLA_OFFLOAD_XSTATS_L3_STATS)) {</div><div class='add'>+		size = rtnl_offload_xstats_get_size_stats(dev, t_l3);</div><div class='ctx'> 		nla_size += nla_total_size_64bit(size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4309,11 +5903,21 @@ static int rtnl_get_offload_stats_size(const struct net_device *dev)</div><div class='ctx'> 	return nla_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct rtnl_stats_dump_filters {</div><div class='add'>+	/* mask[0] filters outer attributes. Then individual nests have their</div><div class='add'>+	 * filtering mask at the index of the nested attribute.</div><div class='add'>+	 */</div><div class='add'>+	u32 mask[IFLA_STATS_MAX + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			       int type, u32 pid, u32 seq, u32 change,</div><div class='del'>-			       unsigned int flags, unsigned int filter_mask,</div><div class='del'>-			       int *idxattr, int *prividx)</div><div class='add'>+			       unsigned int flags,</div><div class='add'>+			       const struct rtnl_stats_dump_filters *filters,</div><div class='add'>+			       int *idxattr, int *prividx,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	unsigned int filter_mask = filters-&gt;mask[0];</div><div class='ctx'> 	struct if_stats_msg *ifsm;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct nlattr *attr;</div><div class='hunk'>@@ -4339,8 +5943,10 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		attr = nla_reserve_64bit(skb, IFLA_STATS_LINK_64,</div><div class='ctx'> 					 sizeof(struct rtnl_link_stats64),</div><div class='ctx'> 					 IFLA_STATS_UNSPEC);</div><div class='del'>-		if (!attr)</div><div class='add'>+		if (!attr) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		sp = nla_data(attr);</div><div class='ctx'> 		dev_get_stats(dev, sp);</div><div class='hunk'>@@ -4351,10 +5957,12 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (ops &amp;&amp; ops-&gt;fill_linkxstats) {</div><div class='ctx'> 			*idxattr = IFLA_STATS_LINK_XSTATS;</div><div class='del'>-			attr = nla_nest_start(skb,</div><div class='del'>-					      IFLA_STATS_LINK_XSTATS);</div><div class='del'>-			if (!attr)</div><div class='add'>+			attr = nla_nest_start_noflag(skb,</div><div class='add'>+						     IFLA_STATS_LINK_XSTATS);</div><div class='add'>+			if (!attr) {</div><div class='add'>+				err = -EMSGSIZE;</div><div class='ctx'> 				goto nla_put_failure;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			err = ops-&gt;fill_linkxstats(skb, dev, prividx, *idxattr);</div><div class='ctx'> 			nla_nest_end(skb, attr);</div><div class='hunk'>@@ -4374,10 +5982,12 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			ops = master-&gt;rtnl_link_ops;</div><div class='ctx'> 		if (ops &amp;&amp; ops-&gt;fill_linkxstats) {</div><div class='ctx'> 			*idxattr = IFLA_STATS_LINK_XSTATS_SLAVE;</div><div class='del'>-			attr = nla_nest_start(skb,</div><div class='del'>-					      IFLA_STATS_LINK_XSTATS_SLAVE);</div><div class='del'>-			if (!attr)</div><div class='add'>+			attr = nla_nest_start_noflag(skb,</div><div class='add'>+						     IFLA_STATS_LINK_XSTATS_SLAVE);</div><div class='add'>+			if (!attr) {</div><div class='add'>+				err = -EMSGSIZE;</div><div class='ctx'> 				goto nla_put_failure;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			err = ops-&gt;fill_linkxstats(skb, dev, prividx, *idxattr);</div><div class='ctx'> 			nla_nest_end(skb, attr);</div><div class='hunk'>@@ -4389,12 +5999,19 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_OFFLOAD_XSTATS,</div><div class='ctx'> 			     *idxattr)) {</div><div class='add'>+		u32 off_filter_mask;</div><div class='add'>+</div><div class='add'>+		off_filter_mask = filters-&gt;mask[IFLA_STATS_LINK_OFFLOAD_XSTATS];</div><div class='ctx'> 		*idxattr = IFLA_STATS_LINK_OFFLOAD_XSTATS;</div><div class='del'>-		attr = nla_nest_start(skb, IFLA_STATS_LINK_OFFLOAD_XSTATS);</div><div class='del'>-		if (!attr)</div><div class='add'>+		attr = nla_nest_start_noflag(skb,</div><div class='add'>+					     IFLA_STATS_LINK_OFFLOAD_XSTATS);</div><div class='add'>+		if (!attr) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		err = rtnl_get_offload_stats(skb, dev, prividx);</div><div class='add'>+		err = rtnl_offload_xstats_fill(skb, dev, prividx,</div><div class='add'>+					       off_filter_mask, extack);</div><div class='ctx'> 		if (err == -ENODATA)</div><div class='ctx'> 			nla_nest_cancel(skb, attr);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -4409,19 +6026,22 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		struct rtnl_af_ops *af_ops;</div><div class='ctx'> </div><div class='ctx'> 		*idxattr = IFLA_STATS_AF_SPEC;</div><div class='del'>-		attr = nla_nest_start(skb, IFLA_STATS_AF_SPEC);</div><div class='del'>-		if (!attr)</div><div class='add'>+		attr = nla_nest_start_noflag(skb, IFLA_STATS_AF_SPEC);</div><div class='add'>+		if (!attr) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		list_for_each_entry_rcu(af_ops, &amp;rtnl_af_ops, list) {</div><div class='ctx'> 			if (af_ops-&gt;fill_stats_af) {</div><div class='ctx'> 				struct nlattr *af;</div><div class='del'>-				int err;</div><div class='ctx'> </div><div class='del'>-				af = nla_nest_start(skb, af_ops-&gt;family);</div><div class='add'>+				af = nla_nest_start_noflag(skb,</div><div class='add'>+							   af_ops-&gt;family);</div><div class='ctx'> 				if (!af) {</div><div class='ctx'> 					rcu_read_unlock();</div><div class='add'>+					err = -EMSGSIZE;</div><div class='ctx'> 					goto nla_put_failure;</div><div class='ctx'> 				}</div><div class='ctx'> 				err = af_ops-&gt;fill_stats_af(skb, dev);</div><div class='hunk'>@@ -4454,13 +6074,14 @@ nla_put_failure:</div><div class='ctx'> 	else</div><div class='ctx'> 		nlmsg_end(skb, nlh);</div><div class='ctx'> </div><div class='del'>-	return -EMSGSIZE;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t if_nlmsg_stats_size(const struct net_device *dev,</div><div class='del'>-				  u32 filter_mask)</div><div class='add'>+				  const struct rtnl_stats_dump_filters *filters)</div><div class='ctx'> {</div><div class='del'>-	size_t size = 0;</div><div class='add'>+	size_t size = NLMSG_ALIGN(sizeof(struct if_stats_msg));</div><div class='add'>+	unsigned int filter_mask = filters-&gt;mask[0];</div><div class='ctx'> </div><div class='ctx'> 	if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_64, 0))</div><div class='ctx'> 		size += nla_total_size_64bit(sizeof(struct rtnl_link_stats64));</div><div class='hunk'>@@ -4496,8 +6117,12 @@ static size_t if_nlmsg_stats_size(const struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_OFFLOAD_XSTATS, 0))</div><div class='del'>-		size += rtnl_get_offload_stats_size(dev);</div><div class='add'>+	if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_OFFLOAD_XSTATS, 0)) {</div><div class='add'>+		u32 off_filter_mask;</div><div class='add'>+</div><div class='add'>+		off_filter_mask = filters-&gt;mask[IFLA_STATS_LINK_OFFLOAD_XSTATS];</div><div class='add'>+		size += rtnl_offload_xstats_get_size(dev, off_filter_mask);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (stats_attr_valid(filter_mask, IFLA_STATS_AF_SPEC, 0)) {</div><div class='ctx'> 		struct rtnl_af_ops *af_ops;</div><div class='hunk'>@@ -4521,19 +6146,123 @@ static size_t if_nlmsg_stats_size(const struct net_device *dev,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define RTNL_STATS_OFFLOAD_XSTATS_VALID ((1 &lt;&lt; __IFLA_OFFLOAD_XSTATS_MAX) - 1)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+rtnl_stats_get_policy_filters[IFLA_STATS_MAX + 1] = {</div><div class='add'>+	[IFLA_STATS_LINK_OFFLOAD_XSTATS] =</div><div class='add'>+		    NLA_POLICY_MASK(NLA_U32, RTNL_STATS_OFFLOAD_XSTATS_VALID),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+rtnl_stats_get_policy[IFLA_STATS_GETSET_MAX + 1] = {</div><div class='add'>+	[IFLA_STATS_GET_FILTERS] =</div><div class='add'>+		    NLA_POLICY_NESTED(rtnl_stats_get_policy_filters),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+ifla_stats_set_policy[IFLA_STATS_GETSET_MAX + 1] = {</div><div class='add'>+	[IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_stats_get_parse_filters(struct nlattr *ifla_filters,</div><div class='add'>+					struct rtnl_stats_dump_filters *filters,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_STATS_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+	int at;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IFLA_STATS_MAX, ifla_filters,</div><div class='add'>+			       rtnl_stats_get_policy_filters, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (at = 1; at &lt;= IFLA_STATS_MAX; at++) {</div><div class='add'>+		if (tb[at]) {</div><div class='add'>+			if (!(filters-&gt;mask[0] &amp; IFLA_STATS_FILTER_BIT(at))) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Filtered attribute not enabled in filter_mask");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			filters-&gt;mask[at] = nla_get_u32(tb[at]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_stats_get_parse(const struct nlmsghdr *nlh,</div><div class='add'>+				u32 filter_mask,</div><div class='add'>+				struct rtnl_stats_dump_filters *filters,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_STATS_GETSET_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	filters-&gt;mask[0] = filter_mask;</div><div class='add'>+	for (i = 1; i &lt; ARRAY_SIZE(filters-&gt;mask); i++)</div><div class='add'>+		filters-&gt;mask[i] = -1U;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct if_stats_msg), tb,</div><div class='add'>+			  IFLA_STATS_GETSET_MAX, rtnl_stats_get_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_STATS_GET_FILTERS]) {</div><div class='add'>+		err = rtnl_stats_get_parse_filters(tb[IFLA_STATS_GET_FILTERS],</div><div class='add'>+						   filters, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_valid_stats_req(const struct nlmsghdr *nlh, bool strict_check,</div><div class='add'>+				bool is_dump, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct if_stats_msg *ifsm;</div><div class='add'>+</div><div class='add'>+	ifsm = nlmsg_payload(nlh, sizeof(*ifsm));</div><div class='add'>+	if (!ifsm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for stats dump");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strict_check)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* only requests using strict checks can pass data to influence</div><div class='add'>+	 * the dump. The legacy exception is filter_mask.</div><div class='add'>+	 */</div><div class='add'>+	if (ifsm-&gt;pad1 || ifsm-&gt;pad2 || (is_dump &amp;&amp; ifsm-&gt;ifindex)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for stats dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ifsm-&gt;filter_mask &gt;= IFLA_STATS_FILTER_BIT(IFLA_STATS_MAX + 1)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid stats requested through filter mask");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnl_stats_get(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct rtnl_stats_dump_filters filters;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	int idxattr = 0, prividx = 0;</div><div class='ctx'> 	struct if_stats_msg *ifsm;</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='del'>-	u32 filter_mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_len(nlh) &lt; sizeof(*ifsm))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = rtnl_valid_stats_req(nlh, netlink_strict_get_check(skb),</div><div class='add'>+				   false, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	ifsm = nlmsg_data(nlh);</div><div class='ctx'> 	if (ifsm-&gt;ifindex &gt; 0)</div><div class='hunk'>@@ -4544,17 +6273,22 @@ static int rtnl_stats_get(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	filter_mask = ifsm-&gt;filter_mask;</div><div class='del'>-	if (!filter_mask)</div><div class='add'>+	if (!ifsm-&gt;filter_mask) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Filter mask must be set for stats get");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nskb = nlmsg_new(if_nlmsg_stats_size(dev, filter_mask), GFP_KERNEL);</div><div class='add'>+	err = rtnl_stats_get_parse(nlh, ifsm-&gt;filter_mask, &amp;filters, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nskb = nlmsg_new(if_nlmsg_stats_size(dev, &amp;filters), GFP_KERNEL);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	err = rtnl_fill_statsinfo(nskb, dev, RTM_NEWSTATS,</div><div class='ctx'> 				  NETLINK_CB(skb).portid, nlh-&gt;nlmsg_seq, 0,</div><div class='del'>-				  0, filter_mask, &amp;idxattr, &amp;prividx);</div><div class='add'>+				  0, &amp;filters, &amp;idxattr, &amp;prividx, extack);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in if_nlmsg_stats_size */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -4568,76 +6302,570 @@ static int rtnl_stats_get(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> static int rtnl_stats_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	int h, s_h, err, s_idx, s_idxattr, s_prividx;</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct rtnl_stats_dump_filters filters;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	unsigned int flags = NLM_F_MULTI;</div><div class='ctx'> 	struct if_stats_msg *ifsm;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+		int idxattr;</div><div class='add'>+		int prividx;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	u32 filter_mask = 0;</div><div class='del'>-	int idx = 0;</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = cb-&gt;args[1];</div><div class='del'>-	s_idxattr = cb-&gt;args[2];</div><div class='del'>-	s_prividx = cb-&gt;args[3];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;seq = net-&gt;dev_base_seq;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &lt; sizeof(*ifsm))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = rtnl_valid_stats_req(cb-&gt;nlh, cb-&gt;strict_check, true, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	ifsm = nlmsg_data(cb-&gt;nlh);</div><div class='del'>-	filter_mask = ifsm-&gt;filter_mask;</div><div class='del'>-	if (!filter_mask)</div><div class='add'>+	if (!ifsm-&gt;filter_mask) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Filter mask must be set for stats dump");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		hlist_for_each_entry(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			err = rtnl_fill_statsinfo(skb, dev, RTM_NEWSTATS,</div><div class='del'>-						  NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						  cb-&gt;nlh-&gt;nlmsg_seq, 0,</div><div class='del'>-						  flags, filter_mask,</div><div class='del'>-						  &amp;s_idxattr, &amp;s_prividx);</div><div class='del'>-			/* If we ran out of room on the first message,</div><div class='del'>-			 * we're in trouble</div><div class='del'>-			 */</div><div class='del'>-			WARN_ON((err == -EMSGSIZE) &amp;&amp; (skb-&gt;len == 0));</div><div class='add'>+	err = rtnl_stats_get_parse(cb-&gt;nlh, ifsm-&gt;filter_mask, &amp;filters,</div><div class='add'>+				   extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			s_prividx = 0;</div><div class='del'>-			s_idxattr = 0;</div><div class='del'>-			nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		err = rtnl_fill_statsinfo(skb, dev, RTM_NEWSTATS,</div><div class='add'>+					  NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					  cb-&gt;nlh-&gt;nlmsg_seq, 0,</div><div class='add'>+					  flags, &amp;filters,</div><div class='add'>+					  &amp;ctx-&gt;idxattr, &amp;ctx-&gt;prividx,</div><div class='add'>+					  extack);</div><div class='add'>+		/* If we ran out of room on the first message,</div><div class='add'>+		 * we're in trouble.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON((err == -EMSGSIZE) &amp;&amp; (skb-&gt;len == 0));</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		ctx-&gt;prividx = 0;</div><div class='add'>+		ctx-&gt;idxattr = 0;</div><div class='add'>+		nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	cb-&gt;args[3] = s_prividx;</div><div class='del'>-	cb-&gt;args[2] = s_idxattr;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='ctx'> </div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtnl_offload_xstats_notify(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rtnl_stats_dump_filters response_filters = {};</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	int idxattr = 0, prividx = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	response_filters.mask[0] |=</div><div class='add'>+		IFLA_STATS_FILTER_BIT(IFLA_STATS_LINK_OFFLOAD_XSTATS);</div><div class='add'>+	response_filters.mask[IFLA_STATS_LINK_OFFLOAD_XSTATS] |=</div><div class='add'>+		IFLA_STATS_FILTER_BIT(IFLA_OFFLOAD_XSTATS_HW_S_INFO);</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(if_nlmsg_stats_size(dev, &amp;response_filters),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	err = rtnl_fill_statsinfo(skb, dev, RTM_NEWSTATS, 0, 0, 0, 0,</div><div class='add'>+				  &amp;response_filters, &amp;idxattr, &amp;prividx, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_STATS, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_STATS, err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtnl_offload_xstats_notify);</div><div class='add'>+</div><div class='add'>+static int rtnl_stats_set(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum netdev_offload_xstats_type t_l3 = NETDEV_OFFLOAD_XSTATS_TYPE_L3;</div><div class='add'>+	struct rtnl_stats_dump_filters response_filters = {};</div><div class='add'>+	struct nlattr *tb[IFLA_STATS_GETSET_MAX + 1];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	struct if_stats_msg *ifsm;</div><div class='add'>+	bool notify = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtnl_valid_stats_req(nlh, netlink_strict_get_check(skb),</div><div class='add'>+				   false, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ifsm = nlmsg_data(nlh);</div><div class='add'>+	if (ifsm-&gt;family != AF_UNSPEC) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Address family should be AF_UNSPEC");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifsm-&gt;ifindex &gt; 0)</div><div class='add'>+		dev = __dev_get_by_index(net, ifsm-&gt;ifindex);</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ifsm-&gt;filter_mask) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Filter mask must be 0 for stats set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(*ifsm), tb, IFLA_STATS_GETSET_MAX,</div><div class='add'>+			  ifla_stats_set_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS]) {</div><div class='add'>+		u8 req = nla_get_u8(tb[IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS]);</div><div class='add'>+</div><div class='add'>+		if (req)</div><div class='add'>+			err = netdev_offload_xstats_enable(dev, t_l3, extack);</div><div class='add'>+		else</div><div class='add'>+			err = netdev_offload_xstats_disable(dev, t_l3);</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			notify = true;</div><div class='add'>+		else if (err != -EALREADY)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		response_filters.mask[0] |=</div><div class='add'>+			IFLA_STATS_FILTER_BIT(IFLA_STATS_LINK_OFFLOAD_XSTATS);</div><div class='add'>+		response_filters.mask[IFLA_STATS_LINK_OFFLOAD_XSTATS] |=</div><div class='add'>+			IFLA_STATS_FILTER_BIT(IFLA_OFFLOAD_XSTATS_HW_S_INFO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (notify)</div><div class='add'>+		rtnl_offload_xstats_notify(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_mdb_valid_dump_req(const struct nlmsghdr *nlh,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+</div><div class='add'>+	bpm = nlmsg_payload(nlh, sizeof(*bpm));</div><div class='add'>+	if (!bpm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for mdb dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bpm-&gt;ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Filtering by device index is not supported for mdb dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*bpm))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid data after header in mdb dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtnl_mdb_dump_ctx {</div><div class='add'>+	long idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rtnl_mdb_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int idx, s_idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	NL_ASSERT_CTX_FITS(struct rtnl_mdb_dump_ctx);</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = rtnl_mdb_valid_dump_req(cb-&gt;nlh, cb-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s_idx = ctx-&gt;idx;</div><div class='add'>+	idx = 0;</div><div class='add'>+</div><div class='add'>+	for_each_netdev(net, dev) {</div><div class='add'>+		if (idx &lt; s_idx)</div><div class='add'>+			goto skip;</div><div class='add'>+		if (!dev-&gt;netdev_ops-&gt;ndo_mdb_dump)</div><div class='add'>+			goto skip;</div><div class='add'>+</div><div class='add'>+		err = dev-&gt;netdev_ops-&gt;ndo_mdb_dump(dev, skb, cb);</div><div class='add'>+		if (err == -EMSGSIZE)</div><div class='add'>+			goto out;</div><div class='add'>+		/* Moving on to next device, reset markers and sequence</div><div class='add'>+		 * counters since they are all maintained per-device.</div><div class='add'>+		 */</div><div class='add'>+		memset(cb-&gt;ctx, 0, sizeof(cb-&gt;ctx));</div><div class='add'>+		cb-&gt;prev_seq = 0;</div><div class='add'>+		cb-&gt;seq = 0;</div><div class='add'>+skip:</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ctx-&gt;idx = idx;</div><div class='ctx'> 	return skb-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rtnl_validate_mdb_entry_get(const struct nlattr *attr,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_mdb_entry *entry = nla_data(attr);</div><div class='add'>+</div><div class='add'>+	if (nla_len(attr) != sizeof(struct br_mdb_entry)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, attr, "Invalid attribute length");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Entry ifindex cannot be specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;state) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Entry state cannot be specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Entry flags cannot be specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vid &gt;= VLAN_VID_MASK) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid entry VLAN id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;addr.proto != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	    entry-&gt;addr.proto != htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+	    entry-&gt;addr.proto != 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unknown entry protocol");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy mdba_get_policy[MDBA_GET_ENTRY_MAX + 1] = {</div><div class='add'>+	[MDBA_GET_ENTRY] = NLA_POLICY_VALIDATE_FN(NLA_BINARY,</div><div class='add'>+						  rtnl_validate_mdb_entry_get,</div><div class='add'>+						  sizeof(struct br_mdb_entry)),</div><div class='add'>+	[MDBA_GET_ENTRY_ATTRS] = { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_mdb_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[MDBA_GET_ENTRY_MAX + 1];</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct br_port_msg), tb,</div><div class='add'>+			  MDBA_GET_ENTRY_MAX, mdba_get_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bpm = nlmsg_data(nlh);</div><div class='add'>+	if (!bpm-&gt;ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid ifindex");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = __dev_get_by_index(net, bpm-&gt;ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device doesn't exist");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, NULL, tb, MDBA_GET_ENTRY)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Missing MDBA_GET_ENTRY attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_mdb_get) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device does not support MDB operations");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_mdb_get(dev, tb, NETLINK_CB(in_skb).portid,</div><div class='add'>+					    nlh-&gt;nlmsg_seq, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_validate_mdb_entry(const struct nlattr *attr,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_mdb_entry *entry = nla_data(attr);</div><div class='add'>+</div><div class='add'>+	if (nla_len(attr) != sizeof(struct br_mdb_entry)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, attr, "Invalid attribute length");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;ifindex == 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Zero entry ifindex is not allowed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;addr.proto == htons(ETH_P_IP)) {</div><div class='add'>+		if (!ipv4_is_multicast(entry-&gt;addr.u.ip4) &amp;&amp;</div><div class='add'>+		    !ipv4_is_zeronet(entry-&gt;addr.u.ip4)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "IPv4 entry group address is not multicast or 0.0.0.0");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (ipv4_is_local_multicast(entry-&gt;addr.u.ip4)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "IPv4 entry group address is local multicast");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (entry-&gt;addr.proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		if (ipv6_addr_is_ll_all_nodes(&amp;entry-&gt;addr.u.ip6)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "IPv6 entry group address is link-local all nodes");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	} else if (entry-&gt;addr.proto == 0) {</div><div class='add'>+		/* L2 mdb */</div><div class='add'>+		if (!is_multicast_ether_addr(entry-&gt;addr.u.mac_addr)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "L2 entry group is not multicast");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unknown entry protocol");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;state != MDB_PERMANENT &amp;&amp; entry-&gt;state != MDB_TEMPORARY) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unknown entry state");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (entry-&gt;vid &gt;= VLAN_VID_MASK) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid entry VLAN id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy mdba_policy[MDBA_SET_ENTRY_MAX + 1] = {</div><div class='add'>+	[MDBA_SET_ENTRY_UNSPEC] = { .strict_start_type = MDBA_SET_ENTRY_ATTRS + 1 },</div><div class='add'>+	[MDBA_SET_ENTRY] = NLA_POLICY_VALIDATE_FN(NLA_BINARY,</div><div class='add'>+						  rtnl_validate_mdb_entry,</div><div class='add'>+						  sizeof(struct br_mdb_entry)),</div><div class='add'>+	[MDBA_SET_ENTRY_ATTRS] = { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[MDBA_SET_ENTRY_MAX + 1];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*bpm), tb,</div><div class='add'>+				     MDBA_SET_ENTRY_MAX, mdba_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bpm = nlmsg_data(nlh);</div><div class='add'>+	if (!bpm-&gt;ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid ifindex");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = __dev_get_by_index(net, bpm-&gt;ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device doesn't exist");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, NULL, tb, MDBA_SET_ENTRY)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Missing MDBA_SET_ENTRY attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_mdb_add) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device does not support MDB operations");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_mdb_add(dev, tb, nlh-&gt;nlmsg_flags, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnl_validate_mdb_entry_del_bulk(const struct nlattr *attr,</div><div class='add'>+					    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct br_mdb_entry *entry = nla_data(attr);</div><div class='add'>+	struct br_mdb_entry zero_entry = {};</div><div class='add'>+</div><div class='add'>+	if (nla_len(attr) != sizeof(struct br_mdb_entry)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, attr, "Invalid attribute length");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;state != MDB_PERMANENT &amp;&amp; entry-&gt;state != MDB_TEMPORARY) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unknown entry state");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Entry flags cannot be set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vid &gt;= VLAN_N_VID - 1) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid entry VLAN id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;entry-&gt;addr, &amp;zero_entry.addr, sizeof(entry-&gt;addr))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Entry address cannot be set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy mdba_del_bulk_policy[MDBA_SET_ENTRY_MAX + 1] = {</div><div class='add'>+	[MDBA_SET_ENTRY] = NLA_POLICY_VALIDATE_FN(NLA_BINARY,</div><div class='add'>+						  rtnl_validate_mdb_entry_del_bulk,</div><div class='add'>+						  sizeof(struct br_mdb_entry)),</div><div class='add'>+	[MDBA_SET_ENTRY_ATTRS] = { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtnl_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool del_bulk = !!(nlh-&gt;nlmsg_flags &amp; NLM_F_BULK);</div><div class='add'>+	struct nlattr *tb[MDBA_SET_ENTRY_MAX + 1];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct br_port_msg *bpm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!del_bulk)</div><div class='add'>+		err = nlmsg_parse_deprecated(nlh, sizeof(*bpm), tb,</div><div class='add'>+					     MDBA_SET_ENTRY_MAX, mdba_policy,</div><div class='add'>+					     extack);</div><div class='add'>+	else</div><div class='add'>+		err = nlmsg_parse(nlh, sizeof(*bpm), tb, MDBA_SET_ENTRY_MAX,</div><div class='add'>+				  mdba_del_bulk_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bpm = nlmsg_data(nlh);</div><div class='add'>+	if (!bpm-&gt;ifindex) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid ifindex");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = __dev_get_by_index(net, bpm-&gt;ifindex);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device doesn't exist");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, NULL, tb, MDBA_SET_ENTRY)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Missing MDBA_SET_ENTRY attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (del_bulk) {</div><div class='add'>+		if (!dev-&gt;netdev_ops-&gt;ndo_mdb_del_bulk) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Device does not support MDB bulk deletion");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		return dev-&gt;netdev_ops-&gt;ndo_mdb_del_bulk(dev, tb, extack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_mdb_del) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device does not support MDB operations");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev-&gt;netdev_ops-&gt;ndo_mdb_del(dev, tb, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Process one rtnetlink message. */</div><div class='ctx'> </div><div class='add'>+static int rtnl_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const bool needs_lock = !(cb-&gt;flags &amp; RTNL_FLAG_DUMP_UNLOCKED);</div><div class='add'>+	rtnl_dumpit_func dumpit = cb-&gt;data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Previous iteration have already finished, avoid calling-&gt;dumpit()</div><div class='add'>+	 * again, it may not expect to be called after it reached the end.</div><div class='add'>+	 */</div><div class='add'>+	if (!dumpit)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (needs_lock)</div><div class='add'>+		rtnl_lock();</div><div class='add'>+	err = dumpit(skb, cb);</div><div class='add'>+	if (needs_lock)</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	/* Old dump handlers used to send NLM_DONE as in a separate recvmsg().</div><div class='add'>+	 * Some applications which parse netlink manually depend on this.</div><div class='add'>+	 */</div><div class='add'>+	if (cb-&gt;flags &amp; RTNL_FLAG_DUMP_SPLIT_NLM_DONE) {</div><div class='add'>+		if (err &lt; 0 &amp;&amp; err != -EMSGSIZE)</div><div class='add'>+			return err;</div><div class='add'>+		if (!err)</div><div class='add'>+			cb-&gt;data = NULL;</div><div class='add'>+</div><div class='add'>+		return skb-&gt;len;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtnetlink_dump_start(struct sock *ssk, struct sk_buff *skb,</div><div class='add'>+				const struct nlmsghdr *nlh,</div><div class='add'>+				struct netlink_dump_control *control)</div><div class='add'>+{</div><div class='add'>+	if (control-&gt;flags &amp; RTNL_FLAG_DUMP_SPLIT_NLM_DONE ||</div><div class='add'>+	    !(control-&gt;flags &amp; RTNL_FLAG_DUMP_UNLOCKED)) {</div><div class='add'>+		WARN_ON(control-&gt;data);</div><div class='add'>+		control-&gt;data = control-&gt;dump;</div><div class='add'>+		control-&gt;dump = rtnl_dumpit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return netlink_dump_start(ssk, skb, nlh, control);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct rtnl_link *link;</div><div class='add'>+	enum rtnl_kinds kind;</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	int err = -EOPNOTSUPP;</div><div class='ctx'> 	rtnl_doit_func doit;</div><div class='ctx'> 	unsigned int flags;</div><div class='del'>-	int kind;</div><div class='ctx'> 	int family;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='hunk'>@@ -4652,16 +6880,16 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	family = ((struct rtgenmsg *)nlmsg_data(nlh))-&gt;rtgen_family;</div><div class='del'>-	kind = type&amp;3;</div><div class='add'>+	kind = rtnl_msgtype_kind(type);</div><div class='ctx'> </div><div class='del'>-	if (kind != 2 &amp;&amp; !netlink_net_capable(skb, CAP_NET_ADMIN))</div><div class='add'>+	if (kind != RTNL_KIND_GET &amp;&amp; !netlink_net_capable(skb, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (kind == 2 &amp;&amp; nlh-&gt;nlmsg_flags&amp;NLM_F_DUMP) {</div><div class='add'>+	if (kind == RTNL_KIND_GET &amp;&amp; (nlh-&gt;nlmsg_flags &amp; NLM_F_DUMP)) {</div><div class='ctx'> 		struct sock *rtnl;</div><div class='ctx'> 		rtnl_dumpit_func dumpit;</div><div class='del'>-		u16 min_dump_alloc = 0;</div><div class='add'>+		u32 min_dump_alloc = 0;</div><div class='ctx'> </div><div class='ctx'> 		link = rtnl_get_link(family, type);</div><div class='ctx'> 		if (!link || !link-&gt;dumpit) {</div><div class='hunk'>@@ -4672,6 +6900,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		}</div><div class='ctx'> 		owner = link-&gt;owner;</div><div class='ctx'> 		dumpit = link-&gt;dumpit;</div><div class='add'>+		flags = link-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 		if (type == RTM_GETLINK - RTM_BASE)</div><div class='ctx'> 			min_dump_alloc = rtnl_calcit(skb, nlh);</div><div class='hunk'>@@ -4689,8 +6918,9 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 				.dump		= dumpit,</div><div class='ctx'> 				.min_dump_alloc	= min_dump_alloc,</div><div class='ctx'> 				.module		= owner,</div><div class='add'>+				.flags		= flags,</div><div class='ctx'> 			};</div><div class='del'>-			err = netlink_dump_start(rtnl, skb, nlh, &amp;c);</div><div class='add'>+			err = rtnetlink_dump_start(rtnl, skb, nlh, &amp;c);</div><div class='ctx'> 			/* netlink_dump_start() will keep a reference on</div><div class='ctx'> 			 * module if dump is still in progress.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -4714,6 +6944,13 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flags = link-&gt;flags;</div><div class='add'>+	if (kind == RTNL_KIND_DEL &amp;&amp; (nlh-&gt;nlmsg_flags &amp; NLM_F_BULK) &amp;&amp;</div><div class='add'>+	    !(flags &amp; RTNL_FLAG_BULK_DEL_SUPPORTED)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Bulk delete is not supported");</div><div class='add'>+		module_put(owner);</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; RTNL_FLAG_DOIT_UNLOCKED) {</div><div class='ctx'> 		doit = link-&gt;doit;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -4779,7 +7016,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi</div><div class='ctx'> 	case NETDEV_CHANGELOWERSTATE:</div><div class='ctx'> 	case NETDEV_CHANGE_TX_QUEUE_LEN:</div><div class='ctx'> 		rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, rtnl_get_event(event),</div><div class='del'>-				   GFP_KERNEL, NULL, 0);</div><div class='add'>+				   GFP_KERNEL, NULL, 0, 0, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4798,7 +7035,6 @@ static int __net_init rtnetlink_net_init(struct net *net)</div><div class='ctx'> 	struct netlink_kernel_cfg cfg = {</div><div class='ctx'> 		.groups		= RTNLGRP_MAX,</div><div class='ctx'> 		.input		= rtnetlink_rcv,</div><div class='del'>-		.cb_mutex	= &amp;rtnl_mutex,</div><div class='ctx'> 		.flags		= NL_CFG_F_NONROOT_RECV,</div><div class='ctx'> 		.bind		= rtnetlink_bind,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -4821,6 +7057,41 @@ static struct pernet_operations rtnetlink_net_ops = {</div><div class='ctx'> 	.exit = rtnetlink_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler rtnetlink_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_NEWLINK, .doit = rtnl_newlink,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.msgtype = RTM_DELLINK, .doit = rtnl_dellink,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET_WIP},</div><div class='add'>+	{.msgtype = RTM_GETLINK, .doit = rtnl_getlink,</div><div class='add'>+	 .dumpit = rtnl_dump_ifinfo, .flags = RTNL_FLAG_DUMP_SPLIT_NLM_DONE},</div><div class='add'>+	{.msgtype = RTM_SETLINK, .doit = rtnl_setlink,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET_WIP},</div><div class='add'>+	{.msgtype = RTM_GETADDR, .dumpit = rtnl_dump_all},</div><div class='add'>+	{.msgtype = RTM_GETROUTE, .dumpit = rtnl_dump_all},</div><div class='add'>+	{.msgtype = RTM_GETNETCONF, .dumpit = rtnl_dump_all},</div><div class='add'>+	{.msgtype = RTM_GETSTATS, .doit = rtnl_stats_get,</div><div class='add'>+	 .dumpit = rtnl_stats_dump},</div><div class='add'>+	{.msgtype = RTM_SETSTATS, .doit = rtnl_stats_set},</div><div class='add'>+	{.msgtype = RTM_NEWLINKPROP, .doit = rtnl_newlinkprop},</div><div class='add'>+	{.msgtype = RTM_DELLINKPROP, .doit = rtnl_dellinkprop},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_GETLINK,</div><div class='add'>+	 .dumpit = rtnl_bridge_getlink},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_DELLINK,</div><div class='add'>+	 .doit = rtnl_bridge_dellink},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_SETLINK,</div><div class='add'>+	 .doit = rtnl_bridge_setlink},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_NEWNEIGH, .doit = rtnl_fdb_add},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_DELNEIGH, .doit = rtnl_fdb_del,</div><div class='add'>+	 .flags = RTNL_FLAG_BULK_DEL_SUPPORTED},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_GETNEIGH, .doit = rtnl_fdb_get,</div><div class='add'>+	 .dumpit = rtnl_fdb_dump},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_NEWMDB, .doit = rtnl_mdb_add},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_DELMDB, .doit = rtnl_mdb_del,</div><div class='add'>+	 .flags = RTNL_FLAG_BULK_DEL_SUPPORTED},</div><div class='add'>+	{.protocol = PF_BRIDGE, .msgtype = RTM_GETMDB, .doit = rtnl_mdb_get,</div><div class='add'>+	 .dumpit = rtnl_mdb_dump},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init rtnetlink_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (register_pernet_subsys(&amp;rtnetlink_net_ops))</div><div class='hunk'>@@ -4828,24 +7099,5 @@ void __init rtnetlink_init(void)</div><div class='ctx'> </div><div class='ctx'> 	register_netdevice_notifier(&amp;rtnetlink_dev_notifier);</div><div class='ctx'> </div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETLINK, rtnl_getlink,</div><div class='del'>-		      rtnl_dump_ifinfo, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETADDR, NULL, rtnl_dump_all, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETROUTE, NULL, rtnl_dump_all, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETNETCONF, NULL, rtnl_dump_all, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_NEWNEIGH, rtnl_fdb_add, NULL, 0);</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_DELNEIGH, rtnl_fdb_del, NULL, 0);</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_GETNEIGH, NULL, rtnl_fdb_dump, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_GETLINK, NULL, rtnl_bridge_getlink, 0);</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_DELLINK, rtnl_bridge_dellink, NULL, 0);</div><div class='del'>-	rtnl_register(PF_BRIDGE, RTM_SETLINK, rtnl_bridge_setlink, NULL, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETSTATS, rtnl_stats_get, rtnl_stats_dump,</div><div class='del'>-		      0);</div><div class='add'>+	rtnl_register_many(rtnetlink_rtnl_msg_handlers);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/scm.c b/net/core/scm.c<br/>index b1ff8a441748..cd87f66671aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/scm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/scm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/scm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/scm.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* scm.c - Socket level control messages processing.</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *              Alignment and value checking mods by Craig Metz</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -27,8 +23,12 @@</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/pid.h&gt;</div><div class='add'>+#include &lt;uapi/linux/pidfd.h&gt;</div><div class='add'>+#include &lt;linux/pidfs.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='add'>+#include &lt;linux/io_uring.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;net/compat.h&gt;</div><div class='ctx'> #include &lt;net/scm.h&gt;</div><div class='ctx'> #include &lt;net/cls_cgroup.h&gt;</div><div class='add'>+#include &lt;net/af_unix.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -82,13 +83,20 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)</div><div class='ctx'> </div><div class='ctx'> 	if (!fpl)</div><div class='ctx'> 	{</div><div class='del'>-		fpl = kmalloc(sizeof(struct scm_fp_list), GFP_KERNEL);</div><div class='add'>+		fpl = kmalloc(sizeof(struct scm_fp_list), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 		if (!fpl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		*fplp = fpl;</div><div class='ctx'> 		fpl-&gt;count = 0;</div><div class='add'>+		fpl-&gt;count_unix = 0;</div><div class='ctx'> 		fpl-&gt;max = SCM_MAX_FD;</div><div class='ctx'> 		fpl-&gt;user = NULL;</div><div class='add'>+#if IS_ENABLED(CONFIG_UNIX)</div><div class='add'>+		fpl-&gt;inflight = false;</div><div class='add'>+		fpl-&gt;dead = false;</div><div class='add'>+		fpl-&gt;edges = NULL;</div><div class='add'>+		INIT_LIST_HEAD(&amp;fpl-&gt;vertices);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> 	fpp = &amp;fpl-&gt;fp[fpl-&gt;count];</div><div class='ctx'> </div><div class='hunk'>@@ -106,6 +114,14 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)</div><div class='ctx'> </div><div class='ctx'> 		if (fd &lt; 0 || !(file = fget_raw(fd)))</div><div class='ctx'> 			return -EBADF;</div><div class='add'>+		/* don't allow io_uring files */</div><div class='add'>+		if (io_is_uring_fops(file)) {</div><div class='add'>+			fput(file);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (unix_get_socket(file))</div><div class='add'>+			fpl-&gt;count_unix++;</div><div class='add'>+</div><div class='ctx'> 		*fpp++ = file;</div><div class='ctx'> 		fpl-&gt;count++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -131,8 +147,25 @@ void __scm_destroy(struct scm_cookie *scm)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__scm_destroy);</div><div class='ctx'> </div><div class='add'>+static inline int scm_replace_pid(struct scm_cookie *scm, struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* drop all previous references */</div><div class='add'>+	scm_destroy_cred(scm);</div><div class='add'>+</div><div class='add'>+	err = pidfs_register_pid(pid);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scm-&gt;pid = pid;</div><div class='add'>+	scm-&gt;creds.pid = pid_vnr(pid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)</div><div class='ctx'> {</div><div class='add'>+	const struct proto_ops *ops = READ_ONCE(sock-&gt;ops);</div><div class='ctx'> 	struct cmsghdr *cmsg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +189,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)</div><div class='ctx'> 		switch (cmsg-&gt;cmsg_type)</div><div class='ctx'> 		{</div><div class='ctx'> 		case SCM_RIGHTS:</div><div class='del'>-			if (!sock-&gt;ops || sock-&gt;ops-&gt;family != PF_UNIX)</div><div class='add'>+			if (!ops || ops-&gt;family != PF_UNIX)</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			err=scm_fp_copy(cmsg, &amp;p-&gt;fp);</div><div class='ctx'> 			if (err&lt;0)</div><div class='hunk'>@@ -174,15 +207,21 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='del'>-			p-&gt;creds.pid = creds.pid;</div><div class='ctx'> 			if (!p-&gt;pid || pid_vnr(p-&gt;pid) != creds.pid) {</div><div class='ctx'> 				struct pid *pid;</div><div class='ctx'> 				err = -ESRCH;</div><div class='ctx'> 				pid = find_get_pid(creds.pid);</div><div class='ctx'> 				if (!pid)</div><div class='ctx'> 					goto error;</div><div class='del'>-				put_pid(p-&gt;pid);</div><div class='del'>-				p-&gt;pid = pid;</div><div class='add'>+</div><div class='add'>+				/* pass a struct pid reference from</div><div class='add'>+				 * find_get_pid() to scm_replace_pid().</div><div class='add'>+				 */</div><div class='add'>+				err = scm_replace_pid(p, pid);</div><div class='add'>+				if (err) {</div><div class='add'>+					put_pid(pid);</div><div class='add'>+					goto error;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -215,16 +254,12 @@ EXPORT_SYMBOL(__scm_send);</div><div class='ctx'> </div><div class='ctx'> int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct cmsghdr __user *cm</div><div class='del'>-		= (__force struct cmsghdr __user *)msg-&gt;msg_control;</div><div class='del'>-	struct cmsghdr cmhdr;</div><div class='ctx'> 	int cmlen = CMSG_LEN(len);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if (MSG_CMSG_COMPAT &amp; msg-&gt;msg_flags)</div><div class='add'>+	if (msg-&gt;msg_flags &amp; MSG_CMSG_COMPAT)</div><div class='ctx'> 		return put_cmsg_compat(msg, level, type, len, data);</div><div class='ctx'> </div><div class='del'>-	if (cm==NULL || msg-&gt;msg_controllen &lt; sizeof(*cm)) {</div><div class='add'>+	if (!msg-&gt;msg_control || msg-&gt;msg_controllen &lt; sizeof(struct cmsghdr)) {</div><div class='ctx'> 		msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='ctx'> 		return 0; /* XXX: return error? check spec. */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -232,98 +267,133 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)</div><div class='ctx'> 		msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='ctx'> 		cmlen = msg-&gt;msg_controllen;</div><div class='ctx'> 	}</div><div class='del'>-	cmhdr.cmsg_level = level;</div><div class='del'>-	cmhdr.cmsg_type = type;</div><div class='del'>-	cmhdr.cmsg_len = cmlen;</div><div class='del'>-</div><div class='del'>-	err = -EFAULT;</div><div class='del'>-	if (copy_to_user(cm, &amp;cmhdr, sizeof cmhdr))</div><div class='del'>-		goto out;</div><div class='del'>-	if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))</div><div class='del'>-		goto out;</div><div class='del'>-	cmlen = CMSG_SPACE(len);</div><div class='del'>-	if (msg-&gt;msg_controllen &lt; cmlen)</div><div class='del'>-		cmlen = msg-&gt;msg_controllen;</div><div class='del'>-	msg-&gt;msg_control += cmlen;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_control_is_user) {</div><div class='add'>+		struct cmsghdr __user *cm = msg-&gt;msg_control_user;</div><div class='add'>+</div><div class='add'>+		check_object_size(data, cmlen - sizeof(*cm), true);</div><div class='add'>+</div><div class='add'>+		scoped_user_write_access_size(cm, cmlen, efault) {</div><div class='add'>+			unsafe_put_user(cmlen, &amp;cm-&gt;cmsg_len, efault);</div><div class='add'>+			unsafe_put_user(level, &amp;cm-&gt;cmsg_level, efault);</div><div class='add'>+			unsafe_put_user(type, &amp;cm-&gt;cmsg_type, efault);</div><div class='add'>+			unsafe_copy_to_user(CMSG_USER_DATA(cm), data,</div><div class='add'>+					    cmlen - sizeof(*cm), efault);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct cmsghdr *cm = msg-&gt;msg_control;</div><div class='add'>+</div><div class='add'>+		cm-&gt;cmsg_level = level;</div><div class='add'>+		cm-&gt;cmsg_type = type;</div><div class='add'>+		cm-&gt;cmsg_len = cmlen;</div><div class='add'>+		memcpy(CMSG_DATA(cm), data, cmlen - sizeof(*cm));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmlen = min(CMSG_SPACE(len), msg-&gt;msg_controllen);</div><div class='add'>+	if (msg-&gt;msg_control_is_user)</div><div class='add'>+		msg-&gt;msg_control_user += cmlen;</div><div class='add'>+	else</div><div class='add'>+		msg-&gt;msg_control += cmlen;</div><div class='ctx'> 	msg-&gt;msg_controllen -= cmlen;</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+efault:</div><div class='add'>+	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(put_cmsg);</div><div class='ctx'> </div><div class='del'>-void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+int put_cmsg_notrunc(struct msghdr *msg, int level, int type, int len,</div><div class='add'>+		     void *data)</div><div class='ctx'> {</div><div class='del'>-	struct cmsghdr __user *cm</div><div class='del'>-		= (__force struct cmsghdr __user*)msg-&gt;msg_control;</div><div class='add'>+	/* Don't produce truncated CMSGs */</div><div class='add'>+	if (!msg-&gt;msg_control || msg-&gt;msg_controllen &lt; CMSG_LEN(len))</div><div class='add'>+		return -ETOOSMALL;</div><div class='ctx'> </div><div class='del'>-	int fdmax = 0;</div><div class='del'>-	int fdnum = scm-&gt;fp-&gt;count;</div><div class='del'>-	struct file **fp = scm-&gt;fp-&gt;fp;</div><div class='del'>-	int __user *cmfptr;</div><div class='add'>+	return put_cmsg(msg, level, type, len, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void put_cmsg_scm_timestamping64(struct msghdr *msg, struct scm_timestamping_internal *tss_internal)</div><div class='add'>+{</div><div class='add'>+	struct scm_timestamping64 tss;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tss.ts); i++) {</div><div class='add'>+		tss.ts[i].tv_sec = tss_internal-&gt;ts[i].tv_sec;</div><div class='add'>+		tss.ts[i].tv_nsec = tss_internal-&gt;ts[i].tv_nsec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_NEW, sizeof(tss), &amp;tss);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(put_cmsg_scm_timestamping64);</div><div class='add'>+</div><div class='add'>+void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_internal *tss_internal)</div><div class='add'>+{</div><div class='add'>+	struct scm_timestamping tss;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tss.ts); i++) {</div><div class='add'>+		tss.ts[i].tv_sec = tss_internal-&gt;ts[i].tv_sec;</div><div class='add'>+		tss.ts[i].tv_nsec = tss_internal-&gt;ts[i].tv_nsec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_OLD, sizeof(tss), &amp;tss);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(put_cmsg_scm_timestamping);</div><div class='add'>+</div><div class='add'>+static int scm_max_fds(struct msghdr *msg)</div><div class='add'>+{</div><div class='add'>+	if (msg-&gt;msg_controllen &lt;= sizeof(struct cmsghdr))</div><div class='add'>+		return 0;</div><div class='add'>+	return (msg-&gt;msg_controllen - sizeof(struct cmsghdr)) / sizeof(int);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+{</div><div class='add'>+	struct cmsghdr __user *cm =</div><div class='add'>+		(__force struct cmsghdr __user *)msg-&gt;msg_control_user;</div><div class='add'>+	unsigned int o_flags = (msg-&gt;msg_flags &amp; MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0;</div><div class='add'>+	int fdmax = min_t(int, scm_max_fds(msg), scm-&gt;fp-&gt;count);</div><div class='add'>+	int __user *cmsg_data = CMSG_USER_DATA(cm);</div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (MSG_CMSG_COMPAT &amp; msg-&gt;msg_flags) {</div><div class='add'>+	/* no use for FD passing from kernel space callers */</div><div class='add'>+	if (WARN_ON_ONCE(!msg-&gt;msg_control_is_user))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_flags &amp; MSG_CMSG_COMPAT) {</div><div class='ctx'> 		scm_detach_fds_compat(msg, scm);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (msg-&gt;msg_controllen &gt; sizeof(struct cmsghdr))</div><div class='del'>-		fdmax = ((msg-&gt;msg_controllen - sizeof(struct cmsghdr))</div><div class='del'>-			 / sizeof(int));</div><div class='del'>-</div><div class='del'>-	if (fdnum &lt; fdmax)</div><div class='del'>-		fdmax = fdnum;</div><div class='del'>-</div><div class='del'>-	for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i&lt;fdmax;</div><div class='del'>-	     i++, cmfptr++)</div><div class='del'>-	{</div><div class='del'>-		struct socket *sock;</div><div class='del'>-		int new_fd;</div><div class='del'>-		err = security_file_receive(fp[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		err = get_unused_fd_flags(MSG_CMSG_CLOEXEC &amp; msg-&gt;msg_flags</div><div class='del'>-					  ? O_CLOEXEC : 0);</div><div class='add'>+	for (i = 0; i &lt; fdmax; i++) {</div><div class='add'>+		err = scm_recv_one_fd(scm-&gt;fp-&gt;fp[i], cmsg_data + i, o_flags);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		new_fd = err;</div><div class='del'>-		err = put_user(new_fd, cmfptr);</div><div class='del'>-		if (err) {</div><div class='del'>-			put_unused_fd(new_fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* Bump the usage count and install the file. */</div><div class='del'>-		sock = sock_from_file(fp[i], &amp;err);</div><div class='del'>-		if (sock) {</div><div class='del'>-			sock_update_netprioidx(&amp;sock-&gt;sk-&gt;sk_cgrp_data);</div><div class='del'>-			sock_update_classid(&amp;sock-&gt;sk-&gt;sk_cgrp_data);</div><div class='del'>-		}</div><div class='del'>-		fd_install(new_fd, get_file(fp[i]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		int cmlen = CMSG_LEN(i*sizeof(int));</div><div class='add'>+	if (i &gt; 0) {</div><div class='add'>+		int cmlen = CMSG_LEN(i * sizeof(int));</div><div class='add'>+</div><div class='ctx'> 		err = put_user(SOL_SOCKET, &amp;cm-&gt;cmsg_level);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = put_user(SCM_RIGHTS, &amp;cm-&gt;cmsg_type);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = put_user(cmlen, &amp;cm-&gt;cmsg_len);</div><div class='ctx'> 		if (!err) {</div><div class='del'>-			cmlen = CMSG_SPACE(i*sizeof(int));</div><div class='add'>+			cmlen = CMSG_SPACE(i * sizeof(int));</div><div class='ctx'> 			if (msg-&gt;msg_controllen &lt; cmlen)</div><div class='ctx'> 				cmlen = msg-&gt;msg_controllen;</div><div class='del'>-			msg-&gt;msg_control += cmlen;</div><div class='add'>+			msg-&gt;msg_control_user += cmlen;</div><div class='ctx'> 			msg-&gt;msg_controllen -= cmlen;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (i &lt; fdnum || (fdnum &amp;&amp; fdmax &lt;= 0))</div><div class='add'>+</div><div class='add'>+	if (i &lt; scm-&gt;fp-&gt;count || (scm-&gt;fp-&gt;count &amp;&amp; fdmax &lt;= 0))</div><div class='ctx'> 		msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * All of the files that fit in the message have had their</div><div class='del'>-	 * usage counts incremented, so we just free the list.</div><div class='add'>+	 * All of the files that fit in the message have had their usage counts</div><div class='add'>+	 * incremented, so we just free the list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__scm_destroy(scm);</div><div class='ctx'> }</div><div class='hunk'>@@ -338,13 +408,141 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	new_fpl = kmemdup(fpl, offsetof(struct scm_fp_list, fp[fpl-&gt;count]),</div><div class='del'>-			  GFP_KERNEL);</div><div class='add'>+			  GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (new_fpl) {</div><div class='ctx'> 		for (i = 0; i &lt; fpl-&gt;count; i++)</div><div class='ctx'> 			get_file(fpl-&gt;fp[i]);</div><div class='add'>+</div><div class='ctx'> 		new_fpl-&gt;max = new_fpl-&gt;count;</div><div class='ctx'> 		new_fpl-&gt;user = get_uid(fpl-&gt;user);</div><div class='add'>+#if IS_ENABLED(CONFIG_UNIX)</div><div class='add'>+		new_fpl-&gt;inflight = false;</div><div class='add'>+		new_fpl-&gt;edges = NULL;</div><div class='add'>+		INIT_LIST_HEAD(&amp;new_fpl-&gt;vertices);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> 	return new_fpl;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scm_fp_dup);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SECURITY_NETWORK</div><div class='add'>+static void scm_passec(struct sock *sk, struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+{</div><div class='add'>+	struct lsm_context ctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_scm_security) {</div><div class='add'>+		err = security_secid_to_secctx(scm-&gt;secid, &amp;ctx);</div><div class='add'>+</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, ctx.len,</div><div class='add'>+				 ctx.context);</div><div class='add'>+</div><div class='add'>+			security_release_secctx(&amp;ctx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool scm_has_secdata(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return sk-&gt;sk_scm_security;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void scm_passec(struct sock *sk, struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool scm_has_secdata(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void scm_pidfd_recv(struct msghdr *msg, struct scm_cookie *scm)</div><div class='add'>+{</div><div class='add'>+	struct file *pidfd_file = NULL;</div><div class='add'>+	int len, pidfd;</div><div class='add'>+</div><div class='add'>+	/* put_cmsg() doesn't return an error if CMSG is truncated,</div><div class='add'>+	 * that's why we need to opencode these checks here.</div><div class='add'>+	 */</div><div class='add'>+	if (msg-&gt;msg_flags &amp; MSG_CMSG_COMPAT)</div><div class='add'>+		len = sizeof(struct compat_cmsghdr) + sizeof(int);</div><div class='add'>+	else</div><div class='add'>+		len = sizeof(struct cmsghdr) + sizeof(int);</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_controllen &lt; len) {</div><div class='add'>+		msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!scm-&gt;pid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pidfd = pidfd_prepare(scm-&gt;pid, PIDFD_STALE, &amp;pidfd_file);</div><div class='add'>+</div><div class='add'>+	if (put_cmsg(msg, SOL_SOCKET, SCM_PIDFD, sizeof(int), &amp;pidfd)) {</div><div class='add'>+		if (pidfd_file) {</div><div class='add'>+			put_unused_fd(pidfd);</div><div class='add'>+			fput(pidfd_file);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pidfd_file)</div><div class='add'>+		fd_install(pidfd, pidfd_file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __scm_recv_common(struct sock *sk, struct msghdr *msg,</div><div class='add'>+			      struct scm_cookie *scm, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!msg-&gt;msg_control) {</div><div class='add'>+		if (sk-&gt;sk_scm_credentials || sk-&gt;sk_scm_pidfd ||</div><div class='add'>+		    scm-&gt;fp || scm_has_secdata(sk))</div><div class='add'>+			msg-&gt;msg_flags |= MSG_CTRUNC;</div><div class='add'>+</div><div class='add'>+		scm_destroy(scm);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_scm_credentials) {</div><div class='add'>+		struct user_namespace *current_ns = current_user_ns();</div><div class='add'>+		struct ucred ucreds = {</div><div class='add'>+			.pid = scm-&gt;creds.pid,</div><div class='add'>+			.uid = from_kuid_munged(current_ns, scm-&gt;creds.uid),</div><div class='add'>+			.gid = from_kgid_munged(current_ns, scm-&gt;creds.gid),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(ucreds), &amp;ucreds);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scm_passec(sk, msg, scm);</div><div class='add'>+</div><div class='add'>+	if (scm-&gt;fp)</div><div class='add'>+		scm_detach_fds(msg, scm);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void scm_recv(struct socket *sock, struct msghdr *msg,</div><div class='add'>+	      struct scm_cookie *scm, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!__scm_recv_common(sock-&gt;sk, msg, scm, flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scm_destroy_cred(scm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scm_recv);</div><div class='add'>+</div><div class='add'>+void scm_recv_unix(struct socket *sock, struct msghdr *msg,</div><div class='add'>+		   struct scm_cookie *scm, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!__scm_recv_common(sock-&gt;sk, msg, scm, flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sock-&gt;sk-&gt;sk_scm_pidfd)</div><div class='add'>+		scm_pidfd_recv(msg, scm);</div><div class='add'>+</div><div class='add'>+	scm_destroy_cred(scm);</div><div class='add'>+}</div><div class='head'>diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c<br/>index af6ad467ed61..9a3965680451 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/secure_seq.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/secure_seq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/secure_seq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/secure_seq.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;. All Rights Reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/cryptohash.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='hunk'>@@ -19,8 +19,10 @@</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='del'>-static siphash_key_t net_secret __read_mostly;</div><div class='del'>-static siphash_key_t ts_secret __read_mostly;</div><div class='add'>+static siphash_aligned_key_t net_secret;</div><div class='add'>+static siphash_aligned_key_t ts_secret;</div><div class='add'>+</div><div class='add'>+#define EPHEMERAL_PORT_SHUFFLE_PERIOD (10 * HZ)</div><div class='ctx'> </div><div class='ctx'> static __always_inline void net_secret_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -62,14 +64,14 @@ u32 secure_tcpv6_ts_off(const struct net *net,</div><div class='ctx'> 		.daddr = *(struct in6_addr *)daddr,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_tcp_timestamps != 1)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_timestamps) != 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ts_secret_init();</div><div class='ctx'> 	return siphash(&amp;combined, offsetofend(typeof(combined), daddr),</div><div class='ctx'> 		       &amp;ts_secret);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(secure_tcpv6_ts_off);</div><div class='add'>+EXPORT_IPV6_MOD(secure_tcpv6_ts_off);</div><div class='ctx'> </div><div class='ctx'> u32 secure_tcpv6_seq(const __be32 *saddr, const __be32 *daddr,</div><div class='ctx'> 		     __be16 sport, __be16 dport)</div><div class='hunk'>@@ -94,17 +96,19 @@ u32 secure_tcpv6_seq(const __be32 *saddr, const __be32 *daddr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(secure_tcpv6_seq);</div><div class='ctx'> </div><div class='del'>-u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,</div><div class='add'>+u64 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,</div><div class='ctx'> 			       __be16 dport)</div><div class='ctx'> {</div><div class='ctx'> 	const struct {</div><div class='ctx'> 		struct in6_addr saddr;</div><div class='ctx'> 		struct in6_addr daddr;</div><div class='add'>+		unsigned int timeseed;</div><div class='ctx'> 		__be16 dport;</div><div class='ctx'> 	} __aligned(SIPHASH_ALIGNMENT) combined = {</div><div class='ctx'> 		.saddr = *(struct in6_addr *)saddr,</div><div class='ctx'> 		.daddr = *(struct in6_addr *)daddr,</div><div class='del'>-		.dport = dport</div><div class='add'>+		.timeseed = jiffies / EPHEMERAL_PORT_SHUFFLE_PERIOD,</div><div class='add'>+		.dport = dport,</div><div class='ctx'> 	};</div><div class='ctx'> 	net_secret_init();</div><div class='ctx'> 	return siphash(&amp;combined, offsetofend(typeof(combined), dport),</div><div class='hunk'>@@ -116,7 +120,7 @@ EXPORT_SYMBOL(secure_ipv6_port_ephemeral);</div><div class='ctx'> #ifdef CONFIG_INET</div><div class='ctx'> u32 secure_tcp_ts_off(const struct net *net, __be32 saddr, __be32 daddr)</div><div class='ctx'> {</div><div class='del'>-	if (net-&gt;ipv4.sysctl_tcp_timestamps != 1)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_timestamps) != 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ts_secret_init();</div><div class='hunk'>@@ -142,53 +146,13 @@ u32 secure_tcp_seq(__be32 saddr, __be32 daddr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(secure_tcp_seq);</div><div class='ctx'> </div><div class='del'>-u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)</div><div class='add'>+u64 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)</div><div class='ctx'> {</div><div class='ctx'> 	net_secret_init();</div><div class='del'>-	return siphash_3u32((__force u32)saddr, (__force u32)daddr,</div><div class='del'>-			    (__force u16)dport, &amp;net_secret);</div><div class='add'>+	return siphash_4u32((__force u32)saddr, (__force u32)daddr,</div><div class='add'>+			    (__force u16)dport,</div><div class='add'>+			    jiffies / EPHEMERAL_PORT_SHUFFLE_PERIOD,</div><div class='add'>+			    &amp;net_secret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IP_DCCP)</div><div class='del'>-u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,</div><div class='del'>-				__be16 sport, __be16 dport)</div><div class='del'>-{</div><div class='del'>-	u64 seq;</div><div class='del'>-	net_secret_init();</div><div class='del'>-	seq = siphash_3u32((__force u32)saddr, (__force u32)daddr,</div><div class='del'>-			   (__force u32)sport &lt;&lt; 16 | (__force u32)dport,</div><div class='del'>-			   &amp;net_secret);</div><div class='del'>-	seq += ktime_get_real_ns();</div><div class='del'>-	seq &amp;= (1ull &lt;&lt; 48) - 1;</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(secure_dccp_sequence_number);</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,</div><div class='del'>-				  __be16 sport, __be16 dport)</div><div class='del'>-{</div><div class='del'>-	const struct {</div><div class='del'>-		struct in6_addr saddr;</div><div class='del'>-		struct in6_addr daddr;</div><div class='del'>-		__be16 sport;</div><div class='del'>-		__be16 dport;</div><div class='del'>-	} __aligned(SIPHASH_ALIGNMENT) combined = {</div><div class='del'>-		.saddr = *(struct in6_addr *)saddr,</div><div class='del'>-		.daddr = *(struct in6_addr *)daddr,</div><div class='del'>-		.sport = sport,</div><div class='del'>-		.dport = dport</div><div class='del'>-	};</div><div class='del'>-	u64 seq;</div><div class='del'>-	net_secret_init();</div><div class='del'>-	seq = siphash(&amp;combined, offsetofend(typeof(combined), dport),</div><div class='del'>-		      &amp;net_secret);</div><div class='del'>-	seq += ktime_get_real_ns();</div><div class='del'>-	seq &amp;= (1ull &lt;&lt; 48) - 1;</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(secure_dccpv6_sequence_number);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/core/selftests.c b/net/core/selftests.c<br/>new file mode 100644<br/>index 000000000000..8b81feb82c4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/selftests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/selftests.c</a></div><div class='hunk'>@@ -0,0 +1,448 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019 Synopsys, Inc. and/or its affiliates.</div><div class='add'>+ * stmmac Selftests Support</div><div class='add'>+ *</div><div class='add'>+ * Author: Jose Abreu &lt;joabreu@synopsys.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Ported from stmmac by:</div><div class='add'>+ * Copyright (C) 2021 Oleksij Rempel &lt;o.rempel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;net/selftests.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+</div><div class='add'>+static u8 net_test_next_id;</div><div class='add'>+</div><div class='add'>+struct sk_buff *net_test_get_skb(struct net_device *ndev, u8 id,</div><div class='add'>+				 struct net_packet_attrs *attr)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct udphdr *uhdr = NULL;</div><div class='add'>+	struct tcphdr *thdr = NULL;</div><div class='add'>+	struct netsfhdr *shdr;</div><div class='add'>+	struct ethhdr *ehdr;</div><div class='add'>+	struct iphdr *ihdr;</div><div class='add'>+	int iplen, size;</div><div class='add'>+</div><div class='add'>+	size = attr-&gt;size + NET_TEST_PKT_SIZE;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;tcp)</div><div class='add'>+		size += sizeof(struct tcphdr);</div><div class='add'>+	else</div><div class='add'>+		size += sizeof(struct udphdr);</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;max_size &amp;&amp; attr-&gt;max_size &gt; size)</div><div class='add'>+		size = attr-&gt;max_size;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(ndev, size);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	prefetchw(skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	ehdr = skb_push(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	skb_set_network_header(skb, skb-&gt;len);</div><div class='add'>+	ihdr = skb_put(skb, sizeof(*ihdr));</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, skb-&gt;len);</div><div class='add'>+	if (attr-&gt;tcp)</div><div class='add'>+		thdr = skb_put(skb, sizeof(*thdr));</div><div class='add'>+	else</div><div class='add'>+		uhdr = skb_put(skb, sizeof(*uhdr));</div><div class='add'>+</div><div class='add'>+	eth_zero_addr(ehdr-&gt;h_dest);</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;src)</div><div class='add'>+		ether_addr_copy(ehdr-&gt;h_source, attr-&gt;src);</div><div class='add'>+	if (attr-&gt;dst)</div><div class='add'>+		ether_addr_copy(ehdr-&gt;h_dest, attr-&gt;dst);</div><div class='add'>+</div><div class='add'>+	ehdr-&gt;h_proto = htons(ETH_P_IP);</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;tcp) {</div><div class='add'>+		memset(thdr, 0, sizeof(*thdr));</div><div class='add'>+		thdr-&gt;source = htons(attr-&gt;sport);</div><div class='add'>+		thdr-&gt;dest = htons(attr-&gt;dport);</div><div class='add'>+		thdr-&gt;doff = sizeof(struct tcphdr) / 4;</div><div class='add'>+	} else {</div><div class='add'>+		uhdr-&gt;source = htons(attr-&gt;sport);</div><div class='add'>+		uhdr-&gt;dest = htons(attr-&gt;dport);</div><div class='add'>+		uhdr-&gt;len = htons(sizeof(*shdr) + sizeof(*uhdr) + attr-&gt;size);</div><div class='add'>+		if (attr-&gt;max_size)</div><div class='add'>+			uhdr-&gt;len = htons(attr-&gt;max_size -</div><div class='add'>+					  (sizeof(*ihdr) + sizeof(*ehdr)));</div><div class='add'>+		uhdr-&gt;check = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ihdr-&gt;ihl = 5;</div><div class='add'>+	ihdr-&gt;ttl = 32;</div><div class='add'>+	ihdr-&gt;version = 4;</div><div class='add'>+	if (attr-&gt;tcp)</div><div class='add'>+		ihdr-&gt;protocol = IPPROTO_TCP;</div><div class='add'>+	else</div><div class='add'>+		ihdr-&gt;protocol = IPPROTO_UDP;</div><div class='add'>+	iplen = sizeof(*ihdr) + sizeof(*shdr) + attr-&gt;size;</div><div class='add'>+	if (attr-&gt;tcp)</div><div class='add'>+		iplen += sizeof(*thdr);</div><div class='add'>+	else</div><div class='add'>+		iplen += sizeof(*uhdr);</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;max_size)</div><div class='add'>+		iplen = attr-&gt;max_size - sizeof(*ehdr);</div><div class='add'>+</div><div class='add'>+	ihdr-&gt;tot_len = htons(iplen);</div><div class='add'>+	ihdr-&gt;frag_off = 0;</div><div class='add'>+	ihdr-&gt;saddr = htonl(attr-&gt;ip_src);</div><div class='add'>+	ihdr-&gt;daddr = htonl(attr-&gt;ip_dst);</div><div class='add'>+	ihdr-&gt;tos = 0;</div><div class='add'>+	ihdr-&gt;id = 0;</div><div class='add'>+	ip_send_check(ihdr);</div><div class='add'>+</div><div class='add'>+	shdr = skb_put(skb, sizeof(*shdr));</div><div class='add'>+	shdr-&gt;version = 0;</div><div class='add'>+	shdr-&gt;magic = cpu_to_be64(NET_TEST_PKT_MAGIC);</div><div class='add'>+	attr-&gt;id = id;</div><div class='add'>+	shdr-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;size) {</div><div class='add'>+		void *payload = skb_put(skb, attr-&gt;size);</div><div class='add'>+</div><div class='add'>+		memset(payload, 0, attr-&gt;size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;max_size &amp;&amp; attr-&gt;max_size &gt; skb-&gt;len) {</div><div class='add'>+		size_t pad_len = attr-&gt;max_size - skb-&gt;len;</div><div class='add'>+		void *pad = skb_put(skb, pad_len);</div><div class='add'>+</div><div class='add'>+		memset(pad, 0, pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;csum = 0;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='add'>+	if (attr-&gt;tcp) {</div><div class='add'>+		int l4len = skb-&gt;len - skb_transport_offset(skb);</div><div class='add'>+</div><div class='add'>+		thdr-&gt;check = ~tcp_v4_check(l4len, ihdr-&gt;saddr, ihdr-&gt;daddr, 0);</div><div class='add'>+		skb-&gt;csum_start = skb_transport_header(skb) - skb-&gt;head;</div><div class='add'>+		skb-&gt;csum_offset = offsetof(struct tcphdr, check);</div><div class='add'>+</div><div class='add'>+		if (attr-&gt;bad_csum) {</div><div class='add'>+			/* Force mangled checksum */</div><div class='add'>+			if (skb_checksum_help(skb)) {</div><div class='add'>+				kfree_skb(skb);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (thdr-&gt;check != CSUM_MANGLED_0)</div><div class='add'>+				thdr-&gt;check = CSUM_MANGLED_0;</div><div class='add'>+			else</div><div class='add'>+				thdr-&gt;check = csum16_sub(thdr-&gt;check,</div><div class='add'>+							 cpu_to_be16(1));</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		udp4_hwcsum(skb, ihdr-&gt;saddr, ihdr-&gt;daddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	skb-&gt;pkt_type = PACKET_HOST;</div><div class='add'>+	skb-&gt;dev = ndev;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(net_test_get_skb);</div><div class='add'>+</div><div class='add'>+static int net_test_loopback_validate(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *ndev,</div><div class='add'>+				      struct packet_type *pt,</div><div class='add'>+				      struct net_device *orig_ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_test_priv *tpriv = pt-&gt;af_packet_priv;</div><div class='add'>+	const unsigned char *src = tpriv-&gt;packet-&gt;src;</div><div class='add'>+	const unsigned char *dst = tpriv-&gt;packet-&gt;dst;</div><div class='add'>+	struct netsfhdr *shdr;</div><div class='add'>+	struct ethhdr *ehdr;</div><div class='add'>+	struct udphdr *uhdr;</div><div class='add'>+	struct tcphdr *thdr;</div><div class='add'>+	struct iphdr *ihdr;</div><div class='add'>+</div><div class='add'>+	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		goto out;</div><div class='add'>+	if (skb_headlen(skb) &lt; (NET_TEST_PKT_SIZE - ETH_HLEN))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ehdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='add'>+	if (dst) {</div><div class='add'>+		if (!ether_addr_equal_unaligned(ehdr-&gt;h_dest, dst))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (src) {</div><div class='add'>+		if (!ether_addr_equal_unaligned(ehdr-&gt;h_source, src))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ihdr = ip_hdr(skb);</div><div class='add'>+	if (tpriv-&gt;double_vlan)</div><div class='add'>+		ihdr = (struct iphdr *)(skb_network_header(skb) + 4);</div><div class='add'>+</div><div class='add'>+	if (tpriv-&gt;packet-&gt;tcp) {</div><div class='add'>+		if (ihdr-&gt;protocol != IPPROTO_TCP)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		thdr = (struct tcphdr *)((u8 *)ihdr + 4 * ihdr-&gt;ihl);</div><div class='add'>+		if (thdr-&gt;dest != htons(tpriv-&gt;packet-&gt;dport))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		shdr = (struct netsfhdr *)((u8 *)thdr + sizeof(*thdr));</div><div class='add'>+	} else {</div><div class='add'>+		if (ihdr-&gt;protocol != IPPROTO_UDP)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		uhdr = (struct udphdr *)((u8 *)ihdr + 4 * ihdr-&gt;ihl);</div><div class='add'>+		if (uhdr-&gt;dest != htons(tpriv-&gt;packet-&gt;dport))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		shdr = (struct netsfhdr *)((u8 *)uhdr + sizeof(*uhdr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (shdr-&gt;magic != cpu_to_be64(NET_TEST_PKT_MAGIC))</div><div class='add'>+		goto out;</div><div class='add'>+	if (tpriv-&gt;packet-&gt;id != shdr-&gt;id)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (tpriv-&gt;packet-&gt;bad_csum &amp;&amp; skb-&gt;ip_summed == CHECKSUM_UNNECESSARY)</div><div class='add'>+		tpriv-&gt;ok = -EIO;</div><div class='add'>+	else</div><div class='add'>+		tpriv-&gt;ok = true;</div><div class='add'>+</div><div class='add'>+	complete(&amp;tpriv-&gt;comp);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_test_loopback(struct net_device *ndev,</div><div class='add'>+			       struct net_packet_attrs *attr)</div><div class='add'>+{</div><div class='add'>+	struct net_test_priv *tpriv;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	tpriv = kzalloc(sizeof(*tpriv), GFP_KERNEL);</div><div class='add'>+	if (!tpriv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tpriv-&gt;ok = false;</div><div class='add'>+	init_completion(&amp;tpriv-&gt;comp);</div><div class='add'>+</div><div class='add'>+	tpriv-&gt;pt.type = htons(ETH_P_IP);</div><div class='add'>+	tpriv-&gt;pt.func = net_test_loopback_validate;</div><div class='add'>+	tpriv-&gt;pt.dev = ndev;</div><div class='add'>+	tpriv-&gt;pt.af_packet_priv = tpriv;</div><div class='add'>+	tpriv-&gt;packet = attr;</div><div class='add'>+	dev_add_pack(&amp;tpriv-&gt;pt);</div><div class='add'>+</div><div class='add'>+	skb = net_test_get_skb(ndev, net_test_next_id, attr);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net_test_next_id++;</div><div class='add'>+	ret = dev_direct_xmit(skb, attr-&gt;queue_mapping);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		goto cleanup;</div><div class='add'>+	} else if (ret &gt; 0) {</div><div class='add'>+		ret = -ENETUNREACH;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!attr-&gt;timeout)</div><div class='add'>+		attr-&gt;timeout = NET_LB_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	wait_for_completion_timeout(&amp;tpriv-&gt;comp, attr-&gt;timeout);</div><div class='add'>+	if (tpriv-&gt;ok &lt; 0)</div><div class='add'>+		ret = tpriv-&gt;ok;</div><div class='add'>+	else if (!tpriv-&gt;ok)</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	dev_remove_pack(&amp;tpriv-&gt;pt);</div><div class='add'>+	kfree(tpriv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_netif_carrier(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return netif_carrier_ok(ndev) ? 0 : -ENOLINK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_phydev(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return ndev-&gt;phydev ? 0 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_loopback_enable(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	if (!ndev-&gt;phydev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return phy_loopback(ndev-&gt;phydev, true, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_loopback_disable(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	if (!ndev-&gt;phydev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return phy_loopback(ndev-&gt;phydev, false, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_loopback_udp(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = { };</div><div class='add'>+</div><div class='add'>+	attr.dst = ndev-&gt;dev_addr;</div><div class='add'>+	return __net_test_loopback(ndev, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_loopback_udp_mtu(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = { };</div><div class='add'>+</div><div class='add'>+	attr.dst = ndev-&gt;dev_addr;</div><div class='add'>+	attr.max_size = ndev-&gt;mtu;</div><div class='add'>+	return __net_test_loopback(ndev, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net_test_phy_loopback_tcp(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = { };</div><div class='add'>+</div><div class='add'>+	attr.dst = ndev-&gt;dev_addr;</div><div class='add'>+	attr.tcp = true;</div><div class='add'>+	return __net_test_loopback(ndev, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_test_phy_loopback_tcp_bad_csum - PHY loopback test with a deliberately</div><div class='add'>+ *					corrupted TCP checksum</div><div class='add'>+ * @ndev: the network device to test</div><div class='add'>+ *</div><div class='add'>+ * Builds the same minimal Ethernet/IPv4/TCP frame as</div><div class='add'>+ * net_test_phy_loopback_tcp(), then flips the least-significant bit of the TCP</div><div class='add'>+ * checksum so the resulting value is provably invalid (neither 0 nor 0xFFFF).</div><div class='add'>+ * The frame is transmitted through the device’s internal PHY loopback path:</div><div class='add'>+ *</div><div class='add'>+ *   test code -&gt; MAC driver -&gt; MAC HW -&gt; xMII -&gt; PHY -&gt;</div><div class='add'>+ *   internal PHY loopback -&gt; xMII -&gt; MAC HW -&gt; MAC driver -&gt; test code</div><div class='add'>+ *</div><div class='add'>+ * Result interpretation</div><div class='add'>+ * ---------------------</div><div class='add'>+ *  0            The frame is delivered to the stack and the driver reports</div><div class='add'>+ *               ip_summed as CHECKSUM_NONE or CHECKSUM_COMPLETE - both are</div><div class='add'>+ *               valid ways to indicate “bad checksum, let the stack verify.”</div><div class='add'>+ *  -ETIMEDOUT   The MAC/PHY silently dropped the frame; hardware checksum</div><div class='add'>+ *               verification filtered it out before the driver saw it.</div><div class='add'>+ *  -EIO         The driver returned the frame with ip_summed ==</div><div class='add'>+ *               CHECKSUM_UNNECESSARY, falsely claiming a valid checksum and</div><div class='add'>+ *               indicating a serious RX-path defect.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int net_test_phy_loopback_tcp_bad_csum(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = { };</div><div class='add'>+</div><div class='add'>+	attr.dst = ndev-&gt;dev_addr;</div><div class='add'>+	attr.tcp = true;</div><div class='add'>+	attr.bad_csum = true;</div><div class='add'>+	return __net_test_loopback(ndev, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_test {</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+	int (*fn)(struct net_device *ndev);</div><div class='add'>+} net_selftests[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "Carrier                       ",</div><div class='add'>+		.fn = net_test_netif_carrier,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY dev is present            ",</div><div class='add'>+		.fn = net_test_phy_phydev,</div><div class='add'>+	}, {</div><div class='add'>+		/* This test should be done before all PHY loopback test */</div><div class='add'>+		.name = "PHY internal loopback, enable ",</div><div class='add'>+		.fn = net_test_phy_loopback_enable,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY internal loopback, UDP    ",</div><div class='add'>+		.fn = net_test_phy_loopback_udp,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY internal loopback, MTU    ",</div><div class='add'>+		.fn = net_test_phy_loopback_udp_mtu,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY internal loopback, TCP    ",</div><div class='add'>+		.fn = net_test_phy_loopback_tcp,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY loopback, bad TCP csum    ",</div><div class='add'>+		.fn = net_test_phy_loopback_tcp_bad_csum,</div><div class='add'>+	}, {</div><div class='add'>+		/* This test should be done after all PHY loopback test */</div><div class='add'>+		.name = "PHY internal loopback, disable",</div><div class='add'>+		.fn = net_test_phy_loopback_disable,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void net_selftest(struct net_device *ndev, struct ethtool_test *etest, u64 *buf)</div><div class='add'>+{</div><div class='add'>+	int count = net_selftest_get_count();</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(*buf) * count);</div><div class='add'>+	net_test_next_id = 0;</div><div class='add'>+</div><div class='add'>+	if (etest-&gt;flags != ETH_TEST_FL_OFFLINE) {</div><div class='add'>+		netdev_err(ndev, "Only offline tests are supported\n");</div><div class='add'>+		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		buf[i] = net_selftests[i].fn(ndev);</div><div class='add'>+		if (buf[i] &amp;&amp; (buf[i] != -EOPNOTSUPP))</div><div class='add'>+			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(net_selftest);</div><div class='add'>+</div><div class='add'>+int net_selftest_get_count(void)</div><div class='add'>+{</div><div class='add'>+	return ARRAY_SIZE(net_selftests);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(net_selftest_get_count);</div><div class='add'>+</div><div class='add'>+void net_selftest_get_strings(u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; net_selftest_get_count(); i++)</div><div class='add'>+		ethtool_sprintf(&amp;data, "%2d. %s", i + 1,</div><div class='add'>+				net_selftests[i].name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(net_selftest_get_strings);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Common library for generic PHY ethtool selftests");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Oleksij Rempel &lt;o.rempel@pengutronix.de&gt;");</div><div class='head'>diff --git a/net/core/skb_fault_injection.c b/net/core/skb_fault_injection.c<br/>new file mode 100644<br/>index 000000000000..4235db6bdfad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/skb_fault_injection.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/skb_fault_injection.c</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/fault-inject.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	struct fault_attr attr;</div><div class='add'>+	char devname[IFNAMSIZ];</div><div class='add'>+	bool filtered;</div><div class='add'>+} skb_realloc = {</div><div class='add'>+	.attr = FAULT_ATTR_INITIALIZER,</div><div class='add'>+	.filtered = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool should_fail_net_realloc_skb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net = skb-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (skb_realloc.filtered &amp;&amp;</div><div class='add'>+	    strncmp(net-&gt;name, skb_realloc.devname, IFNAMSIZ))</div><div class='add'>+		/* device name filter set, but names do not match */</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!should_fail(&amp;skb_realloc.attr, 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+ALLOW_ERROR_INJECTION(should_fail_net_realloc_skb, TRUE);</div><div class='add'>+</div><div class='add'>+void skb_might_realloc(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!should_fail_net_realloc_skb(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_might_realloc);</div><div class='add'>+</div><div class='add'>+static int __init fail_skb_realloc_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	return setup_fault_attr(&amp;skb_realloc.attr, str);</div><div class='add'>+}</div><div class='add'>+__setup("fail_skb_realloc=", fail_skb_realloc_setup);</div><div class='add'>+</div><div class='add'>+static void reset_settings(void)</div><div class='add'>+{</div><div class='add'>+	skb_realloc.filtered = false;</div><div class='add'>+	memset(&amp;skb_realloc.devname, 0, IFNAMSIZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t devname_write(struct file *file, const char __user *buffer,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	reset_settings();</div><div class='add'>+	ret = simple_write_to_buffer(&amp;skb_realloc.devname, IFNAMSIZ,</div><div class='add'>+				     ppos, buffer, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb_realloc.devname[IFNAMSIZ - 1] = '\0';</div><div class='add'>+	/* Remove a possible \n at the end of devname */</div><div class='add'>+	strim(skb_realloc.devname);</div><div class='add'>+</div><div class='add'>+	if (strnlen(skb_realloc.devname, IFNAMSIZ))</div><div class='add'>+		skb_realloc.filtered = true;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t devname_read(struct file *file,</div><div class='add'>+			    char __user *buffer,</div><div class='add'>+			    size_t size, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (!skb_realloc.filtered)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(buffer, size, ppos, &amp;skb_realloc.devname,</div><div class='add'>+				       strlen(skb_realloc.devname));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations devname_ops = {</div><div class='add'>+	.write = devname_write,</div><div class='add'>+	.read = devname_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init fail_skb_realloc_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	umode_t mode = S_IFREG | 0600;</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+</div><div class='add'>+	dir = fault_create_debugfs_attr("fail_skb_realloc", NULL,</div><div class='add'>+					&amp;skb_realloc.attr);</div><div class='add'>+	if (IS_ERR(dir))</div><div class='add'>+		return PTR_ERR(dir);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("devname", mode, dir, NULL, &amp;devname_ops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(fail_skb_realloc_debugfs);</div><div class='head'>diff --git a/net/core/skbuff.c b/net/core/skbuff.c<br/>index b2c807f67aba..a00808f7be6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/skbuff.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/skbuff.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/skbuff.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/skbuff.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Routines having to do with the 'struct sk_buff' memory handlers.</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,11 +26,6 @@</div><div class='ctx'>  *	disabled, or you better be *real* sure that the operation is atomic</div><div class='ctx'>  *	with respect to whatever list is being frobbed (e.g. via lock_sock()</div><div class='ctx'>  *	or via disabling bottom half handlers, etc).</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -55,6 +51,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> #include &lt;linux/splice.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='hunk'>@@ -62,25 +59,137 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/mpls.h&gt;</div><div class='add'>+#include &lt;linux/kcov.h&gt;</div><div class='add'>+#include &lt;linux/iov_iter.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/mpls.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='add'>+#include &lt;net/mctp.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/psp/types.h&gt;</div><div class='add'>+#include &lt;net/dropreason.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='add'>+#include &lt;linux/textsearch.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='add'>+#include "devmem.h"</div><div class='add'>+#include "netmem_priv.h"</div><div class='add'>+#include "sock_destructor.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SKB_EXTENSIONS</div><div class='add'>+static struct kmem_cache *skbuff_ext_cache __ro_after_init;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define GRO_MAX_HEAD_PAD (GRO_MAX_HEAD + NET_SKB_PAD + NET_IP_ALIGN)</div><div class='add'>+#define SKB_SMALL_HEAD_SIZE SKB_HEAD_ALIGN(max(MAX_TCP_HEADER, \</div><div class='add'>+					       GRO_MAX_HEAD_PAD))</div><div class='add'>+</div><div class='add'>+/* We want SKB_SMALL_HEAD_CACHE_SIZE to not be a power of two.</div><div class='add'>+ * This should ensure that SKB_SMALL_HEAD_HEADROOM is a unique</div><div class='add'>+ * size, and we can differentiate heads from skb_small_head_cache</div><div class='add'>+ * vs system slabs by looking at their size (skb_end_offset()).</div><div class='add'>+ */</div><div class='add'>+#define SKB_SMALL_HEAD_CACHE_SIZE					\</div><div class='add'>+	(is_power_of_2(SKB_SMALL_HEAD_SIZE) ?			\</div><div class='add'>+		(SKB_SMALL_HEAD_SIZE + L1_CACHE_BYTES) :	\</div><div class='add'>+		SKB_SMALL_HEAD_SIZE)</div><div class='add'>+</div><div class='add'>+#define SKB_SMALL_HEAD_HEADROOM						\</div><div class='add'>+	SKB_WITH_OVERHEAD(SKB_SMALL_HEAD_CACHE_SIZE)</div><div class='add'>+</div><div class='add'>+/* kcm_write_msgs() relies on casting paged frags to bio_vec to use</div><div class='add'>+ * iov_iter_bvec(). These static asserts ensure the cast is valid is long as the</div><div class='add'>+ * netmem is a page.</div><div class='add'>+ */</div><div class='add'>+static_assert(offsetof(struct bio_vec, bv_page) ==</div><div class='add'>+	      offsetof(skb_frag_t, netmem));</div><div class='add'>+static_assert(sizeof_field(struct bio_vec, bv_page) ==</div><div class='add'>+	      sizeof_field(skb_frag_t, netmem));</div><div class='add'>+</div><div class='add'>+static_assert(offsetof(struct bio_vec, bv_len) == offsetof(skb_frag_t, len));</div><div class='add'>+static_assert(sizeof_field(struct bio_vec, bv_len) ==</div><div class='add'>+	      sizeof_field(skb_frag_t, len));</div><div class='add'>+</div><div class='add'>+static_assert(offsetof(struct bio_vec, bv_offset) ==</div><div class='add'>+	      offsetof(skb_frag_t, offset));</div><div class='add'>+static_assert(sizeof_field(struct bio_vec, bv_offset) ==</div><div class='add'>+	      sizeof_field(skb_frag_t, offset));</div><div class='add'>+</div><div class='add'>+#undef FN</div><div class='add'>+#define FN(reason) [SKB_DROP_REASON_##reason] = #reason,</div><div class='add'>+static const char * const drop_reasons[] = {</div><div class='add'>+	[SKB_CONSUMED] = "CONSUMED",</div><div class='add'>+	DEFINE_DROP_REASON(FN, FN)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drop_reason_list drop_reasons_core = {</div><div class='add'>+	.reasons = drop_reasons,</div><div class='add'>+	.n_reasons = ARRAY_SIZE(drop_reasons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drop_reason_list __rcu *</div><div class='add'>+drop_reasons_by_subsys[SKB_DROP_REASON_SUBSYS_NUM] = {</div><div class='add'>+	[SKB_DROP_REASON_SUBSYS_CORE] = RCU_INITIALIZER(&amp;drop_reasons_core),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(drop_reasons_by_subsys);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drop_reasons_register_subsys - register another drop reason subsystem</div><div class='add'>+ * @subsys: the subsystem to register, must not be the core</div><div class='add'>+ * @list: the list of drop reasons within the subsystem, must point to</div><div class='add'>+ *	a statically initialized list</div><div class='add'>+ */</div><div class='add'>+void drop_reasons_register_subsys(enum skb_drop_reason_subsys subsys,</div><div class='add'>+				  const struct drop_reason_list *list)</div><div class='add'>+{</div><div class='add'>+	if (WARN(subsys &lt;= SKB_DROP_REASON_SUBSYS_CORE ||</div><div class='add'>+		 subsys &gt;= ARRAY_SIZE(drop_reasons_by_subsys),</div><div class='add'>+		 "invalid subsystem %d\n", subsys))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* must point to statically allocated memory, so INIT is OK */</div><div class='add'>+	RCU_INIT_POINTER(drop_reasons_by_subsys[subsys], list);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(drop_reasons_register_subsys);</div><div class='ctx'> </div><div class='del'>-struct kmem_cache *skbuff_head_cache __ro_after_init;</div><div class='del'>-static struct kmem_cache *skbuff_fclone_cache __ro_after_init;</div><div class='del'>-int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS;</div><div class='del'>-EXPORT_SYMBOL(sysctl_max_skb_frags);</div><div class='add'>+/**</div><div class='add'>+ * drop_reasons_unregister_subsys - unregister a drop reason subsystem</div><div class='add'>+ * @subsys: the subsystem to remove, must not be the core</div><div class='add'>+ *</div><div class='add'>+ * Note: This will synchronize_rcu() to ensure no users when it returns.</div><div class='add'>+ */</div><div class='add'>+void drop_reasons_unregister_subsys(enum skb_drop_reason_subsys subsys)</div><div class='add'>+{</div><div class='add'>+	if (WARN(subsys &lt;= SKB_DROP_REASON_SUBSYS_CORE ||</div><div class='add'>+		 subsys &gt;= ARRAY_SIZE(drop_reasons_by_subsys),</div><div class='add'>+		 "invalid subsystem %d\n", subsys))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(drop_reasons_by_subsys[subsys], NULL);</div><div class='add'>+</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(drop_reasons_unregister_subsys);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	skb_panic - private function for out-of-line support</div><div class='hunk'>@@ -97,7 +206,7 @@ EXPORT_SYMBOL(sysctl_max_skb_frags);</div><div class='ctx'> static void skb_panic(struct sk_buff *skb, unsigned int sz, void *addr,</div><div class='ctx'> 		      const char msg[])</div><div class='ctx'> {</div><div class='del'>-	pr_emerg("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n",</div><div class='add'>+	pr_emerg("%s: text:%px len:%d put:%d head:%px data:%px tail:%#lx end:%#lx dev:%s\n",</div><div class='ctx'> 		 msg, addr, skb-&gt;len, sz, skb-&gt;head, skb-&gt;data,</div><div class='ctx'> 		 (unsigned long)skb-&gt;tail, (unsigned long)skb-&gt;end,</div><div class='ctx'> 		 skb-&gt;dev ? skb-&gt;dev-&gt;name : "&lt;NULL&gt;");</div><div class='hunk'>@@ -114,154 +223,240 @@ static void skb_under_panic(struct sk_buff *skb, unsigned int sz, void *addr)</div><div class='ctx'> 	skb_panic(skb, sz, addr, __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * kmalloc_reserve is a wrapper around kmalloc_node_track_caller that tells</div><div class='del'>- * the caller if emergency pfmemalloc reserves are being used. If it is and</div><div class='del'>- * the socket is later found to be SOCK_MEMALLOC then PFMEMALLOC reserves</div><div class='del'>- * may be used. Otherwise, the packet data may be discarded until enough</div><div class='del'>- * memory is free</div><div class='del'>- */</div><div class='del'>-#define kmalloc_reserve(size, gfp, node, pfmemalloc) \</div><div class='del'>-	 __kmalloc_reserve(size, gfp, node, _RET_IP_, pfmemalloc)</div><div class='add'>+#define NAPI_SKB_CACHE_SIZE	128</div><div class='add'>+#define NAPI_SKB_CACHE_BULK	32</div><div class='add'>+#define NAPI_SKB_CACHE_FREE	32</div><div class='ctx'> </div><div class='del'>-static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,</div><div class='del'>-			       unsigned long ip, bool *pfmemalloc)</div><div class='add'>+struct napi_alloc_cache {</div><div class='add'>+	local_lock_t bh_lock;</div><div class='add'>+	struct page_frag_cache page;</div><div class='add'>+	unsigned int skb_count;</div><div class='add'>+	void *skb_cache[NAPI_SKB_CACHE_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);</div><div class='add'>+static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)</div><div class='ctx'> {</div><div class='del'>-	void *obj;</div><div class='del'>-	bool ret_pfmemalloc = false;</div><div class='add'>+	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+	void *data;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Try a regular allocation, when that fails and we're not entitled</div><div class='del'>-	 * to the reserves, fail.</div><div class='del'>-	 */</div><div class='del'>-	obj = kmalloc_node_track_caller(size,</div><div class='del'>-					flags | __GFP_NOMEMALLOC | __GFP_NOWARN,</div><div class='del'>-					node);</div><div class='del'>-	if (obj || !(gfp_pfmemalloc_allowed(flags)))</div><div class='del'>-		goto out;</div><div class='add'>+	fragsz = SKB_DATA_ALIGN(fragsz);</div><div class='ctx'> </div><div class='del'>-	/* Try again but now we are using pfmemalloc reserves */</div><div class='del'>-	ret_pfmemalloc = true;</div><div class='del'>-	obj = kmalloc_node_track_caller(size, flags, node);</div><div class='add'>+	local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+	data = __page_frag_alloc_align(&amp;nc-&gt;page, fragsz,</div><div class='add'>+				       GFP_ATOMIC | __GFP_NOWARN, align_mask);</div><div class='add'>+	local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+	return data;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (pfmemalloc)</div><div class='del'>-		*pfmemalloc = ret_pfmemalloc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__napi_alloc_frag_align);</div><div class='ctx'> </div><div class='del'>-	return obj;</div><div class='add'>+void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (in_hardirq() || irqs_disabled()) {</div><div class='add'>+		struct page_frag_cache *nc = this_cpu_ptr(&amp;netdev_alloc_cache);</div><div class='add'>+</div><div class='add'>+		fragsz = SKB_DATA_ALIGN(fragsz);</div><div class='add'>+		data = __page_frag_alloc_align(nc, fragsz,</div><div class='add'>+					       GFP_ATOMIC | __GFP_NOWARN,</div><div class='add'>+					       align_mask);</div><div class='add'>+	} else {</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		data = __napi_alloc_frag_align(fragsz, align_mask);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='add'>+	return data;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__netdev_alloc_frag_align);</div><div class='ctx'> </div><div class='del'>-/* 	Allocate a new skbuff. We do this ourselves so we can fill in a few</div><div class='del'>- *	'private' fields and also do memory statistics to find all the</div><div class='del'>- *	[BEEP] leaks.</div><div class='del'>- *</div><div class='add'>+/* Cache kmem_cache_size(net_hotdata.skbuff_cache) to help the compiler</div><div class='add'>+ * remove dead code (and skbuff_cache_size) when CONFIG_KASAN is unset.</div><div class='ctx'>  */</div><div class='add'>+static u32 skbuff_cache_size __read_mostly;</div><div class='add'>+</div><div class='add'>+static struct sk_buff *napi_skb_cache_get(bool alloc)</div><div class='add'>+{</div><div class='add'>+	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+	if (unlikely(!nc-&gt;skb_count)) {</div><div class='add'>+		if (alloc)</div><div class='add'>+			nc-&gt;skb_count = kmem_cache_alloc_bulk(net_hotdata.skbuff_cache,</div><div class='add'>+						GFP_ATOMIC | __GFP_NOWARN,</div><div class='add'>+						NAPI_SKB_CACHE_BULK,</div><div class='add'>+						nc-&gt;skb_cache);</div><div class='add'>+		if (unlikely(!nc-&gt;skb_count)) {</div><div class='add'>+			local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nc-&gt;skb_cache[--nc-&gt;skb_count];</div><div class='add'>+	if (nc-&gt;skb_count)</div><div class='add'>+		prefetch(nc-&gt;skb_cache[nc-&gt;skb_count - 1]);</div><div class='add'>+	local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+	kasan_mempool_unpoison_object(skb, skbuff_cache_size);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__alloc_skb	-	allocate a network buffer</div><div class='del'>- *	@size: size to allocate</div><div class='del'>- *	@gfp_mask: allocation mask</div><div class='del'>- *	@flags: If SKB_ALLOC_FCLONE is set, allocate from fclone cache</div><div class='del'>- *		instead of head cache and allocate a cloned (child) skb.</div><div class='del'>- *		If SKB_ALLOC_RX is set, __GFP_MEMALLOC will be used for</div><div class='del'>- *		allocations in case the data is required for writeback</div><div class='del'>- *	@node: numa node to allocate memory on</div><div class='add'>+ * napi_skb_cache_get_bulk - obtain a number of zeroed skb heads from the cache</div><div class='add'>+ * @skbs: pointer to an at least @n-sized array to fill with skb pointers</div><div class='add'>+ * @n: number of entries to provide</div><div class='ctx'>  *</div><div class='del'>- *	Allocate a new &amp;sk_buff. The returned buffer has no headroom and a</div><div class='del'>- *	tail room of at least size bytes. The object has a reference count</div><div class='del'>- *	of one. The return is the buffer. On a failure the return is %NULL.</div><div class='add'>+ * Tries to obtain @n &amp;sk_buff entries from the NAPI percpu cache and writes</div><div class='add'>+ * the pointers into the provided array @skbs. If there are less entries</div><div class='add'>+ * available, tries to replenish the cache and bulk-allocates the diff from</div><div class='add'>+ * the MM layer if needed.</div><div class='add'>+ * The heads are being zeroed with either memset() or %__GFP_ZERO, so they are</div><div class='add'>+ * ready for {,__}build_skb_around() and don't have any data buffers attached.</div><div class='add'>+ * Must be called *only* from the BH context.</div><div class='ctx'>  *</div><div class='del'>- *	Buffers may only be allocated from interrupts using a @gfp_mask of</div><div class='del'>- *	%GFP_ATOMIC.</div><div class='add'>+ * Return: number of successfully allocated skbs (@n if no actual allocation</div><div class='add'>+ *	   needed or kmem_cache_alloc_bulk() didn't fail).</div><div class='ctx'>  */</div><div class='del'>-struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,</div><div class='del'>-			    int flags, int node)</div><div class='add'>+u32 napi_skb_cache_get_bulk(void **skbs, u32 n)</div><div class='ctx'> {</div><div class='del'>-	struct kmem_cache *cache;</div><div class='del'>-	struct skb_shared_info *shinfo;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 *data;</div><div class='del'>-	bool pfmemalloc;</div><div class='add'>+	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+	u32 bulk, total = n;</div><div class='add'>+</div><div class='add'>+	local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+</div><div class='add'>+	if (nc-&gt;skb_count &gt;= n)</div><div class='add'>+		goto get;</div><div class='add'>+</div><div class='add'>+	/* No enough cached skbs. Try refilling the cache first */</div><div class='add'>+	bulk = min(NAPI_SKB_CACHE_SIZE - nc-&gt;skb_count, NAPI_SKB_CACHE_BULK);</div><div class='add'>+	nc-&gt;skb_count += kmem_cache_alloc_bulk(net_hotdata.skbuff_cache,</div><div class='add'>+					       GFP_ATOMIC | __GFP_NOWARN, bulk,</div><div class='add'>+					       &amp;nc-&gt;skb_cache[nc-&gt;skb_count]);</div><div class='add'>+	if (likely(nc-&gt;skb_count &gt;= n))</div><div class='add'>+		goto get;</div><div class='add'>+</div><div class='add'>+	/* Still not enough. Bulk-allocate the missing part directly, zeroed */</div><div class='add'>+	n -= kmem_cache_alloc_bulk(net_hotdata.skbuff_cache,</div><div class='add'>+				   GFP_ATOMIC | __GFP_ZERO | __GFP_NOWARN,</div><div class='add'>+				   n - nc-&gt;skb_count, &amp;skbs[nc-&gt;skb_count]);</div><div class='add'>+	if (likely(nc-&gt;skb_count &gt;= n))</div><div class='add'>+		goto get;</div><div class='add'>+</div><div class='add'>+	/* kmem_cache didn't allocate the number we need, limit the output */</div><div class='add'>+	total -= n - nc-&gt;skb_count;</div><div class='add'>+	n = nc-&gt;skb_count;</div><div class='add'>+</div><div class='add'>+get:</div><div class='add'>+	for (u32 base = nc-&gt;skb_count - n, i = 0; i &lt; n; i++) {</div><div class='add'>+		skbs[i] = nc-&gt;skb_cache[base + i];</div><div class='add'>+</div><div class='add'>+		kasan_mempool_unpoison_object(skbs[i], skbuff_cache_size);</div><div class='add'>+		memset(skbs[i], 0, offsetof(struct sk_buff, tail));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cache = (flags &amp; SKB_ALLOC_FCLONE)</div><div class='del'>-		? skbuff_fclone_cache : skbuff_head_cache;</div><div class='add'>+	nc-&gt;skb_count -= n;</div><div class='add'>+	local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='ctx'> </div><div class='del'>-	if (sk_memalloc_socks() &amp;&amp; (flags &amp; SKB_ALLOC_RX))</div><div class='del'>-		gfp_mask |= __GFP_MEMALLOC;</div><div class='add'>+	return total;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(napi_skb_cache_get_bulk);</div><div class='ctx'> </div><div class='del'>-	/* Get the HEAD */</div><div class='del'>-	skb = kmem_cache_alloc_node(cache, gfp_mask &amp; ~__GFP_DMA, node);</div><div class='del'>-	if (!skb)</div><div class='del'>-		goto out;</div><div class='del'>-	prefetchw(skb);</div><div class='add'>+static inline void __finalize_skb_around(struct sk_buff *skb, void *data,</div><div class='add'>+					 unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='ctx'> </div><div class='del'>-	/* We do our best to align skb_shared_info on a separate cache</div><div class='del'>-	 * line. It usually works because kmalloc(X &gt; SMP_CACHE_BYTES) gives</div><div class='del'>-	 * aligned memory blocks, unless SLUB/SLAB debug is enabled.</div><div class='del'>-	 * Both skb-&gt;head and skb_shared_info are cache line aligned.</div><div class='del'>-	 */</div><div class='del'>-	size = SKB_DATA_ALIGN(size);</div><div class='del'>-	size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-	data = kmalloc_reserve(size, gfp_mask, node, &amp;pfmemalloc);</div><div class='del'>-	if (!data)</div><div class='del'>-		goto nodata;</div><div class='del'>-	/* kmalloc(size) might give us more room than requested.</div><div class='del'>-	 * Put skb_shared_info exactly at the end of allocated zone,</div><div class='del'>-	 * to allow max possible filling before reallocation.</div><div class='del'>-	 */</div><div class='del'>-	size = SKB_WITH_OVERHEAD(ksize(data));</div><div class='del'>-	prefetchw(data + size);</div><div class='add'>+	size -= SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Only clear those fields we need to clear, not those that we will</div><div class='del'>-	 * actually initialise below. Hence, don't put any more fields after</div><div class='del'>-	 * the tail pointer in struct sk_buff!</div><div class='del'>-	 */</div><div class='del'>-	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='del'>-	/* Account for allocated memory : skb + skb-&gt;head */</div><div class='add'>+	/* Assumes caller memset cleared SKB */</div><div class='ctx'> 	skb-&gt;truesize = SKB_TRUESIZE(size);</div><div class='del'>-	skb-&gt;pfmemalloc = pfmemalloc;</div><div class='ctx'> 	refcount_set(&amp;skb-&gt;users, 1);</div><div class='ctx'> 	skb-&gt;head = data;</div><div class='ctx'> 	skb-&gt;data = data;</div><div class='ctx'> 	skb_reset_tail_pointer(skb);</div><div class='del'>-	skb-&gt;end = skb-&gt;tail + size;</div><div class='add'>+	skb_set_end_offset(skb, size);</div><div class='ctx'> 	skb-&gt;mac_header = (typeof(skb-&gt;mac_header))~0U;</div><div class='ctx'> 	skb-&gt;transport_header = (typeof(skb-&gt;transport_header))~0U;</div><div class='del'>-</div><div class='add'>+	skb-&gt;alloc_cpu = raw_smp_processor_id();</div><div class='ctx'> 	/* make sure we initialize shinfo sequentially */</div><div class='ctx'> 	shinfo = skb_shinfo(skb);</div><div class='ctx'> 	memset(shinfo, 0, offsetof(struct skb_shared_info, dataref));</div><div class='ctx'> 	atomic_set(&amp;shinfo-&gt;dataref, 1);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; SKB_ALLOC_FCLONE) {</div><div class='del'>-		struct sk_buff_fclones *fclones;</div><div class='add'>+	skb_set_kcov_handle(skb, kcov_common_handle());</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		fclones = container_of(skb, struct sk_buff_fclones, skb1);</div><div class='add'>+static inline void *__slab_build_skb(void *data, unsigned int *size)</div><div class='add'>+{</div><div class='add'>+	void *resized;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;fclone = SKB_FCLONE_ORIG;</div><div class='del'>-		refcount_set(&amp;fclones-&gt;fclone_ref, 1);</div><div class='add'>+	/* Must find the allocation size (and grow it to match). */</div><div class='add'>+	*size = ksize(data);</div><div class='add'>+	/* krealloc() will immediately return "data" when</div><div class='add'>+	 * "ksize(data)" is requested: it is the existing upper</div><div class='add'>+	 * bounds. As a result, GFP_ATOMIC will be ignored. Note</div><div class='add'>+	 * that this "new" pointer needs to be passed back to the</div><div class='add'>+	 * caller for use so the __alloc_size hinting will be</div><div class='add'>+	 * tracked correctly.</div><div class='add'>+	 */</div><div class='add'>+	resized = krealloc(data, *size, GFP_ATOMIC);</div><div class='add'>+	WARN_ON_ONCE(resized != data);</div><div class='add'>+	return resized;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* build_skb() variant which can operate on slab buffers.</div><div class='add'>+ * Note that this should be used sparingly as slab buffers</div><div class='add'>+ * cannot be combined efficiently by GRO!</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *slab_build_skb(void *data)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	skb = kmem_cache_alloc(net_hotdata.skbuff_cache,</div><div class='add'>+			       GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='add'>+	data = __slab_build_skb(data, &amp;size);</div><div class='add'>+	__finalize_skb_around(skb, data, size);</div><div class='ctx'> </div><div class='del'>-		fclones-&gt;skb2.fclone = SKB_FCLONE_CLONE;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='ctx'> 	return skb;</div><div class='del'>-nodata:</div><div class='del'>-	kmem_cache_free(cache, skb);</div><div class='del'>-	skb = NULL;</div><div class='del'>-	goto out;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__alloc_skb);</div><div class='add'>+EXPORT_SYMBOL(slab_build_skb);</div><div class='add'>+</div><div class='add'>+/* Caller must provide SKB that is memset cleared */</div><div class='add'>+static void __build_skb_around(struct sk_buff *skb, void *data,</div><div class='add'>+			       unsigned int frag_size)</div><div class='add'>+{</div><div class='add'>+	unsigned int size = frag_size;</div><div class='add'>+</div><div class='add'>+	/* frag_size == 0 is considered deprecated now. Callers</div><div class='add'>+	 * using slab buffer should use slab_build_skb() instead.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ONCE(size == 0, "Use slab_build_skb() instead"))</div><div class='add'>+		data = __slab_build_skb(data, &amp;size);</div><div class='add'>+</div><div class='add'>+	__finalize_skb_around(skb, data, size);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __build_skb - build a network buffer</div><div class='ctx'>  * @data: data buffer provided by caller</div><div class='del'>- * @frag_size: size of data, or 0 if head was kmalloced</div><div class='add'>+ * @frag_size: size of data (must not be 0)</div><div class='ctx'>  *</div><div class='ctx'>  * Allocate a new &amp;sk_buff. Caller provides space holding head and</div><div class='del'>- * skb_shared_info. @data must have been allocated by kmalloc() only if</div><div class='del'>- * @frag_size is 0, otherwise data should come from the page allocator</div><div class='del'>- *  or vmalloc()</div><div class='add'>+ * skb_shared_info. @data must have been allocated from the page</div><div class='add'>+ * allocator or vmalloc(). (A @frag_size of 0 to indicate a kmalloc()</div><div class='add'>+ * allocation is deprecated, and callers should use slab_build_skb()</div><div class='add'>+ * instead.)</div><div class='ctx'>  * The return is the new skb buffer.</div><div class='ctx'>  * On a failure the return is %NULL, and @data is not freed.</div><div class='ctx'>  * Notes :</div><div class='hunk'>@@ -274,101 +469,258 @@ EXPORT_SYMBOL(__alloc_skb);</div><div class='ctx'>  */</div><div class='ctx'> struct sk_buff *__build_skb(void *data, unsigned int frag_size)</div><div class='ctx'> {</div><div class='del'>-	struct skb_shared_info *shinfo;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	unsigned int size = frag_size ? : ksize(data);</div><div class='ctx'> </div><div class='del'>-	skb = kmem_cache_alloc(skbuff_head_cache, GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='add'>+	skb = kmem_cache_alloc(net_hotdata.skbuff_cache,</div><div class='add'>+			       GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+	if (unlikely(!skb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	size -= SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-</div><div class='ctx'> 	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='del'>-	skb-&gt;truesize = SKB_TRUESIZE(size);</div><div class='del'>-	refcount_set(&amp;skb-&gt;users, 1);</div><div class='del'>-	skb-&gt;head = data;</div><div class='del'>-	skb-&gt;data = data;</div><div class='del'>-	skb_reset_tail_pointer(skb);</div><div class='del'>-	skb-&gt;end = skb-&gt;tail + size;</div><div class='del'>-	skb-&gt;mac_header = (typeof(skb-&gt;mac_header))~0U;</div><div class='del'>-	skb-&gt;transport_header = (typeof(skb-&gt;transport_header))~0U;</div><div class='del'>-</div><div class='del'>-	/* make sure we initialize shinfo sequentially */</div><div class='del'>-	shinfo = skb_shinfo(skb);</div><div class='del'>-	memset(shinfo, 0, offsetof(struct skb_shared_info, dataref));</div><div class='del'>-	atomic_set(&amp;shinfo-&gt;dataref, 1);</div><div class='add'>+	__build_skb_around(skb, data, frag_size);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* build_skb() is wrapper over __build_skb(), that specifically</div><div class='ctx'>  * takes care of skb-&gt;head and skb-&gt;pfmemalloc</div><div class='del'>- * This means that if @frag_size is not zero, then @data must be backed</div><div class='del'>- * by a page fragment, not kmalloc() or vmalloc()</div><div class='ctx'>  */</div><div class='ctx'> struct sk_buff *build_skb(void *data, unsigned int frag_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = __build_skb(data, frag_size);</div><div class='ctx'> </div><div class='del'>-	if (skb &amp;&amp; frag_size) {</div><div class='add'>+	if (likely(skb &amp;&amp; frag_size)) {</div><div class='ctx'> 		skb-&gt;head_frag = 1;</div><div class='del'>-		if (page_is_pfmemalloc(virt_to_head_page(data)))</div><div class='del'>-			skb-&gt;pfmemalloc = 1;</div><div class='add'>+		skb_propagate_pfmemalloc(virt_to_head_page(data), skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(build_skb);</div><div class='ctx'> </div><div class='del'>-#define NAPI_SKB_CACHE_SIZE	64</div><div class='add'>+/**</div><div class='add'>+ * build_skb_around - build a network buffer around provided skb</div><div class='add'>+ * @skb: sk_buff provide by caller, must be memset cleared</div><div class='add'>+ * @data: data buffer provided by caller</div><div class='add'>+ * @frag_size: size of data</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *build_skb_around(struct sk_buff *skb,</div><div class='add'>+				 void *data, unsigned int frag_size)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-struct napi_alloc_cache {</div><div class='del'>-	struct page_frag_cache page;</div><div class='del'>-	unsigned int skb_count;</div><div class='del'>-	void *skb_cache[NAPI_SKB_CACHE_SIZE];</div><div class='del'>-};</div><div class='add'>+	__build_skb_around(skb, data, frag_size);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);</div><div class='del'>-static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);</div><div class='add'>+	if (frag_size) {</div><div class='add'>+		skb-&gt;head_frag = 1;</div><div class='add'>+		skb_propagate_pfmemalloc(virt_to_head_page(data), skb);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(build_skb_around);</div><div class='ctx'> </div><div class='del'>-static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)</div><div class='add'>+/**</div><div class='add'>+ * __napi_build_skb - build a network buffer</div><div class='add'>+ * @data: data buffer provided by caller</div><div class='add'>+ * @frag_size: size of data</div><div class='add'>+ *</div><div class='add'>+ * Version of __build_skb() that uses NAPI percpu caches to obtain</div><div class='add'>+ * skbuff_head instead of inplace allocation.</div><div class='add'>+ *</div><div class='add'>+ * Returns a new &amp;sk_buff on success, %NULL on allocation failure.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *__napi_build_skb(void *data, unsigned int frag_size)</div><div class='ctx'> {</div><div class='del'>-	struct page_frag_cache *nc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	void *data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	nc = this_cpu_ptr(&amp;netdev_alloc_cache);</div><div class='del'>-	data = page_frag_alloc(nc, fragsz, gfp_mask);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return data;</div><div class='add'>+	skb = napi_skb_cache_get(true);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='add'>+	__build_skb_around(skb, data, frag_size);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * netdev_alloc_frag - allocate a page fragment</div><div class='del'>- * @fragsz: fragment size</div><div class='add'>+ * napi_build_skb - build a network buffer</div><div class='add'>+ * @data: data buffer provided by caller</div><div class='add'>+ * @frag_size: size of data</div><div class='ctx'>  *</div><div class='del'>- * Allocates a frag from a page for receive buffer.</div><div class='del'>- * Uses GFP_ATOMIC allocations.</div><div class='add'>+ * Version of __napi_build_skb() that takes care of skb-&gt;head_frag</div><div class='add'>+ * and skb-&gt;pfmemalloc when the data is a page or page fragment.</div><div class='add'>+ *</div><div class='add'>+ * Returns a new &amp;sk_buff on success, %NULL on allocation failure.</div><div class='ctx'>  */</div><div class='del'>-void *netdev_alloc_frag(unsigned int fragsz)</div><div class='add'>+struct sk_buff *napi_build_skb(void *data, unsigned int frag_size)</div><div class='ctx'> {</div><div class='del'>-	return __netdev_alloc_frag(fragsz, GFP_ATOMIC);</div><div class='add'>+	struct sk_buff *skb = __napi_build_skb(data, frag_size);</div><div class='add'>+</div><div class='add'>+	if (likely(skb) &amp;&amp; frag_size) {</div><div class='add'>+		skb-&gt;head_frag = 1;</div><div class='add'>+		skb_propagate_pfmemalloc(virt_to_head_page(data), skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netdev_alloc_frag);</div><div class='add'>+EXPORT_SYMBOL(napi_build_skb);</div><div class='ctx'> </div><div class='del'>-static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)</div><div class='add'>+/*</div><div class='add'>+ * kmalloc_reserve is a wrapper around kmalloc_node_track_caller that tells</div><div class='add'>+ * the caller if emergency pfmemalloc reserves are being used. If it is and</div><div class='add'>+ * the socket is later found to be SOCK_MEMALLOC then PFMEMALLOC reserves</div><div class='add'>+ * may be used. Otherwise, the packet data may be discarded until enough</div><div class='add'>+ * memory is free</div><div class='add'>+ */</div><div class='add'>+static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node,</div><div class='add'>+			     bool *pfmemalloc)</div><div class='ctx'> {</div><div class='del'>-	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+	bool ret_pfmemalloc = false;</div><div class='add'>+	size_t obj_size;</div><div class='add'>+	void *obj;</div><div class='add'>+</div><div class='add'>+	obj_size = SKB_HEAD_ALIGN(*size);</div><div class='add'>+	if (obj_size &lt;= SKB_SMALL_HEAD_CACHE_SIZE &amp;&amp;</div><div class='add'>+	    !(flags &amp; KMALLOC_NOT_NORMAL_BITS)) {</div><div class='add'>+		obj = kmem_cache_alloc_node(net_hotdata.skb_small_head_cache,</div><div class='add'>+				flags | __GFP_NOMEMALLOC | __GFP_NOWARN,</div><div class='add'>+				node);</div><div class='add'>+		*size = SKB_SMALL_HEAD_CACHE_SIZE;</div><div class='add'>+		if (obj || !(gfp_pfmemalloc_allowed(flags)))</div><div class='add'>+			goto out;</div><div class='add'>+		/* Try again but now we are using pfmemalloc reserves */</div><div class='add'>+		ret_pfmemalloc = true;</div><div class='add'>+		obj = kmem_cache_alloc_node(net_hotdata.skb_small_head_cache, flags, node);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj_size = kmalloc_size_roundup(obj_size);</div><div class='add'>+	/* The following cast might truncate high-order bits of obj_size, this</div><div class='add'>+	 * is harmless because kmalloc(obj_size &gt;= 2^32) will fail anyway.</div><div class='add'>+	 */</div><div class='add'>+	*size = (unsigned int)obj_size;</div><div class='ctx'> </div><div class='del'>-	return page_frag_alloc(&amp;nc-&gt;page, fragsz, gfp_mask);</div><div class='add'>+	/*</div><div class='add'>+	 * Try a regular allocation, when that fails and we're not entitled</div><div class='add'>+	 * to the reserves, fail.</div><div class='add'>+	 */</div><div class='add'>+	obj = kmalloc_node_track_caller(obj_size,</div><div class='add'>+					flags | __GFP_NOMEMALLOC | __GFP_NOWARN,</div><div class='add'>+					node);</div><div class='add'>+	if (obj || !(gfp_pfmemalloc_allowed(flags)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Try again but now we are using pfmemalloc reserves */</div><div class='add'>+	ret_pfmemalloc = true;</div><div class='add'>+	obj = kmalloc_node_track_caller(obj_size, flags, node);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (pfmemalloc)</div><div class='add'>+		*pfmemalloc = ret_pfmemalloc;</div><div class='add'>+</div><div class='add'>+	return obj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void *napi_alloc_frag(unsigned int fragsz)</div><div class='add'>+/* 	Allocate a new skbuff. We do this ourselves so we can fill in a few</div><div class='add'>+ *	'private' fields and also do memory statistics to find all the</div><div class='add'>+ *	[BEEP] leaks.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__alloc_skb	-	allocate a network buffer</div><div class='add'>+ *	@size: size to allocate</div><div class='add'>+ *	@gfp_mask: allocation mask</div><div class='add'>+ *	@flags: If SKB_ALLOC_FCLONE is set, allocate from fclone cache</div><div class='add'>+ *		instead of head cache and allocate a cloned (child) skb.</div><div class='add'>+ *		If SKB_ALLOC_RX is set, __GFP_MEMALLOC will be used for</div><div class='add'>+ *		allocations in case the data is required for writeback</div><div class='add'>+ *	@node: numa node to allocate memory on</div><div class='add'>+ *</div><div class='add'>+ *	Allocate a new &amp;sk_buff. The returned buffer has no headroom and a</div><div class='add'>+ *	tail room of at least size bytes. The object has a reference count</div><div class='add'>+ *	of one. The return is the buffer. On a failure the return is %NULL.</div><div class='add'>+ *</div><div class='add'>+ *	Buffers may only be allocated from interrupts using a @gfp_mask of</div><div class='add'>+ *	%GFP_ATOMIC.</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,</div><div class='add'>+			    int flags, int node)</div><div class='ctx'> {</div><div class='del'>-	return __napi_alloc_frag(fragsz, GFP_ATOMIC);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct kmem_cache *cache;</div><div class='add'>+	bool pfmemalloc;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	if (sk_memalloc_socks() &amp;&amp; (flags &amp; SKB_ALLOC_RX))</div><div class='add'>+		gfp_mask |= __GFP_MEMALLOC;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SKB_ALLOC_FCLONE) {</div><div class='add'>+		cache = net_hotdata.skbuff_fclone_cache;</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+	cache = net_hotdata.skbuff_cache;</div><div class='add'>+	if (unlikely(node != NUMA_NO_NODE &amp;&amp; node != numa_mem_id()))</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SKB_ALLOC_NAPI) {</div><div class='add'>+		skb = napi_skb_cache_get(true);</div><div class='add'>+		if (unlikely(!skb))</div><div class='add'>+			return NULL;</div><div class='add'>+	} else if (!in_hardirq() &amp;&amp; !irqs_disabled()) {</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		skb = napi_skb_cache_get(false);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+fallback:</div><div class='add'>+		skb = kmem_cache_alloc_node(cache, gfp_mask &amp; ~GFP_DMA, node);</div><div class='add'>+		if (unlikely(!skb))</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+	prefetchw(skb);</div><div class='add'>+</div><div class='add'>+	/* We do our best to align skb_shared_info on a separate cache</div><div class='add'>+	 * line. It usually works because kmalloc(X &gt; SMP_CACHE_BYTES) gives</div><div class='add'>+	 * aligned memory blocks, unless SLUB/SLAB debug is enabled.</div><div class='add'>+	 * Both skb-&gt;head and skb_shared_info are cache line aligned.</div><div class='add'>+	 */</div><div class='add'>+	data = kmalloc_reserve(&amp;size, gfp_mask, node, &amp;pfmemalloc);</div><div class='add'>+	if (unlikely(!data))</div><div class='add'>+		goto nodata;</div><div class='add'>+	/* kmalloc_size_roundup() might give us more room than requested.</div><div class='add'>+	 * Put skb_shared_info exactly at the end of allocated zone,</div><div class='add'>+	 * to allow max possible filling before reallocation.</div><div class='add'>+	 */</div><div class='add'>+	prefetchw(data + SKB_WITH_OVERHEAD(size));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only clear those fields we need to clear, not those that we will</div><div class='add'>+	 * actually initialise below. Hence, don't put any more fields after</div><div class='add'>+	 * the tail pointer in struct sk_buff!</div><div class='add'>+	 */</div><div class='add'>+	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='add'>+	__build_skb_around(skb, data, size);</div><div class='add'>+	skb-&gt;pfmemalloc = pfmemalloc;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SKB_ALLOC_FCLONE) {</div><div class='add'>+		struct sk_buff_fclones *fclones;</div><div class='add'>+</div><div class='add'>+		fclones = container_of(skb, struct sk_buff_fclones, skb1);</div><div class='add'>+</div><div class='add'>+		skb-&gt;fclone = SKB_FCLONE_ORIG;</div><div class='add'>+		refcount_set(&amp;fclones-&gt;fclone_ref, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+nodata:</div><div class='add'>+	kmem_cache_free(cache, skb);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(napi_alloc_frag);</div><div class='add'>+EXPORT_SYMBOL(__alloc_skb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	__netdev_alloc_skb - allocate an skbuff for rx on a specific device</div><div class='hunk'>@@ -387,14 +739,17 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,</div><div class='ctx'> 				   gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct page_frag_cache *nc;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	bool pfmemalloc;</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='ctx'> 	len += NET_SKB_PAD;</div><div class='ctx'> </div><div class='del'>-	if ((len &gt; SKB_WITH_OVERHEAD(PAGE_SIZE)) ||</div><div class='add'>+	/* If requested length is either too small or too big,</div><div class='add'>+	 * we use kmalloc() for skb-&gt;head allocation.</div><div class='add'>+	 */</div><div class='add'>+	if (len &lt;= SKB_WITH_OVERHEAD(SKB_SMALL_HEAD_CACHE_SIZE) ||</div><div class='add'>+	    len &gt; SKB_WITH_OVERHEAD(PAGE_SIZE) ||</div><div class='ctx'> 	    (gfp_mask &amp; (__GFP_DIRECT_RECLAIM | GFP_DMA))) {</div><div class='ctx'> 		skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);</div><div class='ctx'> 		if (!skb)</div><div class='hunk'>@@ -402,19 +757,26 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,</div><div class='ctx'> 		goto skb_success;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-	len = SKB_DATA_ALIGN(len);</div><div class='add'>+	len = SKB_HEAD_ALIGN(len);</div><div class='ctx'> </div><div class='ctx'> 	if (sk_memalloc_socks())</div><div class='ctx'> 		gfp_mask |= __GFP_MEMALLOC;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	if (in_hardirq() || irqs_disabled()) {</div><div class='add'>+		nc = this_cpu_ptr(&amp;netdev_alloc_cache);</div><div class='add'>+		data = page_frag_alloc(nc, len, gfp_mask);</div><div class='add'>+		pfmemalloc = page_frag_cache_is_pfmemalloc(nc);</div><div class='add'>+	} else {</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='ctx'> </div><div class='del'>-	nc = this_cpu_ptr(&amp;netdev_alloc_cache);</div><div class='del'>-	data = page_frag_alloc(nc, len, gfp_mask);</div><div class='del'>-	pfmemalloc = nc-&gt;pfmemalloc;</div><div class='add'>+		nc = this_cpu_ptr(&amp;napi_alloc_cache.page);</div><div class='add'>+		data = page_frag_alloc(nc, len, gfp_mask);</div><div class='add'>+		pfmemalloc = page_frag_cache_is_pfmemalloc(nc);</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+		local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!data))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -425,7 +787,6 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* use OR instead of assignment to avoid clearing of bits in mask */</div><div class='ctx'> 	if (pfmemalloc)</div><div class='ctx'> 		skb-&gt;pfmemalloc = 1;</div><div class='ctx'> 	skb-&gt;head_frag = 1;</div><div class='hunk'>@@ -440,10 +801,9 @@ skb_fail:</div><div class='ctx'> EXPORT_SYMBOL(__netdev_alloc_skb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	__napi_alloc_skb - allocate skbuff for rx in a specific NAPI instance</div><div class='add'>+ *	napi_alloc_skb - allocate skbuff for rx in a specific NAPI instance</div><div class='ctx'>  *	@napi: napi instance this buffer was allocated for</div><div class='ctx'>  *	@len: length to allocate</div><div class='del'>- *	@gfp_mask: get_free_pages mask, passed to alloc_skb and alloc_pages</div><div class='ctx'>  *</div><div class='ctx'>  *	Allocate a new sk_buff for use in NAPI receive.  This buffer will</div><div class='ctx'>  *	attempt to allocate the head from a special reserved region used</div><div class='hunk'>@@ -452,41 +812,52 @@ EXPORT_SYMBOL(__netdev_alloc_skb);</div><div class='ctx'>  *</div><div class='ctx'>  *	%NULL is returned if there is no free memory.</div><div class='ctx'>  */</div><div class='del'>-struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,</div><div class='del'>-				 gfp_t gfp_mask)</div><div class='add'>+struct sk_buff *napi_alloc_skb(struct napi_struct *napi, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+	gfp_t gfp_mask = GFP_ATOMIC | __GFP_NOWARN;</div><div class='add'>+	struct napi_alloc_cache *nc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	bool pfmemalloc;</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!in_softirq());</div><div class='ctx'> 	len += NET_SKB_PAD + NET_IP_ALIGN;</div><div class='ctx'> </div><div class='del'>-	if ((len &gt; SKB_WITH_OVERHEAD(PAGE_SIZE)) ||</div><div class='add'>+	/* If requested length is either too small or too big,</div><div class='add'>+	 * we use kmalloc() for skb-&gt;head allocation.</div><div class='add'>+	 */</div><div class='add'>+	if (len &lt;= SKB_WITH_OVERHEAD(SKB_SMALL_HEAD_CACHE_SIZE) ||</div><div class='add'>+	    len &gt; SKB_WITH_OVERHEAD(PAGE_SIZE) ||</div><div class='ctx'> 	    (gfp_mask &amp; (__GFP_DIRECT_RECLAIM | GFP_DMA))) {</div><div class='del'>-		skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);</div><div class='add'>+		skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX | SKB_ALLOC_NAPI,</div><div class='add'>+				  NUMA_NO_NODE);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto skb_fail;</div><div class='ctx'> 		goto skb_success;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-	len = SKB_DATA_ALIGN(len);</div><div class='add'>+	len = SKB_HEAD_ALIGN(len);</div><div class='ctx'> </div><div class='ctx'> 	if (sk_memalloc_socks())</div><div class='ctx'> 		gfp_mask |= __GFP_MEMALLOC;</div><div class='ctx'> </div><div class='add'>+	local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+	nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='add'>+</div><div class='ctx'> 	data = page_frag_alloc(&amp;nc-&gt;page, len, gfp_mask);</div><div class='add'>+	pfmemalloc = page_frag_cache_is_pfmemalloc(&amp;nc-&gt;page);</div><div class='add'>+	local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!data))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	skb = __build_skb(data, len);</div><div class='add'>+	skb = __napi_build_skb(data, len);</div><div class='ctx'> 	if (unlikely(!skb)) {</div><div class='ctx'> 		skb_free_frag(data);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* use OR instead of assignment to avoid clearing of bits in mask */</div><div class='del'>-	if (nc-&gt;page.pfmemalloc)</div><div class='add'>+	if (pfmemalloc)</div><div class='ctx'> 		skb-&gt;pfmemalloc = 1;</div><div class='ctx'> 	skb-&gt;head_frag = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -497,23 +868,27 @@ skb_success:</div><div class='ctx'> skb_fail:</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__napi_alloc_skb);</div><div class='add'>+EXPORT_SYMBOL(napi_alloc_skb);</div><div class='ctx'> </div><div class='del'>-void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,</div><div class='del'>-		     int size, unsigned int truesize)</div><div class='add'>+void skb_add_rx_frag_netmem(struct sk_buff *skb, int i, netmem_ref netmem,</div><div class='add'>+			    int off, int size, unsigned int truesize)</div><div class='ctx'> {</div><div class='del'>-	skb_fill_page_desc(skb, i, page, off, size);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(size &gt; truesize);</div><div class='add'>+</div><div class='add'>+	skb_fill_netmem_desc(skb, i, netmem, off, size);</div><div class='ctx'> 	skb-&gt;len += size;</div><div class='ctx'> 	skb-&gt;data_len += size;</div><div class='ctx'> 	skb-&gt;truesize += truesize;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(skb_add_rx_frag);</div><div class='add'>+EXPORT_SYMBOL(skb_add_rx_frag_netmem);</div><div class='ctx'> </div><div class='ctx'> void skb_coalesce_rx_frag(struct sk_buff *skb, int i, int size,</div><div class='ctx'> 			  unsigned int truesize)</div><div class='ctx'> {</div><div class='ctx'> 	skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(size &gt; truesize);</div><div class='add'>+</div><div class='ctx'> 	skb_frag_size_add(frag, size);</div><div class='ctx'> 	skb-&gt;len += size;</div><div class='ctx'> 	skb-&gt;data_len += size;</div><div class='hunk'>@@ -540,34 +915,207 @@ static void skb_clone_fraglist(struct sk_buff *skb)</div><div class='ctx'> 		skb_get(list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,</div><div class='add'>+		    unsigned int headroom)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_PAGE_POOL)</div><div class='add'>+	u32 size, truesize, len, max_head_size, off;</div><div class='add'>+	struct sk_buff *skb = *pskb, *nskb;</div><div class='add'>+	int err, i, head_off;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	/* XDP does not support fraglist so we need to linearize</div><div class='add'>+	 * the skb.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_has_frag_list(skb))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	max_head_size = SKB_WITH_OVERHEAD(PAGE_SIZE - headroom);</div><div class='add'>+	if (skb-&gt;len &gt; max_head_size + MAX_SKB_FRAGS * PAGE_SIZE)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	size = min_t(u32, skb-&gt;len, max_head_size);</div><div class='add'>+	truesize = SKB_HEAD_ALIGN(size) + headroom;</div><div class='add'>+	data = page_pool_dev_alloc_va(pool, &amp;truesize);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nskb = napi_build_skb(data, truesize);</div><div class='add'>+	if (!nskb) {</div><div class='add'>+		page_pool_free_va(pool, data, true);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_reserve(nskb, headroom);</div><div class='add'>+	skb_copy_header(nskb, skb);</div><div class='add'>+	skb_mark_for_recycle(nskb);</div><div class='add'>+</div><div class='add'>+	err = skb_copy_bits(skb, 0, nskb-&gt;data, size);</div><div class='add'>+	if (err) {</div><div class='add'>+		consume_skb(nskb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	skb_put(nskb, size);</div><div class='add'>+</div><div class='add'>+	head_off = skb_headroom(nskb) - skb_headroom(skb);</div><div class='add'>+	skb_headers_offset_update(nskb, head_off);</div><div class='add'>+</div><div class='add'>+	off = size;</div><div class='add'>+	len = skb-&gt;len - off;</div><div class='add'>+	for (i = 0; i &lt; MAX_SKB_FRAGS &amp;&amp; off &lt; skb-&gt;len; i++) {</div><div class='add'>+		struct page *page;</div><div class='add'>+		u32 page_off;</div><div class='add'>+</div><div class='add'>+		size = min_t(u32, len, PAGE_SIZE);</div><div class='add'>+		truesize = size;</div><div class='add'>+</div><div class='add'>+		page = page_pool_dev_alloc(pool, &amp;page_off, &amp;truesize);</div><div class='add'>+		if (!page) {</div><div class='add'>+			consume_skb(nskb);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_add_rx_frag(nskb, i, page, page_off, size, truesize);</div><div class='add'>+		err = skb_copy_bits(skb, off, page_address(page) + page_off,</div><div class='add'>+				    size);</div><div class='add'>+		if (err) {</div><div class='add'>+			consume_skb(nskb);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len -= size;</div><div class='add'>+		off += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	*pskb = nskb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_pp_cow_data);</div><div class='add'>+</div><div class='add'>+int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb,</div><div class='add'>+			 const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	if (!prog-&gt;aux-&gt;xdp_has_frags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return skb_pp_cow_data(pool, pskb, XDP_PACKET_HEADROOM);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_cow_data_for_xdp);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_PAGE_POOL)</div><div class='add'>+bool napi_pp_put_page(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	netmem = netmem_compound_head(netmem);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!netmem_is_pp(netmem)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	page_pool_put_full_netmem(netmem_get_pp(netmem), netmem, false);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(napi_pp_put_page);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool skb_pp_recycle(struct sk_buff *skb, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb-&gt;pp_recycle)</div><div class='add'>+		return false;</div><div class='add'>+	return napi_pp_put_page(page_to_netmem(virt_to_page(data)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_pp_frag_ref() - Increase fragment references of a page pool aware skb</div><div class='add'>+ * @skb:	page pool aware skb</div><div class='add'>+ *</div><div class='add'>+ * Increase the fragment reference count (pp_ref_count) of a skb. This is</div><div class='add'>+ * intended to gain fragment references only for page pool aware skbs,</div><div class='add'>+ * i.e. when skb-&gt;pp_recycle is true, and not for fragments in a</div><div class='add'>+ * non-pp-recycling skb. It has a fallback to increase references on normal</div><div class='add'>+ * pages, as page pool aware skbs may also have normal page fragments.</div><div class='add'>+ */</div><div class='add'>+static int skb_pp_frag_ref(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	netmem_ref head_netmem;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;pp_recycle)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; shinfo-&gt;nr_frags; i++) {</div><div class='add'>+		head_netmem = netmem_compound_head(shinfo-&gt;frags[i].netmem);</div><div class='add'>+		if (likely(netmem_is_pp(head_netmem)))</div><div class='add'>+			page_pool_ref_netmem(head_netmem);</div><div class='add'>+		else</div><div class='add'>+			page_ref_inc(netmem_to_page(head_netmem));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void skb_kfree_head(void *head, unsigned int end_offset)</div><div class='add'>+{</div><div class='add'>+	if (end_offset == SKB_SMALL_HEAD_HEADROOM)</div><div class='add'>+		kmem_cache_free(net_hotdata.skb_small_head_cache, head);</div><div class='add'>+	else</div><div class='add'>+		kfree(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void skb_free_head(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *head = skb-&gt;head;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;head_frag)</div><div class='add'>+	if (skb-&gt;head_frag) {</div><div class='add'>+		if (skb_pp_recycle(skb, head))</div><div class='add'>+			return;</div><div class='ctx'> 		skb_free_frag(head);</div><div class='del'>-	else</div><div class='del'>-		kfree(head);</div><div class='add'>+	} else {</div><div class='add'>+		skb_kfree_head(head, skb_end_offset(skb));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void skb_release_data(struct sk_buff *skb)</div><div class='add'>+static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;cloned &amp;&amp;</div><div class='del'>-	    atomic_sub_return(skb-&gt;nohdr ? (1 &lt;&lt; SKB_DATAREF_SHIFT) + 1 : 1,</div><div class='del'>-			      &amp;shinfo-&gt;dataref))</div><div class='del'>-		return;</div><div class='add'>+	if (!skb_data_unref(skb, shinfo))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (skb_zcopy(skb)) {</div><div class='add'>+		bool skip_unref = shinfo-&gt;flags &amp; SKBFL_MANAGED_FRAG_REFS;</div><div class='add'>+</div><div class='add'>+		skb_zcopy_clear(skb, true);</div><div class='add'>+		if (skip_unref)</div><div class='add'>+			goto free_head;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; shinfo-&gt;nr_frags; i++)</div><div class='del'>-		__skb_frag_unref(&amp;shinfo-&gt;frags[i]);</div><div class='add'>+		__skb_frag_unref(&amp;shinfo-&gt;frags[i], skb-&gt;pp_recycle);</div><div class='ctx'> </div><div class='add'>+free_head:</div><div class='ctx'> 	if (shinfo-&gt;frag_list)</div><div class='del'>-		kfree_skb_list(shinfo-&gt;frag_list);</div><div class='add'>+		kfree_skb_list_reason(shinfo-&gt;frag_list, reason);</div><div class='ctx'> </div><div class='del'>-	skb_zcopy_clear(skb, true);</div><div class='ctx'> 	skb_free_head(skb);</div><div class='add'>+exit:</div><div class='add'>+	/* When we clone an SKB we copy the reycling bit. The pp_recycle</div><div class='add'>+	 * bit is only set on the head though, so in order to avoid races</div><div class='add'>+	 * while trying to recycle fragments on __skb_frag_unref() we need</div><div class='add'>+	 * to make one SKB responsible for triggering the recycle path.</div><div class='add'>+	 * So disable the recycling bit if an SKB is cloned and we have</div><div class='add'>+	 * additional references to the fragmented part of the SKB.</div><div class='add'>+	 * Eventually the last SKB will have the recycling bit set and it's</div><div class='add'>+	 * dataref set to 0, which will trigger the recycling</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;pp_recycle = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -579,7 +1127,7 @@ static void kfree_skbmem(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	switch (skb-&gt;fclone) {</div><div class='ctx'> 	case SKB_FCLONE_UNAVAILABLE:</div><div class='del'>-		kmem_cache_free(skbuff_head_cache, skb);</div><div class='add'>+		kmem_cache_free(net_hotdata.skbuff_cache, skb);</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	case SKB_FCLONE_ORIG:</div><div class='hunk'>@@ -600,31 +1148,38 @@ static void kfree_skbmem(struct sk_buff *skb)</div><div class='ctx'> 	if (!refcount_dec_and_test(&amp;fclones-&gt;fclone_ref))</div><div class='ctx'> 		return;</div><div class='ctx'> fastpath:</div><div class='del'>-	kmem_cache_free(skbuff_fclone_cache, fclones);</div><div class='add'>+	kmem_cache_free(net_hotdata.skbuff_fclone_cache, fclones);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void skb_release_head_state(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	secpath_reset(skb);</div><div class='ctx'> 	if (skb-&gt;destructor) {</div><div class='del'>-		WARN_ON(in_irq());</div><div class='del'>-		skb-&gt;destructor(skb);</div><div class='del'>-	}</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='del'>-	nf_conntrack_put(skb_nfct(skb));</div><div class='del'>-#endif</div><div class='del'>-#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='del'>-	nf_bridge_put(skb-&gt;nf_bridge);</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(in_hardirq());</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+		INDIRECT_CALL_4(skb-&gt;destructor,</div><div class='add'>+				tcp_wfree, __sock_wfree, sock_wfree,</div><div class='add'>+				xsk_destruct_skb,</div><div class='add'>+				skb);</div><div class='add'>+#else</div><div class='add'>+		INDIRECT_CALL_2(skb-&gt;destructor,</div><div class='add'>+				sock_wfree, xsk_destruct_skb,</div><div class='add'>+				skb);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='add'>+		skb-&gt;destructor = NULL;</div><div class='add'>+		skb-&gt;sk = NULL;</div><div class='add'>+	}</div><div class='add'>+	nf_reset_ct(skb);</div><div class='add'>+	skb_ext_reset(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Free everything but the sk_buff shell. */</div><div class='del'>-static void skb_release_all(struct sk_buff *skb)</div><div class='add'>+static void skb_release_all(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	skb_release_head_state(skb);</div><div class='ctx'> 	if (likely(skb-&gt;head))</div><div class='del'>-		skb_release_data(skb);</div><div class='add'>+		skb_release_data(skb, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -638,38 +1193,206 @@ static void skb_release_all(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void __kfree_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb_release_all(skb);</div><div class='add'>+	skb_release_all(skb, SKB_DROP_REASON_NOT_SPECIFIED);</div><div class='ctx'> 	kfree_skbmem(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__kfree_skb);</div><div class='ctx'> </div><div class='add'>+static __always_inline</div><div class='add'>+bool __sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			  enum skb_drop_reason reason)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!skb_unref(skb)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(reason == SKB_NOT_DROPPED_YET ||</div><div class='add'>+			       u32_get_bits(reason,</div><div class='add'>+					    SKB_DROP_REASON_SUBSYS_MASK) &gt;=</div><div class='add'>+				SKB_DROP_REASON_SUBSYS_NUM);</div><div class='add'>+</div><div class='add'>+	if (reason == SKB_CONSUMED)</div><div class='add'>+		trace_consume_skb(skb, __builtin_return_address(0));</div><div class='add'>+	else</div><div class='add'>+		trace_kfree_skb(skb, __builtin_return_address(0), reason, sk);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- *	kfree_skb - free an sk_buff</div><div class='add'>+ *	sk_skb_reason_drop - free an sk_buff with special reason</div><div class='add'>+ *	@sk: the socket to receive @skb, or NULL if not applicable</div><div class='ctx'>  *	@skb: buffer to free</div><div class='add'>+ *	@reason: reason why this skb is dropped</div><div class='ctx'>  *</div><div class='del'>- *	Drop a reference to the buffer and free it if the usage count has</div><div class='del'>- *	hit zero.</div><div class='add'>+ *	Drop a reference to the buffer and free it if the usage count has hit</div><div class='add'>+ *	zero. Meanwhile, pass the receiving socket and drop reason to</div><div class='add'>+ *	'kfree_skb' tracepoint.</div><div class='ctx'>  */</div><div class='del'>-void kfree_skb(struct sk_buff *skb)</div><div class='add'>+void __fix_address</div><div class='add'>+sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	if (!skb_unref(skb))</div><div class='add'>+	if (__sk_skb_reason_drop(sk, skb, reason))</div><div class='add'>+		__kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sk_skb_reason_drop);</div><div class='add'>+</div><div class='add'>+#define KFREE_SKB_BULK_SIZE	16</div><div class='add'>+</div><div class='add'>+struct skb_free_array {</div><div class='add'>+	unsigned int skb_count;</div><div class='add'>+	void *skb_array[KFREE_SKB_BULK_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void kfree_skb_add_bulk(struct sk_buff *skb,</div><div class='add'>+			       struct skb_free_array *sa,</div><div class='add'>+			       enum skb_drop_reason reason)</div><div class='add'>+{</div><div class='add'>+	/* if SKB is a clone, don't handle this case */</div><div class='add'>+	if (unlikely(skb-&gt;fclone != SKB_FCLONE_UNAVAILABLE)) {</div><div class='add'>+		__kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	trace_kfree_skb(skb, __builtin_return_address(0));</div><div class='del'>-	__kfree_skb(skb);</div><div class='add'>+	skb_release_all(skb, reason);</div><div class='add'>+	sa-&gt;skb_array[sa-&gt;skb_count++] = skb;</div><div class='add'>+</div><div class='add'>+	if (unlikely(sa-&gt;skb_count == KFREE_SKB_BULK_SIZE)) {</div><div class='add'>+		kmem_cache_free_bulk(net_hotdata.skbuff_cache, KFREE_SKB_BULK_SIZE,</div><div class='add'>+				     sa-&gt;skb_array);</div><div class='add'>+		sa-&gt;skb_count = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(kfree_skb);</div><div class='ctx'> </div><div class='del'>-void kfree_skb_list(struct sk_buff *segs)</div><div class='add'>+void __fix_address</div><div class='add'>+kfree_skb_list_reason(struct sk_buff *segs, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='add'>+	struct skb_free_array sa;</div><div class='add'>+</div><div class='add'>+	sa.skb_count = 0;</div><div class='add'>+</div><div class='ctx'> 	while (segs) {</div><div class='ctx'> 		struct sk_buff *next = segs-&gt;next;</div><div class='ctx'> </div><div class='del'>-		kfree_skb(segs);</div><div class='add'>+		if (__sk_skb_reason_drop(NULL, segs, reason)) {</div><div class='add'>+			skb_poison_list(segs);</div><div class='add'>+			kfree_skb_add_bulk(segs, &amp;sa, reason);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		segs = next;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (sa.skb_count)</div><div class='add'>+		kmem_cache_free_bulk(net_hotdata.skbuff_cache, sa.skb_count, sa.skb_array);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(kfree_skb_list_reason);</div><div class='add'>+</div><div class='add'>+/* Dump skb information and contents.</div><div class='add'>+ *</div><div class='add'>+ * Must only be called from net_ratelimit()-ed paths.</div><div class='add'>+ *</div><div class='add'>+ * Dumps whole packets if full_pkt, only headers otherwise.</div><div class='add'>+ */</div><div class='add'>+void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sh = skb_shinfo(skb);</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+	struct sk_buff *list_skb;</div><div class='add'>+	bool has_mac, has_trans;</div><div class='add'>+	int headroom, tailroom;</div><div class='add'>+	int i, len, seg_len;</div><div class='add'>+</div><div class='add'>+	if (full_pkt)</div><div class='add'>+		len = skb-&gt;len;</div><div class='add'>+	else</div><div class='add'>+		len = min_t(int, skb-&gt;len, MAX_HEADER + 128);</div><div class='add'>+</div><div class='add'>+	headroom = skb_headroom(skb);</div><div class='add'>+	tailroom = skb_tailroom(skb);</div><div class='add'>+</div><div class='add'>+	has_mac = skb_mac_header_was_set(skb);</div><div class='add'>+	has_trans = skb_transport_header_was_set(skb);</div><div class='add'>+</div><div class='add'>+	printk("%sskb len=%u headroom=%u headlen=%u tailroom=%u\n"</div><div class='add'>+	       "mac=(%d,%d) mac_len=%u net=(%d,%d) trans=%d\n"</div><div class='add'>+	       "shinfo(txflags=%u nr_frags=%u gso(size=%hu type=%u segs=%hu))\n"</div><div class='add'>+	       "csum(0x%x start=%u offset=%u ip_summed=%u complete_sw=%u valid=%u level=%u)\n"</div><div class='add'>+	       "hash(0x%x sw=%u l4=%u) proto=0x%04x pkttype=%u iif=%d\n"</div><div class='add'>+	       "priority=0x%x mark=0x%x alloc_cpu=%u vlan_all=0x%x\n"</div><div class='add'>+	       "encapsulation=%d inner(proto=0x%04x, mac=%u, net=%u, trans=%u)\n",</div><div class='add'>+	       level, skb-&gt;len, headroom, skb_headlen(skb), tailroom,</div><div class='add'>+	       has_mac ? skb-&gt;mac_header : -1,</div><div class='add'>+	       has_mac ? skb_mac_header_len(skb) : -1,</div><div class='add'>+	       skb-&gt;mac_len,</div><div class='add'>+	       skb-&gt;network_header,</div><div class='add'>+	       has_trans ? skb_network_header_len(skb) : -1,</div><div class='add'>+	       has_trans ? skb-&gt;transport_header : -1,</div><div class='add'>+	       sh-&gt;tx_flags, sh-&gt;nr_frags,</div><div class='add'>+	       sh-&gt;gso_size, sh-&gt;gso_type, sh-&gt;gso_segs,</div><div class='add'>+	       skb-&gt;csum, skb-&gt;csum_start, skb-&gt;csum_offset, skb-&gt;ip_summed,</div><div class='add'>+	       skb-&gt;csum_complete_sw, skb-&gt;csum_valid, skb-&gt;csum_level,</div><div class='add'>+	       skb-&gt;hash, skb-&gt;sw_hash, skb-&gt;l4_hash,</div><div class='add'>+	       ntohs(skb-&gt;protocol), skb-&gt;pkt_type, skb-&gt;skb_iif,</div><div class='add'>+	       skb-&gt;priority, skb-&gt;mark, skb-&gt;alloc_cpu, skb-&gt;vlan_all,</div><div class='add'>+	       skb-&gt;encapsulation, skb-&gt;inner_protocol, skb-&gt;inner_mac_header,</div><div class='add'>+	       skb-&gt;inner_network_header, skb-&gt;inner_transport_header);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		printk("%sdev name=%s feat=%pNF\n",</div><div class='add'>+		       level, dev-&gt;name, &amp;dev-&gt;features);</div><div class='add'>+	if (sk)</div><div class='add'>+		printk("%ssk family=%hu type=%u proto=%u\n",</div><div class='add'>+		       level, sk-&gt;sk_family, sk-&gt;sk_type, sk-&gt;sk_protocol);</div><div class='add'>+</div><div class='add'>+	if (full_pkt &amp;&amp; headroom)</div><div class='add'>+		print_hex_dump(level, "skb headroom: ", DUMP_PREFIX_OFFSET,</div><div class='add'>+			       16, 1, skb-&gt;head, headroom, false);</div><div class='add'>+</div><div class='add'>+	seg_len = min_t(int, skb_headlen(skb), len);</div><div class='add'>+	if (seg_len)</div><div class='add'>+		print_hex_dump(level, "skb linear:   ", DUMP_PREFIX_OFFSET,</div><div class='add'>+			       16, 1, skb-&gt;data, seg_len, false);</div><div class='add'>+	len -= seg_len;</div><div class='add'>+</div><div class='add'>+	if (full_pkt &amp;&amp; tailroom)</div><div class='add'>+		print_hex_dump(level, "skb tailroom: ", DUMP_PREFIX_OFFSET,</div><div class='add'>+			       16, 1, skb_tail_pointer(skb), tailroom, false);</div><div class='add'>+</div><div class='add'>+	for (i = 0; len &amp;&amp; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		u32 p_off, p_len, copied;</div><div class='add'>+		struct page *p;</div><div class='add'>+		u8 *vaddr;</div><div class='add'>+</div><div class='add'>+		if (skb_frag_is_net_iov(frag)) {</div><div class='add'>+			printk("%sskb frag %d: not readable\n", level, i);</div><div class='add'>+			len -= skb_frag_size(frag);</div><div class='add'>+			if (!len)</div><div class='add'>+				break;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_frag_foreach_page(frag, skb_frag_off(frag),</div><div class='add'>+				      skb_frag_size(frag), p, p_off, p_len,</div><div class='add'>+				      copied) {</div><div class='add'>+			seg_len = min_t(int, p_len, len);</div><div class='add'>+			vaddr = kmap_atomic(p);</div><div class='add'>+			print_hex_dump(level, "skb frag:     ",</div><div class='add'>+				       DUMP_PREFIX_OFFSET,</div><div class='add'>+				       16, 1, vaddr + p_off, seg_len, false);</div><div class='add'>+			kunmap_atomic(vaddr);</div><div class='add'>+			len -= seg_len;</div><div class='add'>+			if (!len)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (full_pkt &amp;&amp; skb_has_frag_list(skb)) {</div><div class='add'>+		printk("skb fraglist:\n");</div><div class='add'>+		skb_walk_frags(skb, list_skb)</div><div class='add'>+			skb_dump(level, list_skb, true);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(kfree_skb_list);</div><div class='add'>+EXPORT_SYMBOL(skb_dump);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	skb_tx_error - report an sk_buff xmit error</div><div class='hunk'>@@ -680,10 +1403,14 @@ EXPORT_SYMBOL(kfree_skb_list);</div><div class='ctx'>  */</div><div class='ctx'> void skb_tx_error(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb_zcopy_clear(skb, true);</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_zcopy_downgrade_managed(skb);</div><div class='add'>+		skb_zcopy_clear(skb, true);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_tx_error);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TRACEPOINTS</div><div class='ctx'> /**</div><div class='ctx'>  *	consume_skb - free an skbuff</div><div class='ctx'>  *	@skb: buffer to free</div><div class='hunk'>@@ -697,13 +1424,14 @@ void consume_skb(struct sk_buff *skb)</div><div class='ctx'> 	if (!skb_unref(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	trace_consume_skb(skb);</div><div class='add'>+	trace_consume_skb(skb, __builtin_return_address(0));</div><div class='ctx'> 	__kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(consume_skb);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	consume_stateless_skb - free an skbuff, assuming it is stateless</div><div class='add'>+ *	__consume_stateless_skb - free an skbuff, assuming it is stateless</div><div class='ctx'>  *	@skb: buffer to free</div><div class='ctx'>  *</div><div class='ctx'>  *	Alike consume_skb(), but this variant assumes that this is the last</div><div class='hunk'>@@ -711,66 +1439,74 @@ EXPORT_SYMBOL(consume_skb);</div><div class='ctx'>  */</div><div class='ctx'> void __consume_stateless_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	trace_consume_skb(skb);</div><div class='del'>-	skb_release_data(skb);</div><div class='add'>+	trace_consume_skb(skb, __builtin_return_address(0));</div><div class='add'>+	skb_release_data(skb, SKB_CONSUMED);</div><div class='ctx'> 	kfree_skbmem(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __kfree_skb_flush(void)</div><div class='add'>+static void napi_skb_cache_put(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='ctx'> </div><div class='del'>-	/* flush skb_cache if containing objects */</div><div class='del'>-	if (nc-&gt;skb_count) {</div><div class='del'>-		kmem_cache_free_bulk(skbuff_head_cache, nc-&gt;skb_count,</div><div class='del'>-				     nc-&gt;skb_cache);</div><div class='del'>-		nc-&gt;skb_count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void _kfree_skb_defer(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct napi_alloc_cache *nc = this_cpu_ptr(&amp;napi_alloc_cache);</div><div class='del'>-</div><div class='del'>-	/* drop skb-&gt;head and call any destructors for packet */</div><div class='del'>-	skb_release_all(skb);</div><div class='add'>+	if (!kasan_mempool_poison_object(skb))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* record skb to CPU local list */</div><div class='add'>+	local_lock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='ctx'> 	nc-&gt;skb_cache[nc-&gt;skb_count++] = skb;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SLUB</div><div class='del'>-	/* SLUB writes into objects when freeing */</div><div class='del'>-	prefetchw(skb);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* flush skb_cache if it is filled */</div><div class='ctx'> 	if (unlikely(nc-&gt;skb_count == NAPI_SKB_CACHE_SIZE)) {</div><div class='del'>-		kmem_cache_free_bulk(skbuff_head_cache, NAPI_SKB_CACHE_SIZE,</div><div class='del'>-				     nc-&gt;skb_cache);</div><div class='del'>-		nc-&gt;skb_count = 0;</div><div class='add'>+		u32 i, remaining = NAPI_SKB_CACHE_SIZE - NAPI_SKB_CACHE_FREE;</div><div class='add'>+</div><div class='add'>+		for (i = remaining; i &lt; NAPI_SKB_CACHE_SIZE; i++)</div><div class='add'>+			kasan_mempool_unpoison_object(nc-&gt;skb_cache[i],</div><div class='add'>+						skbuff_cache_size);</div><div class='add'>+</div><div class='add'>+		kmem_cache_free_bulk(net_hotdata.skbuff_cache,</div><div class='add'>+				     NAPI_SKB_CACHE_FREE,</div><div class='add'>+				     nc-&gt;skb_cache + remaining);</div><div class='add'>+		nc-&gt;skb_count = remaining;</div><div class='ctx'> 	}</div><div class='add'>+	local_unlock_nested_bh(&amp;napi_alloc_cache.bh_lock);</div><div class='ctx'> }</div><div class='del'>-void __kfree_skb_defer(struct sk_buff *skb)</div><div class='add'>+</div><div class='add'>+void __napi_kfree_skb(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	_kfree_skb_defer(skb);</div><div class='add'>+	skb_release_all(skb, reason);</div><div class='add'>+	napi_skb_cache_put(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void napi_consume_skb(struct sk_buff *skb, int budget)</div><div class='add'>+void napi_skb_free_stolen_head(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return;</div><div class='add'>+	if (unlikely(skb-&gt;slow_gro)) {</div><div class='add'>+		nf_reset_ct(skb);</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_ext_put(skb);</div><div class='add'>+		skb_orphan(skb);</div><div class='add'>+		skb-&gt;slow_gro = 0;</div><div class='add'>+	}</div><div class='add'>+	napi_skb_cache_put(skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+void napi_consume_skb(struct sk_buff *skb, int budget)</div><div class='add'>+{</div><div class='ctx'> 	/* Zero budget indicate non-NAPI context called us, like netpoll */</div><div class='del'>-	if (unlikely(!budget)) {</div><div class='add'>+	if (unlikely(!budget || !skb)) {</div><div class='ctx'> 		dev_consume_skb_any(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!in_softirq());</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;alloc_cpu != smp_processor_id() &amp;&amp; !skb_shared(skb)) {</div><div class='add'>+		skb_release_head_state(skb);</div><div class='add'>+		return skb_attempt_defer_free(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!skb_unref(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* if reaching here SKB is ready to free */</div><div class='del'>-	trace_consume_skb(skb);</div><div class='add'>+	trace_consume_skb(skb, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 	/* if SKB is a clone, don't handle this case */</div><div class='ctx'> 	if (skb-&gt;fclone != SKB_FCLONE_UNAVAILABLE) {</div><div class='hunk'>@@ -778,16 +1514,15 @@ void napi_consume_skb(struct sk_buff *skb, int budget)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_kfree_skb_defer(skb);</div><div class='add'>+	skb_release_all(skb, SKB_CONSUMED);</div><div class='add'>+	napi_skb_cache_put(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(napi_consume_skb);</div><div class='ctx'> </div><div class='del'>-/* Make sure a field is enclosed inside headers_start/headers_end section */</div><div class='add'>+/* Make sure a field is contained by headers group */</div><div class='ctx'> #define CHECK_SKB_FIELD(field) \</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct sk_buff, field) &lt;		\</div><div class='del'>-		     offsetof(struct sk_buff, headers_start));	\</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct sk_buff, field) &gt;		\</div><div class='del'>-		     offsetof(struct sk_buff, headers_end));	\</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct sk_buff, field) !=		\</div><div class='add'>+		     offsetof(struct sk_buff, headers.field));	\</div><div class='ctx'> </div><div class='ctx'> static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)</div><div class='ctx'> {</div><div class='hunk'>@@ -796,19 +1531,15 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)</div><div class='ctx'> 	new-&gt;dev		= old-&gt;dev;</div><div class='ctx'> 	memcpy(new-&gt;cb, old-&gt;cb, sizeof(old-&gt;cb));</div><div class='ctx'> 	skb_dst_copy(new, old);</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	new-&gt;sp			= secpath_get(old-&gt;sp);</div><div class='del'>-#endif</div><div class='add'>+	__skb_ext_copy(new, old);</div><div class='ctx'> 	__nf_copy(new, old, false);</div><div class='ctx'> </div><div class='del'>-	/* Note : this field could be in headers_start/headers_end section</div><div class='add'>+	/* Note : this field could be in the headers group.</div><div class='ctx'> 	 * It is not yet because we do not want to have a 16 bit hole</div><div class='ctx'> 	 */</div><div class='ctx'> 	new-&gt;queue_mapping = old-&gt;queue_mapping;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;new-&gt;headers_start, &amp;old-&gt;headers_start,</div><div class='del'>-	       offsetof(struct sk_buff, headers_end) -</div><div class='del'>-	       offsetof(struct sk_buff, headers_start));</div><div class='add'>+	memcpy(&amp;new-&gt;headers, &amp;old-&gt;headers, sizeof(new-&gt;headers));</div><div class='ctx'> 	CHECK_SKB_FIELD(protocol);</div><div class='ctx'> 	CHECK_SKB_FIELD(csum);</div><div class='ctx'> 	CHECK_SKB_FIELD(hash);</div><div class='hunk'>@@ -830,6 +1561,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)</div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='ctx'> 	CHECK_SKB_FIELD(napi_id);</div><div class='ctx'> #endif</div><div class='add'>+	CHECK_SKB_FIELD(alloc_cpu);</div><div class='ctx'> #ifdef CONFIG_XPS</div><div class='ctx'> 	CHECK_SKB_FIELD(sender_cpu);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -859,6 +1591,7 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)</div><div class='ctx'> 	n-&gt;nohdr = 0;</div><div class='ctx'> 	n-&gt;peeked = 0;</div><div class='ctx'> 	C(pfmemalloc);</div><div class='add'>+	C(pp_recycle);</div><div class='ctx'> 	n-&gt;destructor = NULL;</div><div class='ctx'> 	C(tail);</div><div class='ctx'> 	C(end);</div><div class='hunk'>@@ -876,6 +1609,31 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * alloc_skb_for_msg() - allocate sk_buff to wrap frag list forming a msg</div><div class='add'>+ * @first: first sk_buff of the msg</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *alloc_skb_for_msg(struct sk_buff *first)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *n;</div><div class='add'>+</div><div class='add'>+	n = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+	if (!n)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	n-&gt;len = first-&gt;len;</div><div class='add'>+	n-&gt;data_len = first-&gt;len;</div><div class='add'>+	n-&gt;truesize = first-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(n)-&gt;frag_list = first;</div><div class='add'>+</div><div class='add'>+	__copy_skb_header(n, first);</div><div class='add'>+	n-&gt;destructor = NULL;</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_skb_for_msg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	skb_morph	-	morph one skb into another</div><div class='ctx'>  *	@dst: the skb to receive the contents</div><div class='ctx'>  *	@src: the skb to supply the contents</div><div class='hunk'>@@ -887,30 +1645,33 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src)</div><div class='ctx'> {</div><div class='del'>-	skb_release_all(dst);</div><div class='add'>+	skb_release_all(dst, SKB_CONSUMED);</div><div class='ctx'> 	return __skb_clone(dst, src);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_morph);</div><div class='ctx'> </div><div class='ctx'> int mm_account_pinned_pages(struct mmpin *mmp, size_t size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long max_pg, num_pg, new_pg, old_pg;</div><div class='add'>+	unsigned long max_pg, num_pg, new_pg, old_pg, rlim;</div><div class='ctx'> 	struct user_struct *user;</div><div class='ctx'> </div><div class='ctx'> 	if (capable(CAP_IPC_LOCK) || !size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	rlim = rlimit(RLIMIT_MEMLOCK);</div><div class='add'>+	if (rlim == RLIM_INFINITY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	num_pg = (size &gt;&gt; PAGE_SHIFT) + 2;	/* worst case */</div><div class='del'>-	max_pg = rlimit(RLIMIT_MEMLOCK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	max_pg = rlim &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	user = mmp-&gt;user ? : current_user();</div><div class='ctx'> </div><div class='add'>+	old_pg = atomic_long_read(&amp;user-&gt;locked_vm);</div><div class='ctx'> 	do {</div><div class='del'>-		old_pg = atomic_long_read(&amp;user-&gt;locked_vm);</div><div class='ctx'> 		new_pg = old_pg + num_pg;</div><div class='ctx'> 		if (new_pg &gt; max_pg)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='del'>-	} while (atomic_long_cmpxchg(&amp;user-&gt;locked_vm, old_pg, new_pg) !=</div><div class='del'>-		 old_pg);</div><div class='add'>+	} while (!atomic_long_try_cmpxchg(&amp;user-&gt;locked_vm, &amp;old_pg, new_pg));</div><div class='ctx'> </div><div class='ctx'> 	if (!mmp-&gt;user) {</div><div class='ctx'> 		mmp-&gt;user = get_uid(user);</div><div class='hunk'>@@ -932,9 +1693,10 @@ void mm_unaccount_pinned_pages(struct mmpin *mmp)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_unaccount_pinned_pages);</div><div class='ctx'> </div><div class='del'>-struct ubuf_info *sock_zerocopy_alloc(struct sock *sk, size_t size)</div><div class='add'>+static struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size,</div><div class='add'>+					    bool devmem)</div><div class='ctx'> {</div><div class='del'>-	struct ubuf_info *uarg;</div><div class='add'>+	struct ubuf_info_msgzc *uarg;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!in_task());</div><div class='hunk'>@@ -947,35 +1709,40 @@ struct ubuf_info *sock_zerocopy_alloc(struct sock *sk, size_t size)</div><div class='ctx'> 	uarg = (void *)skb-&gt;cb;</div><div class='ctx'> 	uarg-&gt;mmp.user = NULL;</div><div class='ctx'> </div><div class='del'>-	if (mm_account_pinned_pages(&amp;uarg-&gt;mmp, size)) {</div><div class='add'>+	if (likely(!devmem) &amp;&amp; mm_account_pinned_pages(&amp;uarg-&gt;mmp, size)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uarg-&gt;callback = sock_zerocopy_callback;</div><div class='add'>+	uarg-&gt;ubuf.ops = &amp;msg_zerocopy_ubuf_ops;</div><div class='ctx'> 	uarg-&gt;id = ((u32)atomic_inc_return(&amp;sk-&gt;sk_zckey)) - 1;</div><div class='ctx'> 	uarg-&gt;len = 1;</div><div class='ctx'> 	uarg-&gt;bytelen = size;</div><div class='ctx'> 	uarg-&gt;zerocopy = 1;</div><div class='del'>-	refcount_set(&amp;uarg-&gt;refcnt, 1);</div><div class='add'>+	uarg-&gt;ubuf.flags = SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN;</div><div class='add'>+	refcount_set(&amp;uarg-&gt;ubuf.refcnt, 1);</div><div class='ctx'> 	sock_hold(sk);</div><div class='ctx'> </div><div class='del'>-	return uarg;</div><div class='add'>+	return &amp;uarg-&gt;ubuf;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_zerocopy_alloc);</div><div class='ctx'> </div><div class='del'>-static inline struct sk_buff *skb_from_uarg(struct ubuf_info *uarg)</div><div class='add'>+static inline struct sk_buff *skb_from_uarg(struct ubuf_info_msgzc *uarg)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of((void *)uarg, struct sk_buff, cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,</div><div class='del'>-					struct ubuf_info *uarg)</div><div class='add'>+struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,</div><div class='add'>+				       struct ubuf_info *uarg, bool devmem)</div><div class='ctx'> {</div><div class='ctx'> 	if (uarg) {</div><div class='add'>+		struct ubuf_info_msgzc *uarg_zc;</div><div class='ctx'> 		const u32 byte_limit = 1 &lt;&lt; 19;		/* limit to a few TSO */</div><div class='ctx'> 		u32 bytelen, next;</div><div class='ctx'> </div><div class='add'>+		/* there might be non MSG_ZEROCOPY users */</div><div class='add'>+		if (uarg-&gt;ops != &amp;msg_zerocopy_ubuf_ops)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='ctx'> 		/* realloc only when socket is locked (TCP, UDP cork),</div><div class='ctx'> 		 * so uarg-&gt;len and sk_zckey access is serialized</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -984,8 +1751,9 @@ struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bytelen = uarg-&gt;bytelen + size;</div><div class='del'>-		if (uarg-&gt;len == USHRT_MAX - 1 || bytelen &gt; byte_limit) {</div><div class='add'>+		uarg_zc = uarg_to_msgzc(uarg);</div><div class='add'>+		bytelen = uarg_zc-&gt;bytelen + size;</div><div class='add'>+		if (uarg_zc-&gt;len == USHRT_MAX - 1 || bytelen &gt; byte_limit) {</div><div class='ctx'> 			/* TCP can create new skb to attach new uarg */</div><div class='ctx'> 			if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='ctx'> 				goto new_alloc;</div><div class='hunk'>@@ -993,21 +1761,26 @@ struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		next = (u32)atomic_read(&amp;sk-&gt;sk_zckey);</div><div class='del'>-		if ((u32)(uarg-&gt;id + uarg-&gt;len) == next) {</div><div class='del'>-			if (mm_account_pinned_pages(&amp;uarg-&gt;mmp, size))</div><div class='add'>+		if ((u32)(uarg_zc-&gt;id + uarg_zc-&gt;len) == next) {</div><div class='add'>+			if (likely(!devmem) &amp;&amp;</div><div class='add'>+			    mm_account_pinned_pages(&amp;uarg_zc-&gt;mmp, size))</div><div class='ctx'> 				return NULL;</div><div class='del'>-			uarg-&gt;len++;</div><div class='del'>-			uarg-&gt;bytelen = bytelen;</div><div class='add'>+			uarg_zc-&gt;len++;</div><div class='add'>+			uarg_zc-&gt;bytelen = bytelen;</div><div class='ctx'> 			atomic_set(&amp;sk-&gt;sk_zckey, ++next);</div><div class='del'>-			sock_zerocopy_get(uarg);</div><div class='add'>+</div><div class='add'>+			/* no extra ref when appending to datagram (MSG_MORE) */</div><div class='add'>+			if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+				net_zcopy_get(uarg);</div><div class='add'>+</div><div class='ctx'> 			return uarg;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> new_alloc:</div><div class='del'>-	return sock_zerocopy_alloc(sk, size);</div><div class='add'>+	return msg_zerocopy_alloc(sk, size, devmem);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_zerocopy_realloc);</div><div class='add'>+EXPORT_SYMBOL_GPL(msg_zerocopy_realloc);</div><div class='ctx'> </div><div class='ctx'> static bool skb_zerocopy_notify_extend(struct sk_buff *skb, u32 lo, u16 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1029,13 +1802,14 @@ static bool skb_zerocopy_notify_extend(struct sk_buff *skb, u32 lo, u16 len)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sock_zerocopy_callback(struct ubuf_info *uarg, bool success)</div><div class='add'>+static void __msg_zerocopy_callback(struct ubuf_info_msgzc *uarg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *tail, *skb = skb_from_uarg(uarg);</div><div class='ctx'> 	struct sock_exterr_skb *serr;</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> 	struct sk_buff_head *q;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool is_zerocopy;</div><div class='ctx'> 	u32 lo, hi;</div><div class='ctx'> 	u16 len;</div><div class='ctx'> </div><div class='hunk'>@@ -1050,6 +1824,7 @@ void sock_zerocopy_callback(struct ubuf_info *uarg, bool success)</div><div class='ctx'> 	len = uarg-&gt;len;</div><div class='ctx'> 	lo = uarg-&gt;id;</div><div class='ctx'> 	hi = uarg-&gt;id + len - 1;</div><div class='add'>+	is_zerocopy = uarg-&gt;zerocopy;</div><div class='ctx'> </div><div class='ctx'> 	serr = SKB_EXT_ERR(skb);</div><div class='ctx'> 	memset(serr, 0, sizeof(*serr));</div><div class='hunk'>@@ -1057,7 +1832,7 @@ void sock_zerocopy_callback(struct ubuf_info *uarg, bool success)</div><div class='ctx'> 	serr-&gt;ee.ee_origin = SO_EE_ORIGIN_ZEROCOPY;</div><div class='ctx'> 	serr-&gt;ee.ee_data = hi;</div><div class='ctx'> 	serr-&gt;ee.ee_info = lo;</div><div class='del'>-	if (!success)</div><div class='add'>+	if (!is_zerocopy)</div><div class='ctx'> 		serr-&gt;ee.ee_code |= SO_EE_CODE_ZEROCOPY_COPIED;</div><div class='ctx'> </div><div class='ctx'> 	q = &amp;sk-&gt;sk_error_queue;</div><div class='hunk'>@@ -1070,72 +1845,91 @@ void sock_zerocopy_callback(struct ubuf_info *uarg, bool success)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> </div><div class='ctx'> release:</div><div class='ctx'> 	consume_skb(skb);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_zerocopy_callback);</div><div class='ctx'> </div><div class='del'>-void sock_zerocopy_put(struct ubuf_info *uarg)</div><div class='add'>+static void msg_zerocopy_complete(struct sk_buff *skb, struct ubuf_info *uarg,</div><div class='add'>+				  bool success)</div><div class='ctx'> {</div><div class='del'>-	if (uarg &amp;&amp; refcount_dec_and_test(&amp;uarg-&gt;refcnt)) {</div><div class='del'>-		if (uarg-&gt;callback)</div><div class='del'>-			uarg-&gt;callback(uarg, uarg-&gt;zerocopy);</div><div class='del'>-		else</div><div class='del'>-			consume_skb(skb_from_uarg(uarg));</div><div class='del'>-	}</div><div class='add'>+	struct ubuf_info_msgzc *uarg_zc = uarg_to_msgzc(uarg);</div><div class='add'>+</div><div class='add'>+	uarg_zc-&gt;zerocopy = uarg_zc-&gt;zerocopy &amp; success;</div><div class='add'>+</div><div class='add'>+	if (refcount_dec_and_test(&amp;uarg-&gt;refcnt))</div><div class='add'>+		__msg_zerocopy_callback(uarg_zc);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_zerocopy_put);</div><div class='ctx'> </div><div class='del'>-void sock_zerocopy_put_abort(struct ubuf_info *uarg)</div><div class='add'>+void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref)</div><div class='ctx'> {</div><div class='del'>-	if (uarg) {</div><div class='del'>-		struct sock *sk = skb_from_uarg(uarg)-&gt;sk;</div><div class='add'>+	struct sock *sk = skb_from_uarg(uarg_to_msgzc(uarg))-&gt;sk;</div><div class='ctx'> </div><div class='del'>-		atomic_dec(&amp;sk-&gt;sk_zckey);</div><div class='del'>-		uarg-&gt;len--;</div><div class='add'>+	atomic_dec(&amp;sk-&gt;sk_zckey);</div><div class='add'>+	uarg_to_msgzc(uarg)-&gt;len--;</div><div class='ctx'> </div><div class='del'>-		sock_zerocopy_put(uarg);</div><div class='del'>-	}</div><div class='add'>+	if (have_uref)</div><div class='add'>+		msg_zerocopy_complete(NULL, uarg, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_zerocopy_put_abort);</div><div class='add'>+EXPORT_SYMBOL_GPL(msg_zerocopy_put_abort);</div><div class='ctx'> </div><div class='del'>-extern int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-				   struct iov_iter *from, size_t length);</div><div class='add'>+const struct ubuf_info_ops msg_zerocopy_ubuf_ops = {</div><div class='add'>+	.complete = msg_zerocopy_complete,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(msg_zerocopy_ubuf_ops);</div><div class='ctx'> </div><div class='ctx'> int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			     struct msghdr *msg, int len,</div><div class='del'>-			     struct ubuf_info *uarg)</div><div class='add'>+			     struct ubuf_info *uarg,</div><div class='add'>+			     struct net_devmem_dmabuf_binding *binding)</div><div class='ctx'> {</div><div class='del'>-	struct ubuf_info *orig_uarg = skb_zcopy(skb);</div><div class='del'>-	struct iov_iter orig_iter = msg-&gt;msg_iter;</div><div class='ctx'> 	int err, orig_len = skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-	/* An skb can only point to one uarg. This edge case happens when</div><div class='del'>-	 * TCP appends to an skb, but zerocopy_realloc triggered a new alloc.</div><div class='del'>-	 */</div><div class='del'>-	if (orig_uarg &amp;&amp; uarg != orig_uarg)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+	if (uarg-&gt;ops-&gt;link_skb) {</div><div class='add'>+		err = uarg-&gt;ops-&gt;link_skb(skb, uarg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		struct ubuf_info *orig_uarg = skb_zcopy(skb);</div><div class='add'>+</div><div class='add'>+		/* An skb can only point to one uarg. This edge case happens</div><div class='add'>+		 * when TCP appends to an skb, but zerocopy_realloc triggered</div><div class='add'>+		 * a new alloc.</div><div class='add'>+		 */</div><div class='add'>+		if (orig_uarg &amp;&amp; uarg != orig_uarg)</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = __zerocopy_sg_from_iter(sk, skb, &amp;msg-&gt;msg_iter, len);</div><div class='add'>+	err = __zerocopy_sg_from_iter(msg, sk, skb, &amp;msg-&gt;msg_iter, len,</div><div class='add'>+				      binding);</div><div class='ctx'> 	if (err == -EFAULT || (err == -EMSGSIZE &amp;&amp; skb-&gt;len == orig_len)) {</div><div class='ctx'> 		struct sock *save_sk = skb-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 		/* Streams do not free skb on error. Reset to prev state. */</div><div class='del'>-		msg-&gt;msg_iter = orig_iter;</div><div class='add'>+		iov_iter_revert(&amp;msg-&gt;msg_iter, skb-&gt;len - orig_len);</div><div class='ctx'> 		skb-&gt;sk = sk;</div><div class='ctx'> 		___pskb_trim(skb, orig_len);</div><div class='ctx'> 		skb-&gt;sk = save_sk;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_zcopy_set(skb, uarg);</div><div class='add'>+	skb_zcopy_set(skb, uarg, NULL);</div><div class='ctx'> 	return skb-&gt;len - orig_len;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_zerocopy_iter_stream);</div><div class='ctx'> </div><div class='add'>+void __skb_zcopy_downgrade_managed(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;flags &amp;= ~SKBFL_MANAGED_FRAG_REFS;</div><div class='add'>+	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++)</div><div class='add'>+		skb_frag_ref(skb, i);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__skb_zcopy_downgrade_managed);</div><div class='add'>+</div><div class='ctx'> static int skb_zerocopy_clone(struct sk_buff *nskb, struct sk_buff *orig,</div><div class='ctx'> 			      gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -1151,7 +1945,7 @@ static int skb_zerocopy_clone(struct sk_buff *nskb, struct sk_buff *orig,</div><div class='ctx'> 			if (skb_copy_ubufs(nskb, GFP_ATOMIC))</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 		}</div><div class='del'>-		skb_zcopy_set(nskb, skb_uarg(orig));</div><div class='add'>+		skb_zcopy_set(nskb, skb_uarg(orig), NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1161,7 +1955,7 @@ static int skb_zerocopy_clone(struct sk_buff *nskb, struct sk_buff *orig,</div><div class='ctx'>  *	@skb: the skb to modify</div><div class='ctx'>  *	@gfp_mask: allocation priority</div><div class='ctx'>  *</div><div class='del'>- *	This must be called on SKBTX_DEV_ZEROCOPY skb.</div><div class='add'>+ *	This must be called on skb with SKBFL_ZEROCOPY_ENABLE.</div><div class='ctx'>  *	It will copy all frags into kernel and drop the reference</div><div class='ctx'>  *	to userspace pages.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1175,18 +1969,29 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int num_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	struct page *page, *head = NULL;</div><div class='del'>-	int i, new_frags;</div><div class='add'>+	int i, order, psize, new_frags;</div><div class='ctx'> 	u32 d_off;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_shared(skb) || skb_unclone(skb, gfp_mask))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	if (!num_frags)</div><div class='ctx'> 		goto release;</div><div class='ctx'> </div><div class='del'>-	new_frags = (__skb_pagelen(skb) + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	/* We might have to allocate high order pages, so compute what minimum</div><div class='add'>+	 * page order is needed.</div><div class='add'>+	 */</div><div class='add'>+	order = 0;</div><div class='add'>+	while ((PAGE_SIZE &lt;&lt; order) * MAX_SKB_FRAGS &lt; __skb_pagelen(skb))</div><div class='add'>+		order++;</div><div class='add'>+	psize = (PAGE_SIZE &lt;&lt; order);</div><div class='add'>+</div><div class='add'>+	new_frags = (__skb_pagelen(skb) + psize - 1) &gt;&gt; (PAGE_SHIFT + order);</div><div class='ctx'> 	for (i = 0; i &lt; new_frags; i++) {</div><div class='del'>-		page = alloc_page(gfp_mask);</div><div class='add'>+		page = alloc_pages(gfp_mask | __GFP_COMP, order);</div><div class='ctx'> 		if (!page) {</div><div class='ctx'> 			while (head) {</div><div class='ctx'> 				struct page *next = (struct page *)page_private(head);</div><div class='hunk'>@@ -1207,17 +2012,17 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)</div><div class='ctx'> 		struct page *p;</div><div class='ctx'> 		u8 *vaddr;</div><div class='ctx'> </div><div class='del'>-		skb_frag_foreach_page(f, f-&gt;page_offset, skb_frag_size(f),</div><div class='add'>+		skb_frag_foreach_page(f, skb_frag_off(f), skb_frag_size(f),</div><div class='ctx'> 				      p, p_off, p_len, copied) {</div><div class='ctx'> 			u32 copy, done = 0;</div><div class='ctx'> 			vaddr = kmap_atomic(p);</div><div class='ctx'> </div><div class='ctx'> 			while (done &lt; p_len) {</div><div class='del'>-				if (d_off == PAGE_SIZE) {</div><div class='add'>+				if (d_off == psize) {</div><div class='ctx'> 					d_off = 0;</div><div class='ctx'> 					page = (struct page *)page_private(page);</div><div class='ctx'> 				}</div><div class='del'>-				copy = min_t(u32, PAGE_SIZE - d_off, p_len - done);</div><div class='add'>+				copy = min_t(u32, psize - d_off, p_len - done);</div><div class='ctx'> 				memcpy(page_address(page) + d_off,</div><div class='ctx'> 				       vaddr + p_off + done, copy);</div><div class='ctx'> 				done += copy;</div><div class='hunk'>@@ -1233,10 +2038,11 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)</div><div class='ctx'> </div><div class='ctx'> 	/* skb frags point to kernel buffers */</div><div class='ctx'> 	for (i = 0; i &lt; new_frags - 1; i++) {</div><div class='del'>-		__skb_fill_page_desc(skb, i, head, 0, PAGE_SIZE);</div><div class='add'>+		__skb_fill_netmem_desc(skb, i, page_to_netmem(head), 0, psize);</div><div class='ctx'> 		head = (struct page *)page_private(head);</div><div class='ctx'> 	}</div><div class='del'>-	__skb_fill_page_desc(skb, new_frags - 1, head, 0, d_off);</div><div class='add'>+	__skb_fill_netmem_desc(skb, new_frags - 1, page_to_netmem(head), 0,</div><div class='add'>+			       d_off);</div><div class='ctx'> 	skb_shinfo(skb)-&gt;nr_frags = new_frags;</div><div class='ctx'> </div><div class='ctx'> release:</div><div class='hunk'>@@ -1273,11 +2079,12 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)</div><div class='ctx'> 	    refcount_read(&amp;fclones-&gt;fclone_ref) == 1) {</div><div class='ctx'> 		n = &amp;fclones-&gt;skb2;</div><div class='ctx'> 		refcount_set(&amp;fclones-&gt;fclone_ref, 2);</div><div class='add'>+		n-&gt;fclone = SKB_FCLONE_CLONE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (skb_pfmemalloc(skb))</div><div class='ctx'> 			gfp_mask |= __GFP_MEMALLOC;</div><div class='ctx'> </div><div class='del'>-		n = kmem_cache_alloc(skbuff_head_cache, gfp_mask);</div><div class='add'>+		n = kmem_cache_alloc(net_hotdata.skbuff_cache, gfp_mask);</div><div class='ctx'> 		if (!n)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,11 +2147,20 @@ static inline int skb_alloc_rx_flag(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *skb_copy(const struct sk_buff *skb, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	int headerlen = skb_headroom(skb);</div><div class='del'>-	unsigned int size = skb_end_offset(skb) + skb-&gt;data_len;</div><div class='del'>-	struct sk_buff *n = __alloc_skb(size, gfp_mask,</div><div class='del'>-					skb_alloc_rx_flag(skb), NUMA_NO_NODE);</div><div class='add'>+	struct sk_buff *n;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int headerlen;</div><div class='add'>+</div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	headerlen = skb_headroom(skb);</div><div class='add'>+	size = skb_end_offset(skb) + skb-&gt;data_len;</div><div class='add'>+	n = __alloc_skb(size, gfp_mask,</div><div class='add'>+			skb_alloc_rx_flag(skb), NUMA_NO_NODE);</div><div class='ctx'> 	if (!n)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1439,29 +2255,34 @@ EXPORT_SYMBOL(__pskb_copy_fclone);</div><div class='ctx'>  *</div><div class='ctx'>  *	All the pointers pointing into skb header may change and must be</div><div class='ctx'>  *	reloaded after call to this function.</div><div class='add'>+ *</div><div class='add'>+ *	Note: If you skb_push() the start of the buffer after reallocating the</div><div class='add'>+ *	header, call skb_postpush_data_move() first to move the metadata out of</div><div class='add'>+ *	the way before writing to &amp;sk_buff-&gt;data.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,</div><div class='ctx'> 		     gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	int i, osize = skb_end_offset(skb);</div><div class='del'>-	int size = osize + nhead + ntail;</div><div class='add'>+	unsigned int osize = skb_end_offset(skb);</div><div class='add'>+	unsigned int size = osize + nhead + ntail;</div><div class='ctx'> 	long off;</div><div class='ctx'> 	u8 *data;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(nhead &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(skb_shared(skb));</div><div class='ctx'> </div><div class='del'>-	size = SKB_DATA_ALIGN(size);</div><div class='add'>+	skb_zcopy_downgrade_managed(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb_pfmemalloc(skb))</div><div class='ctx'> 		gfp_mask |= __GFP_MEMALLOC;</div><div class='del'>-	data = kmalloc_reserve(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),</div><div class='del'>-			       gfp_mask, NUMA_NO_NODE, NULL);</div><div class='add'>+</div><div class='add'>+	data = kmalloc_reserve(&amp;size, gfp_mask, NUMA_NO_NODE, NULL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		goto nodata;</div><div class='del'>-	size = SKB_WITH_OVERHEAD(ksize(data));</div><div class='add'>+	size = SKB_WITH_OVERHEAD(size);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy only real data... and, alas, header. This should be</div><div class='ctx'> 	 * optimized for the cases when header is void.</div><div class='hunk'>@@ -1488,7 +2309,7 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,</div><div class='ctx'> 		if (skb_has_frag_list(skb))</div><div class='ctx'> 			skb_clone_fraglist(skb);</div><div class='ctx'> </div><div class='del'>-		skb_release_data(skb);</div><div class='add'>+		skb_release_data(skb, SKB_CONSUMED);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		skb_free_head(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1497,11 +2318,10 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,</div><div class='ctx'> 	skb-&gt;head     = data;</div><div class='ctx'> 	skb-&gt;head_frag = 0;</div><div class='ctx'> 	skb-&gt;data    += off;</div><div class='add'>+</div><div class='add'>+	skb_set_end_offset(skb, size);</div><div class='ctx'> #ifdef NET_SKBUFF_DATA_USES_OFFSET</div><div class='del'>-	skb-&gt;end      = size;</div><div class='ctx'> 	off           = nhead;</div><div class='del'>-#else</div><div class='del'>-	skb-&gt;end      = skb-&gt;head + size;</div><div class='ctx'> #endif</div><div class='ctx'> 	skb-&gt;tail	      += off;</div><div class='ctx'> 	skb_headers_offset_update(skb, nhead);</div><div class='hunk'>@@ -1510,8 +2330,6 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,</div><div class='ctx'> 	skb-&gt;nohdr    = 0;</div><div class='ctx'> 	atomic_set(&amp;skb_shinfo(skb)-&gt;dataref, 1);</div><div class='ctx'> </div><div class='del'>-	skb_metadata_clear(skb);</div><div class='del'>-</div><div class='ctx'> 	/* It is not generally safe to change skb-&gt;truesize.</div><div class='ctx'> 	 * For the moment, we really care of rx path, or</div><div class='ctx'> 	 * when skb is orphaned (not attached to a socket).</div><div class='hunk'>@@ -1522,7 +2340,7 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nofrags:</div><div class='del'>-	kfree(data);</div><div class='add'>+	skb_kfree_head(data, size);</div><div class='ctx'> nodata:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -1549,6 +2367,104 @@ struct sk_buff *skb_realloc_headroom(struct sk_buff *skb, unsigned int headroom)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_realloc_headroom);</div><div class='ctx'> </div><div class='add'>+/* Note: We plan to rework this in linux-6.4 */</div><div class='add'>+int __skb_unclone_keeptruesize(struct sk_buff *skb, gfp_t pri)</div><div class='add'>+{</div><div class='add'>+	unsigned int saved_end_offset, saved_truesize;</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	saved_end_offset = skb_end_offset(skb);</div><div class='add'>+	saved_truesize = skb-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	res = pskb_expand_head(skb, 0, 0, pri);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	skb-&gt;truesize = saved_truesize;</div><div class='add'>+</div><div class='add'>+	if (likely(skb_end_offset(skb) == saved_end_offset))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We can not change skb-&gt;end if the original or new value</div><div class='add'>+	 * is SKB_SMALL_HEAD_HEADROOM, as it might break skb_kfree_head().</div><div class='add'>+	 */</div><div class='add'>+	if (saved_end_offset == SKB_SMALL_HEAD_HEADROOM ||</div><div class='add'>+	    skb_end_offset(skb) == SKB_SMALL_HEAD_HEADROOM) {</div><div class='add'>+		/* We think this path should not be taken.</div><div class='add'>+		 * Add a temporary trace to warn us just in case.</div><div class='add'>+		 */</div><div class='add'>+		pr_err_once("__skb_unclone_keeptruesize() skb_end_offset() %u -&gt; %u\n",</div><div class='add'>+			    saved_end_offset, skb_end_offset(skb));</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	/* We are about to change back skb-&gt;end,</div><div class='add'>+	 * we need to move skb_shinfo() to its new location.</div><div class='add'>+	 */</div><div class='add'>+	memmove(skb-&gt;head + saved_end_offset,</div><div class='add'>+		shinfo,</div><div class='add'>+		offsetof(struct skb_shared_info, frags[shinfo-&gt;nr_frags]));</div><div class='add'>+</div><div class='add'>+	skb_set_end_offset(skb, saved_end_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	skb_expand_head - reallocate header of &amp;sk_buff</div><div class='add'>+ *	@skb: buffer to reallocate</div><div class='add'>+ *	@headroom: needed headroom</div><div class='add'>+ *</div><div class='add'>+ *	Unlike skb_realloc_headroom, this one does not allocate a new skb</div><div class='add'>+ *	if possible; copies skb-&gt;sk to new skb as needed</div><div class='add'>+ *	and frees original skb in case of failures.</div><div class='add'>+ *</div><div class='add'>+ *	It expect increased headroom and generates warning otherwise.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct sk_buff *skb_expand_head(struct sk_buff *skb, unsigned int headroom)</div><div class='add'>+{</div><div class='add'>+	int delta = headroom - skb_headroom(skb);</div><div class='add'>+	int osize = skb_end_offset(skb);</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(delta &lt;= 0,</div><div class='add'>+		      "%s is expecting an increase in the headroom", __func__))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	delta = SKB_DATA_ALIGN(delta);</div><div class='add'>+	/* pskb_expand_head() might crash, if skb is shared. */</div><div class='add'>+	if (skb_shared(skb) || !is_skb_wmem(skb)) {</div><div class='add'>+		struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!nskb))</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		if (sk)</div><div class='add'>+			skb_set_owner_w(nskb, sk);</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+		skb = nskb;</div><div class='add'>+	}</div><div class='add'>+	if (pskb_expand_head(skb, delta, 0, GFP_ATOMIC))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; is_skb_wmem(skb)) {</div><div class='add'>+		delta = skb_end_offset(skb) - osize;</div><div class='add'>+		refcount_add(delta, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+		skb-&gt;truesize += delta;</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_expand_head);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	skb_copy_expand	-	copy and expand sk_buff</div><div class='ctx'>  *	@skb: buffer to copy</div><div class='hunk'>@@ -1574,12 +2490,20 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Allocate the copy buffer</div><div class='ctx'> 	 */</div><div class='del'>-	struct sk_buff *n = __alloc_skb(newheadroom + skb-&gt;len + newtailroom,</div><div class='del'>-					gfp_mask, skb_alloc_rx_flag(skb),</div><div class='del'>-					NUMA_NO_NODE);</div><div class='del'>-	int oldheadroom = skb_headroom(skb);</div><div class='ctx'> 	int head_copy_len, head_copy_off;</div><div class='add'>+	struct sk_buff *n;</div><div class='add'>+	int oldheadroom;</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	oldheadroom = skb_headroom(skb);</div><div class='add'>+	n = __alloc_skb(newheadroom + skb-&gt;len + newtailroom,</div><div class='add'>+			gfp_mask, skb_alloc_rx_flag(skb),</div><div class='add'>+			NUMA_NO_NODE);</div><div class='ctx'> 	if (!n)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1736,6 +2660,30 @@ void *skb_pull(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> EXPORT_SYMBOL(skb_pull);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	skb_pull_data - remove data from the start of a buffer returning its</div><div class='add'>+ *	original position.</div><div class='add'>+ *	@skb: buffer to use</div><div class='add'>+ *	@len: amount of data to remove</div><div class='add'>+ *</div><div class='add'>+ *	This function removes data from the start of a buffer, returning</div><div class='add'>+ *	the memory to the headroom. A pointer to the original data in the buffer</div><div class='add'>+ *	is returned after checking if there is enough data to pull. Once the</div><div class='add'>+ *	data has been pulled future pushes will overwrite the old data.</div><div class='add'>+ */</div><div class='add'>+void *skb_pull_data(struct sk_buff *skb, size_t len)</div><div class='add'>+{</div><div class='add'>+	void *data = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; len)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, len);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_pull_data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	skb_trim - remove end from a buffer</div><div class='ctx'>  *	@skb: buffer to alter</div><div class='ctx'>  *	@len: new length</div><div class='hunk'>@@ -1846,8 +2794,15 @@ int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='ctx'> 		int delta = skb-&gt;len - len;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;csum = csum_sub(skb-&gt;csum,</div><div class='del'>-				     skb_checksum(skb, len, delta, 0));</div><div class='add'>+		skb-&gt;csum = csum_block_sub(skb-&gt;csum,</div><div class='add'>+					   skb_checksum(skb, len, delta, 0),</div><div class='add'>+					   len);</div><div class='add'>+	} else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+		int hdlen = (len &gt; skb_headlen(skb)) ? skb_headlen(skb) : len;</div><div class='add'>+		int offset = skb_checksum_start_offset(skb) + skb-&gt;csum_offset;</div><div class='add'>+</div><div class='add'>+		if (offset + sizeof(__sum16) &gt; hdlen)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return __pskb_trim(skb, len);</div><div class='ctx'> }</div><div class='hunk'>@@ -1886,6 +2841,9 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)</div><div class='ctx'> 	 */</div><div class='ctx'> 	int i, k, eat = (skb-&gt;tail + delta) - skb-&gt;end;</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	if (eat &gt; 0 || skb_cloned(skb)) {</div><div class='ctx'> 		if (pskb_expand_head(skb, 0, eat &gt; 0 ? eat + 128 : 0,</div><div class='ctx'> 				     GFP_ATOMIC))</div><div class='hunk'>@@ -1924,8 +2882,6 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)</div><div class='ctx'> 		struct sk_buff *insp = NULL;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			BUG_ON(!list);</div><div class='del'>-</div><div class='ctx'> 			if (list-&gt;len &lt;= eat) {</div><div class='ctx'> 				/* Eaten as whole. */</div><div class='ctx'> 				eat -= list-&gt;len;</div><div class='hunk'>@@ -1933,6 +2889,9 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)</div><div class='ctx'> 				insp = list;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Eaten partially. */</div><div class='add'>+				if (skb_is_gso(skb) &amp;&amp; !list-&gt;head_frag &amp;&amp;</div><div class='add'>+				    skb_headlen(list))</div><div class='add'>+					skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_DODGY;</div><div class='ctx'> </div><div class='ctx'> 				if (skb_shared(list)) {</div><div class='ctx'> 					/* Sucks! We need to fork list. :-( */</div><div class='hunk'>@@ -1957,7 +2916,7 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)</div><div class='ctx'> 		/* Free pulled out fragments. */</div><div class='ctx'> 		while ((list = skb_shinfo(skb)-&gt;frag_list) != insp) {</div><div class='ctx'> 			skb_shinfo(skb)-&gt;frag_list = list-&gt;next;</div><div class='del'>-			kfree_skb(list);</div><div class='add'>+			consume_skb(list);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* And insert new clone at head. */</div><div class='ctx'> 		if (clone) {</div><div class='hunk'>@@ -1977,10 +2936,12 @@ pull_pages:</div><div class='ctx'> 			skb_frag_unref(skb, i);</div><div class='ctx'> 			eat -= size;</div><div class='ctx'> 		} else {</div><div class='del'>-			skb_shinfo(skb)-&gt;frags[k] = skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[k];</div><div class='add'>+</div><div class='add'>+			*frag = skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 			if (eat) {</div><div class='del'>-				skb_shinfo(skb)-&gt;frags[k].page_offset += eat;</div><div class='del'>-				skb_frag_size_sub(&amp;skb_shinfo(skb)-&gt;frags[k], eat);</div><div class='add'>+				skb_frag_off_add(frag, eat);</div><div class='add'>+				skb_frag_size_sub(frag, eat);</div><div class='ctx'> 				if (!i)</div><div class='ctx'> 					goto end;</div><div class='ctx'> 				eat = 0;</div><div class='hunk'>@@ -2036,6 +2997,9 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)</div><div class='ctx'> 		to     += copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		goto fault;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		int end;</div><div class='ctx'> 		skb_frag_t *f = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='hunk'>@@ -2052,7 +3016,7 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)</div><div class='ctx'> 				copy = len;</div><div class='ctx'> </div><div class='ctx'> 			skb_frag_foreach_page(f,</div><div class='del'>-					      f-&gt;page_offset + offset - start,</div><div class='add'>+					      skb_frag_off(f) + offset - start,</div><div class='ctx'> 					      copy, p, p_off, p_len, copied) {</div><div class='ctx'> 				vaddr = kmap_atomic(p);</div><div class='ctx'> 				memcpy(to + copied, vaddr + p_off, p_len);</div><div class='hunk'>@@ -2135,10 +3099,8 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd,</div><div class='ctx'> /*</div><div class='ctx'>  * Fill page/offset/length into spd, if it can hold more pages.</div><div class='ctx'>  */</div><div class='del'>-static bool spd_fill_page(struct splice_pipe_desc *spd,</div><div class='del'>-			  struct pipe_inode_info *pipe, struct page *page,</div><div class='del'>-			  unsigned int *len, unsigned int offset,</div><div class='del'>-			  bool linear,</div><div class='add'>+static bool spd_fill_page(struct splice_pipe_desc *spd, struct page *page,</div><div class='add'>+			  unsigned int *len, unsigned int offset, bool linear,</div><div class='ctx'> 			  struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(spd-&gt;nr_pages == MAX_SKB_FRAGS))</div><div class='hunk'>@@ -2166,8 +3128,7 @@ static bool __splice_segment(struct page *page, unsigned int poff,</div><div class='ctx'> 			     unsigned int plen, unsigned int *off,</div><div class='ctx'> 			     unsigned int *len,</div><div class='ctx'> 			     struct splice_pipe_desc *spd, bool linear,</div><div class='del'>-			     struct sock *sk,</div><div class='del'>-			     struct pipe_inode_info *pipe)</div><div class='add'>+			     struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (!*len)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -2186,13 +3147,14 @@ static bool __splice_segment(struct page *page, unsigned int poff,</div><div class='ctx'> 	do {</div><div class='ctx'> 		unsigned int flen = min(*len, plen);</div><div class='ctx'> </div><div class='del'>-		if (spd_fill_page(spd, pipe, page, &amp;flen, poff,</div><div class='del'>-				  linear, sk))</div><div class='add'>+		if (spd_fill_page(spd, page, &amp;flen, poff, linear, sk))</div><div class='ctx'> 			return true;</div><div class='ctx'> 		poff += flen;</div><div class='ctx'> 		plen -= flen;</div><div class='ctx'> 		*len -= flen;</div><div class='del'>-	} while (*len &amp;&amp; plen);</div><div class='add'>+		if (!*len)</div><div class='add'>+			return true;</div><div class='add'>+	} while (plen);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -2205,8 +3167,8 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,</div><div class='ctx'> 			      unsigned int *offset, unsigned int *len,</div><div class='ctx'> 			      struct splice_pipe_desc *spd, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	int seg;</div><div class='ctx'> 	struct sk_buff *iter;</div><div class='add'>+	int seg;</div><div class='ctx'> </div><div class='ctx'> 	/* map the linear part :</div><div class='ctx'> 	 * If skb-&gt;head_frag is set, this 'linear' part is backed by a</div><div class='hunk'>@@ -2218,18 +3180,24 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,</div><div class='ctx'> 			     skb_headlen(skb),</div><div class='ctx'> 			     offset, len, spd,</div><div class='ctx'> 			     skb_head_is_locked(skb),</div><div class='del'>-			     sk, pipe))</div><div class='add'>+			     sk))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * then map the fragments</div><div class='ctx'> 	 */</div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	for (seg = 0; seg &lt; skb_shinfo(skb)-&gt;nr_frags; seg++) {</div><div class='ctx'> 		const skb_frag_t *f = &amp;skb_shinfo(skb)-&gt;frags[seg];</div><div class='ctx'> </div><div class='add'>+		if (WARN_ON_ONCE(!skb_frag_page(f)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='ctx'> 		if (__splice_segment(skb_frag_page(f),</div><div class='del'>-				     f-&gt;page_offset, skb_frag_size(f),</div><div class='del'>-				     offset, len, spd, false, sk, pipe))</div><div class='add'>+				     skb_frag_off(f), skb_frag_size(f),</div><div class='add'>+				     offset, len, spd, false, sk))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2277,10 +3245,34 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_splice_bits);</div><div class='ctx'> </div><div class='del'>-/* Send skb data on a socket. Socket must be locked. */</div><div class='del'>-int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset,</div><div class='del'>-			 int len)</div><div class='add'>+static int sendmsg_locked(struct sock *sk, struct msghdr *msg)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock = sk-&gt;sk_socket;</div><div class='add'>+	size_t size = msg_data_left(msg);</div><div class='add'>+</div><div class='add'>+	if (!sock)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sock-&gt;ops-&gt;sendmsg_locked)</div><div class='add'>+		return sock_no_sendmsg_locked(sk, msg, size);</div><div class='add'>+</div><div class='add'>+	return sock-&gt;ops-&gt;sendmsg_locked(sk, msg, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sendmsg_unlocked(struct sock *sk, struct msghdr *msg)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock = sk-&gt;sk_socket;</div><div class='add'>+</div><div class='add'>+	if (!sock)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return sock_sendmsg(sock, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef int (*sendmsg_func)(struct sock *sk, struct msghdr *msg);</div><div class='add'>+static int __skb_send_sock(struct sock *sk, struct sk_buff *skb, int offset,</div><div class='add'>+			   int len, sendmsg_func sendmsg, int flags)</div><div class='ctx'> {</div><div class='add'>+	int more_hint = sk_is_tcp(sk) ? MSG_MORE : 0;</div><div class='ctx'> 	unsigned int orig_len = len;</div><div class='ctx'> 	struct sk_buff *head = skb;</div><div class='ctx'> 	unsigned short fragidx;</div><div class='hunk'>@@ -2297,8 +3289,13 @@ do_frag_list:</div><div class='ctx'> 		kv.iov_base = skb-&gt;data + offset;</div><div class='ctx'> 		kv.iov_len = slen;</div><div class='ctx'> 		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		msg.msg_flags = MSG_DONTWAIT | flags;</div><div class='add'>+		if (slen &lt; len)</div><div class='add'>+			msg.msg_flags |= more_hint;</div><div class='ctx'> </div><div class='del'>-		ret = kernel_sendmsg_locked(sk, &amp;msg, &amp;kv, 1, slen);</div><div class='add'>+		iov_iter_kvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;kv, 1, slen);</div><div class='add'>+		ret = INDIRECT_CALL_2(sendmsg, sendmsg_locked,</div><div class='add'>+				      sendmsg_unlocked, sk, &amp;msg);</div><div class='ctx'> 		if (ret &lt;= 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -2317,21 +3314,33 @@ do_frag_list:</div><div class='ctx'> 	for (fragidx = 0; fragidx &lt; skb_shinfo(skb)-&gt;nr_frags; fragidx++) {</div><div class='ctx'> 		skb_frag_t *frag  = &amp;skb_shinfo(skb)-&gt;frags[fragidx];</div><div class='ctx'> </div><div class='del'>-		if (offset &lt; frag-&gt;size)</div><div class='add'>+		if (offset &lt; skb_frag_size(frag))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		offset -= frag-&gt;size;</div><div class='add'>+		offset -= skb_frag_size(frag);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (; len &amp;&amp; fragidx &lt; skb_shinfo(skb)-&gt;nr_frags; fragidx++) {</div><div class='ctx'> 		skb_frag_t *frag  = &amp;skb_shinfo(skb)-&gt;frags[fragidx];</div><div class='ctx'> </div><div class='del'>-		slen = min_t(size_t, len, frag-&gt;size - offset);</div><div class='add'>+		slen = min_t(size_t, len, skb_frag_size(frag) - offset);</div><div class='ctx'> </div><div class='ctx'> 		while (slen) {</div><div class='del'>-			ret = kernel_sendpage_locked(sk, frag-&gt;page.p,</div><div class='del'>-						     frag-&gt;page_offset + offset,</div><div class='del'>-						     slen, MSG_DONTWAIT);</div><div class='add'>+			struct bio_vec bvec;</div><div class='add'>+			struct msghdr msg = {</div><div class='add'>+				.msg_flags = MSG_SPLICE_PAGES | MSG_DONTWAIT |</div><div class='add'>+					     flags,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			if (slen &lt; len)</div><div class='add'>+				msg.msg_flags |= more_hint;</div><div class='add'>+			bvec_set_page(&amp;bvec, skb_frag_page(frag), slen,</div><div class='add'>+				      skb_frag_off(frag) + offset);</div><div class='add'>+			iov_iter_bvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;bvec, 1,</div><div class='add'>+				      slen);</div><div class='add'>+</div><div class='add'>+			ret = INDIRECT_CALL_2(sendmsg, sendmsg_locked,</div><div class='add'>+					      sendmsg_unlocked, sk, &amp;msg);</div><div class='ctx'> 			if (ret &lt;= 0)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -2363,20 +3372,27 @@ out:</div><div class='ctx'> error:</div><div class='ctx'> 	return orig_len == len ? ret : orig_len - len;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_send_sock_locked);</div><div class='ctx'> </div><div class='del'>-/* Send skb data on a socket. */</div><div class='del'>-int skb_send_sock(struct sock *sk, struct sk_buff *skb, int offset, int len)</div><div class='add'>+/* Send skb data on a socket. Socket must be locked. */</div><div class='add'>+int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset,</div><div class='add'>+			 int len)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	return __skb_send_sock(sk, skb, offset, len, sendmsg_locked, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_send_sock_locked);</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	ret = skb_send_sock_locked(sk, skb, offset, len);</div><div class='del'>-	release_sock(sk);</div><div class='add'>+int skb_send_sock_locked_with_flags(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				    int offset, int len, int flags)</div><div class='add'>+{</div><div class='add'>+	return __skb_send_sock(sk, skb, offset, len, sendmsg_locked, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_send_sock_locked_with_flags);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+/* Send skb data on a socket. Socket must be unlocked. */</div><div class='add'>+int skb_send_sock(struct sock *sk, struct sk_buff *skb, int offset, int len)</div><div class='add'>+{</div><div class='add'>+	return __skb_send_sock(sk, skb, offset, len, sendmsg_unlocked, 0);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_send_sock);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	skb_store_bits - store bits from kernel buffer to skb</div><div class='hunk'>@@ -2409,6 +3425,9 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)</div><div class='ctx'> 		from += copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		goto fault;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		int end;</div><div class='hunk'>@@ -2425,7 +3444,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)</div><div class='ctx'> 				copy = len;</div><div class='ctx'> </div><div class='ctx'> 			skb_frag_foreach_page(frag,</div><div class='del'>-					      frag-&gt;page_offset + offset - start,</div><div class='add'>+					      skb_frag_off(frag) + offset - start,</div><div class='ctx'> 					      copy, p, p_off, p_len, copied) {</div><div class='ctx'> 				vaddr = kmap_atomic(p);</div><div class='ctx'> 				memcpy(vaddr + p_off, from + copied, p_len);</div><div class='hunk'>@@ -2468,8 +3487,7 @@ fault:</div><div class='ctx'> EXPORT_SYMBOL(skb_store_bits);</div><div class='ctx'> </div><div class='ctx'> /* Checksum skb data. */</div><div class='del'>-__wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='del'>-		      __wsum csum, const struct skb_checksum_ops *ops)</div><div class='add'>+__wsum skb_checksum(const struct sk_buff *skb, int offset, int len, __wsum csum)</div><div class='ctx'> {</div><div class='ctx'> 	int start = skb_headlen(skb);</div><div class='ctx'> 	int i, copy = start - offset;</div><div class='hunk'>@@ -2480,13 +3498,16 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='ctx'> 	if (copy &gt; 0) {</div><div class='ctx'> 		if (copy &gt; len)</div><div class='ctx'> 			copy = len;</div><div class='del'>-		csum = ops-&gt;update(skb-&gt;data + offset, copy, csum);</div><div class='add'>+		csum = csum_partial(skb-&gt;data + offset, copy, csum);</div><div class='ctx'> 		if ((len -= copy) == 0)</div><div class='ctx'> 			return csum;</div><div class='ctx'> 		offset += copy;</div><div class='ctx'> 		pos	= copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!skb_frags_readable(skb)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		int end;</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='hunk'>@@ -2504,12 +3525,12 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='ctx'> 				copy = len;</div><div class='ctx'> </div><div class='ctx'> 			skb_frag_foreach_page(frag,</div><div class='del'>-					      frag-&gt;page_offset + offset - start,</div><div class='add'>+					      skb_frag_off(frag) + offset - start,</div><div class='ctx'> 					      copy, p, p_off, p_len, copied) {</div><div class='ctx'> 				vaddr = kmap_atomic(p);</div><div class='del'>-				csum2 = ops-&gt;update(vaddr + p_off, p_len, 0);</div><div class='add'>+				csum2 = csum_partial(vaddr + p_off, p_len, 0);</div><div class='ctx'> 				kunmap_atomic(vaddr);</div><div class='del'>-				csum = ops-&gt;combine(csum, csum2, pos, p_len);</div><div class='add'>+				csum = csum_block_add(csum, csum2, pos);</div><div class='ctx'> 				pos += p_len;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -2530,9 +3551,9 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='ctx'> 			__wsum csum2;</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='del'>-			csum2 = __skb_checksum(frag_iter, offset - start,</div><div class='del'>-					       copy, 0, ops);</div><div class='del'>-			csum = ops-&gt;combine(csum, csum2, pos, copy);</div><div class='add'>+			csum2 = skb_checksum(frag_iter, offset - start, copy,</div><div class='add'>+					     0);</div><div class='add'>+			csum = csum_block_add(csum, csum2, pos);</div><div class='ctx'> 			if ((len -= copy) == 0)</div><div class='ctx'> 				return csum;</div><div class='ctx'> 			offset += copy;</div><div class='hunk'>@@ -2544,36 +3565,25 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='ctx'> </div><div class='ctx'> 	return csum;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__skb_checksum);</div><div class='del'>-</div><div class='del'>-__wsum skb_checksum(const struct sk_buff *skb, int offset,</div><div class='del'>-		    int len, __wsum csum)</div><div class='del'>-{</div><div class='del'>-	const struct skb_checksum_ops ops = {</div><div class='del'>-		.update  = csum_partial_ext,</div><div class='del'>-		.combine = csum_block_add_ext,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return __skb_checksum(skb, offset, len, csum, &amp;ops);</div><div class='del'>-}</div><div class='ctx'> EXPORT_SYMBOL(skb_checksum);</div><div class='ctx'> </div><div class='ctx'> /* Both of above in one bottle. */</div><div class='ctx'> </div><div class='ctx'> __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,</div><div class='del'>-				    u8 *to, int len, __wsum csum)</div><div class='add'>+				    u8 *to, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int start = skb_headlen(skb);</div><div class='ctx'> 	int i, copy = start - offset;</div><div class='ctx'> 	struct sk_buff *frag_iter;</div><div class='ctx'> 	int pos = 0;</div><div class='add'>+	__wsum csum = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy header. */</div><div class='ctx'> 	if (copy &gt; 0) {</div><div class='ctx'> 		if (copy &gt; len)</div><div class='ctx'> 			copy = len;</div><div class='ctx'> 		csum = csum_partial_copy_nocheck(skb-&gt;data + offset, to,</div><div class='del'>-						 copy, csum);</div><div class='add'>+						 copy);</div><div class='ctx'> 		if ((len -= copy) == 0)</div><div class='ctx'> 			return csum;</div><div class='ctx'> 		offset += copy;</div><div class='hunk'>@@ -2581,6 +3591,9 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,</div><div class='ctx'> 		pos	= copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		int end;</div><div class='ctx'> </div><div class='hunk'>@@ -2598,12 +3611,12 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,</div><div class='ctx'> 				copy = len;</div><div class='ctx'> </div><div class='ctx'> 			skb_frag_foreach_page(frag,</div><div class='del'>-					      frag-&gt;page_offset + offset - start,</div><div class='add'>+					      skb_frag_off(frag) + offset - start,</div><div class='ctx'> 					      copy, p, p_off, p_len, copied) {</div><div class='ctx'> 				vaddr = kmap_atomic(p);</div><div class='ctx'> 				csum2 = csum_partial_copy_nocheck(vaddr + p_off,</div><div class='ctx'> 								  to + copied,</div><div class='del'>-								  p_len, 0);</div><div class='add'>+								  p_len);</div><div class='ctx'> 				kunmap_atomic(vaddr);</div><div class='ctx'> 				csum = csum_block_add(csum, csum2, pos);</div><div class='ctx'> 				pos += p_len;</div><div class='hunk'>@@ -2629,7 +3642,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,</div><div class='ctx'> 				copy = len;</div><div class='ctx'> 			csum2 = skb_copy_and_csum_bits(frag_iter,</div><div class='ctx'> 						       offset - start,</div><div class='del'>-						       to, copy, 0);</div><div class='add'>+						       to, copy);</div><div class='ctx'> 			csum = csum_block_add(csum, csum2, pos);</div><div class='ctx'> 			if ((len -= copy) == 0)</div><div class='ctx'> 				return csum;</div><div class='hunk'>@@ -2644,31 +3657,136 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_copy_and_csum_bits);</div><div class='ctx'> </div><div class='del'>-static __wsum warn_crc32c_csum_update(const void *buff, int len, __wsum sum)</div><div class='add'>+#ifdef CONFIG_NET_CRC32C</div><div class='add'>+u32 skb_crc32c(const struct sk_buff *skb, int offset, int len, u32 crc)</div><div class='ctx'> {</div><div class='del'>-	net_warn_ratelimited(</div><div class='del'>-		"%s: attempt to compute crc32c without libcrc32c.ko\n",</div><div class='del'>-		__func__);</div><div class='del'>-	return 0;</div><div class='add'>+	int start = skb_headlen(skb);</div><div class='add'>+	int i, copy = start - offset;</div><div class='add'>+	struct sk_buff *frag_iter;</div><div class='add'>+</div><div class='add'>+	if (copy &gt; 0) {</div><div class='add'>+		copy = min(copy, len);</div><div class='add'>+		crc = crc32c(crc, skb-&gt;data + offset, copy);</div><div class='add'>+		len -= copy;</div><div class='add'>+		if (len == 0)</div><div class='add'>+			return crc;</div><div class='add'>+		offset += copy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!skb_frags_readable(skb)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+		int end;</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+		WARN_ON(start &gt; offset + len);</div><div class='add'>+</div><div class='add'>+		end = start + skb_frag_size(frag);</div><div class='add'>+		copy = end - offset;</div><div class='add'>+		if (copy &gt; 0) {</div><div class='add'>+			u32 p_off, p_len, copied;</div><div class='add'>+			struct page *p;</div><div class='add'>+			u8 *vaddr;</div><div class='add'>+</div><div class='add'>+			copy = min(copy, len);</div><div class='add'>+			skb_frag_foreach_page(frag,</div><div class='add'>+					      skb_frag_off(frag) + offset - start,</div><div class='add'>+					      copy, p, p_off, p_len, copied) {</div><div class='add'>+				vaddr = kmap_atomic(p);</div><div class='add'>+				crc = crc32c(crc, vaddr + p_off, p_len);</div><div class='add'>+				kunmap_atomic(vaddr);</div><div class='add'>+			}</div><div class='add'>+			len -= copy;</div><div class='add'>+			if (len == 0)</div><div class='add'>+				return crc;</div><div class='add'>+			offset += copy;</div><div class='add'>+		}</div><div class='add'>+		start = end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_walk_frags(skb, frag_iter) {</div><div class='add'>+		int end;</div><div class='add'>+</div><div class='add'>+		WARN_ON(start &gt; offset + len);</div><div class='add'>+</div><div class='add'>+		end = start + frag_iter-&gt;len;</div><div class='add'>+		copy = end - offset;</div><div class='add'>+		if (copy &gt; 0) {</div><div class='add'>+			copy = min(copy, len);</div><div class='add'>+			crc = skb_crc32c(frag_iter, offset - start, copy, crc);</div><div class='add'>+			len -= copy;</div><div class='add'>+			if (len == 0)</div><div class='add'>+				return crc;</div><div class='add'>+			offset += copy;</div><div class='add'>+		}</div><div class='add'>+		start = end;</div><div class='add'>+	}</div><div class='add'>+	BUG_ON(len);</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(skb_crc32c);</div><div class='add'>+#endif /* CONFIG_NET_CRC32C */</div><div class='ctx'> </div><div class='del'>-static __wsum warn_crc32c_csum_combine(__wsum csum, __wsum csum2,</div><div class='del'>-				       int offset, int len)</div><div class='add'>+__sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)</div><div class='ctx'> {</div><div class='del'>-	net_warn_ratelimited(</div><div class='del'>-		"%s: attempt to compute crc32c without libcrc32c.ko\n",</div><div class='del'>-		__func__);</div><div class='del'>-	return 0;</div><div class='add'>+	__sum16 sum;</div><div class='add'>+</div><div class='add'>+	sum = csum_fold(skb_checksum(skb, 0, len, skb-&gt;csum));</div><div class='add'>+	/* See comments in __skb_checksum_complete(). */</div><div class='add'>+	if (likely(!sum)) {</div><div class='add'>+		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='add'>+		    !skb-&gt;csum_complete_sw)</div><div class='add'>+			netdev_rx_csum_fault(skb-&gt;dev, skb);</div><div class='add'>+	}</div><div class='add'>+	if (!skb_shared(skb))</div><div class='add'>+		skb-&gt;csum_valid = !sum;</div><div class='add'>+	return sum;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__skb_checksum_complete_head);</div><div class='ctx'> </div><div class='del'>-static const struct skb_checksum_ops default_crc32c_ops = {</div><div class='del'>-	.update  = warn_crc32c_csum_update,</div><div class='del'>-	.combine = warn_crc32c_csum_combine,</div><div class='del'>-};</div><div class='add'>+/* This function assumes skb-&gt;csum already holds pseudo header's checksum,</div><div class='add'>+ * which has been changed from the hardware checksum, for example, by</div><div class='add'>+ * __skb_checksum_validate_complete(). And, the original skb-&gt;csum must</div><div class='add'>+ * have been validated unsuccessfully for CHECKSUM_COMPLETE case.</div><div class='add'>+ *</div><div class='add'>+ * It returns non-zero if the recomputed checksum is still invalid, otherwise</div><div class='add'>+ * zero. The new checksum is stored back into skb-&gt;csum unless the skb is</div><div class='add'>+ * shared.</div><div class='add'>+ */</div><div class='add'>+__sum16 __skb_checksum_complete(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__wsum csum;</div><div class='add'>+	__sum16 sum;</div><div class='ctx'> </div><div class='del'>-const struct skb_checksum_ops *crc32c_csum_stub __read_mostly =</div><div class='del'>-	&amp;default_crc32c_ops;</div><div class='del'>-EXPORT_SYMBOL(crc32c_csum_stub);</div><div class='add'>+	csum = skb_checksum(skb, 0, skb-&gt;len, 0);</div><div class='add'>+</div><div class='add'>+	sum = csum_fold(csum_add(skb-&gt;csum, csum));</div><div class='add'>+	/* This check is inverted, because we already knew the hardware</div><div class='add'>+	 * checksum is invalid before calling this function. So, if the</div><div class='add'>+	 * re-computed checksum is valid instead, then we have a mismatch</div><div class='add'>+	 * between the original skb-&gt;csum and skb_checksum(). This means either</div><div class='add'>+	 * the original hardware checksum is incorrect or we screw up skb-&gt;csum</div><div class='add'>+	 * when moving skb-&gt;data around.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(!sum)) {</div><div class='add'>+		if (unlikely(skb-&gt;ip_summed == CHECKSUM_COMPLETE) &amp;&amp;</div><div class='add'>+		    !skb-&gt;csum_complete_sw)</div><div class='add'>+			netdev_rx_csum_fault(skb-&gt;dev, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb_shared(skb)) {</div><div class='add'>+		/* Save full packet checksum */</div><div class='add'>+		skb-&gt;csum = csum;</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+		skb-&gt;csum_complete_sw = 1;</div><div class='add'>+		skb-&gt;csum_valid = !sum;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__skb_checksum_complete);</div><div class='ctx'> </div><div class='ctx'>  /**</div><div class='ctx'>  *	skb_zerocopy_headlen - Calculate headroom needed for skb_zerocopy()</div><div class='hunk'>@@ -2684,8 +3802,11 @@ skb_zerocopy_headlen(const struct sk_buff *from)</div><div class='ctx'> </div><div class='ctx'> 	if (!from-&gt;head_frag ||</div><div class='ctx'> 	    skb_headlen(from) &lt; L1_CACHE_BYTES ||</div><div class='del'>-	    skb_shinfo(from)-&gt;nr_frags &gt;= MAX_SKB_FRAGS)</div><div class='add'>+	    skb_shinfo(from)-&gt;nr_frags &gt;= MAX_SKB_FRAGS) {</div><div class='ctx'> 		hlen = skb_headlen(from);</div><div class='add'>+		if (!hlen)</div><div class='add'>+			hlen = from-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_has_frag_list(from))</div><div class='ctx'> 		hlen = from-&gt;len;</div><div class='hunk'>@@ -2737,16 +3858,15 @@ skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len, int hlen)</div><div class='ctx'> 		if (plen) {</div><div class='ctx'> 			page = virt_to_head_page(from-&gt;head);</div><div class='ctx'> 			offset = from-&gt;data - (unsigned char *)page_address(page);</div><div class='del'>-			__skb_fill_page_desc(to, 0, page, offset, plen);</div><div class='add'>+			__skb_fill_netmem_desc(to, 0, page_to_netmem(page),</div><div class='add'>+					       offset, plen);</div><div class='ctx'> 			get_page(page);</div><div class='ctx'> 			j = 1;</div><div class='ctx'> 			len -= plen;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	to-&gt;truesize += len + plen;</div><div class='del'>-	to-&gt;len += len + plen;</div><div class='del'>-	to-&gt;data_len += len + plen;</div><div class='add'>+	skb_len_add(to, len + plen);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb_orphan_frags(from, GFP_ATOMIC))) {</div><div class='ctx'> 		skb_tx_error(from);</div><div class='hunk'>@@ -2755,11 +3875,15 @@ skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len, int hlen)</div><div class='ctx'> 	skb_zerocopy_clone(to, from, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(from)-&gt;nr_frags; i++) {</div><div class='add'>+		int size;</div><div class='add'>+</div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			break;</div><div class='ctx'> 		skb_shinfo(to)-&gt;frags[j] = skb_shinfo(from)-&gt;frags[i];</div><div class='del'>-		skb_shinfo(to)-&gt;frags[j].size = min_t(int, skb_shinfo(to)-&gt;frags[j].size, len);</div><div class='del'>-		len -= skb_shinfo(to)-&gt;frags[j].size;</div><div class='add'>+		size = min_t(int, skb_frag_size(&amp;skb_shinfo(to)-&gt;frags[j]),</div><div class='add'>+					len);</div><div class='add'>+		skb_frag_size_set(&amp;skb_shinfo(to)-&gt;frags[j], size);</div><div class='add'>+		len -= size;</div><div class='ctx'> 		skb_frag_ref(to, j);</div><div class='ctx'> 		j++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2786,7 +3910,7 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to)</div><div class='ctx'> 	csum = 0;</div><div class='ctx'> 	if (csstart != skb-&gt;len)</div><div class='ctx'> 		csum = skb_copy_and_csum_bits(skb, csstart, to + csstart,</div><div class='del'>-					      skb-&gt;len - csstart, 0);</div><div class='add'>+					      skb-&gt;len - csstart);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='ctx'> 		long csstuff = csstart + skb-&gt;csum_offset;</div><div class='hunk'>@@ -2838,20 +3962,32 @@ struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)</div><div class='ctx'> EXPORT_SYMBOL(skb_dequeue_tail);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	skb_queue_purge - empty a list</div><div class='add'>+ *	skb_queue_purge_reason - empty a list</div><div class='ctx'>  *	@list: list to empty</div><div class='add'>+ *	@reason: drop reason</div><div class='ctx'>  *</div><div class='ctx'>  *	Delete all buffers on an &amp;sk_buff list. Each buffer is removed from</div><div class='ctx'>  *	the list and one reference dropped. This function takes the list</div><div class='ctx'>  *	lock and is atomic with respect to other list locking functions.</div><div class='ctx'>  */</div><div class='del'>-void skb_queue_purge(struct sk_buff_head *list)</div><div class='add'>+void skb_queue_purge_reason(struct sk_buff_head *list,</div><div class='add'>+			    enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	while ((skb = skb_dequeue(list)) != NULL)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	struct sk_buff_head tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty_lockless(list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;tmp);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='add'>+	skb_queue_splice_init(list, &amp;tmp);</div><div class='add'>+	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	__skb_queue_purge_reason(&amp;tmp, reason);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(skb_queue_purge);</div><div class='add'>+EXPORT_SYMBOL(skb_queue_purge_reason);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	skb_rbtree_purge - empty a skb rbtree</div><div class='hunk'>@@ -2879,6 +4015,27 @@ unsigned int skb_rbtree_purge(struct rb_root *root)</div><div class='ctx'> 	return sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void skb_errqueue_purge(struct sk_buff_head *list)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *next;</div><div class='add'>+	struct sk_buff_head kill;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;kill);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='add'>+	skb_queue_walk_safe(list, skb, next) {</div><div class='add'>+		if (SKB_EXT_ERR(skb)-&gt;ee.ee_origin == SO_EE_ORIGIN_ZEROCOPY ||</div><div class='add'>+		    SKB_EXT_ERR(skb)-&gt;ee.ee_origin == SO_EE_ORIGIN_TIMESTAMPING)</div><div class='add'>+			continue;</div><div class='add'>+		__skb_unlink(skb, list);</div><div class='add'>+		__skb_queue_tail(&amp;kill, skb);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='add'>+	__skb_queue_purge(&amp;kill);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_errqueue_purge);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	skb_queue_head - queue a buffer at the list head</div><div class='ctx'>  *	@list: list to use</div><div class='hunk'>@@ -2961,28 +4118,6 @@ void skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_append);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	skb_insert	-	insert a buffer</div><div class='del'>- *	@old: buffer to insert before</div><div class='del'>- *	@newsk: buffer to insert</div><div class='del'>- *	@list: list to use</div><div class='del'>- *</div><div class='del'>- *	Place a packet before a given packet in a list. The list locks are</div><div class='del'>- * 	taken and this function is atomic with respect to other list locked</div><div class='del'>- *	calls.</div><div class='del'>- *</div><div class='del'>- *	A buffer cannot be placed on two lists at the same time.</div><div class='del'>- */</div><div class='del'>-void skb_insert(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='del'>-	__skb_insert(newsk, old-&gt;prev, old, list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(skb_insert);</div><div class='del'>-</div><div class='ctx'> static inline void skb_split_inside_header(struct sk_buff *skb,</div><div class='ctx'> 					   struct sk_buff* skb1,</div><div class='ctx'> 					   const u32 len, const int pos)</div><div class='hunk'>@@ -2996,6 +4131,7 @@ static inline void skb_split_inside_header(struct sk_buff *skb,</div><div class='ctx'> 		skb_shinfo(skb1)-&gt;frags[i] = skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='ctx'> 	skb_shinfo(skb1)-&gt;nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	skb1-&gt;unreadable	   = skb-&gt;unreadable;</div><div class='ctx'> 	skb_shinfo(skb)-&gt;nr_frags  = 0;</div><div class='ctx'> 	skb1-&gt;data_len		   = skb-&gt;data_len;</div><div class='ctx'> 	skb1-&gt;len		   += skb1-&gt;data_len;</div><div class='hunk'>@@ -3032,7 +4168,7 @@ static inline void skb_split_no_header(struct sk_buff *skb,</div><div class='ctx'> 				 * 2. Split is accurately. We make this.</div><div class='ctx'> 				 */</div><div class='ctx'> 				skb_frag_ref(skb, i);</div><div class='del'>-				skb_shinfo(skb1)-&gt;frags[0].page_offset += len - pos;</div><div class='add'>+				skb_frag_off_add(&amp;skb_shinfo(skb1)-&gt;frags[0], len - pos);</div><div class='ctx'> 				skb_frag_size_sub(&amp;skb_shinfo(skb1)-&gt;frags[0], len - pos);</div><div class='ctx'> 				skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[i], len - pos);</div><div class='ctx'> 				skb_shinfo(skb)-&gt;nr_frags++;</div><div class='hunk'>@@ -3043,6 +4179,8 @@ static inline void skb_split_no_header(struct sk_buff *skb,</div><div class='ctx'> 		pos += size;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb_shinfo(skb1)-&gt;nr_frags = k;</div><div class='add'>+</div><div class='add'>+	skb1-&gt;unreadable = skb-&gt;unreadable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3054,9 +4192,11 @@ static inline void skb_split_no_header(struct sk_buff *skb,</div><div class='ctx'> void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	int pos = skb_headlen(skb);</div><div class='add'>+	const int zc_flags = SKBFL_SHARED_FRAG | SKBFL_PURE_ZEROCOPY;</div><div class='ctx'> </div><div class='del'>-	skb_shinfo(skb1)-&gt;tx_flags |= skb_shinfo(skb)-&gt;tx_flags &amp;</div><div class='del'>-				      SKBTX_SHARED_FRAG;</div><div class='add'>+	skb_zcopy_downgrade_managed(skb);</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb1)-&gt;flags |= skb_shinfo(skb)-&gt;flags &amp; zc_flags;</div><div class='ctx'> 	skb_zerocopy_clone(skb1, skb, 0);</div><div class='ctx'> 	if (len &lt; pos)	/* Split line is inside header. */</div><div class='ctx'> 		skb_split_inside_header(skb, skb1, len, pos);</div><div class='hunk'>@@ -3071,7 +4211,7 @@ EXPORT_SYMBOL(skb_split);</div><div class='ctx'>  */</div><div class='ctx'> static int skb_prepare_for_shift(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return skb_cloned(skb) &amp;&amp; pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='add'>+	return skb_unclone_keeptruesize(skb, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3095,7 +4235,7 @@ static int skb_prepare_for_shift(struct sk_buff *skb)</div><div class='ctx'> int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> {</div><div class='ctx'> 	int from, to, merge, todo;</div><div class='del'>-	struct skb_frag_struct *fragfrom, *fragto;</div><div class='add'>+	skb_frag_t *fragfrom, *fragto;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(shiftlen &gt; skb-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -3104,6 +4244,9 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> 	if (skb_zcopy(tgt) || skb_zcopy(skb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(tgt-&gt;pp_recycle != skb-&gt;pp_recycle);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb_cmp_decrypted(tgt, skb));</div><div class='add'>+</div><div class='ctx'> 	todo = shiftlen;</div><div class='ctx'> 	from = 0;</div><div class='ctx'> 	to = skb_shinfo(tgt)-&gt;nr_frags;</div><div class='hunk'>@@ -3112,9 +4255,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> 	/* Actual merge is delayed until the point when we know we can</div><div class='ctx'> 	 * commit all, so that we don't have to undo partial changes</div><div class='ctx'> 	 */</div><div class='del'>-	if (!to ||</div><div class='del'>-	    !skb_can_coalesce(tgt, to, skb_frag_page(fragfrom),</div><div class='del'>-			      fragfrom-&gt;page_offset)) {</div><div class='add'>+	if (!skb_can_coalesce(tgt, to, skb_frag_page(fragfrom),</div><div class='add'>+			      skb_frag_off(fragfrom))) {</div><div class='ctx'> 		merge = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		merge = to - 1;</div><div class='hunk'>@@ -3131,7 +4273,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> </div><div class='ctx'> 			skb_frag_size_add(fragto, shiftlen);</div><div class='ctx'> 			skb_frag_size_sub(fragfrom, shiftlen);</div><div class='del'>-			fragfrom-&gt;page_offset += shiftlen;</div><div class='add'>+			skb_frag_off_add(fragfrom, shiftlen);</div><div class='ctx'> </div><div class='ctx'> 			goto onlymerged;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3162,11 +4304,11 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='ctx'> 			__skb_frag_ref(fragfrom);</div><div class='del'>-			fragto-&gt;page = fragfrom-&gt;page;</div><div class='del'>-			fragto-&gt;page_offset = fragfrom-&gt;page_offset;</div><div class='add'>+			skb_frag_page_copy(fragto, fragfrom);</div><div class='add'>+			skb_frag_off_copy(fragto, fragfrom);</div><div class='ctx'> 			skb_frag_size_set(fragto, todo);</div><div class='ctx'> </div><div class='del'>-			fragfrom-&gt;page_offset += todo;</div><div class='add'>+			skb_frag_off_add(fragfrom, todo);</div><div class='ctx'> 			skb_frag_size_sub(fragfrom, todo);</div><div class='ctx'> 			todo = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3183,7 +4325,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)</div><div class='ctx'> 		fragto = &amp;skb_shinfo(tgt)-&gt;frags[merge];</div><div class='ctx'> </div><div class='ctx'> 		skb_frag_size_add(fragto, skb_frag_size(fragfrom));</div><div class='del'>-		__skb_frag_unref(fragfrom);</div><div class='add'>+		__skb_frag_unref(fragfrom, skb-&gt;pp_recycle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reposition in the original skb */</div><div class='hunk'>@@ -3201,13 +4343,8 @@ onlymerged:</div><div class='ctx'> 	tgt-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='del'>-	/* Yak, is it really working this way? Some helper please? */</div><div class='del'>-	skb-&gt;len -= shiftlen;</div><div class='del'>-	skb-&gt;data_len -= shiftlen;</div><div class='del'>-	skb-&gt;truesize -= shiftlen;</div><div class='del'>-	tgt-&gt;len += shiftlen;</div><div class='del'>-	tgt-&gt;data_len += shiftlen;</div><div class='del'>-	tgt-&gt;truesize += shiftlen;</div><div class='add'>+	skb_len_add(skb, -shiftlen);</div><div class='add'>+	skb_len_add(tgt, shiftlen);</div><div class='ctx'> </div><div class='ctx'> 	return shiftlen;</div><div class='ctx'> }</div><div class='hunk'>@@ -3230,6 +4367,7 @@ void skb_prepare_seq_read(struct sk_buff *skb, unsigned int from,</div><div class='ctx'> 	st-&gt;root_skb = st-&gt;cur_skb = skb;</div><div class='ctx'> 	st-&gt;frag_idx = st-&gt;stepped_offset = 0;</div><div class='ctx'> 	st-&gt;frag_data = NULL;</div><div class='add'>+	st-&gt;frag_off = 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_prepare_seq_read);</div><div class='ctx'> </div><div class='hunk'>@@ -3280,18 +4418,34 @@ next_skb:</div><div class='ctx'> 		return block_limit - abs_offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!skb_frags_readable(st-&gt;cur_skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (st-&gt;frag_idx == 0 &amp;&amp; !st-&gt;frag_data)</div><div class='ctx'> 		st-&gt;stepped_offset += skb_headlen(st-&gt;cur_skb);</div><div class='ctx'> </div><div class='ctx'> 	while (st-&gt;frag_idx &lt; skb_shinfo(st-&gt;cur_skb)-&gt;nr_frags) {</div><div class='add'>+		unsigned int pg_idx, pg_off, pg_sz;</div><div class='add'>+</div><div class='ctx'> 		frag = &amp;skb_shinfo(st-&gt;cur_skb)-&gt;frags[st-&gt;frag_idx];</div><div class='del'>-		block_limit = skb_frag_size(frag) + st-&gt;stepped_offset;</div><div class='ctx'> </div><div class='add'>+		pg_idx = 0;</div><div class='add'>+		pg_off = skb_frag_off(frag);</div><div class='add'>+		pg_sz = skb_frag_size(frag);</div><div class='add'>+</div><div class='add'>+		if (skb_frag_must_loop(skb_frag_page(frag))) {</div><div class='add'>+			pg_idx = (pg_off + st-&gt;frag_off) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			pg_off = offset_in_page(pg_off + st-&gt;frag_off);</div><div class='add'>+			pg_sz = min_t(unsigned int, pg_sz - st-&gt;frag_off,</div><div class='add'>+						    PAGE_SIZE - pg_off);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		block_limit = pg_sz + st-&gt;stepped_offset;</div><div class='ctx'> 		if (abs_offset &lt; block_limit) {</div><div class='ctx'> 			if (!st-&gt;frag_data)</div><div class='del'>-				st-&gt;frag_data = kmap_atomic(skb_frag_page(frag));</div><div class='add'>+				st-&gt;frag_data = kmap_atomic(skb_frag_page(frag) + pg_idx);</div><div class='ctx'> </div><div class='del'>-			*data = (u8 *) st-&gt;frag_data + frag-&gt;page_offset +</div><div class='add'>+			*data = (u8 *)st-&gt;frag_data + pg_off +</div><div class='ctx'> 				(abs_offset - st-&gt;stepped_offset);</div><div class='ctx'> </div><div class='ctx'> 			return block_limit - abs_offset;</div><div class='hunk'>@@ -3302,8 +4456,12 @@ next_skb:</div><div class='ctx'> 			st-&gt;frag_data = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		st-&gt;frag_idx++;</div><div class='del'>-		st-&gt;stepped_offset += skb_frag_size(frag);</div><div class='add'>+		st-&gt;stepped_offset += pg_sz;</div><div class='add'>+		st-&gt;frag_off += pg_sz;</div><div class='add'>+		if (st-&gt;frag_off == skb_frag_size(frag)) {</div><div class='add'>+			st-&gt;frag_off = 0;</div><div class='add'>+			st-&gt;frag_idx++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (st-&gt;frag_data) {</div><div class='hunk'>@@ -3339,6 +4497,41 @@ void skb_abort_seq_read(struct skb_seq_state *st)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_abort_seq_read);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * skb_copy_seq_read() - copy from a skb_seq_state to a buffer</div><div class='add'>+ * @st: source skb_seq_state</div><div class='add'>+ * @offset: offset in source</div><div class='add'>+ * @to: destination buffer</div><div class='add'>+ * @len: number of bytes to copy</div><div class='add'>+ *</div><div class='add'>+ * Copy @len bytes from @offset bytes into the source @st to the destination</div><div class='add'>+ * buffer @to. `offset` should increase (or be unchanged) with each subsequent</div><div class='add'>+ * call to this function. If offset needs to decrease from the previous use `st`</div><div class='add'>+ * should be reset first.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or -EINVAL if the copy ended early</div><div class='add'>+ */</div><div class='add'>+int skb_copy_seq_read(struct skb_seq_state *st, int offset, void *to, int len)</div><div class='add'>+{</div><div class='add'>+	const u8 *data;</div><div class='add'>+	u32 sqlen;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		sqlen = skb_seq_read(offset, &amp;data, st);</div><div class='add'>+		if (sqlen == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (sqlen &gt;= len) {</div><div class='add'>+			memcpy(to, data, len);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		memcpy(to, data, sqlen);</div><div class='add'>+		to += sqlen;</div><div class='add'>+		offset += sqlen;</div><div class='add'>+		len -= sqlen;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_copy_seq_read);</div><div class='add'>+</div><div class='ctx'> #define TS_SKB_CB(state)	((struct skb_seq_state *) &amp;((state)-&gt;cb))</div><div class='ctx'> </div><div class='ctx'> static unsigned int skb_ts_get_next_block(unsigned int offset, const u8 **text,</div><div class='hunk'>@@ -3368,87 +4561,33 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state)</div><div class='ctx'> unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,</div><div class='ctx'> 			   unsigned int to, struct ts_config *config)</div><div class='ctx'> {</div><div class='add'>+	unsigned int patlen = config-&gt;ops-&gt;get_pattern_len(config);</div><div class='ctx'> 	struct ts_state state;</div><div class='ctx'> 	unsigned int ret;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(struct skb_seq_state) &gt; sizeof(state.cb));</div><div class='add'>+</div><div class='ctx'> 	config-&gt;get_next_block = skb_ts_get_next_block;</div><div class='ctx'> 	config-&gt;finish = skb_ts_finish;</div><div class='ctx'> </div><div class='ctx'> 	skb_prepare_seq_read(skb, from, to, TS_SKB_CB(&amp;state));</div><div class='ctx'> </div><div class='ctx'> 	ret = textsearch_find(config, &amp;state);</div><div class='del'>-	return (ret &lt;= to - from ? ret : UINT_MAX);</div><div class='add'>+	return (ret + patlen &lt;= to - from ? ret : UINT_MAX);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_find_text);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * skb_append_datato_frags - append the user data to a skb</div><div class='del'>- * @sk: sock  structure</div><div class='del'>- * @skb: skb structure to be appended with user data.</div><div class='del'>- * @getfrag: call back function to be used for getting the user data</div><div class='del'>- * @from: pointer to user message iov</div><div class='del'>- * @length: length of the iov message</div><div class='del'>- *</div><div class='del'>- * Description: This procedure append the user data in the fragment part</div><div class='del'>- * of the skb if any page alloc fails user this procedure returns  -ENOMEM</div><div class='del'>- */</div><div class='del'>-int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			int (*getfrag)(void *from, char *to, int offset,</div><div class='del'>-					int len, int odd, struct sk_buff *skb),</div><div class='del'>-			void *from, int length)</div><div class='del'>-{</div><div class='del'>-	int frg_cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	int copy;</div><div class='del'>-	int offset = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	struct page_frag *pfrag = &amp;current-&gt;task_frag;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Return error if we don't have space for new frag */</div><div class='del'>-		if (frg_cnt &gt;= MAX_SKB_FRAGS)</div><div class='del'>-			return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-		if (!sk_page_frag_refill(sk, pfrag))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		/* copy the user data to page */</div><div class='del'>-		copy = min_t(int, length, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='del'>-</div><div class='del'>-		ret = getfrag(from, page_address(pfrag-&gt;page) + pfrag-&gt;offset,</div><div class='del'>-			      offset, copy, 0, skb);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		/* copy was successful so update the size parameters */</div><div class='del'>-		skb_fill_page_desc(skb, frg_cnt, pfrag-&gt;page, pfrag-&gt;offset,</div><div class='del'>-				   copy);</div><div class='del'>-		frg_cnt++;</div><div class='del'>-		pfrag-&gt;offset += copy;</div><div class='del'>-		get_page(pfrag-&gt;page);</div><div class='del'>-</div><div class='del'>-		skb-&gt;truesize += copy;</div><div class='del'>-		refcount_add(copy, &amp;sk-&gt;sk_wmem_alloc);</div><div class='del'>-		skb-&gt;len += copy;</div><div class='del'>-		skb-&gt;data_len += copy;</div><div class='del'>-		offset += copy;</div><div class='del'>-		length -= copy;</div><div class='del'>-</div><div class='del'>-	} while (length &gt; 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(skb_append_datato_frags);</div><div class='del'>-</div><div class='ctx'> int skb_append_pagefrags(struct sk_buff *skb, struct page *page,</div><div class='del'>-			 int offset, size_t size)</div><div class='add'>+			 int offset, size_t size, size_t max_frags)</div><div class='ctx'> {</div><div class='ctx'> 	int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_can_coalesce(skb, i, page, offset)) {</div><div class='ctx'> 		skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[i - 1], size);</div><div class='del'>-	} else if (i &lt; MAX_SKB_FRAGS) {</div><div class='add'>+	} else if (i &lt; max_frags) {</div><div class='add'>+		skb_zcopy_downgrade_managed(skb);</div><div class='ctx'> 		get_page(page);</div><div class='del'>-		skb_fill_page_desc(skb, i, page, offset, size);</div><div class='add'>+		skb_fill_page_desc_noacc(skb, i, page, offset, size);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3485,13 +4624,104 @@ static inline skb_frag_t skb_head_frag_to_page_desc(struct sk_buff *frag_skb)</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	page = virt_to_head_page(frag_skb-&gt;head);</div><div class='del'>-	head_frag.page.p = page;</div><div class='del'>-	head_frag.page_offset = frag_skb-&gt;data -</div><div class='del'>-		(unsigned char *)page_address(page);</div><div class='del'>-	head_frag.size = skb_headlen(frag_skb);</div><div class='add'>+	skb_frag_fill_page_desc(&amp;head_frag, page, frag_skb-&gt;data -</div><div class='add'>+				(unsigned char *)page_address(page),</div><div class='add'>+				skb_headlen(frag_skb));</div><div class='ctx'> 	return head_frag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sk_buff *skb_segment_list(struct sk_buff *skb,</div><div class='add'>+				 netdev_features_t features,</div><div class='add'>+				 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *list_skb = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+	unsigned int tnl_hlen = skb_tnl_header_len(skb);</div><div class='add'>+	unsigned int delta_truesize = 0;</div><div class='add'>+	unsigned int delta_len = 0;</div><div class='add'>+	struct sk_buff *tail = NULL;</div><div class='add'>+	struct sk_buff *nskb, *tmp;</div><div class='add'>+	int len_diff, err;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, -skb_network_offset(skb) + offset);</div><div class='add'>+</div><div class='add'>+	/* Ensure the head is writeable before touching the shared info */</div><div class='add'>+	err = skb_unclone(skb, GFP_ATOMIC);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_linearize;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;frag_list = NULL;</div><div class='add'>+</div><div class='add'>+	while (list_skb) {</div><div class='add'>+		nskb = list_skb;</div><div class='add'>+		list_skb = list_skb-&gt;next;</div><div class='add'>+</div><div class='add'>+		err = 0;</div><div class='add'>+		delta_truesize += nskb-&gt;truesize;</div><div class='add'>+		if (skb_shared(nskb)) {</div><div class='add'>+			tmp = skb_clone(nskb, GFP_ATOMIC);</div><div class='add'>+			if (tmp) {</div><div class='add'>+				consume_skb(nskb);</div><div class='add'>+				nskb = tmp;</div><div class='add'>+				err = skb_unclone(nskb, GFP_ATOMIC);</div><div class='add'>+			} else {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!tail)</div><div class='add'>+			skb-&gt;next = nskb;</div><div class='add'>+		else</div><div class='add'>+			tail-&gt;next = nskb;</div><div class='add'>+</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			nskb-&gt;next = list_skb;</div><div class='add'>+			goto err_linearize;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tail = nskb;</div><div class='add'>+</div><div class='add'>+		delta_len += nskb-&gt;len;</div><div class='add'>+</div><div class='add'>+		skb_push(nskb, -skb_network_offset(nskb) + offset);</div><div class='add'>+</div><div class='add'>+		skb_release_head_state(nskb);</div><div class='add'>+		len_diff = skb_network_header_len(nskb) - skb_network_header_len(skb);</div><div class='add'>+		__copy_skb_header(nskb, skb);</div><div class='add'>+</div><div class='add'>+		skb_headers_offset_update(nskb, skb_headroom(nskb) - skb_headroom(skb));</div><div class='add'>+		nskb-&gt;transport_header += len_diff;</div><div class='add'>+		skb_copy_from_linear_data_offset(skb, -tnl_hlen,</div><div class='add'>+						 nskb-&gt;data - tnl_hlen,</div><div class='add'>+						 offset + tnl_hlen);</div><div class='add'>+</div><div class='add'>+		if (skb_needs_linearize(nskb, features) &amp;&amp;</div><div class='add'>+		    __skb_linearize(nskb))</div><div class='add'>+			goto err_linearize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;truesize = skb-&gt;truesize - delta_truesize;</div><div class='add'>+	skb-&gt;data_len = skb-&gt;data_len - delta_len;</div><div class='add'>+	skb-&gt;len = skb-&gt;len - delta_len;</div><div class='add'>+</div><div class='add'>+	skb_gso_reset(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;prev = tail;</div><div class='add'>+</div><div class='add'>+	if (skb_needs_linearize(skb, features) &amp;&amp;</div><div class='add'>+	    __skb_linearize(skb))</div><div class='add'>+		goto err_linearize;</div><div class='add'>+</div><div class='add'>+	skb_get(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+err_linearize:</div><div class='add'>+	kfree_skb_list(skb-&gt;next);</div><div class='add'>+	skb-&gt;next = NULL;</div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_segment_list);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	skb_segment - Perform protocol segmentation on skb.</div><div class='ctx'>  *	@head_skb: buffer to segment</div><div class='hunk'>@@ -3507,25 +4737,44 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,</div><div class='ctx'> 	struct sk_buff *segs = NULL;</div><div class='ctx'> 	struct sk_buff *tail = NULL;</div><div class='ctx'> 	struct sk_buff *list_skb = skb_shinfo(head_skb)-&gt;frag_list;</div><div class='del'>-	skb_frag_t *frag = skb_shinfo(head_skb)-&gt;frags;</div><div class='ctx'> 	unsigned int mss = skb_shinfo(head_skb)-&gt;gso_size;</div><div class='ctx'> 	unsigned int doffset = head_skb-&gt;data - skb_mac_header(head_skb);</div><div class='del'>-	struct sk_buff *frag_skb = head_skb;</div><div class='ctx'> 	unsigned int offset = doffset;</div><div class='ctx'> 	unsigned int tnl_hlen = skb_tnl_header_len(head_skb);</div><div class='ctx'> 	unsigned int partial_segs = 0;</div><div class='ctx'> 	unsigned int headroom;</div><div class='ctx'> 	unsigned int len = head_skb-&gt;len;</div><div class='add'>+	struct sk_buff *frag_skb;</div><div class='add'>+	skb_frag_t *frag;</div><div class='ctx'> 	__be16 proto;</div><div class='ctx'> 	bool csum, sg;</div><div class='del'>-	int nfrags = skb_shinfo(head_skb)-&gt;nr_frags;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	int pos;</div><div class='del'>-	int dummy;</div><div class='add'>+	int nfrags, pos;</div><div class='add'>+</div><div class='add'>+	if ((skb_shinfo(head_skb)-&gt;gso_type &amp; SKB_GSO_DODGY) &amp;&amp;</div><div class='add'>+	    mss != GSO_BY_FRAGS &amp;&amp; mss != skb_headlen(head_skb)) {</div><div class='add'>+		struct sk_buff *check_skb;</div><div class='add'>+</div><div class='add'>+		for (check_skb = list_skb; check_skb; check_skb = check_skb-&gt;next) {</div><div class='add'>+			if (skb_headlen(check_skb) &amp;&amp; !check_skb-&gt;head_frag) {</div><div class='add'>+				/* gso_size is untrusted, and we have a frag_list with</div><div class='add'>+				 * a linear non head_frag item.</div><div class='add'>+				 *</div><div class='add'>+				 * If head_skb's headlen does not fit requested gso_size,</div><div class='add'>+				 * it means that the frag_list members do NOT terminate</div><div class='add'>+				 * on exact gso_size boundaries. Hence we cannot perform</div><div class='add'>+				 * skb_frag_t page sharing. Therefore we must fallback to</div><div class='add'>+				 * copying the frag_list skbs; we do so by disabling SG.</div><div class='add'>+				 */</div><div class='add'>+				features &amp;= ~NETIF_F_SG;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__skb_push(head_skb, doffset);</div><div class='del'>-	proto = skb_network_protocol(head_skb, &amp;dummy);</div><div class='add'>+	proto = skb_network_protocol(head_skb, NULL);</div><div class='ctx'> 	if (unlikely(!proto))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='hunk'>@@ -3566,8 +4815,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,</div><div class='ctx'> 		/* GSO partial only requires that we trim off any excess that</div><div class='ctx'> 		 * doesn't fit into an MSS sized block, so take care of that</div><div class='ctx'> 		 * now.</div><div class='add'>+		 * Cap len to not accidentally hit GSO_BY_FRAGS.</div><div class='ctx'> 		 */</div><div class='del'>-		partial_segs = len / mss;</div><div class='add'>+		partial_segs = min(len, GSO_BY_FRAGS - 1) / mss;</div><div class='ctx'> 		if (partial_segs &gt; 1)</div><div class='ctx'> 			mss *= partial_segs;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3578,6 +4828,13 @@ normal:</div><div class='ctx'> 	headroom = skb_headroom(head_skb);</div><div class='ctx'> 	pos = skb_headlen(head_skb);</div><div class='ctx'> </div><div class='add'>+	if (skb_orphan_frags(head_skb, GFP_ATOMIC))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	nfrags = skb_shinfo(head_skb)-&gt;nr_frags;</div><div class='add'>+	frag = skb_shinfo(head_skb)-&gt;frags;</div><div class='add'>+	frag_skb = head_skb;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct sk_buff *nskb;</div><div class='ctx'> 		skb_frag_t *nskb_frag;</div><div class='hunk'>@@ -3593,15 +4850,15 @@ normal:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hsize = skb_headlen(head_skb) - offset;</div><div class='del'>-		if (hsize &lt; 0)</div><div class='del'>-			hsize = 0;</div><div class='del'>-		if (hsize &gt; len || !sg)</div><div class='del'>-			hsize = len;</div><div class='ctx'> </div><div class='del'>-		if (!hsize &amp;&amp; i &gt;= nfrags &amp;&amp; skb_headlen(list_skb) &amp;&amp;</div><div class='add'>+		if (hsize &lt;= 0 &amp;&amp; i &gt;= nfrags &amp;&amp; skb_headlen(list_skb) &amp;&amp;</div><div class='ctx'> 		    (skb_headlen(list_skb) == len || sg)) {</div><div class='ctx'> 			BUG_ON(skb_headlen(list_skb) &gt; len);</div><div class='ctx'> </div><div class='add'>+			nskb = skb_clone(list_skb, GFP_ATOMIC);</div><div class='add'>+			if (unlikely(!nskb))</div><div class='add'>+				goto err;</div><div class='add'>+</div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			nfrags = skb_shinfo(list_skb)-&gt;nr_frags;</div><div class='ctx'> 			frag = skb_shinfo(list_skb)-&gt;frags;</div><div class='hunk'>@@ -3620,12 +4877,8 @@ normal:</div><div class='ctx'> 				frag++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			nskb = skb_clone(list_skb, GFP_ATOMIC);</div><div class='ctx'> 			list_skb = list_skb-&gt;next;</div><div class='ctx'> </div><div class='del'>-			if (unlikely(!nskb))</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='ctx'> 			if (unlikely(pskb_trim(nskb, len))) {</div><div class='ctx'> 				kfree_skb(nskb);</div><div class='ctx'> 				goto err;</div><div class='hunk'>@@ -3641,6 +4894,11 @@ normal:</div><div class='ctx'> 			skb_release_head_state(nskb);</div><div class='ctx'> 			__skb_push(nskb, doffset);</div><div class='ctx'> 		} else {</div><div class='add'>+			if (hsize &lt; 0)</div><div class='add'>+				hsize = 0;</div><div class='add'>+			if (hsize &gt; len || !sg)</div><div class='add'>+				hsize = len;</div><div class='add'>+</div><div class='ctx'> 			nskb = __alloc_skb(hsize + doffset + headroom,</div><div class='ctx'> 					   GFP_ATOMIC, skb_alloc_rx_flag(head_skb),</div><div class='ctx'> 					   NUMA_NO_NODE);</div><div class='hunk'>@@ -3671,14 +4929,20 @@ normal:</div><div class='ctx'> 			goto perform_csum_check;</div><div class='ctx'> </div><div class='ctx'> 		if (!sg) {</div><div class='del'>-			if (!nskb-&gt;remcsum_offload)</div><div class='del'>-				nskb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-			SKB_GSO_CB(nskb)-&gt;csum =</div><div class='del'>-				skb_copy_and_csum_bits(head_skb, offset,</div><div class='del'>-						       skb_put(nskb, len),</div><div class='del'>-						       len, 0);</div><div class='del'>-			SKB_GSO_CB(nskb)-&gt;csum_start =</div><div class='del'>-				skb_headroom(nskb) + doffset;</div><div class='add'>+			if (!csum) {</div><div class='add'>+				if (!nskb-&gt;remcsum_offload)</div><div class='add'>+					nskb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+				SKB_GSO_CB(nskb)-&gt;csum =</div><div class='add'>+					skb_copy_and_csum_bits(head_skb, offset,</div><div class='add'>+							       skb_put(nskb,</div><div class='add'>+								       len),</div><div class='add'>+							       len);</div><div class='add'>+				SKB_GSO_CB(nskb)-&gt;csum_start =</div><div class='add'>+					skb_headroom(nskb) + doffset;</div><div class='add'>+			} else {</div><div class='add'>+				if (skb_copy_bits(head_skb, offset, skb_put(nskb, len), len))</div><div class='add'>+					goto err;</div><div class='add'>+			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3687,15 +4951,19 @@ normal:</div><div class='ctx'> 		skb_copy_from_linear_data_offset(head_skb, offset,</div><div class='ctx'> 						 skb_put(nskb, hsize), hsize);</div><div class='ctx'> </div><div class='del'>-		skb_shinfo(nskb)-&gt;tx_flags |= skb_shinfo(head_skb)-&gt;tx_flags &amp;</div><div class='del'>-					      SKBTX_SHARED_FRAG;</div><div class='add'>+		skb_shinfo(nskb)-&gt;flags |= skb_shinfo(head_skb)-&gt;flags &amp;</div><div class='add'>+					   SKBFL_SHARED_FRAG;</div><div class='ctx'> </div><div class='del'>-		if (skb_orphan_frags(frag_skb, GFP_ATOMIC) ||</div><div class='del'>-		    skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))</div><div class='add'>+		if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='ctx'> 		while (pos &lt; offset + len) {</div><div class='ctx'> 			if (i &gt;= nfrags) {</div><div class='add'>+				if (skb_orphan_frags(list_skb, GFP_ATOMIC) ||</div><div class='add'>+				    skb_zerocopy_clone(nskb, list_skb,</div><div class='add'>+						       GFP_ATOMIC))</div><div class='add'>+					goto err;</div><div class='add'>+</div><div class='ctx'> 				i = 0;</div><div class='ctx'> 				nfrags = skb_shinfo(list_skb)-&gt;nr_frags;</div><div class='ctx'> 				frag = skb_shinfo(list_skb)-&gt;frags;</div><div class='hunk'>@@ -3709,10 +4977,6 @@ normal:</div><div class='ctx'> 					i--;</div><div class='ctx'> 					frag--;</div><div class='ctx'> 				}</div><div class='del'>-				if (skb_orphan_frags(frag_skb, GFP_ATOMIC) ||</div><div class='del'>-				    skb_zerocopy_clone(nskb, frag_skb,</div><div class='del'>-						       GFP_ATOMIC))</div><div class='del'>-					goto err;</div><div class='ctx'> </div><div class='ctx'> 				list_skb = list_skb-&gt;next;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3731,7 +4995,7 @@ normal:</div><div class='ctx'> 			size = skb_frag_size(nskb_frag);</div><div class='ctx'> </div><div class='ctx'> 			if (pos &lt; offset) {</div><div class='del'>-				nskb_frag-&gt;page_offset += offset - pos;</div><div class='add'>+				skb_frag_off_add(nskb_frag, offset - pos);</div><div class='ctx'> 				skb_frag_size_sub(nskb_frag, offset - pos);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -3818,132 +5082,98 @@ err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_segment);</div><div class='ctx'> </div><div class='del'>-int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct skb_shared_info *pinfo, *skbinfo = skb_shinfo(skb);</div><div class='del'>-	unsigned int offset = skb_gro_offset(skb);</div><div class='del'>-	unsigned int headlen = skb_headlen(skb);</div><div class='del'>-	unsigned int len = skb_gro_len(skb);</div><div class='del'>-	unsigned int delta_truesize;</div><div class='del'>-	struct sk_buff *lp;</div><div class='del'>-</div><div class='del'>-	if (unlikely(p-&gt;len + len &gt;= 65536))</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	lp = NAPI_GRO_CB(p)-&gt;last;</div><div class='del'>-	pinfo = skb_shinfo(lp);</div><div class='del'>-</div><div class='del'>-	if (headlen &lt;= offset) {</div><div class='del'>-		skb_frag_t *frag;</div><div class='del'>-		skb_frag_t *frag2;</div><div class='del'>-		int i = skbinfo-&gt;nr_frags;</div><div class='del'>-		int nr_frags = pinfo-&gt;nr_frags + i;</div><div class='add'>+#ifdef CONFIG_SKB_EXTENSIONS</div><div class='add'>+#define SKB_EXT_ALIGN_VALUE	8</div><div class='add'>+#define SKB_EXT_CHUNKSIZEOF(x)	(ALIGN((sizeof(x)), SKB_EXT_ALIGN_VALUE) / SKB_EXT_ALIGN_VALUE)</div><div class='ctx'> </div><div class='del'>-		if (nr_frags &gt; MAX_SKB_FRAGS)</div><div class='del'>-			goto merge;</div><div class='del'>-</div><div class='del'>-		offset -= headlen;</div><div class='del'>-		pinfo-&gt;nr_frags = nr_frags;</div><div class='del'>-		skbinfo-&gt;nr_frags = 0;</div><div class='del'>-</div><div class='del'>-		frag = pinfo-&gt;frags + nr_frags;</div><div class='del'>-		frag2 = skbinfo-&gt;frags + i;</div><div class='del'>-		do {</div><div class='del'>-			*--frag = *--frag2;</div><div class='del'>-		} while (--i);</div><div class='del'>-</div><div class='del'>-		frag-&gt;page_offset += offset;</div><div class='del'>-		skb_frag_size_sub(frag, offset);</div><div class='del'>-</div><div class='del'>-		/* all fragments truesize : remove (head size + sk_buff) */</div><div class='del'>-		delta_truesize = skb-&gt;truesize -</div><div class='del'>-				 SKB_TRUESIZE(skb_end_offset(skb));</div><div class='del'>-</div><div class='del'>-		skb-&gt;truesize -= skb-&gt;data_len;</div><div class='del'>-		skb-&gt;len -= skb-&gt;data_len;</div><div class='del'>-		skb-&gt;data_len = 0;</div><div class='del'>-</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;free = NAPI_GRO_FREE;</div><div class='del'>-		goto done;</div><div class='del'>-	} else if (skb-&gt;head_frag) {</div><div class='del'>-		int nr_frags = pinfo-&gt;nr_frags;</div><div class='del'>-		skb_frag_t *frag = pinfo-&gt;frags + nr_frags;</div><div class='del'>-		struct page *page = virt_to_head_page(skb-&gt;head);</div><div class='del'>-		unsigned int first_size = headlen - offset;</div><div class='del'>-		unsigned int first_offset;</div><div class='del'>-</div><div class='del'>-		if (nr_frags + 1 + skbinfo-&gt;nr_frags &gt; MAX_SKB_FRAGS)</div><div class='del'>-			goto merge;</div><div class='del'>-</div><div class='del'>-		first_offset = skb-&gt;data -</div><div class='del'>-			       (unsigned char *)page_address(page) +</div><div class='del'>-			       offset;</div><div class='del'>-</div><div class='del'>-		pinfo-&gt;nr_frags = nr_frags + 1 + skbinfo-&gt;nr_frags;</div><div class='del'>-</div><div class='del'>-		frag-&gt;page.p	  = page;</div><div class='del'>-		frag-&gt;page_offset = first_offset;</div><div class='del'>-		skb_frag_size_set(frag, first_size);</div><div class='del'>-</div><div class='del'>-		memcpy(frag + 1, skbinfo-&gt;frags, sizeof(*frag) * skbinfo-&gt;nr_frags);</div><div class='del'>-		/* We dont need to clear skbinfo-&gt;nr_frags here */</div><div class='del'>-</div><div class='del'>-		delta_truesize = skb-&gt;truesize - SKB_DATA_ALIGN(sizeof(struct sk_buff));</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;free = NAPI_GRO_FREE_STOLEN_HEAD;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+static const u8 skb_ext_type_len[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='add'>+	[SKB_EXT_BRIDGE_NF] = SKB_EXT_CHUNKSIZEOF(struct nf_bridge_info),</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+	[SKB_EXT_SEC_PATH] = SKB_EXT_CHUNKSIZEOF(struct sec_path),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)</div><div class='add'>+	[TC_SKB_EXT] = SKB_EXT_CHUNKSIZEOF(struct tc_skb_ext),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_MPTCP)</div><div class='add'>+	[SKB_EXT_MPTCP] = SKB_EXT_CHUNKSIZEOF(struct mptcp_ext),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_MCTP_FLOWS)</div><div class='add'>+	[SKB_EXT_MCTP] = SKB_EXT_CHUNKSIZEOF(struct mctp_flow),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_PSP)</div><div class='add'>+	[SKB_EXT_PSP] = SKB_EXT_CHUNKSIZEOF(struct psp_skb_ext),</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-merge:</div><div class='del'>-	delta_truesize = skb-&gt;truesize;</div><div class='del'>-	if (offset &gt; headlen) {</div><div class='del'>-		unsigned int eat = offset - headlen;</div><div class='add'>+static __always_inline unsigned int skb_ext_total_length(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int l = SKB_EXT_CHUNKSIZEOF(struct skb_ext);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		skbinfo-&gt;frags[0].page_offset += eat;</div><div class='del'>-		skb_frag_size_sub(&amp;skbinfo-&gt;frags[0], eat);</div><div class='del'>-		skb-&gt;data_len -= eat;</div><div class='del'>-		skb-&gt;len -= eat;</div><div class='del'>-		offset = headlen;</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(skb_ext_type_len); i++)</div><div class='add'>+		l += skb_ext_type_len[i];</div><div class='ctx'> </div><div class='del'>-	__skb_pull(skb, offset);</div><div class='add'>+	return l;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (NAPI_GRO_CB(p)-&gt;last == p)</div><div class='del'>-		skb_shinfo(p)-&gt;frag_list = skb;</div><div class='del'>-	else</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;last-&gt;next = skb;</div><div class='del'>-	NAPI_GRO_CB(p)-&gt;last = skb;</div><div class='del'>-	__skb_header_release(skb);</div><div class='del'>-	lp = p;</div><div class='add'>+static void skb_extensions_init(void)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(SKB_EXT_NUM &gt;= 8);</div><div class='add'>+#if !IS_ENABLED(CONFIG_KCOV_INSTRUMENT_ALL)</div><div class='add'>+	BUILD_BUG_ON(skb_ext_total_length() &gt; 255);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	NAPI_GRO_CB(p)-&gt;count++;</div><div class='del'>-	p-&gt;data_len += len;</div><div class='del'>-	p-&gt;truesize += delta_truesize;</div><div class='del'>-	p-&gt;len += len;</div><div class='del'>-	if (lp != p) {</div><div class='del'>-		lp-&gt;data_len += len;</div><div class='del'>-		lp-&gt;truesize += delta_truesize;</div><div class='del'>-		lp-&gt;len += len;</div><div class='del'>-	}</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;same_flow = 1;</div><div class='del'>-	return 0;</div><div class='add'>+	skbuff_ext_cache = kmem_cache_create("skbuff_ext_cache",</div><div class='add'>+					     SKB_EXT_ALIGN_VALUE * skb_ext_total_length(),</div><div class='add'>+					     0,</div><div class='add'>+					     SLAB_HWCACHE_ALIGN|SLAB_PANIC,</div><div class='add'>+					     NULL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_gro_receive);</div><div class='add'>+#else</div><div class='add'>+static void skb_extensions_init(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The SKB kmem_cache slab is critical for network performance.  Never</div><div class='add'>+ * merge/alias the slab with similar sized objects.  This avoids fragmentation</div><div class='add'>+ * that hurts performance of kmem_cache_{alloc,free}_bulk APIs.</div><div class='add'>+ */</div><div class='add'>+#ifndef CONFIG_SLUB_TINY</div><div class='add'>+#define FLAG_SKB_NO_MERGE	SLAB_NO_MERGE</div><div class='add'>+#else /* CONFIG_SLUB_TINY - simple loop in kmem_cache_alloc_bulk */</div><div class='add'>+#define FLAG_SKB_NO_MERGE	0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __init skb_init(void)</div><div class='ctx'> {</div><div class='del'>-	skbuff_head_cache = kmem_cache_create_usercopy("skbuff_head_cache",</div><div class='add'>+	net_hotdata.skbuff_cache = kmem_cache_create_usercopy("skbuff_head_cache",</div><div class='ctx'> 					      sizeof(struct sk_buff),</div><div class='ctx'> 					      0,</div><div class='del'>-					      SLAB_HWCACHE_ALIGN|SLAB_PANIC,</div><div class='add'>+					      SLAB_HWCACHE_ALIGN|SLAB_PANIC|</div><div class='add'>+						FLAG_SKB_NO_MERGE,</div><div class='ctx'> 					      offsetof(struct sk_buff, cb),</div><div class='ctx'> 					      sizeof_field(struct sk_buff, cb),</div><div class='ctx'> 					      NULL);</div><div class='del'>-	skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",</div><div class='add'>+	skbuff_cache_size = kmem_cache_size(net_hotdata.skbuff_cache);</div><div class='add'>+</div><div class='add'>+	net_hotdata.skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",</div><div class='ctx'> 						sizeof(struct sk_buff_fclones),</div><div class='ctx'> 						0,</div><div class='ctx'> 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,</div><div class='ctx'> 						NULL);</div><div class='add'>+	/* usercopy should only access first SKB_SMALL_HEAD_HEADROOM bytes.</div><div class='add'>+	 * struct skb_shared_info is located at the end of skb-&gt;head,</div><div class='add'>+	 * and should not be copied to/from user.</div><div class='add'>+	 */</div><div class='add'>+	net_hotdata.skb_small_head_cache = kmem_cache_create_usercopy("skbuff_small_head",</div><div class='add'>+						SKB_SMALL_HEAD_CACHE_SIZE,</div><div class='add'>+						0,</div><div class='add'>+						SLAB_HWCACHE_ALIGN | SLAB_PANIC,</div><div class='add'>+						0,</div><div class='add'>+						SKB_SMALL_HEAD_HEADROOM,</div><div class='add'>+						NULL);</div><div class='add'>+	skb_extensions_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -3982,7 +5212,7 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len,</div><div class='ctx'> 			if (copy &gt; len)</div><div class='ctx'> 				copy = len;</div><div class='ctx'> 			sg_set_page(&amp;sg[elt], skb_frag_page(frag), copy,</div><div class='del'>-					frag-&gt;page_offset+offset-start);</div><div class='add'>+				    skb_frag_off(frag) + offset - start);</div><div class='ctx'> 			elt++;</div><div class='ctx'> 			if (!(len -= copy))</div><div class='ctx'> 				return elt;</div><div class='hunk'>@@ -4059,7 +5289,7 @@ EXPORT_SYMBOL_GPL(skb_to_sgvec);</div><div class='ctx'>  * 3. sg_unmark_end</div><div class='ctx'>  * 4. skb_to_sgvec(payload2)</div><div class='ctx'>  *</div><div class='del'>- * When mapping mutilple payload conditionally, skb_to_sgvec_nomark</div><div class='add'>+ * When mapping multiple payload conditionally, skb_to_sgvec_nomark</div><div class='ctx'>  * is more preferable.</div><div class='ctx'>  */</div><div class='ctx'> int skb_to_sgvec_nomark(struct sk_buff *skb, struct scatterlist *sg,</div><div class='hunk'>@@ -4099,7 +5329,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)</div><div class='ctx'> 	 * at the moment even if they are anonymous).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((skb_cloned(skb) || skb_shinfo(skb)-&gt;nr_frags) &amp;&amp;</div><div class='del'>-	    __pskb_pull_tail(skb, skb_pagelen(skb)-skb_headlen(skb)) == NULL)</div><div class='add'>+	    !__pskb_pull_tail(skb, __skb_pagelen(skb)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Easy case. Most of packets will go this way. */</div><div class='hunk'>@@ -4203,7 +5433,7 @@ static void skb_set_err_queue(struct sk_buff *skb)</div><div class='ctx'> int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) + skb-&gt;truesize &gt;=</div><div class='del'>-	    (unsigned int)sk-&gt;sk_rcvbuf)</div><div class='add'>+	    (unsigned int)READ_ONCE(sk-&gt;sk_rcvbuf))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb_orphan(skb);</div><div class='hunk'>@@ -4217,7 +5447,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_tail(&amp;sk-&gt;sk_error_queue, skb);</div><div class='ctx'> 	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_queue_err_skb);</div><div class='hunk'>@@ -4235,12 +5465,15 @@ struct sk_buff *sock_dequeue_err_skb(struct sock *sk)</div><div class='ctx'> 	bool icmp_next = false;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (skb_queue_empty_lockless(q))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='ctx'> 	skb = __skb_dequeue(q);</div><div class='ctx'> 	if (skb &amp;&amp; (skb_next = skb_peek(q))) {</div><div class='ctx'> 		icmp_next = is_icmp_err_skb(skb_next);</div><div class='ctx'> 		if (icmp_next)</div><div class='del'>-			sk-&gt;sk_err = SKB_EXT_ERR(skb_next)-&gt;ee.ee_origin;</div><div class='add'>+			sk-&gt;sk_err = SKB_EXT_ERR(skb_next)-&gt;ee.ee_errno;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -4248,7 +5481,7 @@ struct sk_buff *sock_dequeue_err_skb(struct sock *sk)</div><div class='ctx'> 		sk-&gt;sk_err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_next)</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -4305,11 +5538,10 @@ static void __skb_complete_tx_timestamp(struct sk_buff *skb,</div><div class='ctx'> 	serr-&gt;ee.ee_info = tstype;</div><div class='ctx'> 	serr-&gt;opt_stats = opt_stats;</div><div class='ctx'> 	serr-&gt;header.h4.iif = skb-&gt;dev ? skb-&gt;dev-&gt;ifindex : 0;</div><div class='del'>-	if (sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_ID) {</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_tsflags) &amp; SOF_TIMESTAMPING_OPT_ID) {</div><div class='ctx'> 		serr-&gt;ee.ee_data = skb_shinfo(skb)-&gt;tskey;</div><div class='del'>-		if (sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp;</div><div class='del'>-		    sk-&gt;sk_type == SOCK_STREAM)</div><div class='del'>-			serr-&gt;ee.ee_data -= sk-&gt;sk_tskey;</div><div class='add'>+		if (sk_is_tcp(sk))</div><div class='add'>+			serr-&gt;ee.ee_data -= atomic_read(&amp;sk-&gt;sk_tskey);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = sock_queue_err_skb(sk, skb);</div><div class='hunk'>@@ -4322,7 +5554,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='del'>-	if (likely(sysctl_tstamp_allow_data || tsonly))</div><div class='add'>+	if (likely(tsonly || READ_ONCE(sock_net(sk)-&gt;core.sysctl_tstamp_allow_data)))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='hunk'>@@ -4355,36 +5587,99 @@ err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp);</div><div class='ctx'> </div><div class='add'>+static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb,</div><div class='add'>+						 struct skb_shared_hwtstamps *hwtstamps,</div><div class='add'>+						 int tstype)</div><div class='add'>+{</div><div class='add'>+	switch (tstype) {</div><div class='add'>+	case SCM_TSTAMP_SCHED:</div><div class='add'>+		return skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_SCHED_TSTAMP;</div><div class='add'>+	case SCM_TSTAMP_SND:</div><div class='add'>+		return skb_shinfo(skb)-&gt;tx_flags &amp; (hwtstamps ? SKBTX_HW_TSTAMP_NOBPF :</div><div class='add'>+						    SKBTX_SW_TSTAMP);</div><div class='add'>+	case SCM_TSTAMP_ACK:</div><div class='add'>+		return TCP_SKB_CB(skb)-&gt;txstamp_ack &amp; TSTAMP_ACK_SK;</div><div class='add'>+	case SCM_TSTAMP_COMPLETION:</div><div class='add'>+		return skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_COMPLETION_TSTAMP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb,</div><div class='add'>+						  struct skb_shared_hwtstamps *hwtstamps,</div><div class='add'>+						  struct sock *sk,</div><div class='add'>+						  int tstype)</div><div class='add'>+{</div><div class='add'>+	int op;</div><div class='add'>+</div><div class='add'>+	switch (tstype) {</div><div class='add'>+	case SCM_TSTAMP_SCHED:</div><div class='add'>+		op = BPF_SOCK_OPS_TSTAMP_SCHED_CB;</div><div class='add'>+		break;</div><div class='add'>+	case SCM_TSTAMP_SND:</div><div class='add'>+		if (hwtstamps) {</div><div class='add'>+			op = BPF_SOCK_OPS_TSTAMP_SND_HW_CB;</div><div class='add'>+			*skb_hwtstamps(skb) = *hwtstamps;</div><div class='add'>+		} else {</div><div class='add'>+			op = BPF_SOCK_OPS_TSTAMP_SND_SW_CB;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SCM_TSTAMP_ACK:</div><div class='add'>+		op = BPF_SOCK_OPS_TSTAMP_ACK_CB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_skops_tx_timestamping(sk, skb, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __skb_tstamp_tx(struct sk_buff *orig_skb,</div><div class='add'>+		     const struct sk_buff *ack_skb,</div><div class='ctx'> 		     struct skb_shared_hwtstamps *hwtstamps,</div><div class='ctx'> 		     struct sock *sk, int tstype)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	bool tsonly, opt_stats = false;</div><div class='add'>+	u32 tsflags;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!hwtstamps &amp;&amp; !(sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_TX_SWHW) &amp;&amp;</div><div class='add'>+	if (skb_shinfo(orig_skb)-&gt;tx_flags &amp; SKBTX_BPF)</div><div class='add'>+		skb_tstamp_tx_report_bpf_timestamping(orig_skb, hwtstamps,</div><div class='add'>+						      sk, tstype);</div><div class='add'>+</div><div class='add'>+	if (!skb_tstamp_tx_report_so_timestamping(orig_skb, hwtstamps, tstype))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tsflags = READ_ONCE(sk-&gt;sk_tsflags);</div><div class='add'>+	if (!hwtstamps &amp;&amp; !(tsflags &amp; SOF_TIMESTAMPING_OPT_TX_SWHW) &amp;&amp;</div><div class='ctx'> 	    skb_shinfo(orig_skb)-&gt;tx_flags &amp; SKBTX_IN_PROGRESS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tsonly = sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_TSONLY;</div><div class='add'>+	tsonly = tsflags &amp; SOF_TIMESTAMPING_OPT_TSONLY;</div><div class='ctx'> 	if (!skb_may_tx_timestamp(sk, tsonly))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (tsonly) {</div><div class='ctx'> #ifdef CONFIG_INET</div><div class='del'>-		if ((sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_STATS) &amp;&amp;</div><div class='del'>-		    sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp;</div><div class='del'>-		    sk-&gt;sk_type == SOCK_STREAM) {</div><div class='del'>-			skb = tcp_get_timestamping_opt_stats(sk);</div><div class='add'>+		if ((tsflags &amp; SOF_TIMESTAMPING_OPT_STATS) &amp;&amp;</div><div class='add'>+		    sk_is_tcp(sk)) {</div><div class='add'>+			skb = tcp_get_timestamping_opt_stats(sk, orig_skb,</div><div class='add'>+							     ack_skb);</div><div class='ctx'> 			opt_stats = true;</div><div class='ctx'> 		} else</div><div class='ctx'> #endif</div><div class='ctx'> 			skb = alloc_skb(0, GFP_ATOMIC);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		skb = skb_clone(orig_skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (skb_orphan_frags_rx(skb, GFP_ATOMIC)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -4398,7 +5693,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,</div><div class='ctx'> 	if (hwtstamps)</div><div class='ctx'> 		*skb_hwtstamps(skb) = *hwtstamps;</div><div class='ctx'> 	else</div><div class='del'>-		skb-&gt;tstamp = ktime_get_real();</div><div class='add'>+		__net_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	__skb_complete_tx_timestamp(skb, sk, tstype, opt_stats);</div><div class='ctx'> }</div><div class='hunk'>@@ -4407,11 +5702,12 @@ EXPORT_SYMBOL_GPL(__skb_tstamp_tx);</div><div class='ctx'> void skb_tstamp_tx(struct sk_buff *orig_skb,</div><div class='ctx'> 		   struct skb_shared_hwtstamps *hwtstamps)</div><div class='ctx'> {</div><div class='del'>-	return __skb_tstamp_tx(orig_skb, hwtstamps, orig_skb-&gt;sk,</div><div class='add'>+	return __skb_tstamp_tx(orig_skb, NULL, hwtstamps, orig_skb-&gt;sk,</div><div class='ctx'> 			       SCM_TSTAMP_SND);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_tstamp_tx);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_WIRELESS</div><div class='ctx'> void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='hunk'>@@ -4437,6 +5733,7 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_complete_wifi_ack);</div><div class='add'>+#endif /* CONFIG_WIRELESS */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * skb_partial_csum_set - set up and verify partial csum values for packet</div><div class='hunk'>@@ -4452,16 +5749,18 @@ EXPORT_SYMBOL_GPL(skb_complete_wifi_ack);</div><div class='ctx'>  */</div><div class='ctx'> bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(start &gt; skb_headlen(skb)) ||</div><div class='del'>-	    unlikely((int)start + off &gt; skb_headlen(skb) - 2)) {</div><div class='del'>-		net_warn_ratelimited("bad partial csum: csum=%u/%u len=%u\n",</div><div class='del'>-				     start, off, skb_headlen(skb));</div><div class='add'>+	u32 csum_end = (u32)start + (u32)off + sizeof(__sum16);</div><div class='add'>+	u32 csum_start = skb_headroom(skb) + (u32)start;</div><div class='add'>+</div><div class='add'>+	if (unlikely(csum_start &gt;= U16_MAX || csum_end &gt; skb_headlen(skb))) {</div><div class='add'>+		net_warn_ratelimited("bad partial csum: csum=%u/%u headroom=%u headlen=%u\n",</div><div class='add'>+				     start, off, skb_headroom(skb), skb_headlen(skb));</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-	skb-&gt;csum_start = skb_headroom(skb) + start;</div><div class='add'>+	skb-&gt;csum_start = csum_start;</div><div class='ctx'> 	skb-&gt;csum_offset = off;</div><div class='del'>-	skb_set_transport_header(skb, start);</div><div class='add'>+	skb-&gt;transport_header = csum_start;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_partial_csum_set);</div><div class='hunk'>@@ -4493,9 +5792,9 @@ static __sum16 *skb_checksum_setup_ip(struct sk_buff *skb,</div><div class='ctx'> 				      typeof(IPPROTO_IP) proto,</div><div class='ctx'> 				      unsigned int off)</div><div class='ctx'> {</div><div class='del'>-	switch (proto) {</div><div class='del'>-		int err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='add'>+	switch (proto) {</div><div class='ctx'> 	case IPPROTO_TCP:</div><div class='ctx'> 		err = skb_maybe_pull_tail(skb, off + sizeof(struct tcphdr),</div><div class='ctx'> 					  off + MAX_TCP_HDR_LEN);</div><div class='hunk'>@@ -4538,7 +5837,7 @@ static int skb_checksum_setup_ipv4(struct sk_buff *skb, bool recalculate)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (ip_hdr(skb)-&gt;frag_off &amp; htons(IP_OFFSET | IP_MF))</div><div class='add'>+	if (ip_is_fragment(ip_hdr(skb)))</div><div class='ctx'> 		fragment = true;</div><div class='ctx'> </div><div class='ctx'> 	off = ip_hdrlen(skb);</div><div class='hunk'>@@ -4795,7 +6094,7 @@ void kfree_skb_partial(struct sk_buff *skb, bool head_stolen)</div><div class='ctx'> {</div><div class='ctx'> 	if (head_stolen) {</div><div class='ctx'> 		skb_release_head_state(skb);</div><div class='del'>-		kmem_cache_free(skbuff_head_cache, skb);</div><div class='add'>+		kmem_cache_free(net_hotdata.skbuff_cache, skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4820,7 +6119,19 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,</div><div class='ctx'> 	if (skb_cloned(to))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (len &lt;= skb_tailroom(to)) {</div><div class='add'>+	/* In general, avoid mixing page_pool and non-page_pool allocated</div><div class='add'>+	 * pages within the same SKB. In theory we could take full</div><div class='add'>+	 * references if @from is cloned and !@to-&gt;pp_recycle but its</div><div class='add'>+	 * tricky (due to potential race with the clone disappearing) and</div><div class='add'>+	 * rare, so not worth dealing with.</div><div class='add'>+	 */</div><div class='add'>+	if (to-&gt;pp_recycle != from-&gt;pp_recycle)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (skb_frags_readable(from) != skb_frags_readable(to))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= skb_tailroom(to) &amp;&amp; skb_frags_readable(from)) {</div><div class='ctx'> 		if (len)</div><div class='ctx'> 			BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));</div><div class='ctx'> 		*delta_truesize = 0;</div><div class='hunk'>@@ -4874,8 +6185,10 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,</div><div class='ctx'> 	/* if the skb is not cloned this does nothing</div><div class='ctx'> 	 * since we set nr_frags to 0.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; from_shinfo-&gt;nr_frags; i++)</div><div class='del'>-		__skb_frag_ref(&amp;from_shinfo-&gt;frags[i]);</div><div class='add'>+	if (skb_pp_frag_ref(from)) {</div><div class='add'>+		for (i = 0; i &lt; from_shinfo-&gt;nr_frags; i++)</div><div class='add'>+			__skb_frag_ref(&amp;from_shinfo-&gt;frags[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	to-&gt;truesize += delta;</div><div class='ctx'> 	to-&gt;len += len;</div><div class='hunk'>@@ -4892,7 +6205,7 @@ EXPORT_SYMBOL(skb_try_coalesce);</div><div class='ctx'>  * @skb: buffer to clean</div><div class='ctx'>  * @xnet: packet is crossing netns</div><div class='ctx'>  *</div><div class='del'>- * skb_scrub_packet can be used after encapsulating or decapsulting a packet</div><div class='add'>+ * skb_scrub_packet can be used after encapsulating or decapsulating a packet</div><div class='ctx'>  * into/from a tunnel. Some information have to be cleared during these</div><div class='ctx'>  * operations.</div><div class='ctx'>  * skb_scrub_packet can also be used to clean a skb before injecting it in</div><div class='hunk'>@@ -4905,161 +6218,28 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)</div><div class='ctx'> 	skb-&gt;skb_iif = 0;</div><div class='ctx'> 	skb-&gt;ignore_df = 0;</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	secpath_reset(skb);</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	skb_ext_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> 	nf_reset_trace(skb);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_SWITCHDEV</div><div class='add'>+	skb-&gt;offload_fwd_mark = 0;</div><div class='add'>+	skb-&gt;offload_l3_fwd_mark = 0;</div><div class='add'>+#endif</div><div class='add'>+	ipvs_reset(skb);</div><div class='add'>+</div><div class='ctx'> 	if (!xnet)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ipvs_reset(skb);</div><div class='ctx'> 	skb-&gt;mark = 0;</div><div class='del'>-	skb-&gt;tstamp = 0;</div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_scrub_packet);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * skb_gso_transport_seglen - Return length of individual segments of a gso packet</div><div class='del'>- *</div><div class='del'>- * @skb: GSO skb</div><div class='del'>- *</div><div class='del'>- * skb_gso_transport_seglen is used to determine the real size of the</div><div class='del'>- * individual segments, including Layer4 headers (TCP/UDP).</div><div class='del'>- *</div><div class='del'>- * The MAC/L2 or network (IP, IPv6) headers are not accounted for.</div><div class='del'>- */</div><div class='del'>-static unsigned int skb_gso_transport_seglen(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='del'>-	unsigned int thlen = 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;encapsulation) {</div><div class='del'>-		thlen = skb_inner_transport_header(skb) -</div><div class='del'>-			skb_transport_header(skb);</div><div class='del'>-</div><div class='del'>-		if (likely(shinfo-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))</div><div class='del'>-			thlen += inner_tcp_hdrlen(skb);</div><div class='del'>-	} else if (likely(shinfo-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {</div><div class='del'>-		thlen = tcp_hdrlen(skb);</div><div class='del'>-	} else if (unlikely(skb_is_gso_sctp(skb))) {</div><div class='del'>-		thlen = sizeof(struct sctphdr);</div><div class='del'>-	} else if (shinfo-&gt;gso_type &amp; SKB_GSO_UDP_L4) {</div><div class='del'>-		thlen = sizeof(struct udphdr);</div><div class='del'>-	}</div><div class='del'>-	/* UFO sets gso_size to the size of the fragmentation</div><div class='del'>-	 * payload, i.e. the size of the L4 (UDP) header is already</div><div class='del'>-	 * accounted for.</div><div class='del'>-	 */</div><div class='del'>-	return thlen + shinfo-&gt;gso_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_gso_network_seglen - Return length of individual segments of a gso packet</div><div class='del'>- *</div><div class='del'>- * @skb: GSO skb</div><div class='del'>- *</div><div class='del'>- * skb_gso_network_seglen is used to determine the real size of the</div><div class='del'>- * individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP).</div><div class='del'>- *</div><div class='del'>- * The MAC/L2 header is not accounted for.</div><div class='del'>- */</div><div class='del'>-static unsigned int skb_gso_network_seglen(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	unsigned int hdr_len = skb_transport_header(skb) -</div><div class='del'>-			       skb_network_header(skb);</div><div class='del'>-</div><div class='del'>-	return hdr_len + skb_gso_transport_seglen(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_gso_mac_seglen - Return length of individual segments of a gso packet</div><div class='del'>- *</div><div class='del'>- * @skb: GSO skb</div><div class='del'>- *</div><div class='del'>- * skb_gso_mac_seglen is used to determine the real size of the</div><div class='del'>- * individual segments, including MAC/L2, Layer3 (IP, IPv6) and L4</div><div class='del'>- * headers (TCP/UDP).</div><div class='del'>- */</div><div class='del'>-static unsigned int skb_gso_mac_seglen(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	unsigned int hdr_len = skb_transport_header(skb) - skb_mac_header(skb);</div><div class='del'>-</div><div class='del'>-	return hdr_len + skb_gso_transport_seglen(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_gso_size_check - check the skb size, considering GSO_BY_FRAGS</div><div class='del'>- *</div><div class='del'>- * There are a couple of instances where we have a GSO skb, and we</div><div class='del'>- * want to determine what size it would be after it is segmented.</div><div class='del'>- *</div><div class='del'>- * We might want to check:</div><div class='del'>- * -    L3+L4+payload size (e.g. IP forwarding)</div><div class='del'>- * - L2+L3+L4+payload size (e.g. sanity check before passing to driver)</div><div class='del'>- *</div><div class='del'>- * This is a helper to do that correctly considering GSO_BY_FRAGS.</div><div class='del'>- *</div><div class='del'>- * @seg_len: The segmented length (from skb_gso_*_seglen). In the</div><div class='del'>- *           GSO_BY_FRAGS case this will be [header sizes + GSO_BY_FRAGS].</div><div class='del'>- *</div><div class='del'>- * @max_len: The maximum permissible length.</div><div class='del'>- *</div><div class='del'>- * Returns true if the segmented length &lt;= max length.</div><div class='del'>- */</div><div class='del'>-static inline bool skb_gso_size_check(const struct sk_buff *skb,</div><div class='del'>-				      unsigned int seg_len,</div><div class='del'>-				      unsigned int max_len) {</div><div class='del'>-	const struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='del'>-	const struct sk_buff *iter;</div><div class='del'>-</div><div class='del'>-	if (shinfo-&gt;gso_size != GSO_BY_FRAGS)</div><div class='del'>-		return seg_len &lt;= max_len;</div><div class='del'>-</div><div class='del'>-	/* Undo this so we can re-use header sizes */</div><div class='del'>-	seg_len -= GSO_BY_FRAGS;</div><div class='del'>-</div><div class='del'>-	skb_walk_frags(skb, iter) {</div><div class='del'>-		if (seg_len + skb_headlen(iter) &gt; max_len)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_gso_validate_network_len - Will a split GSO skb fit into a given MTU?</div><div class='del'>- *</div><div class='del'>- * @skb: GSO skb</div><div class='del'>- * @mtu: MTU to validate against</div><div class='del'>- *</div><div class='del'>- * skb_gso_validate_network_len validates if a given skb will fit a</div><div class='del'>- * wanted MTU once split. It considers L3 headers, L4 headers, and the</div><div class='del'>- * payload.</div><div class='del'>- */</div><div class='del'>-bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu)</div><div class='del'>-{</div><div class='del'>-	return skb_gso_size_check(skb, skb_gso_network_seglen(skb), mtu);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_gso_validate_network_len);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_gso_validate_mac_len - Will a split GSO skb fit in a given length?</div><div class='del'>- *</div><div class='del'>- * @skb: GSO skb</div><div class='del'>- * @len: length to validate against</div><div class='del'>- *</div><div class='del'>- * skb_gso_validate_mac_len validates if a given skb will fit a wanted</div><div class='del'>- * length once split, including L2, L3 and L4 headers and the payload.</div><div class='del'>- */</div><div class='del'>-bool skb_gso_validate_mac_len(const struct sk_buff *skb, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	return skb_gso_size_check(skb, skb_gso_mac_seglen(skb), len);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_gso_validate_mac_len);</div><div class='del'>-</div><div class='ctx'> static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int mac_len;</div><div class='add'>+	int mac_len, meta_len;</div><div class='add'>+	void *meta;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cow(skb, skb_headroom(skb)) &lt; 0) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -5071,6 +6251,13 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb)</div><div class='ctx'> 		memmove(skb_mac_header(skb) + VLAN_HLEN, skb_mac_header(skb),</div><div class='ctx'> 			mac_len - VLAN_HLEN - ETH_TLEN);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	meta_len = skb_metadata_len(skb);</div><div class='add'>+	if (meta_len) {</div><div class='add'>+		meta = skb_metadata_end(skb) - meta_len;</div><div class='add'>+		memmove(meta + VLAN_HLEN, meta, meta_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;mac_header += VLAN_HLEN;</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -5088,8 +6275,8 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb)</div><div class='ctx'> 	skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, VLAN_HLEN)))</div><div class='add'>+	/* We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). */</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, VLAN_HLEN + sizeof(unsigned short))))</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	vhdr = (struct vlan_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -5104,7 +6291,8 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='add'>+	if (!skb_transport_header_was_set(skb))</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='ctx'> 	skb_reset_mac_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='hunk'>@@ -5115,7 +6303,7 @@ err_free:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_vlan_untag);</div><div class='ctx'> </div><div class='del'>-int skb_ensure_writable(struct sk_buff *skb, int write_len)</div><div class='add'>+int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len)</div><div class='ctx'> {</div><div class='ctx'> 	if (!pskb_may_pull(skb, write_len))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -5127,12 +6315,36 @@ int skb_ensure_writable(struct sk_buff *skb, int write_len)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_ensure_writable);</div><div class='ctx'> </div><div class='add'>+int skb_ensure_writable_head_tail(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int needed_headroom = dev-&gt;needed_headroom;</div><div class='add'>+	int needed_tailroom = dev-&gt;needed_tailroom;</div><div class='add'>+</div><div class='add'>+	/* For tail taggers, we need to pad short frames ourselves, to ensure</div><div class='add'>+	 * that the tail tag does not fail at its role of being at the end of</div><div class='add'>+	 * the packet, once the conduit interface pads the frame. Account for</div><div class='add'>+	 * that pad length here, and pad later.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(needed_tailroom &amp;&amp; skb-&gt;len &lt; ETH_ZLEN))</div><div class='add'>+		needed_tailroom += ETH_ZLEN - skb-&gt;len;</div><div class='add'>+	/* skb_headroom() returns unsigned int... */</div><div class='add'>+	needed_headroom = max_t(int, needed_headroom - skb_headroom(skb), 0);</div><div class='add'>+	needed_tailroom = max_t(int, needed_tailroom - skb_tailroom(skb), 0);</div><div class='add'>+</div><div class='add'>+	if (likely(!needed_headroom &amp;&amp; !needed_tailroom &amp;&amp; !skb_cloned(skb)))</div><div class='add'>+		/* No reallocation needed, yay! */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return pskb_expand_head(skb, needed_headroom, needed_tailroom,</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_ensure_writable_head_tail);</div><div class='add'>+</div><div class='ctx'> /* remove VLAN header from packet and update csum accordingly.</div><div class='ctx'>  * expects a non skb_vlan_tag_present skb with a vlan tag payload</div><div class='ctx'>  */</div><div class='ctx'> int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> {</div><div class='del'>-	struct vlan_hdr *vhdr;</div><div class='ctx'> 	int offset = skb-&gt;data - skb_mac_header(skb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -5148,13 +6360,8 @@ int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> </div><div class='ctx'> 	skb_postpull_rcsum(skb, skb-&gt;data + (2 * ETH_ALEN), VLAN_HLEN);</div><div class='ctx'> </div><div class='del'>-	vhdr = (struct vlan_hdr *)(skb-&gt;data + ETH_HLEN);</div><div class='del'>-	*vlan_tci = ntohs(vhdr-&gt;h_vlan_TCI);</div><div class='add'>+	vlan_remove_tag(skb, vlan_tci);</div><div class='ctx'> </div><div class='del'>-	memmove(skb-&gt;data + VLAN_HLEN, skb-&gt;data, 2 * ETH_ALEN);</div><div class='del'>-	__skb_pull(skb, VLAN_HLEN);</div><div class='del'>-</div><div class='del'>-	vlan_set_encap_proto(skb, vhdr);</div><div class='ctx'> 	skb-&gt;mac_header += VLAN_HLEN;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_network_offset(skb) &lt; ETH_HLEN)</div><div class='hunk'>@@ -5176,7 +6383,7 @@ int skb_vlan_pop(struct sk_buff *skb)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(skb_vlan_tag_present(skb))) {</div><div class='del'>-		skb-&gt;vlan_tci = 0;</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (unlikely(!eth_type_vlan(skb-&gt;protocol)))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -5220,7 +6427,7 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;protocol = skb-&gt;vlan_proto;</div><div class='del'>-		skb-&gt;mac_len += VLAN_HLEN;</div><div class='add'>+		skb-&gt;network_header -= VLAN_HLEN;</div><div class='ctx'> </div><div class='ctx'> 		skb_postpush_rcsum(skb, skb-&gt;data + (2 * ETH_ALEN), VLAN_HLEN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5230,11 +6437,257 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)</div><div class='ctx'> EXPORT_SYMBOL(skb_vlan_push);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * skb_eth_pop() - Drop the Ethernet header at the head of a packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: Socket buffer to modify</div><div class='add'>+ *</div><div class='add'>+ * Drop the Ethernet header of @skb.</div><div class='add'>+ *</div><div class='add'>+ * Expects that skb-&gt;data points to the mac header and that no VLAN tags are</div><div class='add'>+ * present.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_eth_pop(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!pskb_may_pull(skb, ETH_HLEN) || skb_vlan_tagged(skb) ||</div><div class='add'>+	    skb_network_offset(skb) &lt; ETH_HLEN)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	skb_pull_rcsum(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_eth_pop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_eth_push() - Add a new Ethernet header at the head of a packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: Socket buffer to modify</div><div class='add'>+ * @dst: Destination MAC address of the new header</div><div class='add'>+ * @src: Source MAC address of the new header</div><div class='add'>+ *</div><div class='add'>+ * Prepend @skb with a new Ethernet header.</div><div class='add'>+ *</div><div class='add'>+ * Expects that skb-&gt;data points to the mac header, which must be empty.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_eth_push(struct sk_buff *skb, const unsigned char *dst,</div><div class='add'>+		 const unsigned char *src)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (skb_network_offset(skb) || skb_vlan_tag_present(skb))</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, sizeof(*eth));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	eth = eth_hdr(skb);</div><div class='add'>+	ether_addr_copy(eth-&gt;h_dest, dst);</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, src);</div><div class='add'>+	eth-&gt;h_proto = skb-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	skb_postpush_rcsum(skb, eth, sizeof(*eth));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_eth_push);</div><div class='add'>+</div><div class='add'>+/* Update the ethertype of hdr and the skb csum value if required. */</div><div class='add'>+static void skb_mod_eth_type(struct sk_buff *skb, struct ethhdr *hdr,</div><div class='add'>+			     __be16 ethertype)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='add'>+		__be16 diff[] = { ~hdr-&gt;h_proto, ethertype };</div><div class='add'>+</div><div class='add'>+		skb-&gt;csum = csum_partial((char *)diff, sizeof(diff), skb-&gt;csum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;h_proto = ethertype;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_mpls_push() - push a new MPLS header after mac_len bytes from start of</div><div class='add'>+ *                   the packet</div><div class='add'>+ *</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @mpls_lse: MPLS label stack entry to push</div><div class='add'>+ * @mpls_proto: ethertype of the new MPLS header (expects 0x8847 or 0x8848)</div><div class='add'>+ * @mac_len: length of the MAC header</div><div class='add'>+ * @ethernet: flag to indicate if the resulting packet after skb_mpls_push is</div><div class='add'>+ *            ethernet</div><div class='add'>+ *</div><div class='add'>+ * Expects skb-&gt;data at mac header.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_mpls_push(struct sk_buff *skb, __be32 mpls_lse, __be16 mpls_proto,</div><div class='add'>+		  int mac_len, bool ethernet)</div><div class='add'>+{</div><div class='add'>+	struct mpls_shim_hdr *lse;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!eth_p_mpls(mpls_proto)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Networking stack does not allow simultaneous Tunnel and MPLS GSO. */</div><div class='add'>+	if (skb-&gt;encapsulation)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, MPLS_HLEN);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;inner_protocol) {</div><div class='add'>+		skb_set_inner_network_header(skb, skb_network_offset(skb));</div><div class='add'>+		skb_set_inner_protocol(skb, skb-&gt;protocol);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_push(skb, MPLS_HLEN);</div><div class='add'>+	memmove(skb_mac_header(skb) - MPLS_HLEN, skb_mac_header(skb),</div><div class='add'>+		mac_len);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_set_network_header(skb, mac_len);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	lse = mpls_hdr(skb);</div><div class='add'>+	lse-&gt;label_stack_entry = mpls_lse;</div><div class='add'>+	skb_postpush_rcsum(skb, lse, MPLS_HLEN);</div><div class='add'>+</div><div class='add'>+	if (ethernet &amp;&amp; mac_len &gt;= ETH_HLEN)</div><div class='add'>+		skb_mod_eth_type(skb, eth_hdr(skb), mpls_proto);</div><div class='add'>+	skb-&gt;protocol = mpls_proto;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_mpls_push);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_mpls_pop() - pop the outermost MPLS header</div><div class='add'>+ *</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @next_proto: ethertype of header after popped MPLS header</div><div class='add'>+ * @mac_len: length of the MAC header</div><div class='add'>+ * @ethernet: flag to indicate if the packet is ethernet</div><div class='add'>+ *</div><div class='add'>+ * Expects skb-&gt;data at mac header.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_mpls_pop(struct sk_buff *skb, __be16 next_proto, int mac_len,</div><div class='add'>+		 bool ethernet)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!eth_p_mpls(skb-&gt;protocol)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = skb_ensure_writable(skb, mac_len + MPLS_HLEN);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	skb_postpull_rcsum(skb, mpls_hdr(skb), MPLS_HLEN);</div><div class='add'>+	memmove(skb_mac_header(skb) + MPLS_HLEN, skb_mac_header(skb),</div><div class='add'>+		mac_len);</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, MPLS_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_set_network_header(skb, mac_len);</div><div class='add'>+</div><div class='add'>+	if (ethernet &amp;&amp; mac_len &gt;= ETH_HLEN) {</div><div class='add'>+		struct ethhdr *hdr;</div><div class='add'>+</div><div class='add'>+		/* use mpls_hdr() to get ethertype to account for VLANs. */</div><div class='add'>+		hdr = (struct ethhdr *)((void *)mpls_hdr(skb) - ETH_HLEN);</div><div class='add'>+		skb_mod_eth_type(skb, hdr, next_proto);</div><div class='add'>+	}</div><div class='add'>+	skb-&gt;protocol = next_proto;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_mpls_pop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_mpls_update_lse() - modify outermost MPLS header and update csum</div><div class='add'>+ *</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @mpls_lse: new MPLS label stack entry to update to</div><div class='add'>+ *</div><div class='add'>+ * Expects skb-&gt;data at mac header.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_mpls_update_lse(struct sk_buff *skb, __be32 mpls_lse)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!eth_p_mpls(skb-&gt;protocol)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = skb_ensure_writable(skb, skb-&gt;mac_len + MPLS_HLEN);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='add'>+		__be32 diff[] = { ~mpls_hdr(skb)-&gt;label_stack_entry, mpls_lse };</div><div class='add'>+</div><div class='add'>+		skb-&gt;csum = csum_partial((char *)diff, sizeof(diff), skb-&gt;csum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mpls_hdr(skb)-&gt;label_stack_entry = mpls_lse;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_mpls_update_lse);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_mpls_dec_ttl() - decrement the TTL of the outermost MPLS header</div><div class='add'>+ *</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ *</div><div class='add'>+ * Expects skb-&gt;data at mac header.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int skb_mpls_dec_ttl(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 lse;</div><div class='add'>+	u8 ttl;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!eth_p_mpls(skb-&gt;protocol)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, skb_network_offset(skb) + MPLS_HLEN))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	lse = be32_to_cpu(mpls_hdr(skb)-&gt;label_stack_entry);</div><div class='add'>+	ttl = (lse &amp; MPLS_LS_TTL_MASK) &gt;&gt; MPLS_LS_TTL_SHIFT;</div><div class='add'>+	if (!--ttl)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	lse &amp;= ~MPLS_LS_TTL_MASK;</div><div class='add'>+	lse |= ttl &lt;&lt; MPLS_LS_TTL_SHIFT;</div><div class='add'>+</div><div class='add'>+	return skb_mpls_update_lse(skb, cpu_to_be32(lse));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skb_mpls_dec_ttl);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * alloc_skb_with_frags - allocate skb with page frags</div><div class='ctx'>  *</div><div class='ctx'>  * @header_len: size of linear part</div><div class='ctx'>  * @data_len: needed length in frags</div><div class='del'>- * @max_page_order: max page order desired.</div><div class='add'>+ * @order: max page order desired.</div><div class='ctx'>  * @errcode: pointer to error code if any</div><div class='ctx'>  * @gfp_mask: allocation mask</div><div class='ctx'>  *</div><div class='hunk'>@@ -5242,61 +6695,50 @@ EXPORT_SYMBOL(skb_vlan_push);</div><div class='ctx'>  */</div><div class='ctx'> struct sk_buff *alloc_skb_with_frags(unsigned long header_len,</div><div class='ctx'> 				     unsigned long data_len,</div><div class='del'>-				     int max_page_order,</div><div class='add'>+				     int order,</div><div class='ctx'> 				     int *errcode,</div><div class='ctx'> 				     gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	int npages = (data_len + (PAGE_SIZE - 1)) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long chunk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	gfp_t gfp_head;</div><div class='del'>-	int i;</div><div class='add'>+	int nr_frags = 0;</div><div class='ctx'> </div><div class='ctx'> 	*errcode = -EMSGSIZE;</div><div class='del'>-	/* Note this test could be relaxed, if we succeed to allocate</div><div class='del'>-	 * high order pages...</div><div class='del'>-	 */</div><div class='del'>-	if (npages &gt; MAX_SKB_FRAGS)</div><div class='add'>+	if (unlikely(data_len &gt; MAX_SKB_FRAGS * (PAGE_SIZE &lt;&lt; order)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	gfp_head = gfp_mask;</div><div class='del'>-	if (gfp_head &amp; __GFP_DIRECT_RECLAIM)</div><div class='del'>-		gfp_head |= __GFP_RETRY_MAYFAIL;</div><div class='del'>-</div><div class='ctx'> 	*errcode = -ENOBUFS;</div><div class='del'>-	skb = alloc_skb(header_len, gfp_head);</div><div class='add'>+	skb = alloc_skb(header_len, gfp_mask);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;truesize += npages &lt;&lt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	for (i = 0; npages &gt; 0; i++) {</div><div class='del'>-		int order = max_page_order;</div><div class='del'>-</div><div class='del'>-		while (order) {</div><div class='del'>-			if (npages &gt;= 1 &lt;&lt; order) {</div><div class='del'>-				page = alloc_pages((gfp_mask &amp; ~__GFP_DIRECT_RECLAIM) |</div><div class='del'>-						   __GFP_COMP |</div><div class='del'>-						   __GFP_NOWARN,</div><div class='del'>-						   order);</div><div class='del'>-				if (page)</div><div class='del'>-					goto fill_page;</div><div class='del'>-				/* Do not retry other high order allocations */</div><div class='del'>-				order = 1;</div><div class='del'>-				max_page_order = 0;</div><div class='del'>-			}</div><div class='add'>+	while (data_len) {</div><div class='add'>+		if (nr_frags == MAX_SKB_FRAGS)</div><div class='add'>+			goto failure;</div><div class='add'>+		while (order &amp;&amp; PAGE_ALIGN(data_len) &lt; (PAGE_SIZE &lt;&lt; order))</div><div class='ctx'> 			order--;</div><div class='add'>+</div><div class='add'>+		if (order) {</div><div class='add'>+			page = alloc_pages((gfp_mask &amp; ~__GFP_DIRECT_RECLAIM) |</div><div class='add'>+					   __GFP_COMP |</div><div class='add'>+					   __GFP_NOWARN,</div><div class='add'>+					   order);</div><div class='add'>+			if (!page) {</div><div class='add'>+				order--;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			page = alloc_page(gfp_mask);</div><div class='add'>+			if (!page)</div><div class='add'>+				goto failure;</div><div class='ctx'> 		}</div><div class='del'>-		page = alloc_page(gfp_mask);</div><div class='del'>-		if (!page)</div><div class='del'>-			goto failure;</div><div class='del'>-fill_page:</div><div class='ctx'> 		chunk = min_t(unsigned long, data_len,</div><div class='ctx'> 			      PAGE_SIZE &lt;&lt; order);</div><div class='del'>-		skb_fill_page_desc(skb, i, page, 0, chunk);</div><div class='add'>+		skb_fill_page_desc(skb, nr_frags, page, 0, chunk);</div><div class='add'>+		nr_frags++;</div><div class='add'>+		skb-&gt;truesize += (PAGE_SIZE &lt;&lt; order);</div><div class='ctx'> 		data_len -= chunk;</div><div class='del'>-		npages -= 1 &lt;&lt; order;</div><div class='ctx'> 	}</div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='hunk'>@@ -5311,21 +6753,17 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 				    const int headlen, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int size = skb_end_offset(skb);</div><div class='add'>+	unsigned int size = skb_end_offset(skb);</div><div class='ctx'> 	int new_hlen = headlen - off;</div><div class='ctx'> 	u8 *data;</div><div class='ctx'> </div><div class='del'>-	size = SKB_DATA_ALIGN(size);</div><div class='del'>-</div><div class='ctx'> 	if (skb_pfmemalloc(skb))</div><div class='ctx'> 		gfp_mask |= __GFP_MEMALLOC;</div><div class='del'>-	data = kmalloc_reserve(size +</div><div class='del'>-			       SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),</div><div class='del'>-			       gfp_mask, NUMA_NO_NODE, NULL);</div><div class='add'>+</div><div class='add'>+	data = kmalloc_reserve(&amp;size, gfp_mask, NUMA_NO_NODE, NULL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	size = SKB_WITH_OVERHEAD(ksize(data));</div><div class='add'>+	size = SKB_WITH_OVERHEAD(size);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy real data, and all frags */</div><div class='ctx'> 	skb_copy_from_linear_data_offset(skb, off, data, new_hlen);</div><div class='hunk'>@@ -5338,14 +6776,14 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 	if (skb_cloned(skb)) {</div><div class='ctx'> 		/* drop the old head gracefully */</div><div class='ctx'> 		if (skb_orphan_frags(skb, gfp_mask)) {</div><div class='del'>-			kfree(data);</div><div class='add'>+			skb_kfree_head(data, size);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++)</div><div class='ctx'> 			skb_frag_ref(skb, i);</div><div class='ctx'> 		if (skb_has_frag_list(skb))</div><div class='ctx'> 			skb_clone_fraglist(skb);</div><div class='del'>-		skb_release_data(skb);</div><div class='add'>+		skb_release_data(skb, SKB_CONSUMED);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* we can reuse existing recount- all we did was</div><div class='ctx'> 		 * relocate values</div><div class='hunk'>@@ -5356,11 +6794,7 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 	skb-&gt;head = data;</div><div class='ctx'> 	skb-&gt;data = data;</div><div class='ctx'> 	skb-&gt;head_frag = 0;</div><div class='del'>-#ifdef NET_SKBUFF_DATA_USES_OFFSET</div><div class='del'>-	skb-&gt;end = size;</div><div class='del'>-#else</div><div class='del'>-	skb-&gt;end = skb-&gt;head + size;</div><div class='del'>-#endif</div><div class='add'>+	skb_set_end_offset(skb, size);</div><div class='ctx'> 	skb_set_tail_pointer(skb, skb_headlen(skb));</div><div class='ctx'> 	skb_headers_offset_update(skb, 0);</div><div class='ctx'> 	skb-&gt;cloned = 0;</div><div class='hunk'>@@ -5376,8 +6810,7 @@ static int pskb_carve(struct sk_buff *skb, const u32 off, gfp_t gfp);</div><div class='ctx'> /* carve out the first eat bytes from skb's frag_list. May recurse into</div><div class='ctx'>  * pskb_carve()</div><div class='ctx'>  */</div><div class='del'>-static int pskb_carve_frag_list(struct sk_buff *skb,</div><div class='del'>-				struct skb_shared_info *shinfo, int eat,</div><div class='add'>+static int pskb_carve_frag_list(struct skb_shared_info *shinfo, int eat,</div><div class='ctx'> 				gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *list = shinfo-&gt;frag_list;</div><div class='hunk'>@@ -5417,7 +6850,7 @@ static int pskb_carve_frag_list(struct sk_buff *skb,</div><div class='ctx'> 	/* Free pulled out fragments. */</div><div class='ctx'> 	while ((list = shinfo-&gt;frag_list) != insp) {</div><div class='ctx'> 		shinfo-&gt;frag_list = list-&gt;next;</div><div class='del'>-		kfree_skb(list);</div><div class='add'>+		consume_skb(list);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* And insert new clone at head. */</div><div class='ctx'> 	if (clone) {</div><div class='hunk'>@@ -5434,28 +6867,23 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 				       int pos, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i, k = 0;</div><div class='del'>-	int size = skb_end_offset(skb);</div><div class='add'>+	unsigned int size = skb_end_offset(skb);</div><div class='ctx'> 	u8 *data;</div><div class='ctx'> 	const int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	struct skb_shared_info *shinfo;</div><div class='ctx'> </div><div class='del'>-	size = SKB_DATA_ALIGN(size);</div><div class='del'>-</div><div class='ctx'> 	if (skb_pfmemalloc(skb))</div><div class='ctx'> 		gfp_mask |= __GFP_MEMALLOC;</div><div class='del'>-	data = kmalloc_reserve(size +</div><div class='del'>-			       SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),</div><div class='del'>-			       gfp_mask, NUMA_NO_NODE, NULL);</div><div class='add'>+</div><div class='add'>+	data = kmalloc_reserve(&amp;size, gfp_mask, NUMA_NO_NODE, NULL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	size = SKB_WITH_OVERHEAD(ksize(data));</div><div class='add'>+	size = SKB_WITH_OVERHEAD(size);</div><div class='ctx'> </div><div class='ctx'> 	memcpy((struct skb_shared_info *)(data + size),</div><div class='del'>-	       skb_shinfo(skb), offsetof(struct skb_shared_info,</div><div class='del'>-					 frags[skb_shinfo(skb)-&gt;nr_frags]));</div><div class='add'>+	       skb_shinfo(skb), offsetof(struct skb_shared_info, frags[0]));</div><div class='ctx'> 	if (skb_orphan_frags(skb, gfp_mask)) {</div><div class='del'>-		kfree(data);</div><div class='add'>+		skb_kfree_head(data, size);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	shinfo = (struct skb_shared_info *)(data + size);</div><div class='hunk'>@@ -5474,7 +6902,7 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 				 *    where splitting is expensive.</div><div class='ctx'> 				 * 2. Split is accurately. We make this.</div><div class='ctx'> 				 */</div><div class='del'>-				shinfo-&gt;frags[0].page_offset += off - pos;</div><div class='add'>+				skb_frag_off_add(&amp;shinfo-&gt;frags[0], off - pos);</div><div class='ctx'> 				skb_frag_size_sub(&amp;shinfo-&gt;frags[0], off - pos);</div><div class='ctx'> 			}</div><div class='ctx'> 			skb_frag_ref(skb, i);</div><div class='hunk'>@@ -5486,20 +6914,20 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,</div><div class='ctx'> 	if (skb_has_frag_list(skb))</div><div class='ctx'> 		skb_clone_fraglist(skb);</div><div class='ctx'> </div><div class='del'>-	if (k == 0) {</div><div class='del'>-		/* split line is in frag list */</div><div class='del'>-		pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask);</div><div class='add'>+	/* split line is in frag list */</div><div class='add'>+	if (k == 0 &amp;&amp; pskb_carve_frag_list(shinfo, off - pos, gfp_mask)) {</div><div class='add'>+		/* skb_frag_unref() is not needed here as shinfo-&gt;nr_frags = 0. */</div><div class='add'>+		if (skb_has_frag_list(skb))</div><div class='add'>+			kfree_skb_list(skb_shinfo(skb)-&gt;frag_list);</div><div class='add'>+		skb_kfree_head(data, size);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	skb_release_data(skb);</div><div class='add'>+	skb_release_data(skb, SKB_CONSUMED);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;head = data;</div><div class='ctx'> 	skb-&gt;head_frag = 0;</div><div class='ctx'> 	skb-&gt;data = data;</div><div class='del'>-#ifdef NET_SKBUFF_DATA_USES_OFFSET</div><div class='del'>-	skb-&gt;end = size;</div><div class='del'>-#else</div><div class='del'>-	skb-&gt;end = skb-&gt;head + size;</div><div class='del'>-#endif</div><div class='add'>+	skb_set_end_offset(skb, size);</div><div class='ctx'> 	skb_reset_tail_pointer(skb);</div><div class='ctx'> 	skb_headers_offset_update(skb, 0);</div><div class='ctx'> 	skb-&gt;cloned   = 0;</div><div class='hunk'>@@ -5558,7 +6986,7 @@ void skb_condense(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;data_len) {</div><div class='ctx'> 		if (skb-&gt;data_len &gt; skb-&gt;end - skb-&gt;tail ||</div><div class='del'>-		    skb_cloned(skb))</div><div class='add'>+		    skb_cloned(skb) || !skb_frags_readable(skb))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		/* Nice, we can free page frag(s) right now */</div><div class='hunk'>@@ -5573,3 +7001,419 @@ void skb_condense(struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb-&gt;truesize = SKB_TRUESIZE(skb_end_offset(skb));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(skb_condense);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SKB_EXTENSIONS</div><div class='add'>+static void *skb_ext_get_ptr(struct skb_ext *ext, enum skb_ext_id id)</div><div class='add'>+{</div><div class='add'>+	return (void *)ext + (ext-&gt;offset[id] * SKB_EXT_ALIGN_VALUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __skb_ext_alloc - allocate a new skb extensions storage</div><div class='add'>+ *</div><div class='add'>+ * @flags: See kmalloc().</div><div class='add'>+ *</div><div class='add'>+ * Returns the newly allocated pointer. The pointer can later attached to a</div><div class='add'>+ * skb via __skb_ext_set().</div><div class='add'>+ * Note: caller must handle the skb_ext as an opaque data.</div><div class='add'>+ */</div><div class='add'>+struct skb_ext *__skb_ext_alloc(gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct skb_ext *new = kmem_cache_alloc(skbuff_ext_cache, flags);</div><div class='add'>+</div><div class='add'>+	if (new) {</div><div class='add'>+		memset(new-&gt;offset, 0, sizeof(new-&gt;offset));</div><div class='add'>+		refcount_set(&amp;new-&gt;refcnt, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct skb_ext *skb_ext_maybe_cow(struct skb_ext *old,</div><div class='add'>+					 unsigned int old_active)</div><div class='add'>+{</div><div class='add'>+	struct skb_ext *new;</div><div class='add'>+</div><div class='add'>+	if (refcount_read(&amp;old-&gt;refcnt) == 1)</div><div class='add'>+		return old;</div><div class='add'>+</div><div class='add'>+	new = kmem_cache_alloc(skbuff_ext_cache, GFP_ATOMIC);</div><div class='add'>+	if (!new)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(new, old, old-&gt;chunks * SKB_EXT_ALIGN_VALUE);</div><div class='add'>+	refcount_set(&amp;new-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+	if (old_active &amp; (1 &lt;&lt; SKB_EXT_SEC_PATH)) {</div><div class='add'>+		struct sec_path *sp = skb_ext_get_ptr(old, SKB_EXT_SEC_PATH);</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; sp-&gt;len; i++)</div><div class='add'>+			xfrm_state_hold(sp-&gt;xvec[i]);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MCTP_FLOWS</div><div class='add'>+	if (old_active &amp; (1 &lt;&lt; SKB_EXT_MCTP)) {</div><div class='add'>+		struct mctp_flow *flow = skb_ext_get_ptr(old, SKB_EXT_MCTP);</div><div class='add'>+</div><div class='add'>+		if (flow-&gt;key)</div><div class='add'>+			refcount_inc(&amp;flow-&gt;key-&gt;refs);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	__skb_ext_put(old);</div><div class='add'>+	return new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __skb_ext_set - attach the specified extension storage to this skb</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @id: extension id</div><div class='add'>+ * @ext: extension storage previously allocated via __skb_ext_alloc()</div><div class='add'>+ *</div><div class='add'>+ * Existing extensions, if any, are cleared.</div><div class='add'>+ *</div><div class='add'>+ * Returns the pointer to the extension.</div><div class='add'>+ */</div><div class='add'>+void *__skb_ext_set(struct sk_buff *skb, enum skb_ext_id id,</div><div class='add'>+		    struct skb_ext *ext)</div><div class='add'>+{</div><div class='add'>+	unsigned int newlen, newoff = SKB_EXT_CHUNKSIZEOF(*ext);</div><div class='add'>+</div><div class='add'>+	skb_ext_put(skb);</div><div class='add'>+	newlen = newoff + skb_ext_type_len[id];</div><div class='add'>+	ext-&gt;chunks = newlen;</div><div class='add'>+	ext-&gt;offset[id] = newoff;</div><div class='add'>+	skb-&gt;extensions = ext;</div><div class='add'>+	skb-&gt;active_extensions = 1 &lt;&lt; id;</div><div class='add'>+	return skb_ext_get_ptr(ext, id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(__skb_ext_set, "NETDEV_INTERNAL");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_ext_add - allocate space for given extension, COW if needed</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @id: extension to allocate space for</div><div class='add'>+ *</div><div class='add'>+ * Allocates enough space for the given extension.</div><div class='add'>+ * If the extension is already present, a pointer to that extension</div><div class='add'>+ * is returned.</div><div class='add'>+ *</div><div class='add'>+ * If the skb was cloned, COW applies and the returned memory can be</div><div class='add'>+ * modified without changing the extension space of clones buffers.</div><div class='add'>+ *</div><div class='add'>+ * Returns pointer to the extension or NULL on allocation failure.</div><div class='add'>+ */</div><div class='add'>+void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id)</div><div class='add'>+{</div><div class='add'>+	struct skb_ext *new, *old = NULL;</div><div class='add'>+	unsigned int newlen, newoff;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;active_extensions) {</div><div class='add'>+		old = skb-&gt;extensions;</div><div class='add'>+</div><div class='add'>+		new = skb_ext_maybe_cow(old, skb-&gt;active_extensions);</div><div class='add'>+		if (!new)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		if (__skb_ext_exist(new, id))</div><div class='add'>+			goto set_active;</div><div class='add'>+</div><div class='add'>+		newoff = new-&gt;chunks;</div><div class='add'>+	} else {</div><div class='add'>+		newoff = SKB_EXT_CHUNKSIZEOF(*new);</div><div class='add'>+</div><div class='add'>+		new = __skb_ext_alloc(GFP_ATOMIC);</div><div class='add'>+		if (!new)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	newlen = newoff + skb_ext_type_len[id];</div><div class='add'>+	new-&gt;chunks = newlen;</div><div class='add'>+	new-&gt;offset[id] = newoff;</div><div class='add'>+set_active:</div><div class='add'>+	skb-&gt;slow_gro = 1;</div><div class='add'>+	skb-&gt;extensions = new;</div><div class='add'>+	skb-&gt;active_extensions |= 1 &lt;&lt; id;</div><div class='add'>+	return skb_ext_get_ptr(new, id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_ext_add);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+static void skb_ext_put_sp(struct sec_path *sp)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sp-&gt;len; i++)</div><div class='add'>+		xfrm_state_put(sp-&gt;xvec[i]);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MCTP_FLOWS</div><div class='add'>+static void skb_ext_put_mctp(struct mctp_flow *flow)</div><div class='add'>+{</div><div class='add'>+	if (flow-&gt;key)</div><div class='add'>+		mctp_key_unref(flow-&gt;key);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __skb_ext_del(struct sk_buff *skb, enum skb_ext_id id)</div><div class='add'>+{</div><div class='add'>+	struct skb_ext *ext = skb-&gt;extensions;</div><div class='add'>+</div><div class='add'>+	skb-&gt;active_extensions &amp;= ~(1 &lt;&lt; id);</div><div class='add'>+	if (skb-&gt;active_extensions == 0) {</div><div class='add'>+		skb-&gt;extensions = NULL;</div><div class='add'>+		__skb_ext_put(ext);</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+	} else if (id == SKB_EXT_SEC_PATH &amp;&amp;</div><div class='add'>+		   refcount_read(&amp;ext-&gt;refcnt) == 1) {</div><div class='add'>+		struct sec_path *sp = skb_ext_get_ptr(ext, SKB_EXT_SEC_PATH);</div><div class='add'>+</div><div class='add'>+		skb_ext_put_sp(sp);</div><div class='add'>+		sp-&gt;len = 0;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__skb_ext_del);</div><div class='add'>+</div><div class='add'>+void __skb_ext_put(struct skb_ext *ext)</div><div class='add'>+{</div><div class='add'>+	/* If this is last clone, nothing can increment</div><div class='add'>+	 * it after check passes.  Avoids one atomic op.</div><div class='add'>+	 */</div><div class='add'>+	if (refcount_read(&amp;ext-&gt;refcnt) == 1)</div><div class='add'>+		goto free_now;</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;ext-&gt;refcnt))</div><div class='add'>+		return;</div><div class='add'>+free_now:</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+	if (__skb_ext_exist(ext, SKB_EXT_SEC_PATH))</div><div class='add'>+		skb_ext_put_sp(skb_ext_get_ptr(ext, SKB_EXT_SEC_PATH));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MCTP_FLOWS</div><div class='add'>+	if (__skb_ext_exist(ext, SKB_EXT_MCTP))</div><div class='add'>+		skb_ext_put_mctp(skb_ext_get_ptr(ext, SKB_EXT_MCTP));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(skbuff_ext_cache, ext);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__skb_ext_put);</div><div class='add'>+#endif /* CONFIG_SKB_EXTENSIONS */</div><div class='add'>+</div><div class='add'>+static void kfree_skb_napi_cache(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* if SKB is a clone, don't handle this case */</div><div class='add'>+	if (skb-&gt;fclone != SKB_FCLONE_UNAVAILABLE) {</div><div class='add'>+		__kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	__napi_kfree_skb(skb, SKB_CONSUMED);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_attempt_defer_free - queue skb for remote freeing</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ *</div><div class='add'>+ * Put @skb in a per-cpu list, using the cpu which</div><div class='add'>+ * allocated the skb/pages to reduce false sharing</div><div class='add'>+ * and memory zone spinlock contention.</div><div class='add'>+ */</div><div class='add'>+void skb_attempt_defer_free(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_defer_node *sdn;</div><div class='add'>+	unsigned long defer_count;</div><div class='add'>+	int cpu = skb-&gt;alloc_cpu;</div><div class='add'>+	unsigned int defer_max;</div><div class='add'>+	bool kick;</div><div class='add'>+</div><div class='add'>+	if (cpu == raw_smp_processor_id() ||</div><div class='add'>+	    WARN_ON_ONCE(cpu &gt;= nr_cpu_ids) ||</div><div class='add'>+	    !cpu_online(cpu)) {</div><div class='add'>+nodefer:	kfree_skb_napi_cache(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb_dst(skb));</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb-&gt;destructor);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb_nfct(skb));</div><div class='add'>+</div><div class='add'>+	sdn = per_cpu_ptr(net_hotdata.skb_defer_nodes, cpu) + numa_node_id();</div><div class='add'>+</div><div class='add'>+	defer_max = READ_ONCE(net_hotdata.sysctl_skb_defer_max);</div><div class='add'>+	defer_count = atomic_long_inc_return(&amp;sdn-&gt;defer_count);</div><div class='add'>+</div><div class='add'>+	if (defer_count &gt;= defer_max)</div><div class='add'>+		goto nodefer;</div><div class='add'>+</div><div class='add'>+	llist_add(&amp;skb-&gt;ll_node, &amp;sdn-&gt;defer_list);</div><div class='add'>+</div><div class='add'>+	/* Send an IPI every time queue reaches half capacity. */</div><div class='add'>+	kick = (defer_count - 1) == (defer_max &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	/* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU</div><div class='add'>+	 * if we are unlucky enough (this seems very unlikely).</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(kick))</div><div class='add'>+		kick_defer_list_purge(cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void skb_splice_csum_page(struct sk_buff *skb, struct page *page,</div><div class='add'>+				 size_t offset, size_t len)</div><div class='add'>+{</div><div class='add'>+	const char *kaddr;</div><div class='add'>+	__wsum csum;</div><div class='add'>+</div><div class='add'>+	kaddr = kmap_local_page(page);</div><div class='add'>+	csum = csum_partial(kaddr + offset, len, 0);</div><div class='add'>+	kunmap_local(kaddr);</div><div class='add'>+	skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_splice_from_iter - Splice (or copy) pages to skbuff</div><div class='add'>+ * @skb: The buffer to add pages to</div><div class='add'>+ * @iter: Iterator representing the pages to be added</div><div class='add'>+ * @maxsize: Maximum amount of pages to be added</div><div class='add'>+ *</div><div class='add'>+ * This is a common helper function for supporting MSG_SPLICE_PAGES.  It</div><div class='add'>+ * extracts pages from an iterator and adds them to the socket buffer if</div><div class='add'>+ * possible, copying them to fragments if not possible (such as if they're slab</div><div class='add'>+ * pages).</div><div class='add'>+ *</div><div class='add'>+ * Returns the amount of data spliced/copied or -EMSGSIZE if there's</div><div class='add'>+ * insufficient space in the buffer to transfer anything.</div><div class='add'>+ */</div><div class='add'>+ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter,</div><div class='add'>+			     ssize_t maxsize)</div><div class='add'>+{</div><div class='add'>+	size_t frag_limit = READ_ONCE(net_hotdata.sysctl_max_skb_frags);</div><div class='add'>+	struct page *pages[8], **ppages = pages;</div><div class='add'>+	ssize_t spliced = 0, ret = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	while (iter-&gt;count &gt; 0) {</div><div class='add'>+		ssize_t space, nr, len;</div><div class='add'>+		size_t off;</div><div class='add'>+</div><div class='add'>+		ret = -EMSGSIZE;</div><div class='add'>+		space = frag_limit - skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+		if (space &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* We might be able to coalesce without increasing nr_frags */</div><div class='add'>+		nr = clamp_t(size_t, space, 1, ARRAY_SIZE(pages));</div><div class='add'>+</div><div class='add'>+		len = iov_iter_extract_pages(iter, &amp;ppages, maxsize, nr, 0, &amp;off);</div><div class='add'>+		if (len &lt;= 0) {</div><div class='add'>+			ret = len ?: -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = 0;</div><div class='add'>+		do {</div><div class='add'>+			struct page *page = pages[i++];</div><div class='add'>+			size_t part = min_t(size_t, PAGE_SIZE - off, len);</div><div class='add'>+</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			if (WARN_ON_ONCE(!sendpage_ok(page)))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			ret = skb_append_pagefrags(skb, page, off, part,</div><div class='add'>+						   frag_limit);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				iov_iter_revert(iter, len);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (skb-&gt;ip_summed == CHECKSUM_NONE)</div><div class='add'>+				skb_splice_csum_page(skb, page, off, part);</div><div class='add'>+</div><div class='add'>+			off = 0;</div><div class='add'>+			spliced += part;</div><div class='add'>+			maxsize -= part;</div><div class='add'>+			len -= part;</div><div class='add'>+		} while (len &gt; 0);</div><div class='add'>+</div><div class='add'>+		if (maxsize &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	skb_len_add(skb, spliced);</div><div class='add'>+	return spliced ?: ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(skb_splice_from_iter);</div><div class='add'>+</div><div class='add'>+static __always_inline</div><div class='add'>+size_t memcpy_from_iter_csum(void *iter_from, size_t progress,</div><div class='add'>+			     size_t len, void *to, void *priv2)</div><div class='add'>+{</div><div class='add'>+	__wsum *csum = priv2;</div><div class='add'>+	__wsum next = csum_partial_copy_nocheck(iter_from, to + progress, len);</div><div class='add'>+</div><div class='add'>+	*csum = csum_block_add(*csum, next, progress);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline</div><div class='add'>+size_t copy_from_user_iter_csum(void __user *iter_from, size_t progress,</div><div class='add'>+				size_t len, void *to, void *priv2)</div><div class='add'>+{</div><div class='add'>+	__wsum next, *csum = priv2;</div><div class='add'>+</div><div class='add'>+	next = csum_and_copy_from_user(iter_from, to + progress, len);</div><div class='add'>+	*csum = csum_block_add(*csum, next, progress);</div><div class='add'>+	return next ? 0 : len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool csum_and_copy_from_iter_full(void *addr, size_t bytes,</div><div class='add'>+				  __wsum *csum, struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	size_t copied;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!i-&gt;data_source))</div><div class='add'>+		return false;</div><div class='add'>+	copied = iterate_and_advance2(i, bytes, addr, csum,</div><div class='add'>+				      copy_from_user_iter_csum,</div><div class='add'>+				      memcpy_from_iter_csum);</div><div class='add'>+	if (likely(copied == bytes))</div><div class='add'>+		return true;</div><div class='add'>+	iov_iter_revert(i, copied);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(csum_and_copy_from_iter_full);</div><div class='add'>+</div><div class='add'>+void get_netmem(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+</div><div class='add'>+	if (netmem_is_net_iov(netmem)) {</div><div class='add'>+		niov = netmem_to_net_iov(netmem);</div><div class='add'>+		if (net_is_devmem_iov(niov))</div><div class='add'>+			net_devmem_get_net_iov(netmem_to_net_iov(netmem));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	get_page(netmem_to_page(netmem));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(get_netmem);</div><div class='add'>+</div><div class='add'>+void put_netmem(netmem_ref netmem)</div><div class='add'>+{</div><div class='add'>+	struct net_iov *niov;</div><div class='add'>+</div><div class='add'>+	if (netmem_is_net_iov(netmem)) {</div><div class='add'>+		niov = netmem_to_net_iov(netmem);</div><div class='add'>+		if (net_is_devmem_iov(niov))</div><div class='add'>+			net_devmem_put_net_iov(netmem_to_net_iov(netmem));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_page(netmem_to_page(netmem));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(put_netmem);</div><div class='head'>diff --git a/net/core/skmsg.c b/net/core/skmsg.c<br/>new file mode 100644<br/>index 000000000000..2ac7731e1e0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/skmsg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/skmsg.c</a></div><div class='hunk'>@@ -0,0 +1,1289 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2017 - 2018 Covalent IO, Inc. http://covalent.io */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skmsg.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#include &lt;trace/events/sock.h&gt;</div><div class='add'>+</div><div class='add'>+static bool sk_msg_try_coalesce_ok(struct sk_msg *msg, int elem_first_coalesce)</div><div class='add'>+{</div><div class='add'>+	if (msg-&gt;sg.end &gt; msg-&gt;sg.start &amp;&amp;</div><div class='add'>+	    elem_first_coalesce &lt; msg-&gt;sg.end)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;sg.end &lt; msg-&gt;sg.start &amp;&amp;</div><div class='add'>+	    (elem_first_coalesce &gt; msg-&gt;sg.start ||</div><div class='add'>+	     elem_first_coalesce &lt; msg-&gt;sg.end))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sk_msg_alloc(struct sock *sk, struct sk_msg *msg, int len,</div><div class='add'>+		 int elem_first_coalesce)</div><div class='add'>+{</div><div class='add'>+	struct page_frag *pfrag = sk_page_frag(sk);</div><div class='add'>+	u32 osize = msg-&gt;sg.size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	len -= msg-&gt;sg.size;</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		struct scatterlist *sge;</div><div class='add'>+		u32 orig_offset;</div><div class='add'>+		int use, i;</div><div class='add'>+</div><div class='add'>+		if (!sk_page_frag_refill(sk, pfrag)) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto msg_trim;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		orig_offset = pfrag-&gt;offset;</div><div class='add'>+		use = min_t(int, len, pfrag-&gt;size - orig_offset);</div><div class='add'>+		if (!sk_wmem_schedule(sk, use)) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto msg_trim;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = msg-&gt;sg.end;</div><div class='add'>+		sk_msg_iter_var_prev(i);</div><div class='add'>+		sge = &amp;msg-&gt;sg.data[i];</div><div class='add'>+</div><div class='add'>+		if (sk_msg_try_coalesce_ok(msg, elem_first_coalesce) &amp;&amp;</div><div class='add'>+		    sg_page(sge) == pfrag-&gt;page &amp;&amp;</div><div class='add'>+		    sge-&gt;offset + sge-&gt;length == orig_offset) {</div><div class='add'>+			sge-&gt;length += use;</div><div class='add'>+		} else {</div><div class='add'>+			if (sk_msg_full(msg)) {</div><div class='add'>+				ret = -ENOSPC;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sge = &amp;msg-&gt;sg.data[msg-&gt;sg.end];</div><div class='add'>+			sg_unmark_end(sge);</div><div class='add'>+			sg_set_page(sge, pfrag-&gt;page, use, orig_offset);</div><div class='add'>+			get_page(pfrag-&gt;page);</div><div class='add'>+			sk_msg_iter_next(msg, end);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk_mem_charge(sk, use);</div><div class='add'>+		msg-&gt;sg.size += use;</div><div class='add'>+		pfrag-&gt;offset += use;</div><div class='add'>+		len -= use;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+msg_trim:</div><div class='add'>+	sk_msg_trim(sk, msg, osize);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_alloc);</div><div class='add'>+</div><div class='add'>+int sk_msg_clone(struct sock *sk, struct sk_msg *dst, struct sk_msg *src,</div><div class='add'>+		 u32 off, u32 len)</div><div class='add'>+{</div><div class='add'>+	int i = src-&gt;sg.start;</div><div class='add'>+	struct scatterlist *sge = sk_msg_elem(src, i);</div><div class='add'>+	struct scatterlist *sgd = NULL;</div><div class='add'>+	u32 sge_len, sge_off;</div><div class='add'>+</div><div class='add'>+	while (off) {</div><div class='add'>+		if (sge-&gt;length &gt; off)</div><div class='add'>+			break;</div><div class='add'>+		off -= sge-&gt;length;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		if (i == src-&gt;sg.end &amp;&amp; off)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		sge = sk_msg_elem(src, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (len) {</div><div class='add'>+		sge_len = sge-&gt;length - off;</div><div class='add'>+		if (sge_len &gt; len)</div><div class='add'>+			sge_len = len;</div><div class='add'>+</div><div class='add'>+		if (dst-&gt;sg.end)</div><div class='add'>+			sgd = sk_msg_elem(dst, dst-&gt;sg.end - 1);</div><div class='add'>+</div><div class='add'>+		if (sgd &amp;&amp;</div><div class='add'>+		    (sg_page(sge) == sg_page(sgd)) &amp;&amp;</div><div class='add'>+		    (sg_virt(sge) + off == sg_virt(sgd) + sgd-&gt;length)) {</div><div class='add'>+			sgd-&gt;length += sge_len;</div><div class='add'>+			dst-&gt;sg.size += sge_len;</div><div class='add'>+		} else if (!sk_msg_full(dst)) {</div><div class='add'>+			sge_off = sge-&gt;offset + off;</div><div class='add'>+			sk_msg_page_add(dst, sg_page(sge), sge_len, sge_off);</div><div class='add'>+		} else {</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		off = 0;</div><div class='add'>+		len -= sge_len;</div><div class='add'>+		sk_mem_charge(sk, sge_len);</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		if (i == src-&gt;sg.end &amp;&amp; len)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		sge = sk_msg_elem(src, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_clone);</div><div class='add'>+</div><div class='add'>+void sk_msg_return_zero(struct sock *sk, struct sk_msg *msg, int bytes)</div><div class='add'>+{</div><div class='add'>+	int i = msg-&gt;sg.start;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct scatterlist *sge = sk_msg_elem(msg, i);</div><div class='add'>+</div><div class='add'>+		if (bytes &lt; sge-&gt;length) {</div><div class='add'>+			sge-&gt;length -= bytes;</div><div class='add'>+			sge-&gt;offset += bytes;</div><div class='add'>+			sk_mem_uncharge(sk, bytes);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk_mem_uncharge(sk, sge-&gt;length);</div><div class='add'>+		bytes -= sge-&gt;length;</div><div class='add'>+		sge-&gt;length = 0;</div><div class='add'>+		sge-&gt;offset = 0;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (bytes &amp;&amp; i != msg-&gt;sg.end);</div><div class='add'>+	msg-&gt;sg.start = i;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_return_zero);</div><div class='add'>+</div><div class='add'>+void sk_msg_return(struct sock *sk, struct sk_msg *msg, int bytes)</div><div class='add'>+{</div><div class='add'>+	int i = msg-&gt;sg.start;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct scatterlist *sge = &amp;msg-&gt;sg.data[i];</div><div class='add'>+		int uncharge = (bytes &lt; sge-&gt;length) ? bytes : sge-&gt;length;</div><div class='add'>+</div><div class='add'>+		sk_mem_uncharge(sk, uncharge);</div><div class='add'>+		bytes -= uncharge;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_return);</div><div class='add'>+</div><div class='add'>+static int sk_msg_free_elem(struct sock *sk, struct sk_msg *msg, u32 i,</div><div class='add'>+			    bool charge)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sge = sk_msg_elem(msg, i);</div><div class='add'>+	u32 len = sge-&gt;length;</div><div class='add'>+</div><div class='add'>+	/* When the skb owns the memory we free it from consume_skb path. */</div><div class='add'>+	if (!msg-&gt;skb) {</div><div class='add'>+		if (charge)</div><div class='add'>+			sk_mem_uncharge(sk, len);</div><div class='add'>+		put_page(sg_page(sge));</div><div class='add'>+	}</div><div class='add'>+	memset(sge, 0, sizeof(*sge));</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sk_msg_free(struct sock *sk, struct sk_msg *msg, u32 i,</div><div class='add'>+			 bool charge)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sge = sk_msg_elem(msg, i);</div><div class='add'>+	int freed = 0;</div><div class='add'>+</div><div class='add'>+	while (msg-&gt;sg.size) {</div><div class='add'>+		msg-&gt;sg.size -= sge-&gt;length;</div><div class='add'>+		freed += sk_msg_free_elem(sk, msg, i, charge);</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		sk_msg_check_to_free(msg, i, msg-&gt;sg.size);</div><div class='add'>+		sge = sk_msg_elem(msg, i);</div><div class='add'>+	}</div><div class='add'>+	consume_skb(msg-&gt;skb);</div><div class='add'>+	sk_msg_init(msg);</div><div class='add'>+	return freed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sk_msg_free_nocharge(struct sock *sk, struct sk_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return __sk_msg_free(sk, msg, msg-&gt;sg.start, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_free_nocharge);</div><div class='add'>+</div><div class='add'>+int sk_msg_free(struct sock *sk, struct sk_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return __sk_msg_free(sk, msg, msg-&gt;sg.start, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_free);</div><div class='add'>+</div><div class='add'>+static void __sk_msg_free_partial(struct sock *sk, struct sk_msg *msg,</div><div class='add'>+				  u32 bytes, bool charge)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	u32 i = msg-&gt;sg.start;</div><div class='add'>+</div><div class='add'>+	while (bytes) {</div><div class='add'>+		sge = sk_msg_elem(msg, i);</div><div class='add'>+		if (!sge-&gt;length)</div><div class='add'>+			break;</div><div class='add'>+		if (bytes &lt; sge-&gt;length) {</div><div class='add'>+			if (charge)</div><div class='add'>+				sk_mem_uncharge(sk, bytes);</div><div class='add'>+			sge-&gt;length -= bytes;</div><div class='add'>+			sge-&gt;offset += bytes;</div><div class='add'>+			msg-&gt;sg.size -= bytes;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg-&gt;sg.size -= sge-&gt;length;</div><div class='add'>+		bytes -= sge-&gt;length;</div><div class='add'>+		sk_msg_free_elem(sk, msg, i, charge);</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		sk_msg_check_to_free(msg, i, bytes);</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;sg.start = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_msg_free_partial(struct sock *sk, struct sk_msg *msg, u32 bytes)</div><div class='add'>+{</div><div class='add'>+	__sk_msg_free_partial(sk, msg, bytes, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_free_partial);</div><div class='add'>+</div><div class='add'>+void sk_msg_free_partial_nocharge(struct sock *sk, struct sk_msg *msg,</div><div class='add'>+				  u32 bytes)</div><div class='add'>+{</div><div class='add'>+	__sk_msg_free_partial(sk, msg, bytes, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_msg_trim(struct sock *sk, struct sk_msg *msg, int len)</div><div class='add'>+{</div><div class='add'>+	int trim = msg-&gt;sg.size - len;</div><div class='add'>+	u32 i = msg-&gt;sg.end;</div><div class='add'>+</div><div class='add'>+	if (trim &lt;= 0) {</div><div class='add'>+		WARN_ON(trim &lt; 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_msg_iter_var_prev(i);</div><div class='add'>+	msg-&gt;sg.size = len;</div><div class='add'>+	while (msg-&gt;sg.data[i].length &amp;&amp;</div><div class='add'>+	       trim &gt;= msg-&gt;sg.data[i].length) {</div><div class='add'>+		trim -= msg-&gt;sg.data[i].length;</div><div class='add'>+		sk_msg_free_elem(sk, msg, i, true);</div><div class='add'>+		sk_msg_iter_var_prev(i);</div><div class='add'>+		if (!trim)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg-&gt;sg.data[i].length -= trim;</div><div class='add'>+	sk_mem_uncharge(sk, trim);</div><div class='add'>+	/* Adjust copybreak if it falls into the trimmed part of last buf */</div><div class='add'>+	if (msg-&gt;sg.curr == i &amp;&amp; msg-&gt;sg.copybreak &gt; msg-&gt;sg.data[i].length)</div><div class='add'>+		msg-&gt;sg.copybreak = msg-&gt;sg.data[i].length;</div><div class='add'>+out:</div><div class='add'>+	sk_msg_iter_var_next(i);</div><div class='add'>+	msg-&gt;sg.end = i;</div><div class='add'>+</div><div class='add'>+	/* If we trim data a full sg elem before curr pointer update</div><div class='add'>+	 * copybreak and current so that any future copy operations</div><div class='add'>+	 * start at new copy location.</div><div class='add'>+	 * However trimmed data that has not yet been used in a copy op</div><div class='add'>+	 * does not require an update.</div><div class='add'>+	 */</div><div class='add'>+	if (!msg-&gt;sg.size) {</div><div class='add'>+		msg-&gt;sg.curr = msg-&gt;sg.start;</div><div class='add'>+		msg-&gt;sg.copybreak = 0;</div><div class='add'>+	} else if (sk_msg_iter_dist(msg-&gt;sg.start, msg-&gt;sg.curr) &gt;=</div><div class='add'>+		   sk_msg_iter_dist(msg-&gt;sg.start, msg-&gt;sg.end)) {</div><div class='add'>+		sk_msg_iter_var_prev(i);</div><div class='add'>+		msg-&gt;sg.curr = i;</div><div class='add'>+		msg-&gt;sg.copybreak = msg-&gt;sg.data[i].length;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_trim);</div><div class='add'>+</div><div class='add'>+int sk_msg_zerocopy_from_iter(struct sock *sk, struct iov_iter *from,</div><div class='add'>+			      struct sk_msg *msg, u32 bytes)</div><div class='add'>+{</div><div class='add'>+	int i, maxpages, ret = 0, num_elems = sk_msg_elem_used(msg);</div><div class='add'>+	const int to_max_pages = MAX_MSG_FRAGS;</div><div class='add'>+	struct page *pages[MAX_MSG_FRAGS];</div><div class='add'>+	ssize_t orig, copied, use, offset;</div><div class='add'>+</div><div class='add'>+	orig = msg-&gt;sg.size;</div><div class='add'>+	while (bytes &gt; 0) {</div><div class='add'>+		i = 0;</div><div class='add'>+		maxpages = to_max_pages - num_elems;</div><div class='add'>+		if (maxpages == 0) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copied = iov_iter_get_pages2(from, pages, bytes, maxpages,</div><div class='add'>+					    &amp;offset);</div><div class='add'>+		if (copied &lt;= 0) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bytes -= copied;</div><div class='add'>+		msg-&gt;sg.size += copied;</div><div class='add'>+</div><div class='add'>+		while (copied) {</div><div class='add'>+			use = min_t(int, copied, PAGE_SIZE - offset);</div><div class='add'>+			sg_set_page(&amp;msg-&gt;sg.data[msg-&gt;sg.end],</div><div class='add'>+				    pages[i], use, offset);</div><div class='add'>+			sg_unmark_end(&amp;msg-&gt;sg.data[msg-&gt;sg.end]);</div><div class='add'>+			sk_mem_charge(sk, use);</div><div class='add'>+</div><div class='add'>+			offset = 0;</div><div class='add'>+			copied -= use;</div><div class='add'>+			sk_msg_iter_next(msg, end);</div><div class='add'>+			num_elems++;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		/* When zerocopy is mixed with sk_msg_*copy* operations we</div><div class='add'>+		 * may have a copybreak set in this case clear and prefer</div><div class='add'>+		 * zerocopy remainder when possible.</div><div class='add'>+		 */</div><div class='add'>+		msg-&gt;sg.copybreak = 0;</div><div class='add'>+		msg-&gt;sg.curr = msg-&gt;sg.end;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	/* Revert iov_iter updates, msg will need to use 'trim' later if it</div><div class='add'>+	 * also needs to be cleared.</div><div class='add'>+	 */</div><div class='add'>+	if (ret)</div><div class='add'>+		iov_iter_revert(from, msg-&gt;sg.size - orig);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_zerocopy_from_iter);</div><div class='add'>+</div><div class='add'>+int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,</div><div class='add'>+			     struct sk_msg *msg, u32 bytes)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOSPC, i = msg-&gt;sg.curr;</div><div class='add'>+	u32 copy, buf_size, copied = 0;</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	void *to;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		sge = sk_msg_elem(msg, i);</div><div class='add'>+		/* This is possible if a trim operation shrunk the buffer */</div><div class='add'>+		if (msg-&gt;sg.copybreak &gt;= sge-&gt;length) {</div><div class='add'>+			msg-&gt;sg.copybreak = 0;</div><div class='add'>+			sk_msg_iter_var_next(i);</div><div class='add'>+			if (i == msg-&gt;sg.end)</div><div class='add'>+				break;</div><div class='add'>+			sge = sk_msg_elem(msg, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_size = sge-&gt;length - msg-&gt;sg.copybreak;</div><div class='add'>+		copy = (buf_size &gt; bytes) ? bytes : buf_size;</div><div class='add'>+		to = sg_virt(sge) + msg-&gt;sg.copybreak;</div><div class='add'>+		msg-&gt;sg.copybreak += copy;</div><div class='add'>+		if (sk-&gt;sk_route_caps &amp; NETIF_F_NOCACHE_COPY)</div><div class='add'>+			ret = copy_from_iter_nocache(to, copy, from);</div><div class='add'>+		else</div><div class='add'>+			ret = copy_from_iter(to, copy, from);</div><div class='add'>+		if (ret != copy) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		bytes -= copy;</div><div class='add'>+		copied += copy;</div><div class='add'>+		if (!bytes)</div><div class='add'>+			break;</div><div class='add'>+		msg-&gt;sg.copybreak = 0;</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+out:</div><div class='add'>+	msg-&gt;sg.curr = i;</div><div class='add'>+	return (ret &lt; 0) ? ret : copied;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter);</div><div class='add'>+</div><div class='add'>+/* Receive sk_msg from psock-&gt;ingress_msg to @msg. */</div><div class='add'>+int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,</div><div class='add'>+		   int len, int flags)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter *iter = &amp;msg-&gt;msg_iter;</div><div class='add'>+	int peek = flags &amp; MSG_PEEK;</div><div class='add'>+	struct sk_msg *msg_rx;</div><div class='add'>+	int i, copied = 0;</div><div class='add'>+</div><div class='add'>+	msg_rx = sk_psock_peek_msg(psock);</div><div class='add'>+	while (copied != len) {</div><div class='add'>+		struct scatterlist *sge;</div><div class='add'>+</div><div class='add'>+		if (unlikely(!msg_rx))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		i = msg_rx-&gt;sg.start;</div><div class='add'>+		do {</div><div class='add'>+			struct page *page;</div><div class='add'>+			int copy;</div><div class='add'>+</div><div class='add'>+			sge = sk_msg_elem(msg_rx, i);</div><div class='add'>+			copy = sge-&gt;length;</div><div class='add'>+			page = sg_page(sge);</div><div class='add'>+			if (copied + copy &gt; len)</div><div class='add'>+				copy = len - copied;</div><div class='add'>+			if (copy)</div><div class='add'>+				copy = copy_page_to_iter(page, sge-&gt;offset, copy, iter);</div><div class='add'>+			if (!copy) {</div><div class='add'>+				copied = copied ? copied : -EFAULT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			copied += copy;</div><div class='add'>+			if (likely(!peek)) {</div><div class='add'>+				sge-&gt;offset += copy;</div><div class='add'>+				sge-&gt;length -= copy;</div><div class='add'>+				if (!msg_rx-&gt;skb) {</div><div class='add'>+					sk_mem_uncharge(sk, copy);</div><div class='add'>+					atomic_sub(copy, &amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+				}</div><div class='add'>+				msg_rx-&gt;sg.size -= copy;</div><div class='add'>+</div><div class='add'>+				if (!sge-&gt;length) {</div><div class='add'>+					sk_msg_iter_var_next(i);</div><div class='add'>+					if (!msg_rx-&gt;skb)</div><div class='add'>+						put_page(page);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* Lets not optimize peek case if copy_page_to_iter</div><div class='add'>+				 * didn't copy the entire length lets just break.</div><div class='add'>+				 */</div><div class='add'>+				if (copy != sge-&gt;length)</div><div class='add'>+					goto out;</div><div class='add'>+				sk_msg_iter_var_next(i);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (copied == len)</div><div class='add'>+				break;</div><div class='add'>+		} while ((i != msg_rx-&gt;sg.end) &amp;&amp; !sg_is_last(sge));</div><div class='add'>+</div><div class='add'>+		if (unlikely(peek)) {</div><div class='add'>+			msg_rx = sk_psock_next_msg(psock, msg_rx);</div><div class='add'>+			if (!msg_rx)</div><div class='add'>+				break;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg_rx-&gt;sg.start = i;</div><div class='add'>+		if (!sge-&gt;length &amp;&amp; (i == msg_rx-&gt;sg.end || sg_is_last(sge))) {</div><div class='add'>+			msg_rx = sk_psock_dequeue_msg(psock);</div><div class='add'>+			kfree_sk_msg(msg_rx);</div><div class='add'>+		}</div><div class='add'>+		msg_rx = sk_psock_peek_msg(psock);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_recvmsg);</div><div class='add'>+</div><div class='add'>+bool sk_msg_is_readable(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	bool empty = true;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (likely(psock))</div><div class='add'>+		empty = list_empty(&amp;psock-&gt;ingress_msg);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return !empty;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_msg_is_readable);</div><div class='add'>+</div><div class='add'>+static struct sk_msg *alloc_sk_msg(gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct sk_msg *msg;</div><div class='add'>+</div><div class='add'>+	msg = kzalloc(sizeof(*msg), gfp | __GFP_NOWARN);</div><div class='add'>+	if (unlikely(!msg))</div><div class='add'>+		return NULL;</div><div class='add'>+	sg_init_marker(msg-&gt;sg.data, NR_MSG_FRAG_IDS);</div><div class='add'>+	return msg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_msg *sk_psock_create_ingress_msg(struct sock *sk,</div><div class='add'>+						  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt; sk-&gt;sk_rcvbuf)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!sk_rmem_schedule(sk, skb, skb-&gt;truesize))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return alloc_sk_msg(GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb,</div><div class='add'>+					u32 off, u32 len,</div><div class='add'>+					struct sk_psock *psock,</div><div class='add'>+					struct sock *sk,</div><div class='add'>+					struct sk_msg *msg,</div><div class='add'>+					bool take_ref)</div><div class='add'>+{</div><div class='add'>+	int num_sge, copied;</div><div class='add'>+</div><div class='add'>+	/* skb_to_sgvec will fail when the total number of fragments in</div><div class='add'>+	 * frag_list and frags exceeds MAX_MSG_FRAGS. For example, the</div><div class='add'>+	 * caller may aggregate multiple skbs.</div><div class='add'>+	 */</div><div class='add'>+	num_sge = skb_to_sgvec(skb, msg-&gt;sg.data, off, len);</div><div class='add'>+	if (num_sge &lt; 0) {</div><div class='add'>+		/* skb linearize may fail with ENOMEM, but lets simply try again</div><div class='add'>+		 * later if this happens. Under memory pressure we don't want to</div><div class='add'>+		 * drop the skb. We need to linearize the skb so that the mapping</div><div class='add'>+		 * in skb_to_sgvec can not error.</div><div class='add'>+		 * Note that skb_linearize requires the skb not to be shared.</div><div class='add'>+		 */</div><div class='add'>+		if (skb_linearize(skb))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		num_sge = skb_to_sgvec(skb, msg-&gt;sg.data, off, len);</div><div class='add'>+		if (unlikely(num_sge &lt; 0))</div><div class='add'>+			return num_sge;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)</div><div class='add'>+	psock-&gt;ingress_bytes += len;</div><div class='add'>+#endif</div><div class='add'>+	copied = len;</div><div class='add'>+	msg-&gt;sg.start = 0;</div><div class='add'>+	msg-&gt;sg.size = copied;</div><div class='add'>+	msg-&gt;sg.end = num_sge;</div><div class='add'>+	msg-&gt;skb = take_ref ? skb_get(skb) : skb;</div><div class='add'>+</div><div class='add'>+	sk_psock_queue_msg(psock, msg);</div><div class='add'>+	sk_psock_data_ready(sk, psock);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb,</div><div class='add'>+				     u32 off, u32 len, bool take_ref);</div><div class='add'>+</div><div class='add'>+static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb,</div><div class='add'>+				u32 off, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = psock-&gt;sk;</div><div class='add'>+	struct sk_msg *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If we are receiving on the same sock skb-&gt;sk is already assigned,</div><div class='add'>+	 * skip memory accounting and owner transition seeing it already set</div><div class='add'>+	 * correctly.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb-&gt;sk == sk))</div><div class='add'>+		return sk_psock_skb_ingress_self(psock, skb, off, len, true);</div><div class='add'>+	msg = sk_psock_create_ingress_msg(sk, skb);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* This will transition ownership of the data from the socket where</div><div class='add'>+	 * the BPF program was run initiating the redirect to the socket</div><div class='add'>+	 * we will eventually receive this data on. The data will be released</div><div class='add'>+	 * from skb_consume found in __tcp_bpf_recvmsg() after its been copied</div><div class='add'>+	 * into user buffers.</div><div class='add'>+	 */</div><div class='add'>+	skb_set_owner_r(skb, sk);</div><div class='add'>+	err = sk_psock_skb_ingress_enqueue(skb, off, len, psock, sk, msg, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		kfree(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Puts an skb on the ingress queue of the socket already assigned to the</div><div class='add'>+ * skb. In this case we do not need to check memory limits or skb_set_owner_r</div><div class='add'>+ * because the skb is already accounted for here.</div><div class='add'>+ */</div><div class='add'>+static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb,</div><div class='add'>+				     u32 off, u32 len, bool take_ref)</div><div class='add'>+{</div><div class='add'>+	struct sk_msg *msg = alloc_sk_msg(GFP_ATOMIC);</div><div class='add'>+	struct sock *sk = psock-&gt;sk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!msg))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	skb_set_owner_r(skb, sk);</div><div class='add'>+	err = sk_psock_skb_ingress_enqueue(skb, off, len, psock, sk, msg, take_ref);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		kfree(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_psock_handle_skb(struct sk_psock *psock, struct sk_buff *skb,</div><div class='add'>+			       u32 off, u32 len, bool ingress)</div><div class='add'>+{</div><div class='add'>+	if (!ingress) {</div><div class='add'>+		if (!sock_writeable(psock-&gt;sk))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		return skb_send_sock(psock-&gt;sk, skb, off, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk_psock_skb_ingress(psock, skb, off, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_skb_state(struct sk_psock *psock,</div><div class='add'>+			       struct sk_psock_work_state *state,</div><div class='add'>+			       int len, int off)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+	if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {</div><div class='add'>+		state-&gt;len = len;</div><div class='add'>+		state-&gt;off = off;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_backlog(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dwork = to_delayed_work(work);</div><div class='add'>+	struct sk_psock *psock = container_of(dwork, struct sk_psock, work);</div><div class='add'>+	struct sk_psock_work_state *state = &amp;psock-&gt;work_state;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	u32 len = 0, off = 0;</div><div class='add'>+	bool ingress;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* If sk is quickly removed from the map and then added back, the old</div><div class='add'>+	 * psock should not be scheduled, because there are now two psocks</div><div class='add'>+	 * pointing to the same sk.</div><div class='add'>+	 */</div><div class='add'>+	if (!sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Increment the psock refcnt to synchronize with close(fd) path in</div><div class='add'>+	 * sock_map_close(), ensuring we wait for backlog thread completion</div><div class='add'>+	 * before sk_socket freed. If refcnt increment fails, it indicates</div><div class='add'>+	 * sock_map_close() completed with sk_socket potentially already freed.</div><div class='add'>+	 */</div><div class='add'>+	if (!sk_psock_get(psock-&gt;sk))</div><div class='add'>+		return;</div><div class='add'>+	mutex_lock(&amp;psock-&gt;work_mutex);</div><div class='add'>+	while ((skb = skb_peek(&amp;psock-&gt;ingress_skb))) {</div><div class='add'>+		len = skb-&gt;len;</div><div class='add'>+		off = 0;</div><div class='add'>+		if (skb_bpf_strparser(skb)) {</div><div class='add'>+			struct strp_msg *stm = strp_msg(skb);</div><div class='add'>+</div><div class='add'>+			off = stm-&gt;offset;</div><div class='add'>+			len = stm-&gt;full_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Resume processing from previous partial state */</div><div class='add'>+		if (unlikely(state-&gt;len)) {</div><div class='add'>+			len = state-&gt;len;</div><div class='add'>+			off = state-&gt;off;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ingress = skb_bpf_ingress(skb);</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		do {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			if (!sock_flag(psock-&gt;sk, SOCK_DEAD))</div><div class='add'>+				ret = sk_psock_handle_skb(psock, skb, off,</div><div class='add'>+							  len, ingress);</div><div class='add'>+			if (ret &lt;= 0) {</div><div class='add'>+				if (ret == -EAGAIN) {</div><div class='add'>+					sk_psock_skb_state(psock, state, len, off);</div><div class='add'>+					/* Restore redir info we cleared before */</div><div class='add'>+					skb_bpf_set_redir(skb, psock-&gt;sk, ingress);</div><div class='add'>+					/* Delay slightly to prioritize any</div><div class='add'>+					 * other work that might be here.</div><div class='add'>+					 */</div><div class='add'>+					if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))</div><div class='add'>+						schedule_delayed_work(&amp;psock-&gt;work, 1);</div><div class='add'>+					goto end;</div><div class='add'>+				}</div><div class='add'>+				/* Hard errors break pipe and stop xmit. */</div><div class='add'>+				sk_psock_report_error(psock, ret ? -ret : EPIPE);</div><div class='add'>+				sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);</div><div class='add'>+				goto end;</div><div class='add'>+			}</div><div class='add'>+			off += ret;</div><div class='add'>+			len -= ret;</div><div class='add'>+		} while (len);</div><div class='add'>+</div><div class='add'>+		/* The entire skb sent, clear state */</div><div class='add'>+		sk_psock_skb_state(psock, state, 0, 0);</div><div class='add'>+		skb = skb_dequeue(&amp;psock-&gt;ingress_skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	mutex_unlock(&amp;psock-&gt;work_mutex);</div><div class='add'>+	sk_psock_put(psock-&gt;sk, psock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_psock *sk_psock_init(struct sock *sk, int node)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct proto *prot;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+</div><div class='add'>+	if (sk_is_inet(sk) &amp;&amp; inet_csk_has_ulp(sk)) {</div><div class='add'>+		psock = ERR_PTR(-EINVAL);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_user_data) {</div><div class='add'>+		psock = ERR_PTR(-EBUSY);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psock = kzalloc_node(sizeof(*psock), GFP_ATOMIC | __GFP_NOWARN, node);</div><div class='add'>+	if (!psock) {</div><div class='add'>+		psock = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+	psock-&gt;sk = sk;</div><div class='add'>+	psock-&gt;eval = __SK_NONE;</div><div class='add'>+	psock-&gt;sk_proto = prot;</div><div class='add'>+	psock-&gt;saved_unhash = prot-&gt;unhash;</div><div class='add'>+	psock-&gt;saved_destroy = prot-&gt;destroy;</div><div class='add'>+	psock-&gt;saved_close = prot-&gt;close;</div><div class='add'>+	psock-&gt;saved_write_space = sk-&gt;sk_write_space;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;psock-&gt;link);</div><div class='add'>+	spin_lock_init(&amp;psock-&gt;link_lock);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;psock-&gt;work, sk_psock_backlog);</div><div class='add'>+	mutex_init(&amp;psock-&gt;work_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;psock-&gt;ingress_msg);</div><div class='add'>+	spin_lock_init(&amp;psock-&gt;ingress_lock);</div><div class='add'>+	skb_queue_head_init(&amp;psock-&gt;ingress_skb);</div><div class='add'>+</div><div class='add'>+	sk_psock_set_state(psock, SK_PSOCK_TX_ENABLED);</div><div class='add'>+	refcount_set(&amp;psock-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+	__rcu_assign_sk_user_data_with_flags(sk, psock,</div><div class='add'>+					     SK_USER_DATA_NOCOPY |</div><div class='add'>+					     SK_USER_DATA_PSOCK);</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	return psock;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_psock_init);</div><div class='add'>+</div><div class='add'>+struct sk_psock_link *sk_psock_link_pop(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock_link *link;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+	link = list_first_entry_or_null(&amp;psock-&gt;link, struct sk_psock_link,</div><div class='add'>+					list);</div><div class='add'>+	if (link)</div><div class='add'>+		list_del(&amp;link-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __sk_psock_purge_ingress_msg(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct sk_msg *msg, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(msg, tmp, &amp;psock-&gt;ingress_msg, list) {</div><div class='add'>+		list_del(&amp;msg-&gt;list);</div><div class='add'>+		if (!msg-&gt;skb)</div><div class='add'>+			atomic_sub(msg-&gt;sg.size, &amp;psock-&gt;sk-&gt;sk_rmem_alloc);</div><div class='add'>+		sk_msg_free(psock-&gt;sk, msg);</div><div class='add'>+		kfree(msg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __sk_psock_zap_ingress(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;psock-&gt;ingress_skb)) != NULL) {</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		sock_drop(psock-&gt;sk, skb);</div><div class='add'>+	}</div><div class='add'>+	__sk_psock_purge_ingress_msg(psock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_link_destroy(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock_link *link, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(link, tmp, &amp;psock-&gt;link, list) {</div><div class='add'>+		list_del(&amp;link-&gt;list);</div><div class='add'>+		sk_psock_free_link(link);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_stop(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+	sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);</div><div class='add'>+	sk_psock_cork_free(psock);</div><div class='add'>+	spin_unlock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_done_strp(struct sk_psock *psock);</div><div class='add'>+</div><div class='add'>+static void sk_psock_destroy(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock = container_of(to_rcu_work(work),</div><div class='add'>+					      struct sk_psock, rwork);</div><div class='add'>+	/* No sk_callback_lock since already detached. */</div><div class='add'>+</div><div class='add'>+	sk_psock_done_strp(psock);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;psock-&gt;work);</div><div class='add'>+	__sk_psock_zap_ingress(psock);</div><div class='add'>+	mutex_destroy(&amp;psock-&gt;work_mutex);</div><div class='add'>+</div><div class='add'>+	psock_progs_drop(&amp;psock-&gt;progs);</div><div class='add'>+</div><div class='add'>+	sk_psock_link_destroy(psock);</div><div class='add'>+	sk_psock_cork_free(psock);</div><div class='add'>+</div><div class='add'>+	if (psock-&gt;sk_redir)</div><div class='add'>+		sock_put(psock-&gt;sk_redir);</div><div class='add'>+	if (psock-&gt;sk_pair)</div><div class='add'>+		sock_put(psock-&gt;sk_pair);</div><div class='add'>+	sock_put(psock-&gt;sk);</div><div class='add'>+	kfree(psock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_drop(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	sk_psock_restore_proto(sk, psock);</div><div class='add'>+	rcu_assign_sk_user_data(sk, NULL);</div><div class='add'>+	if (psock-&gt;progs.stream_parser)</div><div class='add'>+		sk_psock_stop_strp(sk, psock);</div><div class='add'>+	else if (psock-&gt;progs.stream_verdict || psock-&gt;progs.skb_verdict)</div><div class='add'>+		sk_psock_stop_verdict(sk, psock);</div><div class='add'>+	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+</div><div class='add'>+	sk_psock_stop(psock);</div><div class='add'>+</div><div class='add'>+	INIT_RCU_WORK(&amp;psock-&gt;rwork, sk_psock_destroy);</div><div class='add'>+	queue_rcu_work(system_percpu_wq, &amp;psock-&gt;rwork);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_psock_drop);</div><div class='add'>+</div><div class='add'>+static int sk_psock_map_verd(int verdict, bool redir)</div><div class='add'>+{</div><div class='add'>+	switch (verdict) {</div><div class='add'>+	case SK_PASS:</div><div class='add'>+		return redir ? __SK_REDIRECT : __SK_PASS;</div><div class='add'>+	case SK_DROP:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __SK_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock,</div><div class='add'>+			 struct sk_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	prog = READ_ONCE(psock-&gt;progs.msg_parser);</div><div class='add'>+	if (unlikely(!prog)) {</div><div class='add'>+		ret = __SK_PASS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_msg_compute_data_pointers(msg);</div><div class='add'>+	msg-&gt;sk = sk;</div><div class='add'>+	ret = bpf_prog_run_pin_on_cpu(prog, msg);</div><div class='add'>+	ret = sk_psock_map_verd(ret, msg-&gt;sk_redir);</div><div class='add'>+	psock-&gt;apply_bytes = msg-&gt;apply_bytes;</div><div class='add'>+	if (ret == __SK_REDIRECT) {</div><div class='add'>+		if (psock-&gt;sk_redir) {</div><div class='add'>+			sock_put(psock-&gt;sk_redir);</div><div class='add'>+			psock-&gt;sk_redir = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (!msg-&gt;sk_redir) {</div><div class='add'>+			ret = __SK_DROP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		psock-&gt;redir_ingress = sk_msg_to_ingress(msg);</div><div class='add'>+		psock-&gt;sk_redir = msg-&gt;sk_redir;</div><div class='add'>+		sock_hold(psock-&gt;sk_redir);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_psock_msg_verdict);</div><div class='add'>+</div><div class='add'>+static int sk_psock_skb_redirect(struct sk_psock *from, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock_other;</div><div class='add'>+	struct sock *sk_other;</div><div class='add'>+</div><div class='add'>+	sk_other = skb_bpf_redirect_fetch(skb);</div><div class='add'>+	/* This error is a buggy BPF program, it returned a redirect</div><div class='add'>+	 * return code, but then didn't set a redirect interface.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!sk_other)) {</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		sock_drop(from-&gt;sk, skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	psock_other = sk_psock(sk_other);</div><div class='add'>+	/* This error indicates the socket is being torn down or had another</div><div class='add'>+	 * error that caused the pipe to break. We can't send a packet on</div><div class='add'>+	 * a socket that is in this state so we drop the skb.</div><div class='add'>+	 */</div><div class='add'>+	if (!psock_other || sock_flag(sk_other, SOCK_DEAD)) {</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		sock_drop(from-&gt;sk, skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_bh(&amp;psock_other-&gt;ingress_lock);</div><div class='add'>+	if (!sk_psock_test_state(psock_other, SK_PSOCK_TX_ENABLED)) {</div><div class='add'>+		spin_unlock_bh(&amp;psock_other-&gt;ingress_lock);</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		sock_drop(from-&gt;sk, skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;psock_other-&gt;ingress_skb, skb);</div><div class='add'>+	schedule_delayed_work(&amp;psock_other-&gt;work, 0);</div><div class='add'>+	spin_unlock_bh(&amp;psock_other-&gt;ingress_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_tls_verdict_apply(struct sk_buff *skb,</div><div class='add'>+				       struct sk_psock *from, int verdict)</div><div class='add'>+{</div><div class='add'>+	switch (verdict) {</div><div class='add'>+	case __SK_REDIRECT:</div><div class='add'>+		sk_psock_skb_redirect(from, skb);</div><div class='add'>+		break;</div><div class='add'>+	case __SK_PASS:</div><div class='add'>+	case __SK_DROP:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret = __SK_PASS;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	prog = READ_ONCE(psock-&gt;progs.stream_verdict);</div><div class='add'>+	if (likely(prog)) {</div><div class='add'>+		skb-&gt;sk = psock-&gt;sk;</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		ret = bpf_prog_run_pin_on_cpu(prog, skb);</div><div class='add'>+		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));</div><div class='add'>+		skb-&gt;sk = NULL;</div><div class='add'>+	}</div><div class='add'>+	sk_psock_tls_verdict_apply(skb, psock, ret);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_psock_tls_strp_read);</div><div class='add'>+</div><div class='add'>+static int sk_psock_verdict_apply(struct sk_psock *psock, struct sk_buff *skb,</div><div class='add'>+				  int verdict)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk_other;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 len, off;</div><div class='add'>+</div><div class='add'>+	switch (verdict) {</div><div class='add'>+	case __SK_PASS:</div><div class='add'>+		err = -EIO;</div><div class='add'>+		sk_other = psock-&gt;sk;</div><div class='add'>+		if (sock_flag(sk_other, SOCK_DEAD) ||</div><div class='add'>+		    !sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))</div><div class='add'>+			goto out_free;</div><div class='add'>+</div><div class='add'>+		skb_bpf_set_ingress(skb);</div><div class='add'>+</div><div class='add'>+		/* If the queue is empty then we can submit directly</div><div class='add'>+		 * into the msg queue. If its not empty we have to</div><div class='add'>+		 * queue work otherwise we may get OOO data. Otherwise,</div><div class='add'>+		 * if sk_psock_skb_ingress errors will be handled by</div><div class='add'>+		 * retrying later from workqueue.</div><div class='add'>+		 */</div><div class='add'>+		if (skb_queue_empty(&amp;psock-&gt;ingress_skb)) {</div><div class='add'>+			len = skb-&gt;len;</div><div class='add'>+			off = 0;</div><div class='add'>+			if (skb_bpf_strparser(skb)) {</div><div class='add'>+				struct strp_msg *stm = strp_msg(skb);</div><div class='add'>+</div><div class='add'>+				off = stm-&gt;offset;</div><div class='add'>+				len = stm-&gt;full_len;</div><div class='add'>+			}</div><div class='add'>+			err = sk_psock_skb_ingress_self(psock, skb, off, len, false);</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			spin_lock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+			if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {</div><div class='add'>+				skb_queue_tail(&amp;psock-&gt;ingress_skb, skb);</div><div class='add'>+				schedule_delayed_work(&amp;psock-&gt;work, 0);</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto out_free;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case __SK_REDIRECT:</div><div class='add'>+		tcp_eat_skb(psock-&gt;sk, skb);</div><div class='add'>+		err = sk_psock_skb_redirect(psock, skb);</div><div class='add'>+		break;</div><div class='add'>+	case __SK_DROP:</div><div class='add'>+	default:</div><div class='add'>+out_free:</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		tcp_eat_skb(psock-&gt;sk, skb);</div><div class='add'>+		sock_drop(psock-&gt;sk, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_write_space(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	void (*write_space)(struct sock *sk) = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (likely(psock)) {</div><div class='add'>+		if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))</div><div class='add'>+			schedule_delayed_work(&amp;psock-&gt;work, 0);</div><div class='add'>+		write_space = psock-&gt;saved_write_space;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (write_space)</div><div class='add'>+		write_space(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)</div><div class='add'>+static void sk_psock_strp_read(struct strparser *strp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret = __SK_DROP;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk = strp-&gt;sk;</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (unlikely(!psock)) {</div><div class='add'>+		sock_drop(sk, skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	prog = READ_ONCE(psock-&gt;progs.stream_verdict);</div><div class='add'>+	if (likely(prog)) {</div><div class='add'>+		skb-&gt;sk = sk;</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		ret = bpf_prog_run_pin_on_cpu(prog, skb);</div><div class='add'>+		skb_bpf_set_strparser(skb);</div><div class='add'>+		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));</div><div class='add'>+		skb-&gt;sk = NULL;</div><div class='add'>+	}</div><div class='add'>+	sk_psock_verdict_apply(psock, skb, ret);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_psock_strp_read_done(struct strparser *strp, int err)</div><div class='add'>+{</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_psock_strp_parse(struct strparser *strp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock = container_of(strp, struct sk_psock, strp);</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	prog = READ_ONCE(psock-&gt;progs.stream_parser);</div><div class='add'>+	if (likely(prog)) {</div><div class='add'>+		skb-&gt;sk = psock-&gt;sk;</div><div class='add'>+		ret = bpf_prog_run_pin_on_cpu(prog, skb);</div><div class='add'>+		skb-&gt;sk = NULL;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with socket lock held. */</div><div class='add'>+static void sk_psock_strp_data_ready(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (likely(psock)) {</div><div class='add'>+		if (tls_sw_has_ctx_rx(sk)) {</div><div class='add'>+			psock-&gt;saved_data_ready(sk);</div><div class='add'>+		} else {</div><div class='add'>+			read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+			strp_data_ready(&amp;psock-&gt;strp);</div><div class='add'>+			read_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	static const struct strp_callbacks cb = {</div><div class='add'>+		.rcv_msg	= sk_psock_strp_read,</div><div class='add'>+		.read_sock_done	= sk_psock_strp_read_done,</div><div class='add'>+		.parse_msg	= sk_psock_strp_parse,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = strp_init(&amp;psock-&gt;strp, sk, &amp;cb);</div><div class='add'>+	if (!ret)</div><div class='add'>+		sk_psock_set_state(psock, SK_PSOCK_RX_STRP_ENABLED);</div><div class='add'>+</div><div class='add'>+	if (sk_is_tcp(sk)) {</div><div class='add'>+		psock-&gt;strp.cb.read_sock = tcp_bpf_strp_read_sock;</div><div class='add'>+		psock-&gt;copied_seq = tcp_sk(sk)-&gt;copied_seq;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	if (psock-&gt;saved_data_ready)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psock-&gt;saved_data_ready = sk-&gt;sk_data_ready;</div><div class='add'>+	sk-&gt;sk_data_ready = sk_psock_strp_data_ready;</div><div class='add'>+	sk-&gt;sk_write_space = sk_psock_write_space;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	psock_set_prog(&amp;psock-&gt;progs.stream_parser, NULL);</div><div class='add'>+</div><div class='add'>+	if (!psock-&gt;saved_data_ready)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_data_ready = psock-&gt;saved_data_ready;</div><div class='add'>+	psock-&gt;saved_data_ready = NULL;</div><div class='add'>+	strp_stop(&amp;psock-&gt;strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_done_strp(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	/* Parser has been stopped */</div><div class='add'>+	if (sk_psock_test_state(psock, SK_PSOCK_RX_STRP_ENABLED))</div><div class='add'>+		strp_done(&amp;psock-&gt;strp);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void sk_psock_done_strp(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BPF_STREAM_PARSER */</div><div class='add'>+</div><div class='add'>+static int sk_psock_verdict_recv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret = __SK_DROP;</div><div class='add'>+	int len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (unlikely(!psock)) {</div><div class='add'>+		len = 0;</div><div class='add'>+		tcp_eat_skb(sk, skb);</div><div class='add'>+		sock_drop(sk, skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	prog = READ_ONCE(psock-&gt;progs.stream_verdict);</div><div class='add'>+	if (!prog)</div><div class='add'>+		prog = READ_ONCE(psock-&gt;progs.skb_verdict);</div><div class='add'>+	if (likely(prog)) {</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_bpf_redirect_clear(skb);</div><div class='add'>+		ret = bpf_prog_run_pin_on_cpu(prog, skb);</div><div class='add'>+		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));</div><div class='add'>+	}</div><div class='add'>+	ret = sk_psock_verdict_apply(psock, skb, ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		len = ret;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sk_psock_verdict_data_ready(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock = sk-&gt;sk_socket;</div><div class='add'>+	const struct proto_ops *ops;</div><div class='add'>+	int copied;</div><div class='add'>+</div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!sock))</div><div class='add'>+		return;</div><div class='add'>+	ops = READ_ONCE(sock-&gt;ops);</div><div class='add'>+	if (!ops || !ops-&gt;read_skb)</div><div class='add'>+		return;</div><div class='add'>+	copied = ops-&gt;read_skb(sk, sk_psock_verdict_recv);</div><div class='add'>+	if (copied &gt;= 0) {</div><div class='add'>+		struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		psock = sk_psock(sk);</div><div class='add'>+		if (psock)</div><div class='add'>+			sk_psock_data_ready(sk, psock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	if (psock-&gt;saved_data_ready)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psock-&gt;saved_data_ready = sk-&gt;sk_data_ready;</div><div class='add'>+	sk-&gt;sk_data_ready = sk_psock_verdict_data_ready;</div><div class='add'>+	sk-&gt;sk_write_space = sk_psock_write_space;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	psock_set_prog(&amp;psock-&gt;progs.stream_verdict, NULL);</div><div class='add'>+	psock_set_prog(&amp;psock-&gt;progs.skb_verdict, NULL);</div><div class='add'>+</div><div class='add'>+	if (!psock-&gt;saved_data_ready)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_data_ready = psock-&gt;saved_data_ready;</div><div class='add'>+	psock-&gt;saved_data_ready = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/net/core/sock.c b/net/core/sock.c<br/>index 3730eb855095..45c98bf524b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sock.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,7 +7,6 @@</div><div class='ctx'>  *		Generic socket support routines. Memory allocators, socket lock/release</div><div class='ctx'>  *		handler for protocols to use and generic option handler.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Ross Biro</div><div class='ctx'>  *		Fred N. van Kempen, &lt;waltje@uWalt.NL.Mugnet.ORG&gt;</div><div class='ctx'>  *		Florian La Roche, &lt;flla@stud.uni-sb.de&gt;</div><div class='hunk'>@@ -81,17 +81,11 @@</div><div class='ctx'>  *		Arnaldo C. Melo :       cleanups, use skb_queue_purge</div><div class='ctx'>  *</div><div class='ctx'>  * To Fix:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='hunk'>@@ -113,21 +107,28 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='ctx'> #include &lt;linux/memcontrol.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/mroute.h&gt;</div><div class='add'>+#include &lt;linux/mroute6.h&gt;</div><div class='add'>+#include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/request_sock.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;linux/ipsec.h&gt;</div><div class='hunk'>@@ -137,16 +138,25 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/phonet/phonet.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/pidfd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dev.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(proto_list_mutex);</div><div class='ctx'> static LIST_HEAD(proto_list);</div><div class='ctx'> </div><div class='del'>-static void sock_inuse_add(struct net *net, int val);</div><div class='add'>+static void sock_def_write_space_wfree(struct sock *sk, int wmem_alloc);</div><div class='add'>+static void sock_def_write_space(struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * sk_ns_capable - General socket capability test</div><div class='hunk'>@@ -228,6 +238,7 @@ static struct lock_class_key af_family_kern_slock_keys[AF_MAX];</div><div class='ctx'>   x "AF_IEEE802154",	x "AF_CAIF"	,	x "AF_ALG"      , \</div><div class='ctx'>   x "AF_NFC"   ,	x "AF_VSOCK"    ,	x "AF_KCM"      , \</div><div class='ctx'>   x "AF_QIPCRTR",	x "AF_SMC"	,	x "AF_XDP"	, \</div><div class='add'>+  x "AF_MCTP"  , \</div><div class='ctx'>   x "AF_MAX"</div><div class='ctx'> </div><div class='ctx'> static const char *const af_family_key_strings[AF_MAX+1] = {</div><div class='hunk'>@@ -270,18 +281,12 @@ static struct lock_class_key af_elock_keys[AF_MAX];</div><div class='ctx'> static struct lock_class_key af_kern_callback_keys[AF_MAX];</div><div class='ctx'> </div><div class='ctx'> /* Run time adjustable parameters. */</div><div class='del'>-__u32 sysctl_wmem_max __read_mostly = SK_WMEM_MAX;</div><div class='add'>+__u32 sysctl_wmem_max __read_mostly = 4 &lt;&lt; 20;</div><div class='ctx'> EXPORT_SYMBOL(sysctl_wmem_max);</div><div class='del'>-__u32 sysctl_rmem_max __read_mostly = SK_RMEM_MAX;</div><div class='add'>+__u32 sysctl_rmem_max __read_mostly = 4 &lt;&lt; 20;</div><div class='ctx'> EXPORT_SYMBOL(sysctl_rmem_max);</div><div class='del'>-__u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX;</div><div class='del'>-__u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX;</div><div class='del'>-</div><div class='del'>-/* Maximal space eaten by iovec or ancillary data plus some space */</div><div class='del'>-int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512);</div><div class='del'>-EXPORT_SYMBOL(sysctl_optmem_max);</div><div class='del'>-</div><div class='del'>-int sysctl_tstamp_allow_data __read_mostly = 1;</div><div class='add'>+__u32 sysctl_wmem_default __read_mostly = SK_WMEM_DEFAULT;</div><div class='add'>+__u32 sysctl_rmem_default __read_mostly = SK_RMEM_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> DEFINE_STATIC_KEY_FALSE(memalloc_socks_key);</div><div class='ctx'> EXPORT_SYMBOL_GPL(memalloc_socks_key);</div><div class='hunk'>@@ -328,28 +333,113 @@ int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	BUG_ON(!sock_flag(sk, SOCK_MEMALLOC));</div><div class='ctx'> </div><div class='ctx'> 	noreclaim_flag = memalloc_noreclaim_save();</div><div class='del'>-	ret = sk-&gt;sk_backlog_rcv(sk, skb);</div><div class='add'>+	ret = INDIRECT_CALL_INET(sk-&gt;sk_backlog_rcv,</div><div class='add'>+				 tcp_v6_do_rcv,</div><div class='add'>+				 tcp_v4_do_rcv,</div><div class='add'>+				 sk, skb);</div><div class='ctx'> 	memalloc_noreclaim_restore(noreclaim_flag);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sk_backlog_rcv);</div><div class='ctx'> </div><div class='del'>-static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)</div><div class='add'>+void sk_error_report(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct timeval tv;</div><div class='add'>+	sk-&gt;sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+	switch (sk-&gt;sk_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		trace_inet_sk_error_report(sk);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sk_error_report);</div><div class='add'>+</div><div class='add'>+int sock_get_timeout(long timeo, void *optval, bool old_timeval)</div><div class='add'>+{</div><div class='add'>+	struct __kernel_sock_timeval tv;</div><div class='add'>+</div><div class='add'>+	if (timeo == MAX_SCHEDULE_TIMEOUT) {</div><div class='add'>+		tv.tv_sec = 0;</div><div class='add'>+		tv.tv_usec = 0;</div><div class='add'>+	} else {</div><div class='add'>+		tv.tv_sec = timeo / HZ;</div><div class='add'>+		tv.tv_usec = ((timeo % HZ) * USEC_PER_SEC) / HZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old_timeval &amp;&amp; in_compat_syscall() &amp;&amp; !COMPAT_USE_64BIT_TIME) {</div><div class='add'>+		struct old_timeval32 tv32 = { tv.tv_sec, tv.tv_usec };</div><div class='add'>+		*(struct old_timeval32 *)optval = tv32;</div><div class='add'>+		return sizeof(tv32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old_timeval) {</div><div class='add'>+		struct __kernel_old_timeval old_tv;</div><div class='add'>+		old_tv.tv_sec = tv.tv_sec;</div><div class='add'>+		old_tv.tv_usec = tv.tv_usec;</div><div class='add'>+		*(struct __kernel_old_timeval *)optval = old_tv;</div><div class='add'>+		return sizeof(old_tv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*(struct __kernel_sock_timeval *)optval = tv;</div><div class='add'>+	return sizeof(tv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_get_timeout);</div><div class='add'>+</div><div class='add'>+int sock_copy_user_timeval(struct __kernel_sock_timeval *tv,</div><div class='add'>+			   sockptr_t optval, int optlen, bool old_timeval)</div><div class='add'>+{</div><div class='add'>+	if (old_timeval &amp;&amp; in_compat_syscall() &amp;&amp; !COMPAT_USE_64BIT_TIME) {</div><div class='add'>+		struct old_timeval32 tv32;</div><div class='add'>+</div><div class='add'>+		if (optlen &lt; sizeof(tv32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (copy_from_sockptr(&amp;tv32, optval, sizeof(tv32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		tv-&gt;tv_sec = tv32.tv_sec;</div><div class='add'>+		tv-&gt;tv_usec = tv32.tv_usec;</div><div class='add'>+	} else if (old_timeval) {</div><div class='add'>+		struct __kernel_old_timeval old_tv;</div><div class='add'>+</div><div class='add'>+		if (optlen &lt; sizeof(old_tv))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;old_tv, optval, sizeof(old_tv)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		tv-&gt;tv_sec = old_tv.tv_sec;</div><div class='add'>+		tv-&gt;tv_usec = old_tv.tv_usec;</div><div class='add'>+	} else {</div><div class='add'>+		if (optlen &lt; sizeof(*tv))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(tv, optval, sizeof(*tv)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_copy_user_timeval);</div><div class='add'>+</div><div class='add'>+static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen,</div><div class='add'>+			    bool old_timeval)</div><div class='add'>+{</div><div class='add'>+	struct __kernel_sock_timeval tv;</div><div class='add'>+	int err = sock_copy_user_timeval(&amp;tv, optval, optlen, old_timeval);</div><div class='add'>+	long val;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (optlen &lt; sizeof(tv))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (copy_from_user(&amp;tv, optval, sizeof(tv)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	if (tv.tv_usec &lt; 0 || tv.tv_usec &gt;= USEC_PER_SEC)</div><div class='ctx'> 		return -EDOM;</div><div class='ctx'> </div><div class='ctx'> 	if (tv.tv_sec &lt; 0) {</div><div class='ctx'> 		static int warned __read_mostly;</div><div class='ctx'> </div><div class='del'>-		*timeo_p = 0;</div><div class='add'>+		WRITE_ONCE(*timeo_p, 0);</div><div class='ctx'> 		if (warned &lt; 10 &amp;&amp; net_ratelimit()) {</div><div class='ctx'> 			warned++;</div><div class='ctx'> 			pr_info("%s: `%s' (pid %d) tries to set negative timeout\n",</div><div class='hunk'>@@ -357,24 +447,20 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	*timeo_p = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-	if (tv.tv_sec == 0 &amp;&amp; tv.tv_usec == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	if (tv.tv_sec &lt; (MAX_SCHEDULE_TIMEOUT/HZ - 1))</div><div class='del'>-		*timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ);</div><div class='add'>+	val = MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+	if ((tv.tv_sec || tv.tv_usec) &amp;&amp;</div><div class='add'>+	    (tv.tv_sec &lt; (MAX_SCHEDULE_TIMEOUT / HZ - 1)))</div><div class='add'>+		val = tv.tv_sec * HZ + DIV_ROUND_UP((unsigned long)tv.tv_usec,</div><div class='add'>+						    USEC_PER_SEC / HZ);</div><div class='add'>+	WRITE_ONCE(*timeo_p, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sock_warn_obsolete_bsdism(const char *name)</div><div class='add'>+static bool sk_set_prio_allowed(const struct sock *sk, int val)</div><div class='ctx'> {</div><div class='del'>-	static int warned;</div><div class='del'>-	static char warncomm[TASK_COMM_LEN];</div><div class='del'>-	if (strcmp(warncomm, current-&gt;comm) &amp;&amp; warned &lt; 5) {</div><div class='del'>-		strcpy(warncomm,  current-&gt;comm);</div><div class='del'>-		pr_warn("process `%s' is using obsolete %s SO_BSDCOMPAT\n",</div><div class='del'>-			warncomm, name);</div><div class='del'>-		warned++;</div><div class='del'>-	}</div><div class='add'>+	return ((val &gt;= TC_PRIO_BESTEFFORT &amp;&amp; val &lt;= TC_PRIO_INTERACTIVE) ||</div><div class='add'>+		sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_RAW) ||</div><div class='add'>+		sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool sock_needs_netstamp(const struct sock *sk)</div><div class='hunk'>@@ -404,14 +490,14 @@ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct sk_buff_head *list = &amp;sk-&gt;sk_receive_queue;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt;= sk-&gt;sk_rcvbuf) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt;= READ_ONCE(sk-&gt;sk_rcvbuf)) {</div><div class='add'>+		sk_drops_inc(sk);</div><div class='ctx'> 		trace_sock_rcvqueue_full(sk, skb);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sk_rmem_schedule(sk, skb, skb-&gt;truesize)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+		sk_drops_inc(sk);</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -434,30 +520,50 @@ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sock_queue_rcv_skb);</div><div class='ctx'> </div><div class='del'>-int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+int sock_queue_rcv_skb_reason(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			      enum skb_drop_reason *reason)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason drop_reason;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = sk_filter(sk, skb);</div><div class='add'>+	err = sk_filter_reason(sk, skb, &amp;drop_reason);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return __sock_queue_rcv_skb(sk, skb);</div><div class='add'>+	err = __sock_queue_rcv_skb(sk, skb);</div><div class='add'>+	switch (err) {</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		drop_reason = SKB_DROP_REASON_SOCKET_RCVBUFF;</div><div class='add'>+		break;</div><div class='add'>+	case -ENOBUFS:</div><div class='add'>+		drop_reason = SKB_DROP_REASON_PROTO_MEM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		drop_reason = SKB_NOT_DROPPED_YET;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (reason)</div><div class='add'>+		*reason = drop_reason;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(sock_queue_rcv_skb);</div><div class='add'>+EXPORT_SYMBOL(sock_queue_rcv_skb_reason);</div><div class='ctx'> </div><div class='ctx'> int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		     const int nested, unsigned int trim_cap, bool refcounted)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	int rc = NET_RX_SUCCESS;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (sk_filter_trim_cap(sk, skb, trim_cap))</div><div class='add'>+	if (sk_filter_trim_cap(sk, skb, trim_cap, &amp;reason))</div><div class='ctx'> 		goto discard_and_relse;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = NULL;</div><div class='ctx'> </div><div class='del'>-	if (sk_rcvqueues_full(sk, sk-&gt;sk_rcvbuf)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+	if (sk_rcvqueues_full(sk, READ_ONCE(sk-&gt;sk_rcvbuf))) {</div><div class='add'>+		sk_drops_inc(sk);</div><div class='add'>+		reason = SKB_DROP_REASON_SOCKET_RCVBUFF;</div><div class='ctx'> 		goto discard_and_relse;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (nested)</div><div class='hunk'>@@ -472,10 +578,14 @@ int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		rc = sk_backlog_rcv(sk, skb);</div><div class='ctx'> </div><div class='del'>-		mutex_release(&amp;sk-&gt;sk_lock.dep_map, 1, _RET_IP_);</div><div class='del'>-	} else if (sk_add_backlog(sk, skb, sk-&gt;sk_rcvbuf)) {</div><div class='add'>+		mutex_release(&amp;sk-&gt;sk_lock.dep_map, _RET_IP_);</div><div class='add'>+	} else if ((err = sk_add_backlog(sk, skb, READ_ONCE(sk-&gt;sk_rcvbuf)))) {</div><div class='ctx'> 		bh_unlock_sock(sk);</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+		if (err == -ENOMEM)</div><div class='add'>+			reason = SKB_DROP_REASON_PFMEMALLOC;</div><div class='add'>+		if (err == -ENOBUFS)</div><div class='add'>+			reason = SKB_DROP_REASON_SOCKET_BACKLOG;</div><div class='add'>+		sk_drops_inc(sk);</div><div class='ctx'> 		goto discard_and_relse;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -485,18 +595,24 @@ out:</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 	return rc;</div><div class='ctx'> discard_and_relse:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sk_receive_skb);</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,</div><div class='add'>+							  u32));</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,</div><div class='add'>+							   u32));</div><div class='ctx'> struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = __sk_dst_get(sk);</div><div class='ctx'> </div><div class='del'>-	if (dst &amp;&amp; dst-&gt;obsolete &amp;&amp; dst-&gt;ops-&gt;check(dst, cookie) == NULL) {</div><div class='add'>+	if (dst &amp;&amp; READ_ONCE(dst-&gt;obsolete) &amp;&amp;</div><div class='add'>+	    INDIRECT_CALL_INET(dst-&gt;ops-&gt;check, ip6_dst_check, ipv4_dst_check,</div><div class='add'>+			       dst, cookie) == NULL) {</div><div class='ctx'> 		sk_tx_queue_clear(sk);</div><div class='del'>-		sk-&gt;sk_dst_pending_confirm = 0;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_dst_pending_confirm, 0);</div><div class='ctx'> 		RCU_INIT_POINTER(sk-&gt;sk_dst_cache, NULL);</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -510,7 +626,9 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = sk_dst_get(sk);</div><div class='ctx'> </div><div class='del'>-	if (dst &amp;&amp; dst-&gt;obsolete &amp;&amp; dst-&gt;ops-&gt;check(dst, cookie) == NULL) {</div><div class='add'>+	if (dst &amp;&amp; READ_ONCE(dst-&gt;obsolete) &amp;&amp;</div><div class='add'>+	    INDIRECT_CALL_INET(dst-&gt;ops-&gt;check, ip6_dst_check, ipv4_dst_check,</div><div class='add'>+			       dst, cookie) == NULL) {</div><div class='ctx'> 		sk_dst_reset(sk);</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -520,21 +638,59 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_dst_check);</div><div class='ctx'> </div><div class='del'>-static int sock_setbindtodevice(struct sock *sk, char __user *optval,</div><div class='del'>-				int optlen)</div><div class='add'>+static int sock_bindtoindex_locked(struct sock *sk, int ifindex)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOPROTOOPT;</div><div class='ctx'> #ifdef CONFIG_NETDEVICES</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	char devname[IFNAMSIZ];</div><div class='del'>-	int index;</div><div class='ctx'> </div><div class='ctx'> 	/* Sorry... */</div><div class='ctx'> 	ret = -EPERM;</div><div class='del'>-	if (!ns_capable(net-&gt;user_ns, CAP_NET_RAW))</div><div class='add'>+	if (sk-&gt;sk_bound_dev_if &amp;&amp; !ns_capable(net-&gt;user_ns, CAP_NET_RAW))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='add'>+	if (ifindex &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Paired with all READ_ONCE() done locklessly. */</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_bound_dev_if, ifindex);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_prot-&gt;rehash)</div><div class='add'>+		sk-&gt;sk_prot-&gt;rehash(sk);</div><div class='add'>+	sk_dst_reset(sk);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (lock_sk)</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+	ret = sock_bindtoindex_locked(sk, ifindex);</div><div class='add'>+	if (lock_sk)</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_bindtoindex);</div><div class='add'>+</div><div class='add'>+static int sock_setbindtodevice(struct sock *sk, sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOPROTOOPT;</div><div class='add'>+#ifdef CONFIG_NETDEVICES</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	char devname[IFNAMSIZ];</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='ctx'> 	if (optlen &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -548,7 +704,7 @@ static int sock_setbindtodevice(struct sock *sk, char __user *optval,</div><div class='ctx'> 	memset(devname, 0, sizeof(devname));</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='del'>-	if (copy_from_user(devname, optval, optlen))</div><div class='add'>+	if (copy_from_sockptr(devname, optval, optlen))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	index = 0;</div><div class='hunk'>@@ -565,28 +721,25 @@ static int sock_setbindtodevice(struct sock *sk, char __user *optval,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	sk-&gt;sk_bound_dev_if = index;</div><div class='del'>-	sk_dst_reset(sk);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+	ret = sock_bindtoindex_locked(sk, index);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> out:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sock_getbindtodevice(struct sock *sk, char __user *optval,</div><div class='del'>-				int __user *optlen, int len)</div><div class='add'>+static int sock_getbindtodevice(struct sock *sk, sockptr_t optval,</div><div class='add'>+				sockptr_t optlen, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOPROTOOPT;</div><div class='ctx'> #ifdef CONFIG_NETDEVICES</div><div class='add'>+	int bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	char devname[IFNAMSIZ];</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_bound_dev_if == 0) {</div><div class='add'>+	if (bound_dev_if == 0) {</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 		goto zero;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -595,19 +748,19 @@ static int sock_getbindtodevice(struct sock *sk, char __user *optval,</div><div class='ctx'> 	if (len &lt; IFNAMSIZ)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = netdev_get_name(net, devname, sk-&gt;sk_bound_dev_if);</div><div class='add'>+	ret = netdev_get_name(net, devname, bound_dev_if);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	len = strlen(devname) + 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='del'>-	if (copy_to_user(optval, devname, len))</div><div class='add'>+	if (copy_to_sockptr(optval, devname, len))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> zero:</div><div class='ctx'> 	ret = -EFAULT;</div><div class='del'>-	if (put_user(len, optlen))</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -618,43 +771,431 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)</div><div class='del'>-{</div><div class='del'>-	if (valbool)</div><div class='del'>-		sock_set_flag(sk, bit);</div><div class='del'>-	else</div><div class='del'>-		sock_reset_flag(sk, bit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool sk_mc_loop(struct sock *sk)</div><div class='add'>+bool sk_mc_loop(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev_recursion_level())</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return true;</div><div class='del'>-	switch (sk-&gt;sk_family) {</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_family under us. */</div><div class='add'>+	switch (READ_ONCE(sk-&gt;sk_family)) {</div><div class='ctx'> 	case AF_INET:</div><div class='del'>-		return inet_sk(sk)-&gt;mc_loop;</div><div class='add'>+		return inet_test_bit(MC_LOOP, sk);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	case AF_INET6:</div><div class='del'>-		return inet6_sk(sk)-&gt;mc_loop;</div><div class='add'>+		return inet6_test_bit(MC6_LOOP, sk);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON(1);</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_mc_loop);</div><div class='ctx'> </div><div class='add'>+void sock_set_reuseaddr(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	sk-&gt;sk_reuse = SK_CAN_REUSE;</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_reuseaddr);</div><div class='add'>+</div><div class='add'>+void sock_set_reuseport(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	sk-&gt;sk_reuseport = true;</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_reuseport);</div><div class='add'>+</div><div class='add'>+void sock_no_linger(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_lingertime, 0);</div><div class='add'>+	sock_set_flag(sk, SOCK_LINGER);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_no_linger);</div><div class='add'>+</div><div class='add'>+void sock_set_priority(struct sock *sk, u32 priority)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_priority, priority);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_priority);</div><div class='add'>+</div><div class='add'>+void sock_set_sndtimeo(struct sock *sk, s64 secs)</div><div class='add'>+{</div><div class='add'>+	if (secs &amp;&amp; secs &lt; MAX_SCHEDULE_TIMEOUT / HZ - 1)</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_sndtimeo, secs * HZ);</div><div class='add'>+	else</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_sndtimeo, MAX_SCHEDULE_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_sndtimeo);</div><div class='add'>+</div><div class='add'>+static void __sock_set_timestamps(struct sock *sk, bool val, bool new, bool ns)</div><div class='add'>+{</div><div class='add'>+	sock_valbool_flag(sk, SOCK_RCVTSTAMP, val);</div><div class='add'>+	sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, val &amp;&amp; ns);</div><div class='add'>+	if (val)  {</div><div class='add'>+		sock_valbool_flag(sk, SOCK_TSTAMP_NEW, new);</div><div class='add'>+		sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sock_set_timestamp(struct sock *sk, int optname, bool valbool)</div><div class='add'>+{</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case SO_TIMESTAMP_OLD:</div><div class='add'>+		__sock_set_timestamps(sk, valbool, false, false);</div><div class='add'>+		break;</div><div class='add'>+	case SO_TIMESTAMP_NEW:</div><div class='add'>+		__sock_set_timestamps(sk, valbool, true, false);</div><div class='add'>+		break;</div><div class='add'>+	case SO_TIMESTAMPNS_OLD:</div><div class='add'>+		__sock_set_timestamps(sk, valbool, false, true);</div><div class='add'>+		break;</div><div class='add'>+	case SO_TIMESTAMPNS_NEW:</div><div class='add'>+		__sock_set_timestamps(sk, valbool, true, true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_timestamping_bind_phc(struct sock *sk, int phc_index)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	bool match = false;</div><div class='add'>+	int *vclock_index;</div><div class='add'>+	int i, num;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_bound_dev_if)</div><div class='add'>+		dev = dev_get_by_index(net, sk-&gt;sk_bound_dev_if);</div><div class='add'>+</div><div class='add'>+	if (!dev) {</div><div class='add'>+		pr_err("%s: sock not bind to device\n", __func__);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num = ethtool_get_phc_vclocks(dev, &amp;vclock_index);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		if (*(vclock_index + i) == phc_index) {</div><div class='add'>+			match = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num &gt; 0)</div><div class='add'>+		kfree(vclock_index);</div><div class='add'>+</div><div class='add'>+	if (!match)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_bind_phc, phc_index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sock_set_timestamping(struct sock *sk, int optname,</div><div class='add'>+			  struct so_timestamping timestamping)</div><div class='add'>+{</div><div class='add'>+	int val = timestamping.flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (val &amp; ~SOF_TIMESTAMPING_MASK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (val &amp; SOF_TIMESTAMPING_OPT_ID_TCP &amp;&amp;</div><div class='add'>+	    !(val &amp; SOF_TIMESTAMPING_OPT_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (val &amp; SOF_TIMESTAMPING_OPT_ID &amp;&amp;</div><div class='add'>+	    !(sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_ID)) {</div><div class='add'>+		if (sk_is_tcp(sk)) {</div><div class='add'>+			if ((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='add'>+			    (TCPF_CLOSE | TCPF_LISTEN))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (val &amp; SOF_TIMESTAMPING_OPT_ID_TCP)</div><div class='add'>+				atomic_set(&amp;sk-&gt;sk_tskey, tcp_sk(sk)-&gt;write_seq);</div><div class='add'>+			else</div><div class='add'>+				atomic_set(&amp;sk-&gt;sk_tskey, tcp_sk(sk)-&gt;snd_una);</div><div class='add'>+		} else {</div><div class='add'>+			atomic_set(&amp;sk-&gt;sk_tskey, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val &amp; SOF_TIMESTAMPING_OPT_STATS &amp;&amp;</div><div class='add'>+	    !(val &amp; SOF_TIMESTAMPING_OPT_TSONLY))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (val &amp; SOF_TIMESTAMPING_BIND_PHC) {</div><div class='add'>+		ret = sock_timestamping_bind_phc(sk, timestamping.bind_phc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_tsflags, val);</div><div class='add'>+	sock_valbool_flag(sk, SOCK_TSTAMP_NEW, optname == SO_TIMESTAMPING_NEW);</div><div class='add'>+	sock_valbool_flag(sk, SOCK_TIMESTAMPING_ANY, !!(val &amp; TSFLAGS_ANY));</div><div class='add'>+</div><div class='add'>+	if (val &amp; SOF_TIMESTAMPING_RX_SOFTWARE)</div><div class='add'>+		sock_enable_timestamp(sk,</div><div class='add'>+				      SOCK_TIMESTAMPING_RX_SOFTWARE);</div><div class='add'>+	else</div><div class='add'>+		sock_disable_timestamp(sk,</div><div class='add'>+				       (1UL &lt;&lt; SOCK_TIMESTAMPING_RX_SOFTWARE));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CGROUP_BPF)</div><div class='add'>+void bpf_skops_tx_timestamping(struct sock *sk, struct sk_buff *skb, int op)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock_ops_kern sock_ops;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));</div><div class='add'>+	sock_ops.op = op;</div><div class='add'>+	sock_ops.is_fullsock = 1;</div><div class='add'>+	sock_ops.sk = sk;</div><div class='add'>+	bpf_skops_init_skb(&amp;sock_ops, skb, 0);</div><div class='add'>+	__cgroup_bpf_run_filter_sock_ops(sk, &amp;sock_ops, CGROUP_SOCK_OPS);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void sock_set_keepalive(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	if (sk-&gt;sk_prot-&gt;keepalive)</div><div class='add'>+		sk-&gt;sk_prot-&gt;keepalive(sk, true);</div><div class='add'>+	sock_valbool_flag(sk, SOCK_KEEPOPEN, true);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_keepalive);</div><div class='add'>+</div><div class='add'>+static void __sock_set_rcvbuf(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	/* Ensure val * 2 fits into an int, to prevent max_t() from treating it</div><div class='add'>+	 * as a negative value.</div><div class='add'>+	 */</div><div class='add'>+	val = min_t(int, val, INT_MAX / 2);</div><div class='add'>+	sk-&gt;sk_userlocks |= SOCK_RCVBUF_LOCK;</div><div class='add'>+</div><div class='add'>+	/* We double it on the way in to account for "struct sk_buff" etc.</div><div class='add'>+	 * overhead.   Applications assume that the SO_RCVBUF setting they make</div><div class='add'>+	 * will allow that much actual data to be received on that socket.</div><div class='add'>+	 *</div><div class='add'>+	 * Applications are unaware that "struct sk_buff" and other overheads</div><div class='add'>+	 * allocate from the receive buffer during socket buffer allocation.</div><div class='add'>+	 *</div><div class='add'>+	 * And after considering the possible alternatives, returning the value</div><div class='add'>+	 * we actually used in getsockopt is the most desirable behavior.</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_rcvbuf, max_t(int, val * 2, SOCK_MIN_RCVBUF));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sock_set_rcvbuf(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__sock_set_rcvbuf(sk, val);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_rcvbuf);</div><div class='add'>+</div><div class='add'>+static void __sock_set_mark(struct sock *sk, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (val != sk-&gt;sk_mark) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_mark, val);</div><div class='add'>+		sk_dst_reset(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sock_set_mark(struct sock *sk, u32 val)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__sock_set_mark(sk, val);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_set_mark);</div><div class='add'>+</div><div class='add'>+static void sock_release_reserved_memory(struct sock *sk, int bytes)</div><div class='add'>+{</div><div class='add'>+	/* Round down bytes to multiple of pages */</div><div class='add'>+	bytes = round_down(bytes, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	WARN_ON(bytes &gt; sk-&gt;sk_reserved_mem);</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_reserved_mem, sk-&gt;sk_reserved_mem - bytes);</div><div class='add'>+	sk_mem_reclaim(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_reserve_memory(struct sock *sk, int bytes)</div><div class='add'>+{</div><div class='add'>+	long allocated;</div><div class='add'>+	bool charged;</div><div class='add'>+	int pages;</div><div class='add'>+</div><div class='add'>+	if (!mem_cgroup_sk_enabled(sk) || !sk_has_account(sk))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!bytes)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pages = sk_mem_pages(bytes);</div><div class='add'>+</div><div class='add'>+	/* pre-charge to memcg */</div><div class='add'>+	charged = mem_cgroup_sk_charge(sk, pages,</div><div class='add'>+				       GFP_KERNEL | __GFP_RETRY_MAYFAIL);</div><div class='add'>+	if (!charged)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_bypass_prot_mem)</div><div class='add'>+		goto success;</div><div class='add'>+</div><div class='add'>+	/* pre-charge to forward_alloc */</div><div class='add'>+	sk_memory_allocated_add(sk, pages);</div><div class='add'>+	allocated = sk_memory_allocated(sk);</div><div class='add'>+</div><div class='add'>+	/* If the system goes into memory pressure with this</div><div class='add'>+	 * precharge, give up and return error.</div><div class='add'>+	 */</div><div class='add'>+	if (allocated &gt; sk_prot_mem_limits(sk, 1)) {</div><div class='add'>+		sk_memory_allocated_sub(sk, pages);</div><div class='add'>+		mem_cgroup_sk_uncharge(sk, pages);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+	sk_forward_alloc_add(sk, pages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_reserved_mem,</div><div class='add'>+		   sk-&gt;sk_reserved_mem + (pages &lt;&lt; PAGE_SHIFT));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+</div><div class='add'>+/* This is the number of tokens and frags that the user can SO_DEVMEM_DONTNEED</div><div class='add'>+ * in 1 syscall. The limit exists to limit the amount of memory the kernel</div><div class='add'>+ * allocates to copy these tokens, and to prevent looping over the frags for</div><div class='add'>+ * too long.</div><div class='add'>+ */</div><div class='add'>+#define MAX_DONTNEED_TOKENS 128</div><div class='add'>+#define MAX_DONTNEED_FRAGS 1024</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+sock_devmem_dontneed(struct sock *sk, sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int num_tokens, i, j, k, netmem_num = 0;</div><div class='add'>+	struct dmabuf_token *tokens;</div><div class='add'>+	int ret = 0, num_frags = 0;</div><div class='add'>+	netmem_ref netmems[16];</div><div class='add'>+</div><div class='add'>+	if (!sk_is_tcp(sk))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	if (optlen % sizeof(*tokens) ||</div><div class='add'>+	    optlen &gt; sizeof(*tokens) * MAX_DONTNEED_TOKENS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	num_tokens = optlen / sizeof(*tokens);</div><div class='add'>+	tokens = kvmalloc_array(num_tokens, sizeof(*tokens), GFP_KERNEL);</div><div class='add'>+	if (!tokens)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(tokens, optval, optlen)) {</div><div class='add'>+		kvfree(tokens);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xa_lock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+	for (i = 0; i &lt; num_tokens; i++) {</div><div class='add'>+		for (j = 0; j &lt; tokens[i].token_count; j++) {</div><div class='add'>+			if (++num_frags &gt; MAX_DONTNEED_FRAGS)</div><div class='add'>+				goto frag_limit_reached;</div><div class='add'>+</div><div class='add'>+			netmem_ref netmem = (__force netmem_ref)__xa_erase(</div><div class='add'>+				&amp;sk-&gt;sk_user_frags, tokens[i].token_start + j);</div><div class='add'>+</div><div class='add'>+			if (!netmem || WARN_ON_ONCE(!netmem_is_net_iov(netmem)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			netmems[netmem_num++] = netmem;</div><div class='add'>+			if (netmem_num == ARRAY_SIZE(netmems)) {</div><div class='add'>+				xa_unlock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+				for (k = 0; k &lt; netmem_num; k++)</div><div class='add'>+					WARN_ON_ONCE(!napi_pp_put_page(netmems[k]));</div><div class='add'>+				netmem_num = 0;</div><div class='add'>+				xa_lock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+			}</div><div class='add'>+			ret++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+frag_limit_reached:</div><div class='add'>+	xa_unlock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+	for (k = 0; k &lt; netmem_num; k++)</div><div class='add'>+		WARN_ON_ONCE(!napi_pp_put_page(netmems[k]));</div><div class='add'>+</div><div class='add'>+	kvfree(tokens);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void sockopt_lock_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	/* When current-&gt;bpf_ctx is set, the setsockopt is called from</div><div class='add'>+	 * a bpf prog.  bpf has ensured the sk lock has been</div><div class='add'>+	 * acquired before calling setsockopt().</div><div class='add'>+	 */</div><div class='add'>+	if (has_current_bpf_ctx())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sockopt_lock_sock);</div><div class='add'>+</div><div class='add'>+void sockopt_release_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (has_current_bpf_ctx())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sockopt_release_sock);</div><div class='add'>+</div><div class='add'>+bool sockopt_ns_capable(struct user_namespace *ns, int cap)</div><div class='add'>+{</div><div class='add'>+	return has_current_bpf_ctx() || ns_capable(ns, cap);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sockopt_ns_capable);</div><div class='add'>+</div><div class='add'>+bool sockopt_capable(int cap)</div><div class='add'>+{</div><div class='add'>+	return has_current_bpf_ctx() || capable(cap);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sockopt_capable);</div><div class='add'>+</div><div class='add'>+static int sockopt_validate_clockid(__kernel_clockid_t value)</div><div class='add'>+{</div><div class='add'>+	switch (value) {</div><div class='add'>+	case CLOCK_REALTIME:</div><div class='add'>+	case CLOCK_MONOTONIC:</div><div class='add'>+	case CLOCK_TAI:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	This is meant for all protocols to use and covers goings on</div><div class='ctx'>  *	at the socket level. Everything here is generic.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen)</div><div class='add'>+int sk_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='add'>+	struct so_timestamping timestamping;</div><div class='add'>+	struct socket *sock = sk-&gt;sk_socket;</div><div class='ctx'> 	struct sock_txtime sk_txtime;</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int val;</div><div class='ctx'> 	int valbool;</div><div class='ctx'> 	struct linger ling;</div><div class='hunk'>@@ -670,16 +1211,107 @@ int sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	valbool = val ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	/* handle options which do not require locking the socket. */</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case SO_PRIORITY:</div><div class='add'>+		if (sk_set_prio_allowed(sk, val)) {</div><div class='add'>+			sock_set_priority(sk, val);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case SO_TYPE:</div><div class='add'>+	case SO_PROTOCOL:</div><div class='add'>+	case SO_DOMAIN:</div><div class='add'>+	case SO_ERROR:</div><div class='add'>+		return -ENOPROTOOPT;</div><div class='add'>+#ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='add'>+	case SO_BUSY_POLL:</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_ll_usec, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case SO_PREFER_BUSY_POLL:</div><div class='add'>+		if (valbool &amp;&amp; !sockopt_capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_prefer_busy_poll, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case SO_BUSY_POLL_BUDGET:</div><div class='add'>+		if (val &gt; READ_ONCE(sk-&gt;sk_busy_poll_budget) &amp;&amp;</div><div class='add'>+		    !sockopt_capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		if (val &lt; 0 || val &gt; U16_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_busy_poll_budget, val);</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+	case SO_MAX_PACING_RATE:</div><div class='add'>+		{</div><div class='add'>+		unsigned long ulval = (val == ~0U) ? ~0UL : (unsigned int)val;</div><div class='add'>+		unsigned long pacing_rate;</div><div class='add'>+</div><div class='add'>+		if (sizeof(ulval) != sizeof(val) &amp;&amp;</div><div class='add'>+		    optlen &gt;= sizeof(ulval) &amp;&amp;</div><div class='add'>+		    copy_from_sockptr(&amp;ulval, optval, sizeof(ulval))) {</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		if (ulval != ~0UL)</div><div class='add'>+			cmpxchg(&amp;sk-&gt;sk_pacing_status,</div><div class='add'>+				SK_PACING_NONE,</div><div class='add'>+				SK_PACING_NEEDED);</div><div class='add'>+		/* Pairs with READ_ONCE() from sk_getsockopt() */</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_max_pacing_rate, ulval);</div><div class='add'>+		pacing_rate = READ_ONCE(sk-&gt;sk_pacing_rate);</div><div class='add'>+		if (ulval &lt; pacing_rate)</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_pacing_rate, ulval);</div><div class='add'>+		return 0;</div><div class='add'>+		}</div><div class='add'>+	case SO_TXREHASH:</div><div class='add'>+		if (!sk_is_tcp(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (val &lt; -1 || val &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if ((u8)val == SOCK_TXREHASH_DEFAULT)</div><div class='add'>+			val = READ_ONCE(sock_net(sk)-&gt;core.sysctl_txrehash);</div><div class='add'>+		/* Paired with READ_ONCE() in tcp_rtx_synack()</div><div class='add'>+		 * and sk_getsockopt().</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_txrehash, (u8)val);</div><div class='add'>+		return 0;</div><div class='add'>+	case SO_PEEK_OFF:</div><div class='add'>+		{</div><div class='add'>+		int (*set_peek_off)(struct sock *sk, int val);</div><div class='add'>+</div><div class='add'>+		set_peek_off = READ_ONCE(sock-&gt;ops)-&gt;set_peek_off;</div><div class='add'>+		if (set_peek_off)</div><div class='add'>+			ret = set_peek_off(sk, val);</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		return ret;</div><div class='add'>+		}</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+	case SO_DEVMEM_DONTNEED:</div><div class='add'>+		return sock_devmem_dontneed(sk, optval, optlen);</div><div class='add'>+#endif</div><div class='add'>+	case SO_SNDTIMEO_OLD:</div><div class='add'>+	case SO_SNDTIMEO_NEW:</div><div class='add'>+		return sock_set_timeout(&amp;sk-&gt;sk_sndtimeo, optval,</div><div class='add'>+					optlen, optname == SO_SNDTIMEO_OLD);</div><div class='add'>+	case SO_RCVTIMEO_OLD:</div><div class='add'>+	case SO_RCVTIMEO_NEW:</div><div class='add'>+		return sock_set_timeout(&amp;sk-&gt;sk_rcvtimeo, optval,</div><div class='add'>+					optlen, optname == SO_RCVTIMEO_OLD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case SO_DEBUG:</div><div class='del'>-		if (val &amp;&amp; !capable(CAP_NET_ADMIN))</div><div class='add'>+		if (val &amp;&amp; !sockopt_capable(CAP_NET_ADMIN))</div><div class='ctx'> 			ret = -EACCES;</div><div class='ctx'> 		else</div><div class='ctx'> 			sock_valbool_flag(sk, SOCK_DBG, valbool);</div><div class='hunk'>@@ -688,16 +1320,14 @@ int sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		sk-&gt;sk_reuse = (valbool ? SK_CAN_REUSE : SK_NO_REUSE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SO_REUSEPORT:</div><div class='del'>-		sk-&gt;sk_reuseport = valbool;</div><div class='del'>-		break;</div><div class='del'>-	case SO_TYPE:</div><div class='del'>-	case SO_PROTOCOL:</div><div class='del'>-	case SO_DOMAIN:</div><div class='del'>-	case SO_ERROR:</div><div class='del'>-		ret = -ENOPROTOOPT;</div><div class='add'>+		if (valbool &amp;&amp; !sk_is_inet(sk))</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		else</div><div class='add'>+			sk-&gt;sk_reuseport = valbool;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SO_DONTROUTE:</div><div class='ctx'> 		sock_valbool_flag(sk, SOCK_LOCALROUTE, valbool);</div><div class='add'>+		sk_dst_reset(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SO_BROADCAST:</div><div class='ctx'> 		sock_valbool_flag(sk, SOCK_BROADCAST, valbool);</div><div class='hunk'>@@ -708,19 +1338,30 @@ int sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		 * play 'guess the biggest size' games. RCVBUF/SNDBUF</div><div class='ctx'> 		 * are treated in BSD as hints</div><div class='ctx'> 		 */</div><div class='del'>-		val = min_t(u32, val, sysctl_wmem_max);</div><div class='add'>+		val = min_t(u32, val, READ_ONCE(sysctl_wmem_max));</div><div class='ctx'> set_sndbuf:</div><div class='add'>+		/* Ensure val * 2 fits into an int, to prevent max_t()</div><div class='add'>+		 * from treating it as a negative value.</div><div class='add'>+		 */</div><div class='add'>+		val = min_t(int, val, INT_MAX / 2);</div><div class='ctx'> 		sk-&gt;sk_userlocks |= SOCK_SNDBUF_LOCK;</div><div class='del'>-		sk-&gt;sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_sndbuf,</div><div class='add'>+			   max_t(int, val * 2, SOCK_MIN_SNDBUF));</div><div class='ctx'> 		/* Wake up sending tasks if we upped the value. */</div><div class='ctx'> 		sk-&gt;sk_write_space(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_SNDBUFFORCE:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+		if (!sockopt_capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* No negative values (to prevent underflow, as val will be</div><div class='add'>+		 * multiplied by 2).</div><div class='add'>+		 */</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			val = 0;</div><div class='ctx'> 		goto set_sndbuf;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RCVBUF:</div><div class='hunk'>@@ -729,33 +1370,20 @@ set_sndbuf:</div><div class='ctx'> 		 * play 'guess the biggest size' games. RCVBUF/SNDBUF</div><div class='ctx'> 		 * are treated in BSD as hints</div><div class='ctx'> 		 */</div><div class='del'>-		val = min_t(u32, val, sysctl_rmem_max);</div><div class='del'>-set_rcvbuf:</div><div class='del'>-		sk-&gt;sk_userlocks |= SOCK_RCVBUF_LOCK;</div><div class='del'>-		/*</div><div class='del'>-		 * We double it on the way in to account for</div><div class='del'>-		 * "struct sk_buff" etc. overhead.   Applications</div><div class='del'>-		 * assume that the SO_RCVBUF setting they make will</div><div class='del'>-		 * allow that much actual data to be received on that</div><div class='del'>-		 * socket.</div><div class='del'>-		 *</div><div class='del'>-		 * Applications are unaware that "struct sk_buff" and</div><div class='del'>-		 * other overheads allocate from the receive buffer</div><div class='del'>-		 * during socket buffer allocation.</div><div class='del'>-		 *</div><div class='del'>-		 * And after considering the possible alternatives,</div><div class='del'>-		 * returning the value we actually used in getsockopt</div><div class='del'>-		 * is the most desirable behavior.</div><div class='del'>-		 */</div><div class='del'>-		sk-&gt;sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF);</div><div class='add'>+		__sock_set_rcvbuf(sk, min_t(u32, val, READ_ONCE(sysctl_rmem_max)));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RCVBUFFORCE:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+		if (!sockopt_capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		goto set_rcvbuf;</div><div class='add'>+</div><div class='add'>+		/* No negative values (to prevent underflow, as val will be</div><div class='add'>+		 * multiplied by 2).</div><div class='add'>+		 */</div><div class='add'>+		__sock_set_rcvbuf(sk, max(val, 0));</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_KEEPALIVE:</div><div class='ctx'> 		if (sk-&gt;sk_prot-&gt;keepalive)</div><div class='hunk'>@@ -771,167 +1399,113 @@ set_rcvbuf:</div><div class='ctx'> 		sk-&gt;sk_no_check_tx = valbool;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_PRIORITY:</div><div class='del'>-		if ((val &gt;= 0 &amp;&amp; val &lt;= 6) ||</div><div class='del'>-		    ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			sk-&gt;sk_priority = val;</div><div class='del'>-		else</div><div class='del'>-			ret = -EPERM;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case SO_LINGER:</div><div class='ctx'> 		if (optlen &lt; sizeof(ling)) {</div><div class='ctx'> 			ret = -EINVAL;	/* 1003.1g */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;ling, optval, sizeof(ling))) {</div><div class='add'>+		if (copy_from_sockptr(&amp;ling, optval, sizeof(ling))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!ling.l_onoff)</div><div class='add'>+		if (!ling.l_onoff) {</div><div class='ctx'> 			sock_reset_flag(sk, SOCK_LINGER);</div><div class='del'>-		else {</div><div class='del'>-#if (BITS_PER_LONG == 32)</div><div class='del'>-			if ((unsigned int)ling.l_linger &gt;= MAX_SCHEDULE_TIMEOUT/HZ)</div><div class='del'>-				sk-&gt;sk_lingertime = MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+		} else {</div><div class='add'>+			unsigned long t_sec = ling.l_linger;</div><div class='add'>+</div><div class='add'>+			if (t_sec &gt;= MAX_SCHEDULE_TIMEOUT / HZ)</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_lingertime, MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'> 			else</div><div class='del'>-#endif</div><div class='del'>-				sk-&gt;sk_lingertime = (unsigned int)ling.l_linger * HZ;</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_lingertime, t_sec * HZ);</div><div class='ctx'> 			sock_set_flag(sk, SOCK_LINGER);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_BSDCOMPAT:</div><div class='del'>-		sock_warn_obsolete_bsdism("setsockopt");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_PASSCRED:</div><div class='del'>-		if (valbool)</div><div class='del'>-			set_bit(SOCK_PASSCRED, &amp;sock-&gt;flags);</div><div class='del'>-		else</div><div class='del'>-			clear_bit(SOCK_PASSCRED, &amp;sock-&gt;flags);</div><div class='add'>+	case SO_TIMESTAMP_OLD:</div><div class='add'>+	case SO_TIMESTAMP_NEW:</div><div class='add'>+	case SO_TIMESTAMPNS_OLD:</div><div class='add'>+	case SO_TIMESTAMPNS_NEW:</div><div class='add'>+		sock_set_timestamp(sk, optname, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_TIMESTAMP:</div><div class='del'>-	case SO_TIMESTAMPNS:</div><div class='del'>-		if (valbool)  {</div><div class='del'>-			if (optname == SO_TIMESTAMP)</div><div class='del'>-				sock_reset_flag(sk, SOCK_RCVTSTAMPNS);</div><div class='del'>-			else</div><div class='del'>-				sock_set_flag(sk, SOCK_RCVTSTAMPNS);</div><div class='del'>-			sock_set_flag(sk, SOCK_RCVTSTAMP);</div><div class='del'>-			sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='del'>-		} else {</div><div class='del'>-			sock_reset_flag(sk, SOCK_RCVTSTAMP);</div><div class='del'>-			sock_reset_flag(sk, SOCK_RCVTSTAMPNS);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SO_TIMESTAMPING:</div><div class='del'>-		if (val &amp; ~SOF_TIMESTAMPING_MASK) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (val &amp; SOF_TIMESTAMPING_OPT_ID &amp;&amp;</div><div class='del'>-		    !(sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_ID)) {</div><div class='del'>-			if (sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_type == SOCK_STREAM) {</div><div class='del'>-				if ((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='del'>-				    (TCPF_CLOSE | TCPF_LISTEN)) {</div><div class='del'>-					ret = -EINVAL;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				sk-&gt;sk_tskey = tcp_sk(sk)-&gt;snd_una;</div><div class='del'>-			} else {</div><div class='del'>-				sk-&gt;sk_tskey = 0;</div><div class='add'>+	case SO_TIMESTAMPING_NEW:</div><div class='add'>+	case SO_TIMESTAMPING_OLD:</div><div class='add'>+		if (optlen == sizeof(timestamping)) {</div><div class='add'>+			if (copy_from_sockptr(&amp;timestamping, optval,</div><div class='add'>+					      sizeof(timestamping))) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='add'>+		} else {</div><div class='add'>+			memset(&amp;timestamping, 0, sizeof(timestamping));</div><div class='add'>+			timestamping.flags = val;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (val &amp; SOF_TIMESTAMPING_OPT_STATS &amp;&amp;</div><div class='del'>-		    !(val &amp; SOF_TIMESTAMPING_OPT_TSONLY)) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sk-&gt;sk_tsflags = val;</div><div class='del'>-		if (val &amp; SOF_TIMESTAMPING_RX_SOFTWARE)</div><div class='del'>-			sock_enable_timestamp(sk,</div><div class='del'>-					      SOCK_TIMESTAMPING_RX_SOFTWARE);</div><div class='del'>-		else</div><div class='del'>-			sock_disable_timestamp(sk,</div><div class='del'>-					       (1UL &lt;&lt; SOCK_TIMESTAMPING_RX_SOFTWARE));</div><div class='add'>+		ret = sock_set_timestamping(sk, optname, timestamping);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RCVLOWAT:</div><div class='add'>+		{</div><div class='add'>+		int (*set_rcvlowat)(struct sock *sk, int val) = NULL;</div><div class='add'>+</div><div class='ctx'> 		if (val &lt; 0)</div><div class='ctx'> 			val = INT_MAX;</div><div class='del'>-		if (sock-&gt;ops-&gt;set_rcvlowat)</div><div class='del'>-			ret = sock-&gt;ops-&gt;set_rcvlowat(sk, val);</div><div class='add'>+		if (sock)</div><div class='add'>+			set_rcvlowat = READ_ONCE(sock-&gt;ops)-&gt;set_rcvlowat;</div><div class='add'>+		if (set_rcvlowat)</div><div class='add'>+			ret = set_rcvlowat(sk, val);</div><div class='ctx'> 		else</div><div class='del'>-			sk-&gt;sk_rcvlowat = val ? : 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SO_RCVTIMEO:</div><div class='del'>-		ret = sock_set_timeout(&amp;sk-&gt;sk_rcvtimeo, optval, optlen);</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_rcvlowat, val ? : 1);</div><div class='ctx'> 		break;</div><div class='add'>+		}</div><div class='add'>+	case SO_ATTACH_FILTER: {</div><div class='add'>+		struct sock_fprog fprog;</div><div class='ctx'> </div><div class='del'>-	case SO_SNDTIMEO:</div><div class='del'>-		ret = sock_set_timeout(&amp;sk-&gt;sk_sndtimeo, optval, optlen);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SO_ATTACH_FILTER:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		if (optlen == sizeof(struct sock_fprog)) {</div><div class='del'>-			struct sock_fprog fprog;</div><div class='del'>-</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;fprog, optval, sizeof(fprog)))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='add'>+		ret = copy_bpf_fprog_from_user(&amp;fprog, optval, optlen);</div><div class='add'>+		if (!ret)</div><div class='ctx'> 			ret = sk_attach_filter(&amp;fprog, sk);</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	case SO_ATTACH_BPF:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		if (optlen == sizeof(u32)) {</div><div class='ctx'> 			u32 ufd;</div><div class='ctx'> </div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;ufd, optval, sizeof(ufd)))</div><div class='add'>+			if (copy_from_sockptr(&amp;ufd, optval, sizeof(ufd)))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			ret = sk_attach_bpf(ufd, sk);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_ATTACH_REUSEPORT_CBPF:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		if (optlen == sizeof(struct sock_fprog)) {</div><div class='del'>-			struct sock_fprog fprog;</div><div class='del'>-</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;fprog, optval, sizeof(fprog)))</div><div class='del'>-				break;</div><div class='add'>+	case SO_ATTACH_REUSEPORT_CBPF: {</div><div class='add'>+		struct sock_fprog fprog;</div><div class='ctx'> </div><div class='add'>+		ret = copy_bpf_fprog_from_user(&amp;fprog, optval, optlen);</div><div class='add'>+		if (!ret)</div><div class='ctx'> 			ret = sk_reuseport_attach_filter(&amp;fprog, sk);</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	case SO_ATTACH_REUSEPORT_EBPF:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		if (optlen == sizeof(u32)) {</div><div class='ctx'> 			u32 ufd;</div><div class='ctx'> </div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;ufd, optval, sizeof(ufd)))</div><div class='add'>+			if (copy_from_sockptr(&amp;ufd, optval, sizeof(ufd)))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			ret = sk_reuseport_attach_bpf(ufd, sk);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case SO_DETACH_REUSEPORT_BPF:</div><div class='add'>+		ret = reuseport_detach_prog(sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case SO_DETACH_FILTER:</div><div class='ctx'> 		ret = sk_detach_filter(sk);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -943,17 +1517,21 @@ set_rcvbuf:</div><div class='ctx'> 			sock_valbool_flag(sk, SOCK_FILTER_LOCKED, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_PASSSEC:</div><div class='del'>-		if (valbool)</div><div class='del'>-			set_bit(SOCK_PASSSEC, &amp;sock-&gt;flags);</div><div class='del'>-		else</div><div class='del'>-			clear_bit(SOCK_PASSSEC, &amp;sock-&gt;flags);</div><div class='del'>-		break;</div><div class='ctx'> 	case SO_MARK:</div><div class='del'>-		if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		if (!sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_RAW) &amp;&amp;</div><div class='add'>+		    !sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='ctx'> 			ret = -EPERM;</div><div class='del'>-		else</div><div class='del'>-			sk-&gt;sk_mark = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__sock_set_mark(sk, val);</div><div class='add'>+		break;</div><div class='add'>+	case SO_RCVMARK:</div><div class='add'>+		sock_valbool_flag(sk, SOCK_RCVMARK, valbool);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_RCVPRIORITY:</div><div class='add'>+		sock_valbool_flag(sk, SOCK_RCVPRIORITY, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RXQ_OVFL:</div><div class='hunk'>@@ -964,13 +1542,6 @@ set_rcvbuf:</div><div class='ctx'> 		sock_valbool_flag(sk, SOCK_WIFI_STATUS, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_PEEK_OFF:</div><div class='del'>-		if (sock-&gt;ops-&gt;set_peek_off)</div><div class='del'>-			ret = sock-&gt;ops-&gt;set_peek_off(sk, val);</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case SO_NOFCS:</div><div class='ctx'> 		sock_valbool_flag(sk, SOCK_NOFCS, valbool);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -979,32 +1550,36 @@ set_rcvbuf:</div><div class='ctx'> 		sock_valbool_flag(sk, SOCK_SELECT_ERR_QUEUE, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='del'>-	case SO_BUSY_POLL:</div><div class='del'>-		/* allow unprivileged users to decrease the value */</div><div class='del'>-		if ((val &gt; sk-&gt;sk_ll_usec) &amp;&amp; !capable(CAP_NET_ADMIN))</div><div class='del'>-			ret = -EPERM;</div><div class='del'>-		else {</div><div class='del'>-			if (val &lt; 0)</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			else</div><div class='del'>-				sk-&gt;sk_ll_usec = val;</div><div class='del'>-		}</div><div class='add'>+	case SO_PASSCRED:</div><div class='add'>+		if (sk_may_scm_recv(sk))</div><div class='add'>+			sk-&gt;sk_scm_credentials = valbool;</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	case SO_MAX_PACING_RATE:</div><div class='del'>-		if (val != ~0U)</div><div class='del'>-			cmpxchg(&amp;sk-&gt;sk_pacing_status,</div><div class='del'>-				SK_PACING_NONE,</div><div class='del'>-				SK_PACING_NEEDED);</div><div class='del'>-		sk-&gt;sk_max_pacing_rate = val;</div><div class='del'>-		sk-&gt;sk_pacing_rate = min(sk-&gt;sk_pacing_rate,</div><div class='del'>-					 sk-&gt;sk_max_pacing_rate);</div><div class='add'>+	case SO_PASSSEC:</div><div class='add'>+		if (IS_ENABLED(CONFIG_SECURITY_NETWORK) &amp;&amp; sk_may_scm_recv(sk))</div><div class='add'>+			sk-&gt;sk_scm_security = valbool;</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_PASSPIDFD:</div><div class='add'>+		if (sk_is_unix(sk))</div><div class='add'>+			sk-&gt;sk_scm_pidfd = valbool;</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_PASSRIGHTS:</div><div class='add'>+		if (sk_is_unix(sk))</div><div class='add'>+			sk-&gt;sk_scm_rights = valbool;</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_INCOMING_CPU:</div><div class='del'>-		sk-&gt;sk_incoming_cpu = val;</div><div class='add'>+		reuseport_update_incoming_cpu(sk, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_CNX_ADVICE:</div><div class='hunk'>@@ -1014,10 +1589,12 @@ set_rcvbuf:</div><div class='ctx'> </div><div class='ctx'> 	case SO_ZEROCOPY:</div><div class='ctx'> 		if (sk-&gt;sk_family == PF_INET || sk-&gt;sk_family == PF_INET6) {</div><div class='del'>-			if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='del'>-				ret = -ENOTSUPP;</div><div class='add'>+			if (!(sk_is_tcp(sk) ||</div><div class='add'>+			      (sk-&gt;sk_type == SOCK_DGRAM &amp;&amp;</div><div class='add'>+			       sk-&gt;sk_protocol == IPPROTO_UDP)))</div><div class='add'>+				ret = -EOPNOTSUPP;</div><div class='ctx'> 		} else if (sk-&gt;sk_family != PF_RDS) {</div><div class='del'>-			ret = -ENOTSUPP;</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			if (val &lt; 0 || val &gt; 1)</div><div class='hunk'>@@ -1028,34 +1605,94 @@ set_rcvbuf:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_TXTIME:</div><div class='del'>-		if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='del'>-			ret = -EPERM;</div><div class='del'>-		} else if (optlen != sizeof(struct sock_txtime)) {</div><div class='add'>+		if (optlen != sizeof(struct sock_txtime)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-		} else if (copy_from_user(&amp;sk_txtime, optval,</div><div class='add'>+			break;</div><div class='add'>+		} else if (copy_from_sockptr(&amp;sk_txtime, optval,</div><div class='ctx'> 			   sizeof(struct sock_txtime))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='ctx'> 		} else if (sk_txtime.flags &amp; ~SOF_TXTIME_FLAGS_MASK) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			sock_valbool_flag(sk, SOCK_TXTIME, true);</div><div class='del'>-			sk-&gt;sk_clockid = sk_txtime.clockid;</div><div class='del'>-			sk-&gt;sk_txtime_deadline_mode =</div><div class='del'>-				!!(sk_txtime.flags &amp; SOF_TXTIME_DEADLINE_MODE);</div><div class='del'>-			sk-&gt;sk_txtime_report_errors =</div><div class='del'>-				!!(sk_txtime.flags &amp; SOF_TXTIME_REPORT_ERRORS);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* CLOCK_MONOTONIC is only used by sch_fq, and this packet</div><div class='add'>+		 * scheduler has enough safe guards.</div><div class='add'>+		 */</div><div class='add'>+		if (sk_txtime.clockid != CLOCK_MONOTONIC &amp;&amp;</div><div class='add'>+		    !sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = sockopt_validate_clockid(sk_txtime.clockid);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		sock_valbool_flag(sk, SOCK_TXTIME, true);</div><div class='add'>+		sk-&gt;sk_clockid = sk_txtime.clockid;</div><div class='add'>+		sk-&gt;sk_txtime_deadline_mode =</div><div class='add'>+			!!(sk_txtime.flags &amp; SOF_TXTIME_DEADLINE_MODE);</div><div class='add'>+		sk-&gt;sk_txtime_report_errors =</div><div class='add'>+			!!(sk_txtime.flags &amp; SOF_TXTIME_REPORT_ERRORS);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_BINDTOIFINDEX:</div><div class='add'>+		ret = sock_bindtoindex_locked(sk, val);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_BUF_LOCK:</div><div class='add'>+		if (val &amp; ~SOCK_BUF_LOCK_MASK) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		sk-&gt;sk_userlocks = val | (sk-&gt;sk_userlocks &amp;</div><div class='add'>+					  ~SOCK_BUF_LOCK_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case SO_RESERVE_MEM:</div><div class='add'>+	{</div><div class='add'>+		int delta;</div><div class='add'>+</div><div class='add'>+		if (val &lt; 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		delta = val - sk-&gt;sk_reserved_mem;</div><div class='add'>+		if (delta &lt; 0)</div><div class='add'>+			sock_release_reserved_memory(sk, -delta);</div><div class='add'>+		else</div><div class='add'>+			ret = sock_reserve_memory(sk, delta);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENOPROTOOPT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='add'>+		    sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	return sk_setsockopt(sock-&gt;sk, level, optname,</div><div class='add'>+			     optval, optlen);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(sock_setsockopt);</div><div class='ctx'> </div><div class='add'>+static const struct cred *sk_get_peer_cred(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	const struct cred *cred;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+	cred = get_cred(sk-&gt;sk_peer_cred);</div><div class='add'>+	spin_unlock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+</div><div class='add'>+	return cred;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void cred_to_ucred(struct pid *pid, const struct cred *cred,</div><div class='ctx'> 			  struct ucred *ucred)</div><div class='hunk'>@@ -1070,35 +1707,42 @@ static void cred_to_ucred(struct pid *pid, const struct cred *cred,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int groups_to_user(gid_t __user *dst, const struct group_info *src)</div><div class='add'>+static int groups_to_user(sockptr_t dst, const struct group_info *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_namespace *user_ns = current_user_ns();</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; src-&gt;ngroups; i++)</div><div class='del'>-		if (put_user(from_kgid_munged(user_ns, src-&gt;gid[i]), dst + i))</div><div class='add'>+	for (i = 0; i &lt; src-&gt;ngroups; i++) {</div><div class='add'>+		gid_t gid = from_kgid_munged(user_ns, src-&gt;gid[i]);</div><div class='add'>+</div><div class='add'>+		if (copy_to_sockptr_offset(dst, i * sizeof(gid), &amp;gid, sizeof(gid)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen)</div><div class='add'>+int sk_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		  sockptr_t optval, sockptr_t optlen)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct socket *sock = sk-&gt;sk_socket;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		int val;</div><div class='ctx'> 		u64 val64;</div><div class='add'>+		unsigned long ulval;</div><div class='ctx'> 		struct linger ling;</div><div class='del'>-		struct timeval tm;</div><div class='add'>+		struct old_timeval32 tm32;</div><div class='add'>+		struct __kernel_old_timeval tm;</div><div class='add'>+		struct  __kernel_sock_timeval stm;</div><div class='ctx'> 		struct sock_txtime txtime;</div><div class='add'>+		struct so_timestamping timestamping;</div><div class='ctx'> 	} v;</div><div class='ctx'> </div><div class='ctx'> 	int lv = sizeof(int);</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	if (get_user(len, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1119,11 +1763,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_SNDBUF:</div><div class='del'>-		v.val = sk-&gt;sk_sndbuf;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_sndbuf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RCVBUF:</div><div class='del'>-		v.val = sk-&gt;sk_rcvbuf;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_rcvbuf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_REUSEADDR:</div><div class='hunk'>@@ -1165,56 +1809,63 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PRIORITY:</div><div class='del'>-		v.val = sk-&gt;sk_priority;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_priority);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_LINGER:</div><div class='ctx'> 		lv		= sizeof(v.ling);</div><div class='ctx'> 		v.ling.l_onoff	= sock_flag(sk, SOCK_LINGER);</div><div class='del'>-		v.ling.l_linger	= sk-&gt;sk_lingertime / HZ;</div><div class='add'>+		v.ling.l_linger	= READ_ONCE(sk-&gt;sk_lingertime) / HZ;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_BSDCOMPAT:</div><div class='del'>-		sock_warn_obsolete_bsdism("getsockopt");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_TIMESTAMP:</div><div class='add'>+	case SO_TIMESTAMP_OLD:</div><div class='ctx'> 		v.val = sock_flag(sk, SOCK_RCVTSTAMP) &amp;&amp;</div><div class='add'>+				!sock_flag(sk, SOCK_TSTAMP_NEW) &amp;&amp;</div><div class='ctx'> 				!sock_flag(sk, SOCK_RCVTSTAMPNS);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_TIMESTAMPNS:</div><div class='del'>-		v.val = sock_flag(sk, SOCK_RCVTSTAMPNS);</div><div class='add'>+	case SO_TIMESTAMPNS_OLD:</div><div class='add'>+		v.val = sock_flag(sk, SOCK_RCVTSTAMPNS) &amp;&amp; !sock_flag(sk, SOCK_TSTAMP_NEW);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_TIMESTAMPING:</div><div class='del'>-		v.val = sk-&gt;sk_tsflags;</div><div class='add'>+	case SO_TIMESTAMP_NEW:</div><div class='add'>+		v.val = sock_flag(sk, SOCK_RCVTSTAMP) &amp;&amp; sock_flag(sk, SOCK_TSTAMP_NEW);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_RCVTIMEO:</div><div class='del'>-		lv = sizeof(struct timeval);</div><div class='del'>-		if (sk-&gt;sk_rcvtimeo == MAX_SCHEDULE_TIMEOUT) {</div><div class='del'>-			v.tm.tv_sec = 0;</div><div class='del'>-			v.tm.tv_usec = 0;</div><div class='del'>-		} else {</div><div class='del'>-			v.tm.tv_sec = sk-&gt;sk_rcvtimeo / HZ;</div><div class='del'>-			v.tm.tv_usec = ((sk-&gt;sk_rcvtimeo % HZ) * USEC_PER_SEC) / HZ;</div><div class='del'>-		}</div><div class='add'>+	case SO_TIMESTAMPNS_NEW:</div><div class='add'>+		v.val = sock_flag(sk, SOCK_RCVTSTAMPNS) &amp;&amp; sock_flag(sk, SOCK_TSTAMP_NEW);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SO_SNDTIMEO:</div><div class='del'>-		lv = sizeof(struct timeval);</div><div class='del'>-		if (sk-&gt;sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) {</div><div class='del'>-			v.tm.tv_sec = 0;</div><div class='del'>-			v.tm.tv_usec = 0;</div><div class='del'>-		} else {</div><div class='del'>-			v.tm.tv_sec = sk-&gt;sk_sndtimeo / HZ;</div><div class='del'>-			v.tm.tv_usec = ((sk-&gt;sk_sndtimeo % HZ) * USEC_PER_SEC) / HZ;</div><div class='add'>+	case SO_TIMESTAMPING_OLD:</div><div class='add'>+	case SO_TIMESTAMPING_NEW:</div><div class='add'>+		lv = sizeof(v.timestamping);</div><div class='add'>+		/* For the later-added case SO_TIMESTAMPING_NEW: Be strict about only</div><div class='add'>+		 * returning the flags when they were set through the same option.</div><div class='add'>+		 * Don't change the beviour for the old case SO_TIMESTAMPING_OLD.</div><div class='add'>+		 */</div><div class='add'>+		if (optname == SO_TIMESTAMPING_OLD || sock_flag(sk, SOCK_TSTAMP_NEW)) {</div><div class='add'>+			v.timestamping.flags = READ_ONCE(sk-&gt;sk_tsflags);</div><div class='add'>+			v.timestamping.bind_phc = READ_ONCE(sk-&gt;sk_bind_phc);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case SO_RCVTIMEO_OLD:</div><div class='add'>+	case SO_RCVTIMEO_NEW:</div><div class='add'>+		lv = sock_get_timeout(READ_ONCE(sk-&gt;sk_rcvtimeo), &amp;v,</div><div class='add'>+				      SO_RCVTIMEO_OLD == optname);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_SNDTIMEO_OLD:</div><div class='add'>+	case SO_SNDTIMEO_NEW:</div><div class='add'>+		lv = sock_get_timeout(READ_ONCE(sk-&gt;sk_sndtimeo), &amp;v,</div><div class='add'>+				      SO_SNDTIMEO_OLD == optname);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case SO_RCVLOWAT:</div><div class='del'>-		v.val = sk-&gt;sk_rcvlowat;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_rcvlowat);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_SNDLOWAT:</div><div class='hunk'>@@ -1222,7 +1873,24 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PASSCRED:</div><div class='del'>-		v.val = !!test_bit(SOCK_PASSCRED, &amp;sock-&gt;flags);</div><div class='add'>+		if (!sk_may_scm_recv(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		v.val = sk-&gt;sk_scm_credentials;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_PASSPIDFD:</div><div class='add'>+		if (!sk_is_unix(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		v.val = sk-&gt;sk_scm_pidfd;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_PASSRIGHTS:</div><div class='add'>+		if (!sk_is_unix(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		v.val = sk-&gt;sk_scm_rights;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PEERCRED:</div><div class='hunk'>@@ -1230,28 +1898,76 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		struct ucred peercred;</div><div class='ctx'> 		if (len &gt; sizeof(peercred))</div><div class='ctx'> 			len = sizeof(peercred);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sk-&gt;sk_peer_lock);</div><div class='ctx'> 		cred_to_ucred(sk-&gt;sk_peer_pid, sk-&gt;sk_peer_cred, &amp;peercred);</div><div class='del'>-		if (copy_to_user(optval, &amp;peercred, len))</div><div class='add'>+		spin_unlock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;peercred, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		goto lenout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	case SO_PEERPIDFD:</div><div class='add'>+	{</div><div class='add'>+		struct pid *peer_pid;</div><div class='add'>+		struct file *pidfd_file = NULL;</div><div class='add'>+		unsigned int flags = 0;</div><div class='add'>+		int pidfd;</div><div class='add'>+</div><div class='add'>+		if (len &gt; sizeof(pidfd))</div><div class='add'>+			len = sizeof(pidfd);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+		peer_pid = get_pid(sk-&gt;sk_peer_pid);</div><div class='add'>+		spin_unlock(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+</div><div class='add'>+		if (!peer_pid)</div><div class='add'>+			return -ENODATA;</div><div class='add'>+</div><div class='add'>+		/* The use of PIDFD_STALE requires stashing of struct pid</div><div class='add'>+		 * on pidfs with pidfs_register_pid() and only AF_UNIX</div><div class='add'>+		 * were prepared for this.</div><div class='add'>+		 */</div><div class='add'>+		if (sk-&gt;sk_family == AF_UNIX)</div><div class='add'>+			flags = PIDFD_STALE;</div><div class='add'>+</div><div class='add'>+		pidfd = pidfd_prepare(peer_pid, flags, &amp;pidfd_file);</div><div class='add'>+		put_pid(peer_pid);</div><div class='add'>+		if (pidfd &lt; 0)</div><div class='add'>+			return pidfd;</div><div class='add'>+</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;pidfd, len) ||</div><div class='add'>+		    copy_to_sockptr(optlen, &amp;len, sizeof(int))) {</div><div class='add'>+			put_unused_fd(pidfd);</div><div class='add'>+			fput(pidfd_file);</div><div class='add'>+</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_install(pidfd, pidfd_file);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	case SO_PEERGROUPS:</div><div class='ctx'> 	{</div><div class='add'>+		const struct cred *cred;</div><div class='ctx'> 		int ret, n;</div><div class='ctx'> </div><div class='del'>-		if (!sk-&gt;sk_peer_cred)</div><div class='add'>+		cred = sk_get_peer_cred(sk);</div><div class='add'>+		if (!cred)</div><div class='ctx'> 			return -ENODATA;</div><div class='ctx'> </div><div class='del'>-		n = sk-&gt;sk_peer_cred-&gt;group_info-&gt;ngroups;</div><div class='add'>+		n = cred-&gt;group_info-&gt;ngroups;</div><div class='ctx'> 		if (len &lt; n * sizeof(gid_t)) {</div><div class='ctx'> 			len = n * sizeof(gid_t);</div><div class='del'>-			return put_user(len, optlen) ? -EFAULT : -ERANGE;</div><div class='add'>+			put_cred(cred);</div><div class='add'>+			return copy_to_sockptr(optlen, &amp;len, sizeof(int)) ? -EFAULT : -ERANGE;</div><div class='ctx'> 		}</div><div class='ctx'> 		len = n * sizeof(gid_t);</div><div class='ctx'> </div><div class='del'>-		ret = groups_to_user((gid_t __user *)optval,</div><div class='del'>-				     sk-&gt;sk_peer_cred-&gt;group_info);</div><div class='add'>+		ret = groups_to_user(optval, cred-&gt;group_info);</div><div class='add'>+		put_cred(cred);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		goto lenout;</div><div class='hunk'>@@ -1259,14 +1975,14 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	case SO_PEERNAME:</div><div class='ctx'> 	{</div><div class='del'>-		char address[128];</div><div class='add'>+		struct sockaddr_storage address;</div><div class='ctx'> </div><div class='del'>-		lv = sock-&gt;ops-&gt;getname(sock, (struct sockaddr *)address, 2);</div><div class='add'>+		lv = READ_ONCE(sock-&gt;ops)-&gt;getname(sock, (struct sockaddr *)&amp;address, 2);</div><div class='ctx'> 		if (lv &lt; 0)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> 		if (lv &lt; len)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (copy_to_user(optval, address, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;address, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		goto lenout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1279,14 +1995,26 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PASSSEC:</div><div class='del'>-		v.val = !!test_bit(SOCK_PASSSEC, &amp;sock-&gt;flags);</div><div class='add'>+		if (!IS_ENABLED(CONFIG_SECURITY_NETWORK) || !sk_may_scm_recv(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		v.val = sk-&gt;sk_scm_security;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PEERSEC:</div><div class='del'>-		return security_socket_getpeersec_stream(sock, optval, optlen, len);</div><div class='add'>+		return security_socket_getpeersec_stream(sock,</div><div class='add'>+							 optval, optlen, len);</div><div class='ctx'> </div><div class='ctx'> 	case SO_MARK:</div><div class='del'>-		v.val = sk-&gt;sk_mark;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_RCVMARK:</div><div class='add'>+		v.val = sock_flag(sk, SOCK_RCVMARK);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_RCVPRIORITY:</div><div class='add'>+		v.val = sock_flag(sk, SOCK_RCVPRIORITY);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_RXQ_OVFL:</div><div class='hunk'>@@ -1298,10 +2026,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_PEEK_OFF:</div><div class='del'>-		if (!sock-&gt;ops-&gt;set_peek_off)</div><div class='add'>+		if (!READ_ONCE(sock-&gt;ops)-&gt;set_peek_off)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-		v.val = sk-&gt;sk_peek_off;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_peek_off);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SO_NOFCS:</div><div class='ctx'> 		v.val = sock_flag(sk, SOCK_NOFCS);</div><div class='hunk'>@@ -1311,7 +2039,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		return sock_getbindtodevice(sk, optval, optlen, len);</div><div class='ctx'> </div><div class='ctx'> 	case SO_GET_FILTER:</div><div class='del'>-		len = sk_get_filter(sk, (struct sock_filter __user *)optval, len);</div><div class='add'>+		len = sk_get_filter(sk, optval, len);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='hunk'>@@ -1331,29 +2059,37 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='ctx'> 	case SO_BUSY_POLL:</div><div class='del'>-		v.val = sk-&gt;sk_ll_usec;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_ll_usec);</div><div class='add'>+		break;</div><div class='add'>+	case SO_PREFER_BUSY_POLL:</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_prefer_busy_poll);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	case SO_MAX_PACING_RATE:</div><div class='del'>-		v.val = sk-&gt;sk_max_pacing_rate;</div><div class='add'>+		/* The READ_ONCE() pair with the WRITE_ONCE() in sk_setsockopt() */</div><div class='add'>+		if (sizeof(v.ulval) != sizeof(v.val) &amp;&amp; len &gt;= sizeof(v.ulval)) {</div><div class='add'>+			lv = sizeof(v.ulval);</div><div class='add'>+			v.ulval = READ_ONCE(sk-&gt;sk_max_pacing_rate);</div><div class='add'>+		} else {</div><div class='add'>+			/* 32bit version */</div><div class='add'>+			v.val = min_t(unsigned long, ~0U,</div><div class='add'>+				      READ_ONCE(sk-&gt;sk_max_pacing_rate));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_INCOMING_CPU:</div><div class='del'>-		v.val = sk-&gt;sk_incoming_cpu;</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_incoming_cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SO_MEMINFO:</div><div class='ctx'> 	{</div><div class='ctx'> 		u32 meminfo[SK_MEMINFO_VARS];</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 		sk_get_meminfo(sk, meminfo);</div><div class='ctx'> </div><div class='ctx'> 		len = min_t(unsigned int, len, sizeof(meminfo));</div><div class='del'>-		if (copy_to_user(optval, &amp;meminfo, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;meminfo, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		goto lenout;</div><div class='hunk'>@@ -1364,7 +2100,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		v.val = READ_ONCE(sk-&gt;sk_napi_id);</div><div class='ctx'> </div><div class='ctx'> 		/* aggregate non-NAPI IDs down to 0 */</div><div class='del'>-		if (v.val &lt; MIN_NAPI_ID)</div><div class='add'>+		if (!napi_id_valid(v.val))</div><div class='ctx'> 			v.val = 0;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1390,6 +2126,33 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 				  SOF_TXTIME_REPORT_ERRORS : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case SO_BINDTOIFINDEX:</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_NETNS_COOKIE:</div><div class='add'>+		lv = sizeof(u64);</div><div class='add'>+		if (len != lv)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		v.val64 = sock_net(sk)-&gt;net_cookie;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_BUF_LOCK:</div><div class='add'>+		v.val = sk-&gt;sk_userlocks &amp; SOCK_BUF_LOCK_MASK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_RESERVE_MEM:</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_reserved_mem);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SO_TXREHASH:</div><div class='add'>+		if (!sk_is_tcp(sk))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		/* Paired with WRITE_ONCE() in sk_setsockopt() */</div><div class='add'>+		v.val = READ_ONCE(sk-&gt;sk_txrehash);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* We implement the SO_SNDLOWAT etc to not be settable</div><div class='ctx'> 		 * (1003.1g 7).</div><div class='hunk'>@@ -1399,10 +2162,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; lv)</div><div class='ctx'> 		len = lv;</div><div class='del'>-	if (copy_to_user(optval, &amp;v, len))</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;v, len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> lenout:</div><div class='del'>-	if (put_user(len, optlen))</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1414,6 +2177,8 @@ lenout:</div><div class='ctx'>  */</div><div class='ctx'> static inline void sock_lock_init(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	sk_owner_clear(sk);</div><div class='add'>+</div><div class='ctx'> 	if (sk-&gt;sk_kern_sock)</div><div class='ctx'> 		sock_lock_init_class_and_name(</div><div class='ctx'> 			sk,</div><div class='hunk'>@@ -1432,18 +2197,30 @@ static inline void sock_lock_init(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy all fields from osk to nsk but nsk-&gt;sk_refcnt must not change yet,</div><div class='del'>- * even temporarly, because of RCU lookups. sk_node should also be left as is.</div><div class='add'>+ * even temporarily, because of RCU lookups. sk_node should also be left as is.</div><div class='ctx'>  * We must not copy fields between sk_dontcopy_begin and sk_dontcopy_end</div><div class='ctx'>  */</div><div class='ctx'> static void sock_copy(struct sock *nsk, const struct sock *osk)</div><div class='ctx'> {</div><div class='add'>+	const struct proto *prot = READ_ONCE(osk-&gt;sk_prot);</div><div class='ctx'> #ifdef CONFIG_SECURITY_NETWORK</div><div class='ctx'> 	void *sptr = nsk-&gt;sk_security;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/* If we move sk_tx_queue_mapping out of the private section,</div><div class='add'>+	 * we must check if sk_tx_queue_clear() is called after</div><div class='add'>+	 * sock_copy() in sk_clone_lock().</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct sock, sk_tx_queue_mapping) &lt;</div><div class='add'>+		     offsetof(struct sock, sk_dontcopy_begin) ||</div><div class='add'>+		     offsetof(struct sock, sk_tx_queue_mapping) &gt;=</div><div class='add'>+		     offsetof(struct sock, sk_dontcopy_end));</div><div class='add'>+</div><div class='ctx'> 	memcpy(nsk, osk, offsetof(struct sock, sk_dontcopy_begin));</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;nsk-&gt;sk_dontcopy_end, &amp;osk-&gt;sk_dontcopy_end,</div><div class='del'>-	       osk-&gt;sk_prot-&gt;obj_size - offsetof(struct sock, sk_dontcopy_end));</div><div class='add'>+	unsafe_memcpy(&amp;nsk-&gt;sk_dontcopy_end, &amp;osk-&gt;sk_dontcopy_end,</div><div class='add'>+		      prot-&gt;obj_size - offsetof(struct sock, sk_dontcopy_end),</div><div class='add'>+		      /* alloc is larger than struct, see sk_prot_alloc() */);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SECURITY_NETWORK</div><div class='ctx'> 	nsk-&gt;sk_security = sptr;</div><div class='hunk'>@@ -1462,7 +2239,7 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,</div><div class='ctx'> 		sk = kmem_cache_alloc(slab, priority &amp; ~__GFP_ZERO);</div><div class='ctx'> 		if (!sk)</div><div class='ctx'> 			return sk;</div><div class='del'>-		if (priority &amp; __GFP_ZERO)</div><div class='add'>+		if (want_init_on_alloc(priority))</div><div class='ctx'> 			sk_prot_clear_nulls(sk, prot-&gt;obj_size);</div><div class='ctx'> 	} else</div><div class='ctx'> 		sk = kmalloc(prot-&gt;obj_size, priority);</div><div class='hunk'>@@ -1473,7 +2250,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,</div><div class='ctx'> </div><div class='ctx'> 		if (!try_module_get(prot-&gt;owner))</div><div class='ctx'> 			goto out_free_sec;</div><div class='del'>-		sk_tx_queue_clear(sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -1499,6 +2275,9 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)</div><div class='ctx'> 	cgroup_sk_free(&amp;sk-&gt;sk_cgrp_data);</div><div class='ctx'> 	mem_cgroup_sk_free(sk);</div><div class='ctx'> 	security_sk_free(sk);</div><div class='add'>+</div><div class='add'>+	sk_owner_put(sk);</div><div class='add'>+</div><div class='ctx'> 	if (slab != NULL)</div><div class='ctx'> 		kmem_cache_free(slab, sk);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1527,21 +2306,31 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,</div><div class='ctx'> 		 * why we need sk_prot_creator -acme</div><div class='ctx'> 		 */</div><div class='ctx'> 		sk-&gt;sk_prot = sk-&gt;sk_prot_creator = prot;</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(net-&gt;core.sysctl_bypass_prot_mem))</div><div class='add'>+			sk-&gt;sk_bypass_prot_mem = 1;</div><div class='add'>+</div><div class='ctx'> 		sk-&gt;sk_kern_sock = kern;</div><div class='ctx'> 		sock_lock_init(sk);</div><div class='add'>+</div><div class='ctx'> 		sk-&gt;sk_net_refcnt = kern ? 0 : 1;</div><div class='ctx'> 		if (likely(sk-&gt;sk_net_refcnt)) {</div><div class='del'>-			get_net(net);</div><div class='add'>+			get_net_track(net, &amp;sk-&gt;ns_tracker, priority);</div><div class='ctx'> 			sock_inuse_add(net, 1);</div><div class='add'>+		} else {</div><div class='add'>+			net_passive_inc(net);</div><div class='add'>+			__netns_tracker_alloc(net, &amp;sk-&gt;ns_tracker,</div><div class='add'>+					      false, priority);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sock_net_set(sk, net);</div><div class='del'>-		refcount_set(&amp;sk-&gt;sk_wmem_alloc, 1);</div><div class='add'>+		refcount_set(&amp;sk-&gt;sk_wmem_alloc, SK_WMEM_ALLOC_BIAS);</div><div class='ctx'> </div><div class='ctx'> 		mem_cgroup_sk_alloc(sk);</div><div class='ctx'> 		cgroup_sk_alloc(&amp;sk-&gt;sk_cgrp_data);</div><div class='ctx'> 		sock_update_classid(&amp;sk-&gt;sk_cgrp_data);</div><div class='ctx'> 		sock_update_netprioidx(&amp;sk-&gt;sk_cgrp_data);</div><div class='add'>+		sk_tx_queue_clear(sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -1554,6 +2343,7 @@ EXPORT_SYMBOL(sk_alloc);</div><div class='ctx'> static void __sk_destruct(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = container_of(head, struct sock, sk_rcu);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct sk_filter *filter;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_destruct)</div><div class='hunk'>@@ -1565,11 +2355,13 @@ static void __sk_destruct(struct rcu_head *head)</div><div class='ctx'> 		sk_filter_uncharge(sk, filter);</div><div class='ctx'> 		RCU_INIT_POINTER(sk-&gt;sk_filter, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='del'>-		reuseport_detach_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	sock_disable_timestamp(sk, SK_FLAGS_TIMESTAMP);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	bpf_sk_storage_free(sk);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (atomic_read(&amp;sk-&gt;sk_omem_alloc))</div><div class='ctx'> 		pr_debug("%s: optmem leakage (%d bytes) detected\n",</div><div class='ctx'> 			 __func__, atomic_read(&amp;sk-&gt;sk_omem_alloc));</div><div class='hunk'>@@ -1579,17 +2371,42 @@ static void __sk_destruct(struct rcu_head *head)</div><div class='ctx'> 		sk-&gt;sk_frag.page = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_peer_cred)</div><div class='del'>-		put_cred(sk-&gt;sk_peer_cred);</div><div class='add'>+	/* We do not need to acquire sk-&gt;sk_peer_lock, we are the last user. */</div><div class='add'>+	put_cred(sk-&gt;sk_peer_cred);</div><div class='ctx'> 	put_pid(sk-&gt;sk_peer_pid);</div><div class='del'>-	if (likely(sk-&gt;sk_net_refcnt))</div><div class='del'>-		put_net(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	if (likely(sk-&gt;sk_net_refcnt)) {</div><div class='add'>+		put_net_track(net, &amp;sk-&gt;ns_tracker);</div><div class='add'>+	} else {</div><div class='add'>+		__netns_tracker_free(net, &amp;sk-&gt;ns_tracker, false);</div><div class='add'>+		net_passive_dec(net);</div><div class='add'>+	}</div><div class='ctx'> 	sk_prot_free(sk-&gt;sk_prot_creator, sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void sk_net_refcnt_upgrade(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(sk-&gt;sk_net_refcnt);</div><div class='add'>+	__netns_tracker_free(net, &amp;sk-&gt;ns_tracker, false);</div><div class='add'>+	net_passive_dec(net);</div><div class='add'>+	sk-&gt;sk_net_refcnt = 1;</div><div class='add'>+	get_net_track(net, &amp;sk-&gt;ns_tracker, GFP_KERNEL);</div><div class='add'>+	sock_inuse_add(net, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_net_refcnt_upgrade);</div><div class='add'>+</div><div class='ctx'> void sk_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	if (sock_flag(sk, SOCK_RCU_FREE))</div><div class='add'>+	bool use_call_rcu = sock_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+</div><div class='add'>+	if (rcu_access_pointer(sk-&gt;sk_reuseport_cb)) {</div><div class='add'>+		reuseport_detach_sock(sk);</div><div class='add'>+		use_call_rcu = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (use_call_rcu)</div><div class='ctx'> 		call_rcu(&amp;sk-&gt;sk_rcu, __sk_destruct);</div><div class='ctx'> 	else</div><div class='ctx'> 		__sk_destruct(&amp;sk-&gt;sk_rcu);</div><div class='hunk'>@@ -1634,156 +2451,209 @@ static void sk_init_common(struct sock *sk)</div><div class='ctx'> 	lockdep_set_class_and_name(&amp;sk-&gt;sk_error_queue.lock,</div><div class='ctx'> 			af_elock_keys + sk-&gt;sk_family,</div><div class='ctx'> 			af_family_elock_key_strings[sk-&gt;sk_family]);</div><div class='del'>-	lockdep_set_class_and_name(&amp;sk-&gt;sk_callback_lock,</div><div class='add'>+	if (sk-&gt;sk_kern_sock)</div><div class='add'>+		lockdep_set_class_and_name(&amp;sk-&gt;sk_callback_lock,</div><div class='add'>+			af_kern_callback_keys + sk-&gt;sk_family,</div><div class='add'>+			af_family_kern_clock_key_strings[sk-&gt;sk_family]);</div><div class='add'>+	else</div><div class='add'>+		lockdep_set_class_and_name(&amp;sk-&gt;sk_callback_lock,</div><div class='ctx'> 			af_callback_keys + sk-&gt;sk_family,</div><div class='ctx'> 			af_family_clock_key_strings[sk-&gt;sk_family]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	sk_clone_lock - clone a socket, and lock its clone</div><div class='del'>- *	@sk: the socket to clone</div><div class='del'>- *	@priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)</div><div class='add'>+ * sk_clone - clone a socket</div><div class='add'>+ * @sk: the socket to clone</div><div class='add'>+ * @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)</div><div class='add'>+ * @lock: if true, lock the cloned sk</div><div class='ctx'>  *</div><div class='del'>- *	Caller must unlock socket even in error path (bh_unlock_sock(newsk))</div><div class='add'>+ * If @lock is true, the clone is locked by bh_lock_sock(), and</div><div class='add'>+ * caller must unlock socket even in error path by bh_unlock_sock().</div><div class='ctx'>  */</div><div class='del'>-struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)</div><div class='add'>+struct sock *sk_clone(const struct sock *sk, const gfp_t priority,</div><div class='add'>+		      bool lock)</div><div class='ctx'> {</div><div class='del'>-	struct sock *newsk;</div><div class='add'>+	struct proto *prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+	struct sk_filter *filter;</div><div class='ctx'> 	bool is_charged = true;</div><div class='add'>+	struct sock *newsk;</div><div class='ctx'> </div><div class='del'>-	newsk = sk_prot_alloc(sk-&gt;sk_prot, priority, sk-&gt;sk_family);</div><div class='del'>-	if (newsk != NULL) {</div><div class='del'>-		struct sk_filter *filter;</div><div class='add'>+	newsk = sk_prot_alloc(prot, priority, sk-&gt;sk_family);</div><div class='add'>+	if (!newsk)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		sock_copy(newsk, sk);</div><div class='add'>+	sock_copy(newsk, sk);</div><div class='ctx'> </div><div class='del'>-		newsk-&gt;sk_prot_creator = sk-&gt;sk_prot;</div><div class='add'>+	newsk-&gt;sk_prot_creator = prot;</div><div class='ctx'> </div><div class='del'>-		/* SANITY */</div><div class='del'>-		if (likely(newsk-&gt;sk_net_refcnt))</div><div class='del'>-			get_net(sock_net(newsk));</div><div class='del'>-		sk_node_init(&amp;newsk-&gt;sk_node);</div><div class='del'>-		sock_lock_init(newsk);</div><div class='add'>+	/* SANITY */</div><div class='add'>+	if (likely(newsk-&gt;sk_net_refcnt)) {</div><div class='add'>+		get_net_track(sock_net(newsk), &amp;newsk-&gt;ns_tracker, priority);</div><div class='add'>+		sock_inuse_add(sock_net(newsk), 1);</div><div class='add'>+	} else {</div><div class='add'>+		/* Kernel sockets are not elevating the struct net refcount.</div><div class='add'>+		 * Instead, use a tracker to more easily detect if a layer</div><div class='add'>+		 * is not properly dismantling its kernel sockets at netns</div><div class='add'>+		 * destroy time.</div><div class='add'>+		 */</div><div class='add'>+		net_passive_inc(sock_net(newsk));</div><div class='add'>+		__netns_tracker_alloc(sock_net(newsk), &amp;newsk-&gt;ns_tracker,</div><div class='add'>+				      false, priority);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_node_init(&amp;newsk-&gt;sk_node);</div><div class='add'>+	sock_lock_init(newsk);</div><div class='add'>+</div><div class='add'>+	if (lock)</div><div class='ctx'> 		bh_lock_sock(newsk);</div><div class='del'>-		newsk-&gt;sk_backlog.head	= newsk-&gt;sk_backlog.tail = NULL;</div><div class='del'>-		newsk-&gt;sk_backlog.len = 0;</div><div class='ctx'> </div><div class='del'>-		atomic_set(&amp;newsk-&gt;sk_rmem_alloc, 0);</div><div class='del'>-		/*</div><div class='del'>-		 * sk_wmem_alloc set to one (see sk_free() and sock_wfree())</div><div class='del'>-		 */</div><div class='del'>-		refcount_set(&amp;newsk-&gt;sk_wmem_alloc, 1);</div><div class='del'>-		atomic_set(&amp;newsk-&gt;sk_omem_alloc, 0);</div><div class='del'>-		sk_init_common(newsk);</div><div class='del'>-</div><div class='del'>-		newsk-&gt;sk_dst_cache	= NULL;</div><div class='del'>-		newsk-&gt;sk_dst_pending_confirm = 0;</div><div class='del'>-		newsk-&gt;sk_wmem_queued	= 0;</div><div class='del'>-		newsk-&gt;sk_forward_alloc = 0;</div><div class='del'>-		atomic_set(&amp;newsk-&gt;sk_drops, 0);</div><div class='del'>-		newsk-&gt;sk_send_head	= NULL;</div><div class='del'>-		newsk-&gt;sk_userlocks	= sk-&gt;sk_userlocks &amp; ~SOCK_BINDPORT_LOCK;</div><div class='del'>-		atomic_set(&amp;newsk-&gt;sk_zckey, 0);</div><div class='del'>-</div><div class='del'>-		sock_reset_flag(newsk, SOCK_DONE);</div><div class='del'>-		mem_cgroup_sk_alloc(newsk);</div><div class='del'>-		cgroup_sk_alloc(&amp;newsk-&gt;sk_cgrp_data);</div><div class='add'>+	newsk-&gt;sk_backlog.head	= newsk-&gt;sk_backlog.tail = NULL;</div><div class='add'>+	newsk-&gt;sk_backlog.len = 0;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		filter = rcu_dereference(sk-&gt;sk_filter);</div><div class='del'>-		if (filter != NULL)</div><div class='del'>-			/* though it's an empty new sock, the charging may fail</div><div class='del'>-			 * if sysctl_optmem_max was changed between creation of</div><div class='del'>-			 * original socket and cloning</div><div class='del'>-			 */</div><div class='del'>-			is_charged = sk_filter_charge(newsk, filter);</div><div class='del'>-		RCU_INIT_POINTER(newsk-&gt;sk_filter, filter);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	atomic_set(&amp;newsk-&gt;sk_rmem_alloc, 0);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(!is_charged || xfrm_sk_clone_policy(newsk, sk))) {</div><div class='del'>-			/* We need to make sure that we don't uncharge the new</div><div class='del'>-			 * socket if we couldn't charge it in the first place</div><div class='del'>-			 * as otherwise we uncharge the parent's filter.</div><div class='del'>-			 */</div><div class='del'>-			if (!is_charged)</div><div class='del'>-				RCU_INIT_POINTER(newsk-&gt;sk_filter, NULL);</div><div class='del'>-			sk_free_unlock_clone(newsk);</div><div class='del'>-			newsk = NULL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		RCU_INIT_POINTER(newsk-&gt;sk_reuseport_cb, NULL);</div><div class='add'>+	refcount_set(&amp;newsk-&gt;sk_wmem_alloc, SK_WMEM_ALLOC_BIAS);</div><div class='ctx'> </div><div class='del'>-		newsk-&gt;sk_err	   = 0;</div><div class='del'>-		newsk-&gt;sk_err_soft = 0;</div><div class='del'>-		newsk-&gt;sk_priority = 0;</div><div class='del'>-		newsk-&gt;sk_incoming_cpu = raw_smp_processor_id();</div><div class='del'>-		atomic64_set(&amp;newsk-&gt;sk_cookie, 0);</div><div class='del'>-		if (likely(newsk-&gt;sk_net_refcnt))</div><div class='del'>-			sock_inuse_add(sock_net(newsk), 1);</div><div class='add'>+	atomic_set(&amp;newsk-&gt;sk_omem_alloc, 0);</div><div class='add'>+	sk_init_common(newsk);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Before updating sk_refcnt, we must commit prior changes to memory</div><div class='del'>-		 * (Documentation/RCU/rculist_nulls.txt for details)</div><div class='del'>-		 */</div><div class='del'>-		smp_wmb();</div><div class='del'>-		refcount_set(&amp;newsk-&gt;sk_refcnt, 2);</div><div class='add'>+	newsk-&gt;sk_dst_cache	= NULL;</div><div class='add'>+	newsk-&gt;sk_dst_pending_confirm = 0;</div><div class='add'>+	newsk-&gt;sk_wmem_queued	= 0;</div><div class='add'>+	newsk-&gt;sk_forward_alloc = 0;</div><div class='add'>+	newsk-&gt;sk_reserved_mem  = 0;</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(newsk-&gt;sk_drop_counters);</div><div class='add'>+	sk_drops_reset(newsk);</div><div class='add'>+	newsk-&gt;sk_send_head	= NULL;</div><div class='add'>+	newsk-&gt;sk_userlocks	= sk-&gt;sk_userlocks &amp; ~SOCK_BINDPORT_LOCK;</div><div class='add'>+	atomic_set(&amp;newsk-&gt;sk_zckey, 0);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Increment the counter in the same struct proto as the master</div><div class='del'>-		 * sock (sk_refcnt_debug_inc uses newsk-&gt;sk_prot-&gt;socks, that</div><div class='del'>-		 * is the same as sk-&gt;sk_prot-&gt;socks, as this field was copied</div><div class='del'>-		 * with memcpy).</div><div class='del'>-		 *</div><div class='del'>-		 * This _changes_ the previous behaviour, where</div><div class='del'>-		 * tcp_create_openreq_child always was incrementing the</div><div class='del'>-		 * equivalent to tcp_prot-&gt;socks (inet_sock_nr), so this have</div><div class='del'>-		 * to be taken into account in all callers. -acme</div><div class='add'>+	sock_reset_flag(newsk, SOCK_DONE);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='add'>+	/* sk-&gt;sk_memcg will be populated at accept() time */</div><div class='add'>+	newsk-&gt;sk_memcg = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cgroup_sk_clone(&amp;newsk-&gt;sk_cgrp_data);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	filter = rcu_dereference(sk-&gt;sk_filter);</div><div class='add'>+	if (filter != NULL)</div><div class='add'>+		/* though it's an empty new sock, the charging may fail</div><div class='add'>+		 * if sysctl_optmem_max was changed between creation of</div><div class='add'>+		 * original socket and cloning</div><div class='ctx'> 		 */</div><div class='del'>-		sk_refcnt_debug_inc(newsk);</div><div class='del'>-		sk_set_socket(newsk, NULL);</div><div class='del'>-		newsk-&gt;sk_wq = NULL;</div><div class='add'>+		is_charged = sk_filter_charge(newsk, filter);</div><div class='add'>+	RCU_INIT_POINTER(newsk-&gt;sk_filter, filter);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		if (newsk-&gt;sk_prot-&gt;sockets_allocated)</div><div class='del'>-			sk_sockets_allocated_inc(newsk);</div><div class='add'>+	if (unlikely(!is_charged || xfrm_sk_clone_policy(newsk, sk))) {</div><div class='add'>+		/* We need to make sure that we don't uncharge the new</div><div class='add'>+		 * socket if we couldn't charge it in the first place</div><div class='add'>+		 * as otherwise we uncharge the parent's filter.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_charged)</div><div class='add'>+			RCU_INIT_POINTER(newsk-&gt;sk_filter, NULL);</div><div class='ctx'> </div><div class='del'>-		if (sock_needs_netstamp(sk) &amp;&amp;</div><div class='del'>-		    newsk-&gt;sk_flags &amp; SK_FLAGS_TIMESTAMP)</div><div class='del'>-			net_enable_timestamp();</div><div class='add'>+		goto free;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(newsk-&gt;sk_reuseport_cb, NULL);</div><div class='add'>+</div><div class='add'>+	if (bpf_sk_storage_clone(sk, newsk))</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	/* Clear sk_user_data if parent had the pointer tagged</div><div class='add'>+	 * as not suitable for copying when cloning.</div><div class='add'>+	 */</div><div class='add'>+	if (sk_user_data_is_nocopy(newsk))</div><div class='add'>+		newsk-&gt;sk_user_data = NULL;</div><div class='add'>+</div><div class='add'>+	newsk-&gt;sk_err	   = 0;</div><div class='add'>+	newsk-&gt;sk_err_soft = 0;</div><div class='add'>+	newsk-&gt;sk_priority = 0;</div><div class='add'>+	newsk-&gt;sk_incoming_cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Before updating sk_refcnt, we must commit prior changes to memory</div><div class='add'>+	 * (Documentation/RCU/rculist_nulls.rst for details)</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	refcount_set(&amp;newsk-&gt;sk_refcnt, 2);</div><div class='add'>+</div><div class='add'>+	sk_set_socket(newsk, NULL);</div><div class='add'>+	sk_tx_queue_clear(newsk);</div><div class='add'>+	RCU_INIT_POINTER(newsk-&gt;sk_wq, NULL);</div><div class='add'>+</div><div class='add'>+	if (newsk-&gt;sk_prot-&gt;sockets_allocated)</div><div class='add'>+		sk_sockets_allocated_inc(newsk);</div><div class='add'>+</div><div class='add'>+	if (sock_needs_netstamp(sk) &amp;&amp; newsk-&gt;sk_flags &amp; SK_FLAGS_TIMESTAMP)</div><div class='add'>+		net_enable_timestamp();</div><div class='ctx'> out:</div><div class='ctx'> 	return newsk;</div><div class='add'>+free:</div><div class='add'>+	/* It is still raw copy of parent, so invalidate</div><div class='add'>+	 * destructor and make plain sk_free()</div><div class='add'>+	 */</div><div class='add'>+	newsk-&gt;sk_destruct = NULL;</div><div class='add'>+	if (lock)</div><div class='add'>+		bh_unlock_sock(newsk);</div><div class='add'>+	sk_free(newsk);</div><div class='add'>+	newsk = NULL;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sk_clone_lock);</div><div class='add'>+EXPORT_SYMBOL_GPL(sk_clone);</div><div class='ctx'> </div><div class='del'>-void sk_free_unlock_clone(struct sock *sk)</div><div class='add'>+static u32 sk_dst_gso_max_size(struct sock *sk, const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* It is still raw copy of parent, so invalidate</div><div class='del'>-	 * destructor and make plain sk_free() */</div><div class='del'>-	sk-&gt;sk_destruct = NULL;</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sk_free(sk);</div><div class='add'>+	bool is_ipv6 = false;</div><div class='add'>+	u32 max_size;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	is_ipv6 = (sk-&gt;sk_family == AF_INET6 &amp;&amp;</div><div class='add'>+		   !ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr));</div><div class='add'>+#endif</div><div class='add'>+	/* pairs with the WRITE_ONCE() in netif_set_gso(_ipv4)_max_size() */</div><div class='add'>+	max_size = is_ipv6 ? READ_ONCE(dev-&gt;gso_max_size) :</div><div class='add'>+			READ_ONCE(dev-&gt;gso_ipv4_max_size);</div><div class='add'>+	if (max_size &gt; GSO_LEGACY_MAX_SIZE &amp;&amp; !sk_is_tcp(sk))</div><div class='add'>+		max_size = GSO_LEGACY_MAX_SIZE;</div><div class='add'>+</div><div class='add'>+	return max_size - (MAX_TCP_HEADER + 1);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(sk_free_unlock_clone);</div><div class='ctx'> </div><div class='ctx'> void sk_setup_caps(struct sock *sk, struct dst_entry *dst)</div><div class='ctx'> {</div><div class='add'>+	const struct net_device *dev;</div><div class='ctx'> 	u32 max_segs = 1;</div><div class='ctx'> </div><div class='del'>-	sk_dst_set(sk, dst);</div><div class='del'>-	sk-&gt;sk_route_caps = dst-&gt;dev-&gt;features | sk-&gt;sk_route_forced_caps;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	sk-&gt;sk_route_caps = dev-&gt;features;</div><div class='add'>+	if (sk_is_tcp(sk)) {</div><div class='add'>+		struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+		sk-&gt;sk_route_caps |= NETIF_F_GSO;</div><div class='add'>+		icsk-&gt;icsk_ack.dst_quick_ack = dst_metric(dst, RTAX_QUICKACK);</div><div class='add'>+	}</div><div class='ctx'> 	if (sk-&gt;sk_route_caps &amp; NETIF_F_GSO)</div><div class='ctx'> 		sk-&gt;sk_route_caps |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-	sk-&gt;sk_route_caps &amp;= ~sk-&gt;sk_route_nocaps;</div><div class='add'>+	if (unlikely(sk-&gt;sk_gso_disabled))</div><div class='add'>+		sk-&gt;sk_route_caps &amp;= ~NETIF_F_GSO_MASK;</div><div class='ctx'> 	if (sk_can_gso(sk)) {</div><div class='ctx'> 		if (dst-&gt;header_len &amp;&amp; !xfrm_dst_offload_ok(dst)) {</div><div class='ctx'> 			sk-&gt;sk_route_caps &amp;= ~NETIF_F_GSO_MASK;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			sk-&gt;sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='del'>-			sk-&gt;sk_gso_max_size = dst-&gt;dev-&gt;gso_max_size;</div><div class='del'>-			max_segs = max_t(u32, dst-&gt;dev-&gt;gso_max_segs, 1);</div><div class='add'>+			sk-&gt;sk_gso_max_size = sk_dst_gso_max_size(sk, dev);</div><div class='add'>+			/* pairs with the WRITE_ONCE() in netif_set_gso_max_segs() */</div><div class='add'>+			max_segs = max_t(u32, READ_ONCE(dev-&gt;gso_max_segs), 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	sk-&gt;sk_gso_max_segs = max_segs;</div><div class='add'>+	sk_dst_set(sk, dst);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sk_setup_caps);</div><div class='ctx'> </div><div class='hunk'>@@ -1797,10 +2667,24 @@ EXPORT_SYMBOL_GPL(sk_setup_caps);</div><div class='ctx'>  */</div><div class='ctx'> void sock_wfree(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> 	unsigned int len = skb-&gt;truesize;</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+	bool free;</div><div class='add'>+	int old;</div><div class='ctx'> </div><div class='ctx'> 	if (!sock_flag(sk, SOCK_USE_WRITE_QUEUE)) {</div><div class='add'>+		if (sock_flag(sk, SOCK_RCU_FREE) &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_write_space == sock_def_write_space) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			free = __refcount_sub_and_test(len, &amp;sk-&gt;sk_wmem_alloc,</div><div class='add'>+						       &amp;old);</div><div class='add'>+			sock_def_write_space_wfree(sk, old - len);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			if (unlikely(free))</div><div class='add'>+				__sk_free(sk);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Keep a reference on sk_wmem_alloc, this will be released</div><div class='ctx'> 		 * after sk_write_space() call</div><div class='hunk'>@@ -1831,26 +2715,45 @@ void __sock_wfree(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	int old_wmem;</div><div class='add'>+</div><div class='ctx'> 	skb_orphan(skb);</div><div class='del'>-	skb-&gt;sk = sk;</div><div class='ctx'> #ifdef CONFIG_INET</div><div class='del'>-	if (unlikely(!sk_fullsock(sk))) {</div><div class='del'>-		skb-&gt;destructor = sock_edemux;</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(!sk_fullsock(sk)))</div><div class='add'>+		return skb_set_owner_edemux(skb, sk);</div><div class='ctx'> #endif</div><div class='add'>+	skb-&gt;sk = sk;</div><div class='ctx'> 	skb-&gt;destructor = sock_wfree;</div><div class='ctx'> 	skb_set_hash_from_sk(skb, sk);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We used to take a refcount on sk, but following operation</div><div class='del'>-	 * is enough to guarantee sk_free() wont free this sock until</div><div class='add'>+	 * is enough to guarantee sk_free() won't free this sock until</div><div class='ctx'> 	 * all in-flight packets are completed</div><div class='ctx'> 	 */</div><div class='del'>-	refcount_add(skb-&gt;truesize, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+	__refcount_add(skb-&gt;truesize, &amp;sk-&gt;sk_wmem_alloc, &amp;old_wmem);</div><div class='add'>+</div><div class='add'>+	/* (old_wmem == SK_WMEM_ALLOC_BIAS) if no other TX packet for this socket</div><div class='add'>+	 * is in a host queue (qdisc, NIC queue).</div><div class='add'>+	 * Set skb-&gt;ooo_okay so that netdev_pick_tx() can choose a TX queue</div><div class='add'>+	 * based on XPS for better performance.</div><div class='add'>+	 * Otherwise clear ooo_okay to not risk Out Of Order delivery.</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;ooo_okay = (old_wmem == SK_WMEM_ALLOC_BIAS);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_set_owner_w);</div><div class='ctx'> </div><div class='add'>+static bool can_skb_orphan_partial(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* Drivers depend on in-order delivery for crypto offload,</div><div class='add'>+	 * partial orphan breaks out-of-order-OK logic.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_is_decrypted(skb))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return (skb-&gt;destructor == sock_wfree ||</div><div class='add'>+		(IS_ENABLED(CONFIG_INET) &amp;&amp; skb-&gt;destructor == tcp_wfree));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This helper is used by netem, as it can hold packets in its</div><div class='ctx'>  * delay queue. We want to allow the owner socket to send more</div><div class='ctx'>  * packets, as if they were already TX completed by a typical driver.</div><div class='hunk'>@@ -1862,20 +2765,10 @@ void skb_orphan_partial(struct sk_buff *skb)</div><div class='ctx'> 	if (skb_is_tcp_pure_ack(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;destructor == sock_wfree</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-	    || skb-&gt;destructor == tcp_wfree</div><div class='del'>-#endif</div><div class='del'>-		) {</div><div class='del'>-		struct sock *sk = skb-&gt;sk;</div><div class='add'>+	if (can_skb_orphan_partial(skb) &amp;&amp; skb_set_owner_sk_safe(skb, skb-&gt;sk))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)) {</div><div class='del'>-			WARN_ON(refcount_sub_and_test(skb-&gt;truesize, &amp;sk-&gt;sk_wmem_alloc));</div><div class='del'>-			skb-&gt;destructor = sock_efree;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		skb_orphan(skb);</div><div class='del'>-	}</div><div class='add'>+	skb_orphan(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_orphan_partial);</div><div class='ctx'> </div><div class='hunk'>@@ -1902,27 +2795,27 @@ void sock_efree(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_efree);</div><div class='ctx'> </div><div class='del'>-kuid_t sock_i_uid(struct sock *sk)</div><div class='add'>+/* Buffer destructor for prefetch/receive path where reference count may</div><div class='add'>+ * not be held, e.g. for listen sockets.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+void sock_pfree(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	kuid_t uid;</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	uid = sk-&gt;sk_socket ? SOCK_INODE(sk-&gt;sk_socket)-&gt;i_uid : GLOBAL_ROOT_UID;</div><div class='del'>-	read_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	return uid;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_i_uid);</div><div class='add'>+	if (!sk_is_refcounted(sk))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-unsigned long sock_i_ino(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	unsigned long ino;</div><div class='add'>+	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV &amp;&amp; inet_reqsk(sk)-&gt;syncookie) {</div><div class='add'>+		inet_reqsk(sk)-&gt;rsk_listener = NULL;</div><div class='add'>+		reqsk_free(inet_reqsk(sk));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	ino = sk-&gt;sk_socket ? SOCK_INODE(sk-&gt;sk_socket)-&gt;i_ino : 0;</div><div class='del'>-	read_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	return ino;</div><div class='add'>+	sock_gen_put(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(sock_i_ino);</div><div class='add'>+EXPORT_SYMBOL(sock_pfree);</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a skb from the socket's send buffer.</div><div class='hunk'>@@ -1930,8 +2823,10 @@ EXPORT_SYMBOL(sock_i_ino);</div><div class='ctx'> struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force,</div><div class='ctx'> 			     gfp_t priority)</div><div class='ctx'> {</div><div class='del'>-	if (force || refcount_read(&amp;sk-&gt;sk_wmem_alloc) &lt; sk-&gt;sk_sndbuf) {</div><div class='add'>+	if (force ||</div><div class='add'>+	    refcount_read(&amp;sk-&gt;sk_wmem_alloc) &lt; READ_ONCE(sk-&gt;sk_sndbuf)) {</div><div class='ctx'> 		struct sk_buff *skb = alloc_skb(size, priority);</div><div class='add'>+</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			skb_set_owner_w(skb, sk);</div><div class='ctx'> 			return skb;</div><div class='hunk'>@@ -1955,7 +2850,7 @@ struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size,</div><div class='ctx'> </div><div class='ctx'> 	/* small safe race: SKB_TRUESIZE may differ from final skb-&gt;truesize */</div><div class='ctx'> 	if (atomic_read(&amp;sk-&gt;sk_omem_alloc) + SKB_TRUESIZE(size) &gt;</div><div class='del'>-	    sysctl_optmem_max)</div><div class='add'>+	    READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(size, priority);</div><div class='hunk'>@@ -1973,8 +2868,10 @@ struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size,</div><div class='ctx'>  */</div><div class='ctx'> void *sock_kmalloc(struct sock *sk, int size, gfp_t priority)</div><div class='ctx'> {</div><div class='del'>-	if ((unsigned int)size &lt;= sysctl_optmem_max &amp;&amp;</div><div class='del'>-	    atomic_read(&amp;sk-&gt;sk_omem_alloc) + size &lt; sysctl_optmem_max) {</div><div class='add'>+	int optmem_max = READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max);</div><div class='add'>+</div><div class='add'>+	if ((unsigned int)size &lt;= optmem_max &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;sk-&gt;sk_omem_alloc) + size &lt; optmem_max) {</div><div class='ctx'> 		void *mem;</div><div class='ctx'> 		/* First do the add, to avoid the race if kmalloc</div><div class='ctx'> 		 * might sleep.</div><div class='hunk'>@@ -1989,6 +2886,22 @@ void *sock_kmalloc(struct sock *sk, int size, gfp_t priority)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_kmalloc);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Duplicate the input "src" memory block using the socket's</div><div class='add'>+ * option memory buffer.</div><div class='add'>+ */</div><div class='add'>+void *sock_kmemdup(struct sock *sk, const void *src,</div><div class='add'>+		   int size, gfp_t priority)</div><div class='add'>+{</div><div class='add'>+	void *mem;</div><div class='add'>+</div><div class='add'>+	mem = sock_kmalloc(sk, size, priority);</div><div class='add'>+	if (mem)</div><div class='add'>+		memcpy(mem, src, size);</div><div class='add'>+	return mem;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_kmemdup);</div><div class='add'>+</div><div class='ctx'> /* Free an option memory block. Note, we actually want the inline</div><div class='ctx'>  * here as this allows gcc to detect the nullify and fold away the</div><div class='ctx'>  * condition entirely.</div><div class='hunk'>@@ -1999,7 +2912,7 @@ static inline void __sock_kfree_s(struct sock *sk, void *mem, int size,</div><div class='ctx'> 	if (WARN_ON_ONCE(!mem))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (nullify)</div><div class='del'>-		kzfree(mem);</div><div class='add'>+		kfree_sensitive(mem);</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(mem);</div><div class='ctx'> 	atomic_sub(size, &amp;sk-&gt;sk_omem_alloc);</div><div class='hunk'>@@ -2032,11 +2945,11 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='ctx'> 		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-		if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) &lt; sk-&gt;sk_sndbuf)</div><div class='add'>+		if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) &lt; READ_ONCE(sk-&gt;sk_sndbuf))</div><div class='ctx'> 			break;</div><div class='del'>-		if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_shutdown) &amp; SEND_SHUTDOWN)</div><div class='ctx'> 			break;</div><div class='del'>-		if (sk-&gt;sk_err)</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_err))</div><div class='ctx'> 			break;</div><div class='ctx'> 		timeo = schedule_timeout(timeo);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2064,10 +2977,10 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,</div><div class='ctx'> 			goto failure;</div><div class='ctx'> </div><div class='ctx'> 		err = -EPIPE;</div><div class='del'>-		if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_shutdown) &amp; SEND_SHUTDOWN)</div><div class='ctx'> 			goto failure;</div><div class='ctx'> </div><div class='del'>-		if (sk_wmem_alloc_get(sk) &lt; sk-&gt;sk_sndbuf)</div><div class='add'>+		if (sk_wmem_alloc_get(sk) &lt; READ_ONCE(sk-&gt;sk_sndbuf))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='hunk'>@@ -2093,27 +3006,24 @@ failure:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_alloc_send_pskb);</div><div class='ctx'> </div><div class='del'>-struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,</div><div class='del'>-				    int noblock, int *errcode)</div><div class='del'>-{</div><div class='del'>-	return sock_alloc_send_pskb(sk, size, 0, noblock, errcode, 0);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_alloc_send_skb);</div><div class='del'>-</div><div class='del'>-int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,</div><div class='add'>+int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,</div><div class='ctx'> 		     struct sockcm_cookie *sockc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tsflags;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(SOF_TIMESTAMPING_LAST == (1 &lt;&lt; 31));</div><div class='add'>+</div><div class='ctx'> 	switch (cmsg-&gt;cmsg_type) {</div><div class='ctx'> 	case SO_MARK:</div><div class='del'>-		if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_RAW) &amp;&amp;</div><div class='add'>+		    !ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(u32)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		sockc-&gt;mark = *(u32 *)CMSG_DATA(cmsg);</div><div class='ctx'> 		break;</div><div class='del'>-	case SO_TIMESTAMPING:</div><div class='add'>+	case SO_TIMESTAMPING_OLD:</div><div class='add'>+	case SO_TIMESTAMPING_NEW:</div><div class='ctx'> 		if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(u32)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2131,10 +3041,33 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		sockc-&gt;transmit_time = get_unaligned((u64 *)CMSG_DATA(cmsg));</div><div class='ctx'> 		break;</div><div class='add'>+	case SCM_TS_OPT_ID:</div><div class='add'>+		if (sk_is_tcp(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tsflags = READ_ONCE(sk-&gt;sk_tsflags);</div><div class='add'>+		if (!(tsflags &amp; SOF_TIMESTAMPING_OPT_ID))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(u32)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sockc-&gt;ts_opt_id = *(u32 *)CMSG_DATA(cmsg);</div><div class='add'>+		sockc-&gt;tsflags |= SOCKCM_FLAG_TS_OPT_ID;</div><div class='add'>+		break;</div><div class='ctx'> 	/* SCM_RIGHTS and SCM_CREDENTIALS are semantically in SOL_UNIX. */</div><div class='ctx'> 	case SCM_RIGHTS:</div><div class='ctx'> 	case SCM_CREDENTIALS:</div><div class='ctx'> 		break;</div><div class='add'>+	case SO_PRIORITY:</div><div class='add'>+		if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(u32)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!sk_set_prio_allowed(sk, *(u32 *)CMSG_DATA(cmsg)))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		sockc-&gt;priority = *(u32 *)CMSG_DATA(cmsg);</div><div class='add'>+		break;</div><div class='add'>+	case SCM_DEVMEM_DMABUF:</div><div class='add'>+		if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(u32)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sockc-&gt;dmabuf_id = *(u32 *)CMSG_DATA(cmsg);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2153,7 +3086,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (cmsg-&gt;cmsg_level != SOL_SOCKET)</div><div class='ctx'> 			continue;</div><div class='del'>-		ret = __sock_cmsg_send(sk, msg, cmsg, sockc);</div><div class='add'>+		ret = __sock_cmsg_send(sk, cmsg, sockc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2172,17 +3105,17 @@ static void sk_enter_memory_pressure(struct sock *sk)</div><div class='ctx'> static void sk_leave_memory_pressure(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;leave_memory_pressure) {</div><div class='del'>-		sk-&gt;sk_prot-&gt;leave_memory_pressure(sk);</div><div class='add'>+		INDIRECT_CALL_INET_1(sk-&gt;sk_prot-&gt;leave_memory_pressure,</div><div class='add'>+				     tcp_leave_memory_pressure, sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned long *memory_pressure = sk-&gt;sk_prot-&gt;memory_pressure;</div><div class='ctx'> </div><div class='del'>-		if (memory_pressure &amp;&amp; *memory_pressure)</div><div class='del'>-			*memory_pressure = 0;</div><div class='add'>+		if (memory_pressure &amp;&amp; READ_ONCE(*memory_pressure))</div><div class='add'>+			WRITE_ONCE(*memory_pressure, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* On 32bit arches, an skb frag is limited to 2^15 */</div><div class='del'>-#define SKB_FRAG_PAGE_ORDER	get_order(32768)</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * skb_page_frag_refill - check that a page_frag contains enough room</div><div class='hunk'>@@ -2207,7 +3140,8 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t gfp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pfrag-&gt;offset = 0;</div><div class='del'>-	if (SKB_FRAG_PAGE_ORDER) {</div><div class='add'>+	if (SKB_FRAG_PAGE_ORDER &amp;&amp;</div><div class='add'>+	    !static_branch_unlikely(&amp;net_high_order_alloc_disable_key)) {</div><div class='ctx'> 		/* Avoid direct reclaim but allow kswapd to wake */</div><div class='ctx'> 		pfrag-&gt;page = alloc_pages((gfp &amp; ~__GFP_DIRECT_RECLAIM) |</div><div class='ctx'> 					  __GFP_COMP | __GFP_NOWARN |</div><div class='hunk'>@@ -2232,74 +3166,16 @@ bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)</div><div class='ctx'> 	if (likely(skb_page_frag_refill(32U, pfrag, sk-&gt;sk_allocation)))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	sk_enter_memory_pressure(sk);</div><div class='add'>+	if (!sk-&gt;sk_bypass_prot_mem)</div><div class='add'>+		sk_enter_memory_pressure(sk);</div><div class='add'>+</div><div class='ctx'> 	sk_stream_moderate_sndbuf(sk);</div><div class='add'>+</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_page_frag_refill);</div><div class='ctx'> </div><div class='del'>-int sk_alloc_sg(struct sock *sk, int len, struct scatterlist *sg,</div><div class='del'>-		int sg_start, int *sg_curr_index, unsigned int *sg_curr_size,</div><div class='del'>-		int first_coalesce)</div><div class='del'>-{</div><div class='del'>-	int sg_curr = *sg_curr_index, use = 0, rc = 0;</div><div class='del'>-	unsigned int size = *sg_curr_size;</div><div class='del'>-	struct page_frag *pfrag;</div><div class='del'>-	struct scatterlist *sge;</div><div class='del'>-</div><div class='del'>-	len -= size;</div><div class='del'>-	pfrag = sk_page_frag(sk);</div><div class='del'>-</div><div class='del'>-	while (len &gt; 0) {</div><div class='del'>-		unsigned int orig_offset;</div><div class='del'>-</div><div class='del'>-		if (!sk_page_frag_refill(sk, pfrag)) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		use = min_t(int, len, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='del'>-</div><div class='del'>-		if (!sk_wmem_schedule(sk, use)) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sk_mem_charge(sk, use);</div><div class='del'>-		size += use;</div><div class='del'>-		orig_offset = pfrag-&gt;offset;</div><div class='del'>-		pfrag-&gt;offset += use;</div><div class='del'>-</div><div class='del'>-		sge = sg + sg_curr - 1;</div><div class='del'>-		if (sg_curr &gt; first_coalesce &amp;&amp; sg_page(sge) == pfrag-&gt;page &amp;&amp;</div><div class='del'>-		    sge-&gt;offset + sge-&gt;length == orig_offset) {</div><div class='del'>-			sge-&gt;length += use;</div><div class='del'>-		} else {</div><div class='del'>-			sge = sg + sg_curr;</div><div class='del'>-			sg_unmark_end(sge);</div><div class='del'>-			sg_set_page(sge, pfrag-&gt;page, use, orig_offset);</div><div class='del'>-			get_page(pfrag-&gt;page);</div><div class='del'>-			sg_curr++;</div><div class='del'>-</div><div class='del'>-			if (sg_curr == MAX_SKB_FRAGS)</div><div class='del'>-				sg_curr = 0;</div><div class='del'>-</div><div class='del'>-			if (sg_curr == sg_start) {</div><div class='del'>-				rc = -ENOSPC;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len -= use;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	*sg_curr_size = size;</div><div class='del'>-	*sg_curr_index = sg_curr;</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sk_alloc_sg);</div><div class='del'>-</div><div class='del'>-static void __lock_sock(struct sock *sk)</div><div class='add'>+void __lock_sock(struct sock *sk)</div><div class='ctx'> 	__releases(&amp;sk-&gt;sk_lock.slock)</div><div class='ctx'> 	__acquires(&amp;sk-&gt;sk_lock.slock)</div><div class='ctx'> {</div><div class='hunk'>@@ -2317,28 +3193,32 @@ static void __lock_sock(struct sock *sk)</div><div class='ctx'> 	finish_wait(&amp;sk-&gt;sk_lock.wq, &amp;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __release_sock(struct sock *sk)</div><div class='add'>+void __release_sock(struct sock *sk)</div><div class='ctx'> 	__releases(&amp;sk-&gt;sk_lock.slock)</div><div class='ctx'> 	__acquires(&amp;sk-&gt;sk_lock.slock)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='add'>+	int nb = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = sk-&gt;sk_backlog.head) != NULL) {</div><div class='ctx'> 		sk-&gt;sk_backlog.head = sk-&gt;sk_backlog.tail = NULL;</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> </div><div class='del'>-		do {</div><div class='add'>+		while (1) {</div><div class='ctx'> 			next = skb-&gt;next;</div><div class='ctx'> 			prefetch(next);</div><div class='del'>-			WARN_ON_ONCE(skb_dst_is_noref(skb));</div><div class='del'>-			skb-&gt;next = NULL;</div><div class='add'>+			DEBUG_NET_WARN_ON_ONCE(skb_dst_is_noref(skb));</div><div class='add'>+			skb_mark_not_on_list(skb);</div><div class='ctx'> 			sk_backlog_rcv(sk, skb);</div><div class='ctx'> </div><div class='del'>-			cond_resched();</div><div class='del'>-</div><div class='ctx'> 			skb = next;</div><div class='del'>-		} while (skb != NULL);</div><div class='add'>+			if (!skb)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (!(++nb &amp; 15))</div><div class='add'>+				cond_resched();</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2354,8 +3234,14 @@ void __sk_flush_backlog(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> 	__release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_prot-&gt;release_cb)</div><div class='add'>+		INDIRECT_CALL_INET_1(sk-&gt;sk_prot-&gt;release_cb,</div><div class='add'>+				     tcp_release_cb, sk);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__sk_flush_backlog);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * sk_wait_data - wait for data to arrive at sk_receive_queue</div><div class='hunk'>@@ -2389,17 +3275,34 @@ EXPORT_SYMBOL(sk_wait_data);</div><div class='ctx'>  *	@amt: pages to allocate</div><div class='ctx'>  *	@kind: allocation type</div><div class='ctx'>  *</div><div class='del'>- *	Similar to __sk_mem_schedule(), but does not update sk_forward_alloc</div><div class='add'>+ *	Similar to __sk_mem_schedule(), but does not update sk_forward_alloc.</div><div class='add'>+ *</div><div class='add'>+ *	Unlike the globally shared limits among the sockets under same protocol,</div><div class='add'>+ *	consuming the budget of a memcg won't have direct effect on other ones.</div><div class='add'>+ *	So be optimistic about memcg's tolerance, and leave the callers to decide</div><div class='add'>+ *	whether or not to raise allocated through sk_under_memory_pressure() or</div><div class='add'>+ *	its variants.</div><div class='ctx'>  */</div><div class='ctx'> int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)</div><div class='ctx'> {</div><div class='add'>+	bool memcg_enabled = false, charged = false;</div><div class='ctx'> 	struct proto *prot = sk-&gt;sk_prot;</div><div class='del'>-	long allocated = sk_memory_allocated_add(sk, amt);</div><div class='del'>-	bool charged = true;</div><div class='add'>+	long allocated = 0;</div><div class='ctx'> </div><div class='del'>-	if (mem_cgroup_sockets_enabled &amp;&amp; sk-&gt;sk_memcg &amp;&amp;</div><div class='del'>-	    !(charged = mem_cgroup_charge_skmem(sk-&gt;sk_memcg, amt)))</div><div class='del'>-		goto suppress_allocation;</div><div class='add'>+	if (!sk-&gt;sk_bypass_prot_mem) {</div><div class='add'>+		sk_memory_allocated_add(sk, amt);</div><div class='add'>+		allocated = sk_memory_allocated(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mem_cgroup_sk_enabled(sk)) {</div><div class='add'>+		memcg_enabled = true;</div><div class='add'>+		charged = mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge());</div><div class='add'>+		if (!charged)</div><div class='add'>+			goto suppress_allocation;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!allocated)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Under limit. */</div><div class='ctx'> 	if (allocated &lt;= sk_prot_mem_limits(sk, 0)) {</div><div class='hunk'>@@ -2415,7 +3318,14 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)</div><div class='ctx'> 	if (allocated &gt; sk_prot_mem_limits(sk, 2))</div><div class='ctx'> 		goto suppress_allocation;</div><div class='ctx'> </div><div class='del'>-	/* guarantee minimum buffer size under pressure */</div><div class='add'>+	/* Guarantee minimum buffer size under pressure (either global</div><div class='add'>+	 * or memcg) to make sure features described in RFC 7323 (TCP</div><div class='add'>+	 * Extensions for High Performance) work properly.</div><div class='add'>+	 *</div><div class='add'>+	 * This rule does NOT stand when exceeds global or memcg's hard</div><div class='add'>+	 * limit, or else a DoS attack can be taken place by spawning</div><div class='add'>+	 * lots of sockets whose usage are under minimum buffer size.</div><div class='add'>+	 */</div><div class='ctx'> 	if (kind == SK_MEM_RECV) {</div><div class='ctx'> 		if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt; sk_get_rmem0(sk, prot))</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -2432,10 +3342,19 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk_has_memory_pressure(sk)) {</div><div class='del'>-		int alloc;</div><div class='add'>+		u64 alloc;</div><div class='ctx'> </div><div class='del'>-		if (!sk_under_memory_pressure(sk))</div><div class='add'>+		/* The following 'average' heuristic is within the</div><div class='add'>+		 * scope of global accounting, so it only makes</div><div class='add'>+		 * sense for global memory pressure.</div><div class='add'>+		 */</div><div class='add'>+		if (!sk_under_global_memory_pressure(sk))</div><div class='ctx'> 			return 1;</div><div class='add'>+</div><div class='add'>+		/* Try to be fair among all the sockets under global</div><div class='add'>+		 * pressure by allowing the ones that below average</div><div class='add'>+		 * usage to raise.</div><div class='add'>+		 */</div><div class='ctx'> 		alloc = sk_sockets_allocated_read_positive(sk);</div><div class='ctx'> 		if (sk_prot_mem_limits(sk, 2) &gt; alloc *</div><div class='ctx'> 		    sk_mem_pages(sk-&gt;sk_wmem_queued +</div><div class='hunk'>@@ -2452,21 +3371,25 @@ suppress_allocation:</div><div class='ctx'> 		/* Fail only if socket is _under_ its sndbuf.</div><div class='ctx'> 		 * In this case we cannot block, so that we have to fail.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sk-&gt;sk_wmem_queued + size &gt;= sk-&gt;sk_sndbuf)</div><div class='add'>+		if (sk-&gt;sk_wmem_queued + size &gt;= sk-&gt;sk_sndbuf) {</div><div class='add'>+			/* Force charge with __GFP_NOFAIL */</div><div class='add'>+			if (memcg_enabled &amp;&amp; !charged)</div><div class='add'>+				mem_cgroup_sk_charge(sk, amt,</div><div class='add'>+						     gfp_memcg_charge() | __GFP_NOFAIL);</div><div class='ctx'> 			return 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kind == SK_MEM_SEND || (kind == SK_MEM_RECV &amp;&amp; charged))</div><div class='del'>-		trace_sock_exceed_buf_limit(sk, prot, allocated, kind);</div><div class='add'>+	trace_sock_exceed_buf_limit(sk, prot, allocated, kind);</div><div class='ctx'> </div><div class='del'>-	sk_memory_allocated_sub(sk, amt);</div><div class='add'>+	if (allocated)</div><div class='add'>+		sk_memory_allocated_sub(sk, amt);</div><div class='ctx'> </div><div class='del'>-	if (mem_cgroup_sockets_enabled &amp;&amp; sk-&gt;sk_memcg)</div><div class='del'>-		mem_cgroup_uncharge_skmem(sk-&gt;sk_memcg, amt);</div><div class='add'>+	if (charged)</div><div class='add'>+		mem_cgroup_sk_uncharge(sk, amt);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__sk_mem_raise_allocated);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	__sk_mem_schedule - increase sk_forward_alloc and memory_allocated</div><div class='hunk'>@@ -2482,10 +3405,10 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, amt = sk_mem_pages(size);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_forward_alloc += amt &lt;&lt; SK_MEM_QUANTUM_SHIFT;</div><div class='add'>+	sk_forward_alloc_add(sk, amt &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> 	ret = __sk_mem_raise_allocated(sk, size, amt, kind);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		sk-&gt;sk_forward_alloc -= amt &lt;&lt; SK_MEM_QUANTUM_SHIFT;</div><div class='add'>+		sk_forward_alloc_add(sk, -(amt &lt;&lt; PAGE_SHIFT));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sk_mem_schedule);</div><div class='hunk'>@@ -2499,33 +3422,53 @@ EXPORT_SYMBOL(__sk_mem_schedule);</div><div class='ctx'>  */</div><div class='ctx'> void __sk_mem_reduce_allocated(struct sock *sk, int amount)</div><div class='ctx'> {</div><div class='del'>-	sk_memory_allocated_sub(sk, amount);</div><div class='add'>+	if (mem_cgroup_sk_enabled(sk))</div><div class='add'>+		mem_cgroup_sk_uncharge(sk, amount);</div><div class='ctx'> </div><div class='del'>-	if (mem_cgroup_sockets_enabled &amp;&amp; sk-&gt;sk_memcg)</div><div class='del'>-		mem_cgroup_uncharge_skmem(sk-&gt;sk_memcg, amount);</div><div class='add'>+	if (sk-&gt;sk_bypass_prot_mem)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk_memory_allocated_sub(sk, amount);</div><div class='ctx'> </div><div class='del'>-	if (sk_under_memory_pressure(sk) &amp;&amp;</div><div class='add'>+	if (sk_under_global_memory_pressure(sk) &amp;&amp;</div><div class='ctx'> 	    (sk_memory_allocated(sk) &lt; sk_prot_mem_limits(sk, 0)))</div><div class='ctx'> 		sk_leave_memory_pressure(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__sk_mem_reduce_allocated);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	__sk_mem_reclaim - reclaim sk_forward_alloc and memory_allocated</div><div class='ctx'>  *	@sk: socket</div><div class='del'>- *	@amount: number of bytes (rounded down to a SK_MEM_QUANTUM multiple)</div><div class='add'>+ *	@amount: number of bytes (rounded down to a PAGE_SIZE multiple)</div><div class='ctx'>  */</div><div class='ctx'> void __sk_mem_reclaim(struct sock *sk, int amount)</div><div class='ctx'> {</div><div class='del'>-	amount &gt;&gt;= SK_MEM_QUANTUM_SHIFT;</div><div class='del'>-	sk-&gt;sk_forward_alloc -= amount &lt;&lt; SK_MEM_QUANTUM_SHIFT;</div><div class='add'>+	amount &gt;&gt;= PAGE_SHIFT;</div><div class='add'>+	sk_forward_alloc_add(sk, -(amount &lt;&lt; PAGE_SHIFT));</div><div class='ctx'> 	__sk_mem_reduce_allocated(sk, amount);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__sk_mem_reclaim);</div><div class='ctx'> </div><div class='add'>+void __sk_charge(struct sock *sk, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	int amt;</div><div class='add'>+</div><div class='add'>+	gfp |= __GFP_NOFAIL;</div><div class='add'>+	if (mem_cgroup_from_sk(sk)) {</div><div class='add'>+		/* The socket has not been accepted yet, no need</div><div class='add'>+		 * to look at newsk-&gt;sk_wmem_queued.</div><div class='add'>+		 */</div><div class='add'>+		amt = sk_mem_pages(sk-&gt;sk_forward_alloc +</div><div class='add'>+				   atomic_read(&amp;sk-&gt;sk_rmem_alloc));</div><div class='add'>+		if (amt)</div><div class='add'>+			mem_cgroup_sk_charge(sk, amt, gfp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kmem_cache_charge(sk, gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int sk_set_peek_off(struct sock *sk, int val)</div><div class='ctx'> {</div><div class='del'>-	sk-&gt;sk_peek_off = val;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_peek_off, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sk_set_peek_off);</div><div class='hunk'>@@ -2537,13 +3480,13 @@ EXPORT_SYMBOL_GPL(sk_set_peek_off);</div><div class='ctx'>  * function, some default processing is provided.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int sock_no_bind(struct socket *sock, struct sockaddr *saddr, int len)</div><div class='add'>+int sock_no_bind(struct socket *sock, struct sockaddr_unsized *saddr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_no_bind);</div><div class='ctx'> </div><div class='del'>-int sock_no_connect(struct socket *sock, struct sockaddr *saddr,</div><div class='add'>+int sock_no_connect(struct socket *sock, struct sockaddr_unsized *saddr,</div><div class='ctx'> 		    int len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -2556,8 +3499,8 @@ int sock_no_socketpair(struct socket *sock1, struct socket *sock2)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_no_socketpair);</div><div class='ctx'> </div><div class='del'>-int sock_no_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-		   bool kern)</div><div class='add'>+int sock_no_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+		   struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -2588,20 +3531,6 @@ int sock_no_shutdown(struct socket *sock, int how)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_no_shutdown);</div><div class='ctx'> </div><div class='del'>-int sock_no_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_no_setsockopt);</div><div class='del'>-</div><div class='del'>-int sock_no_getsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_no_getsockopt);</div><div class='del'>-</div><div class='ctx'> int sock_no_sendmsg(struct socket *sock, struct msghdr *m, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -2628,35 +3557,20 @@ int sock_no_mmap(struct file *file, struct socket *sock, struct vm_area_struct *</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_no_mmap);</div><div class='ctx'> </div><div class='del'>-ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	ssize_t res;</div><div class='del'>-	struct msghdr msg = {.msg_flags = flags};</div><div class='del'>-	struct kvec iov;</div><div class='del'>-	char *kaddr = kmap(page);</div><div class='del'>-	iov.iov_base = kaddr + offset;</div><div class='del'>-	iov.iov_len = size;</div><div class='del'>-	res = kernel_sendmsg(sock, &amp;msg, &amp;iov, 1, size);</div><div class='del'>-	kunmap(page);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_no_sendpage);</div><div class='del'>-</div><div class='del'>-ssize_t sock_no_sendpage_locked(struct sock *sk, struct page *page,</div><div class='del'>-				int offset, size_t size, int flags)</div><div class='add'>+/*</div><div class='add'>+ * When a file is received (via SCM_RIGHTS, etc), we must bump the</div><div class='add'>+ * various sock-based usage counts.</div><div class='add'>+ */</div><div class='add'>+void __receive_sock(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	ssize_t res;</div><div class='del'>-	struct msghdr msg = {.msg_flags = flags};</div><div class='del'>-	struct kvec iov;</div><div class='del'>-	char *kaddr = kmap(page);</div><div class='add'>+	struct socket *sock;</div><div class='ctx'> </div><div class='del'>-	iov.iov_base = kaddr + offset;</div><div class='del'>-	iov.iov_len = size;</div><div class='del'>-	res = kernel_sendmsg_locked(sk, &amp;msg, &amp;iov, 1, size);</div><div class='del'>-	kunmap(page);</div><div class='del'>-	return res;</div><div class='add'>+	sock = sock_from_file(file);</div><div class='add'>+	if (sock) {</div><div class='add'>+		sock_update_netprioidx(&amp;sock-&gt;sk-&gt;sk_cgrp_data);</div><div class='add'>+		sock_update_classid(&amp;sock-&gt;sk-&gt;sk_cgrp_data);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(sock_no_sendpage_locked);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Default Socket Callbacks</div><div class='hunk'>@@ -2681,20 +3595,22 @@ static void sock_def_error_report(struct sock *sk)</div><div class='ctx'> 	wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='ctx'> 	if (skwq_has_sleeper(wq))</div><div class='ctx'> 		wake_up_interruptible_poll(&amp;wq-&gt;wait, EPOLLERR);</div><div class='del'>-	sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);</div><div class='add'>+	sk_wake_async_rcu(sk, SOCK_WAKE_IO, POLL_ERR);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sock_def_readable(struct sock *sk)</div><div class='add'>+void sock_def_readable(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct socket_wq *wq;</div><div class='ctx'> </div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='ctx'> 	if (skwq_has_sleeper(wq))</div><div class='ctx'> 		wake_up_interruptible_sync_poll(&amp;wq-&gt;wait, EPOLLIN | EPOLLPRI |</div><div class='ctx'> 						EPOLLRDNORM | EPOLLRDBAND);</div><div class='del'>-	sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);</div><div class='add'>+	sk_wake_async_rcu(sk, SOCK_WAKE_WAITD, POLL_IN);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2707,20 +3623,42 @@ static void sock_def_write_space(struct sock *sk)</div><div class='ctx'> 	/* Do not wake up a writer until he can make "significant"</div><div class='ctx'> 	 * progress.  --DaveM</div><div class='ctx'> 	 */</div><div class='del'>-	if ((refcount_read(&amp;sk-&gt;sk_wmem_alloc) &lt;&lt; 1) &lt;= sk-&gt;sk_sndbuf) {</div><div class='add'>+	if (sock_writeable(sk)) {</div><div class='ctx'> 		wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='ctx'> 		if (skwq_has_sleeper(wq))</div><div class='ctx'> 			wake_up_interruptible_sync_poll(&amp;wq-&gt;wait, EPOLLOUT |</div><div class='ctx'> 						EPOLLWRNORM | EPOLLWRBAND);</div><div class='ctx'> </div><div class='ctx'> 		/* Should agree with poll, otherwise some programs break */</div><div class='del'>-		if (sock_writeable(sk))</div><div class='del'>-			sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='add'>+		sk_wake_async_rcu(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* An optimised version of sock_def_write_space(), should only be called</div><div class='add'>+ * for SOCK_RCU_FREE sockets under RCU read section and after putting</div><div class='add'>+ * -&gt;sk_wmem_alloc.</div><div class='add'>+ */</div><div class='add'>+static void sock_def_write_space_wfree(struct sock *sk, int wmem_alloc)</div><div class='add'>+{</div><div class='add'>+	/* Do not wake up a writer until he can make "significant"</div><div class='add'>+	 * progress.  --DaveM</div><div class='add'>+	 */</div><div class='add'>+	if (__sock_writeable(sk, wmem_alloc)) {</div><div class='add'>+		struct socket_wq *wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='add'>+</div><div class='add'>+		/* rely on refcount_sub from sock_wfree() */</div><div class='add'>+		smp_mb__after_atomic();</div><div class='add'>+		if (wq &amp;&amp; waitqueue_active(&amp;wq-&gt;wait))</div><div class='add'>+			wake_up_interruptible_sync_poll(&amp;wq-&gt;wait, EPOLLOUT |</div><div class='add'>+						EPOLLWRNORM | EPOLLWRBAND);</div><div class='add'>+</div><div class='add'>+		/* Should agree with poll, otherwise some programs break */</div><div class='add'>+		sk_wake_async_rcu(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sock_def_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -2728,7 +3666,7 @@ static void sock_def_destruct(struct sock *sk)</div><div class='ctx'> void sk_send_sigurg(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (sk-&gt;sk_socket &amp;&amp; sk-&gt;sk_socket-&gt;file)</div><div class='del'>-		if (send_sigurg(&amp;sk-&gt;sk_socket-&gt;file-&gt;f_owner))</div><div class='add'>+		if (send_sigurg(sk-&gt;sk_socket-&gt;file))</div><div class='ctx'> 			sk_wake_async(sk, SOCK_WAKE_URG, POLL_PRI);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_send_sigurg);</div><div class='hunk'>@@ -2743,12 +3681,19 @@ EXPORT_SYMBOL(sk_reset_timer);</div><div class='ctx'> </div><div class='ctx'> void sk_stop_timer(struct sock *sk, struct timer_list* timer)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer(timer))</div><div class='add'>+	if (timer_delete(timer))</div><div class='ctx'> 		__sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_stop_timer);</div><div class='ctx'> </div><div class='del'>-void sock_init_data(struct socket *sock, struct sock *sk)</div><div class='add'>+void sk_stop_timer_sync(struct sock *sk, struct timer_list *timer)</div><div class='add'>+{</div><div class='add'>+	if (timer_delete_sync(timer))</div><div class='add'>+		__sock_put(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sk_stop_timer_sync);</div><div class='add'>+</div><div class='add'>+void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid)</div><div class='ctx'> {</div><div class='ctx'> 	sk_init_common(sk);</div><div class='ctx'> 	sk-&gt;sk_send_head	=	NULL;</div><div class='hunk'>@@ -2756,34 +3701,22 @@ void sock_init_data(struct socket *sock, struct sock *sk)</div><div class='ctx'> 	timer_setup(&amp;sk-&gt;sk_timer, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_allocation	=	GFP_KERNEL;</div><div class='del'>-	sk-&gt;sk_rcvbuf		=	sysctl_rmem_default;</div><div class='del'>-	sk-&gt;sk_sndbuf		=	sysctl_wmem_default;</div><div class='add'>+	sk-&gt;sk_rcvbuf		=	READ_ONCE(sysctl_rmem_default);</div><div class='add'>+	sk-&gt;sk_sndbuf		=	READ_ONCE(sysctl_wmem_default);</div><div class='ctx'> 	sk-&gt;sk_state		=	TCP_CLOSE;</div><div class='add'>+	sk-&gt;sk_use_task_frag	=	true;</div><div class='ctx'> 	sk_set_socket(sk, sock);</div><div class='ctx'> </div><div class='ctx'> 	sock_set_flag(sk, SOCK_ZAPPED);</div><div class='ctx'> </div><div class='ctx'> 	if (sock) {</div><div class='ctx'> 		sk-&gt;sk_type	=	sock-&gt;type;</div><div class='del'>-		sk-&gt;sk_wq	=	sock-&gt;wq;</div><div class='add'>+		RCU_INIT_POINTER(sk-&gt;sk_wq, &amp;sock-&gt;wq);</div><div class='ctx'> 		sock-&gt;sk	=	sk;</div><div class='del'>-		sk-&gt;sk_uid	=	SOCK_INODE(sock)-&gt;i_uid;</div><div class='ctx'> 	} else {</div><div class='del'>-		sk-&gt;sk_wq	=	NULL;</div><div class='del'>-		sk-&gt;sk_uid	=	make_kuid(sock_net(sk)-&gt;user_ns, 0);</div><div class='add'>+		RCU_INIT_POINTER(sk-&gt;sk_wq, NULL);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	rwlock_init(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	if (sk-&gt;sk_kern_sock)</div><div class='del'>-		lockdep_set_class_and_name(</div><div class='del'>-			&amp;sk-&gt;sk_callback_lock,</div><div class='del'>-			af_kern_callback_keys + sk-&gt;sk_family,</div><div class='del'>-			af_family_kern_clock_key_strings[sk-&gt;sk_family]);</div><div class='del'>-	else</div><div class='del'>-		lockdep_set_class_and_name(</div><div class='del'>-			&amp;sk-&gt;sk_callback_lock,</div><div class='del'>-			af_callback_keys + sk-&gt;sk_family,</div><div class='del'>-			af_family_clock_key_strings[sk-&gt;sk_family]);</div><div class='add'>+	sk-&gt;sk_uid	=	uid;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_state_change	=	sock_def_wakeup;</div><div class='ctx'> 	sk-&gt;sk_data_ready	=	sock_def_readable;</div><div class='hunk'>@@ -2797,48 +3730,61 @@ void sock_init_data(struct socket *sock, struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_peer_pid 	=	NULL;</div><div class='ctx'> 	sk-&gt;sk_peer_cred	=	NULL;</div><div class='add'>+	spin_lock_init(&amp;sk-&gt;sk_peer_lock);</div><div class='add'>+</div><div class='ctx'> 	sk-&gt;sk_write_pending	=	0;</div><div class='ctx'> 	sk-&gt;sk_rcvlowat		=	1;</div><div class='ctx'> 	sk-&gt;sk_rcvtimeo		=	MAX_SCHEDULE_TIMEOUT;</div><div class='ctx'> 	sk-&gt;sk_sndtimeo		=	MAX_SCHEDULE_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_stamp = SK_DEFAULT_STAMP;</div><div class='add'>+#if BITS_PER_LONG==32</div><div class='add'>+	seqlock_init(&amp;sk-&gt;sk_stamp_seq);</div><div class='add'>+#endif</div><div class='ctx'> 	atomic_set(&amp;sk-&gt;sk_zckey, 0);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='ctx'> 	sk-&gt;sk_napi_id		=	0;</div><div class='del'>-	sk-&gt;sk_ll_usec		=	sysctl_net_busy_read;</div><div class='add'>+	sk-&gt;sk_ll_usec		=	READ_ONCE(sysctl_net_busy_read);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_max_pacing_rate = ~0U;</div><div class='del'>-	sk-&gt;sk_pacing_rate = ~0U;</div><div class='del'>-	sk-&gt;sk_pacing_shift = 10;</div><div class='add'>+	sk-&gt;sk_max_pacing_rate = ~0UL;</div><div class='add'>+	sk-&gt;sk_pacing_rate = ~0UL;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_pacing_shift, 10);</div><div class='ctx'> 	sk-&gt;sk_incoming_cpu = -1;</div><div class='ctx'> </div><div class='ctx'> 	sk_rx_queue_clear(sk);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Before updating sk_refcnt, we must commit prior changes to memory</div><div class='del'>-	 * (Documentation/RCU/rculist_nulls.txt for details)</div><div class='add'>+	 * (Documentation/RCU/rculist_nulls.rst for details)</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	refcount_set(&amp;sk-&gt;sk_refcnt, 1);</div><div class='del'>-	atomic_set(&amp;sk-&gt;sk_drops, 0);</div><div class='add'>+	sk_drops_reset(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_init_data_uid);</div><div class='add'>+</div><div class='add'>+void sock_init_data(struct socket *sock, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	kuid_t uid = sock ?</div><div class='add'>+		SOCK_INODE(sock)-&gt;i_uid :</div><div class='add'>+		make_kuid(sock_net(sk)-&gt;user_ns, 0);</div><div class='add'>+</div><div class='add'>+	sock_init_data_uid(sock, sk, uid);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_init_data);</div><div class='ctx'> </div><div class='ctx'> void lock_sock_nested(struct sock *sk, int subclass)</div><div class='ctx'> {</div><div class='add'>+	/* The sk_lock has mutex_lock() semantics here. */</div><div class='add'>+	mutex_acquire(&amp;sk-&gt;sk_lock.dep_map, subclass, 0, _RET_IP_);</div><div class='add'>+</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	spin_lock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='del'>-	if (sk-&gt;sk_lock.owned)</div><div class='add'>+	if (sock_owned_by_user_nocheck(sk))</div><div class='ctx'> 		__lock_sock(sk);</div><div class='ctx'> 	sk-&gt;sk_lock.owned = 1;</div><div class='del'>-	spin_unlock(&amp;sk-&gt;sk_lock.slock);</div><div class='del'>-	/*</div><div class='del'>-	 * The sk_lock has mutex_lock() semantics here:</div><div class='del'>-	 */</div><div class='del'>-	mutex_acquire(&amp;sk-&gt;sk_lock.dep_map, subclass, 0, _RET_IP_);</div><div class='del'>-	local_bh_enable();</div><div class='add'>+	spin_unlock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lock_sock_nested);</div><div class='ctx'> </div><div class='hunk'>@@ -2848,11 +3794,9 @@ void release_sock(struct sock *sk)</div><div class='ctx'> 	if (sk-&gt;sk_backlog.tail)</div><div class='ctx'> 		__release_sock(sk);</div><div class='ctx'> </div><div class='del'>-	/* Warning : release_cb() might need to release sk ownership,</div><div class='del'>-	 * ie call sock_release_ownership(sk) before us.</div><div class='del'>-	 */</div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;release_cb)</div><div class='del'>-		sk-&gt;sk_prot-&gt;release_cb(sk);</div><div class='add'>+		INDIRECT_CALL_INET_1(sk-&gt;sk_prot-&gt;release_cb,</div><div class='add'>+				     tcp_release_cb, sk);</div><div class='ctx'> </div><div class='ctx'> 	sock_release_ownership(sk);</div><div class='ctx'> 	if (waitqueue_active(&amp;sk-&gt;sk_lock.wq))</div><div class='hunk'>@@ -2861,75 +3805,78 @@ void release_sock(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(release_sock);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * lock_sock_fast - fast version of lock_sock</div><div class='del'>- * @sk: socket</div><div class='del'>- *</div><div class='del'>- * This version should be used for very small section, where process wont block</div><div class='del'>- * return false if fast path is taken:</div><div class='del'>- *</div><div class='del'>- *   sk_lock.slock locked, owned = 0, BH disabled</div><div class='del'>- *</div><div class='del'>- * return true if slow path is taken:</div><div class='del'>- *</div><div class='del'>- *   sk_lock.slock unlocked, owned = 1, BH enabled</div><div class='del'>- */</div><div class='del'>-bool lock_sock_fast(struct sock *sk)</div><div class='add'>+bool __lock_sock_fast(struct sock *sk) __acquires(&amp;sk-&gt;sk_lock.slock)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	spin_lock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> </div><div class='del'>-	if (!sk-&gt;sk_lock.owned)</div><div class='add'>+	if (!sock_owned_by_user_nocheck(sk)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Note : We must disable BH</div><div class='add'>+		 * Fast path return with bottom halves disabled and</div><div class='add'>+		 * sock::sk_lock.slock held.</div><div class='add'>+		 *</div><div class='add'>+		 * The 'mutex' is not contended and holding</div><div class='add'>+		 * sock::sk_lock.slock prevents all other lockers to</div><div class='add'>+		 * proceed so the corresponding unlock_sock_fast() can</div><div class='add'>+		 * avoid the slow path of release_sock() completely and</div><div class='add'>+		 * just release slock.</div><div class='add'>+		 *</div><div class='add'>+		 * From a semantical POV this is equivalent to 'acquiring'</div><div class='add'>+		 * the 'mutex', hence the corresponding lockdep</div><div class='add'>+		 * mutex_release() has to happen in the fast path of</div><div class='add'>+		 * unlock_sock_fast().</div><div class='ctx'> 		 */</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__lock_sock(sk);</div><div class='ctx'> 	sk-&gt;sk_lock.owned = 1;</div><div class='del'>-	spin_unlock(&amp;sk-&gt;sk_lock.slock);</div><div class='del'>-	/*</div><div class='del'>-	 * The sk_lock has mutex_lock() semantics here:</div><div class='del'>-	 */</div><div class='del'>-	mutex_acquire(&amp;sk-&gt;sk_lock.dep_map, 0, 0, _RET_IP_);</div><div class='del'>-	local_bh_enable();</div><div class='add'>+	__acquire(&amp;sk-&gt;sk_lock.slock);</div><div class='add'>+	spin_unlock_bh(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(lock_sock_fast);</div><div class='add'>+EXPORT_SYMBOL(__lock_sock_fast);</div><div class='ctx'> </div><div class='del'>-int sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)</div><div class='add'>+int sock_gettstamp(struct socket *sock, void __user *userstamp,</div><div class='add'>+		   bool timeval, bool time32)</div><div class='ctx'> {</div><div class='del'>-	struct timeval tv;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct timespec64 ts;</div><div class='ctx'> </div><div class='ctx'> 	sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='del'>-	tv = ktime_to_timeval(sk-&gt;sk_stamp);</div><div class='del'>-	if (tv.tv_sec == -1)</div><div class='add'>+	ts = ktime_to_timespec64(sock_read_timestamp(sk));</div><div class='add'>+	if (ts.tv_sec == -1)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	if (tv.tv_sec == 0) {</div><div class='del'>-		sk-&gt;sk_stamp = ktime_get_real();</div><div class='del'>-		tv = ktime_to_timeval(sk-&gt;sk_stamp);</div><div class='add'>+	if (ts.tv_sec == 0) {</div><div class='add'>+		ktime_t kt = ktime_get_real();</div><div class='add'>+		sock_write_timestamp(sk, kt);</div><div class='add'>+		ts = ktime_to_timespec64(kt);</div><div class='ctx'> 	}</div><div class='del'>-	return copy_to_user(userstamp, &amp;tv, sizeof(tv)) ? -EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sock_get_timestamp);</div><div class='ctx'> </div><div class='del'>-int sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)</div><div class='del'>-{</div><div class='del'>-	struct timespec ts;</div><div class='add'>+	if (timeval)</div><div class='add'>+		ts.tv_nsec /= 1000;</div><div class='ctx'> </div><div class='del'>-	sock_enable_timestamp(sk, SOCK_TIMESTAMP);</div><div class='del'>-	ts = ktime_to_timespec(sk-&gt;sk_stamp);</div><div class='del'>-	if (ts.tv_sec == -1)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (ts.tv_sec == 0) {</div><div class='del'>-		sk-&gt;sk_stamp = ktime_get_real();</div><div class='del'>-		ts = ktime_to_timespec(sk-&gt;sk_stamp);</div><div class='add'>+#ifdef CONFIG_COMPAT_32BIT_TIME</div><div class='add'>+	if (time32)</div><div class='add'>+		return put_old_timespec32(&amp;ts, userstamp);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SPARC64</div><div class='add'>+	/* beware of padding in sparc64 timeval */</div><div class='add'>+	if (timeval &amp;&amp; !in_compat_syscall()) {</div><div class='add'>+		struct __kernel_old_timeval __user tv = {</div><div class='add'>+			.tv_sec = ts.tv_sec,</div><div class='add'>+			.tv_usec = ts.tv_nsec,</div><div class='add'>+		};</div><div class='add'>+		if (copy_to_user(userstamp, &amp;tv, sizeof(tv)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return copy_to_user(userstamp, &amp;ts, sizeof(ts)) ? -EFAULT : 0;</div><div class='add'>+#endif</div><div class='add'>+	return put_timespec64(&amp;ts, userstamp);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(sock_get_timestampns);</div><div class='add'>+EXPORT_SYMBOL(sock_gettstamp);</div><div class='ctx'> </div><div class='del'>-void sock_enable_timestamp(struct sock *sk, int flag)</div><div class='add'>+void sock_enable_timestamp(struct sock *sk, enum sock_flags flag)</div><div class='ctx'> {</div><div class='ctx'> 	if (!sock_flag(sk, flag)) {</div><div class='ctx'> 		unsigned long previous_flags = sk-&gt;sk_flags;</div><div class='hunk'>@@ -2987,31 +3934,18 @@ EXPORT_SYMBOL(sock_recv_errqueue);</div><div class='ctx'>  *</div><div class='ctx'>  *	FIX: POSIX 1003.1g is very ambiguous here. It states that</div><div class='ctx'>  *	asynchronous errors should be reported by getsockopt. We assume</div><div class='del'>- *	this means if you specify SO_ERROR (otherwise whats the point of it).</div><div class='add'>+ *	this means if you specify SO_ERROR (otherwise what is the point of it).</div><div class='ctx'>  */</div><div class='ctx'> int sock_common_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 			   char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	return sk-&gt;sk_prot-&gt;getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	return READ_ONCE(sk-&gt;sk_prot)-&gt;getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_common_getsockopt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_sock_common_getsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				  char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_prot-&gt;compat_getsockopt != NULL)</div><div class='del'>-		return sk-&gt;sk_prot-&gt;compat_getsockopt(sk, level, optname,</div><div class='del'>-						      optval, optlen);</div><div class='del'>-	return sk-&gt;sk_prot-&gt;getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_sock_common_getsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 			int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -3019,8 +3953,7 @@ int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	int addr_len = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = sk-&gt;sk_prot-&gt;recvmsg(sk, msg, size, flags &amp; MSG_DONTWAIT,</div><div class='del'>-				   flags &amp; ~MSG_DONTWAIT, &amp;addr_len);</div><div class='add'>+	err = sk-&gt;sk_prot-&gt;recvmsg(sk, msg, size, flags, &amp;addr_len);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='ctx'> 		msg-&gt;msg_namelen = addr_len;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -3031,35 +3964,22 @@ EXPORT_SYMBOL(sock_common_recvmsg);</div><div class='ctx'>  *	Set socket options on an inet socket.</div><div class='ctx'>  */</div><div class='ctx'> int sock_common_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			   char __user *optval, unsigned int optlen)</div><div class='add'>+			   sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	return sk-&gt;sk_prot-&gt;setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	return READ_ONCE(sk-&gt;sk_prot)-&gt;setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_common_setsockopt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_sock_common_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				  char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_prot-&gt;compat_setsockopt != NULL)</div><div class='del'>-		return sk-&gt;sk_prot-&gt;compat_setsockopt(sk, level, optname,</div><div class='del'>-						      optval, optlen);</div><div class='del'>-	return sk-&gt;sk_prot-&gt;setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_sock_common_setsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void sk_common_release(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;destroy)</div><div class='ctx'> 		sk-&gt;sk_prot-&gt;destroy(sk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Observation: when sock_common_release is called, processes have</div><div class='add'>+	 * Observation: when sk_common_release is called, processes have</div><div class='ctx'> 	 * no access to socket. But net still has.</div><div class='ctx'> 	 * Step one, detach it from networking:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -3084,8 +4004,6 @@ void sk_common_release(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	xfrm_sk_free_policy(sk);</div><div class='ctx'> </div><div class='del'>-	sk_refcnt_debug_release(sk);</div><div class='del'>-</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_common_release);</div><div class='hunk'>@@ -3095,30 +4013,19 @@ void sk_get_meminfo(const struct sock *sk, u32 *mem)</div><div class='ctx'> 	memset(mem, 0, sizeof(*mem) * SK_MEMINFO_VARS);</div><div class='ctx'> </div><div class='ctx'> 	mem[SK_MEMINFO_RMEM_ALLOC] = sk_rmem_alloc_get(sk);</div><div class='del'>-	mem[SK_MEMINFO_RCVBUF] = sk-&gt;sk_rcvbuf;</div><div class='add'>+	mem[SK_MEMINFO_RCVBUF] = READ_ONCE(sk-&gt;sk_rcvbuf);</div><div class='ctx'> 	mem[SK_MEMINFO_WMEM_ALLOC] = sk_wmem_alloc_get(sk);</div><div class='del'>-	mem[SK_MEMINFO_SNDBUF] = sk-&gt;sk_sndbuf;</div><div class='del'>-	mem[SK_MEMINFO_FWD_ALLOC] = sk-&gt;sk_forward_alloc;</div><div class='del'>-	mem[SK_MEMINFO_WMEM_QUEUED] = sk-&gt;sk_wmem_queued;</div><div class='add'>+	mem[SK_MEMINFO_SNDBUF] = READ_ONCE(sk-&gt;sk_sndbuf);</div><div class='add'>+	mem[SK_MEMINFO_FWD_ALLOC] = READ_ONCE(sk-&gt;sk_forward_alloc);</div><div class='add'>+	mem[SK_MEMINFO_WMEM_QUEUED] = READ_ONCE(sk-&gt;sk_wmem_queued);</div><div class='ctx'> 	mem[SK_MEMINFO_OPTMEM] = atomic_read(&amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-	mem[SK_MEMINFO_BACKLOG] = sk-&gt;sk_backlog.len;</div><div class='del'>-	mem[SK_MEMINFO_DROPS] = atomic_read(&amp;sk-&gt;sk_drops);</div><div class='add'>+	mem[SK_MEMINFO_BACKLOG] = READ_ONCE(sk-&gt;sk_backlog.len);</div><div class='add'>+	mem[SK_MEMINFO_DROPS] = sk_drops_read(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-#define PROTO_INUSE_NR	64	/* should be enough for the first time */</div><div class='del'>-struct prot_inuse {</div><div class='del'>-	int val[PROTO_INUSE_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR);</div><div class='ctx'> </div><div class='del'>-void sock_prot_inuse_add(struct net *net, struct proto *prot, int val)</div><div class='del'>-{</div><div class='del'>-	__this_cpu_add(net-&gt;core.prot_inuse-&gt;val[prot-&gt;inuse_idx], val);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(sock_prot_inuse_add);</div><div class='del'>-</div><div class='ctx'> int sock_prot_inuse_get(struct net *net, struct proto *prot)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, idx = prot-&gt;inuse_idx;</div><div class='hunk'>@@ -3131,17 +4038,12 @@ int sock_prot_inuse_get(struct net *net, struct proto *prot)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sock_prot_inuse_get);</div><div class='ctx'> </div><div class='del'>-static void sock_inuse_add(struct net *net, int val)</div><div class='del'>-{</div><div class='del'>-	this_cpu_add(*net-&gt;core.sock_inuse, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int sock_inuse_get(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, res = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu)</div><div class='del'>-		res += *per_cpu_ptr(net-&gt;core.sock_inuse, cpu);</div><div class='add'>+		res += per_cpu_ptr(net-&gt;core.prot_inuse, cpu)-&gt;all;</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -3153,22 +4055,12 @@ static int __net_init sock_inuse_init_net(struct net *net)</div><div class='ctx'> 	net-&gt;core.prot_inuse = alloc_percpu(struct prot_inuse);</div><div class='ctx'> 	if (net-&gt;core.prot_inuse == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	net-&gt;core.sock_inuse = alloc_percpu(int);</div><div class='del'>-	if (net-&gt;core.sock_inuse == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	free_percpu(net-&gt;core.prot_inuse);</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit sock_inuse_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	free_percpu(net-&gt;core.prot_inuse);</div><div class='del'>-	free_percpu(net-&gt;core.sock_inuse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations net_inuse_ops = {</div><div class='hunk'>@@ -3186,36 +4078,71 @@ static __init int net_inuse_init(void)</div><div class='ctx'> </div><div class='ctx'> core_initcall(net_inuse_init);</div><div class='ctx'> </div><div class='del'>-static void assign_proto_idx(struct proto *prot)</div><div class='add'>+static int assign_proto_idx(struct proto *prot)</div><div class='ctx'> {</div><div class='ctx'> 	prot-&gt;inuse_idx = find_first_zero_bit(proto_inuse_idx, PROTO_INUSE_NR);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(prot-&gt;inuse_idx == PROTO_INUSE_NR - 1)) {</div><div class='add'>+	if (unlikely(prot-&gt;inuse_idx == PROTO_INUSE_NR)) {</div><div class='ctx'> 		pr_err("PROTO_INUSE_NR exhausted\n");</div><div class='del'>-		return;</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(prot-&gt;inuse_idx, proto_inuse_idx);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void release_proto_idx(struct proto *prot)</div><div class='ctx'> {</div><div class='del'>-	if (prot-&gt;inuse_idx != PROTO_INUSE_NR - 1)</div><div class='add'>+	if (prot-&gt;inuse_idx != PROTO_INUSE_NR)</div><div class='ctx'> 		clear_bit(prot-&gt;inuse_idx, proto_inuse_idx);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline void assign_proto_idx(struct proto *prot)</div><div class='add'>+static inline int assign_proto_idx(struct proto *prot)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void release_proto_idx(struct proto *prot)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sock_inuse_add(struct net *net, int val)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void tw_prot_cleanup(struct timewait_sock_ops *twsk_prot)</div><div class='ctx'> {</div><div class='add'>+	if (!twsk_prot)</div><div class='add'>+		return;</div><div class='add'>+	kfree(twsk_prot-&gt;twsk_slab_name);</div><div class='add'>+	twsk_prot-&gt;twsk_slab_name = NULL;</div><div class='add'>+	kmem_cache_destroy(twsk_prot-&gt;twsk_slab);</div><div class='add'>+	twsk_prot-&gt;twsk_slab = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tw_prot_init(const struct proto *prot)</div><div class='add'>+{</div><div class='add'>+	struct timewait_sock_ops *twsk_prot = prot-&gt;twsk_prot;</div><div class='add'>+</div><div class='add'>+	if (!twsk_prot)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	twsk_prot-&gt;twsk_slab_name = kasprintf(GFP_KERNEL, "tw_sock_%s",</div><div class='add'>+					      prot-&gt;name);</div><div class='add'>+	if (!twsk_prot-&gt;twsk_slab_name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	twsk_prot-&gt;twsk_slab =</div><div class='add'>+		kmem_cache_create(twsk_prot-&gt;twsk_slab_name,</div><div class='add'>+				  twsk_prot-&gt;twsk_obj_size, 0,</div><div class='add'>+				  SLAB_ACCOUNT | prot-&gt;slab_flags,</div><div class='add'>+				  NULL);</div><div class='add'>+	if (!twsk_prot-&gt;twsk_slab) {</div><div class='add'>+		pr_crit("%s: Can't create timewait sock SLAB cache!\n",</div><div class='add'>+			prot-&gt;name);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void req_prot_cleanup(struct request_sock_ops *rsk_prot)</div><div class='ctx'> {</div><div class='hunk'>@@ -3254,6 +4181,16 @@ static int req_prot_init(const struct proto *prot)</div><div class='ctx'> </div><div class='ctx'> int proto_register(struct proto *prot, int alloc_slab)</div><div class='ctx'> {</div><div class='add'>+	int ret = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (prot-&gt;memory_allocated &amp;&amp; !prot-&gt;sysctl_mem) {</div><div class='add'>+		pr_err("%s: missing sysctl_mem\n", prot-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (prot-&gt;memory_allocated &amp;&amp; !prot-&gt;per_cpu_fw_alloc) {</div><div class='add'>+		pr_err("%s: missing per_cpu_fw_alloc\n", prot-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (alloc_slab) {</div><div class='ctx'> 		prot-&gt;slab = kmem_cache_create_usercopy(prot-&gt;name,</div><div class='ctx'> 					prot-&gt;obj_size, 0,</div><div class='hunk'>@@ -3271,39 +4208,32 @@ int proto_register(struct proto *prot, int alloc_slab)</div><div class='ctx'> 		if (req_prot_init(prot))</div><div class='ctx'> 			goto out_free_request_sock_slab;</div><div class='ctx'> </div><div class='del'>-		if (prot-&gt;twsk_prot != NULL) {</div><div class='del'>-			prot-&gt;twsk_prot-&gt;twsk_slab_name = kasprintf(GFP_KERNEL, "tw_sock_%s", prot-&gt;name);</div><div class='del'>-</div><div class='del'>-			if (prot-&gt;twsk_prot-&gt;twsk_slab_name == NULL)</div><div class='del'>-				goto out_free_request_sock_slab;</div><div class='del'>-</div><div class='del'>-			prot-&gt;twsk_prot-&gt;twsk_slab =</div><div class='del'>-				kmem_cache_create(prot-&gt;twsk_prot-&gt;twsk_slab_name,</div><div class='del'>-						  prot-&gt;twsk_prot-&gt;twsk_obj_size,</div><div class='del'>-						  0,</div><div class='del'>-						  SLAB_ACCOUNT |</div><div class='del'>-						  prot-&gt;slab_flags,</div><div class='del'>-						  NULL);</div><div class='del'>-			if (prot-&gt;twsk_prot-&gt;twsk_slab == NULL)</div><div class='del'>-				goto out_free_timewait_sock_slab_name;</div><div class='del'>-		}</div><div class='add'>+		if (tw_prot_init(prot))</div><div class='add'>+			goto out_free_timewait_sock_slab;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;proto_list_mutex);</div><div class='add'>+	ret = assign_proto_idx(prot);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mutex_unlock(&amp;proto_list_mutex);</div><div class='add'>+		goto out_free_timewait_sock_slab;</div><div class='add'>+	}</div><div class='ctx'> 	list_add(&amp;prot-&gt;node, &amp;proto_list);</div><div class='del'>-	assign_proto_idx(prot);</div><div class='ctx'> 	mutex_unlock(&amp;proto_list_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='del'>-out_free_timewait_sock_slab_name:</div><div class='del'>-	kfree(prot-&gt;twsk_prot-&gt;twsk_slab_name);</div><div class='add'>+out_free_timewait_sock_slab:</div><div class='add'>+	if (alloc_slab)</div><div class='add'>+		tw_prot_cleanup(prot-&gt;twsk_prot);</div><div class='ctx'> out_free_request_sock_slab:</div><div class='del'>-	req_prot_cleanup(prot-&gt;rsk_prot);</div><div class='add'>+	if (alloc_slab) {</div><div class='add'>+		req_prot_cleanup(prot-&gt;rsk_prot);</div><div class='ctx'> </div><div class='del'>-	kmem_cache_destroy(prot-&gt;slab);</div><div class='del'>-	prot-&gt;slab = NULL;</div><div class='add'>+		kmem_cache_destroy(prot-&gt;slab);</div><div class='add'>+		prot-&gt;slab = NULL;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='del'>-	return -ENOBUFS;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(proto_register);</div><div class='ctx'> </div><div class='hunk'>@@ -3318,12 +4248,7 @@ void proto_unregister(struct proto *prot)</div><div class='ctx'> 	prot-&gt;slab = NULL;</div><div class='ctx'> </div><div class='ctx'> 	req_prot_cleanup(prot-&gt;rsk_prot);</div><div class='del'>-</div><div class='del'>-	if (prot-&gt;twsk_prot != NULL &amp;&amp; prot-&gt;twsk_prot-&gt;twsk_slab != NULL) {</div><div class='del'>-		kmem_cache_destroy(prot-&gt;twsk_prot-&gt;twsk_slab);</div><div class='del'>-		kfree(prot-&gt;twsk_prot-&gt;twsk_slab_name);</div><div class='del'>-		prot-&gt;twsk_prot-&gt;twsk_slab = NULL;</div><div class='del'>-	}</div><div class='add'>+	tw_prot_cleanup(prot-&gt;twsk_prot);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(proto_unregister);</div><div class='ctx'> </div><div class='hunk'>@@ -3339,6 +4264,8 @@ int sock_load_diag_module(int family, int protocol)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INET</div><div class='ctx'> 	if (family == AF_INET &amp;&amp;</div><div class='add'>+	    protocol != IPPROTO_RAW &amp;&amp;</div><div class='add'>+	    protocol &lt; MAX_INET_PROTOS &amp;&amp;</div><div class='ctx'> 	    !rcu_access_pointer(inet_protos[protocol]))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3376,7 +4303,7 @@ static long sock_prot_memory_allocated(struct proto *proto)</div><div class='ctx'> 	return proto-&gt;memory_allocated != NULL ? proto_memory_allocated(proto) : -1L;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *sock_prot_memory_pressure(struct proto *proto)</div><div class='add'>+static const char *sock_prot_memory_pressure(struct proto *proto)</div><div class='ctx'> {</div><div class='ctx'> 	return proto-&gt;memory_pressure != NULL ?</div><div class='ctx'> 	proto_memory_pressure(proto) ? "yes" : "no" : "NI";</div><div class='hunk'>@@ -3386,7 +4313,7 @@ static void proto_seq_printf(struct seq_file *seq, struct proto *proto)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "%-9s %4u %6d  %6ld   %-3s %6u   %-3s  %-10s "</div><div class='del'>-			"%2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c\n",</div><div class='add'>+			"%2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c\n",</div><div class='ctx'> 		   proto-&gt;name,</div><div class='ctx'> 		   proto-&gt;obj_size,</div><div class='ctx'> 		   sock_prot_inuse_get(seq_file_net(seq), proto),</div><div class='hunk'>@@ -3407,7 +4334,6 @@ static void proto_seq_printf(struct seq_file *seq, struct proto *proto)</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;getsockopt),</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;sendmsg),</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;recvmsg),</div><div class='del'>-		   proto_method_implemented(proto-&gt;sendpage),</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;bind),</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;backlog_rcv),</div><div class='ctx'> 		   proto_method_implemented(proto-&gt;hash),</div><div class='hunk'>@@ -3428,7 +4354,7 @@ static int proto_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			   "maxhdr",</div><div class='ctx'> 			   "slab",</div><div class='ctx'> 			   "module",</div><div class='del'>-			   "cl co di ac io in de sh ss gs se re sp bi br ha uh gp em\n");</div><div class='add'>+			   "cl co di ac io in de sh ss gs se re bi br ha uh gp em\n");</div><div class='ctx'> 	else</div><div class='ctx'> 		proto_seq_printf(seq, list_entry(v, struct proto, node));</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3475,8 +4401,149 @@ bool sk_busy_loop_end(void *p, unsigned long start_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = p;</div><div class='ctx'> </div><div class='del'>-	return !skb_queue_empty(&amp;sk-&gt;sk_receive_queue) ||</div><div class='del'>-	       sk_busy_loop_timeout(sk, start_time);</div><div class='add'>+	if (!skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (sk_is_udp(sk) &amp;&amp;</div><div class='add'>+	    !skb_queue_empty_lockless(&amp;udp_sk(sk)-&gt;reader_queue))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return sk_busy_loop_timeout(sk, start_time);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_busy_loop_end);</div><div class='ctx'> #endif /* CONFIG_NET_RX_BUSY_POLL */</div><div class='add'>+</div><div class='add'>+int sock_bind_add(struct sock *sk, struct sockaddr_unsized *addr, int addr_len)</div><div class='add'>+{</div><div class='add'>+	if (!sk-&gt;sk_prot-&gt;bind_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return sk-&gt;sk_prot-&gt;bind_add(sk, addr, addr_len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_bind_add);</div><div class='add'>+</div><div class='add'>+/* Copy 'size' bytes from userspace and return `size` back to userspace */</div><div class='add'>+int sock_ioctl_inout(struct sock *sk, unsigned int cmd,</div><div class='add'>+		     void __user *arg, void *karg, size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(karg, arg, size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	ret = READ_ONCE(sk-&gt;sk_prot)-&gt;ioctl(sk, cmd, karg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, karg, size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sock_ioctl_inout);</div><div class='add'>+</div><div class='add'>+/* This is the most common ioctl prep function, where the result (4 bytes) is</div><div class='add'>+ * copied back to userspace if the ioctl() returns successfully. No input is</div><div class='add'>+ * copied from userspace as input argument.</div><div class='add'>+ */</div><div class='add'>+static int sock_ioctl_out(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	int ret, karg = 0;</div><div class='add'>+</div><div class='add'>+	ret = READ_ONCE(sk-&gt;sk_prot)-&gt;ioctl(sk, cmd, &amp;karg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return put_user(karg, (int __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A wrapper around sock ioctls, which copies the data from userspace</div><div class='add'>+ * (depending on the protocol/ioctl), and copies back the result to userspace.</div><div class='add'>+ * The main motivation for this function is to pass kernel memory to the</div><div class='add'>+ * protocol ioctl callbacks, instead of userspace memory.</div><div class='add'>+ */</div><div class='add'>+int sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	int rc = 1;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type == SOCK_RAW &amp;&amp; sk-&gt;sk_family == AF_INET)</div><div class='add'>+		rc = ipmr_sk_ioctl(sk, cmd, arg);</div><div class='add'>+	else if (sk-&gt;sk_type == SOCK_RAW &amp;&amp; sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		rc = ip6mr_sk_ioctl(sk, cmd, arg);</div><div class='add'>+	else if (sk_is_phonet(sk))</div><div class='add'>+		rc = phonet_sk_ioctl(sk, cmd, arg);</div><div class='add'>+</div><div class='add'>+	/* If ioctl was processed, returns its value */</div><div class='add'>+	if (rc &lt;= 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Otherwise call the default handler */</div><div class='add'>+	return sock_ioctl_out(sk, cmd, arg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sk_ioctl);</div><div class='add'>+</div><div class='add'>+static int __init sock_struct_check(void)</div><div class='add'>+{</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rx, sk_drops);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rx, sk_peek_off);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rx, sk_error_queue);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rx, sk_receive_queue);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rx, sk_backlog);</div><div class='add'>+</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rx_dst);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rx_dst_ifindex);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rx_dst_cookie);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rcvbuf);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_filter);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_wq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_data_ready);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rcvtimeo);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rx, sk_rcvlowat);</div><div class='add'>+</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_err);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_socket);</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_memcg);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_lock);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_reserved_mem);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_forward_alloc);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_tsflags);</div><div class='add'>+</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_omem_alloc);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_omem_alloc);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_err_soft);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_wmem_queued);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_wmem_alloc);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_tsq_flags);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_send_head);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_write_queue);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_write_pending);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_frag);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_timer);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_pacing_rate);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_zckey);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_tskey);</div><div class='add'>+</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_dst_pending_confirm);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_pacing_status);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_max_pacing_rate);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_sndtimeo);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_priority);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_mark);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_uid);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_protocol);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_dst_cache);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_route_caps);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_gso_type);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_gso_max_size);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_allocation);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_txhash);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_sndbuf);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_gso_max_segs);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_pacing_shift);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_use_task_frag);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(sock_struct_check);</div><div class='head'>diff --git a/net/core/sock_destructor.h b/net/core/sock_destructor.h<br/>new file mode 100644<br/>index 000000000000..2f396e6bfba5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sock_destructor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sock_destructor.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _NET_CORE_SOCK_DESTRUCTOR_H</div><div class='add'>+#define _NET_CORE_SOCK_DESTRUCTOR_H</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+static inline bool is_skb_wmem(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;destructor == sock_wfree ||</div><div class='add'>+	       skb-&gt;destructor == __sock_wfree ||</div><div class='add'>+	       (IS_ENABLED(CONFIG_INET) &amp;&amp; skb-&gt;destructor == tcp_wfree);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c<br/>index 3312a5849a97..026ce9bd9e5e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/sock_diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_diag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sock_diag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sock_diag.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /* License: GPL */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -11,25 +12,31 @@</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/nospec.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/cookie.h&gt;</div><div class='ctx'> #include &lt;linux/inet_diag.h&gt;</div><div class='ctx'> #include &lt;linux/sock_diag.h&gt;</div><div class='ctx'> </div><div class='del'>-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];</div><div class='del'>-static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);</div><div class='del'>-static DEFINE_MUTEX(sock_diag_table_mutex);</div><div class='add'>+static const struct sock_diag_handler __rcu *sock_diag_handlers[AF_MAX];</div><div class='add'>+</div><div class='add'>+static const struct sock_diag_inet_compat __rcu *inet_rcv_compat;</div><div class='add'>+</div><div class='ctx'> static struct workqueue_struct *broadcast_wq;</div><div class='ctx'> </div><div class='del'>-u64 sock_gen_cookie(struct sock *sk)</div><div class='add'>+DEFINE_COOKIE(sock_cookie);</div><div class='add'>+</div><div class='add'>+u64 __sock_gen_cookie(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	while (1) {</div><div class='del'>-		u64 res = atomic64_read(&amp;sk-&gt;sk_cookie);</div><div class='add'>+	u64 res = atomic64_read(&amp;sk-&gt;sk_cookie);</div><div class='ctx'> </div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-		res = atomic64_inc_return(&amp;sock_net(sk)-&gt;cookie_gen);</div><div class='del'>-		atomic64_cmpxchg(&amp;sk-&gt;sk_cookie, 0, res);</div><div class='add'>+	if (!res) {</div><div class='add'>+		u64 new = gen_cookie_next(&amp;sock_cookie);</div><div class='add'>+</div><div class='add'>+		atomic64_cmpxchg(&amp;sk-&gt;sk_cookie, res, new);</div><div class='add'>+</div><div class='add'>+		/* Another thread might have changed sk_cookie before us. */</div><div class='add'>+		res = atomic64_read(&amp;sk-&gt;sk_cookie);</div><div class='ctx'> 	}</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie)</div><div class='hunk'>@@ -116,6 +123,24 @@ static size_t sock_diag_nlmsg_size(void)</div><div class='ctx'> 	       + nla_total_size_64bit(sizeof(struct tcp_info))); /* INET_DIAG_INFO */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct sock_diag_handler *sock_diag_lock_handler(int family)</div><div class='add'>+{</div><div class='add'>+	const struct sock_diag_handler *handler;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	handler = rcu_dereference(sock_diag_handlers[family]);</div><div class='add'>+	if (handler &amp;&amp; !try_module_get(handler-&gt;owner))</div><div class='add'>+		handler = NULL;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_diag_unlock_handler(const struct sock_diag_handler *handler)</div><div class='add'>+{</div><div class='add'>+	module_put(handler-&gt;owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sock_diag_broadcast_destroy_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct broadcast_sk *bsk =</div><div class='hunk'>@@ -132,12 +157,12 @@ static void sock_diag_broadcast_destroy_work(struct work_struct *work)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	hndl = sock_diag_handlers[sk-&gt;sk_family];</div><div class='del'>-	if (hndl &amp;&amp; hndl-&gt;get_info)</div><div class='del'>-		err = hndl-&gt;get_info(skb, sk);</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='del'>-</div><div class='add'>+	hndl = sock_diag_lock_handler(sk-&gt;sk_family);</div><div class='add'>+	if (hndl) {</div><div class='add'>+		if (hndl-&gt;get_info)</div><div class='add'>+			err = hndl-&gt;get_info(skb, sk);</div><div class='add'>+		sock_diag_unlock_handler(hndl);</div><div class='add'>+	}</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		nlmsg_multicast(sock_net(sk)-&gt;diag_nlsk, skb, 0, group,</div><div class='ctx'> 				GFP_KERNEL);</div><div class='hunk'>@@ -160,51 +185,43 @@ void sock_diag_broadcast_destroy(struct sock *sk)</div><div class='ctx'> 	queue_work(broadcast_wq, &amp;bsk-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh))</div><div class='add'>+void sock_diag_register_inet_compat(const struct sock_diag_inet_compat *ptr)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	inet_rcv_compat = fn;</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='add'>+	xchg(&amp;inet_rcv_compat, RCU_INITIALIZER(ptr));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sock_diag_register_inet_compat);</div><div class='ctx'> </div><div class='del'>-void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh))</div><div class='add'>+void sock_diag_unregister_inet_compat(const struct sock_diag_inet_compat *ptr)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	inet_rcv_compat = NULL;</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='add'>+	const struct sock_diag_inet_compat *old;</div><div class='add'>+</div><div class='add'>+	old = unrcu_pointer(xchg(&amp;inet_rcv_compat, NULL));</div><div class='add'>+	WARN_ON_ONCE(old != ptr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sock_diag_unregister_inet_compat);</div><div class='ctx'> </div><div class='ctx'> int sock_diag_register(const struct sock_diag_handler *hndl)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int family = hndl-&gt;family;</div><div class='ctx'> </div><div class='del'>-	if (hndl-&gt;family &gt;= AF_MAX)</div><div class='add'>+	if (family &gt;= AF_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	if (sock_diag_handlers[hndl-&gt;family])</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-	else</div><div class='del'>-		sock_diag_handlers[hndl-&gt;family] = hndl;</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return !cmpxchg((const struct sock_diag_handler **)</div><div class='add'>+				&amp;sock_diag_handlers[family],</div><div class='add'>+			NULL, hndl) ? 0 : -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sock_diag_register);</div><div class='ctx'> </div><div class='del'>-void sock_diag_unregister(const struct sock_diag_handler *hnld)</div><div class='add'>+void sock_diag_unregister(const struct sock_diag_handler *hndl)</div><div class='ctx'> {</div><div class='del'>-	int family = hnld-&gt;family;</div><div class='add'>+	int family = hndl-&gt;family;</div><div class='ctx'> </div><div class='ctx'> 	if (family &gt;= AF_MAX)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	BUG_ON(sock_diag_handlers[family] != hnld);</div><div class='del'>-	sock_diag_handlers[family] = NULL;</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='add'>+	xchg((const struct sock_diag_handler **)&amp;sock_diag_handlers[family],</div><div class='add'>+	     NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sock_diag_unregister);</div><div class='ctx'> </div><div class='hunk'>@@ -221,20 +238,20 @@ static int __sock_diag_cmd(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	req-&gt;sdiag_family = array_index_nospec(req-&gt;sdiag_family, AF_MAX);</div><div class='ctx'> </div><div class='del'>-	if (sock_diag_handlers[req-&gt;sdiag_family] == NULL)</div><div class='add'>+	if (!rcu_access_pointer(sock_diag_handlers[req-&gt;sdiag_family]))</div><div class='ctx'> 		sock_load_diag_module(req-&gt;sdiag_family, 0);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-	hndl = sock_diag_handlers[req-&gt;sdiag_family];</div><div class='add'>+	hndl = sock_diag_lock_handler(req-&gt;sdiag_family);</div><div class='ctx'> 	if (hndl == NULL)</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-	else if (nlh-&gt;nlmsg_type == SOCK_DIAG_BY_FAMILY)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (nlh-&gt;nlmsg_type == SOCK_DIAG_BY_FAMILY)</div><div class='ctx'> 		err = hndl-&gt;dump(skb, nlh);</div><div class='ctx'> 	else if (nlh-&gt;nlmsg_type == SOCK_DESTROY &amp;&amp; hndl-&gt;destroy)</div><div class='ctx'> 		err = hndl-&gt;destroy(skb, nlh);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='del'>-	mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='add'>+	sock_diag_unlock_handler(hndl);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -242,20 +259,25 @@ static int __sock_diag_cmd(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	const struct sock_diag_inet_compat *ptr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (nlh-&gt;nlmsg_type) {</div><div class='ctx'> 	case TCPDIAG_GETSOCK:</div><div class='del'>-	case DCCPDIAG_GETSOCK:</div><div class='del'>-		if (inet_rcv_compat == NULL)</div><div class='add'>+		if (!rcu_access_pointer(inet_rcv_compat))</div><div class='ctx'> 			sock_load_diag_module(AF_INET, 0);</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;sock_diag_table_mutex);</div><div class='del'>-		if (inet_rcv_compat != NULL)</div><div class='del'>-			ret = inet_rcv_compat(skb, nlh);</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		mutex_unlock(&amp;sock_diag_table_mutex);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		ptr = rcu_dereference(inet_rcv_compat);</div><div class='add'>+		if (ptr &amp;&amp; !try_module_get(ptr-&gt;owner))</div><div class='add'>+			ptr = NULL;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		if (ptr) {</div><div class='add'>+			ret = ptr-&gt;fn(skb, nlh);</div><div class='add'>+			module_put(ptr-&gt;owner);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		return ret;</div><div class='ctx'> 	case SOCK_DIAG_BY_FAMILY:</div><div class='hunk'>@@ -266,13 +288,9 @@ static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX(sock_diag_mutex);</div><div class='del'>-</div><div class='ctx'> static void sock_diag_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;sock_diag_mutex);</div><div class='ctx'> 	netlink_rcv_skb(skb, &amp;sock_diag_rcv_msg);</div><div class='del'>-	mutex_unlock(&amp;sock_diag_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sock_diag_bind(struct net *net, int group)</div><div class='hunk'>@@ -280,12 +298,12 @@ static int sock_diag_bind(struct net *net, int group)</div><div class='ctx'> 	switch (group) {</div><div class='ctx'> 	case SKNLGRP_INET_TCP_DESTROY:</div><div class='ctx'> 	case SKNLGRP_INET_UDP_DESTROY:</div><div class='del'>-		if (!sock_diag_handlers[AF_INET])</div><div class='add'>+		if (!rcu_access_pointer(sock_diag_handlers[AF_INET]))</div><div class='ctx'> 			sock_load_diag_module(AF_INET, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SKNLGRP_INET6_TCP_DESTROY:</div><div class='ctx'> 	case SKNLGRP_INET6_UDP_DESTROY:</div><div class='del'>-		if (!sock_diag_handlers[AF_INET6])</div><div class='add'>+		if (!rcu_access_pointer(sock_diag_handlers[AF_INET6]))</div><div class='ctx'> 			sock_load_diag_module(AF_INET6, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -330,7 +348,7 @@ static struct pernet_operations diag_net_ops = {</div><div class='ctx'> </div><div class='ctx'> static int __init sock_diag_init(void)</div><div class='ctx'> {</div><div class='del'>-	broadcast_wq = alloc_workqueue("sock_diag_events", 0, 0);</div><div class='add'>+	broadcast_wq = alloc_workqueue("sock_diag_events", WQ_PERCPU, 0);</div><div class='ctx'> 	BUG_ON(!broadcast_wq);</div><div class='ctx'> 	return register_pernet_subsys(&amp;diag_net_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/sock_map.c b/net/core/sock_map.c<br/>new file mode 100644<br/>index 000000000000..5947b38e4f8b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sock_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sock_map.c</a></div><div class='hunk'>@@ -0,0 +1,1959 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2017 - 2018 Covalent IO, Inc. http://covalent.io */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/skmsg.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/jhash.h&gt;</div><div class='add'>+#include &lt;linux/sock_diag.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+</div><div class='add'>+struct bpf_stab {</div><div class='add'>+	struct bpf_map map;</div><div class='add'>+	struct sock **sks;</div><div class='add'>+	struct sk_psock_progs progs;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SOCK_CREATE_FLAG_MASK				\</div><div class='add'>+	(BPF_F_NUMA_NODE | BPF_F_RDONLY | BPF_F_WRONLY)</div><div class='add'>+</div><div class='add'>+/* This mutex is used to</div><div class='add'>+ *  - protect race between prog/link attach/detach and link prog update, and</div><div class='add'>+ *  - protect race between releasing and accessing map in bpf_link.</div><div class='add'>+ * A single global mutex lock is used since it is expected contention is low.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(sockmap_mutex);</div><div class='add'>+</div><div class='add'>+static int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,</div><div class='add'>+				struct bpf_prog *old, struct bpf_link *link,</div><div class='add'>+				u32 which);</div><div class='add'>+static struct sk_psock_progs *sock_map_progs(struct bpf_map *map);</div><div class='add'>+</div><div class='add'>+static struct bpf_map *sock_map_alloc(union bpf_attr *attr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;max_entries == 0 ||</div><div class='add'>+	    attr-&gt;key_size    != 4 ||</div><div class='add'>+	    (attr-&gt;value_size != sizeof(u32) &amp;&amp;</div><div class='add'>+	     attr-&gt;value_size != sizeof(u64)) ||</div><div class='add'>+	    attr-&gt;map_flags &amp; ~SOCK_CREATE_FLAG_MASK)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	stab = bpf_map_area_alloc(sizeof(*stab), NUMA_NO_NODE);</div><div class='add'>+	if (!stab)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	bpf_map_init_from_attr(&amp;stab-&gt;map, attr);</div><div class='add'>+	spin_lock_init(&amp;stab-&gt;lock);</div><div class='add'>+</div><div class='add'>+	stab-&gt;sks = bpf_map_area_alloc((u64) stab-&gt;map.max_entries *</div><div class='add'>+				       sizeof(struct sock *),</div><div class='add'>+				       stab-&gt;map.numa_node);</div><div class='add'>+	if (!stab-&gt;sks) {</div><div class='add'>+		bpf_map_area_free(stab);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;stab-&gt;map;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;attach_flags || attr-&gt;replace_bpf_fd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	CLASS(fd, f)(attr-&gt;target_fd);</div><div class='add'>+	map = __bpf_map_get(f);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+	ret = sock_map_prog_update(map, prog, NULL, NULL, attr-&gt;attach_type);</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;attach_flags || attr-&gt;replace_bpf_fd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	CLASS(fd, f)(attr-&gt;target_fd);</div><div class='add'>+	map = __bpf_map_get(f);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+	prog = bpf_prog_get(attr-&gt;attach_bpf_fd);</div><div class='add'>+	if (IS_ERR(prog))</div><div class='add'>+		return PTR_ERR(prog);</div><div class='add'>+</div><div class='add'>+	if (prog-&gt;type != ptype) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto put_prog;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+	ret = sock_map_prog_update(map, NULL, prog, NULL, attr-&gt;attach_type);</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+put_prog:</div><div class='add'>+	bpf_prog_put(prog);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_sk_acquire(struct sock *sk)</div><div class='add'>+	__acquires(&amp;sk-&gt;sk_lock.slock)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_sk_release(struct sock *sk)</div><div class='add'>+	__releases(&amp;sk-&gt;sk_lock.slock)</div><div class='add'>+{</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_add_link(struct sk_psock *psock,</div><div class='add'>+			      struct sk_psock_link *link,</div><div class='add'>+			      struct bpf_map *map, void *link_raw)</div><div class='add'>+{</div><div class='add'>+	link-&gt;link_raw = link_raw;</div><div class='add'>+	link-&gt;map = map;</div><div class='add'>+	spin_lock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+	list_add_tail(&amp;link-&gt;list, &amp;psock-&gt;link);</div><div class='add'>+	spin_unlock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_del_link(struct sock *sk,</div><div class='add'>+			      struct sk_psock *psock, void *link_raw)</div><div class='add'>+{</div><div class='add'>+	bool strp_stop = false, verdict_stop = false;</div><div class='add'>+	struct sk_psock_link *link, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+	list_for_each_entry_safe(link, tmp, &amp;psock-&gt;link, list) {</div><div class='add'>+		if (link-&gt;link_raw == link_raw) {</div><div class='add'>+			struct bpf_map *map = link-&gt;map;</div><div class='add'>+			struct sk_psock_progs *progs = sock_map_progs(map);</div><div class='add'>+</div><div class='add'>+			if (psock-&gt;saved_data_ready &amp;&amp; progs-&gt;stream_parser)</div><div class='add'>+				strp_stop = true;</div><div class='add'>+			if (psock-&gt;saved_data_ready &amp;&amp; progs-&gt;stream_verdict)</div><div class='add'>+				verdict_stop = true;</div><div class='add'>+			if (psock-&gt;saved_data_ready &amp;&amp; progs-&gt;skb_verdict)</div><div class='add'>+				verdict_stop = true;</div><div class='add'>+			list_del(&amp;link-&gt;list);</div><div class='add'>+			sk_psock_free_link(link);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;psock-&gt;link_lock);</div><div class='add'>+	if (strp_stop || verdict_stop) {</div><div class='add'>+		write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+		if (strp_stop)</div><div class='add'>+			sk_psock_stop_strp(sk, psock);</div><div class='add'>+		if (verdict_stop)</div><div class='add'>+			sk_psock_stop_verdict(sk, psock);</div><div class='add'>+</div><div class='add'>+		if (psock-&gt;psock_update_sk_prot)</div><div class='add'>+			psock-&gt;psock_update_sk_prot(sk, psock, false);</div><div class='add'>+		write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_unref(struct sock *sk, void *link_raw)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock = sk_psock(sk);</div><div class='add'>+</div><div class='add'>+	if (likely(psock)) {</div><div class='add'>+		sock_map_del_link(sk, psock, link_raw);</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_init_proto(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	if (!sk-&gt;sk_prot-&gt;psock_update_sk_prot)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	psock-&gt;psock_update_sk_prot = sk-&gt;sk_prot-&gt;psock_update_sk_prot;</div><div class='add'>+	return sk-&gt;sk_prot-&gt;psock_update_sk_prot(sk, psock, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_psock *sock_map_psock_get_checked(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (psock) {</div><div class='add'>+		if (sk-&gt;sk_prot-&gt;close != sock_map_close) {</div><div class='add'>+			psock = ERR_PTR(-EBUSY);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!refcount_inc_not_zero(&amp;psock-&gt;refcnt))</div><div class='add'>+			psock = ERR_PTR(-EBUSY);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return psock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_link(struct bpf_map *map, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock_progs *progs = sock_map_progs(map);</div><div class='add'>+	struct bpf_prog *stream_verdict = NULL;</div><div class='add'>+	struct bpf_prog *stream_parser = NULL;</div><div class='add'>+	struct bpf_prog *skb_verdict = NULL;</div><div class='add'>+	struct bpf_prog *msg_parser = NULL;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	stream_verdict = READ_ONCE(progs-&gt;stream_verdict);</div><div class='add'>+	if (stream_verdict) {</div><div class='add'>+		stream_verdict = bpf_prog_inc_not_zero(stream_verdict);</div><div class='add'>+		if (IS_ERR(stream_verdict))</div><div class='add'>+			return PTR_ERR(stream_verdict);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream_parser = READ_ONCE(progs-&gt;stream_parser);</div><div class='add'>+	if (stream_parser) {</div><div class='add'>+		stream_parser = bpf_prog_inc_not_zero(stream_parser);</div><div class='add'>+		if (IS_ERR(stream_parser)) {</div><div class='add'>+			ret = PTR_ERR(stream_parser);</div><div class='add'>+			goto out_put_stream_verdict;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg_parser = READ_ONCE(progs-&gt;msg_parser);</div><div class='add'>+	if (msg_parser) {</div><div class='add'>+		msg_parser = bpf_prog_inc_not_zero(msg_parser);</div><div class='add'>+		if (IS_ERR(msg_parser)) {</div><div class='add'>+			ret = PTR_ERR(msg_parser);</div><div class='add'>+			goto out_put_stream_parser;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_verdict = READ_ONCE(progs-&gt;skb_verdict);</div><div class='add'>+	if (skb_verdict) {</div><div class='add'>+		skb_verdict = bpf_prog_inc_not_zero(skb_verdict);</div><div class='add'>+		if (IS_ERR(skb_verdict)) {</div><div class='add'>+			ret = PTR_ERR(skb_verdict);</div><div class='add'>+			goto out_put_msg_parser;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psock = sock_map_psock_get_checked(sk);</div><div class='add'>+	if (IS_ERR(psock)) {</div><div class='add'>+		ret = PTR_ERR(psock);</div><div class='add'>+		goto out_progs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (psock) {</div><div class='add'>+		if ((msg_parser &amp;&amp; READ_ONCE(psock-&gt;progs.msg_parser)) ||</div><div class='add'>+		    (stream_parser  &amp;&amp; READ_ONCE(psock-&gt;progs.stream_parser)) ||</div><div class='add'>+		    (skb_verdict &amp;&amp; READ_ONCE(psock-&gt;progs.skb_verdict)) ||</div><div class='add'>+		    (skb_verdict &amp;&amp; READ_ONCE(psock-&gt;progs.stream_verdict)) ||</div><div class='add'>+		    (stream_verdict &amp;&amp; READ_ONCE(psock-&gt;progs.skb_verdict)) ||</div><div class='add'>+		    (stream_verdict &amp;&amp; READ_ONCE(psock-&gt;progs.stream_verdict))) {</div><div class='add'>+			sk_psock_put(sk, psock);</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto out_progs;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		psock = sk_psock_init(sk, map-&gt;numa_node);</div><div class='add'>+		if (IS_ERR(psock)) {</div><div class='add'>+			ret = PTR_ERR(psock);</div><div class='add'>+			goto out_progs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msg_parser)</div><div class='add'>+		psock_set_prog(&amp;psock-&gt;progs.msg_parser, msg_parser);</div><div class='add'>+	if (stream_parser)</div><div class='add'>+		psock_set_prog(&amp;psock-&gt;progs.stream_parser, stream_parser);</div><div class='add'>+	if (stream_verdict)</div><div class='add'>+		psock_set_prog(&amp;psock-&gt;progs.stream_verdict, stream_verdict);</div><div class='add'>+	if (skb_verdict)</div><div class='add'>+		psock_set_prog(&amp;psock-&gt;progs.skb_verdict, skb_verdict);</div><div class='add'>+</div><div class='add'>+	/* msg_* and stream_* programs references tracked in psock after this</div><div class='add'>+	 * point. Reference dec and cleanup will occur through psock destructor</div><div class='add'>+	 */</div><div class='add'>+	ret = sock_map_init_proto(sk, psock);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	if (stream_parser &amp;&amp; stream_verdict &amp;&amp; !psock-&gt;saved_data_ready) {</div><div class='add'>+		if (sk_is_tcp(sk))</div><div class='add'>+			ret = sk_psock_init_strp(sk, psock);</div><div class='add'>+		else</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		if (ret) {</div><div class='add'>+			write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+			sk_psock_put(sk, psock);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		sk_psock_start_strp(sk, psock);</div><div class='add'>+	} else if (!stream_parser &amp;&amp; stream_verdict &amp;&amp; !psock-&gt;saved_data_ready) {</div><div class='add'>+		sk_psock_start_verdict(sk,psock);</div><div class='add'>+	} else if (!stream_verdict &amp;&amp; skb_verdict &amp;&amp; !psock-&gt;saved_data_ready) {</div><div class='add'>+		sk_psock_start_verdict(sk, psock);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	return 0;</div><div class='add'>+out_progs:</div><div class='add'>+	if (skb_verdict)</div><div class='add'>+		bpf_prog_put(skb_verdict);</div><div class='add'>+out_put_msg_parser:</div><div class='add'>+	if (msg_parser)</div><div class='add'>+		bpf_prog_put(msg_parser);</div><div class='add'>+out_put_stream_parser:</div><div class='add'>+	if (stream_parser)</div><div class='add'>+		bpf_prog_put(stream_parser);</div><div class='add'>+out_put_stream_verdict:</div><div class='add'>+	if (stream_verdict)</div><div class='add'>+		bpf_prog_put(stream_verdict);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_free(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* After the sync no updates or deletes will be in-flight so it</div><div class='add'>+	 * is safe to walk map and remove entries without risking a race</div><div class='add'>+	 * in EEXIST update case.</div><div class='add'>+	 */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	for (i = 0; i &lt; stab-&gt;map.max_entries; i++) {</div><div class='add'>+		struct sock **psk = &amp;stab-&gt;sks[i];</div><div class='add'>+		struct sock *sk;</div><div class='add'>+</div><div class='add'>+		sk = xchg(psk, NULL);</div><div class='add'>+		if (sk) {</div><div class='add'>+			sock_hold(sk);</div><div class='add'>+			lock_sock(sk);</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			sock_map_unref(sk, psk);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			sock_put(sk);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wait for psock readers accessing its map link */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	bpf_map_area_free(stab-&gt;sks);</div><div class='add'>+	bpf_map_area_free(stab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_release_progs(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	psock_progs_drop(&amp;container_of(map, struct bpf_stab, map)-&gt;progs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *__sock_map_lookup_elem(struct bpf_map *map, u32 key)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='add'>+	if (unlikely(key &gt;= map-&gt;max_entries))</div><div class='add'>+		return NULL;</div><div class='add'>+	return READ_ONCE(stab-&gt;sks[key]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_map_lookup(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = __sock_map_lookup_elem(map, *(u32 *)key);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (sk_is_refcounted(sk) &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='add'>+		return NULL;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_map_lookup_sys(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (map-&gt;value_size != sizeof(u64))</div><div class='add'>+		return ERR_PTR(-ENOSPC);</div><div class='add'>+</div><div class='add'>+	sk = __sock_map_lookup_elem(map, *(u32 *)key);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	__sock_gen_cookie(sk);</div><div class='add'>+	return &amp;sk-&gt;sk_cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test,</div><div class='add'>+			     struct sock **psk)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;stab-&gt;lock);</div><div class='add'>+	if (!sk_test || sk_test == *psk)</div><div class='add'>+		sk = xchg(psk, NULL);</div><div class='add'>+</div><div class='add'>+	if (likely(sk))</div><div class='add'>+		sock_map_unref(sk, psk);</div><div class='add'>+	else</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;stab-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_delete_from_link(struct bpf_map *map, struct sock *sk,</div><div class='add'>+				      void *link_raw)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+</div><div class='add'>+	__sock_map_delete(stab, sk, link_raw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long sock_map_delete_elem(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+	u32 i = *(u32 *)key;</div><div class='add'>+	struct sock **psk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(i &gt;= map-&gt;max_entries))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	psk = &amp;stab-&gt;sks[i];</div><div class='add'>+	return __sock_map_delete(stab, NULL, psk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_get_next_key(struct bpf_map *map, void *key, void *next)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+	u32 i = key ? *(u32 *)key : U32_MAX;</div><div class='add'>+	u32 *key_next = next;</div><div class='add'>+</div><div class='add'>+	if (i == stab-&gt;map.max_entries - 1)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	if (i &gt;= stab-&gt;map.max_entries)</div><div class='add'>+		*key_next = 0;</div><div class='add'>+	else</div><div class='add'>+		*key_next = i + 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_update_common(struct bpf_map *map, u32 idx,</div><div class='add'>+				  struct sock *sk, u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_stab *stab = container_of(map, struct bpf_stab, map);</div><div class='add'>+	struct sk_psock_link *link;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct sock *osk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+	if (unlikely(flags &gt; BPF_EXIST))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (unlikely(idx &gt;= map-&gt;max_entries))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	link = sk_psock_init_link();</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = sock_map_link(map, sk);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	WARN_ON_ONCE(!psock);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;stab-&gt;lock);</div><div class='add'>+	osk = stab-&gt;sks[idx];</div><div class='add'>+	if (osk &amp;&amp; flags == BPF_NOEXIST) {</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	} else if (!osk &amp;&amp; flags == BPF_EXIST) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_map_add_link(psock, link, map, &amp;stab-&gt;sks[idx]);</div><div class='add'>+	stab-&gt;sks[idx] = sk;</div><div class='add'>+	if (osk)</div><div class='add'>+		sock_map_unref(osk, &amp;stab-&gt;sks[idx]);</div><div class='add'>+	spin_unlock_bh(&amp;stab-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;stab-&gt;lock);</div><div class='add'>+	if (psock)</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+out_free:</div><div class='add'>+	sk_psock_free_link(link);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sock_map_op_okay(const struct bpf_sock_ops_kern *ops)</div><div class='add'>+{</div><div class='add'>+	return ops-&gt;op == BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB ||</div><div class='add'>+	       ops-&gt;op == BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB ||</div><div class='add'>+	       ops-&gt;op == BPF_SOCK_OPS_TCP_LISTEN_CB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sock_map_redirect_allowed(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk_is_tcp(sk))</div><div class='add'>+		return sk-&gt;sk_state != TCP_LISTEN;</div><div class='add'>+	else</div><div class='add'>+		return sk-&gt;sk_state == TCP_ESTABLISHED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sock_map_sk_is_suitable(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return !!sk-&gt;sk_prot-&gt;psock_update_sk_prot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sock_map_sk_state_allowed(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk_is_tcp(sk))</div><div class='add'>+		return (1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_ESTABLISHED | TCPF_LISTEN);</div><div class='add'>+	if (sk_is_stream_unix(sk))</div><div class='add'>+		return (1 &lt;&lt; sk-&gt;sk_state) &amp; TCPF_ESTABLISHED;</div><div class='add'>+	if (sk_is_vsock(sk) &amp;&amp;</div><div class='add'>+	    (sk-&gt;sk_type == SOCK_STREAM || sk-&gt;sk_type == SOCK_SEQPACKET))</div><div class='add'>+		return (1 &lt;&lt; sk-&gt;sk_state) &amp; TCPF_ESTABLISHED;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_hash_update_common(struct bpf_map *map, void *key,</div><div class='add'>+				   struct sock *sk, u64 flags);</div><div class='add'>+</div><div class='add'>+int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value,</div><div class='add'>+			     u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 ufd;</div><div class='add'>+</div><div class='add'>+	if (map-&gt;value_size == sizeof(u64))</div><div class='add'>+		ufd = *(u64 *)value;</div><div class='add'>+	else</div><div class='add'>+		ufd = *(u32 *)value;</div><div class='add'>+	if (ufd &gt; S32_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sock = sockfd_lookup(ufd, &amp;ret);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return ret;</div><div class='add'>+	sk = sock-&gt;sk;</div><div class='add'>+	if (!sk) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!sock_map_sk_is_suitable(sk)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_map_sk_acquire(sk);</div><div class='add'>+	if (!sock_map_sk_state_allowed(sk))</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (map-&gt;map_type == BPF_MAP_TYPE_SOCKMAP)</div><div class='add'>+		ret = sock_map_update_common(map, *(u32 *)key, sk, flags);</div><div class='add'>+	else</div><div class='add'>+		ret = sock_hash_update_common(map, key, sk, flags);</div><div class='add'>+	sock_map_sk_release(sk);</div><div class='add'>+out:</div><div class='add'>+	sockfd_put(sock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long sock_map_update_elem(struct bpf_map *map, void *key,</div><div class='add'>+				 void *value, u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!sk || !sk_fullsock(sk)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sock_map_sk_is_suitable(sk))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+	if (!sock_map_sk_state_allowed(sk))</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (map-&gt;map_type == BPF_MAP_TYPE_SOCKMAP)</div><div class='add'>+		ret = sock_map_update_common(map, *(u32 *)key, sk, flags);</div><div class='add'>+	else</div><div class='add'>+		ret = sock_hash_update_common(map, key, sk, flags);</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sock_map_update, struct bpf_sock_ops_kern *, sops,</div><div class='add'>+	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='add'>+	if (likely(sock_map_sk_is_suitable(sops-&gt;sk) &amp;&amp;</div><div class='add'>+		   sock_map_op_okay(sops)))</div><div class='add'>+		return sock_map_update_common(map, *(u32 *)key, sops-&gt;sk,</div><div class='add'>+					      flags);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sock_map_update_proto = {</div><div class='add'>+	.func		= bpf_sock_map_update,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MAP_KEY,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_map *, map, u32, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	sk = __sock_map_lookup_elem(map, key);</div><div class='add'>+	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if ((flags &amp; BPF_F_INGRESS) &amp;&amp; sk_is_vsock(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	skb_bpf_set_redir(skb, sk, flags &amp; BPF_F_INGRESS);</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_redirect_map_proto = {</div><div class='add'>+	.func           = bpf_sk_redirect_map,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type      = ARG_ANYTHING,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_msg_redirect_map, struct sk_msg *, msg,</div><div class='add'>+	   struct bpf_map *, map, u32, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	sk = __sock_map_lookup_elem(map, key);</div><div class='add'>+	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if (!(flags &amp; BPF_F_INGRESS) &amp;&amp; !sk_is_tcp(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if (sk_is_vsock(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	msg-&gt;flags = flags;</div><div class='add'>+	msg-&gt;sk_redir = sk;</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_msg_redirect_map_proto = {</div><div class='add'>+	.func           = bpf_msg_redirect_map,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type      = ARG_ANYTHING,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sock_map_seq_info {</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	u32 index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_iter__sockmap {</div><div class='add'>+	__bpf_md_ptr(struct bpf_iter_meta *, meta);</div><div class='add'>+	__bpf_md_ptr(struct bpf_map *, map);</div><div class='add'>+	__bpf_md_ptr(void *, key);</div><div class='add'>+	__bpf_md_ptr(struct sock *, sk);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DEFINE_BPF_ITER_FUNC(sockmap, struct bpf_iter_meta *meta,</div><div class='add'>+		     struct bpf_map *map, void *key,</div><div class='add'>+		     struct sock *sk)</div><div class='add'>+</div><div class='add'>+static void *sock_map_seq_lookup_elem(struct sock_map_seq_info *info)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(info-&gt;index &gt;= info-&gt;map-&gt;max_entries))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	info-&gt;sk = __sock_map_lookup_elem(info-&gt;map, info-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* can't return sk directly, since that might be NULL */</div><div class='add'>+	return info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_map_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+	__acquires(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_map_seq_info *info = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (*pos == 0)</div><div class='add'>+		++*pos;</div><div class='add'>+</div><div class='add'>+	/* pairs with sock_map_seq_stop */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	return sock_map_seq_lookup_elem(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_map_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='add'>+	__must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_map_seq_info *info = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	++*pos;</div><div class='add'>+	++info-&gt;index;</div><div class='add'>+</div><div class='add'>+	return sock_map_seq_lookup_elem(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+	__must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_map_seq_info *info = seq-&gt;private;</div><div class='add'>+	struct bpf_iter__sockmap ctx = {};</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, !v);</div><div class='add'>+	if (!prog)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx.meta = &amp;meta;</div><div class='add'>+	ctx.map = info-&gt;map;</div><div class='add'>+	if (v) {</div><div class='add'>+		ctx.key = &amp;info-&gt;index;</div><div class='add'>+		ctx.sk = info-&gt;sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+	__releases(rcu)</div><div class='add'>+{</div><div class='add'>+	if (!v)</div><div class='add'>+		(void)sock_map_seq_show(seq, NULL);</div><div class='add'>+</div><div class='add'>+	/* pairs with sock_map_seq_start */</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations sock_map_seq_ops = {</div><div class='add'>+	.start	= sock_map_seq_start,</div><div class='add'>+	.next	= sock_map_seq_next,</div><div class='add'>+	.stop	= sock_map_seq_stop,</div><div class='add'>+	.show	= sock_map_seq_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sock_map_init_seq_private(void *priv_data,</div><div class='add'>+				     struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct sock_map_seq_info *info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_inc_with_uref(aux-&gt;map);</div><div class='add'>+	info-&gt;map = aux-&gt;map;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_fini_seq_private(void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct sock_map_seq_info *info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_put_with_uref(info-&gt;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 sock_map_mem_usage(const struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	u64 usage = sizeof(struct bpf_stab);</div><div class='add'>+</div><div class='add'>+	usage += (u64)map-&gt;max_entries * sizeof(struct sock *);</div><div class='add'>+	return usage;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info sock_map_iter_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;sock_map_seq_ops,</div><div class='add'>+	.init_seq_private	= sock_map_init_seq_private,</div><div class='add'>+	.fini_seq_private	= sock_map_fini_seq_private,</div><div class='add'>+	.seq_priv_size		= sizeof(struct sock_map_seq_info),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(sock_map_btf_ids, struct, bpf_stab)</div><div class='add'>+const struct bpf_map_ops sock_map_ops = {</div><div class='add'>+	.map_meta_equal		= bpf_map_meta_equal,</div><div class='add'>+	.map_alloc		= sock_map_alloc,</div><div class='add'>+	.map_free		= sock_map_free,</div><div class='add'>+	.map_get_next_key	= sock_map_get_next_key,</div><div class='add'>+	.map_lookup_elem_sys_only = sock_map_lookup_sys,</div><div class='add'>+	.map_update_elem	= sock_map_update_elem,</div><div class='add'>+	.map_delete_elem	= sock_map_delete_elem,</div><div class='add'>+	.map_lookup_elem	= sock_map_lookup,</div><div class='add'>+	.map_release_uref	= sock_map_release_progs,</div><div class='add'>+	.map_check_btf		= map_check_no_btf,</div><div class='add'>+	.map_mem_usage		= sock_map_mem_usage,</div><div class='add'>+	.map_btf_id		= &amp;sock_map_btf_ids[0],</div><div class='add'>+	.iter_seq_info		= &amp;sock_map_iter_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_shtab_elem {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	u32 hash;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	u8 key[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_shtab_bucket {</div><div class='add'>+	struct hlist_head head;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_shtab {</div><div class='add'>+	struct bpf_map map;</div><div class='add'>+	struct bpf_shtab_bucket *buckets;</div><div class='add'>+	u32 buckets_num;</div><div class='add'>+	u32 elem_size;</div><div class='add'>+	struct sk_psock_progs progs;</div><div class='add'>+	atomic_t count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 sock_hash_bucket_hash(const void *key, u32 len)</div><div class='add'>+{</div><div class='add'>+	return jhash(key, len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_shtab_bucket *sock_hash_select_bucket(struct bpf_shtab *htab,</div><div class='add'>+							u32 hash)</div><div class='add'>+{</div><div class='add'>+	return &amp;htab-&gt;buckets[hash &amp; (htab-&gt;buckets_num - 1)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_shtab_elem *</div><div class='add'>+sock_hash_lookup_elem_raw(struct hlist_head *head, u32 hash, void *key,</div><div class='add'>+			  u32 key_size)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab_elem *elem;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(elem, head, node) {</div><div class='add'>+		if (elem-&gt;hash == hash &amp;&amp;</div><div class='add'>+		    !memcmp(&amp;elem-&gt;key, key, key_size))</div><div class='add'>+			return elem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *__sock_hash_lookup_elem(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	u32 key_size = map-&gt;key_size, hash;</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+	struct bpf_shtab_elem *elem;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='add'>+	hash = sock_hash_bucket_hash(key, key_size);</div><div class='add'>+	bucket = sock_hash_select_bucket(htab, hash);</div><div class='add'>+	elem = sock_hash_lookup_elem_raw(&amp;bucket-&gt;head, hash, key, key_size);</div><div class='add'>+</div><div class='add'>+	return elem ? elem-&gt;sk : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_free_elem(struct bpf_shtab *htab,</div><div class='add'>+				struct bpf_shtab_elem *elem)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;htab-&gt;count);</div><div class='add'>+	kfree_rcu(elem, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_delete_from_link(struct bpf_map *map, struct sock *sk,</div><div class='add'>+				       void *link_raw)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	struct bpf_shtab_elem *elem_probe, *elem = link_raw;</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+	bucket = sock_hash_select_bucket(htab, elem-&gt;hash);</div><div class='add'>+</div><div class='add'>+	/* elem may be deleted in parallel from the map, but access here</div><div class='add'>+	 * is okay since it's going away only after RCU grace period.</div><div class='add'>+	 * However, we need to check whether it's still present.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	elem_probe = sock_hash_lookup_elem_raw(&amp;bucket-&gt;head, elem-&gt;hash,</div><div class='add'>+					       elem-&gt;key, map-&gt;key_size);</div><div class='add'>+	if (elem_probe &amp;&amp; elem_probe == elem) {</div><div class='add'>+		hlist_del_rcu(&amp;elem-&gt;node);</div><div class='add'>+		sock_map_unref(elem-&gt;sk, elem);</div><div class='add'>+		sock_hash_free_elem(htab, elem);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long sock_hash_delete_elem(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	u32 hash, key_size = map-&gt;key_size;</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+	struct bpf_shtab_elem *elem;</div><div class='add'>+	int ret = -ENOENT;</div><div class='add'>+</div><div class='add'>+	hash = sock_hash_bucket_hash(key, key_size);</div><div class='add'>+	bucket = sock_hash_select_bucket(htab, hash);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	elem = sock_hash_lookup_elem_raw(&amp;bucket-&gt;head, hash, key, key_size);</div><div class='add'>+	if (elem) {</div><div class='add'>+		hlist_del_rcu(&amp;elem-&gt;node);</div><div class='add'>+		sock_map_unref(elem-&gt;sk, elem);</div><div class='add'>+		sock_hash_free_elem(htab, elem);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_shtab_elem *sock_hash_alloc_elem(struct bpf_shtab *htab,</div><div class='add'>+						   void *key, u32 key_size,</div><div class='add'>+						   u32 hash, struct sock *sk,</div><div class='add'>+						   struct bpf_shtab_elem *old)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab_elem *new;</div><div class='add'>+</div><div class='add'>+	if (atomic_inc_return(&amp;htab-&gt;count) &gt; htab-&gt;map.max_entries) {</div><div class='add'>+		if (!old) {</div><div class='add'>+			atomic_dec(&amp;htab-&gt;count);</div><div class='add'>+			return ERR_PTR(-E2BIG);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new = bpf_map_kmalloc_node(&amp;htab-&gt;map, htab-&gt;elem_size,</div><div class='add'>+				   GFP_ATOMIC | __GFP_NOWARN,</div><div class='add'>+				   htab-&gt;map.numa_node);</div><div class='add'>+	if (!new) {</div><div class='add'>+		atomic_dec(&amp;htab-&gt;count);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	memcpy(new-&gt;key, key, key_size);</div><div class='add'>+	new-&gt;sk = sk;</div><div class='add'>+	new-&gt;hash = hash;</div><div class='add'>+	return new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_hash_update_common(struct bpf_map *map, void *key,</div><div class='add'>+				   struct sock *sk, u64 flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	u32 key_size = map-&gt;key_size, hash;</div><div class='add'>+	struct bpf_shtab_elem *elem, *elem_new;</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+	struct sk_psock_link *link;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+	if (unlikely(flags &gt; BPF_EXIST))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link = sk_psock_init_link();</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = sock_map_link(map, sk);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	WARN_ON_ONCE(!psock);</div><div class='add'>+</div><div class='add'>+	hash = sock_hash_bucket_hash(key, key_size);</div><div class='add'>+	bucket = sock_hash_select_bucket(htab, hash);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	elem = sock_hash_lookup_elem_raw(&amp;bucket-&gt;head, hash, key, key_size);</div><div class='add'>+	if (elem &amp;&amp; flags == BPF_NOEXIST) {</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	} else if (!elem &amp;&amp; flags == BPF_EXIST) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	elem_new = sock_hash_alloc_elem(htab, key, key_size, hash, sk, elem);</div><div class='add'>+	if (IS_ERR(elem_new)) {</div><div class='add'>+		ret = PTR_ERR(elem_new);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_map_add_link(psock, link, map, elem_new);</div><div class='add'>+	/* Add new element to the head of the list, so that</div><div class='add'>+	 * concurrent search will find it before old elem.</div><div class='add'>+	 */</div><div class='add'>+	hlist_add_head_rcu(&amp;elem_new-&gt;node, &amp;bucket-&gt;head);</div><div class='add'>+	if (elem) {</div><div class='add'>+		hlist_del_rcu(&amp;elem-&gt;node);</div><div class='add'>+		sock_map_unref(elem-&gt;sk, elem);</div><div class='add'>+		sock_hash_free_elem(htab, elem);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+out_free:</div><div class='add'>+	sk_psock_free_link(link);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_hash_get_next_key(struct bpf_map *map, void *key,</div><div class='add'>+				  void *key_next)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	struct bpf_shtab_elem *elem, *elem_next;</div><div class='add'>+	u32 hash, key_size = map-&gt;key_size;</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		goto find_first_elem;</div><div class='add'>+	hash = sock_hash_bucket_hash(key, key_size);</div><div class='add'>+	head = &amp;sock_hash_select_bucket(htab, hash)-&gt;head;</div><div class='add'>+	elem = sock_hash_lookup_elem_raw(head, hash, key, key_size);</div><div class='add'>+	if (!elem)</div><div class='add'>+		goto find_first_elem;</div><div class='add'>+</div><div class='add'>+	elem_next = hlist_entry_safe(rcu_dereference(hlist_next_rcu(&amp;elem-&gt;node)),</div><div class='add'>+				     struct bpf_shtab_elem, node);</div><div class='add'>+	if (elem_next) {</div><div class='add'>+		memcpy(key_next, elem_next-&gt;key, key_size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = hash &amp; (htab-&gt;buckets_num - 1);</div><div class='add'>+	i++;</div><div class='add'>+find_first_elem:</div><div class='add'>+	for (; i &lt; htab-&gt;buckets_num; i++) {</div><div class='add'>+		head = &amp;sock_hash_select_bucket(htab, i)-&gt;head;</div><div class='add'>+		elem_next = hlist_entry_safe(rcu_dereference(hlist_first_rcu(head)),</div><div class='add'>+					     struct bpf_shtab_elem, node);</div><div class='add'>+		if (elem_next) {</div><div class='add'>+			memcpy(key_next, elem_next-&gt;key, key_size);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_map *sock_hash_alloc(union bpf_attr *attr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;max_entries == 0 ||</div><div class='add'>+	    attr-&gt;key_size    == 0 ||</div><div class='add'>+	    (attr-&gt;value_size != sizeof(u32) &amp;&amp;</div><div class='add'>+	     attr-&gt;value_size != sizeof(u64)) ||</div><div class='add'>+	    attr-&gt;map_flags &amp; ~SOCK_CREATE_FLAG_MASK)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (attr-&gt;key_size &gt; MAX_BPF_STACK)</div><div class='add'>+		return ERR_PTR(-E2BIG);</div><div class='add'>+</div><div class='add'>+	htab = bpf_map_area_alloc(sizeof(*htab), NUMA_NO_NODE);</div><div class='add'>+	if (!htab)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	bpf_map_init_from_attr(&amp;htab-&gt;map, attr);</div><div class='add'>+</div><div class='add'>+	htab-&gt;buckets_num = roundup_pow_of_two(htab-&gt;map.max_entries);</div><div class='add'>+	htab-&gt;elem_size = sizeof(struct bpf_shtab_elem) +</div><div class='add'>+			  round_up(htab-&gt;map.key_size, 8);</div><div class='add'>+	if (htab-&gt;buckets_num == 0 ||</div><div class='add'>+	    htab-&gt;buckets_num &gt; U32_MAX / sizeof(struct bpf_shtab_bucket)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto free_htab;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	htab-&gt;buckets = bpf_map_area_alloc(htab-&gt;buckets_num *</div><div class='add'>+					   sizeof(struct bpf_shtab_bucket),</div><div class='add'>+					   htab-&gt;map.numa_node);</div><div class='add'>+	if (!htab-&gt;buckets) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_htab;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; htab-&gt;buckets_num; i++) {</div><div class='add'>+		INIT_HLIST_HEAD(&amp;htab-&gt;buckets[i].head);</div><div class='add'>+		spin_lock_init(&amp;htab-&gt;buckets[i].lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;htab-&gt;map;</div><div class='add'>+free_htab:</div><div class='add'>+	bpf_map_area_free(htab);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_free(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+	struct hlist_head unlink_list;</div><div class='add'>+	struct bpf_shtab_elem *elem;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* After the sync no updates or deletes will be in-flight so it</div><div class='add'>+	 * is safe to walk map and remove entries without risking a race</div><div class='add'>+	 * in EEXIST update case.</div><div class='add'>+	 */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	for (i = 0; i &lt; htab-&gt;buckets_num; i++) {</div><div class='add'>+		bucket = sock_hash_select_bucket(htab, i);</div><div class='add'>+</div><div class='add'>+		/* We are racing with sock_hash_delete_from_link to</div><div class='add'>+		 * enter the spin-lock critical section. Every socket on</div><div class='add'>+		 * the list is still linked to sockhash. Since link</div><div class='add'>+		 * exists, psock exists and holds a ref to socket. That</div><div class='add'>+		 * lets us to grab a socket ref too.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+		hlist_for_each_entry(elem, &amp;bucket-&gt;head, node)</div><div class='add'>+			sock_hold(elem-&gt;sk);</div><div class='add'>+		hlist_move_list(&amp;bucket-&gt;head, &amp;unlink_list);</div><div class='add'>+		spin_unlock_bh(&amp;bucket-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/* Process removed entries out of atomic context to</div><div class='add'>+		 * block for socket lock before deleting the psock's</div><div class='add'>+		 * link to sockhash.</div><div class='add'>+		 */</div><div class='add'>+		hlist_for_each_entry_safe(elem, node, &amp;unlink_list, node) {</div><div class='add'>+			hlist_del(&amp;elem-&gt;node);</div><div class='add'>+			lock_sock(elem-&gt;sk);</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			sock_map_unref(elem-&gt;sk, elem);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			release_sock(elem-&gt;sk);</div><div class='add'>+			sock_put(elem-&gt;sk);</div><div class='add'>+			sock_hash_free_elem(htab, elem);</div><div class='add'>+		}</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wait for psock readers accessing its map link */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	bpf_map_area_free(htab-&gt;buckets);</div><div class='add'>+	bpf_map_area_free(htab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_hash_lookup_sys(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (map-&gt;value_size != sizeof(u64))</div><div class='add'>+		return ERR_PTR(-ENOSPC);</div><div class='add'>+</div><div class='add'>+	sk = __sock_hash_lookup_elem(map, key);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	__sock_gen_cookie(sk);</div><div class='add'>+	return &amp;sk-&gt;sk_cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_hash_lookup(struct bpf_map *map, void *key)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = __sock_hash_lookup_elem(map, key);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (sk_is_refcounted(sk) &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='add'>+		return NULL;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_release_progs(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	psock_progs_drop(&amp;container_of(map, struct bpf_shtab, map)-&gt;progs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sock_hash_update, struct bpf_sock_ops_kern *, sops,</div><div class='add'>+	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='add'>+	if (likely(sock_map_sk_is_suitable(sops-&gt;sk) &amp;&amp;</div><div class='add'>+		   sock_map_op_okay(sops)))</div><div class='add'>+		return sock_hash_update_common(map, key, sops-&gt;sk, flags);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sock_hash_update_proto = {</div><div class='add'>+	.func		= bpf_sock_hash_update,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	.pkt_access	= true,</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type	= ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type	= ARG_PTR_TO_MAP_KEY,</div><div class='add'>+	.arg4_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,</div><div class='add'>+	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	sk = __sock_hash_lookup_elem(map, key);</div><div class='add'>+	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if ((flags &amp; BPF_F_INGRESS) &amp;&amp; sk_is_vsock(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	skb_bpf_set_redir(skb, sk, flags &amp; BPF_F_INGRESS);</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_sk_redirect_hash_proto = {</div><div class='add'>+	.func           = bpf_sk_redirect_hash,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type      = ARG_PTR_TO_MAP_KEY,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BPF_CALL_4(bpf_msg_redirect_hash, struct sk_msg *, msg,</div><div class='add'>+	   struct bpf_map *, map, void *, key, u64, flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~(BPF_F_INGRESS)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	sk = __sock_hash_lookup_elem(map, key);</div><div class='add'>+	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if (!(flags &amp; BPF_F_INGRESS) &amp;&amp; !sk_is_tcp(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+	if (sk_is_vsock(sk))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	msg-&gt;flags = flags;</div><div class='add'>+	msg-&gt;sk_redir = sk;</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bpf_func_proto bpf_msg_redirect_hash_proto = {</div><div class='add'>+	.func           = bpf_msg_redirect_hash,</div><div class='add'>+	.gpl_only       = false,</div><div class='add'>+	.ret_type       = RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_CTX,</div><div class='add'>+	.arg2_type      = ARG_CONST_MAP_PTR,</div><div class='add'>+	.arg3_type      = ARG_PTR_TO_MAP_KEY,</div><div class='add'>+	.arg4_type      = ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sock_hash_seq_info {</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	struct bpf_shtab *htab;</div><div class='add'>+	u32 bucket_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *sock_hash_seq_find_next(struct sock_hash_seq_info *info,</div><div class='add'>+				     struct bpf_shtab_elem *prev_elem)</div><div class='add'>+{</div><div class='add'>+	const struct bpf_shtab *htab = info-&gt;htab;</div><div class='add'>+	struct bpf_shtab_bucket *bucket;</div><div class='add'>+	struct bpf_shtab_elem *elem;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+</div><div class='add'>+	/* try to find next elem in the same bucket */</div><div class='add'>+	if (prev_elem) {</div><div class='add'>+		node = rcu_dereference(hlist_next_rcu(&amp;prev_elem-&gt;node));</div><div class='add'>+		elem = hlist_entry_safe(node, struct bpf_shtab_elem, node);</div><div class='add'>+		if (elem)</div><div class='add'>+			return elem;</div><div class='add'>+</div><div class='add'>+		/* no more elements, continue in the next bucket */</div><div class='add'>+		info-&gt;bucket_id++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; info-&gt;bucket_id &lt; htab-&gt;buckets_num; info-&gt;bucket_id++) {</div><div class='add'>+		bucket = &amp;htab-&gt;buckets[info-&gt;bucket_id];</div><div class='add'>+		node = rcu_dereference(hlist_first_rcu(&amp;bucket-&gt;head));</div><div class='add'>+		elem = hlist_entry_safe(node, struct bpf_shtab_elem, node);</div><div class='add'>+		if (elem)</div><div class='add'>+			return elem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_hash_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+	__acquires(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_hash_seq_info *info = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (*pos == 0)</div><div class='add'>+		++*pos;</div><div class='add'>+</div><div class='add'>+	/* pairs with sock_hash_seq_stop */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	return sock_hash_seq_find_next(info, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *sock_hash_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='add'>+	__must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_hash_seq_info *info = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	++*pos;</div><div class='add'>+	return sock_hash_seq_find_next(info, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_hash_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+	__must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct sock_hash_seq_info *info = seq-&gt;private;</div><div class='add'>+	struct bpf_iter__sockmap ctx = {};</div><div class='add'>+	struct bpf_shtab_elem *elem = v;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, !elem);</div><div class='add'>+	if (!prog)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx.meta = &amp;meta;</div><div class='add'>+	ctx.map = info-&gt;map;</div><div class='add'>+	if (elem) {</div><div class='add'>+		ctx.key = elem-&gt;key;</div><div class='add'>+		ctx.sk = elem-&gt;sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+	__releases(rcu)</div><div class='add'>+{</div><div class='add'>+	if (!v)</div><div class='add'>+		(void)sock_hash_seq_show(seq, NULL);</div><div class='add'>+</div><div class='add'>+	/* pairs with sock_hash_seq_start */</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations sock_hash_seq_ops = {</div><div class='add'>+	.start	= sock_hash_seq_start,</div><div class='add'>+	.next	= sock_hash_seq_next,</div><div class='add'>+	.stop	= sock_hash_seq_stop,</div><div class='add'>+	.show	= sock_hash_seq_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sock_hash_init_seq_private(void *priv_data,</div><div class='add'>+				      struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct sock_hash_seq_info *info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_inc_with_uref(aux-&gt;map);</div><div class='add'>+	info-&gt;map = aux-&gt;map;</div><div class='add'>+	info-&gt;htab = container_of(aux-&gt;map, struct bpf_shtab, map);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_hash_fini_seq_private(void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct sock_hash_seq_info *info = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_map_put_with_uref(info-&gt;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 sock_hash_mem_usage(const struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);</div><div class='add'>+	u64 usage = sizeof(*htab);</div><div class='add'>+</div><div class='add'>+	usage += htab-&gt;buckets_num * sizeof(struct bpf_shtab_bucket);</div><div class='add'>+	usage += atomic_read(&amp;htab-&gt;count) * (u64)htab-&gt;elem_size;</div><div class='add'>+	return usage;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info sock_hash_iter_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;sock_hash_seq_ops,</div><div class='add'>+	.init_seq_private	= sock_hash_init_seq_private,</div><div class='add'>+	.fini_seq_private	= sock_hash_fini_seq_private,</div><div class='add'>+	.seq_priv_size		= sizeof(struct sock_hash_seq_info),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(sock_hash_map_btf_ids, struct, bpf_shtab)</div><div class='add'>+const struct bpf_map_ops sock_hash_ops = {</div><div class='add'>+	.map_meta_equal		= bpf_map_meta_equal,</div><div class='add'>+	.map_alloc		= sock_hash_alloc,</div><div class='add'>+	.map_free		= sock_hash_free,</div><div class='add'>+	.map_get_next_key	= sock_hash_get_next_key,</div><div class='add'>+	.map_update_elem	= sock_map_update_elem,</div><div class='add'>+	.map_delete_elem	= sock_hash_delete_elem,</div><div class='add'>+	.map_lookup_elem	= sock_hash_lookup,</div><div class='add'>+	.map_lookup_elem_sys_only = sock_hash_lookup_sys,</div><div class='add'>+	.map_release_uref	= sock_hash_release_progs,</div><div class='add'>+	.map_check_btf		= map_check_no_btf,</div><div class='add'>+	.map_mem_usage		= sock_hash_mem_usage,</div><div class='add'>+	.map_btf_id		= &amp;sock_hash_map_btf_ids[0],</div><div class='add'>+	.iter_seq_info		= &amp;sock_hash_iter_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sk_psock_progs *sock_map_progs(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	switch (map-&gt;map_type) {</div><div class='add'>+	case BPF_MAP_TYPE_SOCKMAP:</div><div class='add'>+		return &amp;container_of(map, struct bpf_stab, map)-&gt;progs;</div><div class='add'>+	case BPF_MAP_TYPE_SOCKHASH:</div><div class='add'>+		return &amp;container_of(map, struct bpf_shtab, map)-&gt;progs;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_prog_link_lookup(struct bpf_map *map, struct bpf_prog ***pprog,</div><div class='add'>+				     struct bpf_link ***plink, u32 which)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock_progs *progs = sock_map_progs(map);</div><div class='add'>+	struct bpf_prog **cur_pprog;</div><div class='add'>+	struct bpf_link **cur_plink;</div><div class='add'>+</div><div class='add'>+	if (!progs)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (which) {</div><div class='add'>+	case BPF_SK_MSG_VERDICT:</div><div class='add'>+		cur_pprog = &amp;progs-&gt;msg_parser;</div><div class='add'>+		cur_plink = &amp;progs-&gt;msg_parser_link;</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)</div><div class='add'>+	case BPF_SK_SKB_STREAM_PARSER:</div><div class='add'>+		cur_pprog = &amp;progs-&gt;stream_parser;</div><div class='add'>+		cur_plink = &amp;progs-&gt;stream_parser_link;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case BPF_SK_SKB_STREAM_VERDICT:</div><div class='add'>+		if (progs-&gt;skb_verdict)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		cur_pprog = &amp;progs-&gt;stream_verdict;</div><div class='add'>+		cur_plink = &amp;progs-&gt;stream_verdict_link;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SK_SKB_VERDICT:</div><div class='add'>+		if (progs-&gt;stream_verdict)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		cur_pprog = &amp;progs-&gt;skb_verdict;</div><div class='add'>+		cur_plink = &amp;progs-&gt;skb_verdict_link;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pprog = cur_pprog;</div><div class='add'>+	if (plink)</div><div class='add'>+		*plink = cur_plink;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle the following four cases:</div><div class='add'>+ * prog_attach: prog != NULL, old == NULL, link == NULL</div><div class='add'>+ * prog_detach: prog == NULL, old != NULL, link == NULL</div><div class='add'>+ * link_attach: prog != NULL, old == NULL, link != NULL</div><div class='add'>+ * link_detach: prog == NULL, old != NULL, link != NULL</div><div class='add'>+ */</div><div class='add'>+static int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,</div><div class='add'>+				struct bpf_prog *old, struct bpf_link *link,</div><div class='add'>+				u32 which)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog **pprog;</div><div class='add'>+	struct bpf_link **plink;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = sock_map_prog_link_lookup(map, &amp;pprog, &amp;plink, which);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* for prog_attach/prog_detach/link_attach, return error if a bpf_link</div><div class='add'>+	 * exists for that prog.</div><div class='add'>+	 */</div><div class='add'>+	if ((!link || prog) &amp;&amp; *plink)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (old) {</div><div class='add'>+		ret = psock_replace_prog(pprog, prog, old);</div><div class='add'>+		if (!ret)</div><div class='add'>+			*plink = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		psock_set_prog(pprog, prog);</div><div class='add'>+		if (link)</div><div class='add'>+			*plink = link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sock_map_bpf_prog_query(const union bpf_attr *attr,</div><div class='add'>+			    union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	__u32 __user *prog_ids = u64_to_user_ptr(attr-&gt;query.prog_ids);</div><div class='add'>+	u32 prog_cnt = 0, flags = 0;</div><div class='add'>+	struct bpf_prog **pprog;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	u32 id = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;query.query_flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	CLASS(fd, f)(attr-&gt;target_fd);</div><div class='add'>+	map = __bpf_map_get(f);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ret = sock_map_prog_link_lookup(map, &amp;pprog, NULL, attr-&gt;query.attach_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	prog = *pprog;</div><div class='add'>+	prog_cnt = !prog ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	if (!attr-&gt;query.prog_cnt || !prog_ids || !prog_cnt)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* we do not hold the refcnt, the bpf prog may be released</div><div class='add'>+	 * asynchronously and the id would be set to 0.</div><div class='add'>+	 */</div><div class='add'>+	id = data_race(prog-&gt;aux-&gt;id);</div><div class='add'>+	if (id == 0)</div><div class='add'>+		prog_cnt = 0;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(&amp;uattr-&gt;query.attach_flags, &amp;flags, sizeof(flags)) ||</div><div class='add'>+	    (id != 0 &amp;&amp; copy_to_user(prog_ids, &amp;id, sizeof(u32))) ||</div><div class='add'>+	    copy_to_user(&amp;uattr-&gt;query.prog_cnt, &amp;prog_cnt, sizeof(prog_cnt)))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_unlink(struct sock *sk, struct sk_psock_link *link)</div><div class='add'>+{</div><div class='add'>+	switch (link-&gt;map-&gt;map_type) {</div><div class='add'>+	case BPF_MAP_TYPE_SOCKMAP:</div><div class='add'>+		return sock_map_delete_from_link(link-&gt;map, sk,</div><div class='add'>+						 link-&gt;link_raw);</div><div class='add'>+	case BPF_MAP_TYPE_SOCKHASH:</div><div class='add'>+		return sock_hash_delete_from_link(link-&gt;map, sk,</div><div class='add'>+						  link-&gt;link_raw);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_remove_links(struct sock *sk, struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock_link *link;</div><div class='add'>+</div><div class='add'>+	while ((link = sk_psock_link_pop(psock))) {</div><div class='add'>+		sock_map_unlink(sk, link);</div><div class='add'>+		sk_psock_free_link(link);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sock_map_unhash(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	void (*saved_unhash)(struct sock *sk);</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (unlikely(!psock)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		saved_unhash = READ_ONCE(sk-&gt;sk_prot)-&gt;unhash;</div><div class='add'>+	} else {</div><div class='add'>+		saved_unhash = psock-&gt;saved_unhash;</div><div class='add'>+		sock_map_remove_links(sk, psock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+	if (WARN_ON_ONCE(saved_unhash == sock_map_unhash))</div><div class='add'>+		return;</div><div class='add'>+	if (saved_unhash)</div><div class='add'>+		saved_unhash(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sock_map_unhash);</div><div class='add'>+</div><div class='add'>+void sock_map_destroy(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	void (*saved_destroy)(struct sock *sk);</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock_get(sk);</div><div class='add'>+	if (unlikely(!psock)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		saved_destroy = READ_ONCE(sk-&gt;sk_prot)-&gt;destroy;</div><div class='add'>+	} else {</div><div class='add'>+		saved_destroy = psock-&gt;saved_destroy;</div><div class='add'>+		sock_map_remove_links(sk, psock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		sk_psock_stop(psock);</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+	}</div><div class='add'>+	if (WARN_ON_ONCE(saved_destroy == sock_map_destroy))</div><div class='add'>+		return;</div><div class='add'>+	if (saved_destroy)</div><div class='add'>+		saved_destroy(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sock_map_destroy);</div><div class='add'>+</div><div class='add'>+void sock_map_close(struct sock *sk, long timeout)</div><div class='add'>+{</div><div class='add'>+	void (*saved_close)(struct sock *sk, long timeout);</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (likely(psock)) {</div><div class='add'>+		saved_close = psock-&gt;saved_close;</div><div class='add'>+		sock_map_remove_links(sk, psock);</div><div class='add'>+		psock = sk_psock_get(sk);</div><div class='add'>+		if (unlikely(!psock))</div><div class='add'>+			goto no_psock;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		sk_psock_stop(psock);</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		cancel_delayed_work_sync(&amp;psock-&gt;work);</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+	} else {</div><div class='add'>+		saved_close = READ_ONCE(sk-&gt;sk_prot)-&gt;close;</div><div class='add'>+no_psock:</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		release_sock(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure we do not recurse. This is a bug.</div><div class='add'>+	 * Leak the socket instead of crashing on a stack overflow.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(saved_close == sock_map_close))</div><div class='add'>+		return;</div><div class='add'>+	saved_close(sk, timeout);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sock_map_close);</div><div class='add'>+</div><div class='add'>+struct sockmap_link {</div><div class='add'>+	struct bpf_link link;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void sock_map_link_release(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	struct sockmap_link *sockmap_link = container_of(link, struct sockmap_link, link);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+	if (!sockmap_link-&gt;map)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(sock_map_prog_update(sockmap_link-&gt;map, NULL, link-&gt;prog, link,</div><div class='add'>+					  link-&gt;attach_type));</div><div class='add'>+</div><div class='add'>+	bpf_map_put_with_uref(sockmap_link-&gt;map);</div><div class='add'>+	sockmap_link-&gt;map = NULL;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_link_detach(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	sock_map_link_release(link);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_link_dealloc(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	kfree(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle the following two cases:</div><div class='add'>+ * case 1: link != NULL, prog != NULL, old != NULL</div><div class='add'>+ * case 2: link != NULL, prog != NULL, old == NULL</div><div class='add'>+ */</div><div class='add'>+static int sock_map_link_update_prog(struct bpf_link *link,</div><div class='add'>+				     struct bpf_prog *prog,</div><div class='add'>+				     struct bpf_prog *old)</div><div class='add'>+{</div><div class='add'>+	const struct sockmap_link *sockmap_link = container_of(link, struct sockmap_link, link);</div><div class='add'>+	struct bpf_prog **pprog, *old_link_prog;</div><div class='add'>+	struct bpf_link **plink;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+</div><div class='add'>+	/* If old prog is not NULL, ensure old prog is the same as link-&gt;prog. */</div><div class='add'>+	if (old &amp;&amp; link-&gt;prog != old) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* Ensure link-&gt;prog has the same type/attach_type as the new prog. */</div><div class='add'>+	if (link-&gt;prog-&gt;type != prog-&gt;type ||</div><div class='add'>+	    link-&gt;prog-&gt;expected_attach_type != prog-&gt;expected_attach_type) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!sockmap_link-&gt;map) {</div><div class='add'>+		ret = -ENOLINK;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sock_map_prog_link_lookup(sockmap_link-&gt;map, &amp;pprog, &amp;plink,</div><div class='add'>+					link-&gt;attach_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* return error if the stored bpf_link does not match the incoming bpf_link. */</div><div class='add'>+	if (link != *plink) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old) {</div><div class='add'>+		ret = psock_replace_prog(pprog, prog, old);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	} else {</div><div class='add'>+		psock_set_prog(pprog, prog);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_prog_inc(prog);</div><div class='add'>+	old_link_prog = xchg(&amp;link-&gt;prog, prog);</div><div class='add'>+	bpf_prog_put(old_link_prog);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 sock_map_link_get_map_id(const struct sockmap_link *sockmap_link)</div><div class='add'>+{</div><div class='add'>+	u32 map_id = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+	if (sockmap_link-&gt;map)</div><div class='add'>+		map_id = sockmap_link-&gt;map-&gt;id;</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+	return map_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_link_fill_info(const struct bpf_link *link,</div><div class='add'>+				   struct bpf_link_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct sockmap_link *sockmap_link = container_of(link, struct sockmap_link, link);</div><div class='add'>+	u32 map_id = sock_map_link_get_map_id(sockmap_link);</div><div class='add'>+</div><div class='add'>+	info-&gt;sockmap.map_id = map_id;</div><div class='add'>+	info-&gt;sockmap.attach_type = link-&gt;attach_type;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_link_show_fdinfo(const struct bpf_link *link,</div><div class='add'>+				      struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	const struct sockmap_link *sockmap_link = container_of(link, struct sockmap_link, link);</div><div class='add'>+	u32 map_id = sock_map_link_get_map_id(sockmap_link);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "map_id:\t%u\n", map_id);</div><div class='add'>+	seq_printf(seq, "attach_type:\t%u\n", link-&gt;attach_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_link_ops sock_map_link_ops = {</div><div class='add'>+	.release = sock_map_link_release,</div><div class='add'>+	.dealloc = sock_map_link_dealloc,</div><div class='add'>+	.detach = sock_map_link_detach,</div><div class='add'>+	.update_prog = sock_map_link_update_prog,</div><div class='add'>+	.fill_link_info = sock_map_link_fill_info,</div><div class='add'>+	.show_fdinfo = sock_map_link_show_fdinfo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link_primer link_primer;</div><div class='add'>+	struct sockmap_link *sockmap_link;</div><div class='add'>+	enum bpf_attach_type attach_type;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;link_create.flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	map = bpf_map_get_with_uref(attr-&gt;link_create.target_fd);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+	if (map-&gt;map_type != BPF_MAP_TYPE_SOCKMAP &amp;&amp; map-&gt;map_type != BPF_MAP_TYPE_SOCKHASH) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sockmap_link = kzalloc(sizeof(*sockmap_link), GFP_USER);</div><div class='add'>+	if (!sockmap_link) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attach_type = attr-&gt;link_create.attach_type;</div><div class='add'>+	bpf_link_init(&amp;sockmap_link-&gt;link, BPF_LINK_TYPE_SOCKMAP, &amp;sock_map_link_ops, prog,</div><div class='add'>+		      attach_type);</div><div class='add'>+	sockmap_link-&gt;map = map;</div><div class='add'>+</div><div class='add'>+	ret = bpf_link_prime(&amp;sockmap_link-&gt;link, &amp;link_primer);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(sockmap_link);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sockmap_mutex);</div><div class='add'>+	ret = sock_map_prog_update(map, prog, NULL, &amp;sockmap_link-&gt;link, attach_type);</div><div class='add'>+	mutex_unlock(&amp;sockmap_mutex);</div><div class='add'>+	if (ret) {</div><div class='add'>+		bpf_link_cleanup(&amp;link_primer);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Increase refcnt for the prog since when old prog is replaced with</div><div class='add'>+	 * psock_replace_prog() and psock_set_prog() its refcnt will be decreased.</div><div class='add'>+	 *</div><div class='add'>+	 * Actually, we do not need to increase refcnt for the prog since bpf_link</div><div class='add'>+	 * will hold a reference. But in order to have less complexity w.r.t.</div><div class='add'>+	 * replacing/setting prog, let us increase the refcnt to make things simpler.</div><div class='add'>+	 */</div><div class='add'>+	bpf_prog_inc(prog);</div><div class='add'>+</div><div class='add'>+	return bpf_link_settle(&amp;link_primer);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bpf_map_put_with_uref(map);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sock_map_iter_attach_target(struct bpf_prog *prog,</div><div class='add'>+				       union bpf_iter_link_info *linfo,</div><div class='add'>+				       struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!linfo-&gt;map.map_fd)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	map = bpf_map_get_with_uref(linfo-&gt;map.map_fd);</div><div class='add'>+	if (IS_ERR(map))</div><div class='add'>+		return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+	if (map-&gt;map_type != BPF_MAP_TYPE_SOCKMAP &amp;&amp;</div><div class='add'>+	    map-&gt;map_type != BPF_MAP_TYPE_SOCKHASH)</div><div class='add'>+		goto put_map;</div><div class='add'>+</div><div class='add'>+	if (prog-&gt;aux-&gt;max_rdonly_access &gt; map-&gt;key_size) {</div><div class='add'>+		err = -EACCES;</div><div class='add'>+		goto put_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aux-&gt;map = map;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+put_map:</div><div class='add'>+	bpf_map_put_with_uref(map);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sock_map_iter_detach_target(struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	bpf_map_put_with_uref(aux-&gt;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_iter_reg sock_map_iter_reg = {</div><div class='add'>+	.target			= "sockmap",</div><div class='add'>+	.attach_target		= sock_map_iter_attach_target,</div><div class='add'>+	.detach_target		= sock_map_iter_detach_target,</div><div class='add'>+	.show_fdinfo		= bpf_iter_map_show_fdinfo,</div><div class='add'>+	.fill_link_info		= bpf_iter_map_fill_link_info,</div><div class='add'>+	.ctx_arg_info_size	= 2,</div><div class='add'>+	.ctx_arg_info		= {</div><div class='add'>+		{ offsetof(struct bpf_iter__sockmap, key),</div><div class='add'>+		  PTR_TO_BUF | PTR_MAYBE_NULL | MEM_RDONLY },</div><div class='add'>+		{ offsetof(struct bpf_iter__sockmap, sk),</div><div class='add'>+		  PTR_TO_BTF_ID_OR_NULL },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_sockmap_iter_init(void)</div><div class='add'>+{</div><div class='add'>+	sock_map_iter_reg.ctx_arg_info[1].btf_id =</div><div class='add'>+		btf_sock_ids[BTF_SOCK_TYPE_SOCK];</div><div class='add'>+	return bpf_iter_reg_target(&amp;sock_map_iter_reg);</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_sockmap_iter_init);</div><div class='head'>diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c<br/>index ba5cba56f574..4211710393a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/sock_reuseport.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sock_reuseport.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sock_reuseport.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sock_reuseport.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * selecting the socket index from the array of available sockets.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='hunk'>@@ -16,33 +17,165 @@</div><div class='ctx'> </div><div class='ctx'> DEFINE_SPINLOCK(reuseport_lock);</div><div class='ctx'> </div><div class='del'>-#define REUSEPORT_MIN_ID 1</div><div class='ctx'> static DEFINE_IDA(reuseport_ida);</div><div class='add'>+static int reuseport_resurrect(struct sock *sk, struct sock_reuseport *old_reuse,</div><div class='add'>+			       struct sock_reuseport *reuse, bool bind_inany);</div><div class='ctx'> </div><div class='del'>-int reuseport_get_id(struct sock_reuseport *reuse)</div><div class='add'>+void reuseport_has_conns_set(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	int id;</div><div class='add'>+	struct sock_reuseport *reuse;</div><div class='ctx'> </div><div class='del'>-	if (reuse-&gt;reuseport_id)</div><div class='del'>-		return reuse-&gt;reuseport_id;</div><div class='add'>+	if (!rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	id = ida_simple_get(&amp;reuseport_ida, REUSEPORT_MIN_ID, 0,</div><div class='del'>-			    /* Called under reuseport_lock */</div><div class='del'>-			    GFP_ATOMIC);</div><div class='del'>-	if (id &lt; 0)</div><div class='del'>-		return id;</div><div class='add'>+	spin_lock_bh(&amp;reuseport_lock);</div><div class='add'>+	reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='add'>+					  lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+	if (likely(reuse))</div><div class='add'>+		reuse-&gt;has_conns = 1;</div><div class='add'>+	spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(reuseport_has_conns_set);</div><div class='ctx'> </div><div class='del'>-	reuse-&gt;reuseport_id = id;</div><div class='add'>+static void __reuseport_get_incoming_cpu(struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	/* Paired with READ_ONCE() in reuseport_select_sock_by_hash(). */</div><div class='add'>+	WRITE_ONCE(reuse-&gt;incoming_cpu, reuse-&gt;incoming_cpu + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __reuseport_put_incoming_cpu(struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	/* Paired with READ_ONCE() in reuseport_select_sock_by_hash(). */</div><div class='add'>+	WRITE_ONCE(reuse-&gt;incoming_cpu, reuse-&gt;incoming_cpu - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reuseport_get_incoming_cpu(struct sock *sk, struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_incoming_cpu &gt;= 0)</div><div class='add'>+		__reuseport_get_incoming_cpu(reuse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reuseport_put_incoming_cpu(struct sock *sk, struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_incoming_cpu &gt;= 0)</div><div class='add'>+		__reuseport_put_incoming_cpu(reuse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void reuseport_update_incoming_cpu(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	struct sock_reuseport *reuse;</div><div class='add'>+	int old_sk_incoming_cpu;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!rcu_access_pointer(sk-&gt;sk_reuseport_cb))) {</div><div class='add'>+		/* Paired with REAE_ONCE() in sk_incoming_cpu_update()</div><div class='add'>+		 * and compute_score().</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_incoming_cpu, val);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;reuseport_lock);</div><div class='add'>+</div><div class='add'>+	/* This must be done under reuseport_lock to avoid a race with</div><div class='add'>+	 * reuseport_grow(), which accesses sk-&gt;sk_incoming_cpu without</div><div class='add'>+	 * lock_sock() when detaching a shutdown()ed sk.</div><div class='add'>+	 *</div><div class='add'>+	 * Paired with READ_ONCE() in reuseport_select_sock_by_hash().</div><div class='add'>+	 */</div><div class='add'>+	old_sk_incoming_cpu = sk-&gt;sk_incoming_cpu;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_incoming_cpu, val);</div><div class='ctx'> </div><div class='del'>-	return reuse-&gt;reuseport_id;</div><div class='add'>+	reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='add'>+					  lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+</div><div class='add'>+	/* reuseport_grow() has detached a closed sk. */</div><div class='add'>+	if (!reuse)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (old_sk_incoming_cpu &lt; 0 &amp;&amp; val &gt;= 0)</div><div class='add'>+		__reuseport_get_incoming_cpu(reuse);</div><div class='add'>+	else if (old_sk_incoming_cpu &gt;= 0 &amp;&amp; val &lt; 0)</div><div class='add'>+		__reuseport_put_incoming_cpu(reuse);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reuseport_sock_index(struct sock *sk,</div><div class='add'>+				const struct sock_reuseport *reuse,</div><div class='add'>+				bool closed)</div><div class='add'>+{</div><div class='add'>+	int left, right;</div><div class='add'>+</div><div class='add'>+	if (!closed) {</div><div class='add'>+		left = 0;</div><div class='add'>+		right = reuse-&gt;num_socks;</div><div class='add'>+	} else {</div><div class='add'>+		left = reuse-&gt;max_socks - reuse-&gt;num_closed_socks;</div><div class='add'>+		right = reuse-&gt;max_socks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; left &lt; right; left++)</div><div class='add'>+		if (reuse-&gt;socks[left] == sk)</div><div class='add'>+			return left;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __reuseport_add_sock(struct sock *sk,</div><div class='add'>+				 struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	reuse-&gt;socks[reuse-&gt;num_socks] = sk;</div><div class='add'>+	/* paired with smp_rmb() in reuseport_(select|migrate)_sock() */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	reuse-&gt;num_socks++;</div><div class='add'>+	reuseport_get_incoming_cpu(sk, reuse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __reuseport_detach_sock(struct sock *sk,</div><div class='add'>+				    struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	int i = reuseport_sock_index(sk, reuse, false);</div><div class='add'>+</div><div class='add'>+	if (i == -1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	reuse-&gt;socks[i] = reuse-&gt;socks[reuse-&gt;num_socks - 1];</div><div class='add'>+	reuse-&gt;num_socks--;</div><div class='add'>+	reuseport_put_incoming_cpu(sk, reuse);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __reuseport_add_closed_sock(struct sock *sk,</div><div class='add'>+					struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	reuse-&gt;socks[reuse-&gt;max_socks - reuse-&gt;num_closed_socks - 1] = sk;</div><div class='add'>+	/* paired with READ_ONCE() in inet_csk_bind_conflict() */</div><div class='add'>+	WRITE_ONCE(reuse-&gt;num_closed_socks, reuse-&gt;num_closed_socks + 1);</div><div class='add'>+	reuseport_get_incoming_cpu(sk, reuse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __reuseport_detach_closed_sock(struct sock *sk,</div><div class='add'>+					   struct sock_reuseport *reuse)</div><div class='add'>+{</div><div class='add'>+	int i = reuseport_sock_index(sk, reuse, true);</div><div class='add'>+</div><div class='add'>+	if (i == -1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	reuse-&gt;socks[i] = reuse-&gt;socks[reuse-&gt;max_socks - reuse-&gt;num_closed_socks];</div><div class='add'>+	/* paired with READ_ONCE() in inet_csk_bind_conflict() */</div><div class='add'>+	WRITE_ONCE(reuse-&gt;num_closed_socks, reuse-&gt;num_closed_socks - 1);</div><div class='add'>+	reuseport_put_incoming_cpu(sk, reuse);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock_reuseport *__reuseport_alloc(unsigned int max_socks)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = sizeof(struct sock_reuseport) +</div><div class='del'>-		      sizeof(struct sock *) * max_socks;</div><div class='del'>-	struct sock_reuseport *reuse = kzalloc(size, GFP_ATOMIC);</div><div class='add'>+	struct sock_reuseport *reuse;</div><div class='ctx'> </div><div class='add'>+	reuse = kzalloc(struct_size(reuse, socks, max_socks), GFP_ATOMIC);</div><div class='ctx'> 	if (!reuse)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -55,6 +188,7 @@ static struct sock_reuseport *__reuseport_alloc(unsigned int max_socks)</div><div class='ctx'> int reuseport_alloc(struct sock *sk, bool bind_inany)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock_reuseport *reuse;</div><div class='add'>+	int id, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* bh lock used since this function call may precede hlist lock in</div><div class='ctx'> 	 * soft irq of receive path or setsockopt from process context</div><div class='hunk'>@@ -67,6 +201,12 @@ int reuseport_alloc(struct sock *sk, bool bind_inany)</div><div class='ctx'> 	reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='ctx'> 					  lockdep_is_held(&amp;reuseport_lock));</div><div class='ctx'> 	if (reuse) {</div><div class='add'>+		if (reuse-&gt;num_closed_socks) {</div><div class='add'>+			/* sk was shutdown()ed before */</div><div class='add'>+			ret = reuseport_resurrect(sk, reuse, NULL, bind_inany);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Only set reuse-&gt;bind_inany if the bind_inany is true.</div><div class='ctx'> 		 * Otherwise, it will overwrite the reuse-&gt;bind_inany</div><div class='ctx'> 		 * which was set by the bind/hash path.</div><div class='hunk'>@@ -78,19 +218,28 @@ int reuseport_alloc(struct sock *sk, bool bind_inany)</div><div class='ctx'> </div><div class='ctx'> 	reuse = __reuseport_alloc(INIT_SOCKS);</div><div class='ctx'> 	if (!reuse) {</div><div class='del'>-		spin_unlock_bh(&amp;reuseport_lock);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = ida_alloc(&amp;reuseport_ida, GFP_ATOMIC);</div><div class='add'>+	if (id &lt; 0) {</div><div class='add'>+		kfree(reuse);</div><div class='add'>+		ret = id;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	reuse-&gt;reuseport_id = id;</div><div class='add'>+	reuse-&gt;bind_inany = bind_inany;</div><div class='ctx'> 	reuse-&gt;socks[0] = sk;</div><div class='ctx'> 	reuse-&gt;num_socks = 1;</div><div class='del'>-	reuse-&gt;bind_inany = bind_inany;</div><div class='add'>+	reuseport_get_incoming_cpu(sk, reuse);</div><div class='ctx'> 	rcu_assign_pointer(sk-&gt;sk_reuseport_cb, reuse);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;reuseport_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(reuseport_alloc);</div><div class='ctx'> </div><div class='hunk'>@@ -100,24 +249,45 @@ static struct sock_reuseport *reuseport_grow(struct sock_reuseport *reuse)</div><div class='ctx'> 	u32 more_socks_size, i;</div><div class='ctx'> </div><div class='ctx'> 	more_socks_size = reuse-&gt;max_socks * 2U;</div><div class='del'>-	if (more_socks_size &gt; U16_MAX)</div><div class='add'>+	if (more_socks_size &gt; U16_MAX) {</div><div class='add'>+		if (reuse-&gt;num_closed_socks) {</div><div class='add'>+			/* Make room by removing a closed sk.</div><div class='add'>+			 * The child has already been migrated.</div><div class='add'>+			 * Only reqsk left at this point.</div><div class='add'>+			 */</div><div class='add'>+			struct sock *sk;</div><div class='add'>+</div><div class='add'>+			sk = reuse-&gt;socks[reuse-&gt;max_socks - reuse-&gt;num_closed_socks];</div><div class='add'>+			RCU_INIT_POINTER(sk-&gt;sk_reuseport_cb, NULL);</div><div class='add'>+			__reuseport_detach_closed_sock(sk, reuse);</div><div class='add'>+</div><div class='add'>+			return reuse;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	more_reuse = __reuseport_alloc(more_socks_size);</div><div class='ctx'> 	if (!more_reuse)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	more_reuse-&gt;max_socks = more_socks_size;</div><div class='ctx'> 	more_reuse-&gt;num_socks = reuse-&gt;num_socks;</div><div class='add'>+	more_reuse-&gt;num_closed_socks = reuse-&gt;num_closed_socks;</div><div class='ctx'> 	more_reuse-&gt;prog = reuse-&gt;prog;</div><div class='ctx'> 	more_reuse-&gt;reuseport_id = reuse-&gt;reuseport_id;</div><div class='ctx'> 	more_reuse-&gt;bind_inany = reuse-&gt;bind_inany;</div><div class='add'>+	more_reuse-&gt;has_conns = reuse-&gt;has_conns;</div><div class='add'>+	more_reuse-&gt;incoming_cpu = reuse-&gt;incoming_cpu;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(more_reuse-&gt;socks, reuse-&gt;socks,</div><div class='ctx'> 	       reuse-&gt;num_socks * sizeof(struct sock *));</div><div class='add'>+	memcpy(more_reuse-&gt;socks +</div><div class='add'>+	       (more_reuse-&gt;max_socks - more_reuse-&gt;num_closed_socks),</div><div class='add'>+	       reuse-&gt;socks + (reuse-&gt;max_socks - reuse-&gt;num_closed_socks),</div><div class='add'>+	       reuse-&gt;num_closed_socks * sizeof(struct sock *));</div><div class='ctx'> 	more_reuse-&gt;synq_overflow_ts = READ_ONCE(reuse-&gt;synq_overflow_ts);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; reuse-&gt;num_socks; ++i)</div><div class='add'>+	for (i = 0; i &lt; reuse-&gt;max_socks; ++i)</div><div class='ctx'> 		rcu_assign_pointer(reuse-&gt;socks[i]-&gt;sk_reuseport_cb,</div><div class='ctx'> 				   more_reuse);</div><div class='ctx'> </div><div class='hunk'>@@ -135,8 +305,7 @@ static void reuseport_free_rcu(struct rcu_head *head)</div><div class='ctx'> </div><div class='ctx'> 	reuse = container_of(head, struct sock_reuseport, rcu);</div><div class='ctx'> 	sk_reuseport_prog_free(rcu_dereference_protected(reuse-&gt;prog, 1));</div><div class='del'>-	if (reuse-&gt;reuseport_id)</div><div class='del'>-		ida_simple_remove(&amp;reuseport_ida, reuse-&gt;reuseport_id);</div><div class='add'>+	ida_free(&amp;reuseport_ida, reuse-&gt;reuseport_id);</div><div class='ctx'> 	kfree(reuse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -144,6 +313,8 @@ static void reuseport_free_rcu(struct rcu_head *head)</div><div class='ctx'>  *  reuseport_add_sock - Add a socket to the reuseport group of another.</div><div class='ctx'>  *  @sk:  New socket to add to the group.</div><div class='ctx'>  *  @sk2: Socket belonging to the existing reuseport group.</div><div class='add'>+ *  @bind_inany: Whether or not the group is bound to a local INANY address.</div><div class='add'>+ *</div><div class='ctx'>  *  May return ENOMEM and not add socket to group under memory pressure.</div><div class='ctx'>  */</div><div class='ctx'> int reuseport_add_sock(struct sock *sk, struct sock *sk2, bool bind_inany)</div><div class='hunk'>@@ -161,13 +332,21 @@ int reuseport_add_sock(struct sock *sk, struct sock *sk2, bool bind_inany)</div><div class='ctx'> 	reuse = rcu_dereference_protected(sk2-&gt;sk_reuseport_cb,</div><div class='ctx'> 					  lockdep_is_held(&amp;reuseport_lock));</div><div class='ctx'> 	old_reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='del'>-					     lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+					      lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+	if (old_reuse &amp;&amp; old_reuse-&gt;num_closed_socks) {</div><div class='add'>+		/* sk was shutdown()ed before */</div><div class='add'>+		int err = reuseport_resurrect(sk, old_reuse, reuse, reuse-&gt;bind_inany);</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (old_reuse &amp;&amp; old_reuse-&gt;num_socks != 1) {</div><div class='ctx'> 		spin_unlock_bh(&amp;reuseport_lock);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (reuse-&gt;num_socks == reuse-&gt;max_socks) {</div><div class='add'>+	if (reuse-&gt;num_socks + reuse-&gt;num_closed_socks == reuse-&gt;max_socks) {</div><div class='ctx'> 		reuse = reuseport_grow(reuse);</div><div class='ctx'> 		if (!reuse) {</div><div class='ctx'> 			spin_unlock_bh(&amp;reuseport_lock);</div><div class='hunk'>@@ -175,10 +354,7 @@ int reuseport_add_sock(struct sock *sk, struct sock *sk2, bool bind_inany)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reuse-&gt;socks[reuse-&gt;num_socks] = sk;</div><div class='del'>-	/* paired with smp_rmb() in reuseport_select_sock() */</div><div class='del'>-	smp_wmb();</div><div class='del'>-	reuse-&gt;num_socks++;</div><div class='add'>+	__reuseport_add_sock(sk, reuse);</div><div class='ctx'> 	rcu_assign_pointer(sk-&gt;sk_reuseport_cb, reuse);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;reuseport_lock);</div><div class='hunk'>@@ -187,38 +363,137 @@ int reuseport_add_sock(struct sock *sk, struct sock *sk2, bool bind_inany)</div><div class='ctx'> 		call_rcu(&amp;old_reuse-&gt;rcu, reuseport_free_rcu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(reuseport_add_sock);</div><div class='add'>+</div><div class='add'>+static int reuseport_resurrect(struct sock *sk, struct sock_reuseport *old_reuse,</div><div class='add'>+			       struct sock_reuseport *reuse, bool bind_inany)</div><div class='add'>+{</div><div class='add'>+	if (old_reuse == reuse) {</div><div class='add'>+		/* If sk was in the same reuseport group, just pop sk out of</div><div class='add'>+		 * the closed section and push sk into the listening section.</div><div class='add'>+		 */</div><div class='add'>+		__reuseport_detach_closed_sock(sk, old_reuse);</div><div class='add'>+		__reuseport_add_sock(sk, old_reuse);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!reuse) {</div><div class='add'>+		/* In bind()/listen() path, we cannot carry over the eBPF prog</div><div class='add'>+		 * for the shutdown()ed socket. In setsockopt() path, we should</div><div class='add'>+		 * not change the eBPF prog of listening sockets by attaching a</div><div class='add'>+		 * prog to the shutdown()ed socket. Thus, we will allocate a new</div><div class='add'>+		 * reuseport group and detach sk from the old group.</div><div class='add'>+		 */</div><div class='add'>+		int id;</div><div class='add'>+</div><div class='add'>+		reuse = __reuseport_alloc(INIT_SOCKS);</div><div class='add'>+		if (!reuse)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		id = ida_alloc(&amp;reuseport_ida, GFP_ATOMIC);</div><div class='add'>+		if (id &lt; 0) {</div><div class='add'>+			kfree(reuse);</div><div class='add'>+			return id;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reuse-&gt;reuseport_id = id;</div><div class='add'>+		reuse-&gt;bind_inany = bind_inany;</div><div class='add'>+	} else {</div><div class='add'>+		/* Move sk from the old group to the new one if</div><div class='add'>+		 * - all the other listeners in the old group were close()d or</div><div class='add'>+		 *   shutdown()ed, and then sk2 has listen()ed on the same port</div><div class='add'>+		 * OR</div><div class='add'>+		 * - sk listen()ed without bind() (or with autobind), was</div><div class='add'>+		 *   shutdown()ed, and then listen()s on another port which</div><div class='add'>+		 *   sk2 listen()s on.</div><div class='add'>+		 */</div><div class='add'>+		if (reuse-&gt;num_socks + reuse-&gt;num_closed_socks == reuse-&gt;max_socks) {</div><div class='add'>+			reuse = reuseport_grow(reuse);</div><div class='add'>+			if (!reuse)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__reuseport_detach_closed_sock(sk, old_reuse);</div><div class='add'>+	__reuseport_add_sock(sk, reuse);</div><div class='add'>+	rcu_assign_pointer(sk-&gt;sk_reuseport_cb, reuse);</div><div class='add'>+</div><div class='add'>+	if (old_reuse-&gt;num_socks + old_reuse-&gt;num_closed_socks == 0)</div><div class='add'>+		call_rcu(&amp;old_reuse-&gt;rcu, reuseport_free_rcu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void reuseport_detach_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock_reuseport *reuse;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;reuseport_lock);</div><div class='ctx'> 	reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='ctx'> 					  lockdep_is_held(&amp;reuseport_lock));</div><div class='ctx'> </div><div class='del'>-	/* At least one of the sk in this reuseport group is added to</div><div class='del'>-	 * a bpf map.  Notify the bpf side.  The bpf map logic will</div><div class='del'>-	 * remove the sk if it is indeed added to a bpf map.</div><div class='add'>+	/* reuseport_grow() has detached a closed sk */</div><div class='add'>+	if (!reuse)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Notify the bpf side. The sk may be added to a sockarray</div><div class='add'>+	 * map. If so, sockarray logic will remove it from the map.</div><div class='add'>+	 *</div><div class='add'>+	 * Other bpf map types that work with reuseport, like sockmap,</div><div class='add'>+	 * don't need an explicit callback from here. They override sk</div><div class='add'>+	 * unhash/close ops to remove the sk from the map before we</div><div class='add'>+	 * get to this point.</div><div class='ctx'> 	 */</div><div class='del'>-	if (reuse-&gt;reuseport_id)</div><div class='del'>-		bpf_sk_reuseport_detach(sk);</div><div class='add'>+	bpf_sk_reuseport_detach(sk);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(sk-&gt;sk_reuseport_cb, NULL);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; reuse-&gt;num_socks; i++) {</div><div class='del'>-		if (reuse-&gt;socks[i] == sk) {</div><div class='del'>-			reuse-&gt;socks[i] = reuse-&gt;socks[reuse-&gt;num_socks - 1];</div><div class='del'>-			reuse-&gt;num_socks--;</div><div class='del'>-			if (reuse-&gt;num_socks == 0)</div><div class='del'>-				call_rcu(&amp;reuse-&gt;rcu, reuseport_free_rcu);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!__reuseport_detach_closed_sock(sk, reuse))</div><div class='add'>+		__reuseport_detach_sock(sk, reuse);</div><div class='add'>+</div><div class='add'>+	if (reuse-&gt;num_socks + reuse-&gt;num_closed_socks == 0)</div><div class='add'>+		call_rcu(&amp;reuse-&gt;rcu, reuseport_free_rcu);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	spin_unlock_bh(&amp;reuseport_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(reuseport_detach_sock);</div><div class='ctx'> </div><div class='add'>+void reuseport_stop_listen_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_protocol == IPPROTO_TCP) {</div><div class='add'>+		struct sock_reuseport *reuse;</div><div class='add'>+		struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;reuseport_lock);</div><div class='add'>+</div><div class='add'>+		reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='add'>+						  lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+		prog = rcu_dereference_protected(reuse-&gt;prog,</div><div class='add'>+						 lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_migrate_req) ||</div><div class='add'>+		    (prog &amp;&amp; prog-&gt;expected_attach_type == BPF_SK_REUSEPORT_SELECT_OR_MIGRATE)) {</div><div class='add'>+			/* Migration capable, move sk from the listening section</div><div class='add'>+			 * to the closed section.</div><div class='add'>+			 */</div><div class='add'>+			bpf_sk_reuseport_detach(sk);</div><div class='add'>+</div><div class='add'>+			__reuseport_detach_sock(sk, reuse);</div><div class='add'>+			__reuseport_add_closed_sock(sk, reuse);</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Not capable to do migration, detach immediately */</div><div class='add'>+	reuseport_detach_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(reuseport_stop_listen_sock);</div><div class='add'>+</div><div class='ctx'> static struct sock *run_bpf_filter(struct sock_reuseport *reuse, u16 socks,</div><div class='ctx'> 				   struct bpf_prog *prog, struct sk_buff *skb,</div><div class='ctx'> 				   int hdr_len)</div><div class='hunk'>@@ -249,6 +524,37 @@ static struct sock *run_bpf_filter(struct sock_reuseport *reuse, u16 socks,</div><div class='ctx'> 	return reuse-&gt;socks[index];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sock *reuseport_select_sock_by_hash(struct sock_reuseport *reuse,</div><div class='add'>+						  u32 hash, u16 num_socks)</div><div class='add'>+{</div><div class='add'>+	struct sock *first_valid_sk = NULL;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	i = j = reciprocal_scale(hash, num_socks);</div><div class='add'>+	do {</div><div class='add'>+		struct sock *sk = reuse-&gt;socks[i];</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state != TCP_ESTABLISHED) {</div><div class='add'>+			/* Paired with WRITE_ONCE() in __reuseport_(get|put)_incoming_cpu(). */</div><div class='add'>+			if (!READ_ONCE(reuse-&gt;incoming_cpu))</div><div class='add'>+				return sk;</div><div class='add'>+</div><div class='add'>+			/* Paired with WRITE_ONCE() in reuseport_update_incoming_cpu(). */</div><div class='add'>+			if (READ_ONCE(sk-&gt;sk_incoming_cpu) == raw_smp_processor_id())</div><div class='add'>+				return sk;</div><div class='add'>+</div><div class='add'>+			if (!first_valid_sk)</div><div class='add'>+				first_valid_sk = sk;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= num_socks)</div><div class='add'>+			i = 0;</div><div class='add'>+	} while (i != j);</div><div class='add'>+</div><div class='add'>+	return first_valid_sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  reuseport_select_sock - Select a socket from an SO_REUSEPORT group.</div><div class='ctx'>  *  @sk: First socket in the group.</div><div class='hunk'>@@ -279,21 +585,21 @@ struct sock *reuseport_select_sock(struct sock *sk,</div><div class='ctx'> 	prog = rcu_dereference(reuse-&gt;prog);</div><div class='ctx'> 	socks = READ_ONCE(reuse-&gt;num_socks);</div><div class='ctx'> 	if (likely(socks)) {</div><div class='del'>-		/* paired with smp_wmb() in reuseport_add_sock() */</div><div class='add'>+		/* paired with smp_wmb() in __reuseport_add_sock() */</div><div class='ctx'> 		smp_rmb();</div><div class='ctx'> </div><div class='ctx'> 		if (!prog || !skb)</div><div class='ctx'> 			goto select_by_hash;</div><div class='ctx'> </div><div class='ctx'> 		if (prog-&gt;type == BPF_PROG_TYPE_SK_REUSEPORT)</div><div class='del'>-			sk2 = bpf_run_sk_reuseport(reuse, sk, prog, skb, hash);</div><div class='add'>+			sk2 = bpf_run_sk_reuseport(reuse, sk, prog, skb, NULL, hash);</div><div class='ctx'> 		else</div><div class='ctx'> 			sk2 = run_bpf_filter(reuse, socks, prog, skb, hdr_len);</div><div class='ctx'> </div><div class='ctx'> select_by_hash:</div><div class='ctx'> 		/* no bpf or invalid bpf result: fall back to hash usage */</div><div class='ctx'> 		if (!sk2)</div><div class='del'>-			sk2 = reuse-&gt;socks[reciprocal_scale(hash, socks)];</div><div class='add'>+			sk2 = reuseport_select_sock_by_hash(reuse, hash, socks);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -302,14 +608,90 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(reuseport_select_sock);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *  reuseport_migrate_sock - Select a socket from an SO_REUSEPORT group.</div><div class='add'>+ *  @sk: close()ed or shutdown()ed socket in the group.</div><div class='add'>+ *  @migrating_sk: ESTABLISHED/SYN_RECV full socket in the accept queue or</div><div class='add'>+ *    NEW_SYN_RECV request socket during 3WHS.</div><div class='add'>+ *  @skb: skb to run through BPF filter.</div><div class='add'>+ *  Returns a socket (with sk_refcnt +1) that should accept the child socket</div><div class='add'>+ *  (or NULL on error).</div><div class='add'>+ */</div><div class='add'>+struct sock *reuseport_migrate_sock(struct sock *sk,</div><div class='add'>+				    struct sock *migrating_sk,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock_reuseport *reuse;</div><div class='add'>+	struct sock *nsk = NULL;</div><div class='add'>+	bool allocated = false;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	u16 socks;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	reuse = rcu_dereference(sk-&gt;sk_reuseport_cb);</div><div class='add'>+	if (!reuse)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	socks = READ_ONCE(reuse-&gt;num_socks);</div><div class='add'>+	if (unlikely(!socks))</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	/* paired with smp_wmb() in __reuseport_add_sock() */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	hash = migrating_sk-&gt;sk_hash;</div><div class='add'>+	prog = rcu_dereference(reuse-&gt;prog);</div><div class='add'>+	if (!prog || prog-&gt;expected_attach_type != BPF_SK_REUSEPORT_SELECT_OR_MIGRATE) {</div><div class='add'>+		if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_migrate_req))</div><div class='add'>+			goto select_by_hash;</div><div class='add'>+		goto failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		skb = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto failure;</div><div class='add'>+		allocated = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nsk = bpf_run_sk_reuseport(reuse, sk, prog, skb, migrating_sk, hash);</div><div class='add'>+</div><div class='add'>+	if (allocated)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+select_by_hash:</div><div class='add'>+	if (!nsk)</div><div class='add'>+		nsk = reuseport_select_sock_by_hash(reuse, hash, socks);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(nsk) || unlikely(!refcount_inc_not_zero(&amp;nsk-&gt;sk_refcnt))) {</div><div class='add'>+		nsk = NULL;</div><div class='add'>+		goto failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return nsk;</div><div class='add'>+</div><div class='add'>+failure:</div><div class='add'>+	__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(reuseport_migrate_sock);</div><div class='add'>+</div><div class='ctx'> int reuseport_attach_prog(struct sock *sk, struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock_reuseport *reuse;</div><div class='ctx'> 	struct bpf_prog *old_prog;</div><div class='ctx'> </div><div class='del'>-	if (sk_unhashed(sk) &amp;&amp; sk-&gt;sk_reuseport) {</div><div class='del'>-		int err = reuseport_alloc(sk, false);</div><div class='add'>+	if (sk_unhashed(sk)) {</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='add'>+		if (!sk-&gt;sk_reuseport)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = reuseport_alloc(sk, false);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	} else if (!rcu_access_pointer(sk-&gt;sk_reuseport_cb)) {</div><div class='hunk'>@@ -329,3 +711,38 @@ int reuseport_attach_prog(struct sock *sk, struct bpf_prog *prog)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(reuseport_attach_prog);</div><div class='add'>+</div><div class='add'>+int reuseport_detach_prog(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sock_reuseport *reuse;</div><div class='add'>+	struct bpf_prog *old_prog;</div><div class='add'>+</div><div class='add'>+	old_prog = NULL;</div><div class='add'>+	spin_lock_bh(&amp;reuseport_lock);</div><div class='add'>+	reuse = rcu_dereference_protected(sk-&gt;sk_reuseport_cb,</div><div class='add'>+					  lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+</div><div class='add'>+	/* reuse must be checked after acquiring the reuseport_lock</div><div class='add'>+	 * because reuseport_grow() can detach a closed sk.</div><div class='add'>+	 */</div><div class='add'>+	if (!reuse) {</div><div class='add'>+		spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+		return sk-&gt;sk_reuseport ? -ENOENT : -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk) &amp;&amp; reuse-&gt;num_closed_socks) {</div><div class='add'>+		spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_prog = rcu_replace_pointer(reuse-&gt;prog, old_prog,</div><div class='add'>+				       lockdep_is_held(&amp;reuseport_lock));</div><div class='add'>+	spin_unlock_bh(&amp;reuseport_lock);</div><div class='add'>+</div><div class='add'>+	if (!old_prog)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	sk_reuseport_prog_free(old_prog);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(reuseport_detach_prog);</div><div class='head'>diff --git a/net/core/stream.c b/net/core/stream.c<br/>index 7d329fb1f553..7a37e7dd2c43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/stream.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/stream.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/stream.c</a></div><div class='hunk'>@@ -23,16 +23,20 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * sk_stream_write_space - stream socket write_space callback.</div><div class='del'>- * @sk: socket</div><div class='add'>+ * @sk: pointer to the socket structure</div><div class='ctx'>  *</div><div class='del'>- * FIXME: write proper description</div><div class='add'>+ * This function is invoked when there's space available in the socket's</div><div class='add'>+ * send buffer for writing. It first checks if the socket is writable,</div><div class='add'>+ * clears the SOCK_NOSPACE flag indicating that memory for writing</div><div class='add'>+ * is now available, wakes up any processes waiting for write operations</div><div class='add'>+ * and sends asynchronous notifications if needed.</div><div class='ctx'>  */</div><div class='ctx'> void sk_stream_write_space(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct socket *sock = sk-&gt;sk_socket;</div><div class='ctx'> 	struct socket_wq *wq;</div><div class='ctx'> </div><div class='del'>-	if (sk_stream_is_writeable(sk) &amp;&amp; sock) {</div><div class='add'>+	if (__sk_stream_is_writeable(sk, 1) &amp;&amp; sock) {</div><div class='ctx'> 		clear_bit(SOCK_NOSPACE, &amp;sock-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -73,13 +77,13 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p)</div><div class='ctx'> 		add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 		sk-&gt;sk_write_pending++;</div><div class='ctx'> 		done = sk_wait_event(sk, timeo_p,</div><div class='del'>-				     !sk-&gt;sk_err &amp;&amp;</div><div class='del'>-				     !((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='add'>+				     !READ_ONCE(sk-&gt;sk_err) &amp;&amp;</div><div class='add'>+				     !((1 &lt;&lt; READ_ONCE(sk-&gt;sk_state)) &amp;</div><div class='ctx'> 				       ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)), &amp;wait);</div><div class='ctx'> 		remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 		sk-&gt;sk_write_pending--;</div><div class='ctx'> 	} while (!done);</div><div class='del'>-	return 0;</div><div class='add'>+	return done &lt; 0 ? done : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sk_stream_wait_connect);</div><div class='ctx'> </div><div class='hunk'>@@ -87,9 +91,9 @@ EXPORT_SYMBOL(sk_stream_wait_connect);</div><div class='ctx'>  * sk_stream_closing - Return 1 if we still have things to send in our buffers.</div><div class='ctx'>  * @sk: socket to verify</div><div class='ctx'>  */</div><div class='del'>-static inline int sk_stream_closing(struct sock *sk)</div><div class='add'>+static int sk_stream_closing(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return (1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='add'>+	return (1 &lt;&lt; READ_ONCE(sk-&gt;sk_state)) &amp;</div><div class='ctx'> 	       (TCPF_FIN_WAIT1 | TCPF_CLOSING | TCPF_LAST_ACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -117,14 +121,13 @@ EXPORT_SYMBOL(sk_stream_wait_close);</div><div class='ctx'>  */</div><div class='ctx'> int sk_stream_wait_memory(struct sock *sk, long *timeo_p)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret, err = 0;</div><div class='ctx'> 	long vm_wait = 0;</div><div class='ctx'> 	long current_timeo = *timeo_p;</div><div class='del'>-	bool noblock = (*timeo_p ? false : true);</div><div class='ctx'> 	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> </div><div class='ctx'> 	if (sk_stream_memory_free(sk))</div><div class='del'>-		current_timeo = vm_wait = (prandom_u32() % (HZ / 5)) + 2;</div><div class='add'>+		current_timeo = vm_wait = get_random_u32_below(HZ / 5) + 2;</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> </div><div class='hunk'>@@ -133,11 +136,8 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)</div><div class='ctx'> </div><div class='ctx'> 		if (sk-&gt;sk_err || (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN))</div><div class='ctx'> 			goto do_error;</div><div class='del'>-		if (!*timeo_p) {</div><div class='del'>-			if (noblock)</div><div class='del'>-				set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='del'>-			goto do_nonblock;</div><div class='del'>-		}</div><div class='add'>+		if (!*timeo_p)</div><div class='add'>+			goto do_eagain;</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			goto do_interrupted;</div><div class='ctx'> 		sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='hunk'>@@ -146,11 +146,13 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)</div><div class='ctx'> </div><div class='ctx'> 		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='ctx'> 		sk-&gt;sk_write_pending++;</div><div class='del'>-		sk_wait_event(sk, &amp;current_timeo, sk-&gt;sk_err ||</div><div class='del'>-						  (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN) ||</div><div class='del'>-						  (sk_stream_memory_free(sk) &amp;&amp;</div><div class='del'>-						  !vm_wait), &amp;wait);</div><div class='add'>+		ret = sk_wait_event(sk, &amp;current_timeo, READ_ONCE(sk-&gt;sk_err) ||</div><div class='add'>+				    (READ_ONCE(sk-&gt;sk_shutdown) &amp; SEND_SHUTDOWN) ||</div><div class='add'>+				    (sk_stream_memory_free(sk) &amp;&amp; !vm_wait),</div><div class='add'>+				    &amp;wait);</div><div class='ctx'> 		sk-&gt;sk_write_pending--;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto do_error;</div><div class='ctx'> </div><div class='ctx'> 		if (vm_wait) {</div><div class='ctx'> 			vm_wait -= current_timeo;</div><div class='hunk'>@@ -163,13 +165,20 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)</div><div class='ctx'> 		*timeo_p = current_timeo;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> do_error:</div><div class='ctx'> 	err = -EPIPE;</div><div class='ctx'> 	goto out;</div><div class='del'>-do_nonblock:</div><div class='add'>+do_eagain:</div><div class='add'>+	/* Make sure that whenever EAGAIN is returned, EPOLLOUT event can</div><div class='add'>+	 * be generated later.</div><div class='add'>+	 * When TCP receives ACK packets that make room, tcp_check_space()</div><div class='add'>+	 * only calls tcp_new_space() if SOCK_NOSPACE is set.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> 	goto out;</div><div class='ctx'> do_interrupted:</div><div class='hunk'>@@ -193,17 +202,19 @@ void sk_stream_kill_queues(struct sock *sk)</div><div class='ctx'> 	/* First the read buffer. */</div><div class='ctx'> 	__skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> </div><div class='del'>-	/* Next, the error queue. */</div><div class='del'>-	__skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='add'>+	/* Next, the error queue.</div><div class='add'>+	 * We need to use queue lock, because other threads might</div><div class='add'>+	 * add packets to the queue without socket lock being held.</div><div class='add'>+	 */</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='ctx'> </div><div class='ctx'> 	/* Next, the write queue. */</div><div class='del'>-	WARN_ON(!skb_queue_empty(&amp;sk-&gt;sk_write_queue));</div><div class='add'>+	WARN_ON_ONCE(!skb_queue_empty(&amp;sk-&gt;sk_write_queue));</div><div class='ctx'> </div><div class='ctx'> 	/* Account for returned memory. */</div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='add'>+	sk_mem_reclaim_final(sk);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(sk-&gt;sk_wmem_queued);</div><div class='del'>-	WARN_ON(sk-&gt;sk_forward_alloc);</div><div class='add'>+	WARN_ON_ONCE(sk-&gt;sk_wmem_queued);</div><div class='ctx'> </div><div class='ctx'> 	/* It is _impossible_ for the backlog to contain anything</div><div class='ctx'> 	 * when we get here.  All user references to this socket</div><div class='head'>diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c<br/>index b1a2c5e38530..8d4decb2606f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/sysctl_net_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/sysctl_net_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/sysctl_net_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/sysctl_net_core.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Added /proc/sys/net/core directory entry (empty =) ). [MS]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -15,28 +16,126 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/isolation.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/net_ratelimit.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='ctx'> </div><div class='del'>-static int zero = 0;</div><div class='del'>-static int one = 1;</div><div class='del'>-static int two __maybe_unused = 2;</div><div class='add'>+#include "dev.h"</div><div class='add'>+#include "net-sysfs.h"</div><div class='add'>+</div><div class='add'>+static int int_3600 = 3600;</div><div class='ctx'> static int min_sndbuf = SOCK_MIN_SNDBUF;</div><div class='ctx'> static int min_rcvbuf = SOCK_MIN_RCVBUF;</div><div class='ctx'> static int max_skb_frags = MAX_SKB_FRAGS;</div><div class='add'>+static int min_mem_pcpu_rsv = SK_MEMORY_PCPU_RESERVE;</div><div class='add'>+static int netdev_budget_usecs_min = 2 * USEC_PER_SEC / HZ;</div><div class='ctx'> </div><div class='ctx'> static int net_msg_warn;	/* Unused, but still a sysctl */</div><div class='ctx'> </div><div class='ctx'> int sysctl_fb_tunnels_only_for_init_net __read_mostly = 0;</div><div class='ctx'> EXPORT_SYMBOL(sysctl_fb_tunnels_only_for_init_net);</div><div class='ctx'> </div><div class='add'>+/* 0 - Keep current behavior:</div><div class='add'>+ *     IPv4: inherit all current settings from init_net</div><div class='add'>+ *     IPv6: reset all settings to default</div><div class='add'>+ * 1 - Both inherit all current settings from init_net</div><div class='add'>+ * 2 - Both reset all settings to default</div><div class='add'>+ * 3 - Both inherit all settings from current netns</div><div class='add'>+ */</div><div class='add'>+int sysctl_devconf_inherit_init_net __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(sysctl_devconf_inherit_init_net);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_FLOW_LIMIT) || IS_ENABLED(CONFIG_RPS)</div><div class='add'>+static int dump_cpumask(void *buffer, size_t *lenp, loff_t *ppos,</div><div class='add'>+			struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	char *kbuf;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (*ppos || !*lenp) {</div><div class='add'>+		*lenp = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CPUs are displayed as a hex bitmap + a comma between each groups of 8</div><div class='add'>+	 * nibbles (except the last one which has a newline instead).</div><div class='add'>+	 * Guesstimate the buffer size at the group granularity level.</div><div class='add'>+	 */</div><div class='add'>+	len = min(DIV_ROUND_UP(nr_cpumask_bits, 32) * (8 + 1), *lenp);</div><div class='add'>+	kbuf = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!kbuf) {</div><div class='add'>+		*lenp = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = scnprintf(kbuf, len, "%*pb", cpumask_pr_args(mask));</div><div class='add'>+	if (!len) {</div><div class='add'>+		*lenp = 0;</div><div class='add'>+		goto free_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* scnprintf writes a trailing null char not counted in the returned</div><div class='add'>+	 * length, override it with a newline.</div><div class='add'>+	 */</div><div class='add'>+	kbuf[len++] = '\n';</div><div class='add'>+	memcpy(buffer, kbuf, len);</div><div class='add'>+	*lenp = len;</div><div class='add'>+	*ppos += len;</div><div class='add'>+</div><div class='add'>+free_buf:</div><div class='add'>+	kfree(kbuf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-static int rps_sock_flow_sysctl(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+</div><div class='add'>+DEFINE_MUTEX(rps_default_mask_mutex);</div><div class='add'>+</div><div class='add'>+static int rps_default_mask_sysctl(const struct ctl_table *table, int write,</div><div class='add'>+				   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct net *net = (struct net *)table-&gt;data;</div><div class='add'>+	struct cpumask *mask;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rps_default_mask_mutex);</div><div class='add'>+	mask = net-&gt;core.rps_default_mask;</div><div class='add'>+	if (write) {</div><div class='add'>+		if (!mask) {</div><div class='add'>+			mask = kzalloc(cpumask_size(), GFP_KERNEL);</div><div class='add'>+			net-&gt;core.rps_default_mask = mask;</div><div class='add'>+		}</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		if (!mask)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		err = cpumask_parse(buffer, mask);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		err = rps_cpumask_housekeeping(mask);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+	} else {</div><div class='add'>+		err = dump_cpumask(buffer, lenp, ppos,</div><div class='add'>+				   mask ?: cpu_none_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mutex_unlock(&amp;rps_default_mask_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rps_sock_flow_sysctl(const struct ctl_table *table, int write,</div><div class='add'>+				void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int orig_size, size;</div><div class='ctx'> 	int ret, i;</div><div class='hunk'>@@ -50,7 +149,8 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sock_flow_mutex);</div><div class='ctx'> </div><div class='del'>-	orig_sock_table = rcu_dereference_protected(rps_sock_flow_table,</div><div class='add'>+	orig_sock_table = rcu_dereference_protected(</div><div class='add'>+					net_hotdata.rps_sock_flow_table,</div><div class='ctx'> 					lockdep_is_held(&amp;sock_flow_mutex));</div><div class='ctx'> 	size = orig_size = orig_sock_table ? orig_sock_table-&gt;mask + 1 : 0;</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +171,8 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> 					mutex_unlock(&amp;sock_flow_mutex);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='del'>-				rps_cpu_mask = roundup_pow_of_two(nr_cpu_ids) - 1;</div><div class='add'>+				net_hotdata.rps_cpu_mask =</div><div class='add'>+					roundup_pow_of_two(nr_cpu_ids) - 1;</div><div class='ctx'> 				sock_table-&gt;mask = size - 1;</div><div class='ctx'> 			} else</div><div class='ctx'> 				sock_table = orig_sock_table;</div><div class='hunk'>@@ -82,16 +183,16 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> 			sock_table = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (sock_table != orig_sock_table) {</div><div class='del'>-			rcu_assign_pointer(rps_sock_flow_table, sock_table);</div><div class='add'>+			rcu_assign_pointer(net_hotdata.rps_sock_flow_table,</div><div class='add'>+					   sock_table);</div><div class='ctx'> 			if (sock_table) {</div><div class='del'>-				static_key_slow_inc(&amp;rps_needed);</div><div class='del'>-				static_key_slow_inc(&amp;rfs_needed);</div><div class='add'>+				static_branch_inc(&amp;rps_needed);</div><div class='add'>+				static_branch_inc(&amp;rfs_needed);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (orig_sock_table) {</div><div class='del'>-				static_key_slow_dec(&amp;rps_needed);</div><div class='del'>-				static_key_slow_dec(&amp;rfs_needed);</div><div class='del'>-				synchronize_rcu();</div><div class='del'>-				vfree(orig_sock_table);</div><div class='add'>+				static_branch_dec(&amp;rps_needed);</div><div class='add'>+				static_branch_dec(&amp;rfs_needed);</div><div class='add'>+				kvfree_rcu(orig_sock_table, rcu);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -105,9 +206,8 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> #ifdef CONFIG_NET_FLOW_LIMIT</div><div class='ctx'> static DEFINE_MUTEX(flow_limit_update_mutex);</div><div class='ctx'> </div><div class='del'>-static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,</div><div class='del'>-				 void __user *buffer, size_t *lenp,</div><div class='del'>-				 loff_t *ppos)</div><div class='add'>+static int flow_limit_cpu_sysctl(const struct ctl_table *table, int write,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd_flow_limit *cur;</div><div class='ctx'> 	struct softnet_data *sd;</div><div class='hunk'>@@ -118,7 +218,7 @@ static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (write) {</div><div class='del'>-		ret = cpumask_parse_user(buffer, *lenp, mask);</div><div class='add'>+		ret = cpumask_parse(buffer, mask);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='hunk'>@@ -130,8 +230,7 @@ static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> 				     lockdep_is_held(&amp;flow_limit_update_mutex));</div><div class='ctx'> 			if (cur &amp;&amp; !cpumask_test_cpu(i, mask)) {</div><div class='ctx'> 				RCU_INIT_POINTER(sd-&gt;flow_limit, NULL);</div><div class='del'>-				synchronize_rcu();</div><div class='del'>-				kfree(cur);</div><div class='add'>+				kfree_rcu(cur, rcu);</div><div class='ctx'> 			} else if (!cur &amp;&amp; cpumask_test_cpu(i, mask)) {</div><div class='ctx'> 				cur = kzalloc_node(len, GFP_KERNEL,</div><div class='ctx'> 						   cpu_to_node(i));</div><div class='hunk'>@@ -140,20 +239,13 @@ static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> 					ret = -ENOMEM;</div><div class='ctx'> 					goto write_unlock;</div><div class='ctx'> 				}</div><div class='del'>-				cur-&gt;num_buckets = netdev_flow_limit_table_len;</div><div class='add'>+				cur-&gt;log_buckets = ilog2(netdev_flow_limit_table_len);</div><div class='ctx'> 				rcu_assign_pointer(sd-&gt;flow_limit, cur);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> write_unlock:</div><div class='ctx'> 		mutex_unlock(&amp;flow_limit_update_mutex);</div><div class='ctx'> 	} else {</div><div class='del'>-		char kbuf[128];</div><div class='del'>-</div><div class='del'>-		if (*ppos || !*lenp) {</div><div class='del'>-			*lenp = 0;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		cpumask_clear(mask);</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		for_each_possible_cpu(i) {</div><div class='hunk'>@@ -163,20 +255,7 @@ write_unlock:</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		len = min(sizeof(kbuf) - 1, *lenp);</div><div class='del'>-		len = scnprintf(kbuf, len, "%*pb", cpumask_pr_args(mask));</div><div class='del'>-		if (!len) {</div><div class='del'>-			*lenp = 0;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		if (len &lt; *lenp)</div><div class='del'>-			kbuf[len++] = '\n';</div><div class='del'>-		if (copy_to_user(buffer, kbuf, len)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		*lenp = len;</div><div class='del'>-		*ppos += len;</div><div class='add'>+		ret = dump_cpumask(buffer, lenp, ppos, mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -184,9 +263,8 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int flow_limit_table_len_sysctl(struct ctl_table *table, int write,</div><div class='del'>-				       void __user *buffer, size_t *lenp,</div><div class='del'>-				       loff_t *ppos)</div><div class='add'>+static int flow_limit_table_len_sysctl(const struct ctl_table *table, int write,</div><div class='add'>+				       void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old, *ptr;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -207,8 +285,8 @@ static int flow_limit_table_len_sysctl(struct ctl_table *table, int write,</div><div class='ctx'> #endif /* CONFIG_NET_FLOW_LIMIT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_SCHED</div><div class='del'>-static int set_default_qdisc(struct ctl_table *table, int write,</div><div class='del'>-			     void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int set_default_qdisc(const struct ctl_table *table, int write,</div><div class='add'>+			     void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	char id[IFNAMSIZ];</div><div class='ctx'> 	struct ctl_table tbl = {</div><div class='hunk'>@@ -226,23 +304,26 @@ static int set_default_qdisc(struct ctl_table *table, int write,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int proc_do_dev_weight(struct ctl_table *table, int write,</div><div class='del'>-			   void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_do_dev_weight(const struct ctl_table *table, int write,</div><div class='add'>+			   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = proc_dointvec(table, write, buffer, lenp, ppos);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	dev_rx_weight = weight_p * dev_weight_rx_bias;</div><div class='del'>-	dev_tx_weight = weight_p * dev_weight_tx_bias;</div><div class='add'>+	static DEFINE_MUTEX(dev_weight_mutex);</div><div class='add'>+	int ret, weight;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev_weight_mutex);</div><div class='add'>+	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	if (!ret &amp;&amp; write) {</div><div class='add'>+		weight = READ_ONCE(weight_p);</div><div class='add'>+		WRITE_ONCE(net_hotdata.dev_rx_weight, weight * dev_weight_rx_bias);</div><div class='add'>+		WRITE_ONCE(net_hotdata.dev_tx_weight, weight * dev_weight_tx_bias);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev_weight_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_do_rss_key(struct ctl_table *table, int write,</div><div class='del'>-			   void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_do_rss_key(const struct ctl_table *table, int write,</div><div class='add'>+			   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table fake_table;</div><div class='ctx'> 	char buf[NETDEV_RSS_KEY_LEN * 3];</div><div class='hunk'>@@ -254,11 +335,13 @@ static int proc_do_rss_key(struct ctl_table *table, int write,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BPF_JIT</div><div class='del'>-static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,</div><div class='del'>-					   void __user *buffer, size_t *lenp,</div><div class='add'>+static int proc_dointvec_minmax_bpf_enable(const struct ctl_table *table, int write,</div><div class='add'>+					   void *buffer, size_t *lenp,</div><div class='ctx'> 					   loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, jit_enable = *(int *)table-&gt;data;</div><div class='add'>+	int min = *(int *)table-&gt;extra1;</div><div class='add'>+	int max = *(int *)table-&gt;extra2;</div><div class='ctx'> 	struct ctl_table tmp = *table;</div><div class='ctx'> </div><div class='ctx'> 	if (write &amp;&amp; !capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -268,7 +351,7 @@ static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,</div><div class='ctx'> 	ret = proc_dointvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='ctx'> 	if (write &amp;&amp; !ret) {</div><div class='ctx'> 		if (jit_enable &lt; 2 ||</div><div class='del'>-		    (jit_enable == 2 &amp;&amp; bpf_dump_raw_ok())) {</div><div class='add'>+		    (jit_enable == 2 &amp;&amp; bpf_dump_raw_ok(current_cred()))) {</div><div class='ctx'> 			*(int *)table-&gt;data = jit_enable;</div><div class='ctx'> 			if (jit_enable == 2)</div><div class='ctx'> 				pr_warn("bpf_jit_enable = 2 was set! NEVER use this in production, only for JIT debugging!\n");</div><div class='hunk'>@@ -276,56 +359,44 @@ static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; ret &amp;&amp; min == max)</div><div class='add'>+		pr_info_once("CONFIG_BPF_JIT_ALWAYS_ON is enabled, bpf_jit_enable is permanently set to 1.\n");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> # ifdef CONFIG_HAVE_EBPF_JIT</div><div class='ctx'> static int</div><div class='del'>-proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write,</div><div class='del'>-				    void __user *buffer, size_t *lenp,</div><div class='del'>-				    loff_t *ppos)</div><div class='add'>+proc_dointvec_minmax_bpf_restricted(const struct ctl_table *table, int write,</div><div class='add'>+				    void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	return proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='del'>-# endif</div><div class='add'>+# endif /* CONFIG_HAVE_EBPF_JIT */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+proc_dolongvec_minmax_bpf_restricted(const struct ctl_table *table, int write,</div><div class='add'>+				     void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table net_core_table[] = {</div><div class='del'>-#ifdef CONFIG_NET</div><div class='del'>-	{</div><div class='del'>-		.procname	= "wmem_max",</div><div class='del'>-		.data		= &amp;sysctl_wmem_max,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;min_sndbuf,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "rmem_max",</div><div class='del'>-		.data		= &amp;sysctl_rmem_max,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;min_rcvbuf,</div><div class='del'>-	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "wmem_default",</div><div class='del'>-		.data		= &amp;sysctl_wmem_default,</div><div class='add'>+		.procname	= "mem_pcpu_rsv",</div><div class='add'>+		.data		= &amp;net_hotdata.sysctl_mem_pcpu_rsv,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;min_sndbuf,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "rmem_default",</div><div class='del'>-		.data		= &amp;sysctl_rmem_default,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;min_rcvbuf,</div><div class='add'>+		.extra1		= &amp;min_mem_pcpu_rsv,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "dev_weight",</div><div class='hunk'>@@ -333,6 +404,7 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_do_dev_weight,</div><div class='add'>+		.extra1         = SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "dev_weight_rx_bias",</div><div class='hunk'>@@ -340,6 +412,7 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_do_dev_weight,</div><div class='add'>+		.extra1         = SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "dev_weight_tx_bias",</div><div class='hunk'>@@ -347,10 +420,11 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_do_dev_weight,</div><div class='add'>+		.extra1         = SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "netdev_max_backlog",</div><div class='del'>-		.data		= &amp;netdev_max_backlog,</div><div class='add'>+		.data		= &amp;net_hotdata.max_backlog,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='hunk'>@@ -370,11 +444,11 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax_bpf_enable,</div><div class='ctx'> # ifdef CONFIG_BPF_JIT_ALWAYS_ON</div><div class='del'>-		.extra1		= &amp;one,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> # else</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;two,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='ctx'> # endif</div><div class='ctx'> 	},</div><div class='ctx'> # ifdef CONFIG_HAVE_EBPF_JIT</div><div class='hunk'>@@ -384,8 +458,8 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0600,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax_bpf_restricted,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;two,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bpf_jit_kallsyms",</div><div class='hunk'>@@ -393,14 +467,23 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0600,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax_bpf_restricted,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> # endif</div><div class='add'>+	{</div><div class='add'>+		.procname	= "bpf_jit_limit",</div><div class='add'>+		.data		= &amp;bpf_jit_limit,</div><div class='add'>+		.maxlen		= sizeof(long),</div><div class='add'>+		.mode		= 0600,</div><div class='add'>+		.proc_handler	= proc_dolongvec_minmax_bpf_restricted,</div><div class='add'>+		.extra1		= SYSCTL_LONG_ONE,</div><div class='add'>+		.extra2		= &amp;bpf_jit_limit_max,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "netdev_tstamp_prequeue",</div><div class='del'>-		.data		= &amp;netdev_tstamp_prequeue,</div><div class='add'>+		.data		= &amp;net_hotdata.tstamp_prequeue,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='hunk'>@@ -419,22 +502,6 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "optmem_max",</div><div class='del'>-		.data		= &amp;sysctl_optmem_max,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "tstamp_allow_data",</div><div class='del'>-		.data		= &amp;sysctl_tstamp_allow_data,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one</div><div class='del'>-	},</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "rps_sock_flow_entries",</div><div class='hunk'>@@ -464,7 +531,7 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "busy_read",</div><div class='hunk'>@@ -472,7 +539,7 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_NET_SCHED</div><div class='hunk'>@@ -483,10 +550,9 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.proc_handler	= set_default_qdisc</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-#endif /* CONFIG_NET */</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "netdev_budget",</div><div class='del'>-		.data		= &amp;netdev_budget,</div><div class='add'>+		.data		= &amp;net_hotdata.netdev_budget,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='hunk'>@@ -500,20 +566,20 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max_skb_frags",</div><div class='del'>-		.data		= &amp;sysctl_max_skb_frags,</div><div class='add'>+		.data		= &amp;net_hotdata.sysctl_max_skb_frags,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='ctx'> 		.extra2		= &amp;max_skb_frags,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "netdev_budget_usecs",</div><div class='del'>-		.data		= &amp;netdev_budget_usecs,</div><div class='add'>+		.data		= &amp;net_hotdata.netdev_budget_usecs,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='add'>+		.extra1		= &amp;netdev_budget_usecs_min,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fb_tunnels_only_for_init_net",</div><div class='hunk'>@@ -521,43 +587,184 @@ static struct ctl_table net_core_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "devconf_inherit_init_net",</div><div class='add'>+		.data		= &amp;sysctl_devconf_inherit_init_net,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_THREE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "high_order_alloc_disable",</div><div class='add'>+		.data		= &amp;net_high_order_alloc_disable_key.key,</div><div class='add'>+		.maxlen         = sizeof(net_high_order_alloc_disable_key),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_do_static_key,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "gro_normal_batch",</div><div class='add'>+		.data		= &amp;net_hotdata.gro_normal_batch,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "netdev_unregister_timeout_secs",</div><div class='add'>+		.data		= &amp;netdev_unregister_timeout_secs,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= &amp;int_3600,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "skb_defer_max",</div><div class='add'>+		.data		= &amp;net_hotdata.sysctl_skb_defer_max,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table netns_core_table[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_RPS)</div><div class='add'>+	{</div><div class='add'>+		.procname	= "rps_default_mask",</div><div class='add'>+		.data		= &amp;init_net,</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= rps_default_mask_sysctl</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "somaxconn",</div><div class='ctx'> 		.data		= &amp;init_net.core.sysctl_somaxconn,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.procname	= "optmem_max",</div><div class='add'>+		.data		= &amp;init_net.core.sysctl_optmem_max,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "txrehash",</div><div class='add'>+		.data		= &amp;init_net.core.sysctl_txrehash,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "txq_reselection_ms",</div><div class='add'>+		.data		= &amp;init_net.core.sysctl_txq_reselection,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_ms_jiffies,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tstamp_allow_data",</div><div class='add'>+		.data		= &amp;init_net.core.sysctl_tstamp_allow_data,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "bypass_prot_mem",</div><div class='add'>+		.data		= &amp;init_net.core.sysctl_bypass_prot_mem,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	/* sysctl_core_net_init() will set the values after this</div><div class='add'>+	 * to readonly in network namespaces</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		.procname	= "wmem_max",</div><div class='add'>+		.data		= &amp;sysctl_wmem_max,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;min_sndbuf,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "rmem_max",</div><div class='add'>+		.data		= &amp;sysctl_rmem_max,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;min_rcvbuf,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "wmem_default",</div><div class='add'>+		.data		= &amp;sysctl_wmem_default,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;min_sndbuf,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "rmem_default",</div><div class='add'>+		.data		= &amp;sysctl_rmem_default,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;min_rcvbuf,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __init fb_tunnels_only_for_init_net_sysctl_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	/* fallback tunnels for initns only */</div><div class='add'>+	if (!strncmp(str, "initns", 6))</div><div class='add'>+		sysctl_fb_tunnels_only_for_init_net = 1;</div><div class='add'>+	/* no fallback tunnels anywhere */</div><div class='add'>+	else if (!strncmp(str, "none", 4))</div><div class='add'>+		sysctl_fb_tunnels_only_for_init_net = 2;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("fb_tunnels=", fb_tunnels_only_for_init_net_sysctl_setup);</div><div class='add'>+</div><div class='ctx'> static __net_init int sysctl_core_net_init(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	size_t table_size = ARRAY_SIZE(netns_core_table);</div><div class='ctx'> 	struct ctl_table *tbl;</div><div class='ctx'> </div><div class='ctx'> 	tbl = netns_core_table;</div><div class='ctx'> 	if (!net_eq(net, &amp;init_net)) {</div><div class='add'>+		int i;</div><div class='ctx'> 		tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);</div><div class='ctx'> 		if (tbl == NULL)</div><div class='ctx'> 			goto err_dup;</div><div class='ctx'> </div><div class='del'>-		tbl[0].data = &amp;net-&gt;core.sysctl_somaxconn;</div><div class='add'>+		for (i = 0; i &lt; table_size; ++i) {</div><div class='add'>+			if (tbl[i].data == &amp;sysctl_wmem_max)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		/* Don't export any sysctls to unprivileged users */</div><div class='del'>-		if (net-&gt;user_ns != &amp;init_user_ns) {</div><div class='del'>-			tbl[0].procname = NULL;</div><div class='add'>+			tbl[i].data += (char *)net - (char *)&amp;init_net;</div><div class='ctx'> 		}</div><div class='add'>+		for (; i &lt; table_size; ++i)</div><div class='add'>+			tbl[i].mode &amp;= ~0222;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	net-&gt;core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);</div><div class='add'>+	net-&gt;core.sysctl_hdr = register_net_sysctl_sz(net, "net/core", tbl, table_size);</div><div class='ctx'> 	if (net-&gt;core.sysctl_hdr == NULL)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -572,11 +779,14 @@ err_dup:</div><div class='ctx'> </div><div class='ctx'> static __net_exit void sysctl_core_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *tbl;</div><div class='add'>+	const struct ctl_table *tbl;</div><div class='ctx'> </div><div class='ctx'> 	tbl = net-&gt;core.sysctl_hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	unregister_net_sysctl_table(net-&gt;core.sysctl_hdr);</div><div class='ctx'> 	BUG_ON(tbl == netns_core_table);</div><div class='add'>+#if IS_ENABLED(CONFIG_RPS)</div><div class='add'>+	kfree(net-&gt;core.rps_default_mask);</div><div class='add'>+#endif</div><div class='ctx'> 	kfree(tbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/core/timestamping.c b/net/core/timestamping.c<br/>index 42689d5c468c..a50a7ef49ae8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/timestamping.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/timestamping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/timestamping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/timestamping.c</a></div><div class='hunk'>@@ -1,32 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * PTP 1588 clock support - support for timestamping in PHY devices</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 OMICRON electronics GmbH</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/ptp_classify.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int classify(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(skb-&gt;dev &amp;&amp; skb-&gt;dev-&gt;phydev &amp;&amp;</div><div class='del'>-		   skb-&gt;dev-&gt;phydev-&gt;drv))</div><div class='add'>+		   skb-&gt;dev-&gt;phydev-&gt;mii_ts))</div><div class='ctx'> 		return ptp_classify_raw(skb);</div><div class='ctx'> 	else</div><div class='ctx'> 		return PTP_CLASS_NONE;</div><div class='hunk'>@@ -34,35 +22,77 @@ static unsigned int classify(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void skb_clone_tx_timestamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+	struct mii_timestamper *mii_ts;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	struct sk_buff *clone;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;sk)</div><div class='add'>+	if (!skb-&gt;sk || !skb-&gt;dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hwprov = rcu_dereference(skb-&gt;dev-&gt;hwprov);</div><div class='add'>+	if (hwprov) {</div><div class='add'>+		if (hwprov-&gt;source != HWTSTAMP_SOURCE_PHYLIB ||</div><div class='add'>+		    !hwprov-&gt;phydev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phydev = hwprov-&gt;phydev;</div><div class='add'>+	} else {</div><div class='add'>+		phydev = skb-&gt;dev-&gt;phydev;</div><div class='add'>+		if (!phy_is_default_hwtstamp(phydev)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	type = classify(skb);</div><div class='ctx'> 	if (type == PTP_CLASS_NONE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	phydev = skb-&gt;dev-&gt;phydev;</div><div class='del'>-	if (likely(phydev-&gt;drv-&gt;txtstamp)) {</div><div class='add'>+	mii_ts = phydev-&gt;mii_ts;</div><div class='add'>+	if (likely(mii_ts-&gt;txtstamp)) {</div><div class='ctx'> 		clone = skb_clone_sk(skb);</div><div class='ctx'> 		if (!clone)</div><div class='ctx'> 			return;</div><div class='del'>-		phydev-&gt;drv-&gt;txtstamp(phydev, clone, type);</div><div class='add'>+		mii_ts-&gt;txtstamp(mii_ts, clone, type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(skb_clone_tx_timestamp);</div><div class='ctx'> </div><div class='ctx'> bool skb_defer_rx_timestamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+	struct mii_timestamper *mii_ts;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;dev || !skb-&gt;dev-&gt;phydev || !skb-&gt;dev-&gt;phydev-&gt;drv)</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hwprov = rcu_dereference(skb-&gt;dev-&gt;hwprov);</div><div class='add'>+	if (hwprov) {</div><div class='add'>+		if (hwprov-&gt;source != HWTSTAMP_SOURCE_PHYLIB ||</div><div class='add'>+		    !hwprov-&gt;phydev) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phydev = hwprov-&gt;phydev;</div><div class='add'>+	} else {</div><div class='add'>+		phydev = skb-&gt;dev-&gt;phydev;</div><div class='add'>+		if (!phy_is_default_hwtstamp(phydev)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (skb_headroom(skb) &lt; ETH_HLEN)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -75,9 +105,9 @@ bool skb_defer_rx_timestamp(struct sk_buff *skb)</div><div class='ctx'> 	if (type == PTP_CLASS_NONE)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	phydev = skb-&gt;dev-&gt;phydev;</div><div class='del'>-	if (likely(phydev-&gt;drv-&gt;rxtstamp))</div><div class='del'>-		return phydev-&gt;drv-&gt;rxtstamp(phydev, skb, type);</div><div class='add'>+	mii_ts = phydev-&gt;mii_ts;</div><div class='add'>+	if (likely(mii_ts-&gt;rxtstamp))</div><div class='add'>+		return mii_ts-&gt;rxtstamp(mii_ts, skb, type);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/core/tso.c b/net/core/tso.c<br/>index 43f4eba61933..6df997b9076e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/tso.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/tso.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/tso.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/tso.c</a></div><div class='hunk'>@@ -3,21 +3,12 @@</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/tso.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Calculate expected number of TX descriptors */</div><div class='del'>-int tso_count_descs(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	/* The Marvell Way */</div><div class='del'>-	return skb_shinfo(skb)-&gt;gso_segs * 2 + skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tso_count_descs);</div><div class='del'>-</div><div class='del'>-void tso_build_hdr(struct sk_buff *skb, char *hdr, struct tso_t *tso,</div><div class='add'>+void tso_build_hdr(const struct sk_buff *skb, char *hdr, struct tso_t *tso,</div><div class='ctx'> 		   int size, bool is_last)</div><div class='ctx'> {</div><div class='del'>-	struct tcphdr *tcph;</div><div class='del'>-	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+	int hdr_len = skb_transport_offset(skb) + tso-&gt;tlen;</div><div class='ctx'> 	int mac_hdr_len = skb_network_offset(skb);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hdr, skb-&gt;data, hdr_len);</div><div class='hunk'>@@ -30,23 +21,31 @@ void tso_build_hdr(struct sk_buff *skb, char *hdr, struct tso_t *tso,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ipv6hdr *iph = (void *)(hdr + mac_hdr_len);</div><div class='ctx'> </div><div class='del'>-		iph-&gt;payload_len = htons(size + tcp_hdrlen(skb));</div><div class='add'>+		iph-&gt;payload_len = htons(size + tso-&gt;tlen);</div><div class='ctx'> 	}</div><div class='del'>-	tcph = (struct tcphdr *)(hdr + skb_transport_offset(skb));</div><div class='del'>-	put_unaligned_be32(tso-&gt;tcp_seq, &amp;tcph-&gt;seq);</div><div class='add'>+	hdr += skb_transport_offset(skb);</div><div class='add'>+	if (tso-&gt;tlen != sizeof(struct udphdr)) {</div><div class='add'>+		struct tcphdr *tcph = (struct tcphdr *)hdr;</div><div class='add'>+</div><div class='add'>+		put_unaligned_be32(tso-&gt;tcp_seq, &amp;tcph-&gt;seq);</div><div class='add'>+</div><div class='add'>+		if (!is_last) {</div><div class='add'>+			/* Clear all special flags for not last packet */</div><div class='add'>+			tcph-&gt;psh = 0;</div><div class='add'>+			tcph-&gt;fin = 0;</div><div class='add'>+			tcph-&gt;rst = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct udphdr *uh = (struct udphdr *)hdr;</div><div class='ctx'> </div><div class='del'>-	if (!is_last) {</div><div class='del'>-		/* Clear all special flags for not last packet */</div><div class='del'>-		tcph-&gt;psh = 0;</div><div class='del'>-		tcph-&gt;fin = 0;</div><div class='del'>-		tcph-&gt;rst = 0;</div><div class='add'>+		uh-&gt;len = htons(sizeof(*uh) + size);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tso_build_hdr);</div><div class='ctx'> </div><div class='del'>-void tso_build_data(struct sk_buff *skb, struct tso_t *tso, int size)</div><div class='add'>+void tso_build_data(const struct sk_buff *skb, struct tso_t *tso, int size)</div><div class='ctx'> {</div><div class='del'>-	tso-&gt;tcp_seq += size;</div><div class='add'>+	tso-&gt;tcp_seq += size; /* not worth avoiding this operation for UDP */</div><div class='ctx'> 	tso-&gt;size -= size;</div><div class='ctx'> 	tso-&gt;data += size;</div><div class='ctx'> </div><div class='hunk'>@@ -55,19 +54,21 @@ void tso_build_data(struct sk_buff *skb, struct tso_t *tso, int size)</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[tso-&gt;next_frag_idx];</div><div class='ctx'> </div><div class='ctx'> 		/* Move to next segment */</div><div class='del'>-		tso-&gt;size = frag-&gt;size;</div><div class='del'>-		tso-&gt;data = page_address(frag-&gt;page.p) + frag-&gt;page_offset;</div><div class='add'>+		tso-&gt;size = skb_frag_size(frag);</div><div class='add'>+		tso-&gt;data = skb_frag_address(frag);</div><div class='ctx'> 		tso-&gt;next_frag_idx++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tso_build_data);</div><div class='ctx'> </div><div class='del'>-void tso_start(struct sk_buff *skb, struct tso_t *tso)</div><div class='add'>+int tso_start(struct sk_buff *skb, struct tso_t *tso)</div><div class='ctx'> {</div><div class='del'>-	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+	int tlen = skb_is_gso_tcp(skb) ? tcp_hdrlen(skb) : sizeof(struct udphdr);</div><div class='add'>+	int hdr_len = skb_transport_offset(skb) + tlen;</div><div class='ctx'> </div><div class='add'>+	tso-&gt;tlen = tlen;</div><div class='ctx'> 	tso-&gt;ip_id = ntohs(ip_hdr(skb)-&gt;id);</div><div class='del'>-	tso-&gt;tcp_seq = ntohl(tcp_hdr(skb)-&gt;seq);</div><div class='add'>+	tso-&gt;tcp_seq = (tlen != sizeof(struct udphdr)) ? ntohl(tcp_hdr(skb)-&gt;seq) : 0;</div><div class='ctx'> 	tso-&gt;next_frag_idx = 0;</div><div class='ctx'> 	tso-&gt;ipv6 = vlan_get_protocol(skb) == htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='hunk'>@@ -79,9 +80,10 @@ void tso_start(struct sk_buff *skb, struct tso_t *tso)</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[tso-&gt;next_frag_idx];</div><div class='ctx'> </div><div class='ctx'> 		/* Move to next segment */</div><div class='del'>-		tso-&gt;size = frag-&gt;size;</div><div class='del'>-		tso-&gt;data = page_address(frag-&gt;page.p) + frag-&gt;page_offset;</div><div class='add'>+		tso-&gt;size = skb_frag_size(frag);</div><div class='add'>+		tso-&gt;data = skb_frag_address(frag);</div><div class='ctx'> 		tso-&gt;next_frag_idx++;</div><div class='ctx'> 	}</div><div class='add'>+	return hdr_len;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tso_start);</div><div class='head'>diff --git a/net/core/utils.c b/net/core/utils.c<br/>index 2a597ac7808e..5e63b0ea21f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/utils.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/utils.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *	Generic address resultion entity</div><div class='add'>+ *	Generic address resolution entity</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	net_random Alan Cox</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *	in{4,6}_pton YOSHIFUJI Hideaki, Copyright (C)2006 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='ctx'>  *	Created by Alexey Kuznetsov &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -306,7 +302,7 @@ static int inet4_pton(const char *src, u16 port_num,</div><div class='ctx'> 		struct sockaddr_storage *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;</div><div class='del'>-	int srclen = strlen(src);</div><div class='add'>+	size_t srclen = strlen(src);</div><div class='ctx'> </div><div class='ctx'> 	if (srclen &gt; INET_ADDRSTRLEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -326,7 +322,7 @@ static int inet6_pton(struct net *net, const char *src, u16 port_num,</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;</div><div class='ctx'> 	const char *scope_delim;</div><div class='del'>-	int srclen = strlen(src);</div><div class='add'>+	size_t srclen = strlen(src);</div><div class='ctx'> </div><div class='ctx'> 	if (srclen &gt; INET6_ADDRSTRLEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -403,9 +399,9 @@ int inet_pton_with_scope(struct net *net, __kernel_sa_family_t af,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_pton_with_scope);</div><div class='ctx'> </div><div class='del'>-bool inet_addr_is_any(struct sockaddr *addr)</div><div class='add'>+bool inet_addr_is_any(struct sockaddr_storage *addr)</div><div class='ctx'> {</div><div class='del'>-	if (addr-&gt;sa_family == AF_INET6) {</div><div class='add'>+	if (addr-&gt;ss_family == AF_INET6) {</div><div class='ctx'> 		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;</div><div class='ctx'> 		const struct sockaddr_in6 in6_any =</div><div class='ctx'> 			{ .sin6_addr = IN6ADDR_ANY_INIT };</div><div class='hunk'>@@ -413,13 +409,13 @@ bool inet_addr_is_any(struct sockaddr *addr)</div><div class='ctx'> 		if (!memcmp(in6-&gt;sin6_addr.s6_addr,</div><div class='ctx'> 			    in6_any.sin6_addr.s6_addr, 16))</div><div class='ctx'> 			return true;</div><div class='del'>-	} else if (addr-&gt;sa_family == AF_INET) {</div><div class='add'>+	} else if (addr-&gt;ss_family == AF_INET) {</div><div class='ctx'> 		struct sockaddr_in *in = (struct sockaddr_in *)addr;</div><div class='ctx'> </div><div class='ctx'> 		if (in-&gt;sin_addr.s_addr == htonl(INADDR_ANY))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_warn("unexpected address family %u\n", addr-&gt;sa_family);</div><div class='add'>+		pr_warn("unexpected address family %u\n", addr-&gt;ss_family);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -442,6 +438,23 @@ void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_proto_csum_replace4);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * inet_proto_csum_replace16 - update layer 4 header checksum field</div><div class='add'>+ * @sum: Layer 4 header checksum field</div><div class='add'>+ * @skb: sk_buff for the packet</div><div class='add'>+ * @from: old IPv6 address</div><div class='add'>+ * @to: new IPv6 address</div><div class='add'>+ * @pseudohdr: True if layer 4 header checksum includes pseudoheader</div><div class='add'>+ *</div><div class='add'>+ * Update layer 4 header as per the update in IPv6 src/dst address.</div><div class='add'>+ *</div><div class='add'>+ * There is no need to update skb-&gt;csum in this function, because update in two</div><div class='add'>+ * fields a.) IPv6 src/dst address and b.) L4 header checksum cancels each other</div><div class='add'>+ * for skb-&gt;csum calculation. Whereas inet_proto_csum_replace4 function needs to</div><div class='add'>+ * update skb-&gt;csum, because update in 3 fields a.) IPv4 src/dst address,</div><div class='add'>+ * b.) IPv4 Header checksum and c.) L4 header checksum results in same diff as</div><div class='add'>+ * L4 Header checksum for skb-&gt;csum calculation.</div><div class='add'>+ */</div><div class='ctx'> void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,</div><div class='ctx'> 			       const __be32 *from, const __be32 *to,</div><div class='ctx'> 			       bool pseudohdr)</div><div class='hunk'>@@ -453,9 +466,6 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,</div><div class='ctx'> 	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='ctx'> 		*sum = csum_fold(csum_partial(diff, sizeof(diff),</div><div class='ctx'> 				 ~csum_unfold(*sum)));</div><div class='del'>-		if (skb-&gt;ip_summed == CHECKSUM_COMPLETE &amp;&amp; pseudohdr)</div><div class='del'>-			skb-&gt;csum = ~csum_partial(diff, sizeof(diff),</div><div class='del'>-						  ~skb-&gt;csum);</div><div class='ctx'> 	} else if (pseudohdr)</div><div class='ctx'> 		*sum = ~csum_fold(csum_partial(diff, sizeof(diff),</div><div class='ctx'> 				  csum_unfold(*sum)));</div><div class='hunk'>@@ -463,12 +473,12 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,</div><div class='ctx'> EXPORT_SYMBOL(inet_proto_csum_replace16);</div><div class='ctx'> </div><div class='ctx'> void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb,</div><div class='del'>-				     __wsum diff, bool pseudohdr)</div><div class='add'>+				     __wsum diff, bool pseudohdr, bool ipv6)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='del'>-		*sum = csum_fold(csum_add(diff, ~csum_unfold(*sum)));</div><div class='del'>-		if (skb-&gt;ip_summed == CHECKSUM_COMPLETE &amp;&amp; pseudohdr)</div><div class='del'>-			skb-&gt;csum = ~csum_add(diff, ~skb-&gt;csum);</div><div class='add'>+		csum_replace_by_diff(sum, diff);</div><div class='add'>+		if (skb-&gt;ip_summed == CHECKSUM_COMPLETE &amp;&amp; pseudohdr &amp;&amp; !ipv6)</div><div class='add'>+			skb-&gt;csum = ~csum_sub(diff, skb-&gt;csum);</div><div class='ctx'> 	} else if (pseudohdr) {</div><div class='ctx'> 		*sum = ~csum_fold(csum_add(diff, csum_unfold(*sum)));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/core/xdp.c b/net/core/xdp.c<br/>index 89b6785cef2a..9100e160113a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/xdp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/xdp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/core/xdp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/core/xdp.c</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* net/core/xdp.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2017 Jesper Dangaard Brouer, Red Hat Inc.</div><div class='del'>- * Released under terms in GPL version 2.  See COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -11,9 +13,15 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='del'>-#include &lt;net/page_pool.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;net/xdp_priv.h&gt; /* struct xdp_mem_allocator */</div><div class='add'>+#include &lt;trace/events/xdp.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define REG_STATE_NEW		0x0</div><div class='ctx'> #define REG_STATE_REGISTERED	0x1</div><div class='hunk'>@@ -29,23 +37,12 @@ static int mem_id_next = MEM_ID_MIN;</div><div class='ctx'> static bool mem_id_init; /* false */</div><div class='ctx'> static struct rhashtable *mem_id_ht;</div><div class='ctx'> </div><div class='del'>-struct xdp_mem_allocator {</div><div class='del'>-	struct xdp_mem_info mem;</div><div class='del'>-	union {</div><div class='del'>-		void *allocator;</div><div class='del'>-		struct page_pool *page_pool;</div><div class='del'>-		struct zero_copy_allocator *zc_alloc;</div><div class='del'>-	};</div><div class='del'>-	struct rhash_head node;</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static u32 xdp_mem_id_hashfn(const void *data, u32 len, u32 seed)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 *k = data;</div><div class='ctx'> 	const u32 key = *k;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(FIELD_SIZEOF(struct xdp_mem_allocator, mem.id)</div><div class='add'>+	BUILD_BUG_ON(sizeof_field(struct xdp_mem_allocator, mem.id)</div><div class='ctx'> 		     != sizeof(u32));</div><div class='ctx'> </div><div class='ctx'> 	/* Use cyclic increasing ID as direct hash key */</div><div class='hunk'>@@ -65,7 +62,7 @@ static const struct rhashtable_params mem_id_rht_params = {</div><div class='ctx'> 	.nelem_hint = 64,</div><div class='ctx'> 	.head_offset = offsetof(struct xdp_mem_allocator, node),</div><div class='ctx'> 	.key_offset  = offsetof(struct xdp_mem_allocator, mem.id),</div><div class='del'>-	.key_len = FIELD_SIZEOF(struct xdp_mem_allocator, mem.id),</div><div class='add'>+	.key_len = sizeof_field(struct xdp_mem_allocator, mem.id),</div><div class='ctx'> 	.max_size = MEM_ID_MAX,</div><div class='ctx'> 	.min_size = 8,</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='hunk'>@@ -80,36 +77,73 @@ static void __xdp_mem_allocator_rcu_free(struct rcu_head *rcu)</div><div class='ctx'> 	xa = container_of(rcu, struct xdp_mem_allocator, rcu);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow this ID to be reused */</div><div class='del'>-	ida_simple_remove(&amp;mem_id_pool, xa-&gt;mem.id);</div><div class='add'>+	ida_free(&amp;mem_id_pool, xa-&gt;mem.id);</div><div class='ctx'> </div><div class='del'>-	/* Notice, driver is expected to free the *allocator,</div><div class='del'>-	 * e.g. page_pool, and MUST also use RCU free.</div><div class='del'>-	 */</div><div class='add'>+	kfree(xa);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Poison memory */</div><div class='del'>-	xa-&gt;mem.id = 0xFFFF;</div><div class='del'>-	xa-&gt;mem.type = 0xF0F0;</div><div class='del'>-	xa-&gt;allocator = (void *)0xDEAD9001;</div><div class='add'>+static void mem_xa_remove(struct xdp_mem_allocator *xa)</div><div class='add'>+{</div><div class='add'>+	trace_mem_disconnect(xa);</div><div class='ctx'> </div><div class='del'>-	kfree(xa);</div><div class='add'>+	if (!rhashtable_remove_fast(mem_id_ht, &amp;xa-&gt;node, mem_id_rht_params))</div><div class='add'>+		call_rcu(&amp;xa-&gt;rcu, __xdp_mem_allocator_rcu_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mem_allocator_disconnect(void *allocator)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_allocator *xa;</div><div class='add'>+	struct rhashtable_iter iter;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mem_id_lock);</div><div class='add'>+</div><div class='add'>+	rhashtable_walk_enter(mem_id_ht, &amp;iter);</div><div class='add'>+	do {</div><div class='add'>+		rhashtable_walk_start(&amp;iter);</div><div class='add'>+</div><div class='add'>+		while ((xa = rhashtable_walk_next(&amp;iter)) &amp;&amp; !IS_ERR(xa)) {</div><div class='add'>+			if (xa-&gt;allocator == allocator)</div><div class='add'>+				mem_xa_remove(xa);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rhashtable_walk_stop(&amp;iter);</div><div class='add'>+</div><div class='add'>+	} while (xa == ERR_PTR(-EAGAIN));</div><div class='add'>+	rhashtable_walk_exit(&amp;iter);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mem_id_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __xdp_rxq_info_unreg_mem_model(struct xdp_rxq_info *xdp_rxq)</div><div class='add'>+void xdp_unreg_mem_model(struct xdp_mem_info *mem)</div><div class='ctx'> {</div><div class='ctx'> 	struct xdp_mem_allocator *xa;</div><div class='del'>-	int id = xdp_rxq-&gt;mem.id;</div><div class='add'>+	int type = mem-&gt;type;</div><div class='add'>+	int id = mem-&gt;id;</div><div class='add'>+</div><div class='add'>+	/* Reset mem info to defaults */</div><div class='add'>+	mem-&gt;id = 0;</div><div class='add'>+	mem-&gt;type = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (id == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mem_id_lock);</div><div class='add'>+	if (type == MEM_TYPE_PAGE_POOL) {</div><div class='add'>+		xa = rhashtable_lookup_fast(mem_id_ht, &amp;id, mem_id_rht_params);</div><div class='add'>+		page_pool_destroy(xa-&gt;page_pool);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_unreg_mem_model);</div><div class='ctx'> </div><div class='del'>-	xa = rhashtable_lookup_fast(mem_id_ht, &amp;id, mem_id_rht_params);</div><div class='del'>-	if (xa &amp;&amp; !rhashtable_remove_fast(mem_id_ht, &amp;xa-&gt;node, mem_id_rht_params))</div><div class='del'>-		call_rcu(&amp;xa-&gt;rcu, __xdp_mem_allocator_rcu_free);</div><div class='add'>+void xdp_rxq_info_unreg_mem_model(struct xdp_rxq_info *xdp_rxq)</div><div class='add'>+{</div><div class='add'>+	if (xdp_rxq-&gt;reg_state != REG_STATE_REGISTERED) {</div><div class='add'>+		WARN(1, "Missing register, driver bug");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;mem_id_lock);</div><div class='add'>+	xdp_unreg_mem_model(&amp;xdp_rxq-&gt;mem);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_rxq_info_unreg_mem_model);</div><div class='ctx'> </div><div class='ctx'> void xdp_rxq_info_unreg(struct xdp_rxq_info *xdp_rxq)</div><div class='ctx'> {</div><div class='hunk'>@@ -117,16 +151,10 @@ void xdp_rxq_info_unreg(struct xdp_rxq_info *xdp_rxq)</div><div class='ctx'> 	if (xdp_rxq-&gt;reg_state == REG_STATE_UNUSED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN(!(xdp_rxq-&gt;reg_state == REG_STATE_REGISTERED), "Driver BUG");</div><div class='del'>-</div><div class='del'>-	__xdp_rxq_info_unreg_mem_model(xdp_rxq);</div><div class='add'>+	xdp_rxq_info_unreg_mem_model(xdp_rxq);</div><div class='ctx'> </div><div class='ctx'> 	xdp_rxq-&gt;reg_state = REG_STATE_UNREGISTERED;</div><div class='ctx'> 	xdp_rxq-&gt;dev = NULL;</div><div class='del'>-</div><div class='del'>-	/* Reset mem info to defaults */</div><div class='del'>-	xdp_rxq-&gt;mem.id = 0;</div><div class='del'>-	xdp_rxq-&gt;mem.type = 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_rxq_info_unreg);</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +164,15 @@ static void xdp_rxq_info_init(struct xdp_rxq_info *xdp_rxq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns 0 on success, negative on failure */</div><div class='del'>-int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,</div><div class='del'>-		     struct net_device *dev, u32 queue_index)</div><div class='add'>+int __xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,</div><div class='add'>+		       struct net_device *dev, u32 queue_index,</div><div class='add'>+		       unsigned int napi_id, u32 frag_size)</div><div class='ctx'> {</div><div class='add'>+	if (!dev) {</div><div class='add'>+		WARN(1, "Missing net_device from driver");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (xdp_rxq-&gt;reg_state == REG_STATE_UNUSED) {</div><div class='ctx'> 		WARN(1, "Driver promised not to register this");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -149,20 +183,16 @@ int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,</div><div class='ctx'> 		xdp_rxq_info_unreg(xdp_rxq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='del'>-		WARN(1, "Missing net_device from driver");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* State either UNREGISTERED or NEW */</div><div class='ctx'> 	xdp_rxq_info_init(xdp_rxq);</div><div class='ctx'> 	xdp_rxq-&gt;dev = dev;</div><div class='ctx'> 	xdp_rxq-&gt;queue_index = queue_index;</div><div class='add'>+	xdp_rxq-&gt;frag_size = frag_size;</div><div class='ctx'> </div><div class='ctx'> 	xdp_rxq-&gt;reg_state = REG_STATE_REGISTERED;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_rxq_info_reg);</div><div class='add'>+EXPORT_SYMBOL_GPL(__xdp_rxq_info_reg);</div><div class='ctx'> </div><div class='ctx'> void xdp_rxq_info_unused(struct xdp_rxq_info *xdp_rxq)</div><div class='ctx'> {</div><div class='hunk'>@@ -211,7 +241,7 @@ static int __mem_id_cyclic_get(gfp_t gfp)</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	id = ida_simple_get(&amp;mem_id_pool, mem_id_next, MEM_ID_MAX, gfp);</div><div class='add'>+	id = ida_alloc_range(&amp;mem_id_pool, mem_id_next, MEM_ID_MAX - 1, gfp);</div><div class='ctx'> 	if (id &lt; 0) {</div><div class='ctx'> 		if (id == -ENOSPC) {</div><div class='ctx'> 			/* Cyclic allocator, reset next id */</div><div class='hunk'>@@ -238,28 +268,24 @@ static bool __is_supported_mem_type(enum xdp_mem_type type)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,</div><div class='del'>-			       enum xdp_mem_type type, void *allocator)</div><div class='add'>+static struct xdp_mem_allocator *__xdp_reg_mem_model(struct xdp_mem_info *mem,</div><div class='add'>+						     enum xdp_mem_type type,</div><div class='add'>+						     void *allocator)</div><div class='ctx'> {</div><div class='ctx'> 	struct xdp_mem_allocator *xdp_alloc;</div><div class='ctx'> 	gfp_t gfp = GFP_KERNEL;</div><div class='ctx'> 	int id, errno, ret;</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='del'>-	if (xdp_rxq-&gt;reg_state != REG_STATE_REGISTERED) {</div><div class='del'>-		WARN(1, "Missing register, driver bug");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!__is_supported_mem_type(type))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> </div><div class='del'>-	xdp_rxq-&gt;mem.type = type;</div><div class='add'>+	mem-&gt;type = type;</div><div class='ctx'> </div><div class='ctx'> 	if (!allocator) {</div><div class='del'>-		if (type == MEM_TYPE_PAGE_POOL || type == MEM_TYPE_ZERO_COPY)</div><div class='del'>-			return -EINVAL; /* Setup time check page_pool req */</div><div class='del'>-		return 0;</div><div class='add'>+		if (type == MEM_TYPE_PAGE_POOL)</div><div class='add'>+			return ERR_PTR(-EINVAL); /* Setup time check page_pool req */</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Delay init of rhashtable to save memory if feature isn't used */</div><div class='hunk'>@@ -267,15 +293,13 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,</div><div class='ctx'> 		mutex_lock(&amp;mem_id_lock);</div><div class='ctx'> 		ret = __mem_id_init_hash_table();</div><div class='ctx'> 		mutex_unlock(&amp;mem_id_lock);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xdp_alloc = kzalloc(sizeof(*xdp_alloc), gfp);</div><div class='ctx'> 	if (!xdp_alloc)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mem_id_lock);</div><div class='ctx'> 	id = __mem_id_cyclic_get(gfp);</div><div class='hunk'>@@ -283,111 +307,261 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,</div><div class='ctx'> 		errno = id;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='del'>-	xdp_rxq-&gt;mem.id = id;</div><div class='del'>-	xdp_alloc-&gt;mem  = xdp_rxq-&gt;mem;</div><div class='add'>+	mem-&gt;id = id;</div><div class='add'>+	xdp_alloc-&gt;mem = *mem;</div><div class='ctx'> 	xdp_alloc-&gt;allocator = allocator;</div><div class='ctx'> </div><div class='ctx'> 	/* Insert allocator into ID lookup table */</div><div class='ctx'> 	ptr = rhashtable_insert_slow(mem_id_ht, &amp;id, &amp;xdp_alloc-&gt;node);</div><div class='ctx'> 	if (IS_ERR(ptr)) {</div><div class='add'>+		ida_free(&amp;mem_id_pool, mem-&gt;id);</div><div class='add'>+		mem-&gt;id = 0;</div><div class='ctx'> 		errno = PTR_ERR(ptr);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (type == MEM_TYPE_PAGE_POOL)</div><div class='add'>+		page_pool_use_xdp_mem(allocator, mem_allocator_disconnect, mem);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;mem_id_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return xdp_alloc;</div><div class='ctx'> err:</div><div class='ctx'> 	mutex_unlock(&amp;mem_id_lock);</div><div class='ctx'> 	kfree(xdp_alloc);</div><div class='del'>-	return errno;</div><div class='add'>+	return ERR_PTR(errno);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int xdp_reg_mem_model(struct xdp_mem_info *mem,</div><div class='add'>+		      enum xdp_mem_type type, void *allocator)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_allocator *xdp_alloc;</div><div class='add'>+</div><div class='add'>+	xdp_alloc = __xdp_reg_mem_model(mem, type, allocator);</div><div class='add'>+	if (IS_ERR(xdp_alloc))</div><div class='add'>+		return PTR_ERR(xdp_alloc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_reg_mem_model);</div><div class='add'>+</div><div class='add'>+int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,</div><div class='add'>+			       enum xdp_mem_type type, void *allocator)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_allocator *xdp_alloc;</div><div class='add'>+</div><div class='add'>+	if (xdp_rxq-&gt;reg_state != REG_STATE_REGISTERED) {</div><div class='add'>+		WARN(1, "Missing register, driver bug");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xdp_alloc = __xdp_reg_mem_model(&amp;xdp_rxq-&gt;mem, type, allocator);</div><div class='add'>+	if (IS_ERR(xdp_alloc))</div><div class='add'>+		return PTR_ERR(xdp_alloc);</div><div class='add'>+</div><div class='add'>+	if (type == MEM_TYPE_XSK_BUFF_POOL &amp;&amp; allocator)</div><div class='add'>+		xsk_pool_set_rxq_info(allocator, xdp_rxq);</div><div class='add'>+</div><div class='add'>+	if (trace_mem_connect_enabled() &amp;&amp; xdp_alloc)</div><div class='add'>+		trace_mem_connect(xdp_alloc, xdp_rxq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_rxq_info_reg_mem_model);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * xdp_reg_page_pool - register &amp;page_pool as a memory provider for XDP</div><div class='add'>+ * @pool: &amp;page_pool to register</div><div class='add'>+ *</div><div class='add'>+ * Can be used to register pools manually without connecting to any XDP RxQ</div><div class='add'>+ * info, so that the XDP layer will be aware of them. Then, they can be</div><div class='add'>+ * attached to an RxQ info manually via xdp_rxq_info_attach_page_pool().</div><div class='add'>+ *</div><div class='add'>+ * Return: %0 on success, -errno on error.</div><div class='add'>+ */</div><div class='add'>+int xdp_reg_page_pool(struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_info mem;</div><div class='add'>+</div><div class='add'>+	return xdp_reg_mem_model(&amp;mem, MEM_TYPE_PAGE_POOL, pool);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_reg_page_pool);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xdp_unreg_page_pool - unregister &amp;page_pool from the memory providers list</div><div class='add'>+ * @pool: &amp;page_pool to unregister</div><div class='add'>+ *</div><div class='add'>+ * A shorthand for manual unregistering page pools. If the pool was previously</div><div class='add'>+ * attached to an RxQ info, it must be detached first.</div><div class='add'>+ */</div><div class='add'>+void xdp_unreg_page_pool(const struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_info mem = {</div><div class='add'>+		.type	= MEM_TYPE_PAGE_POOL,</div><div class='add'>+		.id	= pool-&gt;xdp_mem_id,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xdp_unreg_mem_model(&amp;mem);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_unreg_page_pool);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xdp_rxq_info_attach_page_pool - attach registered pool to RxQ info</div><div class='add'>+ * @xdp_rxq: XDP RxQ info to attach the pool to</div><div class='add'>+ * @pool: pool to attach</div><div class='add'>+ *</div><div class='add'>+ * If the pool was registered manually, this function must be called instead</div><div class='add'>+ * of xdp_rxq_info_reg_mem_model() to connect it to the RxQ info.</div><div class='add'>+ */</div><div class='add'>+void xdp_rxq_info_attach_page_pool(struct xdp_rxq_info *xdp_rxq,</div><div class='add'>+				   const struct page_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct xdp_mem_info mem = {</div><div class='add'>+		.type	= MEM_TYPE_PAGE_POOL,</div><div class='add'>+		.id	= pool-&gt;xdp_mem_id,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xdp_rxq_info_attach_mem_model(xdp_rxq, &amp;mem);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_rxq_info_attach_page_pool);</div><div class='add'>+</div><div class='ctx'> /* XDP RX runs under NAPI protection, and in different delivery error</div><div class='ctx'>  * scenarios (e.g. queue full), it is possible to return the xdp_frame</div><div class='del'>- * while still leveraging this protection.  The @napi_direct boolian</div><div class='add'>+ * while still leveraging this protection.  The @napi_direct boolean</div><div class='ctx'>  * is used for those calls sites.  Thus, allowing for faster recycling</div><div class='ctx'>  * of xdp_frames/pages in those cases.</div><div class='ctx'>  */</div><div class='del'>-static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct,</div><div class='del'>-			 unsigned long handle)</div><div class='add'>+void __xdp_return(netmem_ref netmem, enum xdp_mem_type mem_type,</div><div class='add'>+		  bool napi_direct, struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='del'>-	struct xdp_mem_allocator *xa;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	switch (mem-&gt;type) {</div><div class='add'>+	switch (mem_type) {</div><div class='ctx'> 	case MEM_TYPE_PAGE_POOL:</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		/* mem-&gt;id is valid, checked in xdp_rxq_info_reg_mem_model() */</div><div class='del'>-		xa = rhashtable_lookup(mem_id_ht, &amp;mem-&gt;id, mem_id_rht_params);</div><div class='del'>-		page = virt_to_head_page(data);</div><div class='del'>-		if (xa) {</div><div class='del'>-			napi_direct &amp;= !xdp_return_frame_no_direct();</div><div class='del'>-			page_pool_put_page(xa-&gt;page_pool, page, napi_direct);</div><div class='del'>-		} else {</div><div class='del'>-			put_page(page);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		netmem = netmem_compound_head(netmem);</div><div class='add'>+		if (napi_direct &amp;&amp; xdp_return_frame_no_direct())</div><div class='add'>+			napi_direct = false;</div><div class='add'>+		/* No need to check netmem_is_pp() as mem-&gt;type knows this a</div><div class='add'>+		 * page_pool page</div><div class='add'>+		 */</div><div class='add'>+		page_pool_put_full_netmem(netmem_get_pp(netmem), netmem,</div><div class='add'>+					  napi_direct);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEM_TYPE_PAGE_SHARED:</div><div class='del'>-		page_frag_free(data);</div><div class='add'>+		page_frag_free(__netmem_address(netmem));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEM_TYPE_PAGE_ORDER0:</div><div class='del'>-		page = virt_to_page(data); /* Assumes order0 page*/</div><div class='del'>-		put_page(page);</div><div class='add'>+		put_page(__netmem_to_page(netmem));</div><div class='ctx'> 		break;</div><div class='del'>-	case MEM_TYPE_ZERO_COPY:</div><div class='add'>+	case MEM_TYPE_XSK_BUFF_POOL:</div><div class='ctx'> 		/* NB! Only valid from an xdp_buff! */</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		/* mem-&gt;id is valid, checked in xdp_rxq_info_reg_mem_model() */</div><div class='del'>-		xa = rhashtable_lookup(mem_id_ht, &amp;mem-&gt;id, mem_id_rht_params);</div><div class='del'>-		xa-&gt;zc_alloc-&gt;free(xa-&gt;zc_alloc, handle);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		xsk_buff_free(xdp);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Not possible, checked in xdp_rxq_info_reg_mem_model() */</div><div class='add'>+		WARN(1, "Incorrect XDP memory type (%d) usage", mem_type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void xdp_return_frame(struct xdp_frame *xdpf)</div><div class='ctx'> {</div><div class='del'>-	__xdp_return(xdpf-&gt;data, &amp;xdpf-&gt;mem, false, 0);</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+</div><div class='add'>+	if (likely(!xdp_frame_has_frags(xdpf)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+	for (u32 i = 0; i &lt; sinfo-&gt;nr_frags; i++)</div><div class='add'>+		__xdp_return(skb_frag_netmem(&amp;sinfo-&gt;frags[i]), xdpf-&gt;mem_type,</div><div class='add'>+			     false, NULL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	__xdp_return(virt_to_netmem(xdpf-&gt;data), xdpf-&gt;mem_type, false, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_return_frame);</div><div class='ctx'> </div><div class='ctx'> void xdp_return_frame_rx_napi(struct xdp_frame *xdpf)</div><div class='ctx'> {</div><div class='del'>-	__xdp_return(xdpf-&gt;data, &amp;xdpf-&gt;mem, true, 0);</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+</div><div class='add'>+	if (likely(!xdp_frame_has_frags(xdpf)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+	for (u32 i = 0; i &lt; sinfo-&gt;nr_frags; i++)</div><div class='add'>+		__xdp_return(skb_frag_netmem(&amp;sinfo-&gt;frags[i]), xdpf-&gt;mem_type,</div><div class='add'>+			     true, NULL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	__xdp_return(virt_to_netmem(xdpf-&gt;data), xdpf-&gt;mem_type, true, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);</div><div class='ctx'> </div><div class='del'>-void xdp_return_buff(struct xdp_buff *xdp)</div><div class='add'>+/* XDP bulk APIs introduce a defer/flush mechanism to return</div><div class='add'>+ * pages belonging to the same xdp_mem_allocator object</div><div class='add'>+ * (identified via the mem.id field) in bulk to optimize</div><div class='add'>+ * I-cache and D-cache.</div><div class='add'>+ * The bulk queue size is set to 16 to be aligned to how</div><div class='add'>+ * XDP_REDIRECT bulking works. The bulk is flushed when</div><div class='add'>+ * it is full or when mem.id changes.</div><div class='add'>+ * xdp_frame_bulk is usually stored/allocated on the function</div><div class='add'>+ * call-stack to avoid locking penalties.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Must be called with rcu_read_lock held */</div><div class='add'>+void xdp_return_frame_bulk(struct xdp_frame *xdpf,</div><div class='add'>+			   struct xdp_frame_bulk *bq)</div><div class='ctx'> {</div><div class='del'>-	__xdp_return(xdp-&gt;data, &amp;xdp-&gt;rxq-&gt;mem, true, xdp-&gt;handle);</div><div class='add'>+	if (xdpf-&gt;mem_type != MEM_TYPE_PAGE_POOL) {</div><div class='add'>+		xdp_return_frame(xdpf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bq-&gt;count == XDP_BULK_QUEUE_SIZE)</div><div class='add'>+		xdp_flush_frame_bulk(bq);</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdp_frame_has_frags(xdpf))) {</div><div class='add'>+		struct skb_shared_info *sinfo;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+		for (i = 0; i &lt; sinfo-&gt;nr_frags; i++) {</div><div class='add'>+			skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+			bq-&gt;q[bq-&gt;count++] = skb_frag_netmem(frag);</div><div class='add'>+			if (bq-&gt;count == XDP_BULK_QUEUE_SIZE)</div><div class='add'>+				xdp_flush_frame_bulk(bq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	bq-&gt;q[bq-&gt;count++] = virt_to_netmem(xdpf-&gt;data);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_return_buff);</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_return_frame_bulk);</div><div class='ctx'> </div><div class='del'>-int xdp_attachment_query(struct xdp_attachment_info *info,</div><div class='del'>-			 struct netdev_bpf *bpf)</div><div class='add'>+/**</div><div class='add'>+ * xdp_return_frag -- free one XDP frag or decrement its refcount</div><div class='add'>+ * @netmem: network memory reference to release</div><div class='add'>+ * @xdp: &amp;xdp_buff to release the frag for</div><div class='add'>+ */</div><div class='add'>+void xdp_return_frag(netmem_ref netmem, const struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='del'>-	bpf-&gt;prog_id = info-&gt;prog ? info-&gt;prog-&gt;aux-&gt;id : 0;</div><div class='del'>-	bpf-&gt;prog_flags = info-&gt;prog ? info-&gt;flags : 0;</div><div class='del'>-	return 0;</div><div class='add'>+	__xdp_return(netmem, xdp-&gt;rxq-&gt;mem.type, true, NULL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_attachment_query);</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_return_frag);</div><div class='ctx'> </div><div class='del'>-bool xdp_attachment_flags_ok(struct xdp_attachment_info *info,</div><div class='del'>-			     struct netdev_bpf *bpf)</div><div class='add'>+void xdp_return_buff(struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='del'>-	if (info-&gt;prog &amp;&amp; (bpf-&gt;flags ^ info-&gt;flags) &amp; XDP_FLAGS_MODES) {</div><div class='del'>-		NL_SET_ERR_MSG(bpf-&gt;extack,</div><div class='del'>-			       "program loaded with different flags");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+</div><div class='add'>+	if (likely(!xdp_buff_has_frags(xdp)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	for (u32 i = 0; i &lt; sinfo-&gt;nr_frags; i++)</div><div class='add'>+		__xdp_return(skb_frag_netmem(&amp;sinfo-&gt;frags[i]),</div><div class='add'>+			     xdp-&gt;rxq-&gt;mem.type, true, xdp);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	__xdp_return(virt_to_netmem(xdp-&gt;data), xdp-&gt;rxq-&gt;mem.type, true, xdp);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(xdp_attachment_flags_ok);</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_return_buff);</div><div class='ctx'> </div><div class='ctx'> void xdp_attachment_setup(struct xdp_attachment_info *info,</div><div class='ctx'> 			  struct netdev_bpf *bpf)</div><div class='hunk'>@@ -398,3 +572,484 @@ void xdp_attachment_setup(struct xdp_attachment_info *info,</div><div class='ctx'> 	info-&gt;flags = bpf-&gt;flags;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xdp_attachment_setup);</div><div class='add'>+</div><div class='add'>+struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	unsigned int metasize, totsize;</div><div class='add'>+	void *addr, *data_to_copy;</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	/* Clone into a MEM_TYPE_PAGE_ORDER0 xdp_frame. */</div><div class='add'>+	metasize = xdp_data_meta_unsupported(xdp) ? 0 :</div><div class='add'>+		   xdp-&gt;data - xdp-&gt;data_meta;</div><div class='add'>+	totsize = xdp-&gt;data_end - xdp-&gt;data + metasize;</div><div class='add'>+</div><div class='add'>+	if (sizeof(*xdpf) + totsize &gt; PAGE_SIZE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	page = dev_alloc_page();</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	addr = page_to_virt(page);</div><div class='add'>+	xdpf = addr;</div><div class='add'>+	memset(xdpf, 0, sizeof(*xdpf));</div><div class='add'>+</div><div class='add'>+	addr += sizeof(*xdpf);</div><div class='add'>+	data_to_copy = metasize ? xdp-&gt;data_meta : xdp-&gt;data;</div><div class='add'>+	memcpy(addr, data_to_copy, totsize);</div><div class='add'>+</div><div class='add'>+	xdpf-&gt;data = addr + metasize;</div><div class='add'>+	xdpf-&gt;len = totsize - metasize;</div><div class='add'>+	xdpf-&gt;headroom = 0;</div><div class='add'>+	xdpf-&gt;metasize = metasize;</div><div class='add'>+	xdpf-&gt;frame_sz = PAGE_SIZE;</div><div class='add'>+	xdpf-&gt;mem_type = MEM_TYPE_PAGE_ORDER0;</div><div class='add'>+</div><div class='add'>+	xsk_buff_free(xdp);</div><div class='add'>+	return xdpf;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_convert_zc_to_xdp_frame);</div><div class='add'>+</div><div class='add'>+/* Used by XDP_WARN macro, to avoid inlining WARN() in fast-path */</div><div class='add'>+void xdp_warn(const char *msg, const char *func, const int line)</div><div class='add'>+{</div><div class='add'>+	WARN(1, "XDP_WARN: %s(line:%d): %s\n", func, line, msg);</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_warn);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xdp_build_skb_from_buff - create an skb from &amp;xdp_buff</div><div class='add'>+ * @xdp: &amp;xdp_buff to convert to an skb</div><div class='add'>+ *</div><div class='add'>+ * Perform common operations to create a new skb to pass up the stack from</div><div class='add'>+ * &amp;xdp_buff: allocate an skb head from the NAPI percpu cache, initialize</div><div class='add'>+ * skb data pointers and offsets, set the recycle bit if the buff is</div><div class='add'>+ * PP-backed, Rx queue index, protocol and update frags info.</div><div class='add'>+ *</div><div class='add'>+ * Return: new &amp;sk_buff on success, %NULL on error.</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *xdp_build_skb_from_buff(const struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	const struct xdp_rxq_info *rxq = xdp-&gt;rxq;</div><div class='add'>+	const struct skb_shared_info *sinfo;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 nr_frags = 0;</div><div class='add'>+	int metalen;</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdp_buff_has_frags(xdp))) {</div><div class='add'>+		sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+		nr_frags = sinfo-&gt;nr_frags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = napi_build_skb(xdp-&gt;data_hard_start, xdp-&gt;frame_sz);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, xdp-&gt;data - xdp-&gt;data_hard_start);</div><div class='add'>+	__skb_put(skb, xdp-&gt;data_end - xdp-&gt;data);</div><div class='add'>+</div><div class='add'>+	metalen = xdp-&gt;data - xdp-&gt;data_meta;</div><div class='add'>+	if (metalen &gt; 0)</div><div class='add'>+		skb_metadata_set(skb, metalen);</div><div class='add'>+</div><div class='add'>+	if (rxq-&gt;mem.type == MEM_TYPE_PAGE_POOL)</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='add'>+</div><div class='add'>+	skb_record_rx_queue(skb, rxq-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+	if (unlikely(nr_frags)) {</div><div class='add'>+		u32 tsize;</div><div class='add'>+</div><div class='add'>+		tsize = sinfo-&gt;xdp_frags_truesize ? : nr_frags * xdp-&gt;frame_sz;</div><div class='add'>+		xdp_update_skb_frags_info(skb, nr_frags, sinfo-&gt;xdp_frags_size,</div><div class='add'>+					  tsize, xdp_buff_get_skb_flags(xdp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, rxq-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_build_skb_from_buff);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xdp_copy_frags_from_zc - copy frags from XSk buff to skb</div><div class='add'>+ * @skb: skb to copy frags to</div><div class='add'>+ * @xdp: XSk &amp;xdp_buff from which the frags will be copied</div><div class='add'>+ * @pp: &amp;page_pool backing page allocation, if available</div><div class='add'>+ *</div><div class='add'>+ * Copy all frags from XSk &amp;xdp_buff to the skb to pass it up the stack.</div><div class='add'>+ * Allocate a new buffer for each frag, copy it and attach to the skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success, false on netmem allocation fail.</div><div class='add'>+ */</div><div class='add'>+static noinline bool xdp_copy_frags_from_zc(struct sk_buff *skb,</div><div class='add'>+					    const struct xdp_buff *xdp,</div><div class='add'>+					    struct page_pool *pp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = skb_shinfo(skb);</div><div class='add'>+	const struct skb_shared_info *xinfo;</div><div class='add'>+	u32 nr_frags, tsize = 0;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	xinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	nr_frags = xinfo-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	for (u32 i = 0; i &lt; nr_frags; i++) {</div><div class='add'>+		const skb_frag_t *frag = &amp;xinfo-&gt;frags[i];</div><div class='add'>+		u32 len = skb_frag_size(frag);</div><div class='add'>+		u32 offset, truesize = len;</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		page = page_pool_dev_alloc(pp, &amp;offset, &amp;truesize);</div><div class='add'>+		if (unlikely(!page)) {</div><div class='add'>+			sinfo-&gt;nr_frags = i;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(page_address(page) + offset, skb_frag_address(frag),</div><div class='add'>+		       LARGEST_ALIGN(len));</div><div class='add'>+		__skb_fill_page_desc_noacc(sinfo, i, page, offset, len);</div><div class='add'>+</div><div class='add'>+		tsize += truesize;</div><div class='add'>+		if (page_is_pfmemalloc(page))</div><div class='add'>+			flags |= XDP_FLAGS_FRAGS_PF_MEMALLOC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xdp_update_skb_frags_info(skb, nr_frags, xinfo-&gt;xdp_frags_size, tsize,</div><div class='add'>+				  flags);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xdp_build_skb_from_zc - create an skb from XSk &amp;xdp_buff</div><div class='add'>+ * @xdp: source XSk buff</div><div class='add'>+ *</div><div class='add'>+ * Similar to xdp_build_skb_from_buff(), but for XSk frames. Allocate an skb</div><div class='add'>+ * head, new buffer for the head, copy the data and initialize the skb fields.</div><div class='add'>+ * If there are frags, allocate new buffers for them and copy.</div><div class='add'>+ * Buffers are allocated from the system percpu pools to try recycling them.</div><div class='add'>+ * If new skb was built successfully, @xdp is returned to XSk pool's freelist.</div><div class='add'>+ * On error, it remains untouched and the caller must take care of this.</div><div class='add'>+ *</div><div class='add'>+ * Return: new &amp;sk_buff on success, %NULL on error.</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *xdp_build_skb_from_zc(struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	const struct xdp_rxq_info *rxq = xdp-&gt;rxq;</div><div class='add'>+	u32 len = xdp-&gt;data_end - xdp-&gt;data_meta;</div><div class='add'>+	u32 truesize = xdp-&gt;frame_sz;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct page_pool *pp;</div><div class='add'>+	int metalen;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PAGE_POOL))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	local_lock_nested_bh(&amp;system_page_pool.bh_lock);</div><div class='add'>+	pp = this_cpu_read(system_page_pool.pool);</div><div class='add'>+	data = page_pool_dev_alloc_va(pp, &amp;truesize);</div><div class='add'>+	if (unlikely(!data))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skb = napi_build_skb(data, truesize);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		page_pool_free_va(pp, data, true);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='add'>+	skb_reserve(skb, xdp-&gt;data_meta - xdp-&gt;data_hard_start);</div><div class='add'>+</div><div class='add'>+	memcpy(__skb_put(skb, len), xdp-&gt;data_meta, LARGEST_ALIGN(len));</div><div class='add'>+</div><div class='add'>+	metalen = xdp-&gt;data - xdp-&gt;data_meta;</div><div class='add'>+	if (metalen &gt; 0) {</div><div class='add'>+		skb_metadata_set(skb, metalen);</div><div class='add'>+		__skb_pull(skb, metalen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_record_rx_queue(skb, rxq-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdp_buff_has_frags(xdp)) &amp;&amp;</div><div class='add'>+	    unlikely(!xdp_copy_frags_from_zc(skb, xdp, pp))) {</div><div class='add'>+		napi_consume_skb(skb, true);</div><div class='add'>+		skb = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xsk_buff_free(xdp);</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, rxq-&gt;dev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	local_unlock_nested_bh(&amp;system_page_pool.bh_lock);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_build_skb_from_zc);</div><div class='add'>+</div><div class='add'>+struct sk_buff *__xdp_build_skb_from_frame(struct xdp_frame *xdpf,</div><div class='add'>+					   struct sk_buff *skb,</div><div class='add'>+					   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+	unsigned int headroom, frame_size;</div><div class='add'>+	void *hard_start;</div><div class='add'>+	u8 nr_frags;</div><div class='add'>+</div><div class='add'>+	/* xdp frags frame */</div><div class='add'>+	if (unlikely(xdp_frame_has_frags(xdpf)))</div><div class='add'>+		nr_frags = sinfo-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	/* Part of headroom was reserved to xdpf */</div><div class='add'>+	headroom = sizeof(*xdpf) + xdpf-&gt;headroom;</div><div class='add'>+</div><div class='add'>+	/* Memory size backing xdp_frame data already have reserved</div><div class='add'>+	 * room for build_skb to place skb_shared_info in tailroom.</div><div class='add'>+	 */</div><div class='add'>+	frame_size = xdpf-&gt;frame_sz;</div><div class='add'>+</div><div class='add'>+	hard_start = xdpf-&gt;data - headroom;</div><div class='add'>+	skb = build_skb_around(skb, hard_start, frame_size);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, headroom);</div><div class='add'>+	__skb_put(skb, xdpf-&gt;len);</div><div class='add'>+	if (xdpf-&gt;metasize)</div><div class='add'>+		skb_metadata_set(skb, xdpf-&gt;metasize);</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdp_frame_has_frags(xdpf)))</div><div class='add'>+		xdp_update_skb_frags_info(skb, nr_frags, sinfo-&gt;xdp_frags_size,</div><div class='add'>+					  nr_frags * xdpf-&gt;frame_sz,</div><div class='add'>+					  xdp_frame_get_skb_flags(xdpf));</div><div class='add'>+</div><div class='add'>+	/* Essential SKB info: protocol and skb-&gt;dev */</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='add'>+</div><div class='add'>+	/* Optional SKB info, currently missing:</div><div class='add'>+	 * - HW checksum info		(skb-&gt;ip_summed)</div><div class='add'>+	 * - HW RX hash			(skb_set_hash)</div><div class='add'>+	 * - RX ring dev queue index	(skb_record_rx_queue)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (xdpf-&gt;mem_type == MEM_TYPE_PAGE_POOL)</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='add'>+</div><div class='add'>+	/* Allow SKB to reuse area used by xdp_frame */</div><div class='add'>+	xdp_scrub_frame(xdpf);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__xdp_build_skb_from_frame);</div><div class='add'>+</div><div class='add'>+struct sk_buff *xdp_build_skb_from_frame(struct xdp_frame *xdpf,</div><div class='add'>+					 struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = kmem_cache_alloc(net_hotdata.skbuff_cache, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset(skb, 0, offsetof(struct sk_buff, tail));</div><div class='add'>+</div><div class='add'>+	return __xdp_build_skb_from_frame(xdpf, skb, dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_build_skb_from_frame);</div><div class='add'>+</div><div class='add'>+struct xdp_frame *xdpf_clone(struct xdp_frame *xdpf)</div><div class='add'>+{</div><div class='add'>+	unsigned int headroom, totalsize;</div><div class='add'>+	struct xdp_frame *nxdpf;</div><div class='add'>+	struct page *page;</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	headroom = xdpf-&gt;headroom + sizeof(*xdpf);</div><div class='add'>+	totalsize = headroom + xdpf-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(totalsize &gt; PAGE_SIZE))</div><div class='add'>+		return NULL;</div><div class='add'>+	page = dev_alloc_page();</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+	addr = page_to_virt(page);</div><div class='add'>+</div><div class='add'>+	memcpy(addr, xdpf, totalsize);</div><div class='add'>+</div><div class='add'>+	nxdpf = addr;</div><div class='add'>+	nxdpf-&gt;data = addr + headroom;</div><div class='add'>+	nxdpf-&gt;frame_sz = PAGE_SIZE;</div><div class='add'>+	nxdpf-&gt;mem_type = MEM_TYPE_PAGE_ORDER0;</div><div class='add'>+</div><div class='add'>+	return nxdpf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_xdp_metadata_rx_timestamp - Read XDP frame RX timestamp.</div><div class='add'>+ * @ctx: XDP context pointer.</div><div class='add'>+ * @timestamp: Return value pointer.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * Returns 0 on success or ``-errno`` on error.</div><div class='add'>+ * * ``-EOPNOTSUPP`` : means device driver does not implement kfunc</div><div class='add'>+ * * ``-ENODATA``    : means no RX-timestamp available for this frame</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_xdp_metadata_rx_hash - Read XDP frame RX hash.</div><div class='add'>+ * @ctx: XDP context pointer.</div><div class='add'>+ * @hash: Return value pointer.</div><div class='add'>+ * @rss_type: Return value pointer for RSS type.</div><div class='add'>+ *</div><div class='add'>+ * The RSS hash type (@rss_type) specifies what portion of packet headers NIC</div><div class='add'>+ * hardware used when calculating RSS hash value.  The RSS type can be decoded</div><div class='add'>+ * via &amp;enum xdp_rss_hash_type either matching on individual L3/L4 bits</div><div class='add'>+ * ``XDP_RSS_L*`` or by combined traditional *RSS Hashing Types*</div><div class='add'>+ * ``XDP_RSS_TYPE_L*``.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * Returns 0 on success or ``-errno`` on error.</div><div class='add'>+ * * ``-EOPNOTSUPP`` : means device driver doesn't implement kfunc</div><div class='add'>+ * * ``-ENODATA``    : means no RX-hash available for this frame</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, u32 *hash,</div><div class='add'>+					 enum xdp_rss_hash_type *rss_type)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_xdp_metadata_rx_vlan_tag - Get XDP packet outermost VLAN tag</div><div class='add'>+ * @ctx: XDP context pointer.</div><div class='add'>+ * @vlan_proto: Destination pointer for VLAN Tag protocol identifier (TPID).</div><div class='add'>+ * @vlan_tci: Destination pointer for VLAN TCI (VID + DEI + PCP)</div><div class='add'>+ *</div><div class='add'>+ * In case of success, ``vlan_proto`` contains *Tag protocol identifier (TPID)*,</div><div class='add'>+ * usually ``ETH_P_8021Q`` or ``ETH_P_8021AD``, but some networks can use</div><div class='add'>+ * custom TPIDs. ``vlan_proto`` is stored in **network byte order (BE)**</div><div class='add'>+ * and should be used as follows:</div><div class='add'>+ * ``if (vlan_proto == bpf_htons(ETH_P_8021Q)) do_something();``</div><div class='add'>+ *</div><div class='add'>+ * ``vlan_tci`` contains the remaining 16 bits of a VLAN tag.</div><div class='add'>+ * Driver is expected to provide those in **host byte order (usually LE)**,</div><div class='add'>+ * so the bpf program should not perform byte conversion.</div><div class='add'>+ * According to 802.1Q standard, *VLAN TCI (Tag control information)*</div><div class='add'>+ * is a bit field that contains:</div><div class='add'>+ * *VLAN identifier (VID)* that can be read with ``vlan_tci &amp; 0xfff``,</div><div class='add'>+ * *Drop eligible indicator (DEI)* - 1 bit,</div><div class='add'>+ * *Priority code point (PCP)* - 3 bits.</div><div class='add'>+ * For detailed meaning of DEI and PCP, please refer to other sources.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * Returns 0 on success or ``-errno`` on error.</div><div class='add'>+ * * ``-EOPNOTSUPP`` : device driver doesn't implement kfunc</div><div class='add'>+ * * ``-ENODATA``    : VLAN tag was not stripped or is not available</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_xdp_metadata_rx_vlan_tag(const struct xdp_md *ctx,</div><div class='add'>+					     __be16 *vlan_proto, u16 *vlan_tci)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(xdp_metadata_kfunc_ids)</div><div class='add'>+#define XDP_METADATA_KFUNC(_, __, name, ___) BTF_ID_FLAGS(func, name, KF_TRUSTED_ARGS)</div><div class='add'>+XDP_METADATA_KFUNC_xxx</div><div class='add'>+#undef XDP_METADATA_KFUNC</div><div class='add'>+BTF_KFUNCS_END(xdp_metadata_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set xdp_metadata_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;xdp_metadata_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST(xdp_metadata_kfunc_ids_unsorted)</div><div class='add'>+#define XDP_METADATA_KFUNC(name, _, str, __) BTF_ID(func, str)</div><div class='add'>+XDP_METADATA_KFUNC_xxx</div><div class='add'>+#undef XDP_METADATA_KFUNC</div><div class='add'>+</div><div class='add'>+u32 bpf_xdp_metadata_kfunc_id(int id)</div><div class='add'>+{</div><div class='add'>+	/* xdp_metadata_kfunc_ids is sorted and can't be used */</div><div class='add'>+	return xdp_metadata_kfunc_ids_unsorted[id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bpf_dev_bound_kfunc_id(u32 btf_id)</div><div class='add'>+{</div><div class='add'>+	return btf_id_set8_contains(&amp;xdp_metadata_kfunc_ids, btf_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init xdp_metadata_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &amp;xdp_metadata_kfunc_set);</div><div class='add'>+}</div><div class='add'>+late_initcall(xdp_metadata_init);</div><div class='add'>+</div><div class='add'>+void xdp_set_features_flag_locked(struct net_device *dev, xdp_features_t val)</div><div class='add'>+{</div><div class='add'>+	val &amp;= NETDEV_XDP_ACT_MASK;</div><div class='add'>+	if (dev-&gt;xdp_features == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked_or_invisible(dev);</div><div class='add'>+	dev-&gt;xdp_features = val;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;reg_state == NETREG_REGISTERED)</div><div class='add'>+		call_netdevice_notifiers(NETDEV_XDP_FEAT_CHANGE, dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_set_features_flag_locked);</div><div class='add'>+</div><div class='add'>+void xdp_set_features_flag(struct net_device *dev, xdp_features_t val)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	xdp_set_features_flag_locked(dev, val);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_set_features_flag);</div><div class='add'>+</div><div class='add'>+void xdp_features_set_redirect_target_locked(struct net_device *dev,</div><div class='add'>+					     bool support_sg)</div><div class='add'>+{</div><div class='add'>+	xdp_features_t val = (dev-&gt;xdp_features | NETDEV_XDP_ACT_NDO_XMIT);</div><div class='add'>+</div><div class='add'>+	if (support_sg)</div><div class='add'>+		val |= NETDEV_XDP_ACT_NDO_XMIT_SG;</div><div class='add'>+	xdp_set_features_flag_locked(dev, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_features_set_redirect_target_locked);</div><div class='add'>+</div><div class='add'>+void xdp_features_set_redirect_target(struct net_device *dev, bool support_sg)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	xdp_features_set_redirect_target_locked(dev, support_sg);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_features_set_redirect_target);</div><div class='add'>+</div><div class='add'>+void xdp_features_clear_redirect_target_locked(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	xdp_features_t val = dev-&gt;xdp_features;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~(NETDEV_XDP_ACT_NDO_XMIT | NETDEV_XDP_ACT_NDO_XMIT_SG);</div><div class='add'>+	xdp_set_features_flag_locked(dev, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_features_clear_redirect_target_locked);</div><div class='add'>+</div><div class='add'>+void xdp_features_clear_redirect_target(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	xdp_features_clear_redirect_target_locked(dev);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xdp_features_clear_redirect_target);</div><div class='head'>diff --git a/net/dcb/Kconfig b/net/dcb/Kconfig<br/>index 4066d59c8de5..efee8b9fe1d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dcb/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dcb/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dcb/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config DCB</div><div class='ctx'> 	bool "Data Center Bridging support"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for configuring Data Center Bridging (DCB)</div><div class='ctx'> 	  features on DCB capable Ethernet adapters via rtnetlink.  Say 'Y'</div><div class='ctx'> 	  if you have a DCB capable Ethernet adapter which supports this</div><div class='head'>diff --git a/net/dcb/Makefile b/net/dcb/Makefile<br/>index c1282c9e64fa..2c0fa16ee2a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dcb/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dcb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dcb/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='del'>-obj-$(CONFIG_DCB) += dcbnl.o dcbevent.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-y += dcbnl.o dcbevent.o</div><div class='head'>diff --git a/net/dcb/dcbevent.c b/net/dcb/dcbevent.c<br/>index a520d8004d89..8620564c2b0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dcb/dcbevent.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/dcbevent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dcb/dcbevent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dcb/dcbevent.c</a></div><div class='hunk'>@@ -1,18 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2010, Intel Corporation.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- * more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along with</div><div class='del'>- * this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Author: John Fastabend &lt;john.r.fastabend@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c<br/>index a556cd708885..03eb1d941fca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dcb/dcbnl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dcb/dcbnl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dcb/dcbnl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dcb/dcbnl.c</a></div><div class='hunk'>@@ -1,18 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2008-2011, Intel Corporation.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- * more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along with</div><div class='del'>- * this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Description: Data Center Bridging netlink interface</div><div class='ctx'>  * Author: Lucy Liu &lt;lucy.liu@intel.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -177,6 +166,7 @@ static const struct nla_policy dcbnl_ieee_policy[DCB_ATTR_IEEE_MAX + 1] = {</div><div class='ctx'> 	[DCB_ATTR_IEEE_QCN]         = {.len = sizeof(struct ieee_qcn)},</div><div class='ctx'> 	[DCB_ATTR_IEEE_QCN_STATS]   = {.len = sizeof(struct ieee_qcn_stats)},</div><div class='ctx'> 	[DCB_ATTR_DCB_BUFFER]       = {.len = sizeof(struct dcbnl_buffer)},</div><div class='add'>+	[DCB_ATTR_DCB_APP_TRUST_TABLE] = {.type = NLA_NESTED},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DCB number of traffic classes nested attributes. */</div><div class='hunk'>@@ -188,8 +178,41 @@ static const struct nla_policy dcbnl_featcfg_nest[DCB_FEATCFG_ATTR_MAX + 1] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(dcb_app_list);</div><div class='add'>+static LIST_HEAD(dcb_rewr_list);</div><div class='ctx'> static DEFINE_SPINLOCK(dcb_lock);</div><div class='ctx'> </div><div class='add'>+static enum ieee_attrs_app dcbnl_app_attr_type_get(u8 selector)</div><div class='add'>+{</div><div class='add'>+	switch (selector) {</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_ETHERTYPE:</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_STREAM:</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_DGRAM:</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_ANY:</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_DSCP:</div><div class='add'>+		return DCB_ATTR_IEEE_APP;</div><div class='add'>+	case DCB_APP_SEL_PCP:</div><div class='add'>+		return DCB_ATTR_DCB_APP;</div><div class='add'>+	default:</div><div class='add'>+		return DCB_ATTR_IEEE_APP_UNSPEC;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dcbnl_app_attr_type_validate(enum ieee_attrs_app type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case DCB_ATTR_IEEE_APP:</div><div class='add'>+	case DCB_ATTR_DCB_APP:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dcbnl_app_selector_validate(enum ieee_attrs_app type, u8 selector)</div><div class='add'>+{</div><div class='add'>+	return dcbnl_app_attr_type_get(selector) == type;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *dcbnl_newmsg(int type, u8 cmd, u32 port, u32 seq,</div><div class='ctx'> 				    u32 flags, struct nlmsghdr **nlhp)</div><div class='ctx'> {</div><div class='hunk'>@@ -241,12 +264,13 @@ static int dcbnl_getpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!netdev-&gt;dcbnl_ops-&gt;getpfccfg)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,</div><div class='del'>-			       tb[DCB_ATTR_PFC_CFG], dcbnl_pfc_up_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_PFC_UP_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_PFC_CFG],</div><div class='add'>+					  dcbnl_pfc_up_nest, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, DCB_ATTR_PFC_CFG);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, DCB_ATTR_PFC_CFG);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -299,12 +323,13 @@ static int dcbnl_getcap(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!netdev-&gt;dcbnl_ops-&gt;getcap)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_CAP_ATTR_MAX, tb[DCB_ATTR_CAP],</div><div class='del'>-			       dcbnl_cap_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_CAP_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_CAP], dcbnl_cap_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, DCB_ATTR_CAP);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, DCB_ATTR_CAP);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -343,12 +368,13 @@ static int dcbnl_getnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!netdev-&gt;dcbnl_ops-&gt;getnumtcs)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],</div><div class='del'>-			       dcbnl_numtcs_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_NUMTCS_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_NUMTCS],</div><div class='add'>+					  dcbnl_numtcs_nest, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, DCB_ATTR_NUMTCS);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, DCB_ATTR_NUMTCS);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -388,8 +414,9 @@ static int dcbnl_setnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!netdev-&gt;dcbnl_ops-&gt;setnumtcs)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],</div><div class='del'>-			       dcbnl_numtcs_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_NUMTCS_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_NUMTCS],</div><div class='add'>+					  dcbnl_numtcs_nest, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -447,8 +474,9 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_APP])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],</div><div class='del'>-			       dcbnl_app_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(app_tb, DCB_APP_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_APP], dcbnl_app_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +507,7 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 		up = dcb_getapp(netdev, &amp;app);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	app_nest = nla_nest_start(skb, DCB_ATTR_APP);</div><div class='add'>+	app_nest = nla_nest_start_noflag(skb, DCB_ATTR_APP);</div><div class='ctx'> 	if (!app_nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -515,8 +543,9 @@ static int dcbnl_setapp(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_APP])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],</div><div class='del'>-			       dcbnl_app_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(app_tb, DCB_APP_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_APP], dcbnl_app_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -573,12 +602,13 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	    !netdev-&gt;dcbnl_ops-&gt;getpgbwgcfgrx)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX, tb[DCB_ATTR_PG_CFG],</div><div class='del'>-			       dcbnl_pg_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(pg_tb, DCB_PG_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	pg_nest = nla_nest_start(skb, DCB_ATTR_PG_CFG);</div><div class='add'>+	pg_nest = nla_nest_start_noflag(skb, DCB_ATTR_PG_CFG);</div><div class='ctx'> 	if (!pg_nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -593,12 +623,13 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 			data = pg_tb[DCB_PG_ATTR_TC_ALL];</div><div class='ctx'> 		else</div><div class='ctx'> 			data = pg_tb[i];</div><div class='del'>-		ret = nla_parse_nested(param_tb, DCB_TC_ATTR_PARAM_MAX, data,</div><div class='del'>-				       dcbnl_tc_param_nest, NULL);</div><div class='add'>+		ret = nla_parse_nested_deprecated(param_tb,</div><div class='add'>+						  DCB_TC_ATTR_PARAM_MAX, data,</div><div class='add'>+						  dcbnl_tc_param_nest, NULL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_pg;</div><div class='ctx'> </div><div class='del'>-		param_nest = nla_nest_start(skb, i);</div><div class='add'>+		param_nest = nla_nest_start_noflag(skb, i);</div><div class='ctx'> 		if (!param_nest)</div><div class='ctx'> 			goto err_pg;</div><div class='ctx'> </div><div class='hunk'>@@ -730,8 +761,9 @@ static int dcbnl_setpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!netdev-&gt;dcbnl_ops-&gt;setpfccfg)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,</div><div class='del'>-			       tb[DCB_ATTR_PFC_CFG], dcbnl_pfc_up_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_PFC_UP_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_PFC_CFG],</div><div class='add'>+					  dcbnl_pfc_up_nest, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -786,8 +818,9 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	    !netdev-&gt;dcbnl_ops-&gt;setpgbwgcfgrx)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX, tb[DCB_ATTR_PG_CFG],</div><div class='del'>-			       dcbnl_pg_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(pg_tb, DCB_PG_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -795,8 +828,10 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 		if (!pg_tb[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = nla_parse_nested(param_tb, DCB_TC_ATTR_PARAM_MAX,</div><div class='del'>-				       pg_tb[i], dcbnl_tc_param_nest, NULL);</div><div class='add'>+		ret = nla_parse_nested_deprecated(param_tb,</div><div class='add'>+						  DCB_TC_ATTR_PARAM_MAX,</div><div class='add'>+						  pg_tb[i],</div><div class='add'>+						  dcbnl_tc_param_nest, NULL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -884,12 +919,13 @@ static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	    !netdev-&gt;dcbnl_ops-&gt;getbcncfg)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(bcn_tb, DCB_BCN_ATTR_MAX, tb[DCB_ATTR_BCN],</div><div class='del'>-			       dcbnl_bcn_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(bcn_tb, DCB_BCN_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_BCN], dcbnl_bcn_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	bcn_nest = nla_nest_start(skb, DCB_ATTR_BCN);</div><div class='add'>+	bcn_nest = nla_nest_start_noflag(skb, DCB_ATTR_BCN);</div><div class='ctx'> 	if (!bcn_nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -943,8 +979,9 @@ static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	    !netdev-&gt;dcbnl_ops-&gt;setbcnrp)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_BCN_ATTR_MAX, tb[DCB_ATTR_BCN],</div><div class='del'>-			       dcbnl_pfc_up_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_BCN_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_BCN], dcbnl_bcn_nest,</div><div class='add'>+					  NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1002,7 +1039,7 @@ static int dcbnl_build_peer_app(struct net_device *netdev, struct sk_buff* skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-		app = nla_nest_start(skb, app_nested_type);</div><div class='add'>+		app = nla_nest_start_noflag(skb, app_nested_type);</div><div class='ctx'> 		if (!app)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1024,19 +1061,93 @@ nla_put_failure:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dcbnl_getapptrust(struct net_device *netdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct dcbnl_rtnl_ops *ops = netdev-&gt;dcbnl_ops;</div><div class='add'>+	enum ieee_attrs_app type;</div><div class='add'>+	struct nlattr *apptrust;</div><div class='add'>+	int nselectors, err, i;</div><div class='add'>+	u8 *selectors;</div><div class='add'>+</div><div class='add'>+	selectors = kzalloc(IEEE_8021QAZ_APP_SEL_MAX + 1, GFP_KERNEL);</div><div class='add'>+	if (!selectors)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;dcbnl_getapptrust(netdev, selectors, &amp;nselectors);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	apptrust = nla_nest_start(skb, DCB_ATTR_DCB_APP_TRUST_TABLE);</div><div class='add'>+	if (!apptrust) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nselectors; i++) {</div><div class='add'>+		type = dcbnl_app_attr_type_get(selectors[i]);</div><div class='add'>+		err = nla_put_u8(skb, type, selectors[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			nla_nest_cancel(skb, apptrust);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, apptrust);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(selectors);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set or delete APP table or rewrite table entries. The APP struct is validated</div><div class='add'>+ * and the appropriate callback function is called.</div><div class='add'>+ */</div><div class='add'>+static int dcbnl_app_table_setdel(struct nlattr *attr,</div><div class='add'>+				  struct net_device *netdev,</div><div class='add'>+				  int (*setdel)(struct net_device *dev,</div><div class='add'>+						struct dcb_app *app))</div><div class='add'>+{</div><div class='add'>+	struct dcb_app *app_data;</div><div class='add'>+	enum ieee_attrs_app type;</div><div class='add'>+	struct nlattr *attr_itr;</div><div class='add'>+	int rem, err;</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(attr_itr, attr, rem) {</div><div class='add'>+		type = nla_type(attr_itr);</div><div class='add'>+</div><div class='add'>+		if (!dcbnl_app_attr_type_validate(type))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (nla_len(attr_itr) &lt; sizeof(struct dcb_app))</div><div class='add'>+			return -ERANGE;</div><div class='add'>+</div><div class='add'>+		app_data = nla_data(attr_itr);</div><div class='add'>+</div><div class='add'>+		if (!dcbnl_app_selector_validate(type, app_data-&gt;selector))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = setdel(netdev, app_data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Handle IEEE 802.1Qaz/802.1Qau/802.1Qbb GET commands. */</div><div class='ctx'> static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr *ieee, *app;</div><div class='del'>-	struct dcb_app_type *itr;</div><div class='ctx'> 	const struct dcbnl_rtnl_ops *ops = netdev-&gt;dcbnl_ops;</div><div class='add'>+	struct nlattr *ieee, *app, *rewr;</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='ctx'> 	int dcbx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(skb, DCB_ATTR_IFNAME, netdev-&gt;name))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	ieee = nla_nest_start(skb, DCB_ATTR_IEEE);</div><div class='add'>+	ieee = nla_nest_start_noflag(skb, DCB_ATTR_IEEE);</div><div class='ctx'> 	if (!ieee)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1106,15 +1217,16 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	app = nla_nest_start(skb, DCB_ATTR_IEEE_APP_TABLE);</div><div class='add'>+	app = nla_nest_start_noflag(skb, DCB_ATTR_IEEE_APP_TABLE);</div><div class='ctx'> 	if (!app)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dcb_lock);</div><div class='ctx'> 	list_for_each_entry(itr, &amp;dcb_app_list, list) {</div><div class='ctx'> 		if (itr-&gt;ifindex == netdev-&gt;ifindex) {</div><div class='del'>-			err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr-&gt;app),</div><div class='del'>-					 &amp;itr-&gt;app);</div><div class='add'>+			enum ieee_attrs_app type =</div><div class='add'>+				dcbnl_app_attr_type_get(itr-&gt;app.selector);</div><div class='add'>+			err = nla_put(skb, type, sizeof(itr-&gt;app), &amp;itr-&gt;app);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				spin_unlock_bh(&amp;dcb_lock);</div><div class='ctx'> 				return -EMSGSIZE;</div><div class='hunk'>@@ -1130,6 +1242,33 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	spin_unlock_bh(&amp;dcb_lock);</div><div class='ctx'> 	nla_nest_end(skb, app);</div><div class='ctx'> </div><div class='add'>+	rewr = nla_nest_start(skb, DCB_ATTR_DCB_REWR_TABLE);</div><div class='add'>+	if (!rewr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	list_for_each_entry(itr, &amp;dcb_rewr_list, list) {</div><div class='add'>+		if (itr-&gt;ifindex == netdev-&gt;ifindex) {</div><div class='add'>+			enum ieee_attrs_app type =</div><div class='add'>+				dcbnl_app_attr_type_get(itr-&gt;app.selector);</div><div class='add'>+			err = nla_put(skb, type, sizeof(itr-&gt;app), &amp;itr-&gt;app);</div><div class='add'>+			if (err) {</div><div class='add'>+				spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+				nla_nest_cancel(skb, rewr);</div><div class='add'>+				return -EMSGSIZE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+	nla_nest_end(skb, rewr);</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;dcbnl_getapptrust) {</div><div class='add'>+		err = dcbnl_getapptrust(netdev, skb);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* get peer info if available */</div><div class='ctx'> 	if (ops-&gt;ieee_peer_getets) {</div><div class='ctx'> 		struct ieee_ets ets;</div><div class='hunk'>@@ -1174,13 +1313,13 @@ static int dcbnl_cee_pg_fill(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	u8 pgid, up_map, prio, tc_pct;</div><div class='ctx'> 	const struct dcbnl_rtnl_ops *ops = dev-&gt;dcbnl_ops;</div><div class='ctx'> 	int i = dir ? DCB_ATTR_CEE_TX_PG : DCB_ATTR_CEE_RX_PG;</div><div class='del'>-	struct nlattr *pg = nla_nest_start(skb, i);</div><div class='add'>+	struct nlattr *pg = nla_nest_start_noflag(skb, i);</div><div class='ctx'> </div><div class='ctx'> 	if (!pg)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	for (i = DCB_PG_ATTR_TC_0; i &lt;= DCB_PG_ATTR_TC_7; i++) {</div><div class='del'>-		struct nlattr *tc_nest = nla_nest_start(skb, i);</div><div class='add'>+		struct nlattr *tc_nest = nla_nest_start_noflag(skb, i);</div><div class='ctx'> </div><div class='ctx'> 		if (!tc_nest)</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='hunk'>@@ -1231,7 +1370,7 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(skb, DCB_ATTR_IFNAME, netdev-&gt;name))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	cee = nla_nest_start(skb, DCB_ATTR_CEE);</div><div class='add'>+	cee = nla_nest_start_noflag(skb, DCB_ATTR_CEE);</div><div class='ctx'> 	if (!cee)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1250,7 +1389,8 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	/* local pfc */</div><div class='ctx'> 	if (ops-&gt;getpfccfg) {</div><div class='del'>-		struct nlattr *pfc_nest = nla_nest_start(skb, DCB_ATTR_CEE_PFC);</div><div class='add'>+		struct nlattr *pfc_nest = nla_nest_start_noflag(skb,</div><div class='add'>+								DCB_ATTR_CEE_PFC);</div><div class='ctx'> </div><div class='ctx'> 		if (!pfc_nest)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='hunk'>@@ -1265,14 +1405,14 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	/* local app */</div><div class='ctx'> 	spin_lock_bh(&amp;dcb_lock);</div><div class='del'>-	app = nla_nest_start(skb, DCB_ATTR_CEE_APP_TABLE);</div><div class='add'>+	app = nla_nest_start_noflag(skb, DCB_ATTR_CEE_APP_TABLE);</div><div class='ctx'> 	if (!app)</div><div class='ctx'> 		goto dcb_unlock;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(itr, &amp;dcb_app_list, list) {</div><div class='ctx'> 		if (itr-&gt;ifindex == netdev-&gt;ifindex) {</div><div class='del'>-			struct nlattr *app_nest = nla_nest_start(skb,</div><div class='del'>-								 DCB_ATTR_APP);</div><div class='add'>+			struct nlattr *app_nest = nla_nest_start_noflag(skb,</div><div class='add'>+									DCB_ATTR_APP);</div><div class='ctx'> 			if (!app_nest)</div><div class='ctx'> 				goto dcb_unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -1305,7 +1445,8 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	/* features flags */</div><div class='ctx'> 	if (ops-&gt;getfeatcfg) {</div><div class='del'>-		struct nlattr *feat = nla_nest_start(skb, DCB_ATTR_CEE_FEAT);</div><div class='add'>+		struct nlattr *feat = nla_nest_start_noflag(skb,</div><div class='add'>+							    DCB_ATTR_CEE_FEAT);</div><div class='ctx'> 		if (!feat)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1376,7 +1517,7 @@ static int dcbnl_notify(struct net_device *dev, int event, int cmd,</div><div class='ctx'> </div><div class='ctx'> 	skb = dcbnl_newmsg(event, cmd, portid, seq, 0, &amp;nlh);</div><div class='ctx'> 	if (!skb)</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (dcbx_ver == DCB_CAP_DCBX_VER_IEEE)</div><div class='ctx'> 		err = dcbnl_ieee_fill(skb, dev);</div><div class='hunk'>@@ -1421,6 +1562,7 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> {</div><div class='ctx'> 	const struct dcbnl_rtnl_ops *ops = netdev-&gt;dcbnl_ops;</div><div class='ctx'> 	struct nlattr *ieee[DCB_ATTR_IEEE_MAX + 1];</div><div class='add'>+	int prio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ops)</div><div class='hunk'>@@ -1429,8 +1571,9 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_IEEE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(ieee, DCB_ATTR_IEEE_MAX, tb[DCB_ATTR_IEEE],</div><div class='del'>-			       dcbnl_ieee_policy, NULL);</div><div class='add'>+	err = nla_parse_nested_deprecated(ieee, DCB_ATTR_IEEE_MAX,</div><div class='add'>+					  tb[DCB_ATTR_IEEE],</div><div class='add'>+					  dcbnl_ieee_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1469,34 +1612,79 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 		struct dcbnl_buffer *buffer =</div><div class='ctx'> 			nla_data(ieee[DCB_ATTR_DCB_BUFFER]);</div><div class='ctx'> </div><div class='add'>+		for (prio = 0; prio &lt; ARRAY_SIZE(buffer-&gt;prio2buffer); prio++) {</div><div class='add'>+			if (buffer-&gt;prio2buffer[prio] &gt;= DCBX_MAX_BUFFERS) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		err = ops-&gt;dcbnl_setbuffer(netdev, buffer);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ieee[DCB_ATTR_DCB_REWR_TABLE]) {</div><div class='add'>+		err = dcbnl_app_table_setdel(ieee[DCB_ATTR_DCB_REWR_TABLE],</div><div class='add'>+					     netdev,</div><div class='add'>+					     ops-&gt;dcbnl_setrewr ?: dcb_setrewr);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ieee[DCB_ATTR_IEEE_APP_TABLE]) {</div><div class='add'>+		err = dcbnl_app_table_setdel(ieee[DCB_ATTR_IEEE_APP_TABLE],</div><div class='add'>+					     netdev, ops-&gt;ieee_setapp ?:</div><div class='add'>+					     dcb_ieee_setapp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee[DCB_ATTR_DCB_APP_TRUST_TABLE]) {</div><div class='add'>+		u8 selectors[IEEE_8021QAZ_APP_SEL_MAX + 1] = {0};</div><div class='ctx'> 		struct nlattr *attr;</div><div class='add'>+		int nselectors = 0;</div><div class='ctx'> 		int rem;</div><div class='ctx'> </div><div class='del'>-		nla_for_each_nested(attr, ieee[DCB_ATTR_IEEE_APP_TABLE], rem) {</div><div class='del'>-			struct dcb_app *app_data;</div><div class='add'>+		if (!ops-&gt;dcbnl_setapptrust) {</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (nla_type(attr) != DCB_ATTR_IEEE_APP)</div><div class='del'>-				continue;</div><div class='add'>+		nla_for_each_nested(attr, ieee[DCB_ATTR_DCB_APP_TRUST_TABLE],</div><div class='add'>+				    rem) {</div><div class='add'>+			enum ieee_attrs_app type = nla_type(attr);</div><div class='add'>+			u8 selector;</div><div class='add'>+			int i;</div><div class='ctx'> </div><div class='del'>-			if (nla_len(attr) &lt; sizeof(struct dcb_app)) {</div><div class='del'>-				err = -ERANGE;</div><div class='add'>+			if (!dcbnl_app_attr_type_validate(type) ||</div><div class='add'>+			    nla_len(attr) != 1 ||</div><div class='add'>+			    nselectors &gt;= sizeof(selectors)) {</div><div class='add'>+				err = -EINVAL;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			app_data = nla_data(attr);</div><div class='del'>-			if (ops-&gt;ieee_setapp)</div><div class='del'>-				err = ops-&gt;ieee_setapp(netdev, app_data);</div><div class='del'>-			else</div><div class='del'>-				err = dcb_ieee_setapp(netdev, app_data);</div><div class='del'>-			if (err)</div><div class='add'>+			selector = nla_get_u8(attr);</div><div class='add'>+</div><div class='add'>+			if (!dcbnl_app_selector_validate(type, selector)) {</div><div class='add'>+				err = -EINVAL;</div><div class='ctx'> 				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Duplicate selector ? */</div><div class='add'>+			for (i = 0; i &lt; nselectors; i++) {</div><div class='add'>+				if (selectors[i] == selector) {</div><div class='add'>+					err = -EINVAL;</div><div class='add'>+					goto err;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			selectors[nselectors++] = selector;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;dcbnl_setapptrust(netdev, selectors, nselectors);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -1529,28 +1717,26 @@ static int dcbnl_ieee_del(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_IEEE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(ieee, DCB_ATTR_IEEE_MAX, tb[DCB_ATTR_IEEE],</div><div class='del'>-			       dcbnl_ieee_policy, NULL);</div><div class='add'>+	err = nla_parse_nested_deprecated(ieee, DCB_ATTR_IEEE_MAX,</div><div class='add'>+					  tb[DCB_ATTR_IEEE],</div><div class='add'>+					  dcbnl_ieee_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (ieee[DCB_ATTR_IEEE_APP_TABLE]) {</div><div class='del'>-		struct nlattr *attr;</div><div class='del'>-		int rem;</div><div class='del'>-</div><div class='del'>-		nla_for_each_nested(attr, ieee[DCB_ATTR_IEEE_APP_TABLE], rem) {</div><div class='del'>-			struct dcb_app *app_data;</div><div class='add'>+		err = dcbnl_app_table_setdel(ieee[DCB_ATTR_IEEE_APP_TABLE],</div><div class='add'>+					     netdev, ops-&gt;ieee_delapp ?:</div><div class='add'>+					     dcb_ieee_delapp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (nla_type(attr) != DCB_ATTR_IEEE_APP)</div><div class='del'>-				continue;</div><div class='del'>-			app_data = nla_data(attr);</div><div class='del'>-			if (ops-&gt;ieee_delapp)</div><div class='del'>-				err = ops-&gt;ieee_delapp(netdev, app_data);</div><div class='del'>-			else</div><div class='del'>-				err = dcb_ieee_delapp(netdev, app_data);</div><div class='del'>-			if (err)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='add'>+	if (ieee[DCB_ATTR_DCB_REWR_TABLE]) {</div><div class='add'>+		err = dcbnl_app_table_setdel(ieee[DCB_ATTR_DCB_REWR_TABLE],</div><div class='add'>+					     netdev,</div><div class='add'>+					     ops-&gt;dcbnl_delrewr ?: dcb_delrewr);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -1602,12 +1788,13 @@ static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_FEATCFG])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_FEATCFG_ATTR_MAX,</div><div class='del'>-			       tb[DCB_ATTR_FEATCFG], dcbnl_featcfg_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_FEATCFG_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_FEATCFG],</div><div class='add'>+					  dcbnl_featcfg_nest, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, DCB_ATTR_FEATCFG);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, DCB_ATTR_FEATCFG);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1646,8 +1833,9 @@ static int dcbnl_setfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!tb[DCB_ATTR_FEATCFG])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(data, DCB_FEATCFG_ATTR_MAX,</div><div class='del'>-			       tb[DCB_ATTR_FEATCFG], dcbnl_featcfg_nest, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(data, DCB_FEATCFG_ATTR_MAX,</div><div class='add'>+					  tb[DCB_ATTR_FEATCFG],</div><div class='add'>+					  dcbnl_featcfg_nest, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -1727,7 +1915,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct dcbmsg *dcb = nlmsg_data(nlh);</div><div class='ctx'> 	struct nlattr *tb[DCB_ATTR_MAX + 1];</div><div class='del'>-	u32 portid = skb ? NETLINK_CB(skb).portid : 0;</div><div class='add'>+	u32 portid = NETLINK_CB(skb).portid;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	struct sk_buff *reply_skb;</div><div class='ctx'> 	struct nlmsghdr *reply_nlh = NULL;</div><div class='hunk'>@@ -1736,8 +1924,8 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if ((nlh-&gt;nlmsg_type == RTM_SETDCB) &amp;&amp; !netlink_capable(skb, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,</div><div class='del'>-			  dcbnl_rtnl_policy, extack);</div><div class='add'>+	ret = nlmsg_parse_deprecated(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,</div><div class='add'>+				     dcbnl_rtnl_policy, extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1748,6 +1936,8 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	fn = &amp;reply_funcs[dcb-&gt;cmd];</div><div class='ctx'> 	if (!fn-&gt;cb)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='add'>+	if (fn-&gt;type == RTM_SETDCB &amp;&amp; !netlink_capable(skb, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (!tb[DCB_ATTR_IFNAME])</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1762,7 +1952,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	reply_skb = dcbnl_newmsg(fn-&gt;type, dcb-&gt;cmd, portid, nlh-&gt;nlmsg_seq,</div><div class='ctx'> 				 nlh-&gt;nlmsg_flags, &amp;reply_nlh);</div><div class='ctx'> 	if (!reply_skb)</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = fn-&gt;cb(netdev, nlh, nlh-&gt;nlmsg_seq, tb, reply_skb);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -1777,6 +1967,22 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dcb_app_type *dcb_rewr_lookup(const struct dcb_app *app,</div><div class='add'>+					    int ifindex, int proto)</div><div class='add'>+{</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(itr, &amp;dcb_rewr_list, list) {</div><div class='add'>+		if (itr-&gt;app.selector == app-&gt;selector &amp;&amp;</div><div class='add'>+		    itr-&gt;app.priority == app-&gt;priority &amp;&amp;</div><div class='add'>+		    itr-&gt;ifindex == ifindex &amp;&amp;</div><div class='add'>+		    ((proto == -1) || itr-&gt;app.protocol == proto))</div><div class='add'>+			return itr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dcb_app_type *dcb_app_lookup(const struct dcb_app *app,</div><div class='ctx'> 					   int ifindex, int prio)</div><div class='ctx'> {</div><div class='hunk'>@@ -1793,7 +1999,8 @@ static struct dcb_app_type *dcb_app_lookup(const struct dcb_app *app,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dcb_app_add(const struct dcb_app *app, int ifindex)</div><div class='add'>+static int dcb_app_add(struct list_head *list, const struct dcb_app *app,</div><div class='add'>+		       int ifindex)</div><div class='ctx'> {</div><div class='ctx'> 	struct dcb_app_type *entry;</div><div class='ctx'> </div><div class='hunk'>@@ -1803,13 +2010,15 @@ static int dcb_app_add(const struct dcb_app *app, int ifindex)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;entry-&gt;app, app, sizeof(*app));</div><div class='ctx'> 	entry-&gt;ifindex = ifindex;</div><div class='del'>-	list_add(&amp;entry-&gt;list, &amp;dcb_app_list);</div><div class='add'>+	list_add(&amp;entry-&gt;list, list);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dcb_getapp - retrieve the DCBX application user priority</div><div class='add'>+ * @dev: network interface</div><div class='add'>+ * @app: application to get user priority of</div><div class='ctx'>  *</div><div class='ctx'>  * On success returns a non-zero 802.1p user priority bitmap</div><div class='ctx'>  * otherwise returns 0 as the invalid user priority bitmap to</div><div class='hunk'>@@ -1832,6 +2041,8 @@ EXPORT_SYMBOL(dcb_getapp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dcb_setapp - add CEE dcb application data to app list</div><div class='add'>+ * @dev: network interface</div><div class='add'>+ * @new: application data to add</div><div class='ctx'>  *</div><div class='ctx'>  * Priority 0 is an invalid priority in CEE spec. This routine</div><div class='ctx'>  * removes applications from the app list if the priority is</div><div class='hunk'>@@ -1862,7 +2073,7 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* App type does not exist add new application type */</div><div class='ctx'> 	if (new-&gt;priority)</div><div class='del'>-		err = dcb_app_add(new, dev-&gt;ifindex);</div><div class='add'>+		err = dcb_app_add(&amp;dcb_app_list, new, dev-&gt;ifindex);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;dcb_lock);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -1873,6 +2084,8 @@ EXPORT_SYMBOL(dcb_setapp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dcb_ieee_getapp_mask - retrieve the IEEE DCB application priority</div><div class='add'>+ * @dev: network interface</div><div class='add'>+ * @app: where to store the retrieve application data</div><div class='ctx'>  *</div><div class='ctx'>  * Helper routine which on success returns a non-zero 802.1Qaz user</div><div class='ctx'>  * priority bitmap otherwise returns 0 to indicate the dcb_app was</div><div class='hunk'>@@ -1893,8 +2106,67 @@ u8 dcb_ieee_getapp_mask(struct net_device *dev, struct dcb_app *app)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dcb_ieee_getapp_mask);</div><div class='ctx'> </div><div class='add'>+/* Get protocol value from rewrite entry. */</div><div class='add'>+u16 dcb_getrewr(struct net_device *dev, struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='add'>+	u16 proto = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	itr = dcb_rewr_lookup(app, dev-&gt;ifindex, -1);</div><div class='add'>+	if (itr)</div><div class='add'>+		proto = itr-&gt;app.protocol;</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+</div><div class='add'>+	return proto;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dcb_getrewr);</div><div class='add'>+</div><div class='add'>+ /* Add rewrite entry to the rewrite list. */</div><div class='add'>+int dcb_setrewr(struct net_device *dev, struct dcb_app *new)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	/* Search for existing match and abort if found. */</div><div class='add'>+	if (dcb_rewr_lookup(new, dev-&gt;ifindex, new-&gt;protocol)) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dcb_app_add(&amp;dcb_rewr_list, new, dev-&gt;ifindex);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dcb_setrewr);</div><div class='add'>+</div><div class='add'>+/* Delete rewrite entry from the rewrite list. */</div><div class='add'>+int dcb_delrewr(struct net_device *dev, struct dcb_app *del)</div><div class='add'>+{</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	/* Search for existing match and remove it. */</div><div class='add'>+	itr = dcb_rewr_lookup(del, dev-&gt;ifindex, del-&gt;protocol);</div><div class='add'>+	if (itr) {</div><div class='add'>+		list_del(&amp;itr-&gt;list);</div><div class='add'>+		kfree(itr);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dcb_delrewr);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * dcb_ieee_setapp - add IEEE dcb application data to app list</div><div class='add'>+ * @dev: network interface</div><div class='add'>+ * @new: application data to add</div><div class='ctx'>  *</div><div class='ctx'>  * This adds Application data to the list. Multiple application</div><div class='ctx'>  * entries may exists for the same selector and protocol as long</div><div class='hunk'>@@ -1918,7 +2190,7 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = dcb_app_add(new, dev-&gt;ifindex);</div><div class='add'>+	err = dcb_app_add(&amp;dcb_app_list, new, dev-&gt;ifindex);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;dcb_lock);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -1929,6 +2201,8 @@ EXPORT_SYMBOL(dcb_ieee_setapp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dcb_ieee_delapp - delete IEEE dcb application data from list</div><div class='add'>+ * @dev: network interface</div><div class='add'>+ * @del: application data to delete</div><div class='ctx'>  *</div><div class='ctx'>  * This removes a matching APP data from the APP list</div><div class='ctx'>  */</div><div class='hunk'>@@ -1958,7 +2232,59 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dcb_ieee_delapp);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/* dcb_getrewr_prio_pcp_mask_map - For a given device, find mapping from</div><div class='add'>+ * priorities to the PCP and DEI values assigned to that priority.</div><div class='add'>+ */</div><div class='add'>+void dcb_getrewr_prio_pcp_mask_map(const struct net_device *dev,</div><div class='add'>+				   struct dcb_rewr_prio_pcp_map *p_map)</div><div class='add'>+{</div><div class='add'>+	int ifindex = dev-&gt;ifindex;</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='add'>+	u8 prio;</div><div class='add'>+</div><div class='add'>+	memset(p_map-&gt;map, 0, sizeof(p_map-&gt;map));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	list_for_each_entry(itr, &amp;dcb_rewr_list, list) {</div><div class='add'>+		if (itr-&gt;ifindex == ifindex &amp;&amp;</div><div class='add'>+		    itr-&gt;app.selector == DCB_APP_SEL_PCP &amp;&amp;</div><div class='add'>+		    itr-&gt;app.protocol &lt; 16 &amp;&amp;</div><div class='add'>+		    itr-&gt;app.priority &lt; IEEE_8021QAZ_MAX_TCS) {</div><div class='add'>+			prio = itr-&gt;app.priority;</div><div class='add'>+			p_map-&gt;map[prio] |= 1 &lt;&lt; itr-&gt;app.protocol;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dcb_getrewr_prio_pcp_mask_map);</div><div class='add'>+</div><div class='add'>+/* dcb_getrewr_prio_dscp_mask_map - For a given device, find mapping from</div><div class='add'>+ * priorities to the DSCP values assigned to that priority.</div><div class='add'>+ */</div><div class='add'>+void dcb_getrewr_prio_dscp_mask_map(const struct net_device *dev,</div><div class='add'>+				    struct dcb_ieee_app_prio_map *p_map)</div><div class='add'>+{</div><div class='add'>+	int ifindex = dev-&gt;ifindex;</div><div class='add'>+	struct dcb_app_type *itr;</div><div class='add'>+	u8 prio;</div><div class='add'>+</div><div class='add'>+	memset(p_map-&gt;map, 0, sizeof(p_map-&gt;map));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+	list_for_each_entry(itr, &amp;dcb_rewr_list, list) {</div><div class='add'>+		if (itr-&gt;ifindex == ifindex &amp;&amp;</div><div class='add'>+		    itr-&gt;app.selector == IEEE_8021QAZ_APP_SEL_DSCP &amp;&amp;</div><div class='add'>+		    itr-&gt;app.protocol &lt; 64 &amp;&amp;</div><div class='add'>+		    itr-&gt;app.priority &lt; IEEE_8021QAZ_MAX_TCS) {</div><div class='add'>+			prio = itr-&gt;app.priority;</div><div class='add'>+			p_map-&gt;map[prio] |= 1ULL &lt;&lt; itr-&gt;app.protocol;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dcb_getrewr_prio_dscp_mask_map);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * dcb_ieee_getapp_prio_dscp_mask_map - For a given device, find mapping from</div><div class='ctx'>  * priorities to the DSCP values assigned to that priority. Initialize p_map</div><div class='ctx'>  * such that each map element holds a bit mask of DSCP values configured for</div><div class='hunk'>@@ -1987,7 +2313,7 @@ void dcb_ieee_getapp_prio_dscp_mask_map(const struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dcb_ieee_getapp_prio_dscp_mask_map);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * dcb_ieee_getapp_dscp_prio_mask_map - For a given device, find mapping from</div><div class='ctx'>  * DSCP values to the priorities assigned to that DSCP value. Initialize p_map</div><div class='ctx'>  * such that each map element holds a bit mask of priorities configured for a</div><div class='hunk'>@@ -2014,7 +2340,7 @@ dcb_ieee_getapp_dscp_prio_mask_map(const struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dcb_ieee_getapp_dscp_prio_mask_map);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Per 802.1Q-2014, the selector value of 1 is used for matching on Ethernet</div><div class='ctx'>  * type, with valid PID values &gt;= 1536. A special meaning is then assigned to</div><div class='ctx'>  * protocol value of 0: "default priority. For use when priority is not</div><div class='hunk'>@@ -2044,12 +2370,58 @@ u8 dcb_ieee_getapp_default_prio_mask(const struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dcb_ieee_getapp_default_prio_mask);</div><div class='ctx'> </div><div class='add'>+static void dcbnl_flush_dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dcb_app_type *itr, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dcb_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(itr, tmp, &amp;dcb_app_list, list) {</div><div class='add'>+		if (itr-&gt;ifindex == dev-&gt;ifindex) {</div><div class='add'>+			list_del(&amp;itr-&gt;list);</div><div class='add'>+			kfree(itr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dcb_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dcbnl_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				 unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		if (!dev-&gt;dcbnl_ops)</div><div class='add'>+			return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+		dcbnl_flush_dev(dev);</div><div class='add'>+</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	default:</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block dcbnl_nb __read_mostly = {</div><div class='add'>+	.notifier_call  = dcbnl_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler dcbnl_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_GETDCB, .doit = dcb_doit},</div><div class='add'>+	{.msgtype = RTM_SETDCB, .doit = dcb_doit},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init dcbnl_init(void)</div><div class='ctx'> {</div><div class='del'>-	INIT_LIST_HEAD(&amp;dcb_app_list);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;dcbnl_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_GETDCB, dcb_doit, NULL, 0);</div><div class='del'>-	rtnl_register(PF_UNSPEC, RTM_SETDCB, dcb_doit, NULL, 0);</div><div class='add'>+	rtnl_register_many(dcbnl_rtnl_msg_handlers);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig<br/>deleted file mode 100644<br/>index b270e84d9c13..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-menuconfig IP_DCCP</div><div class='del'>-	tristate "The DCCP Protocol"</div><div class='del'>-	depends on INET</div><div class='del'>-	---help---</div><div class='del'>-	  Datagram Congestion Control Protocol (RFC 4340)</div><div class='del'>-</div><div class='del'>-	  From http://www.ietf.org/rfc/rfc4340.txt:</div><div class='del'>-</div><div class='del'>-	  The Datagram Congestion Control Protocol (DCCP) is a transport</div><div class='del'>-	  protocol that implements bidirectional, unicast connections of</div><div class='del'>-	  congestion-controlled, unreliable datagrams. It should be suitable</div><div class='del'>-	  for use by applications such as streaming media, Internet telephony,</div><div class='del'>-	  and on-line games.</div><div class='del'>-</div><div class='del'>-	  To compile this protocol support as a module, choose M here: the</div><div class='del'>-	  module will be called dccp.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='del'>-if IP_DCCP</div><div class='del'>-</div><div class='del'>-config INET_DCCP_DIAG</div><div class='del'>-	depends on INET_DIAG</div><div class='del'>-	def_tristate y if (IP_DCCP = y &amp;&amp; INET_DIAG = y)</div><div class='del'>-	def_tristate m</div><div class='del'>-</div><div class='del'>-source "net/dccp/ccids/Kconfig"</div><div class='del'>-</div><div class='del'>-menu "DCCP Kernel Hacking"</div><div class='del'>-	depends on DEBUG_KERNEL=y</div><div class='del'>-</div><div class='del'>-config IP_DCCP_DEBUG</div><div class='del'>-	bool "DCCP debug messages"</div><div class='del'>-	---help---</div><div class='del'>-	  Only use this if you're hacking DCCP.</div><div class='del'>-</div><div class='del'>-	  When compiling DCCP as a module, this debugging output can be toggled</div><div class='del'>-	  by setting the parameter dccp_debug of the `dccp' module to 0 or 1.</div><div class='del'>-</div><div class='del'>-	  Just say N.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-endmenu</div><div class='del'>-</div><div class='del'>-endif # IP_DDCP</div><div class='head'>diff --git a/net/dccp/Makefile b/net/dccp/Makefile<br/>deleted file mode 100644<br/>index 5b4ff37bc806..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o</div><div class='del'>-</div><div class='del'>-dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o \</div><div class='del'>-	  qpolicy.o</div><div class='del'>-#</div><div class='del'>-# CCID algorithms to be used by dccp.ko</div><div class='del'>-#</div><div class='del'>-# CCID-2 is default (RFC 4340, p. 77) and has Ack Vectors as dependency</div><div class='del'>-dccp-y += ccids/ccid2.o ackvec.o</div><div class='del'>-dccp-$(CONFIG_IP_DCCP_CCID3)	+= ccids/ccid3.o</div><div class='del'>-dccp-$(CONFIG_IP_DCCP_TFRC_LIB) += ccids/lib/tfrc.o		\</div><div class='del'>-				   ccids/lib/tfrc_equation.o	\</div><div class='del'>-				   ccids/lib/packet_history.o	\</div><div class='del'>-				   ccids/lib/loss_interval.o</div><div class='del'>-</div><div class='del'>-dccp_ipv4-y := ipv4.o</div><div class='del'>-</div><div class='del'>-# build dccp_ipv6 as module whenever either IPv6 or DCCP is a module</div><div class='del'>-obj-$(subst y,$(CONFIG_IP_DCCP),$(CONFIG_IPV6)) += dccp_ipv6.o</div><div class='del'>-dccp_ipv6-y := ipv6.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o</div><div class='del'>-</div><div class='del'>-dccp-$(CONFIG_SYSCTL) += sysctl.o</div><div class='del'>-</div><div class='del'>-dccp_diag-y := diag.o</div><div class='del'>-</div><div class='del'>-# build with local directory for trace.h</div><div class='del'>-CFLAGS_proto.o := -I$(src)</div><div class='head'>diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c<br/>deleted file mode 100644<br/>index 2a24f7d171a5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ackvec.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ackvec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,405 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ackvec.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of Ack Vectors for the DCCP protocol</div><div class='del'>- *  Copyright (c) 2007 University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>- *</div><div class='del'>- *      This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *      under the terms of the GNU General Public License as published by the</div><div class='del'>- *      Free Software Foundation; version 2 of the License;</div><div class='del'>- */</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *dccp_ackvec_slab;</div><div class='del'>-static struct kmem_cache *dccp_ackvec_record_slab;</div><div class='del'>-</div><div class='del'>-struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec *av = kmem_cache_zalloc(dccp_ackvec_slab, priority);</div><div class='del'>-</div><div class='del'>-	if (av != NULL) {</div><div class='del'>-		av-&gt;av_buf_head	= av-&gt;av_buf_tail = DCCPAV_MAX_ACKVEC_LEN - 1;</div><div class='del'>-		INIT_LIST_HEAD(&amp;av-&gt;av_records);</div><div class='del'>-	}</div><div class='del'>-	return av;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_ackvec_purge_records(struct dccp_ackvec *av)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_record *cur, *next;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(cur, next, &amp;av-&gt;av_records, avr_node)</div><div class='del'>-		kmem_cache_free(dccp_ackvec_record_slab, cur);</div><div class='del'>-	INIT_LIST_HEAD(&amp;av-&gt;av_records);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_ackvec_free(struct dccp_ackvec *av)</div><div class='del'>-{</div><div class='del'>-	if (likely(av != NULL)) {</div><div class='del'>-		dccp_ackvec_purge_records(av);</div><div class='del'>-		kmem_cache_free(dccp_ackvec_slab, av);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_ackvec_update_records  -  Record information about sent Ack Vectors</div><div class='del'>- * @av:		Ack Vector records to update</div><div class='del'>- * @seqno:	Sequence number of the packet carrying the Ack Vector just sent</div><div class='del'>- * @nonce_sum:	The sum of all buffer nonces contained in the Ack Vector</div><div class='del'>- */</div><div class='del'>-int dccp_ackvec_update_records(struct dccp_ackvec *av, u64 seqno, u8 nonce_sum)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_record *avr;</div><div class='del'>-</div><div class='del'>-	avr = kmem_cache_alloc(dccp_ackvec_record_slab, GFP_ATOMIC);</div><div class='del'>-	if (avr == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	avr-&gt;avr_ack_seqno  = seqno;</div><div class='del'>-	avr-&gt;avr_ack_ptr    = av-&gt;av_buf_head;</div><div class='del'>-	avr-&gt;avr_ack_ackno  = av-&gt;av_buf_ackno;</div><div class='del'>-	avr-&gt;avr_ack_nonce  = nonce_sum;</div><div class='del'>-	avr-&gt;avr_ack_runlen = dccp_ackvec_runlen(av-&gt;av_buf + av-&gt;av_buf_head);</div><div class='del'>-	/*</div><div class='del'>-	 * When the buffer overflows, we keep no more than one record. This is</div><div class='del'>-	 * the simplest way of disambiguating sender-Acks dating from before the</div><div class='del'>-	 * overflow from sender-Acks which refer to after the overflow; a simple</div><div class='del'>-	 * solution is preferable here since we are handling an exception.</div><div class='del'>-	 */</div><div class='del'>-	if (av-&gt;av_overflow)</div><div class='del'>-		dccp_ackvec_purge_records(av);</div><div class='del'>-	/*</div><div class='del'>-	 * Since GSS is incremented for each packet, the list is automatically</div><div class='del'>-	 * arranged in descending order of @ack_seqno.</div><div class='del'>-	 */</div><div class='del'>-	list_add(&amp;avr-&gt;avr_node, &amp;av-&gt;av_records);</div><div class='del'>-</div><div class='del'>-	dccp_pr_debug("Added Vector, ack_seqno=%llu, ack_ackno=%llu (rl=%u)\n",</div><div class='del'>-		      (unsigned long long)avr-&gt;avr_ack_seqno,</div><div class='del'>-		      (unsigned long long)avr-&gt;avr_ack_ackno,</div><div class='del'>-		      avr-&gt;avr_ack_runlen);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dccp_ackvec_record *dccp_ackvec_lookup(struct list_head *av_list,</div><div class='del'>-						     const u64 ackno)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_record *avr;</div><div class='del'>-	/*</div><div class='del'>-	 * Exploit that records are inserted in descending order of sequence</div><div class='del'>-	 * number, start with the oldest record first. If @ackno is `before'</div><div class='del'>-	 * the earliest ack_ackno, the packet is too old to be considered.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry_reverse(avr, av_list, avr_node) {</div><div class='del'>-		if (avr-&gt;avr_ack_seqno == ackno)</div><div class='del'>-			return avr;</div><div class='del'>-		if (before48(ackno, avr-&gt;avr_ack_seqno))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Buffer index and length computation using modulo-buffersize arithmetic.</div><div class='del'>- * Note that, as pointers move from right to left, head is `before' tail.</div><div class='del'>- */</div><div class='del'>-static inline u16 __ackvec_idx_add(const u16 a, const u16 b)</div><div class='del'>-{</div><div class='del'>-	return (a + b) % DCCPAV_MAX_ACKVEC_LEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 __ackvec_idx_sub(const u16 a, const u16 b)</div><div class='del'>-{</div><div class='del'>-	return __ackvec_idx_add(a, DCCPAV_MAX_ACKVEC_LEN - b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 dccp_ackvec_buflen(const struct dccp_ackvec *av)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(av-&gt;av_overflow))</div><div class='del'>-		return DCCPAV_MAX_ACKVEC_LEN;</div><div class='del'>-	return __ackvec_idx_sub(av-&gt;av_buf_tail, av-&gt;av_buf_head);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_ackvec_update_old  -  Update previous state as per RFC 4340, 11.4.1</div><div class='del'>- * @av:		non-empty buffer to update</div><div class='del'>- * @distance:   negative or zero distance of @seqno from buf_ackno downward</div><div class='del'>- * @seqno:	the (old) sequence number whose record is to be updated</div><div class='del'>- * @state:	state in which packet carrying @seqno was received</div><div class='del'>- */</div><div class='del'>-static void dccp_ackvec_update_old(struct dccp_ackvec *av, s64 distance,</div><div class='del'>-				   u64 seqno, enum dccp_ackvec_states state)</div><div class='del'>-{</div><div class='del'>-	u16 ptr = av-&gt;av_buf_head;</div><div class='del'>-</div><div class='del'>-	BUG_ON(distance &gt; 0);</div><div class='del'>-	if (unlikely(dccp_ackvec_is_empty(av)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		u8 runlen = dccp_ackvec_runlen(av-&gt;av_buf + ptr);</div><div class='del'>-</div><div class='del'>-		if (distance + runlen &gt;= 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * Only update the state if packet has not been received</div><div class='del'>-			 * yet. This is OK as per the second table in RFC 4340,</div><div class='del'>-			 * 11.4.1; i.e. here we are using the following table:</div><div class='del'>-			 *                     RECEIVED</div><div class='del'>-			 *                      0   1   3</div><div class='del'>-			 *              S     +---+---+---+</div><div class='del'>-			 *              T   0 | 0 | 0 | 0 |</div><div class='del'>-			 *              O     +---+---+---+</div><div class='del'>-			 *              R   1 | 1 | 1 | 1 |</div><div class='del'>-			 *              E     +---+---+---+</div><div class='del'>-			 *              D   3 | 0 | 1 | 3 |</div><div class='del'>-			 *                    +---+---+---+</div><div class='del'>-			 * The "Not Received" state was set by reserve_seats().</div><div class='del'>-			 */</div><div class='del'>-			if (av-&gt;av_buf[ptr] == DCCPAV_NOT_RECEIVED)</div><div class='del'>-				av-&gt;av_buf[ptr] = state;</div><div class='del'>-			else</div><div class='del'>-				dccp_pr_debug("Not changing %llu state to %u\n",</div><div class='del'>-					      (unsigned long long)seqno, state);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		distance += runlen + 1;</div><div class='del'>-		ptr	  = __ackvec_idx_add(ptr, 1);</div><div class='del'>-</div><div class='del'>-	} while (ptr != av-&gt;av_buf_tail);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Mark @num entries after buf_head as "Not yet received". */</div><div class='del'>-static void dccp_ackvec_reserve_seats(struct dccp_ackvec *av, u16 num)</div><div class='del'>-{</div><div class='del'>-	u16 start = __ackvec_idx_add(av-&gt;av_buf_head, 1),</div><div class='del'>-	    len	  = DCCPAV_MAX_ACKVEC_LEN - start;</div><div class='del'>-</div><div class='del'>-	/* check for buffer wrap-around */</div><div class='del'>-	if (num &gt; len) {</div><div class='del'>-		memset(av-&gt;av_buf + start, DCCPAV_NOT_RECEIVED, len);</div><div class='del'>-		start = 0;</div><div class='del'>-		num  -= len;</div><div class='del'>-	}</div><div class='del'>-	if (num)</div><div class='del'>-		memset(av-&gt;av_buf + start, DCCPAV_NOT_RECEIVED, num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_ackvec_add_new  -  Record one or more new entries in Ack Vector buffer</div><div class='del'>- * @av:		 container of buffer to update (can be empty or non-empty)</div><div class='del'>- * @num_packets: number of packets to register (must be &gt;= 1)</div><div class='del'>- * @seqno:	 sequence number of the first packet in @num_packets</div><div class='del'>- * @state:	 state in which packet carrying @seqno was received</div><div class='del'>- */</div><div class='del'>-static void dccp_ackvec_add_new(struct dccp_ackvec *av, u32 num_packets,</div><div class='del'>-				u64 seqno, enum dccp_ackvec_states state)</div><div class='del'>-{</div><div class='del'>-	u32 num_cells = num_packets;</div><div class='del'>-</div><div class='del'>-	if (num_packets &gt; DCCPAV_BURST_THRESH) {</div><div class='del'>-		u32 lost_packets = num_packets - 1;</div><div class='del'>-</div><div class='del'>-		DCCP_WARN("Warning: large burst loss (%u)\n", lost_packets);</div><div class='del'>-		/*</div><div class='del'>-		 * We received 1 packet and have a loss of size "num_packets-1"</div><div class='del'>-		 * which we squeeze into num_cells-1 rather than reserving an</div><div class='del'>-		 * entire byte for each lost packet.</div><div class='del'>-		 * The reason is that the vector grows in O(burst_length); when</div><div class='del'>-		 * it grows too large there will no room left for the payload.</div><div class='del'>-		 * This is a trade-off: if a few packets out of the burst show</div><div class='del'>-		 * up later, their state will not be changed; it is simply too</div><div class='del'>-		 * costly to reshuffle/reallocate/copy the buffer each time.</div><div class='del'>-		 * Should such problems persist, we will need to switch to a</div><div class='del'>-		 * different underlying data structure.</div><div class='del'>-		 */</div><div class='del'>-		for (num_packets = num_cells = 1; lost_packets; ++num_cells) {</div><div class='del'>-			u8 len = min_t(u32, lost_packets, DCCPAV_MAX_RUNLEN);</div><div class='del'>-</div><div class='del'>-			av-&gt;av_buf_head = __ackvec_idx_sub(av-&gt;av_buf_head, 1);</div><div class='del'>-			av-&gt;av_buf[av-&gt;av_buf_head] = DCCPAV_NOT_RECEIVED | len;</div><div class='del'>-</div><div class='del'>-			lost_packets -= len;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num_cells + dccp_ackvec_buflen(av) &gt;= DCCPAV_MAX_ACKVEC_LEN) {</div><div class='del'>-		DCCP_CRIT("Ack Vector buffer overflow: dropping old entries");</div><div class='del'>-		av-&gt;av_overflow = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	av-&gt;av_buf_head = __ackvec_idx_sub(av-&gt;av_buf_head, num_packets);</div><div class='del'>-	if (av-&gt;av_overflow)</div><div class='del'>-		av-&gt;av_buf_tail = av-&gt;av_buf_head;</div><div class='del'>-</div><div class='del'>-	av-&gt;av_buf[av-&gt;av_buf_head] = state;</div><div class='del'>-	av-&gt;av_buf_ackno	    = seqno;</div><div class='del'>-</div><div class='del'>-	if (num_packets &gt; 1)</div><div class='del'>-		dccp_ackvec_reserve_seats(av, num_packets - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_ackvec_input  -  Register incoming packet in the buffer</div><div class='del'>- */</div><div class='del'>-void dccp_ackvec_input(struct dccp_ackvec *av, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u64 seqno = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-	enum dccp_ackvec_states state = DCCPAV_RECEIVED;</div><div class='del'>-</div><div class='del'>-	if (dccp_ackvec_is_empty(av)) {</div><div class='del'>-		dccp_ackvec_add_new(av, 1, seqno, state);</div><div class='del'>-		av-&gt;av_tail_ackno = seqno;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		s64 num_packets = dccp_delta_seqno(av-&gt;av_buf_ackno, seqno);</div><div class='del'>-		u8 *current_head = av-&gt;av_buf + av-&gt;av_buf_head;</div><div class='del'>-</div><div class='del'>-		if (num_packets == 1 &amp;&amp;</div><div class='del'>-		    dccp_ackvec_state(current_head) == state &amp;&amp;</div><div class='del'>-		    dccp_ackvec_runlen(current_head) &lt; DCCPAV_MAX_RUNLEN) {</div><div class='del'>-</div><div class='del'>-			*current_head   += 1;</div><div class='del'>-			av-&gt;av_buf_ackno = seqno;</div><div class='del'>-</div><div class='del'>-		} else if (num_packets &gt; 0) {</div><div class='del'>-			dccp_ackvec_add_new(av, num_packets, seqno, state);</div><div class='del'>-		} else {</div><div class='del'>-			dccp_ackvec_update_old(av, num_packets, seqno, state);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_ackvec_clear_state  -  Perform house-keeping / garbage-collection</div><div class='del'>- * This routine is called when the peer acknowledges the receipt of Ack Vectors</div><div class='del'>- * up to and including @ackno. While based on on section A.3 of RFC 4340, here</div><div class='del'>- * are additional precautions to prevent corrupted buffer state. In particular,</div><div class='del'>- * we use tail_ackno to identify outdated records; it always marks the earliest</div><div class='del'>- * packet of group (2) in 11.4.2.</div><div class='del'>- */</div><div class='del'>-void dccp_ackvec_clear_state(struct dccp_ackvec *av, const u64 ackno)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_record *avr, *next;</div><div class='del'>-	u8 runlen_now, eff_runlen;</div><div class='del'>-	s64 delta;</div><div class='del'>-</div><div class='del'>-	avr = dccp_ackvec_lookup(&amp;av-&gt;av_records, ackno);</div><div class='del'>-	if (avr == NULL)</div><div class='del'>-		return;</div><div class='del'>-	/*</div><div class='del'>-	 * Deal with outdated acknowledgments: this arises when e.g. there are</div><div class='del'>-	 * several old records and the acks from the peer come in slowly. In</div><div class='del'>-	 * that case we may still have records that pre-date tail_ackno.</div><div class='del'>-	 */</div><div class='del'>-	delta = dccp_delta_seqno(av-&gt;av_tail_ackno, avr-&gt;avr_ack_ackno);</div><div class='del'>-	if (delta &lt; 0)</div><div class='del'>-		goto free_records;</div><div class='del'>-	/*</div><div class='del'>-	 * Deal with overlapping Ack Vectors: don't subtract more than the</div><div class='del'>-	 * number of packets between tail_ackno and ack_ackno.</div><div class='del'>-	 */</div><div class='del'>-	eff_runlen = delta &lt; avr-&gt;avr_ack_runlen ? delta : avr-&gt;avr_ack_runlen;</div><div class='del'>-</div><div class='del'>-	runlen_now = dccp_ackvec_runlen(av-&gt;av_buf + avr-&gt;avr_ack_ptr);</div><div class='del'>-	/*</div><div class='del'>-	 * The run length of Ack Vector cells does not decrease over time. If</div><div class='del'>-	 * the run length is the same as at the time the Ack Vector was sent, we</div><div class='del'>-	 * free the ack_ptr cell. That cell can however not be freed if the run</div><div class='del'>-	 * length has increased: in this case we need to move the tail pointer</div><div class='del'>-	 * backwards (towards higher indices), to its next-oldest neighbour.</div><div class='del'>-	 */</div><div class='del'>-	if (runlen_now &gt; eff_runlen) {</div><div class='del'>-</div><div class='del'>-		av-&gt;av_buf[avr-&gt;avr_ack_ptr] -= eff_runlen + 1;</div><div class='del'>-		av-&gt;av_buf_tail = __ackvec_idx_add(avr-&gt;avr_ack_ptr, 1);</div><div class='del'>-</div><div class='del'>-		/* This move may not have cleared the overflow flag. */</div><div class='del'>-		if (av-&gt;av_overflow)</div><div class='del'>-			av-&gt;av_overflow = (av-&gt;av_buf_head == av-&gt;av_buf_tail);</div><div class='del'>-	} else {</div><div class='del'>-		av-&gt;av_buf_tail	= avr-&gt;avr_ack_ptr;</div><div class='del'>-		/*</div><div class='del'>-		 * We have made sure that avr points to a valid cell within the</div><div class='del'>-		 * buffer. This cell is either older than head, or equals head</div><div class='del'>-		 * (empty buffer): in both cases we no longer have any overflow.</div><div class='del'>-		 */</div><div class='del'>-		av-&gt;av_overflow	= 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The peer has acknowledged up to and including ack_ackno. Hence the</div><div class='del'>-	 * first packet in group (2) of 11.4.2 is the successor of ack_ackno.</div><div class='del'>-	 */</div><div class='del'>-	av-&gt;av_tail_ackno = ADD48(avr-&gt;avr_ack_ackno, 1);</div><div class='del'>-</div><div class='del'>-free_records:</div><div class='del'>-	list_for_each_entry_safe_from(avr, next, &amp;av-&gt;av_records, avr_node) {</div><div class='del'>-		list_del(&amp;avr-&gt;avr_node);</div><div class='del'>-		kmem_cache_free(dccp_ackvec_record_slab, avr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Routines to keep track of Ack Vectors received in an skb</div><div class='del'>- */</div><div class='del'>-int dccp_ackvec_parsed_add(struct list_head *head, u8 *vec, u8 len, u8 nonce)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_parsed *new = kmalloc(sizeof(*new), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (new == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	new-&gt;vec   = vec;</div><div class='del'>-	new-&gt;len   = len;</div><div class='del'>-	new-&gt;nonce = nonce;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;new-&gt;node, head);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_ackvec_parsed_add);</div><div class='del'>-</div><div class='del'>-void dccp_ackvec_parsed_cleanup(struct list_head *parsed_chunks)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec_parsed *cur, *next;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(cur, next, parsed_chunks, node)</div><div class='del'>-		kfree(cur);</div><div class='del'>-	INIT_LIST_HEAD(parsed_chunks);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_ackvec_parsed_cleanup);</div><div class='del'>-</div><div class='del'>-int __init dccp_ackvec_init(void)</div><div class='del'>-{</div><div class='del'>-	dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",</div><div class='del'>-					     sizeof(struct dccp_ackvec), 0,</div><div class='del'>-					     SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	if (dccp_ackvec_slab == NULL)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	dccp_ackvec_record_slab = kmem_cache_create("dccp_ackvec_record",</div><div class='del'>-					     sizeof(struct dccp_ackvec_record),</div><div class='del'>-					     0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	if (dccp_ackvec_record_slab == NULL)</div><div class='del'>-		goto out_destroy_slab;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_destroy_slab:</div><div class='del'>-	kmem_cache_destroy(dccp_ackvec_slab);</div><div class='del'>-	dccp_ackvec_slab = NULL;</div><div class='del'>-out_err:</div><div class='del'>-	DCCP_CRIT("Unable to create Ack Vector slab cache");</div><div class='del'>-	return -ENOBUFS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_ackvec_exit(void)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_destroy(dccp_ackvec_slab);</div><div class='del'>-	dccp_ackvec_slab = NULL;</div><div class='del'>-	kmem_cache_destroy(dccp_ackvec_record_slab);</div><div class='del'>-	dccp_ackvec_record_slab = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h<br/>deleted file mode 100644<br/>index 3284bfa988c0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ackvec.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ackvec.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +0,0 @@</div><div class='del'>-#ifndef _ACKVEC_H</div><div class='del'>-#define _ACKVEC_H</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ackvec.h</div><div class='del'>- *</div><div class='del'>- *  An implementation of Ack Vectors for the DCCP protocol</div><div class='del'>- *  Copyright (c) 2007 University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ack Vector buffer space is static, in multiples of %DCCP_SINGLE_OPT_MAXLEN,</div><div class='del'>- * the maximum size of a single Ack Vector. Setting %DCCPAV_NUM_ACKVECS to 1</div><div class='del'>- * will be sufficient for most cases of low Ack Ratios, using a value of 2 gives</div><div class='del'>- * more headroom if Ack Ratio is higher or when the sender acknowledges slowly.</div><div class='del'>- * The maximum value is bounded by the u16 types for indices and functions.</div><div class='del'>- */</div><div class='del'>-#define DCCPAV_NUM_ACKVECS	2</div><div class='del'>-#define DCCPAV_MAX_ACKVEC_LEN	(DCCP_SINGLE_OPT_MAXLEN * DCCPAV_NUM_ACKVECS)</div><div class='del'>-</div><div class='del'>-/* Estimated minimum average Ack Vector length - used for updating MPS */</div><div class='del'>-#define DCCPAV_MIN_OPTLEN	16</div><div class='del'>-</div><div class='del'>-/* Threshold for coping with large bursts of losses */</div><div class='del'>-#define DCCPAV_BURST_THRESH	(DCCPAV_MAX_ACKVEC_LEN / 8)</div><div class='del'>-</div><div class='del'>-enum dccp_ackvec_states {</div><div class='del'>-	DCCPAV_RECEIVED =	0x00,</div><div class='del'>-	DCCPAV_ECN_MARKED =	0x40,</div><div class='del'>-	DCCPAV_RESERVED =	0x80,</div><div class='del'>-	DCCPAV_NOT_RECEIVED =	0xC0</div><div class='del'>-};</div><div class='del'>-#define DCCPAV_MAX_RUNLEN	0x3F</div><div class='del'>-</div><div class='del'>-static inline u8 dccp_ackvec_runlen(const u8 *cell)</div><div class='del'>-{</div><div class='del'>-	return *cell &amp; DCCPAV_MAX_RUNLEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 dccp_ackvec_state(const u8 *cell)</div><div class='del'>-{</div><div class='del'>-	return *cell &amp; ~DCCPAV_MAX_RUNLEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_ackvec - Ack Vector main data structure</div><div class='del'>- *</div><div class='del'>- * This implements a fixed-size circular buffer within an array and is largely</div><div class='del'>- * based on Appendix A of RFC 4340.</div><div class='del'>- *</div><div class='del'>- * @av_buf:	   circular buffer storage area</div><div class='del'>- * @av_buf_head:   head index; begin of live portion in @av_buf</div><div class='del'>- * @av_buf_tail:   tail index; first index _after_ the live portion in @av_buf</div><div class='del'>- * @av_buf_ackno:  highest seqno of acknowledgeable packet recorded in @av_buf</div><div class='del'>- * @av_tail_ackno: lowest  seqno of acknowledgeable packet recorded in @av_buf</div><div class='del'>- * @av_buf_nonce:  ECN nonce sums, each covering subsequent segments of up to</div><div class='del'>- *		   %DCCP_SINGLE_OPT_MAXLEN cells in the live portion of @av_buf</div><div class='del'>- * @av_overflow:   if 1 then buf_head == buf_tail indicates buffer wraparound</div><div class='del'>- * @av_records:	   list of %dccp_ackvec_record (Ack Vectors sent previously)</div><div class='del'>- */</div><div class='del'>-struct dccp_ackvec {</div><div class='del'>-	u8			av_buf[DCCPAV_MAX_ACKVEC_LEN];</div><div class='del'>-	u16			av_buf_head;</div><div class='del'>-	u16			av_buf_tail;</div><div class='del'>-	u64			av_buf_ackno:48;</div><div class='del'>-	u64			av_tail_ackno:48;</div><div class='del'>-	bool			av_buf_nonce[DCCPAV_NUM_ACKVECS];</div><div class='del'>-	u8			av_overflow:1;</div><div class='del'>-	struct list_head	av_records;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_ackvec_record - Records information about sent Ack Vectors</div><div class='del'>- *</div><div class='del'>- * These list entries define the additional information which the HC-Receiver</div><div class='del'>- * keeps about recently-sent Ack Vectors; again refer to RFC 4340, Appendix A.</div><div class='del'>- *</div><div class='del'>- * @avr_node:	    the list node in @av_records</div><div class='del'>- * @avr_ack_seqno:  sequence number of the packet the Ack Vector was sent on</div><div class='del'>- * @avr_ack_ackno:  the Ack number that this record/Ack Vector refers to</div><div class='del'>- * @avr_ack_ptr:    pointer into @av_buf where this record starts</div><div class='del'>- * @avr_ack_runlen: run length of @avr_ack_ptr at the time of sending</div><div class='del'>- * @avr_ack_nonce:  the sum of @av_buf_nonce's at the time this record was sent</div><div class='del'>- *</div><div class='del'>- * The list as a whole is sorted in descending order by @avr_ack_seqno.</div><div class='del'>- */</div><div class='del'>-struct dccp_ackvec_record {</div><div class='del'>-	struct list_head avr_node;</div><div class='del'>-	u64		 avr_ack_seqno:48;</div><div class='del'>-	u64		 avr_ack_ackno:48;</div><div class='del'>-	u16		 avr_ack_ptr;</div><div class='del'>-	u8		 avr_ack_runlen;</div><div class='del'>-	u8		 avr_ack_nonce:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int dccp_ackvec_init(void);</div><div class='del'>-void dccp_ackvec_exit(void);</div><div class='del'>-</div><div class='del'>-struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority);</div><div class='del'>-void dccp_ackvec_free(struct dccp_ackvec *av);</div><div class='del'>-</div><div class='del'>-void dccp_ackvec_input(struct dccp_ackvec *av, struct sk_buff *skb);</div><div class='del'>-int dccp_ackvec_update_records(struct dccp_ackvec *av, u64 seq, u8 sum);</div><div class='del'>-void dccp_ackvec_clear_state(struct dccp_ackvec *av, const u64 ackno);</div><div class='del'>-u16 dccp_ackvec_buflen(const struct dccp_ackvec *av);</div><div class='del'>-</div><div class='del'>-static inline bool dccp_ackvec_is_empty(const struct dccp_ackvec *av)</div><div class='del'>-{</div><div class='del'>-	return av-&gt;av_overflow == 0 &amp;&amp; av-&gt;av_buf_head == av-&gt;av_buf_tail;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_ackvec_parsed  -  Record offsets of Ack Vectors in skb</div><div class='del'>- * @vec:	start of vector (offset into skb)</div><div class='del'>- * @len:	length of @vec</div><div class='del'>- * @nonce:	whether @vec had an ECN nonce of 0 or 1</div><div class='del'>- * @node:	FIFO - arranged in descending order of ack_ackno</div><div class='del'>- *</div><div class='del'>- * This structure is used by CCIDs to access Ack Vectors in a received skb.</div><div class='del'>- */</div><div class='del'>-struct dccp_ackvec_parsed {</div><div class='del'>-	u8		 *vec,</div><div class='del'>-			 len,</div><div class='del'>-			 nonce:1;</div><div class='del'>-	struct list_head node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int dccp_ackvec_parsed_add(struct list_head *head, u8 *vec, u8 len, u8 nonce);</div><div class='del'>-void dccp_ackvec_parsed_cleanup(struct list_head *parsed_chunks);</div><div class='del'>-#endif /* _ACKVEC_H */</div><div class='head'>diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c<br/>deleted file mode 100644<br/>index 90f77d08cc37..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccid.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccid.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,222 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ccid.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  CCID infrastructure</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "ccids/lib/tfrc.h"</div><div class='del'>-</div><div class='del'>-static struct ccid_operations *ccids[] = {</div><div class='del'>-	&amp;ccid2_ops,</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3</div><div class='del'>-	&amp;ccid3_ops,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ccid_operations *ccid_by_number(const u8 id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ccids); i++)</div><div class='del'>-		if (ccids[i]-&gt;ccid_id == id)</div><div class='del'>-			return ccids[i];</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check that up to @array_len members in @ccid_array are supported */</div><div class='del'>-bool ccid_support_check(u8 const *ccid_array, u8 array_len)</div><div class='del'>-{</div><div class='del'>-	while (array_len &gt; 0)</div><div class='del'>-		if (ccid_by_number(ccid_array[--array_len]) == NULL)</div><div class='del'>-			return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid_get_builtin_ccids  -  Populate a list of built-in CCIDs</div><div class='del'>- * @ccid_array: pointer to copy into</div><div class='del'>- * @array_len: value to return length into</div><div class='del'>- *</div><div class='del'>- * This function allocates memory - caller must see that it is freed after use.</div><div class='del'>- */</div><div class='del'>-int ccid_get_builtin_ccids(u8 **ccid_array, u8 *array_len)</div><div class='del'>-{</div><div class='del'>-	*ccid_array = kmalloc(ARRAY_SIZE(ccids), gfp_any());</div><div class='del'>-	if (*ccid_array == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	for (*array_len = 0; *array_len &lt; ARRAY_SIZE(ccids); *array_len += 1)</div><div class='del'>-		(*ccid_array)[*array_len] = ccids[*array_len]-&gt;ccid_id;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ccid_getsockopt_builtin_ccids(struct sock *sk, int len,</div><div class='del'>-				  char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	u8 *ccid_array, array_len;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (ccid_get_builtin_ccids(&amp;ccid_array, &amp;array_len))</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	if (put_user(array_len, optlen))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	else if (len &gt; 0 &amp;&amp; copy_to_user(optval, ccid_array,</div><div class='del'>-					 len &gt; array_len ? array_len : len))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-</div><div class='del'>-	kfree(ccid_array);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *ccid_kmem_cache_create(int obj_size, char *slab_name_fmt, const char *fmt,...)</div><div class='del'>-{</div><div class='del'>-	struct kmem_cache *slab;</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	vsnprintf(slab_name_fmt, CCID_SLAB_NAME_LENGTH, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	slab = kmem_cache_create(slab_name_fmt, sizeof(struct ccid) + obj_size, 0,</div><div class='del'>-				 SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	return slab;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid_kmem_cache_destroy(struct kmem_cache *slab)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_destroy(slab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init ccid_activate(struct ccid_operations *ccid_ops)</div><div class='del'>-{</div><div class='del'>-	int err = -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	ccid_ops-&gt;ccid_hc_rx_slab =</div><div class='del'>-			ccid_kmem_cache_create(ccid_ops-&gt;ccid_hc_rx_obj_size,</div><div class='del'>-					       ccid_ops-&gt;ccid_hc_rx_slab_name,</div><div class='del'>-					       "ccid%u_hc_rx_sock",</div><div class='del'>-					       ccid_ops-&gt;ccid_id);</div><div class='del'>-	if (ccid_ops-&gt;ccid_hc_rx_slab == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ccid_ops-&gt;ccid_hc_tx_slab =</div><div class='del'>-			ccid_kmem_cache_create(ccid_ops-&gt;ccid_hc_tx_obj_size,</div><div class='del'>-					       ccid_ops-&gt;ccid_hc_tx_slab_name,</div><div class='del'>-					       "ccid%u_hc_tx_sock",</div><div class='del'>-					       ccid_ops-&gt;ccid_id);</div><div class='del'>-	if (ccid_ops-&gt;ccid_hc_tx_slab == NULL)</div><div class='del'>-		goto out_free_rx_slab;</div><div class='del'>-</div><div class='del'>-	pr_info("DCCP: Activated CCID %d (%s)\n",</div><div class='del'>-		ccid_ops-&gt;ccid_id, ccid_ops-&gt;ccid_name);</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-out_free_rx_slab:</div><div class='del'>-	ccid_kmem_cache_destroy(ccid_ops-&gt;ccid_hc_rx_slab);</div><div class='del'>-	ccid_ops-&gt;ccid_hc_rx_slab = NULL;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid_deactivate(struct ccid_operations *ccid_ops)</div><div class='del'>-{</div><div class='del'>-	ccid_kmem_cache_destroy(ccid_ops-&gt;ccid_hc_tx_slab);</div><div class='del'>-	ccid_ops-&gt;ccid_hc_tx_slab = NULL;</div><div class='del'>-	ccid_kmem_cache_destroy(ccid_ops-&gt;ccid_hc_rx_slab);</div><div class='del'>-	ccid_ops-&gt;ccid_hc_rx_slab = NULL;</div><div class='del'>-</div><div class='del'>-	pr_info("DCCP: Deactivated CCID %d (%s)\n",</div><div class='del'>-		ccid_ops-&gt;ccid_id, ccid_ops-&gt;ccid_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ccid *ccid_new(const u8 id, struct sock *sk, bool rx)</div><div class='del'>-{</div><div class='del'>-	struct ccid_operations *ccid_ops = ccid_by_number(id);</div><div class='del'>-	struct ccid *ccid = NULL;</div><div class='del'>-</div><div class='del'>-	if (ccid_ops == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ccid = kmem_cache_alloc(rx ? ccid_ops-&gt;ccid_hc_rx_slab :</div><div class='del'>-				     ccid_ops-&gt;ccid_hc_tx_slab, gfp_any());</div><div class='del'>-	if (ccid == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-	ccid-&gt;ccid_ops = ccid_ops;</div><div class='del'>-	if (rx) {</div><div class='del'>-		memset(ccid + 1, 0, ccid_ops-&gt;ccid_hc_rx_obj_size);</div><div class='del'>-		if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_init != NULL &amp;&amp;</div><div class='del'>-		    ccid-&gt;ccid_ops-&gt;ccid_hc_rx_init(ccid, sk) != 0)</div><div class='del'>-			goto out_free_ccid;</div><div class='del'>-	} else {</div><div class='del'>-		memset(ccid + 1, 0, ccid_ops-&gt;ccid_hc_tx_obj_size);</div><div class='del'>-		if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_init != NULL &amp;&amp;</div><div class='del'>-		    ccid-&gt;ccid_ops-&gt;ccid_hc_tx_init(ccid, sk) != 0)</div><div class='del'>-			goto out_free_ccid;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return ccid;</div><div class='del'>-out_free_ccid:</div><div class='del'>-	kmem_cache_free(rx ? ccid_ops-&gt;ccid_hc_rx_slab :</div><div class='del'>-			ccid_ops-&gt;ccid_hc_tx_slab, ccid);</div><div class='del'>-	ccid = NULL;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	if (ccid != NULL) {</div><div class='del'>-		if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_exit != NULL)</div><div class='del'>-			ccid-&gt;ccid_ops-&gt;ccid_hc_rx_exit(sk);</div><div class='del'>-		kmem_cache_free(ccid-&gt;ccid_ops-&gt;ccid_hc_rx_slab, ccid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	if (ccid != NULL) {</div><div class='del'>-		if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_exit != NULL)</div><div class='del'>-			ccid-&gt;ccid_ops-&gt;ccid_hc_tx_exit(sk);</div><div class='del'>-		kmem_cache_free(ccid-&gt;ccid_ops-&gt;ccid_hc_tx_slab, ccid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init ccid_initialize_builtins(void)</div><div class='del'>-{</div><div class='del'>-	int i, err = tfrc_lib_init();</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ccids); i++) {</div><div class='del'>-		err = ccid_activate(ccids[i]);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unwind_registrations;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unwind_registrations:</div><div class='del'>-	while(--i &gt;= 0)</div><div class='del'>-		ccid_deactivate(ccids[i]);</div><div class='del'>-	tfrc_lib_exit();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ccid_cleanup_builtins(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ccids); i++)</div><div class='del'>-		ccid_deactivate(ccids[i]);</div><div class='del'>-	tfrc_lib_exit();</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h<br/>deleted file mode 100644<br/>index 6eb837a47b5c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccid.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccid.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,265 +0,0 @@</div><div class='del'>-#ifndef _CCID_H</div><div class='del'>-#define _CCID_H</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ccid.h</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  CCID infrastructure</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-/* maximum value for a CCID (RFC 4340, 19.5) */</div><div class='del'>-#define CCID_MAX		255</div><div class='del'>-#define CCID_SLAB_NAME_LENGTH	32</div><div class='del'>-</div><div class='del'>-struct tcp_info;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  struct ccid_operations  -  Interface to Congestion-Control Infrastructure</div><div class='del'>- *</div><div class='del'>- *  @ccid_id: numerical CCID ID (up to %CCID_MAX, cf. table 5 in RFC 4340, 10.)</div><div class='del'>- *  @ccid_ccmps: the CCMPS including network/transport headers (0 when disabled)</div><div class='del'>- *  @ccid_name: alphabetical identifier string for @ccid_id</div><div class='del'>- *  @ccid_hc_{r,t}x_slab: memory pool for the receiver/sender half-connection</div><div class='del'>- *  @ccid_hc_{r,t}x_obj_size: size of the receiver/sender half-connection socket</div><div class='del'>- *</div><div class='del'>- *  @ccid_hc_{r,t}x_init: CCID-specific initialisation routine (before startup)</div><div class='del'>- *  @ccid_hc_{r,t}x_exit: CCID-specific cleanup routine (before destruction)</div><div class='del'>- *  @ccid_hc_rx_packet_recv: implements the HC-receiver side</div><div class='del'>- *  @ccid_hc_{r,t}x_parse_options: parsing routine for CCID/HC-specific options</div><div class='del'>- *  @ccid_hc_{r,t}x_insert_options: insert routine for CCID/HC-specific options</div><div class='del'>- *  @ccid_hc_tx_packet_recv: implements feedback processing for the HC-sender</div><div class='del'>- *  @ccid_hc_tx_send_packet: implements the sending part of the HC-sender</div><div class='del'>- *  @ccid_hc_tx_packet_sent: does accounting for packets in flight by HC-sender</div><div class='del'>- *  @ccid_hc_{r,t}x_get_info: INET_DIAG information for HC-receiver/sender</div><div class='del'>- *  @ccid_hc_{r,t}x_getsockopt: socket options specific to HC-receiver/sender</div><div class='del'>- */</div><div class='del'>-struct ccid_operations {</div><div class='del'>-	unsigned char		ccid_id;</div><div class='del'>-	__u32			ccid_ccmps;</div><div class='del'>-	const char		*ccid_name;</div><div class='del'>-	struct kmem_cache	*ccid_hc_rx_slab,</div><div class='del'>-				*ccid_hc_tx_slab;</div><div class='del'>-	char			ccid_hc_rx_slab_name[CCID_SLAB_NAME_LENGTH];</div><div class='del'>-	char			ccid_hc_tx_slab_name[CCID_SLAB_NAME_LENGTH];</div><div class='del'>-	__u32			ccid_hc_rx_obj_size,</div><div class='del'>-				ccid_hc_tx_obj_size;</div><div class='del'>-	/* Interface Routines */</div><div class='del'>-	int		(*ccid_hc_rx_init)(struct ccid *ccid, struct sock *sk);</div><div class='del'>-	int		(*ccid_hc_tx_init)(struct ccid *ccid, struct sock *sk);</div><div class='del'>-	void		(*ccid_hc_rx_exit)(struct sock *sk);</div><div class='del'>-	void		(*ccid_hc_tx_exit)(struct sock *sk);</div><div class='del'>-	void		(*ccid_hc_rx_packet_recv)(struct sock *sk,</div><div class='del'>-						  struct sk_buff *skb);</div><div class='del'>-	int		(*ccid_hc_rx_parse_options)(struct sock *sk, u8 pkt,</div><div class='del'>-						    u8 opt, u8 *val, u8 len);</div><div class='del'>-	int		(*ccid_hc_rx_insert_options)(struct sock *sk,</div><div class='del'>-						     struct sk_buff *skb);</div><div class='del'>-	void		(*ccid_hc_tx_packet_recv)(struct sock *sk,</div><div class='del'>-						  struct sk_buff *skb);</div><div class='del'>-	int		(*ccid_hc_tx_parse_options)(struct sock *sk, u8 pkt,</div><div class='del'>-						    u8 opt, u8 *val, u8 len);</div><div class='del'>-	int		(*ccid_hc_tx_send_packet)(struct sock *sk,</div><div class='del'>-						  struct sk_buff *skb);</div><div class='del'>-	void		(*ccid_hc_tx_packet_sent)(struct sock *sk,</div><div class='del'>-						  unsigned int len);</div><div class='del'>-	void		(*ccid_hc_rx_get_info)(struct sock *sk,</div><div class='del'>-					       struct tcp_info *info);</div><div class='del'>-	void		(*ccid_hc_tx_get_info)(struct sock *sk,</div><div class='del'>-					       struct tcp_info *info);</div><div class='del'>-	int		(*ccid_hc_rx_getsockopt)(struct sock *sk,</div><div class='del'>-						 const int optname, int len,</div><div class='del'>-						 u32 __user *optval,</div><div class='del'>-						 int __user *optlen);</div><div class='del'>-	int		(*ccid_hc_tx_getsockopt)(struct sock *sk,</div><div class='del'>-						 const int optname, int len,</div><div class='del'>-						 u32 __user *optval,</div><div class='del'>-						 int __user *optlen);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct ccid_operations ccid2_ops;</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3</div><div class='del'>-extern struct ccid_operations ccid3_ops;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int ccid_initialize_builtins(void);</div><div class='del'>-void ccid_cleanup_builtins(void);</div><div class='del'>-</div><div class='del'>-struct ccid {</div><div class='del'>-	struct ccid_operations *ccid_ops;</div><div class='del'>-	char		       ccid_priv[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void *ccid_priv(const struct ccid *ccid)</div><div class='del'>-{</div><div class='del'>-	return (void *)ccid-&gt;ccid_priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool ccid_support_check(u8 const *ccid_array, u8 array_len);</div><div class='del'>-int ccid_get_builtin_ccids(u8 **ccid_array, u8 *array_len);</div><div class='del'>-int ccid_getsockopt_builtin_ccids(struct sock *sk, int len,</div><div class='del'>-				  char __user *, int __user *);</div><div class='del'>-</div><div class='del'>-struct ccid *ccid_new(const u8 id, struct sock *sk, bool rx);</div><div class='del'>-</div><div class='del'>-static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp)</div><div class='del'>-{</div><div class='del'>-	struct ccid *ccid = dp-&gt;dccps_hc_rx_ccid;</div><div class='del'>-</div><div class='del'>-	if (ccid == NULL || ccid-&gt;ccid_ops == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	return ccid-&gt;ccid_ops-&gt;ccid_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ccid_get_current_tx_ccid(struct dccp_sock *dp)</div><div class='del'>-{</div><div class='del'>-	struct ccid *ccid = dp-&gt;dccps_hc_tx_ccid;</div><div class='del'>-</div><div class='del'>-	if (ccid == NULL || ccid-&gt;ccid_ops == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	return ccid-&gt;ccid_ops-&gt;ccid_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk);</div><div class='del'>-void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Congestion control of queued data packets via CCID decision.</div><div class='del'>- *</div><div class='del'>- * The TX CCID performs its congestion-control by indicating whether and when a</div><div class='del'>- * queued packet may be sent, using the return code of ccid_hc_tx_send_packet().</div><div class='del'>- * The following modes are supported via the symbolic constants below:</div><div class='del'>- * - timer-based pacing    (CCID returns a delay value in milliseconds);</div><div class='del'>- * - autonomous dequeueing (CCID internally schedules dccps_xmitlet).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum ccid_dequeueing_decision {</div><div class='del'>-	CCID_PACKET_SEND_AT_ONCE =	 0x00000,  /* "green light": no delay */</div><div class='del'>-	CCID_PACKET_DELAY_MAX =		 0x0FFFF,  /* maximum delay in msecs  */</div><div class='del'>-	CCID_PACKET_DELAY =		 0x10000,  /* CCID msec-delay mode */</div><div class='del'>-	CCID_PACKET_WILL_DEQUEUE_LATER = 0x20000,  /* CCID autonomous mode */</div><div class='del'>-	CCID_PACKET_ERR =		 0xF0000,  /* error condition */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int ccid_packet_dequeue_eval(const int return_code)</div><div class='del'>-{</div><div class='del'>-	if (return_code &lt; 0)</div><div class='del'>-		return CCID_PACKET_ERR;</div><div class='del'>-	if (return_code == 0)</div><div class='del'>-		return CCID_PACKET_SEND_AT_ONCE;</div><div class='del'>-	if (return_code &lt;= CCID_PACKET_DELAY_MAX)</div><div class='del'>-		return CCID_PACKET_DELAY;</div><div class='del'>-	return return_code;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_send_packet != NULL)</div><div class='del'>-		return ccid-&gt;ccid_ops-&gt;ccid_hc_tx_send_packet(sk, skb);</div><div class='del'>-	return CCID_PACKET_SEND_AT_ONCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					  unsigned int len)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_packet_sent != NULL)</div><div class='del'>-		ccid-&gt;ccid_ops-&gt;ccid_hc_tx_packet_sent(sk, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ccid_hc_rx_packet_recv(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_packet_recv != NULL)</div><div class='del'>-		ccid-&gt;ccid_ops-&gt;ccid_hc_rx_packet_recv(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ccid_hc_tx_packet_recv(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_packet_recv != NULL)</div><div class='del'>-		ccid-&gt;ccid_ops-&gt;ccid_hc_tx_packet_recv(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid_hc_tx_parse_options  -  Parse CCID-specific options sent by the receiver</div><div class='del'>- * @pkt: type of packet that @opt appears on (RFC 4340, 5.1)</div><div class='del'>- * @opt: the CCID-specific option type (RFC 4340, 5.8 and 10.3)</div><div class='del'>- * @val: value of @opt</div><div class='del'>- * @len: length of @val in bytes</div><div class='del'>- */</div><div class='del'>-static inline int ccid_hc_tx_parse_options(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					   u8 pkt, u8 opt, u8 *val, u8 len)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_parse_options == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	return ccid-&gt;ccid_ops-&gt;ccid_hc_tx_parse_options(sk, pkt, opt, val, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid_hc_rx_parse_options  -  Parse CCID-specific options sent by the sender</div><div class='del'>- * Arguments are analogous to ccid_hc_tx_parse_options()</div><div class='del'>- */</div><div class='del'>-static inline int ccid_hc_rx_parse_options(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					   u8 pkt, u8 opt, u8 *val, u8 len)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_parse_options == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	return ccid-&gt;ccid_ops-&gt;ccid_hc_rx_parse_options(sk, pkt, opt, val, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ccid_hc_rx_insert_options(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_insert_options != NULL)</div><div class='del'>-		return ccid-&gt;ccid_ops-&gt;ccid_hc_rx_insert_options(sk, skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ccid_hc_rx_get_info(struct ccid *ccid, struct sock *sk,</div><div class='del'>-				       struct tcp_info *info)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_rx_get_info != NULL)</div><div class='del'>-		ccid-&gt;ccid_ops-&gt;ccid_hc_rx_get_info(sk, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ccid_hc_tx_get_info(struct ccid *ccid, struct sock *sk,</div><div class='del'>-				       struct tcp_info *info)</div><div class='del'>-{</div><div class='del'>-	if (ccid-&gt;ccid_ops-&gt;ccid_hc_tx_get_info != NULL)</div><div class='del'>-		ccid-&gt;ccid_ops-&gt;ccid_hc_tx_get_info(sk, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ccid_hc_rx_getsockopt(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					const int optname, int len,</div><div class='del'>-					u32 __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int rc = -ENOPROTOOPT;</div><div class='del'>-	if (ccid != NULL &amp;&amp; ccid-&gt;ccid_ops-&gt;ccid_hc_rx_getsockopt != NULL)</div><div class='del'>-		rc = ccid-&gt;ccid_ops-&gt;ccid_hc_rx_getsockopt(sk, optname, len,</div><div class='del'>-						 optval, optlen);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ccid_hc_tx_getsockopt(struct ccid *ccid, struct sock *sk,</div><div class='del'>-					const int optname, int len,</div><div class='del'>-					u32 __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int rc = -ENOPROTOOPT;</div><div class='del'>-	if (ccid != NULL &amp;&amp; ccid-&gt;ccid_ops-&gt;ccid_hc_tx_getsockopt != NULL)</div><div class='del'>-		rc = ccid-&gt;ccid_ops-&gt;ccid_hc_tx_getsockopt(sk, optname, len,</div><div class='del'>-						 optval, optlen);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-#endif /* _CCID_H */</div><div class='head'>diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig<br/>deleted file mode 100644<br/>index 8ba3fc9d6d16..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-menu "DCCP CCIDs Configuration"</div><div class='del'>-</div><div class='del'>-config IP_DCCP_CCID2_DEBUG</div><div class='del'>-	bool "CCID-2 debugging messages"</div><div class='del'>-	---help---</div><div class='del'>-	  Enable CCID-2 specific debugging messages.</div><div class='del'>-</div><div class='del'>-	  The debugging output can additionally be toggled by setting the</div><div class='del'>-	  ccid2_debug parameter to 0 or 1.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='del'>-config IP_DCCP_CCID3</div><div class='del'>-	bool "CCID-3 (TCP-Friendly)"</div><div class='del'>-	def_bool y if (IP_DCCP = y || IP_DCCP = m)</div><div class='del'>-	---help---</div><div class='del'>-	  CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based</div><div class='del'>-	  rate-controlled congestion control mechanism.  TFRC is designed to</div><div class='del'>-	  be reasonably fair when competing for bandwidth with TCP-like flows,</div><div class='del'>-	  where a flow is "reasonably fair" if its sending rate is generally</div><div class='del'>-	  within a factor of two of the sending rate of a TCP flow under the</div><div class='del'>-	  same conditions.  However, TFRC has a much lower variation of</div><div class='del'>-	  throughput over time compared with TCP, which makes CCID-3 more</div><div class='del'>-	  suitable than CCID-2 for applications such streaming media where a</div><div class='del'>-	  relatively smooth sending rate is of importance.</div><div class='del'>-</div><div class='del'>-	  CCID-3 is further described in RFC 4342,</div><div class='del'>-	  http://www.ietf.org/rfc/rfc4342.txt</div><div class='del'>-</div><div class='del'>-	  The TFRC congestion control algorithms were initially described in</div><div class='del'>-	  RFC 5348.</div><div class='del'>-</div><div class='del'>-	  This text was extracted from RFC 4340 (sec. 10.2),</div><div class='del'>-	  http://www.ietf.org/rfc/rfc4340.txt</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='del'>-config IP_DCCP_CCID3_DEBUG</div><div class='del'>-	bool "CCID-3 debugging messages"</div><div class='del'>-	depends on IP_DCCP_CCID3</div><div class='del'>-	---help---</div><div class='del'>-	  Enable CCID-3 specific debugging messages.</div><div class='del'>-</div><div class='del'>-	  The debugging output can additionally be toggled by setting the</div><div class='del'>-	  ccid3_debug parameter to 0 or 1.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='del'>-config IP_DCCP_TFRC_LIB</div><div class='del'>-	def_bool y if IP_DCCP_CCID3</div><div class='del'>-</div><div class='del'>-config IP_DCCP_TFRC_DEBUG</div><div class='del'>-	def_bool y if IP_DCCP_CCID3_DEBUG</div><div class='del'>-endmenu</div><div class='head'>diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c<br/>deleted file mode 100644<br/>index 842a9c7c73a3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/ccid2.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,801 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2005, 2006 Andrea Bittau &lt;a.bittau@cs.ucl.ac.uk&gt;</div><div class='del'>- *</div><div class='del'>- *  Changes to meet Linux coding standards, and DCCP infrastructure fixes.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2006 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This implementation should follow RFC 4341</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "../feat.h"</div><div class='del'>-#include "ccid2.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID2_DEBUG</div><div class='del'>-static bool ccid2_debug;</div><div class='del'>-#define ccid2_pr_debug(format, a...)	DCCP_PR_DEBUG(ccid2_debug, format, ##a)</div><div class='del'>-#else</div><div class='del'>-#define ccid2_pr_debug(format, a...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hc)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_seq *seqp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* check if we have space to preserve the pointer to the buffer */</div><div class='del'>-	if (hc-&gt;tx_seqbufc &gt;= (sizeof(hc-&gt;tx_seqbuf) /</div><div class='del'>-			       sizeof(struct ccid2_seq *)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* allocate buffer and initialize linked list */</div><div class='del'>-	seqp = kmalloc_array(CCID2_SEQBUF_LEN, sizeof(struct ccid2_seq),</div><div class='del'>-			     gfp_any());</div><div class='del'>-	if (seqp == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (CCID2_SEQBUF_LEN - 1); i++) {</div><div class='del'>-		seqp[i].ccid2s_next = &amp;seqp[i + 1];</div><div class='del'>-		seqp[i + 1].ccid2s_prev = &amp;seqp[i];</div><div class='del'>-	}</div><div class='del'>-	seqp[CCID2_SEQBUF_LEN - 1].ccid2s_next = seqp;</div><div class='del'>-	seqp-&gt;ccid2s_prev = &amp;seqp[CCID2_SEQBUF_LEN - 1];</div><div class='del'>-</div><div class='del'>-	/* This is the first allocation.  Initiate the head and tail.  */</div><div class='del'>-	if (hc-&gt;tx_seqbufc == 0)</div><div class='del'>-		hc-&gt;tx_seqh = hc-&gt;tx_seqt = seqp;</div><div class='del'>-	else {</div><div class='del'>-		/* link the existing list with the one we just created */</div><div class='del'>-		hc-&gt;tx_seqh-&gt;ccid2s_next = seqp;</div><div class='del'>-		seqp-&gt;ccid2s_prev = hc-&gt;tx_seqh;</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_seqt-&gt;ccid2s_prev = &amp;seqp[CCID2_SEQBUF_LEN - 1];</div><div class='del'>-		seqp[CCID2_SEQBUF_LEN - 1].ccid2s_next = hc-&gt;tx_seqt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* store the original pointer to the buffer so we can free it */</div><div class='del'>-	hc-&gt;tx_seqbuf[hc-&gt;tx_seqbufc] = seqp;</div><div class='del'>-	hc-&gt;tx_seqbufc++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (ccid2_cwnd_network_limited(ccid2_hc_tx_sk(sk)))</div><div class='del'>-		return CCID_PACKET_WILL_DEQUEUE_LATER;</div><div class='del'>-	return CCID_PACKET_SEND_AT_ONCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 max_ratio = DIV_ROUND_UP(ccid2_hc_tx_sk(sk)-&gt;tx_cwnd, 2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure that Ack Ratio does not exceed ceil(cwnd/2), which is (2) from</div><div class='del'>-	 * RFC 4341, 6.1.2. We ignore the statement that Ack Ratio 2 is always</div><div class='del'>-	 * acceptable since this causes starvation/deadlock whenever cwnd &lt; 2.</div><div class='del'>-	 * The same problem arises when Ack Ratio is 0 (ie. Ack Ratio disabled).</div><div class='del'>-	 */</div><div class='del'>-	if (val == 0 || val &gt; max_ratio) {</div><div class='del'>-		DCCP_WARN("Limiting Ack Ratio (%u) to %u\n", val, max_ratio);</div><div class='del'>-		val = max_ratio;</div><div class='del'>-	}</div><div class='del'>-	dccp_feat_signal_nn_change(sk, DCCPF_ACK_RATIO,</div><div class='del'>-				   min_t(u32, val, DCCPF_ACK_RATIO_MAX));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_check_l_ack_ratio(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * After a loss, idle period, application limited period, or RTO we</div><div class='del'>-	 * need to check that the ack ratio is still less than the congestion</div><div class='del'>-	 * window. Otherwise, we will send an entire congestion window of</div><div class='del'>-	 * packets and got no response because we haven't sent ack ratio</div><div class='del'>-	 * packets yet.</div><div class='del'>-	 * If the ack ratio does need to be reduced, we reduce it to half of</div><div class='del'>-	 * the congestion window (or 1 if that's zero) instead of to the</div><div class='del'>-	 * congestion window. This prevents problems if one ack is lost.</div><div class='del'>-	 */</div><div class='del'>-	if (dccp_feat_nn_get(sk, DCCPF_ACK_RATIO) &gt; hc-&gt;tx_cwnd)</div><div class='del'>-		ccid2_change_l_ack_ratio(sk, hc-&gt;tx_cwnd/2 ? : 1U);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_change_l_seq_window(struct sock *sk, u64 val)</div><div class='del'>-{</div><div class='del'>-	dccp_feat_signal_nn_change(sk, DCCPF_SEQUENCE_WINDOW,</div><div class='del'>-				   clamp_val(val, DCCPF_SEQ_WMIN,</div><div class='del'>-						  DCCPF_SEQ_WMAX));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_tasklet_schedule(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct tasklet_struct *t = &amp;dccp_sk(sk)-&gt;dccps_xmitlet;</div><div class='del'>-</div><div class='del'>-	if (!test_and_set_bit(TASKLET_STATE_SCHED, &amp;t-&gt;state)) {</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		__tasklet_schedule(t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_hc_tx_rto_expire(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = from_timer(hc, t, tx_rtotimer);</div><div class='del'>-	struct sock *sk = hc-&gt;sk;</div><div class='del'>-	const bool sender_was_blocked = ccid2_cwnd_network_limited(hc);</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;hc-&gt;tx_rtotimer, jiffies + HZ / 5);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ccid2_pr_debug("RTO_EXPIRE\n");</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* back-off timer */</div><div class='del'>-	hc-&gt;tx_rto &lt;&lt;= 1;</div><div class='del'>-	if (hc-&gt;tx_rto &gt; DCCP_RTO_MAX)</div><div class='del'>-		hc-&gt;tx_rto = DCCP_RTO_MAX;</div><div class='del'>-</div><div class='del'>-	/* adjust pipe, cwnd etc */</div><div class='del'>-	hc-&gt;tx_ssthresh = hc-&gt;tx_cwnd / 2;</div><div class='del'>-	if (hc-&gt;tx_ssthresh &lt; 2)</div><div class='del'>-		hc-&gt;tx_ssthresh = 2;</div><div class='del'>-	hc-&gt;tx_cwnd	= 1;</div><div class='del'>-	hc-&gt;tx_pipe	= 0;</div><div class='del'>-</div><div class='del'>-	/* clear state about stuff we sent */</div><div class='del'>-	hc-&gt;tx_seqt = hc-&gt;tx_seqh;</div><div class='del'>-	hc-&gt;tx_packets_acked = 0;</div><div class='del'>-</div><div class='del'>-	/* clear ack ratio state. */</div><div class='del'>-	hc-&gt;tx_rpseq    = 0;</div><div class='del'>-	hc-&gt;tx_rpdupack = -1;</div><div class='del'>-	ccid2_change_l_ack_ratio(sk, 1);</div><div class='del'>-</div><div class='del'>-	/* if we were blocked before, we may now send cwnd=1 packet */</div><div class='del'>-	if (sender_was_blocked)</div><div class='del'>-		dccp_tasklet_schedule(sk);</div><div class='del'>-	/* restart backed-off timer */</div><div class='del'>-	sk_reset_timer(sk, &amp;hc-&gt;tx_rtotimer, jiffies + hc-&gt;tx_rto);</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Congestion window validation (RFC 2861).</div><div class='del'>- */</div><div class='del'>-static bool ccid2_do_cwv = true;</div><div class='del'>-module_param(ccid2_do_cwv, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ccid2_do_cwv, "Perform RFC2861 Congestion Window Validation");</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid2_update_used_window  -  Track how much of cwnd is actually used</div><div class='del'>- * This is done in addition to CWV. The sender needs to have an idea of how many</div><div class='del'>- * packets may be in flight, to set the local Sequence Window value accordingly</div><div class='del'>- * (RFC 4340, 7.5.2). The CWV mechanism is exploited to keep track of the</div><div class='del'>- * maximum-used window. We use an EWMA low-pass filter to filter out noise.</div><div class='del'>- */</div><div class='del'>-static void ccid2_update_used_window(struct ccid2_hc_tx_sock *hc, u32 new_wnd)</div><div class='del'>-{</div><div class='del'>-	hc-&gt;tx_expected_wnd = (3 * hc-&gt;tx_expected_wnd + new_wnd) / 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This borrows the code of tcp_cwnd_application_limited() */</div><div class='del'>-static void ccid2_cwnd_application_limited(struct sock *sk, const u32 now)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	/* don't reduce cwnd below the initial window (IW) */</div><div class='del'>-	u32 init_win = rfc3390_bytes_to_packets(dccp_sk(sk)-&gt;dccps_mss_cache),</div><div class='del'>-	    win_used = max(hc-&gt;tx_cwnd_used, init_win);</div><div class='del'>-</div><div class='del'>-	if (win_used &lt; hc-&gt;tx_cwnd) {</div><div class='del'>-		hc-&gt;tx_ssthresh = max(hc-&gt;tx_ssthresh,</div><div class='del'>-				     (hc-&gt;tx_cwnd &gt;&gt; 1) + (hc-&gt;tx_cwnd &gt;&gt; 2));</div><div class='del'>-		hc-&gt;tx_cwnd = (hc-&gt;tx_cwnd + win_used) &gt;&gt; 1;</div><div class='del'>-	}</div><div class='del'>-	hc-&gt;tx_cwnd_used  = 0;</div><div class='del'>-	hc-&gt;tx_cwnd_stamp = now;</div><div class='del'>-</div><div class='del'>-	ccid2_check_l_ack_ratio(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This borrows the code of tcp_cwnd_restart() */</div><div class='del'>-static void ccid2_cwnd_restart(struct sock *sk, const u32 now)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	u32 cwnd = hc-&gt;tx_cwnd, restart_cwnd,</div><div class='del'>-	    iwnd = rfc3390_bytes_to_packets(dccp_sk(sk)-&gt;dccps_mss_cache);</div><div class='del'>-	s32 delta = now - hc-&gt;tx_lsndtime;</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_ssthresh = max(hc-&gt;tx_ssthresh, (cwnd &gt;&gt; 1) + (cwnd &gt;&gt; 2));</div><div class='del'>-</div><div class='del'>-	/* don't reduce cwnd below the initial window (IW) */</div><div class='del'>-	restart_cwnd = min(cwnd, iwnd);</div><div class='del'>-</div><div class='del'>-	while ((delta -= hc-&gt;tx_rto) &gt;= 0 &amp;&amp; cwnd &gt; restart_cwnd)</div><div class='del'>-		cwnd &gt;&gt;= 1;</div><div class='del'>-	hc-&gt;tx_cwnd = max(cwnd, restart_cwnd);</div><div class='del'>-	hc-&gt;tx_cwnd_stamp = now;</div><div class='del'>-	hc-&gt;tx_cwnd_used  = 0;</div><div class='del'>-</div><div class='del'>-	ccid2_check_l_ack_ratio(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	const u32 now = ccid2_jiffies32;</div><div class='del'>-	struct ccid2_seq *next;</div><div class='del'>-</div><div class='del'>-	/* slow-start after idle periods (RFC 2581, RFC 2861) */</div><div class='del'>-	if (ccid2_do_cwv &amp;&amp; !hc-&gt;tx_pipe &amp;&amp;</div><div class='del'>-	    (s32)(now - hc-&gt;tx_lsndtime) &gt;= hc-&gt;tx_rto)</div><div class='del'>-		ccid2_cwnd_restart(sk, now);</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_lsndtime = now;</div><div class='del'>-	hc-&gt;tx_pipe    += 1;</div><div class='del'>-</div><div class='del'>-	/* see whether cwnd was fully used (RFC 2861), update expected window */</div><div class='del'>-	if (ccid2_cwnd_network_limited(hc)) {</div><div class='del'>-		ccid2_update_used_window(hc, hc-&gt;tx_cwnd);</div><div class='del'>-		hc-&gt;tx_cwnd_used  = 0;</div><div class='del'>-		hc-&gt;tx_cwnd_stamp = now;</div><div class='del'>-	} else {</div><div class='del'>-		if (hc-&gt;tx_pipe &gt; hc-&gt;tx_cwnd_used)</div><div class='del'>-			hc-&gt;tx_cwnd_used = hc-&gt;tx_pipe;</div><div class='del'>-</div><div class='del'>-		ccid2_update_used_window(hc, hc-&gt;tx_cwnd_used);</div><div class='del'>-</div><div class='del'>-		if (ccid2_do_cwv &amp;&amp; (s32)(now - hc-&gt;tx_cwnd_stamp) &gt;= hc-&gt;tx_rto)</div><div class='del'>-			ccid2_cwnd_application_limited(sk, now);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_seqh-&gt;ccid2s_seq   = dp-&gt;dccps_gss;</div><div class='del'>-	hc-&gt;tx_seqh-&gt;ccid2s_acked = 0;</div><div class='del'>-	hc-&gt;tx_seqh-&gt;ccid2s_sent  = now;</div><div class='del'>-</div><div class='del'>-	next = hc-&gt;tx_seqh-&gt;ccid2s_next;</div><div class='del'>-	/* check if we need to alloc more space */</div><div class='del'>-	if (next == hc-&gt;tx_seqt) {</div><div class='del'>-		if (ccid2_hc_tx_alloc_seq(hc)) {</div><div class='del'>-			DCCP_CRIT("packet history - out of memory!");</div><div class='del'>-			/* FIXME: find a more graceful way to bail out */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		next = hc-&gt;tx_seqh-&gt;ccid2s_next;</div><div class='del'>-		BUG_ON(next == hc-&gt;tx_seqt);</div><div class='del'>-	}</div><div class='del'>-	hc-&gt;tx_seqh = next;</div><div class='del'>-</div><div class='del'>-	ccid2_pr_debug("cwnd=%d pipe=%d\n", hc-&gt;tx_cwnd, hc-&gt;tx_pipe);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: The code below is broken and the variables have been removed</div><div class='del'>-	 * from the socket struct. The `ackloss' variable was always set to 0,</div><div class='del'>-	 * and with arsent there are several problems:</div><div class='del'>-	 *  (i) it doesn't just count the number of Acks, but all sent packets;</div><div class='del'>-	 *  (ii) it is expressed in # of packets, not # of windows, so the</div><div class='del'>-	 *  comparison below uses the wrong formula: Appendix A of RFC 4341</div><div class='del'>-	 *  comes up with the number K = cwnd / (R^2 - R) of consecutive windows</div><div class='del'>-	 *  of data with no lost or marked Ack packets. If arsent were the # of</div><div class='del'>-	 *  consecutive Acks received without loss, then Ack Ratio needs to be</div><div class='del'>-	 *  decreased by 1 when</div><div class='del'>-	 *	      arsent &gt;=  K * cwnd / R  =  cwnd^2 / (R^3 - R^2)</div><div class='del'>-	 *  where cwnd / R is the number of Acks received per window of data</div><div class='del'>-	 *  (cf. RFC 4341, App. A). The problems are that</div><div class='del'>-	 *  - arsent counts other packets as well;</div><div class='del'>-	 *  - the comparison uses a formula different from RFC 4341;</div><div class='del'>-	 *  - computing a cubic/quadratic equation each time is too complicated.</div><div class='del'>-	 *  Hence a different algorithm is needed.</div><div class='del'>-	 */</div><div class='del'>-#if 0</div><div class='del'>-	/* Ack Ratio.  Need to maintain a concept of how many windows we sent */</div><div class='del'>-	hc-&gt;tx_arsent++;</div><div class='del'>-	/* We had an ack loss in this window... */</div><div class='del'>-	if (hc-&gt;tx_ackloss) {</div><div class='del'>-		if (hc-&gt;tx_arsent &gt;= hc-&gt;tx_cwnd) {</div><div class='del'>-			hc-&gt;tx_arsent  = 0;</div><div class='del'>-			hc-&gt;tx_ackloss = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* No acks lost up to now... */</div><div class='del'>-		/* decrease ack ratio if enough packets were sent */</div><div class='del'>-		if (dp-&gt;dccps_l_ack_ratio &gt; 1) {</div><div class='del'>-			/* XXX don't calculate denominator each time */</div><div class='del'>-			int denom = dp-&gt;dccps_l_ack_ratio * dp-&gt;dccps_l_ack_ratio -</div><div class='del'>-				    dp-&gt;dccps_l_ack_ratio;</div><div class='del'>-</div><div class='del'>-			denom = hc-&gt;tx_cwnd * hc-&gt;tx_cwnd / denom;</div><div class='del'>-</div><div class='del'>-			if (hc-&gt;tx_arsent &gt;= denom) {</div><div class='del'>-				ccid2_change_l_ack_ratio(sk, dp-&gt;dccps_l_ack_ratio - 1);</div><div class='del'>-				hc-&gt;tx_arsent = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* we can't increase ack ratio further [1] */</div><div class='del'>-			hc-&gt;tx_arsent = 0; /* or maybe set it to cwnd*/</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sk_reset_timer(sk, &amp;hc-&gt;tx_rtotimer, jiffies + hc-&gt;tx_rto);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID2_DEBUG</div><div class='del'>-	do {</div><div class='del'>-		struct ccid2_seq *seqp = hc-&gt;tx_seqt;</div><div class='del'>-</div><div class='del'>-		while (seqp != hc-&gt;tx_seqh) {</div><div class='del'>-			ccid2_pr_debug("out seq=%llu acked=%d time=%u\n",</div><div class='del'>-				       (unsigned long long)seqp-&gt;ccid2s_seq,</div><div class='del'>-				       seqp-&gt;ccid2s_acked, seqp-&gt;ccid2s_sent);</div><div class='del'>-			seqp = seqp-&gt;ccid2s_next;</div><div class='del'>-		}</div><div class='del'>-	} while (0);</div><div class='del'>-	ccid2_pr_debug("=========\n");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid2_rtt_estimator - Sample RTT and compute RTO using RFC2988 algorithm</div><div class='del'>- * This code is almost identical with TCP's tcp_rtt_estimator(), since</div><div class='del'>- * - it has a higher sampling frequency (recommended by RFC 1323),</div><div class='del'>- * - the RTO does not collapse into RTT due to RTTVAR going towards zero,</div><div class='del'>- * - it is simple (cf. more complex proposals such as Eifel timer or research</div><div class='del'>- *   which suggests that the gain should be set according to window size),</div><div class='del'>- * - in tests it was found to work well with CCID2 [gerrit].</div><div class='del'>- */</div><div class='del'>-static void ccid2_rtt_estimator(struct sock *sk, const long mrtt)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	long m = mrtt ? : 1;</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_srtt == 0) {</div><div class='del'>-		/* First measurement m */</div><div class='del'>-		hc-&gt;tx_srtt = m &lt;&lt; 3;</div><div class='del'>-		hc-&gt;tx_mdev = m &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_mdev_max = max(hc-&gt;tx_mdev, tcp_rto_min(sk));</div><div class='del'>-		hc-&gt;tx_rttvar   = hc-&gt;tx_mdev_max;</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_rtt_seq  = dccp_sk(sk)-&gt;dccps_gss;</div><div class='del'>-	} else {</div><div class='del'>-		/* Update scaled SRTT as SRTT += 1/8 * (m - SRTT) */</div><div class='del'>-		m -= (hc-&gt;tx_srtt &gt;&gt; 3);</div><div class='del'>-		hc-&gt;tx_srtt += m;</div><div class='del'>-</div><div class='del'>-		/* Similarly, update scaled mdev with regard to |m| */</div><div class='del'>-		if (m &lt; 0) {</div><div class='del'>-			m = -m;</div><div class='del'>-			m -= (hc-&gt;tx_mdev &gt;&gt; 2);</div><div class='del'>-			/*</div><div class='del'>-			 * This neutralises RTO increase when RTT &lt; SRTT - mdev</div><div class='del'>-			 * (see P. Sarolahti, A. Kuznetsov,"Congestion Control</div><div class='del'>-			 * in Linux TCP", USENIX 2002, pp. 49-62).</div><div class='del'>-			 */</div><div class='del'>-			if (m &gt; 0)</div><div class='del'>-				m &gt;&gt;= 3;</div><div class='del'>-		} else {</div><div class='del'>-			m -= (hc-&gt;tx_mdev &gt;&gt; 2);</div><div class='del'>-		}</div><div class='del'>-		hc-&gt;tx_mdev += m;</div><div class='del'>-</div><div class='del'>-		if (hc-&gt;tx_mdev &gt; hc-&gt;tx_mdev_max) {</div><div class='del'>-			hc-&gt;tx_mdev_max = hc-&gt;tx_mdev;</div><div class='del'>-			if (hc-&gt;tx_mdev_max &gt; hc-&gt;tx_rttvar)</div><div class='del'>-				hc-&gt;tx_rttvar = hc-&gt;tx_mdev_max;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Decay RTTVAR at most once per flight, exploiting that</div><div class='del'>-		 *  1) pipe &lt;= cwnd &lt;= Sequence_Window = W  (RFC 4340, 7.5.2)</div><div class='del'>-		 *  2) AWL = GSS-W+1 &lt;= GAR &lt;= GSS          (RFC 4340, 7.5.1)</div><div class='del'>-		 * GAR is a useful bound for FlightSize = pipe.</div><div class='del'>-		 * AWL is probably too low here, as it over-estimates pipe.</div><div class='del'>-		 */</div><div class='del'>-		if (after48(dccp_sk(sk)-&gt;dccps_gar, hc-&gt;tx_rtt_seq)) {</div><div class='del'>-			if (hc-&gt;tx_mdev_max &lt; hc-&gt;tx_rttvar)</div><div class='del'>-				hc-&gt;tx_rttvar -= (hc-&gt;tx_rttvar -</div><div class='del'>-						  hc-&gt;tx_mdev_max) &gt;&gt; 2;</div><div class='del'>-			hc-&gt;tx_rtt_seq  = dccp_sk(sk)-&gt;dccps_gss;</div><div class='del'>-			hc-&gt;tx_mdev_max = tcp_rto_min(sk);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set RTO from SRTT and RTTVAR</div><div class='del'>-	 * As in TCP, 4 * RTTVAR &gt;= TCP_RTO_MIN, giving a minimum RTO of 200 ms.</div><div class='del'>-	 * This agrees with RFC 4341, 5:</div><div class='del'>-	 *	"Because DCCP does not retransmit data, DCCP does not require</div><div class='del'>-	 *	 TCP's recommended minimum timeout of one second".</div><div class='del'>-	 */</div><div class='del'>-	hc-&gt;tx_rto = (hc-&gt;tx_srtt &gt;&gt; 3) + hc-&gt;tx_rttvar;</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_rto &gt; DCCP_RTO_MAX)</div><div class='del'>-		hc-&gt;tx_rto = DCCP_RTO_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_new_ack(struct sock *sk, struct ccid2_seq *seqp,</div><div class='del'>-			  unsigned int *maxincr)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	int r_seq_used = hc-&gt;tx_cwnd / dp-&gt;dccps_l_ack_ratio;</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_cwnd &lt; dp-&gt;dccps_l_seq_win &amp;&amp;</div><div class='del'>-	    r_seq_used &lt; dp-&gt;dccps_r_seq_win) {</div><div class='del'>-		if (hc-&gt;tx_cwnd &lt; hc-&gt;tx_ssthresh) {</div><div class='del'>-			if (*maxincr &gt; 0 &amp;&amp; ++hc-&gt;tx_packets_acked &gt;= 2) {</div><div class='del'>-				hc-&gt;tx_cwnd += 1;</div><div class='del'>-				*maxincr    -= 1;</div><div class='del'>-				hc-&gt;tx_packets_acked = 0;</div><div class='del'>-			}</div><div class='del'>-		} else if (++hc-&gt;tx_packets_acked &gt;= hc-&gt;tx_cwnd) {</div><div class='del'>-			hc-&gt;tx_cwnd += 1;</div><div class='del'>-			hc-&gt;tx_packets_acked = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Adjust the local sequence window and the ack ratio to allow about</div><div class='del'>-	 * 5 times the number of packets in the network (RFC 4340 7.5.2)</div><div class='del'>-	 */</div><div class='del'>-	if (r_seq_used * CCID2_WIN_CHANGE_FACTOR &gt;= dp-&gt;dccps_r_seq_win)</div><div class='del'>-		ccid2_change_l_ack_ratio(sk, dp-&gt;dccps_l_ack_ratio * 2);</div><div class='del'>-	else if (r_seq_used * CCID2_WIN_CHANGE_FACTOR &lt; dp-&gt;dccps_r_seq_win/2)</div><div class='del'>-		ccid2_change_l_ack_ratio(sk, dp-&gt;dccps_l_ack_ratio / 2 ? : 1U);</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_cwnd * CCID2_WIN_CHANGE_FACTOR &gt;= dp-&gt;dccps_l_seq_win)</div><div class='del'>-		ccid2_change_l_seq_window(sk, dp-&gt;dccps_l_seq_win * 2);</div><div class='del'>-	else if (hc-&gt;tx_cwnd * CCID2_WIN_CHANGE_FACTOR &lt; dp-&gt;dccps_l_seq_win/2)</div><div class='del'>-		ccid2_change_l_seq_window(sk, dp-&gt;dccps_l_seq_win / 2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: RTT is sampled several times per acknowledgment (for each</div><div class='del'>-	 * entry in the Ack Vector), instead of once per Ack (as in TCP SACK).</div><div class='del'>-	 * This causes the RTT to be over-estimated, since the older entries</div><div class='del'>-	 * in the Ack Vector have earlier sending times.</div><div class='del'>-	 * The cleanest solution is to not use the ccid2s_sent field at all</div><div class='del'>-	 * and instead use DCCP timestamps: requires changes in other places.</div><div class='del'>-	 */</div><div class='del'>-	ccid2_rtt_estimator(sk, ccid2_jiffies32 - seqp-&gt;ccid2s_sent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_congestion_event(struct sock *sk, struct ccid2_seq *seqp)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-	if ((s32)(seqp-&gt;ccid2s_sent - hc-&gt;tx_last_cong) &lt; 0) {</div><div class='del'>-		ccid2_pr_debug("Multiple losses in an RTT---treating as one\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_last_cong = ccid2_jiffies32;</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_cwnd      = hc-&gt;tx_cwnd / 2 ? : 1U;</div><div class='del'>-	hc-&gt;tx_ssthresh  = max(hc-&gt;tx_cwnd, 2U);</div><div class='del'>-</div><div class='del'>-	ccid2_check_l_ack_ratio(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid2_hc_tx_parse_options(struct sock *sk, u8 packet_type,</div><div class='del'>-				     u8 option, u8 *optval, u8 optlen)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-	switch (option) {</div><div class='del'>-	case DCCPO_ACK_VECTOR_0:</div><div class='del'>-	case DCCPO_ACK_VECTOR_1:</div><div class='del'>-		return dccp_ackvec_parsed_add(&amp;hc-&gt;tx_av_chunks, optval, optlen,</div><div class='del'>-					      option - DCCPO_ACK_VECTOR_0);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	const bool sender_was_blocked = ccid2_cwnd_network_limited(hc);</div><div class='del'>-	struct dccp_ackvec_parsed *avp;</div><div class='del'>-	u64 ackno, seqno;</div><div class='del'>-	struct ccid2_seq *seqp;</div><div class='del'>-	int done = 0;</div><div class='del'>-	unsigned int maxincr = 0;</div><div class='del'>-</div><div class='del'>-	/* check reverse path congestion */</div><div class='del'>-	seqno = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-</div><div class='del'>-	/* XXX this whole "algorithm" is broken.  Need to fix it to keep track</div><div class='del'>-	 * of the seqnos of the dupacks so that rpseq and rpdupack are correct</div><div class='del'>-	 * -sorbo.</div><div class='del'>-	 */</div><div class='del'>-	/* need to bootstrap */</div><div class='del'>-	if (hc-&gt;tx_rpdupack == -1) {</div><div class='del'>-		hc-&gt;tx_rpdupack = 0;</div><div class='del'>-		hc-&gt;tx_rpseq    = seqno;</div><div class='del'>-	} else {</div><div class='del'>-		/* check if packet is consecutive */</div><div class='del'>-		if (dccp_delta_seqno(hc-&gt;tx_rpseq, seqno) == 1)</div><div class='del'>-			hc-&gt;tx_rpseq = seqno;</div><div class='del'>-		/* it's a later packet */</div><div class='del'>-		else if (after48(seqno, hc-&gt;tx_rpseq)) {</div><div class='del'>-			hc-&gt;tx_rpdupack++;</div><div class='del'>-</div><div class='del'>-			/* check if we got enough dupacks */</div><div class='del'>-			if (hc-&gt;tx_rpdupack &gt;= NUMDUPACK) {</div><div class='del'>-				hc-&gt;tx_rpdupack = -1; /* XXX lame */</div><div class='del'>-				hc-&gt;tx_rpseq    = 0;</div><div class='del'>-#ifdef __CCID2_COPES_GRACEFULLY_WITH_ACK_CONGESTION_CONTROL__</div><div class='del'>-				/*</div><div class='del'>-				 * FIXME: Ack Congestion Control is broken; in</div><div class='del'>-				 * the current state instabilities occurred with</div><div class='del'>-				 * Ack Ratios greater than 1; causing hang-ups</div><div class='del'>-				 * and long RTO timeouts. This needs to be fixed</div><div class='del'>-				 * before opening up dynamic changes. -- gerrit</div><div class='del'>-				 */</div><div class='del'>-				ccid2_change_l_ack_ratio(sk, 2 * dp-&gt;dccps_l_ack_ratio);</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check forward path congestion */</div><div class='del'>-	if (dccp_packet_without_ack(skb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* still didn't send out new data packets */</div><div class='del'>-	if (hc-&gt;tx_seqh == hc-&gt;tx_seqt)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	ackno = DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq;</div><div class='del'>-	if (after48(ackno, hc-&gt;tx_high_ack))</div><div class='del'>-		hc-&gt;tx_high_ack = ackno;</div><div class='del'>-</div><div class='del'>-	seqp = hc-&gt;tx_seqt;</div><div class='del'>-	while (before48(seqp-&gt;ccid2s_seq, ackno)) {</div><div class='del'>-		seqp = seqp-&gt;ccid2s_next;</div><div class='del'>-		if (seqp == hc-&gt;tx_seqh) {</div><div class='del'>-			seqp = hc-&gt;tx_seqh-&gt;ccid2s_prev;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In slow-start, cwnd can increase up to a maximum of Ack Ratio/2</div><div class='del'>-	 * packets per acknowledgement. Rounding up avoids that cwnd is not</div><div class='del'>-	 * advanced when Ack Ratio is 1 and gives a slight edge otherwise.</div><div class='del'>-	 */</div><div class='del'>-	if (hc-&gt;tx_cwnd &lt; hc-&gt;tx_ssthresh)</div><div class='del'>-		maxincr = DIV_ROUND_UP(dp-&gt;dccps_l_ack_ratio, 2);</div><div class='del'>-</div><div class='del'>-	/* go through all ack vectors */</div><div class='del'>-	list_for_each_entry(avp, &amp;hc-&gt;tx_av_chunks, node) {</div><div class='del'>-		/* go through this ack vector */</div><div class='del'>-		for (; avp-&gt;len--; avp-&gt;vec++) {</div><div class='del'>-			u64 ackno_end_rl = SUB48(ackno,</div><div class='del'>-						 dccp_ackvec_runlen(avp-&gt;vec));</div><div class='del'>-</div><div class='del'>-			ccid2_pr_debug("ackvec %llu |%u,%u|\n",</div><div class='del'>-				       (unsigned long long)ackno,</div><div class='del'>-				       dccp_ackvec_state(avp-&gt;vec) &gt;&gt; 6,</div><div class='del'>-				       dccp_ackvec_runlen(avp-&gt;vec));</div><div class='del'>-			/* if the seqno we are analyzing is larger than the</div><div class='del'>-			 * current ackno, then move towards the tail of our</div><div class='del'>-			 * seqnos.</div><div class='del'>-			 */</div><div class='del'>-			while (after48(seqp-&gt;ccid2s_seq, ackno)) {</div><div class='del'>-				if (seqp == hc-&gt;tx_seqt) {</div><div class='del'>-					done = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				seqp = seqp-&gt;ccid2s_prev;</div><div class='del'>-			}</div><div class='del'>-			if (done)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* check all seqnos in the range of the vector</div><div class='del'>-			 * run length</div><div class='del'>-			 */</div><div class='del'>-			while (between48(seqp-&gt;ccid2s_seq,ackno_end_rl,ackno)) {</div><div class='del'>-				const u8 state = dccp_ackvec_state(avp-&gt;vec);</div><div class='del'>-</div><div class='del'>-				/* new packet received or marked */</div><div class='del'>-				if (state != DCCPAV_NOT_RECEIVED &amp;&amp;</div><div class='del'>-				    !seqp-&gt;ccid2s_acked) {</div><div class='del'>-					if (state == DCCPAV_ECN_MARKED)</div><div class='del'>-						ccid2_congestion_event(sk,</div><div class='del'>-								       seqp);</div><div class='del'>-					else</div><div class='del'>-						ccid2_new_ack(sk, seqp,</div><div class='del'>-							      &amp;maxincr);</div><div class='del'>-</div><div class='del'>-					seqp-&gt;ccid2s_acked = 1;</div><div class='del'>-					ccid2_pr_debug("Got ack for %llu\n",</div><div class='del'>-						       (unsigned long long)seqp-&gt;ccid2s_seq);</div><div class='del'>-					hc-&gt;tx_pipe--;</div><div class='del'>-				}</div><div class='del'>-				if (seqp == hc-&gt;tx_seqt) {</div><div class='del'>-					done = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				seqp = seqp-&gt;ccid2s_prev;</div><div class='del'>-			}</div><div class='del'>-			if (done)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ackno = SUB48(ackno_end_rl, 1);</div><div class='del'>-		}</div><div class='del'>-		if (done)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The state about what is acked should be correct now</div><div class='del'>-	 * Check for NUMDUPACK</div><div class='del'>-	 */</div><div class='del'>-	seqp = hc-&gt;tx_seqt;</div><div class='del'>-	while (before48(seqp-&gt;ccid2s_seq, hc-&gt;tx_high_ack)) {</div><div class='del'>-		seqp = seqp-&gt;ccid2s_next;</div><div class='del'>-		if (seqp == hc-&gt;tx_seqh) {</div><div class='del'>-			seqp = hc-&gt;tx_seqh-&gt;ccid2s_prev;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	done = 0;</div><div class='del'>-	while (1) {</div><div class='del'>-		if (seqp-&gt;ccid2s_acked) {</div><div class='del'>-			done++;</div><div class='del'>-			if (done == NUMDUPACK)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (seqp == hc-&gt;tx_seqt)</div><div class='del'>-			break;</div><div class='del'>-		seqp = seqp-&gt;ccid2s_prev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If there are at least 3 acknowledgements, anything unacknowledged</div><div class='del'>-	 * below the last sequence number is considered lost</div><div class='del'>-	 */</div><div class='del'>-	if (done == NUMDUPACK) {</div><div class='del'>-		struct ccid2_seq *last_acked = seqp;</div><div class='del'>-</div><div class='del'>-		/* check for lost packets */</div><div class='del'>-		while (1) {</div><div class='del'>-			if (!seqp-&gt;ccid2s_acked) {</div><div class='del'>-				ccid2_pr_debug("Packet lost: %llu\n",</div><div class='del'>-					       (unsigned long long)seqp-&gt;ccid2s_seq);</div><div class='del'>-				/* XXX need to traverse from tail -&gt; head in</div><div class='del'>-				 * order to detect multiple congestion events in</div><div class='del'>-				 * one ack vector.</div><div class='del'>-				 */</div><div class='del'>-				ccid2_congestion_event(sk, seqp);</div><div class='del'>-				hc-&gt;tx_pipe--;</div><div class='del'>-			}</div><div class='del'>-			if (seqp == hc-&gt;tx_seqt)</div><div class='del'>-				break;</div><div class='del'>-			seqp = seqp-&gt;ccid2s_prev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_seqt = last_acked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* trim acked packets in tail */</div><div class='del'>-	while (hc-&gt;tx_seqt != hc-&gt;tx_seqh) {</div><div class='del'>-		if (!hc-&gt;tx_seqt-&gt;ccid2s_acked)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_seqt = hc-&gt;tx_seqt-&gt;ccid2s_next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* restart RTO timer if not all outstanding data has been acked */</div><div class='del'>-	if (hc-&gt;tx_pipe == 0)</div><div class='del'>-		sk_stop_timer(sk, &amp;hc-&gt;tx_rtotimer);</div><div class='del'>-	else</div><div class='del'>-		sk_reset_timer(sk, &amp;hc-&gt;tx_rtotimer, jiffies + hc-&gt;tx_rto);</div><div class='del'>-done:</div><div class='del'>-	/* check if incoming Acks allow pending packets to be sent */</div><div class='del'>-	if (sender_was_blocked &amp;&amp; !ccid2_cwnd_network_limited(hc))</div><div class='del'>-		dccp_tasklet_schedule(sk);</div><div class='del'>-	dccp_ackvec_parsed_cleanup(&amp;hc-&gt;tx_av_chunks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid_priv(ccid);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	u32 max_ratio;</div><div class='del'>-</div><div class='del'>-	/* RFC 4341, 5: initialise ssthresh to arbitrarily high (max) value */</div><div class='del'>-	hc-&gt;tx_ssthresh = ~0U;</div><div class='del'>-</div><div class='del'>-	/* Use larger initial windows (RFC 4341, section 5). */</div><div class='del'>-	hc-&gt;tx_cwnd = rfc3390_bytes_to_packets(dp-&gt;dccps_mss_cache);</div><div class='del'>-	hc-&gt;tx_expected_wnd = hc-&gt;tx_cwnd;</div><div class='del'>-</div><div class='del'>-	/* Make sure that Ack Ratio is enabled and within bounds. */</div><div class='del'>-	max_ratio = DIV_ROUND_UP(hc-&gt;tx_cwnd, 2);</div><div class='del'>-	if (dp-&gt;dccps_l_ack_ratio == 0 || dp-&gt;dccps_l_ack_ratio &gt; max_ratio)</div><div class='del'>-		dp-&gt;dccps_l_ack_ratio = max_ratio;</div><div class='del'>-</div><div class='del'>-	/* XXX init ~ to window size... */</div><div class='del'>-	if (ccid2_hc_tx_alloc_seq(hc))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_rto	 = DCCP_TIMEOUT_INIT;</div><div class='del'>-	hc-&gt;tx_rpdupack  = -1;</div><div class='del'>-	hc-&gt;tx_last_cong = hc-&gt;tx_lsndtime = hc-&gt;tx_cwnd_stamp = ccid2_jiffies32;</div><div class='del'>-	hc-&gt;tx_cwnd_used = 0;</div><div class='del'>-	hc-&gt;sk		 = sk;</div><div class='del'>-	timer_setup(&amp;hc-&gt;tx_rtotimer, ccid2_hc_tx_rto_expire, 0);</div><div class='del'>-	INIT_LIST_HEAD(&amp;hc-&gt;tx_av_chunks);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_hc_tx_exit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sk_stop_timer(sk, &amp;hc-&gt;tx_rtotimer);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hc-&gt;tx_seqbufc; i++)</div><div class='del'>-		kfree(hc-&gt;tx_seqbuf[i]);</div><div class='del'>-	hc-&gt;tx_seqbufc = 0;</div><div class='del'>-	dccp_ackvec_parsed_cleanup(&amp;hc-&gt;tx_av_chunks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ccid2_hc_rx_sock *hc = ccid2_hc_rx_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (!dccp_data_packet(skb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (++hc-&gt;rx_num_data_pkts &gt;= dccp_sk(sk)-&gt;dccps_r_ack_ratio) {</div><div class='del'>-		dccp_send_ack(sk);</div><div class='del'>-		hc-&gt;rx_num_data_pkts = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ccid_operations ccid2_ops = {</div><div class='del'>-	.ccid_id		  = DCCPC_CCID2,</div><div class='del'>-	.ccid_name		  = "TCP-like",</div><div class='del'>-	.ccid_hc_tx_obj_size	  = sizeof(struct ccid2_hc_tx_sock),</div><div class='del'>-	.ccid_hc_tx_init	  = ccid2_hc_tx_init,</div><div class='del'>-	.ccid_hc_tx_exit	  = ccid2_hc_tx_exit,</div><div class='del'>-	.ccid_hc_tx_send_packet	  = ccid2_hc_tx_send_packet,</div><div class='del'>-	.ccid_hc_tx_packet_sent	  = ccid2_hc_tx_packet_sent,</div><div class='del'>-	.ccid_hc_tx_parse_options = ccid2_hc_tx_parse_options,</div><div class='del'>-	.ccid_hc_tx_packet_recv	  = ccid2_hc_tx_packet_recv,</div><div class='del'>-	.ccid_hc_rx_obj_size	  = sizeof(struct ccid2_hc_rx_sock),</div><div class='del'>-	.ccid_hc_rx_packet_recv	  = ccid2_hc_rx_packet_recv,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID2_DEBUG</div><div class='del'>-module_param(ccid2_debug, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ccid2_debug, "Enable CCID-2 debug messages");</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h<br/>deleted file mode 100644<br/>index 1af0116dc6ce..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/ccid2.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2005 Andrea Bittau &lt;a.bittau@cs.ucl.ac.uk&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef _DCCP_CCID2_H_</div><div class='del'>-#define _DCCP_CCID2_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include "../ccid.h"</div><div class='del'>-#include "../dccp.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CCID-2 timestamping faces the same issues as TCP timestamping.</div><div class='del'>- * Hence we reuse/share as much of the code as possible.</div><div class='del'>- */</div><div class='del'>-#define ccid2_jiffies32	((u32)jiffies)</div><div class='del'>-</div><div class='del'>-/* NUMDUPACK parameter from RFC 4341, p. 6 */</div><div class='del'>-#define NUMDUPACK	3</div><div class='del'>-</div><div class='del'>-struct ccid2_seq {</div><div class='del'>-	u64			ccid2s_seq;</div><div class='del'>-	u32			ccid2s_sent;</div><div class='del'>-	int			ccid2s_acked;</div><div class='del'>-	struct ccid2_seq	*ccid2s_prev;</div><div class='del'>-	struct ccid2_seq	*ccid2s_next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CCID2_SEQBUF_LEN 1024</div><div class='del'>-#define CCID2_SEQBUF_MAX 128</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Multiple of congestion window to keep the sequence window at</div><div class='del'>- * (RFC 4340 7.5.2)</div><div class='del'>- */</div><div class='del'>-#define CCID2_WIN_CHANGE_FACTOR 5</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ccid2_hc_tx_sock - CCID2 TX half connection</div><div class='del'>- * @tx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5</div><div class='del'>- * @tx_packets_acked:	     Ack counter for deriving cwnd growth (RFC 3465)</div><div class='del'>- * @tx_srtt:		     smoothed RTT estimate, scaled by 2^3</div><div class='del'>- * @tx_mdev:		     smoothed RTT variation, scaled by 2^2</div><div class='del'>- * @tx_mdev_max:	     maximum of @mdev during one flight</div><div class='del'>- * @tx_rttvar:		     moving average/maximum of @mdev_max</div><div class='del'>- * @tx_rto:		     RTO value deriving from SRTT and RTTVAR (RFC 2988)</div><div class='del'>- * @tx_rtt_seq:		     to decay RTTVAR at most once per flight</div><div class='del'>- * @tx_cwnd_used:	     actually used cwnd, W_used of RFC 2861</div><div class='del'>- * @tx_expected_wnd:	     moving average of @tx_cwnd_used</div><div class='del'>- * @tx_cwnd_stamp:	     to track idle periods in CWV</div><div class='del'>- * @tx_lsndtime:	     last time (in jiffies) a data packet was sent</div><div class='del'>- * @tx_rpseq:		     last consecutive seqno</div><div class='del'>- * @tx_rpdupack:	     dupacks since rpseq</div><div class='del'>- * @tx_av_chunks:	     list of Ack Vectors received on current skb</div><div class='del'>- */</div><div class='del'>-struct ccid2_hc_tx_sock {</div><div class='del'>-	u32			tx_cwnd;</div><div class='del'>-	u32			tx_ssthresh;</div><div class='del'>-	u32			tx_pipe;</div><div class='del'>-	u32			tx_packets_acked;</div><div class='del'>-	struct ccid2_seq	*tx_seqbuf[CCID2_SEQBUF_MAX];</div><div class='del'>-	int			tx_seqbufc;</div><div class='del'>-	struct ccid2_seq	*tx_seqh;</div><div class='del'>-	struct ccid2_seq	*tx_seqt;</div><div class='del'>-</div><div class='del'>-	/* RTT measurement: variables/principles are the same as in TCP */</div><div class='del'>-	u32			tx_srtt,</div><div class='del'>-				tx_mdev,</div><div class='del'>-				tx_mdev_max,</div><div class='del'>-				tx_rttvar,</div><div class='del'>-				tx_rto;</div><div class='del'>-	u64			tx_rtt_seq:48;</div><div class='del'>-	struct timer_list	tx_rtotimer;</div><div class='del'>-	struct sock		*sk;</div><div class='del'>-</div><div class='del'>-	/* Congestion Window validation (optional, RFC 2861) */</div><div class='del'>-	u32			tx_cwnd_used,</div><div class='del'>-				tx_expected_wnd,</div><div class='del'>-				tx_cwnd_stamp,</div><div class='del'>-				tx_lsndtime;</div><div class='del'>-</div><div class='del'>-	u64			tx_rpseq;</div><div class='del'>-	int			tx_rpdupack;</div><div class='del'>-	u32			tx_last_cong;</div><div class='del'>-	u64			tx_high_ack;</div><div class='del'>-	struct list_head	tx_av_chunks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool ccid2_cwnd_network_limited(struct ccid2_hc_tx_sock *hc)</div><div class='del'>-{</div><div class='del'>-	return hc-&gt;tx_pipe &gt;= hc-&gt;tx_cwnd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert RFC 3390 larger initial window into an equivalent number of packets.</div><div class='del'>- * This is based on the numbers specified in RFC 5681, 3.1.</div><div class='del'>- */</div><div class='del'>-static inline u32 rfc3390_bytes_to_packets(const u32 smss)</div><div class='del'>-{</div><div class='del'>-	return smss &lt;= 1095 ? 4 : (smss &gt; 2190 ? 2 : 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ccid2_hc_rx_sock  -  Receiving end of CCID-2 half-connection</div><div class='del'>- * @rx_num_data_pkts: number of data packets received since last feedback</div><div class='del'>- */</div><div class='del'>-struct ccid2_hc_rx_sock {</div><div class='del'>-	u32	rx_num_data_pkts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return ccid_priv(dccp_sk(sk)-&gt;dccps_hc_tx_ccid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct ccid2_hc_rx_sock *ccid2_hc_rx_sk(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return ccid_priv(dccp_sk(sk)-&gt;dccps_hc_rx_ccid);</div><div class='del'>-}</div><div class='del'>-#endif /* _DCCP_CCID2_H_ */</div><div class='head'>diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c<br/>deleted file mode 100644<br/>index 12877a1514e7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/ccid3.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,873 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005-7 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *</div><div class='del'>- *  This code has been developed by the University of Waikato WAND</div><div class='del'>- *  research group. For further information please see http://www.wand.net.nz/</div><div class='del'>- *</div><div class='del'>- *  This code also uses code from Lulea University, rereleased as GPL by its</div><div class='del'>- *  authors:</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  Changes to meet Linux coding standards, to make it meet latest ccid3 draft</div><div class='del'>- *  and to make it work as a loadable module in the DCCP stack written by</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include "../dccp.h"</div><div class='del'>-#include "ccid3.h"</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG</div><div class='del'>-static bool ccid3_debug;</div><div class='del'>-#define ccid3_pr_debug(format, a...)	DCCP_PR_DEBUG(ccid3_debug, format, ##a)</div><div class='del'>-#else</div><div class='del'>-#define ccid3_pr_debug(format, a...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Transmitter Half-Connection Routines</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG</div><div class='del'>-static const char *ccid3_tx_state_name(enum ccid3_hc_tx_states state)</div><div class='del'>-{</div><div class='del'>-	static const char *const ccid3_state_names[] = {</div><div class='del'>-	[TFRC_SSTATE_NO_SENT]  = "NO_SENT",</div><div class='del'>-	[TFRC_SSTATE_NO_FBACK] = "NO_FBACK",</div><div class='del'>-	[TFRC_SSTATE_FBACK]    = "FBACK",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ccid3_state_names[state];</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_set_state(struct sock *sk,</div><div class='del'>-				  enum ccid3_hc_tx_states state)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	enum ccid3_hc_tx_states oldstate = hc-&gt;tx_state;</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("%s(%p) %-8.8s -&gt; %s\n",</div><div class='del'>-		       dccp_role(sk), sk, ccid3_tx_state_name(oldstate),</div><div class='del'>-		       ccid3_tx_state_name(state));</div><div class='del'>-	WARN_ON(state == oldstate);</div><div class='del'>-	hc-&gt;tx_state = state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compute the initial sending rate X_init in the manner of RFC 3390:</div><div class='del'>- *</div><div class='del'>- *	X_init  =  min(4 * s, max(2 * s, 4380 bytes)) / RTT</div><div class='del'>- *</div><div class='del'>- * Note that RFC 3390 uses MSS, RFC 4342 refers to RFC 3390, and rfc3448bis</div><div class='del'>- * (rev-02) clarifies the use of RFC 3390 with regard to the above formula.</div><div class='del'>- * For consistency with other parts of the code, X_init is scaled by 2^6.</div><div class='del'>- */</div><div class='del'>-static inline u64 rfc3390_initial_rate(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	const struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	const __u32 w_init = clamp_t(__u32, 4380U, 2 * hc-&gt;tx_s, 4 * hc-&gt;tx_s);</div><div class='del'>-</div><div class='del'>-	return scaled_div(w_init &lt;&lt; 6, hc-&gt;tx_rtt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid3_update_send_interval  -  Calculate new t_ipi = s / X_inst</div><div class='del'>- * This respects the granularity of X_inst (64 * bytes/second).</div><div class='del'>- */</div><div class='del'>-static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hc)</div><div class='del'>-{</div><div class='del'>-	hc-&gt;tx_t_ipi = scaled_div32(((u64)hc-&gt;tx_s) &lt;&lt; 6, hc-&gt;tx_x);</div><div class='del'>-</div><div class='del'>-	DCCP_BUG_ON(hc-&gt;tx_t_ipi == 0);</div><div class='del'>-	ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc-&gt;tx_t_ipi,</div><div class='del'>-		       hc-&gt;tx_s, (unsigned int)(hc-&gt;tx_x &gt;&gt; 6));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)</div><div class='del'>-{</div><div class='del'>-	u32 delta = ktime_us_delta(now, hc-&gt;tx_t_last_win_count);</div><div class='del'>-</div><div class='del'>-	return delta / hc-&gt;tx_rtt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid3_hc_tx_update_x  -  Update allowed sending rate X</div><div class='del'>- * @stamp: most recent time if available - can be left NULL.</div><div class='del'>- *</div><div class='del'>- * This function tracks draft rfc3448bis, check there for latest details.</div><div class='del'>- *</div><div class='del'>- * Note: X and X_recv are both stored in units of 64 * bytes/second, to support</div><div class='del'>- *       fine-grained resolution of sending rates. This requires scaling by 2^6</div><div class='del'>- *       throughout the code. Only X_calc is unscaled (in bytes/second).</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	__u64 min_rate = 2 * hc-&gt;tx_x_recv;</div><div class='del'>-	const __u64 old_x = hc-&gt;tx_x;</div><div class='del'>-	ktime_t now = stamp ? *stamp : ktime_get_real();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Handle IDLE periods: do not reduce below RFC3390 initial sending rate</div><div class='del'>-	 * when idling [RFC 4342, 5.1]. Definition of idling is from rfc3448bis:</div><div class='del'>-	 * a sender is idle if it has not sent anything over a 2-RTT-period.</div><div class='del'>-	 * For consistency with X and X_recv, min_rate is also scaled by 2^6.</div><div class='del'>-	 */</div><div class='del'>-	if (ccid3_hc_tx_idle_rtt(hc, now) &gt;= 2) {</div><div class='del'>-		min_rate = rfc3390_initial_rate(sk);</div><div class='del'>-		min_rate = max(min_rate, 2 * hc-&gt;tx_x_recv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_p &gt; 0) {</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_x = min(((__u64)hc-&gt;tx_x_calc) &lt;&lt; 6, min_rate);</div><div class='del'>-		hc-&gt;tx_x = max(hc-&gt;tx_x, (((__u64)hc-&gt;tx_s) &lt;&lt; 6) / TFRC_T_MBI);</div><div class='del'>-</div><div class='del'>-	} else if (ktime_us_delta(now, hc-&gt;tx_t_ld) - (s64)hc-&gt;tx_rtt &gt;= 0) {</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_x = min(2 * hc-&gt;tx_x, min_rate);</div><div class='del'>-		hc-&gt;tx_x = max(hc-&gt;tx_x,</div><div class='del'>-			       scaled_div(((__u64)hc-&gt;tx_s) &lt;&lt; 6, hc-&gt;tx_rtt));</div><div class='del'>-		hc-&gt;tx_t_ld = now;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_x != old_x) {</div><div class='del'>-		ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "</div><div class='del'>-			       "X_recv=%u\n", (unsigned int)(old_x &gt;&gt; 6),</div><div class='del'>-			       (unsigned int)(hc-&gt;tx_x &gt;&gt; 6), hc-&gt;tx_x_calc,</div><div class='del'>-			       (unsigned int)(hc-&gt;tx_x_recv &gt;&gt; 6));</div><div class='del'>-</div><div class='del'>-		ccid3_update_send_interval(hc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ccid3_hc_tx_update_s - Track the mean packet size `s'</div><div class='del'>- *	@len: DCCP packet payload size in bytes</div><div class='del'>- *</div><div class='del'>- *	cf. RFC 4342, 5.3 and  RFC 3448, 4.1</div><div class='del'>- */</div><div class='del'>-static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hc, int len)</div><div class='del'>-{</div><div class='del'>-	const u16 old_s = hc-&gt;tx_s;</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_s = tfrc_ewma(hc-&gt;tx_s, len, 9);</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_s != old_s)</div><div class='del'>-		ccid3_update_send_interval(hc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Update Window Counter using the algorithm from [RFC 4342, 8.1].</div><div class='del'>- *	As elsewhere, RTT &gt; 0 is assumed by using dccp_sample_rtt().</div><div class='del'>- */</div><div class='del'>-static inline void ccid3_hc_tx_update_win_count(struct ccid3_hc_tx_sock *hc,</div><div class='del'>-						ktime_t now)</div><div class='del'>-{</div><div class='del'>-	u32 delta = ktime_us_delta(now, hc-&gt;tx_t_last_win_count),</div><div class='del'>-	    quarter_rtts = (4 * delta) / hc-&gt;tx_rtt;</div><div class='del'>-</div><div class='del'>-	if (quarter_rtts &gt; 0) {</div><div class='del'>-		hc-&gt;tx_t_last_win_count = now;</div><div class='del'>-		hc-&gt;tx_last_win_count  += min(quarter_rtts, 5U);</div><div class='del'>-		hc-&gt;tx_last_win_count  &amp;= 0xF;		/* mod 16 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_no_feedback_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = from_timer(hc, t, tx_no_feedback_timer);</div><div class='del'>-	struct sock *sk = hc-&gt;sk;</div><div class='del'>-	unsigned long t_nfb = USEC_PER_SEC / 5;</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk)) {</div><div class='del'>-		/* Try again later. */</div><div class='del'>-		/* XXX: set some sensible MIB */</div><div class='del'>-		goto restart_timer;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("%s(%p, state=%s) - entry\n", dccp_role(sk), sk,</div><div class='del'>-		       ccid3_tx_state_name(hc-&gt;tx_state));</div><div class='del'>-</div><div class='del'>-	/* Ignore and do not restart after leaving the established state */</div><div class='del'>-	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(DCCPF_OPEN | DCCPF_PARTOPEN))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Reset feedback state to "no feedback received" */</div><div class='del'>-	if (hc-&gt;tx_state == TFRC_SSTATE_FBACK)</div><div class='del'>-		ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Determine new allowed sending rate X as per draft rfc3448bis-00, 4.4</div><div class='del'>-	 * RTO is 0 if and only if no feedback has been received yet.</div><div class='del'>-	 */</div><div class='del'>-	if (hc-&gt;tx_t_rto == 0 || hc-&gt;tx_p == 0) {</div><div class='del'>-</div><div class='del'>-		/* halve send rate directly */</div><div class='del'>-		hc-&gt;tx_x = max(hc-&gt;tx_x / 2,</div><div class='del'>-			       (((__u64)hc-&gt;tx_s) &lt;&lt; 6) / TFRC_T_MBI);</div><div class='del'>-		ccid3_update_send_interval(hc);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 *  Modify the cached value of X_recv</div><div class='del'>-		 *</div><div class='del'>-		 *  If (X_calc &gt; 2 * X_recv)</div><div class='del'>-		 *    X_recv = max(X_recv / 2, s / (2 * t_mbi));</div><div class='del'>-		 *  Else</div><div class='del'>-		 *    X_recv = X_calc / 4;</div><div class='del'>-		 *</div><div class='del'>-		 *  Note that X_recv is scaled by 2^6 while X_calc is not</div><div class='del'>-		 */</div><div class='del'>-		if (hc-&gt;tx_x_calc &gt; (hc-&gt;tx_x_recv &gt;&gt; 5))</div><div class='del'>-			hc-&gt;tx_x_recv =</div><div class='del'>-				max(hc-&gt;tx_x_recv / 2,</div><div class='del'>-				    (((__u64)hc-&gt;tx_s) &lt;&lt; 6) / (2*TFRC_T_MBI));</div><div class='del'>-		else {</div><div class='del'>-			hc-&gt;tx_x_recv = hc-&gt;tx_x_calc;</div><div class='del'>-			hc-&gt;tx_x_recv &lt;&lt;= 4;</div><div class='del'>-		}</div><div class='del'>-		ccid3_hc_tx_update_x(sk, NULL);</div><div class='del'>-	}</div><div class='del'>-	ccid3_pr_debug("Reduced X to %llu/64 bytes/sec\n",</div><div class='del'>-			(unsigned long long)hc-&gt;tx_x);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set new timeout for the nofeedback timer.</div><div class='del'>-	 * See comments in packet_recv() regarding the value of t_RTO.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(hc-&gt;tx_t_rto == 0))	/* no feedback received yet */</div><div class='del'>-		t_nfb = TFRC_INITIAL_TIMEOUT;</div><div class='del'>-	else</div><div class='del'>-		t_nfb = max(hc-&gt;tx_t_rto, 2 * hc-&gt;tx_t_ipi);</div><div class='del'>-</div><div class='del'>-restart_timer:</div><div class='del'>-	sk_reset_timer(sk, &amp;hc-&gt;tx_no_feedback_timer,</div><div class='del'>-			   jiffies + usecs_to_jiffies(t_nfb));</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid3_hc_tx_send_packet  -  Delay-based dequeueing of TX packets</div><div class='del'>- * @skb: next packet candidate to send on @sk</div><div class='del'>- *</div><div class='del'>- * This function uses the convention of ccid_packet_dequeue_eval() and</div><div class='del'>- * returns a millisecond-delay value between 0 and t_mbi = 64000 msec.</div><div class='del'>- */</div><div class='del'>-static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	ktime_t now = ktime_get_real();</div><div class='del'>-	s64 delay;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This function is called only for Data and DataAck packets. Sending</div><div class='del'>-	 * zero-sized Data(Ack)s is theoretically possible, but for congestion</div><div class='del'>-	 * control this case is pathological - ignore it.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(skb-&gt;len == 0))</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;tx_state == TFRC_SSTATE_NO_SENT) {</div><div class='del'>-		sk_reset_timer(sk, &amp;hc-&gt;tx_no_feedback_timer, (jiffies +</div><div class='del'>-			       usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));</div><div class='del'>-		hc-&gt;tx_last_win_count	= 0;</div><div class='del'>-		hc-&gt;tx_t_last_win_count = now;</div><div class='del'>-</div><div class='del'>-		/* Set t_0 for initial packet */</div><div class='del'>-		hc-&gt;tx_t_nom = now;</div><div class='del'>-</div><div class='del'>-		hc-&gt;tx_s = skb-&gt;len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Use initial RTT sample when available: recommended by erratum</div><div class='del'>-		 * to RFC 4342. This implements the initialisation procedure of</div><div class='del'>-		 * draft rfc3448bis, section 4.2. Remember, X is scaled by 2^6.</div><div class='del'>-		 */</div><div class='del'>-		if (dp-&gt;dccps_syn_rtt) {</div><div class='del'>-			ccid3_pr_debug("SYN RTT = %uus\n", dp-&gt;dccps_syn_rtt);</div><div class='del'>-			hc-&gt;tx_rtt  = dp-&gt;dccps_syn_rtt;</div><div class='del'>-			hc-&gt;tx_x    = rfc3390_initial_rate(sk);</div><div class='del'>-			hc-&gt;tx_t_ld = now;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * Sender does not have RTT sample:</div><div class='del'>-			 * - set fallback RTT (RFC 4340, 3.4) since a RTT value</div><div class='del'>-			 *   is needed in several parts (e.g.  window counter);</div><div class='del'>-			 * - set sending rate X_pps = 1pps as per RFC 3448, 4.2.</div><div class='del'>-			 */</div><div class='del'>-			hc-&gt;tx_rtt = DCCP_FALLBACK_RTT;</div><div class='del'>-			hc-&gt;tx_x   = hc-&gt;tx_s;</div><div class='del'>-			hc-&gt;tx_x &lt;&lt;= 6;</div><div class='del'>-		}</div><div class='del'>-		ccid3_update_send_interval(hc);</div><div class='del'>-</div><div class='del'>-		ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		delay = ktime_us_delta(hc-&gt;tx_t_nom, now);</div><div class='del'>-		ccid3_pr_debug("delay=%ld\n", (long)delay);</div><div class='del'>-		/*</div><div class='del'>-		 *	Scheduling of packet transmissions (RFC 5348, 8.3)</div><div class='del'>-		 *</div><div class='del'>-		 * if (t_now &gt; t_nom - delta)</div><div class='del'>-		 *       // send the packet now</div><div class='del'>-		 * else</div><div class='del'>-		 *       // send the packet in (t_nom - t_now) milliseconds.</div><div class='del'>-		 */</div><div class='del'>-		if (delay &gt;= TFRC_T_DELTA)</div><div class='del'>-			return (u32)delay / USEC_PER_MSEC;</div><div class='del'>-</div><div class='del'>-		ccid3_hc_tx_update_win_count(hc, now);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* prepare to send now (add options etc.) */</div><div class='del'>-	dp-&gt;dccps_hc_tx_insert_options = 1;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_ccval  = hc-&gt;tx_last_win_count;</div><div class='del'>-</div><div class='del'>-	/* set the nominal send time for the next following packet */</div><div class='del'>-	hc-&gt;tx_t_nom = ktime_add_us(hc-&gt;tx_t_nom, hc-&gt;tx_t_ipi);</div><div class='del'>-	return CCID_PACKET_SEND_AT_ONCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_packet_sent(struct sock *sk, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-	ccid3_hc_tx_update_s(hc, len);</div><div class='del'>-</div><div class='del'>-	if (tfrc_tx_hist_add(&amp;hc-&gt;tx_hist, dccp_sk(sk)-&gt;dccps_gss))</div><div class='del'>-		DCCP_CRIT("packet history - out of memory!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	struct tfrc_tx_hist_entry *acked;</div><div class='del'>-	ktime_t now;</div><div class='del'>-	unsigned long t_nfb;</div><div class='del'>-	u32 r_sample;</div><div class='del'>-</div><div class='del'>-	/* we are only interested in ACKs */</div><div class='del'>-	if (!(DCCP_SKB_CB(skb)-&gt;dccpd_type == DCCP_PKT_ACK ||</div><div class='del'>-	      DCCP_SKB_CB(skb)-&gt;dccpd_type == DCCP_PKT_DATAACK))</div><div class='del'>-		return;</div><div class='del'>-	/*</div><div class='del'>-	 * Locate the acknowledged packet in the TX history.</div><div class='del'>-	 *</div><div class='del'>-	 * Returning "entry not found" here can for instance happen when</div><div class='del'>-	 *  - the host has not sent out anything (e.g. a passive server),</div><div class='del'>-	 *  - the Ack is outdated (packet with higher Ack number was received),</div><div class='del'>-	 *  - it is a bogus Ack (for a packet not sent on this connection).</div><div class='del'>-	 */</div><div class='del'>-	acked = tfrc_tx_hist_find_entry(hc-&gt;tx_hist, dccp_hdr_ack_seq(skb));</div><div class='del'>-	if (acked == NULL)</div><div class='del'>-		return;</div><div class='del'>-	/* For the sake of RTT sampling, ignore/remove all older entries */</div><div class='del'>-	tfrc_tx_hist_purge(&amp;acked-&gt;next);</div><div class='del'>-</div><div class='del'>-	/* Update the moving average for the RTT estimate (RFC 3448, 4.3) */</div><div class='del'>-	now	  = ktime_get_real();</div><div class='del'>-	r_sample  = dccp_sample_rtt(sk, ktime_us_delta(now, acked-&gt;stamp));</div><div class='del'>-	hc-&gt;tx_rtt = tfrc_ewma(hc-&gt;tx_rtt, r_sample, 9);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update allowed sending rate X as per draft rfc3448bis-00, 4.2/3</div><div class='del'>-	 */</div><div class='del'>-	if (hc-&gt;tx_state == TFRC_SSTATE_NO_FBACK) {</div><div class='del'>-		ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);</div><div class='del'>-</div><div class='del'>-		if (hc-&gt;tx_t_rto == 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * Initial feedback packet: Larger Initial Windows (4.2)</div><div class='del'>-			 */</div><div class='del'>-			hc-&gt;tx_x    = rfc3390_initial_rate(sk);</div><div class='del'>-			hc-&gt;tx_t_ld = now;</div><div class='del'>-</div><div class='del'>-			ccid3_update_send_interval(hc);</div><div class='del'>-</div><div class='del'>-			goto done_computing_x;</div><div class='del'>-		} else if (hc-&gt;tx_p == 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * First feedback after nofeedback timer expiry (4.3)</div><div class='del'>-			 */</div><div class='del'>-			goto done_computing_x;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update sending rate (step 4 of [RFC 3448, 4.3]) */</div><div class='del'>-	if (hc-&gt;tx_p &gt; 0)</div><div class='del'>-		hc-&gt;tx_x_calc = tfrc_calc_x(hc-&gt;tx_s, hc-&gt;tx_rtt, hc-&gt;tx_p);</div><div class='del'>-	ccid3_hc_tx_update_x(sk, &amp;now);</div><div class='del'>-</div><div class='del'>-done_computing_x:</div><div class='del'>-	ccid3_pr_debug("%s(%p), RTT=%uus (sample=%uus), s=%u, "</div><div class='del'>-			       "p=%u, X_calc=%u, X_recv=%u, X=%u\n",</div><div class='del'>-			       dccp_role(sk), sk, hc-&gt;tx_rtt, r_sample,</div><div class='del'>-			       hc-&gt;tx_s, hc-&gt;tx_p, hc-&gt;tx_x_calc,</div><div class='del'>-			       (unsigned int)(hc-&gt;tx_x_recv &gt;&gt; 6),</div><div class='del'>-			       (unsigned int)(hc-&gt;tx_x &gt;&gt; 6));</div><div class='del'>-</div><div class='del'>-	/* unschedule no feedback timer */</div><div class='del'>-	sk_stop_timer(sk, &amp;hc-&gt;tx_no_feedback_timer);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * As we have calculated new ipi, delta, t_nom it is possible</div><div class='del'>-	 * that we now can send a packet, so wake up dccp_wait_for_ccid</div><div class='del'>-	 */</div><div class='del'>-	sk-&gt;sk_write_space(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update timeout interval for the nofeedback timer. In order to control</div><div class='del'>-	 * rate halving on networks with very low RTTs (&lt;= 1 ms), use per-route</div><div class='del'>-	 * tunable RTAX_RTO_MIN value as the lower bound.</div><div class='del'>-	 */</div><div class='del'>-	hc-&gt;tx_t_rto = max_t(u32, 4 * hc-&gt;tx_rtt,</div><div class='del'>-				  USEC_PER_SEC/HZ * tcp_rto_min(sk));</div><div class='del'>-	/*</div><div class='del'>-	 * Schedule no feedback timer to expire in</div><div class='del'>-	 * max(t_RTO, 2 * s/X)  =  max(t_RTO, 2 * t_ipi)</div><div class='del'>-	 */</div><div class='del'>-	t_nfb = max(hc-&gt;tx_t_rto, 2 * hc-&gt;tx_t_ipi);</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("%s(%p), Scheduled no feedback timer to "</div><div class='del'>-		       "expire in %lu jiffies (%luus)\n",</div><div class='del'>-		       dccp_role(sk), sk, usecs_to_jiffies(t_nfb), t_nfb);</div><div class='del'>-</div><div class='del'>-	sk_reset_timer(sk, &amp;hc-&gt;tx_no_feedback_timer,</div><div class='del'>-			   jiffies + usecs_to_jiffies(t_nfb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_tx_parse_options(struct sock *sk, u8 packet_type,</div><div class='del'>-				     u8 option, u8 *optval, u8 optlen)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	__be32 opt_val;</div><div class='del'>-</div><div class='del'>-	switch (option) {</div><div class='del'>-	case TFRC_OPT_RECEIVE_RATE:</div><div class='del'>-	case TFRC_OPT_LOSS_EVENT_RATE:</div><div class='del'>-		/* Must be ignored on Data packets, cf. RFC 4342 8.3 and 8.5 */</div><div class='del'>-		if (packet_type == DCCP_PKT_DATA)</div><div class='del'>-			break;</div><div class='del'>-		if (unlikely(optlen != 4)) {</div><div class='del'>-			DCCP_WARN("%s(%p), invalid len %d for %u\n",</div><div class='del'>-				  dccp_role(sk), sk, optlen, option);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		opt_val = ntohl(get_unaligned((__be32 *)optval));</div><div class='del'>-</div><div class='del'>-		if (option == TFRC_OPT_RECEIVE_RATE) {</div><div class='del'>-			/* Receive Rate is kept in units of 64 bytes/second */</div><div class='del'>-			hc-&gt;tx_x_recv = opt_val;</div><div class='del'>-			hc-&gt;tx_x_recv &lt;&lt;= 6;</div><div class='del'>-</div><div class='del'>-			ccid3_pr_debug("%s(%p), RECEIVE_RATE=%u\n",</div><div class='del'>-				       dccp_role(sk), sk, opt_val);</div><div class='del'>-		} else {</div><div class='del'>-			/* Update the fixpoint Loss Event Rate fraction */</div><div class='del'>-			hc-&gt;tx_p = tfrc_invert_loss_event_rate(opt_val);</div><div class='del'>-</div><div class='del'>-			ccid3_pr_debug("%s(%p), LOSS_EVENT_RATE=%u\n",</div><div class='del'>-				       dccp_role(sk), sk, opt_val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid_priv(ccid);</div><div class='del'>-</div><div class='del'>-	hc-&gt;tx_state = TFRC_SSTATE_NO_SENT;</div><div class='del'>-	hc-&gt;tx_hist  = NULL;</div><div class='del'>-	hc-&gt;sk	     = sk;</div><div class='del'>-	timer_setup(&amp;hc-&gt;tx_no_feedback_timer,</div><div class='del'>-		    ccid3_hc_tx_no_feedback_timer, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_exit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-	sk_stop_timer(sk, &amp;hc-&gt;tx_no_feedback_timer);</div><div class='del'>-	tfrc_tx_hist_purge(&amp;hc-&gt;tx_hist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_tx_get_info(struct sock *sk, struct tcp_info *info)</div><div class='del'>-{</div><div class='del'>-	info-&gt;tcpi_rto = ccid3_hc_tx_sk(sk)-&gt;tx_t_rto;</div><div class='del'>-	info-&gt;tcpi_rtt = ccid3_hc_tx_sk(sk)-&gt;tx_rtt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,</div><div class='del'>-				  u32 __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	const struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-	struct tfrc_tx_info tfrc;</div><div class='del'>-	const void *val;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DCCP_SOCKOPT_CCID_TX_INFO:</div><div class='del'>-		if (len &lt; sizeof(tfrc))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		memset(&amp;tfrc, 0, sizeof(tfrc));</div><div class='del'>-		tfrc.tfrctx_x	   = hc-&gt;tx_x;</div><div class='del'>-		tfrc.tfrctx_x_recv = hc-&gt;tx_x_recv;</div><div class='del'>-		tfrc.tfrctx_x_calc = hc-&gt;tx_x_calc;</div><div class='del'>-		tfrc.tfrctx_rtt	   = hc-&gt;tx_rtt;</div><div class='del'>-		tfrc.tfrctx_p	   = hc-&gt;tx_p;</div><div class='del'>-		tfrc.tfrctx_rto	   = hc-&gt;tx_t_rto;</div><div class='del'>-		tfrc.tfrctx_ipi	   = hc-&gt;tx_t_ipi;</div><div class='del'>-		len = sizeof(tfrc);</div><div class='del'>-		val = &amp;tfrc;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (put_user(len, optlen) || copy_to_user(optval, val, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Receiver Half-Connection Routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* CCID3 feedback types */</div><div class='del'>-enum ccid3_fback_type {</div><div class='del'>-	CCID3_FBACK_NONE = 0,</div><div class='del'>-	CCID3_FBACK_INITIAL,</div><div class='del'>-	CCID3_FBACK_PERIODIC,</div><div class='del'>-	CCID3_FBACK_PARAM_CHANGE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG</div><div class='del'>-static const char *ccid3_rx_state_name(enum ccid3_hc_rx_states state)</div><div class='del'>-{</div><div class='del'>-	static const char *const ccid3_rx_state_names[] = {</div><div class='del'>-	[TFRC_RSTATE_NO_DATA] = "NO_DATA",</div><div class='del'>-	[TFRC_RSTATE_DATA]    = "DATA",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return ccid3_rx_state_names[state];</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_rx_set_state(struct sock *sk,</div><div class='del'>-				  enum ccid3_hc_rx_states state)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	enum ccid3_hc_rx_states oldstate = hc-&gt;rx_state;</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("%s(%p) %-8.8s -&gt; %s\n",</div><div class='del'>-		       dccp_role(sk), sk, ccid3_rx_state_name(oldstate),</div><div class='del'>-		       ccid3_rx_state_name(state));</div><div class='del'>-	WARN_ON(state == oldstate);</div><div class='del'>-	hc-&gt;rx_state = state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_rx_send_feedback(struct sock *sk,</div><div class='del'>-				      const struct sk_buff *skb,</div><div class='del'>-				      enum ccid3_fback_type fbtype)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	ktime_t now = ktime_get();</div><div class='del'>-	s64 delta = 0;</div><div class='del'>-</div><div class='del'>-	switch (fbtype) {</div><div class='del'>-	case CCID3_FBACK_INITIAL:</div><div class='del'>-		hc-&gt;rx_x_recv = 0;</div><div class='del'>-		hc-&gt;rx_pinv   = ~0U;   /* see RFC 4342, 8.5 */</div><div class='del'>-		break;</div><div class='del'>-	case CCID3_FBACK_PARAM_CHANGE:</div><div class='del'>-		/*</div><div class='del'>-		 * When parameters change (new loss or p &gt; p_prev), we do not</div><div class='del'>-		 * have a reliable estimate for R_m of [RFC 3448, 6.2] and so</div><div class='del'>-		 * need to  reuse the previous value of X_recv. However, when</div><div class='del'>-		 * X_recv was 0 (due to early loss), this would kill X down to</div><div class='del'>-		 * s/t_mbi (i.e. one packet in 64 seconds).</div><div class='del'>-		 * To avoid such drastic reduction, we approximate X_recv as</div><div class='del'>-		 * the number of bytes since last feedback.</div><div class='del'>-		 * This is a safe fallback, since X is bounded above by X_calc.</div><div class='del'>-		 */</div><div class='del'>-		if (hc-&gt;rx_x_recv &gt; 0)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case CCID3_FBACK_PERIODIC:</div><div class='del'>-		delta = ktime_us_delta(now, hc-&gt;rx_tstamp_last_feedback);</div><div class='del'>-		if (delta &lt;= 0)</div><div class='del'>-			delta = 1;</div><div class='del'>-		hc-&gt;rx_x_recv = scaled_div32(hc-&gt;rx_bytes_recv, delta);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("Interval %lldusec, X_recv=%u, 1/p=%u\n", delta,</div><div class='del'>-		       hc-&gt;rx_x_recv, hc-&gt;rx_pinv);</div><div class='del'>-</div><div class='del'>-	hc-&gt;rx_tstamp_last_feedback = now;</div><div class='del'>-	hc-&gt;rx_last_counter	    = dccp_hdr(skb)-&gt;dccph_ccval;</div><div class='del'>-	hc-&gt;rx_bytes_recv	    = 0;</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_hc_rx_insert_options = 1;</div><div class='del'>-	dccp_send_ack(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	__be32 x_recv, pinv;</div><div class='del'>-</div><div class='del'>-	if (!(sk-&gt;sk_state == DCCP_OPEN || sk-&gt;sk_state == DCCP_PARTOPEN))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dccp_packet_without_ack(skb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	x_recv = htonl(hc-&gt;rx_x_recv);</div><div class='del'>-	pinv   = htonl(hc-&gt;rx_pinv);</div><div class='del'>-</div><div class='del'>-	if (dccp_insert_option(skb, TFRC_OPT_LOSS_EVENT_RATE,</div><div class='del'>-			       &amp;pinv, sizeof(pinv)) ||</div><div class='del'>-	    dccp_insert_option(skb, TFRC_OPT_RECEIVE_RATE,</div><div class='del'>-			       &amp;x_recv, sizeof(x_recv)))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ccid3_first_li  -  Implements [RFC 5348, 6.3.1]</div><div class='del'>- *</div><div class='del'>- * Determine the length of the first loss interval via inverse lookup.</div><div class='del'>- * Assume that X_recv can be computed by the throughput equation</div><div class='del'>- *		    s</div><div class='del'>- *	X_recv = --------</div><div class='del'>- *		 R * fval</div><div class='del'>- * Find some p such that f(p) = fval; return 1/p (scaled).</div><div class='del'>- */</div><div class='del'>-static u32 ccid3_first_li(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	u32 x_recv, p;</div><div class='del'>-	s64 delta;</div><div class='del'>-	u64 fval;</div><div class='del'>-</div><div class='del'>-	if (hc-&gt;rx_rtt == 0) {</div><div class='del'>-		DCCP_WARN("No RTT estimate available, using fallback RTT\n");</div><div class='del'>-		hc-&gt;rx_rtt = DCCP_FALLBACK_RTT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	delta = ktime_us_delta(ktime_get(), hc-&gt;rx_tstamp_last_feedback);</div><div class='del'>-	if (delta &lt;= 0)</div><div class='del'>-		delta = 1;</div><div class='del'>-	x_recv = scaled_div32(hc-&gt;rx_bytes_recv, delta);</div><div class='del'>-	if (x_recv == 0) {		/* would also trigger divide-by-zero */</div><div class='del'>-		DCCP_WARN("X_recv==0\n");</div><div class='del'>-		if (hc-&gt;rx_x_recv == 0) {</div><div class='del'>-			DCCP_BUG("stored value of X_recv is zero");</div><div class='del'>-			return ~0U;</div><div class='del'>-		}</div><div class='del'>-		x_recv = hc-&gt;rx_x_recv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fval = scaled_div(hc-&gt;rx_s, hc-&gt;rx_rtt);</div><div class='del'>-	fval = scaled_div32(fval, x_recv);</div><div class='del'>-	p = tfrc_calc_x_reverse_lookup(fval);</div><div class='del'>-</div><div class='del'>-	ccid3_pr_debug("%s(%p), receive rate=%u bytes/s, implied "</div><div class='del'>-		       "loss rate=%u\n", dccp_role(sk), sk, x_recv, p);</div><div class='del'>-</div><div class='del'>-	return p == 0 ? ~0U : scaled_div(1, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	enum ccid3_fback_type do_feedback = CCID3_FBACK_NONE;</div><div class='del'>-	const u64 ndp = dccp_sk(sk)-&gt;dccps_options_received.dccpor_ndp;</div><div class='del'>-	const bool is_data_packet = dccp_data_packet(skb);</div><div class='del'>-</div><div class='del'>-	if (unlikely(hc-&gt;rx_state == TFRC_RSTATE_NO_DATA)) {</div><div class='del'>-		if (is_data_packet) {</div><div class='del'>-			const u32 payload = skb-&gt;len - dccp_hdr(skb)-&gt;dccph_doff * 4;</div><div class='del'>-			do_feedback = CCID3_FBACK_INITIAL;</div><div class='del'>-			ccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA);</div><div class='del'>-			hc-&gt;rx_s = payload;</div><div class='del'>-			/*</div><div class='del'>-			 * Not necessary to update rx_bytes_recv here,</div><div class='del'>-			 * since X_recv = 0 for the first feedback packet (cf.</div><div class='del'>-			 * RFC 3448, 6.3) -- gerrit</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-		goto update_records;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tfrc_rx_hist_duplicate(&amp;hc-&gt;rx_hist, skb))</div><div class='del'>-		return; /* done receiving */</div><div class='del'>-</div><div class='del'>-	if (is_data_packet) {</div><div class='del'>-		const u32 payload = skb-&gt;len - dccp_hdr(skb)-&gt;dccph_doff * 4;</div><div class='del'>-		/*</div><div class='del'>-		 * Update moving-average of s and the sum of received payload bytes</div><div class='del'>-		 */</div><div class='del'>-		hc-&gt;rx_s = tfrc_ewma(hc-&gt;rx_s, payload, 9);</div><div class='del'>-		hc-&gt;rx_bytes_recv += payload;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perform loss detection and handle pending losses</div><div class='del'>-	 */</div><div class='del'>-	if (tfrc_rx_handle_loss(&amp;hc-&gt;rx_hist, &amp;hc-&gt;rx_li_hist,</div><div class='del'>-				skb, ndp, ccid3_first_li, sk)) {</div><div class='del'>-		do_feedback = CCID3_FBACK_PARAM_CHANGE;</div><div class='del'>-		goto done_receiving;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tfrc_rx_hist_loss_pending(&amp;hc-&gt;rx_hist))</div><div class='del'>-		return; /* done receiving */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Handle data packets: RTT sampling and monitoring p</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!is_data_packet))</div><div class='del'>-		goto update_records;</div><div class='del'>-</div><div class='del'>-	if (!tfrc_lh_is_initialised(&amp;hc-&gt;rx_li_hist)) {</div><div class='del'>-		const u32 sample = tfrc_rx_hist_sample_rtt(&amp;hc-&gt;rx_hist, skb);</div><div class='del'>-		/*</div><div class='del'>-		 * Empty loss history: no loss so far, hence p stays 0.</div><div class='del'>-		 * Sample RTT values, since an RTT estimate is required for the</div><div class='del'>-		 * computation of p when the first loss occurs; RFC 3448, 6.3.1.</div><div class='del'>-		 */</div><div class='del'>-		if (sample != 0)</div><div class='del'>-			hc-&gt;rx_rtt = tfrc_ewma(hc-&gt;rx_rtt, sample, 9);</div><div class='del'>-</div><div class='del'>-	} else if (tfrc_lh_update_i_mean(&amp;hc-&gt;rx_li_hist, skb)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Step (3) of [RFC 3448, 6.1]: Recompute I_mean and, if I_mean</div><div class='del'>-		 * has decreased (resp. p has increased), send feedback now.</div><div class='del'>-		 */</div><div class='del'>-		do_feedback = CCID3_FBACK_PARAM_CHANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the periodic once-per-RTT feedback is due; RFC 4342, 10.3</div><div class='del'>-	 */</div><div class='del'>-	if (SUB16(dccp_hdr(skb)-&gt;dccph_ccval, hc-&gt;rx_last_counter) &gt; 3)</div><div class='del'>-		do_feedback = CCID3_FBACK_PERIODIC;</div><div class='del'>-</div><div class='del'>-update_records:</div><div class='del'>-	tfrc_rx_hist_add_packet(&amp;hc-&gt;rx_hist, skb, ndp);</div><div class='del'>-</div><div class='del'>-done_receiving:</div><div class='del'>-	if (do_feedback)</div><div class='del'>-		ccid3_hc_rx_send_feedback(sk, skb, do_feedback);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_rx_init(struct ccid *ccid, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid_priv(ccid);</div><div class='del'>-</div><div class='del'>-	hc-&gt;rx_state = TFRC_RSTATE_NO_DATA;</div><div class='del'>-	tfrc_lh_init(&amp;hc-&gt;rx_li_hist);</div><div class='del'>-	return tfrc_rx_hist_alloc(&amp;hc-&gt;rx_hist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_rx_exit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-</div><div class='del'>-	tfrc_rx_hist_purge(&amp;hc-&gt;rx_hist);</div><div class='del'>-	tfrc_lh_cleanup(&amp;hc-&gt;rx_li_hist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ccid3_hc_rx_get_info(struct sock *sk, struct tcp_info *info)</div><div class='del'>-{</div><div class='del'>-	info-&gt;tcpi_ca_state = ccid3_hc_rx_sk(sk)-&gt;rx_state;</div><div class='del'>-	info-&gt;tcpi_options  |= TCPI_OPT_TIMESTAMPS;</div><div class='del'>-	info-&gt;tcpi_rcv_rtt  = ccid3_hc_rx_sk(sk)-&gt;rx_rtt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,</div><div class='del'>-				  u32 __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	const struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);</div><div class='del'>-	struct tfrc_rx_info rx_info;</div><div class='del'>-	const void *val;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DCCP_SOCKOPT_CCID_RX_INFO:</div><div class='del'>-		if (len &lt; sizeof(rx_info))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		rx_info.tfrcrx_x_recv = hc-&gt;rx_x_recv;</div><div class='del'>-		rx_info.tfrcrx_rtt    = hc-&gt;rx_rtt;</div><div class='del'>-		rx_info.tfrcrx_p      = tfrc_invert_loss_event_rate(hc-&gt;rx_pinv);</div><div class='del'>-		len = sizeof(rx_info);</div><div class='del'>-		val = &amp;rx_info;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (put_user(len, optlen) || copy_to_user(optval, val, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ccid_operations ccid3_ops = {</div><div class='del'>-	.ccid_id		   = DCCPC_CCID3,</div><div class='del'>-	.ccid_name		   = "TCP-Friendly Rate Control",</div><div class='del'>-	.ccid_hc_tx_obj_size	   = sizeof(struct ccid3_hc_tx_sock),</div><div class='del'>-	.ccid_hc_tx_init	   = ccid3_hc_tx_init,</div><div class='del'>-	.ccid_hc_tx_exit	   = ccid3_hc_tx_exit,</div><div class='del'>-	.ccid_hc_tx_send_packet	   = ccid3_hc_tx_send_packet,</div><div class='del'>-	.ccid_hc_tx_packet_sent	   = ccid3_hc_tx_packet_sent,</div><div class='del'>-	.ccid_hc_tx_packet_recv	   = ccid3_hc_tx_packet_recv,</div><div class='del'>-	.ccid_hc_tx_parse_options  = ccid3_hc_tx_parse_options,</div><div class='del'>-	.ccid_hc_rx_obj_size	   = sizeof(struct ccid3_hc_rx_sock),</div><div class='del'>-	.ccid_hc_rx_init	   = ccid3_hc_rx_init,</div><div class='del'>-	.ccid_hc_rx_exit	   = ccid3_hc_rx_exit,</div><div class='del'>-	.ccid_hc_rx_insert_options = ccid3_hc_rx_insert_options,</div><div class='del'>-	.ccid_hc_rx_packet_recv	   = ccid3_hc_rx_packet_recv,</div><div class='del'>-	.ccid_hc_rx_get_info	   = ccid3_hc_rx_get_info,</div><div class='del'>-	.ccid_hc_tx_get_info	   = ccid3_hc_tx_get_info,</div><div class='del'>-	.ccid_hc_rx_getsockopt	   = ccid3_hc_rx_getsockopt,</div><div class='del'>-	.ccid_hc_tx_getsockopt	   = ccid3_hc_tx_getsockopt,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG</div><div class='del'>-module_param(ccid3_debug, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ccid3_debug, "Enable CCID-3 debug messages");</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h<br/>deleted file mode 100644<br/>index 813d91c6e1e2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/ccid3.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/ccid3.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *</div><div class='del'>- *  This code has been developed by the University of Waikato WAND</div><div class='del'>- *  research group. For further information please see http://www.wand.net.nz/</div><div class='del'>- *  or e-mail Ian McDonald - ian.mcdonald@jandi.co.nz</div><div class='del'>- *</div><div class='del'>- *  This code also uses code from Lulea University, rereleased as GPL by its</div><div class='del'>- *  authors:</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  Changes to meet Linux coding standards, to make it meet latest ccid3 draft</div><div class='del'>- *  and to make it work as a loadable module in the DCCP stack written by</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef _DCCP_CCID3_H_</div><div class='del'>-#define _DCCP_CCID3_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/tfrc.h&gt;</div><div class='del'>-#include "lib/tfrc.h"</div><div class='del'>-#include "../ccid.h"</div><div class='del'>-</div><div class='del'>-/* Two seconds as per RFC 5348, 4.2 */</div><div class='del'>-#define TFRC_INITIAL_TIMEOUT	   (2 * USEC_PER_SEC)</div><div class='del'>-</div><div class='del'>-/* Parameter t_mbi from [RFC 3448, 4.3]: backoff interval in seconds */</div><div class='del'>-#define TFRC_T_MBI		   64</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The t_delta parameter (RFC 5348, 8.3): delays of less than %USEC_PER_MSEC are</div><div class='del'>- * rounded down to 0, since sk_reset_timer() here uses millisecond granularity.</div><div class='del'>- * Hence we can use a constant t_delta = %USEC_PER_MSEC when HZ &gt;= 500. A coarse</div><div class='del'>- * resolution of HZ &lt; 500 means that the error is below one timer tick (t_gran)</div><div class='del'>- * when using the constant t_delta  =  t_gran / 2  =  %USEC_PER_SEC / (2 * HZ).</div><div class='del'>- */</div><div class='del'>-#if (HZ &gt;= 500)</div><div class='del'>-# define TFRC_T_DELTA		   USEC_PER_MSEC</div><div class='del'>-#else</div><div class='del'>-# define TFRC_T_DELTA		   (USEC_PER_SEC / (2 * HZ))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-enum ccid3_options {</div><div class='del'>-	TFRC_OPT_LOSS_EVENT_RATE = 192,</div><div class='del'>-	TFRC_OPT_LOSS_INTERVALS	 = 193,</div><div class='del'>-	TFRC_OPT_RECEIVE_RATE	 = 194,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* TFRC sender states */</div><div class='del'>-enum ccid3_hc_tx_states {</div><div class='del'>-	TFRC_SSTATE_NO_SENT = 1,</div><div class='del'>-	TFRC_SSTATE_NO_FBACK,</div><div class='del'>-	TFRC_SSTATE_FBACK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket</div><div class='del'>- * @tx_x:		  Current sending rate in 64 * bytes per second</div><div class='del'>- * @tx_x_recv:		  Receive rate in 64 * bytes per second</div><div class='del'>- * @tx_x_calc:		  Calculated rate in bytes per second</div><div class='del'>- * @tx_rtt:		  Estimate of current round trip time in usecs</div><div class='del'>- * @tx_p:		  Current loss event rate (0-1) scaled by 1000000</div><div class='del'>- * @tx_s:		  Packet size in bytes</div><div class='del'>- * @tx_t_rto:		  Nofeedback Timer setting in usecs</div><div class='del'>- * @tx_t_ipi:		  Interpacket (send) interval (RFC 3448, 4.6) in usecs</div><div class='del'>- * @tx_state:		  Sender state, one of %ccid3_hc_tx_states</div><div class='del'>- * @tx_last_win_count:	  Last window counter sent</div><div class='del'>- * @tx_t_last_win_count:  Timestamp of earliest packet</div><div class='del'>- *			  with last_win_count value sent</div><div class='del'>- * @tx_no_feedback_timer: Handle to no feedback timer</div><div class='del'>- * @tx_t_ld:		  Time last doubled during slow start</div><div class='del'>- * @tx_t_nom:		  Nominal send time of next packet</div><div class='del'>- * @tx_hist:		  Packet history</div><div class='del'>- */</div><div class='del'>-struct ccid3_hc_tx_sock {</div><div class='del'>-	u64				tx_x;</div><div class='del'>-	u64				tx_x_recv;</div><div class='del'>-	u32				tx_x_calc;</div><div class='del'>-	u32				tx_rtt;</div><div class='del'>-	u32				tx_p;</div><div class='del'>-	u32				tx_t_rto;</div><div class='del'>-	u32				tx_t_ipi;</div><div class='del'>-	u16				tx_s;</div><div class='del'>-	enum ccid3_hc_tx_states		tx_state:8;</div><div class='del'>-	u8				tx_last_win_count;</div><div class='del'>-	ktime_t				tx_t_last_win_count;</div><div class='del'>-	struct timer_list		tx_no_feedback_timer;</div><div class='del'>-	struct sock			*sk;</div><div class='del'>-	ktime_t				tx_t_ld;</div><div class='del'>-	ktime_t				tx_t_nom;</div><div class='del'>-	struct tfrc_tx_hist_entry	*tx_hist;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_tx_sock *hctx = ccid_priv(dccp_sk(sk)-&gt;dccps_hc_tx_ccid);</div><div class='del'>-	BUG_ON(hctx == NULL);</div><div class='del'>-	return hctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TFRC receiver states */</div><div class='del'>-enum ccid3_hc_rx_states {</div><div class='del'>-	TFRC_RSTATE_NO_DATA = 1,</div><div class='del'>-	TFRC_RSTATE_DATA,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket</div><div class='del'>- * @rx_last_counter:	     Tracks window counter (RFC 4342, 8.1)</div><div class='del'>- * @rx_state:		     Receiver state, one of %ccid3_hc_rx_states</div><div class='del'>- * @rx_bytes_recv:	     Total sum of DCCP payload bytes</div><div class='del'>- * @rx_x_recv:		     Receiver estimate of send rate (RFC 3448, sec. 4.3)</div><div class='del'>- * @rx_rtt:		     Receiver estimate of RTT</div><div class='del'>- * @rx_tstamp_last_feedback: Time at which last feedback was sent</div><div class='del'>- * @rx_hist:		     Packet history (loss detection + RTT sampling)</div><div class='del'>- * @rx_li_hist:		     Loss Interval database</div><div class='del'>- * @rx_s:		     Received packet size in bytes</div><div class='del'>- * @rx_pinv:		     Inverse of Loss Event Rate (RFC 4342, sec. 8.5)</div><div class='del'>- */</div><div class='del'>-struct ccid3_hc_rx_sock {</div><div class='del'>-	u8				rx_last_counter:4;</div><div class='del'>-	enum ccid3_hc_rx_states		rx_state:8;</div><div class='del'>-	u32				rx_bytes_recv;</div><div class='del'>-	u32				rx_x_recv;</div><div class='del'>-	u32				rx_rtt;</div><div class='del'>-	ktime_t				rx_tstamp_last_feedback;</div><div class='del'>-	struct tfrc_rx_hist		rx_hist;</div><div class='del'>-	struct tfrc_loss_hist		rx_li_hist;</div><div class='del'>-	u16				rx_s;</div><div class='del'>-#define rx_pinv				rx_li_hist.i_mean</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct ccid3_hc_rx_sock *hcrx = ccid_priv(dccp_sk(sk)-&gt;dccps_hc_rx_ccid);</div><div class='del'>-	BUG_ON(hcrx == NULL);</div><div class='del'>-	return hcrx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _DCCP_CCID3_H_ */</div><div class='head'>diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c<br/>deleted file mode 100644<br/>index 57f9fd78c4df..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/loss_interval.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/loss_interval.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005-7 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include "tfrc.h"</div><div class='del'>-</div><div class='del'>-static struct kmem_cache  *tfrc_lh_slab  __read_mostly;</div><div class='del'>-/* Loss Interval weights from [RFC 3448, 5.4], scaled by 10 */</div><div class='del'>-static const int tfrc_lh_weights[NINTERVAL] = { 10, 10, 10, 10, 8, 6, 4, 2 };</div><div class='del'>-</div><div class='del'>-/* implements LIFO semantics on the array */</div><div class='del'>-static inline u8 LIH_INDEX(const u8 ctr)</div><div class='del'>-{</div><div class='del'>-	return LIH_SIZE - 1 - (ctr % LIH_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the `counter' index always points at the next entry to be populated */</div><div class='del'>-static inline struct tfrc_loss_interval *tfrc_lh_peek(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	return lh-&gt;counter ? lh-&gt;ring[LIH_INDEX(lh-&gt;counter - 1)] : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* given i with 0 &lt;= i &lt;= k, return I_i as per the rfc3448bis notation */</div><div class='del'>-static inline u32 tfrc_lh_get_interval(struct tfrc_loss_hist *lh, const u8 i)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(i &gt;= lh-&gt;counter);</div><div class='del'>-	return lh-&gt;ring[LIH_INDEX(lh-&gt;counter - i - 1)]-&gt;li_length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	On-demand allocation and de-allocation of entries</div><div class='del'>- */</div><div class='del'>-static struct tfrc_loss_interval *tfrc_lh_demand_next(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	if (lh-&gt;ring[LIH_INDEX(lh-&gt;counter)] == NULL)</div><div class='del'>-		lh-&gt;ring[LIH_INDEX(lh-&gt;counter)] = kmem_cache_alloc(tfrc_lh_slab,</div><div class='del'>-								    GFP_ATOMIC);</div><div class='del'>-	return lh-&gt;ring[LIH_INDEX(lh-&gt;counter)];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_lh_cleanup(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	if (!tfrc_lh_is_initialised(lh))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (lh-&gt;counter = 0; lh-&gt;counter &lt; LIH_SIZE; lh-&gt;counter++)</div><div class='del'>-		if (lh-&gt;ring[LIH_INDEX(lh-&gt;counter)] != NULL) {</div><div class='del'>-			kmem_cache_free(tfrc_lh_slab,</div><div class='del'>-					lh-&gt;ring[LIH_INDEX(lh-&gt;counter)]);</div><div class='del'>-			lh-&gt;ring[LIH_INDEX(lh-&gt;counter)] = NULL;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tfrc_lh_calc_i_mean(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	u32 i_i, i_tot0 = 0, i_tot1 = 0, w_tot = 0;</div><div class='del'>-	int i, k = tfrc_lh_length(lh) - 1; /* k is as in rfc3448bis, 5.4 */</div><div class='del'>-</div><div class='del'>-	if (k &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= k; i++) {</div><div class='del'>-		i_i = tfrc_lh_get_interval(lh, i);</div><div class='del'>-</div><div class='del'>-		if (i &lt; k) {</div><div class='del'>-			i_tot0 += i_i * tfrc_lh_weights[i];</div><div class='del'>-			w_tot  += tfrc_lh_weights[i];</div><div class='del'>-		}</div><div class='del'>-		if (i &gt; 0)</div><div class='del'>-			i_tot1 += i_i * tfrc_lh_weights[i-1];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lh-&gt;i_mean = max(i_tot0, i_tot1) / w_tot;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_lh_update_i_mean  -  Update the `open' loss interval I_0</div><div class='del'>- * For recomputing p: returns `true' if p &gt; p_prev  &lt;=&gt;  1/p &lt; 1/p_prev</div><div class='del'>- */</div><div class='del'>-u8 tfrc_lh_update_i_mean(struct tfrc_loss_hist *lh, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct tfrc_loss_interval *cur = tfrc_lh_peek(lh);</div><div class='del'>-	u32 old_i_mean = lh-&gt;i_mean;</div><div class='del'>-	s64 len;</div><div class='del'>-</div><div class='del'>-	if (cur == NULL)			/* not initialised */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	len = dccp_delta_seqno(cur-&gt;li_seqno, DCCP_SKB_CB(skb)-&gt;dccpd_seq) + 1;</div><div class='del'>-</div><div class='del'>-	if (len - (s64)cur-&gt;li_length &lt;= 0)	/* duplicate or reordered */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (SUB16(dccp_hdr(skb)-&gt;dccph_ccval, cur-&gt;li_ccval) &gt; 4)</div><div class='del'>-		/*</div><div class='del'>-		 * Implements RFC 4342, 10.2:</div><div class='del'>-		 * If a packet S (skb) exists whose seqno comes `after' the one</div><div class='del'>-		 * starting the current loss interval (cur) and if the modulo-16</div><div class='del'>-		 * distance from C(cur) to C(S) is greater than 4, consider all</div><div class='del'>-		 * subsequent packets as belonging to a new loss interval. This</div><div class='del'>-		 * test is necessary since CCVal may wrap between intervals.</div><div class='del'>-		 */</div><div class='del'>-		cur-&gt;li_is_closed = 1;</div><div class='del'>-</div><div class='del'>-	if (tfrc_lh_length(lh) == 1)		/* due to RFC 3448, 6.3.1 */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	cur-&gt;li_length = len;</div><div class='del'>-	tfrc_lh_calc_i_mean(lh);</div><div class='del'>-</div><div class='del'>-	return lh-&gt;i_mean &lt; old_i_mean;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Determine if `new_loss' does begin a new loss interval [RFC 4342, 10.2] */</div><div class='del'>-static inline u8 tfrc_lh_is_new_loss(struct tfrc_loss_interval *cur,</div><div class='del'>-				     struct tfrc_rx_hist_entry *new_loss)</div><div class='del'>-{</div><div class='del'>-	return	dccp_delta_seqno(cur-&gt;li_seqno, new_loss-&gt;tfrchrx_seqno) &gt; 0 &amp;&amp;</div><div class='del'>-		(cur-&gt;li_is_closed || SUB16(new_loss-&gt;tfrchrx_ccval, cur-&gt;li_ccval) &gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_lh_interval_add  -  Insert new record into the Loss Interval database</div><div class='del'>- * @lh:		   Loss Interval database</div><div class='del'>- * @rh:		   Receive history containing a fresh loss event</div><div class='del'>- * @calc_first_li: Caller-dependent routine to compute length of first interval</div><div class='del'>- * @sk:		   Used by @calc_first_li in caller-specific way (subtyping)</div><div class='del'>- *</div><div class='del'>- * Updates I_mean and returns 1 if a new interval has in fact been added to @lh.</div><div class='del'>- */</div><div class='del'>-int tfrc_lh_interval_add(struct tfrc_loss_hist *lh, struct tfrc_rx_hist *rh,</div><div class='del'>-			 u32 (*calc_first_li)(struct sock *), struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct tfrc_loss_interval *cur = tfrc_lh_peek(lh), *new;</div><div class='del'>-</div><div class='del'>-	if (cur != NULL &amp;&amp; !tfrc_lh_is_new_loss(cur, tfrc_rx_hist_loss_prev(rh)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new = tfrc_lh_demand_next(lh);</div><div class='del'>-	if (unlikely(new == NULL)) {</div><div class='del'>-		DCCP_CRIT("Cannot allocate/add loss record.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new-&gt;li_seqno	  = tfrc_rx_hist_loss_prev(rh)-&gt;tfrchrx_seqno;</div><div class='del'>-	new-&gt;li_ccval	  = tfrc_rx_hist_loss_prev(rh)-&gt;tfrchrx_ccval;</div><div class='del'>-	new-&gt;li_is_closed = 0;</div><div class='del'>-</div><div class='del'>-	if (++lh-&gt;counter == 1)</div><div class='del'>-		lh-&gt;i_mean = new-&gt;li_length = (*calc_first_li)(sk);</div><div class='del'>-	else {</div><div class='del'>-		cur-&gt;li_length = dccp_delta_seqno(cur-&gt;li_seqno, new-&gt;li_seqno);</div><div class='del'>-		new-&gt;li_length = dccp_delta_seqno(new-&gt;li_seqno,</div><div class='del'>-				  tfrc_rx_hist_last_rcv(rh)-&gt;tfrchrx_seqno) + 1;</div><div class='del'>-		if (lh-&gt;counter &gt; (2*LIH_SIZE))</div><div class='del'>-			lh-&gt;counter -= LIH_SIZE;</div><div class='del'>-</div><div class='del'>-		tfrc_lh_calc_i_mean(lh);</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init tfrc_li_init(void)</div><div class='del'>-{</div><div class='del'>-	tfrc_lh_slab = kmem_cache_create("tfrc_li_hist",</div><div class='del'>-					 sizeof(struct tfrc_loss_interval), 0,</div><div class='del'>-					 SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	return tfrc_lh_slab == NULL ? -ENOBUFS : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_li_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (tfrc_lh_slab != NULL) {</div><div class='del'>-		kmem_cache_destroy(tfrc_lh_slab);</div><div class='del'>-		tfrc_lh_slab = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ccids/lib/loss_interval.h b/net/dccp/ccids/lib/loss_interval.h<br/>deleted file mode 100644<br/>index 57f631a86ccd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/loss_interval.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/loss_interval.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-#ifndef _DCCP_LI_HIST_</div><div class='del'>-#define _DCCP_LI_HIST_</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005-7 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the Free</div><div class='del'>- *  Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- *  any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Number of loss intervals (RFC 4342, 8.6.1). The history size is one more than</div><div class='del'>- * NINTERVAL, since the `open' interval I_0 is always stored as the first entry.</div><div class='del'>- */</div><div class='del'>-#define NINTERVAL	8</div><div class='del'>-#define LIH_SIZE	(NINTERVAL + 1)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  tfrc_loss_interval  -  Loss history record for TFRC-based protocols</div><div class='del'>- *  @li_seqno:		Highest received seqno before the start of loss</div><div class='del'>- *  @li_ccval:		The CCVal belonging to @li_seqno</div><div class='del'>- *  @li_is_closed:	Whether @li_seqno is older than 1 RTT</div><div class='del'>- *  @li_length:		Loss interval sequence length</div><div class='del'>- */</div><div class='del'>-struct tfrc_loss_interval {</div><div class='del'>-	u64		 li_seqno:48,</div><div class='del'>-			 li_ccval:4,</div><div class='del'>-			 li_is_closed:1;</div><div class='del'>-	u32		 li_length;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  tfrc_loss_hist  -  Loss record database</div><div class='del'>- *  @ring:	Circular queue managed in LIFO manner</div><div class='del'>- *  @counter:	Current count of entries (can be more than %LIH_SIZE)</div><div class='del'>- *  @i_mean:	Current Average Loss Interval [RFC 3448, 5.4]</div><div class='del'>- */</div><div class='del'>-struct tfrc_loss_hist {</div><div class='del'>-	struct tfrc_loss_interval	*ring[LIH_SIZE];</div><div class='del'>-	u8				counter;</div><div class='del'>-	u32				i_mean;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void tfrc_lh_init(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	memset(lh, 0, sizeof(struct tfrc_loss_hist));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 tfrc_lh_is_initialised(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	return lh-&gt;counter &gt; 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 tfrc_lh_length(struct tfrc_loss_hist *lh)</div><div class='del'>-{</div><div class='del'>-	return min(lh-&gt;counter, (u8)LIH_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct tfrc_rx_hist;</div><div class='del'>-</div><div class='del'>-int tfrc_lh_interval_add(struct tfrc_loss_hist *, struct tfrc_rx_hist *,</div><div class='del'>-			 u32 (*first_li)(struct sock *), struct sock *);</div><div class='del'>-u8 tfrc_lh_update_i_mean(struct tfrc_loss_hist *lh, struct sk_buff *);</div><div class='del'>-void tfrc_lh_cleanup(struct tfrc_loss_hist *lh);</div><div class='del'>-</div><div class='del'>-#endif /* _DCCP_LI_HIST_ */</div><div class='head'>diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c<br/>deleted file mode 100644<br/>index 876e18592d71..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/packet_history.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/packet_history.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,447 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *</div><div class='del'>- *  This code has been developed by the University of Waikato WAND</div><div class='del'>- *  research group. For further information please see http://www.wand.net.nz/</div><div class='del'>- *  or e-mail Ian McDonald - ian.mcdonald@jandi.co.nz</div><div class='del'>- *</div><div class='del'>- *  This code also uses code from Lulea University, rereleased as GPL by its</div><div class='del'>- *  authors:</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  Changes to meet Linux coding standards, to make it meet latest ccid3 draft</div><div class='del'>- *  and to make it work as a loadable module in the DCCP stack written by</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "packet_history.h"</div><div class='del'>-#include "../../dccp.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transmitter History Routines</div><div class='del'>- */</div><div class='del'>-static struct kmem_cache *tfrc_tx_hist_slab;</div><div class='del'>-</div><div class='del'>-int __init tfrc_tx_packet_history_init(void)</div><div class='del'>-{</div><div class='del'>-	tfrc_tx_hist_slab = kmem_cache_create("tfrc_tx_hist",</div><div class='del'>-					      sizeof(struct tfrc_tx_hist_entry),</div><div class='del'>-					      0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	return tfrc_tx_hist_slab == NULL ? -ENOBUFS : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_tx_packet_history_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (tfrc_tx_hist_slab != NULL) {</div><div class='del'>-		kmem_cache_destroy(tfrc_tx_hist_slab);</div><div class='del'>-		tfrc_tx_hist_slab = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int tfrc_tx_hist_add(struct tfrc_tx_hist_entry **headp, u64 seqno)</div><div class='del'>-{</div><div class='del'>-	struct tfrc_tx_hist_entry *entry = kmem_cache_alloc(tfrc_tx_hist_slab, gfp_any());</div><div class='del'>-</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	entry-&gt;seqno = seqno;</div><div class='del'>-	entry-&gt;stamp = ktime_get_real();</div><div class='del'>-	entry-&gt;next  = *headp;</div><div class='del'>-	*headp	     = entry;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_tx_hist_purge(struct tfrc_tx_hist_entry **headp)</div><div class='del'>-{</div><div class='del'>-	struct tfrc_tx_hist_entry *head = *headp;</div><div class='del'>-</div><div class='del'>-	while (head != NULL) {</div><div class='del'>-		struct tfrc_tx_hist_entry *next = head-&gt;next;</div><div class='del'>-</div><div class='del'>-		kmem_cache_free(tfrc_tx_hist_slab, head);</div><div class='del'>-		head = next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*headp = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Receiver History Routines</div><div class='del'>- */</div><div class='del'>-static struct kmem_cache *tfrc_rx_hist_slab;</div><div class='del'>-</div><div class='del'>-int __init tfrc_rx_packet_history_init(void)</div><div class='del'>-{</div><div class='del'>-	tfrc_rx_hist_slab = kmem_cache_create("tfrc_rxh_cache",</div><div class='del'>-					      sizeof(struct tfrc_rx_hist_entry),</div><div class='del'>-					      0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	return tfrc_rx_hist_slab == NULL ? -ENOBUFS : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_rx_packet_history_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (tfrc_rx_hist_slab != NULL) {</div><div class='del'>-		kmem_cache_destroy(tfrc_rx_hist_slab);</div><div class='del'>-		tfrc_rx_hist_slab = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tfrc_rx_hist_entry_from_skb(struct tfrc_rx_hist_entry *entry,</div><div class='del'>-					       const struct sk_buff *skb,</div><div class='del'>-					       const u64 ndp)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	entry-&gt;tfrchrx_seqno = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-	entry-&gt;tfrchrx_ccval = dh-&gt;dccph_ccval;</div><div class='del'>-	entry-&gt;tfrchrx_type  = dh-&gt;dccph_type;</div><div class='del'>-	entry-&gt;tfrchrx_ndp   = ndp;</div><div class='del'>-	entry-&gt;tfrchrx_tstamp = ktime_get_real();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h,</div><div class='del'>-			     const struct sk_buff *skb,</div><div class='del'>-			     const u64 ndp)</div><div class='del'>-{</div><div class='del'>-	struct tfrc_rx_hist_entry *entry = tfrc_rx_hist_last_rcv(h);</div><div class='del'>-</div><div class='del'>-	tfrc_rx_hist_entry_from_skb(entry, skb, ndp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* has the packet contained in skb been seen before? */</div><div class='del'>-int tfrc_rx_hist_duplicate(struct tfrc_rx_hist *h, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const u64 seq = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dccp_delta_seqno(tfrc_rx_hist_loss_prev(h)-&gt;tfrchrx_seqno, seq) &lt;= 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt;= h-&gt;loss_count; i++)</div><div class='del'>-		if (tfrc_rx_hist_entry(h, i)-&gt;tfrchrx_seqno == seq)</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tfrc_rx_hist_swap(struct tfrc_rx_hist *h, const u8 a, const u8 b)</div><div class='del'>-{</div><div class='del'>-	const u8 idx_a = tfrc_rx_hist_index(h, a),</div><div class='del'>-		 idx_b = tfrc_rx_hist_index(h, b);</div><div class='del'>-</div><div class='del'>-	swap(h-&gt;ring[idx_a], h-&gt;ring[idx_b]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Private helper functions for loss detection.</div><div class='del'>- *</div><div class='del'>- * In the descriptions, `Si' refers to the sequence number of entry number i,</div><div class='del'>- * whose NDP count is `Ni' (lower case is used for variables).</div><div class='del'>- * Note: All __xxx_loss functions expect that a test against duplicates has been</div><div class='del'>- *       performed already: the seqno of the skb must not be less than the seqno</div><div class='del'>- *       of loss_prev; and it must not equal that of any valid history entry.</div><div class='del'>- */</div><div class='del'>-static void __do_track_loss(struct tfrc_rx_hist *h, struct sk_buff *skb, u64 n1)</div><div class='del'>-{</div><div class='del'>-	u64 s0 = tfrc_rx_hist_loss_prev(h)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s1 = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-</div><div class='del'>-	if (!dccp_loss_free(s0, s1, n1)) {	/* gap between S0 and S1 */</div><div class='del'>-		h-&gt;loss_count = 1;</div><div class='del'>-		tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 1), skb, n1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __one_after_loss(struct tfrc_rx_hist *h, struct sk_buff *skb, u32 n2)</div><div class='del'>-{</div><div class='del'>-	u64 s0 = tfrc_rx_hist_loss_prev(h)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s1 = tfrc_rx_hist_entry(h, 1)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s2 = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-</div><div class='del'>-	if (likely(dccp_delta_seqno(s1, s2) &gt; 0)) {	/* S1  &lt;  S2 */</div><div class='del'>-		h-&gt;loss_count = 2;</div><div class='del'>-		tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 2), skb, n2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* S0  &lt;  S2  &lt;  S1 */</div><div class='del'>-</div><div class='del'>-	if (dccp_loss_free(s0, s2, n2)) {</div><div class='del'>-		u64 n1 = tfrc_rx_hist_entry(h, 1)-&gt;tfrchrx_ndp;</div><div class='del'>-</div><div class='del'>-		if (dccp_loss_free(s2, s1, n1)) {</div><div class='del'>-			/* hole is filled: S0, S2, and S1 are consecutive */</div><div class='del'>-			h-&gt;loss_count = 0;</div><div class='del'>-			h-&gt;loss_start = tfrc_rx_hist_index(h, 1);</div><div class='del'>-		} else</div><div class='del'>-			/* gap between S2 and S1: just update loss_prev */</div><div class='del'>-			tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_loss_prev(h), skb, n2);</div><div class='del'>-</div><div class='del'>-	} else {	/* gap between S0 and S2 */</div><div class='del'>-		/*</div><div class='del'>-		 * Reorder history to insert S2 between S0 and S1</div><div class='del'>-		 */</div><div class='del'>-		tfrc_rx_hist_swap(h, 0, 3);</div><div class='del'>-		h-&gt;loss_start = tfrc_rx_hist_index(h, 3);</div><div class='del'>-		tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 1), skb, n2);</div><div class='del'>-		h-&gt;loss_count = 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return 1 if a new loss event has been identified */</div><div class='del'>-static int __two_after_loss(struct tfrc_rx_hist *h, struct sk_buff *skb, u32 n3)</div><div class='del'>-{</div><div class='del'>-	u64 s0 = tfrc_rx_hist_loss_prev(h)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s1 = tfrc_rx_hist_entry(h, 1)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s2 = tfrc_rx_hist_entry(h, 2)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s3 = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-</div><div class='del'>-	if (likely(dccp_delta_seqno(s2, s3) &gt; 0)) {	/* S2  &lt;  S3 */</div><div class='del'>-		h-&gt;loss_count = 3;</div><div class='del'>-		tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 3), skb, n3);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* S3  &lt;  S2 */</div><div class='del'>-</div><div class='del'>-	if (dccp_delta_seqno(s1, s3) &gt; 0) {		/* S1  &lt;  S3  &lt;  S2 */</div><div class='del'>-		/*</div><div class='del'>-		 * Reorder history to insert S3 between S1 and S2</div><div class='del'>-		 */</div><div class='del'>-		tfrc_rx_hist_swap(h, 2, 3);</div><div class='del'>-		tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 2), skb, n3);</div><div class='del'>-		h-&gt;loss_count = 3;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* S0  &lt;  S3  &lt;  S1 */</div><div class='del'>-</div><div class='del'>-	if (dccp_loss_free(s0, s3, n3)) {</div><div class='del'>-		u64 n1 = tfrc_rx_hist_entry(h, 1)-&gt;tfrchrx_ndp;</div><div class='del'>-</div><div class='del'>-		if (dccp_loss_free(s3, s1, n1)) {</div><div class='del'>-			/* hole between S0 and S1 filled by S3 */</div><div class='del'>-			u64 n2 = tfrc_rx_hist_entry(h, 2)-&gt;tfrchrx_ndp;</div><div class='del'>-</div><div class='del'>-			if (dccp_loss_free(s1, s2, n2)) {</div><div class='del'>-				/* entire hole filled by S0, S3, S1, S2 */</div><div class='del'>-				h-&gt;loss_start = tfrc_rx_hist_index(h, 2);</div><div class='del'>-				h-&gt;loss_count = 0;</div><div class='del'>-			} else {</div><div class='del'>-				/* gap remains between S1 and S2 */</div><div class='del'>-				h-&gt;loss_start = tfrc_rx_hist_index(h, 1);</div><div class='del'>-				h-&gt;loss_count = 1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else /* gap exists between S3 and S1, loss_count stays at 2 */</div><div class='del'>-			tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_loss_prev(h), skb, n3);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The remaining case:  S0  &lt;  S3  &lt;  S1  &lt;  S2;  gap between S0 and S3</div><div class='del'>-	 * Reorder history to insert S3 between S0 and S1.</div><div class='del'>-	 */</div><div class='del'>-	tfrc_rx_hist_swap(h, 0, 3);</div><div class='del'>-	h-&gt;loss_start = tfrc_rx_hist_index(h, 3);</div><div class='del'>-	tfrc_rx_hist_entry_from_skb(tfrc_rx_hist_entry(h, 1), skb, n3);</div><div class='del'>-	h-&gt;loss_count = 3;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* recycle RX history records to continue loss detection if necessary */</div><div class='del'>-static void __three_after_loss(struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * At this stage we know already that there is a gap between S0 and S1</div><div class='del'>-	 * (since S0 was the highest sequence number received before detecting</div><div class='del'>-	 * the loss). To recycle the loss record, it is	thus only necessary to</div><div class='del'>-	 * check for other possible gaps between S1/S2 and between S2/S3.</div><div class='del'>-	 */</div><div class='del'>-	u64 s1 = tfrc_rx_hist_entry(h, 1)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s2 = tfrc_rx_hist_entry(h, 2)-&gt;tfrchrx_seqno,</div><div class='del'>-	    s3 = tfrc_rx_hist_entry(h, 3)-&gt;tfrchrx_seqno;</div><div class='del'>-	u64 n2 = tfrc_rx_hist_entry(h, 2)-&gt;tfrchrx_ndp,</div><div class='del'>-	    n3 = tfrc_rx_hist_entry(h, 3)-&gt;tfrchrx_ndp;</div><div class='del'>-</div><div class='del'>-	if (dccp_loss_free(s1, s2, n2)) {</div><div class='del'>-</div><div class='del'>-		if (dccp_loss_free(s2, s3, n3)) {</div><div class='del'>-			/* no gap between S2 and S3: entire hole is filled */</div><div class='del'>-			h-&gt;loss_start = tfrc_rx_hist_index(h, 3);</div><div class='del'>-			h-&gt;loss_count = 0;</div><div class='del'>-		} else {</div><div class='del'>-			/* gap between S2 and S3 */</div><div class='del'>-			h-&gt;loss_start = tfrc_rx_hist_index(h, 2);</div><div class='del'>-			h-&gt;loss_count = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {	/* gap between S1 and S2 */</div><div class='del'>-		h-&gt;loss_start = tfrc_rx_hist_index(h, 1);</div><div class='del'>-		h-&gt;loss_count = 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  tfrc_rx_handle_loss  -  Loss detection and further processing</div><div class='del'>- *  @h:		    The non-empty RX history object</div><div class='del'>- *  @lh:	    Loss Intervals database to update</div><div class='del'>- *  @skb:	    Currently received packet</div><div class='del'>- *  @ndp:	    The NDP count belonging to @skb</div><div class='del'>- *  @calc_first_li: Caller-dependent computation of first loss interval in @lh</div><div class='del'>- *  @sk:	    Used by @calc_first_li (see tfrc_lh_interval_add)</div><div class='del'>- *</div><div class='del'>- *  Chooses action according to pending loss, updates LI database when a new</div><div class='del'>- *  loss was detected, and does required post-processing. Returns 1 when caller</div><div class='del'>- *  should send feedback, 0 otherwise.</div><div class='del'>- *  Since it also takes care of reordering during loss detection and updates the</div><div class='del'>- *  records accordingly, the caller should not perform any more RX history</div><div class='del'>- *  operations when loss_count is greater than 0 after calling this function.</div><div class='del'>- */</div><div class='del'>-int tfrc_rx_handle_loss(struct tfrc_rx_hist *h,</div><div class='del'>-			struct tfrc_loss_hist *lh,</div><div class='del'>-			struct sk_buff *skb, const u64 ndp,</div><div class='del'>-			u32 (*calc_first_li)(struct sock *), struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	int is_new_loss = 0;</div><div class='del'>-</div><div class='del'>-	if (h-&gt;loss_count == 0) {</div><div class='del'>-		__do_track_loss(h, skb, ndp);</div><div class='del'>-	} else if (h-&gt;loss_count == 1) {</div><div class='del'>-		__one_after_loss(h, skb, ndp);</div><div class='del'>-	} else if (h-&gt;loss_count != 2) {</div><div class='del'>-		DCCP_BUG("invalid loss_count %d", h-&gt;loss_count);</div><div class='del'>-	} else if (__two_after_loss(h, skb, ndp)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Update Loss Interval database and recycle RX records</div><div class='del'>-		 */</div><div class='del'>-		is_new_loss = tfrc_lh_interval_add(lh, h, calc_first_li, sk);</div><div class='del'>-		__three_after_loss(h);</div><div class='del'>-	}</div><div class='del'>-	return is_new_loss;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int tfrc_rx_hist_alloc(struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= TFRC_NDUPACK; i++) {</div><div class='del'>-		h-&gt;ring[i] = kmem_cache_alloc(tfrc_rx_hist_slab, GFP_ATOMIC);</div><div class='del'>-		if (h-&gt;ring[i] == NULL)</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h-&gt;loss_count = h-&gt;loss_start = 0;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	while (i-- != 0) {</div><div class='del'>-		kmem_cache_free(tfrc_rx_hist_slab, h-&gt;ring[i]);</div><div class='del'>-		h-&gt;ring[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-	return -ENOBUFS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_rx_hist_purge(struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= TFRC_NDUPACK; ++i)</div><div class='del'>-		if (h-&gt;ring[i] != NULL) {</div><div class='del'>-			kmem_cache_free(tfrc_rx_hist_slab, h-&gt;ring[i]);</div><div class='del'>-			h-&gt;ring[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_rtt_last_s - reference entry to compute RTT samples against</div><div class='del'>- */</div><div class='del'>-static inline struct tfrc_rx_hist_entry *</div><div class='del'>-			tfrc_rx_hist_rtt_last_s(const struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;ring[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_rtt_prev_s - previously suitable (wrt rtt_last_s) RTT-sampling entry</div><div class='del'>- */</div><div class='del'>-static inline struct tfrc_rx_hist_entry *</div><div class='del'>-			tfrc_rx_hist_rtt_prev_s(const struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;ring[h-&gt;rtt_sample_prev];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_sample_rtt  -  Sample RTT from timestamp / CCVal</div><div class='del'>- * Based on ideas presented in RFC 4342, 8.1. Returns 0 if it was not able</div><div class='del'>- * to compute a sample with given data - calling function should check this.</div><div class='del'>- */</div><div class='del'>-u32 tfrc_rx_hist_sample_rtt(struct tfrc_rx_hist *h, const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u32 sample = 0,</div><div class='del'>-	    delta_v = SUB16(dccp_hdr(skb)-&gt;dccph_ccval,</div><div class='del'>-			    tfrc_rx_hist_rtt_last_s(h)-&gt;tfrchrx_ccval);</div><div class='del'>-</div><div class='del'>-	if (delta_v &lt; 1 || delta_v &gt; 4) {	/* unsuitable CCVal delta */</div><div class='del'>-		if (h-&gt;rtt_sample_prev == 2) {	/* previous candidate stored */</div><div class='del'>-			sample = SUB16(tfrc_rx_hist_rtt_prev_s(h)-&gt;tfrchrx_ccval,</div><div class='del'>-				       tfrc_rx_hist_rtt_last_s(h)-&gt;tfrchrx_ccval);</div><div class='del'>-			if (sample)</div><div class='del'>-				sample = 4 / sample *</div><div class='del'>-				         ktime_us_delta(tfrc_rx_hist_rtt_prev_s(h)-&gt;tfrchrx_tstamp,</div><div class='del'>-							tfrc_rx_hist_rtt_last_s(h)-&gt;tfrchrx_tstamp);</div><div class='del'>-			else    /*</div><div class='del'>-				 * FIXME: This condition is in principle not</div><div class='del'>-				 * possible but occurs when CCID is used for</div><div class='del'>-				 * two-way data traffic. I have tried to trace</div><div class='del'>-				 * it, but the cause does not seem to be here.</div><div class='del'>-				 */</div><div class='del'>-				DCCP_BUG("please report to dccp@vger.kernel.org"</div><div class='del'>-					 " =&gt; prev = %u, last = %u",</div><div class='del'>-					 tfrc_rx_hist_rtt_prev_s(h)-&gt;tfrchrx_ccval,</div><div class='del'>-					 tfrc_rx_hist_rtt_last_s(h)-&gt;tfrchrx_ccval);</div><div class='del'>-		} else if (delta_v &lt; 1) {</div><div class='del'>-			h-&gt;rtt_sample_prev = 1;</div><div class='del'>-			goto keep_ref_for_next_time;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (delta_v == 4) /* optimal match */</div><div class='del'>-		sample = ktime_to_us(net_timedelta(tfrc_rx_hist_rtt_last_s(h)-&gt;tfrchrx_tstamp));</div><div class='del'>-	else {			 /* suboptimal match */</div><div class='del'>-		h-&gt;rtt_sample_prev = 2;</div><div class='del'>-		goto keep_ref_for_next_time;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(sample &gt; DCCP_SANE_RTT_MAX)) {</div><div class='del'>-		DCCP_WARN("RTT sample %u too large, using max\n", sample);</div><div class='del'>-		sample = DCCP_SANE_RTT_MAX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h-&gt;rtt_sample_prev = 0;	       /* use current entry as next reference */</div><div class='del'>-keep_ref_for_next_time:</div><div class='del'>-</div><div class='del'>-	return sample;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h<br/>deleted file mode 100644<br/>index ee362b0b630d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/packet_history.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/packet_history.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Packet RX/TX history data structures and routines for TFRC-based protocols.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-6 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *</div><div class='del'>- *  This code has been developed by the University of Waikato WAND</div><div class='del'>- *  research group. For further information please see http://www.wand.net.nz/</div><div class='del'>- *  or e-mail Ian McDonald - ian.mcdonald@jandi.co.nz</div><div class='del'>- *</div><div class='del'>- *  This code also uses code from Lulea University, rereleased as GPL by its</div><div class='del'>- *  authors:</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  Changes to meet Linux coding standards, to make it meet latest ccid3 draft</div><div class='del'>- *  and to make it work as a loadable module in the DCCP stack written by</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _DCCP_PKT_HIST_</div><div class='del'>-#define _DCCP_PKT_HIST_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "tfrc.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  tfrc_tx_hist_entry  -  Simple singly-linked TX history list</div><div class='del'>- *  @next:  next oldest entry (LIFO order)</div><div class='del'>- *  @seqno: sequence number of this entry</div><div class='del'>- *  @stamp: send time of packet with sequence number @seqno</div><div class='del'>- */</div><div class='del'>-struct tfrc_tx_hist_entry {</div><div class='del'>-	struct tfrc_tx_hist_entry *next;</div><div class='del'>-	u64			  seqno;</div><div class='del'>-	ktime_t			  stamp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct tfrc_tx_hist_entry *</div><div class='del'>-	tfrc_tx_hist_find_entry(struct tfrc_tx_hist_entry *head, u64 seqno)</div><div class='del'>-{</div><div class='del'>-	while (head != NULL &amp;&amp; head-&gt;seqno != seqno)</div><div class='del'>-		head = head-&gt;next;</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int tfrc_tx_hist_add(struct tfrc_tx_hist_entry **headp, u64 seqno);</div><div class='del'>-void tfrc_tx_hist_purge(struct tfrc_tx_hist_entry **headp);</div><div class='del'>-</div><div class='del'>-/* Subtraction a-b modulo-16, respects circular wrap-around */</div><div class='del'>-#define SUB16(a, b) (((a) + 16 - (b)) &amp; 0xF)</div><div class='del'>-</div><div class='del'>-/* Number of packets to wait after a missing packet (RFC 4342, 6.1) */</div><div class='del'>-#define TFRC_NDUPACK 3</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_entry - Store information about a single received packet</div><div class='del'>- * @tfrchrx_seqno:	DCCP packet sequence number</div><div class='del'>- * @tfrchrx_ccval:	window counter value of packet (RFC 4342, 8.1)</div><div class='del'>- * @tfrchrx_ndp:	the NDP count (if any) of the packet</div><div class='del'>- * @tfrchrx_tstamp:	actual receive time of packet</div><div class='del'>- */</div><div class='del'>-struct tfrc_rx_hist_entry {</div><div class='del'>-	u64		 tfrchrx_seqno:48,</div><div class='del'>-			 tfrchrx_ccval:4,</div><div class='del'>-			 tfrchrx_type:4;</div><div class='del'>-	u64		 tfrchrx_ndp:48;</div><div class='del'>-	ktime_t		 tfrchrx_tstamp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist  -  RX history structure for TFRC-based protocols</div><div class='del'>- * @ring:		Packet history for RTT sampling and loss detection</div><div class='del'>- * @loss_count:		Number of entries in circular history</div><div class='del'>- * @loss_start:		Movable index (for loss detection)</div><div class='del'>- * @rtt_sample_prev:	Used during RTT sampling, points to candidate entry</div><div class='del'>- */</div><div class='del'>-struct tfrc_rx_hist {</div><div class='del'>-	struct tfrc_rx_hist_entry *ring[TFRC_NDUPACK + 1];</div><div class='del'>-	u8			  loss_count:2,</div><div class='del'>-				  loss_start:2;</div><div class='del'>-#define rtt_sample_prev		  loss_start</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_index - index to reach n-th entry after loss_start</div><div class='del'>- */</div><div class='del'>-static inline u8 tfrc_rx_hist_index(const struct tfrc_rx_hist *h, const u8 n)</div><div class='del'>-{</div><div class='del'>-	return (h-&gt;loss_start + n) &amp; TFRC_NDUPACK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_last_rcv - entry with highest-received-seqno so far</div><div class='del'>- */</div><div class='del'>-static inline struct tfrc_rx_hist_entry *</div><div class='del'>-			tfrc_rx_hist_last_rcv(const struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;ring[tfrc_rx_hist_index(h, h-&gt;loss_count)];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_entry - return the n-th history entry after loss_start</div><div class='del'>- */</div><div class='del'>-static inline struct tfrc_rx_hist_entry *</div><div class='del'>-			tfrc_rx_hist_entry(const struct tfrc_rx_hist *h, const u8 n)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;ring[tfrc_rx_hist_index(h, n)];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_rx_hist_loss_prev - entry with highest-received-seqno before loss was detected</div><div class='del'>- */</div><div class='del'>-static inline struct tfrc_rx_hist_entry *</div><div class='del'>-			tfrc_rx_hist_loss_prev(const struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;ring[h-&gt;loss_start];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* indicate whether previously a packet was detected missing */</div><div class='del'>-static inline bool tfrc_rx_hist_loss_pending(const struct tfrc_rx_hist *h)</div><div class='del'>-{</div><div class='del'>-	return h-&gt;loss_count &gt; 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h, const struct sk_buff *skb,</div><div class='del'>-			     const u64 ndp);</div><div class='del'>-</div><div class='del'>-int tfrc_rx_hist_duplicate(struct tfrc_rx_hist *h, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-struct tfrc_loss_hist;</div><div class='del'>-int tfrc_rx_handle_loss(struct tfrc_rx_hist *h, struct tfrc_loss_hist *lh,</div><div class='del'>-			struct sk_buff *skb, const u64 ndp,</div><div class='del'>-			u32 (*first_li)(struct sock *sk), struct sock *sk);</div><div class='del'>-u32 tfrc_rx_hist_sample_rtt(struct tfrc_rx_hist *h, const struct sk_buff *skb);</div><div class='del'>-int tfrc_rx_hist_alloc(struct tfrc_rx_hist *h);</div><div class='del'>-void tfrc_rx_hist_purge(struct tfrc_rx_hist *h);</div><div class='del'>-</div><div class='del'>-#endif /* _DCCP_PKT_HIST_ */</div><div class='head'>diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c<br/>deleted file mode 100644<br/>index d7f265e1f50c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/tfrc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * TFRC library initialisation</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2007 The University of Aberdeen, Scotland, UK</div><div class='del'>- * Copyright (c) 2007 Arnaldo Carvalho de Melo &lt;acme@redhat.com&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include "tfrc.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_TFRC_DEBUG</div><div class='del'>-bool tfrc_debug;</div><div class='del'>-module_param(tfrc_debug, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(tfrc_debug, "Enable TFRC debug messages");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int __init tfrc_lib_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc = tfrc_li_init();</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rc = tfrc_tx_packet_history_init();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_free_loss_intervals;</div><div class='del'>-</div><div class='del'>-	rc = tfrc_rx_packet_history_init();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_free_tx_history;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_free_tx_history:</div><div class='del'>-	tfrc_tx_packet_history_exit();</div><div class='del'>-out_free_loss_intervals:</div><div class='del'>-	tfrc_li_exit();</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tfrc_lib_exit(void)</div><div class='del'>-{</div><div class='del'>-	tfrc_rx_packet_history_exit();</div><div class='del'>-	tfrc_tx_packet_history_exit();</div><div class='del'>-	tfrc_li_exit();</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ccids/lib/tfrc.h b/net/dccp/ccids/lib/tfrc.h<br/>deleted file mode 100644<br/>index 40ee7d62b652..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/tfrc.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-#ifndef _TFRC_H_</div><div class='del'>-#define _TFRC_H_</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2007   The University of Aberdeen, Scotland, UK</div><div class='del'>- *  Copyright (c) 2005-6 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005-6 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *  Copyright (c) 2005   Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *  Copyright (c) 2003   Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include "../../dccp.h"</div><div class='del'>-</div><div class='del'>-/* internal includes that this library exports: */</div><div class='del'>-#include "loss_interval.h"</div><div class='del'>-#include "packet_history.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_TFRC_DEBUG</div><div class='del'>-extern bool tfrc_debug;</div><div class='del'>-#define tfrc_pr_debug(format, a...)	DCCP_PR_DEBUG(tfrc_debug, format, ##a)</div><div class='del'>-#else</div><div class='del'>-#define tfrc_pr_debug(format, a...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* integer-arithmetic divisions of type (a * 1000000)/b */</div><div class='del'>-static inline u64 scaled_div(u64 a, u64 b)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(b == 0);</div><div class='del'>-	return div64_u64(a * 1000000, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 scaled_div32(u64 a, u64 b)</div><div class='del'>-{</div><div class='del'>-	u64 result = scaled_div(a, b);</div><div class='del'>-</div><div class='del'>-	if (result &gt; UINT_MAX) {</div><div class='del'>-		DCCP_CRIT("Overflow: %llu/%llu &gt; UINT_MAX",</div><div class='del'>-			  (unsigned long long)a, (unsigned long long)b);</div><div class='del'>-		return UINT_MAX;</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_ewma  -  Exponentially weighted moving average</div><div class='del'>- * @weight: Weight to be used as damping factor, in units of 1/10</div><div class='del'>- */</div><div class='del'>-static inline u32 tfrc_ewma(const u32 avg, const u32 newval, const u8 weight)</div><div class='del'>-{</div><div class='del'>-	return avg ? (weight * avg + (10 - weight) * newval) / 10 : newval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 tfrc_calc_x(u16 s, u32 R, u32 p);</div><div class='del'>-u32 tfrc_calc_x_reverse_lookup(u32 fvalue);</div><div class='del'>-u32 tfrc_invert_loss_event_rate(u32 loss_event_rate);</div><div class='del'>-</div><div class='del'>-int tfrc_tx_packet_history_init(void);</div><div class='del'>-void tfrc_tx_packet_history_exit(void);</div><div class='del'>-int tfrc_rx_packet_history_init(void);</div><div class='del'>-void tfrc_rx_packet_history_exit(void);</div><div class='del'>-</div><div class='del'>-int tfrc_li_init(void);</div><div class='del'>-void tfrc_li_exit(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_TFRC_LIB</div><div class='del'>-int tfrc_lib_init(void);</div><div class='del'>-void tfrc_lib_exit(void);</div><div class='del'>-#else</div><div class='del'>-#define tfrc_lib_init() (0)</div><div class='del'>-#define tfrc_lib_exit()</div><div class='del'>-#endif</div><div class='del'>-#endif /* _TFRC_H_ */</div><div class='head'>diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c<br/>deleted file mode 100644<br/>index 88ef98285bec..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ccids/lib/tfrc_equation.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ccids/lib/tfrc_equation.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,705 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include "../../dccp.h"</div><div class='del'>-#include "tfrc.h"</div><div class='del'>-</div><div class='del'>-#define TFRC_CALC_X_ARRSIZE 500</div><div class='del'>-#define TFRC_CALC_X_SPLIT   50000	/* 0.05 * 1000000, details below */</div><div class='del'>-#define TFRC_SMALLEST_P	    (TFRC_CALC_X_SPLIT/TFRC_CALC_X_ARRSIZE)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  TFRC TCP Reno Throughput Equation Lookup Table for f(p)</div><div class='del'>-</div><div class='del'>-  The following two-column lookup table implements a part of the TCP throughput</div><div class='del'>-  equation from [RFC 3448, sec. 3.1]:</div><div class='del'>-</div><div class='del'>-				     s</div><div class='del'>-  X_calc  =  --------------------------------------------------------------</div><div class='del'>-	     R * sqrt(2*b*p/3) + (3 * t_RTO * sqrt(3*b*p/8) * (p + 32*p^3))</div><div class='del'>-</div><div class='del'>-  Where:</div><div class='del'>-	X      is the transmit rate in bytes/second</div><div class='del'>-	s      is the packet size in bytes</div><div class='del'>-	R      is the round trip time in seconds</div><div class='del'>-	p      is the loss event rate, between 0 and 1.0, of the number of loss</div><div class='del'>-		      events as a fraction of the number of packets transmitted</div><div class='del'>-	t_RTO  is the TCP retransmission timeout value in seconds</div><div class='del'>-	b      is the number of packets acknowledged by a single TCP ACK</div><div class='del'>-</div><div class='del'>-  We can assume that b = 1 and t_RTO is 4 * R. The equation now becomes:</div><div class='del'>-</div><div class='del'>-				     s</div><div class='del'>-  X_calc  =  -------------------------------------------------------</div><div class='del'>-	     R * sqrt(p*2/3) + (12 * R * sqrt(p*3/8) * (p + 32*p^3))</div><div class='del'>-</div><div class='del'>-  which we can break down into:</div><div class='del'>-</div><div class='del'>-		      s</div><div class='del'>-	X_calc  =  ---------</div><div class='del'>-		    R * f(p)</div><div class='del'>-</div><div class='del'>-  where f(p) is given for 0 &lt; p &lt;= 1 by:</div><div class='del'>-</div><div class='del'>-	f(p)  =  sqrt(2*p/3) + 12 * sqrt(3*p/8) *  (p + 32*p^3)</div><div class='del'>-</div><div class='del'>-  Since this is kernel code, floating-point arithmetic is avoided in favour of</div><div class='del'>-  integer arithmetic. This means that nearly all fractional parameters are</div><div class='del'>-  scaled by 1000000:</div><div class='del'>-    * the parameters p and R</div><div class='del'>-    * the return result f(p)</div><div class='del'>-  The lookup table therefore actually tabulates the following function g(q):</div><div class='del'>-</div><div class='del'>-	g(q)  =  1000000 * f(q/1000000)</div><div class='del'>-</div><div class='del'>-  Hence, when p &lt;= 1, q must be less than or equal to 1000000. To achieve finer</div><div class='del'>-  granularity for the practically more relevant case of small values of p (up to</div><div class='del'>-  5%), the second column is used; the first one ranges up to 100%.  This split</div><div class='del'>-  corresponds to the value of q = TFRC_CALC_X_SPLIT. At the same time this also</div><div class='del'>-  determines the smallest resolution possible with this lookup table:</div><div class='del'>-</div><div class='del'>-    TFRC_SMALLEST_P   =  TFRC_CALC_X_SPLIT / TFRC_CALC_X_ARRSIZE</div><div class='del'>-</div><div class='del'>-  The entire table is generated by:</div><div class='del'>-    for(i=0; i &lt; TFRC_CALC_X_ARRSIZE; i++) {</div><div class='del'>-	lookup[i][0]  =  g((i+1) * 1000000/TFRC_CALC_X_ARRSIZE);</div><div class='del'>-	lookup[i][1]  =  g((i+1) * TFRC_CALC_X_SPLIT/TFRC_CALC_X_ARRSIZE);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  With the given configuration, we have, with M = TFRC_CALC_X_ARRSIZE-1,</div><div class='del'>-    lookup[0][0]  =  g(1000000/(M+1))		= 1000000 * f(0.2%)</div><div class='del'>-    lookup[M][0]  =  g(1000000)			= 1000000 * f(100%)</div><div class='del'>-    lookup[0][1]  =  g(TFRC_SMALLEST_P)		= 1000000 * f(0.01%)</div><div class='del'>-    lookup[M][1]  =  g(TFRC_CALC_X_SPLIT)	= 1000000 * f(5%)</div><div class='del'>-</div><div class='del'>-  In summary, the two columns represent f(p) for the following ranges:</div><div class='del'>-    * The first column is for   0.002  &lt;= p &lt;= 1.0</div><div class='del'>-    * The second column is for  0.0001 &lt;= p &lt;= 0.05</div><div class='del'>-  Where the columns overlap, the second (finer-grained) is given preference,</div><div class='del'>-  i.e. the first column is used only for p &gt;= 0.05.</div><div class='del'>- */</div><div class='del'>-static const u32 tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE][2] = {</div><div class='del'>-	{     37172,   8172 },</div><div class='del'>-	{     53499,  11567 },</div><div class='del'>-	{     66664,  14180 },</div><div class='del'>-	{     78298,  16388 },</div><div class='del'>-	{     89021,  18339 },</div><div class='del'>-	{     99147,  20108 },</div><div class='del'>-	{    108858,  21738 },</div><div class='del'>-	{    118273,  23260 },</div><div class='del'>-	{    127474,  24693 },</div><div class='del'>-	{    136520,  26052 },</div><div class='del'>-	{    145456,  27348 },</div><div class='del'>-	{    154316,  28589 },</div><div class='del'>-	{    163130,  29783 },</div><div class='del'>-	{    171919,  30935 },</div><div class='del'>-	{    180704,  32049 },</div><div class='del'>-	{    189502,  33130 },</div><div class='del'>-	{    198328,  34180 },</div><div class='del'>-	{    207194,  35202 },</div><div class='del'>-	{    216114,  36198 },</div><div class='del'>-	{    225097,  37172 },</div><div class='del'>-	{    234153,  38123 },</div><div class='del'>-	{    243294,  39055 },</div><div class='del'>-	{    252527,  39968 },</div><div class='del'>-	{    261861,  40864 },</div><div class='del'>-	{    271305,  41743 },</div><div class='del'>-	{    280866,  42607 },</div><div class='del'>-	{    290553,  43457 },</div><div class='del'>-	{    300372,  44293 },</div><div class='del'>-	{    310333,  45117 },</div><div class='del'>-	{    320441,  45929 },</div><div class='del'>-	{    330705,  46729 },</div><div class='del'>-	{    341131,  47518 },</div><div class='del'>-	{    351728,  48297 },</div><div class='del'>-	{    362501,  49066 },</div><div class='del'>-	{    373460,  49826 },</div><div class='del'>-	{    384609,  50577 },</div><div class='del'>-	{    395958,  51320 },</div><div class='del'>-	{    407513,  52054 },</div><div class='del'>-	{    419281,  52780 },</div><div class='del'>-	{    431270,  53499 },</div><div class='del'>-	{    443487,  54211 },</div><div class='del'>-	{    455940,  54916 },</div><div class='del'>-	{    468635,  55614 },</div><div class='del'>-	{    481581,  56306 },</div><div class='del'>-	{    494785,  56991 },</div><div class='del'>-	{    508254,  57671 },</div><div class='del'>-	{    521996,  58345 },</div><div class='del'>-	{    536019,  59014 },</div><div class='del'>-	{    550331,  59677 },</div><div class='del'>-	{    564939,  60335 },</div><div class='del'>-	{    579851,  60988 },</div><div class='del'>-	{    595075,  61636 },</div><div class='del'>-	{    610619,  62279 },</div><div class='del'>-	{    626491,  62918 },</div><div class='del'>-	{    642700,  63553 },</div><div class='del'>-	{    659253,  64183 },</div><div class='del'>-	{    676158,  64809 },</div><div class='del'>-	{    693424,  65431 },</div><div class='del'>-	{    711060,  66050 },</div><div class='del'>-	{    729073,  66664 },</div><div class='del'>-	{    747472,  67275 },</div><div class='del'>-	{    766266,  67882 },</div><div class='del'>-	{    785464,  68486 },</div><div class='del'>-	{    805073,  69087 },</div><div class='del'>-	{    825103,  69684 },</div><div class='del'>-	{    845562,  70278 },</div><div class='del'>-	{    866460,  70868 },</div><div class='del'>-	{    887805,  71456 },</div><div class='del'>-	{    909606,  72041 },</div><div class='del'>-	{    931873,  72623 },</div><div class='del'>-	{    954614,  73202 },</div><div class='del'>-	{    977839,  73778 },</div><div class='del'>-	{   1001557,  74352 },</div><div class='del'>-	{   1025777,  74923 },</div><div class='del'>-	{   1050508,  75492 },</div><div class='del'>-	{   1075761,  76058 },</div><div class='del'>-	{   1101544,  76621 },</div><div class='del'>-	{   1127867,  77183 },</div><div class='del'>-	{   1154739,  77741 },</div><div class='del'>-	{   1182172,  78298 },</div><div class='del'>-	{   1210173,  78852 },</div><div class='del'>-	{   1238753,  79405 },</div><div class='del'>-	{   1267922,  79955 },</div><div class='del'>-	{   1297689,  80503 },</div><div class='del'>-	{   1328066,  81049 },</div><div class='del'>-	{   1359060,  81593 },</div><div class='del'>-	{   1390684,  82135 },</div><div class='del'>-	{   1422947,  82675 },</div><div class='del'>-	{   1455859,  83213 },</div><div class='del'>-	{   1489430,  83750 },</div><div class='del'>-	{   1523671,  84284 },</div><div class='del'>-	{   1558593,  84817 },</div><div class='del'>-	{   1594205,  85348 },</div><div class='del'>-	{   1630518,  85878 },</div><div class='del'>-	{   1667543,  86406 },</div><div class='del'>-	{   1705290,  86932 },</div><div class='del'>-	{   1743770,  87457 },</div><div class='del'>-	{   1782994,  87980 },</div><div class='del'>-	{   1822973,  88501 },</div><div class='del'>-	{   1863717,  89021 },</div><div class='del'>-	{   1905237,  89540 },</div><div class='del'>-	{   1947545,  90057 },</div><div class='del'>-	{   1990650,  90573 },</div><div class='del'>-	{   2034566,  91087 },</div><div class='del'>-	{   2079301,  91600 },</div><div class='del'>-	{   2124869,  92111 },</div><div class='del'>-	{   2171279,  92622 },</div><div class='del'>-	{   2218543,  93131 },</div><div class='del'>-	{   2266673,  93639 },</div><div class='del'>-	{   2315680,  94145 },</div><div class='del'>-	{   2365575,  94650 },</div><div class='del'>-	{   2416371,  95154 },</div><div class='del'>-	{   2468077,  95657 },</div><div class='del'>-	{   2520707,  96159 },</div><div class='del'>-	{   2574271,  96660 },</div><div class='del'>-	{   2628782,  97159 },</div><div class='del'>-	{   2684250,  97658 },</div><div class='del'>-	{   2740689,  98155 },</div><div class='del'>-	{   2798110,  98651 },</div><div class='del'>-	{   2856524,  99147 },</div><div class='del'>-	{   2915944,  99641 },</div><div class='del'>-	{   2976382, 100134 },</div><div class='del'>-	{   3037850, 100626 },</div><div class='del'>-	{   3100360, 101117 },</div><div class='del'>-	{   3163924, 101608 },</div><div class='del'>-	{   3228554, 102097 },</div><div class='del'>-	{   3294263, 102586 },</div><div class='del'>-	{   3361063, 103073 },</div><div class='del'>-	{   3428966, 103560 },</div><div class='del'>-	{   3497984, 104045 },</div><div class='del'>-	{   3568131, 104530 },</div><div class='del'>-	{   3639419, 105014 },</div><div class='del'>-	{   3711860, 105498 },</div><div class='del'>-	{   3785467, 105980 },</div><div class='del'>-	{   3860253, 106462 },</div><div class='del'>-	{   3936229, 106942 },</div><div class='del'>-	{   4013410, 107422 },</div><div class='del'>-	{   4091808, 107902 },</div><div class='del'>-	{   4171435, 108380 },</div><div class='del'>-	{   4252306, 108858 },</div><div class='del'>-	{   4334431, 109335 },</div><div class='del'>-	{   4417825, 109811 },</div><div class='del'>-	{   4502501, 110287 },</div><div class='del'>-	{   4588472, 110762 },</div><div class='del'>-	{   4675750, 111236 },</div><div class='del'>-	{   4764349, 111709 },</div><div class='del'>-	{   4854283, 112182 },</div><div class='del'>-	{   4945564, 112654 },</div><div class='del'>-	{   5038206, 113126 },</div><div class='del'>-	{   5132223, 113597 },</div><div class='del'>-	{   5227627, 114067 },</div><div class='del'>-	{   5324432, 114537 },</div><div class='del'>-	{   5422652, 115006 },</div><div class='del'>-	{   5522299, 115474 },</div><div class='del'>-	{   5623389, 115942 },</div><div class='del'>-	{   5725934, 116409 },</div><div class='del'>-	{   5829948, 116876 },</div><div class='del'>-	{   5935446, 117342 },</div><div class='del'>-	{   6042439, 117808 },</div><div class='del'>-	{   6150943, 118273 },</div><div class='del'>-	{   6260972, 118738 },</div><div class='del'>-	{   6372538, 119202 },</div><div class='del'>-	{   6485657, 119665 },</div><div class='del'>-	{   6600342, 120128 },</div><div class='del'>-	{   6716607, 120591 },</div><div class='del'>-	{   6834467, 121053 },</div><div class='del'>-	{   6953935, 121514 },</div><div class='del'>-	{   7075025, 121976 },</div><div class='del'>-	{   7197752, 122436 },</div><div class='del'>-	{   7322131, 122896 },</div><div class='del'>-	{   7448175, 123356 },</div><div class='del'>-	{   7575898, 123815 },</div><div class='del'>-	{   7705316, 124274 },</div><div class='del'>-	{   7836442, 124733 },</div><div class='del'>-	{   7969291, 125191 },</div><div class='del'>-	{   8103877, 125648 },</div><div class='del'>-	{   8240216, 126105 },</div><div class='del'>-	{   8378321, 126562 },</div><div class='del'>-	{   8518208, 127018 },</div><div class='del'>-	{   8659890, 127474 },</div><div class='del'>-	{   8803384, 127930 },</div><div class='del'>-	{   8948702, 128385 },</div><div class='del'>-	{   9095861, 128840 },</div><div class='del'>-	{   9244875, 129294 },</div><div class='del'>-	{   9395760, 129748 },</div><div class='del'>-	{   9548529, 130202 },</div><div class='del'>-	{   9703198, 130655 },</div><div class='del'>-	{   9859782, 131108 },</div><div class='del'>-	{  10018296, 131561 },</div><div class='del'>-	{  10178755, 132014 },</div><div class='del'>-	{  10341174, 132466 },</div><div class='del'>-	{  10505569, 132917 },</div><div class='del'>-	{  10671954, 133369 },</div><div class='del'>-	{  10840345, 133820 },</div><div class='del'>-	{  11010757, 134271 },</div><div class='del'>-	{  11183206, 134721 },</div><div class='del'>-	{  11357706, 135171 },</div><div class='del'>-	{  11534274, 135621 },</div><div class='del'>-	{  11712924, 136071 },</div><div class='del'>-	{  11893673, 136520 },</div><div class='del'>-	{  12076536, 136969 },</div><div class='del'>-	{  12261527, 137418 },</div><div class='del'>-	{  12448664, 137867 },</div><div class='del'>-	{  12637961, 138315 },</div><div class='del'>-	{  12829435, 138763 },</div><div class='del'>-	{  13023101, 139211 },</div><div class='del'>-	{  13218974, 139658 },</div><div class='del'>-	{  13417071, 140106 },</div><div class='del'>-	{  13617407, 140553 },</div><div class='del'>-	{  13819999, 140999 },</div><div class='del'>-	{  14024862, 141446 },</div><div class='del'>-	{  14232012, 141892 },</div><div class='del'>-	{  14441465, 142339 },</div><div class='del'>-	{  14653238, 142785 },</div><div class='del'>-	{  14867346, 143230 },</div><div class='del'>-	{  15083805, 143676 },</div><div class='del'>-	{  15302632, 144121 },</div><div class='del'>-	{  15523842, 144566 },</div><div class='del'>-	{  15747453, 145011 },</div><div class='del'>-	{  15973479, 145456 },</div><div class='del'>-	{  16201939, 145900 },</div><div class='del'>-	{  16432847, 146345 },</div><div class='del'>-	{  16666221, 146789 },</div><div class='del'>-	{  16902076, 147233 },</div><div class='del'>-	{  17140429, 147677 },</div><div class='del'>-	{  17381297, 148121 },</div><div class='del'>-	{  17624696, 148564 },</div><div class='del'>-	{  17870643, 149007 },</div><div class='del'>-	{  18119154, 149451 },</div><div class='del'>-	{  18370247, 149894 },</div><div class='del'>-	{  18623936, 150336 },</div><div class='del'>-	{  18880241, 150779 },</div><div class='del'>-	{  19139176, 151222 },</div><div class='del'>-	{  19400759, 151664 },</div><div class='del'>-	{  19665007, 152107 },</div><div class='del'>-	{  19931936, 152549 },</div><div class='del'>-	{  20201564, 152991 },</div><div class='del'>-	{  20473907, 153433 },</div><div class='del'>-	{  20748982, 153875 },</div><div class='del'>-	{  21026807, 154316 },</div><div class='del'>-	{  21307399, 154758 },</div><div class='del'>-	{  21590773, 155199 },</div><div class='del'>-	{  21876949, 155641 },</div><div class='del'>-	{  22165941, 156082 },</div><div class='del'>-	{  22457769, 156523 },</div><div class='del'>-	{  22752449, 156964 },</div><div class='del'>-	{  23049999, 157405 },</div><div class='del'>-	{  23350435, 157846 },</div><div class='del'>-	{  23653774, 158287 },</div><div class='del'>-	{  23960036, 158727 },</div><div class='del'>-	{  24269236, 159168 },</div><div class='del'>-	{  24581392, 159608 },</div><div class='del'>-	{  24896521, 160049 },</div><div class='del'>-	{  25214642, 160489 },</div><div class='del'>-	{  25535772, 160929 },</div><div class='del'>-	{  25859927, 161370 },</div><div class='del'>-	{  26187127, 161810 },</div><div class='del'>-	{  26517388, 162250 },</div><div class='del'>-	{  26850728, 162690 },</div><div class='del'>-	{  27187165, 163130 },</div><div class='del'>-	{  27526716, 163569 },</div><div class='del'>-	{  27869400, 164009 },</div><div class='del'>-	{  28215234, 164449 },</div><div class='del'>-	{  28564236, 164889 },</div><div class='del'>-	{  28916423, 165328 },</div><div class='del'>-	{  29271815, 165768 },</div><div class='del'>-	{  29630428, 166208 },</div><div class='del'>-	{  29992281, 166647 },</div><div class='del'>-	{  30357392, 167087 },</div><div class='del'>-	{  30725779, 167526 },</div><div class='del'>-	{  31097459, 167965 },</div><div class='del'>-	{  31472452, 168405 },</div><div class='del'>-	{  31850774, 168844 },</div><div class='del'>-	{  32232445, 169283 },</div><div class='del'>-	{  32617482, 169723 },</div><div class='del'>-	{  33005904, 170162 },</div><div class='del'>-	{  33397730, 170601 },</div><div class='del'>-	{  33792976, 171041 },</div><div class='del'>-	{  34191663, 171480 },</div><div class='del'>-	{  34593807, 171919 },</div><div class='del'>-	{  34999428, 172358 },</div><div class='del'>-	{  35408544, 172797 },</div><div class='del'>-	{  35821174, 173237 },</div><div class='del'>-	{  36237335, 173676 },</div><div class='del'>-	{  36657047, 174115 },</div><div class='del'>-	{  37080329, 174554 },</div><div class='del'>-	{  37507197, 174993 },</div><div class='del'>-	{  37937673, 175433 },</div><div class='del'>-	{  38371773, 175872 },</div><div class='del'>-	{  38809517, 176311 },</div><div class='del'>-	{  39250924, 176750 },</div><div class='del'>-	{  39696012, 177190 },</div><div class='del'>-	{  40144800, 177629 },</div><div class='del'>-	{  40597308, 178068 },</div><div class='del'>-	{  41053553, 178507 },</div><div class='del'>-	{  41513554, 178947 },</div><div class='del'>-	{  41977332, 179386 },</div><div class='del'>-	{  42444904, 179825 },</div><div class='del'>-	{  42916290, 180265 },</div><div class='del'>-	{  43391509, 180704 },</div><div class='del'>-	{  43870579, 181144 },</div><div class='del'>-	{  44353520, 181583 },</div><div class='del'>-	{  44840352, 182023 },</div><div class='del'>-	{  45331092, 182462 },</div><div class='del'>-	{  45825761, 182902 },</div><div class='del'>-	{  46324378, 183342 },</div><div class='del'>-	{  46826961, 183781 },</div><div class='del'>-	{  47333531, 184221 },</div><div class='del'>-	{  47844106, 184661 },</div><div class='del'>-	{  48358706, 185101 },</div><div class='del'>-	{  48877350, 185541 },</div><div class='del'>-	{  49400058, 185981 },</div><div class='del'>-	{  49926849, 186421 },</div><div class='del'>-	{  50457743, 186861 },</div><div class='del'>-	{  50992759, 187301 },</div><div class='del'>-	{  51531916, 187741 },</div><div class='del'>-	{  52075235, 188181 },</div><div class='del'>-	{  52622735, 188622 },</div><div class='del'>-	{  53174435, 189062 },</div><div class='del'>-	{  53730355, 189502 },</div><div class='del'>-	{  54290515, 189943 },</div><div class='del'>-	{  54854935, 190383 },</div><div class='del'>-	{  55423634, 190824 },</div><div class='del'>-	{  55996633, 191265 },</div><div class='del'>-	{  56573950, 191706 },</div><div class='del'>-	{  57155606, 192146 },</div><div class='del'>-	{  57741621, 192587 },</div><div class='del'>-	{  58332014, 193028 },</div><div class='del'>-	{  58926806, 193470 },</div><div class='del'>-	{  59526017, 193911 },</div><div class='del'>-	{  60129666, 194352 },</div><div class='del'>-	{  60737774, 194793 },</div><div class='del'>-	{  61350361, 195235 },</div><div class='del'>-	{  61967446, 195677 },</div><div class='del'>-	{  62589050, 196118 },</div><div class='del'>-	{  63215194, 196560 },</div><div class='del'>-	{  63845897, 197002 },</div><div class='del'>-	{  64481179, 197444 },</div><div class='del'>-	{  65121061, 197886 },</div><div class='del'>-	{  65765563, 198328 },</div><div class='del'>-	{  66414705, 198770 },</div><div class='del'>-	{  67068508, 199213 },</div><div class='del'>-	{  67726992, 199655 },</div><div class='del'>-	{  68390177, 200098 },</div><div class='del'>-	{  69058085, 200540 },</div><div class='del'>-	{  69730735, 200983 },</div><div class='del'>-	{  70408147, 201426 },</div><div class='del'>-	{  71090343, 201869 },</div><div class='del'>-	{  71777343, 202312 },</div><div class='del'>-	{  72469168, 202755 },</div><div class='del'>-	{  73165837, 203199 },</div><div class='del'>-	{  73867373, 203642 },</div><div class='del'>-	{  74573795, 204086 },</div><div class='del'>-	{  75285124, 204529 },</div><div class='del'>-	{  76001380, 204973 },</div><div class='del'>-	{  76722586, 205417 },</div><div class='del'>-	{  77448761, 205861 },</div><div class='del'>-	{  78179926, 206306 },</div><div class='del'>-	{  78916102, 206750 },</div><div class='del'>-	{  79657310, 207194 },</div><div class='del'>-	{  80403571, 207639 },</div><div class='del'>-	{  81154906, 208084 },</div><div class='del'>-	{  81911335, 208529 },</div><div class='del'>-	{  82672880, 208974 },</div><div class='del'>-	{  83439562, 209419 },</div><div class='del'>-	{  84211402, 209864 },</div><div class='del'>-	{  84988421, 210309 },</div><div class='del'>-	{  85770640, 210755 },</div><div class='del'>-	{  86558080, 211201 },</div><div class='del'>-	{  87350762, 211647 },</div><div class='del'>-	{  88148708, 212093 },</div><div class='del'>-	{  88951938, 212539 },</div><div class='del'>-	{  89760475, 212985 },</div><div class='del'>-	{  90574339, 213432 },</div><div class='del'>-	{  91393551, 213878 },</div><div class='del'>-	{  92218133, 214325 },</div><div class='del'>-	{  93048107, 214772 },</div><div class='del'>-	{  93883493, 215219 },</div><div class='del'>-	{  94724314, 215666 },</div><div class='del'>-	{  95570590, 216114 },</div><div class='del'>-	{  96422343, 216561 },</div><div class='del'>-	{  97279594, 217009 },</div><div class='del'>-	{  98142366, 217457 },</div><div class='del'>-	{  99010679, 217905 },</div><div class='del'>-	{  99884556, 218353 },</div><div class='del'>-	{ 100764018, 218801 },</div><div class='del'>-	{ 101649086, 219250 },</div><div class='del'>-	{ 102539782, 219698 },</div><div class='del'>-	{ 103436128, 220147 },</div><div class='del'>-	{ 104338146, 220596 },</div><div class='del'>-	{ 105245857, 221046 },</div><div class='del'>-	{ 106159284, 221495 },</div><div class='del'>-	{ 107078448, 221945 },</div><div class='del'>-	{ 108003370, 222394 },</div><div class='del'>-	{ 108934074, 222844 },</div><div class='del'>-	{ 109870580, 223294 },</div><div class='del'>-	{ 110812910, 223745 },</div><div class='del'>-	{ 111761087, 224195 },</div><div class='del'>-	{ 112715133, 224646 },</div><div class='del'>-	{ 113675069, 225097 },</div><div class='del'>-	{ 114640918, 225548 },</div><div class='del'>-	{ 115612702, 225999 },</div><div class='del'>-	{ 116590442, 226450 },</div><div class='del'>-	{ 117574162, 226902 },</div><div class='del'>-	{ 118563882, 227353 },</div><div class='del'>-	{ 119559626, 227805 },</div><div class='del'>-	{ 120561415, 228258 },</div><div class='del'>-	{ 121569272, 228710 },</div><div class='del'>-	{ 122583219, 229162 },</div><div class='del'>-	{ 123603278, 229615 },</div><div class='del'>-	{ 124629471, 230068 },</div><div class='del'>-	{ 125661822, 230521 },</div><div class='del'>-	{ 126700352, 230974 },</div><div class='del'>-	{ 127745083, 231428 },</div><div class='del'>-	{ 128796039, 231882 },</div><div class='del'>-	{ 129853241, 232336 },</div><div class='del'>-	{ 130916713, 232790 },</div><div class='del'>-	{ 131986475, 233244 },</div><div class='del'>-	{ 133062553, 233699 },</div><div class='del'>-	{ 134144966, 234153 },</div><div class='del'>-	{ 135233739, 234608 },</div><div class='del'>-	{ 136328894, 235064 },</div><div class='del'>-	{ 137430453, 235519 },</div><div class='del'>-	{ 138538440, 235975 },</div><div class='del'>-	{ 139652876, 236430 },</div><div class='del'>-	{ 140773786, 236886 },</div><div class='del'>-	{ 141901190, 237343 },</div><div class='del'>-	{ 143035113, 237799 },</div><div class='del'>-	{ 144175576, 238256 },</div><div class='del'>-	{ 145322604, 238713 },</div><div class='del'>-	{ 146476218, 239170 },</div><div class='del'>-	{ 147636442, 239627 },</div><div class='del'>-	{ 148803298, 240085 },</div><div class='del'>-	{ 149976809, 240542 },</div><div class='del'>-	{ 151156999, 241000 },</div><div class='del'>-	{ 152343890, 241459 },</div><div class='del'>-	{ 153537506, 241917 },</div><div class='del'>-	{ 154737869, 242376 },</div><div class='del'>-	{ 155945002, 242835 },</div><div class='del'>-	{ 157158929, 243294 },</div><div class='del'>-	{ 158379673, 243753 },</div><div class='del'>-	{ 159607257, 244213 },</div><div class='del'>-	{ 160841704, 244673 },</div><div class='del'>-	{ 162083037, 245133 },</div><div class='del'>-	{ 163331279, 245593 },</div><div class='del'>-	{ 164586455, 246054 },</div><div class='del'>-	{ 165848586, 246514 },</div><div class='del'>-	{ 167117696, 246975 },</div><div class='del'>-	{ 168393810, 247437 },</div><div class='del'>-	{ 169676949, 247898 },</div><div class='del'>-	{ 170967138, 248360 },</div><div class='del'>-	{ 172264399, 248822 },</div><div class='del'>-	{ 173568757, 249284 },</div><div class='del'>-	{ 174880235, 249747 },</div><div class='del'>-	{ 176198856, 250209 },</div><div class='del'>-	{ 177524643, 250672 },</div><div class='del'>-	{ 178857621, 251136 },</div><div class='del'>-	{ 180197813, 251599 },</div><div class='del'>-	{ 181545242, 252063 },</div><div class='del'>-	{ 182899933, 252527 },</div><div class='del'>-	{ 184261908, 252991 },</div><div class='del'>-	{ 185631191, 253456 },</div><div class='del'>-	{ 187007807, 253920 },</div><div class='del'>-	{ 188391778, 254385 },</div><div class='del'>-	{ 189783129, 254851 },</div><div class='del'>-	{ 191181884, 255316 },</div><div class='del'>-	{ 192588065, 255782 },</div><div class='del'>-	{ 194001698, 256248 },</div><div class='del'>-	{ 195422805, 256714 },</div><div class='del'>-	{ 196851411, 257181 },</div><div class='del'>-	{ 198287540, 257648 },</div><div class='del'>-	{ 199731215, 258115 },</div><div class='del'>-	{ 201182461, 258582 },</div><div class='del'>-	{ 202641302, 259050 },</div><div class='del'>-	{ 204107760, 259518 },</div><div class='del'>-	{ 205581862, 259986 },</div><div class='del'>-	{ 207063630, 260454 },</div><div class='del'>-	{ 208553088, 260923 },</div><div class='del'>-	{ 210050262, 261392 },</div><div class='del'>-	{ 211555174, 261861 },</div><div class='del'>-	{ 213067849, 262331 },</div><div class='del'>-	{ 214588312, 262800 },</div><div class='del'>-	{ 216116586, 263270 },</div><div class='del'>-	{ 217652696, 263741 },</div><div class='del'>-	{ 219196666, 264211 },</div><div class='del'>-	{ 220748520, 264682 },</div><div class='del'>-	{ 222308282, 265153 },</div><div class='del'>-	{ 223875978, 265625 },</div><div class='del'>-	{ 225451630, 266097 },</div><div class='del'>-	{ 227035265, 266569 },</div><div class='del'>-	{ 228626905, 267041 },</div><div class='del'>-	{ 230226576, 267514 },</div><div class='del'>-	{ 231834302, 267986 },</div><div class='del'>-	{ 233450107, 268460 },</div><div class='del'>-	{ 235074016, 268933 },</div><div class='del'>-	{ 236706054, 269407 },</div><div class='del'>-	{ 238346244, 269881 },</div><div class='del'>-	{ 239994613, 270355 },</div><div class='del'>-	{ 241651183, 270830 },</div><div class='del'>-	{ 243315981, 271305 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* return largest index i such that fval &lt;= lookup[i][small] */</div><div class='del'>-static inline u32 tfrc_binsearch(u32 fval, u8 small)</div><div class='del'>-{</div><div class='del'>-	u32 try, low = 0, high = TFRC_CALC_X_ARRSIZE - 1;</div><div class='del'>-</div><div class='del'>-	while (low &lt; high) {</div><div class='del'>-		try = (low + high) / 2;</div><div class='del'>-		if (fval &lt;= tfrc_calc_x_lookup[try][small])</div><div class='del'>-			high = try;</div><div class='del'>-		else</div><div class='del'>-			low  = try + 1;</div><div class='del'>-	}</div><div class='del'>-	return high;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_calc_x - Calculate the send rate as per section 3.1 of RFC3448</div><div class='del'>- * @s: packet size          in bytes</div><div class='del'>- * @R: RTT                  scaled by 1000000   (i.e., microseconds)</div><div class='del'>- * @p: loss ratio estimate  scaled by 1000000</div><div class='del'>- *</div><div class='del'>- * Returns X_calc           in bytes per second (not scaled).</div><div class='del'>- */</div><div class='del'>-u32 tfrc_calc_x(u16 s, u32 R, u32 p)</div><div class='del'>-{</div><div class='del'>-	u16 index;</div><div class='del'>-	u32 f;</div><div class='del'>-	u64 result;</div><div class='del'>-</div><div class='del'>-	/* check against invalid parameters and divide-by-zero   */</div><div class='del'>-	BUG_ON(p &gt;  1000000);		/* p must not exceed 100%   */</div><div class='del'>-	BUG_ON(p == 0);			/* f(0) = 0, divide by zero */</div><div class='del'>-	if (R == 0) {			/* possible  divide by zero */</div><div class='del'>-		DCCP_CRIT("WARNING: RTT is 0, returning maximum X_calc.");</div><div class='del'>-		return ~0U;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p &lt;= TFRC_CALC_X_SPLIT)		{     /* 0.0000 &lt; p &lt;= 0.05   */</div><div class='del'>-		if (p &lt; TFRC_SMALLEST_P) {	      /* 0.0000 &lt; p &lt;  0.0001 */</div><div class='del'>-			DCCP_WARN("Value of p (%d) below resolution. "</div><div class='del'>-				  "Substituting %d\n", p, TFRC_SMALLEST_P);</div><div class='del'>-			index = 0;</div><div class='del'>-		} else				      /* 0.0001 &lt;= p &lt;= 0.05  */</div><div class='del'>-			index =  p/TFRC_SMALLEST_P - 1;</div><div class='del'>-</div><div class='del'>-		f = tfrc_calc_x_lookup[index][1];</div><div class='del'>-</div><div class='del'>-	} else {				      /* 0.05   &lt;  p &lt;= 1.00  */</div><div class='del'>-		index = p/(1000000/TFRC_CALC_X_ARRSIZE) - 1;</div><div class='del'>-</div><div class='del'>-		f = tfrc_calc_x_lookup[index][0];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Compute X = s/(R*f(p)) in bytes per second.</div><div class='del'>-	 * Since f(p) and R are both scaled by 1000000, we need to multiply by</div><div class='del'>-	 * 1000000^2. To avoid overflow, the result is computed in two stages.</div><div class='del'>-	 * This works under almost all reasonable operational conditions, for a</div><div class='del'>-	 * wide range of parameters. Yet, should some strange combination of</div><div class='del'>-	 * parameters result in overflow, the use of scaled_div32 will catch</div><div class='del'>-	 * this and return UINT_MAX - which is a logically adequate consequence.</div><div class='del'>-	 */</div><div class='del'>-	result = scaled_div(s, R);</div><div class='del'>-	return scaled_div32(result, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  tfrc_calc_x_reverse_lookup  -  try to find p given f(p)</div><div class='del'>- *  @fvalue: function value to match, scaled by 1000000</div><div class='del'>- *</div><div class='del'>- *  Returns closest match for p, also scaled by 1000000</div><div class='del'>- */</div><div class='del'>-u32 tfrc_calc_x_reverse_lookup(u32 fvalue)</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	if (fvalue == 0)	/* f(p) = 0  whenever  p = 0 */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Error cases. */</div><div class='del'>-	if (fvalue &lt; tfrc_calc_x_lookup[0][1]) {</div><div class='del'>-		DCCP_WARN("fvalue %u smaller than resolution\n", fvalue);</div><div class='del'>-		return TFRC_SMALLEST_P;</div><div class='del'>-	}</div><div class='del'>-	if (fvalue &gt; tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) {</div><div class='del'>-		DCCP_WARN("fvalue %u exceeds bounds!\n", fvalue);</div><div class='del'>-		return 1000000;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fvalue &lt;= tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][1]) {</div><div class='del'>-		index = tfrc_binsearch(fvalue, 1);</div><div class='del'>-		return (index + 1) * TFRC_CALC_X_SPLIT / TFRC_CALC_X_ARRSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* else ... it must be in the coarse-grained column */</div><div class='del'>-	index = tfrc_binsearch(fvalue, 0);</div><div class='del'>-	return (index + 1) * 1000000 / TFRC_CALC_X_ARRSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tfrc_invert_loss_event_rate  -  Compute p so that 10^6 corresponds to 100%</div><div class='del'>- * When @loss_event_rate is large, there is a chance that p is truncated to 0.</div><div class='del'>- * To avoid re-entering slow-start in that case, we set p = TFRC_SMALLEST_P &gt; 0.</div><div class='del'>- */</div><div class='del'>-u32 tfrc_invert_loss_event_rate(u32 loss_event_rate)</div><div class='del'>-{</div><div class='del'>-	if (loss_event_rate == UINT_MAX)		/* see RFC 4342, 8.5 */</div><div class='del'>-		return 0;</div><div class='del'>-	if (unlikely(loss_event_rate == 0))		/* map 1/0 into 100% */</div><div class='del'>-		return 1000000;</div><div class='del'>-	return max_t(u32, scaled_div(1, loss_event_rate), TFRC_SMALLEST_P);</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h<br/>deleted file mode 100644<br/>index f91e3816806b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/dccp.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/dccp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,501 +0,0 @@</div><div class='del'>-#ifndef _DCCP_H</div><div class='del'>-#define _DCCP_H</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/dccp.h</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *  Copyright (c) 2005-6 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include &lt;net/snmp.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	DCCP - specific warning and debugging macros.</div><div class='del'>- */</div><div class='del'>-#define DCCP_WARN(fmt, ...)						\</div><div class='del'>-	net_warn_ratelimited("%s: " fmt, __func__, ##__VA_ARGS__)</div><div class='del'>-#define DCCP_CRIT(fmt, a...) printk(KERN_CRIT fmt " at %s:%d/%s()\n", ##a, \</div><div class='del'>-					 __FILE__, __LINE__, __func__)</div><div class='del'>-#define DCCP_BUG(a...)       do { DCCP_CRIT("BUG: " a); dump_stack(); } while(0)</div><div class='del'>-#define DCCP_BUG_ON(cond)    do { if (unlikely((cond) != 0))		   \</div><div class='del'>-				     DCCP_BUG("\"%s\" holds (exception!)", \</div><div class='del'>-					      __stringify(cond));          \</div><div class='del'>-			     } while (0)</div><div class='del'>-</div><div class='del'>-#define DCCP_PRINTK(enable, fmt, args...)	do { if (enable)	     \</div><div class='del'>-							printk(fmt, ##args); \</div><div class='del'>-						} while(0)</div><div class='del'>-#define DCCP_PR_DEBUG(enable, fmt, a...)	DCCP_PRINTK(enable, KERN_DEBUG \</div><div class='del'>-						  "%s: " fmt, __func__, ##a)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_DEBUG</div><div class='del'>-extern bool dccp_debug;</div><div class='del'>-#define dccp_pr_debug(format, a...)	  DCCP_PR_DEBUG(dccp_debug, format, ##a)</div><div class='del'>-#define dccp_pr_debug_cat(format, a...)   DCCP_PRINTK(dccp_debug, format, ##a)</div><div class='del'>-#define dccp_debug(fmt, a...)		  dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)</div><div class='del'>-#else</div><div class='del'>-#define dccp_pr_debug(format, a...)</div><div class='del'>-#define dccp_pr_debug_cat(format, a...)</div><div class='del'>-#define dccp_debug(format, a...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern struct inet_hashinfo dccp_hashinfo;</div><div class='del'>-</div><div class='del'>-extern struct percpu_counter dccp_orphan_count;</div><div class='del'>-</div><div class='del'>-void dccp_time_wait(struct sock *sk, int state, int timeo);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Set safe upper bounds for header and option length. Since Data Offset is 8</div><div class='del'>- *  bits (RFC 4340, sec. 5.1), the total header length can never be more than</div><div class='del'>- *  4 * 255 = 1020 bytes. The largest possible header length is 28 bytes (X=1):</div><div class='del'>- *    - DCCP-Response with ACK Subheader and 4 bytes of Service code      OR</div><div class='del'>- *    - DCCP-Reset    with ACK Subheader and 4 bytes of Reset Code fields</div><div class='del'>- *  Hence a safe upper bound for the maximum option length is 1020-28 = 992</div><div class='del'>- */</div><div class='del'>-#define MAX_DCCP_SPECIFIC_HEADER (255 * sizeof(uint32_t))</div><div class='del'>-#define DCCP_MAX_PACKET_HDR 28</div><div class='del'>-#define DCCP_MAX_OPT_LEN (MAX_DCCP_SPECIFIC_HEADER - DCCP_MAX_PACKET_HDR)</div><div class='del'>-#define MAX_DCCP_HEADER (MAX_DCCP_SPECIFIC_HEADER + MAX_HEADER)</div><div class='del'>-</div><div class='del'>-/* Upper bound for initial feature-negotiation overhead (padded to 32 bits) */</div><div class='del'>-#define DCCP_FEATNEG_OVERHEAD	 (32 * sizeof(uint32_t))</div><div class='del'>-</div><div class='del'>-#define DCCP_TIMEWAIT_LEN (60 * HZ) /* how long to wait to destroy TIME-WAIT</div><div class='del'>-				     * state, about 60 seconds */</div><div class='del'>-</div><div class='del'>-/* RFC 1122, 4.2.3.1 initial RTO value */</div><div class='del'>-#define DCCP_TIMEOUT_INIT ((unsigned int)(3 * HZ))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The maximum back-off value for retransmissions. This is needed for</div><div class='del'>- *  - retransmitting client-Requests (sec. 8.1.1),</div><div class='del'>- *  - retransmitting Close/CloseReq when closing (sec. 8.3),</div><div class='del'>- *  - feature-negotiation retransmission (sec. 6.6.3),</div><div class='del'>- *  - Acks in client-PARTOPEN state (sec. 8.1.5).</div><div class='del'>- */</div><div class='del'>-#define DCCP_RTO_MAX ((unsigned int)(64 * HZ))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RTT sampling: sanity bounds and fallback RTT value from RFC 4340, section 3.4</div><div class='del'>- */</div><div class='del'>-#define DCCP_SANE_RTT_MIN	100</div><div class='del'>-#define DCCP_FALLBACK_RTT	(USEC_PER_SEC / 5)</div><div class='del'>-#define DCCP_SANE_RTT_MAX	(3 * USEC_PER_SEC)</div><div class='del'>-</div><div class='del'>-/* sysctl variables for DCCP */</div><div class='del'>-extern int  sysctl_dccp_request_retries;</div><div class='del'>-extern int  sysctl_dccp_retries1;</div><div class='del'>-extern int  sysctl_dccp_retries2;</div><div class='del'>-extern int  sysctl_dccp_tx_qlen;</div><div class='del'>-extern int  sysctl_dccp_sync_ratelimit;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	48-bit sequence number arithmetic (signed and unsigned)</div><div class='del'>- */</div><div class='del'>-#define INT48_MIN	  0x800000000000LL		/* 2^47	    */</div><div class='del'>-#define UINT48_MAX	  0xFFFFFFFFFFFFLL		/* 2^48 - 1 */</div><div class='del'>-#define COMPLEMENT48(x)	 (0x1000000000000LL - (x))	/* 2^48 - x */</div><div class='del'>-#define TO_SIGNED48(x)	 (((x) &lt; INT48_MIN)? (x) : -COMPLEMENT48( (x)))</div><div class='del'>-#define TO_UNSIGNED48(x) (((x) &gt;= 0)?	     (x) :  COMPLEMENT48(-(x)))</div><div class='del'>-#define ADD48(a, b)	 (((a) + (b)) &amp; UINT48_MAX)</div><div class='del'>-#define SUB48(a, b)	 ADD48((a), COMPLEMENT48(b))</div><div class='del'>-</div><div class='del'>-static inline void dccp_set_seqno(u64 *seqno, u64 value)</div><div class='del'>-{</div><div class='del'>-	*seqno = value &amp; UINT48_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_inc_seqno(u64 *seqno)</div><div class='del'>-{</div><div class='del'>-	*seqno = ADD48(*seqno, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* signed mod-2^48 distance: pos. if seqno1 &lt; seqno2, neg. if seqno1 &gt; seqno2 */</div><div class='del'>-static inline s64 dccp_delta_seqno(const u64 seqno1, const u64 seqno2)</div><div class='del'>-{</div><div class='del'>-	u64 delta = SUB48(seqno2, seqno1);</div><div class='del'>-</div><div class='del'>-	return TO_SIGNED48(delta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is seq1 &lt; seq2 ? */</div><div class='del'>-static inline int before48(const u64 seq1, const u64 seq2)</div><div class='del'>-{</div><div class='del'>-	return (s64)((seq2 &lt;&lt; 16) - (seq1 &lt;&lt; 16)) &gt; 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is seq1 &gt; seq2 ? */</div><div class='del'>-#define after48(seq1, seq2)	before48(seq2, seq1)</div><div class='del'>-</div><div class='del'>-/* is seq2 &lt;= seq1 &lt;= seq3 ? */</div><div class='del'>-static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3)</div><div class='del'>-{</div><div class='del'>-	return (seq3 &lt;&lt; 16) - (seq2 &lt;&lt; 16) &gt;= (seq1 &lt;&lt; 16) - (seq2 &lt;&lt; 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 max48(const u64 seq1, const u64 seq2)</div><div class='del'>-{</div><div class='del'>-	return after48(seq1, seq2) ? seq1 : seq2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_loss_count - Approximate the number of lost data packets in a burst loss</div><div class='del'>- * @s1:  last known sequence number before the loss ('hole')</div><div class='del'>- * @s2:  first sequence number seen after the 'hole'</div><div class='del'>- * @ndp: NDP count on packet with sequence number @s2</div><div class='del'>- */</div><div class='del'>-static inline u64 dccp_loss_count(const u64 s1, const u64 s2, const u64 ndp)</div><div class='del'>-{</div><div class='del'>-	s64 delta = dccp_delta_seqno(s1, s2);</div><div class='del'>-</div><div class='del'>-	WARN_ON(delta &lt; 0);</div><div class='del'>-	delta -= ndp + 1;</div><div class='del'>-</div><div class='del'>-	return delta &gt; 0 ? delta : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_loss_free - Evaluate condition for data loss from RFC 4340, 7.7.1</div><div class='del'>- */</div><div class='del'>-static inline bool dccp_loss_free(const u64 s1, const u64 s2, const u64 ndp)</div><div class='del'>-{</div><div class='del'>-	return dccp_loss_count(s1, s2, ndp) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DCCP_MIB_NUM = 0,</div><div class='del'>-	DCCP_MIB_ACTIVEOPENS,			/* ActiveOpens */</div><div class='del'>-	DCCP_MIB_ESTABRESETS,			/* EstabResets */</div><div class='del'>-	DCCP_MIB_CURRESTAB,			/* CurrEstab */</div><div class='del'>-	DCCP_MIB_OUTSEGS,			/* OutSegs */</div><div class='del'>-	DCCP_MIB_OUTRSTS,</div><div class='del'>-	DCCP_MIB_ABORTONTIMEOUT,</div><div class='del'>-	DCCP_MIB_TIMEOUTS,</div><div class='del'>-	DCCP_MIB_ABORTFAILED,</div><div class='del'>-	DCCP_MIB_PASSIVEOPENS,</div><div class='del'>-	DCCP_MIB_ATTEMPTFAILS,</div><div class='del'>-	DCCP_MIB_OUTDATAGRAMS,</div><div class='del'>-	DCCP_MIB_INERRS,</div><div class='del'>-	DCCP_MIB_OPTMANDATORYERROR,</div><div class='del'>-	DCCP_MIB_INVALIDOPT,</div><div class='del'>-	__DCCP_MIB_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DCCP_MIB_MAX	__DCCP_MIB_MAX</div><div class='del'>-struct dccp_mib {</div><div class='del'>-	unsigned long	mibs[DCCP_MIB_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics);</div><div class='del'>-#define DCCP_INC_STATS(field)	SNMP_INC_STATS(dccp_statistics, field)</div><div class='del'>-#define __DCCP_INC_STATS(field)	__SNMP_INC_STATS(dccp_statistics, field)</div><div class='del'>-#define DCCP_DEC_STATS(field)	SNMP_DEC_STATS(dccp_statistics, field)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	Checksumming routines</div><div class='del'>- */</div><div class='del'>-static inline unsigned int dccp_csum_coverage(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr* dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (dh-&gt;dccph_cscov == 0)</div><div class='del'>-		return skb-&gt;len;</div><div class='del'>-	return (dh-&gt;dccph_doff + dh-&gt;dccph_cscov - 1) * sizeof(u32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_csum_outgoing(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	unsigned int cov = dccp_csum_coverage(skb);</div><div class='del'>-</div><div class='del'>-	if (cov &gt;= skb-&gt;len)</div><div class='del'>-		dccp_hdr(skb)-&gt;dccph_cscov = 0;</div><div class='del'>-</div><div class='del'>-	skb-&gt;csum = skb_checksum(skb, 0, (cov &gt; skb-&gt;len)? skb-&gt;len : cov, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_v4_send_check(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-int dccp_retransmit_skb(struct sock *sk);</div><div class='del'>-</div><div class='del'>-void dccp_send_ack(struct sock *sk);</div><div class='del'>-void dccp_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			 struct request_sock *rsk);</div><div class='del'>-</div><div class='del'>-void dccp_send_sync(struct sock *sk, const u64 seq,</div><div class='del'>-		    const enum dccp_pkt_type pkt_type);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TX Packet Dequeueing Interface</div><div class='del'>- */</div><div class='del'>-void dccp_qpolicy_push(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-bool dccp_qpolicy_full(struct sock *sk);</div><div class='del'>-void dccp_qpolicy_drop(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-struct sk_buff *dccp_qpolicy_top(struct sock *sk);</div><div class='del'>-struct sk_buff *dccp_qpolicy_pop(struct sock *sk);</div><div class='del'>-bool dccp_qpolicy_param_ok(struct sock *sk, __be32 param);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TX Packet Output and TX Timers</div><div class='del'>- */</div><div class='del'>-void dccp_write_xmit(struct sock *sk);</div><div class='del'>-void dccp_write_space(struct sock *sk);</div><div class='del'>-void dccp_flush_write_queue(struct sock *sk, long *time_budget);</div><div class='del'>-</div><div class='del'>-void dccp_init_xmit_timers(struct sock *sk);</div><div class='del'>-static inline void dccp_clear_xmit_timers(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	inet_csk_clear_xmit_timers(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu);</div><div class='del'>-</div><div class='del'>-const char *dccp_packet_name(const int type);</div><div class='del'>-</div><div class='del'>-void dccp_set_state(struct sock *sk, const int state);</div><div class='del'>-void dccp_done(struct sock *sk);</div><div class='del'>-</div><div class='del'>-int dccp_reqsk_init(struct request_sock *rq, struct dccp_sock const *dp,</div><div class='del'>-		    struct sk_buff const *skb);</div><div class='del'>-</div><div class='del'>-int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-struct sock *dccp_create_openreq_child(const struct sock *sk,</div><div class='del'>-				       const struct request_sock *req,</div><div class='del'>-				       const struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-struct sock *dccp_v4_request_recv_sock(const struct sock *sk, struct sk_buff *skb,</div><div class='del'>-				       struct request_sock *req,</div><div class='del'>-				       struct dst_entry *dst,</div><div class='del'>-				       struct request_sock *req_unhash,</div><div class='del'>-				       bool *own_req);</div><div class='del'>-struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			    struct request_sock *req);</div><div class='del'>-</div><div class='del'>-int dccp_child_process(struct sock *parent, struct sock *child,</div><div class='del'>-		       struct sk_buff *skb);</div><div class='del'>-int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			   struct dccp_hdr *dh, unsigned int len);</div><div class='del'>-int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			 const struct dccp_hdr *dh, const unsigned int len);</div><div class='del'>-</div><div class='del'>-int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);</div><div class='del'>-void dccp_destroy_sock(struct sock *sk);</div><div class='del'>-</div><div class='del'>-void dccp_close(struct sock *sk, long timeout);</div><div class='del'>-struct sk_buff *dccp_make_response(const struct sock *sk, struct dst_entry *dst,</div><div class='del'>-				   struct request_sock *req);</div><div class='del'>-</div><div class='del'>-int dccp_connect(struct sock *sk);</div><div class='del'>-int dccp_disconnect(struct sock *sk, int flags);</div><div class='del'>-int dccp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen);</div><div class='del'>-int dccp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_dccp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, int __user *optlen);</div><div class='del'>-int compat_dccp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, unsigned int optlen);</div><div class='del'>-#endif</div><div class='del'>-int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg);</div><div class='del'>-int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);</div><div class='del'>-int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='del'>-		 int flags, int *addr_len);</div><div class='del'>-void dccp_shutdown(struct sock *sk, int how);</div><div class='del'>-int inet_dccp_listen(struct socket *sock, int backlog);</div><div class='del'>-__poll_t dccp_poll(struct file *file, struct socket *sock,</div><div class='del'>-		       poll_table *wait);</div><div class='del'>-int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);</div><div class='del'>-void dccp_req_err(struct sock *sk, u64 seq);</div><div class='del'>-</div><div class='del'>-struct sk_buff *dccp_ctl_make_reset(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code);</div><div class='del'>-void dccp_send_close(struct sock *sk, const int active);</div><div class='del'>-int dccp_invalid_packet(struct sk_buff *skb);</div><div class='del'>-u32 dccp_sample_rtt(struct sock *sk, long delta);</div><div class='del'>-</div><div class='del'>-static inline bool dccp_bad_service_code(const struct sock *sk,</div><div class='del'>-					const __be32 service)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_service == service)</div><div class='del'>-		return false;</div><div class='del'>-	return !dccp_list_has_service(dp-&gt;dccps_service_list, service);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_skb_cb  -  DCCP per-packet control information</div><div class='del'>- * @dccpd_type: one of %dccp_pkt_type (or unknown)</div><div class='del'>- * @dccpd_ccval: CCVal field (5.1), see e.g. RFC 4342, 8.1</div><div class='del'>- * @dccpd_reset_code: one of %dccp_reset_codes</div><div class='del'>- * @dccpd_reset_data: Data1..3 fields (depend on @dccpd_reset_code)</div><div class='del'>- * @dccpd_opt_len: total length of all options (5.8) in the packet</div><div class='del'>- * @dccpd_seq: sequence number</div><div class='del'>- * @dccpd_ack_seq: acknowledgment number subheader field value</div><div class='del'>- *</div><div class='del'>- * This is used for transmission as well as for reception.</div><div class='del'>- */</div><div class='del'>-struct dccp_skb_cb {</div><div class='del'>-	union {</div><div class='del'>-		struct inet_skb_parm	h4;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		struct inet6_skb_parm	h6;</div><div class='del'>-#endif</div><div class='del'>-	} header;</div><div class='del'>-	__u8  dccpd_type:4;</div><div class='del'>-	__u8  dccpd_ccval:4;</div><div class='del'>-	__u8  dccpd_reset_code,</div><div class='del'>-	      dccpd_reset_data[3];</div><div class='del'>-	__u16 dccpd_opt_len;</div><div class='del'>-	__u64 dccpd_seq;</div><div class='del'>-	__u64 dccpd_ack_seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DCCP_SKB_CB(__skb) ((struct dccp_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='del'>-</div><div class='del'>-/* RFC 4340, sec. 7.7 */</div><div class='del'>-static inline int dccp_non_data_packet(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const __u8 type = DCCP_SKB_CB(skb)-&gt;dccpd_type;</div><div class='del'>-</div><div class='del'>-	return type == DCCP_PKT_ACK	 ||</div><div class='del'>-	       type == DCCP_PKT_CLOSE	 ||</div><div class='del'>-	       type == DCCP_PKT_CLOSEREQ ||</div><div class='del'>-	       type == DCCP_PKT_RESET	 ||</div><div class='del'>-	       type == DCCP_PKT_SYNC	 ||</div><div class='del'>-	       type == DCCP_PKT_SYNCACK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* RFC 4340, sec. 7.7 */</div><div class='del'>-static inline int dccp_data_packet(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const __u8 type = DCCP_SKB_CB(skb)-&gt;dccpd_type;</div><div class='del'>-</div><div class='del'>-	return type == DCCP_PKT_DATA	 ||</div><div class='del'>-	       type == DCCP_PKT_DATAACK  ||</div><div class='del'>-	       type == DCCP_PKT_REQUEST  ||</div><div class='del'>-	       type == DCCP_PKT_RESPONSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dccp_packet_without_ack(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const __u8 type = DCCP_SKB_CB(skb)-&gt;dccpd_type;</div><div class='del'>-</div><div class='del'>-	return type == DCCP_PKT_DATA || type == DCCP_PKT_REQUEST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DCCP_PKT_WITHOUT_ACK_SEQ (UINT48_MAX &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-static inline void dccp_hdr_set_seq(struct dccp_hdr *dh, const u64 gss)</div><div class='del'>-{</div><div class='del'>-	struct dccp_hdr_ext *dhx = (struct dccp_hdr_ext *)((void *)dh +</div><div class='del'>-							   sizeof(*dh));</div><div class='del'>-	dh-&gt;dccph_seq2 = 0;</div><div class='del'>-	dh-&gt;dccph_seq = htons((gss &gt;&gt; 32) &amp; 0xfffff);</div><div class='del'>-	dhx-&gt;dccph_seq_low = htonl(gss &amp; 0xffffffff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_hdr_set_ack(struct dccp_hdr_ack_bits *dhack,</div><div class='del'>-				    const u64 gsr)</div><div class='del'>-{</div><div class='del'>-	dhack-&gt;dccph_reserved1 = 0;</div><div class='del'>-	dhack-&gt;dccph_ack_nr_high = htons(gsr &gt;&gt; 32);</div><div class='del'>-	dhack-&gt;dccph_ack_nr_low  = htonl(gsr &amp; 0xffffffff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_update_gsr(struct sock *sk, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (after48(seq, dp-&gt;dccps_gsr))</div><div class='del'>-		dp-&gt;dccps_gsr = seq;</div><div class='del'>-	/* Sequence validity window depends on remote Sequence Window (7.5.1) */</div><div class='del'>-	dp-&gt;dccps_swl = SUB48(ADD48(dp-&gt;dccps_gsr, 1), dp-&gt;dccps_r_seq_win / 4);</div><div class='del'>-	/*</div><div class='del'>-	 * Adjust SWL so that it is not below ISR. In contrast to RFC 4340,</div><div class='del'>-	 * 7.5.1 we perform this check beyond the initial handshake: W/W' are</div><div class='del'>-	 * always &gt; 32, so for the first W/W' packets in the lifetime of a</div><div class='del'>-	 * connection we always have to adjust SWL.</div><div class='del'>-	 * A second reason why we are doing this is that the window depends on</div><div class='del'>-	 * the feature-remote value of Sequence Window: nothing stops the peer</div><div class='del'>-	 * from updating this value while we are busy adjusting SWL for the</div><div class='del'>-	 * first W packets (we would have to count from scratch again then).</div><div class='del'>-	 * Therefore it is safer to always make sure that the Sequence Window</div><div class='del'>-	 * is not artificially extended by a peer who grows SWL downwards by</div><div class='del'>-	 * continually updating the feature-remote Sequence-Window.</div><div class='del'>-	 * If sequence numbers wrap it is bad luck. But that will take a while</div><div class='del'>-	 * (48 bit), and this measure prevents Sequence-number attacks.</div><div class='del'>-	 */</div><div class='del'>-	if (before48(dp-&gt;dccps_swl, dp-&gt;dccps_isr))</div><div class='del'>-		dp-&gt;dccps_swl = dp-&gt;dccps_isr;</div><div class='del'>-	dp-&gt;dccps_swh = ADD48(dp-&gt;dccps_gsr, (3 * dp-&gt;dccps_r_seq_win) / 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_update_gss(struct sock *sk, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_gss = seq;</div><div class='del'>-	/* Ack validity window depends on local Sequence Window value (7.5.1) */</div><div class='del'>-	dp-&gt;dccps_awl = SUB48(ADD48(dp-&gt;dccps_gss, 1), dp-&gt;dccps_l_seq_win);</div><div class='del'>-	/* Adjust AWL so that it is not below ISS - see comment above for SWL */</div><div class='del'>-	if (before48(dp-&gt;dccps_awl, dp-&gt;dccps_iss))</div><div class='del'>-		dp-&gt;dccps_awl = dp-&gt;dccps_iss;</div><div class='del'>-	dp-&gt;dccps_awh = dp-&gt;dccps_gss;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dccp_ackvec_pending(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return dccp_sk(sk)-&gt;dccps_hc_rx_ackvec != NULL &amp;&amp;</div><div class='del'>-	       !dccp_ackvec_is_empty(dccp_sk(sk)-&gt;dccps_hc_rx_ackvec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dccp_ack_pending(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return dccp_ackvec_pending(sk) || inet_csk_ack_scheduled(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_feat_signal_nn_change(struct sock *sk, u8 feat, u64 nn_val);</div><div class='del'>-int dccp_feat_finalise_settings(struct dccp_sock *dp);</div><div class='del'>-int dccp_feat_server_ccid_dependencies(struct dccp_request_sock *dreq);</div><div class='del'>-int dccp_feat_insert_opts(struct dccp_sock*, struct dccp_request_sock*,</div><div class='del'>-			  struct sk_buff *skb);</div><div class='del'>-int dccp_feat_activate_values(struct sock *sk, struct list_head *fn);</div><div class='del'>-void dccp_feat_list_purge(struct list_head *fn_list);</div><div class='del'>-</div><div class='del'>-int dccp_insert_options(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-int dccp_insert_options_rsk(struct dccp_request_sock *, struct sk_buff *);</div><div class='del'>-u32 dccp_timestamp(void);</div><div class='del'>-void dccp_timestamping_init(void);</div><div class='del'>-int dccp_insert_option(struct sk_buff *skb, unsigned char option,</div><div class='del'>-		       const void *value, unsigned char len);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-int dccp_sysctl_init(void);</div><div class='del'>-void dccp_sysctl_exit(void);</div><div class='del'>-#else</div><div class='del'>-static inline int dccp_sysctl_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_sysctl_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _DCCP_H */</div><div class='head'>diff --git a/net/dccp/diag.c b/net/dccp/diag.c<br/>deleted file mode 100644<br/>index 2d84303ea6bf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/diag.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/diag.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/inet_diag.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-static void dccp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	memset(info, 0, sizeof(*info));</div><div class='del'>-</div><div class='del'>-	info-&gt;tcpi_state	= sk-&gt;sk_state;</div><div class='del'>-	info-&gt;tcpi_retransmits	= icsk-&gt;icsk_retransmits;</div><div class='del'>-	info-&gt;tcpi_probes	= icsk-&gt;icsk_probes_out;</div><div class='del'>-	info-&gt;tcpi_backoff	= icsk-&gt;icsk_backoff;</div><div class='del'>-	info-&gt;tcpi_pmtu		= icsk-&gt;icsk_pmtu_cookie;</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_hc_rx_ackvec != NULL)</div><div class='del'>-		info-&gt;tcpi_options |= TCPI_OPT_SACK;</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_hc_rx_ccid != NULL)</div><div class='del'>-		ccid_hc_rx_get_info(dp-&gt;dccps_hc_rx_ccid, sk, info);</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_hc_tx_ccid != NULL)</div><div class='del'>-		ccid_hc_tx_get_info(dp-&gt;dccps_hc_tx_ccid, sk, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,</div><div class='del'>-			       void *_info)</div><div class='del'>-{</div><div class='del'>-	r-&gt;idiag_rqueue = r-&gt;idiag_wqueue = 0;</div><div class='del'>-</div><div class='del'>-	if (_info != NULL)</div><div class='del'>-		dccp_get_info(sk, _info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			   const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='del'>-{</div><div class='del'>-	inet_diag_dump_icsk(&amp;dccp_hashinfo, skb, cb, r, bc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_diag_dump_one(struct sk_buff *in_skb,</div><div class='del'>-			      const struct nlmsghdr *nlh,</div><div class='del'>-			      const struct inet_diag_req_v2 *req)</div><div class='del'>-{</div><div class='del'>-	return inet_diag_dump_one_icsk(&amp;dccp_hashinfo, in_skb, nlh, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct inet_diag_handler dccp_diag_handler = {</div><div class='del'>-	.dump		 = dccp_diag_dump,</div><div class='del'>-	.dump_one	 = dccp_diag_dump_one,</div><div class='del'>-	.idiag_get_info	 = dccp_diag_get_info,</div><div class='del'>-	.idiag_type	 = IPPROTO_DCCP,</div><div class='del'>-	.idiag_info_size = sizeof(struct tcp_info),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dccp_diag_init(void)</div><div class='del'>-{</div><div class='del'>-	return inet_diag_register(&amp;dccp_diag_handler);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dccp_diag_fini(void)</div><div class='del'>-{</div><div class='del'>-	inet_diag_unregister(&amp;dccp_diag_handler);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dccp_diag_init);</div><div class='del'>-module_exit(dccp_diag_fini);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("DCCP inet_diag handler");</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-33 /* AF_INET - IPPROTO_DCCP */);</div><div class='head'>diff --git a/net/dccp/feat.c b/net/dccp/feat.c<br/>deleted file mode 100644<br/>index f227f002c73d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/feat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/feat.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1564 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/feat.c</div><div class='del'>- *</div><div class='del'>- *  Feature negotiation for the DCCP protocol (RFC 4340, section 6)</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2008 Gerrit Renker &lt;gerrit@erg.abdn.ac.uk&gt;</div><div class='del'>- *  Rewrote from scratch, some bits from earlier code by</div><div class='del'>- *  Copyright (c) 2005 Andrea Bittau &lt;a.bittau@cs.ucl.ac.uk&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  ASSUMPTIONS</div><div class='del'>- *  -----------</div><div class='del'>- *  o Feature negotiation is coordinated with connection setup (as in TCP), wild</div><div class='del'>- *    changes of parameters of an established connection are not supported.</div><div class='del'>- *  o Changing non-negotiable (NN) values is supported in state OPEN/PARTOPEN.</div><div class='del'>- *  o All currently known SP features have 1-byte quantities. If in the future</div><div class='del'>- *    extensions of RFCs 4340..42 define features with item lengths larger than</div><div class='del'>- *    one byte, a feature-specific extension of the code will be required.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-/* feature-specific sysctls - initialised to the defaults from RFC 4340, 6.4 */</div><div class='del'>-unsigned long	sysctl_dccp_sequence_window __read_mostly = 100;</div><div class='del'>-int		sysctl_dccp_rx_ccid	    __read_mostly = 2,</div><div class='del'>-		sysctl_dccp_tx_ccid	    __read_mostly = 2;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Feature activation handlers.</div><div class='del'>- *</div><div class='del'>- * These all use an u64 argument, to provide enough room for NN/SP features. At</div><div class='del'>- * this stage the negotiated values have been checked to be within their range.</div><div class='del'>- */</div><div class='del'>-static int dccp_hdlr_ccid(struct sock *sk, u64 ccid, bool rx)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct ccid *new_ccid = ccid_new(ccid, sk, rx);</div><div class='del'>-</div><div class='del'>-	if (new_ccid == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (rx) {</div><div class='del'>-		ccid_hc_rx_delete(dp-&gt;dccps_hc_rx_ccid, sk);</div><div class='del'>-		dp-&gt;dccps_hc_rx_ccid = new_ccid;</div><div class='del'>-	} else {</div><div class='del'>-		ccid_hc_tx_delete(dp-&gt;dccps_hc_tx_ccid, sk);</div><div class='del'>-		dp-&gt;dccps_hc_tx_ccid = new_ccid;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_hdlr_seq_win(struct sock *sk, u64 seq_win, bool rx)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (rx) {</div><div class='del'>-		dp-&gt;dccps_r_seq_win = seq_win;</div><div class='del'>-		/* propagate changes to update SWL/SWH */</div><div class='del'>-		dccp_update_gsr(sk, dp-&gt;dccps_gsr);</div><div class='del'>-	} else {</div><div class='del'>-		dp-&gt;dccps_l_seq_win = seq_win;</div><div class='del'>-		/* propagate changes to update AWL */</div><div class='del'>-		dccp_update_gss(sk, dp-&gt;dccps_gss);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_hdlr_ack_ratio(struct sock *sk, u64 ratio, bool rx)</div><div class='del'>-{</div><div class='del'>-	if (rx)</div><div class='del'>-		dccp_sk(sk)-&gt;dccps_r_ack_ratio = ratio;</div><div class='del'>-	else</div><div class='del'>-		dccp_sk(sk)-&gt;dccps_l_ack_ratio = ratio;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_hdlr_ackvec(struct sock *sk, u64 enable, bool rx)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (rx) {</div><div class='del'>-		if (enable &amp;&amp; dp-&gt;dccps_hc_rx_ackvec == NULL) {</div><div class='del'>-			dp-&gt;dccps_hc_rx_ackvec = dccp_ackvec_alloc(gfp_any());</div><div class='del'>-			if (dp-&gt;dccps_hc_rx_ackvec == NULL)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		} else if (!enable) {</div><div class='del'>-			dccp_ackvec_free(dp-&gt;dccps_hc_rx_ackvec);</div><div class='del'>-			dp-&gt;dccps_hc_rx_ackvec = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_hdlr_ndp(struct sock *sk, u64 enable, bool rx)</div><div class='del'>-{</div><div class='del'>-	if (!rx)</div><div class='del'>-		dccp_sk(sk)-&gt;dccps_send_ndp_count = (enable &gt; 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Minimum Checksum Coverage is located at the RX side (9.2.1). This means that</div><div class='del'>- * `rx' holds when the sending peer informs about his partial coverage via a</div><div class='del'>- * ChangeR() option. In the other case, we are the sender and the receiver</div><div class='del'>- * announces its coverage via ChangeL() options. The policy here is to honour</div><div class='del'>- * such communication by enabling the corresponding partial coverage - but only</div><div class='del'>- * if it has not been set manually before; the warning here means that all</div><div class='del'>- * packets will be dropped.</div><div class='del'>- */</div><div class='del'>-static int dccp_hdlr_min_cscov(struct sock *sk, u64 cscov, bool rx)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (rx)</div><div class='del'>-		dp-&gt;dccps_pcrlen = cscov;</div><div class='del'>-	else {</div><div class='del'>-		if (dp-&gt;dccps_pcslen == 0)</div><div class='del'>-			dp-&gt;dccps_pcslen = cscov;</div><div class='del'>-		else if (cscov &gt; dp-&gt;dccps_pcslen)</div><div class='del'>-			DCCP_WARN("CsCov %u too small, peer requires &gt;= %u\n",</div><div class='del'>-				  dp-&gt;dccps_pcslen, (u8)cscov);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct {</div><div class='del'>-	u8			feat_num;		/* DCCPF_xxx */</div><div class='del'>-	enum dccp_feat_type	rxtx;			/* RX or TX  */</div><div class='del'>-	enum dccp_feat_type	reconciliation;		/* SP or NN  */</div><div class='del'>-	u8			default_value;		/* as in 6.4 */</div><div class='del'>-	int (*activation_hdlr)(struct sock *sk, u64 val, bool rx);</div><div class='del'>-/*</div><div class='del'>- *    Lookup table for location and type of features (from RFC 4340/4342)</div><div class='del'>- *  +--------------------------+----+-----+----+----+---------+-----------+</div><div class='del'>- *  | Feature                  | Location | Reconc. | Initial |  Section  |</div><div class='del'>- *  |                          | RX | TX  | SP | NN |  Value  | Reference |</div><div class='del'>- *  +--------------------------+----+-----+----+----+---------+-----------+</div><div class='del'>- *  | DCCPF_CCID               |    |  X  | X  |    |   2     | 10        |</div><div class='del'>- *  | DCCPF_SHORT_SEQNOS       |    |  X  | X  |    |   0     |  7.6.1    |</div><div class='del'>- *  | DCCPF_SEQUENCE_WINDOW    |    |  X  |    | X  | 100     |  7.5.2    |</div><div class='del'>- *  | DCCPF_ECN_INCAPABLE      | X  |     | X  |    |   0     | 12.1      |</div><div class='del'>- *  | DCCPF_ACK_RATIO          |    |  X  |    | X  |   2     | 11.3      |</div><div class='del'>- *  | DCCPF_SEND_ACK_VECTOR    | X  |     | X  |    |   0     | 11.5      |</div><div class='del'>- *  | DCCPF_SEND_NDP_COUNT     |    |  X  | X  |    |   0     |  7.7.2    |</div><div class='del'>- *  | DCCPF_MIN_CSUM_COVER     | X  |     | X  |    |   0     |  9.2.1    |</div><div class='del'>- *  | DCCPF_DATA_CHECKSUM      | X  |     | X  |    |   0     |  9.3.1    |</div><div class='del'>- *  | DCCPF_SEND_LEV_RATE      | X  |     | X  |    |   0     | 4342/8.4  |</div><div class='del'>- *  +--------------------------+----+-----+----+----+---------+-----------+</div><div class='del'>- */</div><div class='del'>-} dccp_feat_table[] = {</div><div class='del'>-	{ DCCPF_CCID,		 FEAT_AT_TX, FEAT_SP, 2,   dccp_hdlr_ccid     },</div><div class='del'>-	{ DCCPF_SHORT_SEQNOS,	 FEAT_AT_TX, FEAT_SP, 0,   NULL },</div><div class='del'>-	{ DCCPF_SEQUENCE_WINDOW, FEAT_AT_TX, FEAT_NN, 100, dccp_hdlr_seq_win  },</div><div class='del'>-	{ DCCPF_ECN_INCAPABLE,	 FEAT_AT_RX, FEAT_SP, 0,   NULL },</div><div class='del'>-	{ DCCPF_ACK_RATIO,	 FEAT_AT_TX, FEAT_NN, 2,   dccp_hdlr_ack_ratio},</div><div class='del'>-	{ DCCPF_SEND_ACK_VECTOR, FEAT_AT_RX, FEAT_SP, 0,   dccp_hdlr_ackvec   },</div><div class='del'>-	{ DCCPF_SEND_NDP_COUNT,  FEAT_AT_TX, FEAT_SP, 0,   dccp_hdlr_ndp      },</div><div class='del'>-	{ DCCPF_MIN_CSUM_COVER,  FEAT_AT_RX, FEAT_SP, 0,   dccp_hdlr_min_cscov},</div><div class='del'>-	{ DCCPF_DATA_CHECKSUM,	 FEAT_AT_RX, FEAT_SP, 0,   NULL },</div><div class='del'>-	{ DCCPF_SEND_LEV_RATE,	 FEAT_AT_RX, FEAT_SP, 0,   NULL },</div><div class='del'>-};</div><div class='del'>-#define DCCP_FEAT_SUPPORTED_MAX		ARRAY_SIZE(dccp_feat_table)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_index  -  Hash function to map feature number into array position</div><div class='del'>- * Returns consecutive array index or -1 if the feature is not understood.</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_index(u8 feat_num)</div><div class='del'>-{</div><div class='del'>-	/* The first 9 entries are occupied by the types from RFC 4340, 6.4 */</div><div class='del'>-	if (feat_num &gt; DCCPF_RESERVED &amp;&amp; feat_num &lt;= DCCPF_DATA_CHECKSUM)</div><div class='del'>-		return feat_num - 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Other features: add cases for new feature types here after adding</div><div class='del'>-	 * them to the above table.</div><div class='del'>-	 */</div><div class='del'>-	switch (feat_num) {</div><div class='del'>-	case DCCPF_SEND_LEV_RATE:</div><div class='del'>-			return DCCP_FEAT_SUPPORTED_MAX - 1;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 dccp_feat_type(u8 feat_num)</div><div class='del'>-{</div><div class='del'>-	int idx = dccp_feat_index(feat_num);</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		return FEAT_UNKNOWN;</div><div class='del'>-	return dccp_feat_table[idx].reconciliation;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_feat_default_value(u8 feat_num)</div><div class='del'>-{</div><div class='del'>-	int idx = dccp_feat_index(feat_num);</div><div class='del'>-	/*</div><div class='del'>-	 * There are no default values for unknown features, so encountering a</div><div class='del'>-	 * negative index here indicates a serious problem somewhere else.</div><div class='del'>-	 */</div><div class='del'>-	DCCP_BUG_ON(idx &lt; 0);</div><div class='del'>-</div><div class='del'>-	return idx &lt; 0 ? 0 : dccp_feat_table[idx].default_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Debugging and verbose-printing section</div><div class='del'>- */</div><div class='del'>-static const char *dccp_feat_fname(const u8 feat)</div><div class='del'>-{</div><div class='del'>-	static const char *const feature_names[] = {</div><div class='del'>-		[DCCPF_RESERVED]	= "Reserved",</div><div class='del'>-		[DCCPF_CCID]		= "CCID",</div><div class='del'>-		[DCCPF_SHORT_SEQNOS]	= "Allow Short Seqnos",</div><div class='del'>-		[DCCPF_SEQUENCE_WINDOW]	= "Sequence Window",</div><div class='del'>-		[DCCPF_ECN_INCAPABLE]	= "ECN Incapable",</div><div class='del'>-		[DCCPF_ACK_RATIO]	= "Ack Ratio",</div><div class='del'>-		[DCCPF_SEND_ACK_VECTOR]	= "Send ACK Vector",</div><div class='del'>-		[DCCPF_SEND_NDP_COUNT]	= "Send NDP Count",</div><div class='del'>-		[DCCPF_MIN_CSUM_COVER]	= "Min. Csum Coverage",</div><div class='del'>-		[DCCPF_DATA_CHECKSUM]	= "Send Data Checksum",</div><div class='del'>-	};</div><div class='del'>-	if (feat &gt; DCCPF_DATA_CHECKSUM &amp;&amp; feat &lt; DCCPF_MIN_CCID_SPECIFIC)</div><div class='del'>-		return feature_names[DCCPF_RESERVED];</div><div class='del'>-</div><div class='del'>-	if (feat ==  DCCPF_SEND_LEV_RATE)</div><div class='del'>-		return "Send Loss Event Rate";</div><div class='del'>-	if (feat &gt;= DCCPF_MIN_CCID_SPECIFIC)</div><div class='del'>-		return "CCID-specific";</div><div class='del'>-</div><div class='del'>-	return feature_names[feat];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *const dccp_feat_sname[] = {</div><div class='del'>-	"DEFAULT", "INITIALISING", "CHANGING", "UNSTABLE", "STABLE",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_DEBUG</div><div class='del'>-static const char *dccp_feat_oname(const u8 opt)</div><div class='del'>-{</div><div class='del'>-	switch (opt) {</div><div class='del'>-	case DCCPO_CHANGE_L:  return "Change_L";</div><div class='del'>-	case DCCPO_CONFIRM_L: return "Confirm_L";</div><div class='del'>-	case DCCPO_CHANGE_R:  return "Change_R";</div><div class='del'>-	case DCCPO_CONFIRM_R: return "Confirm_R";</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_feat_printval(u8 feat_num, dccp_feat_val const *val)</div><div class='del'>-{</div><div class='del'>-	u8 i, type = dccp_feat_type(feat_num);</div><div class='del'>-</div><div class='del'>-	if (val == NULL || (type == FEAT_SP &amp;&amp; val-&gt;sp.vec == NULL))</div><div class='del'>-		dccp_pr_debug_cat("(NULL)");</div><div class='del'>-	else if (type == FEAT_SP)</div><div class='del'>-		for (i = 0; i &lt; val-&gt;sp.len; i++)</div><div class='del'>-			dccp_pr_debug_cat("%s%u", i ? " " : "", val-&gt;sp.vec[i]);</div><div class='del'>-	else if (type == FEAT_NN)</div><div class='del'>-		dccp_pr_debug_cat("%llu", (unsigned long long)val-&gt;nn);</div><div class='del'>-	else</div><div class='del'>-		dccp_pr_debug_cat("unknown type %u", type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_feat_printvals(u8 feat_num, u8 *list, u8 len)</div><div class='del'>-{</div><div class='del'>-	u8 type = dccp_feat_type(feat_num);</div><div class='del'>-	dccp_feat_val fval = { .sp.vec = list, .sp.len = len };</div><div class='del'>-</div><div class='del'>-	if (type == FEAT_NN)</div><div class='del'>-		fval.nn = dccp_decode_value_var(list, len);</div><div class='del'>-	dccp_feat_printval(feat_num, &amp;fval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_feat_print_entry(struct dccp_feat_entry const *entry)</div><div class='del'>-{</div><div class='del'>-	dccp_debug("   * %s %s = ", entry-&gt;is_local ? "local" : "remote",</div><div class='del'>-				    dccp_feat_fname(entry-&gt;feat_num));</div><div class='del'>-	dccp_feat_printval(entry-&gt;feat_num, &amp;entry-&gt;val);</div><div class='del'>-	dccp_pr_debug_cat(", state=%s %s\n", dccp_feat_sname[entry-&gt;state],</div><div class='del'>-			  entry-&gt;needs_confirm ? "(Confirm pending)" : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define dccp_feat_print_opt(opt, feat, val, len, mandatory)	do {	      \</div><div class='del'>-	dccp_pr_debug("%s(%s, ", dccp_feat_oname(opt), dccp_feat_fname(feat));\</div><div class='del'>-	dccp_feat_printvals(feat, val, len);				      \</div><div class='del'>-	dccp_pr_debug_cat(") %s\n", mandatory ? "!" : "");	} while (0)</div><div class='del'>-</div><div class='del'>-#define dccp_feat_print_fnlist(fn_list)  {		\</div><div class='del'>-	const struct dccp_feat_entry *___entry;		\</div><div class='del'>-							\</div><div class='del'>-	dccp_pr_debug("List Dump:\n");			\</div><div class='del'>-	list_for_each_entry(___entry, fn_list, node)	\</div><div class='del'>-		dccp_feat_print_entry(___entry);	\</div><div class='del'>-}</div><div class='del'>-#else	/* ! CONFIG_IP_DCCP_DEBUG */</div><div class='del'>-#define dccp_feat_print_opt(opt, feat, val, len, mandatory)</div><div class='del'>-#define dccp_feat_print_fnlist(fn_list)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __dccp_feat_activate(struct sock *sk, const int idx,</div><div class='del'>-				const bool is_local, dccp_feat_val const *fval)</div><div class='del'>-{</div><div class='del'>-	bool rx;</div><div class='del'>-	u64 val;</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0 || idx &gt;= DCCP_FEAT_SUPPORTED_MAX)</div><div class='del'>-		return -1;</div><div class='del'>-	if (dccp_feat_table[idx].activation_hdlr == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (fval == NULL) {</div><div class='del'>-		val = dccp_feat_table[idx].default_value;</div><div class='del'>-	} else if (dccp_feat_table[idx].reconciliation == FEAT_SP) {</div><div class='del'>-		if (fval-&gt;sp.vec == NULL) {</div><div class='del'>-			/*</div><div class='del'>-			 * This can happen when an empty Confirm is sent</div><div class='del'>-			 * for an SP (i.e. known) feature. In this case</div><div class='del'>-			 * we would be using the default anyway.</div><div class='del'>-			 */</div><div class='del'>-			DCCP_CRIT("Feature #%d undefined: using default", idx);</div><div class='del'>-			val = dccp_feat_table[idx].default_value;</div><div class='del'>-		} else {</div><div class='del'>-			val = fval-&gt;sp.vec[0];</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		val = fval-&gt;nn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Location is RX if this is a local-RX or remote-TX feature */</div><div class='del'>-	rx = (is_local == (dccp_feat_table[idx].rxtx == FEAT_AT_RX));</div><div class='del'>-</div><div class='del'>-	dccp_debug("   -&gt; activating %s %s, %sval=%llu\n", rx ? "RX" : "TX",</div><div class='del'>-		   dccp_feat_fname(dccp_feat_table[idx].feat_num),</div><div class='del'>-		   fval ? "" : "default ",  (unsigned long long)val);</div><div class='del'>-</div><div class='del'>-	return dccp_feat_table[idx].activation_hdlr(sk, val, rx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_activate  -  Activate feature value on socket</div><div class='del'>- * @sk: fully connected DCCP socket (after handshake is complete)</div><div class='del'>- * @feat_num: feature to activate, one of %dccp_feature_numbers</div><div class='del'>- * @local: whether local (1) or remote (0) @feat_num is meant</div><div class='del'>- * @fval: the value (SP or NN) to activate, or NULL to use the default value</div><div class='del'>- *</div><div class='del'>- * For general use this function is preferable over __dccp_feat_activate().</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_activate(struct sock *sk, u8 feat_num, bool local,</div><div class='del'>-			      dccp_feat_val const *fval)</div><div class='del'>-{</div><div class='del'>-	return __dccp_feat_activate(sk, dccp_feat_index(feat_num), local, fval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Test for "Req'd" feature (RFC 4340, 6.4) */</div><div class='del'>-static inline int dccp_feat_must_be_understood(u8 feat_num)</div><div class='del'>-{</div><div class='del'>-	return	feat_num == DCCPF_CCID || feat_num == DCCPF_SHORT_SEQNOS ||</div><div class='del'>-		feat_num == DCCPF_SEQUENCE_WINDOW;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* copy constructor, fval must not already contain allocated memory */</div><div class='del'>-static int dccp_feat_clone_sp_val(dccp_feat_val *fval, u8 const *val, u8 len)</div><div class='del'>-{</div><div class='del'>-	fval-&gt;sp.len = len;</div><div class='del'>-	if (fval-&gt;sp.len &gt; 0) {</div><div class='del'>-		fval-&gt;sp.vec = kmemdup(val, len, gfp_any());</div><div class='del'>-		if (fval-&gt;sp.vec == NULL) {</div><div class='del'>-			fval-&gt;sp.len = 0;</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_feat_val_destructor(u8 feat_num, dccp_feat_val *val)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(val == NULL))</div><div class='del'>-		return;</div><div class='del'>-	if (dccp_feat_type(feat_num) == FEAT_SP)</div><div class='del'>-		kfree(val-&gt;sp.vec);</div><div class='del'>-	memset(val, 0, sizeof(*val));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dccp_feat_entry *</div><div class='del'>-	      dccp_feat_clone_entry(struct dccp_feat_entry const *original)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *new;</div><div class='del'>-	u8 type = dccp_feat_type(original-&gt;feat_num);</div><div class='del'>-</div><div class='del'>-	if (type == FEAT_UNKNOWN)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	new = kmemdup(original, sizeof(struct dccp_feat_entry), gfp_any());</div><div class='del'>-	if (new == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (type == FEAT_SP &amp;&amp; dccp_feat_clone_sp_val(&amp;new-&gt;val,</div><div class='del'>-						      original-&gt;val.sp.vec,</div><div class='del'>-						      original-&gt;val.sp.len)) {</div><div class='del'>-		kfree(new);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_feat_entry_destructor(struct dccp_feat_entry *entry)</div><div class='del'>-{</div><div class='del'>-	if (entry != NULL) {</div><div class='del'>-		dccp_feat_val_destructor(entry-&gt;feat_num, &amp;entry-&gt;val);</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * List management functions</div><div class='del'>- *</div><div class='del'>- * Feature negotiation lists rely on and maintain the following invariants:</div><div class='del'>- * - each feat_num in the list is known, i.e. we know its type and default value</div><div class='del'>- * - each feat_num/is_local combination is unique (old entries are overwritten)</div><div class='del'>- * - SP values are always freshly allocated</div><div class='del'>- * - list is sorted in increasing order of feature number (faster lookup)</div><div class='del'>- */</div><div class='del'>-static struct dccp_feat_entry *dccp_feat_list_lookup(struct list_head *fn_list,</div><div class='del'>-						     u8 feat_num, bool is_local)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(entry, fn_list, node) {</div><div class='del'>-		if (entry-&gt;feat_num == feat_num &amp;&amp; entry-&gt;is_local == is_local)</div><div class='del'>-			return entry;</div><div class='del'>-		else if (entry-&gt;feat_num &gt; feat_num)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_entry_new  -  Central list update routine (called by all others)</div><div class='del'>- * @head:  list to add to</div><div class='del'>- * @feat:  feature number</div><div class='del'>- * @local: whether the local (1) or remote feature with number @feat is meant</div><div class='del'>- *</div><div class='del'>- * This is the only constructor and serves to ensure the above invariants.</div><div class='del'>- */</div><div class='del'>-static struct dccp_feat_entry *</div><div class='del'>-	      dccp_feat_entry_new(struct list_head *head, u8 feat, bool local)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(entry, head, node)</div><div class='del'>-		if (entry-&gt;feat_num == feat &amp;&amp; entry-&gt;is_local == local) {</div><div class='del'>-			dccp_feat_val_destructor(entry-&gt;feat_num, &amp;entry-&gt;val);</div><div class='del'>-			return entry;</div><div class='del'>-		} else if (entry-&gt;feat_num &gt; feat) {</div><div class='del'>-			head = &amp;entry-&gt;node;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	entry = kmalloc(sizeof(*entry), gfp_any());</div><div class='del'>-	if (entry != NULL) {</div><div class='del'>-		entry-&gt;feat_num = feat;</div><div class='del'>-		entry-&gt;is_local = local;</div><div class='del'>-		list_add_tail(&amp;entry-&gt;node, head);</div><div class='del'>-	}</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_push_change  -  Add/overwrite a Change option in the list</div><div class='del'>- * @fn_list: feature-negotiation list to update</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @local: whether local (1) or remote (0) @feat_num is meant</div><div class='del'>- * @mandatory: whether to use Mandatory feature negotiation options</div><div class='del'>- * @fval: pointer to NN/SP value to be inserted (will be copied)</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_push_change(struct list_head *fn_list, u8 feat, u8 local,</div><div class='del'>-				 u8 mandatory, dccp_feat_val *fval)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *new = dccp_feat_entry_new(fn_list, feat, local);</div><div class='del'>-</div><div class='del'>-	if (new == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	new-&gt;feat_num	     = feat;</div><div class='del'>-	new-&gt;is_local	     = local;</div><div class='del'>-	new-&gt;state	     = FEAT_INITIALISING;</div><div class='del'>-	new-&gt;needs_confirm   = false;</div><div class='del'>-	new-&gt;empty_confirm   = false;</div><div class='del'>-	new-&gt;val	     = *fval;</div><div class='del'>-	new-&gt;needs_mandatory = mandatory;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_push_confirm  -  Add a Confirm entry to the FN list</div><div class='del'>- * @fn_list: feature-negotiation list to add to</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @local: whether local (1) or remote (0) @feat_num is being confirmed</div><div class='del'>- * @fval: pointer to NN/SP value to be inserted or NULL</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, a Reset code for further processing otherwise.</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_push_confirm(struct list_head *fn_list, u8 feat, u8 local,</div><div class='del'>-				  dccp_feat_val *fval)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *new = dccp_feat_entry_new(fn_list, feat, local);</div><div class='del'>-</div><div class='del'>-	if (new == NULL)</div><div class='del'>-		return DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-</div><div class='del'>-	new-&gt;feat_num	     = feat;</div><div class='del'>-	new-&gt;is_local	     = local;</div><div class='del'>-	new-&gt;state	     = FEAT_STABLE;	/* transition in 6.6.2 */</div><div class='del'>-	new-&gt;needs_confirm   = true;</div><div class='del'>-	new-&gt;empty_confirm   = (fval == NULL);</div><div class='del'>-	new-&gt;val.nn	     = 0;		/* zeroes the whole structure */</div><div class='del'>-	if (!new-&gt;empty_confirm)</div><div class='del'>-		new-&gt;val     = *fval;</div><div class='del'>-	new-&gt;needs_mandatory = false;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_push_empty_confirm(struct list_head *fn_list, u8 feat, u8 local)</div><div class='del'>-{</div><div class='del'>-	return dccp_feat_push_confirm(fn_list, feat, local, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_feat_list_pop(struct dccp_feat_entry *entry)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;entry-&gt;node);</div><div class='del'>-	dccp_feat_entry_destructor(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_feat_list_purge(struct list_head *fn_list)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *entry, *next;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, next, fn_list, node)</div><div class='del'>-		dccp_feat_entry_destructor(entry);</div><div class='del'>-	INIT_LIST_HEAD(fn_list);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_feat_list_purge);</div><div class='del'>-</div><div class='del'>-/* generate @to as full clone of @from - @to must not contain any nodes */</div><div class='del'>-int dccp_feat_clone_list(struct list_head const *from, struct list_head *to)</div><div class='del'>-{</div><div class='del'>-	struct dccp_feat_entry *entry, *new;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(to);</div><div class='del'>-	list_for_each_entry(entry, from, node) {</div><div class='del'>-		new = dccp_feat_clone_entry(entry);</div><div class='del'>-		if (new == NULL)</div><div class='del'>-			goto cloning_failed;</div><div class='del'>-		list_add_tail(&amp;new-&gt;node, to);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-cloning_failed:</div><div class='del'>-	dccp_feat_list_purge(to);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_valid_nn_length  -  Enforce length constraints on NN options</div><div class='del'>- * Length is between 0 and %DCCP_OPTVAL_MAXLEN. Used for outgoing packets only,</div><div class='del'>- * incoming options are accepted as long as their values are valid.</div><div class='del'>- */</div><div class='del'>-static u8 dccp_feat_valid_nn_length(u8 feat_num)</div><div class='del'>-{</div><div class='del'>-	if (feat_num == DCCPF_ACK_RATIO)	/* RFC 4340, 11.3 and 6.6.8 */</div><div class='del'>-		return 2;</div><div class='del'>-	if (feat_num == DCCPF_SEQUENCE_WINDOW)	/* RFC 4340, 7.5.2 and 6.5  */</div><div class='del'>-		return 6;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 dccp_feat_is_valid_nn_val(u8 feat_num, u64 val)</div><div class='del'>-{</div><div class='del'>-	switch (feat_num) {</div><div class='del'>-	case DCCPF_ACK_RATIO:</div><div class='del'>-		return val &lt;= DCCPF_ACK_RATIO_MAX;</div><div class='del'>-	case DCCPF_SEQUENCE_WINDOW:</div><div class='del'>-		return val &gt;= DCCPF_SEQ_WMIN &amp;&amp; val &lt;= DCCPF_SEQ_WMAX;</div><div class='del'>-	}</div><div class='del'>-	return 0;	/* feature unknown - so we can't tell */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check that SP values are within the ranges defined in RFC 4340 */</div><div class='del'>-static u8 dccp_feat_is_valid_sp_val(u8 feat_num, u8 val)</div><div class='del'>-{</div><div class='del'>-	switch (feat_num) {</div><div class='del'>-	case DCCPF_CCID:</div><div class='del'>-		return val == DCCPC_CCID2 || val == DCCPC_CCID3;</div><div class='del'>-	/* Type-check Boolean feature values: */</div><div class='del'>-	case DCCPF_SHORT_SEQNOS:</div><div class='del'>-	case DCCPF_ECN_INCAPABLE:</div><div class='del'>-	case DCCPF_SEND_ACK_VECTOR:</div><div class='del'>-	case DCCPF_SEND_NDP_COUNT:</div><div class='del'>-	case DCCPF_DATA_CHECKSUM:</div><div class='del'>-	case DCCPF_SEND_LEV_RATE:</div><div class='del'>-		return val &lt; 2;</div><div class='del'>-	case DCCPF_MIN_CSUM_COVER:</div><div class='del'>-		return val &lt; 16;</div><div class='del'>-	}</div><div class='del'>-	return 0;			/* feature unknown */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 dccp_feat_sp_list_ok(u8 feat_num, u8 const *sp_list, u8 sp_len)</div><div class='del'>-{</div><div class='del'>-	if (sp_list == NULL || sp_len &lt; 1)</div><div class='del'>-		return 0;</div><div class='del'>-	while (sp_len--)</div><div class='del'>-		if (!dccp_feat_is_valid_sp_val(feat_num, *sp_list++))</div><div class='del'>-			return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_insert_opts  -  Generate FN options from current list state</div><div class='del'>- * @skb: next sk_buff to be sent to the peer</div><div class='del'>- * @dp: for client during handshake and general negotiation</div><div class='del'>- * @dreq: used by the server only (all Changes/Confirms in LISTEN/RESPOND)</div><div class='del'>- */</div><div class='del'>-int dccp_feat_insert_opts(struct dccp_sock *dp, struct dccp_request_sock *dreq,</div><div class='del'>-			  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = dreq ? &amp;dreq-&gt;dreq_featneg : &amp;dp-&gt;dccps_featneg;</div><div class='del'>-	struct dccp_feat_entry *pos, *next;</div><div class='del'>-	u8 opt, type, len, *ptr, nn_in_nbo[DCCP_OPTVAL_MAXLEN];</div><div class='del'>-	bool rpt;</div><div class='del'>-</div><div class='del'>-	/* put entries into @skb in the order they appear in the list */</div><div class='del'>-	list_for_each_entry_safe_reverse(pos, next, fn, node) {</div><div class='del'>-		opt  = dccp_feat_genopt(pos);</div><div class='del'>-		type = dccp_feat_type(pos-&gt;feat_num);</div><div class='del'>-		rpt  = false;</div><div class='del'>-</div><div class='del'>-		if (pos-&gt;empty_confirm) {</div><div class='del'>-			len = 0;</div><div class='del'>-			ptr = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			if (type == FEAT_SP) {</div><div class='del'>-				len = pos-&gt;val.sp.len;</div><div class='del'>-				ptr = pos-&gt;val.sp.vec;</div><div class='del'>-				rpt = pos-&gt;needs_confirm;</div><div class='del'>-			} else if (type == FEAT_NN) {</div><div class='del'>-				len = dccp_feat_valid_nn_length(pos-&gt;feat_num);</div><div class='del'>-				ptr = nn_in_nbo;</div><div class='del'>-				dccp_encode_value_var(pos-&gt;val.nn, ptr, len);</div><div class='del'>-			} else {</div><div class='del'>-				DCCP_BUG("unknown feature %u", pos-&gt;feat_num);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dccp_feat_print_opt(opt, pos-&gt;feat_num, ptr, len, 0);</div><div class='del'>-</div><div class='del'>-		if (dccp_insert_fn_opt(skb, opt, pos-&gt;feat_num, ptr, len, rpt))</div><div class='del'>-			return -1;</div><div class='del'>-		if (pos-&gt;needs_mandatory &amp;&amp; dccp_insert_option_mandatory(skb))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk-&gt;sk_state == DCCP_OPEN &amp;&amp;</div><div class='del'>-		    (opt == DCCPO_CONFIRM_R || opt == DCCPO_CONFIRM_L)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Confirms don't get retransmitted (6.6.3) once the</div><div class='del'>-			 * connection is in state OPEN</div><div class='del'>-			 */</div><div class='del'>-			dccp_feat_list_pop(pos);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * Enter CHANGING after transmitting the Change</div><div class='del'>-			 * option (6.6.2).</div><div class='del'>-			 */</div><div class='del'>-			if (pos-&gt;state == FEAT_INITIALISING)</div><div class='del'>-				pos-&gt;state = FEAT_CHANGING;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __feat_register_nn  -  Register new NN value on socket</div><div class='del'>- * @fn: feature-negotiation list to register with</div><div class='del'>- * @feat: an NN feature from %dccp_feature_numbers</div><div class='del'>- * @mandatory: use Mandatory option if 1</div><div class='del'>- * @nn_val: value to register (restricted to 4 bytes)</div><div class='del'>- *</div><div class='del'>- * Note that NN features are local by definition (RFC 4340, 6.3.2).</div><div class='del'>- */</div><div class='del'>-static int __feat_register_nn(struct list_head *fn, u8 feat,</div><div class='del'>-			      u8 mandatory, u64 nn_val)</div><div class='del'>-{</div><div class='del'>-	dccp_feat_val fval = { .nn = nn_val };</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_type(feat) != FEAT_NN ||</div><div class='del'>-	    !dccp_feat_is_valid_nn_val(feat, nn_val))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Don't bother with default values, they will be activated anyway. */</div><div class='del'>-	if (nn_val - (u64)dccp_feat_default_value(feat) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return dccp_feat_push_change(fn, feat, 1, mandatory, &amp;fval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __feat_register_sp  -  Register new SP value/list on socket</div><div class='del'>- * @fn: feature-negotiation list to register with</div><div class='del'>- * @feat: an SP feature from %dccp_feature_numbers</div><div class='del'>- * @is_local: whether the local (1) or the remote (0) @feat is meant</div><div class='del'>- * @mandatory: use Mandatory option if 1</div><div class='del'>- * @sp_val: SP value followed by optional preference list</div><div class='del'>- * @sp_len: length of @sp_val in bytes</div><div class='del'>- */</div><div class='del'>-static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,</div><div class='del'>-			      u8 mandatory, u8 const *sp_val, u8 sp_len)</div><div class='del'>-{</div><div class='del'>-	dccp_feat_val fval;</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_type(feat) != FEAT_SP ||</div><div class='del'>-	    !dccp_feat_sp_list_ok(feat, sp_val, sp_len))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Avoid negotiating alien CCIDs by only advertising supported ones */</div><div class='del'>-	if (feat == DCCPF_CCID &amp;&amp; !ccid_support_check(sp_val, sp_len))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_clone_sp_val(&amp;fval, sp_val, sp_len))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return dccp_feat_push_change(fn, feat, is_local, mandatory, &amp;fval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_register_sp  -  Register requests to change SP feature values</div><div class='del'>- * @sk: client or listening socket</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @is_local: whether the local (1) or remote (0) @feat is meant</div><div class='del'>- * @list: array of preferred values, in descending order of preference</div><div class='del'>- * @len: length of @list in bytes</div><div class='del'>- */</div><div class='del'>-int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,</div><div class='del'>-			  u8 const *list, u8 len)</div><div class='del'>-{	 /* any changes must be registered before establishing the connection */</div><div class='del'>-	if (sk-&gt;sk_state != DCCP_CLOSED)</div><div class='del'>-		return -EISCONN;</div><div class='del'>-	if (dccp_feat_type(feat) != FEAT_SP)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return __feat_register_sp(&amp;dccp_sk(sk)-&gt;dccps_featneg, feat, is_local,</div><div class='del'>-				  0, list, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_nn_get  -  Query current/pending value of NN feature</div><div class='del'>- * @sk: DCCP socket of an established connection</div><div class='del'>- * @feat: NN feature number from %dccp_feature_numbers</div><div class='del'>- *</div><div class='del'>- * For a known NN feature, returns value currently being negotiated, or</div><div class='del'>- * current (confirmed) value if no negotiation is going on.</div><div class='del'>- */</div><div class='del'>-u64 dccp_feat_nn_get(struct sock *sk, u8 feat)</div><div class='del'>-{</div><div class='del'>-	if (dccp_feat_type(feat) == FEAT_NN) {</div><div class='del'>-		struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-		struct dccp_feat_entry *entry;</div><div class='del'>-</div><div class='del'>-		entry = dccp_feat_list_lookup(&amp;dp-&gt;dccps_featneg, feat, 1);</div><div class='del'>-		if (entry != NULL)</div><div class='del'>-			return entry-&gt;val.nn;</div><div class='del'>-</div><div class='del'>-		switch (feat) {</div><div class='del'>-		case DCCPF_ACK_RATIO:</div><div class='del'>-			return dp-&gt;dccps_l_ack_ratio;</div><div class='del'>-		case DCCPF_SEQUENCE_WINDOW:</div><div class='del'>-			return dp-&gt;dccps_l_seq_win;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	DCCP_BUG("attempt to look up unsupported feature %u", feat);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_feat_nn_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_signal_nn_change  -  Update NN values for an established connection</div><div class='del'>- * @sk: DCCP socket of an established connection</div><div class='del'>- * @feat: NN feature number from %dccp_feature_numbers</div><div class='del'>- * @nn_val: the new value to use</div><div class='del'>- *</div><div class='del'>- * This function is used to communicate NN updates out-of-band.</div><div class='del'>- */</div><div class='del'>-int dccp_feat_signal_nn_change(struct sock *sk, u8 feat, u64 nn_val)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = &amp;dccp_sk(sk)-&gt;dccps_featneg;</div><div class='del'>-	dccp_feat_val fval = { .nn = nn_val };</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state != DCCP_OPEN &amp;&amp; sk-&gt;sk_state != DCCP_PARTOPEN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_type(feat) != FEAT_NN ||</div><div class='del'>-	    !dccp_feat_is_valid_nn_val(feat, nn_val))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (nn_val == dccp_feat_nn_get(sk, feat))</div><div class='del'>-		return 0;	/* already set or negotiation under way */</div><div class='del'>-</div><div class='del'>-	entry = dccp_feat_list_lookup(fn, feat, 1);</div><div class='del'>-	if (entry != NULL) {</div><div class='del'>-		dccp_pr_debug("Clobbering existing NN entry %llu -&gt; %llu\n",</div><div class='del'>-			      (unsigned long long)entry-&gt;val.nn,</div><div class='del'>-			      (unsigned long long)nn_val);</div><div class='del'>-		dccp_feat_list_pop(entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inet_csk_schedule_ack(sk);</div><div class='del'>-	return dccp_feat_push_change(fn, feat, 1, 0, &amp;fval);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_feat_signal_nn_change);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Tracking features whose value depend on the choice of CCID</div><div class='del'>- *</div><div class='del'>- * This is designed with an extension in mind so that a list walk could be done</div><div class='del'>- * before activating any features. However, the existing framework was found to</div><div class='del'>- * work satisfactorily up until now, the automatic verification is left open.</div><div class='del'>- * When adding new CCIDs, add a corresponding dependency table here.</div><div class='del'>- */</div><div class='del'>-static const struct ccid_dependency *dccp_feat_ccid_deps(u8 ccid, bool is_local)</div><div class='del'>-{</div><div class='del'>-	static const struct ccid_dependency ccid2_dependencies[2][2] = {</div><div class='del'>-		/*</div><div class='del'>-		 * CCID2 mandates Ack Vectors (RFC 4341, 4.): as CCID is a TX</div><div class='del'>-		 * feature and Send Ack Vector is an RX feature, `is_local'</div><div class='del'>-		 * needs to be reversed.</div><div class='del'>-		 */</div><div class='del'>-		{	/* Dependencies of the receiver-side (remote) CCID2 */</div><div class='del'>-			{</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_ACK_VECTOR,</div><div class='del'>-				.is_local	= true,</div><div class='del'>-				.is_mandatory	= true,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{ 0, 0, 0, 0 }</div><div class='del'>-		},</div><div class='del'>-		{	/* Dependencies of the sender-side (local) CCID2 */</div><div class='del'>-			{</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_ACK_VECTOR,</div><div class='del'>-				.is_local	= false,</div><div class='del'>-				.is_mandatory	= true,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{ 0, 0, 0, 0 }</div><div class='del'>-		}</div><div class='del'>-	};</div><div class='del'>-	static const struct ccid_dependency ccid3_dependencies[2][5] = {</div><div class='del'>-		{	/*</div><div class='del'>-			 * Dependencies of the receiver-side CCID3</div><div class='del'>-			 */</div><div class='del'>-			{	/* locally disable Ack Vectors */</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_ACK_VECTOR,</div><div class='del'>-				.is_local	= true,</div><div class='del'>-				.is_mandatory	= false,</div><div class='del'>-				.val		= 0</div><div class='del'>-			},</div><div class='del'>-			{	/* see below why Send Loss Event Rate is on */</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_LEV_RATE,</div><div class='del'>-				.is_local	= true,</div><div class='del'>-				.is_mandatory	= true,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{	/* NDP Count is needed as per RFC 4342, 6.1.1 */</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_NDP_COUNT,</div><div class='del'>-				.is_local	= false,</div><div class='del'>-				.is_mandatory	= true,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{ 0, 0, 0, 0 },</div><div class='del'>-		},</div><div class='del'>-		{	/*</div><div class='del'>-			 * CCID3 at the TX side: we request that the HC-receiver</div><div class='del'>-			 * will not send Ack Vectors (they will be ignored, so</div><div class='del'>-			 * Mandatory is not set); we enable Send Loss Event Rate</div><div class='del'>-			 * (Mandatory since the implementation does not support</div><div class='del'>-			 * the Loss Intervals option of RFC 4342, 8.6).</div><div class='del'>-			 * The last two options are for peer's information only.</div><div class='del'>-			*/</div><div class='del'>-			{</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_ACK_VECTOR,</div><div class='del'>-				.is_local	= false,</div><div class='del'>-				.is_mandatory	= false,</div><div class='del'>-				.val		= 0</div><div class='del'>-			},</div><div class='del'>-			{</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_LEV_RATE,</div><div class='del'>-				.is_local	= false,</div><div class='del'>-				.is_mandatory	= true,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{	/* this CCID does not support Ack Ratio */</div><div class='del'>-				.dependent_feat	= DCCPF_ACK_RATIO,</div><div class='del'>-				.is_local	= true,</div><div class='del'>-				.is_mandatory	= false,</div><div class='del'>-				.val		= 0</div><div class='del'>-			},</div><div class='del'>-			{	/* tell receiver we are sending NDP counts */</div><div class='del'>-				.dependent_feat	= DCCPF_SEND_NDP_COUNT,</div><div class='del'>-				.is_local	= true,</div><div class='del'>-				.is_mandatory	= false,</div><div class='del'>-				.val		= 1</div><div class='del'>-			},</div><div class='del'>-			{ 0, 0, 0, 0 }</div><div class='del'>-		}</div><div class='del'>-	};</div><div class='del'>-	switch (ccid) {</div><div class='del'>-	case DCCPC_CCID2:</div><div class='del'>-		return ccid2_dependencies[is_local];</div><div class='del'>-	case DCCPC_CCID3:</div><div class='del'>-		return ccid3_dependencies[is_local];</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_propagate_ccid - Resolve dependencies of features on choice of CCID</div><div class='del'>- * @fn: feature-negotiation list to update</div><div class='del'>- * @id: CCID number to track</div><div class='del'>- * @is_local: whether TX CCID (1) or RX CCID (0) is meant</div><div class='del'>- *</div><div class='del'>- * This function needs to be called after registering all other features.</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_propagate_ccid(struct list_head *fn, u8 id, bool is_local)</div><div class='del'>-{</div><div class='del'>-	const struct ccid_dependency *table = dccp_feat_ccid_deps(id, is_local);</div><div class='del'>-	int i, rc = (table == NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; rc == 0 &amp;&amp; table[i].dependent_feat != DCCPF_RESERVED; i++)</div><div class='del'>-		if (dccp_feat_type(table[i].dependent_feat) == FEAT_SP)</div><div class='del'>-			rc = __feat_register_sp(fn, table[i].dependent_feat,</div><div class='del'>-						    table[i].is_local,</div><div class='del'>-						    table[i].is_mandatory,</div><div class='del'>-						    &amp;table[i].val, 1);</div><div class='del'>-		else</div><div class='del'>-			rc = __feat_register_nn(fn, table[i].dependent_feat,</div><div class='del'>-						    table[i].is_mandatory,</div><div class='del'>-						    table[i].val);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_finalise_settings  -  Finalise settings before starting negotiation</div><div class='del'>- * @dp: client or listening socket (settings will be inherited)</div><div class='del'>- *</div><div class='del'>- * This is called after all registrations (socket initialisation, sysctls, and</div><div class='del'>- * sockopt calls), and before sending the first packet containing Change options</div><div class='del'>- * (ie. client-Request or server-Response), to ensure internal consistency.</div><div class='del'>- */</div><div class='del'>-int dccp_feat_finalise_settings(struct dccp_sock *dp)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = &amp;dp-&gt;dccps_featneg;</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-	int i = 2, ccids[2] = { -1, -1 };</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Propagating CCIDs:</div><div class='del'>-	 * 1) not useful to propagate CCID settings if this host advertises more</div><div class='del'>-	 *    than one CCID: the choice of CCID  may still change - if this is</div><div class='del'>-	 *    the client, or if this is the server and the client sends</div><div class='del'>-	 *    singleton CCID values.</div><div class='del'>-	 * 2) since is that propagate_ccid changes the list, we defer changing</div><div class='del'>-	 *    the sorted list until after the traversal.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(entry, fn, node)</div><div class='del'>-		if (entry-&gt;feat_num == DCCPF_CCID &amp;&amp; entry-&gt;val.sp.len == 1)</div><div class='del'>-			ccids[entry-&gt;is_local] = entry-&gt;val.sp.vec[0];</div><div class='del'>-	while (i--)</div><div class='del'>-		if (ccids[i] &gt; 0 &amp;&amp; dccp_feat_propagate_ccid(fn, ccids[i], i))</div><div class='del'>-			return -1;</div><div class='del'>-	dccp_feat_print_fnlist(fn);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_server_ccid_dependencies  -  Resolve CCID-dependent features</div><div class='del'>- * It is the server which resolves the dependencies once the CCID has been</div><div class='del'>- * fully negotiated. If no CCID has been negotiated, it uses the default CCID.</div><div class='del'>- */</div><div class='del'>-int dccp_feat_server_ccid_dependencies(struct dccp_request_sock *dreq)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = &amp;dreq-&gt;dreq_featneg;</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-	u8 is_local, ccid;</div><div class='del'>-</div><div class='del'>-	for (is_local = 0; is_local &lt;= 1; is_local++) {</div><div class='del'>-		entry = dccp_feat_list_lookup(fn, DCCPF_CCID, is_local);</div><div class='del'>-</div><div class='del'>-		if (entry != NULL &amp;&amp; !entry-&gt;empty_confirm)</div><div class='del'>-			ccid = entry-&gt;val.sp.vec[0];</div><div class='del'>-		else</div><div class='del'>-			ccid = dccp_feat_default_value(DCCPF_CCID);</div><div class='del'>-</div><div class='del'>-		if (dccp_feat_propagate_ccid(fn, ccid, is_local))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Select the first entry in @servlist that also occurs in @clilist (6.3.1) */</div><div class='del'>-static int dccp_feat_preflist_match(u8 *servlist, u8 slen, u8 *clilist, u8 clen)</div><div class='del'>-{</div><div class='del'>-	u8 c, s;</div><div class='del'>-</div><div class='del'>-	for (s = 0; s &lt; slen; s++)</div><div class='del'>-		for (c = 0; c &lt; clen; c++)</div><div class='del'>-			if (servlist[s] == clilist[c])</div><div class='del'>-				return servlist[s];</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_prefer  -  Move preferred entry to the start of array</div><div class='del'>- * Reorder the @array_len elements in @array so that @preferred_value comes</div><div class='del'>- * first. Returns &gt;0 to indicate that @preferred_value does occur in @array.</div><div class='del'>- */</div><div class='del'>-static u8 dccp_feat_prefer(u8 preferred_value, u8 *array, u8 array_len)</div><div class='del'>-{</div><div class='del'>-	u8 i, does_occur = 0;</div><div class='del'>-</div><div class='del'>-	if (array != NULL) {</div><div class='del'>-		for (i = 0; i &lt; array_len; i++)</div><div class='del'>-			if (array[i] == preferred_value) {</div><div class='del'>-				array[i] = array[0];</div><div class='del'>-				does_occur++;</div><div class='del'>-			}</div><div class='del'>-		if (does_occur)</div><div class='del'>-			array[0] = preferred_value;</div><div class='del'>-	}</div><div class='del'>-	return does_occur;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_reconcile  -  Reconcile SP preference lists</div><div class='del'>- *  @fv: SP list to reconcile into</div><div class='del'>- *  @arr: received SP preference list</div><div class='del'>- *  @len: length of @arr in bytes</div><div class='del'>- *  @is_server: whether this side is the server (and @fv is the server's list)</div><div class='del'>- *  @reorder: whether to reorder the list in @fv after reconciling with @arr</div><div class='del'>- * When successful, &gt; 0 is returned and the reconciled list is in @fval.</div><div class='del'>- * A value of 0 means that negotiation failed (no shared entry).</div><div class='del'>- */</div><div class='del'>-static int dccp_feat_reconcile(dccp_feat_val *fv, u8 *arr, u8 len,</div><div class='del'>-			       bool is_server, bool reorder)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (!fv-&gt;sp.vec || !arr) {</div><div class='del'>-		DCCP_CRIT("NULL feature value or array");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_server)</div><div class='del'>-		rc = dccp_feat_preflist_match(fv-&gt;sp.vec, fv-&gt;sp.len, arr, len);</div><div class='del'>-	else</div><div class='del'>-		rc = dccp_feat_preflist_match(arr, len, fv-&gt;sp.vec, fv-&gt;sp.len);</div><div class='del'>-</div><div class='del'>-	if (!reorder)</div><div class='del'>-		return rc;</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reorder list: used for activating features and in dccp_insert_fn_opt.</div><div class='del'>-	 */</div><div class='del'>-	return dccp_feat_prefer(rc, fv-&gt;sp.vec, fv-&gt;sp.len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_change_recv  -  Process incoming ChangeL/R options</div><div class='del'>- * @fn: feature-negotiation list to update</div><div class='del'>- * @is_mandatory: whether the Change was preceded by a Mandatory option</div><div class='del'>- * @opt: %DCCPO_CHANGE_L or %DCCPO_CHANGE_R</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @val: NN value or SP value/preference list</div><div class='del'>- * @len: length of @val in bytes</div><div class='del'>- * @server: whether this node is the server (1) or the client (0)</div><div class='del'>- */</div><div class='del'>-static u8 dccp_feat_change_recv(struct list_head *fn, u8 is_mandatory, u8 opt,</div><div class='del'>-				u8 feat, u8 *val, u8 len, const bool server)</div><div class='del'>-{</div><div class='del'>-	u8 defval, type = dccp_feat_type(feat);</div><div class='del'>-	const bool local = (opt == DCCPO_CHANGE_R);</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-	dccp_feat_val fval;</div><div class='del'>-</div><div class='del'>-	if (len == 0 || type == FEAT_UNKNOWN)		/* 6.1 and 6.6.8 */</div><div class='del'>-		goto unknown_feature_or_value;</div><div class='del'>-</div><div class='del'>-	dccp_feat_print_opt(opt, feat, val, len, is_mandatory);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Negotiation of NN features: Change R is invalid, so there is no</div><div class='del'>-	 *	simultaneous negotiation; hence we do not look up in the list.</div><div class='del'>-	 */</div><div class='del'>-	if (type == FEAT_NN) {</div><div class='del'>-		if (local || len &gt; sizeof(fval.nn))</div><div class='del'>-			goto unknown_feature_or_value;</div><div class='del'>-</div><div class='del'>-		/* 6.3.2: "The feature remote MUST accept any valid value..." */</div><div class='del'>-		fval.nn = dccp_decode_value_var(val, len);</div><div class='del'>-		if (!dccp_feat_is_valid_nn_val(feat, fval.nn))</div><div class='del'>-			goto unknown_feature_or_value;</div><div class='del'>-</div><div class='del'>-		return dccp_feat_push_confirm(fn, feat, local, &amp;fval);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Unidirectional/simultaneous negotiation of SP features (6.3.1)</div><div class='del'>-	 */</div><div class='del'>-	entry = dccp_feat_list_lookup(fn, feat, local);</div><div class='del'>-	if (entry == NULL) {</div><div class='del'>-		/*</div><div class='del'>-		 * No particular preferences have been registered. We deal with</div><div class='del'>-		 * this situation by assuming that all valid values are equally</div><div class='del'>-		 * acceptable, and apply the following checks:</div><div class='del'>-		 * - if the peer's list is a singleton, we accept a valid value;</div><div class='del'>-		 * - if we are the server, we first try to see if the peer (the</div><div class='del'>-		 *   client) advertises the default value. If yes, we use it,</div><div class='del'>-		 *   otherwise we accept the preferred value;</div><div class='del'>-		 * - else if we are the client, we use the first list element.</div><div class='del'>-		 */</div><div class='del'>-		if (dccp_feat_clone_sp_val(&amp;fval, val, 1))</div><div class='del'>-			return DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-</div><div class='del'>-		if (len &gt; 1 &amp;&amp; server) {</div><div class='del'>-			defval = dccp_feat_default_value(feat);</div><div class='del'>-			if (dccp_feat_preflist_match(&amp;defval, 1, val, len) &gt; -1)</div><div class='del'>-				fval.sp.vec[0] = defval;</div><div class='del'>-		} else if (!dccp_feat_is_valid_sp_val(feat, fval.sp.vec[0])) {</div><div class='del'>-			kfree(fval.sp.vec);</div><div class='del'>-			goto unknown_feature_or_value;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Treat unsupported CCIDs like invalid values */</div><div class='del'>-		if (feat == DCCPF_CCID &amp;&amp; !ccid_support_check(fval.sp.vec, 1)) {</div><div class='del'>-			kfree(fval.sp.vec);</div><div class='del'>-			goto not_valid_or_not_known;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return dccp_feat_push_confirm(fn, feat, local, &amp;fval);</div><div class='del'>-</div><div class='del'>-	} else if (entry-&gt;state == FEAT_UNSTABLE) {	/* 6.6.2 */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_reconcile(&amp;entry-&gt;val, val, len, server, true)) {</div><div class='del'>-		entry-&gt;empty_confirm = false;</div><div class='del'>-	} else if (is_mandatory) {</div><div class='del'>-		return DCCP_RESET_CODE_MANDATORY_ERROR;</div><div class='del'>-	} else if (entry-&gt;state == FEAT_INITIALISING) {</div><div class='del'>-		/*</div><div class='del'>-		 * Failed simultaneous negotiation (server only): try to `save'</div><div class='del'>-		 * the connection by checking whether entry contains the default</div><div class='del'>-		 * value for @feat. If yes, send an empty Confirm to signal that</div><div class='del'>-		 * the received Change was not understood - which implies using</div><div class='del'>-		 * the default value.</div><div class='del'>-		 * If this also fails, we use Reset as the last resort.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(!server);</div><div class='del'>-		defval = dccp_feat_default_value(feat);</div><div class='del'>-		if (!dccp_feat_reconcile(&amp;entry-&gt;val, &amp;defval, 1, server, true))</div><div class='del'>-			return DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-		entry-&gt;empty_confirm = true;</div><div class='del'>-	}</div><div class='del'>-	entry-&gt;needs_confirm   = true;</div><div class='del'>-	entry-&gt;needs_mandatory = false;</div><div class='del'>-	entry-&gt;state	       = FEAT_STABLE;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unknown_feature_or_value:</div><div class='del'>-	if (!is_mandatory)</div><div class='del'>-		return dccp_push_empty_confirm(fn, feat, local);</div><div class='del'>-</div><div class='del'>-not_valid_or_not_known:</div><div class='del'>-	return is_mandatory ? DCCP_RESET_CODE_MANDATORY_ERROR</div><div class='del'>-			    : DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_confirm_recv  -  Process received Confirm options</div><div class='del'>- * @fn: feature-negotiation list to update</div><div class='del'>- * @is_mandatory: whether @opt was preceded by a Mandatory option</div><div class='del'>- * @opt: %DCCPO_CONFIRM_L or %DCCPO_CONFIRM_R</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @val: NN value or SP value/preference list</div><div class='del'>- * @len: length of @val in bytes</div><div class='del'>- * @server: whether this node is server (1) or client (0)</div><div class='del'>- */</div><div class='del'>-static u8 dccp_feat_confirm_recv(struct list_head *fn, u8 is_mandatory, u8 opt,</div><div class='del'>-				 u8 feat, u8 *val, u8 len, const bool server)</div><div class='del'>-{</div><div class='del'>-	u8 *plist, plen, type = dccp_feat_type(feat);</div><div class='del'>-	const bool local = (opt == DCCPO_CONFIRM_R);</div><div class='del'>-	struct dccp_feat_entry *entry = dccp_feat_list_lookup(fn, feat, local);</div><div class='del'>-</div><div class='del'>-	dccp_feat_print_opt(opt, feat, val, len, is_mandatory);</div><div class='del'>-</div><div class='del'>-	if (entry == NULL) {	/* nothing queued: ignore or handle error */</div><div class='del'>-		if (is_mandatory &amp;&amp; type == FEAT_UNKNOWN)</div><div class='del'>-			return DCCP_RESET_CODE_MANDATORY_ERROR;</div><div class='del'>-</div><div class='del'>-		if (!local &amp;&amp; type == FEAT_NN)		/* 6.3.2 */</div><div class='del'>-			goto confirmation_failed;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;state != FEAT_CHANGING)		/* 6.6.2 */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (len == 0) {</div><div class='del'>-		if (dccp_feat_must_be_understood(feat))	/* 6.6.7 */</div><div class='del'>-			goto confirmation_failed;</div><div class='del'>-		/*</div><div class='del'>-		 * Empty Confirm during connection setup: this means reverting</div><div class='del'>-		 * to the `old' value, which in this case is the default. Since</div><div class='del'>-		 * we handle default values automatically when no other values</div><div class='del'>-		 * have been set, we revert to the old value by removing this</div><div class='del'>-		 * entry from the list.</div><div class='del'>-		 */</div><div class='del'>-		dccp_feat_list_pop(entry);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type == FEAT_NN) {</div><div class='del'>-		if (len &gt; sizeof(entry-&gt;val.nn))</div><div class='del'>-			goto confirmation_failed;</div><div class='del'>-</div><div class='del'>-		if (entry-&gt;val.nn == dccp_decode_value_var(val, len))</div><div class='del'>-			goto confirmation_succeeded;</div><div class='del'>-</div><div class='del'>-		DCCP_WARN("Bogus Confirm for non-existing value\n");</div><div class='del'>-		goto confirmation_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Parsing SP Confirms: the first element of @val is the preferred</div><div class='del'>-	 * SP value which the peer confirms, the remainder depends on @len.</div><div class='del'>-	 * Note that only the confirmed value need to be a valid SP value.</div><div class='del'>-	 */</div><div class='del'>-	if (!dccp_feat_is_valid_sp_val(feat, *val))</div><div class='del'>-		goto confirmation_failed;</div><div class='del'>-</div><div class='del'>-	if (len == 1) {		/* peer didn't supply a preference list */</div><div class='del'>-		plist = val;</div><div class='del'>-		plen  = len;</div><div class='del'>-	} else {		/* preferred value + preference list */</div><div class='del'>-		plist = val + 1;</div><div class='del'>-		plen  = len - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check whether the peer got the reconciliation right (6.6.8) */</div><div class='del'>-	if (dccp_feat_reconcile(&amp;entry-&gt;val, plist, plen, server, 0) != *val) {</div><div class='del'>-		DCCP_WARN("Confirm selected the wrong value %u\n", *val);</div><div class='del'>-		return DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-	}</div><div class='del'>-	entry-&gt;val.sp.vec[0] = *val;</div><div class='del'>-</div><div class='del'>-confirmation_succeeded:</div><div class='del'>-	entry-&gt;state = FEAT_STABLE;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-confirmation_failed:</div><div class='del'>-	DCCP_WARN("Confirmation failed\n");</div><div class='del'>-	return is_mandatory ? DCCP_RESET_CODE_MANDATORY_ERROR</div><div class='del'>-			    : DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_handle_nn_established  -  Fast-path reception of NN options</div><div class='del'>- * @sk:		socket of an established DCCP connection</div><div class='del'>- * @mandatory:	whether @opt was preceded by a Mandatory option</div><div class='del'>- * @opt:	%DCCPO_CHANGE_L | %DCCPO_CONFIRM_R (NN only)</div><div class='del'>- * @feat:	NN number, one of %dccp_feature_numbers</div><div class='del'>- * @val:	NN value</div><div class='del'>- * @len:	length of @val in bytes</div><div class='del'>- *</div><div class='del'>- * This function combines the functionality of change_recv/confirm_recv, with</div><div class='del'>- * the following differences (reset codes are the same):</div><div class='del'>- *    - cleanup after receiving the Confirm;</div><div class='del'>- *    - values are directly activated after successful parsing;</div><div class='del'>- *    - deliberately restricted to NN features.</div><div class='del'>- * The restriction to NN features is essential since SP features can have non-</div><div class='del'>- * predictable outcomes (depending on the remote configuration), and are inter-</div><div class='del'>- * dependent (CCIDs for instance cause further dependencies).</div><div class='del'>- */</div><div class='del'>-static u8 dccp_feat_handle_nn_established(struct sock *sk, u8 mandatory, u8 opt,</div><div class='del'>-					  u8 feat, u8 *val, u8 len)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = &amp;dccp_sk(sk)-&gt;dccps_featneg;</div><div class='del'>-	const bool local = (opt == DCCPO_CONFIRM_R);</div><div class='del'>-	struct dccp_feat_entry *entry;</div><div class='del'>-	u8 type = dccp_feat_type(feat);</div><div class='del'>-	dccp_feat_val fval;</div><div class='del'>-</div><div class='del'>-	dccp_feat_print_opt(opt, feat, val, len, mandatory);</div><div class='del'>-</div><div class='del'>-	/* Ignore non-mandatory unknown and non-NN features */</div><div class='del'>-	if (type == FEAT_UNKNOWN) {</div><div class='del'>-		if (local &amp;&amp; !mandatory)</div><div class='del'>-			return 0;</div><div class='del'>-		goto fast_path_unknown;</div><div class='del'>-	} else if (type != FEAT_NN) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't accept empty Confirms, since in fast-path feature</div><div class='del'>-	 * negotiation the values are enabled immediately after sending</div><div class='del'>-	 * the Change option.</div><div class='del'>-	 * Empty Changes on the other hand are invalid (RFC 4340, 6.1).</div><div class='del'>-	 */</div><div class='del'>-	if (len == 0 || len &gt; sizeof(fval.nn))</div><div class='del'>-		goto fast_path_unknown;</div><div class='del'>-</div><div class='del'>-	if (opt == DCCPO_CHANGE_L) {</div><div class='del'>-		fval.nn = dccp_decode_value_var(val, len);</div><div class='del'>-		if (!dccp_feat_is_valid_nn_val(feat, fval.nn))</div><div class='del'>-			goto fast_path_unknown;</div><div class='del'>-</div><div class='del'>-		if (dccp_feat_push_confirm(fn, feat, local, &amp;fval) ||</div><div class='del'>-		    dccp_feat_activate(sk, feat, local, &amp;fval))</div><div class='del'>-			return DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-</div><div class='del'>-		/* set the `Ack Pending' flag to piggyback a Confirm */</div><div class='del'>-		inet_csk_schedule_ack(sk);</div><div class='del'>-</div><div class='del'>-	} else if (opt == DCCPO_CONFIRM_R) {</div><div class='del'>-		entry = dccp_feat_list_lookup(fn, feat, local);</div><div class='del'>-		if (entry == NULL || entry-&gt;state != FEAT_CHANGING)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		fval.nn = dccp_decode_value_var(val, len);</div><div class='del'>-		/*</div><div class='del'>-		 * Just ignore a value that doesn't match our current value.</div><div class='del'>-		 * If the option changes twice within two RTTs, then at least</div><div class='del'>-		 * one CONFIRM will be received for the old value after a</div><div class='del'>-		 * new CHANGE was sent.</div><div class='del'>-		 */</div><div class='del'>-		if (fval.nn != entry-&gt;val.nn)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		/* Only activate after receiving the Confirm option (6.6.1). */</div><div class='del'>-		dccp_feat_activate(sk, feat, local, &amp;fval);</div><div class='del'>-</div><div class='del'>-		/* It has been confirmed - so remove the entry */</div><div class='del'>-		dccp_feat_list_pop(entry);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		DCCP_WARN("Received illegal option %u\n", opt);</div><div class='del'>-		goto fast_path_failed;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fast_path_unknown:</div><div class='del'>-	if (!mandatory)</div><div class='del'>-		return dccp_push_empty_confirm(fn, feat, local);</div><div class='del'>-</div><div class='del'>-fast_path_failed:</div><div class='del'>-	return mandatory ? DCCP_RESET_CODE_MANDATORY_ERROR</div><div class='del'>-			 : DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_parse_options  -  Process Feature-Negotiation Options</div><div class='del'>- * @sk: for general use and used by the client during connection setup</div><div class='del'>- * @dreq: used by the server during connection setup</div><div class='del'>- * @mandatory: whether @opt was preceded by a Mandatory option</div><div class='del'>- * @opt: %DCCPO_CHANGE_L | %DCCPO_CHANGE_R | %DCCPO_CONFIRM_L | %DCCPO_CONFIRM_R</div><div class='del'>- * @feat: one of %dccp_feature_numbers</div><div class='del'>- * @val: value contents of @opt</div><div class='del'>- * @len: length of @val in bytes</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, a Reset code for ending the connection otherwise.</div><div class='del'>- */</div><div class='del'>-int dccp_feat_parse_options(struct sock *sk, struct dccp_request_sock *dreq,</div><div class='del'>-			    u8 mandatory, u8 opt, u8 feat, u8 *val, u8 len)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct list_head *fn = dreq ? &amp;dreq-&gt;dreq_featneg : &amp;dp-&gt;dccps_featneg;</div><div class='del'>-	bool server = false;</div><div class='del'>-</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	/*</div><div class='del'>-	 *	Negotiation during connection setup</div><div class='del'>-	 */</div><div class='del'>-	case DCCP_LISTEN:</div><div class='del'>-		server = true;			/* fall through */</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-		switch (opt) {</div><div class='del'>-		case DCCPO_CHANGE_L:</div><div class='del'>-		case DCCPO_CHANGE_R:</div><div class='del'>-			return dccp_feat_change_recv(fn, mandatory, opt, feat,</div><div class='del'>-						     val, len, server);</div><div class='del'>-		case DCCPO_CONFIRM_R:</div><div class='del'>-		case DCCPO_CONFIRM_L:</div><div class='del'>-			return dccp_feat_confirm_recv(fn, mandatory, opt, feat,</div><div class='del'>-						      val, len, server);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	/*</div><div class='del'>-	 *	Support for exchanging NN options on an established connection.</div><div class='del'>-	 */</div><div class='del'>-	case DCCP_OPEN:</div><div class='del'>-	case DCCP_PARTOPEN:</div><div class='del'>-		return dccp_feat_handle_nn_established(sk, mandatory, opt, feat,</div><div class='del'>-						       val, len);</div><div class='del'>-	}</div><div class='del'>-	return 0;	/* ignore FN options in all other states */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_init  -  Seed feature negotiation with host-specific defaults</div><div class='del'>- * This initialises global defaults, depending on the value of the sysctls.</div><div class='del'>- * These can later be overridden by registering changes via setsockopt calls.</div><div class='del'>- * The last link in the chain is finalise_settings, to make sure that between</div><div class='del'>- * here and the start of actual feature negotiation no inconsistencies enter.</div><div class='del'>- *</div><div class='del'>- * All features not appearing below use either defaults or are otherwise</div><div class='del'>- * later adjusted through dccp_feat_finalise_settings().</div><div class='del'>- */</div><div class='del'>-int dccp_feat_init(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct list_head *fn = &amp;dccp_sk(sk)-&gt;dccps_featneg;</div><div class='del'>-	u8 on = 1, off = 0;</div><div class='del'>-	int rc;</div><div class='del'>-	struct {</div><div class='del'>-		u8 *val;</div><div class='del'>-		u8 len;</div><div class='del'>-	} tx, rx;</div><div class='del'>-</div><div class='del'>-	/* Non-negotiable (NN) features */</div><div class='del'>-	rc = __feat_register_nn(fn, DCCPF_SEQUENCE_WINDOW, 0,</div><div class='del'>-				    sysctl_dccp_sequence_window);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* Server-priority (SP) features */</div><div class='del'>-</div><div class='del'>-	/* Advertise that short seqnos are not supported (7.6.1) */</div><div class='del'>-	rc = __feat_register_sp(fn, DCCPF_SHORT_SEQNOS, true, true, &amp;off, 1);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* RFC 4340 12.1: "If a DCCP is not ECN capable, ..." */</div><div class='del'>-	rc = __feat_register_sp(fn, DCCPF_ECN_INCAPABLE, true, true, &amp;on, 1);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We advertise the available list of CCIDs and reorder according to</div><div class='del'>-	 * preferences, to avoid failure resulting from negotiating different</div><div class='del'>-	 * singleton values (which always leads to failure).</div><div class='del'>-	 * These settings can still (later) be overridden via sockopts.</div><div class='del'>-	 */</div><div class='del'>-	if (ccid_get_builtin_ccids(&amp;tx.val, &amp;tx.len))</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	if (ccid_get_builtin_ccids(&amp;rx.val, &amp;rx.len)) {</div><div class='del'>-		kfree(tx.val);</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!dccp_feat_prefer(sysctl_dccp_tx_ccid, tx.val, tx.len) ||</div><div class='del'>-	    !dccp_feat_prefer(sysctl_dccp_rx_ccid, rx.val, rx.len))</div><div class='del'>-		goto free_ccid_lists;</div><div class='del'>-</div><div class='del'>-	rc = __feat_register_sp(fn, DCCPF_CCID, true, false, tx.val, tx.len);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto free_ccid_lists;</div><div class='del'>-</div><div class='del'>-	rc = __feat_register_sp(fn, DCCPF_CCID, false, false, rx.val, rx.len);</div><div class='del'>-</div><div class='del'>-free_ccid_lists:</div><div class='del'>-	kfree(tx.val);</div><div class='del'>-	kfree(rx.val);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_feat_activate_values(struct sock *sk, struct list_head *fn_list)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct dccp_feat_entry *cur, *next;</div><div class='del'>-	int idx;</div><div class='del'>-	dccp_feat_val *fvals[DCCP_FEAT_SUPPORTED_MAX][2] = {</div><div class='del'>-		 [0 ... DCCP_FEAT_SUPPORTED_MAX-1] = { NULL, NULL }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(cur, fn_list, node) {</div><div class='del'>-		/*</div><div class='del'>-		 * An empty Confirm means that either an unknown feature type</div><div class='del'>-		 * or an invalid value was present. In the first case there is</div><div class='del'>-		 * nothing to activate, in the other the default value is used.</div><div class='del'>-		 */</div><div class='del'>-		if (cur-&gt;empty_confirm)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		idx = dccp_feat_index(cur-&gt;feat_num);</div><div class='del'>-		if (idx &lt; 0) {</div><div class='del'>-			DCCP_BUG("Unknown feature %u", cur-&gt;feat_num);</div><div class='del'>-			goto activation_failed;</div><div class='del'>-		}</div><div class='del'>-		if (cur-&gt;state != FEAT_STABLE) {</div><div class='del'>-			DCCP_CRIT("Negotiation of %s %s failed in state %s",</div><div class='del'>-				  cur-&gt;is_local ? "local" : "remote",</div><div class='del'>-				  dccp_feat_fname(cur-&gt;feat_num),</div><div class='del'>-				  dccp_feat_sname[cur-&gt;state]);</div><div class='del'>-			goto activation_failed;</div><div class='del'>-		}</div><div class='del'>-		fvals[idx][cur-&gt;is_local] = &amp;cur-&gt;val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Activate in decreasing order of index, so that the CCIDs are always</div><div class='del'>-	 * activated as the last feature. This avoids the case where a CCID</div><div class='del'>-	 * relies on the initialisation of one or more features that it depends</div><div class='del'>-	 * on (e.g. Send NDP Count, Send Ack Vector, and Ack Ratio features).</div><div class='del'>-	 */</div><div class='del'>-	for (idx = DCCP_FEAT_SUPPORTED_MAX; --idx &gt;= 0;)</div><div class='del'>-		if (__dccp_feat_activate(sk, idx, 0, fvals[idx][0]) ||</div><div class='del'>-		    __dccp_feat_activate(sk, idx, 1, fvals[idx][1])) {</div><div class='del'>-			DCCP_CRIT("Could not activate %d", idx);</div><div class='del'>-			goto activation_failed;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* Clean up Change options which have been confirmed already */</div><div class='del'>-	list_for_each_entry_safe(cur, next, fn_list, node)</div><div class='del'>-		if (!cur-&gt;needs_confirm)</div><div class='del'>-			dccp_feat_list_pop(cur);</div><div class='del'>-</div><div class='del'>-	dccp_pr_debug("Activation OK\n");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-activation_failed:</div><div class='del'>-	/*</div><div class='del'>-	 * We clean up everything that may have been allocated, since</div><div class='del'>-	 * it is difficult to track at which stage negotiation failed.</div><div class='del'>-	 * This is ok, since all allocation functions below are robust</div><div class='del'>-	 * against NULL arguments.</div><div class='del'>-	 */</div><div class='del'>-	ccid_hc_rx_delete(dp-&gt;dccps_hc_rx_ccid, sk);</div><div class='del'>-	ccid_hc_tx_delete(dp-&gt;dccps_hc_tx_ccid, sk);</div><div class='del'>-	dp-&gt;dccps_hc_rx_ccid = dp-&gt;dccps_hc_tx_ccid = NULL;</div><div class='del'>-	dccp_ackvec_free(dp-&gt;dccps_hc_rx_ackvec);</div><div class='del'>-	dp-&gt;dccps_hc_rx_ackvec = NULL;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/feat.h b/net/dccp/feat.h<br/>deleted file mode 100644<br/>index 0e75cebb2187..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/feat.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/feat.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,137 +0,0 @@</div><div class='del'>-#ifndef _DCCP_FEAT_H</div><div class='del'>-#define _DCCP_FEAT_H</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/feat.h</div><div class='del'>- *</div><div class='del'>- *  Feature negotiation for the DCCP protocol (RFC 4340, section 6)</div><div class='del'>- *  Copyright (c) 2008 Gerrit Renker &lt;gerrit@erg.abdn.ac.uk&gt;</div><div class='del'>- *  Copyright (c) 2005 Andrea Bittau &lt;a.bittau@cs.ucl.ac.uk&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License version 2 as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Known limit values</div><div class='del'>- */</div><div class='del'>-/* Ack Ratio takes 2-byte integer values (11.3) */</div><div class='del'>-#define DCCPF_ACK_RATIO_MAX	0xFFFF</div><div class='del'>-/* Wmin=32 and Wmax=2^46-1 from 7.5.2 */</div><div class='del'>-#define DCCPF_SEQ_WMIN		32</div><div class='del'>-#define DCCPF_SEQ_WMAX		0x3FFFFFFFFFFFull</div><div class='del'>-/* Maximum number of SP values that fit in a single (Confirm) option */</div><div class='del'>-#define DCCP_FEAT_MAX_SP_VALS	(DCCP_SINGLE_OPT_MAXLEN - 2)</div><div class='del'>-</div><div class='del'>-enum dccp_feat_type {</div><div class='del'>-	FEAT_AT_RX   = 1,	/* located at RX side of half-connection  */</div><div class='del'>-	FEAT_AT_TX   = 2,	/* located at TX side of half-connection  */</div><div class='del'>-	FEAT_SP      = 4,	/* server-priority reconciliation (6.3.1) */</div><div class='del'>-	FEAT_NN	     = 8,	/* non-negotiable reconciliation (6.3.2)  */</div><div class='del'>-	FEAT_UNKNOWN = 0xFF	/* not understood or invalid feature	  */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dccp_feat_state {</div><div class='del'>-	FEAT_DEFAULT = 0,	/* using default values from 6.4 */</div><div class='del'>-	FEAT_INITIALISING,	/* feature is being initialised  */</div><div class='del'>-	FEAT_CHANGING,		/* Change sent but not confirmed yet */</div><div class='del'>-	FEAT_UNSTABLE,		/* local modification in state CHANGING */</div><div class='del'>-	FEAT_STABLE		/* both ends (think they) agree */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_feat_val  -  Container for SP or NN feature values</div><div class='del'>- * @nn:     single NN value</div><div class='del'>- * @sp.vec: single SP value plus optional preference list</div><div class='del'>- * @sp.len: length of @sp.vec in bytes</div><div class='del'>- */</div><div class='del'>-typedef union {</div><div class='del'>-	u64 nn;</div><div class='del'>-	struct {</div><div class='del'>-		u8	*vec;</div><div class='del'>-		u8	len;</div><div class='del'>-	}   sp;</div><div class='del'>-} dccp_feat_val;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct feat_entry  -  Data structure to perform feature negotiation</div><div class='del'>- * @val: feature's current value (SP features may have preference list)</div><div class='del'>- * @state: feature's current state</div><div class='del'>- * @feat_num: one of %dccp_feature_numbers</div><div class='del'>- * @needs_mandatory: whether Mandatory options should be sent</div><div class='del'>- * @needs_confirm: whether to send a Confirm instead of a Change</div><div class='del'>- * @empty_confirm: whether to send an empty Confirm (depends on @needs_confirm)</div><div class='del'>- * @is_local: feature location (1) or feature-remote (0)</div><div class='del'>- * @node: list pointers, entries arranged in FIFO order</div><div class='del'>- */</div><div class='del'>-struct dccp_feat_entry {</div><div class='del'>-	dccp_feat_val           val;</div><div class='del'>-	enum dccp_feat_state    state:8;</div><div class='del'>-	u8                      feat_num;</div><div class='del'>-</div><div class='del'>-	bool			needs_mandatory,</div><div class='del'>-				needs_confirm,</div><div class='del'>-				empty_confirm,</div><div class='del'>-				is_local;</div><div class='del'>-</div><div class='del'>-	struct list_head	node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u8 dccp_feat_genopt(struct dccp_feat_entry *entry)</div><div class='del'>-{</div><div class='del'>-	if (entry-&gt;needs_confirm)</div><div class='del'>-		return entry-&gt;is_local ? DCCPO_CONFIRM_L : DCCPO_CONFIRM_R;</div><div class='del'>-	return entry-&gt;is_local ? DCCPO_CHANGE_L : DCCPO_CHANGE_R;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ccid_dependency  -  Track changes resulting from choosing a CCID</div><div class='del'>- * @dependent_feat: one of %dccp_feature_numbers</div><div class='del'>- * @is_local: local (1) or remote (0) @dependent_feat</div><div class='del'>- * @is_mandatory: whether presence of @dependent_feat is mission-critical or not</div><div class='del'>- * @val: corresponding default value for @dependent_feat (u8 is sufficient here)</div><div class='del'>- */</div><div class='del'>-struct ccid_dependency {</div><div class='del'>-	u8	dependent_feat;</div><div class='del'>-	bool	is_local:1,</div><div class='del'>-		is_mandatory:1;</div><div class='del'>-	u8	val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sysctls to seed defaults for feature negotiation</div><div class='del'>- */</div><div class='del'>-extern unsigned long sysctl_dccp_sequence_window;</div><div class='del'>-extern int	     sysctl_dccp_rx_ccid;</div><div class='del'>-extern int	     sysctl_dccp_tx_ccid;</div><div class='del'>-</div><div class='del'>-int dccp_feat_init(struct sock *sk);</div><div class='del'>-void dccp_feat_initialise_sysctls(void);</div><div class='del'>-int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,</div><div class='del'>-			  u8 const *list, u8 len);</div><div class='del'>-int dccp_feat_parse_options(struct sock *, struct dccp_request_sock *,</div><div class='del'>-			    u8 mand, u8 opt, u8 feat, u8 *val, u8 len);</div><div class='del'>-int dccp_feat_clone_list(struct list_head const *, struct list_head *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Encoding variable-length options and their maximum length.</div><div class='del'>- *</div><div class='del'>- * This affects NN options (SP options are all u8) and other variable-length</div><div class='del'>- * options (see table 3 in RFC 4340). The limit is currently given the Sequence</div><div class='del'>- * Window NN value (sec. 7.5.2) and the NDP count (sec. 7.7) option, all other</div><div class='del'>- * options consume less than 6 bytes (timestamps are 4 bytes).</div><div class='del'>- * When updating this constant (e.g. due to new internet drafts / RFCs), make</div><div class='del'>- * sure that you also update all code which refers to it.</div><div class='del'>- */</div><div class='del'>-#define DCCP_OPTVAL_MAXLEN	6</div><div class='del'>-</div><div class='del'>-void dccp_encode_value_var(const u64 value, u8 *to, const u8 len);</div><div class='del'>-u64 dccp_decode_value_var(const u8 *bf, const u8 len);</div><div class='del'>-u64 dccp_feat_nn_get(struct sock *sk, u8 feat);</div><div class='del'>-</div><div class='del'>-int dccp_insert_option_mandatory(struct sk_buff *skb);</div><div class='del'>-int dccp_insert_fn_opt(struct sk_buff *skb, u8 type, u8 feat, u8 *val, u8 len,</div><div class='del'>-		       bool repeat_first);</div><div class='del'>-#endif /* _DCCP_FEAT_H */</div><div class='head'>diff --git a/net/dccp/input.c b/net/dccp/input.c<br/>deleted file mode 100644<br/>index 85d6c879383d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/input.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,742 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/input.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-/* rate-limit for syncs in reply to sequence-invalid packets; RFC 4340, 7.5.4 */</div><div class='del'>-int sysctl_dccp_sync_ratelimit	__read_mostly = HZ / 8;</div><div class='del'>-</div><div class='del'>-static void dccp_enqueue_skb(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	__skb_pull(skb, dccp_hdr(skb)-&gt;dccph_doff * 4);</div><div class='del'>-	__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='del'>-	skb_set_owner_r(skb, sk);</div><div class='del'>-	sk-&gt;sk_data_ready(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_fin(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * On receiving Close/CloseReq, both RD/WR shutdown are performed.</div><div class='del'>-	 * RFC 4340, 8.3 says that we MAY send further Data/DataAcks after</div><div class='del'>-	 * receiving the closing segment, but there is no guarantee that such</div><div class='del'>-	 * data will be processed at all.</div><div class='del'>-	 */</div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='del'>-	sock_set_flag(sk, SOCK_DONE);</div><div class='del'>-	dccp_enqueue_skb(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_rcv_close(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int queued = 0;</div><div class='del'>-</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	/*</div><div class='del'>-	 * We ignore Close when received in one of the following states:</div><div class='del'>-	 *  - CLOSED		(may be a late or duplicate packet)</div><div class='del'>-	 *  - PASSIVE_CLOSEREQ	(the peer has sent a CloseReq earlier)</div><div class='del'>-	 *  - RESPOND		(already handled by dccp_check_req)</div><div class='del'>-	 */</div><div class='del'>-	case DCCP_CLOSING:</div><div class='del'>-		/*</div><div class='del'>-		 * Simultaneous-close: receiving a Close after sending one. This</div><div class='del'>-		 * can happen if both client and server perform active-close and</div><div class='del'>-		 * will result in an endless ping-pong of crossing and retrans-</div><div class='del'>-		 * mitted Close packets, which only terminates when one of the</div><div class='del'>-		 * nodes times out (min. 64 seconds). Quicker convergence can be</div><div class='del'>-		 * achieved when one of the nodes acts as tie-breaker.</div><div class='del'>-		 * This is ok as both ends are done with data transfer and each</div><div class='del'>-		 * end is just waiting for the other to acknowledge termination.</div><div class='del'>-		 */</div><div class='del'>-		if (dccp_sk(sk)-&gt;dccps_role != DCCP_ROLE_CLIENT)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-	case DCCP_ACTIVE_CLOSEREQ:</div><div class='del'>-		dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED);</div><div class='del'>-		dccp_done(sk);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_OPEN:</div><div class='del'>-	case DCCP_PARTOPEN:</div><div class='del'>-		/* Give waiting application a chance to read pending data */</div><div class='del'>-		queued = 1;</div><div class='del'>-		dccp_fin(sk, skb);</div><div class='del'>-		dccp_set_state(sk, DCCP_PASSIVE_CLOSE);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_PASSIVE_CLOSE:</div><div class='del'>-		/*</div><div class='del'>-		 * Retransmitted Close: we have already enqueued the first one.</div><div class='del'>-		 */</div><div class='del'>-		sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);</div><div class='del'>-	}</div><div class='del'>-	return queued;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int queued = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Step 7: Check for unexpected packet types</div><div class='del'>-	 *      If (S.is_server and P.type == CloseReq)</div><div class='del'>-	 *	  Send Sync packet acknowledging P.seqno</div><div class='del'>-	 *	  Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (dccp_sk(sk)-&gt;dccps_role != DCCP_ROLE_CLIENT) {</div><div class='del'>-		dccp_send_sync(sk, DCCP_SKB_CB(skb)-&gt;dccpd_seq, DCCP_PKT_SYNC);</div><div class='del'>-		return queued;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Step 13: process relevant Client states &lt; CLOSEREQ */</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-		dccp_send_close(sk, 0);</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSING);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_OPEN:</div><div class='del'>-	case DCCP_PARTOPEN:</div><div class='del'>-		/* Give waiting application a chance to read pending data */</div><div class='del'>-		queued = 1;</div><div class='del'>-		dccp_fin(sk, skb);</div><div class='del'>-		dccp_set_state(sk, DCCP_PASSIVE_CLOSEREQ);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_PASSIVE_CLOSEREQ:</div><div class='del'>-		sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);</div><div class='del'>-	}</div><div class='del'>-	return queued;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 dccp_reset_code_convert(const u8 code)</div><div class='del'>-{</div><div class='del'>-	static const u16 error_code[] = {</div><div class='del'>-	[DCCP_RESET_CODE_CLOSED]	     = 0,	/* normal termination */</div><div class='del'>-	[DCCP_RESET_CODE_UNSPECIFIED]	     = 0,	/* nothing known */</div><div class='del'>-	[DCCP_RESET_CODE_ABORTED]	     = ECONNRESET,</div><div class='del'>-</div><div class='del'>-	[DCCP_RESET_CODE_NO_CONNECTION]	     = ECONNREFUSED,</div><div class='del'>-	[DCCP_RESET_CODE_CONNECTION_REFUSED] = ECONNREFUSED,</div><div class='del'>-	[DCCP_RESET_CODE_TOO_BUSY]	     = EUSERS,</div><div class='del'>-	[DCCP_RESET_CODE_AGGRESSION_PENALTY] = EDQUOT,</div><div class='del'>-</div><div class='del'>-	[DCCP_RESET_CODE_PACKET_ERROR]	     = ENOMSG,</div><div class='del'>-	[DCCP_RESET_CODE_BAD_INIT_COOKIE]    = EBADR,</div><div class='del'>-	[DCCP_RESET_CODE_BAD_SERVICE_CODE]   = EBADRQC,</div><div class='del'>-	[DCCP_RESET_CODE_OPTION_ERROR]	     = EILSEQ,</div><div class='del'>-	[DCCP_RESET_CODE_MANDATORY_ERROR]    = EOPNOTSUPP,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return code &gt;= DCCP_MAX_RESET_CODES ? 0 : error_code[code];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u16 err = dccp_reset_code_convert(dccp_hdr_reset(skb)-&gt;dccph_reset_code);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_err = err;</div><div class='del'>-</div><div class='del'>-	/* Queue the equivalent of TCP fin so that dccp_recvmsg exits the loop */</div><div class='del'>-	dccp_fin(sk, skb);</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; !sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);</div><div class='del'>-	dccp_time_wait(sk, DCCP_TIME_WAIT, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_handle_ackvec_processing(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_ackvec *av = dccp_sk(sk)-&gt;dccps_hc_rx_ackvec;</div><div class='del'>-</div><div class='del'>-	if (av == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)</div><div class='del'>-		dccp_ackvec_clear_state(av, DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq);</div><div class='del'>-	dccp_ackvec_input(av, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_deliver_input_to_ccids(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	/* Don't deliver to RX CCID when node has shut down read end. */</div><div class='del'>-	if (!(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN))</div><div class='del'>-		ccid_hc_rx_packet_recv(dp-&gt;dccps_hc_rx_ccid, sk, skb);</div><div class='del'>-	/*</div><div class='del'>-	 * Until the TX queue has been drained, we can not honour SHUT_WR, since</div><div class='del'>-	 * we need received feedback as input to adjust congestion control.</div><div class='del'>-	 */</div><div class='del'>-	if (sk-&gt;sk_write_queue.qlen &gt; 0 || !(sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN))</div><div class='del'>-		ccid_hc_tx_packet_recv(dp-&gt;dccps_hc_tx_ccid, sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	u64 lswl, lawl, seqno = DCCP_SKB_CB(skb)-&gt;dccpd_seq,</div><div class='del'>-			ackno = DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Step 5: Prepare sequence numbers for Sync</div><div class='del'>-	 *     If P.type == Sync or P.type == SyncAck,</div><div class='del'>-	 *	  If S.AWL &lt;= P.ackno &lt;= S.AWH and P.seqno &gt;= S.SWL,</div><div class='del'>-	 *	     / * P is valid, so update sequence number variables</div><div class='del'>-	 *		 accordingly.  After this update, P will pass the tests</div><div class='del'>-	 *		 in Step 6.  A SyncAck is generated if necessary in</div><div class='del'>-	 *		 Step 15 * /</div><div class='del'>-	 *	     Update S.GSR, S.SWL, S.SWH</div><div class='del'>-	 *	  Otherwise,</div><div class='del'>-	 *	     Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (dh-&gt;dccph_type == DCCP_PKT_SYNC ||</div><div class='del'>-	    dh-&gt;dccph_type == DCCP_PKT_SYNCACK) {</div><div class='del'>-		if (between48(ackno, dp-&gt;dccps_awl, dp-&gt;dccps_awh) &amp;&amp;</div><div class='del'>-		    dccp_delta_seqno(dp-&gt;dccps_swl, seqno) &gt;= 0)</div><div class='del'>-			dccp_update_gsr(sk, seqno);</div><div class='del'>-		else</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Step 6: Check sequence numbers</div><div class='del'>-	 *      Let LSWL = S.SWL and LAWL = S.AWL</div><div class='del'>-	 *      If P.type == CloseReq or P.type == Close or P.type == Reset,</div><div class='del'>-	 *	  LSWL := S.GSR + 1, LAWL := S.GAR</div><div class='del'>-	 *      If LSWL &lt;= P.seqno &lt;= S.SWH</div><div class='del'>-	 *	     and (P.ackno does not exist or LAWL &lt;= P.ackno &lt;= S.AWH),</div><div class='del'>-	 *	  Update S.GSR, S.SWL, S.SWH</div><div class='del'>-	 *	  If P.type != Sync,</div><div class='del'>-	 *	     Update S.GAR</div><div class='del'>-	 */</div><div class='del'>-	lswl = dp-&gt;dccps_swl;</div><div class='del'>-	lawl = dp-&gt;dccps_awl;</div><div class='del'>-</div><div class='del'>-	if (dh-&gt;dccph_type == DCCP_PKT_CLOSEREQ ||</div><div class='del'>-	    dh-&gt;dccph_type == DCCP_PKT_CLOSE ||</div><div class='del'>-	    dh-&gt;dccph_type == DCCP_PKT_RESET) {</div><div class='del'>-		lswl = ADD48(dp-&gt;dccps_gsr, 1);</div><div class='del'>-		lawl = dp-&gt;dccps_gar;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (between48(seqno, lswl, dp-&gt;dccps_swh) &amp;&amp;</div><div class='del'>-	    (ackno == DCCP_PKT_WITHOUT_ACK_SEQ ||</div><div class='del'>-	     between48(ackno, lawl, dp-&gt;dccps_awh))) {</div><div class='del'>-		dccp_update_gsr(sk, seqno);</div><div class='del'>-</div><div class='del'>-		if (dh-&gt;dccph_type != DCCP_PKT_SYNC &amp;&amp;</div><div class='del'>-		    ackno != DCCP_PKT_WITHOUT_ACK_SEQ &amp;&amp;</div><div class='del'>-		    after48(ackno, dp-&gt;dccps_gar))</div><div class='del'>-			dp-&gt;dccps_gar = ackno;</div><div class='del'>-	} else {</div><div class='del'>-		unsigned long now = jiffies;</div><div class='del'>-		/*</div><div class='del'>-		 *   Step 6: Check sequence numbers</div><div class='del'>-		 *      Otherwise,</div><div class='del'>-		 *         If P.type == Reset,</div><div class='del'>-		 *            Send Sync packet acknowledging S.GSR</div><div class='del'>-		 *         Otherwise,</div><div class='del'>-		 *            Send Sync packet acknowledging P.seqno</div><div class='del'>-		 *      Drop packet and return</div><div class='del'>-		 *</div><div class='del'>-		 *   These Syncs are rate-limited as per RFC 4340, 7.5.4:</div><div class='del'>-		 *   at most 1 / (dccp_sync_rate_limit * HZ) Syncs per second.</div><div class='del'>-		 */</div><div class='del'>-		if (time_before(now, (dp-&gt;dccps_rate_last +</div><div class='del'>-				      sysctl_dccp_sync_ratelimit)))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		DCCP_WARN("Step 6 failed for %s packet, "</div><div class='del'>-			  "(LSWL(%llu) &lt;= P.seqno(%llu) &lt;= S.SWH(%llu)) and "</div><div class='del'>-			  "(P.ackno %s or LAWL(%llu) &lt;= P.ackno(%llu) &lt;= S.AWH(%llu), "</div><div class='del'>-			  "sending SYNC...\n",  dccp_packet_name(dh-&gt;dccph_type),</div><div class='del'>-			  (unsigned long long) lswl, (unsigned long long) seqno,</div><div class='del'>-			  (unsigned long long) dp-&gt;dccps_swh,</div><div class='del'>-			  (ackno == DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist"</div><div class='del'>-							      : "exists",</div><div class='del'>-			  (unsigned long long) lawl, (unsigned long long) ackno,</div><div class='del'>-			  (unsigned long long) dp-&gt;dccps_awh);</div><div class='del'>-</div><div class='del'>-		dp-&gt;dccps_rate_last = now;</div><div class='del'>-</div><div class='del'>-		if (dh-&gt;dccph_type == DCCP_PKT_RESET)</div><div class='del'>-			seqno = dp-&gt;dccps_gsr;</div><div class='del'>-		dccp_send_sync(sk, seqno, DCCP_PKT_SYNC);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-				  const struct dccp_hdr *dh, const unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	switch (dccp_hdr(skb)-&gt;dccph_type) {</div><div class='del'>-	case DCCP_PKT_DATAACK:</div><div class='del'>-	case DCCP_PKT_DATA:</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: schedule DATA_DROPPED (RFC 4340, 11.7.2) if and when</div><div class='del'>-		 * - sk_shutdown == RCV_SHUTDOWN, use Code 1, "Not Listening"</div><div class='del'>-		 * - sk_receive_queue is full, use Code 2, "Receive Buffer"</div><div class='del'>-		 */</div><div class='del'>-		dccp_enqueue_skb(sk, skb);</div><div class='del'>-		return 0;</div><div class='del'>-	case DCCP_PKT_ACK:</div><div class='del'>-		goto discard;</div><div class='del'>-	case DCCP_PKT_RESET:</div><div class='del'>-		/*</div><div class='del'>-		 *  Step 9: Process Reset</div><div class='del'>-		 *	If P.type == Reset,</div><div class='del'>-		 *		Tear down connection</div><div class='del'>-		 *		S.state := TIMEWAIT</div><div class='del'>-		 *		Set TIMEWAIT timer</div><div class='del'>-		 *		Drop packet and return</div><div class='del'>-		 */</div><div class='del'>-		dccp_rcv_reset(sk, skb);</div><div class='del'>-		return 0;</div><div class='del'>-	case DCCP_PKT_CLOSEREQ:</div><div class='del'>-		if (dccp_rcv_closereq(sk, skb))</div><div class='del'>-			return 0;</div><div class='del'>-		goto discard;</div><div class='del'>-	case DCCP_PKT_CLOSE:</div><div class='del'>-		if (dccp_rcv_close(sk, skb))</div><div class='del'>-			return 0;</div><div class='del'>-		goto discard;</div><div class='del'>-	case DCCP_PKT_REQUEST:</div><div class='del'>-		/* Step 7</div><div class='del'>-		 *   or (S.is_server and P.type == Response)</div><div class='del'>-		 *   or (S.is_client and P.type == Request)</div><div class='del'>-		 *   or (S.state &gt;= OPEN and P.type == Request</div><div class='del'>-		 *	and P.seqno &gt;= S.OSR)</div><div class='del'>-		 *    or (S.state &gt;= OPEN and P.type == Response</div><div class='del'>-		 *	and P.seqno &gt;= S.OSR)</div><div class='del'>-		 *    or (S.state == RESPOND and P.type == Data),</div><div class='del'>-		 *  Send Sync packet acknowledging P.seqno</div><div class='del'>-		 *  Drop packet and return</div><div class='del'>-		 */</div><div class='del'>-		if (dp-&gt;dccps_role != DCCP_ROLE_LISTEN)</div><div class='del'>-			goto send_sync;</div><div class='del'>-		goto check_seq;</div><div class='del'>-	case DCCP_PKT_RESPONSE:</div><div class='del'>-		if (dp-&gt;dccps_role != DCCP_ROLE_CLIENT)</div><div class='del'>-			goto send_sync;</div><div class='del'>-check_seq:</div><div class='del'>-		if (dccp_delta_seqno(dp-&gt;dccps_osr,</div><div class='del'>-				     DCCP_SKB_CB(skb)-&gt;dccpd_seq) &gt;= 0) {</div><div class='del'>-send_sync:</div><div class='del'>-			dccp_send_sync(sk, DCCP_SKB_CB(skb)-&gt;dccpd_seq,</div><div class='del'>-				       DCCP_PKT_SYNC);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_PKT_SYNC:</div><div class='del'>-		dccp_send_sync(sk, DCCP_SKB_CB(skb)-&gt;dccpd_seq,</div><div class='del'>-			       DCCP_PKT_SYNCACK);</div><div class='del'>-		/*</div><div class='del'>-		 * From RFC 4340, sec. 5.7</div><div class='del'>-		 *</div><div class='del'>-		 * As with DCCP-Ack packets, DCCP-Sync and DCCP-SyncAck packets</div><div class='del'>-		 * MAY have non-zero-length application data areas, whose</div><div class='del'>-		 * contents receivers MUST ignore.</div><div class='del'>-		 */</div><div class='del'>-		goto discard;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DCCP_INC_STATS(DCCP_MIB_INERRS);</div><div class='del'>-discard:</div><div class='del'>-	__kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			 const struct dccp_hdr *dh, const unsigned int len)</div><div class='del'>-{</div><div class='del'>-	if (dccp_check_seqno(sk, skb))</div><div class='del'>-		goto discard;</div><div class='del'>-</div><div class='del'>-	if (dccp_parse_options(sk, NULL, skb))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	dccp_handle_ackvec_processing(sk, skb);</div><div class='del'>-	dccp_deliver_input_to_ccids(sk, skb);</div><div class='del'>-</div><div class='del'>-	return __dccp_rcv_established(sk, skb, dh, len);</div><div class='del'>-discard:</div><div class='del'>-	__kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_rcv_established);</div><div class='del'>-</div><div class='del'>-static int dccp_rcv_request_sent_state_process(struct sock *sk,</div><div class='del'>-					       struct sk_buff *skb,</div><div class='del'>-					       const struct dccp_hdr *dh,</div><div class='del'>-					       const unsigned int len)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *  Step 4: Prepare sequence numbers in REQUEST</div><div class='del'>-	 *     If S.state == REQUEST,</div><div class='del'>-	 *	  If (P.type == Response or P.type == Reset)</div><div class='del'>-	 *		and S.AWL &lt;= P.ackno &lt;= S.AWH,</div><div class='del'>-	 *	     / * Set sequence number variables corresponding to the</div><div class='del'>-	 *		other endpoint, so P will pass the tests in Step 6 * /</div><div class='del'>-	 *	     Set S.GSR, S.ISR, S.SWL, S.SWH</div><div class='del'>-	 *	     / * Response processing continues in Step 10; Reset</div><div class='del'>-	 *		processing continues in Step 9 * /</div><div class='del'>-	*/</div><div class='del'>-	if (dh-&gt;dccph_type == DCCP_PKT_RESPONSE) {</div><div class='del'>-		const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-		struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-		long tstamp = dccp_timestamp();</div><div class='del'>-</div><div class='del'>-		if (!between48(DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq,</div><div class='del'>-			       dp-&gt;dccps_awl, dp-&gt;dccps_awh)) {</div><div class='del'>-			dccp_pr_debug("invalid ackno: S.AWL=%llu, "</div><div class='del'>-				      "P.ackno=%llu, S.AWH=%llu\n",</div><div class='del'>-				      (unsigned long long)dp-&gt;dccps_awl,</div><div class='del'>-			   (unsigned long long)DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq,</div><div class='del'>-				      (unsigned long long)dp-&gt;dccps_awh);</div><div class='del'>-			goto out_invalid_packet;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If option processing (Step 8) failed, return 1 here so that</div><div class='del'>-		 * dccp_v4_do_rcv() sends a Reset. The Reset code depends on</div><div class='del'>-		 * the option type and is set in dccp_parse_options().</div><div class='del'>-		 */</div><div class='del'>-		if (dccp_parse_options(sk, NULL, skb))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* Obtain usec RTT sample from SYN exchange (used by TFRC). */</div><div class='del'>-		if (likely(dp-&gt;dccps_options_received.dccpor_timestamp_echo))</div><div class='del'>-			dp-&gt;dccps_syn_rtt = dccp_sample_rtt(sk, 10 * (tstamp -</div><div class='del'>-			    dp-&gt;dccps_options_received.dccpor_timestamp_echo));</div><div class='del'>-</div><div class='del'>-		/* Stop the REQUEST timer */</div><div class='del'>-		inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);</div><div class='del'>-		WARN_ON(sk-&gt;sk_send_head == NULL);</div><div class='del'>-		kfree_skb(sk-&gt;sk_send_head);</div><div class='del'>-		sk-&gt;sk_send_head = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set ISR, GSR from packet. ISS was set in dccp_v{4,6}_connect</div><div class='del'>-		 * and GSS in dccp_transmit_skb(). Setting AWL/AWH and SWL/SWH</div><div class='del'>-		 * is done as part of activating the feature values below, since</div><div class='del'>-		 * these settings depend on the local/remote Sequence Window</div><div class='del'>-		 * features, which were undefined or not confirmed until now.</div><div class='del'>-		 */</div><div class='del'>-		dp-&gt;dccps_gsr = dp-&gt;dccps_isr = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-</div><div class='del'>-		dccp_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *    Step 10: Process REQUEST state (second part)</div><div class='del'>-		 *       If S.state == REQUEST,</div><div class='del'>-		 *	  / * If we get here, P is a valid Response from the</div><div class='del'>-		 *	      server (see Step 4), and we should move to</div><div class='del'>-		 *	      PARTOPEN state. PARTOPEN means send an Ack,</div><div class='del'>-		 *	      don't send Data packets, retransmit Acks</div><div class='del'>-		 *	      periodically, and always include any Init Cookie</div><div class='del'>-		 *	      from the Response * /</div><div class='del'>-		 *	  S.state := PARTOPEN</div><div class='del'>-		 *	  Set PARTOPEN timer</div><div class='del'>-		 *	  Continue with S.state == PARTOPEN</div><div class='del'>-		 *	  / * Step 12 will send the Ack completing the</div><div class='del'>-		 *	      three-way handshake * /</div><div class='del'>-		 */</div><div class='del'>-		dccp_set_state(sk, DCCP_PARTOPEN);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If feature negotiation was successful, activate features now;</div><div class='del'>-		 * an activation failure means that this host could not activate</div><div class='del'>-		 * one ore more features (e.g. insufficient memory), which would</div><div class='del'>-		 * leave at least one feature in an undefined state.</div><div class='del'>-		 */</div><div class='del'>-		if (dccp_feat_activate_values(sk, &amp;dp-&gt;dccps_featneg))</div><div class='del'>-			goto unable_to_proceed;</div><div class='del'>-</div><div class='del'>-		/* Make sure socket is routed, for correct metrics. */</div><div class='del'>-		icsk-&gt;icsk_af_ops-&gt;rebuild_header(sk);</div><div class='del'>-</div><div class='del'>-		if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_write_pending || icsk-&gt;icsk_ack.pingpong ||</div><div class='del'>-		    icsk-&gt;icsk_accept_queue.rskq_defer_accept) {</div><div class='del'>-			/* Save one ACK. Data will be ready after</div><div class='del'>-			 * several ticks, if write_pending is set.</div><div class='del'>-			 *</div><div class='del'>-			 * It may be deleted, but with this feature tcpdumps</div><div class='del'>-			 * look so _wonderfully_ clever, that I was not able</div><div class='del'>-			 * to stand against the temptation 8)     --ANK</div><div class='del'>-			 */</div><div class='del'>-			/*</div><div class='del'>-			 * OK, in DCCP we can as well do a similar trick, its</div><div class='del'>-			 * even in the draft, but there is no need for us to</div><div class='del'>-			 * schedule an ack here, as dccp_sendmsg does this for</div><div class='del'>-			 * us, also stated in the draft. -acme</div><div class='del'>-			 */</div><div class='del'>-			__kfree_skb(skb);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		dccp_send_ack(sk);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out_invalid_packet:</div><div class='del'>-	/* dccp_v4_do_rcv will send a reset */</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = DCCP_RESET_CODE_PACKET_ERROR;</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-unable_to_proceed:</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = DCCP_RESET_CODE_ABORTED;</div><div class='del'>-	/*</div><div class='del'>-	 * We mark this socket as no longer usable, so that the loop in</div><div class='del'>-	 * dccp_sendmsg() terminates and the application gets notified.</div><div class='del'>-	 */</div><div class='del'>-	dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-	sk-&gt;sk_err = ECOMM;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_rcv_respond_partopen_state_process(struct sock *sk,</div><div class='del'>-						   struct sk_buff *skb,</div><div class='del'>-						   const struct dccp_hdr *dh,</div><div class='del'>-						   const unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	u32 sample = dp-&gt;dccps_options_received.dccpor_timestamp_echo;</div><div class='del'>-	int queued = 0;</div><div class='del'>-</div><div class='del'>-	switch (dh-&gt;dccph_type) {</div><div class='del'>-	case DCCP_PKT_RESET:</div><div class='del'>-		inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_PKT_DATA:</div><div class='del'>-		if (sk-&gt;sk_state == DCCP_RESPOND)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_PKT_DATAACK:</div><div class='del'>-	case DCCP_PKT_ACK:</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: we should be resetting the PARTOPEN (DELACK) timer</div><div class='del'>-		 * here but only if we haven't used the DELACK timer for</div><div class='del'>-		 * something else, like sending a delayed ack for a TIMESTAMP</div><div class='del'>-		 * echo, etc, for now were not clearing it, sending an extra</div><div class='del'>-		 * ACK when there is nothing else to do in DELACK is not a big</div><div class='del'>-		 * deal after all.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* Stop the PARTOPEN timer */</div><div class='del'>-		if (sk-&gt;sk_state == DCCP_PARTOPEN)</div><div class='del'>-			inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);</div><div class='del'>-</div><div class='del'>-		/* Obtain usec RTT sample from SYN exchange (used by TFRC). */</div><div class='del'>-		if (likely(sample)) {</div><div class='del'>-			long delta = dccp_timestamp() - sample;</div><div class='del'>-</div><div class='del'>-			dp-&gt;dccps_syn_rtt = dccp_sample_rtt(sk, 10 * delta);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dp-&gt;dccps_osr = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-		dccp_set_state(sk, DCCP_OPEN);</div><div class='del'>-</div><div class='del'>-		if (dh-&gt;dccph_type == DCCP_PKT_DATAACK ||</div><div class='del'>-		    dh-&gt;dccph_type == DCCP_PKT_DATA) {</div><div class='del'>-			__dccp_rcv_established(sk, skb, dh, len);</div><div class='del'>-			queued = 1; /* packet was queued</div><div class='del'>-				       (by __dccp_rcv_established) */</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return queued;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			   struct dccp_hdr *dh, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);</div><div class='del'>-	const int old_state = sk-&gt;sk_state;</div><div class='del'>-	bool acceptable;</div><div class='del'>-	int queued = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Step 3: Process LISTEN state</div><div class='del'>-	 *</div><div class='del'>-	 *     If S.state == LISTEN,</div><div class='del'>-	 *	 If P.type == Request or P contains a valid Init Cookie option,</div><div class='del'>-	 *	      (* Must scan the packet's options to check for Init</div><div class='del'>-	 *		 Cookies.  Only Init Cookies are processed here,</div><div class='del'>-	 *		 however; other options are processed in Step 8.  This</div><div class='del'>-	 *		 scan need only be performed if the endpoint uses Init</div><div class='del'>-	 *		 Cookies *)</div><div class='del'>-	 *	      (* Generate a new socket and switch to that socket *)</div><div class='del'>-	 *	      Set S := new socket for this port pair</div><div class='del'>-	 *	      S.state = RESPOND</div><div class='del'>-	 *	      Choose S.ISS (initial seqno) or set from Init Cookies</div><div class='del'>-	 *	      Initialize S.GAR := S.ISS</div><div class='del'>-	 *	      Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init</div><div class='del'>-	 *	      Cookies Continue with S.state == RESPOND</div><div class='del'>-	 *	      (* A Response packet will be generated in Step 11 *)</div><div class='del'>-	 *	 Otherwise,</div><div class='del'>-	 *	      Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *	      Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN) {</div><div class='del'>-		if (dh-&gt;dccph_type == DCCP_PKT_REQUEST) {</div><div class='del'>-			/* It is possible that we process SYN packets from backlog,</div><div class='del'>-			 * so we need to make sure to disable BH and RCU right there.</div><div class='del'>-			 */</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			local_bh_disable();</div><div class='del'>-			acceptable = inet_csk(sk)-&gt;icsk_af_ops-&gt;conn_request(sk, skb) &gt;= 0;</div><div class='del'>-			local_bh_enable();</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			if (!acceptable)</div><div class='del'>-				return 1;</div><div class='del'>-			consume_skb(skb);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (dh-&gt;dccph_type == DCCP_PKT_RESET)</div><div class='del'>-			goto discard;</div><div class='del'>-</div><div class='del'>-		/* Caller (dccp_v4_do_rcv) will send Reset */</div><div class='del'>-		dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_NO_CONNECTION;</div><div class='del'>-		return 1;</div><div class='del'>-	} else if (sk-&gt;sk_state == DCCP_CLOSED) {</div><div class='del'>-		dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_NO_CONNECTION;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Step 6: Check sequence numbers (omitted in LISTEN/REQUEST state) */</div><div class='del'>-	if (sk-&gt;sk_state != DCCP_REQUESTING &amp;&amp; dccp_check_seqno(sk, skb))</div><div class='del'>-		goto discard;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Step 7: Check for unexpected packet types</div><div class='del'>-	 *      If (S.is_server and P.type == Response)</div><div class='del'>-	 *	    or (S.is_client and P.type == Request)</div><div class='del'>-	 *	    or (S.state == RESPOND and P.type == Data),</div><div class='del'>-	 *	  Send Sync packet acknowledging P.seqno</div><div class='del'>-	 *	  Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if ((dp-&gt;dccps_role != DCCP_ROLE_CLIENT &amp;&amp;</div><div class='del'>-	     dh-&gt;dccph_type == DCCP_PKT_RESPONSE) ||</div><div class='del'>-	    (dp-&gt;dccps_role == DCCP_ROLE_CLIENT &amp;&amp;</div><div class='del'>-	     dh-&gt;dccph_type == DCCP_PKT_REQUEST) ||</div><div class='del'>-	    (sk-&gt;sk_state == DCCP_RESPOND &amp;&amp; dh-&gt;dccph_type == DCCP_PKT_DATA)) {</div><div class='del'>-		dccp_send_sync(sk, dcb-&gt;dccpd_seq, DCCP_PKT_SYNC);</div><div class='del'>-		goto discard;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*  Step 8: Process options */</div><div class='del'>-	if (dccp_parse_options(sk, NULL, skb))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Step 9: Process Reset</div><div class='del'>-	 *	If P.type == Reset,</div><div class='del'>-	 *		Tear down connection</div><div class='del'>-	 *		S.state := TIMEWAIT</div><div class='del'>-	 *		Set TIMEWAIT timer</div><div class='del'>-	 *		Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (dh-&gt;dccph_type == DCCP_PKT_RESET) {</div><div class='del'>-		dccp_rcv_reset(sk, skb);</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (dh-&gt;dccph_type == DCCP_PKT_CLOSEREQ) {	/* Step 13 */</div><div class='del'>-		if (dccp_rcv_closereq(sk, skb))</div><div class='del'>-			return 0;</div><div class='del'>-		goto discard;</div><div class='del'>-	} else if (dh-&gt;dccph_type == DCCP_PKT_CLOSE) {		/* Step 14 */</div><div class='del'>-		if (dccp_rcv_close(sk, skb))</div><div class='del'>-			return 0;</div><div class='del'>-		goto discard;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-		queued = dccp_rcv_request_sent_state_process(sk, skb, dh, len);</div><div class='del'>-		if (queued &gt;= 0)</div><div class='del'>-			return queued;</div><div class='del'>-</div><div class='del'>-		__kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case DCCP_PARTOPEN:</div><div class='del'>-		/* Step 8: if using Ack Vectors, mark packet acknowledgeable */</div><div class='del'>-		dccp_handle_ackvec_processing(sk, skb);</div><div class='del'>-		dccp_deliver_input_to_ccids(sk, skb);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_RESPOND:</div><div class='del'>-		queued = dccp_rcv_respond_partopen_state_process(sk, skb,</div><div class='del'>-								 dh, len);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dh-&gt;dccph_type == DCCP_PKT_ACK ||</div><div class='del'>-	    dh-&gt;dccph_type == DCCP_PKT_DATAACK) {</div><div class='del'>-		switch (old_state) {</div><div class='del'>-		case DCCP_PARTOPEN:</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (unlikely(dh-&gt;dccph_type == DCCP_PKT_SYNC)) {</div><div class='del'>-		dccp_send_sync(sk, dcb-&gt;dccpd_seq, DCCP_PKT_SYNCACK);</div><div class='del'>-		goto discard;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!queued) {</div><div class='del'>-discard:</div><div class='del'>-		__kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_rcv_state_process);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  dccp_sample_rtt  -  Validate and finalise computation of RTT sample</div><div class='del'>- *  @delta:	number of microseconds between packet and acknowledgment</div><div class='del'>- *</div><div class='del'>- *  The routine is kept generic to work in different contexts. It should be</div><div class='del'>- *  called immediately when the ACK used for the RTT sample arrives.</div><div class='del'>- */</div><div class='del'>-u32 dccp_sample_rtt(struct sock *sk, long delta)</div><div class='del'>-{</div><div class='del'>-	/* dccpor_elapsed_time is either zeroed out or set and &gt; 0 */</div><div class='del'>-	delta -= dccp_sk(sk)-&gt;dccps_options_received.dccpor_elapsed_time * 10;</div><div class='del'>-</div><div class='del'>-	if (unlikely(delta &lt;= 0)) {</div><div class='del'>-		DCCP_WARN("unusable RTT sample %ld, using min\n", delta);</div><div class='del'>-		return DCCP_SANE_RTT_MIN;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(delta &gt; DCCP_SANE_RTT_MAX)) {</div><div class='del'>-		DCCP_WARN("RTT sample %ld too large, using max\n", delta);</div><div class='del'>-		return DCCP_SANE_RTT_MAX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return delta;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c<br/>deleted file mode 100644<br/>index 8e08cea6f178..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1086 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ipv4.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/icmp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/icmp.h&gt;</div><div class='del'>-#include &lt;net/inet_common.h&gt;</div><div class='del'>-#include &lt;net/inet_hashtables.h&gt;</div><div class='del'>-#include &lt;net/inet_sock.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/timewait_sock.h&gt;</div><div class='del'>-#include &lt;net/tcp_states.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/secure_seq.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The per-net dccp.v4_ctl_sk socket is used for responding to</div><div class='del'>- * the Out-of-the-blue (OOTB) packets. A control sock will be created</div><div class='del'>- * for this socket at the initialization time.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='del'>-{</div><div class='del'>-	const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	__be16 orig_sport, orig_dport;</div><div class='del'>-	__be32 daddr, nexthop;</div><div class='del'>-	struct flowi4 *fl4;</div><div class='del'>-	struct rtable *rt;</div><div class='del'>-	int err;</div><div class='del'>-	struct ip_options_rcu *inet_opt;</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_role = DCCP_ROLE_CLIENT;</div><div class='del'>-</div><div class='del'>-	if (addr_len &lt; sizeof(struct sockaddr_in))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (usin-&gt;sin_family != AF_INET)</div><div class='del'>-		return -EAFNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	nexthop = daddr = usin-&gt;sin_addr.s_addr;</div><div class='del'>-</div><div class='del'>-	inet_opt = rcu_dereference_protected(inet-&gt;inet_opt,</div><div class='del'>-					     lockdep_sock_is_held(sk));</div><div class='del'>-	if (inet_opt != NULL &amp;&amp; inet_opt-&gt;opt.srr) {</div><div class='del'>-		if (daddr == 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		nexthop = inet_opt-&gt;opt.faddr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orig_sport = inet-&gt;inet_sport;</div><div class='del'>-	orig_dport = usin-&gt;sin_port;</div><div class='del'>-	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='del'>-	rt = ip_route_connect(fl4, nexthop, inet-&gt;inet_saddr,</div><div class='del'>-			      RT_CONN_FLAGS(sk), sk-&gt;sk_bound_dev_if,</div><div class='del'>-			      IPPROTO_DCCP,</div><div class='del'>-			      orig_sport, orig_dport, sk);</div><div class='del'>-	if (IS_ERR(rt))</div><div class='del'>-		return PTR_ERR(rt);</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;rt_flags &amp; (RTCF_MULTICAST | RTCF_BROADCAST)) {</div><div class='del'>-		ip_rt_put(rt);</div><div class='del'>-		return -ENETUNREACH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inet_opt == NULL || !inet_opt-&gt;opt.srr)</div><div class='del'>-		daddr = fl4-&gt;daddr;</div><div class='del'>-</div><div class='del'>-	if (inet-&gt;inet_saddr == 0)</div><div class='del'>-		inet-&gt;inet_saddr = fl4-&gt;saddr;</div><div class='del'>-	sk_rcv_saddr_set(sk, inet-&gt;inet_saddr);</div><div class='del'>-	inet-&gt;inet_dport = usin-&gt;sin_port;</div><div class='del'>-	sk_daddr_set(sk, daddr);</div><div class='del'>-</div><div class='del'>-	inet_csk(sk)-&gt;icsk_ext_hdr_len = 0;</div><div class='del'>-	if (inet_opt)</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ext_hdr_len = inet_opt-&gt;opt.optlen;</div><div class='del'>-	/*</div><div class='del'>-	 * Socket identity is still unknown (sport may be zero).</div><div class='del'>-	 * However we set state to DCCP_REQUESTING and not releasing socket</div><div class='del'>-	 * lock select source port, enter ourselves into the hash tables and</div><div class='del'>-	 * complete initialization after this.</div><div class='del'>-	 */</div><div class='del'>-	dccp_set_state(sk, DCCP_REQUESTING);</div><div class='del'>-	err = inet_hash_connect(&amp;dccp_death_row, sk);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	rt = ip_route_newports(fl4, rt, orig_sport, orig_dport,</div><div class='del'>-			       inet-&gt;inet_sport, inet-&gt;inet_dport, sk);</div><div class='del'>-	if (IS_ERR(rt)) {</div><div class='del'>-		err = PTR_ERR(rt);</div><div class='del'>-		rt = NULL;</div><div class='del'>-		goto failure;</div><div class='del'>-	}</div><div class='del'>-	/* OK, now commit destination to socket.  */</div><div class='del'>-	sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_iss = secure_dccp_sequence_number(inet-&gt;inet_saddr,</div><div class='del'>-						    inet-&gt;inet_daddr,</div><div class='del'>-						    inet-&gt;inet_sport,</div><div class='del'>-						    inet-&gt;inet_dport);</div><div class='del'>-	inet-&gt;inet_id = dp-&gt;dccps_iss ^ jiffies;</div><div class='del'>-</div><div class='del'>-	err = dccp_connect(sk);</div><div class='del'>-	rt = NULL;</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto failure;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-failure:</div><div class='del'>-	/*</div><div class='del'>-	 * This unhashes the socket and releases the local port, if necessary.</div><div class='del'>-	 */</div><div class='del'>-	dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-	ip_rt_put(rt);</div><div class='del'>-	sk-&gt;sk_route_caps = 0;</div><div class='del'>-	inet-&gt;inet_dport = 0;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_v4_connect);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine does path mtu discovery as defined in RFC1191.</div><div class='del'>- */</div><div class='del'>-static inline void dccp_do_pmtu_discovery(struct sock *sk,</div><div class='del'>-					  const struct iphdr *iph,</div><div class='del'>-					  u32 mtu)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	const struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	/* We are not interested in DCCP_LISTEN and request_socks (RESPONSEs</div><div class='del'>-	 * send out by Linux are always &lt; 576bytes so they should go through</div><div class='del'>-	 * unfragmented).</div><div class='del'>-	 */</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dst = inet_csk_update_pmtu(sk, mtu);</div><div class='del'>-	if (!dst)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Something is about to be wrong... Remember soft error</div><div class='del'>-	 * for the case, if this connection will not able to recover.</div><div class='del'>-	 */</div><div class='del'>-	if (mtu &lt; dst_mtu(dst) &amp;&amp; ip_dont_fragment(sk, dst))</div><div class='del'>-		sk-&gt;sk_err_soft = EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	mtu = dst_mtu(dst);</div><div class='del'>-</div><div class='del'>-	if (inet-&gt;pmtudisc != IP_PMTUDISC_DONT &amp;&amp;</div><div class='del'>-	    ip_sk_accept_pmtu(sk) &amp;&amp;</div><div class='del'>-	    inet_csk(sk)-&gt;icsk_pmtu_cookie &gt; mtu) {</div><div class='del'>-		dccp_sync_mss(sk, mtu);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * From RFC 4340, sec. 14.1:</div><div class='del'>-		 *</div><div class='del'>-		 *	DCCP-Sync packets are the best choice for upward</div><div class='del'>-		 *	probing, since DCCP-Sync probes do not risk application</div><div class='del'>-		 *	data loss.</div><div class='del'>-		 */</div><div class='del'>-		dccp_send_sync(sk, dp-&gt;dccps_gsr, DCCP_PKT_SYNC);</div><div class='del'>-	} /* else let the usual retransmit timer handle it */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_do_redirect(struct sk_buff *skb, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = __sk_dst_check(sk, 0);</div><div class='del'>-</div><div class='del'>-	if (dst)</div><div class='del'>-		dst-&gt;ops-&gt;redirect(dst, sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_req_err(struct sock *sk, u64 seq)</div><div class='del'>-	{</div><div class='del'>-	struct request_sock *req = inet_reqsk(sk);</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ICMPs are not backlogged, hence we cannot get an established</div><div class='del'>-	 * socket here.</div><div class='del'>-	 */</div><div class='del'>-	if (!between48(seq, dccp_rsk(req)-&gt;dreq_iss, dccp_rsk(req)-&gt;dreq_gss)) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Still in RESPOND, just remove it silently.</div><div class='del'>-		 * There is no good way to pass the error to the newly</div><div class='del'>-		 * created socket, and POSIX does not want network</div><div class='del'>-		 * errors returned from accept().</div><div class='del'>-		 */</div><div class='del'>-		inet_csk_reqsk_queue_drop(req-&gt;rsk_listener, req);</div><div class='del'>-	}</div><div class='del'>-	reqsk_put(req);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dccp_req_err);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine is called by the ICMP module when it gets some sort of error</div><div class='del'>- * condition. If err &lt; 0 then the socket should be closed and the error</div><div class='del'>- * returned to the user. If err &gt; 0 it's just the icmp type &lt;&lt; 8 | icmp code.</div><div class='del'>- * After adjustment header points to the first 8 bytes of the tcp header. We</div><div class='del'>- * need to find the appropriate port.</div><div class='del'>- *</div><div class='del'>- * The locking strategy used here is very "optimistic". When someone else</div><div class='del'>- * accesses the socket the ICMP is just dropped and for some paths there is no</div><div class='del'>- * check at all. A more general error queue to queue errors for later handling</div><div class='del'>- * is probably better.</div><div class='del'>- */</div><div class='del'>-static void dccp_v4_err(struct sk_buff *skb, u32 info)</div><div class='del'>-{</div><div class='del'>-	const struct iphdr *iph = (struct iphdr *)skb-&gt;data;</div><div class='del'>-	const u8 offset = iph-&gt;ihl &lt;&lt; 2;</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	struct dccp_sock *dp;</div><div class='del'>-	struct inet_sock *inet;</div><div class='del'>-	const int type = icmp_hdr(skb)-&gt;type;</div><div class='del'>-	const int code = icmp_hdr(skb)-&gt;code;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	__u64 seq;</div><div class='del'>-	int err;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* Only need dccph_dport &amp; dccph_sport which are the first</div><div class='del'>-	 * 4 bytes in dccp header.</div><div class='del'>-	 * Our caller (icmp_socket_deliver()) already pulled 8 bytes for us.</div><div class='del'>-	 */</div><div class='del'>-	BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) &gt; 8);</div><div class='del'>-	BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) &gt; 8);</div><div class='del'>-	dh = (struct dccp_hdr *)(skb-&gt;data + offset);</div><div class='del'>-</div><div class='del'>-	sk = __inet_lookup_established(net, &amp;dccp_hashinfo,</div><div class='del'>-				       iph-&gt;daddr, dh-&gt;dccph_dport,</div><div class='del'>-				       iph-&gt;saddr, ntohs(dh-&gt;dccph_sport),</div><div class='del'>-				       inet_iif(skb), 0);</div><div class='del'>-	if (!sk) {</div><div class='del'>-		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_TIME_WAIT) {</div><div class='del'>-		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	seq = dccp_hdr_seq(dh);</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_NEW_SYN_RECV)</div><div class='del'>-		return dccp_req_err(sk, seq);</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	/* If too many ICMPs get dropped on busy</div><div class='del'>-	 * servers this needs to be solved differently.</div><div class='del'>-	 */</div><div class='del'>-	if (sock_owned_by_user(sk))</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_LOCKDROPPEDICMPS);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dp = dccp_sk(sk);</div><div class='del'>-	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(DCCPF_REQUESTING | DCCPF_LISTEN) &amp;&amp;</div><div class='del'>-	    !between48(seq, dp-&gt;dccps_awl, dp-&gt;dccps_awh)) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ICMP_REDIRECT:</div><div class='del'>-		if (!sock_owned_by_user(sk))</div><div class='del'>-			dccp_do_redirect(skb, sk);</div><div class='del'>-		goto out;</div><div class='del'>-	case ICMP_SOURCE_QUENCH:</div><div class='del'>-		/* Just silently ignore these. */</div><div class='del'>-		goto out;</div><div class='del'>-	case ICMP_PARAMETERPROB:</div><div class='del'>-		err = EPROTO;</div><div class='del'>-		break;</div><div class='del'>-	case ICMP_DEST_UNREACH:</div><div class='del'>-		if (code &gt; NR_ICMP_UNREACH)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (code == ICMP_FRAG_NEEDED) { /* PMTU discovery (RFC1191) */</div><div class='del'>-			if (!sock_owned_by_user(sk))</div><div class='del'>-				dccp_do_pmtu_discovery(sk, iph, info);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = icmp_err_convert[code].errno;</div><div class='del'>-		break;</div><div class='del'>-	case ICMP_TIME_EXCEEDED:</div><div class='del'>-		err = EHOSTUNREACH;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-	case DCCP_RESPOND:</div><div class='del'>-		if (!sock_owned_by_user(sk)) {</div><div class='del'>-			__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);</div><div class='del'>-			sk-&gt;sk_err = err;</div><div class='del'>-</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='del'>-</div><div class='del'>-			dccp_done(sk);</div><div class='del'>-		} else</div><div class='del'>-			sk-&gt;sk_err_soft = err;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we've already connected we will keep trying</div><div class='del'>-	 * until we time out, or the user gives up.</div><div class='del'>-	 *</div><div class='del'>-	 * rfc1122 4.2.3.9 allows to consider as hard errors</div><div class='del'>-	 * only PROTO_UNREACH and PORT_UNREACH (well, FRAG_FAILED too,</div><div class='del'>-	 * but it is obsoleted by pmtu discovery).</div><div class='del'>-	 *</div><div class='del'>-	 * Note, that in modern internet, where routing is unreliable</div><div class='del'>-	 * and in each dark corner broken firewalls sit, sending random</div><div class='del'>-	 * errors ordered by their masters even this two messages finally lose</div><div class='del'>-	 * their original sense (even Linux sends invalid PORT_UNREACHs)</div><div class='del'>-	 *</div><div class='del'>-	 * Now we are in compliance with RFCs.</div><div class='del'>-	 *							--ANK (980905)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	inet = inet_sk(sk);</div><div class='del'>-	if (!sock_owned_by_user(sk) &amp;&amp; inet-&gt;recverr) {</div><div class='del'>-		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='del'>-	} else /* Only an error on timeout */</div><div class='del'>-		sk-&gt;sk_err_soft = err;</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __sum16 dccp_v4_csum_finish(struct sk_buff *skb,</div><div class='del'>-				      __be32 src, __be32 dst)</div><div class='del'>-{</div><div class='del'>-	return csum_tcpudp_magic(src, dst, skb-&gt;len, IPPROTO_DCCP, skb-&gt;csum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_v4_send_check(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	dccp_csum_outgoing(skb);</div><div class='del'>-	dh-&gt;dccph_checksum = dccp_v4_csum_finish(skb,</div><div class='del'>-						 inet-&gt;inet_saddr,</div><div class='del'>-						 inet-&gt;inet_daddr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_v4_send_check);</div><div class='del'>-</div><div class='del'>-static inline u64 dccp_v4_init_sequence(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return secure_dccp_sequence_number(ip_hdr(skb)-&gt;daddr,</div><div class='del'>-					   ip_hdr(skb)-&gt;saddr,</div><div class='del'>-					   dccp_hdr(skb)-&gt;dccph_dport,</div><div class='del'>-					   dccp_hdr(skb)-&gt;dccph_sport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The three way handshake has completed - we got a valid ACK or DATAACK -</div><div class='del'>- * now create the new socket.</div><div class='del'>- *</div><div class='del'>- * This is the equivalent of TCP's tcp_v4_syn_recv_sock</div><div class='del'>- */</div><div class='del'>-struct sock *dccp_v4_request_recv_sock(const struct sock *sk,</div><div class='del'>-				       struct sk_buff *skb,</div><div class='del'>-				       struct request_sock *req,</div><div class='del'>-				       struct dst_entry *dst,</div><div class='del'>-				       struct request_sock *req_unhash,</div><div class='del'>-				       bool *own_req)</div><div class='del'>-{</div><div class='del'>-	struct inet_request_sock *ireq;</div><div class='del'>-	struct inet_sock *newinet;</div><div class='del'>-	struct sock *newsk;</div><div class='del'>-</div><div class='del'>-	if (sk_acceptq_is_full(sk))</div><div class='del'>-		goto exit_overflow;</div><div class='del'>-</div><div class='del'>-	newsk = dccp_create_openreq_child(sk, req, skb);</div><div class='del'>-	if (newsk == NULL)</div><div class='del'>-		goto exit_nonewsk;</div><div class='del'>-</div><div class='del'>-	newinet		   = inet_sk(newsk);</div><div class='del'>-	ireq		   = inet_rsk(req);</div><div class='del'>-	sk_daddr_set(newsk, ireq-&gt;ir_rmt_addr);</div><div class='del'>-	sk_rcv_saddr_set(newsk, ireq-&gt;ir_loc_addr);</div><div class='del'>-	newinet-&gt;inet_saddr	= ireq-&gt;ir_loc_addr;</div><div class='del'>-	RCU_INIT_POINTER(newinet-&gt;inet_opt, rcu_dereference(ireq-&gt;ireq_opt));</div><div class='del'>-	newinet-&gt;mc_index  = inet_iif(skb);</div><div class='del'>-	newinet-&gt;mc_ttl	   = ip_hdr(skb)-&gt;ttl;</div><div class='del'>-	newinet-&gt;inet_id   = jiffies;</div><div class='del'>-</div><div class='del'>-	if (dst == NULL &amp;&amp; (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL)</div><div class='del'>-		goto put_and_exit;</div><div class='del'>-</div><div class='del'>-	sk_setup_caps(newsk, dst);</div><div class='del'>-</div><div class='del'>-	dccp_sync_mss(newsk, dst_mtu(dst));</div><div class='del'>-</div><div class='del'>-	if (__inet_inherit_port(sk, newsk) &lt; 0)</div><div class='del'>-		goto put_and_exit;</div><div class='del'>-	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));</div><div class='del'>-	if (*own_req)</div><div class='del'>-		ireq-&gt;ireq_opt = NULL;</div><div class='del'>-	else</div><div class='del'>-		newinet-&gt;inet_opt = NULL;</div><div class='del'>-	return newsk;</div><div class='del'>-</div><div class='del'>-exit_overflow:</div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);</div><div class='del'>-exit_nonewsk:</div><div class='del'>-	dst_release(dst);</div><div class='del'>-exit:</div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);</div><div class='del'>-	return NULL;</div><div class='del'>-put_and_exit:</div><div class='del'>-	newinet-&gt;inet_opt = NULL;</div><div class='del'>-	inet_csk_prepare_forced_close(newsk);</div><div class='del'>-	dccp_done(newsk);</div><div class='del'>-	goto exit;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_v4_request_recv_sock);</div><div class='del'>-</div><div class='del'>-static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,</div><div class='del'>-					   struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtable *rt;</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	struct flowi4 fl4 = {</div><div class='del'>-		.flowi4_oif = inet_iif(skb),</div><div class='del'>-		.daddr = iph-&gt;saddr,</div><div class='del'>-		.saddr = iph-&gt;daddr,</div><div class='del'>-		.flowi4_tos = RT_CONN_FLAGS(sk),</div><div class='del'>-		.flowi4_proto = sk-&gt;sk_protocol,</div><div class='del'>-		.fl4_sport = dccp_hdr(skb)-&gt;dccph_dport,</div><div class='del'>-		.fl4_dport = dccp_hdr(skb)-&gt;dccph_sport,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	security_skb_classify_flow(skb, flowi4_to_flowi(&amp;fl4));</div><div class='del'>-	rt = ip_route_output_flow(net, &amp;fl4, sk);</div><div class='del'>-	if (IS_ERR(rt)) {</div><div class='del'>-		IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;rt-&gt;dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	int err = -1;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	struct flowi4 fl4;</div><div class='del'>-</div><div class='del'>-	dst = inet_csk_route_req(sk, &amp;fl4, req);</div><div class='del'>-	if (dst == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	skb = dccp_make_response(sk, dst, req);</div><div class='del'>-	if (skb != NULL) {</div><div class='del'>-		const struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-		struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-		dh-&gt;dccph_checksum = dccp_v4_csum_finish(skb, ireq-&gt;ir_loc_addr,</div><div class='del'>-							      ireq-&gt;ir_rmt_addr);</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		err = ip_build_and_send_pkt(skb, sk, ireq-&gt;ir_loc_addr,</div><div class='del'>-					    ireq-&gt;ir_rmt_addr,</div><div class='del'>-					    rcu_dereference(ireq-&gt;ireq_opt));</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		err = net_xmit_eval(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	dst_release(dst);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	const struct iphdr *rxiph;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	struct net *net = dev_net(skb_dst(rxskb)-&gt;dev);</div><div class='del'>-	struct sock *ctl_sk = net-&gt;dccp.v4_ctl_sk;</div><div class='del'>-</div><div class='del'>-	/* Never send a reset in response to a reset. */</div><div class='del'>-	if (dccp_hdr(rxskb)-&gt;dccph_type == DCCP_PKT_RESET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (skb_rtable(rxskb)-&gt;rt_type != RTN_LOCAL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dst = dccp_v4_route_skb(net, ctl_sk, rxskb);</div><div class='del'>-	if (dst == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = dccp_ctl_make_reset(ctl_sk, rxskb);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rxiph = ip_hdr(rxskb);</div><div class='del'>-	dccp_hdr(skb)-&gt;dccph_checksum = dccp_v4_csum_finish(skb, rxiph-&gt;saddr,</div><div class='del'>-								 rxiph-&gt;daddr);</div><div class='del'>-	skb_dst_set(skb, dst_clone(dst));</div><div class='del'>-</div><div class='del'>-	local_bh_disable();</div><div class='del'>-	bh_lock_sock(ctl_sk);</div><div class='del'>-	err = ip_build_and_send_pkt(skb, ctl_sk,</div><div class='del'>-				    rxiph-&gt;daddr, rxiph-&gt;saddr, NULL);</div><div class='del'>-	bh_unlock_sock(ctl_sk);</div><div class='del'>-</div><div class='del'>-	if (net_xmit_eval(err) == 0) {</div><div class='del'>-		__DCCP_INC_STATS(DCCP_MIB_OUTSEGS);</div><div class='del'>-		__DCCP_INC_STATS(DCCP_MIB_OUTRSTS);</div><div class='del'>-	}</div><div class='del'>-	local_bh_enable();</div><div class='del'>-out:</div><div class='del'>-	dst_release(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v4_reqsk_destructor(struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	dccp_feat_list_purge(&amp;dccp_rsk(req)-&gt;dreq_featneg);</div><div class='del'>-	kfree(rcu_dereference_protected(inet_rsk(req)-&gt;ireq_opt, 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_syn_ack_timeout(const struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dccp_syn_ack_timeout);</div><div class='del'>-</div><div class='del'>-static struct request_sock_ops dccp_request_sock_ops __read_mostly = {</div><div class='del'>-	.family		= PF_INET,</div><div class='del'>-	.obj_size	= sizeof(struct dccp_request_sock),</div><div class='del'>-	.rtx_syn_ack	= dccp_v4_send_response,</div><div class='del'>-	.send_ack	= dccp_reqsk_send_ack,</div><div class='del'>-	.destructor	= dccp_v4_reqsk_destructor,</div><div class='del'>-	.send_reset	= dccp_v4_ctl_send_reset,</div><div class='del'>-	.syn_ack_timeout = dccp_syn_ack_timeout,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct inet_request_sock *ireq;</div><div class='del'>-	struct request_sock *req;</div><div class='del'>-	struct dccp_request_sock *dreq;</div><div class='del'>-	const __be32 service = dccp_hdr_request(skb)-&gt;dccph_req_service;</div><div class='del'>-	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	/* Never answer to DCCP_PKT_REQUESTs send to broadcast or multicast */</div><div class='del'>-	if (skb_rtable(skb)-&gt;rt_flags &amp; (RTCF_BROADCAST | RTCF_MULTICAST))</div><div class='del'>-		return 0;	/* discard, don't send a reset here */</div><div class='del'>-</div><div class='del'>-	if (dccp_bad_service_code(sk, service)) {</div><div class='del'>-		dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * TW buckets are converted to open requests without</div><div class='del'>-	 * limitations, they conserve resources and peer is</div><div class='del'>-	 * evidently real one.</div><div class='del'>-	 */</div><div class='del'>-	dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-	if (inet_csk_reqsk_queue_is_full(sk))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (sk_acceptq_is_full(sk))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	req = inet_reqsk_alloc(&amp;dccp_request_sock_ops, sk, true);</div><div class='del'>-	if (req == NULL)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (dccp_reqsk_init(req, dccp_sk(sk), skb))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	dreq = dccp_rsk(req);</div><div class='del'>-	if (dccp_parse_options(sk, dreq, skb))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	if (security_inet_conn_request(sk, skb, req))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	ireq = inet_rsk(req);</div><div class='del'>-	sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)-&gt;daddr);</div><div class='del'>-	sk_daddr_set(req_to_sk(req), ip_hdr(skb)-&gt;saddr);</div><div class='del'>-	ireq-&gt;ir_mark = inet_request_mark(sk, skb);</div><div class='del'>-	ireq-&gt;ireq_family = AF_INET;</div><div class='del'>-	ireq-&gt;ir_iif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Step 3: Process LISTEN state</div><div class='del'>-	 *</div><div class='del'>-	 * Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie</div><div class='del'>-	 *</div><div class='del'>-	 * Setting S.SWL/S.SWH to is deferred to dccp_create_openreq_child().</div><div class='del'>-	 */</div><div class='del'>-	dreq-&gt;dreq_isr	   = dcb-&gt;dccpd_seq;</div><div class='del'>-	dreq-&gt;dreq_gsr	   = dreq-&gt;dreq_isr;</div><div class='del'>-	dreq-&gt;dreq_iss	   = dccp_v4_init_sequence(skb);</div><div class='del'>-	dreq-&gt;dreq_gss     = dreq-&gt;dreq_iss;</div><div class='del'>-	dreq-&gt;dreq_service = service;</div><div class='del'>-</div><div class='del'>-	if (dccp_v4_send_response(sk, req))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	inet_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT);</div><div class='del'>-	reqsk_put(req);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-drop_and_free:</div><div class='del'>-	reqsk_free(req);</div><div class='del'>-drop:</div><div class='del'>-	__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_v4_conn_request);</div><div class='del'>-</div><div class='del'>-int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_OPEN) { /* Fast path */</div><div class='del'>-		if (dccp_rcv_established(sk, skb, dh, skb-&gt;len))</div><div class='del'>-			goto reset;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Step 3: Process LISTEN state</div><div class='del'>-	 *	 If P.type == Request or P contains a valid Init Cookie option,</div><div class='del'>-	 *	      (* Must scan the packet's options to check for Init</div><div class='del'>-	 *		 Cookies.  Only Init Cookies are processed here,</div><div class='del'>-	 *		 however; other options are processed in Step 8.  This</div><div class='del'>-	 *		 scan need only be performed if the endpoint uses Init</div><div class='del'>-	 *		 Cookies *)</div><div class='del'>-	 *	      (* Generate a new socket and switch to that socket *)</div><div class='del'>-	 *	      Set S := new socket for this port pair</div><div class='del'>-	 *	      S.state = RESPOND</div><div class='del'>-	 *	      Choose S.ISS (initial seqno) or set from Init Cookies</div><div class='del'>-	 *	      Initialize S.GAR := S.ISS</div><div class='del'>-	 *	      Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies</div><div class='del'>-	 *	      Continue with S.state == RESPOND</div><div class='del'>-	 *	      (* A Response packet will be generated in Step 11 *)</div><div class='del'>-	 *	 Otherwise,</div><div class='del'>-	 *	      Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *	      Drop packet and return</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE: the check for the packet types is done in</div><div class='del'>-	 *	 dccp_rcv_state_process</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (dccp_rcv_state_process(sk, skb, dh, skb-&gt;len))</div><div class='del'>-		goto reset;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-reset:</div><div class='del'>-	dccp_v4_ctl_send_reset(sk, skb);</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_v4_do_rcv);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	dccp_invalid_packet  -  check for malformed packets</div><div class='del'>- *	Implements RFC 4340, 8.5:  Step 1: Check header basics</div><div class='del'>- *	Packets that fail these checks are ignored and do not receive Resets.</div><div class='del'>- */</div><div class='del'>-int dccp_invalid_packet(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	unsigned int cscov;</div><div class='del'>-	u8 dccph_doff;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* If the packet is shorter than 12 bytes, drop packet and return */</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct dccp_hdr))) {</div><div class='del'>-		DCCP_WARN("pskb_may_pull failed\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	/* If P.type is not understood, drop packet and return */</div><div class='del'>-	if (dh-&gt;dccph_type &gt;= DCCP_PKT_INVALID) {</div><div class='del'>-		DCCP_WARN("invalid packet type\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If P.Data Offset is too small for packet type, drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	dccph_doff = dh-&gt;dccph_doff;</div><div class='del'>-	if (dccph_doff &lt; dccp_hdr_len(skb) / sizeof(u32)) {</div><div class='del'>-		DCCP_WARN("P.Data Offset(%u) too small\n", dccph_doff);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If P.Data Offset is too too large for packet, drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (!pskb_may_pull(skb, dccph_doff * sizeof(u32))) {</div><div class='del'>-		DCCP_WARN("P.Data Offset(%u) too large\n", dccph_doff);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	dh = dccp_hdr(skb);</div><div class='del'>-	/*</div><div class='del'>-	 * If P.type is not Data, Ack, or DataAck and P.X == 0 (the packet</div><div class='del'>-	 * has short sequence numbers), drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if ((dh-&gt;dccph_type &lt; DCCP_PKT_DATA    ||</div><div class='del'>-	    dh-&gt;dccph_type &gt; DCCP_PKT_DATAACK) &amp;&amp; dh-&gt;dccph_x == 0)  {</div><div class='del'>-		DCCP_WARN("P.type (%s) not Data || [Data]Ack, while P.X == 0\n",</div><div class='del'>-			  dccp_packet_name(dh-&gt;dccph_type));</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If P.CsCov is too large for the packet size, drop packet and return.</div><div class='del'>-	 * This must come _before_ checksumming (not as RFC 4340 suggests).</div><div class='del'>-	 */</div><div class='del'>-	cscov = dccp_csum_coverage(skb);</div><div class='del'>-	if (cscov &gt; skb-&gt;len) {</div><div class='del'>-		DCCP_WARN("P.CsCov %u exceeds packet length %d\n",</div><div class='del'>-			  dh-&gt;dccph_cscov, skb-&gt;len);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If header checksum is incorrect, drop packet and return.</div><div class='del'>-	 * (This step is completed in the AF-dependent functions.) */</div><div class='del'>-	skb-&gt;csum = skb_checksum(skb, 0, cscov, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_invalid_packet);</div><div class='del'>-</div><div class='del'>-/* this is called when real data arrives */</div><div class='del'>-static int dccp_v4_rcv(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	const struct iphdr *iph;</div><div class='del'>-	bool refcounted;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	int min_cov;</div><div class='del'>-</div><div class='del'>-	/* Step 1: Check header basics */</div><div class='del'>-</div><div class='del'>-	if (dccp_invalid_packet(skb))</div><div class='del'>-		goto discard_it;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-	/* Step 1: If header checksum is incorrect, drop packet and return */</div><div class='del'>-	if (dccp_v4_csum_finish(skb, iph-&gt;saddr, iph-&gt;daddr)) {</div><div class='del'>-		DCCP_WARN("dropped packet with invalid checksum\n");</div><div class='del'>-		goto discard_it;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_seq  = dccp_hdr_seq(dh);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type = dh-&gt;dccph_type;</div><div class='del'>-</div><div class='del'>-	dccp_pr_debug("%8.8s src=%pI4@%-5d dst=%pI4@%-5d seq=%llu",</div><div class='del'>-		      dccp_packet_name(dh-&gt;dccph_type),</div><div class='del'>-		      &amp;iph-&gt;saddr, ntohs(dh-&gt;dccph_sport),</div><div class='del'>-		      &amp;iph-&gt;daddr, ntohs(dh-&gt;dccph_dport),</div><div class='del'>-		      (unsigned long long) DCCP_SKB_CB(skb)-&gt;dccpd_seq);</div><div class='del'>-</div><div class='del'>-	if (dccp_packet_without_ack(skb)) {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq = DCCP_PKT_WITHOUT_ACK_SEQ;</div><div class='del'>-		dccp_pr_debug_cat("\n");</div><div class='del'>-	} else {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq = dccp_hdr_ack_seq(skb);</div><div class='del'>-		dccp_pr_debug_cat(", ack=%llu\n", (unsigned long long)</div><div class='del'>-				  DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-lookup:</div><div class='del'>-	sk = __inet_lookup_skb(&amp;dccp_hashinfo, skb, __dccp_hdr_len(dh),</div><div class='del'>-			       dh-&gt;dccph_sport, dh-&gt;dccph_dport, 0, &amp;refcounted);</div><div class='del'>-	if (!sk) {</div><div class='del'>-		dccp_pr_debug("failed to look up flow ID in table and "</div><div class='del'>-			      "get corresponding socket\n");</div><div class='del'>-		goto no_dccp_socket;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Step 2:</div><div class='del'>-	 *	... or S.state == TIMEWAIT,</div><div class='del'>-	 *		Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *		Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_TIME_WAIT) {</div><div class='del'>-		dccp_pr_debug("sk-&gt;sk_state == DCCP_TIME_WAIT: do_time_wait\n");</div><div class='del'>-		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		goto no_dccp_socket;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_NEW_SYN_RECV) {</div><div class='del'>-		struct request_sock *req = inet_reqsk(sk);</div><div class='del'>-		struct sock *nsk;</div><div class='del'>-</div><div class='del'>-		sk = req-&gt;rsk_listener;</div><div class='del'>-		if (unlikely(sk-&gt;sk_state != DCCP_LISTEN)) {</div><div class='del'>-			inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='del'>-			goto lookup;</div><div class='del'>-		}</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		refcounted = true;</div><div class='del'>-		nsk = dccp_check_req(sk, skb, req);</div><div class='del'>-		if (!nsk) {</div><div class='del'>-			reqsk_put(req);</div><div class='del'>-			goto discard_and_relse;</div><div class='del'>-		}</div><div class='del'>-		if (nsk == sk) {</div><div class='del'>-			reqsk_put(req);</div><div class='del'>-		} else if (dccp_child_process(sk, nsk, skb)) {</div><div class='del'>-			dccp_v4_ctl_send_reset(sk, skb);</div><div class='del'>-			goto discard_and_relse;</div><div class='del'>-		} else {</div><div class='del'>-			sock_put(sk);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage</div><div class='del'>-	 *	o if MinCsCov = 0, only packets with CsCov = 0 are accepted</div><div class='del'>-	 *	o if MinCsCov &gt; 0, also accept packets with CsCov &gt;= MinCsCov</div><div class='del'>-	 */</div><div class='del'>-	min_cov = dccp_sk(sk)-&gt;dccps_pcrlen;</div><div class='del'>-	if (dh-&gt;dccph_cscov &amp;&amp; (min_cov == 0 || dh-&gt;dccph_cscov &lt; min_cov))  {</div><div class='del'>-		dccp_pr_debug("Packet CsCov %d does not satisfy MinCsCov %d\n",</div><div class='del'>-			      dh-&gt;dccph_cscov, min_cov);</div><div class='del'>-		/* FIXME: "Such packets SHOULD be reported using Data Dropped</div><div class='del'>-		 *         options (Section 11.7) with Drop Code 0, Protocol</div><div class='del'>-		 *         Constraints."                                     */</div><div class='del'>-		goto discard_and_relse;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='del'>-		goto discard_and_relse;</div><div class='del'>-	nf_reset(skb);</div><div class='del'>-</div><div class='del'>-	return __sk_receive_skb(sk, skb, 1, dh-&gt;dccph_doff * 4, refcounted);</div><div class='del'>-</div><div class='del'>-no_dccp_socket:</div><div class='del'>-	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='del'>-		goto discard_it;</div><div class='del'>-	/*</div><div class='del'>-	 * Step 2:</div><div class='del'>-	 *	If no socket ...</div><div class='del'>-	 *		Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *		Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (dh-&gt;dccph_type != DCCP_PKT_RESET) {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_reset_code =</div><div class='del'>-					DCCP_RESET_CODE_NO_CONNECTION;</div><div class='del'>-		dccp_v4_ctl_send_reset(sk, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-discard_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-discard_and_relse:</div><div class='del'>-	if (refcounted)</div><div class='del'>-		sock_put(sk);</div><div class='del'>-	goto discard_it;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct inet_connection_sock_af_ops dccp_ipv4_af_ops = {</div><div class='del'>-	.queue_xmit	   = ip_queue_xmit,</div><div class='del'>-	.send_check	   = dccp_v4_send_check,</div><div class='del'>-	.rebuild_header	   = inet_sk_rebuild_header,</div><div class='del'>-	.conn_request	   = dccp_v4_conn_request,</div><div class='del'>-	.syn_recv_sock	   = dccp_v4_request_recv_sock,</div><div class='del'>-	.net_header_len	   = sizeof(struct iphdr),</div><div class='del'>-	.setsockopt	   = ip_setsockopt,</div><div class='del'>-	.getsockopt	   = ip_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ip_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ip_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dccp_v4_init_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	static __u8 dccp_v4_ctl_sock_initialized;</div><div class='del'>-	int err = dccp_init_sock(sk, dccp_v4_ctl_sock_initialized);</div><div class='del'>-</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		if (unlikely(!dccp_v4_ctl_sock_initialized))</div><div class='del'>-			dccp_v4_ctl_sock_initialized = 1;</div><div class='del'>-		inet_csk(sk)-&gt;icsk_af_ops = &amp;dccp_ipv4_af_ops;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct timewait_sock_ops dccp_timewait_sock_ops = {</div><div class='del'>-	.twsk_obj_size	= sizeof(struct inet_timewait_sock),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct proto dccp_v4_prot = {</div><div class='del'>-	.name			= "DCCP",</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.close			= dccp_close,</div><div class='del'>-	.connect		= dccp_v4_connect,</div><div class='del'>-	.disconnect		= dccp_disconnect,</div><div class='del'>-	.ioctl			= dccp_ioctl,</div><div class='del'>-	.init			= dccp_v4_init_sock,</div><div class='del'>-	.setsockopt		= dccp_setsockopt,</div><div class='del'>-	.getsockopt		= dccp_getsockopt,</div><div class='del'>-	.sendmsg		= dccp_sendmsg,</div><div class='del'>-	.recvmsg		= dccp_recvmsg,</div><div class='del'>-	.backlog_rcv		= dccp_v4_do_rcv,</div><div class='del'>-	.hash			= inet_hash,</div><div class='del'>-	.unhash			= inet_unhash,</div><div class='del'>-	.accept			= inet_csk_accept,</div><div class='del'>-	.get_port		= inet_csk_get_port,</div><div class='del'>-	.shutdown		= dccp_shutdown,</div><div class='del'>-	.destroy		= dccp_destroy_sock,</div><div class='del'>-	.orphan_count		= &amp;dccp_orphan_count,</div><div class='del'>-	.max_header		= MAX_DCCP_HEADER,</div><div class='del'>-	.obj_size		= sizeof(struct dccp_sock),</div><div class='del'>-	.slab_flags		= SLAB_TYPESAFE_BY_RCU,</div><div class='del'>-	.rsk_prot		= &amp;dccp_request_sock_ops,</div><div class='del'>-	.twsk_prot		= &amp;dccp_timewait_sock_ops,</div><div class='del'>-	.h.hashinfo		= &amp;dccp_hashinfo,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt	= compat_dccp_setsockopt,</div><div class='del'>-	.compat_getsockopt	= compat_dccp_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_protocol dccp_v4_protocol = {</div><div class='del'>-	.handler	= dccp_v4_rcv,</div><div class='del'>-	.err_handler	= dccp_v4_err,</div><div class='del'>-	.no_policy	= 1,</div><div class='del'>-	.netns_ok	= 1,</div><div class='del'>-	.icmp_strict_tag_validation = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proto_ops inet_dccp_ops = {</div><div class='del'>-	.family		   = PF_INET,</div><div class='del'>-	.owner		   = THIS_MODULE,</div><div class='del'>-	.release	   = inet_release,</div><div class='del'>-	.bind		   = inet_bind,</div><div class='del'>-	.connect	   = inet_stream_connect,</div><div class='del'>-	.socketpair	   = sock_no_socketpair,</div><div class='del'>-	.accept		   = inet_accept,</div><div class='del'>-	.getname	   = inet_getname,</div><div class='del'>-	/* FIXME: work on tcp_poll to rename it to inet_csk_poll */</div><div class='del'>-	.poll		   = dccp_poll,</div><div class='del'>-	.ioctl		   = inet_ioctl,</div><div class='del'>-	/* FIXME: work on inet_listen to rename it to sock_common_listen */</div><div class='del'>-	.listen		   = inet_dccp_listen,</div><div class='del'>-	.shutdown	   = inet_shutdown,</div><div class='del'>-	.setsockopt	   = sock_common_setsockopt,</div><div class='del'>-	.getsockopt	   = sock_common_getsockopt,</div><div class='del'>-	.sendmsg	   = inet_sendmsg,</div><div class='del'>-	.recvmsg	   = sock_common_recvmsg,</div><div class='del'>-	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct inet_protosw dccp_v4_protosw = {</div><div class='del'>-	.type		= SOCK_DCCP,</div><div class='del'>-	.protocol	= IPPROTO_DCCP,</div><div class='del'>-	.prot		= &amp;dccp_v4_prot,</div><div class='del'>-	.ops		= &amp;inet_dccp_ops,</div><div class='del'>-	.flags		= INET_PROTOSW_ICSK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init dccp_v4_init_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	if (dccp_hashinfo.bhash == NULL)</div><div class='del'>-		return -ESOCKTNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	return inet_ctl_sock_create(&amp;net-&gt;dccp.v4_ctl_sk, PF_INET,</div><div class='del'>-				    SOCK_DCCP, IPPROTO_DCCP, net);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit dccp_v4_exit_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	inet_ctl_sock_destroy(net-&gt;dccp.v4_ctl_sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit dccp_v4_exit_batch(struct list_head *net_exit_list)</div><div class='del'>-{</div><div class='del'>-	inet_twsk_purge(&amp;dccp_hashinfo, AF_INET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations dccp_v4_ops = {</div><div class='del'>-	.init	= dccp_v4_init_net,</div><div class='del'>-	.exit	= dccp_v4_exit_net,</div><div class='del'>-	.exit_batch = dccp_v4_exit_batch,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dccp_v4_init(void)</div><div class='del'>-{</div><div class='del'>-	int err = proto_register(&amp;dccp_v4_prot, 1);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	inet_register_protosw(&amp;dccp_v4_protosw);</div><div class='del'>-</div><div class='del'>-	err = register_pernet_subsys(&amp;dccp_v4_ops);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_destroy_ctl_sock;</div><div class='del'>-</div><div class='del'>-	err = inet_add_protocol(&amp;dccp_v4_protocol, IPPROTO_DCCP);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_proto_unregister;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-out_proto_unregister:</div><div class='del'>-	unregister_pernet_subsys(&amp;dccp_v4_ops);</div><div class='del'>-out_destroy_ctl_sock:</div><div class='del'>-	inet_unregister_protosw(&amp;dccp_v4_protosw);</div><div class='del'>-	proto_unregister(&amp;dccp_v4_prot);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dccp_v4_exit(void)</div><div class='del'>-{</div><div class='del'>-	inet_del_protocol(&amp;dccp_v4_protocol, IPPROTO_DCCP);</div><div class='del'>-	unregister_pernet_subsys(&amp;dccp_v4_ops);</div><div class='del'>-	inet_unregister_protosw(&amp;dccp_v4_protosw);</div><div class='del'>-	proto_unregister(&amp;dccp_v4_prot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dccp_v4_init);</div><div class='del'>-module_exit(dccp_v4_exit);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * __stringify doesn't likes enums, so use SOCK_DCCP (6) and IPPROTO_DCCP (33)</div><div class='del'>- * values directly, Also cover the case where the protocol is not specified,</div><div class='del'>- * i.e. net-pf-PF_INET-proto-0-type-SOCK_DCCP</div><div class='del'>- */</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 33, 6);</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 0, 6);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("DCCP - Datagram Congestion Controlled Protocol");</div><div class='head'>diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c<br/>deleted file mode 100644<br/>index 6344f1b18a6a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1169 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	DCCP over IPv6</div><div class='del'>- *	Linux INET6 implementation</div><div class='del'>- *</div><div class='del'>- *	Based on net/dccp6/ipv6.c</div><div class='del'>- *</div><div class='del'>- *	Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/xfrm.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-#include &lt;net/inet_common.h&gt;</div><div class='del'>-#include &lt;net/inet_hashtables.h&gt;</div><div class='del'>-#include &lt;net/inet_sock.h&gt;</div><div class='del'>-#include &lt;net/inet6_connection_sock.h&gt;</div><div class='del'>-#include &lt;net/inet6_hashtables.h&gt;</div><div class='del'>-#include &lt;net/ip6_route.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-#include &lt;net/transp_v6.h&gt;</div><div class='del'>-#include &lt;net/ip6_checksum.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/secure_seq.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "ipv6.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-/* The per-net dccp.v6_ctl_sk is used for sending RSTs and ACKs */</div><div class='del'>-</div><div class='del'>-static const struct inet_connection_sock_af_ops dccp_ipv6_mapped;</div><div class='del'>-static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops;</div><div class='del'>-</div><div class='del'>-/* add pseudo-header to DCCP checksum stored in skb-&gt;csum */</div><div class='del'>-static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb,</div><div class='del'>-				      const struct in6_addr *saddr,</div><div class='del'>-				      const struct in6_addr *daddr)</div><div class='del'>-{</div><div class='del'>-	return csum_ipv6_magic(saddr, daddr, skb-&gt;len, IPPROTO_DCCP, skb-&gt;csum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_v6_send_check(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	dccp_csum_outgoing(skb);</div><div class='del'>-	dh-&gt;dccph_checksum = dccp_v6_csum_finish(skb, &amp;np-&gt;saddr, &amp;sk-&gt;sk_v6_daddr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 dccp_v6_init_sequence(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return secure_dccpv6_sequence_number(ipv6_hdr(skb)-&gt;daddr.s6_addr32,</div><div class='del'>-					     ipv6_hdr(skb)-&gt;saddr.s6_addr32,</div><div class='del'>-					     dccp_hdr(skb)-&gt;dccph_dport,</div><div class='del'>-					     dccp_hdr(skb)-&gt;dccph_sport     );</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='del'>-			u8 type, u8 code, int offset, __be32 info)</div><div class='del'>-{</div><div class='del'>-	const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb-&gt;data;</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	struct dccp_sock *dp;</div><div class='del'>-	struct ipv6_pinfo *np;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	int err;</div><div class='del'>-	__u64 seq;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* Only need dccph_dport &amp; dccph_sport which are the first</div><div class='del'>-	 * 4 bytes in dccp header.</div><div class='del'>-	 * Our caller (icmpv6_notify()) already pulled 8 bytes for us.</div><div class='del'>-	 */</div><div class='del'>-	BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) &gt; 8);</div><div class='del'>-	BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) &gt; 8);</div><div class='del'>-	dh = (struct dccp_hdr *)(skb-&gt;data + offset);</div><div class='del'>-</div><div class='del'>-	sk = __inet6_lookup_established(net, &amp;dccp_hashinfo,</div><div class='del'>-					&amp;hdr-&gt;daddr, dh-&gt;dccph_dport,</div><div class='del'>-					&amp;hdr-&gt;saddr, ntohs(dh-&gt;dccph_sport),</div><div class='del'>-					inet6_iif(skb), 0);</div><div class='del'>-</div><div class='del'>-	if (!sk) {</div><div class='del'>-		__ICMP6_INC_STATS(net, __in6_dev_get(skb-&gt;dev),</div><div class='del'>-				  ICMP6_MIB_INERRORS);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_TIME_WAIT) {</div><div class='del'>-		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	seq = dccp_hdr_seq(dh);</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_NEW_SYN_RECV)</div><div class='del'>-		return dccp_req_err(sk, seq);</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk))</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_LOCKDROPPEDICMPS);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dp = dccp_sk(sk);</div><div class='del'>-	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(DCCPF_REQUESTING | DCCPF_LISTEN) &amp;&amp;</div><div class='del'>-	    !between48(seq, dp-&gt;dccps_awl, dp-&gt;dccps_awh)) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	np = inet6_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (type == NDISC_REDIRECT) {</div><div class='del'>-		if (!sock_owned_by_user(sk)) {</div><div class='del'>-			struct dst_entry *dst = __sk_dst_check(sk, np-&gt;dst_cookie);</div><div class='del'>-</div><div class='del'>-			if (dst)</div><div class='del'>-				dst-&gt;ops-&gt;redirect(dst, sk, skb);</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type == ICMPV6_PKT_TOOBIG) {</div><div class='del'>-		struct dst_entry *dst = NULL;</div><div class='del'>-</div><div class='del'>-		if (!ip6_sk_accept_pmtu(sk))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (sock_owned_by_user(sk))</div><div class='del'>-			goto out;</div><div class='del'>-		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (DCCPF_LISTEN | DCCPF_CLOSED))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		dst = inet6_csk_update_pmtu(sk, ntohl(info));</div><div class='del'>-		if (!dst)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (inet_csk(sk)-&gt;icsk_pmtu_cookie &gt; dst_mtu(dst))</div><div class='del'>-			dccp_sync_mss(sk, dst_mtu(dst));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icmpv6_err_convert(type, code, &amp;err);</div><div class='del'>-</div><div class='del'>-	/* Might be for an request_sock */</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_REQUESTING:</div><div class='del'>-	case DCCP_RESPOND:  /* Cannot happen.</div><div class='del'>-			       It can, it SYNs are crossed. --ANK */</div><div class='del'>-		if (!sock_owned_by_user(sk)) {</div><div class='del'>-			__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);</div><div class='del'>-			sk-&gt;sk_err = err;</div><div class='del'>-			/*</div><div class='del'>-			 * Wake people up to see the error</div><div class='del'>-			 * (see connect in sock.c)</div><div class='del'>-			 */</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='del'>-			dccp_done(sk);</div><div class='del'>-		} else</div><div class='del'>-			sk-&gt;sk_err_soft = err;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sock_owned_by_user(sk) &amp;&amp; np-&gt;recverr) {</div><div class='del'>-		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='del'>-	} else</div><div class='del'>-		sk-&gt;sk_err_soft = err;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct in6_addr *final_p, final;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-	int err = -1;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_proto = IPPROTO_DCCP;</div><div class='del'>-	fl6.daddr = ireq-&gt;ir_v6_rmt_addr;</div><div class='del'>-	fl6.saddr = ireq-&gt;ir_v6_loc_addr;</div><div class='del'>-	fl6.flowlabel = 0;</div><div class='del'>-	fl6.flowi6_oif = ireq-&gt;ir_iif;</div><div class='del'>-	fl6.fl6_dport = ireq-&gt;ir_rmt_port;</div><div class='del'>-	fl6.fl6_sport = htons(ireq-&gt;ir_num);</div><div class='del'>-	security_req_classify_flow(req, flowi6_to_flowi(&amp;fl6));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	final_p = fl6_update_dst(&amp;fl6, rcu_dereference(np-&gt;opt), &amp;final);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='del'>-	if (IS_ERR(dst)) {</div><div class='del'>-		err = PTR_ERR(dst);</div><div class='del'>-		dst = NULL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dccp_make_response(sk, dst, req);</div><div class='del'>-	if (skb != NULL) {</div><div class='del'>-		struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-		struct ipv6_txoptions *opt;</div><div class='del'>-</div><div class='del'>-		dh-&gt;dccph_checksum = dccp_v6_csum_finish(skb,</div><div class='del'>-							 &amp;ireq-&gt;ir_v6_loc_addr,</div><div class='del'>-							 &amp;ireq-&gt;ir_v6_rmt_addr);</div><div class='del'>-		fl6.daddr = ireq-&gt;ir_v6_rmt_addr;</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		opt = ireq-&gt;ipv6_opt;</div><div class='del'>-		if (!opt)</div><div class='del'>-			opt = rcu_dereference(np-&gt;opt);</div><div class='del'>-		err = ip6_xmit(sk, skb, &amp;fl6, sk-&gt;sk_mark, opt, np-&gt;tclass);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		err = net_xmit_eval(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	dst_release(dst);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v6_reqsk_destructor(struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	dccp_feat_list_purge(&amp;dccp_rsk(req)-&gt;dreq_featneg);</div><div class='del'>-	kfree(inet_rsk(req)-&gt;ipv6_opt);</div><div class='del'>-	kfree_skb(inet_rsk(req)-&gt;pktopts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)</div><div class='del'>-{</div><div class='del'>-	const struct ipv6hdr *rxip6h;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-	struct net *net = dev_net(skb_dst(rxskb)-&gt;dev);</div><div class='del'>-	struct sock *ctl_sk = net-&gt;dccp.v6_ctl_sk;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-</div><div class='del'>-	if (dccp_hdr(rxskb)-&gt;dccph_type == DCCP_PKT_RESET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!ipv6_unicast_destination(rxskb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = dccp_ctl_make_reset(ctl_sk, rxskb);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rxip6h = ipv6_hdr(rxskb);</div><div class='del'>-	dccp_hdr(skb)-&gt;dccph_checksum = dccp_v6_csum_finish(skb, &amp;rxip6h-&gt;saddr,</div><div class='del'>-							    &amp;rxip6h-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.daddr = rxip6h-&gt;saddr;</div><div class='del'>-	fl6.saddr = rxip6h-&gt;daddr;</div><div class='del'>-</div><div class='del'>-	fl6.flowi6_proto = IPPROTO_DCCP;</div><div class='del'>-	fl6.flowi6_oif = inet6_iif(rxskb);</div><div class='del'>-	fl6.fl6_dport = dccp_hdr(skb)-&gt;dccph_dport;</div><div class='del'>-	fl6.fl6_sport = dccp_hdr(skb)-&gt;dccph_sport;</div><div class='del'>-	security_skb_classify_flow(rxskb, flowi6_to_flowi(&amp;fl6));</div><div class='del'>-</div><div class='del'>-	/* sk = NULL, but it is safe for now. RST socket required. */</div><div class='del'>-	dst = ip6_dst_lookup_flow(ctl_sk, &amp;fl6, NULL);</div><div class='del'>-	if (!IS_ERR(dst)) {</div><div class='del'>-		skb_dst_set(skb, dst);</div><div class='del'>-		ip6_xmit(ctl_sk, skb, &amp;fl6, 0, NULL, 0);</div><div class='del'>-		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);</div><div class='del'>-		DCCP_INC_STATS(DCCP_MIB_OUTRSTS);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct request_sock_ops dccp6_request_sock_ops = {</div><div class='del'>-	.family		= AF_INET6,</div><div class='del'>-	.obj_size	= sizeof(struct dccp6_request_sock),</div><div class='del'>-	.rtx_syn_ack	= dccp_v6_send_response,</div><div class='del'>-	.send_ack	= dccp_reqsk_send_ack,</div><div class='del'>-	.destructor	= dccp_v6_reqsk_destructor,</div><div class='del'>-	.send_reset	= dccp_v6_ctl_send_reset,</div><div class='del'>-	.syn_ack_timeout = dccp_syn_ack_timeout,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct request_sock *req;</div><div class='del'>-	struct dccp_request_sock *dreq;</div><div class='del'>-	struct inet_request_sock *ireq;</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	const __be32 service = dccp_hdr_request(skb)-&gt;dccph_req_service;</div><div class='del'>-	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='del'>-		return dccp_v4_conn_request(sk, skb);</div><div class='del'>-</div><div class='del'>-	if (!ipv6_unicast_destination(skb))</div><div class='del'>-		return 0;	/* discard, don't send a reset here */</div><div class='del'>-</div><div class='del'>-	if (dccp_bad_service_code(sk, service)) {</div><div class='del'>-		dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE;</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * There are no SYN attacks on IPv6, yet...</div><div class='del'>-	 */</div><div class='del'>-	dcb-&gt;dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-	if (inet_csk_reqsk_queue_is_full(sk))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (sk_acceptq_is_full(sk))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	req = inet_reqsk_alloc(&amp;dccp6_request_sock_ops, sk, true);</div><div class='del'>-	if (req == NULL)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (dccp_reqsk_init(req, dccp_sk(sk), skb))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	dreq = dccp_rsk(req);</div><div class='del'>-	if (dccp_parse_options(sk, dreq, skb))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	if (security_inet_conn_request(sk, skb, req))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	ireq = inet_rsk(req);</div><div class='del'>-	ireq-&gt;ir_v6_rmt_addr = ipv6_hdr(skb)-&gt;saddr;</div><div class='del'>-	ireq-&gt;ir_v6_loc_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='del'>-	ireq-&gt;ireq_family = AF_INET6;</div><div class='del'>-	ireq-&gt;ir_mark = inet_request_mark(sk, skb);</div><div class='del'>-</div><div class='del'>-	if (ipv6_opt_accepted(sk, skb, IP6CB(skb)) ||</div><div class='del'>-	    np-&gt;rxopt.bits.rxinfo || np-&gt;rxopt.bits.rxoinfo ||</div><div class='del'>-	    np-&gt;rxopt.bits.rxhlim || np-&gt;rxopt.bits.rxohlim) {</div><div class='del'>-		refcount_inc(&amp;skb-&gt;users);</div><div class='del'>-		ireq-&gt;pktopts = skb;</div><div class='del'>-	}</div><div class='del'>-	ireq-&gt;ir_iif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-</div><div class='del'>-	/* So that link locals have meaning */</div><div class='del'>-	if (!sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-	    ipv6_addr_type(&amp;ireq-&gt;ir_v6_rmt_addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='del'>-		ireq-&gt;ir_iif = inet6_iif(skb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Step 3: Process LISTEN state</div><div class='del'>-	 *</div><div class='del'>-	 *   Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie</div><div class='del'>-	 *</div><div class='del'>-	 * Setting S.SWL/S.SWH to is deferred to dccp_create_openreq_child().</div><div class='del'>-	 */</div><div class='del'>-	dreq-&gt;dreq_isr	   = dcb-&gt;dccpd_seq;</div><div class='del'>-	dreq-&gt;dreq_gsr     = dreq-&gt;dreq_isr;</div><div class='del'>-	dreq-&gt;dreq_iss	   = dccp_v6_init_sequence(skb);</div><div class='del'>-	dreq-&gt;dreq_gss     = dreq-&gt;dreq_iss;</div><div class='del'>-	dreq-&gt;dreq_service = service;</div><div class='del'>-</div><div class='del'>-	if (dccp_v6_send_response(sk, req))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	inet_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT);</div><div class='del'>-	reqsk_put(req);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-drop_and_free:</div><div class='del'>-	reqsk_free(req);</div><div class='del'>-drop:</div><div class='del'>-	__DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sock *dccp_v6_request_recv_sock(const struct sock *sk,</div><div class='del'>-					      struct sk_buff *skb,</div><div class='del'>-					      struct request_sock *req,</div><div class='del'>-					      struct dst_entry *dst,</div><div class='del'>-					      struct request_sock *req_unhash,</div><div class='del'>-					      bool *own_req)</div><div class='del'>-{</div><div class='del'>-	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-	struct ipv6_pinfo *newnp;</div><div class='del'>-	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct ipv6_txoptions *opt;</div><div class='del'>-	struct inet_sock *newinet;</div><div class='del'>-	struct dccp6_sock *newdp6;</div><div class='del'>-	struct sock *newsk;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-		/*</div><div class='del'>-		 *	v6 mapped</div><div class='del'>-		 */</div><div class='del'>-		newsk = dccp_v4_request_recv_sock(sk, skb, req, dst,</div><div class='del'>-						  req_unhash, own_req);</div><div class='del'>-		if (newsk == NULL)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		newdp6 = (struct dccp6_sock *)newsk;</div><div class='del'>-		newinet = inet_sk(newsk);</div><div class='del'>-		newinet-&gt;pinet6 = &amp;newdp6-&gt;inet6;</div><div class='del'>-		newnp = inet6_sk(newsk);</div><div class='del'>-</div><div class='del'>-		memcpy(newnp, np, sizeof(struct ipv6_pinfo));</div><div class='del'>-</div><div class='del'>-		newnp-&gt;saddr = newsk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-</div><div class='del'>-		inet_csk(newsk)-&gt;icsk_af_ops = &amp;dccp_ipv6_mapped;</div><div class='del'>-		newsk-&gt;sk_backlog_rcv = dccp_v4_do_rcv;</div><div class='del'>-		newnp-&gt;pktoptions  = NULL;</div><div class='del'>-		newnp-&gt;opt	   = NULL;</div><div class='del'>-		newnp-&gt;ipv6_mc_list = NULL;</div><div class='del'>-		newnp-&gt;ipv6_ac_list = NULL;</div><div class='del'>-		newnp-&gt;ipv6_fl_list = NULL;</div><div class='del'>-		newnp-&gt;mcast_oif   = inet6_iif(skb);</div><div class='del'>-		newnp-&gt;mcast_hops  = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * No need to charge this sock to the relevant IPv6 refcnt debug socks count</div><div class='del'>-		 * here, dccp_create_openreq_child now does this for us, see the comment in</div><div class='del'>-		 * that function for the gory details. -acme</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* It is tricky place. Until this moment IPv4 tcp</div><div class='del'>-		   worked with IPv6 icsk.icsk_af_ops.</div><div class='del'>-		   Sync it now.</div><div class='del'>-		 */</div><div class='del'>-		dccp_sync_mss(newsk, inet_csk(newsk)-&gt;icsk_pmtu_cookie);</div><div class='del'>-</div><div class='del'>-		return newsk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (sk_acceptq_is_full(sk))</div><div class='del'>-		goto out_overflow;</div><div class='del'>-</div><div class='del'>-	if (!dst) {</div><div class='del'>-		struct flowi6 fl6;</div><div class='del'>-</div><div class='del'>-		dst = inet6_csk_route_req(sk, &amp;fl6, req, IPPROTO_DCCP);</div><div class='del'>-		if (!dst)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	newsk = dccp_create_openreq_child(sk, req, skb);</div><div class='del'>-	if (newsk == NULL)</div><div class='del'>-		goto out_nonewsk;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No need to charge this sock to the relevant IPv6 refcnt debug socks</div><div class='del'>-	 * count here, dccp_create_openreq_child now does this for us, see the</div><div class='del'>-	 * comment in that function for the gory details. -acme</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ip6_dst_store(newsk, dst, NULL, NULL);</div><div class='del'>-	newsk-&gt;sk_route_caps = dst-&gt;dev-&gt;features &amp; ~(NETIF_F_IP_CSUM |</div><div class='del'>-						      NETIF_F_TSO);</div><div class='del'>-	newdp6 = (struct dccp6_sock *)newsk;</div><div class='del'>-	newinet = inet_sk(newsk);</div><div class='del'>-	newinet-&gt;pinet6 = &amp;newdp6-&gt;inet6;</div><div class='del'>-	newnp = inet6_sk(newsk);</div><div class='del'>-</div><div class='del'>-	memcpy(newnp, np, sizeof(struct ipv6_pinfo));</div><div class='del'>-</div><div class='del'>-	newsk-&gt;sk_v6_daddr	= ireq-&gt;ir_v6_rmt_addr;</div><div class='del'>-	newnp-&gt;saddr		= ireq-&gt;ir_v6_loc_addr;</div><div class='del'>-	newsk-&gt;sk_v6_rcv_saddr	= ireq-&gt;ir_v6_loc_addr;</div><div class='del'>-	newsk-&gt;sk_bound_dev_if	= ireq-&gt;ir_iif;</div><div class='del'>-</div><div class='del'>-	/* Now IPv6 options...</div><div class='del'>-</div><div class='del'>-	   First: no IPv4 options.</div><div class='del'>-	 */</div><div class='del'>-	newinet-&gt;inet_opt = NULL;</div><div class='del'>-</div><div class='del'>-	/* Clone RX bits */</div><div class='del'>-	newnp-&gt;rxopt.all = np-&gt;rxopt.all;</div><div class='del'>-</div><div class='del'>-	newnp-&gt;ipv6_mc_list = NULL;</div><div class='del'>-	newnp-&gt;ipv6_ac_list = NULL;</div><div class='del'>-	newnp-&gt;ipv6_fl_list = NULL;</div><div class='del'>-	newnp-&gt;pktoptions = NULL;</div><div class='del'>-	newnp-&gt;opt	  = NULL;</div><div class='del'>-	newnp-&gt;mcast_oif  = inet6_iif(skb);</div><div class='del'>-	newnp-&gt;mcast_hops = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clone native IPv6 options from listening socket (if any)</div><div class='del'>-	 *</div><div class='del'>-	 * Yes, keeping reference count would be much more clever, but we make</div><div class='del'>-	 * one more one thing there: reattach optmem to newsk.</div><div class='del'>-	 */</div><div class='del'>-	opt = ireq-&gt;ipv6_opt;</div><div class='del'>-	if (!opt)</div><div class='del'>-		opt = rcu_dereference(np-&gt;opt);</div><div class='del'>-	if (opt) {</div><div class='del'>-		opt = ipv6_dup_options(newsk, opt);</div><div class='del'>-		RCU_INIT_POINTER(newnp-&gt;opt, opt);</div><div class='del'>-	}</div><div class='del'>-	inet_csk(newsk)-&gt;icsk_ext_hdr_len = 0;</div><div class='del'>-	if (opt)</div><div class='del'>-		inet_csk(newsk)-&gt;icsk_ext_hdr_len = opt-&gt;opt_nflen +</div><div class='del'>-						    opt-&gt;opt_flen;</div><div class='del'>-</div><div class='del'>-	dccp_sync_mss(newsk, dst_mtu(dst));</div><div class='del'>-</div><div class='del'>-	newinet-&gt;inet_daddr = newinet-&gt;inet_saddr = LOOPBACK4_IPV6;</div><div class='del'>-	newinet-&gt;inet_rcv_saddr = LOOPBACK4_IPV6;</div><div class='del'>-</div><div class='del'>-	if (__inet_inherit_port(sk, newsk) &lt; 0) {</div><div class='del'>-		inet_csk_prepare_forced_close(newsk);</div><div class='del'>-		dccp_done(newsk);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));</div><div class='del'>-	/* Clone pktoptions received with SYN, if we own the req */</div><div class='del'>-	if (*own_req &amp;&amp; ireq-&gt;pktopts) {</div><div class='del'>-		newnp-&gt;pktoptions = skb_clone(ireq-&gt;pktopts, GFP_ATOMIC);</div><div class='del'>-		consume_skb(ireq-&gt;pktopts);</div><div class='del'>-		ireq-&gt;pktopts = NULL;</div><div class='del'>-		if (newnp-&gt;pktoptions)</div><div class='del'>-			skb_set_owner_r(newnp-&gt;pktoptions, newsk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return newsk;</div><div class='del'>-</div><div class='del'>-out_overflow:</div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);</div><div class='del'>-out_nonewsk:</div><div class='del'>-	dst_release(dst);</div><div class='del'>-out:</div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The socket must have it's spinlock held when we get</div><div class='del'>- * here.</div><div class='del'>- *</div><div class='del'>- * We have a potential double-lock case here, so even when</div><div class='del'>- * doing backlog processing we use the BH locking scheme.</div><div class='del'>- * This is because we cannot sleep with the original spinlock</div><div class='del'>- * held.</div><div class='del'>- */</div><div class='del'>-static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct sk_buff *opt_skb = NULL;</div><div class='del'>-</div><div class='del'>-	/* Imagine: socket is IPv6. IPv4 packet arrives,</div><div class='del'>-	   goes to IPv4 receive handler and backlogged.</div><div class='del'>-	   From backlog it always goes here. Kerboom...</div><div class='del'>-	   Fortunately, dccp_rcv_established and rcv_established</div><div class='del'>-	   handle them correctly, but it is not case with</div><div class='del'>-	   dccp_v6_hnd_req and dccp_v6_ctl_send_reset().   --ANK</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='del'>-		return dccp_v4_do_rcv(sk, skb);</div><div class='del'>-</div><div class='del'>-	if (sk_filter(sk, skb))</div><div class='del'>-		goto discard;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * socket locking is here for SMP purposes as backlog rcv is currently</div><div class='del'>-	 * called with bh processing disabled.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Do Stevens' IPV6_PKTOPTIONS.</div><div class='del'>-</div><div class='del'>-	   Yes, guys, it is the only place in our code, where we</div><div class='del'>-	   may make it not affecting IPv4.</div><div class='del'>-	   The rest of code is protocol independent,</div><div class='del'>-	   and I do not like idea to uglify IPv4.</div><div class='del'>-</div><div class='del'>-	   Actually, all the idea behind IPV6_PKTOPTIONS</div><div class='del'>-	   looks not very well thought. For now we latch</div><div class='del'>-	   options, received in the last packet, enqueued</div><div class='del'>-	   by tcp. Feel free to propose better solution.</div><div class='del'>-					       --ANK (980728)</div><div class='del'>-	 */</div><div class='del'>-	if (np-&gt;rxopt.all)</div><div class='del'>-		opt_skb = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_OPEN) { /* Fast path */</div><div class='del'>-		if (dccp_rcv_established(sk, skb, dccp_hdr(skb), skb-&gt;len))</div><div class='del'>-			goto reset;</div><div class='del'>-		if (opt_skb)</div><div class='del'>-			goto ipv6_pktoptions;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Step 3: Process LISTEN state</div><div class='del'>-	 *     If S.state == LISTEN,</div><div class='del'>-	 *	 If P.type == Request or P contains a valid Init Cookie option,</div><div class='del'>-	 *	      (* Must scan the packet's options to check for Init</div><div class='del'>-	 *		 Cookies.  Only Init Cookies are processed here,</div><div class='del'>-	 *		 however; other options are processed in Step 8.  This</div><div class='del'>-	 *		 scan need only be performed if the endpoint uses Init</div><div class='del'>-	 *		 Cookies *)</div><div class='del'>-	 *	      (* Generate a new socket and switch to that socket *)</div><div class='del'>-	 *	      Set S := new socket for this port pair</div><div class='del'>-	 *	      S.state = RESPOND</div><div class='del'>-	 *	      Choose S.ISS (initial seqno) or set from Init Cookies</div><div class='del'>-	 *	      Initialize S.GAR := S.ISS</div><div class='del'>-	 *	      Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies</div><div class='del'>-	 *	      Continue with S.state == RESPOND</div><div class='del'>-	 *	      (* A Response packet will be generated in Step 11 *)</div><div class='del'>-	 *	 Otherwise,</div><div class='del'>-	 *	      Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *	      Drop packet and return</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE: the check for the packet types is done in</div><div class='del'>-	 *	 dccp_rcv_state_process</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (dccp_rcv_state_process(sk, skb, dccp_hdr(skb), skb-&gt;len))</div><div class='del'>-		goto reset;</div><div class='del'>-	if (opt_skb)</div><div class='del'>-		goto ipv6_pktoptions;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-reset:</div><div class='del'>-	dccp_v6_ctl_send_reset(sk, skb);</div><div class='del'>-discard:</div><div class='del'>-	if (opt_skb != NULL)</div><div class='del'>-		__kfree_skb(opt_skb);</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-/* Handling IPV6_PKTOPTIONS skb the similar</div><div class='del'>- * way it's done for net/ipv6/tcp_ipv6.c</div><div class='del'>- */</div><div class='del'>-ipv6_pktoptions:</div><div class='del'>-	if (!((1 &lt;&lt; sk-&gt;sk_state) &amp; (DCCPF_CLOSED | DCCPF_LISTEN))) {</div><div class='del'>-		if (np-&gt;rxopt.bits.rxinfo || np-&gt;rxopt.bits.rxoinfo)</div><div class='del'>-			np-&gt;mcast_oif = inet6_iif(opt_skb);</div><div class='del'>-		if (np-&gt;rxopt.bits.rxhlim || np-&gt;rxopt.bits.rxohlim)</div><div class='del'>-			np-&gt;mcast_hops = ipv6_hdr(opt_skb)-&gt;hop_limit;</div><div class='del'>-		if (np-&gt;rxopt.bits.rxflow || np-&gt;rxopt.bits.rxtclass)</div><div class='del'>-			np-&gt;rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));</div><div class='del'>-		if (np-&gt;repflow)</div><div class='del'>-			np-&gt;flow_label = ip6_flowlabel(ipv6_hdr(opt_skb));</div><div class='del'>-		if (ipv6_opt_accepted(sk, opt_skb,</div><div class='del'>-				      &amp;DCCP_SKB_CB(opt_skb)-&gt;header.h6)) {</div><div class='del'>-			skb_set_owner_r(opt_skb, sk);</div><div class='del'>-			memmove(IP6CB(opt_skb),</div><div class='del'>-				&amp;DCCP_SKB_CB(opt_skb)-&gt;header.h6,</div><div class='del'>-				sizeof(struct inet6_skb_parm));</div><div class='del'>-			opt_skb = xchg(&amp;np-&gt;pktoptions, opt_skb);</div><div class='del'>-		} else {</div><div class='del'>-			__kfree_skb(opt_skb);</div><div class='del'>-			opt_skb = xchg(&amp;np-&gt;pktoptions, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(opt_skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_v6_rcv(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	bool refcounted;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	int min_cov;</div><div class='del'>-</div><div class='del'>-	/* Step 1: Check header basics */</div><div class='del'>-</div><div class='del'>-	if (dccp_invalid_packet(skb))</div><div class='del'>-		goto discard_it;</div><div class='del'>-</div><div class='del'>-	/* Step 1: If header checksum is incorrect, drop packet and return. */</div><div class='del'>-	if (dccp_v6_csum_finish(skb, &amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-				     &amp;ipv6_hdr(skb)-&gt;daddr)) {</div><div class='del'>-		DCCP_WARN("dropped packet with invalid checksum\n");</div><div class='del'>-		goto discard_it;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_seq  = dccp_hdr_seq(dh);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type = dh-&gt;dccph_type;</div><div class='del'>-</div><div class='del'>-	if (dccp_packet_without_ack(skb))</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq = DCCP_PKT_WITHOUT_ACK_SEQ;</div><div class='del'>-	else</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq = dccp_hdr_ack_seq(skb);</div><div class='del'>-</div><div class='del'>-lookup:</div><div class='del'>-	sk = __inet6_lookup_skb(&amp;dccp_hashinfo, skb, __dccp_hdr_len(dh),</div><div class='del'>-			        dh-&gt;dccph_sport, dh-&gt;dccph_dport,</div><div class='del'>-				inet6_iif(skb), 0, &amp;refcounted);</div><div class='del'>-	if (!sk) {</div><div class='del'>-		dccp_pr_debug("failed to look up flow ID in table and "</div><div class='del'>-			      "get corresponding socket\n");</div><div class='del'>-		goto no_dccp_socket;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Step 2:</div><div class='del'>-	 *	... or S.state == TIMEWAIT,</div><div class='del'>-	 *		Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *		Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_TIME_WAIT) {</div><div class='del'>-		dccp_pr_debug("sk-&gt;sk_state == DCCP_TIME_WAIT: do_time_wait\n");</div><div class='del'>-		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		goto no_dccp_socket;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_NEW_SYN_RECV) {</div><div class='del'>-		struct request_sock *req = inet_reqsk(sk);</div><div class='del'>-		struct sock *nsk;</div><div class='del'>-</div><div class='del'>-		sk = req-&gt;rsk_listener;</div><div class='del'>-		if (unlikely(sk-&gt;sk_state != DCCP_LISTEN)) {</div><div class='del'>-			inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='del'>-			goto lookup;</div><div class='del'>-		}</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		refcounted = true;</div><div class='del'>-		nsk = dccp_check_req(sk, skb, req);</div><div class='del'>-		if (!nsk) {</div><div class='del'>-			reqsk_put(req);</div><div class='del'>-			goto discard_and_relse;</div><div class='del'>-		}</div><div class='del'>-		if (nsk == sk) {</div><div class='del'>-			reqsk_put(req);</div><div class='del'>-		} else if (dccp_child_process(sk, nsk, skb)) {</div><div class='del'>-			dccp_v6_ctl_send_reset(sk, skb);</div><div class='del'>-			goto discard_and_relse;</div><div class='del'>-		} else {</div><div class='del'>-			sock_put(sk);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage</div><div class='del'>-	 *	o if MinCsCov = 0, only packets with CsCov = 0 are accepted</div><div class='del'>-	 *	o if MinCsCov &gt; 0, also accept packets with CsCov &gt;= MinCsCov</div><div class='del'>-	 */</div><div class='del'>-	min_cov = dccp_sk(sk)-&gt;dccps_pcrlen;</div><div class='del'>-	if (dh-&gt;dccph_cscov  &amp;&amp;  (min_cov == 0 || dh-&gt;dccph_cscov &lt; min_cov))  {</div><div class='del'>-		dccp_pr_debug("Packet CsCov %d does not satisfy MinCsCov %d\n",</div><div class='del'>-			      dh-&gt;dccph_cscov, min_cov);</div><div class='del'>-		/* FIXME: send Data Dropped option (see also dccp_v4_rcv) */</div><div class='del'>-		goto discard_and_relse;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='del'>-		goto discard_and_relse;</div><div class='del'>-</div><div class='del'>-	return __sk_receive_skb(sk, skb, 1, dh-&gt;dccph_doff * 4,</div><div class='del'>-				refcounted) ? -1 : 0;</div><div class='del'>-</div><div class='del'>-no_dccp_socket:</div><div class='del'>-	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='del'>-		goto discard_it;</div><div class='del'>-	/*</div><div class='del'>-	 * Step 2:</div><div class='del'>-	 *	If no socket ...</div><div class='del'>-	 *		Generate Reset(No Connection) unless P.type == Reset</div><div class='del'>-	 *		Drop packet and return</div><div class='del'>-	 */</div><div class='del'>-	if (dh-&gt;dccph_type != DCCP_PKT_RESET) {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_reset_code =</div><div class='del'>-					DCCP_RESET_CODE_NO_CONNECTION;</div><div class='del'>-		dccp_v6_ctl_send_reset(sk, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-discard_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-discard_and_relse:</div><div class='del'>-	if (refcounted)</div><div class='del'>-		sock_put(sk);</div><div class='del'>-	goto discard_it;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='del'>-			   int addr_len)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in6 *usin = (struct sockaddr_in6 *)uaddr;</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct in6_addr *saddr = NULL, *final_p, final;</div><div class='del'>-	struct ipv6_txoptions *opt;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	int addr_type;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_role = DCCP_ROLE_CLIENT;</div><div class='del'>-</div><div class='del'>-	if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (usin-&gt;sin6_family != AF_INET6)</div><div class='del'>-		return -EAFNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-</div><div class='del'>-	if (np-&gt;sndflow) {</div><div class='del'>-		fl6.flowlabel = usin-&gt;sin6_flowinfo &amp; IPV6_FLOWINFO_MASK;</div><div class='del'>-		IP6_ECN_flow_init(fl6.flowlabel);</div><div class='del'>-		if (fl6.flowlabel &amp; IPV6_FLOWLABEL_MASK) {</div><div class='del'>-			struct ip6_flowlabel *flowlabel;</div><div class='del'>-			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-			if (flowlabel == NULL)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			fl6_sock_release(flowlabel);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * connect() to INADDR_ANY means loopback (BSD'ism).</div><div class='del'>-	 */</div><div class='del'>-	if (ipv6_addr_any(&amp;usin-&gt;sin6_addr))</div><div class='del'>-		usin-&gt;sin6_addr.s6_addr[15] = 1;</div><div class='del'>-</div><div class='del'>-	addr_type = ipv6_addr_type(&amp;usin-&gt;sin6_addr);</div><div class='del'>-</div><div class='del'>-	if (addr_type &amp; IPV6_ADDR_MULTICAST)</div><div class='del'>-		return -ENETUNREACH;</div><div class='del'>-</div><div class='del'>-	if (addr_type &amp; IPV6_ADDR_LINKLOCAL) {</div><div class='del'>-		if (addr_len &gt;= sizeof(struct sockaddr_in6) &amp;&amp;</div><div class='del'>-		    usin-&gt;sin6_scope_id) {</div><div class='del'>-			/* If interface is set while binding, indices</div><div class='del'>-			 * must coincide.</div><div class='del'>-			 */</div><div class='del'>-			if (sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_bound_dev_if != usin-&gt;sin6_scope_id)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			sk-&gt;sk_bound_dev_if = usin-&gt;sin6_scope_id;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Connect to link-local address requires an interface */</div><div class='del'>-		if (!sk-&gt;sk_bound_dev_if)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_v6_daddr = usin-&gt;sin6_addr;</div><div class='del'>-	np-&gt;flow_label = fl6.flowlabel;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * DCCP over IPv4</div><div class='del'>-	 */</div><div class='del'>-	if (addr_type == IPV6_ADDR_MAPPED) {</div><div class='del'>-		u32 exthdrlen = icsk-&gt;icsk_ext_hdr_len;</div><div class='del'>-		struct sockaddr_in sin;</div><div class='del'>-</div><div class='del'>-		SOCK_DEBUG(sk, "connect: ipv4 mapped\n");</div><div class='del'>-</div><div class='del'>-		if (__ipv6_only_sock(sk))</div><div class='del'>-			return -ENETUNREACH;</div><div class='del'>-</div><div class='del'>-		sin.sin_family = AF_INET;</div><div class='del'>-		sin.sin_port = usin-&gt;sin6_port;</div><div class='del'>-		sin.sin_addr.s_addr = usin-&gt;sin6_addr.s6_addr32[3];</div><div class='del'>-</div><div class='del'>-		icsk-&gt;icsk_af_ops = &amp;dccp_ipv6_mapped;</div><div class='del'>-		sk-&gt;sk_backlog_rcv = dccp_v4_do_rcv;</div><div class='del'>-</div><div class='del'>-		err = dccp_v4_connect(sk, (struct sockaddr *)&amp;sin, sizeof(sin));</div><div class='del'>-		if (err) {</div><div class='del'>-			icsk-&gt;icsk_ext_hdr_len = exthdrlen;</div><div class='del'>-			icsk-&gt;icsk_af_ops = &amp;dccp_ipv6_af_ops;</div><div class='del'>-			sk-&gt;sk_backlog_rcv = dccp_v6_do_rcv;</div><div class='del'>-			goto failure;</div><div class='del'>-		}</div><div class='del'>-		np-&gt;saddr = sk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='del'>-		saddr = &amp;sk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-</div><div class='del'>-	fl6.flowi6_proto = IPPROTO_DCCP;</div><div class='del'>-	fl6.daddr = sk-&gt;sk_v6_daddr;</div><div class='del'>-	fl6.saddr = saddr ? *saddr : np-&gt;saddr;</div><div class='del'>-	fl6.flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-	fl6.fl6_dport = usin-&gt;sin6_port;</div><div class='del'>-	fl6.fl6_sport = inet-&gt;inet_sport;</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='del'>-</div><div class='del'>-	opt = rcu_dereference_protected(np-&gt;opt, lockdep_sock_is_held(sk));</div><div class='del'>-	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='del'>-</div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='del'>-	if (IS_ERR(dst)) {</div><div class='del'>-		err = PTR_ERR(dst);</div><div class='del'>-		goto failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (saddr == NULL) {</div><div class='del'>-		saddr = &amp;fl6.saddr;</div><div class='del'>-		sk-&gt;sk_v6_rcv_saddr = *saddr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the source address */</div><div class='del'>-	np-&gt;saddr = *saddr;</div><div class='del'>-	inet-&gt;inet_rcv_saddr = LOOPBACK4_IPV6;</div><div class='del'>-</div><div class='del'>-	ip6_dst_store(sk, dst, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_ext_hdr_len = 0;</div><div class='del'>-	if (opt)</div><div class='del'>-		icsk-&gt;icsk_ext_hdr_len = opt-&gt;opt_flen + opt-&gt;opt_nflen;</div><div class='del'>-</div><div class='del'>-	inet-&gt;inet_dport = usin-&gt;sin6_port;</div><div class='del'>-</div><div class='del'>-	dccp_set_state(sk, DCCP_REQUESTING);</div><div class='del'>-	err = inet6_hash_connect(&amp;dccp_death_row, sk);</div><div class='del'>-	if (err)</div><div class='del'>-		goto late_failure;</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_iss = secure_dccpv6_sequence_number(np-&gt;saddr.s6_addr32,</div><div class='del'>-						      sk-&gt;sk_v6_daddr.s6_addr32,</div><div class='del'>-						      inet-&gt;inet_sport,</div><div class='del'>-						      inet-&gt;inet_dport);</div><div class='del'>-	err = dccp_connect(sk);</div><div class='del'>-	if (err)</div><div class='del'>-		goto late_failure;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-late_failure:</div><div class='del'>-	dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-	__sk_dst_reset(sk);</div><div class='del'>-failure:</div><div class='del'>-	inet-&gt;inet_dport = 0;</div><div class='del'>-	sk-&gt;sk_route_caps = 0;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops = {</div><div class='del'>-	.queue_xmit	   = inet6_csk_xmit,</div><div class='del'>-	.send_check	   = dccp_v6_send_check,</div><div class='del'>-	.rebuild_header	   = inet6_sk_rebuild_header,</div><div class='del'>-	.conn_request	   = dccp_v6_conn_request,</div><div class='del'>-	.syn_recv_sock	   = dccp_v6_request_recv_sock,</div><div class='del'>-	.net_header_len	   = sizeof(struct ipv6hdr),</div><div class='del'>-	.setsockopt	   = ipv6_setsockopt,</div><div class='del'>-	.getsockopt	   = ipv6_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet6_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in6),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ipv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ipv6_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	DCCP over IPv4 via INET6 API</div><div class='del'>- */</div><div class='del'>-static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = {</div><div class='del'>-	.queue_xmit	   = ip_queue_xmit,</div><div class='del'>-	.send_check	   = dccp_v4_send_check,</div><div class='del'>-	.rebuild_header	   = inet_sk_rebuild_header,</div><div class='del'>-	.conn_request	   = dccp_v6_conn_request,</div><div class='del'>-	.syn_recv_sock	   = dccp_v6_request_recv_sock,</div><div class='del'>-	.net_header_len	   = sizeof(struct iphdr),</div><div class='del'>-	.setsockopt	   = ipv6_setsockopt,</div><div class='del'>-	.getsockopt	   = ipv6_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet6_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in6),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ipv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ipv6_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* NOTE: A lot of things set to zero explicitly by call to</div><div class='del'>- *       sk_alloc() so need not be done here.</div><div class='del'>- */</div><div class='del'>-static int dccp_v6_init_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	static __u8 dccp_v6_ctl_sock_initialized;</div><div class='del'>-	int err = dccp_init_sock(sk, dccp_v6_ctl_sock_initialized);</div><div class='del'>-</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		if (unlikely(!dccp_v6_ctl_sock_initialized))</div><div class='del'>-			dccp_v6_ctl_sock_initialized = 1;</div><div class='del'>-		inet_csk(sk)-&gt;icsk_af_ops = &amp;dccp_ipv6_af_ops;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_v6_destroy_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	dccp_destroy_sock(sk);</div><div class='del'>-	inet6_destroy_sock(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct timewait_sock_ops dccp6_timewait_sock_ops = {</div><div class='del'>-	.twsk_obj_size	= sizeof(struct dccp6_timewait_sock),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct proto dccp_v6_prot = {</div><div class='del'>-	.name		   = "DCCPv6",</div><div class='del'>-	.owner		   = THIS_MODULE,</div><div class='del'>-	.close		   = dccp_close,</div><div class='del'>-	.connect	   = dccp_v6_connect,</div><div class='del'>-	.disconnect	   = dccp_disconnect,</div><div class='del'>-	.ioctl		   = dccp_ioctl,</div><div class='del'>-	.init		   = dccp_v6_init_sock,</div><div class='del'>-	.setsockopt	   = dccp_setsockopt,</div><div class='del'>-	.getsockopt	   = dccp_getsockopt,</div><div class='del'>-	.sendmsg	   = dccp_sendmsg,</div><div class='del'>-	.recvmsg	   = dccp_recvmsg,</div><div class='del'>-	.backlog_rcv	   = dccp_v6_do_rcv,</div><div class='del'>-	.hash		   = inet6_hash,</div><div class='del'>-	.unhash		   = inet_unhash,</div><div class='del'>-	.accept		   = inet_csk_accept,</div><div class='del'>-	.get_port	   = inet_csk_get_port,</div><div class='del'>-	.shutdown	   = dccp_shutdown,</div><div class='del'>-	.destroy	   = dccp_v6_destroy_sock,</div><div class='del'>-	.orphan_count	   = &amp;dccp_orphan_count,</div><div class='del'>-	.max_header	   = MAX_DCCP_HEADER,</div><div class='del'>-	.obj_size	   = sizeof(struct dccp6_sock),</div><div class='del'>-	.slab_flags	   = SLAB_TYPESAFE_BY_RCU,</div><div class='del'>-	.rsk_prot	   = &amp;dccp6_request_sock_ops,</div><div class='del'>-	.twsk_prot	   = &amp;dccp6_timewait_sock_ops,</div><div class='del'>-	.h.hashinfo	   = &amp;dccp_hashinfo,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_dccp_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_dccp_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inet6_protocol dccp_v6_protocol = {</div><div class='del'>-	.handler	= dccp_v6_rcv,</div><div class='del'>-	.err_handler	= dccp_v6_err,</div><div class='del'>-	.flags		= INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proto_ops inet6_dccp_ops = {</div><div class='del'>-	.family		   = PF_INET6,</div><div class='del'>-	.owner		   = THIS_MODULE,</div><div class='del'>-	.release	   = inet6_release,</div><div class='del'>-	.bind		   = inet6_bind,</div><div class='del'>-	.connect	   = inet_stream_connect,</div><div class='del'>-	.socketpair	   = sock_no_socketpair,</div><div class='del'>-	.accept		   = inet_accept,</div><div class='del'>-	.getname	   = inet6_getname,</div><div class='del'>-	.poll		   = dccp_poll,</div><div class='del'>-	.ioctl		   = inet6_ioctl,</div><div class='del'>-	.listen		   = inet_dccp_listen,</div><div class='del'>-	.shutdown	   = inet_shutdown,</div><div class='del'>-	.setsockopt	   = sock_common_setsockopt,</div><div class='del'>-	.getsockopt	   = sock_common_getsockopt,</div><div class='del'>-	.sendmsg	   = inet_sendmsg,</div><div class='del'>-	.recvmsg	   = sock_common_recvmsg,</div><div class='del'>-	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct inet_protosw dccp_v6_protosw = {</div><div class='del'>-	.type		= SOCK_DCCP,</div><div class='del'>-	.protocol	= IPPROTO_DCCP,</div><div class='del'>-	.prot		= &amp;dccp_v6_prot,</div><div class='del'>-	.ops		= &amp;inet6_dccp_ops,</div><div class='del'>-	.flags		= INET_PROTOSW_ICSK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init dccp_v6_init_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	if (dccp_hashinfo.bhash == NULL)</div><div class='del'>-		return -ESOCKTNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	return inet_ctl_sock_create(&amp;net-&gt;dccp.v6_ctl_sk, PF_INET6,</div><div class='del'>-				    SOCK_DCCP, IPPROTO_DCCP, net);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit dccp_v6_exit_net(struct net *net)</div><div class='del'>-{</div><div class='del'>-	inet_ctl_sock_destroy(net-&gt;dccp.v6_ctl_sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit dccp_v6_exit_batch(struct list_head *net_exit_list)</div><div class='del'>-{</div><div class='del'>-	inet_twsk_purge(&amp;dccp_hashinfo, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations dccp_v6_ops = {</div><div class='del'>-	.init   = dccp_v6_init_net,</div><div class='del'>-	.exit   = dccp_v6_exit_net,</div><div class='del'>-	.exit_batch = dccp_v6_exit_batch,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dccp_v6_init(void)</div><div class='del'>-{</div><div class='del'>-	int err = proto_register(&amp;dccp_v6_prot, 1);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	inet6_register_protosw(&amp;dccp_v6_protosw);</div><div class='del'>-</div><div class='del'>-	err = register_pernet_subsys(&amp;dccp_v6_ops);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_destroy_ctl_sock;</div><div class='del'>-</div><div class='del'>-	err = inet6_add_protocol(&amp;dccp_v6_protocol, IPPROTO_DCCP);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unregister_proto;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-out_unregister_proto:</div><div class='del'>-	unregister_pernet_subsys(&amp;dccp_v6_ops);</div><div class='del'>-out_destroy_ctl_sock:</div><div class='del'>-	inet6_unregister_protosw(&amp;dccp_v6_protosw);</div><div class='del'>-	proto_unregister(&amp;dccp_v6_prot);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dccp_v6_exit(void)</div><div class='del'>-{</div><div class='del'>-	inet6_del_protocol(&amp;dccp_v6_protocol, IPPROTO_DCCP);</div><div class='del'>-	unregister_pernet_subsys(&amp;dccp_v6_ops);</div><div class='del'>-	inet6_unregister_protosw(&amp;dccp_v6_protosw);</div><div class='del'>-	proto_unregister(&amp;dccp_v6_prot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dccp_v6_init);</div><div class='del'>-module_exit(dccp_v6_exit);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * __stringify doesn't likes enums, so use SOCK_DCCP (6) and IPPROTO_DCCP (33)</div><div class='del'>- * values directly, Also cover the case where the protocol is not specified,</div><div class='del'>- * i.e. net-pf-PF_INET6-proto-0-type-SOCK_DCCP</div><div class='del'>- */</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 33, 6);</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 0, 6);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("DCCPv6 - Datagram Congestion Controlled Protocol");</div><div class='head'>diff --git a/net/dccp/ipv6.h b/net/dccp/ipv6.h<br/>deleted file mode 100644<br/>index af259e15e7f0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/ipv6.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/ipv6.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-#ifndef _DCCP_IPV6_H</div><div class='del'>-#define _DCCP_IPV6_H</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/ipv6.h</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/ipv6.h&gt;</div><div class='del'>-</div><div class='del'>-struct dccp6_sock {</div><div class='del'>-	struct dccp_sock  dccp;</div><div class='del'>-	/*</div><div class='del'>-	 * ipv6_pinfo has to be the last member of dccp6_sock,</div><div class='del'>-	 * see inet6_sk_generic.</div><div class='del'>-	 */</div><div class='del'>-	struct ipv6_pinfo inet6;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dccp6_request_sock {</div><div class='del'>-	struct dccp_request_sock  dccp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dccp6_timewait_sock {</div><div class='del'>-	struct inet_timewait_sock   inet;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _DCCP_IPV6_H */</div><div class='head'>diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c<br/>deleted file mode 100644<br/>index ba6fc3c1186b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/minisocks.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/minisocks.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,272 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/minisocks.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/inet_timewait_sock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-struct inet_timewait_death_row dccp_death_row = {</div><div class='del'>-	.sysctl_max_tw_buckets = NR_FILE * 2,</div><div class='del'>-	.hashinfo	= &amp;dccp_hashinfo,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_death_row);</div><div class='del'>-</div><div class='del'>-void dccp_time_wait(struct sock *sk, int state, int timeo)</div><div class='del'>-{</div><div class='del'>-	struct inet_timewait_sock *tw;</div><div class='del'>-</div><div class='del'>-	tw = inet_twsk_alloc(sk, &amp;dccp_death_row, state);</div><div class='del'>-</div><div class='del'>-	if (tw != NULL) {</div><div class='del'>-		const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-		const int rto = (icsk-&gt;icsk_rto &lt;&lt; 2) - (icsk-&gt;icsk_rto &gt;&gt; 1);</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		if (tw-&gt;tw_family == PF_INET6) {</div><div class='del'>-			tw-&gt;tw_v6_daddr = sk-&gt;sk_v6_daddr;</div><div class='del'>-			tw-&gt;tw_v6_rcv_saddr = sk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-			tw-&gt;tw_ipv6only = sk-&gt;sk_ipv6only;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* Get the TIME_WAIT timeout firing. */</div><div class='del'>-		if (timeo &lt; rto)</div><div class='del'>-			timeo = rto;</div><div class='del'>-</div><div class='del'>-		if (state == DCCP_TIME_WAIT)</div><div class='del'>-			timeo = DCCP_TIMEWAIT_LEN;</div><div class='del'>-</div><div class='del'>-		/* tw_timer is pinned, so we need to make sure BH are disabled</div><div class='del'>-		 * in following section, otherwise timer handler could run before</div><div class='del'>-		 * we complete the initialization.</div><div class='del'>-		 */</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		inet_twsk_schedule(tw, timeo);</div><div class='del'>-		/* Linkage updates.</div><div class='del'>-		 * Note that access to tw after this point is illegal.</div><div class='del'>-		 */</div><div class='del'>-		inet_twsk_hashdance(tw, sk, &amp;dccp_hashinfo);</div><div class='del'>-		local_bh_enable();</div><div class='del'>-	} else {</div><div class='del'>-		/* Sorry, if we're out of memory, just CLOSE this</div><div class='del'>-		 * socket up.  We've got bigger problems than</div><div class='del'>-		 * non-graceful socket closings.</div><div class='del'>-		 */</div><div class='del'>-		DCCP_WARN("time wait bucket table overflow\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dccp_done(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sock *dccp_create_openreq_child(const struct sock *sk,</div><div class='del'>-				       const struct request_sock *req,</div><div class='del'>-				       const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Step 3: Process LISTEN state</div><div class='del'>-	 *</div><div class='del'>-	 *   (* Generate a new socket and switch to that socket *)</div><div class='del'>-	 *   Set S := new socket for this port pair</div><div class='del'>-	 */</div><div class='del'>-	struct sock *newsk = inet_csk_clone_lock(sk, req, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (newsk != NULL) {</div><div class='del'>-		struct dccp_request_sock *dreq = dccp_rsk(req);</div><div class='del'>-		struct inet_connection_sock *newicsk = inet_csk(newsk);</div><div class='del'>-		struct dccp_sock *newdp = dccp_sk(newsk);</div><div class='del'>-</div><div class='del'>-		newdp-&gt;dccps_role	    = DCCP_ROLE_SERVER;</div><div class='del'>-		newdp-&gt;dccps_hc_rx_ackvec   = NULL;</div><div class='del'>-		newdp-&gt;dccps_service_list   = NULL;</div><div class='del'>-		newdp-&gt;dccps_service	    = dreq-&gt;dreq_service;</div><div class='del'>-		newdp-&gt;dccps_timestamp_echo = dreq-&gt;dreq_timestamp_echo;</div><div class='del'>-		newdp-&gt;dccps_timestamp_time = dreq-&gt;dreq_timestamp_time;</div><div class='del'>-		newicsk-&gt;icsk_rto	    = DCCP_TIMEOUT_INIT;</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;newdp-&gt;dccps_featneg);</div><div class='del'>-		/*</div><div class='del'>-		 * Step 3: Process LISTEN state</div><div class='del'>-		 *</div><div class='del'>-		 *    Choose S.ISS (initial seqno) or set from Init Cookies</div><div class='del'>-		 *    Initialize S.GAR := S.ISS</div><div class='del'>-		 *    Set S.ISR, S.GSR from packet (or Init Cookies)</div><div class='del'>-		 *</div><div class='del'>-		 *    Setting AWL/AWH and SWL/SWH happens as part of the feature</div><div class='del'>-		 *    activation below, as these windows all depend on the local</div><div class='del'>-		 *    and remote Sequence Window feature values (7.5.2).</div><div class='del'>-		 */</div><div class='del'>-		newdp-&gt;dccps_iss = dreq-&gt;dreq_iss;</div><div class='del'>-		newdp-&gt;dccps_gss = dreq-&gt;dreq_gss;</div><div class='del'>-		newdp-&gt;dccps_gar = newdp-&gt;dccps_iss;</div><div class='del'>-		newdp-&gt;dccps_isr = dreq-&gt;dreq_isr;</div><div class='del'>-		newdp-&gt;dccps_gsr = dreq-&gt;dreq_gsr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Activate features: initialise CCIDs, sequence windows etc.</div><div class='del'>-		 */</div><div class='del'>-		if (dccp_feat_activate_values(newsk, &amp;dreq-&gt;dreq_featneg)) {</div><div class='del'>-			sk_free_unlock_clone(newsk);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		dccp_init_xmit_timers(newsk);</div><div class='del'>-</div><div class='del'>-		__DCCP_INC_STATS(DCCP_MIB_PASSIVEOPENS);</div><div class='del'>-	}</div><div class='del'>-	return newsk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_create_openreq_child);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process an incoming packet for RESPOND sockets represented</div><div class='del'>- * as an request_sock.</div><div class='del'>- */</div><div class='del'>-struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			    struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	struct sock *child = NULL;</div><div class='del'>-	struct dccp_request_sock *dreq = dccp_rsk(req);</div><div class='del'>-	bool own_req;</div><div class='del'>-</div><div class='del'>-	/* TCP/DCCP listeners became lockless.</div><div class='del'>-	 * DCCP stores complex state in its request_sock, so we need</div><div class='del'>-	 * a protection for them, now this code runs without being protected</div><div class='del'>-	 * by the parent (listener) lock.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_bh(&amp;dreq-&gt;dreq_lock);</div><div class='del'>-</div><div class='del'>-	/* Check for retransmitted REQUEST */</div><div class='del'>-	if (dccp_hdr(skb)-&gt;dccph_type == DCCP_PKT_REQUEST) {</div><div class='del'>-</div><div class='del'>-		if (after48(DCCP_SKB_CB(skb)-&gt;dccpd_seq, dreq-&gt;dreq_gsr)) {</div><div class='del'>-			dccp_pr_debug("Retransmitted REQUEST\n");</div><div class='del'>-			dreq-&gt;dreq_gsr = DCCP_SKB_CB(skb)-&gt;dccpd_seq;</div><div class='del'>-			/*</div><div class='del'>-			 * Send another RESPONSE packet</div><div class='del'>-			 * To protect against Request floods, increment retrans</div><div class='del'>-			 * counter (backoff, monitored by dccp_response_timer).</div><div class='del'>-			 */</div><div class='del'>-			inet_rtx_syn_ack(sk, req);</div><div class='del'>-		}</div><div class='del'>-		/* Network Duplicate, discard packet */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = DCCP_RESET_CODE_PACKET_ERROR;</div><div class='del'>-</div><div class='del'>-	if (dccp_hdr(skb)-&gt;dccph_type != DCCP_PKT_ACK &amp;&amp;</div><div class='del'>-	    dccp_hdr(skb)-&gt;dccph_type != DCCP_PKT_DATAACK)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	/* Invalid ACK */</div><div class='del'>-	if (!between48(DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq,</div><div class='del'>-				dreq-&gt;dreq_iss, dreq-&gt;dreq_gss)) {</div><div class='del'>-		dccp_pr_debug("Invalid ACK number: ack_seq=%llu, "</div><div class='del'>-			      "dreq_iss=%llu, dreq_gss=%llu\n",</div><div class='del'>-			      (unsigned long long)</div><div class='del'>-			      DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq,</div><div class='del'>-			      (unsigned long long) dreq-&gt;dreq_iss,</div><div class='del'>-			      (unsigned long long) dreq-&gt;dreq_gss);</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dccp_parse_options(sk, dreq, skb))</div><div class='del'>-		 goto drop;</div><div class='del'>-</div><div class='del'>-	child = inet_csk(sk)-&gt;icsk_af_ops-&gt;syn_recv_sock(sk, skb, req, NULL,</div><div class='del'>-							 req, &amp;own_req);</div><div class='del'>-	if (child) {</div><div class='del'>-		child = inet_csk_complete_hashdance(sk, child, req, own_req);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;</div><div class='del'>-drop:</div><div class='del'>-	if (dccp_hdr(skb)-&gt;dccph_type != DCCP_PKT_RESET)</div><div class='del'>-		req-&gt;rsk_ops-&gt;send_reset(sk, skb);</div><div class='del'>-</div><div class='del'>-	inet_csk_reqsk_queue_drop(sk, req);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_bh(&amp;dreq-&gt;dreq_lock);</div><div class='del'>-	return child;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_check_req);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Queue segment on the new socket if the new socket is active,</div><div class='del'>- *  otherwise we just shortcircuit this and continue with</div><div class='del'>- *  the new socket.</div><div class='del'>- */</div><div class='del'>-int dccp_child_process(struct sock *parent, struct sock *child,</div><div class='del'>-		       struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	const int state = child-&gt;sk_state;</div><div class='del'>-</div><div class='del'>-	if (!sock_owned_by_user(child)) {</div><div class='del'>-		ret = dccp_rcv_state_process(child, skb, dccp_hdr(skb),</div><div class='del'>-					     skb-&gt;len);</div><div class='del'>-</div><div class='del'>-		/* Wakeup parent, send SIGIO */</div><div class='del'>-		if (state == DCCP_RESPOND &amp;&amp; child-&gt;sk_state != state)</div><div class='del'>-			parent-&gt;sk_data_ready(parent);</div><div class='del'>-	} else {</div><div class='del'>-		/* Alas, it is possible again, because we do lookup</div><div class='del'>-		 * in main socket hash table and lock on listening</div><div class='del'>-		 * socket does not protect us more.</div><div class='del'>-		 */</div><div class='del'>-		__sk_add_backlog(child, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bh_unlock_sock(child);</div><div class='del'>-	sock_put(child);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_child_process);</div><div class='del'>-</div><div class='del'>-void dccp_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			 struct request_sock *rsk)</div><div class='del'>-{</div><div class='del'>-	DCCP_BUG("DCCP-ACK packets are never sent in LISTEN/RESPOND state");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_reqsk_send_ack);</div><div class='del'>-</div><div class='del'>-int dccp_reqsk_init(struct request_sock *req,</div><div class='del'>-		    struct dccp_sock const *dp, struct sk_buff const *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_request_sock *dreq = dccp_rsk(req);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;dreq-&gt;dreq_lock);</div><div class='del'>-	inet_rsk(req)-&gt;ir_rmt_port = dccp_hdr(skb)-&gt;dccph_sport;</div><div class='del'>-	inet_rsk(req)-&gt;ir_num	   = ntohs(dccp_hdr(skb)-&gt;dccph_dport);</div><div class='del'>-	inet_rsk(req)-&gt;acked	   = 0;</div><div class='del'>-	dreq-&gt;dreq_timestamp_echo  = 0;</div><div class='del'>-</div><div class='del'>-	/* inherit feature negotiation options from listening socket */</div><div class='del'>-	return dccp_feat_clone_list(&amp;dp-&gt;dccps_featneg, &amp;dreq-&gt;dreq_featneg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_reqsk_init);</div><div class='head'>diff --git a/net/dccp/options.c b/net/dccp/options.c<br/>deleted file mode 100644<br/>index 4e40db017e19..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/options.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/options.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,609 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/options.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Copyright (c) 2005 Aristeu Sergio Rozanski Filho &lt;aris@cathedrallabs.org&gt;</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>- *  Copyright (c) 2005 Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;</div><div class='del'>- *</div><div class='del'>- *      This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-u64 dccp_decode_value_var(const u8 *bf, const u8 len)</div><div class='del'>-{</div><div class='del'>-	u64 value = 0;</div><div class='del'>-</div><div class='del'>-	if (len &gt;= DCCP_OPTVAL_MAXLEN)</div><div class='del'>-		value += ((u64)*bf++) &lt;&lt; 40;</div><div class='del'>-	if (len &gt; 4)</div><div class='del'>-		value += ((u64)*bf++) &lt;&lt; 32;</div><div class='del'>-	if (len &gt; 3)</div><div class='del'>-		value += ((u64)*bf++) &lt;&lt; 24;</div><div class='del'>-	if (len &gt; 2)</div><div class='del'>-		value += ((u64)*bf++) &lt;&lt; 16;</div><div class='del'>-	if (len &gt; 1)</div><div class='del'>-		value += ((u64)*bf++) &lt;&lt; 8;</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		value += *bf;</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_parse_options  -  Parse DCCP options present in @skb</div><div class='del'>- * @sk: client|server|listening dccp socket (when @dreq != NULL)</div><div class='del'>- * @dreq: request socket to use during connection setup, or NULL</div><div class='del'>- */</div><div class='del'>-int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,</div><div class='del'>-		       struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	const struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-	const u8 pkt_type = DCCP_SKB_CB(skb)-&gt;dccpd_type;</div><div class='del'>-	unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb);</div><div class='del'>-	unsigned char *opt_ptr = options;</div><div class='del'>-	const unsigned char *opt_end = (unsigned char *)dh +</div><div class='del'>-					(dh-&gt;dccph_doff * 4);</div><div class='del'>-	struct dccp_options_received *opt_recv = &amp;dp-&gt;dccps_options_received;</div><div class='del'>-	unsigned char opt, len;</div><div class='del'>-	unsigned char *uninitialized_var(value);</div><div class='del'>-	u32 elapsed_time;</div><div class='del'>-	__be32 opt_val;</div><div class='del'>-	int rc;</div><div class='del'>-	int mandatory = 0;</div><div class='del'>-</div><div class='del'>-	memset(opt_recv, 0, sizeof(*opt_recv));</div><div class='del'>-</div><div class='del'>-	opt = len = 0;</div><div class='del'>-	while (opt_ptr != opt_end) {</div><div class='del'>-		opt   = *opt_ptr++;</div><div class='del'>-		len   = 0;</div><div class='del'>-		value = NULL;</div><div class='del'>-</div><div class='del'>-		/* Check if this isn't a single byte option */</div><div class='del'>-		if (opt &gt; DCCPO_MAX_RESERVED) {</div><div class='del'>-			if (opt_ptr == opt_end)</div><div class='del'>-				goto out_nonsensical_length;</div><div class='del'>-</div><div class='del'>-			len = *opt_ptr++;</div><div class='del'>-			if (len &lt; 2)</div><div class='del'>-				goto out_nonsensical_length;</div><div class='del'>-			/*</div><div class='del'>-			 * Remove the type and len fields, leaving</div><div class='del'>-			 * just the value size</div><div class='del'>-			 */</div><div class='del'>-			len	-= 2;</div><div class='del'>-			value	= opt_ptr;</div><div class='del'>-			opt_ptr += len;</div><div class='del'>-</div><div class='del'>-			if (opt_ptr &gt; opt_end)</div><div class='del'>-				goto out_nonsensical_length;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * CCID-specific options are ignored during connection setup, as</div><div class='del'>-		 * negotiation may still be in progress (see RFC 4340, 10.3).</div><div class='del'>-		 * The same applies to Ack Vectors, as these depend on the CCID.</div><div class='del'>-		 */</div><div class='del'>-		if (dreq != NULL &amp;&amp; (opt &gt;= DCCPO_MIN_RX_CCID_SPECIFIC ||</div><div class='del'>-		    opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1))</div><div class='del'>-			goto ignore_option;</div><div class='del'>-</div><div class='del'>-		switch (opt) {</div><div class='del'>-		case DCCPO_PADDING:</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_MANDATORY:</div><div class='del'>-			if (mandatory)</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			if (pkt_type != DCCP_PKT_DATA)</div><div class='del'>-				mandatory = 1;</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_NDP_COUNT:</div><div class='del'>-			if (len &gt; 6)</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-</div><div class='del'>-			opt_recv-&gt;dccpor_ndp = dccp_decode_value_var(value, len);</div><div class='del'>-			dccp_pr_debug("%s opt: NDP count=%llu\n", dccp_role(sk),</div><div class='del'>-				      (unsigned long long)opt_recv-&gt;dccpor_ndp);</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_CHANGE_L ... DCCPO_CONFIRM_R:</div><div class='del'>-			if (pkt_type == DCCP_PKT_DATA)      /* RFC 4340, 6 */</div><div class='del'>-				break;</div><div class='del'>-			if (len == 0)</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			rc = dccp_feat_parse_options(sk, dreq, mandatory, opt,</div><div class='del'>-						    *value, value + 1, len - 1);</div><div class='del'>-			if (rc)</div><div class='del'>-				goto out_featneg_failed;</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_TIMESTAMP:</div><div class='del'>-			if (len != 4)</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			/*</div><div class='del'>-			 * RFC 4340 13.1: "The precise time corresponding to</div><div class='del'>-			 * Timestamp Value zero is not specified". We use</div><div class='del'>-			 * zero to indicate absence of a meaningful timestamp.</div><div class='del'>-			 */</div><div class='del'>-			opt_val = get_unaligned((__be32 *)value);</div><div class='del'>-			if (unlikely(opt_val == 0)) {</div><div class='del'>-				DCCP_WARN("Timestamp with zero value\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (dreq != NULL) {</div><div class='del'>-				dreq-&gt;dreq_timestamp_echo = ntohl(opt_val);</div><div class='del'>-				dreq-&gt;dreq_timestamp_time = dccp_timestamp();</div><div class='del'>-			} else {</div><div class='del'>-				opt_recv-&gt;dccpor_timestamp =</div><div class='del'>-					dp-&gt;dccps_timestamp_echo = ntohl(opt_val);</div><div class='del'>-				dp-&gt;dccps_timestamp_time = dccp_timestamp();</div><div class='del'>-			}</div><div class='del'>-			dccp_pr_debug("%s rx opt: TIMESTAMP=%u, ackno=%llu\n",</div><div class='del'>-				      dccp_role(sk), ntohl(opt_val),</div><div class='del'>-				      (unsigned long long)</div><div class='del'>-				      DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq);</div><div class='del'>-			/* schedule an Ack in case this sender is quiescent */</div><div class='del'>-			inet_csk_schedule_ack(sk);</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_TIMESTAMP_ECHO:</div><div class='del'>-			if (len != 4 &amp;&amp; len != 6 &amp;&amp; len != 8)</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-</div><div class='del'>-			opt_val = get_unaligned((__be32 *)value);</div><div class='del'>-			opt_recv-&gt;dccpor_timestamp_echo = ntohl(opt_val);</div><div class='del'>-</div><div class='del'>-			dccp_pr_debug("%s rx opt: TIMESTAMP_ECHO=%u, len=%d, "</div><div class='del'>-				      "ackno=%llu", dccp_role(sk),</div><div class='del'>-				      opt_recv-&gt;dccpor_timestamp_echo,</div><div class='del'>-				      len + 2,</div><div class='del'>-				      (unsigned long long)</div><div class='del'>-				      DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq);</div><div class='del'>-</div><div class='del'>-			value += 4;</div><div class='del'>-</div><div class='del'>-			if (len == 4) {		/* no elapsed time included */</div><div class='del'>-				dccp_pr_debug_cat("\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (len == 6) {		/* 2-byte elapsed time */</div><div class='del'>-				__be16 opt_val2 = get_unaligned((__be16 *)value);</div><div class='del'>-				elapsed_time = ntohs(opt_val2);</div><div class='del'>-			} else {		/* 4-byte elapsed time */</div><div class='del'>-				opt_val = get_unaligned((__be32 *)value);</div><div class='del'>-				elapsed_time = ntohl(opt_val);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			dccp_pr_debug_cat(", ELAPSED_TIME=%u\n", elapsed_time);</div><div class='del'>-</div><div class='del'>-			/* Give precedence to the biggest ELAPSED_TIME */</div><div class='del'>-			if (elapsed_time &gt; opt_recv-&gt;dccpor_elapsed_time)</div><div class='del'>-				opt_recv-&gt;dccpor_elapsed_time = elapsed_time;</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_ELAPSED_TIME:</div><div class='del'>-			if (dccp_packet_without_ack(skb))   /* RFC 4340, 13.2 */</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (len == 2) {</div><div class='del'>-				__be16 opt_val2 = get_unaligned((__be16 *)value);</div><div class='del'>-				elapsed_time = ntohs(opt_val2);</div><div class='del'>-			} else if (len == 4) {</div><div class='del'>-				opt_val = get_unaligned((__be32 *)value);</div><div class='del'>-				elapsed_time = ntohl(opt_val);</div><div class='del'>-			} else {</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (elapsed_time &gt; opt_recv-&gt;dccpor_elapsed_time)</div><div class='del'>-				opt_recv-&gt;dccpor_elapsed_time = elapsed_time;</div><div class='del'>-</div><div class='del'>-			dccp_pr_debug("%s rx opt: ELAPSED_TIME=%d\n",</div><div class='del'>-				      dccp_role(sk), elapsed_time);</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_MIN_RX_CCID_SPECIFIC ... DCCPO_MAX_RX_CCID_SPECIFIC:</div><div class='del'>-			if (ccid_hc_rx_parse_options(dp-&gt;dccps_hc_rx_ccid, sk,</div><div class='del'>-						     pkt_type, opt, value, len))</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			break;</div><div class='del'>-		case DCCPO_ACK_VECTOR_0:</div><div class='del'>-		case DCCPO_ACK_VECTOR_1:</div><div class='del'>-			if (dccp_packet_without_ack(skb))   /* RFC 4340, 11.4 */</div><div class='del'>-				break;</div><div class='del'>-			/*</div><div class='del'>-			 * Ack vectors are processed by the TX CCID if it is</div><div class='del'>-			 * interested. The RX CCID need not parse Ack Vectors,</div><div class='del'>-			 * since it is only interested in clearing old state.</div><div class='del'>-			 */</div><div class='del'>-			/* fall through */</div><div class='del'>-		case DCCPO_MIN_TX_CCID_SPECIFIC ... DCCPO_MAX_TX_CCID_SPECIFIC:</div><div class='del'>-			if (ccid_hc_tx_parse_options(dp-&gt;dccps_hc_tx_ccid, sk,</div><div class='del'>-						     pkt_type, opt, value, len))</div><div class='del'>-				goto out_invalid_option;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			DCCP_CRIT("DCCP(%p): option %d(len=%d) not "</div><div class='del'>-				  "implemented, ignoring", sk, opt, len);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-ignore_option:</div><div class='del'>-		if (opt != DCCPO_MANDATORY)</div><div class='del'>-			mandatory = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mandatory was the last byte in option list -&gt; reset connection */</div><div class='del'>-	if (mandatory)</div><div class='del'>-		goto out_invalid_option;</div><div class='del'>-</div><div class='del'>-out_nonsensical_length:</div><div class='del'>-	/* RFC 4340, 5.8: ignore option and all remaining option space */</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_invalid_option:</div><div class='del'>-	DCCP_INC_STATS(DCCP_MIB_INVALIDOPT);</div><div class='del'>-	rc = DCCP_RESET_CODE_OPTION_ERROR;</div><div class='del'>-out_featneg_failed:</div><div class='del'>-	DCCP_WARN("DCCP(%p): Option %d (len=%d) error=%u\n", sk, opt, len, rc);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = rc;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_data[0] = opt;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_data[1] = len &gt; 0 ? value[0] : 0;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_data[2] = len &gt; 1 ? value[1] : 0;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_parse_options);</div><div class='del'>-</div><div class='del'>-void dccp_encode_value_var(const u64 value, u8 *to, const u8 len)</div><div class='del'>-{</div><div class='del'>-	if (len &gt;= DCCP_OPTVAL_MAXLEN)</div><div class='del'>-		*to++ = (value &amp; 0xFF0000000000ull) &gt;&gt; 40;</div><div class='del'>-	if (len &gt; 4)</div><div class='del'>-		*to++ = (value &amp; 0xFF00000000ull) &gt;&gt; 32;</div><div class='del'>-	if (len &gt; 3)</div><div class='del'>-		*to++ = (value &amp; 0xFF000000) &gt;&gt; 24;</div><div class='del'>-	if (len &gt; 2)</div><div class='del'>-		*to++ = (value &amp; 0xFF0000) &gt;&gt; 16;</div><div class='del'>-	if (len &gt; 1)</div><div class='del'>-		*to++ = (value &amp; 0xFF00) &gt;&gt; 8;</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		*to++ = (value &amp; 0xFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 dccp_ndp_len(const u64 ndp)</div><div class='del'>-{</div><div class='del'>-	if (likely(ndp &lt;= 0xFF))</div><div class='del'>-		return 1;</div><div class='del'>-	return likely(ndp &lt;= USHRT_MAX) ? 2 : (ndp &lt;= UINT_MAX ? 4 : 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_insert_option(struct sk_buff *skb, const unsigned char option,</div><div class='del'>-		       const void *value, const unsigned char len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *to;</div><div class='del'>-</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_opt_len + len + 2 &gt; DCCP_MAX_OPT_LEN)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len += len + 2;</div><div class='del'>-</div><div class='del'>-	to    = skb_push(skb, len + 2);</div><div class='del'>-	*to++ = option;</div><div class='del'>-	*to++ = len + 2;</div><div class='del'>-</div><div class='del'>-	memcpy(to, value, len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_insert_option);</div><div class='del'>-</div><div class='del'>-static int dccp_insert_option_ndp(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	u64 ndp = dp-&gt;dccps_ndp_count;</div><div class='del'>-</div><div class='del'>-	if (dccp_non_data_packet(skb))</div><div class='del'>-		++dp-&gt;dccps_ndp_count;</div><div class='del'>-	else</div><div class='del'>-		dp-&gt;dccps_ndp_count = 0;</div><div class='del'>-</div><div class='del'>-	if (ndp &gt; 0) {</div><div class='del'>-		unsigned char *ptr;</div><div class='del'>-		const int ndp_len = dccp_ndp_len(ndp);</div><div class='del'>-		const int len = ndp_len + 2;</div><div class='del'>-</div><div class='del'>-		if (DCCP_SKB_CB(skb)-&gt;dccpd_opt_len + len &gt; DCCP_MAX_OPT_LEN)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_opt_len += len;</div><div class='del'>-</div><div class='del'>-		ptr = skb_push(skb, len);</div><div class='del'>-		*ptr++ = DCCPO_NDP_COUNT;</div><div class='del'>-		*ptr++ = len;</div><div class='del'>-		dccp_encode_value_var(ndp, ptr, ndp_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dccp_elapsed_time_len(const u32 elapsed_time)</div><div class='del'>-{</div><div class='del'>-	return elapsed_time == 0 ? 0 : elapsed_time &lt;= 0xFFFF ? 2 : 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_insert_option_timestamp(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	__be32 now = htonl(dccp_timestamp());</div><div class='del'>-	/* yes this will overflow but that is the point as we want a</div><div class='del'>-	 * 10 usec 32 bit timer which mean it wraps every 11.9 hours */</div><div class='del'>-</div><div class='del'>-	return dccp_insert_option(skb, DCCPO_TIMESTAMP, &amp;now, sizeof(now));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,</div><div class='del'>-					     struct dccp_request_sock *dreq,</div><div class='del'>-					     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	__be32 tstamp_echo;</div><div class='del'>-	unsigned char *to;</div><div class='del'>-	u32 elapsed_time, elapsed_time_len, len;</div><div class='del'>-</div><div class='del'>-	if (dreq != NULL) {</div><div class='del'>-		elapsed_time = dccp_timestamp() - dreq-&gt;dreq_timestamp_time;</div><div class='del'>-		tstamp_echo  = htonl(dreq-&gt;dreq_timestamp_echo);</div><div class='del'>-		dreq-&gt;dreq_timestamp_echo = 0;</div><div class='del'>-	} else {</div><div class='del'>-		elapsed_time = dccp_timestamp() - dp-&gt;dccps_timestamp_time;</div><div class='del'>-		tstamp_echo  = htonl(dp-&gt;dccps_timestamp_echo);</div><div class='del'>-		dp-&gt;dccps_timestamp_echo = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	elapsed_time_len = dccp_elapsed_time_len(elapsed_time);</div><div class='del'>-	len = 6 + elapsed_time_len;</div><div class='del'>-</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_opt_len + len &gt; DCCP_MAX_OPT_LEN)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len += len;</div><div class='del'>-</div><div class='del'>-	to    = skb_push(skb, len);</div><div class='del'>-	*to++ = DCCPO_TIMESTAMP_ECHO;</div><div class='del'>-	*to++ = len;</div><div class='del'>-</div><div class='del'>-	memcpy(to, &amp;tstamp_echo, 4);</div><div class='del'>-	to += 4;</div><div class='del'>-</div><div class='del'>-	if (elapsed_time_len == 2) {</div><div class='del'>-		const __be16 var16 = htons((u16)elapsed_time);</div><div class='del'>-		memcpy(to, &amp;var16, 2);</div><div class='del'>-	} else if (elapsed_time_len == 4) {</div><div class='del'>-		const __be32 var32 = htonl(elapsed_time);</div><div class='del'>-		memcpy(to, &amp;var32, 4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct dccp_ackvec *av = dp-&gt;dccps_hc_rx_ackvec;</div><div class='del'>-	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);</div><div class='del'>-	const u16 buflen = dccp_ackvec_buflen(av);</div><div class='del'>-	/* Figure out how many options do we need to represent the ackvec */</div><div class='del'>-	const u8 nr_opts = DIV_ROUND_UP(buflen, DCCP_SINGLE_OPT_MAXLEN);</div><div class='del'>-	u16 len = buflen + 2 * nr_opts;</div><div class='del'>-	u8 i, nonce = 0;</div><div class='del'>-	const unsigned char *tail, *from;</div><div class='del'>-	unsigned char *to;</div><div class='del'>-</div><div class='del'>-	if (dcb-&gt;dccpd_opt_len + len &gt; DCCP_MAX_OPT_LEN) {</div><div class='del'>-		DCCP_WARN("Lacking space for %u bytes on %s packet\n", len,</div><div class='del'>-			  dccp_packet_name(dcb-&gt;dccpd_type));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Since Ack Vectors are variable-length, we can not always predict</div><div class='del'>-	 * their size. To catch exception cases where the space is running out</div><div class='del'>-	 * on the skb, a separate Sync is scheduled to carry the Ack Vector.</div><div class='del'>-	 */</div><div class='del'>-	if (len &gt; DCCPAV_MIN_OPTLEN &amp;&amp;</div><div class='del'>-	    len + dcb-&gt;dccpd_opt_len + skb-&gt;len &gt; dp-&gt;dccps_mss_cache) {</div><div class='del'>-		DCCP_WARN("No space left for Ack Vector (%u) on skb (%u+%u), "</div><div class='del'>-			  "MPS=%u ==&gt; reduce payload size?\n", len, skb-&gt;len,</div><div class='del'>-			  dcb-&gt;dccpd_opt_len, dp-&gt;dccps_mss_cache);</div><div class='del'>-		dp-&gt;dccps_sync_scheduled = 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	dcb-&gt;dccpd_opt_len += len;</div><div class='del'>-</div><div class='del'>-	to   = skb_push(skb, len);</div><div class='del'>-	len  = buflen;</div><div class='del'>-	from = av-&gt;av_buf + av-&gt;av_buf_head;</div><div class='del'>-	tail = av-&gt;av_buf + DCCPAV_MAX_ACKVEC_LEN;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_opts; ++i) {</div><div class='del'>-		int copylen = len;</div><div class='del'>-</div><div class='del'>-		if (len &gt; DCCP_SINGLE_OPT_MAXLEN)</div><div class='del'>-			copylen = DCCP_SINGLE_OPT_MAXLEN;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * RFC 4340, 12.2: Encode the Nonce Echo for this Ack Vector via</div><div class='del'>-		 * its type; ack_nonce is the sum of all individual buf_nonce's.</div><div class='del'>-		 */</div><div class='del'>-		nonce ^= av-&gt;av_buf_nonce[i];</div><div class='del'>-</div><div class='del'>-		*to++ = DCCPO_ACK_VECTOR_0 + av-&gt;av_buf_nonce[i];</div><div class='del'>-		*to++ = copylen + 2;</div><div class='del'>-</div><div class='del'>-		/* Check if buf_head wraps */</div><div class='del'>-		if (from + copylen &gt; tail) {</div><div class='del'>-			const u16 tailsize = tail - from;</div><div class='del'>-</div><div class='del'>-			memcpy(to, from, tailsize);</div><div class='del'>-			to	+= tailsize;</div><div class='del'>-			len	-= tailsize;</div><div class='del'>-			copylen	-= tailsize;</div><div class='del'>-			from	= av-&gt;av_buf;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(to, from, copylen);</div><div class='del'>-		from += copylen;</div><div class='del'>-		to   += copylen;</div><div class='del'>-		len  -= copylen;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Each sent Ack Vector is recorded in the list, as per A.2 of RFC 4340.</div><div class='del'>-	 */</div><div class='del'>-	if (dccp_ackvec_update_records(av, dcb-&gt;dccpd_seq, nonce))</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_insert_option_mandatory  -  Mandatory option (5.8.2)</div><div class='del'>- * Note that since we are using skb_push, this function needs to be called</div><div class='del'>- * _after_ inserting the option it is supposed to influence (stack order).</div><div class='del'>- */</div><div class='del'>-int dccp_insert_option_mandatory(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_opt_len &gt;= DCCP_MAX_OPT_LEN)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len++;</div><div class='del'>-	*(u8 *)skb_push(skb, 1) = DCCPO_MANDATORY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_insert_fn_opt  -  Insert single Feature-Negotiation option into @skb</div><div class='del'>- * @type: %DCCPO_CHANGE_L, %DCCPO_CHANGE_R, %DCCPO_CONFIRM_L, %DCCPO_CONFIRM_R</div><div class='del'>- * @feat: one out of %dccp_feature_numbers</div><div class='del'>- * @val: NN value or SP array (preferred element first) to copy</div><div class='del'>- * @len: true length of @val in bytes (excluding first element repetition)</div><div class='del'>- * @repeat_first: whether to copy the first element of @val twice</div><div class='del'>- *</div><div class='del'>- * The last argument is used to construct Confirm options, where the preferred</div><div class='del'>- * value and the preference list appear separately (RFC 4340, 6.3.1). Preference</div><div class='del'>- * lists are kept such that the preferred entry is always first, so we only need</div><div class='del'>- * to copy twice, and avoid the overhead of cloning into a bigger array.</div><div class='del'>- */</div><div class='del'>-int dccp_insert_fn_opt(struct sk_buff *skb, u8 type, u8 feat,</div><div class='del'>-		       u8 *val, u8 len, bool repeat_first)</div><div class='del'>-{</div><div class='del'>-	u8 tot_len, *to;</div><div class='del'>-</div><div class='del'>-	/* take the `Feature' field and possible repetition into account */</div><div class='del'>-	if (len &gt; (DCCP_SINGLE_OPT_MAXLEN - 2)) {</div><div class='del'>-		DCCP_WARN("length %u for feature %u too large\n", len, feat);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(val == NULL || len == 0))</div><div class='del'>-		len = repeat_first = false;</div><div class='del'>-	tot_len = 3 + repeat_first + len;</div><div class='del'>-</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_opt_len + tot_len &gt; DCCP_MAX_OPT_LEN) {</div><div class='del'>-		DCCP_WARN("packet too small for feature %d option!\n", feat);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len += tot_len;</div><div class='del'>-</div><div class='del'>-	to    = skb_push(skb, tot_len);</div><div class='del'>-	*to++ = type;</div><div class='del'>-	*to++ = tot_len;</div><div class='del'>-	*to++ = feat;</div><div class='del'>-</div><div class='del'>-	if (repeat_first)</div><div class='del'>-		*to++ = *val;</div><div class='del'>-	if (len)</div><div class='del'>-		memcpy(to, val, len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The length of all options needs to be a multiple of 4 (5.8) */</div><div class='del'>-static void dccp_insert_option_padding(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int padding = DCCP_SKB_CB(skb)-&gt;dccpd_opt_len % 4;</div><div class='del'>-</div><div class='del'>-	if (padding != 0) {</div><div class='del'>-		padding = 4 - padding;</div><div class='del'>-		memset(skb_push(skb, padding), 0, padding);</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_opt_len += padding;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_insert_options(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len = 0;</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_send_ndp_count &amp;&amp; dccp_insert_option_ndp(sk, skb))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (DCCP_SKB_CB(skb)-&gt;dccpd_type != DCCP_PKT_DATA) {</div><div class='del'>-</div><div class='del'>-		/* Feature Negotiation */</div><div class='del'>-		if (dccp_feat_insert_opts(dp, NULL, skb))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		if (DCCP_SKB_CB(skb)-&gt;dccpd_type == DCCP_PKT_REQUEST) {</div><div class='del'>-			/*</div><div class='del'>-			 * Obtain RTT sample from Request/Response exchange.</div><div class='del'>-			 * This is currently used for TFRC initialisation.</div><div class='del'>-			 */</div><div class='del'>-			if (dccp_insert_option_timestamp(skb))</div><div class='del'>-				return -1;</div><div class='del'>-</div><div class='del'>-		} else if (dccp_ackvec_pending(sk) &amp;&amp;</div><div class='del'>-			   dccp_insert_option_ackvec(sk, skb)) {</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_hc_rx_insert_options) {</div><div class='del'>-		if (ccid_hc_rx_insert_options(dp-&gt;dccps_hc_rx_ccid, sk, skb))</div><div class='del'>-			return -1;</div><div class='del'>-		dp-&gt;dccps_hc_rx_insert_options = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_timestamp_echo != 0 &amp;&amp;</div><div class='del'>-	    dccp_insert_option_timestamp_echo(dp, NULL, skb))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	dccp_insert_option_padding(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_opt_len = 0;</div><div class='del'>-</div><div class='del'>-	if (dccp_feat_insert_opts(NULL, dreq, skb))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Obtain RTT sample from Response/Ack exchange (used by TFRC). */</div><div class='del'>-	if (dccp_insert_option_timestamp(skb))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (dreq-&gt;dreq_timestamp_echo != 0 &amp;&amp;</div><div class='del'>-	    dccp_insert_option_timestamp_echo(NULL, dreq, skb))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	dccp_insert_option_padding(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/output.c b/net/dccp/output.c<br/>deleted file mode 100644<br/>index 91a15b3c4915..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/output.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,704 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/output.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/inet_sock.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ackvec.h"</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-static inline void dccp_event_ack_sent(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* enqueue @skb on sk_send_head for retransmission, return clone to send now */</div><div class='del'>-static struct sk_buff *dccp_skb_entail(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	skb_set_owner_w(skb, sk);</div><div class='del'>-	WARN_ON(sk-&gt;sk_send_head);</div><div class='del'>-	sk-&gt;sk_send_head = skb;</div><div class='del'>-	return skb_clone(sk-&gt;sk_send_head, gfp_any());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * All SKB's seen here are completely headerless. It is our</div><div class='del'>- * job to build the DCCP header, and pass the packet down to</div><div class='del'>- * IP so it can do the same plus pass the packet off to the</div><div class='del'>- * device.</div><div class='del'>- */</div><div class='del'>-static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (likely(skb != NULL)) {</div><div class='del'>-		struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-		const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-		struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-		struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);</div><div class='del'>-		struct dccp_hdr *dh;</div><div class='del'>-		/* XXX For now we're using only 48 bits sequence numbers */</div><div class='del'>-		const u32 dccp_header_size = sizeof(*dh) +</div><div class='del'>-					     sizeof(struct dccp_hdr_ext) +</div><div class='del'>-					  dccp_packet_hdr_len(dcb-&gt;dccpd_type);</div><div class='del'>-		int err, set_ack = 1;</div><div class='del'>-		u64 ackno = dp-&gt;dccps_gsr;</div><div class='del'>-		/*</div><div class='del'>-		 * Increment GSS here already in case the option code needs it.</div><div class='del'>-		 * Update GSS for real only if option processing below succeeds.</div><div class='del'>-		 */</div><div class='del'>-		dcb-&gt;dccpd_seq = ADD48(dp-&gt;dccps_gss, 1);</div><div class='del'>-</div><div class='del'>-		switch (dcb-&gt;dccpd_type) {</div><div class='del'>-		case DCCP_PKT_DATA:</div><div class='del'>-			set_ack = 0;</div><div class='del'>-			/* fall through */</div><div class='del'>-		case DCCP_PKT_DATAACK:</div><div class='del'>-		case DCCP_PKT_RESET:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case DCCP_PKT_REQUEST:</div><div class='del'>-			set_ack = 0;</div><div class='del'>-			/* Use ISS on the first (non-retransmitted) Request. */</div><div class='del'>-			if (icsk-&gt;icsk_retransmits == 0)</div><div class='del'>-				dcb-&gt;dccpd_seq = dp-&gt;dccps_iss;</div><div class='del'>-			/* fall through */</div><div class='del'>-</div><div class='del'>-		case DCCP_PKT_SYNC:</div><div class='del'>-		case DCCP_PKT_SYNCACK:</div><div class='del'>-			ackno = dcb-&gt;dccpd_ack_seq;</div><div class='del'>-			/* fall through */</div><div class='del'>-		default:</div><div class='del'>-			/*</div><div class='del'>-			 * Set owner/destructor: some skbs are allocated via</div><div class='del'>-			 * alloc_skb (e.g. when retransmission may happen).</div><div class='del'>-			 * Only Data, DataAck, and Reset packets should come</div><div class='del'>-			 * through here with skb-&gt;sk set.</div><div class='del'>-			 */</div><div class='del'>-			WARN_ON(skb-&gt;sk);</div><div class='del'>-			skb_set_owner_w(skb, sk);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dccp_insert_options(sk, skb)) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -EPROTO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Build DCCP header and checksum it. */</div><div class='del'>-		dh = dccp_zeroed_hdr(skb, dccp_header_size);</div><div class='del'>-		dh-&gt;dccph_type	= dcb-&gt;dccpd_type;</div><div class='del'>-		dh-&gt;dccph_sport	= inet-&gt;inet_sport;</div><div class='del'>-		dh-&gt;dccph_dport	= inet-&gt;inet_dport;</div><div class='del'>-		dh-&gt;dccph_doff	= (dccp_header_size + dcb-&gt;dccpd_opt_len) / 4;</div><div class='del'>-		dh-&gt;dccph_ccval	= dcb-&gt;dccpd_ccval;</div><div class='del'>-		dh-&gt;dccph_cscov = dp-&gt;dccps_pcslen;</div><div class='del'>-		/* XXX For now we're using only 48 bits sequence numbers */</div><div class='del'>-		dh-&gt;dccph_x	= 1;</div><div class='del'>-</div><div class='del'>-		dccp_update_gss(sk, dcb-&gt;dccpd_seq);</div><div class='del'>-		dccp_hdr_set_seq(dh, dp-&gt;dccps_gss);</div><div class='del'>-		if (set_ack)</div><div class='del'>-			dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), ackno);</div><div class='del'>-</div><div class='del'>-		switch (dcb-&gt;dccpd_type) {</div><div class='del'>-		case DCCP_PKT_REQUEST:</div><div class='del'>-			dccp_hdr_request(skb)-&gt;dccph_req_service =</div><div class='del'>-							dp-&gt;dccps_service;</div><div class='del'>-			/*</div><div class='del'>-			 * Limit Ack window to ISS &lt;= P.ackno &lt;= GSS, so that</div><div class='del'>-			 * only Responses to Requests we sent are considered.</div><div class='del'>-			 */</div><div class='del'>-			dp-&gt;dccps_awl = dp-&gt;dccps_iss;</div><div class='del'>-			break;</div><div class='del'>-		case DCCP_PKT_RESET:</div><div class='del'>-			dccp_hdr_reset(skb)-&gt;dccph_reset_code =</div><div class='del'>-							dcb-&gt;dccpd_reset_code;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icsk-&gt;icsk_af_ops-&gt;send_check(sk, skb);</div><div class='del'>-</div><div class='del'>-		if (set_ack)</div><div class='del'>-			dccp_event_ack_sent(sk);</div><div class='del'>-</div><div class='del'>-		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);</div><div class='del'>-</div><div class='del'>-		err = icsk-&gt;icsk_af_ops-&gt;queue_xmit(sk, skb, &amp;inet-&gt;cork.fl);</div><div class='del'>-		return net_xmit_eval(err);</div><div class='del'>-	}</div><div class='del'>-	return -ENOBUFS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_determine_ccmps  -  Find out about CCID-specific packet-size limits</div><div class='del'>- * We only consider the HC-sender CCID for setting the CCMPS (RFC 4340, 14.),</div><div class='del'>- * since the RX CCID is restricted to feedback packets (Acks), which are small</div><div class='del'>- * in comparison with the data traffic. A value of 0 means "no current CCMPS".</div><div class='del'>- */</div><div class='del'>-static u32 dccp_determine_ccmps(const struct dccp_sock *dp)</div><div class='del'>-{</div><div class='del'>-	const struct ccid *tx_ccid = dp-&gt;dccps_hc_tx_ccid;</div><div class='del'>-</div><div class='del'>-	if (tx_ccid == NULL || tx_ccid-&gt;ccid_ops == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	return tx_ccid-&gt;ccid_ops-&gt;ccid_ccmps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	u32 ccmps = dccp_determine_ccmps(dp);</div><div class='del'>-	u32 cur_mps = ccmps ? min(pmtu, ccmps) : pmtu;</div><div class='del'>-</div><div class='del'>-	/* Account for header lengths and IPv4/v6 option overhead */</div><div class='del'>-	cur_mps -= (icsk-&gt;icsk_af_ops-&gt;net_header_len + icsk-&gt;icsk_ext_hdr_len +</div><div class='del'>-		    sizeof(struct dccp_hdr) + sizeof(struct dccp_hdr_ext));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Leave enough headroom for common DCCP header options.</div><div class='del'>-	 * This only considers options which may appear on DCCP-Data packets, as</div><div class='del'>-	 * per table 3 in RFC 4340, 5.8. When running out of space for other</div><div class='del'>-	 * options (eg. Ack Vector which can take up to 255 bytes), it is better</div><div class='del'>-	 * to schedule a separate Ack. Thus we leave headroom for the following:</div><div class='del'>-	 *  - 1 byte for Slow Receiver (11.6)</div><div class='del'>-	 *  - 6 bytes for Timestamp (13.1)</div><div class='del'>-	 *  - 10 bytes for Timestamp Echo (13.3)</div><div class='del'>-	 *  - 8 bytes for NDP count (7.7, when activated)</div><div class='del'>-	 *  - 6 bytes for Data Checksum (9.3)</div><div class='del'>-	 *  - %DCCPAV_MIN_OPTLEN bytes for Ack Vector size (11.4, when enabled)</div><div class='del'>-	 */</div><div class='del'>-	cur_mps -= roundup(1 + 6 + 10 + dp-&gt;dccps_send_ndp_count * 8 + 6 +</div><div class='del'>-			   (dp-&gt;dccps_hc_rx_ackvec ? DCCPAV_MIN_OPTLEN : 0), 4);</div><div class='del'>-</div><div class='del'>-	/* And store cached results */</div><div class='del'>-	icsk-&gt;icsk_pmtu_cookie = pmtu;</div><div class='del'>-	dp-&gt;dccps_mss_cache = cur_mps;</div><div class='del'>-</div><div class='del'>-	return cur_mps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_sync_mss);</div><div class='del'>-</div><div class='del'>-void dccp_write_space(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct socket_wq *wq;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='del'>-	if (skwq_has_sleeper(wq))</div><div class='del'>-		wake_up_interruptible(&amp;wq-&gt;wait);</div><div class='del'>-	/* Should agree with poll, otherwise some programs break */</div><div class='del'>-	if (sock_writeable(sk))</div><div class='del'>-		sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_wait_for_ccid  -  Await CCID send permission</div><div class='del'>- * @sk:    socket to wait for</div><div class='del'>- * @delay: timeout in jiffies</div><div class='del'>- *</div><div class='del'>- * This is used by CCIDs which need to delay the send time in process context.</div><div class='del'>- */</div><div class='del'>-static int dccp_wait_for_ccid(struct sock *sk, unsigned long delay)</div><div class='del'>-{</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	long remaining;</div><div class='del'>-</div><div class='del'>-	prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	sk-&gt;sk_write_pending++;</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	remaining = schedule_timeout(delay);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	sk-&gt;sk_write_pending--;</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='del'>-</div><div class='del'>-	if (signal_pending(current) || sk-&gt;sk_err)</div><div class='del'>-		return -1;</div><div class='del'>-	return remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_xmit_packet  -  Send data packet under control of CCID</div><div class='del'>- * Transmits next-queued payload and informs CCID to account for the packet.</div><div class='del'>- */</div><div class='del'>-static void dccp_xmit_packet(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	int err, len;</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct sk_buff *skb = dccp_qpolicy_pop(sk);</div><div class='del'>-</div><div class='del'>-	if (unlikely(skb == NULL))</div><div class='del'>-		return;</div><div class='del'>-	len = skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_PARTOPEN) {</div><div class='del'>-		const u32 cur_mps = dp-&gt;dccps_mss_cache - DCCP_FEATNEG_OVERHEAD;</div><div class='del'>-		/*</div><div class='del'>-		 * See 8.1.5 - Handshake Completion.</div><div class='del'>-		 *</div><div class='del'>-		 * For robustness we resend Confirm options until the client has</div><div class='del'>-		 * entered OPEN. During the initial feature negotiation, the MPS</div><div class='del'>-		 * is smaller than usual, reduced by the Change/Confirm options.</div><div class='del'>-		 */</div><div class='del'>-		if (!list_empty(&amp;dp-&gt;dccps_featneg) &amp;&amp; len &gt; cur_mps) {</div><div class='del'>-			DCCP_WARN("Payload too large (%d) for featneg.\n", len);</div><div class='del'>-			dccp_send_ack(sk);</div><div class='del'>-			dccp_feat_list_purge(&amp;dp-&gt;dccps_featneg);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		inet_csk_schedule_ack(sk);</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,</div><div class='del'>-					      inet_csk(sk)-&gt;icsk_rto,</div><div class='del'>-					      DCCP_RTO_MAX);</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_DATAACK;</div><div class='del'>-	} else if (dccp_ack_pending(sk)) {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_DATAACK;</div><div class='del'>-	} else {</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_DATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = dccp_transmit_skb(sk, skb);</div><div class='del'>-	if (err)</div><div class='del'>-		dccp_pr_debug("transmit_skb() returned err=%d\n", err);</div><div class='del'>-	/*</div><div class='del'>-	 * Register this one as sent even if an error occurred. To the remote</div><div class='del'>-	 * end a local packet drop is indistinguishable from network loss, i.e.</div><div class='del'>-	 * any local drop will eventually be reported via receiver feedback.</div><div class='del'>-	 */</div><div class='del'>-	ccid_hc_tx_packet_sent(dp-&gt;dccps_hc_tx_ccid, sk, len);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the CCID needs to transfer additional header options out-of-band</div><div class='del'>-	 * (e.g. Ack Vectors or feature-negotiation options), it activates this</div><div class='del'>-	 * flag to schedule a Sync. The Sync will automatically incorporate all</div><div class='del'>-	 * currently pending header options, thus clearing the backlog.</div><div class='del'>-	 */</div><div class='del'>-	if (dp-&gt;dccps_sync_scheduled)</div><div class='del'>-		dccp_send_sync(sk, dp-&gt;dccps_gsr, DCCP_PKT_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_flush_write_queue  -  Drain queue at end of connection</div><div class='del'>- * Since dccp_sendmsg queues packets without waiting for them to be sent, it may</div><div class='del'>- * happen that the TX queue is not empty at the end of a connection. We give the</div><div class='del'>- * HC-sender CCID a grace period of up to @time_budget jiffies. If this function</div><div class='del'>- * returns with a non-empty write queue, it will be purged later.</div><div class='del'>- */</div><div class='del'>-void dccp_flush_write_queue(struct sock *sk, long *time_budget)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	long delay, rc;</div><div class='del'>-</div><div class='del'>-	while (*time_budget &gt; 0 &amp;&amp; (skb = skb_peek(&amp;sk-&gt;sk_write_queue))) {</div><div class='del'>-		rc = ccid_hc_tx_send_packet(dp-&gt;dccps_hc_tx_ccid, sk, skb);</div><div class='del'>-</div><div class='del'>-		switch (ccid_packet_dequeue_eval(rc)) {</div><div class='del'>-		case CCID_PACKET_WILL_DEQUEUE_LATER:</div><div class='del'>-			/*</div><div class='del'>-			 * If the CCID determines when to send, the next sending</div><div class='del'>-			 * time is unknown or the CCID may not even send again</div><div class='del'>-			 * (e.g. remote host crashes or lost Ack packets).</div><div class='del'>-			 */</div><div class='del'>-			DCCP_WARN("CCID did not manage to send all packets\n");</div><div class='del'>-			return;</div><div class='del'>-		case CCID_PACKET_DELAY:</div><div class='del'>-			delay = msecs_to_jiffies(rc);</div><div class='del'>-			if (delay &gt; *time_budget)</div><div class='del'>-				return;</div><div class='del'>-			rc = dccp_wait_for_ccid(sk, delay);</div><div class='del'>-			if (rc &lt; 0)</div><div class='del'>-				return;</div><div class='del'>-			*time_budget -= (delay - rc);</div><div class='del'>-			/* check again if we can send now */</div><div class='del'>-			break;</div><div class='del'>-		case CCID_PACKET_SEND_AT_ONCE:</div><div class='del'>-			dccp_xmit_packet(sk);</div><div class='del'>-			break;</div><div class='del'>-		case CCID_PACKET_ERR:</div><div class='del'>-			skb_dequeue(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			dccp_pr_debug("packet discarded due to err=%ld\n", rc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_write_xmit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while ((skb = dccp_qpolicy_top(sk))) {</div><div class='del'>-		int rc = ccid_hc_tx_send_packet(dp-&gt;dccps_hc_tx_ccid, sk, skb);</div><div class='del'>-</div><div class='del'>-		switch (ccid_packet_dequeue_eval(rc)) {</div><div class='del'>-		case CCID_PACKET_WILL_DEQUEUE_LATER:</div><div class='del'>-			return;</div><div class='del'>-		case CCID_PACKET_DELAY:</div><div class='del'>-			sk_reset_timer(sk, &amp;dp-&gt;dccps_xmit_timer,</div><div class='del'>-				       jiffies + msecs_to_jiffies(rc));</div><div class='del'>-			return;</div><div class='del'>-		case CCID_PACKET_SEND_AT_ONCE:</div><div class='del'>-			dccp_xmit_packet(sk);</div><div class='del'>-			break;</div><div class='del'>-		case CCID_PACKET_ERR:</div><div class='del'>-			dccp_qpolicy_drop(sk, skb);</div><div class='del'>-			dccp_pr_debug("packet discarded due to err=%d\n", rc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_retransmit_skb  -  Retransmit Request, Close, or CloseReq packets</div><div class='del'>- * There are only four retransmittable packet types in DCCP:</div><div class='del'>- * - Request  in client-REQUEST  state (sec. 8.1.1),</div><div class='del'>- * - CloseReq in server-CLOSEREQ state (sec. 8.3),</div><div class='del'>- * - Close    in   node-CLOSING  state (sec. 8.3),</div><div class='del'>- * - Acks in client-PARTOPEN state (sec. 8.1.5, handled by dccp_delack_timer()).</div><div class='del'>- * This function expects sk-&gt;sk_send_head to contain the original skb.</div><div class='del'>- */</div><div class='del'>-int dccp_retransmit_skb(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(sk-&gt;sk_send_head == NULL);</div><div class='del'>-</div><div class='del'>-	if (inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk) != 0)</div><div class='del'>-		return -EHOSTUNREACH; /* Routing failure or similar. */</div><div class='del'>-</div><div class='del'>-	/* this count is used to distinguish original and retransmitted skb */</div><div class='del'>-	inet_csk(sk)-&gt;icsk_retransmits++;</div><div class='del'>-</div><div class='del'>-	return dccp_transmit_skb(sk, skb_clone(sk-&gt;sk_send_head, GFP_ATOMIC));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *dccp_make_response(const struct sock *sk, struct dst_entry *dst,</div><div class='del'>-				   struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	struct dccp_hdr *dh;</div><div class='del'>-	struct dccp_request_sock *dreq;</div><div class='del'>-	const u32 dccp_header_size = sizeof(struct dccp_hdr) +</div><div class='del'>-				     sizeof(struct dccp_hdr_ext) +</div><div class='del'>-				     sizeof(struct dccp_hdr_response);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	/* sk is marked const to clearly express we dont hold socket lock.</div><div class='del'>-	 * sock_wmalloc() will atomically change sk-&gt;sk_wmem_alloc,</div><div class='del'>-	 * it is safe to promote sk to non const.</div><div class='del'>-	 */</div><div class='del'>-	skb = sock_wmalloc((struct sock *)sk, MAX_DCCP_HEADER, 1,</div><div class='del'>-			   GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, MAX_DCCP_HEADER);</div><div class='del'>-</div><div class='del'>-	skb_dst_set(skb, dst_clone(dst));</div><div class='del'>-</div><div class='del'>-	dreq = dccp_rsk(req);</div><div class='del'>-	if (inet_rsk(req)-&gt;acked)	/* increase GSS upon retransmission */</div><div class='del'>-		dccp_inc_seqno(&amp;dreq-&gt;dreq_gss);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_RESPONSE;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_seq  = dreq-&gt;dreq_gss;</div><div class='del'>-</div><div class='del'>-	/* Resolve feature dependencies resulting from choice of CCID */</div><div class='del'>-	if (dccp_feat_server_ccid_dependencies(dreq))</div><div class='del'>-		goto response_failed;</div><div class='del'>-</div><div class='del'>-	if (dccp_insert_options_rsk(dreq, skb))</div><div class='del'>-		goto response_failed;</div><div class='del'>-</div><div class='del'>-	/* Build and checksum header */</div><div class='del'>-	dh = dccp_zeroed_hdr(skb, dccp_header_size);</div><div class='del'>-</div><div class='del'>-	dh-&gt;dccph_sport	= htons(inet_rsk(req)-&gt;ir_num);</div><div class='del'>-	dh-&gt;dccph_dport	= inet_rsk(req)-&gt;ir_rmt_port;</div><div class='del'>-	dh-&gt;dccph_doff	= (dccp_header_size +</div><div class='del'>-			   DCCP_SKB_CB(skb)-&gt;dccpd_opt_len) / 4;</div><div class='del'>-	dh-&gt;dccph_type	= DCCP_PKT_RESPONSE;</div><div class='del'>-	dh-&gt;dccph_x	= 1;</div><div class='del'>-	dccp_hdr_set_seq(dh, dreq-&gt;dreq_gss);</div><div class='del'>-	dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dreq-&gt;dreq_gsr);</div><div class='del'>-	dccp_hdr_response(skb)-&gt;dccph_resp_service = dreq-&gt;dreq_service;</div><div class='del'>-</div><div class='del'>-	dccp_csum_outgoing(skb);</div><div class='del'>-</div><div class='del'>-	/* We use `acked' to remember that a Response was already sent. */</div><div class='del'>-	inet_rsk(req)-&gt;acked = 1;</div><div class='del'>-	DCCP_INC_STATS(DCCP_MIB_OUTSEGS);</div><div class='del'>-	return skb;</div><div class='del'>-response_failed:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_make_response);</div><div class='del'>-</div><div class='del'>-/* answer offending packet in @rcv_skb with Reset from control socket @ctl */</div><div class='del'>-struct sk_buff *dccp_ctl_make_reset(struct sock *sk, struct sk_buff *rcv_skb)</div><div class='del'>-{</div><div class='del'>-	struct dccp_hdr *rxdh = dccp_hdr(rcv_skb), *dh;</div><div class='del'>-	struct dccp_skb_cb *dcb = DCCP_SKB_CB(rcv_skb);</div><div class='del'>-	const u32 dccp_hdr_reset_len = sizeof(struct dccp_hdr) +</div><div class='del'>-				       sizeof(struct dccp_hdr_ext) +</div><div class='del'>-				       sizeof(struct dccp_hdr_reset);</div><div class='del'>-	struct dccp_hdr_reset *dhr;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb(sk-&gt;sk_prot-&gt;max_header, GFP_ATOMIC);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-</div><div class='del'>-	/* Swap the send and the receive. */</div><div class='del'>-	dh = dccp_zeroed_hdr(skb, dccp_hdr_reset_len);</div><div class='del'>-	dh-&gt;dccph_type	= DCCP_PKT_RESET;</div><div class='del'>-	dh-&gt;dccph_sport	= rxdh-&gt;dccph_dport;</div><div class='del'>-	dh-&gt;dccph_dport	= rxdh-&gt;dccph_sport;</div><div class='del'>-	dh-&gt;dccph_doff	= dccp_hdr_reset_len / 4;</div><div class='del'>-	dh-&gt;dccph_x	= 1;</div><div class='del'>-</div><div class='del'>-	dhr = dccp_hdr_reset(skb);</div><div class='del'>-	dhr-&gt;dccph_reset_code = dcb-&gt;dccpd_reset_code;</div><div class='del'>-</div><div class='del'>-	switch (dcb-&gt;dccpd_reset_code) {</div><div class='del'>-	case DCCP_RESET_CODE_PACKET_ERROR:</div><div class='del'>-		dhr-&gt;dccph_reset_data[0] = rxdh-&gt;dccph_type;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_RESET_CODE_OPTION_ERROR:	/* fall through */</div><div class='del'>-	case DCCP_RESET_CODE_MANDATORY_ERROR:</div><div class='del'>-		memcpy(dhr-&gt;dccph_reset_data, dcb-&gt;dccpd_reset_data, 3);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * From RFC 4340, 8.3.1:</div><div class='del'>-	 *   If P.ackno exists, set R.seqno := P.ackno + 1.</div><div class='del'>-	 *   Else set R.seqno := 0.</div><div class='del'>-	 */</div><div class='del'>-	if (dcb-&gt;dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)</div><div class='del'>-		dccp_hdr_set_seq(dh, ADD48(dcb-&gt;dccpd_ack_seq, 1));</div><div class='del'>-	dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dcb-&gt;dccpd_seq);</div><div class='del'>-</div><div class='del'>-	dccp_csum_outgoing(skb);</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_ctl_make_reset);</div><div class='del'>-</div><div class='del'>-/* send Reset on established socket, to close or abort the connection */</div><div class='del'>-int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: what if rebuild_header fails?</div><div class='del'>-	 * Should we be doing a rebuild_header here?</div><div class='del'>-	 */</div><div class='del'>-	int err = inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk);</div><div class='del'>-</div><div class='del'>-	if (err != 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	skb = sock_wmalloc(sk, sk-&gt;sk_prot-&gt;max_header, 1, GFP_ATOMIC);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	/* Reserve space for headers and prepare control bits. */</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type	   = DCCP_PKT_RESET;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_reset_code = code;</div><div class='del'>-</div><div class='del'>-	return dccp_transmit_skb(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do all connect socket setups that can be done AF independent.</div><div class='del'>- */</div><div class='del'>-int dccp_connect(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct dst_entry *dst = __sk_dst_get(sk);</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_err = 0;</div><div class='del'>-	sock_reset_flag(sk, SOCK_DONE);</div><div class='del'>-</div><div class='del'>-	dccp_sync_mss(sk, dst_mtu(dst));</div><div class='del'>-</div><div class='del'>-	/* do not connect if feature negotiation setup fails */</div><div class='del'>-	if (dccp_feat_finalise_settings(dccp_sk(sk)))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-</div><div class='del'>-	/* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */</div><div class='del'>-	dp-&gt;dccps_gar = dp-&gt;dccps_iss;</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb(sk-&gt;sk_prot-&gt;max_header, sk-&gt;sk_allocation);</div><div class='del'>-	if (unlikely(skb == NULL))</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	/* Reserve space for headers. */</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_REQUEST;</div><div class='del'>-</div><div class='del'>-	dccp_transmit_skb(sk, dccp_skb_entail(sk, skb));</div><div class='del'>-	DCCP_INC_STATS(DCCP_MIB_ACTIVEOPENS);</div><div class='del'>-</div><div class='del'>-	/* Timer for repeating the REQUEST until an answer. */</div><div class='del'>-	icsk-&gt;icsk_retransmits = 0;</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-				  icsk-&gt;icsk_rto, DCCP_RTO_MAX);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_connect);</div><div class='del'>-</div><div class='del'>-void dccp_send_ack(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	/* If we have been reset, we may not send again. */</div><div class='del'>-	if (sk-&gt;sk_state != DCCP_CLOSED) {</div><div class='del'>-		struct sk_buff *skb = alloc_skb(sk-&gt;sk_prot-&gt;max_header,</div><div class='del'>-						GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			inet_csk_schedule_ack(sk);</div><div class='del'>-			inet_csk(sk)-&gt;icsk_ack.ato = TCP_ATO_MIN;</div><div class='del'>-			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,</div><div class='del'>-						  TCP_DELACK_MAX,</div><div class='del'>-						  DCCP_RTO_MAX);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Reserve space for headers */</div><div class='del'>-		skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_ACK;</div><div class='del'>-		dccp_transmit_skb(sk, skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_send_ack);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */</div><div class='del'>-void dccp_send_delayed_ack(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: tune this timer. elapsed time fixes the skew, so no problem</div><div class='del'>-	 * with using 2s, and active senders also piggyback the ACK into a</div><div class='del'>-	 * DATAACK packet, so this is really for quiescent senders.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long timeout = jiffies + 2 * HZ;</div><div class='del'>-</div><div class='del'>-	/* Use new timeout only if there wasn't a older one earlier. */</div><div class='del'>-	if (icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER) {</div><div class='del'>-		/* If delack timer was blocked or is about to expire,</div><div class='del'>-		 * send ACK now.</div><div class='del'>-		 *</div><div class='del'>-		 * FIXME: check the "about to expire" part</div><div class='del'>-		 */</div><div class='del'>-		if (icsk-&gt;icsk_ack.blocked) {</div><div class='del'>-			dccp_send_ack(sk);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!time_before(timeout, icsk-&gt;icsk_ack.timeout))</div><div class='del'>-			timeout = icsk-&gt;icsk_ack.timeout;</div><div class='del'>-	}</div><div class='del'>-	icsk-&gt;icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;</div><div class='del'>-	icsk-&gt;icsk_ack.timeout = timeout;</div><div class='del'>-	sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer, timeout);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void dccp_send_sync(struct sock *sk, const u64 ackno,</div><div class='del'>-		    const enum dccp_pkt_type pkt_type)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We are not putting this on the write queue, so</div><div class='del'>-	 * dccp_transmit_skb() will set the ownership to this</div><div class='del'>-	 * sock.</div><div class='del'>-	 */</div><div class='del'>-	struct sk_buff *skb = alloc_skb(sk-&gt;sk_prot-&gt;max_header, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		/* FIXME: how to make sure the sync is sent? */</div><div class='del'>-		DCCP_CRIT("could not send %s", dccp_packet_name(pkt_type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reserve space for headers and prepare control bits. */</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_type = pkt_type;</div><div class='del'>-	DCCP_SKB_CB(skb)-&gt;dccpd_ack_seq = ackno;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear the flag in case the Sync was scheduled for out-of-band data,</div><div class='del'>-	 * such as carrying a long Ack Vector.</div><div class='del'>-	 */</div><div class='del'>-	dccp_sk(sk)-&gt;dccps_sync_scheduled = 0;</div><div class='del'>-</div><div class='del'>-	dccp_transmit_skb(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_send_sync);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send a DCCP_PKT_CLOSE/CLOSEREQ. The caller locks the socket for us. This</div><div class='del'>- * cannot be allowed to fail queueing a DCCP_PKT_CLOSE/CLOSEREQ frame under</div><div class='del'>- * any circumstances.</div><div class='del'>- */</div><div class='del'>-void dccp_send_close(struct sock *sk, const int active)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	const gfp_t prio = active ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb(sk-&gt;sk_prot-&gt;max_header, prio);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Reserve space for headers and prepare control bits. */</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-	if (dp-&gt;dccps_role == DCCP_ROLE_SERVER &amp;&amp; !dp-&gt;dccps_server_timewait)</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_CLOSEREQ;</div><div class='del'>-	else</div><div class='del'>-		DCCP_SKB_CB(skb)-&gt;dccpd_type = DCCP_PKT_CLOSE;</div><div class='del'>-</div><div class='del'>-	if (active) {</div><div class='del'>-		skb = dccp_skb_entail(sk, skb);</div><div class='del'>-		/*</div><div class='del'>-		 * Retransmission timer for active-close: RFC 4340, 8.3 requires</div><div class='del'>-		 * to retransmit the Close/CloseReq until the CLOSING/CLOSEREQ</div><div class='del'>-		 * state can be left. The initial timeout is 2 RTTs.</div><div class='del'>-		 * Since RTT measurement is done by the CCIDs, there is no easy</div><div class='del'>-		 * way to get an RTT sample. The fallback RTT from RFC 4340, 3.4</div><div class='del'>-		 * is too low (200ms); we use a high value to avoid unnecessary</div><div class='del'>-		 * retransmissions when the link RTT is &gt; 0.2 seconds.</div><div class='del'>-		 * FIXME: Let main module sample RTTs and use that instead.</div><div class='del'>-		 */</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-					  DCCP_TIMEOUT_INIT, DCCP_RTO_MAX);</div><div class='del'>-	}</div><div class='del'>-	dccp_transmit_skb(sk, skb);</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/proto.c b/net/dccp/proto.c<br/>deleted file mode 100644<br/>index 875858c8b059..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/proto.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/proto.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1276 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/proto.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *	under the terms of the GNU General Public License version 2 as</div><div class='del'>- *	published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/inet_sock.h&gt;</div><div class='del'>-#include &lt;net/inet_common.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ioctls.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ccid.h"</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-#define CREATE_TRACE_POINTS</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-DEFINE_SNMP_STAT(struct dccp_mib, dccp_statistics) __read_mostly;</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_statistics);</div><div class='del'>-</div><div class='del'>-struct percpu_counter dccp_orphan_count;</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_orphan_count);</div><div class='del'>-</div><div class='del'>-struct inet_hashinfo dccp_hashinfo;</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_hashinfo);</div><div class='del'>-</div><div class='del'>-/* the maximum queue length for tx in packets. 0 is no limit */</div><div class='del'>-int sysctl_dccp_tx_qlen __read_mostly = 5;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_DEBUG</div><div class='del'>-static const char *dccp_state_name(const int state)</div><div class='del'>-{</div><div class='del'>-	static const char *const dccp_state_names[] = {</div><div class='del'>-	[DCCP_OPEN]		= "OPEN",</div><div class='del'>-	[DCCP_REQUESTING]	= "REQUESTING",</div><div class='del'>-	[DCCP_PARTOPEN]		= "PARTOPEN",</div><div class='del'>-	[DCCP_LISTEN]		= "LISTEN",</div><div class='del'>-	[DCCP_RESPOND]		= "RESPOND",</div><div class='del'>-	[DCCP_CLOSING]		= "CLOSING",</div><div class='del'>-	[DCCP_ACTIVE_CLOSEREQ]	= "CLOSEREQ",</div><div class='del'>-	[DCCP_PASSIVE_CLOSE]	= "PASSIVE_CLOSE",</div><div class='del'>-	[DCCP_PASSIVE_CLOSEREQ]	= "PASSIVE_CLOSEREQ",</div><div class='del'>-	[DCCP_TIME_WAIT]	= "TIME_WAIT",</div><div class='del'>-	[DCCP_CLOSED]		= "CLOSED",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (state &gt;= DCCP_MAX_STATES)</div><div class='del'>-		return "INVALID STATE!";</div><div class='del'>-	else</div><div class='del'>-		return dccp_state_names[state];</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void dccp_set_state(struct sock *sk, const int state)</div><div class='del'>-{</div><div class='del'>-	const int oldstate = sk-&gt;sk_state;</div><div class='del'>-</div><div class='del'>-	dccp_pr_debug("%s(%p)  %s  --&gt;  %s\n", dccp_role(sk), sk,</div><div class='del'>-		      dccp_state_name(oldstate), dccp_state_name(state));</div><div class='del'>-	WARN_ON(state == oldstate);</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case DCCP_OPEN:</div><div class='del'>-		if (oldstate != DCCP_OPEN)</div><div class='del'>-			DCCP_INC_STATS(DCCP_MIB_CURRESTAB);</div><div class='del'>-		/* Client retransmits all Confirm options until entering OPEN */</div><div class='del'>-		if (oldstate == DCCP_PARTOPEN)</div><div class='del'>-			dccp_feat_list_purge(&amp;dccp_sk(sk)-&gt;dccps_featneg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DCCP_CLOSED:</div><div class='del'>-		if (oldstate == DCCP_OPEN || oldstate == DCCP_ACTIVE_CLOSEREQ ||</div><div class='del'>-		    oldstate == DCCP_CLOSING)</div><div class='del'>-			DCCP_INC_STATS(DCCP_MIB_ESTABRESETS);</div><div class='del'>-</div><div class='del'>-		sk-&gt;sk_prot-&gt;unhash(sk);</div><div class='del'>-		if (inet_csk(sk)-&gt;icsk_bind_hash != NULL &amp;&amp;</div><div class='del'>-		    !(sk-&gt;sk_userlocks &amp; SOCK_BINDPORT_LOCK))</div><div class='del'>-			inet_put_port(sk);</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		if (oldstate == DCCP_OPEN)</div><div class='del'>-			DCCP_DEC_STATS(DCCP_MIB_CURRESTAB);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Change state AFTER socket is unhashed to avoid closed</div><div class='del'>-	 * socket sitting in hash tables.</div><div class='del'>-	 */</div><div class='del'>-	inet_sk_set_state(sk, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_set_state);</div><div class='del'>-</div><div class='del'>-static void dccp_finish_passive_close(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_PASSIVE_CLOSE:</div><div class='del'>-		/* Node (client or server) has received Close packet. */</div><div class='del'>-		dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED);</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_PASSIVE_CLOSEREQ:</div><div class='del'>-		/*</div><div class='del'>-		 * Client received CloseReq. We set the `active' flag so that</div><div class='del'>-		 * dccp_send_close() retransmits the Close as per RFC 4340, 8.3.</div><div class='del'>-		 */</div><div class='del'>-		dccp_send_close(sk, 1);</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSING);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_done(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-	dccp_clear_xmit_timers(sk);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='del'>-</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_state_change(sk);</div><div class='del'>-	else</div><div class='del'>-		inet_csk_destroy_sock(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_done);</div><div class='del'>-</div><div class='del'>-const char *dccp_packet_name(const int type)</div><div class='del'>-{</div><div class='del'>-	static const char *const dccp_packet_names[] = {</div><div class='del'>-		[DCCP_PKT_REQUEST]  = "REQUEST",</div><div class='del'>-		[DCCP_PKT_RESPONSE] = "RESPONSE",</div><div class='del'>-		[DCCP_PKT_DATA]	    = "DATA",</div><div class='del'>-		[DCCP_PKT_ACK]	    = "ACK",</div><div class='del'>-		[DCCP_PKT_DATAACK]  = "DATAACK",</div><div class='del'>-		[DCCP_PKT_CLOSEREQ] = "CLOSEREQ",</div><div class='del'>-		[DCCP_PKT_CLOSE]    = "CLOSE",</div><div class='del'>-		[DCCP_PKT_RESET]    = "RESET",</div><div class='del'>-		[DCCP_PKT_SYNC]	    = "SYNC",</div><div class='del'>-		[DCCP_PKT_SYNCACK]  = "SYNCACK",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (type &gt;= DCCP_NR_PKT_TYPES)</div><div class='del'>-		return "INVALID";</div><div class='del'>-	else</div><div class='del'>-		return dccp_packet_names[type];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_packet_name);</div><div class='del'>-</div><div class='del'>-static void dccp_sk_destruct(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	ccid_hc_tx_delete(dp-&gt;dccps_hc_tx_ccid, sk);</div><div class='del'>-	dp-&gt;dccps_hc_tx_ccid = NULL;</div><div class='del'>-	inet_sock_destruct(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_rto		= DCCP_TIMEOUT_INIT;</div><div class='del'>-	icsk-&gt;icsk_syn_retries	= sysctl_dccp_request_retries;</div><div class='del'>-	sk-&gt;sk_state		= DCCP_CLOSED;</div><div class='del'>-	sk-&gt;sk_write_space	= dccp_write_space;</div><div class='del'>-	sk-&gt;sk_destruct		= dccp_sk_destruct;</div><div class='del'>-	icsk-&gt;icsk_sync_mss	= dccp_sync_mss;</div><div class='del'>-	dp-&gt;dccps_mss_cache	= 536;</div><div class='del'>-	dp-&gt;dccps_rate_last	= jiffies;</div><div class='del'>-	dp-&gt;dccps_role		= DCCP_ROLE_UNDEFINED;</div><div class='del'>-	dp-&gt;dccps_service	= DCCP_SERVICE_CODE_IS_ABSENT;</div><div class='del'>-	dp-&gt;dccps_tx_qlen	= sysctl_dccp_tx_qlen;</div><div class='del'>-</div><div class='del'>-	dccp_init_xmit_timers(sk);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;dp-&gt;dccps_featneg);</div><div class='del'>-	/* control socket doesn't need feat nego */</div><div class='del'>-	if (likely(ctl_sock_initialized))</div><div class='del'>-		return dccp_feat_init(sk);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_init_sock);</div><div class='del'>-</div><div class='del'>-void dccp_destroy_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	__skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-	if (sk-&gt;sk_send_head != NULL) {</div><div class='del'>-		kfree_skb(sk-&gt;sk_send_head);</div><div class='del'>-		sk-&gt;sk_send_head = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up a referenced DCCP bind bucket. */</div><div class='del'>-	if (inet_csk(sk)-&gt;icsk_bind_hash != NULL)</div><div class='del'>-		inet_put_port(sk);</div><div class='del'>-</div><div class='del'>-	kfree(dp-&gt;dccps_service_list);</div><div class='del'>-	dp-&gt;dccps_service_list = NULL;</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;dccps_hc_rx_ackvec != NULL) {</div><div class='del'>-		dccp_ackvec_free(dp-&gt;dccps_hc_rx_ackvec);</div><div class='del'>-		dp-&gt;dccps_hc_rx_ackvec = NULL;</div><div class='del'>-	}</div><div class='del'>-	ccid_hc_rx_delete(dp-&gt;dccps_hc_rx_ccid, sk);</div><div class='del'>-	dp-&gt;dccps_hc_rx_ccid = NULL;</div><div class='del'>-</div><div class='del'>-	/* clean up feature negotiation state */</div><div class='del'>-	dccp_feat_list_purge(&amp;dp-&gt;dccps_featneg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_destroy_sock);</div><div class='del'>-</div><div class='del'>-static inline int dccp_listen_start(struct sock *sk, int backlog)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_role = DCCP_ROLE_LISTEN;</div><div class='del'>-	/* do not start to listen if feature negotiation setup fails */</div><div class='del'>-	if (dccp_feat_finalise_settings(dp))</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	return inet_csk_listen_start(sk, backlog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dccp_need_reset(int state)</div><div class='del'>-{</div><div class='del'>-	return state != DCCP_CLOSED &amp;&amp; state != DCCP_LISTEN &amp;&amp;</div><div class='del'>-	       state != DCCP_REQUESTING;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_disconnect(struct sock *sk, int flags)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	int err = 0;</div><div class='del'>-	const int old_state = sk-&gt;sk_state;</div><div class='del'>-</div><div class='del'>-	if (old_state != DCCP_CLOSED)</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This corresponds to the ABORT function of RFC793, sec. 3.8</div><div class='del'>-	 * TCP uses a RST segment, DCCP a Reset packet with Code 2, "Aborted".</div><div class='del'>-	 */</div><div class='del'>-	if (old_state == DCCP_LISTEN) {</div><div class='del'>-		inet_csk_listen_stop(sk);</div><div class='del'>-	} else if (dccp_need_reset(old_state)) {</div><div class='del'>-		dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);</div><div class='del'>-		sk-&gt;sk_err = ECONNRESET;</div><div class='del'>-	} else if (old_state == DCCP_REQUESTING)</div><div class='del'>-		sk-&gt;sk_err = ECONNRESET;</div><div class='del'>-</div><div class='del'>-	dccp_clear_xmit_timers(sk);</div><div class='del'>-	ccid_hc_rx_delete(dp-&gt;dccps_hc_rx_ccid, sk);</div><div class='del'>-	dp-&gt;dccps_hc_rx_ccid = NULL;</div><div class='del'>-</div><div class='del'>-	__skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-	__skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-	if (sk-&gt;sk_send_head != NULL) {</div><div class='del'>-		__kfree_skb(sk-&gt;sk_send_head);</div><div class='del'>-		sk-&gt;sk_send_head = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inet-&gt;inet_dport = 0;</div><div class='del'>-</div><div class='del'>-	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK))</div><div class='del'>-		inet_reset_saddr(sk);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_shutdown = 0;</div><div class='del'>-	sock_reset_flag(sk, SOCK_DONE);</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_backoff = 0;</div><div class='del'>-	inet_csk_delack_init(sk);</div><div class='del'>-	__sk_dst_reset(sk);</div><div class='del'>-</div><div class='del'>-	WARN_ON(inet-&gt;inet_num &amp;&amp; !icsk-&gt;icsk_bind_hash);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_disconnect);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Wait for a DCCP event.</div><div class='del'>- *</div><div class='del'>- *	Note that we don't need to lock the socket, as the upper poll layers</div><div class='del'>- *	take care of normal races (between the test and the event) and we don't</div><div class='del'>- *	go look at any of the socket buffers directly.</div><div class='del'>- */</div><div class='del'>-__poll_t dccp_poll(struct file *file, struct socket *sock,</div><div class='del'>-		       poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	__poll_t mask;</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN)</div><div class='del'>-		return inet_csk_listen_poll(sk);</div><div class='del'>-</div><div class='del'>-	/* Socket is not locked. We are protected from async events</div><div class='del'>-	   by poll logic and correct handling of state changes</div><div class='del'>-	   made by another threads is impossible in any case.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mask = 0;</div><div class='del'>-	if (sk-&gt;sk_err)</div><div class='del'>-		mask = EPOLLERR;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_shutdown == SHUTDOWN_MASK || sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		mask |= EPOLLHUP;</div><div class='del'>-	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='del'>-		mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;</div><div class='del'>-</div><div class='del'>-	/* Connected? */</div><div class='del'>-	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(DCCPF_REQUESTING | DCCPF_RESPOND)) {</div><div class='del'>-		if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt; 0)</div><div class='del'>-			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='del'>-</div><div class='del'>-		if (!(sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)) {</div><div class='del'>-			if (sk_stream_is_writeable(sk)) {</div><div class='del'>-				mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='del'>-			} else {  /* send SIGIO later */</div><div class='del'>-				sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='del'>-				set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='del'>-</div><div class='del'>-				/* Race breaker. If space is freed after</div><div class='del'>-				 * wspace test but before the flags are set,</div><div class='del'>-				 * IO signal will be lost.</div><div class='del'>-				 */</div><div class='del'>-				if (sk_stream_is_writeable(sk))</div><div class='del'>-					mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_poll);</div><div class='del'>-</div><div class='del'>-int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int rc = -ENOTCONN;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCINQ: {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		unsigned long amount = 0;</div><div class='del'>-</div><div class='del'>-		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-		if (skb != NULL) {</div><div class='del'>-			/*</div><div class='del'>-			 * We will only return the amount of this packet since</div><div class='del'>-			 * that is all that will be read.</div><div class='del'>-			 */</div><div class='del'>-			amount = skb-&gt;len;</div><div class='del'>-		}</div><div class='del'>-		rc = put_user(amount, (int __user *)arg);</div><div class='del'>-	}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		rc = -ENOIOCTLCMD;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_ioctl);</div><div class='del'>-</div><div class='del'>-static int dccp_setsockopt_service(struct sock *sk, const __be32 service,</div><div class='del'>-				   char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct dccp_service_list *sl = NULL;</div><div class='del'>-</div><div class='del'>-	if (service == DCCP_SERVICE_INVALID_VALUE ||</div><div class='del'>-	    optlen &gt; DCCP_SERVICE_LIST_MAX_LEN * sizeof(u32))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (optlen &gt; sizeof(service)) {</div><div class='del'>-		sl = kmalloc(optlen, GFP_KERNEL);</div><div class='del'>-		if (sl == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		sl-&gt;dccpsl_nr = optlen / sizeof(u32) - 1;</div><div class='del'>-		if (copy_from_user(sl-&gt;dccpsl_list,</div><div class='del'>-				   optval + sizeof(service),</div><div class='del'>-				   optlen - sizeof(service)) ||</div><div class='del'>-		    dccp_list_has_service(sl, DCCP_SERVICE_INVALID_VALUE)) {</div><div class='del'>-			kfree(sl);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	dp-&gt;dccps_service = service;</div><div class='del'>-</div><div class='del'>-	kfree(dp-&gt;dccps_service_list);</div><div class='del'>-</div><div class='del'>-	dp-&gt;dccps_service_list = sl;</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_setsockopt_cscov(struct sock *sk, int cscov, bool rx)</div><div class='del'>-{</div><div class='del'>-	u8 *list, len;</div><div class='del'>-	int i, rc;</div><div class='del'>-</div><div class='del'>-	if (cscov &lt; 0 || cscov &gt; 15)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/*</div><div class='del'>-	 * Populate a list of permissible values, in the range cscov...15. This</div><div class='del'>-	 * is necessary since feature negotiation of single values only works if</div><div class='del'>-	 * both sides incidentally choose the same value. Since the list starts</div><div class='del'>-	 * lowest-value first, negotiation will pick the smallest shared value.</div><div class='del'>-	 */</div><div class='del'>-	if (cscov == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	len = 16 - cscov;</div><div class='del'>-</div><div class='del'>-	list = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (list == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-		list[i] = cscov++;</div><div class='del'>-</div><div class='del'>-	rc = dccp_feat_register_sp(sk, DCCPF_MIN_CSUM_COVER, rx, list, len);</div><div class='del'>-</div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		if (rx)</div><div class='del'>-			dccp_sk(sk)-&gt;dccps_pcrlen = cscov;</div><div class='del'>-		else</div><div class='del'>-			dccp_sk(sk)-&gt;dccps_pcslen = cscov;</div><div class='del'>-	}</div><div class='del'>-	kfree(list);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dccp_setsockopt_ccid(struct sock *sk, int type,</div><div class='del'>-				char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	u8 *val;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (optlen &lt; 1 || optlen &gt; DCCP_FEAT_MAX_SP_VALS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = memdup_user(optval, optlen);</div><div class='del'>-	if (IS_ERR(val))</div><div class='del'>-		return PTR_ERR(val);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)</div><div class='del'>-		rc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen);</div><div class='del'>-</div><div class='del'>-	if (!rc &amp;&amp; (type == DCCP_SOCKOPT_RX_CCID || type == DCCP_SOCKOPT_CCID))</div><div class='del'>-		rc = dccp_feat_register_sp(sk, DCCPF_CCID, 0, val, optlen);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	kfree(val);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_dccp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	int val, err = 0;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DCCP_SOCKOPT_PACKET_SIZE:</div><div class='del'>-		DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");</div><div class='del'>-		return 0;</div><div class='del'>-	case DCCP_SOCKOPT_CHANGE_L:</div><div class='del'>-	case DCCP_SOCKOPT_CHANGE_R:</div><div class='del'>-		DCCP_WARN("sockopt(CHANGE_L/R) is deprecated: fix your app\n");</div><div class='del'>-		return 0;</div><div class='del'>-	case DCCP_SOCKOPT_CCID:</div><div class='del'>-	case DCCP_SOCKOPT_RX_CCID:</div><div class='del'>-	case DCCP_SOCKOPT_TX_CCID:</div><div class='del'>-		return dccp_setsockopt_ccid(sk, optname, optval, optlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (optlen &lt; (int)sizeof(int))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (optname == DCCP_SOCKOPT_SERVICE)</div><div class='del'>-		return dccp_setsockopt_service(sk, val, optval, optlen);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DCCP_SOCKOPT_SERVER_TIMEWAIT:</div><div class='del'>-		if (dp-&gt;dccps_role != DCCP_ROLE_SERVER)</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			dp-&gt;dccps_server_timewait = (val != 0);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_SEND_CSCOV:</div><div class='del'>-		err = dccp_setsockopt_cscov(sk, val, false);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_RECV_CSCOV:</div><div class='del'>-		err = dccp_setsockopt_cscov(sk, val, true);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_QPOLICY_ID:</div><div class='del'>-		if (sk-&gt;sk_state != DCCP_CLOSED)</div><div class='del'>-			err = -EISCONN;</div><div class='del'>-		else if (val &lt; 0 || val &gt;= DCCPQ_POLICY_MAX)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			dp-&gt;dccps_qpolicy = val;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_QPOLICY_TXQLEN:</div><div class='del'>-		if (val &lt; 0)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			dp-&gt;dccps_tx_qlen = val;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -ENOPROTOOPT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_DCCP)</div><div class='del'>-		return inet_csk(sk)-&gt;icsk_af_ops-&gt;setsockopt(sk, level,</div><div class='del'>-							     optname, optval,</div><div class='del'>-							     optlen);</div><div class='del'>-	return do_dccp_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_setsockopt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_dccp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_DCCP)</div><div class='del'>-		return inet_csk_compat_setsockopt(sk, level, optname,</div><div class='del'>-						  optval, optlen);</div><div class='del'>-	return do_dccp_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(compat_dccp_setsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int dccp_getsockopt_service(struct sock *sk, int len,</div><div class='del'>-				   __be32 __user *optval,</div><div class='del'>-				   int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	const struct dccp_service_list *sl;</div><div class='del'>-	int err = -ENOENT, slen = 0, total_len = sizeof(u32);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	if ((sl = dp-&gt;dccps_service_list) != NULL) {</div><div class='del'>-		slen = sl-&gt;dccpsl_nr * sizeof(u32);</div><div class='del'>-		total_len += slen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (total_len &gt; len)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	if (put_user(total_len, optlen) ||</div><div class='del'>-	    put_user(dp-&gt;dccps_service, optval) ||</div><div class='del'>-	    (sl != NULL &amp;&amp; copy_to_user(optval + 1, sl-&gt;dccpsl_list, slen)))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_dccp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp;</div><div class='del'>-	int val, len;</div><div class='del'>-</div><div class='del'>-	if (get_user(len, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (len &lt; (int)sizeof(int))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DCCP_SOCKOPT_PACKET_SIZE:</div><div class='del'>-		DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");</div><div class='del'>-		return 0;</div><div class='del'>-	case DCCP_SOCKOPT_SERVICE:</div><div class='del'>-		return dccp_getsockopt_service(sk, len,</div><div class='del'>-					       (__be32 __user *)optval, optlen);</div><div class='del'>-	case DCCP_SOCKOPT_GET_CUR_MPS:</div><div class='del'>-		val = dp-&gt;dccps_mss_cache;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_AVAILABLE_CCIDS:</div><div class='del'>-		return ccid_getsockopt_builtin_ccids(sk, len, optval, optlen);</div><div class='del'>-	case DCCP_SOCKOPT_TX_CCID:</div><div class='del'>-		val = ccid_get_current_tx_ccid(dp);</div><div class='del'>-		if (val &lt; 0)</div><div class='del'>-			return -ENOPROTOOPT;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_RX_CCID:</div><div class='del'>-		val = ccid_get_current_rx_ccid(dp);</div><div class='del'>-		if (val &lt; 0)</div><div class='del'>-			return -ENOPROTOOPT;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_SERVER_TIMEWAIT:</div><div class='del'>-		val = dp-&gt;dccps_server_timewait;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_SEND_CSCOV:</div><div class='del'>-		val = dp-&gt;dccps_pcslen;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_RECV_CSCOV:</div><div class='del'>-		val = dp-&gt;dccps_pcrlen;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_QPOLICY_ID:</div><div class='del'>-		val = dp-&gt;dccps_qpolicy;</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_SOCKOPT_QPOLICY_TXQLEN:</div><div class='del'>-		val = dp-&gt;dccps_tx_qlen;</div><div class='del'>-		break;</div><div class='del'>-	case 128 ... 191:</div><div class='del'>-		return ccid_hc_rx_getsockopt(dp-&gt;dccps_hc_rx_ccid, sk, optname,</div><div class='del'>-					     len, (u32 __user *)optval, optlen);</div><div class='del'>-	case 192 ... 255:</div><div class='del'>-		return ccid_hc_tx_getsockopt(dp-&gt;dccps_hc_tx_ccid, sk, optname,</div><div class='del'>-					     len, (u32 __user *)optval, optlen);</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = sizeof(val);</div><div class='del'>-	if (put_user(len, optlen) || copy_to_user(optval, &amp;val, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_DCCP)</div><div class='del'>-		return inet_csk(sk)-&gt;icsk_af_ops-&gt;getsockopt(sk, level,</div><div class='del'>-							     optname, optval,</div><div class='del'>-							     optlen);</div><div class='del'>-	return do_dccp_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_getsockopt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_dccp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_DCCP)</div><div class='del'>-		return inet_csk_compat_getsockopt(sk, level, optname,</div><div class='del'>-						  optval, optlen);</div><div class='del'>-	return do_dccp_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct cmsghdr *cmsg;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assign an (opaque) qpolicy priority value to skb-&gt;priority.</div><div class='del'>-	 *</div><div class='del'>-	 * We are overloading this skb field for use with the qpolicy subystem.</div><div class='del'>-	 * The skb-&gt;priority is normally used for the SO_PRIORITY option, which</div><div class='del'>-	 * is initialised from sk_priority. Since the assignment of sk_priority</div><div class='del'>-	 * to skb-&gt;priority happens later (on layer 3), we overload this field</div><div class='del'>-	 * for use with queueing priorities as long as the skb is on layer 4.</div><div class='del'>-	 * The default priority value (if nothing is set) is 0.</div><div class='del'>-	 */</div><div class='del'>-	skb-&gt;priority = 0;</div><div class='del'>-</div><div class='del'>-	for_each_cmsghdr(cmsg, msg) {</div><div class='del'>-		if (!CMSG_OK(msg, cmsg))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (cmsg-&gt;cmsg_level != SOL_DCCP)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (cmsg-&gt;cmsg_type &lt;= DCCP_SCM_QPOLICY_MAX &amp;&amp;</div><div class='del'>-		    !dccp_qpolicy_param_ok(skb-&gt;sk, cmsg-&gt;cmsg_type))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		switch (cmsg-&gt;cmsg_type) {</div><div class='del'>-		case DCCP_SCM_PRIORITY:</div><div class='del'>-			if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(__u32)))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			skb-&gt;priority = *(__u32 *)CMSG_DATA(cmsg);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	const int flags = msg-&gt;msg_flags;</div><div class='del'>-	const int noblock = flags &amp; MSG_DONTWAIT;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int rc, size;</div><div class='del'>-	long timeo;</div><div class='del'>-</div><div class='del'>-	trace_dccp_probe(sk, len);</div><div class='del'>-</div><div class='del'>-	if (len &gt; dp-&gt;dccps_mss_cache)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (dccp_qpolicy_full(sk)) {</div><div class='del'>-		rc = -EAGAIN;</div><div class='del'>-		goto out_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeo = sock_sndtimeo(sk, noblock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have to use sk_stream_wait_connect here to set sk_write_pending,</div><div class='del'>-	 * so that the trick in dccp_rcv_request_sent_state_process.</div><div class='del'>-	 */</div><div class='del'>-	/* Wait for a connection to finish. */</div><div class='del'>-	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(DCCPF_OPEN | DCCPF_PARTOPEN))</div><div class='del'>-		if ((rc = sk_stream_wait_connect(sk, &amp;timeo)) != 0)</div><div class='del'>-			goto out_release;</div><div class='del'>-</div><div class='del'>-	size = sk-&gt;sk_prot-&gt;max_header + len;</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	skb = sock_alloc_send_skb(sk, size, noblock, &amp;rc);</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto out_release;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED) {</div><div class='del'>-		rc = -ENOTCONN;</div><div class='del'>-		goto out_discard;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-	rc = memcpy_from_msg(skb_put(skb, len), msg, len);</div><div class='del'>-	if (rc != 0)</div><div class='del'>-		goto out_discard;</div><div class='del'>-</div><div class='del'>-	rc = dccp_msghdr_parse(msg, skb);</div><div class='del'>-	if (rc != 0)</div><div class='del'>-		goto out_discard;</div><div class='del'>-</div><div class='del'>-	dccp_qpolicy_push(sk, skb);</div><div class='del'>-	/*</div><div class='del'>-	 * The xmit_timer is set if the TX CCID is rate-based and will expire</div><div class='del'>-	 * when congestion control permits to release further packets into the</div><div class='del'>-	 * network. Window-based CCIDs do not use this timer.</div><div class='del'>-	 */</div><div class='del'>-	if (!timer_pending(&amp;dp-&gt;dccps_xmit_timer))</div><div class='del'>-		dccp_write_xmit(sk);</div><div class='del'>-out_release:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return rc ? : len;</div><div class='del'>-out_discard:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	goto out_release;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_sendmsg);</div><div class='del'>-</div><div class='del'>-int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='del'>-		 int flags, int *addr_len)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh;</div><div class='del'>-	long timeo;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN) {</div><div class='del'>-		len = -ENOTCONN;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeo = sock_rcvtimeo(sk, nonblock);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct sk_buff *skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			goto verify_sock_status;</div><div class='del'>-</div><div class='del'>-		dh = dccp_hdr(skb);</div><div class='del'>-</div><div class='del'>-		switch (dh-&gt;dccph_type) {</div><div class='del'>-		case DCCP_PKT_DATA:</div><div class='del'>-		case DCCP_PKT_DATAACK:</div><div class='del'>-			goto found_ok_skb;</div><div class='del'>-</div><div class='del'>-		case DCCP_PKT_CLOSE:</div><div class='del'>-		case DCCP_PKT_CLOSEREQ:</div><div class='del'>-			if (!(flags &amp; MSG_PEEK))</div><div class='del'>-				dccp_finish_passive_close(sk);</div><div class='del'>-			/* fall through */</div><div class='del'>-		case DCCP_PKT_RESET:</div><div class='del'>-			dccp_pr_debug("found fin (%s) ok!\n",</div><div class='del'>-				      dccp_packet_name(dh-&gt;dccph_type));</div><div class='del'>-			len = 0;</div><div class='del'>-			goto found_fin_ok;</div><div class='del'>-		default:</div><div class='del'>-			dccp_pr_debug("packet_type=%s\n",</div><div class='del'>-				      dccp_packet_name(dh-&gt;dccph_type));</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='del'>-		}</div><div class='del'>-verify_sock_status:</div><div class='del'>-		if (sock_flag(sk, SOCK_DONE)) {</div><div class='del'>-			len = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_err) {</div><div class='del'>-			len = sock_error(sk);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) {</div><div class='del'>-			len = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_state == DCCP_CLOSED) {</div><div class='del'>-			if (!sock_flag(sk, SOCK_DONE)) {</div><div class='del'>-				/* This occurs when user tries to read</div><div class='del'>-				 * from never connected socket.</div><div class='del'>-				 */</div><div class='del'>-				len = -ENOTCONN;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			len = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!timeo) {</div><div class='del'>-			len = -EAGAIN;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			len = sock_intr_errno(timeo);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sk_wait_data(sk, &amp;timeo, NULL);</div><div class='del'>-		continue;</div><div class='del'>-	found_ok_skb:</div><div class='del'>-		if (len &gt; skb-&gt;len)</div><div class='del'>-			len = skb-&gt;len;</div><div class='del'>-		else if (len &lt; skb-&gt;len)</div><div class='del'>-			msg-&gt;msg_flags |= MSG_TRUNC;</div><div class='del'>-</div><div class='del'>-		if (skb_copy_datagram_msg(skb, 0, msg, len)) {</div><div class='del'>-			/* Exception. Bailout! */</div><div class='del'>-			len = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (flags &amp; MSG_TRUNC)</div><div class='del'>-			len = skb-&gt;len;</div><div class='del'>-	found_fin_ok:</div><div class='del'>-		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='del'>-		break;</div><div class='del'>-	} while (1);</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_recvmsg);</div><div class='del'>-</div><div class='del'>-int inet_dccp_listen(struct socket *sock, int backlog)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	unsigned char old_state;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (sock-&gt;state != SS_UNCONNECTED || sock-&gt;type != SOCK_DCCP)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	old_state = sk-&gt;sk_state;</div><div class='del'>-	if (!((1 &lt;&lt; old_state) &amp; (DCCPF_CLOSED | DCCPF_LISTEN)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Really, if the socket is already in listen state</div><div class='del'>-	 * we can only allow the backlog to be adjusted.</div><div class='del'>-	 */</div><div class='del'>-	if (old_state != DCCP_LISTEN) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: here it probably should be sk-&gt;sk_prot-&gt;listen_start</div><div class='del'>-		 * see tcp_listen_start</div><div class='del'>-		 */</div><div class='del'>-		err = dccp_listen_start(sk, backlog);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	sk-&gt;sk_max_ack_backlog = backlog;</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_dccp_listen);</div><div class='del'>-</div><div class='del'>-static void dccp_terminate_connection(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	u8 next_state = DCCP_CLOSED;</div><div class='del'>-</div><div class='del'>-	switch (sk-&gt;sk_state) {</div><div class='del'>-	case DCCP_PASSIVE_CLOSE:</div><div class='del'>-	case DCCP_PASSIVE_CLOSEREQ:</div><div class='del'>-		dccp_finish_passive_close(sk);</div><div class='del'>-		break;</div><div class='del'>-	case DCCP_PARTOPEN:</div><div class='del'>-		dccp_pr_debug("Stop PARTOPEN timer (%p)\n", sk);</div><div class='del'>-		inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DCCP_OPEN:</div><div class='del'>-		dccp_send_close(sk, 1);</div><div class='del'>-</div><div class='del'>-		if (dccp_sk(sk)-&gt;dccps_role == DCCP_ROLE_SERVER &amp;&amp;</div><div class='del'>-		    !dccp_sk(sk)-&gt;dccps_server_timewait)</div><div class='del'>-			next_state = DCCP_ACTIVE_CLOSEREQ;</div><div class='del'>-		else</div><div class='del'>-			next_state = DCCP_CLOSING;</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		dccp_set_state(sk, next_state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_close(struct sock *sk, long timeout)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u32 data_was_unread = 0;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_LISTEN) {</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-</div><div class='del'>-		/* Special case. */</div><div class='del'>-		inet_csk_listen_stop(sk);</div><div class='del'>-</div><div class='del'>-		goto adjudge_to_death;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk_stop_timer(sk, &amp;dp-&gt;dccps_xmit_timer);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We need to flush the recv. buffs.  We do this only on the</div><div class='del'>-	 * descriptor close, not protocol-sourced closes, because the</div><div class='del'>-	  *reader process may not have drained the data yet!</div><div class='del'>-	 */</div><div class='del'>-	while ((skb = __skb_dequeue(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='del'>-		data_was_unread += skb-&gt;len;</div><div class='del'>-		__kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If socket has been already reset kill it. */</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		goto adjudge_to_death;</div><div class='del'>-</div><div class='del'>-	if (data_was_unread) {</div><div class='del'>-		/* Unread data was tossed, send an appropriate Reset Code */</div><div class='del'>-		DCCP_WARN("ABORT with %u bytes unread\n", data_was_unread);</div><div class='del'>-		dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);</div><div class='del'>-		dccp_set_state(sk, DCCP_CLOSED);</div><div class='del'>-	} else if (sock_flag(sk, SOCK_LINGER) &amp;&amp; !sk-&gt;sk_lingertime) {</div><div class='del'>-		/* Check zero linger _after_ checking for unread data. */</div><div class='del'>-		sk-&gt;sk_prot-&gt;disconnect(sk, 0);</div><div class='del'>-	} else if (sk-&gt;sk_state != DCCP_CLOSED) {</div><div class='del'>-		/*</div><div class='del'>-		 * Normal connection termination. May need to wait if there are</div><div class='del'>-		 * still packets in the TX queue that are delayed by the CCID.</div><div class='del'>-		 */</div><div class='del'>-		dccp_flush_write_queue(sk, &amp;timeout);</div><div class='del'>-		dccp_terminate_connection(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Flush write queue. This may be necessary in several cases:</div><div class='del'>-	 * - we have been closed by the peer but still have application data;</div><div class='del'>-	 * - abortive termination (unread data or zero linger time),</div><div class='del'>-	 * - normal termination but queue could not be flushed within time limit</div><div class='del'>-	 */</div><div class='del'>-	__skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-</div><div class='del'>-	sk_stream_wait_close(sk, timeout);</div><div class='del'>-</div><div class='del'>-adjudge_to_death:</div><div class='del'>-	state = sk-&gt;sk_state;</div><div class='del'>-	sock_hold(sk);</div><div class='del'>-	sock_orphan(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It is the last release_sock in its life. It will remove backlog.</div><div class='del'>-	 */</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	/*</div><div class='del'>-	 * Now socket is owned by kernel and we acquire BH lock</div><div class='del'>-	 * to finish close. No need to check for user refs.</div><div class='del'>-	 */</div><div class='del'>-	local_bh_disable();</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	WARN_ON(sock_owned_by_user(sk));</div><div class='del'>-</div><div class='del'>-	percpu_counter_inc(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='del'>-</div><div class='del'>-	/* Have we already been destroyed by a softirq or backlog? */</div><div class='del'>-	if (state != DCCP_CLOSED &amp;&amp; sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED)</div><div class='del'>-		inet_csk_destroy_sock(sk);</div><div class='del'>-</div><div class='del'>-	/* Otherwise, socket is reprieved until protocol close. */</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	local_bh_enable();</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_close);</div><div class='del'>-</div><div class='del'>-void dccp_shutdown(struct sock *sk, int how)</div><div class='del'>-{</div><div class='del'>-	dccp_pr_debug("called shutdown(%x)\n", how);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_shutdown);</div><div class='del'>-</div><div class='del'>-static inline int __init dccp_mib_init(void)</div><div class='del'>-{</div><div class='del'>-	dccp_statistics = alloc_percpu(struct dccp_mib);</div><div class='del'>-	if (!dccp_statistics)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dccp_mib_exit(void)</div><div class='del'>-{</div><div class='del'>-	free_percpu(dccp_statistics);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int thash_entries;</div><div class='del'>-module_param(thash_entries, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(thash_entries, "Number of ehash buckets");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_DCCP_DEBUG</div><div class='del'>-bool dccp_debug;</div><div class='del'>-module_param(dccp_debug, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(dccp_debug, "Enable debug messages");</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_debug);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init dccp_init(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long goal;</div><div class='del'>-	int ehash_order, bhash_order, i;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct dccp_skb_cb) &gt;</div><div class='del'>-		     FIELD_SIZEOF(struct sk_buff, cb));</div><div class='del'>-	rc = percpu_counter_init(&amp;dccp_orphan_count, 0, GFP_KERNEL);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_fail;</div><div class='del'>-	rc = -ENOBUFS;</div><div class='del'>-	inet_hashinfo_init(&amp;dccp_hashinfo);</div><div class='del'>-	dccp_hashinfo.bind_bucket_cachep =</div><div class='del'>-		kmem_cache_create("dccp_bind_bucket",</div><div class='del'>-				  sizeof(struct inet_bind_bucket), 0,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	if (!dccp_hashinfo.bind_bucket_cachep)</div><div class='del'>-		goto out_free_percpu;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Size and allocate the main established and bind bucket</div><div class='del'>-	 * hash tables.</div><div class='del'>-	 *</div><div class='del'>-	 * The methodology is similar to that of the buffer cache.</div><div class='del'>-	 */</div><div class='del'>-	if (totalram_pages &gt;= (128 * 1024))</div><div class='del'>-		goal = totalram_pages &gt;&gt; (21 - PAGE_SHIFT);</div><div class='del'>-	else</div><div class='del'>-		goal = totalram_pages &gt;&gt; (23 - PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-	if (thash_entries)</div><div class='del'>-		goal = (thash_entries *</div><div class='del'>-			sizeof(struct inet_ehash_bucket)) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	for (ehash_order = 0; (1UL &lt;&lt; ehash_order) &lt; goal; ehash_order++)</div><div class='del'>-		;</div><div class='del'>-	do {</div><div class='del'>-		unsigned long hash_size = (1UL &lt;&lt; ehash_order) * PAGE_SIZE /</div><div class='del'>-					sizeof(struct inet_ehash_bucket);</div><div class='del'>-</div><div class='del'>-		while (hash_size &amp; (hash_size - 1))</div><div class='del'>-			hash_size--;</div><div class='del'>-		dccp_hashinfo.ehash_mask = hash_size - 1;</div><div class='del'>-		dccp_hashinfo.ehash = (struct inet_ehash_bucket *)</div><div class='del'>-			__get_free_pages(GFP_ATOMIC|__GFP_NOWARN, ehash_order);</div><div class='del'>-	} while (!dccp_hashinfo.ehash &amp;&amp; --ehash_order &gt; 0);</div><div class='del'>-</div><div class='del'>-	if (!dccp_hashinfo.ehash) {</div><div class='del'>-		DCCP_CRIT("Failed to allocate DCCP established hash table");</div><div class='del'>-		goto out_free_bind_bucket_cachep;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= dccp_hashinfo.ehash_mask; i++)</div><div class='del'>-		INIT_HLIST_NULLS_HEAD(&amp;dccp_hashinfo.ehash[i].chain, i);</div><div class='del'>-</div><div class='del'>-	if (inet_ehash_locks_alloc(&amp;dccp_hashinfo))</div><div class='del'>-			goto out_free_dccp_ehash;</div><div class='del'>-</div><div class='del'>-	bhash_order = ehash_order;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		dccp_hashinfo.bhash_size = (1UL &lt;&lt; bhash_order) * PAGE_SIZE /</div><div class='del'>-					sizeof(struct inet_bind_hashbucket);</div><div class='del'>-		if ((dccp_hashinfo.bhash_size &gt; (64 * 1024)) &amp;&amp;</div><div class='del'>-		    bhash_order &gt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		dccp_hashinfo.bhash = (struct inet_bind_hashbucket *)</div><div class='del'>-			__get_free_pages(GFP_ATOMIC|__GFP_NOWARN, bhash_order);</div><div class='del'>-	} while (!dccp_hashinfo.bhash &amp;&amp; --bhash_order &gt;= 0);</div><div class='del'>-</div><div class='del'>-	if (!dccp_hashinfo.bhash) {</div><div class='del'>-		DCCP_CRIT("Failed to allocate DCCP bind hash table");</div><div class='del'>-		goto out_free_dccp_locks;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dccp_hashinfo.bhash_size; i++) {</div><div class='del'>-		spin_lock_init(&amp;dccp_hashinfo.bhash[i].lock);</div><div class='del'>-		INIT_HLIST_HEAD(&amp;dccp_hashinfo.bhash[i].chain);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = dccp_mib_init();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_free_dccp_bhash;</div><div class='del'>-</div><div class='del'>-	rc = dccp_ackvec_init();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_free_dccp_mib;</div><div class='del'>-</div><div class='del'>-	rc = dccp_sysctl_init();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_ackvec_exit;</div><div class='del'>-</div><div class='del'>-	rc = ccid_initialize_builtins();</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_sysctl_exit;</div><div class='del'>-</div><div class='del'>-	dccp_timestamping_init();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_sysctl_exit:</div><div class='del'>-	dccp_sysctl_exit();</div><div class='del'>-out_ackvec_exit:</div><div class='del'>-	dccp_ackvec_exit();</div><div class='del'>-out_free_dccp_mib:</div><div class='del'>-	dccp_mib_exit();</div><div class='del'>-out_free_dccp_bhash:</div><div class='del'>-	free_pages((unsigned long)dccp_hashinfo.bhash, bhash_order);</div><div class='del'>-out_free_dccp_locks:</div><div class='del'>-	inet_ehash_locks_free(&amp;dccp_hashinfo);</div><div class='del'>-out_free_dccp_ehash:</div><div class='del'>-	free_pages((unsigned long)dccp_hashinfo.ehash, ehash_order);</div><div class='del'>-out_free_bind_bucket_cachep:</div><div class='del'>-	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);</div><div class='del'>-out_free_percpu:</div><div class='del'>-	percpu_counter_destroy(&amp;dccp_orphan_count);</div><div class='del'>-out_fail:</div><div class='del'>-	dccp_hashinfo.bhash = NULL;</div><div class='del'>-	dccp_hashinfo.ehash = NULL;</div><div class='del'>-	dccp_hashinfo.bind_bucket_cachep = NULL;</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dccp_fini(void)</div><div class='del'>-{</div><div class='del'>-	ccid_cleanup_builtins();</div><div class='del'>-	dccp_mib_exit();</div><div class='del'>-	free_pages((unsigned long)dccp_hashinfo.bhash,</div><div class='del'>-		   get_order(dccp_hashinfo.bhash_size *</div><div class='del'>-			     sizeof(struct inet_bind_hashbucket)));</div><div class='del'>-	free_pages((unsigned long)dccp_hashinfo.ehash,</div><div class='del'>-		   get_order((dccp_hashinfo.ehash_mask + 1) *</div><div class='del'>-			     sizeof(struct inet_ehash_bucket)));</div><div class='del'>-	inet_ehash_locks_free(&amp;dccp_hashinfo);</div><div class='del'>-	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);</div><div class='del'>-	dccp_ackvec_exit();</div><div class='del'>-	dccp_sysctl_exit();</div><div class='del'>-	percpu_counter_destroy(&amp;dccp_orphan_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dccp_init);</div><div class='del'>-module_exit(dccp_fini);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;");</div><div class='del'>-MODULE_DESCRIPTION("DCCP - Datagram Congestion Controlled Protocol");</div><div class='head'>diff --git a/net/dccp/qpolicy.c b/net/dccp/qpolicy.c<br/>deleted file mode 100644<br/>index 63c30bfa4703..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/qpolicy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/qpolicy.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,137 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/qpolicy.c</div><div class='del'>- *</div><div class='del'>- *  Policy-based packet dequeueing interface for DCCP.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2008 Tomasz Grobelny &lt;tomasz@grobelny.oswiecenia.net&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License v2</div><div class='del'>- *  as published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Simple Dequeueing Policy:</div><div class='del'>- *	If tx_qlen is different from 0, enqueue up to tx_qlen elements.</div><div class='del'>- */</div><div class='del'>-static void qpolicy_simple_push(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	skb_queue_tail(&amp;sk-&gt;sk_write_queue, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool qpolicy_simple_full(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return dccp_sk(sk)-&gt;dccps_tx_qlen &amp;&amp;</div><div class='del'>-	       sk-&gt;sk_write_queue.qlen &gt;= dccp_sk(sk)-&gt;dccps_tx_qlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *qpolicy_simple_top(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return skb_peek(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Priority-based Dequeueing Policy:</div><div class='del'>- *	If tx_qlen is different from 0 and the queue has reached its upper bound</div><div class='del'>- *	of tx_qlen elements, replace older packets lowest-priority-first.</div><div class='del'>- */</div><div class='del'>-static struct sk_buff *qpolicy_prio_best_skb(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb, *best = NULL;</div><div class='del'>-</div><div class='del'>-	skb_queue_walk(&amp;sk-&gt;sk_write_queue, skb)</div><div class='del'>-		if (best == NULL || skb-&gt;priority &gt; best-&gt;priority)</div><div class='del'>-			best = skb;</div><div class='del'>-	return best;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *qpolicy_prio_worst_skb(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb, *worst = NULL;</div><div class='del'>-</div><div class='del'>-	skb_queue_walk(&amp;sk-&gt;sk_write_queue, skb)</div><div class='del'>-		if (worst == NULL || skb-&gt;priority &lt; worst-&gt;priority)</div><div class='del'>-			worst = skb;</div><div class='del'>-	return worst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool qpolicy_prio_full(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	if (qpolicy_simple_full(sk))</div><div class='del'>-		dccp_qpolicy_drop(sk, qpolicy_prio_worst_skb(sk));</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_qpolicy_operations  -  TX Packet Dequeueing Interface</div><div class='del'>- * @push: add a new @skb to the write queue</div><div class='del'>- * @full: indicates that no more packets will be admitted</div><div class='del'>- * @top:  peeks at whatever the queueing policy defines as its `top'</div><div class='del'>- */</div><div class='del'>-static struct dccp_qpolicy_operations {</div><div class='del'>-	void		(*push)	(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-	bool		(*full) (struct sock *sk);</div><div class='del'>-	struct sk_buff*	(*top)  (struct sock *sk);</div><div class='del'>-	__be32		params;</div><div class='del'>-</div><div class='del'>-} qpol_table[DCCPQ_POLICY_MAX] = {</div><div class='del'>-	[DCCPQ_POLICY_SIMPLE] = {</div><div class='del'>-		.push   = qpolicy_simple_push,</div><div class='del'>-		.full   = qpolicy_simple_full,</div><div class='del'>-		.top    = qpolicy_simple_top,</div><div class='del'>-		.params = 0,</div><div class='del'>-	},</div><div class='del'>-	[DCCPQ_POLICY_PRIO] = {</div><div class='del'>-		.push   = qpolicy_simple_push,</div><div class='del'>-		.full   = qpolicy_prio_full,</div><div class='del'>-		.top    = qpolicy_prio_best_skb,</div><div class='del'>-		.params = DCCP_SCM_PRIORITY,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Externally visible interface</div><div class='del'>- */</div><div class='del'>-void dccp_qpolicy_push(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	qpol_table[dccp_sk(sk)-&gt;dccps_qpolicy].push(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool dccp_qpolicy_full(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return qpol_table[dccp_sk(sk)-&gt;dccps_qpolicy].full(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_qpolicy_drop(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (skb != NULL) {</div><div class='del'>-		skb_unlink(skb, &amp;sk-&gt;sk_write_queue);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *dccp_qpolicy_top(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return qpol_table[dccp_sk(sk)-&gt;dccps_qpolicy].top(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *dccp_qpolicy_pop(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = dccp_qpolicy_top(sk);</div><div class='del'>-</div><div class='del'>-	if (skb != NULL) {</div><div class='del'>-		/* Clear any skb fields that we used internally */</div><div class='del'>-		skb-&gt;priority = 0;</div><div class='del'>-		skb_unlink(skb, &amp;sk-&gt;sk_write_queue);</div><div class='del'>-	}</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool dccp_qpolicy_param_ok(struct sock *sk, __be32 param)</div><div class='del'>-{</div><div class='del'>-	/* check if exactly one bit is set */</div><div class='del'>-	if (!param || (param &amp; (param - 1)))</div><div class='del'>-		return false;</div><div class='del'>-	return (qpol_table[dccp_sk(sk)-&gt;dccps_qpolicy].params &amp; param) == param;</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c<br/>deleted file mode 100644<br/>index 53731e45403c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/sysctl.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/sysctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,118 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/sysctl.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License v2</div><div class='del'>- *	as published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "feat.h"</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_SYSCTL</div><div class='del'>-#error This file should not be compiled without CONFIG_SYSCTL defined</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Boundary values */</div><div class='del'>-static int		zero     = 0,</div><div class='del'>-			one      = 1,</div><div class='del'>-			u8_max   = 0xFF;</div><div class='del'>-static unsigned long	seqw_min = DCCPF_SEQ_WMIN,</div><div class='del'>-			seqw_max = 0xFFFFFFFF;		/* maximum on 32 bit */</div><div class='del'>-</div><div class='del'>-static struct ctl_table dccp_default_table[] = {</div><div class='del'>-	{</div><div class='del'>-		.procname	= "seq_window",</div><div class='del'>-		.data		= &amp;sysctl_dccp_sequence_window,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_sequence_window),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra1		= &amp;seqw_min,		/* RFC 4340, 7.5.2 */</div><div class='del'>-		.extra2		= &amp;seqw_max,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "rx_ccid",</div><div class='del'>-		.data		= &amp;sysctl_dccp_rx_ccid,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_rx_ccid),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;u8_max,		/* RFC 4340, 10. */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "tx_ccid",</div><div class='del'>-		.data		= &amp;sysctl_dccp_tx_ccid,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_tx_ccid),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;u8_max,		/* RFC 4340, 10. */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "request_retries",</div><div class='del'>-		.data		= &amp;sysctl_dccp_request_retries,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_request_retries),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one,</div><div class='del'>-		.extra2		= &amp;u8_max,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "retries1",</div><div class='del'>-		.data		= &amp;sysctl_dccp_retries1,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_retries1),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;u8_max,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "retries2",</div><div class='del'>-		.data		= &amp;sysctl_dccp_retries2,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_retries2),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;u8_max,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "tx_qlen",</div><div class='del'>-		.data		= &amp;sysctl_dccp_tx_qlen,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_tx_qlen),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "sync_ratelimit",</div><div class='del'>-		.data		= &amp;sysctl_dccp_sync_ratelimit,</div><div class='del'>-		.maxlen		= sizeof(sysctl_dccp_sync_ratelimit),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_ms_jiffies,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ctl_table_header *dccp_table_header;</div><div class='del'>-</div><div class='del'>-int __init dccp_sysctl_init(void)</div><div class='del'>-{</div><div class='del'>-	dccp_table_header = register_net_sysctl(&amp;init_net, "net/dccp/default",</div><div class='del'>-			dccp_default_table);</div><div class='del'>-</div><div class='del'>-	return dccp_table_header != NULL ? 0 : -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_sysctl_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (dccp_table_header != NULL) {</div><div class='del'>-		unregister_net_sysctl_table(dccp_table_header);</div><div class='del'>-		dccp_table_header = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/timer.c b/net/dccp/timer.c<br/>deleted file mode 100644<br/>index 1501a20a94ca..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,275 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  net/dccp/timer.c</div><div class='del'>- *</div><div class='del'>- *  An implementation of the DCCP protocol</div><div class='del'>- *  Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dccp.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dccp.h"</div><div class='del'>-</div><div class='del'>-/* sysctl variables governing numbers of retransmission attempts */</div><div class='del'>-int  sysctl_dccp_request_retries	__read_mostly = TCP_SYN_RETRIES;</div><div class='del'>-int  sysctl_dccp_retries1		__read_mostly = TCP_RETR1;</div><div class='del'>-int  sysctl_dccp_retries2		__read_mostly = TCP_RETR2;</div><div class='del'>-</div><div class='del'>-static void dccp_write_err(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	sk-&gt;sk_err = sk-&gt;sk_err_soft ? : ETIMEDOUT;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='del'>-</div><div class='del'>-	dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);</div><div class='del'>-	dccp_done(sk);</div><div class='del'>-	__DCCP_INC_STATS(DCCP_MIB_ABORTONTIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* A write timeout has occurred. Process the after effects. */</div><div class='del'>-static int dccp_write_timeout(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	int retry_until;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_REQUESTING || sk-&gt;sk_state == DCCP_PARTOPEN) {</div><div class='del'>-		if (icsk-&gt;icsk_retransmits != 0)</div><div class='del'>-			dst_negative_advice(sk);</div><div class='del'>-		retry_until = icsk-&gt;icsk_syn_retries ?</div><div class='del'>-			    : sysctl_dccp_request_retries;</div><div class='del'>-	} else {</div><div class='del'>-		if (icsk-&gt;icsk_retransmits &gt;= sysctl_dccp_retries1) {</div><div class='del'>-			/* NOTE. draft-ietf-tcpimpl-pmtud-01.txt requires pmtu</div><div class='del'>-			   black hole detection. :-(</div><div class='del'>-</div><div class='del'>-			   It is place to make it. It is not made. I do not want</div><div class='del'>-			   to make it. It is disguisting. It does not work in any</div><div class='del'>-			   case. Let me to cite the same draft, which requires for</div><div class='del'>-			   us to implement this:</div><div class='del'>-</div><div class='del'>-   "The one security concern raised by this memo is that ICMP black holes</div><div class='del'>-   are often caused by over-zealous security administrators who block</div><div class='del'>-   all ICMP messages.  It is vitally important that those who design and</div><div class='del'>-   deploy security systems understand the impact of strict filtering on</div><div class='del'>-   upper-layer protocols.  The safest web site in the world is worthless</div><div class='del'>-   if most TCP implementations cannot transfer data from it.  It would</div><div class='del'>-   be far nicer to have all of the black holes fixed rather than fixing</div><div class='del'>-   all of the TCP implementations."</div><div class='del'>-</div><div class='del'>-			   Golden words :-).</div><div class='del'>-		   */</div><div class='del'>-</div><div class='del'>-			dst_negative_advice(sk);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retry_until = sysctl_dccp_retries2;</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: see tcp_write_timout and tcp_out_of_resources</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icsk-&gt;icsk_retransmits &gt;= retry_until) {</div><div class='del'>-		/* Has it gone just too far? */</div><div class='del'>-		dccp_write_err(sk);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The DCCP retransmit timer.</div><div class='del'>- */</div><div class='del'>-static void dccp_retransmit_timer(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was</div><div class='del'>-	 * sent, no need to retransmit, this sock is dead.</div><div class='del'>-	 */</div><div class='del'>-	if (dccp_write_timeout(sk))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We want to know the number of packets retransmitted, not the</div><div class='del'>-	 * total number of retransmissions of clones of original packets.</div><div class='del'>-	 */</div><div class='del'>-	if (icsk-&gt;icsk_retransmits == 0)</div><div class='del'>-		__DCCP_INC_STATS(DCCP_MIB_TIMEOUTS);</div><div class='del'>-</div><div class='del'>-	if (dccp_retransmit_skb(sk) != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Retransmission failed because of local congestion,</div><div class='del'>-		 * do not backoff.</div><div class='del'>-		 */</div><div class='del'>-		if (--icsk-&gt;icsk_retransmits == 0)</div><div class='del'>-			icsk-&gt;icsk_retransmits = 1;</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-					  min(icsk-&gt;icsk_rto,</div><div class='del'>-					      TCP_RESOURCE_PROBE_INTERVAL),</div><div class='del'>-					  DCCP_RTO_MAX);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_backoff++;</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_rto = min(icsk-&gt;icsk_rto &lt;&lt; 1, DCCP_RTO_MAX);</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk-&gt;icsk_rto,</div><div class='del'>-				  DCCP_RTO_MAX);</div><div class='del'>-	if (icsk-&gt;icsk_retransmits &gt; sysctl_dccp_retries1)</div><div class='del'>-		__sk_dst_reset(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_write_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk =</div><div class='del'>-			from_timer(icsk, t, icsk_retransmit_timer);</div><div class='del'>-	struct sock *sk = &amp;icsk-&gt;icsk_inet.sk;</div><div class='del'>-	int event = 0;</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk)) {</div><div class='del'>-		/* Try again later */</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_retransmit_timer,</div><div class='del'>-			       jiffies + (HZ / 20));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED || !icsk-&gt;icsk_pending)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (time_after(icsk-&gt;icsk_timeout, jiffies)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_retransmit_timer,</div><div class='del'>-			       icsk-&gt;icsk_timeout);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	event = icsk-&gt;icsk_pending;</div><div class='del'>-	icsk-&gt;icsk_pending = 0;</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case ICSK_TIME_RETRANS:</div><div class='del'>-		dccp_retransmit_timer(sk);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_keepalive_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = from_timer(sk, t, sk_timer);</div><div class='del'>-</div><div class='del'>-	pr_err("dccp should not use a keepalive timer !\n");</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the same as tcp_delack_timer, sans prequeue &amp; mem_reclaim stuff */</div><div class='del'>-static void dccp_delack_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk =</div><div class='del'>-			from_timer(icsk, t, icsk_delack_timer);</div><div class='del'>-	struct sock *sk = &amp;icsk-&gt;icsk_inet.sk;</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk)) {</div><div class='del'>-		/* Try again later. */</div><div class='del'>-		icsk-&gt;icsk_ack.blocked = 1;</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer,</div><div class='del'>-			       jiffies + TCP_DELACK_MIN);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == DCCP_CLOSED ||</div><div class='del'>-	    !(icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER))</div><div class='del'>-		goto out;</div><div class='del'>-	if (time_after(icsk-&gt;icsk_ack.timeout, jiffies)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer,</div><div class='del'>-			       icsk-&gt;icsk_ack.timeout);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_ack.pending &amp;= ~ICSK_ACK_TIMER;</div><div class='del'>-</div><div class='del'>-	if (inet_csk_ack_scheduled(sk)) {</div><div class='del'>-		if (!icsk-&gt;icsk_ack.pingpong) {</div><div class='del'>-			/* Delayed ACK missed: inflate ATO. */</div><div class='del'>-			icsk-&gt;icsk_ack.ato = min(icsk-&gt;icsk_ack.ato &lt;&lt; 1,</div><div class='del'>-						 icsk-&gt;icsk_rto);</div><div class='del'>-		} else {</div><div class='del'>-			/* Delayed ACK missed: leave pingpong mode and</div><div class='del'>-			 * deflate ATO.</div><div class='del'>-			 */</div><div class='del'>-			icsk-&gt;icsk_ack.pingpong = 0;</div><div class='del'>-			icsk-&gt;icsk_ack.ato = TCP_ATO_MIN;</div><div class='del'>-		}</div><div class='del'>-		dccp_send_ack(sk);</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKS);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dccp_write_xmitlet  -  Workhorse for CCID packet dequeueing interface</div><div class='del'>- * See the comments above %ccid_dequeueing_decision for supported modes.</div><div class='del'>- */</div><div class='del'>-static void dccp_write_xmitlet(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = (struct sock *)data;</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-	if (sock_owned_by_user(sk))</div><div class='del'>-		sk_reset_timer(sk, &amp;dccp_sk(sk)-&gt;dccps_xmit_timer, jiffies + 1);</div><div class='del'>-	else</div><div class='del'>-		dccp_write_xmit(sk);</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dccp_write_xmit_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = from_timer(dp, t, dccps_xmit_timer);</div><div class='del'>-	struct sock *sk = &amp;dp-&gt;dccps_inet_connection.icsk_inet.sk;</div><div class='del'>-</div><div class='del'>-	dccp_write_xmitlet((unsigned long)sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dccp_init_xmit_timers(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dccp_sock *dp = dccp_sk(sk);</div><div class='del'>-</div><div class='del'>-	tasklet_init(&amp;dp-&gt;dccps_xmitlet, dccp_write_xmitlet, (unsigned long)sk);</div><div class='del'>-	timer_setup(&amp;dp-&gt;dccps_xmit_timer, dccp_write_xmit_timer, 0);</div><div class='del'>-	inet_csk_init_xmit_timers(sk, &amp;dccp_write_timer, &amp;dccp_delack_timer,</div><div class='del'>-				  &amp;dccp_keepalive_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ktime_t dccp_timestamp_seed;</div><div class='del'>-/**</div><div class='del'>- * dccp_timestamp  -  10s of microseconds time source</div><div class='del'>- * Returns the number of 10s of microseconds since loading DCCP. This is native</div><div class='del'>- * DCCP time difference format (RFC 4340, sec. 13).</div><div class='del'>- * Please note: This will wrap around about circa every 11.9 hours.</div><div class='del'>- */</div><div class='del'>-u32 dccp_timestamp(void)</div><div class='del'>-{</div><div class='del'>-	u64 delta = (u64)ktime_us_delta(ktime_get_real(), dccp_timestamp_seed);</div><div class='del'>-</div><div class='del'>-	do_div(delta, 10);</div><div class='del'>-	return delta;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dccp_timestamp);</div><div class='del'>-</div><div class='del'>-void __init dccp_timestamping_init(void)</div><div class='del'>-{</div><div class='del'>-	dccp_timestamp_seed = ktime_get_real();</div><div class='del'>-}</div><div class='head'>diff --git a/net/dccp/trace.h b/net/dccp/trace.h<br/>deleted file mode 100644<br/>index 5062421beee9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dccp/trace.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dccp/trace.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#undef TRACE_SYSTEM</div><div class='del'>-#define TRACE_SYSTEM dccp</div><div class='del'>-</div><div class='del'>-#if !defined(_TRACE_DCCP_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='del'>-#define _TRACE_DCCP_H</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include "dccp.h"</div><div class='del'>-#include "ccids/ccid3.h"</div><div class='del'>-#include &lt;linux/tracepoint.h&gt;</div><div class='del'>-#include &lt;trace/events/net_probe_common.h&gt;</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(dccp_probe,</div><div class='del'>-</div><div class='del'>-	TP_PROTO(struct sock *sk, size_t size),</div><div class='del'>-</div><div class='del'>-	TP_ARGS(sk, size),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		/* sockaddr_in6 is always bigger than sockaddr_in */</div><div class='del'>-		__array(__u8, saddr, sizeof(struct sockaddr_in6))</div><div class='del'>-		__array(__u8, daddr, sizeof(struct sockaddr_in6))</div><div class='del'>-		__field(__u16, sport)</div><div class='del'>-		__field(__u16, dport)</div><div class='del'>-		__field(__u16, size)</div><div class='del'>-		__field(__u16, tx_s)</div><div class='del'>-		__field(__u32, tx_rtt)</div><div class='del'>-		__field(__u32, tx_p)</div><div class='del'>-		__field(__u32, tx_x_calc)</div><div class='del'>-		__field(__u64, tx_x_recv)</div><div class='del'>-		__field(__u64, tx_x)</div><div class='del'>-		__field(__u32, tx_t_ipi)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-		struct ccid3_hc_tx_sock *hc = NULL;</div><div class='del'>-</div><div class='del'>-		if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)</div><div class='del'>-			hc = ccid3_hc_tx_sk(sk);</div><div class='del'>-</div><div class='del'>-		memset(__entry-&gt;saddr, 0, sizeof(struct sockaddr_in6));</div><div class='del'>-		memset(__entry-&gt;daddr, 0, sizeof(struct sockaddr_in6));</div><div class='del'>-</div><div class='del'>-		TP_STORE_ADDR_PORTS(__entry, inet, sk);</div><div class='del'>-</div><div class='del'>-		/* For filtering use */</div><div class='del'>-		__entry-&gt;sport = ntohs(inet-&gt;inet_sport);</div><div class='del'>-		__entry-&gt;dport = ntohs(inet-&gt;inet_dport);</div><div class='del'>-</div><div class='del'>-		__entry-&gt;size = size;</div><div class='del'>-		if (hc) {</div><div class='del'>-			__entry-&gt;tx_s = hc-&gt;tx_s;</div><div class='del'>-			__entry-&gt;tx_rtt = hc-&gt;tx_rtt;</div><div class='del'>-			__entry-&gt;tx_p = hc-&gt;tx_p;</div><div class='del'>-			__entry-&gt;tx_x_calc = hc-&gt;tx_x_calc;</div><div class='del'>-			__entry-&gt;tx_x_recv = hc-&gt;tx_x_recv &gt;&gt; 6;</div><div class='del'>-			__entry-&gt;tx_x = hc-&gt;tx_x &gt;&gt; 6;</div><div class='del'>-			__entry-&gt;tx_t_ipi = hc-&gt;tx_t_ipi;</div><div class='del'>-		} else {</div><div class='del'>-			__entry-&gt;tx_s = 0;</div><div class='del'>-			memset(&amp;__entry-&gt;tx_rtt, 0, (void *)&amp;__entry-&gt;tx_t_ipi -</div><div class='del'>-			       (void *)&amp;__entry-&gt;tx_rtt +</div><div class='del'>-			       sizeof(__entry-&gt;tx_t_ipi));</div><div class='del'>-		}</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("src=%pISpc dest=%pISpc size=%d tx_s=%d tx_rtt=%d "</div><div class='del'>-		  "tx_p=%d tx_x_calc=%u tx_x_recv=%llu tx_x=%llu tx_t_ipi=%d",</div><div class='del'>-		  __entry-&gt;saddr, __entry-&gt;daddr, __entry-&gt;size,</div><div class='del'>-		  __entry-&gt;tx_s, __entry-&gt;tx_rtt, __entry-&gt;tx_p,</div><div class='del'>-		  __entry-&gt;tx_x_calc, __entry-&gt;tx_x_recv, __entry-&gt;tx_x,</div><div class='del'>-		  __entry-&gt;tx_t_ipi)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-#endif /* _TRACE_TCP_H */</div><div class='del'>-</div><div class='del'>-/* This part must be outside protection */</div><div class='del'>-#undef TRACE_INCLUDE_PATH</div><div class='del'>-#define TRACE_INCLUDE_PATH .</div><div class='del'>-#undef TRACE_INCLUDE_FILE</div><div class='del'>-#define TRACE_INCLUDE_FILE trace</div><div class='del'>-#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig<br/>deleted file mode 100644<br/>index dcc74956badd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# DECnet configuration</div><div class='del'>-#</div><div class='del'>-config DECNET</div><div class='del'>-	tristate "DECnet Support"</div><div class='del'>-	---help---</div><div class='del'>-	  The DECnet networking protocol was used in many products made by</div><div class='del'>-	  Digital (now Compaq).  It provides reliable stream and sequenced</div><div class='del'>-	  packet communications over which run a variety of services similar</div><div class='del'>-	  to those which run over TCP/IP.</div><div class='del'>-</div><div class='del'>-	  To find some tools to use with the kernel layer support, please</div><div class='del'>-	  look at Patrick Caulfield's web site:</div><div class='del'>-	  &lt;http://linux-decnet.sourceforge.net/&gt;.</div><div class='del'>-</div><div class='del'>-	  More detailed documentation is available in</div><div class='del'>-	  &lt;file:Documentation/networking/decnet.txt&gt;.</div><div class='del'>-</div><div class='del'>-	  Be sure to say Y to "/proc file system support" and "Sysctl support"</div><div class='del'>-	  below when using DECnet, since you will need sysctl support to aid</div><div class='del'>-	  in configuration at run time.</div><div class='del'>-</div><div class='del'>-	  The DECnet code is also available as a module ( = code which can be</div><div class='del'>-	  inserted in and removed from the running kernel whenever you want).</div><div class='del'>-	  The module is called decnet.</div><div class='del'>-</div><div class='del'>-config DECNET_ROUTER</div><div class='del'>-	bool "DECnet: router support"</div><div class='del'>-	depends on DECNET</div><div class='del'>-	select FIB_RULES</div><div class='del'>-	---help---</div><div class='del'>-	  Add support for turning your DECnet Endnode into a level 1 or 2</div><div class='del'>-	  router.  This is an experimental, but functional option.  If you</div><div class='del'>-	  do say Y here, then make sure that you also say Y to "Kernel/User</div><div class='del'>-	  network link driver", "Routing messages" and "Network packet</div><div class='del'>-	  filtering".  The first two are required to allow configuration via</div><div class='del'>-	  rtnetlink (you will need Alexey Kuznetsov's iproute2 package</div><div class='del'>-	  from &lt;ftp://ftp.tux.org/pub/net/ip-routing/&gt;). The "Network packet</div><div class='del'>-	  filtering" option will be required for the forthcoming routing daemon</div><div class='del'>-	  to work.</div><div class='del'>-</div><div class='del'>-	  See &lt;file:Documentation/networking/decnet.txt&gt; for more information.</div><div class='head'>diff --git a/net/decnet/Makefile b/net/decnet/Makefile<br/>deleted file mode 100644<br/>index 07b38e441b2d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_DECNET) += decnet.o</div><div class='del'>-</div><div class='del'>-decnet-y := af_decnet.o dn_nsp_in.o dn_nsp_out.o \</div><div class='del'>-	    dn_route.o dn_dev.o dn_neigh.o dn_timer.o</div><div class='del'>-decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o</div><div class='del'>-decnet-y += sysctl_net_decnet.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_NETFILTER) += netfilter/</div><div class='head'>diff --git a/net/decnet/README b/net/decnet/README<br/>deleted file mode 100644<br/>index 60e7ec88c81f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/README?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-                       Linux DECnet Project</div><div class='del'>-                      ======================</div><div class='del'>-</div><div class='del'>-The documentation for this kernel subsystem is available in the</div><div class='del'>-Documentation/networking subdirectory of this distribution and also</div><div class='del'>-on line at http://www.chygwyn.com/DECnet/</div><div class='del'>-</div><div class='del'>-Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='head'>diff --git a/net/decnet/TODO b/net/decnet/TODO<br/>deleted file mode 100644<br/>index 358e9eb49016..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/TODO?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-Steve's quick list of things that need finishing off:</div><div class='del'>-[they are in no particular order and range from the trivial to the long winded]</div><div class='del'>-</div><div class='del'>- o Proper timeouts on each neighbour (in routing mode) rather than</div><div class='del'>-   just the 60 second On-Ethernet cache value.</div><div class='del'>-</div><div class='del'>- o Support for X.25 linklayer</div><div class='del'>-</div><div class='del'>- o Support for DDCMP link layer</div><div class='del'>-</div><div class='del'>- o The DDCMP device itself</div><div class='del'>-</div><div class='del'>- o PPP support (rfc1762)</div><div class='del'>-</div><div class='del'>- o Lots of testing with real applications</div><div class='del'>-</div><div class='del'>- o Verify errors etc. against POSIX 1003.1g (draft)</div><div class='del'>-</div><div class='del'>- o Using send/recvmsg() to get at connect/disconnect data (POSIX 1003.1g)</div><div class='del'>-   [maybe this should be done at socket level... the control data in the</div><div class='del'>-    send/recvmsg() calls should simply be a vector of set/getsockopt()</div><div class='del'>-    calls]</div><div class='del'>-</div><div class='del'>- o check MSG_CTRUNC is set where it should be.</div><div class='del'>-</div><div class='del'>- o Find all the commonality between DECnet and IPv4 routing code and extract</div><div class='del'>-   it into a small library of routines. [probably a project for 2.7.xx]</div><div class='del'>-</div><div class='del'>- o Add perfect socket hashing - an idea suggested by Paul Koning. Currently</div><div class='del'>-   we have a half-way house scheme which seems to work reasonably well, but</div><div class='del'>-   the full scheme is still worth implementing, its not not top of my list</div><div class='del'>-   right now.</div><div class='del'>-</div><div class='del'>- o Add session control message flow control</div><div class='del'>-</div><div class='del'>- o Add NSP message flow control</div><div class='del'>-</div><div class='del'>- o DECnet sendpages() function</div><div class='del'>-</div><div class='del'>- o AIO for DECnet</div><div class='head'>diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c<br/>deleted file mode 100644<br/>index 7d6ff983ba2c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/af_decnet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/af_decnet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2411 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Socket Layer Interface</div><div class='del'>- *</div><div class='del'>- * Authors:     Eduardo Marcelo Serrat &lt;emserrat@geocities.com&gt;</div><div class='del'>- *              Patrick Caulfield &lt;patrick@pandh.demon.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *        Steve Whitehouse: Copied from Eduardo Serrat and Patrick Caulfield's</div><div class='del'>- *                          version of the code. Original copyright preserved</div><div class='del'>- *                          below.</div><div class='del'>- *        Steve Whitehouse: Some bug fixes, cleaning up some code to make it</div><div class='del'>- *                          compatible with my routing layer.</div><div class='del'>- *        Steve Whitehouse: Merging changes from Eduardo Serrat and Patrick</div><div class='del'>- *                          Caulfield.</div><div class='del'>- *        Steve Whitehouse: Further bug fixes, checking module code still works</div><div class='del'>- *                          with new routing layer.</div><div class='del'>- *        Steve Whitehouse: Additional set/get_sockopt() calls.</div><div class='del'>- *        Steve Whitehouse: Fixed TIOCINQ ioctl to be same as Eduardo's new</div><div class='del'>- *                          code.</div><div class='del'>- *        Steve Whitehouse: recvmsg() changed to try and behave in a POSIX like</div><div class='del'>- *                          way. Didn't manage it entirely, but its better.</div><div class='del'>- *        Steve Whitehouse: ditto for sendmsg().</div><div class='del'>- *        Steve Whitehouse: A selection of bug fixes to various things.</div><div class='del'>- *        Steve Whitehouse: Added TIOCOUTQ ioctl.</div><div class='del'>- *        Steve Whitehouse: Fixes to username2sockaddr &amp; sockaddr2username.</div><div class='del'>- *        Steve Whitehouse: Fixes to connect() error returns.</div><div class='del'>- *       Patrick Caulfield: Fixes to delayed acceptance logic.</div><div class='del'>- *         David S. Miller: New socket locking</div><div class='del'>- *        Steve Whitehouse: Socket list hashing/locking</div><div class='del'>- *         Arnaldo C. Melo: use capable, not suser</div><div class='del'>- *        Steve Whitehouse: Removed unused code. Fix to use sk-&gt;allocation</div><div class='del'>- *                          when required.</div><div class='del'>- *       Patrick Caulfield: /proc/net/decnet now has object name/number</div><div class='del'>- *        Steve Whitehouse: Fixed local port allocation, hashed sk list</div><div class='del'>- *          Matthew Wilcox: Fixes for dn_ioctl()</div><div class='del'>- *        Steve Whitehouse: New connect/accept logic to allow timeouts and</div><div class='del'>- *                          prepare for sendpage etc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    (c) 1995-1998 E.M. Serrat		emserrat@geocities.com</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-HISTORY:</div><div class='del'>-</div><div class='del'>-Version           Kernel     Date       Author/Comments</div><div class='del'>--------           ------     ----       ---------------</div><div class='del'>-Version 0.0.1     2.0.30    01-dic-97	Eduardo Marcelo Serrat</div><div class='del'>-					(emserrat@geocities.com)</div><div class='del'>-</div><div class='del'>-					First Development of DECnet Socket La-</div><div class='del'>-					yer for Linux. Only supports outgoing</div><div class='del'>-					connections.</div><div class='del'>-</div><div class='del'>-Version 0.0.2	  2.1.105   20-jun-98   Patrick J. Caulfield</div><div class='del'>-					(patrick@pandh.demon.co.uk)</div><div class='del'>-</div><div class='del'>-					Port to new kernel development version.</div><div class='del'>-</div><div class='del'>-Version 0.0.3     2.1.106   25-jun-98   Eduardo Marcelo Serrat</div><div class='del'>-					(emserrat@geocities.com)</div><div class='del'>-					_</div><div class='del'>-					Added support for incoming connections</div><div class='del'>-					so we can start developing server apps</div><div class='del'>-					on Linux.</div><div class='del'>-					-</div><div class='del'>-					Module Support</div><div class='del'>-Version 0.0.4     2.1.109   21-jul-98   Eduardo Marcelo Serrat</div><div class='del'>-				       (emserrat@geocities.com)</div><div class='del'>-				       _</div><div class='del'>-					Added support for X11R6.4. Now we can</div><div class='del'>-					use DECnet transport for X on Linux!!!</div><div class='del'>-				       -</div><div class='del'>-Version 0.0.5    2.1.110   01-aug-98   Eduardo Marcelo Serrat</div><div class='del'>-				       (emserrat@geocities.com)</div><div class='del'>-				       Removed bugs on flow control</div><div class='del'>-				       Removed bugs on incoming accessdata</div><div class='del'>-				       order</div><div class='del'>-				       -</div><div class='del'>-Version 0.0.6    2.1.110   07-aug-98   Eduardo Marcelo Serrat</div><div class='del'>-				       dn_recvmsg fixes</div><div class='del'>-</div><div class='del'>-					Patrick J. Caulfield</div><div class='del'>-				       dn_bind fixes</div><div class='del'>-*******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/route.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/tcp_states.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;asm/ioctls.h&gt;</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_nsp.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-</div><div class='del'>-struct dn_sock {</div><div class='del'>-	struct sock sk;</div><div class='del'>-	struct dn_scp scp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dn_keepalive(struct sock *sk);</div><div class='del'>-</div><div class='del'>-#define DN_SK_HASH_SHIFT 8</div><div class='del'>-#define DN_SK_HASH_SIZE (1 &lt;&lt; DN_SK_HASH_SHIFT)</div><div class='del'>-#define DN_SK_HASH_MASK (DN_SK_HASH_SIZE - 1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct proto_ops dn_proto_ops;</div><div class='del'>-static DEFINE_RWLOCK(dn_hash_lock);</div><div class='del'>-static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE];</div><div class='del'>-static struct hlist_head dn_wild_sk;</div><div class='del'>-static atomic_long_t decnet_memory_allocated;</div><div class='del'>-</div><div class='del'>-static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen, int flags);</div><div class='del'>-static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags);</div><div class='del'>-</div><div class='del'>-static struct hlist_head *dn_find_list(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;addr.sdn_flags &amp; SDF_WILD)</div><div class='del'>-		return hlist_empty(&amp;dn_wild_sk) ? &amp;dn_wild_sk : NULL;</div><div class='del'>-</div><div class='del'>-	return &amp;dn_sk_hash[le16_to_cpu(scp-&gt;addrloc) &amp; DN_SK_HASH_MASK];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Valid ports are those greater than zero and not already in use.</div><div class='del'>- */</div><div class='del'>-static int check_port(__le16 port)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	if (port == 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	sk_for_each(sk, &amp;dn_sk_hash[le16_to_cpu(port) &amp; DN_SK_HASH_MASK]) {</div><div class='del'>-		struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-		if (scp-&gt;addrloc == port)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned short port_alloc(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-static unsigned short port = 0x2000;</div><div class='del'>-	unsigned short i_port = port;</div><div class='del'>-</div><div class='del'>-	while(check_port(cpu_to_le16(++port)) != 0) {</div><div class='del'>-		if (port == i_port)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scp-&gt;addrloc = cpu_to_le16(port);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Since this is only ever called from user</div><div class='del'>- * level, we don't need a write_lock() version</div><div class='del'>- * of this.</div><div class='del'>- */</div><div class='del'>-static int dn_hash_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct hlist_head *list;</div><div class='del'>-	int rv = -EUSERS;</div><div class='del'>-</div><div class='del'>-	BUG_ON(sk_hashed(sk));</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;dn_hash_lock);</div><div class='del'>-</div><div class='del'>-	if (!scp-&gt;addrloc &amp;&amp; !port_alloc(sk))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rv = -EADDRINUSE;</div><div class='del'>-	if ((list = dn_find_list(sk)) == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	sk_add_node(sk, list);</div><div class='del'>-	rv = 0;</div><div class='del'>-out:</div><div class='del'>-	write_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_unhash_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	write_lock(&amp;dn_hash_lock);</div><div class='del'>-	sk_del_node_init(sk);</div><div class='del'>-	write_unlock(&amp;dn_hash_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_unhash_sock_bh(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	write_lock_bh(&amp;dn_hash_lock);</div><div class='del'>-	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hlist_head *listen_hash(struct sockaddr_dn *addr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int hash = addr-&gt;sdn_objnum;</div><div class='del'>-</div><div class='del'>-	if (hash == 0) {</div><div class='del'>-		hash = addr-&gt;sdn_objnamel;</div><div class='del'>-		for(i = 0; i &lt; le16_to_cpu(addr-&gt;sdn_objnamel); i++) {</div><div class='del'>-			hash ^= addr-&gt;sdn_objname[i];</div><div class='del'>-			hash ^= (hash &lt;&lt; 3);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;dn_sk_hash[hash &amp; DN_SK_HASH_MASK];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called to transform a socket from bound (i.e. with a local address)</div><div class='del'>- * into a listening socket (doesn't need a local port number) and rehashes</div><div class='del'>- * based upon the object name/number.</div><div class='del'>- */</div><div class='del'>-static void dn_rehash_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *list;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;addr.sdn_flags &amp; SDF_WILD)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;dn_hash_lock);</div><div class='del'>-	sk_del_node_init(sk);</div><div class='del'>-	DN_SK(sk)-&gt;addrloc = 0;</div><div class='del'>-	list = listen_hash(&amp;DN_SK(sk)-&gt;addr);</div><div class='del'>-	sk_add_node(sk, list);</div><div class='del'>-	write_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_sockaddr2username(struct sockaddr_dn *sdn, unsigned char *buf, unsigned char type)</div><div class='del'>-{</div><div class='del'>-	int len = 2;</div><div class='del'>-</div><div class='del'>-	*buf++ = type;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 0:</div><div class='del'>-		*buf++ = sdn-&gt;sdn_objnum;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		*buf++ = 0;</div><div class='del'>-		*buf++ = le16_to_cpu(sdn-&gt;sdn_objnamel);</div><div class='del'>-		memcpy(buf, sdn-&gt;sdn_objname, le16_to_cpu(sdn-&gt;sdn_objnamel));</div><div class='del'>-		len = 3 + le16_to_cpu(sdn-&gt;sdn_objnamel);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		memset(buf, 0, 5);</div><div class='del'>-		buf += 5;</div><div class='del'>-		*buf++ = le16_to_cpu(sdn-&gt;sdn_objnamel);</div><div class='del'>-		memcpy(buf, sdn-&gt;sdn_objname, le16_to_cpu(sdn-&gt;sdn_objnamel));</div><div class='del'>-		len = 7 + le16_to_cpu(sdn-&gt;sdn_objnamel);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On reception of usernames, we handle types 1 and 0 for destination</div><div class='del'>- * addresses only. Types 2 and 4 are used for source addresses, but the</div><div class='del'>- * UIC, GIC are ignored and they are both treated the same way. Type 3</div><div class='del'>- * is never used as I've no idea what its purpose might be or what its</div><div class='del'>- * format is.</div><div class='del'>- */</div><div class='del'>-int dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn *sdn, unsigned char *fmt)</div><div class='del'>-{</div><div class='del'>-	unsigned char type;</div><div class='del'>-	int size = len;</div><div class='del'>-	int namel = 12;</div><div class='del'>-</div><div class='del'>-	sdn-&gt;sdn_objnum = 0;</div><div class='del'>-	sdn-&gt;sdn_objnamel = cpu_to_le16(0);</div><div class='del'>-	memset(sdn-&gt;sdn_objname, 0, DN_MAXOBJL);</div><div class='del'>-</div><div class='del'>-	if (len &lt; 2)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	len -= 2;</div><div class='del'>-	*fmt = *data++;</div><div class='del'>-	type = *data++;</div><div class='del'>-</div><div class='del'>-	switch (*fmt) {</div><div class='del'>-	case 0:</div><div class='del'>-		sdn-&gt;sdn_objnum = type;</div><div class='del'>-		return 2;</div><div class='del'>-	case 1:</div><div class='del'>-		namel = 16;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		len  -= 4;</div><div class='del'>-		data += 4;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		len  -= 8;</div><div class='del'>-		data += 8;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len -= 1;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	sdn-&gt;sdn_objnamel = cpu_to_le16(*data++);</div><div class='del'>-	len -= le16_to_cpu(sdn-&gt;sdn_objnamel);</div><div class='del'>-</div><div class='del'>-	if ((len &lt; 0) || (le16_to_cpu(sdn-&gt;sdn_objnamel) &gt; namel))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	memcpy(sdn-&gt;sdn_objname, data, le16_to_cpu(sdn-&gt;sdn_objnamel));</div><div class='del'>-</div><div class='del'>-	return size - len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sock *dn_sklist_find_listener(struct sockaddr_dn *addr)</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *list = listen_hash(addr);</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;dn_hash_lock);</div><div class='del'>-	sk_for_each(sk, list) {</div><div class='del'>-		struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-		if (sk-&gt;sk_state != TCP_LISTEN)</div><div class='del'>-			continue;</div><div class='del'>-		if (scp-&gt;addr.sdn_objnum) {</div><div class='del'>-			if (scp-&gt;addr.sdn_objnum != addr-&gt;sdn_objnum)</div><div class='del'>-				continue;</div><div class='del'>-		} else {</div><div class='del'>-			if (addr-&gt;sdn_objnum)</div><div class='del'>-				continue;</div><div class='del'>-			if (scp-&gt;addr.sdn_objnamel != addr-&gt;sdn_objnamel)</div><div class='del'>-				continue;</div><div class='del'>-			if (memcmp(scp-&gt;addr.sdn_objname, addr-&gt;sdn_objname, le16_to_cpu(addr-&gt;sdn_objnamel)) != 0)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		read_unlock(&amp;dn_hash_lock);</div><div class='del'>-		return sk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk = sk_head(&amp;dn_wild_sk);</div><div class='del'>-	if (sk) {</div><div class='del'>-		if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='del'>-			sock_hold(sk);</div><div class='del'>-		else</div><div class='del'>-			sk = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	read_unlock(&amp;dn_hash_lock);</div><div class='del'>-	return sk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sock *dn_find_by_skb(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct dn_scp *scp;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;dn_hash_lock);</div><div class='del'>-	sk_for_each(sk, &amp;dn_sk_hash[le16_to_cpu(cb-&gt;dst_port) &amp; DN_SK_HASH_MASK]) {</div><div class='del'>-		scp = DN_SK(sk);</div><div class='del'>-		if (cb-&gt;src != dn_saddr2dn(&amp;scp-&gt;peer))</div><div class='del'>-			continue;</div><div class='del'>-		if (cb-&gt;dst_port != scp-&gt;addrloc)</div><div class='del'>-			continue;</div><div class='del'>-		if (scp-&gt;addrrem &amp;&amp; (cb-&gt;src_port != scp-&gt;addrrem))</div><div class='del'>-			continue;</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-	sk = NULL;</div><div class='del'>-found:</div><div class='del'>-	read_unlock(&amp;dn_hash_lock);</div><div class='del'>-	return sk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void dn_destruct(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	skb_queue_purge(&amp;scp-&gt;data_xmit_queue);</div><div class='del'>-	skb_queue_purge(&amp;scp-&gt;other_xmit_queue);</div><div class='del'>-	skb_queue_purge(&amp;scp-&gt;other_receive_queue);</div><div class='del'>-</div><div class='del'>-	dst_release(rcu_dereference_check(sk-&gt;sk_dst_cache, 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long dn_memory_pressure;</div><div class='del'>-</div><div class='del'>-static void dn_enter_memory_pressure(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	if (!dn_memory_pressure) {</div><div class='del'>-		dn_memory_pressure = 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct proto dn_proto = {</div><div class='del'>-	.name			= "NSP",</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.enter_memory_pressure	= dn_enter_memory_pressure,</div><div class='del'>-	.memory_pressure	= &amp;dn_memory_pressure,</div><div class='del'>-	.memory_allocated	= &amp;decnet_memory_allocated,</div><div class='del'>-	.sysctl_mem		= sysctl_decnet_mem,</div><div class='del'>-	.sysctl_wmem		= sysctl_decnet_wmem,</div><div class='del'>-	.sysctl_rmem		= sysctl_decnet_rmem,</div><div class='del'>-	.max_header		= DN_MAX_NSP_DATA_HEADER + 64,</div><div class='del'>-	.obj_size		= sizeof(struct dn_sock),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp, int kern)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp;</div><div class='del'>-	struct sock *sk = sk_alloc(net, PF_DECnet, gfp, &amp;dn_proto, kern);</div><div class='del'>-</div><div class='del'>-	if  (!sk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (sock)</div><div class='del'>-		sock-&gt;ops = &amp;dn_proto_ops;</div><div class='del'>-	sock_init_data(sock, sk);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_backlog_rcv = dn_nsp_backlog_rcv;</div><div class='del'>-	sk-&gt;sk_destruct    = dn_destruct;</div><div class='del'>-	sk-&gt;sk_no_check_tx = 1;</div><div class='del'>-	sk-&gt;sk_family      = PF_DECnet;</div><div class='del'>-	sk-&gt;sk_protocol    = 0;</div><div class='del'>-	sk-&gt;sk_allocation  = gfp;</div><div class='del'>-	sk-&gt;sk_sndbuf	   = sysctl_decnet_wmem[1];</div><div class='del'>-	sk-&gt;sk_rcvbuf	   = sysctl_decnet_rmem[1];</div><div class='del'>-</div><div class='del'>-	/* Initialization of DECnet Session Control Port		*/</div><div class='del'>-	scp = DN_SK(sk);</div><div class='del'>-	scp-&gt;state	= DN_O;		/* Open			*/</div><div class='del'>-	scp-&gt;numdat	= 1;		/* Next data seg to tx	*/</div><div class='del'>-	scp-&gt;numoth	= 1;		/* Next oth data to tx  */</div><div class='del'>-	scp-&gt;ackxmt_dat = 0;		/* Last data seg ack'ed */</div><div class='del'>-	scp-&gt;ackxmt_oth = 0;		/* Last oth data ack'ed */</div><div class='del'>-	scp-&gt;ackrcv_dat = 0;		/* Highest data ack recv*/</div><div class='del'>-	scp-&gt;ackrcv_oth = 0;		/* Last oth data ack rec*/</div><div class='del'>-	scp-&gt;flowrem_sw = DN_SEND;</div><div class='del'>-	scp-&gt;flowloc_sw = DN_SEND;</div><div class='del'>-	scp-&gt;flowrem_dat = 0;</div><div class='del'>-	scp-&gt;flowrem_oth = 1;</div><div class='del'>-	scp-&gt;flowloc_dat = 0;</div><div class='del'>-	scp-&gt;flowloc_oth = 1;</div><div class='del'>-	scp-&gt;services_rem = 0;</div><div class='del'>-	scp-&gt;services_loc = 1 | NSP_FC_NONE;</div><div class='del'>-	scp-&gt;info_rem = 0;</div><div class='del'>-	scp-&gt;info_loc = 0x03; /* NSP version 4.1 */</div><div class='del'>-	scp-&gt;segsize_rem = 230 - DN_MAX_NSP_DATA_HEADER; /* Default: Updated by remote segsize */</div><div class='del'>-	scp-&gt;nonagle = 0;</div><div class='del'>-	scp-&gt;multi_ireq = 1;</div><div class='del'>-	scp-&gt;accept_mode = ACC_IMMED;</div><div class='del'>-	scp-&gt;addr.sdn_family    = AF_DECnet;</div><div class='del'>-	scp-&gt;peer.sdn_family    = AF_DECnet;</div><div class='del'>-	scp-&gt;accessdata.acc_accl = 5;</div><div class='del'>-	memcpy(scp-&gt;accessdata.acc_acc, "LINUX", 5);</div><div class='del'>-</div><div class='del'>-	scp-&gt;max_window   = NSP_MAX_WINDOW;</div><div class='del'>-	scp-&gt;snd_window   = NSP_MIN_WINDOW;</div><div class='del'>-	scp-&gt;nsp_srtt     = NSP_INITIAL_SRTT;</div><div class='del'>-	scp-&gt;nsp_rttvar   = NSP_INITIAL_RTTVAR;</div><div class='del'>-	scp-&gt;nsp_rxtshift = 0;</div><div class='del'>-</div><div class='del'>-	skb_queue_head_init(&amp;scp-&gt;data_xmit_queue);</div><div class='del'>-	skb_queue_head_init(&amp;scp-&gt;other_xmit_queue);</div><div class='del'>-	skb_queue_head_init(&amp;scp-&gt;other_receive_queue);</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = 0;</div><div class='del'>-	scp-&gt;persist_fxn = NULL;</div><div class='del'>-	scp-&gt;keepalive = 10 * HZ;</div><div class='del'>-	scp-&gt;keepalive_fxn = dn_keepalive;</div><div class='del'>-</div><div class='del'>-	dn_start_slow_timer(sk);</div><div class='del'>-out:</div><div class='del'>-	return sk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Keepalive timer.</div><div class='del'>- * FIXME: Should respond to SO_KEEPALIVE etc.</div><div class='del'>- */</div><div class='del'>-static void dn_keepalive(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * By checking the other_data transmit queue is empty</div><div class='del'>-	 * we are double checking that we are not sending too</div><div class='del'>-	 * many of these keepalive frames.</div><div class='del'>-	 */</div><div class='del'>-	if (skb_queue_empty(&amp;scp-&gt;other_xmit_queue))</div><div class='del'>-		dn_nsp_send_link(sk, DN_NOCHANGE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Timer for shutdown/destroyed sockets.</div><div class='del'>- * When socket is dead &amp; no packets have been sent for a</div><div class='del'>- * certain amount of time, they are removed by this</div><div class='del'>- * routine. Also takes care of sending out DI &amp; DC</div><div class='del'>- * frames at correct times.</div><div class='del'>- */</div><div class='del'>-int dn_destroy_timer(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-</div><div class='del'>-	switch (scp-&gt;state) {</div><div class='del'>-	case DN_DI:</div><div class='del'>-		dn_nsp_send_disc(sk, NSP_DISCINIT, 0, GFP_ATOMIC);</div><div class='del'>-		if (scp-&gt;nsp_rxtshift &gt;= decnet_di_count)</div><div class='del'>-			scp-&gt;state = DN_CN;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case DN_DR:</div><div class='del'>-		dn_nsp_send_disc(sk, NSP_DISCINIT, 0, GFP_ATOMIC);</div><div class='del'>-		if (scp-&gt;nsp_rxtshift &gt;= decnet_dr_count)</div><div class='del'>-			scp-&gt;state = DN_DRC;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case DN_DN:</div><div class='del'>-		if (scp-&gt;nsp_rxtshift &lt; decnet_dn_count) {</div><div class='del'>-			/* printk(KERN_DEBUG "dn_destroy_timer: DN\n"); */</div><div class='del'>-			dn_nsp_send_disc(sk, NSP_DISCCONF, NSP_REASON_DC,</div><div class='del'>-					 GFP_ATOMIC);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = (HZ * decnet_time_wait);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_socket)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (time_after_eq(jiffies, scp-&gt;stamp + HZ * decnet_time_wait)) {</div><div class='del'>-		dn_unhash_sock(sk);</div><div class='del'>-		sock_put(sk);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_destroy_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	scp-&gt;nsp_rxtshift = 0; /* reset back off */</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_socket) {</div><div class='del'>-		if (sk-&gt;sk_socket-&gt;state != SS_UNCONNECTED)</div><div class='del'>-			sk-&gt;sk_socket-&gt;state = SS_DISCONNECTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_state = TCP_CLOSE;</div><div class='del'>-</div><div class='del'>-	switch (scp-&gt;state) {</div><div class='del'>-	case DN_DN:</div><div class='del'>-		dn_nsp_send_disc(sk, NSP_DISCCONF, NSP_REASON_DC,</div><div class='del'>-				 sk-&gt;sk_allocation);</div><div class='del'>-		scp-&gt;persist_fxn = dn_destroy_timer;</div><div class='del'>-		scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-		break;</div><div class='del'>-	case DN_CR:</div><div class='del'>-		scp-&gt;state = DN_DR;</div><div class='del'>-		goto disc_reject;</div><div class='del'>-	case DN_RUN:</div><div class='del'>-		scp-&gt;state = DN_DI;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DN_DI:</div><div class='del'>-	case DN_DR:</div><div class='del'>-disc_reject:</div><div class='del'>-		dn_nsp_send_disc(sk, NSP_DISCINIT, 0, sk-&gt;sk_allocation);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DN_NC:</div><div class='del'>-	case DN_NR:</div><div class='del'>-	case DN_RJ:</div><div class='del'>-	case DN_DIC:</div><div class='del'>-	case DN_CN:</div><div class='del'>-	case DN_DRC:</div><div class='del'>-	case DN_CI:</div><div class='del'>-	case DN_CD:</div><div class='del'>-		scp-&gt;persist_fxn = dn_destroy_timer;</div><div class='del'>-		scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "DECnet: dn_destroy_sock passed socket in invalid state\n");</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DN_O:</div><div class='del'>-		dn_stop_slow_timer(sk);</div><div class='del'>-</div><div class='del'>-		dn_unhash_sock_bh(sk);</div><div class='del'>-		sock_put(sk);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *dn_addr2asc(__u16 addr, char *buf)</div><div class='del'>-{</div><div class='del'>-	unsigned short node, area;</div><div class='del'>-</div><div class='del'>-	node = addr &amp; 0x03ff;</div><div class='del'>-	area = addr &gt;&gt; 10;</div><div class='del'>-	sprintf(buf, "%hd.%hd", area, node);</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_create(struct net *net, struct socket *sock, int protocol,</div><div class='del'>-		     int kern)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	if (protocol &lt; 0 || protocol &gt; SK_PROTOCOL_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return -EAFNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	switch (sock-&gt;type) {</div><div class='del'>-	case SOCK_SEQPACKET:</div><div class='del'>-		if (protocol != DNPROTO_NSP)</div><div class='del'>-			return -EPROTONOSUPPORT;</div><div class='del'>-		break;</div><div class='del'>-	case SOCK_STREAM:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ESOCKTNOSUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if ((sk = dn_alloc_sock(net, sock, GFP_KERNEL, kern)) == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_protocol = protocol;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dn_release(struct socket *sock)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	if (sk) {</div><div class='del'>-		sock_orphan(sk);</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		dn_destroy_sock(sk);</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		sock_put(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sockaddr_dn *saddr = (struct sockaddr_dn *)uaddr;</div><div class='del'>-	struct net_device *dev, *ldev;</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	if (addr_len != sizeof(struct sockaddr_dn))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (saddr-&gt;sdn_family != AF_DECnet)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(saddr-&gt;sdn_nodeaddrl) &amp;&amp; (le16_to_cpu(saddr-&gt;sdn_nodeaddrl) != 2))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(saddr-&gt;sdn_objnamel) &gt; DN_MAXOBJL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (saddr-&gt;sdn_flags &amp; ~SDF_WILD)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_NET_BIND_SERVICE) &amp;&amp; (saddr-&gt;sdn_objnum ||</div><div class='del'>-	    (saddr-&gt;sdn_flags &amp; SDF_WILD)))</div><div class='del'>-		return -EACCES;</div><div class='del'>-</div><div class='del'>-	if (!(saddr-&gt;sdn_flags &amp; SDF_WILD)) {</div><div class='del'>-		if (le16_to_cpu(saddr-&gt;sdn_nodeaddrl)) {</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			ldev = NULL;</div><div class='del'>-			for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='del'>-				if (!dev-&gt;dn_ptr)</div><div class='del'>-					continue;</div><div class='del'>-				if (dn_dev_islocal(dev, dn_saddr2dn(saddr))) {</div><div class='del'>-					ldev = dev;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			if (ldev == NULL)</div><div class='del'>-				return -EADDRNOTAVAIL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = -EINVAL;</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	if (sock_flag(sk, SOCK_ZAPPED)) {</div><div class='del'>-		memcpy(&amp;scp-&gt;addr, saddr, addr_len);</div><div class='del'>-		sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-		rv = dn_hash_sock(sk);</div><div class='del'>-		if (rv)</div><div class='del'>-			sock_set_flag(sk, SOCK_ZAPPED);</div><div class='del'>-	}</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_auto_bind(struct socket *sock)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='del'>-</div><div class='del'>-	scp-&gt;addr.sdn_flags  = 0;</div><div class='del'>-	scp-&gt;addr.sdn_objnum = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This stuff is to keep compatibility with Eduardo's</div><div class='del'>-	 * patch. I hope I can dispense with it shortly...</div><div class='del'>-	 */</div><div class='del'>-	if ((scp-&gt;accessdata.acc_accl != 0) &amp;&amp;</div><div class='del'>-		(scp-&gt;accessdata.acc_accl &lt;= 12)) {</div><div class='del'>-</div><div class='del'>-		scp-&gt;addr.sdn_objnamel = cpu_to_le16(scp-&gt;accessdata.acc_accl);</div><div class='del'>-		memcpy(scp-&gt;addr.sdn_objname, scp-&gt;accessdata.acc_acc, le16_to_cpu(scp-&gt;addr.sdn_objnamel));</div><div class='del'>-</div><div class='del'>-		scp-&gt;accessdata.acc_accl = 0;</div><div class='del'>-		memset(scp-&gt;accessdata.acc_acc, 0, 40);</div><div class='del'>-	}</div><div class='del'>-	/* End of compatibility stuff */</div><div class='del'>-</div><div class='del'>-	scp-&gt;addr.sdn_add.a_len = cpu_to_le16(2);</div><div class='del'>-	rv = dn_dev_bind_default((__le16 *)scp-&gt;addr.sdn_add.a_addr);</div><div class='del'>-	if (rv == 0) {</div><div class='del'>-		rv = dn_hash_sock(sk);</div><div class='del'>-		if (rv)</div><div class='del'>-			sock_set_flag(sk, SOCK_ZAPPED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_confirm_accept(struct sock *sk, long *timeo, gfp_t allocation)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state != DN_CR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	scp-&gt;state = DN_CC;</div><div class='del'>-	scp-&gt;segsize_loc = dst_metric_advmss(__sk_dst_get(sk));</div><div class='del'>-	dn_send_conn_conf(sk, allocation);</div><div class='del'>-</div><div class='del'>-	prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	for(;;) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		if (scp-&gt;state == DN_CC)</div><div class='del'>-			*timeo = schedule_timeout(*timeo);</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		err = 0;</div><div class='del'>-		if (scp-&gt;state == DN_RUN)</div><div class='del'>-			break;</div><div class='del'>-		err = sock_error(sk);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		err = sock_intr_errno(*timeo);</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		if (!*timeo)</div><div class='del'>-			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		sk-&gt;sk_socket-&gt;state = SS_CONNECTED;</div><div class='del'>-	} else if (scp-&gt;state != DN_CC) {</div><div class='del'>-		sk-&gt;sk_socket-&gt;state = SS_UNCONNECTED;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_wait_run(struct sock *sk, long *timeo)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state == DN_RUN)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!*timeo)</div><div class='del'>-		return -EALREADY;</div><div class='del'>-</div><div class='del'>-	prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	for(;;) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		if (scp-&gt;state == DN_CI || scp-&gt;state == DN_CC)</div><div class='del'>-			*timeo = schedule_timeout(*timeo);</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		err = 0;</div><div class='del'>-		if (scp-&gt;state == DN_RUN)</div><div class='del'>-			break;</div><div class='del'>-		err = sock_error(sk);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		err = sock_intr_errno(*timeo);</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		if (!*timeo)</div><div class='del'>-			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='del'>-out:</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		sk-&gt;sk_socket-&gt;state = SS_CONNECTED;</div><div class='del'>-	} else if (scp-&gt;state != DN_CI &amp;&amp; scp-&gt;state != DN_CC) {</div><div class='del'>-		sk-&gt;sk_socket-&gt;state = SS_UNCONNECTED;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen, long *timeo, int flags)</div><div class='del'>-{</div><div class='del'>-	struct socket *sock = sk-&gt;sk_socket;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int err = -EISCONN;</div><div class='del'>-	struct flowidn fld;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-</div><div class='del'>-	if (sock-&gt;state == SS_CONNECTED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (sock-&gt;state == SS_CONNECTING) {</div><div class='del'>-		err = 0;</div><div class='del'>-		if (scp-&gt;state == DN_RUN) {</div><div class='del'>-			sock-&gt;state = SS_CONNECTED;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		err = -ECONNREFUSED;</div><div class='del'>-		if (scp-&gt;state != DN_CI &amp;&amp; scp-&gt;state != DN_CC) {</div><div class='del'>-			sock-&gt;state = SS_UNCONNECTED;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		return dn_wait_run(sk, timeo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (scp-&gt;state != DN_O)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (addr == NULL || addrlen != sizeof(struct sockaddr_dn))</div><div class='del'>-		goto out;</div><div class='del'>-	if (addr-&gt;sdn_family != AF_DECnet)</div><div class='del'>-		goto out;</div><div class='del'>-	if (addr-&gt;sdn_flags &amp; SDF_WILD)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (sock_flag(sk, SOCK_ZAPPED)) {</div><div class='del'>-		err = dn_auto_bind(sk-&gt;sk_socket);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;scp-&gt;peer, addr, sizeof(struct sockaddr_dn));</div><div class='del'>-</div><div class='del'>-	err = -EHOSTUNREACH;</div><div class='del'>-	memset(&amp;fld, 0, sizeof(fld));</div><div class='del'>-	fld.flowidn_oif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-	fld.daddr = dn_saddr2dn(&amp;scp-&gt;peer);</div><div class='del'>-	fld.saddr = dn_saddr2dn(&amp;scp-&gt;addr);</div><div class='del'>-	dn_sk_ports_copy(&amp;fld, scp);</div><div class='del'>-	fld.flowidn_proto = DNPROTO_NSP;</div><div class='del'>-	if (dn_route_output_sock(&amp;sk-&gt;sk_dst_cache, &amp;fld, sk, flags) &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	dst = __sk_dst_get(sk);</div><div class='del'>-	sk-&gt;sk_route_caps = dst-&gt;dev-&gt;features;</div><div class='del'>-	sock-&gt;state = SS_CONNECTING;</div><div class='del'>-	scp-&gt;state = DN_CI;</div><div class='del'>-	scp-&gt;segsize_loc = dst_metric_advmss(dst);</div><div class='del'>-</div><div class='del'>-	dn_nsp_send_conninit(sk, NSP_CI);</div><div class='del'>-	err = -EINPROGRESS;</div><div class='del'>-	if (*timeo) {</div><div class='del'>-		err = dn_wait_run(sk, timeo);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_connect(struct socket *sock, struct sockaddr *uaddr, int addrlen, int flags)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_dn *addr = (struct sockaddr_dn *)uaddr;</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int err;</div><div class='del'>-	long timeo = sock_sndtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	err = __dn_connect(sk, addr, addrlen, &amp;timeo, 0);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_check_state(struct sock *sk, struct sockaddr_dn *addr, int addrlen, long *timeo, int flags)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	switch (scp-&gt;state) {</div><div class='del'>-	case DN_RUN:</div><div class='del'>-		return 0;</div><div class='del'>-	case DN_CR:</div><div class='del'>-		return dn_confirm_accept(sk, timeo, sk-&gt;sk_allocation);</div><div class='del'>-	case DN_CI:</div><div class='del'>-	case DN_CC:</div><div class='del'>-		return dn_wait_run(sk, timeo);</div><div class='del'>-	case DN_O:</div><div class='del'>-		return __dn_connect(sk, addr, addrlen, timeo, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void dn_access_copy(struct sk_buff *skb, struct accessdata_dn *acc)</div><div class='del'>-{</div><div class='del'>-	unsigned char *ptr = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	acc-&gt;acc_userl = *ptr++;</div><div class='del'>-	memcpy(&amp;acc-&gt;acc_user, ptr, acc-&gt;acc_userl);</div><div class='del'>-	ptr += acc-&gt;acc_userl;</div><div class='del'>-</div><div class='del'>-	acc-&gt;acc_passl = *ptr++;</div><div class='del'>-	memcpy(&amp;acc-&gt;acc_pass, ptr, acc-&gt;acc_passl);</div><div class='del'>-	ptr += acc-&gt;acc_passl;</div><div class='del'>-</div><div class='del'>-	acc-&gt;acc_accl = *ptr++;</div><div class='del'>-	memcpy(&amp;acc-&gt;acc_acc, ptr, acc-&gt;acc_accl);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, acc-&gt;acc_accl + acc-&gt;acc_passl + acc-&gt;acc_userl + 3);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_user_copy(struct sk_buff *skb, struct optdata_dn *opt)</div><div class='del'>-{</div><div class='del'>-	unsigned char *ptr = skb-&gt;data;</div><div class='del'>-	u16 len = *ptr++; /* yes, it's 8bit on the wire */</div><div class='del'>-</div><div class='del'>-	BUG_ON(len &gt; 16); /* we've checked the contents earlier */</div><div class='del'>-	opt-&gt;opt_optl   = cpu_to_le16(len);</div><div class='del'>-	opt-&gt;opt_status = 0;</div><div class='del'>-	memcpy(opt-&gt;opt_data, ptr, len);</div><div class='del'>-	skb_pull(skb, len + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *dn_wait_for_connect(struct sock *sk, long *timeo)</div><div class='del'>-{</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	for(;;) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			*timeo = schedule_timeout(*timeo);</div><div class='del'>-			skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-		}</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		if (skb != NULL)</div><div class='del'>-			break;</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (sk-&gt;sk_state != TCP_LISTEN)</div><div class='del'>-			break;</div><div class='del'>-		err = sock_intr_errno(*timeo);</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		if (!*timeo)</div><div class='del'>-			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='del'>-</div><div class='del'>-	return skb == NULL ? ERR_PTR(err) : skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-		     bool kern)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk, *newsk;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	unsigned char menuver;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned char type;</div><div class='del'>-	long timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state != TCP_LISTEN || DN_SK(sk)-&gt;state != DN_O) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = skb_dequeue(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		skb = dn_wait_for_connect(sk, &amp;timeo);</div><div class='del'>-		if (IS_ERR(skb)) {</div><div class='del'>-			release_sock(sk);</div><div class='del'>-			return PTR_ERR(skb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-	sk-&gt;sk_ack_backlog--;</div><div class='del'>-	newsk = dn_alloc_sock(sock_net(sk), newsock, sk-&gt;sk_allocation, kern);</div><div class='del'>-	if (newsk == NULL) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	}</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	dst = skb_dst(skb);</div><div class='del'>-	sk_dst_set(newsk, dst);</div><div class='del'>-	skb_dst_set(skb, NULL);</div><div class='del'>-</div><div class='del'>-	DN_SK(newsk)-&gt;state        = DN_CR;</div><div class='del'>-	DN_SK(newsk)-&gt;addrrem      = cb-&gt;src_port;</div><div class='del'>-	DN_SK(newsk)-&gt;services_rem = cb-&gt;services;</div><div class='del'>-	DN_SK(newsk)-&gt;info_rem     = cb-&gt;info;</div><div class='del'>-	DN_SK(newsk)-&gt;segsize_rem  = cb-&gt;segsize;</div><div class='del'>-	DN_SK(newsk)-&gt;accept_mode  = DN_SK(sk)-&gt;accept_mode;</div><div class='del'>-</div><div class='del'>-	if (DN_SK(newsk)-&gt;segsize_rem &lt; 230)</div><div class='del'>-		DN_SK(newsk)-&gt;segsize_rem = 230;</div><div class='del'>-</div><div class='del'>-	if ((DN_SK(newsk)-&gt;services_rem &amp; NSP_FC_MASK) == NSP_FC_NONE)</div><div class='del'>-		DN_SK(newsk)-&gt;max_window = decnet_no_fc_max_cwnd;</div><div class='del'>-</div><div class='del'>-	newsk-&gt;sk_state  = TCP_LISTEN;</div><div class='del'>-	memcpy(&amp;(DN_SK(newsk)-&gt;addr), &amp;(DN_SK(sk)-&gt;addr), sizeof(struct sockaddr_dn));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we are listening on a wild socket, we don't want</div><div class='del'>-	 * the newly created socket on the wrong hash queue.</div><div class='del'>-	 */</div><div class='del'>-	DN_SK(newsk)-&gt;addr.sdn_flags &amp;= ~SDF_WILD;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, dn_username2sockaddr(skb-&gt;data, skb-&gt;len, &amp;(DN_SK(newsk)-&gt;addr), &amp;type));</div><div class='del'>-	skb_pull(skb, dn_username2sockaddr(skb-&gt;data, skb-&gt;len, &amp;(DN_SK(newsk)-&gt;peer), &amp;type));</div><div class='del'>-	*(__le16 *)(DN_SK(newsk)-&gt;peer.sdn_add.a_addr) = cb-&gt;src;</div><div class='del'>-	*(__le16 *)(DN_SK(newsk)-&gt;addr.sdn_add.a_addr) = cb-&gt;dst;</div><div class='del'>-</div><div class='del'>-	menuver = *skb-&gt;data;</div><div class='del'>-	skb_pull(skb, 1);</div><div class='del'>-</div><div class='del'>-	if (menuver &amp; DN_MENUVER_ACC)</div><div class='del'>-		dn_access_copy(skb, &amp;(DN_SK(newsk)-&gt;accessdata));</div><div class='del'>-</div><div class='del'>-	if (menuver &amp; DN_MENUVER_USR)</div><div class='del'>-		dn_user_copy(skb, &amp;(DN_SK(newsk)-&gt;conndata_in));</div><div class='del'>-</div><div class='del'>-	if (menuver &amp; DN_MENUVER_PRX)</div><div class='del'>-		DN_SK(newsk)-&gt;peer.sdn_flags |= SDF_PROXY;</div><div class='del'>-</div><div class='del'>-	if (menuver &amp; DN_MENUVER_UIC)</div><div class='del'>-		DN_SK(newsk)-&gt;peer.sdn_flags |= SDF_UICPROXY;</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;(DN_SK(newsk)-&gt;conndata_out), &amp;(DN_SK(sk)-&gt;conndata_out),</div><div class='del'>-		sizeof(struct optdata_dn));</div><div class='del'>-	memcpy(&amp;(DN_SK(newsk)-&gt;discdata_out), &amp;(DN_SK(sk)-&gt;discdata_out),</div><div class='del'>-		sizeof(struct optdata_dn));</div><div class='del'>-</div><div class='del'>-	lock_sock(newsk);</div><div class='del'>-	err = dn_hash_sock(newsk);</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		sock_reset_flag(newsk, SOCK_ZAPPED);</div><div class='del'>-		dn_send_conn_ack(newsk);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Here we use sk-&gt;sk_allocation since although the conn conf is</div><div class='del'>-		 * for the newsk, the context is the old socket.</div><div class='del'>-		 */</div><div class='del'>-		if (DN_SK(newsk)-&gt;accept_mode == ACC_IMMED)</div><div class='del'>-			err = dn_confirm_accept(newsk, &amp;timeo,</div><div class='del'>-						sk-&gt;sk_allocation);</div><div class='del'>-	}</div><div class='del'>-	release_sock(newsk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_getname(struct socket *sock, struct sockaddr *uaddr,int peer)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_dn *sa = (struct sockaddr_dn *)uaddr;</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (peer) {</div><div class='del'>-		if ((sock-&gt;state != SS_CONNECTED &amp;&amp;</div><div class='del'>-		     sock-&gt;state != SS_CONNECTING) &amp;&amp;</div><div class='del'>-		    scp-&gt;accept_mode == ACC_IMMED) {</div><div class='del'>-			release_sock(sk);</div><div class='del'>-			return -ENOTCONN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(sa, &amp;scp-&gt;peer, sizeof(struct sockaddr_dn));</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(sa, &amp;scp-&gt;addr, sizeof(struct sockaddr_dn));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return sizeof(struct sockaddr_dn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static __poll_t dn_poll(struct file *file, struct socket *sock, poll_table  *wait)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	__poll_t mask = datagram_poll(file, sock, wait);</div><div class='del'>-</div><div class='del'>-	if (!skb_queue_empty(&amp;scp-&gt;other_receive_queue))</div><div class='del'>-		mask |= EPOLLRDBAND;</div><div class='del'>-</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int err = -EOPNOTSUPP;</div><div class='del'>-	long amount = 0;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	switch(cmd)</div><div class='del'>-	{</div><div class='del'>-	case SIOCGIFADDR:</div><div class='del'>-	case SIOCSIFADDR:</div><div class='del'>-		return dn_dev_ioctl(cmd, (void __user *)arg);</div><div class='del'>-</div><div class='del'>-	case SIOCATMARK:</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		val = !skb_queue_empty(&amp;scp-&gt;other_receive_queue);</div><div class='del'>-		if (scp-&gt;state != DN_RUN)</div><div class='del'>-			val = -ENOTCONN;</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		return val;</div><div class='del'>-</div><div class='del'>-	case TIOCOUTQ:</div><div class='del'>-		amount = sk-&gt;sk_sndbuf - sk_wmem_alloc_get(sk);</div><div class='del'>-		if (amount &lt; 0)</div><div class='del'>-			amount = 0;</div><div class='del'>-		err = put_user(amount, (int __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TIOCINQ:</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		skb = skb_peek(&amp;scp-&gt;other_receive_queue);</div><div class='del'>-		if (skb) {</div><div class='del'>-			amount = skb-&gt;len;</div><div class='del'>-		} else {</div><div class='del'>-			skb_queue_walk(&amp;sk-&gt;sk_receive_queue, skb)</div><div class='del'>-				amount += skb-&gt;len;</div><div class='del'>-		}</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		err = put_user(amount, (int __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		err = -ENOIOCTLCMD;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_listen(struct socket *sock, int backlog)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sock_flag(sk, SOCK_ZAPPED))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if ((DN_SK(sk)-&gt;state != DN_O) || (sk-&gt;sk_state == TCP_LISTEN))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_max_ack_backlog = backlog;</div><div class='del'>-	sk-&gt;sk_ack_backlog     = 0;</div><div class='del'>-	sk-&gt;sk_state           = TCP_LISTEN;</div><div class='del'>-	err                 = 0;</div><div class='del'>-	dn_rehash_sock(sk);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_shutdown(struct socket *sock, int how)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int err = -ENOTCONN;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sock-&gt;state == SS_UNCONNECTED)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	if (sock-&gt;state == SS_DISCONNECTING)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (scp-&gt;state == DN_O)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (how != SHUT_RDWR)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='del'>-	dn_destroy_sock(sk);</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	err = __dn_setsockopt(sock, level, optname, optval, optlen, 0);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != DSO_LINKINFO &amp;&amp;</div><div class='del'>-	    optname != DSO_STREAM &amp;&amp; optname != DSO_SEQPACKET)</div><div class='del'>-		err = nf_setsockopt(sk, PF_DECnet, optname, optval, optlen);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __dn_setsockopt(struct socket *sock, int level,int optname, char __user *optval, unsigned int optlen, int flags)</div><div class='del'>-{</div><div class='del'>-	struct	sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	long timeo;</div><div class='del'>-	union {</div><div class='del'>-		struct optdata_dn opt;</div><div class='del'>-		struct accessdata_dn acc;</div><div class='del'>-		int mode;</div><div class='del'>-		unsigned long win;</div><div class='del'>-		int val;</div><div class='del'>-		unsigned char services;</div><div class='del'>-		unsigned char info;</div><div class='del'>-	} u;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (optlen &amp;&amp; !optval)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (optlen &gt; sizeof(u))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;u, optval, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DSO_CONDATA:</div><div class='del'>-		if (sock-&gt;state == SS_CONNECTED)</div><div class='del'>-			return -EISCONN;</div><div class='del'>-		if ((scp-&gt;state != DN_O) &amp;&amp; (scp-&gt;state != DN_CR))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(struct optdata_dn))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (le16_to_cpu(u.opt.opt_optl) &gt; 16)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;scp-&gt;conndata_out, &amp;u.opt, optlen);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_DISDATA:</div><div class='del'>-		if (sock-&gt;state != SS_CONNECTED &amp;&amp;</div><div class='del'>-		    scp-&gt;accept_mode == ACC_IMMED)</div><div class='del'>-			return -ENOTCONN;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(struct optdata_dn))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (le16_to_cpu(u.opt.opt_optl) &gt; 16)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;scp-&gt;discdata_out, &amp;u.opt, optlen);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_CONACCESS:</div><div class='del'>-		if (sock-&gt;state == SS_CONNECTED)</div><div class='del'>-			return -EISCONN;</div><div class='del'>-		if (scp-&gt;state != DN_O)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(struct accessdata_dn))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if ((u.acc.acc_accl &gt; DN_MAXACCL) ||</div><div class='del'>-		    (u.acc.acc_passl &gt; DN_MAXACCL) ||</div><div class='del'>-		    (u.acc.acc_userl &gt; DN_MAXACCL))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;scp-&gt;accessdata, &amp;u.acc, optlen);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_ACCEPTMODE:</div><div class='del'>-		if (sock-&gt;state == SS_CONNECTED)</div><div class='del'>-			return -EISCONN;</div><div class='del'>-		if (scp-&gt;state != DN_O)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(int))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if ((u.mode != ACC_IMMED) &amp;&amp; (u.mode != ACC_DEFER))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		scp-&gt;accept_mode = (unsigned char)u.mode;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_CONACCEPT:</div><div class='del'>-		if (scp-&gt;state != DN_CR)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		timeo = sock_rcvtimeo(sk, 0);</div><div class='del'>-		err = dn_confirm_accept(sk, &amp;timeo, sk-&gt;sk_allocation);</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	case DSO_CONREJECT:</div><div class='del'>-		if (scp-&gt;state != DN_CR)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		scp-&gt;state = DN_DR;</div><div class='del'>-		sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='del'>-		dn_nsp_send_disc(sk, 0x38, 0, sk-&gt;sk_allocation);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_MAXWINDOW:</div><div class='del'>-		if (optlen != sizeof(unsigned long))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (u.win &gt; NSP_MAX_WINDOW)</div><div class='del'>-			u.win = NSP_MAX_WINDOW;</div><div class='del'>-		if (u.win == 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scp-&gt;max_window = u.win;</div><div class='del'>-		if (scp-&gt;snd_window &gt; u.win)</div><div class='del'>-			scp-&gt;snd_window = u.win;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_NODELAY:</div><div class='del'>-		if (optlen != sizeof(int))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (scp-&gt;nonagle == TCP_NAGLE_CORK)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scp-&gt;nonagle = (u.val == 0) ? 0 : TCP_NAGLE_OFF;</div><div class='del'>-		/* if (scp-&gt;nonagle == 1) { Push pending frames } */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_CORK:</div><div class='del'>-		if (optlen != sizeof(int))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (scp-&gt;nonagle == TCP_NAGLE_OFF)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scp-&gt;nonagle = (u.val == 0) ? 0 : TCP_NAGLE_CORK;</div><div class='del'>-		/* if (scp-&gt;nonagle == 0) { Push pending frames } */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_SERVICES:</div><div class='del'>-		if (optlen != sizeof(unsigned char))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if ((u.services &amp; ~NSP_FC_MASK) != 0x01)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if ((u.services &amp; NSP_FC_MASK) == NSP_FC_MASK)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scp-&gt;services_loc = u.services;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_INFO:</div><div class='del'>-		if (optlen != sizeof(unsigned char))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (u.info &amp; 0xfc)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scp-&gt;info_loc = u.info;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_LINKINFO:</div><div class='del'>-	case DSO_STREAM:</div><div class='del'>-	case DSO_SEQPACKET:</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	err = __dn_getsockopt(sock, level, optname, optval, optlen, 0);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != DSO_STREAM &amp;&amp;</div><div class='del'>-	    optname != DSO_SEQPACKET &amp;&amp; optname != DSO_CONACCEPT &amp;&amp;</div><div class='del'>-	    optname != DSO_CONREJECT) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		if (get_user(len, optlen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		err = nf_getsockopt(sk, PF_DECnet, optname, optval, &amp;len);</div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			err = put_user(len, optlen);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __dn_getsockopt(struct socket *sock, int level,int optname, char __user *optval,int __user *optlen, int flags)</div><div class='del'>-{</div><div class='del'>-	struct	sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct linkinfo_dn link;</div><div class='del'>-	unsigned int r_len;</div><div class='del'>-	void *r_data = NULL;</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	if(get_user(r_len , optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case DSO_CONDATA:</div><div class='del'>-		if (r_len &gt; sizeof(struct optdata_dn))</div><div class='del'>-			r_len = sizeof(struct optdata_dn);</div><div class='del'>-		r_data = &amp;scp-&gt;conndata_in;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_DISDATA:</div><div class='del'>-		if (r_len &gt; sizeof(struct optdata_dn))</div><div class='del'>-			r_len = sizeof(struct optdata_dn);</div><div class='del'>-		r_data = &amp;scp-&gt;discdata_in;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_CONACCESS:</div><div class='del'>-		if (r_len &gt; sizeof(struct accessdata_dn))</div><div class='del'>-			r_len = sizeof(struct accessdata_dn);</div><div class='del'>-		r_data = &amp;scp-&gt;accessdata;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_ACCEPTMODE:</div><div class='del'>-		if (r_len &gt; sizeof(unsigned char))</div><div class='del'>-			r_len = sizeof(unsigned char);</div><div class='del'>-		r_data = &amp;scp-&gt;accept_mode;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_LINKINFO:</div><div class='del'>-		if (r_len &gt; sizeof(struct linkinfo_dn))</div><div class='del'>-			r_len = sizeof(struct linkinfo_dn);</div><div class='del'>-</div><div class='del'>-		memset(&amp;link, 0, sizeof(link));</div><div class='del'>-</div><div class='del'>-		switch (sock-&gt;state) {</div><div class='del'>-		case SS_CONNECTING:</div><div class='del'>-			link.idn_linkstate = LL_CONNECTING;</div><div class='del'>-			break;</div><div class='del'>-		case SS_DISCONNECTING:</div><div class='del'>-			link.idn_linkstate = LL_DISCONNECTING;</div><div class='del'>-			break;</div><div class='del'>-		case SS_CONNECTED:</div><div class='del'>-			link.idn_linkstate = LL_RUNNING;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			link.idn_linkstate = LL_INACTIVE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		link.idn_segsize = scp-&gt;segsize_rem;</div><div class='del'>-		r_data = &amp;link;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_MAXWINDOW:</div><div class='del'>-		if (r_len &gt; sizeof(unsigned long))</div><div class='del'>-			r_len = sizeof(unsigned long);</div><div class='del'>-		r_data = &amp;scp-&gt;max_window;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_NODELAY:</div><div class='del'>-		if (r_len &gt; sizeof(int))</div><div class='del'>-			r_len = sizeof(int);</div><div class='del'>-		val = (scp-&gt;nonagle == TCP_NAGLE_OFF);</div><div class='del'>-		r_data = &amp;val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_CORK:</div><div class='del'>-		if (r_len &gt; sizeof(int))</div><div class='del'>-			r_len = sizeof(int);</div><div class='del'>-		val = (scp-&gt;nonagle == TCP_NAGLE_CORK);</div><div class='del'>-		r_data = &amp;val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_SERVICES:</div><div class='del'>-		if (r_len &gt; sizeof(unsigned char))</div><div class='del'>-			r_len = sizeof(unsigned char);</div><div class='del'>-		r_data = &amp;scp-&gt;services_rem;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_INFO:</div><div class='del'>-		if (r_len &gt; sizeof(unsigned char))</div><div class='del'>-			r_len = sizeof(unsigned char);</div><div class='del'>-		r_data = &amp;scp-&gt;info_rem;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DSO_STREAM:</div><div class='del'>-	case DSO_SEQPACKET:</div><div class='del'>-	case DSO_CONACCEPT:</div><div class='del'>-	case DSO_CONREJECT:</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r_data) {</div><div class='del'>-		if (copy_to_user(optval, r_data, r_len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (put_user(r_len, optlen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_data_ready(struct sock *sk, struct sk_buff_head *q, int flags, int target)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int len = 0;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MSG_OOB)</div><div class='del'>-		return !skb_queue_empty(q) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	skb_queue_walk(q, skb) {</div><div class='del'>-		struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-		len += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-		if (cb-&gt;nsp_flags &amp; 0x40) {</div><div class='del'>-			/* SOCK_SEQPACKET reads to EOM */</div><div class='del'>-			if (sk-&gt;sk_type == SOCK_SEQPACKET)</div><div class='del'>-				return 1;</div><div class='del'>-			/* so does SOCK_STREAM unless WAITALL is specified */</div><div class='del'>-			if (!(flags &amp; MSG_WAITALL))</div><div class='del'>-				return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* minimum data length for read exceeded */</div><div class='del'>-		if (len &gt;= target)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='del'>-		      int flags)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff_head *queue = &amp;sk-&gt;sk_receive_queue;</div><div class='del'>-	size_t target = size &gt; 1 ? 1 : 0;</div><div class='del'>-	size_t copied = 0;</div><div class='del'>-	int rv = 0;</div><div class='del'>-	struct sk_buff *skb, *n;</div><div class='del'>-	struct dn_skb_cb *cb = NULL;</div><div class='del'>-	unsigned char eor = 0;</div><div class='del'>-	long timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sock_flag(sk, SOCK_ZAPPED)) {</div><div class='del'>-		rv = -EADDRNOTAVAIL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) {</div><div class='del'>-		rv = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = dn_check_state(sk, NULL, 0, &amp;timeo, flags);</div><div class='del'>-	if (rv)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; ~(MSG_CMSG_COMPAT|MSG_PEEK|MSG_OOB|MSG_WAITALL|MSG_DONTWAIT|MSG_NOSIGNAL)) {</div><div class='del'>-		rv = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MSG_OOB)</div><div class='del'>-		queue = &amp;scp-&gt;other_receive_queue;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MSG_WAITALL)</div><div class='del'>-		target = size;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * See if there is data ready to read, sleep if there isn't</div><div class='del'>-	 */</div><div class='del'>-	for(;;) {</div><div class='del'>-		DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (!skb_queue_empty(&amp;scp-&gt;other_receive_queue)) {</div><div class='del'>-			if (!(flags &amp; MSG_OOB)) {</div><div class='del'>-				msg-&gt;msg_flags |= MSG_OOB;</div><div class='del'>-				if (!scp-&gt;other_report) {</div><div class='del'>-					scp-&gt;other_report = 1;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (scp-&gt;state != DN_RUN)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			rv = sock_intr_errno(timeo);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dn_data_ready(sk, queue, flags, target))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; MSG_DONTWAIT) {</div><div class='del'>-			rv = -EWOULDBLOCK;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='del'>-		sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='del'>-		sk_wait_event(sk, &amp;timeo, dn_data_ready(sk, queue, flags, target), &amp;wait);</div><div class='del'>-		sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='del'>-		remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_queue_walk_safe(queue, skb, n) {</div><div class='del'>-		unsigned int chunk = skb-&gt;len;</div><div class='del'>-		cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-		if ((chunk + copied) &gt; size)</div><div class='del'>-			chunk = size - copied;</div><div class='del'>-</div><div class='del'>-		if (memcpy_to_msg(msg, skb-&gt;data, chunk)) {</div><div class='del'>-			rv = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		copied += chunk;</div><div class='del'>-</div><div class='del'>-		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			skb_pull(skb, chunk);</div><div class='del'>-</div><div class='del'>-		eor = cb-&gt;nsp_flags &amp; 0x40;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;len == 0) {</div><div class='del'>-			skb_unlink(skb, queue);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			/*</div><div class='del'>-			 * N.B. Don't refer to skb or cb after this point</div><div class='del'>-			 * in loop.</div><div class='del'>-			 */</div><div class='del'>-			if ((scp-&gt;flowloc_sw == DN_DONTSEND) &amp;&amp; !dn_congested(sk)) {</div><div class='del'>-				scp-&gt;flowloc_sw = DN_SEND;</div><div class='del'>-				dn_nsp_send_link(sk, DN_SEND, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (eor) {</div><div class='del'>-			if (sk-&gt;sk_type == SOCK_SEQPACKET)</div><div class='del'>-				break;</div><div class='del'>-			if (!(flags &amp; MSG_WAITALL))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (flags &amp; MSG_OOB)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (copied &gt;= target)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = copied;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (eor &amp;&amp; (sk-&gt;sk_type == SOCK_SEQPACKET))</div><div class='del'>-		msg-&gt;msg_flags |= MSG_EOR;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (rv == 0)</div><div class='del'>-		rv = (flags &amp; MSG_PEEK) ? -sk-&gt;sk_err : sock_error(sk);</div><div class='del'>-</div><div class='del'>-	if ((rv &gt;= 0) &amp;&amp; msg-&gt;msg_name) {</div><div class='del'>-		__sockaddr_check_size(sizeof(struct sockaddr_dn));</div><div class='del'>-		memcpy(msg-&gt;msg_name, &amp;scp-&gt;peer, sizeof(struct sockaddr_dn));</div><div class='del'>-		msg-&gt;msg_namelen = sizeof(struct sockaddr_dn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int dn_queue_too_long(struct dn_scp *scp, struct sk_buff_head *queue, int flags)</div><div class='del'>-{</div><div class='del'>-	unsigned char fctype = scp-&gt;services_rem &amp; NSP_FC_MASK;</div><div class='del'>-	if (skb_queue_len(queue) &gt;= scp-&gt;snd_window)</div><div class='del'>-		return 1;</div><div class='del'>-	if (fctype != NSP_FC_NONE) {</div><div class='del'>-		if (flags &amp; MSG_OOB) {</div><div class='del'>-			if (scp-&gt;flowrem_oth == 0)</div><div class='del'>-				return 1;</div><div class='del'>-		} else {</div><div class='del'>-			if (scp-&gt;flowrem_dat == 0)</div><div class='del'>-				return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The DECnet spec requires that the "routing layer" accepts packets which</div><div class='del'>- * are at least 230 bytes in size. This excludes any headers which the NSP</div><div class='del'>- * layer might add, so we always assume that we'll be using the maximal</div><div class='del'>- * length header on data packets. The variation in length is due to the</div><div class='del'>- * inclusion (or not) of the two 16 bit acknowledgement fields so it doesn't</div><div class='del'>- * make much practical difference.</div><div class='del'>- */</div><div class='del'>-unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu)</div><div class='del'>-{</div><div class='del'>-	unsigned int mss = 230 - DN_MAX_NSP_DATA_HEADER;</div><div class='del'>-	if (dev) {</div><div class='del'>-		struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-		mtu -= LL_RESERVED_SPACE(dev);</div><div class='del'>-		if (dn_db-&gt;use_long)</div><div class='del'>-			mtu -= 21;</div><div class='del'>-		else</div><div class='del'>-			mtu -= 6;</div><div class='del'>-		mtu -= DN_MAX_NSP_DATA_HEADER;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * 21 = long header, 16 = guess at MAC header length</div><div class='del'>-		 */</div><div class='del'>-		mtu -= (21 + DN_MAX_NSP_DATA_HEADER + 16);</div><div class='del'>-	}</div><div class='del'>-	if (mtu &gt; mss)</div><div class='del'>-		mss = mtu;</div><div class='del'>-	return mss;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int dn_current_mss(struct sock *sk, int flags)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = __sk_dst_get(sk);</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int mss_now = min_t(int, scp-&gt;segsize_loc, scp-&gt;segsize_rem);</div><div class='del'>-</div><div class='del'>-	/* Other data messages are limited to 16 bytes per packet */</div><div class='del'>-	if (flags &amp; MSG_OOB)</div><div class='del'>-		return 16;</div><div class='del'>-</div><div class='del'>-	/* This works out the maximum size of segment we can send out */</div><div class='del'>-	if (dst) {</div><div class='del'>-		u32 mtu = dst_mtu(dst);</div><div class='del'>-		mss_now = min_t(int, dn_mss_from_pmtu(dst-&gt;dev, mtu), mss_now);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mss_now;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * N.B. We get the timeout wrong here, but then we always did get it</div><div class='del'>- * wrong before and this is another step along the road to correcting</div><div class='del'>- * it. It ought to get updated each time we pass through the routine,</div><div class='del'>- * but in practise it probably doesn't matter too much for now.</div><div class='del'>- */</div><div class='del'>-static inline struct sk_buff *dn_alloc_send_pskb(struct sock *sk,</div><div class='del'>-			      unsigned long datalen, int noblock,</div><div class='del'>-			      int *errcode)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = sock_alloc_send_skb(sk, datalen,</div><div class='del'>-						   noblock, errcode);</div><div class='del'>-	if (skb) {</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_DNA_RT);</div><div class='del'>-		skb-&gt;pkt_type = PACKET_OUTGOING;</div><div class='del'>-	}</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	size_t mss;</div><div class='del'>-	struct sk_buff_head *queue = &amp;scp-&gt;data_xmit_queue;</div><div class='del'>-	int flags = msg-&gt;msg_flags;</div><div class='del'>-	int err = 0;</div><div class='del'>-	size_t sent = 0;</div><div class='del'>-	int addr_len = msg-&gt;msg_namelen;</div><div class='del'>-	DECLARE_SOCKADDR(struct sockaddr_dn *, addr, msg-&gt;msg_name);</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	size_t len;</div><div class='del'>-	unsigned char fctype;</div><div class='del'>-	long timeo;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; ~(MSG_TRYHARD|MSG_OOB|MSG_DONTWAIT|MSG_EOR|MSG_NOSIGNAL|MSG_MORE|MSG_CMSG_COMPAT))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (addr_len &amp;&amp; (addr_len != sizeof(struct sockaddr_dn)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	timeo = sock_sndtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-	/*</div><div class='del'>-	 * The only difference between stream sockets and sequenced packet</div><div class='del'>-	 * sockets is that the stream sockets always behave as if MSG_EOR</div><div class='del'>-	 * has been set.</div><div class='del'>-	 */</div><div class='del'>-	if (sock-&gt;type == SOCK_STREAM) {</div><div class='del'>-		if (flags &amp; MSG_EOR) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		flags |= MSG_EOR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	err = dn_check_state(sk, addr, addr_len, &amp;timeo, flags);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN) {</div><div class='del'>-		err = -EPIPE;</div><div class='del'>-		if (!(flags &amp; MSG_NOSIGNAL))</div><div class='del'>-			send_sig(SIGPIPE, current, 0);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; MSG_TRYHARD) &amp;&amp; sk-&gt;sk_dst_cache)</div><div class='del'>-		dst_negative_advice(sk);</div><div class='del'>-</div><div class='del'>-	mss = scp-&gt;segsize_rem;</div><div class='del'>-	fctype = scp-&gt;services_rem &amp; NSP_FC_MASK;</div><div class='del'>-</div><div class='del'>-	mss = dn_current_mss(sk, flags);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MSG_OOB) {</div><div class='del'>-		queue = &amp;scp-&gt;other_xmit_queue;</div><div class='del'>-		if (size &gt; mss) {</div><div class='del'>-			err = -EMSGSIZE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist_fxn = dn_nsp_xmit_timeout;</div><div class='del'>-</div><div class='del'>-	while(sent &lt; size) {</div><div class='del'>-		err = sock_error(sk);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			err = sock_intr_errno(timeo);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate size that we wish to send.</div><div class='del'>-		 */</div><div class='del'>-		len = size - sent;</div><div class='del'>-</div><div class='del'>-		if (len &gt; mss)</div><div class='del'>-			len = mss;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Wait for queue size to go down below the window</div><div class='del'>-		 * size.</div><div class='del'>-		 */</div><div class='del'>-		if (dn_queue_too_long(scp, queue, flags)) {</div><div class='del'>-			DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='del'>-</div><div class='del'>-			if (flags &amp; MSG_DONTWAIT) {</div><div class='del'>-				err = -EWOULDBLOCK;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='del'>-			sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='del'>-			sk_wait_event(sk, &amp;timeo,</div><div class='del'>-				      !dn_queue_too_long(scp, queue, flags), &amp;wait);</div><div class='del'>-			sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='del'>-			remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Get a suitably sized skb.</div><div class='del'>-		 * 64 is a bit of a hack really, but its larger than any</div><div class='del'>-		 * link-layer headers and has served us well as a good</div><div class='del'>-		 * guess as to their real length.</div><div class='del'>-		 */</div><div class='del'>-		skb = dn_alloc_send_pskb(sk, len + 64 + DN_MAX_NSP_DATA_HEADER,</div><div class='del'>-					 flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!skb)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-		skb_reserve(skb, 64 + DN_MAX_NSP_DATA_HEADER);</div><div class='del'>-</div><div class='del'>-		if (memcpy_from_msg(skb_put(skb, len), msg, len)) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (flags &amp; MSG_OOB) {</div><div class='del'>-			cb-&gt;nsp_flags = 0x30;</div><div class='del'>-			if (fctype != NSP_FC_NONE)</div><div class='del'>-				scp-&gt;flowrem_oth--;</div><div class='del'>-		} else {</div><div class='del'>-			cb-&gt;nsp_flags = 0x00;</div><div class='del'>-			if (scp-&gt;seg_total == 0)</div><div class='del'>-				cb-&gt;nsp_flags |= 0x20;</div><div class='del'>-</div><div class='del'>-			scp-&gt;seg_total += len;</div><div class='del'>-</div><div class='del'>-			if (((sent + len) == size) &amp;&amp; (flags &amp; MSG_EOR)) {</div><div class='del'>-				cb-&gt;nsp_flags |= 0x40;</div><div class='del'>-				scp-&gt;seg_total = 0;</div><div class='del'>-				if (fctype == NSP_FC_SCMC)</div><div class='del'>-					scp-&gt;flowrem_dat--;</div><div class='del'>-			}</div><div class='del'>-			if (fctype == NSP_FC_SRC)</div><div class='del'>-				scp-&gt;flowrem_dat--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sent += len;</div><div class='del'>-		dn_nsp_queue_xmit(sk, skb, sk-&gt;sk_allocation, flags &amp; MSG_OOB);</div><div class='del'>-		skb = NULL;</div><div class='del'>-</div><div class='del'>-		scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return sent ? sent : err;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	err = sk_stream_error(sk, flags, err);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_device_event(struct notifier_block *this, unsigned long event,</div><div class='del'>-			   void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-</div><div class='del'>-	if (!net_eq(dev_net(dev), &amp;init_net))</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case NETDEV_UP:</div><div class='del'>-		dn_dev_up(dev);</div><div class='del'>-		break;</div><div class='del'>-	case NETDEV_DOWN:</div><div class='del'>-		dn_dev_down(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block dn_dev_notifier = {</div><div class='del'>-	.notifier_call = dn_device_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct packet_type dn_dix_packet_type __read_mostly = {</div><div class='del'>-	.type =		cpu_to_be16(ETH_P_DNA_RT),</div><div class='del'>-	.func =		dn_route_rcv,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-struct dn_iter_state {</div><div class='del'>-	int bucket;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sock *dn_socket_get_first(struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct dn_iter_state *state = seq-&gt;private;</div><div class='del'>-	struct sock *n = NULL;</div><div class='del'>-</div><div class='del'>-	for(state-&gt;bucket = 0;</div><div class='del'>-	    state-&gt;bucket &lt; DN_SK_HASH_SIZE;</div><div class='del'>-	    ++state-&gt;bucket) {</div><div class='del'>-		n = sk_head(&amp;dn_sk_hash[state-&gt;bucket]);</div><div class='del'>-		if (n)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sock *dn_socket_get_next(struct seq_file *seq,</div><div class='del'>-				       struct sock *n)</div><div class='del'>-{</div><div class='del'>-	struct dn_iter_state *state = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	n = sk_next(n);</div><div class='del'>-try_again:</div><div class='del'>-	if (n)</div><div class='del'>-		goto out;</div><div class='del'>-	if (++state-&gt;bucket &gt;= DN_SK_HASH_SIZE)</div><div class='del'>-		goto out;</div><div class='del'>-	n = sk_head(&amp;dn_sk_hash[state-&gt;bucket]);</div><div class='del'>-	goto try_again;</div><div class='del'>-out:</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sock *socket_get_idx(struct seq_file *seq, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = dn_socket_get_first(seq);</div><div class='del'>-</div><div class='del'>-	if (sk) {</div><div class='del'>-		while(*pos &amp;&amp; (sk = dn_socket_get_next(seq, sk)))</div><div class='del'>-			--*pos;</div><div class='del'>-	}</div><div class='del'>-	return *pos ? NULL : sk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_socket_get_idx(struct seq_file *seq, loff_t pos)</div><div class='del'>-{</div><div class='del'>-	void *rc;</div><div class='del'>-	read_lock_bh(&amp;dn_hash_lock);</div><div class='del'>-	rc = socket_get_idx(seq, &amp;pos);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		read_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_socket_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	return *pos ? dn_socket_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_socket_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	void *rc;</div><div class='del'>-</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		rc = dn_socket_get_idx(seq, 0);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = dn_socket_get_next(seq, v);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out;</div><div class='del'>-	read_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-out:</div><div class='del'>-	++*pos;</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_socket_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	if (v &amp;&amp; v != SEQ_START_TOKEN)</div><div class='del'>-		read_unlock_bh(&amp;dn_hash_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IS_NOT_PRINTABLE(x) ((x) &lt; 32 || (x) &gt; 126)</div><div class='del'>-</div><div class='del'>-static void dn_printable_object(struct sockaddr_dn *dn, unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (le16_to_cpu(dn-&gt;sdn_objnamel)) {</div><div class='del'>-	case 0:</div><div class='del'>-		sprintf(buf, "%d", dn-&gt;sdn_objnum);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		for (i = 0; i &lt; le16_to_cpu(dn-&gt;sdn_objnamel); i++) {</div><div class='del'>-			buf[i] = dn-&gt;sdn_objname[i];</div><div class='del'>-			if (IS_NOT_PRINTABLE(buf[i]))</div><div class='del'>-				buf[i] = '.';</div><div class='del'>-		}</div><div class='del'>-		buf[i] = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *dn_state2asc(unsigned char state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case DN_O:</div><div class='del'>-		return "OPEN";</div><div class='del'>-	case DN_CR:</div><div class='del'>-		return "  CR";</div><div class='del'>-	case DN_DR:</div><div class='del'>-		return "  DR";</div><div class='del'>-	case DN_DRC:</div><div class='del'>-		return " DRC";</div><div class='del'>-	case DN_CC:</div><div class='del'>-		return "  CC";</div><div class='del'>-	case DN_CI:</div><div class='del'>-		return "  CI";</div><div class='del'>-	case DN_NR:</div><div class='del'>-		return "  NR";</div><div class='del'>-	case DN_NC:</div><div class='del'>-		return "  NC";</div><div class='del'>-	case DN_CD:</div><div class='del'>-		return "  CD";</div><div class='del'>-	case DN_RJ:</div><div class='del'>-		return "  RJ";</div><div class='del'>-	case DN_RUN:</div><div class='del'>-		return " RUN";</div><div class='del'>-	case DN_DI:</div><div class='del'>-		return "  DI";</div><div class='del'>-	case DN_DIC:</div><div class='del'>-		return " DIC";</div><div class='del'>-	case DN_DN:</div><div class='del'>-		return "  DN";</div><div class='del'>-	case DN_CL:</div><div class='del'>-		return "  CL";</div><div class='del'>-	case DN_CN:</div><div class='del'>-		return "  CN";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "????";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dn_socket_format_entry(struct seq_file *seq, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	char buf1[DN_ASCBUF_LEN];</div><div class='del'>-	char buf2[DN_ASCBUF_LEN];</div><div class='del'>-	char local_object[DN_MAXOBJL+3];</div><div class='del'>-	char remote_object[DN_MAXOBJL+3];</div><div class='del'>-</div><div class='del'>-	dn_printable_object(&amp;scp-&gt;addr, local_object);</div><div class='del'>-	dn_printable_object(&amp;scp-&gt;peer, remote_object);</div><div class='del'>-</div><div class='del'>-	seq_printf(seq,</div><div class='del'>-		   "%6s/%04X %04d:%04d %04d:%04d %01d %-16s "</div><div class='del'>-		   "%6s/%04X %04d:%04d %04d:%04d %01d %-16s %4s %s\n",</div><div class='del'>-		   dn_addr2asc(le16_to_cpu(dn_saddr2dn(&amp;scp-&gt;addr)), buf1),</div><div class='del'>-		   scp-&gt;addrloc,</div><div class='del'>-		   scp-&gt;numdat,</div><div class='del'>-		   scp-&gt;numoth,</div><div class='del'>-		   scp-&gt;ackxmt_dat,</div><div class='del'>-		   scp-&gt;ackxmt_oth,</div><div class='del'>-		   scp-&gt;flowloc_sw,</div><div class='del'>-		   local_object,</div><div class='del'>-		   dn_addr2asc(le16_to_cpu(dn_saddr2dn(&amp;scp-&gt;peer)), buf2),</div><div class='del'>-		   scp-&gt;addrrem,</div><div class='del'>-		   scp-&gt;numdat_rcv,</div><div class='del'>-		   scp-&gt;numoth_rcv,</div><div class='del'>-		   scp-&gt;ackrcv_dat,</div><div class='del'>-		   scp-&gt;ackrcv_oth,</div><div class='del'>-		   scp-&gt;flowrem_sw,</div><div class='del'>-		   remote_object,</div><div class='del'>-		   dn_state2asc(scp-&gt;state),</div><div class='del'>-		   ((scp-&gt;accept_mode == ACC_IMMED) ? "IMMED" : "DEFER"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_socket_seq_show(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_puts(seq, "Local                                              Remote\n");</div><div class='del'>-	} else {</div><div class='del'>-		dn_socket_format_entry(seq, v);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations dn_socket_seq_ops = {</div><div class='del'>-	.start	= dn_socket_seq_start,</div><div class='del'>-	.next	= dn_socket_seq_next,</div><div class='del'>-	.stop	= dn_socket_seq_stop,</div><div class='del'>-	.show	= dn_socket_seq_show,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct net_proto_family	dn_family_ops = {</div><div class='del'>-	.family =	AF_DECnet,</div><div class='del'>-	.create =	dn_create,</div><div class='del'>-	.owner	=	THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proto_ops dn_proto_ops = {</div><div class='del'>-	.family =	AF_DECnet,</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.release =	dn_release,</div><div class='del'>-	.bind =		dn_bind,</div><div class='del'>-	.connect =	dn_connect,</div><div class='del'>-	.socketpair =	sock_no_socketpair,</div><div class='del'>-	.accept =	dn_accept,</div><div class='del'>-	.getname =	dn_getname,</div><div class='del'>-	.poll =		dn_poll,</div><div class='del'>-	.ioctl =	dn_ioctl,</div><div class='del'>-	.listen =	dn_listen,</div><div class='del'>-	.shutdown =	dn_shutdown,</div><div class='del'>-	.setsockopt =	dn_setsockopt,</div><div class='del'>-	.getsockopt =	dn_getsockopt,</div><div class='del'>-	.sendmsg =	dn_sendmsg,</div><div class='del'>-	.recvmsg =	dn_recvmsg,</div><div class='del'>-	.mmap =		sock_no_mmap,</div><div class='del'>-	.sendpage =	sock_no_sendpage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("The Linux DECnet Network Protocol");</div><div class='del'>-MODULE_AUTHOR("Linux DECnet Project Team");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NETPROTO(PF_DECnet);</div><div class='del'>-</div><div class='del'>-static const char banner[] __initconst = KERN_INFO</div><div class='del'>-"NET4: DECnet for Linux: V.2.5.68s (C) 1995-2003 Linux DECnet Project Team\n";</div><div class='del'>-</div><div class='del'>-static int __init decnet_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	printk(banner);</div><div class='del'>-</div><div class='del'>-	rc = proto_register(&amp;dn_proto, 1);</div><div class='del'>-	if (rc != 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dn_neigh_init();</div><div class='del'>-	dn_dev_init();</div><div class='del'>-	dn_route_init();</div><div class='del'>-	dn_fib_init();</div><div class='del'>-</div><div class='del'>-	sock_register(&amp;dn_family_ops);</div><div class='del'>-	dev_add_pack(&amp;dn_dix_packet_type);</div><div class='del'>-	register_netdevice_notifier(&amp;dn_dev_notifier);</div><div class='del'>-</div><div class='del'>-	proc_create_seq_private("decnet", 0444, init_net.proc_net,</div><div class='del'>-			&amp;dn_socket_seq_ops, sizeof(struct dn_iter_state),</div><div class='del'>-			NULL);</div><div class='del'>-	dn_register_sysctl();</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-module_init(decnet_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prevent DECnet module unloading until its fixed properly.</div><div class='del'>- * Requires an audit of the code to check for memory leaks and</div><div class='del'>- * initialisation problems etc.</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-static void __exit decnet_exit(void)</div><div class='del'>-{</div><div class='del'>-	sock_unregister(AF_DECnet);</div><div class='del'>-	rtnl_unregister_all(PF_DECnet);</div><div class='del'>-	dev_remove_pack(&amp;dn_dix_packet_type);</div><div class='del'>-</div><div class='del'>-	dn_unregister_sysctl();</div><div class='del'>-</div><div class='del'>-	unregister_netdevice_notifier(&amp;dn_dev_notifier);</div><div class='del'>-</div><div class='del'>-	dn_route_cleanup();</div><div class='del'>-	dn_dev_cleanup();</div><div class='del'>-	dn_neigh_cleanup();</div><div class='del'>-	dn_fib_cleanup();</div><div class='del'>-</div><div class='del'>-	remove_proc_entry("decnet", init_net.proc_net);</div><div class='del'>-</div><div class='del'>-	proto_unregister(&amp;dn_proto);</div><div class='del'>-</div><div class='del'>-	rcu_barrier_bh(); /* Wait for completion of call_rcu_bh()'s */</div><div class='del'>-}</div><div class='del'>-module_exit(decnet_exit);</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c<br/>deleted file mode 100644<br/>index bfd43e8f2c06..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_dev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_dev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1438 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Device Layer</div><div class='del'>- *</div><div class='del'>- * Authors:     Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *              Eduardo Marcelo Serrat &lt;emserrat@geocities.com&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *          Steve Whitehouse : Devices now see incoming frames so they</div><div class='del'>- *                             can mark on who it came from.</div><div class='del'>- *          Steve Whitehouse : Fixed bug in creating neighbours. Each neighbour</div><div class='del'>- *                             can now have a device specific setup func.</div><div class='del'>- *          Steve Whitehouse : Added /proc/sys/net/decnet/conf/&lt;dev&gt;/</div><div class='del'>- *          Steve Whitehouse : Fixed bug which sometimes killed timer</div><div class='del'>- *          Steve Whitehouse : Multiple ifaddr support</div><div class='del'>- *          Steve Whitehouse : SIOCGIFCONF is now a compile time option</div><div class='del'>- *          Steve Whitehouse : /proc/sys/net/decnet/conf/&lt;sys&gt;/forwarding</div><div class='del'>- *          Steve Whitehouse : Removed timer1 - it's a user space issue now</div><div class='del'>- *         Patrick Caulfield : Fixed router hello message format</div><div class='del'>- *          Steve Whitehouse : Got rid of constant sizes for blksize for</div><div class='del'>- *                             devices. All mtu based now.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/if_addr.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-</div><div class='del'>-#define DN_IFREQ_SIZE (sizeof(struct ifreq) - sizeof(struct sockaddr) + sizeof(struct sockaddr_dn))</div><div class='del'>-</div><div class='del'>-static char dn_rt_all_end_mcast[ETH_ALEN] = {0xAB,0x00,0x00,0x04,0x00,0x00};</div><div class='del'>-static char dn_rt_all_rt_mcast[ETH_ALEN]  = {0xAB,0x00,0x00,0x03,0x00,0x00};</div><div class='del'>-static char dn_hiord[ETH_ALEN]            = {0xAA,0x00,0x04,0x00,0x00,0x00};</div><div class='del'>-static unsigned char dn_eco_version[3]    = {0x02,0x00,0x00};</div><div class='del'>-</div><div class='del'>-extern struct neigh_table dn_neigh_table;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * decnet_address is kept in network order.</div><div class='del'>- */</div><div class='del'>-__le16 decnet_address = 0;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(dndev_lock);</div><div class='del'>-static struct net_device *decnet_default_device;</div><div class='del'>-static BLOCKING_NOTIFIER_HEAD(dnaddr_chain);</div><div class='del'>-</div><div class='del'>-static struct dn_dev *dn_dev_create(struct net_device *dev, int *err);</div><div class='del'>-static void dn_dev_delete(struct net_device *dev);</div><div class='del'>-static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa);</div><div class='del'>-</div><div class='del'>-static int dn_eth_up(struct net_device *);</div><div class='del'>-static void dn_eth_down(struct net_device *);</div><div class='del'>-static void dn_send_brd_hello(struct net_device *dev, struct dn_ifaddr *ifa);</div><div class='del'>-static void dn_send_ptp_hello(struct net_device *dev, struct dn_ifaddr *ifa);</div><div class='del'>-</div><div class='del'>-static struct dn_dev_parms dn_dev_list[] =  {</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_ETHER, /* Ethernet */</div><div class='del'>-	.mode =		DN_DEV_BCAST,</div><div class='del'>-	.state =	DN_DEV_S_RU,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		10,</div><div class='del'>-	.name =		"ethernet",</div><div class='del'>-	.up =		dn_eth_up,</div><div class='del'>-	.down = 	dn_eth_down,</div><div class='del'>-	.timer3 =	dn_send_brd_hello,</div><div class='del'>-},</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_IPGRE, /* DECnet tunneled over GRE in IP */</div><div class='del'>-	.mode =		DN_DEV_BCAST,</div><div class='del'>-	.state =	DN_DEV_S_RU,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		10,</div><div class='del'>-	.name =		"ipgre",</div><div class='del'>-	.timer3 =	dn_send_brd_hello,</div><div class='del'>-},</div><div class='del'>-#if 0</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_X25, /* Bog standard X.25 */</div><div class='del'>-	.mode =		DN_DEV_UCAST,</div><div class='del'>-	.state =	DN_DEV_S_DS,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		120,</div><div class='del'>-	.name =		"x25",</div><div class='del'>-	.timer3 =	dn_send_ptp_hello,</div><div class='del'>-},</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_PPP, /* DECnet over PPP */</div><div class='del'>-	.mode =		DN_DEV_BCAST,</div><div class='del'>-	.state =	DN_DEV_S_RU,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		10,</div><div class='del'>-	.name =		"ppp",</div><div class='del'>-	.timer3 =	dn_send_brd_hello,</div><div class='del'>-},</div><div class='del'>-#endif</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_DDCMP, /* DECnet over DDCMP */</div><div class='del'>-	.mode =		DN_DEV_UCAST,</div><div class='del'>-	.state =	DN_DEV_S_DS,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		120,</div><div class='del'>-	.name =		"ddcmp",</div><div class='del'>-	.timer3 =	dn_send_ptp_hello,</div><div class='del'>-},</div><div class='del'>-{</div><div class='del'>-	.type =		ARPHRD_LOOPBACK, /* Loopback interface - always last */</div><div class='del'>-	.mode =		DN_DEV_BCAST,</div><div class='del'>-	.state =	DN_DEV_S_RU,</div><div class='del'>-	.t2 =		1,</div><div class='del'>-	.t3 =		10,</div><div class='del'>-	.name =		"loopback",</div><div class='del'>-	.timer3 =	dn_send_brd_hello,</div><div class='del'>-}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DN_DEV_LIST_SIZE ARRAY_SIZE(dn_dev_list)</div><div class='del'>-</div><div class='del'>-#define DN_DEV_PARMS_OFFSET(x) offsetof(struct dn_dev_parms, x)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-</div><div class='del'>-static int min_t2[] = { 1 };</div><div class='del'>-static int max_t2[] = { 60 }; /* No max specified, but this seems sensible */</div><div class='del'>-static int min_t3[] = { 1 };</div><div class='del'>-static int max_t3[] = { 8191 }; /* Must fit in 16 bits when multiplied by BCT3MULT or T3MULT */</div><div class='del'>-</div><div class='del'>-static int min_priority[1];</div><div class='del'>-static int max_priority[] = { 127 }; /* From DECnet spec */</div><div class='del'>-</div><div class='del'>-static int dn_forwarding_proc(struct ctl_table *, int,</div><div class='del'>-			void __user *, size_t *, loff_t *);</div><div class='del'>-static struct dn_dev_sysctl_table {</div><div class='del'>-	struct ctl_table_header *sysctl_header;</div><div class='del'>-	struct ctl_table dn_dev_vars[5];</div><div class='del'>-} dn_dev_sysctl = {</div><div class='del'>-	NULL,</div><div class='del'>-	{</div><div class='del'>-	{</div><div class='del'>-		.procname = "forwarding",</div><div class='del'>-		.data = (void *)DN_DEV_PARMS_OFFSET(forwarding),</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = dn_forwarding_proc,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "priority",</div><div class='del'>-		.data = (void *)DN_DEV_PARMS_OFFSET(priority),</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_priority,</div><div class='del'>-		.extra2 = &amp;max_priority</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "t2",</div><div class='del'>-		.data = (void *)DN_DEV_PARMS_OFFSET(t2),</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_t2,</div><div class='del'>-		.extra2 = &amp;max_t2</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "t3",</div><div class='del'>-		.data = (void *)DN_DEV_PARMS_OFFSET(t3),</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_t3,</div><div class='del'>-		.extra2 = &amp;max_t3</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *parms)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev_sysctl_table *t;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	char path[sizeof("net/decnet/conf/") + IFNAMSIZ];</div><div class='del'>-</div><div class='del'>-	t = kmemdup(&amp;dn_dev_sysctl, sizeof(*t), GFP_KERNEL);</div><div class='del'>-	if (t == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; ARRAY_SIZE(t-&gt;dn_dev_vars) - 1; i++) {</div><div class='del'>-		long offset = (long)t-&gt;dn_dev_vars[i].data;</div><div class='del'>-		t-&gt;dn_dev_vars[i].data = ((char *)parms) + offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(path, sizeof(path), "net/decnet/conf/%s",</div><div class='del'>-		dev? dev-&gt;name : parms-&gt;name);</div><div class='del'>-</div><div class='del'>-	t-&gt;dn_dev_vars[0].extra1 = (void *)dev;</div><div class='del'>-</div><div class='del'>-	t-&gt;sysctl_header = register_net_sysctl(&amp;init_net, path, t-&gt;dn_dev_vars);</div><div class='del'>-	if (t-&gt;sysctl_header == NULL)</div><div class='del'>-		kfree(t);</div><div class='del'>-	else</div><div class='del'>-		parms-&gt;sysctl = t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms)</div><div class='del'>-{</div><div class='del'>-	if (parms-&gt;sysctl) {</div><div class='del'>-		struct dn_dev_sysctl_table *t = parms-&gt;sysctl;</div><div class='del'>-		parms-&gt;sysctl = NULL;</div><div class='del'>-		unregister_net_sysctl_table(t-&gt;sysctl_header);</div><div class='del'>-		kfree(t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_forwarding_proc(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer,</div><div class='del'>-				size_t *lenp, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_DECNET_ROUTER</div><div class='del'>-	struct net_device *dev = table-&gt;extra1;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	int err;</div><div class='del'>-	int tmp, old;</div><div class='del'>-</div><div class='del'>-	if (table-&gt;extra1 == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-	old = dn_db-&gt;parms.forwarding;</div><div class='del'>-</div><div class='del'>-	err = proc_dointvec(table, write, buffer, lenp, ppos);</div><div class='del'>-</div><div class='del'>-	if ((err &gt;= 0) &amp;&amp; write) {</div><div class='del'>-		if (dn_db-&gt;parms.forwarding &lt; 0)</div><div class='del'>-			dn_db-&gt;parms.forwarding = 0;</div><div class='del'>-		if (dn_db-&gt;parms.forwarding &gt; 2)</div><div class='del'>-			dn_db-&gt;parms.forwarding = 2;</div><div class='del'>-		/*</div><div class='del'>-		 * What an ugly hack this is... its works, just. It</div><div class='del'>-		 * would be nice if sysctl/proc were just that little</div><div class='del'>-		 * bit more flexible so I don't have to write a special</div><div class='del'>-		 * routine, or suffer hacks like this - SJW</div><div class='del'>-		 */</div><div class='del'>-		tmp = dn_db-&gt;parms.forwarding;</div><div class='del'>-		dn_db-&gt;parms.forwarding = old;</div><div class='del'>-		if (dn_db-&gt;parms.down)</div><div class='del'>-			dn_db-&gt;parms.down(dev);</div><div class='del'>-		dn_db-&gt;parms.forwarding = tmp;</div><div class='del'>-		if (dn_db-&gt;parms.up)</div><div class='del'>-			dn_db-&gt;parms.up(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-#else</div><div class='del'>-	return -EINVAL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_SYSCTL */</div><div class='del'>-static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *parms)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SYSCTL */</div><div class='del'>-</div><div class='del'>-static inline __u16 mtu2blksize(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	u32 blksize = dev-&gt;mtu;</div><div class='del'>-	if (blksize &gt; 0xffff)</div><div class='del'>-		blksize = 0xffff;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type == ARPHRD_ETHER ||</div><div class='del'>-	    dev-&gt;type == ARPHRD_PPP ||</div><div class='del'>-	    dev-&gt;type == ARPHRD_IPGRE ||</div><div class='del'>-	    dev-&gt;type == ARPHRD_LOOPBACK)</div><div class='del'>-		blksize -= 2;</div><div class='del'>-</div><div class='del'>-	return (__u16)blksize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dn_ifaddr *dn_dev_alloc_ifa(void)</div><div class='del'>-{</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-</div><div class='del'>-	ifa = kzalloc(sizeof(*ifa), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	return ifa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_free_ifa(struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	kfree_rcu(ifa, rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr __rcu **ifap, int destroy)</div><div class='del'>-{</div><div class='del'>-	struct dn_ifaddr *ifa1 = rtnl_dereference(*ifap);</div><div class='del'>-	unsigned char mac_addr[6];</div><div class='del'>-	struct net_device *dev = dn_db-&gt;dev;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	*ifap = ifa1-&gt;ifa_next;</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;dev-&gt;type == ARPHRD_ETHER) {</div><div class='del'>-		if (ifa1-&gt;ifa_local != dn_eth2dn(dev-&gt;dev_addr)) {</div><div class='del'>-			dn_dn2eth(mac_addr, ifa1-&gt;ifa_local);</div><div class='del'>-			dev_mc_del(dev, mac_addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_ifaddr_notify(RTM_DELADDR, ifa1);</div><div class='del'>-	blocking_notifier_call_chain(&amp;dnaddr_chain, NETDEV_DOWN, ifa1);</div><div class='del'>-	if (destroy) {</div><div class='del'>-		dn_dev_free_ifa(ifa1);</div><div class='del'>-</div><div class='del'>-		if (dn_db-&gt;ifa_list == NULL)</div><div class='del'>-			dn_dev_delete(dn_db-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dn_db-&gt;dev;</div><div class='del'>-	struct dn_ifaddr *ifa1;</div><div class='del'>-	unsigned char mac_addr[6];</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	/* Check for duplicates */</div><div class='del'>-	for (ifa1 = rtnl_dereference(dn_db-&gt;ifa_list);</div><div class='del'>-	     ifa1 != NULL;</div><div class='del'>-	     ifa1 = rtnl_dereference(ifa1-&gt;ifa_next)) {</div><div class='del'>-		if (ifa1-&gt;ifa_local == ifa-&gt;ifa_local)</div><div class='del'>-			return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type == ARPHRD_ETHER) {</div><div class='del'>-		if (ifa-&gt;ifa_local != dn_eth2dn(dev-&gt;dev_addr)) {</div><div class='del'>-			dn_dn2eth(mac_addr, ifa-&gt;ifa_local);</div><div class='del'>-			dev_mc_add(dev, mac_addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ifa-&gt;ifa_next = dn_db-&gt;ifa_list;</div><div class='del'>-	rcu_assign_pointer(dn_db-&gt;ifa_list, ifa);</div><div class='del'>-</div><div class='del'>-	dn_ifaddr_notify(RTM_NEWADDR, ifa);</div><div class='del'>-	blocking_notifier_call_chain(&amp;dnaddr_chain, NETDEV_UP, ifa);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_dev_set_ifa(struct net_device *dev, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rtnl_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	if (dn_db == NULL) {</div><div class='del'>-		int err;</div><div class='del'>-		dn_db = dn_dev_create(dev, &amp;err);</div><div class='del'>-		if (dn_db == NULL)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ifa-&gt;ifa_dev = dn_db;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_LOOPBACK)</div><div class='del'>-		ifa-&gt;ifa_scope = RT_SCOPE_HOST;</div><div class='del'>-</div><div class='del'>-	rv = dn_dev_insert_ifa(dn_db, ifa);</div><div class='del'>-	if (rv)</div><div class='del'>-		dn_dev_free_ifa(ifa);</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int dn_dev_ioctl(unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	char buffer[DN_IFREQ_SIZE];</div><div class='del'>-	struct ifreq *ifr = (struct ifreq *)buffer;</div><div class='del'>-	struct sockaddr_dn *sdn = (struct sockaddr_dn *)&amp;ifr-&gt;ifr_addr;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_ifaddr *ifa = NULL;</div><div class='del'>-	struct dn_ifaddr __rcu **ifap = NULL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(ifr, arg, DN_IFREQ_SIZE))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ifr-&gt;ifr_name[IFNAMSIZ-1] = 0;</div><div class='del'>-</div><div class='del'>-	dev_load(&amp;init_net, ifr-&gt;ifr_name);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGIFADDR:</div><div class='del'>-		break;</div><div class='del'>-	case SIOCSIFADDR:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN))</div><div class='del'>-			return -EACCES;</div><div class='del'>-		if (sdn-&gt;sdn_family != AF_DECnet)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-</div><div class='del'>-	if ((dev = __dev_get_by_name(&amp;init_net, ifr-&gt;ifr_name)) == NULL) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dn_db = rtnl_dereference(dev-&gt;dn_ptr)) != NULL) {</div><div class='del'>-		for (ifap = &amp;dn_db-&gt;ifa_list;</div><div class='del'>-		     (ifa = rtnl_dereference(*ifap)) != NULL;</div><div class='del'>-		     ifap = &amp;ifa-&gt;ifa_next)</div><div class='del'>-			if (strcmp(ifr-&gt;ifr_name, ifa-&gt;ifa_label) == 0)</div><div class='del'>-				break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ifa == NULL &amp;&amp; cmd != SIOCSIFADDR) {</div><div class='del'>-		ret = -EADDRNOTAVAIL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGIFADDR:</div><div class='del'>-		*((__le16 *)sdn-&gt;sdn_nodeaddr) = ifa-&gt;ifa_local;</div><div class='del'>-		goto rarok;</div><div class='del'>-</div><div class='del'>-	case SIOCSIFADDR:</div><div class='del'>-		if (!ifa) {</div><div class='del'>-			if ((ifa = dn_dev_alloc_ifa()) == NULL) {</div><div class='del'>-				ret = -ENOBUFS;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			memcpy(ifa-&gt;ifa_label, dev-&gt;name, IFNAMSIZ);</div><div class='del'>-		} else {</div><div class='del'>-			if (ifa-&gt;ifa_local == dn_saddr2dn(sdn))</div><div class='del'>-				break;</div><div class='del'>-			dn_dev_del_ifa(dn_db, ifap, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ifa-&gt;ifa_local = ifa-&gt;ifa_address = dn_saddr2dn(sdn);</div><div class='del'>-</div><div class='del'>-		ret = dn_dev_set_ifa(dev, ifa);</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-rarok:</div><div class='del'>-	if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-	goto done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct net_device *dn_dev_get_default(void)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;dndev_lock);</div><div class='del'>-	dev = decnet_default_device;</div><div class='del'>-	if (dev) {</div><div class='del'>-		if (dev-&gt;dn_ptr)</div><div class='del'>-			dev_hold(dev);</div><div class='del'>-		else</div><div class='del'>-			dev = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;dndev_lock);</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_dev_set_default(struct net_device *dev, int force)</div><div class='del'>-{</div><div class='del'>-	struct net_device *old = NULL;</div><div class='del'>-	int rv = -EBUSY;</div><div class='del'>-	if (!dev-&gt;dn_ptr)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;dndev_lock);</div><div class='del'>-	if (force || decnet_default_device == NULL) {</div><div class='del'>-		old = decnet_default_device;</div><div class='del'>-		decnet_default_device = dev;</div><div class='del'>-		rv = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;dndev_lock);</div><div class='del'>-</div><div class='del'>-	if (old)</div><div class='del'>-		dev_put(old);</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_check_default(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;dndev_lock);</div><div class='del'>-	if (dev == decnet_default_device) {</div><div class='del'>-		decnet_default_device = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		dev = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;dndev_lock);</div><div class='del'>-</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_put(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called with RTNL</div><div class='del'>- */</div><div class='del'>-static struct dn_dev *dn_dev_by_index(int ifindex)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_dev *dn_dev = NULL;</div><div class='del'>-</div><div class='del'>-	dev = __dev_get_by_index(&amp;init_net, ifindex);</div><div class='del'>-	if (dev)</div><div class='del'>-		dn_dev = rtnl_dereference(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	return dn_dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nla_policy dn_ifa_policy[IFA_MAX+1] = {</div><div class='del'>-	[IFA_ADDRESS]		= { .type = NLA_U16 },</div><div class='del'>-	[IFA_LOCAL]		= { .type = NLA_U16 },</div><div class='del'>-	[IFA_LABEL]		= { .type = NLA_STRING,</div><div class='del'>-				    .len = IFNAMSIZ - 1 },</div><div class='del'>-	[IFA_FLAGS]		= { .type = NLA_U32 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			 struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct nlattr *tb[IFA_MAX+1];</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct ifaddrmsg *ifm;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-	struct dn_ifaddr __rcu **ifap;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,</div><div class='del'>-			  extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = -ENODEV;</div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='del'>-	if ((dn_db = dn_dev_by_index(ifm-&gt;ifa_index)) == NULL)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = -EADDRNOTAVAIL;</div><div class='del'>-	for (ifap = &amp;dn_db-&gt;ifa_list;</div><div class='del'>-	     (ifa = rtnl_dereference(*ifap)) != NULL;</div><div class='del'>-	     ifap = &amp;ifa-&gt;ifa_next) {</div><div class='del'>-		if (tb[IFA_LOCAL] &amp;&amp;</div><div class='del'>-		    nla_memcmp(tb[IFA_LOCAL], &amp;ifa-&gt;ifa_local, 2))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (tb[IFA_LABEL] &amp;&amp; nla_strcmp(tb[IFA_LABEL], ifa-&gt;ifa_label))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dn_dev_del_ifa(dn_db, ifap, 1);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-errout:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			 struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct nlattr *tb[IFA_MAX+1];</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct ifaddrmsg *ifm;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,</div><div class='del'>-			  extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (tb[IFA_LOCAL] == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='del'>-	if ((dev = __dev_get_by_index(&amp;init_net, ifm-&gt;ifa_index)) == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if ((dn_db = rtnl_dereference(dev-&gt;dn_ptr)) == NULL) {</div><div class='del'>-		dn_db = dn_dev_create(dev, &amp;err);</div><div class='del'>-		if (!dn_db)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ifa = dn_dev_alloc_ifa()) == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	if (tb[IFA_ADDRESS] == NULL)</div><div class='del'>-		tb[IFA_ADDRESS] = tb[IFA_LOCAL];</div><div class='del'>-</div><div class='del'>-	ifa-&gt;ifa_local = nla_get_le16(tb[IFA_LOCAL]);</div><div class='del'>-	ifa-&gt;ifa_address = nla_get_le16(tb[IFA_ADDRESS]);</div><div class='del'>-	ifa-&gt;ifa_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) :</div><div class='del'>-					 ifm-&gt;ifa_flags;</div><div class='del'>-	ifa-&gt;ifa_scope = ifm-&gt;ifa_scope;</div><div class='del'>-	ifa-&gt;ifa_dev = dn_db;</div><div class='del'>-</div><div class='del'>-	if (tb[IFA_LABEL])</div><div class='del'>-		nla_strlcpy(ifa-&gt;ifa_label, tb[IFA_LABEL], IFNAMSIZ);</div><div class='del'>-	else</div><div class='del'>-		memcpy(ifa-&gt;ifa_label, dev-&gt;name, IFNAMSIZ);</div><div class='del'>-</div><div class='del'>-	err = dn_dev_insert_ifa(dn_db, ifa);</div><div class='del'>-	if (err)</div><div class='del'>-		dn_dev_free_ifa(ifa);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t dn_ifaddr_nlmsg_size(void)</div><div class='del'>-{</div><div class='del'>-	return NLMSG_ALIGN(sizeof(struct ifaddrmsg))</div><div class='del'>-	       + nla_total_size(IFNAMSIZ) /* IFA_LABEL */</div><div class='del'>-	       + nla_total_size(2) /* IFA_ADDRESS */</div><div class='del'>-	       + nla_total_size(2) /* IFA_LOCAL */</div><div class='del'>-	       + nla_total_size(4); /* IFA_FLAGS */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nl_fill_ifaddr(struct sk_buff *skb, struct dn_ifaddr *ifa,</div><div class='del'>-			     u32 portid, u32 seq, int event, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	struct ifaddrmsg *ifm;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	u32 ifa_flags = ifa-&gt;ifa_flags | IFA_F_PERMANENT;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*ifm), flags);</div><div class='del'>-	if (nlh == NULL)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='del'>-	ifm-&gt;ifa_family = AF_DECnet;</div><div class='del'>-	ifm-&gt;ifa_prefixlen = 16;</div><div class='del'>-	ifm-&gt;ifa_flags = ifa_flags;</div><div class='del'>-	ifm-&gt;ifa_scope = ifa-&gt;ifa_scope;</div><div class='del'>-	ifm-&gt;ifa_index = ifa-&gt;ifa_dev-&gt;dev-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	if ((ifa-&gt;ifa_address &amp;&amp;</div><div class='del'>-	     nla_put_le16(skb, IFA_ADDRESS, ifa-&gt;ifa_address)) ||</div><div class='del'>-	    (ifa-&gt;ifa_local &amp;&amp;</div><div class='del'>-	     nla_put_le16(skb, IFA_LOCAL, ifa-&gt;ifa_local)) ||</div><div class='del'>-	    (ifa-&gt;ifa_label[0] &amp;&amp;</div><div class='del'>-	     nla_put_string(skb, IFA_LABEL, ifa-&gt;ifa_label)) ||</div><div class='del'>-	     nla_put_u32(skb, IFA_FLAGS, ifa_flags))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nlmsg_cancel(skb, nlh);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int err = -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb(dn_ifaddr_nlmsg_size(), GFP_KERNEL);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = dn_nl_fill_ifaddr(skb, ifa, 0, 0, event, 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		/* -EMSGSIZE implies BUG in dn_ifaddr_nlmsg_size() */</div><div class='del'>-		WARN_ON(err == -EMSGSIZE);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	rtnl_notify(skb, &amp;init_net, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL);</div><div class='del'>-	return;</div><div class='del'>-errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(&amp;init_net, RTNLGRP_DECnet_IFADDR, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int idx, dn_idx = 0, skip_ndevs, skip_naddr;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	skip_ndevs = cb-&gt;args[0];</div><div class='del'>-	skip_naddr = cb-&gt;args[1];</div><div class='del'>-</div><div class='del'>-	idx = 0;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='del'>-		if (idx &lt; skip_ndevs)</div><div class='del'>-			goto cont;</div><div class='del'>-		else if (idx &gt; skip_ndevs) {</div><div class='del'>-			/* Only skip over addresses for first dev dumped</div><div class='del'>-			 * in this iteration (idx == skip_ndevs) */</div><div class='del'>-			skip_naddr = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((dn_db = rcu_dereference(dev-&gt;dn_ptr)) == NULL)</div><div class='del'>-			goto cont;</div><div class='del'>-</div><div class='del'>-		for (ifa = rcu_dereference(dn_db-&gt;ifa_list), dn_idx = 0; ifa;</div><div class='del'>-		     ifa = rcu_dereference(ifa-&gt;ifa_next), dn_idx++) {</div><div class='del'>-			if (dn_idx &lt; skip_naddr)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					      cb-&gt;nlh-&gt;nlmsg_seq, RTM_NEWADDR,</div><div class='del'>-					      NLM_F_MULTI) &lt; 0)</div><div class='del'>-				goto done;</div><div class='del'>-		}</div><div class='del'>-cont:</div><div class='del'>-		idx++;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	cb-&gt;args[0] = idx;</div><div class='del'>-	cb-&gt;args[1] = dn_idx;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_dev_get_first(struct net_device *dev, __le16 *addr)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-	int rv = -ENODEV;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dn_db = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	if (dn_db == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ifa = rcu_dereference(dn_db-&gt;ifa_list);</div><div class='del'>-	if (ifa != NULL) {</div><div class='del'>-		*addr = ifa-&gt;ifa_local;</div><div class='del'>-		rv = 0;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find a default address to bind to.</div><div class='del'>- *</div><div class='del'>- * This is one of those areas where the initial VMS concepts don't really</div><div class='del'>- * map onto the Linux concepts, and since we introduced multiple addresses</div><div class='del'>- * per interface we have to cope with slightly odd ways of finding out what</div><div class='del'>- * "our address" really is. Mostly it's not a problem; for this we just guess</div><div class='del'>- * a sensible default. Eventually the routing code will take care of all the</div><div class='del'>- * nasties for us I hope.</div><div class='del'>- */</div><div class='del'>-int dn_dev_bind_default(__le16 *addr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int rv;</div><div class='del'>-	dev = dn_dev_get_default();</div><div class='del'>-last_chance:</div><div class='del'>-	if (dev) {</div><div class='del'>-		rv = dn_dev_get_first(dev, addr);</div><div class='del'>-		dev_put(dev);</div><div class='del'>-		if (rv == 0 || dev == init_net.loopback_dev)</div><div class='del'>-			return rv;</div><div class='del'>-	}</div><div class='del'>-	dev = init_net.loopback_dev;</div><div class='del'>-	dev_hold(dev);</div><div class='del'>-	goto last_chance;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct endnode_hello_message *msg;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	__le16 *pktlen;</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	msg = skb_put(skb, sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	msg-&gt;msgflg  = 0x0D;</div><div class='del'>-	memcpy(msg-&gt;tiver, dn_eco_version, 3);</div><div class='del'>-	dn_dn2eth(msg-&gt;id, ifa-&gt;ifa_local);</div><div class='del'>-	msg-&gt;iinfo   = DN_RT_INFO_ENDN;</div><div class='del'>-	msg-&gt;blksize = cpu_to_le16(mtu2blksize(dev));</div><div class='del'>-	msg-&gt;area    = 0x00;</div><div class='del'>-	memset(msg-&gt;seed, 0, 8);</div><div class='del'>-	memcpy(msg-&gt;neighbor, dn_hiord, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;router) {</div><div class='del'>-		struct dn_neigh *dn = (struct dn_neigh *)dn_db-&gt;router;</div><div class='del'>-		dn_dn2eth(msg-&gt;neighbor, dn-&gt;addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg-&gt;timer   = cpu_to_le16((unsigned short)dn_db-&gt;parms.t3);</div><div class='del'>-	msg-&gt;mpd     = 0x00;</div><div class='del'>-	msg-&gt;datalen = 0x02;</div><div class='del'>-	memset(msg-&gt;data, 0xAA, 2);</div><div class='del'>-</div><div class='del'>-	pktlen = skb_push(skb, 2);</div><div class='del'>-	*pktlen = cpu_to_le16(skb-&gt;len - 2);</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	dn_rt_finish_output(skb, dn_rt_all_rt_mcast, msg-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DRDELAY (5 * HZ)</div><div class='del'>-</div><div class='del'>-static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	/* First check time since device went up */</div><div class='del'>-	if (time_before(jiffies, dn_db-&gt;uptime + DRDELAY))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* If there is no router, then yes... */</div><div class='del'>-	if (!dn_db-&gt;router)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* otherwise only if we have a higher priority or.. */</div><div class='del'>-	if (dn-&gt;priority &lt; dn_db-&gt;parms.priority)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* if we have equal priority and a higher node number */</div><div class='del'>-	if (dn-&gt;priority != dn_db-&gt;parms.priority)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(dn-&gt;addr) &lt; le16_to_cpu(ifa-&gt;ifa_local))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-	struct dn_neigh *dn = (struct dn_neigh *)dn_db-&gt;router;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	size_t size;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	unsigned char *i1, *i2;</div><div class='del'>-	__le16 *pktlen;</div><div class='del'>-	char *src;</div><div class='del'>-</div><div class='del'>-	if (mtu2blksize(dev) &lt; (26 + 7))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	n = mtu2blksize(dev) - 26;</div><div class='del'>-	n /= 7;</div><div class='del'>-</div><div class='del'>-	if (n &gt; 32)</div><div class='del'>-		n = 32;</div><div class='del'>-</div><div class='del'>-	size = 2 + 26 + 7 * n;</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(NULL, size, GFP_ATOMIC)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	ptr = skb_put(skb, size);</div><div class='del'>-</div><div class='del'>-	*ptr++ = DN_RT_PKT_CNTL | DN_RT_PKT_ERTH;</div><div class='del'>-	*ptr++ = 2; /* ECO */</div><div class='del'>-	*ptr++ = 0;</div><div class='del'>-	*ptr++ = 0;</div><div class='del'>-	dn_dn2eth(ptr, ifa-&gt;ifa_local);</div><div class='del'>-	src = ptr;</div><div class='del'>-	ptr += ETH_ALEN;</div><div class='del'>-	*ptr++ = dn_db-&gt;parms.forwarding == 1 ?</div><div class='del'>-			DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;</div><div class='del'>-	*((__le16 *)ptr) = cpu_to_le16(mtu2blksize(dev));</div><div class='del'>-	ptr += 2;</div><div class='del'>-	*ptr++ = dn_db-&gt;parms.priority; /* Priority */</div><div class='del'>-	*ptr++ = 0; /* Area: Reserved */</div><div class='del'>-	*((__le16 *)ptr) = cpu_to_le16((unsigned short)dn_db-&gt;parms.t3);</div><div class='del'>-	ptr += 2;</div><div class='del'>-	*ptr++ = 0; /* MPD: Reserved */</div><div class='del'>-	i1 = ptr++;</div><div class='del'>-	memset(ptr, 0, 7); /* Name: Reserved */</div><div class='del'>-	ptr += 7;</div><div class='del'>-	i2 = ptr++;</div><div class='del'>-</div><div class='del'>-	n = dn_neigh_elist(dev, ptr, n);</div><div class='del'>-</div><div class='del'>-	*i2 = 7 * n;</div><div class='del'>-	*i1 = 8 + *i2;</div><div class='del'>-</div><div class='del'>-	skb_trim(skb, (27 + *i2));</div><div class='del'>-</div><div class='del'>-	pktlen = skb_push(skb, 2);</div><div class='del'>-	*pktlen = cpu_to_le16(skb-&gt;len - 2);</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	if (dn_am_i_a_router(dn, dn_db, ifa)) {</div><div class='del'>-		struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC);</div><div class='del'>-		if (skb2) {</div><div class='del'>-			dn_rt_finish_output(skb2, dn_rt_all_end_mcast, src);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_rt_finish_output(skb, dn_rt_all_rt_mcast, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_send_brd_hello(struct net_device *dev, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.forwarding == 0)</div><div class='del'>-		dn_send_endnode_hello(dev, ifa);</div><div class='del'>-	else</div><div class='del'>-		dn_send_router_hello(dev, ifa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_send_ptp_hello(struct net_device *dev, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	int tdlen = 16;</div><div class='del'>-	int size = dev-&gt;hard_header_len + 2 + 4 + tdlen;</div><div class='del'>-	struct sk_buff *skb = dn_alloc_skb(NULL, size, GFP_ATOMIC);</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	char src[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return ;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb_push(skb, dev-&gt;hard_header_len);</div><div class='del'>-	ptr = skb_put(skb, 2 + 4 + tdlen);</div><div class='del'>-</div><div class='del'>-	*ptr++ = DN_RT_PKT_HELO;</div><div class='del'>-	*((__le16 *)ptr) = ifa-&gt;ifa_local;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	*ptr++ = tdlen;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; tdlen; i++)</div><div class='del'>-		*ptr++ = 0252;</div><div class='del'>-</div><div class='del'>-	dn_dn2eth(src, ifa-&gt;ifa_local);</div><div class='del'>-	dn_rt_finish_output(skb, dn_rt_all_rt_mcast, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_eth_up(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.forwarding == 0)</div><div class='del'>-		dev_mc_add(dev, dn_rt_all_end_mcast);</div><div class='del'>-	else</div><div class='del'>-		dev_mc_add(dev, dn_rt_all_rt_mcast);</div><div class='del'>-</div><div class='del'>-	dn_db-&gt;use_long = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_eth_down(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.forwarding == 0)</div><div class='del'>-		dev_mc_del(dev, dn_rt_all_end_mcast);</div><div class='del'>-	else</div><div class='del'>-		dev_mc_del(dev, dn_rt_all_rt_mcast);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_set_timer(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static void dn_dev_timer_func(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = from_timer(dn_db, t, timer);</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dev = dn_db-&gt;dev;</div><div class='del'>-	if (dn_db-&gt;t3 &lt;= dn_db-&gt;parms.t2) {</div><div class='del'>-		if (dn_db-&gt;parms.timer3) {</div><div class='del'>-			for (ifa = rcu_dereference(dn_db-&gt;ifa_list);</div><div class='del'>-			     ifa;</div><div class='del'>-			     ifa = rcu_dereference(ifa-&gt;ifa_next)) {</div><div class='del'>-				if (!(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY))</div><div class='del'>-					dn_db-&gt;parms.timer3(dev, ifa);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dn_db-&gt;t3 = dn_db-&gt;parms.t3;</div><div class='del'>-	} else {</div><div class='del'>-		dn_db-&gt;t3 -= dn_db-&gt;parms.t2;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	dn_dev_set_timer(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_set_timer(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference_raw(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.t2 &gt; dn_db-&gt;parms.t3)</div><div class='del'>-		dn_db-&gt;parms.t2 = dn_db-&gt;parms.t3;</div><div class='del'>-</div><div class='del'>-	dn_db-&gt;timer.expires = jiffies + (dn_db-&gt;parms.t2 * HZ);</div><div class='del'>-</div><div class='del'>-	add_timer(&amp;dn_db-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dn_dev *dn_dev_create(struct net_device *dev, int *err)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct dn_dev_parms *p = dn_dev_list;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; DN_DEV_LIST_SIZE; i++, p++) {</div><div class='del'>-		if (p-&gt;type == dev-&gt;type)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*err = -ENODEV;</div><div class='del'>-	if (i == DN_DEV_LIST_SIZE)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	*err = -ENOBUFS;</div><div class='del'>-	if ((dn_db = kzalloc(sizeof(struct dn_dev), GFP_ATOMIC)) == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;dn_db-&gt;parms, p, sizeof(struct dn_dev_parms));</div><div class='del'>-</div><div class='del'>-	rcu_assign_pointer(dev-&gt;dn_ptr, dn_db);</div><div class='del'>-	dn_db-&gt;dev = dev;</div><div class='del'>-	timer_setup(&amp;dn_db-&gt;timer, dn_dev_timer_func, 0);</div><div class='del'>-</div><div class='del'>-	dn_db-&gt;uptime = jiffies;</div><div class='del'>-</div><div class='del'>-	dn_db-&gt;neigh_parms = neigh_parms_alloc(dev, &amp;dn_neigh_table);</div><div class='del'>-	if (!dn_db-&gt;neigh_parms) {</div><div class='del'>-		RCU_INIT_POINTER(dev-&gt;dn_ptr, NULL);</div><div class='del'>-		kfree(dn_db);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.up) {</div><div class='del'>-		if (dn_db-&gt;parms.up(dev) &lt; 0) {</div><div class='del'>-			neigh_parms_release(&amp;dn_neigh_table, dn_db-&gt;neigh_parms);</div><div class='del'>-			dev-&gt;dn_ptr = NULL;</div><div class='del'>-			kfree(dn_db);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_dev_sysctl_register(dev, &amp;dn_db-&gt;parms);</div><div class='del'>-</div><div class='del'>-	dn_dev_set_timer(dev);</div><div class='del'>-</div><div class='del'>-	*err = 0;</div><div class='del'>-	return dn_db;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This processes a device up event. We only start up</div><div class='del'>- * the loopback device &amp; ethernet devices with correct</div><div class='del'>- * MAC addresses automatically. Others must be started</div><div class='del'>- * specifically.</div><div class='del'>- *</div><div class='del'>- * FIXME: How should we configure the loopback address ? If we could dispense</div><div class='del'>- * with using decnet_address here and for autobind, it will be one less thing</div><div class='del'>- * for users to worry about setting up.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void dn_dev_up(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-	__le16 addr = decnet_address;</div><div class='del'>-	int maybe_default = 0;</div><div class='del'>-	struct dn_dev *dn_db = rtnl_dereference(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;type != ARPHRD_ETHER) &amp;&amp; (dev-&gt;type != ARPHRD_LOOPBACK))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Need to ensure that loopback device has a dn_db attached to it</div><div class='del'>-	 * to allow creation of neighbours against it, even though it might</div><div class='del'>-	 * not have a local address of its own. Might as well do the same for</div><div class='del'>-	 * all autoconfigured interfaces.</div><div class='del'>-	 */</div><div class='del'>-	if (dn_db == NULL) {</div><div class='del'>-		int err;</div><div class='del'>-		dn_db = dn_dev_create(dev, &amp;err);</div><div class='del'>-		if (dn_db == NULL)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type == ARPHRD_ETHER) {</div><div class='del'>-		if (memcmp(dev-&gt;dev_addr, dn_hiord, 4) != 0)</div><div class='del'>-			return;</div><div class='del'>-		addr = dn_eth2dn(dev-&gt;dev_addr);</div><div class='del'>-		maybe_default = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (addr == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((ifa = dn_dev_alloc_ifa()) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ifa-&gt;ifa_local = ifa-&gt;ifa_address = addr;</div><div class='del'>-	ifa-&gt;ifa_flags = 0;</div><div class='del'>-	ifa-&gt;ifa_scope = RT_SCOPE_UNIVERSE;</div><div class='del'>-	strcpy(ifa-&gt;ifa_label, dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	dn_dev_set_ifa(dev, ifa);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Automagically set the default device to the first automatically</div><div class='del'>-	 * configured ethernet card in the system.</div><div class='del'>-	 */</div><div class='del'>-	if (maybe_default) {</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-		if (dn_dev_set_default(dev, 0))</div><div class='del'>-			dev_put(dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_delete(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rtnl_dereference(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-	if (dn_db == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;dn_db-&gt;timer);</div><div class='del'>-	dn_dev_sysctl_unregister(&amp;dn_db-&gt;parms);</div><div class='del'>-	dn_dev_check_default(dev);</div><div class='del'>-	neigh_ifdown(&amp;dn_neigh_table, dev);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;parms.down)</div><div class='del'>-		dn_db-&gt;parms.down(dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;dn_ptr = NULL;</div><div class='del'>-</div><div class='del'>-	neigh_parms_release(&amp;dn_neigh_table, dn_db-&gt;neigh_parms);</div><div class='del'>-	neigh_ifdown(&amp;dn_neigh_table, dev);</div><div class='del'>-</div><div class='del'>-	if (dn_db-&gt;router)</div><div class='del'>-		neigh_release(dn_db-&gt;router);</div><div class='del'>-	if (dn_db-&gt;peer)</div><div class='del'>-		neigh_release(dn_db-&gt;peer);</div><div class='del'>-</div><div class='del'>-	kfree(dn_db);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_down(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_dev *dn_db = rtnl_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-</div><div class='del'>-	if (dn_db == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while ((ifa = rtnl_dereference(dn_db-&gt;ifa_list)) != NULL) {</div><div class='del'>-		dn_dev_del_ifa(dn_db, &amp;dn_db-&gt;ifa_list, 0);</div><div class='del'>-		dn_dev_free_ifa(ifa);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_dev_delete(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_init_pkt(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_veri_pkt(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_hello(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_devices_off(void)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	for_each_netdev(&amp;init_net, dev)</div><div class='del'>-		dn_dev_down(dev);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_dev_devices_on(void)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	for_each_netdev(&amp;init_net, dev) {</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			dn_dev_up(dev);</div><div class='del'>-	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int register_dnaddr_notifier(struct notifier_block *nb)</div><div class='del'>-{</div><div class='del'>-	return blocking_notifier_chain_register(&amp;dnaddr_chain, nb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int unregister_dnaddr_notifier(struct notifier_block *nb)</div><div class='del'>-{</div><div class='del'>-	return blocking_notifier_chain_unregister(&amp;dnaddr_chain, nb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static inline int is_dn_dev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;dn_ptr != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-	__acquires(RCU)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	if (*pos == 0)</div><div class='del'>-		return SEQ_START_TOKEN;</div><div class='del'>-</div><div class='del'>-	i = 1;</div><div class='del'>-	for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='del'>-		if (!is_dn_dev(dev))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (i++ == *pos)</div><div class='del'>-			return dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	++*pos;</div><div class='del'>-</div><div class='del'>-	dev = v;</div><div class='del'>-	if (v == SEQ_START_TOKEN)</div><div class='del'>-		dev = net_device_entry(&amp;init_net.dev_base_head);</div><div class='del'>-</div><div class='del'>-	for_each_netdev_continue_rcu(&amp;init_net, dev) {</div><div class='del'>-		if (!is_dn_dev(dev))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		return dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dev_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-	__releases(RCU)</div><div class='del'>-{</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *dn_type2asc(char type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case DN_DEV_BCAST:</div><div class='del'>-		return "B";</div><div class='del'>-	case DN_DEV_UCAST:</div><div class='del'>-		return "U";</div><div class='del'>-	case DN_DEV_MPOINT:</div><div class='del'>-		return "M";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "?";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_dev_seq_show(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	if (v == SEQ_START_TOKEN)</div><div class='del'>-		seq_puts(seq, "Name     Flags T1   Timer1 T3   Timer3 BlkSize Pri State DevType    Router Peer\n");</div><div class='del'>-	else {</div><div class='del'>-		struct net_device *dev = v;</div><div class='del'>-		char peer_buf[DN_ASCBUF_LEN];</div><div class='del'>-		char router_buf[DN_ASCBUF_LEN];</div><div class='del'>-		struct dn_dev *dn_db = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-		seq_printf(seq, "%-8s %1s     %04u %04u   %04lu %04lu"</div><div class='del'>-				"   %04hu    %03d %02x    %-10s %-7s %-7s\n",</div><div class='del'>-				dev-&gt;name ? dev-&gt;name : "???",</div><div class='del'>-				dn_type2asc(dn_db-&gt;parms.mode),</div><div class='del'>-				0, 0,</div><div class='del'>-				dn_db-&gt;t3, dn_db-&gt;parms.t3,</div><div class='del'>-				mtu2blksize(dev),</div><div class='del'>-				dn_db-&gt;parms.priority,</div><div class='del'>-				dn_db-&gt;parms.state, dn_db-&gt;parms.name,</div><div class='del'>-				dn_db-&gt;router ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db-&gt;router-&gt;primary_key), router_buf) : "",</div><div class='del'>-				dn_db-&gt;peer ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db-&gt;peer-&gt;primary_key), peer_buf) : "");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations dn_dev_seq_ops = {</div><div class='del'>-	.start	= dn_dev_seq_start,</div><div class='del'>-	.next	= dn_dev_seq_next,</div><div class='del'>-	.stop	= dn_dev_seq_stop,</div><div class='del'>-	.show	= dn_dev_seq_show,</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-static int addr[2];</div><div class='del'>-module_param_array(addr, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(addr, "The DECnet address of this machine: area,node");</div><div class='del'>-</div><div class='del'>-void __init dn_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	if (addr[0] &gt; 63 || addr[0] &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "DECnet: Area must be between 0 and 63");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (addr[1] &gt; 1023 || addr[1] &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "DECnet: Node must be between 0 and 1023");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	decnet_address = cpu_to_le16((addr[0] &lt;&lt; 10) | addr[1]);</div><div class='del'>-</div><div class='del'>-	dn_dev_devices_on();</div><div class='del'>-</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_NEWADDR,</div><div class='del'>-			     dn_nl_newaddr, NULL, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_DELADDR,</div><div class='del'>-			     dn_nl_deladdr, NULL, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_GETADDR,</div><div class='del'>-			     NULL, dn_nl_dump_ifaddr, 0);</div><div class='del'>-</div><div class='del'>-	proc_create_seq("decnet_dev", 0444, init_net.proc_net, &amp;dn_dev_seq_ops);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-		for(i = 0; i &lt; DN_DEV_LIST_SIZE; i++)</div><div class='del'>-			dn_dev_sysctl_register(NULL, &amp;dn_dev_list[i]);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_SYSCTL */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit dn_dev_cleanup(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-		for(i = 0; i &lt; DN_DEV_LIST_SIZE; i++)</div><div class='del'>-			dn_dev_sysctl_unregister(&amp;dn_dev_list[i]);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_SYSCTL */</div><div class='del'>-</div><div class='del'>-	remove_proc_entry("decnet_dev", init_net.proc_net);</div><div class='del'>-</div><div class='del'>-	dn_dev_devices_off();</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c<br/>deleted file mode 100644<br/>index f78fe58eafc8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_fib.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_fib.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,799 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Routing Forwarding Information Base (Glue/Info List)</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *              Alexey Kuznetsov : SMP locking changes</div><div class='del'>- *              Steve Whitehouse : Rewrote it... Well to be more correct, I</div><div class='del'>- *                                 copied most of it from the ipv4 fib code.</div><div class='del'>- *              Steve Whitehouse : Updated it in style and fixed a few bugs</div><div class='del'>- *                                 which were fixed in the ipv4 code since</div><div class='del'>- *                                 this code was copied from it.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/nexthop.h&gt;</div><div class='del'>-</div><div class='del'>-#define RT_MIN_TABLE 1</div><div class='del'>-</div><div class='del'>-#define for_fib_info() { struct dn_fib_info *fi;\</div><div class='del'>-	for(fi = dn_fib_info_list; fi; fi = fi-&gt;fib_next)</div><div class='del'>-#define endfor_fib_info() }</div><div class='del'>-</div><div class='del'>-#define for_nexthops(fi) { int nhsel; const struct dn_fib_nh *nh;\</div><div class='del'>-	for(nhsel = 0, nh = (fi)-&gt;fib_nh; nhsel &lt; (fi)-&gt;fib_nhs; nh++, nhsel++)</div><div class='del'>-</div><div class='del'>-#define change_nexthops(fi) { int nhsel; struct dn_fib_nh *nh;\</div><div class='del'>-	for(nhsel = 0, nh = (struct dn_fib_nh *)((fi)-&gt;fib_nh); nhsel &lt; (fi)-&gt;fib_nhs; nh++, nhsel++)</div><div class='del'>-</div><div class='del'>-#define endfor_nexthops(fi) }</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(dn_fib_multipath_lock);</div><div class='del'>-static struct dn_fib_info *dn_fib_info_list;</div><div class='del'>-static DEFINE_SPINLOCK(dn_fib_info_lock);</div><div class='del'>-</div><div class='del'>-static struct</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	u8 scope;</div><div class='del'>-} dn_fib_props[RTN_MAX+1] = {</div><div class='del'>-	[RTN_UNSPEC] =      { .error = 0,       .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-	[RTN_UNICAST] =     { .error = 0,       .scope = RT_SCOPE_UNIVERSE },</div><div class='del'>-	[RTN_LOCAL] =       { .error = 0,       .scope = RT_SCOPE_HOST },</div><div class='del'>-	[RTN_BROADCAST] =   { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-	[RTN_ANYCAST] =     { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-	[RTN_MULTICAST] =   { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-	[RTN_BLACKHOLE] =   { .error = -EINVAL, .scope = RT_SCOPE_UNIVERSE },</div><div class='del'>-	[RTN_UNREACHABLE] = { .error = -EHOSTUNREACH, .scope = RT_SCOPE_UNIVERSE },</div><div class='del'>-	[RTN_PROHIBIT] =    { .error = -EACCES, .scope = RT_SCOPE_UNIVERSE },</div><div class='del'>-	[RTN_THROW] =       { .error = -EAGAIN, .scope = RT_SCOPE_UNIVERSE },</div><div class='del'>-	[RTN_NAT] =         { .error = 0,       .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-	[RTN_XRESOLVE] =    { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force);</div><div class='del'>-static int dn_fib_sync_up(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-void dn_fib_free_info(struct dn_fib_info *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi-&gt;fib_dead == 0) {</div><div class='del'>-		printk(KERN_DEBUG "DECnet: BUG! Attempt to free alive dn_fib_info\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		if (nh-&gt;nh_dev)</div><div class='del'>-			dev_put(nh-&gt;nh_dev);</div><div class='del'>-		nh-&gt;nh_dev = NULL;</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-	kfree(fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_fib_release_info(struct dn_fib_info *fi)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;dn_fib_info_lock);</div><div class='del'>-	if (fi &amp;&amp; --fi-&gt;fib_treeref == 0) {</div><div class='del'>-		if (fi-&gt;fib_next)</div><div class='del'>-			fi-&gt;fib_next-&gt;fib_prev = fi-&gt;fib_prev;</div><div class='del'>-		if (fi-&gt;fib_prev)</div><div class='del'>-			fi-&gt;fib_prev-&gt;fib_next = fi-&gt;fib_next;</div><div class='del'>-		if (fi == dn_fib_info_list)</div><div class='del'>-			dn_fib_info_list = fi-&gt;fib_next;</div><div class='del'>-		fi-&gt;fib_dead = 1;</div><div class='del'>-		dn_fib_info_put(fi);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;dn_fib_info_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_fib_nh_comp(const struct dn_fib_info *fi, const struct dn_fib_info *ofi)</div><div class='del'>-{</div><div class='del'>-	const struct dn_fib_nh *onh = ofi-&gt;fib_nh;</div><div class='del'>-</div><div class='del'>-	for_nexthops(fi) {</div><div class='del'>-		if (nh-&gt;nh_oif != onh-&gt;nh_oif ||</div><div class='del'>-			nh-&gt;nh_gw != onh-&gt;nh_gw ||</div><div class='del'>-			nh-&gt;nh_scope != onh-&gt;nh_scope ||</div><div class='del'>-			nh-&gt;nh_weight != onh-&gt;nh_weight ||</div><div class='del'>-			((nh-&gt;nh_flags^onh-&gt;nh_flags)&amp;~RTNH_F_DEAD))</div><div class='del'>-				return -1;</div><div class='del'>-		onh++;</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dn_fib_info *dn_fib_find_info(const struct dn_fib_info *nfi)</div><div class='del'>-{</div><div class='del'>-	for_fib_info() {</div><div class='del'>-		if (fi-&gt;fib_nhs != nfi-&gt;fib_nhs)</div><div class='del'>-			continue;</div><div class='del'>-		if (nfi-&gt;fib_protocol == fi-&gt;fib_protocol &amp;&amp;</div><div class='del'>-			nfi-&gt;fib_prefsrc == fi-&gt;fib_prefsrc &amp;&amp;</div><div class='del'>-			nfi-&gt;fib_priority == fi-&gt;fib_priority &amp;&amp;</div><div class='del'>-			memcmp(nfi-&gt;fib_metrics, fi-&gt;fib_metrics, sizeof(fi-&gt;fib_metrics)) == 0 &amp;&amp;</div><div class='del'>-			((nfi-&gt;fib_flags^fi-&gt;fib_flags)&amp;~RTNH_F_DEAD) == 0 &amp;&amp;</div><div class='del'>-			(nfi-&gt;fib_nhs == 0 || dn_fib_nh_comp(fi, nfi) == 0))</div><div class='del'>-				return fi;</div><div class='del'>-	} endfor_fib_info();</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_count_nhs(const struct nlattr *attr)</div><div class='del'>-{</div><div class='del'>-	struct rtnexthop *nhp = nla_data(attr);</div><div class='del'>-	int nhs = 0, nhlen = nla_len(attr);</div><div class='del'>-</div><div class='del'>-	while (rtnh_ok(nhp, nhlen)) {</div><div class='del'>-		nhs++;</div><div class='del'>-		nhp = rtnh_next(nhp, &amp;nhlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* leftover implies invalid nexthop configuration, discard it */</div><div class='del'>-	return nhlen &gt; 0 ? 0 : nhs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_get_nhs(struct dn_fib_info *fi, const struct nlattr *attr,</div><div class='del'>-			  const struct rtmsg *r)</div><div class='del'>-{</div><div class='del'>-	struct rtnexthop *nhp = nla_data(attr);</div><div class='del'>-	int nhlen = nla_len(attr);</div><div class='del'>-</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		int attrlen;</div><div class='del'>-</div><div class='del'>-		if (!rtnh_ok(nhp, nhlen))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		nh-&gt;nh_flags  = (r-&gt;rtm_flags&amp;~0xFF) | nhp-&gt;rtnh_flags;</div><div class='del'>-		nh-&gt;nh_oif    = nhp-&gt;rtnh_ifindex;</div><div class='del'>-		nh-&gt;nh_weight = nhp-&gt;rtnh_hops + 1;</div><div class='del'>-</div><div class='del'>-		attrlen = rtnh_attrlen(nhp);</div><div class='del'>-		if (attrlen &gt; 0) {</div><div class='del'>-			struct nlattr *gw_attr;</div><div class='del'>-</div><div class='del'>-			gw_attr = nla_find((struct nlattr *) (nhp + 1), attrlen, RTA_GATEWAY);</div><div class='del'>-			nh-&gt;nh_gw = gw_attr ? nla_get_le16(gw_attr) : 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		nhp = rtnh_next(nhp, &amp;nhlen);</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_fib_check_nh(const struct rtmsg *r, struct dn_fib_info *fi, struct dn_fib_nh *nh)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (nh-&gt;nh_gw) {</div><div class='del'>-		struct flowidn fld;</div><div class='del'>-		struct dn_fib_res res;</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_flags&amp;RTNH_F_ONLINK) {</div><div class='del'>-			struct net_device *dev;</div><div class='del'>-</div><div class='del'>-			if (r-&gt;rtm_scope &gt;= RT_SCOPE_LINK)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (dnet_addr_type(nh-&gt;nh_gw) != RTN_UNICAST)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if ((dev = __dev_get_by_index(&amp;init_net, nh-&gt;nh_oif)) == NULL)</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			if (!(dev-&gt;flags&amp;IFF_UP))</div><div class='del'>-				return -ENETDOWN;</div><div class='del'>-			nh-&gt;nh_dev = dev;</div><div class='del'>-			dev_hold(dev);</div><div class='del'>-			nh-&gt;nh_scope = RT_SCOPE_LINK;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memset(&amp;fld, 0, sizeof(fld));</div><div class='del'>-		fld.daddr = nh-&gt;nh_gw;</div><div class='del'>-		fld.flowidn_oif = nh-&gt;nh_oif;</div><div class='del'>-		fld.flowidn_scope = r-&gt;rtm_scope + 1;</div><div class='del'>-</div><div class='del'>-		if (fld.flowidn_scope &lt; RT_SCOPE_LINK)</div><div class='del'>-			fld.flowidn_scope = RT_SCOPE_LINK;</div><div class='del'>-</div><div class='del'>-		if ((err = dn_fib_lookup(&amp;fld, &amp;res)) != 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (res.type != RTN_UNICAST &amp;&amp; res.type != RTN_LOCAL)</div><div class='del'>-			goto out;</div><div class='del'>-		nh-&gt;nh_scope = res.scope;</div><div class='del'>-		nh-&gt;nh_oif = DN_FIB_RES_OIF(res);</div><div class='del'>-		nh-&gt;nh_dev = DN_FIB_RES_DEV(res);</div><div class='del'>-		if (nh-&gt;nh_dev == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-		dev_hold(nh-&gt;nh_dev);</div><div class='del'>-		err = -ENETDOWN;</div><div class='del'>-		if (!(nh-&gt;nh_dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-			goto out;</div><div class='del'>-		err = 0;</div><div class='del'>-out:</div><div class='del'>-		dn_fib_res_put(&amp;res);</div><div class='del'>-		return err;</div><div class='del'>-	} else {</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_flags&amp;(RTNH_F_PERVASIVE|RTNH_F_ONLINK))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		dev = __dev_get_by_index(&amp;init_net, nh-&gt;nh_oif);</div><div class='del'>-		if (dev == NULL || dev-&gt;dn_ptr == NULL)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		if (!(dev-&gt;flags&amp;IFF_UP))</div><div class='del'>-			return -ENETDOWN;</div><div class='del'>-		nh-&gt;nh_dev = dev;</div><div class='del'>-		dev_hold(nh-&gt;nh_dev);</div><div class='del'>-		nh-&gt;nh_scope = RT_SCOPE_HOST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, struct nlattr *attrs[],</div><div class='del'>-				       const struct nlmsghdr *nlh, int *errp)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct dn_fib_info *fi = NULL;</div><div class='del'>-	struct dn_fib_info *ofi;</div><div class='del'>-	int nhs = 1;</div><div class='del'>-</div><div class='del'>-	if (r-&gt;rtm_type &gt; RTN_MAX)</div><div class='del'>-		goto err_inval;</div><div class='del'>-</div><div class='del'>-	if (dn_fib_props[r-&gt;rtm_type].scope &gt; r-&gt;rtm_scope)</div><div class='del'>-		goto err_inval;</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_MULTIPATH] &amp;&amp;</div><div class='del'>-	    (nhs = dn_fib_count_nhs(attrs[RTA_MULTIPATH])) == 0)</div><div class='del'>-		goto err_inval;</div><div class='del'>-</div><div class='del'>-	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct dn_fib_nh), GFP_KERNEL);</div><div class='del'>-	err = -ENOBUFS;</div><div class='del'>-	if (fi == NULL)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	fi-&gt;fib_protocol = r-&gt;rtm_protocol;</div><div class='del'>-	fi-&gt;fib_nhs = nhs;</div><div class='del'>-	fi-&gt;fib_flags = r-&gt;rtm_flags;</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_PRIORITY])</div><div class='del'>-		fi-&gt;fib_priority = nla_get_u32(attrs[RTA_PRIORITY]);</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_METRICS]) {</div><div class='del'>-		struct nlattr *attr;</div><div class='del'>-		int rem;</div><div class='del'>-</div><div class='del'>-		nla_for_each_nested(attr, attrs[RTA_METRICS], rem) {</div><div class='del'>-			int type = nla_type(attr);</div><div class='del'>-</div><div class='del'>-			if (type) {</div><div class='del'>-				if (type &gt; RTAX_MAX || type == RTAX_CC_ALGO ||</div><div class='del'>-				    nla_len(attr) &lt; 4)</div><div class='del'>-					goto err_inval;</div><div class='del'>-</div><div class='del'>-				fi-&gt;fib_metrics[type-1] = nla_get_u32(attr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_PREFSRC])</div><div class='del'>-		fi-&gt;fib_prefsrc = nla_get_le16(attrs[RTA_PREFSRC]);</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_MULTIPATH]) {</div><div class='del'>-		if ((err = dn_fib_get_nhs(fi, attrs[RTA_MULTIPATH], r)) != 0)</div><div class='del'>-			goto failure;</div><div class='del'>-</div><div class='del'>-		if (attrs[RTA_OIF] &amp;&amp;</div><div class='del'>-		    fi-&gt;fib_nh-&gt;nh_oif != nla_get_u32(attrs[RTA_OIF]))</div><div class='del'>-			goto err_inval;</div><div class='del'>-</div><div class='del'>-		if (attrs[RTA_GATEWAY] &amp;&amp;</div><div class='del'>-		    fi-&gt;fib_nh-&gt;nh_gw != nla_get_le16(attrs[RTA_GATEWAY]))</div><div class='del'>-			goto err_inval;</div><div class='del'>-	} else {</div><div class='del'>-		struct dn_fib_nh *nh = fi-&gt;fib_nh;</div><div class='del'>-</div><div class='del'>-		if (attrs[RTA_OIF])</div><div class='del'>-			nh-&gt;nh_oif = nla_get_u32(attrs[RTA_OIF]);</div><div class='del'>-</div><div class='del'>-		if (attrs[RTA_GATEWAY])</div><div class='del'>-			nh-&gt;nh_gw = nla_get_le16(attrs[RTA_GATEWAY]);</div><div class='del'>-</div><div class='del'>-		nh-&gt;nh_flags = r-&gt;rtm_flags;</div><div class='del'>-		nh-&gt;nh_weight = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r-&gt;rtm_type == RTN_NAT) {</div><div class='del'>-		if (!attrs[RTA_GATEWAY] || nhs != 1 || attrs[RTA_OIF])</div><div class='del'>-			goto err_inval;</div><div class='del'>-</div><div class='del'>-		fi-&gt;fib_nh-&gt;nh_gw = nla_get_le16(attrs[RTA_GATEWAY]);</div><div class='del'>-		goto link_it;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dn_fib_props[r-&gt;rtm_type].error) {</div><div class='del'>-		if (attrs[RTA_GATEWAY] || attrs[RTA_OIF] || attrs[RTA_MULTIPATH])</div><div class='del'>-			goto err_inval;</div><div class='del'>-</div><div class='del'>-		goto link_it;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r-&gt;rtm_scope &gt; RT_SCOPE_HOST)</div><div class='del'>-		goto err_inval;</div><div class='del'>-</div><div class='del'>-	if (r-&gt;rtm_scope == RT_SCOPE_HOST) {</div><div class='del'>-		struct dn_fib_nh *nh = fi-&gt;fib_nh;</div><div class='del'>-</div><div class='del'>-		/* Local address is added */</div><div class='del'>-		if (nhs != 1 || nh-&gt;nh_gw)</div><div class='del'>-			goto err_inval;</div><div class='del'>-		nh-&gt;nh_scope = RT_SCOPE_NOWHERE;</div><div class='del'>-		nh-&gt;nh_dev = dev_get_by_index(&amp;init_net, fi-&gt;fib_nh-&gt;nh_oif);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		if (nh-&gt;nh_dev == NULL)</div><div class='del'>-			goto failure;</div><div class='del'>-	} else {</div><div class='del'>-		change_nexthops(fi) {</div><div class='del'>-			if ((err = dn_fib_check_nh(r, fi, nh)) != 0)</div><div class='del'>-				goto failure;</div><div class='del'>-		} endfor_nexthops(fi)</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;fib_prefsrc) {</div><div class='del'>-		if (r-&gt;rtm_type != RTN_LOCAL || !attrs[RTA_DST] ||</div><div class='del'>-		    fi-&gt;fib_prefsrc != nla_get_le16(attrs[RTA_DST]))</div><div class='del'>-			if (dnet_addr_type(fi-&gt;fib_prefsrc) != RTN_LOCAL)</div><div class='del'>-				goto err_inval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-link_it:</div><div class='del'>-	if ((ofi = dn_fib_find_info(fi)) != NULL) {</div><div class='del'>-		fi-&gt;fib_dead = 1;</div><div class='del'>-		dn_fib_free_info(fi);</div><div class='del'>-		ofi-&gt;fib_treeref++;</div><div class='del'>-		return ofi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fi-&gt;fib_treeref++;</div><div class='del'>-	refcount_set(&amp;fi-&gt;fib_clntref, 1);</div><div class='del'>-	spin_lock(&amp;dn_fib_info_lock);</div><div class='del'>-	fi-&gt;fib_next = dn_fib_info_list;</div><div class='del'>-	fi-&gt;fib_prev = NULL;</div><div class='del'>-	if (dn_fib_info_list)</div><div class='del'>-		dn_fib_info_list-&gt;fib_prev = fi;</div><div class='del'>-	dn_fib_info_list = fi;</div><div class='del'>-	spin_unlock(&amp;dn_fib_info_lock);</div><div class='del'>-	return fi;</div><div class='del'>-</div><div class='del'>-err_inval:</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-</div><div class='del'>-failure:</div><div class='del'>-	*errp = err;</div><div class='del'>-	if (fi) {</div><div class='del'>-		fi-&gt;fib_dead = 1;</div><div class='del'>-		dn_fib_free_info(fi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowidn *fld, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	int err = dn_fib_props[type].error;</div><div class='del'>-</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		if (fi-&gt;fib_flags &amp; RTNH_F_DEAD)</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		res-&gt;fi = fi;</div><div class='del'>-</div><div class='del'>-		switch (type) {</div><div class='del'>-		case RTN_NAT:</div><div class='del'>-			DN_FIB_RES_RESET(*res);</div><div class='del'>-			refcount_inc(&amp;fi-&gt;fib_clntref);</div><div class='del'>-			return 0;</div><div class='del'>-		case RTN_UNICAST:</div><div class='del'>-		case RTN_LOCAL:</div><div class='del'>-			for_nexthops(fi) {</div><div class='del'>-				if (nh-&gt;nh_flags &amp; RTNH_F_DEAD)</div><div class='del'>-					continue;</div><div class='del'>-				if (!fld-&gt;flowidn_oif ||</div><div class='del'>-				    fld-&gt;flowidn_oif == nh-&gt;nh_oif)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (nhsel &lt; fi-&gt;fib_nhs) {</div><div class='del'>-				res-&gt;nh_sel = nhsel;</div><div class='del'>-				refcount_inc(&amp;fi-&gt;fib_clntref);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			endfor_nexthops(fi);</div><div class='del'>-			res-&gt;fi = NULL;</div><div class='del'>-			return 1;</div><div class='del'>-		default:</div><div class='del'>-			net_err_ratelimited("DECnet: impossible routing event : dn_fib_semantic_match type=%d\n",</div><div class='del'>-					    type);</div><div class='del'>-			res-&gt;fi = NULL;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_fib_select_multipath(const struct flowidn *fld, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_info *fi = res-&gt;fi;</div><div class='del'>-	int w;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-	if (fi-&gt;fib_power &lt;= 0) {</div><div class='del'>-		int power = 0;</div><div class='del'>-		change_nexthops(fi) {</div><div class='del'>-			if (!(nh-&gt;nh_flags&amp;RTNH_F_DEAD)) {</div><div class='del'>-				power += nh-&gt;nh_weight;</div><div class='del'>-				nh-&gt;nh_power = nh-&gt;nh_weight;</div><div class='del'>-			}</div><div class='del'>-		} endfor_nexthops(fi);</div><div class='del'>-		fi-&gt;fib_power = power;</div><div class='del'>-		if (power &lt; 0) {</div><div class='del'>-			spin_unlock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-			res-&gt;nh_sel = 0;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	w = jiffies % fi-&gt;fib_power;</div><div class='del'>-</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		if (!(nh-&gt;nh_flags&amp;RTNH_F_DEAD) &amp;&amp; nh-&gt;nh_power) {</div><div class='del'>-			if ((w -= nh-&gt;nh_power) &lt;= 0) {</div><div class='del'>-				nh-&gt;nh_power--;</div><div class='del'>-				fi-&gt;fib_power--;</div><div class='del'>-				res-&gt;nh_sel = nhsel;</div><div class='del'>-				spin_unlock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-	res-&gt;nh_sel = 0;</div><div class='del'>-	spin_unlock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 rtm_get_table(struct nlattr *attrs[], u8 table)</div><div class='del'>-{</div><div class='del'>-	if (attrs[RTA_TABLE])</div><div class='del'>-		table = nla_get_u32(attrs[RTA_TABLE]);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct dn_fib_table *tb;</div><div class='del'>-	struct rtmsg *r = nlmsg_data(nlh);</div><div class='del'>-	struct nlattr *attrs[RTA_MAX+1];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,</div><div class='del'>-			  extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	tb = dn_fib_get_table(rtm_get_table(attrs, r-&gt;rtm_table), 0);</div><div class='del'>-	if (!tb)</div><div class='del'>-		return -ESRCH;</div><div class='del'>-</div><div class='del'>-	return tb-&gt;delete(tb, r, attrs, nlh, &amp;NETLINK_CB(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='del'>-			       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct dn_fib_table *tb;</div><div class='del'>-	struct rtmsg *r = nlmsg_data(nlh);</div><div class='del'>-	struct nlattr *attrs[RTA_MAX+1];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,</div><div class='del'>-			  extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	tb = dn_fib_get_table(rtm_get_table(attrs, r-&gt;rtm_table), 1);</div><div class='del'>-	if (!tb)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	return tb-&gt;insert(tb, r, attrs, nlh, &amp;NETLINK_CB(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fib_magic(int cmd, int type, __le16 dst, int dst_len, struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_table *tb;</div><div class='del'>-	struct {</div><div class='del'>-		struct nlmsghdr nlh;</div><div class='del'>-		struct rtmsg rtm;</div><div class='del'>-	} req;</div><div class='del'>-	struct {</div><div class='del'>-		struct nlattr hdr;</div><div class='del'>-		__le16 dst;</div><div class='del'>-	} dst_attr = {</div><div class='del'>-		.dst = dst,</div><div class='del'>-	};</div><div class='del'>-	struct {</div><div class='del'>-		struct nlattr hdr;</div><div class='del'>-		__le16 prefsrc;</div><div class='del'>-	} prefsrc_attr = {</div><div class='del'>-		.prefsrc = ifa-&gt;ifa_local,</div><div class='del'>-	};</div><div class='del'>-	struct {</div><div class='del'>-		struct nlattr hdr;</div><div class='del'>-		u32 oif;</div><div class='del'>-	} oif_attr = {</div><div class='del'>-		.oif = ifa-&gt;ifa_dev-&gt;dev-&gt;ifindex,</div><div class='del'>-	};</div><div class='del'>-	struct nlattr *attrs[RTA_MAX+1] = {</div><div class='del'>-		[RTA_DST] = (struct nlattr *) &amp;dst_attr,</div><div class='del'>-		[RTA_PREFSRC] = (struct nlattr * ) &amp;prefsrc_attr,</div><div class='del'>-		[RTA_OIF] = (struct nlattr *) &amp;oif_attr,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	memset(&amp;req.rtm, 0, sizeof(req.rtm));</div><div class='del'>-</div><div class='del'>-	if (type == RTN_UNICAST)</div><div class='del'>-		tb = dn_fib_get_table(RT_MIN_TABLE, 1);</div><div class='del'>-	else</div><div class='del'>-		tb = dn_fib_get_table(RT_TABLE_LOCAL, 1);</div><div class='del'>-</div><div class='del'>-	if (tb == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	req.nlh.nlmsg_len = sizeof(req);</div><div class='del'>-	req.nlh.nlmsg_type = cmd;</div><div class='del'>-	req.nlh.nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE|NLM_F_APPEND;</div><div class='del'>-	req.nlh.nlmsg_pid = 0;</div><div class='del'>-	req.nlh.nlmsg_seq = 0;</div><div class='del'>-</div><div class='del'>-	req.rtm.rtm_dst_len = dst_len;</div><div class='del'>-	req.rtm.rtm_table = tb-&gt;n;</div><div class='del'>-	req.rtm.rtm_protocol = RTPROT_KERNEL;</div><div class='del'>-	req.rtm.rtm_scope = (type != RTN_LOCAL ? RT_SCOPE_LINK : RT_SCOPE_HOST);</div><div class='del'>-	req.rtm.rtm_type = type;</div><div class='del'>-</div><div class='del'>-	if (cmd == RTM_NEWROUTE)</div><div class='del'>-		tb-&gt;insert(tb, &amp;req.rtm, attrs, &amp;req.nlh, NULL);</div><div class='del'>-	else</div><div class='del'>-		tb-&gt;delete(tb, &amp;req.rtm, attrs, &amp;req.nlh, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_fib_add_ifaddr(struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	fib_magic(RTM_NEWROUTE, RTN_LOCAL, ifa-&gt;ifa_local, 16, ifa);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (!(dev-&gt;flags&amp;IFF_UP))</div><div class='del'>-		return;</div><div class='del'>-	/* In the future, we will want to add default routes here */</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)</div><div class='del'>-{</div><div class='del'>-	int found_it = 0;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct dn_ifaddr *ifa2;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	/* Scan device list */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='del'>-		dn_db = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-		if (dn_db == NULL)</div><div class='del'>-			continue;</div><div class='del'>-		for (ifa2 = rcu_dereference(dn_db-&gt;ifa_list);</div><div class='del'>-		     ifa2 != NULL;</div><div class='del'>-		     ifa2 = rcu_dereference(ifa2-&gt;ifa_next)) {</div><div class='del'>-			if (ifa2-&gt;ifa_local == ifa-&gt;ifa_local) {</div><div class='del'>-				found_it = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (found_it == 0) {</div><div class='del'>-		fib_magic(RTM_DELROUTE, RTN_LOCAL, ifa-&gt;ifa_local, 16, ifa);</div><div class='del'>-</div><div class='del'>-		if (dnet_addr_type(ifa-&gt;ifa_local) != RTN_LOCAL) {</div><div class='del'>-			if (dn_fib_sync_down(ifa-&gt;ifa_local, NULL, 0))</div><div class='del'>-				dn_fib_flush();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_fib_disable_addr(struct net_device *dev, int force)</div><div class='del'>-{</div><div class='del'>-	if (dn_fib_sync_down(0, dev, force))</div><div class='del'>-		dn_fib_flush();</div><div class='del'>-	dn_rt_cache_flush(0);</div><div class='del'>-	neigh_ifdown(&amp;dn_neigh_table, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct dn_ifaddr *ifa = (struct dn_ifaddr *)ptr;</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case NETDEV_UP:</div><div class='del'>-		dn_fib_add_ifaddr(ifa);</div><div class='del'>-		dn_fib_sync_up(ifa-&gt;ifa_dev-&gt;dev);</div><div class='del'>-		dn_rt_cache_flush(-1);</div><div class='del'>-		break;</div><div class='del'>-	case NETDEV_DOWN:</div><div class='del'>-		dn_fib_del_ifaddr(ifa);</div><div class='del'>-		if (ifa-&gt;ifa_dev &amp;&amp; ifa-&gt;ifa_dev-&gt;ifa_list == NULL) {</div><div class='del'>-			dn_fib_disable_addr(ifa-&gt;ifa_dev-&gt;dev, 1);</div><div class='del'>-		} else {</div><div class='del'>-			dn_rt_cache_flush(-1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int scope = RT_SCOPE_NOWHERE;</div><div class='del'>-</div><div class='del'>-	if (force)</div><div class='del'>-		scope = -1;</div><div class='del'>-</div><div class='del'>-	for_fib_info() {</div><div class='del'>-		/*</div><div class='del'>-		 * This makes no sense for DECnet.... we will almost</div><div class='del'>-		 * certainly have more than one local address the same</div><div class='del'>-		 * over all our interfaces. It needs thinking about</div><div class='del'>-		 * some more.</div><div class='del'>-		 */</div><div class='del'>-		if (local &amp;&amp; fi-&gt;fib_prefsrc == local) {</div><div class='del'>-			fi-&gt;fib_flags |= RTNH_F_DEAD;</div><div class='del'>-			ret++;</div><div class='del'>-		} else if (dev &amp;&amp; fi-&gt;fib_nhs) {</div><div class='del'>-			int dead = 0;</div><div class='del'>-</div><div class='del'>-			change_nexthops(fi) {</div><div class='del'>-				if (nh-&gt;nh_flags&amp;RTNH_F_DEAD)</div><div class='del'>-					dead++;</div><div class='del'>-				else if (nh-&gt;nh_dev == dev &amp;&amp;</div><div class='del'>-						nh-&gt;nh_scope != scope) {</div><div class='del'>-					spin_lock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-					nh-&gt;nh_flags |= RTNH_F_DEAD;</div><div class='del'>-					fi-&gt;fib_power -= nh-&gt;nh_power;</div><div class='del'>-					nh-&gt;nh_power = 0;</div><div class='del'>-					spin_unlock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-					dead++;</div><div class='del'>-				}</div><div class='del'>-			} endfor_nexthops(fi)</div><div class='del'>-			if (dead == fi-&gt;fib_nhs) {</div><div class='del'>-				fi-&gt;fib_flags |= RTNH_F_DEAD;</div><div class='del'>-				ret++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} endfor_fib_info();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_fib_sync_up(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;flags&amp;IFF_UP))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for_fib_info() {</div><div class='del'>-		int alive = 0;</div><div class='del'>-</div><div class='del'>-		change_nexthops(fi) {</div><div class='del'>-			if (!(nh-&gt;nh_flags&amp;RTNH_F_DEAD)) {</div><div class='del'>-				alive++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (nh-&gt;nh_dev == NULL || !(nh-&gt;nh_dev-&gt;flags&amp;IFF_UP))</div><div class='del'>-				continue;</div><div class='del'>-			if (nh-&gt;nh_dev != dev || dev-&gt;dn_ptr == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			alive++;</div><div class='del'>-			spin_lock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-			nh-&gt;nh_power = 0;</div><div class='del'>-			nh-&gt;nh_flags &amp;= ~RTNH_F_DEAD;</div><div class='del'>-			spin_unlock_bh(&amp;dn_fib_multipath_lock);</div><div class='del'>-		} endfor_nexthops(fi);</div><div class='del'>-</div><div class='del'>-		if (alive &gt; 0) {</div><div class='del'>-			fi-&gt;fib_flags &amp;= ~RTNH_F_DEAD;</div><div class='del'>-			ret++;</div><div class='del'>-		}</div><div class='del'>-	} endfor_fib_info();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block dn_fib_dnaddr_notifier = {</div><div class='del'>-	.notifier_call = dn_fib_dnaddr_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __exit dn_fib_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	dn_fib_table_cleanup();</div><div class='del'>-	dn_fib_rules_cleanup();</div><div class='del'>-</div><div class='del'>-	unregister_dnaddr_notifier(&amp;dn_fib_dnaddr_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void __init dn_fib_init(void)</div><div class='del'>-{</div><div class='del'>-	dn_fib_table_init();</div><div class='del'>-	dn_fib_rules_init();</div><div class='del'>-</div><div class='del'>-	register_dnaddr_notifier(&amp;dn_fib_dnaddr_notifier);</div><div class='del'>-</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_NEWROUTE,</div><div class='del'>-			     dn_fib_rtm_newroute, NULL, 0);</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_DELROUTE,</div><div class='del'>-			     dn_fib_rtm_delroute, NULL, 0);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c<br/>deleted file mode 100644<br/>index 94b306f6d551..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_neigh.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_neigh.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,605 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Neighbour Functions (Adjacency Database and</div><div class='del'>- *                                                        On-Ethernet Cache)</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *     Steve Whitehouse     : Fixed router listing routine</div><div class='del'>- *     Steve Whitehouse     : Added error_report functions</div><div class='del'>- *     Steve Whitehouse     : Added default router detection</div><div class='del'>- *     Steve Whitehouse     : Hop counts in outgoing messages</div><div class='del'>- *     Steve Whitehouse     : Fixed src/dst in outgoing messages so</div><div class='del'>- *                            forwarding now stands a good chance of</div><div class='del'>- *                            working.</div><div class='del'>- *     Steve Whitehouse     : Fixed neighbour states (for now anyway).</div><div class='del'>- *     Steve Whitehouse     : Made error_report functions dummies. This</div><div class='del'>- *                            is not the right place to return skbs.</div><div class='del'>- *     Steve Whitehouse     : Convert to seq_file</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_decnet.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/jhash.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-static int dn_neigh_construct(struct neighbour *);</div><div class='del'>-static void dn_neigh_error_report(struct neighbour *, struct sk_buff *);</div><div class='del'>-static int dn_neigh_output(struct neighbour *neigh, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Operations for adding the link layer header.</div><div class='del'>- */</div><div class='del'>-static const struct neigh_ops dn_neigh_ops = {</div><div class='del'>-	.family =		AF_DECnet,</div><div class='del'>-	.error_report =		dn_neigh_error_report,</div><div class='del'>-	.output =		dn_neigh_output,</div><div class='del'>-	.connected_output =	dn_neigh_output,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 dn_neigh_hash(const void *pkey,</div><div class='del'>-			 const struct net_device *dev,</div><div class='del'>-			 __u32 *hash_rnd)</div><div class='del'>-{</div><div class='del'>-	return jhash_2words(*(__u16 *)pkey, 0, hash_rnd[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dn_key_eq(const struct neighbour *neigh, const void *pkey)</div><div class='del'>-{</div><div class='del'>-	return neigh_key_eq16(neigh, pkey);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct neigh_table dn_neigh_table = {</div><div class='del'>-	.family =			PF_DECnet,</div><div class='del'>-	.entry_size =			NEIGH_ENTRY_SIZE(sizeof(struct dn_neigh)),</div><div class='del'>-	.key_len =			sizeof(__le16),</div><div class='del'>-	.protocol =			cpu_to_be16(ETH_P_DNA_RT),</div><div class='del'>-	.hash =				dn_neigh_hash,</div><div class='del'>-	.key_eq =			dn_key_eq,</div><div class='del'>-	.constructor =			dn_neigh_construct,</div><div class='del'>-	.id =				"dn_neigh_cache",</div><div class='del'>-	.parms ={</div><div class='del'>-		.tbl =			&amp;dn_neigh_table,</div><div class='del'>-		.reachable_time =	30 * HZ,</div><div class='del'>-		.data = {</div><div class='del'>-			[NEIGH_VAR_MCAST_PROBES] = 0,</div><div class='del'>-			[NEIGH_VAR_UCAST_PROBES] = 0,</div><div class='del'>-			[NEIGH_VAR_APP_PROBES] = 0,</div><div class='del'>-			[NEIGH_VAR_RETRANS_TIME] = 1 * HZ,</div><div class='del'>-			[NEIGH_VAR_BASE_REACHABLE_TIME] = 30 * HZ,</div><div class='del'>-			[NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ,</div><div class='del'>-			[NEIGH_VAR_GC_STALETIME] = 60 * HZ,</div><div class='del'>-			[NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX,</div><div class='del'>-			[NEIGH_VAR_PROXY_QLEN] = 0,</div><div class='del'>-			[NEIGH_VAR_ANYCAST_DELAY] = 0,</div><div class='del'>-			[NEIGH_VAR_PROXY_DELAY] = 0,</div><div class='del'>-			[NEIGH_VAR_LOCKTIME] = 1 * HZ,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	.gc_interval =			30 * HZ,</div><div class='del'>-	.gc_thresh1 =			128,</div><div class='del'>-	.gc_thresh2 =			512,</div><div class='del'>-	.gc_thresh3 =			1024,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dn_neigh_construct(struct neighbour *neigh)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='del'>-	struct dn_neigh *dn = container_of(neigh, struct dn_neigh, n);</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct neigh_parms *parms;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dn_db = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	if (dn_db == NULL) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parms = dn_db-&gt;neigh_parms;</div><div class='del'>-	if (!parms) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__neigh_parms_put(neigh-&gt;parms);</div><div class='del'>-	neigh-&gt;parms = neigh_parms_clone(parms);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	neigh-&gt;ops = &amp;dn_neigh_ops;</div><div class='del'>-	neigh-&gt;nud_state = NUD_NOARP;</div><div class='del'>-	neigh-&gt;output = neigh-&gt;ops-&gt;connected_output;</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;type == ARPHRD_IPGRE) || (dev-&gt;flags &amp; IFF_POINTOPOINT))</div><div class='del'>-		memcpy(neigh-&gt;ha, dev-&gt;broadcast, dev-&gt;addr_len);</div><div class='del'>-	else if ((dev-&gt;type == ARPHRD_ETHER) || (dev-&gt;type == ARPHRD_LOOPBACK))</div><div class='del'>-		dn_dn2eth(neigh-&gt;ha, dn-&gt;addr);</div><div class='del'>-	else {</div><div class='del'>-		net_dbg_ratelimited("Trying to create neigh for hw %d\n",</div><div class='del'>-				    dev-&gt;type);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make an estimate of the remote block size by assuming that its</div><div class='del'>-	 * two less then the device mtu, which it true for ethernet (and</div><div class='del'>-	 * other things which support long format headers) since there is</div><div class='del'>-	 * an extra length field (of 16 bits) which isn't part of the</div><div class='del'>-	 * ethernet headers and which the DECnet specs won't admit is part</div><div class='del'>-	 * of the DECnet routing headers either.</div><div class='del'>-	 *</div><div class='del'>-	 * If we over estimate here its no big deal, the NSP negotiations</div><div class='del'>-	 * will prevent us from sending packets which are too large for the</div><div class='del'>-	 * remote node to handle. In any case this figure is normally updated</div><div class='del'>-	 * by a hello message in most cases.</div><div class='del'>-	 */</div><div class='del'>-	dn-&gt;blksize = dev-&gt;mtu - 2;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_neigh_error_report(struct neighbour *neigh, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "dn_neigh_error_report: called\n");</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_neigh_output(struct neighbour *neigh, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct dn_route *rt = (struct dn_route *)dst;</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='del'>-	char mac_addr[ETH_ALEN];</div><div class='del'>-	unsigned int seq;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dn_dn2eth(mac_addr, rt-&gt;rt_local_src);</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;neigh-&gt;ha_lock);</div><div class='del'>-		err = dev_hard_header(skb, dev, ntohs(skb-&gt;protocol),</div><div class='del'>-				      neigh-&gt;ha, mac_addr, skb-&gt;len);</div><div class='del'>-	} while (read_seqretry(&amp;neigh-&gt;ha_lock, seq));</div><div class='del'>-</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = dev_queue_xmit(skb);</div><div class='del'>-	else {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_neigh_output_packet(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct dn_route *rt = (struct dn_route *)dst;</div><div class='del'>-	struct neighbour *neigh = rt-&gt;n;</div><div class='del'>-</div><div class='del'>-	return neigh-&gt;output(neigh, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For talking to broadcast devices: Ethernet &amp; PPP</div><div class='del'>- */</div><div class='del'>-static int dn_long_output(struct neighbour *neigh, struct sock *sk,</div><div class='del'>-			  struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='del'>-	int headroom = dev-&gt;hard_header_len + sizeof(struct dn_long_packet) + 3;</div><div class='del'>-	unsigned char *data;</div><div class='del'>-	struct dn_long_packet *lp;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (skb_headroom(skb) &lt; headroom) {</div><div class='del'>-		struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);</div><div class='del'>-		if (skb2 == NULL) {</div><div class='del'>-			net_crit_ratelimited("dn_long_output: no memory\n");</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = skb2;</div><div class='del'>-		net_info_ratelimited("dn_long_output: Increasing headroom\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = skb_push(skb, sizeof(struct dn_long_packet) + 3);</div><div class='del'>-	lp = (struct dn_long_packet *)(data+3);</div><div class='del'>-</div><div class='del'>-	*((__le16 *)data) = cpu_to_le16(skb-&gt;len - 2);</div><div class='del'>-	*(data + 2) = 1 | DN_RT_F_PF; /* Padding */</div><div class='del'>-</div><div class='del'>-	lp-&gt;msgflg   = DN_RT_PKT_LONG|(cb-&gt;rt_flags&amp;(DN_RT_F_IE|DN_RT_F_RQR|DN_RT_F_RTS));</div><div class='del'>-	lp-&gt;d_area   = lp-&gt;d_subarea = 0;</div><div class='del'>-	dn_dn2eth(lp-&gt;d_id, cb-&gt;dst);</div><div class='del'>-	lp-&gt;s_area   = lp-&gt;s_subarea = 0;</div><div class='del'>-	dn_dn2eth(lp-&gt;s_id, cb-&gt;src);</div><div class='del'>-	lp-&gt;nl2      = 0;</div><div class='del'>-	lp-&gt;visit_ct = cb-&gt;hops &amp; 0x3f;</div><div class='del'>-	lp-&gt;s_class  = 0;</div><div class='del'>-	lp-&gt;pt       = 0;</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING,</div><div class='del'>-		       &amp;init_net, sk, skb, NULL, neigh-&gt;dev,</div><div class='del'>-		       dn_neigh_output_packet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For talking to pointopoint and multidrop devices: DDCMP and X.25</div><div class='del'>- */</div><div class='del'>-static int dn_short_output(struct neighbour *neigh, struct sock *sk,</div><div class='del'>-			   struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='del'>-	int headroom = dev-&gt;hard_header_len + sizeof(struct dn_short_packet) + 2;</div><div class='del'>-	struct dn_short_packet *sp;</div><div class='del'>-	unsigned char *data;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (skb_headroom(skb) &lt; headroom) {</div><div class='del'>-		struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);</div><div class='del'>-		if (skb2 == NULL) {</div><div class='del'>-			net_crit_ratelimited("dn_short_output: no memory\n");</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = skb2;</div><div class='del'>-		net_info_ratelimited("dn_short_output: Increasing headroom\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);</div><div class='del'>-	*((__le16 *)data) = cpu_to_le16(skb-&gt;len - 2);</div><div class='del'>-	sp = (struct dn_short_packet *)(data+2);</div><div class='del'>-</div><div class='del'>-	sp-&gt;msgflg     = DN_RT_PKT_SHORT|(cb-&gt;rt_flags&amp;(DN_RT_F_RQR|DN_RT_F_RTS));</div><div class='del'>-	sp-&gt;dstnode    = cb-&gt;dst;</div><div class='del'>-	sp-&gt;srcnode    = cb-&gt;src;</div><div class='del'>-	sp-&gt;forward    = cb-&gt;hops &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING,</div><div class='del'>-		       &amp;init_net, sk, skb, NULL, neigh-&gt;dev,</div><div class='del'>-		       dn_neigh_output_packet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For talking to DECnet phase III nodes</div><div class='del'>- * Phase 3 output is the same as short output, execpt that</div><div class='del'>- * it clears the area bits before transmission.</div><div class='del'>- */</div><div class='del'>-static int dn_phase3_output(struct neighbour *neigh, struct sock *sk,</div><div class='del'>-			    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='del'>-	int headroom = dev-&gt;hard_header_len + sizeof(struct dn_short_packet) + 2;</div><div class='del'>-	struct dn_short_packet *sp;</div><div class='del'>-	unsigned char *data;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	if (skb_headroom(skb) &lt; headroom) {</div><div class='del'>-		struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);</div><div class='del'>-		if (skb2 == NULL) {</div><div class='del'>-			net_crit_ratelimited("dn_phase3_output: no memory\n");</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = skb2;</div><div class='del'>-		net_info_ratelimited("dn_phase3_output: Increasing headroom\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);</div><div class='del'>-	*((__le16 *)data) = cpu_to_le16(skb-&gt;len - 2);</div><div class='del'>-	sp = (struct dn_short_packet *)(data + 2);</div><div class='del'>-</div><div class='del'>-	sp-&gt;msgflg   = DN_RT_PKT_SHORT|(cb-&gt;rt_flags&amp;(DN_RT_F_RQR|DN_RT_F_RTS));</div><div class='del'>-	sp-&gt;dstnode  = cb-&gt;dst &amp; cpu_to_le16(0x03ff);</div><div class='del'>-	sp-&gt;srcnode  = cb-&gt;src &amp; cpu_to_le16(0x03ff);</div><div class='del'>-	sp-&gt;forward  = cb-&gt;hops &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING,</div><div class='del'>-		       &amp;init_net, sk, skb, NULL, neigh-&gt;dev,</div><div class='del'>-		       dn_neigh_output_packet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_to_neigh_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct dn_route *rt = (struct dn_route *) dst;</div><div class='del'>-	struct neighbour *neigh = rt-&gt;n;</div><div class='del'>-	struct dn_neigh *dn = container_of(neigh, struct dn_neigh, n);</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	bool use_long;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dn_db = rcu_dereference(neigh-&gt;dev-&gt;dn_ptr);</div><div class='del'>-	if (dn_db == NULL) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	use_long = dn_db-&gt;use_long;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (dn-&gt;flags &amp; DN_NDFLAG_P3)</div><div class='del'>-		return dn_phase3_output(neigh, sk, skb);</div><div class='del'>-	if (use_long)</div><div class='del'>-		return dn_long_output(neigh, sk, skb);</div><div class='del'>-	else</div><div class='del'>-		return dn_short_output(neigh, sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unfortunately, the neighbour code uses the device in its hash</div><div class='del'>- * function, so we don't get any advantage from it. This function</div><div class='del'>- * basically does a neigh_lookup(), but without comparing the device</div><div class='del'>- * field. This is required for the On-Ethernet cache</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pointopoint link receives a hello message</div><div class='del'>- */</div><div class='del'>-void dn_neigh_pointopoint_hello(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ethernet router hello message received</div><div class='del'>- */</div><div class='del'>-int dn_neigh_router_hello(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtnode_hello_message *msg = (struct rtnode_hello_message *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	struct neighbour *neigh;</div><div class='del'>-	struct dn_neigh *dn;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	__le16 src;</div><div class='del'>-</div><div class='del'>-	src = dn_eth2dn(msg-&gt;id);</div><div class='del'>-</div><div class='del'>-	neigh = __neigh_lookup(&amp;dn_neigh_table, &amp;src, skb-&gt;dev, 1);</div><div class='del'>-</div><div class='del'>-	dn = container_of(neigh, struct dn_neigh, n);</div><div class='del'>-</div><div class='del'>-	if (neigh) {</div><div class='del'>-		write_lock(&amp;neigh-&gt;lock);</div><div class='del'>-</div><div class='del'>-		neigh-&gt;used = jiffies;</div><div class='del'>-		dn_db = rcu_dereference(neigh-&gt;dev-&gt;dn_ptr);</div><div class='del'>-</div><div class='del'>-		if (!(neigh-&gt;nud_state &amp; NUD_PERMANENT)) {</div><div class='del'>-			neigh-&gt;updated = jiffies;</div><div class='del'>-</div><div class='del'>-			if (neigh-&gt;dev-&gt;type == ARPHRD_ETHER)</div><div class='del'>-				memcpy(neigh-&gt;ha, &amp;eth_hdr(skb)-&gt;h_source, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-			dn-&gt;blksize  = le16_to_cpu(msg-&gt;blksize);</div><div class='del'>-			dn-&gt;priority = msg-&gt;priority;</div><div class='del'>-</div><div class='del'>-			dn-&gt;flags &amp;= ~DN_NDFLAG_P3;</div><div class='del'>-</div><div class='del'>-			switch (msg-&gt;iinfo &amp; DN_RT_INFO_TYPE) {</div><div class='del'>-			case DN_RT_INFO_L1RT:</div><div class='del'>-				dn-&gt;flags &amp;=~DN_NDFLAG_R2;</div><div class='del'>-				dn-&gt;flags |= DN_NDFLAG_R1;</div><div class='del'>-				break;</div><div class='del'>-			case DN_RT_INFO_L2RT:</div><div class='del'>-				dn-&gt;flags |= DN_NDFLAG_R2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Only use routers in our area */</div><div class='del'>-		if ((le16_to_cpu(src)&gt;&gt;10) == (le16_to_cpu((decnet_address))&gt;&gt;10)) {</div><div class='del'>-			if (!dn_db-&gt;router) {</div><div class='del'>-				dn_db-&gt;router = neigh_clone(neigh);</div><div class='del'>-			} else {</div><div class='del'>-				if (msg-&gt;priority &gt; ((struct dn_neigh *)dn_db-&gt;router)-&gt;priority)</div><div class='del'>-					neigh_release(xchg(&amp;dn_db-&gt;router, neigh_clone(neigh)));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		write_unlock(&amp;neigh-&gt;lock);</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Endnode hello message received</div><div class='del'>- */</div><div class='del'>-int dn_neigh_endnode_hello(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct endnode_hello_message *msg = (struct endnode_hello_message *)skb-&gt;data;</div><div class='del'>-	struct neighbour *neigh;</div><div class='del'>-	struct dn_neigh *dn;</div><div class='del'>-	__le16 src;</div><div class='del'>-</div><div class='del'>-	src = dn_eth2dn(msg-&gt;id);</div><div class='del'>-</div><div class='del'>-	neigh = __neigh_lookup(&amp;dn_neigh_table, &amp;src, skb-&gt;dev, 1);</div><div class='del'>-</div><div class='del'>-	dn = container_of(neigh, struct dn_neigh, n);</div><div class='del'>-</div><div class='del'>-	if (neigh) {</div><div class='del'>-		write_lock(&amp;neigh-&gt;lock);</div><div class='del'>-</div><div class='del'>-		neigh-&gt;used = jiffies;</div><div class='del'>-</div><div class='del'>-		if (!(neigh-&gt;nud_state &amp; NUD_PERMANENT)) {</div><div class='del'>-			neigh-&gt;updated = jiffies;</div><div class='del'>-</div><div class='del'>-			if (neigh-&gt;dev-&gt;type == ARPHRD_ETHER)</div><div class='del'>-				memcpy(neigh-&gt;ha, &amp;eth_hdr(skb)-&gt;h_source, ETH_ALEN);</div><div class='del'>-			dn-&gt;flags   &amp;= ~(DN_NDFLAG_R1 | DN_NDFLAG_R2);</div><div class='del'>-			dn-&gt;blksize  = le16_to_cpu(msg-&gt;blksize);</div><div class='del'>-			dn-&gt;priority = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		write_unlock(&amp;neigh-&gt;lock);</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *dn_find_slot(char *base, int max, int priority)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *min = NULL;</div><div class='del'>-</div><div class='del'>-	base += 6; /* skip first id */</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; max; i++) {</div><div class='del'>-		if (!min || (*base &lt; *min))</div><div class='del'>-			min = base;</div><div class='del'>-		base += 7; /* find next priority */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!min)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return (*min &lt; priority) ? (min - 6) : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct elist_cb_state {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	unsigned char *rs;</div><div class='del'>-	int t, n;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void neigh_elist_cb(struct neighbour *neigh, void *_info)</div><div class='del'>-{</div><div class='del'>-	struct elist_cb_state *s = _info;</div><div class='del'>-	struct dn_neigh *dn;</div><div class='del'>-</div><div class='del'>-	if (neigh-&gt;dev != s-&gt;dev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dn = container_of(neigh, struct dn_neigh, n);</div><div class='del'>-	if (!(dn-&gt;flags &amp; (DN_NDFLAG_R1|DN_NDFLAG_R2)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;t == s-&gt;n)</div><div class='del'>-		s-&gt;rs = dn_find_slot(s-&gt;ptr, s-&gt;n, dn-&gt;priority);</div><div class='del'>-	else</div><div class='del'>-		s-&gt;t++;</div><div class='del'>-	if (s-&gt;rs == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dn_dn2eth(s-&gt;rs, dn-&gt;addr);</div><div class='del'>-	s-&gt;rs += 6;</div><div class='del'>-	*(s-&gt;rs) = neigh-&gt;nud_state &amp; NUD_CONNECTED ? 0x80 : 0x0;</div><div class='del'>-	*(s-&gt;rs) |= dn-&gt;priority;</div><div class='del'>-	s-&gt;rs++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n)</div><div class='del'>-{</div><div class='del'>-	struct elist_cb_state state;</div><div class='del'>-</div><div class='del'>-	state.dev = dev;</div><div class='del'>-	state.t = 0;</div><div class='del'>-	state.n = n;</div><div class='del'>-	state.ptr = ptr;</div><div class='del'>-	state.rs = ptr;</div><div class='del'>-</div><div class='del'>-	neigh_for_each(&amp;dn_neigh_table, neigh_elist_cb, &amp;state);</div><div class='del'>-</div><div class='del'>-	return state.t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='del'>-static inline void dn_neigh_format_entry(struct seq_file *seq,</div><div class='del'>-					 struct neighbour *n)</div><div class='del'>-{</div><div class='del'>-	struct dn_neigh *dn = container_of(n, struct dn_neigh, n);</div><div class='del'>-	char buf[DN_ASCBUF_LEN];</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;n-&gt;lock);</div><div class='del'>-	seq_printf(seq, "%-7s %s%s%s   %02x    %02d  %07ld %-8s\n",</div><div class='del'>-		   dn_addr2asc(le16_to_cpu(dn-&gt;addr), buf),</div><div class='del'>-		   (dn-&gt;flags&amp;DN_NDFLAG_R1) ? "1" : "-",</div><div class='del'>-		   (dn-&gt;flags&amp;DN_NDFLAG_R2) ? "2" : "-",</div><div class='del'>-		   (dn-&gt;flags&amp;DN_NDFLAG_P3) ? "3" : "-",</div><div class='del'>-		   dn-&gt;n.nud_state,</div><div class='del'>-		   refcount_read(&amp;dn-&gt;n.refcnt),</div><div class='del'>-		   dn-&gt;blksize,</div><div class='del'>-		   (dn-&gt;n.dev) ? dn-&gt;n.dev-&gt;name : "?");</div><div class='del'>-	read_unlock(&amp;n-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_neigh_seq_show(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_puts(seq, "Addr    Flags State Use Blksize Dev\n");</div><div class='del'>-	} else {</div><div class='del'>-		dn_neigh_format_entry(seq, v);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_neigh_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	return neigh_seq_start(seq, pos, &amp;dn_neigh_table,</div><div class='del'>-			       NEIGH_SEQ_NEIGH_ONLY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations dn_neigh_seq_ops = {</div><div class='del'>-	.start = dn_neigh_seq_start,</div><div class='del'>-	.next  = neigh_seq_next,</div><div class='del'>-	.stop  = neigh_seq_stop,</div><div class='del'>-	.show  = dn_neigh_seq_show,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __init dn_neigh_init(void)</div><div class='del'>-{</div><div class='del'>-	neigh_table_init(NEIGH_DN_TABLE, &amp;dn_neigh_table);</div><div class='del'>-	proc_create_net("decnet_neigh", 0444, init_net.proc_net,</div><div class='del'>-			&amp;dn_neigh_seq_ops, sizeof(struct neigh_seq_state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit dn_neigh_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	remove_proc_entry("decnet_neigh", init_net.proc_net);</div><div class='del'>-	neigh_table_clear(NEIGH_DN_TABLE, &amp;dn_neigh_table);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c<br/>deleted file mode 100644<br/>index 2fb5e055ba25..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_nsp_in.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_nsp_in.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,914 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Network Services Protocol (Input)</div><div class='del'>- *</div><div class='del'>- * Author:      Eduardo Marcelo Serrat &lt;emserrat@geocities.com&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *</div><div class='del'>- *    Steve Whitehouse:  Split into dn_nsp_in.c and dn_nsp_out.c from</div><div class='del'>- *                       original dn_nsp.c.</div><div class='del'>- *    Steve Whitehouse:  Updated to work with my new routing architecture.</div><div class='del'>- *    Steve Whitehouse:  Add changes from Eduardo Serrat's patches.</div><div class='del'>- *    Steve Whitehouse:  Put all ack handling code in a common routine.</div><div class='del'>- *    Steve Whitehouse:  Put other common bits into dn_nsp_rx()</div><div class='del'>- *    Steve Whitehouse:  More checks on skb-&gt;len to catch bogus packets</div><div class='del'>- *                       Fixed various race conditions and possible nasties.</div><div class='del'>- *    Steve Whitehouse:  Now handles returned conninit frames.</div><div class='del'>- *     David S. Miller:  New socket locking</div><div class='del'>- *    Steve Whitehouse:  Fixed lockup when socket filtering was enabled.</div><div class='del'>- *         Paul Koning:  Fix to push CC sockets into RUN when acks are</div><div class='del'>- *                       received.</div><div class='del'>- *    Steve Whitehouse:</div><div class='del'>- *   Patrick Caulfield:  Checking conninits for correctness &amp; sending of error</div><div class='del'>- *                       responses.</div><div class='del'>- *    Steve Whitehouse:  Added backlog congestion level return codes.</div><div class='del'>- *   Patrick Caulfield:</div><div class='del'>- *    Steve Whitehouse:  Added flow control support (outbound)</div><div class='del'>- *    Steve Whitehouse:  Prepare for nonlinear skbs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    (c) 1995-1998 E.M. Serrat		emserrat@geocities.com</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-*******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/route.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/tcp_states.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/termios.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_decnet.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_nsp.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-extern int decnet_log_martians;</div><div class='del'>-</div><div class='del'>-static void dn_log_martian(struct sk_buff *skb, const char *msg)</div><div class='del'>-{</div><div class='del'>-	if (decnet_log_martians) {</div><div class='del'>-		char *devname = skb-&gt;dev ? skb-&gt;dev-&gt;name : "???";</div><div class='del'>-		struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-		net_info_ratelimited("DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n",</div><div class='del'>-				     msg, devname,</div><div class='del'>-				     le16_to_cpu(cb-&gt;src),</div><div class='del'>-				     le16_to_cpu(cb-&gt;dst),</div><div class='del'>-				     le16_to_cpu(cb-&gt;src_port),</div><div class='del'>-				     le16_to_cpu(cb-&gt;dst_port));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For this function we've flipped the cross-subchannel bit</div><div class='del'>- * if the message is an otherdata or linkservice message. Thus</div><div class='del'>- * we can use it to work out what to update.</div><div class='del'>- */</div><div class='del'>-static void dn_ack(struct sock *sk, struct sk_buff *skb, unsigned short ack)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned short type = ((ack &gt;&gt; 12) &amp; 0x0003);</div><div class='del'>-	int wakeup = 0;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 0: /* ACK - Data */</div><div class='del'>-		if (dn_after(ack, scp-&gt;ackrcv_dat)) {</div><div class='del'>-			scp-&gt;ackrcv_dat = ack &amp; 0x0fff;</div><div class='del'>-			wakeup |= dn_nsp_check_xmit_queue(sk, skb,</div><div class='del'>-							  &amp;scp-&gt;data_xmit_queue,</div><div class='del'>-							  ack);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 1: /* NAK - Data */</div><div class='del'>-		break;</div><div class='del'>-	case 2: /* ACK - OtherData */</div><div class='del'>-		if (dn_after(ack, scp-&gt;ackrcv_oth)) {</div><div class='del'>-			scp-&gt;ackrcv_oth = ack &amp; 0x0fff;</div><div class='del'>-			wakeup |= dn_nsp_check_xmit_queue(sk, skb,</div><div class='del'>-							  &amp;scp-&gt;other_xmit_queue,</div><div class='del'>-							  ack);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* NAK - OtherData */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wakeup &amp;&amp; !sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_state_change(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function is a universal ack processor.</div><div class='del'>- */</div><div class='del'>-static int dn_process_ack(struct sock *sk, struct sk_buff *skb, int oth)</div><div class='del'>-{</div><div class='del'>-	__le16 *ptr = (__le16 *)skb-&gt;data;</div><div class='del'>-	int len = 0;</div><div class='del'>-	unsigned short ack;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		return len;</div><div class='del'>-</div><div class='del'>-	if ((ack = le16_to_cpu(*ptr)) &amp; 0x8000) {</div><div class='del'>-		skb_pull(skb, 2);</div><div class='del'>-		ptr++;</div><div class='del'>-		len += 2;</div><div class='del'>-		if ((ack &amp; 0x4000) == 0) {</div><div class='del'>-			if (oth)</div><div class='del'>-				ack ^= 0x2000;</div><div class='del'>-			dn_ack(sk, skb, ack);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		return len;</div><div class='del'>-</div><div class='del'>-	if ((ack = le16_to_cpu(*ptr)) &amp; 0x8000) {</div><div class='del'>-		skb_pull(skb, 2);</div><div class='del'>-		len += 2;</div><div class='del'>-		if ((ack &amp; 0x4000) == 0) {</div><div class='del'>-			if (oth)</div><div class='del'>-				ack ^= 0x2000;</div><div class='del'>-			dn_ack(sk, skb, ack);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_check_idf - Check an image data field format is correct.</div><div class='del'>- * @pptr: Pointer to pointer to image data</div><div class='del'>- * @len: Pointer to length of image data</div><div class='del'>- * @max: The maximum allowed length of the data in the image data field</div><div class='del'>- * @follow_on: Check that this many bytes exist beyond the end of the image data</div><div class='del'>- *</div><div class='del'>- * Returns: 0 if ok, -1 on error</div><div class='del'>- */</div><div class='del'>-static inline int dn_check_idf(unsigned char **pptr, int *len, unsigned char max, unsigned char follow_on)</div><div class='del'>-{</div><div class='del'>-	unsigned char *ptr = *pptr;</div><div class='del'>-	unsigned char flen = *ptr++;</div><div class='del'>-</div><div class='del'>-	(*len)--;</div><div class='del'>-	if (flen &gt; max)</div><div class='del'>-		return -1;</div><div class='del'>-	if ((flen + follow_on) &gt; *len)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	*len -= flen;</div><div class='del'>-	*pptr = ptr + flen;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Table of reason codes to pass back to node which sent us a badly</div><div class='del'>- * formed message, plus text messages for the log. A zero entry in</div><div class='del'>- * the reason field means "don't reply" otherwise a disc init is sent with</div><div class='del'>- * the specified reason code.</div><div class='del'>- */</div><div class='del'>-static struct {</div><div class='del'>-	unsigned short reason;</div><div class='del'>-	const char *text;</div><div class='del'>-} ci_err_table[] = {</div><div class='del'>- { 0,             "CI: Truncated message" },</div><div class='del'>- { NSP_REASON_ID, "CI: Destination username error" },</div><div class='del'>- { NSP_REASON_ID, "CI: Destination username type" },</div><div class='del'>- { NSP_REASON_US, "CI: Source username error" },</div><div class='del'>- { 0,             "CI: Truncated at menuver" },</div><div class='del'>- { 0,             "CI: Truncated before access or user data" },</div><div class='del'>- { NSP_REASON_IO, "CI: Access data format error" },</div><div class='del'>- { NSP_REASON_IO, "CI: User data format error" }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function uses a slightly different lookup method</div><div class='del'>- * to find its sockets, since it searches on object name/number</div><div class='del'>- * rather than port numbers. Various tests are done to ensure that</div><div class='del'>- * the incoming data is in the correct format before it is queued to</div><div class='del'>- * a socket.</div><div class='del'>- */</div><div class='del'>-static struct sock *dn_find_listener(struct sk_buff *skb, unsigned short *reason)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct nsp_conn_init_msg *msg = (struct nsp_conn_init_msg *)skb-&gt;data;</div><div class='del'>-	struct sockaddr_dn dstaddr;</div><div class='del'>-	struct sockaddr_dn srcaddr;</div><div class='del'>-	unsigned char type = 0;</div><div class='del'>-	int dstlen;</div><div class='del'>-	int srclen;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	int len;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned char menuver;</div><div class='del'>-</div><div class='del'>-	memset(&amp;dstaddr, 0, sizeof(struct sockaddr_dn));</div><div class='del'>-	memset(&amp;srcaddr, 0, sizeof(struct sockaddr_dn));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 1. Decode &amp; remove message header</div><div class='del'>-	 */</div><div class='del'>-	cb-&gt;src_port = msg-&gt;srcaddr;</div><div class='del'>-	cb-&gt;dst_port = msg-&gt;dstaddr;</div><div class='del'>-	cb-&gt;services = msg-&gt;services;</div><div class='del'>-	cb-&gt;info     = msg-&gt;info;</div><div class='del'>-	cb-&gt;segsize  = le16_to_cpu(msg-&gt;segsize);</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(*msg)))</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	len = skb-&gt;len;</div><div class='del'>-	ptr = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 2. Check destination end username format</div><div class='del'>-	 */</div><div class='del'>-	dstlen = dn_username2sockaddr(ptr, len, &amp;dstaddr, &amp;type);</div><div class='del'>-	err++;</div><div class='del'>-	if (dstlen &lt; 0)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	err++;</div><div class='del'>-	if (type &gt; 1)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	len -= dstlen;</div><div class='del'>-	ptr += dstlen;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 3. Check source end username format</div><div class='del'>-	 */</div><div class='del'>-	srclen = dn_username2sockaddr(ptr, len, &amp;srcaddr, &amp;type);</div><div class='del'>-	err++;</div><div class='del'>-	if (srclen &lt; 0)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	len -= srclen;</div><div class='del'>-	ptr += srclen;</div><div class='del'>-	err++;</div><div class='del'>-	if (len &lt; 1)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	menuver = *ptr;</div><div class='del'>-	ptr++;</div><div class='del'>-	len--;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 4. Check that optional data actually exists if menuver says it does</div><div class='del'>-	 */</div><div class='del'>-	err++;</div><div class='del'>-	if ((menuver &amp; (DN_MENUVER_ACC | DN_MENUVER_USR)) &amp;&amp; (len &lt; 1))</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 5. Check optional access data format</div><div class='del'>-	 */</div><div class='del'>-	err++;</div><div class='del'>-	if (menuver &amp; DN_MENUVER_ACC) {</div><div class='del'>-		if (dn_check_idf(&amp;ptr, &amp;len, 39, 1))</div><div class='del'>-			goto err_out;</div><div class='del'>-		if (dn_check_idf(&amp;ptr, &amp;len, 39, 1))</div><div class='del'>-			goto err_out;</div><div class='del'>-		if (dn_check_idf(&amp;ptr, &amp;len, 39, (menuver &amp; DN_MENUVER_USR) ? 1 : 0))</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 6. Check optional user data format</div><div class='del'>-	 */</div><div class='del'>-	err++;</div><div class='del'>-	if (menuver &amp; DN_MENUVER_USR) {</div><div class='del'>-		if (dn_check_idf(&amp;ptr, &amp;len, 16, 0))</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 7. Look up socket based on destination end username</div><div class='del'>-	 */</div><div class='del'>-	return dn_sklist_find_listener(&amp;dstaddr);</div><div class='del'>-err_out:</div><div class='del'>-	dn_log_martian(skb, ci_err_table[err].text);</div><div class='del'>-	*reason = ci_err_table[err].reason;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void dn_nsp_conn_init(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (sk_acceptq_is_full(sk)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_ack_backlog++;</div><div class='del'>-	skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='del'>-	sk-&gt;sk_state_change(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 4)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ptr = skb-&gt;data;</div><div class='del'>-	cb-&gt;services = *ptr++;</div><div class='del'>-	cb-&gt;info = *ptr++;</div><div class='del'>-	cb-&gt;segsize = le16_to_cpu(*(__le16 *)ptr);</div><div class='del'>-</div><div class='del'>-	if ((scp-&gt;state == DN_CI) || (scp-&gt;state == DN_CD)) {</div><div class='del'>-		scp-&gt;persist = 0;</div><div class='del'>-		scp-&gt;addrrem = cb-&gt;src_port;</div><div class='del'>-		sk-&gt;sk_state = TCP_ESTABLISHED;</div><div class='del'>-		scp-&gt;state = DN_RUN;</div><div class='del'>-		scp-&gt;services_rem = cb-&gt;services;</div><div class='del'>-		scp-&gt;info_rem = cb-&gt;info;</div><div class='del'>-		scp-&gt;segsize_rem = cb-&gt;segsize;</div><div class='del'>-</div><div class='del'>-		if ((scp-&gt;services_rem &amp; NSP_FC_MASK) == NSP_FC_NONE)</div><div class='del'>-			scp-&gt;max_window = decnet_no_fc_max_cwnd;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;len &gt; 0) {</div><div class='del'>-			u16 dlen = *skb-&gt;data;</div><div class='del'>-			if ((dlen &lt;= 16) &amp;&amp; (dlen &lt;= skb-&gt;len)) {</div><div class='del'>-				scp-&gt;conndata_in.opt_optl = cpu_to_le16(dlen);</div><div class='del'>-				skb_copy_from_linear_data_offset(skb, 1,</div><div class='del'>-					      scp-&gt;conndata_in.opt_data, dlen);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dn_nsp_send_link(sk, DN_NOCHANGE, 0);</div><div class='del'>-		if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_conn_ack(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state == DN_CI) {</div><div class='del'>-		scp-&gt;state = DN_CD;</div><div class='del'>-		scp-&gt;persist = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	unsigned short reason;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	reason = le16_to_cpu(*(__le16 *)skb-&gt;data);</div><div class='del'>-	skb_pull(skb, 2);</div><div class='del'>-</div><div class='del'>-	scp-&gt;discdata_in.opt_status = cpu_to_le16(reason);</div><div class='del'>-	scp-&gt;discdata_in.opt_optl   = 0;</div><div class='del'>-	memset(scp-&gt;discdata_in.opt_data, 0, 16);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &gt; 0) {</div><div class='del'>-		u16 dlen = *skb-&gt;data;</div><div class='del'>-		if ((dlen &lt;= 16) &amp;&amp; (dlen &lt;= skb-&gt;len)) {</div><div class='del'>-			scp-&gt;discdata_in.opt_optl = cpu_to_le16(dlen);</div><div class='del'>-			skb_copy_from_linear_data_offset(skb, 1, scp-&gt;discdata_in.opt_data, dlen);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scp-&gt;addrrem = cb-&gt;src_port;</div><div class='del'>-	sk-&gt;sk_state = TCP_CLOSE;</div><div class='del'>-</div><div class='del'>-	switch (scp-&gt;state) {</div><div class='del'>-	case DN_CI:</div><div class='del'>-	case DN_CD:</div><div class='del'>-		scp-&gt;state = DN_RJ;</div><div class='del'>-		sk-&gt;sk_err = ECONNREFUSED;</div><div class='del'>-		break;</div><div class='del'>-	case DN_RUN:</div><div class='del'>-		sk-&gt;sk_shutdown |= SHUTDOWN_MASK;</div><div class='del'>-		scp-&gt;state = DN_DN;</div><div class='del'>-		break;</div><div class='del'>-	case DN_DI:</div><div class='del'>-		scp-&gt;state = DN_DIC;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-		if (sk-&gt;sk_socket-&gt;state != SS_UNCONNECTED)</div><div class='del'>-			sk-&gt;sk_socket-&gt;state = SS_DISCONNECTING;</div><div class='del'>-		sk-&gt;sk_state_change(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It appears that its possible for remote machines to send disc</div><div class='del'>-	 * init messages with no port identifier if we are in the CI and</div><div class='del'>-	 * possibly also the CD state. Obviously we shouldn't reply with</div><div class='del'>-	 * a message if we don't know what the end point is.</div><div class='del'>-	 */</div><div class='del'>-	if (scp-&gt;addrrem) {</div><div class='del'>-		dn_nsp_send_disc(sk, NSP_DISCCONF, NSP_REASON_DC, GFP_ATOMIC);</div><div class='del'>-	}</div><div class='del'>-	scp-&gt;persist_fxn = dn_destroy_timer;</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * disc_conf messages are also called no_resources or no_link</div><div class='del'>- * messages depending upon the "reason" field.</div><div class='del'>- */</div><div class='del'>-static void dn_nsp_disc_conf(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned short reason;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len != 2)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	reason = le16_to_cpu(*(__le16 *)skb-&gt;data);</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_state = TCP_CLOSE;</div><div class='del'>-</div><div class='del'>-	switch (scp-&gt;state) {</div><div class='del'>-	case DN_CI:</div><div class='del'>-		scp-&gt;state = DN_NR;</div><div class='del'>-		break;</div><div class='del'>-	case DN_DR:</div><div class='del'>-		if (reason == NSP_REASON_DC)</div><div class='del'>-			scp-&gt;state = DN_DRC;</div><div class='del'>-		if (reason == NSP_REASON_NL)</div><div class='del'>-			scp-&gt;state = DN_CN;</div><div class='del'>-		break;</div><div class='del'>-	case DN_DI:</div><div class='del'>-		scp-&gt;state = DN_DIC;</div><div class='del'>-		break;</div><div class='del'>-	case DN_RUN:</div><div class='del'>-		sk-&gt;sk_shutdown |= SHUTDOWN_MASK;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case DN_CC:</div><div class='del'>-		scp-&gt;state = DN_CN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-		if (sk-&gt;sk_socket-&gt;state != SS_UNCONNECTED)</div><div class='del'>-			sk-&gt;sk_socket-&gt;state = SS_DISCONNECTING;</div><div class='del'>-		sk-&gt;sk_state_change(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist_fxn = dn_destroy_timer;</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_linkservice(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned short segnum;</div><div class='del'>-	unsigned char lsflags;</div><div class='del'>-	signed char fcval;</div><div class='del'>-	int wake_up = 0;</div><div class='del'>-	char *ptr = skb-&gt;data;</div><div class='del'>-	unsigned char fctype = scp-&gt;services_rem &amp; NSP_FC_MASK;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len != 4)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	segnum = le16_to_cpu(*(__le16 *)ptr);</div><div class='del'>-	ptr += 2;</div><div class='del'>-	lsflags = *(unsigned char *)ptr++;</div><div class='del'>-	fcval = *ptr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Here we ignore erronous packets which should really</div><div class='del'>-	 * should cause a connection abort. It is not critical</div><div class='del'>-	 * for now though.</div><div class='del'>-	 */</div><div class='del'>-	if (lsflags &amp; 0xf8)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (seq_next(scp-&gt;numoth_rcv, segnum)) {</div><div class='del'>-		seq_add(&amp;scp-&gt;numoth_rcv, 1);</div><div class='del'>-		switch(lsflags &amp; 0x04) { /* FCVAL INT */</div><div class='del'>-		case 0x00: /* Normal Request */</div><div class='del'>-			switch(lsflags &amp; 0x03) { /* FCVAL MOD */</div><div class='del'>-			case 0x00: /* Request count */</div><div class='del'>-				if (fcval &lt; 0) {</div><div class='del'>-					unsigned char p_fcval = -fcval;</div><div class='del'>-					if ((scp-&gt;flowrem_dat &gt; p_fcval) &amp;&amp;</div><div class='del'>-					    (fctype == NSP_FC_SCMC)) {</div><div class='del'>-						scp-&gt;flowrem_dat -= p_fcval;</div><div class='del'>-					}</div><div class='del'>-				} else if (fcval &gt; 0) {</div><div class='del'>-					scp-&gt;flowrem_dat += fcval;</div><div class='del'>-					wake_up = 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 0x01: /* Stop outgoing data */</div><div class='del'>-				scp-&gt;flowrem_sw = DN_DONTSEND;</div><div class='del'>-				break;</div><div class='del'>-			case 0x02: /* Ok to start again */</div><div class='del'>-				scp-&gt;flowrem_sw = DN_SEND;</div><div class='del'>-				dn_nsp_output(sk);</div><div class='del'>-				wake_up = 1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 0x04: /* Interrupt Request */</div><div class='del'>-			if (fcval &gt; 0) {</div><div class='del'>-				scp-&gt;flowrem_oth += fcval;</div><div class='del'>-				wake_up = 1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (wake_up &amp;&amp; !sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_nsp_send_oth_ack(sk);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy of sock_queue_rcv_skb (from sock.h) without</div><div class='del'>- * bh_lock_sock() (its already held when this is called) which</div><div class='del'>- * also allows data and other data to be queued to a socket.</div><div class='del'>- */</div><div class='del'>-static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig, struct sk_buff_head *queue)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Cast skb-&gt;rcvbuf to unsigned... It's pointless, but reduces</div><div class='del'>-	   number of warnings when compiling with -W --ANK</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) + skb-&gt;truesize &gt;=</div><div class='del'>-	    (unsigned int)sk-&gt;sk_rcvbuf) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = sk_filter(sk, skb);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	skb_set_owner_r(skb, sk);</div><div class='del'>-	skb_queue_tail(queue, skb);</div><div class='del'>-</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_data_ready(sk);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_otherdata(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned short segnum;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	int queued = 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	cb-&gt;segnum = segnum = le16_to_cpu(*(__le16 *)skb-&gt;data);</div><div class='del'>-	skb_pull(skb, 2);</div><div class='del'>-</div><div class='del'>-	if (seq_next(scp-&gt;numoth_rcv, segnum)) {</div><div class='del'>-</div><div class='del'>-		if (dn_queue_skb(sk, skb, SIGURG, &amp;scp-&gt;other_receive_queue) == 0) {</div><div class='del'>-			seq_add(&amp;scp-&gt;numoth_rcv, 1);</div><div class='del'>-			scp-&gt;other_report = 0;</div><div class='del'>-			queued = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_nsp_send_oth_ack(sk);</div><div class='del'>-out:</div><div class='del'>-	if (!queued)</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_nsp_data(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int queued = 0;</div><div class='del'>-	unsigned short segnum;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	cb-&gt;segnum = segnum = le16_to_cpu(*(__le16 *)skb-&gt;data);</div><div class='del'>-	skb_pull(skb, 2);</div><div class='del'>-</div><div class='del'>-	if (seq_next(scp-&gt;numdat_rcv, segnum)) {</div><div class='del'>-		if (dn_queue_skb(sk, skb, SIGIO, &amp;sk-&gt;sk_receive_queue) == 0) {</div><div class='del'>-			seq_add(&amp;scp-&gt;numdat_rcv, 1);</div><div class='del'>-			queued = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((scp-&gt;flowloc_sw == DN_SEND) &amp;&amp; dn_congested(sk)) {</div><div class='del'>-			scp-&gt;flowloc_sw = DN_DONTSEND;</div><div class='del'>-			dn_nsp_send_link(sk, DN_DONTSEND, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_nsp_send_data_ack(sk);</div><div class='del'>-out:</div><div class='del'>-	if (!queued)</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If one of our conninit messages is returned, this function</div><div class='del'>- * deals with it. It puts the socket into the NO_COMMUNICATION</div><div class='del'>- * state.</div><div class='del'>- */</div><div class='del'>-static void dn_returned_conn_init(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state == DN_CI) {</div><div class='del'>-		scp-&gt;state = DN_NC;</div><div class='del'>-		sk-&gt;sk_state = TCP_CLOSE;</div><div class='del'>-		if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nsp_no_socket(struct sk_buff *skb, unsigned short reason)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	int ret = NET_RX_DROP;</div><div class='del'>-</div><div class='del'>-	/* Must not reply to returned packets */</div><div class='del'>-	if (cb-&gt;rt_flags &amp; DN_RT_F_RTS)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if ((reason != NSP_REASON_OK) &amp;&amp; ((cb-&gt;nsp_flags &amp; 0x0c) == 0x08)) {</div><div class='del'>-		switch (cb-&gt;nsp_flags &amp; 0x70) {</div><div class='del'>-		case 0x10:</div><div class='del'>-		case 0x60: /* (Retransmitted) Connect Init */</div><div class='del'>-			dn_nsp_return_disc(skb, NSP_DISCINIT, reason);</div><div class='del'>-			ret = NET_RX_SUCCESS;</div><div class='del'>-			break;</div><div class='del'>-		case 0x20: /* Connect Confirm */</div><div class='del'>-			dn_nsp_return_disc(skb, NSP_DISCCONF, reason);</div><div class='del'>-			ret = NET_RX_SUCCESS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nsp_rx_packet(struct net *net, struct sock *sk2,</div><div class='del'>-			    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct sock *sk = NULL;</div><div class='del'>-	unsigned char *ptr = (unsigned char *)skb-&gt;data;</div><div class='del'>-	unsigned short reason = NSP_REASON_NL;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, 2))</div><div class='del'>-		goto free_out;</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-	cb-&gt;nsp_flags = *ptr++;</div><div class='del'>-</div><div class='del'>-	if (decnet_debug_level &amp; 2)</div><div class='del'>-		printk(KERN_DEBUG "dn_nsp_rx: Message type 0x%02x\n", (int)cb-&gt;nsp_flags);</div><div class='del'>-</div><div class='del'>-	if (cb-&gt;nsp_flags &amp; 0x83)</div><div class='del'>-		goto free_out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Filter out conninits and useless packet types</div><div class='del'>-	 */</div><div class='del'>-	if ((cb-&gt;nsp_flags &amp; 0x0c) == 0x08) {</div><div class='del'>-		switch (cb-&gt;nsp_flags &amp; 0x70) {</div><div class='del'>-		case 0x00: /* NOP */</div><div class='del'>-		case 0x70: /* Reserved */</div><div class='del'>-		case 0x50: /* Reserved, Phase II node init */</div><div class='del'>-			goto free_out;</div><div class='del'>-		case 0x10:</div><div class='del'>-		case 0x60:</div><div class='del'>-			if (unlikely(cb-&gt;rt_flags &amp; DN_RT_F_RTS))</div><div class='del'>-				goto free_out;</div><div class='del'>-			sk = dn_find_listener(skb, &amp;reason);</div><div class='del'>-			goto got_it;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, 3))</div><div class='del'>-		goto free_out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Grab the destination address.</div><div class='del'>-	 */</div><div class='del'>-	cb-&gt;dst_port = *(__le16 *)ptr;</div><div class='del'>-	cb-&gt;src_port = 0;</div><div class='del'>-	ptr += 2;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If not a connack, grab the source address too.</div><div class='del'>-	 */</div><div class='del'>-	if (pskb_may_pull(skb, 5)) {</div><div class='del'>-		cb-&gt;src_port = *(__le16 *)ptr;</div><div class='del'>-		ptr += 2;</div><div class='del'>-		skb_pull(skb, 5);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Returned packets...</div><div class='del'>-	 * Swap src &amp; dst and look up in the normal way.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(cb-&gt;rt_flags &amp; DN_RT_F_RTS)) {</div><div class='del'>-		swap(cb-&gt;dst_port, cb-&gt;src_port);</div><div class='del'>-		swap(cb-&gt;dst, cb-&gt;src);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Find the socket to which this skb is destined.</div><div class='del'>-	 */</div><div class='del'>-	sk = dn_find_by_skb(skb);</div><div class='del'>-got_it:</div><div class='del'>-	if (sk != NULL) {</div><div class='del'>-		struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-		/* Reset backoff */</div><div class='del'>-		scp-&gt;nsp_rxtshift = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We linearize everything except data segments here.</div><div class='del'>-		 */</div><div class='del'>-		if (cb-&gt;nsp_flags &amp; ~0x60) {</div><div class='del'>-			if (unlikely(skb_linearize(skb)))</div><div class='del'>-				goto free_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return sk_receive_skb(sk, skb, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dn_nsp_no_socket(skb, reason);</div><div class='del'>-</div><div class='del'>-free_out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_nsp_rx(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_IN,</div><div class='del'>-		       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-		       dn_nsp_rx_packet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the main receive routine for sockets. It is called</div><div class='del'>- * from the above when the socket is not busy, and also from</div><div class='del'>- * sock_release() when there is a backlog queued up.</div><div class='del'>- */</div><div class='del'>-int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	if (cb-&gt;rt_flags &amp; DN_RT_F_RTS) {</div><div class='del'>-		if (cb-&gt;nsp_flags == 0x18 || cb-&gt;nsp_flags == 0x68)</div><div class='del'>-			dn_returned_conn_init(sk, skb);</div><div class='del'>-		else</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		return NET_RX_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Control packet.</div><div class='del'>-	 */</div><div class='del'>-	if ((cb-&gt;nsp_flags &amp; 0x0c) == 0x08) {</div><div class='del'>-		switch (cb-&gt;nsp_flags &amp; 0x70) {</div><div class='del'>-		case 0x10:</div><div class='del'>-		case 0x60:</div><div class='del'>-			dn_nsp_conn_init(sk, skb);</div><div class='del'>-			break;</div><div class='del'>-		case 0x20:</div><div class='del'>-			dn_nsp_conn_conf(sk, skb);</div><div class='del'>-			break;</div><div class='del'>-		case 0x30:</div><div class='del'>-			dn_nsp_disc_init(sk, skb);</div><div class='del'>-			break;</div><div class='del'>-		case 0x40:</div><div class='del'>-			dn_nsp_disc_conf(sk, skb);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (cb-&gt;nsp_flags == 0x24) {</div><div class='del'>-		/*</div><div class='del'>-		 * Special for connacks, 'cos they don't have</div><div class='del'>-		 * ack data or ack otherdata info.</div><div class='del'>-		 */</div><div class='del'>-		dn_nsp_conn_ack(sk, skb);</div><div class='del'>-	} else {</div><div class='del'>-		int other = 1;</div><div class='del'>-</div><div class='del'>-		/* both data and ack frames can kick a CC socket into RUN */</div><div class='del'>-		if ((scp-&gt;state == DN_CC) &amp;&amp; !sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-			scp-&gt;state = DN_RUN;</div><div class='del'>-			sk-&gt;sk_state = TCP_ESTABLISHED;</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((cb-&gt;nsp_flags &amp; 0x1c) == 0)</div><div class='del'>-			other = 0;</div><div class='del'>-		if (cb-&gt;nsp_flags == 0x04)</div><div class='del'>-			other = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Read out ack data here, this applies equally</div><div class='del'>-		 * to data, other data, link serivce and both</div><div class='del'>-		 * ack data and ack otherdata.</div><div class='del'>-		 */</div><div class='del'>-		dn_process_ack(sk, skb, other);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we've some sort of data here then call a</div><div class='del'>-		 * suitable routine for dealing with it, otherwise</div><div class='del'>-		 * the packet is an ack and can be discarded.</div><div class='del'>-		 */</div><div class='del'>-		if ((cb-&gt;nsp_flags &amp; 0x0c) == 0) {</div><div class='del'>-</div><div class='del'>-			if (scp-&gt;state != DN_RUN)</div><div class='del'>-				goto free_out;</div><div class='del'>-</div><div class='del'>-			switch (cb-&gt;nsp_flags) {</div><div class='del'>-			case 0x10: /* LS */</div><div class='del'>-				dn_nsp_linkservice(sk, skb);</div><div class='del'>-				break;</div><div class='del'>-			case 0x30: /* OD */</div><div class='del'>-				dn_nsp_otherdata(sk, skb);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				dn_nsp_data(sk, skb);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else { /* Ack, chuck it out here */</div><div class='del'>-free_out:</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c<br/>deleted file mode 100644<br/>index a1779de6bd9c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_nsp_out.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_nsp_out.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,703 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Network Services Protocol (Output)</div><div class='del'>- *</div><div class='del'>- * Author:      Eduardo Marcelo Serrat &lt;emserrat@geocities.com&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *</div><div class='del'>- *    Steve Whitehouse:  Split into dn_nsp_in.c and dn_nsp_out.c from</div><div class='del'>- *                       original dn_nsp.c.</div><div class='del'>- *    Steve Whitehouse:  Updated to work with my new routing architecture.</div><div class='del'>- *    Steve Whitehouse:  Added changes from Eduardo Serrat's patches.</div><div class='del'>- *    Steve Whitehouse:  Now conninits have the "return" bit set.</div><div class='del'>- *    Steve Whitehouse:  Fixes to check alloc'd skbs are non NULL!</div><div class='del'>- *                       Moved output state machine into one function</div><div class='del'>- *    Steve Whitehouse:  New output state machine</div><div class='del'>- *         Paul Koning:  Connect Confirm message fix.</div><div class='del'>- *      Eduardo Serrat:  Fix to stop dn_nsp_do_disc() sending malformed packets.</div><div class='del'>- *    Steve Whitehouse:  dn_nsp_output() and friends needed a spring clean</div><div class='del'>- *    Steve Whitehouse:  Moved dn_nsp_send() in here from route.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    (c) 1995-1998 E.M. Serrat		emserrat@geocities.com</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-*******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/route.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/termios.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/if_packet.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_nsp.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int nsp_backoff[NSP_MAXRXTSHIFT + 1] = { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };</div><div class='del'>-</div><div class='del'>-static void dn_nsp_send(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = skb-&gt;sk;</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	struct flowidn fld;</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-	scp-&gt;stamp = jiffies;</div><div class='del'>-</div><div class='del'>-	dst = sk_dst_check(sk, 0);</div><div class='del'>-	if (dst) {</div><div class='del'>-try_again:</div><div class='del'>-		skb_dst_set(skb, dst);</div><div class='del'>-		dst_output(&amp;init_net, skb-&gt;sk, skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;fld, 0, sizeof(fld));</div><div class='del'>-	fld.flowidn_oif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-	fld.saddr = dn_saddr2dn(&amp;scp-&gt;addr);</div><div class='del'>-	fld.daddr = dn_saddr2dn(&amp;scp-&gt;peer);</div><div class='del'>-	dn_sk_ports_copy(&amp;fld, scp);</div><div class='del'>-	fld.flowidn_proto = DNPROTO_NSP;</div><div class='del'>-	if (dn_route_output_sock(&amp;sk-&gt;sk_dst_cache, &amp;fld, sk, 0) == 0) {</div><div class='del'>-		dst = sk_dst_get(sk);</div><div class='del'>-		sk-&gt;sk_route_caps = dst-&gt;dev-&gt;features;</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_err = EHOSTUNREACH;</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_state_change(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If sk == NULL, then we assume that we are supposed to be making</div><div class='del'>- * a routing layer skb. If sk != NULL, then we are supposed to be</div><div class='del'>- * creating an skb for the NSP layer.</div><div class='del'>- *</div><div class='del'>- * The eventual aim is for each socket to have a cached header size</div><div class='del'>- * for its outgoing packets, and to set hdr from this when sk != NULL.</div><div class='del'>- */</div><div class='del'>-struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int hdr = 64;</div><div class='del'>-</div><div class='del'>-	if ((skb = alloc_skb(size + hdr, pri)) == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_DNA_RT);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OUTGOING;</div><div class='del'>-</div><div class='del'>-	if (sk)</div><div class='del'>-		skb_set_owner_w(skb, sk);</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, hdr);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calculate persist timer based upon the smoothed round</div><div class='del'>- * trip time and the variance. Backoff according to the</div><div class='del'>- * nsp_backoff[] array.</div><div class='del'>- */</div><div class='del'>-unsigned long dn_nsp_persist(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	unsigned long t = ((scp-&gt;nsp_srtt &gt;&gt; 2) + scp-&gt;nsp_rttvar) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-	t *= nsp_backoff[scp-&gt;nsp_rxtshift];</div><div class='del'>-</div><div class='del'>-	if (t &lt; HZ) t = HZ;</div><div class='del'>-	if (t &gt; (600*HZ)) t = (600*HZ);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;nsp_rxtshift &lt; NSP_MAXRXTSHIFT)</div><div class='del'>-		scp-&gt;nsp_rxtshift++;</div><div class='del'>-</div><div class='del'>-	/* printk(KERN_DEBUG "rxtshift %lu, t=%lu\n", scp-&gt;nsp_rxtshift, t); */</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is called each time we get an estimate for the rtt</div><div class='del'>- * on the link.</div><div class='del'>- */</div><div class='del'>-static void dn_nsp_rtt(struct sock *sk, long rtt)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	long srtt = (long)scp-&gt;nsp_srtt;</div><div class='del'>-	long rttvar = (long)scp-&gt;nsp_rttvar;</div><div class='del'>-	long delta;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the jiffies clock flips over in the middle of timestamp</div><div class='del'>-	 * gathering this value might turn out negative, so we make sure</div><div class='del'>-	 * that is it always positive here.</div><div class='del'>-	 */</div><div class='del'>-	if (rtt &lt; 0)</div><div class='del'>-		rtt = -rtt;</div><div class='del'>-	/*</div><div class='del'>-	 * Add new rtt to smoothed average</div><div class='del'>-	 */</div><div class='del'>-	delta = ((rtt &lt;&lt; 3) - srtt);</div><div class='del'>-	srtt += (delta &gt;&gt; 3);</div><div class='del'>-	if (srtt &gt;= 1)</div><div class='del'>-		scp-&gt;nsp_srtt = (unsigned long)srtt;</div><div class='del'>-	else</div><div class='del'>-		scp-&gt;nsp_srtt = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add new rtt varience to smoothed varience</div><div class='del'>-	 */</div><div class='del'>-	delta &gt;&gt;= 1;</div><div class='del'>-	rttvar += ((((delta&gt;0)?(delta):(-delta)) - rttvar) &gt;&gt; 2);</div><div class='del'>-	if (rttvar &gt;= 1)</div><div class='del'>-		scp-&gt;nsp_rttvar = (unsigned long)rttvar;</div><div class='del'>-	else</div><div class='del'>-		scp-&gt;nsp_rttvar = 1;</div><div class='del'>-</div><div class='del'>-	/* printk(KERN_DEBUG "srtt=%lu rttvar=%lu\n", scp-&gt;nsp_srtt, scp-&gt;nsp_rttvar); */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_nsp_clone_and_send - Send a data packet by cloning it</div><div class='del'>- * @skb: The packet to clone and transmit</div><div class='del'>- * @gfp: memory allocation flag</div><div class='del'>- *</div><div class='del'>- * Clone a queued data or other data packet and transmit it.</div><div class='del'>- *</div><div class='del'>- * Returns: The number of times the packet has been sent previously</div><div class='del'>- */</div><div class='del'>-static inline unsigned int dn_nsp_clone_and_send(struct sk_buff *skb,</div><div class='del'>-					     gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct sk_buff *skb2;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if ((skb2 = skb_clone(skb, gfp)) != NULL) {</div><div class='del'>-		ret = cb-&gt;xmit_count;</div><div class='del'>-		cb-&gt;xmit_count++;</div><div class='del'>-		cb-&gt;stamp = jiffies;</div><div class='del'>-		skb2-&gt;sk = skb-&gt;sk;</div><div class='del'>-		dn_nsp_send(skb2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_nsp_output - Try and send something from socket queues</div><div class='del'>- * @sk: The socket whose queues are to be investigated</div><div class='del'>- *</div><div class='del'>- * Try and send the packet on the end of the data and other data queues.</div><div class='del'>- * Other data gets priority over data, and if we retransmit a packet we</div><div class='del'>- * reduce the window by dividing it in two.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void dn_nsp_output(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned int reduce_win = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First we check for otherdata/linkservice messages</div><div class='del'>-	 */</div><div class='del'>-	if ((skb = skb_peek(&amp;scp-&gt;other_xmit_queue)) != NULL)</div><div class='del'>-		reduce_win = dn_nsp_clone_and_send(skb, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we may not send any data, we don't.</div><div class='del'>-	 * If we are still trying to get some other data down the</div><div class='del'>-	 * channel, we don't try and send any data.</div><div class='del'>-	 */</div><div class='del'>-	if (reduce_win || (scp-&gt;flowrem_sw != DN_SEND))</div><div class='del'>-		goto recalc_window;</div><div class='del'>-</div><div class='del'>-	if ((skb = skb_peek(&amp;scp-&gt;data_xmit_queue)) != NULL)</div><div class='del'>-		reduce_win = dn_nsp_clone_and_send(skb, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we've sent any frame more than once, we cut the</div><div class='del'>-	 * send window size in half. There is always a minimum</div><div class='del'>-	 * window size of one available.</div><div class='del'>-	 */</div><div class='del'>-recalc_window:</div><div class='del'>-	if (reduce_win) {</div><div class='del'>-		scp-&gt;snd_window &gt;&gt;= 1;</div><div class='del'>-		if (scp-&gt;snd_window &lt; NSP_MIN_WINDOW)</div><div class='del'>-			scp-&gt;snd_window = NSP_MIN_WINDOW;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_nsp_xmit_timeout(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	dn_nsp_output(sk);</div><div class='del'>-</div><div class='del'>-	if (!skb_queue_empty(&amp;scp-&gt;data_xmit_queue) ||</div><div class='del'>-	    !skb_queue_empty(&amp;scp-&gt;other_xmit_queue))</div><div class='del'>-		scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le16 *dn_mk_common_header(struct dn_scp *scp, struct sk_buff *skb, unsigned char msgflag, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *ptr = skb_push(skb, len);</div><div class='del'>-</div><div class='del'>-	BUG_ON(len &lt; 5);</div><div class='del'>-</div><div class='del'>-	*ptr++ = msgflag;</div><div class='del'>-	*((__le16 *)ptr) = scp-&gt;addrrem;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	*((__le16 *)ptr) = scp-&gt;addrloc;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	return (__le16 __force *)ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned char msgflag, int hlen, int other)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	unsigned short acknum = scp-&gt;numdat_rcv &amp; 0x0FFF;</div><div class='del'>-	unsigned short ackcrs = scp-&gt;numoth_rcv &amp; 0x0FFF;</div><div class='del'>-	__le16 *ptr;</div><div class='del'>-</div><div class='del'>-	BUG_ON(hlen &lt; 9);</div><div class='del'>-</div><div class='del'>-	scp-&gt;ackxmt_dat = acknum;</div><div class='del'>-	scp-&gt;ackxmt_oth = ackcrs;</div><div class='del'>-	acknum |= 0x8000;</div><div class='del'>-	ackcrs |= 0x8000;</div><div class='del'>-</div><div class='del'>-	/* If this is an "other data/ack" message, swap acknum and ackcrs */</div><div class='del'>-	if (other)</div><div class='del'>-		swap(acknum, ackcrs);</div><div class='del'>-</div><div class='del'>-	/* Set "cross subchannel" bit in ackcrs */</div><div class='del'>-	ackcrs |= 0x2000;</div><div class='del'>-</div><div class='del'>-	ptr = dn_mk_common_header(scp, skb, msgflag, hlen);</div><div class='del'>-</div><div class='del'>-	*ptr++ = cpu_to_le16(acknum);</div><div class='del'>-	*ptr++ = cpu_to_le16(ackcrs);</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __le16 *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *skb, int oth)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	__le16 *ptr = dn_mk_ack_header(sk, skb, cb-&gt;nsp_flags, 11, oth);</div><div class='del'>-</div><div class='del'>-	if (unlikely(oth)) {</div><div class='del'>-		cb-&gt;segnum = scp-&gt;numoth;</div><div class='del'>-		seq_add(&amp;scp-&gt;numoth, 1);</div><div class='del'>-	} else {</div><div class='del'>-		cb-&gt;segnum = scp-&gt;numdat;</div><div class='del'>-		seq_add(&amp;scp-&gt;numdat, 1);</div><div class='del'>-	}</div><div class='del'>-	*(ptr++) = cpu_to_le16(cb-&gt;segnum);</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			gfp_t gfp, int oth)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	unsigned long t = ((scp-&gt;nsp_srtt &gt;&gt; 2) + scp-&gt;nsp_rttvar) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-	cb-&gt;xmit_count = 0;</div><div class='del'>-	dn_nsp_mk_data_header(sk, skb, oth);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Slow start: If we have been idle for more than</div><div class='del'>-	 * one RTT, then reset window to min size.</div><div class='del'>-	 */</div><div class='del'>-	if ((jiffies - scp-&gt;stamp) &gt; t)</div><div class='del'>-		scp-&gt;snd_window = NSP_MIN_WINDOW;</div><div class='del'>-</div><div class='del'>-	if (oth)</div><div class='del'>-		skb_queue_tail(&amp;scp-&gt;other_xmit_queue, skb);</div><div class='del'>-	else</div><div class='del'>-		skb_queue_tail(&amp;scp-&gt;data_xmit_queue, skb);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;flowrem_sw != DN_SEND)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dn_nsp_clone_and_send(skb, gfp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff_head *q, unsigned short acknum)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff *skb2, *n, *ack = NULL;</div><div class='del'>-	int wakeup = 0;</div><div class='del'>-	int try_retrans = 0;</div><div class='del'>-	unsigned long reftime = cb-&gt;stamp;</div><div class='del'>-	unsigned long pkttime;</div><div class='del'>-	unsigned short xmit_count;</div><div class='del'>-	unsigned short segnum;</div><div class='del'>-</div><div class='del'>-	skb_queue_walk_safe(q, skb2, n) {</div><div class='del'>-		struct dn_skb_cb *cb2 = DN_SKB_CB(skb2);</div><div class='del'>-</div><div class='del'>-		if (dn_before_or_equal(cb2-&gt;segnum, acknum))</div><div class='del'>-			ack = skb2;</div><div class='del'>-</div><div class='del'>-		/* printk(KERN_DEBUG "ack: %s %04x %04x\n", ack ? "ACK" : "SKIP", (int)cb2-&gt;segnum, (int)acknum); */</div><div class='del'>-</div><div class='del'>-		if (ack == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* printk(KERN_DEBUG "check_xmit_queue: %04x, %d\n", acknum, cb2-&gt;xmit_count); */</div><div class='del'>-</div><div class='del'>-		/* Does _last_ packet acked have xmit_count &gt; 1 */</div><div class='del'>-		try_retrans = 0;</div><div class='del'>-		/* Remember to wake up the sending process */</div><div class='del'>-		wakeup = 1;</div><div class='del'>-		/* Keep various statistics */</div><div class='del'>-		pkttime = cb2-&gt;stamp;</div><div class='del'>-		xmit_count = cb2-&gt;xmit_count;</div><div class='del'>-		segnum = cb2-&gt;segnum;</div><div class='del'>-		/* Remove and drop ack'ed packet */</div><div class='del'>-		skb_unlink(ack, q);</div><div class='del'>-		kfree_skb(ack);</div><div class='del'>-		ack = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We don't expect to see acknowledgements for packets we</div><div class='del'>-		 * haven't sent yet.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(xmit_count == 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the packet has only been sent once, we can use it</div><div class='del'>-		 * to calculate the RTT and also open the window a little</div><div class='del'>-		 * further.</div><div class='del'>-		 */</div><div class='del'>-		if (xmit_count == 1) {</div><div class='del'>-			if (dn_equal(segnum, acknum))</div><div class='del'>-				dn_nsp_rtt(sk, (long)(pkttime - reftime));</div><div class='del'>-</div><div class='del'>-			if (scp-&gt;snd_window &lt; scp-&gt;max_window)</div><div class='del'>-				scp-&gt;snd_window++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Packet has been sent more than once. If this is the last</div><div class='del'>-		 * packet to be acknowledged then we want to send the next</div><div class='del'>-		 * packet in the send queue again (assumes the remote host does</div><div class='del'>-		 * go-back-N error control).</div><div class='del'>-		 */</div><div class='del'>-		if (xmit_count &gt; 1)</div><div class='del'>-			try_retrans = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (try_retrans)</div><div class='del'>-		dn_nsp_output(sk);</div><div class='del'>-</div><div class='del'>-	return wakeup;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_nsp_send_data_ack(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, 9, GFP_ATOMIC)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, 9);</div><div class='del'>-	dn_mk_ack_header(sk, skb, 0x04, 9, 0);</div><div class='del'>-	dn_nsp_send(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_nsp_send_oth_ack(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, 9, GFP_ATOMIC)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, 9);</div><div class='del'>-	dn_mk_ack_header(sk, skb, 0x14, 9, 1);</div><div class='del'>-	dn_nsp_send(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dn_send_conn_ack (struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct nsp_conn_ack_msg *msg;</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, 3, sk-&gt;sk_allocation)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	msg = skb_put(skb, 3);</div><div class='del'>-	msg-&gt;msgflg = 0x24;</div><div class='del'>-	msg-&gt;dstaddr = scp-&gt;addrrem;</div><div class='del'>-</div><div class='del'>-	dn_nsp_send(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nsp_retrans_conn_conf(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state == DN_CC)</div><div class='del'>-		dn_send_conn_conf(sk, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_send_conn_conf(struct sock *sk, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct nsp_conn_init_msg *msg;</div><div class='del'>-	__u8 len = (__u8)le16_to_cpu(scp-&gt;conndata_out.opt_optl);</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, 50 + len, gfp)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	msg = skb_put(skb, sizeof(*msg));</div><div class='del'>-	msg-&gt;msgflg = 0x28;</div><div class='del'>-	msg-&gt;dstaddr = scp-&gt;addrrem;</div><div class='del'>-	msg-&gt;srcaddr = scp-&gt;addrloc;</div><div class='del'>-	msg-&gt;services = scp-&gt;services_loc;</div><div class='del'>-	msg-&gt;info = scp-&gt;info_loc;</div><div class='del'>-	msg-&gt;segsize = cpu_to_le16(scp-&gt;segsize_loc);</div><div class='del'>-</div><div class='del'>-	skb_put_u8(skb, len);</div><div class='del'>-</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		skb_put_data(skb, scp-&gt;conndata_out.opt_data, len);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	dn_nsp_send(skb);</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-	scp-&gt;persist_fxn = dn_nsp_retrans_conn_conf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,</div><div class='del'>-			unsigned short reason, gfp_t gfp,</div><div class='del'>-			struct dst_entry *dst,</div><div class='del'>-			int ddl, unsigned char *dd, __le16 rem, __le16 loc)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	int size = 7 + ddl + ((msgflg == NSP_DISCINIT) ? 1 : 0);</div><div class='del'>-	unsigned char *msg;</div><div class='del'>-</div><div class='del'>-	if ((dst == NULL) || (rem == 0)) {</div><div class='del'>-		net_dbg_ratelimited("DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n",</div><div class='del'>-				    le16_to_cpu(rem), dst);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, size, gfp)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	msg = skb_put(skb, size);</div><div class='del'>-	*msg++ = msgflg;</div><div class='del'>-	*(__le16 *)msg = rem;</div><div class='del'>-	msg += 2;</div><div class='del'>-	*(__le16 *)msg = loc;</div><div class='del'>-	msg += 2;</div><div class='del'>-	*(__le16 *)msg = cpu_to_le16(reason);</div><div class='del'>-	msg += 2;</div><div class='del'>-	if (msgflg == NSP_DISCINIT)</div><div class='del'>-		*msg++ = ddl;</div><div class='del'>-</div><div class='del'>-	if (ddl) {</div><div class='del'>-		memcpy(msg, dd, ddl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This doesn't go via the dn_nsp_send() function since we need</div><div class='del'>-	 * to be able to send disc packets out which have no socket</div><div class='del'>-	 * associations.</div><div class='del'>-	 */</div><div class='del'>-	skb_dst_set(skb, dst_clone(dst));</div><div class='del'>-	dst_output(&amp;init_net, skb-&gt;sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dn_nsp_send_disc(struct sock *sk, unsigned char msgflg,</div><div class='del'>-			unsigned short reason, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	int ddl = 0;</div><div class='del'>-</div><div class='del'>-	if (msgflg == NSP_DISCINIT)</div><div class='del'>-		ddl = le16_to_cpu(scp-&gt;discdata_out.opt_optl);</div><div class='del'>-</div><div class='del'>-	if (reason == 0)</div><div class='del'>-		reason = le16_to_cpu(scp-&gt;discdata_out.opt_status);</div><div class='del'>-</div><div class='del'>-	dn_nsp_do_disc(sk, msgflg, reason, gfp, __sk_dst_get(sk), ddl,</div><div class='del'>-		scp-&gt;discdata_out.opt_data, scp-&gt;addrrem, scp-&gt;addrloc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dn_nsp_return_disc(struct sk_buff *skb, unsigned char msgflg,</div><div class='del'>-			unsigned short reason)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	int ddl = 0;</div><div class='del'>-	gfp_t gfp = GFP_ATOMIC;</div><div class='del'>-</div><div class='del'>-	dn_nsp_do_disc(NULL, msgflg, reason, gfp, skb_dst(skb), ddl,</div><div class='del'>-			NULL, cb-&gt;src_port, cb-&gt;dst_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	gfp_t gfp = GFP_ATOMIC;</div><div class='del'>-</div><div class='del'>-	if ((skb = dn_alloc_skb(sk, DN_MAX_NSP_DATA_HEADER + 2, gfp)) == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, DN_MAX_NSP_DATA_HEADER);</div><div class='del'>-	ptr = skb_put(skb, 2);</div><div class='del'>-	DN_SKB_CB(skb)-&gt;nsp_flags = 0x10;</div><div class='del'>-	*ptr++ = lsflags;</div><div class='del'>-	*ptr = fcval;</div><div class='del'>-</div><div class='del'>-	dn_nsp_queue_xmit(sk, skb, gfp, 1);</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-	scp-&gt;persist_fxn = dn_nsp_xmit_timeout;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_nsp_retrans_conninit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;state == DN_CI)</div><div class='del'>-		dn_nsp_send_conninit(sk, NSP_RCI);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)</div><div class='del'>-{</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-	struct nsp_conn_init_msg *msg;</div><div class='del'>-	unsigned char aux;</div><div class='del'>-	unsigned char menuver;</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	unsigned char type = 1;</div><div class='del'>-	gfp_t allocation = (msgflg == NSP_CI) ? sk-&gt;sk_allocation : GFP_ATOMIC;</div><div class='del'>-	struct sk_buff *skb = dn_alloc_skb(sk, 200, allocation);</div><div class='del'>-</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cb  = DN_SKB_CB(skb);</div><div class='del'>-	msg = skb_put(skb, sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	msg-&gt;msgflg	= msgflg;</div><div class='del'>-	msg-&gt;dstaddr	= 0x0000;		/* Remote Node will assign it*/</div><div class='del'>-</div><div class='del'>-	msg-&gt;srcaddr	= scp-&gt;addrloc;</div><div class='del'>-	msg-&gt;services	= scp-&gt;services_loc;	/* Requested flow control    */</div><div class='del'>-	msg-&gt;info	= scp-&gt;info_loc;	/* Version Number            */</div><div class='del'>-	msg-&gt;segsize	= cpu_to_le16(scp-&gt;segsize_loc);	/* Max segment size  */</div><div class='del'>-</div><div class='del'>-	if (scp-&gt;peer.sdn_objnum)</div><div class='del'>-		type = 0;</div><div class='del'>-</div><div class='del'>-	skb_put(skb, dn_sockaddr2username(&amp;scp-&gt;peer,</div><div class='del'>-					  skb_tail_pointer(skb), type));</div><div class='del'>-	skb_put(skb, dn_sockaddr2username(&amp;scp-&gt;addr,</div><div class='del'>-					  skb_tail_pointer(skb), 2));</div><div class='del'>-</div><div class='del'>-	menuver = DN_MENUVER_ACC | DN_MENUVER_USR;</div><div class='del'>-	if (scp-&gt;peer.sdn_flags &amp; SDF_PROXY)</div><div class='del'>-		menuver |= DN_MENUVER_PRX;</div><div class='del'>-	if (scp-&gt;peer.sdn_flags &amp; SDF_UICPROXY)</div><div class='del'>-		menuver |= DN_MENUVER_UIC;</div><div class='del'>-</div><div class='del'>-	skb_put_u8(skb, menuver);	/* Menu Version		*/</div><div class='del'>-</div><div class='del'>-	aux = scp-&gt;accessdata.acc_userl;</div><div class='del'>-	skb_put_u8(skb, aux);</div><div class='del'>-	if (aux &gt; 0)</div><div class='del'>-		skb_put_data(skb, scp-&gt;accessdata.acc_user, aux);</div><div class='del'>-</div><div class='del'>-	aux = scp-&gt;accessdata.acc_passl;</div><div class='del'>-	skb_put_u8(skb, aux);</div><div class='del'>-	if (aux &gt; 0)</div><div class='del'>-		skb_put_data(skb, scp-&gt;accessdata.acc_pass, aux);</div><div class='del'>-</div><div class='del'>-	aux = scp-&gt;accessdata.acc_accl;</div><div class='del'>-	skb_put_u8(skb, aux);</div><div class='del'>-	if (aux &gt; 0)</div><div class='del'>-		skb_put_data(skb, scp-&gt;accessdata.acc_acc, aux);</div><div class='del'>-</div><div class='del'>-	aux = (__u8)le16_to_cpu(scp-&gt;conndata_out.opt_optl);</div><div class='del'>-	skb_put_u8(skb, aux);</div><div class='del'>-	if (aux &gt; 0)</div><div class='del'>-		skb_put_data(skb, scp-&gt;conndata_out.opt_data, aux);</div><div class='del'>-</div><div class='del'>-	scp-&gt;persist = dn_nsp_persist(sk);</div><div class='del'>-	scp-&gt;persist_fxn = dn_nsp_retrans_conninit;</div><div class='del'>-</div><div class='del'>-	cb-&gt;rt_flags = DN_RT_F_RQR;</div><div class='del'>-</div><div class='del'>-	dn_nsp_send(skb);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c<br/>deleted file mode 100644<br/>index 1c002c0fb712..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_route.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_route.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1927 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Routing Functions (Endnode and Router)</div><div class='del'>- *</div><div class='del'>- * Authors:     Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *              Eduardo Marcelo Serrat &lt;emserrat@geocities.com&gt;</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *              Steve Whitehouse : Fixes to allow "intra-ethernet" and</div><div class='del'>- *                                 "return-to-sender" bits on outgoing</div><div class='del'>- *                                 packets.</div><div class='del'>- *		Steve Whitehouse : Timeouts for cached routes.</div><div class='del'>- *              Steve Whitehouse : Use dst cache for input routes too.</div><div class='del'>- *              Steve Whitehouse : Fixed error values in dn_send_skb.</div><div class='del'>- *              Steve Whitehouse : Rework routing functions to better fit</div><div class='del'>- *                                 DECnet routing design</div><div class='del'>- *              Alexey Kuznetsov : New SMP locking</div><div class='del'>- *              Steve Whitehouse : More SMP locking changes &amp; dn_cache_dump()</div><div class='del'>- *              Steve Whitehouse : Prerouting NF hook, now really is prerouting.</div><div class='del'>- *				   Fixed possible skb leak in rtnetlink funcs.</div><div class='del'>- *              Steve Whitehouse : Dave Miller's dynamic hash table sizing and</div><div class='del'>- *                                 Alexey Kuznetsov's finer grained locking</div><div class='del'>- *                                 from ipv4/route.c.</div><div class='del'>- *              Steve Whitehouse : Routing is now starting to look like a</div><div class='del'>- *                                 sensible set of code now, mainly due to</div><div class='del'>- *                                 my copying the IPv4 routing code. The</div><div class='del'>- *                                 hooks here are modified and will continue</div><div class='del'>- *                                 to evolve for a while.</div><div class='del'>- *              Steve Whitehouse : Real SMP at last :-) Also new netfilter</div><div class='del'>- *                                 stuff. Look out raw sockets your days</div><div class='del'>- *                                 are numbered!</div><div class='del'>- *              Steve Whitehouse : Added return-to-sender functions. Added</div><div class='del'>- *                                 backlog congestion level return codes.</div><div class='del'>- *		Steve Whitehouse : Fixed bug where routes were set up with</div><div class='del'>- *                                 no ref count on net devices.</div><div class='del'>- *              Steve Whitehouse : RCU for the route cache</div><div class='del'>- *              Steve Whitehouse : Preparations for the flow cache</div><div class='del'>- *              Steve Whitehouse : Prepare for nonlinear skbs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    (c) 1995-1998 E.M. Serrat		emserrat@geocities.com</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-*******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/route.h&gt;</div><div class='del'>-#include &lt;linux/in_route.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_decnet.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/times.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_nsp.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-</div><div class='del'>-struct dn_rt_hash_bucket</div><div class='del'>-{</div><div class='del'>-	struct dn_route __rcu *chain;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct neigh_table dn_neigh_table;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static unsigned char dn_hiord_addr[6] = {0xAA,0x00,0x04,0x00,0x00,0x00};</div><div class='del'>-</div><div class='del'>-static const int dn_rt_min_delay = 2 * HZ;</div><div class='del'>-static const int dn_rt_max_delay = 10 * HZ;</div><div class='del'>-static const int dn_rt_mtu_expires = 10 * 60 * HZ;</div><div class='del'>-</div><div class='del'>-static unsigned long dn_rt_deadline;</div><div class='del'>-</div><div class='del'>-static int dn_dst_gc(struct dst_ops *ops);</div><div class='del'>-static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);</div><div class='del'>-static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);</div><div class='del'>-static unsigned int dn_dst_mtu(const struct dst_entry *dst);</div><div class='del'>-static void dn_dst_destroy(struct dst_entry *);</div><div class='del'>-static void dn_dst_ifdown(struct dst_entry *, struct net_device *dev, int how);</div><div class='del'>-static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);</div><div class='del'>-static void dn_dst_link_failure(struct sk_buff *);</div><div class='del'>-static void dn_dst_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			       struct sk_buff *skb , u32 mtu);</div><div class='del'>-static void dn_dst_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			    struct sk_buff *skb);</div><div class='del'>-static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst,</div><div class='del'>-					     struct sk_buff *skb,</div><div class='del'>-					     const void *daddr);</div><div class='del'>-static int dn_route_input(struct sk_buff *);</div><div class='del'>-static void dn_run_flush(struct timer_list *unused);</div><div class='del'>-</div><div class='del'>-static struct dn_rt_hash_bucket *dn_rt_hash_table;</div><div class='del'>-static unsigned int dn_rt_hash_mask;</div><div class='del'>-</div><div class='del'>-static struct timer_list dn_route_timer;</div><div class='del'>-static DEFINE_TIMER(dn_rt_flush_timer, dn_run_flush);</div><div class='del'>-int decnet_dst_gc_interval = 2;</div><div class='del'>-</div><div class='del'>-static struct dst_ops dn_dst_ops = {</div><div class='del'>-	.family =		PF_DECnet,</div><div class='del'>-	.gc_thresh =		128,</div><div class='del'>-	.gc =			dn_dst_gc,</div><div class='del'>-	.check =		dn_dst_check,</div><div class='del'>-	.default_advmss =	dn_dst_default_advmss,</div><div class='del'>-	.mtu =			dn_dst_mtu,</div><div class='del'>-	.cow_metrics =		dst_cow_metrics_generic,</div><div class='del'>-	.destroy =		dn_dst_destroy,</div><div class='del'>-	.ifdown =		dn_dst_ifdown,</div><div class='del'>-	.negative_advice =	dn_dst_negative_advice,</div><div class='del'>-	.link_failure =		dn_dst_link_failure,</div><div class='del'>-	.update_pmtu =		dn_dst_update_pmtu,</div><div class='del'>-	.redirect =		dn_dst_redirect,</div><div class='del'>-	.neigh_lookup =		dn_dst_neigh_lookup,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dn_dst_destroy(struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = (struct dn_route *) dst;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;n)</div><div class='del'>-		neigh_release(rt-&gt;n);</div><div class='del'>-	dst_destroy_metrics_generic(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dst_ifdown(struct dst_entry *dst, struct net_device *dev, int how)</div><div class='del'>-{</div><div class='del'>-	if (how) {</div><div class='del'>-		struct dn_route *rt = (struct dn_route *) dst;</div><div class='del'>-		struct neighbour *n = rt-&gt;n;</div><div class='del'>-</div><div class='del'>-		if (n &amp;&amp; n-&gt;dev == dev) {</div><div class='del'>-			n-&gt;dev = dev_net(dev)-&gt;loopback_dev;</div><div class='del'>-			dev_hold(n-&gt;dev);</div><div class='del'>-			dev_put(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int dn_hash(__le16 src, __le16 dst)</div><div class='del'>-{</div><div class='del'>-	__u16 tmp = (__u16 __force)(src ^ dst);</div><div class='del'>-	tmp ^= (tmp &gt;&gt; 3);</div><div class='del'>-	tmp ^= (tmp &gt;&gt; 5);</div><div class='del'>-	tmp ^= (tmp &gt;&gt; 10);</div><div class='del'>-	return dn_rt_hash_mask &amp; (unsigned int)tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dst_check_expire(struct timer_list *unused)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct dn_route *rt;</div><div class='del'>-	struct dn_route __rcu **rtp;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	unsigned long expire = 120 * HZ;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= dn_rt_hash_mask; i++) {</div><div class='del'>-		rtp = &amp;dn_rt_hash_table[i].chain;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-		while ((rt = rcu_dereference_protected(*rtp,</div><div class='del'>-						lockdep_is_held(&amp;dn_rt_hash_table[i].lock))) != NULL) {</div><div class='del'>-			if (atomic_read(&amp;rt-&gt;dst.__refcnt) &gt; 1 ||</div><div class='del'>-			    (now - rt-&gt;dst.lastuse) &lt; expire) {</div><div class='del'>-				rtp = &amp;rt-&gt;dn_next;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			*rtp = rt-&gt;dn_next;</div><div class='del'>-			rt-&gt;dn_next = NULL;</div><div class='del'>-			dst_dev_put(&amp;rt-&gt;dst);</div><div class='del'>-			dst_release(&amp;rt-&gt;dst);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-</div><div class='del'>-		if ((jiffies - now) &gt; 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;dn_route_timer, now + decnet_dst_gc_interval * HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_dst_gc(struct dst_ops *ops)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt;</div><div class='del'>-	struct dn_route __rcu **rtp;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	unsigned long expire = 10 * HZ;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= dn_rt_hash_mask; i++) {</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-		rtp = &amp;dn_rt_hash_table[i].chain;</div><div class='del'>-</div><div class='del'>-		while ((rt = rcu_dereference_protected(*rtp,</div><div class='del'>-						lockdep_is_held(&amp;dn_rt_hash_table[i].lock))) != NULL) {</div><div class='del'>-			if (atomic_read(&amp;rt-&gt;dst.__refcnt) &gt; 1 ||</div><div class='del'>-			    (now - rt-&gt;dst.lastuse) &lt; expire) {</div><div class='del'>-				rtp = &amp;rt-&gt;dn_next;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			*rtp = rt-&gt;dn_next;</div><div class='del'>-			rt-&gt;dn_next = NULL;</div><div class='del'>-			dst_dev_put(&amp;rt-&gt;dst);</div><div class='del'>-			dst_release(&amp;rt-&gt;dst);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The decnet standards don't impose a particular minimum mtu, what they</div><div class='del'>- * do insist on is that the routing layer accepts a datagram of at least</div><div class='del'>- * 230 bytes long. Here we have to subtract the routing header length from</div><div class='del'>- * 230 to get the minimum acceptable mtu. If there is no neighbour, then we</div><div class='del'>- * assume the worst and use a long header size.</div><div class='del'>- *</div><div class='del'>- * We update both the mtu and the advertised mss (i.e. the segment size we</div><div class='del'>- * advertise to the other end).</div><div class='del'>- */</div><div class='del'>-static void dn_dst_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			       struct sk_buff *skb, u32 mtu)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = (struct dn_route *) dst;</div><div class='del'>-	struct neighbour *n = rt-&gt;n;</div><div class='del'>-	u32 min_mtu = 230;</div><div class='del'>-	struct dn_dev *dn;</div><div class='del'>-</div><div class='del'>-	dn = n ? rcu_dereference_raw(n-&gt;dev-&gt;dn_ptr) : NULL;</div><div class='del'>-</div><div class='del'>-	if (dn &amp;&amp; dn-&gt;use_long == 0)</div><div class='del'>-		min_mtu -= 6;</div><div class='del'>-	else</div><div class='del'>-		min_mtu -= 21;</div><div class='del'>-</div><div class='del'>-	if (dst_metric(dst, RTAX_MTU) &gt; mtu &amp;&amp; mtu &gt;= min_mtu) {</div><div class='del'>-		if (!(dst_metric_locked(dst, RTAX_MTU))) {</div><div class='del'>-			dst_metric_set(dst, RTAX_MTU, mtu);</div><div class='del'>-			dst_set_expires(dst, dn_rt_mtu_expires);</div><div class='del'>-		}</div><div class='del'>-		if (!(dst_metric_locked(dst, RTAX_ADVMSS))) {</div><div class='del'>-			u32 mss = mtu - DN_MAX_NSP_DATA_HEADER;</div><div class='del'>-			u32 existing_mss = dst_metric_raw(dst, RTAX_ADVMSS);</div><div class='del'>-			if (!existing_mss || existing_mss &gt; mss)</div><div class='del'>-				dst_metric_set(dst, RTAX_ADVMSS, mss);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dst_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When a route has been marked obsolete. (e.g. routing cache flush)</div><div class='del'>- */</div><div class='del'>-static struct dst_entry *dn_dst_check(struct dst_entry *dst, __u32 cookie)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dst_entry *dn_dst_negative_advice(struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	dst_release(dst);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_dst_link_failure(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int compare_keys(struct flowidn *fl1, struct flowidn *fl2)</div><div class='del'>-{</div><div class='del'>-	return ((fl1-&gt;daddr ^ fl2-&gt;daddr) |</div><div class='del'>-		(fl1-&gt;saddr ^ fl2-&gt;saddr) |</div><div class='del'>-		(fl1-&gt;flowidn_mark ^ fl2-&gt;flowidn_mark) |</div><div class='del'>-		(fl1-&gt;flowidn_scope ^ fl2-&gt;flowidn_scope) |</div><div class='del'>-		(fl1-&gt;flowidn_oif ^ fl2-&gt;flowidn_oif) |</div><div class='del'>-		(fl1-&gt;flowidn_iif ^ fl2-&gt;flowidn_iif)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_insert_route(struct dn_route *rt, unsigned int hash, struct dn_route **rp)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rth;</div><div class='del'>-	struct dn_route __rcu **rthp;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-</div><div class='del'>-	rthp = &amp;dn_rt_hash_table[hash].chain;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;dn_rt_hash_table[hash].lock);</div><div class='del'>-	while ((rth = rcu_dereference_protected(*rthp,</div><div class='del'>-						lockdep_is_held(&amp;dn_rt_hash_table[hash].lock))) != NULL) {</div><div class='del'>-		if (compare_keys(&amp;rth-&gt;fld, &amp;rt-&gt;fld)) {</div><div class='del'>-			/* Put it first */</div><div class='del'>-			*rthp = rth-&gt;dn_next;</div><div class='del'>-			rcu_assign_pointer(rth-&gt;dn_next,</div><div class='del'>-					   dn_rt_hash_table[hash].chain);</div><div class='del'>-			rcu_assign_pointer(dn_rt_hash_table[hash].chain, rth);</div><div class='del'>-</div><div class='del'>-			dst_hold_and_use(&amp;rth-&gt;dst, now);</div><div class='del'>-			spin_unlock_bh(&amp;dn_rt_hash_table[hash].lock);</div><div class='del'>-</div><div class='del'>-			dst_release_immediate(&amp;rt-&gt;dst);</div><div class='del'>-			*rp = rth;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		rthp = &amp;rth-&gt;dn_next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_assign_pointer(rt-&gt;dn_next, dn_rt_hash_table[hash].chain);</div><div class='del'>-	rcu_assign_pointer(dn_rt_hash_table[hash].chain, rt);</div><div class='del'>-</div><div class='del'>-	dst_hold_and_use(&amp;rt-&gt;dst, now);</div><div class='del'>-	spin_unlock_bh(&amp;dn_rt_hash_table[hash].lock);</div><div class='del'>-	*rp = rt;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_run_flush(struct timer_list *unused)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct dn_route *rt, *next;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dn_rt_hash_mask; i++) {</div><div class='del'>-		spin_lock_bh(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-</div><div class='del'>-		if ((rt = xchg((struct dn_route **)&amp;dn_rt_hash_table[i].chain, NULL)) == NULL)</div><div class='del'>-			goto nothing_to_declare;</div><div class='del'>-</div><div class='del'>-		for(; rt; rt = next) {</div><div class='del'>-			next = rcu_dereference_raw(rt-&gt;dn_next);</div><div class='del'>-			RCU_INIT_POINTER(rt-&gt;dn_next, NULL);</div><div class='del'>-			dst_dev_put(&amp;rt-&gt;dst);</div><div class='del'>-			dst_release(&amp;rt-&gt;dst);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-nothing_to_declare:</div><div class='del'>-		spin_unlock_bh(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(dn_rt_flush_lock);</div><div class='del'>-</div><div class='del'>-void dn_rt_cache_flush(int delay)</div><div class='del'>-{</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	int user_mode = !in_interrupt();</div><div class='del'>-</div><div class='del'>-	if (delay &lt; 0)</div><div class='del'>-		delay = dn_rt_min_delay;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;dn_rt_flush_lock);</div><div class='del'>-</div><div class='del'>-	if (del_timer(&amp;dn_rt_flush_timer) &amp;&amp; delay &gt; 0 &amp;&amp; dn_rt_deadline) {</div><div class='del'>-		long tmo = (long)(dn_rt_deadline - now);</div><div class='del'>-</div><div class='del'>-		if (user_mode &amp;&amp; tmo &lt; dn_rt_max_delay - dn_rt_min_delay)</div><div class='del'>-			tmo = 0;</div><div class='del'>-</div><div class='del'>-		if (delay &gt; tmo)</div><div class='del'>-			delay = tmo;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (delay &lt;= 0) {</div><div class='del'>-		spin_unlock_bh(&amp;dn_rt_flush_lock);</div><div class='del'>-		dn_run_flush(NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dn_rt_deadline == 0)</div><div class='del'>-		dn_rt_deadline = now + dn_rt_max_delay;</div><div class='del'>-</div><div class='del'>-	dn_rt_flush_timer.expires = now + delay;</div><div class='del'>-	add_timer(&amp;dn_rt_flush_timer);</div><div class='del'>-	spin_unlock_bh(&amp;dn_rt_flush_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_return_short - Return a short packet to its sender</div><div class='del'>- * @skb: The packet to return</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int dn_return_short(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	__le16 *src;</div><div class='del'>-	__le16 *dst;</div><div class='del'>-</div><div class='del'>-	/* Add back headers */</div><div class='del'>-	skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='del'>-</div><div class='del'>-	if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL)</div><div class='del'>-		return NET_RX_DROP;</div><div class='del'>-</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-	/* Skip packet length and point to flags */</div><div class='del'>-	ptr = skb-&gt;data + 2;</div><div class='del'>-	*ptr++ = (cb-&gt;rt_flags &amp; ~DN_RT_F_RQR) | DN_RT_F_RTS;</div><div class='del'>-</div><div class='del'>-	dst = (__le16 *)ptr;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	src = (__le16 *)ptr;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	*ptr = 0; /* Zero hop count */</div><div class='del'>-</div><div class='del'>-	swap(*src, *dst);</div><div class='del'>-</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OUTGOING;</div><div class='del'>-	dn_rt_finish_output(skb, NULL, NULL);</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_return_long - Return a long packet to its sender</div><div class='del'>- * @skb: The long format packet to return</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int dn_return_long(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	unsigned char *src_addr, *dst_addr;</div><div class='del'>-	unsigned char tmp[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	/* Add back all headers */</div><div class='del'>-	skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='del'>-</div><div class='del'>-	if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL)</div><div class='del'>-		return NET_RX_DROP;</div><div class='del'>-</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-	/* Ignore packet length and point to flags */</div><div class='del'>-	ptr = skb-&gt;data + 2;</div><div class='del'>-</div><div class='del'>-	/* Skip padding */</div><div class='del'>-	if (*ptr &amp; DN_RT_F_PF) {</div><div class='del'>-		char padlen = (*ptr &amp; ~DN_RT_F_PF);</div><div class='del'>-		ptr += padlen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*ptr++ = (cb-&gt;rt_flags &amp; ~DN_RT_F_RQR) | DN_RT_F_RTS;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	dst_addr = ptr;</div><div class='del'>-	ptr += 8;</div><div class='del'>-	src_addr = ptr;</div><div class='del'>-	ptr += 6;</div><div class='del'>-	*ptr = 0; /* Zero hop count */</div><div class='del'>-</div><div class='del'>-	/* Swap source and destination */</div><div class='del'>-	memcpy(tmp, src_addr, ETH_ALEN);</div><div class='del'>-	memcpy(src_addr, dst_addr, ETH_ALEN);</div><div class='del'>-	memcpy(dst_addr, tmp, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OUTGOING;</div><div class='del'>-	dn_rt_finish_output(skb, dst_addr, src_addr);</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dn_route_rx_packet - Try and find a route for an incoming packet</div><div class='del'>- * @skb: The packet to find a route for</div><div class='del'>- *</div><div class='del'>- * Returns: result of input function if route is found, error code otherwise</div><div class='del'>- */</div><div class='del'>-static int dn_route_rx_packet(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = dn_route_input(skb)) == 0)</div><div class='del'>-		return dst_input(skb);</div><div class='del'>-</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-	if (decnet_debug_level &amp; 4) {</div><div class='del'>-		char *devname = skb-&gt;dev ? skb-&gt;dev-&gt;name : "???";</div><div class='del'>-</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-			"DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",</div><div class='del'>-			(int)cb-&gt;rt_flags, devname, skb-&gt;len,</div><div class='del'>-			le16_to_cpu(cb-&gt;src), le16_to_cpu(cb-&gt;dst),</div><div class='del'>-			err, skb-&gt;pkt_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((skb-&gt;pkt_type == PACKET_HOST) &amp;&amp; (cb-&gt;rt_flags &amp; DN_RT_F_RQR)) {</div><div class='del'>-		switch (cb-&gt;rt_flags &amp; DN_RT_PKT_MSK) {</div><div class='del'>-		case DN_RT_PKT_SHORT:</div><div class='del'>-			return dn_return_short(skb);</div><div class='del'>-		case DN_RT_PKT_LONG:</div><div class='del'>-			return dn_return_long(skb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_rx_long(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	unsigned char *ptr = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, 21)) /* 20 for long header, 1 for shortest nsp */</div><div class='del'>-		goto drop_it;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, 20);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	/* Destination info */</div><div class='del'>-	ptr += 2;</div><div class='del'>-	cb-&gt;dst = dn_eth2dn(ptr);</div><div class='del'>-	if (memcmp(ptr, dn_hiord_addr, 4) != 0)</div><div class='del'>-		goto drop_it;</div><div class='del'>-	ptr += 6;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Source info */</div><div class='del'>-	ptr += 2;</div><div class='del'>-	cb-&gt;src = dn_eth2dn(ptr);</div><div class='del'>-	if (memcmp(ptr, dn_hiord_addr, 4) != 0)</div><div class='del'>-		goto drop_it;</div><div class='del'>-	ptr += 6;</div><div class='del'>-	/* Other junk */</div><div class='del'>-	ptr++;</div><div class='del'>-	cb-&gt;hops = *ptr++; /* Visit Count */</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING,</div><div class='del'>-		       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-		       dn_route_rx_packet);</div><div class='del'>-</div><div class='del'>-drop_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_route_rx_short(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	unsigned char *ptr = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, 6)) /* 5 for short header + 1 for shortest nsp */</div><div class='del'>-		goto drop_it;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, 5);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	cb-&gt;dst = *(__le16 *)ptr;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	cb-&gt;src = *(__le16 *)ptr;</div><div class='del'>-	ptr += 2;</div><div class='del'>-	cb-&gt;hops = *ptr &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING,</div><div class='del'>-		       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-		       dn_route_rx_packet);</div><div class='del'>-</div><div class='del'>-drop_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_discard(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * I know we drop the packet here, but thats considered success in</div><div class='del'>-	 * this case</div><div class='del'>-	 */</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_ptp_hello(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	dn_dev_hello(skb);</div><div class='del'>-	dn_neigh_pointopoint_hello(skb);</div><div class='del'>-	return NET_RX_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	unsigned char flags = 0;</div><div class='del'>-	__u16 len = le16_to_cpu(*(__le16 *)skb-&gt;data);</div><div class='del'>-	struct dn_dev *dn = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	unsigned char padlen = 0;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(dev_net(dev), &amp;init_net))</div><div class='del'>-		goto dump_it;</div><div class='del'>-</div><div class='del'>-	if (dn == NULL)</div><div class='del'>-		goto dump_it;</div><div class='del'>-</div><div class='del'>-	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, 3))</div><div class='del'>-		goto dump_it;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, 2);</div><div class='del'>-</div><div class='del'>-	if (len &gt; skb-&gt;len)</div><div class='del'>-		goto dump_it;</div><div class='del'>-</div><div class='del'>-	skb_trim(skb, len);</div><div class='del'>-</div><div class='del'>-	flags = *skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-	cb-&gt;stamp = jiffies;</div><div class='del'>-	cb-&gt;iif = dev-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have padding, remove it.</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; DN_RT_F_PF) {</div><div class='del'>-		padlen = flags &amp; ~DN_RT_F_PF;</div><div class='del'>-		if (!pskb_may_pull(skb, padlen + 1))</div><div class='del'>-			goto dump_it;</div><div class='del'>-		skb_pull(skb, padlen);</div><div class='del'>-		flags = *skb-&gt;data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Weed out future version DECnet</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; DN_RT_F_VER)</div><div class='del'>-		goto dump_it;</div><div class='del'>-</div><div class='del'>-	cb-&gt;rt_flags = flags;</div><div class='del'>-</div><div class='del'>-	if (decnet_debug_level &amp; 1)</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-			"dn_route_rcv: got 0x%02x from %s [%d %d %d]\n",</div><div class='del'>-			(int)flags, (dev) ? dev-&gt;name : "???", len, skb-&gt;len,</div><div class='del'>-			padlen);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; DN_RT_PKT_CNTL) {</div><div class='del'>-		if (unlikely(skb_linearize(skb)))</div><div class='del'>-			goto dump_it;</div><div class='del'>-</div><div class='del'>-		switch (flags &amp; DN_RT_CNTL_MSK) {</div><div class='del'>-		case DN_RT_PKT_INIT:</div><div class='del'>-			dn_dev_init_pkt(skb);</div><div class='del'>-			break;</div><div class='del'>-		case DN_RT_PKT_VERI:</div><div class='del'>-			dn_dev_veri_pkt(skb);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dn-&gt;parms.state != DN_DEV_S_RU)</div><div class='del'>-			goto dump_it;</div><div class='del'>-</div><div class='del'>-		switch (flags &amp; DN_RT_CNTL_MSK) {</div><div class='del'>-		case DN_RT_PKT_HELO:</div><div class='del'>-			return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,</div><div class='del'>-				       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-				       dn_route_ptp_hello);</div><div class='del'>-</div><div class='del'>-		case DN_RT_PKT_L1RT:</div><div class='del'>-		case DN_RT_PKT_L2RT:</div><div class='del'>-			return NF_HOOK(NFPROTO_DECNET, NF_DN_ROUTE,</div><div class='del'>-				       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-				       dn_route_discard);</div><div class='del'>-		case DN_RT_PKT_ERTH:</div><div class='del'>-			return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,</div><div class='del'>-				       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-				       dn_neigh_router_hello);</div><div class='del'>-</div><div class='del'>-		case DN_RT_PKT_EEDH:</div><div class='del'>-			return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,</div><div class='del'>-				       &amp;init_net, NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-				       dn_neigh_endnode_hello);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (dn-&gt;parms.state != DN_DEV_S_RU)</div><div class='del'>-			goto dump_it;</div><div class='del'>-</div><div class='del'>-		skb_pull(skb, 1); /* Pull flags */</div><div class='del'>-</div><div class='del'>-		switch (flags &amp; DN_RT_PKT_MSK) {</div><div class='del'>-		case DN_RT_PKT_LONG:</div><div class='del'>-			return dn_route_rx_long(skb);</div><div class='del'>-		case DN_RT_PKT_SHORT:</div><div class='del'>-			return dn_route_rx_short(skb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-dump_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-out:</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct dn_route *rt = (struct dn_route *)dst;</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;n == NULL)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	cb-&gt;src = rt-&gt;rt_saddr;</div><div class='del'>-	cb-&gt;dst = rt-&gt;rt_daddr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Always set the Intra-Ethernet bit on all outgoing packets</div><div class='del'>-	 * originated on this node. Only valid flag from upper layers</div><div class='del'>-	 * is return-to-sender-requested. Set hop count to 0 too.</div><div class='del'>-	 */</div><div class='del'>-	cb-&gt;rt_flags &amp;= ~DN_RT_F_RQR;</div><div class='del'>-	cb-&gt;rt_flags |= DN_RT_F_IE;</div><div class='del'>-	cb-&gt;hops = 0;</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_OUT,</div><div class='del'>-		       &amp;init_net, sk, skb, NULL, dev,</div><div class='del'>-		       dn_to_neigh_output);</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	net_dbg_ratelimited("dn_output: This should not happen\n");</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_forward(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct dn_dev *dn_db = rcu_dereference(dst-&gt;dev-&gt;dn_ptr);</div><div class='del'>-	struct dn_route *rt;</div><div class='del'>-	int header_len;</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	/* Ensure that we have enough space for headers */</div><div class='del'>-	rt = (struct dn_route *)skb_dst(skb);</div><div class='del'>-	header_len = dn_db-&gt;use_long ? 21 : 6;</div><div class='del'>-	if (skb_cow(skb, LL_RESERVED_SPACE(rt-&gt;dst.dev)+header_len))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Hop count exceeded.</div><div class='del'>-	 */</div><div class='del'>-	if (++cb-&gt;hops &gt; 30)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = rt-&gt;dst.dev;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If packet goes out same interface it came in on, then set</div><div class='del'>-	 * the Intra-Ethernet bit. This has no effect for short</div><div class='del'>-	 * packets, so we don't need to test for them here.</div><div class='del'>-	 */</div><div class='del'>-	cb-&gt;rt_flags &amp;= ~DN_RT_F_IE;</div><div class='del'>-	if (rt-&gt;rt_flags &amp; RTCF_DOREDIRECT)</div><div class='del'>-		cb-&gt;rt_flags |= DN_RT_F_IE;</div><div class='del'>-</div><div class='del'>-	return NF_HOOK(NFPROTO_DECNET, NF_DN_FORWARD,</div><div class='del'>-		       &amp;init_net, NULL, skb, dev, skb-&gt;dev,</div><div class='del'>-		       dn_to_neigh_output);</div><div class='del'>-</div><div class='del'>-drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used to catch bugs. This should never normally get</div><div class='del'>- * called.</div><div class='del'>- */</div><div class='del'>-static int dn_rt_bug_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	net_dbg_ratelimited("dn_rt_bug: skb from:%04x to:%04x\n",</div><div class='del'>-			    le16_to_cpu(cb-&gt;src), le16_to_cpu(cb-&gt;dst));</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_rt_bug(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	net_dbg_ratelimited("dn_rt_bug: skb from:%04x to:%04x\n",</div><div class='del'>-			    le16_to_cpu(cb-&gt;src), le16_to_cpu(cb-&gt;dst));</div><div class='del'>-</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return NET_RX_DROP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int dn_dst_default_advmss(const struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	return dn_mss_from_pmtu(dst-&gt;dev, dst_mtu(dst));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int dn_dst_mtu(const struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='del'>-</div><div class='del'>-	return mtu ? : dst-&gt;dev-&gt;mtu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst,</div><div class='del'>-					     struct sk_buff *skb,</div><div class='del'>-					     const void *daddr)</div><div class='del'>-{</div><div class='del'>-	return __neigh_lookup_errno(&amp;dn_neigh_table, daddr, dst-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_info *fi = res-&gt;fi;</div><div class='del'>-	struct net_device *dev = rt-&gt;dst.dev;</div><div class='del'>-	unsigned int mss_metric;</div><div class='del'>-	struct neighbour *n;</div><div class='del'>-</div><div class='del'>-	if (fi) {</div><div class='del'>-		if (DN_FIB_RES_GW(*res) &amp;&amp;</div><div class='del'>-		    DN_FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)</div><div class='del'>-			rt-&gt;rt_gateway = DN_FIB_RES_GW(*res);</div><div class='del'>-		dst_init_metrics(&amp;rt-&gt;dst, fi-&gt;fib_metrics, true);</div><div class='del'>-	}</div><div class='del'>-	rt-&gt;rt_type = res-&gt;type;</div><div class='del'>-</div><div class='del'>-	if (dev != NULL &amp;&amp; rt-&gt;n == NULL) {</div><div class='del'>-		n = __neigh_lookup_errno(&amp;dn_neigh_table, &amp;rt-&gt;rt_gateway, dev);</div><div class='del'>-		if (IS_ERR(n))</div><div class='del'>-			return PTR_ERR(n);</div><div class='del'>-		rt-&gt;n = n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dst_metric(&amp;rt-&gt;dst, RTAX_MTU) &gt; rt-&gt;dst.dev-&gt;mtu)</div><div class='del'>-		dst_metric_set(&amp;rt-&gt;dst, RTAX_MTU, rt-&gt;dst.dev-&gt;mtu);</div><div class='del'>-	mss_metric = dst_metric_raw(&amp;rt-&gt;dst, RTAX_ADVMSS);</div><div class='del'>-	if (mss_metric) {</div><div class='del'>-		unsigned int mss = dn_mss_from_pmtu(dev, dst_mtu(&amp;rt-&gt;dst));</div><div class='del'>-		if (mss_metric &gt; mss)</div><div class='del'>-			dst_metric_set(&amp;rt-&gt;dst, RTAX_ADVMSS, mss);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_match_addr(__le16 addr1, __le16 addr2)</div><div class='del'>-{</div><div class='del'>-	__u16 tmp = le16_to_cpu(addr1) ^ le16_to_cpu(addr2);</div><div class='del'>-	int match = 16;</div><div class='del'>-	while(tmp) {</div><div class='del'>-		tmp &gt;&gt;= 1;</div><div class='del'>-		match--;</div><div class='del'>-	}</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int scope)</div><div class='del'>-{</div><div class='del'>-	__le16 saddr = 0;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct dn_ifaddr *ifa;</div><div class='del'>-	int best_match = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	dn_db = rcu_dereference(dev-&gt;dn_ptr);</div><div class='del'>-	for (ifa = rcu_dereference(dn_db-&gt;ifa_list);</div><div class='del'>-	     ifa != NULL;</div><div class='del'>-	     ifa = rcu_dereference(ifa-&gt;ifa_next)) {</div><div class='del'>-		if (ifa-&gt;ifa_scope &gt; scope)</div><div class='del'>-			continue;</div><div class='del'>-		if (!daddr) {</div><div class='del'>-			saddr = ifa-&gt;ifa_local;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = dn_match_addr(daddr, ifa-&gt;ifa_local);</div><div class='del'>-		if (ret &gt; best_match)</div><div class='del'>-			saddr = ifa-&gt;ifa_local;</div><div class='del'>-		if (best_match == 0)</div><div class='del'>-			saddr = ifa-&gt;ifa_local;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return saddr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le16 __dn_fib_res_prefsrc(struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	return dnet_select_source(DN_FIB_RES_DEV(*res), DN_FIB_RES_GW(*res), res-&gt;scope);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le16 dn_fib_rules_map_destination(__le16 daddr, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	__le16 mask = dnet_make_mask(res-&gt;prefixlen);</div><div class='del'>-	return (daddr&amp;~mask)|res-&gt;fi-&gt;fib_nh-&gt;nh_gw;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *oldflp, int try_hard)</div><div class='del'>-{</div><div class='del'>-	struct flowidn fld = {</div><div class='del'>-		.daddr = oldflp-&gt;daddr,</div><div class='del'>-		.saddr = oldflp-&gt;saddr,</div><div class='del'>-		.flowidn_scope = RT_SCOPE_UNIVERSE,</div><div class='del'>-		.flowidn_mark = oldflp-&gt;flowidn_mark,</div><div class='del'>-		.flowidn_iif = LOOPBACK_IFINDEX,</div><div class='del'>-		.flowidn_oif = oldflp-&gt;flowidn_oif,</div><div class='del'>-	};</div><div class='del'>-	struct dn_route *rt = NULL;</div><div class='del'>-	struct net_device *dev_out = NULL, *dev;</div><div class='del'>-	struct neighbour *neigh = NULL;</div><div class='del'>-	unsigned int hash;</div><div class='del'>-	unsigned int flags = 0;</div><div class='del'>-	struct dn_fib_res res = { .fi = NULL, .type = RTN_UNICAST };</div><div class='del'>-	int err;</div><div class='del'>-	int free_res = 0;</div><div class='del'>-	__le16 gateway = 0;</div><div class='del'>-</div><div class='del'>-	if (decnet_debug_level &amp; 16)</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "dn_route_output_slow: dst=%04x src=%04x mark=%d"</div><div class='del'>-		       " iif=%d oif=%d\n", le16_to_cpu(oldflp-&gt;daddr),</div><div class='del'>-		       le16_to_cpu(oldflp-&gt;saddr),</div><div class='del'>-		       oldflp-&gt;flowidn_mark, LOOPBACK_IFINDEX,</div><div class='del'>-		       oldflp-&gt;flowidn_oif);</div><div class='del'>-</div><div class='del'>-	/* If we have an output interface, verify its a DECnet device */</div><div class='del'>-	if (oldflp-&gt;flowidn_oif) {</div><div class='del'>-		dev_out = dev_get_by_index(&amp;init_net, oldflp-&gt;flowidn_oif);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		if (dev_out &amp;&amp; dev_out-&gt;dn_ptr == NULL) {</div><div class='del'>-			dev_put(dev_out);</div><div class='del'>-			dev_out = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (dev_out == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we have a source address, verify that its a local address */</div><div class='del'>-	if (oldflp-&gt;saddr) {</div><div class='del'>-		err = -EADDRNOTAVAIL;</div><div class='del'>-</div><div class='del'>-		if (dev_out) {</div><div class='del'>-			if (dn_dev_islocal(dev_out, oldflp-&gt;saddr))</div><div class='del'>-				goto source_ok;</div><div class='del'>-			dev_put(dev_out);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='del'>-			if (!dev-&gt;dn_ptr)</div><div class='del'>-				continue;</div><div class='del'>-			if (!dn_dev_islocal(dev, oldflp-&gt;saddr))</div><div class='del'>-				continue;</div><div class='del'>-			if ((dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='del'>-			    oldflp-&gt;daddr &amp;&amp;</div><div class='del'>-			    !dn_dev_islocal(dev, oldflp-&gt;daddr))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			dev_out = dev;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		if (dev_out == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-		dev_hold(dev_out);</div><div class='del'>-source_ok:</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No destination? Assume its local */</div><div class='del'>-	if (!fld.daddr) {</div><div class='del'>-		fld.daddr = fld.saddr;</div><div class='del'>-</div><div class='del'>-		if (dev_out)</div><div class='del'>-			dev_put(dev_out);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		dev_out = init_net.loopback_dev;</div><div class='del'>-		if (!dev_out-&gt;dn_ptr)</div><div class='del'>-			goto out;</div><div class='del'>-		err = -EADDRNOTAVAIL;</div><div class='del'>-		dev_hold(dev_out);</div><div class='del'>-		if (!fld.daddr) {</div><div class='del'>-			fld.daddr =</div><div class='del'>-			fld.saddr = dnet_select_source(dev_out, 0,</div><div class='del'>-						       RT_SCOPE_HOST);</div><div class='del'>-			if (!fld.daddr)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-		fld.flowidn_oif = LOOPBACK_IFINDEX;</div><div class='del'>-		res.type = RTN_LOCAL;</div><div class='del'>-		goto make_route;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (decnet_debug_level &amp; 16)</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "dn_route_output_slow: initial checks complete."</div><div class='del'>-		       " dst=%04x src=%04x oif=%d try_hard=%d\n",</div><div class='del'>-		       le16_to_cpu(fld.daddr), le16_to_cpu(fld.saddr),</div><div class='del'>-		       fld.flowidn_oif, try_hard);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * N.B. If the kernel is compiled without router support then</div><div class='del'>-	 * dn_fib_lookup() will evaluate to non-zero so this if () block</div><div class='del'>-	 * will always be executed.</div><div class='del'>-	 */</div><div class='del'>-	err = -ESRCH;</div><div class='del'>-	if (try_hard || (err = dn_fib_lookup(&amp;fld, &amp;res)) != 0) {</div><div class='del'>-		struct dn_dev *dn_db;</div><div class='del'>-		if (err != -ESRCH)</div><div class='del'>-			goto out;</div><div class='del'>-		/*</div><div class='del'>-		 * Here the fallback is basically the standard algorithm for</div><div class='del'>-		 * routing in endnodes which is described in the DECnet routing</div><div class='del'>-		 * docs</div><div class='del'>-		 *</div><div class='del'>-		 * If we are not trying hard, look in neighbour cache.</div><div class='del'>-		 * The result is tested to ensure that if a specific output</div><div class='del'>-		 * device/source address was requested, then we honour that</div><div class='del'>-		 * here</div><div class='del'>-		 */</div><div class='del'>-		if (!try_hard) {</div><div class='del'>-			neigh = neigh_lookup_nodev(&amp;dn_neigh_table, &amp;init_net, &amp;fld.daddr);</div><div class='del'>-			if (neigh) {</div><div class='del'>-				if ((oldflp-&gt;flowidn_oif &amp;&amp;</div><div class='del'>-				    (neigh-&gt;dev-&gt;ifindex != oldflp-&gt;flowidn_oif)) ||</div><div class='del'>-				    (oldflp-&gt;saddr &amp;&amp;</div><div class='del'>-				    (!dn_dev_islocal(neigh-&gt;dev,</div><div class='del'>-						     oldflp-&gt;saddr)))) {</div><div class='del'>-					neigh_release(neigh);</div><div class='del'>-					neigh = NULL;</div><div class='del'>-				} else {</div><div class='del'>-					if (dev_out)</div><div class='del'>-						dev_put(dev_out);</div><div class='del'>-					if (dn_dev_islocal(neigh-&gt;dev, fld.daddr)) {</div><div class='del'>-						dev_out = init_net.loopback_dev;</div><div class='del'>-						res.type = RTN_LOCAL;</div><div class='del'>-					} else {</div><div class='del'>-						dev_out = neigh-&gt;dev;</div><div class='del'>-					}</div><div class='del'>-					dev_hold(dev_out);</div><div class='del'>-					goto select_source;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Not there? Perhaps its a local address */</div><div class='del'>-		if (dev_out == NULL)</div><div class='del'>-			dev_out = dn_dev_get_default();</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		if (dev_out == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-		dn_db = rcu_dereference_raw(dev_out-&gt;dn_ptr);</div><div class='del'>-		if (!dn_db)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		/* Possible improvement - check all devices for local addr */</div><div class='del'>-		if (dn_dev_islocal(dev_out, fld.daddr)) {</div><div class='del'>-			dev_put(dev_out);</div><div class='del'>-			dev_out = init_net.loopback_dev;</div><div class='del'>-			dev_hold(dev_out);</div><div class='del'>-			res.type = RTN_LOCAL;</div><div class='del'>-			goto select_source;</div><div class='del'>-		}</div><div class='del'>-		/* Not local either.... try sending it to the default router */</div><div class='del'>-		neigh = neigh_clone(dn_db-&gt;router);</div><div class='del'>-		BUG_ON(neigh &amp;&amp; neigh-&gt;dev != dev_out);</div><div class='del'>-</div><div class='del'>-		/* Ok then, we assume its directly connected and move on */</div><div class='del'>-select_source:</div><div class='del'>-		if (neigh)</div><div class='del'>-			gateway = ((struct dn_neigh *)neigh)-&gt;addr;</div><div class='del'>-		if (gateway == 0)</div><div class='del'>-			gateway = fld.daddr;</div><div class='del'>-		if (fld.saddr == 0) {</div><div class='del'>-			fld.saddr = dnet_select_source(dev_out, gateway,</div><div class='del'>-						       res.type == RTN_LOCAL ?</div><div class='del'>-						       RT_SCOPE_HOST :</div><div class='del'>-						       RT_SCOPE_LINK);</div><div class='del'>-			if (fld.saddr == 0 &amp;&amp; res.type != RTN_LOCAL)</div><div class='del'>-				goto e_addr;</div><div class='del'>-		}</div><div class='del'>-		fld.flowidn_oif = dev_out-&gt;ifindex;</div><div class='del'>-		goto make_route;</div><div class='del'>-	}</div><div class='del'>-	free_res = 1;</div><div class='del'>-</div><div class='del'>-	if (res.type == RTN_NAT)</div><div class='del'>-		goto e_inval;</div><div class='del'>-</div><div class='del'>-	if (res.type == RTN_LOCAL) {</div><div class='del'>-		if (!fld.saddr)</div><div class='del'>-			fld.saddr = fld.daddr;</div><div class='del'>-		if (dev_out)</div><div class='del'>-			dev_put(dev_out);</div><div class='del'>-		dev_out = init_net.loopback_dev;</div><div class='del'>-		dev_hold(dev_out);</div><div class='del'>-		if (!dev_out-&gt;dn_ptr)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		fld.flowidn_oif = dev_out-&gt;ifindex;</div><div class='del'>-		if (res.fi)</div><div class='del'>-			dn_fib_info_put(res.fi);</div><div class='del'>-		res.fi = NULL;</div><div class='del'>-		goto make_route;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (res.fi-&gt;fib_nhs &gt; 1 &amp;&amp; fld.flowidn_oif == 0)</div><div class='del'>-		dn_fib_select_multipath(&amp;fld, &amp;res);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We could add some logic to deal with default routes here and</div><div class='del'>-	 * get rid of some of the special casing above.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!fld.saddr)</div><div class='del'>-		fld.saddr = DN_FIB_RES_PREFSRC(res);</div><div class='del'>-</div><div class='del'>-	if (dev_out)</div><div class='del'>-		dev_put(dev_out);</div><div class='del'>-	dev_out = DN_FIB_RES_DEV(res);</div><div class='del'>-	dev_hold(dev_out);</div><div class='del'>-	fld.flowidn_oif = dev_out-&gt;ifindex;</div><div class='del'>-	gateway = DN_FIB_RES_GW(res);</div><div class='del'>-</div><div class='del'>-make_route:</div><div class='del'>-	if (dev_out-&gt;flags &amp; IFF_LOOPBACK)</div><div class='del'>-		flags |= RTCF_LOCAL;</div><div class='del'>-</div><div class='del'>-	rt = dst_alloc(&amp;dn_dst_ops, dev_out, 0, DST_OBSOLETE_NONE, DST_HOST);</div><div class='del'>-	if (rt == NULL)</div><div class='del'>-		goto e_nobufs;</div><div class='del'>-</div><div class='del'>-	rt-&gt;dn_next = NULL;</div><div class='del'>-	memset(&amp;rt-&gt;fld, 0, sizeof(rt-&gt;fld));</div><div class='del'>-	rt-&gt;fld.saddr        = oldflp-&gt;saddr;</div><div class='del'>-	rt-&gt;fld.daddr        = oldflp-&gt;daddr;</div><div class='del'>-	rt-&gt;fld.flowidn_oif  = oldflp-&gt;flowidn_oif;</div><div class='del'>-	rt-&gt;fld.flowidn_iif  = 0;</div><div class='del'>-	rt-&gt;fld.flowidn_mark = oldflp-&gt;flowidn_mark;</div><div class='del'>-</div><div class='del'>-	rt-&gt;rt_saddr      = fld.saddr;</div><div class='del'>-	rt-&gt;rt_daddr      = fld.daddr;</div><div class='del'>-	rt-&gt;rt_gateway    = gateway ? gateway : fld.daddr;</div><div class='del'>-	rt-&gt;rt_local_src  = fld.saddr;</div><div class='del'>-</div><div class='del'>-	rt-&gt;rt_dst_map    = fld.daddr;</div><div class='del'>-	rt-&gt;rt_src_map    = fld.saddr;</div><div class='del'>-</div><div class='del'>-	rt-&gt;n = neigh;</div><div class='del'>-	neigh = NULL;</div><div class='del'>-</div><div class='del'>-	rt-&gt;dst.lastuse = jiffies;</div><div class='del'>-	rt-&gt;dst.output  = dn_output;</div><div class='del'>-	rt-&gt;dst.input   = dn_rt_bug;</div><div class='del'>-	rt-&gt;rt_flags      = flags;</div><div class='del'>-	if (flags &amp; RTCF_LOCAL)</div><div class='del'>-		rt-&gt;dst.input = dn_nsp_rx;</div><div class='del'>-</div><div class='del'>-	err = dn_rt_set_next_hop(rt, &amp;res);</div><div class='del'>-	if (err)</div><div class='del'>-		goto e_neighbour;</div><div class='del'>-</div><div class='del'>-	hash = dn_hash(rt-&gt;fld.saddr, rt-&gt;fld.daddr);</div><div class='del'>-	/* dn_insert_route() increments dst-&gt;__refcnt */</div><div class='del'>-	dn_insert_route(rt, hash, (struct dn_route **)pprt);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (neigh)</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-	if (free_res)</div><div class='del'>-		dn_fib_res_put(&amp;res);</div><div class='del'>-	if (dev_out)</div><div class='del'>-		dev_put(dev_out);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-e_addr:</div><div class='del'>-	err = -EADDRNOTAVAIL;</div><div class='del'>-	goto done;</div><div class='del'>-e_inval:</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	goto done;</div><div class='del'>-e_nobufs:</div><div class='del'>-	err = -ENOBUFS;</div><div class='del'>-	goto done;</div><div class='del'>-e_neighbour:</div><div class='del'>-	dst_release_immediate(&amp;rt-&gt;dst);</div><div class='del'>-	goto e_nobufs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * N.B. The flags may be moved into the flowi at some future stage.</div><div class='del'>- */</div><div class='del'>-static int __dn_route_output_key(struct dst_entry **pprt, const struct flowidn *flp, int flags)</div><div class='del'>-{</div><div class='del'>-	unsigned int hash = dn_hash(flp-&gt;saddr, flp-&gt;daddr);</div><div class='del'>-	struct dn_route *rt = NULL;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; MSG_TRYHARD)) {</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		for (rt = rcu_dereference_bh(dn_rt_hash_table[hash].chain); rt;</div><div class='del'>-			rt = rcu_dereference_bh(rt-&gt;dn_next)) {</div><div class='del'>-			if ((flp-&gt;daddr == rt-&gt;fld.daddr) &amp;&amp;</div><div class='del'>-			    (flp-&gt;saddr == rt-&gt;fld.saddr) &amp;&amp;</div><div class='del'>-			    (flp-&gt;flowidn_mark == rt-&gt;fld.flowidn_mark) &amp;&amp;</div><div class='del'>-			    dn_is_output_route(rt) &amp;&amp;</div><div class='del'>-			    (rt-&gt;fld.flowidn_oif == flp-&gt;flowidn_oif)) {</div><div class='del'>-				dst_hold_and_use(&amp;rt-&gt;dst, jiffies);</div><div class='del'>-				rcu_read_unlock_bh();</div><div class='del'>-				*pprt = &amp;rt-&gt;dst;</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dn_route_output_slow(pprt, flp, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_output_key(struct dst_entry **pprt, struct flowidn *flp, int flags)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = __dn_route_output_key(pprt, flp, flags);</div><div class='del'>-	if (err == 0 &amp;&amp; flp-&gt;flowidn_proto) {</div><div class='del'>-		*pprt = xfrm_lookup(&amp;init_net, *pprt,</div><div class='del'>-				    flowidn_to_flowi(flp), NULL, 0);</div><div class='del'>-		if (IS_ERR(*pprt)) {</div><div class='del'>-			err = PTR_ERR(*pprt);</div><div class='del'>-			*pprt = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_route_output_sock(struct dst_entry __rcu **pprt, struct flowidn *fl, struct sock *sk, int flags)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = __dn_route_output_key(pprt, fl, flags &amp; MSG_TRYHARD);</div><div class='del'>-	if (err == 0 &amp;&amp; fl-&gt;flowidn_proto) {</div><div class='del'>-		*pprt = xfrm_lookup(&amp;init_net, *pprt,</div><div class='del'>-				    flowidn_to_flowi(fl), sk, 0);</div><div class='del'>-		if (IS_ERR(*pprt)) {</div><div class='del'>-			err = PTR_ERR(*pprt);</div><div class='del'>-			*pprt = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_input_slow(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = NULL;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	struct net_device *in_dev = skb-&gt;dev;</div><div class='del'>-	struct net_device *out_dev = NULL;</div><div class='del'>-	struct dn_dev *dn_db;</div><div class='del'>-	struct neighbour *neigh = NULL;</div><div class='del'>-	unsigned int hash;</div><div class='del'>-	int flags = 0;</div><div class='del'>-	__le16 gateway = 0;</div><div class='del'>-	__le16 local_src = 0;</div><div class='del'>-	struct flowidn fld = {</div><div class='del'>-		.daddr = cb-&gt;dst,</div><div class='del'>-		.saddr = cb-&gt;src,</div><div class='del'>-		.flowidn_scope = RT_SCOPE_UNIVERSE,</div><div class='del'>-		.flowidn_mark = skb-&gt;mark,</div><div class='del'>-		.flowidn_iif = skb-&gt;dev-&gt;ifindex,</div><div class='del'>-	};</div><div class='del'>-	struct dn_fib_res res = { .fi = NULL, .type = RTN_UNREACHABLE };</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	int free_res = 0;</div><div class='del'>-</div><div class='del'>-	dev_hold(in_dev);</div><div class='del'>-</div><div class='del'>-	if ((dn_db = rcu_dereference(in_dev-&gt;dn_ptr)) == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Zero source addresses are not allowed */</div><div class='del'>-	if (fld.saddr == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In this case we've just received a packet from a source</div><div class='del'>-	 * outside ourselves pretending to come from us. We don't</div><div class='del'>-	 * allow it any further to prevent routing loops, spoofing and</div><div class='del'>-	 * other nasties. Loopback packets already have the dst attached</div><div class='del'>-	 * so this only affects packets which have originated elsewhere.</div><div class='del'>-	 */</div><div class='del'>-	err  = -ENOTUNIQ;</div><div class='del'>-	if (dn_dev_islocal(in_dev, cb-&gt;src))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = dn_fib_lookup(&amp;fld, &amp;res);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err != -ESRCH)</div><div class='del'>-			goto out;</div><div class='del'>-		/*</div><div class='del'>-		 * Is the destination us ?</div><div class='del'>-		 */</div><div class='del'>-		if (!dn_dev_islocal(in_dev, cb-&gt;dst))</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		res.type = RTN_LOCAL;</div><div class='del'>-	} else {</div><div class='del'>-		__le16 src_map = fld.saddr;</div><div class='del'>-		free_res = 1;</div><div class='del'>-</div><div class='del'>-		out_dev = DN_FIB_RES_DEV(res);</div><div class='del'>-		if (out_dev == NULL) {</div><div class='del'>-			net_crit_ratelimited("Bug in dn_route_input_slow() No output device\n");</div><div class='del'>-			goto e_inval;</div><div class='del'>-		}</div><div class='del'>-		dev_hold(out_dev);</div><div class='del'>-</div><div class='del'>-		if (res.r)</div><div class='del'>-			src_map = fld.saddr; /* no NAT support for now */</div><div class='del'>-</div><div class='del'>-		gateway = DN_FIB_RES_GW(res);</div><div class='del'>-		if (res.type == RTN_NAT) {</div><div class='del'>-			fld.daddr = dn_fib_rules_map_destination(fld.daddr, &amp;res);</div><div class='del'>-			dn_fib_res_put(&amp;res);</div><div class='del'>-			free_res = 0;</div><div class='del'>-			if (dn_fib_lookup(&amp;fld, &amp;res))</div><div class='del'>-				goto e_inval;</div><div class='del'>-			free_res = 1;</div><div class='del'>-			if (res.type != RTN_UNICAST)</div><div class='del'>-				goto e_inval;</div><div class='del'>-			flags |= RTCF_DNAT;</div><div class='del'>-			gateway = fld.daddr;</div><div class='del'>-		}</div><div class='del'>-		fld.saddr = src_map;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch(res.type) {</div><div class='del'>-	case RTN_UNICAST:</div><div class='del'>-		/*</div><div class='del'>-		 * Forwarding check here, we only check for forwarding</div><div class='del'>-		 * being turned off, if you want to only forward intra</div><div class='del'>-		 * area, its up to you to set the routing tables up</div><div class='del'>-		 * correctly.</div><div class='del'>-		 */</div><div class='del'>-		if (dn_db-&gt;parms.forwarding == 0)</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		if (res.fi-&gt;fib_nhs &gt; 1 &amp;&amp; fld.flowidn_oif == 0)</div><div class='del'>-			dn_fib_select_multipath(&amp;fld, &amp;res);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check for out_dev == in_dev. We use the RTCF_DOREDIRECT</div><div class='del'>-		 * flag as a hint to set the intra-ethernet bit when</div><div class='del'>-		 * forwarding. If we've got NAT in operation, we don't do</div><div class='del'>-		 * this optimisation.</div><div class='del'>-		 */</div><div class='del'>-		if (out_dev == in_dev &amp;&amp; !(flags &amp; RTCF_NAT))</div><div class='del'>-			flags |= RTCF_DOREDIRECT;</div><div class='del'>-</div><div class='del'>-		local_src = DN_FIB_RES_PREFSRC(res);</div><div class='del'>-</div><div class='del'>-	case RTN_BLACKHOLE:</div><div class='del'>-	case RTN_UNREACHABLE:</div><div class='del'>-		break;</div><div class='del'>-	case RTN_LOCAL:</div><div class='del'>-		flags |= RTCF_LOCAL;</div><div class='del'>-		fld.saddr = cb-&gt;dst;</div><div class='del'>-		fld.daddr = cb-&gt;src;</div><div class='del'>-</div><div class='del'>-		/* Routing tables gave us a gateway */</div><div class='del'>-		if (gateway)</div><div class='del'>-			goto make_route;</div><div class='del'>-</div><div class='del'>-		/* Packet was intra-ethernet, so we know its on-link */</div><div class='del'>-		if (cb-&gt;rt_flags &amp; DN_RT_F_IE) {</div><div class='del'>-			gateway = cb-&gt;src;</div><div class='del'>-			goto make_route;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Use the default router if there is one */</div><div class='del'>-		neigh = neigh_clone(dn_db-&gt;router);</div><div class='del'>-		if (neigh) {</div><div class='del'>-			gateway = ((struct dn_neigh *)neigh)-&gt;addr;</div><div class='del'>-			goto make_route;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Close eyes and pray */</div><div class='del'>-		gateway = cb-&gt;src;</div><div class='del'>-		goto make_route;</div><div class='del'>-	default:</div><div class='del'>-		goto e_inval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-make_route:</div><div class='del'>-	rt = dst_alloc(&amp;dn_dst_ops, out_dev, 1, DST_OBSOLETE_NONE, DST_HOST);</div><div class='del'>-	if (rt == NULL)</div><div class='del'>-		goto e_nobufs;</div><div class='del'>-</div><div class='del'>-	rt-&gt;dn_next = NULL;</div><div class='del'>-	memset(&amp;rt-&gt;fld, 0, sizeof(rt-&gt;fld));</div><div class='del'>-	rt-&gt;rt_saddr      = fld.saddr;</div><div class='del'>-	rt-&gt;rt_daddr      = fld.daddr;</div><div class='del'>-	rt-&gt;rt_gateway    = fld.daddr;</div><div class='del'>-	if (gateway)</div><div class='del'>-		rt-&gt;rt_gateway = gateway;</div><div class='del'>-	rt-&gt;rt_local_src  = local_src ? local_src : rt-&gt;rt_saddr;</div><div class='del'>-</div><div class='del'>-	rt-&gt;rt_dst_map    = fld.daddr;</div><div class='del'>-	rt-&gt;rt_src_map    = fld.saddr;</div><div class='del'>-</div><div class='del'>-	rt-&gt;fld.saddr        = cb-&gt;src;</div><div class='del'>-	rt-&gt;fld.daddr        = cb-&gt;dst;</div><div class='del'>-	rt-&gt;fld.flowidn_oif  = 0;</div><div class='del'>-	rt-&gt;fld.flowidn_iif  = in_dev-&gt;ifindex;</div><div class='del'>-	rt-&gt;fld.flowidn_mark = fld.flowidn_mark;</div><div class='del'>-</div><div class='del'>-	rt-&gt;n = neigh;</div><div class='del'>-	rt-&gt;dst.lastuse = jiffies;</div><div class='del'>-	rt-&gt;dst.output = dn_rt_bug_out;</div><div class='del'>-	switch (res.type) {</div><div class='del'>-	case RTN_UNICAST:</div><div class='del'>-		rt-&gt;dst.input = dn_forward;</div><div class='del'>-		break;</div><div class='del'>-	case RTN_LOCAL:</div><div class='del'>-		rt-&gt;dst.output = dn_output;</div><div class='del'>-		rt-&gt;dst.input = dn_nsp_rx;</div><div class='del'>-		rt-&gt;dst.dev = in_dev;</div><div class='del'>-		flags |= RTCF_LOCAL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	case RTN_UNREACHABLE:</div><div class='del'>-	case RTN_BLACKHOLE:</div><div class='del'>-		rt-&gt;dst.input = dst_discard;</div><div class='del'>-	}</div><div class='del'>-	rt-&gt;rt_flags = flags;</div><div class='del'>-</div><div class='del'>-	err = dn_rt_set_next_hop(rt, &amp;res);</div><div class='del'>-	if (err)</div><div class='del'>-		goto e_neighbour;</div><div class='del'>-</div><div class='del'>-	hash = dn_hash(rt-&gt;fld.saddr, rt-&gt;fld.daddr);</div><div class='del'>-	/* dn_insert_route() increments dst-&gt;__refcnt */</div><div class='del'>-	dn_insert_route(rt, hash, &amp;rt);</div><div class='del'>-	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (neigh)</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-	if (free_res)</div><div class='del'>-		dn_fib_res_put(&amp;res);</div><div class='del'>-	dev_put(in_dev);</div><div class='del'>-	if (out_dev)</div><div class='del'>-		dev_put(out_dev);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-e_inval:</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	goto done;</div><div class='del'>-</div><div class='del'>-e_nobufs:</div><div class='del'>-	err = -ENOBUFS;</div><div class='del'>-	goto done;</div><div class='del'>-</div><div class='del'>-e_neighbour:</div><div class='del'>-	dst_release_immediate(&amp;rt-&gt;dst);</div><div class='del'>-	goto done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_route_input(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt;</div><div class='del'>-	struct dn_skb_cb *cb = DN_SKB_CB(skb);</div><div class='del'>-	unsigned int hash = dn_hash(cb-&gt;src, cb-&gt;dst);</div><div class='del'>-</div><div class='del'>-	if (skb_dst(skb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt != NULL;</div><div class='del'>-	    rt = rcu_dereference(rt-&gt;dn_next)) {</div><div class='del'>-		if ((rt-&gt;fld.saddr == cb-&gt;src) &amp;&amp;</div><div class='del'>-		    (rt-&gt;fld.daddr == cb-&gt;dst) &amp;&amp;</div><div class='del'>-		    (rt-&gt;fld.flowidn_oif == 0) &amp;&amp;</div><div class='del'>-		    (rt-&gt;fld.flowidn_mark == skb-&gt;mark) &amp;&amp;</div><div class='del'>-		    (rt-&gt;fld.flowidn_iif == cb-&gt;iif)) {</div><div class='del'>-			dst_hold_and_use(&amp;rt-&gt;dst, jiffies);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			skb_dst_set(skb, (struct dst_entry *)rt);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return dn_route_input_slow(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_rt_fill_info(struct sk_buff *skb, u32 portid, u32 seq,</div><div class='del'>-			   int event, int nowait, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = (struct dn_route *)skb_dst(skb);</div><div class='del'>-	struct rtmsg *r;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	long expires;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*r), flags);</div><div class='del'>-	if (!nlh)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	r = nlmsg_data(nlh);</div><div class='del'>-	r-&gt;rtm_family = AF_DECnet;</div><div class='del'>-	r-&gt;rtm_dst_len = 16;</div><div class='del'>-	r-&gt;rtm_src_len = 0;</div><div class='del'>-	r-&gt;rtm_tos = 0;</div><div class='del'>-	r-&gt;rtm_table = RT_TABLE_MAIN;</div><div class='del'>-	r-&gt;rtm_type = rt-&gt;rt_type;</div><div class='del'>-	r-&gt;rtm_flags = (rt-&gt;rt_flags &amp; ~0xFFFF) | RTM_F_CLONED;</div><div class='del'>-	r-&gt;rtm_scope = RT_SCOPE_UNIVERSE;</div><div class='del'>-	r-&gt;rtm_protocol = RTPROT_UNSPEC;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;rt_flags &amp; RTCF_NOTIFY)</div><div class='del'>-		r-&gt;rtm_flags |= RTM_F_NOTIFY;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u32(skb, RTA_TABLE, RT_TABLE_MAIN) &lt; 0 ||</div><div class='del'>-	    nla_put_le16(skb, RTA_DST, rt-&gt;rt_daddr) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;fld.saddr) {</div><div class='del'>-		r-&gt;rtm_src_len = 16;</div><div class='del'>-		if (nla_put_le16(skb, RTA_SRC, rt-&gt;fld.saddr) &lt; 0)</div><div class='del'>-			goto errout;</div><div class='del'>-	}</div><div class='del'>-	if (rt-&gt;dst.dev &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_OIF, rt-&gt;dst.dev-&gt;ifindex) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note to self - change this if input routes reverse direction when</div><div class='del'>-	 * they deal only with inputs and not with replies like they do</div><div class='del'>-	 * currently.</div><div class='del'>-	 */</div><div class='del'>-	if (nla_put_le16(skb, RTA_PREFSRC, rt-&gt;rt_local_src) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;rt_daddr != rt-&gt;rt_gateway &amp;&amp;</div><div class='del'>-	    nla_put_le16(skb, RTA_GATEWAY, rt-&gt;rt_gateway) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (rtnetlink_put_metrics(skb, dst_metrics_ptr(&amp;rt-&gt;dst)) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	expires = rt-&gt;dst.expires ? rt-&gt;dst.expires - jiffies : 0;</div><div class='del'>-	if (rtnl_put_cacheinfo(skb, &amp;rt-&gt;dst, 0, expires,</div><div class='del'>-			       rt-&gt;dst.error) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (dn_is_input_route(rt) &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_IIF, rt-&gt;fld.flowidn_iif) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-errout:</div><div class='del'>-	nlmsg_cancel(skb, nlh);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct nla_policy rtm_dn_policy[RTA_MAX + 1] = {</div><div class='del'>-	[RTA_DST]		= { .type = NLA_U16 },</div><div class='del'>-	[RTA_SRC]		= { .type = NLA_U16 },</div><div class='del'>-	[RTA_IIF]		= { .type = NLA_U32 },</div><div class='del'>-	[RTA_OIF]		= { .type = NLA_U32 },</div><div class='del'>-	[RTA_GATEWAY]		= { .type = NLA_U16 },</div><div class='del'>-	[RTA_PRIORITY]		= { .type = NLA_U32 },</div><div class='del'>-	[RTA_PREFSRC]		= { .type = NLA_U16 },</div><div class='del'>-	[RTA_METRICS]		= { .type = NLA_NESTED },</div><div class='del'>-	[RTA_MULTIPATH]		= { .type = NLA_NESTED },</div><div class='del'>-	[RTA_TABLE]		= { .type = NLA_U32 },</div><div class='del'>-	[RTA_MARK]		= { .type = NLA_U32 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is called by both endnodes and routers now.</div><div class='del'>- */</div><div class='del'>-static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='del'>-			     struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='del'>-	struct rtmsg *rtm = nlmsg_data(nlh);</div><div class='del'>-	struct dn_route *rt = NULL;</div><div class='del'>-	struct dn_skb_cb *cb;</div><div class='del'>-	int err;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct flowidn fld;</div><div class='del'>-	struct nlattr *tb[RTA_MAX+1];</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_dn_policy,</div><div class='del'>-			  extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fld, 0, sizeof(fld));</div><div class='del'>-	fld.flowidn_proto = DNPROTO_NSP;</div><div class='del'>-</div><div class='del'>-	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	cb = DN_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	if (tb[RTA_SRC])</div><div class='del'>-		fld.saddr = nla_get_le16(tb[RTA_SRC]);</div><div class='del'>-</div><div class='del'>-	if (tb[RTA_DST])</div><div class='del'>-		fld.daddr = nla_get_le16(tb[RTA_DST]);</div><div class='del'>-</div><div class='del'>-	if (tb[RTA_IIF])</div><div class='del'>-		fld.flowidn_iif = nla_get_u32(tb[RTA_IIF]);</div><div class='del'>-</div><div class='del'>-	if (fld.flowidn_iif) {</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-		dev = __dev_get_by_index(&amp;init_net, fld.flowidn_iif);</div><div class='del'>-		if (!dev || !dev-&gt;dn_ptr) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_DNA_RT);</div><div class='del'>-		skb-&gt;dev = dev;</div><div class='del'>-		cb-&gt;src = fld.saddr;</div><div class='del'>-		cb-&gt;dst = fld.daddr;</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		err = dn_route_input(skb);</div><div class='del'>-		local_bh_enable();</div><div class='del'>-		memset(cb, 0, sizeof(struct dn_skb_cb));</div><div class='del'>-		rt = (struct dn_route *)skb_dst(skb);</div><div class='del'>-		if (!err &amp;&amp; -rt-&gt;dst.error)</div><div class='del'>-			err = rt-&gt;dst.error;</div><div class='del'>-	} else {</div><div class='del'>-		if (tb[RTA_OIF])</div><div class='del'>-			fld.flowidn_oif = nla_get_u32(tb[RTA_OIF]);</div><div class='del'>-</div><div class='del'>-		err = dn_route_output_key((struct dst_entry **)&amp;rt, &amp;fld, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = NULL;</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free;</div><div class='del'>-	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='del'>-	if (rtm-&gt;rtm_flags &amp; RTM_F_NOTIFY)</div><div class='del'>-		rt-&gt;rt_flags |= RTCF_NOTIFY;</div><div class='del'>-</div><div class='del'>-	err = dn_rt_fill_info(skb, NETLINK_CB(in_skb).portid, nlh-&gt;nlmsg_seq, RTM_NEWROUTE, 0, 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		err = -EMSGSIZE;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rtnl_unicast(skb, &amp;init_net, NETLINK_CB(in_skb).portid);</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For routers, this is called from dn_fib_dump, but for endnodes its</div><div class='del'>- * called directly from the rtnetlink dispatch table.</div><div class='del'>- */</div><div class='del'>-int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct dn_route *rt;</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx, s_idx;</div><div class='del'>-	struct rtmsg *rtm;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &lt; sizeof(struct rtmsg))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rtm = nlmsg_data(cb-&gt;nlh);</div><div class='del'>-	if (!(rtm-&gt;rtm_flags &amp; RTM_F_CLONED))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = idx = cb-&gt;args[1];</div><div class='del'>-	for(h = 0; h &lt;= dn_rt_hash_mask; h++) {</div><div class='del'>-		if (h &lt; s_h)</div><div class='del'>-			continue;</div><div class='del'>-		if (h &gt; s_h)</div><div class='del'>-			s_idx = 0;</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		for(rt = rcu_dereference_bh(dn_rt_hash_table[h].chain), idx = 0;</div><div class='del'>-			rt;</div><div class='del'>-			rt = rcu_dereference_bh(rt-&gt;dn_next), idx++) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				continue;</div><div class='del'>-			skb_dst_set(skb, dst_clone(&amp;rt-&gt;dst));</div><div class='del'>-			if (dn_rt_fill_info(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					cb-&gt;nlh-&gt;nlmsg_seq, RTM_NEWROUTE,</div><div class='del'>-					1, NLM_F_MULTI) &lt; 0) {</div><div class='del'>-				skb_dst_drop(skb);</div><div class='del'>-				rcu_read_unlock_bh();</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			skb_dst_drop(skb);</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-struct dn_rt_cache_iter_state {</div><div class='del'>-	int bucket;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dn_route *dn_rt_cache_get_first(struct seq_file *seq)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = NULL;</div><div class='del'>-	struct dn_rt_cache_iter_state *s = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	for(s-&gt;bucket = dn_rt_hash_mask; s-&gt;bucket &gt;= 0; --s-&gt;bucket) {</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		rt = rcu_dereference_bh(dn_rt_hash_table[s-&gt;bucket].chain);</div><div class='del'>-		if (rt)</div><div class='del'>-			break;</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-	}</div><div class='del'>-	return rt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dn_route *dn_rt_cache_get_next(struct seq_file *seq, struct dn_route *rt)</div><div class='del'>-{</div><div class='del'>-	struct dn_rt_cache_iter_state *s = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	rt = rcu_dereference_bh(rt-&gt;dn_next);</div><div class='del'>-	while (!rt) {</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-		if (--s-&gt;bucket &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		rt = rcu_dereference_bh(dn_rt_hash_table[s-&gt;bucket].chain);</div><div class='del'>-	}</div><div class='del'>-	return rt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_rt_cache_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = dn_rt_cache_get_first(seq);</div><div class='del'>-</div><div class='del'>-	if (rt) {</div><div class='del'>-		while(*pos &amp;&amp; (rt = dn_rt_cache_get_next(seq, rt)))</div><div class='del'>-			--*pos;</div><div class='del'>-	}</div><div class='del'>-	return *pos ? NULL : rt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *dn_rt_cache_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = dn_rt_cache_get_next(seq, v);</div><div class='del'>-	++*pos;</div><div class='del'>-	return rt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_rt_cache_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	if (v)</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_rt_cache_seq_show(struct seq_file *seq, void *v)</div><div class='del'>-{</div><div class='del'>-	struct dn_route *rt = v;</div><div class='del'>-	char buf1[DN_ASCBUF_LEN], buf2[DN_ASCBUF_LEN];</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",</div><div class='del'>-		   rt-&gt;dst.dev ? rt-&gt;dst.dev-&gt;name : "*",</div><div class='del'>-		   dn_addr2asc(le16_to_cpu(rt-&gt;rt_daddr), buf1),</div><div class='del'>-		   dn_addr2asc(le16_to_cpu(rt-&gt;rt_saddr), buf2),</div><div class='del'>-		   atomic_read(&amp;rt-&gt;dst.__refcnt),</div><div class='del'>-		   rt-&gt;dst.__use, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations dn_rt_cache_seq_ops = {</div><div class='del'>-	.start	= dn_rt_cache_seq_start,</div><div class='del'>-	.next	= dn_rt_cache_seq_next,</div><div class='del'>-	.stop	= dn_rt_cache_seq_stop,</div><div class='del'>-	.show	= dn_rt_cache_seq_show,</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-void __init dn_route_init(void)</div><div class='del'>-{</div><div class='del'>-	int i, goal, order;</div><div class='del'>-</div><div class='del'>-	dn_dst_ops.kmem_cachep =</div><div class='del'>-		kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);</div><div class='del'>-	dst_entries_init(&amp;dn_dst_ops);</div><div class='del'>-	timer_setup(&amp;dn_route_timer, dn_dst_check_expire, 0);</div><div class='del'>-	dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;</div><div class='del'>-	add_timer(&amp;dn_route_timer);</div><div class='del'>-</div><div class='del'>-	goal = totalram_pages &gt;&gt; (26 - PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-	for(order = 0; (1UL &lt;&lt; order) &lt; goal; order++)</div><div class='del'>-		/* NOTHING */;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only want 1024 entries max, since the table is very, very unlikely</div><div class='del'>-	 * to be larger than that.</div><div class='del'>-	 */</div><div class='del'>-	while(order &amp;&amp; ((((1UL &lt;&lt; order) * PAGE_SIZE) /</div><div class='del'>-				sizeof(struct dn_rt_hash_bucket)) &gt;= 2048))</div><div class='del'>-		order--;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		dn_rt_hash_mask = (1UL &lt;&lt; order) * PAGE_SIZE /</div><div class='del'>-			sizeof(struct dn_rt_hash_bucket);</div><div class='del'>-		while(dn_rt_hash_mask &amp; (dn_rt_hash_mask - 1))</div><div class='del'>-			dn_rt_hash_mask--;</div><div class='del'>-		dn_rt_hash_table = (struct dn_rt_hash_bucket *)</div><div class='del'>-			__get_free_pages(GFP_ATOMIC, order);</div><div class='del'>-	} while (dn_rt_hash_table == NULL &amp;&amp; --order &gt; 0);</div><div class='del'>-</div><div class='del'>-	if (!dn_rt_hash_table)</div><div class='del'>-		panic("Failed to allocate DECnet route cache hash table\n");</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-		"DECnet: Routing cache hash table of %u buckets, %ldKbytes\n",</div><div class='del'>-		dn_rt_hash_mask,</div><div class='del'>-		(long)(dn_rt_hash_mask*sizeof(struct dn_rt_hash_bucket))/1024);</div><div class='del'>-</div><div class='del'>-	dn_rt_hash_mask--;</div><div class='del'>-	for(i = 0; i &lt;= dn_rt_hash_mask; i++) {</div><div class='del'>-		spin_lock_init(&amp;dn_rt_hash_table[i].lock);</div><div class='del'>-		dn_rt_hash_table[i].chain = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);</div><div class='del'>-</div><div class='del'>-	proc_create_seq_private("decnet_cache", 0444, init_net.proc_net,</div><div class='del'>-			&amp;dn_rt_cache_seq_ops,</div><div class='del'>-			sizeof(struct dn_rt_cache_iter_state), NULL);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DECNET_ROUTER</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_GETROUTE,</div><div class='del'>-			     dn_cache_getroute, dn_fib_dump, 0);</div><div class='del'>-#else</div><div class='del'>-	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_GETROUTE,</div><div class='del'>-			     dn_cache_getroute, dn_cache_dump, 0);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit dn_route_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	del_timer(&amp;dn_route_timer);</div><div class='del'>-	dn_run_flush(NULL);</div><div class='del'>-</div><div class='del'>-	remove_proc_entry("decnet_cache", init_net.proc_net);</div><div class='del'>-	dst_entries_destroy(&amp;dn_dst_ops);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c<br/>deleted file mode 100644<br/>index 4a4e3c17740c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_rules.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_rules.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,258 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Routing Forwarding Information Base (Rules)</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *              Mostly copied from Alexey Kuznetsov's ipv4/fib_rules.c</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *              Steve Whitehouse &lt;steve@chygwyn.com&gt;</div><div class='del'>- *              Updated for Thomas Graf's generic rules</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-static struct fib_rules_ops *dn_fib_rules_ops;</div><div class='del'>-</div><div class='del'>-struct dn_fib_rule</div><div class='del'>-{</div><div class='del'>-	struct fib_rule		common;</div><div class='del'>-	unsigned char		dst_len;</div><div class='del'>-	unsigned char		src_len;</div><div class='del'>-	__le16			src;</div><div class='del'>-	__le16			srcmask;</div><div class='del'>-	__le16			dst;</div><div class='del'>-	__le16			dstmask;</div><div class='del'>-	__le16			srcmap;</div><div class='del'>-	u8			flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int dn_fib_lookup(struct flowidn *flp, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	struct fib_lookup_arg arg = {</div><div class='del'>-		.result = res,</div><div class='del'>-	};</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = fib_rules_lookup(dn_fib_rules_ops,</div><div class='del'>-			       flowidn_to_flowi(flp), 0, &amp;arg);</div><div class='del'>-	res-&gt;r = arg.rule;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='del'>-			      int flags, struct fib_lookup_arg *arg)</div><div class='del'>-{</div><div class='del'>-	struct flowidn *fld = &amp;flp-&gt;u.dn;</div><div class='del'>-	int err = -EAGAIN;</div><div class='del'>-	struct dn_fib_table *tbl;</div><div class='del'>-</div><div class='del'>-	switch(rule-&gt;action) {</div><div class='del'>-	case FR_ACT_TO_TBL:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FR_ACT_UNREACHABLE:</div><div class='del'>-		err = -ENETUNREACH;</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	case FR_ACT_PROHIBIT:</div><div class='del'>-		err = -EACCES;</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	case FR_ACT_BLACKHOLE:</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tbl = dn_fib_get_table(rule-&gt;table, 0);</div><div class='del'>-	if (tbl == NULL)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = tbl-&gt;lookup(tbl, fld, (struct dn_fib_res *)arg-&gt;result);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-errout:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nla_policy dn_fib_rule_policy[FRA_MAX+1] = {</div><div class='del'>-	FRA_GENERIC_POLICY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_rule *r = (struct dn_fib_rule *)rule;</div><div class='del'>-	struct flowidn *fld = &amp;fl-&gt;u.dn;</div><div class='del'>-	__le16 daddr = fld-&gt;daddr;</div><div class='del'>-	__le16 saddr = fld-&gt;saddr;</div><div class='del'>-</div><div class='del'>-	if (((saddr ^ r-&gt;src) &amp; r-&gt;srcmask) ||</div><div class='del'>-	    ((daddr ^ r-&gt;dst) &amp; r-&gt;dstmask))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='del'>-				 struct fib_rule_hdr *frh,</div><div class='del'>-				 struct nlattr **tb,</div><div class='del'>-				 struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	struct dn_fib_rule *r = (struct dn_fib_rule *)rule;</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;tos) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Invalid tos value");</div><div class='del'>-		goto  errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rule-&gt;table == RT_TABLE_UNSPEC) {</div><div class='del'>-		if (rule-&gt;action == FR_ACT_TO_TBL) {</div><div class='del'>-			struct dn_fib_table *table;</div><div class='del'>-</div><div class='del'>-			table = dn_fib_empty_table();</div><div class='del'>-			if (table == NULL) {</div><div class='del'>-				err = -ENOBUFS;</div><div class='del'>-				goto errout;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rule-&gt;table = table-&gt;n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;src_len)</div><div class='del'>-		r-&gt;src = nla_get_le16(tb[FRA_SRC]);</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;dst_len)</div><div class='del'>-		r-&gt;dst = nla_get_le16(tb[FRA_DST]);</div><div class='del'>-</div><div class='del'>-	r-&gt;src_len = frh-&gt;src_len;</div><div class='del'>-	r-&gt;srcmask = dnet_make_mask(r-&gt;src_len);</div><div class='del'>-	r-&gt;dst_len = frh-&gt;dst_len;</div><div class='del'>-	r-&gt;dstmask = dnet_make_mask(r-&gt;dst_len);</div><div class='del'>-	err = 0;</div><div class='del'>-errout:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,</div><div class='del'>-			       struct nlattr **tb)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_rule *r = (struct dn_fib_rule *)rule;</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;src_len &amp;&amp; (r-&gt;src_len != frh-&gt;src_len))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;dst_len &amp;&amp; (r-&gt;dst_len != frh-&gt;dst_len))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;src_len &amp;&amp; (r-&gt;src != nla_get_le16(tb[FRA_SRC])))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (frh-&gt;dst_len &amp;&amp; (r-&gt;dst != nla_get_le16(tb[FRA_DST])))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int dnet_addr_type(__le16 addr)</div><div class='del'>-{</div><div class='del'>-	struct flowidn fld = { .daddr = addr };</div><div class='del'>-	struct dn_fib_res res;</div><div class='del'>-	unsigned int ret = RTN_UNICAST;</div><div class='del'>-	struct dn_fib_table *tb = dn_fib_get_table(RT_TABLE_LOCAL, 0);</div><div class='del'>-</div><div class='del'>-	res.r = NULL;</div><div class='del'>-</div><div class='del'>-	if (tb) {</div><div class='del'>-		if (!tb-&gt;lookup(tb, &amp;fld, &amp;res)) {</div><div class='del'>-			ret = res.type;</div><div class='del'>-			dn_fib_res_put(&amp;res);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,</div><div class='del'>-			    struct fib_rule_hdr *frh)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_rule *r = (struct dn_fib_rule *)rule;</div><div class='del'>-</div><div class='del'>-	frh-&gt;dst_len = r-&gt;dst_len;</div><div class='del'>-	frh-&gt;src_len = r-&gt;src_len;</div><div class='del'>-	frh-&gt;tos = 0;</div><div class='del'>-</div><div class='del'>-	if ((r-&gt;dst_len &amp;&amp;</div><div class='del'>-	     nla_put_le16(skb, FRA_DST, r-&gt;dst)) ||</div><div class='del'>-	    (r-&gt;src_len &amp;&amp;</div><div class='del'>-	     nla_put_le16(skb, FRA_SRC, r-&gt;src)))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	return -ENOBUFS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)</div><div class='del'>-{</div><div class='del'>-	dn_rt_cache_flush(-1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct fib_rules_ops __net_initconst dn_fib_rules_ops_template = {</div><div class='del'>-	.family		= AF_DECnet,</div><div class='del'>-	.rule_size	= sizeof(struct dn_fib_rule),</div><div class='del'>-	.addr_size	= sizeof(u16),</div><div class='del'>-	.action		= dn_fib_rule_action,</div><div class='del'>-	.match		= dn_fib_rule_match,</div><div class='del'>-	.configure	= dn_fib_rule_configure,</div><div class='del'>-	.compare	= dn_fib_rule_compare,</div><div class='del'>-	.fill		= dn_fib_rule_fill,</div><div class='del'>-	.flush_cache	= dn_fib_rule_flush_cache,</div><div class='del'>-	.nlgroup	= RTNLGRP_DECnet_RULE,</div><div class='del'>-	.policy		= dn_fib_rule_policy,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.fro_net	= &amp;init_net,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init dn_fib_rules_init(void)</div><div class='del'>-{</div><div class='del'>-	dn_fib_rules_ops =</div><div class='del'>-		fib_rules_register(&amp;dn_fib_rules_ops_template, &amp;init_net);</div><div class='del'>-	BUG_ON(IS_ERR(dn_fib_rules_ops));</div><div class='del'>-	BUG_ON(fib_default_rule_add(dn_fib_rules_ops, 0x7fff,</div><div class='del'>-			            RT_TABLE_MAIN, 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit dn_fib_rules_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	fib_rules_unregister(dn_fib_rules_ops);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	rcu_barrier();</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c<br/>deleted file mode 100644<br/>index f0710b5d037d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_table.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_table.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,928 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Routing Forwarding Information Base (Routing Tables)</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *              Mostly copied from the IPv4 routing code</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/route.h&gt; /* RTF_xxx */</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-#include &lt;net/dn_fib.h&gt;</div><div class='del'>-#include &lt;net/dn_neigh.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-</div><div class='del'>-struct dn_zone</div><div class='del'>-{</div><div class='del'>-	struct dn_zone		*dz_next;</div><div class='del'>-	struct dn_fib_node 	**dz_hash;</div><div class='del'>-	int			dz_nent;</div><div class='del'>-	int			dz_divisor;</div><div class='del'>-	u32			dz_hashmask;</div><div class='del'>-#define DZ_HASHMASK(dz)	((dz)-&gt;dz_hashmask)</div><div class='del'>-	int			dz_order;</div><div class='del'>-	__le16			dz_mask;</div><div class='del'>-#define DZ_MASK(dz)	((dz)-&gt;dz_mask)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dn_hash</div><div class='del'>-{</div><div class='del'>-	struct dn_zone	*dh_zones[17];</div><div class='del'>-	struct dn_zone	*dh_zone_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define dz_key_0(key)		((key).datum = 0)</div><div class='del'>-</div><div class='del'>-#define for_nexthops(fi) { int nhsel; const struct dn_fib_nh *nh;\</div><div class='del'>-	for(nhsel = 0, nh = (fi)-&gt;fib_nh; nhsel &lt; (fi)-&gt;fib_nhs; nh++, nhsel++)</div><div class='del'>-</div><div class='del'>-#define endfor_nexthops(fi) }</div><div class='del'>-</div><div class='del'>-#define DN_MAX_DIVISOR 1024</div><div class='del'>-#define DN_S_ZOMBIE 1</div><div class='del'>-#define DN_S_ACCESSED 2</div><div class='del'>-</div><div class='del'>-#define DN_FIB_SCAN(f, fp) \</div><div class='del'>-for( ; ((f) = *(fp)) != NULL; (fp) = &amp;(f)-&gt;fn_next)</div><div class='del'>-</div><div class='del'>-#define DN_FIB_SCAN_KEY(f, fp, key) \</div><div class='del'>-for( ; ((f) = *(fp)) != NULL &amp;&amp; dn_key_eq((f)-&gt;fn_key, (key)); (fp) = &amp;(f)-&gt;fn_next)</div><div class='del'>-</div><div class='del'>-#define RT_TABLE_MIN 1</div><div class='del'>-#define DN_FIB_TABLE_HASHSZ 256</div><div class='del'>-static struct hlist_head dn_fib_table_hash[DN_FIB_TABLE_HASHSZ];</div><div class='del'>-static DEFINE_RWLOCK(dn_fib_tables_lock);</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *dn_hash_kmem __read_mostly;</div><div class='del'>-static int dn_fib_hash_zombies;</div><div class='del'>-</div><div class='del'>-static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	u16 h = le16_to_cpu(key.datum)&gt;&gt;(16 - dz-&gt;dz_order);</div><div class='del'>-	h ^= (h &gt;&gt; 10);</div><div class='del'>-	h ^= (h &gt;&gt; 6);</div><div class='del'>-	h &amp;= DZ_HASHMASK(dz);</div><div class='del'>-	return *(dn_fib_idx_t *)&amp;h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline dn_fib_key_t dz_key(__le16 dst, struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	dn_fib_key_t k;</div><div class='del'>-	k.datum = dst &amp; DZ_MASK(dz);</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dn_fib_node **dn_chain_p(dn_fib_key_t key, struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	return &amp;dz-&gt;dz_hash[dn_hash(key, dz).datum];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dn_fib_node *dz_chain(dn_fib_key_t key, struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	return dz-&gt;dz_hash[dn_hash(key, dz).datum];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_key_eq(dn_fib_key_t a, dn_fib_key_t b)</div><div class='del'>-{</div><div class='del'>-	return a.datum == b.datum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_key_leq(dn_fib_key_t a, dn_fib_key_t b)</div><div class='del'>-{</div><div class='del'>-	return a.datum &lt;= b.datum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dn_rebuild_zone(struct dn_zone *dz,</div><div class='del'>-				   struct dn_fib_node **old_ht,</div><div class='del'>-				   int old_divisor)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_node *f, **fp, *next;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; old_divisor; i++) {</div><div class='del'>-		for(f = old_ht[i]; f; f = next) {</div><div class='del'>-			next = f-&gt;fn_next;</div><div class='del'>-			for(fp = dn_chain_p(f-&gt;fn_key, dz);</div><div class='del'>-				*fp &amp;&amp; dn_key_leq((*fp)-&gt;fn_key, f-&gt;fn_key);</div><div class='del'>-				fp = &amp;(*fp)-&gt;fn_next)</div><div class='del'>-				/* NOTHING */;</div><div class='del'>-			f-&gt;fn_next = *fp;</div><div class='del'>-			*fp = f;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_rehash_zone(struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_node **ht, **old_ht;</div><div class='del'>-	int old_divisor, new_divisor;</div><div class='del'>-	u32 new_hashmask;</div><div class='del'>-</div><div class='del'>-	old_divisor = dz-&gt;dz_divisor;</div><div class='del'>-</div><div class='del'>-	switch (old_divisor) {</div><div class='del'>-	case 16:</div><div class='del'>-		new_divisor = 256;</div><div class='del'>-		new_hashmask = 0xFF;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "DECnet: dn_rehash_zone: BUG! %d\n",</div><div class='del'>-		       old_divisor);</div><div class='del'>-		/* fall through */</div><div class='del'>-	case 256:</div><div class='del'>-		new_divisor = 1024;</div><div class='del'>-		new_hashmask = 0x3FF;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ht = kcalloc(new_divisor, sizeof(struct dn_fib_node*), GFP_KERNEL);</div><div class='del'>-	if (ht == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	old_ht = dz-&gt;dz_hash;</div><div class='del'>-	dz-&gt;dz_hash = ht;</div><div class='del'>-	dz-&gt;dz_hashmask = new_hashmask;</div><div class='del'>-	dz-&gt;dz_divisor = new_divisor;</div><div class='del'>-	dn_rebuild_zone(dz, old_ht, old_divisor);</div><div class='del'>-	write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	kfree(old_ht);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_free_node(struct dn_fib_node *f)</div><div class='del'>-{</div><div class='del'>-	dn_fib_release_info(DN_FIB_INFO(f));</div><div class='del'>-	kmem_cache_free(dn_hash_kmem, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct dn_zone *dn_new_zone(struct dn_hash *table, int z)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct dn_zone *dz = kzalloc(sizeof(struct dn_zone), GFP_KERNEL);</div><div class='del'>-	if (!dz)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (z) {</div><div class='del'>-		dz-&gt;dz_divisor = 16;</div><div class='del'>-		dz-&gt;dz_hashmask = 0x0F;</div><div class='del'>-	} else {</div><div class='del'>-		dz-&gt;dz_divisor = 1;</div><div class='del'>-		dz-&gt;dz_hashmask = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dz-&gt;dz_hash = kcalloc(dz-&gt;dz_divisor, sizeof(struct dn_fib_node *), GFP_KERNEL);</div><div class='del'>-	if (!dz-&gt;dz_hash) {</div><div class='del'>-		kfree(dz);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dz-&gt;dz_order = z;</div><div class='del'>-	dz-&gt;dz_mask = dnet_make_mask(z);</div><div class='del'>-</div><div class='del'>-	for(i = z + 1; i &lt;= 16; i++)</div><div class='del'>-		if (table-&gt;dh_zones[i])</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	if (i&gt;16) {</div><div class='del'>-		dz-&gt;dz_next = table-&gt;dh_zone_list;</div><div class='del'>-		table-&gt;dh_zone_list = dz;</div><div class='del'>-	} else {</div><div class='del'>-		dz-&gt;dz_next = table-&gt;dh_zones[i]-&gt;dz_next;</div><div class='del'>-		table-&gt;dh_zones[i]-&gt;dz_next = dz;</div><div class='del'>-	}</div><div class='del'>-	table-&gt;dh_zones[z] = dz;</div><div class='del'>-	write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	return dz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct nlattr *attrs[], struct dn_fib_info *fi)</div><div class='del'>-{</div><div class='del'>-	struct rtnexthop *nhp;</div><div class='del'>-	int nhlen;</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_PRIORITY] &amp;&amp;</div><div class='del'>-	    nla_get_u32(attrs[RTA_PRIORITY]) != fi-&gt;fib_priority)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (attrs[RTA_OIF] || attrs[RTA_GATEWAY]) {</div><div class='del'>-		if ((!attrs[RTA_OIF] || nla_get_u32(attrs[RTA_OIF]) == fi-&gt;fib_nh-&gt;nh_oif) &amp;&amp;</div><div class='del'>-		    (!attrs[RTA_GATEWAY]  || nla_get_le16(attrs[RTA_GATEWAY]) != fi-&gt;fib_nh-&gt;nh_gw))</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!attrs[RTA_MULTIPATH])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nhp = nla_data(attrs[RTA_MULTIPATH]);</div><div class='del'>-	nhlen = nla_len(attrs[RTA_MULTIPATH]);</div><div class='del'>-</div><div class='del'>-	for_nexthops(fi) {</div><div class='del'>-		int attrlen = nhlen - sizeof(struct rtnexthop);</div><div class='del'>-		__le16 gw;</div><div class='del'>-</div><div class='del'>-		if (attrlen &lt; 0 || (nhlen -= nhp-&gt;rtnh_len) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (nhp-&gt;rtnh_ifindex &amp;&amp; nhp-&gt;rtnh_ifindex != nh-&gt;nh_oif)</div><div class='del'>-			return 1;</div><div class='del'>-		if (attrlen) {</div><div class='del'>-			struct nlattr *gw_attr;</div><div class='del'>-</div><div class='del'>-			gw_attr = nla_find((struct nlattr *) (nhp + 1), attrlen, RTA_GATEWAY);</div><div class='del'>-			gw = gw_attr ? nla_get_le16(gw_attr) : 0;</div><div class='del'>-</div><div class='del'>-			if (gw &amp;&amp; gw != nh-&gt;nh_gw)</div><div class='del'>-				return 1;</div><div class='del'>-		}</div><div class='del'>-		nhp = RTNH_NEXT(nhp);</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t dn_fib_nlmsg_size(struct dn_fib_info *fi)</div><div class='del'>-{</div><div class='del'>-	size_t payload = NLMSG_ALIGN(sizeof(struct rtmsg))</div><div class='del'>-			 + nla_total_size(4) /* RTA_TABLE */</div><div class='del'>-			 + nla_total_size(2) /* RTA_DST */</div><div class='del'>-			 + nla_total_size(4) /* RTA_PRIORITY */</div><div class='del'>-			 + nla_total_size(TCP_CA_NAME_MAX); /* RTAX_CC_ALGO */</div><div class='del'>-</div><div class='del'>-	/* space for nested metrics */</div><div class='del'>-	payload += nla_total_size((RTAX_MAX * nla_total_size(4)));</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;fib_nhs) {</div><div class='del'>-		/* Also handles the special case fib_nhs == 1 */</div><div class='del'>-</div><div class='del'>-		/* each nexthop is packed in an attribute */</div><div class='del'>-		size_t nhsize = nla_total_size(sizeof(struct rtnexthop));</div><div class='del'>-</div><div class='del'>-		/* may contain a gateway attribute */</div><div class='del'>-		nhsize += nla_total_size(4);</div><div class='del'>-</div><div class='del'>-		/* all nexthops are packed in a nested attribute */</div><div class='del'>-		payload += nla_total_size(fi-&gt;fib_nhs * nhsize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return payload;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,</div><div class='del'>-			u32 tb_id, u8 type, u8 scope, void *dst, int dst_len,</div><div class='del'>-			struct dn_fib_info *fi, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	struct rtmsg *rtm;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*rtm), flags);</div><div class='del'>-	if (!nlh)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	rtm = nlmsg_data(nlh);</div><div class='del'>-	rtm-&gt;rtm_family = AF_DECnet;</div><div class='del'>-	rtm-&gt;rtm_dst_len = dst_len;</div><div class='del'>-	rtm-&gt;rtm_src_len = 0;</div><div class='del'>-	rtm-&gt;rtm_tos = 0;</div><div class='del'>-	rtm-&gt;rtm_table = tb_id;</div><div class='del'>-	rtm-&gt;rtm_flags = fi-&gt;fib_flags;</div><div class='del'>-	rtm-&gt;rtm_scope = scope;</div><div class='del'>-	rtm-&gt;rtm_type  = type;</div><div class='del'>-	rtm-&gt;rtm_protocol = fi-&gt;fib_protocol;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u32(skb, RTA_TABLE, tb_id) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (rtm-&gt;rtm_dst_len &amp;&amp;</div><div class='del'>-	    nla_put(skb, RTA_DST, 2, dst) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;fib_priority &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_PRIORITY, fi-&gt;fib_priority) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (rtnetlink_put_metrics(skb, fi-&gt;fib_metrics) &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;fib_nhs == 1) {</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_gw &amp;&amp;</div><div class='del'>-		    nla_put_le16(skb, RTA_GATEWAY, fi-&gt;fib_nh-&gt;nh_gw) &lt; 0)</div><div class='del'>-			goto errout;</div><div class='del'>-</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_oif &amp;&amp;</div><div class='del'>-		    nla_put_u32(skb, RTA_OIF, fi-&gt;fib_nh-&gt;nh_oif) &lt; 0)</div><div class='del'>-			goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;fib_nhs &gt; 1) {</div><div class='del'>-		struct rtnexthop *nhp;</div><div class='del'>-		struct nlattr *mp_head;</div><div class='del'>-</div><div class='del'>-		if (!(mp_head = nla_nest_start(skb, RTA_MULTIPATH)))</div><div class='del'>-			goto errout;</div><div class='del'>-</div><div class='del'>-		for_nexthops(fi) {</div><div class='del'>-			if (!(nhp = nla_reserve_nohdr(skb, sizeof(*nhp))))</div><div class='del'>-				goto errout;</div><div class='del'>-</div><div class='del'>-			nhp-&gt;rtnh_flags = nh-&gt;nh_flags &amp; 0xFF;</div><div class='del'>-			nhp-&gt;rtnh_hops = nh-&gt;nh_weight - 1;</div><div class='del'>-			nhp-&gt;rtnh_ifindex = nh-&gt;nh_oif;</div><div class='del'>-</div><div class='del'>-			if (nh-&gt;nh_gw &amp;&amp;</div><div class='del'>-			    nla_put_le16(skb, RTA_GATEWAY, nh-&gt;nh_gw) &lt; 0)</div><div class='del'>-				goto errout;</div><div class='del'>-</div><div class='del'>-			nhp-&gt;rtnh_len = skb_tail_pointer(skb) - (unsigned char *)nhp;</div><div class='del'>-		} endfor_nexthops(fi);</div><div class='del'>-</div><div class='del'>-		nla_nest_end(skb, mp_head);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-errout:</div><div class='del'>-	nlmsg_cancel(skb, nlh);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id,</div><div class='del'>-			struct nlmsghdr *nlh, struct netlink_skb_parms *req)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u32 portid = req ? req-&gt;portid : 0;</div><div class='del'>-	int err = -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	skb = nlmsg_new(dn_fib_nlmsg_size(DN_FIB_INFO(f)), GFP_KERNEL);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	err = dn_fib_dump_info(skb, portid, nlh-&gt;nlmsg_seq, event, tb_id,</div><div class='del'>-			       f-&gt;fn_type, f-&gt;fn_scope, &amp;f-&gt;fn_key, z,</div><div class='del'>-			       DN_FIB_INFO(f), 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		/* -EMSGSIZE implies BUG in dn_fib_nlmsg_size() */</div><div class='del'>-		WARN_ON(err == -EMSGSIZE);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	rtnl_notify(skb, &amp;init_net, portid, RTNLGRP_DECnet_ROUTE, nlh, GFP_KERNEL);</div><div class='del'>-	return;</div><div class='del'>-errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(&amp;init_net, RTNLGRP_DECnet_ROUTE, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ int dn_hash_dump_bucket(struct sk_buff *skb,</div><div class='del'>-				struct netlink_callback *cb,</div><div class='del'>-				struct dn_fib_table *tb,</div><div class='del'>-				struct dn_zone *dz,</div><div class='del'>-				struct dn_fib_node *f)</div><div class='del'>-{</div><div class='del'>-	int i, s_i;</div><div class='del'>-</div><div class='del'>-	s_i = cb-&gt;args[4];</div><div class='del'>-	for(i = 0; f; i++, f = f-&gt;fn_next) {</div><div class='del'>-		if (i &lt; s_i)</div><div class='del'>-			continue;</div><div class='del'>-		if (f-&gt;fn_state &amp; DN_S_ZOMBIE)</div><div class='del'>-			continue;</div><div class='del'>-		if (dn_fib_dump_info(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-				RTM_NEWROUTE,</div><div class='del'>-				tb-&gt;n,</div><div class='del'>-				(f-&gt;fn_state &amp; DN_S_ZOMBIE) ? 0 : f-&gt;fn_type,</div><div class='del'>-				f-&gt;fn_scope, &amp;f-&gt;fn_key, dz-&gt;dz_order,</div><div class='del'>-				f-&gt;fn_info, NLM_F_MULTI) &lt; 0) {</div><div class='del'>-			cb-&gt;args[4] = i;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	cb-&gt;args[4] = i;</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ int dn_hash_dump_zone(struct sk_buff *skb,</div><div class='del'>-				struct netlink_callback *cb,</div><div class='del'>-				struct dn_fib_table *tb,</div><div class='del'>-				struct dn_zone *dz)</div><div class='del'>-{</div><div class='del'>-	int h, s_h;</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[3];</div><div class='del'>-	for(h = 0; h &lt; dz-&gt;dz_divisor; h++) {</div><div class='del'>-		if (h &lt; s_h)</div><div class='del'>-			continue;</div><div class='del'>-		if (h &gt; s_h)</div><div class='del'>-			memset(&amp;cb-&gt;args[4], 0, sizeof(cb-&gt;args) - 4*sizeof(cb-&gt;args[0]));</div><div class='del'>-		if (dz-&gt;dz_hash == NULL || dz-&gt;dz_hash[h] == NULL)</div><div class='del'>-			continue;</div><div class='del'>-		if (dn_hash_dump_bucket(skb, cb, tb, dz, dz-&gt;dz_hash[h]) &lt; 0) {</div><div class='del'>-			cb-&gt;args[3] = h;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	cb-&gt;args[3] = h;</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_table_dump(struct dn_fib_table *tb, struct sk_buff *skb,</div><div class='del'>-				struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	int m, s_m;</div><div class='del'>-	struct dn_zone *dz;</div><div class='del'>-	struct dn_hash *table = (struct dn_hash *)tb-&gt;data;</div><div class='del'>-</div><div class='del'>-	s_m = cb-&gt;args[2];</div><div class='del'>-	read_lock(&amp;dn_fib_tables_lock);</div><div class='del'>-	for(dz = table-&gt;dh_zone_list, m = 0; dz; dz = dz-&gt;dz_next, m++) {</div><div class='del'>-		if (m &lt; s_m)</div><div class='del'>-			continue;</div><div class='del'>-		if (m &gt; s_m)</div><div class='del'>-			memset(&amp;cb-&gt;args[3], 0, sizeof(cb-&gt;args) - 3*sizeof(cb-&gt;args[0]));</div><div class='del'>-</div><div class='del'>-		if (dn_hash_dump_zone(skb, cb, tb, dz) &lt; 0) {</div><div class='del'>-			cb-&gt;args[2] = m;</div><div class='del'>-			read_unlock(&amp;dn_fib_tables_lock);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;dn_fib_tables_lock);</div><div class='del'>-	cb-&gt;args[2] = m;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	unsigned int h, s_h;</div><div class='del'>-	unsigned int e = 0, s_e;</div><div class='del'>-	struct dn_fib_table *tb;</div><div class='del'>-	int dumped = 0;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &gt;= sizeof(struct rtmsg) &amp;&amp;</div><div class='del'>-		((struct rtmsg *)nlmsg_data(cb-&gt;nlh))-&gt;rtm_flags&amp;RTM_F_CLONED)</div><div class='del'>-			return dn_cache_dump(skb, cb);</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_e = cb-&gt;args[1];</div><div class='del'>-</div><div class='del'>-	for (h = s_h; h &lt; DN_FIB_TABLE_HASHSZ; h++, s_h = 0) {</div><div class='del'>-		e = 0;</div><div class='del'>-		hlist_for_each_entry(tb, &amp;dn_fib_table_hash[h], hlist) {</div><div class='del'>-			if (e &lt; s_e)</div><div class='del'>-				goto next;</div><div class='del'>-			if (dumped)</div><div class='del'>-				memset(&amp;cb-&gt;args[2], 0, sizeof(cb-&gt;args) -</div><div class='del'>-						 2 * sizeof(cb-&gt;args[0]));</div><div class='del'>-			if (tb-&gt;dump(tb, skb, cb) &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			dumped = 1;</div><div class='del'>-next:</div><div class='del'>-			e++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	cb-&gt;args[1] = e;</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_table_insert(struct dn_fib_table *tb, struct rtmsg *r, struct nlattr *attrs[],</div><div class='del'>-			       struct nlmsghdr *n, struct netlink_skb_parms *req)</div><div class='del'>-{</div><div class='del'>-	struct dn_hash *table = (struct dn_hash *)tb-&gt;data;</div><div class='del'>-	struct dn_fib_node *new_f, *f, **fp, **del_fp;</div><div class='del'>-	struct dn_zone *dz;</div><div class='del'>-	struct dn_fib_info *fi;</div><div class='del'>-	int z = r-&gt;rtm_dst_len;</div><div class='del'>-	int type = r-&gt;rtm_type;</div><div class='del'>-	dn_fib_key_t key;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (z &gt; 16)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dz = table-&gt;dh_zones[z];</div><div class='del'>-	if (!dz &amp;&amp; !(dz = dn_new_zone(table, z)))</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	dz_key_0(key);</div><div class='del'>-	if (attrs[RTA_DST]) {</div><div class='del'>-		__le16 dst = nla_get_le16(attrs[RTA_DST]);</div><div class='del'>-		if (dst &amp; ~DZ_MASK(dz))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		key = dz_key(dst, dz);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((fi = dn_fib_create_info(r, attrs, n, &amp;err)) == NULL)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (dz-&gt;dz_nent &gt; (dz-&gt;dz_divisor &lt;&lt; 2) &amp;&amp;</div><div class='del'>-			dz-&gt;dz_divisor &gt; DN_MAX_DIVISOR &amp;&amp;</div><div class='del'>-			(z==16 || (1&lt;&lt;z) &gt; dz-&gt;dz_divisor))</div><div class='del'>-		dn_rehash_zone(dz);</div><div class='del'>-</div><div class='del'>-	fp = dn_chain_p(key, dz);</div><div class='del'>-</div><div class='del'>-	DN_FIB_SCAN(f, fp) {</div><div class='del'>-		if (dn_key_leq(key, f-&gt;fn_key))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	del_fp = NULL;</div><div class='del'>-</div><div class='del'>-	if (f &amp;&amp; (f-&gt;fn_state &amp; DN_S_ZOMBIE) &amp;&amp;</div><div class='del'>-			dn_key_eq(f-&gt;fn_key, key)) {</div><div class='del'>-		del_fp = fp;</div><div class='del'>-		fp = &amp;f-&gt;fn_next;</div><div class='del'>-		f = *fp;</div><div class='del'>-		goto create;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DN_FIB_SCAN_KEY(f, fp, key) {</div><div class='del'>-		if (fi-&gt;fib_priority &lt;= DN_FIB_INFO(f)-&gt;fib_priority)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (f &amp;&amp; dn_key_eq(f-&gt;fn_key, key) &amp;&amp;</div><div class='del'>-			fi-&gt;fib_priority == DN_FIB_INFO(f)-&gt;fib_priority) {</div><div class='del'>-		struct dn_fib_node **ins_fp;</div><div class='del'>-</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-		if (n-&gt;nlmsg_flags &amp; NLM_F_EXCL)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (n-&gt;nlmsg_flags &amp; NLM_F_REPLACE) {</div><div class='del'>-			del_fp = fp;</div><div class='del'>-			fp = &amp;f-&gt;fn_next;</div><div class='del'>-			f = *fp;</div><div class='del'>-			goto replace;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ins_fp = fp;</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-</div><div class='del'>-		DN_FIB_SCAN_KEY(f, fp, key) {</div><div class='del'>-			if (fi-&gt;fib_priority != DN_FIB_INFO(f)-&gt;fib_priority)</div><div class='del'>-				break;</div><div class='del'>-			if (f-&gt;fn_type == type &amp;&amp;</div><div class='del'>-			    f-&gt;fn_scope == r-&gt;rtm_scope &amp;&amp;</div><div class='del'>-			    DN_FIB_INFO(f) == fi)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(n-&gt;nlmsg_flags &amp; NLM_F_APPEND)) {</div><div class='del'>-			fp = ins_fp;</div><div class='del'>-			f = *fp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-create:</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-	if (!(n-&gt;nlmsg_flags &amp; NLM_F_CREATE))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-replace:</div><div class='del'>-	err = -ENOBUFS;</div><div class='del'>-	new_f = kmem_cache_zalloc(dn_hash_kmem, GFP_KERNEL);</div><div class='del'>-	if (new_f == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	new_f-&gt;fn_key = key;</div><div class='del'>-	new_f-&gt;fn_type = type;</div><div class='del'>-	new_f-&gt;fn_scope = r-&gt;rtm_scope;</div><div class='del'>-	DN_FIB_INFO(new_f) = fi;</div><div class='del'>-</div><div class='del'>-	new_f-&gt;fn_next = f;</div><div class='del'>-	write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	*fp = new_f;</div><div class='del'>-	write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-	dz-&gt;dz_nent++;</div><div class='del'>-</div><div class='del'>-	if (del_fp) {</div><div class='del'>-		f = *del_fp;</div><div class='del'>-		write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-		*del_fp = f-&gt;fn_next;</div><div class='del'>-		write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-</div><div class='del'>-		if (!(f-&gt;fn_state &amp; DN_S_ZOMBIE))</div><div class='del'>-			dn_rtmsg_fib(RTM_DELROUTE, f, z, tb-&gt;n, n, req);</div><div class='del'>-		if (f-&gt;fn_state &amp; DN_S_ACCESSED)</div><div class='del'>-			dn_rt_cache_flush(-1);</div><div class='del'>-		dn_free_node(f);</div><div class='del'>-		dz-&gt;dz_nent--;</div><div class='del'>-	} else {</div><div class='del'>-		dn_rt_cache_flush(-1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_rtmsg_fib(RTM_NEWROUTE, new_f, z, tb-&gt;n, n, req);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-out:</div><div class='del'>-	dn_fib_release_info(fi);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dn_fib_table_delete(struct dn_fib_table *tb, struct rtmsg *r, struct nlattr *attrs[],</div><div class='del'>-			       struct nlmsghdr *n, struct netlink_skb_parms *req)</div><div class='del'>-{</div><div class='del'>-	struct dn_hash *table = (struct dn_hash*)tb-&gt;data;</div><div class='del'>-	struct dn_fib_node **fp, **del_fp, *f;</div><div class='del'>-	int z = r-&gt;rtm_dst_len;</div><div class='del'>-	struct dn_zone *dz;</div><div class='del'>-	dn_fib_key_t key;</div><div class='del'>-	int matched;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (z &gt; 16)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((dz = table-&gt;dh_zones[z]) == NULL)</div><div class='del'>-		return -ESRCH;</div><div class='del'>-</div><div class='del'>-	dz_key_0(key);</div><div class='del'>-	if (attrs[RTA_DST]) {</div><div class='del'>-		__le16 dst = nla_get_le16(attrs[RTA_DST]);</div><div class='del'>-		if (dst &amp; ~DZ_MASK(dz))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		key = dz_key(dst, dz);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fp = dn_chain_p(key, dz);</div><div class='del'>-</div><div class='del'>-	DN_FIB_SCAN(f, fp) {</div><div class='del'>-		if (dn_key_eq(f-&gt;fn_key, key))</div><div class='del'>-			break;</div><div class='del'>-		if (dn_key_leq(key, f-&gt;fn_key))</div><div class='del'>-			return -ESRCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = 0;</div><div class='del'>-	del_fp = NULL;</div><div class='del'>-	DN_FIB_SCAN_KEY(f, fp, key) {</div><div class='del'>-		struct dn_fib_info *fi = DN_FIB_INFO(f);</div><div class='del'>-</div><div class='del'>-		if (f-&gt;fn_state &amp; DN_S_ZOMBIE)</div><div class='del'>-			return -ESRCH;</div><div class='del'>-</div><div class='del'>-		matched++;</div><div class='del'>-</div><div class='del'>-		if (del_fp == NULL &amp;&amp;</div><div class='del'>-				(!r-&gt;rtm_type || f-&gt;fn_type == r-&gt;rtm_type) &amp;&amp;</div><div class='del'>-				(r-&gt;rtm_scope == RT_SCOPE_NOWHERE || f-&gt;fn_scope == r-&gt;rtm_scope) &amp;&amp;</div><div class='del'>-				(!r-&gt;rtm_protocol ||</div><div class='del'>-					fi-&gt;fib_protocol == r-&gt;rtm_protocol) &amp;&amp;</div><div class='del'>-				dn_fib_nh_match(r, n, attrs, fi) == 0)</div><div class='del'>-			del_fp = fp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (del_fp) {</div><div class='del'>-		f = *del_fp;</div><div class='del'>-		dn_rtmsg_fib(RTM_DELROUTE, f, z, tb-&gt;n, n, req);</div><div class='del'>-</div><div class='del'>-		if (matched != 1) {</div><div class='del'>-			write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-			*del_fp = f-&gt;fn_next;</div><div class='del'>-			write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-</div><div class='del'>-			if (f-&gt;fn_state &amp; DN_S_ACCESSED)</div><div class='del'>-				dn_rt_cache_flush(-1);</div><div class='del'>-			dn_free_node(f);</div><div class='del'>-			dz-&gt;dz_nent--;</div><div class='del'>-		} else {</div><div class='del'>-			f-&gt;fn_state |= DN_S_ZOMBIE;</div><div class='del'>-			if (f-&gt;fn_state &amp; DN_S_ACCESSED) {</div><div class='del'>-				f-&gt;fn_state &amp;= ~DN_S_ACCESSED;</div><div class='del'>-				dn_rt_cache_flush(-1);</div><div class='del'>-			}</div><div class='del'>-			if (++dn_fib_hash_zombies &gt; 128)</div><div class='del'>-				dn_fib_flush();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ESRCH;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dn_flush_list(struct dn_fib_node **fp, int z, struct dn_hash *table)</div><div class='del'>-{</div><div class='del'>-	int found = 0;</div><div class='del'>-	struct dn_fib_node *f;</div><div class='del'>-</div><div class='del'>-	while((f = *fp) != NULL) {</div><div class='del'>-		struct dn_fib_info *fi = DN_FIB_INFO(f);</div><div class='del'>-</div><div class='del'>-		if (fi &amp;&amp; ((f-&gt;fn_state &amp; DN_S_ZOMBIE) || (fi-&gt;fib_flags &amp; RTNH_F_DEAD))) {</div><div class='del'>-			write_lock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-			*fp = f-&gt;fn_next;</div><div class='del'>-			write_unlock_bh(&amp;dn_fib_tables_lock);</div><div class='del'>-</div><div class='del'>-			dn_free_node(f);</div><div class='del'>-			found++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		fp = &amp;f-&gt;fn_next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_table_flush(struct dn_fib_table *tb)</div><div class='del'>-{</div><div class='del'>-	struct dn_hash *table = (struct dn_hash *)tb-&gt;data;</div><div class='del'>-	struct dn_zone *dz;</div><div class='del'>-	int found = 0;</div><div class='del'>-</div><div class='del'>-	dn_fib_hash_zombies = 0;</div><div class='del'>-	for(dz = table-&gt;dh_zone_list; dz; dz = dz-&gt;dz_next) {</div><div class='del'>-		int i;</div><div class='del'>-		int tmp = 0;</div><div class='del'>-		for(i = dz-&gt;dz_divisor-1; i &gt;= 0; i--)</div><div class='del'>-			tmp += dn_flush_list(&amp;dz-&gt;dz_hash[i], dz-&gt;dz_order, table);</div><div class='del'>-		dz-&gt;dz_nent -= tmp;</div><div class='del'>-		found += tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowidn *flp, struct dn_fib_res *res)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct dn_zone *dz;</div><div class='del'>-	struct dn_hash *t = (struct dn_hash *)tb-&gt;data;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;dn_fib_tables_lock);</div><div class='del'>-	for(dz = t-&gt;dh_zone_list; dz; dz = dz-&gt;dz_next) {</div><div class='del'>-		struct dn_fib_node *f;</div><div class='del'>-		dn_fib_key_t k = dz_key(flp-&gt;daddr, dz);</div><div class='del'>-</div><div class='del'>-		for(f = dz_chain(k, dz); f; f = f-&gt;fn_next) {</div><div class='del'>-			if (!dn_key_eq(k, f-&gt;fn_key)) {</div><div class='del'>-				if (dn_key_leq(k, f-&gt;fn_key))</div><div class='del'>-					break;</div><div class='del'>-				else</div><div class='del'>-					continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			f-&gt;fn_state |= DN_S_ACCESSED;</div><div class='del'>-</div><div class='del'>-			if (f-&gt;fn_state&amp;DN_S_ZOMBIE)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (f-&gt;fn_scope &lt; flp-&gt;flowidn_scope)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			err = dn_fib_semantic_match(f-&gt;fn_type, DN_FIB_INFO(f), flp, res);</div><div class='del'>-</div><div class='del'>-			if (err == 0) {</div><div class='del'>-				res-&gt;type = f-&gt;fn_type;</div><div class='del'>-				res-&gt;scope = f-&gt;fn_scope;</div><div class='del'>-				res-&gt;prefixlen = dz-&gt;dz_order;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = 1;</div><div class='del'>-out:</div><div class='del'>-	read_unlock(&amp;dn_fib_tables_lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct dn_fib_table *dn_fib_get_table(u32 n, int create)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_table *t;</div><div class='del'>-	unsigned int h;</div><div class='del'>-</div><div class='del'>-	if (n &lt; RT_TABLE_MIN)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (n &gt; RT_TABLE_MAX)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	h = n &amp; (DN_FIB_TABLE_HASHSZ - 1);</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(t, &amp;dn_fib_table_hash[h], hlist) {</div><div class='del'>-		if (t-&gt;n == n) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (!create)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (in_interrupt()) {</div><div class='del'>-		net_dbg_ratelimited("DECnet: BUG! Attempt to create routing table from interrupt\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t = kzalloc(sizeof(struct dn_fib_table) + sizeof(struct dn_hash),</div><div class='del'>-		    GFP_KERNEL);</div><div class='del'>-	if (t == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	t-&gt;n = n;</div><div class='del'>-	t-&gt;insert = dn_fib_table_insert;</div><div class='del'>-	t-&gt;delete = dn_fib_table_delete;</div><div class='del'>-	t-&gt;lookup = dn_fib_table_lookup;</div><div class='del'>-	t-&gt;flush  = dn_fib_table_flush;</div><div class='del'>-	t-&gt;dump = dn_fib_table_dump;</div><div class='del'>-	hlist_add_head_rcu(&amp;t-&gt;hlist, &amp;dn_fib_table_hash[h]);</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dn_fib_table *dn_fib_empty_table(void)</div><div class='del'>-{</div><div class='del'>-	u32 id;</div><div class='del'>-</div><div class='del'>-	for(id = RT_TABLE_MIN; id &lt;= RT_TABLE_MAX; id++)</div><div class='del'>-		if (dn_fib_get_table(id, 0) == NULL)</div><div class='del'>-			return dn_fib_get_table(id, 1);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_fib_flush(void)</div><div class='del'>-{</div><div class='del'>-	int flushed = 0;</div><div class='del'>-	struct dn_fib_table *tb;</div><div class='del'>-	unsigned int h;</div><div class='del'>-</div><div class='del'>-	for (h = 0; h &lt; DN_FIB_TABLE_HASHSZ; h++) {</div><div class='del'>-		hlist_for_each_entry(tb, &amp;dn_fib_table_hash[h], hlist)</div><div class='del'>-			flushed += tb-&gt;flush(tb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flushed)</div><div class='del'>-		dn_rt_cache_flush(-1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init dn_fib_table_init(void)</div><div class='del'>-{</div><div class='del'>-	dn_hash_kmem = kmem_cache_create("dn_fib_info_cache",</div><div class='del'>-					sizeof(struct dn_fib_info),</div><div class='del'>-					0, SLAB_HWCACHE_ALIGN,</div><div class='del'>-					NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit dn_fib_table_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	struct dn_fib_table *t;</div><div class='del'>-	struct hlist_node *next;</div><div class='del'>-	unsigned int h;</div><div class='del'>-</div><div class='del'>-	write_lock(&amp;dn_fib_tables_lock);</div><div class='del'>-	for (h = 0; h &lt; DN_FIB_TABLE_HASHSZ; h++) {</div><div class='del'>-		hlist_for_each_entry_safe(t, next, &amp;dn_fib_table_hash[h],</div><div class='del'>-					  hlist) {</div><div class='del'>-			hlist_del(&amp;t-&gt;hlist);</div><div class='del'>-			kfree(t);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	write_unlock(&amp;dn_fib_tables_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c<br/>deleted file mode 100644<br/>index aa4155875ca8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/dn_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/dn_timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Socket Timer Functions</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *       Steve Whitehouse      : Made keepalive timer part of the same</div><div class='del'>- *                               timer idea.</div><div class='del'>- *       Steve Whitehouse      : Added checks for sk-&gt;sock_readers</div><div class='del'>- *       David S. Miller       : New socket locking</div><div class='del'>- *       Steve Whitehouse      : Timer grabs socket ref.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Slow timer is for everything else (n * 500mS)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SLOW_INTERVAL (HZ/2)</div><div class='del'>-</div><div class='del'>-static void dn_slow_timer(struct timer_list *t);</div><div class='del'>-</div><div class='del'>-void dn_start_slow_timer(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	timer_setup(&amp;sk-&gt;sk_timer, dn_slow_timer, 0);</div><div class='del'>-	sk_reset_timer(sk, &amp;sk-&gt;sk_timer, jiffies + SLOW_INTERVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_stop_slow_timer(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	sk_stop_timer(sk, &amp;sk-&gt;sk_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dn_slow_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = from_timer(sk, t, sk_timer);</div><div class='del'>-	struct dn_scp *scp = DN_SK(sk);</div><div class='del'>-</div><div class='del'>-	bh_lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (sock_owned_by_user(sk)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;sk-&gt;sk_timer, jiffies + HZ / 10);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The persist timer is the standard slow timer used for retransmits</div><div class='del'>-	 * in both connection establishment and disconnection as well as</div><div class='del'>-	 * in the RUN state. The different states are catered for by changing</div><div class='del'>-	 * the function pointer in the socket. Setting the timer to a value</div><div class='del'>-	 * of zero turns it off. We allow the persist_fxn to turn the</div><div class='del'>-	 * timer off in a permant way by returning non-zero, so that</div><div class='del'>-	 * timer based routines may remove sockets. This is why we have a</div><div class='del'>-	 * sock_hold()/sock_put() around the timer to prevent the socket</div><div class='del'>-	 * going away in the middle.</div><div class='del'>-	 */</div><div class='del'>-	if (scp-&gt;persist &amp;&amp; scp-&gt;persist_fxn) {</div><div class='del'>-		if (scp-&gt;persist &lt;= SLOW_INTERVAL) {</div><div class='del'>-			scp-&gt;persist = 0;</div><div class='del'>-</div><div class='del'>-			if (scp-&gt;persist_fxn(sk))</div><div class='del'>-				goto out;</div><div class='del'>-		} else {</div><div class='del'>-			scp-&gt;persist -= SLOW_INTERVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check for keepalive timeout. After the other timer 'cos if</div><div class='del'>-	 * the previous timer caused a retransmit, we don't need to</div><div class='del'>-	 * do this. scp-&gt;stamp is the last time that we sent a packet.</div><div class='del'>-	 * The keepalive function sends a link service packet to the</div><div class='del'>-	 * other end. If it remains unacknowledged, the standard</div><div class='del'>-	 * socket timers will eventually shut the socket down. Each</div><div class='del'>-	 * time we do this, scp-&gt;stamp will be updated, thus</div><div class='del'>-	 * we won't try and send another until scp-&gt;keepalive has passed</div><div class='del'>-	 * since the last successful transmission.</div><div class='del'>-	 */</div><div class='del'>-	if (scp-&gt;keepalive &amp;&amp; scp-&gt;keepalive_fxn &amp;&amp; (scp-&gt;state == DN_RUN)) {</div><div class='del'>-		if (time_after_eq(jiffies, scp-&gt;stamp + scp-&gt;keepalive))</div><div class='del'>-			scp-&gt;keepalive_fxn(sk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk_reset_timer(sk, &amp;sk-&gt;sk_timer, jiffies + SLOW_INTERVAL);</div><div class='del'>-out:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='del'>-	sock_put(sk);</div><div class='del'>-}</div><div class='head'>diff --git a/net/decnet/netfilter/Kconfig b/net/decnet/netfilter/Kconfig<br/>deleted file mode 100644<br/>index 8d7c109d5109..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/netfilter/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# DECnet netfilter configuration</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-menu "DECnet: Netfilter Configuration"</div><div class='del'>-	depends on DECNET &amp;&amp; NETFILTER</div><div class='del'>-	depends on NETFILTER_ADVANCED</div><div class='del'>-</div><div class='del'>-config DECNET_NF_GRABULATOR</div><div class='del'>-	tristate "Routing message grabulator (for userland routing daemon)"</div><div class='del'>-	help</div><div class='del'>-	  Enable this module if you want to use the userland DECnet routing</div><div class='del'>-	  daemon. You will also need to enable routing support for DECnet</div><div class='del'>-	  unless you just want to monitor routing messages from other nodes.</div><div class='del'>-</div><div class='del'>-endmenu</div><div class='head'>diff --git a/net/decnet/netfilter/Makefile b/net/decnet/netfilter/Makefile<br/>deleted file mode 100644<br/>index b579e52130aa..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/netfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for DECnet netfilter modules</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_DECNET_NF_GRABULATOR) += dn_rtmsg.o</div><div class='head'>diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c<br/>deleted file mode 100644<br/>index a4faacadd8a8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/netfilter/dn_rtmsg.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/netfilter/dn_rtmsg.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet Routing Message Grabulator</div><div class='del'>- *</div><div class='del'>- *              (C) 2000 ChyGwyn Limited  -  http://www.chygwyn.com/</div><div class='del'>- *              This code may be copied under the GPL v.2 or at your option</div><div class='del'>- *              any later version.</div><div class='del'>- *</div><div class='del'>- * Author:      Steven Whitehouse &lt;steve@chygwyn.com&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_decnet.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-static struct sock *dnrmg = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	size_t size;</div><div class='del'>-	sk_buff_data_t old_tail;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	struct nf_dn_rtmsg *rtm;</div><div class='del'>-</div><div class='del'>-	size = NLMSG_ALIGN(rt_skb-&gt;len) +</div><div class='del'>-	       NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg));</div><div class='del'>-	skb = nlmsg_new(size, GFP_ATOMIC);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		*errp = -ENOMEM;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	old_tail = skb-&gt;tail;</div><div class='del'>-	nlh = nlmsg_put(skb, 0, 0, 0, size, 0);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		*errp = -ENOMEM;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	rtm = (struct nf_dn_rtmsg *)nlmsg_data(nlh);</div><div class='del'>-	rtm-&gt;nfdn_ifindex = rt_skb-&gt;dev-&gt;ifindex;</div><div class='del'>-	ptr = NFDN_RTMSG(rtm);</div><div class='del'>-	skb_copy_from_linear_data(rt_skb, ptr, rt_skb-&gt;len);</div><div class='del'>-	nlh-&gt;nlmsg_len = skb-&gt;tail - old_tail;</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dnrmg_send_peer(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb2;</div><div class='del'>-	int status = 0;</div><div class='del'>-	int group = 0;</div><div class='del'>-	unsigned char flags = *skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	switch (flags &amp; DN_RT_CNTL_MSK) {</div><div class='del'>-	case DN_RT_PKT_L1RT:</div><div class='del'>-		group = DNRNG_NLGRP_L1;</div><div class='del'>-		break;</div><div class='del'>-	case DN_RT_PKT_L2RT:</div><div class='del'>-		group = DNRNG_NLGRP_L2;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb2 = dnrmg_build_message(skb, &amp;status);</div><div class='del'>-	if (skb2 == NULL)</div><div class='del'>-		return;</div><div class='del'>-	NETLINK_CB(skb2).dst_group = group;</div><div class='del'>-	netlink_broadcast(dnrmg, skb2, 0, group, GFP_ATOMIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static unsigned int dnrmg_hook(void *priv,</div><div class='del'>-			struct sk_buff *skb,</div><div class='del'>-			const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	dnrmg_send_peer(skb);</div><div class='del'>-	return NF_ACCEPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define RCV_SKB_FAIL(err) do { netlink_ack(skb, nlh, (err), NULL); return; } while (0)</div><div class='del'>-</div><div class='del'>-static inline void dnrmg_receive_user_skb(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct nlmsghdr *nlh = nlmsg_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*nlh) ||</div><div class='del'>-	    nlh-&gt;nlmsg_len &lt; sizeof(*nlh) ||</div><div class='del'>-	    skb-&gt;len &lt; nlh-&gt;nlmsg_len)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!netlink_capable(skb, CAP_NET_ADMIN))</div><div class='del'>-		RCV_SKB_FAIL(-EPERM);</div><div class='del'>-</div><div class='del'>-	/* Eventually we might send routing messages too */</div><div class='del'>-</div><div class='del'>-	RCV_SKB_FAIL(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops dnrmg_ops = {</div><div class='del'>-	.hook		= dnrmg_hook,</div><div class='del'>-	.pf		= NFPROTO_DECNET,</div><div class='del'>-	.hooknum	= NF_DN_ROUTE,</div><div class='del'>-	.priority	= NF_DN_PRI_DNRTMSG,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dn_rtmsg_init(void)</div><div class='del'>-{</div><div class='del'>-	int rv = 0;</div><div class='del'>-	struct netlink_kernel_cfg cfg = {</div><div class='del'>-		.groups	= DNRNG_NLGRP_MAX,</div><div class='del'>-		.input	= dnrmg_receive_user_skb,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dnrmg = netlink_kernel_create(&amp;init_net, NETLINK_DNRTMSG, &amp;cfg);</div><div class='del'>-	if (dnrmg == NULL) {</div><div class='del'>-		printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = nf_register_net_hook(&amp;init_net, &amp;dnrmg_ops);</div><div class='del'>-	if (rv) {</div><div class='del'>-		netlink_kernel_release(dnrmg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dn_rtmsg_fini(void)</div><div class='del'>-{</div><div class='del'>-	nf_unregister_net_hook(&amp;init_net, &amp;dnrmg_ops);</div><div class='del'>-	netlink_kernel_release(dnrmg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("DECnet Routing Message Grabulator");</div><div class='del'>-MODULE_AUTHOR("Steven Whitehouse &lt;steve@chygwyn.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);</div><div class='del'>-</div><div class='del'>-module_init(dn_rtmsg_init);</div><div class='del'>-module_exit(dn_rtmsg_fini);</div><div class='head'>diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c<br/>deleted file mode 100644<br/>index 55bf64a22b59..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/decnet/sysctl_net_decnet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/decnet/sysctl_net_decnet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,373 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * DECnet       An implementation of the DECnet protocol suite for the LINUX</div><div class='del'>- *              operating system.  DECnet is implemented using the  BSD Socket</div><div class='del'>- *              interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *              DECnet sysctl support functions</div><div class='del'>- *</div><div class='del'>- * Author:      Steve Whitehouse &lt;SteveW@ACM.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- * Steve Whitehouse - C99 changes and default device handling</div><div class='del'>- * Steve Whitehouse - Memory buffer settings, like the tcp ones</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;net/neighbour.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/flow.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/dn.h&gt;</div><div class='del'>-#include &lt;net/dn_dev.h&gt;</div><div class='del'>-#include &lt;net/dn_route.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int decnet_debug_level;</div><div class='del'>-int decnet_time_wait = 30;</div><div class='del'>-int decnet_dn_count = 1;</div><div class='del'>-int decnet_di_count = 3;</div><div class='del'>-int decnet_dr_count = 3;</div><div class='del'>-int decnet_log_martians = 1;</div><div class='del'>-int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW;</div><div class='del'>-</div><div class='del'>-/* Reasonable defaults, I hope, based on tcp's defaults */</div><div class='del'>-long sysctl_decnet_mem[3] = { 768 &lt;&lt; 3, 1024 &lt;&lt; 3, 1536 &lt;&lt; 3 };</div><div class='del'>-int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 };</div><div class='del'>-int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 };</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-extern int decnet_dst_gc_interval;</div><div class='del'>-static int min_decnet_time_wait[] = { 5 };</div><div class='del'>-static int max_decnet_time_wait[] = { 600 };</div><div class='del'>-static int min_state_count[] = { 1 };</div><div class='del'>-static int max_state_count[] = { NSP_MAXRXTSHIFT };</div><div class='del'>-static int min_decnet_dst_gc_interval[] = { 1 };</div><div class='del'>-static int max_decnet_dst_gc_interval[] = { 60 };</div><div class='del'>-static int min_decnet_no_fc_max_cwnd[] = { NSP_MIN_WINDOW };</div><div class='del'>-static int max_decnet_no_fc_max_cwnd[] = { NSP_MAX_WINDOW };</div><div class='del'>-static char node_name[7] = "???";</div><div class='del'>-</div><div class='del'>-static struct ctl_table_header *dn_table_header = NULL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ctype.h :-)</div><div class='del'>- */</div><div class='del'>-#define ISNUM(x) (((x) &gt;= '0') &amp;&amp; ((x) &lt;= '9'))</div><div class='del'>-#define ISLOWER(x) (((x) &gt;= 'a') &amp;&amp; ((x) &lt;= 'z'))</div><div class='del'>-#define ISUPPER(x) (((x) &gt;= 'A') &amp;&amp; ((x) &lt;= 'Z'))</div><div class='del'>-#define ISALPHA(x) (ISLOWER(x) || ISUPPER(x))</div><div class='del'>-#define INVALID_END_CHAR(x) (ISNUM(x) || ISALPHA(x))</div><div class='del'>-</div><div class='del'>-static void strip_it(char *str)</div><div class='del'>-{</div><div class='del'>-	for(;;) {</div><div class='del'>-		switch (*str) {</div><div class='del'>-		case ' ':</div><div class='del'>-		case '\n':</div><div class='del'>-		case '\r':</div><div class='del'>-		case ':':</div><div class='del'>-			*str = 0;</div><div class='del'>-			/* Fallthrough */</div><div class='del'>-		case 0:</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		str++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Simple routine to parse an ascii DECnet address</div><div class='del'>- * into a network order address.</div><div class='del'>- */</div><div class='del'>-static int parse_addr(__le16 *addr, char *str)</div><div class='del'>-{</div><div class='del'>-	__u16 area, node;</div><div class='del'>-</div><div class='del'>-	while(*str &amp;&amp; !ISNUM(*str)) str++;</div><div class='del'>-</div><div class='del'>-	if (*str == 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	area = (*str++ - '0');</div><div class='del'>-	if (ISNUM(*str)) {</div><div class='del'>-		area *= 10;</div><div class='del'>-		area += (*str++ - '0');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*str++ != '.')</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (!ISNUM(*str))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	node = *str++ - '0';</div><div class='del'>-	if (ISNUM(*str)) {</div><div class='del'>-		node *= 10;</div><div class='del'>-		node += (*str++ - '0');</div><div class='del'>-	}</div><div class='del'>-	if (ISNUM(*str)) {</div><div class='del'>-		node *= 10;</div><div class='del'>-		node += (*str++ - '0');</div><div class='del'>-	}</div><div class='del'>-	if (ISNUM(*str)) {</div><div class='del'>-		node *= 10;</div><div class='del'>-		node += (*str++ - '0');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((node &gt; 1023) || (area &gt; 63))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (INVALID_END_CHAR(*str))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	*addr = cpu_to_le16((area &lt;&lt; 10) | node);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_node_address_handler(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer,</div><div class='del'>-				size_t *lenp, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char addr[DN_ASCBUF_LEN];</div><div class='del'>-	size_t len;</div><div class='del'>-	__le16 dnaddr;</div><div class='del'>-</div><div class='del'>-	if (!*lenp || (*ppos &amp;&amp; !write)) {</div><div class='del'>-		*lenp = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write) {</div><div class='del'>-		len = (*lenp &lt; DN_ASCBUF_LEN) ? *lenp : (DN_ASCBUF_LEN-1);</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(addr, buffer, len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		addr[len] = 0;</div><div class='del'>-		strip_it(addr);</div><div class='del'>-</div><div class='del'>-		if (parse_addr(&amp;dnaddr, addr))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		dn_dev_devices_off();</div><div class='del'>-</div><div class='del'>-		decnet_address = dnaddr;</div><div class='del'>-</div><div class='del'>-		dn_dev_devices_on();</div><div class='del'>-</div><div class='del'>-		*ppos += len;</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_addr2asc(le16_to_cpu(decnet_address), addr);</div><div class='del'>-	len = strlen(addr);</div><div class='del'>-	addr[len++] = '\n';</div><div class='del'>-</div><div class='del'>-	if (len &gt; *lenp) len = *lenp;</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(buffer, addr, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	*lenp = len;</div><div class='del'>-	*ppos += len;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dn_def_dev_handler(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer,</div><div class='del'>-				size_t *lenp, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	size_t len;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	char devname[17];</div><div class='del'>-</div><div class='del'>-	if (!*lenp || (*ppos &amp;&amp; !write)) {</div><div class='del'>-		*lenp = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write) {</div><div class='del'>-		if (*lenp &gt; 16)</div><div class='del'>-			return -E2BIG;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(devname, buffer, *lenp))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		devname[*lenp] = 0;</div><div class='del'>-		strip_it(devname);</div><div class='del'>-</div><div class='del'>-		dev = dev_get_by_name(&amp;init_net, devname);</div><div class='del'>-		if (dev == NULL)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;dn_ptr == NULL) {</div><div class='del'>-			dev_put(dev);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dn_dev_set_default(dev, 1)) {</div><div class='del'>-			dev_put(dev);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		*ppos += *lenp;</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = dn_dev_get_default();</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		*lenp = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(devname, dev-&gt;name);</div><div class='del'>-	dev_put(dev);</div><div class='del'>-	len = strlen(devname);</div><div class='del'>-	devname[len++] = '\n';</div><div class='del'>-</div><div class='del'>-	if (len &gt; *lenp) len = *lenp;</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(buffer, devname, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	*lenp = len;</div><div class='del'>-	*ppos += len;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ctl_table dn_table[] = {</div><div class='del'>-	{</div><div class='del'>-		.procname = "node_address",</div><div class='del'>-		.maxlen = 7,</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = dn_node_address_handler,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "node_name",</div><div class='del'>-		.data = node_name,</div><div class='del'>-		.maxlen = 7,</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dostring,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "default_device",</div><div class='del'>-		.maxlen = 16,</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = dn_def_dev_handler,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "time_wait",</div><div class='del'>-		.data = &amp;decnet_time_wait,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_decnet_time_wait,</div><div class='del'>-		.extra2 = &amp;max_decnet_time_wait</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "dn_count",</div><div class='del'>-		.data = &amp;decnet_dn_count,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_state_count,</div><div class='del'>-		.extra2 = &amp;max_state_count</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "di_count",</div><div class='del'>-		.data = &amp;decnet_di_count,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_state_count,</div><div class='del'>-		.extra2 = &amp;max_state_count</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "dr_count",</div><div class='del'>-		.data = &amp;decnet_dr_count,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_state_count,</div><div class='del'>-		.extra2 = &amp;max_state_count</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "dst_gc_interval",</div><div class='del'>-		.data = &amp;decnet_dst_gc_interval,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_decnet_dst_gc_interval,</div><div class='del'>-		.extra2 = &amp;max_decnet_dst_gc_interval</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "no_fc_max_cwnd",</div><div class='del'>-		.data = &amp;decnet_no_fc_max_cwnd,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec_minmax,</div><div class='del'>-		.extra1 = &amp;min_decnet_no_fc_max_cwnd,</div><div class='del'>-		.extra2 = &amp;max_decnet_no_fc_max_cwnd</div><div class='del'>-	},</div><div class='del'>-       {</div><div class='del'>-		.procname = "decnet_mem",</div><div class='del'>-		.data = &amp;sysctl_decnet_mem,</div><div class='del'>-		.maxlen = sizeof(sysctl_decnet_mem),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_doulongvec_minmax</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "decnet_rmem",</div><div class='del'>-		.data = &amp;sysctl_decnet_rmem,</div><div class='del'>-		.maxlen = sizeof(sysctl_decnet_rmem),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "decnet_wmem",</div><div class='del'>-		.data = &amp;sysctl_decnet_wmem,</div><div class='del'>-		.maxlen = sizeof(sysctl_decnet_wmem),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname = "debug",</div><div class='del'>-		.data = &amp;decnet_debug_level,</div><div class='del'>-		.maxlen = sizeof(int),</div><div class='del'>-		.mode = 0644,</div><div class='del'>-		.proc_handler = proc_dointvec,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void dn_register_sysctl(void)</div><div class='del'>-{</div><div class='del'>-	dn_table_header = register_net_sysctl(&amp;init_net, "net/decnet", dn_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_unregister_sysctl(void)</div><div class='del'>-{</div><div class='del'>-	unregister_net_sysctl_table(dn_table_header);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else  /* CONFIG_SYSCTL */</div><div class='del'>-void dn_unregister_sysctl(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-void dn_register_sysctl(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/devlink/Makefile b/net/devlink/Makefile<br/>new file mode 100644<br/>index 000000000000..000da622116a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-y := core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \</div><div class='add'>+	 resource.o param.o region.o health.o trap.o rate.o linecard.o</div><div class='head'>diff --git a/net/devlink/core.c b/net/devlink/core.c<br/>new file mode 100644<br/>index 000000000000..58093f49c090<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/core.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwmsg);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwerr);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_trap_report);</div><div class='add'>+</div><div class='add'>+DEFINE_XARRAY_FLAGS(devlinks, XA_FLAGS_ALLOC);</div><div class='add'>+</div><div class='add'>+static struct devlink *devlinks_xa_get(unsigned long index)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	devlink = xa_find(&amp;devlinks, &amp;index, index, DEVLINK_REGISTERED);</div><div class='add'>+	if (!devlink || !devlink_try_get(devlink))</div><div class='add'>+		devlink = NULL;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return devlink;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* devlink_rels xarray contains 1:1 relationships between</div><div class='add'>+ * devlink object and related nested devlink instance.</div><div class='add'>+ * The xarray index is used to get the nested object from</div><div class='add'>+ * the nested-in object code.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_XARRAY_FLAGS(devlink_rels, XA_FLAGS_ALLOC1);</div><div class='add'>+</div><div class='add'>+#define DEVLINK_REL_IN_USE XA_MARK_0</div><div class='add'>+</div><div class='add'>+struct devlink_rel {</div><div class='add'>+	u32 index;</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+	u32 devlink_index;</div><div class='add'>+	struct {</div><div class='add'>+		u32 devlink_index;</div><div class='add'>+		u32 obj_index;</div><div class='add'>+		devlink_rel_notify_cb_t *notify_cb;</div><div class='add'>+		devlink_rel_cleanup_cb_t *cleanup_cb;</div><div class='add'>+		struct delayed_work notify_work;</div><div class='add'>+	} nested_in;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void devlink_rel_free(struct devlink_rel *rel)</div><div class='add'>+{</div><div class='add'>+	xa_erase(&amp;devlink_rels, rel-&gt;index);</div><div class='add'>+	kfree(rel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_rel_get(struct devlink_rel *rel)</div><div class='add'>+{</div><div class='add'>+	refcount_inc(&amp;rel-&gt;refcount);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_rel_put(struct devlink_rel *rel)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;rel-&gt;refcount))</div><div class='add'>+		devlink_rel_free(rel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rel_nested_in_notify_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel = container_of(work, struct devlink_rel,</div><div class='add'>+					       nested_in.notify_work.work);</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	devlink = devlinks_xa_get(rel-&gt;nested_in.devlink_index);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		goto rel_put;</div><div class='add'>+	if (!devl_trylock(devlink)) {</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+		goto reschedule_work;</div><div class='add'>+	}</div><div class='add'>+	if (!devl_is_registered(devlink)) {</div><div class='add'>+		devl_unlock(devlink);</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+		goto rel_put;</div><div class='add'>+	}</div><div class='add'>+	if (!xa_get_mark(&amp;devlink_rels, rel-&gt;index, DEVLINK_REL_IN_USE))</div><div class='add'>+		rel-&gt;nested_in.cleanup_cb(devlink, rel-&gt;nested_in.obj_index, rel-&gt;index);</div><div class='add'>+	rel-&gt;nested_in.notify_cb(devlink, rel-&gt;nested_in.obj_index);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+</div><div class='add'>+rel_put:</div><div class='add'>+	__devlink_rel_put(rel);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+reschedule_work:</div><div class='add'>+	schedule_delayed_work(&amp;rel-&gt;nested_in.notify_work, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rel_nested_in_notify_work_schedule(struct devlink_rel *rel)</div><div class='add'>+{</div><div class='add'>+	__devlink_rel_get(rel);</div><div class='add'>+	schedule_delayed_work(&amp;rel-&gt;nested_in.notify_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rel *devlink_rel_alloc(void)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel;</div><div class='add'>+	static u32 next;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rel = kzalloc(sizeof(*rel), GFP_KERNEL);</div><div class='add'>+	if (!rel)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	err = xa_alloc_cyclic(&amp;devlink_rels, &amp;rel-&gt;index, rel,</div><div class='add'>+			      xa_limit_32b, &amp;next, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(rel);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;rel-&gt;refcount, 1);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;rel-&gt;nested_in.notify_work,</div><div class='add'>+			  &amp;devlink_rel_nested_in_notify_work);</div><div class='add'>+	return rel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rel_put(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel = devlink-&gt;rel;</div><div class='add'>+</div><div class='add'>+	if (!rel)</div><div class='add'>+		return;</div><div class='add'>+	xa_clear_mark(&amp;devlink_rels, rel-&gt;index, DEVLINK_REL_IN_USE);</div><div class='add'>+	devlink_rel_nested_in_notify_work_schedule(rel);</div><div class='add'>+	__devlink_rel_put(rel);</div><div class='add'>+	devlink-&gt;rel = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_rel_nested_in_clear(u32 rel_index)</div><div class='add'>+{</div><div class='add'>+	xa_clear_mark(&amp;devlink_rels, rel_index, DEVLINK_REL_IN_USE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_rel_nested_in_add(u32 *rel_index, u32 devlink_index,</div><div class='add'>+			      u32 obj_index, devlink_rel_notify_cb_t *notify_cb,</div><div class='add'>+			      devlink_rel_cleanup_cb_t *cleanup_cb,</div><div class='add'>+			      struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel = devlink_rel_alloc();</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rel))</div><div class='add'>+		return PTR_ERR(rel);</div><div class='add'>+</div><div class='add'>+	rel-&gt;devlink_index = devlink-&gt;index;</div><div class='add'>+	rel-&gt;nested_in.devlink_index = devlink_index;</div><div class='add'>+	rel-&gt;nested_in.obj_index = obj_index;</div><div class='add'>+	rel-&gt;nested_in.notify_cb = notify_cb;</div><div class='add'>+	rel-&gt;nested_in.cleanup_cb = cleanup_cb;</div><div class='add'>+	*rel_index = rel-&gt;index;</div><div class='add'>+	xa_set_mark(&amp;devlink_rels, rel-&gt;index, DEVLINK_REL_IN_USE);</div><div class='add'>+	devlink-&gt;rel = rel;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_rel_nested_in_notify - Notify the object this devlink</div><div class='add'>+ *				  instance is nested in.</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ *</div><div class='add'>+ * This is called upon network namespace change of devlink instance.</div><div class='add'>+ * In case this devlink instance is nested in another devlink object,</div><div class='add'>+ * a notification of a change of this object should be sent</div><div class='add'>+ * over netlink. The parent devlink instance lock needs to be</div><div class='add'>+ * taken during the notification preparation.</div><div class='add'>+ * However, since the devlink lock of nested instance is held here,</div><div class='add'>+ * we would end with wrong devlink instance lock ordering and</div><div class='add'>+ * deadlock. Therefore the work is utilized to avoid that.</div><div class='add'>+ */</div><div class='add'>+void devlink_rel_nested_in_notify(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel = devlink-&gt;rel;</div><div class='add'>+</div><div class='add'>+	if (!rel)</div><div class='add'>+		return;</div><div class='add'>+	devlink_rel_nested_in_notify_work_schedule(rel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rel *devlink_rel_find(unsigned long rel_index)</div><div class='add'>+{</div><div class='add'>+	return xa_find(&amp;devlink_rels, &amp;rel_index, rel_index,</div><div class='add'>+		       DEVLINK_REL_IN_USE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink *devlink_rel_devlink_get(u32 rel_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rel *rel;</div><div class='add'>+	u32 devlink_index;</div><div class='add'>+</div><div class='add'>+	if (!rel_index)</div><div class='add'>+		return NULL;</div><div class='add'>+	xa_lock(&amp;devlink_rels);</div><div class='add'>+	rel = devlink_rel_find(rel_index);</div><div class='add'>+	if (rel)</div><div class='add'>+		devlink_index = rel-&gt;devlink_index;</div><div class='add'>+	xa_unlock(&amp;devlink_rels);</div><div class='add'>+	if (!rel)</div><div class='add'>+		return NULL;</div><div class='add'>+	return devlinks_xa_get(devlink_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_rel_devlink_handle_put(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				   u32 rel_index, int attrtype,</div><div class='add'>+				   bool *msg_updated)</div><div class='add'>+{</div><div class='add'>+	struct net *net = devlink_net(devlink);</div><div class='add'>+	struct devlink *rel_devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rel_devlink = devlink_rel_devlink_get(rel_index);</div><div class='add'>+	if (!rel_devlink)</div><div class='add'>+		return 0;</div><div class='add'>+	err = devlink_nl_put_nested_handle(msg, net, rel_devlink, attrtype);</div><div class='add'>+	devlink_put(rel_devlink);</div><div class='add'>+	if (!err &amp;&amp; msg_updated)</div><div class='add'>+		*msg_updated = true;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *devlink_priv(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return &amp;devlink-&gt;priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_priv);</div><div class='add'>+</div><div class='add'>+struct devlink *priv_to_devlink(void *priv)</div><div class='add'>+{</div><div class='add'>+	return container_of(priv, struct devlink, priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(priv_to_devlink);</div><div class='add'>+</div><div class='add'>+struct device *devlink_to_dev(const struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return devlink-&gt;dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_to_dev);</div><div class='add'>+</div><div class='add'>+struct net *devlink_net(const struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return read_pnet(&amp;devlink-&gt;_net);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_net);</div><div class='add'>+</div><div class='add'>+void devl_assert_locked(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_assert_locked);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+/* For use in conjunction with LOCKDEP only e.g. rcu_dereference_protected() */</div><div class='add'>+bool devl_lock_is_held(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return lockdep_is_held(&amp;devlink-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_lock_is_held);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void devl_lock(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;devlink-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_lock);</div><div class='add'>+</div><div class='add'>+int devl_trylock(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return mutex_trylock(&amp;devlink-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_trylock);</div><div class='add'>+</div><div class='add'>+void devl_unlock(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;devlink-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_unlock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_try_get() - try to obtain a reference on a devlink instance</div><div class='add'>+ * @devlink: instance to reference</div><div class='add'>+ *</div><div class='add'>+ * Obtain a reference on a devlink instance. A reference on a devlink instance</div><div class='add'>+ * only implies that it's safe to take the instance lock. It does not imply</div><div class='add'>+ * that the instance is registered, use devl_is_registered() after taking</div><div class='add'>+ * the instance lock to check registration status.</div><div class='add'>+ */</div><div class='add'>+struct devlink *__must_check devlink_try_get(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	if (refcount_inc_not_zero(&amp;devlink-&gt;refcount))</div><div class='add'>+		return devlink;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_release(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	devlink = container_of(to_rcu_work(work), struct devlink, rwork);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;devlink-&gt;lock);</div><div class='add'>+	lockdep_unregister_key(&amp;devlink-&gt;lock_key);</div><div class='add'>+	put_device(devlink-&gt;dev);</div><div class='add'>+	kvfree(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_put(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;devlink-&gt;refcount))</div><div class='add'>+		queue_rcu_work(system_percpu_wq, &amp;devlink-&gt;rwork);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+retry:</div><div class='add'>+	devlink = xa_find(&amp;devlinks, indexp, ULONG_MAX, DEVLINK_REGISTERED);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (!devlink_try_get(devlink))</div><div class='add'>+		goto next;</div><div class='add'>+	if (!net_eq(devlink_net(devlink), net)) {</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+		goto next;</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return devlink;</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+	(*indexp)++;</div><div class='add'>+	goto retry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_register - Register devlink instance</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ */</div><div class='add'>+int devl_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	xa_set_mark(&amp;devlinks, devlink-&gt;index, DEVLINK_REGISTERED);</div><div class='add'>+	devlink_notify_register(devlink);</div><div class='add'>+	devlink_rel_nested_in_notify(devlink);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_register);</div><div class='add'>+</div><div class='add'>+void devlink_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_register(devlink);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_unregister - Unregister devlink instance</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ */</div><div class='add'>+void devl_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_REGISTERED(devlink);</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	devlink_notify_unregister(devlink);</div><div class='add'>+	xa_clear_mark(&amp;devlinks, devlink-&gt;index, DEVLINK_REGISTERED);</div><div class='add'>+	devlink_rel_put(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_unregister);</div><div class='add'>+</div><div class='add'>+void devlink_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_unregister(devlink);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_alloc_ns - Allocate new devlink instance resources</div><div class='add'>+ *	in specific namespace</div><div class='add'>+ *</div><div class='add'>+ *	@ops: ops</div><div class='add'>+ *	@priv_size: size of user private data</div><div class='add'>+ *	@net: net namespace</div><div class='add'>+ *	@dev: parent device</div><div class='add'>+ *</div><div class='add'>+ *	Allocate new devlink instance resources, including devlink index</div><div class='add'>+ *	and name.</div><div class='add'>+ */</div><div class='add'>+struct devlink *devlink_alloc_ns(const struct devlink_ops *ops,</div><div class='add'>+				 size_t priv_size, struct net *net,</div><div class='add'>+				 struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	static u32 last_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ops || !dev);</div><div class='add'>+	if (!devlink_reload_actions_valid(ops))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	devlink = kvzalloc(struct_size(devlink, priv, priv_size), GFP_KERNEL);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = xa_alloc_cyclic(&amp;devlinks, &amp;devlink-&gt;index, devlink, xa_limit_31b,</div><div class='add'>+			      &amp;last_id, GFP_KERNEL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_xa_alloc;</div><div class='add'>+</div><div class='add'>+	devlink-&gt;dev = get_device(dev);</div><div class='add'>+	devlink-&gt;ops = ops;</div><div class='add'>+	xa_init_flags(&amp;devlink-&gt;ports, XA_FLAGS_ALLOC);</div><div class='add'>+	xa_init_flags(&amp;devlink-&gt;params, XA_FLAGS_ALLOC);</div><div class='add'>+	xa_init_flags(&amp;devlink-&gt;snapshot_ids, XA_FLAGS_ALLOC);</div><div class='add'>+	xa_init_flags(&amp;devlink-&gt;nested_rels, XA_FLAGS_ALLOC);</div><div class='add'>+	write_pnet(&amp;devlink-&gt;_net, net);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;rate_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;linecard_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;sb_list);</div><div class='add'>+	INIT_LIST_HEAD_RCU(&amp;devlink-&gt;dpipe_table_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;resource_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;region_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;reporter_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;trap_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;trap_group_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink-&gt;trap_policer_list);</div><div class='add'>+	INIT_RCU_WORK(&amp;devlink-&gt;rwork, devlink_release);</div><div class='add'>+	lockdep_register_key(&amp;devlink-&gt;lock_key);</div><div class='add'>+	mutex_init(&amp;devlink-&gt;lock);</div><div class='add'>+	lockdep_set_class(&amp;devlink-&gt;lock, &amp;devlink-&gt;lock_key);</div><div class='add'>+	refcount_set(&amp;devlink-&gt;refcount, 1);</div><div class='add'>+</div><div class='add'>+	return devlink;</div><div class='add'>+</div><div class='add'>+err_xa_alloc:</div><div class='add'>+	kvfree(devlink);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_alloc_ns);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_free - Free devlink instance resources</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ */</div><div class='add'>+void devlink_free(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);</div><div class='add'>+</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_policer_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_group_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;reporter_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;region_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;resource_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;dpipe_table_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;sb_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;rate_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;linecard_list));</div><div class='add'>+	WARN_ON(!xa_empty(&amp;devlink-&gt;ports));</div><div class='add'>+</div><div class='add'>+	xa_destroy(&amp;devlink-&gt;nested_rels);</div><div class='add'>+	xa_destroy(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	xa_destroy(&amp;devlink-&gt;params);</div><div class='add'>+	xa_destroy(&amp;devlink-&gt;ports);</div><div class='add'>+</div><div class='add'>+	xa_erase(&amp;devlinks, devlink-&gt;index);</div><div class='add'>+</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_free);</div><div class='add'>+</div><div class='add'>+static void __net_exit devlink_pernet_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	u32 actions_performed;</div><div class='add'>+	unsigned long index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* In case network namespace is getting destroyed, reload</div><div class='add'>+	 * all devlink instances from this namespace into init_net.</div><div class='add'>+	 */</div><div class='add'>+	devlinks_xa_for_each_registered_get(net, index, devlink) {</div><div class='add'>+		devl_dev_lock(devlink, true);</div><div class='add'>+		err = 0;</div><div class='add'>+		if (devl_is_registered(devlink))</div><div class='add'>+			err = devlink_reload(devlink, &amp;init_net,</div><div class='add'>+					     DEVLINK_RELOAD_ACTION_DRIVER_REINIT,</div><div class='add'>+					     DEVLINK_RELOAD_LIMIT_UNSPEC,</div><div class='add'>+					     &amp;actions_performed, NULL);</div><div class='add'>+		devl_dev_unlock(devlink, true);</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			pr_warn("Failed to reload devlink instance into init_net\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations devlink_pernet_ops __net_initdata = {</div><div class='add'>+	.pre_exit = devlink_pernet_pre_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block devlink_port_netdevice_nb = {</div><div class='add'>+	.notifier_call = devlink_port_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init devlink_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_pernet_subsys(&amp;devlink_pernet_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = genl_register_family(&amp;devlink_nl_family);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unreg_pernet_subsys;</div><div class='add'>+	err = register_netdevice_notifier(&amp;devlink_port_netdevice_nb);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	genl_unregister_family(&amp;devlink_nl_family);</div><div class='add'>+</div><div class='add'>+out_unreg_pernet_subsys:</div><div class='add'>+	unregister_pernet_subsys(&amp;devlink_pernet_ops);</div><div class='add'>+out:</div><div class='add'>+	WARN_ON(err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(devlink_init);</div><div class='head'>diff --git a/net/devlink/dev.c b/net/devlink/dev.c<br/>new file mode 100644<br/>index 000000000000..02602704bdea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/dev.c</a></div><div class='hunk'>@@ -0,0 +1,1442 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_info_req {</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void (*version_cb)(const char *version_name,</div><div class='add'>+			   enum devlink_info_version_type version_type,</div><div class='add'>+			   void *version_cb_priv);</div><div class='add'>+	void *version_cb_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_reload_combination {</div><div class='add'>+	enum devlink_reload_action action;</div><div class='add'>+	enum devlink_reload_limit limit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_reload_combination devlink_reload_invalid_combinations[] = {</div><div class='add'>+	{</div><div class='add'>+		/* can't reinitialize driver with no down time */</div><div class='add'>+		.action = DEVLINK_RELOAD_ACTION_DRIVER_REINIT,</div><div class='add'>+		.limit = DEVLINK_RELOAD_LIMIT_NO_RESET,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_reload_combination_is_invalid(enum devlink_reload_action action,</div><div class='add'>+				      enum devlink_reload_limit limit)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(devlink_reload_invalid_combinations); i++)</div><div class='add'>+		if (devlink_reload_invalid_combinations[i].action == action &amp;&amp;</div><div class='add'>+		    devlink_reload_invalid_combinations[i].limit == limit)</div><div class='add'>+			return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_reload_action_is_supported(struct devlink *devlink, enum devlink_reload_action action)</div><div class='add'>+{</div><div class='add'>+	return test_bit(action, &amp;devlink-&gt;ops-&gt;reload_actions);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_reload_limit_is_supported(struct devlink *devlink, enum devlink_reload_limit limit)</div><div class='add'>+{</div><div class='add'>+	return test_bit(limit, &amp;devlink-&gt;ops-&gt;reload_limits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_reload_stat_put(struct sk_buff *msg,</div><div class='add'>+				   enum devlink_reload_limit limit, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *reload_stats_entry;</div><div class='add'>+</div><div class='add'>+	reload_stats_entry = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_STATS_ENTRY);</div><div class='add'>+	if (!reload_stats_entry)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_STATS_LIMIT, limit) ||</div><div class='add'>+	    nla_put_u32(msg, DEVLINK_ATTR_RELOAD_STATS_VALUE, value))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	nla_nest_end(msg, reload_stats_entry);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, reload_stats_entry);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_reload_stats_put(struct sk_buff *msg, struct devlink *devlink, bool is_remote)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *reload_stats_attr, *act_info, *act_stats;</div><div class='add'>+	int i, j, stat_idx;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!is_remote)</div><div class='add'>+		reload_stats_attr = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_STATS);</div><div class='add'>+	else</div><div class='add'>+		reload_stats_attr = nla_nest_start(msg, DEVLINK_ATTR_REMOTE_RELOAD_STATS);</div><div class='add'>+</div><div class='add'>+	if (!reload_stats_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= DEVLINK_RELOAD_ACTION_MAX; i++) {</div><div class='add'>+		if ((!is_remote &amp;&amp;</div><div class='add'>+		     !devlink_reload_action_is_supported(devlink, i)) ||</div><div class='add'>+		    i == DEVLINK_RELOAD_ACTION_UNSPEC)</div><div class='add'>+			continue;</div><div class='add'>+		act_info = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_INFO);</div><div class='add'>+		if (!act_info)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_ACTION, i))</div><div class='add'>+			goto action_info_nest_cancel;</div><div class='add'>+		act_stats = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_STATS);</div><div class='add'>+		if (!act_stats)</div><div class='add'>+			goto action_info_nest_cancel;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt;= DEVLINK_RELOAD_LIMIT_MAX; j++) {</div><div class='add'>+			/* Remote stats are shown even if not locally supported.</div><div class='add'>+			 * Stats of actions with unspecified limit are shown</div><div class='add'>+			 * though drivers don't need to register unspecified</div><div class='add'>+			 * limit.</div><div class='add'>+			 */</div><div class='add'>+			if ((!is_remote &amp;&amp; j != DEVLINK_RELOAD_LIMIT_UNSPEC &amp;&amp;</div><div class='add'>+			     !devlink_reload_limit_is_supported(devlink, j)) ||</div><div class='add'>+			    devlink_reload_combination_is_invalid(i, j))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			stat_idx = j * __DEVLINK_RELOAD_ACTION_MAX + i;</div><div class='add'>+			if (!is_remote)</div><div class='add'>+				value = devlink-&gt;stats.reload_stats[stat_idx];</div><div class='add'>+			else</div><div class='add'>+				value = devlink-&gt;stats.remote_reload_stats[stat_idx];</div><div class='add'>+			if (devlink_reload_stat_put(msg, j, value))</div><div class='add'>+				goto action_stats_nest_cancel;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(msg, act_stats);</div><div class='add'>+		nla_nest_end(msg, act_info);</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(msg, reload_stats_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+action_stats_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, act_stats);</div><div class='add'>+action_info_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, act_info);</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, reload_stats_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_nested_fill(struct sk_buff *msg, struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	unsigned long rel_index;</div><div class='add'>+	void *unused;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;nested_rels, rel_index, unused) {</div><div class='add'>+		err = devlink_rel_devlink_handle_put(msg, devlink,</div><div class='add'>+						     rel_index,</div><div class='add'>+						     DEVLINK_ATTR_NESTED_DEVLINK,</div><div class='add'>+						     NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			   enum devlink_command cmd, u32 portid,</div><div class='add'>+			   u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *dev_stats;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink-&gt;reload_failed))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	dev_stats = nla_nest_start(msg, DEVLINK_ATTR_DEV_STATS);</div><div class='add'>+	if (!dev_stats)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_reload_stats_put(msg, devlink, false))</div><div class='add'>+		goto dev_stats_nest_cancel;</div><div class='add'>+	if (devlink_reload_stats_put(msg, devlink, true))</div><div class='add'>+		goto dev_stats_nest_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, dev_stats);</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_nested_fill(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dev_stats_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, dev_stats);</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_NEW &amp;&amp; cmd != DEVLINK_CMD_DEL);</div><div class='add'>+	WARN_ON(!devl_is_registered(devlink));</div><div class='add'>+</div><div class='add'>+	if (!devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_fill(msg, devlink, cmd, 0, 0, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,</div><div class='add'>+			      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,</div><div class='add'>+			       NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			       cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(msg, cb, devlink_nl_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rel_notify_cb(struct devlink *devlink, u32 obj_index)</div><div class='add'>+{</div><div class='add'>+	devlink_notify(devlink, DEVLINK_CMD_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rel_cleanup_cb(struct devlink *devlink, u32 obj_index,</div><div class='add'>+				   u32 rel_index)</div><div class='add'>+{</div><div class='add'>+	xa_erase(&amp;devlink-&gt;nested_rels, rel_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devl_nested_devlink_set(struct devlink *devlink,</div><div class='add'>+			    struct devlink *nested_devlink)</div><div class='add'>+{</div><div class='add'>+	u32 rel_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_rel_nested_in_add(&amp;rel_index, devlink-&gt;index, 0,</div><div class='add'>+					devlink_rel_notify_cb,</div><div class='add'>+					devlink_rel_cleanup_cb,</div><div class='add'>+					nested_devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return xa_insert(&amp;devlink-&gt;nested_rels, rel_index,</div><div class='add'>+			 xa_mk_value(0), GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_nested_devlink_set);</div><div class='add'>+</div><div class='add'>+void devlink_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_notify(devlink, DEVLINK_CMD_NEW);</div><div class='add'>+	devlink_linecards_notify_register(devlink);</div><div class='add'>+	devlink_ports_notify_register(devlink);</div><div class='add'>+	devlink_trap_policers_notify_register(devlink);</div><div class='add'>+	devlink_trap_groups_notify_register(devlink);</div><div class='add'>+	devlink_traps_notify_register(devlink);</div><div class='add'>+	devlink_rates_notify_register(devlink);</div><div class='add'>+	devlink_regions_notify_register(devlink);</div><div class='add'>+	devlink_params_notify_register(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_params_notify_unregister(devlink);</div><div class='add'>+	devlink_regions_notify_unregister(devlink);</div><div class='add'>+	devlink_rates_notify_unregister(devlink);</div><div class='add'>+	devlink_traps_notify_unregister(devlink);</div><div class='add'>+	devlink_trap_groups_notify_unregister(devlink);</div><div class='add'>+	devlink_trap_policers_notify_unregister(devlink);</div><div class='add'>+	devlink_ports_notify_unregister(devlink);</div><div class='add'>+	devlink_linecards_notify_unregister(devlink);</div><div class='add'>+	devlink_notify(devlink, DEVLINK_CMD_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_reload_failed_set(struct devlink *devlink,</div><div class='add'>+				      bool reload_failed)</div><div class='add'>+{</div><div class='add'>+	if (devlink-&gt;reload_failed == reload_failed)</div><div class='add'>+		return;</div><div class='add'>+	devlink-&gt;reload_failed = reload_failed;</div><div class='add'>+	devlink_notify(devlink, DEVLINK_CMD_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool devlink_is_reload_failed(const struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return devlink-&gt;reload_failed;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_is_reload_failed);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__devlink_reload_stats_update(struct devlink *devlink, u32 *reload_stats,</div><div class='add'>+			      enum devlink_reload_limit limit, u32 actions_performed)</div><div class='add'>+{</div><div class='add'>+	unsigned long actions = actions_performed;</div><div class='add'>+	int stat_idx;</div><div class='add'>+	int action;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(action, &amp;actions, __DEVLINK_RELOAD_ACTION_MAX) {</div><div class='add'>+		stat_idx = limit * __DEVLINK_RELOAD_ACTION_MAX + action;</div><div class='add'>+		reload_stats[stat_idx]++;</div><div class='add'>+	}</div><div class='add'>+	devlink_notify(devlink, DEVLINK_CMD_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_reload_stats_update(struct devlink *devlink, enum devlink_reload_limit limit,</div><div class='add'>+			    u32 actions_performed)</div><div class='add'>+{</div><div class='add'>+	__devlink_reload_stats_update(devlink, devlink-&gt;stats.reload_stats, limit,</div><div class='add'>+				      actions_performed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_remote_reload_actions_performed - Update devlink on reload actions</div><div class='add'>+ *	  performed which are not a direct result of devlink reload call.</div><div class='add'>+ *</div><div class='add'>+ *	This should be called by a driver after performing reload actions in case it was not</div><div class='add'>+ *	a result of devlink reload call. For example fw_activate was performed as a result</div><div class='add'>+ *	of devlink reload triggered fw_activate on another host.</div><div class='add'>+ *	The motivation for this function is to keep data on reload actions performed on this</div><div class='add'>+ *	function whether it was done due to direct devlink reload call or not.</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@limit: reload limit</div><div class='add'>+ *	@actions_performed: bitmask of actions performed</div><div class='add'>+ */</div><div class='add'>+void devlink_remote_reload_actions_performed(struct devlink *devlink,</div><div class='add'>+					     enum devlink_reload_limit limit,</div><div class='add'>+					     u32 actions_performed)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!actions_performed ||</div><div class='add'>+		    actions_performed &amp; BIT(DEVLINK_RELOAD_ACTION_UNSPEC) ||</div><div class='add'>+		    actions_performed &gt;= BIT(__DEVLINK_RELOAD_ACTION_MAX) ||</div><div class='add'>+		    limit &gt; DEVLINK_RELOAD_LIMIT_MAX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__devlink_reload_stats_update(devlink, devlink-&gt;stats.remote_reload_stats, limit,</div><div class='add'>+				      actions_performed);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_remote_reload_actions_performed);</div><div class='add'>+</div><div class='add'>+static struct net *devlink_netns_get(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *netns_pid_attr = info-&gt;attrs[DEVLINK_ATTR_NETNS_PID];</div><div class='add'>+	struct nlattr *netns_fd_attr = info-&gt;attrs[DEVLINK_ATTR_NETNS_FD];</div><div class='add'>+	struct nlattr *netns_id_attr = info-&gt;attrs[DEVLINK_ATTR_NETNS_ID];</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	if (!!netns_pid_attr + !!netns_fd_attr + !!netns_id_attr &gt; 1) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "multiple netns identifying attributes specified");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netns_pid_attr) {</div><div class='add'>+		net = get_net_ns_by_pid(nla_get_u32(netns_pid_attr));</div><div class='add'>+	} else if (netns_fd_attr) {</div><div class='add'>+		net = get_net_ns_by_fd(nla_get_u32(netns_fd_attr));</div><div class='add'>+	} else if (netns_id_attr) {</div><div class='add'>+		net = get_net_ns_by_id(sock_net(skb-&gt;sk),</div><div class='add'>+				       nla_get_u32(netns_id_attr));</div><div class='add'>+		if (!net)</div><div class='add'>+			net = ERR_PTR(-EINVAL);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		net = ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	if (IS_ERR(net)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Unknown network namespace");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	if (!netlink_ns_capable(skb, net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='add'>+		put_net(net);</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='add'>+	}</div><div class='add'>+	return net;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_reload_netns_change(struct devlink *devlink,</div><div class='add'>+					struct net *curr_net,</div><div class='add'>+					struct net *dest_net)</div><div class='add'>+{</div><div class='add'>+	/* Userspace needs to be notified about devlink objects</div><div class='add'>+	 * removed from original and entering new network namespace.</div><div class='add'>+	 * The rest of the devlink objects are re-created during</div><div class='add'>+	 * reload process so the notifications are generated separatelly.</div><div class='add'>+	 */</div><div class='add'>+	devlink_notify_unregister(devlink);</div><div class='add'>+	write_pnet(&amp;devlink-&gt;_net, dest_net);</div><div class='add'>+	devlink_notify_register(devlink);</div><div class='add'>+	devlink_rel_nested_in_notify(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_reload_reinit_sanity_check(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_policer_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_group_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;trap_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;dpipe_table_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;sb_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;rate_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink-&gt;linecard_list));</div><div class='add'>+	WARN_ON(!xa_empty(&amp;devlink-&gt;ports));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_reload(struct devlink *devlink, struct net *dest_net,</div><div class='add'>+		   enum devlink_reload_action action,</div><div class='add'>+		   enum devlink_reload_limit limit,</div><div class='add'>+		   u32 *actions_performed, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 remote_reload_stats[DEVLINK_RELOAD_STATS_ARRAY_SIZE];</div><div class='add'>+	struct net *curr_net;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Make sure the reload operations are invoked with the device lock</div><div class='add'>+	 * held to allow drivers to trigger functionality that expects it</div><div class='add'>+	 * (e.g., PCI reset) and to close possible races between these</div><div class='add'>+	 * operations and probe/remove.</div><div class='add'>+	 */</div><div class='add'>+	device_lock_assert(devlink-&gt;dev);</div><div class='add'>+</div><div class='add'>+	memcpy(remote_reload_stats, devlink-&gt;stats.remote_reload_stats,</div><div class='add'>+	       sizeof(remote_reload_stats));</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;reload_down(devlink, !!dest_net, action, limit, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	curr_net = devlink_net(devlink);</div><div class='add'>+	if (dest_net &amp;&amp; !net_eq(dest_net, curr_net))</div><div class='add'>+		devlink_reload_netns_change(devlink, curr_net, dest_net);</div><div class='add'>+</div><div class='add'>+	if (action == DEVLINK_RELOAD_ACTION_DRIVER_REINIT) {</div><div class='add'>+		devlink_params_driverinit_load_new(devlink);</div><div class='add'>+		devlink_reload_reinit_sanity_check(devlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;reload_up(devlink, action, limit, actions_performed, extack);</div><div class='add'>+	devlink_reload_failed_set(devlink, !!err);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!(*actions_performed &amp; BIT(action)));</div><div class='add'>+	/* Catch driver on updating the remote action within devlink reload */</div><div class='add'>+	WARN_ON(memcmp(remote_reload_stats, devlink-&gt;stats.remote_reload_stats,</div><div class='add'>+		       sizeof(remote_reload_stats)));</div><div class='add'>+	devlink_reload_stats_update(devlink, limit, *actions_performed);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_reload_actions_performed_snd(struct devlink *devlink, u32 actions_performed,</div><div class='add'>+					enum devlink_command cmd, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq, &amp;devlink_nl_family, 0, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto free_msg;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_bitfield32(msg, DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED, actions_performed,</div><div class='add'>+			       actions_performed))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	enum devlink_reload_action action;</div><div class='add'>+	enum devlink_reload_limit limit;</div><div class='add'>+	struct net *dest_net = NULL;</div><div class='add'>+	u32 actions_performed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_resources_validate(devlink, NULL, info);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "resources size validation failed");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	action = nla_get_u8_default(info-&gt;attrs[DEVLINK_ATTR_RELOAD_ACTION],</div><div class='add'>+				    DEVLINK_RELOAD_ACTION_DRIVER_REINIT);</div><div class='add'>+</div><div class='add'>+	if (!devlink_reload_action_is_supported(devlink, action)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Requested reload action is not supported by the driver");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit = DEVLINK_RELOAD_LIMIT_UNSPEC;</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_RELOAD_LIMITS]) {</div><div class='add'>+		struct nla_bitfield32 limits;</div><div class='add'>+		u32 limits_selected;</div><div class='add'>+</div><div class='add'>+		limits = nla_get_bitfield32(info-&gt;attrs[DEVLINK_ATTR_RELOAD_LIMITS]);</div><div class='add'>+		limits_selected = limits.value &amp; limits.selector;</div><div class='add'>+		if (!limits_selected) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Invalid limit selected");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		for (limit = 0 ; limit &lt;= DEVLINK_RELOAD_LIMIT_MAX ; limit++)</div><div class='add'>+			if (limits_selected &amp; BIT(limit))</div><div class='add'>+				break;</div><div class='add'>+		/* UAPI enables multiselection, but currently it is not used */</div><div class='add'>+		if (limits_selected != BIT(limit)) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Multiselection of limit is not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (!devlink_reload_limit_is_supported(devlink, limit)) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Requested limit is not supported by the driver");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (devlink_reload_combination_is_invalid(action, limit)) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Requested limit is invalid for this action");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_NETNS_PID] ||</div><div class='add'>+	    info-&gt;attrs[DEVLINK_ATTR_NETNS_FD] ||</div><div class='add'>+	    info-&gt;attrs[DEVLINK_ATTR_NETNS_ID]) {</div><div class='add'>+		dest_net = devlink_netns_get(skb, info);</div><div class='add'>+		if (IS_ERR(dest_net))</div><div class='add'>+			return PTR_ERR(dest_net);</div><div class='add'>+		if (!net_eq(dest_net, devlink_net(devlink)) &amp;&amp;</div><div class='add'>+		    action != DEVLINK_RELOAD_ACTION_DRIVER_REINIT) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(info-&gt;extack,</div><div class='add'>+					   "Changing namespace is only supported for reinit action");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_reload(devlink, dest_net, action, limit, &amp;actions_performed, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	if (dest_net)</div><div class='add'>+		put_net(dest_net);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	/* For backward compatibility generate reply only if attributes used by user */</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_RELOAD_ACTION] &amp;&amp; !info-&gt;attrs[DEVLINK_ATTR_RELOAD_LIMITS])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return devlink_nl_reload_actions_performed_snd(devlink, actions_performed,</div><div class='add'>+						       DEVLINK_CMD_RELOAD, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool devlink_reload_actions_valid(const struct devlink_ops *ops)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_reload_combination *comb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!devlink_reload_supported(ops)) {</div><div class='add'>+		if (WARN_ON(ops-&gt;reload_actions))</div><div class='add'>+			return false;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ops-&gt;reload_actions ||</div><div class='add'>+		    ops-&gt;reload_actions &amp; BIT(DEVLINK_RELOAD_ACTION_UNSPEC) ||</div><div class='add'>+		    ops-&gt;reload_actions &gt;= BIT(__DEVLINK_RELOAD_ACTION_MAX)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ops-&gt;reload_limits &amp; BIT(DEVLINK_RELOAD_LIMIT_UNSPEC) ||</div><div class='add'>+		    ops-&gt;reload_limits &gt;= BIT(__DEVLINK_RELOAD_LIMIT_MAX)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(devlink_reload_invalid_combinations); i++)  {</div><div class='add'>+		comb = &amp;devlink_reload_invalid_combinations[i];</div><div class='add'>+		if (ops-&gt;reload_actions == BIT(comb-&gt;action) &amp;&amp;</div><div class='add'>+		    ops-&gt;reload_limits == BIT(comb-&gt;limit))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				   enum devlink_command cmd, u32 portid,</div><div class='add'>+				   u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	enum devlink_eswitch_encap_mode encap_mode;</div><div class='add'>+	u8 inline_mode;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 mode;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_handle(msg, devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;eswitch_mode_get) {</div><div class='add'>+		err = ops-&gt;eswitch_mode_get(devlink, &amp;mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		err = nla_put_u16(msg, DEVLINK_ATTR_ESWITCH_MODE, mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;eswitch_inline_mode_get) {</div><div class='add'>+		err = ops-&gt;eswitch_inline_mode_get(devlink, &amp;inline_mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_INLINE_MODE,</div><div class='add'>+				 inline_mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;eswitch_encap_mode_get) {</div><div class='add'>+		err = ops-&gt;eswitch_encap_mode_get(devlink, &amp;encap_mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_ENCAP_MODE, encap_mode);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_eswitch_fill(msg, devlink, DEVLINK_CMD_ESWITCH_GET,</div><div class='add'>+				      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	enum devlink_eswitch_encap_mode encap_mode;</div><div class='add'>+	u8 inline_mode;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u16 mode;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_MODE]) {</div><div class='add'>+		if (!ops-&gt;eswitch_mode_set)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		mode = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_ESWITCH_MODE]);</div><div class='add'>+		err = devlink_rate_nodes_check(devlink, mode, info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		err = ops-&gt;eswitch_mode_set(devlink, mode, info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_INLINE_MODE]) {</div><div class='add'>+		if (!ops-&gt;eswitch_inline_mode_set)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		inline_mode = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_ESWITCH_INLINE_MODE]);</div><div class='add'>+		err = ops-&gt;eswitch_inline_mode_set(devlink, inline_mode,</div><div class='add'>+						   info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]) {</div><div class='add'>+		if (!ops-&gt;eswitch_encap_mode_set)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		encap_mode = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]);</div><div class='add'>+		err = ops-&gt;eswitch_encap_mode_set(devlink, encap_mode,</div><div class='add'>+						  info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_info_serial_number_put(struct devlink_info_req *req, const char *sn)</div><div class='add'>+{</div><div class='add'>+	if (!req-&gt;msg)</div><div class='add'>+		return 0;</div><div class='add'>+	return nla_put_string(req-&gt;msg, DEVLINK_ATTR_INFO_SERIAL_NUMBER, sn);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_serial_number_put);</div><div class='add'>+</div><div class='add'>+int devlink_info_board_serial_number_put(struct devlink_info_req *req,</div><div class='add'>+					 const char *bsn)</div><div class='add'>+{</div><div class='add'>+	if (!req-&gt;msg)</div><div class='add'>+		return 0;</div><div class='add'>+	return nla_put_string(req-&gt;msg, DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER,</div><div class='add'>+			      bsn);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_board_serial_number_put);</div><div class='add'>+</div><div class='add'>+static int devlink_info_version_put(struct devlink_info_req *req, int attr,</div><div class='add'>+				    const char *version_name,</div><div class='add'>+				    const char *version_value,</div><div class='add'>+				    enum devlink_info_version_type version_type)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;version_cb)</div><div class='add'>+		req-&gt;version_cb(version_name, version_type,</div><div class='add'>+				req-&gt;version_cb_priv);</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;msg || !*version_value)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(req-&gt;msg, attr);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(req-&gt;msg, DEVLINK_ATTR_INFO_VERSION_NAME,</div><div class='add'>+			     version_name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(req-&gt;msg, DEVLINK_ATTR_INFO_VERSION_VALUE,</div><div class='add'>+			     version_value);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(req-&gt;msg, nest);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(req-&gt;msg, nest);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_info_version_fixed_put(struct devlink_info_req *req,</div><div class='add'>+				   const char *version_name,</div><div class='add'>+				   const char *version_value)</div><div class='add'>+{</div><div class='add'>+	return devlink_info_version_put(req, DEVLINK_ATTR_INFO_VERSION_FIXED,</div><div class='add'>+					version_name, version_value,</div><div class='add'>+					DEVLINK_INFO_VERSION_TYPE_NONE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_version_fixed_put);</div><div class='add'>+</div><div class='add'>+int devlink_info_version_stored_put(struct devlink_info_req *req,</div><div class='add'>+				    const char *version_name,</div><div class='add'>+				    const char *version_value)</div><div class='add'>+{</div><div class='add'>+	return devlink_info_version_put(req, DEVLINK_ATTR_INFO_VERSION_STORED,</div><div class='add'>+					version_name, version_value,</div><div class='add'>+					DEVLINK_INFO_VERSION_TYPE_NONE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_version_stored_put);</div><div class='add'>+</div><div class='add'>+int devlink_info_version_stored_put_ext(struct devlink_info_req *req,</div><div class='add'>+					const char *version_name,</div><div class='add'>+					const char *version_value,</div><div class='add'>+					enum devlink_info_version_type version_type)</div><div class='add'>+{</div><div class='add'>+	return devlink_info_version_put(req, DEVLINK_ATTR_INFO_VERSION_STORED,</div><div class='add'>+					version_name, version_value,</div><div class='add'>+					version_type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_version_stored_put_ext);</div><div class='add'>+</div><div class='add'>+int devlink_info_version_running_put(struct devlink_info_req *req,</div><div class='add'>+				     const char *version_name,</div><div class='add'>+				     const char *version_value)</div><div class='add'>+{</div><div class='add'>+	return devlink_info_version_put(req, DEVLINK_ATTR_INFO_VERSION_RUNNING,</div><div class='add'>+					version_name, version_value,</div><div class='add'>+					DEVLINK_INFO_VERSION_TYPE_NONE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_version_running_put);</div><div class='add'>+</div><div class='add'>+int devlink_info_version_running_put_ext(struct devlink_info_req *req,</div><div class='add'>+					 const char *version_name,</div><div class='add'>+					 const char *version_value,</div><div class='add'>+					 enum devlink_info_version_type version_type)</div><div class='add'>+{</div><div class='add'>+	return devlink_info_version_put(req, DEVLINK_ATTR_INFO_VERSION_RUNNING,</div><div class='add'>+					version_name, version_value,</div><div class='add'>+					version_type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_info_version_running_put_ext);</div><div class='add'>+</div><div class='add'>+static int devlink_nl_driver_info_get(struct device_driver *drv,</div><div class='add'>+				      struct devlink_info_req *req)</div><div class='add'>+{</div><div class='add'>+	if (!drv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (drv-&gt;name[0])</div><div class='add'>+		return nla_put_string(req-&gt;msg, DEVLINK_ATTR_INFO_DRIVER_NAME,</div><div class='add'>+				      drv-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_info_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+		     enum devlink_command cmd, u32 portid,</div><div class='add'>+		     u32 seq, int flags, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = devlink_to_dev(devlink);</div><div class='add'>+	struct devlink_info_req req = {};</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	req.msg = msg;</div><div class='add'>+	if (devlink-&gt;ops-&gt;info_get) {</div><div class='add'>+		err = devlink-&gt;ops-&gt;info_get(devlink, &amp;req, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_cancel_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_driver_info_get(dev-&gt;driver, &amp;req);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_msg:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_info_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_info_fill(msg, devlink, DEVLINK_CMD_INFO_GET,</div><div class='add'>+				   info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+				   info-&gt;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			     struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_info_fill(msg, devlink, DEVLINK_CMD_INFO_GET,</div><div class='add'>+				   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+				   cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+				   cb-&gt;extack);</div><div class='add'>+	if (err == -EOPNOTSUPP)</div><div class='add'>+		err = 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_info_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(msg, cb, devlink_nl_info_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_flash_update_fill(struct sk_buff *msg,</div><div class='add'>+					struct devlink *devlink,</div><div class='add'>+					enum devlink_command cmd,</div><div class='add'>+					struct devlink_flash_notify *params)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, 0, 0, &amp;devlink_nl_family, 0, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;status_msg &amp;&amp;</div><div class='add'>+	    nla_put_string(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG,</div><div class='add'>+			   params-&gt;status_msg))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (params-&gt;component &amp;&amp;</div><div class='add'>+	    nla_put_string(msg, DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,</div><div class='add'>+			   params-&gt;component))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE,</div><div class='add'>+			       params-&gt;done))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL,</div><div class='add'>+			       params-&gt;total))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,</div><div class='add'>+			       params-&gt;timeout))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_flash_update_notify(struct devlink *devlink,</div><div class='add'>+					  enum devlink_command cmd,</div><div class='add'>+					  struct devlink_flash_notify *params)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_FLASH_UPDATE &amp;&amp;</div><div class='add'>+		cmd != DEVLINK_CMD_FLASH_UPDATE_END &amp;&amp;</div><div class='add'>+		cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);</div><div class='add'>+</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_flash_update_fill(msg, devlink, cmd, params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_msg;</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_flash_update_begin_notify(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_notify params = {};</div><div class='add'>+</div><div class='add'>+	__devlink_flash_update_notify(devlink,</div><div class='add'>+				      DEVLINK_CMD_FLASH_UPDATE,</div><div class='add'>+				      &amp;params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_flash_update_end_notify(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_notify params = {};</div><div class='add'>+</div><div class='add'>+	__devlink_flash_update_notify(devlink,</div><div class='add'>+				      DEVLINK_CMD_FLASH_UPDATE_END,</div><div class='add'>+				      &amp;params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_flash_update_status_notify(struct devlink *devlink,</div><div class='add'>+					const char *status_msg,</div><div class='add'>+					const char *component,</div><div class='add'>+					unsigned long done,</div><div class='add'>+					unsigned long total)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_notify params = {</div><div class='add'>+		.status_msg = status_msg,</div><div class='add'>+		.component = component,</div><div class='add'>+		.done = done,</div><div class='add'>+		.total = total,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	__devlink_flash_update_notify(devlink,</div><div class='add'>+				      DEVLINK_CMD_FLASH_UPDATE_STATUS,</div><div class='add'>+				      &amp;params);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_flash_update_status_notify);</div><div class='add'>+</div><div class='add'>+void devlink_flash_update_timeout_notify(struct devlink *devlink,</div><div class='add'>+					 const char *status_msg,</div><div class='add'>+					 const char *component,</div><div class='add'>+					 unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_notify params = {</div><div class='add'>+		.status_msg = status_msg,</div><div class='add'>+		.component = component,</div><div class='add'>+		.timeout = timeout,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	__devlink_flash_update_notify(devlink,</div><div class='add'>+				      DEVLINK_CMD_FLASH_UPDATE_STATUS,</div><div class='add'>+				      &amp;params);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_flash_update_timeout_notify);</div><div class='add'>+</div><div class='add'>+struct devlink_flash_component_lookup_ctx {</div><div class='add'>+	const char *lookup_name;</div><div class='add'>+	bool lookup_name_found;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_flash_component_lookup_cb(const char *version_name,</div><div class='add'>+				  enum devlink_info_version_type version_type,</div><div class='add'>+				  void *version_cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_component_lookup_ctx *lookup_ctx = version_cb_priv;</div><div class='add'>+</div><div class='add'>+	if (version_type != DEVLINK_INFO_VERSION_TYPE_COMPONENT ||</div><div class='add'>+	    lookup_ctx-&gt;lookup_name_found)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lookup_ctx-&gt;lookup_name_found =</div><div class='add'>+		!strcmp(lookup_ctx-&gt;lookup_name, version_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_flash_component_get(struct devlink *devlink,</div><div class='add'>+				       struct nlattr *nla_component,</div><div class='add'>+				       const char **p_component,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_component_lookup_ctx lookup_ctx = {};</div><div class='add'>+	struct devlink_info_req req = {};</div><div class='add'>+	const char *component;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nla_component)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	component = nla_data(nla_component);</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;info_get) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla_component,</div><div class='add'>+				    "component update is not supported by this device");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lookup_ctx.lookup_name = component;</div><div class='add'>+	req.version_cb = devlink_flash_component_lookup_cb;</div><div class='add'>+	req.version_cb_priv = &amp;lookup_ctx;</div><div class='add'>+</div><div class='add'>+	ret = devlink-&gt;ops-&gt;info_get(devlink, &amp;req, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!lookup_ctx.lookup_name_found) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla_component,</div><div class='add'>+				    "selected component is not supported by this device");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*p_component = component;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla_overwrite_mask, *nla_file_name;</div><div class='add'>+	struct devlink_flash_update_params params = {};</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const char *file_name;</div><div class='add'>+	u32 supported_params;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;flash_update)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = devlink_flash_component_get(devlink,</div><div class='add'>+					  info-&gt;attrs[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT],</div><div class='add'>+					  &amp;params.component, info-&gt;extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	supported_params = devlink-&gt;ops-&gt;supported_flash_update_params;</div><div class='add'>+</div><div class='add'>+	nla_overwrite_mask = info-&gt;attrs[DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK];</div><div class='add'>+	if (nla_overwrite_mask) {</div><div class='add'>+		struct nla_bitfield32 sections;</div><div class='add'>+</div><div class='add'>+		if (!(supported_params &amp; DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack, nla_overwrite_mask,</div><div class='add'>+					    "overwrite settings are not supported by this device");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		sections = nla_get_bitfield32(nla_overwrite_mask);</div><div class='add'>+		params.overwrite_mask = sections.value &amp; sections.selector;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_file_name = info-&gt;attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME];</div><div class='add'>+	file_name = nla_data(nla_file_name);</div><div class='add'>+	ret = request_firmware(&amp;params.fw, file_name, devlink-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, nla_file_name,</div><div class='add'>+				    "failed to locate the requested firmware file");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_flash_update_begin_notify(devlink);</div><div class='add'>+	ret = devlink-&gt;ops-&gt;flash_update(devlink, &amp;params, info-&gt;extack);</div><div class='add'>+	devlink_flash_update_end_notify(devlink);</div><div class='add'>+</div><div class='add'>+	release_firmware(params.fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_compat_running_version(struct devlink *devlink,</div><div class='add'>+					     char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct devlink_info_req req = {};</div><div class='add'>+	const struct nlattr *nlattr;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int rem, err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req.msg = msg;</div><div class='add'>+	err = devlink-&gt;ops-&gt;info_get(devlink, &amp;req, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_msg;</div><div class='add'>+</div><div class='add'>+	nla_for_each_attr_type(nlattr, DEVLINK_ATTR_INFO_VERSION_RUNNING,</div><div class='add'>+			       (void *)msg-&gt;data, msg-&gt;len, rem) {</div><div class='add'>+		const struct nlattr *kv;</div><div class='add'>+		int rem_kv;</div><div class='add'>+</div><div class='add'>+		nla_for_each_nested_type(kv, DEVLINK_ATTR_INFO_VERSION_VALUE,</div><div class='add'>+					 nlattr, rem_kv) {</div><div class='add'>+			strlcat(buf, nla_data(kv), len);</div><div class='add'>+			strlcat(buf, " ", len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+free_msg:</div><div class='add'>+	nlmsg_consume(msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_compat_running_version(struct devlink *devlink,</div><div class='add'>+				    char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (!devlink-&gt;ops-&gt;info_get)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	if (devl_is_registered(devlink))</div><div class='add'>+		__devlink_compat_running_version(devlink, buf, len);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_compat_flash_update(struct devlink *devlink, const char *file_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_flash_update_params params = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	if (!devl_is_registered(devlink)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;flash_update) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;params.fw, file_name, devlink-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	devlink_flash_update_begin_notify(devlink);</div><div class='add'>+	ret = devlink-&gt;ops-&gt;flash_update(devlink, &amp;params, NULL);</div><div class='add'>+	devlink_flash_update_end_notify(devlink);</div><div class='add'>+</div><div class='add'>+	release_firmware(params.fw);</div><div class='add'>+out_unlock:</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_selftests_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			  u32 portid, u32 seq, int flags,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *selftests;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags,</div><div class='add'>+			  DEVLINK_CMD_SELFTESTS_GET);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	selftests = nla_nest_start(msg, DEVLINK_ATTR_SELFTESTS);</div><div class='add'>+	if (!selftests)</div><div class='add'>+		goto err_cancel_msg;</div><div class='add'>+</div><div class='add'>+	for (i = DEVLINK_ATTR_SELFTEST_ID_UNSPEC + 1;</div><div class='add'>+	     i &lt;= DEVLINK_ATTR_SELFTEST_ID_MAX; i++) {</div><div class='add'>+		if (devlink-&gt;ops-&gt;selftest_check(devlink, i, extack)) {</div><div class='add'>+			err = nla_put_flag(msg, i);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_cancel_msg;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, selftests);</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_msg:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_selftests_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;selftest_check)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_selftests_fill(msg, devlink, info-&gt;snd_portid,</div><div class='add'>+					info-&gt;snd_seq, 0, info-&gt;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_selftests_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					     struct devlink *devlink,</div><div class='add'>+					     struct netlink_callback *cb,</div><div class='add'>+					     int flags)</div><div class='add'>+{</div><div class='add'>+	if (!devlink-&gt;ops-&gt;selftest_check)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return devlink_nl_selftests_fill(msg, devlink,</div><div class='add'>+					 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					 cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+					 cb-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_selftests_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				    struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_selftests_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_selftest_result_put(struct sk_buff *skb, unsigned int id,</div><div class='add'>+				       enum devlink_selftest_status test_status)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *result_attr;</div><div class='add'>+</div><div class='add'>+	result_attr = nla_nest_start(skb, DEVLINK_ATTR_SELFTEST_RESULT);</div><div class='add'>+	if (!result_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, DEVLINK_ATTR_SELFTEST_RESULT_ID, id) ||</div><div class='add'>+	    nla_put_u8(skb, DEVLINK_ATTR_SELFTEST_RESULT_STATUS,</div><div class='add'>+		       test_status))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, result_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, result_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy devlink_selftest_nl_policy[DEVLINK_ATTR_SELFTEST_ID_MAX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct nlattr *attrs, *selftests;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;selftest_run || !devlink-&gt;ops-&gt;selftest_check)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_SELFTESTS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	attrs = info-&gt;attrs[DEVLINK_ATTR_SELFTESTS];</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, DEVLINK_ATTR_SELFTEST_ID_MAX, attrs,</div><div class='add'>+			       devlink_selftest_nl_policy, info-&gt;extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	hdr = genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;devlink_nl_family, 0, DEVLINK_CMD_SELFTESTS_RUN);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto free_msg;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+</div><div class='add'>+	selftests = nla_nest_start(msg, DEVLINK_ATTR_SELFTESTS);</div><div class='add'>+	if (!selftests)</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+</div><div class='add'>+	for (i = DEVLINK_ATTR_SELFTEST_ID_UNSPEC + 1;</div><div class='add'>+	     i &lt;= DEVLINK_ATTR_SELFTEST_ID_MAX; i++) {</div><div class='add'>+		enum devlink_selftest_status test_status;</div><div class='add'>+</div><div class='add'>+		if (nla_get_flag(tb[i])) {</div><div class='add'>+			if (!devlink-&gt;ops-&gt;selftest_check(devlink, i,</div><div class='add'>+							  info-&gt;extack)) {</div><div class='add'>+				if (devlink_selftest_result_put(msg, i,</div><div class='add'>+								DEVLINK_SELFTEST_STATUS_SKIP))</div><div class='add'>+					goto selftests_nest_cancel;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			test_status = devlink-&gt;ops-&gt;selftest_run(devlink, i,</div><div class='add'>+								 info-&gt;extack);</div><div class='add'>+			if (devlink_selftest_result_put(msg, i, test_status))</div><div class='add'>+				goto selftests_nest_cancel;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, selftests);</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+selftests_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, selftests);</div><div class='add'>+genlmsg_cancel:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h<br/>new file mode 100644<br/>index 000000000000..14eaad9cfe35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/devl_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/devl_internal.h</a></div><div class='hunk'>@@ -0,0 +1,304 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+#include &lt;rdma/ib_verbs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink_gen.h"</div><div class='add'>+</div><div class='add'>+struct devlink_rel;</div><div class='add'>+</div><div class='add'>+#define DEVLINK_REGISTERED XA_MARK_1</div><div class='add'>+</div><div class='add'>+#define DEVLINK_RELOAD_STATS_ARRAY_SIZE \</div><div class='add'>+	(__DEVLINK_RELOAD_LIMIT_MAX * __DEVLINK_RELOAD_ACTION_MAX)</div><div class='add'>+</div><div class='add'>+struct devlink_dev_stats {</div><div class='add'>+	u32 reload_stats[DEVLINK_RELOAD_STATS_ARRAY_SIZE];</div><div class='add'>+	u32 remote_reload_stats[DEVLINK_RELOAD_STATS_ARRAY_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink {</div><div class='add'>+	u32 index;</div><div class='add'>+	struct xarray ports;</div><div class='add'>+	struct list_head rate_list;</div><div class='add'>+	struct list_head sb_list;</div><div class='add'>+	struct list_head dpipe_table_list;</div><div class='add'>+	struct list_head resource_list;</div><div class='add'>+	struct xarray params;</div><div class='add'>+	struct list_head region_list;</div><div class='add'>+	struct list_head reporter_list;</div><div class='add'>+	struct devlink_dpipe_headers *dpipe_headers;</div><div class='add'>+	struct list_head trap_list;</div><div class='add'>+	struct list_head trap_group_list;</div><div class='add'>+	struct list_head trap_policer_list;</div><div class='add'>+	struct list_head linecard_list;</div><div class='add'>+	const struct devlink_ops *ops;</div><div class='add'>+	struct xarray snapshot_ids;</div><div class='add'>+	struct devlink_dev_stats stats;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	possible_net_t _net;</div><div class='add'>+	/* Serializes access to devlink instance specific objects such as</div><div class='add'>+	 * port, sb, dpipe, resource, params, region, traps and more.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct lock_class_key lock_key;</div><div class='add'>+	u8 reload_failed:1;</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+	struct rcu_work rwork;</div><div class='add'>+	struct devlink_rel *rel;</div><div class='add'>+	struct xarray nested_rels;</div><div class='add'>+	char priv[] __aligned(NETDEV_ALIGN);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct xarray devlinks;</div><div class='add'>+extern struct genl_family devlink_nl_family;</div><div class='add'>+</div><div class='add'>+/* devlink instances are open to the access from the user space after</div><div class='add'>+ * devlink_register() call. Such logical barrier allows us to have certain</div><div class='add'>+ * expectations related to locking.</div><div class='add'>+ *</div><div class='add'>+ * Before *_register() - we are in initialization stage and no parallel</div><div class='add'>+ * access possible to the devlink instance. All drivers perform that phase</div><div class='add'>+ * by implicitly holding device_lock.</div><div class='add'>+ *</div><div class='add'>+ * After *_register() - users and driver can access devlink instance at</div><div class='add'>+ * the same time.</div><div class='add'>+ */</div><div class='add'>+#define ASSERT_DEVLINK_REGISTERED(d)                                           \</div><div class='add'>+	WARN_ON_ONCE(!xa_get_mark(&amp;devlinks, (d)-&gt;index, DEVLINK_REGISTERED))</div><div class='add'>+#define ASSERT_DEVLINK_NOT_REGISTERED(d)                                       \</div><div class='add'>+	WARN_ON_ONCE(xa_get_mark(&amp;devlinks, (d)-&gt;index, DEVLINK_REGISTERED))</div><div class='add'>+</div><div class='add'>+/* Iterate over devlink pointers which were possible to get reference to.</div><div class='add'>+ * devlink_put() needs to be called for each iterated devlink pointer</div><div class='add'>+ * in loop body in order to release the reference.</div><div class='add'>+ */</div><div class='add'>+#define devlinks_xa_for_each_registered_get(net, index, devlink)	\</div><div class='add'>+	for (index = 0; (devlink = devlinks_xa_find_get(net, &amp;index)); index++)</div><div class='add'>+</div><div class='add'>+struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp);</div><div class='add'>+</div><div class='add'>+static inline bool __devl_is_registered(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return xa_get_mark(&amp;devlinks, devlink-&gt;index, DEVLINK_REGISTERED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool devl_is_registered(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	return __devl_is_registered(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void devl_dev_lock(struct devlink *devlink, bool dev_lock)</div><div class='add'>+{</div><div class='add'>+	if (dev_lock)</div><div class='add'>+		device_lock(devlink-&gt;dev);</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void devl_dev_unlock(struct devlink *devlink, bool dev_lock)</div><div class='add'>+{</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	if (dev_lock)</div><div class='add'>+		device_unlock(devlink-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef void devlink_rel_notify_cb_t(struct devlink *devlink, u32 obj_index);</div><div class='add'>+typedef void devlink_rel_cleanup_cb_t(struct devlink *devlink, u32 obj_index,</div><div class='add'>+				      u32 rel_index);</div><div class='add'>+</div><div class='add'>+void devlink_rel_nested_in_clear(u32 rel_index);</div><div class='add'>+int devlink_rel_nested_in_add(u32 *rel_index, u32 devlink_index,</div><div class='add'>+			      u32 obj_index, devlink_rel_notify_cb_t *notify_cb,</div><div class='add'>+			      devlink_rel_cleanup_cb_t *cleanup_cb,</div><div class='add'>+			      struct devlink *devlink);</div><div class='add'>+void devlink_rel_nested_in_notify(struct devlink *devlink);</div><div class='add'>+int devlink_rel_devlink_handle_put(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				   u32 rel_index, int attrtype,</div><div class='add'>+				   bool *msg_updated);</div><div class='add'>+</div><div class='add'>+/* Netlink */</div><div class='add'>+enum devlink_multicast_groups {</div><div class='add'>+	DEVLINK_MCGRP_CONFIG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* state held across netlink dumps */</div><div class='add'>+struct devlink_nl_dump_state {</div><div class='add'>+	unsigned long instance;</div><div class='add'>+	int idx;</div><div class='add'>+	union {</div><div class='add'>+		/* DEVLINK_CMD_REGION_READ */</div><div class='add'>+		struct {</div><div class='add'>+			u64 start_offset;</div><div class='add'>+		};</div><div class='add'>+		/* DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET */</div><div class='add'>+		struct {</div><div class='add'>+			u64 dump_ts;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef int devlink_nl_dump_one_func_t(struct sk_buff *msg,</div><div class='add'>+				       struct devlink *devlink,</div><div class='add'>+				       struct netlink_callback *cb,</div><div class='add'>+				       int flags);</div><div class='add'>+</div><div class='add'>+struct devlink *</div><div class='add'>+devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs,</div><div class='add'>+			    bool dev_lock);</div><div class='add'>+</div><div class='add'>+int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='add'>+		      devlink_nl_dump_one_func_t *dump_one);</div><div class='add'>+</div><div class='add'>+static inline struct devlink_nl_dump_state *</div><div class='add'>+devlink_dump_state(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	NL_ASSERT_CTX_FITS(struct devlink_nl_dump_state);</div><div class='add'>+</div><div class='add'>+	return (struct devlink_nl_dump_state *)cb-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_BUS_NAME, devlink-&gt;dev-&gt;bus-&gt;name))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_DEV_NAME, dev_name(devlink-&gt;dev)))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int devlink_nl_put_u64(struct sk_buff *msg, int attrtype, u64 val)</div><div class='add'>+{</div><div class='add'>+	return nla_put_u64_64bit(msg, attrtype, val, DEVLINK_ATTR_PAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,</div><div class='add'>+				 struct devlink *devlink, int attrtype);</div><div class='add'>+int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+static inline bool devlink_nl_notify_need(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	return genl_has_listeners(&amp;devlink_nl_family, devlink_net(devlink),</div><div class='add'>+				  DEVLINK_MCGRP_CONFIG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_obj_desc {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	const char *bus_name;</div><div class='add'>+	const char *dev_name;</div><div class='add'>+	unsigned int port_index;</div><div class='add'>+	bool port_index_valid;</div><div class='add'>+	long data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void devlink_nl_obj_desc_init(struct devlink_obj_desc *desc,</div><div class='add'>+					    struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	memset(desc, 0, sizeof(*desc));</div><div class='add'>+	desc-&gt;bus_name = devlink-&gt;dev-&gt;bus-&gt;name;</div><div class='add'>+	desc-&gt;dev_name = dev_name(devlink-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void devlink_nl_obj_desc_port_set(struct devlink_obj_desc *desc,</div><div class='add'>+						struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;port_index = devlink_port-&gt;index;</div><div class='add'>+	desc-&gt;port_index_valid = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data);</div><div class='add'>+</div><div class='add'>+static inline void devlink_nl_notify_send_desc(struct devlink *devlink,</div><div class='add'>+					       struct sk_buff *msg,</div><div class='add'>+					       struct devlink_obj_desc *desc)</div><div class='add'>+{</div><div class='add'>+	genlmsg_multicast_netns_filtered(&amp;devlink_nl_family,</div><div class='add'>+					 devlink_net(devlink),</div><div class='add'>+					 msg, 0, DEVLINK_MCGRP_CONFIG,</div><div class='add'>+					 GFP_KERNEL,</div><div class='add'>+					 devlink_nl_notify_filter, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void devlink_nl_notify_send(struct devlink *devlink,</div><div class='add'>+					  struct sk_buff *msg)</div><div class='add'>+{</div><div class='add'>+	struct devlink_obj_desc desc;</div><div class='add'>+</div><div class='add'>+	devlink_nl_obj_desc_init(&amp;desc, devlink);</div><div class='add'>+	devlink_nl_notify_send_desc(devlink, msg, &amp;desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Notify */</div><div class='add'>+void devlink_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_ports_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_ports_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_params_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_params_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_regions_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_regions_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_trap_policers_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_trap_policers_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_trap_groups_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_trap_groups_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_traps_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_traps_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_rates_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_rates_notify_unregister(struct devlink *devlink);</div><div class='add'>+void devlink_linecards_notify_register(struct devlink *devlink);</div><div class='add'>+void devlink_linecards_notify_unregister(struct devlink *devlink);</div><div class='add'>+</div><div class='add'>+/* Ports */</div><div class='add'>+#define ASSERT_DEVLINK_PORT_INITIALIZED(devlink_port)				\</div><div class='add'>+	WARN_ON_ONCE(!(devlink_port)-&gt;initialized)</div><div class='add'>+</div><div class='add'>+struct devlink_port *devlink_port_get_by_index(struct devlink *devlink,</div><div class='add'>+					       unsigned int port_index);</div><div class='add'>+int devlink_port_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				 unsigned long event, void *ptr);</div><div class='add'>+struct devlink_port *</div><div class='add'>+devlink_port_get_from_info(struct devlink *devlink, struct genl_info *info);</div><div class='add'>+struct devlink_port *devlink_port_get_from_attrs(struct devlink *devlink,</div><div class='add'>+						 struct nlattr **attrs);</div><div class='add'>+</div><div class='add'>+/* Reload */</div><div class='add'>+bool devlink_reload_actions_valid(const struct devlink_ops *ops);</div><div class='add'>+int devlink_reload(struct devlink *devlink, struct net *dest_net,</div><div class='add'>+		   enum devlink_reload_action action,</div><div class='add'>+		   enum devlink_reload_limit limit,</div><div class='add'>+		   u32 *actions_performed, struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static inline bool devlink_reload_supported(const struct devlink_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return ops-&gt;reload_down &amp;&amp; ops-&gt;reload_up;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Params */</div><div class='add'>+void devlink_params_driverinit_load_new(struct devlink *devlink);</div><div class='add'>+</div><div class='add'>+/* Resources */</div><div class='add'>+struct devlink_resource;</div><div class='add'>+int devlink_resources_validate(struct devlink *devlink,</div><div class='add'>+			       struct devlink_resource *resource,</div><div class='add'>+			       struct genl_info *info);</div><div class='add'>+</div><div class='add'>+/* Rates */</div><div class='add'>+int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+/* Linecards */</div><div class='add'>+unsigned int devlink_linecard_index(struct devlink_linecard *linecard);</div><div class='head'>diff --git a/net/devlink/dpipe.c b/net/devlink/dpipe.c<br/>new file mode 100644<br/>index 000000000000..e55701b007f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/dpipe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/dpipe.c</a></div><div class='hunk'>@@ -0,0 +1,915 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+static struct devlink_dpipe_field devlink_dpipe_fields_ethernet[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "destination mac",</div><div class='add'>+		.id = DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC,</div><div class='add'>+		.bitwidth = 48,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_dpipe_header devlink_dpipe_header_ethernet = {</div><div class='add'>+	.name = "ethernet",</div><div class='add'>+	.id = DEVLINK_DPIPE_HEADER_ETHERNET,</div><div class='add'>+	.fields = devlink_dpipe_fields_ethernet,</div><div class='add'>+	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ethernet),</div><div class='add'>+	.global = true,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_header_ethernet);</div><div class='add'>+</div><div class='add'>+static struct devlink_dpipe_field devlink_dpipe_fields_ipv4[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "destination ip",</div><div class='add'>+		.id = DEVLINK_DPIPE_FIELD_IPV4_DST_IP,</div><div class='add'>+		.bitwidth = 32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_dpipe_header devlink_dpipe_header_ipv4 = {</div><div class='add'>+	.name = "ipv4",</div><div class='add'>+	.id = DEVLINK_DPIPE_HEADER_IPV4,</div><div class='add'>+	.fields = devlink_dpipe_fields_ipv4,</div><div class='add'>+	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ipv4),</div><div class='add'>+	.global = true,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_header_ipv4);</div><div class='add'>+</div><div class='add'>+static struct devlink_dpipe_field devlink_dpipe_fields_ipv6[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "destination ip",</div><div class='add'>+		.id = DEVLINK_DPIPE_FIELD_IPV6_DST_IP,</div><div class='add'>+		.bitwidth = 128,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_dpipe_header devlink_dpipe_header_ipv6 = {</div><div class='add'>+	.name = "ipv6",</div><div class='add'>+	.id = DEVLINK_DPIPE_HEADER_IPV6,</div><div class='add'>+	.fields = devlink_dpipe_fields_ipv6,</div><div class='add'>+	.fields_count = ARRAY_SIZE(devlink_dpipe_fields_ipv6),</div><div class='add'>+	.global = true,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_header_ipv6);</div><div class='add'>+</div><div class='add'>+int devlink_dpipe_match_put(struct sk_buff *skb,</div><div class='add'>+			    struct devlink_dpipe_match *match)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_header *header = match-&gt;header;</div><div class='add'>+	struct devlink_dpipe_field *field = &amp;header-&gt;fields[match-&gt;field_id];</div><div class='add'>+	struct nlattr *match_attr;</div><div class='add'>+</div><div class='add'>+	match_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_MATCH);</div><div class='add'>+	if (!match_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_MATCH_TYPE, match-&gt;type) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_INDEX, match-&gt;header_index) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='add'>+	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, match_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, match_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_match_put);</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_matches_put(struct devlink_dpipe_table *table,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *matches_attr;</div><div class='add'>+</div><div class='add'>+	matches_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					     DEVLINK_ATTR_DPIPE_TABLE_MATCHES);</div><div class='add'>+	if (!matches_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (table-&gt;table_ops-&gt;matches_dump(table-&gt;priv, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, matches_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, matches_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_dpipe_action_put(struct sk_buff *skb,</div><div class='add'>+			     struct devlink_dpipe_action *action)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_header *header = action-&gt;header;</div><div class='add'>+	struct devlink_dpipe_field *field = &amp;header-&gt;fields[action-&gt;field_id];</div><div class='add'>+	struct nlattr *action_attr;</div><div class='add'>+</div><div class='add'>+	action_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_ACTION);</div><div class='add'>+	if (!action_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_ACTION_TYPE, action-&gt;type) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_INDEX, action-&gt;header_index) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='add'>+	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, action_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, action_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_action_put);</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_actions_put(struct devlink_dpipe_table *table,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *actions_attr;</div><div class='add'>+</div><div class='add'>+	actions_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					     DEVLINK_ATTR_DPIPE_TABLE_ACTIONS);</div><div class='add'>+	if (!actions_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (table-&gt;table_ops-&gt;actions_dump(table-&gt;priv, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, actions_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, actions_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_table_put(struct sk_buff *skb,</div><div class='add'>+				   struct devlink_dpipe_table *table)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *table_attr;</div><div class='add'>+	u64 table_size;</div><div class='add'>+</div><div class='add'>+	table_size = table-&gt;table_ops-&gt;size_get(table-&gt;priv);</div><div class='add'>+	table_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_TABLE);</div><div class='add'>+	if (!table_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_TABLE_NAME, table-&gt;name) ||</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_SIZE, table_size))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(skb, DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,</div><div class='add'>+		       table-&gt;counters_enabled))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (table-&gt;resource_valid) {</div><div class='add'>+		if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,</div><div class='add'>+				       table-&gt;resource_id) ||</div><div class='add'>+		    devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,</div><div class='add'>+				       table-&gt;resource_units))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+	if (devlink_dpipe_matches_put(table, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_dpipe_actions_put(table, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, table_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, table_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_send_and_alloc_skb(struct sk_buff **pskb,</div><div class='add'>+					    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (*pskb) {</div><div class='add'>+		err = genlmsg_reply(*pskb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	*pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!*pskb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_tables_fill(struct genl_info *info,</div><div class='add'>+				     enum devlink_command cmd, int flags,</div><div class='add'>+				     struct list_head *dpipe_tables,</div><div class='add'>+				     const char *table_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+	struct nlattr *tables_attr;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	bool incomplete;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	table = list_first_entry(dpipe_tables,</div><div class='add'>+				 struct devlink_dpipe_table, list);</div><div class='add'>+start_again:</div><div class='add'>+	err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(skb, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	tables_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_TABLES);</div><div class='add'>+	if (!tables_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	incomplete = false;</div><div class='add'>+	list_for_each_entry_from(table, dpipe_tables, list) {</div><div class='add'>+		if (!table_name) {</div><div class='add'>+			err = devlink_dpipe_table_put(skb, table);</div><div class='add'>+			if (err) {</div><div class='add'>+				if (!i)</div><div class='add'>+					goto err_table_put;</div><div class='add'>+				incomplete = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (!strcmp(table-&gt;name, table_name)) {</div><div class='add'>+				err = devlink_dpipe_table_put(skb, table);</div><div class='add'>+				if (err)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, tables_attr);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	if (incomplete)</div><div class='add'>+		goto start_again;</div><div class='add'>+</div><div class='add'>+send_done:</div><div class='add'>+	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		goto send_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+err_table_put:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const char *table_name =  NULL;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME])</div><div class='add'>+		table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='add'>+</div><div class='add'>+	return devlink_dpipe_tables_fill(info, DEVLINK_CMD_DPIPE_TABLE_GET, 0,</div><div class='add'>+					 &amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_value_put(struct sk_buff *skb,</div><div class='add'>+				   struct devlink_dpipe_value *value)</div><div class='add'>+{</div><div class='add'>+	if (nla_put(skb, DEVLINK_ATTR_DPIPE_VALUE,</div><div class='add'>+		    value-&gt;value_size, value-&gt;value))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (value-&gt;mask)</div><div class='add'>+		if (nla_put(skb, DEVLINK_ATTR_DPIPE_VALUE_MASK,</div><div class='add'>+			    value-&gt;value_size, value-&gt;mask))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	if (value-&gt;mapping_valid)</div><div class='add'>+		if (nla_put_u32(skb, DEVLINK_ATTR_DPIPE_VALUE_MAPPING,</div><div class='add'>+				value-&gt;mapping_value))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_action_value_put(struct sk_buff *skb,</div><div class='add'>+					  struct devlink_dpipe_value *value)</div><div class='add'>+{</div><div class='add'>+	if (!value-&gt;action)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (devlink_dpipe_action_put(skb, value-&gt;action))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (devlink_dpipe_value_put(skb, value))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_action_values_put(struct sk_buff *skb,</div><div class='add'>+					   struct devlink_dpipe_value *values,</div><div class='add'>+					   unsigned int values_count)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *action_attr;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; values_count; i++) {</div><div class='add'>+		action_attr = nla_nest_start_noflag(skb,</div><div class='add'>+						    DEVLINK_ATTR_DPIPE_ACTION_VALUE);</div><div class='add'>+		if (!action_attr)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		err = devlink_dpipe_action_value_put(skb, &amp;values[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_action_value_put;</div><div class='add'>+		nla_nest_end(skb, action_attr);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_action_value_put:</div><div class='add'>+	nla_nest_cancel(skb, action_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_match_value_put(struct sk_buff *skb,</div><div class='add'>+					 struct devlink_dpipe_value *value)</div><div class='add'>+{</div><div class='add'>+	if (!value-&gt;match)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (devlink_dpipe_match_put(skb, value-&gt;match))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (devlink_dpipe_value_put(skb, value))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_match_values_put(struct sk_buff *skb,</div><div class='add'>+					  struct devlink_dpipe_value *values,</div><div class='add'>+					  unsigned int values_count)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *match_attr;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; values_count; i++) {</div><div class='add'>+		match_attr = nla_nest_start_noflag(skb,</div><div class='add'>+						   DEVLINK_ATTR_DPIPE_MATCH_VALUE);</div><div class='add'>+		if (!match_attr)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		err = devlink_dpipe_match_value_put(skb, &amp;values[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_match_value_put;</div><div class='add'>+		nla_nest_end(skb, match_attr);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_match_value_put:</div><div class='add'>+	nla_nest_cancel(skb, match_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_entry_put(struct sk_buff *skb,</div><div class='add'>+				   struct devlink_dpipe_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *entry_attr, *matches_attr, *actions_attr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	entry_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_ENTRY);</div><div class='add'>+	if (!entry_attr)</div><div class='add'>+		return  -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_ENTRY_INDEX, entry-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (entry-&gt;counter_valid)</div><div class='add'>+		if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,</div><div class='add'>+				       entry-&gt;counter))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	matches_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					     DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES);</div><div class='add'>+	if (!matches_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_dpipe_match_values_put(skb, entry-&gt;match_values,</div><div class='add'>+					     entry-&gt;match_values_count);</div><div class='add'>+	if (err) {</div><div class='add'>+		nla_nest_cancel(skb, matches_attr);</div><div class='add'>+		goto err_match_values_put;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, matches_attr);</div><div class='add'>+</div><div class='add'>+	actions_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					     DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES);</div><div class='add'>+	if (!actions_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_dpipe_action_values_put(skb, entry-&gt;action_values,</div><div class='add'>+					      entry-&gt;action_values_count);</div><div class='add'>+	if (err) {</div><div class='add'>+		nla_nest_cancel(skb, actions_attr);</div><div class='add'>+		goto err_action_values_put;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, actions_attr);</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, entry_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+err_match_values_put:</div><div class='add'>+err_action_values_put:</div><div class='add'>+	nla_nest_cancel(skb, entry_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_dpipe_table *</div><div class='add'>+devlink_dpipe_table_find(struct list_head *dpipe_tables,</div><div class='add'>+			 const char *table_name, struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(table, dpipe_tables, list,</div><div class='add'>+				lockdep_is_held(&amp;devlink-&gt;lock)) {</div><div class='add'>+		if (!strcmp(table-&gt;name, table_name))</div><div class='add'>+			return table;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_dpipe_send_and_alloc_skb(&amp;dump_ctx-&gt;skb,</div><div class='add'>+					       dump_ctx-&gt;info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dump_ctx-&gt;hdr = genlmsg_put(dump_ctx-&gt;skb,</div><div class='add'>+				    dump_ctx-&gt;info-&gt;snd_portid,</div><div class='add'>+				    dump_ctx-&gt;info-&gt;snd_seq,</div><div class='add'>+				    &amp;devlink_nl_family, NLM_F_MULTI,</div><div class='add'>+				    dump_ctx-&gt;cmd);</div><div class='add'>+	if (!dump_ctx-&gt;hdr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	devlink = dump_ctx-&gt;info-&gt;user_ptr[0];</div><div class='add'>+	if (devlink_nl_put_handle(dump_ctx-&gt;skb, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	dump_ctx-&gt;nest = nla_nest_start_noflag(dump_ctx-&gt;skb,</div><div class='add'>+					       DEVLINK_ATTR_DPIPE_ENTRIES);</div><div class='add'>+	if (!dump_ctx-&gt;nest)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_free(dump_ctx-&gt;skb);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_prepare);</div><div class='add'>+</div><div class='add'>+int devlink_dpipe_entry_ctx_append(struct devlink_dpipe_dump_ctx *dump_ctx,</div><div class='add'>+				   struct devlink_dpipe_entry *entry)</div><div class='add'>+{</div><div class='add'>+	return devlink_dpipe_entry_put(dump_ctx-&gt;skb, entry);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_append);</div><div class='add'>+</div><div class='add'>+int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx)</div><div class='add'>+{</div><div class='add'>+	nla_nest_end(dump_ctx-&gt;skb, dump_ctx-&gt;nest);</div><div class='add'>+	genlmsg_end(dump_ctx-&gt;skb, dump_ctx-&gt;hdr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_close);</div><div class='add'>+</div><div class='add'>+void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	unsigned int value_count, value_index;</div><div class='add'>+	struct devlink_dpipe_value *value;</div><div class='add'>+</div><div class='add'>+	value = entry-&gt;action_values;</div><div class='add'>+	value_count = entry-&gt;action_values_count;</div><div class='add'>+	for (value_index = 0; value_index &lt; value_count; value_index++) {</div><div class='add'>+		kfree(value[value_index].value);</div><div class='add'>+		kfree(value[value_index].mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = entry-&gt;match_values;</div><div class='add'>+	value_count = entry-&gt;match_values_count;</div><div class='add'>+	for (value_index = 0; value_index &lt; value_count; value_index++) {</div><div class='add'>+		kfree(value[value_index].value);</div><div class='add'>+		kfree(value[value_index].mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_entry_clear);</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_entries_fill(struct genl_info *info,</div><div class='add'>+				      enum devlink_command cmd, int flags,</div><div class='add'>+				      struct devlink_dpipe_table *table)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_dump_ctx dump_ctx;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dump_ctx.skb = NULL;</div><div class='add'>+	dump_ctx.cmd = cmd;</div><div class='add'>+	dump_ctx.info = info;</div><div class='add'>+</div><div class='add'>+	err = table-&gt;table_ops-&gt;entries_dump(table-&gt;priv,</div><div class='add'>+					     table-&gt;counters_enabled,</div><div class='add'>+					     &amp;dump_ctx);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+send_done:</div><div class='add'>+	nlh = nlmsg_put(dump_ctx.skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = devlink_dpipe_send_and_alloc_skb(&amp;dump_ctx.skb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		goto send_done;</div><div class='add'>+	}</div><div class='add'>+	return genlmsg_reply(dump_ctx.skb, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+	const char *table_name;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_DPIPE_TABLE_NAME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='add'>+	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name, devlink);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!table-&gt;table_ops-&gt;entries_dump)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return devlink_dpipe_entries_fill(info, DEVLINK_CMD_DPIPE_ENTRIES_GET,</div><div class='add'>+					  0, table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_fields_put(struct sk_buff *skb,</div><div class='add'>+				    const struct devlink_dpipe_header *header)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_field *field;</div><div class='add'>+	struct nlattr *field_attr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; header-&gt;fields_count; i++) {</div><div class='add'>+		field = &amp;header-&gt;fields[i];</div><div class='add'>+		field_attr = nla_nest_start_noflag(skb,</div><div class='add'>+						   DEVLINK_ATTR_DPIPE_FIELD);</div><div class='add'>+		if (!field_attr)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_FIELD_NAME, field-&gt;name) ||</div><div class='add'>+		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_ID, field-&gt;id) ||</div><div class='add'>+		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH, field-&gt;bitwidth) ||</div><div class='add'>+		    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE, field-&gt;mapping_type))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		nla_nest_end(skb, field_attr);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, field_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_header_put(struct sk_buff *skb,</div><div class='add'>+				    struct devlink_dpipe_header *header)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *fields_attr, *header_attr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	header_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_HEADER);</div><div class='add'>+	if (!header_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_HEADER_NAME, header-&gt;name) ||</div><div class='add'>+	    nla_put_u32(skb, DEVLINK_ATTR_DPIPE_HEADER_ID, header-&gt;id) ||</div><div class='add'>+	    nla_put_u8(skb, DEVLINK_ATTR_DPIPE_HEADER_GLOBAL, header-&gt;global))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	fields_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					    DEVLINK_ATTR_DPIPE_HEADER_FIELDS);</div><div class='add'>+	if (!fields_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_dpipe_fields_put(skb, header);</div><div class='add'>+	if (err) {</div><div class='add'>+		nla_nest_cancel(skb, fields_attr);</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, fields_attr);</div><div class='add'>+	nla_nest_end(skb, header_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	nla_nest_cancel(skb, header_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_headers_fill(struct genl_info *info,</div><div class='add'>+				      enum devlink_command cmd, int flags,</div><div class='add'>+				      struct devlink_dpipe_headers *</div><div class='add'>+				      dpipe_headers)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct nlattr *headers_attr;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+start_again:</div><div class='add'>+	err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(skb, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	headers_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_DPIPE_HEADERS);</div><div class='add'>+	if (!headers_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (; i &lt; dpipe_headers-&gt;headers_count; i++) {</div><div class='add'>+		err = devlink_dpipe_header_put(skb, dpipe_headers-&gt;headers[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (!j)</div><div class='add'>+				goto err_table_put;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, headers_attr);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	if (i != dpipe_headers-&gt;headers_count)</div><div class='add'>+		goto start_again;</div><div class='add'>+</div><div class='add'>+send_done:</div><div class='add'>+	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = devlink_dpipe_send_and_alloc_skb(&amp;skb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		goto send_done;</div><div class='add'>+	}</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+err_table_put:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;dpipe_headers)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return devlink_dpipe_headers_fill(info, DEVLINK_CMD_DPIPE_HEADERS_GET,</div><div class='add'>+					  0, devlink-&gt;dpipe_headers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_dpipe_table_counters_set(struct devlink *devlink,</div><div class='add'>+					    const char *table_name,</div><div class='add'>+					    bool enable)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+</div><div class='add'>+	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name, devlink);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (table-&gt;counter_control_extern)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!(table-&gt;counters_enabled ^ enable))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	table-&gt;counters_enabled = enable;</div><div class='add'>+	if (table-&gt;table_ops-&gt;counters_set_update)</div><div class='add'>+		table-&gt;table_ops-&gt;counters_set_update(table-&gt;priv, enable);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,</div><div class='add'>+					     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const char *table_name;</div><div class='add'>+	bool counters_enable;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_DPIPE_TABLE_NAME) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info,</div><div class='add'>+				DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	table_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_NAME]);</div><div class='add'>+	counters_enable = !!nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]);</div><div class='add'>+</div><div class='add'>+	return devlink_dpipe_table_counters_set(devlink, table_name,</div><div class='add'>+						counters_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_dpipe_headers_register - register dpipe headers</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @dpipe_headers: dpipe header array</div><div class='add'>+ *</div><div class='add'>+ * Register the headers supported by hardware.</div><div class='add'>+ */</div><div class='add'>+void devl_dpipe_headers_register(struct devlink *devlink,</div><div class='add'>+				 struct devlink_dpipe_headers *dpipe_headers)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	devlink-&gt;dpipe_headers = dpipe_headers;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_dpipe_headers_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_dpipe_headers_unregister - unregister dpipe headers</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ *</div><div class='add'>+ * Unregister the headers supported by hardware.</div><div class='add'>+ */</div><div class='add'>+void devl_dpipe_headers_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	devlink-&gt;dpipe_headers = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_dpipe_headers_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_dpipe_table_counter_enabled - check if counter allocation</div><div class='add'>+ *					      required</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@table_name: tables name</div><div class='add'>+ *</div><div class='add'>+ *	Used by driver to check if counter allocation is required.</div><div class='add'>+ *	After counter allocation is turned on the table entries</div><div class='add'>+ *	are updated to include counter statistics.</div><div class='add'>+ *</div><div class='add'>+ *	After that point on the driver must respect the counter</div><div class='add'>+ *	state so that each entry added to the table is added</div><div class='add'>+ *	with a counter.</div><div class='add'>+ */</div><div class='add'>+bool devlink_dpipe_table_counter_enabled(struct devlink *devlink,</div><div class='add'>+					 const char *table_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name, devlink);</div><div class='add'>+	enabled = false;</div><div class='add'>+	if (table)</div><div class='add'>+		enabled = table-&gt;counters_enabled;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return enabled;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_dpipe_table_counter_enabled);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_dpipe_table_register - register dpipe table</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @table_name: table name</div><div class='add'>+ * @table_ops: table ops</div><div class='add'>+ * @priv: priv</div><div class='add'>+ * @counter_control_extern: external control for counters</div><div class='add'>+ */</div><div class='add'>+int devl_dpipe_table_register(struct devlink *devlink,</div><div class='add'>+			      const char *table_name,</div><div class='add'>+			      const struct devlink_dpipe_table_ops *table_ops,</div><div class='add'>+			      void *priv, bool counter_control_extern)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!table_ops-&gt;size_get))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list, table_name,</div><div class='add'>+				     devlink))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	table = kzalloc(sizeof(*table), GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	table-&gt;name = table_name;</div><div class='add'>+	table-&gt;table_ops = table_ops;</div><div class='add'>+	table-&gt;priv = priv;</div><div class='add'>+	table-&gt;counter_control_extern = counter_control_extern;</div><div class='add'>+</div><div class='add'>+	list_add_tail_rcu(&amp;table-&gt;list, &amp;devlink-&gt;dpipe_table_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_dpipe_table_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_dpipe_table_unregister - unregister dpipe table</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @table_name: table name</div><div class='add'>+ */</div><div class='add'>+void devl_dpipe_table_unregister(struct devlink *devlink,</div><div class='add'>+				 const char *table_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name, devlink);</div><div class='add'>+	if (!table)</div><div class='add'>+		return;</div><div class='add'>+	list_del_rcu(&amp;table-&gt;list);</div><div class='add'>+	kfree_rcu(table, rcu);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_dpipe_table_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_dpipe_table_resource_set - set the resource id</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @table_name: table name</div><div class='add'>+ * @resource_id: resource id</div><div class='add'>+ * @resource_units: number of resource's units consumed per table's entry</div><div class='add'>+ */</div><div class='add'>+int devl_dpipe_table_resource_set(struct devlink *devlink,</div><div class='add'>+				  const char *table_name, u64 resource_id,</div><div class='add'>+				  u64 resource_units)</div><div class='add'>+{</div><div class='add'>+	struct devlink_dpipe_table *table;</div><div class='add'>+</div><div class='add'>+	table = devlink_dpipe_table_find(&amp;devlink-&gt;dpipe_table_list,</div><div class='add'>+					 table_name, devlink);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	table-&gt;resource_id = resource_id;</div><div class='add'>+	table-&gt;resource_units = resource_units;</div><div class='add'>+	table-&gt;resource_valid = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_dpipe_table_resource_set);</div><div class='head'>diff --git a/net/devlink/health.c b/net/devlink/health.c<br/>new file mode 100644<br/>index 000000000000..136a67c36a20<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/health.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/health.c</a></div><div class='hunk'>@@ -0,0 +1,1350 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;trace/events/devlink.h&gt;</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_fmsg_item {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int attrtype;</div><div class='add'>+	u8 nla_type;</div><div class='add'>+	u16 len;</div><div class='add'>+	int value[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_fmsg {</div><div class='add'>+	struct list_head item_list;</div><div class='add'>+	int err; /* first error encountered on some devlink_fmsg_XXX() call */</div><div class='add'>+	bool putting_binary; /* This flag forces enclosing of binary data</div><div class='add'>+			      * in an array brackets. It forces using</div><div class='add'>+			      * of designated API:</div><div class='add'>+			      * devlink_fmsg_binary_pair_nest_start()</div><div class='add'>+			      * devlink_fmsg_binary_pair_nest_end()</div><div class='add'>+			      */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink_fmsg *devlink_fmsg_alloc(void)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg *fmsg;</div><div class='add'>+</div><div class='add'>+	fmsg = kzalloc(sizeof(*fmsg), GFP_KERNEL);</div><div class='add'>+	if (!fmsg)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;fmsg-&gt;item_list);</div><div class='add'>+</div><div class='add'>+	return fmsg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_free(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg_item *item, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(item, tmp, &amp;fmsg-&gt;item_list, list) {</div><div class='add'>+		list_del(&amp;item-&gt;list);</div><div class='add'>+		kfree(item);</div><div class='add'>+	}</div><div class='add'>+	kfree(fmsg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_health_reporter {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	void *priv;</div><div class='add'>+	const struct devlink_health_reporter_ops *ops;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	struct devlink_fmsg *dump_fmsg;</div><div class='add'>+	u64 graceful_period;</div><div class='add'>+	u64 burst_period;</div><div class='add'>+	bool auto_recover;</div><div class='add'>+	bool auto_dump;</div><div class='add'>+	u8 health_state;</div><div class='add'>+	u64 dump_ts;</div><div class='add'>+	u64 dump_real_ts;</div><div class='add'>+	u64 error_count;</div><div class='add'>+	u64 recovery_count;</div><div class='add'>+	u64 last_recovery_ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void *</div><div class='add'>+devlink_health_reporter_priv(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	return reporter-&gt;priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_reporter_priv);</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+__devlink_health_reporter_find_by_name(struct list_head *reporter_list,</div><div class='add'>+				       const char *reporter_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(reporter, reporter_list, list)</div><div class='add'>+		if (!strcmp(reporter-&gt;ops-&gt;name, reporter_name))</div><div class='add'>+			return reporter;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+devlink_health_reporter_find_by_name(struct devlink *devlink,</div><div class='add'>+				     const char *reporter_name)</div><div class='add'>+{</div><div class='add'>+	return __devlink_health_reporter_find_by_name(&amp;devlink-&gt;reporter_list,</div><div class='add'>+						      reporter_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+devlink_port_health_reporter_find_by_name(struct devlink_port *devlink_port,</div><div class='add'>+					  const char *reporter_name)</div><div class='add'>+{</div><div class='add'>+	return __devlink_health_reporter_find_by_name(&amp;devlink_port-&gt;reporter_list,</div><div class='add'>+						      reporter_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+__devlink_health_reporter_create(struct devlink *devlink,</div><div class='add'>+				 const struct devlink_health_reporter_ops *ops,</div><div class='add'>+				 void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ops-&gt;default_graceful_period &amp;&amp; !ops-&gt;recover))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ops-&gt;default_burst_period &amp;&amp; !ops-&gt;default_graceful_period))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	reporter = kzalloc(sizeof(*reporter), GFP_KERNEL);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	reporter-&gt;priv = priv;</div><div class='add'>+	reporter-&gt;ops = ops;</div><div class='add'>+	reporter-&gt;devlink = devlink;</div><div class='add'>+	reporter-&gt;graceful_period = ops-&gt;default_graceful_period;</div><div class='add'>+	reporter-&gt;burst_period = ops-&gt;default_burst_period;</div><div class='add'>+	reporter-&gt;auto_recover = !!ops-&gt;recover;</div><div class='add'>+	reporter-&gt;auto_dump = !!ops-&gt;dump;</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_port_health_reporter_create() - create devlink health reporter for</div><div class='add'>+ *                                      specified port instance</div><div class='add'>+ *</div><div class='add'>+ * @port: devlink_port to which health reports will relate</div><div class='add'>+ * @ops: devlink health reporter ops</div><div class='add'>+ * @priv: driver priv pointer</div><div class='add'>+ */</div><div class='add'>+struct devlink_health_reporter *</div><div class='add'>+devl_port_health_reporter_create(struct devlink_port *port,</div><div class='add'>+				 const struct devlink_health_reporter_ops *ops,</div><div class='add'>+				 void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(port-&gt;devlink);</div><div class='add'>+</div><div class='add'>+	if (__devlink_health_reporter_find_by_name(&amp;port-&gt;reporter_list,</div><div class='add'>+						   ops-&gt;name))</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+</div><div class='add'>+	reporter = __devlink_health_reporter_create(port-&gt;devlink, ops, priv);</div><div class='add'>+	if (IS_ERR(reporter))</div><div class='add'>+		return reporter;</div><div class='add'>+</div><div class='add'>+	reporter-&gt;devlink_port = port;</div><div class='add'>+	list_add_tail(&amp;reporter-&gt;list, &amp;port-&gt;reporter_list);</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_port_health_reporter_create);</div><div class='add'>+</div><div class='add'>+struct devlink_health_reporter *</div><div class='add'>+devlink_port_health_reporter_create(struct devlink_port *port,</div><div class='add'>+				    const struct devlink_health_reporter_ops *ops,</div><div class='add'>+				    void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	struct devlink *devlink = port-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	reporter = devl_port_health_reporter_create(port, ops, priv);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_health_reporter_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_health_reporter_create - create devlink health reporter</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink instance which the health reports will relate</div><div class='add'>+ * @ops: devlink health reporter ops</div><div class='add'>+ * @priv: driver priv pointer</div><div class='add'>+ */</div><div class='add'>+struct devlink_health_reporter *</div><div class='add'>+devl_health_reporter_create(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_health_reporter_ops *ops,</div><div class='add'>+			    void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	if (devlink_health_reporter_find_by_name(devlink, ops-&gt;name))</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+</div><div class='add'>+	reporter = __devlink_health_reporter_create(devlink, ops, priv);</div><div class='add'>+	if (IS_ERR(reporter))</div><div class='add'>+		return reporter;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;reporter-&gt;list, &amp;devlink-&gt;reporter_list);</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_health_reporter_create);</div><div class='add'>+</div><div class='add'>+struct devlink_health_reporter *</div><div class='add'>+devlink_health_reporter_create(struct devlink *devlink,</div><div class='add'>+			       const struct devlink_health_reporter_ops *ops,</div><div class='add'>+			       void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	reporter = devl_health_reporter_create(devlink, ops, priv);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_reporter_create);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_health_reporter_free(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	if (reporter-&gt;dump_fmsg)</div><div class='add'>+		devlink_fmsg_free(reporter-&gt;dump_fmsg);</div><div class='add'>+	kfree(reporter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_health_reporter_destroy() - destroy devlink health reporter</div><div class='add'>+ *</div><div class='add'>+ * @reporter: devlink health reporter to destroy</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+devl_health_reporter_destroy(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	devl_assert_locked(reporter-&gt;devlink);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;reporter-&gt;list);</div><div class='add'>+	devlink_health_reporter_free(reporter);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_health_reporter_destroy);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+devlink_health_reporter_destroy(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = reporter-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_health_reporter_destroy(reporter);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_health_reporter_fill(struct sk_buff *msg,</div><div class='add'>+				struct devlink_health_reporter *reporter,</div><div class='add'>+				enum devlink_command cmd, u32 portid,</div><div class='add'>+				u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = reporter-&gt;devlink;</div><div class='add'>+	struct nlattr *reporter_attr;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+</div><div class='add'>+	if (reporter-&gt;devlink_port) {</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, reporter-&gt;devlink_port-&gt;index))</div><div class='add'>+			goto genlmsg_cancel;</div><div class='add'>+	}</div><div class='add'>+	reporter_attr = nla_nest_start_noflag(msg,</div><div class='add'>+					      DEVLINK_ATTR_HEALTH_REPORTER);</div><div class='add'>+	if (!reporter_attr)</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+			   reporter-&gt;ops-&gt;name))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,</div><div class='add'>+		       reporter-&gt;health_state))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,</div><div class='add'>+			       reporter-&gt;error_count))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,</div><div class='add'>+			       reporter-&gt;recovery_count))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;ops-&gt;recover &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,</div><div class='add'>+			       reporter-&gt;graceful_period))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;ops-&gt;recover &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD,</div><div class='add'>+			       reporter-&gt;burst_period))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;ops-&gt;recover &amp;&amp;</div><div class='add'>+	    nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,</div><div class='add'>+		       reporter-&gt;auto_recover))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;dump_fmsg &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,</div><div class='add'>+			       jiffies_to_msecs(reporter-&gt;dump_ts)))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;dump_fmsg &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,</div><div class='add'>+			       reporter-&gt;dump_real_ts))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+	if (reporter-&gt;ops-&gt;dump &amp;&amp;</div><div class='add'>+	    nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP,</div><div class='add'>+		       reporter-&gt;auto_dump))</div><div class='add'>+		goto reporter_nest_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, reporter_attr);</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+reporter_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, reporter_attr);</div><div class='add'>+genlmsg_cancel:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+devlink_health_reporter_get_from_attrs(struct devlink *devlink,</div><div class='add'>+				       struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	char *reporter_name;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_HEALTH_REPORTER_NAME])</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	reporter_name = nla_data(attrs[DEVLINK_ATTR_HEALTH_REPORTER_NAME]);</div><div class='add'>+	devlink_port = devlink_port_get_from_attrs(devlink, attrs);</div><div class='add'>+	if (IS_ERR(devlink_port))</div><div class='add'>+		return devlink_health_reporter_find_by_name(devlink,</div><div class='add'>+							    reporter_name);</div><div class='add'>+	else</div><div class='add'>+		return devlink_port_health_reporter_find_by_name(devlink_port,</div><div class='add'>+								 reporter_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+devlink_health_reporter_get_from_info(struct devlink *devlink,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return devlink_health_reporter_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_get_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_health_reporter_fill(msg, reporter,</div><div class='add'>+					      DEVLINK_CMD_HEALTH_REPORTER_GET,</div><div class='add'>+					      info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+					      0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_health_reporter_get_dump_one(struct sk_buff *msg,</div><div class='add'>+						   struct devlink *devlink,</div><div class='add'>+						   struct netlink_callback *cb,</div><div class='add'>+						   int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	unsigned long port_index_end = ULONG_MAX;</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	unsigned long port_index_start = 0;</div><div class='add'>+	struct devlink_port *port;</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (attrs &amp;&amp; attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		port_index_start = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+		port_index_end = port_index_start;</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+		goto per_port_dump;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(reporter, &amp;devlink-&gt;reporter_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_health_reporter_fill(msg, reporter,</div><div class='add'>+						      DEVLINK_CMD_HEALTH_REPORTER_GET,</div><div class='add'>+						      NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+						      flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+per_port_dump:</div><div class='add'>+	xa_for_each_range(&amp;devlink-&gt;ports, port_index, port,</div><div class='add'>+			  port_index_start, port_index_end) {</div><div class='add'>+		list_for_each_entry(reporter, &amp;port-&gt;reporter_list, list) {</div><div class='add'>+			if (idx &lt; state-&gt;idx) {</div><div class='add'>+				idx++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = devlink_nl_health_reporter_fill(msg, reporter,</div><div class='add'>+							      DEVLINK_CMD_HEALTH_REPORTER_GET,</div><div class='add'>+							      NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+							      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+							      flags);</div><div class='add'>+			if (err) {</div><div class='add'>+				state-&gt;idx = idx;</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+			idx++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb,</div><div class='add'>+				 devlink_nl_health_reporter_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;recover &amp;&amp;</div><div class='add'>+	    (info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] ||</div><div class='add'>+	     info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] ||</div><div class='add'>+	     info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD]))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;dump &amp;&amp;</div><div class='add'>+	    info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP])</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD]) {</div><div class='add'>+		reporter-&gt;graceful_period =</div><div class='add'>+			nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD]);</div><div class='add'>+		if (!reporter-&gt;graceful_period)</div><div class='add'>+			reporter-&gt;burst_period = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD]) {</div><div class='add'>+		u64 burst_period =</div><div class='add'>+			nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD]);</div><div class='add'>+</div><div class='add'>+		if (!reporter-&gt;graceful_period &amp;&amp; burst_period) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(info-&gt;extack,</div><div class='add'>+					   "Cannot set burst period without a grace period.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reporter-&gt;burst_period = burst_period;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER])</div><div class='add'>+		reporter-&gt;auto_recover =</div><div class='add'>+			nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER]);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP])</div><div class='add'>+		reporter-&gt;auto_dump =</div><div class='add'>+		nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_recover_notify(struct devlink_health_reporter *reporter,</div><div class='add'>+				   enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = reporter-&gt;devlink;</div><div class='add'>+	struct devlink_obj_desc desc;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);</div><div class='add'>+	ASSERT_DEVLINK_REGISTERED(devlink);</div><div class='add'>+</div><div class='add'>+	if (!devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_health_reporter_fill(msg, reporter, cmd, 0, 0, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_obj_desc_init(&amp;desc, devlink);</div><div class='add'>+	if (reporter-&gt;devlink_port)</div><div class='add'>+		devlink_nl_obj_desc_port_set(&amp;desc, reporter-&gt;devlink_port);</div><div class='add'>+	devlink_nl_notify_send_desc(devlink, msg, &amp;desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_health_reporter_in_burst(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	unsigned long burst_threshold = reporter-&gt;last_recovery_ts +</div><div class='add'>+		msecs_to_jiffies(reporter-&gt;burst_period);</div><div class='add'>+</div><div class='add'>+	return time_is_after_jiffies(burst_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+devlink_health_reporter_recovery_done(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	reporter-&gt;recovery_count++;</div><div class='add'>+	if (!devlink_health_reporter_in_burst(reporter))</div><div class='add'>+		/* When burst period is set, last_recovery_ts marks the first</div><div class='add'>+		 * recovery within the burst period, not necessarily the last</div><div class='add'>+		 * one.</div><div class='add'>+		 */</div><div class='add'>+		reporter-&gt;last_recovery_ts = jiffies;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_reporter_recovery_done);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_health_reporter_recover(struct devlink_health_reporter *reporter,</div><div class='add'>+				void *priv_ctx, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (reporter-&gt;health_state == DEVLINK_HEALTH_REPORTER_STATE_HEALTHY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;recover)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = reporter-&gt;ops-&gt;recover(reporter, priv_ctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	devlink_health_reporter_recovery_done(reporter);</div><div class='add'>+	reporter-&gt;health_state = DEVLINK_HEALTH_REPORTER_STATE_HEALTHY;</div><div class='add'>+	devlink_recover_notify(reporter, DEVLINK_CMD_HEALTH_REPORTER_RECOVER);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_health_dump_clear(struct devlink_health_reporter *reporter)</div><div class='add'>+{</div><div class='add'>+	if (!reporter-&gt;dump_fmsg)</div><div class='add'>+		return;</div><div class='add'>+	devlink_fmsg_free(reporter-&gt;dump_fmsg);</div><div class='add'>+	reporter-&gt;dump_fmsg = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_health_do_dump(struct devlink_health_reporter *reporter,</div><div class='add'>+				  void *priv_ctx,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;dump)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (reporter-&gt;dump_fmsg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reporter-&gt;dump_fmsg = devlink_fmsg_alloc();</div><div class='add'>+	if (!reporter-&gt;dump_fmsg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_obj_nest_start(reporter-&gt;dump_fmsg);</div><div class='add'>+</div><div class='add'>+	err = reporter-&gt;ops-&gt;dump(reporter, reporter-&gt;dump_fmsg,</div><div class='add'>+				  priv_ctx, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto dump_err;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_obj_nest_end(reporter-&gt;dump_fmsg);</div><div class='add'>+	err = reporter-&gt;dump_fmsg-&gt;err;</div><div class='add'>+	if (err)</div><div class='add'>+		goto dump_err;</div><div class='add'>+</div><div class='add'>+	reporter-&gt;dump_ts = jiffies;</div><div class='add'>+	reporter-&gt;dump_real_ts = ktime_get_real_ns();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dump_err:</div><div class='add'>+	devlink_health_dump_clear(reporter);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_health_recover_abort(struct devlink_health_reporter *reporter,</div><div class='add'>+			     enum devlink_health_reporter_state prev_state)</div><div class='add'>+{</div><div class='add'>+	unsigned long recover_ts_threshold;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;auto_recover)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* abort if the previous error wasn't recovered */</div><div class='add'>+	if (prev_state != DEVLINK_HEALTH_REPORTER_STATE_HEALTHY)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (devlink_health_reporter_in_burst(reporter))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	recover_ts_threshold = reporter-&gt;last_recovery_ts +</div><div class='add'>+		msecs_to_jiffies(reporter-&gt;burst_period) +</div><div class='add'>+		msecs_to_jiffies(reporter-&gt;graceful_period);</div><div class='add'>+	if (reporter-&gt;last_recovery_ts &amp;&amp; reporter-&gt;recovery_count &amp;&amp;</div><div class='add'>+	    time_is_after_jiffies(recover_ts_threshold))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_health_report(struct devlink_health_reporter *reporter,</div><div class='add'>+			  const char *msg, void *priv_ctx)</div><div class='add'>+{</div><div class='add'>+	enum devlink_health_reporter_state prev_health_state;</div><div class='add'>+	struct devlink *devlink = reporter-&gt;devlink;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* write a log message of the current error */</div><div class='add'>+	WARN_ON(!msg);</div><div class='add'>+	trace_devlink_health_report(devlink, reporter-&gt;ops-&gt;name, msg);</div><div class='add'>+	reporter-&gt;error_count++;</div><div class='add'>+	prev_health_state = reporter-&gt;health_state;</div><div class='add'>+	reporter-&gt;health_state = DEVLINK_HEALTH_REPORTER_STATE_ERROR;</div><div class='add'>+	devlink_recover_notify(reporter, DEVLINK_CMD_HEALTH_REPORTER_RECOVER);</div><div class='add'>+</div><div class='add'>+	if (devlink_health_recover_abort(reporter, prev_health_state)) {</div><div class='add'>+		trace_devlink_health_recover_aborted(devlink,</div><div class='add'>+						     reporter-&gt;ops-&gt;name,</div><div class='add'>+						     reporter-&gt;health_state,</div><div class='add'>+						     jiffies -</div><div class='add'>+						     reporter-&gt;last_recovery_ts);</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reporter-&gt;auto_dump) {</div><div class='add'>+		devl_lock(devlink);</div><div class='add'>+		/* store current dump of current error, for later analysis */</div><div class='add'>+		devlink_health_do_dump(reporter, priv_ctx, NULL);</div><div class='add'>+		devl_unlock(devlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;auto_recover)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	ret = devlink_health_reporter_recover(reporter, priv_ctx, NULL);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_report);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,</div><div class='add'>+				     enum devlink_health_reporter_state state)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(state != DEVLINK_HEALTH_REPORTER_STATE_HEALTHY &amp;&amp;</div><div class='add'>+		    state != DEVLINK_HEALTH_REPORTER_STATE_ERROR))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (reporter-&gt;health_state == state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reporter-&gt;health_state = state;</div><div class='add'>+	trace_devlink_health_reporter_state_update(reporter-&gt;devlink,</div><div class='add'>+						   reporter-&gt;ops-&gt;name, state);</div><div class='add'>+	devlink_recover_notify(reporter, DEVLINK_CMD_HEALTH_REPORTER_RECOVER);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update);</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,</div><div class='add'>+					    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return devlink_health_reporter_recover(reporter, NULL, info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_err_if_binary(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	if (!fmsg-&gt;err &amp;&amp; fmsg-&gt;putting_binary)</div><div class='add'>+		fmsg-&gt;err = -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_nest_common(struct devlink_fmsg *fmsg, int attrtype)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg_item *item;</div><div class='add'>+</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	item = kzalloc(sizeof(*item), GFP_KERNEL);</div><div class='add'>+	if (!item) {</div><div class='add'>+		fmsg-&gt;err = -ENOMEM;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item-&gt;attrtype = attrtype;</div><div class='add'>+	list_add_tail(&amp;item-&gt;list, &amp;fmsg-&gt;item_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_obj_nest_start(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_nest_common(fmsg, DEVLINK_ATTR_FMSG_OBJ_NEST_START);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_obj_nest_start);</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_nest_end(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_nest_common(fmsg, DEVLINK_ATTR_FMSG_NEST_END);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_obj_nest_end(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_obj_nest_end);</div><div class='add'>+</div><div class='add'>+#define DEVLINK_FMSG_MAX_SIZE (GENLMSG_DEFAULT_SIZE - GENL_HDRLEN - NLA_HDRLEN)</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_put_name(struct devlink_fmsg *fmsg, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg_item *item;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (strlen(name) + 1 &gt; DEVLINK_FMSG_MAX_SIZE) {</div><div class='add'>+		fmsg-&gt;err = -EMSGSIZE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item = kzalloc(sizeof(*item) + strlen(name) + 1, GFP_KERNEL);</div><div class='add'>+	if (!item) {</div><div class='add'>+		fmsg-&gt;err = -ENOMEM;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item-&gt;nla_type = DEVLINK_VAR_ATTR_TYPE_NUL_STRING;</div><div class='add'>+	item-&gt;len = strlen(name) + 1;</div><div class='add'>+	item-&gt;attrtype = DEVLINK_ATTR_FMSG_OBJ_NAME;</div><div class='add'>+	memcpy(&amp;item-&gt;value, name, item-&gt;len);</div><div class='add'>+	list_add_tail(&amp;item-&gt;list, &amp;fmsg-&gt;item_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_pair_nest_start(struct devlink_fmsg *fmsg, const char *name)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_nest_common(fmsg, DEVLINK_ATTR_FMSG_PAIR_NEST_START);</div><div class='add'>+	devlink_fmsg_put_name(fmsg, name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_pair_nest_start);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_pair_nest_end(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_pair_nest_end);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_arr_pair_nest_start(struct devlink_fmsg *fmsg,</div><div class='add'>+				      const char *name)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_nest_common(fmsg, DEVLINK_ATTR_FMSG_ARR_NEST_START);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_arr_pair_nest_start);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_arr_pair_nest_end(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_nest_end(fmsg);</div><div class='add'>+	devlink_fmsg_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_arr_pair_nest_end);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_binary_pair_nest_start(struct devlink_fmsg *fmsg,</div><div class='add'>+					 const char *name)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_arr_pair_nest_start(fmsg, name);</div><div class='add'>+	fmsg-&gt;putting_binary = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_binary_pair_nest_start);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_binary_pair_nest_end(struct devlink_fmsg *fmsg)</div><div class='add'>+{</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!fmsg-&gt;putting_binary)</div><div class='add'>+		fmsg-&gt;err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	fmsg-&gt;putting_binary = false;</div><div class='add'>+	devlink_fmsg_arr_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_binary_pair_nest_end);</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_put_value(struct devlink_fmsg *fmsg,</div><div class='add'>+				   const void *value, u16 value_len,</div><div class='add'>+				   u8 value_nla_type)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg_item *item;</div><div class='add'>+</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (value_len &gt; DEVLINK_FMSG_MAX_SIZE) {</div><div class='add'>+		fmsg-&gt;err = -EMSGSIZE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item = kzalloc(sizeof(*item) + value_len, GFP_KERNEL);</div><div class='add'>+	if (!item) {</div><div class='add'>+		fmsg-&gt;err = -ENOMEM;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	item-&gt;nla_type = value_nla_type;</div><div class='add'>+	item-&gt;len = value_len;</div><div class='add'>+	item-&gt;attrtype = DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA;</div><div class='add'>+	memcpy(&amp;item-&gt;value, value, item-&gt;len);</div><div class='add'>+	list_add_tail(&amp;item-&gt;list, &amp;fmsg-&gt;item_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_put_value(fmsg, &amp;value, sizeof(value),</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_FLAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_put_value(fmsg, &amp;value, sizeof(value),</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_U8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_put_value(fmsg, &amp;value, sizeof(value),</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_U32);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_u32_put);</div><div class='add'>+</div><div class='add'>+static void devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_put_value(fmsg, &amp;value, sizeof(value),</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_U64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_err_if_binary(fmsg);</div><div class='add'>+	devlink_fmsg_put_value(fmsg, value, strlen(value) + 1,</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_NUL_STRING);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_string_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_binary_put(struct devlink_fmsg *fmsg, const void *value,</div><div class='add'>+			     u16 value_len)</div><div class='add'>+{</div><div class='add'>+	if (!fmsg-&gt;err &amp;&amp; !fmsg-&gt;putting_binary)</div><div class='add'>+		fmsg-&gt;err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_put_value(fmsg, value, value_len,</div><div class='add'>+			       DEVLINK_VAR_ATTR_TYPE_BINARY);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_binary_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_bool_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+				bool value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_bool_put(fmsg, value);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_bool_pair_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_u8_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+			      u8 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_u8_put(fmsg, value);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_u8_pair_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_u32_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+			       u32 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_u32_put(fmsg, value);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_u32_pair_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_u64_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+			       u64 value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_u64_put(fmsg, value);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_u64_pair_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_string_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+				  const char *value)</div><div class='add'>+{</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, name);</div><div class='add'>+	devlink_fmsg_string_put(fmsg, value);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_string_pair_put);</div><div class='add'>+</div><div class='add'>+void devlink_fmsg_binary_pair_put(struct devlink_fmsg *fmsg, const char *name,</div><div class='add'>+				  const void *value, u32 value_len)</div><div class='add'>+{</div><div class='add'>+	u32 data_size;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_binary_pair_nest_start(fmsg, name);</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; value_len; offset += data_size) {</div><div class='add'>+		data_size = value_len - offset;</div><div class='add'>+		if (data_size &gt; DEVLINK_FMSG_MAX_SIZE)</div><div class='add'>+			data_size = DEVLINK_FMSG_MAX_SIZE;</div><div class='add'>+</div><div class='add'>+		devlink_fmsg_binary_put(fmsg, value + offset, data_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_binary_pair_nest_end(fmsg);</div><div class='add'>+	fmsg-&gt;putting_binary = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_binary_pair_put);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_fmsg_item_fill_data(struct devlink_fmsg_item *msg, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int attrtype = DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	switch (msg-&gt;nla_type) {</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_FLAG:</div><div class='add'>+		/* Always provide flag data, regardless of its value */</div><div class='add'>+		tmp = *(bool *)msg-&gt;value;</div><div class='add'>+</div><div class='add'>+		return nla_put_u8(skb, attrtype, tmp);</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U8:</div><div class='add'>+		return nla_put_u8(skb, attrtype, *(u8 *)msg-&gt;value);</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U32:</div><div class='add'>+		return nla_put_u32(skb, attrtype, *(u32 *)msg-&gt;value);</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U64:</div><div class='add'>+		return devlink_nl_put_u64(skb, attrtype, *(u64 *)msg-&gt;value);</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_NUL_STRING:</div><div class='add'>+		return nla_put_string(skb, attrtype, (char *)&amp;msg-&gt;value);</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_BINARY:</div><div class='add'>+		return nla_put(skb, attrtype, msg-&gt;len, (void *)&amp;msg-&gt;value);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_fmsg_prepare_skb(struct devlink_fmsg *fmsg, struct sk_buff *skb,</div><div class='add'>+			 int *start)</div><div class='add'>+{</div><div class='add'>+	struct devlink_fmsg_item *item;</div><div class='add'>+	struct nlattr *fmsg_nlattr;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	fmsg_nlattr = nla_nest_start_noflag(skb, DEVLINK_ATTR_FMSG);</div><div class='add'>+	if (!fmsg_nlattr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(item, &amp;fmsg-&gt;item_list, list) {</div><div class='add'>+		if (i &lt; *start) {</div><div class='add'>+			i++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (item-&gt;attrtype) {</div><div class='add'>+		case DEVLINK_ATTR_FMSG_OBJ_NEST_START:</div><div class='add'>+		case DEVLINK_ATTR_FMSG_PAIR_NEST_START:</div><div class='add'>+		case DEVLINK_ATTR_FMSG_ARR_NEST_START:</div><div class='add'>+		case DEVLINK_ATTR_FMSG_NEST_END:</div><div class='add'>+			err = nla_put_flag(skb, item-&gt;attrtype);</div><div class='add'>+			break;</div><div class='add'>+		case DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA:</div><div class='add'>+			err = nla_put_u8(skb, DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE,</div><div class='add'>+					 item-&gt;nla_type);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			err = devlink_fmsg_item_fill_data(item, skb);</div><div class='add'>+			break;</div><div class='add'>+		case DEVLINK_ATTR_FMSG_OBJ_NAME:</div><div class='add'>+			err = nla_put_string(skb, item-&gt;attrtype,</div><div class='add'>+					     (char *)&amp;item-&gt;value);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!err)</div><div class='add'>+			*start = ++i;</div><div class='add'>+		else</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, fmsg_nlattr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_fmsg_snd(struct devlink_fmsg *fmsg,</div><div class='add'>+			    struct genl_info *info,</div><div class='add'>+			    enum devlink_command cmd, int flags)</div><div class='add'>+{</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool last = false;</div><div class='add'>+	int index = 0;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return fmsg-&gt;err;</div><div class='add'>+</div><div class='add'>+	while (!last) {</div><div class='add'>+		int tmp_index = index;</div><div class='add'>+</div><div class='add'>+		skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+				  &amp;devlink_nl_family, flags | NLM_F_MULTI, cmd);</div><div class='add'>+		if (!hdr) {</div><div class='add'>+			err = -EMSGSIZE;</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = devlink_fmsg_prepare_skb(fmsg, skb, &amp;index);</div><div class='add'>+		if (!err)</div><div class='add'>+			last = true;</div><div class='add'>+		else if (err != -EMSGSIZE || tmp_index == index)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		genlmsg_end(skb, hdr);</div><div class='add'>+		err = genlmsg_reply(skb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_fmsg_dumpit(struct devlink_fmsg *fmsg, struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb,</div><div class='add'>+			       enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	int index = state-&gt;idx;</div><div class='add'>+	int tmp_index = index;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (fmsg-&gt;err)</div><div class='add'>+		return fmsg-&gt;err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;devlink_nl_family, NLM_F_ACK | NLM_F_MULTI, cmd);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_fmsg_prepare_skb(fmsg, skb, &amp;index);</div><div class='add'>+	if ((err &amp;&amp; err != -EMSGSIZE) || tmp_index == index)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	state-&gt;idx = index;</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,</div><div class='add'>+					     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	struct devlink_fmsg *fmsg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;diagnose)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	fmsg = devlink_fmsg_alloc();</div><div class='add'>+	if (!fmsg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_obj_nest_start(fmsg);</div><div class='add'>+</div><div class='add'>+	err = reporter-&gt;ops-&gt;diagnose(reporter, fmsg, info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_obj_nest_end(fmsg);</div><div class='add'>+</div><div class='add'>+	err = devlink_fmsg_snd(fmsg, info,</div><div class='add'>+			       DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE, 0);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	devlink_fmsg_free(fmsg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+devlink_health_reporter_get_from_cb_lock(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_get_from_attrs_lock(sock_net(cb-&gt;skb-&gt;sk), attrs,</div><div class='add'>+					      false);</div><div class='add'>+	if (IS_ERR(devlink))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_attrs(devlink, attrs);</div><div class='add'>+	if (!reporter) {</div><div class='add'>+		devl_unlock(devlink);</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+	}</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_cb_lock(cb);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	devlink = reporter-&gt;devlink;</div><div class='add'>+	if (!reporter-&gt;ops-&gt;dump) {</div><div class='add'>+		devl_unlock(devlink);</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;idx) {</div><div class='add'>+		err = devlink_health_do_dump(reporter, NULL, cb-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+		state-&gt;dump_ts = reporter-&gt;dump_ts;</div><div class='add'>+	}</div><div class='add'>+	if (!reporter-&gt;dump_fmsg || state-&gt;dump_ts != reporter-&gt;dump_ts) {</div><div class='add'>+		NL_SET_ERR_MSG(cb-&gt;extack, "Dump trampled, please retry");</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_fmsg_dumpit(reporter-&gt;dump_fmsg, skb, cb,</div><div class='add'>+				  DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET);</div><div class='add'>+unlock:</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,</div><div class='add'>+					       struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;dump)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	devlink_health_dump_clear(reporter);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,</div><div class='add'>+					 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_get_from_info(devlink, info);</div><div class='add'>+	if (!reporter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!reporter-&gt;ops-&gt;test)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return reporter-&gt;ops-&gt;test(reporter, info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_fmsg_dump_skb - Dump sk_buffer structure</div><div class='add'>+ * @fmsg: devlink formatted message pointer</div><div class='add'>+ * @skb: pointer to skb</div><div class='add'>+ *</div><div class='add'>+ * Dump diagnostic information about sk_buff structure, like headroom, length,</div><div class='add'>+ * tailroom, MAC, etc.</div><div class='add'>+ */</div><div class='add'>+void devlink_fmsg_dump_skb(struct devlink_fmsg *fmsg, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sh = skb_shinfo(skb);</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+	bool has_mac, has_trans;</div><div class='add'>+</div><div class='add'>+	has_mac = skb_mac_header_was_set(skb);</div><div class='add'>+	has_trans = skb_transport_header_was_set(skb);</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, "skb");</div><div class='add'>+	devlink_fmsg_obj_nest_start(fmsg);</div><div class='add'>+	devlink_fmsg_put(fmsg, "actual len", skb-&gt;len);</div><div class='add'>+	devlink_fmsg_put(fmsg, "head len", skb_headlen(skb));</div><div class='add'>+	devlink_fmsg_put(fmsg, "data len", skb-&gt;data_len);</div><div class='add'>+	devlink_fmsg_put(fmsg, "tail len", skb_tailroom(skb));</div><div class='add'>+	devlink_fmsg_put(fmsg, "MAC", has_mac ? skb-&gt;mac_header : -1);</div><div class='add'>+	devlink_fmsg_put(fmsg, "MAC len",</div><div class='add'>+			 has_mac ? skb_mac_header_len(skb) : -1);</div><div class='add'>+	devlink_fmsg_put(fmsg, "network hdr", skb-&gt;network_header);</div><div class='add'>+	devlink_fmsg_put(fmsg, "network hdr len",</div><div class='add'>+			 has_trans ? skb_network_header_len(skb) : -1);</div><div class='add'>+	devlink_fmsg_put(fmsg, "transport hdr",</div><div class='add'>+			 has_trans ? skb-&gt;transport_header : -1);</div><div class='add'>+	devlink_fmsg_put(fmsg, "csum", (__force u32)skb-&gt;csum);</div><div class='add'>+	devlink_fmsg_put(fmsg, "csum_ip_summed", (u8)skb-&gt;ip_summed);</div><div class='add'>+	devlink_fmsg_put(fmsg, "csum_complete_sw", !!skb-&gt;csum_complete_sw);</div><div class='add'>+	devlink_fmsg_put(fmsg, "csum_valid", !!skb-&gt;csum_valid);</div><div class='add'>+	devlink_fmsg_put(fmsg, "csum_level", (u8)skb-&gt;csum_level);</div><div class='add'>+	devlink_fmsg_put(fmsg, "sw_hash", !!skb-&gt;sw_hash);</div><div class='add'>+	devlink_fmsg_put(fmsg, "l4_hash", !!skb-&gt;l4_hash);</div><div class='add'>+	devlink_fmsg_put(fmsg, "proto", ntohs(skb-&gt;protocol));</div><div class='add'>+	devlink_fmsg_put(fmsg, "pkt_type", (u8)skb-&gt;pkt_type);</div><div class='add'>+	devlink_fmsg_put(fmsg, "iif", skb-&gt;skb_iif);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		devlink_fmsg_pair_nest_start(fmsg, "sk");</div><div class='add'>+		devlink_fmsg_obj_nest_start(fmsg);</div><div class='add'>+		devlink_fmsg_put(fmsg, "family", sk-&gt;sk_type);</div><div class='add'>+		devlink_fmsg_put(fmsg, "type", sk-&gt;sk_type);</div><div class='add'>+		devlink_fmsg_put(fmsg, "proto", sk-&gt;sk_protocol);</div><div class='add'>+		devlink_fmsg_obj_nest_end(fmsg);</div><div class='add'>+		devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_obj_nest_end(fmsg);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_pair_nest_start(fmsg, "shinfo");</div><div class='add'>+	devlink_fmsg_obj_nest_start(fmsg);</div><div class='add'>+	devlink_fmsg_put(fmsg, "tx_flags", sh-&gt;tx_flags);</div><div class='add'>+	devlink_fmsg_put(fmsg, "nr_frags", sh-&gt;nr_frags);</div><div class='add'>+	devlink_fmsg_put(fmsg, "gso_size", sh-&gt;gso_size);</div><div class='add'>+	devlink_fmsg_put(fmsg, "gso_type", sh-&gt;gso_type);</div><div class='add'>+	devlink_fmsg_put(fmsg, "gso_segs", sh-&gt;gso_segs);</div><div class='add'>+	devlink_fmsg_obj_nest_end(fmsg);</div><div class='add'>+	devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_fmsg_dump_skb);</div><div class='head'>diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c<br/>new file mode 100644<br/>index 000000000000..67f70a621d27<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/linecard.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/linecard.c</a></div><div class='hunk'>@@ -0,0 +1,628 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_linecard {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	const struct devlink_linecard_ops *ops;</div><div class='add'>+	void *priv;</div><div class='add'>+	enum devlink_linecard_state state;</div><div class='add'>+	struct mutex state_lock; /* Protects state */</div><div class='add'>+	const char *type;</div><div class='add'>+	struct devlink_linecard_type *types;</div><div class='add'>+	unsigned int types_count;</div><div class='add'>+	u32 rel_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+unsigned int devlink_linecard_index(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	return linecard-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_linecard *</div><div class='add'>+devlink_linecard_get_by_index(struct devlink *devlink,</div><div class='add'>+			      unsigned int linecard_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *devlink_linecard;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_linecard, &amp;devlink-&gt;linecard_list, list) {</div><div class='add'>+		if (devlink_linecard-&gt;index == linecard_index)</div><div class='add'>+			return devlink_linecard;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool devlink_linecard_index_exists(struct devlink *devlink,</div><div class='add'>+					  unsigned int linecard_index)</div><div class='add'>+{</div><div class='add'>+	return devlink_linecard_get_by_index(devlink, linecard_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_linecard *</div><div class='add'>+devlink_linecard_get_from_attrs(struct devlink *devlink, struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	if (attrs[DEVLINK_ATTR_LINECARD_INDEX]) {</div><div class='add'>+		u32 linecard_index = nla_get_u32(attrs[DEVLINK_ATTR_LINECARD_INDEX]);</div><div class='add'>+		struct devlink_linecard *linecard;</div><div class='add'>+</div><div class='add'>+		linecard = devlink_linecard_get_by_index(devlink, linecard_index);</div><div class='add'>+		if (!linecard)</div><div class='add'>+			return ERR_PTR(-ENODEV);</div><div class='add'>+		return linecard;</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_linecard *</div><div class='add'>+devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return devlink_linecard_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_linecard_type {</div><div class='add'>+	const char *type;</div><div class='add'>+	const void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int devlink_nl_linecard_fill(struct sk_buff *msg,</div><div class='add'>+				    struct devlink *devlink,</div><div class='add'>+				    struct devlink_linecard *linecard,</div><div class='add'>+				    enum devlink_command cmd, u32 portid,</div><div class='add'>+				    u32 seq, int flags,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard_type *linecard_type;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_LINECARD_INDEX, linecard-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_LINECARD_STATE, linecard-&gt;state))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (linecard-&gt;type &amp;&amp;</div><div class='add'>+	    nla_put_string(msg, DEVLINK_ATTR_LINECARD_TYPE, linecard-&gt;type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (linecard-&gt;types_count) {</div><div class='add'>+		attr = nla_nest_start(msg,</div><div class='add'>+				      DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES);</div><div class='add'>+		if (!attr)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		for (i = 0; i &lt; linecard-&gt;types_count; i++) {</div><div class='add'>+			linecard_type = &amp;linecard-&gt;types[i];</div><div class='add'>+			if (nla_put_string(msg, DEVLINK_ATTR_LINECARD_TYPE,</div><div class='add'>+					   linecard_type-&gt;type)) {</div><div class='add'>+				nla_nest_cancel(msg, attr);</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(msg, attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_rel_devlink_handle_put(msg, devlink,</div><div class='add'>+					   linecard-&gt;rel_index,</div><div class='add'>+					   DEVLINK_ATTR_NESTED_DEVLINK,</div><div class='add'>+					   NULL))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_linecard_notify(struct devlink_linecard *linecard,</div><div class='add'>+				    enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = linecard-&gt;devlink;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &amp;&amp;</div><div class='add'>+		cmd != DEVLINK_CMD_LINECARD_DEL);</div><div class='add'>+</div><div class='add'>+	if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_linecard_fill(msg, devlink, linecard, cmd, 0, 0, 0,</div><div class='add'>+				       NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_linecards_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(linecard, &amp;devlink-&gt;linecard_list, list)</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_linecards_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(linecard, &amp;devlink-&gt;linecard_list, list)</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_linecard_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	linecard = devlink_linecard_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(linecard))</div><div class='add'>+		return PTR_ERR(linecard);</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	err = devlink_nl_linecard_fill(msg, devlink, linecard,</div><div class='add'>+				       DEVLINK_CMD_LINECARD_NEW,</div><div class='add'>+				       info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+				       info-&gt;extack);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_linecard_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					    struct devlink *devlink,</div><div class='add'>+					    struct netlink_callback *cb,</div><div class='add'>+					    int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(linecard, &amp;devlink-&gt;linecard_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+		err = devlink_nl_linecard_fill(msg, devlink, linecard,</div><div class='add'>+					       DEVLINK_CMD_LINECARD_NEW,</div><div class='add'>+					       NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					       cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+					       cb-&gt;extack);</div><div class='add'>+		mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_linecard_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_linecard_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_linecard_type *</div><div class='add'>+devlink_linecard_type_lookup(struct devlink_linecard *linecard,</div><div class='add'>+			     const char *type)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard_type *linecard_type;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; linecard-&gt;types_count; i++) {</div><div class='add'>+		linecard_type = &amp;linecard-&gt;types[i];</div><div class='add'>+		if (!strcmp(type, linecard_type-&gt;type))</div><div class='add'>+			return linecard_type;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_linecard_type_set(struct devlink_linecard *linecard,</div><div class='add'>+				     const char *type,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_linecard_ops *ops = linecard-&gt;ops;</div><div class='add'>+	struct devlink_linecard_type *linecard_type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_PROVISIONING) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card is currently being provisioned");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_UNPROVISIONING) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card is currently being unprovisioned");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	linecard_type = devlink_linecard_type_lookup(linecard, type);</div><div class='add'>+	if (!linecard_type) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported line card type provided");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (linecard-&gt;state != DEVLINK_LINECARD_STATE_UNPROVISIONED &amp;&amp;</div><div class='add'>+	    linecard-&gt;state != DEVLINK_LINECARD_STATE_PROVISIONING_FAILED) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card already provisioned");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		/* Check if the line card is provisioned in the same</div><div class='add'>+		 * way the user asks. In case it is, make the operation</div><div class='add'>+		 * to return success.</div><div class='add'>+		 */</div><div class='add'>+		if (ops-&gt;same_provision &amp;&amp;</div><div class='add'>+		    ops-&gt;same_provision(linecard, linecard-&gt;priv,</div><div class='add'>+					linecard_type-&gt;type,</div><div class='add'>+					linecard_type-&gt;priv))</div><div class='add'>+			err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_PROVISIONING;</div><div class='add'>+	linecard-&gt;type = linecard_type-&gt;type;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	err = ops-&gt;provision(linecard, linecard-&gt;priv, linecard_type-&gt;type,</div><div class='add'>+			     linecard_type-&gt;priv, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Provisioning failed. Assume the linecard is unprovisioned</div><div class='add'>+		 * for future operations.</div><div class='add'>+		 */</div><div class='add'>+		mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+		linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONED;</div><div class='add'>+		linecard-&gt;type = NULL;</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+		mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_linecard_type_unset(struct devlink_linecard *linecard,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_PROVISIONING) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card is currently being provisioned");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_UNPROVISIONING) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card is currently being unprovisioned");</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_PROVISIONING_FAILED) {</div><div class='add'>+		linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONED;</div><div class='add'>+		linecard-&gt;type = NULL;</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (linecard-&gt;state == DEVLINK_LINECARD_STATE_UNPROVISIONED) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Line card is not provisioned");</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONING;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	err = linecard-&gt;ops-&gt;unprovision(linecard, linecard-&gt;priv,</div><div class='add'>+					 extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Unprovisioning failed. Assume the linecard is unprovisioned</div><div class='add'>+		 * for future operations.</div><div class='add'>+		 */</div><div class='add'>+		mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+		linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONED;</div><div class='add'>+		linecard-&gt;type = NULL;</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+		mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	linecard = devlink_linecard_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(linecard))</div><div class='add'>+		return PTR_ERR(linecard);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_LINECARD_TYPE]) {</div><div class='add'>+		const char *type;</div><div class='add'>+</div><div class='add'>+		type = nla_data(info-&gt;attrs[DEVLINK_ATTR_LINECARD_TYPE]);</div><div class='add'>+		if (strcmp(type, "")) {</div><div class='add'>+			err = devlink_linecard_type_set(linecard, type, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			err = devlink_linecard_type_unset(linecard, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_linecard_types_init(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard_type *linecard_type;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	count = linecard-&gt;ops-&gt;types_count(linecard, linecard-&gt;priv);</div><div class='add'>+	linecard-&gt;types = kmalloc_array(count, sizeof(*linecard_type),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!linecard-&gt;types)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	linecard-&gt;types_count = count;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		linecard_type = &amp;linecard-&gt;types[i];</div><div class='add'>+		linecard-&gt;ops-&gt;types_get(linecard, linecard-&gt;priv, i,</div><div class='add'>+					 &amp;linecard_type-&gt;type,</div><div class='add'>+					 &amp;linecard_type-&gt;priv);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_linecard_types_fini(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	kfree(linecard-&gt;types);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_linecard_create - Create devlink linecard</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@linecard_index: driver-specific numerical identifier of the linecard</div><div class='add'>+ *	@ops: linecards ops</div><div class='add'>+ *	@priv: user priv pointer</div><div class='add'>+ *</div><div class='add'>+ *	Create devlink linecard instance with provided linecard index.</div><div class='add'>+ *	Caller can use any indexing, even hw-related one.</div><div class='add'>+ *</div><div class='add'>+ *	Return: Line card structure or an ERR_PTR() encoded error code.</div><div class='add'>+ */</div><div class='add'>+struct devlink_linecard *</div><div class='add'>+devl_linecard_create(struct devlink *devlink, unsigned int linecard_index,</div><div class='add'>+		     const struct devlink_linecard_ops *ops, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ops || !ops-&gt;provision || !ops-&gt;unprovision ||</div><div class='add'>+		    !ops-&gt;types_count || !ops-&gt;types_get))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (devlink_linecard_index_exists(devlink, linecard_index))</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+</div><div class='add'>+	linecard = kzalloc(sizeof(*linecard), GFP_KERNEL);</div><div class='add'>+	if (!linecard)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	linecard-&gt;devlink = devlink;</div><div class='add'>+	linecard-&gt;index = linecard_index;</div><div class='add'>+	linecard-&gt;ops = ops;</div><div class='add'>+	linecard-&gt;priv = priv;</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONED;</div><div class='add'>+	mutex_init(&amp;linecard-&gt;state_lock);</div><div class='add'>+</div><div class='add'>+	err = devlink_linecard_types_init(linecard);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_destroy(&amp;linecard-&gt;state_lock);</div><div class='add'>+		kfree(linecard);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;linecard-&gt;list, &amp;devlink-&gt;linecard_list);</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	return linecard;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_linecard_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_linecard_destroy - Destroy devlink linecard</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ */</div><div class='add'>+void devl_linecard_destroy(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_DEL);</div><div class='add'>+	list_del(&amp;linecard-&gt;list);</div><div class='add'>+	devlink_linecard_types_fini(linecard);</div><div class='add'>+	mutex_destroy(&amp;linecard-&gt;state_lock);</div><div class='add'>+	kfree(linecard);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_linecard_destroy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_provision_set - Set provisioning on linecard</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ *	@type: linecard type</div><div class='add'>+ *</div><div class='add'>+ *	This is either called directly from the provision() op call or</div><div class='add'>+ *	as a result of the provision() op call asynchronously.</div><div class='add'>+ */</div><div class='add'>+void devlink_linecard_provision_set(struct devlink_linecard *linecard,</div><div class='add'>+				    const char *type)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	WARN_ON(linecard-&gt;type &amp;&amp; strcmp(linecard-&gt;type, type));</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_PROVISIONED;</div><div class='add'>+	linecard-&gt;type = type;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_provision_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_provision_clear - Clear provisioning on linecard</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ *</div><div class='add'>+ *	This is either called directly from the unprovision() op call or</div><div class='add'>+ *	as a result of the unprovision() op call asynchronously.</div><div class='add'>+ */</div><div class='add'>+void devlink_linecard_provision_clear(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_UNPROVISIONED;</div><div class='add'>+	linecard-&gt;type = NULL;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_provision_clear);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_provision_fail - Fail provisioning on linecard</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ *</div><div class='add'>+ *	This is either called directly from the provision() op call or</div><div class='add'>+ *	as a result of the provision() op call asynchronously.</div><div class='add'>+ */</div><div class='add'>+void devlink_linecard_provision_fail(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_PROVISIONING_FAILED;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_provision_fail);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_activate - Set linecard active</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ */</div><div class='add'>+void devlink_linecard_activate(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	WARN_ON(linecard-&gt;state != DEVLINK_LINECARD_STATE_PROVISIONED);</div><div class='add'>+	linecard-&gt;state = DEVLINK_LINECARD_STATE_ACTIVE;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_activate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_deactivate - Set linecard inactive</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ */</div><div class='add'>+void devlink_linecard_deactivate(struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;linecard-&gt;state_lock);</div><div class='add'>+	switch (linecard-&gt;state) {</div><div class='add'>+	case DEVLINK_LINECARD_STATE_ACTIVE:</div><div class='add'>+		linecard-&gt;state = DEVLINK_LINECARD_STATE_PROVISIONED;</div><div class='add'>+		devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_LINECARD_STATE_UNPROVISIONING:</div><div class='add'>+		/* Line card is being deactivated as part</div><div class='add'>+		 * of unprovisioning flow.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;linecard-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_deactivate);</div><div class='add'>+</div><div class='add'>+static void devlink_linecard_rel_notify_cb(struct devlink *devlink,</div><div class='add'>+					   u32 linecard_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+</div><div class='add'>+	linecard = devlink_linecard_get_by_index(devlink, linecard_index);</div><div class='add'>+	if (!linecard)</div><div class='add'>+		return;</div><div class='add'>+	devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_linecard_rel_cleanup_cb(struct devlink *devlink,</div><div class='add'>+					    u32 linecard_index, u32 rel_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_linecard *linecard;</div><div class='add'>+</div><div class='add'>+	linecard = devlink_linecard_get_by_index(devlink, linecard_index);</div><div class='add'>+	if (linecard &amp;&amp; linecard-&gt;rel_index == rel_index)</div><div class='add'>+		linecard-&gt;rel_index = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_linecard_nested_dl_set - Attach/detach nested devlink</div><div class='add'>+ *					 instance to linecard.</div><div class='add'>+ *</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ *	@nested_devlink: devlink instance to attach or NULL to detach</div><div class='add'>+ */</div><div class='add'>+int devlink_linecard_nested_dl_set(struct devlink_linecard *linecard,</div><div class='add'>+				   struct devlink *nested_devlink)</div><div class='add'>+{</div><div class='add'>+	return devlink_rel_nested_in_add(&amp;linecard-&gt;rel_index,</div><div class='add'>+					 linecard-&gt;devlink-&gt;index,</div><div class='add'>+					 linecard-&gt;index,</div><div class='add'>+					 devlink_linecard_rel_notify_cb,</div><div class='add'>+					 devlink_linecard_rel_cleanup_cb,</div><div class='add'>+					 nested_devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_linecard_nested_dl_set);</div><div class='head'>diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c<br/>new file mode 100644<br/>index 000000000000..593605c1b1ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,376 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+#define DEVLINK_NL_FLAG_NEED_PORT		BIT(0)</div><div class='add'>+#define DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT	BIT(1)</div><div class='add'>+#define DEVLINK_NL_FLAG_NEED_DEV_LOCK		BIT(2)</div><div class='add'>+</div><div class='add'>+static const struct genl_multicast_group devlink_nl_mcgrps[] = {</div><div class='add'>+	[DEVLINK_MCGRP_CONFIG] = { .name = DEVLINK_GENL_MCGRP_CONFIG_NAME },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_nl_sock_priv {</div><div class='add'>+	struct devlink_obj_desc __rcu *flt;</div><div class='add'>+	spinlock_t flt_lock; /* Protects flt. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void devlink_nl_sock_priv_init(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_sock_priv *sk_priv = priv;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;sk_priv-&gt;flt_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_nl_sock_priv_destroy(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_sock_priv *sk_priv = priv;</div><div class='add'>+	struct devlink_obj_desc *flt;</div><div class='add'>+</div><div class='add'>+	flt = rcu_dereference_protected(sk_priv-&gt;flt, true);</div><div class='add'>+	kfree_rcu(flt, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_notify_filter_set_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_sock_priv *sk_priv;</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	struct devlink_obj_desc *flt;</div><div class='add'>+	size_t data_offset = 0;</div><div class='add'>+	size_t data_size = 0;</div><div class='add'>+	char *pos;</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_BUS_NAME])</div><div class='add'>+		data_size = size_add(data_size,</div><div class='add'>+				     nla_len(attrs[DEVLINK_ATTR_BUS_NAME]) + 1);</div><div class='add'>+	if (attrs[DEVLINK_ATTR_DEV_NAME])</div><div class='add'>+		data_size = size_add(data_size,</div><div class='add'>+				     nla_len(attrs[DEVLINK_ATTR_DEV_NAME]) + 1);</div><div class='add'>+</div><div class='add'>+	flt = kzalloc(size_add(sizeof(*flt), data_size), GFP_KERNEL);</div><div class='add'>+	if (!flt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pos = (char *) flt-&gt;data;</div><div class='add'>+	if (attrs[DEVLINK_ATTR_BUS_NAME]) {</div><div class='add'>+		data_offset += nla_strscpy(pos,</div><div class='add'>+					   attrs[DEVLINK_ATTR_BUS_NAME],</div><div class='add'>+					   data_size) + 1;</div><div class='add'>+		flt-&gt;bus_name = pos;</div><div class='add'>+		pos += data_offset;</div><div class='add'>+	}</div><div class='add'>+	if (attrs[DEVLINK_ATTR_DEV_NAME]) {</div><div class='add'>+		nla_strscpy(pos, attrs[DEVLINK_ATTR_DEV_NAME],</div><div class='add'>+			    data_size - data_offset);</div><div class='add'>+		flt-&gt;dev_name = pos;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		flt-&gt;port_index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+		flt-&gt;port_index_valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't attach empty filter. */</div><div class='add'>+	if (!flt-&gt;bus_name &amp;&amp; !flt-&gt;dev_name &amp;&amp; !flt-&gt;port_index_valid) {</div><div class='add'>+		kfree(flt);</div><div class='add'>+		flt = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_priv = genl_sk_priv_get(&amp;devlink_nl_family, NETLINK_CB(skb).sk);</div><div class='add'>+	if (IS_ERR(sk_priv)) {</div><div class='add'>+		kfree(flt);</div><div class='add'>+		return PTR_ERR(sk_priv);</div><div class='add'>+	}</div><div class='add'>+	spin_lock(&amp;sk_priv-&gt;flt_lock);</div><div class='add'>+	flt = rcu_replace_pointer(sk_priv-&gt;flt, flt,</div><div class='add'>+				  lockdep_is_held(&amp;sk_priv-&gt;flt_lock));</div><div class='add'>+	spin_unlock(&amp;sk_priv-&gt;flt_lock);</div><div class='add'>+	kfree_rcu(flt, rcu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool devlink_obj_desc_match(const struct devlink_obj_desc *desc,</div><div class='add'>+				   const struct devlink_obj_desc *flt)</div><div class='add'>+{</div><div class='add'>+	if (desc-&gt;bus_name &amp;&amp; flt-&gt;bus_name &amp;&amp;</div><div class='add'>+	    strcmp(desc-&gt;bus_name, flt-&gt;bus_name))</div><div class='add'>+		return false;</div><div class='add'>+	if (desc-&gt;dev_name &amp;&amp; flt-&gt;dev_name &amp;&amp;</div><div class='add'>+	    strcmp(desc-&gt;dev_name, flt-&gt;dev_name))</div><div class='add'>+		return false;</div><div class='add'>+	if (desc-&gt;port_index_valid &amp;&amp; flt-&gt;port_index_valid &amp;&amp;</div><div class='add'>+	    desc-&gt;port_index != flt-&gt;port_index)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct devlink_obj_desc *desc = data;</div><div class='add'>+	struct devlink_nl_sock_priv *sk_priv;</div><div class='add'>+	struct devlink_obj_desc *flt;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_priv = __genl_sk_priv_get(&amp;devlink_nl_family, dsk);</div><div class='add'>+	if (!IS_ERR_OR_NULL(sk_priv)) {</div><div class='add'>+		flt = rcu_dereference(sk_priv-&gt;flt);</div><div class='add'>+		if (flt)</div><div class='add'>+			ret = !devlink_obj_desc_match(desc, flt);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,</div><div class='add'>+				 struct devlink *devlink, int attrtype)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nested_attr;</div><div class='add'>+	struct net *devl_net;</div><div class='add'>+</div><div class='add'>+	nested_attr = nla_nest_start(msg, attrtype);</div><div class='add'>+	if (!nested_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	devl_net = read_pnet_rcu(&amp;devlink-&gt;_net);</div><div class='add'>+	if (!net_eq(net, devl_net)) {</div><div class='add'>+		int id = peernet2id_alloc(net, devl_net, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		if (nla_put_s32(msg, DEVLINK_ATTR_NETNS_ID, id))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	} else {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, nested_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, nested_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (*msg) {</div><div class='add'>+		err = genlmsg_reply(*msg, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	*msg = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!*msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink *</div><div class='add'>+devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs,</div><div class='add'>+			    bool dev_lock)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	unsigned long index;</div><div class='add'>+	char *busname;</div><div class='add'>+	char *devname;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_BUS_NAME] || !attrs[DEVLINK_ATTR_DEV_NAME])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	busname = nla_data(attrs[DEVLINK_ATTR_BUS_NAME]);</div><div class='add'>+	devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);</div><div class='add'>+</div><div class='add'>+	devlinks_xa_for_each_registered_get(net, index, devlink) {</div><div class='add'>+		if (strcmp(devlink-&gt;dev-&gt;bus-&gt;name, busname) == 0 &amp;&amp;</div><div class='add'>+		    strcmp(dev_name(devlink-&gt;dev), devname) == 0) {</div><div class='add'>+			devl_dev_lock(devlink, dev_lock);</div><div class='add'>+			if (devl_is_registered(devlink))</div><div class='add'>+				return devlink;</div><div class='add'>+			devl_dev_unlock(devlink, dev_lock);</div><div class='add'>+		}</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devlink_nl_pre_doit(struct sk_buff *skb, struct genl_info *info,</div><div class='add'>+				 u8 flags)</div><div class='add'>+{</div><div class='add'>+	bool dev_lock = flags &amp; DEVLINK_NL_FLAG_NEED_DEV_LOCK;</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_get_from_attrs_lock(genl_info_net(info), info-&gt;attrs,</div><div class='add'>+					      dev_lock);</div><div class='add'>+	if (IS_ERR(devlink))</div><div class='add'>+		return PTR_ERR(devlink);</div><div class='add'>+</div><div class='add'>+	info-&gt;user_ptr[0] = devlink;</div><div class='add'>+	if (flags &amp; DEVLINK_NL_FLAG_NEED_PORT) {</div><div class='add'>+		devlink_port = devlink_port_get_from_info(devlink, info);</div><div class='add'>+		if (IS_ERR(devlink_port)) {</div><div class='add'>+			err = PTR_ERR(devlink_port);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		info-&gt;user_ptr[1] = devlink_port;</div><div class='add'>+	} else if (flags &amp; DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT) {</div><div class='add'>+		devlink_port = devlink_port_get_from_info(devlink, info);</div><div class='add'>+		if (!IS_ERR(devlink_port))</div><div class='add'>+			info-&gt;user_ptr[1] = devlink_port;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	devl_dev_unlock(devlink, dev_lock);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_pre_doit(const struct genl_split_ops *ops,</div><div class='add'>+			struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return __devlink_nl_pre_doit(skb, info, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_pre_doit_port(const struct genl_split_ops *ops,</div><div class='add'>+			     struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return __devlink_nl_pre_doit(skb, info, DEVLINK_NL_FLAG_NEED_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,</div><div class='add'>+				 struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return __devlink_nl_pre_doit(skb, info, DEVLINK_NL_FLAG_NEED_DEV_LOCK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_pre_doit_port_optional(const struct genl_split_ops *ops,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return __devlink_nl_pre_doit(skb, info, DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_nl_post_doit(struct sk_buff *skb, struct genl_info *info,</div><div class='add'>+				   u8 flags)</div><div class='add'>+{</div><div class='add'>+	bool dev_lock = flags &amp; DEVLINK_NL_FLAG_NEED_DEV_LOCK;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	devlink = info-&gt;user_ptr[0];</div><div class='add'>+	devl_dev_unlock(devlink, dev_lock);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_nl_post_doit(const struct genl_split_ops *ops,</div><div class='add'>+			  struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	__devlink_nl_post_doit(skb, info, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+devlink_nl_post_doit_dev_lock(const struct genl_split_ops *ops,</div><div class='add'>+			      struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	__devlink_nl_post_doit(skb, info, DEVLINK_NL_FLAG_NEED_DEV_LOCK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_inst_single_dumpit(struct sk_buff *msg,</div><div class='add'>+					 struct netlink_callback *cb, int flags,</div><div class='add'>+					 devlink_nl_dump_one_func_t *dump_one,</div><div class='add'>+					 struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_get_from_attrs_lock(sock_net(msg-&gt;sk), attrs, false);</div><div class='add'>+	if (IS_ERR(devlink))</div><div class='add'>+		return PTR_ERR(devlink);</div><div class='add'>+	err = dump_one(msg, devlink, cb, flags | NLM_F_DUMP_FILTERED);</div><div class='add'>+</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+</div><div class='add'>+	if (err != -EMSGSIZE)</div><div class='add'>+		return err;</div><div class='add'>+	return msg-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_inst_iter_dumpit(struct sk_buff *msg,</div><div class='add'>+				       struct netlink_callback *cb, int flags,</div><div class='add'>+				       devlink_nl_dump_one_func_t *dump_one)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	while ((devlink = devlinks_xa_find_get(sock_net(msg-&gt;sk),</div><div class='add'>+					       &amp;state-&gt;instance))) {</div><div class='add'>+		devl_lock(devlink);</div><div class='add'>+</div><div class='add'>+		if (devl_is_registered(devlink))</div><div class='add'>+			err = dump_one(msg, devlink, cb, flags);</div><div class='add'>+		else</div><div class='add'>+			err = 0;</div><div class='add'>+</div><div class='add'>+		devl_unlock(devlink);</div><div class='add'>+		devlink_put(devlink);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		state-&gt;instance++;</div><div class='add'>+</div><div class='add'>+		/* restart sub-object walk for the next instance */</div><div class='add'>+		state-&gt;idx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err != -EMSGSIZE)</div><div class='add'>+		return err;</div><div class='add'>+	return msg-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb,</div><div class='add'>+		      devlink_nl_dump_one_func_t *dump_one)</div><div class='add'>+{</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	int flags = NLM_F_MULTI;</div><div class='add'>+</div><div class='add'>+	if (attrs &amp;&amp;</div><div class='add'>+	    (attrs[DEVLINK_ATTR_BUS_NAME] || attrs[DEVLINK_ATTR_DEV_NAME]))</div><div class='add'>+		return devlink_nl_inst_single_dumpit(msg, cb, flags, dump_one,</div><div class='add'>+						     attrs);</div><div class='add'>+	else</div><div class='add'>+		return devlink_nl_inst_iter_dumpit(msg, cb, flags, dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct genl_family devlink_nl_family __ro_after_init = {</div><div class='add'>+	.name		= DEVLINK_GENL_NAME,</div><div class='add'>+	.version	= DEVLINK_GENL_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='add'>+	.split_ops	= devlink_nl_ops,</div><div class='add'>+	.n_split_ops	= ARRAY_SIZE(devlink_nl_ops),</div><div class='add'>+	.resv_start_op	= DEVLINK_CMD_SELFTESTS_RUN + 1,</div><div class='add'>+	.mcgrps		= devlink_nl_mcgrps,</div><div class='add'>+	.n_mcgrps	= ARRAY_SIZE(devlink_nl_mcgrps),</div><div class='add'>+	.sock_priv_size		= sizeof(struct devlink_nl_sock_priv),</div><div class='add'>+	.sock_priv_init		= devlink_nl_sock_priv_init,</div><div class='add'>+	.sock_priv_destroy	= devlink_nl_sock_priv_destroy,</div><div class='add'>+};</div><div class='head'>diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c<br/>new file mode 100644<br/>index 000000000000..f4c61c2b4f22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/netlink_gen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/netlink_gen.c</a></div><div class='hunk'>@@ -0,0 +1,1287 @@</div><div class='add'>+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/devlink.yaml */</div><div class='add'>+/* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink_gen.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+/* Sparse enums validation callbacks */</div><div class='add'>+static int</div><div class='add'>+devlink_attr_param_type_validate(const struct nlattr *attr,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	switch (nla_get_u8(attr)) {</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U8:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U16:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U32:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_U64:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_STRING:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_FLAG:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_NUL_STRING:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case DEVLINK_VAR_ATTR_TYPE_BINARY:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	NL_SET_ERR_MSG_ATTR(extack, attr, "invalid enum value");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common nested types */</div><div class='add'>+const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN_ATTR_CAPS + 1] = {</div><div class='add'>+	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] = { .type = NLA_BINARY, },</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_STATE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_OPSTATE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_CAPS] = NLA_POLICY_BITFIELD32(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_RATE_TC_ATTR_BW + 1] = {</div><div class='add'>+	[DEVLINK_RATE_TC_ATTR_INDEX] = NLA_POLICY_MAX(NLA_U8, DEVLINK_RATE_TC_INDEX_MAX),</div><div class='add'>+	[DEVLINK_RATE_TC_ATTR_BW] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELFTEST_ID_FLASH + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_GET - do */</div><div class='add'>+static const struct nla_policy devlink_get_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_GET - do */</div><div class='add'>+static const struct nla_policy devlink_port_get_do_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_port_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_SET - do */</div><div class='add'>+static const struct nla_policy devlink_port_set_nl_policy[DEVLINK_ATTR_PORT_FUNCTION + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_TYPE] = NLA_POLICY_MAX(NLA_U16, 3),</div><div class='add'>+	[DEVLINK_ATTR_PORT_FUNCTION] = NLA_POLICY_NESTED(devlink_dl_port_function_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_NEW - do */</div><div class='add'>+static const struct nla_policy devlink_port_new_nl_policy[DEVLINK_ATTR_PORT_PCI_SF_NUMBER + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_FLAVOUR] = NLA_POLICY_MAX(NLA_U16, 7),</div><div class='add'>+	[DEVLINK_ATTR_PORT_PCI_PF_NUMBER] = { .type = NLA_U16, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_PCI_SF_NUMBER] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_CONTROLLER_NUMBER] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_DEL - do */</div><div class='add'>+static const struct nla_policy devlink_port_del_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_SPLIT - do */</div><div class='add'>+static const struct nla_policy devlink_port_split_nl_policy[DEVLINK_ATTR_PORT_SPLIT_COUNT + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_SPLIT_COUNT] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_UNSPLIT - do */</div><div class='add'>+static const struct nla_policy devlink_port_unsplit_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_GET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_get_do_nl_policy[DEVLINK_ATTR_SB_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_sb_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_POOL_GET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_pool_get_do_nl_policy[DEVLINK_ATTR_SB_POOL_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_POOL_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_sb_pool_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_POOL_SET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_pool_set_nl_policy[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_SIZE] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_PORT_POOL_GET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_port_pool_get_do_nl_policy[DEVLINK_ATTR_SB_POOL_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_PORT_POOL_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_sb_port_pool_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_PORT_POOL_SET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_port_pool_set_nl_policy[DEVLINK_ATTR_SB_THRESHOLD + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16, },</div><div class='add'>+	[DEVLINK_ATTR_SB_THRESHOLD] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_TC_POOL_BIND_GET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_tc_pool_bind_get_do_nl_policy[DEVLINK_ATTR_SB_TC_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_TYPE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[DEVLINK_ATTR_SB_TC_INDEX] = { .type = NLA_U16, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_TC_POOL_BIND_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_sb_tc_pool_bind_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_TC_POOL_BIND_SET - do */</div><div class='add'>+static const struct nla_policy devlink_sb_tc_pool_bind_set_nl_policy[DEVLINK_ATTR_SB_TC_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16, },</div><div class='add'>+	[DEVLINK_ATTR_SB_POOL_TYPE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[DEVLINK_ATTR_SB_TC_INDEX] = { .type = NLA_U16, },</div><div class='add'>+	[DEVLINK_ATTR_SB_THRESHOLD] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_OCC_SNAPSHOT - do */</div><div class='add'>+static const struct nla_policy devlink_sb_occ_snapshot_nl_policy[DEVLINK_ATTR_SB_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SB_OCC_MAX_CLEAR - do */</div><div class='add'>+static const struct nla_policy devlink_sb_occ_max_clear_nl_policy[DEVLINK_ATTR_SB_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_ESWITCH_GET - do */</div><div class='add'>+static const struct nla_policy devlink_eswitch_get_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_ESWITCH_SET - do */</div><div class='add'>+static const struct nla_policy devlink_eswitch_set_nl_policy[DEVLINK_ATTR_ESWITCH_ENCAP_MODE + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_ESWITCH_MODE] = NLA_POLICY_MAX(NLA_U16, 2),</div><div class='add'>+	[DEVLINK_ATTR_ESWITCH_INLINE_MODE] = NLA_POLICY_MAX(NLA_U8, 3),</div><div class='add'>+	[DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_DPIPE_TABLE_GET - do */</div><div class='add'>+static const struct nla_policy devlink_dpipe_table_get_nl_policy[DEVLINK_ATTR_DPIPE_TABLE_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_DPIPE_ENTRIES_GET - do */</div><div class='add'>+static const struct nla_policy devlink_dpipe_entries_get_nl_policy[DEVLINK_ATTR_DPIPE_TABLE_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_DPIPE_HEADERS_GET - do */</div><div class='add'>+static const struct nla_policy devlink_dpipe_headers_get_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET - do */</div><div class='add'>+static const struct nla_policy devlink_dpipe_table_counters_set_nl_policy[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED] = { .type = NLA_U8, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RESOURCE_SET - do */</div><div class='add'>+static const struct nla_policy devlink_resource_set_nl_policy[DEVLINK_ATTR_RESOURCE_SIZE + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RESOURCE_ID] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_RESOURCE_SIZE] = { .type = NLA_U64, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RESOURCE_DUMP - do */</div><div class='add'>+static const struct nla_policy devlink_resource_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RELOAD - do */</div><div class='add'>+static const struct nla_policy devlink_reload_nl_policy[DEVLINK_ATTR_RELOAD_LIMITS + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RELOAD_ACTION] = NLA_POLICY_RANGE(NLA_U8, 1, 2),</div><div class='add'>+	[DEVLINK_ATTR_RELOAD_LIMITS] = NLA_POLICY_BITFIELD32(6),</div><div class='add'>+	[DEVLINK_ATTR_NETNS_PID] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_NETNS_FD] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_NETNS_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PARAM_GET - do */</div><div class='add'>+static const struct nla_policy devlink_param_get_do_nl_policy[DEVLINK_ATTR_PARAM_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PARAM_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PARAM_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_param_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PARAM_SET - do */</div><div class='add'>+static const struct nla_policy devlink_param_set_nl_policy[DEVLINK_ATTR_PARAM_RESET_DEFAULT + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PARAM_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PARAM_TYPE] = NLA_POLICY_VALIDATE_FN(NLA_U8, &amp;devlink_attr_param_type_validate),</div><div class='add'>+	[DEVLINK_ATTR_PARAM_VALUE_CMODE] = NLA_POLICY_MAX(NLA_U8, 2),</div><div class='add'>+	[DEVLINK_ATTR_PARAM_RESET_DEFAULT] = { .type = NLA_FLAG, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_REGION_GET - do */</div><div class='add'>+static const struct nla_policy devlink_region_get_do_nl_policy[DEVLINK_ATTR_REGION_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_REGION_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_region_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_REGION_NEW - do */</div><div class='add'>+static const struct nla_policy devlink_region_new_nl_policy[DEVLINK_ATTR_REGION_SNAPSHOT_ID + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_REGION_DEL - do */</div><div class='add'>+static const struct nla_policy devlink_region_del_nl_policy[DEVLINK_ATTR_REGION_SNAPSHOT_ID + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_REGION_READ - dump */</div><div class='add'>+static const struct nla_policy devlink_region_read_nl_policy[DEVLINK_ATTR_REGION_DIRECT + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_DIRECT] = { .type = NLA_FLAG, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_CHUNK_ADDR] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_REGION_CHUNK_LEN] = { .type = NLA_U64, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_PARAM_GET - do */</div><div class='add'>+static const struct nla_policy devlink_port_param_get_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_PORT_PARAM_SET - do */</div><div class='add'>+static const struct nla_policy devlink_port_param_set_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_INFO_GET - do */</div><div class='add'>+static const struct nla_policy devlink_info_get_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_GET - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_get_do_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_get_dump_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_SET - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_set_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] = { .type = NLA_U8, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP] = { .type = NLA_U8, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD] = { .type = NLA_U64, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_RECOVER - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_recover_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_diagnose_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_dump_get_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_dump_clear_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_FLASH_UPDATE - do */</div><div class='add'>+static const struct nla_policy devlink_flash_update_nl_policy[DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK] = NLA_POLICY_BITFIELD32(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_GET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_get_do_nl_policy[DEVLINK_ATTR_TRAP_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_trap_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_SET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_set_nl_policy[DEVLINK_ATTR_TRAP_ACTION + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_ACTION] = NLA_POLICY_MAX(NLA_U8, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_GROUP_GET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_group_get_do_nl_policy[DEVLINK_ATTR_TRAP_GROUP_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_GROUP_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_GROUP_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_trap_group_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_GROUP_SET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_group_set_nl_policy[DEVLINK_ATTR_TRAP_POLICER_ID + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_GROUP_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_ACTION] = NLA_POLICY_MAX(NLA_U8, 2),</div><div class='add'>+	[DEVLINK_ATTR_TRAP_POLICER_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_POLICER_GET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_policer_get_do_nl_policy[DEVLINK_ATTR_TRAP_POLICER_ID + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_POLICER_ID] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_POLICER_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_trap_policer_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_TRAP_POLICER_SET - do */</div><div class='add'>+static const struct nla_policy devlink_trap_policer_set_nl_policy[DEVLINK_ATTR_TRAP_POLICER_BURST + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_POLICER_ID] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_POLICER_RATE] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_TRAP_POLICER_BURST] = { .type = NLA_U64, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_HEALTH_REPORTER_TEST - do */</div><div class='add'>+static const struct nla_policy devlink_health_reporter_test_nl_policy[DEVLINK_ATTR_HEALTH_REPORTER_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RATE_GET - do */</div><div class='add'>+static const struct nla_policy devlink_rate_get_do_nl_policy[DEVLINK_ATTR_RATE_NODE_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RATE_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_rate_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RATE_SET - do */</div><div class='add'>+static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RATE_TC_BWS + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_SHARE] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_MAX] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_WEIGHT] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TC_BWS] = NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RATE_NEW - do */</div><div class='add'>+static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RATE_TC_BWS + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_SHARE] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_MAX] = { .type = NLA_U64, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TX_WEIGHT] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_TC_BWS] = NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_RATE_DEL - do */</div><div class='add'>+static const struct nla_policy devlink_rate_del_nl_policy[DEVLINK_ATTR_RATE_NODE_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_LINECARD_GET - do */</div><div class='add'>+static const struct nla_policy devlink_linecard_get_do_nl_policy[DEVLINK_ATTR_LINECARD_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_LINECARD_GET - dump */</div><div class='add'>+static const struct nla_policy devlink_linecard_get_dump_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_LINECARD_SET - do */</div><div class='add'>+static const struct nla_policy devlink_linecard_set_nl_policy[DEVLINK_ATTR_LINECARD_TYPE + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32, },</div><div class='add'>+	[DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SELFTESTS_GET - do */</div><div class='add'>+static const struct nla_policy devlink_selftests_get_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_SELFTESTS_RUN - do */</div><div class='add'>+static const struct nla_policy devlink_selftests_run_nl_policy[DEVLINK_ATTR_SELFTESTS + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_SELFTESTS] = NLA_POLICY_NESTED(devlink_dl_selftest_id_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */</div><div class='add'>+static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {</div><div class='add'>+	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ops table for devlink */</div><div class='add'>+const struct genl_split_ops devlink_nl_ops[74] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.dumpit		= devlink_nl_get_dumpit,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_GET,</div><div class='add'>+		.dumpit		= devlink_nl_port_get_dumpit,</div><div class='add'>+		.policy		= devlink_port_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_FUNCTION,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_NEW,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_port_new_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_new_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_PCI_SF_NUMBER,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_DEL,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_del_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_del_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_SPLIT,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_split_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_split_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_SPLIT_COUNT,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_UNSPLIT,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_unsplit_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_unsplit_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_sb_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_GET,</div><div class='add'>+		.dumpit		= devlink_nl_sb_get_dumpit,</div><div class='add'>+		.policy		= devlink_sb_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_POOL_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_sb_pool_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_pool_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_POOL_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_POOL_GET,</div><div class='add'>+		.dumpit		= devlink_nl_sb_pool_get_dumpit,</div><div class='add'>+		.policy		= devlink_sb_pool_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_POOL_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_sb_pool_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_pool_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_PORT_POOL_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_sb_port_pool_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_port_pool_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_POOL_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_PORT_POOL_GET,</div><div class='add'>+		.dumpit		= devlink_nl_sb_port_pool_get_dumpit,</div><div class='add'>+		.policy		= devlink_sb_port_pool_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_PORT_POOL_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_sb_port_pool_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_port_pool_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_THRESHOLD,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_TC_POOL_BIND_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_sb_tc_pool_bind_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_tc_pool_bind_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_TC_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_TC_POOL_BIND_GET,</div><div class='add'>+		.dumpit		= devlink_nl_sb_tc_pool_bind_get_dumpit,</div><div class='add'>+		.policy		= devlink_sb_tc_pool_bind_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_TC_POOL_BIND_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_sb_tc_pool_bind_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_tc_pool_bind_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_TC_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_OCC_SNAPSHOT,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_sb_occ_snapshot_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_occ_snapshot_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SB_OCC_MAX_CLEAR,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_sb_occ_max_clear_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_sb_occ_max_clear_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SB_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_ESWITCH_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_eswitch_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_eswitch_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_ESWITCH_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_eswitch_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_eswitch_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_ESWITCH_ENCAP_MODE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_DPIPE_TABLE_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_dpipe_table_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_dpipe_table_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DPIPE_TABLE_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_DPIPE_ENTRIES_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_dpipe_entries_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_dpipe_entries_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DPIPE_TABLE_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_DPIPE_HEADERS_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_dpipe_headers_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_dpipe_headers_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_dpipe_table_counters_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_dpipe_table_counters_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RESOURCE_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_resource_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_resource_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RESOURCE_SIZE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RESOURCE_DUMP,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_resource_dump_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_resource_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RELOAD,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_dev_lock,</div><div class='add'>+		.doit		= devlink_nl_reload_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit_dev_lock,</div><div class='add'>+		.policy		= devlink_reload_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RELOAD_LIMITS,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PARAM_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_param_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_param_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PARAM_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PARAM_GET,</div><div class='add'>+		.dumpit		= devlink_nl_param_get_dumpit,</div><div class='add'>+		.policy		= devlink_param_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PARAM_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_param_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_param_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PARAM_RESET_DEFAULT,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_REGION_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_region_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_region_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_REGION_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_REGION_GET,</div><div class='add'>+		.dumpit		= devlink_nl_region_get_dumpit,</div><div class='add'>+		.policy		= devlink_region_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_REGION_NEW,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_region_new_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_region_new_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_REGION_SNAPSHOT_ID,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_REGION_DEL,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_region_del_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_region_del_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_REGION_SNAPSHOT_ID,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_REGION_READ,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='add'>+		.dumpit		= devlink_nl_region_read_dumpit,</div><div class='add'>+		.policy		= devlink_region_read_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_REGION_DIRECT,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_PARAM_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_param_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_param_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_PARAM_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='add'>+		.dumpit		= devlink_nl_port_param_get_dumpit,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_PORT_PARAM_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port,</div><div class='add'>+		.doit		= devlink_nl_port_param_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_port_param_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_INFO_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_info_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_info_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_INFO_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.dumpit		= devlink_nl_info_get_dumpit,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_GET,</div><div class='add'>+		.dumpit		= devlink_nl_health_reporter_get_dumpit,</div><div class='add'>+		.policy		= devlink_health_reporter_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_RECOVER,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_recover_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_recover_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_diagnose_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_diagnose_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='add'>+		.dumpit		= devlink_nl_health_reporter_dump_get_dumpit,</div><div class='add'>+		.policy		= devlink_health_reporter_dump_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_dump_clear_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_dump_clear_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_FLASH_UPDATE,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_flash_update_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_flash_update_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_GET,</div><div class='add'>+		.dumpit		= devlink_nl_trap_get_dumpit,</div><div class='add'>+		.policy		= devlink_trap_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_ACTION,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_GROUP_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_group_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_group_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_GROUP_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_GROUP_GET,</div><div class='add'>+		.dumpit		= devlink_nl_trap_group_get_dumpit,</div><div class='add'>+		.policy		= devlink_trap_group_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_GROUP_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_group_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_group_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_POLICER_ID,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_POLICER_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_policer_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_policer_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_POLICER_ID,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_POLICER_GET,</div><div class='add'>+		.dumpit		= devlink_nl_trap_policer_get_dumpit,</div><div class='add'>+		.policy		= devlink_trap_policer_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_TRAP_POLICER_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_trap_policer_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_trap_policer_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_TRAP_POLICER_BURST,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_HEALTH_REPORTER_TEST,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit_port_optional,</div><div class='add'>+		.doit		= devlink_nl_health_reporter_test_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_health_reporter_test_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_HEALTH_REPORTER_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RATE_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_rate_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_rate_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RATE_NODE_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RATE_GET,</div><div class='add'>+		.dumpit		= devlink_nl_rate_get_dumpit,</div><div class='add'>+		.policy		= devlink_rate_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RATE_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_rate_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_rate_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RATE_TC_BWS,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RATE_NEW,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_rate_new_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_rate_new_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RATE_TC_BWS,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_RATE_DEL,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_rate_del_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_rate_del_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_RATE_NODE_NAME,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_LINECARD_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_linecard_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_linecard_get_do_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_LINECARD_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_LINECARD_GET,</div><div class='add'>+		.dumpit		= devlink_nl_linecard_get_dumpit,</div><div class='add'>+		.policy		= devlink_linecard_get_dump_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_LINECARD_SET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_linecard_set_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_linecard_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_LINECARD_TYPE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SELFTESTS_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_selftests_get_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_selftests_get_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_DEV_NAME,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SELFTESTS_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.dumpit		= devlink_nl_selftests_get_dumpit,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DUMP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_SELFTESTS_RUN,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT,</div><div class='add'>+		.pre_doit	= devlink_nl_pre_doit,</div><div class='add'>+		.doit		= devlink_nl_selftests_run_doit,</div><div class='add'>+		.post_doit	= devlink_nl_post_doit,</div><div class='add'>+		.policy		= devlink_selftests_run_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_SELFTESTS,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= DEVLINK_CMD_NOTIFY_FILTER_SET,</div><div class='add'>+		.doit		= devlink_nl_notify_filter_set_doit,</div><div class='add'>+		.policy		= devlink_notify_filter_set_nl_policy,</div><div class='add'>+		.maxattr	= DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/net/devlink/netlink_gen.h b/net/devlink/netlink_gen.h<br/>new file mode 100644<br/>index 000000000000..2817d53a0eba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/netlink_gen.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/netlink_gen.h</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/devlink.yaml */</div><div class='add'>+/* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_DEVLINK_GEN_H</div><div class='add'>+#define _LINUX_DEVLINK_GEN_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+/* Common nested types */</div><div class='add'>+extern const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN_ATTR_CAPS + 1];</div><div class='add'>+extern const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_RATE_TC_ATTR_BW + 1];</div><div class='add'>+extern const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELFTEST_ID_FLASH + 1];</div><div class='add'>+</div><div class='add'>+/* Ops table for devlink */</div><div class='add'>+extern const struct genl_split_ops devlink_nl_ops[74];</div><div class='add'>+</div><div class='add'>+int devlink_nl_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb,</div><div class='add'>+			struct genl_info *info);</div><div class='add'>+int devlink_nl_pre_doit_port(const struct genl_split_ops *ops,</div><div class='add'>+			     struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,</div><div class='add'>+				 struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_pre_doit_port_optional(const struct genl_split_ops *ops,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info);</div><div class='add'>+void</div><div class='add'>+devlink_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb,</div><div class='add'>+		     struct genl_info *info);</div><div class='add'>+void</div><div class='add'>+devlink_nl_post_doit_dev_lock(const struct genl_split_ops *ops,</div><div class='add'>+			      struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+int devlink_nl_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_port_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_get_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_sb_pool_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				  struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_port_pool_get_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_port_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_get_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					  struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb,</div><div class='add'>+				    struct genl_info *info);</div><div class='add'>+int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info);</div><div class='add'>+int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb,</div><div class='add'>+				    struct genl_info *info);</div><div class='add'>+int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info);</div><div class='add'>+int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info);</div><div class='add'>+int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,</div><div class='add'>+					     struct genl_info *info);</div><div class='add'>+int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_param_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_param_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_region_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_region_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				 struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_region_read_dumpit(struct sk_buff *skb,</div><div class='add'>+				  struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_port_param_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_port_param_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				     struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_port_param_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_info_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_info_get_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_health_reporter_get_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info);</div><div class='add'>+int devlink_nl_health_reporter_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					  struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info);</div><div class='add'>+int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,</div><div class='add'>+					    struct genl_info *info);</div><div class='add'>+int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,</div><div class='add'>+					     struct genl_info *info);</div><div class='add'>+int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,</div><div class='add'>+					       struct genl_info *info);</div><div class='add'>+int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_get_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_group_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_group_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				     struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_policer_get_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info);</div><div class='add'>+int devlink_nl_trap_policer_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_trap_policer_set_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info);</div><div class='add'>+int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,</div><div class='add'>+					 struct genl_info *info);</div><div class='add'>+int devlink_nl_rate_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_rate_get_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_linecard_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_linecard_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_selftests_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_selftests_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				    struct netlink_callback *cb);</div><div class='add'>+int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int devlink_nl_notify_filter_set_doit(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_DEVLINK_GEN_H */</div><div class='head'>diff --git a/net/devlink/param.c b/net/devlink/param.c<br/>new file mode 100644<br/>index 000000000000..e0ea93eded43<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/param.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/param.c</a></div><div class='hunk'>@@ -0,0 +1,950 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+static const struct devlink_param devlink_param_generic[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_INT_ERR_RESET_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_INT_ERR_RESET_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_MAX_MACS,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_MAX_MACS_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_MAX_MACS_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_SRIOV_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_SRIOV_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_IGNORE_ARI_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_IGNORE_ARI_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_RESET_DEV_ON_DRV_PROBE,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_RESET_DEV_ON_DRV_PROBE_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_RESET_DEV_ON_DRV_PROBE_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_ROCE_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_ROCE_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_REMOTE_DEV_RESET,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_REMOTE_DEV_RESET_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_REMOTE_DEV_RESET_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_ETH_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_ETH_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_RDMA_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_RDMA_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_IO_EQ_SIZE,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_IO_EQ_SIZE_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_IO_EQ_SIZE_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_EVENT_EQ_SIZE,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_EVENT_EQ_SIZE_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_EVENT_EQ_SIZE_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_ENABLE_PHC_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_ENABLE_PHC_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_CLOCK_ID,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_CLOCK_ID_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_CLOCK_ID_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_TOTAL_VFS,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_TOTAL_VFS_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_TOTAL_VFS_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_NUM_DOORBELLS,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_NUM_DOORBELLS_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_NUM_DOORBELLS_TYPE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = DEVLINK_PARAM_GENERIC_ID_MAX_MAC_PER_VF,</div><div class='add'>+		.name = DEVLINK_PARAM_GENERIC_MAX_MAC_PER_VF_NAME,</div><div class='add'>+		.type = DEVLINK_PARAM_GENERIC_MAX_MAC_PER_VF_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int devlink_param_generic_verify(const struct devlink_param *param)</div><div class='add'>+{</div><div class='add'>+	/* verify it match generic parameter by id and name */</div><div class='add'>+	if (param-&gt;id &gt; DEVLINK_PARAM_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (strcmp(param-&gt;name, devlink_param_generic[param-&gt;id].name))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	WARN_ON(param-&gt;type != devlink_param_generic[param-&gt;id].type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_driver_verify(const struct devlink_param *param)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (param-&gt;id &lt;= DEVLINK_PARAM_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* verify no such name in generic params */</div><div class='add'>+	for (i = 0; i &lt;= DEVLINK_PARAM_GENERIC_ID_MAX; i++)</div><div class='add'>+		if (!strcmp(param-&gt;name, devlink_param_generic[i].name))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_param_item *</div><div class='add'>+devlink_param_find_by_name(struct xarray *params, const char *param_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	unsigned long param_id;</div><div class='add'>+</div><div class='add'>+	xa_for_each(params, param_id, param_item) {</div><div class='add'>+		if (!strcmp(param_item-&gt;param-&gt;name, param_name))</div><div class='add'>+			return param_item;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_param_item *</div><div class='add'>+devlink_param_find_by_id(struct xarray *params, u32 param_id)</div><div class='add'>+{</div><div class='add'>+	return xa_load(params, param_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_param_cmode_is_supported(const struct devlink_param *param,</div><div class='add'>+				 enum devlink_param_cmode cmode)</div><div class='add'>+{</div><div class='add'>+	return test_bit(cmode, &amp;param-&gt;supported_cmodes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_get(struct devlink *devlink,</div><div class='add'>+			     const struct devlink_param *param,</div><div class='add'>+			     struct devlink_param_gset_ctx *ctx,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!param-&gt;get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return param-&gt;get(devlink, param-&gt;id, ctx, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_set(struct devlink *devlink,</div><div class='add'>+			     const struct devlink_param *param,</div><div class='add'>+			     struct devlink_param_gset_ctx *ctx,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!param-&gt;set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return param-&gt;set(devlink, param-&gt;id, ctx, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_get_default(struct devlink *devlink,</div><div class='add'>+				     const struct devlink_param *param,</div><div class='add'>+				     struct devlink_param_gset_ctx *ctx,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!param-&gt;get_default)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return param-&gt;get_default(devlink, param-&gt;id, ctx, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_reset_default(struct devlink *devlink,</div><div class='add'>+				       const struct devlink_param *param,</div><div class='add'>+				       enum devlink_param_cmode cmode,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!param-&gt;reset_default)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return param-&gt;reset_default(devlink, param-&gt;id, cmode, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_param_value_put(struct sk_buff *msg, enum devlink_param_type type,</div><div class='add'>+			   int nla_type, union devlink_param_value val,</div><div class='add'>+			   bool flag_as_u8)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U8:</div><div class='add'>+		if (nla_put_u8(msg, nla_type, val.vu8))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U16:</div><div class='add'>+		if (nla_put_u16(msg, nla_type, val.vu16))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U32:</div><div class='add'>+		if (nla_put_u32(msg, nla_type, val.vu32))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U64:</div><div class='add'>+		if (devlink_nl_put_u64(msg, nla_type, val.vu64))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_STRING:</div><div class='add'>+		if (nla_put_string(msg, nla_type, val.vstr))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_BOOL:</div><div class='add'>+		/* default values of type bool are encoded with u8, so that</div><div class='add'>+		 * false can be distinguished from not present</div><div class='add'>+		 */</div><div class='add'>+		if (flag_as_u8) {</div><div class='add'>+			if (nla_put_u8(msg, nla_type, val.vbool))</div><div class='add'>+				return -EMSGSIZE;</div><div class='add'>+		} else {</div><div class='add'>+			if (val.vbool &amp;&amp; nla_put_flag(msg, nla_type))</div><div class='add'>+				return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_param_value_fill_one(struct sk_buff *msg,</div><div class='add'>+				enum devlink_param_type type,</div><div class='add'>+				enum devlink_param_cmode cmode,</div><div class='add'>+				union devlink_param_value val,</div><div class='add'>+				union devlink_param_value default_val,</div><div class='add'>+				bool has_default)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *param_value_attr;</div><div class='add'>+	int err = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	param_value_attr = nla_nest_start_noflag(msg,</div><div class='add'>+						 DEVLINK_ATTR_PARAM_VALUE);</div><div class='add'>+	if (!param_value_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_PARAM_VALUE_CMODE, cmode))</div><div class='add'>+		goto value_nest_cancel;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_param_value_put(msg, type,</div><div class='add'>+					 DEVLINK_ATTR_PARAM_VALUE_DATA,</div><div class='add'>+					 val, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto value_nest_cancel;</div><div class='add'>+</div><div class='add'>+	if (has_default) {</div><div class='add'>+		err = devlink_nl_param_value_put(msg, type,</div><div class='add'>+						 DEVLINK_ATTR_PARAM_VALUE_DEFAULT,</div><div class='add'>+						 default_val, true);</div><div class='add'>+		if (err)</div><div class='add'>+			goto value_nest_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, param_value_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+value_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, param_value_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				 unsigned int port_index,</div><div class='add'>+				 struct devlink_param_item *param_item,</div><div class='add'>+				 enum devlink_command cmd,</div><div class='add'>+				 u32 portid, u32 seq, int flags,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	union devlink_param_value default_value[DEVLINK_PARAM_CMODE_MAX + 1];</div><div class='add'>+	union devlink_param_value param_value[DEVLINK_PARAM_CMODE_MAX + 1];</div><div class='add'>+	bool default_value_set[DEVLINK_PARAM_CMODE_MAX + 1] = {};</div><div class='add'>+	bool param_value_set[DEVLINK_PARAM_CMODE_MAX + 1] = {};</div><div class='add'>+	const struct devlink_param *param = param_item-&gt;param;</div><div class='add'>+	struct devlink_param_gset_ctx ctx;</div><div class='add'>+	struct nlattr *param_values_list;</div><div class='add'>+	struct nlattr *param_attr;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Get value from driver part to driverinit configuration mode */</div><div class='add'>+	for (i = 0; i &lt;= DEVLINK_PARAM_CMODE_MAX; i++) {</div><div class='add'>+		if (!devlink_param_cmode_is_supported(param, i))</div><div class='add'>+			continue;</div><div class='add'>+		if (i == DEVLINK_PARAM_CMODE_DRIVERINIT) {</div><div class='add'>+			if (param_item-&gt;driverinit_value_new_valid)</div><div class='add'>+				param_value[i] = param_item-&gt;driverinit_value_new;</div><div class='add'>+			else if (param_item-&gt;driverinit_value_valid)</div><div class='add'>+				param_value[i] = param_item-&gt;driverinit_value;</div><div class='add'>+			else</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+			if (param_item-&gt;driverinit_value_valid) {</div><div class='add'>+				default_value[i] = param_item-&gt;driverinit_default;</div><div class='add'>+				default_value_set[i] = true;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ctx.cmode = i;</div><div class='add'>+			err = devlink_param_get(devlink, param, &amp;ctx, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			param_value[i] = ctx.val;</div><div class='add'>+</div><div class='add'>+			err = devlink_param_get_default(devlink, param, &amp;ctx,</div><div class='add'>+							extack);</div><div class='add'>+			if (!err) {</div><div class='add'>+				default_value[i] = ctx.val;</div><div class='add'>+				default_value_set[i] = true;</div><div class='add'>+			} else if (err != -EOPNOTSUPP) {</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		param_value_set[i] = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+</div><div class='add'>+	if (cmd == DEVLINK_CMD_PORT_PARAM_GET ||</div><div class='add'>+	    cmd == DEVLINK_CMD_PORT_PARAM_NEW ||</div><div class='add'>+	    cmd == DEVLINK_CMD_PORT_PARAM_DEL)</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, port_index))</div><div class='add'>+			goto genlmsg_cancel;</div><div class='add'>+</div><div class='add'>+	param_attr = nla_nest_start_noflag(msg, DEVLINK_ATTR_PARAM);</div><div class='add'>+	if (!param_attr)</div><div class='add'>+		goto genlmsg_cancel;</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_PARAM_NAME, param-&gt;name))</div><div class='add'>+		goto param_nest_cancel;</div><div class='add'>+	if (param-&gt;generic &amp;&amp; nla_put_flag(msg, DEVLINK_ATTR_PARAM_GENERIC))</div><div class='add'>+		goto param_nest_cancel;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_PARAM_TYPE, param-&gt;type))</div><div class='add'>+		goto param_nest_cancel;</div><div class='add'>+</div><div class='add'>+	param_values_list = nla_nest_start_noflag(msg,</div><div class='add'>+						  DEVLINK_ATTR_PARAM_VALUES_LIST);</div><div class='add'>+	if (!param_values_list)</div><div class='add'>+		goto param_nest_cancel;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= DEVLINK_PARAM_CMODE_MAX; i++) {</div><div class='add'>+		if (!param_value_set[i])</div><div class='add'>+			continue;</div><div class='add'>+		err = devlink_nl_param_value_fill_one(msg, param-&gt;type,</div><div class='add'>+						      i, param_value[i],</div><div class='add'>+						      default_value[i],</div><div class='add'>+						      default_value_set[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			goto values_list_nest_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, param_values_list);</div><div class='add'>+	nla_nest_end(msg, param_attr);</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+values_list_nest_cancel:</div><div class='add'>+	nla_nest_end(msg, param_values_list);</div><div class='add'>+param_nest_cancel:</div><div class='add'>+	nla_nest_cancel(msg, param_attr);</div><div class='add'>+genlmsg_cancel:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_param_notify(struct devlink *devlink,</div><div class='add'>+				 unsigned int port_index,</div><div class='add'>+				 struct devlink_param_item *param_item,</div><div class='add'>+				 enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_PARAM_NEW &amp;&amp; cmd != DEVLINK_CMD_PARAM_DEL &amp;&amp;</div><div class='add'>+		cmd != DEVLINK_CMD_PORT_PARAM_NEW &amp;&amp;</div><div class='add'>+		cmd != DEVLINK_CMD_PORT_PARAM_DEL);</div><div class='add'>+</div><div class='add'>+	/* devlink_notify_register() / devlink_notify_unregister()</div><div class='add'>+	 * will replay the notifications if the params are added/removed</div><div class='add'>+	 * outside of the lifetime of the instance.</div><div class='add'>+	 */</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+	err = devlink_nl_param_fill(msg, devlink, port_index, param_item, cmd,</div><div class='add'>+				    0, 0, 0, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_params_notify(struct devlink *devlink,</div><div class='add'>+				  enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	unsigned long param_id;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;params, param_id, param_item)</div><div class='add'>+		devlink_param_notify(devlink, 0, param_item, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_params_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_params_notify(devlink, DEVLINK_CMD_PARAM_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_params_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_params_notify(devlink, DEVLINK_CMD_PARAM_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_param_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					 struct devlink *devlink,</div><div class='add'>+					 struct netlink_callback *cb,</div><div class='add'>+					 int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	unsigned long param_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	xa_for_each_start(&amp;devlink-&gt;params, param_id, param_item, state-&gt;idx) {</div><div class='add'>+		err = devlink_nl_param_fill(msg, devlink, 0, param_item,</div><div class='add'>+					    DEVLINK_CMD_PARAM_GET,</div><div class='add'>+					    NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					    cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+					    cb-&gt;extack);</div><div class='add'>+		if (err == -EOPNOTSUPP) {</div><div class='add'>+			err = 0;</div><div class='add'>+		} else if (err) {</div><div class='add'>+			state-&gt;idx = param_id;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_param_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_param_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_param_type_get_from_info(struct genl_info *info,</div><div class='add'>+				 enum devlink_param_type *param_type)</div><div class='add'>+{</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_PARAM_TYPE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*param_type = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_PARAM_TYPE]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_param_value_get_from_info(const struct devlink_param *param,</div><div class='add'>+				  struct genl_info *info,</div><div class='add'>+				  union devlink_param_value *value)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *param_data;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	param_data = info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_DATA];</div><div class='add'>+</div><div class='add'>+	if (param-&gt;type != DEVLINK_PARAM_TYPE_BOOL &amp;&amp; !param_data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (param-&gt;type) {</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U8:</div><div class='add'>+		if (nla_len(param_data) != sizeof(u8))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value-&gt;vu8 = nla_get_u8(param_data);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U16:</div><div class='add'>+		if (nla_len(param_data) != sizeof(u16))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value-&gt;vu16 = nla_get_u16(param_data);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U32:</div><div class='add'>+		if (nla_len(param_data) != sizeof(u32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value-&gt;vu32 = nla_get_u32(param_data);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_U64:</div><div class='add'>+		if (nla_len(param_data) != sizeof(u64))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value-&gt;vu64 = nla_get_u64(param_data);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_STRING:</div><div class='add'>+		len = strnlen(nla_data(param_data), nla_len(param_data));</div><div class='add'>+		if (len == nla_len(param_data) ||</div><div class='add'>+		    len &gt;= __DEVLINK_PARAM_MAX_STRING_VALUE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		strcpy(value-&gt;vstr, nla_data(param_data));</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PARAM_TYPE_BOOL:</div><div class='add'>+		if (param_data &amp;&amp; nla_len(param_data))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value-&gt;vbool = nla_get_flag(param_data);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_param_item *</div><div class='add'>+devlink_param_get_from_info(struct xarray *params, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	char *param_name;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_PARAM_NAME))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	param_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_PARAM_NAME]);</div><div class='add'>+	return devlink_param_find_by_name(params, param_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_param_get_doit(struct sk_buff *skb,</div><div class='add'>+			      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_get_from_info(&amp;devlink-&gt;params, info);</div><div class='add'>+	if (!param_item)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_param_fill(msg, devlink, 0, param_item,</div><div class='add'>+				    DEVLINK_CMD_PARAM_GET, info-&gt;snd_portid,</div><div class='add'>+				    info-&gt;snd_seq, 0, info-&gt;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devlink_nl_cmd_param_set_doit(struct devlink *devlink,</div><div class='add'>+					   unsigned int port_index,</div><div class='add'>+					   struct xarray *params,</div><div class='add'>+					   struct genl_info *info,</div><div class='add'>+					   enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	enum devlink_param_type param_type;</div><div class='add'>+	struct devlink_param_gset_ctx ctx;</div><div class='add'>+	enum devlink_param_cmode cmode;</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	const struct devlink_param *param;</div><div class='add'>+	union devlink_param_value value;</div><div class='add'>+	bool reset_default;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_get_from_info(params, info);</div><div class='add'>+	if (!param_item)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	param = param_item-&gt;param;</div><div class='add'>+	err = devlink_param_type_get_from_info(info, &amp;param_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (param_type != param-&gt;type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	reset_default = info-&gt;attrs[DEVLINK_ATTR_PARAM_RESET_DEFAULT];</div><div class='add'>+	if (!reset_default) {</div><div class='add'>+		err = devlink_param_value_get_from_info(param, info, &amp;value);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		if (param-&gt;validate) {</div><div class='add'>+			err = param-&gt;validate(devlink, param-&gt;id, value,</div><div class='add'>+					      info-&gt;extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_PARAM_VALUE_CMODE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cmode = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_PARAM_VALUE_CMODE]);</div><div class='add'>+	if (!devlink_param_cmode_is_supported(param, cmode))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (cmode == DEVLINK_PARAM_CMODE_DRIVERINIT) {</div><div class='add'>+		if (reset_default) {</div><div class='add'>+			if (!param_item-&gt;driverinit_value_valid) {</div><div class='add'>+				NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+					       "Default value not available");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			value = param_item-&gt;driverinit_default;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		param_item-&gt;driverinit_value_new = value;</div><div class='add'>+		param_item-&gt;driverinit_value_new_valid = true;</div><div class='add'>+	} else {</div><div class='add'>+		if (!param-&gt;set)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		ctx.val = value;</div><div class='add'>+		ctx.cmode = cmode;</div><div class='add'>+		if (reset_default)</div><div class='add'>+			err = devlink_param_reset_default(devlink, param, cmode,</div><div class='add'>+							  info-&gt;extack);</div><div class='add'>+		else</div><div class='add'>+			err = devlink_param_set(devlink, param, &amp;ctx,</div><div class='add'>+						info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_param_notify(devlink, port_index, param_item, cmd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	return __devlink_nl_cmd_param_set_doit(devlink, 0, &amp;devlink-&gt;params,</div><div class='add'>+					       info, DEVLINK_CMD_PARAM_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_param_get_dumpit(struct sk_buff *msg,</div><div class='add'>+				     struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG(cb-&gt;extack, "Port params are not supported");</div><div class='add'>+	return msg-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_param_get_doit(struct sk_buff *skb,</div><div class='add'>+				   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG(info-&gt;extack, "Port params are not supported");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_param_set_doit(struct sk_buff *skb,</div><div class='add'>+				   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG(info-&gt;extack, "Port params are not supported");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_verify(const struct devlink_param *param)</div><div class='add'>+{</div><div class='add'>+	if (!param || !param-&gt;name || !param-&gt;supported_cmodes)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (param-&gt;generic)</div><div class='add'>+		return devlink_param_generic_verify(param);</div><div class='add'>+	else</div><div class='add'>+		return devlink_param_driver_verify(param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_param_register(struct devlink *devlink,</div><div class='add'>+				  const struct devlink_param *param)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(devlink_param_verify(param));</div><div class='add'>+	WARN_ON(devlink_param_find_by_name(&amp;devlink-&gt;params, param-&gt;name));</div><div class='add'>+</div><div class='add'>+	if (param-&gt;supported_cmodes == BIT(DEVLINK_PARAM_CMODE_DRIVERINIT))</div><div class='add'>+		WARN_ON(param-&gt;get || param-&gt;set);</div><div class='add'>+	else</div><div class='add'>+		WARN_ON(!param-&gt;get || !param-&gt;set);</div><div class='add'>+</div><div class='add'>+	param_item = kzalloc(sizeof(*param_item), GFP_KERNEL);</div><div class='add'>+	if (!param_item)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	param_item-&gt;param = param;</div><div class='add'>+</div><div class='add'>+	err = xa_insert(&amp;devlink-&gt;params, param-&gt;id, param_item, GFP_KERNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_xa_insert;</div><div class='add'>+</div><div class='add'>+	devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_xa_insert:</div><div class='add'>+	kfree(param_item);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_param_unregister(struct devlink *devlink,</div><div class='add'>+				     const struct devlink_param *param)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_find_by_id(&amp;devlink-&gt;params, param-&gt;id);</div><div class='add'>+	if (WARN_ON(!param_item))</div><div class='add'>+		return;</div><div class='add'>+	devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_DEL);</div><div class='add'>+	xa_erase(&amp;devlink-&gt;params, param-&gt;id);</div><div class='add'>+	kfree(param_item);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_params_register - register configuration parameters</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@params: configuration parameters array</div><div class='add'>+ *	@params_count: number of parameters provided</div><div class='add'>+ *</div><div class='add'>+ *	Register the configuration parameters supported by the driver.</div><div class='add'>+ */</div><div class='add'>+int devl_params_register(struct devlink *devlink,</div><div class='add'>+			 const struct devlink_param *params,</div><div class='add'>+			 size_t params_count)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_param *param = params;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params_count; i++, param++) {</div><div class='add'>+		err = devlink_param_register(devlink, param);</div><div class='add'>+		if (err)</div><div class='add'>+			goto rollback;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	if (!i)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (param--; i &gt; 0; i--, param--)</div><div class='add'>+		devlink_param_unregister(devlink, param);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_params_register);</div><div class='add'>+</div><div class='add'>+int devlink_params_register(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_param *params,</div><div class='add'>+			    size_t params_count)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	err = devl_params_register(devlink, params, params_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_params_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_params_unregister - unregister configuration parameters</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@params: configuration parameters to unregister</div><div class='add'>+ *	@params_count: number of parameters provided</div><div class='add'>+ */</div><div class='add'>+void devl_params_unregister(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_param *params,</div><div class='add'>+			    size_t params_count)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_param *param = params;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params_count; i++, param++)</div><div class='add'>+		devlink_param_unregister(devlink, param);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_params_unregister);</div><div class='add'>+</div><div class='add'>+void devlink_params_unregister(struct devlink *devlink,</div><div class='add'>+			       const struct devlink_param *params,</div><div class='add'>+			       size_t params_count)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_params_unregister(devlink, params, params_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_params_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_param_driverinit_value_get - get configuration parameter</div><div class='add'>+ *					  value for driver initializing</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@param_id: parameter ID</div><div class='add'>+ *	@val: pointer to store the value of parameter in driverinit</div><div class='add'>+ *	      configuration mode</div><div class='add'>+ *</div><div class='add'>+ *	This function should be used by the driver to get driverinit</div><div class='add'>+ *	configuration for initialization after reload command.</div><div class='add'>+ *</div><div class='add'>+ *	Note that lockless call of this function relies on the</div><div class='add'>+ *	driver to maintain following basic sane behavior:</div><div class='add'>+ *	1) Driver ensures a call to this function cannot race with</div><div class='add'>+ *	   registering/unregistering the parameter with the same parameter ID.</div><div class='add'>+ *	2) Driver ensures a call to this function cannot race with</div><div class='add'>+ *	   devl_param_driverinit_value_set() call with the same parameter ID.</div><div class='add'>+ *	3) Driver ensures a call to this function cannot race with</div><div class='add'>+ *	   reload operation.</div><div class='add'>+ *	If the driver is not able to comply, it has to take the devlink-&gt;lock</div><div class='add'>+ *	while calling this.</div><div class='add'>+ */</div><div class='add'>+int devl_param_driverinit_value_get(struct devlink *devlink, u32 param_id,</div><div class='add'>+				    union devlink_param_value *val)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!devlink_reload_supported(devlink-&gt;ops)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_find_by_id(&amp;devlink-&gt;params, param_id);</div><div class='add'>+	if (!param_item)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!param_item-&gt;driverinit_value_valid)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!devlink_param_cmode_is_supported(param_item-&gt;param,</div><div class='add'>+						      DEVLINK_PARAM_CMODE_DRIVERINIT)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	*val = param_item-&gt;driverinit_value;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_param_driverinit_value_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_param_driverinit_value_set - set value of configuration</div><div class='add'>+ *					  parameter for driverinit</div><div class='add'>+ *					  configuration mode</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@param_id: parameter ID</div><div class='add'>+ *	@init_val: value of parameter to set for driverinit configuration mode</div><div class='add'>+ *</div><div class='add'>+ *	This function should be used by the driver to set driverinit</div><div class='add'>+ *	configuration mode default value.</div><div class='add'>+ */</div><div class='add'>+void devl_param_driverinit_value_set(struct devlink *devlink, u32 param_id,</div><div class='add'>+				     union devlink_param_value init_val)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_find_by_id(&amp;devlink-&gt;params, param_id);</div><div class='add'>+	if (WARN_ON(!param_item))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!devlink_param_cmode_is_supported(param_item-&gt;param,</div><div class='add'>+						      DEVLINK_PARAM_CMODE_DRIVERINIT)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	param_item-&gt;driverinit_value = init_val;</div><div class='add'>+	param_item-&gt;driverinit_value_valid = true;</div><div class='add'>+	param_item-&gt;driverinit_default = init_val;</div><div class='add'>+</div><div class='add'>+	devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_param_driverinit_value_set);</div><div class='add'>+</div><div class='add'>+void devlink_params_driverinit_load_new(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+	unsigned long param_id;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;params, param_id, param_item) {</div><div class='add'>+		if (!devlink_param_cmode_is_supported(param_item-&gt;param,</div><div class='add'>+						      DEVLINK_PARAM_CMODE_DRIVERINIT) ||</div><div class='add'>+		    !param_item-&gt;driverinit_value_new_valid)</div><div class='add'>+			continue;</div><div class='add'>+		param_item-&gt;driverinit_value = param_item-&gt;driverinit_value_new;</div><div class='add'>+		param_item-&gt;driverinit_value_valid = true;</div><div class='add'>+		param_item-&gt;driverinit_value_new_valid = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devl_param_value_changed - notify devlink on a parameter's value</div><div class='add'>+ *				   change. Should be called by the driver</div><div class='add'>+ *				   right after the change.</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@param_id: parameter ID</div><div class='add'>+ *</div><div class='add'>+ *	This function should be used by the driver to notify devlink on value</div><div class='add'>+ *	change, excluding driverinit configuration mode.</div><div class='add'>+ *	For driverinit configuration mode driver should use the function</div><div class='add'>+ */</div><div class='add'>+void devl_param_value_changed(struct devlink *devlink, u32 param_id)</div><div class='add'>+{</div><div class='add'>+	struct devlink_param_item *param_item;</div><div class='add'>+</div><div class='add'>+	param_item = devlink_param_find_by_id(&amp;devlink-&gt;params, param_id);</div><div class='add'>+	WARN_ON(!param_item);</div><div class='add'>+</div><div class='add'>+	devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_param_value_changed);</div><div class='head'>diff --git a/net/devlink/port.c b/net/devlink/port.c<br/>new file mode 100644<br/>index 000000000000..93d8a25bb920<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/port.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/port.c</a></div><div class='hunk'>@@ -0,0 +1,1604 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+#define DEVLINK_PORT_FN_CAPS_VALID_MASK \</div><div class='add'>+	(_BITUL(__DEVLINK_PORT_FN_ATTR_CAPS_MAX) - 1)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy devlink_function_nl_policy[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {</div><div class='add'>+	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] = { .type = NLA_BINARY },</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_STATE] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U8, DEVLINK_PORT_FN_STATE_INACTIVE,</div><div class='add'>+				 DEVLINK_PORT_FN_STATE_ACTIVE),</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_CAPS] =</div><div class='add'>+		NLA_POLICY_BITFIELD32(DEVLINK_PORT_FN_CAPS_VALID_MASK),</div><div class='add'>+	[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ASSERT_DEVLINK_PORT_REGISTERED(devlink_port)				\</div><div class='add'>+	WARN_ON_ONCE(!(devlink_port)-&gt;registered)</div><div class='add'>+#define ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port)			\</div><div class='add'>+	WARN_ON_ONCE((devlink_port)-&gt;registered)</div><div class='add'>+</div><div class='add'>+struct devlink_port *devlink_port_get_by_index(struct devlink *devlink,</div><div class='add'>+					       unsigned int port_index)</div><div class='add'>+{</div><div class='add'>+	return xa_load(&amp;devlink-&gt;ports, port_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_port *devlink_port_get_from_attrs(struct devlink *devlink,</div><div class='add'>+						 struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		u32 port_index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+		struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+		devlink_port = devlink_port_get_by_index(devlink, port_index);</div><div class='add'>+		if (!devlink_port)</div><div class='add'>+			return ERR_PTR(-ENODEV);</div><div class='add'>+		return devlink_port;</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_port *devlink_port_get_from_info(struct devlink *devlink,</div><div class='add'>+						struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return devlink_port_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_port_fn_cap_fill(struct nla_bitfield32 *caps,</div><div class='add'>+				     u32 cap, bool is_enable)</div><div class='add'>+{</div><div class='add'>+	caps-&gt;selector |= cap;</div><div class='add'>+	if (is_enable)</div><div class='add'>+		caps-&gt;value |= cap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_roce_fill(struct devlink_port *devlink_port,</div><div class='add'>+				     struct nla_bitfield32 *caps,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool is_enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_fn_roce_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_port-&gt;ops-&gt;port_fn_roce_get(devlink_port, &amp;is_enable,</div><div class='add'>+						  extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_fn_cap_fill(caps, DEVLINK_PORT_FN_CAP_ROCE, is_enable);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_migratable_fill(struct devlink_port *devlink_port,</div><div class='add'>+					   struct nla_bitfield32 *caps,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool is_enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_fn_migratable_get ||</div><div class='add'>+	    devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_port-&gt;ops-&gt;port_fn_migratable_get(devlink_port,</div><div class='add'>+							&amp;is_enable, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_fn_cap_fill(caps, DEVLINK_PORT_FN_CAP_MIGRATABLE, is_enable);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_ipsec_crypto_fill(struct devlink_port *devlink_port,</div><div class='add'>+					     struct nla_bitfield32 *caps,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool is_enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_fn_ipsec_crypto_get ||</div><div class='add'>+	    devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_port-&gt;ops-&gt;port_fn_ipsec_crypto_get(devlink_port, &amp;is_enable, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_fn_cap_fill(caps, DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO, is_enable);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_ipsec_packet_fill(struct devlink_port *devlink_port,</div><div class='add'>+					     struct nla_bitfield32 *caps,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool is_enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_fn_ipsec_packet_get ||</div><div class='add'>+	    devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_port-&gt;ops-&gt;port_fn_ipsec_packet_get(devlink_port, &amp;is_enable, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_fn_cap_fill(caps, DEVLINK_PORT_FN_CAP_IPSEC_PACKET, is_enable);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_caps_fill(struct devlink_port *devlink_port,</div><div class='add'>+				     struct sk_buff *msg,</div><div class='add'>+				     struct netlink_ext_ack *extack,</div><div class='add'>+				     bool *msg_updated)</div><div class='add'>+{</div><div class='add'>+	struct nla_bitfield32 caps = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_port_fn_roce_fill(devlink_port, &amp;caps, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_port_fn_migratable_fill(devlink_port, &amp;caps, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_port_fn_ipsec_crypto_fill(devlink_port, &amp;caps, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_port_fn_ipsec_packet_fill(devlink_port, &amp;caps, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!caps.selector)</div><div class='add'>+		return 0;</div><div class='add'>+	err = nla_put_bitfield32(msg, DEVLINK_PORT_FN_ATTR_CAPS, caps.value,</div><div class='add'>+				 caps.selector);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*msg_updated = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_max_io_eqs_fill(struct devlink_port *port,</div><div class='add'>+					   struct sk_buff *msg,</div><div class='add'>+					   struct netlink_ext_ack *extack,</div><div class='add'>+					   bool *msg_updated)</div><div class='add'>+{</div><div class='add'>+	u32 max_io_eqs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!port-&gt;ops-&gt;port_fn_max_io_eqs_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = port-&gt;ops-&gt;port_fn_max_io_eqs_get(port, &amp;max_io_eqs, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = nla_put_u32(msg, DEVLINK_PORT_FN_ATTR_MAX_IO_EQS, max_io_eqs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	*msg_updated = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_handle_fill(struct sk_buff *msg, struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink_port-&gt;devlink))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t devlink_nl_port_handle_size(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	return nla_total_size(strlen(devlink-&gt;dev-&gt;bus-&gt;name) + 1) /* DEVLINK_ATTR_BUS_NAME */</div><div class='add'>+	     + nla_total_size(strlen(dev_name(devlink-&gt;dev)) + 1) /* DEVLINK_ATTR_DEV_NAME */</div><div class='add'>+	     + nla_total_size(4); /* DEVLINK_ATTR_PORT_INDEX */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_port_attrs_put(struct sk_buff *msg,</div><div class='add'>+				     struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;attrs_set)</div><div class='add'>+		return 0;</div><div class='add'>+	if (attrs-&gt;lanes) {</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_LANES, attrs-&gt;lanes))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_PORT_SPLITTABLE, attrs-&gt;splittable))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_FLAVOUR, attrs-&gt;flavour))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	switch (devlink_port-&gt;attrs.flavour) {</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_PF:</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,</div><div class='add'>+				attrs-&gt;pci_pf.controller) ||</div><div class='add'>+		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs-&gt;pci_pf.pf))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs-&gt;pci_pf.external))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_VF:</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,</div><div class='add'>+				attrs-&gt;pci_vf.controller) ||</div><div class='add'>+		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs-&gt;pci_vf.pf) ||</div><div class='add'>+		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER, attrs-&gt;pci_vf.vf))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs-&gt;pci_vf.external))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_SF:</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,</div><div class='add'>+				attrs-&gt;pci_sf.controller) ||</div><div class='add'>+		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,</div><div class='add'>+				attrs-&gt;pci_sf.pf) ||</div><div class='add'>+		    nla_put_u32(msg, DEVLINK_ATTR_PORT_PCI_SF_NUMBER,</div><div class='add'>+				attrs-&gt;pci_sf.sf))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PHYSICAL:</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_CPU:</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_DSA:</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,</div><div class='add'>+				attrs-&gt;phys.port_number))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		if (!attrs-&gt;split)</div><div class='add'>+			return 0;</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP,</div><div class='add'>+				attrs-&gt;phys.port_number))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER,</div><div class='add'>+				attrs-&gt;phys.split_subport_number))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_hw_addr_fill(struct devlink_port *port,</div><div class='add'>+					struct sk_buff *msg,</div><div class='add'>+					struct netlink_ext_ack *extack,</div><div class='add'>+					bool *msg_updated)</div><div class='add'>+{</div><div class='add'>+	u8 hw_addr[MAX_ADDR_LEN];</div><div class='add'>+	int hw_addr_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!port-&gt;ops-&gt;port_fn_hw_addr_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = port-&gt;ops-&gt;port_fn_hw_addr_get(port, hw_addr, &amp;hw_addr_len,</div><div class='add'>+					     extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = nla_put(msg, DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR, hw_addr_len, hw_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	*msg_updated = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_port_fn_state_valid(enum devlink_port_fn_state state)</div><div class='add'>+{</div><div class='add'>+	return state == DEVLINK_PORT_FN_STATE_INACTIVE ||</div><div class='add'>+	       state == DEVLINK_PORT_FN_STATE_ACTIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_port_fn_opstate_valid(enum devlink_port_fn_opstate opstate)</div><div class='add'>+{</div><div class='add'>+	return opstate == DEVLINK_PORT_FN_OPSTATE_DETACHED ||</div><div class='add'>+	       opstate == DEVLINK_PORT_FN_OPSTATE_ATTACHED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_state_fill(struct devlink_port *port,</div><div class='add'>+				      struct sk_buff *msg,</div><div class='add'>+				      struct netlink_ext_ack *extack,</div><div class='add'>+				      bool *msg_updated)</div><div class='add'>+{</div><div class='add'>+	enum devlink_port_fn_opstate opstate;</div><div class='add'>+	enum devlink_port_fn_state state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!port-&gt;ops-&gt;port_fn_state_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = port-&gt;ops-&gt;port_fn_state_get(port, &amp;state, &amp;opstate, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (!devlink_port_fn_state_valid(state)) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid state read from driver");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!devlink_port_fn_opstate_valid(opstate)) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid operational state read from driver");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_PORT_FN_ATTR_STATE, state) ||</div><div class='add'>+	    nla_put_u8(msg, DEVLINK_PORT_FN_ATTR_OPSTATE, opstate))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	*msg_updated = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_port_fn_mig_set(struct devlink_port *devlink_port, bool enable,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_fn_migratable_set(devlink_port, enable,</div><div class='add'>+							 extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_port_fn_roce_set(struct devlink_port *devlink_port, bool enable,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_fn_roce_set(devlink_port, enable,</div><div class='add'>+						   extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_port_fn_ipsec_crypto_set(struct devlink_port *devlink_port, bool enable,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_fn_ipsec_crypto_set(devlink_port, enable, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_port_fn_ipsec_packet_set(struct devlink_port *devlink_port, bool enable,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_fn_ipsec_packet_set(devlink_port, enable, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_caps_set(struct devlink_port *devlink_port,</div><div class='add'>+				    const struct nlattr *attr,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nla_bitfield32 caps;</div><div class='add'>+	u32 caps_value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	caps = nla_get_bitfield32(attr);</div><div class='add'>+	caps_value = caps.value &amp; caps.selector;</div><div class='add'>+	if (caps.selector &amp; DEVLINK_PORT_FN_CAP_ROCE) {</div><div class='add'>+		err = devlink_port_fn_roce_set(devlink_port,</div><div class='add'>+					       caps_value &amp; DEVLINK_PORT_FN_CAP_ROCE,</div><div class='add'>+					       extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (caps.selector &amp; DEVLINK_PORT_FN_CAP_MIGRATABLE) {</div><div class='add'>+		err = devlink_port_fn_mig_set(devlink_port, caps_value &amp;</div><div class='add'>+					      DEVLINK_PORT_FN_CAP_MIGRATABLE,</div><div class='add'>+					      extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (caps.selector &amp; DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO) {</div><div class='add'>+		err = devlink_port_fn_ipsec_crypto_set(devlink_port, caps_value &amp;</div><div class='add'>+						       DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO,</div><div class='add'>+						       extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (caps.selector &amp; DEVLINK_PORT_FN_CAP_IPSEC_PACKET) {</div><div class='add'>+		err = devlink_port_fn_ipsec_packet_set(devlink_port, caps_value &amp;</div><div class='add'>+						       DEVLINK_PORT_FN_CAP_IPSEC_PACKET,</div><div class='add'>+						       extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_port_fn_max_io_eqs_set(struct devlink_port *devlink_port,</div><div class='add'>+			       const struct nlattr *attr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 max_io_eqs;</div><div class='add'>+</div><div class='add'>+	max_io_eqs = nla_get_u32(attr);</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_fn_max_io_eqs_set(devlink_port,</div><div class='add'>+							 max_io_eqs, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_port_function_attrs_put(struct sk_buff *msg, struct devlink_port *port,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *function_attr;</div><div class='add'>+	bool msg_updated = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	function_attr = nla_nest_start_noflag(msg, DEVLINK_ATTR_PORT_FUNCTION);</div><div class='add'>+	if (!function_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = devlink_port_fn_hw_addr_fill(port, msg, extack, &amp;msg_updated);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = devlink_port_fn_caps_fill(port, msg, extack, &amp;msg_updated);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = devlink_port_fn_state_fill(port, msg, extack, &amp;msg_updated);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = devlink_port_fn_max_io_eqs_fill(port, msg, extack, &amp;msg_updated);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = devlink_rel_devlink_handle_put(msg, port-&gt;devlink,</div><div class='add'>+					     port-&gt;rel_index,</div><div class='add'>+					     DEVLINK_PORT_FN_ATTR_DEVLINK,</div><div class='add'>+					     &amp;msg_updated);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (err || !msg_updated)</div><div class='add'>+		nla_nest_cancel(msg, function_attr);</div><div class='add'>+	else</div><div class='add'>+		nla_nest_end(msg, function_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_port_fill(struct sk_buff *msg,</div><div class='add'>+				struct devlink_port *devlink_port,</div><div class='add'>+				enum devlink_command cmd, u32 portid, u32 seq,</div><div class='add'>+				int flags, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_TYPE, devlink_port-&gt;type))</div><div class='add'>+		goto nla_put_failure_type_locked;</div><div class='add'>+	if (devlink_port-&gt;desired_type != DEVLINK_PORT_TYPE_NOTSET &amp;&amp;</div><div class='add'>+	    nla_put_u16(msg, DEVLINK_ATTR_PORT_DESIRED_TYPE,</div><div class='add'>+			devlink_port-&gt;desired_type))</div><div class='add'>+		goto nla_put_failure_type_locked;</div><div class='add'>+	if (devlink_port-&gt;type == DEVLINK_PORT_TYPE_ETH) {</div><div class='add'>+		if (devlink_port-&gt;type_eth.netdev &amp;&amp;</div><div class='add'>+		    (nla_put_u32(msg, DEVLINK_ATTR_PORT_NETDEV_IFINDEX,</div><div class='add'>+				 devlink_port-&gt;type_eth.ifindex) ||</div><div class='add'>+		     nla_put_string(msg, DEVLINK_ATTR_PORT_NETDEV_NAME,</div><div class='add'>+				    devlink_port-&gt;type_eth.ifname)))</div><div class='add'>+			goto nla_put_failure_type_locked;</div><div class='add'>+	}</div><div class='add'>+	if (devlink_port-&gt;type == DEVLINK_PORT_TYPE_IB) {</div><div class='add'>+		struct ib_device *ibdev = devlink_port-&gt;type_ib.ibdev;</div><div class='add'>+</div><div class='add'>+		if (ibdev &amp;&amp;</div><div class='add'>+		    nla_put_string(msg, DEVLINK_ATTR_PORT_IBDEV_NAME,</div><div class='add'>+				   ibdev-&gt;name))</div><div class='add'>+			goto nla_put_failure_type_locked;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+	if (devlink_nl_port_attrs_put(msg, devlink_port))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_nl_port_function_attrs_put(msg, devlink_port, extack))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_port-&gt;linecard &amp;&amp;</div><div class='add'>+	    nla_put_u32(msg, DEVLINK_ATTR_LINECARD_INDEX,</div><div class='add'>+			devlink_linecard_index(devlink_port-&gt;linecard)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure_type_locked:</div><div class='add'>+	spin_unlock_bh(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_port_notify(struct devlink_port *devlink_port,</div><div class='add'>+				enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+	struct devlink_obj_desc desc;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_PORT_NEW &amp;&amp; cmd != DEVLINK_CMD_PORT_DEL);</div><div class='add'>+</div><div class='add'>+	if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_port_fill(msg, devlink_port, cmd, 0, 0, 0, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_obj_desc_init(&amp;desc, devlink);</div><div class='add'>+	devlink_nl_obj_desc_port_set(&amp;desc, devlink_port);</div><div class='add'>+	devlink_nl_notify_send_desc(devlink, msg, &amp;desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_ports_notify(struct devlink *devlink,</div><div class='add'>+				 enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;ports, port_index, devlink_port)</div><div class='add'>+		devlink_port_notify(devlink_port, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_ports_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_ports_notify(devlink, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_ports_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_ports_notify(devlink, DEVLINK_CMD_PORT_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_PORT_NEW,</div><div class='add'>+				   info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+				   info-&gt;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			     struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	xa_for_each_start(&amp;devlink-&gt;ports, port_index, devlink_port, state-&gt;idx) {</div><div class='add'>+		err = devlink_nl_port_fill(msg, devlink_port,</div><div class='add'>+					   DEVLINK_CMD_PORT_NEW,</div><div class='add'>+					   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					   cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+					   cb-&gt;extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = port_index;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_port_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_type_set(struct devlink_port *devlink_port,</div><div class='add'>+				 enum devlink_port_type port_type)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_type_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (port_type == devlink_port-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_port-&gt;ops-&gt;port_type_set(devlink_port, port_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	devlink_port-&gt;desired_type = port_type;</div><div class='add'>+	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_function_hw_addr_set(struct devlink_port *port,</div><div class='add'>+					     const struct nlattr *attr,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const u8 *hw_addr;</div><div class='add'>+	int hw_addr_len;</div><div class='add'>+</div><div class='add'>+	hw_addr = nla_data(attr);</div><div class='add'>+	hw_addr_len = nla_len(attr);</div><div class='add'>+	if (hw_addr_len &gt; MAX_ADDR_LEN) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Port function hardware address too long");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (port-&gt;type == DEVLINK_PORT_TYPE_ETH) {</div><div class='add'>+		if (hw_addr_len != ETH_ALEN) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Address must be 6 bytes for Ethernet device");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!is_unicast_ether_addr(hw_addr)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Non-unicast hardware address unsupported");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return port-&gt;ops-&gt;port_fn_hw_addr_set(port, hw_addr, hw_addr_len,</div><div class='add'>+					      extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_fn_state_set(struct devlink_port *port,</div><div class='add'>+				     const struct nlattr *attr,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum devlink_port_fn_state state;</div><div class='add'>+</div><div class='add'>+	state = nla_get_u8(attr);</div><div class='add'>+	return port-&gt;ops-&gt;port_fn_state_set(port, state, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_function_validate(struct devlink_port *devlink_port,</div><div class='add'>+					  struct nlattr **tb,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_port_ops *ops = devlink_port-&gt;ops;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] &amp;&amp;</div><div class='add'>+	    !ops-&gt;port_fn_hw_addr_set) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR],</div><div class='add'>+				    "Port doesn't support function attributes");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (tb[DEVLINK_PORT_FN_ATTR_STATE] &amp;&amp; !ops-&gt;port_fn_state_set) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FN_ATTR_STATE],</div><div class='add'>+				    "Function does not support state setting");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	attr = tb[DEVLINK_PORT_FN_ATTR_CAPS];</div><div class='add'>+	if (attr) {</div><div class='add'>+		struct nla_bitfield32 caps;</div><div class='add'>+</div><div class='add'>+		caps = nla_get_bitfield32(attr);</div><div class='add'>+		if (caps.selector &amp; DEVLINK_PORT_FN_CAP_ROCE &amp;&amp;</div><div class='add'>+		    !ops-&gt;port_fn_roce_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+					    "Port doesn't support RoCE function attribute");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (caps.selector &amp; DEVLINK_PORT_FN_CAP_MIGRATABLE) {</div><div class='add'>+			if (!ops-&gt;port_fn_migratable_set) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "Port doesn't support migratable function attribute");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			if (devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "migratable function attribute supported for VFs only");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (caps.selector &amp; DEVLINK_PORT_FN_CAP_IPSEC_CRYPTO) {</div><div class='add'>+			if (!ops-&gt;port_fn_ipsec_crypto_set) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "Port doesn't support ipsec_crypto function attribute");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			if (devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "ipsec_crypto function attribute supported for VFs only");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (caps.selector &amp; DEVLINK_PORT_FN_CAP_IPSEC_PACKET) {</div><div class='add'>+			if (!ops-&gt;port_fn_ipsec_packet_set) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "Port doesn't support ipsec_packet function attribute");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			if (devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_VF) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+						    "ipsec_packet function attribute supported for VFs only");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS] &amp;&amp;</div><div class='add'>+	    !ops-&gt;port_fn_max_io_eqs_set) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS],</div><div class='add'>+				    "Function does not support max_io_eqs setting");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_port_function_set(struct devlink_port *port,</div><div class='add'>+				     const struct nlattr *attr,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, DEVLINK_PORT_FUNCTION_ATTR_MAX, attr,</div><div class='add'>+			       devlink_function_nl_policy, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Fail to parse port function attributes");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_port_function_validate(port, tb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	attr = tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR];</div><div class='add'>+	if (attr) {</div><div class='add'>+		err = devlink_port_function_hw_addr_set(port, attr, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr = tb[DEVLINK_PORT_FN_ATTR_CAPS];</div><div class='add'>+	if (attr) {</div><div class='add'>+		err = devlink_port_fn_caps_set(port, attr, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr = tb[DEVLINK_PORT_FN_ATTR_MAX_IO_EQS];</div><div class='add'>+	if (attr) {</div><div class='add'>+		err = devlink_port_fn_max_io_eqs_set(port, attr, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Keep this as the last function attribute set, so that when</div><div class='add'>+	 * multiple port function attributes are set along with state,</div><div class='add'>+	 * Those can be applied first before activating the state.</div><div class='add'>+	 */</div><div class='add'>+	attr = tb[DEVLINK_PORT_FN_ATTR_STATE];</div><div class='add'>+	if (attr)</div><div class='add'>+		err = devlink_port_fn_state_set(port, attr, extack);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		devlink_port_notify(port, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_TYPE]) {</div><div class='add'>+		enum devlink_port_type port_type;</div><div class='add'>+</div><div class='add'>+		port_type = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PORT_TYPE]);</div><div class='add'>+		err = devlink_port_type_set(devlink_port, port_type);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_FUNCTION]) {</div><div class='add'>+		struct nlattr *attr = info-&gt;attrs[DEVLINK_ATTR_PORT_FUNCTION];</div><div class='add'>+		struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+</div><div class='add'>+		err = devlink_port_function_set(devlink_port, attr, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_PORT_SPLIT_COUNT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_split)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	count = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_SPLIT_COUNT]);</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;attrs.splittable) {</div><div class='add'>+		/* Split ports cannot be split. */</div><div class='add'>+		if (devlink_port-&gt;attrs.split)</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Port cannot be split further");</div><div class='add'>+		else</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Port cannot be split");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &lt; 2 || !is_power_of_2(count) || count &gt; devlink_port-&gt;attrs.lanes) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Invalid split count");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_split(devlink, devlink_port, count,</div><div class='add'>+					     info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_unsplit)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_unsplit(devlink, devlink_port, info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink_port_new_attrs new_attrs = {};</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;port_new)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_PORT_FLAVOUR] ||</div><div class='add'>+	    !info-&gt;attrs[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Port flavour or PCI PF are not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	new_attrs.flavour = nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PORT_FLAVOUR]);</div><div class='add'>+	new_attrs.pfnum =</div><div class='add'>+		nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		/* Port index of the new port being created by driver. */</div><div class='add'>+		new_attrs.port_index =</div><div class='add'>+			nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+		new_attrs.port_index_valid = true;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_CONTROLLER_NUMBER]) {</div><div class='add'>+		new_attrs.controller =</div><div class='add'>+			nla_get_u16(info-&gt;attrs[DEVLINK_ATTR_PORT_CONTROLLER_NUMBER]);</div><div class='add'>+		new_attrs.controller_valid = true;</div><div class='add'>+	}</div><div class='add'>+	if (new_attrs.flavour == DEVLINK_PORT_FLAVOUR_PCI_SF &amp;&amp;</div><div class='add'>+	    info-&gt;attrs[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]) {</div><div class='add'>+		new_attrs.sfnum = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]);</div><div class='add'>+		new_attrs.sfnum_valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;port_new(devlink, &amp;new_attrs,</div><div class='add'>+				     extack, &amp;devlink_port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_port_del;</div><div class='add'>+	}</div><div class='add'>+	err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_PORT_NEW,</div><div class='add'>+				   info-&gt;snd_portid, info-&gt;snd_seq, 0, NULL);</div><div class='add'>+	if (WARN_ON_ONCE(err))</div><div class='add'>+		goto err_out_msg_free;</div><div class='add'>+	err = genlmsg_reply(msg, info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_port_del;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_msg_free:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+err_out_port_del:</div><div class='add'>+	devlink_port-&gt;ops-&gt;port_del(devlink, devlink_port, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;ops-&gt;port_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return devlink_port-&gt;ops-&gt;port_del(devlink, devlink_port, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_port_type_warn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *port = container_of(to_delayed_work(work),</div><div class='add'>+						 struct devlink_port,</div><div class='add'>+						 type_warn_dw);</div><div class='add'>+	dev_warn(port-&gt;devlink-&gt;dev, "Type was not set for devlink port.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool devlink_port_type_should_warn(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	/* Ignore CPU and DSA flavours. */</div><div class='add'>+	return devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_CPU &amp;&amp;</div><div class='add'>+	       devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_DSA &amp;&amp;</div><div class='add'>+	       devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_UNUSED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEVLINK_PORT_TYPE_WARN_TIMEOUT (HZ * 3600)</div><div class='add'>+</div><div class='add'>+static void devlink_port_type_warn_schedule(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	if (!devlink_port_type_should_warn(devlink_port))</div><div class='add'>+		return;</div><div class='add'>+	/* Schedule a work to WARN in case driver does not set port</div><div class='add'>+	 * type within timeout.</div><div class='add'>+	 */</div><div class='add'>+	schedule_delayed_work(&amp;devlink_port-&gt;type_warn_dw,</div><div class='add'>+			      DEVLINK_PORT_TYPE_WARN_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_port_type_warn_cancel(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	if (!devlink_port_type_should_warn(devlink_port))</div><div class='add'>+		return;</div><div class='add'>+	cancel_delayed_work_sync(&amp;devlink_port-&gt;type_warn_dw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_port_init() - Init devlink port</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @devlink_port: devlink port</div><div class='add'>+ *</div><div class='add'>+ * Initialize essential stuff that is needed for functions</div><div class='add'>+ * that may be called before devlink port registration.</div><div class='add'>+ * Call to this function is optional and not needed</div><div class='add'>+ * in case the driver does not use such functions.</div><div class='add'>+ */</div><div class='add'>+void devlink_port_init(struct devlink *devlink,</div><div class='add'>+		       struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	if (devlink_port-&gt;initialized)</div><div class='add'>+		return;</div><div class='add'>+	devlink_port-&gt;devlink = devlink;</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink_port-&gt;region_list);</div><div class='add'>+	devlink_port-&gt;initialized = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_port_fini() - Deinitialize devlink port</div><div class='add'>+ *</div><div class='add'>+ * @devlink_port: devlink port</div><div class='add'>+ *</div><div class='add'>+ * Deinitialize essential stuff that is in use for functions</div><div class='add'>+ * that may be called after devlink port unregistration.</div><div class='add'>+ * Call to this function is optional and not needed</div><div class='add'>+ * in case the driver does not use such functions.</div><div class='add'>+ */</div><div class='add'>+void devlink_port_fini(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink_port-&gt;region_list));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_fini);</div><div class='add'>+</div><div class='add'>+static const struct devlink_port_ops devlink_port_dummy_ops = {};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_port_register_with_ops() - Register devlink port</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @devlink_port: devlink port</div><div class='add'>+ * @port_index: driver-specific numerical identifier of the port</div><div class='add'>+ * @ops: port ops</div><div class='add'>+ *</div><div class='add'>+ * Register devlink port with provided port index. User can use</div><div class='add'>+ * any indexing, even hw-related one. devlink_port structure</div><div class='add'>+ * is convenient to be embedded inside user driver private structure.</div><div class='add'>+ * Note that the caller should take care of zeroing the devlink_port</div><div class='add'>+ * structure.</div><div class='add'>+ */</div><div class='add'>+int devl_port_register_with_ops(struct devlink *devlink,</div><div class='add'>+				struct devlink_port *devlink_port,</div><div class='add'>+				unsigned int port_index,</div><div class='add'>+				const struct devlink_port_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	devlink_port_init(devlink, devlink_port);</div><div class='add'>+	devlink_port-&gt;registered = true;</div><div class='add'>+	devlink_port-&gt;index = port_index;</div><div class='add'>+	devlink_port-&gt;ops = ops ? ops : &amp;devlink_port_dummy_ops;</div><div class='add'>+	spin_lock_init(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;devlink_port-&gt;reporter_list);</div><div class='add'>+	err = xa_insert(&amp;devlink-&gt;ports, port_index, devlink_port, GFP_KERNEL);</div><div class='add'>+	if (err) {</div><div class='add'>+		devlink_port-&gt;registered = false;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;devlink_port-&gt;type_warn_dw, &amp;devlink_port_type_warn);</div><div class='add'>+	devlink_port_type_warn_schedule(devlink_port);</div><div class='add'>+	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_port_register_with_ops);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_register_with_ops - Register devlink port</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@port_index: driver-specific numerical identifier of the port</div><div class='add'>+ *	@ops: port ops</div><div class='add'>+ *</div><div class='add'>+ *	Register devlink port with provided port index. User can use</div><div class='add'>+ *	any indexing, even hw-related one. devlink_port structure</div><div class='add'>+ *	is convenient to be embedded inside user driver private structure.</div><div class='add'>+ *	Note that the caller should take care of zeroing the devlink_port</div><div class='add'>+ *	structure.</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+int devlink_port_register_with_ops(struct devlink *devlink,</div><div class='add'>+				   struct devlink_port *devlink_port,</div><div class='add'>+				   unsigned int port_index,</div><div class='add'>+				   const struct devlink_port_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	err = devl_port_register_with_ops(devlink, devlink_port,</div><div class='add'>+					  port_index, ops);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_register_with_ops);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_port_unregister() - Unregister devlink port</div><div class='add'>+ *</div><div class='add'>+ * @devlink_port: devlink port</div><div class='add'>+ */</div><div class='add'>+void devl_port_unregister(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;devlink_port-&gt;devlink-&gt;lock);</div><div class='add'>+	WARN_ON(devlink_port-&gt;type != DEVLINK_PORT_TYPE_NOTSET);</div><div class='add'>+</div><div class='add'>+	devlink_port_type_warn_cancel(devlink_port);</div><div class='add'>+	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_DEL);</div><div class='add'>+	xa_erase(&amp;devlink_port-&gt;devlink-&gt;ports, devlink_port-&gt;index);</div><div class='add'>+	WARN_ON(!list_empty(&amp;devlink_port-&gt;reporter_list));</div><div class='add'>+	devlink_port-&gt;registered = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_port_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_unregister - Unregister devlink port</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+void devlink_port_unregister(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_port_unregister(devlink_port);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_unregister);</div><div class='add'>+</div><div class='add'>+static void devlink_port_type_netdev_checks(struct devlink_port *devlink_port,</div><div class='add'>+					    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = netdev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	/* If driver registers devlink port, it should set devlink port</div><div class='add'>+	 * attributes accordingly so the compat functions are called</div><div class='add'>+	 * and the original ops are not used.</div><div class='add'>+	 */</div><div class='add'>+	if (ops-&gt;ndo_get_phys_port_name) {</div><div class='add'>+		/* Some drivers use the same set of ndos for netdevs</div><div class='add'>+		 * that have devlink_port registered and also for</div><div class='add'>+		 * those who don't. Make sure that ndo_get_phys_port_name</div><div class='add'>+		 * returns -EOPNOTSUPP here in case it is defined.</div><div class='add'>+		 * Warn if not.</div><div class='add'>+		 */</div><div class='add'>+		char name[IFNAMSIZ];</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;ndo_get_phys_port_name(netdev, name, sizeof(name));</div><div class='add'>+		WARN_ON(err != -EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+	if (ops-&gt;ndo_get_port_parent_id) {</div><div class='add'>+		/* Some drivers use the same set of ndos for netdevs</div><div class='add'>+		 * that have devlink_port registered and also for</div><div class='add'>+		 * those who don't. Make sure that ndo_get_port_parent_id</div><div class='add'>+		 * returns -EOPNOTSUPP here in case it is defined.</div><div class='add'>+		 * Warn if not.</div><div class='add'>+		 */</div><div class='add'>+		struct netdev_phys_item_id ppid;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;ndo_get_port_parent_id(netdev, &amp;ppid);</div><div class='add'>+		WARN_ON(err != -EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_port_type_set(struct devlink_port *devlink_port,</div><div class='add'>+				    enum devlink_port_type type,</div><div class='add'>+				    void *type_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = type_dev;</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	if (type == DEVLINK_PORT_TYPE_NOTSET) {</div><div class='add'>+		devlink_port_type_warn_schedule(devlink_port);</div><div class='add'>+	} else {</div><div class='add'>+		devlink_port_type_warn_cancel(devlink_port);</div><div class='add'>+		if (type == DEVLINK_PORT_TYPE_ETH &amp;&amp; netdev)</div><div class='add'>+			devlink_port_type_netdev_checks(devlink_port, netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+	devlink_port-&gt;type = type;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case DEVLINK_PORT_TYPE_ETH:</div><div class='add'>+		devlink_port-&gt;type_eth.netdev = netdev;</div><div class='add'>+		if (netdev) {</div><div class='add'>+			ASSERT_RTNL();</div><div class='add'>+			devlink_port-&gt;type_eth.ifindex = netdev-&gt;ifindex;</div><div class='add'>+			BUILD_BUG_ON(sizeof(devlink_port-&gt;type_eth.ifname) !=</div><div class='add'>+				     sizeof(netdev-&gt;name));</div><div class='add'>+			strcpy(devlink_port-&gt;type_eth.ifname, netdev-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_TYPE_IB:</div><div class='add'>+		devlink_port-&gt;type_ib.ibdev = type_dev;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;devlink_port-&gt;type_lock);</div><div class='add'>+	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_type_eth_set - Set port type to Ethernet</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *</div><div class='add'>+ *	If driver is calling this, most likely it is doing something wrong.</div><div class='add'>+ */</div><div class='add'>+void devlink_port_type_eth_set(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	dev_warn(devlink_port-&gt;devlink-&gt;dev,</div><div class='add'>+		 "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n",</div><div class='add'>+		 devlink_port-&gt;index);</div><div class='add'>+	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_type_ib_set - Set port type to InfiniBand</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@ibdev: related IB device</div><div class='add'>+ */</div><div class='add'>+void devlink_port_type_ib_set(struct devlink_port *devlink_port,</div><div class='add'>+			      struct ib_device *ibdev)</div><div class='add'>+{</div><div class='add'>+	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_IB, ibdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_type_clear - Clear port type</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *</div><div class='add'>+ *	If driver is calling this for clearing Ethernet type, most likely</div><div class='add'>+ *	it is doing something wrong.</div><div class='add'>+ */</div><div class='add'>+void devlink_port_type_clear(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	if (devlink_port-&gt;type == DEVLINK_PORT_TYPE_ETH)</div><div class='add'>+		dev_warn(devlink_port-&gt;devlink-&gt;dev,</div><div class='add'>+			 "devlink port type for port %d cleared without a software interface reference, device type not supported by the kernel?\n",</div><div class='add'>+			 devlink_port-&gt;index);</div><div class='add'>+	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_NOTSET, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_type_clear);</div><div class='add'>+</div><div class='add'>+int devlink_port_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				 unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct devlink_port *devlink_port = netdev-&gt;devlink_port;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port)</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	devlink = devlink_port-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_POST_INIT:</div><div class='add'>+		/* Set the type but not netdev pointer. It is going to be set</div><div class='add'>+		 * later on by NETDEV_REGISTER event. Happens once during</div><div class='add'>+		 * netdevice register</div><div class='add'>+		 */</div><div class='add'>+		__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH,</div><div class='add'>+					NULL);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_REGISTER:</div><div class='add'>+	case NETDEV_CHANGENAME:</div><div class='add'>+		if (devlink_net(devlink) != dev_net(netdev))</div><div class='add'>+			return NOTIFY_OK;</div><div class='add'>+		/* Set the netdev on top of previously set type. Note this</div><div class='add'>+		 * event happens also during net namespace change so here</div><div class='add'>+		 * we take into account netdev pointer appearing in this</div><div class='add'>+		 * namespace.</div><div class='add'>+		 */</div><div class='add'>+		__devlink_port_type_set(devlink_port, devlink_port-&gt;type,</div><div class='add'>+					netdev);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		if (devlink_net(devlink) != dev_net(netdev))</div><div class='add'>+			return NOTIFY_OK;</div><div class='add'>+		/* Clear netdev pointer, but not the type. This event happens</div><div class='add'>+		 * also during net namespace change so we need to clear</div><div class='add'>+		 * pointer to netdev that is going to another net namespace.</div><div class='add'>+		 */</div><div class='add'>+		__devlink_port_type_set(devlink_port, devlink_port-&gt;type,</div><div class='add'>+					NULL);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PRE_UNINIT:</div><div class='add'>+		/* Clear the type and the netdev pointer. Happens one during</div><div class='add'>+		 * netdevice unregister.</div><div class='add'>+		 */</div><div class='add'>+		__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_NOTSET,</div><div class='add'>+					NULL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devlink_port_attrs_set(struct devlink_port *devlink_port,</div><div class='add'>+				     enum devlink_port_flavour flavour)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	devlink_port-&gt;attrs_set = true;</div><div class='add'>+	attrs-&gt;flavour = flavour;</div><div class='add'>+	if (attrs-&gt;switch_id.id_len) {</div><div class='add'>+		devlink_port-&gt;switch_port = true;</div><div class='add'>+		if (WARN_ON(attrs-&gt;switch_id.id_len &gt; MAX_PHYS_ITEM_ID_LEN))</div><div class='add'>+			attrs-&gt;switch_id.id_len = MAX_PHYS_ITEM_ID_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		devlink_port-&gt;switch_port = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_attrs_set - Set port attributes</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@attrs: devlink port attrs</div><div class='add'>+ */</div><div class='add'>+void devlink_port_attrs_set(struct devlink_port *devlink_port,</div><div class='add'>+			    const struct devlink_port_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+	WARN_ON(attrs-&gt;splittable &amp;&amp; attrs-&gt;split);</div><div class='add'>+</div><div class='add'>+	devlink_port-&gt;attrs = *attrs;</div><div class='add'>+	__devlink_port_attrs_set(devlink_port, attrs-&gt;flavour);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_attrs_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_attrs_pci_pf_set - Set PCI PF port attributes</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@controller: associated controller number for the devlink port instance</div><div class='add'>+ *	@pf: associated PCI function number for the devlink port instance</div><div class='add'>+ *	@external: indicates if the port is for an external controller</div><div class='add'>+ */</div><div class='add'>+void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 controller,</div><div class='add'>+				   u16 pf, bool external)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	__devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_PF);</div><div class='add'>+	attrs-&gt;pci_pf.controller = controller;</div><div class='add'>+	attrs-&gt;pci_pf.pf = pf;</div><div class='add'>+	attrs-&gt;pci_pf.external = external;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_pf_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_attrs_pci_vf_set - Set PCI VF port attributes</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@controller: associated controller number for the devlink port instance</div><div class='add'>+ *	@pf: associated PCI function number for the devlink port instance</div><div class='add'>+ *	@vf: associated PCI VF number of a PF for the devlink port instance;</div><div class='add'>+ *	     VF number starts from 0 for the first PCI virtual function</div><div class='add'>+ *	@external: indicates if the port is for an external controller</div><div class='add'>+ */</div><div class='add'>+void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller,</div><div class='add'>+				   u16 pf, u16 vf, bool external)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	__devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_VF);</div><div class='add'>+	attrs-&gt;pci_vf.controller = controller;</div><div class='add'>+	attrs-&gt;pci_vf.pf = pf;</div><div class='add'>+	attrs-&gt;pci_vf.vf = vf;</div><div class='add'>+	attrs-&gt;pci_vf.external = external;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_vf_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_attrs_pci_sf_set - Set PCI SF port attributes</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@controller: associated controller number for the devlink port instance</div><div class='add'>+ *	@pf: associated PCI function number for the devlink port instance</div><div class='add'>+ *	@sf: associated SF number of a PF for the devlink port instance</div><div class='add'>+ *	@external: indicates if the port is for an external controller</div><div class='add'>+ */</div><div class='add'>+void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port, u32 controller,</div><div class='add'>+				   u16 pf, u32 sf, bool external)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	__devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_SF);</div><div class='add'>+	attrs-&gt;pci_sf.controller = controller;</div><div class='add'>+	attrs-&gt;pci_sf.pf = pf;</div><div class='add'>+	attrs-&gt;pci_sf.sf = sf;</div><div class='add'>+	attrs-&gt;pci_sf.external = external;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_sf_set);</div><div class='add'>+</div><div class='add'>+static void devlink_port_rel_notify_cb(struct devlink *devlink, u32 port_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+	devlink_port = devlink_port_get_by_index(devlink, port_index);</div><div class='add'>+	if (!devlink_port)</div><div class='add'>+		return;</div><div class='add'>+	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_port_rel_cleanup_cb(struct devlink *devlink, u32 port_index,</div><div class='add'>+					u32 rel_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+	devlink_port = devlink_port_get_by_index(devlink, port_index);</div><div class='add'>+	if (devlink_port &amp;&amp; devlink_port-&gt;rel_index == rel_index)</div><div class='add'>+		devlink_port-&gt;rel_index = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_port_fn_devlink_set - Attach peer devlink</div><div class='add'>+ *			      instance to port function.</div><div class='add'>+ * @devlink_port: devlink port</div><div class='add'>+ * @fn_devlink: devlink instance to attach</div><div class='add'>+ */</div><div class='add'>+int devl_port_fn_devlink_set(struct devlink_port *devlink_port,</div><div class='add'>+			     struct devlink *fn_devlink)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_PORT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(devlink_port-&gt;attrs.flavour != DEVLINK_PORT_FLAVOUR_PCI_SF ||</div><div class='add'>+		    devlink_port-&gt;attrs.pci_sf.external))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return devlink_rel_nested_in_add(&amp;devlink_port-&gt;rel_index,</div><div class='add'>+					 devlink_port-&gt;devlink-&gt;index,</div><div class='add'>+					 devlink_port-&gt;index,</div><div class='add'>+					 devlink_port_rel_notify_cb,</div><div class='add'>+					 devlink_port_rel_cleanup_cb,</div><div class='add'>+					 fn_devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_port_fn_devlink_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_linecard_set - Link port with a linecard</div><div class='add'>+ *</div><div class='add'>+ *	@devlink_port: devlink port</div><div class='add'>+ *	@linecard: devlink linecard</div><div class='add'>+ */</div><div class='add'>+void devlink_port_linecard_set(struct devlink_port *devlink_port,</div><div class='add'>+			       struct devlink_linecard *linecard)</div><div class='add'>+{</div><div class='add'>+	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);</div><div class='add'>+</div><div class='add'>+	devlink_port-&gt;linecard = linecard;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_linecard_set);</div><div class='add'>+</div><div class='add'>+static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,</div><div class='add'>+					     char *name, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs *attrs = &amp;devlink_port-&gt;attrs;</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	if (!devlink_port-&gt;attrs_set || devlink_port-&gt;attrs.no_phys_port_name)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (attrs-&gt;flavour) {</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PHYSICAL:</div><div class='add'>+		if (devlink_port-&gt;linecard)</div><div class='add'>+			n = snprintf(name, len, "l%u",</div><div class='add'>+				     devlink_linecard_index(devlink_port-&gt;linecard));</div><div class='add'>+		if (n &lt; len)</div><div class='add'>+			n += snprintf(name + n, len - n, "p%u",</div><div class='add'>+				      attrs-&gt;phys.port_number);</div><div class='add'>+		if (n &lt; len &amp;&amp; attrs-&gt;split)</div><div class='add'>+			n += snprintf(name + n, len - n, "s%u",</div><div class='add'>+				      attrs-&gt;phys.split_subport_number);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_CPU:</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_DSA:</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_UNUSED:</div><div class='add'>+		/* As CPU and DSA ports do not have a netdevice associated</div><div class='add'>+		 * case should not ever happen.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_PF:</div><div class='add'>+		if (attrs-&gt;pci_pf.external) {</div><div class='add'>+			n = snprintf(name, len, "c%u", attrs-&gt;pci_pf.controller);</div><div class='add'>+			if (n &gt;= len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			len -= n;</div><div class='add'>+			name += n;</div><div class='add'>+		}</div><div class='add'>+		n = snprintf(name, len, "pf%u", attrs-&gt;pci_pf.pf);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_VF:</div><div class='add'>+		if (attrs-&gt;pci_vf.external) {</div><div class='add'>+			n = snprintf(name, len, "c%u", attrs-&gt;pci_vf.controller);</div><div class='add'>+			if (n &gt;= len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			len -= n;</div><div class='add'>+			name += n;</div><div class='add'>+		}</div><div class='add'>+		n = snprintf(name, len, "pf%uvf%u",</div><div class='add'>+			     attrs-&gt;pci_vf.pf, attrs-&gt;pci_vf.vf);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_PCI_SF:</div><div class='add'>+		if (attrs-&gt;pci_sf.external) {</div><div class='add'>+			n = snprintf(name, len, "c%u", attrs-&gt;pci_sf.controller);</div><div class='add'>+			if (n &gt;= len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			len -= n;</div><div class='add'>+			name += n;</div><div class='add'>+		}</div><div class='add'>+		n = snprintf(name, len, "pf%usf%u", attrs-&gt;pci_sf.pf,</div><div class='add'>+			     attrs-&gt;pci_sf.sf);</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_PORT_FLAVOUR_VIRTUAL:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &gt;= len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_compat_phys_port_name_get(struct net_device *dev,</div><div class='add'>+				      char *name, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+	/* RTNL mutex is held here which ensures that devlink_port</div><div class='add'>+	 * instance cannot disappear in the middle. No need to take</div><div class='add'>+	 * any devlink lock as only permanent values are accessed.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	devlink_port = dev-&gt;devlink_port;</div><div class='add'>+	if (!devlink_port)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return __devlink_port_phys_port_name_get(devlink_port, name, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_compat_switch_id_get(struct net_device *dev,</div><div class='add'>+				 struct netdev_phys_item_id *ppid)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+	/* Caller must hold RTNL mutex or reference to dev, which ensures that</div><div class='add'>+	 * devlink_port instance cannot disappear in the middle. No need to take</div><div class='add'>+	 * any devlink lock as only permanent values are accessed.</div><div class='add'>+	 */</div><div class='add'>+	devlink_port = dev-&gt;devlink_port;</div><div class='add'>+	if (!devlink_port || !devlink_port-&gt;switch_port)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	memcpy(ppid, &amp;devlink_port-&gt;attrs.switch_id, sizeof(*ppid));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/devlink/rate.c b/net/devlink/rate.c<br/>new file mode 100644<br/>index 000000000000..d157a8419bca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/rate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/rate.c</a></div><div class='hunk'>@@ -0,0 +1,850 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+devlink_rate_is_leaf(struct devlink_rate *devlink_rate)</div><div class='add'>+{</div><div class='add'>+	return devlink_rate-&gt;type == DEVLINK_RATE_TYPE_LEAF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+devlink_rate_is_node(struct devlink_rate *devlink_rate)</div><div class='add'>+{</div><div class='add'>+	return devlink_rate-&gt;type == DEVLINK_RATE_TYPE_NODE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rate *</div><div class='add'>+devlink_rate_leaf_get_from_info(struct devlink *devlink, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+</div><div class='add'>+	devlink_port = devlink_port_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+	if (IS_ERR(devlink_port))</div><div class='add'>+		return ERR_CAST(devlink_port);</div><div class='add'>+	devlink_rate = devlink_port-&gt;devlink_rate;</div><div class='add'>+	return devlink_rate ?: ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rate *</div><div class='add'>+devlink_rate_node_get_by_name(struct devlink *devlink, const char *node_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_rate, &amp;devlink-&gt;rate_list, list) {</div><div class='add'>+		if (devlink_rate_is_node(devlink_rate) &amp;&amp;</div><div class='add'>+		    !strcmp(node_name, devlink_rate-&gt;name))</div><div class='add'>+			return devlink_rate;</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rate *</div><div class='add'>+devlink_rate_node_get_from_attrs(struct devlink *devlink, struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	const char *rate_node_name;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_RATE_NODE_NAME])</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	rate_node_name = nla_data(attrs[DEVLINK_ATTR_RATE_NODE_NAME]);</div><div class='add'>+	len = strlen(rate_node_name);</div><div class='add'>+	/* Name cannot be empty or decimal number */</div><div class='add'>+	if (!len || strspn(rate_node_name, "0123456789") == len)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return devlink_rate_node_get_by_name(devlink, rate_node_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rate *</div><div class='add'>+devlink_rate_node_get_from_info(struct devlink *devlink, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return devlink_rate_node_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_rate *</div><div class='add'>+devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_PORT_INDEX])</div><div class='add'>+		return devlink_rate_leaf_get_from_info(devlink, info);</div><div class='add'>+	else if (attrs[DEVLINK_ATTR_RATE_NODE_NAME])</div><div class='add'>+		return devlink_rate_node_get_from_info(devlink, info);</div><div class='add'>+	else</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_rate_put_tc_bws(struct sk_buff *msg, u32 *tc_bw)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla_tc_bw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DEVLINK_RATE_TCS_MAX; i++) {</div><div class='add'>+		nla_tc_bw = nla_nest_start(msg, DEVLINK_ATTR_RATE_TC_BWS);</div><div class='add'>+		if (!nla_tc_bw)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(msg, DEVLINK_RATE_TC_ATTR_INDEX, i) ||</div><div class='add'>+		    nla_put_u32(msg, DEVLINK_RATE_TC_ATTR_BW, tc_bw[i]))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(msg, nla_tc_bw);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, nla_tc_bw);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_rate_fill(struct sk_buff *msg,</div><div class='add'>+				struct devlink_rate *devlink_rate,</div><div class='add'>+				enum devlink_command cmd, u32 portid, u32 seq,</div><div class='add'>+				int flags, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_rate-&gt;devlink;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_RATE_TYPE, devlink_rate-&gt;type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_rate_is_leaf(devlink_rate)) {</div><div class='add'>+		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+				devlink_rate-&gt;devlink_port-&gt;index))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else if (devlink_rate_is_node(devlink_rate)) {</div><div class='add'>+		if (nla_put_string(msg, DEVLINK_ATTR_RATE_NODE_NAME,</div><div class='add'>+				   devlink_rate-&gt;name))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_RATE_TX_SHARE,</div><div class='add'>+			       devlink_rate-&gt;tx_share))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_RATE_TX_MAX,</div><div class='add'>+			       devlink_rate-&gt;tx_max))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_RATE_TX_PRIORITY,</div><div class='add'>+			devlink_rate-&gt;tx_priority))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_RATE_TX_WEIGHT,</div><div class='add'>+			devlink_rate-&gt;tx_weight))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_rate-&gt;parent)</div><div class='add'>+		if (nla_put_string(msg, DEVLINK_ATTR_RATE_PARENT_NODE_NAME,</div><div class='add'>+				   devlink_rate-&gt;parent-&gt;name))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_rate_put_tc_bws(msg, devlink_rate-&gt;tc_bw))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_rate_notify(struct devlink_rate *devlink_rate,</div><div class='add'>+				enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_rate-&gt;devlink;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_RATE_NEW &amp;&amp; cmd != DEVLINK_CMD_RATE_DEL);</div><div class='add'>+</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_rate_fill(msg, devlink_rate, cmd, 0, 0, 0, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_rates_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *rate_node;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rate_node, &amp;devlink-&gt;rate_list, list)</div><div class='add'>+		devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_rates_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *rate_node;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(rate_node, &amp;devlink-&gt;rate_list, list)</div><div class='add'>+		devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			     struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_rate, &amp;devlink-&gt;rate_list, list) {</div><div class='add'>+		enum devlink_command cmd = DEVLINK_CMD_RATE_NEW;</div><div class='add'>+		u32 id = NETLINK_CB(cb-&gt;skb).portid;</div><div class='add'>+</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_rate_fill(msg, devlink_rate, cmd, id,</div><div class='add'>+					   cb-&gt;nlh-&gt;nlmsg_seq, flags, NULL);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_rate_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_rate_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_rate_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_rate = devlink_rate_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_rate))</div><div class='add'>+		return PTR_ERR(devlink_rate);</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_rate_fill(msg, devlink_rate, DEVLINK_CMD_RATE_NEW,</div><div class='add'>+				   info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+				   info-&gt;extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+devlink_rate_is_parent_node(struct devlink_rate *devlink_rate,</div><div class='add'>+			    struct devlink_rate *parent)</div><div class='add'>+{</div><div class='add'>+	while (parent) {</div><div class='add'>+		if (parent == devlink_rate)</div><div class='add'>+			return true;</div><div class='add'>+		parent = parent-&gt;parent;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_rate_parent_node_set(struct devlink_rate *devlink_rate,</div><div class='add'>+				struct genl_info *info,</div><div class='add'>+				struct nlattr *nla_parent)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_rate-&gt;devlink;</div><div class='add'>+	const char *parent_name = nla_data(nla_parent);</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	size_t len = strlen(parent_name);</div><div class='add'>+	struct devlink_rate *parent;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	parent = devlink_rate-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (parent &amp;&amp; !len) {</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_parent_set(devlink_rate, NULL,</div><div class='add'>+							devlink_rate-&gt;priv, NULL,</div><div class='add'>+							info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_parent_set(devlink_rate, NULL,</div><div class='add'>+							devlink_rate-&gt;priv, NULL,</div><div class='add'>+							info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		refcount_dec(&amp;parent-&gt;refcnt);</div><div class='add'>+		devlink_rate-&gt;parent = NULL;</div><div class='add'>+	} else if (len) {</div><div class='add'>+		parent = devlink_rate_node_get_by_name(devlink, parent_name);</div><div class='add'>+		if (IS_ERR(parent))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		if (parent == devlink_rate) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Parent to self is not allowed");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (devlink_rate_is_node(devlink_rate) &amp;&amp;</div><div class='add'>+		    devlink_rate_is_parent_node(devlink_rate, parent-&gt;parent)) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Node is already a parent of parent node.");</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_parent_set(devlink_rate, parent,</div><div class='add'>+							devlink_rate-&gt;priv, parent-&gt;priv,</div><div class='add'>+							info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_parent_set(devlink_rate, parent,</div><div class='add'>+							devlink_rate-&gt;priv, parent-&gt;priv,</div><div class='add'>+							info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (devlink_rate-&gt;parent)</div><div class='add'>+			/* we're reassigning to other parent in this case */</div><div class='add'>+			refcount_dec(&amp;devlink_rate-&gt;parent-&gt;refcnt);</div><div class='add'>+</div><div class='add'>+		refcount_inc(&amp;parent-&gt;refcnt);</div><div class='add'>+		devlink_rate-&gt;parent = parent;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_rate_tc_bw_parse(struct nlattr *parent_nest, u32 *tc_bw,</div><div class='add'>+				       unsigned long *bitmap,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[DEVLINK_RATE_TC_ATTR_MAX + 1];</div><div class='add'>+	u8 tc_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, DEVLINK_RATE_TC_ATTR_MAX, parent_nest,</div><div class='add'>+			       devlink_dl_rate_tc_bws_nl_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[DEVLINK_RATE_TC_ATTR_INDEX]) {</div><div class='add'>+		NL_SET_ERR_ATTR_MISS(extack, parent_nest,</div><div class='add'>+				     DEVLINK_RATE_TC_ATTR_INDEX);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_index = nla_get_u8(tb[DEVLINK_RATE_TC_ATTR_INDEX]);</div><div class='add'>+</div><div class='add'>+	if (!tb[DEVLINK_RATE_TC_ATTR_BW]) {</div><div class='add'>+		NL_SET_ERR_ATTR_MISS(extack, parent_nest,</div><div class='add'>+				     DEVLINK_RATE_TC_ATTR_BW);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(tc_index, bitmap)) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "Duplicate traffic class index specified (%u)",</div><div class='add'>+				   tc_index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_bw[tc_index] = nla_get_u32(tb[DEVLINK_RATE_TC_ATTR_BW]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_rate_tc_bw_set(struct devlink_rate *devlink_rate,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(bitmap, DEVLINK_RATE_TCS_MAX) = {};</div><div class='add'>+	struct devlink *devlink = devlink_rate-&gt;devlink;</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	u32 tc_bw[DEVLINK_RATE_TCS_MAX] = {};</div><div class='add'>+	int rem, err = -EOPNOTSUPP, i;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	nlmsg_for_each_attr_type(attr, DEVLINK_ATTR_RATE_TC_BWS, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem) {</div><div class='add'>+		err = devlink_nl_rate_tc_bw_parse(attr, tc_bw, bitmap,</div><div class='add'>+						  info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DEVLINK_RATE_TCS_MAX; i++) {</div><div class='add'>+		if (!test_bit(i, bitmap)) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(info-&gt;extack,</div><div class='add'>+					   "Bandwidth values must be specified for all %u traffic classes",</div><div class='add'>+					   DEVLINK_RATE_TCS_MAX);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+		err = ops-&gt;rate_leaf_tc_bw_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+					       tc_bw, info-&gt;extack);</div><div class='add'>+	else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+		err = ops-&gt;rate_node_tc_bw_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+					       tc_bw, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(devlink_rate-&gt;tc_bw, tc_bw, sizeof(tc_bw));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_rate_set(struct devlink_rate *devlink_rate,</div><div class='add'>+			       const struct devlink_ops *ops,</div><div class='add'>+			       struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla_parent, **attrs = info-&gt;attrs;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+	u32 priority;</div><div class='add'>+	u32 weight;</div><div class='add'>+	u64 rate;</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_RATE_TX_SHARE]) {</div><div class='add'>+		rate = nla_get_u64(attrs[DEVLINK_ATTR_RATE_TX_SHARE]);</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_tx_share_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							  rate, info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_tx_share_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							  rate, info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		devlink_rate-&gt;tx_share = rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_RATE_TX_MAX]) {</div><div class='add'>+		rate = nla_get_u64(attrs[DEVLINK_ATTR_RATE_TX_MAX]);</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_tx_max_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							rate, info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_tx_max_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							rate, info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		devlink_rate-&gt;tx_max = rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY]) {</div><div class='add'>+		priority = nla_get_u32(attrs[DEVLINK_ATTR_RATE_TX_PRIORITY]);</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_tx_priority_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							     priority, info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_tx_priority_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							     priority, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		devlink_rate-&gt;tx_priority = priority;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_RATE_TX_WEIGHT]) {</div><div class='add'>+		weight = nla_get_u32(attrs[DEVLINK_ATTR_RATE_TX_WEIGHT]);</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_leaf_tx_weight_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							   weight, info-&gt;extack);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			err = ops-&gt;rate_node_tx_weight_set(devlink_rate, devlink_rate-&gt;priv,</div><div class='add'>+							   weight, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		devlink_rate-&gt;tx_weight = weight;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_parent = attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME];</div><div class='add'>+	if (nla_parent) {</div><div class='add'>+		err = devlink_nl_rate_parent_node_set(devlink_rate, info,</div><div class='add'>+						      nla_parent);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_RATE_TC_BWS]) {</div><div class='add'>+		err = devlink_nl_rate_tc_bw_set(devlink_rate, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool devlink_rate_set_ops_supported(const struct devlink_ops *ops,</div><div class='add'>+					   struct genl_info *info,</div><div class='add'>+					   enum devlink_rate_type type)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (type == DEVLINK_RATE_TYPE_LEAF) {</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] &amp;&amp; !ops-&gt;rate_leaf_tx_share_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "TX share set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_MAX] &amp;&amp; !ops-&gt;rate_leaf_tx_max_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "TX max set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] &amp;&amp;</div><div class='add'>+		    !ops-&gt;rate_leaf_parent_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Parent set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY] &amp;&amp; !ops-&gt;rate_leaf_tx_priority_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TX_PRIORITY],</div><div class='add'>+					    "TX priority set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_WEIGHT] &amp;&amp; !ops-&gt;rate_leaf_tx_weight_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TX_WEIGHT],</div><div class='add'>+					    "TX weight set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TC_BWS] &amp;&amp;</div><div class='add'>+		    !ops-&gt;rate_leaf_tc_bw_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TC_BWS],</div><div class='add'>+					    "TC bandwidth set isn't supported for the leafs");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	} else if (type == DEVLINK_RATE_TYPE_NODE) {</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] &amp;&amp; !ops-&gt;rate_node_tx_share_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "TX share set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_MAX] &amp;&amp; !ops-&gt;rate_node_tx_max_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "TX max set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] &amp;&amp;</div><div class='add'>+		    !ops-&gt;rate_node_parent_set) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Parent set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY] &amp;&amp; !ops-&gt;rate_node_tx_priority_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TX_PRIORITY],</div><div class='add'>+					    "TX priority set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TX_WEIGHT] &amp;&amp; !ops-&gt;rate_node_tx_weight_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TX_WEIGHT],</div><div class='add'>+					    "TX weight set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (attrs[DEVLINK_ATTR_RATE_TC_BWS] &amp;&amp;</div><div class='add'>+		    !ops-&gt;rate_node_tc_bw_set) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    attrs[DEVLINK_ATTR_RATE_TC_BWS],</div><div class='add'>+					    "TC bandwidth set isn't supported for the nodes");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		WARN(1, "Unknown type of rate object");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+	const struct devlink_ops *ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_rate = devlink_rate_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_rate))</div><div class='add'>+		return PTR_ERR(devlink_rate);</div><div class='add'>+</div><div class='add'>+	ops = devlink-&gt;ops;</div><div class='add'>+	if (!ops || !devlink_rate_set_ops_supported(ops, info, devlink_rate-&gt;type))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_rate_set(devlink_rate, ops, info);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		devlink_rate_notify(devlink_rate, DEVLINK_CMD_RATE_NEW);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_rate *rate_node;</div><div class='add'>+	const struct devlink_ops *ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ops = devlink-&gt;ops;</div><div class='add'>+	if (!ops || !ops-&gt;rate_node_new || !ops-&gt;rate_node_del) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Rate nodes aren't supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!devlink_rate_set_ops_supported(ops, info, DEVLINK_RATE_TYPE_NODE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rate_node = devlink_rate_node_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+	if (!IS_ERR(rate_node))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	else if (rate_node == ERR_PTR(-EINVAL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rate_node = kzalloc(sizeof(*rate_node), GFP_KERNEL);</div><div class='add'>+	if (!rate_node)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rate_node-&gt;devlink = devlink;</div><div class='add'>+	rate_node-&gt;type = DEVLINK_RATE_TYPE_NODE;</div><div class='add'>+	rate_node-&gt;name = nla_strdup(info-&gt;attrs[DEVLINK_ATTR_RATE_NODE_NAME], GFP_KERNEL);</div><div class='add'>+	if (!rate_node-&gt;name) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_strdup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;rate_node_new(rate_node, &amp;rate_node-&gt;priv, info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_node_new;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_rate_set(rate_node, ops, info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_rate_set;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;rate_node-&gt;refcnt, 1);</div><div class='add'>+	list_add(&amp;rate_node-&gt;list, &amp;devlink-&gt;rate_list);</div><div class='add'>+	devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_NEW);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_rate_set:</div><div class='add'>+	ops-&gt;rate_node_del(rate_node, rate_node-&gt;priv, info-&gt;extack);</div><div class='add'>+err_node_new:</div><div class='add'>+	kfree(rate_node-&gt;name);</div><div class='add'>+err_strdup:</div><div class='add'>+	kfree(rate_node);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_rate *rate_node;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rate_node = devlink_rate_node_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(rate_node))</div><div class='add'>+		return PTR_ERR(rate_node);</div><div class='add'>+</div><div class='add'>+	if (refcount_read(&amp;rate_node-&gt;refcnt) &gt; 1) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Node has children. Cannot delete node.");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_DEL);</div><div class='add'>+	err = devlink-&gt;ops-&gt;rate_node_del(rate_node, rate_node-&gt;priv,</div><div class='add'>+					  info-&gt;extack);</div><div class='add'>+	if (rate_node-&gt;parent)</div><div class='add'>+		refcount_dec(&amp;rate_node-&gt;parent-&gt;refcnt);</div><div class='add'>+	list_del(&amp;rate_node-&gt;list);</div><div class='add'>+	kfree(rate_node-&gt;name);</div><div class='add'>+	kfree(rate_node);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_rate, &amp;devlink-&gt;rate_list, list)</div><div class='add'>+		if (devlink_rate_is_node(devlink_rate)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Rate node(s) exists.");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_rate_node_create - create devlink rate node</div><div class='add'>+ * @devlink: devlink instance</div><div class='add'>+ * @priv: driver private data</div><div class='add'>+ * @node_name: name of the resulting node</div><div class='add'>+ * @parent: parent devlink_rate struct</div><div class='add'>+ *</div><div class='add'>+ * Create devlink rate object of type node</div><div class='add'>+ */</div><div class='add'>+struct devlink_rate *</div><div class='add'>+devl_rate_node_create(struct devlink *devlink, void *priv, char *node_name,</div><div class='add'>+		      struct devlink_rate *parent)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *rate_node;</div><div class='add'>+</div><div class='add'>+	rate_node = devlink_rate_node_get_by_name(devlink, node_name);</div><div class='add'>+	if (!IS_ERR(rate_node))</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+</div><div class='add'>+	rate_node = kzalloc(sizeof(*rate_node), GFP_KERNEL);</div><div class='add'>+	if (!rate_node)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	if (parent) {</div><div class='add'>+		rate_node-&gt;parent = parent;</div><div class='add'>+		refcount_inc(&amp;rate_node-&gt;parent-&gt;refcnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate_node-&gt;type = DEVLINK_RATE_TYPE_NODE;</div><div class='add'>+	rate_node-&gt;devlink = devlink;</div><div class='add'>+	rate_node-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	rate_node-&gt;name = kstrdup(node_name, GFP_KERNEL);</div><div class='add'>+	if (!rate_node-&gt;name) {</div><div class='add'>+		kfree(rate_node);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;rate_node-&gt;refcnt, 1);</div><div class='add'>+	list_add(&amp;rate_node-&gt;list, &amp;devlink-&gt;rate_list);</div><div class='add'>+	devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_NEW);</div><div class='add'>+	return rate_node;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_rate_node_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_rate_leaf_create - create devlink rate leaf</div><div class='add'>+ * @devlink_port: devlink port object to create rate object on</div><div class='add'>+ * @priv: driver private data</div><div class='add'>+ * @parent: parent devlink_rate struct</div><div class='add'>+ *</div><div class='add'>+ * Create devlink rate object of type leaf on provided @devlink_port.</div><div class='add'>+ */</div><div class='add'>+int devl_rate_leaf_create(struct devlink_port *devlink_port, void *priv,</div><div class='add'>+			  struct devlink_rate *parent)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+	struct devlink_rate *devlink_rate;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink_port-&gt;devlink);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(devlink_port-&gt;devlink_rate))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	devlink_rate = kzalloc(sizeof(*devlink_rate), GFP_KERNEL);</div><div class='add'>+	if (!devlink_rate)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (parent) {</div><div class='add'>+		devlink_rate-&gt;parent = parent;</div><div class='add'>+		refcount_inc(&amp;devlink_rate-&gt;parent-&gt;refcnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_rate-&gt;type = DEVLINK_RATE_TYPE_LEAF;</div><div class='add'>+	devlink_rate-&gt;devlink = devlink;</div><div class='add'>+	devlink_rate-&gt;devlink_port = devlink_port;</div><div class='add'>+	devlink_rate-&gt;priv = priv;</div><div class='add'>+	list_add_tail(&amp;devlink_rate-&gt;list, &amp;devlink-&gt;rate_list);</div><div class='add'>+	devlink_port-&gt;devlink_rate = devlink_rate;</div><div class='add'>+	devlink_rate_notify(devlink_rate, DEVLINK_CMD_RATE_NEW);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_rate_leaf_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_rate_leaf_destroy - destroy devlink rate leaf</div><div class='add'>+ *</div><div class='add'>+ * @devlink_port: devlink port linked to the rate object</div><div class='add'>+ *</div><div class='add'>+ * Destroy the devlink rate object of type leaf on provided @devlink_port.</div><div class='add'>+ */</div><div class='add'>+void devl_rate_leaf_destroy(struct devlink_port *devlink_port)</div><div class='add'>+{</div><div class='add'>+	struct devlink_rate *devlink_rate = devlink_port-&gt;devlink_rate;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink_port-&gt;devlink);</div><div class='add'>+	if (!devlink_rate)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink_rate_notify(devlink_rate, DEVLINK_CMD_RATE_DEL);</div><div class='add'>+	if (devlink_rate-&gt;parent)</div><div class='add'>+		refcount_dec(&amp;devlink_rate-&gt;parent-&gt;refcnt);</div><div class='add'>+	list_del(&amp;devlink_rate-&gt;list);</div><div class='add'>+	devlink_port-&gt;devlink_rate = NULL;</div><div class='add'>+	kfree(devlink_rate);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_rate_leaf_destroy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_rate_nodes_destroy - destroy all devlink rate nodes on device</div><div class='add'>+ * @devlink: devlink instance</div><div class='add'>+ *</div><div class='add'>+ * Unset parent for all rate objects and destroy all rate nodes</div><div class='add'>+ * on specified device.</div><div class='add'>+ */</div><div class='add'>+void devl_rate_nodes_destroy(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	struct devlink_rate *devlink_rate, *tmp;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_rate, &amp;devlink-&gt;rate_list, list) {</div><div class='add'>+		if (!devlink_rate-&gt;parent)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (devlink_rate_is_leaf(devlink_rate))</div><div class='add'>+			ops-&gt;rate_leaf_parent_set(devlink_rate, NULL, devlink_rate-&gt;priv,</div><div class='add'>+						  NULL, NULL);</div><div class='add'>+		else if (devlink_rate_is_node(devlink_rate))</div><div class='add'>+			ops-&gt;rate_node_parent_set(devlink_rate, NULL, devlink_rate-&gt;priv,</div><div class='add'>+						  NULL, NULL);</div><div class='add'>+</div><div class='add'>+		refcount_dec(&amp;devlink_rate-&gt;parent-&gt;refcnt);</div><div class='add'>+		devlink_rate-&gt;parent = NULL;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(devlink_rate, tmp, &amp;devlink-&gt;rate_list, list) {</div><div class='add'>+		if (devlink_rate_is_node(devlink_rate)) {</div><div class='add'>+			ops-&gt;rate_node_del(devlink_rate, devlink_rate-&gt;priv, NULL);</div><div class='add'>+			list_del(&amp;devlink_rate-&gt;list);</div><div class='add'>+			kfree(devlink_rate-&gt;name);</div><div class='add'>+			kfree(devlink_rate);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_rate_nodes_destroy);</div><div class='head'>diff --git a/net/devlink/region.c b/net/devlink/region.c<br/>new file mode 100644<br/>index 000000000000..d6e5805cf3a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/region.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/region.c</a></div><div class='hunk'>@@ -0,0 +1,1258 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_region {</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct devlink_port *port;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	union {</div><div class='add'>+		const struct devlink_region_ops *ops;</div><div class='add'>+		const struct devlink_port_region_ops *port_ops;</div><div class='add'>+	};</div><div class='add'>+	struct mutex snapshot_lock; /* protects snapshot_list,</div><div class='add'>+				     * max_snapshots and cur_snapshots</div><div class='add'>+				     * consistency.</div><div class='add'>+				     */</div><div class='add'>+	struct list_head snapshot_list;</div><div class='add'>+	u32 max_snapshots;</div><div class='add'>+	u32 cur_snapshots;</div><div class='add'>+	u64 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devlink_snapshot {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	u8 *data;</div><div class='add'>+	u32 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink_region *</div><div class='add'>+devlink_region_get_by_name(struct devlink *devlink, const char *region_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;devlink-&gt;region_list, list)</div><div class='add'>+		if (!strcmp(region-&gt;ops-&gt;name, region_name))</div><div class='add'>+			return region;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_region *</div><div class='add'>+devlink_port_region_get_by_name(struct devlink_port *port,</div><div class='add'>+				const char *region_name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;port-&gt;region_list, list)</div><div class='add'>+		if (!strcmp(region-&gt;port_ops-&gt;name, region_name))</div><div class='add'>+			return region;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_snapshot *</div><div class='add'>+devlink_region_snapshot_get_by_id(struct devlink_region *region, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct devlink_snapshot *snapshot;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(snapshot, &amp;region-&gt;snapshot_list, list)</div><div class='add'>+		if (snapshot-&gt;id == id)</div><div class='add'>+			return snapshot;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_region_snapshot_id_put(struct sk_buff *msg,</div><div class='add'>+					     struct devlink *devlink,</div><div class='add'>+					     struct devlink_snapshot *snapshot)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *snap_attr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snap_attr = nla_nest_start_noflag(msg, DEVLINK_ATTR_REGION_SNAPSHOT);</div><div class='add'>+	if (!snap_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(msg, DEVLINK_ATTR_REGION_SNAPSHOT_ID, snapshot-&gt;id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, snap_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, snap_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_region_snapshots_id_put(struct sk_buff *msg,</div><div class='add'>+					      struct devlink *devlink,</div><div class='add'>+					      struct devlink_region *region)</div><div class='add'>+{</div><div class='add'>+	struct devlink_snapshot *snapshot;</div><div class='add'>+	struct nlattr *snapshots_attr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snapshots_attr = nla_nest_start_noflag(msg,</div><div class='add'>+					       DEVLINK_ATTR_REGION_SNAPSHOTS);</div><div class='add'>+	if (!snapshots_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(snapshot, &amp;region-&gt;snapshot_list, list) {</div><div class='add'>+		err = devlink_nl_region_snapshot_id_put(msg, devlink, snapshot);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, snapshots_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, snapshots_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				  enum devlink_command cmd, u32 portid,</div><div class='add'>+				  u32 seq, int flags,</div><div class='add'>+				  struct devlink_region *region)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_handle(msg, devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (region-&gt;port) {</div><div class='add'>+		err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+				  region-&gt;port-&gt;index);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, region-&gt;ops-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_SIZE, region-&gt;size);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(msg, DEVLINK_ATTR_REGION_MAX_SNAPSHOTS,</div><div class='add'>+			  region-&gt;max_snapshots);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_region_snapshots_id_put(msg, devlink, region);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+devlink_nl_region_notify_build(struct devlink_region *region,</div><div class='add'>+			       struct devlink_snapshot *snapshot,</div><div class='add'>+			       enum devlink_command cmd, u32 portid, u32 seq)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, 0, cmd);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_handle(msg, devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_cancel_msg;</div><div class='add'>+</div><div class='add'>+	if (region-&gt;port) {</div><div class='add'>+		err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+				  region-&gt;port-&gt;index);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_cancel_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME,</div><div class='add'>+			     region-&gt;ops-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_cancel_msg;</div><div class='add'>+</div><div class='add'>+	if (snapshot) {</div><div class='add'>+		err = nla_put_u32(msg, DEVLINK_ATTR_REGION_SNAPSHOT_ID,</div><div class='add'>+				  snapshot-&gt;id);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_cancel_msg;</div><div class='add'>+	} else {</div><div class='add'>+		err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_SIZE,</div><div class='add'>+					 region-&gt;size);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_cancel_msg;</div><div class='add'>+	}</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return msg;</div><div class='add'>+</div><div class='add'>+out_cancel_msg:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+out_free_msg:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_nl_region_notify(struct devlink_region *region,</div><div class='add'>+				     struct devlink_snapshot *snapshot,</div><div class='add'>+				     enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cmd != DEVLINK_CMD_REGION_NEW &amp;&amp; cmd != DEVLINK_CMD_REGION_DEL);</div><div class='add'>+</div><div class='add'>+	if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = devlink_nl_region_notify_build(region, snapshot, cmd, 0, 0);</div><div class='add'>+	if (IS_ERR(msg))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_regions_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;devlink-&gt;region_list, list)</div><div class='add'>+		devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_regions_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(region, &amp;devlink-&gt;region_list, list)</div><div class='add'>+		devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __devlink_snapshot_id_increment - Increment number of snapshots using an id</div><div class='add'>+ *	@devlink: devlink instance</div><div class='add'>+ *	@id: the snapshot id</div><div class='add'>+ *</div><div class='add'>+ *	Track when a new snapshot begins using an id. Load the count for the</div><div class='add'>+ *	given id from the snapshot xarray, increment it, and store it back.</div><div class='add'>+ *</div><div class='add'>+ *	Called when a new snapshot is created with the given id.</div><div class='add'>+ *</div><div class='add'>+ *	The id *must* have been previously allocated by</div><div class='add'>+ *	devlink_region_snapshot_id_get().</div><div class='add'>+ *</div><div class='add'>+ *	Returns 0 on success, or an error on failure.</div><div class='add'>+ */</div><div class='add'>+static int __devlink_snapshot_id_increment(struct devlink *devlink, u32 id)</div><div class='add'>+{</div><div class='add'>+	unsigned long count;</div><div class='add'>+	void *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	p = xa_load(&amp;devlink-&gt;snapshot_ids, id);</div><div class='add'>+	if (WARN_ON(!p)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!xa_is_value(p))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = xa_to_value(p);</div><div class='add'>+	count++;</div><div class='add'>+</div><div class='add'>+	err = xa_err(__xa_store(&amp;devlink-&gt;snapshot_ids, id, xa_mk_value(count),</div><div class='add'>+				GFP_ATOMIC));</div><div class='add'>+unlock:</div><div class='add'>+	xa_unlock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __devlink_snapshot_id_decrement - Decrease number of snapshots using an id</div><div class='add'>+ *	@devlink: devlink instance</div><div class='add'>+ *	@id: the snapshot id</div><div class='add'>+ *</div><div class='add'>+ *	Track when a snapshot is deleted and stops using an id. Load the count</div><div class='add'>+ *	for the given id from the snapshot xarray, decrement it, and store it</div><div class='add'>+ *	back.</div><div class='add'>+ *</div><div class='add'>+ *	If the count reaches zero, erase this id from the xarray, freeing it</div><div class='add'>+ *	up for future re-use by devlink_region_snapshot_id_get().</div><div class='add'>+ *</div><div class='add'>+ *	Called when a snapshot using the given id is deleted, and when the</div><div class='add'>+ *	initial allocator of the id is finished using it.</div><div class='add'>+ */</div><div class='add'>+static void __devlink_snapshot_id_decrement(struct devlink *devlink, u32 id)</div><div class='add'>+{</div><div class='add'>+	unsigned long count;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	p = xa_load(&amp;devlink-&gt;snapshot_ids, id);</div><div class='add'>+	if (WARN_ON(!p))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!xa_is_value(p)))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	count = xa_to_value(p);</div><div class='add'>+</div><div class='add'>+	if (count &gt; 1) {</div><div class='add'>+		count--;</div><div class='add'>+		__xa_store(&amp;devlink-&gt;snapshot_ids, id, xa_mk_value(count),</div><div class='add'>+			   GFP_ATOMIC);</div><div class='add'>+	} else {</div><div class='add'>+		/* If this was the last user, we can erase this id */</div><div class='add'>+		__xa_erase(&amp;devlink-&gt;snapshot_ids, id);</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	xa_unlock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__devlink_snapshot_id_insert - Insert a specific snapshot ID</div><div class='add'>+ *	@devlink: devlink instance</div><div class='add'>+ *	@id: the snapshot id</div><div class='add'>+ *</div><div class='add'>+ *	Mark the given snapshot id as used by inserting a zero value into the</div><div class='add'>+ *	snapshot xarray.</div><div class='add'>+ *</div><div class='add'>+ *	This must be called while holding the devlink instance lock. Unlike</div><div class='add'>+ *	devlink_snapshot_id_get, the initial reference count is zero, not one.</div><div class='add'>+ *	It is expected that the id will immediately be used before</div><div class='add'>+ *	releasing the devlink instance lock.</div><div class='add'>+ *</div><div class='add'>+ *	Returns zero on success, or an error code if the snapshot id could not</div><div class='add'>+ *	be inserted.</div><div class='add'>+ */</div><div class='add'>+static int __devlink_snapshot_id_insert(struct devlink *devlink, u32 id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	if (xa_load(&amp;devlink-&gt;snapshot_ids, id)) {</div><div class='add'>+		xa_unlock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+	err = xa_err(__xa_store(&amp;devlink-&gt;snapshot_ids, id, xa_mk_value(0),</div><div class='add'>+				GFP_ATOMIC));</div><div class='add'>+	xa_unlock(&amp;devlink-&gt;snapshot_ids);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__devlink_region_snapshot_id_get - get snapshot ID</div><div class='add'>+ *	@devlink: devlink instance</div><div class='add'>+ *	@id: storage to return snapshot id</div><div class='add'>+ *</div><div class='add'>+ *	Allocates a new snapshot id. Returns zero on success, or a negative</div><div class='add'>+ *	error on failure. Must be called while holding the devlink instance</div><div class='add'>+ *	lock.</div><div class='add'>+ *</div><div class='add'>+ *	Snapshot IDs are tracked using an xarray which stores the number of</div><div class='add'>+ *	users of the snapshot id.</div><div class='add'>+ *</div><div class='add'>+ *	Note that the caller of this function counts as a 'user', in order to</div><div class='add'>+ *	avoid race conditions. The caller must release its hold on the</div><div class='add'>+ *	snapshot by using devlink_region_snapshot_id_put.</div><div class='add'>+ */</div><div class='add'>+static int __devlink_region_snapshot_id_get(struct devlink *devlink, u32 *id)</div><div class='add'>+{</div><div class='add'>+	return xa_alloc(&amp;devlink-&gt;snapshot_ids, id, xa_mk_value(1),</div><div class='add'>+			xa_limit_32b, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__devlink_region_snapshot_create - create a new snapshot</div><div class='add'>+ *	This will add a new snapshot of a region. The snapshot</div><div class='add'>+ *	will be stored on the region struct and can be accessed</div><div class='add'>+ *	from devlink. This is useful for future analyses of snapshots.</div><div class='add'>+ *	Multiple snapshots can be created on a region.</div><div class='add'>+ *	The @snapshot_id should be obtained using the getter function.</div><div class='add'>+ *</div><div class='add'>+ *	Must be called only while holding the region snapshot lock.</div><div class='add'>+ *</div><div class='add'>+ *	@region: devlink region of the snapshot</div><div class='add'>+ *	@data: snapshot data</div><div class='add'>+ *	@snapshot_id: snapshot id to be created</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+__devlink_region_snapshot_create(struct devlink_region *region,</div><div class='add'>+				 u8 *data, u32 snapshot_id)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+	struct devlink_snapshot *snapshot;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;region-&gt;snapshot_lock);</div><div class='add'>+</div><div class='add'>+	/* check if region can hold one more snapshot */</div><div class='add'>+	if (region-&gt;cur_snapshots == region-&gt;max_snapshots)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (devlink_region_snapshot_get_by_id(region, snapshot_id))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	snapshot = kzalloc(sizeof(*snapshot), GFP_KERNEL);</div><div class='add'>+	if (!snapshot)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = __devlink_snapshot_id_increment(devlink, snapshot_id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_snapshot_id_increment;</div><div class='add'>+</div><div class='add'>+	snapshot-&gt;id = snapshot_id;</div><div class='add'>+	snapshot-&gt;region = region;</div><div class='add'>+	snapshot-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;snapshot-&gt;list, &amp;region-&gt;snapshot_list);</div><div class='add'>+</div><div class='add'>+	region-&gt;cur_snapshots++;</div><div class='add'>+</div><div class='add'>+	devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_NEW);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_snapshot_id_increment:</div><div class='add'>+	kfree(snapshot);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_region_snapshot_del(struct devlink_region *region,</div><div class='add'>+					struct devlink_snapshot *snapshot)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;region-&gt;snapshot_lock);</div><div class='add'>+</div><div class='add'>+	devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_DEL);</div><div class='add'>+	region-&gt;cur_snapshots--;</div><div class='add'>+	list_del(&amp;snapshot-&gt;list);</div><div class='add'>+	region-&gt;ops-&gt;destructor(snapshot-&gt;data);</div><div class='add'>+	__devlink_snapshot_id_decrement(devlink, snapshot-&gt;id);</div><div class='add'>+	kfree(snapshot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_region_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_port *port = NULL;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	const char *region_name;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_REGION_NAME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		index = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+</div><div class='add'>+		port = devlink_port_get_by_index(devlink, index);</div><div class='add'>+		if (!port)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	region_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='add'>+	if (port)</div><div class='add'>+		region = devlink_port_region_get_by_name(port, region_name);</div><div class='add'>+	else</div><div class='add'>+		region = devlink_region_get_by_name(devlink, region_name);</div><div class='add'>+</div><div class='add'>+	if (!region)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_region_fill(msg, devlink, DEVLINK_CMD_REGION_GET,</div><div class='add'>+				     info-&gt;snd_portid, info-&gt;snd_seq, 0,</div><div class='add'>+				     region);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_cmd_region_get_port_dumpit(struct sk_buff *msg,</div><div class='add'>+						 struct netlink_callback *cb,</div><div class='add'>+						 struct devlink_port *port,</div><div class='add'>+						 int *idx, int start, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;port-&gt;region_list, list) {</div><div class='add'>+		if (*idx &lt; start) {</div><div class='add'>+			(*idx)++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_region_fill(msg, port-&gt;devlink,</div><div class='add'>+					     DEVLINK_CMD_REGION_GET,</div><div class='add'>+					     NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					     cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					     flags, region);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		(*idx)++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_region_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					  struct devlink *devlink,</div><div class='add'>+					  struct netlink_callback *cb,</div><div class='add'>+					  int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	struct devlink_port *port;</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;devlink-&gt;region_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_region_fill(msg, devlink,</div><div class='add'>+					     DEVLINK_CMD_REGION_GET,</div><div class='add'>+					     NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					     cb-&gt;nlh-&gt;nlmsg_seq, flags,</div><div class='add'>+					     region);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;ports, port_index, port) {</div><div class='add'>+		err = devlink_nl_cmd_region_get_port_dumpit(msg, cb, port, &amp;idx,</div><div class='add'>+							    state-&gt;idx, flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_region_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				 struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_region_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_snapshot *snapshot;</div><div class='add'>+	struct devlink_port *port = NULL;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	const char *region_name;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	u32 snapshot_id;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_REGION_NAME) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_REGION_SNAPSHOT_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	region_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='add'>+	snapshot_id = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		index = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+</div><div class='add'>+		port = devlink_port_get_by_index(devlink, index);</div><div class='add'>+		if (!port)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port)</div><div class='add'>+		region = devlink_port_region_get_by_name(port, region_name);</div><div class='add'>+	else</div><div class='add'>+		region = devlink_region_get_by_name(devlink, region_name);</div><div class='add'>+</div><div class='add'>+	if (!region)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);</div><div class='add'>+	if (!snapshot) {</div><div class='add'>+		mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_region_snapshot_del(region, snapshot);</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_snapshot *snapshot;</div><div class='add'>+	struct devlink_port *port = NULL;</div><div class='add'>+	struct nlattr *snapshot_id_attr;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	const char *region_name;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	u32 snapshot_id;</div><div class='add'>+	u8 *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_REGION_NAME)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "No region name provided");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	region_name = nla_data(info-&gt;attrs[DEVLINK_ATTR_REGION_NAME]);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		index = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+</div><div class='add'>+		port = devlink_port_get_by_index(devlink, index);</div><div class='add'>+		if (!port)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port)</div><div class='add'>+		region = devlink_port_region_get_by_name(port, region_name);</div><div class='add'>+	else</div><div class='add'>+		region = devlink_region_get_by_name(devlink, region_name);</div><div class='add'>+</div><div class='add'>+	if (!region) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "The requested region does not exist");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!region-&gt;ops-&gt;snapshot) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "The requested region does not support taking an immediate snapshot");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+</div><div class='add'>+	if (region-&gt;cur_snapshots == region-&gt;max_snapshots) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "The region has reached the maximum number of stored snapshots");</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snapshot_id_attr = info-&gt;attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID];</div><div class='add'>+	if (snapshot_id_attr) {</div><div class='add'>+		snapshot_id = nla_get_u32(snapshot_id_attr);</div><div class='add'>+</div><div class='add'>+		if (devlink_region_snapshot_get_by_id(region, snapshot_id)) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "The requested snapshot id is already in use");</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = __devlink_snapshot_id_insert(devlink, snapshot_id);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+	} else {</div><div class='add'>+		err = __devlink_region_snapshot_id_get(devlink, &amp;snapshot_id);</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack, "Failed to allocate a new snapshot id");</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port)</div><div class='add'>+		err = region-&gt;port_ops-&gt;snapshot(port, region-&gt;port_ops,</div><div class='add'>+						 info-&gt;extack, &amp;data);</div><div class='add'>+	else</div><div class='add'>+		err = region-&gt;ops-&gt;snapshot(devlink, region-&gt;ops,</div><div class='add'>+					    info-&gt;extack, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_snapshot_capture;</div><div class='add'>+</div><div class='add'>+	err = __devlink_region_snapshot_create(region, data, snapshot_id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_snapshot_create;</div><div class='add'>+</div><div class='add'>+	if (!snapshot_id_attr) {</div><div class='add'>+		struct sk_buff *msg;</div><div class='add'>+</div><div class='add'>+		snapshot = devlink_region_snapshot_get_by_id(region,</div><div class='add'>+							     snapshot_id);</div><div class='add'>+		if (WARN_ON(!snapshot)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg = devlink_nl_region_notify_build(region, snapshot,</div><div class='add'>+						     DEVLINK_CMD_REGION_NEW,</div><div class='add'>+						     info-&gt;snd_portid,</div><div class='add'>+						     info-&gt;snd_seq);</div><div class='add'>+		err = PTR_ERR_OR_ZERO(msg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_notify;</div><div class='add'>+</div><div class='add'>+		err = genlmsg_reply(msg, info);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_notify;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_snapshot_create:</div><div class='add'>+	region-&gt;ops-&gt;destructor(data);</div><div class='add'>+err_snapshot_capture:</div><div class='add'>+	__devlink_snapshot_id_decrement(devlink, snapshot_id);</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_notify:</div><div class='add'>+	devlink_region_snapshot_del(region, snapshot);</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_cmd_region_read_chunk_fill(struct sk_buff *msg,</div><div class='add'>+						 u8 *chunk, u32 chunk_size,</div><div class='add'>+						 u64 addr)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *chunk_attr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	chunk_attr = nla_nest_start_noflag(msg, DEVLINK_ATTR_REGION_CHUNK);</div><div class='add'>+	if (!chunk_attr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = nla_put(msg, DEVLINK_ATTR_REGION_CHUNK_DATA, chunk_size, chunk);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_CHUNK_ADDR, addr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, chunk_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, chunk_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEVLINK_REGION_READ_CHUNK_SIZE 256</div><div class='add'>+</div><div class='add'>+typedef int devlink_chunk_fill_t(void *cb_priv, u8 *chunk, u32 chunk_size,</div><div class='add'>+				 u64 curr_offset,</div><div class='add'>+				 struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_region_read_fill(struct sk_buff *skb, devlink_chunk_fill_t *cb,</div><div class='add'>+			    void *cb_priv, u64 start_offset, u64 end_offset,</div><div class='add'>+			    u64 *new_offset, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u64 curr_offset = start_offset;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	/* Allocate and re-use a single buffer */</div><div class='add'>+	data = kmalloc(DEVLINK_REGION_READ_CHUNK_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	*new_offset = start_offset;</div><div class='add'>+</div><div class='add'>+	while (curr_offset &lt; end_offset) {</div><div class='add'>+		u32 data_size;</div><div class='add'>+</div><div class='add'>+		data_size = min_t(u32, end_offset - curr_offset,</div><div class='add'>+				  DEVLINK_REGION_READ_CHUNK_SIZE);</div><div class='add'>+</div><div class='add'>+		err = cb(cb_priv, data, data_size, curr_offset, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = devlink_nl_cmd_region_read_chunk_fill(skb, data, data_size, curr_offset);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		curr_offset += data_size;</div><div class='add'>+	}</div><div class='add'>+	*new_offset = curr_offset;</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_region_snapshot_fill(void *cb_priv, u8 *chunk, u32 chunk_size,</div><div class='add'>+			     u64 curr_offset,</div><div class='add'>+			     struct netlink_ext_ack __always_unused *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_snapshot *snapshot = cb_priv;</div><div class='add'>+</div><div class='add'>+	memcpy(chunk, &amp;snapshot-&gt;data[curr_offset], chunk_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_region_port_direct_fill(void *cb_priv, u8 *chunk, u32 chunk_size,</div><div class='add'>+				u64 curr_offset, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region = cb_priv;</div><div class='add'>+</div><div class='add'>+	return region-&gt;port_ops-&gt;read(region-&gt;port, region-&gt;port_ops, extack,</div><div class='add'>+				      curr_offset, chunk_size, chunk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_region_direct_fill(void *cb_priv, u8 *chunk, u32 chunk_size,</div><div class='add'>+			   u64 curr_offset, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region = cb_priv;</div><div class='add'>+</div><div class='add'>+	return region-&gt;ops-&gt;read(region-&gt;devlink, region-&gt;ops, extack,</div><div class='add'>+				 curr_offset, chunk_size, chunk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_region_read_dumpit(struct sk_buff *skb,</div><div class='add'>+				  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct nlattr *chunks_attr, *region_attr, *snapshot_attr;</div><div class='add'>+	u64 ret_offset, start_offset, end_offset = U64_MAX;</div><div class='add'>+	struct nlattr **attrs = info-&gt;info.attrs;</div><div class='add'>+	struct devlink_port *port = NULL;</div><div class='add'>+	devlink_chunk_fill_t *region_cb;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	const char *region_name;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	void *region_cb_priv;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	start_offset = state-&gt;start_offset;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_get_from_attrs_lock(sock_net(cb-&gt;skb-&gt;sk), attrs,</div><div class='add'>+					      false);</div><div class='add'>+	if (IS_ERR(devlink))</div><div class='add'>+		return PTR_ERR(devlink);</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_REGION_NAME]) {</div><div class='add'>+		NL_SET_ERR_MSG(cb-&gt;extack, "No region name provided");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {</div><div class='add'>+		index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);</div><div class='add'>+</div><div class='add'>+		port = devlink_port_get_by_index(devlink, index);</div><div class='add'>+		if (!port) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	region_attr = attrs[DEVLINK_ATTR_REGION_NAME];</div><div class='add'>+	region_name = nla_data(region_attr);</div><div class='add'>+</div><div class='add'>+	if (port)</div><div class='add'>+		region = devlink_port_region_get_by_name(port, region_name);</div><div class='add'>+	else</div><div class='add'>+		region = devlink_region_get_by_name(devlink, region_name);</div><div class='add'>+</div><div class='add'>+	if (!region) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(cb-&gt;extack, region_attr, "Requested region does not exist");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snapshot_attr = attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID];</div><div class='add'>+	if (!snapshot_attr) {</div><div class='add'>+		if (!nla_get_flag(attrs[DEVLINK_ATTR_REGION_DIRECT])) {</div><div class='add'>+			NL_SET_ERR_MSG(cb-&gt;extack, "No snapshot id provided");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!region-&gt;ops-&gt;read) {</div><div class='add'>+			NL_SET_ERR_MSG(cb-&gt;extack, "Requested region does not support direct read");</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (port)</div><div class='add'>+			region_cb = &amp;devlink_region_port_direct_fill;</div><div class='add'>+		else</div><div class='add'>+			region_cb = &amp;devlink_region_direct_fill;</div><div class='add'>+		region_cb_priv = region;</div><div class='add'>+	} else {</div><div class='add'>+		struct devlink_snapshot *snapshot;</div><div class='add'>+		u32 snapshot_id;</div><div class='add'>+</div><div class='add'>+		if (nla_get_flag(attrs[DEVLINK_ATTR_REGION_DIRECT])) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(cb-&gt;extack, snapshot_attr, "Direct region read does not use snapshot");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snapshot_id = nla_get_u32(snapshot_attr);</div><div class='add'>+		snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);</div><div class='add'>+		if (!snapshot) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(cb-&gt;extack, snapshot_attr, "Requested snapshot does not exist");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+		region_cb = &amp;devlink_region_snapshot_fill;</div><div class='add'>+		region_cb_priv = snapshot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR] &amp;&amp;</div><div class='add'>+	    attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]) {</div><div class='add'>+		if (!start_offset)</div><div class='add'>+			start_offset =</div><div class='add'>+				nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR]);</div><div class='add'>+</div><div class='add'>+		end_offset = nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR]);</div><div class='add'>+		end_offset += nla_get_u64(attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (end_offset &gt; region-&gt;size)</div><div class='add'>+		end_offset = region-&gt;size;</div><div class='add'>+</div><div class='add'>+	/* return 0 if there is no further data to read */</div><div class='add'>+	if (start_offset == end_offset) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			  &amp;devlink_nl_family, NLM_F_ACK | NLM_F_MULTI,</div><div class='add'>+			  DEVLINK_CMD_REGION_READ);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_put_handle(skb, devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (region-&gt;port) {</div><div class='add'>+		err = nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX,</div><div class='add'>+				  region-&gt;port-&gt;index);</div><div class='add'>+		if (err)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(skb, DEVLINK_ATTR_REGION_NAME, region_name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	chunks_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_REGION_CHUNKS);</div><div class='add'>+	if (!chunks_attr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_region_read_fill(skb, region_cb, region_cb_priv,</div><div class='add'>+					  start_offset, end_offset, &amp;ret_offset,</div><div class='add'>+					  cb-&gt;extack);</div><div class='add'>+</div><div class='add'>+	if (err &amp;&amp; err != -EMSGSIZE)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	/* Check if there was any progress done to prevent infinite loop */</div><div class='add'>+	if (ret_offset == start_offset) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;start_offset = ret_offset;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, chunks_attr);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+out_unlock:</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	devlink_put(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_region_create - create a new address region</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @ops: region operations and name</div><div class='add'>+ * @region_max_snapshots: Maximum supported number of snapshots for region</div><div class='add'>+ * @region_size: size of region</div><div class='add'>+ */</div><div class='add'>+struct devlink_region *devl_region_create(struct devlink *devlink,</div><div class='add'>+					  const struct devlink_region_ops *ops,</div><div class='add'>+					  u32 region_max_snapshots,</div><div class='add'>+					  u64 region_size)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ops) || WARN_ON(!ops-&gt;destructor))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (devlink_region_get_by_name(devlink, ops-&gt;name))</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+</div><div class='add'>+	region = kzalloc(sizeof(*region), GFP_KERNEL);</div><div class='add'>+	if (!region)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	region-&gt;devlink = devlink;</div><div class='add'>+	region-&gt;max_snapshots = region_max_snapshots;</div><div class='add'>+	region-&gt;ops = ops;</div><div class='add'>+	region-&gt;size = region_size;</div><div class='add'>+	INIT_LIST_HEAD(&amp;region-&gt;snapshot_list);</div><div class='add'>+	mutex_init(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	list_add_tail(&amp;region-&gt;list, &amp;devlink-&gt;region_list);</div><div class='add'>+	devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW);</div><div class='add'>+</div><div class='add'>+	return region;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_region_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_region_create - create a new address region</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@ops: region operations and name</div><div class='add'>+ *	@region_max_snapshots: Maximum supported number of snapshots for region</div><div class='add'>+ *	@region_size: size of region</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+struct devlink_region *</div><div class='add'>+devlink_region_create(struct devlink *devlink,</div><div class='add'>+		      const struct devlink_region_ops *ops,</div><div class='add'>+		      u32 region_max_snapshots, u64 region_size)</div><div class='add'>+{</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	region = devl_region_create(devlink, ops, region_max_snapshots,</div><div class='add'>+				    region_size);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return region;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_region_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_port_region_create - create a new address region for a port</div><div class='add'>+ *</div><div class='add'>+ *	@port: devlink port</div><div class='add'>+ *	@ops: region operations and name</div><div class='add'>+ *	@region_max_snapshots: Maximum supported number of snapshots for region</div><div class='add'>+ *	@region_size: size of region</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+struct devlink_region *</div><div class='add'>+devlink_port_region_create(struct devlink_port *port,</div><div class='add'>+			   const struct devlink_port_region_ops *ops,</div><div class='add'>+			   u32 region_max_snapshots, u64 region_size)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = port-&gt;devlink;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ASSERT_DEVLINK_PORT_INITIALIZED(port);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ops) || WARN_ON(!ops-&gt;destructor))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+</div><div class='add'>+	if (devlink_port_region_get_by_name(port, ops-&gt;name)) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	region = kzalloc(sizeof(*region), GFP_KERNEL);</div><div class='add'>+	if (!region) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	region-&gt;devlink = devlink;</div><div class='add'>+	region-&gt;port = port;</div><div class='add'>+	region-&gt;max_snapshots = region_max_snapshots;</div><div class='add'>+	region-&gt;port_ops = ops;</div><div class='add'>+	region-&gt;size = region_size;</div><div class='add'>+	INIT_LIST_HEAD(&amp;region-&gt;snapshot_list);</div><div class='add'>+	mutex_init(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	list_add_tail(&amp;region-&gt;list, &amp;port-&gt;region_list);</div><div class='add'>+	devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW);</div><div class='add'>+</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return region;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_port_region_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_region_destroy - destroy address region</div><div class='add'>+ *</div><div class='add'>+ * @region: devlink region to destroy</div><div class='add'>+ */</div><div class='add'>+void devl_region_destroy(struct devlink_region *region)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+	struct devlink_snapshot *snapshot, *ts;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+</div><div class='add'>+	/* Free all snapshots of region */</div><div class='add'>+	mutex_lock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	list_for_each_entry_safe(snapshot, ts, &amp;region-&gt;snapshot_list, list)</div><div class='add'>+		devlink_region_snapshot_del(region, snapshot);</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;region-&gt;list);</div><div class='add'>+	mutex_destroy(&amp;region-&gt;snapshot_lock);</div><div class='add'>+</div><div class='add'>+	devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_DEL);</div><div class='add'>+	kfree(region);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_region_destroy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_region_destroy - destroy address region</div><div class='add'>+ *</div><div class='add'>+ *	@region: devlink region to destroy</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+void devlink_region_destroy(struct devlink_region *region)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = region-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_region_destroy(region);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_region_destroy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_region_snapshot_id_get - get snapshot ID</div><div class='add'>+ *</div><div class='add'>+ *	This callback should be called when adding a new snapshot,</div><div class='add'>+ *	Driver should use the same id for multiple snapshots taken</div><div class='add'>+ *	on multiple regions at the same time/by the same trigger.</div><div class='add'>+ *</div><div class='add'>+ *	The caller of this function must use devlink_region_snapshot_id_put</div><div class='add'>+ *	when finished creating regions using this id.</div><div class='add'>+ *</div><div class='add'>+ *	Returns zero on success, or a negative error code on failure.</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@id: storage to return id</div><div class='add'>+ */</div><div class='add'>+int devlink_region_snapshot_id_get(struct devlink *devlink, u32 *id)</div><div class='add'>+{</div><div class='add'>+	return __devlink_region_snapshot_id_get(devlink, id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_region_snapshot_id_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_region_snapshot_id_put - put snapshot ID reference</div><div class='add'>+ *</div><div class='add'>+ *	This should be called by a driver after finishing creating snapshots</div><div class='add'>+ *	with an id. Doing so ensures that the ID can later be released in the</div><div class='add'>+ *	event that all snapshots using it have been destroyed.</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *	@id: id to release reference on</div><div class='add'>+ */</div><div class='add'>+void devlink_region_snapshot_id_put(struct devlink *devlink, u32 id)</div><div class='add'>+{</div><div class='add'>+	__devlink_snapshot_id_decrement(devlink, id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_region_snapshot_id_put);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_region_snapshot_create - create a new snapshot</div><div class='add'>+ *	This will add a new snapshot of a region. The snapshot</div><div class='add'>+ *	will be stored on the region struct and can be accessed</div><div class='add'>+ *	from devlink. This is useful for future analyses of snapshots.</div><div class='add'>+ *	Multiple snapshots can be created on a region.</div><div class='add'>+ *	The @snapshot_id should be obtained using the getter function.</div><div class='add'>+ *</div><div class='add'>+ *	@region: devlink region of the snapshot</div><div class='add'>+ *	@data: snapshot data</div><div class='add'>+ *	@snapshot_id: snapshot id to be created</div><div class='add'>+ */</div><div class='add'>+int devlink_region_snapshot_create(struct devlink_region *region,</div><div class='add'>+				   u8 *data, u32 snapshot_id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	err = __devlink_region_snapshot_create(region, data, snapshot_id);</div><div class='add'>+	mutex_unlock(&amp;region-&gt;snapshot_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_region_snapshot_create);</div><div class='head'>diff --git a/net/devlink/resource.c b/net/devlink/resource.c<br/>new file mode 100644<br/>index 000000000000..2d6324f3d91f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/resource.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/resource.c</a></div><div class='hunk'>@@ -0,0 +1,504 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct devlink_resource - devlink resource</div><div class='add'>+ * @name: name of the resource</div><div class='add'>+ * @id: id, per devlink instance</div><div class='add'>+ * @size: size of the resource</div><div class='add'>+ * @size_new: updated size of the resource, reload is needed</div><div class='add'>+ * @size_valid: valid in case the total size of the resource is valid</div><div class='add'>+ *              including its children</div><div class='add'>+ * @parent: parent resource</div><div class='add'>+ * @size_params: size parameters</div><div class='add'>+ * @list: parent list</div><div class='add'>+ * @resource_list: list of child resources</div><div class='add'>+ * @occ_get: occupancy getter callback</div><div class='add'>+ * @occ_get_priv: occupancy getter callback priv</div><div class='add'>+ */</div><div class='add'>+struct devlink_resource {</div><div class='add'>+	const char *name;</div><div class='add'>+	u64 id;</div><div class='add'>+	u64 size;</div><div class='add'>+	u64 size_new;</div><div class='add'>+	bool size_valid;</div><div class='add'>+	struct devlink_resource *parent;</div><div class='add'>+	struct devlink_resource_size_params size_params;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct list_head resource_list;</div><div class='add'>+	devlink_resource_occ_get_t *occ_get;</div><div class='add'>+	void *occ_get_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink_resource *</div><div class='add'>+devlink_resource_find(struct devlink *devlink,</div><div class='add'>+		      struct devlink_resource *resource, u64 resource_id)</div><div class='add'>+{</div><div class='add'>+	struct list_head *resource_list;</div><div class='add'>+</div><div class='add'>+	if (resource)</div><div class='add'>+		resource_list = &amp;resource-&gt;resource_list;</div><div class='add'>+	else</div><div class='add'>+		resource_list = &amp;devlink-&gt;resource_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(resource, resource_list, list) {</div><div class='add'>+		struct devlink_resource *child_resource;</div><div class='add'>+</div><div class='add'>+		if (resource-&gt;id == resource_id)</div><div class='add'>+			return resource;</div><div class='add'>+</div><div class='add'>+		child_resource = devlink_resource_find(devlink, resource,</div><div class='add'>+						       resource_id);</div><div class='add'>+		if (child_resource)</div><div class='add'>+			return child_resource;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_resource_validate_children(struct devlink_resource *resource)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *child_resource;</div><div class='add'>+	bool size_valid = true;</div><div class='add'>+	u64 parts_size = 0;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;resource-&gt;resource_list))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(child_resource, &amp;resource-&gt;resource_list, list)</div><div class='add'>+		parts_size += child_resource-&gt;size_new;</div><div class='add'>+</div><div class='add'>+	if (parts_size &gt; resource-&gt;size_new)</div><div class='add'>+		size_valid = false;</div><div class='add'>+out:</div><div class='add'>+	resource-&gt;size_valid = size_valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_resource_validate_size(struct devlink_resource *resource, u64 size,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u64 reminder;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (size &gt; resource-&gt;size_params.size_max) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Size larger than maximum");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (size &lt; resource-&gt;size_params.size_min) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Size smaller than minimum");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	div64_u64_rem(size, resource-&gt;size_params.size_granularity, &amp;reminder);</div><div class='add'>+	if (reminder) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Wrong granularity");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+	u64 resource_id;</div><div class='add'>+	u64 size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_RESOURCE_ID) ||</div><div class='add'>+	    GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_RESOURCE_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	resource_id = nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_RESOURCE_ID]);</div><div class='add'>+</div><div class='add'>+	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='add'>+	if (!resource)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	size = nla_get_u64(info-&gt;attrs[DEVLINK_ATTR_RESOURCE_SIZE]);</div><div class='add'>+	err = devlink_resource_validate_size(resource, size, info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	resource-&gt;size_new = size;</div><div class='add'>+	devlink_resource_validate_children(resource);</div><div class='add'>+	if (resource-&gt;parent)</div><div class='add'>+		devlink_resource_validate_children(resource-&gt;parent);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_resource_size_params_put(struct devlink_resource *resource,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource_size_params *size_params;</div><div class='add'>+</div><div class='add'>+	size_params = &amp;resource-&gt;size_params;</div><div class='add'>+	if (devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,</div><div class='add'>+			       size_params-&gt;size_granularity) ||</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,</div><div class='add'>+			       size_params-&gt;size_max) ||</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,</div><div class='add'>+			       size_params-&gt;size_min) ||</div><div class='add'>+	    nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_UNIT, size_params-&gt;unit))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_resource_occ_put(struct devlink_resource *resource,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!resource-&gt;occ_get)</div><div class='add'>+		return 0;</div><div class='add'>+	return devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_OCC,</div><div class='add'>+				  resource-&gt;occ_get(resource-&gt;occ_get_priv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,</div><div class='add'>+				struct devlink_resource *resource)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *child_resource;</div><div class='add'>+	struct nlattr *child_resource_attr;</div><div class='add'>+	struct nlattr *resource_attr;</div><div class='add'>+</div><div class='add'>+	resource_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_RESOURCE);</div><div class='add'>+	if (!resource_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(skb, DEVLINK_ATTR_RESOURCE_NAME, resource-&gt;name) ||</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource-&gt;size) ||</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_ID, resource-&gt;id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (resource-&gt;size != resource-&gt;size_new &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,</div><div class='add'>+			       resource-&gt;size_new))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_resource_occ_put(resource, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (devlink_resource_size_params_put(resource, skb))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (list_empty(&amp;resource-&gt;resource_list))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_SIZE_VALID,</div><div class='add'>+		       resource-&gt;size_valid))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	child_resource_attr = nla_nest_start_noflag(skb,</div><div class='add'>+						    DEVLINK_ATTR_RESOURCE_LIST);</div><div class='add'>+	if (!child_resource_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(child_resource, &amp;resource-&gt;resource_list, list) {</div><div class='add'>+		if (devlink_resource_put(devlink, skb, child_resource))</div><div class='add'>+			goto resource_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, child_resource_attr);</div><div class='add'>+out:</div><div class='add'>+	nla_nest_end(skb, resource_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+resource_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, child_resource_attr);</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, resource_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_resource_fill(struct genl_info *info,</div><div class='add'>+				 enum devlink_command cmd, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+	struct nlattr *resources_attr;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	bool incomplete;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	resource = list_first_entry(&amp;devlink-&gt;resource_list,</div><div class='add'>+				    struct devlink_resource, list);</div><div class='add'>+start_again:</div><div class='add'>+	err = devlink_nl_msg_reply_and_new(&amp;skb, info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;devlink_nl_family, NLM_F_MULTI, cmd);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(skb, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	resources_attr = nla_nest_start_noflag(skb,</div><div class='add'>+					       DEVLINK_ATTR_RESOURCE_LIST);</div><div class='add'>+	if (!resources_attr)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	incomplete = false;</div><div class='add'>+	i = 0;</div><div class='add'>+	list_for_each_entry_from(resource, &amp;devlink-&gt;resource_list, list) {</div><div class='add'>+		err = devlink_resource_put(devlink, skb, resource);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (!i)</div><div class='add'>+				goto err_resource_put;</div><div class='add'>+			incomplete = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	nla_nest_end(skb, resources_attr);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	if (incomplete)</div><div class='add'>+		goto start_again;</div><div class='add'>+send_done:</div><div class='add'>+	nlh = nlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			NLMSG_DONE, 0, flags | NLM_F_MULTI);</div><div class='add'>+	if (!nlh) {</div><div class='add'>+		err = devlink_nl_msg_reply_and_new(&amp;skb, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		goto send_done;</div><div class='add'>+	}</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+err_resource_put:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;resource_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return devlink_resource_fill(info, DEVLINK_CMD_RESOURCE_DUMP, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_resources_validate(struct devlink *devlink,</div><div class='add'>+			       struct devlink_resource *resource,</div><div class='add'>+			       struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct list_head *resource_list;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (resource)</div><div class='add'>+		resource_list = &amp;resource-&gt;resource_list;</div><div class='add'>+	else</div><div class='add'>+		resource_list = &amp;devlink-&gt;resource_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(resource, resource_list, list) {</div><div class='add'>+		if (!resource-&gt;size_valid)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = devlink_resources_validate(devlink, resource, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_resource_register - devlink resource register</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @resource_name: resource's name</div><div class='add'>+ * @resource_size: resource's size</div><div class='add'>+ * @resource_id: resource's id</div><div class='add'>+ * @parent_resource_id: resource's parent id</div><div class='add'>+ * @size_params: size parameters</div><div class='add'>+ *</div><div class='add'>+ * Generic resources should reuse the same names across drivers.</div><div class='add'>+ * Please see the generic resources list at:</div><div class='add'>+ * Documentation/networking/devlink/devlink-resource.rst</div><div class='add'>+ */</div><div class='add'>+int devl_resource_register(struct devlink *devlink,</div><div class='add'>+			   const char *resource_name,</div><div class='add'>+			   u64 resource_size,</div><div class='add'>+			   u64 resource_id,</div><div class='add'>+			   u64 parent_resource_id,</div><div class='add'>+			   const struct devlink_resource_size_params *size_params)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+	struct list_head *resource_list;</div><div class='add'>+	bool top_hierarchy;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	top_hierarchy = parent_resource_id == DEVLINK_RESOURCE_ID_PARENT_TOP;</div><div class='add'>+</div><div class='add'>+	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='add'>+	if (resource)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	resource = kzalloc(sizeof(*resource), GFP_KERNEL);</div><div class='add'>+	if (!resource)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (top_hierarchy) {</div><div class='add'>+		resource_list = &amp;devlink-&gt;resource_list;</div><div class='add'>+	} else {</div><div class='add'>+		struct devlink_resource *parent_resource;</div><div class='add'>+</div><div class='add'>+		parent_resource = devlink_resource_find(devlink, NULL,</div><div class='add'>+							parent_resource_id);</div><div class='add'>+		if (parent_resource) {</div><div class='add'>+			resource_list = &amp;parent_resource-&gt;resource_list;</div><div class='add'>+			resource-&gt;parent = parent_resource;</div><div class='add'>+		} else {</div><div class='add'>+			kfree(resource);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resource-&gt;name = resource_name;</div><div class='add'>+	resource-&gt;size = resource_size;</div><div class='add'>+	resource-&gt;size_new = resource_size;</div><div class='add'>+	resource-&gt;id = resource_id;</div><div class='add'>+	resource-&gt;size_valid = true;</div><div class='add'>+	memcpy(&amp;resource-&gt;size_params, size_params,</div><div class='add'>+	       sizeof(resource-&gt;size_params));</div><div class='add'>+	INIT_LIST_HEAD(&amp;resource-&gt;resource_list);</div><div class='add'>+	list_add_tail(&amp;resource-&gt;list, resource_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_resource_register);</div><div class='add'>+</div><div class='add'>+static void devlink_resource_unregister(struct devlink *devlink,</div><div class='add'>+					struct devlink_resource *resource)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *tmp, *child_resource;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(child_resource, tmp, &amp;resource-&gt;resource_list,</div><div class='add'>+				 list) {</div><div class='add'>+		devlink_resource_unregister(devlink, child_resource);</div><div class='add'>+		list_del(&amp;child_resource-&gt;list);</div><div class='add'>+		kfree(child_resource);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_resources_unregister - free all resources</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ */</div><div class='add'>+void devl_resources_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *tmp, *child_resource;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(child_resource, tmp, &amp;devlink-&gt;resource_list,</div><div class='add'>+				 list) {</div><div class='add'>+		devlink_resource_unregister(devlink, child_resource);</div><div class='add'>+		list_del(&amp;child_resource-&gt;list);</div><div class='add'>+		kfree(child_resource);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_resources_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devlink_resources_unregister - free all resources</div><div class='add'>+ *</div><div class='add'>+ *	@devlink: devlink</div><div class='add'>+ *</div><div class='add'>+ *	Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+void devlink_resources_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_resources_unregister(devlink);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_resources_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_resource_size_get - get and update size</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @resource_id: the requested resource id</div><div class='add'>+ * @p_resource_size: ptr to update</div><div class='add'>+ */</div><div class='add'>+int devl_resource_size_get(struct devlink *devlink,</div><div class='add'>+			   u64 resource_id,</div><div class='add'>+			   u64 *p_resource_size)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='add'>+	if (!resource)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*p_resource_size = resource-&gt;size_new;</div><div class='add'>+	resource-&gt;size = resource-&gt;size_new;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_resource_size_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_resource_occ_get_register - register occupancy getter</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @resource_id: resource id</div><div class='add'>+ * @occ_get: occupancy getter callback</div><div class='add'>+ * @occ_get_priv: occupancy getter callback priv</div><div class='add'>+ */</div><div class='add'>+void devl_resource_occ_get_register(struct devlink *devlink,</div><div class='add'>+				    u64 resource_id,</div><div class='add'>+				    devlink_resource_occ_get_t *occ_get,</div><div class='add'>+				    void *occ_get_priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='add'>+	if (WARN_ON(!resource))</div><div class='add'>+		return;</div><div class='add'>+	WARN_ON(resource-&gt;occ_get);</div><div class='add'>+</div><div class='add'>+	resource-&gt;occ_get = occ_get;</div><div class='add'>+	resource-&gt;occ_get_priv = occ_get_priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_resource_occ_get_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_resource_occ_get_unregister - unregister occupancy getter</div><div class='add'>+ *</div><div class='add'>+ * @devlink: devlink</div><div class='add'>+ * @resource_id: resource id</div><div class='add'>+ */</div><div class='add'>+void devl_resource_occ_get_unregister(struct devlink *devlink,</div><div class='add'>+				      u64 resource_id)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource *resource;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resource = devlink_resource_find(devlink, NULL, resource_id);</div><div class='add'>+	if (WARN_ON(!resource))</div><div class='add'>+		return;</div><div class='add'>+	WARN_ON(!resource-&gt;occ_get);</div><div class='add'>+</div><div class='add'>+	resource-&gt;occ_get = NULL;</div><div class='add'>+	resource-&gt;occ_get_priv = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_resource_occ_get_unregister);</div><div class='head'>diff --git a/net/devlink/sb.c b/net/devlink/sb.c<br/>new file mode 100644<br/>index 000000000000..0a76bb32502b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/sb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/sb.c</a></div><div class='hunk'>@@ -0,0 +1,995 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_sb {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	u32 size;</div><div class='add'>+	u16 ingress_pools_count;</div><div class='add'>+	u16 egress_pools_count;</div><div class='add'>+	u16 ingress_tc_count;</div><div class='add'>+	u16 egress_tc_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u16 devlink_sb_pool_count(struct devlink_sb *devlink_sb)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb-&gt;ingress_pools_count + devlink_sb-&gt;egress_pools_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_sb *devlink_sb_get_by_index(struct devlink *devlink,</div><div class='add'>+						  unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='add'>+		if (devlink_sb-&gt;index == sb_index)</div><div class='add'>+			return devlink_sb;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool devlink_sb_index_exists(struct devlink *devlink,</div><div class='add'>+				    unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_get_by_index(devlink, sb_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_sb *devlink_sb_get_from_attrs(struct devlink *devlink,</div><div class='add'>+						    struct nlattr **attrs)</div><div class='add'>+{</div><div class='add'>+	if (attrs[DEVLINK_ATTR_SB_INDEX]) {</div><div class='add'>+		u32 sb_index = nla_get_u32(attrs[DEVLINK_ATTR_SB_INDEX]);</div><div class='add'>+		struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+		devlink_sb = devlink_sb_get_by_index(devlink, sb_index);</div><div class='add'>+		if (!devlink_sb)</div><div class='add'>+			return ERR_PTR(-ENODEV);</div><div class='add'>+		return devlink_sb;</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_sb *devlink_sb_get_from_info(struct devlink *devlink,</div><div class='add'>+						   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_get_from_attrs(devlink, info-&gt;attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_sb_pool_index_get_from_attrs(struct devlink_sb *devlink_sb,</div><div class='add'>+						struct nlattr **attrs,</div><div class='add'>+						u16 *p_pool_index)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_SB_POOL_INDEX])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u16(attrs[DEVLINK_ATTR_SB_POOL_INDEX]);</div><div class='add'>+	if (val &gt;= devlink_sb_pool_count(devlink_sb))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*p_pool_index = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_sb_pool_index_get_from_info(struct devlink_sb *devlink_sb,</div><div class='add'>+					       struct genl_info *info,</div><div class='add'>+					       u16 *p_pool_index)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_pool_index_get_from_attrs(devlink_sb, info-&gt;attrs,</div><div class='add'>+						    p_pool_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_pool_type_get_from_attrs(struct nlattr **attrs,</div><div class='add'>+				    enum devlink_sb_pool_type *p_pool_type)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_SB_POOL_TYPE])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u8(attrs[DEVLINK_ATTR_SB_POOL_TYPE]);</div><div class='add'>+	if (val != DEVLINK_SB_POOL_TYPE_INGRESS &amp;&amp;</div><div class='add'>+	    val != DEVLINK_SB_POOL_TYPE_EGRESS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*p_pool_type = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_pool_type_get_from_info(struct genl_info *info,</div><div class='add'>+				   enum devlink_sb_pool_type *p_pool_type)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_pool_type_get_from_attrs(info-&gt;attrs, p_pool_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_th_type_get_from_attrs(struct nlattr **attrs,</div><div class='add'>+				  enum devlink_sb_threshold_type *p_th_type)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u8(attrs[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE]);</div><div class='add'>+	if (val != DEVLINK_SB_THRESHOLD_TYPE_STATIC &amp;&amp;</div><div class='add'>+	    val != DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*p_th_type = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_th_type_get_from_info(struct genl_info *info,</div><div class='add'>+				 enum devlink_sb_threshold_type *p_th_type)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_th_type_get_from_attrs(info-&gt;attrs, p_th_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_tc_index_get_from_attrs(struct devlink_sb *devlink_sb,</div><div class='add'>+				   struct nlattr **attrs,</div><div class='add'>+				   enum devlink_sb_pool_type pool_type,</div><div class='add'>+				   u16 *p_tc_index)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_SB_TC_INDEX])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u16(attrs[DEVLINK_ATTR_SB_TC_INDEX]);</div><div class='add'>+	if (pool_type == DEVLINK_SB_POOL_TYPE_INGRESS &amp;&amp;</div><div class='add'>+	    val &gt;= devlink_sb-&gt;ingress_tc_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (pool_type == DEVLINK_SB_POOL_TYPE_EGRESS &amp;&amp;</div><div class='add'>+	    val &gt;= devlink_sb-&gt;egress_tc_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*p_tc_index = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_sb_tc_index_get_from_info(struct devlink_sb *devlink_sb,</div><div class='add'>+				  struct genl_info *info,</div><div class='add'>+				  enum devlink_sb_pool_type pool_type,</div><div class='add'>+				  u16 *p_tc_index)</div><div class='add'>+{</div><div class='add'>+	return devlink_sb_tc_index_get_from_attrs(devlink_sb, info-&gt;attrs,</div><div class='add'>+						  pool_type, p_tc_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_sb_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			      struct devlink_sb *devlink_sb,</div><div class='add'>+			      enum devlink_command cmd, u32 portid,</div><div class='add'>+			      u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_SIZE, devlink_sb-&gt;size))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,</div><div class='add'>+			devlink_sb-&gt;ingress_pools_count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,</div><div class='add'>+			devlink_sb-&gt;egress_pools_count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_INGRESS_TC_COUNT,</div><div class='add'>+			devlink_sb-&gt;ingress_tc_count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_EGRESS_TC_COUNT,</div><div class='add'>+			devlink_sb-&gt;egress_tc_count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_sb_fill(msg, devlink, devlink_sb,</div><div class='add'>+				 DEVLINK_CMD_SB_NEW,</div><div class='add'>+				 info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			   struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_sb_fill(msg, devlink, devlink_sb,</div><div class='add'>+					 DEVLINK_CMD_SB_NEW,</div><div class='add'>+					 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					 cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_sb_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_sb_pool_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				   struct devlink_sb *devlink_sb,</div><div class='add'>+				   u16 pool_index, enum devlink_command cmd,</div><div class='add'>+				   u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_sb_pool_info pool_info;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;sb_pool_get(devlink, devlink_sb-&gt;index,</div><div class='add'>+					pool_index, &amp;pool_info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_TYPE, pool_info.pool_type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_POOL_SIZE, pool_info.size))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,</div><div class='add'>+		       pool_info.threshold_type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_POOL_CELL_SIZE,</div><div class='add'>+			pool_info.cell_size))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_pool_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='add'>+						  &amp;pool_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_pool_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_sb_pool_fill(msg, devlink, devlink_sb, pool_index,</div><div class='add'>+				      DEVLINK_CMD_SB_POOL_NEW,</div><div class='add'>+				      info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sb_pool_get_dumpit(struct sk_buff *msg, int start, int *p_idx,</div><div class='add'>+				struct devlink *devlink,</div><div class='add'>+				struct devlink_sb *devlink_sb,</div><div class='add'>+				u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	u16 pool_count = devlink_sb_pool_count(devlink_sb);</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (pool_index = 0; pool_index &lt; pool_count; pool_index++) {</div><div class='add'>+		if (*p_idx &lt; start) {</div><div class='add'>+			(*p_idx)++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_sb_pool_fill(msg, devlink,</div><div class='add'>+					      devlink_sb,</div><div class='add'>+					      pool_index,</div><div class='add'>+					      DEVLINK_CMD_SB_POOL_NEW,</div><div class='add'>+					      portid, seq, flags);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		(*p_idx)++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_sb_pool_get_dump_one(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_pool_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='add'>+		err = __sb_pool_get_dumpit(msg, state-&gt;idx, &amp;idx,</div><div class='add'>+					   devlink, devlink_sb,</div><div class='add'>+					   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					   cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err == -EOPNOTSUPP) {</div><div class='add'>+			err = 0;</div><div class='add'>+		} else if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_sb_pool_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_sb_pool_set(struct devlink *devlink, unsigned int sb_index,</div><div class='add'>+			       u16 pool_index, u32 size,</div><div class='add'>+			       enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_pool_set)</div><div class='add'>+		return ops-&gt;sb_pool_set(devlink, sb_index, pool_index,</div><div class='add'>+					size, threshold_type, extack);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	enum devlink_sb_threshold_type threshold_type;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	u32 size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='add'>+						  &amp;pool_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_th_type_get_from_info(info, &amp;threshold_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_SB_POOL_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	size = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_POOL_SIZE]);</div><div class='add'>+	return devlink_sb_pool_set(devlink, devlink_sb-&gt;index,</div><div class='add'>+				   pool_index, size, threshold_type,</div><div class='add'>+				   info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_sb_port_pool_fill(struct sk_buff *msg,</div><div class='add'>+					struct devlink *devlink,</div><div class='add'>+					struct devlink_port *devlink_port,</div><div class='add'>+					struct devlink_sb *devlink_sb,</div><div class='add'>+					u16 pool_index,</div><div class='add'>+					enum devlink_command cmd,</div><div class='add'>+					u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	u32 threshold;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;sb_port_pool_get(devlink_port, devlink_sb-&gt;index,</div><div class='add'>+				    pool_index, &amp;threshold);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_THRESHOLD, threshold))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_occ_port_pool_get) {</div><div class='add'>+		u32 cur;</div><div class='add'>+		u32 max;</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;sb_occ_port_pool_get(devlink_port, devlink_sb-&gt;index,</div><div class='add'>+						pool_index, &amp;cur, &amp;max);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			goto sb_occ_get_failure;</div><div class='add'>+		if (!err) {</div><div class='add'>+			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_CUR, cur))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_MAX, max))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+sb_occ_get_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_port_pool_get_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='add'>+						  &amp;pool_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_port_pool_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_sb_port_pool_fill(msg, devlink, devlink_port,</div><div class='add'>+					   devlink_sb, pool_index,</div><div class='add'>+					   DEVLINK_CMD_SB_PORT_POOL_NEW,</div><div class='add'>+					   info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sb_port_pool_get_dumpit(struct sk_buff *msg, int start, int *p_idx,</div><div class='add'>+				     struct devlink *devlink,</div><div class='add'>+				     struct devlink_sb *devlink_sb,</div><div class='add'>+				     u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	u16 pool_count = devlink_sb_pool_count(devlink_sb);</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;ports, port_index, devlink_port) {</div><div class='add'>+		for (pool_index = 0; pool_index &lt; pool_count; pool_index++) {</div><div class='add'>+			if (*p_idx &lt; start) {</div><div class='add'>+				(*p_idx)++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = devlink_nl_sb_port_pool_fill(msg, devlink,</div><div class='add'>+							   devlink_port,</div><div class='add'>+							   devlink_sb,</div><div class='add'>+							   pool_index,</div><div class='add'>+							   DEVLINK_CMD_SB_PORT_POOL_NEW,</div><div class='add'>+							   portid, seq, flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			(*p_idx)++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_sb_port_pool_get_dump_one(struct sk_buff *msg,</div><div class='add'>+				     struct devlink *devlink,</div><div class='add'>+				     struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_port_pool_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='add'>+		err = __sb_port_pool_get_dumpit(msg, state-&gt;idx, &amp;idx,</div><div class='add'>+						devlink, devlink_sb,</div><div class='add'>+						NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err == -EOPNOTSUPP) {</div><div class='add'>+			err = 0;</div><div class='add'>+		} else if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_port_pool_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_sb_port_pool_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_sb_port_pool_set(struct devlink_port *devlink_port,</div><div class='add'>+				    unsigned int sb_index, u16 pool_index,</div><div class='add'>+				    u32 threshold,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink_port-&gt;devlink-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_port_pool_set)</div><div class='add'>+		return ops-&gt;sb_port_pool_set(devlink_port, sb_index,</div><div class='add'>+					     pool_index, threshold, extack);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	u32 threshold;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='add'>+						  &amp;pool_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_SB_THRESHOLD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	threshold = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD]);</div><div class='add'>+	return devlink_sb_port_pool_set(devlink_port, devlink_sb-&gt;index,</div><div class='add'>+					pool_index, threshold, info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_sb_tc_pool_bind_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				struct devlink_port *devlink_port,</div><div class='add'>+				struct devlink_sb *devlink_sb, u16 tc_index,</div><div class='add'>+				enum devlink_sb_pool_type pool_type,</div><div class='add'>+				enum devlink_command cmd,</div><div class='add'>+				u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	u32 threshold;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;sb_tc_pool_bind_get(devlink_port, devlink_sb-&gt;index,</div><div class='add'>+				       tc_index, pool_type,</div><div class='add'>+				       &amp;pool_index, &amp;threshold);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_INDEX, devlink_sb-&gt;index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_TC_INDEX, tc_index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_SB_POOL_TYPE, pool_type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(msg, DEVLINK_ATTR_SB_POOL_INDEX, pool_index))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_SB_THRESHOLD, threshold))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_occ_tc_port_bind_get) {</div><div class='add'>+		u32 cur;</div><div class='add'>+		u32 max;</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;sb_occ_tc_port_bind_get(devlink_port,</div><div class='add'>+						   devlink_sb-&gt;index,</div><div class='add'>+						   tc_index, pool_type,</div><div class='add'>+						   &amp;cur, &amp;max);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+		if (!err) {</div><div class='add'>+			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_CUR, cur))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_MAX, max))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_get_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = devlink_port-&gt;devlink;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	enum devlink_sb_pool_type pool_type;</div><div class='add'>+	u16 tc_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_type_get_from_info(info, &amp;pool_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_tc_index_get_from_info(devlink_sb, info,</div><div class='add'>+						pool_type, &amp;tc_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_tc_pool_bind_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink, devlink_port,</div><div class='add'>+					      devlink_sb, tc_index, pool_type,</div><div class='add'>+					      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='add'>+					      info-&gt;snd_portid,</div><div class='add'>+					      info-&gt;snd_seq, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sb_tc_pool_bind_get_dumpit(struct sk_buff *msg,</div><div class='add'>+					int start, int *p_idx,</div><div class='add'>+					struct devlink *devlink,</div><div class='add'>+					struct devlink_sb *devlink_sb,</div><div class='add'>+					u32 portid, u32 seq, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	unsigned long port_index;</div><div class='add'>+	u16 tc_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;devlink-&gt;ports, port_index, devlink_port) {</div><div class='add'>+		for (tc_index = 0;</div><div class='add'>+		     tc_index &lt; devlink_sb-&gt;ingress_tc_count; tc_index++) {</div><div class='add'>+			if (*p_idx &lt; start) {</div><div class='add'>+				(*p_idx)++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink,</div><div class='add'>+							      devlink_port,</div><div class='add'>+							      devlink_sb,</div><div class='add'>+							      tc_index,</div><div class='add'>+							      DEVLINK_SB_POOL_TYPE_INGRESS,</div><div class='add'>+							      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='add'>+							      portid, seq,</div><div class='add'>+							      flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			(*p_idx)++;</div><div class='add'>+		}</div><div class='add'>+		for (tc_index = 0;</div><div class='add'>+		     tc_index &lt; devlink_sb-&gt;egress_tc_count; tc_index++) {</div><div class='add'>+			if (*p_idx &lt; start) {</div><div class='add'>+				(*p_idx)++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = devlink_nl_sb_tc_pool_bind_fill(msg, devlink,</div><div class='add'>+							      devlink_port,</div><div class='add'>+							      devlink_sb,</div><div class='add'>+							      tc_index,</div><div class='add'>+							      DEVLINK_SB_POOL_TYPE_EGRESS,</div><div class='add'>+							      DEVLINK_CMD_SB_TC_POOL_BIND_NEW,</div><div class='add'>+							      portid, seq,</div><div class='add'>+							      flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			(*p_idx)++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,</div><div class='add'>+						   struct devlink *devlink,</div><div class='add'>+						   struct netlink_callback *cb,</div><div class='add'>+						   int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;sb_tc_pool_bind_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(devlink_sb, &amp;devlink-&gt;sb_list, list) {</div><div class='add'>+		err = __sb_tc_pool_bind_get_dumpit(msg, state-&gt;idx, &amp;idx,</div><div class='add'>+						   devlink, devlink_sb,</div><div class='add'>+						   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						   cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err == -EOPNOTSUPP) {</div><div class='add'>+			err = 0;</div><div class='add'>+		} else if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_get_dumpit(struct sk_buff *skb,</div><div class='add'>+					  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb,</div><div class='add'>+				 devlink_nl_sb_tc_pool_bind_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port,</div><div class='add'>+				       unsigned int sb_index, u16 tc_index,</div><div class='add'>+				       enum devlink_sb_pool_type pool_type,</div><div class='add'>+				       u16 pool_index, u32 threshold,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	const struct devlink_ops *ops = devlink_port-&gt;devlink-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_tc_pool_bind_set)</div><div class='add'>+		return ops-&gt;sb_tc_pool_bind_set(devlink_port, sb_index,</div><div class='add'>+						tc_index, pool_type,</div><div class='add'>+						pool_index, threshold, extack);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb,</div><div class='add'>+					struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = info-&gt;user_ptr[1];</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	enum devlink_sb_pool_type pool_type;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+	u16 tc_index;</div><div class='add'>+	u16 pool_index;</div><div class='add'>+	u32 threshold;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_type_get_from_info(info, &amp;pool_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_tc_index_get_from_info(devlink_sb, info,</div><div class='add'>+						pool_type, &amp;tc_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,</div><div class='add'>+						  &amp;pool_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_SB_THRESHOLD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	threshold = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_SB_THRESHOLD]);</div><div class='add'>+	return devlink_sb_tc_pool_bind_set(devlink_port, devlink_sb-&gt;index,</div><div class='add'>+					   tc_index, pool_type,</div><div class='add'>+					   pool_index, threshold, info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_occ_snapshot)</div><div class='add'>+		return ops-&gt;sb_occ_snapshot(devlink, devlink_sb-&gt;index);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	const struct devlink_ops *ops = devlink-&gt;ops;</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_from_info(devlink, info);</div><div class='add'>+	if (IS_ERR(devlink_sb))</div><div class='add'>+		return PTR_ERR(devlink_sb);</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;sb_occ_max_clear)</div><div class='add'>+		return ops-&gt;sb_occ_max_clear(devlink, devlink_sb-&gt;index);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devl_sb_register(struct devlink *devlink, unsigned int sb_index,</div><div class='add'>+		     u32 size, u16 ingress_pools_count,</div><div class='add'>+		     u16 egress_pools_count, u16 ingress_tc_count,</div><div class='add'>+		     u16 egress_tc_count)</div><div class='add'>+{</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (devlink_sb_index_exists(devlink, sb_index))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	devlink_sb = kzalloc(sizeof(*devlink_sb), GFP_KERNEL);</div><div class='add'>+	if (!devlink_sb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	devlink_sb-&gt;index = sb_index;</div><div class='add'>+	devlink_sb-&gt;size = size;</div><div class='add'>+	devlink_sb-&gt;ingress_pools_count = ingress_pools_count;</div><div class='add'>+	devlink_sb-&gt;egress_pools_count = egress_pools_count;</div><div class='add'>+	devlink_sb-&gt;ingress_tc_count = ingress_tc_count;</div><div class='add'>+	devlink_sb-&gt;egress_tc_count = egress_tc_count;</div><div class='add'>+	list_add_tail(&amp;devlink_sb-&gt;list, &amp;devlink-&gt;sb_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_sb_register);</div><div class='add'>+</div><div class='add'>+int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,</div><div class='add'>+			u32 size, u16 ingress_pools_count,</div><div class='add'>+			u16 egress_pools_count, u16 ingress_tc_count,</div><div class='add'>+			u16 egress_tc_count)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	err = devl_sb_register(devlink, sb_index, size, ingress_pools_count,</div><div class='add'>+			       egress_pools_count, ingress_tc_count,</div><div class='add'>+			       egress_tc_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_sb_register);</div><div class='add'>+</div><div class='add'>+void devl_sb_unregister(struct devlink *devlink, unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct devlink_sb *devlink_sb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;devlink-&gt;lock);</div><div class='add'>+</div><div class='add'>+	devlink_sb = devlink_sb_get_by_index(devlink, sb_index);</div><div class='add'>+	WARN_ON(!devlink_sb);</div><div class='add'>+	list_del(&amp;devlink_sb-&gt;list);</div><div class='add'>+	kfree(devlink_sb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_sb_unregister);</div><div class='add'>+</div><div class='add'>+void devlink_sb_unregister(struct devlink *devlink, unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_sb_unregister(devlink, sb_index);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_sb_unregister);</div><div class='head'>diff --git a/net/devlink/trap.c b/net/devlink/trap.c<br/>new file mode 100644<br/>index 000000000000..f36087f90db5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devlink/trap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devlink/trap.c</a></div><div class='hunk'>@@ -0,0 +1,1854 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "devl_internal.h"</div><div class='add'>+</div><div class='add'>+struct devlink_stats {</div><div class='add'>+	u64_stats_t rx_bytes;</div><div class='add'>+	u64_stats_t rx_packets;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct devlink_trap_policer_item - Packet trap policer attributes.</div><div class='add'>+ * @policer: Immutable packet trap policer attributes.</div><div class='add'>+ * @rate: Rate in packets / sec.</div><div class='add'>+ * @burst: Burst size in packets.</div><div class='add'>+ * @list: trap_policer_list member.</div><div class='add'>+ *</div><div class='add'>+ * Describes packet trap policer attributes. Created by devlink during trap</div><div class='add'>+ * policer registration.</div><div class='add'>+ */</div><div class='add'>+struct devlink_trap_policer_item {</div><div class='add'>+	const struct devlink_trap_policer *policer;</div><div class='add'>+	u64 rate;</div><div class='add'>+	u64 burst;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct devlink_trap_group_item - Packet trap group attributes.</div><div class='add'>+ * @group: Immutable packet trap group attributes.</div><div class='add'>+ * @policer_item: Associated policer item. Can be NULL.</div><div class='add'>+ * @list: trap_group_list member.</div><div class='add'>+ * @stats: Trap group statistics.</div><div class='add'>+ *</div><div class='add'>+ * Describes packet trap group attributes. Created by devlink during trap</div><div class='add'>+ * group registration.</div><div class='add'>+ */</div><div class='add'>+struct devlink_trap_group_item {</div><div class='add'>+	const struct devlink_trap_group *group;</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct devlink_stats __percpu *stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct devlink_trap_item - Packet trap attributes.</div><div class='add'>+ * @trap: Immutable packet trap attributes.</div><div class='add'>+ * @group_item: Associated group item.</div><div class='add'>+ * @list: trap_list member.</div><div class='add'>+ * @action: Trap action.</div><div class='add'>+ * @stats: Trap statistics.</div><div class='add'>+ * @priv: Driver private information.</div><div class='add'>+ *</div><div class='add'>+ * Describes both mutable and immutable packet trap attributes. Created by</div><div class='add'>+ * devlink during trap registration and used for all trap related operations.</div><div class='add'>+ */</div><div class='add'>+struct devlink_trap_item {</div><div class='add'>+	const struct devlink_trap *trap;</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	enum devlink_trap_action action;</div><div class='add'>+	struct devlink_stats __percpu *stats;</div><div class='add'>+	void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_policer_item *</div><div class='add'>+devlink_trap_policer_item_lookup(struct devlink *devlink, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(policer_item, &amp;devlink-&gt;trap_policer_list, list) {</div><div class='add'>+		if (policer_item-&gt;policer-&gt;id == id)</div><div class='add'>+			return policer_item;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_item *</div><div class='add'>+devlink_trap_item_lookup(struct devlink *devlink, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(trap_item, &amp;devlink-&gt;trap_list, list) {</div><div class='add'>+		if (!strcmp(trap_item-&gt;trap-&gt;name, name))</div><div class='add'>+			return trap_item;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_item *</div><div class='add'>+devlink_trap_item_get_from_info(struct devlink *devlink,</div><div class='add'>+				struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_TRAP_NAME])</div><div class='add'>+		return NULL;</div><div class='add'>+	attr = info-&gt;attrs[DEVLINK_ATTR_TRAP_NAME];</div><div class='add'>+</div><div class='add'>+	return devlink_trap_item_lookup(devlink, nla_data(attr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_action_get_from_info(struct genl_info *info,</div><div class='add'>+				  enum devlink_trap_action *p_trap_action)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = nla_get_u8(info-&gt;attrs[DEVLINK_ATTR_TRAP_ACTION]);</div><div class='add'>+	switch (val) {</div><div class='add'>+	case DEVLINK_TRAP_ACTION_DROP:</div><div class='add'>+	case DEVLINK_TRAP_ACTION_TRAP:</div><div class='add'>+	case DEVLINK_TRAP_ACTION_MIRROR:</div><div class='add'>+		*p_trap_action = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_metadata_put(struct sk_buff *msg,</div><div class='add'>+				     const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, DEVLINK_ATTR_TRAP_METADATA);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if ((trap-&gt;metadata_cap &amp; DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT) &amp;&amp;</div><div class='add'>+	    nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if ((trap-&gt;metadata_cap &amp; DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE) &amp;&amp;</div><div class='add'>+	    nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_trap_stats_read(struct devlink_stats __percpu *trap_stats,</div><div class='add'>+				    struct devlink_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(stats, 0, sizeof(*stats));</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		struct devlink_stats *cpu_stats;</div><div class='add'>+		u64 rx_packets, rx_bytes;</div><div class='add'>+		unsigned int start;</div><div class='add'>+</div><div class='add'>+		cpu_stats = per_cpu_ptr(trap_stats, i);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;cpu_stats-&gt;rx_packets);</div><div class='add'>+			rx_bytes = u64_stats_read(&amp;cpu_stats-&gt;rx_bytes);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_packets, rx_packets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_bytes, rx_bytes);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_stats_put(struct sk_buff *msg,</div><div class='add'>+			     struct devlink_stats __percpu *trap_stats)</div><div class='add'>+{</div><div class='add'>+	struct devlink_stats stats;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	devlink_trap_stats_read(trap_stats, &amp;stats);</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, DEVLINK_ATTR_STATS);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_PACKETS,</div><div class='add'>+			       u64_stats_read(&amp;stats.rx_packets)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_BYTES,</div><div class='add'>+			       u64_stats_read(&amp;stats.rx_bytes)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_stats_put(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				  const struct devlink_trap_item *trap_item)</div><div class='add'>+{</div><div class='add'>+	struct devlink_stats stats;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	u64 drops = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_drop_counter_get) {</div><div class='add'>+		err = devlink-&gt;ops-&gt;trap_drop_counter_get(devlink,</div><div class='add'>+							  trap_item-&gt;trap,</div><div class='add'>+							  &amp;drops);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_trap_stats_read(trap_item-&gt;stats, &amp;stats);</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, DEVLINK_ATTR_STATS);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_drop_counter_get &amp;&amp;</div><div class='add'>+	    devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_PACKETS,</div><div class='add'>+			       u64_stats_read(&amp;stats.rx_packets)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_BYTES,</div><div class='add'>+			       u64_stats_read(&amp;stats.rx_bytes)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_trap_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+				const struct devlink_trap_item *trap_item,</div><div class='add'>+				enum devlink_command cmd, u32 portid, u32 seq,</div><div class='add'>+				int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item = trap_item-&gt;group_item;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_TRAP_GROUP_NAME,</div><div class='add'>+			   group_item-&gt;group-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_TRAP_NAME, trap_item-&gt;trap-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_TRAP_TYPE, trap_item-&gt;trap-&gt;type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (trap_item-&gt;trap-&gt;generic &amp;&amp;</div><div class='add'>+	    nla_put_flag(msg, DEVLINK_ATTR_TRAP_GENERIC))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, DEVLINK_ATTR_TRAP_ACTION, trap_item-&gt;action))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_metadata_put(msg, trap_item-&gt;trap);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_stats_put(msg, devlink, trap_item);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trap_item = devlink_trap_item_get_from_info(devlink, info);</div><div class='add'>+	if (!trap_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_fill(msg, devlink, trap_item,</div><div class='add'>+				   DEVLINK_CMD_TRAP_NEW, info-&gt;snd_portid,</div><div class='add'>+				   info-&gt;snd_seq, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_trap_fill;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+err_trap_fill:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_trap_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					struct devlink *devlink,</div><div class='add'>+					struct netlink_callback *cb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(trap_item, &amp;devlink-&gt;trap_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_trap_fill(msg, devlink, trap_item,</div><div class='add'>+					   DEVLINK_CMD_TRAP_NEW,</div><div class='add'>+					   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					   cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_trap_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devlink_trap_action_set(struct devlink *devlink,</div><div class='add'>+				     struct devlink_trap_item *trap_item,</div><div class='add'>+				     enum devlink_trap_action trap_action,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (trap_item-&gt;action != trap_action &amp;&amp;</div><div class='add'>+	    trap_item-&gt;trap-&gt;type != DEVLINK_TRAP_TYPE_DROP) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot change action of non-drop traps. Skipping");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;trap_action_set(devlink, trap_item-&gt;trap,</div><div class='add'>+					    trap_action, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	trap_item-&gt;action = trap_action;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_action_set(struct devlink *devlink,</div><div class='add'>+				   struct devlink_trap_item *trap_item,</div><div class='add'>+				   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	enum devlink_trap_action trap_action;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_TRAP_ACTION])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_action_get_from_info(info, &amp;trap_action);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Invalid trap action");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __devlink_trap_action_set(devlink, trap_item, trap_action,</div><div class='add'>+					 info-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trap_item = devlink_trap_item_get_from_info(devlink, info);</div><div class='add'>+	if (!trap_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devlink_trap_action_set(devlink, trap_item, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_group_item *</div><div class='add'>+devlink_trap_group_item_lookup(struct devlink *devlink, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(group_item, &amp;devlink-&gt;trap_group_list, list) {</div><div class='add'>+		if (!strcmp(group_item-&gt;group-&gt;name, name))</div><div class='add'>+			return group_item;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_group_item *</div><div class='add'>+devlink_trap_group_item_lookup_by_id(struct devlink *devlink, u16 id)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(group_item, &amp;devlink-&gt;trap_group_list, list) {</div><div class='add'>+		if (group_item-&gt;group-&gt;id == id)</div><div class='add'>+			return group_item;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_group_item *</div><div class='add'>+devlink_trap_group_item_get_from_info(struct devlink *devlink,</div><div class='add'>+				      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_TRAP_GROUP_NAME])</div><div class='add'>+		return NULL;</div><div class='add'>+	name = nla_data(info-&gt;attrs[DEVLINK_ATTR_TRAP_GROUP_NAME]);</div><div class='add'>+</div><div class='add'>+	return devlink_trap_group_item_lookup(devlink, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_trap_group_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			   const struct devlink_trap_group_item *group_item,</div><div class='add'>+			   enum devlink_command cmd, u32 portid, u32 seq,</div><div class='add'>+			   int flags)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_string(msg, DEVLINK_ATTR_TRAP_GROUP_NAME,</div><div class='add'>+			   group_item-&gt;group-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (group_item-&gt;group-&gt;generic &amp;&amp;</div><div class='add'>+	    nla_put_flag(msg, DEVLINK_ATTR_TRAP_GENERIC))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (group_item-&gt;policer_item &amp;&amp;</div><div class='add'>+	    nla_put_u32(msg, DEVLINK_ATTR_TRAP_POLICER_ID,</div><div class='add'>+			group_item-&gt;policer_item-&gt;policer-&gt;id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_group_stats_put(msg, group_item-&gt;stats);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_group_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_group_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	group_item = devlink_trap_group_item_get_from_info(devlink, info);</div><div class='add'>+	if (!group_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap group");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_group_fill(msg, devlink, group_item,</div><div class='add'>+					 DEVLINK_CMD_TRAP_GROUP_NEW,</div><div class='add'>+					 info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_trap_group_fill;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+err_trap_group_fill:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_trap_group_get_dump_one(struct sk_buff *msg,</div><div class='add'>+					      struct devlink *devlink,</div><div class='add'>+					      struct netlink_callback *cb,</div><div class='add'>+					      int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(group_item, &amp;devlink-&gt;trap_group_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_trap_group_fill(msg, devlink, group_item,</div><div class='add'>+						 DEVLINK_CMD_TRAP_GROUP_NEW,</div><div class='add'>+						 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						 cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_group_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				     struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_trap_group_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__devlink_trap_group_action_set(struct devlink *devlink,</div><div class='add'>+				struct devlink_trap_group_item *group_item,</div><div class='add'>+				enum devlink_trap_action trap_action,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const char *group_name = group_item-&gt;group-&gt;name;</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_group_action_set) {</div><div class='add'>+		err = devlink-&gt;ops-&gt;trap_group_action_set(devlink, group_item-&gt;group,</div><div class='add'>+							  trap_action, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(trap_item, &amp;devlink-&gt;trap_list, list) {</div><div class='add'>+			if (strcmp(trap_item-&gt;group_item-&gt;group-&gt;name, group_name))</div><div class='add'>+				continue;</div><div class='add'>+			if (trap_item-&gt;action != trap_action &amp;&amp;</div><div class='add'>+			    trap_item-&gt;trap-&gt;type != DEVLINK_TRAP_TYPE_DROP)</div><div class='add'>+				continue;</div><div class='add'>+			trap_item-&gt;action = trap_action;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(trap_item, &amp;devlink-&gt;trap_list, list) {</div><div class='add'>+		if (strcmp(trap_item-&gt;group_item-&gt;group-&gt;name, group_name))</div><div class='add'>+			continue;</div><div class='add'>+		err = __devlink_trap_action_set(devlink, trap_item,</div><div class='add'>+						trap_action, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_action_set(struct devlink *devlink,</div><div class='add'>+			      struct devlink_trap_group_item *group_item,</div><div class='add'>+			      struct genl_info *info, bool *p_modified)</div><div class='add'>+{</div><div class='add'>+	enum devlink_trap_action trap_action;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_TRAP_ACTION])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_action_get_from_info(info, &amp;trap_action);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Invalid trap action");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = __devlink_trap_group_action_set(devlink, group_item, trap_action,</div><div class='add'>+					      info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*p_modified = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_group_set(struct devlink *devlink,</div><div class='add'>+				  struct devlink_trap_group_item *group_item,</div><div class='add'>+				  struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	const struct devlink_trap_policer *policer;</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	u32 policer_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!attrs[DEVLINK_ATTR_TRAP_POLICER_ID])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;trap_group_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	policer_id = nla_get_u32(attrs[DEVLINK_ATTR_TRAP_POLICER_ID]);</div><div class='add'>+	policer_item = devlink_trap_policer_item_lookup(devlink, policer_id);</div><div class='add'>+	if (policer_id &amp;&amp; !policer_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap policer");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	policer = policer_item ? policer_item-&gt;policer : NULL;</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;trap_group_set(devlink, group_item-&gt;group, policer,</div><div class='add'>+					   extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	group_item-&gt;policer_item = policer_item;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+	bool modified = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_group_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	group_item = devlink_trap_group_item_get_from_info(devlink, info);</div><div class='add'>+	if (!group_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap group");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_group_action_set(devlink, group_item, info,</div><div class='add'>+					    &amp;modified);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_group_set(devlink, group_item, info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_trap_group_set;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_trap_group_set:</div><div class='add'>+	if (modified)</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Trap group set failed, but some changes were committed already");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_trap_policer_item *</div><div class='add'>+devlink_trap_policer_item_get_from_info(struct devlink *devlink,</div><div class='add'>+					struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[DEVLINK_ATTR_TRAP_POLICER_ID])</div><div class='add'>+		return NULL;</div><div class='add'>+	id = nla_get_u32(info-&gt;attrs[DEVLINK_ATTR_TRAP_POLICER_ID]);</div><div class='add'>+</div><div class='add'>+	return devlink_trap_policer_item_lookup(devlink, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_policer_stats_put(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			       const struct devlink_trap_policer *policer)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	u64 drops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;trap_policer_counter_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;trap_policer_counter_get(devlink, policer, &amp;drops);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	attr = nla_nest_start(msg, DEVLINK_ATTR_STATS);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(msg, attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_nl_trap_policer_fill(struct sk_buff *msg, struct devlink *devlink,</div><div class='add'>+			     const struct devlink_trap_policer_item *policer_item,</div><div class='add'>+			     enum devlink_command cmd, u32 portid, u32 seq,</div><div class='add'>+			     int flags)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, portid, seq, &amp;devlink_nl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_handle(msg, devlink))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, DEVLINK_ATTR_TRAP_POLICER_ID,</div><div class='add'>+			policer_item-&gt;policer-&gt;id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_TRAP_POLICER_RATE,</div><div class='add'>+			       policer_item-&gt;rate))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (devlink_nl_put_u64(msg, DEVLINK_ATTR_TRAP_POLICER_BURST,</div><div class='add'>+			       policer_item-&gt;burst))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_policer_stats_put(msg, devlink,</div><div class='add'>+					     policer_item-&gt;policer);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_policer_get_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_policer_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	policer_item = devlink_trap_policer_item_get_from_info(devlink, info);</div><div class='add'>+	if (!policer_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap policer");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_policer_fill(msg, devlink, policer_item,</div><div class='add'>+					   DEVLINK_CMD_TRAP_POLICER_NEW,</div><div class='add'>+					   info-&gt;snd_portid, info-&gt;snd_seq, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_trap_policer_fill;</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+err_trap_policer_fill:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_nl_trap_policer_get_dump_one(struct sk_buff *msg,</div><div class='add'>+						struct devlink *devlink,</div><div class='add'>+						struct netlink_callback *cb,</div><div class='add'>+						int flags)</div><div class='add'>+{</div><div class='add'>+	struct devlink_nl_dump_state *state = devlink_dump_state(cb);</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(policer_item, &amp;devlink-&gt;trap_policer_list, list) {</div><div class='add'>+		if (idx &lt; state-&gt;idx) {</div><div class='add'>+			idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = devlink_nl_trap_policer_fill(msg, devlink, policer_item,</div><div class='add'>+						   DEVLINK_CMD_TRAP_POLICER_NEW,</div><div class='add'>+						   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						   cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+		if (err) {</div><div class='add'>+			state-&gt;idx = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_policer_get_dumpit(struct sk_buff *skb,</div><div class='add'>+				       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return devlink_nl_dumpit(skb, cb, devlink_nl_trap_policer_get_dump_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_policer_set(struct devlink *devlink,</div><div class='add'>+			 struct devlink_trap_policer_item *policer_item,</div><div class='add'>+			 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='add'>+	u64 rate, burst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rate = policer_item-&gt;rate;</div><div class='add'>+	burst = policer_item-&gt;burst;</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_TRAP_POLICER_RATE])</div><div class='add'>+		rate = nla_get_u64(attrs[DEVLINK_ATTR_TRAP_POLICER_RATE]);</div><div class='add'>+</div><div class='add'>+	if (attrs[DEVLINK_ATTR_TRAP_POLICER_BURST])</div><div class='add'>+		burst = nla_get_u64(attrs[DEVLINK_ATTR_TRAP_POLICER_BURST]);</div><div class='add'>+</div><div class='add'>+	if (rate &lt; policer_item-&gt;policer-&gt;min_rate) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Policer rate lower than limit");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rate &gt; policer_item-&gt;policer-&gt;max_rate) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Policer rate higher than limit");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (burst &lt; policer_item-&gt;policer-&gt;min_burst) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Policer burst size lower than limit");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (burst &gt; policer_item-&gt;policer-&gt;max_burst) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Policer burst size higher than limit");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;trap_policer_set(devlink, policer_item-&gt;policer,</div><div class='add'>+					     rate, burst, info-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	policer_item-&gt;rate = rate;</div><div class='add'>+	policer_item-&gt;burst = burst;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devlink_nl_trap_policer_set_doit(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct devlink *devlink = info-&gt;user_ptr[0];</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;devlink-&gt;trap_policer_list))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;trap_policer_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	policer_item = devlink_trap_policer_item_get_from_info(devlink, info);</div><div class='add'>+	if (!policer_item) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device did not register this trap policer");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devlink_trap_policer_set(devlink, policer_item, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEVLINK_TRAP(_id, _type)					      \</div><div class='add'>+	{								      \</div><div class='add'>+		.type = DEVLINK_TRAP_TYPE_##_type,			      \</div><div class='add'>+		.id = DEVLINK_TRAP_GENERIC_ID_##_id,			      \</div><div class='add'>+		.name = DEVLINK_TRAP_GENERIC_NAME_##_id,		      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct devlink_trap devlink_trap_generic[] = {</div><div class='add'>+	DEVLINK_TRAP(SMAC_MC, DROP),</div><div class='add'>+	DEVLINK_TRAP(VLAN_TAG_MISMATCH, DROP),</div><div class='add'>+	DEVLINK_TRAP(INGRESS_VLAN_FILTER, DROP),</div><div class='add'>+	DEVLINK_TRAP(INGRESS_STP_FILTER, DROP),</div><div class='add'>+	DEVLINK_TRAP(EMPTY_TX_LIST, DROP),</div><div class='add'>+	DEVLINK_TRAP(PORT_LOOPBACK_FILTER, DROP),</div><div class='add'>+	DEVLINK_TRAP(BLACKHOLE_ROUTE, DROP),</div><div class='add'>+	DEVLINK_TRAP(TTL_ERROR, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(TAIL_DROP, DROP),</div><div class='add'>+	DEVLINK_TRAP(NON_IP_PACKET, DROP),</div><div class='add'>+	DEVLINK_TRAP(UC_DIP_MC_DMAC, DROP),</div><div class='add'>+	DEVLINK_TRAP(DIP_LB, DROP),</div><div class='add'>+	DEVLINK_TRAP(SIP_MC, DROP),</div><div class='add'>+	DEVLINK_TRAP(SIP_LB, DROP),</div><div class='add'>+	DEVLINK_TRAP(CORRUPTED_IP_HDR, DROP),</div><div class='add'>+	DEVLINK_TRAP(IPV4_SIP_BC, DROP),</div><div class='add'>+	DEVLINK_TRAP(IPV6_MC_DIP_RESERVED_SCOPE, DROP),</div><div class='add'>+	DEVLINK_TRAP(IPV6_MC_DIP_INTERFACE_LOCAL_SCOPE, DROP),</div><div class='add'>+	DEVLINK_TRAP(MTU_ERROR, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(UNRESOLVED_NEIGH, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(RPF, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(REJECT_ROUTE, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(IPV4_LPM_UNICAST_MISS, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(IPV6_LPM_UNICAST_MISS, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(NON_ROUTABLE, DROP),</div><div class='add'>+	DEVLINK_TRAP(DECAP_ERROR, EXCEPTION),</div><div class='add'>+	DEVLINK_TRAP(OVERLAY_SMAC_MC, DROP),</div><div class='add'>+	DEVLINK_TRAP(INGRESS_FLOW_ACTION_DROP, DROP),</div><div class='add'>+	DEVLINK_TRAP(EGRESS_FLOW_ACTION_DROP, DROP),</div><div class='add'>+	DEVLINK_TRAP(STP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(LACP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(LLDP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IGMP_QUERY, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IGMP_V1_REPORT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IGMP_V2_REPORT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IGMP_V3_REPORT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IGMP_V2_LEAVE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(MLD_QUERY, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(MLD_V1_REPORT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(MLD_V2_REPORT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(MLD_V1_DONE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_DHCP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_DHCP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(ARP_REQUEST, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(ARP_RESPONSE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(ARP_OVERLAY, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_NEIGH_SOLICIT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_NEIGH_ADVERT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_BFD, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_BFD, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_OSPF, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_OSPF, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_BGP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_BGP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_VRRP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_VRRP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_PIM, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_PIM, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(UC_LB, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(LOCAL_ROUTE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(EXTERNAL_ROUTE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_UC_DIP_LINK_LOCAL_SCOPE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_DIP_ALL_NODES, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_DIP_ALL_ROUTERS, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_ROUTER_SOLICIT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_ROUTER_ADVERT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_REDIRECT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV4_ROUTER_ALERT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(IPV6_ROUTER_ALERT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(PTP_EVENT, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(PTP_GENERAL, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(FLOW_ACTION_SAMPLE, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(FLOW_ACTION_TRAP, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(EARLY_DROP, DROP),</div><div class='add'>+	DEVLINK_TRAP(VXLAN_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(LLC_SNAP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(VLAN_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(PPPOE_PPP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(MPLS_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(ARP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(IP_1_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(IP_N_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(GRE_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(UDP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(TCP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(IPSEC_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(SCTP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(DCCP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(GTP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(ESP_PARSING, DROP),</div><div class='add'>+	DEVLINK_TRAP(BLACKHOLE_NEXTHOP, DROP),</div><div class='add'>+	DEVLINK_TRAP(DMAC_FILTER, DROP),</div><div class='add'>+	DEVLINK_TRAP(EAPOL, CONTROL),</div><div class='add'>+	DEVLINK_TRAP(LOCKED_PORT, DROP),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEVLINK_TRAP_GROUP(_id)						      \</div><div class='add'>+	{								      \</div><div class='add'>+		.id = DEVLINK_TRAP_GROUP_GENERIC_ID_##_id,		      \</div><div class='add'>+		.name = DEVLINK_TRAP_GROUP_GENERIC_NAME_##_id,		      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct devlink_trap_group devlink_trap_group_generic[] = {</div><div class='add'>+	DEVLINK_TRAP_GROUP(L2_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(L3_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(L3_EXCEPTIONS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(BUFFER_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(TUNNEL_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(ACL_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(STP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(LACP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(LLDP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(MC_SNOOPING),</div><div class='add'>+	DEVLINK_TRAP_GROUP(DHCP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(NEIGH_DISCOVERY),</div><div class='add'>+	DEVLINK_TRAP_GROUP(BFD),</div><div class='add'>+	DEVLINK_TRAP_GROUP(OSPF),</div><div class='add'>+	DEVLINK_TRAP_GROUP(BGP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(VRRP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(PIM),</div><div class='add'>+	DEVLINK_TRAP_GROUP(UC_LB),</div><div class='add'>+	DEVLINK_TRAP_GROUP(LOCAL_DELIVERY),</div><div class='add'>+	DEVLINK_TRAP_GROUP(EXTERNAL_DELIVERY),</div><div class='add'>+	DEVLINK_TRAP_GROUP(IPV6),</div><div class='add'>+	DEVLINK_TRAP_GROUP(PTP_EVENT),</div><div class='add'>+	DEVLINK_TRAP_GROUP(PTP_GENERAL),</div><div class='add'>+	DEVLINK_TRAP_GROUP(ACL_SAMPLE),</div><div class='add'>+	DEVLINK_TRAP_GROUP(ACL_TRAP),</div><div class='add'>+	DEVLINK_TRAP_GROUP(PARSER_ERROR_DROPS),</div><div class='add'>+	DEVLINK_TRAP_GROUP(EAPOL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int devlink_trap_generic_verify(const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	if (trap-&gt;id &gt; DEVLINK_TRAP_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (strcmp(trap-&gt;name, devlink_trap_generic[trap-&gt;id].name))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (trap-&gt;type != devlink_trap_generic[trap-&gt;id].type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_driver_verify(const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (trap-&gt;id &lt;= DEVLINK_TRAP_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(devlink_trap_generic); i++) {</div><div class='add'>+		if (!strcmp(trap-&gt;name, devlink_trap_generic[i].name))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_verify(const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	if (!trap || !trap-&gt;name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (trap-&gt;generic)</div><div class='add'>+		return devlink_trap_generic_verify(trap);</div><div class='add'>+	else</div><div class='add'>+		return devlink_trap_driver_verify(trap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_generic_verify(const struct devlink_trap_group *group)</div><div class='add'>+{</div><div class='add'>+	if (group-&gt;id &gt; DEVLINK_TRAP_GROUP_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (strcmp(group-&gt;name, devlink_trap_group_generic[group-&gt;id].name))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_driver_verify(const struct devlink_trap_group *group)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (group-&gt;id &lt;= DEVLINK_TRAP_GROUP_GENERIC_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(devlink_trap_group_generic); i++) {</div><div class='add'>+		if (!strcmp(group-&gt;name, devlink_trap_group_generic[i].name))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devlink_trap_group_verify(const struct devlink_trap_group *group)</div><div class='add'>+{</div><div class='add'>+	if (group-&gt;generic)</div><div class='add'>+		return devlink_trap_group_generic_verify(group);</div><div class='add'>+	else</div><div class='add'>+		return devlink_trap_group_driver_verify(group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_group_notify(struct devlink *devlink,</div><div class='add'>+			  const struct devlink_trap_group_item *group_item,</div><div class='add'>+			  enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &amp;&amp;</div><div class='add'>+		     cmd != DEVLINK_CMD_TRAP_GROUP_DEL);</div><div class='add'>+</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_group_fill(msg, devlink, group_item, cmd, 0, 0,</div><div class='add'>+					 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_trap_groups_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(group_item, &amp;devlink-&gt;trap_group_list, list)</div><div class='add'>+		devlink_trap_group_notify(devlink, group_item,</div><div class='add'>+					  DEVLINK_CMD_TRAP_GROUP_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_trap_groups_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(group_item, &amp;devlink-&gt;trap_group_list, list)</div><div class='add'>+		devlink_trap_group_notify(devlink, group_item,</div><div class='add'>+					  DEVLINK_CMD_TRAP_GROUP_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_item_group_link(struct devlink *devlink,</div><div class='add'>+			     struct devlink_trap_item *trap_item)</div><div class='add'>+{</div><div class='add'>+	u16 group_id = trap_item-&gt;trap-&gt;init_group_id;</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	group_item = devlink_trap_group_item_lookup_by_id(devlink, group_id);</div><div class='add'>+	if (WARN_ON_ONCE(!group_item))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	trap_item-&gt;group_item = group_item;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_trap_notify(struct devlink *devlink,</div><div class='add'>+				const struct devlink_trap_item *trap_item,</div><div class='add'>+				enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &amp;&amp;</div><div class='add'>+		     cmd != DEVLINK_CMD_TRAP_DEL);</div><div class='add'>+</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_fill(msg, devlink, trap_item, cmd, 0, 0, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_traps_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(trap_item, &amp;devlink-&gt;trap_list, list)</div><div class='add'>+		devlink_trap_notify(devlink, trap_item, DEVLINK_CMD_TRAP_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_traps_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(trap_item, &amp;devlink-&gt;trap_list, list)</div><div class='add'>+		devlink_trap_notify(devlink, trap_item, DEVLINK_CMD_TRAP_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_register(struct devlink *devlink,</div><div class='add'>+		      const struct devlink_trap *trap, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (devlink_trap_item_lookup(devlink, trap-&gt;name))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	trap_item = kzalloc(sizeof(*trap_item), GFP_KERNEL);</div><div class='add'>+	if (!trap_item)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	trap_item-&gt;stats = netdev_alloc_pcpu_stats(struct devlink_stats);</div><div class='add'>+	if (!trap_item-&gt;stats) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_stats_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trap_item-&gt;trap = trap;</div><div class='add'>+	trap_item-&gt;action = trap-&gt;init_action;</div><div class='add'>+	trap_item-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_item_group_link(devlink, trap_item);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_group_link;</div><div class='add'>+</div><div class='add'>+	err = devlink-&gt;ops-&gt;trap_init(devlink, trap, trap_item);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_trap_init;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;trap_item-&gt;list, &amp;devlink-&gt;trap_list);</div><div class='add'>+	devlink_trap_notify(devlink, trap_item, DEVLINK_CMD_TRAP_NEW);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_trap_init:</div><div class='add'>+err_group_link:</div><div class='add'>+	free_percpu(trap_item-&gt;stats);</div><div class='add'>+err_stats_alloc:</div><div class='add'>+	kfree(trap_item);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_trap_unregister(struct devlink *devlink,</div><div class='add'>+				    const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	trap_item = devlink_trap_item_lookup(devlink, trap-&gt;name);</div><div class='add'>+	if (WARN_ON_ONCE(!trap_item))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink_trap_notify(devlink, trap_item, DEVLINK_CMD_TRAP_DEL);</div><div class='add'>+	list_del(&amp;trap_item-&gt;list);</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_fini)</div><div class='add'>+		devlink-&gt;ops-&gt;trap_fini(devlink, trap, trap_item);</div><div class='add'>+	free_percpu(trap_item-&gt;stats);</div><div class='add'>+	kfree(trap_item);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devlink_trap_disable(struct devlink *devlink,</div><div class='add'>+				 const struct devlink_trap *trap)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item;</div><div class='add'>+</div><div class='add'>+	trap_item = devlink_trap_item_lookup(devlink, trap-&gt;name);</div><div class='add'>+	if (WARN_ON_ONCE(!trap_item))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink-&gt;ops-&gt;trap_action_set(devlink, trap, DEVLINK_TRAP_ACTION_DROP,</div><div class='add'>+				      NULL);</div><div class='add'>+	trap_item-&gt;action = DEVLINK_TRAP_ACTION_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_traps_register - Register packet traps with devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @traps: Packet traps.</div><div class='add'>+ * @traps_count: Count of provided packet traps.</div><div class='add'>+ * @priv: Driver private information.</div><div class='add'>+ *</div><div class='add'>+ * Return: Non-zero value on failure.</div><div class='add'>+ */</div><div class='add'>+int devl_traps_register(struct devlink *devlink,</div><div class='add'>+			const struct devlink_trap *traps,</div><div class='add'>+			size_t traps_count, void *priv)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!devlink-&gt;ops-&gt;trap_init || !devlink-&gt;ops-&gt;trap_action_set)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	for (i = 0; i &lt; traps_count; i++) {</div><div class='add'>+		const struct devlink_trap *trap = &amp;traps[i];</div><div class='add'>+</div><div class='add'>+		err = devlink_trap_verify(trap);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_trap_verify;</div><div class='add'>+</div><div class='add'>+		err = devlink_trap_register(devlink, trap, priv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_trap_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_trap_register:</div><div class='add'>+err_trap_verify:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_unregister(devlink, &amp;traps[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_traps_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_traps_register - Register packet traps with devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @traps: Packet traps.</div><div class='add'>+ * @traps_count: Count of provided packet traps.</div><div class='add'>+ * @priv: Driver private information.</div><div class='add'>+ *</div><div class='add'>+ * Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ *</div><div class='add'>+ * Return: Non-zero value on failure.</div><div class='add'>+ */</div><div class='add'>+int devlink_traps_register(struct devlink *devlink,</div><div class='add'>+			   const struct devlink_trap *traps,</div><div class='add'>+			   size_t traps_count, void *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	err = devl_traps_register(devlink, traps, traps_count, priv);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_traps_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_traps_unregister - Unregister packet traps from devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @traps: Packet traps.</div><div class='add'>+ * @traps_count: Count of provided packet traps.</div><div class='add'>+ */</div><div class='add'>+void devl_traps_unregister(struct devlink *devlink,</div><div class='add'>+			   const struct devlink_trap *traps,</div><div class='add'>+			   size_t traps_count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	/* Make sure we do not have any packets in-flight while unregistering</div><div class='add'>+	 * traps by disabling all of them and waiting for a grace period.</div><div class='add'>+	 */</div><div class='add'>+	for (i = traps_count - 1; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_disable(devlink, &amp;traps[i]);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	for (i = traps_count - 1; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_unregister(devlink, &amp;traps[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_traps_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_traps_unregister - Unregister packet traps from devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @traps: Packet traps.</div><div class='add'>+ * @traps_count: Count of provided packet traps.</div><div class='add'>+ *</div><div class='add'>+ * Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+void devlink_traps_unregister(struct devlink *devlink,</div><div class='add'>+			      const struct devlink_trap *traps,</div><div class='add'>+			      size_t traps_count)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_traps_unregister(devlink, traps, traps_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_traps_unregister);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_stats_update(struct devlink_stats __percpu *trap_stats,</div><div class='add'>+			  size_t skb_len)</div><div class='add'>+{</div><div class='add'>+	struct devlink_stats *stats;</div><div class='add'>+</div><div class='add'>+	stats = this_cpu_ptr(trap_stats);</div><div class='add'>+	u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+	u64_stats_add(&amp;stats-&gt;rx_bytes, skb_len);</div><div class='add'>+	u64_stats_inc(&amp;stats-&gt;rx_packets);</div><div class='add'>+	u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_report_metadata_set(struct devlink_trap_metadata *metadata,</div><div class='add'>+				 const struct devlink_trap_item *trap_item,</div><div class='add'>+				 struct devlink_port *in_devlink_port,</div><div class='add'>+				 const struct flow_action_cookie *fa_cookie)</div><div class='add'>+{</div><div class='add'>+	metadata-&gt;trap_name = trap_item-&gt;trap-&gt;name;</div><div class='add'>+	metadata-&gt;trap_group_name = trap_item-&gt;group_item-&gt;group-&gt;name;</div><div class='add'>+	metadata-&gt;fa_cookie = fa_cookie;</div><div class='add'>+	metadata-&gt;trap_type = trap_item-&gt;trap-&gt;type;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;in_devlink_port-&gt;type_lock);</div><div class='add'>+	if (in_devlink_port-&gt;type == DEVLINK_PORT_TYPE_ETH)</div><div class='add'>+		metadata-&gt;input_dev = in_devlink_port-&gt;type_eth.netdev;</div><div class='add'>+	spin_unlock(&amp;in_devlink_port-&gt;type_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_trap_report - Report trapped packet to drop monitor.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @skb: Trapped packet.</div><div class='add'>+ * @trap_ctx: Trap context.</div><div class='add'>+ * @in_devlink_port: Input devlink port.</div><div class='add'>+ * @fa_cookie: Flow action cookie. Could be NULL.</div><div class='add'>+ */</div><div class='add'>+void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,</div><div class='add'>+			 void *trap_ctx, struct devlink_port *in_devlink_port,</div><div class='add'>+			 const struct flow_action_cookie *fa_cookie)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item = trap_ctx;</div><div class='add'>+</div><div class='add'>+	devlink_trap_stats_update(trap_item-&gt;stats, skb-&gt;len);</div><div class='add'>+	devlink_trap_stats_update(trap_item-&gt;group_item-&gt;stats, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (tracepoint_enabled(devlink_trap_report)) {</div><div class='add'>+		struct devlink_trap_metadata metadata = {};</div><div class='add'>+</div><div class='add'>+		devlink_trap_report_metadata_set(&amp;metadata, trap_item,</div><div class='add'>+						 in_devlink_port, fa_cookie);</div><div class='add'>+		trace_devlink_trap_report(devlink, skb, &amp;metadata);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_trap_report);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_trap_ctx_priv - Trap context to driver private information.</div><div class='add'>+ * @trap_ctx: Trap context.</div><div class='add'>+ *</div><div class='add'>+ * Return: Driver private information passed during registration.</div><div class='add'>+ */</div><div class='add'>+void *devlink_trap_ctx_priv(void *trap_ctx)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_item *trap_item = trap_ctx;</div><div class='add'>+</div><div class='add'>+	return trap_item-&gt;priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_trap_ctx_priv);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_item_policer_link(struct devlink *devlink,</div><div class='add'>+				     struct devlink_trap_group_item *group_item)</div><div class='add'>+{</div><div class='add'>+	u32 policer_id = group_item-&gt;group-&gt;init_policer_id;</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+</div><div class='add'>+	if (policer_id == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	policer_item = devlink_trap_policer_item_lookup(devlink, policer_id);</div><div class='add'>+	if (WARN_ON_ONCE(!policer_item))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	group_item-&gt;policer_item = policer_item;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_group_register(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_trap_group *group)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (devlink_trap_group_item_lookup(devlink, group-&gt;name))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	group_item = kzalloc(sizeof(*group_item), GFP_KERNEL);</div><div class='add'>+	if (!group_item)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	group_item-&gt;stats = netdev_alloc_pcpu_stats(struct devlink_stats);</div><div class='add'>+	if (!group_item-&gt;stats) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_stats_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	group_item-&gt;group = group;</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_group_item_policer_link(devlink, group_item);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_policer_link;</div><div class='add'>+</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_group_init) {</div><div class='add'>+		err = devlink-&gt;ops-&gt;trap_group_init(devlink, group);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_group_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;group_item-&gt;list, &amp;devlink-&gt;trap_group_list);</div><div class='add'>+	devlink_trap_group_notify(devlink, group_item,</div><div class='add'>+				  DEVLINK_CMD_TRAP_GROUP_NEW);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_group_init:</div><div class='add'>+err_policer_link:</div><div class='add'>+	free_percpu(group_item-&gt;stats);</div><div class='add'>+err_stats_alloc:</div><div class='add'>+	kfree(group_item);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_group_unregister(struct devlink *devlink,</div><div class='add'>+			      const struct devlink_trap_group *group)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_group_item *group_item;</div><div class='add'>+</div><div class='add'>+	group_item = devlink_trap_group_item_lookup(devlink, group-&gt;name);</div><div class='add'>+	if (WARN_ON_ONCE(!group_item))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink_trap_group_notify(devlink, group_item,</div><div class='add'>+				  DEVLINK_CMD_TRAP_GROUP_DEL);</div><div class='add'>+	list_del(&amp;group_item-&gt;list);</div><div class='add'>+	free_percpu(group_item-&gt;stats);</div><div class='add'>+	kfree(group_item);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_trap_groups_register - Register packet trap groups with devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @groups: Packet trap groups.</div><div class='add'>+ * @groups_count: Count of provided packet trap groups.</div><div class='add'>+ *</div><div class='add'>+ * Return: Non-zero value on failure.</div><div class='add'>+ */</div><div class='add'>+int devl_trap_groups_register(struct devlink *devlink,</div><div class='add'>+			      const struct devlink_trap_group *groups,</div><div class='add'>+			      size_t groups_count)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	for (i = 0; i &lt; groups_count; i++) {</div><div class='add'>+		const struct devlink_trap_group *group = &amp;groups[i];</div><div class='add'>+</div><div class='add'>+		err = devlink_trap_group_verify(group);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_trap_group_verify;</div><div class='add'>+</div><div class='add'>+		err = devlink_trap_group_register(devlink, group);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_trap_group_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_trap_group_register:</div><div class='add'>+err_trap_group_verify:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_group_unregister(devlink, &amp;groups[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_trap_groups_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_trap_groups_register - Register packet trap groups with devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @groups: Packet trap groups.</div><div class='add'>+ * @groups_count: Count of provided packet trap groups.</div><div class='add'>+ *</div><div class='add'>+ * Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ *</div><div class='add'>+ * Return: Non-zero value on failure.</div><div class='add'>+ */</div><div class='add'>+int devlink_trap_groups_register(struct devlink *devlink,</div><div class='add'>+				 const struct devlink_trap_group *groups,</div><div class='add'>+				 size_t groups_count)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	err = devl_trap_groups_register(devlink, groups, groups_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_trap_groups_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_trap_groups_unregister - Unregister packet trap groups from devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @groups: Packet trap groups.</div><div class='add'>+ * @groups_count: Count of provided packet trap groups.</div><div class='add'>+ */</div><div class='add'>+void devl_trap_groups_unregister(struct devlink *devlink,</div><div class='add'>+				 const struct devlink_trap_group *groups,</div><div class='add'>+				 size_t groups_count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	for (i = groups_count - 1; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_group_unregister(devlink, &amp;groups[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_trap_groups_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devlink_trap_groups_unregister - Unregister packet trap groups from devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @groups: Packet trap groups.</div><div class='add'>+ * @groups_count: Count of provided packet trap groups.</div><div class='add'>+ *</div><div class='add'>+ * Context: Takes and release devlink-&gt;lock &lt;mutex&gt;.</div><div class='add'>+ */</div><div class='add'>+void devlink_trap_groups_unregister(struct devlink *devlink,</div><div class='add'>+				    const struct devlink_trap_group *groups,</div><div class='add'>+				    size_t groups_count)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	devl_trap_groups_unregister(devlink, groups, groups_count);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devlink_trap_groups_unregister);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_policer_notify(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_trap_policer_item *policer_item,</div><div class='add'>+			    enum devlink_command cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &amp;&amp;</div><div class='add'>+		     cmd != DEVLINK_CMD_TRAP_POLICER_DEL);</div><div class='add'>+</div><div class='add'>+	if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = devlink_nl_trap_policer_fill(msg, devlink, policer_item, cmd, 0,</div><div class='add'>+					   0, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_nl_notify_send(devlink, msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_trap_policers_notify_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(policer_item, &amp;devlink-&gt;trap_policer_list, list)</div><div class='add'>+		devlink_trap_policer_notify(devlink, policer_item,</div><div class='add'>+					    DEVLINK_CMD_TRAP_POLICER_NEW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devlink_trap_policers_notify_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(policer_item, &amp;devlink-&gt;trap_policer_list,</div><div class='add'>+				    list)</div><div class='add'>+		devlink_trap_policer_notify(devlink, policer_item,</div><div class='add'>+					    DEVLINK_CMD_TRAP_POLICER_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+devlink_trap_policer_register(struct devlink *devlink,</div><div class='add'>+			      const struct devlink_trap_policer *policer)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (devlink_trap_policer_item_lookup(devlink, policer-&gt;id))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	policer_item = kzalloc(sizeof(*policer_item), GFP_KERNEL);</div><div class='add'>+	if (!policer_item)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	policer_item-&gt;policer = policer;</div><div class='add'>+	policer_item-&gt;rate = policer-&gt;init_rate;</div><div class='add'>+	policer_item-&gt;burst = policer-&gt;init_burst;</div><div class='add'>+</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_policer_init) {</div><div class='add'>+		err = devlink-&gt;ops-&gt;trap_policer_init(devlink, policer);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_policer_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;policer_item-&gt;list, &amp;devlink-&gt;trap_policer_list);</div><div class='add'>+	devlink_trap_policer_notify(devlink, policer_item,</div><div class='add'>+				    DEVLINK_CMD_TRAP_POLICER_NEW);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_policer_init:</div><div class='add'>+	kfree(policer_item);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+devlink_trap_policer_unregister(struct devlink *devlink,</div><div class='add'>+				const struct devlink_trap_policer *policer)</div><div class='add'>+{</div><div class='add'>+	struct devlink_trap_policer_item *policer_item;</div><div class='add'>+</div><div class='add'>+	policer_item = devlink_trap_policer_item_lookup(devlink, policer-&gt;id);</div><div class='add'>+	if (WARN_ON_ONCE(!policer_item))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devlink_trap_policer_notify(devlink, policer_item,</div><div class='add'>+				    DEVLINK_CMD_TRAP_POLICER_DEL);</div><div class='add'>+	list_del(&amp;policer_item-&gt;list);</div><div class='add'>+	if (devlink-&gt;ops-&gt;trap_policer_fini)</div><div class='add'>+		devlink-&gt;ops-&gt;trap_policer_fini(devlink, policer);</div><div class='add'>+	kfree(policer_item);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_trap_policers_register - Register packet trap policers with devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @policers: Packet trap policers.</div><div class='add'>+ * @policers_count: Count of provided packet trap policers.</div><div class='add'>+ *</div><div class='add'>+ * Return: Non-zero value on failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+devl_trap_policers_register(struct devlink *devlink,</div><div class='add'>+			    const struct devlink_trap_policer *policers,</div><div class='add'>+			    size_t policers_count)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	for (i = 0; i &lt; policers_count; i++) {</div><div class='add'>+		const struct devlink_trap_policer *policer = &amp;policers[i];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(policer-&gt;id == 0 ||</div><div class='add'>+			    policer-&gt;max_rate &lt; policer-&gt;min_rate ||</div><div class='add'>+			    policer-&gt;max_burst &lt; policer-&gt;min_burst)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_trap_policer_verify;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = devlink_trap_policer_register(devlink, policer);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_trap_policer_register;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_trap_policer_register:</div><div class='add'>+err_trap_policer_verify:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_policer_unregister(devlink, &amp;policers[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_trap_policers_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devl_trap_policers_unregister - Unregister packet trap policers from devlink.</div><div class='add'>+ * @devlink: devlink.</div><div class='add'>+ * @policers: Packet trap policers.</div><div class='add'>+ * @policers_count: Count of provided packet trap policers.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+devl_trap_policers_unregister(struct devlink *devlink,</div><div class='add'>+			      const struct devlink_trap_policer *policers,</div><div class='add'>+			      size_t policers_count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	devl_assert_locked(devlink);</div><div class='add'>+	for (i = policers_count - 1; i &gt;= 0; i--)</div><div class='add'>+		devlink_trap_policer_unregister(devlink, &amp;policers[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devl_trap_policers_unregister);</div><div class='head'>diff --git a/net/devres.c b/net/devres.c<br/>new file mode 100644<br/>index 000000000000..5ccf6ca311dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/devres.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/devres.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * This file contains all networking devres helpers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+struct net_device_devres {</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void devm_free_netdev(struct device *dev, void *this)</div><div class='add'>+{</div><div class='add'>+	struct net_device_devres *res = this;</div><div class='add'>+</div><div class='add'>+	free_netdev(res-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,</div><div class='add'>+					   unsigned int txqs, unsigned int rxqs)</div><div class='add'>+{</div><div class='add'>+	struct net_device_devres *dr;</div><div class='add'>+</div><div class='add'>+	dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);</div><div class='add'>+	if (!dr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dr-&gt;ndev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);</div><div class='add'>+	if (!dr-&gt;ndev) {</div><div class='add'>+		devres_free(dr);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devres_add(dev, dr);</div><div class='add'>+</div><div class='add'>+	return dr-&gt;ndev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(devm_alloc_etherdev_mqs);</div><div class='add'>+</div><div class='add'>+static void devm_unregister_netdev(struct device *dev, void *this)</div><div class='add'>+{</div><div class='add'>+	struct net_device_devres *res = this;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(res-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_devres_match(struct device *dev, void *this, void *match_data)</div><div class='add'>+{</div><div class='add'>+	struct net_device_devres *res = this;</div><div class='add'>+	struct net_device *ndev = match_data;</div><div class='add'>+</div><div class='add'>+	return ndev == res-&gt;ndev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	devm_register_netdev - resource managed variant of register_netdev()</div><div class='add'>+ *	@dev: managing device for this netdev - usually the parent device</div><div class='add'>+ *	@ndev: device to register</div><div class='add'>+ *</div><div class='add'>+ *	This is a devres variant of register_netdev() for which the unregister</div><div class='add'>+ *	function will be called automatically when the managing device is</div><div class='add'>+ *	detached. Note: the net_device used must also be resource managed by</div><div class='add'>+ *	the same struct device.</div><div class='add'>+ */</div><div class='add'>+int devm_register_netdev(struct device *dev, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_device_devres *dr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* struct net_device must itself be managed. For now a managed netdev</div><div class='add'>+	 * can only be allocated by devm_alloc_etherdev_mqs() so the check is</div><div class='add'>+	 * straightforward.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(!devres_find(dev, devm_free_netdev,</div><div class='add'>+				 netdev_devres_match, ndev)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dr = devres_alloc(devm_unregister_netdev, sizeof(*dr), GFP_KERNEL);</div><div class='add'>+	if (!dr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = register_netdev(ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		devres_free(dr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dr-&gt;ndev = ndev;</div><div class='add'>+	devres_add(ndev-&gt;dev.parent, dr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(devm_register_netdev);</div><div class='head'>diff --git a/net/dns_resolver/Kconfig b/net/dns_resolver/Kconfig<br/>index 50d49f7e0472..7c2dba273e35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dns_resolver/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Configuration for DNS Resolver</div><div class='ctx'> #</div><div class='ctx'> config DNS_RESOLVER</div><div class='ctx'> 	tristate "DNS Resolver support"</div><div class='del'>-	depends on NET &amp;&amp; KEYS</div><div class='add'>+	depends on KEYS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Saying Y here will include support for the DNS Resolver key type</div><div class='ctx'> 	  which can be used to make upcalls to perform DNS lookups in</div><div class='hunk'>@@ -18,10 +19,10 @@ config DNS_RESOLVER</div><div class='ctx'> 	  SMB2 later.  DNS Resolver is supported by the userspace upcall</div><div class='ctx'> 	  helper "/sbin/dns.resolver" via /etc/request-key.conf.</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/networking/dns_resolver.txt&gt; for further</div><div class='add'>+	  See &lt;file:Documentation/networking/dns_resolver.rst&gt; for further</div><div class='ctx'> 	  information.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this as a module, choose M here: the module will be called</div><div class='del'>-	  dnsresolver.</div><div class='add'>+	  dns_resolver.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='head'>diff --git a/net/dns_resolver/Makefile b/net/dns_resolver/Makefile<br/>index d5c13c2eb36d..877532d662d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dns_resolver/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux DNS Resolver.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c<br/>index 7f4534828f6c..c42ddd85ff1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/dns_key.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/dns_key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/dns_key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dns_resolver/dns_key.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* Key type used to cache DNS lookups made by the kernel</div><div class='ctx'>  *</div><div class='del'>- * See Documentation/networking/dns_resolver.txt</div><div class='add'>+ * See Documentation/networking/dns_resolver.rst</div><div class='ctx'>  *</div><div class='ctx'>  *   Copyright (c) 2007 Igor Mammedov</div><div class='ctx'>  *   Author(s): Igor Mammedov (niallain@gmail.com)</div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/keyctl.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/dns_resolver.h&gt;</div><div class='ctx'> #include &lt;keys/dns_resolver-type.h&gt;</div><div class='ctx'> #include &lt;keys/user-type.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -48,14 +49,44 @@ const struct cred *dns_resolver_cache;</div><div class='ctx'> /*</div><div class='ctx'>  * Preparse instantiation data for a dns_resolver key.</div><div class='ctx'>  *</div><div class='del'>- * The data must be a NUL-terminated string, with the NUL char accounted in</div><div class='del'>- * datalen.</div><div class='add'>+ * For normal hostname lookups, the data must be a NUL-terminated string, with</div><div class='add'>+ * the NUL char accounted in datalen.</div><div class='ctx'>  *</div><div class='ctx'>  * If the data contains a '#' characters, then we take the clause after each</div><div class='ctx'>  * one to be an option of the form 'key=value'.  The actual data of interest is</div><div class='ctx'>  * the string leading up to the first '#'.  For instance:</div><div class='ctx'>  *</div><div class='ctx'>  *        "ip1,ip2,...#foo=bar"</div><div class='add'>+ *</div><div class='add'>+ * For server list requests, the data must begin with a NUL char and be</div><div class='add'>+ * followed by a byte indicating the version of the data format.  Version 1</div><div class='add'>+ * looks something like (note this is packed):</div><div class='add'>+ *</div><div class='add'>+ *	u8      Non-string marker (ie. 0)</div><div class='add'>+ *	u8	Content (DNS_PAYLOAD_IS_*)</div><div class='add'>+ *	u8	Version (e.g. 1)</div><div class='add'>+ *	u8	Source of server list</div><div class='add'>+ *	u8	Lookup status of server list</div><div class='add'>+ *	u8	Number of servers</div><div class='add'>+ *	foreach-server {</div><div class='add'>+ *		__le16	Name length</div><div class='add'>+ *		__le16	Priority (as per SRV record, low first)</div><div class='add'>+ *		__le16	Weight (as per SRV record, higher first)</div><div class='add'>+ *		__le16	Port</div><div class='add'>+ *		u8	Source of address list</div><div class='add'>+ *		u8	Lookup status of address list</div><div class='add'>+ *		u8	Protocol (DNS_SERVER_PROTOCOL_*)</div><div class='add'>+ *		u8	Number of addresses</div><div class='add'>+ *		char[]	Name (not NUL-terminated)</div><div class='add'>+ *		foreach-address {</div><div class='add'>+ *			u8		Family (DNS_ADDRESS_IS_*)</div><div class='add'>+ *			union {</div><div class='add'>+ *				u8[4]	ipv4_addr</div><div class='add'>+ *				u8[16]	ipv6_addr</div><div class='add'>+ *			}</div><div class='add'>+ *		}</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> dns_resolver_preparse(struct key_preparsed_payload *prep)</div><div class='hunk'>@@ -66,9 +97,45 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)</div><div class='ctx'> 	int datalen = prep-&gt;datalen, result_len = 0;</div><div class='ctx'> 	const char *data = prep-&gt;data, *end, *opt;</div><div class='ctx'> </div><div class='add'>+	if (datalen &lt;= 1 || !data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data[0] == 0) {</div><div class='add'>+		const struct dns_server_list_v1_header *v1;</div><div class='add'>+</div><div class='add'>+		/* It may be a server list. */</div><div class='add'>+		if (datalen &lt; sizeof(*v1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		v1 = (const struct dns_server_list_v1_header *)data;</div><div class='add'>+		kenter("[%u,%u],%u", v1-&gt;hdr.content, v1-&gt;hdr.version, datalen);</div><div class='add'>+		if (v1-&gt;hdr.content != DNS_PAYLOAD_IS_SERVER_LIST) {</div><div class='add'>+			pr_warn_ratelimited(</div><div class='add'>+				"dns_resolver: Unsupported content type (%u)\n",</div><div class='add'>+				v1-&gt;hdr.content);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (v1-&gt;hdr.version != 1) {</div><div class='add'>+			pr_warn_ratelimited(</div><div class='add'>+				"dns_resolver: Unsupported server list version (%u)\n",</div><div class='add'>+				v1-&gt;hdr.version);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((v1-&gt;status != DNS_LOOKUP_GOOD &amp;&amp;</div><div class='add'>+		     v1-&gt;status != DNS_LOOKUP_GOOD_WITH_BAD)) {</div><div class='add'>+			if (prep-&gt;expiry == TIME64_MAX)</div><div class='add'>+				prep-&gt;expiry = ktime_get_real_seconds() + 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result_len = datalen;</div><div class='add'>+		goto store_result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	kenter("'%*.*s',%u", datalen, datalen, data, datalen);</div><div class='ctx'> </div><div class='del'>-	if (datalen &lt;= 1 || !data || data[datalen - 1] != '\0')</div><div class='add'>+	if (!data || data[datalen - 1] != '\0')</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	datalen--;</div><div class='ctx'> </div><div class='hunk'>@@ -144,6 +211,7 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+store_result:</div><div class='ctx'> 	kdebug("store result");</div><div class='ctx'> 	prep-&gt;quotalen = result_len;</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +309,7 @@ static void dns_resolver_describe(const struct key *key, struct seq_file *m)</div><div class='ctx'>  * - the key's semaphore is read-locked</div><div class='ctx'>  */</div><div class='ctx'> static long dns_resolver_read(const struct key *key,</div><div class='del'>-			      char __user *buffer, size_t buflen)</div><div class='add'>+			      char *buffer, size_t buflen)</div><div class='ctx'> {</div><div class='ctx'> 	int err = PTR_ERR(key-&gt;payload.data[dns_key_error]);</div><div class='ctx'> </div><div class='hunk'>@@ -253,6 +321,7 @@ static long dns_resolver_read(const struct key *key,</div><div class='ctx'> </div><div class='ctx'> struct key_type key_type_dns_resolver = {</div><div class='ctx'> 	.name		= "dns_resolver",</div><div class='add'>+	.flags		= KEY_TYPE_NET_DOMAIN | KEY_TYPE_INSTANT_REAP,</div><div class='ctx'> 	.preparse	= dns_resolver_preparse,</div><div class='ctx'> 	.free_preparse	= dns_resolver_free_preparse,</div><div class='ctx'> 	.instantiate	= generic_key_instantiate,</div><div class='hunk'>@@ -275,7 +344,7 @@ static int __init init_dns_resolver(void)</div><div class='ctx'> 	 * this is used to prevent malicious redirections from being installed</div><div class='ctx'> 	 * with add_key().</div><div class='ctx'> 	 */</div><div class='del'>-	cred = prepare_kernel_cred(NULL);</div><div class='add'>+	cred = prepare_kernel_cred(&amp;init_task);</div><div class='ctx'> 	if (!cred)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c<br/>index 49da67034f29..53da62984447 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/dns_query.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dns_resolver/dns_query.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dns_resolver/dns_query.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dns_resolver/dns_query.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* Upcall routine, designed to work as a key type and working through</div><div class='ctx'>  * /sbin/request-key to contact userspace when handling DNS queries.</div><div class='ctx'>  *</div><div class='del'>- * See Documentation/networking/dns_resolver.txt</div><div class='add'>+ * See Documentation/networking/dns_resolver.rst</div><div class='ctx'>  *</div><div class='ctx'>  *   Copyright (c) 2007 Igor Mammedov</div><div class='ctx'>  *   Author(s): Igor Mammedov (niallain@gmail.com)</div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/dns_resolver.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;keys/dns_resolver-type.h&gt;</div><div class='ctx'> #include &lt;keys/user-type.h&gt;</div><div class='hunk'>@@ -48,12 +49,14 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dns_query - Query the DNS</div><div class='add'>+ * @net: The network namespace to operate in.</div><div class='ctx'>  * @type: Query type (or NULL for straight host-&gt;IP lookup)</div><div class='ctx'>  * @name: Name to look up</div><div class='ctx'>  * @namelen: Length of name</div><div class='ctx'>  * @options: Request options (or NULL if no options)</div><div class='ctx'>  * @_result: Where to place the returned data (or NULL)</div><div class='ctx'>  * @_expiry: Where to store the result expiry time (or NULL)</div><div class='add'>+ * @invalidate: Always invalidate the key after use</div><div class='ctx'>  *</div><div class='ctx'>  * The data will be returned in the pointer at *result, if provided, and the</div><div class='ctx'>  * caller is responsible for freeing it.</div><div class='hunk'>@@ -68,12 +71,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the size of the result on success, -ve error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int dns_query(const char *type, const char *name, size_t namelen,</div><div class='del'>-	      const char *options, char **_result, time64_t *_expiry)</div><div class='add'>+int dns_query(struct net *net,</div><div class='add'>+	      const char *type, const char *name, size_t namelen,</div><div class='add'>+	      const char *options, char **_result, time64_t *_expiry,</div><div class='add'>+	      bool invalidate)</div><div class='ctx'> {</div><div class='ctx'> 	struct key *rkey;</div><div class='ctx'> 	struct user_key_payload *upayload;</div><div class='del'>-	const struct cred *saved_cred;</div><div class='ctx'> 	size_t typelen, desclen;</div><div class='ctx'> 	char *desc, *cp;</div><div class='ctx'> 	int ret, len;</div><div class='hunk'>@@ -94,8 +98,6 @@ int dns_query(const char *type, const char *name, size_t namelen,</div><div class='ctx'> 		desclen += typelen + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!namelen)</div><div class='del'>-		namelen = strnlen(name, 256);</div><div class='ctx'> 	if (namelen &lt; 3 || namelen &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	desclen += namelen + 1;</div><div class='hunk'>@@ -121,9 +123,8 @@ int dns_query(const char *type, const char *name, size_t namelen,</div><div class='ctx'> 	/* make the upcall, using special credentials to prevent the use of</div><div class='ctx'> 	 * add_key() to preinstall malicious redirections</div><div class='ctx'> 	 */</div><div class='del'>-	saved_cred = override_creds(dns_resolver_cache);</div><div class='del'>-	rkey = request_key(&amp;key_type_dns_resolver, desc, options);</div><div class='del'>-	revert_creds(saved_cred);</div><div class='add'>+	scoped_with_creds(dns_resolver_cache)</div><div class='add'>+		rkey = request_key_net(&amp;key_type_dns_resolver, desc, net, options);</div><div class='ctx'> 	kfree(desc);</div><div class='ctx'> 	if (IS_ERR(rkey)) {</div><div class='ctx'> 		ret = PTR_ERR(rkey);</div><div class='hunk'>@@ -148,12 +149,9 @@ int dns_query(const char *type, const char *name, size_t namelen,</div><div class='ctx'> </div><div class='ctx'> 	if (_result) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		*_result = kmalloc(len + 1, GFP_KERNEL);</div><div class='add'>+		*_result = kmemdup_nul(upayload-&gt;data, len, GFP_KERNEL);</div><div class='ctx'> 		if (!*_result)</div><div class='ctx'> 			goto put;</div><div class='del'>-</div><div class='del'>-		memcpy(*_result, upayload-&gt;data, len);</div><div class='del'>-		(*_result)[len] = '\0';</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (_expiry)</div><div class='hunk'>@@ -162,6 +160,8 @@ int dns_query(const char *type, const char *name, size_t namelen,</div><div class='ctx'> 	ret = len;</div><div class='ctx'> put:</div><div class='ctx'> 	up_read(&amp;rkey-&gt;sem);</div><div class='add'>+	if (invalidate)</div><div class='add'>+		key_invalidate(rkey);</div><div class='ctx'> 	key_put(rkey);</div><div class='ctx'> out:</div><div class='ctx'> 	kleave(" = %d", ret);</div><div class='head'>diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig<br/>index 4183e4ba27a5..f86b30742122 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/Kconfig</a></div><div class='hunk'>@@ -1,56 +1,207 @@</div><div class='del'>-config HAVE_NET_DSA</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on INET &amp;&amp; NETDEVICES &amp;&amp; !S390</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='del'>-# Drivers must select NET_DSA and the appropriate tagging format</div><div class='del'>-</div><div class='del'>-config NET_DSA</div><div class='add'>+menuconfig NET_DSA</div><div class='ctx'> 	tristate "Distributed Switch Architecture"</div><div class='del'>-	depends on HAVE_NET_DSA &amp;&amp; MAY_USE_DEVLINK</div><div class='ctx'> 	depends on BRIDGE || BRIDGE=n</div><div class='add'>+	depends on HSR || HSR=n</div><div class='add'>+	depends on INET &amp;&amp; NETDEVICES</div><div class='add'>+	select GRO_CELLS</div><div class='ctx'> 	select NET_SWITCHDEV</div><div class='ctx'> 	select PHYLINK</div><div class='del'>-	---help---</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	imply NET_SELFTESTS</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y if you want to enable support for the hardware switches supported</div><div class='ctx'> 	  by the Distributed Switch Architecture.</div><div class='ctx'> </div><div class='ctx'> if NET_DSA</div><div class='ctx'> </div><div class='del'>-config NET_DSA_LEGACY</div><div class='del'>-	bool "Support for older platform device and Device Tree registration"</div><div class='del'>-	default y</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y if you want to enable support for the older platform device and</div><div class='del'>-	  deprecated Device Tree binding registration.</div><div class='add'>+# Drivers must select the appropriate tagging format(s)</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_NONE</div><div class='add'>+	tristate "No-op tag driver"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for switches which don't tag</div><div class='add'>+	  frames over the CPU port.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_AR9331</div><div class='add'>+	tristate "Tag driver for Atheros AR9331 SoC with built-in switch"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  the Atheros AR9331 SoC with built-in switch.</div><div class='ctx'> </div><div class='del'>-	  This feature is scheduled for removal in 4.17.</div><div class='add'>+config NET_DSA_TAG_BRCM_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	default n</div><div class='ctx'> </div><div class='del'>-# tagging formats</div><div class='ctx'> config NET_DSA_TAG_BRCM</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for Broadcom switches using in-frame headers"</div><div class='add'>+	select NET_DSA_TAG_BRCM_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you want to enable support for tagging frames for the</div><div class='add'>+	  Broadcom switches which place the tag after the MAC source address.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_BRCM_LEGACY</div><div class='add'>+	tristate "Tag driver for BCM63xx legacy switches using in-frame headers"</div><div class='add'>+	select NET_DSA_TAG_BRCM_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you want to enable support for tagging frames for the</div><div class='add'>+	  BCM63xx legacy switches which place the tag after the MAC source</div><div class='add'>+	  address.</div><div class='add'>+	  This tag is used in BCM63xx legacy switches which work without the</div><div class='add'>+	  original FCS and length before the tag insertion.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_BRCM_LEGACY_FCS</div><div class='add'>+	tristate "Tag driver for BCM53xx legacy switches using in-frame headers"</div><div class='add'>+	select NET_DSA_TAG_BRCM_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you want to enable support for tagging frames for the</div><div class='add'>+	  BCM53xx legacy switches which place the tag after the MAC source</div><div class='add'>+	  address.</div><div class='add'>+	  This tag is used in BCM53xx legacy switches which expect original</div><div class='add'>+	  FCS and length before the tag insertion to be present.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_BRCM_PREPEND</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for Broadcom switches using prepended headers"</div><div class='add'>+	select NET_DSA_TAG_BRCM_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you want to enable support for tagging frames for the</div><div class='add'>+	  Broadcom switches which places the tag before the Ethernet header</div><div class='add'>+	  (prepended).</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_HELLCREEK</div><div class='add'>+	tristate "Tag driver for Hirschmann Hellcreek TSN switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames</div><div class='add'>+	  for the Hirschmann Hellcreek TSN switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_GSWIP</div><div class='add'>+	tristate "Tag driver for Lantiq / Intel GSWIP switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for the</div><div class='add'>+	  Lantiq / Intel GSWIP switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_DSA_COMMON</div><div class='add'>+	tristate</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_DSA</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for Marvell switches using DSA headers"</div><div class='add'>+	select NET_DSA_TAG_DSA_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for the</div><div class='add'>+	  Marvell switches which use DSA headers.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_EDSA</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for Marvell switches using EtherType DSA headers"</div><div class='add'>+	select NET_DSA_TAG_DSA_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for the</div><div class='add'>+	  Marvell switches which use EtherType DSA headers.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_MTK</div><div class='add'>+	tristate "Tag driver for Mediatek switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  Mediatek switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_MXL_GSW1XX</div><div class='add'>+	tristate "Tag driver for MaxLinear GSW1xx switches"</div><div class='add'>+	help</div><div class='add'>+	  The GSW1xx family of switches supports an 8-byte special tag which</div><div class='add'>+	  can be used on the CPU port of the switch.</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  MaxLinear GSW1xx switches.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_KSZ</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for Microchip 8795/937x/9477/9893 families of switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you want to enable support for tagging frames for the</div><div class='add'>+	  Microchip 8795/937x/9477/9893 families of switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_OCELOT</div><div class='add'>+	tristate "Tag driver for Ocelot family of switches, using NPI port"</div><div class='add'>+	select PACKING</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable NPI tagging for the Ocelot switches</div><div class='add'>+	  (VSC7511, VSC7512, VSC7513, VSC7514, VSC9953, VSC9959). In this mode,</div><div class='add'>+	  the frames over the Ethernet CPU port are prepended with a</div><div class='add'>+	  hardware-defined injection/extraction frame header.  Flow control</div><div class='add'>+	  (PAUSE frames) over the CPU port is not supported when operating in</div><div class='add'>+	  this mode.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_OCELOT_8021Q</div><div class='add'>+	tristate "Tag driver for Ocelot family of switches, using VLAN"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames with a</div><div class='add'>+	  custom VLAN-based header. Frames that require timestamping, such as</div><div class='add'>+	  PTP, are not delivered over Ethernet but over register-based MMIO.</div><div class='add'>+	  Flow control over the CPU port is functional in this mode. When using</div><div class='add'>+	  this mode, less TCAM resources (VCAP IS1, IS2, ES0) are available for</div><div class='add'>+	  use with tc-flower.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_QCA</div><div class='add'>+	tristate "Tag driver for Qualcomm Atheros QCA8K switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  the Qualcomm Atheros QCA8K switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_RTL4_A</div><div class='add'>+	tristate "Tag driver for Realtek 4 byte protocol A tags"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for the</div><div class='add'>+	  Realtek switches with 4 byte protocol A tags, such as found in</div><div class='add'>+	  the Realtek RTL8366RB.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_RTL8_4</div><div class='add'>+	tristate "Tag driver for Realtek 8 byte protocol 4 tags"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for Realtek</div><div class='add'>+	  switches with 8 byte protocol 4 tags, such as the Realtek RTL8365MB-VC.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_RZN1_A5PSW</div><div class='add'>+	tristate "Tag driver for Renesas RZ/N1 A5PSW switch"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  Renesas RZ/N1 embedded switch that uses an 8 byte tag located after</div><div class='add'>+	  destination MAC address.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_LAN9303</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for SMSC/Microchip LAN9303 family of switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for the</div><div class='add'>+	  SMSC/Microchip LAN9303 family of switches.</div><div class='ctx'> </div><div class='del'>-config NET_DSA_TAG_MTK</div><div class='del'>-	bool</div><div class='add'>+config NET_DSA_TAG_SJA1105</div><div class='add'>+	tristate "Tag driver for NXP SJA1105 switches"</div><div class='add'>+	select PACKING</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames with the</div><div class='add'>+	  NXP SJA1105 switch family. Both the native tagging protocol (which</div><div class='add'>+	  is only for link-local traffic) as well as non-native tagging (based</div><div class='add'>+	  on a custom 802.1Q VLAN header) are available.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_TAG_TRAILER</div><div class='del'>-	bool</div><div class='add'>+	tristate "Tag driver for switches using a trailer tag"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames at</div><div class='add'>+	  with a trailed. e.g. Marvell 88E6060.</div><div class='ctx'> </div><div class='del'>-config NET_DSA_TAG_QCA</div><div class='del'>-	bool</div><div class='add'>+config NET_DSA_TAG_VSC73XX_8021Q</div><div class='add'>+	tristate "Tag driver for Microchip/Vitesse VSC73xx family of switches, using VLAN"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames with a</div><div class='add'>+	  custom VLAN-based header.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_XRS700X</div><div class='add'>+	tristate "Tag driver for XRS700x switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  Arrow SpeedChips XRS700x switches that use a single byte tag trailer.</div><div class='add'>+</div><div class='add'>+config NET_DSA_TAG_YT921X</div><div class='add'>+	tristate "Tag driver for Motorcomm YT921x switches"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M if you want to enable support for tagging frames for</div><div class='add'>+	  Motorcomm YT921x switches.</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/net/dsa/Makefile b/net/dsa/Makefile<br/>index 9e4d3536f977..42d173f5a701 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/Makefile</a></div><div class='hunk'>@@ -1,16 +1,46 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# the stubs are built-in whenever DSA is built-in or module</div><div class='add'>+ifdef CONFIG_NET_DSA</div><div class='add'>+obj-y := stubs.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> # the core</div><div class='ctx'> obj-$(CONFIG_NET_DSA) += dsa_core.o</div><div class='del'>-dsa_core-y += dsa.o dsa2.o master.o port.o slave.o switch.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_LEGACY) += legacy.o</div><div class='add'>+dsa_core-y += \</div><div class='add'>+	conduit.o \</div><div class='add'>+	devlink.o \</div><div class='add'>+	dsa.o \</div><div class='add'>+	netlink.o \</div><div class='add'>+	port.o \</div><div class='add'>+	switch.o \</div><div class='add'>+	tag.o \</div><div class='add'>+	tag_8021q.o \</div><div class='add'>+	trace.o \</div><div class='add'>+	user.o</div><div class='ctx'> </div><div class='ctx'> # tagging formats</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_BRCM_PREPEND) += tag_brcm.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o</div><div class='del'>-dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_AR9331) += tag_ar9331.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_DSA_COMMON) += tag_dsa.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_HELLCREEK) += tag_hellcreek.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_MXL_GSW1XX) += tag_mxl-gsw1xx.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_NONE) += tag_none.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_OCELOT) += tag_ocelot.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_OCELOT_8021Q) += tag_ocelot_8021q.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_RTL4_A) += tag_rtl4_a.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_RTL8_4) += tag_rtl8_4.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_RZN1_A5PSW) += tag_rzn1_a5psw.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_SJA1105) += tag_sja1105.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_VSC73XX_8021Q) += tag_vsc73xx_8021q.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_XRS700X) += tag_xrs700x.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_TAG_YT921X) += tag_yt921x.o</div><div class='add'>+</div><div class='add'>+# for tracing framework to find trace.h</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='head'>diff --git a/net/dsa/conduit.c b/net/dsa/conduit.c<br/>new file mode 100644<br/>index 000000000000..a1b044467bd6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/conduit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/conduit.c</a></div><div class='hunk'>@@ -0,0 +1,549 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Handling of a conduit device, switching frames via its switch fabric CPU port</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Savoir-faire Linux Inc.</div><div class='add'>+ *	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "conduit.h"</div><div class='add'>+#include "dsa.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+static int dsa_conduit_get_regs_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	int port = cpu_dp-&gt;index;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_regs_len) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		len = ops-&gt;get_regs_len(dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+		ret += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret += sizeof(struct ethtool_drvinfo);</div><div class='add'>+	ret += sizeof(struct ethtool_regs);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_regs_len) {</div><div class='add'>+		len = ds-&gt;ops-&gt;get_regs_len(ds, port);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+		ret += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_get_regs(struct net_device *dev,</div><div class='add'>+				 struct ethtool_regs *regs, void *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	struct ethtool_drvinfo *cpu_info;</div><div class='add'>+	struct ethtool_regs *cpu_regs;</div><div class='add'>+	int port = cpu_dp-&gt;index;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_regs_len &amp;&amp; ops-&gt;get_regs) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		len = ops-&gt;get_regs_len(dev);</div><div class='add'>+		if (len &lt; 0) {</div><div class='add'>+			netdev_unlock_ops(dev);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		regs-&gt;len = len;</div><div class='add'>+		ops-&gt;get_regs(dev, regs, data);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		data += regs-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpu_info = (struct ethtool_drvinfo *)data;</div><div class='add'>+	strscpy(cpu_info-&gt;driver, "dsa", sizeof(cpu_info-&gt;driver));</div><div class='add'>+	data += sizeof(*cpu_info);</div><div class='add'>+	cpu_regs = (struct ethtool_regs *)data;</div><div class='add'>+	data += sizeof(*cpu_regs);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_regs_len &amp;&amp; ds-&gt;ops-&gt;get_regs) {</div><div class='add'>+		len = ds-&gt;ops-&gt;get_regs_len(ds, port);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+		cpu_regs-&gt;len = len;</div><div class='add'>+		ds-&gt;ops-&gt;get_regs(ds, port, cpu_regs, data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dsa_conduit_append_port_stats(struct dsa_switch *ds, int port,</div><div class='add'>+					     u64 *data, size_t start)</div><div class='add'>+{</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;get_sset_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	count = ds-&gt;ops-&gt;get_sset_count(ds, port, ETH_SS_STATS);</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_ethtool_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_ethtool_stats(ds, port, data + start);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_get_ethtool_stats(struct net_device *dev,</div><div class='add'>+					  struct ethtool_stats *stats,</div><div class='add'>+					  u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp, *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	int count, mcount = 0;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_ethtool_stats) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		mcount = ops-&gt;get_sset_count(dev, ETH_SS_STATS);</div><div class='add'>+		ops-&gt;get_ethtool_stats(dev, stats, data);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (!dsa_port_is_dsa(dp) &amp;&amp; !dsa_port_is_cpu(dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		count = dsa_conduit_append_port_stats(dp-&gt;ds, dp-&gt;index,</div><div class='add'>+						      data, mcount);</div><div class='add'>+		if (count &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mcount += count;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_get_ethtool_phy_stats(struct net_device *dev,</div><div class='add'>+					      struct ethtool_stats *stats,</div><div class='add'>+					      u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	int port = cpu_dp-&gt;index;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phydev &amp;&amp; (!ops || !ops-&gt;get_ethtool_phy_stats)) {</div><div class='add'>+		count = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='add'>+		if (count &gt;= 0)</div><div class='add'>+			phy_ethtool_get_stats(dev-&gt;phydev, stats, data);</div><div class='add'>+	} else if (ops &amp;&amp; ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_ethtool_phy_stats) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		count = ops-&gt;get_sset_count(dev, ETH_SS_PHY_STATS);</div><div class='add'>+		ops-&gt;get_ethtool_phy_stats(dev, stats, data);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		count = 0;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_ethtool_phy_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_ethtool_phy_stats(ds, port, data + count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_append_port_sset_count(struct dsa_switch *ds, int port,</div><div class='add'>+					       int sset, int *count)</div><div class='add'>+{</div><div class='add'>+	if (ds-&gt;ops-&gt;get_sset_count)</div><div class='add'>+		*count += ds-&gt;ops-&gt;get_sset_count(ds, port, sset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_conduit_get_sset_count(struct net_device *dev, int sset)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp, *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	if (sset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='add'>+	    (!ops || !ops-&gt;get_ethtool_phy_stats))</div><div class='add'>+		count = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='add'>+	else if (ops &amp;&amp; ops-&gt;get_sset_count)</div><div class='add'>+		count = ops-&gt;get_sset_count(dev, sset);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		count = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (!dsa_port_is_dsa(dp) &amp;&amp; !dsa_port_is_cpu(dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dsa_conduit_append_port_sset_count(dp-&gt;ds, dp-&gt;index, sset,</div><div class='add'>+						   &amp;count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dsa_conduit_append_port_strings(struct dsa_switch *ds, int port,</div><div class='add'>+					       u32 stringset, u8 *data,</div><div class='add'>+					       size_t start)</div><div class='add'>+{</div><div class='add'>+	int len = ETH_GSTRING_LEN;</div><div class='add'>+	u8 pfx[8], *ndata;</div><div class='add'>+	int count, i;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;get_strings)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	snprintf(pfx, sizeof(pfx), "s%.2d_p%.2d", ds-&gt;index, port);</div><div class='add'>+	/* We do not want to be NULL-terminated, since this is a prefix */</div><div class='add'>+	pfx[sizeof(pfx) - 1] = '_';</div><div class='add'>+	ndata = data + start * len;</div><div class='add'>+	/* This function copies ETH_GSTRINGS_LEN bytes, we will mangle</div><div class='add'>+	 * the output after to prepend our CPU port prefix we</div><div class='add'>+	 * constructed earlier</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;ops-&gt;get_strings(ds, port, stringset, ndata);</div><div class='add'>+	count = ds-&gt;ops-&gt;get_sset_count(ds, port, stringset);</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		memmove(ndata + (i * len + sizeof(pfx)),</div><div class='add'>+			ndata + i * len, len - sizeof(pfx));</div><div class='add'>+		memcpy(ndata + i * len, pfx, sizeof(pfx));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_get_strings(struct net_device *dev, u32 stringset,</div><div class='add'>+				    u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp, *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	int count, mcount = 0;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	if (stringset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='add'>+	    !ops-&gt;get_ethtool_phy_stats) {</div><div class='add'>+		mcount = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='add'>+		if (mcount &lt; 0)</div><div class='add'>+			mcount = 0;</div><div class='add'>+		else</div><div class='add'>+			phy_ethtool_get_strings(dev-&gt;phydev, data);</div><div class='add'>+	} else if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_strings) {</div><div class='add'>+		mcount = ops-&gt;get_sset_count(dev, stringset);</div><div class='add'>+		if (mcount &lt; 0)</div><div class='add'>+			mcount = 0;</div><div class='add'>+		ops-&gt;get_strings(dev, stringset, data);</div><div class='add'>+	}</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (!dsa_port_is_dsa(dp) &amp;&amp; !dsa_port_is_cpu(dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		count = dsa_conduit_append_port_strings(dp-&gt;ds, dp-&gt;index,</div><div class='add'>+							stringset, data,</div><div class='add'>+							mcount);</div><div class='add'>+		if (count &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mcount += count;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deny PTP operations on conduit if there is at least one switch in the tree</div><div class='add'>+ * that is PTP capable.</div><div class='add'>+ */</div><div class='add'>+int __dsa_conduit_hwtstamp_validate(struct net_device *dev,</div><div class='add'>+				    const struct kernel_hwtstamp_config *config,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dst = ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dsa_port_supports_hwtstamp(dp)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "HW timestamping not allowed on DSA conduit when switch supports the operation");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_conduit_ethtool_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	struct ethtool_ops *ops;</div><div class='add'>+</div><div class='add'>+	if (netif_is_lag_master(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ops = devm_kzalloc(ds-&gt;dev, sizeof(*ops), GFP_KERNEL);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cpu_dp-&gt;orig_ethtool_ops = dev-&gt;ethtool_ops;</div><div class='add'>+	if (cpu_dp-&gt;orig_ethtool_ops)</div><div class='add'>+		memcpy(ops, cpu_dp-&gt;orig_ethtool_ops, sizeof(*ops));</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_regs_len = dsa_conduit_get_regs_len;</div><div class='add'>+	ops-&gt;get_regs = dsa_conduit_get_regs;</div><div class='add'>+	ops-&gt;get_sset_count = dsa_conduit_get_sset_count;</div><div class='add'>+	ops-&gt;get_ethtool_stats = dsa_conduit_get_ethtool_stats;</div><div class='add'>+	ops-&gt;get_strings = dsa_conduit_get_strings;</div><div class='add'>+	ops-&gt;get_ethtool_phy_stats = dsa_conduit_get_ethtool_phy_stats;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops = ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_ethtool_teardown(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+</div><div class='add'>+	if (netif_is_lag_master(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='add'>+	cpu_dp-&gt;orig_ethtool_ops = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Keep the conduit always promiscuous if the tagging protocol requires that</div><div class='add'>+ * (garbles MAC DA) or if it doesn't support unicast filtering, case in which</div><div class='add'>+ * it would revert to promiscuous mode as soon as we call dev_uc_add() on it</div><div class='add'>+ * anyway.</div><div class='add'>+ */</div><div class='add'>+static void dsa_conduit_set_promiscuity(struct net_device *dev, int inc)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *ops = dev-&gt;dsa_ptr-&gt;tag_ops;</div><div class='add'>+</div><div class='add'>+	if ((dev-&gt;priv_flags &amp; IFF_UNICAST_FLT) &amp;&amp; !ops-&gt;promisc_on_conduit)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	dev_set_promiscuity(dev, inc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t tagging_show(struct device *d, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = to_net_dev(d);</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%s\n",</div><div class='add'>+		       dsa_tag_protocol_to_str(cpu_dp-&gt;tag_ops));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t tagging_store(struct device *d, struct device_attribute *attr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *new_tag_ops, *old_tag_ops;</div><div class='add'>+	const char *end = strchrnul(buf, '\n'), *name;</div><div class='add'>+	struct net_device *dev = to_net_dev(d);</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	size_t len = end - buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Empty string passed */</div><div class='add'>+	if (!len)</div><div class='add'>+		return -ENOPROTOOPT;</div><div class='add'>+</div><div class='add'>+	name = kstrndup(buf, len, GFP_KERNEL);</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	old_tag_ops = cpu_dp-&gt;tag_ops;</div><div class='add'>+	new_tag_ops = dsa_tag_driver_get_by_name(name);</div><div class='add'>+	kfree(name);</div><div class='add'>+	/* Bad tagger name? */</div><div class='add'>+	if (IS_ERR(new_tag_ops))</div><div class='add'>+		return PTR_ERR(new_tag_ops);</div><div class='add'>+</div><div class='add'>+	if (new_tag_ops == old_tag_ops)</div><div class='add'>+		/* Drop the temporarily held duplicate reference, since</div><div class='add'>+		 * the DSA switch tree uses this tagger.</div><div class='add'>+		 */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_change_tag_proto(cpu_dp-&gt;ds-&gt;dst, new_tag_ops,</div><div class='add'>+					old_tag_ops);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* On failure the old tagger is restored, so we don't need the</div><div class='add'>+		 * driver for the new one.</div><div class='add'>+		 */</div><div class='add'>+		dsa_tag_driver_put(new_tag_ops);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* On success we no longer need the module for the old tagging protocol</div><div class='add'>+	 */</div><div class='add'>+out:</div><div class='add'>+	dsa_tag_driver_put(old_tag_ops);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RW(tagging);</div><div class='add'>+</div><div class='add'>+static struct attribute *dsa_user_attrs[] = {</div><div class='add'>+	&amp;dev_attr_tagging.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group dsa_group = {</div><div class='add'>+	.name	= "dsa",</div><div class='add'>+	.attrs	= dsa_user_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_reset_mtu(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dev_set_mtu(dev, ETH_DATA_LEN);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_dbg(dev,</div><div class='add'>+			   "Unable to reset MTU to exclude DSA overheads\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_conduit_setup(struct net_device *dev, struct dsa_port *cpu_dp)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = cpu_dp-&gt;tag_ops;</div><div class='add'>+	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='add'>+	struct device_link *consumer_link;</div><div class='add'>+	int mtu, ret;</div><div class='add'>+</div><div class='add'>+	mtu = ETH_DATA_LEN + dsa_tag_protocol_overhead(tag_ops);</div><div class='add'>+</div><div class='add'>+	/* The DSA conduit must use SET_NETDEV_DEV for this to work. */</div><div class='add'>+	if (!netif_is_lag_master(dev)) {</div><div class='add'>+		consumer_link = device_link_add(ds-&gt;dev, dev-&gt;dev.parent,</div><div class='add'>+						DL_FLAG_AUTOREMOVE_CONSUMER);</div><div class='add'>+		if (!consumer_link)</div><div class='add'>+			netdev_err(dev,</div><div class='add'>+				   "Failed to create a device link to DSA switch %s\n",</div><div class='add'>+				   dev_name(ds-&gt;dev));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The switch driver may not implement -&gt;port_change_mtu(), case in</div><div class='add'>+	 * which dsa_user_change_mtu() will not update the conduit MTU either,</div><div class='add'>+	 * so we need to do that here.</div><div class='add'>+	 */</div><div class='add'>+	ret = dev_set_mtu(dev, mtu);</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_warn(dev, "error %d setting MTU to %d to include DSA overhead\n",</div><div class='add'>+			    ret, mtu);</div><div class='add'>+</div><div class='add'>+	/* If we use a tagging format that doesn't have an ethertype</div><div class='add'>+	 * field, make sure that all packets from this point on get</div><div class='add'>+	 * sent to the tag format's receive function.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	dev-&gt;dsa_ptr = cpu_dp;</div><div class='add'>+</div><div class='add'>+	dsa_conduit_set_promiscuity(dev, 1);</div><div class='add'>+</div><div class='add'>+	ret = dsa_conduit_ethtool_setup(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err_reset_promisc;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_create_group(&amp;dev-&gt;dev.kobj, &amp;dsa_group);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err_ethtool_teardown;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+out_err_ethtool_teardown:</div><div class='add'>+	dsa_conduit_ethtool_teardown(dev);</div><div class='add'>+out_err_reset_promisc:</div><div class='add'>+	dsa_conduit_set_promiscuity(dev, -1);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_conduit_teardown(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;dev.kobj, &amp;dsa_group);</div><div class='add'>+	dsa_conduit_ethtool_teardown(dev);</div><div class='add'>+	dsa_conduit_reset_mtu(dev);</div><div class='add'>+	dsa_conduit_set_promiscuity(dev, -1);</div><div class='add'>+</div><div class='add'>+	dev-&gt;dsa_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	/* If we used a tagging format that doesn't have an ethertype</div><div class='add'>+	 * field, make sure that all packets from this point get sent</div><div class='add'>+	 * without the tag and go through the regular receive path.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_conduit_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,</div><div class='add'>+			  struct netdev_lag_upper_info *uinfo,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool conduit_setup = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(lag_dev)) {</div><div class='add'>+		err = dsa_conduit_setup(lag_dev, cpu_dp);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		conduit_setup = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dsa_port_lag_join(cpu_dp, lag_dev, uinfo, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_WEAK_MOD(extack, "CPU port failed to join LAG");</div><div class='add'>+		goto out_conduit_teardown;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_conduit_teardown:</div><div class='add'>+	if (conduit_setup)</div><div class='add'>+		dsa_conduit_teardown(lag_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Tear down a conduit if there isn't any other user port on it,</div><div class='add'>+ * optionally also destroying LAG information.</div><div class='add'>+ */</div><div class='add'>+void dsa_conduit_lag_teardown(struct net_device *lag_dev,</div><div class='add'>+			      struct dsa_port *cpu_dp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *upper;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	dsa_port_lag_leave(cpu_dp, lag_dev);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_upper_dev_rcu(lag_dev, upper, iter)</div><div class='add'>+		if (dsa_user_dev_check(upper))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+	dsa_conduit_teardown(lag_dev);</div><div class='add'>+}</div><div class='head'>diff --git a/net/dsa/conduit.h b/net/dsa/conduit.h<br/>new file mode 100644<br/>index 000000000000..31f8834f54bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/conduit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/conduit.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_CONDUIT_H</div><div class='add'>+#define __DSA_CONDUIT_H</div><div class='add'>+</div><div class='add'>+struct dsa_port;</div><div class='add'>+struct net_device;</div><div class='add'>+struct netdev_lag_upper_info;</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+</div><div class='add'>+int dsa_conduit_setup(struct net_device *dev, struct dsa_port *cpu_dp);</div><div class='add'>+void dsa_conduit_teardown(struct net_device *dev);</div><div class='add'>+int dsa_conduit_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,</div><div class='add'>+			  struct netdev_lag_upper_info *uinfo,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+void dsa_conduit_lag_teardown(struct net_device *lag_dev,</div><div class='add'>+			      struct dsa_port *cpu_dp);</div><div class='add'>+int __dsa_conduit_hwtstamp_validate(struct net_device *dev,</div><div class='add'>+				    const struct kernel_hwtstamp_config *config,</div><div class='add'>+				    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/devlink.c b/net/dsa/devlink.c<br/>new file mode 100644<br/>index 000000000000..ed342f345692<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/devlink.c</a></div><div class='hunk'>@@ -0,0 +1,402 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * DSA devlink handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "devlink.h"</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_info_get(struct devlink *dl,</div><div class='add'>+				struct devlink_info_req *req,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;devlink_info_get)</div><div class='add'>+		return ds-&gt;ops-&gt;devlink_info_get(ds, req, extack);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_pool_get(struct devlink *dl,</div><div class='add'>+				   unsigned int sb_index, u16 pool_index,</div><div class='add'>+				   struct devlink_sb_pool_info *pool_info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_pool_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_pool_get(ds, sb_index, pool_index,</div><div class='add'>+					    pool_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_pool_set(struct devlink *dl, unsigned int sb_index,</div><div class='add'>+				   u16 pool_index, u32 size,</div><div class='add'>+				   enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_pool_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_pool_set(ds, sb_index, pool_index, size,</div><div class='add'>+					    threshold_type, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_port_pool_get(struct devlink_port *dlp,</div><div class='add'>+					unsigned int sb_index, u16 pool_index,</div><div class='add'>+					u32 *p_threshold)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_port_pool_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_port_pool_get(ds, port, sb_index,</div><div class='add'>+						 pool_index, p_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_port_pool_set(struct devlink_port *dlp,</div><div class='add'>+					unsigned int sb_index, u16 pool_index,</div><div class='add'>+					u32 threshold,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_port_pool_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_port_pool_set(ds, port, sb_index,</div><div class='add'>+						 pool_index, threshold, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_devlink_sb_tc_pool_bind_get(struct devlink_port *dlp,</div><div class='add'>+				unsigned int sb_index, u16 tc_index,</div><div class='add'>+				enum devlink_sb_pool_type pool_type,</div><div class='add'>+				u16 *p_pool_index, u32 *p_threshold)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_tc_pool_bind_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_tc_pool_bind_get(ds, port, sb_index,</div><div class='add'>+						    tc_index, pool_type,</div><div class='add'>+						    p_pool_index, p_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_devlink_sb_tc_pool_bind_set(struct devlink_port *dlp,</div><div class='add'>+				unsigned int sb_index, u16 tc_index,</div><div class='add'>+				enum devlink_sb_pool_type pool_type,</div><div class='add'>+				u16 pool_index, u32 threshold,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_tc_pool_bind_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_tc_pool_bind_set(ds, port, sb_index,</div><div class='add'>+						    tc_index, pool_type,</div><div class='add'>+						    pool_index, threshold,</div><div class='add'>+						    extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_occ_snapshot(struct devlink *dl,</div><div class='add'>+				       unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_occ_snapshot)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_occ_snapshot(ds, sb_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_occ_max_clear(struct devlink *dl,</div><div class='add'>+					unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_occ_max_clear)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_occ_max_clear(ds, sb_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_devlink_sb_occ_port_pool_get(struct devlink_port *dlp,</div><div class='add'>+					    unsigned int sb_index,</div><div class='add'>+					    u16 pool_index, u32 *p_cur,</div><div class='add'>+					    u32 *p_max)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_occ_port_pool_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_occ_port_pool_get(ds, port, sb_index,</div><div class='add'>+						     pool_index, p_cur, p_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_devlink_sb_occ_tc_port_bind_get(struct devlink_port *dlp,</div><div class='add'>+				    unsigned int sb_index, u16 tc_index,</div><div class='add'>+				    enum devlink_sb_pool_type pool_type,</div><div class='add'>+				    u32 *p_cur, u32 *p_max)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(dlp);</div><div class='add'>+	int port = dsa_devlink_port_to_port(dlp);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_sb_occ_tc_port_bind_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_sb_occ_tc_port_bind_get(ds, port,</div><div class='add'>+							sb_index, tc_index,</div><div class='add'>+							pool_type, p_cur,</div><div class='add'>+							p_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops dsa_devlink_ops = {</div><div class='add'>+	.info_get			= dsa_devlink_info_get,</div><div class='add'>+	.sb_pool_get			= dsa_devlink_sb_pool_get,</div><div class='add'>+	.sb_pool_set			= dsa_devlink_sb_pool_set,</div><div class='add'>+	.sb_port_pool_get		= dsa_devlink_sb_port_pool_get,</div><div class='add'>+	.sb_port_pool_set		= dsa_devlink_sb_port_pool_set,</div><div class='add'>+	.sb_tc_pool_bind_get		= dsa_devlink_sb_tc_pool_bind_get,</div><div class='add'>+	.sb_tc_pool_bind_set		= dsa_devlink_sb_tc_pool_bind_set,</div><div class='add'>+	.sb_occ_snapshot		= dsa_devlink_sb_occ_snapshot,</div><div class='add'>+	.sb_occ_max_clear		= dsa_devlink_sb_occ_max_clear,</div><div class='add'>+	.sb_occ_port_pool_get		= dsa_devlink_sb_occ_port_pool_get,</div><div class='add'>+	.sb_occ_tc_port_bind_get	= dsa_devlink_sb_occ_tc_port_bind_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dsa_devlink_param_get(struct devlink *dl, u32 id,</div><div class='add'>+			  struct devlink_param_gset_ctx *ctx,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_param_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_param_get(ds, id, ctx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_param_get);</div><div class='add'>+</div><div class='add'>+int dsa_devlink_param_set(struct devlink *dl, u32 id,</div><div class='add'>+			  struct devlink_param_gset_ctx *ctx,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;devlink_param_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;devlink_param_set(ds, id, ctx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_param_set);</div><div class='add'>+</div><div class='add'>+int dsa_devlink_params_register(struct dsa_switch *ds,</div><div class='add'>+				const struct devlink_param *params,</div><div class='add'>+				size_t params_count)</div><div class='add'>+{</div><div class='add'>+	return devlink_params_register(ds-&gt;devlink, params, params_count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_params_register);</div><div class='add'>+</div><div class='add'>+void dsa_devlink_params_unregister(struct dsa_switch *ds,</div><div class='add'>+				   const struct devlink_param *params,</div><div class='add'>+				   size_t params_count)</div><div class='add'>+{</div><div class='add'>+	devlink_params_unregister(ds-&gt;devlink, params, params_count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_params_unregister);</div><div class='add'>+</div><div class='add'>+int dsa_devlink_resource_register(struct dsa_switch *ds,</div><div class='add'>+				  const char *resource_name,</div><div class='add'>+				  u64 resource_size,</div><div class='add'>+				  u64 resource_id,</div><div class='add'>+				  u64 parent_resource_id,</div><div class='add'>+				  const struct devlink_resource_size_params *size_params)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	devl_lock(ds-&gt;devlink);</div><div class='add'>+	ret = devl_resource_register(ds-&gt;devlink, resource_name, resource_size,</div><div class='add'>+				     resource_id, parent_resource_id,</div><div class='add'>+				     size_params);</div><div class='add'>+	devl_unlock(ds-&gt;devlink);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_resource_register);</div><div class='add'>+</div><div class='add'>+void dsa_devlink_resources_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	devlink_resources_unregister(ds-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_resources_unregister);</div><div class='add'>+</div><div class='add'>+void dsa_devlink_resource_occ_get_register(struct dsa_switch *ds,</div><div class='add'>+					   u64 resource_id,</div><div class='add'>+					   devlink_resource_occ_get_t *occ_get,</div><div class='add'>+					   void *occ_get_priv)</div><div class='add'>+{</div><div class='add'>+	devl_lock(ds-&gt;devlink);</div><div class='add'>+	devl_resource_occ_get_register(ds-&gt;devlink, resource_id, occ_get,</div><div class='add'>+				       occ_get_priv);</div><div class='add'>+	devl_unlock(ds-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_resource_occ_get_register);</div><div class='add'>+</div><div class='add'>+void dsa_devlink_resource_occ_get_unregister(struct dsa_switch *ds,</div><div class='add'>+					     u64 resource_id)</div><div class='add'>+{</div><div class='add'>+	devl_lock(ds-&gt;devlink);</div><div class='add'>+	devl_resource_occ_get_unregister(ds-&gt;devlink, resource_id);</div><div class='add'>+	devl_unlock(ds-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_resource_occ_get_unregister);</div><div class='add'>+</div><div class='add'>+struct devlink_region *</div><div class='add'>+dsa_devlink_region_create(struct dsa_switch *ds,</div><div class='add'>+			  const struct devlink_region_ops *ops,</div><div class='add'>+			  u32 region_max_snapshots, u64 region_size)</div><div class='add'>+{</div><div class='add'>+	return devlink_region_create(ds-&gt;devlink, ops, region_max_snapshots,</div><div class='add'>+				     region_size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_region_create);</div><div class='add'>+</div><div class='add'>+struct devlink_region *</div><div class='add'>+dsa_devlink_port_region_create(struct dsa_switch *ds,</div><div class='add'>+			       int port,</div><div class='add'>+			       const struct devlink_port_region_ops *ops,</div><div class='add'>+			       u32 region_max_snapshots, u64 region_size)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+</div><div class='add'>+	return devlink_port_region_create(&amp;dp-&gt;devlink_port, ops,</div><div class='add'>+					  region_max_snapshots,</div><div class='add'>+					  region_size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_port_region_create);</div><div class='add'>+</div><div class='add'>+void dsa_devlink_region_destroy(struct devlink_region *region)</div><div class='add'>+{</div><div class='add'>+	devlink_region_destroy(region);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_devlink_region_destroy);</div><div class='add'>+</div><div class='add'>+int dsa_port_devlink_setup(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *dlp = &amp;dp-&gt;devlink_port;</div><div class='add'>+	struct dsa_switch_tree *dst = dp-&gt;ds-&gt;dst;</div><div class='add'>+	struct devlink_port_attrs attrs = {};</div><div class='add'>+	struct devlink *dl = dp-&gt;ds-&gt;devlink;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	const unsigned char *id;</div><div class='add'>+	unsigned char len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(dlp, 0, sizeof(*dlp));</div><div class='add'>+	devlink_port_init(dl, dlp);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_setup) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_setup(ds, dp-&gt;index);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = (const unsigned char *)&amp;dst-&gt;index;</div><div class='add'>+	len = sizeof(dst-&gt;index);</div><div class='add'>+</div><div class='add'>+	attrs.phys.port_number = dp-&gt;index;</div><div class='add'>+	memcpy(attrs.switch_id.id, id, len);</div><div class='add'>+	attrs.switch_id.id_len = len;</div><div class='add'>+</div><div class='add'>+	switch (dp-&gt;type) {</div><div class='add'>+	case DSA_PORT_TYPE_UNUSED:</div><div class='add'>+		attrs.flavour = DEVLINK_PORT_FLAVOUR_UNUSED;</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_CPU:</div><div class='add'>+		attrs.flavour = DEVLINK_PORT_FLAVOUR_CPU;</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_DSA:</div><div class='add'>+		attrs.flavour = DEVLINK_PORT_FLAVOUR_DSA;</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_USER:</div><div class='add'>+		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_attrs_set(dlp, &amp;attrs);</div><div class='add'>+	err = devlink_port_register(dl, dlp, dp-&gt;index);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (ds-&gt;ops-&gt;port_teardown)</div><div class='add'>+			ds-&gt;ops-&gt;port_teardown(ds, dp-&gt;index);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_devlink_teardown(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *dlp = &amp;dp-&gt;devlink_port;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	devlink_port_unregister(dlp);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_teardown)</div><div class='add'>+		ds-&gt;ops-&gt;port_teardown(ds, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	devlink_port_fini(dlp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_switch_devlink_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	devlink_register(ds-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_switch_devlink_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	devlink_unregister(ds-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_switch_devlink_alloc(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_devlink_priv *dl_priv;</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+</div><div class='add'>+	/* Add the switch to devlink before calling setup, so that setup can</div><div class='add'>+	 * add dpipe tables</div><div class='add'>+	 */</div><div class='add'>+	dl = devlink_alloc(&amp;dsa_devlink_ops, sizeof(*dl_priv), ds-&gt;dev);</div><div class='add'>+	if (!dl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ds-&gt;devlink = dl;</div><div class='add'>+</div><div class='add'>+	dl_priv = devlink_priv(ds-&gt;devlink);</div><div class='add'>+	dl_priv-&gt;ds = ds;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_switch_devlink_free(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	devlink_free(ds-&gt;devlink);</div><div class='add'>+	ds-&gt;devlink = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/net/dsa/devlink.h b/net/dsa/devlink.h<br/>new file mode 100644<br/>index 000000000000..4d9f4f23705b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/devlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/devlink.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_DEVLINK_H</div><div class='add'>+#define __DSA_DEVLINK_H</div><div class='add'>+</div><div class='add'>+struct dsa_port;</div><div class='add'>+struct dsa_switch;</div><div class='add'>+</div><div class='add'>+int dsa_port_devlink_setup(struct dsa_port *dp);</div><div class='add'>+void dsa_port_devlink_teardown(struct dsa_port *dp);</div><div class='add'>+void dsa_switch_devlink_register(struct dsa_switch *ds);</div><div class='add'>+void dsa_switch_devlink_unregister(struct dsa_switch *ds);</div><div class='add'>+int dsa_switch_devlink_alloc(struct dsa_switch *ds);</div><div class='add'>+void dsa_switch_devlink_free(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c<br/>index 9f3209ff7ffd..a20efabe778f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/dsa.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/dsa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/dsa.c</a></div><div class='hunk'>@@ -1,90 +1,1381 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * net/dsa/dsa.c - Hardware switch handling</div><div class='add'>+ * DSA topology and switch handling</div><div class='add'>+ *</div><div class='ctx'>  * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='ctx'>  * Copyright (c) 2013 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='add'>+ * Copyright (c) 2016 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/phy_fixed.h&gt;</div><div class='del'>-#include &lt;linux/ptp_classify.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;net/dsa_stubs.h&gt;</div><div class='add'>+#include &lt;net/sch_generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "conduit.h"</div><div class='add'>+#include "devlink.h"</div><div class='add'>+#include "dsa.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "switch.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+#define DSA_MAX_NUM_OFFLOADING_BRIDGES		BITS_PER_LONG</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(dsa2_mutex);</div><div class='add'>+LIST_HEAD(dsa_tree_list);</div><div class='add'>+</div><div class='add'>+static struct workqueue_struct *dsa_owq;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+/* Track the bridges with forwarding offload enabled */</div><div class='add'>+static unsigned long dsa_fwd_offloading_bridges;</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb,</div><div class='del'>-					    struct net_device *dev)</div><div class='add'>+bool dsa_schedule_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	/* Just return the original SKB */</div><div class='del'>-	return skb;</div><div class='add'>+	return queue_work(dsa_owq, work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dsa_device_ops none_ops = {</div><div class='del'>-	.xmit	= dsa_slave_notag_xmit,</div><div class='del'>-	.rcv	= NULL,</div><div class='del'>-};</div><div class='add'>+void dsa_flush_workqueue(void)</div><div class='add'>+{</div><div class='add'>+	flush_workqueue(dsa_owq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_flush_workqueue);</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_BRCM</div><div class='del'>-	[DSA_TAG_PROTO_BRCM] = &amp;brcm_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND</div><div class='del'>-	[DSA_TAG_PROTO_BRCM_PREPEND] = &amp;brcm_prepend_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_DSA</div><div class='del'>-	[DSA_TAG_PROTO_DSA] = &amp;dsa_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_EDSA</div><div class='del'>-	[DSA_TAG_PROTO_EDSA] = &amp;edsa_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_KSZ</div><div class='del'>-	[DSA_TAG_PROTO_KSZ] = &amp;ksz_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_LAN9303</div><div class='del'>-	[DSA_TAG_PROTO_LAN9303] = &amp;lan9303_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_MTK</div><div class='del'>-	[DSA_TAG_PROTO_MTK] = &amp;mtk_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_QCA</div><div class='del'>-	[DSA_TAG_PROTO_QCA] = &amp;qca_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_TRAILER</div><div class='del'>-	[DSA_TAG_PROTO_TRAILER] = &amp;trailer_netdev_ops,</div><div class='del'>-#endif</div><div class='del'>-	[DSA_TAG_PROTO_NONE] = &amp;none_ops,</div><div class='del'>-};</div><div class='add'>+/**</div><div class='add'>+ * dsa_lag_map() - Map LAG structure to a linear LAG array</div><div class='add'>+ * @dst: Tree in which to record the mapping.</div><div class='add'>+ * @lag: LAG structure that is to be mapped to the tree's array.</div><div class='add'>+ *</div><div class='add'>+ * dsa_lag_id/dsa_lag_by_id can then be used to translate between the</div><div class='add'>+ * two spaces. The size of the mapping space is determined by the</div><div class='add'>+ * driver by setting ds-&gt;num_lag_ids. It is perfectly legal to leave</div><div class='add'>+ * it unset if it is not needed, in which case these functions become</div><div class='add'>+ * no-ops.</div><div class='add'>+ */</div><div class='add'>+void dsa_lag_map(struct dsa_switch_tree *dst, struct dsa_lag *lag)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	for (id = 1; id &lt;= dst-&gt;lags_len; id++) {</div><div class='add'>+		if (!dsa_lag_by_id(dst, id)) {</div><div class='add'>+			dst-&gt;lags[id - 1] = lag;</div><div class='add'>+			lag-&gt;id = id;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No IDs left, which is OK. Some drivers do not need it. The</div><div class='add'>+	 * ones that do, e.g. mv88e6xxx, will discover that dsa_lag_id</div><div class='add'>+	 * returns an error for this device when joining the LAG. The</div><div class='add'>+	 * driver can then return -EOPNOTSUPP back to DSA, which will</div><div class='add'>+	 * fall back to a software LAG.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_lag_unmap() - Remove a LAG ID mapping</div><div class='add'>+ * @dst: Tree in which the mapping is recorded.</div><div class='add'>+ * @lag: LAG structure that was mapped.</div><div class='add'>+ *</div><div class='add'>+ * As there may be multiple users of the mapping, it is only removed</div><div class='add'>+ * if there are no other references to it.</div><div class='add'>+ */</div><div class='add'>+void dsa_lag_unmap(struct dsa_switch_tree *dst, struct dsa_lag *lag)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	dsa_lags_foreach_id(id, dst) {</div><div class='add'>+		if (dsa_lag_by_id(dst, id) == lag) {</div><div class='add'>+			dst-&gt;lags[id - 1] = NULL;</div><div class='add'>+			lag-&gt;id = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_lag *dsa_tree_lag_find(struct dsa_switch_tree *dst,</div><div class='add'>+				  const struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_lag_dev_get(dp) == lag_dev)</div><div class='add'>+			return dp-&gt;lag;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_bridge *dsa_tree_bridge_find(struct dsa_switch_tree *dst,</div><div class='add'>+					const struct net_device *br)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_bridge_dev_get(dp) == br)</div><div class='add'>+			return dp-&gt;bridge;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_bridge_num_find(const struct net_device *bridge_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dst, &amp;dsa_tree_list, list) {</div><div class='add'>+		struct dsa_bridge *bridge;</div><div class='add'>+</div><div class='add'>+		bridge = dsa_tree_bridge_find(dst, bridge_dev);</div><div class='add'>+		if (bridge)</div><div class='add'>+			return bridge-&gt;num;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int dsa_bridge_num_get(const struct net_device *bridge_dev, int max)</div><div class='add'>+{</div><div class='add'>+	unsigned int bridge_num = dsa_bridge_num_find(bridge_dev);</div><div class='add'>+</div><div class='add'>+	/* Switches without FDB isolation support don't get unique</div><div class='add'>+	 * bridge numbering</div><div class='add'>+	 */</div><div class='add'>+	if (!max)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!bridge_num) {</div><div class='add'>+		/* First port that requests FDB isolation or TX forwarding</div><div class='add'>+		 * offload for this bridge</div><div class='add'>+		 */</div><div class='add'>+		bridge_num = find_next_zero_bit(&amp;dsa_fwd_offloading_bridges,</div><div class='add'>+						DSA_MAX_NUM_OFFLOADING_BRIDGES,</div><div class='add'>+						1);</div><div class='add'>+		if (bridge_num &gt;= max)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		set_bit(bridge_num, &amp;dsa_fwd_offloading_bridges);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bridge_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_bridge_num_put(const struct net_device *bridge_dev,</div><div class='add'>+			unsigned int bridge_num)</div><div class='add'>+{</div><div class='add'>+	/* Since we refcount bridges, we know that when we call this function</div><div class='add'>+	 * it is no longer in use, so we can just go ahead and remove it from</div><div class='add'>+	 * the bit mask.</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(bridge_num, &amp;dsa_fwd_offloading_bridges);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_switch *dsa_switch_find(int tree_index, int sw_index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dst, &amp;dsa_tree_list, list) {</div><div class='add'>+		if (dst-&gt;index != tree_index)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			if (dp-&gt;ds-&gt;index != sw_index)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			return dp-&gt;ds;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_switch_find);</div><div class='add'>+</div><div class='add'>+static struct dsa_switch_tree *dsa_tree_find(int index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dst, &amp;dsa_tree_list, list)</div><div class='add'>+		if (dst-&gt;index == index)</div><div class='add'>+			return dst;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_switch_tree *dsa_tree_alloc(int index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+</div><div class='add'>+	dst = kzalloc(sizeof(*dst), GFP_KERNEL);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dst-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dst-&gt;rtable);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dst-&gt;ports);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dst-&gt;list);</div><div class='add'>+	list_add_tail(&amp;dst-&gt;list, &amp;dsa_tree_list);</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;dst-&gt;refcount);</div><div class='add'>+</div><div class='add'>+	return dst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_free(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	if (dst-&gt;tag_ops)</div><div class='add'>+		dsa_tag_driver_put(dst-&gt;tag_ops);</div><div class='add'>+	list_del(&amp;dst-&gt;list);</div><div class='add'>+	kfree(dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_switch_tree *dsa_tree_get(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	if (dst)</div><div class='add'>+		kref_get(&amp;dst-&gt;refcount);</div><div class='add'>+</div><div class='add'>+	return dst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_switch_tree *dsa_tree_touch(int index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+</div><div class='add'>+	dst = dsa_tree_find(index);</div><div class='add'>+	if (dst)</div><div class='add'>+		return dsa_tree_get(dst);</div><div class='add'>+	else</div><div class='add'>+		return dsa_tree_alloc(index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_release(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+</div><div class='add'>+	dst = container_of(ref, struct dsa_switch_tree, refcount);</div><div class='add'>+</div><div class='add'>+	dsa_tree_free(dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_put(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	if (dst)</div><div class='add'>+		kref_put(&amp;dst-&gt;refcount, dsa_tree_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_port *dsa_tree_find_port_by_node(struct dsa_switch_tree *dst,</div><div class='add'>+						   struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dp-&gt;dn == dn)</div><div class='add'>+			return dp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_link *dsa_link_touch(struct dsa_port *dp,</div><div class='add'>+				       struct dsa_port *link_dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	struct dsa_link *dl;</div><div class='add'>+</div><div class='add'>+	dst = ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dl, &amp;dst-&gt;rtable, list)</div><div class='add'>+		if (dl-&gt;dp == dp &amp;&amp; dl-&gt;link_dp == link_dp)</div><div class='add'>+			return dl;</div><div class='add'>+</div><div class='add'>+	dl = kzalloc(sizeof(*dl), GFP_KERNEL);</div><div class='add'>+	if (!dl)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dl-&gt;dp = dp;</div><div class='add'>+	dl-&gt;link_dp = link_dp;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dl-&gt;list);</div><div class='add'>+	list_add_tail(&amp;dl-&gt;list, &amp;dst-&gt;rtable);</div><div class='add'>+</div><div class='add'>+	return dl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dsa_port_setup_routing_table(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	struct device_node *dn = dp-&gt;dn;</div><div class='add'>+	struct of_phandle_iterator it;</div><div class='add'>+	struct dsa_port *link_dp;</div><div class='add'>+	struct dsa_link *dl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	of_for_each_phandle(&amp;it, err, dn, "link", NULL, 0) {</div><div class='add'>+		link_dp = dsa_tree_find_port_by_node(dst, it.node);</div><div class='add'>+		if (!link_dp) {</div><div class='add'>+			of_node_put(it.node);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dl = dsa_link_touch(dp, link_dp);</div><div class='add'>+		if (!dl) {</div><div class='add'>+			of_node_put(it.node);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dsa_tree_setup_routing_table(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	bool complete = true;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dsa_port_is_dsa(dp)) {</div><div class='add'>+			complete = dsa_port_setup_routing_table(dp);</div><div class='add'>+			if (!complete)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return complete;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_port *dsa_tree_find_first_cpu(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_is_cpu(dp))</div><div class='add'>+			return dp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *dsa_tree_find_first_conduit(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct device_node *ethernet;</div><div class='add'>+	struct net_device *conduit;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+</div><div class='add'>+	cpu_dp = dsa_tree_find_first_cpu(dst);</div><div class='add'>+	ethernet = of_parse_phandle(cpu_dp-&gt;dn, "ethernet", 0);</div><div class='add'>+	conduit = of_find_net_device_by_node(ethernet);</div><div class='add'>+	of_node_put(ethernet);</div><div class='add'>+</div><div class='add'>+	return conduit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assign the default CPU port (the first one in the tree) to all ports of the</div><div class='add'>+ * fabric which don't already have one as part of their own switch.</div><div class='add'>+ */</div><div class='add'>+static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp, *dp;</div><div class='add'>+</div><div class='add'>+	cpu_dp = dsa_tree_find_first_cpu(dst);</div><div class='add'>+	if (!cpu_dp) {</div><div class='add'>+		pr_err("DSA: tree %d has no CPU port\n", dst-&gt;index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dp-&gt;cpu_dp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))</div><div class='add'>+			dp-&gt;cpu_dp = cpu_dp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_port *</div><div class='add'>+dsa_switch_preferred_default_local_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;preferred_default_local_cpu_port)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	cpu_dp = ds-&gt;ops-&gt;preferred_default_local_cpu_port(ds);</div><div class='add'>+	if (!cpu_dp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!dsa_port_is_cpu(cpu_dp) || cpu_dp-&gt;ds != ds))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return cpu_dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Perform initial assignment of CPU ports to user ports and DSA links in the</div><div class='add'>+ * fabric, giving preference to CPU ports local to each switch. Default to</div><div class='add'>+ * using the first CPU port in the switch tree if the port does not have a CPU</div><div class='add'>+ * port local to this switch.</div><div class='add'>+ */</div><div class='add'>+static int dsa_tree_setup_cpu_ports(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *preferred_cpu_dp, *cpu_dp, *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cpu_dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (!dsa_port_is_cpu(cpu_dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		preferred_cpu_dp = dsa_switch_preferred_default_local_cpu_port(cpu_dp-&gt;ds);</div><div class='add'>+		if (preferred_cpu_dp &amp;&amp; preferred_cpu_dp != cpu_dp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Prefer a local CPU port */</div><div class='add'>+		dsa_switch_for_each_port(dp, cpu_dp-&gt;ds) {</div><div class='add'>+			/* Prefer the first local CPU port found */</div><div class='add'>+			if (dp-&gt;cpu_dp)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))</div><div class='add'>+				dp-&gt;cpu_dp = cpu_dp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_tree_setup_default_cpu(dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_teardown_cpu_ports(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))</div><div class='add'>+			dp-&gt;cpu_dp = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_setup(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	bool dsa_port_link_registered = false;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	bool dsa_port_enabled = false;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;setup)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_devlink_setup(dp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (dp-&gt;type) {</div><div class='add'>+	case DSA_PORT_TYPE_UNUSED:</div><div class='add'>+		dsa_port_disable(dp);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_CPU:</div><div class='add'>+		if (dp-&gt;dn) {</div><div class='add'>+			err = dsa_shared_port_link_register_of(dp);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			dsa_port_link_registered = true;</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(ds-&gt;dev,</div><div class='add'>+				 "skipping link registration for CPU port %d\n",</div><div class='add'>+				 dp-&gt;index);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dsa_port_enable(dp, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		dsa_port_enabled = true;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_DSA:</div><div class='add'>+		if (dp-&gt;dn) {</div><div class='add'>+			err = dsa_shared_port_link_register_of(dp);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			dsa_port_link_registered = true;</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(ds-&gt;dev,</div><div class='add'>+				 "skipping link registration for DSA port %d\n",</div><div class='add'>+				 dp-&gt;index);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dsa_port_enable(dp, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		dsa_port_enabled = true;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_USER:</div><div class='add'>+		of_get_mac_address(dp-&gt;dn, dp-&gt;mac);</div><div class='add'>+		err = dsa_user_create(dp);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &amp;&amp; dsa_port_enabled)</div><div class='add'>+		dsa_port_disable(dp);</div><div class='add'>+	if (err &amp;&amp; dsa_port_link_registered)</div><div class='add'>+		dsa_shared_port_link_unregister_of(dp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dsa_port_devlink_teardown(dp);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;setup = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_teardown(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	if (!dp-&gt;setup)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (dp-&gt;type) {</div><div class='add'>+	case DSA_PORT_TYPE_UNUSED:</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_CPU:</div><div class='add'>+		dsa_port_disable(dp);</div><div class='add'>+		if (dp-&gt;dn)</div><div class='add'>+			dsa_shared_port_link_unregister_of(dp);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_DSA:</div><div class='add'>+		dsa_port_disable(dp);</div><div class='add'>+		if (dp-&gt;dn)</div><div class='add'>+			dsa_shared_port_link_unregister_of(dp);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_TYPE_USER:</div><div class='add'>+		if (dp-&gt;user) {</div><div class='add'>+			dsa_user_destroy(dp-&gt;user);</div><div class='add'>+			dp-&gt;user = NULL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_port_devlink_teardown(dp);</div><div class='add'>+</div><div class='add'>+	dp-&gt;setup = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_setup_as_unused(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	dp-&gt;type = DSA_PORT_TYPE_UNUSED;</div><div class='add'>+	return dsa_port_setup(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = ds-&gt;dst-&gt;tag_ops;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tag_ops-&gt;proto == dst-&gt;default_proto)</div><div class='add'>+		goto connect;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = ds-&gt;ops-&gt;change_tag_protocol(ds, tag_ops-&gt;proto);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Unable to use tag protocol \"%s\": %pe\n",</div><div class='add'>+			tag_ops-&gt;name, ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+connect:</div><div class='add'>+	if (tag_ops-&gt;connect) {</div><div class='add'>+		err = tag_ops-&gt;connect(ds);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;connect_tag_protocol) {</div><div class='add'>+		err = ds-&gt;ops-&gt;connect_tag_protocol(ds, tag_ops-&gt;proto);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Unable to connect to tag protocol \"%s\": %pe\n",</div><div class='add'>+				tag_ops-&gt;name, ERR_PTR(err));</div><div class='add'>+			goto disconnect;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+disconnect:</div><div class='add'>+	if (tag_ops-&gt;disconnect)</div><div class='add'>+		tag_ops-&gt;disconnect(ds);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_switch_teardown_tag_protocol(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = ds-&gt;dst-&gt;tag_ops;</div><div class='add'>+</div><div class='add'>+	if (tag_ops-&gt;disconnect)</div><div class='add'>+		tag_ops-&gt;disconnect(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;setup)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Initialize ds-&gt;phys_mii_mask before registering the user MDIO bus</div><div class='add'>+	 * driver and before ops-&gt;setup() has run, since the switch drivers and</div><div class='add'>+	 * the user MDIO bus driver rely on these values for probing PHY</div><div class='add'>+	 * devices or not</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;phys_mii_mask |= dsa_user_ports(ds);</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_devlink_alloc(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_register_notifier(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto devlink_free;</div><div class='add'>+</div><div class='add'>+	ds-&gt;configure_vlan_while_not_filtering = true;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;setup(ds);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto unregister_notifier;</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_setup_tag_protocol(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;user_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read) {</div><div class='add'>+		ds-&gt;user_mii_bus = mdiobus_alloc();</div><div class='add'>+		if (!ds-&gt;user_mii_bus) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto teardown;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dsa_user_mii_bus_init(ds);</div><div class='add'>+</div><div class='add'>+		err = mdiobus_register(ds-&gt;user_mii_bus);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto free_user_mii_bus;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_switch_devlink_register(ds);</div><div class='add'>+</div><div class='add'>+	ds-&gt;setup = true;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_user_mii_bus:</div><div class='add'>+	if (ds-&gt;user_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read)</div><div class='add'>+		mdiobus_free(ds-&gt;user_mii_bus);</div><div class='add'>+teardown:</div><div class='add'>+	if (ds-&gt;ops-&gt;teardown)</div><div class='add'>+		ds-&gt;ops-&gt;teardown(ds);</div><div class='add'>+unregister_notifier:</div><div class='add'>+	dsa_switch_unregister_notifier(ds);</div><div class='add'>+devlink_free:</div><div class='add'>+	dsa_switch_devlink_free(ds);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_switch_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	if (!ds-&gt;setup)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_devlink_unregister(ds);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;user_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read) {</div><div class='add'>+		mdiobus_unregister(ds-&gt;user_mii_bus);</div><div class='add'>+		mdiobus_free(ds-&gt;user_mii_bus);</div><div class='add'>+		ds-&gt;user_mii_bus = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_switch_teardown_tag_protocol(ds);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;teardown)</div><div class='add'>+		ds-&gt;ops-&gt;teardown(ds);</div><div class='add'>+</div><div class='add'>+	dsa_switch_unregister_notifier(ds);</div><div class='add'>+</div><div class='add'>+	dsa_switch_devlink_free(ds);</div><div class='add'>+</div><div class='add'>+	ds-&gt;setup = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* First tear down the non-shared, then the shared ports. This ensures that</div><div class='add'>+ * all work items scheduled by our switchdev handlers for user ports have</div><div class='add'>+ * completed before we destroy the refcounting kept on the shared ports.</div><div class='add'>+ */</div><div class='add'>+static void dsa_tree_teardown_ports(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_is_user(dp) || dsa_port_is_unused(dp))</div><div class='add'>+			dsa_port_teardown(dp);</div><div class='add'>+</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dsa_port_is_dsa(dp) || dsa_port_is_cpu(dp))</div><div class='add'>+			dsa_port_teardown(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_teardown_switches(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		dsa_switch_teardown(dp-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Bring shared ports up first, then non-shared ports */</div><div class='add'>+static int dsa_tree_setup_ports(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dsa_port_is_dsa(dp) || dsa_port_is_cpu(dp)) {</div><div class='add'>+			err = dsa_port_setup(dp);</div><div class='add'>+			if (err)</div><div class='add'>+				goto teardown;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dsa_port_is_user(dp) || dsa_port_is_unused(dp)) {</div><div class='add'>+			err = dsa_port_setup(dp);</div><div class='add'>+			if (err) {</div><div class='add'>+				err = dsa_port_setup_as_unused(dp);</div><div class='add'>+				if (err)</div><div class='add'>+					goto teardown;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+teardown:</div><div class='add'>+	dsa_tree_teardown_ports(dst);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tree_setup_switches(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		err = dsa_switch_setup(dp-&gt;ds);</div><div class='add'>+		if (err) {</div><div class='add'>+			dsa_tree_teardown_switches(dst);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tree_setup_conduit(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_cpu_port(cpu_dp, dst) {</div><div class='add'>+		struct net_device *conduit = cpu_dp-&gt;conduit;</div><div class='add'>+		bool admin_up = (conduit-&gt;flags &amp; IFF_UP) &amp;&amp;</div><div class='add'>+				!qdisc_tx_is_noop(conduit);</div><div class='add'>+</div><div class='add'>+		err = dsa_conduit_setup(conduit, cpu_dp);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Replay conduit state event */</div><div class='add'>+		dsa_tree_conduit_admin_state_change(dst, conduit, admin_up);</div><div class='add'>+		dsa_tree_conduit_oper_state_change(dst, conduit,</div><div class='add'>+						   netif_oper_up(conduit));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_teardown_conduit(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_cpu_port(cpu_dp, dst) {</div><div class='add'>+		struct net_device *conduit = cpu_dp-&gt;conduit;</div><div class='add'>+</div><div class='add'>+		/* Synthesizing an "admin down" state is sufficient for</div><div class='add'>+		 * the switches to get a notification if the conduit is</div><div class='add'>+		 * currently up and running.</div><div class='add'>+		 */</div><div class='add'>+		dsa_tree_conduit_admin_state_change(dst, conduit, false);</div><div class='add'>+</div><div class='add'>+		dsa_conduit_teardown(conduit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tree_setup_lags(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol)</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dp-&gt;ds-&gt;num_lag_ids &gt; len)</div><div class='add'>+			len = dp-&gt;ds-&gt;num_lag_ids;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dst-&gt;lags = kcalloc(len, sizeof(*dst-&gt;lags), GFP_KERNEL);</div><div class='add'>+	if (!dst-&gt;lags)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dst-&gt;lags_len = len;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_teardown_lags(struct dsa_switch_tree *dst)</div><div class='ctx'> {</div><div class='del'>-	const struct dsa_device_ops *ops;</div><div class='add'>+	kfree(dst-&gt;lags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (tag_protocol &gt;= DSA_TAG_LAST)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	ops = dsa_device_ops[tag_protocol];</div><div class='add'>+static void dsa_tree_teardown_routing_table(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	struct dsa_link *dl, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(dl, next, &amp;dst-&gt;rtable, list) {</div><div class='add'>+		list_del(&amp;dl-&gt;list);</div><div class='add'>+		kfree(dl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tree_setup(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	bool complete;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dst-&gt;setup) {</div><div class='add'>+		pr_err("DSA: tree %d already setup! Disjoint trees?\n",</div><div class='add'>+		       dst-&gt;index);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete = dsa_tree_setup_routing_table(dst);</div><div class='add'>+	if (!complete)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_setup_cpu_ports(dst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown_rtable;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_setup_switches(dst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown_cpu_ports;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_setup_ports(dst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown_switches;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_setup_conduit(dst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown_ports;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_setup_lags(dst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto teardown_conduit;</div><div class='add'>+</div><div class='add'>+	dst-&gt;setup = true;</div><div class='add'>+</div><div class='add'>+	pr_info("DSA: tree %d setup\n", dst-&gt;index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	if (!ops)</div><div class='del'>-		return ERR_PTR(-ENOPROTOOPT);</div><div class='add'>+teardown_conduit:</div><div class='add'>+	dsa_tree_teardown_conduit(dst);</div><div class='add'>+teardown_ports:</div><div class='add'>+	dsa_tree_teardown_ports(dst);</div><div class='add'>+teardown_switches:</div><div class='add'>+	dsa_tree_teardown_switches(dst);</div><div class='add'>+teardown_cpu_ports:</div><div class='add'>+	dsa_tree_teardown_cpu_ports(dst);</div><div class='add'>+teardown_rtable:</div><div class='add'>+	dsa_tree_teardown_routing_table(dst);</div><div class='ctx'> </div><div class='del'>-	return ops;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dev_is_class(struct device *dev, void *class)</div><div class='add'>+static void dsa_tree_teardown(struct dsa_switch_tree *dst)</div><div class='add'>+{</div><div class='add'>+	if (!dst-&gt;setup)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_lags(dst);</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_conduit(dst);</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_ports(dst);</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_switches(dst);</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_cpu_ports(dst);</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown_routing_table(dst);</div><div class='add'>+</div><div class='add'>+	pr_info("DSA: tree %d torn down\n", dst-&gt;index);</div><div class='add'>+</div><div class='add'>+	dst-&gt;setup = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tree_bind_tag_proto(struct dsa_switch_tree *dst,</div><div class='add'>+				   const struct dsa_device_ops *tag_ops)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *old_tag_ops = dst-&gt;tag_ops;</div><div class='add'>+	struct dsa_notifier_tag_proto_info info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dst-&gt;tag_ops = tag_ops;</div><div class='add'>+</div><div class='add'>+	/* Notify the switches from this tree about the connection</div><div class='add'>+	 * to the new tagger</div><div class='add'>+	 */</div><div class='add'>+	info.tag_ops = tag_ops;</div><div class='add'>+	err = dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO_CONNECT, &amp;info);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		goto out_disconnect;</div><div class='add'>+</div><div class='add'>+	/* Notify the old tagger about the disconnection from this tree */</div><div class='add'>+	info.tag_ops = old_tag_ops;</div><div class='add'>+	dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO_DISCONNECT, &amp;info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_disconnect:</div><div class='add'>+	info.tag_ops = tag_ops;</div><div class='add'>+	dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO_DISCONNECT, &amp;info);</div><div class='add'>+	dst-&gt;tag_ops = old_tag_ops;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Since the dsa/tagging sysfs device attribute is per conduit, the assumption</div><div class='add'>+ * is that all DSA switches within a tree share the same tagger, otherwise</div><div class='add'>+ * they would have formed disjoint trees (different "dsa,member" values).</div><div class='add'>+ */</div><div class='add'>+int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,</div><div class='add'>+			      const struct dsa_device_ops *tag_ops,</div><div class='add'>+			      const struct dsa_device_ops *old_tag_ops)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_tag_proto_info info;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!rtnl_trylock())</div><div class='add'>+		return restart_syscall();</div><div class='add'>+</div><div class='add'>+	/* At the moment we don't allow changing the tag protocol under</div><div class='add'>+	 * traffic. The rtnl_mutex also happens to serialize concurrent</div><div class='add'>+	 * attempts to change the tagging protocol. If we ever lift the IFF_UP</div><div class='add'>+	 * restriction, there needs to be another mutex which serializes this.</div><div class='add'>+	 */</div><div class='add'>+	dsa_tree_for_each_user_port(dp, dst) {</div><div class='add'>+		if (dsa_port_to_conduit(dp)-&gt;flags &amp; IFF_UP)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;user-&gt;flags &amp; IFF_UP)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Notify the tag protocol change */</div><div class='add'>+	info.tag_ops = tag_ops;</div><div class='add'>+	err = dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unwind_tagger;</div><div class='add'>+</div><div class='add'>+	err = dsa_tree_bind_tag_proto(dst, tag_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unwind_tagger;</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unwind_tagger:</div><div class='add'>+	info.tag_ops = old_tag_ops;</div><div class='add'>+	dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO, &amp;info);</div><div class='add'>+out_unlock:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_conduit_state_change(struct dsa_switch_tree *dst,</div><div class='add'>+					  struct net_device *conduit)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_conduit_state_info info;</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+</div><div class='add'>+	info.conduit = conduit;</div><div class='add'>+	info.operational = dsa_port_conduit_is_operational(cpu_dp);</div><div class='add'>+</div><div class='add'>+	dsa_tree_notify(dst, DSA_NOTIFIER_CONDUIT_STATE_CHANGE, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_tree_conduit_admin_state_change(struct dsa_switch_tree *dst,</div><div class='add'>+					 struct net_device *conduit,</div><div class='add'>+					 bool up)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	bool notify = false;</div><div class='add'>+</div><div class='add'>+	/* Don't keep track of admin state on LAG DSA conduits,</div><div class='add'>+	 * but rather just of physical DSA conduits</div><div class='add'>+	 */</div><div class='add'>+	if (netif_is_lag_master(conduit))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((dsa_port_conduit_is_operational(cpu_dp)) !=</div><div class='add'>+	    (up &amp;&amp; cpu_dp-&gt;conduit_oper_up))</div><div class='add'>+		notify = true;</div><div class='add'>+</div><div class='add'>+	cpu_dp-&gt;conduit_admin_up = up;</div><div class='add'>+</div><div class='add'>+	if (notify)</div><div class='add'>+		dsa_tree_conduit_state_change(dst, conduit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_tree_conduit_oper_state_change(struct dsa_switch_tree *dst,</div><div class='add'>+					struct net_device *conduit,</div><div class='add'>+					bool up)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	bool notify = false;</div><div class='add'>+</div><div class='add'>+	/* Don't keep track of oper state on LAG DSA conduits,</div><div class='add'>+	 * but rather just of physical DSA conduits</div><div class='add'>+	 */</div><div class='add'>+	if (netif_is_lag_master(conduit))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((dsa_port_conduit_is_operational(cpu_dp)) !=</div><div class='add'>+	    (cpu_dp-&gt;conduit_admin_up &amp;&amp; up))</div><div class='add'>+		notify = true;</div><div class='add'>+</div><div class='add'>+	cpu_dp-&gt;conduit_oper_up = up;</div><div class='add'>+</div><div class='add'>+	if (notify)</div><div class='add'>+		dsa_tree_conduit_state_change(dst, conduit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds)</div><div class='add'>+		if (dp-&gt;index == index)</div><div class='add'>+			return dp;</div><div class='add'>+</div><div class='add'>+	dp = kzalloc(sizeof(*dp), GFP_KERNEL);</div><div class='add'>+	if (!dp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dp-&gt;ds = ds;</div><div class='add'>+	dp-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+	mutex_init(&amp;dp-&gt;vlans_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;fdbs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;mdbs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;vlans); /* also initializes &amp;dp-&gt;user_vlans */</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;list);</div><div class='add'>+	list_add_tail(&amp;dp-&gt;list, &amp;dst-&gt;ports);</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_parse_user(struct dsa_port *dp, const char *name)</div><div class='add'>+{</div><div class='add'>+	dp-&gt;type = DSA_PORT_TYPE_USER;</div><div class='add'>+	dp-&gt;name = name;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_parse_dsa(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	dp-&gt;type = DSA_PORT_TYPE_DSA;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol dsa_get_tag_protocol(struct dsa_port *dp,</div><div class='add'>+						  struct net_device *conduit)</div><div class='add'>+{</div><div class='add'>+	enum dsa_tag_protocol tag_protocol = DSA_TAG_PROTO_NONE;</div><div class='add'>+	struct dsa_switch *mds, *ds = dp-&gt;ds;</div><div class='add'>+	unsigned int mdp_upstream;</div><div class='add'>+	struct dsa_port *mdp;</div><div class='add'>+</div><div class='add'>+	/* It is possible to stack DSA switches onto one another when that</div><div class='add'>+	 * happens the switch driver may want to know if its tagging protocol</div><div class='add'>+	 * is going to work in such a configuration.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_user_dev_check(conduit)) {</div><div class='add'>+		mdp = dsa_user_to_port(conduit);</div><div class='add'>+		mds = mdp-&gt;ds;</div><div class='add'>+		mdp_upstream = dsa_upstream_port(mds, mdp-&gt;index);</div><div class='add'>+		tag_protocol = mds-&gt;ops-&gt;get_tag_protocol(mds, mdp_upstream,</div><div class='add'>+							  DSA_TAG_PROTO_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the conduit device is not itself a DSA user in a disjoint DSA</div><div class='add'>+	 * tree, then return immediately.</div><div class='add'>+	 */</div><div class='add'>+	return ds-&gt;ops-&gt;get_tag_protocol(ds, dp-&gt;index, tag_protocol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *conduit,</div><div class='add'>+			      const char *user_protocol)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = NULL;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	enum dsa_tag_protocol default_proto;</div><div class='add'>+</div><div class='add'>+	/* Find out which protocol the switch would prefer. */</div><div class='add'>+	default_proto = dsa_get_tag_protocol(dp, conduit);</div><div class='add'>+	if (dst-&gt;default_proto) {</div><div class='add'>+		if (dst-&gt;default_proto != default_proto) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"A DSA switch tree can have only one tagging protocol\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dst-&gt;default_proto = default_proto;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* See if the user wants to override that preference. */</div><div class='add'>+	if (user_protocol) {</div><div class='add'>+		if (!ds-&gt;ops-&gt;change_tag_protocol) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Tag protocol cannot be modified\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tag_ops = dsa_tag_driver_get_by_name(user_protocol);</div><div class='add'>+		if (IS_ERR(tag_ops)) {</div><div class='add'>+			dev_warn(ds-&gt;dev,</div><div class='add'>+				 "Failed to find a tagging driver for protocol %s, using default\n",</div><div class='add'>+				 user_protocol);</div><div class='add'>+			tag_ops = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tag_ops)</div><div class='add'>+		tag_ops = dsa_tag_driver_get_by_id(default_proto);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(tag_ops)) {</div><div class='add'>+		if (PTR_ERR(tag_ops) == -ENOPROTOOPT)</div><div class='add'>+			return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+		dev_warn(ds-&gt;dev, "No tagger for this switch\n");</div><div class='add'>+		return PTR_ERR(tag_ops);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dst-&gt;tag_ops) {</div><div class='add'>+		if (dst-&gt;tag_ops != tag_ops) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"A DSA switch tree can have only one tagging protocol\n");</div><div class='add'>+</div><div class='add'>+			dsa_tag_driver_put(tag_ops);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* In the case of multiple CPU ports per switch, the tagging</div><div class='add'>+		 * protocol is still reference-counted only per switch tree.</div><div class='add'>+		 */</div><div class='add'>+		dsa_tag_driver_put(tag_ops);</div><div class='add'>+	} else {</div><div class='add'>+		dst-&gt;tag_ops = tag_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;conduit = conduit;</div><div class='add'>+	dp-&gt;type = DSA_PORT_TYPE_CPU;</div><div class='add'>+	dsa_port_set_tag_protocol(dp, dst-&gt;tag_ops);</div><div class='add'>+	dp-&gt;dst = dst;</div><div class='add'>+</div><div class='add'>+	/* At this point, the tree may be configured to use a different</div><div class='add'>+	 * tagger than the one chosen by the switch driver during</div><div class='add'>+	 * .setup, in the case when a user selects a custom protocol</div><div class='add'>+	 * through the DT.</div><div class='add'>+	 *</div><div class='add'>+	 * This is resolved by syncing the driver with the tree in</div><div class='add'>+	 * dsa_switch_setup_tag_protocol once .setup has run and the</div><div class='add'>+	 * driver is ready to accept calls to .change_tag_protocol. If</div><div class='add'>+	 * the driver does not support the custom protocol at that</div><div class='add'>+	 * point, the tree is wholly rejected, thereby ensuring that the</div><div class='add'>+	 * tree and driver are always in agreement on the protocol to</div><div class='add'>+	 * use.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	struct device_node *ethernet = of_parse_phandle(dn, "ethernet", 0);</div><div class='add'>+	const char *name = of_get_property(dn, "label", NULL);</div><div class='add'>+	bool link = of_property_read_bool(dn, "link");</div><div class='add'>+</div><div class='add'>+	dp-&gt;dn = dn;</div><div class='add'>+</div><div class='add'>+	if (ethernet) {</div><div class='add'>+		struct net_device *conduit;</div><div class='add'>+		const char *user_protocol;</div><div class='add'>+</div><div class='add'>+		conduit = of_find_net_device_by_node(ethernet);</div><div class='add'>+		of_node_put(ethernet);</div><div class='add'>+		if (!conduit)</div><div class='add'>+			return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+		user_protocol = of_get_property(dn, "dsa-tag-protocol", NULL);</div><div class='add'>+		return dsa_port_parse_cpu(dp, conduit, user_protocol);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link)</div><div class='add'>+		return dsa_port_parse_dsa(dp);</div><div class='add'>+</div><div class='add'>+	return dsa_port_parse_user(dp, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_parse_ports_of(struct dsa_switch *ds,</div><div class='add'>+				     struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	struct device_node *ports, *port;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	ports = of_get_child_by_name(dn, "ports");</div><div class='add'>+	if (!ports) {</div><div class='add'>+		/* The second possibility is "ethernet-ports" */</div><div class='add'>+		ports = of_get_child_by_name(dn, "ethernet-ports");</div><div class='add'>+		if (!ports) {</div><div class='add'>+			dev_err(ds-&gt;dev, "no ports child node found\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(ports, port) {</div><div class='add'>+		err = of_property_read_u32(port, "reg", &amp;reg);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_node_put(port);</div><div class='add'>+			goto out_put_node;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg &gt;= ds-&gt;num_ports) {</div><div class='add'>+			dev_err(ds-&gt;dev, "port %pOF index %u exceeds num_ports (%u)\n",</div><div class='add'>+				port, reg, ds-&gt;num_ports);</div><div class='add'>+			of_node_put(port);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_put_node;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dp = dsa_to_port(ds, reg);</div><div class='add'>+</div><div class='add'>+		err = dsa_port_parse_of(dp, port);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_node_put(port);</div><div class='add'>+			goto out_put_node;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(ports);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_parse_member_of(struct dsa_switch *ds,</div><div class='add'>+				      struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	u32 m[2] = { 0, 0 };</div><div class='add'>+	int sz;</div><div class='add'>+</div><div class='add'>+	/* Don't error out if this optional property isn't found */</div><div class='add'>+	sz = of_property_read_variable_u32_array(dn, "dsa,member", m, 2, 2);</div><div class='add'>+	if (sz &lt; 0 &amp;&amp; sz != -EINVAL)</div><div class='add'>+		return sz;</div><div class='add'>+</div><div class='add'>+	ds-&gt;index = m[1];</div><div class='add'>+</div><div class='add'>+	ds-&gt;dst = dsa_tree_touch(m[0]);</div><div class='add'>+	if (!ds-&gt;dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_find(ds-&gt;dst-&gt;index, ds-&gt;index)) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"A DSA switch with index %d already exists in tree %d\n",</div><div class='add'>+			ds-&gt;index, ds-&gt;dst-&gt;index);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;dst-&gt;last_switch &lt; ds-&gt;index)</div><div class='add'>+		ds-&gt;dst-&gt;last_switch = ds-&gt;index;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_touch_ports(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		dp = dsa_port_touch(ds, port);</div><div class='add'>+		if (!dp)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_parse_of(struct dsa_switch *ds, struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_parse_member_of(ds, dn);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_touch_ports(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return dsa_switch_parse_ports_of(ds, dn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dev_is_class(struct device *dev, const void *class)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;class != NULL &amp;&amp; !strcmp(dev-&gt;class-&gt;name, class))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -102,7 +1393,7 @@ static struct device *dev_find_class(struct device *parent, char *class)</div><div class='ctx'> 	return device_find_child(parent, class, dev_is_class);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net_device *dsa_dev_to_net_device(struct device *dev)</div><div class='add'>+static struct net_device *dsa_dev_to_net_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *d;</div><div class='ctx'> </div><div class='hunk'>@@ -119,99 +1410,257 @@ struct net_device *dsa_dev_to_net_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_dev_to_net_device);</div><div class='ctx'> </div><div class='del'>-/* Determine if we should defer delivery of skb until we have a rx timestamp.</div><div class='del'>- *</div><div class='del'>- * Called from dsa_switch_rcv. For now, this will only work if tagging is</div><div class='del'>- * enabled on the switch. Normally the MAC driver would retrieve the hardware</div><div class='del'>- * timestamp when it reads the packet out of the hardware. However in a DSA</div><div class='del'>- * switch, the DSA driver owning the interface to which the packet is</div><div class='del'>- * delivered is never notified unless we do so here.</div><div class='del'>- */</div><div class='del'>-static bool dsa_skb_defer_rx_timestamp(struct dsa_slave_priv *p,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+static int dsa_port_parse(struct dsa_port *dp, const char *name,</div><div class='add'>+			  struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='del'>-	unsigned int type;</div><div class='add'>+	if (!strcmp(name, "cpu")) {</div><div class='add'>+		struct net_device *conduit;</div><div class='ctx'> </div><div class='del'>-	if (skb_headroom(skb) &lt; ETH_HLEN)</div><div class='del'>-		return false;</div><div class='add'>+		conduit = dsa_dev_to_net_device(dev);</div><div class='add'>+		if (!conduit)</div><div class='add'>+			return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='del'>-	__skb_push(skb, ETH_HLEN);</div><div class='add'>+		dev_put(conduit);</div><div class='ctx'> </div><div class='del'>-	type = ptp_classify_raw(skb);</div><div class='add'>+		return dsa_port_parse_cpu(dp, conduit, NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	__skb_pull(skb, ETH_HLEN);</div><div class='add'>+	if (!strcmp(name, "dsa"))</div><div class='add'>+		return dsa_port_parse_dsa(dp);</div><div class='ctx'> </div><div class='del'>-	if (type == PTP_CLASS_NONE)</div><div class='del'>-		return false;</div><div class='add'>+	return dsa_port_parse_user(dp, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_parse_ports(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_chip_data *cd)</div><div class='add'>+{</div><div class='add'>+	bool valid_name_found = false;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (likely(ds-&gt;ops-&gt;port_rxtstamp))</div><div class='del'>-		return ds-&gt;ops-&gt;port_rxtstamp(ds, p-&gt;dp-&gt;index, skb, type);</div><div class='add'>+	for (i = 0; i &lt; DSA_MAX_PORTS; i++) {</div><div class='add'>+		name = cd-&gt;port_names[i];</div><div class='add'>+		dev = cd-&gt;netdev[i];</div><div class='add'>+		dp = dsa_to_port(ds, i);</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+		if (!name)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_parse(dp, name, dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		valid_name_found = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!valid_name_found &amp;&amp; i == DSA_MAX_PORTS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			  struct packet_type *pt, struct net_device *unused)</div><div class='add'>+static int dsa_switch_parse(struct dsa_switch *ds, struct dsa_chip_data *cd)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	struct sk_buff *nskb = NULL;</div><div class='del'>-	struct pcpu_sw_netstats *s;</div><div class='del'>-	struct dsa_slave_priv *p;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!cpu_dp)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='add'>+	ds-&gt;cd = cd;</div><div class='add'>+</div><div class='add'>+	/* We don't support interconnected switches nor multiple trees via</div><div class='add'>+	 * platform data, so this is the unique switch of the tree.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;index = 0;</div><div class='add'>+	ds-&gt;dst = dsa_tree_touch(0);</div><div class='add'>+	if (!ds-&gt;dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = dsa_switch_touch_ports(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return dsa_switch_parse_ports(ds, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_switch_release_ports(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_mac_addr *a, *tmp;</div><div class='add'>+	struct dsa_port *dp, *next;</div><div class='add'>+	struct dsa_vlan *v, *n;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port_safe(dp, next, ds) {</div><div class='add'>+		/* These are either entries that upper layers lost track of</div><div class='add'>+		 * (probably due to bugs), or installed through interfaces</div><div class='add'>+		 * where one does not necessarily have to remove them, like</div><div class='add'>+		 * ndo_dflt_fdb_add().</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(a, tmp, &amp;dp-&gt;fdbs, list) {</div><div class='add'>+			dev_info(ds-&gt;dev,</div><div class='add'>+				 "Cleaning up unicast address %pM vid %u from port %d\n",</div><div class='add'>+				 a-&gt;addr, a-&gt;vid, dp-&gt;index);</div><div class='add'>+			list_del(&amp;a-&gt;list);</div><div class='add'>+			kfree(a);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(a, tmp, &amp;dp-&gt;mdbs, list) {</div><div class='add'>+			dev_info(ds-&gt;dev,</div><div class='add'>+				 "Cleaning up multicast address %pM vid %u from port %d\n",</div><div class='add'>+				 a-&gt;addr, a-&gt;vid, dp-&gt;index);</div><div class='add'>+			list_del(&amp;a-&gt;list);</div><div class='add'>+			kfree(a);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* These are entries that upper layers have lost track of,</div><div class='add'>+		 * probably due to bugs, but also due to dsa_port_do_vlan_del()</div><div class='add'>+		 * having failed and the VLAN entry still lingering on.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(v, n, &amp;dp-&gt;vlans, list) {</div><div class='add'>+			dev_info(ds-&gt;dev,</div><div class='add'>+				 "Cleaning up vid %u from port %d\n",</div><div class='add'>+				 v-&gt;vid, dp-&gt;index);</div><div class='add'>+			list_del(&amp;v-&gt;list);</div><div class='add'>+			kfree(v);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;dp-&gt;list);</div><div class='add'>+		kfree(dp);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return 0;</div><div class='add'>+static int dsa_switch_probe(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	struct dsa_chip_data *pdata;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	nskb = cpu_dp-&gt;rcv(skb, dev, pt);</div><div class='del'>-	if (!nskb) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='add'>+	if (!ds-&gt;dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	pdata = ds-&gt;dev-&gt;platform_data;</div><div class='add'>+	np = ds-&gt;dev-&gt;of_node;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;num_ports)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (np) {</div><div class='add'>+		err = dsa_switch_parse_of(ds, np);</div><div class='add'>+		if (err)</div><div class='add'>+			dsa_switch_release_ports(ds);</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		err = dsa_switch_parse(ds, pdata);</div><div class='add'>+		if (err)</div><div class='add'>+			dsa_switch_release_ports(ds);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = nskb;</div><div class='del'>-	p = netdev_priv(skb-&gt;dev);</div><div class='del'>-	skb_push(skb, ETH_HLEN);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_HOST;</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	s = this_cpu_ptr(p-&gt;stats64);</div><div class='del'>-	u64_stats_update_begin(&amp;s-&gt;syncp);</div><div class='del'>-	s-&gt;rx_packets++;</div><div class='del'>-	s-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;s-&gt;syncp);</div><div class='add'>+	dst = ds-&gt;dst;</div><div class='add'>+	dsa_tree_get(dst);</div><div class='add'>+	err = dsa_tree_setup(dst);</div><div class='add'>+	if (err) {</div><div class='add'>+		dsa_switch_release_ports(ds);</div><div class='add'>+		dsa_tree_put(dst);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dsa_skb_defer_rx_timestamp(p, skb))</div><div class='del'>-		return 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+int dsa_register_switch(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	mutex_lock(&amp;dsa2_mutex);</div><div class='add'>+	err = dsa_switch_probe(ds);</div><div class='add'>+	dsa_tree_put(ds-&gt;dst);</div><div class='add'>+	mutex_unlock(&amp;dsa2_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_register_switch);</div><div class='add'>+</div><div class='add'>+static void dsa_switch_remove(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+	dsa_tree_teardown(dst);</div><div class='add'>+	dsa_switch_release_ports(ds);</div><div class='add'>+	dsa_tree_put(dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_unregister_switch(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dsa2_mutex);</div><div class='add'>+	dsa_switch_remove(ds);</div><div class='add'>+	mutex_unlock(&amp;dsa2_mutex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_unregister_switch);</div><div class='add'>+</div><div class='add'>+/* If the DSA conduit chooses to unregister its net_device on .shutdown, DSA is</div><div class='add'>+ * blocking that operation from completion, due to the dev_hold taken inside</div><div class='add'>+ * netdev_upper_dev_link. Unlink the DSA user interfaces from being uppers of</div><div class='add'>+ * the DSA conduit, so that the system can reboot successfully.</div><div class='add'>+ */</div><div class='add'>+void dsa_switch_shutdown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit, *user_dev;</div><div class='add'>+	LIST_HEAD(close_list);</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dsa2_mutex);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;setup)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds)</div><div class='add'>+		list_add(&amp;dp-&gt;conduit-&gt;close_list, &amp;close_list);</div><div class='add'>+</div><div class='add'>+	netif_close_many(&amp;close_list, true);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		conduit = dsa_port_to_conduit(dp);</div><div class='add'>+		user_dev = dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		netif_device_detach(user_dev);</div><div class='add'>+		netdev_upper_dev_unlink(conduit, user_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disconnect from further netdevice notifiers on the conduit,</div><div class='add'>+	 * since netdev_uses_dsa() will now return false.</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds)</div><div class='add'>+		dp-&gt;conduit-&gt;dsa_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dsa2_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_switch_shutdown);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='del'>-static bool dsa_is_port_initialized(struct dsa_switch *ds, int p)</div><div class='add'>+static bool dsa_port_is_initialized(const struct dsa_port *dp)</div><div class='ctx'> {</div><div class='del'>-	return dsa_is_user_port(ds, p) &amp;&amp; ds-&gt;ports[p].slave;</div><div class='add'>+	return dp-&gt;type == DSA_PORT_TYPE_USER &amp;&amp; dp-&gt;user;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dsa_switch_suspend(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* Suspend slave network devices */</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='del'>-		if (!dsa_is_port_initialized(ds, i))</div><div class='add'>+	/* Suspend user network devices */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (!dsa_port_is_initialized(dp))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = dsa_slave_suspend(ds-&gt;ports[i].slave);</div><div class='add'>+		ret = dsa_user_suspend(dp-&gt;user);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -225,7 +1674,8 @@ EXPORT_SYMBOL_GPL(dsa_switch_suspend);</div><div class='ctx'> </div><div class='ctx'> int dsa_switch_resume(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ds-&gt;ops-&gt;resume)</div><div class='ctx'> 		ret = ds-&gt;ops-&gt;resume(ds);</div><div class='hunk'>@@ -233,12 +1683,12 @@ int dsa_switch_resume(struct dsa_switch *ds)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Resume slave network devices */</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='del'>-		if (!dsa_is_port_initialized(ds, i))</div><div class='add'>+	/* Resume user network devices */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (!dsa_port_is_initialized(dp))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = dsa_slave_resume(ds-&gt;ports[i].slave);</div><div class='add'>+		ret = dsa_user_resume(dp-&gt;user);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -248,39 +1698,152 @@ int dsa_switch_resume(struct dsa_switch *ds)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dsa_switch_resume);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct packet_type dsa_pack_type __read_mostly = {</div><div class='del'>-	.type	= cpu_to_be16(ETH_P_XDSA),</div><div class='del'>-	.func	= dsa_switch_rcv,</div><div class='del'>-};</div><div class='add'>+struct dsa_port *dsa_port_from_netdev(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	if (!netdev || !dsa_user_dev_check(netdev))</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *dsa_owq;</div><div class='add'>+	return dsa_user_to_port(netdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_port_from_netdev);</div><div class='ctx'> </div><div class='del'>-bool dsa_schedule_work(struct work_struct *work)</div><div class='add'>+bool dsa_db_equal(const struct dsa_db *a, const struct dsa_db *b)</div><div class='ctx'> {</div><div class='del'>-	return queue_work(dsa_owq, work);</div><div class='add'>+	if (a-&gt;type != b-&gt;type)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (a-&gt;type) {</div><div class='add'>+	case DSA_DB_PORT:</div><div class='add'>+		return a-&gt;dp == b-&gt;dp;</div><div class='add'>+	case DSA_DB_LAG:</div><div class='add'>+		return a-&gt;lag.dev == b-&gt;lag.dev;</div><div class='add'>+	case DSA_DB_BRIDGE:</div><div class='add'>+		return a-&gt;bridge.num == b-&gt;bridge.num;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool dsa_fdb_present_in_other_db(struct dsa_switch *ds, int port,</div><div class='add'>+				 const unsigned char *addr, u16 vid,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(a, &amp;dp-&gt;fdbs, list) {</div><div class='add'>+		if (!ether_addr_equal(a-&gt;addr, addr) || a-&gt;vid != vid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (a-&gt;db.type == db.type &amp;&amp; !dsa_db_equal(&amp;a-&gt;db, &amp;db))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_fdb_present_in_other_db);</div><div class='add'>+</div><div class='add'>+bool dsa_mdb_present_in_other_db(struct dsa_switch *ds, int port,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(a, &amp;dp-&gt;mdbs, list) {</div><div class='add'>+		if (!ether_addr_equal(a-&gt;addr, mdb-&gt;addr) || a-&gt;vid != mdb-&gt;vid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (a-&gt;db.type == db.type &amp;&amp; !dsa_db_equal(&amp;a-&gt;db, &amp;db))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_mdb_present_in_other_db);</div><div class='add'>+</div><div class='add'>+/* Helpers for switches without specific HSR offloads, but which can implement</div><div class='add'>+ * NETIF_F_HW_HSR_DUP because their tagger uses dsa_xmit_port_mask()</div><div class='add'>+ */</div><div class='add'>+int dsa_port_simple_hsr_validate(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct net_device *hsr,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum hsr_port_type type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hsr_get_port_type(hsr, dsa_to_port(ds, port)-&gt;user, &amp;type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (type != HSR_PT_SLAVE_A &amp;&amp; type != HSR_PT_SLAVE_B) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only HSR slave ports can be offloaded");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_port_simple_hsr_validate);</div><div class='add'>+</div><div class='add'>+int dsa_port_simple_hsr_join(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct net_device *hsr,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_simple_hsr_validate(ds, port, hsr, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-static ATOMIC_NOTIFIER_HEAD(dsa_notif_chain);</div><div class='add'>+	dsa_hsr_foreach_port(other_dp, ds, hsr) {</div><div class='add'>+		if (other_dp != dp) {</div><div class='add'>+			dp-&gt;user-&gt;features |= NETIF_F_HW_HSR_DUP;</div><div class='add'>+			other_dp-&gt;user-&gt;features |= NETIF_F_HW_HSR_DUP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-int register_dsa_notifier(struct notifier_block *nb)</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_port_simple_hsr_join);</div><div class='add'>+</div><div class='add'>+int dsa_port_simple_hsr_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct net_device *hsr)</div><div class='ctx'> {</div><div class='del'>-	return atomic_notifier_chain_register(&amp;dsa_notif_chain, nb);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;</div><div class='add'>+</div><div class='add'>+	dsa_hsr_foreach_port(other_dp, ds, hsr) {</div><div class='add'>+		if (other_dp != dp) {</div><div class='add'>+			dp-&gt;user-&gt;features &amp;= ~NETIF_F_HW_HSR_DUP;</div><div class='add'>+			other_dp-&gt;user-&gt;features &amp;= ~NETIF_F_HW_HSR_DUP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(register_dsa_notifier);</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_port_simple_hsr_leave);</div><div class='add'>+</div><div class='add'>+static const struct dsa_stubs __dsa_stubs = {</div><div class='add'>+	.conduit_hwtstamp_validate = __dsa_conduit_hwtstamp_validate,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int unregister_dsa_notifier(struct notifier_block *nb)</div><div class='add'>+static void dsa_register_stubs(void)</div><div class='ctx'> {</div><div class='del'>-	return atomic_notifier_chain_unregister(&amp;dsa_notif_chain, nb);</div><div class='add'>+	dsa_stubs = &amp;__dsa_stubs;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(unregister_dsa_notifier);</div><div class='ctx'> </div><div class='del'>-int call_dsa_notifiers(unsigned long val, struct net_device *dev,</div><div class='del'>-		       struct dsa_notifier_info *info)</div><div class='add'>+static void dsa_unregister_stubs(void)</div><div class='ctx'> {</div><div class='del'>-	info-&gt;dev = dev;</div><div class='del'>-	return atomic_notifier_call_chain(&amp;dsa_notif_chain, val, info);</div><div class='add'>+	dsa_stubs = NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(call_dsa_notifiers);</div><div class='ctx'> </div><div class='ctx'> static int __init dsa_init_module(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -291,25 +1854,38 @@ static int __init dsa_init_module(void)</div><div class='ctx'> 	if (!dsa_owq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rc = dsa_slave_register_notifier();</div><div class='add'>+	rc = dsa_user_register_notifier();</div><div class='ctx'> 	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+		goto register_notifier_fail;</div><div class='ctx'> </div><div class='del'>-	rc = dsa_legacy_register();</div><div class='add'>+	dev_add_pack(&amp;dsa_pack_type);</div><div class='add'>+</div><div class='add'>+	rc = rtnl_link_register(&amp;dsa_link_ops);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+		goto netlink_register_fail;</div><div class='ctx'> </div><div class='del'>-	dev_add_pack(&amp;dsa_pack_type);</div><div class='add'>+	dsa_register_stubs();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+netlink_register_fail:</div><div class='add'>+	dsa_user_unregister_notifier();</div><div class='add'>+	dev_remove_pack(&amp;dsa_pack_type);</div><div class='add'>+register_notifier_fail:</div><div class='add'>+	destroy_workqueue(dsa_owq);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> module_init(dsa_init_module);</div><div class='ctx'> </div><div class='ctx'> static void __exit dsa_cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-	dsa_slave_unregister_notifier();</div><div class='add'>+	dsa_unregister_stubs();</div><div class='add'>+</div><div class='add'>+	rtnl_link_unregister(&amp;dsa_link_ops);</div><div class='add'>+</div><div class='add'>+	dsa_user_unregister_notifier();</div><div class='ctx'> 	dev_remove_pack(&amp;dsa_pack_type);</div><div class='del'>-	dsa_legacy_unregister();</div><div class='ctx'> 	destroy_workqueue(dsa_owq);</div><div class='ctx'> }</div><div class='ctx'> module_exit(dsa_cleanup_module);</div><div class='hunk'>@@ -318,3 +1894,4 @@ MODULE_AUTHOR("Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:dsa");</div><div class='add'>+MODULE_IMPORT_NS("NETDEV_INTERNAL");</div><div class='head'>diff --git a/net/dsa/dsa.h b/net/dsa/dsa.h<br/>new file mode 100644<br/>index 000000000000..3cc7823e9ef3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/dsa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/dsa.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_H</div><div class='add'>+#define __DSA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct dsa_db;</div><div class='add'>+struct dsa_device_ops;</div><div class='add'>+struct dsa_lag;</div><div class='add'>+struct dsa_switch_tree;</div><div class='add'>+struct net_device;</div><div class='add'>+struct work_struct;</div><div class='add'>+</div><div class='add'>+extern struct list_head dsa_tree_list;</div><div class='add'>+</div><div class='add'>+bool dsa_db_equal(const struct dsa_db *a, const struct dsa_db *b);</div><div class='add'>+bool dsa_schedule_work(struct work_struct *work);</div><div class='add'>+void dsa_lag_map(struct dsa_switch_tree *dst, struct dsa_lag *lag);</div><div class='add'>+void dsa_lag_unmap(struct dsa_switch_tree *dst, struct dsa_lag *lag);</div><div class='add'>+struct dsa_lag *dsa_tree_lag_find(struct dsa_switch_tree *dst,</div><div class='add'>+				  const struct net_device *lag_dev);</div><div class='add'>+struct net_device *dsa_tree_find_first_conduit(struct dsa_switch_tree *dst);</div><div class='add'>+int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,</div><div class='add'>+			      const struct dsa_device_ops *tag_ops,</div><div class='add'>+			      const struct dsa_device_ops *old_tag_ops);</div><div class='add'>+void dsa_tree_conduit_admin_state_change(struct dsa_switch_tree *dst,</div><div class='add'>+					 struct net_device *conduit,</div><div class='add'>+					 bool up);</div><div class='add'>+void dsa_tree_conduit_oper_state_change(struct dsa_switch_tree *dst,</div><div class='add'>+					struct net_device *conduit,</div><div class='add'>+					bool up);</div><div class='add'>+unsigned int dsa_bridge_num_get(const struct net_device *bridge_dev, int max);</div><div class='add'>+void dsa_bridge_num_put(const struct net_device *bridge_dev,</div><div class='add'>+			unsigned int bridge_num);</div><div class='add'>+struct dsa_bridge *dsa_tree_bridge_find(struct dsa_switch_tree *dst,</div><div class='add'>+					const struct net_device *br);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c<br/>deleted file mode 100644<br/>index a1917025e155..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/dsa2.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,831 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/dsa/dsa2.c - Hardware switch handling, binding version 2</div><div class='del'>- * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- * Copyright (c) 2013 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='del'>- * Copyright (c) 2016 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(dsa_tree_list);</div><div class='del'>-static DEFINE_MUTEX(dsa2_mutex);</div><div class='del'>-</div><div class='del'>-static const struct devlink_ops dsa_devlink_ops = {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsa_switch_tree *dsa_tree_find(int index)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(dst, &amp;dsa_tree_list, list)</div><div class='del'>-		if (dst-&gt;index == index)</div><div class='del'>-			return dst;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_switch_tree *dsa_tree_alloc(int index)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst;</div><div class='del'>-</div><div class='del'>-	dst = kzalloc(sizeof(*dst), GFP_KERNEL);</div><div class='del'>-	if (!dst)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	dst-&gt;index = index;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;dst-&gt;list);</div><div class='del'>-	list_add_tail(&amp;dsa_tree_list, &amp;dst-&gt;list);</div><div class='del'>-</div><div class='del'>-	kref_init(&amp;dst-&gt;refcount);</div><div class='del'>-</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_free(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;dst-&gt;list);</div><div class='del'>-	kfree(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_switch_tree *dsa_tree_get(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	if (dst)</div><div class='del'>-		kref_get(&amp;dst-&gt;refcount);</div><div class='del'>-</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_switch_tree *dsa_tree_touch(int index)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst;</div><div class='del'>-</div><div class='del'>-	dst = dsa_tree_find(index);</div><div class='del'>-	if (dst)</div><div class='del'>-		return dsa_tree_get(dst);</div><div class='del'>-	else</div><div class='del'>-		return dsa_tree_alloc(index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_release(struct kref *ref)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst;</div><div class='del'>-</div><div class='del'>-	dst = container_of(ref, struct dsa_switch_tree, refcount);</div><div class='del'>-</div><div class='del'>-	dsa_tree_free(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_put(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	if (dst)</div><div class='del'>-		kref_put(&amp;dst-&gt;refcount, dsa_tree_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_port_is_dsa(struct dsa_port *port)</div><div class='del'>-{</div><div class='del'>-	return port-&gt;type == DSA_PORT_TYPE_DSA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_port_is_cpu(struct dsa_port *port)</div><div class='del'>-{</div><div class='del'>-	return port-&gt;type == DSA_PORT_TYPE_CPU;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_port_is_user(struct dsa_port *dp)</div><div class='del'>-{</div><div class='del'>-	return dp-&gt;type == DSA_PORT_TYPE_USER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_port *dsa_tree_find_port_by_node(struct dsa_switch_tree *dst,</div><div class='del'>-						   struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int device, port;</div><div class='del'>-</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-			dp = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-			if (dp-&gt;dn == dn)</div><div class='del'>-				return dp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_port_setup_routing_table(struct dsa_port *dp)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-	struct device_node *dn = dp-&gt;dn;</div><div class='del'>-	struct of_phandle_iterator it;</div><div class='del'>-	struct dsa_port *link_dp;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	of_for_each_phandle(&amp;it, err, dn, "link", NULL, 0) {</div><div class='del'>-		link_dp = dsa_tree_find_port_by_node(dst, it.node);</div><div class='del'>-		if (!link_dp) {</div><div class='del'>-			of_node_put(it.node);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ds-&gt;rtable[link_dp-&gt;ds-&gt;index] = dp-&gt;index;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_switch_setup_routing_table(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	bool complete = true;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DSA_MAX_SWITCHES; i++)</div><div class='del'>-		ds-&gt;rtable[i] = DSA_RTABLE_NONE;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='del'>-		dp = &amp;ds-&gt;ports[i];</div><div class='del'>-</div><div class='del'>-		if (dsa_port_is_dsa(dp)) {</div><div class='del'>-			complete = dsa_port_setup_routing_table(dp);</div><div class='del'>-			if (!complete)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_tree_setup_routing_table(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	bool complete = true;</div><div class='del'>-	int device;</div><div class='del'>-</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		complete = dsa_switch_setup_routing_table(ds);</div><div class='del'>-		if (!complete)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_port *dsa_tree_find_first_cpu(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int device, port;</div><div class='del'>-</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-			dp = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-			if (dsa_port_is_cpu(dp))</div><div class='del'>-				return dp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int device, port;</div><div class='del'>-</div><div class='del'>-	/* DSA currently only supports a single CPU port */</div><div class='del'>-	dst-&gt;cpu_dp = dsa_tree_find_first_cpu(dst);</div><div class='del'>-	if (!dst-&gt;cpu_dp) {</div><div class='del'>-		pr_warn("Tree has no master device\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assign the default CPU port to all ports of the fabric */</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-			dp = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-			if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))</div><div class='del'>-				dp-&gt;cpu_dp = dst-&gt;cpu_dp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	/* DSA currently only supports a single CPU port */</div><div class='del'>-	dst-&gt;cpu_dp = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_setup(struct dsa_port *dp)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	memset(&amp;dp-&gt;devlink_port, 0, sizeof(dp-&gt;devlink_port));</div><div class='del'>-</div><div class='del'>-	if (dp-&gt;type != DSA_PORT_TYPE_UNUSED)</div><div class='del'>-		err = devlink_port_register(ds-&gt;devlink, &amp;dp-&gt;devlink_port,</div><div class='del'>-					    dp-&gt;index);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	switch (dp-&gt;type) {</div><div class='del'>-	case DSA_PORT_TYPE_UNUSED:</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_TYPE_CPU:</div><div class='del'>-		/* dp-&gt;index is used now as port_number. However</div><div class='del'>-		 * CPU ports should have separate numbering</div><div class='del'>-		 * independent from front panel port numbers.</div><div class='del'>-		 */</div><div class='del'>-		devlink_port_attrs_set(&amp;dp-&gt;devlink_port,</div><div class='del'>-				       DEVLINK_PORT_FLAVOUR_CPU,</div><div class='del'>-				       dp-&gt;index, false, 0);</div><div class='del'>-		err = dsa_port_link_register_of(dp);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(ds-&gt;dev, "failed to setup link for port %d.%d\n",</div><div class='del'>-				ds-&gt;index, dp-&gt;index);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_TYPE_DSA:</div><div class='del'>-		/* dp-&gt;index is used now as port_number. However</div><div class='del'>-		 * DSA ports should have separate numbering</div><div class='del'>-		 * independent from front panel port numbers.</div><div class='del'>-		 */</div><div class='del'>-		devlink_port_attrs_set(&amp;dp-&gt;devlink_port,</div><div class='del'>-				       DEVLINK_PORT_FLAVOUR_DSA,</div><div class='del'>-				       dp-&gt;index, false, 0);</div><div class='del'>-		err = dsa_port_link_register_of(dp);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(ds-&gt;dev, "failed to setup link for port %d.%d\n",</div><div class='del'>-				ds-&gt;index, dp-&gt;index);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_TYPE_USER:</div><div class='del'>-		devlink_port_attrs_set(&amp;dp-&gt;devlink_port,</div><div class='del'>-				       DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='del'>-				       dp-&gt;index, false, 0);</div><div class='del'>-		err = dsa_slave_create(dp);</div><div class='del'>-		if (err)</div><div class='del'>-			dev_err(ds-&gt;dev, "failed to create slave for port %d.%d\n",</div><div class='del'>-				ds-&gt;index, dp-&gt;index);</div><div class='del'>-		else</div><div class='del'>-			devlink_port_type_eth_set(&amp;dp-&gt;devlink_port, dp-&gt;slave);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_port_teardown(struct dsa_port *dp)</div><div class='del'>-{</div><div class='del'>-	if (dp-&gt;type != DSA_PORT_TYPE_UNUSED)</div><div class='del'>-		devlink_port_unregister(&amp;dp-&gt;devlink_port);</div><div class='del'>-</div><div class='del'>-	switch (dp-&gt;type) {</div><div class='del'>-	case DSA_PORT_TYPE_UNUSED:</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_TYPE_CPU:</div><div class='del'>-	case DSA_PORT_TYPE_DSA:</div><div class='del'>-		dsa_port_link_unregister_of(dp);</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_TYPE_USER:</div><div class='del'>-		if (dp-&gt;slave) {</div><div class='del'>-			dsa_slave_destroy(dp-&gt;slave);</div><div class='del'>-			dp-&gt;slave = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_setup(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Initialize ds-&gt;phys_mii_mask before registering the slave MDIO bus</div><div class='del'>-	 * driver and before ops-&gt;setup() has run, since the switch drivers and</div><div class='del'>-	 * the slave MDIO bus driver rely on these values for probing PHY</div><div class='del'>-	 * devices or not</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;phys_mii_mask |= dsa_user_ports(ds);</div><div class='del'>-</div><div class='del'>-	/* Add the switch to devlink before calling setup, so that setup can</div><div class='del'>-	 * add dpipe tables</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;devlink = devlink_alloc(&amp;dsa_devlink_ops, 0);</div><div class='del'>-	if (!ds-&gt;devlink)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_register(ds-&gt;devlink, ds-&gt;dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = ds-&gt;ops-&gt;setup(ds);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = dsa_switch_register_notifier(ds);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;slave_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read) {</div><div class='del'>-		ds-&gt;slave_mii_bus = devm_mdiobus_alloc(ds-&gt;dev);</div><div class='del'>-		if (!ds-&gt;slave_mii_bus)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		dsa_slave_mii_bus_init(ds);</div><div class='del'>-</div><div class='del'>-		err = mdiobus_register(ds-&gt;slave_mii_bus);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_switch_teardown(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	if (ds-&gt;slave_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read)</div><div class='del'>-		mdiobus_unregister(ds-&gt;slave_mii_bus);</div><div class='del'>-</div><div class='del'>-	dsa_switch_unregister_notifier(ds);</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;devlink) {</div><div class='del'>-		devlink_unregister(ds-&gt;devlink);</div><div class='del'>-		devlink_free(ds-&gt;devlink);</div><div class='del'>-		ds-&gt;devlink = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_tree_setup_switches(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int device, port;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		err = dsa_switch_setup(ds);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-			dp = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-			err = dsa_port_setup(dp);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_teardown_switches(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int device, port;</div><div class='del'>-</div><div class='del'>-	for (device = 0; device &lt; DSA_MAX_SWITCHES; device++) {</div><div class='del'>-		ds = dst-&gt;ds[device];</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-			dp = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-			dsa_port_teardown(dp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dsa_switch_teardown(ds);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_tree_setup_master(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dst-&gt;cpu_dp;</div><div class='del'>-	struct net_device *master = cpu_dp-&gt;master;</div><div class='del'>-</div><div class='del'>-	/* DSA currently supports a single pair of CPU port and master device */</div><div class='del'>-	return dsa_master_setup(master, cpu_dp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_teardown_master(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dst-&gt;cpu_dp;</div><div class='del'>-	struct net_device *master = cpu_dp-&gt;master;</div><div class='del'>-</div><div class='del'>-	return dsa_master_teardown(master);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_tree_setup(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	bool complete;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (dst-&gt;setup) {</div><div class='del'>-		pr_err("DSA: tree %d already setup! Disjoint trees?\n",</div><div class='del'>-		       dst-&gt;index);</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	complete = dsa_tree_setup_routing_table(dst);</div><div class='del'>-	if (!complete)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = dsa_tree_setup_default_cpu(dst);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = dsa_tree_setup_switches(dst);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = dsa_tree_setup_master(dst);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	dst-&gt;setup = true;</div><div class='del'>-</div><div class='del'>-	pr_info("DSA: tree %d setup\n", dst-&gt;index);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_teardown(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	if (!dst-&gt;setup)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dsa_tree_teardown_master(dst);</div><div class='del'>-</div><div class='del'>-	dsa_tree_teardown_switches(dst);</div><div class='del'>-</div><div class='del'>-	dsa_tree_teardown_default_cpu(dst);</div><div class='del'>-</div><div class='del'>-	pr_info("DSA: tree %d torn down\n", dst-&gt;index);</div><div class='del'>-</div><div class='del'>-	dst-&gt;setup = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_tree_remove_switch(struct dsa_switch_tree *dst,</div><div class='del'>-				   unsigned int index)</div><div class='del'>-{</div><div class='del'>-	dsa_tree_teardown(dst);</div><div class='del'>-</div><div class='del'>-	dst-&gt;ds[index] = NULL;</div><div class='del'>-	dsa_tree_put(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_tree_add_switch(struct dsa_switch_tree *dst,</div><div class='del'>-			       struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	unsigned int index = ds-&gt;index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (dst-&gt;ds[index])</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	dsa_tree_get(dst);</div><div class='del'>-	dst-&gt;ds[index] = ds;</div><div class='del'>-</div><div class='del'>-	err = dsa_tree_setup(dst);</div><div class='del'>-	if (err)</div><div class='del'>-		dsa_tree_remove_switch(dst, index);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_parse_user(struct dsa_port *dp, const char *name)</div><div class='del'>-{</div><div class='del'>-	if (!name)</div><div class='del'>-		name = "eth%d";</div><div class='del'>-</div><div class='del'>-	dp-&gt;type = DSA_PORT_TYPE_USER;</div><div class='del'>-	dp-&gt;name = name;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_parse_dsa(struct dsa_port *dp)</div><div class='del'>-{</div><div class='del'>-	dp-&gt;type = DSA_PORT_TYPE_DSA;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-	const struct dsa_device_ops *tag_ops;</div><div class='del'>-	enum dsa_tag_protocol tag_protocol;</div><div class='del'>-</div><div class='del'>-	tag_protocol = ds-&gt;ops-&gt;get_tag_protocol(ds, dp-&gt;index);</div><div class='del'>-	tag_ops = dsa_resolve_tag_protocol(tag_protocol);</div><div class='del'>-	if (IS_ERR(tag_ops)) {</div><div class='del'>-		dev_warn(ds-&gt;dev, "No tagger for this switch\n");</div><div class='del'>-		return PTR_ERR(tag_ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dp-&gt;type = DSA_PORT_TYPE_CPU;</div><div class='del'>-	dp-&gt;rcv = tag_ops-&gt;rcv;</div><div class='del'>-	dp-&gt;tag_ops = tag_ops;</div><div class='del'>-	dp-&gt;master = master;</div><div class='del'>-	dp-&gt;dst = dst;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	struct device_node *ethernet = of_parse_phandle(dn, "ethernet", 0);</div><div class='del'>-	const char *name = of_get_property(dn, "label", NULL);</div><div class='del'>-	bool link = of_property_read_bool(dn, "link");</div><div class='del'>-</div><div class='del'>-	dp-&gt;dn = dn;</div><div class='del'>-</div><div class='del'>-	if (ethernet) {</div><div class='del'>-		struct net_device *master;</div><div class='del'>-</div><div class='del'>-		master = of_find_net_device_by_node(ethernet);</div><div class='del'>-		if (!master)</div><div class='del'>-			return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-		return dsa_port_parse_cpu(dp, master);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (link)</div><div class='del'>-		return dsa_port_parse_dsa(dp);</div><div class='del'>-</div><div class='del'>-	return dsa_port_parse_user(dp, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_parse_ports_of(struct dsa_switch *ds,</div><div class='del'>-				     struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	struct device_node *ports, *port;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	u32 reg;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ports = of_get_child_by_name(dn, "ports");</div><div class='del'>-	if (!ports) {</div><div class='del'>-		dev_err(ds-&gt;dev, "no ports child node found\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_available_child_of_node(ports, port) {</div><div class='del'>-		err = of_property_read_u32(port, "reg", &amp;reg);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (reg &gt;= ds-&gt;num_ports)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		dp = &amp;ds-&gt;ports[reg];</div><div class='del'>-</div><div class='del'>-		err = dsa_port_parse_of(dp, port);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_parse_member_of(struct dsa_switch *ds,</div><div class='del'>-				      struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	u32 m[2] = { 0, 0 };</div><div class='del'>-	int sz;</div><div class='del'>-</div><div class='del'>-	/* Don't error out if this optional property isn't found */</div><div class='del'>-	sz = of_property_read_variable_u32_array(dn, "dsa,member", m, 2, 2);</div><div class='del'>-	if (sz &lt; 0 &amp;&amp; sz != -EINVAL)</div><div class='del'>-		return sz;</div><div class='del'>-</div><div class='del'>-	ds-&gt;index = m[1];</div><div class='del'>-	if (ds-&gt;index &gt;= DSA_MAX_SWITCHES)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ds-&gt;dst = dsa_tree_touch(m[0]);</div><div class='del'>-	if (!ds-&gt;dst)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_parse_of(struct dsa_switch *ds, struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = dsa_switch_parse_member_of(ds, dn);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return dsa_switch_parse_ports_of(ds, dn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_port_parse(struct dsa_port *dp, const char *name,</div><div class='del'>-			  struct device *dev)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(name, "cpu")) {</div><div class='del'>-		struct net_device *master;</div><div class='del'>-</div><div class='del'>-		master = dsa_dev_to_net_device(dev);</div><div class='del'>-		if (!master)</div><div class='del'>-			return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-		dev_put(master);</div><div class='del'>-</div><div class='del'>-		return dsa_port_parse_cpu(dp, master);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strcmp(name, "dsa"))</div><div class='del'>-		return dsa_port_parse_dsa(dp);</div><div class='del'>-</div><div class='del'>-	return dsa_port_parse_user(dp, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_parse_ports(struct dsa_switch *ds,</div><div class='del'>-				  struct dsa_chip_data *cd)</div><div class='del'>-{</div><div class='del'>-	bool valid_name_found = false;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DSA_MAX_PORTS; i++) {</div><div class='del'>-		name = cd-&gt;port_names[i];</div><div class='del'>-		dev = cd-&gt;netdev[i];</div><div class='del'>-		dp = &amp;ds-&gt;ports[i];</div><div class='del'>-</div><div class='del'>-		if (!name)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		err = dsa_port_parse(dp, name, dev);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		valid_name_found = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!valid_name_found &amp;&amp; i == DSA_MAX_PORTS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_parse(struct dsa_switch *ds, struct dsa_chip_data *cd)</div><div class='del'>-{</div><div class='del'>-	ds-&gt;cd = cd;</div><div class='del'>-</div><div class='del'>-	/* We don't support interconnected switches nor multiple trees via</div><div class='del'>-	 * platform data, so this is the unique switch of the tree.</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;index = 0;</div><div class='del'>-	ds-&gt;dst = dsa_tree_touch(0);</div><div class='del'>-	if (!ds-&gt;dst)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return dsa_switch_parse_ports(ds, cd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_add(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-</div><div class='del'>-	return dsa_tree_add_switch(dst, ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_probe(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct dsa_chip_data *pdata = ds-&gt;dev-&gt;platform_data;</div><div class='del'>-	struct device_node *np = ds-&gt;dev-&gt;of_node;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (np)</div><div class='del'>-		err = dsa_switch_parse_of(ds, np);</div><div class='del'>-	else if (pdata)</div><div class='del'>-		err = dsa_switch_parse(ds, pdata);</div><div class='del'>-	else</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return dsa_switch_add(ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n)</div><div class='del'>-{</div><div class='del'>-	size_t size = sizeof(struct dsa_switch) + n * sizeof(struct dsa_port);</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ds = devm_kzalloc(dev, size, GFP_KERNEL);</div><div class='del'>-	if (!ds)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* We avoid allocating memory outside dsa_switch</div><div class='del'>-	 * if it is not needed.</div><div class='del'>-	 */</div><div class='del'>-	if (n &lt;= sizeof(ds-&gt;_bitmap) * 8) {</div><div class='del'>-		ds-&gt;bitmap = &amp;ds-&gt;_bitmap;</div><div class='del'>-	} else {</div><div class='del'>-		ds-&gt;bitmap = devm_kcalloc(dev,</div><div class='del'>-					  BITS_TO_LONGS(n),</div><div class='del'>-					  sizeof(unsigned long),</div><div class='del'>-					  GFP_KERNEL);</div><div class='del'>-		if (unlikely(!ds-&gt;bitmap))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ds-&gt;dev = dev;</div><div class='del'>-	ds-&gt;num_ports = n;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; ++i) {</div><div class='del'>-		ds-&gt;ports[i].index = i;</div><div class='del'>-		ds-&gt;ports[i].ds = ds;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ds;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_switch_alloc);</div><div class='del'>-</div><div class='del'>-int dsa_register_switch(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dsa2_mutex);</div><div class='del'>-	err = dsa_switch_probe(ds);</div><div class='del'>-	dsa_tree_put(ds-&gt;dst);</div><div class='del'>-	mutex_unlock(&amp;dsa2_mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_register_switch);</div><div class='del'>-</div><div class='del'>-static void dsa_switch_remove(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-	unsigned int index = ds-&gt;index;</div><div class='del'>-</div><div class='del'>-	dsa_tree_remove_switch(dst, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_unregister_switch(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;dsa2_mutex);</div><div class='del'>-	dsa_switch_remove(ds);</div><div class='del'>-	mutex_unlock(&amp;dsa2_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_unregister_switch);</div><div class='head'>diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h<br/>deleted file mode 100644<br/>index 3964c6f7a7c0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/dsa_priv.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/dsa_priv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/dsa/dsa_priv.h - Hardware switch handling</div><div class='del'>- * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DSA_PRIV_H</div><div class='del'>-#define __DSA_PRIV_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/netpoll.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DSA_NOTIFIER_AGEING_TIME,</div><div class='del'>-	DSA_NOTIFIER_BRIDGE_JOIN,</div><div class='del'>-	DSA_NOTIFIER_BRIDGE_LEAVE,</div><div class='del'>-	DSA_NOTIFIER_FDB_ADD,</div><div class='del'>-	DSA_NOTIFIER_FDB_DEL,</div><div class='del'>-	DSA_NOTIFIER_MDB_ADD,</div><div class='del'>-	DSA_NOTIFIER_MDB_DEL,</div><div class='del'>-	DSA_NOTIFIER_VLAN_ADD,</div><div class='del'>-	DSA_NOTIFIER_VLAN_DEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DSA_NOTIFIER_AGEING_TIME */</div><div class='del'>-struct dsa_notifier_ageing_time_info {</div><div class='del'>-	struct switchdev_trans *trans;</div><div class='del'>-	unsigned int ageing_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DSA_NOTIFIER_BRIDGE_* */</div><div class='del'>-struct dsa_notifier_bridge_info {</div><div class='del'>-	struct net_device *br;</div><div class='del'>-	int sw_index;</div><div class='del'>-	int port;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DSA_NOTIFIER_FDB_* */</div><div class='del'>-struct dsa_notifier_fdb_info {</div><div class='del'>-	int sw_index;</div><div class='del'>-	int port;</div><div class='del'>-	const unsigned char *addr;</div><div class='del'>-	u16 vid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DSA_NOTIFIER_MDB_* */</div><div class='del'>-struct dsa_notifier_mdb_info {</div><div class='del'>-	const struct switchdev_obj_port_mdb *mdb;</div><div class='del'>-	struct switchdev_trans *trans;</div><div class='del'>-	int sw_index;</div><div class='del'>-	int port;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DSA_NOTIFIER_VLAN_* */</div><div class='del'>-struct dsa_notifier_vlan_info {</div><div class='del'>-	const struct switchdev_obj_port_vlan *vlan;</div><div class='del'>-	struct switchdev_trans *trans;</div><div class='del'>-	int sw_index;</div><div class='del'>-	int port;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dsa_slave_priv {</div><div class='del'>-	/* Copy of CPU port xmit for faster access in slave transmit hot path */</div><div class='del'>-	struct sk_buff *	(*xmit)(struct sk_buff *skb,</div><div class='del'>-					struct net_device *dev);</div><div class='del'>-</div><div class='del'>-	struct pcpu_sw_netstats	*stats64;</div><div class='del'>-</div><div class='del'>-	/* DSA port data, such as switch, port index, etc. */</div><div class='del'>-	struct dsa_port		*dp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	struct netpoll		*netpoll;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* TC context */</div><div class='del'>-	struct list_head	mall_tc_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* dsa.c */</div><div class='del'>-const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);</div><div class='del'>-bool dsa_schedule_work(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-/* legacy.c */</div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)</div><div class='del'>-int dsa_legacy_register(void);</div><div class='del'>-void dsa_legacy_unregister(void);</div><div class='del'>-#else</div><div class='del'>-static inline int dsa_legacy_register(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dsa_legacy_unregister(void) { }</div><div class='del'>-#endif</div><div class='del'>-int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='del'>-		       struct net_device *dev,</div><div class='del'>-		       const unsigned char *addr, u16 vid,</div><div class='del'>-		       u16 flags);</div><div class='del'>-int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='del'>-		       struct net_device *dev,</div><div class='del'>-		       const unsigned char *addr, u16 vid);</div><div class='del'>-</div><div class='del'>-/* master.c */</div><div class='del'>-int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp);</div><div class='del'>-void dsa_master_teardown(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static inline struct net_device *dsa_master_find_slave(struct net_device *dev,</div><div class='del'>-						       int device, int port)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct dsa_port *slave_port;</div><div class='del'>-</div><div class='del'>-	if (device &lt; 0 || device &gt;= DSA_MAX_SWITCHES)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ds = dst-&gt;ds[device];</div><div class='del'>-	if (!ds)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (port &lt; 0 || port &gt;= ds-&gt;num_ports)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	slave_port = &amp;ds-&gt;ports[port];</div><div class='del'>-</div><div class='del'>-	if (unlikely(slave_port-&gt;type != DSA_PORT_TYPE_USER))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return slave_port-&gt;slave;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* port.c */</div><div class='del'>-int dsa_port_set_state(struct dsa_port *dp, u8 state,</div><div class='del'>-		       struct switchdev_trans *trans);</div><div class='del'>-int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);</div><div class='del'>-void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy);</div><div class='del'>-int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);</div><div class='del'>-void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);</div><div class='del'>-int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,</div><div class='del'>-			    struct switchdev_trans *trans);</div><div class='del'>-int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,</div><div class='del'>-			 struct switchdev_trans *trans);</div><div class='del'>-int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='del'>-		     u16 vid);</div><div class='del'>-int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='del'>-		     u16 vid);</div><div class='del'>-int dsa_port_fdb_dump(struct dsa_port *dp, dsa_fdb_dump_cb_t *cb, void *data);</div><div class='del'>-int dsa_port_mdb_add(const struct dsa_port *dp,</div><div class='del'>-		     const struct switchdev_obj_port_mdb *mdb,</div><div class='del'>-		     struct switchdev_trans *trans);</div><div class='del'>-int dsa_port_mdb_del(const struct dsa_port *dp,</div><div class='del'>-		     const struct switchdev_obj_port_mdb *mdb);</div><div class='del'>-int dsa_port_vlan_add(struct dsa_port *dp,</div><div class='del'>-		      const struct switchdev_obj_port_vlan *vlan,</div><div class='del'>-		      struct switchdev_trans *trans);</div><div class='del'>-int dsa_port_vlan_del(struct dsa_port *dp,</div><div class='del'>-		      const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-int dsa_port_link_register_of(struct dsa_port *dp);</div><div class='del'>-void dsa_port_link_unregister_of(struct dsa_port *dp);</div><div class='del'>-</div><div class='del'>-/* slave.c */</div><div class='del'>-extern const struct dsa_device_ops notag_netdev_ops;</div><div class='del'>-void dsa_slave_mii_bus_init(struct dsa_switch *ds);</div><div class='del'>-int dsa_slave_create(struct dsa_port *dp);</div><div class='del'>-void dsa_slave_destroy(struct net_device *slave_dev);</div><div class='del'>-int dsa_slave_suspend(struct net_device *slave_dev);</div><div class='del'>-int dsa_slave_resume(struct net_device *slave_dev);</div><div class='del'>-int dsa_slave_register_notifier(void);</div><div class='del'>-void dsa_slave_unregister_notifier(void);</div><div class='del'>-</div><div class='del'>-static inline struct dsa_port *dsa_slave_to_port(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return p-&gt;dp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct net_device *</div><div class='del'>-dsa_slave_to_master(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return dp-&gt;cpu_dp-&gt;master;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* switch.c */</div><div class='del'>-int dsa_switch_register_notifier(struct dsa_switch *ds);</div><div class='del'>-void dsa_switch_unregister_notifier(struct dsa_switch *ds);</div><div class='del'>-</div><div class='del'>-/* tag_brcm.c */</div><div class='del'>-extern const struct dsa_device_ops brcm_netdev_ops;</div><div class='del'>-extern const struct dsa_device_ops brcm_prepend_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_dsa.c */</div><div class='del'>-extern const struct dsa_device_ops dsa_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_edsa.c */</div><div class='del'>-extern const struct dsa_device_ops edsa_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_ksz.c */</div><div class='del'>-extern const struct dsa_device_ops ksz_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_lan9303.c */</div><div class='del'>-extern const struct dsa_device_ops lan9303_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_mtk.c */</div><div class='del'>-extern const struct dsa_device_ops mtk_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_qca.c */</div><div class='del'>-extern const struct dsa_device_ops qca_netdev_ops;</div><div class='del'>-</div><div class='del'>-/* tag_trailer.c */</div><div class='del'>-extern const struct dsa_device_ops trailer_netdev_ops;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c<br/>deleted file mode 100644<br/>index 42a7b85b84e1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/legacy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/legacy.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,748 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/dsa/legacy.c - Hardware switch handling</div><div class='del'>- * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- * Copyright (c) 2013 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/phy_fixed.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-/* switch driver registration ***********************************************/</div><div class='del'>-static DEFINE_MUTEX(dsa_switch_drivers_mutex);</div><div class='del'>-static LIST_HEAD(dsa_switch_drivers);</div><div class='del'>-</div><div class='del'>-void register_switch_driver(struct dsa_switch_driver *drv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-	list_add_tail(&amp;drv-&gt;list, &amp;dsa_switch_drivers);</div><div class='del'>-	mutex_unlock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(register_switch_driver);</div><div class='del'>-</div><div class='del'>-void unregister_switch_driver(struct dsa_switch_driver *drv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-	list_del_init(&amp;drv-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(unregister_switch_driver);</div><div class='del'>-</div><div class='del'>-static const struct dsa_switch_ops *</div><div class='del'>-dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,</div><div class='del'>-		 const char **_name, void **priv)</div><div class='del'>-{</div><div class='del'>-	const struct dsa_switch_ops *ret;</div><div class='del'>-	struct list_head *list;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	ret = NULL;</div><div class='del'>-	name = NULL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-	list_for_each(list, &amp;dsa_switch_drivers) {</div><div class='del'>-		const struct dsa_switch_ops *ops;</div><div class='del'>-		struct dsa_switch_driver *drv;</div><div class='del'>-</div><div class='del'>-		drv = list_entry(list, struct dsa_switch_driver, list);</div><div class='del'>-		ops = drv-&gt;ops;</div><div class='del'>-</div><div class='del'>-		name = ops-&gt;probe(parent, host_dev, sw_addr, priv);</div><div class='del'>-		if (name != NULL) {</div><div class='del'>-			ret = ops;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;dsa_switch_drivers_mutex);</div><div class='del'>-</div><div class='del'>-	*_name = name;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* basic switch operations **************************************************/</div><div class='del'>-static int dsa_cpu_dsa_setups(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	int ret, port;</div><div class='del'>-</div><div class='del'>-	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-		if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = dsa_port_link_register_of(&amp;ds-&gt;ports[port]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_switch_setup_one(struct dsa_switch *ds,</div><div class='del'>-				struct net_device *master)</div><div class='del'>-{</div><div class='del'>-	const struct dsa_switch_ops *ops = ds-&gt;ops;</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-	struct dsa_chip_data *cd = ds-&gt;cd;</div><div class='del'>-	bool valid_name_found = false;</div><div class='del'>-	int index = ds-&gt;index;</div><div class='del'>-	struct dsa_port *dp;</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Validate supplied switch configuration.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='del'>-		char *name;</div><div class='del'>-</div><div class='del'>-		dp = &amp;ds-&gt;ports[i];</div><div class='del'>-</div><div class='del'>-		name = cd-&gt;port_names[i];</div><div class='del'>-		if (name == NULL)</div><div class='del'>-			continue;</div><div class='del'>-		dp-&gt;name = name;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(name, "cpu")) {</div><div class='del'>-			if (dst-&gt;cpu_dp) {</div><div class='del'>-				netdev_err(master,</div><div class='del'>-					   "multiple cpu ports?!\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			dst-&gt;cpu_dp = &amp;ds-&gt;ports[i];</div><div class='del'>-			dst-&gt;cpu_dp-&gt;master = master;</div><div class='del'>-			dp-&gt;type = DSA_PORT_TYPE_CPU;</div><div class='del'>-		} else if (!strcmp(name, "dsa")) {</div><div class='del'>-			dp-&gt;type = DSA_PORT_TYPE_DSA;</div><div class='del'>-		} else {</div><div class='del'>-			dp-&gt;type = DSA_PORT_TYPE_USER;</div><div class='del'>-		}</div><div class='del'>-		valid_name_found = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!valid_name_found &amp;&amp; i == ds-&gt;num_ports)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Make the built-in MII bus mask match the number of ports,</div><div class='del'>-	 * switch drivers can override this later</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;phys_mii_mask |= dsa_user_ports(ds);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the CPU connects to this switch, set the switch tree</div><div class='del'>-	 * tagging protocol to the preferred tagging format of this</div><div class='del'>-	 * switch.</div><div class='del'>-	 */</div><div class='del'>-	if (dst-&gt;cpu_dp-&gt;ds == ds) {</div><div class='del'>-		const struct dsa_device_ops *tag_ops;</div><div class='del'>-		enum dsa_tag_protocol tag_protocol;</div><div class='del'>-</div><div class='del'>-		tag_protocol = ops-&gt;get_tag_protocol(ds, dst-&gt;cpu_dp-&gt;index);</div><div class='del'>-		tag_ops = dsa_resolve_tag_protocol(tag_protocol);</div><div class='del'>-		if (IS_ERR(tag_ops))</div><div class='del'>-			return PTR_ERR(tag_ops);</div><div class='del'>-</div><div class='del'>-		dst-&gt;cpu_dp-&gt;tag_ops = tag_ops;</div><div class='del'>-</div><div class='del'>-		/* Few copies for faster access in master receive hot path */</div><div class='del'>-		dst-&gt;cpu_dp-&gt;rcv = dst-&gt;cpu_dp-&gt;tag_ops-&gt;rcv;</div><div class='del'>-		dst-&gt;cpu_dp-&gt;dst = dst;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(ds-&gt;rtable, cd-&gt;rtable, sizeof(ds-&gt;rtable));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do basic register setup.</div><div class='del'>-	 */</div><div class='del'>-	ret = ops-&gt;setup(ds);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = dsa_switch_register_notifier(ds);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;slave_mii_bus &amp;&amp; ops-&gt;phy_read) {</div><div class='del'>-		ds-&gt;slave_mii_bus = devm_mdiobus_alloc(ds-&gt;dev);</div><div class='del'>-		if (!ds-&gt;slave_mii_bus)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		dsa_slave_mii_bus_init(ds);</div><div class='del'>-</div><div class='del'>-		ret = mdiobus_register(ds-&gt;slave_mii_bus);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create network devices for physical switch ports.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='del'>-		ds-&gt;ports[i].dn = cd-&gt;port_dn[i];</div><div class='del'>-		ds-&gt;ports[i].cpu_dp = dst-&gt;cpu_dp;</div><div class='del'>-</div><div class='del'>-		if (!dsa_is_user_port(ds, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = dsa_slave_create(&amp;ds-&gt;ports[i]);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",</div><div class='del'>-				   index, i, cd-&gt;port_names[i], ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Perform configuration of the CPU and DSA ports */</div><div class='del'>-	ret = dsa_cpu_dsa_setups(ds);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",</div><div class='del'>-			   index);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_switch *</div><div class='del'>-dsa_switch_setup(struct dsa_switch_tree *dst, struct net_device *master,</div><div class='del'>-		 int index, struct device *parent, struct device *host_dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_chip_data *cd = dst-&gt;pd-&gt;chip + index;</div><div class='del'>-	const struct dsa_switch_ops *ops;</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	int ret;</div><div class='del'>-	const char *name;</div><div class='del'>-	void *priv;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Probe for switch model.</div><div class='del'>-	 */</div><div class='del'>-	ops = dsa_switch_probe(parent, host_dev, cd-&gt;sw_addr, &amp;name, &amp;priv);</div><div class='del'>-	if (!ops) {</div><div class='del'>-		netdev_err(master, "[%d]: could not detect attached switch\n",</div><div class='del'>-			   index);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-	netdev_info(master, "[%d]: detected a %s switch\n",</div><div class='del'>-		    index, name);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate and initialise switch state.</div><div class='del'>-	 */</div><div class='del'>-	ds = dsa_switch_alloc(parent, DSA_MAX_PORTS);</div><div class='del'>-	if (!ds)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	ds-&gt;dst = dst;</div><div class='del'>-	ds-&gt;index = index;</div><div class='del'>-	ds-&gt;cd = cd;</div><div class='del'>-	ds-&gt;ops = ops;</div><div class='del'>-	ds-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	ret = dsa_switch_setup_one(ds, master);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	return ds;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_switch_destroy(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	int port;</div><div class='del'>-</div><div class='del'>-	/* Destroy network devices for physical switch ports. */</div><div class='del'>-	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-		if (!dsa_is_user_port(ds, port))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!ds-&gt;ports[port].slave)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dsa_slave_destroy(ds-&gt;ports[port].slave);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Disable configuration of the CPU and DSA ports */</div><div class='del'>-	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='del'>-		if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))</div><div class='del'>-			continue;</div><div class='del'>-		dsa_port_link_unregister_of(&amp;ds-&gt;ports[port]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;slave_mii_bus &amp;&amp; ds-&gt;ops-&gt;phy_read)</div><div class='del'>-		mdiobus_unregister(ds-&gt;slave_mii_bus);</div><div class='del'>-</div><div class='del'>-	dsa_switch_unregister_notifier(ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* platform driver init and cleanup *****************************************/</div><div class='del'>-static int dev_is_class(struct device *dev, void *class)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;class != NULL &amp;&amp; !strcmp(dev-&gt;class-&gt;name, class))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device *dev_find_class(struct device *parent, char *class)</div><div class='del'>-{</div><div class='del'>-	if (dev_is_class(parent, class)) {</div><div class='del'>-		get_device(parent);</div><div class='del'>-		return parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return device_find_child(parent, class, dev_is_class);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device *d;</div><div class='del'>-</div><div class='del'>-	d = dev_find_class(dev, "mdio_bus");</div><div class='del'>-	if (d != NULL) {</div><div class='del'>-		struct mii_bus *bus;</div><div class='del'>-</div><div class='del'>-		bus = to_mii_bus(d);</div><div class='del'>-		put_device(d);</div><div class='del'>-</div><div class='del'>-		return bus;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_host_dev_to_mii_bus);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,</div><div class='del'>-					struct dsa_chip_data *cd,</div><div class='del'>-					int chip_index, int port_index,</div><div class='del'>-					struct device_node *link)</div><div class='del'>-{</div><div class='del'>-	const __be32 *reg;</div><div class='del'>-	int link_sw_addr;</div><div class='del'>-	struct device_node *parent_sw;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	parent_sw = of_get_parent(link);</div><div class='del'>-	if (!parent_sw)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	reg = of_get_property(parent_sw, "reg", &amp;len);</div><div class='del'>-	if (!reg || (len != sizeof(*reg) * 2))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the destination switch number from the second field of its 'reg'</div><div class='del'>-	 * property, i.e. for "reg = &lt;0x19 1&gt;" sw_addr is '1'.</div><div class='del'>-	 */</div><div class='del'>-	link_sw_addr = be32_to_cpup(reg + 1);</div><div class='del'>-</div><div class='del'>-	if (link_sw_addr &gt;= pd-&gt;nr_chips)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cd-&gt;rtable[link_sw_addr] = port_index;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_of_probe_links(struct dsa_platform_data *pd,</div><div class='del'>-			      struct dsa_chip_data *cd,</div><div class='del'>-			      int chip_index, int port_index,</div><div class='del'>-			      struct device_node *port,</div><div class='del'>-			      const char *port_name)</div><div class='del'>-{</div><div class='del'>-	struct device_node *link;</div><div class='del'>-	int link_index;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (link_index = 0;; link_index++) {</div><div class='del'>-		link = of_parse_phandle(port, "link", link_index);</div><div class='del'>-		if (!link)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(port_name, "dsa") &amp;&amp; pd-&gt;nr_chips &gt; 1) {</div><div class='del'>-			ret = dsa_of_setup_routing_table(pd, cd, chip_index,</div><div class='del'>-							 port_index, link);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_of_free_platform_data(struct dsa_platform_data *pd)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int port_index;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pd-&gt;nr_chips; i++) {</div><div class='del'>-		port_index = 0;</div><div class='del'>-		while (port_index &lt; DSA_MAX_PORTS) {</div><div class='del'>-			kfree(pd-&gt;chip[i].port_names[port_index]);</div><div class='del'>-			port_index++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Drop our reference to the MDIO bus device */</div><div class='del'>-		if (pd-&gt;chip[i].host_dev)</div><div class='del'>-			put_device(pd-&gt;chip[i].host_dev);</div><div class='del'>-	}</div><div class='del'>-	kfree(pd-&gt;chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_of_probe(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np = dev-&gt;of_node;</div><div class='del'>-	struct device_node *child, *mdio, *ethernet, *port;</div><div class='del'>-	struct mii_bus *mdio_bus, *mdio_bus_switch;</div><div class='del'>-	struct net_device *ethernet_dev;</div><div class='del'>-	struct dsa_platform_data *pd;</div><div class='del'>-	struct dsa_chip_data *cd;</div><div class='del'>-	const char *port_name;</div><div class='del'>-	int chip_index, port_index;</div><div class='del'>-	const unsigned int *sw_addr, *port_reg;</div><div class='del'>-	u32 eeprom_len;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mdio = of_parse_phandle(np, "dsa,mii-bus", 0);</div><div class='del'>-	if (!mdio)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mdio_bus = of_mdio_find_bus(mdio);</div><div class='del'>-	if (!mdio_bus)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-	ethernet = of_parse_phandle(np, "dsa,ethernet", 0);</div><div class='del'>-	if (!ethernet) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_put_mdio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ethernet_dev = of_find_net_device_by_node(ethernet);</div><div class='del'>-	if (!ethernet_dev) {</div><div class='del'>-		ret = -EPROBE_DEFER;</div><div class='del'>-		goto out_put_mdio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd = kzalloc(sizeof(*pd), GFP_KERNEL);</div><div class='del'>-	if (!pd) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_put_ethernet;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;platform_data = pd;</div><div class='del'>-	pd-&gt;of_netdev = ethernet_dev;</div><div class='del'>-	pd-&gt;nr_chips = of_get_available_child_count(np);</div><div class='del'>-	if (pd-&gt;nr_chips &gt; DSA_MAX_SWITCHES)</div><div class='del'>-		pd-&gt;nr_chips = DSA_MAX_SWITCHES;</div><div class='del'>-</div><div class='del'>-	pd-&gt;chip = kcalloc(pd-&gt;nr_chips, sizeof(struct dsa_chip_data),</div><div class='del'>-			   GFP_KERNEL);</div><div class='del'>-	if (!pd-&gt;chip) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chip_index = -1;</div><div class='del'>-	for_each_available_child_of_node(np, child) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		chip_index++;</div><div class='del'>-		cd = &amp;pd-&gt;chip[chip_index];</div><div class='del'>-</div><div class='del'>-		cd-&gt;of_node = child;</div><div class='del'>-</div><div class='del'>-		/* Initialize the routing table */</div><div class='del'>-		for (i = 0; i &lt; DSA_MAX_SWITCHES; ++i)</div><div class='del'>-			cd-&gt;rtable[i] = DSA_RTABLE_NONE;</div><div class='del'>-</div><div class='del'>-		/* When assigning the host device, increment its refcount */</div><div class='del'>-		cd-&gt;host_dev = get_device(&amp;mdio_bus-&gt;dev);</div><div class='del'>-</div><div class='del'>-		sw_addr = of_get_property(child, "reg", NULL);</div><div class='del'>-		if (!sw_addr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cd-&gt;sw_addr = be32_to_cpup(sw_addr);</div><div class='del'>-		if (cd-&gt;sw_addr &gt;= PHY_MAX_ADDR)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!of_property_read_u32(child, "eeprom-length", &amp;eeprom_len))</div><div class='del'>-			cd-&gt;eeprom_len = eeprom_len;</div><div class='del'>-</div><div class='del'>-		mdio = of_parse_phandle(child, "mii-bus", 0);</div><div class='del'>-		if (mdio) {</div><div class='del'>-			mdio_bus_switch = of_mdio_find_bus(mdio);</div><div class='del'>-			if (!mdio_bus_switch) {</div><div class='del'>-				ret = -EPROBE_DEFER;</div><div class='del'>-				goto out_free_chip;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Drop the mdio_bus device ref, replacing the host</div><div class='del'>-			 * device with the mdio_bus_switch device, keeping</div><div class='del'>-			 * the refcount from of_mdio_find_bus() above.</div><div class='del'>-			 */</div><div class='del'>-			put_device(cd-&gt;host_dev);</div><div class='del'>-			cd-&gt;host_dev = &amp;mdio_bus_switch-&gt;dev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for_each_available_child_of_node(child, port) {</div><div class='del'>-			port_reg = of_get_property(port, "reg", NULL);</div><div class='del'>-			if (!port_reg)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			port_index = be32_to_cpup(port_reg);</div><div class='del'>-			if (port_index &gt;= DSA_MAX_PORTS)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			port_name = of_get_property(port, "label", NULL);</div><div class='del'>-			if (!port_name)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			cd-&gt;port_dn[port_index] = port;</div><div class='del'>-</div><div class='del'>-			cd-&gt;port_names[port_index] = kstrdup(port_name,</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-			if (!cd-&gt;port_names[port_index]) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto out_free_chip;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = dsa_of_probe_links(pd, cd, chip_index,</div><div class='del'>-						 port_index, port, port_name);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out_free_chip;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The individual chips hold their own refcount on the mdio bus,</div><div class='del'>-	 * so drop ours */</div><div class='del'>-	put_device(&amp;mdio_bus-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_free_chip:</div><div class='del'>-	dsa_of_free_platform_data(pd);</div><div class='del'>-out_free:</div><div class='del'>-	kfree(pd);</div><div class='del'>-	dev-&gt;platform_data = NULL;</div><div class='del'>-out_put_ethernet:</div><div class='del'>-	put_device(&amp;ethernet_dev-&gt;dev);</div><div class='del'>-out_put_mdio:</div><div class='del'>-	put_device(&amp;mdio_bus-&gt;dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_of_remove(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_platform_data *pd = dev-&gt;platform_data;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;of_node)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dsa_of_free_platform_data(pd);</div><div class='del'>-	put_device(&amp;pd-&gt;of_netdev-&gt;dev);</div><div class='del'>-	kfree(pd);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int dsa_of_probe(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dsa_of_remove(struct device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,</div><div class='del'>-			 struct device *parent, struct dsa_platform_data *pd)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned configured = 0;</div><div class='del'>-</div><div class='del'>-	dst-&gt;pd = pd;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pd-&gt;nr_chips; i++) {</div><div class='del'>-		struct dsa_switch *ds;</div><div class='del'>-</div><div class='del'>-		ds = dsa_switch_setup(dst, dev, i, parent, pd-&gt;chip[i].host_dev);</div><div class='del'>-		if (IS_ERR(ds)) {</div><div class='del'>-			netdev_err(dev, "[%d]: couldn't create dsa switch instance (error %ld)\n",</div><div class='del'>-				   i, PTR_ERR(ds));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dst-&gt;ds[i] = ds;</div><div class='del'>-</div><div class='del'>-		++configured;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If no switch was found, exit cleanly</div><div class='del'>-	 */</div><div class='del'>-	if (!configured)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-	return dsa_master_setup(dst-&gt;cpu_dp-&gt;master, dst-&gt;cpu_dp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_platform_data *pd = pdev-&gt;dev.platform_data;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dsa_switch_tree *dst;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;dev.of_node) {</div><div class='del'>-		ret = dsa_of_probe(&amp;pdev-&gt;dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		pd = pdev-&gt;dev.platform_data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pd == NULL || (pd-&gt;netdev == NULL &amp;&amp; pd-&gt;of_netdev == NULL))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (pd-&gt;of_netdev) {</div><div class='del'>-		dev = pd-&gt;of_netdev;</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-	} else {</div><div class='del'>-		dev = dsa_dev_to_net_device(pd-&gt;netdev);</div><div class='del'>-	}</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		ret = -EPROBE_DEFER;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;dsa_ptr != NULL) {</div><div class='del'>-		dev_put(dev);</div><div class='del'>-		ret = -EEXIST;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*dst), GFP_KERNEL);</div><div class='del'>-	if (dst == NULL) {</div><div class='del'>-		dev_put(dev);</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, dst);</div><div class='del'>-</div><div class='del'>-	ret = dsa_setup_dst(dst, dev, &amp;pdev-&gt;dev, pd);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_put(dev);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	dsa_of_remove(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_remove_dst(struct dsa_switch_tree *dst)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dsa_master_teardown(dst-&gt;cpu_dp-&gt;master);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dst-&gt;pd-&gt;nr_chips; i++) {</div><div class='del'>-		struct dsa_switch *ds = dst-&gt;ds[i];</div><div class='del'>-</div><div class='del'>-		if (ds)</div><div class='del'>-			dsa_switch_destroy(ds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_put(dst-&gt;cpu_dp-&gt;master);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch_tree *dst = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	dsa_remove_dst(dst);</div><div class='del'>-	dsa_of_remove(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_shutdown(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int dsa_suspend(struct device *d)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(d);</div><div class='del'>-	struct dsa_switch_tree *dst = platform_get_drvdata(pdev);</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dst-&gt;pd-&gt;nr_chips; i++) {</div><div class='del'>-		struct dsa_switch *ds = dst-&gt;ds[i];</div><div class='del'>-</div><div class='del'>-		if (ds != NULL)</div><div class='del'>-			ret = dsa_switch_suspend(ds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_resume(struct device *d)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(d);</div><div class='del'>-	struct dsa_switch_tree *dst = platform_get_drvdata(pdev);</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dst-&gt;pd-&gt;nr_chips; i++) {</div><div class='del'>-		struct dsa_switch *ds = dst-&gt;ds[i];</div><div class='del'>-</div><div class='del'>-		if (ds != NULL)</div><div class='del'>-			ret = dsa_switch_resume(ds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(dsa_pm_ops, dsa_suspend, dsa_resume);</div><div class='del'>-</div><div class='del'>-static const struct of_device_id dsa_of_match_table[] = {</div><div class='del'>-	{ .compatible = "marvell,dsa", },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, dsa_of_match_table);</div><div class='del'>-</div><div class='del'>-static struct platform_driver dsa_driver = {</div><div class='del'>-	.probe		= dsa_probe,</div><div class='del'>-	.remove		= dsa_remove,</div><div class='del'>-	.shutdown	= dsa_shutdown,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	= "dsa",</div><div class='del'>-		.of_match_table = dsa_of_match_table,</div><div class='del'>-		.pm	= &amp;dsa_pm_ops,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int dsa_legacy_register(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;dsa_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_legacy_unregister(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;dsa_driver);</div><div class='del'>-}</div><div class='head'>diff --git a/net/dsa/master.c b/net/dsa/master.c<br/>deleted file mode 100644<br/>index c90ee3227dea..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/master.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/master.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Handling of a master device, switching frames via its switch fabric CPU port</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2017 Savoir-faire Linux Inc.</div><div class='del'>- *	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-static void dsa_master_get_ethtool_stats(struct net_device *dev,</div><div class='del'>-					 struct ethtool_stats *stats,</div><div class='del'>-					 uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='del'>-	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='del'>-	int port = cpu_dp-&gt;index;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_ethtool_stats) {</div><div class='del'>-		count = ops-&gt;get_sset_count(dev, ETH_SS_STATS);</div><div class='del'>-		ops-&gt;get_ethtool_stats(dev, stats, data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_ethtool_stats)</div><div class='del'>-		ds-&gt;ops-&gt;get_ethtool_stats(ds, port, data + count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_master_get_ethtool_phy_stats(struct net_device *dev,</div><div class='del'>-					     struct ethtool_stats *stats,</div><div class='del'>-					     uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='del'>-	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='del'>-	int port = cpu_dp-&gt;index;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phydev &amp;&amp; !ops-&gt;get_ethtool_phy_stats) {</div><div class='del'>-		count = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='del'>-		if (count &gt;= 0)</div><div class='del'>-			phy_ethtool_get_stats(dev-&gt;phydev, stats, data);</div><div class='del'>-	} else if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_ethtool_phy_stats) {</div><div class='del'>-		count = ops-&gt;get_sset_count(dev, ETH_SS_PHY_STATS);</div><div class='del'>-		ops-&gt;get_ethtool_phy_stats(dev, stats, data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (count &lt; 0)</div><div class='del'>-		count = 0;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_ethtool_phy_stats)</div><div class='del'>-		ds-&gt;ops-&gt;get_ethtool_phy_stats(ds, port, data + count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_master_get_sset_count(struct net_device *dev, int sset)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='del'>-	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	if (sset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='del'>-	    !ops-&gt;get_ethtool_phy_stats)</div><div class='del'>-		count = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='del'>-	else if (ops-&gt;get_sset_count)</div><div class='del'>-		count = ops-&gt;get_sset_count(dev, sset);</div><div class='del'>-</div><div class='del'>-	if (count &lt; 0)</div><div class='del'>-		count = 0;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_sset_count)</div><div class='del'>-		count += ds-&gt;ops-&gt;get_sset_count(ds, cpu_dp-&gt;index, sset);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,</div><div class='del'>-				   uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	const struct ethtool_ops *ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='del'>-	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='del'>-	int port = cpu_dp-&gt;index;</div><div class='del'>-	int len = ETH_GSTRING_LEN;</div><div class='del'>-	int mcount = 0, count;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	uint8_t pfx[4];</div><div class='del'>-	uint8_t *ndata;</div><div class='del'>-</div><div class='del'>-	snprintf(pfx, sizeof(pfx), "p%.2d", port);</div><div class='del'>-	/* We do not want to be NULL-terminated, since this is a prefix */</div><div class='del'>-	pfx[sizeof(pfx) - 1] = '_';</div><div class='del'>-</div><div class='del'>-	if (stringset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='del'>-	    !ops-&gt;get_ethtool_phy_stats) {</div><div class='del'>-		mcount = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='del'>-		if (mcount &lt; 0)</div><div class='del'>-			mcount = 0;</div><div class='del'>-		else</div><div class='del'>-			phy_ethtool_get_strings(dev-&gt;phydev, data);</div><div class='del'>-	} else if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_strings) {</div><div class='del'>-		mcount = ops-&gt;get_sset_count(dev, stringset);</div><div class='del'>-		if (mcount &lt; 0)</div><div class='del'>-			mcount = 0;</div><div class='del'>-		ops-&gt;get_strings(dev, stringset, data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_strings) {</div><div class='del'>-		ndata = data + mcount * len;</div><div class='del'>-		/* This function copies ETH_GSTRINGS_LEN bytes, we will mangle</div><div class='del'>-		 * the output after to prepend our CPU port prefix we</div><div class='del'>-		 * constructed earlier</div><div class='del'>-		 */</div><div class='del'>-		ds-&gt;ops-&gt;get_strings(ds, port, stringset, ndata);</div><div class='del'>-		count = ds-&gt;ops-&gt;get_sset_count(ds, port, stringset);</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			memmove(ndata + (i * len + sizeof(pfx)),</div><div class='del'>-				ndata + i * len, len - sizeof(pfx));</div><div class='del'>-			memcpy(ndata + i * len, pfx, sizeof(pfx));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_master_ethtool_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-	struct dsa_switch *ds = cpu_dp-&gt;ds;</div><div class='del'>-	struct ethtool_ops *ops;</div><div class='del'>-</div><div class='del'>-	ops = devm_kzalloc(ds-&gt;dev, sizeof(*ops), GFP_KERNEL);</div><div class='del'>-	if (!ops)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cpu_dp-&gt;orig_ethtool_ops = dev-&gt;ethtool_ops;</div><div class='del'>-	if (cpu_dp-&gt;orig_ethtool_ops)</div><div class='del'>-		memcpy(ops, cpu_dp-&gt;orig_ethtool_ops, sizeof(*ops));</div><div class='del'>-</div><div class='del'>-	ops-&gt;get_sset_count = dsa_master_get_sset_count;</div><div class='del'>-	ops-&gt;get_ethtool_stats = dsa_master_get_ethtool_stats;</div><div class='del'>-	ops-&gt;get_strings = dsa_master_get_strings;</div><div class='del'>-	ops-&gt;get_ethtool_phy_stats = dsa_master_get_ethtool_phy_stats;</div><div class='del'>-</div><div class='del'>-	dev-&gt;ethtool_ops = ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_master_ethtool_teardown(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='del'>-</div><div class='del'>-	dev-&gt;ethtool_ops = cpu_dp-&gt;orig_ethtool_ops;</div><div class='del'>-	cpu_dp-&gt;orig_ethtool_ops = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)</div><div class='del'>-{</div><div class='del'>-	/* If we use a tagging format that doesn't have an ethertype</div><div class='del'>-	 * field, make sure that all packets from this point on get</div><div class='del'>-	 * sent to the tag format's receive function.</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	dev-&gt;dsa_ptr = cpu_dp;</div><div class='del'>-</div><div class='del'>-	return dsa_master_ethtool_setup(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_master_teardown(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	dsa_master_ethtool_teardown(dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;dsa_ptr = NULL;</div><div class='del'>-</div><div class='del'>-	/* If we used a tagging format that doesn't have an ethertype</div><div class='del'>-	 * field, make sure that all packets from this point get sent</div><div class='del'>-	 * without the tag and go through the regular receive path.</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-}</div><div class='head'>diff --git a/net/dsa/netlink.c b/net/dsa/netlink.c<br/>new file mode 100644<br/>index 000000000000..1332e56349e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2022 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+static const struct nla_policy dsa_policy[IFLA_DSA_MAX + 1] = {</div><div class='add'>+	[IFLA_DSA_CONDUIT]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dsa_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			  struct nlattr *data[],</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_DSA_CONDUIT]) {</div><div class='add'>+		u32 ifindex = nla_get_u32(data[IFLA_DSA_CONDUIT]);</div><div class='add'>+		struct net_device *conduit;</div><div class='add'>+</div><div class='add'>+		conduit = __dev_get_by_index(dev_net(dev), ifindex);</div><div class='add'>+		if (!conduit)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_change_conduit(dev, conduit, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t dsa_get_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u32)) +	/* IFLA_DSA_CONDUIT  */</div><div class='add'>+	       0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_DSA_CONDUIT, conduit-&gt;ifindex))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtnl_link_ops dsa_link_ops __read_mostly = {</div><div class='add'>+	.kind			= "dsa",</div><div class='add'>+	.priv_size		= sizeof(struct dsa_port),</div><div class='add'>+	.maxtype		= IFLA_DSA_MAX,</div><div class='add'>+	.policy			= dsa_policy,</div><div class='add'>+	.changelink		= dsa_changelink,</div><div class='add'>+	.get_size		= dsa_get_size,</div><div class='add'>+	.fill_info		= dsa_fill_info,</div><div class='add'>+	.netns_refund		= true,</div><div class='add'>+};</div><div class='head'>diff --git a/net/dsa/netlink.h b/net/dsa/netlink.h<br/>new file mode 100644<br/>index 000000000000..7eda2fa15722<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/netlink.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_NETLINK_H</div><div class='add'>+#define __DSA_NETLINK_H</div><div class='add'>+</div><div class='add'>+extern struct rtnl_link_ops dsa_link_ops __read_mostly;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/port.c b/net/dsa/port.c<br/>index ed0595459df1..ca3a7f52229b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/port.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/port.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/port.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/port.c</a></div><div class='hunk'>@@ -1,48 +1,151 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Handling of a single switch port</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2017 Savoir-faire Linux Inc.</div><div class='ctx'>  *	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='add'>+#include "dsa.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "switch.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_port_notify - Notify the switching fabric of changes to a port</div><div class='add'>+ * @dp: port on which change occurred</div><div class='add'>+ * @e: event, must be of type DSA_NOTIFIER_*</div><div class='add'>+ * @v: event-specific value.</div><div class='add'>+ *</div><div class='add'>+ * Notify all switches in the DSA tree that this port's switch belongs to,</div><div class='add'>+ * including this switch itself, of an event. Allows the other switches to</div><div class='add'>+ * reconfigure themselves for cross-chip operations. Can also be used to</div><div class='add'>+ * reconfigure ports without net_devices (CPU ports, DSA links) whenever</div><div class='add'>+ * a user port's state changes.</div><div class='add'>+ */</div><div class='ctx'> static int dsa_port_notify(const struct dsa_port *dp, unsigned long e, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct raw_notifier_head *nh = &amp;dp-&gt;ds-&gt;dst-&gt;nh;</div><div class='add'>+	return dsa_tree_notify(dp-&gt;ds-&gt;dst, e, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_notify_bridge_fdb_flush(const struct dsa_port *dp, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_device *brport_dev = dsa_port_to_bridge_port(dp);</div><div class='add'>+	struct switchdev_notifier_fdb_info info = {</div><div class='add'>+		.vid = vid,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* When the port becomes standalone it has already left the bridge.</div><div class='add'>+	 * Don't notify the bridge in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!brport_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	call_switchdev_notifiers(SWITCHDEV_FDB_FLUSH_TO_BRIDGE,</div><div class='add'>+				 brport_dev, &amp;info.info, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_fast_age(const struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_fast_age)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ds-&gt;ops-&gt;port_fast_age(ds, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* flush all VLANs */</div><div class='add'>+	dsa_port_notify_bridge_fdb_flush(dp, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_vlan_fast_age(const struct dsa_port *dp, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_vlan_fast_age)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_vlan_fast_age(ds, dp-&gt;index, vid);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		dsa_port_notify_bridge_fdb_flush(dp, vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_msti_fast_age(const struct dsa_port *dp, u16 msti)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(vids, VLAN_N_VID) = { 0 };</div><div class='add'>+	int err, vid;</div><div class='add'>+</div><div class='add'>+	err = br_mst_get_info(dsa_port_bridge_dev_get(dp), msti, vids);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(vid, vids, VLAN_N_VID) {</div><div class='add'>+		err = dsa_port_vlan_fast_age(dp, vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dsa_port_can_configure_learning(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_brport_flags flags = {</div><div class='add'>+		.mask = BR_LEARNING,</div><div class='add'>+	};</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = raw_notifier_call_chain(nh, e, v);</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_bridge_flags || !ds-&gt;ops-&gt;port_pre_bridge_flags)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return notifier_to_errno(err);</div><div class='add'>+	err = ds-&gt;ops-&gt;port_pre_bridge_flags(ds, dp-&gt;index, flags, NULL);</div><div class='add'>+	return !err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_set_state(struct dsa_port *dp, u8 state,</div><div class='del'>-		       struct switchdev_trans *trans)</div><div class='add'>+bool dsa_port_supports_hwtstamp(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct kernel_hwtstamp_config config = {};</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_hwtstamp_get || !ds-&gt;ops-&gt;port_hwtstamp_set)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* "See through" shim implementations of the "get" method. */</div><div class='add'>+	err = ds-&gt;ops-&gt;port_hwtstamp_get(ds, dp-&gt;index, &amp;config);</div><div class='add'>+	return err != -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_set_state(struct dsa_port *dp, u8 state, bool do_fast_age)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	int port = dp-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='del'>-		return ds-&gt;ops-&gt;port_stp_state_set ? 0 : -EOPNOTSUPP;</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_stp_state_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;ops-&gt;port_stp_state_set)</div><div class='del'>-		ds-&gt;ops-&gt;port_stp_state_set(ds, port, state);</div><div class='add'>+	ds-&gt;ops-&gt;port_stp_state_set(ds, port, state);</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;ops-&gt;port_fast_age) {</div><div class='add'>+	if (!dsa_port_can_configure_learning(dp) ||</div><div class='add'>+	    (do_fast_age &amp;&amp; dp-&gt;learning)) {</div><div class='ctx'> 		/* Fast age FDB entries or flush appropriate forwarding database</div><div class='ctx'> 		 * for the given port, if we are moving it from Learning or</div><div class='ctx'> 		 * Forwarding state, to Disabled or Blocking or Listening state.</div><div class='add'>+		 * Ports that were standalone before the STP state change don't</div><div class='add'>+		 * need to fast age the FDB, since address learning is off in</div><div class='add'>+		 * standalone mode.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if ((dp-&gt;stp_state == BR_STATE_LEARNING ||</div><div class='hunk'>@@ -50,7 +153,7 @@ int dsa_port_set_state(struct dsa_port *dp, u8 state,</div><div class='ctx'> 		    (state == BR_STATE_DISABLED ||</div><div class='ctx'> 		     state == BR_STATE_BLOCKING ||</div><div class='ctx'> 		     state == BR_STATE_LISTENING))</div><div class='del'>-			ds-&gt;ops-&gt;port_fast_age(ds, port);</div><div class='add'>+			dsa_port_fast_age(dp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;stp_state = state;</div><div class='hunk'>@@ -58,18 +161,57 @@ int dsa_port_set_state(struct dsa_port *dp, u8 state,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dsa_port_set_state_now(struct dsa_port *dp, u8 state)</div><div class='add'>+static void dsa_port_set_state_now(struct dsa_port *dp, u8 state,</div><div class='add'>+				   bool do_fast_age)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = dsa_port_set_state(dp, state, NULL);</div><div class='add'>+	err = dsa_port_set_state(dp, state, do_fast_age);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='add'>+		dev_err(ds-&gt;dev, "port %d failed to set STP state %u: %pe\n",</div><div class='add'>+			dp-&gt;index, state, ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_set_mst_state(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_mst_state *state,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	u8 prev_state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mst_state_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = br_mst_get_state(dsa_port_to_bridge_port(dp), state-&gt;msti,</div><div class='add'>+			       &amp;prev_state);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_mst_state_set(ds, dp-&gt;index, state);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!(dp-&gt;learning &amp;&amp;</div><div class='add'>+	      (prev_state == BR_STATE_LEARNING ||</div><div class='add'>+	       prev_state == BR_STATE_FORWARDING) &amp;&amp;</div><div class='add'>+	      (state-&gt;state == BR_STATE_DISABLED ||</div><div class='add'>+	       state-&gt;state == BR_STATE_BLOCKING ||</div><div class='add'>+	       state-&gt;state == BR_STATE_LISTENING)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_msti_fast_age(dp, state-&gt;msti);</div><div class='ctx'> 	if (err)</div><div class='del'>-		pr_err("DSA: failed to set STP state %u (%d)\n", state, err);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Unable to flush associated VLANs");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)</div><div class='add'>+int dsa_port_enable_rt(struct dsa_port *dp, struct phy_device *phy)</div><div class='ctx'> {</div><div class='del'>-	u8 stp_state = dp-&gt;bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	int port = dp-&gt;index;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -80,113 +222,777 @@ int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dsa_port_set_state_now(dp, stp_state);</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		dsa_port_set_state_now(dp, BR_STATE_FORWARDING, false);</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;pl)</div><div class='add'>+		phylink_start(dp-&gt;pl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)</div><div class='add'>+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = dsa_port_enable_rt(dp, phy);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_disable_rt(struct dsa_port *dp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	int port = dp-&gt;index;</div><div class='ctx'> </div><div class='del'>-	dsa_port_set_state_now(dp, BR_STATE_DISABLED);</div><div class='add'>+	if (dp-&gt;pl)</div><div class='add'>+		phylink_stop(dp-&gt;pl);</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		dsa_port_set_state_now(dp, BR_STATE_DISABLED, false);</div><div class='ctx'> </div><div class='ctx'> 	if (ds-&gt;ops-&gt;port_disable)</div><div class='del'>-		ds-&gt;ops-&gt;port_disable(ds, port, phy);</div><div class='add'>+		ds-&gt;ops-&gt;port_disable(ds, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_disable(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dsa_port_disable_rt(dp);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_reset_vlan_filtering(struct dsa_port *dp,</div><div class='add'>+					  struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack extack = {0};</div><div class='add'>+	bool change_vlan_filtering = false;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	bool vlan_filtering;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;needs_standalone_vlan_filtering &amp;&amp;</div><div class='add'>+	    !br_vlan_enabled(bridge.dev)) {</div><div class='add'>+		change_vlan_filtering = true;</div><div class='add'>+		vlan_filtering = true;</div><div class='add'>+	} else if (!ds-&gt;needs_standalone_vlan_filtering &amp;&amp;</div><div class='add'>+		   br_vlan_enabled(bridge.dev)) {</div><div class='add'>+		change_vlan_filtering = true;</div><div class='add'>+		vlan_filtering = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the bridge was vlan_filtering, the bridge core doesn't trigger an</div><div class='add'>+	 * event for changing vlan_filtering setting upon user ports leaving</div><div class='add'>+	 * it. That is a good thing, because that lets us handle it and also</div><div class='add'>+	 * handle the case where the switch's vlan_filtering setting is global</div><div class='add'>+	 * (not per port). When that happens, the correct moment to trigger the</div><div class='add'>+	 * vlan_filtering callback is only when the last port leaves the last</div><div class='add'>+	 * VLAN-aware bridge.</div><div class='add'>+	 */</div><div class='add'>+	if (change_vlan_filtering &amp;&amp; ds-&gt;vlan_filtering_is_global) {</div><div class='add'>+		dsa_switch_for_each_port(other_dp, ds) {</div><div class='add'>+			struct net_device *br = dsa_port_bridge_dev_get(other_dp);</div><div class='add'>+</div><div class='add'>+			if (br &amp;&amp; br_vlan_enabled(br)) {</div><div class='add'>+				change_vlan_filtering = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!change_vlan_filtering)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_vlan_filtering(dp, vlan_filtering, &amp;extack);</div><div class='add'>+	if (extack._msg) {</div><div class='add'>+		dev_err(ds-&gt;dev, "port %d: %s\n", dp-&gt;index,</div><div class='add'>+			extack._msg);</div><div class='add'>+	}</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"port %d failed to reset VLAN filtering to %d: %pe\n",</div><div class='add'>+		       dp-&gt;index, vlan_filtering, ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_inherit_brport_flags(struct dsa_port *dp,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const unsigned long mask = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+				   BR_BCAST_FLOOD | BR_PORT_LOCKED;</div><div class='add'>+	struct net_device *brport_dev = dsa_port_to_bridge_port(dp);</div><div class='add'>+	int flag, err;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(flag, &amp;mask, 32) {</div><div class='add'>+		struct switchdev_brport_flags flags = {0};</div><div class='add'>+</div><div class='add'>+		flags.mask = BIT(flag);</div><div class='add'>+</div><div class='add'>+		if (br_port_flag_is_set(brport_dev, BIT(flag)))</div><div class='add'>+			flags.val = BIT(flag);</div><div class='add'>+</div><div class='add'>+		err = dsa_port_bridge_flags(dp, flags, extack);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_clear_brport_flags(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	const unsigned long val = BR_FLOOD | BR_MCAST_FLOOD | BR_BCAST_FLOOD;</div><div class='add'>+	const unsigned long mask = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+				   BR_BCAST_FLOOD | BR_PORT_LOCKED;</div><div class='add'>+	int flag, err;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(flag, &amp;mask, 32) {</div><div class='add'>+		struct switchdev_brport_flags flags = {0};</div><div class='add'>+</div><div class='add'>+		flags.mask = BIT(flag);</div><div class='add'>+		flags.val = val &amp; BIT(flag);</div><div class='add'>+</div><div class='add'>+		err = dsa_port_bridge_flags(dp, flags, NULL);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+				"failed to clear bridge port flag %lu: %pe\n",</div><div class='add'>+				flags.val, ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_switchdev_sync_attrs(struct dsa_port *dp,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *brport_dev = dsa_port_to_bridge_port(dp);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_inherit_brport_flags(dp, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_set_state(dp, br_port_get_stp_state(brport_dev), false);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_vlan_filtering(dp, br_vlan_enabled(br), extack);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_ageing_time(dp, br_get_ageing_time(br));</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_switchdev_unsync_attrs(struct dsa_port *dp,</div><div class='add'>+					    struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	/* Configure the port for standalone mode (no address learning,</div><div class='add'>+	 * flood everything).</div><div class='add'>+	 * The bridge only emits SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS events</div><div class='add'>+	 * when the user requests it through netlink or sysfs, but not</div><div class='add'>+	 * automatically at port join or leave, so we need to handle resetting</div><div class='add'>+	 * the brport flags ourselves. But we even prefer it that way, because</div><div class='add'>+	 * otherwise, some setups might never get the notification they need,</div><div class='add'>+	 * for example, when a port leaves a LAG that offloads the bridge,</div><div class='add'>+	 * it becomes standalone, but as far as the bridge is concerned, no</div><div class='add'>+	 * port ever left.</div><div class='add'>+	 */</div><div class='add'>+	dsa_port_clear_brport_flags(dp);</div><div class='add'>+</div><div class='add'>+	/* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,</div><div class='add'>+	 * so allow it to be in BR_STATE_FORWARDING to be kept functional</div><div class='add'>+	 */</div><div class='add'>+	dsa_port_set_state_now(dp, BR_STATE_FORWARDING, true);</div><div class='add'>+</div><div class='add'>+	dsa_port_reset_vlan_filtering(dp, bridge);</div><div class='add'>+</div><div class='add'>+	/* Ageing time may be global to the switch chip, so don't change it</div><div class='add'>+	 * here because we have no good reason (or value) to change it to.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_bridge_create(struct dsa_port *dp,</div><div class='add'>+				  struct net_device *br,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_bridge *bridge;</div><div class='add'>+</div><div class='add'>+	bridge = dsa_tree_bridge_find(ds-&gt;dst, br);</div><div class='add'>+	if (bridge) {</div><div class='add'>+		refcount_inc(&amp;bridge-&gt;refcount);</div><div class='add'>+		dp-&gt;bridge = bridge;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);</div><div class='add'>+	if (!bridge)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;bridge-&gt;refcount, 1);</div><div class='add'>+</div><div class='add'>+	bridge-&gt;dev = br;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;num = dsa_bridge_num_get(br, ds-&gt;max_num_bridges);</div><div class='add'>+	if (ds-&gt;max_num_bridges &amp;&amp; !bridge-&gt;num) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Range of offloadable bridges exceeded");</div><div class='add'>+		kfree(bridge);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;bridge = bridge;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_bridge_destroy(struct dsa_port *dp,</div><div class='add'>+				    const struct net_device *br)</div><div class='add'>+{</div><div class='add'>+	struct dsa_bridge *bridge = dp-&gt;bridge;</div><div class='add'>+</div><div class='add'>+	dp-&gt;bridge = NULL;</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;bridge-&gt;refcount))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bridge-&gt;num)</div><div class='add'>+		dsa_bridge_num_put(br, bridge-&gt;num);</div><div class='add'>+</div><div class='add'>+	kfree(bridge);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)</div><div class='add'>+static bool dsa_port_supports_mst(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;vlan_msti_set &amp;&amp;</div><div class='add'>+		ds-&gt;ops-&gt;port_mst_state_set &amp;&amp;</div><div class='add'>+		ds-&gt;ops-&gt;port_vlan_fast_age &amp;&amp;</div><div class='add'>+		dsa_port_can_configure_learning(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_bridge_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='del'>-		.br = br,</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.extack = extack,</div><div class='ctx'> 	};</div><div class='add'>+	struct net_device *dev = dp-&gt;user;</div><div class='add'>+	struct net_device *brport_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Here the port is already bridged. Reflect the current configuration</div><div class='del'>-	 * so that drivers can program their chips accordingly.</div><div class='add'>+	if (br_mst_enabled(br) &amp;&amp; !dsa_port_supports_mst(dp))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Here the interface is already bridged. Reflect the current</div><div class='add'>+	 * configuration so that drivers can program their chips accordingly.</div><div class='ctx'> 	 */</div><div class='del'>-	dp-&gt;bridge_dev = br;</div><div class='add'>+	err = dsa_port_bridge_create(dp, br, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	brport_dev = dsa_port_to_bridge_port(dp);</div><div class='add'>+</div><div class='add'>+	info.bridge = *dp-&gt;bridge;</div><div class='add'>+	err = dsa_broadcast(DSA_NOTIFIER_BRIDGE_JOIN, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_rollback;</div><div class='add'>+</div><div class='add'>+	/* Drivers which support bridge TX forwarding should set this */</div><div class='add'>+	dp-&gt;bridge-&gt;tx_fwd_offload = info.tx_fwd_offload;</div><div class='ctx'> </div><div class='del'>-	err = dsa_port_notify(dp, DSA_NOTIFIER_BRIDGE_JOIN, &amp;info);</div><div class='add'>+	err = switchdev_bridge_port_offload(brport_dev, dev, dp,</div><div class='add'>+					    &amp;dsa_user_switchdev_notifier,</div><div class='add'>+					    &amp;dsa_user_switchdev_blocking_notifier,</div><div class='add'>+					    dp-&gt;bridge-&gt;tx_fwd_offload, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_rollback_unbridge;</div><div class='ctx'> </div><div class='del'>-	/* The bridging is rolled back on error */</div><div class='add'>+	err = dsa_port_switchdev_sync_attrs(dp, extack);</div><div class='ctx'> 	if (err)</div><div class='del'>-		dp-&gt;bridge_dev = NULL;</div><div class='add'>+		goto out_rollback_unoffload;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+out_rollback_unoffload:</div><div class='add'>+	switchdev_bridge_port_unoffload(brport_dev, dp,</div><div class='add'>+					&amp;dsa_user_switchdev_notifier,</div><div class='add'>+					&amp;dsa_user_switchdev_blocking_notifier);</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+out_rollback_unbridge:</div><div class='add'>+	dsa_broadcast(DSA_NOTIFIER_BRIDGE_LEAVE, &amp;info);</div><div class='add'>+out_rollback:</div><div class='add'>+	dsa_port_bridge_destroy(dp, br);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void dsa_port_pre_bridge_leave(struct dsa_port *dp, struct net_device *br)</div><div class='add'>+{</div><div class='add'>+	struct net_device *brport_dev = dsa_port_to_bridge_port(dp);</div><div class='add'>+</div><div class='add'>+	/* Don't try to unoffload something that is not offloaded */</div><div class='add'>+	if (!brport_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switchdev_bridge_port_unoffload(brport_dev, dp,</div><div class='add'>+					&amp;dsa_user_switchdev_notifier,</div><div class='add'>+					&amp;dsa_user_switchdev_blocking_notifier);</div><div class='add'>+</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_bridge_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='del'>-		.br = br,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* If the port could not be offloaded to begin with, then</div><div class='add'>+	 * there is nothing to do.</div><div class='add'>+	 */</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	info.bridge = *dp-&gt;bridge;</div><div class='add'>+</div><div class='ctx'> 	/* Here the port is already unbridged. Reflect the current configuration</div><div class='ctx'> 	 * so that drivers can program their chips accordingly.</div><div class='ctx'> 	 */</div><div class='del'>-	dp-&gt;bridge_dev = NULL;</div><div class='add'>+	dsa_port_bridge_destroy(dp, br);</div><div class='ctx'> </div><div class='del'>-	err = dsa_port_notify(dp, DSA_NOTIFIER_BRIDGE_LEAVE, &amp;info);</div><div class='add'>+	err = dsa_broadcast(DSA_NOTIFIER_BRIDGE_LEAVE, &amp;info);</div><div class='ctx'> 	if (err)</div><div class='del'>-		pr_err("DSA: failed to notify DSA_NOTIFIER_BRIDGE_LEAVE\n");</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+			"port %d failed to notify DSA_NOTIFIER_BRIDGE_LEAVE: %pe\n",</div><div class='add'>+			dp-&gt;index, ERR_PTR(err));</div><div class='ctx'> </div><div class='del'>-	/* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,</div><div class='del'>-	 * so allow it to be in BR_STATE_FORWARDING to be kept functional</div><div class='add'>+	dsa_port_switchdev_unsync_attrs(dp, info.bridge);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_lag_change(struct dsa_port *dp,</div><div class='add'>+			struct netdev_lag_lower_state_info *linfo)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_lag_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+	bool tx_enabled;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;lag)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* On statically configured aggregates (e.g. loadbalance</div><div class='add'>+	 * without LACP) ports will always be tx_enabled, even if the</div><div class='add'>+	 * link is down. Thus we require both link_up and tx_enabled</div><div class='add'>+	 * in order to include it in the tx set.</div><div class='add'>+	 */</div><div class='add'>+	tx_enabled = linfo-&gt;link_up &amp;&amp; linfo-&gt;tx_enabled;</div><div class='add'>+</div><div class='add'>+	if (tx_enabled == dp-&gt;lag_tx_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dp-&gt;lag_tx_enabled = tx_enabled;</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_LAG_CHANGE, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_lag_create(struct dsa_port *dp,</div><div class='add'>+			       struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_lag *lag;</div><div class='add'>+</div><div class='add'>+	lag = dsa_tree_lag_find(ds-&gt;dst, lag_dev);</div><div class='add'>+	if (lag) {</div><div class='add'>+		refcount_inc(&amp;lag-&gt;refcount);</div><div class='add'>+		dp-&gt;lag = lag;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lag = kzalloc(sizeof(*lag), GFP_KERNEL);</div><div class='add'>+	if (!lag)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;lag-&gt;refcount, 1);</div><div class='add'>+	mutex_init(&amp;lag-&gt;fdb_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;lag-&gt;fdbs);</div><div class='add'>+	lag-&gt;dev = lag_dev;</div><div class='add'>+	dsa_lag_map(ds-&gt;dst, lag);</div><div class='add'>+	dp-&gt;lag = lag;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_lag_destroy(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_lag *lag = dp-&gt;lag;</div><div class='add'>+</div><div class='add'>+	dp-&gt;lag = NULL;</div><div class='add'>+	dp-&gt;lag_tx_enabled = false;</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;lag-&gt;refcount))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!list_empty(&amp;lag-&gt;fdbs));</div><div class='add'>+	dsa_lag_unmap(dp-&gt;ds-&gt;dst, lag);</div><div class='add'>+	kfree(lag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_lag_join(struct dsa_port *dp, struct net_device *lag_dev,</div><div class='add'>+		      struct netdev_lag_upper_info *uinfo,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_lag_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.info = uinfo,</div><div class='add'>+		.extack = extack,</div><div class='add'>+	};</div><div class='add'>+	struct net_device *bridge_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_lag_create(dp, lag_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_lag_create;</div><div class='add'>+</div><div class='add'>+	info.lag = *dp-&gt;lag;</div><div class='add'>+	err = dsa_port_notify(dp, DSA_NOTIFIER_LAG_JOIN, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_lag_join;</div><div class='add'>+</div><div class='add'>+	bridge_dev = netdev_master_upper_dev_get(lag_dev);</div><div class='add'>+	if (!bridge_dev || !netif_is_bridge_master(bridge_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_bridge_join(dp, bridge_dev, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_bridge_join;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_bridge_join:</div><div class='add'>+	dsa_port_notify(dp, DSA_NOTIFIER_LAG_LEAVE, &amp;info);</div><div class='add'>+err_lag_join:</div><div class='add'>+	dsa_port_lag_destroy(dp);</div><div class='add'>+err_lag_create:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_pre_lag_leave(struct dsa_port *dp, struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+	if (br)</div><div class='add'>+		dsa_port_pre_bridge_leave(dp, br);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_lag_leave(struct dsa_port *dp, struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct dsa_notifier_lag_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;lag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Port might have been part of a LAG that in turn was</div><div class='add'>+	 * attached to a bridge.</div><div class='ctx'> 	 */</div><div class='del'>-	dsa_port_set_state_now(dp, BR_STATE_FORWARDING);</div><div class='add'>+	if (br)</div><div class='add'>+		dsa_port_bridge_leave(dp, br);</div><div class='add'>+</div><div class='add'>+	info.lag = *dp-&gt;lag;</div><div class='add'>+</div><div class='add'>+	dsa_port_lag_destroy(dp);</div><div class='add'>+</div><div class='add'>+	err = dsa_port_notify(dp, DSA_NOTIFIER_LAG_LEAVE, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+			"port %d failed to notify DSA_NOTIFIER_LAG_LEAVE: %pe\n",</div><div class='add'>+			dp-&gt;index, ERR_PTR(err));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called under rcu_read_lock() */</div><div class='add'>+static bool dsa_port_can_apply_vlan_filtering(struct dsa_port *dp,</div><div class='add'>+					      bool vlan_filtering,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* VLAN awareness was off, so the question is "can we turn it on".</div><div class='add'>+	 * We may have had 8021q uppers, those need to go. Make sure we don't</div><div class='add'>+	 * enter an inconsistent state: deny changing the VLAN awareness state</div><div class='add'>+	 * as long as we have 8021q uppers.</div><div class='add'>+	 */</div><div class='add'>+	if (vlan_filtering &amp;&amp; dsa_port_is_user(dp)) {</div><div class='add'>+		struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+		struct net_device *upper_dev, *user = dp-&gt;user;</div><div class='add'>+		struct list_head *iter;</div><div class='add'>+</div><div class='add'>+		netdev_for_each_upper_dev_rcu(user, upper_dev, iter) {</div><div class='add'>+			struct bridge_vlan_info br_info;</div><div class='add'>+			u16 vid;</div><div class='add'>+</div><div class='add'>+			if (!is_vlan_dev(upper_dev))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			vid = vlan_dev_vlan_id(upper_dev);</div><div class='add'>+</div><div class='add'>+			/* br_vlan_get_info() returns -EINVAL or -ENOENT if the</div><div class='add'>+			 * device, respectively the VID is not found, returning</div><div class='add'>+			 * 0 means success, which is a failure for us here.</div><div class='add'>+			 */</div><div class='add'>+			err = br_vlan_get_info(br, vid, &amp;br_info);</div><div class='add'>+			if (err == 0) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Must first remove VLAN uppers having VIDs also present in bridge");</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;vlan_filtering_is_global)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* For cases where enabling/disabling VLAN awareness is global to the</div><div class='add'>+	 * switch, we need to handle the case where multiple bridges span</div><div class='add'>+	 * different ports of the same switch device and one of them has a</div><div class='add'>+	 * different setting than what is being requested.</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_port(other_dp, ds) {</div><div class='add'>+		struct net_device *other_br = dsa_port_bridge_dev_get(other_dp);</div><div class='add'>+</div><div class='add'>+		/* If it's the same bridge, it also has same</div><div class='add'>+		 * vlan_filtering setting =&gt; no need to check</div><div class='add'>+		 */</div><div class='add'>+		if (!other_br || other_br == dsa_port_bridge_dev_get(dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (br_vlan_enabled(other_br) != vlan_filtering) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "VLAN filtering is a global setting");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,</div><div class='del'>-			    struct switchdev_trans *trans)</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	bool old_vlan_filtering = dsa_port_is_vlan_filtering(dp);</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	bool apply;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* bridge skips -EOPNOTSUPP, so skip the prepare phase */</div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_vlan_filtering)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* We are called from dsa_user_switchdev_blocking_event(),</div><div class='add'>+	 * which is not under rcu_read_lock(), unlike</div><div class='add'>+	 * dsa_user_switchdev_event().</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	apply = dsa_port_can_apply_vlan_filtering(dp, vlan_filtering, extack);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!apply)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_vlan_filtering(dp) == vlan_filtering)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;ops-&gt;port_vlan_filtering)</div><div class='del'>-		return ds-&gt;ops-&gt;port_vlan_filtering(ds, dp-&gt;index,</div><div class='del'>-						    vlan_filtering);</div><div class='add'>+	err = ds-&gt;ops-&gt;port_vlan_filtering(ds, dp-&gt;index, vlan_filtering,</div><div class='add'>+					   extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;vlan_filtering_is_global) {</div><div class='add'>+		struct dsa_port *other_dp;</div><div class='add'>+</div><div class='add'>+		ds-&gt;vlan_filtering = vlan_filtering;</div><div class='add'>+</div><div class='add'>+		dsa_switch_for_each_user_port(other_dp, ds) {</div><div class='add'>+			struct net_device *user = other_dp-&gt;user;</div><div class='add'>+</div><div class='add'>+			/* We might be called in the unbind path, so not</div><div class='add'>+			 * all user devices might still be registered.</div><div class='add'>+			 */</div><div class='add'>+			if (!user)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			err = dsa_user_manage_vlan_filtering(user,</div><div class='add'>+							     vlan_filtering);</div><div class='add'>+			if (err)</div><div class='add'>+				goto restore;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dp-&gt;vlan_filtering = vlan_filtering;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_manage_vlan_filtering(dp-&gt;user,</div><div class='add'>+						     vlan_filtering);</div><div class='add'>+		if (err)</div><div class='add'>+			goto restore;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+restore:</div><div class='add'>+	ds-&gt;ops-&gt;port_vlan_filtering(ds, dp-&gt;index, old_vlan_filtering, NULL);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;vlan_filtering_is_global)</div><div class='add'>+		ds-&gt;vlan_filtering = old_vlan_filtering;</div><div class='add'>+	else</div><div class='add'>+		dp-&gt;vlan_filtering = old_vlan_filtering;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,</div><div class='del'>-			 struct switchdev_trans *trans)</div><div class='add'>+/* This enforces legacy behavior for switch drivers which assume they can't</div><div class='add'>+ * receive VLAN configuration when joining a bridge with vlan_filtering=0</div><div class='add'>+ */</div><div class='add'>+bool dsa_port_skip_vlan_configuration(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!br)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !ds-&gt;configure_vlan_while_not_filtering &amp;&amp; !br_vlan_enabled(br);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock);</div><div class='ctx'> 	unsigned int ageing_time = jiffies_to_msecs(ageing_jiffies);</div><div class='del'>-	struct dsa_notifier_ageing_time_info info = {</div><div class='del'>-		.ageing_time = ageing_time,</div><div class='del'>-		.trans = trans,</div><div class='del'>-	};</div><div class='add'>+	struct dsa_notifier_ageing_time_info info;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='del'>-		return dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &amp;info);</div><div class='add'>+	info.ageing_time = ageing_time;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;ageing_time = ageing_time;</div><div class='ctx'> </div><div class='del'>-	return dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &amp;info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_mst_enable(struct dsa_port *dp, bool on,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (on &amp;&amp; !dsa_port_supports_mst(dp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Hardware does not support MST");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_pre_bridge_flags(const struct dsa_port *dp,</div><div class='add'>+			      struct switchdev_brport_flags flags,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_pre_bridge_flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_pre_bridge_flags(ds, dp-&gt;index, flags, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_flags(struct dsa_port *dp,</div><div class='add'>+			  struct switchdev_brport_flags flags,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_bridge_flags)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_bridge_flags(ds, dp-&gt;index, flags, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		bool learning = flags.val &amp; BR_LEARNING;</div><div class='add'>+</div><div class='add'>+		if (learning == dp-&gt;learning)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if ((dp-&gt;learning &amp;&amp; !learning) &amp;&amp;</div><div class='add'>+		    (dp-&gt;stp_state == BR_STATE_LEARNING ||</div><div class='add'>+		     dp-&gt;stp_state == BR_STATE_FORWARDING))</div><div class='add'>+			dsa_port_fast_age(dp);</div><div class='add'>+</div><div class='add'>+		dp-&gt;learning = learning;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_set_host_flood(struct dsa_port *dp, bool uc, bool mc)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_set_host_flood)</div><div class='add'>+		ds-&gt;ops-&gt;port_set_host_flood(ds, dp-&gt;index, uc, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_vlan_msti(struct dsa_port *dp,</div><div class='add'>+		       const struct switchdev_vlan_msti *msti)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;vlan_msti_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;vlan_msti_set(ds, *dp-&gt;bridge, msti);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_mtu_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.mtu = new_mtu,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_MTU, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='ctx'> 		     u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_fdb_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.addr = addr,</div><div class='ctx'> 		.vid = vid,</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* Refcounting takes bridge.num as a key, and should be global for all</div><div class='add'>+	 * bridges in the absence of FDB isolation, and per bridge otherwise.</div><div class='add'>+	 * Force the bridge.num to zero here in the absence of FDB isolation.</div><div class='add'>+	 */</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='ctx'> 	return dsa_port_notify(dp, DSA_NOTIFIER_FDB_ADD, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -194,16 +1000,157 @@ int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='ctx'> 		     u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_fdb_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.addr = addr,</div><div class='ctx'> 		.vid = vid,</div><div class='del'>-</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='ctx'> 	return dsa_port_notify(dp, DSA_NOTIFIER_FDB_DEL, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dsa_port_host_fdb_add(struct dsa_port *dp,</div><div class='add'>+				 const unsigned char *addr, u16 vid,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_fdb_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.db = db,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_HOST_FDB_ADD, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_standalone_host_fdb_add(struct dsa_port *dp,</div><div class='add'>+				     const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_PORT,</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_fdb_add(dp, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_host_fdb_add(struct dsa_port *dp,</div><div class='add'>+				 const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_BRIDGE,</div><div class='add'>+		.bridge = *dp-&gt;bridge,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	/* Avoid a call to __dev_set_promiscuity() on the conduit, which</div><div class='add'>+	 * requires rtnl_lock(), since we can't guarantee that is held here,</div><div class='add'>+	 * and we can't take it either.</div><div class='add'>+	 */</div><div class='add'>+	if (conduit-&gt;priv_flags &amp; IFF_UNICAST_FLT) {</div><div class='add'>+		err = dev_uc_add(conduit, addr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_fdb_add(dp, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_host_fdb_del(struct dsa_port *dp,</div><div class='add'>+				 const unsigned char *addr, u16 vid,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_fdb_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.db = db,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_HOST_FDB_DEL, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_standalone_host_fdb_del(struct dsa_port *dp,</div><div class='add'>+				     const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_PORT,</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_fdb_del(dp, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_host_fdb_del(struct dsa_port *dp,</div><div class='add'>+				 const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_BRIDGE,</div><div class='add'>+		.bridge = *dp-&gt;bridge,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	if (conduit-&gt;priv_flags &amp; IFF_UNICAST_FLT) {</div><div class='add'>+		err = dev_uc_del(conduit, addr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_fdb_del(dp, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_lag_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			 u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_lag_fdb_info info = {</div><div class='add'>+		.lag = dp-&gt;lag,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_LAG_FDB_ADD, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_lag_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			 u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_lag_fdb_info info = {</div><div class='add'>+		.lag = dp-&gt;lag,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_LAG_FDB_DEL, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dsa_port_fdb_dump(struct dsa_port *dp, dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='hunk'>@@ -216,16 +1163,20 @@ int dsa_port_fdb_dump(struct dsa_port *dp, dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dsa_port_mdb_add(const struct dsa_port *dp,</div><div class='del'>-		     const struct switchdev_obj_port_mdb *mdb,</div><div class='del'>-		     struct switchdev_trans *trans)</div><div class='add'>+		     const struct switchdev_obj_port_mdb *mdb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_mdb_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='del'>-		.trans = trans,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.mdb = mdb,</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='ctx'> 	return dsa_port_notify(dp, DSA_NOTIFIER_MDB_ADD, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -233,216 +1184,772 @@ int dsa_port_mdb_del(const struct dsa_port *dp,</div><div class='ctx'> 		     const struct switchdev_obj_port_mdb *mdb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_mdb_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.mdb = mdb,</div><div class='add'>+		.db = {</div><div class='add'>+			.type = DSA_DB_BRIDGE,</div><div class='add'>+			.bridge = *dp-&gt;bridge,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		info.db.bridge.num = 0;</div><div class='add'>+</div><div class='ctx'> 	return dsa_port_notify(dp, DSA_NOTIFIER_MDB_DEL, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dsa_port_host_mdb_add(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_mdb_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.mdb = mdb,</div><div class='add'>+		.db = db,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_HOST_MDB_ADD, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_standalone_host_mdb_add(const struct dsa_port *dp,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_PORT,</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_mdb_add(dp, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_host_mdb_add(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_BRIDGE,</div><div class='add'>+		.bridge = *dp-&gt;bridge,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	err = dev_mc_add(conduit, mdb-&gt;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_mdb_add(dp, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_host_mdb_del(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_mdb_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.mdb = mdb,</div><div class='add'>+		.db = db,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_HOST_MDB_DEL, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_standalone_host_mdb_del(const struct dsa_port *dp,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_PORT,</div><div class='add'>+		.dp = dp,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_mdb_del(dp, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_bridge_host_mdb_del(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_BRIDGE,</div><div class='add'>+		.bridge = *dp-&gt;bridge,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;fdb_isolation)</div><div class='add'>+		db.bridge.num = 0;</div><div class='add'>+</div><div class='add'>+	err = dev_mc_del(conduit, mdb-&gt;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_mdb_del(dp, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dsa_port_vlan_add(struct dsa_port *dp,</div><div class='ctx'> 		      const struct switchdev_obj_port_vlan *vlan,</div><div class='del'>-		      struct switchdev_trans *trans)</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_vlan_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='del'>-		.trans = trans,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.vlan = vlan,</div><div class='add'>+		.extack = extack,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (netif_is_bridge_master(vlan-&gt;obj.orig_dev))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (br_vlan_enabled(dp-&gt;bridge_dev))</div><div class='del'>-		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &amp;info);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dsa_port_vlan_del(struct dsa_port *dp,</div><div class='ctx'> 		      const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_notifier_vlan_info info = {</div><div class='del'>-		.sw_index = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port = dp-&gt;index,</div><div class='add'>+		.dp = dp,</div><div class='ctx'> 		.vlan = vlan,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (netif_is_bridge_master(vlan-&gt;obj.orig_dev))</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_host_vlan_add(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_notifier_vlan_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.vlan = vlan,</div><div class='add'>+		.extack = extack,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_notify(dp, DSA_NOTIFIER_HOST_VLAN_ADD, &amp;info);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	vlan_vid_add(conduit, htons(ETH_P_8021Q), vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_host_vlan_del(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_notifier_vlan_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.vlan = vlan,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_notify(dp, DSA_NOTIFIER_HOST_VLAN_DEL, &amp;info);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	vlan_vid_del(conduit, htons(ETH_P_8021Q), vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_port_mrp_add(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mrp_add)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (br_vlan_enabled(dp-&gt;bridge_dev))</div><div class='del'>-		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &amp;info);</div><div class='add'>+	return ds-&gt;ops-&gt;port_mrp_add(ds, dp-&gt;index, mrp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+int dsa_port_mrp_del(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mrp_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_mrp_del(ds, dp-&gt;index, mrp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp)</div><div class='add'>+int dsa_port_mrp_add_ring_role(const struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_ring_role_mrp *mrp)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *phy_dn;</div><div class='del'>-	struct phy_device *phydev;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> </div><div class='del'>-	phy_dn = of_parse_phandle(dp-&gt;dn, "phy-handle", 0);</div><div class='del'>-	if (!phy_dn)</div><div class='del'>-		return NULL;</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mrp_add_ring_role)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	phydev = of_phy_find_device(phy_dn);</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		of_node_put(phy_dn);</div><div class='del'>-		return ERR_PTR(-EPROBE_DEFER);</div><div class='del'>-	}</div><div class='add'>+	return ds-&gt;ops-&gt;port_mrp_add_ring_role(ds, dp-&gt;index, mrp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return phydev;</div><div class='add'>+int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_ring_role_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mrp_del_ring_role)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_mrp_del_ring_role(ds, dp-&gt;index, mrp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)</div><div class='add'>+static int dsa_port_assign_conduit(struct dsa_port *dp,</div><div class='add'>+				   struct net_device *conduit,</div><div class='add'>+				   struct netlink_ext_ack *extack,</div><div class='add'>+				   bool fail_on_err)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int port = dp-&gt;index;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int port = dp-&gt;index, err;</div><div class='ctx'> </div><div class='del'>-	phydev = dsa_port_get_phy_device(dp);</div><div class='del'>-	if (!phydev)</div><div class='del'>-		return 0;</div><div class='add'>+	err = ds-&gt;ops-&gt;port_change_conduit(ds, port, conduit, extack);</div><div class='add'>+	if (err &amp;&amp; !fail_on_err)</div><div class='add'>+		dev_err(ds-&gt;dev, "port %d failed to assign conduit %s: %pe\n",</div><div class='add'>+			port, conduit-&gt;name, ERR_PTR(err));</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(phydev))</div><div class='del'>-		return PTR_ERR(phydev);</div><div class='add'>+	if (err &amp;&amp; fail_on_err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (enable) {</div><div class='del'>-		err = genphy_config_init(phydev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_put_dev;</div><div class='add'>+	dp-&gt;cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	dp-&gt;cpu_port_in_lag = netif_is_lag_master(conduit);</div><div class='ctx'> </div><div class='del'>-		err = genphy_resume(phydev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_put_dev;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		err = genphy_read_status(phydev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_put_dev;</div><div class='del'>-	} else {</div><div class='del'>-		err = genphy_suspend(phydev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_put_dev;</div><div class='add'>+/* Change the dp-&gt;cpu_dp affinity for a user port. Note that both cross-chip</div><div class='add'>+ * notifiers and drivers have implicit assumptions about user-to-CPU-port</div><div class='add'>+ * mappings, so we unfortunately cannot delay the deletion of the objects</div><div class='add'>+ * (switchdev, standalone addresses, standalone VLANs) on the old CPU port</div><div class='add'>+ * until the new CPU port has been set up. So we need to completely tear down</div><div class='add'>+ * the old CPU port before changing it, and restore it on errors during the</div><div class='add'>+ * bringup of the new one.</div><div class='add'>+ */</div><div class='add'>+int dsa_port_change_conduit(struct dsa_port *dp, struct net_device *conduit,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct net_device *old_conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct net_device *dev = dp-&gt;user;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	bool vlan_filtering;</div><div class='add'>+	int err, tmp;</div><div class='add'>+</div><div class='add'>+	/* Bridges may hold host FDB, MDB and VLAN objects. These need to be</div><div class='add'>+	 * migrated, so dynamically unoffload and later reoffload the bridge</div><div class='add'>+	 * port.</div><div class='add'>+	 */</div><div class='add'>+	if (bridge_dev) {</div><div class='add'>+		dsa_port_pre_bridge_leave(dp, bridge_dev);</div><div class='add'>+		dsa_port_bridge_leave(dp, bridge_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The port might still be VLAN filtering even if it's no longer</div><div class='add'>+	 * under a bridge, either due to ds-&gt;vlan_filtering_is_global or</div><div class='add'>+	 * ds-&gt;needs_standalone_vlan_filtering. In turn this means VLANs</div><div class='add'>+	 * on the CPU port.</div><div class='add'>+	 */</div><div class='add'>+	vlan_filtering = dsa_port_is_vlan_filtering(dp);</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		err = dsa_user_manage_vlan_filtering(dev, false);</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Failed to remove standalone VLANs");</div><div class='add'>+			goto rewind_old_bridge;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Standalone addresses, and addresses of upper interfaces like</div><div class='add'>+	 * VLAN, LAG, HSR need to be migrated.</div><div class='add'>+	 */</div><div class='add'>+	dsa_user_unsync_ha(dev);</div><div class='add'>+</div><div class='add'>+	/* If live-changing, we also need to uninstall the user device address</div><div class='add'>+	 * from the port FDB and the conduit interface.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		dsa_user_host_uc_uninstall(dev);</div><div class='add'>+</div><div class='add'>+	err = dsa_port_assign_conduit(dp, conduit, extack, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto rewind_old_addrs;</div><div class='add'>+</div><div class='add'>+	/* If the port doesn't have its own MAC address and relies on the DSA</div><div class='add'>+	 * conduit's one, inherit it again from the new DSA conduit.</div><div class='add'>+	 */</div><div class='add'>+	if (is_zero_ether_addr(dp-&gt;mac))</div><div class='add'>+		eth_hw_addr_inherit(dev, conduit);</div><div class='add'>+</div><div class='add'>+	/* If live-changing, we need to install the user device address to the</div><div class='add'>+	 * port FDB and the conduit interface.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		err = dsa_user_host_uc_install(dev, dev-&gt;dev_addr);</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Failed to install host UC address");</div><div class='add'>+			goto rewind_addr_inherit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_user_sync_ha(dev);</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		err = dsa_user_manage_vlan_filtering(dev, true);</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Failed to restore standalone VLANs");</div><div class='add'>+			goto rewind_new_addrs;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;ops-&gt;adjust_link)</div><div class='del'>-		ds-&gt;ops-&gt;adjust_link(ds, port, phydev);</div><div class='add'>+	if (bridge_dev) {</div><div class='add'>+		err = dsa_port_bridge_join(dp, bridge_dev, extack);</div><div class='add'>+		if (err &amp;&amp; err == -EOPNOTSUPP) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Failed to reoffload bridge");</div><div class='add'>+			goto rewind_new_vlan;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rewind_new_vlan:</div><div class='add'>+	if (vlan_filtering)</div><div class='add'>+		dsa_user_manage_vlan_filtering(dev, false);</div><div class='add'>+</div><div class='add'>+rewind_new_addrs:</div><div class='add'>+	dsa_user_unsync_ha(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		dsa_user_host_uc_uninstall(dev);</div><div class='add'>+</div><div class='add'>+rewind_addr_inherit:</div><div class='add'>+	if (is_zero_ether_addr(dp-&gt;mac))</div><div class='add'>+		eth_hw_addr_inherit(dev, old_conduit);</div><div class='add'>+</div><div class='add'>+	dsa_port_assign_conduit(dp, old_conduit, NULL, false);</div><div class='add'>+</div><div class='add'>+/* Restore the objects on the old CPU port */</div><div class='add'>+rewind_old_addrs:</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		tmp = dsa_user_host_uc_install(dev, dev-&gt;dev_addr);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to restore host UC address: %pe\n",</div><div class='add'>+				dp-&gt;index, ERR_PTR(tmp));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(ds-&gt;dev, "enabled port's phy: %s", phydev_name(phydev));</div><div class='add'>+	dsa_user_sync_ha(dev);</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		tmp = dsa_user_manage_vlan_filtering(dev, true);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to restore standalone VLANs: %pe\n",</div><div class='add'>+				dp-&gt;index, ERR_PTR(tmp));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+rewind_old_bridge:</div><div class='add'>+	if (bridge_dev) {</div><div class='add'>+		tmp = dsa_port_bridge_join(dp, bridge_dev, extack);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to rejoin bridge %s: %pe\n",</div><div class='add'>+				dp-&gt;index, bridge_dev-&gt;name, ERR_PTR(tmp));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-err_put_dev:</div><div class='del'>-	put_device(&amp;phydev-&gt;mdio.dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dsa_port_fixed_link_register_of(struct dsa_port *dp)</div><div class='add'>+void dsa_port_set_tag_protocol(struct dsa_port *cpu_dp,</div><div class='add'>+			       const struct dsa_device_ops *tag_ops)</div><div class='add'>+{</div><div class='add'>+	cpu_dp-&gt;rcv = tag_ops-&gt;rcv;</div><div class='add'>+	cpu_dp-&gt;tag_ops = tag_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dsa_supports_eee - indicate that EEE is supported</div><div class='add'>+ * @ds: pointer to &amp;struct dsa_switch</div><div class='add'>+ * @port: port index</div><div class='add'>+ *</div><div class='add'>+ * A default implementation for the .support_eee() DSA operations member,</div><div class='add'>+ * which drivers can use to indicate that they support EEE on all of their</div><div class='add'>+ * user ports.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true</div><div class='add'>+ */</div><div class='add'>+bool dsa_supports_eee(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_supports_eee);</div><div class='add'>+</div><div class='add'>+static void dsa_port_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					   unsigned int mode,</div><div class='add'>+					   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_port_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					 struct phy_device *phydev,</div><div class='add'>+					 unsigned int mode,</div><div class='add'>+					 phy_interface_t interface,</div><div class='add'>+					 int speed, int duplex,</div><div class='add'>+					 bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {</div><div class='add'>+	.mac_config = dsa_port_phylink_mac_config,</div><div class='add'>+	.mac_link_down = dsa_port_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up = dsa_port_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dsa_port_phylink_create(struct dsa_port *dp)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dn = dp-&gt;dn;</div><div class='add'>+	const struct phylink_mac_ops *mac_ops;</div><div class='ctx'> 	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int port = dp-&gt;index;</div><div class='del'>-	int mode;</div><div class='add'>+	phy_interface_t mode;</div><div class='add'>+	struct phylink *pl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = of_phy_register_fixed_link(dn);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(ds-&gt;dev,</div><div class='del'>-			"failed to register the fixed PHY of port %d\n",</div><div class='del'>-			port);</div><div class='del'>-		return err;</div><div class='add'>+	err = of_get_phy_mode(dp-&gt;dn, &amp;mode);</div><div class='add'>+	if (err)</div><div class='add'>+		mode = PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;phylink_get_caps) {</div><div class='add'>+		ds-&gt;ops-&gt;phylink_get_caps(ds, dp-&gt;index, &amp;dp-&gt;pl_config);</div><div class='add'>+	} else {</div><div class='add'>+		/* For legacy drivers */</div><div class='add'>+		if (mode != PHY_INTERFACE_MODE_NA) {</div><div class='add'>+			__set_bit(mode, dp-&gt;pl_config.supported_interfaces);</div><div class='add'>+		} else {</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+				  dp-&gt;pl_config.supported_interfaces);</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+				  dp-&gt;pl_config.supported_interfaces);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phydev = of_phy_find_device(dn);</div><div class='add'>+	mac_ops = &amp;dsa_port_phylink_mac_ops;</div><div class='add'>+	if (ds-&gt;phylink_mac_ops)</div><div class='add'>+		mac_ops = ds-&gt;phylink_mac_ops;</div><div class='ctx'> </div><div class='del'>-	mode = of_get_phy_mode(dn);</div><div class='del'>-	if (mode &lt; 0)</div><div class='del'>-		mode = PHY_INTERFACE_MODE_NA;</div><div class='del'>-	phydev-&gt;interface = mode;</div><div class='add'>+	pl = phylink_create(&amp;dp-&gt;pl_config, of_fwnode_handle(dp-&gt;dn), mode,</div><div class='add'>+			    mac_ops);</div><div class='add'>+	if (IS_ERR(pl)) {</div><div class='add'>+		pr_err("error creating PHYLINK: %ld\n", PTR_ERR(pl));</div><div class='add'>+		return PTR_ERR(pl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;pl = pl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	genphy_config_init(phydev);</div><div class='del'>-	genphy_read_status(phydev);</div><div class='add'>+void dsa_port_phylink_destroy(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	phylink_destroy(dp-&gt;pl);</div><div class='add'>+	dp-&gt;pl = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;ops-&gt;adjust_link)</div><div class='del'>-		ds-&gt;ops-&gt;adjust_link(ds, port, phydev);</div><div class='add'>+static int dsa_shared_port_phylink_register(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct device_node *port_dn = dp-&gt;dn;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	put_device(&amp;phydev-&gt;mdio.dev);</div><div class='add'>+	dp-&gt;pl_config.dev = ds-&gt;dev;</div><div class='add'>+	dp-&gt;pl_config.type = PHYLINK_DEV;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_phylink_create(dp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = phylink_of_phy_connect(dp-&gt;pl, port_dn, 0);</div><div class='add'>+	if (err &amp;&amp; err != -ENODEV) {</div><div class='add'>+		pr_err("could not attach to PHY: %d\n", err);</div><div class='add'>+		goto err_phy_connect;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_phy_connect:</div><div class='add'>+	dsa_port_phylink_destroy(dp);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_link_register_of(struct dsa_port *dp)</div><div class='add'>+/* During the initial DSA driver migration to OF, port nodes were sometimes</div><div class='add'>+ * added to device trees with no indication of how they should operate from a</div><div class='add'>+ * link management perspective (phy-handle, fixed-link, etc). Additionally, the</div><div class='add'>+ * phy-mode may be absent. The interpretation of these port OF nodes depends on</div><div class='add'>+ * their type.</div><div class='add'>+ *</div><div class='add'>+ * User ports with no phy-handle or fixed-link are expected to connect to an</div><div class='add'>+ * internal PHY located on the ds-&gt;user_mii_bus at an MDIO address equal to</div><div class='add'>+ * the port number. This description is still actively supported.</div><div class='add'>+ *</div><div class='add'>+ * Shared (CPU and DSA) ports with no phy-handle or fixed-link are expected to</div><div class='add'>+ * operate at the maximum speed that their phy-mode is capable of. If the</div><div class='add'>+ * phy-mode is absent, they are expected to operate using the phy-mode</div><div class='add'>+ * supported by the port that gives the highest link speed. It is unspecified</div><div class='add'>+ * if the port should use flow control or not, half duplex or full duplex, or</div><div class='add'>+ * if the phy-mode is a SERDES link, whether in-band autoneg is expected to be</div><div class='add'>+ * enabled or not.</div><div class='add'>+ *</div><div class='add'>+ * In the latter case of shared ports, omitting the link management description</div><div class='add'>+ * from the firmware node is deprecated and strongly discouraged. DSA uses</div><div class='add'>+ * phylink, which rejects the firmware nodes of these ports for lacking</div><div class='add'>+ * required properties.</div><div class='add'>+ *</div><div class='add'>+ * For switches in this table, DSA will skip enforcing validation and will</div><div class='add'>+ * later omit registering a phylink instance for the shared ports, if they lack</div><div class='add'>+ * a fixed-link, a phy-handle, or a managed = "in-band-status" property.</div><div class='add'>+ * It becomes the responsibility of the driver to ensure that these ports</div><div class='add'>+ * operate at the maximum speed (whatever this means) and will interoperate</div><div class='add'>+ * with the DSA conduit or other cascade port, since phylink methods will not be</div><div class='add'>+ * invoked for them.</div><div class='add'>+ *</div><div class='add'>+ * If you are considering expanding this table for newly introduced switches,</div><div class='add'>+ * think again. It is OK to remove switches from this table if there aren't DT</div><div class='add'>+ * blobs in circulation which rely on defaulting the shared ports.</div><div class='add'>+ */</div><div class='add'>+static const char * const dsa_switches_apply_workarounds[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_XRS700X)</div><div class='add'>+	"arrow,xrs7003e",</div><div class='add'>+	"arrow,xrs7003f",</div><div class='add'>+	"arrow,xrs7004e",</div><div class='add'>+	"arrow,xrs7004f",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_B53)</div><div class='add'>+	"brcm,bcm5325",</div><div class='add'>+	"brcm,bcm53115",</div><div class='add'>+	"brcm,bcm53125",</div><div class='add'>+	"brcm,bcm53128",</div><div class='add'>+	"brcm,bcm5365",</div><div class='add'>+	"brcm,bcm5389",</div><div class='add'>+	"brcm,bcm5395",</div><div class='add'>+	"brcm,bcm5397",</div><div class='add'>+	"brcm,bcm5398",</div><div class='add'>+	"brcm,bcm53010-srab",</div><div class='add'>+	"brcm,bcm53011-srab",</div><div class='add'>+	"brcm,bcm53012-srab",</div><div class='add'>+	"brcm,bcm53018-srab",</div><div class='add'>+	"brcm,bcm53019-srab",</div><div class='add'>+	"brcm,bcm5301x-srab",</div><div class='add'>+	"brcm,bcm11360-srab",</div><div class='add'>+	"brcm,bcm58522-srab",</div><div class='add'>+	"brcm,bcm58525-srab",</div><div class='add'>+	"brcm,bcm58535-srab",</div><div class='add'>+	"brcm,bcm58622-srab",</div><div class='add'>+	"brcm,bcm58623-srab",</div><div class='add'>+	"brcm,bcm58625-srab",</div><div class='add'>+	"brcm,bcm88312-srab",</div><div class='add'>+	"brcm,cygnus-srab",</div><div class='add'>+	"brcm,nsp-srab",</div><div class='add'>+	"brcm,omega-srab",</div><div class='add'>+	"brcm,bcm3384-switch",</div><div class='add'>+	"brcm,bcm6328-switch",</div><div class='add'>+	"brcm,bcm6368-switch",</div><div class='add'>+	"brcm,bcm63xx-switch",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_BCM_SF2)</div><div class='add'>+	"brcm,bcm7445-switch-v4.0",</div><div class='add'>+	"brcm,bcm7278-switch-v4.0",</div><div class='add'>+	"brcm,bcm7278-switch-v4.8",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_LANTIQ_GSWIP)</div><div class='add'>+	"lantiq,xrx200-gswip",</div><div class='add'>+	"lantiq,xrx300-gswip",</div><div class='add'>+	"lantiq,xrx330-gswip",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6060)</div><div class='add'>+	"marvell,mv88e6060",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6XXX)</div><div class='add'>+	"marvell,mv88e6085",</div><div class='add'>+	"marvell,mv88e6190",</div><div class='add'>+	"marvell,mv88e6250",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON)</div><div class='add'>+	"microchip,ksz8765",</div><div class='add'>+	"microchip,ksz8794",</div><div class='add'>+	"microchip,ksz8795",</div><div class='add'>+	"microchip,ksz8863",</div><div class='add'>+	"microchip,ksz8873",</div><div class='add'>+	"microchip,ksz9477",</div><div class='add'>+	"microchip,ksz9897",</div><div class='add'>+	"microchip,ksz9893",</div><div class='add'>+	"microchip,ksz9563",</div><div class='add'>+	"microchip,ksz8563",</div><div class='add'>+	"microchip,ksz9567",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_SMSC_LAN9303_MDIO)</div><div class='add'>+	"smsc,lan9303-mdio",</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_SMSC_LAN9303_I2C)</div><div class='add'>+	"smsc,lan9303-i2c",</div><div class='add'>+#endif</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dsa_shared_port_validate_of(struct dsa_port *dp,</div><div class='add'>+					bool *missing_phy_mode,</div><div class='add'>+					bool *missing_link_description)</div><div class='ctx'> {</div><div class='del'>-	if (of_phy_is_fixed_link(dp-&gt;dn))</div><div class='del'>-		return dsa_port_fixed_link_register_of(dp);</div><div class='del'>-	else</div><div class='del'>-		return dsa_port_setup_phy_of(dp, true);</div><div class='add'>+	struct device_node *dn = dp-&gt;dn, *phy_np;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	phy_interface_t mode;</div><div class='add'>+</div><div class='add'>+	*missing_phy_mode = false;</div><div class='add'>+	*missing_link_description = false;</div><div class='add'>+</div><div class='add'>+	if (of_get_phy_mode(dn, &amp;mode)) {</div><div class='add'>+		*missing_phy_mode = true;</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"OF node %pOF of %s port %d lacks the required \"phy-mode\" property\n",</div><div class='add'>+			dn, dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Note: of_phy_is_fixed_link() also returns true for</div><div class='add'>+	 * managed = "in-band-status"</div><div class='add'>+	 */</div><div class='add'>+	if (of_phy_is_fixed_link(dn))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phy_np = of_parse_phandle(dn, "phy-handle", 0);</div><div class='add'>+	if (phy_np) {</div><div class='add'>+		of_node_put(phy_np);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*missing_link_description = true;</div><div class='add'>+</div><div class='add'>+	dev_err(ds-&gt;dev,</div><div class='add'>+		"OF node %pOF of %s port %d lacks the required \"phy-handle\", \"fixed-link\" or \"managed\" properties\n",</div><div class='add'>+		dn, dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp-&gt;index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dsa_port_link_unregister_of(struct dsa_port *dp)</div><div class='add'>+static void dsa_shared_port_link_down(struct dsa_port *dp)</div><div class='ctx'> {</div><div class='del'>-	if (of_phy_is_fixed_link(dp-&gt;dn))</div><div class='del'>-		of_phy_deregister_fixed_link(dp-&gt;dn);</div><div class='del'>-	else</div><div class='del'>-		dsa_port_setup_phy_of(dp, false);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;phylink_mac_ops &amp;&amp; ds-&gt;phylink_mac_ops-&gt;mac_link_down)</div><div class='add'>+		ds-&gt;phylink_mac_ops-&gt;mac_link_down(&amp;dp-&gt;pl_config, MLO_AN_FIXED,</div><div class='add'>+						   PHY_INTERFACE_MODE_NA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data)</div><div class='add'>+int dsa_shared_port_link_register_of(struct dsa_port *dp)</div><div class='ctx'> {</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	bool missing_link_description;</div><div class='add'>+	bool missing_phy_mode;</div><div class='ctx'> </div><div class='del'>-	if (of_phy_is_fixed_link(dp-&gt;dn))</div><div class='del'>-		return ret;</div><div class='add'>+	dsa_shared_port_validate_of(dp, &amp;missing_phy_mode,</div><div class='add'>+				    &amp;missing_link_description);</div><div class='ctx'> </div><div class='del'>-	phydev = dsa_port_get_phy_device(dp);</div><div class='del'>-	if (IS_ERR_OR_NULL(phydev))</div><div class='del'>-		return ret;</div><div class='add'>+	if ((missing_phy_mode || missing_link_description) &amp;&amp;</div><div class='add'>+	    !of_device_compatible_match(ds-&gt;dev-&gt;of_node,</div><div class='add'>+					dsa_switches_apply_workarounds))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = phy_ethtool_get_strings(phydev, data);</div><div class='del'>-	put_device(&amp;phydev-&gt;mdio.dev);</div><div class='add'>+	if (missing_link_description) {</div><div class='add'>+		dev_warn(ds-&gt;dev,</div><div class='add'>+			 "Skipping phylink registration for %s port %d\n",</div><div class='add'>+			 dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp-&gt;index);</div><div class='add'>+	} else {</div><div class='add'>+		dsa_shared_port_link_down(dp);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+		return dsa_shared_port_phylink_register(dp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_shared_port_link_unregister_of(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	if (dp-&gt;pl) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		phylink_disconnect_phy(dp-&gt;pl);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		dsa_port_phylink_destroy(dp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_port_get_phy_strings);</div><div class='ctx'> </div><div class='del'>-int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data)</div><div class='add'>+int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (of_phy_is_fixed_link(dp-&gt;dn))</div><div class='del'>-		return ret;</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_hsr_join)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	phydev = dsa_port_get_phy_device(dp);</div><div class='del'>-	if (IS_ERR_OR_NULL(phydev))</div><div class='del'>-		return ret;</div><div class='add'>+	dp-&gt;hsr_dev = hsr;</div><div class='ctx'> </div><div class='del'>-	ret = phy_ethtool_get_stats(phydev, NULL, data);</div><div class='del'>-	put_device(&amp;phydev-&gt;mdio.dev);</div><div class='add'>+	err = ds-&gt;ops-&gt;port_hsr_join(ds, dp-&gt;index, hsr, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		dp-&gt;hsr_dev = NULL;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;hsr_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dp-&gt;hsr_dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_hsr_leave) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_hsr_leave(ds, dp-&gt;index, hsr);</div><div class='add'>+		if (err)</div><div class='add'>+			dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+				"port %d failed to leave HSR %s: %pe\n",</div><div class='add'>+				dp-&gt;index, hsr-&gt;name, ERR_PTR(err));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_port_get_ethtool_phy_stats);</div><div class='ctx'> </div><div class='del'>-int dsa_port_get_phy_sset_count(struct dsa_port *dp)</div><div class='add'>+int dsa_port_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid, bool broadcast)</div><div class='ctx'> {</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct dsa_notifier_tag_8021q_vlan_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.vid = vid,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	if (of_phy_is_fixed_link(dp-&gt;dn))</div><div class='del'>-		return ret;</div><div class='add'>+	if (broadcast)</div><div class='add'>+		return dsa_broadcast(DSA_NOTIFIER_TAG_8021Q_VLAN_ADD, &amp;info);</div><div class='ctx'> </div><div class='del'>-	phydev = dsa_port_get_phy_device(dp);</div><div class='del'>-	if (IS_ERR_OR_NULL(phydev))</div><div class='del'>-		return ret;</div><div class='add'>+	return dsa_port_notify(dp, DSA_NOTIFIER_TAG_8021Q_VLAN_ADD, &amp;info);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = phy_ethtool_get_sset_count(phydev);</div><div class='del'>-	put_device(&amp;phydev-&gt;mdio.dev);</div><div class='add'>+void dsa_port_tag_8021q_vlan_del(struct dsa_port *dp, u16 vid, bool broadcast)</div><div class='add'>+{</div><div class='add'>+	struct dsa_notifier_tag_8021q_vlan_info info = {</div><div class='add'>+		.dp = dp,</div><div class='add'>+		.vid = vid,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (broadcast)</div><div class='add'>+		err = dsa_broadcast(DSA_NOTIFIER_TAG_8021Q_VLAN_DEL, &amp;info);</div><div class='add'>+	else</div><div class='add'>+		err = dsa_port_notify(dp, DSA_NOTIFIER_TAG_8021Q_VLAN_DEL, &amp;info);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+			"port %d failed to notify tag_8021q VLAN %d deletion: %pe\n",</div><div class='add'>+			dp-&gt;index, vid, ERR_PTR(err));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_port_get_phy_sset_count);</div><div class='head'>diff --git a/net/dsa/port.h b/net/dsa/port.h<br/>new file mode 100644<br/>index 000000000000..6bc3291573c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/port.h</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_PORT_H</div><div class='add'>+#define __DSA_PORT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+struct ifreq;</div><div class='add'>+struct netdev_lag_lower_state_info;</div><div class='add'>+struct netdev_lag_upper_info;</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+struct switchdev_mst_state;</div><div class='add'>+struct switchdev_obj_port_mdb;</div><div class='add'>+struct switchdev_vlan_msti;</div><div class='add'>+struct phy_device;</div><div class='add'>+</div><div class='add'>+bool dsa_port_supports_hwtstamp(struct dsa_port *dp);</div><div class='add'>+void dsa_port_set_tag_protocol(struct dsa_port *cpu_dp,</div><div class='add'>+			       const struct dsa_device_ops *tag_ops);</div><div class='add'>+int dsa_port_set_state(struct dsa_port *dp, u8 state, bool do_fast_age);</div><div class='add'>+int dsa_port_set_mst_state(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_mst_state *state,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_enable_rt(struct dsa_port *dp, struct phy_device *phy);</div><div class='add'>+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);</div><div class='add'>+void dsa_port_disable_rt(struct dsa_port *dp);</div><div class='add'>+void dsa_port_disable(struct dsa_port *dp);</div><div class='add'>+int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+void dsa_port_pre_bridge_leave(struct dsa_port *dp, struct net_device *br);</div><div class='add'>+void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);</div><div class='add'>+int dsa_port_lag_change(struct dsa_port *dp,</div><div class='add'>+			struct netdev_lag_lower_state_info *linfo);</div><div class='add'>+int dsa_port_lag_join(struct dsa_port *dp, struct net_device *lag_dev,</div><div class='add'>+		      struct netdev_lag_upper_info *uinfo,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+void dsa_port_pre_lag_leave(struct dsa_port *dp, struct net_device *lag_dev);</div><div class='add'>+void dsa_port_lag_leave(struct dsa_port *dp, struct net_device *lag_dev);</div><div class='add'>+int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+bool dsa_port_skip_vlan_configuration(struct dsa_port *dp);</div><div class='add'>+int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock);</div><div class='add'>+int dsa_port_mst_enable(struct dsa_port *dp, bool on,</div><div class='add'>+			struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_vlan_msti(struct dsa_port *dp,</div><div class='add'>+		       const struct switchdev_vlan_msti *msti);</div><div class='add'>+int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu);</div><div class='add'>+int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		     u16 vid);</div><div class='add'>+int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		     u16 vid);</div><div class='add'>+int dsa_port_standalone_host_fdb_add(struct dsa_port *dp,</div><div class='add'>+				     const unsigned char *addr, u16 vid);</div><div class='add'>+int dsa_port_standalone_host_fdb_del(struct dsa_port *dp,</div><div class='add'>+				     const unsigned char *addr, u16 vid);</div><div class='add'>+int dsa_port_bridge_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+				 u16 vid);</div><div class='add'>+int dsa_port_bridge_host_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+				 u16 vid);</div><div class='add'>+int dsa_port_lag_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			 u16 vid);</div><div class='add'>+int dsa_port_lag_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			 u16 vid);</div><div class='add'>+int dsa_port_fdb_dump(struct dsa_port *dp, dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+int dsa_port_mdb_add(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_mdb_del(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_standalone_host_mdb_add(const struct dsa_port *dp,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_standalone_host_mdb_del(const struct dsa_port *dp,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_bridge_host_mdb_add(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_bridge_host_mdb_del(const struct dsa_port *dp,</div><div class='add'>+				 const struct switchdev_obj_port_mdb *mdb);</div><div class='add'>+int dsa_port_pre_bridge_flags(const struct dsa_port *dp,</div><div class='add'>+			      struct switchdev_brport_flags flags,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_bridge_flags(struct dsa_port *dp,</div><div class='add'>+			  struct switchdev_brport_flags flags,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_vlan_add(struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_vlan_del(struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+int dsa_port_host_vlan_add(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_port_host_vlan_del(struct dsa_port *dp,</div><div class='add'>+			   const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+int dsa_port_mrp_add(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_mrp *mrp);</div><div class='add'>+int dsa_port_mrp_del(const struct dsa_port *dp,</div><div class='add'>+		     const struct switchdev_obj_mrp *mrp);</div><div class='add'>+int dsa_port_mrp_add_ring_role(const struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_ring_role_mrp *mrp);</div><div class='add'>+int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_ring_role_mrp *mrp);</div><div class='add'>+int dsa_port_phylink_create(struct dsa_port *dp);</div><div class='add'>+void dsa_port_phylink_destroy(struct dsa_port *dp);</div><div class='add'>+int dsa_shared_port_link_register_of(struct dsa_port *dp);</div><div class='add'>+void dsa_shared_port_link_unregister_of(struct dsa_port *dp);</div><div class='add'>+int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr);</div><div class='add'>+int dsa_port_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid, bool broadcast);</div><div class='add'>+void dsa_port_tag_8021q_vlan_del(struct dsa_port *dp, u16 vid, bool broadcast);</div><div class='add'>+void dsa_port_set_host_flood(struct dsa_port *dp, bool uc, bool mc);</div><div class='add'>+int dsa_port_change_conduit(struct dsa_port *dp, struct net_device *conduit,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/slave.c b/net/dsa/slave.c<br/>deleted file mode 100644<br/>index 1c45c1d6d241..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/slave.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/slave.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1569 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/dsa/slave.c - Slave device handling</div><div class='del'>- * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/phy_fixed.h&gt;</div><div class='del'>-#include &lt;linux/phylink.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/mdio.h&gt;</div><div class='del'>-#include &lt;net/rtnetlink.h&gt;</div><div class='del'>-#include &lt;net/pkt_cls.h&gt;</div><div class='del'>-#include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;linux/netpoll.h&gt;</div><div class='del'>-#include &lt;linux/ptp_classify.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-static bool dsa_slave_dev_check(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-/* slave mii_bus handling ***************************************************/</div><div class='del'>-static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = bus-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;phys_mii_mask &amp; (1 &lt;&lt; addr))</div><div class='del'>-		return ds-&gt;ops-&gt;phy_read(ds, addr, reg);</div><div class='del'>-</div><div class='del'>-	return 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = bus-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;phys_mii_mask &amp; (1 &lt;&lt; addr))</div><div class='del'>-		return ds-&gt;ops-&gt;phy_write(ds, addr, reg, val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_slave_mii_bus_init(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;priv = (void *)ds;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;name = "dsa slave smi";</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;read = dsa_slave_phy_read;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;write = dsa_slave_phy_write;</div><div class='del'>-	snprintf(ds-&gt;slave_mii_bus-&gt;id, MII_BUS_ID_SIZE, "dsa-%d.%d",</div><div class='del'>-		 ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;parent = ds-&gt;dev;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;phy_mask = ~ds-&gt;phys_mii_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* slave device handling ****************************************************/</div><div class='del'>-static int dsa_slave_get_iflink(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dsa_slave_to_master(dev)-&gt;ifindex;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!(master-&gt;flags &amp; IFF_UP))</div><div class='del'>-		return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, master-&gt;dev_addr)) {</div><div class='del'>-		err = dev_uc_add(master, dev-&gt;dev_addr);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='del'>-		err = dev_set_allmulti(master, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto del_unicast;</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='del'>-		err = dev_set_promiscuity(master, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto clear_allmulti;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = dsa_port_enable(dp, dev-&gt;phydev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto clear_promisc;</div><div class='del'>-</div><div class='del'>-	phylink_start(dp-&gt;pl);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-clear_promisc:</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-		dev_set_promiscuity(master, -1);</div><div class='del'>-clear_allmulti:</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-		dev_set_allmulti(master, -1);</div><div class='del'>-del_unicast:</div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, master-&gt;dev_addr))</div><div class='del'>-		dev_uc_del(master, dev-&gt;dev_addr);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	phylink_stop(dp-&gt;pl);</div><div class='del'>-</div><div class='del'>-	dsa_port_disable(dp, dev-&gt;phydev);</div><div class='del'>-</div><div class='del'>-	dev_mc_unsync(master, dev);</div><div class='del'>-	dev_uc_unsync(master, dev);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-		dev_set_allmulti(master, -1);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-		dev_set_promiscuity(master, -1);</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, master-&gt;dev_addr))</div><div class='del'>-		dev_uc_del(master, dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_change_rx_flags(struct net_device *dev, int change)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-</div><div class='del'>-	if (change &amp; IFF_ALLMULTI)</div><div class='del'>-		dev_set_allmulti(master, dev-&gt;flags &amp; IFF_ALLMULTI ? 1 : -1);</div><div class='del'>-	if (change &amp; IFF_PROMISC)</div><div class='del'>-		dev_set_promiscuity(master, dev-&gt;flags &amp; IFF_PROMISC ? 1 : -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_set_rx_mode(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-</div><div class='del'>-	dev_mc_sync(master, dev);</div><div class='del'>-	dev_uc_sync(master, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_mac_address(struct net_device *dev, void *a)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-	struct sockaddr *addr = a;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='del'>-		return -EADDRNOTAVAIL;</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(addr-&gt;sa_data, master-&gt;dev_addr)) {</div><div class='del'>-		err = dev_uc_add(master, addr-&gt;sa_data);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, master-&gt;dev_addr))</div><div class='del'>-		dev_uc_del(master, dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dsa_slave_dump_ctx {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct netlink_callback *cb;</div><div class='del'>-	int idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dsa_slave_port_fdb_do_dump(const unsigned char *addr, u16 vid,</div><div class='del'>-			   bool is_static, void *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_dump_ctx *dump = data;</div><div class='del'>-	u32 portid = NETLINK_CB(dump-&gt;cb-&gt;skb).portid;</div><div class='del'>-	u32 seq = dump-&gt;cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	struct ndmsg *ndm;</div><div class='del'>-</div><div class='del'>-	if (dump-&gt;idx &lt; dump-&gt;cb-&gt;args[2])</div><div class='del'>-		goto skip;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(dump-&gt;skb, portid, seq, RTM_NEWNEIGH,</div><div class='del'>-			sizeof(*ndm), NLM_F_MULTI);</div><div class='del'>-	if (!nlh)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	ndm = nlmsg_data(nlh);</div><div class='del'>-	ndm-&gt;ndm_family  = AF_BRIDGE;</div><div class='del'>-	ndm-&gt;ndm_pad1    = 0;</div><div class='del'>-	ndm-&gt;ndm_pad2    = 0;</div><div class='del'>-	ndm-&gt;ndm_flags   = NTF_SELF;</div><div class='del'>-	ndm-&gt;ndm_type    = 0;</div><div class='del'>-	ndm-&gt;ndm_ifindex = dump-&gt;dev-&gt;ifindex;</div><div class='del'>-	ndm-&gt;ndm_state   = is_static ? NUD_NOARP : NUD_REACHABLE;</div><div class='del'>-</div><div class='del'>-	if (nla_put(dump-&gt;skb, NDA_LLADDR, ETH_ALEN, addr))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (vid &amp;&amp; nla_put_u16(dump-&gt;skb, NDA_VLAN, vid))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	nlmsg_end(dump-&gt;skb, nlh);</div><div class='del'>-</div><div class='del'>-skip:</div><div class='del'>-	dump-&gt;idx++;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	nlmsg_cancel(dump-&gt;skb, nlh);</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dsa_slave_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-		   struct net_device *dev, struct net_device *filter_dev,</div><div class='del'>-		   int *idx)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_slave_dump_ctx dump = {</div><div class='del'>-		.dev = dev,</div><div class='del'>-		.skb = skb,</div><div class='del'>-		.cb = cb,</div><div class='del'>-		.idx = *idx,</div><div class='del'>-	};</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = dsa_port_fdb_dump(dp, dsa_slave_port_fdb_do_dump, &amp;dump);</div><div class='del'>-	*idx = dump.idx;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='del'>-	int port = p-&gt;dp-&gt;index;</div><div class='del'>-</div><div class='del'>-	/* Pass through to switch driver if it supports timestamping */</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		if (ds-&gt;ops-&gt;port_hwtstamp_get)</div><div class='del'>-			return ds-&gt;ops-&gt;port_hwtstamp_get(ds, port, ifr);</div><div class='del'>-		break;</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		if (ds-&gt;ops-&gt;port_hwtstamp_set)</div><div class='del'>-			return ds-&gt;ops-&gt;port_hwtstamp_set(ds, port, ifr);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return phylink_mii_ioctl(p-&gt;dp-&gt;pl, ifr, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_port_attr_set(struct net_device *dev,</div><div class='del'>-				   const struct switchdev_attr *attr,</div><div class='del'>-				   struct switchdev_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (attr-&gt;id) {</div><div class='del'>-	case SWITCHDEV_ATTR_ID_PORT_STP_STATE:</div><div class='del'>-		ret = dsa_port_set_state(dp, attr-&gt;u.stp_state, trans);</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:</div><div class='del'>-		ret = dsa_port_vlan_filtering(dp, attr-&gt;u.vlan_filtering,</div><div class='del'>-					      trans);</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME:</div><div class='del'>-		ret = dsa_port_ageing_time(dp, attr-&gt;u.ageing_time, trans);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_port_obj_add(struct net_device *dev,</div><div class='del'>-				  const struct switchdev_obj *obj,</div><div class='del'>-				  struct switchdev_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* For the prepare phase, ensure the full set of changes is feasable in</div><div class='del'>-	 * one go in order to signal a failure properly. If an operation is not</div><div class='del'>-	 * supported, return -EOPNOTSUPP.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (obj-&gt;id) {</div><div class='del'>-	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='del'>-		err = dsa_port_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj), trans);</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_OBJ_ID_HOST_MDB:</div><div class='del'>-		/* DSA can directly translate this to a normal MDB add,</div><div class='del'>-		 * but on the CPU port.</div><div class='del'>-		 */</div><div class='del'>-		err = dsa_port_mdb_add(dp-&gt;cpu_dp, SWITCHDEV_OBJ_PORT_MDB(obj),</div><div class='del'>-				       trans);</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='del'>-		err = dsa_port_vlan_add(dp, SWITCHDEV_OBJ_PORT_VLAN(obj),</div><div class='del'>-					trans);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_port_obj_del(struct net_device *dev,</div><div class='del'>-				  const struct switchdev_obj *obj)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	switch (obj-&gt;id) {</div><div class='del'>-	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='del'>-		err = dsa_port_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_OBJ_ID_HOST_MDB:</div><div class='del'>-		/* DSA can directly translate this to a normal MDB add,</div><div class='del'>-		 * but on the CPU port.</div><div class='del'>-		 */</div><div class='del'>-		err = dsa_port_mdb_del(dp-&gt;cpu_dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='del'>-		err = dsa_port_vlan_del(dp, SWITCHDEV_OBJ_PORT_VLAN(obj));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_port_attr_get(struct net_device *dev,</div><div class='del'>-				   struct switchdev_attr *attr)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='del'>-</div><div class='del'>-	switch (attr-&gt;id) {</div><div class='del'>-	case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:</div><div class='del'>-		attr-&gt;u.ppid.id_len = sizeof(dst-&gt;index);</div><div class='del'>-		memcpy(&amp;attr-&gt;u.ppid.id, &amp;dst-&gt;index, attr-&gt;u.ppid.id_len);</div><div class='del'>-		break;</div><div class='del'>-	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:</div><div class='del'>-		attr-&gt;u.brport_flags_support = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline netdev_tx_t dsa_slave_netpoll_send_skb(struct net_device *dev,</div><div class='del'>-						     struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;netpoll)</div><div class='del'>-		netpoll_send_skb(p-&gt;netpoll, skb);</div><div class='del'>-#else</div><div class='del'>-	BUG();</div><div class='del'>-#endif</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_skb_tx_timestamp(struct dsa_slave_priv *p,</div><div class='del'>-				 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='del'>-	struct sk_buff *clone;</div><div class='del'>-	unsigned int type;</div><div class='del'>-</div><div class='del'>-	type = ptp_classify_raw(skb);</div><div class='del'>-	if (type == PTP_CLASS_NONE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;port_txtstamp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clone = skb_clone_sk(skb);</div><div class='del'>-	if (!clone)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;port_txtstamp(ds, p-&gt;dp-&gt;index, clone, type))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	kfree_skb(clone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct pcpu_sw_netstats *s;</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-</div><div class='del'>-	s = this_cpu_ptr(p-&gt;stats64);</div><div class='del'>-	u64_stats_update_begin(&amp;s-&gt;syncp);</div><div class='del'>-	s-&gt;tx_packets++;</div><div class='del'>-	s-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;s-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	/* Identify PTP protocol packets, clone them, and pass them to the</div><div class='del'>-	 * switch driver</div><div class='del'>-	 */</div><div class='del'>-	dsa_skb_tx_timestamp(p, skb);</div><div class='del'>-</div><div class='del'>-	/* Transmit function may have to reallocate the original SKB,</div><div class='del'>-	 * in which case it must have freed it. Only free it here on error.</div><div class='del'>-	 */</div><div class='del'>-	nskb = p-&gt;xmit(skb, dev);</div><div class='del'>-	if (!nskb) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* SKB for netpoll still need to be mangled with the protocol-specific</div><div class='del'>-	 * tag to be successfully transmitted</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(netpoll_tx_running(dev)))</div><div class='del'>-		return dsa_slave_netpoll_send_skb(dev, nskb);</div><div class='del'>-</div><div class='del'>-	/* Queue the SKB for transmission on the parent interface, but</div><div class='del'>-	 * do not modify its EtherType</div><div class='del'>-	 */</div><div class='del'>-	nskb-&gt;dev = dsa_slave_to_master(dev);</div><div class='del'>-	dev_queue_xmit(nskb);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ethtool operations *******************************************************/</div><div class='del'>-</div><div class='del'>-static void dsa_slave_get_drvinfo(struct net_device *dev,</div><div class='del'>-				  struct ethtool_drvinfo *drvinfo)</div><div class='del'>-{</div><div class='del'>-	strlcpy(drvinfo-&gt;driver, "dsa", sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, "platform", sizeof(drvinfo-&gt;bus_info));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_regs_len(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_regs_len)</div><div class='del'>-		return ds-&gt;ops-&gt;get_regs_len(ds, dp-&gt;index);</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dsa_slave_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_regs)</div><div class='del'>-		ds-&gt;ops-&gt;get_regs(ds, dp-&gt;index, regs, _p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_nway_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return phylink_ethtool_nway_reset(dp-&gt;pl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_eeprom_len(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;cd &amp;&amp; ds-&gt;cd-&gt;eeprom_len)</div><div class='del'>-		return ds-&gt;cd-&gt;eeprom_len;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_eeprom_len)</div><div class='del'>-		return ds-&gt;ops-&gt;get_eeprom_len(ds);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_eeprom(struct net_device *dev,</div><div class='del'>-				struct ethtool_eeprom *eeprom, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_eeprom)</div><div class='del'>-		return ds-&gt;ops-&gt;get_eeprom(ds, eeprom, data);</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_eeprom(struct net_device *dev,</div><div class='del'>-				struct ethtool_eeprom *eeprom, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;set_eeprom)</div><div class='del'>-		return ds-&gt;ops-&gt;set_eeprom(ds, eeprom, data);</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_get_strings(struct net_device *dev,</div><div class='del'>-				  uint32_t stringset, uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (stringset == ETH_SS_STATS) {</div><div class='del'>-		int len = ETH_GSTRING_LEN;</div><div class='del'>-</div><div class='del'>-		strncpy(data, "tx_packets", len);</div><div class='del'>-		strncpy(data + len, "tx_bytes", len);</div><div class='del'>-		strncpy(data + 2 * len, "rx_packets", len);</div><div class='del'>-		strncpy(data + 3 * len, "rx_bytes", len);</div><div class='del'>-		if (ds-&gt;ops-&gt;get_strings)</div><div class='del'>-			ds-&gt;ops-&gt;get_strings(ds, dp-&gt;index, stringset,</div><div class='del'>-					     data + 4 * len);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_get_ethtool_stats(struct net_device *dev,</div><div class='del'>-					struct ethtool_stats *stats,</div><div class='del'>-					uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct pcpu_sw_netstats *s;</div><div class='del'>-	unsigned int start;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		u64 tx_packets, tx_bytes, rx_packets, rx_bytes;</div><div class='del'>-</div><div class='del'>-		s = per_cpu_ptr(p-&gt;stats64, i);</div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;s-&gt;syncp);</div><div class='del'>-			tx_packets = s-&gt;tx_packets;</div><div class='del'>-			tx_bytes = s-&gt;tx_bytes;</div><div class='del'>-			rx_packets = s-&gt;rx_packets;</div><div class='del'>-			rx_bytes = s-&gt;rx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;s-&gt;syncp, start));</div><div class='del'>-		data[0] += tx_packets;</div><div class='del'>-		data[1] += tx_bytes;</div><div class='del'>-		data[2] += rx_packets;</div><div class='del'>-		data[3] += rx_bytes;</div><div class='del'>-	}</div><div class='del'>-	if (ds-&gt;ops-&gt;get_ethtool_stats)</div><div class='del'>-		ds-&gt;ops-&gt;get_ethtool_stats(ds, dp-&gt;index, data + 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_sset_count(struct net_device *dev, int sset)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (sset == ETH_SS_STATS) {</div><div class='del'>-		int count;</div><div class='del'>-</div><div class='del'>-		count = 4;</div><div class='del'>-		if (ds-&gt;ops-&gt;get_sset_count)</div><div class='del'>-			count += ds-&gt;ops-&gt;get_sset_count(ds, dp-&gt;index, sset);</div><div class='del'>-</div><div class='del'>-		return count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_get_wol(struct net_device *dev, struct ethtool_wolinfo *w)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	phylink_ethtool_get_wol(dp-&gt;pl, w);</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_wol)</div><div class='del'>-		ds-&gt;ops-&gt;get_wol(ds, dp-&gt;index, w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	phylink_ethtool_set_wol(dp-&gt;pl, w);</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;set_wol)</div><div class='del'>-		ret = ds-&gt;ops-&gt;set_wol(ds, dp-&gt;index, w);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Port's PHY and MAC both need to be EEE capable */</div><div class='del'>-	if (!dev-&gt;phydev &amp;&amp; !dp-&gt;pl)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;set_mac_eee)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	ret = ds-&gt;ops-&gt;set_mac_eee(ds, dp-&gt;index, e);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return phylink_ethtool_set_eee(dp-&gt;pl, e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Port's PHY and MAC both need to be EEE capable */</div><div class='del'>-	if (!dev-&gt;phydev &amp;&amp; !dp-&gt;pl)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;get_mac_eee)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	ret = ds-&gt;ops-&gt;get_mac_eee(ds, dp-&gt;index, e);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return phylink_ethtool_get_eee(dp-&gt;pl, e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_link_ksettings(struct net_device *dev,</div><div class='del'>-					struct ethtool_link_ksettings *cmd)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return phylink_ethtool_ksettings_get(dp-&gt;pl, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_link_ksettings(struct net_device *dev,</div><div class='del'>-					const struct ethtool_link_ksettings *cmd)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return phylink_ethtool_ksettings_set(dp-&gt;pl, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-static int dsa_slave_netpoll_setup(struct net_device *dev,</div><div class='del'>-				   struct netpoll_info *ni)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct netpoll *netpoll;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	netpoll = kzalloc(sizeof(*netpoll), GFP_KERNEL);</div><div class='del'>-	if (!netpoll)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = __netpoll_setup(netpoll, master);</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(netpoll);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p-&gt;netpoll = netpoll;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_netpoll_cleanup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct netpoll *netpoll = p-&gt;netpoll;</div><div class='del'>-</div><div class='del'>-	if (!netpoll)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	p-&gt;netpoll = NULL;</div><div class='del'>-</div><div class='del'>-	__netpoll_free_async(netpoll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_poll_controller(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_phys_port_name(struct net_device *dev,</div><div class='del'>-					char *name, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	if (snprintf(name, len, "p%d", dp-&gt;index) &gt;= len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dsa_mall_tc_entry *</div><div class='del'>-dsa_slave_mall_tc_entry_find(struct net_device *dev, unsigned long cookie)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(mall_tc_entry, &amp;p-&gt;mall_tc_list, list)</div><div class='del'>-		if (mall_tc_entry-&gt;cookie == cookie)</div><div class='del'>-			return mall_tc_entry;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_add_cls_matchall(struct net_device *dev,</div><div class='del'>-				      struct tc_cls_matchall_offload *cls,</div><div class='del'>-				      bool ingress)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='del'>-	__be16 protocol = cls-&gt;common.protocol;</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	struct net_device *to_dev;</div><div class='del'>-	const struct tc_action *a;</div><div class='del'>-	struct dsa_port *to_dp;</div><div class='del'>-	int err = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;port_mirror_add)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!tcf_exts_has_one_action(cls-&gt;exts))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	a = tcf_exts_first_action(cls-&gt;exts);</div><div class='del'>-</div><div class='del'>-	if (is_tcf_mirred_egress_mirror(a) &amp;&amp; protocol == htons(ETH_P_ALL)) {</div><div class='del'>-		struct dsa_mall_mirror_tc_entry *mirror;</div><div class='del'>-</div><div class='del'>-		to_dev = tcf_mirred_dev(a);</div><div class='del'>-		if (!to_dev)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (!dsa_slave_dev_check(to_dev))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		mall_tc_entry = kzalloc(sizeof(*mall_tc_entry), GFP_KERNEL);</div><div class='del'>-		if (!mall_tc_entry)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		mall_tc_entry-&gt;cookie = cls-&gt;cookie;</div><div class='del'>-		mall_tc_entry-&gt;type = DSA_PORT_MALL_MIRROR;</div><div class='del'>-		mirror = &amp;mall_tc_entry-&gt;mirror;</div><div class='del'>-</div><div class='del'>-		to_dp = dsa_slave_to_port(to_dev);</div><div class='del'>-</div><div class='del'>-		mirror-&gt;to_local_port = to_dp-&gt;index;</div><div class='del'>-		mirror-&gt;ingress = ingress;</div><div class='del'>-</div><div class='del'>-		err = ds-&gt;ops-&gt;port_mirror_add(ds, dp-&gt;index, mirror, ingress);</div><div class='del'>-		if (err) {</div><div class='del'>-			kfree(mall_tc_entry);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list_add_tail(&amp;mall_tc_entry-&gt;list, &amp;p-&gt;mall_tc_list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_del_cls_matchall(struct net_device *dev,</div><div class='del'>-				       struct tc_cls_matchall_offload *cls)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;port_mirror_del)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mall_tc_entry = dsa_slave_mall_tc_entry_find(dev, cls-&gt;cookie);</div><div class='del'>-	if (!mall_tc_entry)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	list_del(&amp;mall_tc_entry-&gt;list);</div><div class='del'>-</div><div class='del'>-	switch (mall_tc_entry-&gt;type) {</div><div class='del'>-	case DSA_PORT_MALL_MIRROR:</div><div class='del'>-		ds-&gt;ops-&gt;port_mirror_del(ds, dp-&gt;index, &amp;mall_tc_entry-&gt;mirror);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(mall_tc_entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,</div><div class='del'>-					   struct tc_cls_matchall_offload *cls,</div><div class='del'>-					   bool ingress)</div><div class='del'>-{</div><div class='del'>-	if (cls-&gt;common.chain_index)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (cls-&gt;command) {</div><div class='del'>-	case TC_CLSMATCHALL_REPLACE:</div><div class='del'>-		return dsa_slave_add_cls_matchall(dev, cls, ingress);</div><div class='del'>-	case TC_CLSMATCHALL_DESTROY:</div><div class='del'>-		dsa_slave_del_cls_matchall(dev, cls);</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='del'>-				       void *cb_priv, bool ingress)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = cb_priv;</div><div class='del'>-</div><div class='del'>-	if (!tc_can_offload(dev))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case TC_SETUP_CLSMATCHALL:</div><div class='del'>-		return dsa_slave_setup_tc_cls_matchall(dev, type_data, ingress);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc_block_cb_ig(enum tc_setup_type type,</div><div class='del'>-					  void *type_data, void *cb_priv)</div><div class='del'>-{</div><div class='del'>-	return dsa_slave_setup_tc_block_cb(type, type_data, cb_priv, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc_block_cb_eg(enum tc_setup_type type,</div><div class='del'>-					  void *type_data, void *cb_priv)</div><div class='del'>-{</div><div class='del'>-	return dsa_slave_setup_tc_block_cb(type, type_data, cb_priv, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc_block(struct net_device *dev,</div><div class='del'>-				    struct tc_block_offload *f)</div><div class='del'>-{</div><div class='del'>-	tc_setup_cb_t *cb;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='del'>-		cb = dsa_slave_setup_tc_block_cb_ig;</div><div class='del'>-	else if (f-&gt;binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS)</div><div class='del'>-		cb = dsa_slave_setup_tc_block_cb_eg;</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (f-&gt;command) {</div><div class='del'>-	case TC_BLOCK_BIND:</div><div class='del'>-		return tcf_block_cb_register(f-&gt;block, cb, dev, dev, f-&gt;extack);</div><div class='del'>-	case TC_BLOCK_UNBIND:</div><div class='del'>-		tcf_block_cb_unregister(f-&gt;block, cb, dev);</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='del'>-			      void *type_data)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case TC_SETUP_BLOCK:</div><div class='del'>-		return dsa_slave_setup_tc_block(dev, type_data);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_get_stats64(struct net_device *dev,</div><div class='del'>-				  struct rtnl_link_stats64 *stats)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct pcpu_sw_netstats *s;</div><div class='del'>-	unsigned int start;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	netdev_stats_to_stats64(stats, &amp;dev-&gt;stats);</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		u64 tx_packets, tx_bytes, rx_packets, rx_bytes;</div><div class='del'>-</div><div class='del'>-		s = per_cpu_ptr(p-&gt;stats64, i);</div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;s-&gt;syncp);</div><div class='del'>-			tx_packets = s-&gt;tx_packets;</div><div class='del'>-			tx_bytes = s-&gt;tx_bytes;</div><div class='del'>-			rx_packets = s-&gt;rx_packets;</div><div class='del'>-			rx_bytes = s-&gt;rx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;s-&gt;syncp, start));</div><div class='del'>-</div><div class='del'>-		stats-&gt;tx_packets += tx_packets;</div><div class='del'>-		stats-&gt;tx_bytes += tx_bytes;</div><div class='del'>-		stats-&gt;rx_packets += rx_packets;</div><div class='del'>-		stats-&gt;rx_bytes += rx_bytes;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_rxnfc(struct net_device *dev,</div><div class='del'>-			       struct ethtool_rxnfc *nfc, u32 *rule_locs)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;get_rxnfc)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return ds-&gt;ops-&gt;get_rxnfc(ds, dp-&gt;index, nfc, rule_locs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_set_rxnfc(struct net_device *dev,</div><div class='del'>-			       struct ethtool_rxnfc *nfc)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;set_rxnfc)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return ds-&gt;ops-&gt;set_rxnfc(ds, dp-&gt;index, nfc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_get_ts_info(struct net_device *dev,</div><div class='del'>-				 struct ethtool_ts_info *ts)</div><div class='del'>-{</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(dev);</div><div class='del'>-	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;get_ts_info)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return ds-&gt;ops-&gt;get_ts_info(ds, p-&gt;dp-&gt;index, ts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct ethtool_ops dsa_slave_ethtool_ops = {</div><div class='del'>-	.get_drvinfo		= dsa_slave_get_drvinfo,</div><div class='del'>-	.get_regs_len		= dsa_slave_get_regs_len,</div><div class='del'>-	.get_regs		= dsa_slave_get_regs,</div><div class='del'>-	.nway_reset		= dsa_slave_nway_reset,</div><div class='del'>-	.get_link		= ethtool_op_get_link,</div><div class='del'>-	.get_eeprom_len		= dsa_slave_get_eeprom_len,</div><div class='del'>-	.get_eeprom		= dsa_slave_get_eeprom,</div><div class='del'>-	.set_eeprom		= dsa_slave_set_eeprom,</div><div class='del'>-	.get_strings		= dsa_slave_get_strings,</div><div class='del'>-	.get_ethtool_stats	= dsa_slave_get_ethtool_stats,</div><div class='del'>-	.get_sset_count		= dsa_slave_get_sset_count,</div><div class='del'>-	.set_wol		= dsa_slave_set_wol,</div><div class='del'>-	.get_wol		= dsa_slave_get_wol,</div><div class='del'>-	.set_eee		= dsa_slave_set_eee,</div><div class='del'>-	.get_eee		= dsa_slave_get_eee,</div><div class='del'>-	.get_link_ksettings	= dsa_slave_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings	= dsa_slave_set_link_ksettings,</div><div class='del'>-	.get_rxnfc		= dsa_slave_get_rxnfc,</div><div class='del'>-	.set_rxnfc		= dsa_slave_set_rxnfc,</div><div class='del'>-	.get_ts_info		= dsa_slave_get_ts_info,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* legacy way, bypassing the bridge *****************************************/</div><div class='del'>-int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='del'>-		       struct net_device *dev,</div><div class='del'>-		       const unsigned char *addr, u16 vid,</div><div class='del'>-		       u16 flags)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return dsa_port_fdb_add(dp, addr, vid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='del'>-		       struct net_device *dev,</div><div class='del'>-		       const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-</div><div class='del'>-	return dsa_port_fdb_del(dp, addr, vid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops dsa_slave_netdev_ops = {</div><div class='del'>-	.ndo_open	 	= dsa_slave_open,</div><div class='del'>-	.ndo_stop		= dsa_slave_close,</div><div class='del'>-	.ndo_start_xmit		= dsa_slave_xmit,</div><div class='del'>-	.ndo_change_rx_flags	= dsa_slave_change_rx_flags,</div><div class='del'>-	.ndo_set_rx_mode	= dsa_slave_set_rx_mode,</div><div class='del'>-	.ndo_set_mac_address	= dsa_slave_set_mac_address,</div><div class='del'>-	.ndo_fdb_add		= dsa_legacy_fdb_add,</div><div class='del'>-	.ndo_fdb_del		= dsa_legacy_fdb_del,</div><div class='del'>-	.ndo_fdb_dump		= dsa_slave_fdb_dump,</div><div class='del'>-	.ndo_do_ioctl		= dsa_slave_ioctl,</div><div class='del'>-	.ndo_get_iflink		= dsa_slave_get_iflink,</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	.ndo_netpoll_setup	= dsa_slave_netpoll_setup,</div><div class='del'>-	.ndo_netpoll_cleanup	= dsa_slave_netpoll_cleanup,</div><div class='del'>-	.ndo_poll_controller	= dsa_slave_poll_controller,</div><div class='del'>-#endif</div><div class='del'>-	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,</div><div class='del'>-	.ndo_setup_tc		= dsa_slave_setup_tc,</div><div class='del'>-	.ndo_get_stats64	= dsa_slave_get_stats64,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct switchdev_ops dsa_slave_switchdev_ops = {</div><div class='del'>-	.switchdev_port_attr_get	= dsa_slave_port_attr_get,</div><div class='del'>-	.switchdev_port_attr_set	= dsa_slave_port_attr_set,</div><div class='del'>-	.switchdev_port_obj_add		= dsa_slave_port_obj_add,</div><div class='del'>-	.switchdev_port_obj_del		= dsa_slave_port_obj_del,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct device_type dsa_type = {</div><div class='del'>-	.name	= "dsa",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_validate(struct net_device *dev,</div><div class='del'>-				       unsigned long *supported,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_validate)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ds-&gt;ops-&gt;phylink_validate(ds, dp-&gt;index, supported, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_phylink_mac_link_state(struct net_device *dev,</div><div class='del'>-					    struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	/* Only called for SGMII and 802.3z */</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_mac_link_state)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return ds-&gt;ops-&gt;phylink_mac_link_state(ds, dp-&gt;index, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_mac_config(struct net_device *dev,</div><div class='del'>-					 unsigned int mode,</div><div class='del'>-					 const struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_mac_config)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ds-&gt;ops-&gt;phylink_mac_config(ds, dp-&gt;index, mode, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_mac_an_restart(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_mac_an_restart)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ds-&gt;ops-&gt;phylink_mac_an_restart(ds, dp-&gt;index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_mac_link_down(struct net_device *dev,</div><div class='del'>-					    unsigned int mode,</div><div class='del'>-					    phy_interface_t interface)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_mac_link_down) {</div><div class='del'>-		if (ds-&gt;ops-&gt;adjust_link &amp;&amp; dev-&gt;phydev)</div><div class='del'>-			ds-&gt;ops-&gt;adjust_link(ds, dp-&gt;index, dev-&gt;phydev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ds-&gt;ops-&gt;phylink_mac_link_down(ds, dp-&gt;index, mode, interface);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_mac_link_up(struct net_device *dev,</div><div class='del'>-					  unsigned int mode,</div><div class='del'>-					  phy_interface_t interface,</div><div class='del'>-					  struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;ops-&gt;phylink_mac_link_up) {</div><div class='del'>-		if (ds-&gt;ops-&gt;adjust_link &amp;&amp; dev-&gt;phydev)</div><div class='del'>-			ds-&gt;ops-&gt;adjust_link(ds, dp-&gt;index, dev-&gt;phydev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ds-&gt;ops-&gt;phylink_mac_link_up(ds, dp-&gt;index, mode, interface, phydev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct phylink_mac_ops dsa_slave_phylink_mac_ops = {</div><div class='del'>-	.validate = dsa_slave_phylink_validate,</div><div class='del'>-	.mac_link_state = dsa_slave_phylink_mac_link_state,</div><div class='del'>-	.mac_config = dsa_slave_phylink_mac_config,</div><div class='del'>-	.mac_an_restart = dsa_slave_phylink_mac_an_restart,</div><div class='del'>-	.mac_link_down = dsa_slave_phylink_mac_link_down,</div><div class='del'>-	.mac_link_up = dsa_slave_phylink_mac_link_up,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up)</div><div class='del'>-{</div><div class='del'>-	const struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='del'>-</div><div class='del'>-	phylink_mac_change(dp-&gt;pl, up);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_change);</div><div class='del'>-</div><div class='del'>-static void dsa_slave_phylink_fixed_state(struct net_device *dev,</div><div class='del'>-					  struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	/* No need to check that this operation is valid, the callback would</div><div class='del'>-	 * not be called if it was not.</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;ops-&gt;phylink_fixed_state(ds, dp-&gt;index, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* slave device setup *******************************************************/</div><div class='del'>-static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(slave_dev);</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-</div><div class='del'>-	slave_dev-&gt;phydev = mdiobus_get_phy(ds-&gt;slave_mii_bus, addr);</div><div class='del'>-	if (!slave_dev-&gt;phydev) {</div><div class='del'>-		netdev_err(slave_dev, "no phy at %d\n", addr);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return phylink_connect_phy(dp-&gt;pl, slave_dev-&gt;phydev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_phy_setup(struct net_device *slave_dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(slave_dev);</div><div class='del'>-	struct device_node *port_dn = dp-&gt;dn;</div><div class='del'>-	struct dsa_switch *ds = dp-&gt;ds;</div><div class='del'>-	u32 phy_flags = 0;</div><div class='del'>-	int mode, ret;</div><div class='del'>-</div><div class='del'>-	mode = of_get_phy_mode(port_dn);</div><div class='del'>-	if (mode &lt; 0)</div><div class='del'>-		mode = PHY_INTERFACE_MODE_NA;</div><div class='del'>-</div><div class='del'>-	dp-&gt;pl = phylink_create(slave_dev, of_fwnode_handle(port_dn), mode,</div><div class='del'>-				&amp;dsa_slave_phylink_mac_ops);</div><div class='del'>-	if (IS_ERR(dp-&gt;pl)) {</div><div class='del'>-		netdev_err(slave_dev,</div><div class='del'>-			   "error creating PHYLINK: %ld\n", PTR_ERR(dp-&gt;pl));</div><div class='del'>-		return PTR_ERR(dp-&gt;pl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register only if the switch provides such a callback, since this</div><div class='del'>-	 * callback takes precedence over polling the link GPIO in PHYLINK</div><div class='del'>-	 * (see phylink_get_fixed_state).</div><div class='del'>-	 */</div><div class='del'>-	if (ds-&gt;ops-&gt;phylink_fixed_state)</div><div class='del'>-		phylink_fixed_state_cb(dp-&gt;pl, dsa_slave_phylink_fixed_state);</div><div class='del'>-</div><div class='del'>-	if (ds-&gt;ops-&gt;get_phy_flags)</div><div class='del'>-		phy_flags = ds-&gt;ops-&gt;get_phy_flags(ds, dp-&gt;index);</div><div class='del'>-</div><div class='del'>-	ret = phylink_of_phy_connect(dp-&gt;pl, port_dn, phy_flags);</div><div class='del'>-	if (ret == -ENODEV) {</div><div class='del'>-		/* We could not connect to a designated PHY or SFP, so use the</div><div class='del'>-		 * switch internal MDIO bus instead</div><div class='del'>-		 */</div><div class='del'>-		ret = dsa_slave_phy_connect(slave_dev, dp-&gt;index);</div><div class='del'>-		if (ret) {</div><div class='del'>-			netdev_err(slave_dev,</div><div class='del'>-				   "failed to connect to port %d: %d\n",</div><div class='del'>-				   dp-&gt;index, ret);</div><div class='del'>-			phylink_destroy(dp-&gt;pl);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct lock_class_key dsa_slave_netdev_xmit_lock_key;</div><div class='del'>-static void dsa_slave_set_lockdep_class_one(struct net_device *dev,</div><div class='del'>-					    struct netdev_queue *txq,</div><div class='del'>-					    void *_unused)</div><div class='del'>-{</div><div class='del'>-	lockdep_set_class(&amp;txq-&gt;_xmit_lock,</div><div class='del'>-			  &amp;dsa_slave_netdev_xmit_lock_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dsa_slave_suspend(struct net_device *slave_dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(slave_dev);</div><div class='del'>-</div><div class='del'>-	if (!netif_running(slave_dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	netif_device_detach(slave_dev);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	phylink_stop(dp-&gt;pl);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dsa_slave_resume(struct net_device *slave_dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(slave_dev);</div><div class='del'>-</div><div class='del'>-	if (!netif_running(slave_dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	netif_device_attach(slave_dev);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	phylink_start(dp-&gt;pl);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_slave_notify(struct net_device *dev, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	struct net_device *master = dsa_slave_to_master(dev);</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct dsa_notifier_register_info rinfo = {</div><div class='del'>-		.switch_number = dp-&gt;ds-&gt;index,</div><div class='del'>-		.port_number = dp-&gt;index,</div><div class='del'>-		.master = master,</div><div class='del'>-		.info.dev = dev,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	call_dsa_notifiers(val, dev, &amp;rinfo.info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dsa_slave_create(struct dsa_port *port)</div><div class='del'>-{</div><div class='del'>-	const struct dsa_port *cpu_dp = port-&gt;cpu_dp;</div><div class='del'>-	struct net_device *master = cpu_dp-&gt;master;</div><div class='del'>-	struct dsa_switch *ds = port-&gt;ds;</div><div class='del'>-	const char *name = port-&gt;name;</div><div class='del'>-	struct net_device *slave_dev;</div><div class='del'>-	struct dsa_slave_priv *p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ds-&gt;num_tx_queues)</div><div class='del'>-		ds-&gt;num_tx_queues = 1;</div><div class='del'>-</div><div class='del'>-	slave_dev = alloc_netdev_mqs(sizeof(struct dsa_slave_priv), name,</div><div class='del'>-				     NET_NAME_UNKNOWN, ether_setup,</div><div class='del'>-				     ds-&gt;num_tx_queues, 1);</div><div class='del'>-	if (slave_dev == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	slave_dev-&gt;features = master-&gt;vlan_features | NETIF_F_HW_TC;</div><div class='del'>-	slave_dev-&gt;hw_features |= NETIF_F_HW_TC;</div><div class='del'>-	slave_dev-&gt;ethtool_ops = &amp;dsa_slave_ethtool_ops;</div><div class='del'>-	eth_hw_addr_inherit(slave_dev, master);</div><div class='del'>-	slave_dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='del'>-	slave_dev-&gt;netdev_ops = &amp;dsa_slave_netdev_ops;</div><div class='del'>-	slave_dev-&gt;switchdev_ops = &amp;dsa_slave_switchdev_ops;</div><div class='del'>-	slave_dev-&gt;min_mtu = 0;</div><div class='del'>-	slave_dev-&gt;max_mtu = ETH_MAX_MTU;</div><div class='del'>-	SET_NETDEV_DEVTYPE(slave_dev, &amp;dsa_type);</div><div class='del'>-</div><div class='del'>-	netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,</div><div class='del'>-				 NULL);</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(slave_dev, port-&gt;ds-&gt;dev);</div><div class='del'>-	slave_dev-&gt;dev.of_node = port-&gt;dn;</div><div class='del'>-	slave_dev-&gt;vlan_features = master-&gt;vlan_features;</div><div class='del'>-</div><div class='del'>-	p = netdev_priv(slave_dev);</div><div class='del'>-	p-&gt;stats64 = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!p-&gt;stats64) {</div><div class='del'>-		free_netdev(slave_dev);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	p-&gt;dp = port;</div><div class='del'>-	INIT_LIST_HEAD(&amp;p-&gt;mall_tc_list);</div><div class='del'>-	p-&gt;xmit = cpu_dp-&gt;tag_ops-&gt;xmit;</div><div class='del'>-	port-&gt;slave = slave_dev;</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(slave_dev);</div><div class='del'>-</div><div class='del'>-	ret = dsa_slave_phy_setup(slave_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(master, "error %d setting up slave phy\n", ret);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dsa_slave_notify(slave_dev, DSA_PORT_REGISTER);</div><div class='del'>-</div><div class='del'>-	ret = register_netdev(slave_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(master, "error %d registering interface %s\n",</div><div class='del'>-			   ret, slave_dev-&gt;name);</div><div class='del'>-		goto out_phy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_phy:</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	phylink_disconnect_phy(p-&gt;dp-&gt;pl);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	phylink_destroy(p-&gt;dp-&gt;pl);</div><div class='del'>-out_free:</div><div class='del'>-	free_percpu(p-&gt;stats64);</div><div class='del'>-	free_netdev(slave_dev);</div><div class='del'>-	port-&gt;slave = NULL;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_slave_destroy(struct net_device *slave_dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(slave_dev);</div><div class='del'>-	struct dsa_slave_priv *p = netdev_priv(slave_dev);</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(slave_dev);</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	phylink_disconnect_phy(dp-&gt;pl);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	dsa_slave_notify(slave_dev, DSA_PORT_UNREGISTER);</div><div class='del'>-	unregister_netdev(slave_dev);</div><div class='del'>-	phylink_destroy(dp-&gt;pl);</div><div class='del'>-	free_percpu(p-&gt;stats64);</div><div class='del'>-	free_netdev(slave_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dsa_slave_dev_check(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;netdev_ops == &amp;dsa_slave_netdev_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_changeupper(struct net_device *dev,</div><div class='del'>-				 struct netdev_notifier_changeupper_info *info)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int err = NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (netif_is_bridge_master(info-&gt;upper_dev)) {</div><div class='del'>-		if (info-&gt;linking) {</div><div class='del'>-			err = dsa_port_bridge_join(dp, info-&gt;upper_dev);</div><div class='del'>-			err = notifier_from_errno(err);</div><div class='del'>-		} else {</div><div class='del'>-			dsa_port_bridge_leave(dp, info-&gt;upper_dev);</div><div class='del'>-			err = NOTIFY_OK;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsa_slave_netdevice_event(struct notifier_block *nb,</div><div class='del'>-				     unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-</div><div class='del'>-	if (!dsa_slave_dev_check(dev))</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (event == NETDEV_CHANGEUPPER)</div><div class='del'>-		return dsa_slave_changeupper(dev, ptr);</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dsa_switchdev_event_work {</div><div class='del'>-	struct work_struct work;</div><div class='del'>-	struct switchdev_notifier_fdb_info fdb_info;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned long event;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dsa_slave_switchdev_event_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switchdev_event_work *switchdev_work =</div><div class='del'>-		container_of(work, struct dsa_switchdev_event_work, work);</div><div class='del'>-	struct net_device *dev = switchdev_work-&gt;dev;</div><div class='del'>-	struct switchdev_notifier_fdb_info *fdb_info;</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	switch (switchdev_work-&gt;event) {</div><div class='del'>-	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='del'>-		fdb_info = &amp;switchdev_work-&gt;fdb_info;</div><div class='del'>-		if (!fdb_info-&gt;added_by_user)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		err = dsa_port_fdb_add(dp, fdb_info-&gt;addr, fdb_info-&gt;vid);</div><div class='del'>-		if (err) {</div><div class='del'>-			netdev_dbg(dev, "fdb add failed err=%d\n", err);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED, dev,</div><div class='del'>-					 &amp;fdb_info-&gt;info);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='del'>-		fdb_info = &amp;switchdev_work-&gt;fdb_info;</div><div class='del'>-		if (!fdb_info-&gt;added_by_user)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		err = dsa_port_fdb_del(dp, fdb_info-&gt;addr, fdb_info-&gt;vid);</div><div class='del'>-		if (err) {</div><div class='del'>-			netdev_dbg(dev, "fdb del failed err=%d\n", err);</div><div class='del'>-			dev_close(dev);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	kfree(switchdev_work-&gt;fdb_info.addr);</div><div class='del'>-	kfree(switchdev_work);</div><div class='del'>-	dev_put(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dsa_slave_switchdev_fdb_work_init(struct dsa_switchdev_event_work *</div><div class='del'>-				  switchdev_work,</div><div class='del'>-				  const struct switchdev_notifier_fdb_info *</div><div class='del'>-				  fdb_info)</div><div class='del'>-{</div><div class='del'>-	memcpy(&amp;switchdev_work-&gt;fdb_info, fdb_info,</div><div class='del'>-	       sizeof(switchdev_work-&gt;fdb_info));</div><div class='del'>-	switchdev_work-&gt;fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);</div><div class='del'>-	if (!switchdev_work-&gt;fdb_info.addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ether_addr_copy((u8 *)switchdev_work-&gt;fdb_info.addr,</div><div class='del'>-			fdb_info-&gt;addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called under rcu_read_lock() */</div><div class='del'>-static int dsa_slave_switchdev_event(struct notifier_block *unused,</div><div class='del'>-				     unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct dsa_switchdev_event_work *switchdev_work;</div><div class='del'>-</div><div class='del'>-	if (!dsa_slave_dev_check(dev))</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);</div><div class='del'>-	if (!switchdev_work)</div><div class='del'>-		return NOTIFY_BAD;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;switchdev_work-&gt;work,</div><div class='del'>-		  dsa_slave_switchdev_event_work);</div><div class='del'>-	switchdev_work-&gt;dev = dev;</div><div class='del'>-	switchdev_work-&gt;event = event;</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case SWITCHDEV_FDB_ADD_TO_DEVICE: /* fall through */</div><div class='del'>-	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='del'>-		if (dsa_slave_switchdev_fdb_work_init(switchdev_work, ptr))</div><div class='del'>-			goto err_fdb_work_init;</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		kfree(switchdev_work);</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dsa_schedule_work(&amp;switchdev_work-&gt;work);</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-</div><div class='del'>-err_fdb_work_init:</div><div class='del'>-	kfree(switchdev_work);</div><div class='del'>-	return NOTIFY_BAD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block dsa_slave_nb __read_mostly = {</div><div class='del'>-	.notifier_call  = dsa_slave_netdevice_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct notifier_block dsa_slave_switchdev_notifier = {</div><div class='del'>-	.notifier_call = dsa_slave_switchdev_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int dsa_slave_register_notifier(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = register_netdevice_notifier(&amp;dsa_slave_nb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = register_switchdev_notifier(&amp;dsa_slave_switchdev_notifier);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_switchdev_nb;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_switchdev_nb:</div><div class='del'>-	unregister_netdevice_notifier(&amp;dsa_slave_nb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dsa_slave_unregister_notifier(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = unregister_switchdev_notifier(&amp;dsa_slave_switchdev_notifier);</div><div class='del'>-	if (err)</div><div class='del'>-		pr_err("DSA: failed to unregister switchdev notifier (%d)\n", err);</div><div class='del'>-</div><div class='del'>-	err = unregister_netdevice_notifier(&amp;dsa_slave_nb);</div><div class='del'>-	if (err)</div><div class='del'>-		pr_err("DSA: failed to unregister slave notifier (%d)\n", err);</div><div class='del'>-}</div><div class='head'>diff --git a/net/dsa/stubs.c b/net/dsa/stubs.c<br/>new file mode 100644<br/>index 000000000000..2ed8a6c85fbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/stubs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/stubs.c</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Stubs for DSA functionality called by the core network stack.</div><div class='add'>+ * These are necessary because CONFIG_NET_DSA can be a module, and built-in</div><div class='add'>+ * code cannot directly call symbols exported by modules.</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/dsa_stubs.h&gt;</div><div class='add'>+</div><div class='add'>+const struct dsa_stubs *dsa_stubs;</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_stubs);</div><div class='head'>diff --git a/net/dsa/switch.c b/net/dsa/switch.c<br/>index 142b294d3446..3d2feeea897b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/switch.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/switch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/switch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/switch.c</a></div><div class='hunk'>@@ -1,32 +1,33 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Handling of a single switch chip, part of a switch fabric</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2017 Savoir-faire Linux Inc.</div><div class='ctx'>  *	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "dsa.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "switch.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+#include "user.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int dsa_switch_fastest_ageing_time(struct dsa_switch *ds,</div><div class='ctx'> 						   unsigned int ageing_time)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ds-&gt;num_ports; ++i) {</div><div class='del'>-		struct dsa_port *dp = &amp;ds-&gt;ports[i];</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> </div><div class='add'>+	dsa_switch_for_each_port(dp, ds)</div><div class='ctx'> 		if (dp-&gt;ageing_time &amp;&amp; dp-&gt;ageing_time &lt; ageing_time)</div><div class='ctx'> 			ageing_time = dp-&gt;ageing_time;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ageing_time;</div><div class='ctx'> }</div><div class='hunk'>@@ -35,15 +36,12 @@ static int dsa_switch_ageing_time(struct dsa_switch *ds,</div><div class='ctx'> 				  struct dsa_notifier_ageing_time_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ageing_time = info-&gt;ageing_time;</div><div class='del'>-	struct switchdev_trans *trans = info-&gt;trans;</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans)) {</div><div class='del'>-		if (ds-&gt;ageing_time_min &amp;&amp; ageing_time &lt; ds-&gt;ageing_time_min)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		if (ds-&gt;ageing_time_max &amp;&amp; ageing_time &gt; ds-&gt;ageing_time_max)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (ds-&gt;ageing_time_min &amp;&amp; ageing_time &lt; ds-&gt;ageing_time_min)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ageing_time_max &amp;&amp; ageing_time &gt; ds-&gt;ageing_time_max)</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	/* Program the fastest ageing time in case of multiple bridges */</div><div class='ctx'> 	ageing_time = dsa_switch_fastest_ageing_time(ds, ageing_time);</div><div class='hunk'>@@ -54,15 +52,60 @@ static int dsa_switch_ageing_time(struct dsa_switch *ds,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool dsa_port_mtu_match(struct dsa_port *dp,</div><div class='add'>+			       struct dsa_notifier_mtu_info *info)</div><div class='add'>+{</div><div class='add'>+	return dp == info-&gt;dp || dsa_port_is_dsa(dp) || dsa_port_is_cpu(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_mtu(struct dsa_switch *ds,</div><div class='add'>+			  struct dsa_notifier_mtu_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_change_mtu)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_mtu_match(dp, info)) {</div><div class='add'>+			ret = ds-&gt;ops-&gt;port_change_mtu(ds, dp-&gt;index,</div><div class='add'>+						       info-&gt;mtu);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dsa_switch_bridge_join(struct dsa_switch *ds,</div><div class='ctx'> 				  struct dsa_notifier_bridge_info *info)</div><div class='ctx'> {</div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index &amp;&amp; ds-&gt;ops-&gt;port_bridge_join)</div><div class='del'>-		return ds-&gt;ops-&gt;port_bridge_join(ds, info-&gt;port, info-&gt;br);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;dp-&gt;ds == ds) {</div><div class='add'>+		if (!ds-&gt;ops-&gt;port_bridge_join)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = ds-&gt;ops-&gt;port_bridge_join(ds, info-&gt;dp-&gt;index,</div><div class='add'>+						info-&gt;bridge,</div><div class='add'>+						&amp;info-&gt;tx_fwd_offload,</div><div class='add'>+						info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;index != info-&gt;sw_index &amp;&amp; ds-&gt;ops-&gt;crosschip_bridge_join)</div><div class='del'>-		return ds-&gt;ops-&gt;crosschip_bridge_join(ds, info-&gt;sw_index,</div><div class='del'>-						      info-&gt;port, info-&gt;br);</div><div class='add'>+	if (info-&gt;dp-&gt;ds != ds &amp;&amp; ds-&gt;ops-&gt;crosschip_bridge_join) {</div><div class='add'>+		err = ds-&gt;ops-&gt;crosschip_bridge_join(ds,</div><div class='add'>+						     info-&gt;dp-&gt;ds-&gt;dst-&gt;index,</div><div class='add'>+						     info-&gt;dp-&gt;ds-&gt;index,</div><div class='add'>+						     info-&gt;dp-&gt;index,</div><div class='add'>+						     info-&gt;bridge,</div><div class='add'>+						     info-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -70,153 +113,698 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds,</div><div class='ctx'> static int dsa_switch_bridge_leave(struct dsa_switch *ds,</div><div class='ctx'> 				   struct dsa_notifier_bridge_info *info)</div><div class='ctx'> {</div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index &amp;&amp; ds-&gt;ops-&gt;port_bridge_leave)</div><div class='del'>-		ds-&gt;ops-&gt;port_bridge_leave(ds, info-&gt;port, info-&gt;br);</div><div class='add'>+	if (info-&gt;dp-&gt;ds == ds &amp;&amp; ds-&gt;ops-&gt;port_bridge_leave)</div><div class='add'>+		ds-&gt;ops-&gt;port_bridge_leave(ds, info-&gt;dp-&gt;index, info-&gt;bridge);</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;index != info-&gt;sw_index &amp;&amp; ds-&gt;ops-&gt;crosschip_bridge_leave)</div><div class='del'>-		ds-&gt;ops-&gt;crosschip_bridge_leave(ds, info-&gt;sw_index, info-&gt;port,</div><div class='del'>-						info-&gt;br);</div><div class='add'>+	if (info-&gt;dp-&gt;ds != ds &amp;&amp; ds-&gt;ops-&gt;crosschip_bridge_leave)</div><div class='add'>+		ds-&gt;ops-&gt;crosschip_bridge_leave(ds, info-&gt;dp-&gt;ds-&gt;dst-&gt;index,</div><div class='add'>+						info-&gt;dp-&gt;ds-&gt;index,</div><div class='add'>+						info-&gt;dp-&gt;index,</div><div class='add'>+						info-&gt;bridge);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Matches for all upstream-facing ports (the CPU port and all upstream-facing</div><div class='add'>+ * DSA links) that sit between the targeted port on which the notifier was</div><div class='add'>+ * emitted and its dedicated CPU port.</div><div class='add'>+ */</div><div class='add'>+static bool dsa_port_host_address_match(struct dsa_port *dp,</div><div class='add'>+					const struct dsa_port *targeted_dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = targeted_dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_is_upstream_of(dp-&gt;ds, targeted_dp-&gt;ds))</div><div class='add'>+		return dp-&gt;index == dsa_towards_port(dp-&gt;ds, cpu_dp-&gt;ds-&gt;index,</div><div class='add'>+						     cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dsa_mac_addr *dsa_mac_addr_find(struct list_head *addr_list,</div><div class='add'>+					      const unsigned char *addr, u16 vid,</div><div class='add'>+					      struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(a, addr_list, list)</div><div class='add'>+		if (ether_addr_equal(a-&gt;addr, addr) &amp;&amp; a-&gt;vid == vid &amp;&amp;</div><div class='add'>+		    dsa_db_equal(&amp;a-&gt;db, &amp;db))</div><div class='add'>+			return a;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_mdb_add(struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_mdb_add(ds, port, mdb, db);</div><div class='add'>+		trace_dsa_mdb_add_hw(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;dp-&gt;mdbs, mdb-&gt;addr, mdb-&gt;vid, db);</div><div class='add'>+	if (a) {</div><div class='add'>+		refcount_inc(&amp;a-&gt;refcount);</div><div class='add'>+		trace_dsa_mdb_add_bump(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db,</div><div class='add'>+				       &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a = kzalloc(sizeof(*a), GFP_KERNEL);</div><div class='add'>+	if (!a) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_mdb_add(ds, port, mdb, db);</div><div class='add'>+	trace_dsa_mdb_add_hw(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(a);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(a-&gt;addr, mdb-&gt;addr);</div><div class='add'>+	a-&gt;vid = mdb-&gt;vid;</div><div class='add'>+	a-&gt;db = db;</div><div class='add'>+	refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;a-&gt;list, &amp;dp-&gt;mdbs);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_mdb_del(struct dsa_port *dp,</div><div class='add'>+			       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_mdb_del(ds, port, mdb, db);</div><div class='add'>+		trace_dsa_mdb_del_hw(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;dp-&gt;mdbs, mdb-&gt;addr, mdb-&gt;vid, db);</div><div class='add'>+	if (!a) {</div><div class='add'>+		trace_dsa_mdb_del_not_found(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;a-&gt;refcount)) {</div><div class='add'>+		trace_dsa_mdb_del_drop(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db,</div><div class='add'>+				       &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_mdb_del(ds, port, mdb, db);</div><div class='add'>+	trace_dsa_mdb_del_hw(dp, mdb-&gt;addr, mdb-&gt;vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;a-&gt;list);</div><div class='add'>+	kfree(a);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_fdb_add(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			       u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_fdb_add(ds, port, addr, vid, db);</div><div class='add'>+		trace_dsa_fdb_add_hw(dp, addr, vid, &amp;db, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;dp-&gt;fdbs, addr, vid, db);</div><div class='add'>+	if (a) {</div><div class='add'>+		refcount_inc(&amp;a-&gt;refcount);</div><div class='add'>+		trace_dsa_fdb_add_bump(dp, addr, vid, &amp;db, &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a = kzalloc(sizeof(*a), GFP_KERNEL);</div><div class='add'>+	if (!a) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_fdb_add(ds, port, addr, vid, db);</div><div class='add'>+	trace_dsa_fdb_add_hw(dp, addr, vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(a);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(a-&gt;addr, addr);</div><div class='add'>+	a-&gt;vid = vid;</div><div class='add'>+	a-&gt;db = db;</div><div class='add'>+	refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;a-&gt;list, &amp;dp-&gt;fdbs);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_fdb_del(struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+			       u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_fdb_del(ds, port, addr, vid, db);</div><div class='add'>+		trace_dsa_fdb_del_hw(dp, addr, vid, &amp;db, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;dp-&gt;fdbs, addr, vid, db);</div><div class='add'>+	if (!a) {</div><div class='add'>+		trace_dsa_fdb_del_not_found(dp, addr, vid, &amp;db);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;a-&gt;refcount)) {</div><div class='add'>+		trace_dsa_fdb_del_drop(dp, addr, vid, &amp;db, &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_fdb_del(ds, port, addr, vid, db);</div><div class='add'>+	trace_dsa_fdb_del_hw(dp, addr, vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;a-&gt;list);</div><div class='add'>+	kfree(a);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;addr_lists_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_do_lag_fdb_add(struct dsa_switch *ds, struct dsa_lag *lag,</div><div class='add'>+				     const unsigned char *addr, u16 vid,</div><div class='add'>+				     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lag-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;lag-&gt;fdbs, addr, vid, db);</div><div class='add'>+	if (a) {</div><div class='add'>+		refcount_inc(&amp;a-&gt;refcount);</div><div class='add'>+		trace_dsa_lag_fdb_add_bump(lag-&gt;dev, addr, vid, &amp;db,</div><div class='add'>+					   &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a = kzalloc(sizeof(*a), GFP_KERNEL);</div><div class='add'>+	if (!a) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;lag_fdb_add(ds, *lag, addr, vid, db);</div><div class='add'>+	trace_dsa_lag_fdb_add_hw(lag-&gt;dev, addr, vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(a);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(a-&gt;addr, addr);</div><div class='add'>+	a-&gt;vid = vid;</div><div class='add'>+	a-&gt;db = db;</div><div class='add'>+	refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;a-&gt;list, &amp;lag-&gt;fdbs);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;lag-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_do_lag_fdb_del(struct dsa_switch *ds, struct dsa_lag *lag,</div><div class='add'>+				     const unsigned char *addr, u16 vid,</div><div class='add'>+				     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct dsa_mac_addr *a;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lag-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	a = dsa_mac_addr_find(&amp;lag-&gt;fdbs, addr, vid, db);</div><div class='add'>+	if (!a) {</div><div class='add'>+		trace_dsa_lag_fdb_del_not_found(lag-&gt;dev, addr, vid, &amp;db);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;a-&gt;refcount)) {</div><div class='add'>+		trace_dsa_lag_fdb_del_drop(lag-&gt;dev, addr, vid, &amp;db,</div><div class='add'>+					   &amp;a-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;lag_fdb_del(ds, *lag, addr, vid, db);</div><div class='add'>+	trace_dsa_lag_fdb_del_hw(lag-&gt;dev, addr, vid, &amp;db, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		refcount_set(&amp;a-&gt;refcount, 1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;a-&gt;list);</div><div class='add'>+	kfree(a);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;lag-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_host_fdb_add(struct dsa_switch *ds,</div><div class='add'>+				   struct dsa_notifier_fdb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_fdb_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_address_match(dp, info-&gt;dp)) {</div><div class='add'>+			if (dsa_port_is_cpu(dp) &amp;&amp; info-&gt;dp-&gt;cpu_port_in_lag) {</div><div class='add'>+				err = dsa_switch_do_lag_fdb_add(ds, dp-&gt;lag,</div><div class='add'>+								info-&gt;addr,</div><div class='add'>+								info-&gt;vid,</div><div class='add'>+								info-&gt;db);</div><div class='add'>+			} else {</div><div class='add'>+				err = dsa_port_do_fdb_add(dp, info-&gt;addr,</div><div class='add'>+							  info-&gt;vid, info-&gt;db);</div><div class='add'>+			}</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_host_fdb_del(struct dsa_switch *ds,</div><div class='add'>+				   struct dsa_notifier_fdb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_fdb_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_address_match(dp, info-&gt;dp)) {</div><div class='add'>+			if (dsa_port_is_cpu(dp) &amp;&amp; info-&gt;dp-&gt;cpu_port_in_lag) {</div><div class='add'>+				err = dsa_switch_do_lag_fdb_del(ds, dp-&gt;lag,</div><div class='add'>+								info-&gt;addr,</div><div class='add'>+								info-&gt;vid,</div><div class='add'>+								info-&gt;db);</div><div class='add'>+			} else {</div><div class='add'>+				err = dsa_port_do_fdb_del(dp, info-&gt;addr,</div><div class='add'>+							  info-&gt;vid, info-&gt;db);</div><div class='add'>+			}</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dsa_switch_fdb_add(struct dsa_switch *ds,</div><div class='ctx'> 			      struct dsa_notifier_fdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	int port = dsa_towards_port(ds, info-&gt;sw_index, info-&gt;port);</div><div class='add'>+	int port = dsa_towards_port(ds, info-&gt;dp-&gt;ds-&gt;index, info-&gt;dp-&gt;index);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> </div><div class='ctx'> 	if (!ds-&gt;ops-&gt;port_fdb_add)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return ds-&gt;ops-&gt;port_fdb_add(ds, port, info-&gt;addr, info-&gt;vid);</div><div class='add'>+	return dsa_port_do_fdb_add(dp, info-&gt;addr, info-&gt;vid, info-&gt;db);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_switch_fdb_del(struct dsa_switch *ds,</div><div class='ctx'> 			      struct dsa_notifier_fdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	int port = dsa_towards_port(ds, info-&gt;sw_index, info-&gt;port);</div><div class='add'>+	int port = dsa_towards_port(ds, info-&gt;dp-&gt;ds-&gt;index, info-&gt;dp-&gt;index);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> </div><div class='ctx'> 	if (!ds-&gt;ops-&gt;port_fdb_del)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return ds-&gt;ops-&gt;port_fdb_del(ds, port, info-&gt;addr, info-&gt;vid);</div><div class='add'>+	return dsa_port_do_fdb_del(dp, info-&gt;addr, info-&gt;vid, info-&gt;db);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-dsa_switch_mdb_prepare_bitmap(struct dsa_switch *ds,</div><div class='del'>-			      const struct switchdev_obj_port_mdb *mdb,</div><div class='del'>-			      const unsigned long *bitmap)</div><div class='add'>+static int dsa_switch_lag_fdb_add(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_lag_fdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	int port, err;</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> </div><div class='del'>-	if (!ds-&gt;ops-&gt;port_mdb_prepare || !ds-&gt;ops-&gt;port_mdb_add)</div><div class='add'>+	if (!ds-&gt;ops-&gt;lag_fdb_add)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(port, bitmap, ds-&gt;num_ports) {</div><div class='del'>-		err = ds-&gt;ops-&gt;port_mdb_prepare(ds, port, mdb);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	/* Notify switch only if it has a port in this LAG */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds)</div><div class='add'>+		if (dsa_port_offloads_lag(dp, info-&gt;lag))</div><div class='add'>+			return dsa_switch_do_lag_fdb_add(ds, info-&gt;lag,</div><div class='add'>+							 info-&gt;addr, info-&gt;vid,</div><div class='add'>+							 info-&gt;db);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dsa_switch_mdb_add_bitmap(struct dsa_switch *ds,</div><div class='del'>-				      const struct switchdev_obj_port_mdb *mdb,</div><div class='del'>-				      const unsigned long *bitmap)</div><div class='add'>+static int dsa_switch_lag_fdb_del(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_lag_fdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	int port;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;lag_fdb_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(port, bitmap, ds-&gt;num_ports)</div><div class='del'>-		ds-&gt;ops-&gt;port_mdb_add(ds, port, mdb);</div><div class='add'>+	/* Notify switch only if it has a port in this LAG */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds)</div><div class='add'>+		if (dsa_port_offloads_lag(dp, info-&gt;lag))</div><div class='add'>+			return dsa_switch_do_lag_fdb_del(ds, info-&gt;lag,</div><div class='add'>+							 info-&gt;addr, info-&gt;vid,</div><div class='add'>+							 info-&gt;db);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dsa_switch_mdb_add(struct dsa_switch *ds,</div><div class='del'>-			      struct dsa_notifier_mdb_info *info)</div><div class='add'>+static int dsa_switch_lag_change(struct dsa_switch *ds,</div><div class='add'>+				 struct dsa_notifier_lag_info *info)</div><div class='ctx'> {</div><div class='del'>-	const struct switchdev_obj_port_mdb *mdb = info-&gt;mdb;</div><div class='del'>-	struct switchdev_trans *trans = info-&gt;trans;</div><div class='del'>-	int port;</div><div class='add'>+	if (info-&gt;dp-&gt;ds == ds &amp;&amp; ds-&gt;ops-&gt;port_lag_change)</div><div class='add'>+		return ds-&gt;ops-&gt;port_lag_change(ds, info-&gt;dp-&gt;index);</div><div class='ctx'> </div><div class='del'>-	/* Build a mask of Multicast group members */</div><div class='del'>-	bitmap_zero(ds-&gt;bitmap, ds-&gt;num_ports);</div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index)</div><div class='del'>-		set_bit(info-&gt;port, ds-&gt;bitmap);</div><div class='del'>-	for (port = 0; port &lt; ds-&gt;num_ports; port++)</div><div class='del'>-		if (dsa_is_dsa_port(ds, port))</div><div class='del'>-			set_bit(port, ds-&gt;bitmap);</div><div class='add'>+	if (info-&gt;dp-&gt;ds != ds &amp;&amp; ds-&gt;ops-&gt;crosschip_lag_change)</div><div class='add'>+		return ds-&gt;ops-&gt;crosschip_lag_change(ds, info-&gt;dp-&gt;ds-&gt;index,</div><div class='add'>+						     info-&gt;dp-&gt;index);</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='del'>-		return dsa_switch_mdb_prepare_bitmap(ds, mdb, ds-&gt;bitmap);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	dsa_switch_mdb_add_bitmap(ds, mdb, ds-&gt;bitmap);</div><div class='add'>+static int dsa_switch_lag_join(struct dsa_switch *ds,</div><div class='add'>+			       struct dsa_notifier_lag_info *info)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;dp-&gt;ds == ds &amp;&amp; ds-&gt;ops-&gt;port_lag_join)</div><div class='add'>+		return ds-&gt;ops-&gt;port_lag_join(ds, info-&gt;dp-&gt;index, info-&gt;lag,</div><div class='add'>+					      info-&gt;info, info-&gt;extack);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (info-&gt;dp-&gt;ds != ds &amp;&amp; ds-&gt;ops-&gt;crosschip_lag_join)</div><div class='add'>+		return ds-&gt;ops-&gt;crosschip_lag_join(ds, info-&gt;dp-&gt;ds-&gt;index,</div><div class='add'>+						   info-&gt;dp-&gt;index, info-&gt;lag,</div><div class='add'>+						   info-&gt;info, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_lag_leave(struct dsa_switch *ds,</div><div class='add'>+				struct dsa_notifier_lag_info *info)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;dp-&gt;ds == ds &amp;&amp; ds-&gt;ops-&gt;port_lag_leave)</div><div class='add'>+		return ds-&gt;ops-&gt;port_lag_leave(ds, info-&gt;dp-&gt;index, info-&gt;lag);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;dp-&gt;ds != ds &amp;&amp; ds-&gt;ops-&gt;crosschip_lag_leave)</div><div class='add'>+		return ds-&gt;ops-&gt;crosschip_lag_leave(ds, info-&gt;dp-&gt;ds-&gt;index,</div><div class='add'>+						    info-&gt;dp-&gt;index, info-&gt;lag);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_mdb_add(struct dsa_switch *ds,</div><div class='add'>+			      struct dsa_notifier_mdb_info *info)</div><div class='add'>+{</div><div class='add'>+	int port = dsa_towards_port(ds, info-&gt;dp-&gt;ds-&gt;index, info-&gt;dp-&gt;index);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mdb_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dsa_port_do_mdb_add(dp, info-&gt;mdb, info-&gt;db);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_switch_mdb_del(struct dsa_switch *ds,</div><div class='ctx'> 			      struct dsa_notifier_mdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	const struct switchdev_obj_port_mdb *mdb = info-&gt;mdb;</div><div class='add'>+	int port = dsa_towards_port(ds, info-&gt;dp-&gt;ds-&gt;index, info-&gt;dp-&gt;index);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> </div><div class='ctx'> 	if (!ds-&gt;ops-&gt;port_mdb_del)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index)</div><div class='del'>-		return ds-&gt;ops-&gt;port_mdb_del(ds, info-&gt;port, mdb);</div><div class='add'>+	return dsa_port_do_mdb_del(dp, info-&gt;mdb, info-&gt;db);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int dsa_switch_host_mdb_add(struct dsa_switch *ds,</div><div class='add'>+				   struct dsa_notifier_mdb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mdb_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_address_match(dp, info-&gt;dp)) {</div><div class='add'>+			err = dsa_port_do_mdb_add(dp, info-&gt;mdb, info-&gt;db);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-dsa_switch_vlan_prepare_bitmap(struct dsa_switch *ds,</div><div class='del'>-			       const struct switchdev_obj_port_vlan *vlan,</div><div class='del'>-			       const unsigned long *bitmap)</div><div class='add'>+static int dsa_switch_host_mdb_del(struct dsa_switch *ds,</div><div class='add'>+				   struct dsa_notifier_mdb_info *info)</div><div class='ctx'> {</div><div class='del'>-	int port, err;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!ds-&gt;ops-&gt;port_vlan_prepare || !ds-&gt;ops-&gt;port_vlan_add)</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mdb_del)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(port, bitmap, ds-&gt;num_ports) {</div><div class='del'>-		err = ds-&gt;ops-&gt;port_vlan_prepare(ds, port, vlan);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_address_match(dp, info-&gt;dp)) {</div><div class='add'>+			err = dsa_port_do_mdb_del(dp, info-&gt;mdb, info-&gt;db);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Port VLANs match on the targeted port and on all DSA ports */</div><div class='add'>+static bool dsa_port_vlan_match(struct dsa_port *dp,</div><div class='add'>+				struct dsa_notifier_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	return dsa_port_is_dsa(dp) || dp == info-&gt;dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Host VLANs match on the targeted port's CPU port, and on all DSA ports</div><div class='add'>+ * (upstream and downstream) of that switch and its upstream switches.</div><div class='add'>+ */</div><div class='add'>+static bool dsa_port_host_vlan_match(struct dsa_port *dp,</div><div class='add'>+				     const struct dsa_port *targeted_dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = targeted_dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_is_upstream_of(dp-&gt;ds, targeted_dp-&gt;ds))</div><div class='add'>+		return dsa_port_is_dsa(dp) || dp == cpu_dp;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_vlan *dsa_vlan_find(struct list_head *vlan_list,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, vlan_list, list)</div><div class='add'>+		if (v-&gt;vid == vlan-&gt;vid)</div><div class='add'>+			return v;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_vlan_add(struct dsa_port *dp,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports. */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_vlan_add(ds, port, vlan, extack);</div><div class='add'>+		trace_dsa_vlan_add_hw(dp, vlan, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No need to propagate on shared ports the existing VLANs that were</div><div class='add'>+	 * re-notified after just the flags have changed. This would cause a</div><div class='add'>+	 * refcount bump which we need to avoid, since it unbalances the</div><div class='add'>+	 * additions with the deletions.</div><div class='add'>+	 */</div><div class='add'>+	if (vlan-&gt;changed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;vlans_lock);</div><div class='add'>+</div><div class='add'>+	v = dsa_vlan_find(&amp;dp-&gt;vlans, vlan);</div><div class='add'>+	if (v) {</div><div class='add'>+		refcount_inc(&amp;v-&gt;refcount);</div><div class='add'>+		trace_dsa_vlan_add_bump(dp, vlan, &amp;v-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v = kzalloc(sizeof(*v), GFP_KERNEL);</div><div class='add'>+	if (!v) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_vlan_add(ds, port, vlan, extack);</div><div class='add'>+	trace_dsa_vlan_add_hw(dp, vlan, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(v);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v-&gt;vid = vlan-&gt;vid;</div><div class='add'>+	refcount_set(&amp;v-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;v-&gt;list, &amp;dp-&gt;vlans);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;vlans_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-dsa_switch_vlan_add_bitmap(struct dsa_switch *ds,</div><div class='del'>-			   const struct switchdev_obj_port_vlan *vlan,</div><div class='del'>-			   const unsigned long *bitmap)</div><div class='add'>+static int dsa_port_do_vlan_del(struct dsa_port *dp,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='del'>-	int port;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_vlan_del(ds, port, vlan);</div><div class='add'>+		trace_dsa_vlan_del_hw(dp, vlan, err);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dp-&gt;vlans_lock);</div><div class='add'>+</div><div class='add'>+	v = dsa_vlan_find(&amp;dp-&gt;vlans, vlan);</div><div class='add'>+	if (!v) {</div><div class='add'>+		trace_dsa_vlan_del_not_found(dp, vlan);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;v-&gt;refcount)) {</div><div class='add'>+		trace_dsa_vlan_del_drop(dp, vlan, &amp;v-&gt;refcount);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_vlan_del(ds, port, vlan);</div><div class='add'>+	trace_dsa_vlan_del_hw(dp, vlan, err);</div><div class='add'>+	if (err) {</div><div class='add'>+		refcount_set(&amp;v-&gt;refcount, 1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(port, bitmap, ds-&gt;num_ports)</div><div class='del'>-		ds-&gt;ops-&gt;port_vlan_add(ds, port, vlan);</div><div class='add'>+	list_del(&amp;v-&gt;list);</div><div class='add'>+	kfree(v);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dp-&gt;vlans_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_switch_vlan_add(struct dsa_switch *ds,</div><div class='ctx'> 			       struct dsa_notifier_vlan_info *info)</div><div class='ctx'> {</div><div class='del'>-	const struct switchdev_obj_port_vlan *vlan = info-&gt;vlan;</div><div class='del'>-	struct switchdev_trans *trans = info-&gt;trans;</div><div class='del'>-	int port;</div><div class='del'>-</div><div class='del'>-	/* Build a mask of VLAN members */</div><div class='del'>-	bitmap_zero(ds-&gt;bitmap, ds-&gt;num_ports);</div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index)</div><div class='del'>-		set_bit(info-&gt;port, ds-&gt;bitmap);</div><div class='del'>-	for (port = 0; port &lt; ds-&gt;num_ports; port++)</div><div class='del'>-		if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='del'>-			set_bit(port, ds-&gt;bitmap);</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='del'>-		return dsa_switch_vlan_prepare_bitmap(ds, vlan, ds-&gt;bitmap);</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_vlan_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	dsa_switch_vlan_add_bitmap(ds, vlan, ds-&gt;bitmap);</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_vlan_match(dp, info)) {</div><div class='add'>+			err = dsa_port_do_vlan_add(dp, info-&gt;vlan,</div><div class='add'>+						   info-&gt;extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -224,13 +812,161 @@ static int dsa_switch_vlan_add(struct dsa_switch *ds,</div><div class='ctx'> static int dsa_switch_vlan_del(struct dsa_switch *ds,</div><div class='ctx'> 			       struct dsa_notifier_vlan_info *info)</div><div class='ctx'> {</div><div class='del'>-	const struct switchdev_obj_port_vlan *vlan = info-&gt;vlan;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ds-&gt;ops-&gt;port_vlan_del)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (ds-&gt;index == info-&gt;sw_index)</div><div class='del'>-		return ds-&gt;ops-&gt;port_vlan_del(ds, info-&gt;port, vlan);</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_vlan_match(dp, info)) {</div><div class='add'>+			err = dsa_port_do_vlan_del(dp, info-&gt;vlan);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_host_vlan_add(struct dsa_switch *ds,</div><div class='add'>+				    struct dsa_notifier_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_vlan_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_vlan_match(dp, info-&gt;dp)) {</div><div class='add'>+			err = dsa_port_do_vlan_add(dp, info-&gt;vlan,</div><div class='add'>+						   info-&gt;extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_host_vlan_del(struct dsa_switch *ds,</div><div class='add'>+				    struct dsa_notifier_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_vlan_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_host_vlan_match(dp, info-&gt;dp)) {</div><div class='add'>+			err = dsa_port_do_vlan_del(dp, info-&gt;vlan);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_change_tag_proto(struct dsa_switch *ds,</div><div class='add'>+				       struct dsa_notifier_tag_proto_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = info-&gt;tag_ops;</div><div class='add'>+	struct dsa_port *dp, *cpu_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;change_tag_protocol)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;change_tag_protocol(ds, tag_ops-&gt;proto);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds)</div><div class='add'>+		dsa_port_set_tag_protocol(cpu_dp, tag_ops);</div><div class='add'>+</div><div class='add'>+	/* Now that changing the tag protocol can no longer fail, let's update</div><div class='add'>+	 * the remaining bits which are "duplicated for faster access", and the</div><div class='add'>+	 * bits that depend on the tagger, such as the MTU.</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		struct net_device *user = dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		dsa_user_setup_tagger(user);</div><div class='add'>+</div><div class='add'>+		/* rtnl_mutex is held in dsa_tree_change_tag_proto */</div><div class='add'>+		dsa_user_change_mtu(user, user-&gt;mtu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We use the same cross-chip notifiers to inform both the tagger side, as well</div><div class='add'>+ * as the switch side, of connection and disconnection events.</div><div class='add'>+ * Since ds-&gt;tagger_data is owned by the tagger, it isn't a hard error if the</div><div class='add'>+ * switch side doesn't support connecting to this tagger, and therefore, the</div><div class='add'>+ * fact that we don't disconnect the tagger side doesn't constitute a memory</div><div class='add'>+ * leak: the tagger will still operate with persistent per-switch memory, just</div><div class='add'>+ * with the switch side unconnected to it. What does constitute a hard error is</div><div class='add'>+ * when the switch side supports connecting but fails.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dsa_switch_connect_tag_proto(struct dsa_switch *ds,</div><div class='add'>+			     struct dsa_notifier_tag_proto_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = info-&gt;tag_ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Notify the new tagger about the connection to this switch */</div><div class='add'>+	if (tag_ops-&gt;connect) {</div><div class='add'>+		err = tag_ops-&gt;connect(ds);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;connect_tag_protocol)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Notify the switch about the connection to the new tagger */</div><div class='add'>+	err = ds-&gt;ops-&gt;connect_tag_protocol(ds, tag_ops-&gt;proto);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Revert the new tagger's connection to this tree */</div><div class='add'>+		if (tag_ops-&gt;disconnect)</div><div class='add'>+			tag_ops-&gt;disconnect(ds);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_switch_disconnect_tag_proto(struct dsa_switch *ds,</div><div class='add'>+				struct dsa_notifier_tag_proto_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *tag_ops = info-&gt;tag_ops;</div><div class='add'>+</div><div class='add'>+	/* Notify the tagger about the disconnection from this switch */</div><div class='add'>+	if (tag_ops-&gt;disconnect &amp;&amp; ds-&gt;tagger_data)</div><div class='add'>+		tag_ops-&gt;disconnect(ds);</div><div class='add'>+</div><div class='add'>+	/* No need to notify the switch, since it shouldn't have any</div><div class='add'>+	 * resources to tear down</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_switch_conduit_state_change(struct dsa_switch *ds,</div><div class='add'>+				struct dsa_notifier_conduit_state_info *info)</div><div class='add'>+{</div><div class='add'>+	if (!ds-&gt;ops-&gt;conduit_state_change)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ds-&gt;ops-&gt;conduit_state_change(ds, info-&gt;conduit, info-&gt;operational);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -257,27 +993,77 @@ static int dsa_switch_event(struct notifier_block *nb,</div><div class='ctx'> 	case DSA_NOTIFIER_FDB_DEL:</div><div class='ctx'> 		err = dsa_switch_fdb_del(ds, info);</div><div class='ctx'> 		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_FDB_ADD:</div><div class='add'>+		err = dsa_switch_host_fdb_add(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_FDB_DEL:</div><div class='add'>+		err = dsa_switch_host_fdb_del(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_LAG_FDB_ADD:</div><div class='add'>+		err = dsa_switch_lag_fdb_add(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_LAG_FDB_DEL:</div><div class='add'>+		err = dsa_switch_lag_fdb_del(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_LAG_CHANGE:</div><div class='add'>+		err = dsa_switch_lag_change(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_LAG_JOIN:</div><div class='add'>+		err = dsa_switch_lag_join(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_LAG_LEAVE:</div><div class='add'>+		err = dsa_switch_lag_leave(ds, info);</div><div class='add'>+		break;</div><div class='ctx'> 	case DSA_NOTIFIER_MDB_ADD:</div><div class='ctx'> 		err = dsa_switch_mdb_add(ds, info);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DSA_NOTIFIER_MDB_DEL:</div><div class='ctx'> 		err = dsa_switch_mdb_del(ds, info);</div><div class='ctx'> 		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_MDB_ADD:</div><div class='add'>+		err = dsa_switch_host_mdb_add(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_MDB_DEL:</div><div class='add'>+		err = dsa_switch_host_mdb_del(ds, info);</div><div class='add'>+		break;</div><div class='ctx'> 	case DSA_NOTIFIER_VLAN_ADD:</div><div class='ctx'> 		err = dsa_switch_vlan_add(ds, info);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DSA_NOTIFIER_VLAN_DEL:</div><div class='ctx'> 		err = dsa_switch_vlan_del(ds, info);</div><div class='ctx'> 		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_VLAN_ADD:</div><div class='add'>+		err = dsa_switch_host_vlan_add(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_HOST_VLAN_DEL:</div><div class='add'>+		err = dsa_switch_host_vlan_del(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_MTU:</div><div class='add'>+		err = dsa_switch_mtu(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_TAG_PROTO:</div><div class='add'>+		err = dsa_switch_change_tag_proto(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_TAG_PROTO_CONNECT:</div><div class='add'>+		err = dsa_switch_connect_tag_proto(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_TAG_PROTO_DISCONNECT:</div><div class='add'>+		err = dsa_switch_disconnect_tag_proto(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_TAG_8021Q_VLAN_ADD:</div><div class='add'>+		err = dsa_switch_tag_8021q_vlan_add(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_TAG_8021Q_VLAN_DEL:</div><div class='add'>+		err = dsa_switch_tag_8021q_vlan_del(ds, info);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_NOTIFIER_CONDUIT_STATE_CHANGE:</div><div class='add'>+		err = dsa_switch_conduit_state_change(ds, info);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Non-switchdev operations cannot be rolled back. If a DSA driver</div><div class='del'>-	 * returns an error during the chained call, switch chips may be in an</div><div class='del'>-	 * inconsistent state.</div><div class='del'>-	 */</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_dbg(ds-&gt;dev, "breaking chain for DSA event %lu (%d)\n",</div><div class='ctx'> 			event, err);</div><div class='hunk'>@@ -285,6 +1071,52 @@ static int dsa_switch_event(struct notifier_block *nb,</div><div class='ctx'> 	return notifier_from_errno(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dsa_tree_notify - Execute code for all switches in a DSA switch tree.</div><div class='add'>+ * @dst: collection of struct dsa_switch devices to notify.</div><div class='add'>+ * @e: event, must be of type DSA_NOTIFIER_*</div><div class='add'>+ * @v: event-specific value.</div><div class='add'>+ *</div><div class='add'>+ * Given a struct dsa_switch_tree, this can be used to run a function once for</div><div class='add'>+ * each member DSA switch. The other alternative of traversing the tree is only</div><div class='add'>+ * through its ports list, which does not uniquely list the switches.</div><div class='add'>+ */</div><div class='add'>+int dsa_tree_notify(struct dsa_switch_tree *dst, unsigned long e, void *v)</div><div class='add'>+{</div><div class='add'>+	struct raw_notifier_head *nh = &amp;dst-&gt;nh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = raw_notifier_call_chain(nh, e, v);</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_broadcast - Notify all DSA trees in the system.</div><div class='add'>+ * @e: event, must be of type DSA_NOTIFIER_*</div><div class='add'>+ * @v: event-specific value.</div><div class='add'>+ *</div><div class='add'>+ * Can be used to notify the switching fabric of events such as cross-chip</div><div class='add'>+ * bridging between disjoint trees (such as islands of tagger-compatible</div><div class='add'>+ * switches bridged by an incompatible middle switch).</div><div class='add'>+ *</div><div class='add'>+ * WARNING: this function is not reliable during probe time, because probing</div><div class='add'>+ * between trees is asynchronous and not all DSA trees might have probed.</div><div class='add'>+ */</div><div class='add'>+int dsa_broadcast(unsigned long e, void *v)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dst, &amp;dsa_tree_list, list) {</div><div class='add'>+		err = dsa_tree_notify(dst, e, v);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dsa_switch_register_notifier(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	ds-&gt;nb.notifier_call = dsa_switch_event;</div><div class='head'>diff --git a/net/dsa/switch.h b/net/dsa/switch.h<br/>new file mode 100644<br/>index 000000000000..be0a2749cd97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/switch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/switch.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_SWITCH_H</div><div class='add'>+#define __DSA_SWITCH_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DSA_NOTIFIER_AGEING_TIME,</div><div class='add'>+	DSA_NOTIFIER_BRIDGE_JOIN,</div><div class='add'>+	DSA_NOTIFIER_BRIDGE_LEAVE,</div><div class='add'>+	DSA_NOTIFIER_FDB_ADD,</div><div class='add'>+	DSA_NOTIFIER_FDB_DEL,</div><div class='add'>+	DSA_NOTIFIER_HOST_FDB_ADD,</div><div class='add'>+	DSA_NOTIFIER_HOST_FDB_DEL,</div><div class='add'>+	DSA_NOTIFIER_LAG_FDB_ADD,</div><div class='add'>+	DSA_NOTIFIER_LAG_FDB_DEL,</div><div class='add'>+	DSA_NOTIFIER_LAG_CHANGE,</div><div class='add'>+	DSA_NOTIFIER_LAG_JOIN,</div><div class='add'>+	DSA_NOTIFIER_LAG_LEAVE,</div><div class='add'>+	DSA_NOTIFIER_MDB_ADD,</div><div class='add'>+	DSA_NOTIFIER_MDB_DEL,</div><div class='add'>+	DSA_NOTIFIER_HOST_MDB_ADD,</div><div class='add'>+	DSA_NOTIFIER_HOST_MDB_DEL,</div><div class='add'>+	DSA_NOTIFIER_VLAN_ADD,</div><div class='add'>+	DSA_NOTIFIER_VLAN_DEL,</div><div class='add'>+	DSA_NOTIFIER_HOST_VLAN_ADD,</div><div class='add'>+	DSA_NOTIFIER_HOST_VLAN_DEL,</div><div class='add'>+	DSA_NOTIFIER_MTU,</div><div class='add'>+	DSA_NOTIFIER_TAG_PROTO,</div><div class='add'>+	DSA_NOTIFIER_TAG_PROTO_CONNECT,</div><div class='add'>+	DSA_NOTIFIER_TAG_PROTO_DISCONNECT,</div><div class='add'>+	DSA_NOTIFIER_TAG_8021Q_VLAN_ADD,</div><div class='add'>+	DSA_NOTIFIER_TAG_8021Q_VLAN_DEL,</div><div class='add'>+	DSA_NOTIFIER_CONDUIT_STATE_CHANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_AGEING_TIME */</div><div class='add'>+struct dsa_notifier_ageing_time_info {</div><div class='add'>+	unsigned int ageing_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_BRIDGE_* */</div><div class='add'>+struct dsa_notifier_bridge_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	struct dsa_bridge bridge;</div><div class='add'>+	bool tx_fwd_offload;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_FDB_* */</div><div class='add'>+struct dsa_notifier_fdb_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	const unsigned char *addr;</div><div class='add'>+	u16 vid;</div><div class='add'>+	struct dsa_db db;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_LAG_FDB_* */</div><div class='add'>+struct dsa_notifier_lag_fdb_info {</div><div class='add'>+	struct dsa_lag *lag;</div><div class='add'>+	const unsigned char *addr;</div><div class='add'>+	u16 vid;</div><div class='add'>+	struct dsa_db db;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_MDB_* */</div><div class='add'>+struct dsa_notifier_mdb_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	const struct switchdev_obj_port_mdb *mdb;</div><div class='add'>+	struct dsa_db db;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_LAG_* */</div><div class='add'>+struct dsa_notifier_lag_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	struct dsa_lag lag;</div><div class='add'>+	struct netdev_lag_upper_info *info;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_VLAN_* */</div><div class='add'>+struct dsa_notifier_vlan_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	const struct switchdev_obj_port_vlan *vlan;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_MTU */</div><div class='add'>+struct dsa_notifier_mtu_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	int mtu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_TAG_PROTO_* */</div><div class='add'>+struct dsa_notifier_tag_proto_info {</div><div class='add'>+	const struct dsa_device_ops *tag_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_TAG_8021Q_VLAN_* */</div><div class='add'>+struct dsa_notifier_tag_8021q_vlan_info {</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	u16 vid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA_NOTIFIER_CONDUIT_STATE_CHANGE */</div><div class='add'>+struct dsa_notifier_conduit_state_info {</div><div class='add'>+	const struct net_device *conduit;</div><div class='add'>+	bool operational;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsa_vlan *dsa_vlan_find(struct list_head *vlan_list,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+</div><div class='add'>+int dsa_tree_notify(struct dsa_switch_tree *dst, unsigned long e, void *v);</div><div class='add'>+int dsa_broadcast(unsigned long e, void *v);</div><div class='add'>+</div><div class='add'>+int dsa_switch_register_notifier(struct dsa_switch *ds);</div><div class='add'>+void dsa_switch_unregister_notifier(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/tag.c b/net/dsa/tag.c<br/>new file mode 100644<br/>index 000000000000..79ad105902d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * DSA tagging protocol handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='add'>+ * Copyright (c) 2013 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='add'>+ * Copyright (c) 2016 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(dsa_tag_drivers_list);</div><div class='add'>+static DEFINE_MUTEX(dsa_tag_drivers_lock);</div><div class='add'>+</div><div class='add'>+/* Determine if we should defer delivery of skb until we have a rx timestamp.</div><div class='add'>+ *</div><div class='add'>+ * Called from dsa_switch_rcv. For now, this will only work if tagging is</div><div class='add'>+ * enabled on the switch. Normally the MAC driver would retrieve the hardware</div><div class='add'>+ * timestamp when it reads the packet out of the hardware. However in a DSA</div><div class='add'>+ * switch, the DSA driver owning the interface to which the packet is</div><div class='add'>+ * delivered is never notified unless we do so here.</div><div class='add'>+ */</div><div class='add'>+static bool dsa_skb_defer_rx_timestamp(struct dsa_user_priv *p,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='add'>+	unsigned int type;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_rxtstamp)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; ETH_HLEN)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	__skb_push(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	type = ptp_classify_raw(skb);</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	if (type == PTP_CLASS_NONE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_rxtstamp(ds, p-&gt;dp-&gt;index, skb, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			  struct packet_type *pt, struct net_device *unused)</div><div class='add'>+{</div><div class='add'>+	struct metadata_dst *md_dst = skb_metadata_dst(skb);</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	struct sk_buff *nskb = NULL;</div><div class='add'>+	struct dsa_user_priv *p;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!cpu_dp)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (md_dst &amp;&amp; md_dst-&gt;type == METADATA_HW_PORT_MUX) {</div><div class='add'>+		unsigned int port = md_dst-&gt;u.port_info.port_id;</div><div class='add'>+</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		if (!skb_has_extensions(skb))</div><div class='add'>+			skb-&gt;slow_gro = 0;</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+		if (likely(skb-&gt;dev)) {</div><div class='add'>+			dsa_default_offload_fwd_mark(skb);</div><div class='add'>+			nskb = skb;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		nskb = cpu_dp-&gt;rcv(skb, dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nskb) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nskb;</div><div class='add'>+	skb_push(skb, ETH_HLEN);</div><div class='add'>+	skb-&gt;pkt_type = PACKET_HOST;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!dsa_user_dev_check(skb-&gt;dev))) {</div><div class='add'>+		/* Packet is to be injected directly on an upper</div><div class='add'>+		 * device, e.g. a team/bond, so skip all DSA-port</div><div class='add'>+		 * specific actions.</div><div class='add'>+		 */</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = netdev_priv(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (unlikely(cpu_dp-&gt;ds-&gt;untag_bridge_pvid ||</div><div class='add'>+		     cpu_dp-&gt;ds-&gt;untag_vlan_aware_bridge_pvid)) {</div><div class='add'>+		nskb = dsa_software_vlan_untag(skb);</div><div class='add'>+		if (!nskb) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		skb = nskb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_sw_netstats_rx_add(skb-&gt;dev, skb-&gt;len + ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	if (dsa_skb_defer_rx_timestamp(p, skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	gro_cells_receive(&amp;p-&gt;gcells, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct packet_type dsa_pack_type __read_mostly = {</div><div class='add'>+	.type	= cpu_to_be16(ETH_P_XDSA),</div><div class='add'>+	.func	= dsa_switch_rcv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dsa_tag_driver_register(struct dsa_tag_driver *dsa_tag_driver,</div><div class='add'>+				    struct module *owner)</div><div class='add'>+{</div><div class='add'>+	dsa_tag_driver-&gt;owner = owner;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+	list_add_tail(&amp;dsa_tag_driver-&gt;list, &amp;dsa_tag_drivers_list);</div><div class='add'>+	mutex_unlock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_tag_drivers_register(struct dsa_tag_driver *dsa_tag_driver_array[],</div><div class='add'>+			      unsigned int count, struct module *owner)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		dsa_tag_driver_register(dsa_tag_driver_array[i], owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tag_driver_unregister(struct dsa_tag_driver *dsa_tag_driver)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+	list_del(&amp;dsa_tag_driver-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_drivers_register);</div><div class='add'>+</div><div class='add'>+void dsa_tag_drivers_unregister(struct dsa_tag_driver *dsa_tag_driver_array[],</div><div class='add'>+				unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		dsa_tag_driver_unregister(dsa_tag_driver_array[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_drivers_unregister);</div><div class='add'>+</div><div class='add'>+const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return ops-&gt;name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Function takes a reference on the module owning the tagger,</div><div class='add'>+ * so dsa_tag_driver_put must be called afterwards.</div><div class='add'>+ */</div><div class='add'>+const struct dsa_device_ops *dsa_tag_driver_get_by_name(const char *name)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_device_ops *ops = ERR_PTR(-ENOPROTOOPT);</div><div class='add'>+	struct dsa_tag_driver *dsa_tag_driver;</div><div class='add'>+</div><div class='add'>+	request_module("%s%s", DSA_TAG_DRIVER_ALIAS, name);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+	list_for_each_entry(dsa_tag_driver, &amp;dsa_tag_drivers_list, list) {</div><div class='add'>+		const struct dsa_device_ops *tmp = dsa_tag_driver-&gt;ops;</div><div class='add'>+</div><div class='add'>+		if (strcmp(name, tmp-&gt;name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!try_module_get(dsa_tag_driver-&gt;owner))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ops = tmp;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+</div><div class='add'>+	return ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dsa_device_ops *dsa_tag_driver_get_by_id(int tag_protocol)</div><div class='add'>+{</div><div class='add'>+	struct dsa_tag_driver *dsa_tag_driver;</div><div class='add'>+	const struct dsa_device_ops *ops;</div><div class='add'>+	bool found = false;</div><div class='add'>+</div><div class='add'>+	request_module("%sid-%d", DSA_TAG_DRIVER_ALIAS, tag_protocol);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+	list_for_each_entry(dsa_tag_driver, &amp;dsa_tag_drivers_list, list) {</div><div class='add'>+		ops = dsa_tag_driver-&gt;ops;</div><div class='add'>+		if (ops-&gt;proto == tag_protocol) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (found) {</div><div class='add'>+		if (!try_module_get(dsa_tag_driver-&gt;owner))</div><div class='add'>+			ops = ERR_PTR(-ENOPROTOOPT);</div><div class='add'>+	} else {</div><div class='add'>+		ops = ERR_PTR(-ENOPROTOOPT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+</div><div class='add'>+	return ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_tag_driver_put(const struct dsa_device_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct dsa_tag_driver *dsa_tag_driver;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+	list_for_each_entry(dsa_tag_driver, &amp;dsa_tag_drivers_list, list) {</div><div class='add'>+		if (dsa_tag_driver-&gt;ops == ops) {</div><div class='add'>+			module_put(dsa_tag_driver-&gt;owner);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dsa_tag_drivers_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/net/dsa/tag.h b/net/dsa/tag.h<br/>new file mode 100644<br/>index 000000000000..cf52283fe9df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag.h</a></div><div class='hunk'>@@ -0,0 +1,409 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_TAG_H</div><div class='add'>+#define __DSA_TAG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+struct dsa_tag_driver {</div><div class='add'>+	const struct dsa_device_ops *ops;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct module *owner;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct packet_type dsa_pack_type;</div><div class='add'>+</div><div class='add'>+const struct dsa_device_ops *dsa_tag_driver_get_by_id(int tag_protocol);</div><div class='add'>+const struct dsa_device_ops *dsa_tag_driver_get_by_name(const char *name);</div><div class='add'>+void dsa_tag_driver_put(const struct dsa_device_ops *ops);</div><div class='add'>+const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops);</div><div class='add'>+</div><div class='add'>+static inline int dsa_tag_protocol_overhead(const struct dsa_device_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return ops-&gt;needed_headroom + ops-&gt;needed_tailroom;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_device *dsa_conduit_find_user(struct net_device *dev,</div><div class='add'>+						       int device, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list)</div><div class='add'>+		if (dp-&gt;ds-&gt;index == device &amp;&amp; dp-&gt;index == port &amp;&amp;</div><div class='add'>+		    dp-&gt;type == DSA_PORT_TYPE_USER)</div><div class='add'>+			return dp-&gt;user;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_software_untag_vlan_aware_bridge: Software untagging for VLAN-aware bridge</div><div class='add'>+ * @skb: Pointer to received socket buffer (packet)</div><div class='add'>+ * @br: Pointer to bridge upper interface of ingress port</div><div class='add'>+ * @vid: Parsed VID from packet</div><div class='add'>+ *</div><div class='add'>+ * The bridge can process tagged packets. Software like STP/PTP may not. The</div><div class='add'>+ * bridge can also process untagged packets, to the same effect as if they were</div><div class='add'>+ * tagged with the PVID of the ingress port. So packets tagged with the PVID of</div><div class='add'>+ * the bridge port must be software-untagged, to support both use cases.</div><div class='add'>+ */</div><div class='add'>+static inline void dsa_software_untag_vlan_aware_bridge(struct sk_buff *skb,</div><div class='add'>+							struct net_device *br,</div><div class='add'>+							u16 vid)</div><div class='add'>+{</div><div class='add'>+	u16 pvid, proto;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_vlan_get_proto(br, &amp;proto);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = br_vlan_get_pvid_rcu(skb-&gt;dev, &amp;pvid);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vid == pvid &amp;&amp; skb-&gt;vlan_proto == htons(proto))</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_software_untag_vlan_unaware_bridge: Software untagging for VLAN-unaware bridge</div><div class='add'>+ * @skb: Pointer to received socket buffer (packet)</div><div class='add'>+ * @br: Pointer to bridge upper interface of ingress port</div><div class='add'>+ * @vid: Parsed VID from packet</div><div class='add'>+ *</div><div class='add'>+ * The bridge ignores all VLAN tags. Software like STP/PTP may not (it may run</div><div class='add'>+ * on the plain port, or on a VLAN upper interface). Maybe packets are coming</div><div class='add'>+ * to software as tagged with a driver-defined VID which is NOT equal to the</div><div class='add'>+ * PVID of the bridge port (since the bridge is VLAN-unaware, its configuration</div><div class='add'>+ * should NOT be committed to hardware). DSA needs a method for this private</div><div class='add'>+ * VID to be communicated by software to it, and if packets are tagged with it,</div><div class='add'>+ * software-untag them. Note: the private VID may be different per bridge, to</div><div class='add'>+ * support the FDB isolation use case.</div><div class='add'>+ *</div><div class='add'>+ * FIXME: this is currently implemented based on the broken assumption that</div><div class='add'>+ * the "private VID" used by the driver in VLAN-unaware mode is equal to the</div><div class='add'>+ * bridge PVID. It should not be, except for a coincidence; the bridge PVID is</div><div class='add'>+ * irrelevant to the data path in the VLAN-unaware mode. Thus, the VID that</div><div class='add'>+ * this function removes is wrong.</div><div class='add'>+ *</div><div class='add'>+ * All users of ds-&gt;untag_bridge_pvid should fix their drivers, if necessary,</div><div class='add'>+ * to make the two independent. Only then, if there still remains a need to</div><div class='add'>+ * strip the private VID from packets, then a new ds-&gt;ops-&gt;get_private_vid()</div><div class='add'>+ * API shall be introduced to communicate to DSA what this VID is, which needs</div><div class='add'>+ * to be stripped here.</div><div class='add'>+ */</div><div class='add'>+static inline void dsa_software_untag_vlan_unaware_bridge(struct sk_buff *skb,</div><div class='add'>+							  struct net_device *br,</div><div class='add'>+							  u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	u16 pvid, proto;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = br_vlan_get_proto(br, &amp;proto);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = br_vlan_get_pvid_rcu(skb-&gt;dev, &amp;pvid);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vid != pvid || skb-&gt;vlan_proto != htons(proto))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The sad part about attempting to untag from DSA is that we</div><div class='add'>+	 * don't know, unless we check, if the skb will end up in</div><div class='add'>+	 * the bridge's data path - br_allowed_ingress() - or not.</div><div class='add'>+	 * For example, there might be an 8021q upper for the</div><div class='add'>+	 * default_pvid of the bridge, which will steal VLAN-tagged traffic</div><div class='add'>+	 * from the bridge's data path. This is a configuration that DSA</div><div class='add'>+	 * supports because vlan_filtering is 0. In that case, we should</div><div class='add'>+	 * definitely keep the tag, to make sure it keeps working.</div><div class='add'>+	 */</div><div class='add'>+	upper_dev = __vlan_find_dev_deep_rcu(br, htons(proto), vid);</div><div class='add'>+	if (!upper_dev)</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_software_vlan_untag: Software VLAN untagging in DSA receive path</div><div class='add'>+ * @skb: Pointer to socket buffer (packet)</div><div class='add'>+ *</div><div class='add'>+ * Receive path method for switches which send some packets as VLAN-tagged</div><div class='add'>+ * towards the CPU port (generally from VLAN-aware bridge ports) even when the</div><div class='add'>+ * packet was not tagged on the wire. Called when ds-&gt;untag_bridge_pvid</div><div class='add'>+ * (legacy) or ds-&gt;untag_vlan_aware_bridge_pvid is set to true.</div><div class='add'>+ *</div><div class='add'>+ * As a side effect of this method, any VLAN tag from the skb head is moved</div><div class='add'>+ * to hwaccel.</div><div class='add'>+ */</div><div class='add'>+static inline struct sk_buff *dsa_software_vlan_untag(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(skb-&gt;dev);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	u16 vid, proto;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* software untagging for standalone ports not yet necessary */</div><div class='add'>+	if (!br)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	err = br_vlan_get_proto(br, &amp;proto);</div><div class='add'>+	if (err)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	/* Move VLAN tag from data to hwaccel */</div><div class='add'>+	if (!skb_vlan_tag_present(skb) &amp;&amp; skb-&gt;protocol == htons(proto)) {</div><div class='add'>+		skb = skb_vlan_untag(skb);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb_vlan_tag_present(skb))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	vid = skb_vlan_tag_get_id(skb);</div><div class='add'>+</div><div class='add'>+	if (br_vlan_enabled(br)) {</div><div class='add'>+		if (dp-&gt;ds-&gt;untag_vlan_aware_bridge_pvid)</div><div class='add'>+			dsa_software_untag_vlan_aware_bridge(skb, br, vid);</div><div class='add'>+	} else {</div><div class='add'>+		if (dp-&gt;ds-&gt;untag_bridge_pvid)</div><div class='add'>+			dsa_software_untag_vlan_unaware_bridge(skb, br, vid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For switches without hardware support for DSA tagging to be able</div><div class='add'>+ * to support termination through the bridge.</div><div class='add'>+ */</div><div class='add'>+static inline struct net_device *</div><div class='add'>+dsa_find_designated_bridge_port_by_vid(struct net_device *conduit, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	struct bridge_vlan_info vinfo;</div><div class='add'>+	struct net_device *user;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dp-&gt;type != DSA_PORT_TYPE_USER)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!dp-&gt;bridge)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;stp_state != BR_STATE_LEARNING &amp;&amp;</div><div class='add'>+		    dp-&gt;stp_state != BR_STATE_FORWARDING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Since the bridge might learn this packet, keep the CPU port</div><div class='add'>+		 * affinity with the port that will be used for the reply on</div><div class='add'>+		 * xmit.</div><div class='add'>+		 */</div><div class='add'>+		if (dp-&gt;cpu_dp != cpu_dp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		user = dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		err = br_vlan_get_info_rcu(user, vid, &amp;vinfo);</div><div class='add'>+		if (err)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return user;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If the ingress port offloads the bridge, we mark the frame as autonomously</div><div class='add'>+ * forwarded by hardware, so the software bridge doesn't forward in twice, back</div><div class='add'>+ * to us, because we already did. However, if we're in fallback mode and we do</div><div class='add'>+ * software bridging, we are not offloading it, therefore the dp-&gt;bridge</div><div class='add'>+ * pointer is not populated, and flooding needs to be done by software (we are</div><div class='add'>+ * effectively operating in standalone ports mode).</div><div class='add'>+ */</div><div class='add'>+static inline void dsa_default_offload_fwd_mark(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	skb-&gt;offload_fwd_mark = !!(dp-&gt;bridge);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper for removing DSA header tags from packets in the RX path.</div><div class='add'>+ * Must not be called before skb_pull(len).</div><div class='add'>+ *                                                                 skb-&gt;data</div><div class='add'>+ *                                                                         |</div><div class='add'>+ *                                                                         v</div><div class='add'>+ * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |</div><div class='add'>+ * +-----------------------+-----------------------+---------------+-------+</div><div class='add'>+ * |    Destination MAC    |      Source MAC       |  DSA header   | EType |</div><div class='add'>+ * +-----------------------+-----------------------+---------------+-------+</div><div class='add'>+ *                                                 |               |</div><div class='add'>+ * &lt;----- len -----&gt;                               &lt;----- len -----&gt;</div><div class='add'>+ *                 |</div><div class='add'>+ *       &gt;&gt;&gt;&gt;&gt;&gt;&gt;   v</div><div class='add'>+ *       &gt;&gt;&gt;&gt;&gt;&gt;&gt;   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |</div><div class='add'>+ *       &gt;&gt;&gt;&gt;&gt;&gt;&gt;   +-----------------------+-----------------------+-------+</div><div class='add'>+ *       &gt;&gt;&gt;&gt;&gt;&gt;&gt;   |    Destination MAC    |      Source MAC       | EType |</div><div class='add'>+ *                 +-----------------------+-----------------------+-------+</div><div class='add'>+ *                                                                         ^</div><div class='add'>+ *                                                                         |</div><div class='add'>+ *                                                                 skb-&gt;data</div><div class='add'>+ */</div><div class='add'>+static inline void dsa_strip_etype_header(struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	memmove(skb-&gt;data - ETH_HLEN, skb-&gt;data - ETH_HLEN - len, 2 * ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper for creating space for DSA header tags in TX path packets.</div><div class='add'>+ * Must not be called before skb_push(len).</div><div class='add'>+ *</div><div class='add'>+ * Before:</div><div class='add'>+ *</div><div class='add'>+ *       &lt;&lt;&lt;&lt;&lt;&lt;&lt;   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |</div><div class='add'>+ * ^     &lt;&lt;&lt;&lt;&lt;&lt;&lt;   +-----------------------+-----------------------+-------+</div><div class='add'>+ * |     &lt;&lt;&lt;&lt;&lt;&lt;&lt;   |    Destination MAC    |      Source MAC       | EType |</div><div class='add'>+ * |               +-----------------------+-----------------------+-------+</div><div class='add'>+ * &lt;----- len -----&gt;</div><div class='add'>+ * |</div><div class='add'>+ * |</div><div class='add'>+ * skb-&gt;data</div><div class='add'>+ *</div><div class='add'>+ * After:</div><div class='add'>+ *</div><div class='add'>+ * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |</div><div class='add'>+ * +-----------------------+-----------------------+---------------+-------+</div><div class='add'>+ * |    Destination MAC    |      Source MAC       |  DSA header   | EType |</div><div class='add'>+ * +-----------------------+-----------------------+---------------+-------+</div><div class='add'>+ * ^                                               |               |</div><div class='add'>+ * |                                               &lt;----- len -----&gt;</div><div class='add'>+ * skb-&gt;data</div><div class='add'>+ */</div><div class='add'>+static inline void dsa_alloc_etype_header(struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	memmove(skb-&gt;data, skb-&gt;data + len, 2 * ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On RX, eth_type_trans() on the DSA conduit pulls ETH_HLEN bytes starting from</div><div class='add'>+ * skb_mac_header(skb), which leaves skb-&gt;data pointing at the first byte after</div><div class='add'>+ * what the DSA conduit perceives as the EtherType (the beginning of the L3</div><div class='add'>+ * protocol). Since DSA EtherType header taggers treat the EtherType as part of</div><div class='add'>+ * the DSA tag itself, and the EtherType is 2 bytes in length, the DSA header</div><div class='add'>+ * is located 2 bytes behind skb-&gt;data. Note that EtherType in this context</div><div class='add'>+ * means the first 2 bytes of the DSA header, not the encapsulated EtherType</div><div class='add'>+ * that will become visible after the DSA header is stripped.</div><div class='add'>+ */</div><div class='add'>+static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;data - 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On TX, skb-&gt;data points to the MAC header, which means that EtherType</div><div class='add'>+ * header taggers start exactly where the EtherType is (the EtherType is</div><div class='add'>+ * treated as part of the DSA header).</div><div class='add'>+ */</div><div class='add'>+static inline void *dsa_etype_header_pos_tx(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;data + 2 * ETH_ALEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long dsa_xmit_port_mask(const struct sk_buff *skb,</div><div class='add'>+					       const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	unsigned long mask = BIT(dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_HSR) &amp;&amp;</div><div class='add'>+	    unlikely(dev-&gt;features &amp; NETIF_F_HW_HSR_DUP)) {</div><div class='add'>+		struct net_device *hsr_dev = dp-&gt;hsr_dev;</div><div class='add'>+		struct dsa_port *other_dp;</div><div class='add'>+</div><div class='add'>+		dsa_hsr_foreach_port(other_dp, dp-&gt;ds, hsr_dev)</div><div class='add'>+			mask |= BIT(other_dp-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Create 2 modaliases per tagging protocol, one to auto-load the module</div><div class='add'>+ * given the ID reported by get_tag_protocol(), and the other by name.</div><div class='add'>+ */</div><div class='add'>+#define DSA_TAG_DRIVER_ALIAS "dsa_tag:"</div><div class='add'>+#define MODULE_ALIAS_DSA_TAG_DRIVER(__proto, __name) \</div><div class='add'>+	MODULE_ALIAS(DSA_TAG_DRIVER_ALIAS __name); \</div><div class='add'>+	MODULE_ALIAS(DSA_TAG_DRIVER_ALIAS "id-" \</div><div class='add'>+		     __stringify(__proto##_VALUE))</div><div class='add'>+</div><div class='add'>+void dsa_tag_drivers_register(struct dsa_tag_driver *dsa_tag_driver_array[],</div><div class='add'>+			      unsigned int count,</div><div class='add'>+			      struct module *owner);</div><div class='add'>+void dsa_tag_drivers_unregister(struct dsa_tag_driver *dsa_tag_driver_array[],</div><div class='add'>+				unsigned int count);</div><div class='add'>+</div><div class='add'>+#define dsa_tag_driver_module_drivers(__dsa_tag_drivers_array, __count)	\</div><div class='add'>+static int __init dsa_tag_driver_module_init(void)			\</div><div class='add'>+{									\</div><div class='add'>+	dsa_tag_drivers_register(__dsa_tag_drivers_array, __count,	\</div><div class='add'>+				 THIS_MODULE);				\</div><div class='add'>+	return 0;							\</div><div class='add'>+}									\</div><div class='add'>+module_init(dsa_tag_driver_module_init);				\</div><div class='add'>+									\</div><div class='add'>+static void __exit dsa_tag_driver_module_exit(void)			\</div><div class='add'>+{									\</div><div class='add'>+	dsa_tag_drivers_unregister(__dsa_tag_drivers_array, __count);	\</div><div class='add'>+}									\</div><div class='add'>+module_exit(dsa_tag_driver_module_exit)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * module_dsa_tag_drivers() - Helper macro for registering DSA tag</div><div class='add'>+ * drivers</div><div class='add'>+ * @__ops_array: Array of tag driver structures</div><div class='add'>+ *</div><div class='add'>+ * Helper macro for DSA tag drivers which do not do anything special</div><div class='add'>+ * in module init/exit. Each module may only use this macro once, and</div><div class='add'>+ * calling it replaces module_init() and module_exit().</div><div class='add'>+ */</div><div class='add'>+#define module_dsa_tag_drivers(__ops_array)				\</div><div class='add'>+dsa_tag_driver_module_drivers(__ops_array, ARRAY_SIZE(__ops_array))</div><div class='add'>+</div><div class='add'>+#define DSA_TAG_DRIVER_NAME(__ops) dsa_tag_driver ## _ ## __ops</div><div class='add'>+</div><div class='add'>+/* Create a static structure we can build a linked list of dsa_tag</div><div class='add'>+ * drivers</div><div class='add'>+ */</div><div class='add'>+#define DSA_TAG_DRIVER(__ops)						\</div><div class='add'>+static struct dsa_tag_driver DSA_TAG_DRIVER_NAME(__ops) = {		\</div><div class='add'>+	.ops = &amp;__ops,							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * module_dsa_tag_driver() - Helper macro for registering a single DSA tag</div><div class='add'>+ * driver</div><div class='add'>+ * @__ops: Single tag driver structures</div><div class='add'>+ *</div><div class='add'>+ * Helper macro for DSA tag drivers which do not do anything special</div><div class='add'>+ * in module init/exit. Each module may only use this macro once, and</div><div class='add'>+ * calling it replaces module_init() and module_exit().</div><div class='add'>+ */</div><div class='add'>+#define module_dsa_tag_driver(__ops)					\</div><div class='add'>+DSA_TAG_DRIVER(__ops);							\</div><div class='add'>+									\</div><div class='add'>+static struct dsa_tag_driver *dsa_tag_driver_array[] =	{		\</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(__ops)					\</div><div class='add'>+};									\</div><div class='add'>+module_dsa_tag_drivers(dsa_tag_driver_array)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c<br/>new file mode 100644<br/>index 000000000000..53e03fd8071b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_8021q.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_8021q.c</a></div><div class='hunk'>@@ -0,0 +1,588 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This module is not a complete tagger implementation. It only provides</div><div class='add'>+ * primitives for taggers that rely on 802.1Q VLAN tags to use.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "switch.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+</div><div class='add'>+/* Binary structure of the fake 12-bit VID field (when the TPID is</div><div class='add'>+ * ETH_P_DSA_8021Q):</div><div class='add'>+ *</div><div class='add'>+ * | 11  | 10  |  9  |  8  |  7  |  6  |  5  |  4  |  3  |  2  |  1  |  0  |</div><div class='add'>+ * +-----------+-----+-----------------+-----------+-----------------------+</div><div class='add'>+ * |    RSV    | VBID|    SWITCH_ID    |   VBID    |          PORT         |</div><div class='add'>+ * +-----------+-----+-----------------+-----------+-----------------------+</div><div class='add'>+ *</div><div class='add'>+ * RSV - VID[11:10]:</div><div class='add'>+ *	Reserved. Must be set to 3 (0b11).</div><div class='add'>+ *</div><div class='add'>+ * SWITCH_ID - VID[8:6]:</div><div class='add'>+ *	Index of switch within DSA tree. Must be between 0 and 7.</div><div class='add'>+ *</div><div class='add'>+ * VBID - { VID[9], VID[5:4] }:</div><div class='add'>+ *	Virtual bridge ID. If between 1 and 7, packet targets the broadcast</div><div class='add'>+ *	domain of a bridge. If transmitted as zero, packet targets a single</div><div class='add'>+ *	port.</div><div class='add'>+ *</div><div class='add'>+ * PORT - VID[3:0]:</div><div class='add'>+ *	Index of switch port. Must be between 0 and 15.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DSA_8021Q_RSV_VAL		3</div><div class='add'>+#define DSA_8021Q_RSV_SHIFT		10</div><div class='add'>+#define DSA_8021Q_RSV_MASK		GENMASK(11, 10)</div><div class='add'>+#define DSA_8021Q_RSV			((DSA_8021Q_RSV_VAL &lt;&lt; DSA_8021Q_RSV_SHIFT) &amp; \</div><div class='add'>+							       DSA_8021Q_RSV_MASK)</div><div class='add'>+</div><div class='add'>+#define DSA_8021Q_SWITCH_ID_SHIFT	6</div><div class='add'>+#define DSA_8021Q_SWITCH_ID_MASK	GENMASK(8, 6)</div><div class='add'>+#define DSA_8021Q_SWITCH_ID(x)		(((x) &lt;&lt; DSA_8021Q_SWITCH_ID_SHIFT) &amp; \</div><div class='add'>+						 DSA_8021Q_SWITCH_ID_MASK)</div><div class='add'>+</div><div class='add'>+#define DSA_8021Q_VBID_HI_SHIFT		9</div><div class='add'>+#define DSA_8021Q_VBID_HI_MASK		GENMASK(9, 9)</div><div class='add'>+#define DSA_8021Q_VBID_LO_SHIFT		4</div><div class='add'>+#define DSA_8021Q_VBID_LO_MASK		GENMASK(5, 4)</div><div class='add'>+#define DSA_8021Q_VBID_HI(x)		(((x) &amp; GENMASK(2, 2)) &gt;&gt; 2)</div><div class='add'>+#define DSA_8021Q_VBID_LO(x)		((x) &amp; GENMASK(1, 0))</div><div class='add'>+#define DSA_8021Q_VBID(x)		\</div><div class='add'>+		(((DSA_8021Q_VBID_LO(x) &lt;&lt; DSA_8021Q_VBID_LO_SHIFT) &amp; \</div><div class='add'>+		  DSA_8021Q_VBID_LO_MASK) | \</div><div class='add'>+		 ((DSA_8021Q_VBID_HI(x) &lt;&lt; DSA_8021Q_VBID_HI_SHIFT) &amp; \</div><div class='add'>+		  DSA_8021Q_VBID_HI_MASK))</div><div class='add'>+</div><div class='add'>+#define DSA_8021Q_PORT_SHIFT		0</div><div class='add'>+#define DSA_8021Q_PORT_MASK		GENMASK(3, 0)</div><div class='add'>+#define DSA_8021Q_PORT(x)		(((x) &lt;&lt; DSA_8021Q_PORT_SHIFT) &amp; \</div><div class='add'>+						 DSA_8021Q_PORT_MASK)</div><div class='add'>+</div><div class='add'>+struct dsa_tag_8021q_vlan {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int port;</div><div class='add'>+	u16 vid;</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsa_8021q_context {</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct list_head vlans;</div><div class='add'>+	/* EtherType of RX VID, used for filtering on conduit interface */</div><div class='add'>+	__be16 proto;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num)</div><div class='add'>+{</div><div class='add'>+	/* The VBID value of 0 is reserved for precise TX, but it is also</div><div class='add'>+	 * reserved/invalid for the bridge_num, so all is well.</div><div class='add'>+	 */</div><div class='add'>+	return DSA_8021Q_RSV | DSA_8021Q_VBID(bridge_num);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_bridge_vid);</div><div class='add'>+</div><div class='add'>+/* Returns the VID that will be installed as pvid for this switch port, sent as</div><div class='add'>+ * tagged egress towards the CPU port and decoded by the rcv function.</div><div class='add'>+ */</div><div class='add'>+u16 dsa_tag_8021q_standalone_vid(const struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	return DSA_8021Q_RSV | DSA_8021Q_SWITCH_ID(dp-&gt;ds-&gt;index) |</div><div class='add'>+	       DSA_8021Q_PORT(dp-&gt;index);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_standalone_vid);</div><div class='add'>+</div><div class='add'>+/* Returns the decoded switch ID from the RX VID. */</div><div class='add'>+int dsa_8021q_rx_switch_id(u16 vid)</div><div class='add'>+{</div><div class='add'>+	return (vid &amp; DSA_8021Q_SWITCH_ID_MASK) &gt;&gt; DSA_8021Q_SWITCH_ID_SHIFT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_8021q_rx_switch_id);</div><div class='add'>+</div><div class='add'>+/* Returns the decoded port ID from the RX VID. */</div><div class='add'>+int dsa_8021q_rx_source_port(u16 vid)</div><div class='add'>+{</div><div class='add'>+	return (vid &amp; DSA_8021Q_PORT_MASK) &gt;&gt; DSA_8021Q_PORT_SHIFT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_8021q_rx_source_port);</div><div class='add'>+</div><div class='add'>+/* Returns the decoded VBID from the RX VID. */</div><div class='add'>+static int dsa_tag_8021q_rx_vbid(u16 vid)</div><div class='add'>+{</div><div class='add'>+	u16 vbid_hi = (vid &amp; DSA_8021Q_VBID_HI_MASK) &gt;&gt; DSA_8021Q_VBID_HI_SHIFT;</div><div class='add'>+	u16 vbid_lo = (vid &amp; DSA_8021Q_VBID_LO_MASK) &gt;&gt; DSA_8021Q_VBID_LO_SHIFT;</div><div class='add'>+</div><div class='add'>+	return (vbid_hi &lt;&lt; 2) | vbid_lo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool vid_is_dsa_8021q(u16 vid)</div><div class='add'>+{</div><div class='add'>+	u16 rsv = (vid &amp; DSA_8021Q_RSV_MASK) &gt;&gt; DSA_8021Q_RSV_SHIFT;</div><div class='add'>+</div><div class='add'>+	return rsv == DSA_8021Q_RSV_VAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(vid_is_dsa_8021q);</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_8021q_vlan *</div><div class='add'>+dsa_tag_8021q_vlan_find(struct dsa_8021q_context *ctx, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_tag_8021q_vlan *v;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;ctx-&gt;vlans, list)</div><div class='add'>+		if (v-&gt;vid == vid &amp;&amp; v-&gt;port == port)</div><div class='add'>+			return v;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid,</div><div class='add'>+					  u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx = dp-&gt;ds-&gt;tag_8021q_ctx;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_tag_8021q_vlan *v;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp)))</div><div class='add'>+		return ds-&gt;ops-&gt;tag_8021q_vlan_add(ds, port, vid, flags);</div><div class='add'>+</div><div class='add'>+	v = dsa_tag_8021q_vlan_find(ctx, port, vid);</div><div class='add'>+	if (v) {</div><div class='add'>+		refcount_inc(&amp;v-&gt;refcount);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v = kzalloc(sizeof(*v), GFP_KERNEL);</div><div class='add'>+	if (!v)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;tag_8021q_vlan_add(ds, port, vid, flags);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(v);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v-&gt;vid = vid;</div><div class='add'>+	v-&gt;port = port;</div><div class='add'>+	refcount_set(&amp;v-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;v-&gt;list, &amp;ctx-&gt;vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_port_do_tag_8021q_vlan_del(struct dsa_port *dp, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx = dp-&gt;ds-&gt;tag_8021q_ctx;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_tag_8021q_vlan *v;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* No need to bother with refcounting for user ports */</div><div class='add'>+	if (!(dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp)))</div><div class='add'>+		return ds-&gt;ops-&gt;tag_8021q_vlan_del(ds, port, vid);</div><div class='add'>+</div><div class='add'>+	v = dsa_tag_8021q_vlan_find(ctx, port, vid);</div><div class='add'>+	if (!v)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;v-&gt;refcount))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;tag_8021q_vlan_del(ds, port, vid);</div><div class='add'>+	if (err) {</div><div class='add'>+		refcount_set(&amp;v-&gt;refcount, 1);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;v-&gt;list);</div><div class='add'>+	kfree(v);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+dsa_port_tag_8021q_vlan_match(struct dsa_port *dp,</div><div class='add'>+			      struct dsa_notifier_tag_8021q_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	return dsa_port_is_dsa(dp) || dsa_port_is_cpu(dp) || dp == info-&gt;dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_switch_tag_8021q_vlan_add(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_tag_8021q_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Since we use dsa_broadcast(), there might be other switches in other</div><div class='add'>+	 * trees which don't support tag_8021q, so don't return an error.</div><div class='add'>+	 * Or they might even support tag_8021q but have not registered yet to</div><div class='add'>+	 * use it (maybe they use another tagger currently).</div><div class='add'>+	 */</div><div class='add'>+	if (!ds-&gt;ops-&gt;tag_8021q_vlan_add || !ds-&gt;tag_8021q_ctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_tag_8021q_vlan_match(dp, info)) {</div><div class='add'>+			u16 flags = 0;</div><div class='add'>+</div><div class='add'>+			if (dsa_port_is_user(dp))</div><div class='add'>+				flags |= BRIDGE_VLAN_INFO_UNTAGGED |</div><div class='add'>+					 BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+</div><div class='add'>+			err = dsa_port_do_tag_8021q_vlan_add(dp, info-&gt;vid,</div><div class='add'>+							     flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_switch_tag_8021q_vlan_del(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_tag_8021q_vlan_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;tag_8021q_vlan_del || !ds-&gt;tag_8021q_ctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (dsa_port_tag_8021q_vlan_match(dp, info)) {</div><div class='add'>+			err = dsa_port_do_tag_8021q_vlan_del(dp, info-&gt;vid);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There are 2 ways of offloading tag_8021q VLANs.</div><div class='add'>+ *</div><div class='add'>+ * One is to use a hardware TCAM to push the port's standalone VLAN into the</div><div class='add'>+ * frame when forwarding it to the CPU, as an egress modification rule on the</div><div class='add'>+ * CPU port. This is preferable because it has no side effects for the</div><div class='add'>+ * autonomous forwarding path, and accomplishes tag_8021q's primary goal of</div><div class='add'>+ * identifying the source port of each packet based on VLAN ID.</div><div class='add'>+ *</div><div class='add'>+ * The other is to commit the tag_8021q VLAN as a PVID to the VLAN table, and</div><div class='add'>+ * to configure the port as VLAN-unaware. This is less preferable because</div><div class='add'>+ * unique source port identification can only be done for standalone ports;</div><div class='add'>+ * under a VLAN-unaware bridge, all ports share the same tag_8021q VLAN as</div><div class='add'>+ * PVID, and under a VLAN-aware bridge, packets received by software will not</div><div class='add'>+ * have tag_8021q VLANs appended, just bridge VLANs.</div><div class='add'>+ *</div><div class='add'>+ * For tag_8021q implementations of the second type, this method is used to</div><div class='add'>+ * replace the standalone tag_8021q VLAN of a port with the tag_8021q VLAN to</div><div class='add'>+ * be used for VLAN-unaware bridging.</div><div class='add'>+ */</div><div class='add'>+int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	u16 standalone_vid, bridge_vid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Delete the standalone VLAN of the port and replace it with a</div><div class='add'>+	 * bridging VLAN</div><div class='add'>+	 */</div><div class='add'>+	standalone_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	bridge_vid = dsa_tag_8021q_bridge_vid(bridge.num);</div><div class='add'>+</div><div class='add'>+	err = dsa_port_tag_8021q_vlan_add(dp, bridge_vid, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dsa_port_tag_8021q_vlan_del(dp, standalone_vid, false);</div><div class='add'>+</div><div class='add'>+	*tx_fwd_offload = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_bridge_join);</div><div class='add'>+</div><div class='add'>+void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	u16 standalone_vid, bridge_vid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Delete the bridging VLAN of the port and replace it with a</div><div class='add'>+	 * standalone VLAN</div><div class='add'>+	 */</div><div class='add'>+	standalone_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	bridge_vid = dsa_tag_8021q_bridge_vid(bridge.num);</div><div class='add'>+</div><div class='add'>+	err = dsa_port_tag_8021q_vlan_add(dp, standalone_vid, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"Failed to delete tag_8021q standalone VLAN %d from port %d: %pe\n",</div><div class='add'>+			standalone_vid, port, ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_port_tag_8021q_vlan_del(dp, bridge_vid, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_bridge_leave);</div><div class='add'>+</div><div class='add'>+/* Set up a port's standalone tag_8021q VLAN */</div><div class='add'>+static int dsa_tag_8021q_port_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx = ds-&gt;tag_8021q_ctx;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	u16 vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	struct net_device *conduit;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The CPU port is implicitly configured by</div><div class='add'>+	 * configuring the front-panel ports</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	conduit = dsa_port_to_conduit(dp);</div><div class='add'>+</div><div class='add'>+	err = dsa_port_tag_8021q_vlan_add(dp, vid, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"Failed to apply standalone VID %d to port %d: %pe\n",</div><div class='add'>+			vid, port, ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the VLAN to the conduit's RX filter. */</div><div class='add'>+	vlan_vid_add(conduit, ctx-&gt;proto, vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tag_8021q_port_teardown(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx = ds-&gt;tag_8021q_ctx;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	u16 vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	struct net_device *conduit;</div><div class='add'>+</div><div class='add'>+	/* The CPU port is implicitly configured by</div><div class='add'>+	 * configuring the front-panel ports</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conduit = dsa_port_to_conduit(dp);</div><div class='add'>+</div><div class='add'>+	dsa_port_tag_8021q_vlan_del(dp, vid, false);</div><div class='add'>+</div><div class='add'>+	vlan_vid_del(conduit, ctx-&gt;proto, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_tag_8021q_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int err, port;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		err = dsa_tag_8021q_port_setup(ds, port);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to setup VLAN tagging for port %d: %pe\n",</div><div class='add'>+				port, ERR_PTR(err));</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tag_8021q_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++)</div><div class='add'>+		dsa_tag_8021q_port_teardown(ds, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;proto = proto;</div><div class='add'>+	ctx-&gt;ds = ds;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ctx-&gt;vlans);</div><div class='add'>+</div><div class='add'>+	ds-&gt;tag_8021q_ctx = ctx;</div><div class='add'>+</div><div class='add'>+	err = dsa_tag_8021q_setup(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_register);</div><div class='add'>+</div><div class='add'>+void dsa_tag_8021q_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_8021q_context *ctx = ds-&gt;tag_8021q_ctx;</div><div class='add'>+	struct dsa_tag_8021q_vlan *v, *n;</div><div class='add'>+</div><div class='add'>+	dsa_tag_8021q_teardown(ds);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(v, n, &amp;ctx-&gt;vlans, list) {</div><div class='add'>+		list_del(&amp;v-&gt;list);</div><div class='add'>+		kfree(v);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;tag_8021q_ctx = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_unregister);</div><div class='add'>+</div><div class='add'>+struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,</div><div class='add'>+			       u16 tpid, u16 tci)</div><div class='add'>+{</div><div class='add'>+	/* skb-&gt;data points at the MAC header, which is fine</div><div class='add'>+	 * for vlan_insert_tag().</div><div class='add'>+	 */</div><div class='add'>+	return vlan_insert_tag(skb, htons(tpid), tci);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_8021q_xmit);</div><div class='add'>+</div><div class='add'>+static struct net_device *</div><div class='add'>+dsa_tag_8021q_find_port_by_vbid(struct net_device *conduit, int vbid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vbid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_user_port(dp, dst) {</div><div class='add'>+		if (!dp-&gt;bridge)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;stp_state != BR_STATE_LEARNING &amp;&amp;</div><div class='add'>+		    dp-&gt;stp_state != BR_STATE_FORWARDING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;cpu_dp != cpu_dp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dsa_port_bridge_num_get(dp) == vbid)</div><div class='add'>+			return dp-&gt;user;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *dsa_tag_8021q_find_user(struct net_device *conduit,</div><div class='add'>+					   int source_port, int switch_id,</div><div class='add'>+					   int vid, int vbid)</div><div class='add'>+{</div><div class='add'>+	/* Always prefer precise source port information, if available */</div><div class='add'>+	if (source_port != -1 &amp;&amp; switch_id != -1)</div><div class='add'>+		return dsa_conduit_find_user(conduit, switch_id, source_port);</div><div class='add'>+	else if (vbid &gt;= 1)</div><div class='add'>+		return dsa_tag_8021q_find_port_by_vbid(conduit, vbid);</div><div class='add'>+</div><div class='add'>+	return dsa_find_designated_bridge_port_by_vid(conduit, vid);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_tag_8021q_find_user);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsa_8021q_rcv - Decode source information from tag_8021q header</div><div class='add'>+ * @skb: RX socket buffer</div><div class='add'>+ * @source_port: pointer to storage for precise source port information.</div><div class='add'>+ *	If this is known already from outside tag_8021q, the pre-initialized</div><div class='add'>+ *	value is preserved. If not known, pass -1.</div><div class='add'>+ * @switch_id: similar to source_port.</div><div class='add'>+ * @vbid: pointer to storage for imprecise bridge ID. Must be pre-initialized</div><div class='add'>+ *	with -1. If a positive value is returned, the source_port and switch_id</div><div class='add'>+ *	are invalid.</div><div class='add'>+ * @vid: pointer to storage for original VID, in case tag_8021q decoding failed.</div><div class='add'>+ *</div><div class='add'>+ * If the packet has a tag_8021q header, decode it and set @source_port,</div><div class='add'>+ * @switch_id and @vbid, and strip the header. Otherwise set @vid and keep the</div><div class='add'>+ * header in the hwaccel area of the packet.</div><div class='add'>+ */</div><div class='add'>+void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id,</div><div class='add'>+		   int *vbid, int *vid)</div><div class='add'>+{</div><div class='add'>+	int tmp_source_port, tmp_switch_id, tmp_vbid;</div><div class='add'>+	__be16 vlan_proto;</div><div class='add'>+	u16 tmp_vid, tci;</div><div class='add'>+</div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		vlan_proto = skb-&gt;vlan_proto;</div><div class='add'>+		tci = skb_vlan_tag_get(skb);</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+	} else {</div><div class='add'>+		struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+		vlan_proto = hdr-&gt;h_vlan_proto;</div><div class='add'>+		skb_push_rcsum(skb, ETH_HLEN);</div><div class='add'>+		__skb_vlan_pop(skb, &amp;tci);</div><div class='add'>+		skb_pull_rcsum(skb, ETH_HLEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp_vid = tci &amp; VLAN_VID_MASK;</div><div class='add'>+	if (!vid_is_dsa_8021q(tmp_vid)) {</div><div class='add'>+		/* Not a tag_8021q frame, so return the VID to the</div><div class='add'>+		 * caller for further processing, and put the tag back</div><div class='add'>+		 */</div><div class='add'>+		if (vid)</div><div class='add'>+			*vid = tmp_vid;</div><div class='add'>+</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, vlan_proto, tci);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp_source_port = dsa_8021q_rx_source_port(tmp_vid);</div><div class='add'>+	tmp_switch_id = dsa_8021q_rx_switch_id(tmp_vid);</div><div class='add'>+	tmp_vbid = dsa_tag_8021q_rx_vbid(tmp_vid);</div><div class='add'>+</div><div class='add'>+	/* Precise source port information is unknown when receiving from a</div><div class='add'>+	 * VLAN-unaware bridging domain, and tmp_source_port and tmp_switch_id</div><div class='add'>+	 * are zeroes in this case.</div><div class='add'>+	 *</div><div class='add'>+	 * Preserve the source information from hardware-specific mechanisms,</div><div class='add'>+	 * if available. This allows us to not overwrite a valid source port</div><div class='add'>+	 * and switch ID with less precise values.</div><div class='add'>+	 */</div><div class='add'>+	if (tmp_vbid == 0 &amp;&amp; *source_port == -1)</div><div class='add'>+		*source_port = tmp_source_port;</div><div class='add'>+	if (tmp_vbid == 0 &amp;&amp; *switch_id == -1)</div><div class='add'>+		*switch_id = tmp_switch_id;</div><div class='add'>+</div><div class='add'>+	if (vbid)</div><div class='add'>+		*vbid = tmp_vbid;</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = (tci &amp; VLAN_PRIO_MASK) &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_8021q_rcv);</div><div class='head'>diff --git a/net/dsa/tag_8021q.h b/net/dsa/tag_8021q.h<br/>new file mode 100644<br/>index 000000000000..27b8906f99ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_8021q.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_8021q.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_TAG_8021Q_H</div><div class='add'>+#define __DSA_TAG_8021Q_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "switch.h"</div><div class='add'>+</div><div class='add'>+struct sk_buff;</div><div class='add'>+struct net_device;</div><div class='add'>+</div><div class='add'>+struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,</div><div class='add'>+			       u16 tpid, u16 tci);</div><div class='add'>+</div><div class='add'>+void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id,</div><div class='add'>+		   int *vbid, int *vid);</div><div class='add'>+</div><div class='add'>+struct net_device *dsa_tag_8021q_find_user(struct net_device *conduit,</div><div class='add'>+					   int source_port, int switch_id,</div><div class='add'>+					   int vid, int vbid);</div><div class='add'>+</div><div class='add'>+int dsa_switch_tag_8021q_vlan_add(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_tag_8021q_vlan_info *info);</div><div class='add'>+int dsa_switch_tag_8021q_vlan_del(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_notifier_tag_8021q_vlan_info *info);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/dsa/tag_ar9331.c b/net/dsa/tag_ar9331.c<br/>new file mode 100644<br/>index 000000000000..cbb588ca73aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_ar9331.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_ar9331.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define AR9331_NAME			"ar9331"</div><div class='add'>+</div><div class='add'>+#define AR9331_HDR_LEN			2</div><div class='add'>+#define AR9331_HDR_VERSION		1</div><div class='add'>+</div><div class='add'>+#define AR9331_HDR_VERSION_MASK		GENMASK(15, 14)</div><div class='add'>+#define AR9331_HDR_PRIORITY_MASK	GENMASK(13, 12)</div><div class='add'>+#define AR9331_HDR_TYPE_MASK		GENMASK(10, 8)</div><div class='add'>+#define AR9331_HDR_BROADCAST		BIT(7)</div><div class='add'>+#define AR9331_HDR_FROM_CPU		BIT(6)</div><div class='add'>+/* AR9331_HDR_RESERVED - not used or may be version field.</div><div class='add'>+ * According to the AR8216 doc it should 0b10. On AR9331 it is 0b11 on RX path</div><div class='add'>+ * and should be set to 0b11 to make it work.</div><div class='add'>+ */</div><div class='add'>+#define AR9331_HDR_RESERVED_MASK	GENMASK(5, 4)</div><div class='add'>+#define AR9331_HDR_PORT_NUM_MASK	GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	__le16 *phdr;</div><div class='add'>+	u16 hdr;</div><div class='add'>+</div><div class='add'>+	phdr = skb_push(skb, AR9331_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	hdr = FIELD_PREP(AR9331_HDR_VERSION_MASK, AR9331_HDR_VERSION);</div><div class='add'>+	hdr |= AR9331_HDR_FROM_CPU | dp-&gt;index;</div><div class='add'>+	/* 0b10 for AR8216 and 0b11 for AR9331 */</div><div class='add'>+	hdr |= AR9331_HDR_RESERVED_MASK;</div><div class='add'>+</div><div class='add'>+	phdr[0] = cpu_to_le16(hdr);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ar9331_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	u8 ver, port;</div><div class='add'>+	u16 hdr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, AR9331_HDR_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hdr = le16_to_cpu(*(__le16 *)skb_mac_header(skb));</div><div class='add'>+</div><div class='add'>+	ver = FIELD_GET(AR9331_HDR_VERSION_MASK, hdr);</div><div class='add'>+	if (unlikely(ver != AR9331_HDR_VERSION)) {</div><div class='add'>+		netdev_warn_once(ndev, "%s:%i wrong header version 0x%2x\n",</div><div class='add'>+				 __func__, __LINE__, hdr);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(hdr &amp; AR9331_HDR_FROM_CPU)) {</div><div class='add'>+		netdev_warn_once(ndev, "%s:%i packet should not be from cpu 0x%2x\n",</div><div class='add'>+				 __func__, __LINE__, hdr);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull_rcsum(skb, AR9331_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	/* Get source port information */</div><div class='add'>+	port = FIELD_GET(AR9331_HDR_PORT_NUM_MASK, hdr);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(ndev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ar9331_netdev_ops = {</div><div class='add'>+	.name	= AR9331_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_AR9331,</div><div class='add'>+	.xmit	= ar9331_tag_xmit,</div><div class='add'>+	.rcv	= ar9331_tag_rcv,</div><div class='add'>+	.needed_headroom = AR9331_HDR_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Atheros AR9331 SoC with built-in switch");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_AR9331, AR9331_NAME);</div><div class='add'>+module_dsa_tag_driver(ar9331_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c<br/>index 2b06bb91318b..cf9420439054 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_brcm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_brcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_brcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_brcm.c</a></div><div class='hunk'>@@ -1,26 +1,50 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom tag support</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2014 Broadcom Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dsa/brcm.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "tag.h"</div><div class='ctx'> </div><div class='del'>-/* This tag length is 4 bytes, older ones were 6 bytes, we do not</div><div class='del'>- * handle them</div><div class='del'>- */</div><div class='add'>+#define BRCM_NAME		"brcm"</div><div class='add'>+#define BRCM_LEGACY_NAME	"brcm-legacy"</div><div class='add'>+#define BRCM_LEGACY_FCS_NAME	"brcm-legacy-fcs"</div><div class='add'>+#define BRCM_PREPEND_NAME	"brcm-prepend"</div><div class='add'>+</div><div class='add'>+/* Legacy Broadcom tag (6 bytes) */</div><div class='add'>+#define BRCM_LEG_TAG_LEN	6</div><div class='add'>+</div><div class='add'>+/* Type fields */</div><div class='add'>+/* 1st byte in the tag */</div><div class='add'>+#define BRCM_LEG_TYPE_HI	0x88</div><div class='add'>+/* 2nd byte in the tag */</div><div class='add'>+#define BRCM_LEG_TYPE_LO	0x74</div><div class='add'>+</div><div class='add'>+/* Tag fields */</div><div class='add'>+/* 3rd byte in the tag */</div><div class='add'>+#define BRCM_LEG_UNICAST	(0 &lt;&lt; 5)</div><div class='add'>+#define BRCM_LEG_MULTICAST	(1 &lt;&lt; 5)</div><div class='add'>+#define BRCM_LEG_EGRESS		(2 &lt;&lt; 5)</div><div class='add'>+#define BRCM_LEG_INGRESS	(3 &lt;&lt; 5)</div><div class='add'>+#define BRCM_LEG_LEN_HI(x)	(((x) &gt;&gt; 8) &amp; 0x7)</div><div class='add'>+</div><div class='add'>+/* 4th byte in the tag */</div><div class='add'>+#define BRCM_LEG_LEN_LO(x)	((x) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+/* 6th byte in the tag */</div><div class='add'>+#define BRCM_LEG_PORT_ID	(0xf)</div><div class='add'>+</div><div class='add'>+/* Newer Broadcom tag (4 bytes) */</div><div class='ctx'> #define BRCM_TAG_LEN	4</div><div class='ctx'> </div><div class='del'>-/* Tag is constructed and desconstructed using byte by byte access</div><div class='add'>+/* Tag is constructed and deconstructed using byte by byte access</div><div class='ctx'>  * because the tag is placed after the MAC Source Address, which does</div><div class='ctx'>  * not make it 4-bytes aligned, so this might cause unaligned accesses</div><div class='ctx'>  * on most systems where this is used.</div><div class='hunk'>@@ -59,17 +83,18 @@</div><div class='ctx'> #define BRCM_EG_TC_MASK		0x7</div><div class='ctx'> #define BRCM_EG_PID_MASK	0x1f</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM) || \</div><div class='add'>+	IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,</div><div class='ctx'> 					struct net_device *dev,</div><div class='ctx'> 					unsigned int offset)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='ctx'> 	u16 queue = skb_get_queue_mapping(skb);</div><div class='add'>+	u16 port_mask;</div><div class='ctx'> 	u8 *brcm_tag;</div><div class='ctx'> </div><div class='del'>-	if (skb_cow_head(skb, BRCM_TAG_LEN) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	/* The Ethernet switch we are interfaced with needs packets to be at</div><div class='ctx'> 	 * least 64 bytes (including FCS) otherwise they will be discarded when</div><div class='ctx'> 	 * they enter the switch port logic. When Broadcom tags are enabled, we</div><div class='hunk'>@@ -77,7 +102,7 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,</div><div class='ctx'> 	 * (including FCS and tag) because the length verification is done after</div><div class='ctx'> 	 * the Broadcom tag is stripped off the ingress packet.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Let dsa_slave_xmit() free the SKB</div><div class='add'>+	 * Let dsa_user_xmit() free the SKB</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (__skb_put_padto(skb, ETH_ZLEN + BRCM_TAG_LEN, false))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -85,22 +110,21 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,</div><div class='ctx'> 	skb_push(skb, BRCM_TAG_LEN);</div><div class='ctx'> </div><div class='ctx'> 	if (offset)</div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + BRCM_TAG_LEN, offset);</div><div class='add'>+		dsa_alloc_etype_header(skb, BRCM_TAG_LEN);</div><div class='ctx'> </div><div class='ctx'> 	brcm_tag = skb-&gt;data + offset;</div><div class='ctx'> </div><div class='del'>-	/* Set the ingress opcode, traffic class, tag enforcment is</div><div class='add'>+	/* Set the ingress opcode, traffic class, tag enforcement is</div><div class='ctx'> 	 * deprecated</div><div class='ctx'> 	 */</div><div class='ctx'> 	brcm_tag[0] = (1 &lt;&lt; BRCM_OPCODE_SHIFT) |</div><div class='ctx'> 		       ((queue &amp; BRCM_IG_TC_MASK) &lt;&lt; BRCM_IG_TC_SHIFT);</div><div class='ctx'> 	brcm_tag[1] = 0;</div><div class='del'>-	brcm_tag[2] = 0;</div><div class='del'>-	if (dp-&gt;index == 8)</div><div class='del'>-		brcm_tag[2] = BRCM_IG_DSTMAP2_MASK;</div><div class='del'>-	brcm_tag[3] = (1 &lt;&lt; dp-&gt;index) &amp; BRCM_IG_DSTMAP1_MASK;</div><div class='add'>+	port_mask = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+	brcm_tag[2] = (port_mask &gt;&gt; 8) &amp; BRCM_IG_DSTMAP2_MASK;</div><div class='add'>+	brcm_tag[3] = port_mask &amp; BRCM_IG_DSTMAP1_MASK;</div><div class='ctx'> </div><div class='del'>-	/* Now tell the master network device about the desired output queue</div><div class='add'>+	/* Now tell the conduit network device about the desired output queue</div><div class='ctx'> 	 * as well</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_set_queue_mapping(skb, BRCM_TAG_SET_PORT_QUEUE(dp-&gt;index, queue));</div><div class='hunk'>@@ -108,9 +132,20 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Frames with this tag have one of these two layouts:</div><div class='add'>+ * -----------------------------------</div><div class='add'>+ * | MAC DA | MAC SA | 4b tag | Type | DSA_TAG_PROTO_BRCM</div><div class='add'>+ * -----------------------------------</div><div class='add'>+ * -----------------------------------</div><div class='add'>+ * | 4b tag | MAC DA | MAC SA | Type | DSA_TAG_PROTO_BRCM_PREPEND</div><div class='add'>+ * -----------------------------------</div><div class='add'>+ * In both cases, at receive time, skb-&gt;data points 2 bytes before the actual</div><div class='add'>+ * Ethernet type field and we have an offset of 4bytes between where skb-&gt;data</div><div class='add'>+ * and where the payload starts. So the same low-level receive function can be</div><div class='add'>+ * used.</div><div class='add'>+ */</div><div class='ctx'> static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,</div><div class='ctx'> 				       struct net_device *dev,</div><div class='del'>-				       struct packet_type *pt,</div><div class='ctx'> 				       unsigned int offset)</div><div class='ctx'> {</div><div class='ctx'> 	int source_port;</div><div class='hunk'>@@ -134,17 +169,21 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,</div><div class='ctx'> 	/* Locate which port this is coming from */</div><div class='ctx'> 	source_port = brcm_tag[3] &amp; BRCM_EG_PID_MASK;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, source_port);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, source_port);</div><div class='ctx'> 	if (!skb-&gt;dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove Broadcom tag and update checksum */</div><div class='ctx'> 	skb_pull_rcsum(skb, BRCM_TAG_LEN);</div><div class='ctx'> </div><div class='add'>+	if (likely(!is_link_local_ether_addr(eth_hdr(skb)-&gt;h_dest)))</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_BRCM</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM)</div><div class='ctx'> static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb,</div><div class='ctx'> 				     struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -153,31 +192,185 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				    struct packet_type *pt)</div><div class='add'>+static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='ctx'> </div><div class='ctx'> 	/* skb-&gt;data points to the EtherType, the tag is right before it */</div><div class='del'>-	nskb = brcm_tag_rcv_ll(skb, dev, pt, 2);</div><div class='add'>+	nskb = brcm_tag_rcv_ll(skb, dev, 2);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return nskb;</div><div class='ctx'> </div><div class='del'>-	/* Move the Ethernet DA and SA */</div><div class='del'>-	memmove(nskb-&gt;data - ETH_HLEN,</div><div class='del'>-		nskb-&gt;data - ETH_HLEN - BRCM_TAG_LEN,</div><div class='del'>-		2 * ETH_ALEN);</div><div class='add'>+	dsa_strip_etype_header(skb, BRCM_TAG_LEN);</div><div class='ctx'> </div><div class='ctx'> 	return nskb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops brcm_netdev_ops = {</div><div class='add'>+static const struct dsa_device_ops brcm_netdev_ops = {</div><div class='add'>+	.name	= BRCM_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_BRCM,</div><div class='ctx'> 	.xmit	= brcm_tag_xmit,</div><div class='ctx'> 	.rcv	= brcm_tag_rcv,</div><div class='add'>+	.needed_headroom = BRCM_TAG_LEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(brcm_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM, BRCM_NAME);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY) || \</div><div class='add'>+	IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS)</div><div class='add'>+static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int len = BRCM_LEG_TAG_LEN;</div><div class='add'>+	int source_port;</div><div class='add'>+	__be16 *proto;</div><div class='add'>+	u8 *brcm_tag;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, BRCM_LEG_TAG_LEN + VLAN_HLEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	brcm_tag = dsa_etype_header_pos_rx(skb);</div><div class='add'>+	proto = (__be16 *)(brcm_tag + BRCM_LEG_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	source_port = brcm_tag[5] &amp; BRCM_LEG_PORT_ID;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, source_port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* The internal switch in BCM63XX SoCs always tags on egress on the CPU</div><div class='add'>+	 * port. We use VID 0 internally for untagged traffic, so strip the tag</div><div class='add'>+	 * if the TCI field is all 0, and keep it otherwise to also retain</div><div class='add'>+	 * e.g. 802.1p tagged packets.</div><div class='add'>+	 */</div><div class='add'>+	if (proto[0] == htons(ETH_P_8021Q) &amp;&amp; proto[1] == 0)</div><div class='add'>+		len += VLAN_HLEN;</div><div class='add'>+</div><div class='add'>+	/* Remove Broadcom tag and update checksum */</div><div class='add'>+	skb_pull_rcsum(skb, len);</div><div class='add'>+</div><div class='add'>+	if (likely(!is_link_local_ether_addr(eth_hdr(skb)-&gt;h_dest)))</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	dsa_strip_etype_header(skb, len);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NET_DSA_TAG_BRCM_LEGACY || CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY)</div><div class='add'>+static struct sk_buff *brcm_leg_tag_xmit(struct sk_buff *skb,</div><div class='add'>+					 struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	u8 *brcm_tag;</div><div class='add'>+</div><div class='add'>+	/* The Ethernet switch we are interfaced with needs packets to be at</div><div class='add'>+	 * least 64 bytes (including FCS) otherwise they will be discarded when</div><div class='add'>+	 * they enter the switch port logic. When Broadcom tags are enabled, we</div><div class='add'>+	 * need to make sure that packets are at least 70 bytes</div><div class='add'>+	 * (including FCS and tag) because the length verification is done after</div><div class='add'>+	 * the Broadcom tag is stripped off the ingress packet.</div><div class='add'>+	 *</div><div class='add'>+	 * Let dsa_user_xmit() free the SKB</div><div class='add'>+	 */</div><div class='add'>+	if (__skb_put_padto(skb, ETH_ZLEN + BRCM_LEG_TAG_LEN, false))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, BRCM_LEG_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_alloc_etype_header(skb, BRCM_LEG_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	brcm_tag = skb-&gt;data + 2 * ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	/* Broadcom tag type */</div><div class='add'>+	brcm_tag[0] = BRCM_LEG_TYPE_HI;</div><div class='add'>+	brcm_tag[1] = BRCM_LEG_TYPE_LO;</div><div class='add'>+</div><div class='add'>+	/* Broadcom tag value */</div><div class='add'>+	brcm_tag[2] = BRCM_LEG_EGRESS;</div><div class='add'>+	brcm_tag[3] = 0;</div><div class='add'>+	brcm_tag[4] = 0;</div><div class='add'>+	brcm_tag[5] = dp-&gt;index &amp; BRCM_LEG_PORT_ID;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops brcm_legacy_netdev_ops = {</div><div class='add'>+	.name = BRCM_LEGACY_NAME,</div><div class='add'>+	.proto = DSA_TAG_PROTO_BRCM_LEGACY,</div><div class='add'>+	.xmit = brcm_leg_tag_xmit,</div><div class='add'>+	.rcv = brcm_leg_tag_rcv,</div><div class='add'>+	.needed_headroom = BRCM_LEG_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(brcm_legacy_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM_LEGACY, BRCM_LEGACY_NAME);</div><div class='add'>+#endif /* CONFIG_NET_DSA_TAG_BRCM_LEGACY */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS)</div><div class='add'>+static struct sk_buff *brcm_leg_fcs_tag_xmit(struct sk_buff *skb,</div><div class='add'>+					     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	unsigned int fcs_len;</div><div class='add'>+	__le32 fcs_val;</div><div class='add'>+	u8 *brcm_tag;</div><div class='add'>+</div><div class='add'>+	/* The Ethernet switch we are interfaced with needs packets to be at</div><div class='add'>+	 * least 64 bytes (including FCS) otherwise they will be discarded when</div><div class='add'>+	 * they enter the switch port logic. When Broadcom tags are enabled, we</div><div class='add'>+	 * need to make sure that packets are at least 70 bytes (including FCS</div><div class='add'>+	 * and tag) because the length verification is done after the Broadcom</div><div class='add'>+	 * tag is stripped off the ingress packet.</div><div class='add'>+	 *</div><div class='add'>+	 * Let dsa_user_xmit() free the SKB.</div><div class='add'>+	 */</div><div class='add'>+	if (__skb_put_padto(skb, ETH_ZLEN + BRCM_LEG_TAG_LEN, false))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	fcs_len = skb-&gt;len;</div><div class='add'>+	fcs_val = cpu_to_le32(crc32_le(~0, skb-&gt;data, fcs_len) ^ ~0);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, BRCM_LEG_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_alloc_etype_header(skb, BRCM_LEG_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	brcm_tag = skb-&gt;data + 2 * ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	/* Broadcom tag type */</div><div class='add'>+	brcm_tag[0] = BRCM_LEG_TYPE_HI;</div><div class='add'>+	brcm_tag[1] = BRCM_LEG_TYPE_LO;</div><div class='add'>+</div><div class='add'>+	/* Broadcom tag value */</div><div class='add'>+	brcm_tag[2] = BRCM_LEG_EGRESS | BRCM_LEG_LEN_HI(fcs_len);</div><div class='add'>+	brcm_tag[3] = BRCM_LEG_LEN_LO(fcs_len);</div><div class='add'>+	brcm_tag[4] = 0;</div><div class='add'>+	brcm_tag[5] = dp-&gt;index &amp; BRCM_LEG_PORT_ID;</div><div class='add'>+</div><div class='add'>+	/* Original FCS value */</div><div class='add'>+	if (__skb_pad(skb, ETH_FCS_LEN, false))</div><div class='add'>+		return NULL;</div><div class='add'>+	skb_put_data(skb, &amp;fcs_val, ETH_FCS_LEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops brcm_legacy_fcs_netdev_ops = {</div><div class='add'>+	.name = BRCM_LEGACY_FCS_NAME,</div><div class='add'>+	.proto = DSA_TAG_PROTO_BRCM_LEGACY_FCS,</div><div class='add'>+	.xmit = brcm_leg_fcs_tag_xmit,</div><div class='add'>+	.rcv = brcm_leg_tag_rcv,</div><div class='add'>+	.needed_headroom = BRCM_LEG_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(brcm_legacy_fcs_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM_LEGACY_FCS, BRCM_LEGACY_FCS_NAME);</div><div class='add'>+#endif /* CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)</div><div class='ctx'> static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb,</div><div class='ctx'> 					     struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -186,15 +379,40 @@ static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *brcm_tag_rcv_prepend(struct sk_buff *skb,</div><div class='del'>-					    struct net_device *dev,</div><div class='del'>-					    struct packet_type *pt)</div><div class='add'>+					    struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* tag is prepended to the packet */</div><div class='del'>-	return brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);</div><div class='add'>+	return brcm_tag_rcv_ll(skb, dev, ETH_HLEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops brcm_prepend_netdev_ops = {</div><div class='add'>+static const struct dsa_device_ops brcm_prepend_netdev_ops = {</div><div class='add'>+	.name	= BRCM_PREPEND_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_BRCM_PREPEND,</div><div class='ctx'> 	.xmit	= brcm_tag_xmit_prepend,</div><div class='ctx'> 	.rcv	= brcm_tag_rcv_prepend,</div><div class='add'>+	.needed_headroom = BRCM_TAG_LEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(brcm_prepend_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM_PREPEND, BRCM_PREPEND_NAME);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *dsa_tag_driver_array[] =	{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(brcm_netdev_ops),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(brcm_legacy_netdev_ops),</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(brcm_legacy_fcs_netdev_ops),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(brcm_prepend_netdev_ops),</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_drivers(dsa_tag_driver_array);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Broadcom switches using in-frame headers");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c<br/>index cd13cfc542ce..2a2c4fb61a65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_dsa.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_dsa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_dsa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_dsa.c</a></div><div class='hunk'>@@ -1,110 +1,297 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='del'>- * net/dsa/tag_dsa.c - (Non-ethertype) DSA tagging</div><div class='add'>+ * Regular and Ethertype DSA tagging</div><div class='ctx'>  * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='add'>+ * Regular DSA</div><div class='add'>+ * -----------</div><div class='add'>+</div><div class='add'>+ * For untagged (in 802.1Q terms) packets, the switch will splice in</div><div class='add'>+ * the tag between the SA and the ethertype of the original</div><div class='add'>+ * packet. Tagged frames will instead have their outermost .1Q tag</div><div class='add'>+ * converted to a DSA tag. It expects the same layout when receiving</div><div class='add'>+ * packets from the CPU.</div><div class='add'>+ *</div><div class='add'>+ * Example:</div><div class='add'>+ *</div><div class='add'>+ *     .----.----.----.---------</div><div class='add'>+ * Pu: | DA | SA | ET | Payload ...</div><div class='add'>+ *     '----'----'----'---------</div><div class='add'>+ *       6    6    2       N</div><div class='add'>+ *     .----.----.--------.-----.----.---------</div><div class='add'>+ * Pt: | DA | SA | 0x8100 | TCI | ET | Payload ...</div><div class='add'>+ *     '----'----'--------'-----'----'---------</div><div class='add'>+ *       6    6       2      2    2       N</div><div class='add'>+ *     .----.----.-----.----.---------</div><div class='add'>+ * Pd: | DA | SA | DSA | ET | Payload ...</div><div class='add'>+ *     '----'----'-----'----'---------</div><div class='add'>+ *       6    6     4    2       N</div><div class='add'>+ *</div><div class='add'>+ * No matter if a packet is received untagged (Pu) or tagged (Pt),</div><div class='add'>+ * they will both have the same layout (Pd) when they are sent to the</div><div class='add'>+ * CPU. This is done by ignoring 802.3, replacing the ethertype field</div><div class='add'>+ * with more metadata, among which is a bit to signal if the original</div><div class='add'>+ * packet was tagged or not.</div><div class='add'>+ *</div><div class='add'>+ * Ethertype DSA</div><div class='add'>+ * -------------</div><div class='add'>+ * Uses the exact same tag format as regular DSA, but also includes a</div><div class='add'>+ * proper ethertype field (which the mv88e6xxx driver sets to</div><div class='add'>+ * ETH_P_EDSA/0xdada) followed by two zero bytes:</div><div class='add'>+ *</div><div class='add'>+ * .----.----.--------.--------.-----.----.---------</div><div class='add'>+ * | DA | SA | 0xdada | 0x0000 | DSA | ET | Payload ...</div><div class='add'>+ * '----'----'--------'--------'-----'----'---------</div><div class='add'>+ *   6    6       2        2      4    2       N</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dsa/mv88e6xxx.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define DSA_NAME	"dsa"</div><div class='add'>+#define EDSA_NAME	"edsa"</div><div class='ctx'> </div><div class='ctx'> #define DSA_HLEN	4</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+/**</div><div class='add'>+ * enum dsa_cmd - DSA Command</div><div class='add'>+ * @DSA_CMD_TO_CPU: Set on packets that were trapped or mirrored to</div><div class='add'>+ *     the CPU port. This is needed to implement control protocols,</div><div class='add'>+ *     e.g. STP and LLDP, that must not allow those control packets to</div><div class='add'>+ *     be switched according to the normal rules.</div><div class='add'>+ * @DSA_CMD_FROM_CPU: Used by the CPU to send a packet to a specific</div><div class='add'>+ *     port, ignoring all the barriers that the switch normally</div><div class='add'>+ *     enforces (VLANs, STP port states etc.). No source address</div><div class='add'>+ *     learning takes place. "sudo send packet"</div><div class='add'>+ * @DSA_CMD_TO_SNIFFER: Set on the copies of packets that matched some</div><div class='add'>+ *     user configured ingress or egress monitor criteria. These are</div><div class='add'>+ *     forwarded by the switch tree to the user configured ingress or</div><div class='add'>+ *     egress monitor port, which can be set to the CPU port or a</div><div class='add'>+ *     regular port. If the destination is a regular port, the tag</div><div class='add'>+ *     will be removed before egressing the port. If the destination</div><div class='add'>+ *     is the CPU port, the tag will not be removed.</div><div class='add'>+ * @DSA_CMD_FORWARD: This tag is used on all bulk traffic passing</div><div class='add'>+ *     through the switch tree, including the flows that are directed</div><div class='add'>+ *     towards the CPU. Its device/port tuple encodes the original</div><div class='add'>+ *     source port on which the packet ingressed. It can also be used</div><div class='add'>+ *     on transmit by the CPU to defer the forwarding decision to the</div><div class='add'>+ *     hardware, based on the current config of PVT/VTU/ATU</div><div class='add'>+ *     etc. Source address learning takes places if enabled on the</div><div class='add'>+ *     receiving DSA/CPU port.</div><div class='add'>+ */</div><div class='add'>+enum dsa_cmd {</div><div class='add'>+	DSA_CMD_TO_CPU     = 0,</div><div class='add'>+	DSA_CMD_FROM_CPU   = 1,</div><div class='add'>+	DSA_CMD_TO_SNIFFER = 2,</div><div class='add'>+	DSA_CMD_FORWARD    = 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum dsa_code - TO_CPU Code</div><div class='add'>+ *</div><div class='add'>+ * @DSA_CODE_MGMT_TRAP: DA was classified as a management</div><div class='add'>+ *     address. Typical examples include STP BPDUs and LLDP.</div><div class='add'>+ * @DSA_CODE_FRAME2REG: Response to a "remote management" request.</div><div class='add'>+ * @DSA_CODE_IGMP_MLD_TRAP: IGMP/MLD signaling.</div><div class='add'>+ * @DSA_CODE_POLICY_TRAP: Frame matched some policy configuration on</div><div class='add'>+ *     the device. Typical examples are matching on DA/SA/VID and DHCP</div><div class='add'>+ *     snooping.</div><div class='add'>+ * @DSA_CODE_ARP_MIRROR: The name says it all really.</div><div class='add'>+ * @DSA_CODE_POLICY_MIRROR: Same as @DSA_CODE_POLICY_TRAP, but the</div><div class='add'>+ *     particular policy was set to trigger a mirror instead of a</div><div class='add'>+ *     trap.</div><div class='add'>+ * @DSA_CODE_RESERVED_6: Unused on all devices up to at least 6393X.</div><div class='add'>+ * @DSA_CODE_RESERVED_7: Unused on all devices up to at least 6393X.</div><div class='add'>+ *</div><div class='add'>+ * A 3-bit code is used to relay why a particular frame was sent to</div><div class='add'>+ * the CPU. We only use this to determine if the packet was mirrored</div><div class='add'>+ * or trapped, i.e. whether the packet has been forwarded by hardware</div><div class='add'>+ * or not.</div><div class='add'>+ *</div><div class='add'>+ * This is the superset of all possible codes. Any particular device</div><div class='add'>+ * may only implement a subset.</div><div class='add'>+ */</div><div class='add'>+enum dsa_code {</div><div class='add'>+	DSA_CODE_MGMT_TRAP     = 0,</div><div class='add'>+	DSA_CODE_FRAME2REG     = 1,</div><div class='add'>+	DSA_CODE_IGMP_MLD_TRAP = 2,</div><div class='add'>+	DSA_CODE_POLICY_TRAP   = 3,</div><div class='add'>+	DSA_CODE_ARP_MIRROR    = 4,</div><div class='add'>+	DSA_CODE_POLICY_MIRROR = 5,</div><div class='add'>+	DSA_CODE_RESERVED_6    = 6,</div><div class='add'>+	DSA_CODE_RESERVED_7    = 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				   u8 extra)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct net_device *br_dev;</div><div class='add'>+	u8 tag_dev, tag_port;</div><div class='add'>+	enum dsa_cmd cmd;</div><div class='ctx'> 	u8 *dsa_header;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Convert the outermost 802.1q tag to a DSA tag for tagged</div><div class='del'>-	 * packets, or insert a DSA tag between the addresses and</div><div class='del'>-	 * the ethertype field for untagged packets.</div><div class='del'>-	 */</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_8021Q)) {</div><div class='del'>-		if (skb_cow_head(skb, 0) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='add'>+	if (skb-&gt;offload_fwd_mark) {</div><div class='add'>+		unsigned int bridge_num = dsa_port_bridge_num_get(dp);</div><div class='add'>+		struct dsa_switch_tree *dst = dp-&gt;ds-&gt;dst;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Construct tagged FROM_CPU DSA tag from 802.1q tag.</div><div class='del'>-		 */</div><div class='del'>-		dsa_header = skb-&gt;data + 2 * ETH_ALEN;</div><div class='del'>-		dsa_header[0] = 0x60 | dp-&gt;ds-&gt;index;</div><div class='del'>-		dsa_header[1] = dp-&gt;index &lt;&lt; 3;</div><div class='add'>+		cmd = DSA_CMD_FORWARD;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Move CFI field from byte 2 to byte 1.</div><div class='add'>+		/* When offloading forwarding for a bridge, inject FORWARD</div><div class='add'>+		 * packets on behalf of a virtual switch device with an index</div><div class='add'>+		 * past the physical switches.</div><div class='ctx'> 		 */</div><div class='add'>+		tag_dev = dst-&gt;last_switch + bridge_num;</div><div class='add'>+		tag_port = 0;</div><div class='add'>+	} else {</div><div class='add'>+		cmd = DSA_CMD_FROM_CPU;</div><div class='add'>+		tag_dev = dp-&gt;ds-&gt;index;</div><div class='add'>+		tag_port = dp-&gt;index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	br_dev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+	/* If frame is already 802.1Q tagged, we can convert it to a DSA</div><div class='add'>+	 * tag (avoiding a memmove), but only if the port is standalone</div><div class='add'>+	 * (in which case we always send FROM_CPU) or if the port's</div><div class='add'>+	 * bridge has VLAN filtering enabled (in which case the CPU port</div><div class='add'>+	 * will be a member of the VLAN).</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_8021Q) &amp;&amp;</div><div class='add'>+	    (!br_dev || br_vlan_enabled(br_dev))) {</div><div class='add'>+		if (extra) {</div><div class='add'>+			skb_push(skb, extra);</div><div class='add'>+			dsa_alloc_etype_header(skb, extra);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Construct tagged DSA tag from 802.1Q tag. */</div><div class='add'>+		dsa_header = dsa_etype_header_pos_tx(skb) + extra;</div><div class='add'>+		dsa_header[0] = (cmd &lt;&lt; 6) | 0x20 | tag_dev;</div><div class='add'>+		dsa_header[1] = tag_port &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+		/* Move CFI field from byte 2 to byte 1. */</div><div class='ctx'> 		if (dsa_header[2] &amp; 0x10) {</div><div class='ctx'> 			dsa_header[1] |= 0x01;</div><div class='ctx'> 			dsa_header[2] &amp;= ~0x10;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (skb_cow_head(skb, DSA_HLEN) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		skb_push(skb, DSA_HLEN);</div><div class='add'>+		u16 vid;</div><div class='ctx'> </div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + DSA_HLEN, 2 * ETH_ALEN);</div><div class='add'>+		vid = br_dev ? MV88E6XXX_VID_BRIDGED : MV88E6XXX_VID_STANDALONE;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Construct untagged FROM_CPU DSA tag.</div><div class='del'>-		 */</div><div class='del'>-		dsa_header = skb-&gt;data + 2 * ETH_ALEN;</div><div class='del'>-		dsa_header[0] = 0x40 | dp-&gt;ds-&gt;index;</div><div class='del'>-		dsa_header[1] = dp-&gt;index &lt;&lt; 3;</div><div class='del'>-		dsa_header[2] = 0x00;</div><div class='del'>-		dsa_header[3] = 0x00;</div><div class='add'>+		skb_push(skb, DSA_HLEN + extra);</div><div class='add'>+		dsa_alloc_etype_header(skb, DSA_HLEN + extra);</div><div class='add'>+</div><div class='add'>+		/* Construct DSA header from untagged frame. */</div><div class='add'>+		dsa_header = dsa_etype_header_pos_tx(skb) + extra;</div><div class='add'>+</div><div class='add'>+		dsa_header[0] = (cmd &lt;&lt; 6) | tag_dev;</div><div class='add'>+		dsa_header[1] = tag_port &lt;&lt; 3;</div><div class='add'>+		dsa_header[2] = vid &gt;&gt; 8;</div><div class='add'>+		dsa_header[3] = vid &amp; 0xff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			       struct packet_type *pt)</div><div class='add'>+static struct sk_buff *dsa_rcv_ll(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				  u8 extra)</div><div class='ctx'> {</div><div class='add'>+	bool trap = false, trunk = false;</div><div class='add'>+	int source_device, source_port;</div><div class='add'>+	enum dsa_code code;</div><div class='add'>+	enum dsa_cmd cmd;</div><div class='ctx'> 	u8 *dsa_header;</div><div class='del'>-	int source_device;</div><div class='del'>-	int source_port;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))</div><div class='del'>-		return NULL;</div><div class='add'>+	/* The ethertype field is part of the DSA header. */</div><div class='add'>+	dsa_header = dsa_etype_header_pos_rx(skb);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The ethertype field is part of the DSA header.</div><div class='del'>-	 */</div><div class='del'>-	dsa_header = skb-&gt;data - 2;</div><div class='add'>+	cmd = dsa_header[0] &gt;&gt; 6;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case DSA_CMD_FORWARD:</div><div class='add'>+		trunk = !!(dsa_header[1] &amp; 4);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check that frame type is either TO_CPU or FORWARD.</div><div class='del'>-	 */</div><div class='del'>-	if ((dsa_header[0] &amp; 0xc0) != 0x00 &amp;&amp; (dsa_header[0] &amp; 0xc0) != 0xc0)</div><div class='add'>+	case DSA_CMD_TO_CPU:</div><div class='add'>+		code = (dsa_header[1] &amp; 0x6) | ((dsa_header[2] &gt;&gt; 4) &amp; 1);</div><div class='add'>+</div><div class='add'>+		switch (code) {</div><div class='add'>+		case DSA_CODE_FRAME2REG:</div><div class='add'>+			/* Remote management is not implemented yet,</div><div class='add'>+			 * drop.</div><div class='add'>+			 */</div><div class='add'>+			return NULL;</div><div class='add'>+		case DSA_CODE_ARP_MIRROR:</div><div class='add'>+		case DSA_CODE_POLICY_MIRROR:</div><div class='add'>+			/* Mark mirrored packets to notify any upper</div><div class='add'>+			 * device (like a bridge) that forwarding has</div><div class='add'>+			 * already been done by hardware.</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+		case DSA_CODE_MGMT_TRAP:</div><div class='add'>+		case DSA_CODE_IGMP_MLD_TRAP:</div><div class='add'>+		case DSA_CODE_POLICY_TRAP:</div><div class='add'>+			/* Traps have, by definition, not been</div><div class='add'>+			 * forwarded by hardware, so don't mark them.</div><div class='add'>+			 */</div><div class='add'>+			trap = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* Reserved code, this could be anything. Drop</div><div class='add'>+			 * seems like the safest option.</div><div class='add'>+			 */</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Determine source device and port.</div><div class='del'>-	 */</div><div class='ctx'> 	source_device = dsa_header[0] &amp; 0x1f;</div><div class='ctx'> 	source_port = (dsa_header[1] &gt;&gt; 3) &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, source_device, source_port);</div><div class='add'>+	if (trunk) {</div><div class='add'>+		struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+		struct dsa_lag *lag;</div><div class='add'>+</div><div class='add'>+		/* The exact source port is not available in the tag,</div><div class='add'>+		 * so we inject the frame directly on the upper</div><div class='add'>+		 * team/bond.</div><div class='add'>+		 */</div><div class='add'>+		lag = dsa_lag_by_id(cpu_dp-&gt;dst, source_port + 1);</div><div class='add'>+		skb-&gt;dev = lag ? lag-&gt;dev : NULL;</div><div class='add'>+	} else {</div><div class='add'>+		skb-&gt;dev = dsa_conduit_find_user(dev, source_device,</div><div class='add'>+						 source_port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!skb-&gt;dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Convert the DSA header to an 802.1q header if the 'tagged'</div><div class='del'>-	 * bit in the DSA header is set.  If the 'tagged' bit is clear,</div><div class='del'>-	 * delete the DSA header entirely.</div><div class='add'>+	/* When using LAG offload, skb-&gt;dev is not a DSA user interface,</div><div class='add'>+	 * so we cannot call dsa_default_offload_fwd_mark and we need to</div><div class='add'>+	 * special-case it.</div><div class='add'>+	 */</div><div class='add'>+	if (trunk)</div><div class='add'>+		skb-&gt;offload_fwd_mark = true;</div><div class='add'>+	else if (!trap)</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	/* If the 'tagged' bit is set; convert the DSA tag to a 802.1Q</div><div class='add'>+	 * tag, and delete the ethertype (extra) if applicable. If the</div><div class='add'>+	 * 'tagged' bit is cleared; delete the DSA tag, and ethertype</div><div class='add'>+	 * if applicable.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dsa_header[0] &amp; 0x20) {</div><div class='ctx'> 		u8 new_header[4];</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Insert 802.1q ethertype and copy the VLAN-related</div><div class='add'>+		/* Insert 802.1Q ethertype and copy the VLAN-related</div><div class='ctx'> 		 * fields, but clear the bit that will hold CFI (since</div><div class='ctx'> 		 * DSA uses that bit location for another purpose).</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -113,16 +300,13 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		new_header[2] = dsa_header[2] &amp; ~0x10;</div><div class='ctx'> 		new_header[3] = dsa_header[3];</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Move CFI bit from its place in the DSA header to</div><div class='del'>-		 * its 802.1q-designated place.</div><div class='add'>+		/* Move CFI bit from its place in the DSA header to</div><div class='add'>+		 * its 802.1Q-designated place.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dsa_header[1] &amp; 0x01)</div><div class='ctx'> 			new_header[2] |= 0x10;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Update packet checksum if skb is CHECKSUM_COMPLETE.</div><div class='del'>-		 */</div><div class='add'>+		/* Update packet checksum if skb is CHECKSUM_COMPLETE. */</div><div class='ctx'> 		if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='ctx'> 			__wsum c = skb-&gt;csum;</div><div class='ctx'> 			c = csum_add(c, csum_partial(new_header + 2, 2, 0));</div><div class='hunk'>@@ -131,22 +315,96 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memcpy(dsa_header, new_header, DSA_HLEN);</div><div class='add'>+</div><div class='add'>+		if (extra)</div><div class='add'>+			dsa_strip_etype_header(skb, extra);</div><div class='ctx'> 	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Remove DSA tag and update checksum.</div><div class='del'>-		 */</div><div class='ctx'> 		skb_pull_rcsum(skb, DSA_HLEN);</div><div class='del'>-		memmove(skb-&gt;data - ETH_HLEN,</div><div class='del'>-			skb-&gt;data - ETH_HLEN - DSA_HLEN,</div><div class='del'>-			2 * ETH_ALEN);</div><div class='add'>+		dsa_strip_etype_header(skb, DSA_HLEN + extra);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;offload_fwd_mark = 1;</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_DSA)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dsa_xmit_ll(skb, dev, 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return dsa_rcv_ll(skb, dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops dsa_netdev_ops = {</div><div class='add'>+	.name	  = DSA_NAME,</div><div class='add'>+	.proto	  = DSA_TAG_PROTO_DSA,</div><div class='add'>+	.xmit	  = dsa_xmit,</div><div class='add'>+	.rcv	  = dsa_rcv,</div><div class='add'>+	.needed_headroom = DSA_HLEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(dsa_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_DSA, DSA_NAME);</div><div class='add'>+#endif	/* CONFIG_NET_DSA_TAG_DSA */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_EDSA)</div><div class='add'>+</div><div class='add'>+#define EDSA_HLEN 8</div><div class='add'>+</div><div class='add'>+static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *edsa_header;</div><div class='add'>+</div><div class='add'>+	skb = dsa_xmit_ll(skb, dev, EDSA_HLEN - DSA_HLEN);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	edsa_header = dsa_etype_header_pos_tx(skb);</div><div class='add'>+	edsa_header[0] = (ETH_P_EDSA &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	edsa_header[1] = ETH_P_EDSA &amp; 0xff;</div><div class='add'>+	edsa_header[2] = 0x00;</div><div class='add'>+	edsa_header[3] = 0x00;</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops dsa_netdev_ops = {</div><div class='del'>-	.xmit	= dsa_xmit,</div><div class='del'>-	.rcv	= dsa_rcv,</div><div class='add'>+static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_pull_rcsum(skb, EDSA_HLEN - DSA_HLEN);</div><div class='add'>+</div><div class='add'>+	return dsa_rcv_ll(skb, dev, EDSA_HLEN - DSA_HLEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops edsa_netdev_ops = {</div><div class='add'>+	.name	  = EDSA_NAME,</div><div class='add'>+	.proto	  = DSA_TAG_PROTO_EDSA,</div><div class='add'>+	.xmit	  = edsa_xmit,</div><div class='add'>+	.rcv	  = edsa_rcv,</div><div class='add'>+	.needed_headroom = EDSA_HLEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(edsa_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_EDSA, EDSA_NAME);</div><div class='add'>+#endif	/* CONFIG_NET_DSA_TAG_EDSA */</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *dsa_tag_drivers[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_DSA)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(dsa_netdev_ops),</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_TAG_EDSA)</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(edsa_netdev_ops),</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_drivers(dsa_tag_drivers);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Marvell switches using DSA headers");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c<br/>deleted file mode 100644<br/>index 4083326b806e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_edsa.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_edsa.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * net/dsa/tag_edsa.c - Ethertype DSA tagging</div><div class='del'>- * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-#define DSA_HLEN	4</div><div class='del'>-#define EDSA_HLEN	8</div><div class='del'>-</div><div class='del'>-static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	u8 *edsa_header;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the outermost 802.1q tag to a DSA tag and prepend</div><div class='del'>-	 * a DSA ethertype field is the packet is tagged, or insert</div><div class='del'>-	 * a DSA ethertype plus DSA tag between the addresses and the</div><div class='del'>-	 * current ethertype field if the packet is untagged.</div><div class='del'>-	 */</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_8021Q)) {</div><div class='del'>-		if (skb_cow_head(skb, DSA_HLEN) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		skb_push(skb, DSA_HLEN);</div><div class='del'>-</div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + DSA_HLEN, 2 * ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Construct tagged FROM_CPU DSA tag from 802.1q tag.</div><div class='del'>-		 */</div><div class='del'>-		edsa_header = skb-&gt;data + 2 * ETH_ALEN;</div><div class='del'>-		edsa_header[0] = (ETH_P_EDSA &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		edsa_header[1] = ETH_P_EDSA &amp; 0xff;</div><div class='del'>-		edsa_header[2] = 0x00;</div><div class='del'>-		edsa_header[3] = 0x00;</div><div class='del'>-		edsa_header[4] = 0x60 | dp-&gt;ds-&gt;index;</div><div class='del'>-		edsa_header[5] = dp-&gt;index &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Move CFI field from byte 6 to byte 5.</div><div class='del'>-		 */</div><div class='del'>-		if (edsa_header[6] &amp; 0x10) {</div><div class='del'>-			edsa_header[5] |= 0x01;</div><div class='del'>-			edsa_header[6] &amp;= ~0x10;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (skb_cow_head(skb, EDSA_HLEN) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		skb_push(skb, EDSA_HLEN);</div><div class='del'>-</div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + EDSA_HLEN, 2 * ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Construct untagged FROM_CPU DSA tag.</div><div class='del'>-		 */</div><div class='del'>-		edsa_header = skb-&gt;data + 2 * ETH_ALEN;</div><div class='del'>-		edsa_header[0] = (ETH_P_EDSA &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		edsa_header[1] = ETH_P_EDSA &amp; 0xff;</div><div class='del'>-		edsa_header[2] = 0x00;</div><div class='del'>-		edsa_header[3] = 0x00;</div><div class='del'>-		edsa_header[4] = 0x40 | dp-&gt;ds-&gt;index;</div><div class='del'>-		edsa_header[5] = dp-&gt;index &lt;&lt; 3;</div><div class='del'>-		edsa_header[6] = 0x00;</div><div class='del'>-		edsa_header[7] = 0x00;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				struct packet_type *pt)</div><div class='del'>-{</div><div class='del'>-	u8 *edsa_header;</div><div class='del'>-	int source_device;</div><div class='del'>-	int source_port;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip the two null bytes after the ethertype.</div><div class='del'>-	 */</div><div class='del'>-	edsa_header = skb-&gt;data + 2;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check that frame type is either TO_CPU or FORWARD.</div><div class='del'>-	 */</div><div class='del'>-	if ((edsa_header[0] &amp; 0xc0) != 0x00 &amp;&amp; (edsa_header[0] &amp; 0xc0) != 0xc0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Determine source device and port.</div><div class='del'>-	 */</div><div class='del'>-	source_device = edsa_header[0] &amp; 0x1f;</div><div class='del'>-	source_port = (edsa_header[1] &gt;&gt; 3) &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, source_device, source_port);</div><div class='del'>-	if (!skb-&gt;dev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the 'tagged' bit is set, convert the DSA tag to a 802.1q</div><div class='del'>-	 * tag and delete the ethertype part.  If the 'tagged' bit is</div><div class='del'>-	 * clear, delete the ethertype and the DSA tag parts.</div><div class='del'>-	 */</div><div class='del'>-	if (edsa_header[0] &amp; 0x20) {</div><div class='del'>-		u8 new_header[4];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Insert 802.1q ethertype and copy the VLAN-related</div><div class='del'>-		 * fields, but clear the bit that will hold CFI (since</div><div class='del'>-		 * DSA uses that bit location for another purpose).</div><div class='del'>-		 */</div><div class='del'>-		new_header[0] = (ETH_P_8021Q &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		new_header[1] = ETH_P_8021Q &amp; 0xff;</div><div class='del'>-		new_header[2] = edsa_header[2] &amp; ~0x10;</div><div class='del'>-		new_header[3] = edsa_header[3];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Move CFI bit from its place in the DSA header to</div><div class='del'>-		 * its 802.1q-designated place.</div><div class='del'>-		 */</div><div class='del'>-		if (edsa_header[1] &amp; 0x01)</div><div class='del'>-			new_header[2] |= 0x10;</div><div class='del'>-</div><div class='del'>-		skb_pull_rcsum(skb, DSA_HLEN);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Update packet checksum if skb is CHECKSUM_COMPLETE.</div><div class='del'>-		 */</div><div class='del'>-		if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='del'>-			__wsum c = skb-&gt;csum;</div><div class='del'>-			c = csum_add(c, csum_partial(new_header + 2, 2, 0));</div><div class='del'>-			c = csum_sub(c, csum_partial(edsa_header + 2, 2, 0));</div><div class='del'>-			skb-&gt;csum = c;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(edsa_header, new_header, DSA_HLEN);</div><div class='del'>-</div><div class='del'>-		memmove(skb-&gt;data - ETH_HLEN,</div><div class='del'>-			skb-&gt;data - ETH_HLEN - DSA_HLEN,</div><div class='del'>-			2 * ETH_ALEN);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Remove DSA tag and update checksum.</div><div class='del'>-		 */</div><div class='del'>-		skb_pull_rcsum(skb, EDSA_HLEN);</div><div class='del'>-		memmove(skb-&gt;data - ETH_HLEN,</div><div class='del'>-			skb-&gt;data - ETH_HLEN - EDSA_HLEN,</div><div class='del'>-			2 * ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;offload_fwd_mark = 1;</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct dsa_device_ops edsa_netdev_ops = {</div><div class='del'>-	.xmit	= edsa_xmit,</div><div class='del'>-	.rcv	= edsa_rcv,</div><div class='del'>-};</div><div class='head'>diff --git a/net/dsa/tag_gswip.c b/net/dsa/tag_gswip.c<br/>new file mode 100644<br/>index 000000000000..5fa436121087<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_gswip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_gswip.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Intel / Lantiq GSWIP V2.0 PMAC tag support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 - 2018 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define GSWIP_NAME			"gswip"</div><div class='add'>+</div><div class='add'>+#define GSWIP_TX_HEADER_LEN		4</div><div class='add'>+</div><div class='add'>+/* special tag in TX path header */</div><div class='add'>+/* Byte 0 */</div><div class='add'>+#define GSWIP_TX_SLPID_SHIFT		0	/* source port ID */</div><div class='add'>+#define  GSWIP_TX_SLPID_CPU		2</div><div class='add'>+#define  GSWIP_TX_SLPID_APP1		3</div><div class='add'>+#define  GSWIP_TX_SLPID_APP2		4</div><div class='add'>+#define  GSWIP_TX_SLPID_APP3		5</div><div class='add'>+#define  GSWIP_TX_SLPID_APP4		6</div><div class='add'>+#define  GSWIP_TX_SLPID_APP5		7</div><div class='add'>+</div><div class='add'>+/* Byte 1 */</div><div class='add'>+#define GSWIP_TX_CRCGEN_DIS		BIT(7)</div><div class='add'>+#define GSWIP_TX_DPID_SHIFT		0	/* destination group ID */</div><div class='add'>+#define  GSWIP_TX_DPID_ELAN		0</div><div class='add'>+#define  GSWIP_TX_DPID_EWAN		1</div><div class='add'>+#define  GSWIP_TX_DPID_CPU		2</div><div class='add'>+#define  GSWIP_TX_DPID_APP1		3</div><div class='add'>+#define  GSWIP_TX_DPID_APP2		4</div><div class='add'>+#define  GSWIP_TX_DPID_APP3		5</div><div class='add'>+#define  GSWIP_TX_DPID_APP4		6</div><div class='add'>+#define  GSWIP_TX_DPID_APP5		7</div><div class='add'>+</div><div class='add'>+/* Byte 2 */</div><div class='add'>+#define GSWIP_TX_PORT_MAP_EN		BIT(7)</div><div class='add'>+#define GSWIP_TX_PORT_MAP_SEL		BIT(6)</div><div class='add'>+#define GSWIP_TX_LRN_DIS		BIT(5)</div><div class='add'>+#define GSWIP_TX_CLASS_EN		BIT(4)</div><div class='add'>+#define GSWIP_TX_CLASS_SHIFT		0</div><div class='add'>+#define GSWIP_TX_CLASS_MASK		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* Byte 3 */</div><div class='add'>+#define GSWIP_TX_DPID_EN		BIT(0)</div><div class='add'>+#define GSWIP_TX_PORT_MAP		GENMASK(6, 1)</div><div class='add'>+</div><div class='add'>+#define GSWIP_RX_HEADER_LEN	8</div><div class='add'>+</div><div class='add'>+/* special tag in RX path header */</div><div class='add'>+/* Byte 7 */</div><div class='add'>+#define GSWIP_RX_SPPID_SHIFT		4</div><div class='add'>+#define GSWIP_RX_SPPID_MASK		GENMASK(6, 4)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *gswip_tag_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *gswip_tag;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, GSWIP_TX_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	gswip_tag = skb-&gt;data;</div><div class='add'>+	gswip_tag[0] = GSWIP_TX_SLPID_CPU;</div><div class='add'>+	gswip_tag[1] = GSWIP_TX_DPID_ELAN;</div><div class='add'>+	gswip_tag[2] = GSWIP_TX_PORT_MAP_EN | GSWIP_TX_PORT_MAP_SEL;</div><div class='add'>+	gswip_tag[3] = FIELD_PREP(GSWIP_TX_PORT_MAP, dsa_xmit_port_mask(skb, dev));</div><div class='add'>+	gswip_tag[3] |= GSWIP_TX_DPID_EN;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *gswip_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+	u8 *gswip_tag;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, GSWIP_RX_HEADER_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	gswip_tag = skb-&gt;data - ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	/* Get source port information */</div><div class='add'>+	port = (gswip_tag[7] &amp; GSWIP_RX_SPPID_MASK) &gt;&gt; GSWIP_RX_SPPID_SHIFT;</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* remove GSWIP tag */</div><div class='add'>+	skb_pull_rcsum(skb, GSWIP_RX_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops gswip_netdev_ops = {</div><div class='add'>+	.name = GSWIP_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_GSWIP,</div><div class='add'>+	.xmit = gswip_tag_xmit,</div><div class='add'>+	.rcv = gswip_tag_rcv,</div><div class='add'>+	.needed_headroom = GSWIP_RX_HEADER_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Lantiq / Intel GSWIP switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_GSWIP, GSWIP_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(gswip_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_hellcreek.c b/net/dsa/tag_hellcreek.c<br/>new file mode 100644<br/>index 000000000000..544ab15685a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_hellcreek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_hellcreek.c</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/*</div><div class='add'>+ * net/dsa/tag_hellcreek.c - Hirschmann Hellcreek switch tag format handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019,2020 Linutronix GmbH</div><div class='add'>+ * Author Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on tag_ksz.c.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define HELLCREEK_NAME		"hellcreek"</div><div class='add'>+</div><div class='add'>+#define HELLCREEK_TAG_LEN	1</div><div class='add'>+</div><div class='add'>+static struct sk_buff *hellcreek_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *tag;</div><div class='add'>+</div><div class='add'>+	/* Calculate checksums (if required) before adding the trailer tag to</div><div class='add'>+	 * avoid including it in calculations. That would lead to wrong</div><div class='add'>+	 * checksums after the switch strips the tag.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Tag encoding */</div><div class='add'>+	tag  = skb_put(skb, HELLCREEK_TAG_LEN);</div><div class='add'>+	*tag = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *hellcreek_rcv(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Tag decoding */</div><div class='add'>+	u8 *tag = skb_tail_pointer(skb) - HELLCREEK_TAG_LEN;</div><div class='add'>+	unsigned int port = tag[0] &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		netdev_warn_once(dev, "Failed to get source port: %d\n", port);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pskb_trim_rcsum(skb, skb-&gt;len - HELLCREEK_TAG_LEN))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops hellcreek_netdev_ops = {</div><div class='add'>+	.name	  = HELLCREEK_NAME,</div><div class='add'>+	.proto	  = DSA_TAG_PROTO_HELLCREEK,</div><div class='add'>+	.xmit	  = hellcreek_xmit,</div><div class='add'>+	.rcv	  = hellcreek_rcv,</div><div class='add'>+	.needed_tailroom = HELLCREEK_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Hirschmann Hellcreek TSN switches");</div><div class='add'>+MODULE_LICENSE("Dual MIT/GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_HELLCREEK, HELLCREEK_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(hellcreek_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c<br/>index 0f62effad88f..9170a0148cc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_ksz.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_ksz.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_ksz.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_ksz.c</a></div><div class='hunk'>@@ -1,102 +1,465 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * net/dsa/tag_ksz.c - Microchip KSZ Switch tag format handling</div><div class='ctx'>  * Copyright (c) 2017 Microchip Technology</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dsa/ksz_common.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='del'>-#include "dsa_priv.h"</div><div class='ctx'> </div><div class='del'>-/* For Ingress (Host -&gt; KSZ), 2 bytes are added before FCS.</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define KSZ8795_NAME "ksz8795"</div><div class='add'>+#define KSZ9477_NAME "ksz9477"</div><div class='add'>+#define KSZ9893_NAME "ksz9893"</div><div class='add'>+#define LAN937X_NAME "lan937x"</div><div class='add'>+</div><div class='add'>+/* Typically only one byte is used for tail tag. */</div><div class='add'>+#define KSZ_PTP_TAG_LEN			4</div><div class='add'>+#define KSZ_EGRESS_TAG_LEN		1</div><div class='add'>+#define KSZ_INGRESS_TAG_LEN		1</div><div class='add'>+</div><div class='add'>+#define KSZ_HWTS_EN  0</div><div class='add'>+</div><div class='add'>+struct ksz_tagger_private {</div><div class='add'>+	struct ksz_tagger_data data; /* Must be first */</div><div class='add'>+	unsigned long state;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ksz_tagger_private *</div><div class='add'>+ksz_tagger_private(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return ds-&gt;tagger_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_hwtstamp_set_state(struct dsa_switch *ds, bool on)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_private *priv = ksz_tagger_private(ds);</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		set_bit(KSZ_HWTS_EN, &amp;priv-&gt;state);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(KSZ_HWTS_EN, &amp;priv-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_disconnect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_private *priv = ds-&gt;tagger_data;</div><div class='add'>+</div><div class='add'>+	kthread_destroy_worker(priv-&gt;xmit_worker);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	ds-&gt;tagger_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_connect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_data *tagger_data;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+	struct ksz_tagger_private *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	xmit_worker = kthread_run_worker(0, "dsa%d:%d_xmit",</div><div class='add'>+					    ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='add'>+	if (IS_ERR(xmit_worker)) {</div><div class='add'>+		ret = PTR_ERR(xmit_worker);</div><div class='add'>+		kfree(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;xmit_worker = xmit_worker;</div><div class='add'>+	/* Export functions for switch driver use */</div><div class='add'>+	tagger_data = &amp;priv-&gt;data;</div><div class='add'>+	tagger_data-&gt;hwtstamp_set_state = ksz_hwtstamp_set_state;</div><div class='add'>+	ds-&gt;tagger_data = priv;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      unsigned int port, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim_rcsum(skb, skb-&gt;len - len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For Ingress (Host -&gt; KSZ8795), 1 byte is added before FCS.</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='del'>- * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|tag1(1byte)|FCS(4bytes)</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag(1byte)|FCS(4bytes)</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * tag : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x10=port5)</div><div class='add'>+ *</div><div class='add'>+ * For Egress (KSZ8795 -&gt; Host), 1 byte is added before FCS.</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes)</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * tag0 : zero-based value represents port</div><div class='add'>+ *	  (eg, 0x0=port1, 0x2=port3, 0x3=port4)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define KSZ8795_TAIL_TAG_EG_PORT_M	GENMASK(1, 0)</div><div class='add'>+#define KSZ8795_TAIL_TAG_OVERRIDE	BIT(6)</div><div class='add'>+#define KSZ8795_TAIL_TAG_LOOKUP		BIT(7)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+	u8 *tag;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Tag encoding */</div><div class='add'>+	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);</div><div class='add'>+	hdr = skb_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	*tag = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+	if (is_link_local_ether_addr(hdr-&gt;h_dest))</div><div class='add'>+		*tag |= KSZ8795_TAIL_TAG_OVERRIDE;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *tag;</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;</div><div class='add'>+</div><div class='add'>+	return ksz_common_rcv(skb, dev, tag[0] &amp; KSZ8795_TAIL_TAG_EG_PORT_M,</div><div class='add'>+			      KSZ_EGRESS_TAG_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ksz8795_netdev_ops = {</div><div class='add'>+	.name	= KSZ8795_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_KSZ8795,</div><div class='add'>+	.xmit	= ksz8795_xmit,</div><div class='add'>+	.rcv	= ksz8795_rcv,</div><div class='add'>+	.needed_tailroom = KSZ_INGRESS_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(ksz8795_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ8795_NAME);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For Ingress (Host -&gt; KSZ9477), 2/6 bytes are added before FCS.</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|tag1(1byte)|</div><div class='add'>+ * FCS(4bytes)</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * ts   : time stamp (Present only if PTP is enabled in the Hardware)</div><div class='ctx'>  * tag0 : Prioritization (not used now)</div><div class='ctx'>  * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x10=port5)</div><div class='ctx'>  *</div><div class='del'>- * For Egress (KSZ -&gt; Host), 1 byte is added before FCS.</div><div class='add'>+ * For Egress (KSZ9477 -&gt; Host), 1/5 bytes is added before FCS.</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='del'>- * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes)</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|FCS(4bytes)</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='add'>+ * ts   : time stamp (Present only if bit 7 of tag0 is set)</div><div class='ctx'>  * tag0 : zero-based value represents port</div><div class='ctx'>  *	  (eg, 0x00=port1, 0x02=port3, 0x06=port7)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define	KSZ_INGRESS_TAG_LEN	2</div><div class='del'>-#define	KSZ_EGRESS_TAG_LEN	1</div><div class='add'>+#define KSZ9477_INGRESS_TAG_LEN		2</div><div class='add'>+#define KSZ9477_PTP_TAG_LEN		4</div><div class='add'>+#define KSZ9477_PTP_TAG_INDICATION	BIT(7)</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+#define KSZ9477_TAIL_TAG_EG_PORT_M	GENMASK(2, 0)</div><div class='add'>+#define KSZ9477_TAIL_TAG_PRIO		GENMASK(8, 7)</div><div class='add'>+#define KSZ9477_TAIL_TAG_OVERRIDE	BIT(9)</div><div class='add'>+#define KSZ9477_TAIL_TAG_LOOKUP		BIT(10)</div><div class='add'>+</div><div class='add'>+static void ksz_rcv_timestamp(struct sk_buff *skb, u8 *tag)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	int padlen;</div><div class='del'>-	u8 *tag;</div><div class='add'>+	u8 *tstamp_raw = tag - KSZ_PTP_TAG_LEN;</div><div class='add'>+	ktime_t tstamp;</div><div class='add'>+</div><div class='add'>+	tstamp = ksz_decode_tstamp(get_unaligned_be32(tstamp_raw));</div><div class='add'>+	KSZ_SKB_CB(skb)-&gt;tstamp = tstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Time stamp tag *needs* to be inserted if PTP is enabled in hardware.</div><div class='add'>+ * Regardless of Whether it is a PTP frame or not.</div><div class='add'>+ */</div><div class='add'>+static void ksz_xmit_timestamp(struct dsa_port *dp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_private *priv;</div><div class='add'>+	struct ptp_header *ptp_hdr;</div><div class='add'>+	unsigned int ptp_type;</div><div class='add'>+	u32 tstamp_raw = 0;</div><div class='add'>+	s64 correction;</div><div class='add'>+</div><div class='add'>+	priv = ksz_tagger_private(dp-&gt;ds);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(KSZ_HWTS_EN, &amp;priv-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!KSZ_SKB_CB(skb)-&gt;update_correction)</div><div class='add'>+		goto output_tag;</div><div class='add'>+</div><div class='add'>+	ptp_type = KSZ_SKB_CB(skb)-&gt;ptp_type;</div><div class='ctx'> </div><div class='del'>-	padlen = (skb-&gt;len &gt;= ETH_ZLEN) ? 0 : ETH_ZLEN - skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (skb_tailroom(skb) &gt;= padlen + KSZ_INGRESS_TAG_LEN) {</div><div class='del'>-		/* Let dsa_slave_xmit() free skb */</div><div class='del'>-		if (__skb_put_padto(skb, skb-&gt;len + padlen, false))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		nskb = skb;</div><div class='del'>-	} else {</div><div class='del'>-		nskb = alloc_skb(NET_IP_ALIGN + skb-&gt;len +</div><div class='del'>-				 padlen + KSZ_INGRESS_TAG_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!nskb)</div><div class='del'>-			return NULL;</div><div class='del'>-		skb_reserve(nskb, NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		skb_reset_mac_header(nskb);</div><div class='del'>-		skb_set_network_header(nskb,</div><div class='del'>-				       skb_network_header(skb) - skb-&gt;head);</div><div class='del'>-		skb_set_transport_header(nskb,</div><div class='del'>-					 skb_transport_header(skb) - skb-&gt;head);</div><div class='del'>-		skb_copy_and_csum_dev(skb, skb_put(nskb, skb-&gt;len));</div><div class='del'>-</div><div class='del'>-		/* Let skb_put_padto() free nskb, and let dsa_slave_xmit() free</div><div class='del'>-		 * skb</div><div class='del'>-		 */</div><div class='del'>-		if (skb_put_padto(nskb, nskb-&gt;len + padlen))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		consume_skb(skb);</div><div class='add'>+	ptp_hdr = ptp_parse_header(skb, ptp_type);</div><div class='add'>+	if (!ptp_hdr)</div><div class='add'>+		goto output_tag;</div><div class='add'>+</div><div class='add'>+	correction = (s64)get_unaligned_be64(&amp;ptp_hdr-&gt;correction);</div><div class='add'>+</div><div class='add'>+	if (correction &lt; 0) {</div><div class='add'>+		struct timespec64 ts;</div><div class='add'>+</div><div class='add'>+		ts = ns_to_timespec64(-correction &gt;&gt; 16);</div><div class='add'>+		tstamp_raw = ((ts.tv_sec &amp; 3) &lt;&lt; 30) | ts.tv_nsec;</div><div class='add'>+</div><div class='add'>+		/* Set correction field to 0 and update UDP checksum */</div><div class='add'>+		ptp_header_update_correction(skb, ptp_type, ptp_hdr, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tag = skb_put(nskb, KSZ_INGRESS_TAG_LEN);</div><div class='del'>-	tag[0] = 0;</div><div class='del'>-	tag[1] = 1 &lt;&lt; dp-&gt;index; /* destination port */</div><div class='add'>+output_tag:</div><div class='add'>+	put_unaligned_be32(tstamp_raw, skb_put(skb, KSZ_PTP_TAG_LEN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Defer transmit if waiting for egress time stamp is required.  */</div><div class='add'>+static struct sk_buff *ksz_defer_xmit(struct dsa_port *dp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_data *tagger_data = ksz_tagger_data(dp-&gt;ds);</div><div class='add'>+	struct ksz_tagger_private *priv = ksz_tagger_private(dp-&gt;ds);</div><div class='add'>+	void (*xmit_work_fn)(struct kthread_work *work);</div><div class='add'>+	struct sk_buff *clone = KSZ_SKB_CB(skb)-&gt;clone;</div><div class='add'>+	struct ksz_deferred_xmit_work *xmit_work;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+</div><div class='add'>+	if (!clone)</div><div class='add'>+		return skb;  /* no deferred xmit for this packet */</div><div class='add'>+</div><div class='add'>+	xmit_work_fn = tagger_data-&gt;xmit_work_fn;</div><div class='add'>+	xmit_worker = priv-&gt;xmit_worker;</div><div class='add'>+</div><div class='add'>+	if (!xmit_work_fn || !xmit_worker)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	xmit_work = kzalloc(sizeof(*xmit_work), GFP_ATOMIC);</div><div class='add'>+	if (!xmit_work)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	kthread_init_work(&amp;xmit_work-&gt;work, xmit_work_fn);</div><div class='add'>+	/* Increase refcount so the kfree_skb in dsa_user_xmit</div><div class='add'>+	 * won't really free the packet.</div><div class='add'>+	 */</div><div class='add'>+	xmit_work-&gt;dp = dp;</div><div class='add'>+	xmit_work-&gt;skb = skb_get(skb);</div><div class='add'>+</div><div class='add'>+	kthread_queue_work(xmit_worker, &amp;xmit_work-&gt;work);</div><div class='ctx'> </div><div class='del'>-	return nskb;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			       struct packet_type *pt)</div><div class='add'>+static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 prio = netdev_txq_to_tc(dev, queue_mapping);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+	__be16 *tag;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Tag encoding */</div><div class='add'>+	ksz_xmit_timestamp(dp, skb);</div><div class='add'>+</div><div class='add'>+	tag = skb_put(skb, KSZ9477_INGRESS_TAG_LEN);</div><div class='add'>+	hdr = skb_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	val = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+	val |= FIELD_PREP(KSZ9477_TAIL_TAG_PRIO, prio);</div><div class='add'>+</div><div class='add'>+	if (is_link_local_ether_addr(hdr-&gt;h_dest))</div><div class='add'>+		val |= KSZ9477_TAIL_TAG_OVERRIDE;</div><div class='add'>+</div><div class='add'>+	*tag = cpu_to_be16(val);</div><div class='add'>+</div><div class='add'>+	return ksz_defer_xmit(dp, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = KSZ_EGRESS_TAG_LEN;</div><div class='add'>+	unsigned int port;</div><div class='ctx'> 	u8 *tag;</div><div class='del'>-	int source_port;</div><div class='ctx'> </div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Tag decoding */</div><div class='ctx'> 	tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;</div><div class='add'>+	port = tag[0] &amp; KSZ9477_TAIL_TAG_EG_PORT_M;</div><div class='ctx'> </div><div class='del'>-	source_port = tag[0] &amp; 7;</div><div class='add'>+	/* Extra 4-bytes PTP timestamp */</div><div class='add'>+	if (tag[0] &amp; KSZ9477_PTP_TAG_INDICATION) {</div><div class='add'>+		ksz_rcv_timestamp(skb, tag);</div><div class='add'>+		len += KSZ_PTP_TAG_LEN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, source_port);</div><div class='del'>-	if (!skb-&gt;dev)</div><div class='add'>+	return ksz_common_rcv(skb, dev, port, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ksz9477_netdev_ops = {</div><div class='add'>+	.name	= KSZ9477_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_KSZ9477,</div><div class='add'>+	.xmit	= ksz9477_xmit,</div><div class='add'>+	.rcv	= ksz9477_rcv,</div><div class='add'>+	.connect = ksz_connect,</div><div class='add'>+	.disconnect = ksz_disconnect,</div><div class='add'>+	.needed_tailroom = KSZ9477_INGRESS_TAG_LEN + KSZ_PTP_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(ksz9477_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9477, KSZ9477_NAME);</div><div class='add'>+</div><div class='add'>+#define KSZ9893_TAIL_TAG_PRIO		GENMASK(4, 3)</div><div class='add'>+#define KSZ9893_TAIL_TAG_OVERRIDE	BIT(5)</div><div class='add'>+#define KSZ9893_TAIL_TAG_LOOKUP		BIT(6)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ksz9893_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 prio = netdev_txq_to_tc(dev, queue_mapping);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+	u8 *tag;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	pskb_trim_rcsum(skb, skb-&gt;len - KSZ_EGRESS_TAG_LEN);</div><div class='add'>+	/* Tag encoding */</div><div class='add'>+	ksz_xmit_timestamp(dp, skb);</div><div class='ctx'> </div><div class='del'>-	return skb;</div><div class='add'>+	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);</div><div class='add'>+	hdr = skb_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	*tag = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+	*tag |= FIELD_PREP(KSZ9893_TAIL_TAG_PRIO, prio);</div><div class='add'>+</div><div class='add'>+	if (is_link_local_ether_addr(hdr-&gt;h_dest))</div><div class='add'>+		*tag |= KSZ9893_TAIL_TAG_OVERRIDE;</div><div class='add'>+</div><div class='add'>+	return ksz_defer_xmit(dp, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ksz9893_netdev_ops = {</div><div class='add'>+	.name	= KSZ9893_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_KSZ9893,</div><div class='add'>+	.xmit	= ksz9893_xmit,</div><div class='add'>+	.rcv	= ksz9477_rcv,</div><div class='add'>+	.connect = ksz_connect,</div><div class='add'>+	.disconnect = ksz_disconnect,</div><div class='add'>+	.needed_tailroom = KSZ_INGRESS_TAG_LEN + KSZ_PTP_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(ksz9893_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9893, KSZ9893_NAME);</div><div class='add'>+</div><div class='add'>+/* For xmit, 2/6 bytes are added before FCS.</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|tag1(1byte)|</div><div class='add'>+ * FCS(4bytes)</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * ts   : time stamp (Present only if PTP is enabled in the Hardware)</div><div class='add'>+ * tag0 : represents tag override, lookup and valid</div><div class='add'>+ * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x80=port8)</div><div class='add'>+ *</div><div class='add'>+ * For rcv, 1/5 bytes is added before FCS.</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|FCS(4bytes)</div><div class='add'>+ * ---------------------------------------------------------------------------</div><div class='add'>+ * ts   : time stamp (Present only if bit 7 of tag0 is set)</div><div class='add'>+ * tag0 : zero-based value represents port</div><div class='add'>+ *	  (eg, 0x00=port1, 0x02=port3, 0x07=port8)</div><div class='add'>+ */</div><div class='add'>+#define LAN937X_EGRESS_TAG_LEN		2</div><div class='add'>+</div><div class='add'>+#define LAN937X_TAIL_TAG_BLOCKING_OVERRIDE	BIT(11)</div><div class='add'>+#define LAN937X_TAIL_TAG_LOOKUP			BIT(12)</div><div class='add'>+#define LAN937X_TAIL_TAG_VALID			BIT(13)</div><div class='add'>+#define LAN937X_TAIL_TAG_PRIO			GENMASK(10, 8)</div><div class='add'>+#define LAN937X_TAIL_TAG_PORT_MASK		7</div><div class='add'>+</div><div class='add'>+static struct sk_buff *lan937x_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 prio = netdev_txq_to_tc(dev, queue_mapping);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	const struct ethhdr *hdr = eth_hdr(skb);</div><div class='add'>+	__be16 *tag;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ksz_xmit_timestamp(dp, skb);</div><div class='add'>+</div><div class='add'>+	tag = skb_put(skb, LAN937X_EGRESS_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	val = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+	val |= FIELD_PREP(LAN937X_TAIL_TAG_PRIO, prio);</div><div class='add'>+</div><div class='add'>+	if (is_link_local_ether_addr(hdr-&gt;h_dest))</div><div class='add'>+		val |= LAN937X_TAIL_TAG_BLOCKING_OVERRIDE;</div><div class='add'>+</div><div class='add'>+	/* Tail tag valid bit - This bit should always be set by the CPU */</div><div class='add'>+	val |= LAN937X_TAIL_TAG_VALID;</div><div class='add'>+</div><div class='add'>+	put_unaligned_be16(val, tag);</div><div class='add'>+</div><div class='add'>+	return ksz_defer_xmit(dp, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops ksz_netdev_ops = {</div><div class='del'>-	.xmit	= ksz_xmit,</div><div class='del'>-	.rcv	= ksz_rcv,</div><div class='add'>+static const struct dsa_device_ops lan937x_netdev_ops = {</div><div class='add'>+	.name	= LAN937X_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_LAN937X,</div><div class='add'>+	.xmit	= lan937x_xmit,</div><div class='add'>+	.rcv	= ksz9477_rcv,</div><div class='add'>+	.connect = ksz_connect,</div><div class='add'>+	.disconnect = ksz_disconnect,</div><div class='add'>+	.needed_tailroom = LAN937X_EGRESS_TAG_LEN + KSZ_PTP_TAG_LEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(lan937x_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_LAN937X, LAN937X_NAME);</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *dsa_tag_driver_array[] = {</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(ksz8795_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(ksz9477_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(ksz9893_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(lan937x_netdev_ops),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_drivers(dsa_tag_driver_array);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Microchip 8795/937x/9477/9893 families of switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c<br/>index 548c00254c07..258e5d7dc5ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_lan9303.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_lan9303.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_lan9303.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_lan9303.c</a></div><div class='hunk'>@@ -1,22 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Pengutronix, Juergen Borleis &lt;jbe@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dsa/lan9303.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "tag.h"</div><div class='ctx'> </div><div class='ctx'> /* To define the outgoing port and to discover the incoming port a regular</div><div class='ctx'>  * VLAN tag is used by the LAN9303. But its VID meaning is 'special':</div><div class='hunk'>@@ -39,6 +30,8 @@</div><div class='ctx'>  * Required when no forwarding between the external ports should happen.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define LAN9303_NAME "lan9303"</div><div class='add'>+</div><div class='ctx'> #define LAN9303_TAG_LEN 4</div><div class='ctx'> # define LAN9303_TAG_TX_USE_ALR BIT(3)</div><div class='ctx'> # define LAN9303_TAG_TX_STP_OVERRIDE BIT(4)</div><div class='hunk'>@@ -63,38 +56,29 @@ static int lan9303_xmit_use_arl(struct dsa_port *dp, u8 *dest_addr)</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	u16 *lan9303_tag;</div><div class='del'>-</div><div class='del'>-	/* insert a special VLAN tag between the MAC addresses</div><div class='del'>-	 * and the current ethertype field.</div><div class='del'>-	 */</div><div class='del'>-	if (skb_cow_head(skb, LAN9303_TAG_LEN) &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev,</div><div class='del'>-			"Cannot make room for the special tag. Dropping packet\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	__be16 *lan9303_tag;</div><div class='add'>+	u16 tag;</div><div class='ctx'> </div><div class='ctx'> 	/* provide 'LAN9303_TAG_LEN' bytes additional space */</div><div class='ctx'> 	skb_push(skb, LAN9303_TAG_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* make room between MACs and Ether-Type */</div><div class='del'>-	memmove(skb-&gt;data, skb-&gt;data + LAN9303_TAG_LEN, 2 * ETH_ALEN);</div><div class='add'>+	dsa_alloc_etype_header(skb, LAN9303_TAG_LEN);</div><div class='ctx'> </div><div class='del'>-	lan9303_tag = (u16 *)(skb-&gt;data + 2 * ETH_ALEN);</div><div class='add'>+	lan9303_tag = dsa_etype_header_pos_tx(skb);</div><div class='add'>+</div><div class='add'>+	tag = lan9303_xmit_use_arl(dp, skb-&gt;data) ?</div><div class='add'>+		LAN9303_TAG_TX_USE_ALR :</div><div class='add'>+		dp-&gt;index | LAN9303_TAG_TX_STP_OVERRIDE;</div><div class='ctx'> 	lan9303_tag[0] = htons(ETH_P_8021Q);</div><div class='del'>-	lan9303_tag[1] = lan9303_xmit_use_arl(dp, skb-&gt;data) ?</div><div class='del'>-				LAN9303_TAG_TX_USE_ALR :</div><div class='del'>-				dp-&gt;index | LAN9303_TAG_TX_STP_OVERRIDE;</div><div class='del'>-	lan9303_tag[1] = htons(lan9303_tag[1]);</div><div class='add'>+	lan9303_tag[1] = htons(tag);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				   struct packet_type *pt)</div><div class='add'>+static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u16 *lan9303_tag;</div><div class='ctx'> 	u16 lan9303_tag1;</div><div class='ctx'> 	unsigned int source_port;</div><div class='ctx'> </div><div class='hunk'>@@ -104,40 +88,39 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* '-&gt;data' points into the middle of our special VLAN tag information:</div><div class='del'>-	 *</div><div class='del'>-	 * ~ MAC src   | 0x81 | 0x00 | 0xyy | 0xzz | ether type</div><div class='del'>-	 *                           ^</div><div class='del'>-	 *                        -&gt;data</div><div class='del'>-	 */</div><div class='del'>-	lan9303_tag = (u16 *)(skb-&gt;data - 2);</div><div class='del'>-</div><div class='del'>-	if (lan9303_tag[0] != htons(ETH_P_8021Q)) {</div><div class='del'>-		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet due to invalid VLAN marker\n");</div><div class='del'>-		return NULL;</div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		lan9303_tag1 = skb_vlan_tag_get(skb);</div><div class='add'>+		__vlan_hwaccel_clear_tag(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb_push_rcsum(skb, ETH_HLEN);</div><div class='add'>+		__skb_vlan_pop(skb, &amp;lan9303_tag1);</div><div class='add'>+		skb_pull_rcsum(skb, ETH_HLEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lan9303_tag1 = ntohs(lan9303_tag[1]);</div><div class='ctx'> 	source_port = lan9303_tag1 &amp; 0x3;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, source_port);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, source_port);</div><div class='ctx'> 	if (!skb-&gt;dev) {</div><div class='ctx'> 		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet due to invalid source port\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* remove the special VLAN tag between the MAC addresses</div><div class='del'>-	 * and the current ethertype field.</div><div class='del'>-	 */</div><div class='del'>-	skb_pull_rcsum(skb, 2 + 2);</div><div class='del'>-	memmove(skb-&gt;data - ETH_HLEN, skb-&gt;data - (ETH_HLEN + LAN9303_TAG_LEN),</div><div class='del'>-		2 * ETH_ALEN);</div><div class='del'>-	skb-&gt;offload_fwd_mark = !(lan9303_tag1 &amp; LAN9303_TAG_RX_TRAPPED_TO_CPU);</div><div class='add'>+	if (!(lan9303_tag1 &amp; LAN9303_TAG_RX_TRAPPED_TO_CPU))</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops lan9303_netdev_ops = {</div><div class='add'>+static const struct dsa_device_ops lan9303_netdev_ops = {</div><div class='add'>+	.name = LAN9303_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_LAN9303,</div><div class='ctx'> 	.xmit = lan9303_xmit,</div><div class='ctx'> 	.rcv = lan9303_rcv,</div><div class='add'>+	.needed_headroom = LAN9303_TAG_LEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for SMSC/Microchip LAN9303 family of switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_LAN9303, LAN9303_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(lan9303_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c<br/>index 11535bc70743..dea3eecaf093 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_mtk.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_mtk.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_mtk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_mtk.c</a></div><div class='hunk'>@@ -1,34 +1,33 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Mediatek DSA Tag support</div><div class='ctx'>  * Copyright (C) 2017 Landen Chao &lt;landen.chao@mediatek.com&gt;</div><div class='ctx'>  *		      Sean Wang &lt;sean.wang@mediatek.com&gt;</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 and</div><div class='del'>- * only version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define MTK_NAME		"mtk"</div><div class='ctx'> </div><div class='ctx'> #define MTK_HDR_LEN		4</div><div class='ctx'> #define MTK_HDR_XMIT_UNTAGGED		0</div><div class='ctx'> #define MTK_HDR_XMIT_TAGGED_TPID_8100	1</div><div class='add'>+#define MTK_HDR_XMIT_TAGGED_TPID_88A8	2</div><div class='ctx'> #define MTK_HDR_RECV_SOURCE_PORT_MASK	GENMASK(2, 0)</div><div class='ctx'> #define MTK_HDR_XMIT_DP_BIT_MASK	GENMASK(5, 0)</div><div class='add'>+#define MTK_HDR_XMIT_SA_DIS		BIT(6)</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,</div><div class='ctx'> 				    struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	u8 xmit_tpid;</div><div class='ctx'> 	u8 *mtk_tag;</div><div class='del'>-	bool is_vlan_skb = true;</div><div class='add'>+</div><div class='add'>+	skb_set_queue_mapping(skb, dp-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	/* Build the special tag after the MAC Source Address. If VLAN header</div><div class='ctx'> 	 * is present, it's required that VLAN header and special tag is</div><div class='hunk'>@@ -36,26 +35,30 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 * the both special and VLAN tag at the same time and then look up VLAN</div><div class='ctx'> 	 * table with VID.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!skb_vlan_tagged(skb)) {</div><div class='del'>-		if (skb_cow_head(skb, MTK_HDR_LEN) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_8021Q):</div><div class='add'>+		xmit_tpid = MTK_HDR_XMIT_TAGGED_TPID_8100;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_8021AD):</div><div class='add'>+		xmit_tpid = MTK_HDR_XMIT_TAGGED_TPID_88A8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		xmit_tpid = MTK_HDR_XMIT_UNTAGGED;</div><div class='ctx'> 		skb_push(skb, MTK_HDR_LEN);</div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + MTK_HDR_LEN, 2 * ETH_ALEN);</div><div class='del'>-		is_vlan_skb = false;</div><div class='add'>+		dsa_alloc_etype_header(skb, MTK_HDR_LEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mtk_tag = skb-&gt;data + 2 * ETH_ALEN;</div><div class='add'>+	mtk_tag = dsa_etype_header_pos_tx(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark tag attribute on special tag insertion to notify hardware</div><div class='ctx'> 	 * whether that's a combined special tag with 802.1Q header.</div><div class='ctx'> 	 */</div><div class='del'>-	mtk_tag[0] = is_vlan_skb ? MTK_HDR_XMIT_TAGGED_TPID_8100 :</div><div class='del'>-		     MTK_HDR_XMIT_UNTAGGED;</div><div class='del'>-	mtk_tag[1] = (1 &lt;&lt; dp-&gt;index) &amp; MTK_HDR_XMIT_DP_BIT_MASK;</div><div class='add'>+	mtk_tag[0] = xmit_tpid;</div><div class='add'>+	mtk_tag[1] = FIELD_PREP(MTK_HDR_XMIT_DP_BIT_MASK,</div><div class='add'>+				dsa_xmit_port_mask(skb, dev));</div><div class='ctx'> </div><div class='ctx'> 	/* Tag control information is kept for 802.1Q */</div><div class='del'>-	if (!is_vlan_skb) {</div><div class='add'>+	if (xmit_tpid == MTK_HDR_XMIT_UNTAGGED) {</div><div class='ctx'> 		mtk_tag[2] = 0;</div><div class='ctx'> 		mtk_tag[3] = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -63,50 +66,45 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				   struct packet_type *pt)</div><div class='add'>+static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	u16 hdr;</div><div class='ctx'> 	int port;</div><div class='del'>-	__be16 *phdr, hdr;</div><div class='add'>+	__be16 *phdr;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, MTK_HDR_LEN)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* The MTK header is added by the switch between src addr</div><div class='del'>-	 * and ethertype at this point, skb-&gt;data points to 2 bytes</div><div class='del'>-	 * after src addr so header should be 2 bytes right before.</div><div class='del'>-	 */</div><div class='del'>-	phdr = (__be16 *)(skb-&gt;data - 2);</div><div class='add'>+	phdr = dsa_etype_header_pos_rx(skb);</div><div class='ctx'> 	hdr = ntohs(*phdr);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove MTK tag and recalculate checksum. */</div><div class='ctx'> 	skb_pull_rcsum(skb, MTK_HDR_LEN);</div><div class='ctx'> </div><div class='del'>-	memmove(skb-&gt;data - ETH_HLEN,</div><div class='del'>-		skb-&gt;data - ETH_HLEN - MTK_HDR_LEN,</div><div class='del'>-		2 * ETH_ALEN);</div><div class='add'>+	dsa_strip_etype_header(skb, MTK_HDR_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* Get source port information */</div><div class='ctx'> 	port = (hdr &amp; MTK_HDR_RECV_SOURCE_PORT_MASK);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, port);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='ctx'> 	if (!skb-&gt;dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='ctx'> </div><div class='del'>-static int mtk_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,</div><div class='del'>-				int *offset)</div><div class='del'>-{</div><div class='del'>-	*offset = 4;</div><div class='del'>-	*proto = ((__be16 *)skb-&gt;data)[1];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops mtk_netdev_ops = {</div><div class='add'>+static const struct dsa_device_ops mtk_netdev_ops = {</div><div class='add'>+	.name		= MTK_NAME,</div><div class='add'>+	.proto		= DSA_TAG_PROTO_MTK,</div><div class='ctx'> 	.xmit		= mtk_tag_xmit,</div><div class='ctx'> 	.rcv		= mtk_tag_rcv,</div><div class='del'>-	.flow_dissect	= mtk_tag_flow_dissect,</div><div class='add'>+	.needed_headroom = MTK_HDR_LEN,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Mediatek switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_MTK, MTK_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(mtk_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_mxl-gsw1xx.c b/net/dsa/tag_mxl-gsw1xx.c<br/>new file mode 100644<br/>index 000000000000..60f7c445e656<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_mxl-gsw1xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_mxl-gsw1xx.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * DSA driver Special Tag support for MaxLinear GSW1xx switch chips</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Daniel Golle &lt;daniel@makrotopia.org&gt;</div><div class='add'>+ * Copyright (C) 2023 - 2024 MaxLinear Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+/* To define the outgoing port and to discover the incoming port a special</div><div class='add'>+ * tag is used by the GSW1xx.</div><div class='add'>+ *</div><div class='add'>+ *       Dest MAC       Src MAC    special TAG        EtherType</div><div class='add'>+ * ...| 1 2 3 4 5 6 | 1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 | 1 2 |...</div><div class='add'>+ *                                |&lt;---------------&gt;|</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define GSW1XX_TAG_NAME		"gsw1xx"</div><div class='add'>+</div><div class='add'>+/* special tag header length (RX and TX) */</div><div class='add'>+#define GSW1XX_HEADER_LEN		8</div><div class='add'>+</div><div class='add'>+/* Word 0 = Ethertype -&gt; 0x88C3 */</div><div class='add'>+</div><div class='add'>+/* Word 1 */</div><div class='add'>+#define GSW1XX_TX_PORT_MAP		GENMASK(7, 0)</div><div class='add'>+#define GSW1XX_TX_PORT_MAP_EN		BIT(15)</div><div class='add'>+#define GSW1XX_TX_CLASS_EN		BIT(14)</div><div class='add'>+#define GSW1XX_TX_TIME_STAMP_EN		BIT(13)</div><div class='add'>+#define GSW1XX_TX_LRN_DIS		BIT(12)</div><div class='add'>+#define GSW1XX_TX_CLASS			GENMASK(11, 8)</div><div class='add'>+</div><div class='add'>+/* special tag in RX path header */</div><div class='add'>+/* Word 2 */</div><div class='add'>+#define GSW1XX_RX_PORT_MAP		GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *gsw1xx_tag_xmit(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	__be16 *gsw1xx_tag;</div><div class='add'>+	u16 tag;</div><div class='add'>+</div><div class='add'>+	/* provide additional space 'GSW1XX_HEADER_LEN' bytes */</div><div class='add'>+	skb_push(skb, GSW1XX_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	/* add space between MAC address and Ethertype */</div><div class='add'>+	dsa_alloc_etype_header(skb, GSW1XX_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	/* special tag ingress */</div><div class='add'>+	gsw1xx_tag = dsa_etype_header_pos_tx(skb);</div><div class='add'>+	gsw1xx_tag[0] = htons(ETH_P_MXLGSW);</div><div class='add'>+</div><div class='add'>+	tag = FIELD_PREP(GSW1XX_TX_PORT_MAP, dsa_xmit_port_mask(skb, dev)) |</div><div class='add'>+	      GSW1XX_TX_PORT_MAP_EN | GSW1XX_TX_LRN_DIS;</div><div class='add'>+	gsw1xx_tag[1] = htons(tag);</div><div class='add'>+	gsw1xx_tag[2] = 0;</div><div class='add'>+	gsw1xx_tag[3] = 0;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *gsw1xx_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+	__be16 *gsw1xx_tag;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, GSW1XX_HEADER_LEN))) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet, cannot pull SKB\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gsw1xx_tag = dsa_etype_header_pos_rx(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntohs(gsw1xx_tag[0]) != ETH_P_MXLGSW)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet due to invalid special tag\n");</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Tag: %8ph\n", gsw1xx_tag);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get source port information */</div><div class='add'>+	port = FIELD_GET(GSW1XX_RX_PORT_MAP, ntohs(gsw1xx_tag[1]));</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet due to invalid source port\n");</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Tag: %8ph\n", gsw1xx_tag);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* remove the GSW1xx special tag between MAC addresses and the current</div><div class='add'>+	 * ethertype field.</div><div class='add'>+	 */</div><div class='add'>+	skb_pull_rcsum(skb, GSW1XX_HEADER_LEN);</div><div class='add'>+	dsa_strip_etype_header(skb, GSW1XX_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops gsw1xx_netdev_ops = {</div><div class='add'>+	.name			= GSW1XX_TAG_NAME,</div><div class='add'>+	.proto			= DSA_TAG_PROTO_MXL_GSW1XX,</div><div class='add'>+	.xmit			= gsw1xx_tag_xmit,</div><div class='add'>+	.rcv			= gsw1xx_tag_rcv,</div><div class='add'>+	.needed_headroom	= GSW1XX_HEADER_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for MaxLinear GSW1xx 8 byte protocol");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_MXL_GSW1XX, GSW1XX_TAG_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(gsw1xx_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_none.c b/net/dsa/tag_none.c<br/>new file mode 100644<br/>index 000000000000..e9c9670a9c44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_none.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_none.c</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * net/dsa/tag_none.c - Traffic handling for switches with no tag</div><div class='add'>+ * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='add'>+ * Copyright (c) 2013 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * WARNING: do not use this for new switches. In case of no hardware</div><div class='add'>+ * tagging support, look at tag_8021q.c instead.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define NONE_NAME	"none"</div><div class='add'>+</div><div class='add'>+static struct sk_buff *dsa_user_notag_xmit(struct sk_buff *skb,</div><div class='add'>+					   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Just return the original SKB */</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops none_ops = {</div><div class='add'>+	.name	= NONE_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_NONE,</div><div class='add'>+	.xmit	= dsa_user_notag_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(none_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_NONE, NONE_NAME);</div><div class='add'>+MODULE_DESCRIPTION("DSA no-op tag driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c<br/>new file mode 100644<br/>index 000000000000..3405def79c2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_ocelot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_ocelot.c</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2019 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dsa/ocelot.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define OCELOT_NAME	"ocelot"</div><div class='add'>+#define SEVILLE_NAME	"seville"</div><div class='add'>+</div><div class='add'>+static void ocelot_xmit_common(struct sk_buff *skb, struct net_device *netdev,</div><div class='add'>+			       __be32 ifh_prefix, void **ifh)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	u64 vlan_tci, tag_type;</div><div class='add'>+	void *injection;</div><div class='add'>+	__be32 *prefix;</div><div class='add'>+	u32 rew_op = 0;</div><div class='add'>+	u64 qos_class;</div><div class='add'>+</div><div class='add'>+	ocelot_xmit_get_vlan_info(skb, dsa_port_bridge_dev_get(dp), &amp;vlan_tci,</div><div class='add'>+				  &amp;tag_type);</div><div class='add'>+</div><div class='add'>+	qos_class = netdev_get_num_tc(netdev) ?</div><div class='add'>+		    netdev_get_prio_tc_map(netdev, skb-&gt;priority) : skb-&gt;priority;</div><div class='add'>+</div><div class='add'>+	injection = skb_push(skb, OCELOT_TAG_LEN);</div><div class='add'>+	prefix = skb_push(skb, OCELOT_SHORT_PREFIX_LEN);</div><div class='add'>+</div><div class='add'>+	*prefix = ifh_prefix;</div><div class='add'>+	memset(injection, 0, OCELOT_TAG_LEN);</div><div class='add'>+	ocelot_ifh_set_bypass(injection, 1);</div><div class='add'>+	ocelot_ifh_set_src(injection, ds-&gt;num_ports);</div><div class='add'>+	ocelot_ifh_set_qos_class(injection, qos_class);</div><div class='add'>+	ocelot_ifh_set_vlan_tci(injection, vlan_tci);</div><div class='add'>+	ocelot_ifh_set_tag_type(injection, tag_type);</div><div class='add'>+</div><div class='add'>+	rew_op = ocelot_ptp_rew_op(skb);</div><div class='add'>+	if (rew_op)</div><div class='add'>+		ocelot_ifh_set_rew_op(injection, rew_op);</div><div class='add'>+</div><div class='add'>+	*ifh = injection;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ocelot_xmit(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	void *injection;</div><div class='add'>+</div><div class='add'>+	ocelot_xmit_common(skb, netdev, cpu_to_be32(0x8880000a), &amp;injection);</div><div class='add'>+	ocelot_ifh_set_dest(injection, dsa_xmit_port_mask(skb, netdev));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *seville_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	void *injection;</div><div class='add'>+</div><div class='add'>+	ocelot_xmit_common(skb, netdev, cpu_to_be32(0x88800005), &amp;injection);</div><div class='add'>+	seville_ifh_set_dest(injection, dsa_xmit_port_mask(skb, netdev));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ocelot_rcv(struct sk_buff *skb,</div><div class='add'>+				  struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	u64 src_port, qos_class;</div><div class='add'>+	u64 vlan_tci, tag_type;</div><div class='add'>+	u8 *start = skb-&gt;data;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u8 *extraction;</div><div class='add'>+	u16 vlan_tpid;</div><div class='add'>+	u64 rew_val;</div><div class='add'>+</div><div class='add'>+	/* Revert skb-&gt;data by the amount consumed by the DSA conduit,</div><div class='add'>+	 * so it points to the beginning of the frame.</div><div class='add'>+	 */</div><div class='add'>+	skb_push(skb, ETH_HLEN);</div><div class='add'>+	/* We don't care about the short prefix, it is just for easy entrance</div><div class='add'>+	 * into the DSA conduit's RX filter. Discard it now by moving it into</div><div class='add'>+	 * the headroom.</div><div class='add'>+	 */</div><div class='add'>+	skb_pull(skb, OCELOT_SHORT_PREFIX_LEN);</div><div class='add'>+	/* And skb-&gt;data now points to the extraction frame header.</div><div class='add'>+	 * Keep a pointer to it.</div><div class='add'>+	 */</div><div class='add'>+	extraction = skb-&gt;data;</div><div class='add'>+	/* Now the EFH is part of the headroom as well */</div><div class='add'>+	skb_pull(skb, OCELOT_TAG_LEN);</div><div class='add'>+	/* Reset the pointer to the real MAC header */</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+	/* And move skb-&gt;data to the correct location again */</div><div class='add'>+	skb_pull(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	/* Remove from inet csum the extraction header */</div><div class='add'>+	skb_postpull_rcsum(skb, start, OCELOT_TOTAL_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	ocelot_xfh_get_src_port(extraction, &amp;src_port);</div><div class='add'>+	ocelot_xfh_get_qos_class(extraction, &amp;qos_class);</div><div class='add'>+	ocelot_xfh_get_tag_type(extraction, &amp;tag_type);</div><div class='add'>+	ocelot_xfh_get_vlan_tci(extraction, &amp;vlan_tci);</div><div class='add'>+	ocelot_xfh_get_rew_val(extraction, &amp;rew_val);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(netdev, 0, src_port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		/* The switch will reflect back some frames sent through</div><div class='add'>+		 * sockets opened on the bare DSA conduit. These will come back</div><div class='add'>+		 * with src_port equal to the index of the CPU port, for which</div><div class='add'>+		 * there is no user registered. So don't print any error</div><div class='add'>+		 * message here (ignore and drop those frames).</div><div class='add'>+		 */</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+	skb-&gt;priority = qos_class;</div><div class='add'>+	OCELOT_SKB_CB(skb)-&gt;tstamp_lo = rew_val;</div><div class='add'>+</div><div class='add'>+	/* Ocelot switches copy frames unmodified to the CPU. However, it is</div><div class='add'>+	 * possible for the user to request a VLAN modification through</div><div class='add'>+	 * VCAP_IS1_ACT_VID_REPLACE_ENA. In this case, what will happen is that</div><div class='add'>+	 * the VLAN ID field from the Extraction Header gets updated, but the</div><div class='add'>+	 * 802.1Q header does not (the classified VLAN only becomes visible on</div><div class='add'>+	 * egress through the "port tag" of front-panel ports).</div><div class='add'>+	 * So, for traffic extracted by the CPU, we want to pick up the</div><div class='add'>+	 * classified VLAN and manually replace the existing 802.1Q header from</div><div class='add'>+	 * the packet with it, so that the operating system is always up to</div><div class='add'>+	 * date with the result of tc-vlan actions.</div><div class='add'>+	 * NOTE: In VLAN-unaware mode, we don't want to do that, we want the</div><div class='add'>+	 * frame to remain unmodified, because the classified VLAN is always</div><div class='add'>+	 * equal to the pvid of the ingress port and should not be used for</div><div class='add'>+	 * processing.</div><div class='add'>+	 */</div><div class='add'>+	dp = dsa_user_to_port(skb-&gt;dev);</div><div class='add'>+	vlan_tpid = tag_type ? ETH_P_8021AD : ETH_P_8021Q;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_vlan_filtering(dp) &amp;&amp;</div><div class='add'>+	    eth_hdr(skb)-&gt;h_proto == htons(vlan_tpid)) {</div><div class='add'>+		u16 dummy_vlan_tci;</div><div class='add'>+</div><div class='add'>+		skb_push_rcsum(skb, ETH_HLEN);</div><div class='add'>+		__skb_vlan_pop(skb, &amp;dummy_vlan_tci);</div><div class='add'>+		skb_pull_rcsum(skb, ETH_HLEN);</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, htons(vlan_tpid), vlan_tci);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ocelot_netdev_ops = {</div><div class='add'>+	.name			= OCELOT_NAME,</div><div class='add'>+	.proto			= DSA_TAG_PROTO_OCELOT,</div><div class='add'>+	.xmit			= ocelot_xmit,</div><div class='add'>+	.rcv			= ocelot_rcv,</div><div class='add'>+	.needed_headroom	= OCELOT_TOTAL_TAG_LEN,</div><div class='add'>+	.promisc_on_conduit	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(ocelot_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OCELOT, OCELOT_NAME);</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops seville_netdev_ops = {</div><div class='add'>+	.name			= SEVILLE_NAME,</div><div class='add'>+	.proto			= DSA_TAG_PROTO_SEVILLE,</div><div class='add'>+	.xmit			= seville_xmit,</div><div class='add'>+	.rcv			= ocelot_rcv,</div><div class='add'>+	.needed_headroom	= OCELOT_TOTAL_TAG_LEN,</div><div class='add'>+	.promisc_on_conduit	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(seville_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_SEVILLE, SEVILLE_NAME);</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *ocelot_tag_driver_array[] = {</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(ocelot_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(seville_netdev_ops),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_drivers(ocelot_tag_driver_array);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Ocelot family of switches, using NPI port");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c<br/>new file mode 100644<br/>index 000000000000..3929584791e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_ocelot_8021q.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_ocelot_8021q.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2020-2021 NXP</div><div class='add'>+ *</div><div class='add'>+ * An implementation of the software-defined tag_8021q.c tagger format, which</div><div class='add'>+ * also preserves full functionality under a vlan_filtering bridge. It does</div><div class='add'>+ * this by using the TCAM engines for:</div><div class='add'>+ * - pushing the RX VLAN as a second, outer tag, on egress towards the CPU port</div><div class='add'>+ * - redirecting towards the correct front port based on TX VLAN and popping</div><div class='add'>+ *   that on egress</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include &lt;linux/dsa/ocelot.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+</div><div class='add'>+#define OCELOT_8021Q_NAME "ocelot-8021q"</div><div class='add'>+</div><div class='add'>+struct ocelot_8021q_tagger_private {</div><div class='add'>+	struct ocelot_8021q_tagger_data data; /* Must be first */</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ocelot_defer_xmit(struct dsa_port *dp,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_8021q_tagger_private *priv = dp-&gt;ds-&gt;tagger_data;</div><div class='add'>+	struct ocelot_8021q_tagger_data *data = &amp;priv-&gt;data;</div><div class='add'>+	void (*xmit_work_fn)(struct kthread_work *work);</div><div class='add'>+	struct felix_deferred_xmit_work *xmit_work;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+</div><div class='add'>+	xmit_work_fn = data-&gt;xmit_work_fn;</div><div class='add'>+	xmit_worker = priv-&gt;xmit_worker;</div><div class='add'>+</div><div class='add'>+	if (!xmit_work_fn || !xmit_worker)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* PTP over IP packets need UDP checksumming. We may have inherited</div><div class='add'>+	 * NETIF_F_HW_CSUM from the DSA conduit, but these packets are not sent</div><div class='add'>+	 * through the DSA conduit, so calculate the checksum here.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	xmit_work = kzalloc(sizeof(*xmit_work), GFP_ATOMIC);</div><div class='add'>+	if (!xmit_work)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Calls felix_port_deferred_xmit in felix.c */</div><div class='add'>+	kthread_init_work(&amp;xmit_work-&gt;work, xmit_work_fn);</div><div class='add'>+	/* Increase refcount so the kfree_skb in dsa_user_xmit</div><div class='add'>+	 * won't really free the packet.</div><div class='add'>+	 */</div><div class='add'>+	xmit_work-&gt;dp = dp;</div><div class='add'>+	xmit_work-&gt;skb = skb_get(skb);</div><div class='add'>+</div><div class='add'>+	kthread_queue_work(xmit_worker, &amp;xmit_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ocelot_xmit(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);</div><div class='add'>+	u16 tx_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	struct ethhdr *hdr = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (ocelot_ptp_rew_op(skb) || is_link_local_ether_addr(hdr-&gt;h_dest))</div><div class='add'>+		return ocelot_defer_xmit(dp, skb);</div><div class='add'>+</div><div class='add'>+	return dsa_8021q_xmit(skb, netdev, ETH_P_8021Q,</div><div class='add'>+			      ((pcp &lt;&lt; VLAN_PRIO_SHIFT) | tx_vid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ocelot_rcv(struct sk_buff *skb,</div><div class='add'>+				  struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int src_port = -1, switch_id = -1;</div><div class='add'>+</div><div class='add'>+	dsa_8021q_rcv(skb, &amp;src_port, &amp;switch_id, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(netdev, switch_id, src_port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocelot_disconnect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_8021q_tagger_private *priv = ds-&gt;tagger_data;</div><div class='add'>+</div><div class='add'>+	kthread_destroy_worker(priv-&gt;xmit_worker);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	ds-&gt;tagger_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ocelot_connect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_8021q_tagger_private *priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;xmit_worker = kthread_run_worker(0, "felix_xmit");</div><div class='add'>+	if (IS_ERR(priv-&gt;xmit_worker)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;xmit_worker);</div><div class='add'>+		kfree(priv);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;tagger_data = priv;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops ocelot_8021q_netdev_ops = {</div><div class='add'>+	.name			= OCELOT_8021Q_NAME,</div><div class='add'>+	.proto			= DSA_TAG_PROTO_OCELOT_8021Q,</div><div class='add'>+	.xmit			= ocelot_xmit,</div><div class='add'>+	.rcv			= ocelot_rcv,</div><div class='add'>+	.connect		= ocelot_connect,</div><div class='add'>+	.disconnect		= ocelot_disconnect,</div><div class='add'>+	.needed_headroom	= VLAN_HLEN,</div><div class='add'>+	.promisc_on_conduit	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Ocelot family of switches, using VLAN");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OCELOT_8021Q, OCELOT_8021Q_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(ocelot_8021q_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c<br/>index 613f4ee97771..6d56a28c914c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_qca.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_qca.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_qca.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_qca.c</a></div><div class='hunk'>@@ -1,104 +1,125 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015, The Linux Foundation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 and</div><div class='del'>- * only version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/dsa/tag_qca.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='del'>-</div><div class='del'>-#define QCA_HDR_LEN	2</div><div class='del'>-#define QCA_HDR_VERSION	0x2</div><div class='del'>-</div><div class='del'>-#define QCA_HDR_RECV_VERSION_MASK	GENMASK(15, 14)</div><div class='del'>-#define QCA_HDR_RECV_VERSION_S		14</div><div class='del'>-#define QCA_HDR_RECV_PRIORITY_MASK	GENMASK(13, 11)</div><div class='del'>-#define QCA_HDR_RECV_PRIORITY_S		11</div><div class='del'>-#define QCA_HDR_RECV_TYPE_MASK		GENMASK(10, 6)</div><div class='del'>-#define QCA_HDR_RECV_TYPE_S		6</div><div class='del'>-#define QCA_HDR_RECV_FRAME_IS_TAGGED	BIT(3)</div><div class='del'>-#define QCA_HDR_RECV_SOURCE_PORT_MASK	GENMASK(2, 0)</div><div class='del'>-</div><div class='del'>-#define QCA_HDR_XMIT_VERSION_MASK	GENMASK(15, 14)</div><div class='del'>-#define QCA_HDR_XMIT_VERSION_S		14</div><div class='del'>-#define QCA_HDR_XMIT_PRIORITY_MASK	GENMASK(13, 11)</div><div class='del'>-#define QCA_HDR_XMIT_PRIORITY_S		11</div><div class='del'>-#define QCA_HDR_XMIT_CONTROL_MASK	GENMASK(10, 8)</div><div class='del'>-#define QCA_HDR_XMIT_CONTROL_S		8</div><div class='del'>-#define QCA_HDR_XMIT_FROM_CPU		BIT(7)</div><div class='del'>-#define QCA_HDR_XMIT_DP_BIT_MASK	GENMASK(6, 0)</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define QCA_NAME "qca"</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	u16 *phdr, hdr;</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (skb_cow_head(skb, 0) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='add'>+	__be16 *phdr;</div><div class='add'>+	u16 hdr;</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, QCA_HDR_LEN);</div><div class='ctx'> </div><div class='del'>-	memmove(skb-&gt;data, skb-&gt;data + QCA_HDR_LEN, 2 * ETH_ALEN);</div><div class='del'>-	phdr = (u16 *)(skb-&gt;data + 2 * ETH_ALEN);</div><div class='add'>+	dsa_alloc_etype_header(skb, QCA_HDR_LEN);</div><div class='add'>+	phdr = dsa_etype_header_pos_tx(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the version field, and set destination port information */</div><div class='del'>-	hdr = QCA_HDR_VERSION &lt;&lt; QCA_HDR_XMIT_VERSION_S |</div><div class='del'>-		QCA_HDR_XMIT_FROM_CPU | BIT(dp-&gt;index);</div><div class='add'>+	hdr = FIELD_PREP(QCA_HDR_XMIT_VERSION, QCA_HDR_VERSION);</div><div class='add'>+	hdr |= QCA_HDR_XMIT_FROM_CPU;</div><div class='add'>+	hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, dsa_xmit_port_mask(skb, dev));</div><div class='ctx'> </div><div class='ctx'> 	*phdr = htons(hdr);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				   struct packet_type *pt)</div><div class='add'>+static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u8 ver;</div><div class='add'>+	struct qca_tagger_data *tagger_data;</div><div class='add'>+	struct dsa_port *dp = dev-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	u8 ver, pk_type;</div><div class='add'>+	__be16 *phdr;</div><div class='ctx'> 	int port;</div><div class='del'>-	__be16 *phdr, hdr;</div><div class='add'>+	u16 hdr;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct qca_mgmt_ethhdr) != QCA_HDR_MGMT_HEADER_LEN + QCA_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	tagger_data = ds-&gt;tagger_data;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* The QCA header is added by the switch between src addr and Ethertype</div><div class='del'>-	 * At this point, skb-&gt;data points to ethertype so header should be</div><div class='del'>-	 * right before</div><div class='del'>-	 */</div><div class='del'>-	phdr = (__be16 *)(skb-&gt;data - 2);</div><div class='add'>+	phdr = dsa_etype_header_pos_rx(skb);</div><div class='ctx'> 	hdr = ntohs(*phdr);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the version is correct */</div><div class='del'>-	ver = (hdr &amp; QCA_HDR_RECV_VERSION_MASK) &gt;&gt; QCA_HDR_RECV_VERSION_S;</div><div class='add'>+	ver = FIELD_GET(QCA_HDR_RECV_VERSION, hdr);</div><div class='ctx'> 	if (unlikely(ver != QCA_HDR_VERSION))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* Remove QCA tag and recalculate checksum */</div><div class='del'>-	skb_pull_rcsum(skb, QCA_HDR_LEN);</div><div class='del'>-	memmove(skb-&gt;data - ETH_HLEN, skb-&gt;data - ETH_HLEN - QCA_HDR_LEN,</div><div class='del'>-		ETH_HLEN - QCA_HDR_LEN);</div><div class='add'>+	/* Get pk type */</div><div class='add'>+	pk_type = FIELD_GET(QCA_HDR_RECV_TYPE, hdr);</div><div class='add'>+</div><div class='add'>+	/* Ethernet mgmt read/write packet */</div><div class='add'>+	if (pk_type == QCA_HDR_RECV_TYPE_RW_REG_ACK) {</div><div class='add'>+		if (likely(tagger_data-&gt;rw_reg_ack_handler))</div><div class='add'>+			tagger_data-&gt;rw_reg_ack_handler(ds, skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ethernet MIB counter packet */</div><div class='add'>+	if (pk_type == QCA_HDR_RECV_TYPE_MIB) {</div><div class='add'>+		if (likely(tagger_data-&gt;mib_autocast_handler))</div><div class='add'>+			tagger_data-&gt;mib_autocast_handler(ds, skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get source port information */</div><div class='del'>-	port = (hdr &amp; QCA_HDR_RECV_SOURCE_PORT_MASK);</div><div class='add'>+	port = FIELD_GET(QCA_HDR_RECV_SOURCE_PORT, hdr);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, port);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='ctx'> 	if (!skb-&gt;dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	/* Remove QCA tag and recalculate checksum */</div><div class='add'>+	skb_pull_rcsum(skb, QCA_HDR_LEN);</div><div class='add'>+	dsa_strip_etype_header(skb, QCA_HDR_LEN);</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops qca_netdev_ops = {</div><div class='add'>+static int qca_tag_connect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct qca_tagger_data *tagger_data;</div><div class='add'>+</div><div class='add'>+	tagger_data = kzalloc(sizeof(*tagger_data), GFP_KERNEL);</div><div class='add'>+	if (!tagger_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ds-&gt;tagger_data = tagger_data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca_tag_disconnect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	kfree(ds-&gt;tagger_data);</div><div class='add'>+	ds-&gt;tagger_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops qca_netdev_ops = {</div><div class='add'>+	.name	= QCA_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_QCA,</div><div class='add'>+	.connect = qca_tag_connect,</div><div class='add'>+	.disconnect = qca_tag_disconnect,</div><div class='ctx'> 	.xmit	= qca_tag_xmit,</div><div class='ctx'> 	.rcv	= qca_tag_rcv,</div><div class='add'>+	.needed_headroom = QCA_HDR_LEN,</div><div class='add'>+	.promisc_on_conduit = true,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Qualcomm Atheros QCA8K switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_QCA, QCA_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(qca_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c<br/>new file mode 100644<br/>index 000000000000..3cc63eacfa03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_rtl4_a.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_rtl4_a.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Handler for Realtek 4 byte DSA switch tags</div><div class='add'>+ * Currently only supports protocol "A" found in RTL8366RB</div><div class='add'>+ * Copyright (c) 2020 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This "proprietary tag" header looks like so:</div><div class='add'>+ *</div><div class='add'>+ * -------------------------------------------------</div><div class='add'>+ * | MAC DA | MAC SA | 0x8899 | 2 bytes tag | Type |</div><div class='add'>+ * -------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * The 2 bytes tag form a 16 bit big endian word. The exact</div><div class='add'>+ * meaning has been guessed from packet dumps from ingress</div><div class='add'>+ * frames.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define RTL4_A_NAME		"rtl4a"</div><div class='add'>+</div><div class='add'>+#define RTL4_A_HDR_LEN		4</div><div class='add'>+#define RTL4_A_PROTOCOL_SHIFT	12</div><div class='add'>+/*</div><div class='add'>+ * 0x1 = Realtek Remote Control protocol (RRCP)</div><div class='add'>+ * 0x2/0x3 seems to be used for loopback testing</div><div class='add'>+ * 0x9 = RTL8306 DSA protocol</div><div class='add'>+ * 0xa = RTL8366RB DSA protocol</div><div class='add'>+ */</div><div class='add'>+#define RTL4_A_PROTOCOL_RTL8366RB	0xa</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	__be16 *p;</div><div class='add'>+	u8 *tag;</div><div class='add'>+	u16 out;</div><div class='add'>+</div><div class='add'>+	/* Pad out to at least 60 bytes */</div><div class='add'>+	if (unlikely(__skb_put_padto(skb, ETH_ZLEN, false)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "add realtek tag to package to port %d\n",</div><div class='add'>+		   dp-&gt;index);</div><div class='add'>+	skb_push(skb, RTL4_A_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN);</div><div class='add'>+	tag = dsa_etype_header_pos_tx(skb);</div><div class='add'>+</div><div class='add'>+	/* Set Ethertype */</div><div class='add'>+	p = (__be16 *)tag;</div><div class='add'>+	*p = htons(ETH_P_REALTEK);</div><div class='add'>+</div><div class='add'>+	out = (RTL4_A_PROTOCOL_RTL8366RB &lt;&lt; RTL4_A_PROTOCOL_SHIFT);</div><div class='add'>+	/* The lower bits indicate the port number */</div><div class='add'>+	out |= dsa_xmit_port_mask(skb, dev);</div><div class='add'>+</div><div class='add'>+	p = (__be16 *)(tag + 2);</div><div class='add'>+	*p = htons(out);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u16 protport;</div><div class='add'>+	__be16 *p;</div><div class='add'>+	u16 etype;</div><div class='add'>+	u8 *tag;</div><div class='add'>+	u8 prot;</div><div class='add'>+	u8 port;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, RTL4_A_HDR_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	tag = dsa_etype_header_pos_rx(skb);</div><div class='add'>+	p = (__be16 *)tag;</div><div class='add'>+	etype = ntohs(*p);</div><div class='add'>+	if (etype != ETH_P_REALTEK) {</div><div class='add'>+		/* Not custom, just pass through */</div><div class='add'>+		netdev_dbg(dev, "non-realtek ethertype 0x%04x\n", etype);</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+	p = (__be16 *)(tag + 2);</div><div class='add'>+	protport = ntohs(*p);</div><div class='add'>+	/* The 4 upper bits are the protocol */</div><div class='add'>+	prot = (protport &gt;&gt; RTL4_A_PROTOCOL_SHIFT) &amp; 0x0f;</div><div class='add'>+	if (prot != RTL4_A_PROTOCOL_RTL8366RB) {</div><div class='add'>+		netdev_err(dev, "unknown realtek protocol 0x%01x\n", prot);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	port = protport &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		netdev_dbg(dev, "could not find user for port %d\n", port);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove RTL4 tag and recalculate checksum */</div><div class='add'>+	skb_pull_rcsum(skb, RTL4_A_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_strip_etype_header(skb, RTL4_A_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops rtl4a_netdev_ops = {</div><div class='add'>+	.name	= RTL4_A_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_RTL4_A,</div><div class='add'>+	.xmit	= rtl4a_tag_xmit,</div><div class='add'>+	.rcv	= rtl4a_tag_rcv,</div><div class='add'>+	.needed_headroom = RTL4_A_HDR_LEN,</div><div class='add'>+};</div><div class='add'>+module_dsa_tag_driver(rtl4a_netdev_ops);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Realtek 4 byte protocol A tags");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_RTL4_A, RTL4_A_NAME);</div><div class='head'>diff --git a/net/dsa/tag_rtl8_4.c b/net/dsa/tag_rtl8_4.c<br/>new file mode 100644<br/>index 000000000000..2464545da4d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_rtl8_4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_rtl8_4.c</a></div><div class='hunk'>@@ -0,0 +1,261 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Handler for Realtek 8 byte switch tags</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Alvin Šipraga &lt;alsi@bang-olufsen.dk&gt;</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Currently only supports protocol "4" found in the RTL8365MB, hence</div><div class='add'>+ * named tag_rtl8_4.</div><div class='add'>+ *</div><div class='add'>+ * This tag has the following format:</div><div class='add'>+ *</div><div class='add'>+ *  0                                  7|8                                 15</div><div class='add'>+ *  |-----------------------------------+-----------------------------------|---</div><div class='add'>+ *  |                               (16-bit)                                | ^</div><div class='add'>+ *  |                       Realtek EtherType [0x8899]                      | |</div><div class='add'>+ *  |-----------------------------------+-----------------------------------| 8</div><div class='add'>+ *  |              (8-bit)              |              (8-bit)              |</div><div class='add'>+ *  |          Protocol [0x04]          |              REASON               | b</div><div class='add'>+ *  |-----------------------------------+-----------------------------------| y</div><div class='add'>+ *  |   (1)  | (1) | (2) |   (1)  | (3) | (1)  | (1) |    (1)    |   (5)    | t</div><div class='add'>+ *  | FID_EN |  X  | FID | PRI_EN | PRI | KEEP |  X  | LEARN_DIS |    X     | e</div><div class='add'>+ *  |-----------------------------------+-----------------------------------| s</div><div class='add'>+ *  |   (1)  |                       (15-bit)                               | |</div><div class='add'>+ *  |  ALLOW |                        TX/RX                                 | v</div><div class='add'>+ *  |-----------------------------------+-----------------------------------|---</div><div class='add'>+ *</div><div class='add'>+ * With the following field descriptions:</div><div class='add'>+ *</div><div class='add'>+ *    field      | description</div><div class='add'>+ *   ------------+-------------</div><div class='add'>+ *    Realtek    | 0x8899: indicates that this is a proprietary Realtek tag;</div><div class='add'>+ *     EtherType |         note that Realtek uses the same EtherType for</div><div class='add'>+ *               |         other incompatible tag formats (e.g. tag_rtl4_a.c)</div><div class='add'>+ *    Protocol   | 0x04: indicates that this tag conforms to this format</div><div class='add'>+ *    X          | reserved</div><div class='add'>+ *   ------------+-------------</div><div class='add'>+ *    REASON     | reason for forwarding packet to CPU</div><div class='add'>+ *               | 0: packet was forwarded or flooded to CPU</div><div class='add'>+ *               | 80: packet was trapped to CPU</div><div class='add'>+ *    FID_EN     | 1: packet has an FID</div><div class='add'>+ *               | 0: no FID</div><div class='add'>+ *    FID        | FID of packet (if FID_EN=1)</div><div class='add'>+ *    PRI_EN     | 1: force priority of packet</div><div class='add'>+ *               | 0: don't force priority</div><div class='add'>+ *    PRI        | priority of packet (if PRI_EN=1)</div><div class='add'>+ *    KEEP       | preserve packet VLAN tag format</div><div class='add'>+ *    LEARN_DIS  | don't learn the source MAC address of the packet</div><div class='add'>+ *    ALLOW      | 1: treat TX/RX field as an allowance port mask, meaning the</div><div class='add'>+ *               |    packet may only be forwarded to ports specified in the</div><div class='add'>+ *               |    mask</div><div class='add'>+ *               | 0: no allowance port mask, TX/RX field is the forwarding</div><div class='add'>+ *               |    port mask</div><div class='add'>+ *    TX/RX      | TX (switch-&gt;CPU): port number the packet was received on</div><div class='add'>+ *               | RX (CPU-&gt;switch): forwarding port mask (if ALLOW=0)</div><div class='add'>+ *               |                   allowance port mask (if ALLOW=1)</div><div class='add'>+ *</div><div class='add'>+ * The tag can be positioned before Ethertype, using tag "rtl8_4":</div><div class='add'>+ *</div><div class='add'>+ *  +--------+--------+------------+------+-----</div><div class='add'>+ *  | MAC DA | MAC SA | 8 byte tag | Type | ...</div><div class='add'>+ *  +--------+--------+------------+------+-----</div><div class='add'>+ *</div><div class='add'>+ * The tag can also appear between the end of the payload and before the CRC,</div><div class='add'>+ * using tag "rtl8_4t":</div><div class='add'>+ *</div><div class='add'>+ * +--------+--------+------+-----+---------+------------+-----+</div><div class='add'>+ * | MAC DA | MAC SA | TYPE | ... | payload | 8-byte tag | CRC |</div><div class='add'>+ * +--------+--------+------+-----+---------+------------+-----+</div><div class='add'>+ *</div><div class='add'>+ * The added bytes after the payload will break most checksums, either in</div><div class='add'>+ * software or hardware. To avoid this issue, if the checksum is still pending,</div><div class='add'>+ * this tagger checksums the packet in software before adding the tag.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+/* Protocols supported:</div><div class='add'>+ *</div><div class='add'>+ * 0x04 = RTL8365MB DSA protocol</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define RTL8_4_NAME			"rtl8_4"</div><div class='add'>+#define RTL8_4T_NAME			"rtl8_4t"</div><div class='add'>+</div><div class='add'>+#define RTL8_4_TAG_LEN			8</div><div class='add'>+</div><div class='add'>+#define RTL8_4_PROTOCOL			GENMASK(15, 8)</div><div class='add'>+#define   RTL8_4_PROTOCOL_RTL8365MB	0x04</div><div class='add'>+#define RTL8_4_REASON			GENMASK(7, 0)</div><div class='add'>+#define   RTL8_4_REASON_FORWARD		0</div><div class='add'>+#define   RTL8_4_REASON_TRAP		80</div><div class='add'>+</div><div class='add'>+#define RTL8_4_LEARN_DIS		BIT(5)</div><div class='add'>+</div><div class='add'>+#define RTL8_4_TX			GENMASK(3, 0)</div><div class='add'>+#define RTL8_4_RX			GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+static void rtl8_4_write_tag(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			     void *tag)</div><div class='add'>+{</div><div class='add'>+	__be16 tag16[RTL8_4_TAG_LEN / 2];</div><div class='add'>+</div><div class='add'>+	/* Set Realtek EtherType */</div><div class='add'>+	tag16[0] = htons(ETH_P_REALTEK);</div><div class='add'>+</div><div class='add'>+	/* Set Protocol; zero REASON */</div><div class='add'>+	tag16[1] = htons(FIELD_PREP(RTL8_4_PROTOCOL, RTL8_4_PROTOCOL_RTL8365MB));</div><div class='add'>+</div><div class='add'>+	/* Zero FID_EN, FID, PRI_EN, PRI, KEEP; set LEARN_DIS */</div><div class='add'>+	tag16[2] = htons(FIELD_PREP(RTL8_4_LEARN_DIS, 1));</div><div class='add'>+</div><div class='add'>+	/* Zero ALLOW; set RX (CPU-&gt;switch) forwarding port mask */</div><div class='add'>+	tag16[3] = htons(FIELD_PREP(RTL8_4_RX, dsa_xmit_port_mask(skb, dev)));</div><div class='add'>+</div><div class='add'>+	memcpy(tag, tag16, RTL8_4_TAG_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl8_4_tag_xmit(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	skb_push(skb, RTL8_4_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_alloc_etype_header(skb, RTL8_4_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	rtl8_4_write_tag(skb, dev, dsa_etype_header_pos_tx(skb));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl8_4t_tag_xmit(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Calculate the checksum here if not done yet as trailing tags will</div><div class='add'>+	 * break either software or hardware based checksum</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp; skb_checksum_help(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rtl8_4_write_tag(skb, dev, skb_put(skb, RTL8_4_TAG_LEN));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8_4_read_tag(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			   void *tag)</div><div class='add'>+{</div><div class='add'>+	__be16 tag16[RTL8_4_TAG_LEN / 2];</div><div class='add'>+	u16 etype;</div><div class='add'>+	u8 reason;</div><div class='add'>+	u8 proto;</div><div class='add'>+	u8 port;</div><div class='add'>+</div><div class='add'>+	memcpy(tag16, tag, RTL8_4_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	/* Parse Realtek EtherType */</div><div class='add'>+	etype = ntohs(tag16[0]);</div><div class='add'>+	if (unlikely(etype != ETH_P_REALTEK)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev,</div><div class='add'>+				     "non-realtek ethertype 0x%04x\n", etype);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse Protocol */</div><div class='add'>+	proto = FIELD_GET(RTL8_4_PROTOCOL, ntohs(tag16[1]));</div><div class='add'>+	if (unlikely(proto != RTL8_4_PROTOCOL_RTL8365MB)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev,</div><div class='add'>+				     "unknown realtek protocol 0x%02x\n",</div><div class='add'>+				     proto);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse REASON */</div><div class='add'>+	reason = FIELD_GET(RTL8_4_REASON, ntohs(tag16[1]));</div><div class='add'>+</div><div class='add'>+	/* Parse TX (switch-&gt;CPU) */</div><div class='add'>+	port = FIELD_GET(RTL8_4_TX, ntohs(tag16[3]));</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev,</div><div class='add'>+				     "could not find user for port %d\n",</div><div class='add'>+				     port);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reason != RTL8_4_REASON_TRAP)</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl8_4_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, RTL8_4_TAG_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(rtl8_4_read_tag(skb, dev, dsa_etype_header_pos_rx(skb))))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Remove tag and recalculate checksum */</div><div class='add'>+	skb_pull_rcsum(skb, RTL8_4_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_strip_etype_header(skb, RTL8_4_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtl8_4t_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(rtl8_4_read_tag(skb, dev, skb_tail_pointer(skb) - RTL8_4_TAG_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim_rcsum(skb, skb-&gt;len - RTL8_4_TAG_LEN))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ethertype version */</div><div class='add'>+static const struct dsa_device_ops rtl8_4_netdev_ops = {</div><div class='add'>+	.name = "rtl8_4",</div><div class='add'>+	.proto = DSA_TAG_PROTO_RTL8_4,</div><div class='add'>+	.xmit = rtl8_4_tag_xmit,</div><div class='add'>+	.rcv = rtl8_4_tag_rcv,</div><div class='add'>+	.needed_headroom = RTL8_4_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(rtl8_4_netdev_ops);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_RTL8_4, RTL8_4_NAME);</div><div class='add'>+</div><div class='add'>+/* Tail version */</div><div class='add'>+static const struct dsa_device_ops rtl8_4t_netdev_ops = {</div><div class='add'>+	.name = "rtl8_4t",</div><div class='add'>+	.proto = DSA_TAG_PROTO_RTL8_4T,</div><div class='add'>+	.xmit = rtl8_4t_tag_xmit,</div><div class='add'>+	.rcv = rtl8_4t_tag_rcv,</div><div class='add'>+	.needed_tailroom = RTL8_4_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(rtl8_4t_netdev_ops);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_RTL8_4T, RTL8_4T_NAME);</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *dsa_tag_drivers[] = {</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(rtl8_4_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(rtl8_4t_netdev_ops),</div><div class='add'>+};</div><div class='add'>+module_dsa_tag_drivers(dsa_tag_drivers);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Realtek 8 byte protocol 4 tags");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/tag_rzn1_a5psw.c b/net/dsa/tag_rzn1_a5psw.c<br/>new file mode 100644<br/>index 000000000000..10994b3470f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_rzn1_a5psw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_rzn1_a5psw.c</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Schneider Electric</div><div class='add'>+ *</div><div class='add'>+ * Clément Léger &lt;clement.leger@bootlin.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+/* To define the outgoing port and to discover the incoming port a TAG is</div><div class='add'>+ * inserted after Src MAC :</div><div class='add'>+ *</div><div class='add'>+ *       Dest MAC       Src MAC           TAG         Type</div><div class='add'>+ * ...| 1 2 3 4 5 6 | 1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 | 1 2 |...</div><div class='add'>+ *                                |&lt;---------------&gt;|</div><div class='add'>+ *</div><div class='add'>+ * See struct a5psw_tag for layout</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define A5PSW_NAME			"a5psw"</div><div class='add'>+</div><div class='add'>+#define ETH_P_DSA_A5PSW			0xE001</div><div class='add'>+#define A5PSW_TAG_LEN			8</div><div class='add'>+#define A5PSW_CTRL_DATA_FORCE_FORWARD	BIT(0)</div><div class='add'>+/* This is both used for xmit tag and rcv tagging */</div><div class='add'>+#define A5PSW_CTRL_DATA_PORT		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+struct a5psw_tag {</div><div class='add'>+	__be16 ctrl_tag;</div><div class='add'>+	__be16 ctrl_data;</div><div class='add'>+	__be16 ctrl_data2_hi;</div><div class='add'>+	__be16 ctrl_data2_lo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sk_buff *a5psw_tag_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct a5psw_tag *ptag;</div><div class='add'>+	u32 data2_val;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ptag) != A5PSW_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	/* The Ethernet switch we are interfaced with needs packets to be at</div><div class='add'>+	 * least 60 bytes otherwise they will be discarded when they enter the</div><div class='add'>+	 * switch port logic.</div><div class='add'>+	 */</div><div class='add'>+	if (__skb_put_padto(skb, ETH_ZLEN, false))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* provide 'A5PSW_TAG_LEN' bytes additional space */</div><div class='add'>+	skb_push(skb, A5PSW_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	/* make room between MACs and Ether-Type to insert tag */</div><div class='add'>+	dsa_alloc_etype_header(skb, A5PSW_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	ptag = dsa_etype_header_pos_tx(skb);</div><div class='add'>+</div><div class='add'>+	data2_val = FIELD_PREP(A5PSW_CTRL_DATA_PORT, dsa_xmit_port_mask(skb, dev));</div><div class='add'>+	ptag-&gt;ctrl_tag = htons(ETH_P_DSA_A5PSW);</div><div class='add'>+	ptag-&gt;ctrl_data = htons(A5PSW_CTRL_DATA_FORCE_FORWARD);</div><div class='add'>+	ptag-&gt;ctrl_data2_lo = htons(data2_val);</div><div class='add'>+	ptag-&gt;ctrl_data2_hi = 0;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *a5psw_tag_rcv(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct a5psw_tag *tag;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, A5PSW_TAG_LEN))) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev,</div><div class='add'>+				     "Dropping packet, cannot pull\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tag = dsa_etype_header_pos_rx(skb);</div><div class='add'>+</div><div class='add'>+	if (tag-&gt;ctrl_tag != htons(ETH_P_DSA_A5PSW)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;dev-&gt;dev, "Dropping packet due to invalid TAG marker\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port = FIELD_GET(A5PSW_CTRL_DATA_PORT, ntohs(tag-&gt;ctrl_data));</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_pull_rcsum(skb, A5PSW_TAG_LEN);</div><div class='add'>+	dsa_strip_etype_header(skb, A5PSW_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops a5psw_netdev_ops = {</div><div class='add'>+	.name	= A5PSW_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_RZN1_A5PSW,</div><div class='add'>+	.xmit	= a5psw_tag_xmit,</div><div class='add'>+	.rcv	= a5psw_tag_rcv,</div><div class='add'>+	.needed_headroom = A5PSW_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Renesas RZ/N1 A5PSW switch");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_A5PSW, A5PSW_NAME);</div><div class='add'>+module_dsa_tag_driver(a5psw_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c<br/>new file mode 100644<br/>index 000000000000..02adec693811<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_sja1105.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_sja1105.c</a></div><div class='hunk'>@@ -0,0 +1,762 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/dsa/sja1105.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include &lt;linux/packing.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_NAME				"sja1105"</div><div class='add'>+#define SJA1110_NAME				"sja1110"</div><div class='add'>+</div><div class='add'>+/* Is this a TX or an RX header? */</div><div class='add'>+#define SJA1110_HEADER_HOST_TO_SWITCH		BIT(15)</div><div class='add'>+</div><div class='add'>+/* RX header */</div><div class='add'>+#define SJA1110_RX_HEADER_IS_METADATA		BIT(14)</div><div class='add'>+#define SJA1110_RX_HEADER_HOST_ONLY		BIT(13)</div><div class='add'>+#define SJA1110_RX_HEADER_HAS_TRAILER		BIT(12)</div><div class='add'>+</div><div class='add'>+/* Trap-to-host format (no trailer present) */</div><div class='add'>+#define SJA1110_RX_HEADER_SRC_PORT(x)		(((x) &amp; GENMASK(7, 4)) &gt;&gt; 4)</div><div class='add'>+#define SJA1110_RX_HEADER_SWITCH_ID(x)		((x) &amp; GENMASK(3, 0))</div><div class='add'>+</div><div class='add'>+/* Timestamp format (trailer present) */</div><div class='add'>+#define SJA1110_RX_HEADER_TRAILER_POS(x)	((x) &amp; GENMASK(11, 0))</div><div class='add'>+</div><div class='add'>+#define SJA1110_RX_TRAILER_SWITCH_ID(x)		(((x) &amp; GENMASK(7, 4)) &gt;&gt; 4)</div><div class='add'>+#define SJA1110_RX_TRAILER_SRC_PORT(x)		((x) &amp; GENMASK(3, 0))</div><div class='add'>+</div><div class='add'>+/* Meta frame format (for 2-step TX timestamps) */</div><div class='add'>+#define SJA1110_RX_HEADER_N_TS(x)		(((x) &amp; GENMASK(8, 4)) &gt;&gt; 4)</div><div class='add'>+</div><div class='add'>+/* TX header */</div><div class='add'>+#define SJA1110_TX_HEADER_UPDATE_TC		BIT(14)</div><div class='add'>+#define SJA1110_TX_HEADER_TAKE_TS		BIT(13)</div><div class='add'>+#define SJA1110_TX_HEADER_TAKE_TS_CASC		BIT(12)</div><div class='add'>+#define SJA1110_TX_HEADER_HAS_TRAILER		BIT(11)</div><div class='add'>+</div><div class='add'>+/* Only valid if SJA1110_TX_HEADER_HAS_TRAILER is false */</div><div class='add'>+#define SJA1110_TX_HEADER_PRIO(x)		(((x) &lt;&lt; 7) &amp; GENMASK(10, 7))</div><div class='add'>+#define SJA1110_TX_HEADER_TSTAMP_ID(x)		((x) &amp; GENMASK(7, 0))</div><div class='add'>+</div><div class='add'>+/* Only valid if SJA1110_TX_HEADER_HAS_TRAILER is true */</div><div class='add'>+#define SJA1110_TX_HEADER_TRAILER_POS(x)	((x) &amp; GENMASK(10, 0))</div><div class='add'>+</div><div class='add'>+#define SJA1110_TX_TRAILER_TSTAMP_ID(x)		(((x) &lt;&lt; 24) &amp; GENMASK(31, 24))</div><div class='add'>+#define SJA1110_TX_TRAILER_PRIO(x)		(((x) &lt;&lt; 21) &amp; GENMASK(23, 21))</div><div class='add'>+#define SJA1110_TX_TRAILER_SWITCHID(x)		(((x) &lt;&lt; 12) &amp; GENMASK(15, 12))</div><div class='add'>+#define SJA1110_TX_TRAILER_DESTPORTS(x)		(((x) &lt;&lt; 1) &amp; GENMASK(11, 1))</div><div class='add'>+</div><div class='add'>+#define SJA1110_META_TSTAMP_SIZE		10</div><div class='add'>+</div><div class='add'>+#define SJA1110_HEADER_LEN			4</div><div class='add'>+#define SJA1110_RX_TRAILER_LEN			13</div><div class='add'>+#define SJA1110_TX_TRAILER_LEN			4</div><div class='add'>+#define SJA1110_MAX_PADDING_LEN			15</div><div class='add'>+</div><div class='add'>+struct sja1105_tagger_private {</div><div class='add'>+	struct sja1105_tagger_data data; /* Must be first */</div><div class='add'>+	/* Protects concurrent access to the meta state machine</div><div class='add'>+	 * from taggers running on multiple ports on SMP systems</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t meta_lock;</div><div class='add'>+	struct sk_buff *stampable_skb;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sja1105_tagger_private *</div><div class='add'>+sja1105_tagger_private(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return ds-&gt;tagger_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Similar to is_link_local_ether_addr(hdr-&gt;h_dest) but also covers PTP */</div><div class='add'>+static bool sja1105_is_link_local(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ethhdr *hdr = eth_hdr(skb);</div><div class='add'>+	u64 dmac = ether_addr_to_u64(hdr-&gt;h_dest);</div><div class='add'>+</div><div class='add'>+	if (ntohs(hdr-&gt;h_proto) == ETH_P_SJA1105_META)</div><div class='add'>+		return false;</div><div class='add'>+	if ((dmac &amp; SJA1105_LINKLOCAL_FILTER_A_MASK) ==</div><div class='add'>+		    SJA1105_LINKLOCAL_FILTER_A)</div><div class='add'>+		return true;</div><div class='add'>+	if ((dmac &amp; SJA1105_LINKLOCAL_FILTER_B_MASK) ==</div><div class='add'>+		    SJA1105_LINKLOCAL_FILTER_B)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sja1105_meta {</div><div class='add'>+	u64 tstamp;</div><div class='add'>+	u64 dmac_byte_4;</div><div class='add'>+	u64 dmac_byte_3;</div><div class='add'>+	u64 source_port;</div><div class='add'>+	u64 switch_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void sja1105_meta_unpack(const struct sk_buff *skb,</div><div class='add'>+				struct sja1105_meta *meta)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = skb_mac_header(skb) + ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	/* UM10944.pdf section 4.2.17 AVB Parameters:</div><div class='add'>+	 * Structure of the meta-data follow-up frame.</div><div class='add'>+	 * It is in network byte order, so there are no quirks</div><div class='add'>+	 * while unpacking the meta frame.</div><div class='add'>+	 *</div><div class='add'>+	 * Also SJA1105 E/T only populates bits 23:0 of the timestamp</div><div class='add'>+	 * whereas P/Q/R/S does 32 bits. Since the structure is the</div><div class='add'>+	 * same and the E/T puts zeroes in the high-order byte, use</div><div class='add'>+	 * a unified unpacking command for both device series.</div><div class='add'>+	 */</div><div class='add'>+	packing(buf,     &amp;meta-&gt;tstamp,     31, 0, 4, UNPACK, 0);</div><div class='add'>+	packing(buf + 4, &amp;meta-&gt;dmac_byte_3, 7, 0, 1, UNPACK, 0);</div><div class='add'>+	packing(buf + 5, &amp;meta-&gt;dmac_byte_4, 7, 0, 1, UNPACK, 0);</div><div class='add'>+	packing(buf + 6, &amp;meta-&gt;source_port, 7, 0, 1, UNPACK, 0);</div><div class='add'>+	packing(buf + 7, &amp;meta-&gt;switch_id,   7, 0, 1, UNPACK, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sja1105_is_meta_frame(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ethhdr *hdr = eth_hdr(skb);</div><div class='add'>+	u64 smac = ether_addr_to_u64(hdr-&gt;h_source);</div><div class='add'>+	u64 dmac = ether_addr_to_u64(hdr-&gt;h_dest);</div><div class='add'>+</div><div class='add'>+	if (smac != SJA1105_META_SMAC)</div><div class='add'>+		return false;</div><div class='add'>+	if (dmac != SJA1105_META_DMAC)</div><div class='add'>+		return false;</div><div class='add'>+	if (ntohs(hdr-&gt;h_proto) != ETH_P_SJA1105_META)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calls sja1105_port_deferred_xmit in sja1105_main.c */</div><div class='add'>+static struct sk_buff *sja1105_defer_xmit(struct dsa_port *dp,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tagger_data *tagger_data = sja1105_tagger_data(dp-&gt;ds);</div><div class='add'>+	struct sja1105_tagger_private *priv = sja1105_tagger_private(dp-&gt;ds);</div><div class='add'>+	void (*xmit_work_fn)(struct kthread_work *work);</div><div class='add'>+	struct sja1105_deferred_xmit_work *xmit_work;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+</div><div class='add'>+	xmit_work_fn = tagger_data-&gt;xmit_work_fn;</div><div class='add'>+	xmit_worker = priv-&gt;xmit_worker;</div><div class='add'>+</div><div class='add'>+	if (!xmit_work_fn || !xmit_worker)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	xmit_work = kzalloc(sizeof(*xmit_work), GFP_ATOMIC);</div><div class='add'>+	if (!xmit_work)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	kthread_init_work(&amp;xmit_work-&gt;work, xmit_work_fn);</div><div class='add'>+	/* Increase refcount so the kfree_skb in dsa_user_xmit</div><div class='add'>+	 * won't really free the packet.</div><div class='add'>+	 */</div><div class='add'>+	xmit_work-&gt;dp = dp;</div><div class='add'>+	xmit_work-&gt;skb = skb_get(skb);</div><div class='add'>+</div><div class='add'>+	kthread_queue_work(xmit_worker, &amp;xmit_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send VLAN tags with a TPID that blends in with whatever VLAN protocol a</div><div class='add'>+ * bridge spanning ports of this switch might have.</div><div class='add'>+ */</div><div class='add'>+static u16 sja1105_xmit_tpid(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	u16 proto;</div><div class='add'>+</div><div class='add'>+	/* Since VLAN awareness is global, then if this port is VLAN-unaware,</div><div class='add'>+	 * all ports are. Use the VLAN-unaware TPID used for tag_8021q.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_port_is_vlan_filtering(dp))</div><div class='add'>+		return ETH_P_SJA1105;</div><div class='add'>+</div><div class='add'>+	/* Port is VLAN-aware, so there is a bridge somewhere (a single one,</div><div class='add'>+	 * we're sure about that). It may not be on this port though, so we</div><div class='add'>+	 * need to find it.</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_port(other_dp, ds) {</div><div class='add'>+		struct net_device *br = dsa_port_bridge_dev_get(other_dp);</div><div class='add'>+</div><div class='add'>+		if (!br)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Error is returned only if CONFIG_BRIDGE_VLAN_FILTERING,</div><div class='add'>+		 * which seems pointless to handle, as our port cannot become</div><div class='add'>+		 * VLAN-aware in that case.</div><div class='add'>+		 */</div><div class='add'>+		br_vlan_get_proto(br, &amp;proto);</div><div class='add'>+</div><div class='add'>+		return proto;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "Port is VLAN-aware but cannot find associated bridge!\n");</div><div class='add'>+</div><div class='add'>+	return ETH_P_SJA1105;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1105_imprecise_xmit(struct sk_buff *skb,</div><div class='add'>+					      struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	unsigned int bridge_num = dsa_port_bridge_num_get(dp);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	u16 tx_vid;</div><div class='add'>+</div><div class='add'>+	/* If the port is under a VLAN-aware bridge, just slide the</div><div class='add'>+	 * VLAN-tagged packet into the FDB and hope for the best.</div><div class='add'>+	 * This works because we support a single VLAN-aware bridge</div><div class='add'>+	 * across the entire dst, and its VLANs cannot be shared with</div><div class='add'>+	 * any standalone port.</div><div class='add'>+	 */</div><div class='add'>+	if (br_vlan_enabled(br))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	/* If the port is under a VLAN-unaware bridge, use an imprecise</div><div class='add'>+	 * TX VLAN that targets the bridge's entire broadcast domain,</div><div class='add'>+	 * instead of just the specific port.</div><div class='add'>+	 */</div><div class='add'>+	tx_vid = dsa_tag_8021q_bridge_vid(bridge_num);</div><div class='add'>+</div><div class='add'>+	return dsa_8021q_xmit(skb, netdev, sja1105_xmit_tpid(dp), tx_vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Transform untagged control packets into pvid-tagged control packets so that</div><div class='add'>+ * all packets sent by this tagger are VLAN-tagged and we can configure the</div><div class='add'>+ * switch to drop untagged packets coming from the DSA conduit.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *sja1105_pvid_tag_control_pkt(struct dsa_port *dp,</div><div class='add'>+						    struct sk_buff *skb, u8 pcp)</div><div class='add'>+{</div><div class='add'>+	__be16 xmit_tpid = htons(sja1105_xmit_tpid(dp));</div><div class='add'>+	struct vlan_ethhdr *hdr;</div><div class='add'>+</div><div class='add'>+	/* If VLAN tag is in hwaccel area, move it to the payload</div><div class='add'>+	 * to deal with both cases uniformly and to ensure that</div><div class='add'>+	 * the VLANs are added in the right order.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb_vlan_tag_present(skb))) {</div><div class='add'>+		skb = __vlan_hwaccel_push_inside(skb);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = skb_vlan_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* If skb is already VLAN-tagged, leave that VLAN ID in place */</div><div class='add'>+	if (hdr-&gt;h_vlan_proto == xmit_tpid)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	return vlan_insert_tag(skb, xmit_tpid, (pcp &lt;&lt; VLAN_PRIO_SHIFT) |</div><div class='add'>+			       SJA1105_DEFAULT_VLAN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1105_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);</div><div class='add'>+	u16 tx_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;offload_fwd_mark)</div><div class='add'>+		return sja1105_imprecise_xmit(skb, netdev);</div><div class='add'>+</div><div class='add'>+	/* Transmitting management traffic does not rely upon switch tagging,</div><div class='add'>+	 * but instead SPI-installed management routes. Part 2 of this</div><div class='add'>+	 * is the .port_deferred_xmit driver callback.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(sja1105_is_link_local(skb))) {</div><div class='add'>+		skb = sja1105_pvid_tag_control_pkt(dp, skb, pcp);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		return sja1105_defer_xmit(dp, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_8021q_xmit(skb, netdev, sja1105_xmit_tpid(dp),</div><div class='add'>+			     ((pcp &lt;&lt; VLAN_PRIO_SHIFT) | tx_vid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1110_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *clone = SJA1105_SKB_CB(skb)-&gt;clone;</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);</div><div class='add'>+	u16 tx_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	__be32 *tx_trailer;</div><div class='add'>+	__be16 *tx_header;</div><div class='add'>+	int trailer_pos;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;offload_fwd_mark)</div><div class='add'>+		return sja1105_imprecise_xmit(skb, netdev);</div><div class='add'>+</div><div class='add'>+	/* Transmitting control packets is done using in-band control</div><div class='add'>+	 * extensions, while data packets are transmitted using</div><div class='add'>+	 * tag_8021q TX VLANs.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(!sja1105_is_link_local(skb)))</div><div class='add'>+		return dsa_8021q_xmit(skb, netdev, sja1105_xmit_tpid(dp),</div><div class='add'>+				     ((pcp &lt;&lt; VLAN_PRIO_SHIFT) | tx_vid));</div><div class='add'>+</div><div class='add'>+	skb = sja1105_pvid_tag_control_pkt(dp, skb, pcp);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, SJA1110_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_alloc_etype_header(skb, SJA1110_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	trailer_pos = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	tx_header = dsa_etype_header_pos_tx(skb);</div><div class='add'>+	tx_trailer = skb_put(skb, SJA1110_TX_TRAILER_LEN);</div><div class='add'>+</div><div class='add'>+	tx_header[0] = htons(ETH_P_SJA1110);</div><div class='add'>+	tx_header[1] = htons(SJA1110_HEADER_HOST_TO_SWITCH |</div><div class='add'>+			     SJA1110_TX_HEADER_HAS_TRAILER |</div><div class='add'>+			     SJA1110_TX_HEADER_TRAILER_POS(trailer_pos));</div><div class='add'>+	*tx_trailer = cpu_to_be32(SJA1110_TX_TRAILER_PRIO(pcp) |</div><div class='add'>+				  SJA1110_TX_TRAILER_SWITCHID(dp-&gt;ds-&gt;index) |</div><div class='add'>+				  SJA1110_TX_TRAILER_DESTPORTS(BIT(dp-&gt;index)));</div><div class='add'>+	if (clone) {</div><div class='add'>+		u8 ts_id = SJA1105_SKB_CB(clone)-&gt;ts_id;</div><div class='add'>+</div><div class='add'>+		tx_header[1] |= htons(SJA1110_TX_HEADER_TAKE_TS);</div><div class='add'>+		*tx_trailer |= cpu_to_be32(SJA1110_TX_TRAILER_TSTAMP_ID(ts_id));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_transfer_meta(struct sk_buff *skb,</div><div class='add'>+				  const struct sja1105_meta *meta)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *hdr = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;h_dest[3] = meta-&gt;dmac_byte_3;</div><div class='add'>+	hdr-&gt;h_dest[4] = meta-&gt;dmac_byte_4;</div><div class='add'>+	SJA1105_SKB_CB(skb)-&gt;tstamp = meta-&gt;tstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is a simple state machine which follows the hardware mechanism of</div><div class='add'>+ * generating RX timestamps:</div><div class='add'>+ *</div><div class='add'>+ * After each timestampable skb (all traffic for which send_meta1 and</div><div class='add'>+ * send_meta0 is true, aka all MAC-filtered link-local traffic) a meta frame</div><div class='add'>+ * containing a partial timestamp is immediately generated by the switch and</div><div class='add'>+ * sent as a follow-up to the link-local frame on the CPU port.</div><div class='add'>+ *</div><div class='add'>+ * The meta frames have no unique identifier (such as sequence number) by which</div><div class='add'>+ * one may pair them to the correct timestampable frame.</div><div class='add'>+ * Instead, the switch has internal logic that ensures no frames are sent on</div><div class='add'>+ * the CPU port between a link-local timestampable frame and its corresponding</div><div class='add'>+ * meta follow-up. It also ensures strict ordering between ports (lower ports</div><div class='add'>+ * have higher priority towards the CPU port). For this reason, a per-port</div><div class='add'>+ * data structure is not needed/desirable.</div><div class='add'>+ *</div><div class='add'>+ * This function pairs the link-local frame with its partial timestamp from the</div><div class='add'>+ * meta follow-up frame. The full timestamp will be reconstructed later in a</div><div class='add'>+ * work queue.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff</div><div class='add'>+*sja1105_rcv_meta_state_machine(struct sk_buff *skb,</div><div class='add'>+				struct sja1105_meta *meta,</div><div class='add'>+				bool is_link_local,</div><div class='add'>+				bool is_meta)</div><div class='add'>+{</div><div class='add'>+	/* Step 1: A timestampable frame was received.</div><div class='add'>+	 * Buffer it until we get its meta frame.</div><div class='add'>+	 */</div><div class='add'>+	if (is_link_local) {</div><div class='add'>+		struct dsa_port *dp = dsa_user_to_port(skb-&gt;dev);</div><div class='add'>+		struct sja1105_tagger_private *priv;</div><div class='add'>+		struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+		priv = sja1105_tagger_private(ds);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;priv-&gt;meta_lock);</div><div class='add'>+		/* Was this a link-local frame instead of the meta</div><div class='add'>+		 * that we were expecting?</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;stampable_skb) {</div><div class='add'>+			dev_err_ratelimited(ds-&gt;dev,</div><div class='add'>+					    "Expected meta frame, is %12llx "</div><div class='add'>+					    "in the DSA conduit multicast filter?\n",</div><div class='add'>+					    SJA1105_META_DMAC);</div><div class='add'>+			kfree_skb(priv-&gt;stampable_skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Hold a reference to avoid dsa_switch_rcv</div><div class='add'>+		 * from freeing the skb.</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;stampable_skb = skb_get(skb);</div><div class='add'>+		spin_unlock(&amp;priv-&gt;meta_lock);</div><div class='add'>+</div><div class='add'>+		/* Tell DSA we got nothing */</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Step 2: The meta frame arrived.</div><div class='add'>+	 * Time to take the stampable skb out of the closet, annotate it</div><div class='add'>+	 * with the partial timestamp, and pretend that we received it</div><div class='add'>+	 * just now (basically masquerade the buffered frame as the meta</div><div class='add'>+	 * frame, which serves no further purpose).</div><div class='add'>+	 */</div><div class='add'>+	} else if (is_meta) {</div><div class='add'>+		struct dsa_port *dp = dsa_user_to_port(skb-&gt;dev);</div><div class='add'>+		struct sja1105_tagger_private *priv;</div><div class='add'>+		struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+		struct sk_buff *stampable_skb;</div><div class='add'>+</div><div class='add'>+		priv = sja1105_tagger_private(ds);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;priv-&gt;meta_lock);</div><div class='add'>+</div><div class='add'>+		stampable_skb = priv-&gt;stampable_skb;</div><div class='add'>+		priv-&gt;stampable_skb = NULL;</div><div class='add'>+</div><div class='add'>+		/* Was this a meta frame instead of the link-local</div><div class='add'>+		 * that we were expecting?</div><div class='add'>+		 */</div><div class='add'>+		if (!stampable_skb) {</div><div class='add'>+			dev_err_ratelimited(ds-&gt;dev,</div><div class='add'>+					    "Unexpected meta frame\n");</div><div class='add'>+			spin_unlock(&amp;priv-&gt;meta_lock);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (stampable_skb-&gt;dev != skb-&gt;dev) {</div><div class='add'>+			dev_err_ratelimited(ds-&gt;dev,</div><div class='add'>+					    "Meta frame on wrong port\n");</div><div class='add'>+			spin_unlock(&amp;priv-&gt;meta_lock);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Free the meta frame and give DSA the buffered stampable_skb</div><div class='add'>+		 * for further processing up the network stack.</div><div class='add'>+		 */</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		skb = stampable_skb;</div><div class='add'>+		sja1105_transfer_meta(skb, meta);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;priv-&gt;meta_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sja1105_skb_has_tag_8021q(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u16 tpid = ntohs(eth_hdr(skb)-&gt;h_proto);</div><div class='add'>+</div><div class='add'>+	return tpid == ETH_P_SJA1105 || tpid == ETH_P_8021Q ||</div><div class='add'>+	       skb_vlan_tag_present(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sja1110_skb_has_inband_control_extension(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return ntohs(eth_hdr(skb)-&gt;h_proto) == ETH_P_SJA1110;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1105_rcv(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int source_port = -1, switch_id = -1, vbid = -1, vid = -1;</div><div class='add'>+	struct sja1105_meta meta = {0};</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+	bool is_link_local;</div><div class='add'>+	bool is_meta;</div><div class='add'>+</div><div class='add'>+	hdr = eth_hdr(skb);</div><div class='add'>+	is_link_local = sja1105_is_link_local(skb);</div><div class='add'>+	is_meta = sja1105_is_meta_frame(skb);</div><div class='add'>+</div><div class='add'>+	if (is_link_local) {</div><div class='add'>+		/* Management traffic path. Switch embeds the switch ID and</div><div class='add'>+		 * port ID into bytes of the destination MAC, courtesy of</div><div class='add'>+		 * the incl_srcpt options.</div><div class='add'>+		 */</div><div class='add'>+		source_port = hdr-&gt;h_dest[3];</div><div class='add'>+		switch_id = hdr-&gt;h_dest[4];</div><div class='add'>+	} else if (is_meta) {</div><div class='add'>+		sja1105_meta_unpack(skb, &amp;meta);</div><div class='add'>+		source_port = meta.source_port;</div><div class='add'>+		switch_id = meta.switch_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Normal data plane traffic and link-local frames are tagged with</div><div class='add'>+	 * a tag_8021q VLAN which we have to strip</div><div class='add'>+	 */</div><div class='add'>+	if (sja1105_skb_has_tag_8021q(skb))</div><div class='add'>+		dsa_8021q_rcv(skb, &amp;source_port, &amp;switch_id, &amp;vbid, &amp;vid);</div><div class='add'>+	else if (source_port == -1 &amp;&amp; switch_id == -1)</div><div class='add'>+		/* Packets with no source information have no chance of</div><div class='add'>+		 * getting accepted, drop them straight away.</div><div class='add'>+		 */</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_tag_8021q_find_user(netdev, source_port, switch_id,</div><div class='add'>+					   vid, vbid);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		netdev_warn(netdev, "Couldn't decode source port\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_link_local)</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return sja1105_rcv_meta_state_machine(skb, &amp;meta, is_link_local,</div><div class='add'>+					      is_meta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1110_rcv_meta(struct sk_buff *skb, u16 rx_header)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = dsa_etype_header_pos_rx(skb) + SJA1110_HEADER_LEN;</div><div class='add'>+	int switch_id = SJA1110_RX_HEADER_SWITCH_ID(rx_header);</div><div class='add'>+	int n_ts = SJA1110_RX_HEADER_N_TS(rx_header);</div><div class='add'>+	struct sja1105_tagger_data *tagger_data;</div><div class='add'>+	struct net_device *conduit = skb-&gt;dev;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	ds = dsa_switch_find(cpu_dp-&gt;dst-&gt;index, switch_id);</div><div class='add'>+	if (!ds) {</div><div class='add'>+		net_err_ratelimited("%s: cannot find switch id %d\n",</div><div class='add'>+				    conduit-&gt;name, switch_id);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tagger_data = sja1105_tagger_data(ds);</div><div class='add'>+	if (!tagger_data-&gt;meta_tstamp_handler)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= n_ts; i++) {</div><div class='add'>+		u8 ts_id, source_port, dir;</div><div class='add'>+		u64 tstamp;</div><div class='add'>+</div><div class='add'>+		ts_id = buf[0];</div><div class='add'>+		source_port = (buf[1] &amp; GENMASK(7, 4)) &gt;&gt; 4;</div><div class='add'>+		dir = (buf[1] &amp; BIT(3)) &gt;&gt; 3;</div><div class='add'>+		tstamp = be64_to_cpu(*(__be64 *)(buf + 2));</div><div class='add'>+</div><div class='add'>+		tagger_data-&gt;meta_tstamp_handler(ds, source_port, ts_id, dir,</div><div class='add'>+						 tstamp);</div><div class='add'>+</div><div class='add'>+		buf += SJA1110_META_TSTAMP_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard the meta frame, we've consumed the timestamps it contained */</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1110_rcv_inband_control_extension(struct sk_buff *skb,</div><div class='add'>+							    int *source_port,</div><div class='add'>+							    int *switch_id,</div><div class='add'>+							    bool *host_only)</div><div class='add'>+{</div><div class='add'>+	u16 rx_header;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, SJA1110_HEADER_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* skb-&gt;data points to skb_mac_header(skb) + ETH_HLEN, which is exactly</div><div class='add'>+	 * what we need because the caller has checked the EtherType (which is</div><div class='add'>+	 * located 2 bytes back) and we just need a pointer to the header that</div><div class='add'>+	 * comes afterwards.</div><div class='add'>+	 */</div><div class='add'>+	rx_header = ntohs(*(__be16 *)skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (rx_header &amp; SJA1110_RX_HEADER_HOST_ONLY)</div><div class='add'>+		*host_only = true;</div><div class='add'>+</div><div class='add'>+	if (rx_header &amp; SJA1110_RX_HEADER_IS_METADATA)</div><div class='add'>+		return sja1110_rcv_meta(skb, rx_header);</div><div class='add'>+</div><div class='add'>+	/* Timestamp frame, we have a trailer */</div><div class='add'>+	if (rx_header &amp; SJA1110_RX_HEADER_HAS_TRAILER) {</div><div class='add'>+		int start_of_padding = SJA1110_RX_HEADER_TRAILER_POS(rx_header);</div><div class='add'>+		u8 *rx_trailer = skb_tail_pointer(skb) - SJA1110_RX_TRAILER_LEN;</div><div class='add'>+		u64 *tstamp = &amp;SJA1105_SKB_CB(skb)-&gt;tstamp;</div><div class='add'>+		u8 last_byte = rx_trailer[12];</div><div class='add'>+</div><div class='add'>+		/* The timestamp is unaligned, so we need to use packing()</div><div class='add'>+		 * to get it</div><div class='add'>+		 */</div><div class='add'>+		packing(rx_trailer, tstamp, 63, 0, 8, UNPACK, 0);</div><div class='add'>+</div><div class='add'>+		*source_port = SJA1110_RX_TRAILER_SRC_PORT(last_byte);</div><div class='add'>+		*switch_id = SJA1110_RX_TRAILER_SWITCH_ID(last_byte);</div><div class='add'>+</div><div class='add'>+		/* skb-&gt;len counts from skb-&gt;data, while start_of_padding</div><div class='add'>+		 * counts from the destination MAC address. Right now skb-&gt;data</div><div class='add'>+		 * is still as set by the DSA conduit, so to trim away the</div><div class='add'>+		 * padding and trailer we need to account for the fact that</div><div class='add'>+		 * skb-&gt;data points to skb_mac_header(skb) + ETH_HLEN.</div><div class='add'>+		 */</div><div class='add'>+		if (pskb_trim_rcsum(skb, start_of_padding - ETH_HLEN))</div><div class='add'>+			return NULL;</div><div class='add'>+	/* Trap-to-host frame, no timestamp trailer */</div><div class='add'>+	} else {</div><div class='add'>+		*source_port = SJA1110_RX_HEADER_SRC_PORT(rx_header);</div><div class='add'>+		*switch_id = SJA1110_RX_HEADER_SWITCH_ID(rx_header);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Advance skb-&gt;data past the DSA header */</div><div class='add'>+	skb_pull_rcsum(skb, SJA1110_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	dsa_strip_etype_header(skb, SJA1110_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	/* With skb-&gt;data in its final place, update the MAC header</div><div class='add'>+	 * so that eth_hdr() continues to works properly.</div><div class='add'>+	 */</div><div class='add'>+	skb_set_mac_header(skb, -ETH_HLEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sja1110_rcv(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int source_port = -1, switch_id = -1, vbid = -1, vid = -1;</div><div class='add'>+	bool host_only = false;</div><div class='add'>+</div><div class='add'>+	if (sja1110_skb_has_inband_control_extension(skb)) {</div><div class='add'>+		skb = sja1110_rcv_inband_control_extension(skb, &amp;source_port,</div><div class='add'>+							   &amp;switch_id,</div><div class='add'>+							   &amp;host_only);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Packets with in-band control extensions might still have RX VLANs */</div><div class='add'>+	if (likely(sja1105_skb_has_tag_8021q(skb)))</div><div class='add'>+		dsa_8021q_rcv(skb, &amp;source_port, &amp;switch_id, &amp;vbid, &amp;vid);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_tag_8021q_find_user(netdev, source_port, switch_id,</div><div class='add'>+					   vid, vbid);</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		netdev_warn(netdev, "Couldn't decode source port\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!host_only)</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_flow_dissect(const struct sk_buff *skb, __be16 *proto,</div><div class='add'>+				 int *offset)</div><div class='add'>+{</div><div class='add'>+	/* No tag added for management frames, all ok */</div><div class='add'>+	if (unlikely(sja1105_is_link_local(skb)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_tag_generic_flow_dissect(skb, proto, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1110_flow_dissect(const struct sk_buff *skb, __be16 *proto,</div><div class='add'>+				 int *offset)</div><div class='add'>+{</div><div class='add'>+	/* Management frames have 2 DSA tags on RX, so the needed_headroom we</div><div class='add'>+	 * declared is fine for the generic dissector adjustment procedure.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(sja1105_is_link_local(skb)))</div><div class='add'>+		return dsa_tag_generic_flow_dissect(skb, proto, offset);</div><div class='add'>+</div><div class='add'>+	/* For the rest, there is a single DSA tag, the tag_8021q one */</div><div class='add'>+	*offset = VLAN_HLEN;</div><div class='add'>+	*proto = ((__be16 *)skb-&gt;data)[(VLAN_HLEN / 2) - 1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_disconnect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tagger_private *priv = ds-&gt;tagger_data;</div><div class='add'>+</div><div class='add'>+	kthread_destroy_worker(priv-&gt;xmit_worker);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	ds-&gt;tagger_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_connect(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tagger_private *priv;</div><div class='add'>+	struct kthread_worker *xmit_worker;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;meta_lock);</div><div class='add'>+</div><div class='add'>+	xmit_worker = kthread_run_worker(0, "dsa%d:%d_xmit",</div><div class='add'>+					    ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='add'>+	if (IS_ERR(xmit_worker)) {</div><div class='add'>+		err = PTR_ERR(xmit_worker);</div><div class='add'>+		kfree(priv);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;xmit_worker = xmit_worker;</div><div class='add'>+	ds-&gt;tagger_data = priv;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops sja1105_netdev_ops = {</div><div class='add'>+	.name = SJA1105_NAME,</div><div class='add'>+	.proto = DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.xmit = sja1105_xmit,</div><div class='add'>+	.rcv = sja1105_rcv,</div><div class='add'>+	.connect = sja1105_connect,</div><div class='add'>+	.disconnect = sja1105_disconnect,</div><div class='add'>+	.needed_headroom = VLAN_HLEN,</div><div class='add'>+	.flow_dissect = sja1105_flow_dissect,</div><div class='add'>+	.promisc_on_conduit = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(sja1105_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_SJA1105, SJA1105_NAME);</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops sja1110_netdev_ops = {</div><div class='add'>+	.name = SJA1110_NAME,</div><div class='add'>+	.proto = DSA_TAG_PROTO_SJA1110,</div><div class='add'>+	.xmit = sja1110_xmit,</div><div class='add'>+	.rcv = sja1110_rcv,</div><div class='add'>+	.connect = sja1105_connect,</div><div class='add'>+	.disconnect = sja1105_disconnect,</div><div class='add'>+	.flow_dissect = sja1110_flow_dissect,</div><div class='add'>+	.needed_headroom = SJA1110_HEADER_LEN + VLAN_HLEN,</div><div class='add'>+	.needed_tailroom = SJA1110_RX_TRAILER_LEN + SJA1110_MAX_PADDING_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DSA_TAG_DRIVER(sja1110_netdev_ops);</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_SJA1110, SJA1110_NAME);</div><div class='add'>+</div><div class='add'>+static struct dsa_tag_driver *sja1105_tag_driver_array[] = {</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(sja1105_netdev_ops),</div><div class='add'>+	&amp;DSA_TAG_DRIVER_NAME(sja1110_netdev_ops),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_dsa_tag_drivers(sja1105_tag_driver_array);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for NXP SJA1105 switches");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c<br/>index 56197f0d9608..4dce24cfe6a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_trailer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/dsa/tag_trailer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_trailer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_trailer.c</a></div><div class='hunk'>@@ -1,62 +1,31 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * net/dsa/tag_trailer.c - Trailer tag format handling</div><div class='ctx'>  * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define TRAILER_NAME "trailer"</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_port *dp = dsa_slave_to_port(dev);</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	int padlen;</div><div class='ctx'> 	u8 *trailer;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We have to make sure that the trailer ends up as the very</div><div class='del'>-	 * last 4 bytes of the packet.  This means that we have to pad</div><div class='del'>-	 * the packet to the minimum ethernet frame size, if necessary,</div><div class='del'>-	 * before adding the trailer.</div><div class='del'>-	 */</div><div class='del'>-	padlen = 0;</div><div class='del'>-	if (skb-&gt;len &lt; 60)</div><div class='del'>-		padlen = 60 - skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	nskb = alloc_skb(NET_IP_ALIGN + skb-&gt;len + padlen + 4, GFP_ATOMIC);</div><div class='del'>-	if (!nskb)</div><div class='del'>-		return NULL;</div><div class='del'>-	skb_reserve(nskb, NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_header(nskb);</div><div class='del'>-	skb_set_network_header(nskb, skb_network_header(skb) - skb-&gt;head);</div><div class='del'>-	skb_set_transport_header(nskb, skb_transport_header(skb) - skb-&gt;head);</div><div class='del'>-	skb_copy_and_csum_dev(skb, skb_put(nskb, skb-&gt;len));</div><div class='del'>-	consume_skb(skb);</div><div class='del'>-</div><div class='del'>-	if (padlen) {</div><div class='del'>-		skb_put_zero(nskb, padlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trailer = skb_put(nskb, 4);</div><div class='add'>+	trailer = skb_put(skb, 4);</div><div class='ctx'> 	trailer[0] = 0x80;</div><div class='del'>-	trailer[1] = 1 &lt;&lt; dp-&gt;index;</div><div class='add'>+	trailer[1] = dsa_xmit_port_mask(skb, dev);</div><div class='ctx'> 	trailer[2] = 0x10;</div><div class='ctx'> 	trailer[3] = 0x00;</div><div class='ctx'> </div><div class='del'>-	return nskb;</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-				   struct packet_type *pt)</div><div class='add'>+static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *trailer;</div><div class='ctx'> 	int source_port;</div><div class='hunk'>@@ -71,7 +40,7 @@ static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	source_port = trailer[1] &amp; 7;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dsa_master_find_slave(dev, 0, source_port);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, source_port);</div><div class='ctx'> 	if (!skb-&gt;dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +50,16 @@ static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct dsa_device_ops trailer_netdev_ops = {</div><div class='add'>+static const struct dsa_device_ops trailer_netdev_ops = {</div><div class='add'>+	.name	= TRAILER_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_TRAILER,</div><div class='ctx'> 	.xmit	= trailer_xmit,</div><div class='ctx'> 	.rcv	= trailer_rcv,</div><div class='add'>+	.needed_tailroom = 4,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for switches using a trailer tag");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_TRAILER, TRAILER_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(trailer_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_vsc73xx_8021q.c b/net/dsa/tag_vsc73xx_8021q.c<br/>new file mode 100644<br/>index 000000000000..af121a9aff7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_vsc73xx_8021q.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_vsc73xx_8021q.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR MIT</div><div class='add'>+/* Copyright (C) 2024 Pawel Dembicki &lt;paweldembicki@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "tag_8021q.h"</div><div class='add'>+</div><div class='add'>+#define VSC73XX_8021Q_NAME "vsc73xx-8021q"</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+vsc73xx_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(netdev);</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u16 tx_vid = dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+	u8 pcp;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;offload_fwd_mark) {</div><div class='add'>+		unsigned int bridge_num = dsa_port_bridge_num_get(dp);</div><div class='add'>+		struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+		if (br_vlan_enabled(br))</div><div class='add'>+			return skb;</div><div class='add'>+</div><div class='add'>+		tx_vid = dsa_tag_8021q_bridge_vid(bridge_num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pcp = netdev_txq_to_tc(netdev, queue_mapping);</div><div class='add'>+</div><div class='add'>+	return dsa_8021q_xmit(skb, netdev, ETH_P_8021Q,</div><div class='add'>+			      ((pcp &lt;&lt; VLAN_PRIO_SHIFT) | tx_vid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+vsc73xx_rcv(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int src_port = -1, switch_id = -1, vbid = -1, vid = -1;</div><div class='add'>+</div><div class='add'>+	dsa_8021q_rcv(skb, &amp;src_port, &amp;switch_id, &amp;vbid, &amp;vid);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_tag_8021q_find_user(netdev, src_port, switch_id,</div><div class='add'>+					   vid, vbid);</div><div class='add'>+	if (!skb-&gt;dev) {</div><div class='add'>+		dev_warn_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				     "Couldn't decode source port\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops vsc73xx_8021q_netdev_ops = {</div><div class='add'>+	.name			= VSC73XX_8021Q_NAME,</div><div class='add'>+	.proto			= DSA_TAG_PROTO_VSC73XX_8021Q,</div><div class='add'>+	.xmit			= vsc73xx_xmit,</div><div class='add'>+	.rcv			= vsc73xx_rcv,</div><div class='add'>+	.needed_headroom	= VLAN_HLEN,</div><div class='add'>+	.promisc_on_conduit	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for VSC73XX family of switches, using VLAN");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_VSC73XX_8021Q, VSC73XX_8021Q_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(vsc73xx_8021q_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_xrs700x.c b/net/dsa/tag_xrs700x.c<br/>new file mode 100644<br/>index 000000000000..a05219f702c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_xrs700x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_xrs700x.c</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * XRS700x tag format handling</div><div class='add'>+ * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='add'>+ * Copyright (c) 2020 NovaTech LLC</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define XRS700X_NAME "xrs700x"</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xrs700x_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *trailer;</div><div class='add'>+</div><div class='add'>+	trailer = skb_put(skb, 1);</div><div class='add'>+	trailer[0] = dsa_xmit_port_mask(skb, dev);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xrs700x_rcv(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int source_port;</div><div class='add'>+	u8 *trailer;</div><div class='add'>+</div><div class='add'>+	trailer = skb_tail_pointer(skb) - 1;</div><div class='add'>+</div><div class='add'>+	source_port = ffs((int)trailer[0]) - 1;</div><div class='add'>+</div><div class='add'>+	if (source_port &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(dev, 0, source_port);</div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim_rcsum(skb, skb-&gt;len - 1))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Frame is forwarded by hardware, don't forward in software. */</div><div class='add'>+	dsa_default_offload_fwd_mark(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops xrs700x_netdev_ops = {</div><div class='add'>+	.name	= XRS700X_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_XRS700X,</div><div class='add'>+	.xmit	= xrs700x_xmit,</div><div class='add'>+	.rcv	= xrs700x_rcv,</div><div class='add'>+	.needed_tailroom = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for XRS700x switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_XRS700X, XRS700X_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(xrs700x_netdev_ops);</div><div class='head'>diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c<br/>new file mode 100644<br/>index 000000000000..6bbfd42dc5df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/tag_yt921x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/tag_yt921x.c</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Motorcomm YT921x Switch Extended CPU Port Tagging</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025 David Yang &lt;mmyangfl@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * +----+----+-------+-----+----+---------</div><div class='add'>+ * | DA | SA | TagET | Tag | ET | Payload ...</div><div class='add'>+ * +----+----+-------+-----+----+---------</div><div class='add'>+ *   6    6      2      6    2       N</div><div class='add'>+ *</div><div class='add'>+ * Tag Ethertype: CPU_TAG_TPID_TPID (default: ETH_P_YT921X = 0x9988)</div><div class='add'>+ *   * Hardcoded for the moment, but still configurable. Discuss it if there</div><div class='add'>+ *     are conflicts somewhere and/or you want to change it for some reason.</div><div class='add'>+ * Tag:</div><div class='add'>+ *   2: VLAN Tag</div><div class='add'>+ *   2: Rx Port</div><div class='add'>+ *     15b: Rx Port Valid</div><div class='add'>+ *     14b-11b: Rx Port</div><div class='add'>+ *     10b-0b: Cmd?</div><div class='add'>+ *   2: Tx Port(s)</div><div class='add'>+ *     15b: Tx Port(s) Valid</div><div class='add'>+ *     10b-0b: Tx Port(s) Mask</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tag.h"</div><div class='add'>+</div><div class='add'>+#define YT921X_TAG_NAME	"yt921x"</div><div class='add'>+</div><div class='add'>+#define YT921X_TAG_LEN	8</div><div class='add'>+</div><div class='add'>+#define YT921X_TAG_PORT_EN		BIT(15)</div><div class='add'>+#define YT921X_TAG_RX_PORT_M		GENMASK(14, 11)</div><div class='add'>+#define YT921X_TAG_RX_CMD_M		GENMASK(10, 0)</div><div class='add'>+#define  YT921X_TAG_RX_CMD(x)			FIELD_PREP(YT921X_TAG_RX_CMD_M, (x))</div><div class='add'>+#define  YT921X_TAG_RX_CMD_FORWARDED		0x80</div><div class='add'>+#define  YT921X_TAG_RX_CMD_UNK_UCAST		0xb2</div><div class='add'>+#define  YT921X_TAG_RX_CMD_UNK_MCAST		0xb4</div><div class='add'>+#define YT921X_TAG_TX_PORTS		GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+yt921x_tag_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	__be16 *tag;</div><div class='add'>+	u16 tx;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, YT921X_TAG_LEN);</div><div class='add'>+	dsa_alloc_etype_header(skb, YT921X_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	tag = dsa_etype_header_pos_tx(skb);</div><div class='add'>+</div><div class='add'>+	tag[0] = htons(ETH_P_YT921X);</div><div class='add'>+	/* VLAN tag unrelated when TX */</div><div class='add'>+	tag[1] = 0;</div><div class='add'>+	tag[2] = 0;</div><div class='add'>+	tx = FIELD_PREP(YT921X_TAG_TX_PORTS, dsa_xmit_port_mask(skb, netdev)) |</div><div class='add'>+	     YT921X_TAG_PORT_EN;</div><div class='add'>+	tag[3] = htons(tx);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+yt921x_tag_rcv(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	unsigned int port;</div><div class='add'>+	__be16 *tag;</div><div class='add'>+	u16 cmd;</div><div class='add'>+	u16 rx;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pskb_may_pull(skb, YT921X_TAG_LEN)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	tag = dsa_etype_header_pos_rx(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(tag[0] != htons(ETH_P_YT921X))) {</div><div class='add'>+		dev_warn_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				     "Unexpected EtherType 0x%04x\n",</div><div class='add'>+				     ntohs(tag[0]));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Locate which port this is coming from */</div><div class='add'>+	rx = ntohs(tag[2]);</div><div class='add'>+	if (unlikely((rx &amp; YT921X_TAG_PORT_EN) == 0)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				     "Unexpected rx tag 0x%04x\n", rx);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port = FIELD_GET(YT921X_TAG_RX_PORT_M, rx);</div><div class='add'>+	skb-&gt;dev = dsa_conduit_find_user(netdev, 0, port);</div><div class='add'>+	if (unlikely(!skb-&gt;dev)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				     "Couldn't decode source port %u\n", port);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd = FIELD_GET(YT921X_TAG_RX_CMD_M, rx);</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case YT921X_TAG_RX_CMD_FORWARDED:</div><div class='add'>+		/* Already forwarded by hardware */</div><div class='add'>+		dsa_default_offload_fwd_mark(skb);</div><div class='add'>+		break;</div><div class='add'>+	case YT921X_TAG_RX_CMD_UNK_UCAST:</div><div class='add'>+	case YT921X_TAG_RX_CMD_UNK_MCAST:</div><div class='add'>+		/* NOTE: hardware doesn't distinguish between TRAP (copy to CPU</div><div class='add'>+		 * only) and COPY (forward and copy to CPU). In order to perform</div><div class='add'>+		 * a soft switch, NEVER use COPY action in the switch driver.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_warn_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				     "Unexpected rx cmd 0x%02x\n", cmd);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove YT921x tag and update checksum */</div><div class='add'>+	skb_pull_rcsum(skb, YT921X_TAG_LEN);</div><div class='add'>+	dsa_strip_etype_header(skb, YT921X_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_device_ops yt921x_netdev_ops = {</div><div class='add'>+	.name	= YT921X_TAG_NAME,</div><div class='add'>+	.proto	= DSA_TAG_PROTO_YT921X,</div><div class='add'>+	.xmit	= yt921x_tag_xmit,</div><div class='add'>+	.rcv	= yt921x_tag_rcv,</div><div class='add'>+	.needed_headroom = YT921X_TAG_LEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DSA tag driver for Motorcomm YT921x switches");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_YT921X, YT921X_TAG_NAME);</div><div class='add'>+</div><div class='add'>+module_dsa_tag_driver(yt921x_netdev_ops);</div><div class='head'>diff --git a/net/dsa/trace.c b/net/dsa/trace.c<br/>new file mode 100644<br/>index 000000000000..1b107165d331<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/trace.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Copyright 2022-2023 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+void dsa_db_print(const struct dsa_db *db, char buf[DSA_DB_BUFSIZ])</div><div class='add'>+{</div><div class='add'>+	switch (db-&gt;type) {</div><div class='add'>+	case DSA_DB_PORT:</div><div class='add'>+		sprintf(buf, "port %s", db-&gt;dp-&gt;name);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_DB_LAG:</div><div class='add'>+		sprintf(buf, "lag %s id %d", db-&gt;lag.dev-&gt;name, db-&gt;lag.id);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_DB_BRIDGE:</div><div class='add'>+		sprintf(buf, "bridge %s num %d", db-&gt;bridge.dev-&gt;name,</div><div class='add'>+			db-&gt;bridge.num);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		sprintf(buf, "unknown");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *dsa_port_kind(const struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	switch (dp-&gt;type) {</div><div class='add'>+	case DSA_PORT_TYPE_USER:</div><div class='add'>+		return "user";</div><div class='add'>+	case DSA_PORT_TYPE_CPU:</div><div class='add'>+		return "cpu";</div><div class='add'>+	case DSA_PORT_TYPE_DSA:</div><div class='add'>+		return "dsa";</div><div class='add'>+	default:</div><div class='add'>+		return "unused";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/net/dsa/trace.h b/net/dsa/trace.h<br/>new file mode 100644<br/>index 000000000000..83f3e5f78491<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/trace.h</a></div><div class='hunk'>@@ -0,0 +1,447 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ * Copyright 2022-2023 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM	dsa</div><div class='add'>+</div><div class='add'>+#if !defined(_NET_DSA_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _NET_DSA_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+/* Enough to fit "bridge %s num %d" where num has 3 digits */</div><div class='add'>+#define DSA_DB_BUFSIZ	(IFNAMSIZ + 16)</div><div class='add'>+</div><div class='add'>+void dsa_db_print(const struct dsa_db *db, char buf[DSA_DB_BUFSIZ]);</div><div class='add'>+const char *dsa_port_kind(const struct dsa_port *dp);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(dsa_port_addr_op_hw,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp, const unsigned char *addr, u16 vid,</div><div class='add'>+		 const struct dsa_db *db, int err),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, addr, vid, db, err),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(int, err)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;err = err;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d addr %pM vid %u db \"%s\" err %d",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port, __entry-&gt;addr,</div><div class='add'>+		  __entry-&gt;vid, __entry-&gt;db_buf, __entry-&gt;err)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/* Add unicast/multicast address to hardware, either on user ports</div><div class='add'>+ * (where no refcounting is kept), or on shared ports when the entry</div><div class='add'>+ * is first seen and its refcount is 1.</div><div class='add'>+ */</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_hw, dsa_fdb_add_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, err));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_hw, dsa_mdb_add_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, err));</div><div class='add'>+</div><div class='add'>+/* Delete unicast/multicast address from hardware, either on user ports or</div><div class='add'>+ * when the refcount on shared ports reaches 0</div><div class='add'>+ */</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_hw, dsa_fdb_del_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, err));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_hw, dsa_mdb_del_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, err));</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(dsa_port_addr_op_refcount,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp, const unsigned char *addr, u16 vid,</div><div class='add'>+		 const struct dsa_db *db, const refcount_t *refcount),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, addr, vid, db, refcount),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(unsigned int, refcount)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;refcount = refcount_read(refcount);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d addr %pM vid %u db \"%s\" refcount %u",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port, __entry-&gt;addr,</div><div class='add'>+		  __entry-&gt;vid, __entry-&gt;db_buf, __entry-&gt;refcount)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/* Bump the refcount of an existing unicast/multicast address on shared ports */</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_refcount, dsa_fdb_add_bump,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, refcount));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_refcount, dsa_mdb_add_bump,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, refcount));</div><div class='add'>+</div><div class='add'>+/* Drop the refcount of a multicast address that we still keep on</div><div class='add'>+ * shared ports</div><div class='add'>+ */</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_refcount, dsa_fdb_del_drop,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, refcount));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_op_refcount, dsa_mdb_del_drop,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db, refcount));</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(dsa_port_addr_del_not_found,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp, const unsigned char *addr, u16 vid,</div><div class='add'>+		 const struct dsa_db *db),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, addr, vid, db),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d addr %pM vid %u db \"%s\"",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port,</div><div class='add'>+		  __entry-&gt;addr, __entry-&gt;vid, __entry-&gt;db_buf)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/* Attempt to delete a unicast/multicast address on shared ports for which</div><div class='add'>+ * the delete operation was called more times than the addition</div><div class='add'>+ */</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_del_not_found, dsa_fdb_del_not_found,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_port_addr_del_not_found, dsa_mdb_del_not_found,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp, const unsigned char *addr,</div><div class='add'>+		      u16 vid, const struct dsa_db *db),</div><div class='add'>+	     TP_ARGS(dp, addr, vid, db));</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_lag_fdb_add_hw,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct net_device *lag_dev, const unsigned char *addr,</div><div class='add'>+		 u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(lag_dev, addr, vid, db, err),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, lag_dev-&gt;name)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(int, err)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;err = err;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s addr %pM vid %u db \"%s\" err %d",</div><div class='add'>+		  __get_str(dev), __entry-&gt;addr, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;db_buf, __entry-&gt;err)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_lag_fdb_add_bump,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct net_device *lag_dev, const unsigned char *addr,</div><div class='add'>+		 u16 vid, const struct dsa_db *db, const refcount_t *refcount),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(lag_dev, addr, vid, db, refcount),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, lag_dev-&gt;name)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(unsigned int, refcount)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;refcount = refcount_read(refcount);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s addr %pM vid %u db \"%s\" refcount %u",</div><div class='add'>+		  __get_str(dev), __entry-&gt;addr, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;db_buf, __entry-&gt;refcount)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_lag_fdb_del_hw,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct net_device *lag_dev, const unsigned char *addr,</div><div class='add'>+		 u16 vid, const struct dsa_db *db, int err),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(lag_dev, addr, vid, db, err),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, lag_dev-&gt;name)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(int, err)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;err = err;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s addr %pM vid %u db \"%s\" err %d",</div><div class='add'>+		  __get_str(dev), __entry-&gt;addr, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;db_buf, __entry-&gt;err)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_lag_fdb_del_drop,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct net_device *lag_dev, const unsigned char *addr,</div><div class='add'>+		 u16 vid, const struct dsa_db *db, const refcount_t *refcount),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(lag_dev, addr, vid, db, refcount),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, lag_dev-&gt;name)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+		__field(unsigned int, refcount)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+		__entry-&gt;refcount = refcount_read(refcount);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s addr %pM vid %u db \"%s\" refcount %u",</div><div class='add'>+		  __get_str(dev), __entry-&gt;addr, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;db_buf, __entry-&gt;refcount)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_lag_fdb_del_not_found,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct net_device *lag_dev, const unsigned char *addr,</div><div class='add'>+		 u16 vid, const struct dsa_db *db),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(lag_dev, addr, vid, db),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, lag_dev-&gt;name)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__array(char, db_buf, DSA_DB_BUFSIZ)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		ether_addr_copy(__entry-&gt;addr, addr);</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+		dsa_db_print(db, __entry-&gt;db_buf);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s addr %pM vid %u db \"%s\"",</div><div class='add'>+		  __get_str(dev), __entry-&gt;addr, __entry-&gt;vid, __entry-&gt;db_buf)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(dsa_vlan_op_hw,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		 const struct switchdev_obj_port_vlan *vlan, int err),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, vlan, err),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__field(u16, flags)</div><div class='add'>+		__field(bool, changed)</div><div class='add'>+		__field(int, err)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		__entry-&gt;vid = vlan-&gt;vid;</div><div class='add'>+		__entry-&gt;flags = vlan-&gt;flags;</div><div class='add'>+		__entry-&gt;changed = vlan-&gt;changed;</div><div class='add'>+		__entry-&gt;err = err;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d vid %u%s%s%s",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID ? " pvid" : "",</div><div class='add'>+		  __entry-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED ? " untagged" : "",</div><div class='add'>+		  __entry-&gt;changed ? " (changed)" : "")</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_vlan_op_hw, dsa_vlan_add_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan, int err),</div><div class='add'>+	     TP_ARGS(dp, vlan, err));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_vlan_op_hw, dsa_vlan_del_hw,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan, int err),</div><div class='add'>+	     TP_ARGS(dp, vlan, err));</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(dsa_vlan_op_refcount,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		 const refcount_t *refcount),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, vlan, refcount),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+		__field(u16, flags)</div><div class='add'>+		__field(bool, changed)</div><div class='add'>+		__field(unsigned int, refcount)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		__entry-&gt;vid = vlan-&gt;vid;</div><div class='add'>+		__entry-&gt;flags = vlan-&gt;flags;</div><div class='add'>+		__entry-&gt;changed = vlan-&gt;changed;</div><div class='add'>+		__entry-&gt;refcount = refcount_read(refcount);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d vid %u%s%s%s refcount %u",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port, __entry-&gt;vid,</div><div class='add'>+		  __entry-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID ? " pvid" : "",</div><div class='add'>+		  __entry-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED ? " untagged" : "",</div><div class='add'>+		  __entry-&gt;changed ? " (changed)" : "", __entry-&gt;refcount)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_vlan_op_refcount, dsa_vlan_add_bump,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, vlan, refcount));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(dsa_vlan_op_refcount, dsa_vlan_del_drop,</div><div class='add'>+	     TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		      const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		      const refcount_t *refcount),</div><div class='add'>+	     TP_ARGS(dp, vlan, refcount));</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(dsa_vlan_del_not_found,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct dsa_port *dp,</div><div class='add'>+		 const struct switchdev_obj_port_vlan *vlan),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dp, vlan),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(dev, dev_name(dp-&gt;ds-&gt;dev))</div><div class='add'>+		__string(kind, dsa_port_kind(dp))</div><div class='add'>+		__field(int, port)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__assign_str(kind);</div><div class='add'>+		__entry-&gt;port = dp-&gt;index;</div><div class='add'>+		__entry-&gt;vid = vlan-&gt;vid;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s port %d vid %u",</div><div class='add'>+		  __get_str(dev), __get_str(kind), __entry-&gt;port, __entry-&gt;vid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _NET_DSA_TRACE_H */</div><div class='add'>+</div><div class='add'>+/* We don't want to use include/trace/events */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE	trace</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/net/dsa/user.c b/net/dsa/user.c<br/>new file mode 100644<br/>index 000000000000..f59d66f0975d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/user.c</a></div><div class='hunk'>@@ -0,0 +1,3877 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * net/dsa/user.c - user device handling</div><div class='add'>+ * Copyright (c) 2008-2009 Marvell Semiconductor</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phy_fixed.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+#include &lt;net/selftests.h&gt;</div><div class='add'>+#include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='add'>+#include &lt;net/dcbnl.h&gt;</div><div class='add'>+#include &lt;linux/netpoll.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "conduit.h"</div><div class='add'>+#include "dsa.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "switch.h"</div><div class='add'>+#include "tag.h"</div><div class='add'>+#include "user.h"</div><div class='add'>+</div><div class='add'>+struct dsa_switchdev_event_work {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct net_device *orig_dev;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	unsigned long event;</div><div class='add'>+	/* Specific for SWITCHDEV_FDB_ADD_TO_DEVICE and</div><div class='add'>+	 * SWITCHDEV_FDB_DEL_TO_DEVICE</div><div class='add'>+	 */</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	u16 vid;</div><div class='add'>+	bool host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dsa_standalone_event {</div><div class='add'>+	DSA_UC_ADD,</div><div class='add'>+	DSA_UC_DEL,</div><div class='add'>+	DSA_MC_ADD,</div><div class='add'>+	DSA_MC_DEL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsa_standalone_event_work {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	enum dsa_standalone_event event;</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	u16 vid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsa_host_vlan_rx_filtering_ctx {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	const unsigned char *addr;</div><div class='add'>+	enum dsa_standalone_event event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool dsa_switch_supports_uc_filtering(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return ds-&gt;ops-&gt;port_fdb_add &amp;&amp; ds-&gt;ops-&gt;port_fdb_del &amp;&amp;</div><div class='add'>+	       ds-&gt;fdb_isolation &amp;&amp; !ds-&gt;vlan_filtering_is_global &amp;&amp;</div><div class='add'>+	       !ds-&gt;needs_standalone_vlan_filtering;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dsa_switch_supports_mc_filtering(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return ds-&gt;ops-&gt;port_mdb_add &amp;&amp; ds-&gt;ops-&gt;port_mdb_del &amp;&amp;</div><div class='add'>+	       ds-&gt;fdb_isolation &amp;&amp; !ds-&gt;vlan_filtering_is_global &amp;&amp;</div><div class='add'>+	       !ds-&gt;needs_standalone_vlan_filtering;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_standalone_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct dsa_standalone_event_work *standalone_work =</div><div class='add'>+		container_of(work, struct dsa_standalone_event_work, work);</div><div class='add'>+	const unsigned char *addr = standalone_work-&gt;addr;</div><div class='add'>+	struct net_device *dev = standalone_work-&gt;dev;</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_mdb mdb;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	u16 vid = standalone_work-&gt;vid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (standalone_work-&gt;event) {</div><div class='add'>+	case DSA_UC_ADD:</div><div class='add'>+		err = dsa_port_standalone_host_fdb_add(dp, addr, vid);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to add %pM vid %d to fdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DSA_UC_DEL:</div><div class='add'>+		err = dsa_port_standalone_host_fdb_del(dp, addr, vid);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to delete %pM vid %d from fdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case DSA_MC_ADD:</div><div class='add'>+		ether_addr_copy(mdb.addr, addr);</div><div class='add'>+		mdb.vid = vid;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_standalone_host_mdb_add(dp, &amp;mdb);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to add %pM vid %d to mdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case DSA_MC_DEL:</div><div class='add'>+		ether_addr_copy(mdb.addr, addr);</div><div class='add'>+		mdb.vid = vid;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_standalone_host_mdb_del(dp, &amp;mdb);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to delete %pM vid %d from mdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(standalone_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_schedule_standalone_work(struct net_device *dev,</div><div class='add'>+					     enum dsa_standalone_event event,</div><div class='add'>+					     const unsigned char *addr,</div><div class='add'>+					     u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_standalone_event_work *standalone_work;</div><div class='add'>+</div><div class='add'>+	standalone_work = kzalloc(sizeof(*standalone_work), GFP_ATOMIC);</div><div class='add'>+	if (!standalone_work)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;standalone_work-&gt;work, dsa_user_standalone_event_work);</div><div class='add'>+	standalone_work-&gt;event = event;</div><div class='add'>+	standalone_work-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(standalone_work-&gt;addr, addr);</div><div class='add'>+	standalone_work-&gt;vid = vid;</div><div class='add'>+</div><div class='add'>+	dsa_schedule_work(&amp;standalone_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_host_vlan_rx_filtering(void *arg, int vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_host_vlan_rx_filtering_ctx *ctx = arg;</div><div class='add'>+</div><div class='add'>+	return dsa_user_schedule_standalone_work(ctx-&gt;dev, ctx-&gt;event,</div><div class='add'>+						  ctx-&gt;addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_vlan_for_each(struct net_device *dev,</div><div class='add'>+				  int (*cb)(void *arg, int vid), void *arg)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;addr_list_lock);</div><div class='add'>+</div><div class='add'>+	err = cb(arg, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(v, &amp;dp-&gt;user_vlans, list) {</div><div class='add'>+		err = cb(arg, v-&gt;vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_sync_uc(struct net_device *dev,</div><div class='add'>+			    const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_host_vlan_rx_filtering_ctx ctx = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.event = DSA_UC_ADD,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_uc_add(conduit, addr);</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_uc_filtering(dp-&gt;ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_for_each(dev, dsa_user_host_vlan_rx_filtering,</div><div class='add'>+				      &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_unsync_uc(struct net_device *dev,</div><div class='add'>+			      const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_host_vlan_rx_filtering_ctx ctx = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.event = DSA_UC_DEL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_uc_del(conduit, addr);</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_uc_filtering(dp-&gt;ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_for_each(dev, dsa_user_host_vlan_rx_filtering,</div><div class='add'>+				      &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_sync_mc(struct net_device *dev,</div><div class='add'>+			    const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_host_vlan_rx_filtering_ctx ctx = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.event = DSA_MC_ADD,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_mc_add(conduit, addr);</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_mc_filtering(dp-&gt;ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_for_each(dev, dsa_user_host_vlan_rx_filtering,</div><div class='add'>+				      &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_unsync_mc(struct net_device *dev,</div><div class='add'>+			      const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_host_vlan_rx_filtering_ctx ctx = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.event = DSA_MC_DEL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_mc_del(conduit, addr);</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_mc_filtering(dp-&gt;ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_for_each(dev, dsa_user_host_vlan_rx_filtering,</div><div class='add'>+				      &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_sync_ha(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_synced_mc_addr(ha, dev)</div><div class='add'>+		dsa_user_sync_mc(dev, ha-&gt;addr);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_synced_uc_addr(ha, dev)</div><div class='add'>+		dsa_user_sync_uc(dev, ha-&gt;addr);</div><div class='add'>+</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds) ||</div><div class='add'>+	    dsa_switch_supports_mc_filtering(ds))</div><div class='add'>+		dsa_flush_workqueue();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_unsync_ha(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_synced_uc_addr(ha, dev)</div><div class='add'>+		dsa_user_unsync_uc(dev, ha-&gt;addr);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_synced_mc_addr(ha, dev)</div><div class='add'>+		dsa_user_unsync_mc(dev, ha-&gt;addr);</div><div class='add'>+</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds) ||</div><div class='add'>+	    dsa_switch_supports_mc_filtering(ds))</div><div class='add'>+		dsa_flush_workqueue();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* user mii_bus handling ***************************************************/</div><div class='add'>+static int dsa_user_phy_read(struct mii_bus *bus, int addr, int reg)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;phys_mii_mask &amp; (1 &lt;&lt; addr))</div><div class='add'>+		return ds-&gt;ops-&gt;phy_read(ds, addr, reg);</div><div class='add'>+</div><div class='add'>+	return 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_phy_write(struct mii_bus *bus, int addr, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;phys_mii_mask &amp; (1 &lt;&lt; addr))</div><div class='add'>+		return ds-&gt;ops-&gt;phy_write(ds, addr, reg, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_mii_bus_init(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;priv = (void *)ds;</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;name = "dsa user smi";</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;read = dsa_user_phy_read;</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;write = dsa_user_phy_write;</div><div class='add'>+	snprintf(ds-&gt;user_mii_bus-&gt;id, MII_BUS_ID_SIZE, "dsa-%d.%d",</div><div class='add'>+		 ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;parent = ds-&gt;dev;</div><div class='add'>+	ds-&gt;user_mii_bus-&gt;phy_mask = ~ds-&gt;phys_mii_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* user device handling ****************************************************/</div><div class='add'>+static int dsa_user_get_iflink(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(dsa_user_to_conduit(dev)-&gt;ifindex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_host_uc_install(struct net_device *dev, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds)) {</div><div class='add'>+		err = dsa_port_standalone_host_fdb_add(dp, addr, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ether_addr_equal(addr, conduit-&gt;dev_addr)) {</div><div class='add'>+		err = dev_uc_add(conduit, addr);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto del_host_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+del_host_addr:</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds))</div><div class='add'>+		dsa_port_standalone_host_fdb_del(dp, addr, 0);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_host_uc_uninstall(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ether_addr_equal(dev-&gt;dev_addr, conduit-&gt;dev_addr))</div><div class='add'>+		dev_uc_del(conduit, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds))</div><div class='add'>+		dsa_port_standalone_host_fdb_del(dp, dev-&gt;dev_addr, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dev_open(conduit, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		netdev_err(dev, "failed to open conduit %s\n", conduit-&gt;name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dsa_user_host_uc_install(dev, dev-&gt;dev_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_enable_rt(dp, dev-&gt;phydev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_del_host_uc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_del_host_uc:</div><div class='add'>+	dsa_user_host_uc_uninstall(dev);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	dsa_port_disable_rt(dp);</div><div class='add'>+</div><div class='add'>+	dsa_user_host_uc_uninstall(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_manage_host_flood(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	bool mc = dev-&gt;flags &amp; (IFF_PROMISC | IFF_ALLMULTI);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	bool uc = dev-&gt;flags &amp; IFF_PROMISC;</div><div class='add'>+</div><div class='add'>+	dsa_port_set_host_flood(dp, uc, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_change_rx_flags(struct net_device *dev, int change)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (change &amp; IFF_ALLMULTI)</div><div class='add'>+		dev_set_allmulti(conduit,</div><div class='add'>+				 dev-&gt;flags &amp; IFF_ALLMULTI ? 1 : -1);</div><div class='add'>+	if (change &amp; IFF_PROMISC)</div><div class='add'>+		dev_set_promiscuity(conduit,</div><div class='add'>+				    dev-&gt;flags &amp; IFF_PROMISC ? 1 : -1);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds) &amp;&amp;</div><div class='add'>+	    dsa_switch_supports_mc_filtering(ds))</div><div class='add'>+		dsa_user_manage_host_flood(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	__dev_mc_sync(dev, dsa_user_sync_mc, dsa_user_unsync_mc);</div><div class='add'>+	__dev_uc_sync(dev, dsa_user_sync_uc, dsa_user_unsync_uc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_mac_address(struct net_device *dev, void *a)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct sockaddr *addr = a;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_set_mac_address) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_set_mac_address(ds, dp-&gt;index,</div><div class='add'>+						    addr-&gt;sa_data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the port is down, the address isn't synced yet to hardware or</div><div class='add'>+	 * to the DSA conduit, so there is nothing to change.</div><div class='add'>+	 */</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		goto out_change_dev_addr;</div><div class='add'>+</div><div class='add'>+	err = dsa_user_host_uc_install(dev, addr-&gt;sa_data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dsa_user_host_uc_uninstall(dev);</div><div class='add'>+</div><div class='add'>+out_change_dev_addr:</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_user_dump_ctx {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct netlink_callback *cb;</div><div class='add'>+	int idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_port_fdb_do_dump(const unsigned char *addr, u16 vid,</div><div class='add'>+			  bool is_static, void *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_dump_ctx *dump = data;</div><div class='add'>+	struct ndo_fdb_dump_context *ctx = (void *)dump-&gt;cb-&gt;ctx;</div><div class='add'>+	u32 portid = NETLINK_CB(dump-&gt;cb-&gt;skb).portid;</div><div class='add'>+	u32 seq = dump-&gt;cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+</div><div class='add'>+	if (dump-&gt;idx &lt; ctx-&gt;fdb_idx)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(dump-&gt;skb, portid, seq, RTM_NEWNEIGH,</div><div class='add'>+			sizeof(*ndm), NLM_F_MULTI);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_data(nlh);</div><div class='add'>+	ndm-&gt;ndm_family  = AF_BRIDGE;</div><div class='add'>+	ndm-&gt;ndm_pad1    = 0;</div><div class='add'>+	ndm-&gt;ndm_pad2    = 0;</div><div class='add'>+	ndm-&gt;ndm_flags   = NTF_SELF;</div><div class='add'>+	ndm-&gt;ndm_type    = 0;</div><div class='add'>+	ndm-&gt;ndm_ifindex = dump-&gt;dev-&gt;ifindex;</div><div class='add'>+	ndm-&gt;ndm_state   = is_static ? NUD_NOARP : NUD_REACHABLE;</div><div class='add'>+</div><div class='add'>+	if (nla_put(dump-&gt;skb, NDA_LLADDR, ETH_ALEN, addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (vid &amp;&amp; nla_put_u16(dump-&gt;skb, NDA_VLAN, vid))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nlmsg_end(dump-&gt;skb, nlh);</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+	dump-&gt;idx++;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_cancel(dump-&gt;skb, nlh);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+		  struct net_device *dev, struct net_device *filter_dev,</div><div class='add'>+		  int *idx)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_user_dump_ctx dump = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.skb = skb,</div><div class='add'>+		.cb = cb,</div><div class='add'>+		.idx = *idx,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_fdb_dump(dp, dsa_user_port_fdb_do_dump, &amp;dump);</div><div class='add'>+	*idx = dump.idx;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_mii_ioctl(p-&gt;dp-&gt;pl, ifr, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_port_attr_set(struct net_device *dev, const void *ctx,</div><div class='add'>+				  const struct switchdev_attr *attr,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ctx &amp;&amp; ctx != dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (attr-&gt;id) {</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_STP_STATE:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_set_state(dp, attr-&gt;u.stp_state, true);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_MST_STATE:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_set_mst_state(dp, &amp;attr-&gt;u.mst_state, extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_vlan_filtering(dp, attr-&gt;u.vlan_filtering,</div><div class='add'>+					      extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_ageing_time(dp, attr-&gt;u.ageing_time);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_BRIDGE_MST:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_mst_enable(dp, attr-&gt;u.mst, extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_pre_bridge_flags(dp, attr-&gt;u.brport_flags,</div><div class='add'>+						extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_bridge_flags(dp, attr-&gt;u.brport_flags, extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_VLAN_MSTI:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, attr-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = dsa_port_vlan_msti(dp, &amp;attr-&gt;u.vlan_msti);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called under rcu_read_lock() */</div><div class='add'>+static int</div><div class='add'>+dsa_user_vlan_check_for_8021q_uppers(struct net_device *user,</div><div class='add'>+				     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_upper_dev_rcu(user, upper_dev, iter) {</div><div class='add'>+		u16 vid;</div><div class='add'>+</div><div class='add'>+		if (!is_vlan_dev(upper_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		vid = vlan_dev_vlan_id(upper_dev);</div><div class='add'>+		if (vid == vlan-&gt;vid)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_vlan_add(struct net_device *dev,</div><div class='add'>+			     const struct switchdev_obj *obj,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan *vlan;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_skip_vlan_configuration(dp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "skipping configuration of VLAN");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);</div><div class='add'>+</div><div class='add'>+	/* Deny adding a bridge VLAN when there is already an 802.1Q upper with</div><div class='add'>+	 * the same VID.</div><div class='add'>+	 */</div><div class='add'>+	if (br_vlan_enabled(dsa_port_bridge_dev_get(dp))) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		err = dsa_user_vlan_check_for_8021q_uppers(dev, vlan);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Port already has a VLAN upper with this VID");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_port_vlan_add(dp, vlan, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Offload a VLAN installed on the bridge or on a foreign interface by</div><div class='add'>+ * installing it as a VLAN towards the CPU port.</div><div class='add'>+ */</div><div class='add'>+static int dsa_user_host_vlan_add(struct net_device *dev,</div><div class='add'>+				  const struct switchdev_obj *obj,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan vlan;</div><div class='add'>+</div><div class='add'>+	/* Do nothing if this is a software bridge */</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_skip_vlan_configuration(dp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "skipping configuration of VLAN");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlan = *SWITCHDEV_OBJ_PORT_VLAN(obj);</div><div class='add'>+</div><div class='add'>+	/* Even though drivers often handle CPU membership in special ways,</div><div class='add'>+	 * it doesn't make sense to program a PVID, so clear this flag.</div><div class='add'>+	 */</div><div class='add'>+	vlan.flags &amp;= ~BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_vlan_add(dp, &amp;vlan, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_port_obj_add(struct net_device *dev, const void *ctx,</div><div class='add'>+				 const struct switchdev_obj *obj,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ctx &amp;&amp; ctx != dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (obj-&gt;id) {</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_HOST_MDB:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_bridge_host_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='add'>+		if (dsa_port_offloads_bridge_port(dp, obj-&gt;orig_dev))</div><div class='add'>+			err = dsa_user_vlan_add(dev, obj, extack);</div><div class='add'>+		else</div><div class='add'>+			err = dsa_user_host_vlan_add(dev, obj, extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_MRP:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mrp_add(dp, SWITCHDEV_OBJ_MRP(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_RING_ROLE_MRP:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mrp_add_ring_role(dp,</div><div class='add'>+						 SWITCHDEV_OBJ_RING_ROLE_MRP(obj));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_vlan_del(struct net_device *dev,</div><div class='add'>+			     const struct switchdev_obj *obj)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_skip_vlan_configuration(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);</div><div class='add'>+</div><div class='add'>+	return dsa_port_vlan_del(dp, vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_host_vlan_del(struct net_device *dev,</div><div class='add'>+				  const struct switchdev_obj *obj)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	/* Do nothing if this is a software bridge */</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_skip_vlan_configuration(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);</div><div class='add'>+</div><div class='add'>+	return dsa_port_host_vlan_del(dp, vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_port_obj_del(struct net_device *dev, const void *ctx,</div><div class='add'>+				 const struct switchdev_obj *obj)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ctx &amp;&amp; ctx != dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (obj-&gt;id) {</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='add'>+		if (!dsa_port_offloads_bridge_port(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_HOST_MDB:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_bridge_host_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='add'>+		if (dsa_port_offloads_bridge_port(dp, obj-&gt;orig_dev))</div><div class='add'>+			err = dsa_user_vlan_del(dev, obj);</div><div class='add'>+		else</div><div class='add'>+			err = dsa_user_host_vlan_del(dev, obj);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_MRP:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mrp_del(dp, SWITCHDEV_OBJ_MRP(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_RING_ROLE_MRP:</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(dp, obj-&gt;orig_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_mrp_del_ring_role(dp,</div><div class='add'>+						 SWITCHDEV_OBJ_RING_ROLE_MRP(obj));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t dsa_user_netpoll_send_skb(struct net_device *dev,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return netpoll_send_skb(p-&gt;netpoll, skb);</div><div class='add'>+#else</div><div class='add'>+	BUG();</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_skb_tx_timestamp(struct dsa_user_priv *p,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP_NOBPF))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_txtstamp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ds-&gt;ops-&gt;port_txtstamp(ds, p-&gt;dp-&gt;index, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netdev_tx_t dsa_enqueue_skb(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* SKB for netpoll still need to be mangled with the protocol-specific</div><div class='add'>+	 * tag to be successfully transmitted</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(netpoll_tx_running(dev)))</div><div class='add'>+		return dsa_user_netpoll_send_skb(dev, skb);</div><div class='add'>+</div><div class='add'>+	/* Queue the SKB for transmission on the parent interface, but</div><div class='add'>+	 * do not modify its EtherType</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;dev = dsa_user_to_conduit(dev);</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_enqueue_skb);</div><div class='add'>+</div><div class='add'>+static netdev_tx_t dsa_user_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+</div><div class='add'>+	dev_sw_netstats_tx_add(dev, 1, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	/* Handle tx timestamp if any */</div><div class='add'>+	dsa_skb_tx_timestamp(p, skb);</div><div class='add'>+</div><div class='add'>+	if (skb_ensure_writable_head_tail(skb, dev)) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* needed_tailroom should still be 'warm' in the cache line from</div><div class='add'>+	 * skb_ensure_writable_head_tail(), which has also ensured that</div><div class='add'>+	 * padding is safe.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;needed_tailroom)</div><div class='add'>+		eth_skb_pad(skb);</div><div class='add'>+</div><div class='add'>+	/* Transmit function may have to reallocate the original SKB,</div><div class='add'>+	 * in which case it must have freed it. Only free it here on error.</div><div class='add'>+	 */</div><div class='add'>+	nskb = p-&gt;xmit(skb, dev);</div><div class='add'>+	if (!nskb) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_enqueue_skb(nskb, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ethtool operations *******************************************************/</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_drvinfo(struct net_device *dev,</div><div class='add'>+				 struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	strscpy(drvinfo-&gt;driver, "dsa", sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, "platform", sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_regs_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_regs_len)</div><div class='add'>+		return ds-&gt;ops-&gt;get_regs_len(ds, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+dsa_user_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_regs)</div><div class='add'>+		ds-&gt;ops-&gt;get_regs(ds, dp-&gt;index, regs, _p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_nway_reset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_nway_reset(dp-&gt;pl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_eeprom_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;cd &amp;&amp; ds-&gt;cd-&gt;eeprom_len)</div><div class='add'>+		return ds-&gt;cd-&gt;eeprom_len;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_eeprom_len)</div><div class='add'>+		return ds-&gt;ops-&gt;get_eeprom_len(ds);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_eeprom(struct net_device *dev,</div><div class='add'>+			       struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_eeprom)</div><div class='add'>+		return ds-&gt;ops-&gt;get_eeprom(ds, eeprom, data);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_eeprom(struct net_device *dev,</div><div class='add'>+			       struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;set_eeprom)</div><div class='add'>+		return ds-&gt;ops-&gt;set_eeprom(ds, eeprom, data);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_strings(struct net_device *dev,</div><div class='add'>+				 uint32_t stringset, uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (stringset == ETH_SS_STATS) {</div><div class='add'>+		ethtool_puts(&amp;data, "tx_packets");</div><div class='add'>+		ethtool_puts(&amp;data, "tx_bytes");</div><div class='add'>+		ethtool_puts(&amp;data, "rx_packets");</div><div class='add'>+		ethtool_puts(&amp;data, "rx_bytes");</div><div class='add'>+		if (ds-&gt;ops-&gt;get_strings)</div><div class='add'>+			ds-&gt;ops-&gt;get_strings(ds, dp-&gt;index, stringset, data);</div><div class='add'>+	} else if (stringset ==  ETH_SS_TEST) {</div><div class='add'>+		net_selftest_get_strings(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_ethtool_stats(struct net_device *dev,</div><div class='add'>+				       struct ethtool_stats *stats,</div><div class='add'>+				       uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct pcpu_sw_netstats *s;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		u64 tx_packets, tx_bytes, rx_packets, rx_bytes;</div><div class='add'>+</div><div class='add'>+		s = per_cpu_ptr(dev-&gt;tstats, i);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;s-&gt;syncp);</div><div class='add'>+			tx_packets = u64_stats_read(&amp;s-&gt;tx_packets);</div><div class='add'>+			tx_bytes = u64_stats_read(&amp;s-&gt;tx_bytes);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;s-&gt;rx_packets);</div><div class='add'>+			rx_bytes = u64_stats_read(&amp;s-&gt;rx_bytes);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;s-&gt;syncp, start));</div><div class='add'>+		data[0] += tx_packets;</div><div class='add'>+		data[1] += tx_bytes;</div><div class='add'>+		data[2] += rx_packets;</div><div class='add'>+		data[3] += rx_bytes;</div><div class='add'>+	}</div><div class='add'>+	if (ds-&gt;ops-&gt;get_ethtool_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_ethtool_stats(ds, dp-&gt;index, data + 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_sset_count(struct net_device *dev, int sset)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (sset == ETH_SS_STATS) {</div><div class='add'>+		int count = 0;</div><div class='add'>+</div><div class='add'>+		if (ds-&gt;ops-&gt;get_sset_count) {</div><div class='add'>+			count = ds-&gt;ops-&gt;get_sset_count(ds, dp-&gt;index, sset);</div><div class='add'>+			if (count &lt; 0)</div><div class='add'>+				return count;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return count + 4;</div><div class='add'>+	} else if (sset ==  ETH_SS_TEST) {</div><div class='add'>+		return net_selftest_get_count();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_eth_phy_stats(struct net_device *dev,</div><div class='add'>+				       struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_eth_phy_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_eth_phy_stats(ds, dp-&gt;index, phy_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_eth_mac_stats(struct net_device *dev,</div><div class='add'>+				       struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_eth_mac_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_eth_mac_stats(ds, dp-&gt;index, mac_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+dsa_user_get_eth_ctrl_stats(struct net_device *dev,</div><div class='add'>+			    struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_eth_ctrl_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_eth_ctrl_stats(ds, dp-&gt;index, ctrl_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+dsa_user_get_rmon_stats(struct net_device *dev,</div><div class='add'>+			struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+			const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_rmon_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_rmon_stats(ds, dp-&gt;index, rmon_stats, ranges);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_ts_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_ts_stats *ts_stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_ts_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_ts_stats(ds, dp-&gt;index, ts_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_net_selftest(struct net_device *ndev,</div><div class='add'>+				  struct ethtool_test *etest, u64 *buf)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(ndev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;self_test) {</div><div class='add'>+		ds-&gt;ops-&gt;self_test(ds, dp-&gt;index, etest, buf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net_selftest(ndev, etest, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_mm(struct net_device *dev,</div><div class='add'>+			   struct ethtool_mm_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;get_mm)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;get_mm(ds, dp-&gt;index, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_mm(struct net_device *dev, struct ethtool_mm_cfg *cfg,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;set_mm)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;set_mm(ds, dp-&gt;index, cfg, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_mm_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_mm_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_mm_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_mm_stats(ds, dp-&gt;index, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_wol(struct net_device *dev, struct ethtool_wolinfo *w)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	phylink_ethtool_get_wol(dp-&gt;pl, w);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_wol)</div><div class='add'>+		ds-&gt;ops-&gt;get_wol(ds, dp-&gt;index, w);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	phylink_ethtool_set_wol(dp-&gt;pl, w);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;set_wol)</div><div class='add'>+		ret = ds-&gt;ops-&gt;set_wol(ds, dp-&gt;index, w);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Check whether the switch supports EEE */</div><div class='add'>+	if (!ds-&gt;ops-&gt;support_eee || !ds-&gt;ops-&gt;support_eee(ds, dp-&gt;index))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* If the port is using phylink managed EEE, then an unimplemented</div><div class='add'>+	 * set_mac_eee() is permissible.</div><div class='add'>+	 */</div><div class='add'>+	if (!phylink_mac_implements_lpi(ds-&gt;phylink_mac_ops)) {</div><div class='add'>+		/* Port's PHY and MAC both need to be EEE capable */</div><div class='add'>+		if (!dev-&gt;phydev)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		if (!ds-&gt;ops-&gt;set_mac_eee)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		ret = ds-&gt;ops-&gt;set_mac_eee(ds, dp-&gt;index, e);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (ds-&gt;ops-&gt;set_mac_eee) {</div><div class='add'>+		ret = ds-&gt;ops-&gt;set_mac_eee(ds, dp-&gt;index, e);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_set_eee(dp-&gt;pl, e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	/* Check whether the switch supports EEE */</div><div class='add'>+	if (!ds-&gt;ops-&gt;support_eee || !ds-&gt;ops-&gt;support_eee(ds, dp-&gt;index))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Port's PHY and MAC both need to be EEE capable */</div><div class='add'>+	if (!dev-&gt;phydev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_get_eee(dp-&gt;pl, e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_link_ksettings(struct net_device *dev,</div><div class='add'>+				       struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_get(dp-&gt;pl, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_link_ksettings(struct net_device *dev,</div><div class='add'>+				       const struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_set(dp-&gt;pl, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_pause_stats(struct net_device *dev,</div><div class='add'>+				     struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_pause_stats)</div><div class='add'>+		ds-&gt;ops-&gt;get_pause_stats(ds, dp-&gt;index, pause_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_pauseparam(struct net_device *dev,</div><div class='add'>+				    struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	phylink_ethtool_get_pauseparam(dp-&gt;pl, pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_pauseparam(struct net_device *dev,</div><div class='add'>+				   struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_set_pauseparam(dp-&gt;pl, pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static int dsa_user_netpoll_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct netpoll *netpoll;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	netpoll = kzalloc(sizeof(*netpoll), GFP_KERNEL);</div><div class='add'>+	if (!netpoll)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = __netpoll_setup(netpoll, conduit);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(netpoll);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;netpoll = netpoll;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_netpoll_cleanup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct netpoll *netpoll = p-&gt;netpoll;</div><div class='add'>+</div><div class='add'>+	if (!netpoll)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p-&gt;netpoll = NULL;</div><div class='add'>+</div><div class='add'>+	__netpoll_free(netpoll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_poll_controller(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct dsa_mall_tc_entry *</div><div class='add'>+dsa_user_mall_tc_entry_find(struct net_device *dev, unsigned long cookie)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mall_tc_entry, &amp;p-&gt;mall_tc_list, list)</div><div class='add'>+		if (mall_tc_entry-&gt;cookie == cookie)</div><div class='add'>+			return mall_tc_entry;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_add_cls_matchall_mirred(struct net_device *dev,</div><div class='add'>+				 struct tc_cls_matchall_offload *cls,</div><div class='add'>+				 bool ingress, bool ingress_target)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct dsa_mall_mirror_tc_entry *mirror;</div><div class='add'>+	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	struct dsa_port *to_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cls-&gt;common.protocol != htons(ETH_P_ALL)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only offload \"protocol all\" matchall filter");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_mirror_add) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Switch does not support mirroring operation");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!flow_action_basic_hw_stats_check(&amp;cls-&gt;rule-&gt;action, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+</div><div class='add'>+	if (!act-&gt;dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dsa_user_dev_check(act-&gt;dev)) {</div><div class='add'>+		if (ingress_target) {</div><div class='add'>+			/* We can only fulfill this using software assist */</div><div class='add'>+			if (cls-&gt;common.skip_sw) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Can only mirred to ingress of DSA user port if filter also runs in software");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			to_dp = dp-&gt;cpu_dp;</div><div class='add'>+		} else {</div><div class='add'>+			to_dp = dsa_user_to_port(act-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Handle mirroring to foreign target ports as a mirror towards</div><div class='add'>+		 * the CPU. The software tc rule will take the packets from</div><div class='add'>+		 * there.</div><div class='add'>+		 */</div><div class='add'>+		if (cls-&gt;common.skip_sw) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Can only mirred to CPU if filter also runs in software");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		to_dp = dp-&gt;cpu_dp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;ds != to_dp-&gt;ds) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cross-chip mirroring not implemented");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mall_tc_entry = kzalloc(sizeof(*mall_tc_entry), GFP_KERNEL);</div><div class='add'>+	if (!mall_tc_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mall_tc_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+	mall_tc_entry-&gt;type = DSA_PORT_MALL_MIRROR;</div><div class='add'>+	mirror = &amp;mall_tc_entry-&gt;mirror;</div><div class='add'>+	mirror-&gt;to_local_port = to_dp-&gt;index;</div><div class='add'>+	mirror-&gt;ingress = ingress;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_mirror_add(ds, dp-&gt;index, mirror, ingress, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(mall_tc_entry);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;mall_tc_entry-&gt;list, &amp;p-&gt;mall_tc_list);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_add_cls_matchall_police(struct net_device *dev,</div><div class='add'>+				 struct tc_cls_matchall_offload *cls,</div><div class='add'>+				 bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct dsa_mall_policer_tc_entry *policer;</div><div class='add'>+	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_policer_add) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Policing offload not implemented");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ingress) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only supported on ingress qdisc");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!flow_action_basic_hw_stats_check(&amp;cls-&gt;rule-&gt;action, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mall_tc_entry, &amp;p-&gt;mall_tc_list, list) {</div><div class='add'>+		if (mall_tc_entry-&gt;type == DSA_PORT_MALL_POLICER) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only one port policer allowed");</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+</div><div class='add'>+	mall_tc_entry = kzalloc(sizeof(*mall_tc_entry), GFP_KERNEL);</div><div class='add'>+	if (!mall_tc_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mall_tc_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+	mall_tc_entry-&gt;type = DSA_PORT_MALL_POLICER;</div><div class='add'>+	policer = &amp;mall_tc_entry-&gt;policer;</div><div class='add'>+	policer-&gt;rate_bytes_per_sec = act-&gt;police.rate_bytes_ps;</div><div class='add'>+	policer-&gt;burst = act-&gt;police.burst;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_policer_add(ds, dp-&gt;index, policer);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(mall_tc_entry);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;mall_tc_entry-&gt;list, &amp;p-&gt;mall_tc_list);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_add_cls_matchall(struct net_device *dev,</div><div class='add'>+				     struct tc_cls_matchall_offload *cls,</div><div class='add'>+				     bool ingress)</div><div class='add'>+{</div><div class='add'>+	const struct flow_action *action = &amp;cls-&gt;rule-&gt;action;</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+</div><div class='add'>+	if (!flow_offload_has_one_action(action)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot offload matchall filter with more than one action");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (action-&gt;entries[0].id) {</div><div class='add'>+	case FLOW_ACTION_MIRRED:</div><div class='add'>+		return dsa_user_add_cls_matchall_mirred(dev, cls, ingress,</div><div class='add'>+							false);</div><div class='add'>+	case FLOW_ACTION_MIRRED_INGRESS:</div><div class='add'>+		return dsa_user_add_cls_matchall_mirred(dev, cls, ingress,</div><div class='add'>+							true);</div><div class='add'>+	case FLOW_ACTION_POLICE:</div><div class='add'>+		return dsa_user_add_cls_matchall_police(dev, cls, ingress);</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unknown action");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_del_cls_matchall(struct net_device *dev,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_mall_tc_entry *mall_tc_entry;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	mall_tc_entry = dsa_user_mall_tc_entry_find(dev, cls-&gt;cookie);</div><div class='add'>+	if (!mall_tc_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;mall_tc_entry-&gt;list);</div><div class='add'>+</div><div class='add'>+	switch (mall_tc_entry-&gt;type) {</div><div class='add'>+	case DSA_PORT_MALL_MIRROR:</div><div class='add'>+		if (ds-&gt;ops-&gt;port_mirror_del)</div><div class='add'>+			ds-&gt;ops-&gt;port_mirror_del(ds, dp-&gt;index,</div><div class='add'>+						 &amp;mall_tc_entry-&gt;mirror);</div><div class='add'>+		break;</div><div class='add'>+	case DSA_PORT_MALL_POLICER:</div><div class='add'>+		if (ds-&gt;ops-&gt;port_policer_del)</div><div class='add'>+			ds-&gt;ops-&gt;port_policer_del(ds, dp-&gt;index);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(mall_tc_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_cls_matchall(struct net_device *dev,</div><div class='add'>+					  struct tc_cls_matchall_offload *cls,</div><div class='add'>+					  bool ingress)</div><div class='add'>+{</div><div class='add'>+	if (cls-&gt;common.chain_index)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (cls-&gt;command) {</div><div class='add'>+	case TC_CLSMATCHALL_REPLACE:</div><div class='add'>+		return dsa_user_add_cls_matchall(dev, cls, ingress);</div><div class='add'>+	case TC_CLSMATCHALL_DESTROY:</div><div class='add'>+		dsa_user_del_cls_matchall(dev, cls);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_add_cls_flower(struct net_device *dev,</div><div class='add'>+				   struct flow_cls_offload *cls,</div><div class='add'>+				   bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;cls_flower_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;cls_flower_add(ds, port, cls, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_del_cls_flower(struct net_device *dev,</div><div class='add'>+				   struct flow_cls_offload *cls,</div><div class='add'>+				   bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;cls_flower_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;cls_flower_del(ds, port, cls, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_stats_cls_flower(struct net_device *dev,</div><div class='add'>+				     struct flow_cls_offload *cls,</div><div class='add'>+				     bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;cls_flower_stats)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;cls_flower_stats(ds, port, cls, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_cls_flower(struct net_device *dev,</div><div class='add'>+					struct flow_cls_offload *cls,</div><div class='add'>+					bool ingress)</div><div class='add'>+{</div><div class='add'>+	switch (cls-&gt;command) {</div><div class='add'>+	case FLOW_CLS_REPLACE:</div><div class='add'>+		return dsa_user_add_cls_flower(dev, cls, ingress);</div><div class='add'>+	case FLOW_CLS_DESTROY:</div><div class='add'>+		return dsa_user_del_cls_flower(dev, cls, ingress);</div><div class='add'>+	case FLOW_CLS_STATS:</div><div class='add'>+		return dsa_user_stats_cls_flower(dev, cls, ingress);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='add'>+				      void *cb_priv, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = cb_priv;</div><div class='add'>+</div><div class='add'>+	if (!tc_can_offload(dev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return dsa_user_setup_tc_cls_matchall(dev, type_data, ingress);</div><div class='add'>+	case TC_SETUP_CLSFLOWER:</div><div class='add'>+		return dsa_user_setup_tc_cls_flower(dev, type_data, ingress);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_block_cb_ig(enum tc_setup_type type,</div><div class='add'>+					 void *type_data, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	return dsa_user_setup_tc_block_cb(type, type_data, cb_priv, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_block_cb_eg(enum tc_setup_type type,</div><div class='add'>+					 void *type_data, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	return dsa_user_setup_tc_block_cb(type, type_data, cb_priv, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(dsa_user_block_cb_list);</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc_block(struct net_device *dev,</div><div class='add'>+				   struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+	flow_setup_cb_t *cb;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+		cb = dsa_user_setup_tc_block_cb_ig;</div><div class='add'>+	else if (f-&gt;binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)</div><div class='add'>+		cb = dsa_user_setup_tc_block_cb_eg;</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	f-&gt;driver_block_list = &amp;dsa_user_block_cb_list;</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_BLOCK_BIND:</div><div class='add'>+		if (flow_block_cb_is_busy(cb, dev, &amp;dsa_user_block_cb_list))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		block_cb = flow_block_cb_alloc(cb, dev, dev, NULL);</div><div class='add'>+		if (IS_ERR(block_cb))</div><div class='add'>+			return PTR_ERR(block_cb);</div><div class='add'>+</div><div class='add'>+		flow_block_cb_add(block_cb, f);</div><div class='add'>+		list_add_tail(&amp;block_cb-&gt;driver_list, &amp;dsa_user_block_cb_list);</div><div class='add'>+		return 0;</div><div class='add'>+	case FLOW_BLOCK_UNBIND:</div><div class='add'>+		block_cb = flow_block_cb_lookup(f-&gt;block, cb, dev);</div><div class='add'>+		if (!block_cb)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		flow_block_cb_remove(block_cb, f);</div><div class='add'>+		list_del(&amp;block_cb-&gt;driver_list);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_ft_block(struct dsa_switch *ds, int port,</div><div class='add'>+				   void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dsa_to_port(ds, port));</div><div class='add'>+</div><div class='add'>+	if (!conduit-&gt;netdev_ops-&gt;ndo_setup_tc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return conduit-&gt;netdev_ops-&gt;ndo_setup_tc(conduit, TC_SETUP_FT, type_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='add'>+			     void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_BLOCK:</div><div class='add'>+		return dsa_user_setup_tc_block(dev, type_data);</div><div class='add'>+	case TC_SETUP_FT:</div><div class='add'>+		return dsa_user_setup_ft_block(ds, dp-&gt;index, type_data);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_setup_tc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_setup_tc(ds, dp-&gt;index, type, type_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_rxnfc(struct net_device *dev,</div><div class='add'>+			      struct ethtool_rxnfc *nfc, u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;get_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;get_rxnfc(ds, dp-&gt;index, nfc, rule_locs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_set_rxnfc(struct net_device *dev,</div><div class='add'>+			      struct ethtool_rxnfc *nfc)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;set_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;set_rxnfc(ds, dp-&gt;index, nfc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_get_ts_info(struct net_device *dev,</div><div class='add'>+				struct kernel_ethtool_ts_info *ts)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+	struct dsa_switch *ds = p-&gt;dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;get_ts_info)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;get_ts_info(ds, p-&gt;dp-&gt;index, ts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_vlan_rx_add_vid(struct net_device *dev, __be16 proto,</div><div class='add'>+				    u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		/* This API only allows programming tagged, non-PVID VIDs */</div><div class='add'>+		.flags = 0,</div><div class='add'>+	};</div><div class='add'>+	struct netlink_ext_ack extack = {0};</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* User port... */</div><div class='add'>+	ret = dsa_port_vlan_add(dp, &amp;vlan, &amp;extack);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* And CPU port... */</div><div class='add'>+	ret = dsa_port_host_vlan_add(dp, &amp;vlan, &amp;extack);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "CPU port %d: %s\n", dp-&gt;cpu_dp-&gt;index,</div><div class='add'>+				   extack._msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_uc_filtering(ds) &amp;&amp;</div><div class='add'>+	    !dsa_switch_supports_mc_filtering(ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	v = kzalloc(sizeof(*v), GFP_KERNEL);</div><div class='add'>+	if (!v) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+</div><div class='add'>+	v-&gt;vid = vid;</div><div class='add'>+	list_add_tail(&amp;v-&gt;list, &amp;dp-&gt;user_vlans);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_mc_filtering(ds)) {</div><div class='add'>+		netdev_for_each_synced_mc_addr(ha, dev) {</div><div class='add'>+			dsa_user_schedule_standalone_work(dev, DSA_MC_ADD,</div><div class='add'>+							  ha-&gt;addr, vid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds)) {</div><div class='add'>+		netdev_for_each_synced_uc_addr(ha, dev) {</div><div class='add'>+			dsa_user_schedule_standalone_work(dev, DSA_UC_ADD,</div><div class='add'>+							  ha-&gt;addr, vid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	dsa_port_host_vlan_del(dp, &amp;vlan);</div><div class='add'>+	dsa_port_vlan_del(dp, &amp;vlan);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,</div><div class='add'>+				     u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+		.vid = vid,</div><div class='add'>+		/* This API only allows programming tagged, non-PVID VIDs */</div><div class='add'>+		.flags = 0,</div><div class='add'>+	};</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	struct dsa_vlan *v;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_vlan_del(dp, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_host_vlan_del(dp, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!dsa_switch_supports_uc_filtering(ds) &amp;&amp;</div><div class='add'>+	    !dsa_switch_supports_mc_filtering(ds))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+</div><div class='add'>+	v = dsa_vlan_find(&amp;dp-&gt;user_vlans, &amp;vlan);</div><div class='add'>+	if (!v) {</div><div class='add'>+		netif_addr_unlock_bh(dev);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;v-&gt;list);</div><div class='add'>+	kfree(v);</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_mc_filtering(ds)) {</div><div class='add'>+		netdev_for_each_synced_mc_addr(ha, dev) {</div><div class='add'>+			dsa_user_schedule_standalone_work(dev, DSA_MC_DEL,</div><div class='add'>+							  ha-&gt;addr, vid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds)) {</div><div class='add'>+		netdev_for_each_synced_uc_addr(ha, dev) {</div><div class='add'>+			dsa_user_schedule_standalone_work(dev, DSA_UC_DEL,</div><div class='add'>+							  ha-&gt;addr, vid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_restore_vlan(struct net_device *vdev, int vid, void *arg)</div><div class='add'>+{</div><div class='add'>+	__be16 proto = vdev ? vlan_dev_vlan_proto(vdev) : htons(ETH_P_8021Q);</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_rx_add_vid(arg, proto, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_clear_vlan(struct net_device *vdev, int vid, void *arg)</div><div class='add'>+{</div><div class='add'>+	__be16 proto = vdev ? vlan_dev_vlan_proto(vdev) : htons(ETH_P_8021Q);</div><div class='add'>+</div><div class='add'>+	return dsa_user_vlan_rx_kill_vid(arg, proto, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Keep the VLAN RX filtering list in sync with the hardware only if VLAN</div><div class='add'>+ * filtering is enabled. The baseline is that only ports that offload a</div><div class='add'>+ * VLAN-aware bridge are VLAN-aware, and standalone ports are VLAN-unaware,</div><div class='add'>+ * but there are exceptions for quirky hardware.</div><div class='add'>+ *</div><div class='add'>+ * If ds-&gt;vlan_filtering_is_global = true, then standalone ports which share</div><div class='add'>+ * the same switch with other ports that offload a VLAN-aware bridge are also</div><div class='add'>+ * inevitably VLAN-aware.</div><div class='add'>+ *</div><div class='add'>+ * To summarize, a DSA switch port offloads:</div><div class='add'>+ *</div><div class='add'>+ * - If standalone (this includes software bridge, software LAG):</div><div class='add'>+ *     - if ds-&gt;needs_standalone_vlan_filtering = true, OR if</div><div class='add'>+ *       (ds-&gt;vlan_filtering_is_global = true AND there are bridges spanning</div><div class='add'>+ *       this switch chip which have vlan_filtering=1)</div><div class='add'>+ *         - the 8021q upper VLANs</div><div class='add'>+ *     - else (standalone VLAN filtering is not needed, VLAN filtering is not</div><div class='add'>+ *       global, or it is, but no port is under a VLAN-aware bridge):</div><div class='add'>+ *         - no VLAN (any 8021q upper is a software VLAN)</div><div class='add'>+ *</div><div class='add'>+ * - If under a vlan_filtering=0 bridge which it offload:</div><div class='add'>+ *     - if ds-&gt;configure_vlan_while_not_filtering = true (default):</div><div class='add'>+ *         - the bridge VLANs. These VLANs are committed to hardware but inactive.</div><div class='add'>+ *     - else (deprecated):</div><div class='add'>+ *         - no VLAN. The bridge VLANs are not restored when VLAN awareness is</div><div class='add'>+ *           enabled, so this behavior is broken and discouraged.</div><div class='add'>+ *</div><div class='add'>+ * - If under a vlan_filtering=1 bridge which it offload:</div><div class='add'>+ *     - the bridge VLANs</div><div class='add'>+ *     - the 8021q upper VLANs</div><div class='add'>+ */</div><div class='add'>+int dsa_user_manage_vlan_filtering(struct net_device *user,</div><div class='add'>+				   bool vlan_filtering)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		user-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+</div><div class='add'>+		err = vlan_for_each(user, dsa_user_restore_vlan, user);</div><div class='add'>+		if (err) {</div><div class='add'>+			vlan_for_each(user, dsa_user_clear_vlan, user);</div><div class='add'>+			user-&gt;features &amp;= ~NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = vlan_for_each(user, dsa_user_clear_vlan, user);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		user-&gt;features &amp;= ~NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsa_hw_port {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int old_mtu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dsa_hw_port_list_set_mtu(struct list_head *hw_port_list, int mtu)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_hw_port *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, hw_port_list, list) {</div><div class='add'>+		if (p-&gt;dev-&gt;mtu == mtu)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dev_set_mtu(p-&gt;dev, mtu);</div><div class='add'>+		if (err)</div><div class='add'>+			goto rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	list_for_each_entry_continue_reverse(p, hw_port_list, list) {</div><div class='add'>+		if (p-&gt;dev-&gt;mtu == p-&gt;old_mtu)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dev_set_mtu(p-&gt;dev, p-&gt;old_mtu))</div><div class='add'>+			netdev_err(p-&gt;dev, "Failed to restore MTU\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_hw_port_list_free(struct list_head *hw_port_list)</div><div class='add'>+{</div><div class='add'>+	struct dsa_hw_port *p, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(p, n, hw_port_list, list)</div><div class='add'>+		kfree(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make the hardware datapath to/from @dev limited to a common MTU */</div><div class='add'>+static void dsa_bridge_mtu_normalization(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	struct list_head hw_port_list;</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='add'>+	int min_mtu = ETH_MAX_MTU;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ds-&gt;mtu_enforcement_ingress)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;hw_port_list);</div><div class='add'>+</div><div class='add'>+	/* Populate the list of ports that are part of the same bridge</div><div class='add'>+	 * as the newly added/modified port</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(dst, &amp;dsa_tree_list, list) {</div><div class='add'>+		list_for_each_entry(other_dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			struct dsa_hw_port *hw_port;</div><div class='add'>+			struct net_device *user;</div><div class='add'>+</div><div class='add'>+			if (other_dp-&gt;type != DSA_PORT_TYPE_USER)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!dsa_port_bridge_same(dp, other_dp))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!other_dp-&gt;ds-&gt;mtu_enforcement_ingress)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			user = other_dp-&gt;user;</div><div class='add'>+</div><div class='add'>+			if (min_mtu &gt; user-&gt;mtu)</div><div class='add'>+				min_mtu = user-&gt;mtu;</div><div class='add'>+</div><div class='add'>+			hw_port = kzalloc(sizeof(*hw_port), GFP_KERNEL);</div><div class='add'>+			if (!hw_port)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			hw_port-&gt;dev = user;</div><div class='add'>+			hw_port-&gt;old_mtu = user-&gt;mtu;</div><div class='add'>+</div><div class='add'>+			list_add(&amp;hw_port-&gt;list, &amp;hw_port_list);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attempt to configure the entire hardware bridge to the newly added</div><div class='add'>+	 * interface's MTU first, regardless of whether the intention of the</div><div class='add'>+	 * user was to raise or lower it.</div><div class='add'>+	 */</div><div class='add'>+	err = dsa_hw_port_list_set_mtu(&amp;hw_port_list, dp-&gt;user-&gt;mtu);</div><div class='add'>+	if (!err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Clearly that didn't work out so well, so just set the minimum MTU on</div><div class='add'>+	 * all hardware bridge ports now. If this fails too, then all ports will</div><div class='add'>+	 * still have their old MTU rolled back anyway.</div><div class='add'>+	 */</div><div class='add'>+	dsa_hw_port_list_set_mtu(&amp;hw_port_list, min_mtu);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dsa_hw_port_list_free(&amp;hw_port_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_change_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	int largest_mtu = 0;</div><div class='add'>+	int new_conduit_mtu;</div><div class='add'>+	int old_conduit_mtu;</div><div class='add'>+	int mtu_limit;</div><div class='add'>+	int overhead;</div><div class='add'>+	int cpu_mtu;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_change_mtu)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_user_port(other_dp, ds-&gt;dst) {</div><div class='add'>+		int user_mtu;</div><div class='add'>+</div><div class='add'>+		/* During probe, this function will be called for each user</div><div class='add'>+		 * device, while not all of them have been allocated. That's</div><div class='add'>+		 * ok, it doesn't change what the maximum is, so ignore it.</div><div class='add'>+		 */</div><div class='add'>+		if (!other_dp-&gt;user)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Pretend that we already applied the setting, which we</div><div class='add'>+		 * actually haven't (still haven't done all integrity checks)</div><div class='add'>+		 */</div><div class='add'>+		if (dp == other_dp)</div><div class='add'>+			user_mtu = new_mtu;</div><div class='add'>+		else</div><div class='add'>+			user_mtu = other_dp-&gt;user-&gt;mtu;</div><div class='add'>+</div><div class='add'>+		if (largest_mtu &lt; user_mtu)</div><div class='add'>+			largest_mtu = user_mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	overhead = dsa_tag_protocol_overhead(cpu_dp-&gt;tag_ops);</div><div class='add'>+	mtu_limit = min_t(int, conduit-&gt;max_mtu, dev-&gt;max_mtu + overhead);</div><div class='add'>+	old_conduit_mtu = conduit-&gt;mtu;</div><div class='add'>+	new_conduit_mtu = largest_mtu + overhead;</div><div class='add'>+	if (new_conduit_mtu &gt; mtu_limit)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* If the conduit MTU isn't over limit, there's no need to check the CPU</div><div class='add'>+	 * MTU, since that surely isn't either.</div><div class='add'>+	 */</div><div class='add'>+	cpu_mtu = largest_mtu;</div><div class='add'>+</div><div class='add'>+	/* Start applying stuff */</div><div class='add'>+	if (new_conduit_mtu != old_conduit_mtu) {</div><div class='add'>+		err = dev_set_mtu(conduit, new_conduit_mtu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_conduit_failed;</div><div class='add'>+</div><div class='add'>+		/* We only need to propagate the MTU of the CPU port to</div><div class='add'>+		 * upstream switches, so emit a notifier which updates them.</div><div class='add'>+		 */</div><div class='add'>+		err = dsa_port_mtu_change(cpu_dp, cpu_mtu);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_cpu_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_change_mtu(ds, dp-&gt;index, new_mtu);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_port_failed;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='add'>+</div><div class='add'>+	dsa_bridge_mtu_normalization(dp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_port_failed:</div><div class='add'>+	if (new_conduit_mtu != old_conduit_mtu)</div><div class='add'>+		dsa_port_mtu_change(cpu_dp, old_conduit_mtu - overhead);</div><div class='add'>+out_cpu_failed:</div><div class='add'>+	if (new_conduit_mtu != old_conduit_mtu)</div><div class='add'>+		dev_set_mtu(conduit, old_conduit_mtu);</div><div class='add'>+out_conduit_failed:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_set_apptrust(struct net_device *dev, u8 *sel, int nsel)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_set_apptrust)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_set_apptrust(ds, port, sel, nsel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_get_apptrust(struct net_device *dev, u8 *sel, int *nsel)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_get_apptrust)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_get_apptrust(ds, port, sel, nsel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_set_default_prio(struct net_device *dev, struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	unsigned long mask, new_prio;</div><div class='add'>+	int err, port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_set_default_prio)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = dcb_ieee_setapp(dev, app);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mask = dcb_ieee_getapp_mask(dev, app);</div><div class='add'>+	new_prio = __fls(mask);</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_set_default_prio(ds, port, new_prio);</div><div class='add'>+	if (err) {</div><div class='add'>+		dcb_ieee_delapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update the DSCP prio entries on all user ports of the switch in case</div><div class='add'>+ * the switch supports global DSCP prio instead of per port DSCP prios.</div><div class='add'>+ */</div><div class='add'>+static int dsa_user_dcbnl_ieee_global_dscp_setdel(struct net_device *dev,</div><div class='add'>+						  struct dcb_app *app, bool del)</div><div class='add'>+{</div><div class='add'>+	int (*setdel)(struct net_device *dev, struct dcb_app *app);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct dsa_port *other_dp;</div><div class='add'>+	int err, restore_err;</div><div class='add'>+</div><div class='add'>+	if (del)</div><div class='add'>+		setdel = dcb_ieee_delapp;</div><div class='add'>+	else</div><div class='add'>+		setdel = dcb_ieee_setapp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(other_dp, ds) {</div><div class='add'>+		struct net_device *user = other_dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		if (!user || user == dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = setdel(user, app);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_try_to_restore;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_try_to_restore:</div><div class='add'>+</div><div class='add'>+	/* Revert logic to restore previous state of app entries */</div><div class='add'>+	if (!del)</div><div class='add'>+		setdel = dcb_ieee_delapp;</div><div class='add'>+	else</div><div class='add'>+		setdel = dcb_ieee_setapp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port_continue_reverse(other_dp, ds) {</div><div class='add'>+		struct net_device *user = other_dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		if (!user || user == dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		restore_err = setdel(user, app);</div><div class='add'>+		if (restore_err)</div><div class='add'>+			netdev_err(user, "Failed to restore DSCP prio entry configuration\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_add_dscp_prio(struct net_device *dev, struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	unsigned long mask, new_prio;</div><div class='add'>+	int err, port = dp-&gt;index;</div><div class='add'>+	u8 dscp = app-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_add_dscp_prio)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (dscp &gt;= 64) {</div><div class='add'>+		netdev_err(dev, "DSCP APP entry with protocol value %u is invalid\n",</div><div class='add'>+			   dscp);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dcb_ieee_setapp(dev, app);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mask = dcb_ieee_getapp_mask(dev, app);</div><div class='add'>+	new_prio = __fls(mask);</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_add_dscp_prio(ds, port, dscp, new_prio);</div><div class='add'>+	if (err) {</div><div class='add'>+		dcb_ieee_delapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;dscp_prio_mapping_is_global)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_user_dcbnl_ieee_global_dscp_setdel(dev, app, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (ds-&gt;ops-&gt;port_del_dscp_prio)</div><div class='add'>+			ds-&gt;ops-&gt;port_del_dscp_prio(ds, port, dscp, new_prio);</div><div class='add'>+		dcb_ieee_delapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused dsa_user_dcbnl_ieee_setapp(struct net_device *dev,</div><div class='add'>+						     struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	switch (app-&gt;selector) {</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_ETHERTYPE:</div><div class='add'>+		switch (app-&gt;protocol) {</div><div class='add'>+		case 0:</div><div class='add'>+			return dsa_user_dcbnl_set_default_prio(dev, app);</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_DSCP:</div><div class='add'>+		return dsa_user_dcbnl_add_dscp_prio(dev, app);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_del_default_prio(struct net_device *dev, struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	unsigned long mask, new_prio;</div><div class='add'>+	int err, port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_set_default_prio)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = dcb_ieee_delapp(dev, app);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mask = dcb_ieee_getapp_mask(dev, app);</div><div class='add'>+	new_prio = mask ? __fls(mask) : 0;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_set_default_prio(ds, port, new_prio);</div><div class='add'>+	if (err) {</div><div class='add'>+		dcb_ieee_setapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused</div><div class='add'>+dsa_user_dcbnl_del_dscp_prio(struct net_device *dev, struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int err, port = dp-&gt;index;</div><div class='add'>+	u8 dscp = app-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_del_dscp_prio)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = dcb_ieee_delapp(dev, app);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ds-&gt;ops-&gt;port_del_dscp_prio(ds, port, dscp, app-&gt;priority);</div><div class='add'>+	if (err) {</div><div class='add'>+		dcb_ieee_setapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;dscp_prio_mapping_is_global)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dsa_user_dcbnl_ieee_global_dscp_setdel(dev, app, true);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (ds-&gt;ops-&gt;port_add_dscp_prio)</div><div class='add'>+			ds-&gt;ops-&gt;port_add_dscp_prio(ds, port, dscp,</div><div class='add'>+						    app-&gt;priority);</div><div class='add'>+		dcb_ieee_setapp(dev, app);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused dsa_user_dcbnl_ieee_delapp(struct net_device *dev,</div><div class='add'>+						     struct dcb_app *app)</div><div class='add'>+{</div><div class='add'>+	switch (app-&gt;selector) {</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_ETHERTYPE:</div><div class='add'>+		switch (app-&gt;protocol) {</div><div class='add'>+		case 0:</div><div class='add'>+			return dsa_user_dcbnl_del_default_prio(dev, app);</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE_8021QAZ_APP_SEL_DSCP:</div><div class='add'>+		return dsa_user_dcbnl_del_dscp_prio(dev, app);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Pre-populate the DCB application priority table with the priorities</div><div class='add'>+ * configured during switch setup, which we read from hardware here.</div><div class='add'>+ */</div><div class='add'>+static int dsa_user_dcbnl_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_get_default_prio) {</div><div class='add'>+		int prio = ds-&gt;ops-&gt;port_get_default_prio(ds, port);</div><div class='add'>+		struct dcb_app app = {</div><div class='add'>+			.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE,</div><div class='add'>+			.protocol = 0,</div><div class='add'>+			.priority = prio,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (prio &lt; 0)</div><div class='add'>+			return prio;</div><div class='add'>+</div><div class='add'>+		err = dcb_ieee_setapp(dev, &amp;app);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_get_dscp_prio) {</div><div class='add'>+		int protocol;</div><div class='add'>+</div><div class='add'>+		for (protocol = 0; protocol &lt; 64; protocol++) {</div><div class='add'>+			struct dcb_app app = {</div><div class='add'>+				.selector = IEEE_8021QAZ_APP_SEL_DSCP,</div><div class='add'>+				.protocol = protocol,</div><div class='add'>+			};</div><div class='add'>+			int prio;</div><div class='add'>+</div><div class='add'>+			prio = ds-&gt;ops-&gt;port_get_dscp_prio(ds, port, protocol);</div><div class='add'>+			if (prio == -EOPNOTSUPP)</div><div class='add'>+				continue;</div><div class='add'>+			if (prio &lt; 0)</div><div class='add'>+				return prio;</div><div class='add'>+</div><div class='add'>+			app.priority = prio;</div><div class='add'>+</div><div class='add'>+			err = dcb_ieee_setapp(dev, &amp;app);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops dsa_user_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= dsa_user_get_drvinfo,</div><div class='add'>+	.get_regs_len		= dsa_user_get_regs_len,</div><div class='add'>+	.get_regs		= dsa_user_get_regs,</div><div class='add'>+	.nway_reset		= dsa_user_nway_reset,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_eeprom_len		= dsa_user_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= dsa_user_get_eeprom,</div><div class='add'>+	.set_eeprom		= dsa_user_set_eeprom,</div><div class='add'>+	.get_strings		= dsa_user_get_strings,</div><div class='add'>+	.get_ethtool_stats	= dsa_user_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= dsa_user_get_sset_count,</div><div class='add'>+	.get_eth_phy_stats	= dsa_user_get_eth_phy_stats,</div><div class='add'>+	.get_eth_mac_stats	= dsa_user_get_eth_mac_stats,</div><div class='add'>+	.get_eth_ctrl_stats	= dsa_user_get_eth_ctrl_stats,</div><div class='add'>+	.get_rmon_stats		= dsa_user_get_rmon_stats,</div><div class='add'>+	.get_ts_stats		= dsa_user_get_ts_stats,</div><div class='add'>+	.set_wol		= dsa_user_set_wol,</div><div class='add'>+	.get_wol		= dsa_user_get_wol,</div><div class='add'>+	.set_eee		= dsa_user_set_eee,</div><div class='add'>+	.get_eee		= dsa_user_get_eee,</div><div class='add'>+	.get_link_ksettings	= dsa_user_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= dsa_user_set_link_ksettings,</div><div class='add'>+	.get_pause_stats	= dsa_user_get_pause_stats,</div><div class='add'>+	.get_pauseparam		= dsa_user_get_pauseparam,</div><div class='add'>+	.set_pauseparam		= dsa_user_set_pauseparam,</div><div class='add'>+	.get_rxnfc		= dsa_user_get_rxnfc,</div><div class='add'>+	.set_rxnfc		= dsa_user_set_rxnfc,</div><div class='add'>+	.get_ts_info		= dsa_user_get_ts_info,</div><div class='add'>+	.self_test		= dsa_user_net_selftest,</div><div class='add'>+	.get_mm			= dsa_user_get_mm,</div><div class='add'>+	.set_mm			= dsa_user_set_mm,</div><div class='add'>+	.get_mm_stats		= dsa_user_get_mm_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dcbnl_rtnl_ops __maybe_unused dsa_user_dcbnl_ops = {</div><div class='add'>+	.ieee_setapp		= dsa_user_dcbnl_ieee_setapp,</div><div class='add'>+	.ieee_delapp		= dsa_user_dcbnl_ieee_delapp,</div><div class='add'>+	.dcbnl_setapptrust	= dsa_user_dcbnl_set_apptrust,</div><div class='add'>+	.dcbnl_getapptrust	= dsa_user_dcbnl_get_apptrust,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dsa_user_get_stats64(struct net_device *dev,</div><div class='add'>+				 struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_stats64)</div><div class='add'>+		ds-&gt;ops-&gt;get_stats64(ds, dp-&gt;index, s);</div><div class='add'>+	else</div><div class='add'>+		dev_get_tstats64(dev, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_fill_forward_path(struct net_device_path_ctx *ctx,</div><div class='add'>+				      struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(ctx-&gt;dev);</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='add'>+	path-&gt;dev = ctx-&gt;dev;</div><div class='add'>+	path-&gt;type = DEV_PATH_DSA;</div><div class='add'>+	path-&gt;dsa.proto = cpu_dp-&gt;tag_ops-&gt;proto;</div><div class='add'>+	path-&gt;dsa.port = dp-&gt;index;</div><div class='add'>+	ctx-&gt;dev = conduit;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_hwtstamp_get(struct net_device *dev,</div><div class='add'>+				 struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_hwtstamp_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_hwtstamp_get(ds, dp-&gt;index, cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_hwtstamp_set(struct net_device *dev,</div><div class='add'>+				 struct kernel_hwtstamp_config *cfg,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_hwtstamp_set)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ds-&gt;ops-&gt;port_hwtstamp_set(ds, dp-&gt;index, cfg, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops dsa_user_netdev_ops = {</div><div class='add'>+	.ndo_open		= dsa_user_open,</div><div class='add'>+	.ndo_stop		= dsa_user_close,</div><div class='add'>+	.ndo_start_xmit		= dsa_user_xmit,</div><div class='add'>+	.ndo_change_rx_flags	= dsa_user_change_rx_flags,</div><div class='add'>+	.ndo_set_rx_mode	= dsa_user_set_rx_mode,</div><div class='add'>+	.ndo_set_mac_address	= dsa_user_set_mac_address,</div><div class='add'>+	.ndo_fdb_dump		= dsa_user_fdb_dump,</div><div class='add'>+	.ndo_eth_ioctl		= dsa_user_ioctl,</div><div class='add'>+	.ndo_get_iflink		= dsa_user_get_iflink,</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	.ndo_netpoll_setup	= dsa_user_netpoll_setup,</div><div class='add'>+	.ndo_netpoll_cleanup	= dsa_user_netpoll_cleanup,</div><div class='add'>+	.ndo_poll_controller	= dsa_user_poll_controller,</div><div class='add'>+#endif</div><div class='add'>+	.ndo_setup_tc		= dsa_user_setup_tc,</div><div class='add'>+	.ndo_get_stats64	= dsa_user_get_stats64,</div><div class='add'>+	.ndo_vlan_rx_add_vid	= dsa_user_vlan_rx_add_vid,</div><div class='add'>+	.ndo_vlan_rx_kill_vid	= dsa_user_vlan_rx_kill_vid,</div><div class='add'>+	.ndo_change_mtu		= dsa_user_change_mtu,</div><div class='add'>+	.ndo_fill_forward_path	= dsa_user_fill_forward_path,</div><div class='add'>+	.ndo_hwtstamp_get	= dsa_user_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= dsa_user_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct device_type dsa_type = {</div><div class='add'>+	.name	= "dsa",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;pl)</div><div class='add'>+		phylink_mac_change(dp-&gt;pl, up);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_change);</div><div class='add'>+</div><div class='add'>+static void dsa_user_phylink_fixed_state(struct phylink_config *config,</div><div class='add'>+					 struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	/* No need to check that this operation is valid, the callback would</div><div class='add'>+	 * not be called if it was not.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;ops-&gt;phylink_fixed_state(ds, dp-&gt;index, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* user device setup *******************************************************/</div><div class='add'>+static int dsa_user_phy_connect(struct net_device *user_dev, int addr,</div><div class='add'>+				u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user_dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	user_dev-&gt;phydev = mdiobus_get_phy(ds-&gt;user_mii_bus, addr);</div><div class='add'>+	if (!user_dev-&gt;phydev) {</div><div class='add'>+		netdev_err(user_dev, "no phy at %d\n", addr);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	user_dev-&gt;phydev-&gt;dev_flags |= flags;</div><div class='add'>+</div><div class='add'>+	return phylink_connect_phy(dp-&gt;pl, user_dev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_phy_setup(struct net_device *user_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user_dev);</div><div class='add'>+	struct device_node *port_dn = dp-&gt;dn;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	u32 phy_flags = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dp-&gt;pl_config.dev = &amp;user_dev-&gt;dev;</div><div class='add'>+	dp-&gt;pl_config.type = PHYLINK_NETDEV;</div><div class='add'>+</div><div class='add'>+	/* The get_fixed_state callback takes precedence over polling the</div><div class='add'>+	 * link GPIO in PHYLINK (see phylink_get_fixed_state).  Only set</div><div class='add'>+	 * this if the switch provides such a callback.</div><div class='add'>+	 */</div><div class='add'>+	if (ds-&gt;ops-&gt;phylink_fixed_state) {</div><div class='add'>+		dp-&gt;pl_config.get_fixed_state = dsa_user_phylink_fixed_state;</div><div class='add'>+		dp-&gt;pl_config.poll_fixed_state = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dsa_port_phylink_create(dp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;get_phy_flags)</div><div class='add'>+		phy_flags = ds-&gt;ops-&gt;get_phy_flags(ds, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	ret = phylink_of_phy_connect(dp-&gt;pl, port_dn, phy_flags);</div><div class='add'>+	if (ret == -ENODEV &amp;&amp; ds-&gt;user_mii_bus) {</div><div class='add'>+		/* We could not connect to a designated PHY or SFP, so try to</div><div class='add'>+		 * use the switch internal MDIO bus instead</div><div class='add'>+		 */</div><div class='add'>+		ret = dsa_user_phy_connect(user_dev, dp-&gt;index, phy_flags);</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(user_dev, "failed to connect to PHY: %pe\n",</div><div class='add'>+			   ERR_PTR(ret));</div><div class='add'>+		dsa_port_phylink_destroy(dp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_setup_tagger(struct net_device *user)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user);</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(user);</div><div class='add'>+	const struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+	const struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	user-&gt;needed_headroom = cpu_dp-&gt;tag_ops-&gt;needed_headroom;</div><div class='add'>+	user-&gt;needed_tailroom = cpu_dp-&gt;tag_ops-&gt;needed_tailroom;</div><div class='add'>+	/* Try to save one extra realloc later in the TX path (in the conduit)</div><div class='add'>+	 * by also inheriting the conduit's needed headroom and tailroom.</div><div class='add'>+	 * The 8021q driver also does this.</div><div class='add'>+	 */</div><div class='add'>+	user-&gt;needed_headroom += conduit-&gt;needed_headroom;</div><div class='add'>+	user-&gt;needed_tailroom += conduit-&gt;needed_tailroom;</div><div class='add'>+</div><div class='add'>+	p-&gt;xmit = cpu_dp-&gt;tag_ops-&gt;xmit;</div><div class='add'>+</div><div class='add'>+	user-&gt;features = conduit-&gt;vlan_features | NETIF_F_HW_TC;</div><div class='add'>+	user-&gt;hw_features |= NETIF_F_HW_TC;</div><div class='add'>+	if (user-&gt;needed_tailroom)</div><div class='add'>+		user-&gt;features &amp;= ~(NETIF_F_SG | NETIF_F_FRAGLIST);</div><div class='add'>+	if (ds-&gt;needs_standalone_vlan_filtering)</div><div class='add'>+		user-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+</div><div class='add'>+	user-&gt;lltx = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_suspend(struct net_device *user_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user_dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(user_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(user_dev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	phylink_stop(dp-&gt;pl);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_resume(struct net_device *user_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user_dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(user_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_device_attach(user_dev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	phylink_start(dp-&gt;pl);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_create(struct dsa_port *port)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_port_to_conduit(port);</div><div class='add'>+	struct dsa_switch *ds = port-&gt;ds;</div><div class='add'>+	struct net_device *user_dev;</div><div class='add'>+	struct dsa_user_priv *p;</div><div class='add'>+	const char *name;</div><div class='add'>+	int assign_type;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;num_tx_queues)</div><div class='add'>+		ds-&gt;num_tx_queues = 1;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;name) {</div><div class='add'>+		name = port-&gt;name;</div><div class='add'>+		assign_type = NET_NAME_PREDICTABLE;</div><div class='add'>+	} else {</div><div class='add'>+		name = "eth%d";</div><div class='add'>+		assign_type = NET_NAME_ENUM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	user_dev = alloc_netdev_mqs(sizeof(struct dsa_user_priv), name,</div><div class='add'>+				    assign_type, ether_setup,</div><div class='add'>+				    ds-&gt;num_tx_queues, 1);</div><div class='add'>+	if (user_dev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	user_dev-&gt;rtnl_link_ops = &amp;dsa_link_ops;</div><div class='add'>+	user_dev-&gt;ethtool_ops = &amp;dsa_user_ethtool_ops;</div><div class='add'>+#if IS_ENABLED(CONFIG_DCB)</div><div class='add'>+	user_dev-&gt;dcbnl_ops = &amp;dsa_user_dcbnl_ops;</div><div class='add'>+#endif</div><div class='add'>+	if (!is_zero_ether_addr(port-&gt;mac))</div><div class='add'>+		eth_hw_addr_set(user_dev, port-&gt;mac);</div><div class='add'>+	else</div><div class='add'>+		eth_hw_addr_inherit(user_dev, conduit);</div><div class='add'>+	user_dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	if (dsa_switch_supports_uc_filtering(ds))</div><div class='add'>+		user_dev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+	user_dev-&gt;netdev_ops = &amp;dsa_user_netdev_ops;</div><div class='add'>+	if (ds-&gt;ops-&gt;port_max_mtu)</div><div class='add'>+		user_dev-&gt;max_mtu = ds-&gt;ops-&gt;port_max_mtu(ds, port-&gt;index);</div><div class='add'>+	SET_NETDEV_DEVTYPE(user_dev, &amp;dsa_type);</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(user_dev, port-&gt;ds-&gt;dev);</div><div class='add'>+	SET_NETDEV_DEVLINK_PORT(user_dev, &amp;port-&gt;devlink_port);</div><div class='add'>+	user_dev-&gt;dev.of_node = port-&gt;dn;</div><div class='add'>+	user_dev-&gt;vlan_features = conduit-&gt;vlan_features;</div><div class='add'>+</div><div class='add'>+	p = netdev_priv(user_dev);</div><div class='add'>+	user_dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='add'>+</div><div class='add'>+	ret = gro_cells_init(&amp;p-&gt;gcells, user_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	p-&gt;dp = port;</div><div class='add'>+	INIT_LIST_HEAD(&amp;p-&gt;mall_tc_list);</div><div class='add'>+	port-&gt;user = user_dev;</div><div class='add'>+	dsa_user_setup_tagger(user_dev);</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(user_dev);</div><div class='add'>+</div><div class='add'>+	ret = dsa_user_phy_setup(user_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(user_dev,</div><div class='add'>+			   "error %d setting up PHY for tree %d, switch %d, port %d\n",</div><div class='add'>+			   ret, ds-&gt;dst-&gt;index, ds-&gt;index, port-&gt;index);</div><div class='add'>+		goto out_gcells;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	ret = dsa_user_change_mtu(user_dev, ETH_DATA_LEN);</div><div class='add'>+	if (ret &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+		dev_warn(ds-&gt;dev, "nonfatal error %d setting MTU to %d on port %d\n",</div><div class='add'>+			 ret, ETH_DATA_LEN, port-&gt;index);</div><div class='add'>+</div><div class='add'>+	ret = register_netdevice(user_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(conduit, "error %d registering interface %s\n",</div><div class='add'>+			   ret, user_dev-&gt;name);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		goto out_phy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_DCB)) {</div><div class='add'>+		ret = dsa_user_dcbnl_init(user_dev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(user_dev,</div><div class='add'>+				   "failed to initialize DCB: %pe\n",</div><div class='add'>+				   ERR_PTR(ret));</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			goto out_unregister;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = netdev_upper_dev_link(conduit, user_dev, NULL);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unregister;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	unregister_netdev(user_dev);</div><div class='add'>+out_phy:</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	phylink_disconnect_phy(p-&gt;dp-&gt;pl);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	dsa_port_phylink_destroy(p-&gt;dp);</div><div class='add'>+out_gcells:</div><div class='add'>+	gro_cells_destroy(&amp;p-&gt;gcells);</div><div class='add'>+out_free:</div><div class='add'>+	free_netdev(user_dev);</div><div class='add'>+	port-&gt;user = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_destroy(struct net_device *user_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *conduit = dsa_user_to_conduit(user_dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(user_dev);</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(user_dev);</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(user_dev);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_upper_dev_unlink(conduit, user_dev);</div><div class='add'>+	unregister_netdevice(user_dev);</div><div class='add'>+	phylink_disconnect_phy(dp-&gt;pl);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	dsa_port_phylink_destroy(dp);</div><div class='add'>+	gro_cells_destroy(&amp;p-&gt;gcells);</div><div class='add'>+	free_netdev(user_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dsa_user_change_conduit(struct net_device *dev, struct net_device *conduit,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *old_conduit = dsa_user_to_conduit(dev);</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct net_device *upper;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (conduit == old_conduit)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!ds-&gt;ops-&gt;port_change_conduit) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Driver does not support changing DSA conduit");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(conduit)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Interface not eligible as DSA conduit");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_for_each_upper_dev_rcu(conduit, upper, iter) {</div><div class='add'>+		if (dsa_user_dev_check(upper))</div><div class='add'>+			continue;</div><div class='add'>+		if (netif_is_bridge_master(upper))</div><div class='add'>+			continue;</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot join conduit with unknown uppers");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Since we allow live-changing the DSA conduit, plus we auto-open the</div><div class='add'>+	 * DSA conduit when the user port opens =&gt; we need to ensure that the</div><div class='add'>+	 * new DSA conduit is open too.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		err = dev_open(conduit, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_upper_dev_unlink(old_conduit, dev);</div><div class='add'>+</div><div class='add'>+	err = netdev_upper_dev_link(conduit, dev, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_revert_old_conduit_unlink;</div><div class='add'>+</div><div class='add'>+	err = dsa_port_change_conduit(dp, conduit, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_revert_conduit_link;</div><div class='add'>+</div><div class='add'>+	/* Update the MTU of the new CPU port through cross-chip notifiers */</div><div class='add'>+	err = dsa_user_change_mtu(dev, dev-&gt;mtu);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP) {</div><div class='add'>+		netdev_warn(dev,</div><div class='add'>+			    "nonfatal error updating MTU with new conduit: %pe\n",</div><div class='add'>+			    ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_revert_conduit_link:</div><div class='add'>+	netdev_upper_dev_unlink(conduit, dev);</div><div class='add'>+out_revert_old_conduit_unlink:</div><div class='add'>+	netdev_upper_dev_link(old_conduit, dev, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool dsa_user_dev_check(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;netdev_ops == &amp;dsa_user_netdev_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dsa_user_dev_check);</div><div class='add'>+</div><div class='add'>+static int dsa_user_changeupper(struct net_device *dev,</div><div class='add'>+				struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!dsa_user_dev_check(dev))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dp = dsa_user_to_port(dev);</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(info-&gt;upper_dev)) {</div><div class='add'>+		if (info-&gt;linking) {</div><div class='add'>+			err = dsa_port_bridge_join(dp, info-&gt;upper_dev, extack);</div><div class='add'>+			if (!err)</div><div class='add'>+				dsa_bridge_mtu_normalization(dp);</div><div class='add'>+			if (err == -EOPNOTSUPP) {</div><div class='add'>+				NL_SET_ERR_MSG_WEAK_MOD(extack,</div><div class='add'>+							"Offloading not supported");</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			err = notifier_from_errno(err);</div><div class='add'>+		} else {</div><div class='add'>+			dsa_port_bridge_leave(dp, info-&gt;upper_dev);</div><div class='add'>+			err = NOTIFY_OK;</div><div class='add'>+		}</div><div class='add'>+	} else if (netif_is_lag_master(info-&gt;upper_dev)) {</div><div class='add'>+		if (info-&gt;linking) {</div><div class='add'>+			err = dsa_port_lag_join(dp, info-&gt;upper_dev,</div><div class='add'>+						info-&gt;upper_info, extack);</div><div class='add'>+			if (err == -EOPNOTSUPP) {</div><div class='add'>+				NL_SET_ERR_MSG_WEAK_MOD(extack,</div><div class='add'>+							"Offloading not supported");</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			err = notifier_from_errno(err);</div><div class='add'>+		} else {</div><div class='add'>+			dsa_port_lag_leave(dp, info-&gt;upper_dev);</div><div class='add'>+			err = NOTIFY_OK;</div><div class='add'>+		}</div><div class='add'>+	} else if (is_hsr_master(info-&gt;upper_dev)) {</div><div class='add'>+		if (info-&gt;linking) {</div><div class='add'>+			err = dsa_port_hsr_join(dp, info-&gt;upper_dev, extack);</div><div class='add'>+			if (err == -EOPNOTSUPP) {</div><div class='add'>+				NL_SET_ERR_MSG_WEAK_MOD(extack,</div><div class='add'>+							"Offloading not supported");</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			err = notifier_from_errno(err);</div><div class='add'>+		} else {</div><div class='add'>+			dsa_port_hsr_leave(dp, info-&gt;upper_dev);</div><div class='add'>+			err = NOTIFY_OK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_prechangeupper(struct net_device *dev,</div><div class='add'>+				   struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!dsa_user_dev_check(dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(info-&gt;upper_dev) &amp;&amp; !info-&gt;linking)</div><div class='add'>+		dsa_port_pre_bridge_leave(dp, info-&gt;upper_dev);</div><div class='add'>+	else if (netif_is_lag_master(info-&gt;upper_dev) &amp;&amp; !info-&gt;linking)</div><div class='add'>+		dsa_port_pre_lag_leave(dp, info-&gt;upper_dev);</div><div class='add'>+	/* dsa_port_pre_hsr_leave is not yet necessary since hsr devices cannot</div><div class='add'>+	 * meaningfully placed under a bridge yet</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_lag_changeupper(struct net_device *dev,</div><div class='add'>+			 struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_lag_master(dev))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower, iter) {</div><div class='add'>+		if (!dsa_user_dev_check(lower))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dp = dsa_user_to_port(lower);</div><div class='add'>+		if (!dp-&gt;lag)</div><div class='add'>+			/* Software LAG */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_changeupper(lower, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Same as dsa_user_lag_changeupper() except that it calls</div><div class='add'>+ * dsa_user_prechangeupper()</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dsa_user_lag_prechangeupper(struct net_device *dev,</div><div class='add'>+			    struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_lag_master(dev))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(dev, lower, iter) {</div><div class='add'>+		if (!dsa_user_dev_check(lower))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dp = dsa_user_to_port(lower);</div><div class='add'>+		if (!dp-&gt;lag)</div><div class='add'>+			/* Software LAG */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_prechangeupper(lower, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_prevent_bridging_8021q_upper(struct net_device *dev,</div><div class='add'>+				 struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *ext_ack;</div><div class='add'>+	struct net_device *user, *br;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	ext_ack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	if (!is_vlan_dev(dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	user = vlan_dev_real_dev(dev);</div><div class='add'>+	if (!dsa_user_dev_check(user))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	dp = dsa_user_to_port(user);</div><div class='add'>+	br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	if (!br)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/* Deny enslaving a VLAN device into a VLAN-aware bridge */</div><div class='add'>+	if (br_vlan_enabled(br) &amp;&amp;</div><div class='add'>+	    netif_is_bridge_master(info-&gt;upper_dev) &amp;&amp; info-&gt;linking) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(ext_ack,</div><div class='add'>+				   "Cannot make VLAN device join VLAN-aware bridge");</div><div class='add'>+		return notifier_from_errno(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_check_8021q_upper(struct net_device *dev,</div><div class='add'>+			   struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct bridge_vlan_info br_info;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='add'>+	u16 vid;</div><div class='add'>+</div><div class='add'>+	if (!br || !br_vlan_enabled(br))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+	vid = vlan_dev_vlan_id(info-&gt;upper_dev);</div><div class='add'>+</div><div class='add'>+	/* br_vlan_get_info() returns -EINVAL or -ENOENT if the</div><div class='add'>+	 * device, respectively the VID is not found, returning</div><div class='add'>+	 * 0 means success, which is a failure for us here.</div><div class='add'>+	 */</div><div class='add'>+	err = br_vlan_get_info(br, vid, &amp;br_info);</div><div class='add'>+	if (err == 0) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "This VLAN is already configured by the bridge");</div><div class='add'>+		return notifier_from_errno(-EBUSY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_user_prechangeupper_sanity_check(struct net_device *dev,</div><div class='add'>+				     struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dsa_user_dev_check(dev))</div><div class='add'>+		return dsa_prevent_bridging_8021q_upper(dev, info);</div><div class='add'>+</div><div class='add'>+	dp = dsa_user_to_port(dev);</div><div class='add'>+	ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;port_prechangeupper) {</div><div class='add'>+		err = ds-&gt;ops-&gt;port_prechangeupper(ds, dp-&gt;index, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return notifier_from_errno(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_vlan_dev(info-&gt;upper_dev))</div><div class='add'>+		return dsa_user_check_8021q_upper(dev, info);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* To be eligible as a DSA conduit, a LAG must have all lower interfaces be</div><div class='add'>+ * eligible DSA conduits. Additionally, all LAG slaves must be DSA conduits of</div><div class='add'>+ * switches in the same switch tree.</div><div class='add'>+ */</div><div class='add'>+static int dsa_lag_conduit_validate(struct net_device *lag_dev,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lower1, *lower2;</div><div class='add'>+	struct list_head *iter1, *iter2;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(lag_dev, lower1, iter1) {</div><div class='add'>+		netdev_for_each_lower_dev(lag_dev, lower2, iter2) {</div><div class='add'>+			if (!netdev_uses_dsa(lower1) ||</div><div class='add'>+			    !netdev_uses_dsa(lower2)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "All LAG ports must be eligible as DSA conduits");</div><div class='add'>+				return notifier_from_errno(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (lower1 == lower2)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!dsa_port_tree_same(lower1-&gt;dsa_ptr,</div><div class='add'>+						lower2-&gt;dsa_ptr)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "LAG contains DSA conduits of disjoint switch trees");</div><div class='add'>+				return notifier_from_errno(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_conduit_prechangeupper_sanity_check(struct net_device *conduit,</div><div class='add'>+					struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(conduit))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;linking)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/* Allow DSA switch uppers */</div><div class='add'>+	if (dsa_user_dev_check(info-&gt;upper_dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/* Allow bridge uppers of DSA conduits, subject to further</div><div class='add'>+	 * restrictions in dsa_bridge_prechangelower_sanity_check()</div><div class='add'>+	 */</div><div class='add'>+	if (netif_is_bridge_master(info-&gt;upper_dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/* Allow LAG uppers, subject to further restrictions in</div><div class='add'>+	 * dsa_lag_conduit_prechangelower_sanity_check()</div><div class='add'>+	 */</div><div class='add'>+	if (netif_is_lag_master(info-&gt;upper_dev))</div><div class='add'>+		return dsa_lag_conduit_validate(info-&gt;upper_dev, extack);</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+			   "DSA conduit cannot join unknown upper interfaces");</div><div class='add'>+	return notifier_from_errno(-EBUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dsa_lag_conduit_prechangelower_sanity_check(struct net_device *dev,</div><div class='add'>+					    struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+	struct net_device *lag_dev = info-&gt;upper_dev;</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(lag_dev) || !netif_is_lag_master(lag_dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;linking)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Only DSA conduits can join a LAG DSA conduit");</div><div class='add'>+		return notifier_from_errno(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(lag_dev, lower, iter) {</div><div class='add'>+		if (!dsa_port_tree_same(dev-&gt;dsa_ptr, lower-&gt;dsa_ptr)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Interface is DSA conduit for a different switch tree than this LAG");</div><div class='add'>+			return notifier_from_errno(-EINVAL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Don't allow bridging of DSA conduits, since the bridge layer rx_handler</div><div class='add'>+ * prevents the DSA fake ethertype handler to be invoked, so we don't get the</div><div class='add'>+ * chance to strip off and parse the DSA switch tag protocol header (the bridge</div><div class='add'>+ * layer just returns RX_HANDLER_CONSUMED, stopping RX processing for these</div><div class='add'>+ * frames).</div><div class='add'>+ * The only case where that would not be an issue is when bridging can already</div><div class='add'>+ * be offloaded, such as when the DSA conduit is itself a DSA or plain switchdev</div><div class='add'>+ * port, and is bridged only with other ports from the same hardware device.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dsa_bridge_prechangelower_sanity_check(struct net_device *new_lower,</div><div class='add'>+				       struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = info-&gt;upper_dev;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	if (!netif_is_bridge_master(br))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;linking)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(br, lower, iter) {</div><div class='add'>+		if (!netdev_uses_dsa(new_lower) &amp;&amp; !netdev_uses_dsa(lower))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!netdev_port_same_parent_id(lower, new_lower)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Cannot do software bridging with a DSA conduit");</div><div class='add'>+			return notifier_from_errno(-EINVAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_tree_migrate_ports_from_lag_conduit(struct dsa_switch_tree *dst,</div><div class='add'>+						    struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *new_conduit = dsa_tree_find_first_conduit(dst);</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_user_port(dp, dst) {</div><div class='add'>+		if (dsa_port_to_conduit(dp) != lag_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_change_conduit(dp-&gt;user, new_conduit, NULL);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(dp-&gt;user,</div><div class='add'>+				   "failed to restore conduit to %s: %pe\n",</div><div class='add'>+				   new_conduit-&gt;name, ERR_PTR(err));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_conduit_lag_join(struct net_device *conduit,</div><div class='add'>+				struct net_device *lag_dev,</div><div class='add'>+				struct netdev_lag_upper_info *uinfo,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_conduit_lag_setup(lag_dev, cpu_dp, uinfo, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dsa_tree_for_each_user_port(dp, dst) {</div><div class='add'>+		if (dsa_port_to_conduit(dp) != conduit)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_change_conduit(dp-&gt;user, lag_dev, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto restore;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+restore:</div><div class='add'>+	dsa_tree_for_each_user_port_continue_reverse(dp, dst) {</div><div class='add'>+		if (dsa_port_to_conduit(dp) != lag_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_change_conduit(dp-&gt;user, conduit, NULL);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(dp-&gt;user,</div><div class='add'>+				   "failed to restore conduit to %s: %pe\n",</div><div class='add'>+				   conduit-&gt;name, ERR_PTR(err));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_conduit_lag_teardown(lag_dev, conduit-&gt;dsa_ptr);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_conduit_lag_leave(struct net_device *conduit,</div><div class='add'>+				  struct net_device *lag_dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp, *cpu_dp = lag_dev-&gt;dsa_ptr;</div><div class='add'>+	struct dsa_switch_tree *dst = cpu_dp-&gt;dst;</div><div class='add'>+	struct dsa_port *new_cpu_dp = NULL;</div><div class='add'>+	struct net_device *lower;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(lag_dev, lower, iter) {</div><div class='add'>+		if (netdev_uses_dsa(lower)) {</div><div class='add'>+			new_cpu_dp = lower-&gt;dsa_ptr;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_cpu_dp) {</div><div class='add'>+		/* Update the CPU port of the user ports still under the LAG</div><div class='add'>+		 * so that dsa_port_to_conduit() continues to work properly</div><div class='add'>+		 */</div><div class='add'>+		dsa_tree_for_each_user_port(dp, dst)</div><div class='add'>+			if (dsa_port_to_conduit(dp) == lag_dev)</div><div class='add'>+				dp-&gt;cpu_dp = new_cpu_dp;</div><div class='add'>+</div><div class='add'>+		/* Update the index of the virtual CPU port to match the lowest</div><div class='add'>+		 * physical CPU port</div><div class='add'>+		 */</div><div class='add'>+		lag_dev-&gt;dsa_ptr = new_cpu_dp;</div><div class='add'>+		wmb();</div><div class='add'>+	} else {</div><div class='add'>+		/* If the LAG DSA conduit has no ports left, migrate back all</div><div class='add'>+		 * user ports to the first physical CPU port</div><div class='add'>+		 */</div><div class='add'>+		dsa_tree_migrate_ports_from_lag_conduit(dst, lag_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This DSA conduit has left its LAG in any case, so let</div><div class='add'>+	 * the CPU port leave the hardware LAG as well</div><div class='add'>+	 */</div><div class='add'>+	dsa_conduit_lag_teardown(lag_dev, conduit-&gt;dsa_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_conduit_changeupper(struct net_device *dev,</div><div class='add'>+				   struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	int err = NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(dev))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	if (netif_is_lag_master(info-&gt;upper_dev)) {</div><div class='add'>+		if (info-&gt;linking) {</div><div class='add'>+			err = dsa_conduit_lag_join(dev, info-&gt;upper_dev,</div><div class='add'>+						   info-&gt;upper_info, extack);</div><div class='add'>+			err = notifier_from_errno(err);</div><div class='add'>+		} else {</div><div class='add'>+			dsa_conduit_lag_leave(dev, info-&gt;upper_dev);</div><div class='add'>+			err = NOTIFY_OK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_PRECHANGEUPPER: {</div><div class='add'>+		struct netdev_notifier_changeupper_info *info = ptr;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_prechangeupper_sanity_check(dev, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_conduit_prechangeupper_sanity_check(dev, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_lag_conduit_prechangelower_sanity_check(dev, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_bridge_prechangelower_sanity_check(dev, info);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_prechangeupper(dev, ptr);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_lag_prechangeupper(dev, ptr);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case NETDEV_CHANGEUPPER: {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_changeupper(dev, ptr);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_user_lag_changeupper(dev, ptr);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = dsa_conduit_changeupper(dev, ptr);</div><div class='add'>+		if (notifier_to_errno(err))</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case NETDEV_CHANGELOWERSTATE: {</div><div class='add'>+		struct netdev_notifier_changelowerstate_info *info = ptr;</div><div class='add'>+		struct dsa_port *dp;</div><div class='add'>+		int err = 0;</div><div class='add'>+</div><div class='add'>+		if (dsa_user_dev_check(dev)) {</div><div class='add'>+			dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+			err = dsa_port_lag_change(dp, info-&gt;lower_state_info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Mirror LAG port events on DSA conduits that are in</div><div class='add'>+		 * a LAG towards their respective switch CPU ports</div><div class='add'>+		 */</div><div class='add'>+		if (netdev_uses_dsa(dev)) {</div><div class='add'>+			dp = dev-&gt;dsa_ptr;</div><div class='add'>+</div><div class='add'>+			err = dsa_port_lag_change(dp, info-&gt;lower_state_info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	}</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+	case NETDEV_UP: {</div><div class='add'>+		/* Track state of conduit port.</div><div class='add'>+		 * DSA driver may require the conduit port (and indirectly</div><div class='add'>+		 * the tagger) to be available for some special operation.</div><div class='add'>+		 */</div><div class='add'>+		if (netdev_uses_dsa(dev)) {</div><div class='add'>+			struct dsa_port *cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+			struct dsa_switch_tree *dst = cpu_dp-&gt;ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+			/* Track when the conduit port is UP */</div><div class='add'>+			dsa_tree_conduit_oper_state_change(dst, dev,</div><div class='add'>+							   netif_oper_up(dev));</div><div class='add'>+</div><div class='add'>+			/* Track when the conduit port is ready and can accept</div><div class='add'>+			 * packet.</div><div class='add'>+			 * NETDEV_UP event is not enough to flag a port as ready.</div><div class='add'>+			 * We also have to wait for linkwatch_do_dev to dev_activate</div><div class='add'>+			 * and emit a NETDEV_CHANGE event.</div><div class='add'>+			 * We check if a conduit port is ready by checking if the dev</div><div class='add'>+			 * have a qdisc assigned and is not noop.</div><div class='add'>+			 */</div><div class='add'>+			dsa_tree_conduit_admin_state_change(dst, dev,</div><div class='add'>+							    !qdisc_tx_is_noop(dev));</div><div class='add'>+</div><div class='add'>+			return NOTIFY_OK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+	case NETDEV_GOING_DOWN: {</div><div class='add'>+		struct dsa_port *dp, *cpu_dp;</div><div class='add'>+		struct dsa_switch_tree *dst;</div><div class='add'>+		LIST_HEAD(close_list);</div><div class='add'>+</div><div class='add'>+		if (!netdev_uses_dsa(dev))</div><div class='add'>+			return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+		cpu_dp = dev-&gt;dsa_ptr;</div><div class='add'>+		dst = cpu_dp-&gt;ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+		dsa_tree_conduit_admin_state_change(dst, dev, false);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			if (!dsa_port_is_user(dp))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (dp-&gt;cpu_dp != cpu_dp)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			list_add(&amp;dp-&gt;user-&gt;close_list, &amp;close_list);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_close_many(&amp;close_list, true);</div><div class='add'>+</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+dsa_fdb_offload_notify(struct dsa_switchdev_event_work *switchdev_work)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_fdb_info info = {};</div><div class='add'>+</div><div class='add'>+	info.addr = switchdev_work-&gt;addr;</div><div class='add'>+	info.vid = switchdev_work-&gt;vid;</div><div class='add'>+	info.offloaded = true;</div><div class='add'>+	call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,</div><div class='add'>+				 switchdev_work-&gt;orig_dev, &amp;info.info, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_user_switchdev_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switchdev_event_work *switchdev_work =</div><div class='add'>+		container_of(work, struct dsa_switchdev_event_work, work);</div><div class='add'>+	const unsigned char *addr = switchdev_work-&gt;addr;</div><div class='add'>+	struct net_device *dev = switchdev_work-&gt;dev;</div><div class='add'>+	u16 vid = switchdev_work-&gt;vid;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dp = dsa_user_to_port(dev);</div><div class='add'>+	ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	switch (switchdev_work-&gt;event) {</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+		if (switchdev_work-&gt;host_addr)</div><div class='add'>+			err = dsa_port_bridge_host_fdb_add(dp, addr, vid);</div><div class='add'>+		else if (dp-&gt;lag)</div><div class='add'>+			err = dsa_port_lag_fdb_add(dp, addr, vid);</div><div class='add'>+		else</div><div class='add'>+			err = dsa_port_fdb_add(dp, addr, vid);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to add %pM vid %d to fdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		dsa_fdb_offload_notify(switchdev_work);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		if (switchdev_work-&gt;host_addr)</div><div class='add'>+			err = dsa_port_bridge_host_fdb_del(dp, addr, vid);</div><div class='add'>+		else if (dp-&gt;lag)</div><div class='add'>+			err = dsa_port_lag_fdb_del(dp, addr, vid);</div><div class='add'>+		else</div><div class='add'>+			err = dsa_port_fdb_del(dp, addr, vid);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"port %d failed to delete %pM vid %d from fdb: %d\n",</div><div class='add'>+				dp-&gt;index, addr, vid, err);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(switchdev_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dsa_foreign_dev_check(const struct net_device *dev,</div><div class='add'>+				  const struct net_device *foreign_dev)</div><div class='add'>+{</div><div class='add'>+	const struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	struct dsa_switch_tree *dst = dp-&gt;ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(foreign_dev))</div><div class='add'>+		return !dsa_tree_offloads_bridge_dev(dst, foreign_dev);</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_port(foreign_dev))</div><div class='add'>+		return !dsa_tree_offloads_bridge_port(dst, foreign_dev);</div><div class='add'>+</div><div class='add'>+	/* Everything else is foreign */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_fdb_event(struct net_device *dev,</div><div class='add'>+			      struct net_device *orig_dev,</div><div class='add'>+			      unsigned long event, const void *ctx,</div><div class='add'>+			      const struct switchdev_notifier_fdb_info *fdb_info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switchdev_event_work *switchdev_work;</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+	bool host_addr = fdb_info-&gt;is_local;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (ctx &amp;&amp; ctx != dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (switchdev_fdb_is_dynamically_learned(fdb_info)) {</div><div class='add'>+		if (dsa_port_offloads_bridge_port(dp, orig_dev))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* FDB entries learned by the software bridge or by foreign</div><div class='add'>+		 * bridge ports should be installed as host addresses only if</div><div class='add'>+		 * the driver requests assisted learning.</div><div class='add'>+		 */</div><div class='add'>+		if (!ds-&gt;assisted_learning_on_cpu_port)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Also treat FDB entries on foreign interfaces bridged with us as host</div><div class='add'>+	 * addresses.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_foreign_dev_check(dev, orig_dev))</div><div class='add'>+		host_addr = true;</div><div class='add'>+</div><div class='add'>+	/* Check early that we're not doing work in vain.</div><div class='add'>+	 * Host addresses on LAG ports still require regular FDB ops,</div><div class='add'>+	 * since the CPU port isn't in a LAG.</div><div class='add'>+	 */</div><div class='add'>+	if (dp-&gt;lag &amp;&amp; !host_addr) {</div><div class='add'>+		if (!ds-&gt;ops-&gt;lag_fdb_add || !ds-&gt;ops-&gt;lag_fdb_del)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	} else {</div><div class='add'>+		if (!ds-&gt;ops-&gt;port_fdb_add || !ds-&gt;ops-&gt;port_fdb_del)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);</div><div class='add'>+	if (!switchdev_work)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "%s FDB entry towards %s, addr %pM vid %d%s\n",</div><div class='add'>+		   event == SWITCHDEV_FDB_ADD_TO_DEVICE ? "Adding" : "Deleting",</div><div class='add'>+		   orig_dev-&gt;name, fdb_info-&gt;addr, fdb_info-&gt;vid,</div><div class='add'>+		   host_addr ? " as host address" : "");</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;switchdev_work-&gt;work, dsa_user_switchdev_event_work);</div><div class='add'>+	switchdev_work-&gt;event = event;</div><div class='add'>+	switchdev_work-&gt;dev = dev;</div><div class='add'>+	switchdev_work-&gt;orig_dev = orig_dev;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(switchdev_work-&gt;addr, fdb_info-&gt;addr);</div><div class='add'>+	switchdev_work-&gt;vid = fdb_info-&gt;vid;</div><div class='add'>+	switchdev_work-&gt;host_addr = host_addr;</div><div class='add'>+</div><div class='add'>+	dsa_schedule_work(&amp;switchdev_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='add'>+static int dsa_user_switchdev_event(struct notifier_block *unused,</div><div class='add'>+				    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_PORT_ATTR_SET:</div><div class='add'>+		err = switchdev_handle_port_attr_set(dev, ptr,</div><div class='add'>+						     dsa_user_dev_check,</div><div class='add'>+						     dsa_user_port_attr_set);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		err = switchdev_handle_fdb_event_to_device(dev, event, ptr,</div><div class='add'>+							   dsa_user_dev_check,</div><div class='add'>+							   dsa_foreign_dev_check,</div><div class='add'>+							   dsa_user_fdb_event);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	default:</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_user_switchdev_blocking_event(struct notifier_block *unused,</div><div class='add'>+					     unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_ADD:</div><div class='add'>+		err = switchdev_handle_port_obj_add_foreign(dev, ptr,</div><div class='add'>+							    dsa_user_dev_check,</div><div class='add'>+							    dsa_foreign_dev_check,</div><div class='add'>+							    dsa_user_port_obj_add);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_DEL:</div><div class='add'>+		err = switchdev_handle_port_obj_del_foreign(dev, ptr,</div><div class='add'>+							    dsa_user_dev_check,</div><div class='add'>+							    dsa_foreign_dev_check,</div><div class='add'>+							    dsa_user_port_obj_del);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	case SWITCHDEV_PORT_ATTR_SET:</div><div class='add'>+		err = switchdev_handle_port_attr_set(dev, ptr,</div><div class='add'>+						     dsa_user_dev_check,</div><div class='add'>+						     dsa_user_port_attr_set);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block dsa_user_nb __read_mostly = {</div><div class='add'>+	.notifier_call  = dsa_user_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct notifier_block dsa_user_switchdev_notifier = {</div><div class='add'>+	.notifier_call = dsa_user_switchdev_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct notifier_block dsa_user_switchdev_blocking_notifier = {</div><div class='add'>+	.notifier_call = dsa_user_switchdev_blocking_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dsa_user_register_notifier(void)</div><div class='add'>+{</div><div class='add'>+	struct notifier_block *nb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;dsa_user_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = register_switchdev_notifier(&amp;dsa_user_switchdev_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switchdev_nb;</div><div class='add'>+</div><div class='add'>+	nb = &amp;dsa_user_switchdev_blocking_notifier;</div><div class='add'>+	err = register_switchdev_blocking_notifier(nb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switchdev_blocking_nb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_switchdev_blocking_nb:</div><div class='add'>+	unregister_switchdev_notifier(&amp;dsa_user_switchdev_notifier);</div><div class='add'>+err_switchdev_nb:</div><div class='add'>+	unregister_netdevice_notifier(&amp;dsa_user_nb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dsa_user_unregister_notifier(void)</div><div class='add'>+{</div><div class='add'>+	struct notifier_block *nb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nb = &amp;dsa_user_switchdev_blocking_notifier;</div><div class='add'>+	err = unregister_switchdev_blocking_notifier(nb);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("DSA: failed to unregister switchdev blocking notifier (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	err = unregister_switchdev_notifier(&amp;dsa_user_switchdev_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("DSA: failed to unregister switchdev notifier (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	err = unregister_netdevice_notifier(&amp;dsa_user_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("DSA: failed to unregister user notifier (%d)\n", err);</div><div class='add'>+}</div><div class='head'>diff --git a/net/dsa/user.h b/net/dsa/user.h<br/>new file mode 100644<br/>index 000000000000..016884bead3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/dsa/user.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/dsa/user.h</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+#ifndef __DSA_USER_H</div><div class='add'>+#define __DSA_USER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/netpoll.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/gro_cells.h&gt;</div><div class='add'>+</div><div class='add'>+struct net_device;</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+</div><div class='add'>+extern struct notifier_block dsa_user_switchdev_notifier;</div><div class='add'>+extern struct notifier_block dsa_user_switchdev_blocking_notifier;</div><div class='add'>+</div><div class='add'>+struct dsa_user_priv {</div><div class='add'>+	/* Copy of CPU port xmit for faster access in user transmit hot path */</div><div class='add'>+	struct sk_buff *	(*xmit)(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev);</div><div class='add'>+</div><div class='add'>+	struct gro_cells	gcells;</div><div class='add'>+</div><div class='add'>+	/* DSA port data, such as switch, port index, etc. */</div><div class='add'>+	struct dsa_port		*dp;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	struct netpoll		*netpoll;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* TC context */</div><div class='add'>+	struct list_head	mall_tc_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void dsa_user_mii_bus_init(struct dsa_switch *ds);</div><div class='add'>+int dsa_user_create(struct dsa_port *dp);</div><div class='add'>+void dsa_user_destroy(struct net_device *user_dev);</div><div class='add'>+int dsa_user_suspend(struct net_device *user_dev);</div><div class='add'>+int dsa_user_resume(struct net_device *user_dev);</div><div class='add'>+int dsa_user_register_notifier(void);</div><div class='add'>+void dsa_user_unregister_notifier(void);</div><div class='add'>+int dsa_user_host_uc_install(struct net_device *dev, const u8 *addr);</div><div class='add'>+void dsa_user_host_uc_uninstall(struct net_device *dev);</div><div class='add'>+void dsa_user_sync_ha(struct net_device *dev);</div><div class='add'>+void dsa_user_unsync_ha(struct net_device *dev);</div><div class='add'>+void dsa_user_setup_tagger(struct net_device *user);</div><div class='add'>+int dsa_user_change_mtu(struct net_device *dev, int new_mtu);</div><div class='add'>+int dsa_user_change_conduit(struct net_device *dev, struct net_device *conduit,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+int dsa_user_manage_vlan_filtering(struct net_device *dev,</div><div class='add'>+				   bool vlan_filtering);</div><div class='add'>+</div><div class='add'>+static inline struct dsa_port *dsa_user_to_port(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_user_priv *p = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return p-&gt;dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_device *</div><div class='add'>+dsa_user_to_conduit(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_user_to_port(dev);</div><div class='add'>+</div><div class='add'>+	return dsa_port_to_conduit(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile<br/>index 323177505404..e03eff94e0db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ethernet/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethernet/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethernet/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethernet/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux Ethernet layer.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c<br/>index fd8faa0dfa61..13a63b48b7ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ethernet/eth.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ethernet/eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethernet/eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethernet/eth.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -31,11 +32,6 @@</div><div class='ctx'>  *				  older network drivers and IFF_ALLMULTI.</div><div class='ctx'>  *	Christer Weinigel	: Better rebuild header message.</div><div class='ctx'>  *             Andrew Morton    : 26Feb01: kill ether_setup() - use netdev_boot_setup().</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -47,6 +43,7 @@</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -54,6 +51,7 @@</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='hunk'>@@ -61,11 +59,10 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;net/flow_dissector.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> </div><div class='del'>-__setup("ether=", netdev_boot_setup);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * eth_header - create the Ethernet header</div><div class='ctx'>  * @skb:	buffer to alter</div><div class='hunk'>@@ -118,13 +115,14 @@ EXPORT_SYMBOL(eth_header);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * eth_get_headlen - determine the length of header for an ethernet frame</div><div class='add'>+ * @dev: pointer to network device</div><div class='ctx'>  * @data: pointer to start of frame</div><div class='ctx'>  * @len: total length of frame</div><div class='ctx'>  *</div><div class='ctx'>  * Make a best effort attempt to pull the length for all of the headers for</div><div class='ctx'>  * a given frame in a linear buffer.</div><div class='ctx'>  */</div><div class='del'>-u32 eth_get_headlen(void *data, unsigned int len)</div><div class='add'>+u32 eth_get_headlen(const struct net_device *dev, const void *data, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned int flags = FLOW_DISSECTOR_F_PARSE_1ST_FRAG;</div><div class='ctx'> 	const struct ethhdr *eth = (const struct ethhdr *)data;</div><div class='hunk'>@@ -135,8 +133,9 @@ u32 eth_get_headlen(void *data, unsigned int len)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='ctx'> 	/* parse any remaining L2/L3 headers, check for L4 */</div><div class='del'>-	if (!skb_flow_dissect_flow_keys_basic(NULL, &amp;keys, data, eth-&gt;h_proto,</div><div class='del'>-					      sizeof(*eth), len, flags))</div><div class='add'>+	if (!skb_flow_dissect_flow_keys_basic(dev_net(dev), NULL, &amp;keys, data,</div><div class='add'>+					      eth-&gt;h_proto, sizeof(*eth),</div><div class='add'>+					      len, flags))</div><div class='ctx'> 		return max_t(u32, keys.control.thoff, sizeof(*eth));</div><div class='ctx'> </div><div class='ctx'> 	/* parse for any L4 headers */</div><div class='hunk'>@@ -155,25 +154,15 @@ EXPORT_SYMBOL(eth_get_headlen);</div><div class='ctx'>  */</div><div class='ctx'> __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned short _service_access_point;</div><div class='ctx'> 	const unsigned short *sap;</div><div class='ctx'> 	const struct ethhdr *eth;</div><div class='add'>+	__be16 res;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> </div><div class='del'>-	eth = (struct ethhdr *)skb-&gt;data;</div><div class='del'>-	skb_pull_inline(skb, ETH_HLEN);</div><div class='del'>-</div><div class='del'>-	if (unlikely(is_multicast_ether_addr_64bits(eth-&gt;h_dest))) {</div><div class='del'>-		if (ether_addr_equal_64bits(eth-&gt;h_dest, dev-&gt;broadcast))</div><div class='del'>-			skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='del'>-		else</div><div class='del'>-			skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='del'>-	}</div><div class='del'>-	else if (unlikely(!ether_addr_equal_64bits(eth-&gt;h_dest,</div><div class='del'>-						   dev-&gt;dev_addr)))</div><div class='del'>-		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+	eth = eth_skb_pull_mac(skb);</div><div class='add'>+	eth_skb_pkt_type(skb, dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some variants of DSA tagging don't have an ethertype field</div><div class='hunk'>@@ -192,15 +181,15 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 *      the protocol design and runs IPX over 802.3 without an 802.2 LLC</div><div class='ctx'> 	 *      layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This</div><div class='ctx'> 	 *      won't work for fault tolerant netware but does for the rest.</div><div class='add'>+	 *	We use skb-&gt;dev as temporary storage to not hit</div><div class='add'>+	 *	CONFIG_STACKPROTECTOR_STRONG=y costs on some platforms.</div><div class='ctx'> 	 */</div><div class='del'>-	sap = skb_header_pointer(skb, 0, sizeof(*sap), &amp;_service_access_point);</div><div class='del'>-	if (sap &amp;&amp; *sap == 0xFFFF)</div><div class='del'>-		return htons(ETH_P_802_3);</div><div class='add'>+	sap = skb_header_pointer(skb, 0, sizeof(*sap), &amp;skb-&gt;dev);</div><div class='add'>+	res = (sap &amp;&amp; *sap == 0xFFFF) ? htons(ETH_P_802_3) : htons(ETH_P_802_2);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *      Real 802.2 LLC</div><div class='del'>-	 */</div><div class='del'>-	return htons(ETH_P_802_2);</div><div class='add'>+	/* restore skb-&gt;dev in case it was mangled by skb_header_pointer(). */</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_type_trans);</div><div class='ctx'> </div><div class='hunk'>@@ -239,7 +228,12 @@ int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16</div><div class='ctx'> 	eth-&gt;h_proto = type;</div><div class='ctx'> 	memcpy(eth-&gt;h_source, dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> 	memcpy(eth-&gt;h_dest, neigh-&gt;ha, ETH_ALEN);</div><div class='del'>-	hh-&gt;hh_len = ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	/* Pairs with READ_ONCE() in neigh_resolve_output(),</div><div class='add'>+	 * neigh_hh_output() and neigh_update_hhs().</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;hh-&gt;hh_len, ETH_HLEN);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_header_cache);</div><div class='hunk'>@@ -262,6 +256,18 @@ void eth_header_cache_update(struct hh_cache *hh,</div><div class='ctx'> EXPORT_SYMBOL(eth_header_cache_update);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * eth_header_parse_protocol - extract protocol from L2 header</div><div class='add'>+ * @skb: packet to extract protocol from</div><div class='add'>+ */</div><div class='add'>+__be16 eth_header_parse_protocol(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ethhdr *eth = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	return eth-&gt;h_proto;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(eth_header_parse_protocol);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * eth_prepare_mac_addr_change - prepare for mac change</div><div class='ctx'>  * @dev: network device</div><div class='ctx'>  * @p: socket address</div><div class='hunk'>@@ -287,7 +293,7 @@ void eth_commit_mac_addr_change(struct net_device *dev, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_commit_mac_addr_change);</div><div class='ctx'> </div><div class='hunk'>@@ -313,22 +319,6 @@ int eth_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_mac_addr);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * eth_change_mtu - set new MTU size</div><div class='del'>- * @dev: network device</div><div class='del'>- * @new_mtu: new Maximum Transfer Unit</div><div class='del'>- *</div><div class='del'>- * Allow changing MTU size. Needs to be overridden for devices</div><div class='del'>- * supporting jumbo frames.</div><div class='del'>- */</div><div class='del'>-int eth_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	netdev_warn(dev, "%s is deprecated\n", __func__);</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(eth_change_mtu);</div><div class='del'>-</div><div class='ctx'> int eth_validate_addr(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='hunk'>@@ -343,6 +333,7 @@ const struct header_ops eth_header_ops ____cacheline_aligned = {</div><div class='ctx'> 	.parse		= eth_header_parse,</div><div class='ctx'> 	.cache		= eth_header_cache,</div><div class='ctx'> 	.cache_update	= eth_header_cache_update,</div><div class='add'>+	.parse_protocol	= eth_header_parse_protocol,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -388,42 +379,14 @@ EXPORT_SYMBOL(ether_setup);</div><div class='ctx'> struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,</div><div class='ctx'> 				      unsigned int rxqs)</div><div class='ctx'> {</div><div class='del'>-	return alloc_netdev_mqs(sizeof_priv, "eth%d", NET_NAME_UNKNOWN,</div><div class='add'>+	return alloc_netdev_mqs(sizeof_priv, "eth%d", NET_NAME_ENUM,</div><div class='ctx'> 				ether_setup, txqs, rxqs);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(alloc_etherdev_mqs);</div><div class='ctx'> </div><div class='del'>-static void devm_free_netdev(struct device *dev, void *res)</div><div class='del'>-{</div><div class='del'>-	free_netdev(*(struct net_device **)res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,</div><div class='del'>-					   unsigned int txqs, unsigned int rxqs)</div><div class='del'>-{</div><div class='del'>-	struct net_device **dr;</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-</div><div class='del'>-	dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);</div><div class='del'>-	if (!dr)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);</div><div class='del'>-	if (!netdev) {</div><div class='del'>-		devres_free(dr);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*dr = netdev;</div><div class='del'>-	devres_add(dev, dr);</div><div class='del'>-</div><div class='del'>-	return netdev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(devm_alloc_etherdev_mqs);</div><div class='del'>-</div><div class='ctx'> ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)</div><div class='ctx'> {</div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);</div><div class='add'>+	return sysfs_emit(buf, "%*phC\n", len, addr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sysfs_format_mac);</div><div class='ctx'> </div><div class='hunk'>@@ -439,12 +402,9 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	off_eth = skb_gro_offset(skb);</div><div class='ctx'> 	hlen = off_eth + sizeof(*eh);</div><div class='del'>-	eh = skb_gro_header_fast(skb, off_eth);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		eh = skb_gro_header_slow(skb, hlen, off_eth);</div><div class='del'>-		if (unlikely(!eh))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	eh = skb_gro_header(skb, hlen, off_eth);</div><div class='add'>+	if (unlikely(!eh))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	flush = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -461,19 +421,19 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	type = eh-&gt;h_proto;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ptype = gro_find_receive_by_type(type);</div><div class='ctx'> 	if (ptype == NULL) {</div><div class='ctx'> 		flush = 1;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_gro_pull(skb, sizeof(*eh));</div><div class='ctx'> 	skb_gro_postpull_rcsum(skb, eh, sizeof(*eh));</div><div class='del'>-	pp = call_gro_receive(ptype-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	pp = indirect_call_gro_receive_inet(ptype-&gt;callbacks.gro_receive,</div><div class='add'>+					    ipv6_gro_receive, inet_gro_receive,</div><div class='add'>+					    head, skb);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final(skb, pp, flush);</div><div class='ctx'> </div><div class='hunk'>@@ -491,13 +451,12 @@ int eth_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> 	if (skb-&gt;encapsulation)</div><div class='ctx'> 		skb_set_inner_mac_header(skb, nhoff);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ptype = gro_find_complete_by_type(type);</div><div class='ctx'> 	if (ptype != NULL)</div><div class='del'>-		err = ptype-&gt;callbacks.gro_complete(skb, nhoff +</div><div class='del'>-						    sizeof(struct ethhdr));</div><div class='add'>+		err = INDIRECT_CALL_INET(ptype-&gt;callbacks.gro_complete,</div><div class='add'>+					 ipv6_gro_complete, inet_gro_complete,</div><div class='add'>+					 skb, nhoff + sizeof(*eh));</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_gro_complete);</div><div class='hunk'>@@ -527,24 +486,156 @@ unsigned char * __weak arch_get_platform_mac_address(void)</div><div class='ctx'> </div><div class='ctx'> int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	const unsigned char *addr;</div><div class='del'>-	struct device_node *dp;</div><div class='del'>-</div><div class='del'>-	if (dev_is_pci(dev))</div><div class='del'>-		dp = pci_device_to_OF_node(to_pci_dev(dev));</div><div class='del'>-	else</div><div class='del'>-		dp = dev-&gt;of_node;</div><div class='add'>+	unsigned char *addr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	addr = NULL;</div><div class='del'>-	if (dp)</div><div class='del'>-		addr = of_get_mac_address(dp);</div><div class='del'>-	if (!addr)</div><div class='del'>-		addr = arch_get_platform_mac_address();</div><div class='add'>+	ret = of_get_mac_address(dev-&gt;of_node, mac_addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+	addr = arch_get_platform_mac_address();</div><div class='ctx'> 	if (!addr)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(mac_addr, addr);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eth_platform_get_mac_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * platform_get_ethdev_address - Set netdev's MAC address from a given device</div><div class='add'>+ * @dev:	Pointer to the device</div><div class='add'>+ * @netdev:	Pointer to netdev to write the address to</div><div class='add'>+ *</div><div class='add'>+ * Wrapper around eth_platform_get_mac_address() which writes the address</div><div class='add'>+ * directly to netdev-&gt;dev_addr.</div><div class='add'>+ */</div><div class='add'>+int platform_get_ethdev_address(struct device *dev, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	u8 addr[ETH_ALEN] __aligned(2);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = eth_platform_get_mac_address(dev, addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		eth_hw_addr_set(netdev, addr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(platform_get_ethdev_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named</div><div class='add'>+ * 'mac-address' associated with given device.</div><div class='add'>+ *</div><div class='add'>+ * @dev:	Device with which the mac-address cell is associated.</div><div class='add'>+ * @addrbuf:	Buffer to which the MAC address will be copied on success.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or a negative error number on failure.</div><div class='add'>+ */</div><div class='add'>+int nvmem_get_mac_address(struct device *dev, void *addrbuf)</div><div class='add'>+{</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	const void *mac;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	cell = nvmem_cell_get(dev, "mac-address");</div><div class='add'>+	if (IS_ERR(cell))</div><div class='add'>+		return PTR_ERR(cell);</div><div class='add'>+</div><div class='add'>+	mac = nvmem_cell_read(cell, &amp;len);</div><div class='add'>+	nvmem_cell_put(cell);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mac))</div><div class='add'>+		return PTR_ERR(mac);</div><div class='add'>+</div><div class='add'>+	if (len != ETH_ALEN || !is_valid_ether_addr(mac)) {</div><div class='add'>+		kfree(mac);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(addrbuf, mac);</div><div class='add'>+	kfree(mac);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fwnode_get_mac_addr(struct fwnode_handle *fwnode,</div><div class='add'>+			       const char *name, char *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fwnode_property_read_u8_array(fwnode, name, addr, ETH_ALEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fwnode_get_mac_address - Get the MAC from the firmware node</div><div class='add'>+ * @fwnode:	Pointer to the firmware node</div><div class='add'>+ * @addr:	Address of buffer to store the MAC in</div><div class='add'>+ *</div><div class='add'>+ * Search the firmware node for the best MAC address to use.  'mac-address' is</div><div class='add'>+ * checked first, because that is supposed to contain to "most recent" MAC</div><div class='add'>+ * address. If that isn't set, then 'local-mac-address' is checked next,</div><div class='add'>+ * because that is the default address.  If that isn't set, then the obsolete</div><div class='add'>+ * 'address' is checked, just in case we're using an old device tree.</div><div class='add'>+ *</div><div class='add'>+ * Note that the 'address' property is supposed to contain a virtual address of</div><div class='add'>+ * the register set, but some DTS files have redefined that property to be the</div><div class='add'>+ * MAC address.</div><div class='add'>+ *</div><div class='add'>+ * All-zero MAC addresses are rejected, because those could be properties that</div><div class='add'>+ * exist in the firmware tables, but were not updated by the firmware.  For</div><div class='add'>+ * example, the DTS could define 'mac-address' and 'local-mac-address', with</div><div class='add'>+ * zero MAC addresses.  Some older U-Boots only initialized 'local-mac-address'.</div><div class='add'>+ * In this case, the real MAC is in 'local-mac-address', and 'mac-address'</div><div class='add'>+ * exists but is all zeros.</div><div class='add'>+ */</div><div class='add'>+int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr)</div><div class='add'>+{</div><div class='add'>+	if (!fwnode_get_mac_addr(fwnode, "mac-address", addr) ||</div><div class='add'>+	    !fwnode_get_mac_addr(fwnode, "local-mac-address", addr) ||</div><div class='add'>+	    !fwnode_get_mac_addr(fwnode, "address", addr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fwnode_get_mac_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_get_mac_address - Get the MAC for a given device</div><div class='add'>+ * @dev:	Pointer to the device</div><div class='add'>+ * @addr:	Address of buffer to store the MAC in</div><div class='add'>+ */</div><div class='add'>+int device_get_mac_address(struct device *dev, char *addr)</div><div class='add'>+{</div><div class='add'>+	if (!fwnode_get_mac_address(dev_fwnode(dev), addr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return nvmem_get_mac_address(dev, addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(device_get_mac_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_get_ethdev_address - Set netdev's MAC address from a given device</div><div class='add'>+ * @dev:	Pointer to the device</div><div class='add'>+ * @netdev:	Pointer to netdev to write the address to</div><div class='add'>+ *</div><div class='add'>+ * Wrapper around device_get_mac_address() which writes the address</div><div class='add'>+ * directly to netdev-&gt;dev_addr.</div><div class='add'>+ */</div><div class='add'>+int device_get_ethdev_address(struct device *dev, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = device_get_mac_address(dev, addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		eth_hw_addr_set(netdev, addr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(device_get_ethdev_address);</div><div class='head'>diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile<br/>new file mode 100644<br/>index 000000000000..629c10916670<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+obj-y				+= ioctl.o common.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ETHTOOL_NETLINK)	+= ethtool_nl.o</div><div class='add'>+</div><div class='add'>+ethtool_nl-y	:= netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \</div><div class='add'>+		   linkstate.o debug.o wol.o features.o privflags.o rings.o \</div><div class='add'>+		   channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \</div><div class='add'>+		   tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \</div><div class='add'>+		   module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o \</div><div class='add'>+		   phy.o tsconfig.o mse.o</div><div class='head'>diff --git a/net/ethtool/bitset.c b/net/ethtool/bitset.c<br/>new file mode 100644<br/>index 000000000000..f0883357d12e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/bitset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/bitset.c</a></div><div class='hunk'>@@ -0,0 +1,873 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+/* Some bitmaps are internally represented as an array of unsigned long, some</div><div class='add'>+ * as an array of u32 (some even as single u32 for now). To avoid the need of</div><div class='add'>+ * wrappers on caller side, we provide two set of functions: those with "32"</div><div class='add'>+ * suffix in their names expect u32 based bitmaps, those without it expect</div><div class='add'>+ * unsigned long bitmaps.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u32 ethnl_lower_bits(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return ~(u32)0 &gt;&gt; (32 - n % 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ethnl_upper_bits(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return ~(u32)0 &lt;&lt; (n % 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitmap32_clear() - Clear u32 based bitmap</div><div class='add'>+ * @dst:   bitmap to clear</div><div class='add'>+ * @start: beginning of the interval</div><div class='add'>+ * @end:   end of the interval</div><div class='add'>+ * @mod:   set if bitmap was modified</div><div class='add'>+ *</div><div class='add'>+ * Clear @nbits bits of a bitmap with indices @start &lt;= i &lt; @end</div><div class='add'>+ */</div><div class='add'>+static void ethnl_bitmap32_clear(u32 *dst, unsigned int start, unsigned int end,</div><div class='add'>+				 bool *mod)</div><div class='add'>+{</div><div class='add'>+	unsigned int start_word = start / 32;</div><div class='add'>+	unsigned int end_word = end / 32;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	if (end &lt;= start)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (start % 32) {</div><div class='add'>+		mask = ethnl_upper_bits(start);</div><div class='add'>+		if (end_word == start_word) {</div><div class='add'>+			mask &amp;= ethnl_lower_bits(end);</div><div class='add'>+			if (dst[start_word] &amp; mask) {</div><div class='add'>+				dst[start_word] &amp;= ~mask;</div><div class='add'>+				*mod = true;</div><div class='add'>+			}</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (dst[start_word] &amp; mask) {</div><div class='add'>+			dst[start_word] &amp;= ~mask;</div><div class='add'>+			*mod = true;</div><div class='add'>+		}</div><div class='add'>+		start_word++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = start_word; i &lt; end_word; i++) {</div><div class='add'>+		if (dst[i]) {</div><div class='add'>+			dst[i] = 0;</div><div class='add'>+			*mod = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (end % 32) {</div><div class='add'>+		mask = ethnl_lower_bits(end);</div><div class='add'>+		if (dst[end_word] &amp; mask) {</div><div class='add'>+			dst[end_word] &amp;= ~mask;</div><div class='add'>+			*mod = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitmap32_not_zero() - Check if any bit is set in an interval</div><div class='add'>+ * @map:   bitmap to test</div><div class='add'>+ * @start: beginning of the interval</div><div class='add'>+ * @end:   end of the interval</div><div class='add'>+ *</div><div class='add'>+ * Return: true if there is non-zero bit with  index @start &lt;= i &lt; @end,</div><div class='add'>+ *         false if the whole interval is zero</div><div class='add'>+ */</div><div class='add'>+static bool ethnl_bitmap32_not_zero(const u32 *map, unsigned int start,</div><div class='add'>+				    unsigned int end)</div><div class='add'>+{</div><div class='add'>+	unsigned int start_word = start / 32;</div><div class='add'>+	unsigned int end_word = end / 32;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	if (end &lt;= start)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (start % 32) {</div><div class='add'>+		mask = ethnl_upper_bits(start);</div><div class='add'>+		if (end_word == start_word) {</div><div class='add'>+			mask &amp;= ethnl_lower_bits(end);</div><div class='add'>+			return map[start_word] &amp; mask;</div><div class='add'>+		}</div><div class='add'>+		if (map[start_word] &amp; mask)</div><div class='add'>+			return true;</div><div class='add'>+		start_word++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!memchr_inv(map + start_word, '\0',</div><div class='add'>+			(end_word - start_word) * sizeof(u32)))</div><div class='add'>+		return true;</div><div class='add'>+	if (end % 32 == 0)</div><div class='add'>+		return true;</div><div class='add'>+	return map[end_word] &amp; ethnl_lower_bits(end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitmap32_update() - Modify u32 based bitmap according to value/mask</div><div class='add'>+ *			     pair</div><div class='add'>+ * @dst:   bitmap to update</div><div class='add'>+ * @nbits: bit size of the bitmap</div><div class='add'>+ * @value: values to set</div><div class='add'>+ * @mask:  mask of bits to set</div><div class='add'>+ * @mod:   set to true if bitmap is modified, preserve if not</div><div class='add'>+ *</div><div class='add'>+ * Set bits in @dst bitmap which are set in @mask to values from @value, leave</div><div class='add'>+ * the rest untouched. If destination bitmap was modified, set @mod to true,</div><div class='add'>+ * leave as it is if not.</div><div class='add'>+ */</div><div class='add'>+static void ethnl_bitmap32_update(u32 *dst, unsigned int nbits,</div><div class='add'>+				  const u32 *value, const u32 *mask, bool *mod)</div><div class='add'>+{</div><div class='add'>+	while (nbits &gt; 0) {</div><div class='add'>+		u32 real_mask = mask ? *mask : ~(u32)0;</div><div class='add'>+		u32 new_value;</div><div class='add'>+</div><div class='add'>+		if (nbits &lt; 32)</div><div class='add'>+			real_mask &amp;= ethnl_lower_bits(nbits);</div><div class='add'>+		new_value = (*dst &amp; ~real_mask) | (*value &amp; real_mask);</div><div class='add'>+		if (new_value != *dst) {</div><div class='add'>+			*dst = new_value;</div><div class='add'>+			*mod = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (nbits &lt;= 32)</div><div class='add'>+			break;</div><div class='add'>+		dst++;</div><div class='add'>+		nbits -= 32;</div><div class='add'>+		value++;</div><div class='add'>+		if (mask)</div><div class='add'>+			mask++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ethnl_bitmap32_test_bit(const u32 *map, unsigned int index)</div><div class='add'>+{</div><div class='add'>+	return map[index / 32] &amp; (1U &lt;&lt; (index % 32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitset32_size() - Calculate size of bitset nested attribute</div><div class='add'>+ * @val:     value bitmap (u32 based)</div><div class='add'>+ * @mask:    mask bitmap (u32 based, optional)</div><div class='add'>+ * @nbits:   bit length of the bitset</div><div class='add'>+ * @names:   array of bit names (optional)</div><div class='add'>+ * @compact: assume compact format for output</div><div class='add'>+ *</div><div class='add'>+ * Estimate length of netlink attribute composed by a later call to</div><div class='add'>+ * ethnl_put_bitset32() call with the same arguments.</div><div class='add'>+ *</div><div class='add'>+ * Return: negative error code or attribute length estimate</div><div class='add'>+ */</div><div class='add'>+int ethnl_bitset32_size(const u32 *val, const u32 *mask, unsigned int nbits,</div><div class='add'>+			ethnl_string_array_t names, bool compact)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+</div><div class='add'>+	/* list flag */</div><div class='add'>+	if (!mask)</div><div class='add'>+		len += nla_total_size(sizeof(u32));</div><div class='add'>+	/* size */</div><div class='add'>+	len += nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	if (compact) {</div><div class='add'>+		unsigned int nwords = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+</div><div class='add'>+		/* value, mask */</div><div class='add'>+		len += (mask ? 2 : 1) * nla_total_size(nwords * sizeof(u32));</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int bits_len = 0;</div><div class='add'>+		unsigned int bit_len, i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nbits; i++) {</div><div class='add'>+			const char *name = names ? names[i] : NULL;</div><div class='add'>+</div><div class='add'>+			if (!ethnl_bitmap32_test_bit(mask ?: val, i))</div><div class='add'>+				continue;</div><div class='add'>+			/* index */</div><div class='add'>+			bit_len = nla_total_size(sizeof(u32));</div><div class='add'>+			/* name */</div><div class='add'>+			if (name)</div><div class='add'>+				bit_len += ethnl_strz_size(name);</div><div class='add'>+			/* value */</div><div class='add'>+			if (mask &amp;&amp; ethnl_bitmap32_test_bit(val, i))</div><div class='add'>+				bit_len += nla_total_size(0);</div><div class='add'>+</div><div class='add'>+			/* bit nest */</div><div class='add'>+			bits_len += nla_total_size(bit_len);</div><div class='add'>+		}</div><div class='add'>+		/* bits nest */</div><div class='add'>+		len += nla_total_size(bits_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* outermost nest */</div><div class='add'>+	return nla_total_size(len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_put_bitset32() - Put a bitset nest into a message</div><div class='add'>+ * @skb:      skb with the message</div><div class='add'>+ * @attrtype: attribute type for the bitset nest</div><div class='add'>+ * @val:      value bitmap (u32 based)</div><div class='add'>+ * @mask:     mask bitmap (u32 based, optional)</div><div class='add'>+ * @nbits:    bit length of the bitset</div><div class='add'>+ * @names:    array of bit names (optional)</div><div class='add'>+ * @compact:  use compact format for the output</div><div class='add'>+ *</div><div class='add'>+ * Compose a nested attribute representing a bitset. If @mask is null, simple</div><div class='add'>+ * bitmap (bit list) is created, if @mask is provided, represent a value/mask</div><div class='add'>+ * pair. Bit names are only used in verbose mode and when provided by calller.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative error value on error</div><div class='add'>+ */</div><div class='add'>+int ethnl_put_bitset32(struct sk_buff *skb, int attrtype, const u32 *val,</div><div class='add'>+		       const u32 *mask, unsigned int nbits,</div><div class='add'>+		       ethnl_string_array_t names, bool compact)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, attrtype);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (!mask &amp;&amp; nla_put_flag(skb, ETHTOOL_A_BITSET_NOMASK))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_BITSET_SIZE, nbits))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (compact) {</div><div class='add'>+		unsigned int nwords = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+		unsigned int nbytes = nwords * sizeof(u32);</div><div class='add'>+		u32 *dst;</div><div class='add'>+</div><div class='add'>+		attr = nla_reserve(skb, ETHTOOL_A_BITSET_VALUE, nbytes);</div><div class='add'>+		if (!attr)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		dst = nla_data(attr);</div><div class='add'>+		memcpy(dst, val, nbytes);</div><div class='add'>+		if (nbits % 32)</div><div class='add'>+			dst[nwords - 1] &amp;= ethnl_lower_bits(nbits);</div><div class='add'>+</div><div class='add'>+		if (mask) {</div><div class='add'>+			attr = nla_reserve(skb, ETHTOOL_A_BITSET_MASK, nbytes);</div><div class='add'>+			if (!attr)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			dst = nla_data(attr);</div><div class='add'>+			memcpy(dst, mask, nbytes);</div><div class='add'>+			if (nbits % 32)</div><div class='add'>+				dst[nwords - 1] &amp;= ethnl_lower_bits(nbits);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct nlattr *bits;</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		bits = nla_nest_start(skb, ETHTOOL_A_BITSET_BITS);</div><div class='add'>+		if (!bits)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		for (i = 0; i &lt; nbits; i++) {</div><div class='add'>+			const char *name = names ? names[i] : NULL;</div><div class='add'>+</div><div class='add'>+			if (!ethnl_bitmap32_test_bit(mask ?: val, i))</div><div class='add'>+				continue;</div><div class='add'>+			attr = nla_nest_start(skb, ETHTOOL_A_BITSET_BITS_BIT);</div><div class='add'>+			if (!attr)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (nla_put_u32(skb, ETHTOOL_A_BITSET_BIT_INDEX, i))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (name &amp;&amp;</div><div class='add'>+			    ethnl_put_strz(skb, ETHTOOL_A_BITSET_BIT_NAME, name))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (mask &amp;&amp; ethnl_bitmap32_test_bit(val, i) &amp;&amp;</div><div class='add'>+			    nla_put_flag(skb, ETHTOOL_A_BITSET_BIT_VALUE))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			nla_nest_end(skb, attr);</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, bits);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy bitset_policy[] = {</div><div class='add'>+	[ETHTOOL_A_BITSET_NOMASK]	= { .type = NLA_FLAG },</div><div class='add'>+	[ETHTOOL_A_BITSET_SIZE]		= NLA_POLICY_MAX(NLA_U32,</div><div class='add'>+							 ETHNL_MAX_BITSET_SIZE),</div><div class='add'>+	[ETHTOOL_A_BITSET_BITS]		= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_BITSET_VALUE]	= { .type = NLA_BINARY },</div><div class='add'>+	[ETHTOOL_A_BITSET_MASK]		= { .type = NLA_BINARY },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy bit_policy[] = {</div><div class='add'>+	[ETHTOOL_A_BITSET_BIT_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_BITSET_BIT_NAME]	= { .type = NLA_NUL_STRING },</div><div class='add'>+	[ETHTOOL_A_BITSET_BIT_VALUE]	= { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitset_is_compact() - check if bitset attribute represents a compact</div><div class='add'>+ *			       bitset</div><div class='add'>+ * @bitset:  nested attribute representing a bitset</div><div class='add'>+ * @compact: pointer for return value</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ethnl_bitset_is_compact(const struct nlattr *bitset, bool *compact)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, bitset,</div><div class='add'>+			       bitset_policy, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_BITS]) {</div><div class='add'>+		if (tb[ETHTOOL_A_BITSET_VALUE] || tb[ETHTOOL_A_BITSET_MASK])</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*compact = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[ETHTOOL_A_BITSET_SIZE] || !tb[ETHTOOL_A_BITSET_VALUE])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*compact = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_name_to_idx() - look up string index for a name</div><div class='add'>+ * @names:   array of ETH_GSTRING_LEN sized strings</div><div class='add'>+ * @n_names: number of strings in the array</div><div class='add'>+ * @name:    name to look up</div><div class='add'>+ *</div><div class='add'>+ * Return: index of the string if found, -ENOENT if not found</div><div class='add'>+ */</div><div class='add'>+static int ethnl_name_to_idx(ethnl_string_array_t names, unsigned int n_names,</div><div class='add'>+			     const char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!names)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_names; i++) {</div><div class='add'>+		/* names[i] may not be null terminated */</div><div class='add'>+		if (!strncmp(names[i], name, ETH_GSTRING_LEN) &amp;&amp;</div><div class='add'>+		    strlen(name) &lt;= ETH_GSTRING_LEN)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_parse_bit(unsigned int *index, bool *val, unsigned int nbits,</div><div class='add'>+			   const struct nlattr *bit_attr, bool no_mask,</div><div class='add'>+			   ethnl_string_array_t names,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(bit_policy)];</div><div class='add'>+	int ret, idx;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(bit_policy) - 1, bit_attr,</div><div class='add'>+			       bit_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_BIT_INDEX]) {</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='add'>+		idx = nla_get_u32(tb[ETHTOOL_A_BITSET_BIT_INDEX]);</div><div class='add'>+		if (idx &gt;= nbits) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack,</div><div class='add'>+					    tb[ETHTOOL_A_BITSET_BIT_INDEX],</div><div class='add'>+					    "bit index too high");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		name = names ? names[idx] : NULL;</div><div class='add'>+		if (tb[ETHTOOL_A_BITSET_BIT_NAME] &amp;&amp; name &amp;&amp;</div><div class='add'>+		    strncmp(nla_data(tb[ETHTOOL_A_BITSET_BIT_NAME]), name,</div><div class='add'>+			    nla_len(tb[ETHTOOL_A_BITSET_BIT_NAME]))) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, bit_attr,</div><div class='add'>+					    "bit index and name mismatch");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (tb[ETHTOOL_A_BITSET_BIT_NAME]) {</div><div class='add'>+		idx = ethnl_name_to_idx(names, nbits,</div><div class='add'>+					nla_data(tb[ETHTOOL_A_BITSET_BIT_NAME]));</div><div class='add'>+		if (idx &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack,</div><div class='add'>+					    tb[ETHTOOL_A_BITSET_BIT_NAME],</div><div class='add'>+					    "bit name not found");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, bit_attr,</div><div class='add'>+				    "neither bit index nor name specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*index = idx;</div><div class='add'>+	*val = no_mask || tb[ETHTOOL_A_BITSET_BIT_VALUE];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_bitmap32_equal() - Compare two bitmaps</div><div class='add'>+ * @map1:  first bitmap</div><div class='add'>+ * @map2:  second bitmap</div><div class='add'>+ * @nbits: bit size to compare</div><div class='add'>+ *</div><div class='add'>+ * Return: true if first @nbits are equal, false if not</div><div class='add'>+ */</div><div class='add'>+static bool ethnl_bitmap32_equal(const u32 *map1, const u32 *map2,</div><div class='add'>+				 unsigned int nbits)</div><div class='add'>+{</div><div class='add'>+	if (memcmp(map1, map2, nbits / 32 * sizeof(u32)))</div><div class='add'>+		return false;</div><div class='add'>+	if (nbits % 32 == 0)</div><div class='add'>+		return true;</div><div class='add'>+	return !((map1[nbits / 32] ^ map2[nbits / 32]) &amp;</div><div class='add'>+		 ethnl_lower_bits(nbits % 32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_update_bitset32_verbose(u32 *bitmap, unsigned int nbits,</div><div class='add'>+			      const struct nlattr *attr, struct nlattr **tb,</div><div class='add'>+			      ethnl_string_array_t names,</div><div class='add'>+			      struct netlink_ext_ack *extack, bool *mod)</div><div class='add'>+{</div><div class='add'>+	u32 *saved_bitmap = NULL;</div><div class='add'>+	struct nlattr *bit_attr;</div><div class='add'>+	bool no_mask;</div><div class='add'>+	int rem;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_VALUE]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_VALUE],</div><div class='add'>+				    "value only allowed in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_MASK]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_MASK],</div><div class='add'>+				    "mask only allowed in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	no_mask = tb[ETHTOOL_A_BITSET_NOMASK];</div><div class='add'>+	if (no_mask) {</div><div class='add'>+		unsigned int nwords = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+		unsigned int nbytes = nwords * sizeof(u32);</div><div class='add'>+		bool dummy;</div><div class='add'>+</div><div class='add'>+		/* The bitmap size is only the size of the map part without</div><div class='add'>+		 * its mask part.</div><div class='add'>+		 */</div><div class='add'>+		saved_bitmap = kcalloc(nwords, sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!saved_bitmap)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		memcpy(saved_bitmap, bitmap, nbytes);</div><div class='add'>+		ethnl_bitmap32_clear(bitmap, 0, nbits, &amp;dummy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(bit_attr, tb[ETHTOOL_A_BITSET_BITS], rem) {</div><div class='add'>+		bool old_val, new_val;</div><div class='add'>+		unsigned int idx;</div><div class='add'>+</div><div class='add'>+		if (nla_type(bit_attr) != ETHTOOL_A_BITSET_BITS_BIT) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, bit_attr,</div><div class='add'>+					    "only ETHTOOL_A_BITSET_BITS_BIT allowed in ETHTOOL_A_BITSET_BITS");</div><div class='add'>+			kfree(saved_bitmap);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ret = ethnl_parse_bit(&amp;idx, &amp;new_val, nbits, bit_attr, no_mask,</div><div class='add'>+				      names, extack);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			kfree(saved_bitmap);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		old_val = bitmap[idx / 32] &amp; ((u32)1 &lt;&lt; (idx % 32));</div><div class='add'>+		if (new_val != old_val) {</div><div class='add'>+			if (new_val)</div><div class='add'>+				bitmap[idx / 32] |= ((u32)1 &lt;&lt; (idx % 32));</div><div class='add'>+			else</div><div class='add'>+				bitmap[idx / 32] &amp;= ~((u32)1 &lt;&lt; (idx % 32));</div><div class='add'>+			if (!no_mask)</div><div class='add'>+				*mod = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (no_mask &amp;&amp; !ethnl_bitmap32_equal(saved_bitmap, bitmap, nbits))</div><div class='add'>+		*mod = true;</div><div class='add'>+</div><div class='add'>+	kfree(saved_bitmap);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_compact_sanity_checks(unsigned int nbits,</div><div class='add'>+				       const struct nlattr *nest,</div><div class='add'>+				       struct nlattr **tb,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool no_mask = tb[ETHTOOL_A_BITSET_NOMASK];</div><div class='add'>+	unsigned int attr_nbits, attr_nwords;</div><div class='add'>+	const struct nlattr *test_attr;</div><div class='add'>+</div><div class='add'>+	if (no_mask &amp;&amp; tb[ETHTOOL_A_BITSET_MASK]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_MASK],</div><div class='add'>+				    "mask not allowed in list bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[ETHTOOL_A_BITSET_SIZE]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nest,</div><div class='add'>+				    "missing size in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!tb[ETHTOOL_A_BITSET_VALUE]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nest,</div><div class='add'>+				    "missing value in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!no_mask &amp;&amp; !tb[ETHTOOL_A_BITSET_MASK]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nest,</div><div class='add'>+				    "missing mask in compact nonlist bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr_nbits = nla_get_u32(tb[ETHTOOL_A_BITSET_SIZE]);</div><div class='add'>+	attr_nwords = DIV_ROUND_UP(attr_nbits, 32);</div><div class='add'>+	if (nla_len(tb[ETHTOOL_A_BITSET_VALUE]) != attr_nwords * sizeof(u32)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_VALUE],</div><div class='add'>+				    "bitset value length does not match size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_MASK] &amp;&amp;</div><div class='add'>+	    nla_len(tb[ETHTOOL_A_BITSET_MASK]) != attr_nwords * sizeof(u32)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_MASK],</div><div class='add'>+				    "bitset mask length does not match size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (attr_nbits &lt;= nbits)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	test_attr = no_mask ? tb[ETHTOOL_A_BITSET_VALUE] :</div><div class='add'>+			      tb[ETHTOOL_A_BITSET_MASK];</div><div class='add'>+	if (ethnl_bitmap32_not_zero(nla_data(test_attr), nbits, attr_nbits)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, test_attr,</div><div class='add'>+				    "cannot modify bits past kernel bitset size");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_bitset32() - Apply a bitset nest to a u32 based bitmap</div><div class='add'>+ * @bitmap:  bitmap to update</div><div class='add'>+ * @nbits:   size of the updated bitmap in bits</div><div class='add'>+ * @attr:    nest attribute to parse and apply</div><div class='add'>+ * @names:   array of bit names; may be null for compact format</div><div class='add'>+ * @extack:  extack for error reporting</div><div class='add'>+ * @mod:     set this to true if bitmap is modified, leave as it is if not</div><div class='add'>+ *</div><div class='add'>+ * Apply bitset netsted attribute to a bitmap. If the attribute represents</div><div class='add'>+ * a bit list, @bitmap is set to its contents; otherwise, bits in mask are</div><div class='add'>+ * set to values from value. Bitmaps in the attribute may be longer than</div><div class='add'>+ * @nbits but the message must not request modifying any bits past @nbits.</div><div class='add'>+ *</div><div class='add'>+ * Return: negative error code on failure, 0 on success</div><div class='add'>+ */</div><div class='add'>+int ethnl_update_bitset32(u32 *bitmap, unsigned int nbits,</div><div class='add'>+			  const struct nlattr *attr, ethnl_string_array_t names,</div><div class='add'>+			  struct netlink_ext_ack *extack, bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];</div><div class='add'>+	unsigned int change_bits;</div><div class='add'>+	bool no_mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return 0;</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,</div><div class='add'>+			       bitset_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_BITS])</div><div class='add'>+		return ethnl_update_bitset32_verbose(bitmap, nbits, attr, tb,</div><div class='add'>+						     names, extack, mod);</div><div class='add'>+	ret = ethnl_compact_sanity_checks(nbits, attr, tb, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	no_mask = tb[ETHTOOL_A_BITSET_NOMASK];</div><div class='add'>+	change_bits = min_t(unsigned int,</div><div class='add'>+			    nla_get_u32(tb[ETHTOOL_A_BITSET_SIZE]), nbits);</div><div class='add'>+	ethnl_bitmap32_update(bitmap, change_bits,</div><div class='add'>+			      nla_data(tb[ETHTOOL_A_BITSET_VALUE]),</div><div class='add'>+			      no_mask ? NULL :</div><div class='add'>+					nla_data(tb[ETHTOOL_A_BITSET_MASK]),</div><div class='add'>+			      mod);</div><div class='add'>+	if (no_mask &amp;&amp; change_bits &lt; nbits)</div><div class='add'>+		ethnl_bitmap32_clear(bitmap, change_bits, nbits, mod);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_parse_bitset() - Compute effective value and mask from bitset nest</div><div class='add'>+ * @val:     unsigned long based bitmap to put value into</div><div class='add'>+ * @mask:    unsigned long based bitmap to put mask into</div><div class='add'>+ * @nbits:   size of @val and @mask bitmaps</div><div class='add'>+ * @attr:    nest attribute to parse and apply</div><div class='add'>+ * @names:   array of bit names; may be null for compact format</div><div class='add'>+ * @extack:  extack for error reporting</div><div class='add'>+ *</div><div class='add'>+ * Provide @nbits size long bitmaps for value and mask so that</div><div class='add'>+ * x = (val &amp; mask) | (x &amp; ~mask) would modify any @nbits sized bitmap x</div><div class='add'>+ * the same way ethnl_update_bitset() with the same bitset attribute would.</div><div class='add'>+ *</div><div class='add'>+ * Return:   negative error code on failure, 0 on success</div><div class='add'>+ */</div><div class='add'>+int ethnl_parse_bitset(unsigned long *val, unsigned long *mask,</div><div class='add'>+		       unsigned int nbits, const struct nlattr *attr,</div><div class='add'>+		       ethnl_string_array_t names,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];</div><div class='add'>+	const struct nlattr *bit_attr;</div><div class='add'>+	bool no_mask;</div><div class='add'>+	int rem;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return 0;</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,</div><div class='add'>+			       bitset_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	no_mask = tb[ETHTOOL_A_BITSET_NOMASK];</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_BITSET_BITS]) {</div><div class='add'>+		unsigned int change_bits;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_compact_sanity_checks(nbits, attr, tb, extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		change_bits = nla_get_u32(tb[ETHTOOL_A_BITSET_SIZE]);</div><div class='add'>+		if (change_bits &gt; nbits)</div><div class='add'>+			change_bits = nbits;</div><div class='add'>+		bitmap_from_arr32(val, nla_data(tb[ETHTOOL_A_BITSET_VALUE]),</div><div class='add'>+				  change_bits);</div><div class='add'>+		if (change_bits &lt; nbits)</div><div class='add'>+			bitmap_clear(val, change_bits, nbits - change_bits);</div><div class='add'>+		if (no_mask) {</div><div class='add'>+			bitmap_fill(mask, nbits);</div><div class='add'>+		} else {</div><div class='add'>+			bitmap_from_arr32(mask,</div><div class='add'>+					  nla_data(tb[ETHTOOL_A_BITSET_MASK]),</div><div class='add'>+					  change_bits);</div><div class='add'>+			if (change_bits &lt; nbits)</div><div class='add'>+				bitmap_clear(mask, change_bits,</div><div class='add'>+					     nbits - change_bits);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_VALUE]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_VALUE],</div><div class='add'>+				    "value only allowed in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_BITSET_MASK]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_BITSET_MASK],</div><div class='add'>+				    "mask only allowed in compact bitset");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap_zero(val, nbits);</div><div class='add'>+	if (no_mask)</div><div class='add'>+		bitmap_fill(mask, nbits);</div><div class='add'>+	else</div><div class='add'>+		bitmap_zero(mask, nbits);</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(bit_attr, tb[ETHTOOL_A_BITSET_BITS], rem) {</div><div class='add'>+		unsigned int idx;</div><div class='add'>+		bool bit_val;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_parse_bit(&amp;idx, &amp;bit_val, nbits, bit_attr, no_mask,</div><div class='add'>+				      names, extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (bit_val)</div><div class='add'>+			__set_bit(idx, val);</div><div class='add'>+		if (!no_mask)</div><div class='add'>+			__set_bit(idx, mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG == 64 &amp;&amp; defined(__BIG_ENDIAN)</div><div class='add'>+</div><div class='add'>+/* 64-bit big endian architectures are the only case when u32 based bitmaps</div><div class='add'>+ * and unsigned long based bitmaps have different memory layout so that we</div><div class='add'>+ * cannot simply cast the latter to the former and need actual wrappers</div><div class='add'>+ * converting the latter to the former.</div><div class='add'>+ *</div><div class='add'>+ * To reduce the number of slab allocations, the wrappers use fixed size local</div><div class='add'>+ * variables for bitmaps up to ETHNL_SMALL_BITMAP_BITS bits which is the</div><div class='add'>+ * majority of bitmaps used by ethtool.</div><div class='add'>+ */</div><div class='add'>+#define ETHNL_SMALL_BITMAP_BITS 128</div><div class='add'>+#define ETHNL_SMALL_BITMAP_WORDS DIV_ROUND_UP(ETHNL_SMALL_BITMAP_BITS, 32)</div><div class='add'>+</div><div class='add'>+int ethnl_bitset_size(const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		      unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		      bool compact)</div><div class='add'>+{</div><div class='add'>+	u32 small_mask32[ETHNL_SMALL_BITMAP_WORDS];</div><div class='add'>+	u32 small_val32[ETHNL_SMALL_BITMAP_WORDS];</div><div class='add'>+	u32 *mask32;</div><div class='add'>+	u32 *val32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS) {</div><div class='add'>+		unsigned int nwords = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+</div><div class='add'>+		val32 = kmalloc_array(2 * nwords, sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!val32)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		mask32 = val32 + nwords;</div><div class='add'>+	} else {</div><div class='add'>+		val32 = small_val32;</div><div class='add'>+		mask32 = small_mask32;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap_to_arr32(val32, val, nbits);</div><div class='add'>+	if (mask)</div><div class='add'>+		bitmap_to_arr32(mask32, mask, nbits);</div><div class='add'>+	else</div><div class='add'>+		mask32 = NULL;</div><div class='add'>+	ret = ethnl_bitset32_size(val32, mask32, nbits, names, compact);</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS)</div><div class='add'>+		kfree(val32);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_put_bitset(struct sk_buff *skb, int attrtype,</div><div class='add'>+		     const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		     unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		     bool compact)</div><div class='add'>+{</div><div class='add'>+	u32 small_mask32[ETHNL_SMALL_BITMAP_WORDS];</div><div class='add'>+	u32 small_val32[ETHNL_SMALL_BITMAP_WORDS];</div><div class='add'>+	u32 *mask32;</div><div class='add'>+	u32 *val32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS) {</div><div class='add'>+		unsigned int nwords = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+</div><div class='add'>+		val32 = kmalloc_array(2 * nwords, sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!val32)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		mask32 = val32 + nwords;</div><div class='add'>+	} else {</div><div class='add'>+		val32 = small_val32;</div><div class='add'>+		mask32 = small_mask32;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap_to_arr32(val32, val, nbits);</div><div class='add'>+	if (mask)</div><div class='add'>+		bitmap_to_arr32(mask32, mask, nbits);</div><div class='add'>+	else</div><div class='add'>+		mask32 = NULL;</div><div class='add'>+	ret = ethnl_put_bitset32(skb, attrtype, val32, mask32, nbits, names,</div><div class='add'>+				 compact);</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS)</div><div class='add'>+		kfree(val32);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_update_bitset(unsigned long *bitmap, unsigned int nbits,</div><div class='add'>+			const struct nlattr *attr, ethnl_string_array_t names,</div><div class='add'>+			struct netlink_ext_ack *extack, bool *mod)</div><div class='add'>+{</div><div class='add'>+	u32 small_bitmap32[ETHNL_SMALL_BITMAP_WORDS];</div><div class='add'>+	u32 *bitmap32 = small_bitmap32;</div><div class='add'>+	bool u32_mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS) {</div><div class='add'>+		unsigned int dst_words = DIV_ROUND_UP(nbits, 32);</div><div class='add'>+</div><div class='add'>+		bitmap32 = kmalloc_array(dst_words, sizeof(u32), GFP_KERNEL);</div><div class='add'>+		if (!bitmap32)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap_to_arr32(bitmap32, bitmap, nbits);</div><div class='add'>+	ret = ethnl_update_bitset32(bitmap32, nbits, attr, names, extack,</div><div class='add'>+				    &amp;u32_mod);</div><div class='add'>+	if (u32_mod) {</div><div class='add'>+		bitmap_from_arr32(bitmap, bitmap32, nbits);</div><div class='add'>+		*mod = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nbits &gt; ETHNL_SMALL_BITMAP_BITS)</div><div class='add'>+		kfree(bitmap32);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/* On little endian 64-bit and all 32-bit architectures, an unsigned long</div><div class='add'>+ * based bitmap can be interpreted as u32 based one using a simple cast.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int ethnl_bitset_size(const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		      unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		      bool compact)</div><div class='add'>+{</div><div class='add'>+	return ethnl_bitset32_size((const u32 *)val, (const u32 *)mask, nbits,</div><div class='add'>+				   names, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_put_bitset(struct sk_buff *skb, int attrtype,</div><div class='add'>+		     const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		     unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		     bool compact)</div><div class='add'>+{</div><div class='add'>+	return ethnl_put_bitset32(skb, attrtype, (const u32 *)val,</div><div class='add'>+				  (const u32 *)mask, nbits, names, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_update_bitset(unsigned long *bitmap, unsigned int nbits,</div><div class='add'>+			const struct nlattr *attr, ethnl_string_array_t names,</div><div class='add'>+			struct netlink_ext_ack *extack, bool *mod)</div><div class='add'>+{</div><div class='add'>+	return ethnl_update_bitset32((u32 *)bitmap, nbits, attr, names, extack,</div><div class='add'>+				     mod);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* BITS_PER_LONG == 64 &amp;&amp; defined(__BIG_ENDIAN) */</div><div class='head'>diff --git a/net/ethtool/bitset.h b/net/ethtool/bitset.h<br/>new file mode 100644<br/>index 000000000000..c2c2e0051d00<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/bitset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/bitset.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef _NET_ETHTOOL_BITSET_H</div><div class='add'>+#define _NET_ETHTOOL_BITSET_H</div><div class='add'>+</div><div class='add'>+#define ETHNL_MAX_BITSET_SIZE S16_MAX</div><div class='add'>+</div><div class='add'>+typedef const char (*const ethnl_string_array_t)[ETH_GSTRING_LEN];</div><div class='add'>+</div><div class='add'>+int ethnl_bitset_is_compact(const struct nlattr *bitset, bool *compact);</div><div class='add'>+int ethnl_bitset_size(const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		      unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		      bool compact);</div><div class='add'>+int ethnl_bitset32_size(const u32 *val, const u32 *mask, unsigned int nbits,</div><div class='add'>+			ethnl_string_array_t names, bool compact);</div><div class='add'>+int ethnl_put_bitset(struct sk_buff *skb, int attrtype,</div><div class='add'>+		     const unsigned long *val, const unsigned long *mask,</div><div class='add'>+		     unsigned int nbits, ethnl_string_array_t names,</div><div class='add'>+		     bool compact);</div><div class='add'>+int ethnl_put_bitset32(struct sk_buff *skb, int attrtype, const u32 *val,</div><div class='add'>+		       const u32 *mask, unsigned int nbits,</div><div class='add'>+		       ethnl_string_array_t names, bool compact);</div><div class='add'>+int ethnl_update_bitset(unsigned long *bitmap, unsigned int nbits,</div><div class='add'>+			const struct nlattr *attr, ethnl_string_array_t names,</div><div class='add'>+			struct netlink_ext_ack *extack, bool *mod);</div><div class='add'>+int ethnl_update_bitset32(u32 *bitmap, unsigned int nbits,</div><div class='add'>+			  const struct nlattr *attr, ethnl_string_array_t names,</div><div class='add'>+			  struct netlink_ext_ack *extack, bool *mod);</div><div class='add'>+int ethnl_parse_bitset(unsigned long *val, unsigned long *mask,</div><div class='add'>+		       unsigned int nbits, const struct nlattr *attr,</div><div class='add'>+		       ethnl_string_array_t names,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+#endif /* _NET_ETHTOOL_BITSET_H */</div><div class='head'>diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c<br/>new file mode 100644<br/>index 000000000000..0364b8fb577b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/cabletest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/cabletest.c</a></div><div class='hunk'>@@ -0,0 +1,453 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* 802.3 standard allows 100 meters for BaseT cables. However longer</div><div class='add'>+ * cables might work, depending on the quality of the cables and the</div><div class='add'>+ * PHY. So allow testing for up to 150 meters.</div><div class='add'>+ */</div><div class='add'>+#define MAX_CABLE_LENGTH_CM (150 * 100)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_cable_test_act_policy[] = {</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+	void *ehdr;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ehdr = ethnl_bcastmsg_put(skb, cmd);</div><div class='add'>+	if (!ehdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ethnl_fill_reply_header(skb, phydev-&gt;attached_dev,</div><div class='add'>+				      ETHTOOL_A_CABLE_TEST_NTF_HEADER);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u8(skb, ETHTOOL_A_CABLE_TEST_NTF_STATUS,</div><div class='add'>+			 ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, ehdr);</div><div class='add'>+</div><div class='add'>+	return ethnl_multicast(skb, phydev-&gt;attached_dev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	phydev_err(phydev, "%s: Error %pe\n", __func__, ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	const struct ethtool_phy_ops *ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_CABLE_TEST_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev = req_info.dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	phydev = ethnl_req_get_phydev(&amp;req_info, tb,</div><div class='add'>+				      ETHTOOL_A_CABLE_TEST_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = ethtool_phy_ops;</div><div class='add'>+	if (!ops || !ops-&gt;start_cable_test) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;start_cable_test(phydev, info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethnl_cable_test_started(phydev, ETHTOOL_MSG_CABLE_TEST_NTF);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_alloc(struct phy_device *phydev, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* One TDR sample occupies 20 bytes. For a 150 meter cable,</div><div class='add'>+	 * with four pairs, around 12K is needed.</div><div class='add'>+	 */</div><div class='add'>+	phydev-&gt;skb = genlmsg_new(SZ_16K, GFP_KERNEL);</div><div class='add'>+	if (!phydev-&gt;skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;ehdr = ethnl_bcastmsg_put(phydev-&gt;skb, cmd);</div><div class='add'>+	if (!phydev-&gt;ehdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ethnl_fill_reply_header(phydev-&gt;skb, phydev-&gt;attached_dev,</div><div class='add'>+				      ETHTOOL_A_CABLE_TEST_NTF_HEADER);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u8(phydev-&gt;skb, ETHTOOL_A_CABLE_TEST_NTF_STATUS,</div><div class='add'>+			 ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;nest = nla_nest_start(phydev-&gt;skb,</div><div class='add'>+				      ETHTOOL_A_CABLE_TEST_NTF_NEST);</div><div class='add'>+	if (!phydev-&gt;nest) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	nlmsg_free(phydev-&gt;skb);</div><div class='add'>+	phydev-&gt;skb = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_alloc);</div><div class='add'>+</div><div class='add'>+void ethnl_cable_test_free(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	nlmsg_free(phydev-&gt;skb);</div><div class='add'>+	phydev-&gt;skb = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_free);</div><div class='add'>+</div><div class='add'>+void ethnl_cable_test_finished(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, phydev-&gt;nest);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(phydev-&gt;skb, phydev-&gt;ehdr);</div><div class='add'>+</div><div class='add'>+	ethnl_multicast(phydev-&gt;skb, phydev-&gt;attached_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_finished);</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_result_with_src(struct phy_device *phydev, u8 pair,</div><div class='add'>+				     u8 result, u32 src)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(phydev-&gt;skb, ETHTOOL_A_CABLE_NEST_RESULT);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(phydev-&gt;skb, ETHTOOL_A_CABLE_RESULT_PAIR, pair))</div><div class='add'>+		goto err;</div><div class='add'>+	if (nla_put_u8(phydev-&gt;skb, ETHTOOL_A_CABLE_RESULT_CODE, result))</div><div class='add'>+		goto err;</div><div class='add'>+	if (src != ETHTOOL_A_CABLE_INF_SRC_UNSPEC) {</div><div class='add'>+		if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_RESULT_SRC, src))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(phydev-&gt;skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_result_with_src);</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_fault_length_with_src(struct phy_device *phydev, u8 pair,</div><div class='add'>+					   u32 cm, u32 src)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(phydev-&gt;skb,</div><div class='add'>+			      ETHTOOL_A_CABLE_NEST_FAULT_LENGTH);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(phydev-&gt;skb, ETHTOOL_A_CABLE_FAULT_LENGTH_PAIR, pair))</div><div class='add'>+		goto err;</div><div class='add'>+	if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_FAULT_LENGTH_CM, cm))</div><div class='add'>+		goto err;</div><div class='add'>+	if (src != ETHTOOL_A_CABLE_INF_SRC_UNSPEC) {</div><div class='add'>+		if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_FAULT_LENGTH_SRC,</div><div class='add'>+				src))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(phydev-&gt;skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_fault_length_with_src);</div><div class='add'>+</div><div class='add'>+static const struct nla_policy cable_test_tdr_act_cfg_policy[] = {</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR]	= { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_cable_test_tdr_act_policy[] = {</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+	[ETHTOOL_A_CABLE_TEST_TDR_CFG]		= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CABLE_TEST_TDR_ACT */</div><div class='add'>+static int ethnl_act_cable_test_tdr_cfg(const struct nlattr *nest,</div><div class='add'>+					struct genl_info *info,</div><div class='add'>+					struct phy_tdr_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(cable_test_tdr_act_cfg_policy)];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;first = 100;</div><div class='add'>+	cfg-&gt;step = 100;</div><div class='add'>+	cfg-&gt;last = MAX_CABLE_LENGTH_CM;</div><div class='add'>+	cfg-&gt;pair = PHY_PAIR_ALL;</div><div class='add'>+</div><div class='add'>+	if (!nest)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(tb,</div><div class='add'>+			       ARRAY_SIZE(cable_test_tdr_act_cfg_policy) - 1,</div><div class='add'>+			       nest, cable_test_tdr_act_cfg_policy,</div><div class='add'>+			       info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST])</div><div class='add'>+		cfg-&gt;first = nla_get_u32(</div><div class='add'>+			tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST]);</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST])</div><div class='add'>+		cfg-&gt;last = nla_get_u32(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST]);</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP])</div><div class='add'>+		cfg-&gt;step = nla_get_u32(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP]);</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR]) {</div><div class='add'>+		cfg-&gt;pair = nla_get_u8(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR]);</div><div class='add'>+		if (cfg-&gt;pair &gt; ETHTOOL_A_CABLE_PAIR_D) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(</div><div class='add'>+				info-&gt;extack,</div><div class='add'>+				tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR],</div><div class='add'>+				"invalid pair parameter");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;first &gt; MAX_CABLE_LENGTH_CM) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST],</div><div class='add'>+				    "invalid first parameter");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;last &gt; MAX_CABLE_LENGTH_CM) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST],</div><div class='add'>+				    "invalid last parameter");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;first &gt; cfg-&gt;last) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "invalid first/last parameter");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;step) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP],</div><div class='add'>+				    "invalid step parameter");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;step &gt; (cfg-&gt;last - cfg-&gt;first)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP],</div><div class='add'>+				    "step parameter too big");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	const struct ethtool_phy_ops *ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct phy_tdr_config cfg;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev = req_info.dev;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_act_cable_test_tdr_cfg(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG],</div><div class='add'>+					   info, &amp;cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	phydev = ethnl_req_get_phydev(&amp;req_info, tb,</div><div class='add'>+				      ETHTOOL_A_CABLE_TEST_TDR_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = ethtool_phy_ops;</div><div class='add'>+	if (!ops || !ops-&gt;start_cable_test_tdr) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;start_cable_test_tdr(phydev, info-&gt;extack, &amp;cfg);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethnl_cable_test_started(phydev,</div><div class='add'>+					 ETHTOOL_MSG_CABLE_TEST_TDR_NTF);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+out_dev_put:</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_amplitude(struct phy_device *phydev,</div><div class='add'>+			       u8 pair, s16 mV)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(phydev-&gt;skb,</div><div class='add'>+			      ETHTOOL_A_CABLE_TDR_NEST_AMPLITUDE);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(phydev-&gt;skb, ETHTOOL_A_CABLE_AMPLITUDE_PAIR, pair))</div><div class='add'>+		goto err;</div><div class='add'>+	if (nla_put_u16(phydev-&gt;skb, ETHTOOL_A_CABLE_AMPLITUDE_mV, mV))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(phydev-&gt;skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_amplitude);</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_pulse(struct phy_device *phydev, u16 mV)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(phydev-&gt;skb, ETHTOOL_A_CABLE_TDR_NEST_PULSE);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(phydev-&gt;skb, ETHTOOL_A_CABLE_PULSE_mV, mV))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(phydev-&gt;skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_pulse);</div><div class='add'>+</div><div class='add'>+int ethnl_cable_test_step(struct phy_device *phydev, u32 first, u32 last,</div><div class='add'>+			  u32 step)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret = -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(phydev-&gt;skb, ETHTOOL_A_CABLE_TDR_NEST_STEP);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_STEP_FIRST_DISTANCE,</div><div class='add'>+			first))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_STEP_LAST_DISTANCE, last))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(phydev-&gt;skb, ETHTOOL_A_CABLE_STEP_STEP_DISTANCE, step))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(phydev-&gt;skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(phydev-&gt;skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_cable_test_step);</div><div class='head'>diff --git a/net/ethtool/channels.c b/net/ethtool/channels.c<br/>new file mode 100644<br/>index 000000000000..ca4f80282448<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/channels.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/channels.c</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct channels_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct channels_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_channels		channels;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CHANNELS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct channels_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_channels_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_CHANNELS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int channels_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				 struct ethnl_reply_data *reply_base,</div><div class='add'>+				 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct channels_reply_data *data = CHANNELS_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_channels)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_channels(dev, &amp;data-&gt;channels);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int channels_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u32)) +	/* _CHANNELS_RX_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_TX_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_OTHER_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_COMBINED_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_RX_COUNT */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_TX_COUNT */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _CHANNELS_OTHER_COUNT */</div><div class='add'>+	       nla_total_size(sizeof(u32));	/* _CHANNELS_COMBINED_COUNT */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int channels_fill_reply(struct sk_buff *skb,</div><div class='add'>+			       const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct channels_reply_data *data = CHANNELS_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_channels *channels = &amp;data-&gt;channels;</div><div class='add'>+</div><div class='add'>+	if ((channels-&gt;max_rx &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_CHANNELS_RX_MAX,</div><div class='add'>+			  channels-&gt;max_rx) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_CHANNELS_RX_COUNT,</div><div class='add'>+			  channels-&gt;rx_count))) ||</div><div class='add'>+	    (channels-&gt;max_tx &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_CHANNELS_TX_MAX,</div><div class='add'>+			  channels-&gt;max_tx) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_CHANNELS_TX_COUNT,</div><div class='add'>+			  channels-&gt;tx_count))) ||</div><div class='add'>+	    (channels-&gt;max_other &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_CHANNELS_OTHER_MAX,</div><div class='add'>+			  channels-&gt;max_other) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_CHANNELS_OTHER_COUNT,</div><div class='add'>+			  channels-&gt;other_count))) ||</div><div class='add'>+	    (channels-&gt;max_combined &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_CHANNELS_COMBINED_MAX,</div><div class='add'>+			  channels-&gt;max_combined) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_CHANNELS_COMBINED_COUNT,</div><div class='add'>+			  channels-&gt;combined_count))))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CHANNELS_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_channels_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_CHANNELS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_CHANNELS_RX_COUNT]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CHANNELS_TX_COUNT]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CHANNELS_OTHER_COUNT]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_CHANNELS_COMBINED_COUNT]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_channels_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_channels &amp;&amp; ops-&gt;set_channels ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_channels(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned int from_channel, old_total, i;</div><div class='add'>+	bool mod = false, mod_combined = false;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct ethtool_channels channels = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	u32 err_attr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_channels(dev, &amp;channels);</div><div class='add'>+	old_total = channels.combined_count +</div><div class='add'>+		    max(channels.rx_count, channels.tx_count);</div><div class='add'>+</div><div class='add'>+	ethnl_update_u32(&amp;channels.rx_count, tb[ETHTOOL_A_CHANNELS_RX_COUNT],</div><div class='add'>+			 &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;channels.tx_count, tb[ETHTOOL_A_CHANNELS_TX_COUNT],</div><div class='add'>+			 &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;channels.other_count,</div><div class='add'>+			 tb[ETHTOOL_A_CHANNELS_OTHER_COUNT], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;channels.combined_count,</div><div class='add'>+			 tb[ETHTOOL_A_CHANNELS_COMBINED_COUNT], &amp;mod_combined);</div><div class='add'>+	mod |= mod_combined;</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* ensure new channel counts are within limits */</div><div class='add'>+	if (channels.rx_count &gt; channels.max_rx)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_RX_COUNT;</div><div class='add'>+	else if (channels.tx_count &gt; channels.max_tx)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_TX_COUNT;</div><div class='add'>+	else if (channels.other_count &gt; channels.max_other)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_OTHER_COUNT;</div><div class='add'>+	else if (channels.combined_count &gt; channels.max_combined)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_COMBINED_COUNT;</div><div class='add'>+	else</div><div class='add'>+		err_attr = 0;</div><div class='add'>+	if (err_attr) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[err_attr],</div><div class='add'>+				    "requested channel count exceeds maximum");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure there is at least one RX and one TX channel */</div><div class='add'>+	if (!channels.combined_count &amp;&amp; !channels.rx_count)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_RX_COUNT;</div><div class='add'>+	else if (!channels.combined_count &amp;&amp; !channels.tx_count)</div><div class='add'>+		err_attr = ETHTOOL_A_CHANNELS_TX_COUNT;</div><div class='add'>+	else</div><div class='add'>+		err_attr = 0;</div><div class='add'>+	if (err_attr) {</div><div class='add'>+		if (mod_combined)</div><div class='add'>+			err_attr = ETHTOOL_A_CHANNELS_COMBINED_COUNT;</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[err_attr],</div><div class='add'>+				    "requested channel counts would result in no RX or TX channel being configured");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethtool_check_max_channel(dev, channels, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Disabling channels, query zero-copy AF_XDP sockets */</div><div class='add'>+	from_channel = channels.combined_count +</div><div class='add'>+		       min(channels.rx_count, channels.tx_count);</div><div class='add'>+	for (i = from_channel; i &lt; old_total; i++)</div><div class='add'>+		if (xsk_get_pool_from_qid(dev, i)) {</div><div class='add'>+			GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing zerocopy AF_XDP sockets");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_channels(dev, &amp;channels);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_channels_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_CHANNELS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_CHANNELS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_CHANNELS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct channels_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct channels_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= channels_prepare_data,</div><div class='add'>+	.reply_size		= channels_reply_size,</div><div class='add'>+	.fill_reply		= channels_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_channels_validate,</div><div class='add'>+	.set			= ethnl_set_channels,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_CHANNELS_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/cmis.h b/net/ethtool/cmis.h<br/>new file mode 100644<br/>index 000000000000..4a9a946cabf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/cmis.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/cmis.h</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH		120</div><div class='add'>+#define ETHTOOL_CMIS_CDB_EPL_MAX_PL_LENGTH		2048</div><div class='add'>+#define ETHTOOL_CMIS_CDB_CMD_PAGE			0x9F</div><div class='add'>+#define ETHTOOL_CMIS_CDB_PAGE_I2C_ADDR			0x50</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_cdb - CDB commands parameters</div><div class='add'>+ * @cmis_rev: CMIS revision major.</div><div class='add'>+ * @read_write_len_ext: Allowable additional number of byte octets to the LPL</div><div class='add'>+ *			in a READ or a WRITE CDB commands.</div><div class='add'>+ * @max_completion_time:  Maximum CDB command completion time in msec.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_cdb {</div><div class='add'>+	u8	cmis_rev;</div><div class='add'>+	u8      read_write_len_ext;</div><div class='add'>+	u16     max_completion_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ethtool_cmis_cdb_cmd_id {</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_QUERY_STATUS		= 0x0000,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_MODULE_FEATURES		= 0x0040,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_FW_MANAGMENT_FEATURES	= 0x0041,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_START_FW_DOWNLOAD		= 0x0101,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_WRITE_FW_BLOCK_LPL		= 0x0103,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_WRITE_FW_BLOCK_EPL		= 0x0104,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_COMPLETE_FW_DOWNLOAD	= 0x0107,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_RUN_FW_IMAGE		= 0x0109,</div><div class='add'>+	ETHTOOL_CMIS_CDB_CMD_COMMIT_FW_IMAGE		= 0x010A,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_cdb_request - CDB commands request fields as decribed in</div><div class='add'>+ *				the CMIS standard</div><div class='add'>+ * @id: Command ID.</div><div class='add'>+ * @epl_len: EPL memory length.</div><div class='add'>+ * @lpl_len: LPL memory length.</div><div class='add'>+ * @chk_code: Check code for the previous field and the payload.</div><div class='add'>+ * @resv1: Added to match the CMIS standard request continuity.</div><div class='add'>+ * @resv2: Added to match the CMIS standard request continuity.</div><div class='add'>+ * @payload: Payload for the CDB commands.</div><div class='add'>+ * @epl: Extended payload for the CDB commands.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_cdb_request {</div><div class='add'>+	__be16 id;</div><div class='add'>+	struct_group(body,</div><div class='add'>+		__be16 epl_len;</div><div class='add'>+		u8 lpl_len;</div><div class='add'>+		u8 chk_code;</div><div class='add'>+		u8 resv1;</div><div class='add'>+		u8 resv2;</div><div class='add'>+		u8 payload[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH];</div><div class='add'>+	);</div><div class='add'>+	u8 *epl;	/* Everything above this field checksummed. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CDB_F_COMPLETION_VALID		BIT(0)</div><div class='add'>+#define CDB_F_STATUS_VALID		BIT(1)</div><div class='add'>+#define CDB_F_MODULE_STATE_VALID	BIT(2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_cdb_cmd_args - CDB commands execution arguments</div><div class='add'>+ * @req: CDB command fields as described in the CMIS standard.</div><div class='add'>+ * @max_duration: Maximum duration time for command completion in msec.</div><div class='add'>+ * @read_write_len_ext: Allowable additional number of byte octets to the LPL</div><div class='add'>+ *			in a READ or a WRITE commands.</div><div class='add'>+ * @msleep_pre_rpl: Waiting time before checking reply in msec.</div><div class='add'>+ * @rpl_exp_len: Expected reply length in bytes.</div><div class='add'>+ * @flags: Validation flags for CDB commands.</div><div class='add'>+ * @err_msg: Error message to be sent to user space.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_cdb_cmd_args {</div><div class='add'>+	struct ethtool_cmis_cdb_request req;</div><div class='add'>+	u16				max_duration;</div><div class='add'>+	u8				read_write_len_ext;</div><div class='add'>+	u8				msleep_pre_rpl;</div><div class='add'>+	u8                              rpl_exp_len;</div><div class='add'>+	u8				flags;</div><div class='add'>+	char				*err_msg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_cdb_rpl_hdr - CDB commands reply header arguments</div><div class='add'>+ * @rpl_len: Reply length.</div><div class='add'>+ * @rpl_chk_code: Reply check code.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_cdb_rpl_hdr {</div><div class='add'>+	u8 rpl_len;</div><div class='add'>+	u8 rpl_chk_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_cdb_rpl - CDB commands reply arguments</div><div class='add'>+ * @hdr: CDB commands reply header arguments.</div><div class='add'>+ * @payload: Payload for the CDB commands reply.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_cdb_rpl {</div><div class='add'>+	struct ethtool_cmis_cdb_rpl_hdr hdr;</div><div class='add'>+	u8 payload[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 ethtool_cmis_get_max_lpl_size(u8 num_of_byte_octs);</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_cdb_compose_args(struct ethtool_cmis_cdb_cmd_args *args,</div><div class='add'>+				   enum ethtool_cmis_cdb_cmd_id cmd, u8 *lpl,</div><div class='add'>+				   u8 lpl_len, u8 *epl, u16 epl_len,</div><div class='add'>+				   u16 max_duration, u8 read_write_len_ext,</div><div class='add'>+				   u16 msleep_pre_rpl, u8 rpl_exp_len,</div><div class='add'>+				   u8 flags);</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_cdb_check_completion_flag(u8 cmis_rev, u8 *flags);</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_page_init(struct ethtool_module_eeprom *page_data,</div><div class='add'>+			    u8 page, u32 offset, u32 length);</div><div class='add'>+</div><div class='add'>+struct ethtool_cmis_cdb *</div><div class='add'>+ethtool_cmis_cdb_init(struct net_device *dev,</div><div class='add'>+		      const struct ethtool_module_fw_flash_params *params,</div><div class='add'>+		      struct ethnl_module_fw_flash_ntf_params *ntf_params);</div><div class='add'>+void ethtool_cmis_cdb_fini(struct ethtool_cmis_cdb *cdb);</div><div class='add'>+</div><div class='add'>+int ethtool_cmis_wait_for_cond(struct net_device *dev, u8 flags, u8 flag,</div><div class='add'>+			       u16 max_duration, u32 offset,</div><div class='add'>+			       bool (*cond_success)(u8), bool (*cond_fail)(u8), u8 *state);</div><div class='add'>+</div><div class='add'>+int ethtool_cmis_cdb_execute_cmd(struct net_device *dev,</div><div class='add'>+				 struct ethtool_cmis_cdb_cmd_args *args);</div><div class='head'>diff --git a/net/ethtool/cmis_cdb.c b/net/ethtool/cmis_cdb.c<br/>new file mode 100644<br/>index 000000000000..3057576bc81e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/cmis_cdb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/cmis_cdb.c</a></div><div class='hunk'>@@ -0,0 +1,666 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "module_fw.h"</div><div class='add'>+#include "cmis.h"</div><div class='add'>+</div><div class='add'>+/* For accessing the LPL field on page 9Fh, the allowable length extension is</div><div class='add'>+ * min(i, 15) byte octets where i specifies the allowable additional number of</div><div class='add'>+ * byte octets in a READ or a WRITE.</div><div class='add'>+ */</div><div class='add'>+u32 ethtool_cmis_get_max_lpl_size(u8 num_of_byte_octs)</div><div class='add'>+{</div><div class='add'>+	return 8 * (1 + min_t(u8, num_of_byte_octs, 15));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_cdb_compose_args(struct ethtool_cmis_cdb_cmd_args *args,</div><div class='add'>+				   enum ethtool_cmis_cdb_cmd_id cmd, u8 *lpl,</div><div class='add'>+				   u8 lpl_len, u8 *epl, u16 epl_len,</div><div class='add'>+				   u16 max_duration, u8 read_write_len_ext,</div><div class='add'>+				   u16 msleep_pre_rpl, u8 rpl_exp_len, u8 flags)</div><div class='add'>+{</div><div class='add'>+	args-&gt;req.id = cpu_to_be16(cmd);</div><div class='add'>+	args-&gt;req.lpl_len = lpl_len;</div><div class='add'>+	if (lpl)</div><div class='add'>+		memcpy(args-&gt;req.payload, lpl, args-&gt;req.lpl_len);</div><div class='add'>+	if (epl) {</div><div class='add'>+		args-&gt;req.epl_len = cpu_to_be16(epl_len);</div><div class='add'>+		args-&gt;req.epl = epl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	args-&gt;max_duration = max_duration;</div><div class='add'>+	args-&gt;read_write_len_ext =</div><div class='add'>+		ethtool_cmis_get_max_lpl_size(read_write_len_ext);</div><div class='add'>+	args-&gt;msleep_pre_rpl = msleep_pre_rpl;</div><div class='add'>+	args-&gt;rpl_exp_len = rpl_exp_len;</div><div class='add'>+	args-&gt;flags = flags;</div><div class='add'>+	args-&gt;err_msg = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_page_init(struct ethtool_module_eeprom *page_data,</div><div class='add'>+			    u8 page, u32 offset, u32 length)</div><div class='add'>+{</div><div class='add'>+	page_data-&gt;page = page;</div><div class='add'>+	page_data-&gt;offset = offset;</div><div class='add'>+	page_data-&gt;length = length;</div><div class='add'>+	page_data-&gt;i2c_address = ETHTOOL_CMIS_CDB_PAGE_I2C_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_REVISION_PAGE	0x00</div><div class='add'>+#define CMIS_REVISION_OFFSET	0x01</div><div class='add'>+</div><div class='add'>+struct cmis_rev_rpl {</div><div class='add'>+	u8 rev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 cmis_rev_rpl_major(struct cmis_rev_rpl *rpl)</div><div class='add'>+{</div><div class='add'>+	return rpl-&gt;rev &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmis_rev_major_get(struct net_device *dev, u8 *rev_major)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_module_eeprom page_data = {0};</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	struct cmis_rev_rpl rpl = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(&amp;page_data, CMIS_REVISION_PAGE,</div><div class='add'>+			       CMIS_REVISION_OFFSET, sizeof(rpl));</div><div class='add'>+	page_data.data = (u8 *)&amp;rpl;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_module_eeprom_by_page(dev, &amp;page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*rev_major = cmis_rev_rpl_major(&amp;rpl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_ADVERTISEMENT_PAGE	0x01</div><div class='add'>+#define CMIS_CDB_ADVERTISEMENT_OFFSET	0xA3</div><div class='add'>+</div><div class='add'>+/* Based on section 8.4.11 "CDB Messaging Support Advertisement" in CMIS</div><div class='add'>+ * standard revision 5.2.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_advert_rpl {</div><div class='add'>+	u8	inst_supported;</div><div class='add'>+	u8	read_write_len_ext;</div><div class='add'>+	u8	resv1;</div><div class='add'>+	u8	resv2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 cmis_cdb_advert_rpl_inst_supported(struct cmis_cdb_advert_rpl *rpl)</div><div class='add'>+{</div><div class='add'>+	return rpl-&gt;inst_supported &gt;&gt; 6;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmis_cdb_advertisement_get(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_module_eeprom page_data = {};</div><div class='add'>+	struct cmis_cdb_advert_rpl rpl = {};</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(&amp;page_data, CMIS_CDB_ADVERTISEMENT_PAGE,</div><div class='add'>+			       CMIS_CDB_ADVERTISEMENT_OFFSET, sizeof(rpl));</div><div class='add'>+	page_data.data = (u8 *)&amp;rpl;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_module_eeprom_by_page(dev, &amp;page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cmis_cdb_advert_rpl_inst_supported(&amp;rpl)) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "CDB functionality is not supported",</div><div class='add'>+					      NULL);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdb-&gt;read_write_len_ext = rpl.read_write_len_ext;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_PASSWORD_ENTRY_PAGE	0x00</div><div class='add'>+#define CMIS_PASSWORD_ENTRY_OFFSET	0x7A</div><div class='add'>+</div><div class='add'>+struct cmis_password_entry_pl {</div><div class='add'>+	__be32 password;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* See section 9.3.1 "CMD 0000h: Query Status" in CMIS standard revision 5.2.</div><div class='add'>+ * struct cmis_cdb_query_status_pl and struct cmis_cdb_query_status_rpl are</div><div class='add'>+ * structured layouts of the flat arrays,</div><div class='add'>+ * struct ethtool_cmis_cdb_request::payload and</div><div class='add'>+ * struct ethtool_cmis_cdb_rpl::payload respectively.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_query_status_pl {</div><div class='add'>+	u16 response_delay;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmis_cdb_query_status_rpl {</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_cdb_validate_password(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			   struct net_device *dev,</div><div class='add'>+			   const struct ethtool_module_fw_flash_params *params,</div><div class='add'>+			   struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct cmis_cdb_query_status_pl qs_pl = {0};</div><div class='add'>+	struct ethtool_module_eeprom page_data = {};</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	struct cmis_password_entry_pl pe_pl = {};</div><div class='add'>+	struct cmis_cdb_query_status_rpl *rpl;</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(&amp;page_data, CMIS_PASSWORD_ENTRY_PAGE,</div><div class='add'>+			       CMIS_PASSWORD_ENTRY_OFFSET, sizeof(pe_pl));</div><div class='add'>+	page_data.data = (u8 *)&amp;pe_pl;</div><div class='add'>+</div><div class='add'>+	pe_pl = *((struct cmis_password_entry_pl *)page_data.data);</div><div class='add'>+	pe_pl.password = params-&gt;password;</div><div class='add'>+	err = ops-&gt;set_module_eeprom_by_page(dev, &amp;page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args, ETHTOOL_CMIS_CDB_CMD_QUERY_STATUS,</div><div class='add'>+				      (u8 *)&amp;qs_pl, sizeof(qs_pl), NULL, 0, 0,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000,</div><div class='add'>+				      sizeof(*rpl),</div><div class='add'>+				      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Query Status command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rpl = (struct cmis_cdb_query_status_rpl *)args.req.payload;</div><div class='add'>+	if (!rpl-&gt;length || !rpl-&gt;status) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Password was not accepted",</div><div class='add'>+					      NULL);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Some CDB commands asserts the CDB completion flag only from CMIS</div><div class='add'>+ * revision 5. Therefore, check the relevant validity flag only when</div><div class='add'>+ * the revision supports it.</div><div class='add'>+ */</div><div class='add'>+void ethtool_cmis_cdb_check_completion_flag(u8 cmis_rev, u8 *flags)</div><div class='add'>+{</div><div class='add'>+	*flags |= cmis_rev &gt;= 5 ? CDB_F_COMPLETION_VALID : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_MODULE_FEATURES_RESV_DATA	34</div><div class='add'>+</div><div class='add'>+/* See section 9.4.1 "CMD 0040h: Module Features" in CMIS standard revision 5.2.</div><div class='add'>+ * struct cmis_cdb_module_features_rpl is structured layout of the flat</div><div class='add'>+ * array, ethtool_cmis_cdb_rpl::payload.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_module_features_rpl {</div><div class='add'>+	u8	resv1[CMIS_CDB_MODULE_FEATURES_RESV_DATA];</div><div class='add'>+	__be16	max_completion_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+cmis_cdb_module_features_completion_time(struct cmis_cdb_module_features_rpl *rpl)</div><div class='add'>+{</div><div class='add'>+	return be16_to_cpu(rpl-&gt;max_completion_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmis_cdb_module_features_get(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+					struct net_device *dev,</div><div class='add'>+					struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	struct cmis_cdb_module_features_rpl *rpl;</div><div class='add'>+	u8 flags = CDB_F_STATUS_VALID;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_check_completion_flag(cdb-&gt;cmis_rev, &amp;flags);</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+				      ETHTOOL_CMIS_CDB_CMD_MODULE_FEATURES,</div><div class='add'>+				      NULL, 0, NULL, 0, 0,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000,</div><div class='add'>+				      sizeof(*rpl), flags);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Module Features command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rpl = (struct cmis_cdb_module_features_rpl *)args.req.payload;</div><div class='add'>+	cdb-&gt;max_completion_time =</div><div class='add'>+		cmis_cdb_module_features_completion_time(rpl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethtool_cmis_cdb *</div><div class='add'>+ethtool_cmis_cdb_init(struct net_device *dev,</div><div class='add'>+		      const struct ethtool_module_fw_flash_params *params,</div><div class='add'>+		      struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb *cdb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cdb = kzalloc(sizeof(*cdb), GFP_KERNEL);</div><div class='add'>+	if (!cdb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	err = cmis_rev_major_get(dev, &amp;cdb-&gt;cmis_rev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (cdb-&gt;cmis_rev &lt; 4) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "CMIS revision doesn't support module firmware flashing",</div><div class='add'>+					      NULL);</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmis_cdb_advertisement_get(cdb, dev, ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;password_valid) {</div><div class='add'>+		err = cmis_cdb_validate_password(cdb, dev, params, ntf_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmis_cdb_module_features_get(cdb, dev, ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return cdb;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ethtool_cmis_cdb_fini(cdb);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_cdb_fini(struct ethtool_cmis_cdb *cdb)</div><div class='add'>+{</div><div class='add'>+	kfree(cdb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_completed(u8 data)</div><div class='add'>+{</div><div class='add'>+	return !!(data &amp; 0x40);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_STATUS_SUCCESS	0x01</div><div class='add'>+</div><div class='add'>+static bool status_success(u8 data)</div><div class='add'>+{</div><div class='add'>+	return data == CMIS_CDB_STATUS_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_STATUS_FAIL	0x40</div><div class='add'>+</div><div class='add'>+static bool status_fail(u8 data)</div><div class='add'>+{</div><div class='add'>+	return data &amp; CMIS_CDB_STATUS_FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cmis_wait_for_cond_rpl {</div><div class='add'>+	u8 state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethtool_cmis_module_poll(struct net_device *dev,</div><div class='add'>+			 struct cmis_wait_for_cond_rpl *rpl, u32 offset,</div><div class='add'>+			 bool (*cond_success)(u8), bool (*cond_fail)(u8))</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_module_eeprom page_data = {0};</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(&amp;page_data, 0, offset, sizeof(*rpl));</div><div class='add'>+	page_data.data = (u8 *)rpl;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_module_eeprom_by_page(dev, &amp;page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err_once(dev, "%s\n", extack._msg);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((*cond_success)(rpl-&gt;state))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (*cond_fail &amp;&amp; (*cond_fail)(rpl-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_cmis_wait_for_cond(struct net_device *dev, u8 flags, u8 flag,</div><div class='add'>+			       u16 max_duration, u32 offset,</div><div class='add'>+			       bool (*cond_success)(u8), bool (*cond_fail)(u8),</div><div class='add'>+			       u8 *state)</div><div class='add'>+{</div><div class='add'>+	struct cmis_wait_for_cond_rpl rpl = {};</div><div class='add'>+	unsigned long end;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; flag))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (max_duration == 0)</div><div class='add'>+		max_duration = U16_MAX;</div><div class='add'>+</div><div class='add'>+	end = jiffies + msecs_to_jiffies(max_duration);</div><div class='add'>+	do {</div><div class='add'>+		err = ethtool_cmis_module_poll(dev, &amp;rpl, offset, cond_success,</div><div class='add'>+					       cond_fail);</div><div class='add'>+		if (err != -EBUSY)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, end));</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_module_poll(dev, &amp;rpl, offset, cond_success,</div><div class='add'>+				       cond_fail);</div><div class='add'>+	if (err == -EBUSY)</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	*state = rpl.state;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_COMPLETION_FLAG_OFFSET	0x08</div><div class='add'>+</div><div class='add'>+static int cmis_cdb_wait_for_completion(struct net_device *dev,</div><div class='add'>+					struct ethtool_cmis_cdb_cmd_args *args)</div><div class='add'>+{</div><div class='add'>+	u8 flag;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Some vendors demand waiting time before checking completion flag</div><div class='add'>+	 * in some CDB commands.</div><div class='add'>+	 */</div><div class='add'>+	msleep(args-&gt;msleep_pre_rpl);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_wait_for_cond(dev, args-&gt;flags,</div><div class='add'>+					 CDB_F_COMPLETION_VALID,</div><div class='add'>+					 args-&gt;max_duration,</div><div class='add'>+					 CMIS_CDB_COMPLETION_FLAG_OFFSET,</div><div class='add'>+					 is_completed, NULL, &amp;flag);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		args-&gt;err_msg = "Completion Flag did not set on time";</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_STATUS_OFFSET	0x25</div><div class='add'>+</div><div class='add'>+static void cmis_cdb_status_fail_msg_get(u8 status, char **err_msg)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case 0b10000001:</div><div class='add'>+		*err_msg = "CDB Status is in progress: Busy capturing command";</div><div class='add'>+		break;</div><div class='add'>+	case 0b10000010:</div><div class='add'>+		*err_msg =</div><div class='add'>+			"CDB Status is in progress: Busy checking/validating command";</div><div class='add'>+		break;</div><div class='add'>+	case 0b10000011:</div><div class='add'>+		*err_msg = "CDB Status is in progress: Busy executing";</div><div class='add'>+		break;</div><div class='add'>+	case 0b01000000:</div><div class='add'>+		*err_msg = "CDB status failed: no specific failure";</div><div class='add'>+		break;</div><div class='add'>+	case 0b01000010:</div><div class='add'>+		*err_msg =</div><div class='add'>+			"CDB status failed: Parameter range error or parameter not supported";</div><div class='add'>+		break;</div><div class='add'>+	case 0b01000101:</div><div class='add'>+		*err_msg = "CDB status failed: CdbChkCode error";</div><div class='add'>+		break;</div><div class='add'>+	case 0b01000110:</div><div class='add'>+		*err_msg = "CDB status failed: Password error";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*err_msg = "Unknown failure reason";</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cmis_cdb_wait_for_status(struct net_device *dev,</div><div class='add'>+				    struct ethtool_cmis_cdb_cmd_args *args)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Some vendors demand waiting time before checking status in some</div><div class='add'>+	 * CDB commands.</div><div class='add'>+	 */</div><div class='add'>+	msleep(args-&gt;msleep_pre_rpl);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_wait_for_cond(dev, args-&gt;flags, CDB_F_STATUS_VALID,</div><div class='add'>+					 args-&gt;max_duration,</div><div class='add'>+					 CMIS_CDB_STATUS_OFFSET,</div><div class='add'>+					 status_success, status_fail, &amp;status);</div><div class='add'>+	if (err &lt; 0 &amp;&amp; !args-&gt;err_msg)</div><div class='add'>+		cmis_cdb_status_fail_msg_get(status, &amp;args-&gt;err_msg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_REPLY_OFFSET	0x86</div><div class='add'>+</div><div class='add'>+static int cmis_cdb_process_reply(struct net_device *dev,</div><div class='add'>+				  struct ethtool_module_eeprom *page_data,</div><div class='add'>+				  struct ethtool_cmis_cdb_cmd_args *args)</div><div class='add'>+{</div><div class='add'>+	u8 rpl_hdr_len = sizeof(struct ethtool_cmis_cdb_rpl_hdr);</div><div class='add'>+	u8 rpl_exp_len = args-&gt;rpl_exp_len + rpl_hdr_len;</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	struct ethtool_cmis_cdb_rpl *rpl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!args-&gt;rpl_exp_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(page_data, ETHTOOL_CMIS_CDB_CMD_PAGE,</div><div class='add'>+			       CMIS_CDB_REPLY_OFFSET, rpl_exp_len);</div><div class='add'>+	page_data-&gt;data = kmalloc(page_data-&gt;length, GFP_KERNEL);</div><div class='add'>+	if (!page_data-&gt;data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_module_eeprom_by_page(dev, page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rpl = (struct ethtool_cmis_cdb_rpl *)page_data-&gt;data;</div><div class='add'>+	if ((args-&gt;rpl_exp_len &gt; rpl-&gt;hdr.rpl_len + rpl_hdr_len) ||</div><div class='add'>+	    !rpl-&gt;hdr.rpl_chk_code) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	args-&gt;req.lpl_len = rpl-&gt;hdr.rpl_len;</div><div class='add'>+	memcpy(args-&gt;req.payload, rpl-&gt;payload, args-&gt;req.lpl_len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(page_data-&gt;data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__ethtool_cmis_cdb_execute_cmd(struct net_device *dev,</div><div class='add'>+			       struct ethtool_module_eeprom *page_data,</div><div class='add'>+			       u8 page, u32 offset, u32 length, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct netlink_ext_ack extack = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_page_init(page_data, page, offset, length);</div><div class='add'>+	page_data-&gt;data = kmemdup(data, page_data-&gt;length, GFP_KERNEL);</div><div class='add'>+	if (!page_data-&gt;data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;set_module_eeprom_by_page(dev, page_data, &amp;extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (extack._msg)</div><div class='add'>+			netdev_err(dev, "%s\n", extack._msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(page_data-&gt;data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_EPL_PAGE_START			0xA0</div><div class='add'>+#define CMIS_CDB_EPL_PAGE_END			0xAF</div><div class='add'>+#define CMIS_CDB_EPL_FW_BLOCK_OFFSET_START	128</div><div class='add'>+#define CMIS_CDB_EPL_FW_BLOCK_OFFSET_END	255</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethtool_cmis_cdb_execute_epl_cmd(struct net_device *dev,</div><div class='add'>+				 struct ethtool_cmis_cdb_cmd_args *args,</div><div class='add'>+				 struct ethtool_module_eeprom *page_data)</div><div class='add'>+{</div><div class='add'>+	u16 epl_len = be16_to_cpu(args-&gt;req.epl_len);</div><div class='add'>+	u32 bytes_written = 0;</div><div class='add'>+	u8 page;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (page = CMIS_CDB_EPL_PAGE_START;</div><div class='add'>+	     page &lt;= CMIS_CDB_EPL_PAGE_END &amp;&amp; bytes_written &lt; epl_len; page++) {</div><div class='add'>+		u16 offset = CMIS_CDB_EPL_FW_BLOCK_OFFSET_START;</div><div class='add'>+</div><div class='add'>+		while (offset &lt;= CMIS_CDB_EPL_FW_BLOCK_OFFSET_END &amp;&amp;</div><div class='add'>+		       bytes_written &lt; epl_len) {</div><div class='add'>+			u32 bytes_left = epl_len - bytes_written;</div><div class='add'>+			u16 space_left, bytes_to_write;</div><div class='add'>+</div><div class='add'>+			space_left = CMIS_CDB_EPL_FW_BLOCK_OFFSET_END - offset + 1;</div><div class='add'>+			bytes_to_write = min_t(u16, bytes_left,</div><div class='add'>+					       min_t(u16, space_left,</div><div class='add'>+						     args-&gt;read_write_len_ext));</div><div class='add'>+</div><div class='add'>+			err = __ethtool_cmis_cdb_execute_cmd(dev, page_data,</div><div class='add'>+							     page, offset,</div><div class='add'>+							     bytes_to_write,</div><div class='add'>+							     args-&gt;req.epl + bytes_written);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			offset += bytes_to_write;</div><div class='add'>+			bytes_written += bytes_to_write;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 cmis_cdb_calc_checksum(const void *data, size_t size)</div><div class='add'>+{</div><div class='add'>+	const u8 *bytes = (const u8 *)data;</div><div class='add'>+	u8 checksum = 0;</div><div class='add'>+</div><div class='add'>+	for (size_t i = 0; i &lt; size; i++)</div><div class='add'>+		checksum += bytes[i];</div><div class='add'>+</div><div class='add'>+	return ~checksum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_CDB_CMD_ID_OFFSET	0x80</div><div class='add'>+</div><div class='add'>+int ethtool_cmis_cdb_execute_cmd(struct net_device *dev,</div><div class='add'>+				 struct ethtool_cmis_cdb_cmd_args *args)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_eeprom page_data = {};</div><div class='add'>+	u32 offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	args-&gt;req.chk_code =</div><div class='add'>+		cmis_cdb_calc_checksum(&amp;args-&gt;req,</div><div class='add'>+				       offsetof(struct ethtool_cmis_cdb_request,</div><div class='add'>+						epl));</div><div class='add'>+</div><div class='add'>+	if (args-&gt;req.lpl_len &gt; args-&gt;read_write_len_ext) {</div><div class='add'>+		args-&gt;err_msg = "LPL length is longer than CDB read write length extension allows";</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* According to the CMIS standard, there are two options to trigger the</div><div class='add'>+	 * CDB commands. The default option is triggering the command by writing</div><div class='add'>+	 * the CMDID bytes. Therefore, the command will be split to 2 calls:</div><div class='add'>+	 * First, with everything except the CMDID field and then the CMDID</div><div class='add'>+	 * field.</div><div class='add'>+	 */</div><div class='add'>+	offset = CMIS_CDB_CMD_ID_OFFSET +</div><div class='add'>+		offsetof(struct ethtool_cmis_cdb_request, body);</div><div class='add'>+	err = __ethtool_cmis_cdb_execute_cmd(dev, &amp;page_data,</div><div class='add'>+					     ETHTOOL_CMIS_CDB_CMD_PAGE, offset,</div><div class='add'>+					     sizeof(args-&gt;req.body),</div><div class='add'>+					     &amp;args-&gt;req.body);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (args-&gt;req.epl_len) {</div><div class='add'>+		err = ethtool_cmis_cdb_execute_epl_cmd(dev, args, &amp;page_data);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = CMIS_CDB_CMD_ID_OFFSET +</div><div class='add'>+		offsetof(struct ethtool_cmis_cdb_request, id);</div><div class='add'>+	err = __ethtool_cmis_cdb_execute_cmd(dev, &amp;page_data,</div><div class='add'>+					     ETHTOOL_CMIS_CDB_CMD_PAGE, offset,</div><div class='add'>+					     sizeof(args-&gt;req.id),</div><div class='add'>+					     &amp;args-&gt;req.id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = cmis_cdb_wait_for_completion(dev, args);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = cmis_cdb_wait_for_status(dev, args);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return cmis_cdb_process_reply(dev, &amp;page_data, args);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/cmis_fw_update.c b/net/ethtool/cmis_fw_update.c<br/>new file mode 100644<br/>index 000000000000..df5f344209c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/cmis_fw_update.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/cmis_fw_update.c</a></div><div class='hunk'>@@ -0,0 +1,485 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "module_fw.h"</div><div class='add'>+#include "cmis.h"</div><div class='add'>+</div><div class='add'>+struct cmis_fw_update_fw_mng_features {</div><div class='add'>+	u8	start_cmd_payload_size;</div><div class='add'>+	u8	write_mechanism;</div><div class='add'>+	u16	max_duration_start;</div><div class='add'>+	u16	max_duration_write;</div><div class='add'>+	u16	max_duration_complete;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* See section 9.4.2 "CMD 0041h: Firmware Management Features" in CMIS standard</div><div class='add'>+ * revision 5.2.</div><div class='add'>+ * struct cmis_cdb_fw_mng_features_rpl is a structured layout of the flat</div><div class='add'>+ * array, ethtool_cmis_cdb_rpl::payload.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_fw_mng_features_rpl {</div><div class='add'>+	u8	resv1;</div><div class='add'>+	u8	resv2;</div><div class='add'>+	u8	start_cmd_payload_size;</div><div class='add'>+	u8	resv3;</div><div class='add'>+	u8	read_write_len_ext;</div><div class='add'>+	u8	write_mechanism;</div><div class='add'>+	u8	resv4;</div><div class='add'>+	u8	resv5;</div><div class='add'>+	__be16	max_duration_start;</div><div class='add'>+	__be16	resv6;</div><div class='add'>+	__be16	max_duration_write;</div><div class='add'>+	__be16	max_duration_complete;</div><div class='add'>+	__be16	resv7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cmis_cdb_fw_write_mechanism {</div><div class='add'>+	CMIS_CDB_FW_WRITE_MECHANISM_NONE	= 0x00,</div><div class='add'>+	CMIS_CDB_FW_WRITE_MECHANISM_LPL		= 0x01,</div><div class='add'>+	CMIS_CDB_FW_WRITE_MECHANISM_EPL		= 0x10,</div><div class='add'>+	CMIS_CDB_FW_WRITE_MECHANISM_BOTH	= 0x11,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_fw_mng_features_get(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+				   struct net_device *dev,</div><div class='add'>+				   struct cmis_fw_update_fw_mng_features *fw_mng,</div><div class='add'>+				   struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	struct cmis_cdb_fw_mng_features_rpl *rpl;</div><div class='add'>+	u8 flags = CDB_F_STATUS_VALID;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_check_completion_flag(cdb-&gt;cmis_rev, &amp;flags);</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+				      ETHTOOL_CMIS_CDB_CMD_FW_MANAGMENT_FEATURES,</div><div class='add'>+				      NULL, 0, NULL, 0,</div><div class='add'>+				      cdb-&gt;max_completion_time,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000,</div><div class='add'>+				      sizeof(*rpl), flags);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "FW Management Features command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rpl = (struct cmis_cdb_fw_mng_features_rpl *)args.req.payload;</div><div class='add'>+	if (rpl-&gt;write_mechanism == CMIS_CDB_FW_WRITE_MECHANISM_NONE) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "CDB write mechanism is not supported",</div><div class='add'>+					      NULL);</div><div class='add'>+		return  -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Above, we used read_write_len_ext that we got from CDB</div><div class='add'>+	 * advertisement. Update it with the value that we got from module</div><div class='add'>+	 * features query, which is specific for Firmware Management Commands</div><div class='add'>+	 * (IDs 0100h-01FFh).</div><div class='add'>+	 */</div><div class='add'>+	cdb-&gt;read_write_len_ext = rpl-&gt;read_write_len_ext;</div><div class='add'>+	fw_mng-&gt;start_cmd_payload_size = rpl-&gt;start_cmd_payload_size;</div><div class='add'>+	fw_mng-&gt;write_mechanism =</div><div class='add'>+		rpl-&gt;write_mechanism == CMIS_CDB_FW_WRITE_MECHANISM_LPL ?</div><div class='add'>+		CMIS_CDB_FW_WRITE_MECHANISM_LPL :</div><div class='add'>+		CMIS_CDB_FW_WRITE_MECHANISM_EPL;</div><div class='add'>+	fw_mng-&gt;max_duration_start = be16_to_cpu(rpl-&gt;max_duration_start);</div><div class='add'>+	fw_mng-&gt;max_duration_write = be16_to_cpu(rpl-&gt;max_duration_write);</div><div class='add'>+	fw_mng-&gt;max_duration_complete = be16_to_cpu(rpl-&gt;max_duration_complete);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* See section 9.7.2 "CMD 0101h: Start Firmware Download" in CMIS standard</div><div class='add'>+ * revision 5.2.</div><div class='add'>+ * struct cmis_cdb_start_fw_download_pl is a structured layout of the</div><div class='add'>+ * flat array, ethtool_cmis_cdb_request::payload.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_start_fw_download_pl {</div><div class='add'>+	__struct_group(cmis_cdb_start_fw_download_pl_h, head, /* no attrs */,</div><div class='add'>+			__be32	image_size;</div><div class='add'>+			__be32	resv1;</div><div class='add'>+	);</div><div class='add'>+	u8 vendor_data[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH -</div><div class='add'>+		sizeof(struct cmis_cdb_start_fw_download_pl_h)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_start_download(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			      struct ethtool_cmis_fw_update_params *fw_update,</div><div class='add'>+			      struct cmis_fw_update_fw_mng_features *fw_mng)</div><div class='add'>+{</div><div class='add'>+	u8 vendor_data_size = fw_mng-&gt;start_cmd_payload_size;</div><div class='add'>+	struct cmis_cdb_start_fw_download_pl pl = {};</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	u8 lpl_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pl.image_size = cpu_to_be32(fw_update-&gt;fw-&gt;size);</div><div class='add'>+	memcpy(pl.vendor_data, fw_update-&gt;fw-&gt;data, vendor_data_size);</div><div class='add'>+</div><div class='add'>+	lpl_len = offsetof(struct cmis_cdb_start_fw_download_pl,</div><div class='add'>+			   vendor_data[vendor_data_size]);</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+				      ETHTOOL_CMIS_CDB_CMD_START_FW_DOWNLOAD,</div><div class='add'>+				      (u8 *)&amp;pl, lpl_len, NULL, 0,</div><div class='add'>+				      fw_mng-&gt;max_duration_start,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000, 0,</div><div class='add'>+				      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(fw_update-&gt;dev, &amp;args);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(fw_update-&gt;dev,</div><div class='add'>+					      &amp;fw_update-&gt;ntf_params,</div><div class='add'>+					      "Start FW download command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* See section 9.7.4 "CMD 0103h: Write Firmware Block LPL" in CMIS standard</div><div class='add'>+ * revision 5.2.</div><div class='add'>+ * struct cmis_cdb_write_fw_block_lpl_pl is a structured layout of the</div><div class='add'>+ * flat array, ethtool_cmis_cdb_request::payload.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_write_fw_block_lpl_pl {</div><div class='add'>+	__be32	block_address;</div><div class='add'>+	u8 fw_block[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH - sizeof(__be32)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_write_image_lpl(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			       struct ethtool_cmis_fw_update_params *fw_update,</div><div class='add'>+			       struct cmis_fw_update_fw_mng_features *fw_mng)</div><div class='add'>+{</div><div class='add'>+	u8 start = fw_mng-&gt;start_cmd_payload_size;</div><div class='add'>+	u32 offset, max_block_size, max_lpl_len;</div><div class='add'>+	u32 image_size = fw_update-&gt;fw-&gt;size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	max_lpl_len = min_t(u32,</div><div class='add'>+			    ethtool_cmis_get_max_lpl_size(cdb-&gt;read_write_len_ext),</div><div class='add'>+			    ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH);</div><div class='add'>+	max_block_size =</div><div class='add'>+		max_lpl_len - sizeof_field(struct cmis_cdb_write_fw_block_lpl_pl,</div><div class='add'>+					   block_address);</div><div class='add'>+</div><div class='add'>+	for (offset = start; offset &lt; image_size; offset += max_block_size) {</div><div class='add'>+		struct cmis_cdb_write_fw_block_lpl_pl pl = {</div><div class='add'>+			.block_address = cpu_to_be32(offset - start),</div><div class='add'>+		};</div><div class='add'>+		struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+		u32 block_size, lpl_len;</div><div class='add'>+</div><div class='add'>+		ethnl_module_fw_flash_ntf_in_progress(fw_update-&gt;dev,</div><div class='add'>+						      &amp;fw_update-&gt;ntf_params,</div><div class='add'>+						      offset - start,</div><div class='add'>+						      image_size);</div><div class='add'>+		block_size = min_t(u32, max_block_size, image_size - offset);</div><div class='add'>+		memcpy(pl.fw_block, &amp;fw_update-&gt;fw-&gt;data[offset], block_size);</div><div class='add'>+		lpl_len = block_size +</div><div class='add'>+			sizeof_field(struct cmis_cdb_write_fw_block_lpl_pl,</div><div class='add'>+				     block_address);</div><div class='add'>+</div><div class='add'>+		ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+					      ETHTOOL_CMIS_CDB_CMD_WRITE_FW_BLOCK_LPL,</div><div class='add'>+					      (u8 *)&amp;pl, lpl_len, NULL, 0,</div><div class='add'>+					      fw_mng-&gt;max_duration_write,</div><div class='add'>+					      cdb-&gt;read_write_len_ext, 1, 0,</div><div class='add'>+					      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+		err = ethtool_cmis_cdb_execute_cmd(fw_update-&gt;dev, &amp;args);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			ethnl_module_fw_flash_ntf_err(fw_update-&gt;dev,</div><div class='add'>+						      &amp;fw_update-&gt;ntf_params,</div><div class='add'>+						      "Write FW block LPL command failed",</div><div class='add'>+						      args.err_msg);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cmis_cdb_write_fw_block_epl_pl {</div><div class='add'>+	u8 fw_block[ETHTOOL_CMIS_CDB_EPL_MAX_PL_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_write_image_epl(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			       struct ethtool_cmis_fw_update_params *fw_update,</div><div class='add'>+			       struct cmis_fw_update_fw_mng_features *fw_mng)</div><div class='add'>+{</div><div class='add'>+	u8 start = fw_mng-&gt;start_cmd_payload_size;</div><div class='add'>+	u32 image_size = fw_update-&gt;fw-&gt;size;</div><div class='add'>+	u32 offset, lpl_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lpl_len = sizeof_field(struct cmis_cdb_write_fw_block_lpl_pl,</div><div class='add'>+			       block_address);</div><div class='add'>+</div><div class='add'>+	for (offset = start; offset &lt; image_size;</div><div class='add'>+	     offset += ETHTOOL_CMIS_CDB_EPL_MAX_PL_LENGTH) {</div><div class='add'>+		struct cmis_cdb_write_fw_block_lpl_pl lpl = {</div><div class='add'>+			.block_address = cpu_to_be32(offset - start),</div><div class='add'>+		};</div><div class='add'>+		struct cmis_cdb_write_fw_block_epl_pl *epl;</div><div class='add'>+		struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+		u32 epl_len;</div><div class='add'>+</div><div class='add'>+		ethnl_module_fw_flash_ntf_in_progress(fw_update-&gt;dev,</div><div class='add'>+						      &amp;fw_update-&gt;ntf_params,</div><div class='add'>+						      offset - start,</div><div class='add'>+						      image_size);</div><div class='add'>+</div><div class='add'>+		epl_len = min_t(u32, ETHTOOL_CMIS_CDB_EPL_MAX_PL_LENGTH,</div><div class='add'>+				image_size - offset);</div><div class='add'>+		epl = kmalloc_array(epl_len, sizeof(u8), GFP_KERNEL);</div><div class='add'>+		if (!epl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		memcpy(epl-&gt;fw_block, &amp;fw_update-&gt;fw-&gt;data[offset], epl_len);</div><div class='add'>+</div><div class='add'>+		ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+					      ETHTOOL_CMIS_CDB_CMD_WRITE_FW_BLOCK_EPL,</div><div class='add'>+					      (u8 *)&amp;lpl, lpl_len, (u8 *)epl,</div><div class='add'>+					      epl_len,</div><div class='add'>+					      fw_mng-&gt;max_duration_write,</div><div class='add'>+					      cdb-&gt;read_write_len_ext, 1, 0,</div><div class='add'>+					      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+		err = ethtool_cmis_cdb_execute_cmd(fw_update-&gt;dev, &amp;args);</div><div class='add'>+		kfree(epl);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			ethnl_module_fw_flash_ntf_err(fw_update-&gt;dev,</div><div class='add'>+						      &amp;fw_update-&gt;ntf_params,</div><div class='add'>+						      "Write FW block EPL command failed",</div><div class='add'>+						      args.err_msg);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_complete_download(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+				 struct net_device *dev,</div><div class='add'>+				 struct cmis_fw_update_fw_mng_features *fw_mng,</div><div class='add'>+				 struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+				      ETHTOOL_CMIS_CDB_CMD_COMPLETE_FW_DOWNLOAD,</div><div class='add'>+				      NULL, 0, NULL, 0,</div><div class='add'>+				      fw_mng-&gt;max_duration_complete,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000, 0,</div><div class='add'>+				      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Complete FW download command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_download_image(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			      struct ethtool_cmis_fw_update_params *fw_update,</div><div class='add'>+			      struct cmis_fw_update_fw_mng_features *fw_mng)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_start_download(cdb, fw_update, fw_mng);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (fw_mng-&gt;write_mechanism == CMIS_CDB_FW_WRITE_MECHANISM_LPL) {</div><div class='add'>+		err = cmis_fw_update_write_image_lpl(cdb, fw_update, fw_mng);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		err = cmis_fw_update_write_image_epl(cdb, fw_update, fw_mng);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_complete_download(cdb, fw_update-&gt;dev, fw_mng,</div><div class='add'>+					       &amp;fw_update-&gt;ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CMIS_MODULE_LOW_PWR	= 1,</div><div class='add'>+	CMIS_MODULE_READY	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool module_is_ready(u8 data)</div><div class='add'>+{</div><div class='add'>+	u8 state = (data &gt;&gt; 1) &amp; 7;</div><div class='add'>+</div><div class='add'>+	return state == CMIS_MODULE_READY || state == CMIS_MODULE_LOW_PWR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMIS_MODULE_READY_MAX_DURATION_MSEC	1000</div><div class='add'>+#define CMIS_MODULE_STATE_OFFSET		3</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_wait_for_module_state(struct net_device *dev, u8 flags)</div><div class='add'>+{</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	return ethtool_cmis_wait_for_cond(dev, flags, CDB_F_MODULE_STATE_VALID,</div><div class='add'>+					  CMIS_MODULE_READY_MAX_DURATION_MSEC,</div><div class='add'>+					  CMIS_MODULE_STATE_OFFSET,</div><div class='add'>+					  module_is_ready, NULL, &amp;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* See section 9.7.10 "CMD 0109h: Run Firmware Image" in CMIS standard</div><div class='add'>+ * revision 5.2.</div><div class='add'>+ * struct cmis_cdb_run_fw_image_pl is a structured layout of the flat</div><div class='add'>+ * array, ethtool_cmis_cdb_request::payload.</div><div class='add'>+ */</div><div class='add'>+struct cmis_cdb_run_fw_image_pl {</div><div class='add'>+	u8 resv1;</div><div class='add'>+	u8 image_to_run;</div><div class='add'>+	u16 delay_to_reset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_run_image(struct ethtool_cmis_cdb *cdb, struct net_device *dev,</div><div class='add'>+			 struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	struct cmis_cdb_run_fw_image_pl pl = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args, ETHTOOL_CMIS_CDB_CMD_RUN_FW_IMAGE,</div><div class='add'>+				      (u8 *)&amp;pl, sizeof(pl), NULL, 0,</div><div class='add'>+				      cdb-&gt;max_completion_time,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000, 0,</div><div class='add'>+				      CDB_F_MODULE_STATE_VALID);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Run image command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_wait_for_module_state(dev, args.flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Module is not ready on time after reset",</div><div class='add'>+					      NULL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+cmis_fw_update_commit_image(struct ethtool_cmis_cdb *cdb,</div><div class='add'>+			    struct net_device *dev,</div><div class='add'>+			    struct ethnl_module_fw_flash_ntf_params *ntf_params)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_cdb_cmd_args args = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_cdb_compose_args(&amp;args,</div><div class='add'>+				      ETHTOOL_CMIS_CDB_CMD_COMMIT_FW_IMAGE,</div><div class='add'>+				      NULL, 0, NULL, 0,</div><div class='add'>+				      cdb-&gt;max_completion_time,</div><div class='add'>+				      cdb-&gt;read_write_len_ext, 1000, 0,</div><div class='add'>+				      CDB_F_COMPLETION_VALID | CDB_F_STATUS_VALID);</div><div class='add'>+</div><div class='add'>+	err = ethtool_cmis_cdb_execute_cmd(dev, &amp;args);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ethnl_module_fw_flash_ntf_err(dev, ntf_params,</div><div class='add'>+					      "Commit image command failed",</div><div class='add'>+					      args.err_msg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmis_fw_update_reset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	__u32 reset_data = ETH_RESET_PHY;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;reset(dev, &amp;reset_data);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethtool_cmis_fw_update(struct ethtool_cmis_fw_update_params *fw_update)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_module_fw_flash_ntf_params *ntf_params =</div><div class='add'>+						&amp;fw_update-&gt;ntf_params;</div><div class='add'>+	struct cmis_fw_update_fw_mng_features fw_mng = {0};</div><div class='add'>+	struct net_device *dev = fw_update-&gt;dev;</div><div class='add'>+	struct ethtool_cmis_cdb *cdb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cdb = ethtool_cmis_cdb_init(dev, &amp;fw_update-&gt;params, ntf_params);</div><div class='add'>+	if (IS_ERR(cdb))</div><div class='add'>+		goto err_send_ntf;</div><div class='add'>+</div><div class='add'>+	ethnl_module_fw_flash_ntf_start(dev, ntf_params);</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_fw_mng_features_get(cdb, dev, &amp;fw_mng, ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_cdb_fini;</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_download_image(cdb, fw_update, &amp;fw_mng);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_cdb_fini;</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_run_image(cdb, dev, ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_cdb_fini;</div><div class='add'>+</div><div class='add'>+	/* The CDB command "Run Firmware Image" resets the firmware, so the new</div><div class='add'>+	 * one might have different settings.</div><div class='add'>+	 * Free the old CDB instance, and init a new one.</div><div class='add'>+	 */</div><div class='add'>+	ethtool_cmis_cdb_fini(cdb);</div><div class='add'>+</div><div class='add'>+	cdb = ethtool_cmis_cdb_init(dev, &amp;fw_update-&gt;params, ntf_params);</div><div class='add'>+	if (IS_ERR(cdb))</div><div class='add'>+		goto err_send_ntf;</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_commit_image(cdb, dev, ntf_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_cdb_fini;</div><div class='add'>+</div><div class='add'>+	err = cmis_fw_update_reset(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_cdb_fini;</div><div class='add'>+</div><div class='add'>+	ethnl_module_fw_flash_ntf_complete(dev, ntf_params);</div><div class='add'>+	ethtool_cmis_cdb_fini(cdb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_cdb_fini:</div><div class='add'>+	ethtool_cmis_cdb_fini(cdb);</div><div class='add'>+err_send_ntf:</div><div class='add'>+	ethnl_module_fw_flash_ntf_err(dev, ntf_params, NULL, NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/coalesce.c b/net/ethtool/coalesce.c<br/>new file mode 100644<br/>index 000000000000..3e18ca1ccc5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/coalesce.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/coalesce.c</a></div><div class='hunk'>@@ -0,0 +1,649 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct coalesce_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct coalesce_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_coalesce		coalesce;</div><div class='add'>+	struct kernel_ethtool_coalesce	kernel_coalesce;</div><div class='add'>+	u32				supported_params;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define COALESCE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct coalesce_reply_data, base)</div><div class='add'>+</div><div class='add'>+#define __SUPPORTED_OFFSET ETHTOOL_A_COALESCE_RX_USECS</div><div class='add'>+static u32 attr_to_mask(unsigned int attr_type)</div><div class='add'>+{</div><div class='add'>+	return BIT(attr_type - __SUPPORTED_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* build time check that indices in ethtool_ops::supported_coalesce_params</div><div class='add'>+ * match corresponding attribute types with an offset</div><div class='add'>+ */</div><div class='add'>+#define __CHECK_SUPPORTED_OFFSET(x) \</div><div class='add'>+	static_assert((ETHTOOL_ ## x) == \</div><div class='add'>+		      BIT((ETHTOOL_A_ ## x) - __SUPPORTED_OFFSET))</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_USECS);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_MAX_FRAMES);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_USECS_IRQ);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_MAX_FRAMES_IRQ);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_USECS);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_MAX_FRAMES);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_USECS_IRQ);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_MAX_FRAMES_IRQ);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_STATS_BLOCK_USECS);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_USE_ADAPTIVE_RX);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_USE_ADAPTIVE_TX);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_PKT_RATE_LOW);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_USECS_LOW);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_MAX_FRAMES_LOW);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_USECS_LOW);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_MAX_FRAMES_LOW);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_PKT_RATE_HIGH);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_USECS_HIGH);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RX_MAX_FRAMES_HIGH);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_USECS_HIGH);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_TX_MAX_FRAMES_HIGH);</div><div class='add'>+__CHECK_SUPPORTED_OFFSET(COALESCE_RATE_SAMPLE_INTERVAL);</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_coalesce_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_COALESCE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int coalesce_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				 struct ethnl_reply_data *reply_base,</div><div class='add'>+				 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct coalesce_reply_data *data = COALESCE_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_coalesce)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	data-&gt;supported_params = dev-&gt;ethtool_ops-&gt;supported_coalesce_params;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_coalesce(dev, &amp;data-&gt;coalesce,</div><div class='add'>+					     &amp;data-&gt;kernel_coalesce,</div><div class='add'>+					     info-&gt;extack);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int coalesce_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	int modersz = nla_total_size(0) + /* _PROFILE_IRQ_MODERATION, nest */</div><div class='add'>+		      nla_total_size(sizeof(u32)) + /* _IRQ_MODERATION_USEC */</div><div class='add'>+		      nla_total_size(sizeof(u32)) + /* _IRQ_MODERATION_PKTS */</div><div class='add'>+		      nla_total_size(sizeof(u32));  /* _IRQ_MODERATION_COMPS */</div><div class='add'>+</div><div class='add'>+	int total_modersz = nla_total_size(0) +  /* _{R,T}X_PROFILE, nest */</div><div class='add'>+			modersz * NET_DIM_PARAMS_NUM_PROFILES;</div><div class='add'>+</div><div class='add'>+	return nla_total_size(sizeof(u32)) +	/* _RX_USECS */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_MAX_FRAMES */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_USECS_IRQ */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_MAX_FRAMES_IRQ */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_USECS */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_MAX_FRAMES */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_USECS_IRQ */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_MAX_FRAMES_IRQ */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _STATS_BLOCK_USECS */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _USE_ADAPTIVE_RX */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _USE_ADAPTIVE_TX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _PKT_RATE_LOW */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_USECS_LOW */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_MAX_FRAMES_LOW */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_USECS_LOW */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_MAX_FRAMES_LOW */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _PKT_RATE_HIGH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_USECS_HIGH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RX_MAX_FRAMES_HIGH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_USECS_HIGH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_MAX_FRAMES_HIGH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RATE_SAMPLE_INTERVAL */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _USE_CQE_MODE_TX */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _USE_CQE_MODE_RX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_AGGR_MAX_BYTES */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_AGGR_MAX_FRAMES */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TX_AGGR_TIME_USECS */</div><div class='add'>+	       total_modersz * 2;		/* _{R,T}X_PROFILE */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coalesce_put_u32(struct sk_buff *skb, u16 attr_type, u32 val,</div><div class='add'>+			     u32 supported_params)</div><div class='add'>+{</div><div class='add'>+	if (!val &amp;&amp; !(supported_params &amp; attr_to_mask(attr_type)))</div><div class='add'>+		return false;</div><div class='add'>+	return nla_put_u32(skb, attr_type, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coalesce_put_bool(struct sk_buff *skb, u16 attr_type, u32 val,</div><div class='add'>+			      u32 supported_params)</div><div class='add'>+{</div><div class='add'>+	if (!val &amp;&amp; !(supported_params &amp; attr_to_mask(attr_type)))</div><div class='add'>+		return false;</div><div class='add'>+	return nla_put_u8(skb, attr_type, !!val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * coalesce_put_profile - fill reply with a nla nest with four child nla nests.</div><div class='add'>+ * @skb: socket buffer the message is stored in</div><div class='add'>+ * @attr_type: nest attr type ETHTOOL_A_COALESCE_*X_PROFILE</div><div class='add'>+ * @profile: data passed to userspace</div><div class='add'>+ * @coal_flags: modifiable parameters supported by the driver</div><div class='add'>+ *</div><div class='add'>+ * Put a dim profile nest attribute. Refer to ETHTOOL_A_PROFILE_IRQ_MODERATION.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int coalesce_put_profile(struct sk_buff *skb, u16 attr_type,</div><div class='add'>+				const struct dim_cq_moder *profile,</div><div class='add'>+				u8 coal_flags)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *profile_attr, *moder_attr;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (!profile || !coal_flags)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	profile_attr = nla_nest_start(skb, attr_type);</div><div class='add'>+	if (!profile_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NET_DIM_PARAMS_NUM_PROFILES; i++) {</div><div class='add'>+		moder_attr = nla_nest_start(skb,</div><div class='add'>+					    ETHTOOL_A_PROFILE_IRQ_MODERATION);</div><div class='add'>+		if (!moder_attr) {</div><div class='add'>+			ret = -EMSGSIZE;</div><div class='add'>+			goto cancel_profile;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (coal_flags &amp; DIM_COALESCE_USEC) {</div><div class='add'>+			ret = nla_put_u32(skb, ETHTOOL_A_IRQ_MODERATION_USEC,</div><div class='add'>+					  profile[i].usec);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto cancel_moder;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (coal_flags &amp; DIM_COALESCE_PKTS) {</div><div class='add'>+			ret = nla_put_u32(skb, ETHTOOL_A_IRQ_MODERATION_PKTS,</div><div class='add'>+					  profile[i].pkts);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto cancel_moder;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (coal_flags &amp; DIM_COALESCE_COMPS) {</div><div class='add'>+			ret = nla_put_u32(skb, ETHTOOL_A_IRQ_MODERATION_COMPS,</div><div class='add'>+					  profile[i].comps);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto cancel_moder;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, moder_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, profile_attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cancel_moder:</div><div class='add'>+	nla_nest_cancel(skb, moder_attr);</div><div class='add'>+cancel_profile:</div><div class='add'>+	nla_nest_cancel(skb, profile_attr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int coalesce_fill_reply(struct sk_buff *skb,</div><div class='add'>+			       const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct coalesce_reply_data *data = COALESCE_REPDATA(reply_base);</div><div class='add'>+	const struct kernel_ethtool_coalesce *kcoal = &amp;data-&gt;kernel_coalesce;</div><div class='add'>+	const struct ethtool_coalesce *coal = &amp;data-&gt;coalesce;</div><div class='add'>+	u32 supported = data-&gt;supported_params;</div><div class='add'>+	struct dim_irq_moder *moder;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_USECS,</div><div class='add'>+			     coal-&gt;rx_coalesce_usecs, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_MAX_FRAMES,</div><div class='add'>+			     coal-&gt;rx_max_coalesced_frames, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_USECS_IRQ,</div><div class='add'>+			     coal-&gt;rx_coalesce_usecs_irq, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ,</div><div class='add'>+			     coal-&gt;rx_max_coalesced_frames_irq, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_USECS,</div><div class='add'>+			     coal-&gt;tx_coalesce_usecs, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_MAX_FRAMES,</div><div class='add'>+			     coal-&gt;tx_max_coalesced_frames, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_USECS_IRQ,</div><div class='add'>+			     coal-&gt;tx_coalesce_usecs_irq, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ,</div><div class='add'>+			     coal-&gt;tx_max_coalesced_frames_irq, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_STATS_BLOCK_USECS,</div><div class='add'>+			     coal-&gt;stats_block_coalesce_usecs, supported) ||</div><div class='add'>+	    coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX,</div><div class='add'>+			      coal-&gt;use_adaptive_rx_coalesce, supported) ||</div><div class='add'>+	    coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX,</div><div class='add'>+			      coal-&gt;use_adaptive_tx_coalesce, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_PKT_RATE_LOW,</div><div class='add'>+			     coal-&gt;pkt_rate_low, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_USECS_LOW,</div><div class='add'>+			     coal-&gt;rx_coalesce_usecs_low, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW,</div><div class='add'>+			     coal-&gt;rx_max_coalesced_frames_low, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_USECS_LOW,</div><div class='add'>+			     coal-&gt;tx_coalesce_usecs_low, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW,</div><div class='add'>+			     coal-&gt;tx_max_coalesced_frames_low, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_PKT_RATE_HIGH,</div><div class='add'>+			     coal-&gt;pkt_rate_high, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_USECS_HIGH,</div><div class='add'>+			     coal-&gt;rx_coalesce_usecs_high, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH,</div><div class='add'>+			     coal-&gt;rx_max_coalesced_frames_high, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_USECS_HIGH,</div><div class='add'>+			     coal-&gt;tx_coalesce_usecs_high, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH,</div><div class='add'>+			     coal-&gt;tx_max_coalesced_frames_high, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL,</div><div class='add'>+			     coal-&gt;rate_sample_interval, supported) ||</div><div class='add'>+	    coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_CQE_MODE_TX,</div><div class='add'>+			      kcoal-&gt;use_cqe_mode_tx, supported) ||</div><div class='add'>+	    coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_CQE_MODE_RX,</div><div class='add'>+			      kcoal-&gt;use_cqe_mode_rx, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES,</div><div class='add'>+			     kcoal-&gt;tx_aggr_max_bytes, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES,</div><div class='add'>+			     kcoal-&gt;tx_aggr_max_frames, supported) ||</div><div class='add'>+	    coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS,</div><div class='add'>+			     kcoal-&gt;tx_aggr_time_usecs, supported))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (!req_base-&gt;dev || !req_base-&gt;dev-&gt;irq_moder)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	moder = req_base-&gt;dev-&gt;irq_moder;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (moder-&gt;profile_flags &amp; DIM_PROFILE_RX) {</div><div class='add'>+		ret = coalesce_put_profile(skb, ETHTOOL_A_COALESCE_RX_PROFILE,</div><div class='add'>+					   rcu_dereference(moder-&gt;rx_profile),</div><div class='add'>+					   moder-&gt;coal_flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (moder-&gt;profile_flags &amp; DIM_PROFILE_TX)</div><div class='add'>+		ret = coalesce_put_profile(skb, ETHTOOL_A_COALESCE_TX_PROFILE,</div><div class='add'>+					   rcu_dereference(moder-&gt;tx_profile),</div><div class='add'>+					   moder-&gt;coal_flags);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* COALESCE_SET */</div><div class='add'>+</div><div class='add'>+static const struct nla_policy coalesce_irq_moderation_policy[] = {</div><div class='add'>+	[ETHTOOL_A_IRQ_MODERATION_USEC]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_IRQ_MODERATION_PKTS]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_IRQ_MODERATION_COMPS] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy coalesce_profile_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PROFILE_IRQ_MODERATION] =</div><div class='add'>+		NLA_POLICY_NESTED(coalesce_irq_moderation_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_coalesce_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_COALESCE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_USECS]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_USECS_IRQ]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_USECS]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_USECS_IRQ]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_STATS_BLOCK_USECS]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX]	= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX]	= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_PKT_RATE_LOW]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_USECS_LOW]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_USECS_LOW]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_PKT_RATE_HIGH]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_USECS_HIGH]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_USECS_HIGH]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_COALESCE_USE_CQE_MODE_RX]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_COALESCE_RX_PROFILE] =</div><div class='add'>+		NLA_POLICY_NESTED(coalesce_profile_policy),</div><div class='add'>+	[ETHTOOL_A_COALESCE_TX_PROFILE] =</div><div class='add'>+		NLA_POLICY_NESTED(coalesce_profile_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_coalesce_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+	struct dim_irq_moder *irq_moder = req_info-&gt;dev-&gt;irq_moder;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	u32 supported_params;</div><div class='add'>+	u16 a;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_coalesce || !ops-&gt;set_coalesce)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* make sure that only supported parameters are present */</div><div class='add'>+	supported_params = ops-&gt;supported_coalesce_params;</div><div class='add'>+	if (irq_moder &amp;&amp; irq_moder-&gt;profile_flags &amp; DIM_PROFILE_RX)</div><div class='add'>+		supported_params |= ETHTOOL_COALESCE_RX_PROFILE;</div><div class='add'>+</div><div class='add'>+	if (irq_moder &amp;&amp; irq_moder-&gt;profile_flags &amp; DIM_PROFILE_TX)</div><div class='add'>+		supported_params |= ETHTOOL_COALESCE_TX_PROFILE;</div><div class='add'>+</div><div class='add'>+	for (a = ETHTOOL_A_COALESCE_RX_USECS; a &lt; __ETHTOOL_A_COALESCE_CNT; a++)</div><div class='add'>+		if (tb[a] &amp;&amp; !(supported_params &amp; attr_to_mask(a))) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[a],</div><div class='add'>+					    "cannot modify an unsupported parameter");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_irq_moder - update a specific field in the given profile</div><div class='add'>+ * @irq_moder: place that collects dim related information</div><div class='add'>+ * @irq_field: field in profile to modify</div><div class='add'>+ * @attr_type: attr type ETHTOOL_A_IRQ_MODERATION_*</div><div class='add'>+ * @tb: netlink attribute with new values or null</div><div class='add'>+ * @coal_bit: DIM_COALESCE_* bit from coal_flags</div><div class='add'>+ * @mod: pointer to bool for modification tracking</div><div class='add'>+ * @extack: netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int ethnl_update_irq_moder(struct dim_irq_moder *irq_moder,</div><div class='add'>+				  u16 *irq_field, u16 attr_type,</div><div class='add'>+				  struct nlattr **tb,</div><div class='add'>+				  u8 coal_bit, bool *mod,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!tb[attr_type])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (irq_moder-&gt;coal_flags &amp; coal_bit) {</div><div class='add'>+		val = nla_get_u32(tb[attr_type]);</div><div class='add'>+		if (*irq_field == val)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		*irq_field = val;</div><div class='add'>+		*mod = true;</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_BAD_ATTR(extack, tb[attr_type]);</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_profile - get a profile nest with child nests from userspace.</div><div class='add'>+ * @dev: netdevice to update the profile</div><div class='add'>+ * @dst: profile get from the driver and modified by ethnl_update_profile.</div><div class='add'>+ * @nests: nest attr ETHTOOL_A_COALESCE_*X_PROFILE to set profile.</div><div class='add'>+ * @mod: pointer to bool for modification tracking</div><div class='add'>+ * @extack: Netlink extended ack</div><div class='add'>+ *</div><div class='add'>+ * Layout of nests:</div><div class='add'>+ *   Nested ETHTOOL_A_COALESCE_*X_PROFILE attr</div><div class='add'>+ *     Nested ETHTOOL_A_PROFILE_IRQ_MODERATION attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_USEC attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_PKTS attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_COMPS attr</div><div class='add'>+ *     ...</div><div class='add'>+ *     Nested ETHTOOL_A_PROFILE_IRQ_MODERATION attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_USEC attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_PKTS attr</div><div class='add'>+ *       ETHTOOL_A_IRQ_MODERATION_COMPS attr</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int ethnl_update_profile(struct net_device *dev,</div><div class='add'>+				struct dim_cq_moder __rcu **dst,</div><div class='add'>+				const struct nlattr *nests,</div><div class='add'>+				bool *mod,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int len_irq_moder = ARRAY_SIZE(coalesce_irq_moderation_policy);</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(coalesce_irq_moderation_policy)];</div><div class='add'>+	struct dim_irq_moder *irq_moder = dev-&gt;irq_moder;</div><div class='add'>+	struct dim_cq_moder *new_profile, *old_profile;</div><div class='add'>+	int ret, rem, i = 0, len;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (!nests)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!*dst)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	old_profile = rtnl_dereference(*dst);</div><div class='add'>+	len = NET_DIM_PARAMS_NUM_PROFILES * sizeof(*old_profile);</div><div class='add'>+	new_profile = kmemdup(old_profile, len, GFP_KERNEL);</div><div class='add'>+	if (!new_profile)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested_type(nest, ETHTOOL_A_PROFILE_IRQ_MODERATION,</div><div class='add'>+				 nests, rem) {</div><div class='add'>+		ret = nla_parse_nested(tb, len_irq_moder - 1, nest,</div><div class='add'>+				       coalesce_irq_moderation_policy,</div><div class='add'>+				       extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_update_irq_moder(irq_moder, &amp;new_profile[i].usec,</div><div class='add'>+					     ETHTOOL_A_IRQ_MODERATION_USEC,</div><div class='add'>+					     tb, DIM_COALESCE_USEC,</div><div class='add'>+					     mod, extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_update_irq_moder(irq_moder, &amp;new_profile[i].pkts,</div><div class='add'>+					     ETHTOOL_A_IRQ_MODERATION_PKTS,</div><div class='add'>+					     tb, DIM_COALESCE_PKTS,</div><div class='add'>+					     mod, extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_update_irq_moder(irq_moder, &amp;new_profile[i].comps,</div><div class='add'>+					     ETHTOOL_A_IRQ_MODERATION_COMPS,</div><div class='add'>+					     tb, DIM_COALESCE_COMPS,</div><div class='add'>+					     mod, extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* After the profile is modified, dim itself is a dynamic</div><div class='add'>+	 * mechanism and will quickly fit to the appropriate</div><div class='add'>+	 * coalescing parameters according to the new profile.</div><div class='add'>+	 */</div><div class='add'>+	rcu_assign_pointer(*dst, new_profile);</div><div class='add'>+	kfree_rcu(old_profile, rcu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	kfree(new_profile);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__ethnl_set_coalesce(struct ethnl_req_info *req_info, struct genl_info *info,</div><div class='add'>+		     bool *dual_change)</div><div class='add'>+{</div><div class='add'>+	struct kernel_ethtool_coalesce kernel_coalesce = {};</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct ethtool_coalesce coalesce = {};</div><div class='add'>+	bool mod_mode = false, mod = false;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_coalesce(dev, &amp;coalesce, &amp;kernel_coalesce,</div><div class='add'>+					     info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Update values */</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_coalesce_usecs,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_USECS], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_max_coalesced_frames,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_MAX_FRAMES], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_coalesce_usecs_irq,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_USECS_IRQ], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_max_coalesced_frames_irq,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_coalesce_usecs,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_USECS], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_max_coalesced_frames,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_coalesce_usecs_irq,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_USECS_IRQ], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_max_coalesced_frames_irq,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.stats_block_coalesce_usecs,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_STATS_BLOCK_USECS], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.pkt_rate_low,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_PKT_RATE_LOW], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_coalesce_usecs_low,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_USECS_LOW], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_max_coalesced_frames_low,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_coalesce_usecs_low,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_USECS_LOW], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_max_coalesced_frames_low,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.pkt_rate_high,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_PKT_RATE_HIGH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_coalesce_usecs_high,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_USECS_HIGH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rx_max_coalesced_frames_high,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_coalesce_usecs_high,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_USECS_HIGH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.tx_max_coalesced_frames_high,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;coalesce.rate_sample_interval,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_coalesce.tx_aggr_max_bytes,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_coalesce.tx_aggr_max_frames,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_coalesce.tx_aggr_time_usecs,</div><div class='add'>+			 tb[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS], &amp;mod);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq_moder &amp;&amp; dev-&gt;irq_moder-&gt;profile_flags &amp; DIM_PROFILE_RX) {</div><div class='add'>+		ret = ethnl_update_profile(dev, &amp;dev-&gt;irq_moder-&gt;rx_profile,</div><div class='add'>+					   tb[ETHTOOL_A_COALESCE_RX_PROFILE],</div><div class='add'>+					   &amp;mod, info-&gt;extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq_moder &amp;&amp; dev-&gt;irq_moder-&gt;profile_flags &amp; DIM_PROFILE_TX) {</div><div class='add'>+		ret = ethnl_update_profile(dev, &amp;dev-&gt;irq_moder-&gt;tx_profile,</div><div class='add'>+					   tb[ETHTOOL_A_COALESCE_TX_PROFILE],</div><div class='add'>+					   &amp;mod, info-&gt;extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update operation modes */</div><div class='add'>+	ethnl_update_bool32(&amp;coalesce.use_adaptive_rx_coalesce,</div><div class='add'>+			    tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX], &amp;mod_mode);</div><div class='add'>+	ethnl_update_bool32(&amp;coalesce.use_adaptive_tx_coalesce,</div><div class='add'>+			    tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX], &amp;mod_mode);</div><div class='add'>+	ethnl_update_u8(&amp;kernel_coalesce.use_cqe_mode_tx,</div><div class='add'>+			tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX], &amp;mod_mode);</div><div class='add'>+	ethnl_update_u8(&amp;kernel_coalesce.use_cqe_mode_rx,</div><div class='add'>+			tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_RX], &amp;mod_mode);</div><div class='add'>+</div><div class='add'>+	*dual_change = mod &amp;&amp; mod_mode;</div><div class='add'>+	if (!mod &amp;&amp; !mod_mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_coalesce(dev, &amp;coalesce, &amp;kernel_coalesce,</div><div class='add'>+					     info-&gt;extack);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_coalesce(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	bool dual_change;</div><div class='add'>+	int err, ret;</div><div class='add'>+</div><div class='add'>+	/* SET_COALESCE may change operation mode and parameters in one call.</div><div class='add'>+	 * Changing operation mode may cause the driver to reset the parameter</div><div class='add'>+	 * values, and therefore ignore user input (driver does not know which</div><div class='add'>+	 * parameters come from user and which are echoed back from -&gt;get).</div><div class='add'>+	 * To not complicate the drivers if user tries to change both the mode</div><div class='add'>+	 * and parameters at once - call the driver twice.</div><div class='add'>+	 */</div><div class='add'>+	err = __ethnl_set_coalesce(req_info, info, &amp;dual_change);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	ret = err;</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; dual_change) {</div><div class='add'>+		err = __ethnl_set_coalesce(req_info, info, &amp;dual_change);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_coalesce_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_COALESCE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_COALESCE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_COALESCE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct coalesce_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct coalesce_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= coalesce_prepare_data,</div><div class='add'>+	.reply_size		= coalesce_reply_size,</div><div class='add'>+	.fill_reply		= coalesce_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_coalesce_validate,</div><div class='add'>+	.set			= ethnl_set_coalesce,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_COALESCE_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/common.c b/net/ethtool/common.c<br/>new file mode 100644<br/>index 000000000000..369c05cf8163<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/common.c</a></div><div class='hunk'>@@ -0,0 +1,1169 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/phy_link_topology.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "../core/dev.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[NETIF_F_SG_BIT] =               "tx-scatter-gather",</div><div class='add'>+	[NETIF_F_IP_CSUM_BIT] =          "tx-checksum-ipv4",</div><div class='add'>+	[NETIF_F_HW_CSUM_BIT] =          "tx-checksum-ip-generic",</div><div class='add'>+	[NETIF_F_IPV6_CSUM_BIT] =        "tx-checksum-ipv6",</div><div class='add'>+	[NETIF_F_HIGHDMA_BIT] =          "highdma",</div><div class='add'>+	[NETIF_F_FRAGLIST_BIT] =         "tx-scatter-gather-fraglist",</div><div class='add'>+	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-hw-insert",</div><div class='add'>+</div><div class='add'>+	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-hw-parse",</div><div class='add'>+	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter",</div><div class='add'>+	[NETIF_F_HW_VLAN_STAG_TX_BIT] =  "tx-vlan-stag-hw-insert",</div><div class='add'>+	[NETIF_F_HW_VLAN_STAG_RX_BIT] =  "rx-vlan-stag-hw-parse",</div><div class='add'>+	[NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",</div><div class='add'>+	[NETIF_F_VLAN_CHALLENGED_BIT] =  "vlan-challenged",</div><div class='add'>+	[NETIF_F_GSO_BIT] =              "tx-generic-segmentation",</div><div class='add'>+	[NETIF_F_GRO_BIT] =              "rx-gro",</div><div class='add'>+	[NETIF_F_GRO_HW_BIT] =           "rx-gro-hw",</div><div class='add'>+	[NETIF_F_LRO_BIT] =              "rx-lro",</div><div class='add'>+</div><div class='add'>+	[NETIF_F_TSO_BIT] =              "tx-tcp-segmentation",</div><div class='add'>+	[NETIF_F_GSO_ROBUST_BIT] =       "tx-gso-robust",</div><div class='add'>+	[NETIF_F_TSO_ECN_BIT] =          "tx-tcp-ecn-segmentation",</div><div class='add'>+	[NETIF_F_GSO_ACCECN_BIT] =	 "tx-tcp-accecn-segmentation",</div><div class='add'>+	[NETIF_F_TSO_MANGLEID_BIT] =	 "tx-tcp-mangleid-segmentation",</div><div class='add'>+	[NETIF_F_TSO6_BIT] =             "tx-tcp6-segmentation",</div><div class='add'>+	[NETIF_F_FSO_BIT] =              "tx-fcoe-segmentation",</div><div class='add'>+	[NETIF_F_GSO_GRE_BIT] =		 "tx-gre-segmentation",</div><div class='add'>+	[NETIF_F_GSO_GRE_CSUM_BIT] =	 "tx-gre-csum-segmentation",</div><div class='add'>+	[NETIF_F_GSO_IPXIP4_BIT] =	 "tx-ipxip4-segmentation",</div><div class='add'>+	[NETIF_F_GSO_IPXIP6_BIT] =	 "tx-ipxip6-segmentation",</div><div class='add'>+	[NETIF_F_GSO_UDP_TUNNEL_BIT] =	 "tx-udp_tnl-segmentation",</div><div class='add'>+	[NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT] = "tx-udp_tnl-csum-segmentation",</div><div class='add'>+	[NETIF_F_GSO_PARTIAL_BIT] =	 "tx-gso-partial",</div><div class='add'>+	[NETIF_F_GSO_TUNNEL_REMCSUM_BIT] = "tx-tunnel-remcsum-segmentation",</div><div class='add'>+	[NETIF_F_GSO_SCTP_BIT] =	 "tx-sctp-segmentation",</div><div class='add'>+	[NETIF_F_GSO_ESP_BIT] =		 "tx-esp-segmentation",</div><div class='add'>+	[NETIF_F_GSO_UDP_L4_BIT] =	 "tx-udp-segmentation",</div><div class='add'>+	[NETIF_F_GSO_FRAGLIST_BIT] =	 "tx-gso-list",</div><div class='add'>+</div><div class='add'>+	[NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",</div><div class='add'>+	[NETIF_F_SCTP_CRC_BIT] =        "tx-checksum-sctp",</div><div class='add'>+	[NETIF_F_NTUPLE_BIT] =           "rx-ntuple-filter",</div><div class='add'>+	[NETIF_F_RXHASH_BIT] =           "rx-hashing",</div><div class='add'>+	[NETIF_F_RXCSUM_BIT] =           "rx-checksum",</div><div class='add'>+	[NETIF_F_NOCACHE_COPY_BIT] =     "tx-nocache-copy",</div><div class='add'>+	[NETIF_F_LOOPBACK_BIT] =         "loopback",</div><div class='add'>+	[NETIF_F_RXFCS_BIT] =            "rx-fcs",</div><div class='add'>+	[NETIF_F_RXALL_BIT] =            "rx-all",</div><div class='add'>+	[NETIF_F_HW_L2FW_DOFFLOAD_BIT] = "l2-fwd-offload",</div><div class='add'>+	[NETIF_F_HW_TC_BIT] =		 "hw-tc-offload",</div><div class='add'>+	[NETIF_F_HW_ESP_BIT] =		 "esp-hw-offload",</div><div class='add'>+	[NETIF_F_HW_ESP_TX_CSUM_BIT] =	 "esp-tx-csum-hw-offload",</div><div class='add'>+	[NETIF_F_RX_UDP_TUNNEL_PORT_BIT] =	 "rx-udp_tunnel-port-offload",</div><div class='add'>+	[NETIF_F_HW_TLS_RECORD_BIT] =	"tls-hw-record",</div><div class='add'>+	[NETIF_F_HW_TLS_TX_BIT] =	 "tls-hw-tx-offload",</div><div class='add'>+	[NETIF_F_HW_TLS_RX_BIT] =	 "tls-hw-rx-offload",</div><div class='add'>+	[NETIF_F_GRO_FRAGLIST_BIT] =	 "rx-gro-list",</div><div class='add'>+	[NETIF_F_HW_MACSEC_BIT] =	 "macsec-hw-offload",</div><div class='add'>+	[NETIF_F_GRO_UDP_FWD_BIT] =	 "rx-udp-gro-forwarding",</div><div class='add'>+	[NETIF_F_HW_HSR_TAG_INS_BIT] =	 "hsr-tag-ins-offload",</div><div class='add'>+	[NETIF_F_HW_HSR_TAG_RM_BIT] =	 "hsr-tag-rm-offload",</div><div class='add'>+	[NETIF_F_HW_HSR_FWD_BIT] =	 "hsr-fwd-offload",</div><div class='add'>+	[NETIF_F_HW_HSR_DUP_BIT] =	 "hsr-dup-offload",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char</div><div class='add'>+rss_hash_func_strings[ETH_RSS_HASH_FUNCS_COUNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETH_RSS_HASH_TOP_BIT] =	"toeplitz",</div><div class='add'>+	[ETH_RSS_HASH_XOR_BIT] =	"xor",</div><div class='add'>+	[ETH_RSS_HASH_CRC32_BIT] =	"crc32",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char</div><div class='add'>+tunable_strings[__ETHTOOL_TUNABLE_COUNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_ID_UNSPEC]     = "Unspec",</div><div class='add'>+	[ETHTOOL_RX_COPYBREAK]	= "rx-copybreak",</div><div class='add'>+	[ETHTOOL_TX_COPYBREAK]	= "tx-copybreak",</div><div class='add'>+	[ETHTOOL_PFC_PREVENTION_TOUT] = "pfc-prevention-tout",</div><div class='add'>+	[ETHTOOL_TX_COPYBREAK_BUF_SIZE] = "tx-copybreak-buf-size",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char</div><div class='add'>+phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_ID_UNSPEC]     = "Unspec",</div><div class='add'>+	[ETHTOOL_PHY_DOWNSHIFT]	= "phy-downshift",</div><div class='add'>+	[ETHTOOL_PHY_FAST_LINK_DOWN] = "phy-fast-link-down",</div><div class='add'>+	[ETHTOOL_PHY_EDPD]	= "phy-energy-detect-power-down",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define __LINK_MODE_NAME(speed, type, duplex) \</div><div class='add'>+	#speed "base" #type "/" #duplex</div><div class='add'>+#define __DEFINE_LINK_MODE_NAME(speed, type, duplex) \</div><div class='add'>+	[ETHTOOL_LINK_MODE(speed, type, duplex)] = \</div><div class='add'>+	__LINK_MODE_NAME(speed, type, duplex)</div><div class='add'>+#define __DEFINE_SPECIAL_MODE_NAME(_mode, _name) \</div><div class='add'>+	[ETHTOOL_LINK_MODE_ ## _mode ## _BIT] = _name</div><div class='add'>+</div><div class='add'>+const char link_mode_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1000, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(Autoneg, "Autoneg"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(TP, "TP"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(AUI, "AUI"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(MII, "MII"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(FIBRE, "FIBRE"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(BNC, "BNC"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(Pause, "Pause"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(Asym_Pause, "Asym_Pause"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(2500, X, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(Backplane, "Backplane"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1000, KX, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, KX4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, KR, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(10000baseR_FEC, "10000baseR_FEC"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(20000, MLD2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(20000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(40000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(40000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(40000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(40000, LR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(56000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(56000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(56000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(56000, LR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(25000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(25000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(25000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, LR4_ER4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1000, X, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, LR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, LRM, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10000, ER, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(2500, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(5000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(FEC_NONE, "None"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(FEC_RS, "RS"),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(FEC_BASER, "BASER"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, LR_ER_FR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(50000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, LR2_ER2_FR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, LR4_ER4_FR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100, T1, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1000, T1, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, SR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, LR8_ER8_FR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, CR8, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_NAME(FEC_LLRS, "LLRS"),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, LR_ER_FR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, LR2_ER2_FR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, LR4_ER4_FR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100, FX, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(100, FX, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T1L, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, CR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, DR8_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, SR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, VR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T1S, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T1S, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T1S_P2MP, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(10, T1BRR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, DR_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(200000, VR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, DR2_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(400000, VR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, DR4_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(800000, VR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1600000, CR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1600000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1600000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_NAME(1600000, DR8_2, Full),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+</div><div class='add'>+#define __LINK_MODE_LANES_CR		1</div><div class='add'>+#define __LINK_MODE_LANES_CR2		2</div><div class='add'>+#define __LINK_MODE_LANES_CR4		4</div><div class='add'>+#define __LINK_MODE_LANES_CR8		8</div><div class='add'>+#define __LINK_MODE_LANES_DR		1</div><div class='add'>+#define __LINK_MODE_LANES_DR_2		1</div><div class='add'>+#define __LINK_MODE_LANES_DR2		2</div><div class='add'>+#define __LINK_MODE_LANES_DR2_2		2</div><div class='add'>+#define __LINK_MODE_LANES_DR4		4</div><div class='add'>+#define __LINK_MODE_LANES_DR4_2		4</div><div class='add'>+#define __LINK_MODE_LANES_DR8		8</div><div class='add'>+#define __LINK_MODE_LANES_KR		1</div><div class='add'>+#define __LINK_MODE_LANES_KR2		2</div><div class='add'>+#define __LINK_MODE_LANES_KR4		4</div><div class='add'>+#define __LINK_MODE_LANES_KR8		8</div><div class='add'>+#define __LINK_MODE_LANES_SR		1</div><div class='add'>+#define __LINK_MODE_LANES_SR2		2</div><div class='add'>+#define __LINK_MODE_LANES_SR4		4</div><div class='add'>+#define __LINK_MODE_LANES_SR8		8</div><div class='add'>+#define __LINK_MODE_LANES_ER		1</div><div class='add'>+#define __LINK_MODE_LANES_KX		1</div><div class='add'>+#define __LINK_MODE_LANES_KX4		4</div><div class='add'>+#define __LINK_MODE_LANES_LR		1</div><div class='add'>+#define __LINK_MODE_LANES_LR4		4</div><div class='add'>+#define __LINK_MODE_LANES_LR4_ER4	4</div><div class='add'>+#define __LINK_MODE_LANES_LR_ER_FR	1</div><div class='add'>+#define __LINK_MODE_LANES_LR2_ER2_FR2	2</div><div class='add'>+#define __LINK_MODE_LANES_LR4_ER4_FR4	4</div><div class='add'>+#define __LINK_MODE_LANES_LR8_ER8_FR8	8</div><div class='add'>+#define __LINK_MODE_LANES_LRM		1</div><div class='add'>+#define __LINK_MODE_LANES_MLD2		2</div><div class='add'>+#define __LINK_MODE_LANES_T		1</div><div class='add'>+#define __LINK_MODE_LANES_T1		1</div><div class='add'>+#define __LINK_MODE_LANES_X		1</div><div class='add'>+#define __LINK_MODE_LANES_FX		1</div><div class='add'>+#define __LINK_MODE_LANES_T1L		1</div><div class='add'>+#define __LINK_MODE_LANES_T1S		1</div><div class='add'>+#define __LINK_MODE_LANES_T1S_P2MP	1</div><div class='add'>+#define __LINK_MODE_LANES_VR		1</div><div class='add'>+#define __LINK_MODE_LANES_VR2		2</div><div class='add'>+#define __LINK_MODE_LANES_VR4		4</div><div class='add'>+#define __LINK_MODE_LANES_VR8		8</div><div class='add'>+#define __LINK_MODE_LANES_DR8_2		8</div><div class='add'>+#define __LINK_MODE_LANES_T1BRR		1</div><div class='add'>+</div><div class='add'>+#define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex)	\</div><div class='add'>+	[ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = {		\</div><div class='add'>+		.speed  = SPEED_ ## _speed, \</div><div class='add'>+		.lanes  = __LINK_MODE_LANES_ ## _type, \</div><div class='add'>+		.duplex	= __DUPLEX_ ## _duplex \</div><div class='add'>+	}</div><div class='add'>+#define __DUPLEX_Half DUPLEX_HALF</div><div class='add'>+#define __DUPLEX_Full DUPLEX_FULL</div><div class='add'>+#define __DEFINE_SPECIAL_MODE_PARAMS(_mode) \</div><div class='add'>+	[ETHTOOL_LINK_MODE_ ## _mode ## _BIT] = { \</div><div class='add'>+		.speed	= SPEED_UNKNOWN, \</div><div class='add'>+		.lanes	= 0, \</div><div class='add'>+		.duplex	= DUPLEX_UNKNOWN, \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+const struct link_mode_info link_mode_params[] = {</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1000, T, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(Autoneg),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(TP),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(AUI),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(MII),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(FIBRE),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(BNC),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(Pause),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(Asym_Pause),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(2500, X, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(Backplane),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1000, KX, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, KX4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, KR, Full),</div><div class='add'>+	[ETHTOOL_LINK_MODE_10000baseR_FEC_BIT] = {</div><div class='add'>+		.speed	= SPEED_10000,</div><div class='add'>+		.lanes	= 1,</div><div class='add'>+		.duplex = DUPLEX_FULL,</div><div class='add'>+	},</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(20000, MLD2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(20000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(40000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(40000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(40000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(40000, LR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(56000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(56000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(56000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(56000, LR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(25000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(25000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(25000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, LR4_ER4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1000, X, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, LR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, LRM, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10000, ER, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(2500, T, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(5000, T, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(FEC_NONE),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(FEC_RS),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(FEC_BASER),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, LR_ER_FR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(50000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, LR2_ER2_FR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, LR4_ER4_FR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100, T1, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1000, T1, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, SR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, LR8_ER8_FR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, CR8, Full),</div><div class='add'>+	__DEFINE_SPECIAL_MODE_PARAMS(FEC_LLRS),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, LR_ER_FR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, LR2_ER2_FR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, LR4_ER4_FR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100, FX, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(100, FX, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T1L, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, CR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, DR8_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, SR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, VR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T1S, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T1S, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(10, T1BRR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, CR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, KR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, DR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, DR_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, SR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(200000, VR, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, CR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, KR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, DR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, DR2_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, SR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(400000, VR2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, CR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, KR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, DR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, DR4_2, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, SR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(800000, VR4, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1600000, CR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1600000, KR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1600000, DR8, Full),</div><div class='add'>+	__DEFINE_LINK_MODE_PARAMS(1600000, DR8_2, Full),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+EXPORT_SYMBOL_GPL(link_mode_params);</div><div class='add'>+</div><div class='add'>+const char netif_msg_class_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[NETIF_MSG_DRV_BIT]		= "drv",</div><div class='add'>+	[NETIF_MSG_PROBE_BIT]		= "probe",</div><div class='add'>+	[NETIF_MSG_LINK_BIT]		= "link",</div><div class='add'>+	[NETIF_MSG_TIMER_BIT]		= "timer",</div><div class='add'>+	[NETIF_MSG_IFDOWN_BIT]		= "ifdown",</div><div class='add'>+	[NETIF_MSG_IFUP_BIT]		= "ifup",</div><div class='add'>+	[NETIF_MSG_RX_ERR_BIT]		= "rx_err",</div><div class='add'>+	[NETIF_MSG_TX_ERR_BIT]		= "tx_err",</div><div class='add'>+	[NETIF_MSG_TX_QUEUED_BIT]	= "tx_queued",</div><div class='add'>+	[NETIF_MSG_INTR_BIT]		= "intr",</div><div class='add'>+	[NETIF_MSG_TX_DONE_BIT]		= "tx_done",</div><div class='add'>+	[NETIF_MSG_RX_STATUS_BIT]	= "rx_status",</div><div class='add'>+	[NETIF_MSG_PKTDATA_BIT]		= "pktdata",</div><div class='add'>+	[NETIF_MSG_HW_BIT]		= "hw",</div><div class='add'>+	[NETIF_MSG_WOL_BIT]		= "wol",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(netif_msg_class_names) == NETIF_MSG_CLASS_COUNT);</div><div class='add'>+</div><div class='add'>+const char wol_mode_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[const_ilog2(WAKE_PHY)]		= "phy",</div><div class='add'>+	[const_ilog2(WAKE_UCAST)]	= "ucast",</div><div class='add'>+	[const_ilog2(WAKE_MCAST)]	= "mcast",</div><div class='add'>+	[const_ilog2(WAKE_BCAST)]	= "bcast",</div><div class='add'>+	[const_ilog2(WAKE_ARP)]		= "arp",</div><div class='add'>+	[const_ilog2(WAKE_MAGIC)]	= "magic",</div><div class='add'>+	[const_ilog2(WAKE_MAGICSECURE)]	= "magicsecure",</div><div class='add'>+	[const_ilog2(WAKE_FILTER)]	= "filter",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(wol_mode_names) == WOL_MODE_COUNT);</div><div class='add'>+</div><div class='add'>+const char sof_timestamping_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_TX_HARDWARE)]  = "hardware-transmit",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_TX_SOFTWARE)]  = "software-transmit",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_RX_HARDWARE)]  = "hardware-receive",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_RX_SOFTWARE)]  = "software-receive",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_SOFTWARE)]     = "software-system-clock",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_SYS_HARDWARE)] = "hardware-legacy-clock",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_RAW_HARDWARE)] = "hardware-raw-clock",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_ID)]       = "option-id",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_TX_SCHED)]     = "sched-transmit",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_TX_ACK)]       = "ack-transmit",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_CMSG)]     = "option-cmsg",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_TSONLY)]   = "option-tsonly",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_STATS)]    = "option-stats",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_PKTINFO)]  = "option-pktinfo",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_TX_SWHW)]  = "option-tx-swhw",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_BIND_PHC)]     = "bind-phc",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_ID_TCP)]   = "option-id-tcp",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_OPT_RX_FILTER)] = "option-rx-filter",</div><div class='add'>+	[const_ilog2(SOF_TIMESTAMPING_TX_COMPLETION)] = "tx-completion",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(sof_timestamping_names) == __SOF_TIMESTAMPING_CNT);</div><div class='add'>+</div><div class='add'>+const char ts_tx_type_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[HWTSTAMP_TX_OFF]		= "off",</div><div class='add'>+	[HWTSTAMP_TX_ON]		= "on",</div><div class='add'>+	[HWTSTAMP_TX_ONESTEP_SYNC]	= "onestep-sync",</div><div class='add'>+	[HWTSTAMP_TX_ONESTEP_P2P]	= "onestep-p2p",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(ts_tx_type_names) == __HWTSTAMP_TX_CNT);</div><div class='add'>+</div><div class='add'>+const char ts_rx_filter_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[HWTSTAMP_FILTER_NONE]			= "none",</div><div class='add'>+	[HWTSTAMP_FILTER_ALL]			= "all",</div><div class='add'>+	[HWTSTAMP_FILTER_SOME]			= "some",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V1_L4_EVENT]	= "ptpv1-l4-event",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V1_L4_SYNC]	= "ptpv1-l4-sync",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ]	= "ptpv1-l4-delay-req",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L4_EVENT]	= "ptpv2-l4-event",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L4_SYNC]	= "ptpv2-l4-sync",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ]	= "ptpv2-l4-delay-req",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L2_EVENT]	= "ptpv2-l2-event",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L2_SYNC]	= "ptpv2-l2-sync",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ]	= "ptpv2-l2-delay-req",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_EVENT]		= "ptpv2-event",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_SYNC]		= "ptpv2-sync",</div><div class='add'>+	[HWTSTAMP_FILTER_PTP_V2_DELAY_REQ]	= "ptpv2-delay-req",</div><div class='add'>+	[HWTSTAMP_FILTER_NTP_ALL]		= "ntp-all",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(ts_rx_filter_names) == __HWTSTAMP_FILTER_CNT);</div><div class='add'>+</div><div class='add'>+const char ts_flags_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[const_ilog2(HWTSTAMP_FLAG_BONDED_PHC_INDEX)] = "bonded-phc-index",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(ts_flags_names) == __HWTSTAMP_FLAG_CNT);</div><div class='add'>+</div><div class='add'>+const char udp_tunnel_type_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_UDP_TUNNEL_TYPE_VXLAN]		= "vxlan",</div><div class='add'>+	[ETHTOOL_UDP_TUNNEL_TYPE_GENEVE]	= "geneve",</div><div class='add'>+	[ETHTOOL_UDP_TUNNEL_TYPE_VXLAN_GPE]	= "vxlan-gpe",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(udp_tunnel_type_names) ==</div><div class='add'>+	      __ETHTOOL_UDP_TUNNEL_TYPE_CNT);</div><div class='add'>+</div><div class='add'>+/* return false if legacy contained non-0 deprecated fields</div><div class='add'>+ * maxtxpkt/maxrxpkt. rest of ksettings always updated</div><div class='add'>+ */</div><div class='add'>+bool</div><div class='add'>+convert_legacy_settings_to_link_ksettings(</div><div class='add'>+	struct ethtool_link_ksettings *link_ksettings,</div><div class='add'>+	const struct ethtool_cmd *legacy_settings)</div><div class='add'>+{</div><div class='add'>+	bool retval = true;</div><div class='add'>+</div><div class='add'>+	memset(link_ksettings, 0, sizeof(*link_ksettings));</div><div class='add'>+</div><div class='add'>+	/* This is used to tell users that driver is still using these</div><div class='add'>+	 * deprecated legacy fields, and they should not use</div><div class='add'>+	 * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS</div><div class='add'>+	 */</div><div class='add'>+	if (legacy_settings-&gt;maxtxpkt ||</div><div class='add'>+	    legacy_settings-&gt;maxrxpkt)</div><div class='add'>+		retval = false;</div><div class='add'>+</div><div class='add'>+	ethtool_convert_legacy_u32_to_link_mode(</div><div class='add'>+		link_ksettings-&gt;link_modes.supported,</div><div class='add'>+		legacy_settings-&gt;supported);</div><div class='add'>+	ethtool_convert_legacy_u32_to_link_mode(</div><div class='add'>+		link_ksettings-&gt;link_modes.advertising,</div><div class='add'>+		legacy_settings-&gt;advertising);</div><div class='add'>+	ethtool_convert_legacy_u32_to_link_mode(</div><div class='add'>+		link_ksettings-&gt;link_modes.lp_advertising,</div><div class='add'>+		legacy_settings-&gt;lp_advertising);</div><div class='add'>+	link_ksettings-&gt;base.speed</div><div class='add'>+		= ethtool_cmd_speed(legacy_settings);</div><div class='add'>+	link_ksettings-&gt;base.duplex</div><div class='add'>+		= legacy_settings-&gt;duplex;</div><div class='add'>+	link_ksettings-&gt;base.port</div><div class='add'>+		= legacy_settings-&gt;port;</div><div class='add'>+	link_ksettings-&gt;base.phy_address</div><div class='add'>+		= legacy_settings-&gt;phy_address;</div><div class='add'>+	link_ksettings-&gt;base.autoneg</div><div class='add'>+		= legacy_settings-&gt;autoneg;</div><div class='add'>+	link_ksettings-&gt;base.mdio_support</div><div class='add'>+		= legacy_settings-&gt;mdio_support;</div><div class='add'>+	link_ksettings-&gt;base.eth_tp_mdix</div><div class='add'>+		= legacy_settings-&gt;eth_tp_mdix;</div><div class='add'>+	link_ksettings-&gt;base.eth_tp_mdix_ctrl</div><div class='add'>+		= legacy_settings-&gt;eth_tp_mdix_ctrl;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __ethtool_get_link(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_link)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return netif_running(dev) &amp;&amp; dev-&gt;ethtool_ops-&gt;get_link(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_get_rx_ring_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc rx_rings = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;get_rx_ring_count)</div><div class='add'>+		return ops-&gt;get_rx_ring_count(dev);</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rx_rings.cmd = ETHTOOL_GRXRINGS;</div><div class='add'>+	ret = ops-&gt;get_rxnfc(dev, &amp;rx_rings, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return rx_rings.data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_get_rxnfc_rule_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc info = {</div><div class='add'>+		.cmd = ETHTOOL_GRXCLSRLCNT,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_rxnfc(dev, &amp;info, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return info.rule_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Max offset for one RSS context */</div><div class='add'>+static u32 ethtool_get_rss_ctx_max_channel(struct ethtool_rxfh_context *ctx)</div><div class='add'>+{</div><div class='add'>+	u32 max_ring = 0;</div><div class='add'>+	u32 i, *tbl;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!ctx))</div><div class='add'>+		return 0;</div><div class='add'>+	tbl = ethtool_rxfh_context_indir(ctx);</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;indir_size; i++)</div><div class='add'>+		max_ring = max(max_ring, tbl[i]);</div><div class='add'>+	return max_ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_get_max_rxnfc_channel(struct net_device *dev, u64 *max)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc *info;</div><div class='add'>+	int err, i, rule_cnt;</div><div class='add'>+	u64 max_ring = 0;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rule_cnt = ethtool_get_rxnfc_rule_count(dev);</div><div class='add'>+	if (rule_cnt &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	info = kvzalloc(struct_size(info, rule_locs, rule_cnt), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;cmd = ETHTOOL_GRXCLSRLALL;</div><div class='add'>+	info-&gt;rule_cnt = rule_cnt;</div><div class='add'>+	err = ops-&gt;get_rxnfc(dev, info, info-&gt;rule_locs);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_info;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rule_cnt; i++) {</div><div class='add'>+		struct ethtool_rxnfc rule_info = {</div><div class='add'>+			.cmd = ETHTOOL_GRXCLSRULE,</div><div class='add'>+			.fs.location = info-&gt;rule_locs[i],</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		err = ops-&gt;get_rxnfc(dev, &amp;rule_info, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_info;</div><div class='add'>+</div><div class='add'>+		if (rule_info.fs.ring_cookie != RX_CLS_FLOW_DISC &amp;&amp;</div><div class='add'>+		    rule_info.fs.ring_cookie != RX_CLS_FLOW_WAKE &amp;&amp;</div><div class='add'>+		    !ethtool_get_flow_spec_ring_vf(rule_info.fs.ring_cookie)) {</div><div class='add'>+			u64 ring = rule_info.fs.ring_cookie;</div><div class='add'>+</div><div class='add'>+			if (rule_info.flow_type &amp; FLOW_RSS) {</div><div class='add'>+				struct ethtool_rxfh_context *ctx;</div><div class='add'>+</div><div class='add'>+				ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx,</div><div class='add'>+					      rule_info.rss_context);</div><div class='add'>+				ring += ethtool_get_rss_ctx_max_channel(ctx);</div><div class='add'>+			}</div><div class='add'>+			max_ring = max_t(u64, max_ring, ring);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvfree(info);</div><div class='add'>+	*max = max_ring;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_info:</div><div class='add'>+	kvfree(info);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Max offset across all of a device's RSS contexts */</div><div class='add'>+static u32 ethtool_get_max_rss_ctx_channel(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	unsigned long context;</div><div class='add'>+	u32 max_ring = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	xa_for_each(&amp;dev-&gt;ethtool-&gt;rss_ctx, context, ctx)</div><div class='add'>+		max_ring = max(max_ring, ethtool_get_rss_ctx_max_channel(ctx));</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+</div><div class='add'>+	return max_ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ethtool_get_max_rxfh_channel(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+	u32 dev_size, current_max = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* While we do track whether RSS context has an indirection</div><div class='add'>+	 * table explicitly set by the user, no driver looks at that bit.</div><div class='add'>+	 * Assume drivers won't auto-regenerate the additional tables,</div><div class='add'>+	 * to be safe.</div><div class='add'>+	 */</div><div class='add'>+	current_max = ethtool_get_max_rss_ctx_channel(dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_is_rxfh_configured(dev))</div><div class='add'>+		return current_max;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size ||</div><div class='add'>+	    !dev-&gt;ethtool_ops-&gt;get_rxfh)</div><div class='add'>+		return current_max;</div><div class='add'>+	dev_size = dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size(dev);</div><div class='add'>+	if (dev_size == 0)</div><div class='add'>+		return current_max;</div><div class='add'>+</div><div class='add'>+	rxfh.indir = kcalloc(dev_size, sizeof(rxfh.indir[0]), GFP_USER);</div><div class='add'>+	if (!rxfh.indir)</div><div class='add'>+		return U32_MAX;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, &amp;rxfh);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (ret) {</div><div class='add'>+		current_max = U32_MAX;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (dev_size--)</div><div class='add'>+		current_max = max(current_max, rxfh.indir[dev_size]);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(rxfh.indir);</div><div class='add'>+	return current_max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_check_max_channel(struct net_device *dev,</div><div class='add'>+			      struct ethtool_channels channels,</div><div class='add'>+			      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	u64 max_rxnfc_in_use;</div><div class='add'>+	u32 max_rxfh_in_use;</div><div class='add'>+	int max_mp_in_use;</div><div class='add'>+</div><div class='add'>+	/* ensure the new Rx count fits within the configured Rx flow</div><div class='add'>+	 * indirection table/rxnfc settings</div><div class='add'>+	 */</div><div class='add'>+	if (ethtool_get_max_rxnfc_channel(dev, &amp;max_rxnfc_in_use))</div><div class='add'>+		max_rxnfc_in_use = 0;</div><div class='add'>+	max_rxfh_in_use = ethtool_get_max_rxfh_channel(dev);</div><div class='add'>+	if (channels.combined_count + channels.rx_count &lt;= max_rxfh_in_use) {</div><div class='add'>+		if (info)</div><div class='add'>+			GENL_SET_ERR_MSG_FMT(info, "requested channel counts are too low for existing indirection table (%d)", max_rxfh_in_use);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (channels.combined_count + channels.rx_count &lt;= max_rxnfc_in_use) {</div><div class='add'>+		if (info)</div><div class='add'>+			GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing ntuple filter settings");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_mp_in_use = dev_get_min_mp_channel_count(dev);</div><div class='add'>+	if (channels.combined_count + channels.rx_count &lt;= max_mp_in_use) {</div><div class='add'>+		if (info)</div><div class='add'>+			GENL_SET_ERR_MSG_FMT(info, "requested channel counts are too low for existing memory provider setting (%d)", max_mp_in_use);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_check_rss_ctx_busy(struct net_device *dev, u32 rss_context)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc *info;</div><div class='add'>+	int rc, i, rule_cnt;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_rxnfc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rule_cnt = ethtool_get_rxnfc_rule_count(dev);</div><div class='add'>+	if (!rule_cnt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rule_cnt &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	info = kvzalloc(struct_size(info, rule_locs, rule_cnt), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;cmd = ETHTOOL_GRXCLSRLALL;</div><div class='add'>+	info-&gt;rule_cnt = rule_cnt;</div><div class='add'>+	rc = ops-&gt;get_rxnfc(dev, info, info-&gt;rule_locs);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rule_cnt; i++) {</div><div class='add'>+		struct ethtool_rxnfc rule_info = {</div><div class='add'>+			.cmd = ETHTOOL_GRXCLSRULE,</div><div class='add'>+			.fs.location = info-&gt;rule_locs[i],</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rc = ops-&gt;get_rxnfc(dev, &amp;rule_info, NULL);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out_free;</div><div class='add'>+</div><div class='add'>+		if (rule_info.fs.flow_type &amp; FLOW_RSS &amp;&amp;</div><div class='add'>+		    rule_info.rss_context == rss_context) {</div><div class='add'>+			rc = -EBUSY;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kvfree(info);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethtool_rxfh_context *</div><div class='add'>+ethtool_rxfh_ctx_alloc(const struct ethtool_ops *ops,</div><div class='add'>+		       u32 indir_size, u32 key_size)</div><div class='add'>+{</div><div class='add'>+	size_t indir_bytes, flex_len, key_off, size;</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	u32 priv_bytes, indir_max;</div><div class='add'>+	u16 key_max;</div><div class='add'>+</div><div class='add'>+	key_max = max(key_size, ops-&gt;rxfh_key_space);</div><div class='add'>+	indir_max = max(indir_size, ops-&gt;rxfh_indir_space);</div><div class='add'>+</div><div class='add'>+	priv_bytes = ALIGN(ops-&gt;rxfh_priv_size, sizeof(u32));</div><div class='add'>+	indir_bytes = array_size(indir_max, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	key_off = size_add(priv_bytes, indir_bytes);</div><div class='add'>+	flex_len = size_add(key_off, key_max);</div><div class='add'>+	size = struct_size_t(struct ethtool_rxfh_context, data, flex_len);</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(size, GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;indir_size = indir_size;</div><div class='add'>+	ctx-&gt;key_size = key_size;</div><div class='add'>+	ctx-&gt;key_off = key_off;</div><div class='add'>+	ctx-&gt;priv_size = ops-&gt;rxfh_priv_size;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;hfunc = ETH_RSS_HASH_NO_CHANGE;</div><div class='add'>+	ctx-&gt;input_xfrm = RXH_XFRM_NO_CHANGE;</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if fields configured for flow hash are symmetric - if src is included</div><div class='add'>+ * so is dst and vice versa.</div><div class='add'>+ */</div><div class='add'>+int ethtool_rxfh_config_is_sym(u64 rxfh)</div><div class='add'>+{</div><div class='add'>+	bool sym;</div><div class='add'>+</div><div class='add'>+	sym = rxfh == (rxfh &amp; (RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+			       RXH_L4_B_0_1 | RXH_L4_B_2_3));</div><div class='add'>+	sym &amp;= !!(rxfh &amp; RXH_IP_SRC)   == !!(rxfh &amp; RXH_IP_DST);</div><div class='add'>+	sym &amp;= !!(rxfh &amp; RXH_L4_B_0_1) == !!(rxfh &amp; RXH_L4_B_2_3);</div><div class='add'>+</div><div class='add'>+	return sym;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_check_ops(const struct ethtool_ops *ops)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(ops-&gt;set_coalesce &amp;&amp; !ops-&gt;supported_coalesce_params))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (WARN_ON(ops-&gt;rxfh_max_num_contexts == 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (WARN_ON(ops-&gt;supported_input_xfrm &amp;&amp; !ops-&gt;get_rxfh_fields))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (WARN_ON(ops-&gt;supported_input_xfrm &amp;&amp;</div><div class='add'>+		    ops-&gt;rxfh_per_ctx_fields != ops-&gt;rxfh_per_ctx_key))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* NOTE: sufficiently insane drivers may swap ethtool_ops at runtime,</div><div class='add'>+	 * the fact that ops are checked at registration time does not</div><div class='add'>+	 * mean the ops attached to a netdev later on are sane.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_ringparam_get_cfg(struct net_device *dev,</div><div class='add'>+			       struct ethtool_ringparam *param,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kparam,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	memset(param, 0, sizeof(*param));</div><div class='add'>+	memset(kparam, 0, sizeof(*kparam));</div><div class='add'>+</div><div class='add'>+	param-&gt;cmd = ETHTOOL_GRINGPARAM;</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_ringparam(dev, param, kparam, extack);</div><div class='add'>+</div><div class='add'>+	/* Driver gives us current state, we want to return current config */</div><div class='add'>+	kparam-&gt;tcp_data_split = dev-&gt;cfg-&gt;hds_config;</div><div class='add'>+	kparam-&gt;hds_thresh = dev-&gt;cfg-&gt;hds_thresh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethtool_init_tsinfo(struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+	info-&gt;cmd = ETHTOOL_GET_TS_INFO;</div><div class='add'>+	info-&gt;phc_index = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_net_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+				   struct kernel_ethtool_ts_info *info,</div><div class='add'>+				   struct hwtstamp_provider_desc *hwprov_desc)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_ts_info)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Does ptp comes from netdev */</div><div class='add'>+	ethtool_init_tsinfo(info);</div><div class='add'>+	info-&gt;phc_qualifier = hwprov_desc-&gt;qualifier;</div><div class='add'>+	err = ops-&gt;get_ts_info(dev, info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;phc_index == hwprov_desc-&gt;index &amp;&amp;</div><div class='add'>+	    net_support_hwtstamp_qualifier(dev, hwprov_desc-&gt;qualifier))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct phy_device *</div><div class='add'>+ethtool_phy_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+			       struct kernel_ethtool_ts_info *info,</div><div class='add'>+			       struct hwtstamp_provider_desc *hwprov_desc)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Only precise qualifier is supported in phydev */</div><div class='add'>+	if (hwprov_desc-&gt;qualifier != HWTSTAMP_PROVIDER_QUALIFIER_PRECISE)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	/* Look in the phy topology */</div><div class='add'>+	if (dev-&gt;link_topo) {</div><div class='add'>+		struct phy_device_node *pdn;</div><div class='add'>+		unsigned long phy_index;</div><div class='add'>+</div><div class='add'>+		xa_for_each(&amp;dev-&gt;link_topo-&gt;phys, phy_index, pdn) {</div><div class='add'>+			if (!phy_has_tsinfo(pdn-&gt;phy))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ethtool_init_tsinfo(info);</div><div class='add'>+			err = phy_ts_info(pdn-&gt;phy, info);</div><div class='add'>+			if (err)</div><div class='add'>+				return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+			if (info-&gt;phc_index == hwprov_desc-&gt;index)</div><div class='add'>+				return pdn-&gt;phy;</div><div class='add'>+		}</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Look on the dev-&gt;phydev */</div><div class='add'>+	if (phy_has_tsinfo(dev-&gt;phydev)) {</div><div class='add'>+		ethtool_init_tsinfo(info);</div><div class='add'>+		err = phy_ts_info(dev-&gt;phydev, info);</div><div class='add'>+		if (err)</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+		if (info-&gt;phc_index == hwprov_desc-&gt;index)</div><div class='add'>+			return dev-&gt;phydev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+			       struct kernel_ethtool_ts_info *info,</div><div class='add'>+			       struct hwtstamp_provider_desc *hwprov_desc)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ethtool_net_get_ts_info_by_phc(dev, info, hwprov_desc);</div><div class='add'>+	if (err == -ENODEV || err == -EOPNOTSUPP) {</div><div class='add'>+		struct phy_device *phy;</div><div class='add'>+</div><div class='add'>+		phy = ethtool_phy_get_ts_info_by_phc(dev, info, hwprov_desc);</div><div class='add'>+		if (IS_ERR(phy))</div><div class='add'>+			return PTR_ERR(phy);</div><div class='add'>+</div><div class='add'>+		/* Report the phc source only if we have a real</div><div class='add'>+		 * phc source with an index.</div><div class='add'>+		 */</div><div class='add'>+		if (info-&gt;phc_index &gt;= 0) {</div><div class='add'>+			info-&gt;phc_source = HWTSTAMP_SOURCE_PHYLIB;</div><div class='add'>+			info-&gt;phc_phyindex = phy-&gt;phyindex;</div><div class='add'>+		}</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (!err &amp;&amp; info-&gt;phc_index &gt;= 0) {</div><div class='add'>+		info-&gt;phc_source = HWTSTAMP_SOURCE_NETDEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping |= SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+				 SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __ethtool_get_ts_info(struct net_device *dev,</div><div class='add'>+			  struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hwprov = rcu_dereference(dev-&gt;hwprov);</div><div class='add'>+	/* No provider specified, use default behavior */</div><div class='add'>+	if (!hwprov) {</div><div class='add'>+		const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+		struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+		ethtool_init_tsinfo(info);</div><div class='add'>+		if (phy_is_default_hwtstamp(phydev) &amp;&amp;</div><div class='add'>+		    phy_has_tsinfo(phydev)) {</div><div class='add'>+			err = phy_ts_info(phydev, info);</div><div class='add'>+			/* Report the phc source only if we have a real</div><div class='add'>+			 * phc source with an index.</div><div class='add'>+			 */</div><div class='add'>+			if (!err &amp;&amp; info-&gt;phc_index &gt;= 0) {</div><div class='add'>+				info-&gt;phc_source = HWTSTAMP_SOURCE_PHYLIB;</div><div class='add'>+				info-&gt;phc_phyindex = phydev-&gt;phyindex;</div><div class='add'>+			}</div><div class='add'>+		} else if (ops-&gt;get_ts_info) {</div><div class='add'>+			err = ops-&gt;get_ts_info(dev, info);</div><div class='add'>+			if (!err &amp;&amp; info-&gt;phc_index &gt;= 0)</div><div class='add'>+				info-&gt;phc_source = HWTSTAMP_SOURCE_NETDEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;so_timestamping |= SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+					 SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ethtool_get_ts_info_by_phc(dev, info, &amp;hwprov-&gt;desc);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool net_support_hwtstamp_qualifier(struct net_device *dev,</div><div class='add'>+				    enum hwtstamp_provider_qualifier qualifier)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Return true with precise qualifier and with NIC without</div><div class='add'>+	 * qualifier description to not break the old behavior.</div><div class='add'>+	 */</div><div class='add'>+	if (!ops-&gt;supported_hwtstamp_qualifiers &amp;&amp;</div><div class='add'>+	    qualifier == HWTSTAMP_PROVIDER_QUALIFIER_PRECISE)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;supported_hwtstamp_qualifiers &amp; BIT(qualifier))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_get_phc_vclocks(struct net_device *dev, int **vclock_index)</div><div class='add'>+{</div><div class='add'>+	struct kernel_ethtool_ts_info info = { };</div><div class='add'>+	int num = 0;</div><div class='add'>+</div><div class='add'>+	if (!__ethtool_get_ts_info(dev, &amp;info))</div><div class='add'>+		num = ptp_get_vclocks_index(info.phc_index, vclock_index);</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_get_phc_vclocks);</div><div class='add'>+</div><div class='add'>+int ethtool_get_ts_info_by_layer(struct net_device *dev, struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	return __ethtool_get_ts_info(dev, info);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_get_ts_info_by_layer);</div><div class='add'>+</div><div class='add'>+const struct ethtool_phy_ops *ethtool_phy_ops;</div><div class='add'>+</div><div class='add'>+void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	ethtool_phy_ops = ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_set_ethtool_phy_ops);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethtool_params_from_link_mode(struct ethtool_link_ksettings *link_ksettings,</div><div class='add'>+			      enum ethtool_link_mode_bit_indices link_mode)</div><div class='add'>+{</div><div class='add'>+	const struct link_mode_info *link_info;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(link_mode &gt;= __ETHTOOL_LINK_MODE_MASK_NBITS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_info = &amp;link_mode_params[link_mode];</div><div class='add'>+	link_ksettings-&gt;base.speed = link_info-&gt;speed;</div><div class='add'>+	link_ksettings-&gt;lanes = link_info-&gt;lanes;</div><div class='add'>+	link_ksettings-&gt;base.duplex = link_info-&gt;duplex;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_params_from_link_mode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_forced_speed_maps_init</div><div class='add'>+ * @maps: Pointer to an array of Ethtool forced speed map</div><div class='add'>+ * @size: Array size</div><div class='add'>+ *</div><div class='add'>+ * Initialize an array of Ethtool forced speed map to Ethtool link modes. This</div><div class='add'>+ * should be called during driver module init.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size)</div><div class='add'>+{</div><div class='add'>+	for (u32 i = 0; i &lt; size; i++) {</div><div class='add'>+		struct ethtool_forced_speed_map *map = &amp;maps[i];</div><div class='add'>+</div><div class='add'>+		linkmode_set_bit_array(map-&gt;cap_arr, map-&gt;arr_size, map-&gt;caps);</div><div class='add'>+		map-&gt;cap_arr = NULL;</div><div class='add'>+		map-&gt;arr_size = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_forced_speed_maps_init);</div><div class='add'>+</div><div class='add'>+void ethtool_rxfh_context_lost(struct net_device *dev, u32 context_id)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(!rtnl_is_locked() &amp;&amp;</div><div class='add'>+		  !lockdep_is_held_type(&amp;dev-&gt;ethtool-&gt;rss_lock, -1),</div><div class='add'>+		  "RSS context lock assertion failed\n");</div><div class='add'>+</div><div class='add'>+	netdev_err(dev, "device error, RSS context %d lost\n", context_id);</div><div class='add'>+	ctx = xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, context_id);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	ethtool_rss_notify(dev, ETHTOOL_MSG_RSS_DELETE_NTF, context_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_rxfh_context_lost);</div><div class='head'>diff --git a/net/ethtool/common.h b/net/ethtool/common.h<br/>new file mode 100644<br/>index 000000000000..1609cf4e53eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/common.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef _ETHTOOL_COMMON_H</div><div class='add'>+#define _ETHTOOL_COMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_DEV_FEATURE_WORDS	DIV_ROUND_UP(NETDEV_FEATURE_COUNT, 32)</div><div class='add'>+</div><div class='add'>+/* compose link mode index from speed, type and duplex */</div><div class='add'>+#define ETHTOOL_LINK_MODE(speed, type, duplex) \</div><div class='add'>+	ETHTOOL_LINK_MODE_ ## speed ## base ## type ## _ ## duplex ## _BIT</div><div class='add'>+</div><div class='add'>+#define __SOF_TIMESTAMPING_CNT (const_ilog2(SOF_TIMESTAMPING_LAST) + 1)</div><div class='add'>+#define __HWTSTAMP_FLAG_CNT (const_ilog2(HWTSTAMP_FLAG_LAST) + 1)</div><div class='add'>+</div><div class='add'>+struct genl_info;</div><div class='add'>+struct hwtstamp_provider_desc;</div><div class='add'>+</div><div class='add'>+extern const char</div><div class='add'>+netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char</div><div class='add'>+rss_hash_func_strings[ETH_RSS_HASH_FUNCS_COUNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char</div><div class='add'>+tunable_strings[__ETHTOOL_TUNABLE_COUNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char</div><div class='add'>+phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char link_mode_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char netif_msg_class_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char wol_mode_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char sof_timestamping_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char ts_tx_type_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char ts_rx_filter_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char ts_flags_names[][ETH_GSTRING_LEN];</div><div class='add'>+extern const char udp_tunnel_type_names[][ETH_GSTRING_LEN];</div><div class='add'>+</div><div class='add'>+int __ethtool_get_link(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+bool convert_legacy_settings_to_link_ksettings(</div><div class='add'>+	struct ethtool_link_ksettings *link_ksettings,</div><div class='add'>+	const struct ethtool_cmd *legacy_settings);</div><div class='add'>+int ethtool_check_max_channel(struct net_device *dev,</div><div class='add'>+			      struct ethtool_channels channels,</div><div class='add'>+			      struct genl_info *info);</div><div class='add'>+struct ethtool_rxfh_context *</div><div class='add'>+ethtool_rxfh_ctx_alloc(const struct ethtool_ops *ops,</div><div class='add'>+		       u32 indir_size, u32 key_size);</div><div class='add'>+int ethtool_check_rss_ctx_busy(struct net_device *dev, u32 rss_context);</div><div class='add'>+int ethtool_rxfh_config_is_sym(u64 rxfh);</div><div class='add'>+</div><div class='add'>+void ethtool_ringparam_get_cfg(struct net_device *dev,</div><div class='add'>+			       struct ethtool_ringparam *param,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kparam,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int ethtool_get_rx_ring_count(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+int __ethtool_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info);</div><div class='add'>+int ethtool_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+			       struct kernel_ethtool_ts_info *info,</div><div class='add'>+			       struct hwtstamp_provider_desc *hwprov_desc);</div><div class='add'>+int ethtool_net_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+				   struct kernel_ethtool_ts_info *info,</div><div class='add'>+				   struct hwtstamp_provider_desc *hwprov_desc);</div><div class='add'>+struct phy_device *</div><div class='add'>+ethtool_phy_get_ts_info_by_phc(struct net_device *dev,</div><div class='add'>+			       struct kernel_ethtool_ts_info *info,</div><div class='add'>+			       struct hwtstamp_provider_desc *hwprov_desc);</div><div class='add'>+bool net_support_hwtstamp_qualifier(struct net_device *dev,</div><div class='add'>+				    enum hwtstamp_provider_qualifier qualifier);</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_phy_ops *ethtool_phy_ops;</div><div class='add'>+extern const struct ethtool_pse_ops *ethtool_pse_ops;</div><div class='add'>+</div><div class='add'>+int ethtool_get_module_info_call(struct net_device *dev,</div><div class='add'>+				 struct ethtool_modinfo *modinfo);</div><div class='add'>+int ethtool_get_module_eeprom_call(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eeprom *ee, u8 *data);</div><div class='add'>+</div><div class='add'>+bool __ethtool_dev_mm_supported(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_ETHTOOL_NETLINK)</div><div class='add'>+void ethtool_rss_notify(struct net_device *dev, u32 type, u32 rss_context);</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+ethtool_rss_notify(struct net_device *dev, u32 type, u32 rss_context)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ETHTOOL_COMMON_H */</div><div class='head'>diff --git a/net/ethtool/debug.c b/net/ethtool/debug.c<br/>new file mode 100644<br/>index 000000000000..0b2dea56d461<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/debug.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct debug_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct debug_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	u32				msg_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEBUG_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct debug_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_debug_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_DEBUG_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int debug_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			      struct ethnl_reply_data *reply_base,</div><div class='add'>+			      const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct debug_reply_data *data = DEBUG_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_msglevel)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	data-&gt;msg_mask = dev-&gt;ethtool_ops-&gt;get_msglevel(dev);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int debug_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct debug_reply_data *data = DEBUG_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+</div><div class='add'>+	return ethnl_bitset32_size(&amp;data-&gt;msg_mask, NULL, NETIF_MSG_CLASS_COUNT,</div><div class='add'>+				   netif_msg_class_names, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int debug_fill_reply(struct sk_buff *skb,</div><div class='add'>+			    const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct debug_reply_data *data = DEBUG_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+</div><div class='add'>+	return ethnl_put_bitset32(skb, ETHTOOL_A_DEBUG_MSGMASK, &amp;data-&gt;msg_mask,</div><div class='add'>+				  NULL, NETIF_MSG_CLASS_COUNT,</div><div class='add'>+				  netif_msg_class_names, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DEBUG_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_debug_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_DEBUG_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_DEBUG_MSGMASK]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_debug_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_msglevel &amp;&amp; ops-&gt;set_msglevel ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_debug(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	u32 msg_mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg_mask = dev-&gt;ethtool_ops-&gt;get_msglevel(dev);</div><div class='add'>+	ret = ethnl_update_bitset32(&amp;msg_mask, NETIF_MSG_CLASS_COUNT,</div><div class='add'>+				    tb[ETHTOOL_A_DEBUG_MSGMASK],</div><div class='add'>+				    netif_msg_class_names, info-&gt;extack, &amp;mod);</div><div class='add'>+	if (ret &lt; 0 || !mod)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;set_msglevel(dev, msg_mask);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_debug_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_DEBUG_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_DEBUG_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_DEBUG_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct debug_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct debug_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= debug_prepare_data,</div><div class='add'>+	.reply_size		= debug_reply_size,</div><div class='add'>+	.fill_reply		= debug_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_debug_validate,</div><div class='add'>+	.set			= ethnl_set_debug,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_DEBUG_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/eee.c b/net/ethtool/eee.c<br/>new file mode 100644<br/>index 000000000000..bf398973eb8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/eee.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/eee.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct eee_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct eee_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_keee		eee;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EEE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct eee_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_eee_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_EEE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int eee_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			    struct ethnl_reply_data *reply_base,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct eee_reply_data *data = EEE_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct ethtool_keee *eee = &amp;data-&gt;eee;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_eee)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_eee(dev, eee);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eee_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct eee_reply_data *data = EEE_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_keee *eee = &amp;data-&gt;eee;</div><div class='add'>+	int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* MODES_OURS */</div><div class='add'>+	ret = ethnl_bitset_size(eee-&gt;advertised, eee-&gt;supported,</div><div class='add'>+				__ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+	/* MODES_PEERS */</div><div class='add'>+	ret = ethnl_bitset_size(eee-&gt;lp_advertised, NULL,</div><div class='add'>+				__ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+</div><div class='add'>+	len += nla_total_size(sizeof(u8)) +	/* _EEE_ACTIVE */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _EEE_ENABLED */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _EEE_TX_LPI_ENABLED */</div><div class='add'>+	       nla_total_size(sizeof(u32));	/* _EEE_TX_LPI_TIMER */</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eee_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct eee_reply_data *data = EEE_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_keee *eee = &amp;data-&gt;eee;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset(skb, ETHTOOL_A_EEE_MODES_OURS,</div><div class='add'>+			       eee-&gt;advertised, eee-&gt;supported,</div><div class='add'>+			       __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+			       link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = ethnl_put_bitset(skb, ETHTOOL_A_EEE_MODES_PEER,</div><div class='add'>+			       eee-&gt;lp_advertised, NULL,</div><div class='add'>+			       __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+			       link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_EEE_ACTIVE, eee-&gt;eee_active) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_EEE_ENABLED, eee-&gt;eee_enabled) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_EEE_TX_LPI_ENABLED,</div><div class='add'>+		       eee-&gt;tx_lpi_enabled) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_EEE_TX_LPI_TIMER, eee-&gt;tx_lpi_timer))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* EEE_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_eee_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_EEE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_EEE_MODES_OURS]	= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_EEE_ENABLED]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_EEE_TX_LPI_ENABLED]	= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_EEE_TX_LPI_TIMER]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_eee_validate(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_eee &amp;&amp; ops-&gt;set_eee ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_eee(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct ethtool_keee eee = {};</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_eee(dev, &amp;eee);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_update_bitset(eee.advertised,</div><div class='add'>+				  __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				  tb[ETHTOOL_A_EEE_MODES_OURS],</div><div class='add'>+				  link_mode_names, info-&gt;extack, &amp;mod);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ethnl_update_bool(&amp;eee.eee_enabled, tb[ETHTOOL_A_EEE_ENABLED], &amp;mod);</div><div class='add'>+	ethnl_update_bool(&amp;eee.tx_lpi_enabled, tb[ETHTOOL_A_EEE_TX_LPI_ENABLED],</div><div class='add'>+			  &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;eee.tx_lpi_timer, tb[ETHTOOL_A_EEE_TX_LPI_TIMER],</div><div class='add'>+			 &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_eee(dev, &amp;eee);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_eee_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_EEE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_EEE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_EEE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct eee_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct eee_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= eee_prepare_data,</div><div class='add'>+	.reply_size		= eee_reply_size,</div><div class='add'>+	.fill_reply		= eee_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_eee_validate,</div><div class='add'>+	.set			= ethnl_set_eee,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_EEE_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/eeprom.c b/net/ethtool/eeprom.c<br/>new file mode 100644<br/>index 000000000000..3b8209e930fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/eeprom.c</a></div><div class='hunk'>@@ -0,0 +1,246 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/sfp.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct eeprom_req_info {</div><div class='add'>+	struct ethnl_req_info	base;</div><div class='add'>+	u32			offset;</div><div class='add'>+	u32			length;</div><div class='add'>+	u8			page;</div><div class='add'>+	u8			bank;</div><div class='add'>+	u8			i2c_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct eeprom_reply_data {</div><div class='add'>+	struct ethnl_reply_data base;</div><div class='add'>+	u32			length;</div><div class='add'>+	u8			*data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MODULE_EEPROM_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct eeprom_req_info, base)</div><div class='add'>+</div><div class='add'>+#define MODULE_EEPROM_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct eeprom_reply_data, base)</div><div class='add'>+</div><div class='add'>+static int fallback_set_params(struct eeprom_req_info *request,</div><div class='add'>+			       struct ethtool_modinfo *modinfo,</div><div class='add'>+			       struct ethtool_eeprom *eeprom)</div><div class='add'>+{</div><div class='add'>+	u32 offset = request-&gt;offset;</div><div class='add'>+	u32 length = request-&gt;length;</div><div class='add'>+</div><div class='add'>+	if (request-&gt;page)</div><div class='add'>+		offset = request-&gt;page * ETH_MODULE_EEPROM_PAGE_LEN + offset;</div><div class='add'>+</div><div class='add'>+	if (modinfo-&gt;type == ETH_MODULE_SFF_8472 &amp;&amp;</div><div class='add'>+	    request-&gt;i2c_address == 0x51)</div><div class='add'>+		offset += ETH_MODULE_EEPROM_PAGE_LEN * 2;</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= modinfo-&gt;eeprom_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	eeprom-&gt;cmd = ETHTOOL_GMODULEEEPROM;</div><div class='add'>+	eeprom-&gt;len = length;</div><div class='add'>+	eeprom-&gt;offset = offset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eeprom_fallback(struct eeprom_req_info *request,</div><div class='add'>+			   struct eeprom_reply_data *reply)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = reply-&gt;base.dev;</div><div class='add'>+	struct ethtool_modinfo modinfo = {0};</div><div class='add'>+	struct ethtool_eeprom eeprom = {0};</div><div class='add'>+	u8 *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	modinfo.cmd = ETHTOOL_GMODULEINFO;</div><div class='add'>+	err = ethtool_get_module_info_call(dev, &amp;modinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = fallback_set_params(request, &amp;modinfo, &amp;eeprom);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = kmalloc(eeprom.len, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	err = ethtool_get_module_eeprom_call(dev, &amp;eeprom, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	reply-&gt;data = data;</div><div class='add'>+	reply-&gt;length = eeprom.len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_module_eeprom_by_page(struct net_device *dev,</div><div class='add'>+				     struct ethtool_module_eeprom *page_data,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Module firmware flashing is in progress");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;sfp_bus)</div><div class='add'>+		return sfp_get_module_eeprom_by_page(dev-&gt;sfp_bus, page_data, extack);</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;get_module_eeprom_by_page)</div><div class='add'>+		return ops-&gt;get_module_eeprom_by_page(dev, page_data, extack);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eeprom_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			       struct ethnl_reply_data *reply_base,</div><div class='add'>+			       const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct eeprom_reply_data *reply = MODULE_EEPROM_REPDATA(reply_base);</div><div class='add'>+	struct eeprom_req_info *request = MODULE_EEPROM_REQINFO(req_base);</div><div class='add'>+	struct ethtool_module_eeprom page_data = {0};</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page_data.offset = request-&gt;offset;</div><div class='add'>+	page_data.length = request-&gt;length;</div><div class='add'>+	page_data.i2c_address = request-&gt;i2c_address;</div><div class='add'>+	page_data.page = request-&gt;page;</div><div class='add'>+	page_data.bank = request-&gt;bank;</div><div class='add'>+	page_data.data = kmalloc(page_data.length, GFP_KERNEL);</div><div class='add'>+	if (!page_data.data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	ret = get_module_eeprom_by_page(dev, &amp;page_data, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_ops;</div><div class='add'>+</div><div class='add'>+	reply-&gt;length = ret;</div><div class='add'>+	reply-&gt;data = page_data.data;</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+err_free:</div><div class='add'>+	kfree(page_data.data);</div><div class='add'>+</div><div class='add'>+	if (ret == -EOPNOTSUPP)</div><div class='add'>+		return eeprom_fallback(request, reply);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eeprom_parse_request(struct ethnl_req_info *req_info, struct nlattr **tb,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct eeprom_req_info *request = MODULE_EEPROM_REQINFO(req_info);</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_MODULE_EEPROM_OFFSET] ||</div><div class='add'>+	    !tb[ETHTOOL_A_MODULE_EEPROM_LENGTH] ||</div><div class='add'>+	    !tb[ETHTOOL_A_MODULE_EEPROM_PAGE] ||</div><div class='add'>+	    !tb[ETHTOOL_A_MODULE_EEPROM_I2C_ADDRESS])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	request-&gt;i2c_address = nla_get_u8(tb[ETHTOOL_A_MODULE_EEPROM_I2C_ADDRESS]);</div><div class='add'>+	request-&gt;offset = nla_get_u32(tb[ETHTOOL_A_MODULE_EEPROM_OFFSET]);</div><div class='add'>+	request-&gt;length = nla_get_u32(tb[ETHTOOL_A_MODULE_EEPROM_LENGTH]);</div><div class='add'>+</div><div class='add'>+	/* The following set of conditions limit the API to only dump 1/2</div><div class='add'>+	 * EEPROM page without crossing low page boundary located at offset 128.</div><div class='add'>+	 * This means user may only request dumps of length limited to 128 from</div><div class='add'>+	 * either low 128 bytes or high 128 bytes.</div><div class='add'>+	 * For pages higher than 0 only high 128 bytes are accessible.</div><div class='add'>+	 */</div><div class='add'>+	request-&gt;page = nla_get_u8(tb[ETHTOOL_A_MODULE_EEPROM_PAGE]);</div><div class='add'>+	if (request-&gt;page &amp;&amp; request-&gt;offset &lt; ETH_MODULE_EEPROM_PAGE_LEN) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MODULE_EEPROM_PAGE],</div><div class='add'>+				    "reading from lower half page is allowed for page 0 only");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (request-&gt;offset &lt; ETH_MODULE_EEPROM_PAGE_LEN &amp;&amp;</div><div class='add'>+	    request-&gt;offset + request-&gt;length &gt; ETH_MODULE_EEPROM_PAGE_LEN) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MODULE_EEPROM_LENGTH],</div><div class='add'>+				    "reading cross half page boundary is illegal");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (request-&gt;offset + request-&gt;length &gt; ETH_MODULE_EEPROM_PAGE_LEN * 2) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MODULE_EEPROM_LENGTH],</div><div class='add'>+				    "reading cross page boundary is illegal");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_MODULE_EEPROM_BANK])</div><div class='add'>+		request-&gt;bank = nla_get_u8(tb[ETHTOOL_A_MODULE_EEPROM_BANK]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eeprom_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct eeprom_req_info *request = MODULE_EEPROM_REQINFO(req_base);</div><div class='add'>+</div><div class='add'>+	return nla_total_size(sizeof(u8) * request-&gt;length); /* _EEPROM_DATA */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eeprom_fill_reply(struct sk_buff *skb,</div><div class='add'>+			     const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct eeprom_reply_data *reply = MODULE_EEPROM_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	return nla_put(skb, ETHTOOL_A_MODULE_EEPROM_DATA, reply-&gt;length, reply-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eeprom_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct eeprom_reply_data *reply = MODULE_EEPROM_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	kfree(reply-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_module_eeprom_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_MODULE_EEPROM_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_MODULE_EEPROM_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct eeprom_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct eeprom_reply_data),</div><div class='add'>+</div><div class='add'>+	.parse_request		= eeprom_parse_request,</div><div class='add'>+	.prepare_data		= eeprom_prepare_data,</div><div class='add'>+	.reply_size		= eeprom_reply_size,</div><div class='add'>+	.fill_reply		= eeprom_fill_reply,</div><div class='add'>+	.cleanup_data		= eeprom_cleanup_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_module_eeprom_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_HEADER]	= NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_OFFSET]	=</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, ETH_MODULE_EEPROM_PAGE_LEN * 2 - 1),</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_LENGTH]	=</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U32, 1, ETH_MODULE_EEPROM_PAGE_LEN),</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_PAGE]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_BANK]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_MODULE_EEPROM_I2C_ADDRESS]	=</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U8, 0, ETH_MODULE_MAX_I2C_ADDRESS),</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/net/ethtool/features.c b/net/ethtool/features.c<br/>new file mode 100644<br/>index 000000000000..f2217983be2b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/features.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/features.c</a></div><div class='hunk'>@@ -0,0 +1,297 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct features_req_info {</div><div class='add'>+	struct ethnl_req_info	base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct features_reply_data {</div><div class='add'>+	struct ethnl_reply_data	base;</div><div class='add'>+	u32			hw[ETHTOOL_DEV_FEATURE_WORDS];</div><div class='add'>+	u32			wanted[ETHTOOL_DEV_FEATURE_WORDS];</div><div class='add'>+	u32			active[ETHTOOL_DEV_FEATURE_WORDS];</div><div class='add'>+	u32			nochange[ETHTOOL_DEV_FEATURE_WORDS];</div><div class='add'>+	u32			all[ETHTOOL_DEV_FEATURE_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FEATURES_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct features_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_features_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_FEATURES_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ethnl_features_to_bitmap32(u32 *dest, netdev_features_t src)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETHTOOL_DEV_FEATURE_WORDS; i++)</div><div class='add'>+		dest[i] = src &gt;&gt; (32 * i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int features_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				 struct ethnl_reply_data *reply_base,</div><div class='add'>+				 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct features_reply_data *data = FEATURES_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	netdev_features_t all_features;</div><div class='add'>+</div><div class='add'>+	ethnl_features_to_bitmap32(data-&gt;hw, dev-&gt;hw_features);</div><div class='add'>+	ethnl_features_to_bitmap32(data-&gt;wanted, dev-&gt;wanted_features);</div><div class='add'>+	ethnl_features_to_bitmap32(data-&gt;active, dev-&gt;features);</div><div class='add'>+	ethnl_features_to_bitmap32(data-&gt;nochange, NETIF_F_NEVER_CHANGE);</div><div class='add'>+	all_features = GENMASK_ULL(NETDEV_FEATURE_COUNT - 1, 0);</div><div class='add'>+	ethnl_features_to_bitmap32(data-&gt;all, all_features);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int features_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct features_reply_data *data = FEATURES_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_bitset32_size(data-&gt;hw, data-&gt;all, NETDEV_FEATURE_COUNT,</div><div class='add'>+				  netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+	ret = ethnl_bitset32_size(data-&gt;wanted, NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				  netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+	ret = ethnl_bitset32_size(data-&gt;active, NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				  netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+	ret = ethnl_bitset32_size(data-&gt;nochange, NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				  netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int features_fill_reply(struct sk_buff *skb,</div><div class='add'>+			       const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct features_reply_data *data = FEATURES_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset32(skb, ETHTOOL_A_FEATURES_HW, data-&gt;hw,</div><div class='add'>+				 data-&gt;all, NETDEV_FEATURE_COUNT,</div><div class='add'>+				 netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = ethnl_put_bitset32(skb, ETHTOOL_A_FEATURES_WANTED, data-&gt;wanted,</div><div class='add'>+				 NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				 netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = ethnl_put_bitset32(skb, ETHTOOL_A_FEATURES_ACTIVE, data-&gt;active,</div><div class='add'>+				 NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				 netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return ethnl_put_bitset32(skb, ETHTOOL_A_FEATURES_NOCHANGE,</div><div class='add'>+				  data-&gt;nochange, NULL, NETDEV_FEATURE_COUNT,</div><div class='add'>+				  netdev_features_strings, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_features_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_FEATURES_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_FEATURES_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_FEATURES_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct features_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct features_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= features_prepare_data,</div><div class='add'>+	.reply_size		= features_reply_size,</div><div class='add'>+	.fill_reply		= features_fill_reply,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* FEATURES_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_features_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_FEATURES_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_FEATURES_WANTED]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ethnl_features_to_bitmap(unsigned long *dest, netdev_features_t val)</div><div class='add'>+{</div><div class='add'>+	const unsigned int words = BITS_TO_LONGS(NETDEV_FEATURE_COUNT);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; words; i++)</div><div class='add'>+		dest[i] = (unsigned long)(val &gt;&gt; (i * BITS_PER_LONG));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_features_t ethnl_bitmap_to_features(unsigned long *src)</div><div class='add'>+{</div><div class='add'>+	const unsigned int nft_bits = sizeof(netdev_features_t) * BITS_PER_BYTE;</div><div class='add'>+	const unsigned int words = BITS_TO_LONGS(NETDEV_FEATURE_COUNT);</div><div class='add'>+	netdev_features_t ret = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; words; i++)</div><div class='add'>+		ret |= (netdev_features_t)(src[i]) &lt;&lt; (i * BITS_PER_LONG);</div><div class='add'>+	ret &amp;= ~(netdev_features_t)0 &gt;&gt; (nft_bits - NETDEV_FEATURE_COUNT);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int features_send_reply(struct net_device *dev, struct genl_info *info,</div><div class='add'>+			       const unsigned long *wanted,</div><div class='add'>+			       const unsigned long *wanted_mask,</div><div class='add'>+			       const unsigned long *active,</div><div class='add'>+			       const unsigned long *active_mask, bool compact)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *rskb;</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	int reply_len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reply_len = ethnl_reply_header_size();</div><div class='add'>+	ret = ethnl_bitset_size(wanted, wanted_mask, NETDEV_FEATURE_COUNT,</div><div class='add'>+				netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	reply_len += ret;</div><div class='add'>+	ret = ethnl_bitset_size(active, active_mask, NETDEV_FEATURE_COUNT,</div><div class='add'>+				netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	reply_len += ret;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_FEATURES_SET_REPLY,</div><div class='add'>+				ETHTOOL_A_FEATURES_HEADER, info,</div><div class='add'>+				&amp;reply_payload);</div><div class='add'>+	if (!rskb)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset(rskb, ETHTOOL_A_FEATURES_WANTED, wanted,</div><div class='add'>+			       wanted_mask, NETDEV_FEATURE_COUNT,</div><div class='add'>+			       netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	ret = ethnl_put_bitset(rskb, ETHTOOL_A_FEATURES_ACTIVE, active,</div><div class='add'>+			       active_mask, NETDEV_FEATURE_COUNT,</div><div class='add'>+			       netdev_features_strings, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rskb, reply_payload);</div><div class='add'>+	ret = genlmsg_reply(rskb, info);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_free(rskb);</div><div class='add'>+	WARN_ONCE(1, "calculated message payload length (%d) not sufficient\n",</div><div class='add'>+		  reply_len);</div><div class='add'>+err:</div><div class='add'>+	GENL_SET_ERR_MSG(info, "failed to send reply message");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(wanted_diff_mask, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(active_diff_mask, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(old_active, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(old_wanted, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(new_active, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(new_wanted, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(req_wanted, NETDEV_FEATURE_COUNT);</div><div class='add'>+	DECLARE_BITMAP(req_mask, NETDEV_FEATURE_COUNT);</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	bool mod;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_FEATURES_WANTED])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_FEATURES_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	dev = req_info.dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	ethnl_features_to_bitmap(old_active, dev-&gt;features);</div><div class='add'>+	ethnl_features_to_bitmap(old_wanted, dev-&gt;wanted_features);</div><div class='add'>+	ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT,</div><div class='add'>+				 tb[ETHTOOL_A_FEATURES_WANTED],</div><div class='add'>+				 netdev_features_strings, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_ops;</div><div class='add'>+	if (ethnl_bitmap_to_features(req_mask) &amp; ~NETIF_F_ETHTOOL_BITS) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "attempt to change non-ethtool features");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set req_wanted bits not in req_mask from old_wanted */</div><div class='add'>+	bitmap_and(req_wanted, req_wanted, req_mask, NETDEV_FEATURE_COUNT);</div><div class='add'>+	bitmap_andnot(new_wanted, old_wanted, req_mask, NETDEV_FEATURE_COUNT);</div><div class='add'>+	bitmap_or(req_wanted, new_wanted, req_wanted, NETDEV_FEATURE_COUNT);</div><div class='add'>+	if (!bitmap_equal(req_wanted, old_wanted, NETDEV_FEATURE_COUNT)) {</div><div class='add'>+		dev-&gt;wanted_features &amp;= ~dev-&gt;hw_features;</div><div class='add'>+		dev-&gt;wanted_features |= ethnl_bitmap_to_features(req_wanted) &amp; dev-&gt;hw_features;</div><div class='add'>+		__netdev_update_features(dev);</div><div class='add'>+	}</div><div class='add'>+	ethnl_features_to_bitmap(new_active, dev-&gt;features);</div><div class='add'>+	mod = !bitmap_equal(old_active, new_active, NETDEV_FEATURE_COUNT);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (!(req_info.flags &amp; ETHTOOL_FLAG_OMIT_REPLY)) {</div><div class='add'>+		bool compact = req_info.flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+</div><div class='add'>+		bitmap_xor(wanted_diff_mask, req_wanted, new_active,</div><div class='add'>+			   NETDEV_FEATURE_COUNT);</div><div class='add'>+		bitmap_xor(active_diff_mask, old_active, new_active,</div><div class='add'>+			   NETDEV_FEATURE_COUNT);</div><div class='add'>+		bitmap_and(wanted_diff_mask, wanted_diff_mask, req_mask,</div><div class='add'>+			   NETDEV_FEATURE_COUNT);</div><div class='add'>+		bitmap_and(req_wanted, req_wanted, wanted_diff_mask,</div><div class='add'>+			   NETDEV_FEATURE_COUNT);</div><div class='add'>+		bitmap_and(new_active, new_active, active_diff_mask,</div><div class='add'>+			   NETDEV_FEATURE_COUNT);</div><div class='add'>+</div><div class='add'>+		ret = features_send_reply(dev, info, req_wanted,</div><div class='add'>+					  wanted_diff_mask, new_active,</div><div class='add'>+					  active_diff_mask, compact);</div><div class='add'>+	}</div><div class='add'>+	if (mod)</div><div class='add'>+		netdev_features_change(dev);</div><div class='add'>+</div><div class='add'>+out_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+out_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/fec.c b/net/ethtool/fec.c<br/>new file mode 100644<br/>index 000000000000..4669e74cbcaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/fec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/fec.c</a></div><div class='hunk'>@@ -0,0 +1,364 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct fec_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fec_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(fec_link_modes);</div><div class='add'>+	u32 active_fec;</div><div class='add'>+	u8 fec_auto;</div><div class='add'>+	struct fec_stat_grp {</div><div class='add'>+		u64 stats[1 + ETHTOOL_MAX_LANES];</div><div class='add'>+		u8 cnt;</div><div class='add'>+	} corr, uncorr, corr_bits;</div><div class='add'>+	struct ethtool_fec_hist fec_stat_hist;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FEC_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct fec_reply_data, base)</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_FEC_MASK	((ETHTOOL_FEC_LLRS &lt;&lt; 1) - 1)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_fec_get_policy[ETHTOOL_A_FEC_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_FEC_HEADER]	= NLA_POLICY_NESTED(ethnl_header_policy_stats),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ethtool_fec_to_link_modes(u32 fec, unsigned long *link_modes, u8 *fec_auto)</div><div class='add'>+{</div><div class='add'>+	if (fec_auto)</div><div class='add'>+		*fec_auto = !!(fec &amp; ETHTOOL_FEC_AUTO);</div><div class='add'>+</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_OFF)</div><div class='add'>+		__set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, link_modes);</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_RS)</div><div class='add'>+		__set_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT, link_modes);</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_BASER)</div><div class='add'>+		__set_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT, link_modes);</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_LLRS)</div><div class='add'>+		__set_bit(ETHTOOL_LINK_MODE_FEC_LLRS_BIT, link_modes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethtool_link_modes_to_fecparam(struct ethtool_fecparam *fec,</div><div class='add'>+			       unsigned long *link_modes, u8 fec_auto)</div><div class='add'>+{</div><div class='add'>+	memset(fec, 0, sizeof(*fec));</div><div class='add'>+</div><div class='add'>+	if (fec_auto)</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_AUTO;</div><div class='add'>+</div><div class='add'>+	if (__test_and_clear_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, link_modes))</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_OFF;</div><div class='add'>+	if (__test_and_clear_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT, link_modes))</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_RS;</div><div class='add'>+	if (__test_and_clear_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT, link_modes))</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_BASER;</div><div class='add'>+	if (__test_and_clear_bit(ETHTOOL_LINK_MODE_FEC_LLRS_BIT, link_modes))</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_LLRS;</div><div class='add'>+</div><div class='add'>+	if (!bitmap_empty(link_modes, __ETHTOOL_LINK_MODE_MASK_NBITS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+fec_stats_recalc(struct fec_stat_grp *grp, struct ethtool_fec_stat *stats)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;lanes[0] == ETHTOOL_STAT_NOT_SET) {</div><div class='add'>+		grp-&gt;stats[0] = stats-&gt;total;</div><div class='add'>+		grp-&gt;cnt = stats-&gt;total != ETHTOOL_STAT_NOT_SET;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	grp-&gt;cnt = 1;</div><div class='add'>+	grp-&gt;stats[0] = 0;</div><div class='add'>+	for (i = 0; i &lt; ETHTOOL_MAX_LANES; i++) {</div><div class='add'>+		if (stats-&gt;lanes[i] == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		grp-&gt;stats[0] += stats-&gt;lanes[i];</div><div class='add'>+		grp-&gt;stats[grp-&gt;cnt++] = stats-&gt;lanes[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fec_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			    struct ethnl_reply_data *reply_base,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(active_fec_modes) = {};</div><div class='add'>+	struct fec_reply_data *data = FEC_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct ethtool_fecparam fec = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_fecparam)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_fecparam(dev, &amp;fec);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_complete;</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_fec_stats) {</div><div class='add'>+		struct ethtool_fec_stats stats;</div><div class='add'>+</div><div class='add'>+		ethtool_stats_init((u64 *)&amp;stats, sizeof(stats) / 8);</div><div class='add'>+		ethtool_stats_init((u64 *)data-&gt;fec_stat_hist.values,</div><div class='add'>+				   sizeof(data-&gt;fec_stat_hist.values) / 8);</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_fec_stats(dev, &amp;stats,</div><div class='add'>+						&amp;data-&gt;fec_stat_hist);</div><div class='add'>+</div><div class='add'>+		fec_stats_recalc(&amp;data-&gt;corr, &amp;stats.corrected_blocks);</div><div class='add'>+		fec_stats_recalc(&amp;data-&gt;uncorr, &amp;stats.uncorrectable_blocks);</div><div class='add'>+		fec_stats_recalc(&amp;data-&gt;corr_bits, &amp;stats.corrected_bits);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(fec.reserved);</div><div class='add'>+</div><div class='add'>+	ethtool_fec_to_link_modes(fec.fec, data-&gt;fec_link_modes,</div><div class='add'>+				  &amp;data-&gt;fec_auto);</div><div class='add'>+</div><div class='add'>+	ethtool_fec_to_link_modes(fec.active_fec, active_fec_modes, NULL);</div><div class='add'>+	data-&gt;active_fec = find_first_bit(active_fec_modes,</div><div class='add'>+					  __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	/* Don't report attr if no FEC mode set. Note that</div><div class='add'>+	 * ethtool_fecparam_to_link_modes() ignores NONE and AUTO.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;active_fec == __ETHTOOL_LINK_MODE_MASK_NBITS)</div><div class='add'>+		data-&gt;active_fec = 0;</div><div class='add'>+</div><div class='add'>+out_complete:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fec_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct fec_reply_data *data = FEC_REPDATA(reply_base);</div><div class='add'>+	int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_bitset_size(data-&gt;fec_link_modes, NULL,</div><div class='add'>+				__ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+</div><div class='add'>+	len += nla_total_size(sizeof(u8)) +	/* _FEC_AUTO */</div><div class='add'>+	       nla_total_size(sizeof(u32));	/* _FEC_ACTIVE */</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS) {</div><div class='add'>+		len += 3 * nla_total_size_64bit(sizeof(u64) *</div><div class='add'>+						(1 + ETHTOOL_MAX_LANES));</div><div class='add'>+		/* add FEC bins information */</div><div class='add'>+		len += (nla_total_size(0) +  /* _A_FEC_HIST */</div><div class='add'>+			nla_total_size(4) +  /* _A_FEC_HIST_BIN_LOW */</div><div class='add'>+			nla_total_size(4) +  /* _A_FEC_HIST_BIN_HI */</div><div class='add'>+			/* _A_FEC_HIST_BIN_VAL + per-lane values */</div><div class='add'>+			nla_total_size_64bit(sizeof(u64)) +</div><div class='add'>+			nla_total_size_64bit(sizeof(u64) * ETHTOOL_MAX_LANES)) *</div><div class='add'>+			ETHTOOL_FEC_HIST_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fec_put_hist(struct sk_buff *skb,</div><div class='add'>+			const struct ethtool_fec_hist *hist)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_fec_hist_range *ranges = hist-&gt;ranges;</div><div class='add'>+	const struct ethtool_fec_hist_value *values = hist-&gt;values;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int i, j;</div><div class='add'>+	u64 sum;</div><div class='add'>+</div><div class='add'>+	if (!ranges)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETHTOOL_FEC_HIST_MAX; i++) {</div><div class='add'>+		if (i &amp;&amp; !ranges[i].low &amp;&amp; !ranges[i].high)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(values[i].sum == ETHTOOL_STAT_NOT_SET &amp;&amp;</div><div class='add'>+				 values[i].per_lane[0] == ETHTOOL_STAT_NOT_SET))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_FEC_STAT_HIST);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_FEC_HIST_BIN_LOW,</div><div class='add'>+				ranges[i].low) ||</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_FEC_HIST_BIN_HIGH,</div><div class='add'>+				ranges[i].high))</div><div class='add'>+			goto err_cancel_hist;</div><div class='add'>+		sum = 0;</div><div class='add'>+		for (j = 0; j &lt; ETHTOOL_MAX_LANES; j++) {</div><div class='add'>+			if (values[i].per_lane[j] == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+				break;</div><div class='add'>+			sum += values[i].per_lane[j];</div><div class='add'>+		}</div><div class='add'>+		if (nla_put_uint(skb, ETHTOOL_A_FEC_HIST_BIN_VAL,</div><div class='add'>+				 values[i].sum == ETHTOOL_STAT_NOT_SET ?</div><div class='add'>+				 sum : values[i].sum))</div><div class='add'>+			goto err_cancel_hist;</div><div class='add'>+		if (j &amp;&amp; nla_put_64bit(skb, ETHTOOL_A_FEC_HIST_BIN_VAL_PER_LANE,</div><div class='add'>+				       sizeof(u64) * j,</div><div class='add'>+				       values[i].per_lane,</div><div class='add'>+				       ETHTOOL_A_FEC_HIST_PAD))</div><div class='add'>+			goto err_cancel_hist;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_hist:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fec_put_stats(struct sk_buff *skb, const struct fec_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_FEC_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_64bit(skb, ETHTOOL_A_FEC_STAT_CORRECTED,</div><div class='add'>+			  sizeof(u64) * data-&gt;corr.cnt,</div><div class='add'>+			  data-&gt;corr.stats, ETHTOOL_A_FEC_STAT_PAD) ||</div><div class='add'>+	    nla_put_64bit(skb, ETHTOOL_A_FEC_STAT_UNCORR,</div><div class='add'>+			  sizeof(u64) * data-&gt;uncorr.cnt,</div><div class='add'>+			  data-&gt;uncorr.stats, ETHTOOL_A_FEC_STAT_PAD) ||</div><div class='add'>+	    nla_put_64bit(skb, ETHTOOL_A_FEC_STAT_CORR_BITS,</div><div class='add'>+			  sizeof(u64) * data-&gt;corr_bits.cnt,</div><div class='add'>+			  data-&gt;corr_bits.stats, ETHTOOL_A_FEC_STAT_PAD))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (fec_put_hist(skb, &amp;data-&gt;fec_stat_hist))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fec_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct fec_reply_data *data = FEC_REPDATA(reply_base);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset(skb, ETHTOOL_A_FEC_MODES,</div><div class='add'>+			       data-&gt;fec_link_modes, NULL,</div><div class='add'>+			       __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+			       link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_FEC_AUTO, data-&gt;fec_auto) ||</div><div class='add'>+	    (data-&gt;active_fec &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_FEC_ACTIVE, data-&gt;active_fec)))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp; fec_put_stats(skb, data))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FEC_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1] = {</div><div class='add'>+	[ETHTOOL_A_FEC_HEADER]	= NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_FEC_MODES]	= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_FEC_AUTO]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_fec_validate(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_fecparam &amp;&amp; ops-&gt;set_fecparam ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_fec(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(fec_link_modes) = {};</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct ethtool_fecparam fec = {};</div><div class='add'>+	bool mod = false;</div><div class='add'>+	u8 fec_auto;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_fecparam(dev, &amp;fec);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ethtool_fec_to_link_modes(fec.fec, fec_link_modes, &amp;fec_auto);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_update_bitset(fec_link_modes,</div><div class='add'>+				  __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				  tb[ETHTOOL_A_FEC_MODES],</div><div class='add'>+				  link_mode_names, info-&gt;extack, &amp;mod);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ethnl_update_u8(&amp;fec_auto, tb[ETHTOOL_A_FEC_AUTO], &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ethtool_link_modes_to_fecparam(&amp;fec, fec_link_modes, fec_auto);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[ETHTOOL_A_FEC_MODES],</div><div class='add'>+				    "invalid FEC modes requested");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (!fec.fec) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[ETHTOOL_A_FEC_MODES],</div><div class='add'>+				    "no FEC modes set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_fecparam(dev, &amp;fec);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_fec_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_FEC_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_FEC_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_FEC_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct fec_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct fec_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= fec_prepare_data,</div><div class='add'>+	.reply_size		= fec_reply_size,</div><div class='add'>+	.fill_reply		= fec_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_fec_validate,</div><div class='add'>+	.set			= ethnl_set_fec,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_FEC_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/core/ethtool.c b/net/ethtool/ioctl.c<br/>index 0762aaf8e964..fa83ddade4f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/core/ethtool.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/core/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/ioctl.c</a></div><div class='hunk'>@@ -1,16 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/core/ethtool.c - Ethtool ioctl handler</div><div class='ctx'>  * Copyright (c) 2003 Matthew Wilcox &lt;matthew@wil.cx&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This file is where we call all the ethtool_ops commands to get</div><div class='ctx'>  * the information ethtool needs.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -27,6 +25,31 @@</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+#include &lt;net/flow_offload.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* State held across locks and calls for commands which have devlink fallback */</div><div class='add'>+struct ethtool_devlink_compat {</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	union {</div><div class='add'>+		struct ethtool_flash efl;</div><div class='add'>+		struct ethtool_drvinfo info;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink *netdev_to_devlink_get(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;devlink_port)</div><div class='add'>+		return NULL;</div><div class='add'>+	return devlink_try_get(dev-&gt;devlink_port-&gt;devlink);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some useful ethtool_ops methods that're device independent.</div><div class='hunk'>@@ -36,11 +59,15 @@</div><div class='ctx'> </div><div class='ctx'> u32 ethtool_op_get_link(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	/* Synchronize carrier state with link watch, see also rtnl_getlink() */</div><div class='add'>+	__linkwatch_sync_dev(dev);</div><div class='add'>+</div><div class='ctx'> 	return netif_carrier_ok(dev) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ethtool_op_get_link);</div><div class='ctx'> </div><div class='del'>-int ethtool_op_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)</div><div class='add'>+int ethtool_op_get_ts_info(struct net_device *dev,</div><div class='add'>+			   struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;so_timestamping =</div><div class='ctx'> 		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='hunk'>@@ -53,88 +80,6 @@ EXPORT_SYMBOL(ethtool_op_get_ts_info);</div><div class='ctx'> </div><div class='ctx'> /* Handlers for each ethtool command */</div><div class='ctx'> </div><div class='del'>-#define ETHTOOL_DEV_FEATURE_WORDS	((NETDEV_FEATURE_COUNT + 31) / 32)</div><div class='del'>-</div><div class='del'>-static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = {</div><div class='del'>-	[NETIF_F_SG_BIT] =               "tx-scatter-gather",</div><div class='del'>-	[NETIF_F_IP_CSUM_BIT] =          "tx-checksum-ipv4",</div><div class='del'>-	[NETIF_F_HW_CSUM_BIT] =          "tx-checksum-ip-generic",</div><div class='del'>-	[NETIF_F_IPV6_CSUM_BIT] =        "tx-checksum-ipv6",</div><div class='del'>-	[NETIF_F_HIGHDMA_BIT] =          "highdma",</div><div class='del'>-	[NETIF_F_FRAGLIST_BIT] =         "tx-scatter-gather-fraglist",</div><div class='del'>-	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-hw-insert",</div><div class='del'>-</div><div class='del'>-	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-hw-parse",</div><div class='del'>-	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter",</div><div class='del'>-	[NETIF_F_HW_VLAN_STAG_TX_BIT] =  "tx-vlan-stag-hw-insert",</div><div class='del'>-	[NETIF_F_HW_VLAN_STAG_RX_BIT] =  "rx-vlan-stag-hw-parse",</div><div class='del'>-	[NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",</div><div class='del'>-	[NETIF_F_VLAN_CHALLENGED_BIT] =  "vlan-challenged",</div><div class='del'>-	[NETIF_F_GSO_BIT] =              "tx-generic-segmentation",</div><div class='del'>-	[NETIF_F_LLTX_BIT] =             "tx-lockless",</div><div class='del'>-	[NETIF_F_NETNS_LOCAL_BIT] =      "netns-local",</div><div class='del'>-	[NETIF_F_GRO_BIT] =              "rx-gro",</div><div class='del'>-	[NETIF_F_GRO_HW_BIT] =           "rx-gro-hw",</div><div class='del'>-	[NETIF_F_LRO_BIT] =              "rx-lro",</div><div class='del'>-</div><div class='del'>-	[NETIF_F_TSO_BIT] =              "tx-tcp-segmentation",</div><div class='del'>-	[NETIF_F_GSO_ROBUST_BIT] =       "tx-gso-robust",</div><div class='del'>-	[NETIF_F_TSO_ECN_BIT] =          "tx-tcp-ecn-segmentation",</div><div class='del'>-	[NETIF_F_TSO_MANGLEID_BIT] =	 "tx-tcp-mangleid-segmentation",</div><div class='del'>-	[NETIF_F_TSO6_BIT] =             "tx-tcp6-segmentation",</div><div class='del'>-	[NETIF_F_FSO_BIT] =              "tx-fcoe-segmentation",</div><div class='del'>-	[NETIF_F_GSO_GRE_BIT] =		 "tx-gre-segmentation",</div><div class='del'>-	[NETIF_F_GSO_GRE_CSUM_BIT] =	 "tx-gre-csum-segmentation",</div><div class='del'>-	[NETIF_F_GSO_IPXIP4_BIT] =	 "tx-ipxip4-segmentation",</div><div class='del'>-	[NETIF_F_GSO_IPXIP6_BIT] =	 "tx-ipxip6-segmentation",</div><div class='del'>-	[NETIF_F_GSO_UDP_TUNNEL_BIT] =	 "tx-udp_tnl-segmentation",</div><div class='del'>-	[NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT] = "tx-udp_tnl-csum-segmentation",</div><div class='del'>-	[NETIF_F_GSO_PARTIAL_BIT] =	 "tx-gso-partial",</div><div class='del'>-	[NETIF_F_GSO_SCTP_BIT] =	 "tx-sctp-segmentation",</div><div class='del'>-	[NETIF_F_GSO_ESP_BIT] =		 "tx-esp-segmentation",</div><div class='del'>-	[NETIF_F_GSO_UDP_L4_BIT] =	 "tx-udp-segmentation",</div><div class='del'>-</div><div class='del'>-	[NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",</div><div class='del'>-	[NETIF_F_SCTP_CRC_BIT] =        "tx-checksum-sctp",</div><div class='del'>-	[NETIF_F_FCOE_MTU_BIT] =         "fcoe-mtu",</div><div class='del'>-	[NETIF_F_NTUPLE_BIT] =           "rx-ntuple-filter",</div><div class='del'>-	[NETIF_F_RXHASH_BIT] =           "rx-hashing",</div><div class='del'>-	[NETIF_F_RXCSUM_BIT] =           "rx-checksum",</div><div class='del'>-	[NETIF_F_NOCACHE_COPY_BIT] =     "tx-nocache-copy",</div><div class='del'>-	[NETIF_F_LOOPBACK_BIT] =         "loopback",</div><div class='del'>-	[NETIF_F_RXFCS_BIT] =            "rx-fcs",</div><div class='del'>-	[NETIF_F_RXALL_BIT] =            "rx-all",</div><div class='del'>-	[NETIF_F_HW_L2FW_DOFFLOAD_BIT] = "l2-fwd-offload",</div><div class='del'>-	[NETIF_F_HW_TC_BIT] =		 "hw-tc-offload",</div><div class='del'>-	[NETIF_F_HW_ESP_BIT] =		 "esp-hw-offload",</div><div class='del'>-	[NETIF_F_HW_ESP_TX_CSUM_BIT] =	 "esp-tx-csum-hw-offload",</div><div class='del'>-	[NETIF_F_RX_UDP_TUNNEL_PORT_BIT] =	 "rx-udp_tunnel-port-offload",</div><div class='del'>-	[NETIF_F_HW_TLS_RECORD_BIT] =	"tls-hw-record",</div><div class='del'>-	[NETIF_F_HW_TLS_TX_BIT] =	 "tls-hw-tx-offload",</div><div class='del'>-	[NETIF_F_HW_TLS_RX_BIT] =	 "tls-hw-rx-offload",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char</div><div class='del'>-rss_hash_func_strings[ETH_RSS_HASH_FUNCS_COUNT][ETH_GSTRING_LEN] = {</div><div class='del'>-	[ETH_RSS_HASH_TOP_BIT] =	"toeplitz",</div><div class='del'>-	[ETH_RSS_HASH_XOR_BIT] =	"xor",</div><div class='del'>-	[ETH_RSS_HASH_CRC32_BIT] =	"crc32",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char</div><div class='del'>-tunable_strings[__ETHTOOL_TUNABLE_COUNT][ETH_GSTRING_LEN] = {</div><div class='del'>-	[ETHTOOL_ID_UNSPEC]     = "Unspec",</div><div class='del'>-	[ETHTOOL_RX_COPYBREAK]	= "rx-copybreak",</div><div class='del'>-	[ETHTOOL_TX_COPYBREAK]	= "tx-copybreak",</div><div class='del'>-	[ETHTOOL_PFC_PREVENTION_TOUT] = "pfc-prevention-tout",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char</div><div class='del'>-phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN] = {</div><div class='del'>-	[ETHTOOL_ID_UNSPEC]     = "Unspec",</div><div class='del'>-	[ETHTOOL_PHY_DOWNSHIFT]	= "phy-downshift",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int ethtool_get_features(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_gfeatures cmd = {</div><div class='hunk'>@@ -167,7 +112,8 @@ static int ethtool_get_features(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;cmd, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	useraddr += sizeof(cmd);</div><div class='del'>-	if (copy_to_user(useraddr, features, copy_size * sizeof(*features)))</div><div class='add'>+	if (copy_to_user(useraddr, features,</div><div class='add'>+			 array_size(copy_size, sizeof(*features))))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -215,6 +161,7 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int __ethtool_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> {</div><div class='add'>+	const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (sset == ETH_SS_FEATURES)</div><div class='hunk'>@@ -230,8 +177,12 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 		return ARRAY_SIZE(phy_tunable_strings);</div><div class='ctx'> </div><div class='ctx'> 	if (sset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='del'>-	    !ops-&gt;get_ethtool_phy_stats)</div><div class='del'>-		return phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='add'>+	    !ops-&gt;get_ethtool_phy_stats &amp;&amp;</div><div class='add'>+	    phy_ops &amp;&amp; phy_ops-&gt;get_sset_count)</div><div class='add'>+		return phy_ops-&gt;get_sset_count(dev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	if (sset == ETH_SS_LINK_MODES)</div><div class='add'>+		return __ETHTOOL_LINK_MODE_MASK_NBITS;</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_strings)</div><div class='ctx'> 		return ops-&gt;get_sset_count(dev, sset);</div><div class='hunk'>@@ -242,6 +193,7 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> static void __ethtool_get_strings(struct net_device *dev,</div><div class='ctx'> 	u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (stringset == ETH_SS_FEATURES)</div><div class='hunk'>@@ -255,8 +207,12 @@ static void __ethtool_get_strings(struct net_device *dev,</div><div class='ctx'> 	else if (stringset == ETH_SS_PHY_TUNABLES)</div><div class='ctx'> 		memcpy(data, phy_tunable_strings, sizeof(phy_tunable_strings));</div><div class='ctx'> 	else if (stringset == ETH_SS_PHY_STATS &amp;&amp; dev-&gt;phydev &amp;&amp;</div><div class='del'>-		 !ops-&gt;get_ethtool_phy_stats)</div><div class='del'>-		phy_ethtool_get_strings(dev-&gt;phydev, data);</div><div class='add'>+		 !ops-&gt;get_ethtool_phy_stats &amp;&amp; phy_ops &amp;&amp;</div><div class='add'>+		 phy_ops-&gt;get_strings)</div><div class='add'>+		phy_ops-&gt;get_strings(dev-&gt;phydev, data);</div><div class='add'>+	else if (stringset == ETH_SS_LINK_MODES)</div><div class='add'>+		memcpy(data, link_mode_names,</div><div class='add'>+		       __ETHTOOL_LINK_MODE_MASK_NBITS * ETH_GSTRING_LEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* ops-&gt;get_strings is valid because checked earlier */</div><div class='ctx'> 		ops-&gt;get_strings(dev, stringset, data);</div><div class='hunk'>@@ -269,13 +225,14 @@ static netdev_features_t ethtool_get_feature_mask(u32 eth_cmd)</div><div class='ctx'> 	switch (eth_cmd) {</div><div class='ctx'> 	case ETHTOOL_GTXCSUM:</div><div class='ctx'> 	case ETHTOOL_STXCSUM:</div><div class='del'>-		return NETIF_F_CSUM_MASK | NETIF_F_SCTP_CRC;</div><div class='add'>+		return NETIF_F_CSUM_MASK | NETIF_F_FCOE_CRC |</div><div class='add'>+		       NETIF_F_SCTP_CRC;</div><div class='ctx'> 	case ETHTOOL_GRXCSUM:</div><div class='ctx'> 	case ETHTOOL_SRXCSUM:</div><div class='ctx'> 		return NETIF_F_RXCSUM;</div><div class='ctx'> 	case ETHTOOL_GSG:</div><div class='ctx'> 	case ETHTOOL_SSG:</div><div class='del'>-		return NETIF_F_SG;</div><div class='add'>+		return NETIF_F_SG | NETIF_F_FRAGLIST;</div><div class='ctx'> 	case ETHTOOL_GTSO:</div><div class='ctx'> 	case ETHTOOL_STSO:</div><div class='ctx'> 		return NETIF_F_ALL_TSO;</div><div class='hunk'>@@ -402,7 +359,7 @@ EXPORT_SYMBOL(ethtool_intersect_link_masks);</div><div class='ctx'> void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst,</div><div class='ctx'> 					     u32 legacy_u32)</div><div class='ctx'> {</div><div class='del'>-	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	linkmode_zero(dst);</div><div class='ctx'> 	dst[0] = legacy_u32;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ethtool_convert_legacy_u32_to_link_mode);</div><div class='hunk'>@@ -411,74 +368,12 @@ EXPORT_SYMBOL(ethtool_convert_legacy_u32_to_link_mode);</div><div class='ctx'> bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,</div><div class='ctx'> 					     const unsigned long *src)</div><div class='ctx'> {</div><div class='del'>-	bool retval = true;</div><div class='del'>-</div><div class='del'>-	/* TODO: following test will soon always be true */</div><div class='del'>-	if (__ETHTOOL_LINK_MODE_MASK_NBITS &gt; 32) {</div><div class='del'>-		__ETHTOOL_DECLARE_LINK_MODE_MASK(ext);</div><div class='del'>-</div><div class='del'>-		bitmap_zero(ext, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-		bitmap_fill(ext, 32);</div><div class='del'>-		bitmap_complement(ext, ext, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-		if (bitmap_intersects(ext, src,</div><div class='del'>-				      __ETHTOOL_LINK_MODE_MASK_NBITS)) {</div><div class='del'>-			/* src mask goes beyond bit 31 */</div><div class='del'>-			retval = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	*legacy_u32 = src[0];</div><div class='del'>-	return retval;</div><div class='add'>+	return find_next_bit(src, __ETHTOOL_LINK_MODE_MASK_NBITS, 32) ==</div><div class='add'>+		__ETHTOOL_LINK_MODE_MASK_NBITS;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32);</div><div class='ctx'> </div><div class='del'>-/* return false if legacy contained non-0 deprecated fields</div><div class='del'>- * maxtxpkt/maxrxpkt. rest of ksettings always updated</div><div class='del'>- */</div><div class='del'>-static bool</div><div class='del'>-convert_legacy_settings_to_link_ksettings(</div><div class='del'>-	struct ethtool_link_ksettings *link_ksettings,</div><div class='del'>-	const struct ethtool_cmd *legacy_settings)</div><div class='del'>-{</div><div class='del'>-	bool retval = true;</div><div class='del'>-</div><div class='del'>-	memset(link_ksettings, 0, sizeof(*link_ksettings));</div><div class='del'>-</div><div class='del'>-	/* This is used to tell users that driver is still using these</div><div class='del'>-	 * deprecated legacy fields, and they should not use</div><div class='del'>-	 * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS</div><div class='del'>-	 */</div><div class='del'>-	if (legacy_settings-&gt;maxtxpkt ||</div><div class='del'>-	    legacy_settings-&gt;maxrxpkt)</div><div class='del'>-		retval = false;</div><div class='del'>-</div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(</div><div class='del'>-		link_ksettings-&gt;link_modes.supported,</div><div class='del'>-		legacy_settings-&gt;supported);</div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(</div><div class='del'>-		link_ksettings-&gt;link_modes.advertising,</div><div class='del'>-		legacy_settings-&gt;advertising);</div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(</div><div class='del'>-		link_ksettings-&gt;link_modes.lp_advertising,</div><div class='del'>-		legacy_settings-&gt;lp_advertising);</div><div class='del'>-	link_ksettings-&gt;base.speed</div><div class='del'>-		= ethtool_cmd_speed(legacy_settings);</div><div class='del'>-	link_ksettings-&gt;base.duplex</div><div class='del'>-		= legacy_settings-&gt;duplex;</div><div class='del'>-	link_ksettings-&gt;base.port</div><div class='del'>-		= legacy_settings-&gt;port;</div><div class='del'>-	link_ksettings-&gt;base.phy_address</div><div class='del'>-		= legacy_settings-&gt;phy_address;</div><div class='del'>-	link_ksettings-&gt;base.autoneg</div><div class='del'>-		= legacy_settings-&gt;autoneg;</div><div class='del'>-	link_ksettings-&gt;base.mdio_support</div><div class='del'>-		= legacy_settings-&gt;mdio_support;</div><div class='del'>-	link_ksettings-&gt;base.eth_tp_mdix</div><div class='del'>-		= legacy_settings-&gt;eth_tp_mdix;</div><div class='del'>-	link_ksettings-&gt;base.eth_tp_mdix_ctrl</div><div class='del'>-		= legacy_settings-&gt;eth_tp_mdix_ctrl;</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* return false if ksettings link modes had higher bits</div><div class='ctx'>  * set. legacy_settings always updated (best effort)</div><div class='ctx'>  */</div><div class='hunk'>@@ -539,47 +434,20 @@ struct ethtool_link_usettings {</div><div class='ctx'> 	} link_modes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Internal kernel helper to query a device ethtool_link_settings.</div><div class='del'>- *</div><div class='del'>- * Backward compatibility note: for compatibility with legacy drivers</div><div class='del'>- * that implement only the ethtool_cmd API, this has to work with both</div><div class='del'>- * drivers implementing get_link_ksettings API and drivers</div><div class='del'>- * implementing get_settings API. When drivers implement get_settings</div><div class='del'>- * and report ethtool_cmd deprecated fields</div><div class='del'>- * (transceiver/maxrxpkt/maxtxpkt), these fields are silently ignored</div><div class='del'>- * because the resulting struct ethtool_link_settings does not report them.</div><div class='del'>- */</div><div class='add'>+/* Internal kernel helper to query a device ethtool_link_settings. */</div><div class='ctx'> int __ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 				 struct ethtool_link_ksettings *link_ksettings)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct ethtool_cmd cmd;</div><div class='del'>-</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ethtool_ops-&gt;get_link_ksettings) {</div><div class='del'>-		memset(link_ksettings, 0, sizeof(*link_ksettings));</div><div class='del'>-		return dev-&gt;ethtool_ops-&gt;get_link_ksettings(dev,</div><div class='del'>-							    link_ksettings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* driver doesn't support %ethtool_link_ksettings API. revert to</div><div class='del'>-	 * legacy %ethtool_cmd API, unless it's not supported either.</div><div class='del'>-	 * TODO: remove when ethtool_ops::get_settings disappears internally</div><div class='del'>-	 */</div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;get_settings)</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_link_ksettings)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = ETHTOOL_GSET;</div><div class='del'>-	err = dev-&gt;ethtool_ops-&gt;get_settings(dev, &amp;cmd);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* we ignore deprecated fields transceiver/maxrxpkt/maxtxpkt</div><div class='del'>-	 */</div><div class='del'>-	convert_legacy_settings_to_link_ksettings(link_ksettings, &amp;cmd);</div><div class='del'>-	return err;</div><div class='add'>+	memset(link_ksettings, 0, sizeof(*link_ksettings));</div><div class='add'>+	return dev-&gt;ethtool_ops-&gt;get_link_ksettings(dev, link_ksettings);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ethtool_get_link_ksettings);</div><div class='ctx'> </div><div class='hunk'>@@ -608,6 +476,24 @@ static int load_link_ksettings_from_user(struct ethtool_link_ksettings *to,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Check if the user is trying to change anything besides speed/duplex */</div><div class='add'>+bool ethtool_virtdev_validate_cmd(const struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_link_settings base2 = {};</div><div class='add'>+</div><div class='add'>+	base2.speed = cmd-&gt;base.speed;</div><div class='add'>+	base2.port = PORT_OTHER;</div><div class='add'>+	base2.duplex = cmd-&gt;base.duplex;</div><div class='add'>+	base2.cmd = cmd-&gt;base.cmd;</div><div class='add'>+	base2.link_mode_masks_nwords = cmd-&gt;base.link_mode_masks_nwords;</div><div class='add'>+</div><div class='add'>+	return !memcmp(&amp;base2, &amp;cmd-&gt;base, sizeof(base2)) &amp;&amp;</div><div class='add'>+		bitmap_empty(cmd-&gt;link_modes.supported,</div><div class='add'>+			     __ETHTOOL_LINK_MODE_MASK_NBITS) &amp;&amp;</div><div class='add'>+		bitmap_empty(cmd-&gt;link_modes.lp_advertising,</div><div class='add'>+			     __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* convert a kernel internal ethtool_link_ksettings to</div><div class='ctx'>  * ethtool_link_usettings in user space. return 0 on success, errno on</div><div class='ctx'>  * error.</div><div class='hunk'>@@ -618,7 +504,7 @@ store_link_ksettings_for_user(void __user *to,</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_link_usettings link_usettings;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;link_usettings.base, &amp;from-&gt;base, sizeof(link_usettings));</div><div class='add'>+	memcpy(&amp;link_usettings, from, sizeof(link_usettings));</div><div class='ctx'> 	bitmap_to_arr32(link_usettings.link_modes.supported,</div><div class='ctx'> 			from-&gt;link_modes.supported,</div><div class='ctx'> 			__ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='hunk'>@@ -635,16 +521,7 @@ store_link_ksettings_for_user(void __user *to,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Query device for its ethtool_link_settings.</div><div class='del'>- *</div><div class='del'>- * Backward compatibility note: this function must fail when driver</div><div class='del'>- * does not implement ethtool::get_link_ksettings, even if legacy</div><div class='del'>- * ethtool_ops::get_settings is implemented. This tells new versions</div><div class='del'>- * of ethtool that they should use the legacy API %ETHTOOL_GSET for</div><div class='del'>- * this driver, so that they can correctly access the ethtool_cmd</div><div class='del'>- * deprecated fields (transceiver/maxrxpkt/maxtxpkt), until no driver</div><div class='del'>- * implements ethtool_ops::get_settings anymore.</div><div class='del'>- */</div><div class='add'>+/* Query device for its ethtool_link_settings. */</div><div class='ctx'> static int ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 				      void __user *useraddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -652,7 +529,6 @@ static int ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	struct ethtool_link_ksettings link_ksettings;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-</div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_link_ksettings)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -695,25 +571,19 @@ static int ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	link_ksettings.base.cmd = ETHTOOL_GLINKSETTINGS;</div><div class='ctx'> 	link_ksettings.base.link_mode_masks_nwords</div><div class='ctx'> 		= __ETHTOOL_LINK_MODE_MASK_NU32;</div><div class='add'>+	link_ksettings.base.master_slave_cfg = MASTER_SLAVE_CFG_UNSUPPORTED;</div><div class='add'>+	link_ksettings.base.master_slave_state = MASTER_SLAVE_STATE_UNSUPPORTED;</div><div class='add'>+	link_ksettings.base.rate_matching = RATE_MATCH_NONE;</div><div class='ctx'> </div><div class='ctx'> 	return store_link_ksettings_for_user(useraddr, &amp;link_ksettings);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Update device ethtool_link_settings.</div><div class='del'>- *</div><div class='del'>- * Backward compatibility note: this function must fail when driver</div><div class='del'>- * does not implement ethtool::set_link_ksettings, even if legacy</div><div class='del'>- * ethtool_ops::set_settings is implemented. This tells new versions</div><div class='del'>- * of ethtool that they should use the legacy API %ETHTOOL_SSET for</div><div class='del'>- * this driver, so that they can correctly update the ethtool_cmd</div><div class='del'>- * deprecated fields (transceiver/maxrxpkt/maxtxpkt), until no driver</div><div class='del'>- * implements ethtool_ops::get_settings anymore.</div><div class='del'>- */</div><div class='add'>+/* Update device ethtool_link_settings. */</div><div class='ctx'> static int ethtool_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 				      void __user *useraddr)</div><div class='ctx'> {</div><div class='add'>+	struct ethtool_link_ksettings link_ksettings = {};</div><div class='ctx'> 	int err;</div><div class='del'>-	struct ethtool_link_ksettings link_ksettings;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='hunk'>@@ -741,56 +611,69 @@ static int ethtool_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	    != link_ksettings.base.link_mode_masks_nwords)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev, &amp;link_ksettings);</div><div class='add'>+	if (link_ksettings.base.master_slave_cfg ||</div><div class='add'>+	    link_ksettings.base.master_slave_state)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev, &amp;link_ksettings);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_LINKINFO_NTF);</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_LINKMODES_NTF);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethtool_virtdev_set_link_ksettings(struct net_device *dev,</div><div class='add'>+				       const struct ethtool_link_ksettings *cmd,</div><div class='add'>+				       u32 *dev_speed, u8 *dev_duplex)</div><div class='add'>+{</div><div class='add'>+	u32 speed;</div><div class='add'>+	u8 duplex;</div><div class='add'>+</div><div class='add'>+	speed = cmd-&gt;base.speed;</div><div class='add'>+	duplex = cmd-&gt;base.duplex;</div><div class='add'>+	/* don't allow custom speed and duplex */</div><div class='add'>+	if (!ethtool_validate_speed(speed) ||</div><div class='add'>+	    !ethtool_validate_duplex(duplex) ||</div><div class='add'>+	    !ethtool_virtdev_validate_cmd(cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*dev_speed = speed;</div><div class='add'>+	*dev_duplex = duplex;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ethtool_virtdev_set_link_ksettings);</div><div class='ctx'> </div><div class='ctx'> /* Query device for its ethtool_cmd settings.</div><div class='ctx'>  *</div><div class='del'>- * Backward compatibility note: for compatibility with legacy ethtool,</div><div class='del'>- * this has to work with both drivers implementing get_link_ksettings</div><div class='del'>- * API and drivers implementing get_settings API. When drivers</div><div class='del'>- * implement get_link_ksettings and report higher link mode bits, a</div><div class='del'>- * kernel warning is logged once (with name of 1st driver/device) to</div><div class='del'>- * recommend user to upgrade ethtool, but the command is successful</div><div class='del'>- * (only the lower link mode bits reported back to user).</div><div class='add'>+ * Backward compatibility note: for compatibility with legacy ethtool, this is</div><div class='add'>+ * now implemented via get_link_ksettings. When driver reports higher link mode</div><div class='add'>+ * bits, a kernel warning is logged once (with name of 1st driver/device) to</div><div class='add'>+ * recommend user to upgrade ethtool, but the command is successful (only the</div><div class='add'>+ * lower link mode bits reported back to user). Deprecated fields from</div><div class='add'>+ * ethtool_cmd (transceiver/maxrxpkt/maxtxpkt) are always set to zero.</div><div class='ctx'>  */</div><div class='ctx'> static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='add'>+	struct ethtool_link_ksettings link_ksettings;</div><div class='ctx'> 	struct ethtool_cmd cmd;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_link_ksettings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ethtool_ops-&gt;get_link_ksettings) {</div><div class='del'>-		/* First, use link_ksettings API if it is supported */</div><div class='del'>-		int err;</div><div class='del'>-		struct ethtool_link_ksettings link_ksettings;</div><div class='del'>-</div><div class='del'>-		memset(&amp;link_ksettings, 0, sizeof(link_ksettings));</div><div class='del'>-		err = dev-&gt;ethtool_ops-&gt;get_link_ksettings(dev,</div><div class='del'>-							   &amp;link_ksettings);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		convert_link_ksettings_to_legacy_settings(&amp;cmd,</div><div class='del'>-							  &amp;link_ksettings);</div><div class='del'>-</div><div class='del'>-		/* send a sensible cmd tag back to user */</div><div class='del'>-		cmd.cmd = ETHTOOL_GSET;</div><div class='del'>-	} else {</div><div class='del'>-		/* driver doesn't support %ethtool_link_ksettings</div><div class='del'>-		 * API. revert to legacy %ethtool_cmd API, unless it's</div><div class='del'>-		 * not supported either.</div><div class='del'>-		 */</div><div class='del'>-		int err;</div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-		if (!dev-&gt;ethtool_ops-&gt;get_settings)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+	memset(&amp;link_ksettings, 0, sizeof(link_ksettings));</div><div class='add'>+	err = dev-&gt;ethtool_ops-&gt;get_link_ksettings(dev, &amp;link_ksettings);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	convert_link_ksettings_to_legacy_settings(&amp;cmd, &amp;link_ksettings);</div><div class='ctx'> </div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.cmd = ETHTOOL_GSET;</div><div class='del'>-		err = dev-&gt;ethtool_ops-&gt;get_settings(dev, &amp;cmd);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	/* send a sensible cmd tag back to user */</div><div class='add'>+	cmd.cmd = ETHTOOL_GSET;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;cmd, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -800,65 +683,62 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> /* Update device link settings with given ethtool_cmd.</div><div class='ctx'>  *</div><div class='del'>- * Backward compatibility note: for compatibility with legacy ethtool,</div><div class='del'>- * this has to work with both drivers implementing set_link_ksettings</div><div class='del'>- * API and drivers implementing set_settings API. When drivers</div><div class='del'>- * implement set_link_ksettings and user's request updates deprecated</div><div class='del'>- * ethtool_cmd fields (transceiver/maxrxpkt/maxtxpkt), a kernel</div><div class='del'>- * warning is logged once (with name of 1st driver/device) to</div><div class='del'>- * recommend user to upgrade ethtool, and the request is rejected.</div><div class='add'>+ * Backward compatibility note: for compatibility with legacy ethtool, this is</div><div class='add'>+ * now always implemented via set_link_settings. When user's request updates</div><div class='add'>+ * deprecated ethtool_cmd fields (transceiver/maxrxpkt/maxtxpkt), a kernel</div><div class='add'>+ * warning is logged once (with name of 1st driver/device) to recommend user to</div><div class='add'>+ * upgrade ethtool, and the request is rejected.</div><div class='ctx'>  */</div><div class='ctx'> static int ethtool_set_settings(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='add'>+	struct ethtool_link_ksettings link_ksettings;</div><div class='ctx'> 	struct ethtool_cmd cmd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, useraddr, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* first, try new %ethtool_link_ksettings API. */</div><div class='del'>-	if (dev-&gt;ethtool_ops-&gt;set_link_ksettings) {</div><div class='del'>-		struct ethtool_link_ksettings link_ksettings;</div><div class='del'>-</div><div class='del'>-		if (!convert_legacy_settings_to_link_ksettings(&amp;link_ksettings,</div><div class='del'>-							       &amp;cmd))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		link_ksettings.base.cmd = ETHTOOL_SLINKSETTINGS;</div><div class='del'>-		link_ksettings.base.link_mode_masks_nwords</div><div class='del'>-			= __ETHTOOL_LINK_MODE_MASK_NU32;</div><div class='del'>-		return dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev,</div><div class='del'>-							    &amp;link_ksettings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* legacy %ethtool_cmd API */</div><div class='del'>-</div><div class='del'>-	/* TODO: return -EOPNOTSUPP when ethtool_ops::get_settings</div><div class='del'>-	 * disappears internally</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;set_settings)</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;set_link_ksettings)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_settings(dev, &amp;cmd);</div><div class='add'>+	if (!convert_legacy_settings_to_link_ksettings(&amp;link_ksettings, &amp;cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	link_ksettings.base.link_mode_masks_nwords =</div><div class='add'>+		__ETHTOOL_LINK_MODE_MASK_NU32;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev, &amp;link_ksettings);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_LINKINFO_NTF);</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_LINKMODES_NTF);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev,</div><div class='del'>-						  void __user *useraddr)</div><div class='add'>+static int</div><div class='add'>+ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_drvinfo info;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct device *parent = dev-&gt;dev.parent;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.cmd = ETHTOOL_GDRVINFO;</div><div class='add'>+	rsp-&gt;info.cmd = ETHTOOL_GDRVINFO;</div><div class='add'>+	strscpy(rsp-&gt;info.version, init_uts_ns.name.release,</div><div class='add'>+		sizeof(rsp-&gt;info.version));</div><div class='ctx'> 	if (ops-&gt;get_drvinfo) {</div><div class='del'>-		ops-&gt;get_drvinfo(dev, &amp;info);</div><div class='del'>-	} else if (dev-&gt;dev.parent &amp;&amp; dev-&gt;dev.parent-&gt;driver) {</div><div class='del'>-		strlcpy(info.bus_info, dev_name(dev-&gt;dev.parent),</div><div class='del'>-			sizeof(info.bus_info));</div><div class='del'>-		strlcpy(info.driver, dev-&gt;dev.parent-&gt;driver-&gt;name,</div><div class='del'>-			sizeof(info.driver));</div><div class='add'>+		ops-&gt;get_drvinfo(dev, &amp;rsp-&gt;info);</div><div class='add'>+		if (!rsp-&gt;info.bus_info[0] &amp;&amp; parent)</div><div class='add'>+			strscpy(rsp-&gt;info.bus_info, dev_name(parent),</div><div class='add'>+				sizeof(rsp-&gt;info.bus_info));</div><div class='add'>+		if (!rsp-&gt;info.driver[0] &amp;&amp; parent &amp;&amp; parent-&gt;driver)</div><div class='add'>+			strscpy(rsp-&gt;info.driver, parent-&gt;driver-&gt;name,</div><div class='add'>+				sizeof(rsp-&gt;info.driver));</div><div class='add'>+	} else if (parent &amp;&amp; parent-&gt;driver) {</div><div class='add'>+		strscpy(rsp-&gt;info.bus_info, dev_name(parent),</div><div class='add'>+			sizeof(rsp-&gt;info.bus_info));</div><div class='add'>+		strscpy(rsp-&gt;info.driver, parent-&gt;driver-&gt;name,</div><div class='add'>+			sizeof(rsp-&gt;info.driver));</div><div class='add'>+	} else if (dev-&gt;rtnl_link_ops) {</div><div class='add'>+		strscpy(rsp-&gt;info.driver, dev-&gt;rtnl_link_ops-&gt;kind,</div><div class='add'>+			sizeof(rsp-&gt;info.driver));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -872,21 +752,27 @@ static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		rc = ops-&gt;get_sset_count(dev, ETH_SS_TEST);</div><div class='ctx'> 		if (rc &gt;= 0)</div><div class='del'>-			info.testinfo_len = rc;</div><div class='add'>+			rsp-&gt;info.testinfo_len = rc;</div><div class='ctx'> 		rc = ops-&gt;get_sset_count(dev, ETH_SS_STATS);</div><div class='ctx'> 		if (rc &gt;= 0)</div><div class='del'>-			info.n_stats = rc;</div><div class='add'>+			rsp-&gt;info.n_stats = rc;</div><div class='ctx'> 		rc = ops-&gt;get_sset_count(dev, ETH_SS_PRIV_FLAGS);</div><div class='ctx'> 		if (rc &gt;= 0)</div><div class='del'>-			info.n_priv_flags = rc;</div><div class='add'>+			rsp-&gt;info.n_priv_flags = rc;</div><div class='add'>+	}</div><div class='add'>+	if (ops-&gt;get_regs_len) {</div><div class='add'>+		int ret = ops-&gt;get_regs_len(dev);</div><div class='add'>+</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			rsp-&gt;info.regdump_len = ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (ops-&gt;get_regs_len)</div><div class='del'>-		info.regdump_len = ops-&gt;get_regs_len(dev);</div><div class='add'>+</div><div class='ctx'> 	if (ops-&gt;get_eeprom_len)</div><div class='del'>-		info.eedump_len = ops-&gt;get_eeprom_len(dev);</div><div class='add'>+		rsp-&gt;info.eedump_len = ops-&gt;get_eeprom_len(dev);</div><div class='add'>+</div><div class='add'>+	if (!rsp-&gt;info.fw_version[0])</div><div class='add'>+		rsp-&gt;devlink = netdev_to_devlink_get(dev);</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(useraddr, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -936,7 +822,7 @@ static noinline_for_stack int ethtool_get_sset_info(struct net_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	useraddr += offsetof(struct ethtool_sset_info, data);</div><div class='del'>-	if (copy_to_user(useraddr, info_buf, idx * sizeof(u32)))</div><div class='add'>+	if (copy_to_user(useraddr, info_buf, array_size(idx, sizeof(u32))))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -946,75 +832,421 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,</div><div class='del'>-						u32 cmd, void __user *useraddr)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+ethtool_rxnfc_copy_from_compat(struct ethtool_rxnfc *rxnfc,</div><div class='add'>+			       const struct compat_ethtool_rxnfc __user *useraddr,</div><div class='add'>+			       size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_rxnfc info;</div><div class='del'>-	size_t info_size = sizeof(info);</div><div class='del'>-	int rc;</div><div class='add'>+	struct compat_ethtool_rxnfc crxnfc = {};</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;set_rxnfc)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	/* We expect there to be holes between fs.m_ext and</div><div class='add'>+	 * fs.ring_cookie and at the end of fs, but nowhere else.</div><div class='add'>+	 * On non-x86, no conversion should be needed.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(!IS_ENABLED(CONFIG_X86_64) &amp;&amp;</div><div class='add'>+		     sizeof(struct compat_ethtool_rxnfc) !=</div><div class='add'>+		     sizeof(struct ethtool_rxnfc));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct compat_ethtool_rxnfc, fs.m_ext) +</div><div class='add'>+		     sizeof(useraddr-&gt;fs.m_ext) !=</div><div class='add'>+		     offsetof(struct ethtool_rxnfc, fs.m_ext) +</div><div class='add'>+		     sizeof(rxnfc-&gt;fs.m_ext));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct compat_ethtool_rxnfc, fs.location) -</div><div class='add'>+		     offsetof(struct compat_ethtool_rxnfc, fs.ring_cookie) !=</div><div class='add'>+		     offsetof(struct ethtool_rxnfc, fs.location) -</div><div class='add'>+		     offsetof(struct ethtool_rxnfc, fs.ring_cookie));</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;crxnfc, useraddr, min(size, sizeof(crxnfc))))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	*rxnfc = (struct ethtool_rxnfc) {</div><div class='add'>+		.cmd		= crxnfc.cmd,</div><div class='add'>+		.flow_type	= crxnfc.flow_type,</div><div class='add'>+		.data		= crxnfc.data,</div><div class='add'>+		.fs		= {</div><div class='add'>+			.flow_type	= crxnfc.fs.flow_type,</div><div class='add'>+			.h_u		= crxnfc.fs.h_u,</div><div class='add'>+			.h_ext		= crxnfc.fs.h_ext,</div><div class='add'>+			.m_u		= crxnfc.fs.m_u,</div><div class='add'>+			.m_ext		= crxnfc.fs.m_ext,</div><div class='add'>+			.ring_cookie	= crxnfc.fs.ring_cookie,</div><div class='add'>+			.location	= crxnfc.fs.location,</div><div class='add'>+		},</div><div class='add'>+		.rule_cnt	= crxnfc.rule_cnt,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_rxnfc_copy_from_user(struct ethtool_rxnfc *rxnfc,</div><div class='add'>+					const void __user *useraddr,</div><div class='add'>+					size_t size)</div><div class='add'>+{</div><div class='add'>+	if (compat_need_64bit_alignment_fixup())</div><div class='add'>+		return ethtool_rxnfc_copy_from_compat(rxnfc, useraddr, size);</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(rxnfc, useraddr, size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int ethtool_rxnfc_copy_to_compat(void __user *useraddr,</div><div class='add'>+					const struct ethtool_rxnfc *rxnfc,</div><div class='add'>+					size_t size, const u32 *rule_buf)</div><div class='add'>+{</div><div class='add'>+	struct compat_ethtool_rxnfc crxnfc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;crxnfc, 0, sizeof(crxnfc));</div><div class='add'>+	crxnfc = (struct compat_ethtool_rxnfc) {</div><div class='add'>+		.cmd		= rxnfc-&gt;cmd,</div><div class='add'>+		.flow_type	= rxnfc-&gt;flow_type,</div><div class='add'>+		.data		= rxnfc-&gt;data,</div><div class='add'>+		.fs		= {</div><div class='add'>+			.flow_type	= rxnfc-&gt;fs.flow_type,</div><div class='add'>+			.h_u		= rxnfc-&gt;fs.h_u,</div><div class='add'>+			.h_ext		= rxnfc-&gt;fs.h_ext,</div><div class='add'>+			.m_u		= rxnfc-&gt;fs.m_u,</div><div class='add'>+			.m_ext		= rxnfc-&gt;fs.m_ext,</div><div class='add'>+			.ring_cookie	= rxnfc-&gt;fs.ring_cookie,</div><div class='add'>+			.location	= rxnfc-&gt;fs.location,</div><div class='add'>+		},</div><div class='add'>+		.rule_cnt	= rxnfc-&gt;rule_cnt,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(useraddr, &amp;crxnfc, min(size, sizeof(crxnfc))))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_rxnfc_copy_struct(u32 cmd, struct ethtool_rxnfc *info,</div><div class='add'>+				     size_t *info_size, void __user *useraddr)</div><div class='add'>+{</div><div class='ctx'> 	/* struct ethtool_rxnfc was originally defined for</div><div class='ctx'> 	 * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data</div><div class='ctx'> 	 * members.  User-space might still be using that</div><div class='del'>-	 * definition. */</div><div class='del'>-	if (cmd == ETHTOOL_SRXFH)</div><div class='del'>-		info_size = (offsetof(struct ethtool_rxnfc, data) +</div><div class='del'>-			     sizeof(info.data));</div><div class='add'>+	 * definition.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd == ETHTOOL_GRXFH || cmd == ETHTOOL_SRXFH)</div><div class='add'>+		*info_size = (offsetof(struct ethtool_rxnfc, data) +</div><div class='add'>+			      sizeof(info-&gt;data));</div><div class='add'>+</div><div class='add'>+	if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if ((cmd == ETHTOOL_GRXFH || cmd == ETHTOOL_SRXFH) &amp;&amp; info-&gt;flow_type &amp; FLOW_RSS) {</div><div class='add'>+		*info_size = sizeof(*info);</div><div class='add'>+		if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		/* Since malicious users may modify the original data,</div><div class='add'>+		 * we need to check whether FLOW_RSS is still requested.</div><div class='add'>+		 */</div><div class='add'>+		if (!(info-&gt;flow_type &amp; FLOW_RSS))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;cmd != cmd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_rxnfc_copy_to_user(void __user *useraddr,</div><div class='add'>+				      const struct ethtool_rxnfc *rxnfc,</div><div class='add'>+				      size_t size, const u32 *rule_buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, useraddr, info_size))</div><div class='add'>+	if (compat_need_64bit_alignment_fixup()) {</div><div class='add'>+		ret = ethtool_rxnfc_copy_to_compat(useraddr, rxnfc, size,</div><div class='add'>+						   rule_buf);</div><div class='add'>+		useraddr += offsetof(struct compat_ethtool_rxnfc, rule_locs);</div><div class='add'>+	} else {</div><div class='add'>+		ret = copy_to_user(useraddr, rxnfc, size);</div><div class='add'>+		useraddr += offsetof(struct ethtool_rxnfc, rule_locs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	rc = dev-&gt;ethtool_ops-&gt;set_rxnfc(dev, &amp;info);</div><div class='add'>+	if (rule_buf) {</div><div class='add'>+		if (copy_to_user(useraddr, rule_buf,</div><div class='add'>+				 rxnfc-&gt;rule_cnt * sizeof(u32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool flow_type_hashable(u32 flow_type)</div><div class='add'>+{</div><div class='add'>+	switch (flow_type) {</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+	case SCTP_V4_FLOW:</div><div class='add'>+	case AH_ESP_V4_FLOW:</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='add'>+	case AH_ESP_V6_FLOW:</div><div class='add'>+	case AH_V4_FLOW:</div><div class='add'>+	case ESP_V4_FLOW:</div><div class='add'>+	case AH_V6_FLOW:</div><div class='add'>+	case ESP_V6_FLOW:</div><div class='add'>+	case IPV4_FLOW:</div><div class='add'>+	case IPV6_FLOW:</div><div class='add'>+	case GTPU_V4_FLOW:</div><div class='add'>+	case GTPU_V6_FLOW:</div><div class='add'>+	case GTPC_V4_FLOW:</div><div class='add'>+	case GTPC_V6_FLOW:</div><div class='add'>+	case GTPC_TEID_V4_FLOW:</div><div class='add'>+	case GTPC_TEID_V6_FLOW:</div><div class='add'>+	case GTPU_EH_V4_FLOW:</div><div class='add'>+	case GTPU_EH_V6_FLOW:</div><div class='add'>+	case GTPU_UL_V4_FLOW:</div><div class='add'>+	case GTPU_UL_V6_FLOW:</div><div class='add'>+	case GTPU_DL_V4_FLOW:</div><div class='add'>+	case GTPU_DL_V6_FLOW:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool flow_type_v6(u32 flow_type)</div><div class='add'>+{</div><div class='add'>+	switch (flow_type) {</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='add'>+	case AH_ESP_V6_FLOW:</div><div class='add'>+	case AH_V6_FLOW:</div><div class='add'>+	case ESP_V6_FLOW:</div><div class='add'>+	case IPV6_FLOW:</div><div class='add'>+	case GTPU_V6_FLOW:</div><div class='add'>+	case GTPC_V6_FLOW:</div><div class='add'>+	case GTPC_TEID_V6_FLOW:</div><div class='add'>+	case GTPU_EH_V6_FLOW:</div><div class='add'>+	case GTPU_UL_V6_FLOW:</div><div class='add'>+	case GTPU_DL_V6_FLOW:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* When adding a new type, update the assert and, if it's hashable, add it to</div><div class='add'>+ * the flow_type_hashable switch case.</div><div class='add'>+ */</div><div class='add'>+static_assert(GTPU_DL_V6_FLOW + 1 == __FLOW_TYPE_COUNT);</div><div class='add'>+</div><div class='add'>+static int ethtool_check_xfrm_rxfh(u32 input_xfrm, u64 rxfh)</div><div class='add'>+{</div><div class='add'>+	/* Sanity check: if symmetric-xor/symmetric-or-xor is set, then:</div><div class='add'>+	 * 1 - no other fields besides IP src/dst and/or L4 src/dst are set</div><div class='add'>+	 * 2 - If src is set, dst must also be set</div><div class='add'>+	 */</div><div class='add'>+	if ((input_xfrm != RXH_XFRM_NO_CHANGE &amp;&amp;</div><div class='add'>+	     input_xfrm &amp; (RXH_XFRM_SYM_XOR | RXH_XFRM_SYM_OR_XOR)) &amp;&amp;</div><div class='add'>+	    !ethtool_rxfh_config_is_sym(rxfh))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_check_flow_types(struct net_device *dev, u32 input_xfrm)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	int err;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (!input_xfrm || input_xfrm == RXH_XFRM_NO_CHANGE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __FLOW_TYPE_COUNT; i++) {</div><div class='add'>+		struct ethtool_rxfh_fields fields = {</div><div class='add'>+			.flow_type	= i,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (!flow_type_hashable(i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ops-&gt;get_rxfh_fields(dev, &amp;fields))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = ethtool_check_xfrm_rxfh(input_xfrm, fields.data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+ethtool_set_rxfh_fields(struct net_device *dev, u32 cmd, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxfh_fields fields = {};</div><div class='add'>+	struct ethtool_rxnfc info;</div><div class='add'>+	size_t info_size = sizeof(info);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;set_rxfh_fields)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = ethtool_rxnfc_copy_struct(cmd, &amp;info, &amp;info_size, useraddr);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (cmd == ETHTOOL_SRXCLSRLINS &amp;&amp;</div><div class='del'>-	    copy_to_user(useraddr, &amp;info, info_size))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (info.data &amp; RXH_IP6_FL &amp;&amp; !flow_type_v6(info.flow_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info.flow_type &amp; FLOW_RSS &amp;&amp; info.rss_context &amp;&amp;</div><div class='add'>+	    !ops-&gt;rxfh_per_ctx_fields)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (ops-&gt;get_rxfh) {</div><div class='add'>+		struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+</div><div class='add'>+		rc = ops-&gt;get_rxfh(dev, &amp;rxfh);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit_unlock;</div><div class='add'>+</div><div class='add'>+		rc = ethtool_check_xfrm_rxfh(rxfh.input_xfrm, info.data);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	fields.data = info.data;</div><div class='add'>+	fields.flow_type = info.flow_type &amp; ~FLOW_RSS;</div><div class='add'>+	if (info.flow_type &amp; FLOW_RSS)</div><div class='add'>+		fields.rss_context = info.rss_context;</div><div class='add'>+</div><div class='add'>+	rc = ops-&gt;set_rxfh_fields(dev, &amp;fields, NULL);</div><div class='add'>+exit_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ethtool_rss_notify(dev, ETHTOOL_MSG_RSS_NTF, fields.rss_context);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,</div><div class='del'>-						u32 cmd, void __user *useraddr)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+ethtool_get_rxfh_fields(struct net_device *dev, u32 cmd, void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_rxnfc info;</div><div class='ctx'> 	size_t info_size = sizeof(info);</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxfh_fields fields = {};</div><div class='ctx'> 	int ret;</div><div class='del'>-	void *rule_buf = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!ops-&gt;get_rxnfc)</div><div class='add'>+	if (!ops-&gt;get_rxfh_fields)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* struct ethtool_rxnfc was originally defined for</div><div class='del'>-	 * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data</div><div class='del'>-	 * members.  User-space might still be using that</div><div class='del'>-	 * definition. */</div><div class='del'>-	if (cmd == ETHTOOL_GRXFH)</div><div class='del'>-		info_size = (offsetof(struct ethtool_rxnfc, data) +</div><div class='del'>-			     sizeof(info.data));</div><div class='add'>+	ret = ethtool_rxnfc_copy_struct(cmd, &amp;info, &amp;info_size, useraddr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, useraddr, info_size))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (info.flow_type &amp; FLOW_RSS &amp;&amp; info.rss_context &amp;&amp;</div><div class='add'>+	    !ops-&gt;rxfh_per_ctx_fields)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* If FLOW_RSS was requested then user-space must be using the</div><div class='del'>-	 * new definition, as FLOW_RSS is newer.</div><div class='del'>-	 */</div><div class='del'>-	if (cmd == ETHTOOL_GRXFH &amp;&amp; info.flow_type &amp; FLOW_RSS) {</div><div class='del'>-		info_size = sizeof(info);</div><div class='del'>-		if (copy_from_user(&amp;info, useraddr, info_size))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		/* Since malicious users may modify the original data,</div><div class='del'>-		 * we need to check whether FLOW_RSS is still requested.</div><div class='add'>+	fields.flow_type = info.flow_type &amp; ~FLOW_RSS;</div><div class='add'>+	if (info.flow_type &amp; FLOW_RSS)</div><div class='add'>+		fields.rss_context = info.rss_context;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ret = ops-&gt;get_rxfh_fields(dev, &amp;fields);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	info.data = fields.data;</div><div class='add'>+</div><div class='add'>+	return ethtool_rxnfc_copy_to_user(useraddr, &amp;info, info_size, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,</div><div class='add'>+						u32 cmd, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc info;</div><div class='add'>+	size_t info_size = sizeof(info);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;set_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = ethtool_rxnfc_copy_struct(cmd, &amp;info, &amp;info_size, useraddr);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (cmd == ETHTOOL_SRXCLSRLINS &amp;&amp; info.fs.flow_type &amp; FLOW_RSS) {</div><div class='add'>+		/* Nonzero ring with RSS only makes sense</div><div class='add'>+		 * if NIC adds them together</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(info.flow_type &amp; FLOW_RSS))</div><div class='add'>+		if (!ops-&gt;cap_rss_rxnfc_adds &amp;&amp;</div><div class='add'>+		    ethtool_get_flow_spec_ring(info.fs.ring_cookie))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (info.rss_context &amp;&amp;</div><div class='add'>+		    !xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, info.rss_context))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = ops-&gt;set_rxnfc(dev, &amp;info);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (cmd == ETHTOOL_SRXCLSRLINS &amp;&amp;</div><div class='add'>+	    ethtool_rxnfc_copy_to_user(useraddr, &amp;info, info_size, NULL))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int ethtool_get_rxrings(struct net_device *dev,</div><div class='add'>+						  u32 cmd,</div><div class='add'>+						  void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxnfc info;</div><div class='add'>+	size_t info_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	info_size = sizeof(info);</div><div class='add'>+	ret = ethtool_rxnfc_copy_struct(cmd, &amp;info, &amp;info_size, useraddr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ethtool_get_rx_ring_count(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	info.data = ret;</div><div class='add'>+</div><div class='add'>+	return ethtool_rxnfc_copy_to_user(useraddr, &amp;info, info_size, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,</div><div class='add'>+						u32 cmd, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxnfc info;</div><div class='add'>+	void *rule_buf = NULL;</div><div class='add'>+	size_t info_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_rxnfc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	info_size = sizeof(info);</div><div class='add'>+	ret = ethtool_rxnfc_copy_struct(cmd, &amp;info, &amp;info_size, useraddr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	if (info.cmd == ETHTOOL_GRXCLSRLALL) {</div><div class='ctx'> 		if (info.rule_cnt &gt; 0) {</div><div class='ctx'> 			if (info.rule_cnt &lt;= KMALLOC_MAX_SIZE / sizeof(u32))</div><div class='hunk'>@@ -1029,18 +1261,7 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	ret = -EFAULT;</div><div class='del'>-	if (copy_to_user(useraddr, &amp;info, info_size))</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	if (rule_buf) {</div><div class='del'>-		useraddr += offsetof(struct ethtool_rxnfc, rule_locs);</div><div class='del'>-		if (copy_to_user(useraddr, rule_buf,</div><div class='del'>-				 info.rule_cnt * sizeof(u32)))</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='add'>+	ret = ethtool_rxnfc_copy_to_user(useraddr, &amp;info, info_size, rule_buf);</div><div class='ctx'> err_out:</div><div class='ctx'> 	kfree(rule_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -1048,17 +1269,17 @@ err_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_copy_validate_indir(u32 *indir, void __user *useraddr,</div><div class='del'>-					struct ethtool_rxnfc *rx_rings,</div><div class='del'>-					u32 size)</div><div class='add'>+				       int num_rx_rings,</div><div class='add'>+				       u32 size)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(indir, useraddr, size * sizeof(indir[0])))</div><div class='add'>+	if (copy_from_user(indir, useraddr, array_size(size, sizeof(indir[0]))))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Validate ring indices */</div><div class='ctx'> 	for (i = 0; i &lt; size; i++)</div><div class='del'>-		if (indir[i] &gt;= rx_rings-&gt;data)</div><div class='add'>+		if (indir[i] &gt;= num_rx_rings)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1074,49 +1295,18 @@ void netdev_rss_key_fill(void *buffer, size_t len)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netdev_rss_key_fill);</div><div class='ctx'> </div><div class='del'>-static int ethtool_get_max_rxfh_channel(struct net_device *dev, u32 *max)</div><div class='del'>-{</div><div class='del'>-	u32 dev_size, current_max = 0;</div><div class='del'>-	u32 *indir;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size ||</div><div class='del'>-	    !dev-&gt;ethtool_ops-&gt;get_rxfh)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	dev_size = dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size(dev);</div><div class='del'>-	if (dev_size == 0)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	indir = kcalloc(dev_size, sizeof(indir[0]), GFP_USER);</div><div class='del'>-	if (!indir)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, indir, NULL, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	while (dev_size--)</div><div class='del'>-		current_max = max(current_max, indir[dev_size]);</div><div class='del'>-</div><div class='del'>-	*max = current_max;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(indir);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 						     void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	u32 user_size, dev_size;</div><div class='del'>-	u32 *indir;</div><div class='add'>+	struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+	u32 user_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size ||</div><div class='ctx'> 	    !dev-&gt;ethtool_ops-&gt;get_rxfh)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	dev_size = dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size(dev);</div><div class='del'>-	if (dev_size == 0)</div><div class='add'>+	rxfh.indir_size = dev-&gt;ethtool_ops-&gt;get_rxfh_indir_size(dev);</div><div class='add'>+	if (rxfh.indir_size == 0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;user_size,</div><div class='hunk'>@@ -1125,50 +1315,51 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr + offsetof(struct ethtool_rxfh_indir, size),</div><div class='del'>-			 &amp;dev_size, sizeof(dev_size)))</div><div class='add'>+			 &amp;rxfh.indir_size, sizeof(rxfh.indir_size)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* If the user buffer size is 0, this is just a query for the</div><div class='ctx'> 	 * device table size.  Otherwise, if it's smaller than the</div><div class='ctx'> 	 * device table size it's an error.</div><div class='ctx'> 	 */</div><div class='del'>-	if (user_size &lt; dev_size)</div><div class='add'>+	if (user_size &lt; rxfh.indir_size)</div><div class='ctx'> 		return user_size == 0 ? 0 : -EINVAL;</div><div class='ctx'> </div><div class='del'>-	indir = kcalloc(dev_size, sizeof(indir[0]), GFP_USER);</div><div class='del'>-	if (!indir)</div><div class='add'>+	rxfh.indir = kcalloc(rxfh.indir_size, sizeof(rxfh.indir[0]), GFP_USER);</div><div class='add'>+	if (!rxfh.indir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, indir, NULL, NULL);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, &amp;rxfh);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (copy_to_user(useraddr +</div><div class='ctx'> 			 offsetof(struct ethtool_rxfh_indir, ring_index[0]),</div><div class='del'>-			 indir, dev_size * sizeof(indir[0])))</div><div class='add'>+			 rxfh.indir, rxfh.indir_size * sizeof(*rxfh.indir)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(indir);</div><div class='add'>+	kfree(rxfh.indir);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 						     void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_rxnfc rx_rings;</div><div class='del'>-	u32 user_size, dev_size, i;</div><div class='del'>-	u32 *indir;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxfh_param rxfh_dev = {};</div><div class='add'>+	struct netlink_ext_ack *extack = NULL;</div><div class='add'>+	int num_rx_rings;</div><div class='add'>+	u32 user_size, i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 ringidx_offset = offsetof(struct ethtool_rxfh_indir, ring_index[0]);</div><div class='ctx'> </div><div class='del'>-	if (!ops-&gt;get_rxfh_indir_size || !ops-&gt;set_rxfh ||</div><div class='del'>-	    !ops-&gt;get_rxnfc)</div><div class='add'>+	if (!ops-&gt;get_rxfh_indir_size || !ops-&gt;set_rxfh)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	dev_size = ops-&gt;get_rxfh_indir_size(dev);</div><div class='del'>-	if (dev_size == 0)</div><div class='add'>+	rxfh_dev.indir_size = ops-&gt;get_rxfh_indir_size(dev);</div><div class='add'>+	if (rxfh_dev.indir_size == 0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;user_size,</div><div class='hunk'>@@ -1176,33 +1367,40 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 			   sizeof(user_size)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (user_size != 0 &amp;&amp; user_size != dev_size)</div><div class='add'>+	if (user_size != 0 &amp;&amp; user_size != rxfh_dev.indir_size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	indir = kcalloc(dev_size, sizeof(indir[0]), GFP_USER);</div><div class='del'>-	if (!indir)</div><div class='add'>+	rxfh_dev.indir = kcalloc(rxfh_dev.indir_size,</div><div class='add'>+				 sizeof(rxfh_dev.indir[0]), GFP_USER);</div><div class='add'>+	if (!rxfh_dev.indir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rx_rings.cmd = ETHTOOL_GRXRINGS;</div><div class='del'>-	ret = ops-&gt;get_rxnfc(dev, &amp;rx_rings, NULL);</div><div class='del'>-	if (ret)</div><div class='add'>+	num_rx_rings = ethtool_get_rx_ring_count(dev);</div><div class='add'>+	if (num_rx_rings &lt; 0) {</div><div class='add'>+		ret = num_rx_rings;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (user_size == 0) {</div><div class='del'>-		for (i = 0; i &lt; dev_size; i++)</div><div class='del'>-			indir[i] = ethtool_rxfh_indir_default(i, rx_rings.data);</div><div class='add'>+		u32 *indir = rxfh_dev.indir;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; rxfh_dev.indir_size; i++)</div><div class='add'>+			indir[i] = ethtool_rxfh_indir_default(i, num_rx_rings);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = ethtool_copy_validate_indir(indir,</div><div class='add'>+		ret = ethtool_copy_validate_indir(rxfh_dev.indir,</div><div class='ctx'> 						  useraddr + ringidx_offset,</div><div class='del'>-						  &amp;rx_rings,</div><div class='del'>-						  dev_size);</div><div class='add'>+						  num_rx_rings,</div><div class='add'>+						  rxfh_dev.indir_size);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ops-&gt;set_rxfh(dev, indir, NULL, ETH_RSS_HASH_NO_CHANGE);</div><div class='add'>+	rxfh_dev.hfunc = ETH_RSS_HASH_NO_CHANGE;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ret = ops-&gt;set_rxfh(dev, &amp;rxfh_dev, extack);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* indicate whether rxfh was set to default */</div><div class='ctx'> 	if (user_size == 0)</div><div class='hunk'>@@ -1210,33 +1408,33 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		dev-&gt;priv_flags |= IFF_RXFH_CONFIGURED;</div><div class='ctx'> </div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='ctx'> out:</div><div class='del'>-	kfree(indir);</div><div class='add'>+	kfree(rxfh_dev.indir);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,</div><div class='ctx'> 					       void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxfh_param rxfh_dev = {};</div><div class='ctx'> 	u32 user_indir_size, user_key_size;</div><div class='del'>-	u32 dev_indir_size = 0, dev_key_size = 0;</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='ctx'> 	struct ethtool_rxfh rxfh;</div><div class='del'>-	u32 total_size;</div><div class='ctx'> 	u32 indir_bytes;</div><div class='del'>-	u32 *indir = NULL;</div><div class='del'>-	u8 dev_hfunc = 0;</div><div class='del'>-	u8 *hkey = NULL;</div><div class='ctx'> 	u8 *rss_config;</div><div class='add'>+	u32 total_size;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ops-&gt;get_rxfh)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;get_rxfh_indir_size)</div><div class='del'>-		dev_indir_size = ops-&gt;get_rxfh_indir_size(dev);</div><div class='add'>+		rxfh_dev.indir_size = ops-&gt;get_rxfh_indir_size(dev);</div><div class='ctx'> 	if (ops-&gt;get_rxfh_key_size)</div><div class='del'>-		dev_key_size = ops-&gt;get_rxfh_key_size(dev);</div><div class='add'>+		rxfh_dev.key_size = ops-&gt;get_rxfh_key_size(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;rxfh, useraddr, sizeof(rxfh)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1244,44 +1442,72 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,</div><div class='ctx'> 	user_key_size = rxfh.key_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Check that reserved fields are 0 for now */</div><div class='del'>-	if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd8[2] || rxfh.rsvd32)</div><div class='add'>+	if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd32)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	/* Most drivers don't handle rss_context, check it's 0 as well */</div><div class='del'>-	if (rxfh.rss_context &amp;&amp; !ops-&gt;get_rxfh_context)</div><div class='add'>+	if (rxfh.rss_context &amp;&amp; !ops-&gt;create_rxfh_context)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rxfh.indir_size = dev_indir_size;</div><div class='del'>-	rxfh.key_size = dev_key_size;</div><div class='add'>+	rxfh.indir_size = rxfh_dev.indir_size;</div><div class='add'>+	rxfh.key_size = rxfh_dev.key_size;</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;rxfh, sizeof(rxfh)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if ((user_indir_size &amp;&amp; (user_indir_size != dev_indir_size)) ||</div><div class='del'>-	    (user_key_size &amp;&amp; (user_key_size != dev_key_size)))</div><div class='add'>+	if ((user_indir_size &amp;&amp; user_indir_size != rxfh_dev.indir_size) ||</div><div class='add'>+	    (user_key_size &amp;&amp; user_key_size != rxfh_dev.key_size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	indir_bytes = user_indir_size * sizeof(indir[0]);</div><div class='add'>+	indir_bytes = user_indir_size * sizeof(rxfh_dev.indir[0]);</div><div class='ctx'> 	total_size = indir_bytes + user_key_size;</div><div class='ctx'> 	rss_config = kzalloc(total_size, GFP_USER);</div><div class='ctx'> 	if (!rss_config)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (user_indir_size)</div><div class='del'>-		indir = (u32 *)rss_config;</div><div class='add'>+		rxfh_dev.indir = (u32 *)rss_config;</div><div class='ctx'> </div><div class='ctx'> 	if (user_key_size)</div><div class='del'>-		hkey = rss_config + indir_bytes;</div><div class='add'>+		rxfh_dev.key = rss_config + indir_bytes;</div><div class='ctx'> </div><div class='del'>-	if (rxfh.rss_context)</div><div class='del'>-		ret = dev-&gt;ethtool_ops-&gt;get_rxfh_context(dev, indir, hkey,</div><div class='del'>-							 &amp;dev_hfunc,</div><div class='del'>-							 rxfh.rss_context);</div><div class='del'>-	else</div><div class='del'>-		ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, indir, hkey, &amp;dev_hfunc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (rxfh.rss_context) {</div><div class='add'>+		ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, rxfh.rss_context);</div><div class='add'>+		if (!ctx) {</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (rxfh_dev.indir)</div><div class='add'>+			memcpy(rxfh_dev.indir, ethtool_rxfh_context_indir(ctx),</div><div class='add'>+			       indir_bytes);</div><div class='add'>+		if (!ops-&gt;rxfh_per_ctx_key) {</div><div class='add'>+			rxfh_dev.key_size = 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (rxfh_dev.key)</div><div class='add'>+				memcpy(rxfh_dev.key,</div><div class='add'>+				       ethtool_rxfh_context_key(ctx),</div><div class='add'>+				       user_key_size);</div><div class='add'>+			rxfh_dev.hfunc = ctx-&gt;hfunc;</div><div class='add'>+		}</div><div class='add'>+		rxfh_dev.input_xfrm = ctx-&gt;input_xfrm;</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ret = dev-&gt;ethtool_ops-&gt;get_rxfh(dev, &amp;rxfh_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr + offsetof(struct ethtool_rxfh, hfunc),</div><div class='del'>-			 &amp;dev_hfunc, sizeof(rxfh.hfunc))) {</div><div class='add'>+			 &amp;rxfh_dev.hfunc, sizeof(rxfh.hfunc))) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	} else if (copy_to_user(useraddr +</div><div class='add'>+				offsetof(struct ethtool_rxfh, input_xfrm),</div><div class='add'>+				&amp;rxfh_dev.input_xfrm,</div><div class='add'>+				sizeof(rxfh.input_xfrm))) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	} else if (copy_to_user(useraddr +</div><div class='add'>+				offsetof(struct ethtool_rxfh, key_size),</div><div class='add'>+				&amp;rxfh_dev.key_size,</div><div class='add'>+				sizeof(rxfh.key_size))) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	} else if (copy_to_user(useraddr +</div><div class='ctx'> 			      offsetof(struct ethtool_rxfh, rss_config[0]),</div><div class='hunk'>@@ -1289,6 +1515,7 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='ctx'> 	kfree(rss_config);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1297,18 +1524,21 @@ out:</div><div class='ctx'> static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,</div><div class='ctx'> 					       void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	u32 rss_cfg_offset = offsetof(struct ethtool_rxfh, rss_config[0]);</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='del'>-	struct ethtool_rxnfc rx_rings;</div><div class='del'>-	struct ethtool_rxfh rxfh;</div><div class='ctx'> 	u32 dev_indir_size = 0, dev_key_size = 0, i;</div><div class='del'>-	u32 *indir = NULL, indir_bytes = 0;</div><div class='del'>-	u8 *hkey = NULL;</div><div class='add'>+	u32 user_indir_len = 0, indir_bytes = 0;</div><div class='add'>+	struct ethtool_rxfh_param rxfh_dev = {};</div><div class='add'>+	struct ethtool_rxfh_context *ctx = NULL;</div><div class='add'>+	struct netlink_ext_ack *extack = NULL;</div><div class='add'>+	struct ethtool_rxfh rxfh;</div><div class='add'>+	bool create = false;</div><div class='add'>+	int num_rx_rings;</div><div class='ctx'> 	u8 *rss_config;</div><div class='del'>-	u32 rss_cfg_offset = offsetof(struct ethtool_rxfh, rss_config[0]);</div><div class='del'>-	bool delete = false;</div><div class='add'>+	int ntf = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!ops-&gt;get_rxnfc || !ops-&gt;set_rxfh)</div><div class='add'>+	if (!ops-&gt;set_rxfh)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;get_rxfh_indir_size)</div><div class='hunk'>@@ -1320,34 +1550,55 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Check that reserved fields are 0 for now */</div><div class='del'>-	if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd8[2] || rxfh.rsvd32)</div><div class='add'>+	if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd32)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	/* Most drivers don't handle rss_context, check it's 0 as well */</div><div class='del'>-	if (rxfh.rss_context &amp;&amp; !ops-&gt;set_rxfh_context)</div><div class='add'>+	if (rxfh.rss_context &amp;&amp; !ops-&gt;create_rxfh_context)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	/* Check input data transformation capabilities */</div><div class='add'>+	if (rxfh.input_xfrm &amp;&amp; rxfh.input_xfrm != RXH_XFRM_SYM_XOR &amp;&amp;</div><div class='add'>+	    rxfh.input_xfrm != RXH_XFRM_SYM_OR_XOR &amp;&amp;</div><div class='add'>+	    rxfh.input_xfrm != RXH_XFRM_NO_CHANGE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (rxfh.input_xfrm != RXH_XFRM_NO_CHANGE &amp;&amp;</div><div class='add'>+	    rxfh.input_xfrm &amp; ~ops-&gt;supported_input_xfrm)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='add'>+	create = rxfh.rss_context == ETH_RXFH_CONTEXT_ALLOC;</div><div class='ctx'> </div><div class='del'>-	/* If either indir, hash key or function is valid, proceed further.</div><div class='del'>-	 * Must request at least one change: indir size, hash key or function.</div><div class='del'>-	 */</div><div class='ctx'> 	if ((rxfh.indir_size &amp;&amp;</div><div class='ctx'> 	     rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE &amp;&amp;</div><div class='ctx'> 	     rxfh.indir_size != dev_indir_size) ||</div><div class='del'>-	    (rxfh.key_size &amp;&amp; (rxfh.key_size != dev_key_size)) ||</div><div class='add'>+	    (rxfh.key_size &amp;&amp; rxfh.key_size != dev_key_size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Must request at least one change: indir size, hash key, function</div><div class='add'>+	 * or input transformation.</div><div class='add'>+	 * There's no need for any of it in case of context creation.</div><div class='add'>+	 */</div><div class='add'>+	if (!create &amp;&amp;</div><div class='ctx'> 	    (rxfh.indir_size == ETH_RXFH_INDIR_NO_CHANGE &amp;&amp;</div><div class='del'>-	     rxfh.key_size == 0 &amp;&amp; rxfh.hfunc == ETH_RSS_HASH_NO_CHANGE))</div><div class='add'>+	     rxfh.key_size == 0 &amp;&amp; rxfh.hfunc == ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	     rxfh.input_xfrm == RXH_XFRM_NO_CHANGE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE)</div><div class='del'>-		indir_bytes = dev_indir_size * sizeof(indir[0]);</div><div class='add'>+	indir_bytes = dev_indir_size * sizeof(rxfh_dev.indir[0]);</div><div class='add'>+</div><div class='add'>+	/* Check settings which may be global rather than per RSS-context */</div><div class='add'>+	if (rxfh.rss_context &amp;&amp; !ops-&gt;rxfh_per_ctx_key)</div><div class='add'>+		if (rxfh.key_size ||</div><div class='add'>+		    (rxfh.hfunc &amp;&amp; rxfh.hfunc != ETH_RSS_HASH_NO_CHANGE) ||</div><div class='add'>+		    (rxfh.input_xfrm &amp;&amp; rxfh.input_xfrm != RXH_XFRM_NO_CHANGE))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rss_config = kzalloc(indir_bytes + rxfh.key_size, GFP_USER);</div><div class='add'>+	rss_config = kzalloc(indir_bytes + dev_key_size, GFP_USER);</div><div class='ctx'> 	if (!rss_config)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rx_rings.cmd = ETHTOOL_GRXRINGS;</div><div class='del'>-	ret = ops-&gt;get_rxnfc(dev, &amp;rx_rings, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	num_rx_rings = ethtool_get_rx_ring_count(dev);</div><div class='add'>+	if (num_rx_rings &lt; 0) {</div><div class='add'>+		ret = num_rx_rings;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* rxfh.indir_size == 0 means reset the indir table to default (master</div><div class='ctx'> 	 * context) or delete the context (other RSS contexts).</div><div class='hunk'>@@ -1355,55 +1606,154 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rxfh.indir_size &amp;&amp;</div><div class='ctx'> 	    rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE) {</div><div class='del'>-		indir = (u32 *)rss_config;</div><div class='del'>-		ret = ethtool_copy_validate_indir(indir,</div><div class='add'>+		user_indir_len = indir_bytes;</div><div class='add'>+		rxfh_dev.indir = (u32 *)rss_config;</div><div class='add'>+		rxfh_dev.indir_size = dev_indir_size;</div><div class='add'>+		ret = ethtool_copy_validate_indir(rxfh_dev.indir,</div><div class='ctx'> 						  useraddr + rss_cfg_offset,</div><div class='del'>-						  &amp;rx_rings,</div><div class='add'>+						  num_rx_rings,</div><div class='ctx'> 						  rxfh.indir_size);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_free;</div><div class='ctx'> 	} else if (rxfh.indir_size == 0) {</div><div class='ctx'> 		if (rxfh.rss_context == 0) {</div><div class='del'>-			indir = (u32 *)rss_config;</div><div class='add'>+			u32 *indir;</div><div class='add'>+</div><div class='add'>+			rxfh_dev.indir = (u32 *)rss_config;</div><div class='add'>+			rxfh_dev.indir_size = dev_indir_size;</div><div class='add'>+			indir = rxfh_dev.indir;</div><div class='ctx'> 			for (i = 0; i &lt; dev_indir_size; i++)</div><div class='del'>-				indir[i] = ethtool_rxfh_indir_default(i, rx_rings.data);</div><div class='add'>+				indir[i] =</div><div class='add'>+					ethtool_rxfh_indir_default(i, num_rx_rings);</div><div class='ctx'> 		} else {</div><div class='del'>-			delete = true;</div><div class='add'>+			rxfh_dev.rss_delete = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rxfh.key_size) {</div><div class='del'>-		hkey = rss_config + indir_bytes;</div><div class='del'>-		if (copy_from_user(hkey,</div><div class='del'>-				   useraddr + rss_cfg_offset + indir_bytes,</div><div class='add'>+		rxfh_dev.key_size = dev_key_size;</div><div class='add'>+		rxfh_dev.key = rss_config + indir_bytes;</div><div class='add'>+		if (copy_from_user(rxfh_dev.key,</div><div class='add'>+				   useraddr + rss_cfg_offset + user_indir_len,</div><div class='ctx'> 				   rxfh.key_size)) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rxfh.rss_context)</div><div class='del'>-		ret = ops-&gt;set_rxfh_context(dev, indir, hkey, rxfh.hfunc,</div><div class='del'>-					    &amp;rxfh.rss_context, delete);</div><div class='del'>-	else</div><div class='del'>-		ret = ops-&gt;set_rxfh(dev, indir, hkey, rxfh.hfunc);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+</div><div class='add'>+	ret = ethtool_check_flow_types(dev, rxfh.input_xfrm);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (rxfh.rss_context &amp;&amp; rxfh_dev.rss_delete) {</div><div class='add'>+		ret = ethtool_check_rss_ctx_busy(dev, rxfh.rss_context);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (create) {</div><div class='add'>+		u32 limit, ctx_id;</div><div class='add'>+</div><div class='add'>+		if (rxfh_dev.rss_delete) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+		ctx = ethtool_rxfh_ctx_alloc(ops, dev_indir_size, dev_key_size);</div><div class='add'>+		if (!ctx) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		limit = ops-&gt;rxfh_max_num_contexts ?: U32_MAX;</div><div class='add'>+		ret = xa_alloc(&amp;dev-&gt;ethtool-&gt;rss_ctx, &amp;ctx_id, ctx,</div><div class='add'>+			       XA_LIMIT(1, limit - 1), GFP_KERNEL_ACCOUNT);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			kfree(ctx);</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+		WARN_ON(!ctx_id); /* can't happen */</div><div class='add'>+		rxfh.rss_context = ctx_id;</div><div class='add'>+	} else if (rxfh.rss_context) {</div><div class='add'>+		ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, rxfh.rss_context);</div><div class='add'>+		if (!ctx) {</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rxfh_dev.hfunc = rxfh.hfunc;</div><div class='add'>+	rxfh_dev.rss_context = rxfh.rss_context;</div><div class='add'>+	rxfh_dev.input_xfrm = rxfh.input_xfrm;</div><div class='add'>+</div><div class='add'>+	if (!rxfh.rss_context) {</div><div class='add'>+		ntf = ETHTOOL_MSG_RSS_NTF;</div><div class='add'>+		ret = ops-&gt;set_rxfh(dev, &amp;rxfh_dev, extack);</div><div class='add'>+	} else if (create) {</div><div class='add'>+		ntf = ETHTOOL_MSG_RSS_CREATE_NTF;</div><div class='add'>+		ret = ops-&gt;create_rxfh_context(dev, ctx, &amp;rxfh_dev, extack);</div><div class='add'>+		/* Make sure driver populates defaults */</div><div class='add'>+		WARN_ON_ONCE(!ret &amp;&amp; !rxfh_dev.key &amp;&amp; ops-&gt;rxfh_per_ctx_key &amp;&amp;</div><div class='add'>+			     !memchr_inv(ethtool_rxfh_context_key(ctx), 0,</div><div class='add'>+					 ctx-&gt;key_size));</div><div class='add'>+	} else if (rxfh_dev.rss_delete) {</div><div class='add'>+		ntf = ETHTOOL_MSG_RSS_DELETE_NTF;</div><div class='add'>+		ret = ops-&gt;remove_rxfh_context(dev, ctx, rxfh.rss_context,</div><div class='add'>+					       extack);</div><div class='add'>+	} else {</div><div class='add'>+		ntf = ETHTOOL_MSG_RSS_NTF;</div><div class='add'>+		ret = ops-&gt;modify_rxfh_context(dev, ctx, &amp;rxfh_dev, extack);</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		ntf = 0;</div><div class='add'>+		if (create) {</div><div class='add'>+			/* failed to create, free our new tracking entry */</div><div class='add'>+			xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, rxfh.rss_context);</div><div class='add'>+			kfree(ctx);</div><div class='add'>+		}</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr + offsetof(struct ethtool_rxfh, rss_context),</div><div class='del'>-			 &amp;rxfh.rss_context, sizeof(rxfh.rss_context)))</div><div class='add'>+			 &amp;rxfh_dev.rss_context, sizeof(rxfh_dev.rss_context)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (!rxfh.rss_context) {</div><div class='add'>+	if (!rxfh_dev.rss_context) {</div><div class='ctx'> 		/* indicate whether rxfh was set to default */</div><div class='ctx'> 		if (rxfh.indir_size == 0)</div><div class='ctx'> 			dev-&gt;priv_flags &amp;= ~IFF_RXFH_CONFIGURED;</div><div class='ctx'> 		else if (rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE)</div><div class='ctx'> 			dev-&gt;priv_flags |= IFF_RXFH_CONFIGURED;</div><div class='ctx'> 	}</div><div class='add'>+	/* Update rss_ctx tracking */</div><div class='add'>+	if (rxfh_dev.rss_delete) {</div><div class='add'>+		WARN_ON(xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, rxfh.rss_context) != ctx);</div><div class='add'>+		kfree(ctx);</div><div class='add'>+	} else if (ctx) {</div><div class='add'>+		if (rxfh_dev.indir) {</div><div class='add'>+			for (i = 0; i &lt; dev_indir_size; i++)</div><div class='add'>+				ethtool_rxfh_context_indir(ctx)[i] = rxfh_dev.indir[i];</div><div class='add'>+			ctx-&gt;indir_configured =</div><div class='add'>+				rxfh.indir_size &amp;&amp;</div><div class='add'>+				rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE;</div><div class='add'>+		}</div><div class='add'>+		if (rxfh_dev.key) {</div><div class='add'>+			memcpy(ethtool_rxfh_context_key(ctx), rxfh_dev.key,</div><div class='add'>+			       dev_key_size);</div><div class='add'>+			ctx-&gt;key_configured = !!rxfh.key_size;</div><div class='add'>+		}</div><div class='add'>+		if (rxfh_dev.hfunc != ETH_RSS_HASH_NO_CHANGE)</div><div class='add'>+			ctx-&gt;hfunc = rxfh_dev.hfunc;</div><div class='add'>+		if (rxfh_dev.input_xfrm != RXH_XFRM_NO_CHANGE)</div><div class='add'>+			ctx-&gt;input_xfrm = rxfh_dev.input_xfrm;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+out_free:</div><div class='ctx'> 	kfree(rss_config);</div><div class='add'>+	if (ntf)</div><div class='add'>+		ethtool_rss_notify(dev, ntf, rxfh.rss_context);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1421,15 +1771,18 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	reglen = ops-&gt;get_regs_len(dev);</div><div class='add'>+	if (reglen &lt;= 0)</div><div class='add'>+		return reglen;</div><div class='add'>+</div><div class='ctx'> 	if (regs.len &gt; reglen)</div><div class='ctx'> 		regs.len = reglen;</div><div class='ctx'> </div><div class='del'>-	regbuf = NULL;</div><div class='del'>-	if (reglen) {</div><div class='del'>-		regbuf = vzalloc(reglen);</div><div class='del'>-		if (!regbuf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	regbuf = vzalloc(reglen);</div><div class='add'>+	if (!regbuf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (regs.len &lt; reglen)</div><div class='add'>+		reglen = regs.len;</div><div class='ctx'> </div><div class='ctx'> 	ops-&gt;get_regs(dev, &amp;regs, regbuf);</div><div class='ctx'> </div><div class='hunk'>@@ -1437,7 +1790,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;regs, sizeof(regs)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	useraddr += offsetof(struct ethtool_regs, data);</div><div class='del'>-	if (regbuf &amp;&amp; copy_to_user(useraddr, regbuf, regs.len))</div><div class='add'>+	if (copy_to_user(useraddr, regbuf, reglen))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1454,6 +1807,9 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;reset)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;reset, useraddr, sizeof(reset)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1468,11 +1824,13 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };</div><div class='add'>+	struct ethtool_wolinfo wol;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_wol)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;wol, 0, sizeof(struct ethtool_wolinfo));</div><div class='add'>+	wol.cmd = ETHTOOL_GWOL;</div><div class='ctx'> 	dev-&gt;ethtool_ops-&gt;get_wol(dev, &amp;wol);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;wol, sizeof(wol)))</div><div class='hunk'>@@ -1482,40 +1840,87 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int ethtool_set_wol(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_wolinfo wol;</div><div class='add'>+	struct ethtool_wolinfo wol, cur_wol;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;set_wol)</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_wol || !dev-&gt;ethtool_ops-&gt;set_wol)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cur_wol, 0, sizeof(struct ethtool_wolinfo));</div><div class='add'>+	cur_wol.cmd = ETHTOOL_GWOL;</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_wol(dev, &amp;cur_wol);</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;wol, useraddr, sizeof(wol)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	if (wol.wolopts &amp; ~cur_wol.supported)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (wol.wolopts == cur_wol.wolopts &amp;&amp;</div><div class='add'>+	    !memcmp(wol.sopass, cur_wol.sopass, sizeof(wol.sopass)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	ret = dev-&gt;ethtool_ops-&gt;set_wol(dev, &amp;wol);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;wol_enabled = !!wol.wolopts;</div><div class='add'>+	dev-&gt;ethtool-&gt;wol_enabled = !!wol.wolopts;</div><div class='add'>+	ethtool_notify(dev, ETHTOOL_MSG_WOL_NTF);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void eee_to_keee(struct ethtool_keee *keee,</div><div class='add'>+			const struct ethtool_eee *eee)</div><div class='add'>+{</div><div class='add'>+	memset(keee, 0, sizeof(*keee));</div><div class='add'>+</div><div class='add'>+	keee-&gt;eee_enabled = eee-&gt;eee_enabled;</div><div class='add'>+	keee-&gt;tx_lpi_enabled = eee-&gt;tx_lpi_enabled;</div><div class='add'>+	keee-&gt;tx_lpi_timer = eee-&gt;tx_lpi_timer;</div><div class='add'>+</div><div class='add'>+	ethtool_convert_legacy_u32_to_link_mode(keee-&gt;advertised,</div><div class='add'>+						eee-&gt;advertised);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void keee_to_eee(struct ethtool_eee *eee,</div><div class='add'>+			const struct ethtool_keee *keee)</div><div class='add'>+{</div><div class='add'>+	bool overflow;</div><div class='add'>+</div><div class='add'>+	memset(eee, 0, sizeof(*eee));</div><div class='add'>+</div><div class='add'>+	eee-&gt;eee_active = keee-&gt;eee_active;</div><div class='add'>+	eee-&gt;eee_enabled = keee-&gt;eee_enabled;</div><div class='add'>+	eee-&gt;tx_lpi_enabled = keee-&gt;tx_lpi_enabled;</div><div class='add'>+	eee-&gt;tx_lpi_timer = keee-&gt;tx_lpi_timer;</div><div class='add'>+</div><div class='add'>+	overflow = !ethtool_convert_link_mode_to_legacy_u32(&amp;eee-&gt;supported,</div><div class='add'>+							    keee-&gt;supported);</div><div class='add'>+	ethtool_convert_link_mode_to_legacy_u32(&amp;eee-&gt;advertised,</div><div class='add'>+						keee-&gt;advertised);</div><div class='add'>+	ethtool_convert_link_mode_to_legacy_u32(&amp;eee-&gt;lp_advertised,</div><div class='add'>+						keee-&gt;lp_advertised);</div><div class='add'>+	if (overflow)</div><div class='add'>+		pr_warn("Ethtool ioctl interface doesn't support passing EEE linkmodes beyond bit 32\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ethtool_get_eee(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_eee edata;</div><div class='add'>+	struct ethtool_keee keee;</div><div class='add'>+	struct ethtool_eee eee;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_eee)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;edata, 0, sizeof(struct ethtool_eee));</div><div class='del'>-	edata.cmd = ETHTOOL_GEEE;</div><div class='del'>-	rc = dev-&gt;ethtool_ops-&gt;get_eee(dev, &amp;edata);</div><div class='del'>-</div><div class='add'>+	memset(&amp;keee, 0, sizeof(keee));</div><div class='add'>+	rc = dev-&gt;ethtool_ops-&gt;get_eee(dev, &amp;keee);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(useraddr, &amp;edata, sizeof(edata)))</div><div class='add'>+	keee_to_eee(&amp;eee, &amp;keee);</div><div class='add'>+	if (copy_to_user(useraddr, &amp;eee, sizeof(eee)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1523,15 +1928,21 @@ static int ethtool_get_eee(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int ethtool_set_eee(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_eee edata;</div><div class='add'>+	struct ethtool_keee keee;</div><div class='add'>+	struct ethtool_eee eee;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;set_eee)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;edata, useraddr, sizeof(edata)))</div><div class='add'>+	if (copy_from_user(&amp;eee, useraddr, sizeof(eee)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_eee(dev, &amp;edata);</div><div class='add'>+	eee_to_keee(&amp;keee, &amp;eee);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_eee(dev, &amp;keee);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_EEE_NTF);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_nway_reset(struct net_device *dev)</div><div class='hunk'>@@ -1545,12 +1956,12 @@ static int ethtool_nway_reset(struct net_device *dev)</div><div class='ctx'> static int ethtool_get_link(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_value edata = { .cmd = ETHTOOL_GLINK };</div><div class='add'>+	int link = __ethtool_get_link(dev);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;get_link)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	edata.data = netif_running(dev) &amp;&amp; dev-&gt;ethtool_ops-&gt;get_link(dev);</div><div class='add'>+	if (link &lt; 0)</div><div class='add'>+		return link;</div><div class='ctx'> </div><div class='add'>+	edata.data = link;</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;edata, sizeof(edata)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1578,7 +1989,7 @@ static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr,</div><div class='ctx'> 	if (eeprom.offset + eeprom.len &gt; total_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(PAGE_SIZE, GFP_USER);</div><div class='add'>+	data = kzalloc(PAGE_SIZE, GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1589,6 +2000,10 @@ static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr,</div><div class='ctx'> 		ret = getter(dev, &amp;eeprom, data);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='add'>+		if (!eeprom.len) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (copy_to_user(userbuf, data, eeprom.len)) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1643,7 +2058,7 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (eeprom.offset + eeprom.len &gt; ops-&gt;get_eeprom_len(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(PAGE_SIZE, GFP_USER);</div><div class='add'>+	data = kzalloc(PAGE_SIZE, GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1671,39 +2086,115 @@ static noinline_for_stack int ethtool_get_coalesce(struct net_device *dev,</div><div class='ctx'> 						   void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_coalesce coalesce = { .cmd = ETHTOOL_GCOALESCE };</div><div class='add'>+	struct kernel_ethtool_coalesce kernel_coalesce = {};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_coalesce)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ethtool_ops-&gt;get_coalesce(dev, &amp;coalesce);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_coalesce(dev, &amp;coalesce, &amp;kernel_coalesce,</div><div class='add'>+					     NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;coalesce, sizeof(coalesce)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+ethtool_set_coalesce_supported(struct net_device *dev,</div><div class='add'>+			       struct ethtool_coalesce *coalesce)</div><div class='add'>+{</div><div class='add'>+	u32 supported_params = dev-&gt;ethtool_ops-&gt;supported_coalesce_params;</div><div class='add'>+	u32 nonzero_params = 0;</div><div class='add'>+</div><div class='add'>+	if (coalesce-&gt;rx_coalesce_usecs)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_USECS;</div><div class='add'>+	if (coalesce-&gt;rx_max_coalesced_frames)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_MAX_FRAMES;</div><div class='add'>+	if (coalesce-&gt;rx_coalesce_usecs_irq)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_USECS_IRQ;</div><div class='add'>+	if (coalesce-&gt;rx_max_coalesced_frames_irq)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ;</div><div class='add'>+	if (coalesce-&gt;tx_coalesce_usecs)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_USECS;</div><div class='add'>+	if (coalesce-&gt;tx_max_coalesced_frames)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_MAX_FRAMES;</div><div class='add'>+	if (coalesce-&gt;tx_coalesce_usecs_irq)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_USECS_IRQ;</div><div class='add'>+	if (coalesce-&gt;tx_max_coalesced_frames_irq)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_MAX_FRAMES_IRQ;</div><div class='add'>+	if (coalesce-&gt;stats_block_coalesce_usecs)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_STATS_BLOCK_USECS;</div><div class='add'>+	if (coalesce-&gt;use_adaptive_rx_coalesce)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_USE_ADAPTIVE_RX;</div><div class='add'>+	if (coalesce-&gt;use_adaptive_tx_coalesce)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_USE_ADAPTIVE_TX;</div><div class='add'>+	if (coalesce-&gt;pkt_rate_low)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_PKT_RATE_LOW;</div><div class='add'>+	if (coalesce-&gt;rx_coalesce_usecs_low)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_USECS_LOW;</div><div class='add'>+	if (coalesce-&gt;rx_max_coalesced_frames_low)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_MAX_FRAMES_LOW;</div><div class='add'>+	if (coalesce-&gt;tx_coalesce_usecs_low)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_USECS_LOW;</div><div class='add'>+	if (coalesce-&gt;tx_max_coalesced_frames_low)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_MAX_FRAMES_LOW;</div><div class='add'>+	if (coalesce-&gt;pkt_rate_high)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_PKT_RATE_HIGH;</div><div class='add'>+	if (coalesce-&gt;rx_coalesce_usecs_high)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_USECS_HIGH;</div><div class='add'>+	if (coalesce-&gt;rx_max_coalesced_frames_high)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RX_MAX_FRAMES_HIGH;</div><div class='add'>+	if (coalesce-&gt;tx_coalesce_usecs_high)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_USECS_HIGH;</div><div class='add'>+	if (coalesce-&gt;tx_max_coalesced_frames_high)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_TX_MAX_FRAMES_HIGH;</div><div class='add'>+	if (coalesce-&gt;rate_sample_interval)</div><div class='add'>+		nonzero_params |= ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL;</div><div class='add'>+</div><div class='add'>+	return (supported_params &amp; nonzero_params) == nonzero_params;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline_for_stack int ethtool_set_coalesce(struct net_device *dev,</div><div class='ctx'> 						   void __user *useraddr)</div><div class='ctx'> {</div><div class='add'>+	struct kernel_ethtool_coalesce kernel_coalesce = {};</div><div class='ctx'> 	struct ethtool_coalesce coalesce;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;set_coalesce)</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;set_coalesce || !dev-&gt;ethtool_ops-&gt;get_coalesce)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_coalesce(dev, &amp;coalesce, &amp;kernel_coalesce,</div><div class='add'>+					     NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;coalesce, useraddr, sizeof(coalesce)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_coalesce(dev, &amp;coalesce);</div><div class='add'>+	if (!ethtool_set_coalesce_supported(dev, &amp;coalesce))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_coalesce(dev, &amp;coalesce, &amp;kernel_coalesce,</div><div class='add'>+					     NULL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_COALESCE_NTF);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_get_ringparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_ringparam ringparam = { .cmd = ETHTOOL_GRINGPARAM };</div><div class='add'>+	struct kernel_ethtool_ringparam kernel_ringparam = {};</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_ringparam)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ethtool_ops-&gt;get_ringparam(dev, &amp;ringparam);</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_ringparam(dev, &amp;ringparam,</div><div class='add'>+					&amp;kernel_ringparam, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;ringparam, sizeof(ringparam)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1712,7 +2203,9 @@ static int ethtool_get_ringparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int ethtool_set_ringparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_ringparam ringparam, max = { .cmd = ETHTOOL_GRINGPARAM };</div><div class='add'>+	struct kernel_ethtool_ringparam kernel_ringparam;</div><div class='add'>+	struct ethtool_ringparam ringparam, max;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;set_ringparam || !dev-&gt;ethtool_ops-&gt;get_ringparam)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1720,7 +2213,7 @@ static int ethtool_set_ringparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (copy_from_user(&amp;ringparam, useraddr, sizeof(ringparam)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ethtool_ops-&gt;get_ringparam(dev, &amp;max);</div><div class='add'>+	ethtool_ringparam_get_cfg(dev, &amp;max, &amp;kernel_ringparam, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* ensure new ring parameters are within the maximums */</div><div class='ctx'> 	if (ringparam.rx_pending &gt; max.rx_max_pending ||</div><div class='hunk'>@@ -1729,7 +2222,11 @@ static int ethtool_set_ringparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	    ringparam.tx_pending &gt; max.tx_max_pending)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_ringparam(dev, &amp;ringparam);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_ringparam(dev, &amp;ringparam,</div><div class='add'>+					      &amp;kernel_ringparam, NULL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_RINGS_NTF);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack int ethtool_get_channels(struct net_device *dev,</div><div class='hunk'>@@ -1750,8 +2247,10 @@ static noinline_for_stack int ethtool_get_channels(struct net_device *dev,</div><div class='ctx'> static noinline_for_stack int ethtool_set_channels(struct net_device *dev,</div><div class='ctx'> 						   void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_channels channels, max = { .cmd = ETHTOOL_GCHANNELS };</div><div class='del'>-	u32 max_rx_in_use = 0;</div><div class='add'>+	struct ethtool_channels channels, curr = { .cmd = ETHTOOL_GCHANNELS };</div><div class='add'>+	u16 from_channel, to_channel;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;set_channels || !dev-&gt;ethtool_ops-&gt;get_channels)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1759,28 +2258,47 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev,</div><div class='ctx'> 	if (copy_from_user(&amp;channels, useraddr, sizeof(channels)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ethtool_ops-&gt;get_channels(dev, &amp;max);</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_channels(dev, &amp;curr);</div><div class='add'>+</div><div class='add'>+	if (channels.rx_count == curr.rx_count &amp;&amp;</div><div class='add'>+	    channels.tx_count == curr.tx_count &amp;&amp;</div><div class='add'>+	    channels.combined_count == curr.combined_count &amp;&amp;</div><div class='add'>+	    channels.other_count == curr.other_count)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* ensure new counts are within the maximums */</div><div class='del'>-	if ((channels.rx_count &gt; max.max_rx) ||</div><div class='del'>-	    (channels.tx_count &gt; max.max_tx) ||</div><div class='del'>-	    (channels.combined_count &gt; max.max_combined) ||</div><div class='del'>-	    (channels.other_count &gt; max.max_other))</div><div class='add'>+	if (channels.rx_count &gt; curr.max_rx ||</div><div class='add'>+	    channels.tx_count &gt; curr.max_tx ||</div><div class='add'>+	    channels.combined_count &gt; curr.max_combined ||</div><div class='add'>+	    channels.other_count &gt; curr.max_other)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* ensure the new Rx count fits within the configured Rx flow</div><div class='del'>-	 * indirection table settings */</div><div class='del'>-	if (netif_is_rxfh_configured(dev) &amp;&amp;</div><div class='del'>-	    !ethtool_get_max_rxfh_channel(dev, &amp;max_rx_in_use) &amp;&amp;</div><div class='del'>-	    (channels.combined_count + channels.rx_count) &lt;= max_rx_in_use)</div><div class='del'>-	    return -EINVAL;</div><div class='add'>+	/* ensure there is at least one RX and one TX channel */</div><div class='add'>+	if (!channels.combined_count &amp;&amp;</div><div class='add'>+	    (!channels.rx_count || !channels.tx_count))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = ethtool_check_max_channel(dev, channels, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Disabling channels, query zero-copy AF_XDP sockets */</div><div class='add'>+	from_channel = channels.combined_count +</div><div class='add'>+		min(channels.rx_count, channels.tx_count);</div><div class='add'>+	to_channel = curr.combined_count + max(curr.rx_count, curr.tx_count);</div><div class='add'>+	for (i = from_channel; i &lt; to_channel; i++)</div><div class='add'>+		if (xsk_get_pool_from_qid(dev, i))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_channels(dev, &amp;channels);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_channels(dev, &amp;channels);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_CHANNELS_NTF);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_get_pauseparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_pauseparam pauseparam = { ETHTOOL_GPAUSEPARAM };</div><div class='add'>+	struct ethtool_pauseparam pauseparam = { .cmd = ETHTOOL_GPAUSEPARAM };</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_pauseparam)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1795,6 +2313,7 @@ static int ethtool_get_pauseparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> static int ethtool_set_pauseparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_pauseparam pauseparam;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;set_pauseparam)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1802,7 +2321,10 @@ static int ethtool_set_pauseparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (copy_from_user(&amp;pauseparam, useraddr, sizeof(pauseparam)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;set_pauseparam(dev, &amp;pauseparam);</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_pauseparam(dev, &amp;pauseparam);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ethtool_notify(dev, ETHTOOL_MSG_PAUSE_NTF);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_self_test(struct net_device *dev, char __user *useraddr)</div><div class='hunk'>@@ -1824,17 +2346,19 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	test.len = test_len;</div><div class='del'>-	data = kmalloc_array(test_len, sizeof(u64), GFP_USER);</div><div class='add'>+	data = kcalloc(test_len, sizeof(u64), GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	netif_testing_on(dev);</div><div class='ctx'> 	ops-&gt;self_test(dev, &amp;test, data);</div><div class='add'>+	netif_testing_off(dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;test, sizeof(test)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	useraddr += sizeof(test);</div><div class='del'>-	if (copy_to_user(useraddr, data, test.len * sizeof(u64)))</div><div class='add'>+	if (copy_to_user(useraddr, data, array_size(test.len, sizeof(u64))))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1860,18 +2384,24 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	WARN_ON_ONCE(!ret);</div><div class='ctx'> </div><div class='ctx'> 	gstrings.len = ret;</div><div class='del'>-	data = vzalloc(array_size(gstrings.len, ETH_GSTRING_LEN));</div><div class='del'>-	if (gstrings.len &amp;&amp; !data)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	__ethtool_get_strings(dev, gstrings.string_set, data);</div><div class='add'>+	if (gstrings.len) {</div><div class='add'>+		data = vzalloc(array_size(gstrings.len, ETH_GSTRING_LEN));</div><div class='add'>+		if (!data)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		__ethtool_get_strings(dev, gstrings.string_set, data);</div><div class='add'>+	} else {</div><div class='add'>+		data = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;gstrings, sizeof(gstrings)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	useraddr += sizeof(gstrings);</div><div class='ctx'> 	if (gstrings.len &amp;&amp;</div><div class='del'>-	    copy_to_user(useraddr, data, gstrings.len * ETH_GSTRING_LEN))</div><div class='add'>+	    copy_to_user(useraddr, data,</div><div class='add'>+			 array_size(gstrings.len, ETH_GSTRING_LEN)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1880,11 +2410,31 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vsnprintf(*data, ETH_GSTRING_LEN, fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+	*data += ETH_GSTRING_LEN;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_sprintf);</div><div class='add'>+</div><div class='add'>+void ethtool_puts(u8 **data, const char *str)</div><div class='add'>+{</div><div class='add'>+	strscpy(*data, str, ETH_GSTRING_LEN);</div><div class='add'>+	*data += ETH_GSTRING_LEN;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_puts);</div><div class='add'>+</div><div class='ctx'> static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_value id;</div><div class='ctx'> 	static bool busy;</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!ops-&gt;set_phys_id)</div><div class='hunk'>@@ -1904,7 +2454,8 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	 * removal of the device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	busy = true;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (rc == 0) {</div><div class='hunk'>@@ -1913,27 +2464,26 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 			id.data ? (id.data * HZ) : MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Driver expects to be called at twice the frequency in rc */</div><div class='del'>-		int n = rc * 2, i, interval = HZ / n;</div><div class='add'>+		int n = rc * 2, interval = HZ / n;</div><div class='add'>+		u64 count = mul_u32_u32(n, id.data);</div><div class='add'>+		u64 i = 0;</div><div class='ctx'> </div><div class='del'>-		/* Count down seconds */</div><div class='ctx'> 		do {</div><div class='del'>-			/* Count down iterations per second */</div><div class='del'>-			i = n;</div><div class='del'>-			do {</div><div class='del'>-				rtnl_lock();</div><div class='del'>-				rc = ops-&gt;set_phys_id(dev,</div><div class='del'>-				    (i &amp; 1) ? ETHTOOL_ID_OFF : ETHTOOL_ID_ON);</div><div class='del'>-				rtnl_unlock();</div><div class='del'>-				if (rc)</div><div class='del'>-					break;</div><div class='del'>-				schedule_timeout_interruptible(interval);</div><div class='del'>-			} while (!signal_pending(current) &amp;&amp; --i != 0);</div><div class='del'>-		} while (!signal_pending(current) &amp;&amp;</div><div class='del'>-			 (id.data == 0 || --id.data != 0));</div><div class='add'>+			rtnl_lock();</div><div class='add'>+			netdev_lock_ops(dev);</div><div class='add'>+			rc = ops-&gt;set_phys_id(dev,</div><div class='add'>+				    (i++ &amp; 1) ? ETHTOOL_ID_OFF : ETHTOOL_ID_ON);</div><div class='add'>+			netdev_unlock_ops(dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			if (rc)</div><div class='add'>+				break;</div><div class='add'>+			schedule_timeout_interruptible(interval);</div><div class='add'>+		} while (!signal_pending(current) &amp;&amp; (!id.data || i &lt; count));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	netdev_put(dev, &amp;dev_tracker);</div><div class='ctx'> 	busy = false;</div><div class='ctx'> </div><div class='ctx'> 	(void) ops-&gt;set_phys_id(dev, ETHTOOL_ID_INACTIVE);</div><div class='hunk'>@@ -1960,17 +2510,21 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	stats.n_stats = n_stats;</div><div class='del'>-	data = vzalloc(array_size(n_stats, sizeof(u64)));</div><div class='del'>-	if (n_stats &amp;&amp; !data)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ops-&gt;get_ethtool_stats(dev, &amp;stats, data);</div><div class='add'>+	if (n_stats) {</div><div class='add'>+		data = vzalloc(array_size(n_stats, sizeof(u64)));</div><div class='add'>+		if (!data)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		ops-&gt;get_ethtool_stats(dev, &amp;stats, data);</div><div class='add'>+	} else {</div><div class='add'>+		data = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;stats, sizeof(stats)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	useraddr += sizeof(stats);</div><div class='del'>-	if (n_stats &amp;&amp; copy_to_user(useraddr, data, n_stats * sizeof(u64)))</div><div class='add'>+	if (n_stats &amp;&amp; copy_to_user(useraddr, data, array_size(n_stats, sizeof(u64))))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1979,50 +2533,91 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)</div><div class='add'>+static int ethtool_vzalloc_stats_array(int n_stats, u64 **data)</div><div class='ctx'> {</div><div class='del'>-	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	struct ethtool_stats stats;</div><div class='del'>-	u64 *data;</div><div class='del'>-	int ret, n_stats;</div><div class='del'>-</div><div class='del'>-	if (!phydev &amp;&amp; (!ops-&gt;get_ethtool_phy_stats || !ops-&gt;get_sset_count))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phydev &amp;&amp; !ops-&gt;get_ethtool_phy_stats)</div><div class='del'>-		n_stats = phy_ethtool_get_sset_count(dev-&gt;phydev);</div><div class='del'>-	else</div><div class='del'>-		n_stats = ops-&gt;get_sset_count(dev, ETH_SS_PHY_STATS);</div><div class='ctx'> 	if (n_stats &lt; 0)</div><div class='ctx'> 		return n_stats;</div><div class='ctx'> 	if (n_stats &gt; S32_MAX / sizeof(u64))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	WARN_ON_ONCE(!n_stats);</div><div class='add'>+	if (WARN_ON_ONCE(!n_stats))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	*data = vzalloc(array_size(n_stats, sizeof(u64)));</div><div class='add'>+	if (!*data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_get_phy_stats_phydev(struct phy_device *phydev,</div><div class='add'>+					 struct ethtool_stats *stats,</div><div class='add'>+					 u64 **data)</div><div class='add'>+ {</div><div class='add'>+	const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;</div><div class='add'>+	int n_stats, ret;</div><div class='add'>+</div><div class='add'>+	if (!phy_ops || !phy_ops-&gt;get_sset_count || !phy_ops-&gt;get_stats)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	n_stats = phy_ops-&gt;get_sset_count(phydev);</div><div class='add'>+</div><div class='add'>+	ret = ethtool_vzalloc_stats_array(n_stats, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;n_stats = n_stats;</div><div class='add'>+	return phy_ops-&gt;get_stats(phydev, stats, *data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_get_phy_stats_ethtool(struct net_device *dev,</div><div class='add'>+					  struct ethtool_stats *stats,</div><div class='add'>+					  u64 **data)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	int n_stats, ret;</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;get_sset_count || !ops-&gt;get_ethtool_phy_stats)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	n_stats = ops-&gt;get_sset_count(dev, ETH_SS_PHY_STATS);</div><div class='add'>+</div><div class='add'>+	ret = ethtool_vzalloc_stats_array(n_stats, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;n_stats = n_stats;</div><div class='add'>+	ops-&gt;get_ethtool_phy_stats(dev, stats, *data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	struct ethtool_stats stats;</div><div class='add'>+	u64 *data = NULL;</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;stats, useraddr, sizeof(stats)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	stats.n_stats = n_stats;</div><div class='del'>-	data = vzalloc(array_size(n_stats, sizeof(u64)));</div><div class='del'>-	if (n_stats &amp;&amp; !data)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (phydev)</div><div class='add'>+		ret = ethtool_get_phy_stats_phydev(phydev, &amp;stats, &amp;data);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;phydev &amp;&amp; !ops-&gt;get_ethtool_phy_stats) {</div><div class='del'>-		ret = phy_ethtool_get_stats(dev-&gt;phydev, &amp;stats, data);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	} else {</div><div class='del'>-		ops-&gt;get_ethtool_phy_stats(dev, &amp;stats, data);</div><div class='del'>-	}</div><div class='add'>+	if (ret == -EOPNOTSUPP)</div><div class='add'>+		ret = ethtool_get_phy_stats_ethtool(dev, &amp;stats, &amp;data);</div><div class='ctx'> </div><div class='del'>-	ret = -EFAULT;</div><div class='del'>-	if (copy_to_user(useraddr, &amp;stats, sizeof(stats)))</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	useraddr += sizeof(stats);</div><div class='del'>-	if (n_stats &amp;&amp; copy_to_user(useraddr, data, n_stats * sizeof(u64)))</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(useraddr, &amp;stats, sizeof(stats))) {</div><div class='add'>+		ret = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	useraddr += sizeof(stats);</div><div class='add'>+	if (copy_to_user(useraddr, data, array_size(stats.n_stats, sizeof(u64))))</div><div class='add'>+		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	vfree(data);</div><div class='hunk'>@@ -2092,20 +2687,15 @@ static int ethtool_set_value(struct net_device *dev, char __user *useraddr,</div><div class='ctx'> 	return actor(dev, edata.data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int ethtool_flash_device(struct net_device *dev,</div><div class='del'>-						   char __user *useraddr)</div><div class='add'>+static int</div><div class='add'>+ethtool_flash_device(struct net_device *dev, struct ethtool_devlink_compat *req)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_flash efl;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;efl, useraddr, sizeof(efl)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;ethtool_ops-&gt;flash_device)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;flash_device) {</div><div class='add'>+		req-&gt;devlink = netdev_to_devlink_get(dev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;ethtool_ops-&gt;flash_device(dev, &amp;efl);</div><div class='add'>+	return dev-&gt;ethtool_ops-&gt;flash_device(dev, &amp;req-&gt;efl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_set_dump(struct net_device *dev,</div><div class='hunk'>@@ -2209,40 +2799,35 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int ethtool_get_ts_info(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct ethtool_ts_info info;</div><div class='del'>-	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.cmd = ETHTOOL_GET_TS_INFO;</div><div class='del'>-</div><div class='del'>-	if (phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;ts_info) {</div><div class='del'>-		err = phydev-&gt;drv-&gt;ts_info(phydev, &amp;info);</div><div class='del'>-	} else if (ops-&gt;get_ts_info) {</div><div class='del'>-		err = ops-&gt;get_ts_info(dev, &amp;info);</div><div class='del'>-	} else {</div><div class='del'>-		info.so_timestamping =</div><div class='del'>-			SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-			SOF_TIMESTAMPING_SOFTWARE;</div><div class='del'>-		info.phc_index = -1;</div><div class='del'>-	}</div><div class='add'>+	struct kernel_ethtool_ts_info kernel_info;</div><div class='add'>+	struct ethtool_ts_info info = {};</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='add'>+	err = __ethtool_get_ts_info(dev, &amp;kernel_info);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	info.cmd = kernel_info.cmd;</div><div class='add'>+	info.so_timestamping = kernel_info.so_timestamping;</div><div class='add'>+	info.phc_index = kernel_info.phc_index;</div><div class='add'>+	info.tx_types = kernel_info.tx_types;</div><div class='add'>+	info.rx_filters = kernel_info.rx_filters;</div><div class='add'>+</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;info, sizeof(info)))</div><div class='del'>-		err = -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __ethtool_get_module_info(struct net_device *dev,</div><div class='del'>-				     struct ethtool_modinfo *modinfo)</div><div class='add'>+int ethtool_get_module_info_call(struct net_device *dev,</div><div class='add'>+				 struct ethtool_modinfo *modinfo)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;sfp_bus)</div><div class='ctx'> 		return sfp_get_module_info(dev-&gt;sfp_bus, modinfo);</div><div class='ctx'> </div><div class='hunk'>@@ -2264,7 +2849,7 @@ static int ethtool_get_module_info(struct net_device *dev,</div><div class='ctx'> 	if (copy_from_user(&amp;modinfo, useraddr, sizeof(modinfo)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	ret = __ethtool_get_module_info(dev, &amp;modinfo);</div><div class='add'>+	ret = ethtool_get_module_info_call(dev, &amp;modinfo);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2274,12 +2859,15 @@ static int ethtool_get_module_info(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __ethtool_get_module_eeprom(struct net_device *dev,</div><div class='del'>-				       struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+int ethtool_get_module_eeprom_call(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eeprom *ee, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;sfp_bus)</div><div class='ctx'> 		return sfp_get_module_eeprom(dev-&gt;sfp_bus, ee, data);</div><div class='ctx'> </div><div class='hunk'>@@ -2298,12 +2886,12 @@ static int ethtool_get_module_eeprom(struct net_device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ethtool_modinfo modinfo;</div><div class='ctx'> </div><div class='del'>-	ret = __ethtool_get_module_info(dev, &amp;modinfo);</div><div class='add'>+	ret = ethtool_get_module_info_call(dev, &amp;modinfo);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return ethtool_get_any_eeprom(dev, useraddr,</div><div class='del'>-				      __ethtool_get_module_eeprom,</div><div class='add'>+				      ethtool_get_module_eeprom_call,</div><div class='ctx'> 				      modinfo.eeprom_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2312,6 +2900,7 @@ static int ethtool_tunable_valid(const struct ethtool_tunable *tuna)</div><div class='ctx'> 	switch (tuna-&gt;id) {</div><div class='ctx'> 	case ETHTOOL_RX_COPYBREAK:</div><div class='ctx'> 	case ETHTOOL_TX_COPYBREAK:</div><div class='add'>+	case ETHTOOL_TX_COPYBREAK_BUF_SIZE:</div><div class='ctx'> 		if (tuna-&gt;len != sizeof(u32) ||</div><div class='ctx'> 		    tuna-&gt;type_id != ETHTOOL_TUNABLE_U32)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -2342,7 +2931,7 @@ static int ethtool_get_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	ret = ethtool_tunable_valid(&amp;tuna);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	data = kmalloc(tuna.len, GFP_USER);</div><div class='add'>+	data = kzalloc(tuna.len, GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = ops-&gt;get_tunable(dev, &amp;tuna, data);</div><div class='hunk'>@@ -2383,9 +2972,10 @@ static int ethtool_set_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ethtool_get_per_queue_coalesce(struct net_device *dev,</div><div class='del'>-					  void __user *useraddr,</div><div class='del'>-					  struct ethtool_per_queue_op *per_queue_opt)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+ethtool_get_per_queue_coalesce(struct net_device *dev,</div><div class='add'>+			       void __user *useraddr,</div><div class='add'>+			       struct ethtool_per_queue_op *per_queue_opt)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bit;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2413,9 +3003,10 @@ static int ethtool_get_per_queue_coalesce(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ethtool_set_per_queue_coalesce(struct net_device *dev,</div><div class='del'>-					  void __user *useraddr,</div><div class='del'>-					  struct ethtool_per_queue_op *per_queue_opt)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+ethtool_set_per_queue_coalesce(struct net_device *dev,</div><div class='add'>+			       void __user *useraddr,</div><div class='add'>+			       struct ethtool_per_queue_op *per_queue_opt)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bit;</div><div class='ctx'> 	int i, ret = 0;</div><div class='hunk'>@@ -2449,6 +3040,11 @@ static int ethtool_set_per_queue_coalesce(struct net_device *dev,</div><div class='ctx'> 			goto roll_back;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!ethtool_set_coalesce_supported(dev, &amp;coalesce)) {</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto roll_back;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ret = dev-&gt;ethtool_ops-&gt;set_per_queue_coalesce(dev, bit, &amp;coalesce);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			goto roll_back;</div><div class='hunk'>@@ -2469,13 +3065,17 @@ roll_back:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ethtool_set_per_queue(struct net_device *dev, void __user *useraddr)</div><div class='add'>+static int noinline_for_stack ethtool_set_per_queue(struct net_device *dev,</div><div class='add'>+				 void __user *useraddr, u32 sub_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_per_queue_op per_queue_opt;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;per_queue_opt, useraddr, sizeof(per_queue_opt)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	if (per_queue_opt.sub_command != sub_cmd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	switch (per_queue_opt.sub_command) {</div><div class='ctx'> 	case ETHTOOL_GCOALESCE:</div><div class='ctx'> 		return ethtool_get_per_queue_coalesce(dev, useraddr, &amp;per_queue_opt);</div><div class='hunk'>@@ -2483,17 +3083,23 @@ static int ethtool_set_per_queue(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 		return ethtool_set_per_queue_coalesce(dev, useraddr, &amp;per_queue_opt);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethtool_phy_tunable_valid(const struct ethtool_tunable *tuna)</div><div class='ctx'> {</div><div class='ctx'> 	switch (tuna-&gt;id) {</div><div class='ctx'> 	case ETHTOOL_PHY_DOWNSHIFT:</div><div class='add'>+	case ETHTOOL_PHY_FAST_LINK_DOWN:</div><div class='ctx'> 		if (tuna-&gt;len != sizeof(u8) ||</div><div class='ctx'> 		    tuna-&gt;type_id != ETHTOOL_TUNABLE_U8)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		break;</div><div class='add'>+	case ETHTOOL_PHY_EDPD:</div><div class='add'>+		if (tuna-&gt;len != sizeof(u16) ||</div><div class='add'>+		    tuna-&gt;type_id != ETHTOOL_TUNABLE_U16)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2503,25 +3109,30 @@ static int ethtool_phy_tunable_valid(const struct ethtool_tunable *tuna)</div><div class='ctx'> </div><div class='ctx'> static int get_phy_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct ethtool_tunable tuna;</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	struct ethtool_tunable tuna;</div><div class='add'>+	bool phy_drv_tunable;</div><div class='ctx'> 	void *data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!(phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;get_tunable))</div><div class='add'>+	phy_drv_tunable = phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;get_tunable;</div><div class='add'>+	if (!phy_drv_tunable &amp;&amp; !dev-&gt;ethtool_ops-&gt;get_phy_tunable)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	if (copy_from_user(&amp;tuna, useraddr, sizeof(tuna)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	ret = ethtool_phy_tunable_valid(&amp;tuna);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	data = kmalloc(tuna.len, GFP_USER);</div><div class='add'>+	data = kzalloc(tuna.len, GFP_USER);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	mutex_lock(&amp;phydev-&gt;lock);</div><div class='del'>-	ret = phydev-&gt;drv-&gt;get_tunable(phydev, &amp;tuna, data);</div><div class='del'>-	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+	if (phy_drv_tunable) {</div><div class='add'>+		mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+		ret = phydev-&gt;drv-&gt;get_tunable(phydev, &amp;tuna, data);</div><div class='add'>+		mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		ret = dev-&gt;ethtool_ops-&gt;get_phy_tunable(dev, &amp;tuna, data);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	useraddr += sizeof(tuna);</div><div class='hunk'>@@ -2537,12 +3148,14 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int set_phy_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct ethtool_tunable tuna;</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	struct ethtool_tunable tuna;</div><div class='add'>+	bool phy_drv_tunable;</div><div class='ctx'> 	void *data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!(phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;set_tunable))</div><div class='add'>+	phy_drv_tunable = phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;get_tunable;</div><div class='add'>+	if (!phy_drv_tunable &amp;&amp; !dev-&gt;ethtool_ops-&gt;set_phy_tunable)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (copy_from_user(&amp;tuna, useraddr, sizeof(tuna)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -2553,9 +3166,13 @@ static int set_phy_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	data = memdup_user(useraddr, tuna.len);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='del'>-	mutex_lock(&amp;phydev-&gt;lock);</div><div class='del'>-	ret = phydev-&gt;drv-&gt;set_tunable(phydev, &amp;tuna, data);</div><div class='del'>-	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+	if (phy_drv_tunable) {</div><div class='add'>+		mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+		ret = phydev-&gt;drv-&gt;set_tunable(phydev, &amp;tuna, data);</div><div class='add'>+		mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		ret = dev-&gt;ethtool_ops-&gt;set_phy_tunable(dev, &amp;tuna, data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2563,7 +3180,7 @@ static int set_phy_tunable(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> static int ethtool_get_fecparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_fecparam fecparam = { ETHTOOL_GFECPARAM };</div><div class='add'>+	struct ethtool_fecparam fecparam = { .cmd = ETHTOOL_GFECPARAM };</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;ethtool_ops-&gt;get_fecparam)</div><div class='hunk'>@@ -2573,6 +3190,9 @@ static int ethtool_get_fecparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(fecparam.reserved))</div><div class='add'>+		fecparam.reserved = 0;</div><div class='add'>+</div><div class='ctx'> 	if (copy_to_user(useraddr, &amp;fecparam, sizeof(fecparam)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2588,25 +3208,30 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 	if (copy_from_user(&amp;fecparam, useraddr, sizeof(fecparam)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	if (!fecparam.fec || fecparam.fec &amp; ETHTOOL_FEC_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fecparam.active_fec = 0;</div><div class='add'>+	fecparam.reserved = 0;</div><div class='add'>+</div><div class='ctx'> 	return dev-&gt;ethtool_ops-&gt;set_fecparam(dev, &amp;fecparam);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The main entry point in this file.  Called from net/core/dev_ioctl.c */</div><div class='ctx'> </div><div class='del'>-int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='add'>+static int</div><div class='add'>+__dev_ethtool(struct net *net, struct ifreq *ifr, void __user *useraddr,</div><div class='add'>+	      u32 ethcmd, struct ethtool_devlink_compat *devlink_state)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = __dev_get_by_name(net, ifr-&gt;ifr_name);</div><div class='del'>-	void __user *useraddr = ifr-&gt;ifr_data;</div><div class='del'>-	u32 ethcmd, sub_cmd;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 sub_cmd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	netdev_features_t old_features;</div><div class='ctx'> </div><div class='del'>-	if (!dev || !netif_device_present(dev))</div><div class='add'>+	dev = __dev_get_by_name(net, ifr-&gt;ifr_name);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;ethcmd, useraddr, sizeof(ethcmd)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	if (ethcmd == ETHTOOL_PERQUEUE) {</div><div class='ctx'> 		if (copy_from_user(&amp;sub_cmd, useraddr + sizeof(ethcmd), sizeof(sub_cmd)))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -2657,10 +3282,19 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	if (dev-&gt;dev.parent)</div><div class='add'>+		pm_runtime_get_sync(dev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;ethtool_ops-&gt;begin) {</div><div class='ctx'> 		rc = dev-&gt;ethtool_ops-&gt;begin(dev);</div><div class='del'>-		if (rc  &lt; 0)</div><div class='del'>-			return rc;</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	old_features = dev-&gt;features;</div><div class='ctx'> </div><div class='hunk'>@@ -2672,7 +3306,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 		rc = ethtool_set_settings(dev, useraddr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GDRVINFO:</div><div class='del'>-		rc = ethtool_get_drvinfo(dev, useraddr);</div><div class='add'>+		rc = ethtool_get_drvinfo(dev, devlink_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GREGS:</div><div class='ctx'> 		rc = ethtool_get_regs(dev, useraddr);</div><div class='hunk'>@@ -2690,6 +3324,8 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 	case ETHTOOL_SMSGLVL:</div><div class='ctx'> 		rc = ethtool_set_value_void(dev, useraddr,</div><div class='ctx'> 				       dev-&gt;ethtool_ops-&gt;set_msglevel);</div><div class='add'>+		if (!rc)</div><div class='add'>+			ethtool_notify(dev, ETHTOOL_MSG_DEBUG_NTF);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GEEE:</div><div class='ctx'> 		rc = ethtool_get_eee(dev, useraddr);</div><div class='hunk'>@@ -2752,25 +3388,33 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 	case ETHTOOL_GPFLAGS:</div><div class='ctx'> 		rc = ethtool_get_value(dev, useraddr, ethcmd,</div><div class='ctx'> 				       dev-&gt;ethtool_ops-&gt;get_priv_flags);</div><div class='add'>+		if (!rc)</div><div class='add'>+			ethtool_notify(dev, ETHTOOL_MSG_PRIVFLAGS_NTF);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_SPFLAGS:</div><div class='ctx'> 		rc = ethtool_set_value(dev, useraddr,</div><div class='ctx'> 				       dev-&gt;ethtool_ops-&gt;set_priv_flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GRXFH:</div><div class='add'>+		rc = ethtool_get_rxfh_fields(dev, ethcmd, useraddr);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXFH:</div><div class='add'>+		rc = ethtool_set_rxfh_fields(dev, ethcmd, useraddr);</div><div class='add'>+		break;</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='add'>+		rc = ethtool_get_rxrings(dev, ethcmd, useraddr);</div><div class='add'>+		break;</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLCNT:</div><div class='ctx'> 	case ETHTOOL_GRXCLSRULE:</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLALL:</div><div class='ctx'> 		rc = ethtool_get_rxnfc(dev, ethcmd, useraddr);</div><div class='ctx'> 		break;</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLDEL:</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLINS:</div><div class='ctx'> 		rc = ethtool_set_rxnfc(dev, ethcmd, useraddr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_FLASHDEV:</div><div class='del'>-		rc = ethtool_flash_device(dev, useraddr);</div><div class='add'>+		rc = ethtool_flash_device(dev, devlink_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_RESET:</div><div class='ctx'> 		rc = ethtool_reset(dev, useraddr);</div><div class='hunk'>@@ -2846,7 +3490,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> 		rc = ethtool_get_phy_stats(dev, useraddr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_PERQUEUE:</div><div class='del'>-		rc = ethtool_set_per_queue(dev, useraddr);</div><div class='add'>+		rc = ethtool_set_per_queue(dev, useraddr, sub_cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GLINKSETTINGS:</div><div class='ctx'> 		rc = ethtool_get_link_ksettings(dev, useraddr);</div><div class='hunk'>@@ -2875,6 +3519,335 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)</div><div class='ctx'> </div><div class='ctx'> 	if (old_features != dev-&gt;features)</div><div class='ctx'> 		netdev_features_change(dev);</div><div class='add'>+out:</div><div class='add'>+	if (dev-&gt;dev.parent)</div><div class='add'>+		pm_runtime_put(dev-&gt;dev.parent);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *useraddr)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_devlink_compat *state;</div><div class='add'>+	u32 ethcmd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;ethcmd, useraddr, sizeof(ethcmd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	switch (ethcmd) {</div><div class='add'>+	case ETHTOOL_FLASHDEV:</div><div class='add'>+		if (copy_from_user(&amp;state-&gt;efl, useraddr, sizeof(state-&gt;efl))) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+		state-&gt;efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	rc = __dev_ethtool(net, ifr, useraddr, ethcmd, state);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	switch (ethcmd) {</div><div class='add'>+	case ETHTOOL_FLASHDEV:</div><div class='add'>+		if (state-&gt;devlink)</div><div class='add'>+			rc = devlink_compat_flash_update(state-&gt;devlink,</div><div class='add'>+							 state-&gt;efl.data);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GDRVINFO:</div><div class='add'>+		if (state-&gt;devlink)</div><div class='add'>+			devlink_compat_running_version(state-&gt;devlink,</div><div class='add'>+						       state-&gt;info.fw_version,</div><div class='add'>+						       sizeof(state-&gt;info.fw_version));</div><div class='add'>+		if (copy_to_user(useraddr, &amp;state-&gt;info, sizeof(state-&gt;info))) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_free:</div><div class='add'>+	if (state-&gt;devlink)</div><div class='add'>+		devlink_put(state-&gt;devlink);</div><div class='add'>+	kfree(state);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethtool_rx_flow_key {</div><div class='add'>+	struct flow_dissector_key_basic			basic;</div><div class='add'>+	union {</div><div class='add'>+		struct flow_dissector_key_ipv4_addrs	ipv4;</div><div class='add'>+		struct flow_dissector_key_ipv6_addrs	ipv6;</div><div class='add'>+	};</div><div class='add'>+	struct flow_dissector_key_ports			tp;</div><div class='add'>+	struct flow_dissector_key_ip			ip;</div><div class='add'>+	struct flow_dissector_key_vlan			vlan;</div><div class='add'>+	struct flow_dissector_key_eth_addrs		eth_addrs;</div><div class='add'>+} __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */</div><div class='add'>+</div><div class='add'>+struct ethtool_rx_flow_match {</div><div class='add'>+	struct flow_dissector		dissector;</div><div class='add'>+	struct ethtool_rx_flow_key	key;</div><div class='add'>+	struct ethtool_rx_flow_key	mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ethtool_rx_flow_rule *</div><div class='add'>+ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_rx_flow_spec *fs = input-&gt;fs;</div><div class='add'>+	struct ethtool_rx_flow_match *match;</div><div class='add'>+	struct ethtool_rx_flow_rule *flow;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+</div><div class='add'>+	flow = kzalloc(sizeof(struct ethtool_rx_flow_rule) +</div><div class='add'>+		       sizeof(struct ethtool_rx_flow_match), GFP_KERNEL);</div><div class='add'>+	if (!flow)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/* ethtool_rx supports only one single action per rule. */</div><div class='add'>+	flow-&gt;rule = flow_rule_alloc(1);</div><div class='add'>+	if (!flow-&gt;rule) {</div><div class='add'>+		kfree(flow);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match = (struct ethtool_rx_flow_match *)flow-&gt;priv;</div><div class='add'>+	flow-&gt;rule-&gt;match.dissector	= &amp;match-&gt;dissector;</div><div class='add'>+	flow-&gt;rule-&gt;match.mask		= &amp;match-&gt;mask;</div><div class='add'>+	flow-&gt;rule-&gt;match.key		= &amp;match-&gt;key;</div><div class='add'>+</div><div class='add'>+	match-&gt;mask.basic.n_proto = htons(0xffff);</div><div class='add'>+</div><div class='add'>+	switch (fs-&gt;flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS)) {</div><div class='add'>+	case ETHER_FLOW: {</div><div class='add'>+		const struct ethhdr *ether_spec, *ether_m_spec;</div><div class='add'>+</div><div class='add'>+		ether_spec = &amp;fs-&gt;h_u.ether_spec;</div><div class='add'>+		ether_m_spec = &amp;fs-&gt;m_u.ether_spec;</div><div class='add'>+</div><div class='add'>+		if (!is_zero_ether_addr(ether_m_spec-&gt;h_source)) {</div><div class='add'>+			ether_addr_copy(match-&gt;key.eth_addrs.src,</div><div class='add'>+					ether_spec-&gt;h_source);</div><div class='add'>+			ether_addr_copy(match-&gt;mask.eth_addrs.src,</div><div class='add'>+					ether_m_spec-&gt;h_source);</div><div class='add'>+		}</div><div class='add'>+		if (!is_zero_ether_addr(ether_m_spec-&gt;h_dest)) {</div><div class='add'>+			ether_addr_copy(match-&gt;key.eth_addrs.dst,</div><div class='add'>+					ether_spec-&gt;h_dest);</div><div class='add'>+			ether_addr_copy(match-&gt;mask.eth_addrs.dst,</div><div class='add'>+					ether_m_spec-&gt;h_dest);</div><div class='add'>+		}</div><div class='add'>+		if (ether_m_spec-&gt;h_proto) {</div><div class='add'>+			match-&gt;key.basic.n_proto = ether_spec-&gt;h_proto;</div><div class='add'>+			match-&gt;mask.basic.n_proto = ether_m_spec-&gt;h_proto;</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case UDP_V4_FLOW: {</div><div class='add'>+		const struct ethtool_tcpip4_spec *v4_spec, *v4_m_spec;</div><div class='add'>+</div><div class='add'>+		match-&gt;key.basic.n_proto = htons(ETH_P_IP);</div><div class='add'>+</div><div class='add'>+		v4_spec = &amp;fs-&gt;h_u.tcp_ip4_spec;</div><div class='add'>+		v4_m_spec = &amp;fs-&gt;m_u.tcp_ip4_spec;</div><div class='add'>+</div><div class='add'>+		if (v4_m_spec-&gt;ip4src) {</div><div class='add'>+			match-&gt;key.ipv4.src = v4_spec-&gt;ip4src;</div><div class='add'>+			match-&gt;mask.ipv4.src = v4_m_spec-&gt;ip4src;</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;ip4dst) {</div><div class='add'>+			match-&gt;key.ipv4.dst = v4_spec-&gt;ip4dst;</div><div class='add'>+			match-&gt;mask.ipv4.dst = v4_m_spec-&gt;ip4dst;</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;ip4src ||</div><div class='add'>+		    v4_m_spec-&gt;ip4dst) {</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_IPV4_ADDRS] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, ipv4);</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;psrc) {</div><div class='add'>+			match-&gt;key.tp.src = v4_spec-&gt;psrc;</div><div class='add'>+			match-&gt;mask.tp.src = v4_m_spec-&gt;psrc;</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;pdst) {</div><div class='add'>+			match-&gt;key.tp.dst = v4_spec-&gt;pdst;</div><div class='add'>+			match-&gt;mask.tp.dst = v4_m_spec-&gt;pdst;</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;psrc ||</div><div class='add'>+		    v4_m_spec-&gt;pdst) {</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_PORTS);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_PORTS] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, tp);</div><div class='add'>+		}</div><div class='add'>+		if (v4_m_spec-&gt;tos) {</div><div class='add'>+			match-&gt;key.ip.tos = v4_spec-&gt;tos;</div><div class='add'>+			match-&gt;mask.ip.tos = v4_m_spec-&gt;tos;</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT(FLOW_DISSECTOR_KEY_IP);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_IP] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, ip);</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+	case UDP_V6_FLOW: {</div><div class='add'>+		const struct ethtool_tcpip6_spec *v6_spec, *v6_m_spec;</div><div class='add'>+</div><div class='add'>+		match-&gt;key.basic.n_proto = htons(ETH_P_IPV6);</div><div class='add'>+</div><div class='add'>+		v6_spec = &amp;fs-&gt;h_u.tcp_ip6_spec;</div><div class='add'>+		v6_m_spec = &amp;fs-&gt;m_u.tcp_ip6_spec;</div><div class='add'>+		if (!ipv6_addr_any((struct in6_addr *)v6_m_spec-&gt;ip6src)) {</div><div class='add'>+			memcpy(&amp;match-&gt;key.ipv6.src, v6_spec-&gt;ip6src,</div><div class='add'>+			       sizeof(match-&gt;key.ipv6.src));</div><div class='add'>+			memcpy(&amp;match-&gt;mask.ipv6.src, v6_m_spec-&gt;ip6src,</div><div class='add'>+			       sizeof(match-&gt;mask.ipv6.src));</div><div class='add'>+		}</div><div class='add'>+		if (!ipv6_addr_any((struct in6_addr *)v6_m_spec-&gt;ip6dst)) {</div><div class='add'>+			memcpy(&amp;match-&gt;key.ipv6.dst, v6_spec-&gt;ip6dst,</div><div class='add'>+			       sizeof(match-&gt;key.ipv6.dst));</div><div class='add'>+			memcpy(&amp;match-&gt;mask.ipv6.dst, v6_m_spec-&gt;ip6dst,</div><div class='add'>+			       sizeof(match-&gt;mask.ipv6.dst));</div><div class='add'>+		}</div><div class='add'>+		if (!ipv6_addr_any((struct in6_addr *)v6_m_spec-&gt;ip6src) ||</div><div class='add'>+		    !ipv6_addr_any((struct in6_addr *)v6_m_spec-&gt;ip6dst)) {</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_IPV6_ADDRS] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, ipv6);</div><div class='add'>+		}</div><div class='add'>+		if (v6_m_spec-&gt;psrc) {</div><div class='add'>+			match-&gt;key.tp.src = v6_spec-&gt;psrc;</div><div class='add'>+			match-&gt;mask.tp.src = v6_m_spec-&gt;psrc;</div><div class='add'>+		}</div><div class='add'>+		if (v6_m_spec-&gt;pdst) {</div><div class='add'>+			match-&gt;key.tp.dst = v6_spec-&gt;pdst;</div><div class='add'>+			match-&gt;mask.tp.dst = v6_m_spec-&gt;pdst;</div><div class='add'>+		}</div><div class='add'>+		if (v6_m_spec-&gt;psrc ||</div><div class='add'>+		    v6_m_spec-&gt;pdst) {</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_PORTS);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_PORTS] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, tp);</div><div class='add'>+		}</div><div class='add'>+		if (v6_m_spec-&gt;tclass) {</div><div class='add'>+			match-&gt;key.ip.tos = v6_spec-&gt;tclass;</div><div class='add'>+			match-&gt;mask.ip.tos = v6_m_spec-&gt;tclass;</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_IP);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_IP] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, ip);</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ethtool_rx_flow_rule_destroy(flow);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (fs-&gt;flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS)) {</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+		match-&gt;key.basic.ip_proto = IPPROTO_TCP;</div><div class='add'>+		match-&gt;mask.basic.ip_proto = 0xff;</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		match-&gt;key.basic.ip_proto = IPPROTO_UDP;</div><div class='add'>+		match-&gt;mask.basic.ip_proto = 0xff;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match-&gt;dissector.used_keys |= BIT_ULL(FLOW_DISSECTOR_KEY_BASIC);</div><div class='add'>+	match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_BASIC] =</div><div class='add'>+		offsetof(struct ethtool_rx_flow_key, basic);</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		const struct ethtool_flow_ext *ext_h_spec = &amp;fs-&gt;h_ext;</div><div class='add'>+		const struct ethtool_flow_ext *ext_m_spec = &amp;fs-&gt;m_ext;</div><div class='add'>+</div><div class='add'>+		if (ext_m_spec-&gt;vlan_etype) {</div><div class='add'>+			match-&gt;key.vlan.vlan_tpid = ext_h_spec-&gt;vlan_etype;</div><div class='add'>+			match-&gt;mask.vlan.vlan_tpid = ext_m_spec-&gt;vlan_etype;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ext_m_spec-&gt;vlan_tci) {</div><div class='add'>+			match-&gt;key.vlan.vlan_id =</div><div class='add'>+				ntohs(ext_h_spec-&gt;vlan_tci) &amp; 0x0fff;</div><div class='add'>+			match-&gt;mask.vlan.vlan_id =</div><div class='add'>+				ntohs(ext_m_spec-&gt;vlan_tci) &amp; 0x0fff;</div><div class='add'>+</div><div class='add'>+			match-&gt;key.vlan.vlan_dei =</div><div class='add'>+				!!(ext_h_spec-&gt;vlan_tci &amp; htons(0x1000));</div><div class='add'>+			match-&gt;mask.vlan.vlan_dei =</div><div class='add'>+				!!(ext_m_spec-&gt;vlan_tci &amp; htons(0x1000));</div><div class='add'>+</div><div class='add'>+			match-&gt;key.vlan.vlan_priority =</div><div class='add'>+				(ntohs(ext_h_spec-&gt;vlan_tci) &amp; 0xe000) &gt;&gt; 13;</div><div class='add'>+			match-&gt;mask.vlan.vlan_priority =</div><div class='add'>+				(ntohs(ext_m_spec-&gt;vlan_tci) &amp; 0xe000) &gt;&gt; 13;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ext_m_spec-&gt;vlan_etype ||</div><div class='add'>+		    ext_m_spec-&gt;vlan_tci) {</div><div class='add'>+			match-&gt;dissector.used_keys |=</div><div class='add'>+				BIT_ULL(FLOW_DISSECTOR_KEY_VLAN);</div><div class='add'>+			match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_VLAN] =</div><div class='add'>+				offsetof(struct ethtool_rx_flow_key, vlan);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_MAC_EXT) {</div><div class='add'>+		const struct ethtool_flow_ext *ext_h_spec = &amp;fs-&gt;h_ext;</div><div class='add'>+		const struct ethtool_flow_ext *ext_m_spec = &amp;fs-&gt;m_ext;</div><div class='add'>+</div><div class='add'>+		memcpy(match-&gt;key.eth_addrs.dst, ext_h_spec-&gt;h_dest,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		memcpy(match-&gt;mask.eth_addrs.dst, ext_m_spec-&gt;h_dest,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+		match-&gt;dissector.used_keys |=</div><div class='add'>+			BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS);</div><div class='add'>+		match-&gt;dissector.offset[FLOW_DISSECTOR_KEY_ETH_ADDRS] =</div><div class='add'>+			offsetof(struct ethtool_rx_flow_key, eth_addrs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	act = &amp;flow-&gt;rule-&gt;action.entries[0];</div><div class='add'>+	switch (fs-&gt;ring_cookie) {</div><div class='add'>+	case RX_CLS_FLOW_DISC:</div><div class='add'>+		act-&gt;id = FLOW_ACTION_DROP;</div><div class='add'>+		break;</div><div class='add'>+	case RX_CLS_FLOW_WAKE:</div><div class='add'>+		act-&gt;id = FLOW_ACTION_WAKE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		act-&gt;id = FLOW_ACTION_QUEUE;</div><div class='add'>+		if (fs-&gt;flow_type &amp; FLOW_RSS)</div><div class='add'>+			act-&gt;queue.ctx = input-&gt;rss_ctx;</div><div class='add'>+</div><div class='add'>+		act-&gt;queue.vf = ethtool_get_flow_spec_ring_vf(fs-&gt;ring_cookie);</div><div class='add'>+		act-&gt;queue.index = ethtool_get_flow_spec_ring(fs-&gt;ring_cookie);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flow;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_rx_flow_rule_create);</div><div class='add'>+</div><div class='add'>+void ethtool_rx_flow_rule_destroy(struct ethtool_rx_flow_rule *flow)</div><div class='add'>+{</div><div class='add'>+	kfree(flow-&gt;rule);</div><div class='add'>+	kfree(flow);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_rx_flow_rule_destroy);</div><div class='head'>diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c<br/>new file mode 100644<br/>index 000000000000..30b8ce275159<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/linkinfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/linkinfo.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct linkinfo_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct linkinfo_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_link_ksettings	ksettings;</div><div class='add'>+	struct ethtool_link_settings	*lsettings;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LINKINFO_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct linkinfo_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_linkinfo_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_LINKINFO_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int linkinfo_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				 struct ethnl_reply_data *reply_base,</div><div class='add'>+				 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct linkinfo_reply_data *data = LINKINFO_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data-&gt;lsettings = &amp;data-&gt;ksettings.base;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = __ethtool_get_link_ksettings(dev, &amp;data-&gt;ksettings);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkinfo_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u8)) /* LINKINFO_PORT */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKINFO_PHYADDR */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKINFO_TP_MDIX */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKINFO_TP_MDIX_CTRL */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKINFO_TRANSCEIVER */</div><div class='add'>+		+ 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkinfo_fill_reply(struct sk_buff *skb,</div><div class='add'>+			       const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct linkinfo_reply_data *data = LINKINFO_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_LINKINFO_PORT, data-&gt;lsettings-&gt;port) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKINFO_PHYADDR,</div><div class='add'>+		       data-&gt;lsettings-&gt;phy_address) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKINFO_TP_MDIX,</div><div class='add'>+		       data-&gt;lsettings-&gt;eth_tp_mdix) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKINFO_TP_MDIX_CTRL,</div><div class='add'>+		       data-&gt;lsettings-&gt;eth_tp_mdix_ctrl) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKINFO_TRANSCEIVER,</div><div class='add'>+		       data-&gt;lsettings-&gt;transceiver))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LINKINFO_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_linkinfo_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_LINKINFO_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_LINKINFO_PORT]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_LINKINFO_PHYADDR]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL]	= { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_linkinfo_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_link_ksettings || !ops-&gt;set_link_ksettings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_linkinfo(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_link_ksettings ksettings = {};</div><div class='add'>+	struct ethtool_link_settings *lsettings;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __ethtool_get_link_ksettings(dev, &amp;ksettings);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	lsettings = &amp;ksettings.base;</div><div class='add'>+</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;port, tb[ETHTOOL_A_LINKINFO_PORT], &amp;mod);</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;phy_address, tb[ETHTOOL_A_LINKINFO_PHYADDR],</div><div class='add'>+			&amp;mod);</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;eth_tp_mdix_ctrl,</div><div class='add'>+			tb[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL], &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev, &amp;ksettings);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "link settings update failed");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_linkinfo_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_LINKINFO_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_LINKINFO_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_LINKINFO_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct linkinfo_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct linkinfo_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= linkinfo_prepare_data,</div><div class='add'>+	.reply_size		= linkinfo_reply_size,</div><div class='add'>+	.fill_reply		= linkinfo_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_linkinfo_validate,</div><div class='add'>+	.set			= ethnl_set_linkinfo,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_LINKINFO_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c<br/>new file mode 100644<br/>index 000000000000..259cd9ef1f2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/linkmodes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/linkmodes.c</a></div><div class='hunk'>@@ -0,0 +1,362 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+/* LINKMODES_GET */</div><div class='add'>+</div><div class='add'>+struct linkmodes_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct linkmodes_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_link_ksettings	ksettings;</div><div class='add'>+	struct ethtool_link_settings	*lsettings;</div><div class='add'>+	bool				peer_empty;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LINKMODES_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct linkmodes_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_linkmodes_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_LINKMODES_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int linkmodes_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				  struct ethnl_reply_data *reply_base,</div><div class='add'>+				  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data-&gt;lsettings = &amp;data-&gt;ksettings.base;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = __ethtool_get_link_ksettings(dev, &amp;data-&gt;ksettings);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;cap_link_lanes_supported)</div><div class='add'>+		data-&gt;ksettings.lanes = 0;</div><div class='add'>+</div><div class='add'>+	data-&gt;peer_empty =</div><div class='add'>+		bitmap_empty(data-&gt;ksettings.link_modes.lp_advertising,</div><div class='add'>+			     __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkmodes_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_link_ksettings *ksettings = &amp;data-&gt;ksettings;</div><div class='add'>+	const struct ethtool_link_settings *lsettings = &amp;ksettings-&gt;base;</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	len = nla_total_size(sizeof(u8)) /* LINKMODES_AUTONEG */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* LINKMODES_SPEED */</div><div class='add'>+		+ nla_total_size(sizeof(u32)) /* LINKMODES_LANES */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKMODES_DUPLEX */</div><div class='add'>+		+ nla_total_size(sizeof(u8)) /* LINKMODES_RATE_MATCHING */</div><div class='add'>+		+ 0;</div><div class='add'>+	ret = ethnl_bitset_size(ksettings-&gt;link_modes.advertising,</div><div class='add'>+				ksettings-&gt;link_modes.supported,</div><div class='add'>+				__ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				link_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	len += ret;</div><div class='add'>+	if (!data-&gt;peer_empty) {</div><div class='add'>+		ret = ethnl_bitset_size(ksettings-&gt;link_modes.lp_advertising,</div><div class='add'>+					NULL, __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+					link_mode_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lsettings-&gt;master_slave_cfg != MASTER_SLAVE_CFG_UNSUPPORTED)</div><div class='add'>+		len += nla_total_size(sizeof(u8));</div><div class='add'>+</div><div class='add'>+	if (lsettings-&gt;master_slave_state != MASTER_SLAVE_STATE_UNSUPPORTED)</div><div class='add'>+		len += nla_total_size(sizeof(u8));</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkmodes_fill_reply(struct sk_buff *skb,</div><div class='add'>+				const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_link_ksettings *ksettings = &amp;data-&gt;ksettings;</div><div class='add'>+	const struct ethtool_link_settings *lsettings = &amp;ksettings-&gt;base;</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_LINKMODES_AUTONEG, lsettings-&gt;autoneg))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset(skb, ETHTOOL_A_LINKMODES_OURS,</div><div class='add'>+			       ksettings-&gt;link_modes.advertising,</div><div class='add'>+			       ksettings-&gt;link_modes.supported,</div><div class='add'>+			       __ETHTOOL_LINK_MODE_MASK_NBITS, link_mode_names,</div><div class='add'>+			       compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (!data-&gt;peer_empty) {</div><div class='add'>+		ret = ethnl_put_bitset(skb, ETHTOOL_A_LINKMODES_PEER,</div><div class='add'>+				       ksettings-&gt;link_modes.lp_advertising,</div><div class='add'>+				       NULL, __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				       link_mode_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_LINKMODES_SPEED, lsettings-&gt;speed) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKMODES_DUPLEX, lsettings-&gt;duplex))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (ksettings-&gt;lanes &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_LINKMODES_LANES, ksettings-&gt;lanes))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (lsettings-&gt;master_slave_cfg != MASTER_SLAVE_CFG_UNSUPPORTED &amp;&amp;</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG,</div><div class='add'>+		       lsettings-&gt;master_slave_cfg))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (lsettings-&gt;master_slave_state != MASTER_SLAVE_STATE_UNSUPPORTED &amp;&amp;</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE,</div><div class='add'>+		       lsettings-&gt;master_slave_state))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_LINKMODES_RATE_MATCHING,</div><div class='add'>+		       lsettings-&gt;rate_matching))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LINKMODES_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_linkmodes_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_LINKMODES_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_LINKMODES_AUTONEG]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_LINKMODES_OURS]		= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_LINKMODES_SPEED]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_LINKMODES_DUPLEX]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG]	= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_LINKMODES_LANES]		= NLA_POLICY_RANGE(NLA_U32, 1, 8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set advertised link modes to all supported modes matching requested speed,</div><div class='add'>+ * lanes and duplex values. Called when autonegotiation is on, speed, lanes or</div><div class='add'>+ * duplex is requested but no link mode change. This is done in userspace with</div><div class='add'>+ * ioctl() interface, move it into kernel for netlink.</div><div class='add'>+ * Returns true if advertised modes bitmap was modified.</div><div class='add'>+ */</div><div class='add'>+static bool ethnl_auto_linkmodes(struct ethtool_link_ksettings *ksettings,</div><div class='add'>+				 bool req_speed, bool req_lanes, bool req_duplex)</div><div class='add'>+{</div><div class='add'>+	unsigned long *advertising = ksettings-&gt;link_modes.advertising;</div><div class='add'>+	unsigned long *supported = ksettings-&gt;link_modes.supported;</div><div class='add'>+	DECLARE_BITMAP(old_adv, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	bitmap_copy(old_adv, advertising, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __ETHTOOL_LINK_MODE_MASK_NBITS; i++) {</div><div class='add'>+		const struct link_mode_info *info = &amp;link_mode_params[i];</div><div class='add'>+</div><div class='add'>+		if (info-&gt;speed == SPEED_UNKNOWN)</div><div class='add'>+			continue;</div><div class='add'>+		if (test_bit(i, supported) &amp;&amp;</div><div class='add'>+		    (!req_speed || info-&gt;speed == ksettings-&gt;base.speed) &amp;&amp;</div><div class='add'>+		    (!req_lanes || info-&gt;lanes == ksettings-&gt;lanes) &amp;&amp;</div><div class='add'>+		    (!req_duplex || info-&gt;duplex == ksettings-&gt;base.duplex))</div><div class='add'>+			set_bit(i, advertising);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(i, advertising);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !bitmap_equal(old_adv, advertising,</div><div class='add'>+			     __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ethnl_validate_master_slave_cfg(u8 cfg)</div><div class='add'>+{</div><div class='add'>+	switch (cfg) {</div><div class='add'>+	case MASTER_SLAVE_CFG_MASTER_PREFERRED:</div><div class='add'>+	case MASTER_SLAVE_CFG_SLAVE_PREFERRED:</div><div class='add'>+	case MASTER_SLAVE_CFG_MASTER_FORCE:</div><div class='add'>+	case MASTER_SLAVE_CFG_SLAVE_FORCE:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_check_linkmodes(struct genl_info *info, struct nlattr **tb)</div><div class='add'>+{</div><div class='add'>+	const struct nlattr *master_slave_cfg, *lanes_cfg;</div><div class='add'>+</div><div class='add'>+	master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];</div><div class='add'>+	if (master_slave_cfg &amp;&amp;</div><div class='add'>+	    !ethnl_validate_master_slave_cfg(nla_get_u8(master_slave_cfg))) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, master_slave_cfg,</div><div class='add'>+				    "master/slave value is invalid");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lanes_cfg = tb[ETHTOOL_A_LINKMODES_LANES];</div><div class='add'>+	if (lanes_cfg &amp;&amp; !is_power_of_2(nla_get_u32(lanes_cfg))) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, lanes_cfg,</div><div class='add'>+				    "lanes value is invalid");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,</div><div class='add'>+				  struct ethtool_link_ksettings *ksettings,</div><div class='add'>+				  bool *mod, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_link_settings *lsettings = &amp;ksettings-&gt;base;</div><div class='add'>+	bool req_speed, req_lanes, req_duplex;</div><div class='add'>+	const struct nlattr *master_slave_cfg, *lanes_cfg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];</div><div class='add'>+	if (master_slave_cfg) {</div><div class='add'>+		if (lsettings-&gt;master_slave_cfg == MASTER_SLAVE_CFG_UNSUPPORTED) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack, master_slave_cfg,</div><div class='add'>+					    "master/slave configuration not supported by device");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*mod = false;</div><div class='add'>+	req_speed = tb[ETHTOOL_A_LINKMODES_SPEED];</div><div class='add'>+	req_lanes = tb[ETHTOOL_A_LINKMODES_LANES];</div><div class='add'>+	req_duplex = tb[ETHTOOL_A_LINKMODES_DUPLEX];</div><div class='add'>+</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;autoneg, tb[ETHTOOL_A_LINKMODES_AUTONEG],</div><div class='add'>+			mod);</div><div class='add'>+</div><div class='add'>+	lanes_cfg = tb[ETHTOOL_A_LINKMODES_LANES];</div><div class='add'>+	if (lanes_cfg) {</div><div class='add'>+		/* If autoneg is off and lanes parameter is not supported by the</div><div class='add'>+		 * driver, return an error.</div><div class='add'>+		 */</div><div class='add'>+		if (!lsettings-&gt;autoneg &amp;&amp;</div><div class='add'>+		    !dev-&gt;ethtool_ops-&gt;cap_link_lanes_supported) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack, lanes_cfg,</div><div class='add'>+					    "lanes configuration not supported by device");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	} else if (!lsettings-&gt;autoneg &amp;&amp; ksettings-&gt;lanes) {</div><div class='add'>+		/* If autoneg is off and lanes parameter is not passed from user but</div><div class='add'>+		 * it was defined previously then set the lanes parameter to 0.</div><div class='add'>+		 */</div><div class='add'>+		ksettings-&gt;lanes = 0;</div><div class='add'>+		*mod = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_update_bitset(ksettings-&gt;link_modes.advertising,</div><div class='add'>+				  __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+				  tb[ETHTOOL_A_LINKMODES_OURS], link_mode_names,</div><div class='add'>+				  info-&gt;extack, mod);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ethnl_update_u32(&amp;lsettings-&gt;speed, tb[ETHTOOL_A_LINKMODES_SPEED],</div><div class='add'>+			 mod);</div><div class='add'>+	ethnl_update_u32(&amp;ksettings-&gt;lanes, lanes_cfg, mod);</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;duplex, tb[ETHTOOL_A_LINKMODES_DUPLEX],</div><div class='add'>+			mod);</div><div class='add'>+	ethnl_update_u8(&amp;lsettings-&gt;master_slave_cfg, master_slave_cfg, mod);</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_LINKMODES_OURS] &amp;&amp; lsettings-&gt;autoneg &amp;&amp;</div><div class='add'>+	    (req_speed || req_lanes || req_duplex) &amp;&amp;</div><div class='add'>+	    ethnl_auto_linkmodes(ksettings, req_speed, req_lanes, req_duplex))</div><div class='add'>+		*mod = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_linkmodes_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_check_linkmodes(info, info-&gt;attrs);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_link_ksettings || !ops-&gt;set_link_ksettings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_linkmodes(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_link_ksettings ksettings = {};</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __ethtool_get_link_ksettings(dev, &amp;ksettings);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_update_linkmodes(info, tb, &amp;ksettings, &amp;mod, dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_link_ksettings(dev, &amp;ksettings);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		GENL_SET_ERR_MSG(info, "link settings update failed");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_linkmodes_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_LINKMODES_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_LINKMODES_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_LINKMODES_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct linkmodes_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct linkmodes_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= linkmodes_prepare_data,</div><div class='add'>+	.reply_size		= linkmodes_reply_size,</div><div class='add'>+	.fill_reply		= linkmodes_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_linkmodes_validate,</div><div class='add'>+	.set			= ethnl_set_linkmodes,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_LINKMODES_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/linkstate.c b/net/ethtool/linkstate.c<br/>new file mode 100644<br/>index 000000000000..05a5f72c99fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/linkstate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/linkstate.c</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylib_stubs.h&gt;</div><div class='add'>+</div><div class='add'>+struct linkstate_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct linkstate_reply_data {</div><div class='add'>+	struct ethnl_reply_data			base;</div><div class='add'>+	int					link;</div><div class='add'>+	int					sqi;</div><div class='add'>+	int					sqi_max;</div><div class='add'>+	struct ethtool_link_ext_stats		link_stats;</div><div class='add'>+	bool					link_ext_state_provided;</div><div class='add'>+	struct ethtool_link_ext_state_info	ethtool_link_ext_state_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LINKSTATE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct linkstate_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_linkstate_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_LINKSTATE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_stats),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int linkstate_get_sqi(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!phydev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+	if (!phydev-&gt;drv || !phydev-&gt;drv-&gt;get_sqi)</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (!phydev-&gt;link)</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+	else</div><div class='add'>+		ret = phydev-&gt;drv-&gt;get_sqi(phydev);</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkstate_get_sqi_max(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!phydev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+	if (!phydev-&gt;drv || !phydev-&gt;drv-&gt;get_sqi_max)</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (!phydev-&gt;link)</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+	else</div><div class='add'>+		ret = phydev-&gt;drv-&gt;get_sqi_max(phydev);</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool linkstate_sqi_critical_error(int sqi)</div><div class='add'>+{</div><div class='add'>+	return sqi &lt; 0 &amp;&amp; sqi != -EOPNOTSUPP &amp;&amp; sqi != -ENETDOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool linkstate_sqi_valid(struct linkstate_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	return data-&gt;sqi &gt;= 0 &amp;&amp; data-&gt;sqi_max &gt;= 0 &amp;&amp;</div><div class='add'>+	       data-&gt;sqi &lt;= data-&gt;sqi_max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkstate_get_link_ext_state(struct net_device *dev,</div><div class='add'>+					struct linkstate_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_link_ext_state)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = dev-&gt;ethtool_ops-&gt;get_link_ext_state(dev, &amp;data-&gt;ethtool_link_ext_state_info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data-&gt;link_ext_state_provided = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkstate_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				  struct ethnl_reply_data *reply_base,</div><div class='add'>+				  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct linkstate_reply_data *data = LINKSTATE_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_LINKSTATE_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR(phydev)) {</div><div class='add'>+		ret = PTR_ERR(phydev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	data-&gt;link = __ethtool_get_link(dev);</div><div class='add'>+</div><div class='add'>+	ret = linkstate_get_sqi(phydev);</div><div class='add'>+	if (linkstate_sqi_critical_error(ret))</div><div class='add'>+		goto out;</div><div class='add'>+	data-&gt;sqi = ret;</div><div class='add'>+</div><div class='add'>+	ret = linkstate_get_sqi_max(phydev);</div><div class='add'>+	if (linkstate_sqi_critical_error(ret))</div><div class='add'>+		goto out;</div><div class='add'>+	data-&gt;sqi_max = ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		ret = linkstate_get_link_ext_state(dev, data);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP &amp;&amp; ret != -ENODATA)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_stats_init((u64 *)&amp;data-&gt;link_stats,</div><div class='add'>+			   sizeof(data-&gt;link_stats) / 8);</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS) {</div><div class='add'>+		if (phydev)</div><div class='add'>+			phy_ethtool_get_link_ext_stats(phydev,</div><div class='add'>+						       &amp;data-&gt;link_stats);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;ethtool_ops-&gt;get_link_ext_stats)</div><div class='add'>+			dev-&gt;ethtool_ops-&gt;get_link_ext_stats(dev,</div><div class='add'>+							     &amp;data-&gt;link_stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkstate_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct linkstate_reply_data *data = LINKSTATE_REPDATA(reply_base);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = nla_total_size(sizeof(u8)) /* LINKSTATE_LINK */</div><div class='add'>+		+ 0;</div><div class='add'>+</div><div class='add'>+	if (linkstate_sqi_valid(data)) {</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* LINKSTATE_SQI */</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* LINKSTATE_SQI_MAX */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;link_ext_state_provided)</div><div class='add'>+		len += nla_total_size(sizeof(u8)); /* LINKSTATE_EXT_STATE */</div><div class='add'>+</div><div class='add'>+	if (data-&gt;ethtool_link_ext_state_info.__link_ext_substate)</div><div class='add'>+		len += nla_total_size(sizeof(u8)); /* LINKSTATE_EXT_SUBSTATE */</div><div class='add'>+</div><div class='add'>+	if (data-&gt;link_stats.link_down_events != ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		len += nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linkstate_fill_reply(struct sk_buff *skb,</div><div class='add'>+				const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct linkstate_reply_data *data = LINKSTATE_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;link &gt;= 0 &amp;&amp;</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_LINKSTATE_LINK, !!data-&gt;link))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (linkstate_sqi_valid(data)) {</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI, data-&gt;sqi))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI_MAX,</div><div class='add'>+				data-&gt;sqi_max))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;link_ext_state_provided) {</div><div class='add'>+		if (nla_put_u8(skb, ETHTOOL_A_LINKSTATE_EXT_STATE,</div><div class='add'>+			       data-&gt;ethtool_link_ext_state_info.link_ext_state))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (data-&gt;ethtool_link_ext_state_info.__link_ext_substate &amp;&amp;</div><div class='add'>+		    nla_put_u8(skb, ETHTOOL_A_LINKSTATE_EXT_SUBSTATE,</div><div class='add'>+			       data-&gt;ethtool_link_ext_state_info.__link_ext_substate))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;link_stats.link_down_events != ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_LINKSTATE_EXT_DOWN_CNT,</div><div class='add'>+				data-&gt;link_stats.link_down_events))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_linkstate_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_LINKSTATE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_LINKSTATE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_LINKSTATE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct linkstate_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct linkstate_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= linkstate_prepare_data,</div><div class='add'>+	.reply_size		= linkstate_reply_size,</div><div class='add'>+	.fill_reply		= linkstate_fill_reply,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/mm.c b/net/ethtool/mm.c<br/>new file mode 100644<br/>index 000000000000..29bbbc149375<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/mm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/mm.c</a></div><div class='hunk'>@@ -0,0 +1,561 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2022-2025 NXP</div><div class='add'>+ * Copyright 2024 Furong Xu &lt;0x1207@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+struct mm_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mm_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_mm_state		state;</div><div class='add'>+	struct ethtool_mm_stats		stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MM_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct mm_reply_data, base)</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_MM_STAT_CNT \</div><div class='add'>+	(__ETHTOOL_A_MM_STAT_CNT - (ETHTOOL_A_MM_STAT_PAD + 1))</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_MM_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_stats),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mm_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			   struct ethnl_reply_data *reply_base,</div><div class='add'>+			   const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mm_reply_data *data = MM_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_mm)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ethtool_stats_init((u64 *)&amp;data-&gt;stats,</div><div class='add'>+			   sizeof(data-&gt;stats) / sizeof(u64));</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;get_mm(dev, &amp;data-&gt;state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_complete;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;get_mm_stats &amp;&amp; (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS))</div><div class='add'>+		ops-&gt;get_mm_stats(dev, &amp;data-&gt;stats);</div><div class='add'>+</div><div class='add'>+out_complete:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mm_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			 const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	len += nla_total_size(sizeof(u8)); /* _MM_PMAC_ENABLED */</div><div class='add'>+	len += nla_total_size(sizeof(u8)); /* _MM_TX_ENABLED */</div><div class='add'>+	len += nla_total_size(sizeof(u8)); /* _MM_TX_ACTIVE */</div><div class='add'>+	len += nla_total_size(sizeof(u8)); /* _MM_VERIFY_ENABLED */</div><div class='add'>+	len += nla_total_size(sizeof(u8)); /* _MM_VERIFY_STATUS */</div><div class='add'>+	len += nla_total_size(sizeof(u32)); /* _MM_VERIFY_TIME */</div><div class='add'>+	len += nla_total_size(sizeof(u32)); /* _MM_MAX_VERIFY_TIME */</div><div class='add'>+	len += nla_total_size(sizeof(u32)); /* _MM_TX_MIN_FRAG_SIZE */</div><div class='add'>+	len += nla_total_size(sizeof(u32)); /* _MM_RX_MIN_FRAG_SIZE */</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS)</div><div class='add'>+		len += nla_total_size(0) + /* _MM_STATS */</div><div class='add'>+		       nla_total_size_64bit(sizeof(u64)) * ETHTOOL_MM_STAT_CNT;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mm_put_stat(struct sk_buff *skb, u64 val, u16 attrtype)</div><div class='add'>+{</div><div class='add'>+	if (val == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return 0;</div><div class='add'>+	if (nla_put_u64_64bit(skb, attrtype, val, ETHTOOL_A_MM_STAT_PAD))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mm_put_stats(struct sk_buff *skb,</div><div class='add'>+			const struct ethtool_mm_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_MM_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (mm_put_stat(skb, stats-&gt;MACMergeFrameAssErrorCount,</div><div class='add'>+			ETHTOOL_A_MM_STAT_REASSEMBLY_ERRORS) ||</div><div class='add'>+	    mm_put_stat(skb, stats-&gt;MACMergeFrameSmdErrorCount,</div><div class='add'>+			ETHTOOL_A_MM_STAT_SMD_ERRORS) ||</div><div class='add'>+	    mm_put_stat(skb, stats-&gt;MACMergeFrameAssOkCount,</div><div class='add'>+			ETHTOOL_A_MM_STAT_REASSEMBLY_OK) ||</div><div class='add'>+	    mm_put_stat(skb, stats-&gt;MACMergeFragCountRx,</div><div class='add'>+			ETHTOOL_A_MM_STAT_RX_FRAG_COUNT) ||</div><div class='add'>+	    mm_put_stat(skb, stats-&gt;MACMergeFragCountTx,</div><div class='add'>+			ETHTOOL_A_MM_STAT_TX_FRAG_COUNT) ||</div><div class='add'>+	    mm_put_stat(skb, stats-&gt;MACMergeHoldCount,</div><div class='add'>+			ETHTOOL_A_MM_STAT_HOLD_COUNT))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mm_fill_reply(struct sk_buff *skb,</div><div class='add'>+			 const struct ethnl_req_info *req_base,</div><div class='add'>+			 const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct mm_reply_data *data = MM_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_mm_state *state = &amp;data-&gt;state;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_MM_TX_ENABLED, state-&gt;tx_enabled) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MM_TX_ACTIVE, state-&gt;tx_active) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MM_PMAC_ENABLED, state-&gt;pmac_enabled) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MM_VERIFY_ENABLED, state-&gt;verify_enabled) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MM_VERIFY_STATUS, state-&gt;verify_status) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_MM_VERIFY_TIME, state-&gt;verify_time) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_MM_MAX_VERIFY_TIME, state-&gt;max_verify_time) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_MM_TX_MIN_FRAG_SIZE, state-&gt;tx_min_frag_size) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_MM_RX_MIN_FRAG_SIZE, state-&gt;rx_min_frag_size))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp;</div><div class='add'>+	    mm_put_stats(skb, &amp;data-&gt;stats))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_A_MM_HEADER]		= NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_MM_VERIFY_ENABLED]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_MM_VERIFY_TIME]	= NLA_POLICY_RANGE(NLA_U32, 1, 128),</div><div class='add'>+	[ETHTOOL_A_MM_TX_ENABLED]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_MM_PMAC_ENABLED]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_MM_TX_MIN_FRAG_SIZE]	= NLA_POLICY_RANGE(NLA_U32, 60, 252),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mm_state_to_cfg(const struct ethtool_mm_state *state,</div><div class='add'>+			    struct ethtool_mm_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	/* We could also compare state-&gt;verify_status against</div><div class='add'>+	 * ETHTOOL_MM_VERIFY_STATUS_DISABLED, but state-&gt;verify_enabled</div><div class='add'>+	 * is more like an administrative state which should be seen in</div><div class='add'>+	 * ETHTOOL_MSG_MM_GET replies. For example, a port with verification</div><div class='add'>+	 * disabled might be in the ETHTOOL_MM_VERIFY_STATUS_INITIAL</div><div class='add'>+	 * if it's down.</div><div class='add'>+	 */</div><div class='add'>+	cfg-&gt;verify_enabled = state-&gt;verify_enabled;</div><div class='add'>+	cfg-&gt;verify_time = state-&gt;verify_time;</div><div class='add'>+	cfg-&gt;tx_enabled = state-&gt;tx_enabled;</div><div class='add'>+	cfg-&gt;pmac_enabled = state-&gt;pmac_enabled;</div><div class='add'>+	cfg-&gt;tx_min_frag_size = state-&gt;tx_min_frag_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_mm_validate(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_mm &amp;&amp; ops-&gt;set_mm ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_set_mm(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct ethtool_mm_state state = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct ethtool_mm_cfg cfg = {};</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;get_mm(dev, &amp;state);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mm_state_to_cfg(&amp;state, &amp;cfg);</div><div class='add'>+</div><div class='add'>+	ethnl_update_bool(&amp;cfg.verify_enabled, tb[ETHTOOL_A_MM_VERIFY_ENABLED],</div><div class='add'>+			  &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;cfg.verify_time, tb[ETHTOOL_A_MM_VERIFY_TIME], &amp;mod);</div><div class='add'>+	ethnl_update_bool(&amp;cfg.tx_enabled, tb[ETHTOOL_A_MM_TX_ENABLED], &amp;mod);</div><div class='add'>+	ethnl_update_bool(&amp;cfg.pmac_enabled, tb[ETHTOOL_A_MM_PMAC_ENABLED],</div><div class='add'>+			  &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;cfg.tx_min_frag_size,</div><div class='add'>+			 tb[ETHTOOL_A_MM_TX_MIN_FRAG_SIZE], &amp;mod);</div><div class='add'>+</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cfg.verify_time &gt; state.max_verify_time) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MM_VERIFY_TIME],</div><div class='add'>+				    "verifyTime exceeds device maximum");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg.verify_enabled &amp;&amp; !cfg.tx_enabled) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Verification requires TX enabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg.tx_enabled &amp;&amp; !cfg.pmac_enabled) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "TX enabled requires pMAC enabled");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_mm(dev, &amp;cfg, extack);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_mm_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_MM_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_MM_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_MM_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct mm_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct mm_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= mm_prepare_data,</div><div class='add'>+	.reply_size		= mm_reply_size,</div><div class='add'>+	.fill_reply		= mm_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_mm_validate,</div><div class='add'>+	.set			= ethnl_set_mm,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_MM_NTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Returns whether a given device supports the MAC merge layer</div><div class='add'>+ * (has an eMAC and a pMAC). Must be called under rtnl_lock() and</div><div class='add'>+ * ethnl_ops_begin().</div><div class='add'>+ */</div><div class='add'>+bool __ethtool_dev_mm_supported(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_mm_state state = {};</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_mm)</div><div class='add'>+		ret = ops-&gt;get_mm(dev, &amp;state);</div><div class='add'>+</div><div class='add'>+	return !ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ethtool_dev_mm_supported(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	bool supported;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	supported = __ethtool_dev_mm_supported(dev);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return supported;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_dev_mm_supported);</div><div class='add'>+</div><div class='add'>+static void ethtool_mmsv_configure_tx(struct ethtool_mmsv *mmsv,</div><div class='add'>+				      bool tx_active)</div><div class='add'>+{</div><div class='add'>+	if (mmsv-&gt;ops-&gt;configure_tx)</div><div class='add'>+		mmsv-&gt;ops-&gt;configure_tx(mmsv, tx_active);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethtool_mmsv_configure_pmac(struct ethtool_mmsv *mmsv,</div><div class='add'>+					bool pmac_enabled)</div><div class='add'>+{</div><div class='add'>+	if (mmsv-&gt;ops-&gt;configure_pmac)</div><div class='add'>+		mmsv-&gt;ops-&gt;configure_pmac(mmsv, pmac_enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethtool_mmsv_send_mpacket(struct ethtool_mmsv *mmsv,</div><div class='add'>+				      enum ethtool_mpacket mpacket)</div><div class='add'>+{</div><div class='add'>+	if (mmsv-&gt;ops-&gt;send_mpacket)</div><div class='add'>+		mmsv-&gt;ops-&gt;send_mpacket(mmsv, mpacket);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_verify_timer - Timer for MAC Merge verification</div><div class='add'>+ * @t: timer_list struct containing private info</div><div class='add'>+ *</div><div class='add'>+ * Verify the MAC Merge capability in the local TX direction, by</div><div class='add'>+ * transmitting Verify mPackets up to 3 times. Wait until link</div><div class='add'>+ * partner responds with a Response mPacket, otherwise fail.</div><div class='add'>+ */</div><div class='add'>+static void ethtool_mmsv_verify_timer(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_mmsv *mmsv = timer_container_of(mmsv, t, verify_timer);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool rearm = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (mmsv-&gt;status) {</div><div class='add'>+	case ETHTOOL_MM_VERIFY_STATUS_INITIAL:</div><div class='add'>+	case ETHTOOL_MM_VERIFY_STATUS_VERIFYING:</div><div class='add'>+		if (mmsv-&gt;verify_retries != 0) {</div><div class='add'>+			ethtool_mmsv_send_mpacket(mmsv, ETHTOOL_MPACKET_VERIFY);</div><div class='add'>+			rearm = true;</div><div class='add'>+		} else {</div><div class='add'>+			mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_FAILED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mmsv-&gt;verify_retries--;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED:</div><div class='add'>+		ethtool_mmsv_configure_tx(mmsv, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rearm) {</div><div class='add'>+		mod_timer(&amp;mmsv-&gt;verify_timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(mmsv-&gt;verify_time));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethtool_mmsv_verify_timer_arm(struct ethtool_mmsv *mmsv)</div><div class='add'>+{</div><div class='add'>+	if (mmsv-&gt;pmac_enabled &amp;&amp; mmsv-&gt;tx_enabled &amp;&amp; mmsv-&gt;verify_enabled &amp;&amp;</div><div class='add'>+	    mmsv-&gt;status != ETHTOOL_MM_VERIFY_STATUS_FAILED &amp;&amp;</div><div class='add'>+	    mmsv-&gt;status != ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED) {</div><div class='add'>+		timer_setup(&amp;mmsv-&gt;verify_timer, ethtool_mmsv_verify_timer, 0);</div><div class='add'>+		mod_timer(&amp;mmsv-&gt;verify_timer, jiffies);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethtool_mmsv_apply(struct ethtool_mmsv *mmsv)</div><div class='add'>+{</div><div class='add'>+	/* If verification is disabled, configure FPE right away.</div><div class='add'>+	 * Otherwise let the timer code do it.</div><div class='add'>+	 */</div><div class='add'>+	if (!mmsv-&gt;verify_enabled) {</div><div class='add'>+		ethtool_mmsv_configure_pmac(mmsv, mmsv-&gt;pmac_enabled);</div><div class='add'>+		ethtool_mmsv_configure_tx(mmsv, mmsv-&gt;tx_enabled);</div><div class='add'>+	} else {</div><div class='add'>+		mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_INITIAL;</div><div class='add'>+		mmsv-&gt;verify_retries = ETHTOOL_MM_MAX_VERIFY_RETRIES;</div><div class='add'>+</div><div class='add'>+		if (netif_running(mmsv-&gt;dev))</div><div class='add'>+			ethtool_mmsv_verify_timer_arm(mmsv);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_stop() - Stop MAC Merge Software Verification</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ *</div><div class='add'>+ * Drivers should call this method in a state where the hardware is</div><div class='add'>+ * about to lose state, like ndo_stop() or suspend(), and turning off</div><div class='add'>+ * MAC Merge features would be superfluous. Otherwise, prefer</div><div class='add'>+ * ethtool_mmsv_link_state_handle() with up=false.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_stop(struct ethtool_mmsv *mmsv)</div><div class='add'>+{</div><div class='add'>+	timer_shutdown_sync(&amp;mmsv-&gt;verify_timer);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_stop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_link_state_handle() - Inform MAC Merge Software Verification</div><div class='add'>+ *				      of link state changes</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ * @up: True if device carrier is up and able to pass verification packets</div><div class='add'>+ *</div><div class='add'>+ * Calling context is expected to be from a task, interrupts enabled.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_link_state_handle(struct ethtool_mmsv *mmsv, bool up)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	ethtool_mmsv_stop(mmsv);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (up &amp;&amp; mmsv-&gt;pmac_enabled) {</div><div class='add'>+		/* VERIFY process requires pMAC enabled when NIC comes up */</div><div class='add'>+		ethtool_mmsv_configure_pmac(mmsv, true);</div><div class='add'>+</div><div class='add'>+		/* New link =&gt; maybe new partner =&gt; new verification process */</div><div class='add'>+		ethtool_mmsv_apply(mmsv);</div><div class='add'>+	} else {</div><div class='add'>+		/* Reset the reported verification state while the link is down */</div><div class='add'>+		if (mmsv-&gt;verify_enabled)</div><div class='add'>+			mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_INITIAL;</div><div class='add'>+</div><div class='add'>+		/* No link or pMAC not enabled */</div><div class='add'>+		ethtool_mmsv_configure_pmac(mmsv, false);</div><div class='add'>+		ethtool_mmsv_configure_tx(mmsv, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_link_state_handle);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_event_handle() - Inform MAC Merge Software Verification</div><div class='add'>+ *				 of interrupt-based events</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ * @event: Event which took place (packet transmission or reception)</div><div class='add'>+ *</div><div class='add'>+ * Calling context expects to have interrupts disabled.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_event_handle(struct ethtool_mmsv *mmsv,</div><div class='add'>+			       enum ethtool_mmsv_event event)</div><div class='add'>+{</div><div class='add'>+	/* This is interrupt context, just spin_lock() */</div><div class='add'>+	spin_lock(&amp;mmsv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!mmsv-&gt;pmac_enabled)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case ETHTOOL_MMSV_LP_SENT_VERIFY_MPACKET:</div><div class='add'>+		/* Link partner has sent verify mPacket */</div><div class='add'>+		ethtool_mmsv_send_mpacket(mmsv, ETHTOOL_MPACKET_RESPONSE);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_MMSV_LD_SENT_VERIFY_MPACKET:</div><div class='add'>+		/* Local device has sent verify mPacket */</div><div class='add'>+		if (mmsv-&gt;status != ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED)</div><div class='add'>+			mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_VERIFYING;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_MMSV_LP_SENT_RESPONSE_MPACKET:</div><div class='add'>+		/* Link partner has sent response mPacket */</div><div class='add'>+		if (mmsv-&gt;status == ETHTOOL_MM_VERIFY_STATUS_VERIFYING)</div><div class='add'>+			mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;mmsv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_event_handle);</div><div class='add'>+</div><div class='add'>+static bool ethtool_mmsv_is_tx_active(struct ethtool_mmsv *mmsv)</div><div class='add'>+{</div><div class='add'>+	/* TX is active if administratively enabled, and verification either</div><div class='add'>+	 * succeeded, or was administratively disabled.</div><div class='add'>+	 */</div><div class='add'>+	return mmsv-&gt;tx_enabled &amp;&amp;</div><div class='add'>+	       (mmsv-&gt;status == ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED ||</div><div class='add'>+	       mmsv-&gt;status == ETHTOOL_MM_VERIFY_STATUS_DISABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_get_mm() - get_mm() hook for MAC Merge Software Verification</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ * @state: see struct ethtool_mm_state</div><div class='add'>+ *</div><div class='add'>+ * Drivers are expected to call this from their ethtool_ops :: get_mm()</div><div class='add'>+ * method.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_get_mm(struct ethtool_mmsv *mmsv,</div><div class='add'>+			 struct ethtool_mm_state *state)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	state-&gt;max_verify_time = ETHTOOL_MM_MAX_VERIFY_TIME_MS;</div><div class='add'>+	state-&gt;verify_enabled = mmsv-&gt;verify_enabled;</div><div class='add'>+	state-&gt;pmac_enabled = mmsv-&gt;pmac_enabled;</div><div class='add'>+	state-&gt;verify_time = mmsv-&gt;verify_time;</div><div class='add'>+	state-&gt;tx_enabled = mmsv-&gt;tx_enabled;</div><div class='add'>+	state-&gt;verify_status = mmsv-&gt;status;</div><div class='add'>+	state-&gt;tx_active = ethtool_mmsv_is_tx_active(mmsv);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_get_mm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_set_mm() - set_mm() hook for MAC Merge Software Verification</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ * @cfg: see struct ethtool_mm_cfg</div><div class='add'>+ *</div><div class='add'>+ * Drivers are expected to call this from their ethtool_ops :: set_mm()</div><div class='add'>+ * method.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_set_mm(struct ethtool_mmsv *mmsv, struct ethtool_mm_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Wait for the verification that's currently in progress to finish */</div><div class='add'>+	ethtool_mmsv_stop(mmsv);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	mmsv-&gt;verify_enabled = cfg-&gt;verify_enabled;</div><div class='add'>+	mmsv-&gt;pmac_enabled = cfg-&gt;pmac_enabled;</div><div class='add'>+	mmsv-&gt;verify_time = cfg-&gt;verify_time;</div><div class='add'>+	mmsv-&gt;tx_enabled = cfg-&gt;tx_enabled;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;verify_enabled)</div><div class='add'>+		mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_DISABLED;</div><div class='add'>+</div><div class='add'>+	ethtool_mmsv_apply(mmsv);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mmsv-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_set_mm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethtool_mmsv_init() - Initialize MAC Merge Software Verification state</div><div class='add'>+ * @mmsv: MAC Merge Software Verification state</div><div class='add'>+ * @dev: Pointer to network interface</div><div class='add'>+ * @ops: Methods for implementing the generic functionality</div><div class='add'>+ *</div><div class='add'>+ * The MAC Merge Software Verification is a timer- and event-based state</div><div class='add'>+ * machine intended for network interfaces which lack a hardware-based</div><div class='add'>+ * TX verification process (as per IEEE 802.3 clause 99.4.3). The timer</div><div class='add'>+ * is managed by the core code, whereas events are supplied by the</div><div class='add'>+ * driver explicitly calling one of the other API functions.</div><div class='add'>+ */</div><div class='add'>+void ethtool_mmsv_init(struct ethtool_mmsv *mmsv, struct net_device *dev,</div><div class='add'>+		       const struct ethtool_mmsv_ops *ops)</div><div class='add'>+{</div><div class='add'>+	mmsv-&gt;ops = ops;</div><div class='add'>+	mmsv-&gt;dev = dev;</div><div class='add'>+	mmsv-&gt;verify_retries = ETHTOOL_MM_MAX_VERIFY_RETRIES;</div><div class='add'>+	mmsv-&gt;verify_time = ETHTOOL_MM_MAX_VERIFY_TIME_MS;</div><div class='add'>+	mmsv-&gt;status = ETHTOOL_MM_VERIFY_STATUS_DISABLED;</div><div class='add'>+	timer_setup(&amp;mmsv-&gt;verify_timer, ethtool_mmsv_verify_timer, 0);</div><div class='add'>+	spin_lock_init(&amp;mmsv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethtool_mmsv_init);</div><div class='head'>diff --git a/net/ethtool/module.c b/net/ethtool/module.c<br/>new file mode 100644<br/>index 000000000000..4d4e0a82579a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/module.c</a></div><div class='hunk'>@@ -0,0 +1,557 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/sfp.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+#include "module_fw.h"</div><div class='add'>+</div><div class='add'>+struct module_req_info {</div><div class='add'>+	struct ethnl_req_info base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct module_reply_data {</div><div class='add'>+	struct ethnl_reply_data	base;</div><div class='add'>+	struct ethtool_module_power_mode_params power;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MODULE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct module_reply_data, base)</div><div class='add'>+</div><div class='add'>+/* MODULE_GET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_module_get_policy[ETHTOOL_A_MODULE_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_MODULE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int module_get_power_mode(struct net_device *dev,</div><div class='add'>+				 struct module_reply_data *data,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_module_power_mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Module firmware flashing is in progress");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_module_power_mode(dev, &amp;data-&gt;power, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int module_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			       struct ethnl_reply_data *reply_base,</div><div class='add'>+			       const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct module_reply_data *data = MODULE_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = module_get_power_mode(dev, data, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_complete;</div><div class='add'>+</div><div class='add'>+out_complete:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int module_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct module_reply_data *data = MODULE_REPDATA(reply_base);</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;power.policy)</div><div class='add'>+		len += nla_total_size(sizeof(u8));	/* _MODULE_POWER_MODE_POLICY */</div><div class='add'>+</div><div class='add'>+	if (data-&gt;power.mode)</div><div class='add'>+		len += nla_total_size(sizeof(u8));	/* _MODULE_POWER_MODE */</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int module_fill_reply(struct sk_buff *skb,</div><div class='add'>+			     const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct module_reply_data *data = MODULE_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;power.policy &amp;&amp;</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MODULE_POWER_MODE_POLICY,</div><div class='add'>+		       data-&gt;power.policy))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;power.mode &amp;&amp;</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_MODULE_POWER_MODE, data-&gt;power.mode))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MODULE_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLICY + 1] = {</div><div class='add'>+	[ETHTOOL_A_MODULE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_MODULE_POWER_MODE_POLICY] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U8, ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH,</div><div class='add'>+				 ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_module_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			  struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (req_info-&gt;dev-&gt;ethtool-&gt;module_fw_flash_in_progress) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "Module firmware flashing is in progress");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_module_power_mode || !ops-&gt;set_module_power_mode) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY],</div><div class='add'>+				    "Setting power mode policy is not supported by this device");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_module(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_power_mode_params power = {};</div><div class='add'>+	struct ethtool_module_power_mode_params power_new;</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	power_new.policy = nla_get_u8(tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY]);</div><div class='add'>+	ret = ops-&gt;get_module_power_mode(dev, &amp;power, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (power_new.policy == power.policy)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;set_module_power_mode(dev, &amp;power_new, info-&gt;extack);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_module_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_MODULE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_MODULE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_MODULE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct module_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct module_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= module_prepare_data,</div><div class='add'>+	.reply_size		= module_reply_size,</div><div class='add'>+	.fill_reply		= module_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_module_validate,</div><div class='add'>+	.set			= ethnl_set_module,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_MODULE_NTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MODULE_FW_FLASH_ACT */</div><div class='add'>+</div><div class='add'>+const struct nla_policy</div><div class='add'>+ethnl_module_fw_flash_act_policy[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD + 1] = {</div><div class='add'>+	[ETHTOOL_A_MODULE_FW_FLASH_HEADER] =</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_MODULE_FW_FLASH_FILE_NAME] = { .type = NLA_NUL_STRING },</div><div class='add'>+	[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(module_fw_flash_work_list);</div><div class='add'>+static DEFINE_SPINLOCK(module_fw_flash_work_list_lock);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+module_flash_fw_work_list_add(struct ethtool_module_fw_flash *module_fw,</div><div class='add'>+			      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_fw_flash *work;</div><div class='add'>+</div><div class='add'>+	/* First, check if already registered. */</div><div class='add'>+	spin_lock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+	list_for_each_entry(work, &amp;module_fw_flash_work_list, list) {</div><div class='add'>+		if (work-&gt;fw_update.ntf_params.portid == info-&gt;snd_portid &amp;&amp;</div><div class='add'>+		    work-&gt;fw_update.dev == module_fw-&gt;fw_update.dev) {</div><div class='add'>+			spin_unlock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+			return -EALREADY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;module_fw-&gt;list, &amp;module_fw_flash_work_list);</div><div class='add'>+	spin_unlock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void module_flash_fw_work_list_del(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+	list_del(list);</div><div class='add'>+	spin_unlock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void module_flash_fw_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_fw_flash *module_fw;</div><div class='add'>+</div><div class='add'>+	module_fw = container_of(work, struct ethtool_module_fw_flash, work);</div><div class='add'>+</div><div class='add'>+	ethtool_cmis_fw_update(&amp;module_fw-&gt;fw_update);</div><div class='add'>+</div><div class='add'>+	module_flash_fw_work_list_del(&amp;module_fw-&gt;list);</div><div class='add'>+	module_fw-&gt;fw_update.dev-&gt;ethtool-&gt;module_fw_flash_in_progress = false;</div><div class='add'>+	netdev_put(module_fw-&gt;fw_update.dev, &amp;module_fw-&gt;dev_tracker);</div><div class='add'>+	release_firmware(module_fw-&gt;fw_update.fw);</div><div class='add'>+	kfree(module_fw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MODULE_EEPROM_PHYS_ID_PAGE	0</div><div class='add'>+#define MODULE_EEPROM_PHYS_ID_I2C_ADDR	0x50</div><div class='add'>+</div><div class='add'>+static int module_flash_fw_work_init(struct ethtool_module_fw_flash *module_fw,</div><div class='add'>+				     struct net_device *dev,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_module_eeprom page_data = {};</div><div class='add'>+	u8 phys_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Fetch the SFF-8024 Identifier Value. For all supported standards, it</div><div class='add'>+	 * is located at I2C address 0x50, byte 0. See section 4.1 in SFF-8024,</div><div class='add'>+	 * revision 4.9.</div><div class='add'>+	 */</div><div class='add'>+	page_data.page = MODULE_EEPROM_PHYS_ID_PAGE;</div><div class='add'>+	page_data.offset = SFP_PHYS_ID;</div><div class='add'>+	page_data.length = sizeof(phys_id);</div><div class='add'>+	page_data.i2c_address = MODULE_EEPROM_PHYS_ID_I2C_ADDR;</div><div class='add'>+	page_data.data = &amp;phys_id;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;get_module_eeprom_by_page(dev, &amp;page_data, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (phys_id) {</div><div class='add'>+	case SFF8024_ID_QSFP_DD:</div><div class='add'>+	case SFF8024_ID_OSFP:</div><div class='add'>+	case SFF8024_ID_DSFP:</div><div class='add'>+	case SFF8024_ID_QSFP_PLUS_CMIS:</div><div class='add'>+	case SFF8024_ID_SFP_DD_CMIS:</div><div class='add'>+	case SFF8024_ID_SFP_PLUS_CMIS:</div><div class='add'>+		INIT_WORK(&amp;module_fw-&gt;work, module_flash_fw_work);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Module type does not support firmware flashing");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethnl_module_fw_flash_sock_destroy(struct ethnl_sock_priv *sk_priv)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_fw_flash *work;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+	list_for_each_entry(work, &amp;module_fw_flash_work_list, list) {</div><div class='add'>+		if (work-&gt;fw_update.dev == sk_priv-&gt;dev &amp;&amp;</div><div class='add'>+		    work-&gt;fw_update.ntf_params.portid == sk_priv-&gt;portid) {</div><div class='add'>+			work-&gt;fw_update.ntf_params.closed_sock = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;module_fw_flash_work_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+module_flash_fw_schedule(struct net_device *dev, const char *file_name,</div><div class='add'>+			 struct ethtool_module_fw_flash_params *params,</div><div class='add'>+			 struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_cmis_fw_update_params *fw_update;</div><div class='add'>+	struct ethtool_module_fw_flash *module_fw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	module_fw = kzalloc(sizeof(*module_fw), GFP_KERNEL);</div><div class='add'>+	if (!module_fw)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fw_update = &amp;module_fw-&gt;fw_update;</div><div class='add'>+	fw_update-&gt;params = *params;</div><div class='add'>+	err = request_firmware_direct(&amp;fw_update-&gt;fw,</div><div class='add'>+				      file_name, &amp;dev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "Failed to request module firmware image");</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = module_flash_fw_work_init(module_fw, dev, info-&gt;extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_firmware;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool-&gt;module_fw_flash_in_progress = true;</div><div class='add'>+	netdev_hold(dev, &amp;module_fw-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	fw_update-&gt;dev = dev;</div><div class='add'>+	fw_update-&gt;ntf_params.portid = info-&gt;snd_portid;</div><div class='add'>+	fw_update-&gt;ntf_params.seq = info-&gt;snd_seq;</div><div class='add'>+	fw_update-&gt;ntf_params.closed_sock = false;</div><div class='add'>+</div><div class='add'>+	err = ethnl_sock_priv_set(skb, dev, fw_update-&gt;ntf_params.portid,</div><div class='add'>+				  ETHTOOL_SOCK_TYPE_MODULE_FW_FLASH);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_firmware;</div><div class='add'>+</div><div class='add'>+	err = module_flash_fw_work_list_add(module_fw, info);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_firmware;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;module_fw-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_release_firmware:</div><div class='add'>+	release_firmware(fw_update-&gt;fw);</div><div class='add'>+err_free:</div><div class='add'>+	kfree(module_fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int module_flash_fw(struct net_device *dev, struct nlattr **tb,</div><div class='add'>+			   struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_module_fw_flash_params params = {};</div><div class='add'>+	const char *file_name;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, ETHTOOL_A_MODULE_FW_FLASH_FILE_NAME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	file_name = nla_data(tb[ETHTOOL_A_MODULE_FW_FLASH_FILE_NAME]);</div><div class='add'>+</div><div class='add'>+	attr = tb[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD];</div><div class='add'>+	if (attr) {</div><div class='add'>+		params.password = cpu_to_be32(nla_get_u32(attr));</div><div class='add'>+		params.password_valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return module_flash_fw_schedule(dev, file_name, &amp;params, skb, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_module_fw_flash_validate(struct net_device *dev,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = dev-&gt;devlink_port;</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;set_module_eeprom_by_page ||</div><div class='add'>+	    !ops-&gt;get_module_eeprom_by_page) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Flashing module firmware is not supported by this device");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;reset) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Reset module is not supported by this device, so flashing is not permitted");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Module firmware flashing already in progress");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Netdevice is up, so flashing is not permitted");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devlink_port &amp;&amp; devlink_port-&gt;attrs.split) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can't perform firmware flashing on a split port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_act_module_fw_flash(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_MODULE_FW_FLASH_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	dev = req_info.dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_module_fw_flash_validate(dev, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = module_flash_fw(dev, tb, skb, info);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MODULE_FW_FLASH_NTF */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_module_fw_flash_ntf_put_err(struct sk_buff *skb, char *err_msg,</div><div class='add'>+				  char *sub_err_msg)</div><div class='add'>+{</div><div class='add'>+	int err_msg_len, sub_err_msg_len, total_len;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (!err_msg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err_msg_len = strlen(err_msg);</div><div class='add'>+	total_len = err_msg_len + 2; /* For period and NUL. */</div><div class='add'>+</div><div class='add'>+	if (sub_err_msg) {</div><div class='add'>+		sub_err_msg_len = strlen(sub_err_msg);</div><div class='add'>+		total_len += sub_err_msg_len + 2; /* For ", ". */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr = nla_reserve(skb, ETHTOOL_A_MODULE_FW_FLASH_STATUS_MSG,</div><div class='add'>+			   total_len);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (sub_err_msg)</div><div class='add'>+		sprintf(nla_data(attr), "%s, %s.", err_msg, sub_err_msg);</div><div class='add'>+	else</div><div class='add'>+		sprintf(nla_data(attr), "%s.", err_msg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ethnl_module_fw_flash_ntf(struct net_device *dev,</div><div class='add'>+			  enum ethtool_module_fw_flash_status status,</div><div class='add'>+			  struct ethnl_module_fw_flash_ntf_params *ntf_params,</div><div class='add'>+			  char *err_msg, char *sub_err_msg,</div><div class='add'>+			  u64 done, u64 total)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ntf_params-&gt;closed_sock)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = ethnl_unicast_put(skb, ntf_params-&gt;portid, ++ntf_params-&gt;seq,</div><div class='add'>+				ETHTOOL_MSG_MODULE_FW_FLASH_NTF);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, dev,</div><div class='add'>+				      ETHTOOL_A_MODULE_FW_FLASH_HEADER);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_MODULE_FW_FLASH_STATUS, status))</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_module_fw_flash_ntf_put_err(skb, err_msg, sub_err_msg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(skb, ETHTOOL_A_MODULE_FW_FLASH_DONE, done))</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(skb, ETHTOOL_A_MODULE_FW_FLASH_TOTAL, total))</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	genlmsg_unicast(dev_net(dev), skb, ntf_params-&gt;portid);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_skb:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethnl_module_fw_flash_ntf_err(struct net_device *dev,</div><div class='add'>+				   struct ethnl_module_fw_flash_ntf_params *params,</div><div class='add'>+				   char *err_msg, char *sub_err_msg)</div><div class='add'>+{</div><div class='add'>+	ethnl_module_fw_flash_ntf(dev, ETHTOOL_MODULE_FW_FLASH_STATUS_ERROR,</div><div class='add'>+				  params, err_msg, sub_err_msg, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_start(struct net_device *dev,</div><div class='add'>+				struct ethnl_module_fw_flash_ntf_params *params)</div><div class='add'>+{</div><div class='add'>+	ethnl_module_fw_flash_ntf(dev, ETHTOOL_MODULE_FW_FLASH_STATUS_STARTED,</div><div class='add'>+				  params, NULL, NULL, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_complete(struct net_device *dev,</div><div class='add'>+				   struct ethnl_module_fw_flash_ntf_params *params)</div><div class='add'>+{</div><div class='add'>+	ethnl_module_fw_flash_ntf(dev, ETHTOOL_MODULE_FW_FLASH_STATUS_COMPLETED,</div><div class='add'>+				  params, NULL, NULL, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_in_progress(struct net_device *dev,</div><div class='add'>+				      struct ethnl_module_fw_flash_ntf_params *params,</div><div class='add'>+				      u64 done, u64 total)</div><div class='add'>+{</div><div class='add'>+	ethnl_module_fw_flash_ntf(dev,</div><div class='add'>+				  ETHTOOL_MODULE_FW_FLASH_STATUS_IN_PROGRESS,</div><div class='add'>+				  params, NULL, NULL, done, total);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/module_fw.h b/net/ethtool/module_fw.h<br/>new file mode 100644<br/>index 000000000000..634543a12d0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/module_fw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/module_fw.h</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/ethtool.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_module_fw_flash_ntf_params - module firmware flashing</div><div class='add'>+ *						notifications parameters</div><div class='add'>+ * @portid: Netlink portid of sender.</div><div class='add'>+ * @seq: Sequence number of sender.</div><div class='add'>+ * @closed_sock: Indicates whether the socket was closed from user space.</div><div class='add'>+ */</div><div class='add'>+struct ethnl_module_fw_flash_ntf_params {</div><div class='add'>+	u32 portid;</div><div class='add'>+	u32 seq;</div><div class='add'>+	bool closed_sock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_module_fw_flash_params - module firmware flashing parameters</div><div class='add'>+ * @password: Module password. Only valid when @pass_valid is set.</div><div class='add'>+ * @password_valid: Whether the module password is valid or not.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_module_fw_flash_params {</div><div class='add'>+	__be32 password;</div><div class='add'>+	u8 password_valid:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_cmis_fw_update_params - CMIS firmware update specific</div><div class='add'>+ *						parameters</div><div class='add'>+ * @dev: Pointer to the net_device to be flashed.</div><div class='add'>+ * @params: Module firmware flashing parameters.</div><div class='add'>+ * @ntf_params: Module firmware flashing notification parameters.</div><div class='add'>+ * @fw: Firmware to flash.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_cmis_fw_update_params {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct ethtool_module_fw_flash_params params;</div><div class='add'>+	struct ethnl_module_fw_flash_ntf_params ntf_params;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_module_fw_flash - module firmware flashing</div><div class='add'>+ * @list: List node for &amp;module_fw_flash_work_list.</div><div class='add'>+ * @dev_tracker: Refcount tracker for @dev.</div><div class='add'>+ * @work: The flashing firmware work.</div><div class='add'>+ * @fw_update: CMIS firmware update specific parameters.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_module_fw_flash {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct ethtool_cmis_fw_update_params fw_update;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ethnl_module_fw_flash_sock_destroy(struct ethnl_sock_priv *sk_priv);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_err(struct net_device *dev,</div><div class='add'>+			      struct ethnl_module_fw_flash_ntf_params *params,</div><div class='add'>+			      char *err_msg, char *sub_err_msg);</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_start(struct net_device *dev,</div><div class='add'>+				struct ethnl_module_fw_flash_ntf_params *params);</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_complete(struct net_device *dev,</div><div class='add'>+				   struct ethnl_module_fw_flash_ntf_params *params);</div><div class='add'>+void</div><div class='add'>+ethnl_module_fw_flash_ntf_in_progress(struct net_device *dev,</div><div class='add'>+				      struct ethnl_module_fw_flash_ntf_params *params,</div><div class='add'>+				      u64 done, u64 total);</div><div class='add'>+</div><div class='add'>+void ethtool_cmis_fw_update(struct ethtool_cmis_fw_update_params *params);</div><div class='head'>diff --git a/net/ethtool/mse.c b/net/ethtool/mse.c<br/>new file mode 100644<br/>index 000000000000..6aac004c3ffc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/mse.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/mse.c</a></div><div class='hunk'>@@ -0,0 +1,329 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* Channels A-D only; WORST and LINK are exclusive alternatives */</div><div class='add'>+#define PHY_MSE_CHANNEL_COUNT 4</div><div class='add'>+</div><div class='add'>+struct mse_req_info {</div><div class='add'>+	struct ethnl_req_info base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mse_snapshot_entry {</div><div class='add'>+	struct phy_mse_snapshot snapshot;</div><div class='add'>+	int channel;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mse_reply_data {</div><div class='add'>+	struct ethnl_reply_data base;</div><div class='add'>+	struct phy_mse_capability capability;</div><div class='add'>+	struct mse_snapshot_entry *snapshots;</div><div class='add'>+	unsigned int num_snapshots;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mse_reply_data *</div><div class='add'>+mse_repdata(const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return container_of(reply_base, struct mse_reply_data, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_mse_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_MSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_snapshot_if_supported(struct phy_device *phydev,</div><div class='add'>+				     struct mse_reply_data *data,</div><div class='add'>+				     unsigned int *idx, u32 cap_bit,</div><div class='add'>+				     enum phy_mse_channel channel)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;capability.supported_caps &amp; cap_bit) {</div><div class='add'>+		ret = phydev-&gt;drv-&gt;get_mse_snapshot(phydev, channel,</div><div class='add'>+					&amp;data-&gt;snapshots[*idx].snapshot);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		data-&gt;snapshots[*idx].channel = channel;</div><div class='add'>+		(*idx)++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mse_get_channels(struct phy_device *phydev,</div><div class='add'>+			    struct mse_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;capability.supported_caps)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	data-&gt;snapshots = kcalloc(PHY_MSE_CHANNEL_COUNT,</div><div class='add'>+				  sizeof(*data-&gt;snapshots), GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;snapshots)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Priority 1: Individual channels */</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i, PHY_MSE_CAP_CHANNEL_A,</div><div class='add'>+					PHY_MSE_CHANNEL_A);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i, PHY_MSE_CAP_CHANNEL_B,</div><div class='add'>+					PHY_MSE_CHANNEL_B);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i, PHY_MSE_CAP_CHANNEL_C,</div><div class='add'>+					PHY_MSE_CHANNEL_C);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i, PHY_MSE_CAP_CHANNEL_D,</div><div class='add'>+					PHY_MSE_CHANNEL_D);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If any individual channels were found, we are done. */</div><div class='add'>+	if (i &gt; 0) {</div><div class='add'>+		data-&gt;num_snapshots = i;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Priority 2: Worst channel, if no individual channels supported. */</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i,</div><div class='add'>+					PHY_MSE_CAP_WORST_CHANNEL,</div><div class='add'>+					PHY_MSE_CHANNEL_WORST);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If worst channel was found, we are done. */</div><div class='add'>+	if (i &gt; 0) {</div><div class='add'>+		data-&gt;num_snapshots = i;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Priority 3: Link-wide, if nothing else is supported. */</div><div class='add'>+	ret = get_snapshot_if_supported(phydev, data, &amp;i, PHY_MSE_CAP_LINK,</div><div class='add'>+					PHY_MSE_CHANNEL_LINK);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data-&gt;num_snapshots = i;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mse_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			    struct ethnl_reply_data *reply_base,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mse_reply_data *data = mse_repdata(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, info-&gt;attrs,</div><div class='add'>+				      ETHTOOL_A_MSE_HEADER, info-&gt;extack);</div><div class='add'>+	if (IS_ERR(phydev))</div><div class='add'>+		return PTR_ERR(phydev);</div><div class='add'>+	if (!phydev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;drv || !phydev-&gt;drv-&gt;get_mse_capability ||</div><div class='add'>+	    !phydev-&gt;drv-&gt;get_mse_snapshot) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	if (!phydev-&gt;link) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = phydev-&gt;drv-&gt;get_mse_capability(phydev, &amp;data-&gt;capability);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = mse_get_channels(phydev, data);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(data-&gt;snapshots);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mse_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct mse_reply_data *data = mse_repdata(reply_base);</div><div class='add'>+</div><div class='add'>+	kfree(data-&gt;snapshots);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mse_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct mse_reply_data *data = mse_repdata(reply_base);</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_MSE_CAPABILITIES */</div><div class='add'>+	len += nla_total_size(0);</div><div class='add'>+	if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_AVG)</div><div class='add'>+		/* ETHTOOL_A_MSE_CAPABILITIES_MAX_AVERAGE_MSE */</div><div class='add'>+		len += nla_total_size(sizeof(u64));</div><div class='add'>+	if (data-&gt;capability.supported_caps &amp; (PHY_MSE_CAP_PEAK |</div><div class='add'>+					       PHY_MSE_CAP_WORST_PEAK))</div><div class='add'>+		/* ETHTOOL_A_MSE_CAPABILITIES_MAX_PEAK_MSE */</div><div class='add'>+		len += nla_total_size(sizeof(u64));</div><div class='add'>+	/* ETHTOOL_A_MSE_CAPABILITIES_REFRESH_RATE_PS */</div><div class='add'>+	len += nla_total_size(sizeof(u64));</div><div class='add'>+	/* ETHTOOL_A_MSE_CAPABILITIES_NUM_SYMBOLS */</div><div class='add'>+	len += nla_total_size(sizeof(u64));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;num_snapshots; i++) {</div><div class='add'>+		size_t snapshot_len = 0;</div><div class='add'>+</div><div class='add'>+		/* Per-channel nest (e.g., ETHTOOL_A_MSE_CHANNEL_A / _B / _C /</div><div class='add'>+		 * _D / _WORST_CHANNEL / _LINK)</div><div class='add'>+		 */</div><div class='add'>+		snapshot_len += nla_total_size(0);</div><div class='add'>+</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_AVG)</div><div class='add'>+			snapshot_len += nla_total_size(sizeof(u64));</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_PEAK)</div><div class='add'>+			snapshot_len += nla_total_size(sizeof(u64));</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_WORST_PEAK)</div><div class='add'>+			snapshot_len += nla_total_size(sizeof(u64));</div><div class='add'>+</div><div class='add'>+		len += snapshot_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mse_channel_to_attr(int ch)</div><div class='add'>+{</div><div class='add'>+	switch (ch) {</div><div class='add'>+	case PHY_MSE_CHANNEL_A:</div><div class='add'>+		return ETHTOOL_A_MSE_CHANNEL_A;</div><div class='add'>+	case PHY_MSE_CHANNEL_B:</div><div class='add'>+		return ETHTOOL_A_MSE_CHANNEL_B;</div><div class='add'>+	case PHY_MSE_CHANNEL_C:</div><div class='add'>+		return ETHTOOL_A_MSE_CHANNEL_C;</div><div class='add'>+	case PHY_MSE_CHANNEL_D:</div><div class='add'>+		return ETHTOOL_A_MSE_CHANNEL_D;</div><div class='add'>+	case PHY_MSE_CHANNEL_WORST:</div><div class='add'>+		return ETHTOOL_A_MSE_WORST_CHANNEL;</div><div class='add'>+	case PHY_MSE_CHANNEL_LINK:</div><div class='add'>+		return ETHTOOL_A_MSE_LINK;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mse_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct mse_reply_data *data = mse_repdata(reply_base);</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_MSE_CAPABILITIES);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_AVG) {</div><div class='add'>+		ret = nla_put_uint(skb,</div><div class='add'>+				   ETHTOOL_A_MSE_CAPABILITIES_MAX_AVERAGE_MSE,</div><div class='add'>+				   data-&gt;capability.max_average_mse);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto nla_put_nest_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;capability.supported_caps &amp; (PHY_MSE_CAP_PEAK |</div><div class='add'>+					       PHY_MSE_CAP_WORST_PEAK)) {</div><div class='add'>+		ret = nla_put_uint(skb, ETHTOOL_A_MSE_CAPABILITIES_MAX_PEAK_MSE,</div><div class='add'>+				   data-&gt;capability.max_peak_mse);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto nla_put_nest_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nla_put_uint(skb, ETHTOOL_A_MSE_CAPABILITIES_REFRESH_RATE_PS,</div><div class='add'>+			   data-&gt;capability.refresh_rate_ps);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto nla_put_nest_failure;</div><div class='add'>+</div><div class='add'>+	ret = nla_put_uint(skb, ETHTOOL_A_MSE_CAPABILITIES_NUM_SYMBOLS,</div><div class='add'>+			   data-&gt;capability.num_symbols);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto nla_put_nest_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;num_snapshots; i++) {</div><div class='add'>+		const struct mse_snapshot_entry *s = &amp;data-&gt;snapshots[i];</div><div class='add'>+		int chan_attr;</div><div class='add'>+</div><div class='add'>+		chan_attr = mse_channel_to_attr(s-&gt;channel);</div><div class='add'>+		if (chan_attr &lt; 0)</div><div class='add'>+			return chan_attr;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, chan_attr);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_AVG) {</div><div class='add'>+			ret = nla_put_uint(skb,</div><div class='add'>+					   ETHTOOL_A_MSE_SNAPSHOT_AVERAGE_MSE,</div><div class='add'>+					   s-&gt;snapshot.average_mse);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto nla_put_nest_failure;</div><div class='add'>+		}</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_PEAK) {</div><div class='add'>+			ret = nla_put_uint(skb, ETHTOOL_A_MSE_SNAPSHOT_PEAK_MSE,</div><div class='add'>+					   s-&gt;snapshot.peak_mse);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto nla_put_nest_failure;</div><div class='add'>+		}</div><div class='add'>+		if (data-&gt;capability.supported_caps &amp; PHY_MSE_CAP_WORST_PEAK) {</div><div class='add'>+			ret = nla_put_uint(skb,</div><div class='add'>+					   ETHTOOL_A_MSE_SNAPSHOT_WORST_PEAK_MSE,</div><div class='add'>+					   s-&gt;snapshot.worst_peak_mse);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto nla_put_nest_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_nest_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_mse_request_ops = {</div><div class='add'>+	.request_cmd = ETHTOOL_MSG_MSE_GET,</div><div class='add'>+	.reply_cmd = ETHTOOL_MSG_MSE_GET_REPLY,</div><div class='add'>+	.hdr_attr = ETHTOOL_A_MSE_HEADER,</div><div class='add'>+	.req_info_size = sizeof(struct mse_req_info),</div><div class='add'>+	.reply_data_size = sizeof(struct mse_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data = mse_prepare_data,</div><div class='add'>+	.cleanup_data = mse_cleanup_data,</div><div class='add'>+	.reply_size = mse_reply_size,</div><div class='add'>+	.fill_reply = mse_fill_reply,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c<br/>new file mode 100644<br/>index 000000000000..6e5f0f4f815a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,1583 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/phy_link_topology.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "module_fw.h"</div><div class='add'>+</div><div class='add'>+static struct genl_family ethtool_genl_family;</div><div class='add'>+</div><div class='add'>+static bool ethnl_ok __read_mostly;</div><div class='add'>+static u32 ethnl_bcast_seq;</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_FLAGS_BASIC (ETHTOOL_FLAG_COMPACT_BITSETS |	\</div><div class='add'>+			     ETHTOOL_FLAG_OMIT_REPLY)</div><div class='add'>+#define ETHTOOL_FLAGS_STATS (ETHTOOL_FLAGS_BASIC | ETHTOOL_FLAG_STATS)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_header_policy[] = {</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_NAME]	= { .type = NLA_NUL_STRING,</div><div class='add'>+					    .len = ALTIFNAMSIZ - 1 },</div><div class='add'>+	[ETHTOOL_A_HEADER_FLAGS]	= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+							  ETHTOOL_FLAGS_BASIC),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_header_policy_stats[] = {</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_NAME]	= { .type = NLA_NUL_STRING,</div><div class='add'>+					    .len = ALTIFNAMSIZ - 1 },</div><div class='add'>+	[ETHTOOL_A_HEADER_FLAGS]	= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+							  ETHTOOL_FLAGS_STATS),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_header_policy_phy[] = {</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_NAME]	= { .type = NLA_NUL_STRING,</div><div class='add'>+					    .len = ALTIFNAMSIZ - 1 },</div><div class='add'>+	[ETHTOOL_A_HEADER_FLAGS]	= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+							  ETHTOOL_FLAGS_BASIC),</div><div class='add'>+	[ETHTOOL_A_HEADER_PHY_INDEX]		= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_header_policy_phy_stats[] = {</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_HEADER_DEV_NAME]	= { .type = NLA_NUL_STRING,</div><div class='add'>+					    .len = ALTIFNAMSIZ - 1 },</div><div class='add'>+	[ETHTOOL_A_HEADER_FLAGS]	= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+							  ETHTOOL_FLAGS_STATS),</div><div class='add'>+	[ETHTOOL_A_HEADER_PHY_INDEX]		= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ethnl_sock_priv_set(struct sk_buff *skb, struct net_device *dev, u32 portid,</div><div class='add'>+			enum ethnl_sock_type type)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_sock_priv *sk_priv;</div><div class='add'>+</div><div class='add'>+	sk_priv = genl_sk_priv_get(&amp;ethtool_genl_family, NETLINK_CB(skb).sk);</div><div class='add'>+	if (IS_ERR(sk_priv))</div><div class='add'>+		return PTR_ERR(sk_priv);</div><div class='add'>+</div><div class='add'>+	sk_priv-&gt;dev = dev;</div><div class='add'>+	sk_priv-&gt;portid = portid;</div><div class='add'>+	sk_priv-&gt;type = type;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethnl_sock_priv_destroy(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_sock_priv *sk_priv = priv;</div><div class='add'>+</div><div class='add'>+	switch (sk_priv-&gt;type) {</div><div class='add'>+	case ETHTOOL_SOCK_TYPE_MODULE_FW_FLASH:</div><div class='add'>+		ethnl_module_fw_flash_sock_destroy(sk_priv);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ethnl_bcast_seq_next(void)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	return ++ethnl_bcast_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_ops_begin(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev.parent)</div><div class='add'>+		pm_runtime_get_sync(dev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev) ||</div><div class='add'>+	    dev-&gt;reg_state &gt;= NETREG_UNREGISTERING) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ethtool_ops-&gt;begin) {</div><div class='add'>+		ret = dev-&gt;ethtool_ops-&gt;begin(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	if (dev-&gt;dev.parent)</div><div class='add'>+		pm_runtime_put(dev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethnl_ops_complete(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;ethtool_ops-&gt;complete)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;complete(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev.parent)</div><div class='add'>+		pm_runtime_put(dev-&gt;dev.parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_parse_header_dev_get() - parse request header</div><div class='add'>+ * @req_info:    structure to put results into</div><div class='add'>+ * @header:      nest attribute with request header</div><div class='add'>+ * @net:         request netns</div><div class='add'>+ * @extack:      netlink extack for error reporting</div><div class='add'>+ * @require_dev: fail if no device identified in header</div><div class='add'>+ *</div><div class='add'>+ * Parse request header in nested attribute @nest and puts results into</div><div class='add'>+ * the structure pointed to by @req_info. Extack from @info is used for error</div><div class='add'>+ * reporting. If req_info-&gt;dev is not null on return, reference to it has</div><div class='add'>+ * been taken. If error is returned, *req_info is null initialized and no</div><div class='add'>+ * reference is held.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error code</div><div class='add'>+ */</div><div class='add'>+int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,</div><div class='add'>+			       const struct nlattr *header, struct net *net,</div><div class='add'>+			       struct netlink_ext_ack *extack, bool require_dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(ethnl_header_policy_phy)];</div><div class='add'>+	const struct nlattr *devname_attr;</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!header) {</div><div class='add'>+		if (!require_dev)</div><div class='add'>+			return 0;</div><div class='add'>+		NL_SET_ERR_MSG(extack, "request header missing");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* No validation here, command policy should have a nested policy set</div><div class='add'>+	 * for the header, therefore validation should have already been done.</div><div class='add'>+	 */</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_header_policy_phy) - 1, header,</div><div class='add'>+			       NULL, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (tb[ETHTOOL_A_HEADER_FLAGS])</div><div class='add'>+		flags = nla_get_u32(tb[ETHTOOL_A_HEADER_FLAGS]);</div><div class='add'>+</div><div class='add'>+	devname_attr = tb[ETHTOOL_A_HEADER_DEV_NAME];</div><div class='add'>+	if (tb[ETHTOOL_A_HEADER_DEV_INDEX]) {</div><div class='add'>+		u32 ifindex = nla_get_u32(tb[ETHTOOL_A_HEADER_DEV_INDEX]);</div><div class='add'>+</div><div class='add'>+		dev = netdev_get_by_index(net, ifindex, &amp;req_info-&gt;dev_tracker,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack,</div><div class='add'>+					    tb[ETHTOOL_A_HEADER_DEV_INDEX],</div><div class='add'>+					    "no device matches ifindex");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		/* if both ifindex and ifname are passed, they must match */</div><div class='add'>+		if (devname_attr &amp;&amp;</div><div class='add'>+		    strncmp(dev-&gt;name, nla_data(devname_attr), IFNAMSIZ)) {</div><div class='add'>+			netdev_put(dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, header,</div><div class='add'>+					    "ifindex and name do not match");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else if (devname_attr) {</div><div class='add'>+		dev = netdev_get_by_name(net, nla_data(devname_attr),</div><div class='add'>+					 &amp;req_info-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, devname_attr,</div><div class='add'>+					    "no device matches name");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else if (require_dev) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, header,</div><div class='add'>+				    "neither ifindex nor name specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_HEADER_PHY_INDEX]) {</div><div class='add'>+		if (dev) {</div><div class='add'>+			req_info-&gt;phy_index = nla_get_u32(tb[ETHTOOL_A_HEADER_PHY_INDEX]);</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, header,</div><div class='add'>+					    "phy_index set without a netdev");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_info-&gt;dev = dev;</div><div class='add'>+	req_info-&gt;flags = flags;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct phy_device *ethnl_req_get_phydev(const struct ethnl_req_info *req_info,</div><div class='add'>+					struct nlattr **tb, unsigned int header,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!req_info-&gt;dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!req_info-&gt;phy_index)</div><div class='add'>+		return req_info-&gt;dev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	phydev = phy_link_topo_get_phy(req_info-&gt;dev, req_info-&gt;phy_index);</div><div class='add'>+	if (!phydev &amp;&amp; tb) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[header],</div><div class='add'>+				    "no phy matching phyindex");</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return phydev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_fill_reply_header() - Put common header into a reply message</div><div class='add'>+ * @skb:      skb with the message</div><div class='add'>+ * @dev:      network device to describe in header</div><div class='add'>+ * @attrtype: attribute type to use for the nest</div><div class='add'>+ *</div><div class='add'>+ * Create a nested attribute with attributes describing given network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error value (-EMSGSIZE only) on error</div><div class='add'>+ */</div><div class='add'>+int ethnl_fill_reply_header(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			    u16 attrtype)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return 0;</div><div class='add'>+	nest = nla_nest_start(skb, attrtype);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_HEADER_DEV_INDEX, (u32)dev-&gt;ifindex) ||</div><div class='add'>+	    nla_put_string(skb, ETHTOOL_A_HEADER_DEV_NAME, dev-&gt;name))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	/* If more attributes are put into reply header, ethnl_header_size()</div><div class='add'>+	 * must be updated to account for them.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_reply_init() - Create skb for a reply and fill device identification</div><div class='add'>+ * @payload:      payload length (without netlink and genetlink header)</div><div class='add'>+ * @dev:          device the reply is about (may be null)</div><div class='add'>+ * @cmd:          ETHTOOL_MSG_* message type for reply</div><div class='add'>+ * @hdr_attrtype: attribute type for common header</div><div class='add'>+ * @info:         genetlink info of the received packet we respond to</div><div class='add'>+ * @ehdrp:        place to store payload pointer returned by genlmsg_new()</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to allocated skb on success, NULL on error</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *ethnl_reply_init(size_t payload, struct net_device *dev, u8 cmd,</div><div class='add'>+				 u16 hdr_attrtype, struct genl_info *info,</div><div class='add'>+				 void **ehdrp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(payload, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto err;</div><div class='add'>+	*ehdrp = genlmsg_put_reply(skb, info, &amp;ethtool_genl_family, 0, cmd);</div><div class='add'>+	if (!*ehdrp)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_fill_reply_header(skb, dev, hdr_attrtype);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_free;</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+err:</div><div class='add'>+	if (info)</div><div class='add'>+		GENL_SET_ERR_MSG(info, "failed to setup reply message");</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ethnl_dump_put(struct sk_buff *skb, struct netlink_callback *cb, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	return genlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			   &amp;ethtool_genl_family, 0, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ethnl_bcastmsg_put(struct sk_buff *skb, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	return genlmsg_put(skb, 0, ++ethnl_bcast_seq, &amp;ethtool_genl_family, 0,</div><div class='add'>+			   cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ethnl_unicast_put(struct sk_buff *skb, u32 portid, u32 seq, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	return genlmsg_put(skb, portid, seq, &amp;ethtool_genl_family, 0, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_multicast(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return genlmsg_multicast_netns(&amp;ethtool_genl_family, dev_net(dev), skb,</div><div class='add'>+				       0, ETHNL_MCGRP_MONITOR, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GET request helpers */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_dump_ctx - context structure for generic dumpit() callback</div><div class='add'>+ * @ops:        request ops of currently processed message type</div><div class='add'>+ * @req_info:   parsed request header of processed request</div><div class='add'>+ * @reply_data: data needed to compose the reply</div><div class='add'>+ * @pos_ifindex: saved iteration position - ifindex</div><div class='add'>+ *</div><div class='add'>+ * These parameters are kept in struct netlink_callback as context preserved</div><div class='add'>+ * between iterations. They are initialized by ethnl_default_start() and used</div><div class='add'>+ * in ethnl_default_dumpit() and ethnl_default_done().</div><div class='add'>+ */</div><div class='add'>+struct ethnl_dump_ctx {</div><div class='add'>+	const struct ethnl_request_ops	*ops;</div><div class='add'>+	struct ethnl_req_info		*req_info;</div><div class='add'>+	struct ethnl_reply_data		*reply_data;</div><div class='add'>+	unsigned long			pos_ifindex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_perphy_dump_ctx - context for dumpit() PHY-aware callbacks</div><div class='add'>+ * @ethnl_ctx: generic ethnl context</div><div class='add'>+ * @ifindex: For Filtered DUMP requests, the ifindex of the targeted netdev</div><div class='add'>+ * @pos_phyindex: iterator position for multi-msg DUMP</div><div class='add'>+ */</div><div class='add'>+struct ethnl_perphy_dump_ctx {</div><div class='add'>+	struct ethnl_dump_ctx	ethnl_ctx;</div><div class='add'>+	unsigned int		ifindex;</div><div class='add'>+	unsigned long		pos_phyindex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethnl_request_ops *</div><div class='add'>+ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {</div><div class='add'>+	[ETHTOOL_MSG_STRSET_GET]	= &amp;ethnl_strset_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKINFO_GET]	= &amp;ethnl_linkinfo_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKINFO_SET]	= &amp;ethnl_linkinfo_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKMODES_GET]	= &amp;ethnl_linkmodes_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKMODES_SET]	= &amp;ethnl_linkmodes_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKSTATE_GET]	= &amp;ethnl_linkstate_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_DEBUG_GET]		= &amp;ethnl_debug_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_DEBUG_SET]		= &amp;ethnl_debug_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_WOL_GET]		= &amp;ethnl_wol_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_WOL_SET]		= &amp;ethnl_wol_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_FEATURES_GET]	= &amp;ethnl_features_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PRIVFLAGS_GET]	= &amp;ethnl_privflags_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PRIVFLAGS_SET]	= &amp;ethnl_privflags_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RINGS_GET]		= &amp;ethnl_rings_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RINGS_SET]		= &amp;ethnl_rings_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_CHANNELS_GET]	= &amp;ethnl_channels_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_CHANNELS_SET]	= &amp;ethnl_channels_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_COALESCE_GET]	= &amp;ethnl_coalesce_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_COALESCE_SET]	= &amp;ethnl_coalesce_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PAUSE_GET]		= &amp;ethnl_pause_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PAUSE_SET]		= &amp;ethnl_pause_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_EEE_GET]		= &amp;ethnl_eee_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_EEE_SET]		= &amp;ethnl_eee_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_FEC_GET]		= &amp;ethnl_fec_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_FEC_SET]		= &amp;ethnl_fec_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_TSINFO_GET]	= &amp;ethnl_tsinfo_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MODULE_EEPROM_GET]	= &amp;ethnl_module_eeprom_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_STATS_GET]		= &amp;ethnl_stats_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PHC_VCLOCKS_GET]	= &amp;ethnl_phc_vclocks_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MODULE_GET]	= &amp;ethnl_module_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MODULE_SET]	= &amp;ethnl_module_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PSE_GET]		= &amp;ethnl_pse_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PSE_SET]		= &amp;ethnl_pse_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RSS_GET]		= &amp;ethnl_rss_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RSS_SET]		= &amp;ethnl_rss_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PLCA_GET_CFG]	= &amp;ethnl_plca_cfg_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PLCA_SET_CFG]	= &amp;ethnl_plca_cfg_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PLCA_GET_STATUS]	= &amp;ethnl_plca_status_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MM_GET]		= &amp;ethnl_mm_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MM_SET]		= &amp;ethnl_mm_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_TSCONFIG_GET]	= &amp;ethnl_tsconfig_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_TSCONFIG_SET]	= &amp;ethnl_tsconfig_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PHY_GET]		= &amp;ethnl_phy_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MSE_GET]		= &amp;ethnl_mse_request_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return (struct ethnl_dump_ctx *)cb-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethnl_perphy_dump_ctx *</div><div class='add'>+ethnl_perphy_dump_context(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return (struct ethnl_perphy_dump_ctx *)cb-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_default_parse() - Parse request message</div><div class='add'>+ * @req_info:    pointer to structure to put data into</div><div class='add'>+ * @info:	 genl_info from the request</div><div class='add'>+ * @request_ops: struct request_ops for request type</div><div class='add'>+ * @require_dev: fail if no device identified in header</div><div class='add'>+ *</div><div class='add'>+ * Parse universal request header and call request specific -&gt;parse_request()</div><div class='add'>+ * callback (if defined) to parse the rest of the message.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error code</div><div class='add'>+ */</div><div class='add'>+static int ethnl_default_parse(struct ethnl_req_info *req_info,</div><div class='add'>+			       const struct genl_info *info,</div><div class='add'>+			       const struct ethnl_request_ops *request_ops,</div><div class='add'>+			       bool require_dev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(req_info, tb[request_ops-&gt;hdr_attr],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 require_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (request_ops-&gt;parse_request) {</div><div class='add'>+		ret = request_ops-&gt;parse_request(req_info, tb, info-&gt;extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dev:</div><div class='add'>+	netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+	req_info-&gt;dev = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_init_reply_data() - Initialize reply data for GET request</div><div class='add'>+ * @reply_data: pointer to embedded struct ethnl_reply_data</div><div class='add'>+ * @ops:        instance of struct ethnl_request_ops describing the layout</div><div class='add'>+ * @dev:        network device to initialize the reply for</div><div class='add'>+ *</div><div class='add'>+ * Fills the reply data part with zeros and sets the dev member. Must be called</div><div class='add'>+ * before calling the -&gt;fill_reply() callback (for each iteration when handling</div><div class='add'>+ * dump requests).</div><div class='add'>+ */</div><div class='add'>+static void ethnl_init_reply_data(struct ethnl_reply_data *reply_data,</div><div class='add'>+				  const struct ethnl_request_ops *ops,</div><div class='add'>+				  struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	memset(reply_data, 0, ops-&gt;reply_data_size);</div><div class='add'>+	reply_data-&gt;dev = dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default -&gt;doit() handler for GET type requests */</div><div class='add'>+static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_reply_data *reply_data = NULL;</div><div class='add'>+	struct ethnl_req_info *req_info = NULL;</div><div class='add'>+	const u8 cmd = info-&gt;genlhdr-&gt;cmd;</div><div class='add'>+	const struct ethnl_request_ops *ops;</div><div class='add'>+	int hdr_len, reply_len;</div><div class='add'>+	struct sk_buff *rskb;</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = ethnl_default_requests[cmd];</div><div class='add'>+	if (WARN_ONCE(!ops, "cmd %u has no ethnl_request_ops\n", cmd))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, ops-&gt;hdr_attr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	req_info = kzalloc(ops-&gt;req_info_size, GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	reply_data = kmalloc(ops-&gt;reply_data_size, GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		kfree(req_info);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_default_parse(req_info, info, ops, !ops-&gt;allow_nodev_do);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free;</div><div class='add'>+	ethnl_init_reply_data(reply_data, ops, req_info-&gt;dev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (req_info-&gt;dev)</div><div class='add'>+		netdev_lock_ops(req_info-&gt;dev);</div><div class='add'>+	ret = ops-&gt;prepare_data(req_info, reply_data, info);</div><div class='add'>+	if (req_info-&gt;dev)</div><div class='add'>+		netdev_unlock_ops(req_info-&gt;dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dev;</div><div class='add'>+	ret = ops-&gt;reply_size(req_info, reply_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+	reply_len = ret;</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	rskb = ethnl_reply_init(reply_len + ethnl_reply_header_size(),</div><div class='add'>+				req_info-&gt;dev, ops-&gt;reply_cmd,</div><div class='add'>+				ops-&gt;hdr_attr, info, &amp;reply_payload);</div><div class='add'>+	if (!rskb)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+	hdr_len = rskb-&gt;len;</div><div class='add'>+	ret = ops-&gt;fill_reply(rskb, req_info, reply_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_msg;</div><div class='add'>+	WARN_ONCE(rskb-&gt;len - hdr_len &gt; reply_len,</div><div class='add'>+		  "ethnl cmd %d: calculated reply length %d, but consumed %d\n",</div><div class='add'>+		  cmd, reply_len, rskb-&gt;len - hdr_len);</div><div class='add'>+	if (ops-&gt;cleanup_data)</div><div class='add'>+		ops-&gt;cleanup_data(reply_data);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rskb, reply_payload);</div><div class='add'>+	netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	return genlmsg_reply(rskb, info);</div><div class='add'>+</div><div class='add'>+err_msg:</div><div class='add'>+	WARN_ONCE(ret == -EMSGSIZE, "calculated message payload length (%d) not sufficient\n", reply_len);</div><div class='add'>+	nlmsg_free(rskb);</div><div class='add'>+err_cleanup:</div><div class='add'>+	if (ops-&gt;cleanup_data)</div><div class='add'>+		ops-&gt;cleanup_data(reply_data);</div><div class='add'>+err_dev:</div><div class='add'>+	netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+err_free:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_default_dump_one(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+				  const struct ethnl_dump_ctx *ctx,</div><div class='add'>+				  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	void *ehdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ehdr = genlmsg_put(skb, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			   &amp;ethtool_genl_family, NLM_F_MULTI,</div><div class='add'>+			   ctx-&gt;ops-&gt;reply_cmd);</div><div class='add'>+	if (!ehdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ethnl_init_reply_data(ctx-&gt;reply_data, ctx-&gt;ops, dev);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	ret = ctx-&gt;ops-&gt;prepare_data(ctx-&gt;req_info, ctx-&gt;reply_data, info);</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_cancel;</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, dev, ctx-&gt;ops-&gt;hdr_attr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = ctx-&gt;ops-&gt;fill_reply(skb, ctx-&gt;req_info, ctx-&gt;reply_data);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ctx-&gt;ops-&gt;cleanup_data)</div><div class='add'>+		ctx-&gt;ops-&gt;cleanup_data(ctx-&gt;reply_data);</div><div class='add'>+out_cancel:</div><div class='add'>+	ctx-&gt;reply_data-&gt;dev = NULL;</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		genlmsg_cancel(skb, ehdr);</div><div class='add'>+	else</div><div class='add'>+		genlmsg_end(skb, ehdr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Default -&gt;dumpit() handler for GET requests. */</div><div class='add'>+static int ethnl_default_dumpit(struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_dump_ctx *ctx = ethnl_dump_context(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;pos_ifindex) {</div><div class='add'>+		netdev_hold(dev, &amp;dev_tracker, GFP_ATOMIC);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		ret = ethnl_default_dump_one(skb, dev, ctx, genl_info_dump(cb));</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		netdev_put(dev, &amp;dev_tracker);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+			if (likely(skb-&gt;len))</div><div class='add'>+				ret = skb-&gt;len;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* generic -&gt;start() handler for GET requests */</div><div class='add'>+static int ethnl_default_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct ethnl_dump_ctx *ctx = ethnl_dump_context(cb);</div><div class='add'>+	struct ethnl_reply_data *reply_data;</div><div class='add'>+	const struct ethnl_request_ops *ops;</div><div class='add'>+	struct ethnl_req_info *req_info;</div><div class='add'>+	struct genlmsghdr *ghdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+</div><div class='add'>+	ghdr = nlmsg_data(cb-&gt;nlh);</div><div class='add'>+	ops = ethnl_default_requests[ghdr-&gt;cmd];</div><div class='add'>+	if (WARN_ONCE(!ops, "cmd %u has no ethnl_request_ops\n", ghdr-&gt;cmd))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	req_info = kzalloc(ops-&gt;req_info_size, GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	reply_data = kmalloc(ops-&gt;reply_data_size, GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_req_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_default_parse(req_info, &amp;info-&gt;info, ops, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_reply_data;</div><div class='add'>+	if (req_info-&gt;dev) {</div><div class='add'>+		/* We ignore device specification in dump requests but as the</div><div class='add'>+		 * same parser as for non-dump (doit) requests is used, it</div><div class='add'>+		 * would take reference to the device if it finds one</div><div class='add'>+		 */</div><div class='add'>+		netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+		req_info-&gt;dev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ops = ops;</div><div class='add'>+	ctx-&gt;req_info = req_info;</div><div class='add'>+	ctx-&gt;reply_data = reply_data;</div><div class='add'>+	ctx-&gt;pos_ifindex = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_reply_data:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+free_req_info:</div><div class='add'>+	kfree(req_info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* per-PHY -&gt;start() handler for GET requests */</div><div class='add'>+static int ethnl_perphy_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_perphy_dump_ctx *phy_ctx = ethnl_perphy_dump_context(cb);</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct ethnl_dump_ctx *ctx = &amp;phy_ctx-&gt;ethnl_ctx;</div><div class='add'>+	struct ethnl_reply_data *reply_data;</div><div class='add'>+	const struct ethnl_request_ops *ops;</div><div class='add'>+	struct ethnl_req_info *req_info;</div><div class='add'>+	struct genlmsghdr *ghdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+</div><div class='add'>+	ghdr = nlmsg_data(cb-&gt;nlh);</div><div class='add'>+	ops = ethnl_default_requests[ghdr-&gt;cmd];</div><div class='add'>+	if (WARN_ONCE(!ops, "cmd %u has no ethnl_request_ops\n", ghdr-&gt;cmd))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	req_info = kzalloc(ops-&gt;req_info_size, GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	reply_data = kmalloc(ops-&gt;reply_data_size, GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_req_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unlike per-dev dump, don't ignore dev. The dump handler</div><div class='add'>+	 * will notice it and dump PHYs from given dev. We only keep track of</div><div class='add'>+	 * the dev's ifindex, .dumpit() will grab and release the netdev itself.</div><div class='add'>+	 */</div><div class='add'>+	ret = ethnl_default_parse(req_info, &amp;info-&gt;info, ops, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_reply_data;</div><div class='add'>+	if (req_info-&gt;dev) {</div><div class='add'>+		phy_ctx-&gt;ifindex = req_info-&gt;dev-&gt;ifindex;</div><div class='add'>+		netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+		req_info-&gt;dev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ops = ops;</div><div class='add'>+	ctx-&gt;req_info = req_info;</div><div class='add'>+	ctx-&gt;reply_data = reply_data;</div><div class='add'>+	ctx-&gt;pos_ifindex = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_reply_data:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+free_req_info:</div><div class='add'>+	kfree(req_info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_perphy_dump_one_dev(struct sk_buff *skb,</div><div class='add'>+				     struct ethnl_perphy_dump_ctx *ctx,</div><div class='add'>+				     const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_dump_ctx *ethnl_ctx = &amp;ctx-&gt;ethnl_ctx;</div><div class='add'>+	struct net_device *dev = ethnl_ctx-&gt;req_info-&gt;dev;</div><div class='add'>+	struct phy_device_node *pdn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;link_topo)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	xa_for_each_start(&amp;dev-&gt;link_topo-&gt;phys, ctx-&gt;pos_phyindex, pdn,</div><div class='add'>+			  ctx-&gt;pos_phyindex) {</div><div class='add'>+		ethnl_ctx-&gt;req_info-&gt;phy_index = ctx-&gt;pos_phyindex;</div><div class='add'>+</div><div class='add'>+		/* We can re-use the original dump_one as -&gt;prepare_data in</div><div class='add'>+		 * commands use ethnl_req_get_phydev(), which gets the PHY from</div><div class='add'>+		 * the req_info-&gt;phy_index</div><div class='add'>+		 */</div><div class='add'>+		ret = ethnl_default_dump_one(skb, dev, ethnl_ctx, info);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;pos_phyindex = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_perphy_dump_all_dev(struct sk_buff *skb,</div><div class='add'>+				     struct ethnl_perphy_dump_ctx *ctx,</div><div class='add'>+				     const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_dump_ctx *ethnl_ctx = &amp;ctx-&gt;ethnl_ctx;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ethnl_ctx-&gt;pos_ifindex) {</div><div class='add'>+		netdev_hold(dev, &amp;dev_tracker, GFP_ATOMIC);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		/* per-PHY commands use ethnl_req_get_phydev(), which needs the</div><div class='add'>+		 * net_device in the req_info</div><div class='add'>+		 */</div><div class='add'>+		ethnl_ctx-&gt;req_info-&gt;dev = dev;</div><div class='add'>+		ret = ethnl_perphy_dump_one_dev(skb, ctx, info);</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		netdev_put(dev, &amp;dev_tracker);</div><div class='add'>+		ethnl_ctx-&gt;req_info-&gt;dev = NULL;</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+			if (likely(skb-&gt;len))</div><div class='add'>+				ret = skb-&gt;len;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* per-PHY -&gt;dumpit() handler for GET requests. */</div><div class='add'>+static int ethnl_perphy_dumpit(struct sk_buff *skb,</div><div class='add'>+			       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_perphy_dump_ctx *ctx = ethnl_perphy_dump_context(cb);</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct ethnl_dump_ctx *ethnl_ctx = &amp;ctx-&gt;ethnl_ctx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ifindex) {</div><div class='add'>+		netdevice_tracker dev_tracker;</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = netdev_get_by_index(genl_info_net(&amp;info-&gt;info),</div><div class='add'>+					  ctx-&gt;ifindex, &amp;dev_tracker,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+		if (!dev)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		ethnl_ctx-&gt;req_info-&gt;dev = dev;</div><div class='add'>+		ret = ethnl_perphy_dump_one_dev(skb, ctx, genl_info_dump(cb));</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP &amp;&amp; likely(skb-&gt;len))</div><div class='add'>+			ret = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		netdev_put(dev, &amp;dev_tracker);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ethnl_perphy_dump_all_dev(skb, ctx, genl_info_dump(cb));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* per-PHY -&gt;done() handler for GET requests */</div><div class='add'>+static int ethnl_perphy_done(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_perphy_dump_ctx *ctx = ethnl_perphy_dump_context(cb);</div><div class='add'>+	struct ethnl_dump_ctx *ethnl_ctx = &amp;ctx-&gt;ethnl_ctx;</div><div class='add'>+</div><div class='add'>+	kfree(ethnl_ctx-&gt;reply_data);</div><div class='add'>+	kfree(ethnl_ctx-&gt;req_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default -&gt;done() handler for GET requests */</div><div class='add'>+static int ethnl_default_done(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_dump_ctx *ctx = ethnl_dump_context(cb);</div><div class='add'>+</div><div class='add'>+	kfree(ctx-&gt;reply_data);</div><div class='add'>+	kfree(ctx-&gt;req_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_default_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethnl_request_ops *ops;</div><div class='add'>+	const u8 cmd = info-&gt;genlhdr-&gt;cmd;</div><div class='add'>+	struct ethnl_req_info *req_info;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = ethnl_default_requests[cmd];</div><div class='add'>+	if (WARN_ONCE(!ops, "cmd %u has no ethnl_request_ops\n", cmd))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, ops-&gt;hdr_attr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	req_info = kzalloc(ops-&gt;req_info_size, GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_default_parse(req_info, info,  ops, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free_req;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;set_validate) {</div><div class='add'>+		ret = ops-&gt;set_validate(req_info, info);</div><div class='add'>+		/* 0 means nothing to do */</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto out_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = req_info-&gt;dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+	dev-&gt;cfg_pending = kmemdup(dev-&gt;cfg, sizeof(*dev-&gt;cfg),</div><div class='add'>+				   GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!dev-&gt;cfg_pending) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_tie_cfg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free_cfg;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;set(req_info, info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_ops;</div><div class='add'>+</div><div class='add'>+	swap(dev-&gt;cfg, dev-&gt;cfg_pending);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto out_ops;</div><div class='add'>+	ethnl_notify(dev, ops-&gt;set_ntf_cmd, req_info);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+out_free_cfg:</div><div class='add'>+	kfree(dev-&gt;cfg_pending);</div><div class='add'>+out_tie_cfg:</div><div class='add'>+	dev-&gt;cfg_pending = dev-&gt;cfg;</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+out_dev:</div><div class='add'>+	ethnl_parse_header_dev_put(req_info);</div><div class='add'>+out_free_req:</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethnl_request_ops *</div><div class='add'>+ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_MSG_LINKINFO_NTF]	= &amp;ethnl_linkinfo_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_LINKMODES_NTF]	= &amp;ethnl_linkmodes_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_DEBUG_NTF]		= &amp;ethnl_debug_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_WOL_NTF]		= &amp;ethnl_wol_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_FEATURES_NTF]	= &amp;ethnl_features_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PRIVFLAGS_NTF]	= &amp;ethnl_privflags_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RINGS_NTF]		= &amp;ethnl_rings_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_CHANNELS_NTF]	= &amp;ethnl_channels_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_COALESCE_NTF]	= &amp;ethnl_coalesce_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PAUSE_NTF]		= &amp;ethnl_pause_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_EEE_NTF]		= &amp;ethnl_eee_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_FEC_NTF]		= &amp;ethnl_fec_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MODULE_NTF]	= &amp;ethnl_module_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_PLCA_NTF]		= &amp;ethnl_plca_cfg_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_MM_NTF]		= &amp;ethnl_mm_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RSS_NTF]		= &amp;ethnl_rss_request_ops,</div><div class='add'>+	[ETHTOOL_MSG_RSS_CREATE_NTF]	= &amp;ethnl_rss_request_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* default notification handler */</div><div class='add'>+static void ethnl_default_notify(struct net_device *dev, unsigned int cmd,</div><div class='add'>+				 const struct ethnl_req_info *orig_req_info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_reply_data *reply_data;</div><div class='add'>+	const struct ethnl_request_ops *ops;</div><div class='add'>+	struct ethnl_req_info *req_info;</div><div class='add'>+	struct genl_info info;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	int reply_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	genl_info_init_ntf(&amp;info, &amp;ethtool_genl_family, cmd);</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(cmd &gt; ETHTOOL_MSG_KERNEL_MAX ||</div><div class='add'>+		      !ethnl_default_notify_ops[cmd],</div><div class='add'>+		      "unexpected notification type %u\n", cmd))</div><div class='add'>+		return;</div><div class='add'>+	ops = ethnl_default_notify_ops[cmd];</div><div class='add'>+	req_info = kzalloc(ops-&gt;req_info_size, GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return;</div><div class='add'>+	reply_data = kmalloc(ops-&gt;reply_data_size, GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		kfree(req_info);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_info-&gt;dev = dev;</div><div class='add'>+	req_info-&gt;flags |= ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	if (orig_req_info) {</div><div class='add'>+		req_info-&gt;phy_index = orig_req_info-&gt;phy_index;</div><div class='add'>+		memcpy(&amp;req_info[1], &amp;orig_req_info[1],</div><div class='add'>+		       ops-&gt;req_info_size - sizeof(*req_info));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	ethnl_init_reply_data(reply_data, ops, dev);</div><div class='add'>+	ret = ops-&gt;prepare_data(req_info, reply_data, &amp;info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_rep;</div><div class='add'>+	ret = ops-&gt;reply_size(req_info, reply_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+	reply_len = ret + ethnl_reply_header_size();</div><div class='add'>+	skb = genlmsg_new(reply_len, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+	reply_payload = ethnl_bcastmsg_put(skb, cmd);</div><div class='add'>+	if (!reply_payload)</div><div class='add'>+		goto err_skb;</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, dev, ops-&gt;hdr_attr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_msg;</div><div class='add'>+	ret = ops-&gt;fill_reply(skb, req_info, reply_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_msg;</div><div class='add'>+	if (ops-&gt;cleanup_data)</div><div class='add'>+		ops-&gt;cleanup_data(reply_data);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, reply_payload);</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	ethnl_multicast(skb, dev);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_msg:</div><div class='add'>+	WARN_ONCE(ret == -EMSGSIZE,</div><div class='add'>+		  "calculated message payload length (%d) not sufficient\n",</div><div class='add'>+		  reply_len);</div><div class='add'>+err_skb:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+err_cleanup:</div><div class='add'>+	if (ops-&gt;cleanup_data)</div><div class='add'>+		ops-&gt;cleanup_data(reply_data);</div><div class='add'>+err_rep:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* notifications */</div><div class='add'>+</div><div class='add'>+typedef void (*ethnl_notify_handler_t)(struct net_device *dev, unsigned int cmd,</div><div class='add'>+				       const struct ethnl_req_info *req_info);</div><div class='add'>+</div><div class='add'>+static const ethnl_notify_handler_t ethnl_notify_handlers[] = {</div><div class='add'>+	[ETHTOOL_MSG_LINKINFO_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_LINKMODES_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_DEBUG_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_WOL_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_FEATURES_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_PRIVFLAGS_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_RINGS_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_CHANNELS_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_COALESCE_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_PAUSE_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_EEE_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_FEC_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_MODULE_NTF]	= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_PLCA_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_MM_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_RSS_NTF]		= ethnl_default_notify,</div><div class='add'>+	[ETHTOOL_MSG_RSS_CREATE_NTF]	= ethnl_default_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ethnl_notify(struct net_device *dev, unsigned int cmd,</div><div class='add'>+		  const struct ethnl_req_info *req_info)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!ethnl_ok))</div><div class='add'>+		return;</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (likely(cmd &lt; ARRAY_SIZE(ethnl_notify_handlers) &amp;&amp;</div><div class='add'>+		   ethnl_notify_handlers[cmd]))</div><div class='add'>+		ethnl_notify_handlers[cmd](dev, cmd, req_info);</div><div class='add'>+	else</div><div class='add'>+		WARN_ONCE(1, "notification %u not implemented (dev=%s)\n",</div><div class='add'>+			  cmd, netdev_name(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_notify(struct net_device *dev, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	ethnl_notify(dev, cmd, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_notify);</div><div class='add'>+</div><div class='add'>+static void ethnl_notify_features(struct netdev_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(info);</div><div class='add'>+</div><div class='add'>+	ethtool_notify(dev, ETHTOOL_MSG_FEATURES_NTF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_netdev_event(struct notifier_block *this, unsigned long event,</div><div class='add'>+			      void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct netdev_notifier_info *info = ptr;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = netdev_notifier_info_to_dev(info);</div><div class='add'>+	extack = netdev_notifier_info_to_extack(info);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_FEAT_CHANGE:</div><div class='add'>+		ethnl_notify_features(ptr);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_PRE_UP:</div><div class='add'>+		if (dev-&gt;ethtool-&gt;module_fw_flash_in_progress) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Can't set port up while flashing module firmware");</div><div class='add'>+			return NOTIFY_BAD;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block ethnl_netdev_notifier = {</div><div class='add'>+	.notifier_call = ethnl_netdev_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* genetlink setup */</div><div class='add'>+</div><div class='add'>+static const struct genl_ops ethtool_genl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_STRSET_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_strset_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_strset_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_LINKINFO_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_linkinfo_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_linkinfo_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_LINKINFO_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_linkinfo_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_linkinfo_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_LINKMODES_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_linkmodes_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_linkmodes_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_LINKMODES_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_linkmodes_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_linkmodes_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_LINKSTATE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_linkstate_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_linkstate_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_DEBUG_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_debug_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_debug_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_DEBUG_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_debug_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_debug_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_WOL_GET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_wol_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_wol_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_WOL_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_wol_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_wol_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_FEATURES_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_features_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_features_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_FEATURES_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_set_features,</div><div class='add'>+		.policy = ethnl_features_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_features_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PRIVFLAGS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_privflags_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_privflags_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PRIVFLAGS_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_privflags_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_privflags_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RINGS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_rings_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rings_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RINGS_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_rings_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rings_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_CHANNELS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_channels_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_channels_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_CHANNELS_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_channels_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_channels_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_COALESCE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_coalesce_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_coalesce_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_COALESCE_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_coalesce_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_coalesce_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PAUSE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_pause_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_pause_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PAUSE_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_pause_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_pause_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_EEE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_eee_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_eee_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_EEE_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_eee_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_eee_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_TSINFO_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_tsinfo_start,</div><div class='add'>+		.dumpit	= ethnl_tsinfo_dumpit,</div><div class='add'>+		.done	= ethnl_tsinfo_done,</div><div class='add'>+		.policy = ethnl_tsinfo_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_tsinfo_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_CABLE_TEST_ACT,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_act_cable_test,</div><div class='add'>+		.policy = ethnl_cable_test_act_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_cable_test_act_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_CABLE_TEST_TDR_ACT,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_act_cable_test_tdr,</div><div class='add'>+		.policy = ethnl_cable_test_tdr_act_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_cable_test_tdr_act_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_TUNNEL_INFO_GET,</div><div class='add'>+		.doit	= ethnl_tunnel_info_doit,</div><div class='add'>+		.start	= ethnl_tunnel_info_start,</div><div class='add'>+		.dumpit	= ethnl_tunnel_info_dumpit,</div><div class='add'>+		.policy = ethnl_tunnel_info_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_tunnel_info_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_FEC_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_fec_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_fec_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_FEC_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_fec_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_fec_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MODULE_EEPROM_GET,</div><div class='add'>+		.flags  = GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_module_eeprom_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_module_eeprom_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_STATS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_stats_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_stats_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PHC_VCLOCKS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_phc_vclocks_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_phc_vclocks_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MODULE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_module_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_module_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MODULE_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_module_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_module_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PSE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_perphy_start,</div><div class='add'>+		.dumpit	= ethnl_perphy_dumpit,</div><div class='add'>+		.done	= ethnl_perphy_done,</div><div class='add'>+		.policy = ethnl_pse_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_pse_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PSE_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_pse_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_pse_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RSS_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_rss_dump_start,</div><div class='add'>+		.dumpit	= ethnl_rss_dumpit,</div><div class='add'>+		.policy = ethnl_rss_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rss_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PLCA_GET_CFG,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_perphy_start,</div><div class='add'>+		.dumpit	= ethnl_perphy_dumpit,</div><div class='add'>+		.done	= ethnl_perphy_done,</div><div class='add'>+		.policy = ethnl_plca_get_cfg_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_plca_get_cfg_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PLCA_SET_CFG,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_plca_set_cfg_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_plca_set_cfg_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PLCA_GET_STATUS,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_perphy_start,</div><div class='add'>+		.dumpit	= ethnl_perphy_dumpit,</div><div class='add'>+		.done	= ethnl_perphy_done,</div><div class='add'>+		.policy = ethnl_plca_get_status_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_plca_get_status_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MM_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_mm_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_mm_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MM_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_mm_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_mm_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MODULE_FW_FLASH_ACT,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_act_module_fw_flash,</div><div class='add'>+		.policy	= ethnl_module_fw_flash_act_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_module_fw_flash_act_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_PHY_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_perphy_start,</div><div class='add'>+		.dumpit	= ethnl_perphy_dumpit,</div><div class='add'>+		.done	= ethnl_perphy_done,</div><div class='add'>+		.policy = ethnl_phy_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_phy_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_TSCONFIG_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_default_start,</div><div class='add'>+		.dumpit	= ethnl_default_dumpit,</div><div class='add'>+		.done	= ethnl_default_done,</div><div class='add'>+		.policy = ethnl_tsconfig_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_tsconfig_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_TSCONFIG_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_tsconfig_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_tsconfig_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RSS_SET,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_default_set_doit,</div><div class='add'>+		.policy = ethnl_rss_set_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rss_set_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RSS_CREATE_ACT,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_rss_create_doit,</div><div class='add'>+		.policy	= ethnl_rss_create_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rss_create_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_RSS_DELETE_ACT,</div><div class='add'>+		.flags	= GENL_UNS_ADMIN_PERM,</div><div class='add'>+		.doit	= ethnl_rss_delete_doit,</div><div class='add'>+		.policy	= ethnl_rss_delete_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_rss_delete_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= ETHTOOL_MSG_MSE_GET,</div><div class='add'>+		.doit	= ethnl_default_doit,</div><div class='add'>+		.start	= ethnl_perphy_start,</div><div class='add'>+		.dumpit	= ethnl_perphy_dumpit,</div><div class='add'>+		.done	= ethnl_perphy_done,</div><div class='add'>+		.policy = ethnl_mse_get_policy,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ethnl_mse_get_policy) - 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct genl_multicast_group ethtool_nl_mcgrps[] = {</div><div class='add'>+	[ETHNL_MCGRP_MONITOR] = { .name = ETHTOOL_MCGRP_MONITOR_NAME },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct genl_family ethtool_genl_family __ro_after_init = {</div><div class='add'>+	.name		= ETHTOOL_GENL_NAME,</div><div class='add'>+	.version	= ETHTOOL_GENL_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.ops		= ethtool_genl_ops,</div><div class='add'>+	.n_ops		= ARRAY_SIZE(ethtool_genl_ops),</div><div class='add'>+	.resv_start_op	= ETHTOOL_MSG_MODULE_GET + 1,</div><div class='add'>+	.mcgrps		= ethtool_nl_mcgrps,</div><div class='add'>+	.n_mcgrps	= ARRAY_SIZE(ethtool_nl_mcgrps),</div><div class='add'>+	.sock_priv_size		= sizeof(struct ethnl_sock_priv),</div><div class='add'>+	.sock_priv_destroy	= ethnl_sock_priv_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* module setup */</div><div class='add'>+</div><div class='add'>+static int __init ethnl_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = genl_register_family(&amp;ethtool_genl_family);</div><div class='add'>+	if (WARN(ret &lt; 0, "ethtool: genetlink family registration failed"))</div><div class='add'>+		return ret;</div><div class='add'>+	ethnl_ok = true;</div><div class='add'>+</div><div class='add'>+	ret = register_netdevice_notifier(&amp;ethnl_netdev_notifier);</div><div class='add'>+	WARN(ret &lt; 0, "ethtool: net device notifier registration failed");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(ethnl_init);</div><div class='head'>diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h<br/>new file mode 100644<br/>index 000000000000..89010eaa67df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/netlink.h</a></div><div class='hunk'>@@ -0,0 +1,525 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef _NET_ETHTOOL_NETLINK_H</div><div class='add'>+#define _NET_ETHTOOL_NETLINK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+struct ethnl_req_info;</div><div class='add'>+</div><div class='add'>+u32 ethnl_bcast_seq_next(void);</div><div class='add'>+int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,</div><div class='add'>+			       const struct nlattr *nest, struct net *net,</div><div class='add'>+			       struct netlink_ext_ack *extack,</div><div class='add'>+			       bool require_dev);</div><div class='add'>+int ethnl_fill_reply_header(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			    u16 attrtype);</div><div class='add'>+struct sk_buff *ethnl_reply_init(size_t payload, struct net_device *dev, u8 cmd,</div><div class='add'>+				 u16 hdr_attrtype, struct genl_info *info,</div><div class='add'>+				 void **ehdrp);</div><div class='add'>+void *ethnl_dump_put(struct sk_buff *skb, struct netlink_callback *cb, u8 cmd);</div><div class='add'>+void *ethnl_bcastmsg_put(struct sk_buff *skb, u8 cmd);</div><div class='add'>+void *ethnl_unicast_put(struct sk_buff *skb, u32 portid, u32 seq, u8 cmd);</div><div class='add'>+int ethnl_multicast(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+void ethnl_notify(struct net_device *dev, unsigned int cmd,</div><div class='add'>+		  const struct ethnl_req_info *req_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_strz_size() - calculate attribute length for fixed size string</div><div class='add'>+ * @s: ETH_GSTRING_LEN sized string (may not be null terminated)</div><div class='add'>+ *</div><div class='add'>+ * Return: total length of an attribute with null terminated string from @s</div><div class='add'>+ */</div><div class='add'>+static inline int ethnl_strz_size(const char *s)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(strnlen(s, ETH_GSTRING_LEN) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_put_strz() - put string attribute with fixed size string</div><div class='add'>+ * @skb:      skb with the message</div><div class='add'>+ * @attrtype: attribute type</div><div class='add'>+ * @s:        ETH_GSTRING_LEN sized string (may not be null terminated)</div><div class='add'>+ *</div><div class='add'>+ * Puts an attribute with null terminated string from @s into the message.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static inline int ethnl_put_strz(struct sk_buff *skb, u16 attrtype,</div><div class='add'>+				 const char *s)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = strnlen(s, ETH_GSTRING_LEN);</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	attr = nla_reserve(skb, attrtype, len + 1);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	memcpy(nla_data(attr), s, len);</div><div class='add'>+	((char *)nla_data(attr))[len] = '\0';</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_u32() - update u32 value from NLA_U32 attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Copy the u32 value from NLA_U32 netlink attribute @attr into variable</div><div class='add'>+ * pointed to by @dst; do nothing if @attr is null. Bool pointed to by @mod</div><div class='add'>+ * is set to true if this function changed the value of *dst, otherwise it</div><div class='add'>+ * is left as is.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_u32(u32 *dst, const struct nlattr *attr,</div><div class='add'>+				    bool *mod)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	val = nla_get_u32(attr);</div><div class='add'>+	if (*dst == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*dst = val;</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_u8() - update u8 value from NLA_U8 attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Copy the u8 value from NLA_U8 netlink attribute @attr into variable</div><div class='add'>+ * pointed to by @dst; do nothing if @attr is null. Bool pointed to by @mod</div><div class='add'>+ * is set to true if this function changed the value of *dst, otherwise it</div><div class='add'>+ * is left as is.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_u8(u8 *dst, const struct nlattr *attr,</div><div class='add'>+				   bool *mod)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	val = nla_get_u8(attr);</div><div class='add'>+	if (*dst == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*dst = val;</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_bool32() - update u32 used as bool from NLA_U8 attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Use the u8 value from NLA_U8 netlink attribute @attr to set u32 variable</div><div class='add'>+ * pointed to by @dst to 0 (if zero) or 1 (if not); do nothing if @attr is</div><div class='add'>+ * null. Bool pointed to by @mod is set to true if this function changed the</div><div class='add'>+ * logical value of *dst, otherwise it is left as is.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_bool32(u32 *dst, const struct nlattr *attr,</div><div class='add'>+				       bool *mod)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	val = !!nla_get_u8(attr);</div><div class='add'>+	if (!!*dst == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*dst = val;</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_bool() - updateb bool used as bool from NLA_U8 attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Use the bool value from NLA_U8 netlink attribute @attr to set bool variable</div><div class='add'>+ * pointed to by @dst to 0 (if zero) or 1 (if not); do nothing if @attr is</div><div class='add'>+ * null. Bool pointed to by @mod is set to true if this function changed the</div><div class='add'>+ * logical value of *dst, otherwise it is left as is.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_bool(bool *dst, const struct nlattr *attr,</div><div class='add'>+				     bool *mod)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	val = !!nla_get_u8(attr);</div><div class='add'>+	if (!!*dst == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*dst = val;</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_binary() - update binary data from NLA_BINARY attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @len:  destination buffer length</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Use the u8 value from NLA_U8 netlink attribute @attr to rewrite data block</div><div class='add'>+ * of length @len at @dst by attribute payload; do nothing if @attr is null.</div><div class='add'>+ * Bool pointed to by @mod is set to true if this function changed the logical</div><div class='add'>+ * value of *dst, otherwise it is left as is.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_binary(void *dst, unsigned int len,</div><div class='add'>+				       const struct nlattr *attr, bool *mod)</div><div class='add'>+{</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	if (nla_len(attr) &lt; len)</div><div class='add'>+		len = nla_len(attr);</div><div class='add'>+	if (!memcmp(dst, nla_data(attr), len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(dst, nla_data(attr), len);</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_update_bitfield32() - update u32 value from NLA_BITFIELD32 attribute</div><div class='add'>+ * @dst:  value to update</div><div class='add'>+ * @attr: netlink attribute with new value or null</div><div class='add'>+ * @mod:  pointer to bool for modification tracking</div><div class='add'>+ *</div><div class='add'>+ * Update bits in u32 value which are set in attribute's mask to values from</div><div class='add'>+ * attribute's value. Do nothing if @attr is null or the value wouldn't change;</div><div class='add'>+ * otherwise, set bool pointed to by @mod to true.</div><div class='add'>+ */</div><div class='add'>+static inline void ethnl_update_bitfield32(u32 *dst, const struct nlattr *attr,</div><div class='add'>+					   bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct nla_bitfield32 change;</div><div class='add'>+	u32 newval;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return;</div><div class='add'>+	change = nla_get_bitfield32(attr);</div><div class='add'>+	newval = (*dst &amp; ~change.selector) | (change.value &amp; change.selector);</div><div class='add'>+	if (*dst == newval)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*dst = newval;</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_reply_header_size() - total size of reply header</div><div class='add'>+ *</div><div class='add'>+ * This is an upper estimate so that we do not need to hold RTNL lock longer</div><div class='add'>+ * than necessary (to prevent rename between size estimate and composing the</div><div class='add'>+ * message). Accounts only for device ifindex and name as those are the only</div><div class='add'>+ * attributes ethnl_fill_reply_header() puts into the reply header.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int ethnl_reply_header_size(void)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(nla_total_size(sizeof(u32)) +</div><div class='add'>+			      nla_total_size(IFNAMSIZ));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GET request handling */</div><div class='add'>+</div><div class='add'>+/* Unified processing of GET requests uses two data structures: request info</div><div class='add'>+ * and reply data. Request info holds information parsed from client request</div><div class='add'>+ * and its stays constant through all request processing. Reply data holds data</div><div class='add'>+ * retrieved from ethtool_ops callbacks or other internal sources which is used</div><div class='add'>+ * to compose the reply. When processing a dump request, request info is filled</div><div class='add'>+ * only once (when the request message is parsed) but reply data is filled for</div><div class='add'>+ * each reply message.</div><div class='add'>+ *</div><div class='add'>+ * Both structures consist of part common for all request types (struct</div><div class='add'>+ * ethnl_req_info and struct ethnl_reply_data defined below) and optional</div><div class='add'>+ * parts specific for each request type. Common part always starts at offset 0.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_req_info - base type of request information for GET requests</div><div class='add'>+ * @dev:   network device the request is for (may be null)</div><div class='add'>+ * @dev_tracker: refcount tracker for @dev reference</div><div class='add'>+ * @flags: request flags common for all request types</div><div class='add'>+ * @phy_index: phy_device index connected to @dev this request is for. Can be</div><div class='add'>+ *	       0 if the request doesn't target a phy, or if the @dev's attached</div><div class='add'>+ *	       phy is targeted.</div><div class='add'>+ *</div><div class='add'>+ * This is a common base for request specific structures holding data from</div><div class='add'>+ * parsed userspace request. These always embed struct ethnl_req_info at</div><div class='add'>+ * zero offset.</div><div class='add'>+ */</div><div class='add'>+struct ethnl_req_info {</div><div class='add'>+	struct net_device	*dev;</div><div class='add'>+	netdevice_tracker	dev_tracker;</div><div class='add'>+	u32			flags;</div><div class='add'>+	u32			phy_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void ethnl_parse_header_dev_put(struct ethnl_req_info *req_info)</div><div class='add'>+{</div><div class='add'>+	netdev_put(req_info-&gt;dev, &amp;req_info-&gt;dev_tracker);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ethnl_req_get_phydev() - Gets the phy_device targeted by this request,</div><div class='add'>+ *			    if any. Must be called under rntl_lock().</div><div class='add'>+ * @req_info:	The ethnl request to get the phy from.</div><div class='add'>+ * @tb:		The netlink attributes array, for error reporting.</div><div class='add'>+ * @header:	The netlink header index, used for error reporting.</div><div class='add'>+ * @extack:	The netlink extended ACK, for error reporting.</div><div class='add'>+ *</div><div class='add'>+ * The caller must hold RTNL, until it's done interacting with the returned</div><div class='add'>+ * phy_device.</div><div class='add'>+ *</div><div class='add'>+ * Return: A phy_device pointer corresponding either to the passed phy_index</div><div class='add'>+ *	   if one is provided. If not, the phy_device attached to the</div><div class='add'>+ *	   net_device targeted by this request is returned. If there's no</div><div class='add'>+ *	   targeted net_device, or no phy_device is attached, NULL is</div><div class='add'>+ *	   returned. If the provided phy_index is invalid, an error pointer</div><div class='add'>+ *	   is returned.</div><div class='add'>+ */</div><div class='add'>+struct phy_device *ethnl_req_get_phydev(const struct ethnl_req_info *req_info,</div><div class='add'>+					struct nlattr **tb, unsigned int header,</div><div class='add'>+					struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_reply_data - base type of reply data for GET requests</div><div class='add'>+ * @dev:       device for current reply message; in single shot requests it is</div><div class='add'>+ *             equal to &amp;ethnl_req_info.dev; in dumps it's different for each</div><div class='add'>+ *             reply message</div><div class='add'>+ *</div><div class='add'>+ * This is a common base for request specific structures holding data for</div><div class='add'>+ * kernel reply message. These always embed struct ethnl_reply_data at zero</div><div class='add'>+ * offset.</div><div class='add'>+ */</div><div class='add'>+struct ethnl_reply_data {</div><div class='add'>+	struct net_device		*dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ethnl_ops_begin(struct net_device *dev);</div><div class='add'>+void ethnl_ops_complete(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+enum ethnl_sock_type {</div><div class='add'>+	ETHTOOL_SOCK_TYPE_MODULE_FW_FLASH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ethnl_sock_priv {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 portid;</div><div class='add'>+	enum ethnl_sock_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ethnl_sock_priv_set(struct sk_buff *skb, struct net_device *dev, u32 portid,</div><div class='add'>+			enum ethnl_sock_type type);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethnl_request_ops - unified handling of GET and SET requests</div><div class='add'>+ * @request_cmd:      command id for request (GET)</div><div class='add'>+ * @reply_cmd:        command id for reply (GET_REPLY)</div><div class='add'>+ * @hdr_attr:         attribute type for request header</div><div class='add'>+ * @req_info_size:    size of request info</div><div class='add'>+ * @reply_data_size:  size of reply data</div><div class='add'>+ * @allow_nodev_do:   allow non-dump request with no device identification</div><div class='add'>+ * @set_ntf_cmd:      notification to generate on changes (SET)</div><div class='add'>+ * @parse_request:</div><div class='add'>+ *	Parse request except common header (struct ethnl_req_info). Common</div><div class='add'>+ *	header is already filled on entry, the rest up to @repdata_offset</div><div class='add'>+ *	is zero initialized. This callback should only modify type specific</div><div class='add'>+ *	request info by parsed attributes from request message.</div><div class='add'>+ *	Called for both GET and SET. Information parsed for SET will</div><div class='add'>+ *	be conveyed to the req_info used during NTF generation.</div><div class='add'>+ * @prepare_data:</div><div class='add'>+ *	Retrieve and prepare data needed to compose a reply message. Calls to</div><div class='add'>+ *	ethtool_ops handlers are limited to this callback. Common reply data</div><div class='add'>+ *	(struct ethnl_reply_data) is filled on entry, type specific part after</div><div class='add'>+ *	it is zero initialized. This callback should only modify the type</div><div class='add'>+ *	specific part of reply data. Device identification from struct</div><div class='add'>+ *	ethnl_reply_data is to be used as for dump requests, it iterates</div><div class='add'>+ *	through network devices while dev member of struct ethnl_req_info</div><div class='add'>+ *	points to the device from client request.</div><div class='add'>+ * @reply_size:</div><div class='add'>+ *	Estimate reply message size. Returned value must be sufficient for</div><div class='add'>+ *	message payload without common reply header. The callback may returned</div><div class='add'>+ *	estimate higher than actual message size if exact calculation would</div><div class='add'>+ *	not be worth the saved memory space.</div><div class='add'>+ * @fill_reply:</div><div class='add'>+ *	Fill reply message payload (except for common header) from reply data.</div><div class='add'>+ *	The callback must not generate more payload than previously called</div><div class='add'>+ *	-&gt;reply_size() estimated.</div><div class='add'>+ * @cleanup_data:</div><div class='add'>+ *	Optional cleanup called when reply data is no longer needed. Can be</div><div class='add'>+ *	used e.g. to free any additional data structures outside the main</div><div class='add'>+ *	structure which were allocated by -&gt;prepare_data(). When processing</div><div class='add'>+ *	dump requests, -&gt;cleanup() is called for each message.</div><div class='add'>+ * @set_validate:</div><div class='add'>+ *	Check if set operation is supported for a given device, and perform</div><div class='add'>+ *	extra input checks. Expected return values:</div><div class='add'>+ *	 - 0 if the operation is a noop for the device (rare)</div><div class='add'>+ *	 - 1 if operation should proceed to calling @set</div><div class='add'>+ *	 - negative errno on errors</div><div class='add'>+ *	Called without any locks, just a reference on the netdev.</div><div class='add'>+ * @set:</div><div class='add'>+ *	Execute the set operation. The implementation should return</div><div class='add'>+ *	 - 0 if no configuration has changed</div><div class='add'>+ *	 - 1 if configuration changed and notification should be generated</div><div class='add'>+ *	 - negative errno on errors</div><div class='add'>+ *</div><div class='add'>+ * Description of variable parts of GET request handling when using the</div><div class='add'>+ * unified infrastructure. When used, a pointer to an instance of this</div><div class='add'>+ * structure is to be added to &amp;ethnl_default_requests array and generic</div><div class='add'>+ * handlers ethnl_default_doit(), ethnl_default_dumpit(),</div><div class='add'>+ * ethnl_default_start() and ethnl_default_done() used in @ethtool_genl_ops;</div><div class='add'>+ * ethnl_default_notify() can be used in @ethnl_notify_handlers to send</div><div class='add'>+ * notifications of the corresponding type.</div><div class='add'>+ */</div><div class='add'>+struct ethnl_request_ops {</div><div class='add'>+	u8			request_cmd;</div><div class='add'>+	u8			reply_cmd;</div><div class='add'>+	u16			hdr_attr;</div><div class='add'>+	unsigned int		req_info_size;</div><div class='add'>+	unsigned int		reply_data_size;</div><div class='add'>+	bool			allow_nodev_do;</div><div class='add'>+	u8			set_ntf_cmd;</div><div class='add'>+</div><div class='add'>+	int (*parse_request)(struct ethnl_req_info *req_info,</div><div class='add'>+			     struct nlattr **tb,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+	int (*prepare_data)(const struct ethnl_req_info *req_info,</div><div class='add'>+			    struct ethnl_reply_data *reply_data,</div><div class='add'>+			    const struct genl_info *info);</div><div class='add'>+	int (*reply_size)(const struct ethnl_req_info *req_info,</div><div class='add'>+			  const struct ethnl_reply_data *reply_data);</div><div class='add'>+	int (*fill_reply)(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_info,</div><div class='add'>+			  const struct ethnl_reply_data *reply_data);</div><div class='add'>+	void (*cleanup_data)(struct ethnl_reply_data *reply_data);</div><div class='add'>+</div><div class='add'>+	int (*set_validate)(struct ethnl_req_info *req_info,</div><div class='add'>+			    struct genl_info *info);</div><div class='add'>+	int (*set)(struct ethnl_req_info *req_info,</div><div class='add'>+		   struct genl_info *info);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* request handlers */</div><div class='add'>+</div><div class='add'>+extern const struct ethnl_request_ops ethnl_strset_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_linkinfo_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_linkmodes_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_linkstate_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_debug_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_wol_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_features_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_privflags_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_rings_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_channels_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_coalesce_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_pause_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_eee_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_tsinfo_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_fec_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_module_eeprom_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_stats_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_phc_vclocks_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_module_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_pse_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_rss_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_plca_cfg_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_plca_status_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_mm_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_phy_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_tsconfig_request_ops;</div><div class='add'>+extern const struct ethnl_request_ops ethnl_mse_request_ops;</div><div class='add'>+</div><div class='add'>+extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1];</div><div class='add'>+extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1];</div><div class='add'>+extern const struct nla_policy ethnl_header_policy_phy[ETHTOOL_A_HEADER_PHY_INDEX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_header_policy_phy_stats[ETHTOOL_A_HEADER_PHY_INDEX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_COUNTS_ONLY + 1];</div><div class='add'>+extern const struct nla_policy ethnl_linkinfo_get_policy[ETHTOOL_A_LINKINFO_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_linkinfo_set_policy[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL + 1];</div><div class='add'>+extern const struct nla_policy ethnl_linkmodes_get_policy[ETHTOOL_A_LINKMODES_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_linkmodes_set_policy[ETHTOOL_A_LINKMODES_LANES + 1];</div><div class='add'>+extern const struct nla_policy ethnl_linkstate_get_policy[ETHTOOL_A_LINKSTATE_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_debug_get_policy[ETHTOOL_A_DEBUG_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_debug_set_policy[ETHTOOL_A_DEBUG_MSGMASK + 1];</div><div class='add'>+extern const struct nla_policy ethnl_wol_get_policy[ETHTOOL_A_WOL_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_wol_set_policy[ETHTOOL_A_WOL_SOPASS + 1];</div><div class='add'>+extern const struct nla_policy ethnl_features_get_policy[ETHTOOL_A_FEATURES_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_features_set_policy[ETHTOOL_A_FEATURES_WANTED + 1];</div><div class='add'>+extern const struct nla_policy ethnl_privflags_get_policy[ETHTOOL_A_PRIVFLAGS_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_privflags_set_policy[ETHTOOL_A_PRIVFLAGS_FLAGS + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rings_get_policy[ETHTOOL_A_RINGS_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rings_set_policy[ETHTOOL_A_RINGS_HDS_THRESH_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_channels_get_policy[ETHTOOL_A_CHANNELS_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_channels_set_policy[ETHTOOL_A_CHANNELS_COMBINED_COUNT + 1];</div><div class='add'>+extern const struct nla_policy ethnl_coalesce_get_policy[ETHTOOL_A_COALESCE_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_pause_get_policy[ETHTOOL_A_PAUSE_STATS_SRC + 1];</div><div class='add'>+extern const struct nla_policy ethnl_pause_set_policy[ETHTOOL_A_PAUSE_STATS_SRC + 1];</div><div class='add'>+extern const struct nla_policy ethnl_eee_get_policy[ETHTOOL_A_EEE_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_eee_set_policy[ETHTOOL_A_EEE_TX_LPI_TIMER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_tsinfo_get_policy[ETHTOOL_A_TSINFO_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_cable_test_act_policy[ETHTOOL_A_CABLE_TEST_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_cable_test_tdr_act_policy[ETHTOOL_A_CABLE_TEST_TDR_CFG + 1];</div><div class='add'>+extern const struct nla_policy ethnl_tunnel_info_get_policy[ETHTOOL_A_TUNNEL_INFO_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_fec_get_policy[ETHTOOL_A_FEC_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1];</div><div class='add'>+extern const struct nla_policy ethnl_module_eeprom_get_policy[ETHTOOL_A_MODULE_EEPROM_I2C_ADDRESS + 1];</div><div class='add'>+extern const struct nla_policy ethnl_stats_get_policy[ETHTOOL_A_STATS_SRC + 1];</div><div class='add'>+extern const struct nla_policy ethnl_phc_vclocks_get_policy[ETHTOOL_A_PHC_VCLOCKS_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_module_get_policy[ETHTOOL_A_MODULE_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLICY + 1];</div><div class='add'>+extern const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rss_get_policy[ETHTOOL_A_RSS_START_CONTEXT + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rss_set_policy[ETHTOOL_A_RSS_FLOW_HASH + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rss_create_policy[ETHTOOL_A_RSS_INPUT_XFRM + 1];</div><div class='add'>+extern const struct nla_policy ethnl_rss_delete_policy[ETHTOOL_A_RSS_CONTEXT + 1];</div><div class='add'>+extern const struct nla_policy ethnl_plca_get_cfg_policy[ETHTOOL_A_PLCA_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_plca_set_cfg_policy[ETHTOOL_A_PLCA_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_module_fw_flash_act_policy[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD + 1];</div><div class='add'>+extern const struct nla_policy ethnl_phy_get_policy[ETHTOOL_A_PHY_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_tsconfig_get_policy[ETHTOOL_A_TSCONFIG_HEADER + 1];</div><div class='add'>+extern const struct nla_policy ethnl_tsconfig_set_policy[ETHTOOL_A_TSCONFIG_MAX + 1];</div><div class='add'>+extern const struct nla_policy ethnl_mse_get_policy[ETHTOOL_A_MSE_HEADER + 1];</div><div class='add'>+</div><div class='add'>+int ethnl_set_features(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_tunnel_info_start(struct netlink_callback *cb);</div><div class='add'>+int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int ethnl_act_module_fw_flash(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_rss_dump_start(struct netlink_callback *cb);</div><div class='add'>+int ethnl_rss_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int ethnl_tsinfo_start(struct netlink_callback *cb);</div><div class='add'>+int ethnl_tsinfo_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+int ethnl_tsinfo_done(struct netlink_callback *cb);</div><div class='add'>+int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int ethnl_rss_delete_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char stats_eth_ctrl_names[__ETHTOOL_A_STATS_ETH_CTRL_CNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char stats_rmon_names[__ETHTOOL_A_STATS_RMON_CNT][ETH_GSTRING_LEN];</div><div class='add'>+extern const char stats_phy_names[__ETHTOOL_A_STATS_PHY_CNT][ETH_GSTRING_LEN];</div><div class='add'>+</div><div class='add'>+#endif /* _NET_ETHTOOL_NETLINK_H */</div><div class='head'>diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c<br/>new file mode 100644<br/>index 000000000000..0f9af1e66548<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/pause.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/pause.c</a></div><div class='hunk'>@@ -0,0 +1,219 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct pause_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+	enum ethtool_mac_stats_src	src;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PAUSE_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct pause_req_info, base)</div><div class='add'>+</div><div class='add'>+struct pause_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_pauseparam	pauseparam;</div><div class='add'>+	struct ethtool_pause_stats	pausestat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PAUSE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct pause_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_pause_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PAUSE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_stats),</div><div class='add'>+	[ETHTOOL_A_PAUSE_STATS_SRC]		=</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, ETHTOOL_MAC_STATS_SRC_PMAC),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pause_parse_request(struct ethnl_req_info *req_base,</div><div class='add'>+			       struct nlattr **tb,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum ethtool_mac_stats_src src = ETHTOOL_MAC_STATS_SRC_AGGREGATE;</div><div class='add'>+	struct pause_req_info *req_info = PAUSE_REQINFO(req_base);</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_PAUSE_STATS_SRC]) {</div><div class='add'>+		if (!(req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "ETHTOOL_FLAG_STATS must be set when requesting a source of stats");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		src = nla_get_u32(tb[ETHTOOL_A_PAUSE_STATS_SRC]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_info-&gt;src = src;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pause_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			      struct ethnl_reply_data *reply_base,</div><div class='add'>+			      const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct pause_req_info *req_info = PAUSE_REQINFO(req_base);</div><div class='add'>+	struct pause_reply_data *data = PAUSE_REPDATA(reply_base);</div><div class='add'>+	enum ethtool_mac_stats_src src = req_info-&gt;src;</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_pauseparam)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ethtool_stats_init((u64 *)&amp;data-&gt;pausestat,</div><div class='add'>+			   sizeof(data-&gt;pausestat) / 8);</div><div class='add'>+	data-&gt;pausestat.src = src;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if ((src == ETHTOOL_MAC_STATS_SRC_EMAC ||</div><div class='add'>+	     src == ETHTOOL_MAC_STATS_SRC_PMAC) &amp;&amp;</div><div class='add'>+	    !__ethtool_dev_mm_supported(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(info-&gt;extack,</div><div class='add'>+				   "Device does not support MAC merge layer");</div><div class='add'>+		ethnl_ops_complete(dev);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_pauseparam(dev, &amp;data-&gt;pauseparam);</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_pause_stats)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_pause_stats(dev, &amp;data-&gt;pausestat);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pause_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	int n = nla_total_size(sizeof(u8)) +	/* _PAUSE_AUTONEG */</div><div class='add'>+		nla_total_size(sizeof(u8)) +	/* _PAUSE_RX */</div><div class='add'>+		nla_total_size(sizeof(u8));	/* _PAUSE_TX */</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS)</div><div class='add'>+		n += nla_total_size(0) +	/* _PAUSE_STATS */</div><div class='add'>+		     nla_total_size(sizeof(u32)) + /* _PAUSE_STATS_SRC */</div><div class='add'>+		     nla_total_size_64bit(sizeof(u64)) * ETHTOOL_PAUSE_STAT_CNT;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_put_stat(struct sk_buff *skb, u64 val, u16 attrtype,</div><div class='add'>+			    u16 padtype)</div><div class='add'>+{</div><div class='add'>+	if (val == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return 0;</div><div class='add'>+	if (nla_put_u64_64bit(skb, attrtype, val, padtype))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pause_put_stats(struct sk_buff *skb,</div><div class='add'>+			   const struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	const u16 pad = ETHTOOL_A_PAUSE_STAT_PAD;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_PAUSE_STATS_SRC, pause_stats-&gt;src))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_PAUSE_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (ethtool_put_stat(skb, pause_stats-&gt;tx_pause_frames,</div><div class='add'>+			     ETHTOOL_A_PAUSE_STAT_TX_FRAMES, pad) ||</div><div class='add'>+	    ethtool_put_stat(skb, pause_stats-&gt;rx_pause_frames,</div><div class='add'>+			     ETHTOOL_A_PAUSE_STAT_RX_FRAMES, pad))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pause_fill_reply(struct sk_buff *skb,</div><div class='add'>+			    const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct pause_reply_data *data = PAUSE_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_pauseparam *pauseparam = &amp;data-&gt;pauseparam;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_PAUSE_AUTONEG, !!pauseparam-&gt;autoneg) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_PAUSE_RX, !!pauseparam-&gt;rx_pause) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_PAUSE_TX, !!pauseparam-&gt;tx_pause))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp;</div><div class='add'>+	    pause_put_stats(skb, &amp;data-&gt;pausestat))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PAUSE_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_pause_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PAUSE_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_PAUSE_AUTONEG]		= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_PAUSE_RX]			= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_PAUSE_TX]			= { .type = NLA_U8 },</div><div class='add'>+	[ETHTOOL_A_PAUSE_STATS_SRC]		= { .type = NLA_REJECT },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_pause_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_pauseparam &amp;&amp; ops-&gt;set_pauseparam ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_pause(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct ethtool_pauseparam params = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_pauseparam(dev, &amp;params);</div><div class='add'>+</div><div class='add'>+	ethnl_update_bool32(&amp;params.autoneg, tb[ETHTOOL_A_PAUSE_AUTONEG], &amp;mod);</div><div class='add'>+	ethnl_update_bool32(&amp;params.rx_pause, tb[ETHTOOL_A_PAUSE_RX], &amp;mod);</div><div class='add'>+	ethnl_update_bool32(&amp;params.tx_pause, tb[ETHTOOL_A_PAUSE_TX], &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_pauseparam(dev, &amp;params);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_pause_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PAUSE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PAUSE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PAUSE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct pause_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct pause_reply_data),</div><div class='add'>+</div><div class='add'>+	.parse_request		= pause_parse_request,</div><div class='add'>+	.prepare_data		= pause_prepare_data,</div><div class='add'>+	.reply_size		= pause_reply_size,</div><div class='add'>+	.fill_reply		= pause_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_pause_validate,</div><div class='add'>+	.set			= ethnl_set_pause,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_PAUSE_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/phc_vclocks.c b/net/ethtool/phc_vclocks.c<br/>new file mode 100644<br/>index 000000000000..cadaabed60bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/phc_vclocks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/phc_vclocks.c</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2021 NXP</div><div class='add'>+ */</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct phc_vclocks_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct phc_vclocks_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	int				num;</div><div class='add'>+	int				*index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PHC_VCLOCKS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct phc_vclocks_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_phc_vclocks_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PHC_VCLOCKS_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phc_vclocks_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				    struct ethnl_reply_data *reply_base,</div><div class='add'>+				    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct phc_vclocks_reply_data *data = PHC_VCLOCKS_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	data-&gt;num = ethtool_get_phc_vclocks(dev, &amp;data-&gt;index);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phc_vclocks_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct phc_vclocks_reply_data *data =</div><div class='add'>+		PHC_VCLOCKS_REPDATA(reply_base);</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;num &gt; 0) {</div><div class='add'>+		len += nla_total_size(sizeof(u32));</div><div class='add'>+		len += nla_total_size(sizeof(s32) * data-&gt;num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phc_vclocks_fill_reply(struct sk_buff *skb,</div><div class='add'>+				  const struct ethnl_req_info *req_base,</div><div class='add'>+				  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct phc_vclocks_reply_data *data =</div><div class='add'>+		PHC_VCLOCKS_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;num &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_PHC_VCLOCKS_NUM, data-&gt;num) ||</div><div class='add'>+	    nla_put(skb, ETHTOOL_A_PHC_VCLOCKS_INDEX,</div><div class='add'>+		    sizeof(s32) * data-&gt;num, data-&gt;index))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void phc_vclocks_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct phc_vclocks_reply_data *data =</div><div class='add'>+		PHC_VCLOCKS_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	kfree(data-&gt;index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_phc_vclocks_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PHC_VCLOCKS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PHC_VCLOCKS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct phc_vclocks_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct phc_vclocks_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= phc_vclocks_prepare_data,</div><div class='add'>+	.reply_size		= phc_vclocks_reply_size,</div><div class='add'>+	.fill_reply		= phc_vclocks_fill_reply,</div><div class='add'>+	.cleanup_data		= phc_vclocks_cleanup_data,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/phy.c b/net/ethtool/phy.c<br/>new file mode 100644<br/>index 000000000000..68372bef4b2f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/phy.c</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2023 Bootlin</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phy_link_topology.h&gt;</div><div class='add'>+#include &lt;linux/sfp.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+struct phy_req_info {</div><div class='add'>+	struct ethnl_req_info base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct phy_reply_data {</div><div class='add'>+	struct ethnl_reply_data	base;</div><div class='add'>+	u32 phyindex;</div><div class='add'>+	char *drvname;</div><div class='add'>+	char *name;</div><div class='add'>+	unsigned int upstream_type;</div><div class='add'>+	char *upstream_sfp_name;</div><div class='add'>+	unsigned int upstream_index;</div><div class='add'>+	char *downstream_sfp_name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PHY_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct phy_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_phy_get_policy[ETHTOOL_A_PHY_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_PHY_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_reply_size(const struct ethnl_req_info *req_info,</div><div class='add'>+			  const struct ethnl_reply_data *reply_data)</div><div class='add'>+{</div><div class='add'>+	struct phy_reply_data *rep_data = PHY_REPDATA(reply_data);</div><div class='add'>+	size_t size = 0;</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_PHY_INDEX */</div><div class='add'>+	size += nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_DRVNAME */</div><div class='add'>+	if (rep_data-&gt;drvname)</div><div class='add'>+		size += nla_total_size(strlen(rep_data-&gt;drvname) + 1);</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_NAME */</div><div class='add'>+	size += nla_total_size(strlen(rep_data-&gt;name) + 1);</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_PHY_UPSTREAM_TYPE */</div><div class='add'>+	size += nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_PHY_UPSTREAM_SFP_NAME */</div><div class='add'>+	if (rep_data-&gt;upstream_sfp_name)</div><div class='add'>+		size += nla_total_size(strlen(rep_data-&gt;upstream_sfp_name) + 1);</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_PHY_UPSTREAM_INDEX */</div><div class='add'>+	if (rep_data-&gt;upstream_index)</div><div class='add'>+		size += nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	/* ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME */</div><div class='add'>+	if (rep_data-&gt;downstream_sfp_name)</div><div class='add'>+		size += nla_total_size(strlen(rep_data-&gt;downstream_sfp_name) + 1);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_prepare_data(const struct ethnl_req_info *req_info,</div><div class='add'>+			    struct ethnl_reply_data *reply_data,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct phy_link_topology *topo = reply_data-&gt;dev-&gt;link_topo;</div><div class='add'>+	struct phy_reply_data *rep_data = PHY_REPDATA(reply_data);</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device_node *pdn;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+</div><div class='add'>+	/* RTNL is held by the caller */</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_info, tb, ETHTOOL_A_PHY_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	pdn = xa_load(&amp;topo-&gt;phys, phydev-&gt;phyindex);</div><div class='add'>+	if (!pdn)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rep_data-&gt;phyindex = phydev-&gt;phyindex;</div><div class='add'>+	rep_data-&gt;name = kstrdup(dev_name(&amp;phydev-&gt;mdio.dev), GFP_KERNEL);</div><div class='add'>+	rep_data-&gt;drvname = kstrdup(phydev-&gt;drv-&gt;name, GFP_KERNEL);</div><div class='add'>+	rep_data-&gt;upstream_type = pdn-&gt;upstream_type;</div><div class='add'>+</div><div class='add'>+	if (pdn-&gt;upstream_type == PHY_UPSTREAM_PHY) {</div><div class='add'>+		struct phy_device *upstream = pdn-&gt;upstream.phydev;</div><div class='add'>+		rep_data-&gt;upstream_index = upstream-&gt;phyindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdn-&gt;parent_sfp_bus)</div><div class='add'>+		rep_data-&gt;upstream_sfp_name = kstrdup(sfp_get_name(pdn-&gt;parent_sfp_bus),</div><div class='add'>+						      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;sfp_bus)</div><div class='add'>+		rep_data-&gt;downstream_sfp_name = kstrdup(sfp_get_name(phydev-&gt;sfp_bus),</div><div class='add'>+							GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_info,</div><div class='add'>+			  const struct ethnl_reply_data *reply_data)</div><div class='add'>+{</div><div class='add'>+	struct phy_reply_data *rep_data = PHY_REPDATA(reply_data);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_PHY_INDEX, rep_data-&gt;phyindex) ||</div><div class='add'>+	    nla_put_string(skb, ETHTOOL_A_PHY_NAME, rep_data-&gt;name) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_PHY_UPSTREAM_TYPE, rep_data-&gt;upstream_type))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (rep_data-&gt;drvname &amp;&amp;</div><div class='add'>+	    nla_put_string(skb, ETHTOOL_A_PHY_DRVNAME, rep_data-&gt;drvname))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (rep_data-&gt;upstream_index &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_PHY_UPSTREAM_INDEX,</div><div class='add'>+			rep_data-&gt;upstream_index))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (rep_data-&gt;upstream_sfp_name &amp;&amp;</div><div class='add'>+	    nla_put_string(skb, ETHTOOL_A_PHY_UPSTREAM_SFP_NAME,</div><div class='add'>+			   rep_data-&gt;upstream_sfp_name))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (rep_data-&gt;downstream_sfp_name &amp;&amp;</div><div class='add'>+	    nla_put_string(skb, ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME,</div><div class='add'>+			   rep_data-&gt;downstream_sfp_name))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void phy_cleanup_data(struct ethnl_reply_data *reply_data)</div><div class='add'>+{</div><div class='add'>+	struct phy_reply_data *rep_data = PHY_REPDATA(reply_data);</div><div class='add'>+</div><div class='add'>+	kfree(rep_data-&gt;drvname);</div><div class='add'>+	kfree(rep_data-&gt;name);</div><div class='add'>+	kfree(rep_data-&gt;upstream_sfp_name);</div><div class='add'>+	kfree(rep_data-&gt;downstream_sfp_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_phy_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PHY_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PHY_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PHY_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct phy_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct phy_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= phy_prepare_data,</div><div class='add'>+	.reply_size		= phy_reply_size,</div><div class='add'>+	.fill_reply		= phy_fill_reply,</div><div class='add'>+	.cleanup_data		= phy_cleanup_data,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/plca.c b/net/ethtool/plca.c<br/>new file mode 100644<br/>index 000000000000..e1f7820a6158<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/plca.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/plca.c</a></div><div class='hunk'>@@ -0,0 +1,271 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct plca_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct plca_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct phy_plca_cfg		plca_cfg;</div><div class='add'>+	struct phy_plca_status		plca_st;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Helpers ------------------------------------------------------------------ //</div><div class='add'>+</div><div class='add'>+#define PLCA_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct plca_reply_data, base)</div><div class='add'>+</div><div class='add'>+// PLCA get configuration message ------------------------------------------- //</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_plca_get_cfg_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PLCA_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid,</div><div class='add'>+			     bool *mod)</div><div class='add'>+{</div><div class='add'>+	const struct nlattr *attr = tb[attrid];</div><div class='add'>+</div><div class='add'>+	if (!attr ||</div><div class='add'>+	    WARN_ON_ONCE(attrid &gt;= ARRAY_SIZE(ethnl_plca_set_cfg_policy)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (ethnl_plca_set_cfg_policy[attrid].type) {</div><div class='add'>+	case NLA_U8:</div><div class='add'>+		*dst = nla_get_u8(attr);</div><div class='add'>+		break;</div><div class='add'>+	case NLA_U32:</div><div class='add'>+		*dst = nla_get_u32(attr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*mod = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				     struct ethnl_reply_data *reply_base,</div><div class='add'>+				     const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct plca_reply_data *data = PLCA_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	const struct ethtool_phy_ops *ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_PLCA_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	// check that the PHY device is available and connected</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// note: rtnl_lock is held already by ethnl_default_doit</div><div class='add'>+	ops = ethtool_phy_ops;</div><div class='add'>+	if (!ops || !ops-&gt;get_plca_cfg) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memset(&amp;data-&gt;plca_cfg, 0xff,</div><div class='add'>+	       sizeof_field(struct plca_reply_data, plca_cfg));</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;get_plca_cfg(phydev, &amp;data-&gt;plca_cfg);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plca_get_cfg_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				   const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u16)) +	/* _VERSION */</div><div class='add'>+	       nla_total_size(sizeof(u8)) +	/* _ENABLED */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _NODE_CNT */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _NODE_ID */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _TO_TIMER */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _BURST_COUNT */</div><div class='add'>+	       nla_total_size(sizeof(u32));	/* _BURST_TIMER */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plca_get_cfg_fill_reply(struct sk_buff *skb,</div><div class='add'>+				   const struct ethnl_req_info *req_base,</div><div class='add'>+				   const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct plca_reply_data *data = PLCA_REPDATA(reply_base);</div><div class='add'>+	const struct phy_plca_cfg *plca = &amp;data-&gt;plca_cfg;</div><div class='add'>+</div><div class='add'>+	if ((plca-&gt;version &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u16(skb, ETHTOOL_A_PLCA_VERSION, plca-&gt;version)) ||</div><div class='add'>+	    (plca-&gt;enabled &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u8(skb, ETHTOOL_A_PLCA_ENABLED, !!plca-&gt;enabled)) ||</div><div class='add'>+	    (plca-&gt;node_id &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PLCA_NODE_ID, plca-&gt;node_id)) ||</div><div class='add'>+	    (plca-&gt;node_cnt &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PLCA_NODE_CNT, plca-&gt;node_cnt)) ||</div><div class='add'>+	    (plca-&gt;to_tmr &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PLCA_TO_TMR, plca-&gt;to_tmr)) ||</div><div class='add'>+	    (plca-&gt;burst_cnt &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PLCA_BURST_CNT, plca-&gt;burst_cnt)) ||</div><div class='add'>+	    (plca-&gt;burst_tmr &gt;= 0 &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PLCA_BURST_TMR, plca-&gt;burst_tmr)))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// PLCA set configuration message ------------------------------------------- //</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_plca_set_cfg_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PLCA_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+	[ETHTOOL_A_PLCA_ENABLED]	= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_PLCA_NODE_ID]	= NLA_POLICY_MAX(NLA_U32, 255),</div><div class='add'>+	[ETHTOOL_A_PLCA_NODE_CNT]	= NLA_POLICY_RANGE(NLA_U32, 1, 255),</div><div class='add'>+	[ETHTOOL_A_PLCA_TO_TMR]		= NLA_POLICY_MAX(NLA_U32, 255),</div><div class='add'>+	[ETHTOOL_A_PLCA_BURST_CNT]	= NLA_POLICY_MAX(NLA_U32, 255),</div><div class='add'>+	[ETHTOOL_A_PLCA_BURST_TMR]	= NLA_POLICY_MAX(NLA_U32, 255),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_phy_ops *ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_plca_cfg plca_cfg;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_info, tb, ETHTOOL_A_PLCA_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	// check that the PHY device is available and connected</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ops = ethtool_phy_ops;</div><div class='add'>+	if (!ops || !ops-&gt;set_plca_cfg)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	memset(&amp;plca_cfg, 0xff, sizeof(plca_cfg));</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.enabled, tb, ETHTOOL_A_PLCA_ENABLED, &amp;mod);</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.node_id, tb, ETHTOOL_A_PLCA_NODE_ID, &amp;mod);</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.node_cnt, tb, ETHTOOL_A_PLCA_NODE_CNT, &amp;mod);</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.to_tmr, tb, ETHTOOL_A_PLCA_TO_TMR, &amp;mod);</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.burst_cnt, tb, ETHTOOL_A_PLCA_BURST_CNT,</div><div class='add'>+			 &amp;mod);</div><div class='add'>+	plca_update_sint(&amp;plca_cfg.burst_tmr, tb, ETHTOOL_A_PLCA_BURST_TMR,</div><div class='add'>+			 &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;set_plca_cfg(phydev, &amp;plca_cfg, info-&gt;extack);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_plca_cfg_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PLCA_GET_CFG,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PLCA_GET_CFG_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PLCA_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct plca_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct plca_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= plca_get_cfg_prepare_data,</div><div class='add'>+	.reply_size		= plca_get_cfg_reply_size,</div><div class='add'>+	.fill_reply		= plca_get_cfg_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set			= ethnl_set_plca,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_PLCA_NTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// PLCA get status message -------------------------------------------------- //</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_plca_get_status_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PLCA_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+					struct ethnl_reply_data *reply_base,</div><div class='add'>+					const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct plca_reply_data *data = PLCA_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	const struct ethtool_phy_ops *ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_PLCA_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	// check that the PHY device is available and connected</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// note: rtnl_lock is held already by ethnl_default_doit</div><div class='add'>+	ops = ethtool_phy_ops;</div><div class='add'>+	if (!ops || !ops-&gt;get_plca_status) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memset(&amp;data-&gt;plca_st, 0xff,</div><div class='add'>+	       sizeof_field(struct plca_reply_data, plca_st));</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;get_plca_status(phydev, &amp;data-&gt;plca_st);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plca_get_status_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				      const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u8));	/* _STATUS */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plca_get_status_fill_reply(struct sk_buff *skb,</div><div class='add'>+				      const struct ethnl_req_info *req_base,</div><div class='add'>+				      const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct plca_reply_data *data = PLCA_REPDATA(reply_base);</div><div class='add'>+	const u8 status = data-&gt;plca_st.pst;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, ETHTOOL_A_PLCA_STATUS, !!status))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_plca_status_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PLCA_GET_STATUS,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PLCA_GET_STATUS_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PLCA_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct plca_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct plca_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= plca_get_status_prepare_data,</div><div class='add'>+	.reply_size		= plca_get_status_reply_size,</div><div class='add'>+	.fill_reply		= plca_get_status_fill_reply,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/privflags.c b/net/ethtool/privflags.c<br/>new file mode 100644<br/>index 000000000000..297be6a13ab9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/privflags.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/privflags.c</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct privflags_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct privflags_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	const char			(*priv_flag_names)[ETH_GSTRING_LEN];</div><div class='add'>+	unsigned int			n_priv_flags;</div><div class='add'>+	u32				priv_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PRIVFLAGS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct privflags_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_privflags_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PRIVFLAGS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ethnl_get_priv_flags_info(struct net_device *dev,</div><div class='add'>+				     unsigned int *count,</div><div class='add'>+				     const char (**names)[ETH_GSTRING_LEN])</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	int nflags;</div><div class='add'>+</div><div class='add'>+	nflags = ops-&gt;get_sset_count(dev, ETH_SS_PRIV_FLAGS);</div><div class='add'>+	if (nflags &lt; 0)</div><div class='add'>+		return nflags;</div><div class='add'>+</div><div class='add'>+	if (names) {</div><div class='add'>+		*names = kcalloc(nflags, ETH_GSTRING_LEN, GFP_KERNEL);</div><div class='add'>+		if (!*names)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		ops-&gt;get_strings(dev, ETH_SS_PRIV_FLAGS, (u8 *)*names);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We can pass more than 32 private flags to userspace via netlink but</div><div class='add'>+	 * we cannot get more with ethtool_ops::get_priv_flags(). Note that we</div><div class='add'>+	 * must not adjust nflags before allocating the space for flag names</div><div class='add'>+	 * as the buffer must be large enough for all flags.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ONCE(nflags &gt; 32,</div><div class='add'>+		      "device %s reports more than 32 private flags (%d)\n",</div><div class='add'>+		      netdev_name(dev), nflags))</div><div class='add'>+		nflags = 32;</div><div class='add'>+	*count = nflags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int privflags_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				  struct ethnl_reply_data *reply_base,</div><div class='add'>+				  const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct privflags_reply_data *data = PRIVFLAGS_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	const char (*names)[ETH_GSTRING_LEN];</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	unsigned int nflags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+	if (!ops-&gt;get_priv_flags || !ops-&gt;get_sset_count || !ops-&gt;get_strings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_get_priv_flags_info(dev, &amp;nflags, &amp;names);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_ops;</div><div class='add'>+	data-&gt;priv_flags = ops-&gt;get_priv_flags(dev);</div><div class='add'>+	data-&gt;priv_flag_names = names;</div><div class='add'>+	data-&gt;n_priv_flags = nflags;</div><div class='add'>+</div><div class='add'>+out_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int privflags_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct privflags_reply_data *data = PRIVFLAGS_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const u32 all_flags = ~(u32)0 &gt;&gt; (32 - data-&gt;n_priv_flags);</div><div class='add'>+</div><div class='add'>+	return ethnl_bitset32_size(&amp;data-&gt;priv_flags, &amp;all_flags,</div><div class='add'>+				   data-&gt;n_priv_flags,</div><div class='add'>+				   data-&gt;priv_flag_names, compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int privflags_fill_reply(struct sk_buff *skb,</div><div class='add'>+				const struct ethnl_req_info *req_base,</div><div class='add'>+				const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct privflags_reply_data *data = PRIVFLAGS_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const u32 all_flags = ~(u32)0 &gt;&gt; (32 - data-&gt;n_priv_flags);</div><div class='add'>+</div><div class='add'>+	return ethnl_put_bitset32(skb, ETHTOOL_A_PRIVFLAGS_FLAGS,</div><div class='add'>+				  &amp;data-&gt;priv_flags, &amp;all_flags,</div><div class='add'>+				  data-&gt;n_priv_flags, data-&gt;priv_flag_names,</div><div class='add'>+				  compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void privflags_cleanup_data(struct ethnl_reply_data *reply_data)</div><div class='add'>+{</div><div class='add'>+	struct privflags_reply_data *data = PRIVFLAGS_REPDATA(reply_data);</div><div class='add'>+</div><div class='add'>+	kfree(data-&gt;priv_flag_names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PRIVFLAGS_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_privflags_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_PRIVFLAGS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_PRIVFLAGS_FLAGS]		= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_privflags_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[ETHTOOL_A_PRIVFLAGS_FLAGS])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_priv_flags || !ops-&gt;set_priv_flags ||</div><div class='add'>+	    !ops-&gt;get_sset_count || !ops-&gt;get_strings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_privflags(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const char (*names)[ETH_GSTRING_LEN] = NULL;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	unsigned int nflags;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	bool compact;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_bitset_is_compact(tb[ETHTOOL_A_PRIVFLAGS_FLAGS], &amp;compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_get_priv_flags_info(dev, &amp;nflags, compact ? NULL : &amp;names);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	flags = dev-&gt;ethtool_ops-&gt;get_priv_flags(dev);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_update_bitset32(&amp;flags, nflags,</div><div class='add'>+				    tb[ETHTOOL_A_PRIVFLAGS_FLAGS], names,</div><div class='add'>+				    info-&gt;extack, &amp;mod);</div><div class='add'>+	if (ret &lt; 0 || !mod)</div><div class='add'>+		goto out_free;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_priv_flags(dev, flags);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+	ret = 1;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(names);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_privflags_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PRIVFLAGS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PRIVFLAGS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PRIVFLAGS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct privflags_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct privflags_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= privflags_prepare_data,</div><div class='add'>+	.reply_size		= privflags_reply_size,</div><div class='add'>+	.fill_reply		= privflags_fill_reply,</div><div class='add'>+	.cleanup_data		= privflags_cleanup_data,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_privflags_validate,</div><div class='add'>+	.set			= ethnl_set_privflags,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_PRIVFLAGS_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c<br/>new file mode 100644<br/>index 000000000000..24def9c9dd54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/pse-pd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/pse-pd.c</a></div><div class='hunk'>@@ -0,0 +1,382 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// ethtool interface for Ethernet PSE (Power Sourcing Equipment)</div><div class='add'>+// and PD (Powered Device)</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2022 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "linux/pse-pd/pse.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+</div><div class='add'>+struct pse_req_info {</div><div class='add'>+	struct ethnl_req_info base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pse_reply_data {</div><div class='add'>+	struct ethnl_reply_data	base;</div><div class='add'>+	struct ethtool_pse_control_status status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PSE_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct pse_reply_data, base)</div><div class='add'>+</div><div class='add'>+/* PSE_GET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pse_get_pse_attributes(struct phy_device *phydev,</div><div class='add'>+				  struct netlink_ext_ack *extack,</div><div class='add'>+				  struct pse_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (!phydev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "No PHY found");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;psec) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "No PSE is attached");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;data-&gt;status, 0, sizeof(data-&gt;status));</div><div class='add'>+</div><div class='add'>+	return pse_ethtool_get_status(phydev-&gt;psec, extack, &amp;data-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pse_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			    struct ethnl_reply_data *reply_base,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct pse_reply_data *data = PSE_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_PSE_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR(phydev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = pse_get_pse_attributes(phydev, info-&gt;extack, data);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pse_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct pse_reply_data *data = PSE_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_pse_control_status *st = &amp;data-&gt;status;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;pw_d_id)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _PSE_PW_D_ID */</div><div class='add'>+	if (st-&gt;podl_admin_state &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _PODL_PSE_ADMIN_STATE */</div><div class='add'>+	if (st-&gt;podl_pw_status &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _PODL_PSE_PW_D_STATUS */</div><div class='add'>+	if (st-&gt;c33_admin_state &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _C33_PSE_ADMIN_STATE */</div><div class='add'>+	if (st-&gt;c33_pw_status &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _C33_PSE_PW_D_STATUS */</div><div class='add'>+	if (st-&gt;c33_pw_class &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _C33_PSE_PW_CLASS */</div><div class='add'>+	if (st-&gt;c33_actual_pw &gt; 0)</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _C33_PSE_ACTUAL_PW */</div><div class='add'>+	if (st-&gt;c33_ext_state_info.c33_pse_ext_state &gt; 0) {</div><div class='add'>+		len += nla_total_size(sizeof(u32)); /* _C33_PSE_EXT_STATE */</div><div class='add'>+		if (st-&gt;c33_ext_state_info.__c33_pse_ext_substate &gt; 0)</div><div class='add'>+			/* _C33_PSE_EXT_SUBSTATE */</div><div class='add'>+			len += nla_total_size(sizeof(u32));</div><div class='add'>+	}</div><div class='add'>+	if (st-&gt;c33_avail_pw_limit &gt; 0)</div><div class='add'>+		/* _C33_AVAIL_PSE_PW_LIMIT */</div><div class='add'>+		len += nla_total_size(sizeof(u32));</div><div class='add'>+	if (st-&gt;c33_pw_limit_nb_ranges &gt; 0)</div><div class='add'>+		/* _C33_PSE_PW_LIMIT_RANGES */</div><div class='add'>+		len += st-&gt;c33_pw_limit_nb_ranges *</div><div class='add'>+		       (nla_total_size(0) +</div><div class='add'>+			nla_total_size(sizeof(u32)) * 2);</div><div class='add'>+	if (st-&gt;prio_max)</div><div class='add'>+		/* _PSE_PRIO_MAX + _PSE_PRIO */</div><div class='add'>+		len += nla_total_size(sizeof(u32)) * 2;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pse_put_pw_limit_ranges(struct sk_buff *skb,</div><div class='add'>+				   const struct ethtool_pse_control_status *st)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_c33_pse_pw_limit_range *pw_limit_ranges;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pw_limit_ranges = st-&gt;c33_pw_limit_ranges;</div><div class='add'>+	for (i = 0; i &lt; st-&gt;c33_pw_limit_nb_ranges; i++) {</div><div class='add'>+		struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_C33_PSE_PW_LIMIT_RANGES);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_LIMIT_MIN,</div><div class='add'>+				pw_limit_ranges-&gt;min) ||</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_LIMIT_MAX,</div><div class='add'>+				pw_limit_ranges-&gt;max)) {</div><div class='add'>+			nla_nest_cancel(skb, nest);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+		pw_limit_ranges++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pse_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct pse_reply_data *data = PSE_REPDATA(reply_base);</div><div class='add'>+	const struct ethtool_pse_control_status *st = &amp;data-&gt;status;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;pw_d_id &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_PSE_PW_D_ID,</div><div class='add'>+			st-&gt;pw_d_id))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;podl_admin_state &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_PODL_PSE_ADMIN_STATE,</div><div class='add'>+			st-&gt;podl_admin_state))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;podl_pw_status &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_PODL_PSE_PW_D_STATUS,</div><div class='add'>+			st-&gt;podl_pw_status))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_admin_state &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_ADMIN_STATE,</div><div class='add'>+			st-&gt;c33_admin_state))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_pw_status &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_D_STATUS,</div><div class='add'>+			st-&gt;c33_pw_status))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_pw_class &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_CLASS,</div><div class='add'>+			st-&gt;c33_pw_class))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_actual_pw &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_ACTUAL_PW,</div><div class='add'>+			st-&gt;c33_actual_pw))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_ext_state_info.c33_pse_ext_state &gt; 0) {</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_C33_PSE_EXT_STATE,</div><div class='add'>+				st-&gt;c33_ext_state_info.c33_pse_ext_state))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (st-&gt;c33_ext_state_info.__c33_pse_ext_substate &gt; 0 &amp;&amp;</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_C33_PSE_EXT_SUBSTATE,</div><div class='add'>+				st-&gt;c33_ext_state_info.__c33_pse_ext_substate))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_avail_pw_limit &gt; 0 &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT,</div><div class='add'>+			st-&gt;c33_avail_pw_limit))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;c33_pw_limit_nb_ranges &gt; 0 &amp;&amp;</div><div class='add'>+	    pse_put_pw_limit_ranges(skb, st))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;prio_max &amp;&amp;</div><div class='add'>+	    (nla_put_u32(skb, ETHTOOL_A_PSE_PRIO_MAX, st-&gt;prio_max) ||</div><div class='add'>+	     nla_put_u32(skb, ETHTOOL_A_PSE_PRIO, st-&gt;prio)))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pse_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct pse_reply_data *data = PSE_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	kfree(data-&gt;status.c33_pw_limit_ranges);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PSE_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+	[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED,</div><div class='add'>+				 ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED),</div><div class='add'>+	[ETHTOOL_A_C33_PSE_ADMIN_CONTROL] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U32, ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED,</div><div class='add'>+				 ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED),</div><div class='add'>+	[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_PSE_PRIO] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_pse_validate(struct phy_device *phydev, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "No PHY is attached");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;psec) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "No PSE is attached");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] &amp;&amp;</div><div class='add'>+	    !pse_has_podl(phydev-&gt;psec)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL],</div><div class='add'>+				    "setting PoDL PSE admin control not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL] &amp;&amp;</div><div class='add'>+	    !pse_has_c33(phydev-&gt;psec)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL],</div><div class='add'>+				    "setting C33 PSE admin control not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_info, tb, ETHTOOL_A_PSE_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	ret = ethnl_set_pse_validate(phydev, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_PSE_PRIO]) {</div><div class='add'>+		unsigned int prio;</div><div class='add'>+</div><div class='add'>+		prio = nla_get_u32(tb[ETHTOOL_A_PSE_PRIO]);</div><div class='add'>+		ret = pse_ethtool_set_prio(phydev-&gt;psec, info-&gt;extack, prio);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT]) {</div><div class='add'>+		unsigned int pw_limit;</div><div class='add'>+</div><div class='add'>+		pw_limit = nla_get_u32(tb[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT]);</div><div class='add'>+		ret = pse_ethtool_set_pw_limit(phydev-&gt;psec, info-&gt;extack,</div><div class='add'>+					       pw_limit);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* These values are already validated by the ethnl_pse_set_policy */</div><div class='add'>+	if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] ||</div><div class='add'>+	    tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]) {</div><div class='add'>+		struct pse_control_config config = {};</div><div class='add'>+</div><div class='add'>+		if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL])</div><div class='add'>+			config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);</div><div class='add'>+		if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL])</div><div class='add'>+			config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]);</div><div class='add'>+</div><div class='add'>+		/* pse_ethtool_set_config() will do nothing if the config</div><div class='add'>+		 * is zero</div><div class='add'>+		 */</div><div class='add'>+		ret = pse_ethtool_set_config(phydev-&gt;psec, info-&gt;extack,</div><div class='add'>+					     &amp;config);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Return errno or zero - PSE has no notification */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_pse_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_PSE_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_PSE_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_PSE_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct pse_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct pse_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= pse_prepare_data,</div><div class='add'>+	.reply_size		= pse_reply_size,</div><div class='add'>+	.fill_reply		= pse_fill_reply,</div><div class='add'>+	.cleanup_data		= pse_cleanup_data,</div><div class='add'>+</div><div class='add'>+	.set			= ethnl_set_pse,</div><div class='add'>+	/* PSE has no notification */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ethnl_pse_send_ntf(struct net_device *netdev, unsigned long notifs)</div><div class='add'>+{</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int reply_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!netdev || !notifs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reply_len = ethnl_reply_header_size() +</div><div class='add'>+		    nla_total_size(sizeof(u32)); /* _PSE_NTF_EVENTS */</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(reply_len, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reply_payload = ethnl_bcastmsg_put(skb, ETHTOOL_MSG_PSE_NTF);</div><div class='add'>+	if (!reply_payload)</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, netdev, ETHTOOL_A_PSE_NTF_HEADER);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	if (nla_put_uint(skb, ETHTOOL_A_PSE_NTF_EVENTS, notifs))</div><div class='add'>+		goto err_skb;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, reply_payload);</div><div class='add'>+	ethnl_multicast(skb, netdev);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_skb:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ethnl_pse_send_ntf);</div><div class='head'>diff --git a/net/ethtool/rings.c b/net/ethtool/rings.c<br/>new file mode 100644<br/>index 000000000000..aeedd5ec6b8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/rings.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/rings.c</a></div><div class='hunk'>@@ -0,0 +1,322 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct rings_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rings_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_ringparam	ringparam;</div><div class='add'>+	struct kernel_ethtool_ringparam	kernel_ringparam;</div><div class='add'>+	u32				supported_ring_params;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RINGS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct rings_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rings_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_RINGS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rings_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			      struct ethnl_reply_data *reply_base,</div><div class='add'>+			      const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct rings_reply_data *data = RINGS_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_ringparam)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	data-&gt;supported_ring_params = dev-&gt;ethtool_ops-&gt;supported_ring_params;</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data-&gt;kernel_ringparam.tcp_data_split = dev-&gt;cfg-&gt;hds_config;</div><div class='add'>+	data-&gt;kernel_ringparam.hds_thresh = dev-&gt;cfg-&gt;hds_thresh;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_ringparam(dev, &amp;data-&gt;ringparam,</div><div class='add'>+					&amp;data-&gt;kernel_ringparam, info-&gt;extack);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rings_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(u32)) +	/* _RINGS_RX_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX_MINI_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX_JUMBO_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_TX_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX_MINI */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX_JUMBO */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_TX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_RX_BUF_LEN */</div><div class='add'>+	       nla_total_size(sizeof(u8))  +	/* _RINGS_TCP_DATA_SPLIT */</div><div class='add'>+	       nla_total_size(sizeof(u32)  +	/* _RINGS_CQE_SIZE */</div><div class='add'>+	       nla_total_size(sizeof(u8))  +	/* _RINGS_TX_PUSH */</div><div class='add'>+	       nla_total_size(sizeof(u8))) +	/* _RINGS_RX_PUSH */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_TX_PUSH_BUF_LEN */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_TX_PUSH_BUF_LEN_MAX */</div><div class='add'>+	       nla_total_size(sizeof(u32)) +	/* _RINGS_HDS_THRESH */</div><div class='add'>+	       nla_total_size(sizeof(u32));	/* _RINGS_HDS_THRESH_MAX*/</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rings_fill_reply(struct sk_buff *skb,</div><div class='add'>+			    const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct rings_reply_data *data = RINGS_REPDATA(reply_base);</div><div class='add'>+	const struct kernel_ethtool_ringparam *kr = &amp;data-&gt;kernel_ringparam;</div><div class='add'>+	const struct ethtool_ringparam *ringparam = &amp;data-&gt;ringparam;</div><div class='add'>+	u32 supported_ring_params = data-&gt;supported_ring_params;</div><div class='add'>+</div><div class='add'>+	WARN_ON(kr-&gt;tcp_data_split &gt; ETHTOOL_TCP_DATA_SPLIT_ENABLED);</div><div class='add'>+</div><div class='add'>+	if ((ringparam-&gt;rx_max_pending &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_RX_MAX,</div><div class='add'>+			  ringparam-&gt;rx_max_pending) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_RX,</div><div class='add'>+			  ringparam-&gt;rx_pending))) ||</div><div class='add'>+	    (ringparam-&gt;rx_mini_max_pending &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_RX_MINI_MAX,</div><div class='add'>+			  ringparam-&gt;rx_mini_max_pending) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_RX_MINI,</div><div class='add'>+			  ringparam-&gt;rx_mini_pending))) ||</div><div class='add'>+	    (ringparam-&gt;rx_jumbo_max_pending &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_RX_JUMBO_MAX,</div><div class='add'>+			  ringparam-&gt;rx_jumbo_max_pending) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_RX_JUMBO,</div><div class='add'>+			  ringparam-&gt;rx_jumbo_pending))) ||</div><div class='add'>+	    (ringparam-&gt;tx_max_pending &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_TX_MAX,</div><div class='add'>+			  ringparam-&gt;tx_max_pending) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_TX,</div><div class='add'>+			  ringparam-&gt;tx_pending)))  ||</div><div class='add'>+	    (kr-&gt;rx_buf_len &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_RX_BUF_LEN, kr-&gt;rx_buf_len))) ||</div><div class='add'>+	    (kr-&gt;tcp_data_split &amp;&amp;</div><div class='add'>+	     (nla_put_u8(skb, ETHTOOL_A_RINGS_TCP_DATA_SPLIT,</div><div class='add'>+			 kr-&gt;tcp_data_split))) ||</div><div class='add'>+	    (kr-&gt;cqe_size &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_CQE_SIZE, kr-&gt;cqe_size))) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_RINGS_TX_PUSH, !!kr-&gt;tx_push) ||</div><div class='add'>+	    nla_put_u8(skb, ETHTOOL_A_RINGS_RX_PUSH, !!kr-&gt;rx_push) ||</div><div class='add'>+	    ((supported_ring_params &amp; ETHTOOL_RING_USE_TX_PUSH_BUF_LEN) &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN_MAX,</div><div class='add'>+			  kr-&gt;tx_push_buf_max_len) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN,</div><div class='add'>+			  kr-&gt;tx_push_buf_len))) ||</div><div class='add'>+	    ((supported_ring_params &amp; ETHTOOL_RING_USE_HDS_THRS) &amp;&amp;</div><div class='add'>+	     (nla_put_u32(skb, ETHTOOL_A_RINGS_HDS_THRESH,</div><div class='add'>+			  kr-&gt;hds_thresh) ||</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RINGS_HDS_THRESH_MAX,</div><div class='add'>+			  kr-&gt;hds_thresh_max))))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RINGS_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rings_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_RINGS_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_RINGS_RX]			= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RINGS_RX_MINI]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RINGS_RX_JUMBO]		= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RINGS_TX]			= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RINGS_RX_BUF_LEN]            = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[ETHTOOL_A_RINGS_TCP_DATA_SPLIT]	=</div><div class='add'>+		NLA_POLICY_MAX(NLA_U8, ETHTOOL_TCP_DATA_SPLIT_ENABLED),</div><div class='add'>+	[ETHTOOL_A_RINGS_CQE_SIZE]		= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[ETHTOOL_A_RINGS_TX_PUSH]		= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_RINGS_RX_PUSH]		= NLA_POLICY_MAX(NLA_U8, 1),</div><div class='add'>+	[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN]	= { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RINGS_HDS_THRESH]		= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_rings_validate(struct ethnl_req_info *req_info,</div><div class='add'>+			 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_RX_BUF_LEN] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_RX_BUF_LEN)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_RX_BUF_LEN],</div><div class='add'>+				    "setting rx buf len not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_TCP_DATA_SPLIT)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT],</div><div class='add'>+				    "setting TCP data split is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_HDS_THRESH] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_HDS_THRS)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_HDS_THRESH],</div><div class='add'>+				    "setting hds-thresh is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_CQE_SIZE] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_CQE_SIZE)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_CQE_SIZE],</div><div class='add'>+				    "setting cqe size not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_TX_PUSH] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_TX_PUSH)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_TX_PUSH],</div><div class='add'>+				    "setting tx push not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_RX_PUSH] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_RX_PUSH)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_RX_PUSH],</div><div class='add'>+				    "setting rx push not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN] &amp;&amp;</div><div class='add'>+	    !(ops-&gt;supported_ring_params &amp; ETHTOOL_RING_USE_TX_PUSH_BUF_LEN)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN],</div><div class='add'>+				    "setting tx push buf len is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_ringparam &amp;&amp; ops-&gt;set_ringparam ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_rings(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct kernel_ethtool_ringparam kernel_ringparam;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct ethtool_ringparam ringparam;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	const struct nlattr *err_attr;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ethtool_ringparam_get_cfg(dev, &amp;ringparam, &amp;kernel_ringparam,</div><div class='add'>+				  info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	ethnl_update_u32(&amp;ringparam.rx_pending, tb[ETHTOOL_A_RINGS_RX], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;ringparam.rx_mini_pending,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_RX_MINI], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;ringparam.rx_jumbo_pending,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_RX_JUMBO], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;ringparam.tx_pending, tb[ETHTOOL_A_RINGS_TX], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_ringparam.rx_buf_len,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_RX_BUF_LEN], &amp;mod);</div><div class='add'>+	ethnl_update_u8(&amp;kernel_ringparam.tcp_data_split,</div><div class='add'>+			tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_ringparam.cqe_size,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_CQE_SIZE], &amp;mod);</div><div class='add'>+	ethnl_update_u8(&amp;kernel_ringparam.tx_push,</div><div class='add'>+			tb[ETHTOOL_A_RINGS_TX_PUSH], &amp;mod);</div><div class='add'>+	ethnl_update_u8(&amp;kernel_ringparam.rx_push,</div><div class='add'>+			tb[ETHTOOL_A_RINGS_RX_PUSH], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_ringparam.tx_push_buf_len,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN], &amp;mod);</div><div class='add'>+	ethnl_update_u32(&amp;kernel_ringparam.hds_thresh,</div><div class='add'>+			 tb[ETHTOOL_A_RINGS_HDS_THRESH], &amp;mod);</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (kernel_ringparam.tcp_data_split == ETHTOOL_TCP_DATA_SPLIT_ENABLED &amp;&amp;</div><div class='add'>+	    dev_xdp_sb_prog_count(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+				    tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT],</div><div class='add'>+				    "tcp-data-split can not be enabled with single buffer XDP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_get_min_mp_channel_count(dev)) {</div><div class='add'>+		if (kernel_ringparam.tcp_data_split !=</div><div class='add'>+		    ETHTOOL_TCP_DATA_SPLIT_ENABLED) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+				       "can't disable tcp-data-split while device has memory provider enabled");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		} else if (kernel_ringparam.hds_thresh) {</div><div class='add'>+			NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+				       "can't set non-zero hds_thresh while device is memory provider enabled");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure new ring parameters are within limits */</div><div class='add'>+	if (ringparam.rx_pending &gt; ringparam.rx_max_pending)</div><div class='add'>+		err_attr = tb[ETHTOOL_A_RINGS_RX];</div><div class='add'>+	else if (ringparam.rx_mini_pending &gt; ringparam.rx_mini_max_pending)</div><div class='add'>+		err_attr = tb[ETHTOOL_A_RINGS_RX_MINI];</div><div class='add'>+	else if (ringparam.rx_jumbo_pending &gt; ringparam.rx_jumbo_max_pending)</div><div class='add'>+		err_attr = tb[ETHTOOL_A_RINGS_RX_JUMBO];</div><div class='add'>+	else if (ringparam.tx_pending &gt; ringparam.tx_max_pending)</div><div class='add'>+		err_attr = tb[ETHTOOL_A_RINGS_TX];</div><div class='add'>+	else if (kernel_ringparam.hds_thresh &gt; kernel_ringparam.hds_thresh_max)</div><div class='add'>+		err_attr = tb[ETHTOOL_A_RINGS_HDS_THRESH];</div><div class='add'>+	else</div><div class='add'>+		err_attr = NULL;</div><div class='add'>+	if (err_attr) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, err_attr,</div><div class='add'>+				    "requested ring size exceeds maximum");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (kernel_ringparam.tx_push_buf_len &gt; kernel_ringparam.tx_push_buf_max_len) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR_FMT(info-&gt;extack, tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN],</div><div class='add'>+					"Requested TX push buffer exceeds the maximum of %u",</div><div class='add'>+					kernel_ringparam.tx_push_buf_max_len);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;cfg_pending-&gt;hds_config = kernel_ringparam.tcp_data_split;</div><div class='add'>+	dev-&gt;cfg_pending-&gt;hds_thresh = kernel_ringparam.hds_thresh;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_ringparam(dev, &amp;ringparam,</div><div class='add'>+					      &amp;kernel_ringparam, info-&gt;extack);</div><div class='add'>+	return ret &lt; 0 ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_rings_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_RINGS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_RINGS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_RINGS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct rings_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct rings_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= rings_prepare_data,</div><div class='add'>+	.reply_size		= rings_reply_size,</div><div class='add'>+	.fill_reply		= rings_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_rings_validate,</div><div class='add'>+	.set			= ethnl_set_rings,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_RINGS_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/rss.c b/net/ethtool/rss.c<br/>new file mode 100644<br/>index 000000000000..4dced53be4b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/rss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/rss.c</a></div><div class='hunk'>@@ -0,0 +1,1205 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct rss_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+	u32				rss_context;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rss_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	bool				has_flow_hash;</div><div class='add'>+	bool				no_key_fields;</div><div class='add'>+	u32				indir_size;</div><div class='add'>+	u32				hkey_size;</div><div class='add'>+	u32				hfunc;</div><div class='add'>+	u32				input_xfrm;</div><div class='add'>+	u32				*indir_table;</div><div class='add'>+	u8				*hkey;</div><div class='add'>+	int				flow_hash[__ETHTOOL_A_FLOW_CNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ethtool_rxfh_ft_nl2ioctl[] = {</div><div class='add'>+	[ETHTOOL_A_FLOW_ETHER]		= ETHER_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_IP4]		= IPV4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_IP6]		= IPV6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_TCP4]		= TCP_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_UDP4]		= UDP_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_SCTP4]		= SCTP_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_AH_ESP4]	= AH_ESP_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_TCP6]		= TCP_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_UDP6]		= UDP_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_SCTP6]		= SCTP_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_AH_ESP6]	= AH_ESP_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_AH4]		= AH_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_ESP4]		= ESP_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_AH6]		= AH_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_ESP6]		= ESP_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU4]		= GTPU_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU6]		= GTPU_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC4]		= GTPC_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC6]		= GTPC_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC_TEID4]	= GTPC_TEID_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC_TEID6]	= GTPC_TEID_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_EH4]	= GTPU_EH_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_EH6]	= GTPU_EH_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_UL4]	= GTPU_UL_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_UL6]	= GTPU_UL_V6_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_DL4]	= GTPU_DL_V4_FLOW,</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_DL6]	= GTPU_DL_V6_FLOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RSS_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct rss_req_info, base)</div><div class='add'>+</div><div class='add'>+#define RSS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct rss_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rss_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_RSS_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_RSS_CONTEXT] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_RSS_START_CONTEXT] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_parse_request(struct ethnl_req_info *req_info, struct nlattr **tb,</div><div class='add'>+		  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rss_req_info *request = RSS_REQINFO(req_info);</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RSS_CONTEXT])</div><div class='add'>+		request-&gt;rss_context = nla_get_u32(tb[ETHTOOL_A_RSS_CONTEXT]);</div><div class='add'>+	if (tb[ETHTOOL_A_RSS_START_CONTEXT]) {</div><div class='add'>+		NL_SET_BAD_ATTR(extack, tb[ETHTOOL_A_RSS_START_CONTEXT]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rss_prepare_flow_hash(const struct rss_req_info *req, struct net_device *dev,</div><div class='add'>+		      struct rss_reply_data *data, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	data-&gt;has_flow_hash = false;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_rxfh_fields)</div><div class='add'>+		return;</div><div class='add'>+	if (req-&gt;rss_context &amp;&amp; !dev-&gt;ethtool_ops-&gt;rxfh_per_ctx_fields)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	for (i = 1; i &lt; __ETHTOOL_A_FLOW_CNT; i++) {</div><div class='add'>+		struct ethtool_rxfh_fields fields = {</div><div class='add'>+			.flow_type	= ethtool_rxfh_ft_nl2ioctl[i],</div><div class='add'>+			.rss_context	= req-&gt;rss_context,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;ethtool_ops-&gt;get_rxfh_fields(dev, &amp;fields)) {</div><div class='add'>+			data-&gt;flow_hash[i] = -1; /* Unsupported */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;flow_hash[i] = fields.data;</div><div class='add'>+		data-&gt;has_flow_hash = true;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_get_data_alloc(struct net_device *dev, struct rss_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	u32 total_size, indir_bytes;</div><div class='add'>+	u8 *rss_config;</div><div class='add'>+</div><div class='add'>+	data-&gt;indir_size = 0;</div><div class='add'>+	data-&gt;hkey_size = 0;</div><div class='add'>+	if (ops-&gt;get_rxfh_indir_size)</div><div class='add'>+		data-&gt;indir_size = ops-&gt;get_rxfh_indir_size(dev);</div><div class='add'>+	if (ops-&gt;get_rxfh_key_size)</div><div class='add'>+		data-&gt;hkey_size = ops-&gt;get_rxfh_key_size(dev);</div><div class='add'>+</div><div class='add'>+	indir_bytes = data-&gt;indir_size * sizeof(u32);</div><div class='add'>+	total_size = indir_bytes + data-&gt;hkey_size;</div><div class='add'>+	rss_config = kzalloc(total_size, GFP_KERNEL);</div><div class='add'>+	if (!rss_config)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;indir_size)</div><div class='add'>+		data-&gt;indir_table = (u32 *)rss_config;</div><div class='add'>+	if (data-&gt;hkey_size)</div><div class='add'>+		data-&gt;hkey = rss_config + indir_bytes;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rss_get_data_free(const struct rss_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	kfree(data-&gt;indir_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_prepare_get(const struct rss_req_info *request, struct net_device *dev,</div><div class='add'>+		struct rss_reply_data *data, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+</div><div class='add'>+	ret = rss_get_data_alloc(dev, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	rxfh.indir_size = data-&gt;indir_size;</div><div class='add'>+	rxfh.indir = data-&gt;indir_table;</div><div class='add'>+	rxfh.key_size = data-&gt;hkey_size;</div><div class='add'>+	rxfh.key = data-&gt;hkey;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;get_rxfh(dev, &amp;rxfh);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	data-&gt;hfunc = rxfh.hfunc;</div><div class='add'>+	data-&gt;input_xfrm = rxfh.input_xfrm;</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__rss_prepare_ctx(struct net_device *dev, struct rss_reply_data *data,</div><div class='add'>+		  struct ethtool_rxfh_context *ctx)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(data-&gt;indir_size != ctx-&gt;indir_size ||</div><div class='add'>+			 data-&gt;hkey_size != ctx-&gt;key_size))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data-&gt;no_key_fields = !dev-&gt;ethtool_ops-&gt;rxfh_per_ctx_key;</div><div class='add'>+</div><div class='add'>+	data-&gt;hfunc = ctx-&gt;hfunc;</div><div class='add'>+	data-&gt;input_xfrm = ctx-&gt;input_xfrm;</div><div class='add'>+	memcpy(data-&gt;indir_table, ethtool_rxfh_context_indir(ctx),</div><div class='add'>+	       data-&gt;indir_size * sizeof(u32));</div><div class='add'>+	if (data-&gt;hkey_size)</div><div class='add'>+		memcpy(data-&gt;hkey, ethtool_rxfh_context_key(ctx),</div><div class='add'>+		       data-&gt;hkey_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev,</div><div class='add'>+		struct rss_reply_data *data, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	u32 total_size, indir_bytes;</div><div class='add'>+	u8 *rss_config;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, request-&gt;rss_context);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;indir_size = ctx-&gt;indir_size;</div><div class='add'>+	data-&gt;hkey_size = ctx-&gt;key_size;</div><div class='add'>+</div><div class='add'>+	indir_bytes = data-&gt;indir_size * sizeof(u32);</div><div class='add'>+	total_size = indir_bytes + data-&gt;hkey_size;</div><div class='add'>+	rss_config = kzalloc(total_size, GFP_KERNEL);</div><div class='add'>+	if (!rss_config) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;indir_table = (u32 *)rss_config;</div><div class='add'>+	if (data-&gt;hkey_size)</div><div class='add'>+		data-&gt;hkey = rss_config + indir_bytes;</div><div class='add'>+</div><div class='add'>+	__rss_prepare_ctx(dev, data, ctx);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_prepare(const struct rss_req_info *request, struct net_device *dev,</div><div class='add'>+	    struct rss_reply_data *data, const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	rss_prepare_flow_hash(request, dev, data, info);</div><div class='add'>+</div><div class='add'>+	/* Coming from RSS_SET, driver may only have flow_hash_fields ops */</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_rxfh)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (request-&gt;rss_context)</div><div class='add'>+		return rss_prepare_ctx(request, dev, data, info);</div><div class='add'>+	return rss_prepare_get(request, dev, data, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+		 struct ethnl_reply_data *reply_base,</div><div class='add'>+		 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct rss_reply_data *data = RSS_REPDATA(reply_base);</div><div class='add'>+	struct rss_req_info *request = RSS_REQINFO(req_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+	if (!ops-&gt;get_rxfh)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Some drivers don't handle rss_context */</div><div class='add'>+	if (request-&gt;rss_context &amp;&amp; !ops-&gt;create_rxfh_context)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return rss_prepare(request, dev, data, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+	       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct rss_reply_data *data = RSS_REPDATA(reply_base);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = nla_total_size(sizeof(u32)) +	/* _RSS_CONTEXT */</div><div class='add'>+	      nla_total_size(sizeof(u32)) +	/* _RSS_HFUNC */</div><div class='add'>+	      nla_total_size(sizeof(u32)) +	/* _RSS_INPUT_XFRM */</div><div class='add'>+	      nla_total_size(sizeof(u32) * data-&gt;indir_size) + /* _RSS_INDIR */</div><div class='add'>+	      nla_total_size(data-&gt;hkey_size) + /* _RSS_HKEY */</div><div class='add'>+	      nla_total_size(0) +		/* _RSS_FLOW_HASH */</div><div class='add'>+		nla_total_size(sizeof(u32)) * ETHTOOL_A_FLOW_MAX +</div><div class='add'>+	      0;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_fill_reply(struct sk_buff *skb, const struct ethnl_req_info *req_base,</div><div class='add'>+	       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct rss_reply_data *data = RSS_REPDATA(reply_base);</div><div class='add'>+	struct rss_req_info *request = RSS_REQINFO(req_base);</div><div class='add'>+</div><div class='add'>+	if (request-&gt;rss_context &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_RSS_CONTEXT, request-&gt;rss_context))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if ((data-&gt;indir_size &amp;&amp;</div><div class='add'>+	     nla_put(skb, ETHTOOL_A_RSS_INDIR,</div><div class='add'>+		     sizeof(u32) * data-&gt;indir_size, data-&gt;indir_table)))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;no_key_fields &amp;&amp;</div><div class='add'>+	    ((data-&gt;hfunc &amp;&amp;</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RSS_HFUNC, data-&gt;hfunc)) ||</div><div class='add'>+	     (data-&gt;input_xfrm &amp;&amp;</div><div class='add'>+	      nla_put_u32(skb, ETHTOOL_A_RSS_INPUT_XFRM, data-&gt;input_xfrm)) ||</div><div class='add'>+	     (data-&gt;hkey_size &amp;&amp;</div><div class='add'>+	      nla_put(skb, ETHTOOL_A_RSS_HKEY, data-&gt;hkey_size, data-&gt;hkey))))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;has_flow_hash) {</div><div class='add'>+		struct nlattr *nest;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_RSS_FLOW_HASH);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		for (i = 1; i &lt; __ETHTOOL_A_FLOW_CNT; i++) {</div><div class='add'>+			if (data-&gt;flow_hash[i] &gt;= 0 &amp;&amp;</div><div class='add'>+			    nla_put_uint(skb, i, data-&gt;flow_hash[i])) {</div><div class='add'>+				nla_nest_cancel(skb, nest);</div><div class='add'>+				return -EMSGSIZE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rss_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct rss_reply_data *data = RSS_REPDATA(reply_base);</div><div class='add'>+</div><div class='add'>+	rss_get_data_free(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rss_nl_dump_ctx {</div><div class='add'>+	unsigned long		ifindex;</div><div class='add'>+	unsigned long		ctx_idx;</div><div class='add'>+</div><div class='add'>+	/* User wants to only dump contexts from given ifindex */</div><div class='add'>+	unsigned int		match_ifindex;</div><div class='add'>+	unsigned int		start_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rss_nl_dump_ctx *rss_dump_ctx(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	NL_ASSERT_CTX_FITS(struct rss_nl_dump_ctx);</div><div class='add'>+</div><div class='add'>+	return (struct rss_nl_dump_ctx *)cb-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_rss_dump_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct rss_nl_dump_ctx *ctx = rss_dump_ctx(cb);</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Filtering by context not supported */</div><div class='add'>+	if (tb[ETHTOOL_A_RSS_CONTEXT]) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_CONTEXT]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_RSS_START_CONTEXT]) {</div><div class='add'>+		ctx-&gt;start_ctx = nla_get_u32(tb[ETHTOOL_A_RSS_START_CONTEXT]);</div><div class='add'>+		ctx-&gt;ctx_idx = ctx-&gt;start_ctx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_RSS_HEADER],</div><div class='add'>+					 sock_net(cb-&gt;skb-&gt;sk), cb-&gt;extack,</div><div class='add'>+					 false);</div><div class='add'>+	if (req_info.dev) {</div><div class='add'>+		ctx-&gt;match_ifindex = req_info.dev-&gt;ifindex;</div><div class='add'>+		ctx-&gt;ifindex = ctx-&gt;match_ifindex;</div><div class='add'>+		ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+		req_info.dev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_dump_one_ctx(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+		 struct net_device *dev, u32 rss_context)</div><div class='add'>+{</div><div class='add'>+	const struct genl_info *info = genl_info_dump(cb);</div><div class='add'>+	struct rss_reply_data data = {};</div><div class='add'>+	struct rss_req_info req = {};</div><div class='add'>+	void *ehdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req.rss_context = rss_context;</div><div class='add'>+</div><div class='add'>+	ehdr = ethnl_dump_put(skb, cb, ETHTOOL_MSG_RSS_GET_REPLY);</div><div class='add'>+	if (!ehdr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, dev, ETHTOOL_A_RSS_HEADER);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	ret = rss_prepare(&amp;req, dev, &amp;data, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	ret = rss_fill_reply(skb, &amp;req.base, &amp;data.base);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+	genlmsg_end(skb, ehdr);</div><div class='add'>+</div><div class='add'>+	rss_cleanup_data(&amp;data.base);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cleanup:</div><div class='add'>+	rss_cleanup_data(&amp;data.base);</div><div class='add'>+err_cancel:</div><div class='add'>+	genlmsg_cancel(skb, ehdr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_dump_one_dev(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+		 struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rss_nl_dump_ctx *ctx = rss_dump_ctx(cb);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_rxfh)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;ctx_idx) {</div><div class='add'>+		ret = rss_dump_one_ctx(skb, cb, dev, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		ctx-&gt;ctx_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; xa_find(&amp;dev-&gt;ethtool-&gt;rss_ctx, &amp;ctx-&gt;ctx_idx,</div><div class='add'>+		       ULONG_MAX, XA_PRESENT); ctx-&gt;ctx_idx++) {</div><div class='add'>+		ret = rss_dump_one_ctx(skb, cb, dev, ctx-&gt;ctx_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;ctx_idx = ctx-&gt;start_ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_rss_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rss_nl_dump_ctx *ctx = rss_dump_ctx(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		if (ctx-&gt;match_ifindex &amp;&amp; ctx-&gt;match_ifindex != ctx-&gt;ifindex)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		ret = rss_dump_one_dev(skb, cb, dev);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RSS_NTF */</div><div class='add'>+</div><div class='add'>+static void ethnl_rss_delete_notify(struct net_device *dev, u32 rss_context)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *ntf;</div><div class='add'>+	size_t ntf_size;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	ntf_size = ethnl_reply_header_size() +</div><div class='add'>+		nla_total_size(sizeof(u32));	/* _RSS_CONTEXT */</div><div class='add'>+</div><div class='add'>+	ntf = genlmsg_new(ntf_size, GFP_KERNEL);</div><div class='add'>+	if (!ntf)</div><div class='add'>+		goto out_warn;</div><div class='add'>+</div><div class='add'>+	hdr = ethnl_bcastmsg_put(ntf, ETHTOOL_MSG_RSS_DELETE_NTF);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto out_free_ntf;</div><div class='add'>+</div><div class='add'>+	if (ethnl_fill_reply_header(ntf, dev, ETHTOOL_A_RSS_HEADER) ||</div><div class='add'>+	    nla_put_u32(ntf, ETHTOOL_A_RSS_CONTEXT, rss_context))</div><div class='add'>+		goto out_free_ntf;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(ntf, hdr);</div><div class='add'>+	if (ethnl_multicast(ntf, dev))</div><div class='add'>+		goto out_warn;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_free_ntf:</div><div class='add'>+	nlmsg_free(ntf);</div><div class='add'>+out_warn:</div><div class='add'>+	pr_warn_once("Failed to send a RSS delete notification");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_rss_notify(struct net_device *dev, u32 type, u32 rss_context)</div><div class='add'>+{</div><div class='add'>+	struct rss_req_info req_info = {</div><div class='add'>+		.rss_context = rss_context,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (type == ETHTOOL_MSG_RSS_DELETE_NTF)</div><div class='add'>+		ethnl_rss_delete_notify(dev, rss_context);</div><div class='add'>+	else</div><div class='add'>+		ethnl_notify(dev, type, &amp;req_info.base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RSS_SET */</div><div class='add'>+</div><div class='add'>+#define RFH_MASK (RXH_L2DA | RXH_VLAN | RXH_IP_SRC | RXH_IP_DST | \</div><div class='add'>+		  RXH_L3_PROTO | RXH_L4_B_0_1 | RXH_L4_B_2_3 |	  \</div><div class='add'>+		  RXH_GTP_TEID | RXH_DISCARD)</div><div class='add'>+#define RFH_MASKv6 (RFH_MASK | RXH_IP6_FL)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ethnl_rss_flows_policy[] = {</div><div class='add'>+	[ETHTOOL_A_FLOW_ETHER]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_IP4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_IP6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_TCP4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_UDP4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_SCTP4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_AH_ESP4]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_TCP6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_UDP6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_SCTP6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_AH_ESP6]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_AH4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_ESP4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_AH6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_ESP6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC4]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC6]		= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC_TEID4]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPC_TEID6]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_EH4]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_EH6]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_UL4]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_UL6]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_DL4]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASK),</div><div class='add'>+	[ETHTOOL_A_FLOW_GTPU_DL6]	= NLA_POLICY_MASK(NLA_UINT, RFH_MASKv6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rss_set_policy[ETHTOOL_A_RSS_FLOW_HASH + 1] = {</div><div class='add'>+	[ETHTOOL_A_RSS_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_RSS_CONTEXT] = { .type = NLA_U32, },</div><div class='add'>+	[ETHTOOL_A_RSS_HFUNC] = NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_INDIR] = { .type = NLA_BINARY, },</div><div class='add'>+	[ETHTOOL_A_RSS_HKEY] = NLA_POLICY_MIN(NLA_BINARY, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_INPUT_XFRM] =</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, RXH_XFRM_SYM_OR_XOR),</div><div class='add'>+	[ETHTOOL_A_RSS_FLOW_HASH] = NLA_POLICY_NESTED(ethnl_rss_flows_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_rss_set_validate(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+	struct rss_req_info *request = RSS_REQINFO(req_info);</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct nlattr *bad_attr = NULL;</div><div class='add'>+	u32 input_xfrm;</div><div class='add'>+</div><div class='add'>+	if (request-&gt;rss_context &amp;&amp; !ops-&gt;create_rxfh_context)</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_CONTEXT];</div><div class='add'>+</div><div class='add'>+	if (request-&gt;rss_context &amp;&amp; !ops-&gt;rxfh_per_ctx_key) {</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_HFUNC];</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_HKEY];</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_INPUT_XFRM];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_xfrm = nla_get_u32_default(tb[ETHTOOL_A_RSS_INPUT_XFRM], 0);</div><div class='add'>+	if (input_xfrm &amp; ~ops-&gt;supported_input_xfrm)</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_INPUT_XFRM];</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_RSS_FLOW_HASH] &amp;&amp; !ops-&gt;set_rxfh_fields)</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_FLOW_HASH];</div><div class='add'>+	if (request-&gt;rss_context &amp;&amp;</div><div class='add'>+	    tb[ETHTOOL_A_RSS_FLOW_HASH] &amp;&amp; !ops-&gt;rxfh_per_ctx_fields)</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_FLOW_HASH];</div><div class='add'>+</div><div class='add'>+	if (bad_attr) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, bad_attr);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_set_prep_indir(struct net_device *dev, struct genl_info *info,</div><div class='add'>+		   struct rss_reply_data *data, struct ethtool_rxfh_param *rxfh,</div><div class='add'>+		   bool *reset, bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	size_t alloc_size;</div><div class='add'>+	int num_rx_rings;</div><div class='add'>+	u32 user_size;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_RSS_INDIR])</div><div class='add'>+		return 0;</div><div class='add'>+	if (!data-&gt;indir_size)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = ethtool_get_rx_ring_count(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	num_rx_rings = err;</div><div class='add'>+</div><div class='add'>+	if (nla_len(tb[ETHTOOL_A_RSS_INDIR]) % 4) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_INDIR]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	user_size = nla_len(tb[ETHTOOL_A_RSS_INDIR]) / 4;</div><div class='add'>+	if (!user_size) {</div><div class='add'>+		if (rxfh-&gt;rss_context) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_RSS_INDIR],</div><div class='add'>+					    "can't reset table for a context");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		*reset = true;</div><div class='add'>+	} else if (data-&gt;indir_size % user_size) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR_FMT(extack, tb[ETHTOOL_A_RSS_INDIR],</div><div class='add'>+					"size (%d) mismatch with device indir table (%d)",</div><div class='add'>+					user_size, data-&gt;indir_size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxfh-&gt;indir_size = data-&gt;indir_size;</div><div class='add'>+	alloc_size = array_size(data-&gt;indir_size, sizeof(rxfh-&gt;indir[0]));</div><div class='add'>+	rxfh-&gt;indir = kzalloc(alloc_size, GFP_KERNEL);</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nla_memcpy(rxfh-&gt;indir, tb[ETHTOOL_A_RSS_INDIR], alloc_size);</div><div class='add'>+	for (i = 0; i &lt; user_size; i++) {</div><div class='add'>+		if (rxfh-&gt;indir[i] &lt; num_rx_rings)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		NL_SET_ERR_MSG_ATTR_FMT(extack, tb[ETHTOOL_A_RSS_INDIR],</div><div class='add'>+					"entry %d: queue out of range (%d)",</div><div class='add'>+					i, rxfh-&gt;indir[i]);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (user_size) {</div><div class='add'>+		/* Replicate the user-provided table to fill the device table */</div><div class='add'>+		for (i = user_size; i &lt; data-&gt;indir_size; i++)</div><div class='add'>+			rxfh-&gt;indir[i] = rxfh-&gt;indir[i % user_size];</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; data-&gt;indir_size; i++)</div><div class='add'>+			rxfh-&gt;indir[i] =</div><div class='add'>+				ethtool_rxfh_indir_default(i, num_rx_rings);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*mod |= memcmp(rxfh-&gt;indir, data-&gt;indir_table, data-&gt;indir_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(rxfh-&gt;indir);</div><div class='add'>+	rxfh-&gt;indir = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_set_prep_hkey(struct net_device *dev, struct genl_info *info,</div><div class='add'>+		  struct rss_reply_data *data, struct ethtool_rxfh_param *rxfh,</div><div class='add'>+		  bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_RSS_HKEY])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (nla_len(tb[ETHTOOL_A_RSS_HKEY]) != data-&gt;hkey_size) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_HKEY]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxfh-&gt;key_size = data-&gt;hkey_size;</div><div class='add'>+	rxfh-&gt;key = kmemdup(data-&gt;hkey, data-&gt;hkey_size, GFP_KERNEL);</div><div class='add'>+	if (!rxfh-&gt;key)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ethnl_update_binary(rxfh-&gt;key, rxfh-&gt;key_size, tb[ETHTOOL_A_RSS_HKEY],</div><div class='add'>+			    mod);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rss_check_rxfh_fields_sym(struct net_device *dev, struct genl_info *info,</div><div class='add'>+			  struct rss_reply_data *data, bool xfrm_sym)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!xfrm_sym)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!data-&gt;has_flow_hash) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_INPUT_XFRM],</div><div class='add'>+				    "hash field config not reported");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; __ETHTOOL_A_FLOW_CNT; i++)</div><div class='add'>+		if (data-&gt;flow_hash[i] &gt;= 0 &amp;&amp;</div><div class='add'>+		    !ethtool_rxfh_config_is_sym(data-&gt;flow_hash[i])) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    tb[ETHTOOL_A_RSS_INPUT_XFRM],</div><div class='add'>+					    "hash field config is not symmetric");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_rss_fields(struct net_device *dev, struct genl_info *info,</div><div class='add'>+		     u32 rss_context, struct rss_reply_data *data,</div><div class='add'>+		     bool xfrm_sym, bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *flow_nest = info-&gt;attrs[ETHTOOL_A_RSS_FLOW_HASH];</div><div class='add'>+	struct nlattr *flows[ETHTOOL_A_FLOW_MAX + 1];</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	ret = rss_check_rxfh_fields_sym(dev, info, data, xfrm_sym);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!flow_nest)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(flows, ARRAY_SIZE(ethnl_rss_flows_policy) - 1,</div><div class='add'>+			       flow_nest, ethnl_rss_flows_policy, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; __ETHTOOL_A_FLOW_CNT; i++) {</div><div class='add'>+		struct ethtool_rxfh_fields fields = {</div><div class='add'>+			.flow_type	= ethtool_rxfh_ft_nl2ioctl[i],</div><div class='add'>+			.rss_context	= rss_context,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (!flows[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fields.data = nla_get_u32(flows[i]);</div><div class='add'>+		if (data-&gt;has_flow_hash &amp;&amp; data-&gt;flow_hash[i] == fields.data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (xfrm_sym &amp;&amp; !ethtool_rxfh_config_is_sym(fields.data)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack, flows[i],</div><div class='add'>+					    "conflict with xfrm-input");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ops-&gt;set_rxfh_fields(dev, &amp;fields, info-&gt;extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		*mod = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rss_set_ctx_update(struct ethtool_rxfh_context *ctx, struct nlattr **tb,</div><div class='add'>+		   struct rss_reply_data *data, struct ethtool_rxfh_param *rxfh)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='add'>+		for (i = 0; i &lt; data-&gt;indir_size; i++)</div><div class='add'>+			ethtool_rxfh_context_indir(ctx)[i] = rxfh-&gt;indir[i];</div><div class='add'>+		ctx-&gt;indir_configured = !!nla_len(tb[ETHTOOL_A_RSS_INDIR]);</div><div class='add'>+	}</div><div class='add'>+	if (rxfh-&gt;key) {</div><div class='add'>+		memcpy(ethtool_rxfh_context_key(ctx), rxfh-&gt;key,</div><div class='add'>+		       data-&gt;hkey_size);</div><div class='add'>+		ctx-&gt;key_configured = !!rxfh-&gt;key_size;</div><div class='add'>+	}</div><div class='add'>+	if (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE)</div><div class='add'>+		ctx-&gt;hfunc = rxfh-&gt;hfunc;</div><div class='add'>+	if (rxfh-&gt;input_xfrm != RXH_XFRM_NO_CHANGE)</div><div class='add'>+		ctx-&gt;input_xfrm = rxfh-&gt;input_xfrm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_rss_set(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	bool indir_reset = false, indir_mod, xfrm_sym = false;</div><div class='add'>+	struct rss_req_info *request = RSS_REQINFO(req_info);</div><div class='add'>+	struct ethtool_rxfh_context *ctx = NULL;</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	bool mod = false, fields_mod = false;</div><div class='add'>+	struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct rss_reply_data data = {};</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+	data.base.dev = dev;</div><div class='add'>+</div><div class='add'>+	ret = rss_prepare(request, dev, &amp;data, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rxfh.rss_context = request-&gt;rss_context;</div><div class='add'>+</div><div class='add'>+	ret = rss_set_prep_indir(dev, info, &amp;data, &amp;rxfh, &amp;indir_reset, &amp;mod);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_clean_data;</div><div class='add'>+	indir_mod = !!tb[ETHTOOL_A_RSS_INDIR];</div><div class='add'>+</div><div class='add'>+	rxfh.hfunc = data.hfunc;</div><div class='add'>+	ethnl_update_u8(&amp;rxfh.hfunc, tb[ETHTOOL_A_RSS_HFUNC], &amp;mod);</div><div class='add'>+	if (rxfh.hfunc == data.hfunc)</div><div class='add'>+		rxfh.hfunc = ETH_RSS_HASH_NO_CHANGE;</div><div class='add'>+</div><div class='add'>+	ret = rss_set_prep_hkey(dev, info, &amp;data, &amp;rxfh, &amp;mod);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_free_indir;</div><div class='add'>+</div><div class='add'>+	rxfh.input_xfrm = data.input_xfrm;</div><div class='add'>+	ethnl_update_u8(&amp;rxfh.input_xfrm, tb[ETHTOOL_A_RSS_INPUT_XFRM], &amp;mod);</div><div class='add'>+	/* For drivers which don't support input_xfrm it will be set to 0xff</div><div class='add'>+	 * in the RSS context info. In all other case input_xfrm != 0 means</div><div class='add'>+	 * symmetric hashing is requested.</div><div class='add'>+	 */</div><div class='add'>+	if (!request-&gt;rss_context || ops-&gt;rxfh_per_ctx_key)</div><div class='add'>+		xfrm_sym = rxfh.input_xfrm || data.input_xfrm;</div><div class='add'>+	if (rxfh.input_xfrm == data.input_xfrm)</div><div class='add'>+		rxfh.input_xfrm = RXH_XFRM_NO_CHANGE;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (request-&gt;rss_context) {</div><div class='add'>+		ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, request-&gt;rss_context);</div><div class='add'>+		if (!ctx) {</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto exit_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_set_rss_fields(dev, info, request-&gt;rss_context,</div><div class='add'>+				   &amp;data, xfrm_sym, &amp;fields_mod);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	if (!mod)</div><div class='add'>+		ret = 0; /* nothing to tell the driver */</div><div class='add'>+	else if (!ops-&gt;set_rxfh)</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (!rxfh.rss_context)</div><div class='add'>+		ret = ops-&gt;set_rxfh(dev, &amp;rxfh, info-&gt;extack);</div><div class='add'>+	else</div><div class='add'>+		ret = ops-&gt;modify_rxfh_context(dev, ctx, &amp;rxfh, info-&gt;extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		rss_set_ctx_update(ctx, tb, &amp;data, &amp;rxfh);</div><div class='add'>+	else if (indir_reset)</div><div class='add'>+		dev-&gt;priv_flags &amp;= ~IFF_RXFH_CONFIGURED;</div><div class='add'>+	else if (indir_mod)</div><div class='add'>+		dev-&gt;priv_flags |= IFF_RXFH_CONFIGURED;</div><div class='add'>+</div><div class='add'>+exit_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	kfree(rxfh.key);</div><div class='add'>+exit_free_indir:</div><div class='add'>+	kfree(rxfh.indir);</div><div class='add'>+exit_clean_data:</div><div class='add'>+	rss_cleanup_data(&amp;data.base);</div><div class='add'>+</div><div class='add'>+	return ret ?: mod || fields_mod;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_rss_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_RSS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_RSS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_RSS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct rss_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct rss_reply_data),</div><div class='add'>+</div><div class='add'>+	.parse_request		= rss_parse_request,</div><div class='add'>+	.prepare_data		= rss_prepare_data,</div><div class='add'>+	.reply_size		= rss_reply_size,</div><div class='add'>+	.fill_reply		= rss_fill_reply,</div><div class='add'>+	.cleanup_data		= rss_cleanup_data,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_rss_set_validate,</div><div class='add'>+	.set			= ethnl_rss_set,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_RSS_NTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RSS_CREATE */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rss_create_policy[ETHTOOL_A_RSS_INPUT_XFRM + 1] = {</div><div class='add'>+	[ETHTOOL_A_RSS_HEADER]	= NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_RSS_CONTEXT]	= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_HFUNC]	= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_INDIR]	= NLA_POLICY_MIN(NLA_BINARY, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_HKEY]	= NLA_POLICY_MIN(NLA_BINARY, 1),</div><div class='add'>+	[ETHTOOL_A_RSS_INPUT_XFRM] =</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, RXH_XFRM_SYM_OR_XOR),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_rss_create_validate(struct net_device *dev, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct nlattr *bad_attr = NULL;</div><div class='add'>+	u32 rss_context, input_xfrm;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;create_rxfh_context)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rss_context = nla_get_u32_default(tb[ETHTOOL_A_RSS_CONTEXT], 0);</div><div class='add'>+	if (ops-&gt;rxfh_max_num_contexts &amp;&amp;</div><div class='add'>+	    ops-&gt;rxfh_max_num_contexts &lt;= rss_context) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_CONTEXT]);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;rxfh_per_ctx_key) {</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_HFUNC];</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_HKEY];</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_INPUT_XFRM];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_xfrm = nla_get_u32_default(tb[ETHTOOL_A_RSS_INPUT_XFRM], 0);</div><div class='add'>+	if (input_xfrm &amp; ~ops-&gt;supported_input_xfrm)</div><div class='add'>+		bad_attr = bad_attr ?: tb[ETHTOOL_A_RSS_INPUT_XFRM];</div><div class='add'>+</div><div class='add'>+	if (bad_attr) {</div><div class='add'>+		NL_SET_BAD_ATTR(info-&gt;extack, bad_attr);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ethnl_rss_create_send_ntf(struct sk_buff *rsp, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nlmsghdr *nlh = (void *)rsp-&gt;data;</div><div class='add'>+	struct genlmsghdr *genl_hdr;</div><div class='add'>+</div><div class='add'>+	/* Convert the reply into a notification */</div><div class='add'>+	nlh-&gt;nlmsg_pid = 0;</div><div class='add'>+	nlh-&gt;nlmsg_seq = ethnl_bcast_seq_next();</div><div class='add'>+</div><div class='add'>+	genl_hdr = nlmsg_data(nlh);</div><div class='add'>+	genl_hdr-&gt;cmd =	ETHTOOL_MSG_RSS_CREATE_NTF;</div><div class='add'>+</div><div class='add'>+	ethnl_multicast(rsp, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	bool indir_dflt = false, mod = false, ntf_fail = false;</div><div class='add'>+	struct ethtool_rxfh_param rxfh = {};</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct rss_reply_data data = {};</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	struct rss_req_info req = {};</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sk_buff *rsp;</div><div class='add'>+	void *hdr;</div><div class='add'>+	u32 limit;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rsp = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req.base, tb[ETHTOOL_A_RSS_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit_free_rsp;</div><div class='add'>+</div><div class='add'>+	dev = req.base.dev;</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	req.rss_context = nla_get_u32_default(tb[ETHTOOL_A_RSS_CONTEXT], 0);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_rss_create_validate(dev, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_free_dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit_dev_unlock;</div><div class='add'>+</div><div class='add'>+	ret = rss_get_data_alloc(dev, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_ops;</div><div class='add'>+</div><div class='add'>+	ret = rss_set_prep_indir(dev, info, &amp;data, &amp;rxfh, &amp;indir_dflt, &amp;mod);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_clean_data;</div><div class='add'>+</div><div class='add'>+	ethnl_update_u8(&amp;rxfh.hfunc, tb[ETHTOOL_A_RSS_HFUNC], &amp;mod);</div><div class='add'>+</div><div class='add'>+	ret = rss_set_prep_hkey(dev, info, &amp;data, &amp;rxfh, &amp;mod);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_free_indir;</div><div class='add'>+</div><div class='add'>+	rxfh.input_xfrm = RXH_XFRM_NO_CHANGE;</div><div class='add'>+	ethnl_update_u8(&amp;rxfh.input_xfrm, tb[ETHTOOL_A_RSS_INPUT_XFRM], &amp;mod);</div><div class='add'>+</div><div class='add'>+	ctx = ethtool_rxfh_ctx_alloc(ops, data.indir_size, data.hkey_size);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit_free_hkey;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	if (!req.rss_context) {</div><div class='add'>+		limit = ops-&gt;rxfh_max_num_contexts ?: U32_MAX;</div><div class='add'>+		ret = xa_alloc(&amp;dev-&gt;ethtool-&gt;rss_ctx, &amp;req.rss_context, ctx,</div><div class='add'>+			       XA_LIMIT(1, limit - 1), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	} else {</div><div class='add'>+		ret = xa_insert(&amp;dev-&gt;ethtool-&gt;rss_ctx,</div><div class='add'>+				req.rss_context, ctx, GFP_KERNEL_ACCOUNT);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[ETHTOOL_A_RSS_CONTEXT],</div><div class='add'>+				    "error allocating context ID");</div><div class='add'>+		goto err_unlock_free_ctx;</div><div class='add'>+	}</div><div class='add'>+	rxfh.rss_context = req.rss_context;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;create_rxfh_context(dev, ctx, &amp;rxfh, info-&gt;extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_ctx_id_free;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver populates defaults */</div><div class='add'>+	WARN_ON_ONCE(!rxfh.key &amp;&amp; ops-&gt;rxfh_per_ctx_key &amp;&amp;</div><div class='add'>+		     !memchr_inv(ethtool_rxfh_context_key(ctx), 0,</div><div class='add'>+				 ctx-&gt;key_size));</div><div class='add'>+</div><div class='add'>+	/* Store the config from rxfh to Xarray.. */</div><div class='add'>+	rss_set_ctx_update(ctx, tb, &amp;data, &amp;rxfh);</div><div class='add'>+	/* .. copy from Xarray to data. */</div><div class='add'>+	__rss_prepare_ctx(dev, &amp;data, ctx);</div><div class='add'>+</div><div class='add'>+	hdr = ethnl_unicast_put(rsp, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+				ETHTOOL_MSG_RSS_CREATE_ACT_REPLY);</div><div class='add'>+	ntf_fail = ethnl_fill_reply_header(rsp, dev, ETHTOOL_A_RSS_HEADER);</div><div class='add'>+	ntf_fail |= rss_fill_reply(rsp, &amp;req.base, &amp;data.base);</div><div class='add'>+	if (WARN_ON(!hdr || ntf_fail)) {</div><div class='add'>+		ret = -EMSGSIZE;</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rsp, hdr);</div><div class='add'>+</div><div class='add'>+	/* Use the same skb for the response and the notification,</div><div class='add'>+	 * genlmsg_reply() will copy the skb if it has elevated user count.</div><div class='add'>+	 */</div><div class='add'>+	skb_get(rsp);</div><div class='add'>+	ret = genlmsg_reply(rsp, info);</div><div class='add'>+	ethnl_rss_create_send_ntf(rsp, dev);</div><div class='add'>+	rsp = NULL;</div><div class='add'>+</div><div class='add'>+exit_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+exit_free_hkey:</div><div class='add'>+	kfree(rxfh.key);</div><div class='add'>+exit_free_indir:</div><div class='add'>+	kfree(rxfh.indir);</div><div class='add'>+exit_clean_data:</div><div class='add'>+	rss_get_data_free(&amp;data);</div><div class='add'>+exit_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+exit_dev_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+exit_free_dev:</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req.base);</div><div class='add'>+exit_free_rsp:</div><div class='add'>+	nlmsg_free(rsp);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_ctx_id_free:</div><div class='add'>+	xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, req.rss_context);</div><div class='add'>+err_unlock_free_ctx:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	goto exit_unlock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RSS_DELETE */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_rss_delete_policy[ETHTOOL_A_RSS_CONTEXT + 1] = {</div><div class='add'>+	[ETHTOOL_A_RSS_HEADER]	= NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_RSS_CONTEXT]	= NLA_POLICY_MIN(NLA_U32, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ethnl_rss_delete_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct ethnl_req_info req = {};</div><div class='add'>+	const struct ethtool_ops *ops;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 rss_context;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, ETHTOOL_A_RSS_CONTEXT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rss_context = nla_get_u32(tb[ETHTOOL_A_RSS_CONTEXT]);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req, tb[ETHTOOL_A_RSS_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev = req.dev;</div><div class='add'>+	ops = dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;create_rxfh_context)</div><div class='add'>+		goto exit_free_dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit_dev_unlock;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ret = ethtool_check_rss_ctx_busy(dev, rss_context);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	ctx = xa_load(&amp;dev-&gt;ethtool-&gt;rss_ctx, rss_context);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;remove_rxfh_context(dev, ctx, rss_context, info-&gt;extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	WARN_ON(xa_erase(&amp;dev-&gt;ethtool-&gt;rss_ctx, rss_context) != ctx);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+</div><div class='add'>+	ethnl_rss_delete_notify(dev, rss_context);</div><div class='add'>+</div><div class='add'>+exit_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ethtool-&gt;rss_lock);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+exit_dev_unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+exit_free_dev:</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/stats.c b/net/ethtool/stats.c<br/>new file mode 100644<br/>index 000000000000..3ca8eb2a3b31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/stats.c</a></div><div class='hunk'>@@ -0,0 +1,623 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylib_stubs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct stats_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+	DECLARE_BITMAP(stat_mask, __ETHTOOL_STATS_CNT);</div><div class='add'>+	enum ethtool_mac_stats_src	src;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STATS_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct stats_req_info, base)</div><div class='add'>+</div><div class='add'>+struct stats_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct_group(stats,</div><div class='add'>+		struct ethtool_eth_phy_stats	phy_stats;</div><div class='add'>+		struct ethtool_eth_mac_stats	mac_stats;</div><div class='add'>+		struct ethtool_eth_ctrl_stats	ctrl_stats;</div><div class='add'>+		struct ethtool_rmon_stats	rmon_stats;</div><div class='add'>+		struct ethtool_phy_stats	phydev_stats;</div><div class='add'>+	);</div><div class='add'>+	const struct ethtool_rmon_hist_range	*rmon_ranges;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STATS_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct stats_reply_data, base)</div><div class='add'>+</div><div class='add'>+const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_STATS_ETH_PHY]			= "eth-phy",</div><div class='add'>+	[ETHTOOL_STATS_ETH_MAC]			= "eth-mac",</div><div class='add'>+	[ETHTOOL_STATS_ETH_CTRL]		= "eth-ctrl",</div><div class='add'>+	[ETHTOOL_STATS_RMON]			= "rmon",</div><div class='add'>+	[ETHTOOL_STATS_PHY]			= "phydev",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR]	= "SymbolErrorDuringCarrier",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT]	= "FramesTransmittedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL]	= "SingleCollisionFrames",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL]	= "MultipleCollisionFrames",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT]	= "FramesReceivedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR]	= "FrameCheckSequenceErrors",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR]	= "AlignmentErrors",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES]	= "OctetsTransmittedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER]	= "FramesWithDeferredXmissions",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL]	= "LateCollisions",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_11_XS_COL]	= "FramesAbortedDueToXSColls",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR]	= "FramesLostDueToIntMACXmitError",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR]	= "CarrierSenseErrors",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES]	= "OctetsReceivedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR]	= "FramesLostDueToIntMACRcvError",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST]	= "MulticastFramesXmittedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST]	= "BroadcastFramesXmittedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER]	= "FramesWithExcessiveDeferral",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST]	= "MulticastFramesReceivedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST]	= "BroadcastFramesReceivedOK",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR]	= "InRangeLengthErrors",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN]	= "OutOfRangeLengthField",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR]	= "FrameTooLongErrors",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char stats_eth_ctrl_names[__ETHTOOL_A_STATS_ETH_CTRL_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_CTRL_3_TX]		= "MACControlFramesTransmitted",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_CTRL_4_RX]		= "MACControlFramesReceived",</div><div class='add'>+	[ETHTOOL_A_STATS_ETH_CTRL_5_RX_UNSUP]	= "UnsupportedOpcodesReceived",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char stats_rmon_names[__ETHTOOL_A_STATS_RMON_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_A_STATS_RMON_UNDERSIZE]	= "etherStatsUndersizePkts",</div><div class='add'>+	[ETHTOOL_A_STATS_RMON_OVERSIZE]		= "etherStatsOversizePkts",</div><div class='add'>+	[ETHTOOL_A_STATS_RMON_FRAG]		= "etherStatsFragments",</div><div class='add'>+	[ETHTOOL_A_STATS_RMON_JABBER]		= "etherStatsJabbers",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char stats_phy_names[__ETHTOOL_A_STATS_PHY_CNT][ETH_GSTRING_LEN] = {</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_RX_PKTS]		= "RxFrames",</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_RX_BYTES]		= "RxOctets",</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_RX_ERRORS]		= "RxErrors",</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_TX_PKTS]		= "TxFrames",</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_TX_BYTES]		= "TxOctets",</div><div class='add'>+	[ETHTOOL_A_STATS_PHY_TX_ERRORS]		= "TxErrors",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_stats_get_policy[ETHTOOL_A_STATS_SRC + 1] = {</div><div class='add'>+	[ETHTOOL_A_STATS_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_STATS_GROUPS]	= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_STATS_SRC]		=</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, ETHTOOL_MAC_STATS_SRC_PMAC),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stats_parse_request(struct ethnl_req_info *req_base,</div><div class='add'>+			       struct nlattr **tb,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum ethtool_mac_stats_src src = ETHTOOL_MAC_STATS_SRC_AGGREGATE;</div><div class='add'>+	struct stats_req_info *req_info = STATS_REQINFO(req_base);</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ethnl_update_bitset(req_info-&gt;stat_mask, __ETHTOOL_STATS_CNT,</div><div class='add'>+				  tb[ETHTOOL_A_STATS_GROUPS], stats_std_names,</div><div class='add'>+				  extack, &amp;mod);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!mod) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "no stats requested");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_STATS_SRC])</div><div class='add'>+		src = nla_get_u32(tb[ETHTOOL_A_STATS_SRC]);</div><div class='add'>+</div><div class='add'>+	req_info-&gt;src = src;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			      struct ethnl_reply_data *reply_base,</div><div class='add'>+			      const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct stats_req_info *req_info = STATS_REQINFO(req_base);</div><div class='add'>+	struct stats_reply_data *data = STATS_REPDATA(reply_base);</div><div class='add'>+	enum ethtool_mac_stats_src src = req_info-&gt;src;</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_STATS_HEADER,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+	if (IS_ERR(phydev))</div><div class='add'>+		return PTR_ERR(phydev);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if ((src == ETHTOOL_MAC_STATS_SRC_EMAC ||</div><div class='add'>+	     src == ETHTOOL_MAC_STATS_SRC_PMAC) &amp;&amp;</div><div class='add'>+	    !__ethtool_dev_mm_supported(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(info-&gt;extack,</div><div class='add'>+				   "Device does not support MAC merge layer");</div><div class='add'>+		ethnl_ops_complete(dev);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark all stats as unset (see ETHTOOL_STAT_NOT_SET) to prevent them</div><div class='add'>+	 * from being reported to user space in case driver did not set them.</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;data-&gt;stats, 0xff, sizeof(data-&gt;stats));</div><div class='add'>+</div><div class='add'>+	data-&gt;phy_stats.src = src;</div><div class='add'>+	data-&gt;mac_stats.src = src;</div><div class='add'>+	data-&gt;ctrl_stats.src = src;</div><div class='add'>+	data-&gt;rmon_stats.src = src;</div><div class='add'>+</div><div class='add'>+	if ((test_bit(ETHTOOL_STATS_PHY, req_info-&gt;stat_mask) ||</div><div class='add'>+	     test_bit(ETHTOOL_STATS_ETH_PHY, req_info-&gt;stat_mask)) &amp;&amp;</div><div class='add'>+	    src == ETHTOOL_MAC_STATS_SRC_AGGREGATE) {</div><div class='add'>+		if (phydev)</div><div class='add'>+			phy_ethtool_get_phy_stats(phydev, &amp;data-&gt;phy_stats,</div><div class='add'>+						  &amp;data-&gt;phydev_stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info-&gt;stat_mask) &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_eth_phy_stats)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_eth_phy_stats(dev, &amp;data-&gt;phy_stats);</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info-&gt;stat_mask) &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_eth_mac_stats)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_eth_mac_stats(dev, &amp;data-&gt;mac_stats);</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_CTRL, req_info-&gt;stat_mask) &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_eth_ctrl_stats)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_eth_ctrl_stats(dev, &amp;data-&gt;ctrl_stats);</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_RMON, req_info-&gt;stat_mask) &amp;&amp;</div><div class='add'>+	    dev-&gt;ethtool_ops-&gt;get_rmon_stats)</div><div class='add'>+		dev-&gt;ethtool_ops-&gt;get_rmon_stats(dev, &amp;data-&gt;rmon_stats,</div><div class='add'>+						 &amp;data-&gt;rmon_ranges);</div><div class='add'>+</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct stats_req_info *req_info = STATS_REQINFO(req_base);</div><div class='add'>+	unsigned int n_grps = 0, n_stats = 0;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	len += nla_total_size(sizeof(u32)); /* _STATS_SRC */</div><div class='add'>+</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info-&gt;stat_mask)) {</div><div class='add'>+		n_stats += sizeof(struct ethtool_eth_phy_stats) / sizeof(u64);</div><div class='add'>+		n_grps++;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info-&gt;stat_mask)) {</div><div class='add'>+		n_stats += sizeof(struct ethtool_eth_mac_stats) / sizeof(u64);</div><div class='add'>+		n_grps++;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_ETH_CTRL, req_info-&gt;stat_mask)) {</div><div class='add'>+		n_stats += sizeof(struct ethtool_eth_ctrl_stats) / sizeof(u64);</div><div class='add'>+		n_grps++;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_RMON, req_info-&gt;stat_mask)) {</div><div class='add'>+		n_stats += sizeof(struct ethtool_rmon_stats) / sizeof(u64);</div><div class='add'>+		n_grps++;</div><div class='add'>+		/* Above includes the space for _A_STATS_GRP_HIST_VALs */</div><div class='add'>+</div><div class='add'>+		len += (nla_total_size(0) +	/* _A_STATS_GRP_HIST */</div><div class='add'>+			nla_total_size(4) +	/* _A_STATS_GRP_HIST_BKT_LOW */</div><div class='add'>+			nla_total_size(4)) *	/* _A_STATS_GRP_HIST_BKT_HI */</div><div class='add'>+			ETHTOOL_RMON_HIST_MAX * 2;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(ETHTOOL_STATS_PHY, req_info-&gt;stat_mask)) {</div><div class='add'>+		n_stats += sizeof(struct ethtool_phy_stats) / sizeof(u64);</div><div class='add'>+		n_grps++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += n_grps * (nla_total_size(0) + /* _A_STATS_GRP */</div><div class='add'>+			 nla_total_size(4) + /* _A_STATS_GRP_ID */</div><div class='add'>+			 nla_total_size(4)); /* _A_STATS_GRP_SS_ID */</div><div class='add'>+	len += n_stats * (nla_total_size(0) + /* _A_STATS_GRP_STAT */</div><div class='add'>+			  nla_total_size_64bit(sizeof(u64)));</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stat_put(struct sk_buff *skb, u16 attrtype, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (val == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We want to start stats attr types from 0, so we don't have a type</div><div class='add'>+	 * for pad inside ETHTOOL_A_STATS_GRP_STAT. Pad things on the outside</div><div class='add'>+	 * of ETHTOOL_A_STATS_GRP_STAT. Since we're one nest away from the</div><div class='add'>+	 * actual attr we're 4B off - nla_need_padding_for_64bit() &amp; co.</div><div class='add'>+	 * can't be used.</div><div class='add'>+	 */</div><div class='add'>+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8))</div><div class='add'>+		if (!nla_reserve(skb, ETHTOOL_A_STATS_GRP_PAD, 0))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_STATS_GRP_STAT);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ret = nla_put_u64_64bit(skb, attrtype, val, -1 /* not used */);</div><div class='add'>+	if (ret) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_phy_stats(struct sk_buff *skb,</div><div class='add'>+			       const struct stats_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (stat_put(skb, ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR,</div><div class='add'>+		     data-&gt;phy_stats.SymbolErrorDuringCarrier))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_phydev_stats(struct sk_buff *skb,</div><div class='add'>+				  const struct stats_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (stat_put(skb, ETHTOOL_A_STATS_PHY_RX_PKTS,</div><div class='add'>+		     data-&gt;phydev_stats.rx_packets) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_PHY_RX_BYTES,</div><div class='add'>+		     data-&gt;phydev_stats.rx_bytes) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_PHY_RX_ERRORS,</div><div class='add'>+		     data-&gt;phydev_stats.rx_errors) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_PHY_TX_PKTS,</div><div class='add'>+		     data-&gt;phydev_stats.tx_packets) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_PHY_TX_BYTES,</div><div class='add'>+		     data-&gt;phydev_stats.tx_bytes) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_PHY_TX_ERRORS,</div><div class='add'>+		     data-&gt;phydev_stats.tx_errors))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_mac_stats(struct sk_buff *skb,</div><div class='add'>+			       const struct stats_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT,</div><div class='add'>+		     data-&gt;mac_stats.FramesTransmittedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL,</div><div class='add'>+		     data-&gt;mac_stats.SingleCollisionFrames) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL,</div><div class='add'>+		     data-&gt;mac_stats.MultipleCollisionFrames) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT,</div><div class='add'>+		     data-&gt;mac_stats.FramesReceivedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR,</div><div class='add'>+		     data-&gt;mac_stats.FrameCheckSequenceErrors) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR,</div><div class='add'>+		     data-&gt;mac_stats.AlignmentErrors) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES,</div><div class='add'>+		     data-&gt;mac_stats.OctetsTransmittedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER,</div><div class='add'>+		     data-&gt;mac_stats.FramesWithDeferredXmissions) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL,</div><div class='add'>+		     data-&gt;mac_stats.LateCollisions) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_11_XS_COL,</div><div class='add'>+		     data-&gt;mac_stats.FramesAbortedDueToXSColls) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR,</div><div class='add'>+		     data-&gt;mac_stats.FramesLostDueToIntMACXmitError) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR,</div><div class='add'>+		     data-&gt;mac_stats.CarrierSenseErrors) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES,</div><div class='add'>+		     data-&gt;mac_stats.OctetsReceivedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR,</div><div class='add'>+		     data-&gt;mac_stats.FramesLostDueToIntMACRcvError) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST,</div><div class='add'>+		     data-&gt;mac_stats.MulticastFramesXmittedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST,</div><div class='add'>+		     data-&gt;mac_stats.BroadcastFramesXmittedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER,</div><div class='add'>+		     data-&gt;mac_stats.FramesWithExcessiveDeferral) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST,</div><div class='add'>+		     data-&gt;mac_stats.MulticastFramesReceivedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST,</div><div class='add'>+		     data-&gt;mac_stats.BroadcastFramesReceivedOK) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR,</div><div class='add'>+		     data-&gt;mac_stats.InRangeLengthErrors) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN,</div><div class='add'>+		     data-&gt;mac_stats.OutOfRangeLengthField) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR,</div><div class='add'>+		     data-&gt;mac_stats.FrameTooLongErrors))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_ctrl_stats(struct sk_buff *skb,</div><div class='add'>+				const struct stats_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_3_TX,</div><div class='add'>+		     data-&gt;ctrl_stats.MACControlFramesTransmitted) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_4_RX,</div><div class='add'>+		     data-&gt;ctrl_stats.MACControlFramesReceived) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_5_RX_UNSUP,</div><div class='add'>+		     data-&gt;ctrl_stats.UnsupportedOpcodesReceived))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_rmon_hist(struct sk_buff *skb, u32 attr, const u64 *hist,</div><div class='add'>+			       const struct ethtool_rmon_hist_range *ranges)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ranges)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;	ETHTOOL_RMON_HIST_MAX; i++) {</div><div class='add'>+		if (!ranges[i].low &amp;&amp; !ranges[i].high)</div><div class='add'>+			break;</div><div class='add'>+		if (hist[i] == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, attr);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_STATS_GRP_HIST_BKT_LOW,</div><div class='add'>+				ranges[i].low) ||</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_STATS_GRP_HIST_BKT_HI,</div><div class='add'>+				ranges[i].high) ||</div><div class='add'>+		    nla_put_u64_64bit(skb, ETHTOOL_A_STATS_GRP_HIST_VAL,</div><div class='add'>+				      hist[i], ETHTOOL_A_STATS_GRP_PAD))</div><div class='add'>+			goto err_cancel_hist;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_hist:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_rmon_stats(struct sk_buff *skb,</div><div class='add'>+				const struct stats_reply_data *data)</div><div class='add'>+{</div><div class='add'>+	if (stats_put_rmon_hist(skb, ETHTOOL_A_STATS_GRP_HIST_RX,</div><div class='add'>+				data-&gt;rmon_stats.hist, data-&gt;rmon_ranges) ||</div><div class='add'>+	    stats_put_rmon_hist(skb, ETHTOOL_A_STATS_GRP_HIST_TX,</div><div class='add'>+				data-&gt;rmon_stats.hist_tx, data-&gt;rmon_ranges))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (stat_put(skb, ETHTOOL_A_STATS_RMON_UNDERSIZE,</div><div class='add'>+		     data-&gt;rmon_stats.undersize_pkts) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_RMON_OVERSIZE,</div><div class='add'>+		     data-&gt;rmon_stats.oversize_pkts) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_RMON_FRAG,</div><div class='add'>+		     data-&gt;rmon_stats.fragments) ||</div><div class='add'>+	    stat_put(skb, ETHTOOL_A_STATS_RMON_JABBER,</div><div class='add'>+		     data-&gt;rmon_stats.jabbers))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_put_stats(struct sk_buff *skb,</div><div class='add'>+			   const struct stats_reply_data *data,</div><div class='add'>+			   u32 id, u32 ss_id,</div><div class='add'>+			   int (*cb)(struct sk_buff *skb,</div><div class='add'>+				     const struct stats_reply_data *data))</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_STATS_GRP);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_STATS_GRP_ID, id) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_STATS_GRP_SS_ID, ss_id))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (cb(skb, data))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stats_fill_reply(struct sk_buff *skb,</div><div class='add'>+			    const struct ethnl_req_info *req_base,</div><div class='add'>+			    const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct stats_req_info *req_info = STATS_REQINFO(req_base);</div><div class='add'>+	const struct stats_reply_data *data = STATS_REPDATA(reply_base);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_STATS_SRC, req_info-&gt;src))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; test_bit(ETHTOOL_STATS_ETH_PHY, req_info-&gt;stat_mask))</div><div class='add'>+		ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_PHY,</div><div class='add'>+				      ETH_SS_STATS_ETH_PHY,</div><div class='add'>+				      stats_put_phy_stats);</div><div class='add'>+	if (!ret &amp;&amp; test_bit(ETHTOOL_STATS_ETH_MAC, req_info-&gt;stat_mask))</div><div class='add'>+		ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_MAC,</div><div class='add'>+				      ETH_SS_STATS_ETH_MAC,</div><div class='add'>+				      stats_put_mac_stats);</div><div class='add'>+	if (!ret &amp;&amp; test_bit(ETHTOOL_STATS_ETH_CTRL, req_info-&gt;stat_mask))</div><div class='add'>+		ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_CTRL,</div><div class='add'>+				      ETH_SS_STATS_ETH_CTRL,</div><div class='add'>+				      stats_put_ctrl_stats);</div><div class='add'>+	if (!ret &amp;&amp; test_bit(ETHTOOL_STATS_RMON, req_info-&gt;stat_mask))</div><div class='add'>+		ret = stats_put_stats(skb, data, ETHTOOL_STATS_RMON,</div><div class='add'>+				      ETH_SS_STATS_RMON, stats_put_rmon_stats);</div><div class='add'>+	if (!ret &amp;&amp; test_bit(ETHTOOL_STATS_PHY, req_info-&gt;stat_mask))</div><div class='add'>+		ret = stats_put_stats(skb, data, ETHTOOL_STATS_PHY,</div><div class='add'>+				      ETH_SS_STATS_PHY, stats_put_phydev_stats);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_stats_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_STATS_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_STATS_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_STATS_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct stats_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct stats_reply_data),</div><div class='add'>+</div><div class='add'>+	.parse_request		= stats_parse_request,</div><div class='add'>+	.prepare_data		= stats_prepare_data,</div><div class='add'>+	.reply_size		= stats_reply_size,</div><div class='add'>+	.fill_reply		= stats_fill_reply,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 ethtool_stats_sum(u64 a, u64 b)</div><div class='add'>+{</div><div class='add'>+	if (a == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return b;</div><div class='add'>+	if (b == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return a;</div><div class='add'>+	return a + b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Avoid modifying the aggregation procedure every time a new counter is added</div><div class='add'>+ * by treating the structures as an array of u64 statistics.</div><div class='add'>+ */</div><div class='add'>+static void ethtool_aggregate_stats(void *aggr_stats, const void *emac_stats,</div><div class='add'>+				    const void *pmac_stats, size_t stats_size,</div><div class='add'>+				    size_t stats_offset)</div><div class='add'>+{</div><div class='add'>+	size_t num_stats = stats_size / sizeof(u64);</div><div class='add'>+	const u64 *s1 = emac_stats + stats_offset;</div><div class='add'>+	const u64 *s2 = pmac_stats + stats_offset;</div><div class='add'>+	u64 *s = aggr_stats + stats_offset;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_stats; i++)</div><div class='add'>+		s[i] = ethtool_stats_sum(s1[i], s2[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_aggregate_mac_stats(struct net_device *dev,</div><div class='add'>+				 struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_eth_mac_stats pmac, emac;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emac, 0xff, sizeof(emac));</div><div class='add'>+	memset(&amp;pmac, 0xff, sizeof(pmac));</div><div class='add'>+	emac.src = ETHTOOL_MAC_STATS_SRC_EMAC;</div><div class='add'>+	pmac.src = ETHTOOL_MAC_STATS_SRC_PMAC;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_eth_mac_stats(dev, &amp;emac);</div><div class='add'>+	ops-&gt;get_eth_mac_stats(dev, &amp;pmac);</div><div class='add'>+</div><div class='add'>+	ethtool_aggregate_stats(mac_stats, &amp;emac, &amp;pmac,</div><div class='add'>+				sizeof(mac_stats-&gt;stats),</div><div class='add'>+				offsetof(struct ethtool_eth_mac_stats, stats));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_aggregate_mac_stats);</div><div class='add'>+</div><div class='add'>+void ethtool_aggregate_phy_stats(struct net_device *dev,</div><div class='add'>+				 struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_eth_phy_stats pmac, emac;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emac, 0xff, sizeof(emac));</div><div class='add'>+	memset(&amp;pmac, 0xff, sizeof(pmac));</div><div class='add'>+	emac.src = ETHTOOL_MAC_STATS_SRC_EMAC;</div><div class='add'>+	pmac.src = ETHTOOL_MAC_STATS_SRC_PMAC;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_eth_phy_stats(dev, &amp;emac);</div><div class='add'>+	ops-&gt;get_eth_phy_stats(dev, &amp;pmac);</div><div class='add'>+</div><div class='add'>+	ethtool_aggregate_stats(phy_stats, &amp;emac, &amp;pmac,</div><div class='add'>+				sizeof(phy_stats-&gt;stats),</div><div class='add'>+				offsetof(struct ethtool_eth_phy_stats, stats));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_aggregate_phy_stats);</div><div class='add'>+</div><div class='add'>+void ethtool_aggregate_ctrl_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_eth_ctrl_stats pmac, emac;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emac, 0xff, sizeof(emac));</div><div class='add'>+	memset(&amp;pmac, 0xff, sizeof(pmac));</div><div class='add'>+	emac.src = ETHTOOL_MAC_STATS_SRC_EMAC;</div><div class='add'>+	pmac.src = ETHTOOL_MAC_STATS_SRC_PMAC;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_eth_ctrl_stats(dev, &amp;emac);</div><div class='add'>+	ops-&gt;get_eth_ctrl_stats(dev, &amp;pmac);</div><div class='add'>+</div><div class='add'>+	ethtool_aggregate_stats(ctrl_stats, &amp;emac, &amp;pmac,</div><div class='add'>+				sizeof(ctrl_stats-&gt;stats),</div><div class='add'>+				offsetof(struct ethtool_eth_ctrl_stats, stats));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_aggregate_ctrl_stats);</div><div class='add'>+</div><div class='add'>+void ethtool_aggregate_pause_stats(struct net_device *dev,</div><div class='add'>+				   struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct ethtool_pause_stats pmac, emac;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emac, 0xff, sizeof(emac));</div><div class='add'>+	memset(&amp;pmac, 0xff, sizeof(pmac));</div><div class='add'>+	emac.src = ETHTOOL_MAC_STATS_SRC_EMAC;</div><div class='add'>+	pmac.src = ETHTOOL_MAC_STATS_SRC_PMAC;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_pause_stats(dev, &amp;emac);</div><div class='add'>+	ops-&gt;get_pause_stats(dev, &amp;pmac);</div><div class='add'>+</div><div class='add'>+	ethtool_aggregate_stats(pause_stats, &amp;emac, &amp;pmac,</div><div class='add'>+				sizeof(pause_stats-&gt;stats),</div><div class='add'>+				offsetof(struct ethtool_pause_stats, stats));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_aggregate_pause_stats);</div><div class='add'>+</div><div class='add'>+void ethtool_aggregate_rmon_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_rmon_stats *rmon_stats)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	const struct ethtool_rmon_hist_range *dummy;</div><div class='add'>+	struct ethtool_rmon_stats pmac, emac;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emac, 0xff, sizeof(emac));</div><div class='add'>+	memset(&amp;pmac, 0xff, sizeof(pmac));</div><div class='add'>+	emac.src = ETHTOOL_MAC_STATS_SRC_EMAC;</div><div class='add'>+	pmac.src = ETHTOOL_MAC_STATS_SRC_PMAC;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_rmon_stats(dev, &amp;emac, &amp;dummy);</div><div class='add'>+	ops-&gt;get_rmon_stats(dev, &amp;pmac, &amp;dummy);</div><div class='add'>+</div><div class='add'>+	ethtool_aggregate_stats(rmon_stats, &amp;emac, &amp;pmac,</div><div class='add'>+				sizeof(rmon_stats-&gt;stats),</div><div class='add'>+				offsetof(struct ethtool_rmon_stats, stats));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ethtool_aggregate_rmon_stats);</div><div class='head'>diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c<br/>new file mode 100644<br/>index 000000000000..f6a67109beda<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/strset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/strset.c</a></div><div class='hunk'>@@ -0,0 +1,499 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+struct strset_info {</div><div class='add'>+	bool per_dev;</div><div class='add'>+	bool free_strings;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	const char (*strings)[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct strset_info info_template[] = {</div><div class='add'>+	[ETH_SS_TEST] = {</div><div class='add'>+		.per_dev	= true,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS] = {</div><div class='add'>+		.per_dev	= true,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_PRIV_FLAGS] = {</div><div class='add'>+		.per_dev	= true,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_FEATURES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= ARRAY_SIZE(netdev_features_strings),</div><div class='add'>+		.strings	= netdev_features_strings,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_RSS_HASH_FUNCS] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= ARRAY_SIZE(rss_hash_func_strings),</div><div class='add'>+		.strings	= rss_hash_func_strings,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_TUNABLES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= ARRAY_SIZE(tunable_strings),</div><div class='add'>+		.strings	= tunable_strings,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_PHY_STATS] = {</div><div class='add'>+		.per_dev	= true,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_PHY_TUNABLES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= ARRAY_SIZE(phy_tunable_strings),</div><div class='add'>+		.strings	= phy_tunable_strings,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_LINK_MODES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_LINK_MODE_MASK_NBITS,</div><div class='add'>+		.strings	= link_mode_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_MSG_CLASSES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= NETIF_MSG_CLASS_COUNT,</div><div class='add'>+		.strings	= netif_msg_class_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_WOL_MODES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= WOL_MODE_COUNT,</div><div class='add'>+		.strings	= wol_mode_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_SOF_TIMESTAMPING] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __SOF_TIMESTAMPING_CNT,</div><div class='add'>+		.strings	= sof_timestamping_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_TS_TX_TYPES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __HWTSTAMP_TX_CNT,</div><div class='add'>+		.strings	= ts_tx_type_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_TS_RX_FILTERS] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __HWTSTAMP_FILTER_CNT,</div><div class='add'>+		.strings	= ts_rx_filter_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_TS_FLAGS] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __HWTSTAMP_FLAG_CNT,</div><div class='add'>+		.strings	= ts_flags_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_UDP_TUNNEL_TYPES] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_UDP_TUNNEL_TYPE_CNT,</div><div class='add'>+		.strings	= udp_tunnel_type_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_STD] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_STATS_CNT,</div><div class='add'>+		.strings	= stats_std_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_ETH_PHY] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_A_STATS_ETH_PHY_CNT,</div><div class='add'>+		.strings	= stats_eth_phy_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_ETH_MAC] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_A_STATS_ETH_MAC_CNT,</div><div class='add'>+		.strings	= stats_eth_mac_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_ETH_CTRL] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_A_STATS_ETH_CTRL_CNT,</div><div class='add'>+		.strings	= stats_eth_ctrl_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_RMON] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_A_STATS_RMON_CNT,</div><div class='add'>+		.strings	= stats_rmon_names,</div><div class='add'>+	},</div><div class='add'>+	[ETH_SS_STATS_PHY] = {</div><div class='add'>+		.per_dev	= false,</div><div class='add'>+		.count		= __ETHTOOL_A_STATS_PHY_CNT,</div><div class='add'>+		.strings	= stats_phy_names,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct strset_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+	u32				req_ids;</div><div class='add'>+	bool				counts_only;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STRSET_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct strset_req_info, base)</div><div class='add'>+</div><div class='add'>+struct strset_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct strset_info		sets[ETH_SS_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STRSET_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct strset_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_strset_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_STRSET_HEADER]	=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_phy),</div><div class='add'>+	[ETHTOOL_A_STRSET_STRINGSETS]	= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_STRSET_COUNTS_ONLY]	= { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy get_stringset_policy[] = {</div><div class='add'>+	[ETHTOOL_A_STRINGSET_ID]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * strset_include() - test if a string set should be included in reply</div><div class='add'>+ * @info: parsed client request</div><div class='add'>+ * @data: pointer to request data structure</div><div class='add'>+ * @id:   id of string set to check (ETH_SS_* constants)</div><div class='add'>+ */</div><div class='add'>+static bool strset_include(const struct strset_req_info *info,</div><div class='add'>+			   const struct strset_reply_data *data, u32 id)</div><div class='add'>+{</div><div class='add'>+	bool per_dev;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ETH_SS_COUNT &gt;= BITS_PER_BYTE * sizeof(info-&gt;req_ids));</div><div class='add'>+</div><div class='add'>+	if (info-&gt;req_ids)</div><div class='add'>+		return info-&gt;req_ids &amp; (1U &lt;&lt; id);</div><div class='add'>+	per_dev = data-&gt;sets[id].per_dev;</div><div class='add'>+	if (!per_dev &amp;&amp; !data-&gt;sets[id].strings)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return data-&gt;base.dev ? per_dev : !per_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int strset_get_id(const struct nlattr *nest, u32 *val,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(get_stringset_policy)];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(tb, ARRAY_SIZE(get_stringset_policy) - 1, nest,</div><div class='add'>+			       get_stringset_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, nest, tb, ETHTOOL_A_STRINGSET_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*val = nla_get_u32(tb[ETHTOOL_A_STRINGSET_ID]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy strset_stringsets_policy[] = {</div><div class='add'>+	[ETHTOOL_A_STRINGSETS_STRINGSET]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int strset_parse_request(struct ethnl_req_info *req_base,</div><div class='add'>+				struct nlattr **tb,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct strset_req_info *req_info = STRSET_REQINFO(req_base);</div><div class='add'>+	struct nlattr *nest = tb[ETHTOOL_A_STRSET_STRINGSETS];</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int rem, ret;</div><div class='add'>+</div><div class='add'>+	if (!nest)</div><div class='add'>+		return 0;</div><div class='add'>+	ret = nla_validate_nested(nest,</div><div class='add'>+				  ARRAY_SIZE(strset_stringsets_policy) - 1,</div><div class='add'>+				  strset_stringsets_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	req_info-&gt;counts_only = tb[ETHTOOL_A_STRSET_COUNTS_ONLY];</div><div class='add'>+	nla_for_each_nested(attr, nest, rem) {</div><div class='add'>+		u32 id;</div><div class='add'>+</div><div class='add'>+		if (WARN_ONCE(nla_type(attr) != ETHTOOL_A_STRINGSETS_STRINGSET,</div><div class='add'>+			      "unexpected attrtype %u in ETHTOOL_A_STRSET_STRINGSETS\n",</div><div class='add'>+			      nla_type(attr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = strset_get_id(attr, &amp;id, extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (id &gt;= ETH_SS_COUNT) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, attr,</div><div class='add'>+					    "unknown string set id");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		req_info-&gt;req_ids |= (1U &lt;&lt; id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void strset_cleanup_data(struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	struct strset_reply_data *data = STRSET_REPDATA(reply_base);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_SS_COUNT; i++)</div><div class='add'>+		if (data-&gt;sets[i].free_strings) {</div><div class='add'>+			kfree(data-&gt;sets[i].strings);</div><div class='add'>+			data-&gt;sets[i].strings = NULL;</div><div class='add'>+			data-&gt;sets[i].free_strings = false;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int strset_prepare_set(struct strset_info *info, struct net_device *dev,</div><div class='add'>+			      struct phy_device *phydev, unsigned int id,</div><div class='add'>+			      bool counts_only)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	void *strings;</div><div class='add'>+	int count, ret;</div><div class='add'>+</div><div class='add'>+	if (id == ETH_SS_PHY_STATS &amp;&amp; phydev &amp;&amp;</div><div class='add'>+	    !ops-&gt;get_ethtool_phy_stats &amp;&amp; phy_ops &amp;&amp;</div><div class='add'>+	    phy_ops-&gt;get_sset_count)</div><div class='add'>+		ret = phy_ops-&gt;get_sset_count(phydev);</div><div class='add'>+	else if (ops-&gt;get_sset_count &amp;&amp; ops-&gt;get_strings)</div><div class='add'>+		ret = ops-&gt;get_sset_count(dev, id);</div><div class='add'>+	else</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		info-&gt;count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = ret;</div><div class='add'>+	if (!counts_only) {</div><div class='add'>+		strings = kcalloc(count, ETH_GSTRING_LEN, GFP_KERNEL);</div><div class='add'>+		if (!strings)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		if (id == ETH_SS_PHY_STATS &amp;&amp; phydev &amp;&amp;</div><div class='add'>+		    !ops-&gt;get_ethtool_phy_stats &amp;&amp; phy_ops &amp;&amp;</div><div class='add'>+		    phy_ops-&gt;get_strings)</div><div class='add'>+			phy_ops-&gt;get_strings(phydev, strings);</div><div class='add'>+		else</div><div class='add'>+			ops-&gt;get_strings(dev, id, strings);</div><div class='add'>+		info-&gt;strings = strings;</div><div class='add'>+		info-&gt;free_strings = true;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;count = count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int strset_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			       struct ethnl_reply_data *reply_base,</div><div class='add'>+			       const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct strset_req_info *req_info = STRSET_REQINFO(req_base);</div><div class='add'>+	struct strset_reply_data *data = STRSET_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(info_template) != ETH_SS_COUNT);</div><div class='add'>+	memcpy(&amp;data-&gt;sets, &amp;info_template, sizeof(data-&gt;sets));</div><div class='add'>+</div><div class='add'>+	if (!dev) {</div><div class='add'>+		for (i = 0; i &lt; ETH_SS_COUNT; i++) {</div><div class='add'>+			if ((req_info-&gt;req_ids &amp; (1U &lt;&lt; i)) &amp;&amp;</div><div class='add'>+			    data-&gt;sets[i].per_dev) {</div><div class='add'>+				GENL_SET_ERR_MSG(info, "requested per device strings without dev");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_HEADER_FLAGS,</div><div class='add'>+				      info-&gt;extack);</div><div class='add'>+</div><div class='add'>+	/* phydev can be NULL, check for errors only */</div><div class='add'>+	if (IS_ERR(phydev))</div><div class='add'>+		return PTR_ERR(phydev);</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_strset;</div><div class='add'>+	for (i = 0; i &lt; ETH_SS_COUNT; i++) {</div><div class='add'>+		if (!strset_include(req_info, data, i) ||</div><div class='add'>+		    !data-&gt;sets[i].per_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = strset_prepare_set(&amp;data-&gt;sets[i], dev, phydev, i,</div><div class='add'>+					 req_info-&gt;counts_only);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_ops;</div><div class='add'>+	}</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_ops:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+err_strset:</div><div class='add'>+	strset_cleanup_data(reply_base);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* calculate size of ETHTOOL_A_STRSET_STRINGSET nest for one string set */</div><div class='add'>+static int strset_set_size(const struct strset_info *info, bool counts_only)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (counts_only)</div><div class='add'>+		return nla_total_size(2 * nla_total_size(sizeof(u32)));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;count; i++) {</div><div class='add'>+		const char *str = info-&gt;strings[i];</div><div class='add'>+</div><div class='add'>+		/* ETHTOOL_A_STRING_INDEX, ETHTOOL_A_STRING_VALUE, nest */</div><div class='add'>+		len += nla_total_size(nla_total_size(sizeof(u32)) +</div><div class='add'>+				      ethnl_strz_size(str));</div><div class='add'>+	}</div><div class='add'>+	/* ETHTOOL_A_STRINGSET_ID, ETHTOOL_A_STRINGSET_COUNT */</div><div class='add'>+	len = 2 * nla_total_size(sizeof(u32)) + nla_total_size(len);</div><div class='add'>+</div><div class='add'>+	return nla_total_size(len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int strset_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct strset_req_info *req_info = STRSET_REQINFO(req_base);</div><div class='add'>+	const struct strset_reply_data *data = STRSET_REPDATA(reply_base);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len += nla_total_size(0); /* ETHTOOL_A_STRSET_STRINGSETS */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_SS_COUNT; i++) {</div><div class='add'>+		const struct strset_info *set_info = &amp;data-&gt;sets[i];</div><div class='add'>+</div><div class='add'>+		if (!strset_include(req_info, data, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = strset_set_size(set_info, req_info-&gt;counts_only);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill one string into reply */</div><div class='add'>+static int strset_fill_string(struct sk_buff *skb,</div><div class='add'>+			      const struct strset_info *set_info, u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *string_attr;</div><div class='add'>+	const char *value;</div><div class='add'>+</div><div class='add'>+	value = set_info-&gt;strings[idx];</div><div class='add'>+</div><div class='add'>+	string_attr = nla_nest_start(skb, ETHTOOL_A_STRINGS_STRING);</div><div class='add'>+	if (!string_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_STRING_INDEX, idx) ||</div><div class='add'>+	    ethnl_put_strz(skb, ETHTOOL_A_STRING_VALUE, value))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	nla_nest_end(skb, string_attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, string_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill one string set into reply */</div><div class='add'>+static int strset_fill_set(struct sk_buff *skb,</div><div class='add'>+			   const struct strset_info *set_info, u32 id,</div><div class='add'>+			   bool counts_only)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *stringset_attr;</div><div class='add'>+	struct nlattr *strings_attr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!set_info-&gt;per_dev &amp;&amp; !set_info-&gt;strings)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (set_info-&gt;count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	stringset_attr = nla_nest_start(skb, ETHTOOL_A_STRINGSETS_STRINGSET);</div><div class='add'>+	if (!stringset_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ETHTOOL_A_STRINGSET_ID, id) ||</div><div class='add'>+	    nla_put_u32(skb, ETHTOOL_A_STRINGSET_COUNT, set_info-&gt;count))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (!counts_only) {</div><div class='add'>+		strings_attr = nla_nest_start(skb, ETHTOOL_A_STRINGSET_STRINGS);</div><div class='add'>+		if (!strings_attr)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		for (i = 0; i &lt; set_info-&gt;count; i++) {</div><div class='add'>+			if (strset_fill_string(skb, set_info, i) &lt; 0)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, strings_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, stringset_attr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, stringset_attr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int strset_fill_reply(struct sk_buff *skb,</div><div class='add'>+			     const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct strset_req_info *req_info = STRSET_REQINFO(req_base);</div><div class='add'>+	const struct strset_reply_data *data = STRSET_REPDATA(reply_base);</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_STRSET_STRINGSETS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_SS_COUNT; i++) {</div><div class='add'>+		if (strset_include(req_info, data, i)) {</div><div class='add'>+			ret = strset_fill_set(skb, &amp;data-&gt;sets[i], i,</div><div class='add'>+					      req_info-&gt;counts_only);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_strset_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_STRSET_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_STRSET_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_STRSET_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct strset_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct strset_reply_data),</div><div class='add'>+	.allow_nodev_do		= true,</div><div class='add'>+</div><div class='add'>+	.parse_request		= strset_parse_request,</div><div class='add'>+	.prepare_data		= strset_prepare_data,</div><div class='add'>+	.reply_size		= strset_reply_size,</div><div class='add'>+	.fill_reply		= strset_fill_reply,</div><div class='add'>+	.cleanup_data		= strset_cleanup_data,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/ts.h b/net/ethtool/ts.h<br/>new file mode 100644<br/>index 000000000000..d901a879a671<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/ts.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/ts.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef _NET_ETHTOOL_TS_H</div><div class='add'>+#define _NET_ETHTOOL_TS_H</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+ethnl_ts_hwtst_prov_policy[ETHTOOL_A_TS_HWTSTAMP_PROVIDER_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX] = { .type = NLA_U32 },</div><div class='add'>+	[ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER] =</div><div class='add'>+		NLA_POLICY_MAX(NLA_U32, HWTSTAMP_PROVIDER_QUALIFIER_CNT - 1)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ts_parse_hwtst_provider(const struct nlattr *nest,</div><div class='add'>+			    struct hwtstamp_provider_desc *hwprov_desc,</div><div class='add'>+			    struct netlink_ext_ack *extack,</div><div class='add'>+			    bool *mod);</div><div class='add'>+</div><div class='add'>+#endif /* _NET_ETHTOOL_TS_H */</div><div class='head'>diff --git a/net/ethtool/tsconfig.c b/net/ethtool/tsconfig.c<br/>new file mode 100644<br/>index 000000000000..169b413b31fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/tsconfig.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/tsconfig.c</a></div><div class='hunk'>@@ -0,0 +1,455 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+#include "../core/dev.h"</div><div class='add'>+#include "ts.h"</div><div class='add'>+</div><div class='add'>+struct tsconfig_req_info {</div><div class='add'>+	struct ethnl_req_info base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsconfig_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct hwtstamp_provider_desc	hwprov_desc;</div><div class='add'>+	struct {</div><div class='add'>+		u32 tx_type;</div><div class='add'>+		u32 rx_filter;</div><div class='add'>+		u32 flags;</div><div class='add'>+	} hwtst_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSCONFIG_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct tsconfig_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_tsconfig_get_policy[ETHTOOL_A_TSCONFIG_HEADER + 1] = {</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tsconfig_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+				 struct ethnl_reply_data *reply_base,</div><div class='add'>+				 const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);</div><div class='add'>+	struct hwtstamp_provider *hwprov = NULL;</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	struct kernel_hwtstamp_config cfg = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_hwtstamp_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dev_get_hwtstamp_phylib(dev, &amp;cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data-&gt;hwtst_config.tx_type = BIT(cfg.tx_type);</div><div class='add'>+	data-&gt;hwtst_config.rx_filter = BIT(cfg.rx_filter);</div><div class='add'>+	data-&gt;hwtst_config.flags = cfg.flags;</div><div class='add'>+</div><div class='add'>+	data-&gt;hwprov_desc.index = -1;</div><div class='add'>+	hwprov = rtnl_dereference(dev-&gt;hwprov);</div><div class='add'>+	if (hwprov) {</div><div class='add'>+		data-&gt;hwprov_desc.index = hwprov-&gt;desc.index;</div><div class='add'>+		data-&gt;hwprov_desc.qualifier = hwprov-&gt;desc.qualifier;</div><div class='add'>+	} else {</div><div class='add'>+		struct kernel_ethtool_ts_info ts_info = {};</div><div class='add'>+</div><div class='add'>+		ts_info.phc_index = -1;</div><div class='add'>+		ret = __ethtool_get_ts_info(dev, &amp;ts_info);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (ts_info.phc_index == -1)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		data-&gt;hwprov_desc.index = ts_info.phc_index;</div><div class='add'>+		data-&gt;hwprov_desc.qualifier = ts_info.phc_qualifier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsconfig_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_TX_CNT &gt; 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_FILTER_CNT &gt; 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_FLAG_CNT &gt; 32);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwtst_config.flags) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;data-&gt;hwtst_config.flags,</div><div class='add'>+					  NULL, __HWTSTAMP_FLAG_CNT,</div><div class='add'>+					  ts_flags_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSCONFIG_HWTSTAMP_FLAGS */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwtst_config.tx_type) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;data-&gt;hwtst_config.tx_type,</div><div class='add'>+					  NULL, __HWTSTAMP_TX_CNT,</div><div class='add'>+					  ts_tx_type_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSCONFIG_TX_TYPES */</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;hwtst_config.rx_filter) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;data-&gt;hwtst_config.rx_filter,</div><div class='add'>+					  NULL, __HWTSTAMP_FILTER_CNT,</div><div class='add'>+					  ts_rx_filter_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSCONFIG_RX_FILTERS */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwprov_desc.index &gt;= 0)</div><div class='add'>+		/* _TSCONFIG_HWTSTAMP_PROVIDER */</div><div class='add'>+		len += nla_total_size(0) +</div><div class='add'>+		       2 * nla_total_size(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsconfig_fill_reply(struct sk_buff *skb,</div><div class='add'>+			       const struct ethnl_req_info *req_base,</div><div class='add'>+			       const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwtst_config.flags) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS,</div><div class='add'>+					 &amp;data-&gt;hwtst_config.flags, NULL,</div><div class='add'>+					 __HWTSTAMP_FLAG_CNT,</div><div class='add'>+					 ts_flags_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwtst_config.tx_type) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSCONFIG_TX_TYPES,</div><div class='add'>+					 &amp;data-&gt;hwtst_config.tx_type, NULL,</div><div class='add'>+					 __HWTSTAMP_TX_CNT,</div><div class='add'>+					 ts_tx_type_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwtst_config.rx_filter) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSCONFIG_RX_FILTERS,</div><div class='add'>+					 &amp;data-&gt;hwtst_config.rx_filter,</div><div class='add'>+					 NULL, __HWTSTAMP_FILTER_CNT,</div><div class='add'>+					 ts_rx_filter_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;hwprov_desc.index &gt;= 0) {</div><div class='add'>+		struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX,</div><div class='add'>+				data-&gt;hwprov_desc.index) ||</div><div class='add'>+		    nla_put_u32(skb,</div><div class='add'>+				ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER,</div><div class='add'>+				data-&gt;hwprov_desc.qualifier)) {</div><div class='add'>+			nla_nest_cancel(skb, nest);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TSCONFIG_SET */</div><div class='add'>+const struct nla_policy ethnl_tsconfig_set_policy[ETHTOOL_A_TSCONFIG_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER] =</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_ts_hwtst_prov_policy),</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS] = { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_RX_FILTERS] = { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_TSCONFIG_TX_TYPES] = { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tsconfig_send_reply(struct net_device *dev, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tsconfig_reply_data *reply_data;</div><div class='add'>+	struct tsconfig_req_info *req_info;</div><div class='add'>+	struct sk_buff *rskb;</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	int reply_len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req_info = kzalloc(sizeof(*req_info), GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	reply_data = kmalloc(sizeof(*reply_data), GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		kfree(req_info);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	reply_data-&gt;base.dev = dev;</div><div class='add'>+	ret = tsconfig_prepare_data(&amp;req_info-&gt;base, &amp;reply_data-&gt;base, info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+</div><div class='add'>+	ret = tsconfig_reply_size(&amp;req_info-&gt;base, &amp;reply_data-&gt;base);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+</div><div class='add'>+	reply_len = ret + ethnl_reply_header_size();</div><div class='add'>+	rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_TSCONFIG_SET_REPLY,</div><div class='add'>+				ETHTOOL_A_TSCONFIG_HEADER, info, &amp;reply_payload);</div><div class='add'>+	if (!rskb)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+</div><div class='add'>+	ret = tsconfig_fill_reply(rskb, &amp;req_info-&gt;base, &amp;reply_data-&gt;base);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_cleanup;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(rskb, reply_payload);</div><div class='add'>+	ret = genlmsg_reply(rskb, info);</div><div class='add'>+</div><div class='add'>+err_cleanup:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+	kfree(req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_set_tsconfig_validate(struct ethnl_req_info *req_base,</div><div class='add'>+				       struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct net_device_ops *ops = req_base-&gt;dev-&gt;netdev_ops;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;ndo_hwtstamp_set || !ops-&gt;ndo_hwtstamp_get)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hwtstamp_provider *</div><div class='add'>+tsconfig_set_hwprov_from_desc(struct net_device *dev,</div><div class='add'>+			      struct genl_info *info,</div><div class='add'>+			      struct hwtstamp_provider_desc *hwprov_desc)</div><div class='add'>+{</div><div class='add'>+	struct kernel_ethtool_ts_info ts_info;</div><div class='add'>+	struct hwtstamp_provider *hwprov;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct phy_device *phy = NULL;</div><div class='add'>+	enum hwtstamp_source source;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethtool_net_get_ts_info_by_phc(dev, &amp;ts_info, hwprov_desc);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* Found */</div><div class='add'>+		source = HWTSTAMP_SOURCE_NETDEV;</div><div class='add'>+	} else {</div><div class='add'>+		phy = ethtool_phy_get_ts_info_by_phc(dev, &amp;ts_info, hwprov_desc);</div><div class='add'>+		if (IS_ERR(phy)) {</div><div class='add'>+			if (PTR_ERR(phy) == -ENODEV)</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+						    tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],</div><div class='add'>+						    "phc not in this net device topology");</div><div class='add'>+			return ERR_CAST(phy);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		source = HWTSTAMP_SOURCE_PHYLIB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwprov = kzalloc(sizeof(*hwprov), GFP_KERNEL);</div><div class='add'>+	if (!hwprov)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	hwprov-&gt;desc.index = hwprov_desc-&gt;index;</div><div class='add'>+	hwprov-&gt;desc.qualifier = hwprov_desc-&gt;qualifier;</div><div class='add'>+	hwprov-&gt;source = source;</div><div class='add'>+	hwprov-&gt;phydev = phy;</div><div class='add'>+</div><div class='add'>+	return hwprov;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_set_tsconfig(struct ethnl_req_info *req_base,</div><div class='add'>+			      struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct kernel_hwtstamp_config hwtst_config = {0};</div><div class='add'>+	bool hwprov_mod = false, config_mod = false;</div><div class='add'>+	struct hwtstamp_provider *hwprov = NULL;</div><div class='add'>+	struct net_device *dev = req_base-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_TX_CNT &gt;= 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_FILTER_CNT &gt;= 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_FLAG_CNT &gt; 32);</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER]) {</div><div class='add'>+		struct hwtstamp_provider_desc __hwprov_desc = {.index = -1};</div><div class='add'>+		struct hwtstamp_provider *__hwprov;</div><div class='add'>+</div><div class='add'>+		__hwprov = rtnl_dereference(dev-&gt;hwprov);</div><div class='add'>+		if (__hwprov) {</div><div class='add'>+			__hwprov_desc.index = __hwprov-&gt;desc.index;</div><div class='add'>+			__hwprov_desc.qualifier = __hwprov-&gt;desc.qualifier;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ts_parse_hwtst_provider(tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],</div><div class='add'>+					      &amp;__hwprov_desc, info-&gt;extack,</div><div class='add'>+					      &amp;hwprov_mod);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (hwprov_mod) {</div><div class='add'>+			hwprov = tsconfig_set_hwprov_from_desc(dev, info,</div><div class='add'>+							       &amp;__hwprov_desc);</div><div class='add'>+			if (IS_ERR(hwprov))</div><div class='add'>+				return PTR_ERR(hwprov);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get current hwtstamp config if we are not changing the</div><div class='add'>+	 * hwtstamp source. It will be zeroed in the other case.</div><div class='add'>+	 */</div><div class='add'>+	if (!hwprov_mod) {</div><div class='add'>+		ret = dev_get_hwtstamp_phylib(dev, &amp;hwtst_config);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the hwtstamp config from netlink */</div><div class='add'>+	if (tb[ETHTOOL_A_TSCONFIG_TX_TYPES]) {</div><div class='add'>+		u32 req_tx_type;</div><div class='add'>+</div><div class='add'>+		req_tx_type = BIT(hwtst_config.tx_type);</div><div class='add'>+		ret = ethnl_update_bitset32(&amp;req_tx_type,</div><div class='add'>+					    __HWTSTAMP_TX_CNT,</div><div class='add'>+					    tb[ETHTOOL_A_TSCONFIG_TX_TYPES],</div><div class='add'>+					    ts_tx_type_names, info-&gt;extack,</div><div class='add'>+					    &amp;config_mod);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+</div><div class='add'>+		/* Select only one tx type at a time */</div><div class='add'>+		if (ffs(req_tx_type) != fls(req_tx_type)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hwtst_config.tx_type = ffs(req_tx_type) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_TSCONFIG_RX_FILTERS]) {</div><div class='add'>+		u32 req_rx_filter;</div><div class='add'>+</div><div class='add'>+		req_rx_filter = BIT(hwtst_config.rx_filter);</div><div class='add'>+		ret = ethnl_update_bitset32(&amp;req_rx_filter,</div><div class='add'>+					    __HWTSTAMP_FILTER_CNT,</div><div class='add'>+					    tb[ETHTOOL_A_TSCONFIG_RX_FILTERS],</div><div class='add'>+					    ts_rx_filter_names, info-&gt;extack,</div><div class='add'>+					    &amp;config_mod);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+</div><div class='add'>+		/* Select only one rx filter at a time */</div><div class='add'>+		if (ffs(req_rx_filter) != fls(req_rx_filter)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hwtst_config.rx_filter = ffs(req_rx_filter) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS]) {</div><div class='add'>+		ret = ethnl_update_bitset32(&amp;hwtst_config.flags,</div><div class='add'>+					    __HWTSTAMP_FLAG_CNT,</div><div class='add'>+					    tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS],</div><div class='add'>+					    ts_flags_names, info-&gt;extack,</div><div class='add'>+					    &amp;config_mod);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = net_hwtstamp_validate(&amp;hwtst_config);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_hwprov;</div><div class='add'>+</div><div class='add'>+	if (hwprov_mod) {</div><div class='add'>+		struct kernel_hwtstamp_config zero_config = {0};</div><div class='add'>+		struct hwtstamp_provider *__hwprov;</div><div class='add'>+</div><div class='add'>+		/* Disable current time stamping if we try to enable</div><div class='add'>+		 * another one</div><div class='add'>+		 */</div><div class='add'>+		ret = dev_set_hwtstamp_phylib(dev, &amp;zero_config, info-&gt;extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_free_hwprov;</div><div class='add'>+</div><div class='add'>+		/* Change the selected hwtstamp source */</div><div class='add'>+		__hwprov = rcu_replace_pointer_rtnl(dev-&gt;hwprov, hwprov);</div><div class='add'>+		if (__hwprov)</div><div class='add'>+			kfree_rcu(__hwprov, rcu_head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (config_mod) {</div><div class='add'>+		ret = dev_set_hwtstamp_phylib(dev, &amp;hwtst_config,</div><div class='add'>+					      info-&gt;extack);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tsconfig_send_reply(dev, info);</div><div class='add'>+	if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "error while reading the new configuration set");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tsconfig has no notification */</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_hwprov:</div><div class='add'>+	kfree(hwprov);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_tsconfig_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_TSCONFIG_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_TSCONFIG_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_TSCONFIG_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct tsconfig_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct tsconfig_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= tsconfig_prepare_data,</div><div class='add'>+	.reply_size		= tsconfig_reply_size,</div><div class='add'>+	.fill_reply		= tsconfig_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_tsconfig_validate,</div><div class='add'>+	.set			= ethnl_set_tsconfig,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/tsinfo.c b/net/ethtool/tsinfo.c<br/>new file mode 100644<br/>index 000000000000..8c654caa6805<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/tsinfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/tsinfo.c</a></div><div class='hunk'>@@ -0,0 +1,564 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phy_link_topology.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+#include "ts.h"</div><div class='add'>+</div><div class='add'>+struct tsinfo_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+	struct hwtstamp_provider_desc	hwprov_desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsinfo_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct kernel_ethtool_ts_info	ts_info;</div><div class='add'>+	struct ethtool_ts_stats		stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSINFO_REQINFO(__req_base) \</div><div class='add'>+	container_of(__req_base, struct tsinfo_req_info, base)</div><div class='add'>+</div><div class='add'>+#define TSINFO_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct tsinfo_reply_data, base)</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_TS_STAT_CNT \</div><div class='add'>+	(__ETHTOOL_A_TS_STAT_CNT - (ETHTOOL_A_TS_STAT_UNSPEC + 1))</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_tsinfo_get_policy[ETHTOOL_A_TSINFO_MAX + 1] = {</div><div class='add'>+	[ETHTOOL_A_TSINFO_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy_stats),</div><div class='add'>+	[ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER] =</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_ts_hwtst_prov_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ts_parse_hwtst_provider(const struct nlattr *nest,</div><div class='add'>+			    struct hwtstamp_provider_desc *hwprov_desc,</div><div class='add'>+			    struct netlink_ext_ack *extack,</div><div class='add'>+			    bool *mod)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(ethnl_ts_hwtst_prov_policy)];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested(tb,</div><div class='add'>+			       ARRAY_SIZE(ethnl_ts_hwtst_prov_policy) - 1,</div><div class='add'>+			       nest,</div><div class='add'>+			       ethnl_ts_hwtst_prov_policy, extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, nest, tb,</div><div class='add'>+			      ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX) ||</div><div class='add'>+	    NL_REQ_ATTR_CHECK(extack, nest, tb,</div><div class='add'>+			      ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ethnl_update_u32(&amp;hwprov_desc-&gt;index,</div><div class='add'>+			 tb[ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX],</div><div class='add'>+			 mod);</div><div class='add'>+	ethnl_update_u32(&amp;hwprov_desc-&gt;qualifier,</div><div class='add'>+			 tb[ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER],</div><div class='add'>+			 mod);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+tsinfo_parse_request(struct ethnl_req_info *req_base, struct nlattr **tb,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct tsinfo_req_info *req = TSINFO_REQINFO(req_base);</div><div class='add'>+	bool mod = false;</div><div class='add'>+</div><div class='add'>+	req-&gt;hwprov_desc.index = -1;</div><div class='add'>+</div><div class='add'>+	if (!tb[ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ts_parse_hwtst_provider(tb[ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER],</div><div class='add'>+				       &amp;req-&gt;hwprov_desc, extack, &amp;mod);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsinfo_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			       struct ethnl_reply_data *reply_base,</div><div class='add'>+			       const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tsinfo_reply_data *data = TSINFO_REPDATA(reply_base);</div><div class='add'>+	struct tsinfo_req_info *req = TSINFO_REQINFO(req_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;hwprov_desc.index != -1) {</div><div class='add'>+		ret = ethtool_get_ts_info_by_phc(dev, &amp;data-&gt;ts_info,</div><div class='add'>+						 &amp;req-&gt;hwprov_desc);</div><div class='add'>+		ethnl_ops_complete(dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS) {</div><div class='add'>+		ethtool_stats_init((u64 *)&amp;data-&gt;stats,</div><div class='add'>+				   sizeof(data-&gt;stats) / sizeof(u64));</div><div class='add'>+		if (dev-&gt;ethtool_ops-&gt;get_ts_stats)</div><div class='add'>+			dev-&gt;ethtool_ops-&gt;get_ts_stats(dev, &amp;data-&gt;stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __ethtool_get_ts_info(dev, &amp;data-&gt;ts_info);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsinfo_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct tsinfo_reply_data *data = TSINFO_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct kernel_ethtool_ts_info *ts_info = &amp;data-&gt;ts_info;</div><div class='add'>+	int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(__SOF_TIMESTAMPING_CNT &gt; 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_TX_CNT &gt; 32);</div><div class='add'>+	BUILD_BUG_ON(__HWTSTAMP_FILTER_CNT &gt; 32);</div><div class='add'>+</div><div class='add'>+	if (ts_info-&gt;so_timestamping) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;ts_info-&gt;so_timestamping, NULL,</div><div class='add'>+					  __SOF_TIMESTAMPING_CNT,</div><div class='add'>+					  sof_timestamping_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSINFO_TIMESTAMPING */</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;tx_types) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;ts_info-&gt;tx_types, NULL,</div><div class='add'>+					  __HWTSTAMP_TX_CNT,</div><div class='add'>+					  ts_tx_type_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSINFO_TX_TYPES */</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;rx_filters) {</div><div class='add'>+		ret = ethnl_bitset32_size(&amp;ts_info-&gt;rx_filters, NULL,</div><div class='add'>+					  __HWTSTAMP_FILTER_CNT,</div><div class='add'>+					  ts_rx_filter_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		len += ret;	/* _TSINFO_RX_FILTERS */</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;phc_index &gt;= 0) {</div><div class='add'>+		len += nla_total_size(sizeof(u32));	/* _TSINFO_PHC_INDEX */</div><div class='add'>+		/* _TSINFO_HWTSTAMP_PROVIDER */</div><div class='add'>+		len += nla_total_size(0) + 2 * nla_total_size(sizeof(u32));</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;phc_source) {</div><div class='add'>+		len += nla_total_size(sizeof(u32));	/* _TSINFO_HWTSTAMP_SOURCE */</div><div class='add'>+		if (ts_info-&gt;phc_phyindex)</div><div class='add'>+			/* _TSINFO_HWTSTAMP_PHYINDEX */</div><div class='add'>+			len += nla_total_size(sizeof(u32));</div><div class='add'>+	}</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS)</div><div class='add'>+		len += nla_total_size(0) + /* _TSINFO_STATS */</div><div class='add'>+		       nla_total_size_64bit(sizeof(u64)) * ETHTOOL_TS_STAT_CNT;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsinfo_put_stat(struct sk_buff *skb, u64 val, u16 attrtype)</div><div class='add'>+{</div><div class='add'>+	if (val == ETHTOOL_STAT_NOT_SET)</div><div class='add'>+		return 0;</div><div class='add'>+	if (nla_put_uint(skb, attrtype, val))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsinfo_put_stats(struct sk_buff *skb,</div><div class='add'>+			    const struct ethtool_ts_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ETHTOOL_A_TSINFO_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (tsinfo_put_stat(skb, stats-&gt;tx_stats.pkts,</div><div class='add'>+			    ETHTOOL_A_TS_STAT_TX_PKTS) ||</div><div class='add'>+	    tsinfo_put_stat(skb, stats-&gt;tx_stats.onestep_pkts_unconfirmed,</div><div class='add'>+			    ETHTOOL_A_TS_STAT_TX_ONESTEP_PKTS_UNCONFIRMED) ||</div><div class='add'>+	    tsinfo_put_stat(skb, stats-&gt;tx_stats.lost,</div><div class='add'>+			    ETHTOOL_A_TS_STAT_TX_LOST) ||</div><div class='add'>+	    tsinfo_put_stat(skb, stats-&gt;tx_stats.err,</div><div class='add'>+			    ETHTOOL_A_TS_STAT_TX_ERR))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsinfo_fill_reply(struct sk_buff *skb,</div><div class='add'>+			     const struct ethnl_req_info *req_base,</div><div class='add'>+			     const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	const struct tsinfo_reply_data *data = TSINFO_REPDATA(reply_base);</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct kernel_ethtool_ts_info *ts_info = &amp;data-&gt;ts_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ts_info-&gt;so_timestamping) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSINFO_TIMESTAMPING,</div><div class='add'>+					 &amp;ts_info-&gt;so_timestamping, NULL,</div><div class='add'>+					 __SOF_TIMESTAMPING_CNT,</div><div class='add'>+					 sof_timestamping_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;tx_types) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSINFO_TX_TYPES,</div><div class='add'>+					 &amp;ts_info-&gt;tx_types, NULL,</div><div class='add'>+					 __HWTSTAMP_TX_CNT,</div><div class='add'>+					 ts_tx_type_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;rx_filters) {</div><div class='add'>+		ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSINFO_RX_FILTERS,</div><div class='add'>+					 &amp;ts_info-&gt;rx_filters, NULL,</div><div class='add'>+					 __HWTSTAMP_FILTER_CNT,</div><div class='add'>+					 ts_rx_filter_names, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;phc_index &gt;= 0) {</div><div class='add'>+		struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+		ret = nla_put_u32(skb, ETHTOOL_A_TSINFO_PHC_INDEX,</div><div class='add'>+				  ts_info-&gt;phc_index);</div><div class='add'>+		if (ret)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX,</div><div class='add'>+				ts_info-&gt;phc_index) ||</div><div class='add'>+		    nla_put_u32(skb,</div><div class='add'>+				ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER,</div><div class='add'>+				ts_info-&gt;phc_qualifier)) {</div><div class='add'>+			nla_nest_cancel(skb, nest);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+	if (ts_info-&gt;phc_source) {</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_TSINFO_HWTSTAMP_SOURCE,</div><div class='add'>+				ts_info-&gt;phc_source))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (ts_info-&gt;phc_phyindex &amp;&amp;</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_TSINFO_HWTSTAMP_PHYINDEX,</div><div class='add'>+				ts_info-&gt;phc_phyindex))</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+	if (req_base-&gt;flags &amp; ETHTOOL_FLAG_STATS &amp;&amp;</div><div class='add'>+	    tsinfo_put_stats(skb, &amp;data-&gt;stats))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethnl_tsinfo_dump_ctx {</div><div class='add'>+	struct tsinfo_req_info		*req_info;</div><div class='add'>+	struct tsinfo_reply_data	*reply_data;</div><div class='add'>+	unsigned long			pos_ifindex;</div><div class='add'>+	bool				netdev_dump_done;</div><div class='add'>+	unsigned long			pos_phyindex;</div><div class='add'>+	enum hwtstamp_provider_qualifier pos_phcqualifier;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *ethnl_tsinfo_prepare_dump(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *dev,</div><div class='add'>+				       struct tsinfo_reply_data *reply_data,</div><div class='add'>+				       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	void *ehdr = NULL;</div><div class='add'>+</div><div class='add'>+	ehdr = ethnl_dump_put(skb, cb,</div><div class='add'>+			      ETHTOOL_MSG_TSINFO_GET_REPLY);</div><div class='add'>+	if (!ehdr)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	reply_data = ctx-&gt;reply_data;</div><div class='add'>+	memset(reply_data, 0, sizeof(*reply_data));</div><div class='add'>+	reply_data-&gt;base.dev = dev;</div><div class='add'>+	reply_data-&gt;ts_info.cmd = ETHTOOL_GET_TS_INFO;</div><div class='add'>+	reply_data-&gt;ts_info.phc_index = -1;</div><div class='add'>+</div><div class='add'>+	return ehdr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_tsinfo_end_dump(struct sk_buff *skb,</div><div class='add'>+				 struct net_device *dev,</div><div class='add'>+				 struct tsinfo_req_info *req_info,</div><div class='add'>+				 struct tsinfo_reply_data *reply_data,</div><div class='add'>+				 void *ehdr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reply_data-&gt;ts_info.so_timestamping |= SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+					       SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_fill_reply_header(skb, dev, ETHTOOL_A_TSINFO_HEADER);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = tsinfo_fill_reply(skb, &amp;req_info-&gt;base, &amp;reply_data-&gt;base);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reply_data-&gt;base.dev = NULL;</div><div class='add'>+	genlmsg_end(skb, ehdr);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_tsinfo_dump_one_phydev(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev,</div><div class='add'>+					struct phy_device *phydev,</div><div class='add'>+					struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct tsinfo_reply_data *reply_data;</div><div class='add'>+	struct tsinfo_req_info *req_info;</div><div class='add'>+	void *ehdr = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!phy_has_tsinfo(phydev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	reply_data = ctx-&gt;reply_data;</div><div class='add'>+	req_info = ctx-&gt;req_info;</div><div class='add'>+	ehdr = ethnl_tsinfo_prepare_dump(skb, dev, reply_data, cb);</div><div class='add'>+	if (IS_ERR(ehdr))</div><div class='add'>+		return PTR_ERR(ehdr);</div><div class='add'>+</div><div class='add'>+	ret = phy_ts_info(phydev, &amp;reply_data-&gt;ts_info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (reply_data-&gt;ts_info.phc_index &gt;= 0) {</div><div class='add'>+		reply_data-&gt;ts_info.phc_source = HWTSTAMP_SOURCE_PHYLIB;</div><div class='add'>+		reply_data-&gt;ts_info.phc_phyindex = phydev-&gt;phyindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_tsinfo_end_dump(skb, dev, req_info, reply_data, ehdr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	genlmsg_cancel(skb, ehdr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_tsinfo_dump_one_netdev(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev,</div><div class='add'>+					struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	const struct ethtool_ops *ops = dev-&gt;ethtool_ops;</div><div class='add'>+	struct tsinfo_reply_data *reply_data;</div><div class='add'>+	struct tsinfo_req_info *req_info;</div><div class='add'>+	void *ehdr = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_ts_info)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	reply_data = ctx-&gt;reply_data;</div><div class='add'>+	req_info = ctx-&gt;req_info;</div><div class='add'>+	for (; ctx-&gt;pos_phcqualifier &lt; HWTSTAMP_PROVIDER_QUALIFIER_CNT;</div><div class='add'>+	     ctx-&gt;pos_phcqualifier++) {</div><div class='add'>+		if (!net_support_hwtstamp_qualifier(dev,</div><div class='add'>+						    ctx-&gt;pos_phcqualifier))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ehdr = ethnl_tsinfo_prepare_dump(skb, dev, reply_data, cb);</div><div class='add'>+		if (IS_ERR(ehdr)) {</div><div class='add'>+			ret = PTR_ERR(ehdr);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reply_data-&gt;ts_info.phc_qualifier = ctx-&gt;pos_phcqualifier;</div><div class='add'>+		ret = ops-&gt;get_ts_info(dev, &amp;reply_data-&gt;ts_info);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (reply_data-&gt;ts_info.phc_index &gt;= 0)</div><div class='add'>+			reply_data-&gt;ts_info.phc_source = HWTSTAMP_SOURCE_NETDEV;</div><div class='add'>+		ret = ethnl_tsinfo_end_dump(skb, dev, req_info, reply_data,</div><div class='add'>+					    ehdr);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	genlmsg_cancel(skb, ehdr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethnl_tsinfo_dump_one_net_topo(struct sk_buff *skb,</div><div class='add'>+					  struct net_device *dev,</div><div class='add'>+					  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct phy_device_node *pdn;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;netdev_dump_done) {</div><div class='add'>+		ret = ethnl_tsinfo_dump_one_netdev(skb, dev, cb);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+			return ret;</div><div class='add'>+		ctx-&gt;netdev_dump_done = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;link_topo) {</div><div class='add'>+		if (phy_has_tsinfo(dev-&gt;phydev)) {</div><div class='add'>+			ret = ethnl_tsinfo_dump_one_phydev(skb, dev,</div><div class='add'>+							   dev-&gt;phydev, cb);</div><div class='add'>+			if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xa_for_each_start(&amp;dev-&gt;link_topo-&gt;phys, ctx-&gt;pos_phyindex, pdn,</div><div class='add'>+			  ctx-&gt;pos_phyindex) {</div><div class='add'>+		if (phy_has_tsinfo(pdn-&gt;phy)) {</div><div class='add'>+			ret = ethnl_tsinfo_dump_one_phydev(skb, dev,</div><div class='add'>+							   pdn-&gt;phy, cb);</div><div class='add'>+			if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_tsinfo_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (ctx-&gt;req_info-&gt;base.dev) {</div><div class='add'>+		dev = ctx-&gt;req_info-&gt;base.dev;</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		ret = ethnl_tsinfo_dump_one_net_topo(skb, dev, cb);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+	} else {</div><div class='add'>+		for_each_netdev_dump(net, dev, ctx-&gt;pos_ifindex) {</div><div class='add'>+			netdev_lock_ops(dev);</div><div class='add'>+			ret = ethnl_tsinfo_dump_one_net_topo(skb, dev, cb);</div><div class='add'>+			netdev_unlock_ops(dev);</div><div class='add'>+			if (ret &lt; 0 &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+				break;</div><div class='add'>+			ctx-&gt;pos_phyindex = 0;</div><div class='add'>+			ctx-&gt;netdev_dump_done = false;</div><div class='add'>+			ctx-&gt;pos_phcqualifier = HWTSTAMP_PROVIDER_QUALIFIER_PRECISE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_tsinfo_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct nlattr **tb = info-&gt;info.attrs;</div><div class='add'>+	struct tsinfo_reply_data *reply_data;</div><div class='add'>+	struct tsinfo_req_info *req_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+</div><div class='add'>+	req_info = kzalloc(sizeof(*req_info), GFP_KERNEL);</div><div class='add'>+	if (!req_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	reply_data = kzalloc(sizeof(*reply_data), GFP_KERNEL);</div><div class='add'>+	if (!reply_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_req_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info-&gt;base,</div><div class='add'>+					 tb[ETHTOOL_A_TSINFO_HEADER],</div><div class='add'>+					 sock_net(cb-&gt;skb-&gt;sk), cb-&gt;extack,</div><div class='add'>+					 false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_reply_data;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;req_info = req_info;</div><div class='add'>+	ctx-&gt;reply_data = reply_data;</div><div class='add'>+	ctx-&gt;pos_ifindex = 0;</div><div class='add'>+	ctx-&gt;pos_phyindex = 0;</div><div class='add'>+	ctx-&gt;netdev_dump_done = false;</div><div class='add'>+	ctx-&gt;pos_phcqualifier = HWTSTAMP_PROVIDER_QUALIFIER_PRECISE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_reply_data:</div><div class='add'>+	kfree(reply_data);</div><div class='add'>+free_req_info:</div><div class='add'>+	kfree(req_info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_tsinfo_done(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tsinfo_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct tsinfo_req_info *req_info = ctx-&gt;req_info;</div><div class='add'>+</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info-&gt;base);</div><div class='add'>+	kfree(ctx-&gt;reply_data);</div><div class='add'>+	kfree(ctx-&gt;req_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_tsinfo_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_TSINFO_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_TSINFO_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_TSINFO_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct tsinfo_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct tsinfo_reply_data),</div><div class='add'>+</div><div class='add'>+	.parse_request		= tsinfo_parse_request,</div><div class='add'>+	.prepare_data		= tsinfo_prepare_data,</div><div class='add'>+	.reply_size		= tsinfo_reply_size,</div><div class='add'>+	.fill_reply		= tsinfo_fill_reply,</div><div class='add'>+};</div><div class='head'>diff --git a/net/ethtool/tunnels.c b/net/ethtool/tunnels.c<br/>new file mode 100644<br/>index 000000000000..b4ce47dd2aa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/tunnels.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/tunnels.c</a></div><div class='hunk'>@@ -0,0 +1,281 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bitset.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_tunnel_info_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_TUNNEL_INFO_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static_assert(ETHTOOL_UDP_TUNNEL_TYPE_VXLAN == ilog2(UDP_TUNNEL_TYPE_VXLAN));</div><div class='add'>+static_assert(ETHTOOL_UDP_TUNNEL_TYPE_GENEVE == ilog2(UDP_TUNNEL_TYPE_GENEVE));</div><div class='add'>+static_assert(ETHTOOL_UDP_TUNNEL_TYPE_VXLAN_GPE ==</div><div class='add'>+	      ilog2(UDP_TUNNEL_TYPE_VXLAN_GPE));</div><div class='add'>+</div><div class='add'>+static ssize_t ethnl_udp_table_reply_size(unsigned int types, bool compact)</div><div class='add'>+{</div><div class='add'>+	ssize_t size;</div><div class='add'>+</div><div class='add'>+	size = ethnl_bitset32_size(&amp;types, NULL, __ETHTOOL_UDP_TUNNEL_TYPE_CNT,</div><div class='add'>+				   udp_tunnel_type_names, compact);</div><div class='add'>+	if (size &lt; 0)</div><div class='add'>+		return size;</div><div class='add'>+</div><div class='add'>+	return size +</div><div class='add'>+		nla_total_size(0) + /* _UDP_TABLE */</div><div class='add'>+		nla_total_size(sizeof(u32)); /* _UDP_TABLE_SIZE */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+ethnl_tunnel_info_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct udp_tunnel_nic_info *info;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	info = req_base-&gt;dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	if (!info) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "device does not report tunnel offload info");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size =	nla_total_size(0); /* _INFO_UDP_PORTS */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; UDP_TUNNEL_NIC_MAX_TABLES; i++) {</div><div class='add'>+		if (!info-&gt;tables[i].n_entries)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = ethnl_udp_table_reply_size(info-&gt;tables[i].tunnel_types,</div><div class='add'>+						 compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		size += ret;</div><div class='add'>+</div><div class='add'>+		size += udp_tunnel_nic_dump_size(req_base-&gt;dev, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN) {</div><div class='add'>+		ret = ethnl_udp_table_reply_size(0, compact);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		size += ret;</div><div class='add'>+</div><div class='add'>+		size += nla_total_size(0) +		 /* _TABLE_ENTRY */</div><div class='add'>+			nla_total_size(sizeof(__be16)) + /* _ENTRY_PORT */</div><div class='add'>+			nla_total_size(sizeof(u32));	 /* _ENTRY_TYPE */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_tunnel_info_fill_reply(const struct ethnl_req_info *req_base,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct udp_tunnel_nic_info *info;</div><div class='add'>+	struct nlattr *ports, *table, *entry;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	info = req_base-&gt;dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ports = nla_nest_start(skb, ETHTOOL_A_TUNNEL_INFO_UDP_PORTS);</div><div class='add'>+	if (!ports)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; UDP_TUNNEL_NIC_MAX_TABLES; i++) {</div><div class='add'>+		if (!info-&gt;tables[i].n_entries)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		table = nla_nest_start(skb, ETHTOOL_A_TUNNEL_UDP_TABLE);</div><div class='add'>+		if (!table)</div><div class='add'>+			goto err_cancel_ports;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_SIZE,</div><div class='add'>+				info-&gt;tables[i].n_entries))</div><div class='add'>+			goto err_cancel_table;</div><div class='add'>+</div><div class='add'>+		if (ethnl_put_bitset32(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_TYPES,</div><div class='add'>+				       &amp;info-&gt;tables[i].tunnel_types, NULL,</div><div class='add'>+				       __ETHTOOL_UDP_TUNNEL_TYPE_CNT,</div><div class='add'>+				       udp_tunnel_type_names, compact))</div><div class='add'>+			goto err_cancel_table;</div><div class='add'>+</div><div class='add'>+		if (udp_tunnel_nic_dump_write(req_base-&gt;dev, i, skb))</div><div class='add'>+			goto err_cancel_table;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN) {</div><div class='add'>+		u32 zero = 0;</div><div class='add'>+</div><div class='add'>+		table = nla_nest_start(skb, ETHTOOL_A_TUNNEL_UDP_TABLE);</div><div class='add'>+		if (!table)</div><div class='add'>+			goto err_cancel_ports;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_SIZE, 1))</div><div class='add'>+			goto err_cancel_table;</div><div class='add'>+</div><div class='add'>+		if (ethnl_put_bitset32(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_TYPES,</div><div class='add'>+				       &amp;zero, NULL,</div><div class='add'>+				       __ETHTOOL_UDP_TUNNEL_TYPE_CNT,</div><div class='add'>+				       udp_tunnel_type_names, compact))</div><div class='add'>+			goto err_cancel_table;</div><div class='add'>+</div><div class='add'>+		entry = nla_nest_start(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_ENTRY);</div><div class='add'>+		if (!entry)</div><div class='add'>+			goto err_cancel_entry;</div><div class='add'>+</div><div class='add'>+		if (nla_put_be16(skb, ETHTOOL_A_TUNNEL_UDP_ENTRY_PORT,</div><div class='add'>+				 htons(IANA_VXLAN_UDP_PORT)) ||</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_TUNNEL_UDP_ENTRY_TYPE,</div><div class='add'>+				ilog2(UDP_TUNNEL_TYPE_VXLAN)))</div><div class='add'>+			goto err_cancel_entry;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, entry);</div><div class='add'>+		nla_nest_end(skb, table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, ports);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel_entry:</div><div class='add'>+	nla_nest_cancel(skb, entry);</div><div class='add'>+err_cancel_table:</div><div class='add'>+	nla_nest_cancel(skb, table);</div><div class='add'>+err_cancel_ports:</div><div class='add'>+	nla_nest_cancel(skb, ports);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_req_info req_info = {};</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	struct sk_buff *rskb;</div><div class='add'>+	void *reply_payload;</div><div class='add'>+	int reply_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_TUNNEL_INFO_HEADER],</div><div class='add'>+					 genl_info_net(info), info-&gt;extack,</div><div class='add'>+					 true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ret = ethnl_tunnel_info_reply_size(&amp;req_info, info-&gt;extack);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_unlock_rtnl;</div><div class='add'>+	reply_len = ret + ethnl_reply_header_size();</div><div class='add'>+</div><div class='add'>+	rskb = ethnl_reply_init(reply_len, req_info.dev,</div><div class='add'>+				ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY,</div><div class='add'>+				ETHTOOL_A_TUNNEL_INFO_HEADER,</div><div class='add'>+				info, &amp;reply_payload);</div><div class='add'>+	if (!rskb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_unlock_rtnl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethnl_tunnel_info_fill_reply(&amp;req_info, rskb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	genlmsg_end(rskb, reply_payload);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(rskb, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(rskb);</div><div class='add'>+err_unlock_rtnl:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	ethnl_parse_header_dev_put(&amp;req_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethnl_tunnel_info_dump_ctx {</div><div class='add'>+	struct ethnl_req_info	req_info;</div><div class='add'>+	unsigned long		ifindex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ethnl_tunnel_info_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct ethnl_tunnel_info_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct nlattr **tb = info-&gt;info.attrs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+</div><div class='add'>+	memset(ctx, 0, sizeof(*ctx));</div><div class='add'>+</div><div class='add'>+	ret = ethnl_parse_header_dev_get(&amp;ctx-&gt;req_info,</div><div class='add'>+					 tb[ETHTOOL_A_TUNNEL_INFO_HEADER],</div><div class='add'>+					 sock_net(cb-&gt;skb-&gt;sk), cb-&gt;extack,</div><div class='add'>+					 false);</div><div class='add'>+	if (ctx-&gt;req_info.dev) {</div><div class='add'>+		ethnl_parse_header_dev_put(&amp;ctx-&gt;req_info);</div><div class='add'>+		ctx-&gt;req_info.dev = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ethnl_tunnel_info_dump_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void *ehdr;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		ehdr = ethnl_dump_put(skb, cb,</div><div class='add'>+				      ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY);</div><div class='add'>+		if (!ehdr) {</div><div class='add'>+			ret = -EMSGSIZE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ethnl_fill_reply_header(skb, dev,</div><div class='add'>+					      ETHTOOL_A_TUNNEL_INFO_HEADER);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			genlmsg_cancel(skb, ehdr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx-&gt;req_info.dev = dev;</div><div class='add'>+		ret = ethnl_tunnel_info_fill_reply(&amp;ctx-&gt;req_info, skb);</div><div class='add'>+		ctx-&gt;req_info.dev = NULL;</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			genlmsg_cancel(skb, ehdr);</div><div class='add'>+			if (ret == -EOPNOTSUPP)</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		genlmsg_end(skb, ehdr);</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	if (ret == -EMSGSIZE &amp;&amp; skb-&gt;len)</div><div class='add'>+		return skb-&gt;len;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ethtool/wol.c b/net/ethtool/wol.c<br/>new file mode 100644<br/>index 000000000000..a39d8000d808<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ethtool/wol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ethtool/wol.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "bitset.h"</div><div class='add'>+</div><div class='add'>+struct wol_req_info {</div><div class='add'>+	struct ethnl_req_info		base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wol_reply_data {</div><div class='add'>+	struct ethnl_reply_data		base;</div><div class='add'>+	struct ethtool_wolinfo		wol;</div><div class='add'>+	bool				show_sopass;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WOL_REPDATA(__reply_base) \</div><div class='add'>+	container_of(__reply_base, struct wol_reply_data, base)</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_wol_get_policy[] = {</div><div class='add'>+	[ETHTOOL_A_WOL_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wol_prepare_data(const struct ethnl_req_info *req_base,</div><div class='add'>+			    struct ethnl_reply_data *reply_base,</div><div class='add'>+			    const struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct wol_reply_data *data = WOL_REPDATA(reply_base);</div><div class='add'>+	struct net_device *dev = reply_base-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;ethtool_ops-&gt;get_wol)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_ops_begin(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_wol(dev, &amp;data-&gt;wol);</div><div class='add'>+	ethnl_ops_complete(dev);</div><div class='add'>+	/* do not include password in notifications */</div><div class='add'>+	data-&gt;show_sopass = !genl_info_is_ntf(info) &amp;&amp;</div><div class='add'>+		(data-&gt;wol.supported &amp; WAKE_MAGICSECURE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wol_reply_size(const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct wol_reply_data *data = WOL_REPDATA(reply_base);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = ethnl_bitset32_size(&amp;data-&gt;wol.wolopts, &amp;data-&gt;wol.supported,</div><div class='add'>+				  WOL_MODE_COUNT, wol_mode_names, compact);</div><div class='add'>+	if (len &lt; 0)</div><div class='add'>+		return len;</div><div class='add'>+	if (data-&gt;show_sopass)</div><div class='add'>+		len += nla_total_size(sizeof(data-&gt;wol.sopass));</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wol_fill_reply(struct sk_buff *skb,</div><div class='add'>+			  const struct ethnl_req_info *req_base,</div><div class='add'>+			  const struct ethnl_reply_data *reply_base)</div><div class='add'>+{</div><div class='add'>+	bool compact = req_base-&gt;flags &amp; ETHTOOL_FLAG_COMPACT_BITSETS;</div><div class='add'>+	const struct wol_reply_data *data = WOL_REPDATA(reply_base);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ethnl_put_bitset32(skb, ETHTOOL_A_WOL_MODES, &amp;data-&gt;wol.wolopts,</div><div class='add'>+				 &amp;data-&gt;wol.supported, WOL_MODE_COUNT,</div><div class='add'>+				 wol_mode_names, compact);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (data-&gt;show_sopass &amp;&amp;</div><div class='add'>+	    nla_put(skb, ETHTOOL_A_WOL_SOPASS, sizeof(data-&gt;wol.sopass),</div><div class='add'>+		    data-&gt;wol.sopass))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* WOL_SET */</div><div class='add'>+</div><div class='add'>+const struct nla_policy ethnl_wol_set_policy[] = {</div><div class='add'>+	[ETHTOOL_A_WOL_HEADER]		=</div><div class='add'>+		NLA_POLICY_NESTED(ethnl_header_policy),</div><div class='add'>+	[ETHTOOL_A_WOL_MODES]		= { .type = NLA_NESTED },</div><div class='add'>+	[ETHTOOL_A_WOL_SOPASS]		= { .type = NLA_BINARY,</div><div class='add'>+					    .len = SOPASS_MAX },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_wol_validate(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct ethtool_ops *ops = req_info-&gt;dev-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;get_wol &amp;&amp; ops-&gt;set_wol ? 1 : -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ethnl_set_wol(struct ethnl_req_info *req_info, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };</div><div class='add'>+	struct net_device *dev = req_info-&gt;dev;</div><div class='add'>+	struct nlattr **tb = info-&gt;attrs;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ethtool_ops-&gt;get_wol(dev, &amp;wol);</div><div class='add'>+	ret = ethnl_update_bitset32(&amp;wol.wolopts, WOL_MODE_COUNT,</div><div class='add'>+				    tb[ETHTOOL_A_WOL_MODES], wol_mode_names,</div><div class='add'>+				    info-&gt;extack, &amp;mod);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (wol.wolopts &amp; ~wol.supported) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(info-&gt;extack, tb[ETHTOOL_A_WOL_MODES],</div><div class='add'>+				    "cannot enable unsupported WoL mode");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tb[ETHTOOL_A_WOL_SOPASS]) {</div><div class='add'>+		if (!(wol.supported &amp; WAKE_MAGICSECURE)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(info-&gt;extack,</div><div class='add'>+					    tb[ETHTOOL_A_WOL_SOPASS],</div><div class='add'>+					    "magicsecure not supported, cannot set password");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ethnl_update_binary(wol.sopass, sizeof(wol.sopass),</div><div class='add'>+				    tb[ETHTOOL_A_WOL_SOPASS], &amp;mod);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mod)</div><div class='add'>+		return 0;</div><div class='add'>+	ret = dev-&gt;ethtool_ops-&gt;set_wol(dev, &amp;wol);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	dev-&gt;ethtool-&gt;wol_enabled = !!wol.wolopts;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethnl_request_ops ethnl_wol_request_ops = {</div><div class='add'>+	.request_cmd		= ETHTOOL_MSG_WOL_GET,</div><div class='add'>+	.reply_cmd		= ETHTOOL_MSG_WOL_GET_REPLY,</div><div class='add'>+	.hdr_attr		= ETHTOOL_A_WOL_HEADER,</div><div class='add'>+	.req_info_size		= sizeof(struct wol_req_info),</div><div class='add'>+	.reply_data_size	= sizeof(struct wol_reply_data),</div><div class='add'>+</div><div class='add'>+	.prepare_data		= wol_prepare_data,</div><div class='add'>+	.reply_size		= wol_reply_size,</div><div class='add'>+	.fill_reply		= wol_fill_reply,</div><div class='add'>+</div><div class='add'>+	.set_validate		= ethnl_set_wol_validate,</div><div class='add'>+	.set			= ethnl_set_wol,</div><div class='add'>+	.set_ntf_cmd		= ETHTOOL_MSG_WOL_NTF,</div><div class='add'>+};</div><div class='head'>diff --git a/net/handshake/.kunitconfig b/net/handshake/.kunitconfig<br/>new file mode 100644<br/>index 000000000000..5c48cf4abca2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/.kunitconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/.kunitconfig</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+CONFIG_KUNIT=y</div><div class='add'>+CONFIG_UBSAN=y</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_MULTIUSER=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_NET_HANDSHAKE=y</div><div class='add'>+CONFIG_NET_HANDSHAKE_KUNIT_TEST=y</div><div class='head'>diff --git a/net/handshake/Makefile b/net/handshake/Makefile<br/>new file mode 100644<br/>index 000000000000..ef4d9a2112bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# Makefile for the Generic HANDSHAKE service</div><div class='add'>+#</div><div class='add'>+# Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-y += handshake.o</div><div class='add'>+handshake-y := alert.o genl.o netlink.o request.o tlshd.o trace.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NET_HANDSHAKE_KUNIT_TEST) += handshake-test.o</div><div class='head'>diff --git a/net/handshake/alert.c b/net/handshake/alert.c<br/>new file mode 100644<br/>index 000000000000..329d91984683<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/alert.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/alert.c</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Handle the TLS Alert protocol</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/handshake.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#include &lt;net/tls_prot.h&gt;</div><div class='add'>+</div><div class='add'>+#include "handshake.h"</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/handshake.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_alert_send - send a TLS Alert on a kTLS socket</div><div class='add'>+ * @sock: open kTLS socket to send on</div><div class='add'>+ * @level: TLS Alert level</div><div class='add'>+ * @description: TLS Alert description</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int tls_alert_send(struct socket *sock, u8 level, u8 description)</div><div class='add'>+{</div><div class='add'>+	u8 record_type = TLS_RECORD_TYPE_ALERT;</div><div class='add'>+	u8 buf[CMSG_SPACE(sizeof(record_type))];</div><div class='add'>+	struct msghdr msg = { 0 };</div><div class='add'>+	struct cmsghdr *cmsg;</div><div class='add'>+	struct kvec iov;</div><div class='add'>+	u8 alert[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trace_tls_alert_send(sock-&gt;sk, level, description);</div><div class='add'>+</div><div class='add'>+	alert[0] = level;</div><div class='add'>+	alert[1] = description;</div><div class='add'>+	iov.iov_base = alert;</div><div class='add'>+	iov.iov_len = sizeof(alert);</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	msg.msg_control = buf;</div><div class='add'>+	msg.msg_controllen = sizeof(buf);</div><div class='add'>+	msg.msg_flags = MSG_DONTWAIT;</div><div class='add'>+</div><div class='add'>+	cmsg = CMSG_FIRSTHDR(&amp;msg);</div><div class='add'>+	cmsg-&gt;cmsg_level = SOL_TLS;</div><div class='add'>+	cmsg-&gt;cmsg_type = TLS_SET_RECORD_TYPE;</div><div class='add'>+	cmsg-&gt;cmsg_len = CMSG_LEN(sizeof(record_type));</div><div class='add'>+	memcpy(CMSG_DATA(cmsg), &amp;record_type, sizeof(record_type));</div><div class='add'>+</div><div class='add'>+	iov_iter_kvec(&amp;msg.msg_iter, ITER_SOURCE, &amp;iov, 1, iov.iov_len);</div><div class='add'>+	ret = sock_sendmsg(sock, &amp;msg);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_get_record_type - Look for TLS RECORD_TYPE information</div><div class='add'>+ * @sk: socket (for IP address information)</div><div class='add'>+ * @cmsg: incoming message to be parsed</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a TLS_RECORD_TYPE value.</div><div class='add'>+ */</div><div class='add'>+u8 tls_get_record_type(const struct sock *sk, const struct cmsghdr *cmsg)</div><div class='add'>+{</div><div class='add'>+	u8 record_type;</div><div class='add'>+</div><div class='add'>+	if (cmsg-&gt;cmsg_level != SOL_TLS)</div><div class='add'>+		return 0;</div><div class='add'>+	if (cmsg-&gt;cmsg_type != TLS_GET_RECORD_TYPE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	record_type = *((u8 *)CMSG_DATA(cmsg));</div><div class='add'>+	trace_tls_contenttype(sk, record_type);</div><div class='add'>+	return record_type;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_get_record_type);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_alert_recv - Parse TLS Alert messages</div><div class='add'>+ * @sk: socket (for IP address information)</div><div class='add'>+ * @msg: incoming message to be parsed</div><div class='add'>+ * @level: OUT - TLS AlertLevel value</div><div class='add'>+ * @description: OUT - TLS AlertDescription value</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void tls_alert_recv(const struct sock *sk, const struct msghdr *msg,</div><div class='add'>+		    u8 *level, u8 *description)</div><div class='add'>+{</div><div class='add'>+	const struct kvec *iov;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	iov = msg-&gt;msg_iter.kvec;</div><div class='add'>+	data = iov-&gt;iov_base;</div><div class='add'>+	*level = data[0];</div><div class='add'>+	*description = data[1];</div><div class='add'>+</div><div class='add'>+	trace_tls_alert_recv(sk, *level, *description);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_alert_recv);</div><div class='head'>diff --git a/net/handshake/genl.c b/net/handshake/genl.c<br/>new file mode 100644<br/>index 000000000000..870612609491<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/genl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/genl.c</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/handshake.yaml */</div><div class='add'>+/* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "genl.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+</div><div class='add'>+/* HANDSHAKE_CMD_ACCEPT - do */</div><div class='add'>+static const struct nla_policy handshake_accept_nl_policy[HANDSHAKE_A_ACCEPT_HANDLER_CLASS + 1] = {</div><div class='add'>+	[HANDSHAKE_A_ACCEPT_HANDLER_CLASS] = NLA_POLICY_MAX(NLA_U32, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HANDSHAKE_CMD_DONE - do */</div><div class='add'>+static const struct nla_policy handshake_done_nl_policy[HANDSHAKE_A_DONE_REMOTE_AUTH + 1] = {</div><div class='add'>+	[HANDSHAKE_A_DONE_STATUS] = { .type = NLA_U32, },</div><div class='add'>+	[HANDSHAKE_A_DONE_SOCKFD] = { .type = NLA_S32, },</div><div class='add'>+	[HANDSHAKE_A_DONE_REMOTE_AUTH] = { .type = NLA_U32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ops table for handshake */</div><div class='add'>+static const struct genl_split_ops handshake_nl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd		= HANDSHAKE_CMD_ACCEPT,</div><div class='add'>+		.doit		= handshake_nl_accept_doit,</div><div class='add'>+		.policy		= handshake_accept_nl_policy,</div><div class='add'>+		.maxattr	= HANDSHAKE_A_ACCEPT_HANDLER_CLASS,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= HANDSHAKE_CMD_DONE,</div><div class='add'>+		.doit		= handshake_nl_done_doit,</div><div class='add'>+		.policy		= handshake_done_nl_policy,</div><div class='add'>+		.maxattr	= HANDSHAKE_A_DONE_REMOTE_AUTH,</div><div class='add'>+		.flags		= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct genl_multicast_group handshake_nl_mcgrps[] = {</div><div class='add'>+	[HANDSHAKE_NLGRP_NONE] = { "none", },</div><div class='add'>+	[HANDSHAKE_NLGRP_TLSHD] = { "tlshd", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct genl_family handshake_nl_family __ro_after_init = {</div><div class='add'>+	.name		= HANDSHAKE_FAMILY_NAME,</div><div class='add'>+	.version	= HANDSHAKE_FAMILY_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='add'>+	.split_ops	= handshake_nl_ops,</div><div class='add'>+	.n_split_ops	= ARRAY_SIZE(handshake_nl_ops),</div><div class='add'>+	.mcgrps		= handshake_nl_mcgrps,</div><div class='add'>+	.n_mcgrps	= ARRAY_SIZE(handshake_nl_mcgrps),</div><div class='add'>+};</div><div class='head'>diff --git a/net/handshake/genl.h b/net/handshake/genl.h<br/>new file mode 100644<br/>index 000000000000..8d3e18672daf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/genl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/genl.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/handshake.yaml */</div><div class='add'>+/* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_HANDSHAKE_GEN_H</div><div class='add'>+#define _LINUX_HANDSHAKE_GEN_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+</div><div class='add'>+int handshake_nl_accept_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int handshake_nl_done_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	HANDSHAKE_NLGRP_NONE,</div><div class='add'>+	HANDSHAKE_NLGRP_TLSHD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct genl_family handshake_nl_family;</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_HANDSHAKE_GEN_H */</div><div class='head'>diff --git a/net/handshake/handshake-test.c b/net/handshake/handshake-test.c<br/>new file mode 100644<br/>index 000000000000..55442b2f518a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/handshake-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/handshake-test.c</a></div><div class='hunk'>@@ -0,0 +1,540 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Oracle and/or its affiliates.</div><div class='add'>+ *</div><div class='add'>+ * KUnit test of the handshake upcall mechanism.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+#include "handshake.h"</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='add'>+</div><div class='add'>+static int test_accept_func(struct handshake_req *req, struct genl_info *info,</div><div class='add'>+			    int fd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_done_func(struct handshake_req *req, unsigned int status,</div><div class='add'>+			   struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct handshake_req_alloc_test_param {</div><div class='add'>+	const char			*desc;</div><div class='add'>+	struct handshake_proto		*proto;</div><div class='add'>+	gfp_t				gfp;</div><div class='add'>+	bool				expect_success;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_2 = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_3 = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_4 = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_5 = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+	.hp_accept		= test_accept_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_6 = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+	.hp_privsize		= UINT_MAX,</div><div class='add'>+	.hp_accept		= test_accept_func,</div><div class='add'>+	.hp_done		= test_done_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_good = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+	.hp_accept		= test_accept_func,</div><div class='add'>+	.hp_done		= test_done_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const</div><div class='add'>+struct handshake_req_alloc_test_param handshake_req_alloc_params[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc NULL proto",</div><div class='add'>+		.proto			= NULL,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc CLASS_NONE",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_2,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc CLASS_MAX",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_3,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc no callbacks",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_4,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc no done callback",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_5,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc excessive privsize",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_6,</div><div class='add'>+		.gfp			= GFP_KERNEL | __GFP_NOWARN,</div><div class='add'>+		.expect_success		= false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc			= "handshake_req_alloc all good",</div><div class='add'>+		.proto			= &amp;handshake_req_alloc_proto_good,</div><div class='add'>+		.gfp			= GFP_KERNEL,</div><div class='add'>+		.expect_success		= true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+handshake_req_alloc_get_desc(const struct handshake_req_alloc_test_param *param,</div><div class='add'>+			     char *desc)</div><div class='add'>+{</div><div class='add'>+	strscpy(desc, param-&gt;desc, KUNIT_PARAM_DESC_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Creates the function handshake_req_alloc_gen_params */</div><div class='add'>+KUNIT_ARRAY_PARAM(handshake_req_alloc, handshake_req_alloc_params,</div><div class='add'>+		  handshake_req_alloc_get_desc);</div><div class='add'>+</div><div class='add'>+static void handshake_req_alloc_case(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct handshake_req_alloc_test_param *param = test-&gt;param_value;</div><div class='add'>+	struct handshake_req *result;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_alloc(param-&gt;proto, param-&gt;gfp);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	if (param-&gt;expect_success)</div><div class='add'>+		KUNIT_EXPECT_NOT_NULL(test, result);</div><div class='add'>+	else</div><div class='add'>+		KUNIT_EXPECT_NULL(test, result);</div><div class='add'>+</div><div class='add'>+	kfree(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test1(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int err, result;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_submit(sock, NULL, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, result, -EINVAL);</div><div class='add'>+</div><div class='add'>+	sock_release(sock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test2(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_submit(NULL, req, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, result, -EINVAL);</div><div class='add'>+</div><div class='add'>+	/* handshake_req_submit() destroys @req on error */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test3(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int err, result;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+	sock-&gt;file = NULL;</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, result, -EINVAL);</div><div class='add'>+</div><div class='add'>+	/* handshake_req_submit() destroys @req on error */</div><div class='add'>+	sock_release(sock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test4(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req, *result;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, sock-&gt;sk);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_hash_lookup(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_NOT_NULL(test, result);</div><div class='add'>+	KUNIT_EXPECT_PTR_EQ(test, req, result);</div><div class='add'>+</div><div class='add'>+	handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+	fput(filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test5(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct handshake_net *hn;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int saved, err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, sock-&gt;sk);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	net = sock_net(sock-&gt;sk);</div><div class='add'>+	hn = handshake_pernet(net);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, hn);</div><div class='add'>+</div><div class='add'>+	saved = hn-&gt;hn_pending;</div><div class='add'>+	hn-&gt;hn_pending = hn-&gt;hn_pending_max + 1;</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, err, -EAGAIN);</div><div class='add'>+</div><div class='add'>+	fput(filp);</div><div class='add'>+	hn-&gt;hn_pending = saved;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_submit_test6(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req1, *req2;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req1 = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req1);</div><div class='add'>+	req2 = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req2);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, sock-&gt;sk);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	err = handshake_req_submit(sock, req1, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+	err = handshake_req_submit(sock, req2, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, err, -EBUSY);</div><div class='add'>+</div><div class='add'>+	handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+	fput(filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_cancel_test1(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	bool result;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	/* NB: handshake_req hasn't been accepted */</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_TRUE(test, result);</div><div class='add'>+</div><div class='add'>+	fput(filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_cancel_test2(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req, *next;</div><div class='add'>+	struct handshake_net *hn;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct net *net;</div><div class='add'>+	bool result;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	net = sock_net(sock-&gt;sk);</div><div class='add'>+	hn = handshake_pernet(net);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, hn);</div><div class='add'>+</div><div class='add'>+	/* Pretend to accept this request */</div><div class='add'>+	next = handshake_req_next(hn, HANDSHAKE_HANDLER_CLASS_TLSHD);</div><div class='add'>+	KUNIT_ASSERT_PTR_EQ(test, req, next);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_TRUE(test, result);</div><div class='add'>+</div><div class='add'>+	fput(filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_cancel_test3(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req, *next;</div><div class='add'>+	struct handshake_net *hn;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct net *net;</div><div class='add'>+	bool result;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_good, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	net = sock_net(sock-&gt;sk);</div><div class='add'>+	hn = handshake_pernet(net);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, hn);</div><div class='add'>+</div><div class='add'>+	/* Pretend to accept this request */</div><div class='add'>+	next = handshake_req_next(hn, HANDSHAKE_HANDLER_CLASS_TLSHD);</div><div class='add'>+	KUNIT_ASSERT_PTR_EQ(test, req, next);</div><div class='add'>+</div><div class='add'>+	/* Pretend to complete this request */</div><div class='add'>+	handshake_complete(next, -ETIMEDOUT, NULL);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	result = handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_FALSE(test, result);</div><div class='add'>+</div><div class='add'>+	fput(filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct handshake_req *handshake_req_destroy_test;</div><div class='add'>+</div><div class='add'>+static void test_destroy_func(struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	handshake_req_destroy_test = req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct handshake_proto handshake_req_alloc_proto_destroy = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+	.hp_accept		= test_accept_func,</div><div class='add'>+	.hp_done		= test_done_func,</div><div class='add'>+	.hp_destroy		= test_destroy_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void handshake_req_destroy_test1(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Arrange */</div><div class='add'>+	handshake_req_destroy_test = NULL;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;handshake_req_alloc_proto_destroy, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, req);</div><div class='add'>+</div><div class='add'>+	err = __sock_create(&amp;init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP,</div><div class='add'>+			    &amp;sock, 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	filp = sock_alloc_file(sock, O_NONBLOCK, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, filp);</div><div class='add'>+	sock-&gt;file = filp;</div><div class='add'>+</div><div class='add'>+	err = handshake_req_submit(sock, req, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, err, 0);</div><div class='add'>+</div><div class='add'>+	handshake_req_cancel(sock-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/* Act */</div><div class='add'>+	/* Ensure the close/release/put process has run to</div><div class='add'>+	 * completion before checking the result.</div><div class='add'>+	 */</div><div class='add'>+	__fput_sync(filp);</div><div class='add'>+</div><div class='add'>+	/* Assert */</div><div class='add'>+	KUNIT_EXPECT_PTR_EQ(test, handshake_req_destroy_test, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case handshake_api_test_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_alloc API fuzzing",</div><div class='add'>+		.run_case		= handshake_req_alloc_case,</div><div class='add'>+		.generate_params	= handshake_req_alloc_gen_params,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_submit NULL req arg",</div><div class='add'>+		.run_case		= handshake_req_submit_test1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_submit NULL sock arg",</div><div class='add'>+		.run_case		= handshake_req_submit_test2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_submit NULL sock-&gt;file",</div><div class='add'>+		.run_case		= handshake_req_submit_test3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_lookup works",</div><div class='add'>+		.run_case		= handshake_req_submit_test4,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_submit max pending",</div><div class='add'>+		.run_case		= handshake_req_submit_test5,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_submit multiple",</div><div class='add'>+		.run_case		= handshake_req_submit_test6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_cancel before accept",</div><div class='add'>+		.run_case		= handshake_req_cancel_test1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_cancel after accept",</div><div class='add'>+		.run_case		= handshake_req_cancel_test2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_cancel after done",</div><div class='add'>+		.run_case		= handshake_req_cancel_test3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "req_destroy works",</div><div class='add'>+		.run_case		= handshake_req_destroy_test1,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite handshake_api_suite = {</div><div class='add'>+       .name                   = "Handshake API tests",</div><div class='add'>+       .test_cases             = handshake_api_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suites(&amp;handshake_api_suite);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Test handshake upcall API functions");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/handshake/handshake.h b/net/handshake/handshake.h<br/>new file mode 100644<br/>index 000000000000..a48163765a7a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/handshake.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/handshake.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Generic netlink handshake service</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INTERNAL_HANDSHAKE_H</div><div class='add'>+#define _INTERNAL_HANDSHAKE_H</div><div class='add'>+</div><div class='add'>+/* Per-net namespace context */</div><div class='add'>+struct handshake_net {</div><div class='add'>+	spinlock_t		hn_lock;	/* protects next 3 fields */</div><div class='add'>+	int			hn_pending;</div><div class='add'>+	int			hn_pending_max;</div><div class='add'>+	struct list_head	hn_requests;</div><div class='add'>+</div><div class='add'>+	unsigned long		hn_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hn_flags_bits {</div><div class='add'>+	HANDSHAKE_F_NET_DRAINING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct handshake_proto;</div><div class='add'>+</div><div class='add'>+/* One handshake request */</div><div class='add'>+struct handshake_req {</div><div class='add'>+	struct list_head		hr_list;</div><div class='add'>+	struct rhash_head		hr_rhash;</div><div class='add'>+	unsigned long			hr_flags;</div><div class='add'>+	const struct handshake_proto	*hr_proto;</div><div class='add'>+	struct sock			*hr_sk;</div><div class='add'>+	void				(*hr_odestruct)(struct sock *sk);</div><div class='add'>+</div><div class='add'>+	/* Always the last field */</div><div class='add'>+	char				hr_priv[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hr_flags_bits {</div><div class='add'>+	HANDSHAKE_F_REQ_COMPLETED,</div><div class='add'>+	HANDSHAKE_F_REQ_SESSION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct genl_info;</div><div class='add'>+</div><div class='add'>+/* Invariants for all handshake requests for one transport layer</div><div class='add'>+ * security protocol</div><div class='add'>+ */</div><div class='add'>+struct handshake_proto {</div><div class='add'>+	int			hp_handler_class;</div><div class='add'>+	size_t			hp_privsize;</div><div class='add'>+	unsigned long		hp_flags;</div><div class='add'>+</div><div class='add'>+	int			(*hp_accept)(struct handshake_req *req,</div><div class='add'>+					     struct genl_info *info, int fd);</div><div class='add'>+	void			(*hp_done)(struct handshake_req *req,</div><div class='add'>+					   unsigned int status,</div><div class='add'>+					   struct genl_info *info);</div><div class='add'>+	void			(*hp_destroy)(struct handshake_req *req);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hp_flags_bits {</div><div class='add'>+	HANDSHAKE_F_PROTO_NOTIFY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* alert.c */</div><div class='add'>+int tls_alert_send(struct socket *sock, u8 level, u8 description);</div><div class='add'>+</div><div class='add'>+/* netlink.c */</div><div class='add'>+int handshake_genl_notify(struct net *net, const struct handshake_proto *proto,</div><div class='add'>+			  gfp_t flags);</div><div class='add'>+struct nlmsghdr *handshake_genl_put(struct sk_buff *msg,</div><div class='add'>+				    struct genl_info *info);</div><div class='add'>+struct handshake_net *handshake_pernet(struct net *net);</div><div class='add'>+</div><div class='add'>+/* request.c */</div><div class='add'>+struct handshake_req *handshake_req_alloc(const struct handshake_proto *proto,</div><div class='add'>+					  gfp_t flags);</div><div class='add'>+int handshake_req_hash_init(void);</div><div class='add'>+void handshake_req_hash_destroy(void);</div><div class='add'>+void *handshake_req_private(struct handshake_req *req);</div><div class='add'>+struct handshake_req *handshake_req_hash_lookup(struct sock *sk);</div><div class='add'>+struct handshake_req *handshake_req_next(struct handshake_net *hn, int class);</div><div class='add'>+int handshake_req_submit(struct socket *sock, struct handshake_req *req,</div><div class='add'>+			 gfp_t flags);</div><div class='add'>+void handshake_complete(struct handshake_req *req, unsigned int status,</div><div class='add'>+			struct genl_info *info);</div><div class='add'>+bool handshake_req_cancel(struct sock *sk);</div><div class='add'>+</div><div class='add'>+#endif /* _INTERNAL_HANDSHAKE_H */</div><div class='head'>diff --git a/net/handshake/netlink.c b/net/handshake/netlink.c<br/>new file mode 100644<br/>index 000000000000..1d33a4675a48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,289 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Generic netlink handshake service</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+#include "handshake.h"</div><div class='add'>+#include "genl.h"</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/handshake.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_genl_notify - Notify handlers that a request is waiting</div><div class='add'>+ * @net: target network namespace</div><div class='add'>+ * @proto: handshake protocol</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success or a negative errno if notification failed.</div><div class='add'>+ */</div><div class='add'>+int handshake_genl_notify(struct net *net, const struct handshake_proto *proto,</div><div class='add'>+			  gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	/* Disable notifications during unit testing */</div><div class='add'>+	if (!test_bit(HANDSHAKE_F_PROTO_NOTIFY, &amp;proto-&gt;hp_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!genl_has_listeners(&amp;handshake_nl_family, net,</div><div class='add'>+				proto-&gt;hp_handler_class))</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	msg = genlmsg_new(GENLMSG_DEFAULT_SIZE, flags);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, 0, 0, &amp;handshake_nl_family, 0,</div><div class='add'>+			  HANDSHAKE_CMD_READY);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, HANDSHAKE_A_ACCEPT_HANDLER_CLASS,</div><div class='add'>+			proto-&gt;hp_handler_class) &lt; 0) {</div><div class='add'>+		genlmsg_cancel(msg, hdr);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return genlmsg_multicast_netns(&amp;handshake_nl_family, net, msg,</div><div class='add'>+				       0, proto-&gt;hp_handler_class, flags);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_genl_put - Create a generic netlink message header</div><div class='add'>+ * @msg: buffer in which to create the header</div><div class='add'>+ * @info: generic netlink message context</div><div class='add'>+ *</div><div class='add'>+ * Returns a ready-to-use header, or NULL.</div><div class='add'>+ */</div><div class='add'>+struct nlmsghdr *handshake_genl_put(struct sk_buff *msg,</div><div class='add'>+				    struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	return genlmsg_put(msg, info-&gt;snd_portid, info-&gt;snd_seq,</div><div class='add'>+			   &amp;handshake_nl_family, 0, info-&gt;genlhdr-&gt;cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(handshake_genl_put);</div><div class='add'>+</div><div class='add'>+int handshake_nl_accept_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct handshake_net *hn = handshake_pernet(net);</div><div class='add'>+	struct handshake_req *req = NULL;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int class, err;</div><div class='add'>+</div><div class='add'>+	err = -EOPNOTSUPP;</div><div class='add'>+	if (!hn)</div><div class='add'>+		goto out_status;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, HANDSHAKE_A_ACCEPT_HANDLER_CLASS))</div><div class='add'>+		goto out_status;</div><div class='add'>+	class = nla_get_u32(info-&gt;attrs[HANDSHAKE_A_ACCEPT_HANDLER_CLASS]);</div><div class='add'>+</div><div class='add'>+	err = -EAGAIN;</div><div class='add'>+	req = handshake_req_next(hn, class);</div><div class='add'>+	if (req) {</div><div class='add'>+		sock = req-&gt;hr_sk-&gt;sk_socket;</div><div class='add'>+</div><div class='add'>+		FD_PREPARE(fdf, O_CLOEXEC, sock-&gt;file);</div><div class='add'>+		if (fdf.err) {</div><div class='add'>+			err = fdf.err;</div><div class='add'>+			goto out_complete;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		get_file(sock-&gt;file); /* FD_PREPARE() consumes a reference. */</div><div class='add'>+		err = req-&gt;hr_proto-&gt;hp_accept(req, info, fd_prepare_fd(fdf));</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_complete; /* Automatic cleanup handles fput */</div><div class='add'>+</div><div class='add'>+		trace_handshake_cmd_accept(net, req, req-&gt;hr_sk, fd_prepare_fd(fdf));</div><div class='add'>+		fd_publish(fdf);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_complete:</div><div class='add'>+	handshake_complete(req, -EIO, NULL);</div><div class='add'>+out_status:</div><div class='add'>+	trace_handshake_cmd_accept_err(net, req, NULL, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int handshake_nl_done_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int fd, status, err;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, HANDSHAKE_A_DONE_SOCKFD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	fd = nla_get_s32(info-&gt;attrs[HANDSHAKE_A_DONE_SOCKFD]);</div><div class='add'>+</div><div class='add'>+	sock = sockfd_lookup(fd, &amp;err);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_hash_lookup(sock-&gt;sk);</div><div class='add'>+	if (!req) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		trace_handshake_cmd_done_err(net, req, sock-&gt;sk, err);</div><div class='add'>+		sockfd_put(sock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_handshake_cmd_done(net, req, sock-&gt;sk, fd);</div><div class='add'>+</div><div class='add'>+	status = -EIO;</div><div class='add'>+	if (info-&gt;attrs[HANDSHAKE_A_DONE_STATUS])</div><div class='add'>+		status = nla_get_u32(info-&gt;attrs[HANDSHAKE_A_DONE_STATUS]);</div><div class='add'>+</div><div class='add'>+	handshake_complete(req, status, info);</div><div class='add'>+	sockfd_put(sock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int handshake_net_id;</div><div class='add'>+</div><div class='add'>+static int __net_init handshake_net_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct handshake_net *hn = net_generic(net, handshake_net_id);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	struct sysinfo si;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Arbitrary limit to prevent handshakes that do not make</div><div class='add'>+	 * progress from clogging up the system. The cap scales up</div><div class='add'>+	 * with the amount of physical memory on the system.</div><div class='add'>+	 */</div><div class='add'>+	si_meminfo(&amp;si);</div><div class='add'>+	tmp = si.totalram / (25 * si.mem_unit);</div><div class='add'>+	hn-&gt;hn_pending_max = clamp(tmp, 3UL, 50UL);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;hn-&gt;hn_lock);</div><div class='add'>+	hn-&gt;hn_pending = 0;</div><div class='add'>+	hn-&gt;hn_flags = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;hn-&gt;hn_requests);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit handshake_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct handshake_net *hn = net_generic(net, handshake_net_id);</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	LIST_HEAD(requests);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Drain the net's pending list. Requests that have been</div><div class='add'>+	 * accepted and are in progress will be destroyed when</div><div class='add'>+	 * the socket is closed.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;hn-&gt;hn_lock);</div><div class='add'>+	set_bit(HANDSHAKE_F_NET_DRAINING, &amp;hn-&gt;hn_flags);</div><div class='add'>+	list_splice_init(&amp;requests, &amp;hn-&gt;hn_requests);</div><div class='add'>+	spin_unlock(&amp;hn-&gt;hn_lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;requests)) {</div><div class='add'>+		req = list_first_entry(&amp;requests, struct handshake_req, hr_list);</div><div class='add'>+		list_del(&amp;req-&gt;hr_list);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Requests on this list have not yet been</div><div class='add'>+		 * accepted, so they do not have an fd to put.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		handshake_complete(req, -ETIMEDOUT, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations handshake_genl_net_ops = {</div><div class='add'>+	.init		= handshake_net_init,</div><div class='add'>+	.exit		= handshake_net_exit,</div><div class='add'>+	.id		= &amp;handshake_net_id,</div><div class='add'>+	.size		= sizeof(struct handshake_net),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_pernet - Get the handshake private per-net structure</div><div class='add'>+ * @net: network namespace</div><div class='add'>+ *</div><div class='add'>+ * Returns a pointer to the net's private per-net structure for the</div><div class='add'>+ * handshake module, or NULL if handshake_init() failed.</div><div class='add'>+ */</div><div class='add'>+struct handshake_net *handshake_pernet(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return handshake_net_id ?</div><div class='add'>+		net_generic(net, handshake_net_id) : NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(handshake_pernet);</div><div class='add'>+</div><div class='add'>+static int __init handshake_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = handshake_req_hash_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_warn("handshake: hash initialization failed (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = genl_register_family(&amp;handshake_nl_family);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_warn("handshake: netlink registration failed (%d)\n", ret);</div><div class='add'>+		handshake_req_hash_destroy();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ORDER: register_pernet_subsys must be done last.</div><div class='add'>+	 *</div><div class='add'>+	 *	If initialization does not make it past pernet_subsys</div><div class='add'>+	 *	registration, then handshake_net_id will remain 0. That</div><div class='add'>+	 *	shunts the handshake consumer API to return ENOTSUPP</div><div class='add'>+	 *	to prevent it from dereferencing something that hasn't</div><div class='add'>+	 *	been allocated.</div><div class='add'>+	 */</div><div class='add'>+	ret = register_pernet_subsys(&amp;handshake_genl_net_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_warn("handshake: pernet registration failed (%d)\n", ret);</div><div class='add'>+		genl_unregister_family(&amp;handshake_nl_family);</div><div class='add'>+		handshake_req_hash_destroy();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit handshake_exit(void)</div><div class='add'>+{</div><div class='add'>+	unregister_pernet_subsys(&amp;handshake_genl_net_ops);</div><div class='add'>+	handshake_net_id = 0;</div><div class='add'>+</div><div class='add'>+	handshake_req_hash_destroy();</div><div class='add'>+	genl_unregister_family(&amp;handshake_nl_family);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(handshake_init);</div><div class='add'>+module_exit(handshake_exit);</div><div class='head'>diff --git a/net/handshake/request.c b/net/handshake/request.c<br/>new file mode 100644<br/>index 000000000000..274d2c89b6b2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/request.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/request.c</a></div><div class='hunk'>@@ -0,0 +1,343 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Handshake request lifetime events</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+#include "handshake.h"</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/handshake.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We need both a handshake_req -&gt; sock mapping, and a sock -&gt;</div><div class='add'>+ * handshake_req mapping. Both are one-to-one.</div><div class='add'>+ *</div><div class='add'>+ * To avoid adding another pointer field to struct sock, net/handshake</div><div class='add'>+ * maintains a hash table, indexed by the memory address of @sock, to</div><div class='add'>+ * find the struct handshake_req outstanding for that socket. The</div><div class='add'>+ * reverse direction uses a simple pointer field in the handshake_req</div><div class='add'>+ * struct.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct rhashtable handshake_rhashtbl ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params handshake_rhash_params = {</div><div class='add'>+	.key_len		= sizeof_field(struct handshake_req, hr_sk),</div><div class='add'>+	.key_offset		= offsetof(struct handshake_req, hr_sk),</div><div class='add'>+	.head_offset		= offsetof(struct handshake_req, hr_rhash),</div><div class='add'>+	.automatic_shrinking	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int handshake_req_hash_init(void)</div><div class='add'>+{</div><div class='add'>+	return rhashtable_init(&amp;handshake_rhashtbl, &amp;handshake_rhash_params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void handshake_req_hash_destroy(void)</div><div class='add'>+{</div><div class='add'>+	rhashtable_destroy(&amp;handshake_rhashtbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct handshake_req *handshake_req_hash_lookup(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return rhashtable_lookup_fast(&amp;handshake_rhashtbl, &amp;sk,</div><div class='add'>+				      handshake_rhash_params);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(handshake_req_hash_lookup);</div><div class='add'>+</div><div class='add'>+static bool handshake_req_hash_add(struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rhashtable_lookup_insert_fast(&amp;handshake_rhashtbl,</div><div class='add'>+					    &amp;req-&gt;hr_rhash,</div><div class='add'>+					    handshake_rhash_params);</div><div class='add'>+	return ret == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_req_destroy(struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;hr_proto-&gt;hp_destroy)</div><div class='add'>+		req-&gt;hr_proto-&gt;hp_destroy(req);</div><div class='add'>+	rhashtable_remove_fast(&amp;handshake_rhashtbl, &amp;req-&gt;hr_rhash,</div><div class='add'>+			       handshake_rhash_params);</div><div class='add'>+	kfree(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handshake_sk_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	void (*sk_destruct)(struct sock *sk);</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_hash_lookup(sk);</div><div class='add'>+	if (!req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	trace_handshake_destruct(sock_net(sk), req, sk);</div><div class='add'>+	sk_destruct = req-&gt;hr_odestruct;</div><div class='add'>+	handshake_req_destroy(req);</div><div class='add'>+	if (sk_destruct)</div><div class='add'>+		sk_destruct(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_req_alloc - Allocate a handshake request</div><div class='add'>+ * @proto: security protocol</div><div class='add'>+ * @flags: memory allocation flags</div><div class='add'>+ *</div><div class='add'>+ * Returns an initialized handshake_req or NULL.</div><div class='add'>+ */</div><div class='add'>+struct handshake_req *handshake_req_alloc(const struct handshake_proto *proto,</div><div class='add'>+					  gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	if (!proto)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (proto-&gt;hp_handler_class &lt;= HANDSHAKE_HANDLER_CLASS_NONE)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (proto-&gt;hp_handler_class &gt;= HANDSHAKE_HANDLER_CLASS_MAX)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (!proto-&gt;hp_accept || !proto-&gt;hp_done)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(struct_size(req, hr_priv, proto-&gt;hp_privsize), flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;req-&gt;hr_list);</div><div class='add'>+	req-&gt;hr_proto = proto;</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(handshake_req_alloc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_req_private - Get per-handshake private data</div><div class='add'>+ * @req: handshake arguments</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void *handshake_req_private(struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	return (void *)&amp;req-&gt;hr_priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(handshake_req_private);</div><div class='add'>+</div><div class='add'>+static bool __add_pending_locked(struct handshake_net *hn,</div><div class='add'>+				 struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(!list_empty(&amp;req-&gt;hr_list)))</div><div class='add'>+		return false;</div><div class='add'>+	hn-&gt;hn_pending++;</div><div class='add'>+	list_add_tail(&amp;req-&gt;hr_list, &amp;hn-&gt;hn_requests);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __remove_pending_locked(struct handshake_net *hn,</div><div class='add'>+				    struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	hn-&gt;hn_pending--;</div><div class='add'>+	list_del_init(&amp;req-&gt;hr_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns %true if the request was found on @net's pending list,</div><div class='add'>+ * otherwise %false.</div><div class='add'>+ *</div><div class='add'>+ * If @req was on a pending list, it has not yet been accepted.</div><div class='add'>+ */</div><div class='add'>+static bool remove_pending(struct handshake_net *hn, struct handshake_req *req)</div><div class='add'>+{</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hn-&gt;hn_lock);</div><div class='add'>+	if (!list_empty(&amp;req-&gt;hr_list)) {</div><div class='add'>+		__remove_pending_locked(hn, req);</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;hn-&gt;hn_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct handshake_req *handshake_req_next(struct handshake_net *hn, int class)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req, *pos;</div><div class='add'>+</div><div class='add'>+	req = NULL;</div><div class='add'>+	spin_lock(&amp;hn-&gt;hn_lock);</div><div class='add'>+	list_for_each_entry(pos, &amp;hn-&gt;hn_requests, hr_list) {</div><div class='add'>+		if (pos-&gt;hr_proto-&gt;hp_handler_class != class)</div><div class='add'>+			continue;</div><div class='add'>+		__remove_pending_locked(hn, pos);</div><div class='add'>+		req = pos;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;hn-&gt;hn_lock);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(handshake_req_next);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_req_submit - Submit a handshake request</div><div class='add'>+ * @sock: open socket on which to perform the handshake</div><div class='add'>+ * @req: handshake arguments</div><div class='add'>+ * @flags: memory allocation flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Request queued</div><div class='add'>+ *   %-EINVAL: Invalid argument</div><div class='add'>+ *   %-EBUSY: A handshake is already under way for this socket</div><div class='add'>+ *   %-ESRCH: No handshake agent is available</div><div class='add'>+ *   %-EAGAIN: Too many pending handshake requests</div><div class='add'>+ *   %-ENOMEM: Failed to allocate memory</div><div class='add'>+ *   %-EMSGSIZE: Failed to construct notification message</div><div class='add'>+ *   %-EOPNOTSUPP: Handshake module not initialized</div><div class='add'>+ *</div><div class='add'>+ * A zero return value from handshake_req_submit() means that</div><div class='add'>+ * exactly one subsequent completion callback is guaranteed.</div><div class='add'>+ *</div><div class='add'>+ * A negative return value from handshake_req_submit() means that</div><div class='add'>+ * no completion callback will be done and that @req has been</div><div class='add'>+ * destroyed.</div><div class='add'>+ */</div><div class='add'>+int handshake_req_submit(struct socket *sock, struct handshake_req *req,</div><div class='add'>+			 gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct handshake_net *hn;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!sock || !req || !sock-&gt;file) {</div><div class='add'>+		kfree(req);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;hr_sk = sock-&gt;sk;</div><div class='add'>+	if (!req-&gt;hr_sk) {</div><div class='add'>+		kfree(req);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	req-&gt;hr_odestruct = req-&gt;hr_sk-&gt;sk_destruct;</div><div class='add'>+	req-&gt;hr_sk-&gt;sk_destruct = handshake_sk_destruct;</div><div class='add'>+</div><div class='add'>+	ret = -EOPNOTSUPP;</div><div class='add'>+	net = sock_net(req-&gt;hr_sk);</div><div class='add'>+	hn = handshake_pernet(net);</div><div class='add'>+	if (!hn)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	ret = -EAGAIN;</div><div class='add'>+	if (READ_ONCE(hn-&gt;hn_pending) &gt;= hn-&gt;hn_pending_max)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hn-&gt;hn_lock);</div><div class='add'>+	ret = -EOPNOTSUPP;</div><div class='add'>+	if (test_bit(HANDSHAKE_F_NET_DRAINING, &amp;hn-&gt;hn_flags))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	ret = -EBUSY;</div><div class='add'>+	if (!handshake_req_hash_add(req))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	if (!__add_pending_locked(hn, req))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	spin_unlock(&amp;hn-&gt;hn_lock);</div><div class='add'>+</div><div class='add'>+	ret = handshake_genl_notify(net, req-&gt;hr_proto, flags);</div><div class='add'>+	if (ret) {</div><div class='add'>+		trace_handshake_notify_err(net, req, req-&gt;hr_sk, ret);</div><div class='add'>+		if (remove_pending(hn, req))</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prevent socket release while a handshake request is pending */</div><div class='add'>+	sock_hold(req-&gt;hr_sk);</div><div class='add'>+</div><div class='add'>+	trace_handshake_submit(net, req, req-&gt;hr_sk);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;hn-&gt;hn_lock);</div><div class='add'>+out_err:</div><div class='add'>+	trace_handshake_submit_err(net, req, req-&gt;hr_sk, ret);</div><div class='add'>+	handshake_req_destroy(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(handshake_req_submit);</div><div class='add'>+</div><div class='add'>+void handshake_complete(struct handshake_req *req, unsigned int status,</div><div class='add'>+			struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = req-&gt;hr_sk;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(HANDSHAKE_F_REQ_COMPLETED, &amp;req-&gt;hr_flags)) {</div><div class='add'>+		trace_handshake_complete(net, req, sk, status);</div><div class='add'>+		req-&gt;hr_proto-&gt;hp_done(req, status, info);</div><div class='add'>+</div><div class='add'>+		/* Handshake request is no longer pending */</div><div class='add'>+		sock_put(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(handshake_complete);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handshake_req_cancel - Cancel an in-progress handshake</div><div class='add'>+ * @sk: socket on which there is an ongoing handshake</div><div class='add'>+ *</div><div class='add'>+ * Request cancellation races with request completion. To determine</div><div class='add'>+ * who won, callers examine the return value from this function.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %true - Uncompleted handshake request was canceled</div><div class='add'>+ *   %false - Handshake request already completed or not found</div><div class='add'>+ */</div><div class='add'>+bool handshake_req_cancel(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	struct handshake_net *hn;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	net = sock_net(sk);</div><div class='add'>+	req = handshake_req_hash_lookup(sk);</div><div class='add'>+	if (!req) {</div><div class='add'>+		trace_handshake_cancel_none(net, req, sk);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hn = handshake_pernet(net);</div><div class='add'>+	if (hn &amp;&amp; remove_pending(hn, req)) {</div><div class='add'>+		/* Request hadn't been accepted */</div><div class='add'>+		goto out_true;</div><div class='add'>+	}</div><div class='add'>+	if (test_and_set_bit(HANDSHAKE_F_REQ_COMPLETED, &amp;req-&gt;hr_flags)) {</div><div class='add'>+		/* Request already completed */</div><div class='add'>+		trace_handshake_cancel_busy(net, req, sk);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_true:</div><div class='add'>+	trace_handshake_cancel(net, req, sk);</div><div class='add'>+</div><div class='add'>+	/* Handshake request is no longer pending */</div><div class='add'>+	sock_put(sk);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(handshake_req_cancel);</div><div class='head'>diff --git a/net/handshake/tlshd.c b/net/handshake/tlshd.c<br/>new file mode 100644<br/>index 000000000000..8f9532a15f43<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/tlshd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/tlshd.c</a></div><div class='hunk'>@@ -0,0 +1,455 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Establish a TLS session for a kernel socket consumer</div><div class='add'>+ * using the tlshd user space handler.</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021-2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/key.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/handshake.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/tls_prot.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/keyctl.h&gt;</div><div class='add'>+#include &lt;uapi/linux/handshake.h&gt;</div><div class='add'>+#include "handshake.h"</div><div class='add'>+</div><div class='add'>+struct tls_handshake_req {</div><div class='add'>+	void			(*th_consumer_done)(void *data, int status,</div><div class='add'>+						    key_serial_t peerid);</div><div class='add'>+	void			*th_consumer_data;</div><div class='add'>+</div><div class='add'>+	int			th_type;</div><div class='add'>+	unsigned int		th_timeout_ms;</div><div class='add'>+	int			th_auth_mode;</div><div class='add'>+	const char		*th_peername;</div><div class='add'>+	key_serial_t		th_keyring;</div><div class='add'>+	key_serial_t		th_certificate;</div><div class='add'>+	key_serial_t		th_privkey;</div><div class='add'>+</div><div class='add'>+	unsigned int		th_num_peerids;</div><div class='add'>+	key_serial_t		th_peerid[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tls_handshake_req *</div><div class='add'>+tls_handshake_req_init(struct handshake_req *req,</div><div class='add'>+		       const struct tls_handshake_args *args)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq = handshake_req_private(req);</div><div class='add'>+</div><div class='add'>+	treq-&gt;th_timeout_ms = args-&gt;ta_timeout_ms;</div><div class='add'>+	treq-&gt;th_consumer_done = args-&gt;ta_done;</div><div class='add'>+	treq-&gt;th_consumer_data = args-&gt;ta_data;</div><div class='add'>+	treq-&gt;th_peername = args-&gt;ta_peername;</div><div class='add'>+	treq-&gt;th_keyring = args-&gt;ta_keyring;</div><div class='add'>+	treq-&gt;th_num_peerids = 0;</div><div class='add'>+	treq-&gt;th_certificate = TLS_NO_CERT;</div><div class='add'>+	treq-&gt;th_privkey = TLS_NO_PRIVKEY;</div><div class='add'>+	return treq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tls_handshake_remote_peerids(struct tls_handshake_req *treq,</div><div class='add'>+					 struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *head = nlmsg_attrdata(info-&gt;nlhdr, GENL_HDRLEN);</div><div class='add'>+	int rem, len = nlmsg_attrlen(info-&gt;nlhdr, GENL_HDRLEN);</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	nla_for_each_attr(nla, head, len, rem) {</div><div class='add'>+		if (nla_type(nla) == HANDSHAKE_A_DONE_REMOTE_AUTH)</div><div class='add'>+			i++;</div><div class='add'>+	}</div><div class='add'>+	if (!i)</div><div class='add'>+		return;</div><div class='add'>+	treq-&gt;th_num_peerids = min_t(unsigned int, i,</div><div class='add'>+				     ARRAY_SIZE(treq-&gt;th_peerid));</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	nla_for_each_attr(nla, head, len, rem) {</div><div class='add'>+		if (nla_type(nla) == HANDSHAKE_A_DONE_REMOTE_AUTH)</div><div class='add'>+			treq-&gt;th_peerid[i++] = nla_get_u32(nla);</div><div class='add'>+		if (i &gt;= treq-&gt;th_num_peerids)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_handshake_done - callback to handle a CMD_DONE request</div><div class='add'>+ * @req: socket on which the handshake was performed</div><div class='add'>+ * @status: session status code</div><div class='add'>+ * @info: full results of session establishment</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void tls_handshake_done(struct handshake_req *req,</div><div class='add'>+			       unsigned int status, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq = handshake_req_private(req);</div><div class='add'>+</div><div class='add'>+	treq-&gt;th_peerid[0] = TLS_NO_PEERID;</div><div class='add'>+	if (info)</div><div class='add'>+		tls_handshake_remote_peerids(treq, info);</div><div class='add'>+</div><div class='add'>+	if (!status)</div><div class='add'>+		set_bit(HANDSHAKE_F_REQ_SESSION, &amp;req-&gt;hr_flags);</div><div class='add'>+</div><div class='add'>+	treq-&gt;th_consumer_done(treq-&gt;th_consumer_data, -status,</div><div class='add'>+			       treq-&gt;th_peerid[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_KEYS)</div><div class='add'>+static int tls_handshake_private_keyring(struct tls_handshake_req *treq)</div><div class='add'>+{</div><div class='add'>+	key_ref_t process_keyring_ref, keyring_ref;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (treq-&gt;th_keyring == TLS_NO_KEYRING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	process_keyring_ref = lookup_user_key(KEY_SPEC_PROCESS_KEYRING,</div><div class='add'>+					      KEY_LOOKUP_CREATE,</div><div class='add'>+					      KEY_NEED_WRITE);</div><div class='add'>+	if (IS_ERR(process_keyring_ref)) {</div><div class='add'>+		ret = PTR_ERR(process_keyring_ref);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	keyring_ref = lookup_user_key(treq-&gt;th_keyring, KEY_LOOKUP_CREATE,</div><div class='add'>+				      KEY_NEED_LINK);</div><div class='add'>+	if (IS_ERR(keyring_ref)) {</div><div class='add'>+		ret = PTR_ERR(keyring_ref);</div><div class='add'>+		goto out_put_key;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = key_link(key_ref_to_ptr(process_keyring_ref),</div><div class='add'>+		       key_ref_to_ptr(keyring_ref));</div><div class='add'>+</div><div class='add'>+	key_ref_put(keyring_ref);</div><div class='add'>+out_put_key:</div><div class='add'>+	key_ref_put(process_keyring_ref);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int tls_handshake_private_keyring(struct tls_handshake_req *treq)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int tls_handshake_put_peer_identity(struct sk_buff *msg,</div><div class='add'>+					   struct tls_handshake_req *treq)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; treq-&gt;th_num_peerids; i++)</div><div class='add'>+		if (nla_put_u32(msg, HANDSHAKE_A_ACCEPT_PEER_IDENTITY,</div><div class='add'>+				treq-&gt;th_peerid[i]) &lt; 0)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tls_handshake_put_certificate(struct sk_buff *msg,</div><div class='add'>+					 struct tls_handshake_req *treq)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *entry_attr;</div><div class='add'>+</div><div class='add'>+	if (treq-&gt;th_certificate == TLS_NO_CERT &amp;&amp;</div><div class='add'>+	    treq-&gt;th_privkey == TLS_NO_PRIVKEY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	entry_attr = nla_nest_start(msg, HANDSHAKE_A_ACCEPT_CERTIFICATE);</div><div class='add'>+	if (!entry_attr)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_s32(msg, HANDSHAKE_A_X509_CERT,</div><div class='add'>+			treq-&gt;th_certificate) ||</div><div class='add'>+	    nla_put_s32(msg, HANDSHAKE_A_X509_PRIVKEY,</div><div class='add'>+			treq-&gt;th_privkey)) {</div><div class='add'>+		nla_nest_cancel(msg, entry_attr);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, entry_attr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_handshake_accept - callback to construct a CMD_ACCEPT response</div><div class='add'>+ * @req: handshake parameters to return</div><div class='add'>+ * @info: generic netlink message context</div><div class='add'>+ * @fd: file descriptor to be returned</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, or a negative errno on failure.</div><div class='add'>+ */</div><div class='add'>+static int tls_handshake_accept(struct handshake_req *req,</div><div class='add'>+				struct genl_info *info, int fd)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq = handshake_req_private(req);</div><div class='add'>+	struct nlmsghdr *hdr;</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tls_handshake_private_keyring(treq);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	msg = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		goto out;</div><div class='add'>+	hdr = handshake_genl_put(msg, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto out_cancel;</div><div class='add'>+</div><div class='add'>+	ret = nla_put_s32(msg, HANDSHAKE_A_ACCEPT_SOCKFD, fd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_cancel;</div><div class='add'>+	ret = nla_put_u32(msg, HANDSHAKE_A_ACCEPT_MESSAGE_TYPE, treq-&gt;th_type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_cancel;</div><div class='add'>+	if (treq-&gt;th_peername) {</div><div class='add'>+		ret = nla_put_string(msg, HANDSHAKE_A_ACCEPT_PEERNAME,</div><div class='add'>+				     treq-&gt;th_peername);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_cancel;</div><div class='add'>+	}</div><div class='add'>+	if (treq-&gt;th_timeout_ms) {</div><div class='add'>+		ret = nla_put_u32(msg, HANDSHAKE_A_ACCEPT_TIMEOUT, treq-&gt;th_timeout_ms);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_cancel;</div><div class='add'>+	}</div><div class='add'>+	if (treq-&gt;th_keyring) {</div><div class='add'>+		ret = nla_put_u32(msg, HANDSHAKE_A_ACCEPT_KEYRING,</div><div class='add'>+				  treq-&gt;th_keyring);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nla_put_u32(msg, HANDSHAKE_A_ACCEPT_AUTH_MODE,</div><div class='add'>+			  treq-&gt;th_auth_mode);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_cancel;</div><div class='add'>+	switch (treq-&gt;th_auth_mode) {</div><div class='add'>+	case HANDSHAKE_AUTH_PSK:</div><div class='add'>+		ret = tls_handshake_put_peer_identity(msg, treq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_cancel;</div><div class='add'>+		break;</div><div class='add'>+	case HANDSHAKE_AUTH_X509:</div><div class='add'>+		ret = tls_handshake_put_certificate(msg, treq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_cancel;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='add'>+</div><div class='add'>+out_cancel:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	nlmsg_free(msg);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct handshake_proto tls_handshake_proto = {</div><div class='add'>+	.hp_handler_class	= HANDSHAKE_HANDLER_CLASS_TLSHD,</div><div class='add'>+	.hp_privsize		= sizeof(struct tls_handshake_req),</div><div class='add'>+	.hp_flags		= BIT(HANDSHAKE_F_PROTO_NOTIFY),</div><div class='add'>+</div><div class='add'>+	.hp_accept		= tls_handshake_accept,</div><div class='add'>+	.hp_done		= tls_handshake_done,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_client_hello_anon - request an anonymous TLS handshake on a socket</div><div class='add'>+ * @args: socket and handshake parameters for this request</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Handshake request enqueue; -&gt;done will be called when complete</div><div class='add'>+ *   %-ESRCH: No user agent is available</div><div class='add'>+ *   %-ENOMEM: Memory allocation failed</div><div class='add'>+ */</div><div class='add'>+int tls_client_hello_anon(const struct tls_handshake_args *args, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq;</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;tls_handshake_proto, flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	treq = tls_handshake_req_init(req, args);</div><div class='add'>+	treq-&gt;th_type = HANDSHAKE_MSG_TYPE_CLIENTHELLO;</div><div class='add'>+	treq-&gt;th_auth_mode = HANDSHAKE_AUTH_UNAUTH;</div><div class='add'>+</div><div class='add'>+	return handshake_req_submit(args-&gt;ta_sock, req, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_client_hello_anon);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_client_hello_x509 - request an x.509-based TLS handshake on a socket</div><div class='add'>+ * @args: socket and handshake parameters for this request</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Handshake request enqueue; -&gt;done will be called when complete</div><div class='add'>+ *   %-ESRCH: No user agent is available</div><div class='add'>+ *   %-ENOMEM: Memory allocation failed</div><div class='add'>+ */</div><div class='add'>+int tls_client_hello_x509(const struct tls_handshake_args *args, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq;</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;tls_handshake_proto, flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	treq = tls_handshake_req_init(req, args);</div><div class='add'>+	treq-&gt;th_type = HANDSHAKE_MSG_TYPE_CLIENTHELLO;</div><div class='add'>+	treq-&gt;th_auth_mode = HANDSHAKE_AUTH_X509;</div><div class='add'>+	treq-&gt;th_certificate = args-&gt;ta_my_cert;</div><div class='add'>+	treq-&gt;th_privkey = args-&gt;ta_my_privkey;</div><div class='add'>+</div><div class='add'>+	return handshake_req_submit(args-&gt;ta_sock, req, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_client_hello_x509);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_client_hello_psk - request a PSK-based TLS handshake on a socket</div><div class='add'>+ * @args: socket and handshake parameters for this request</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Handshake request enqueue; -&gt;done will be called when complete</div><div class='add'>+ *   %-EINVAL: Wrong number of local peer IDs</div><div class='add'>+ *   %-ESRCH: No user agent is available</div><div class='add'>+ *   %-ENOMEM: Memory allocation failed</div><div class='add'>+ */</div><div class='add'>+int tls_client_hello_psk(const struct tls_handshake_args *args, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq;</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!args-&gt;ta_num_peerids ||</div><div class='add'>+	    args-&gt;ta_num_peerids &gt; ARRAY_SIZE(treq-&gt;th_peerid))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;tls_handshake_proto, flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	treq = tls_handshake_req_init(req, args);</div><div class='add'>+	treq-&gt;th_type = HANDSHAKE_MSG_TYPE_CLIENTHELLO;</div><div class='add'>+	treq-&gt;th_auth_mode = HANDSHAKE_AUTH_PSK;</div><div class='add'>+	treq-&gt;th_num_peerids = args-&gt;ta_num_peerids;</div><div class='add'>+	for (i = 0; i &lt; args-&gt;ta_num_peerids; i++)</div><div class='add'>+		treq-&gt;th_peerid[i] = args-&gt;ta_my_peerids[i];</div><div class='add'>+</div><div class='add'>+	return handshake_req_submit(args-&gt;ta_sock, req, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_client_hello_psk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_server_hello_x509 - request a server TLS handshake on a socket</div><div class='add'>+ * @args: socket and handshake parameters for this request</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Handshake request enqueue; -&gt;done will be called when complete</div><div class='add'>+ *   %-ESRCH: No user agent is available</div><div class='add'>+ *   %-ENOMEM: Memory allocation failed</div><div class='add'>+ */</div><div class='add'>+int tls_server_hello_x509(const struct tls_handshake_args *args, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq;</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;tls_handshake_proto, flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	treq = tls_handshake_req_init(req, args);</div><div class='add'>+	treq-&gt;th_type = HANDSHAKE_MSG_TYPE_SERVERHELLO;</div><div class='add'>+	treq-&gt;th_auth_mode = HANDSHAKE_AUTH_X509;</div><div class='add'>+	treq-&gt;th_certificate = args-&gt;ta_my_cert;</div><div class='add'>+	treq-&gt;th_privkey = args-&gt;ta_my_privkey;</div><div class='add'>+</div><div class='add'>+	return handshake_req_submit(args-&gt;ta_sock, req, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_server_hello_x509);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_server_hello_psk - request a server TLS handshake on a socket</div><div class='add'>+ * @args: socket and handshake parameters for this request</div><div class='add'>+ * @flags: memory allocation control flags</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Handshake request enqueue; -&gt;done will be called when complete</div><div class='add'>+ *   %-ESRCH: No user agent is available</div><div class='add'>+ *   %-ENOMEM: Memory allocation failed</div><div class='add'>+ */</div><div class='add'>+int tls_server_hello_psk(const struct tls_handshake_args *args, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tls_handshake_req *treq;</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_alloc(&amp;tls_handshake_proto, flags);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	treq = tls_handshake_req_init(req, args);</div><div class='add'>+	treq-&gt;th_type = HANDSHAKE_MSG_TYPE_SERVERHELLO;</div><div class='add'>+	treq-&gt;th_auth_mode = HANDSHAKE_AUTH_PSK;</div><div class='add'>+	treq-&gt;th_num_peerids = 1;</div><div class='add'>+	treq-&gt;th_peerid[0] = args-&gt;ta_my_peerids[0];</div><div class='add'>+</div><div class='add'>+	return handshake_req_submit(args-&gt;ta_sock, req, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_server_hello_psk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_handshake_cancel - cancel a pending handshake</div><div class='add'>+ * @sk: socket on which there is an ongoing handshake</div><div class='add'>+ *</div><div class='add'>+ * Request cancellation races with request completion. To determine</div><div class='add'>+ * who won, callers examine the return value from this function.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %true - Uncompleted handshake request was canceled</div><div class='add'>+ *   %false - Handshake request already completed or not found</div><div class='add'>+ */</div><div class='add'>+bool tls_handshake_cancel(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return handshake_req_cancel(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_handshake_cancel);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tls_handshake_close - send a Closure alert</div><div class='add'>+ * @sock: an open socket</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void tls_handshake_close(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct handshake_req *req;</div><div class='add'>+</div><div class='add'>+	req = handshake_req_hash_lookup(sock-&gt;sk);</div><div class='add'>+	if (!req)</div><div class='add'>+		return;</div><div class='add'>+	if (!test_and_clear_bit(HANDSHAKE_F_REQ_SESSION, &amp;req-&gt;hr_flags))</div><div class='add'>+		return;</div><div class='add'>+	tls_alert_send(sock, TLS_ALERT_LEVEL_WARNING,</div><div class='add'>+		       TLS_ALERT_DESC_CLOSE_NOTIFY);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tls_handshake_close);</div><div class='head'>diff --git a/net/handshake/trace.c b/net/handshake/trace.c<br/>new file mode 100644<br/>index 000000000000..44432d0857b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/handshake/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/handshake/trace.c</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Trace points for transport security layer handshakes.</div><div class='add'>+ *</div><div class='add'>+ * Author: Chuck Lever &lt;chuck.lever@oracle.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/inet_sock.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "handshake.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/handshake.h&gt;</div><div class='head'>diff --git a/net/hsr/Kconfig b/net/hsr/Kconfig<br/>index 4b683fd0abf1..fcacdf4f0ffc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/Kconfig</a></div><div class='hunk'>@@ -1,28 +1,58 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IEC 62439-3 High-availability Seamless Redundancy</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config HSR</div><div class='del'>-	tristate "High-availability Seamless Redundancy (HSR)"</div><div class='del'>-	---help---</div><div class='add'>+	tristate "High-availability Seamless Redundancy (HSR &amp; PRP)"</div><div class='add'>+	help</div><div class='add'>+	  This enables IEC 62439 defined High-availability Seamless</div><div class='add'>+	  Redundancy (HSR) and Parallel Redundancy Protocol (PRP).</div><div class='add'>+</div><div class='ctx'> 	  If you say Y here, then your Linux box will be able to act as a</div><div class='del'>-	  DANH ("Doubly attached node implementing HSR"). For this to work,</div><div class='del'>-	  your Linux box needs (at least) two physical Ethernet interfaces,</div><div class='del'>-	  and it must be connected as a node in a ring network together with</div><div class='del'>-	  other HSR capable nodes.</div><div class='add'>+	  DANH ("Doubly attached node implementing HSR") or DANP ("Doubly</div><div class='add'>+	  attached node implementing PRP"). For this to work, your Linux box</div><div class='add'>+	  needs (at least) two physical Ethernet interfaces.</div><div class='add'>+</div><div class='add'>+	  For DANH, it must be connected as a node in a ring network together</div><div class='add'>+	  with other HSR capable nodes. All Ethernet frames sent over the HSR</div><div class='add'>+	  device will be sent in both directions on the ring (over both slave</div><div class='add'>+	  ports), giving a redundant, instant fail-over network. Each HSR node</div><div class='add'>+	  in the ring acts like a bridge for HSR frames, but filters frames</div><div class='add'>+	  that have been forwarded earlier.</div><div class='ctx'> </div><div class='del'>-	  All Ethernet frames sent over the hsr device will be sent in both</div><div class='del'>-	  directions on the ring (over both slave ports), giving a redundant,</div><div class='del'>-	  instant fail-over network. Each HSR node in the ring acts like a</div><div class='del'>-	  bridge for HSR frames, but filters frames that have been forwarded</div><div class='del'>-	  earlier.</div><div class='add'>+	  For DANP, it must be connected as a node connecting to two</div><div class='add'>+	  separate networks over the two slave interfaces. Like HSR, Ethernet</div><div class='add'>+	  frames sent over the PRP device will be sent to both networks giving</div><div class='add'>+	  a redundant, instant fail-over network. Unlike HSR, PRP networks</div><div class='add'>+	  can have Singly Attached Nodes (SAN) such as PC, printer, bridges</div><div class='add'>+	  etc and will be able to communicate with DANP nodes.</div><div class='ctx'> </div><div class='ctx'> 	  This code is a "best effort" to comply with the HSR standard as</div><div class='ctx'> 	  described in IEC 62439-3:2010 (HSRv0) and IEC 62439-3:2012 (HSRv1),</div><div class='del'>-	  but no compliancy tests have been made. Use iproute2 to select</div><div class='del'>-	  the version you desire.</div><div class='add'>+	  and PRP standard described in IEC 62439-4:2012 (PRP), but no</div><div class='add'>+	  compliancy tests have been made. Use iproute2 to select the protocol</div><div class='add'>+	  you would like to use.</div><div class='ctx'> </div><div class='ctx'> 	  You need to perform any and all necessary tests yourself before</div><div class='ctx'> 	  relying on this code in a safety critical system!</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+if HSR</div><div class='add'>+</div><div class='add'>+config PRP_DUP_DISCARD_KUNIT_TEST</div><div class='add'>+	tristate "PRP duplicate discard KUnit tests" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  Covers the PRP duplicate discard algorithm.</div><div class='add'>+	  Only useful for kernel devs running KUnit test harness and are not</div><div class='add'>+	  for inclusion into a production build.</div><div class='add'>+</div><div class='add'>+	  For more information on KUnit and unit tests in general please refer</div><div class='add'>+	  to the KUnit documentation in Documentation/dev-tools/kunit/.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/net/hsr/Makefile b/net/hsr/Makefile<br/>index 9ae972a820f4..34e581db5c41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for HSR</div><div class='ctx'> #</div><div class='hunk'>@@ -6,3 +7,6 @@ obj-$(CONFIG_HSR)	+= hsr.o</div><div class='ctx'> </div><div class='ctx'> hsr-y			:= hsr_main.o hsr_framereg.o hsr_device.o \</div><div class='ctx'> 			   hsr_netlink.o hsr_slave.o hsr_forward.o</div><div class='add'>+hsr-$(CONFIG_DEBUG_FS) += hsr_debugfs.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_PRP_DUP_DISCARD_KUNIT_TEST) += prp_dup_discard_test.o</div><div class='head'>diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c<br/>new file mode 100644<br/>index 000000000000..5b2cfac3b2ba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * debugfs code for HSR &amp; PRP</div><div class='add'>+ * Copyright (C) 2019 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author(s):</div><div class='add'>+ *	Murali Karicheri &lt;m-karicheri2@ti.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include "hsr_main.h"</div><div class='add'>+#include "hsr_framereg.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *hsr_debugfs_root_dir;</div><div class='add'>+</div><div class='add'>+/* hsr_node_table_show - Formats and prints node_table entries */</div><div class='add'>+static int</div><div class='add'>+hsr_node_table_show(struct seq_file *sfp, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *priv = (struct hsr_priv *)sfp-&gt;private;</div><div class='add'>+	struct hsr_node *node;</div><div class='add'>+</div><div class='add'>+	seq_printf(sfp, "Node Table entries for (%s) device\n",</div><div class='add'>+		   (priv-&gt;prot_version == PRP_V1 ? "PRP" : "HSR"));</div><div class='add'>+	seq_puts(sfp, "MAC-Address-A,    MAC-Address-B,    time_in[A], ");</div><div class='add'>+	seq_puts(sfp, "time_in[B], Address-B port, ");</div><div class='add'>+	if (priv-&gt;prot_version == PRP_V1)</div><div class='add'>+		seq_puts(sfp, "SAN-A, SAN-B, DAN-P\n");</div><div class='add'>+	else</div><div class='add'>+		seq_puts(sfp, "DAN-H\n");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(node, &amp;priv-&gt;node_db, mac_list) {</div><div class='add'>+		/* skip self node */</div><div class='add'>+		if (hsr_addr_is_self(priv, node-&gt;macaddress_A))</div><div class='add'>+			continue;</div><div class='add'>+		seq_printf(sfp, "%pM ", &amp;node-&gt;macaddress_A[0]);</div><div class='add'>+		seq_printf(sfp, "%pM ", &amp;node-&gt;macaddress_B[0]);</div><div class='add'>+		seq_printf(sfp, "%10lx, ", node-&gt;time_in[HSR_PT_SLAVE_A]);</div><div class='add'>+		seq_printf(sfp, "%10lx, ", node-&gt;time_in[HSR_PT_SLAVE_B]);</div><div class='add'>+		seq_printf(sfp, "%14x, ", node-&gt;addr_B_port);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;prot_version == PRP_V1)</div><div class='add'>+			seq_printf(sfp, "%5x, %5x, %5x\n",</div><div class='add'>+				   node-&gt;san_a, node-&gt;san_b,</div><div class='add'>+				   (node-&gt;san_a == 0 &amp;&amp; node-&gt;san_b == 0));</div><div class='add'>+		else</div><div class='add'>+			seq_printf(sfp, "%5x\n", 1);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(hsr_node_table);</div><div class='add'>+</div><div class='add'>+void hsr_debugfs_rename(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = debugfs_change_name(priv-&gt;node_tbl_root, "%s", dev-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_warn(dev, "failed to rename\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hsr_debugfs_init - create hsr node_table file for dumping</div><div class='add'>+ * the node table</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * When debugfs is configured this routine sets up the node_table file per</div><div class='add'>+ * hsr device for dumping the node_table entries</div><div class='add'>+ */</div><div class='add'>+void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)</div><div class='add'>+{</div><div class='add'>+	struct dentry *de = NULL;</div><div class='add'>+</div><div class='add'>+	de = debugfs_create_dir(hsr_dev-&gt;name, hsr_debugfs_root_dir);</div><div class='add'>+	if (IS_ERR(de)) {</div><div class='add'>+		pr_err("Cannot create hsr debugfs directory\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;node_tbl_root = de;</div><div class='add'>+</div><div class='add'>+	de = debugfs_create_file("node_table", S_IFREG | 0444,</div><div class='add'>+				 priv-&gt;node_tbl_root, priv,</div><div class='add'>+				 &amp;hsr_node_table_fops);</div><div class='add'>+	if (IS_ERR(de)) {</div><div class='add'>+		pr_err("Cannot create hsr node_table file\n");</div><div class='add'>+		debugfs_remove(priv-&gt;node_tbl_root);</div><div class='add'>+		priv-&gt;node_tbl_root = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hsr_debugfs_term - Tear down debugfs intrastructure</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * When Debugfs is configured this routine removes debugfs file system</div><div class='add'>+ * elements that are specific to hsr</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+hsr_debugfs_term(struct hsr_priv *priv)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(priv-&gt;node_tbl_root);</div><div class='add'>+	priv-&gt;node_tbl_root = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hsr_debugfs_create_root(void)</div><div class='add'>+{</div><div class='add'>+	hsr_debugfs_root_dir = debugfs_create_dir("hsr", NULL);</div><div class='add'>+	if (IS_ERR(hsr_debugfs_root_dir)) {</div><div class='add'>+		pr_err("Cannot create hsr debugfs root directory\n");</div><div class='add'>+		hsr_debugfs_root_dir = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hsr_debugfs_remove_root(void)</div><div class='add'>+{</div><div class='add'>+	/* debugfs_remove() internally checks NULL and ERROR */</div><div class='add'>+	debugfs_remove(hsr_debugfs_root_dir);</div><div class='add'>+}</div><div class='head'>diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c<br/>index b8cd43c9ed5b..d1bfc49b5f01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_device.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_device.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='del'>- *</div><div class='ctx'>  * This file contains device methods for creating, using and destroying</div><div class='del'>- * virtual HSR devices.</div><div class='add'>+ * virtual HSR or PRP devices.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -23,7 +18,6 @@</div><div class='ctx'> #include "hsr_main.h"</div><div class='ctx'> #include "hsr_forward.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static bool is_admin_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev &amp;&amp; (dev-&gt;flags &amp; IFF_UP);</div><div class='hunk'>@@ -34,90 +28,75 @@ static bool is_slave_up(struct net_device *dev)</div><div class='ctx'> 	return dev &amp;&amp; is_admin_up(dev) &amp;&amp; netif_oper_up(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __hsr_set_operstate(struct net_device *dev, int transition)</div><div class='del'>-{</div><div class='del'>-	write_lock_bh(&amp;dev_base_lock);</div><div class='del'>-	if (dev-&gt;operstate != transition) {</div><div class='del'>-		dev-&gt;operstate = transition;</div><div class='del'>-		write_unlock_bh(&amp;dev_base_lock);</div><div class='del'>-		netdev_state_change(dev);</div><div class='del'>-	} else {</div><div class='del'>-		write_unlock_bh(&amp;dev_base_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void hsr_set_operstate(struct hsr_port *master, bool has_carrier)</div><div class='ctx'> {</div><div class='del'>-	if (!is_admin_up(master-&gt;dev)) {</div><div class='del'>-		__hsr_set_operstate(master-&gt;dev, IF_OPER_DOWN);</div><div class='add'>+	struct net_device *dev = master-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!is_admin_up(dev)) {</div><div class='add'>+		netif_set_operstate(dev, IF_OPER_DOWN);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (has_carrier)</div><div class='del'>-		__hsr_set_operstate(master-&gt;dev, IF_OPER_UP);</div><div class='add'>+		netif_set_operstate(dev, IF_OPER_UP);</div><div class='ctx'> 	else</div><div class='del'>-		__hsr_set_operstate(master-&gt;dev, IF_OPER_LOWERLAYERDOWN);</div><div class='add'>+		netif_set_operstate(dev, IF_OPER_LOWERLAYERDOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool hsr_check_carrier(struct hsr_port *master)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_port *port;</div><div class='del'>-	bool has_carrier;</div><div class='ctx'> </div><div class='del'>-	has_carrier = false;</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hsr_for_each_port(master-&gt;hsr, port)</div><div class='del'>-		if ((port-&gt;type != HSR_PT_MASTER) &amp;&amp; is_slave_up(port-&gt;dev)) {</div><div class='del'>-			has_carrier = true;</div><div class='del'>-			break;</div><div class='add'>+	hsr_for_each_port_rtnl(master-&gt;hsr, port) {</div><div class='add'>+		if (port-&gt;type != HSR_PT_MASTER &amp;&amp; is_slave_up(port-&gt;dev)) {</div><div class='add'>+			netif_carrier_on(master-&gt;dev);</div><div class='add'>+			return true;</div><div class='ctx'> 		}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (has_carrier)</div><div class='del'>-		netif_carrier_on(master-&gt;dev);</div><div class='del'>-	else</div><div class='del'>-		netif_carrier_off(master-&gt;dev);</div><div class='add'>+	netif_carrier_off(master-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return has_carrier;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void hsr_check_announce(struct net_device *hsr_dev,</div><div class='del'>-			       unsigned char old_operstate)</div><div class='add'>+static void hsr_check_announce(struct net_device *hsr_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(hsr_dev);</div><div class='add'>+	if (netif_running(hsr_dev) &amp;&amp; netif_oper_up(hsr_dev)) {</div><div class='add'>+		/* Enable announce timer and start sending supervisory frames */</div><div class='add'>+		if (!timer_pending(&amp;hsr-&gt;announce_timer)) {</div><div class='add'>+			hsr-&gt;announce_count = 0;</div><div class='add'>+			mod_timer(&amp;hsr-&gt;announce_timer, jiffies +</div><div class='add'>+				  msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if ((hsr_dev-&gt;operstate == IF_OPER_UP)</div><div class='del'>-			&amp;&amp; (old_operstate != IF_OPER_UP)) {</div><div class='del'>-		/* Went up */</div><div class='del'>-		hsr-&gt;announce_count = 0;</div><div class='del'>-		hsr-&gt;announce_timer.expires = jiffies +</div><div class='del'>-				msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);</div><div class='del'>-		add_timer(&amp;hsr-&gt;announce_timer);</div><div class='add'>+		if (hsr-&gt;redbox &amp;&amp; !timer_pending(&amp;hsr-&gt;announce_proxy_timer))</div><div class='add'>+			mod_timer(&amp;hsr-&gt;announce_proxy_timer, jiffies +</div><div class='add'>+				  msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL) / 2);</div><div class='add'>+	} else {</div><div class='add'>+		/* Deactivate the announce timer  */</div><div class='add'>+		timer_delete(&amp;hsr-&gt;announce_timer);</div><div class='add'>+		if (hsr-&gt;redbox)</div><div class='add'>+			timer_delete(&amp;hsr-&gt;announce_proxy_timer);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((hsr_dev-&gt;operstate != IF_OPER_UP) &amp;&amp; (old_operstate == IF_OPER_UP))</div><div class='del'>-		/* Went down */</div><div class='del'>-		del_timer(&amp;hsr-&gt;announce_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hsr_check_carrier_and_operstate(struct hsr_priv *hsr)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_port *master;</div><div class='del'>-	unsigned char old_operstate;</div><div class='ctx'> 	bool has_carrier;</div><div class='ctx'> </div><div class='ctx'> 	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='ctx'> 	/* netif_stacked_transfer_operstate() cannot be used here since</div><div class='ctx'> 	 * it doesn't set IF_OPER_LOWERLAYERDOWN (?)</div><div class='ctx'> 	 */</div><div class='del'>-	old_operstate = master-&gt;dev-&gt;operstate;</div><div class='ctx'> 	has_carrier = hsr_check_carrier(master);</div><div class='ctx'> 	hsr_set_operstate(master, has_carrier);</div><div class='del'>-	hsr_check_announce(master-&gt;dev, old_operstate);</div><div class='add'>+	hsr_check_announce(master-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hsr_get_max_mtu(struct hsr_priv *hsr)</div><div class='hunk'>@@ -126,33 +105,28 @@ int hsr_get_max_mtu(struct hsr_priv *hsr)</div><div class='ctx'> 	struct hsr_port *port;</div><div class='ctx'> </div><div class='ctx'> 	mtu_max = ETH_DATA_LEN;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hsr_for_each_port(hsr, port)</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port)</div><div class='ctx'> 		if (port-&gt;type != HSR_PT_MASTER)</div><div class='ctx'> 			mtu_max = min(port-&gt;dev-&gt;mtu, mtu_max);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (mtu_max &lt; HSR_HLEN)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return mtu_max - HSR_HLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int hsr_dev_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='del'>-	struct hsr_port *master;</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(dev);</div><div class='del'>-	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='ctx'> </div><div class='ctx'> 	if (new_mtu &gt; hsr_get_max_mtu(hsr)) {</div><div class='del'>-		netdev_info(master-&gt;dev, "A HSR master's MTU cannot be greater than the smallest MTU of its slaves minus the HSR Tag length (%d octets).\n",</div><div class='add'>+		netdev_info(dev, "A HSR master's MTU cannot be greater than the smallest MTU of its slaves minus the HSR Tag length (%d octets).\n",</div><div class='ctx'> 			    HSR_HLEN);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -161,45 +135,60 @@ static int hsr_dev_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='ctx'> 	struct hsr_port *port;</div><div class='del'>-	char designation;</div><div class='add'>+	const char *designation = NULL;</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(dev);</div><div class='del'>-	designation = '\0';</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hsr_for_each_port(hsr, port) {</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='ctx'> 		if (port-&gt;type == HSR_PT_MASTER)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		switch (port-&gt;type) {</div><div class='ctx'> 		case HSR_PT_SLAVE_A:</div><div class='del'>-			designation = 'A';</div><div class='add'>+			designation = "Slave A";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case HSR_PT_SLAVE_B:</div><div class='del'>-			designation = 'B';</div><div class='add'>+			designation = "Slave B";</div><div class='add'>+			break;</div><div class='add'>+		case HSR_PT_INTERLINK:</div><div class='add'>+			designation = "Interlink";</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			designation = '?';</div><div class='add'>+			designation = "Unknown";</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!is_slave_up(port-&gt;dev))</div><div class='del'>-			netdev_warn(dev, "Slave %c (%s) is not up; please bring it up to get a fully working HSR network\n",</div><div class='add'>+			netdev_warn(dev, "%s (%s) is not up; please bring it up to get a fully working HSR network\n",</div><div class='ctx'> 				    designation, port-&gt;dev-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (designation == '\0')</div><div class='add'>+	if (!designation)</div><div class='ctx'> 		netdev_warn(dev, "No slave devices configured\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int hsr_dev_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* Nothing to do here. */</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='add'>+</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER)</div><div class='add'>+			continue;</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case HSR_PT_SLAVE_A:</div><div class='add'>+		case HSR_PT_SLAVE_B:</div><div class='add'>+			dev_uc_unsync(port-&gt;dev, dev);</div><div class='add'>+			dev_mc_unsync(port-&gt;dev, dev);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static netdev_features_t hsr_features_recompute(struct hsr_priv *hsr,</div><div class='ctx'> 						netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -216,7 +205,7 @@ static netdev_features_t hsr_features_recompute(struct hsr_priv *hsr,</div><div class='ctx'> 	 * may become enabled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	features &amp;= ~NETIF_F_ONE_FOR_ALL;</div><div class='del'>-	hsr_for_each_port(hsr, port)</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port)</div><div class='ctx'> 		features = netdev_increment_features(features,</div><div class='ctx'> 						     port-&gt;dev-&gt;features,</div><div class='ctx'> 						     mask);</div><div class='hunk'>@@ -232,99 +221,190 @@ static netdev_features_t hsr_fix_features(struct net_device *dev,</div><div class='ctx'> 	return hsr_features_recompute(hsr, features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_priv *hsr = netdev_priv(dev);</div><div class='ctx'> 	struct hsr_port *master;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='del'>-	skb-&gt;dev = master-&gt;dev;</div><div class='del'>-	hsr_forward_skb(skb, master);</div><div class='add'>+	if (master) {</div><div class='add'>+		skb-&gt;dev = master-&gt;dev;</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		skb_reset_mac_len(skb);</div><div class='add'>+		spin_lock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+		hsr_forward_skb(skb, master);</div><div class='add'>+		spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+	} else {</div><div class='add'>+		dev_core_stats_tx_dropped_inc(dev);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static const struct header_ops hsr_header_ops = {</div><div class='ctx'> 	.create	 = eth_header,</div><div class='ctx'> 	.parse	 = eth_header_parse,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void send_hsr_supervision_frame(struct hsr_port *master,</div><div class='del'>-		u8 type, u8 hsrVer)</div><div class='add'>+static struct sk_buff *hsr_init_skb(struct hsr_port *master, int extra)</div><div class='ctx'> {</div><div class='add'>+	struct hsr_priv *hsr = master-&gt;hsr;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int hlen, tlen;</div><div class='del'>-	struct hsr_tag *hsr_tag;</div><div class='del'>-	struct hsr_sup_tag *hsr_stag;</div><div class='del'>-	struct hsr_sup_payload *hsr_sp;</div><div class='del'>-	unsigned long irqflags;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	hlen = LL_RESERVED_SPACE(master-&gt;dev);</div><div class='ctx'> 	tlen = master-&gt;dev-&gt;needed_tailroom;</div><div class='del'>-	skb = dev_alloc_skb(</div><div class='del'>-			sizeof(struct hsr_tag) +</div><div class='del'>-			sizeof(struct hsr_sup_tag) +</div><div class='del'>-			sizeof(struct hsr_sup_payload) + hlen + tlen);</div><div class='add'>+	len = sizeof(struct hsr_sup_tag) + sizeof(struct hsr_sup_payload);</div><div class='add'>+	/* skb size is same for PRP/HSR frames, only difference</div><div class='add'>+	 * being, for PRP it is a trailer and for HSR it is a</div><div class='add'>+	 * header.</div><div class='add'>+	 * RedBox might use @extra more bytes.</div><div class='add'>+	 */</div><div class='add'>+	skb = dev_alloc_skb(len + extra + hlen + tlen);</div><div class='ctx'> </div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return;</div><div class='add'>+	if (!skb)</div><div class='add'>+		return skb;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, hlen);</div><div class='del'>-</div><div class='ctx'> 	skb-&gt;dev = master-&gt;dev;</div><div class='del'>-	skb-&gt;protocol = htons(hsrVer ? ETH_P_HSR : ETH_P_PRP);</div><div class='ctx'> 	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='ctx'> </div><div class='del'>-	if (dev_hard_header(skb, skb-&gt;dev, (hsrVer ? ETH_P_HSR : ETH_P_PRP),</div><div class='del'>-			    master-&gt;hsr-&gt;sup_multicast_addr,</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	if (dev_hard_header(skb, skb-&gt;dev, ETH_P_PRP,</div><div class='add'>+			    hsr-&gt;sup_multicast_addr,</div><div class='ctx'> 			    skb-&gt;dev-&gt;dev_addr, skb-&gt;len) &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_hsr_supervision_frame(struct hsr_port *port,</div><div class='add'>+				       unsigned long *interval,</div><div class='add'>+				       const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = port-&gt;hsr;</div><div class='add'>+	__u8 type = HSR_TLV_LIFE_CHECK;</div><div class='add'>+	struct hsr_sup_payload *hsr_sp;</div><div class='add'>+	struct hsr_sup_tlv *hsr_stlv;</div><div class='add'>+	struct hsr_sup_tag *hsr_stag;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int extra = 0;</div><div class='ctx'> </div><div class='del'>-	if (hsrVer &gt; 0) {</div><div class='del'>-		hsr_tag = skb_put(skb, sizeof(struct hsr_tag));</div><div class='del'>-		hsr_tag-&gt;encap_proto = htons(ETH_P_PRP);</div><div class='del'>-		set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE);</div><div class='add'>+	*interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);</div><div class='add'>+	if (hsr-&gt;announce_count &lt; 3 &amp;&amp; hsr-&gt;prot_version == 0) {</div><div class='add'>+		type = HSR_TLV_ANNOUNCE;</div><div class='add'>+		*interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);</div><div class='add'>+		hsr-&gt;announce_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hsr-&gt;redbox)</div><div class='add'>+		extra = sizeof(struct hsr_sup_tlv) +</div><div class='add'>+			sizeof(struct hsr_sup_payload);</div><div class='add'>+</div><div class='add'>+	skb = hsr_init_skb(port, extra);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev_warn_once(port-&gt;dev, "HSR: Could not send supervision frame\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag));</div><div class='del'>-	set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf));</div><div class='del'>-	set_hsr_stag_HSR_Ver(hsr_stag, hsrVer);</div><div class='add'>+	skb_set_network_header(skb, ETH_HLEN + HSR_HLEN);</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='add'>+</div><div class='add'>+	set_hsr_stag_path(hsr_stag, (hsr-&gt;prot_version ? 0x0 : 0xf));</div><div class='add'>+	set_hsr_stag_HSR_ver(hsr_stag, hsr-&gt;prot_version);</div><div class='ctx'> </div><div class='ctx'> 	/* From HSRv1 on we have separate supervision sequence numbers. */</div><div class='del'>-	spin_lock_irqsave(&amp;master-&gt;hsr-&gt;seqnr_lock, irqflags);</div><div class='del'>-	if (hsrVer &gt; 0) {</div><div class='del'>-		hsr_stag-&gt;sequence_nr = htons(master-&gt;hsr-&gt;sup_sequence_nr);</div><div class='del'>-		hsr_tag-&gt;sequence_nr = htons(master-&gt;hsr-&gt;sequence_nr);</div><div class='del'>-		master-&gt;hsr-&gt;sup_sequence_nr++;</div><div class='del'>-		master-&gt;hsr-&gt;sequence_nr++;</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+	if (hsr-&gt;prot_version &gt; 0) {</div><div class='add'>+		hsr_stag-&gt;sequence_nr = htons(hsr-&gt;sup_sequence_nr);</div><div class='add'>+		hsr-&gt;sup_sequence_nr++;</div><div class='ctx'> 	} else {</div><div class='del'>-		hsr_stag-&gt;sequence_nr = htons(master-&gt;hsr-&gt;sequence_nr);</div><div class='del'>-		master-&gt;hsr-&gt;sequence_nr++;</div><div class='add'>+		hsr_stag-&gt;sequence_nr = htons(hsr-&gt;sequence_nr);</div><div class='add'>+		hsr-&gt;sequence_nr++;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;master-&gt;hsr-&gt;seqnr_lock, irqflags);</div><div class='ctx'> </div><div class='del'>-	hsr_stag-&gt;HSR_TLV_Type = type;</div><div class='del'>-	/* TODO: Why 12 in HSRv0? */</div><div class='del'>-	hsr_stag-&gt;HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12;</div><div class='add'>+	hsr_stag-&gt;tlv.HSR_TLV_type = type;</div><div class='add'>+	/* HSRv0 has 6 unused bytes after the MAC */</div><div class='add'>+	hsr_stag-&gt;tlv.HSR_TLV_length = hsr-&gt;prot_version ?</div><div class='add'>+				sizeof(struct hsr_sup_payload) : 12;</div><div class='ctx'> </div><div class='del'>-	/* Payload: MacAddressA */</div><div class='add'>+	/* Payload: MacAddressA / SAN MAC from ProxyNodeTable */</div><div class='ctx'> 	hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));</div><div class='del'>-	ether_addr_copy(hsr_sp-&gt;MacAddressA, master-&gt;dev-&gt;dev_addr);</div><div class='add'>+	ether_addr_copy(hsr_sp-&gt;macaddress_A, addr);</div><div class='add'>+</div><div class='add'>+	if (hsr-&gt;redbox &amp;&amp;</div><div class='add'>+	    hsr_is_node_in_db(&amp;hsr-&gt;proxy_node_db, addr)) {</div><div class='add'>+		hsr_stlv = skb_put(skb, sizeof(struct hsr_sup_tlv));</div><div class='add'>+		hsr_stlv-&gt;HSR_TLV_type = PRP_TLV_REDBOX_MAC;</div><div class='add'>+		hsr_stlv-&gt;HSR_TLV_length = sizeof(struct hsr_sup_payload);</div><div class='ctx'> </div><div class='del'>-	if (skb_put_padto(skb, ETH_ZLEN + HSR_HLEN))</div><div class='add'>+		/* Payload: MacAddressRedBox */</div><div class='add'>+		hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));</div><div class='add'>+		ether_addr_copy(hsr_sp-&gt;macaddress_A, hsr-&gt;macaddress_redbox);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_put_padto(skb, ETH_ZLEN)) {</div><div class='add'>+		spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	hsr_forward_skb(skb, master);</div><div class='add'>+	hsr_forward_skb(skb, port);</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='ctx'> 	return;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	WARN_ONCE(1, "HSR: Could not send supervision frame\n");</div><div class='del'>-	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void send_prp_supervision_frame(struct hsr_port *master,</div><div class='add'>+				       unsigned long *interval,</div><div class='add'>+				       const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = master-&gt;hsr;</div><div class='add'>+	struct hsr_sup_payload *hsr_sp;</div><div class='add'>+	struct hsr_sup_tag *hsr_stag;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = hsr_init_skb(master, 0);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev_warn_once(master-&gt;dev, "PRP: Could not send supervision frame\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);</div><div class='add'>+	hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag));</div><div class='add'>+	set_hsr_stag_path(hsr_stag, (hsr-&gt;prot_version ? 0x0 : 0xf));</div><div class='add'>+	set_hsr_stag_HSR_ver(hsr_stag, (hsr-&gt;prot_version ? 1 : 0));</div><div class='add'>+</div><div class='add'>+	/* From HSRv1 on we have separate supervision sequence numbers. */</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+	hsr_stag-&gt;sequence_nr = htons(hsr-&gt;sup_sequence_nr);</div><div class='add'>+	hsr-&gt;sup_sequence_nr++;</div><div class='add'>+	hsr_stag-&gt;tlv.HSR_TLV_type = PRP_TLV_LIFE_CHECK_DD;</div><div class='add'>+	hsr_stag-&gt;tlv.HSR_TLV_length = sizeof(struct hsr_sup_payload);</div><div class='add'>+</div><div class='add'>+	/* Payload: MacAddressA */</div><div class='add'>+	hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));</div><div class='add'>+	ether_addr_copy(hsr_sp-&gt;macaddress_A, master-&gt;dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	if (skb_put_padto(skb, ETH_ZLEN)) {</div><div class='add'>+		spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hsr_forward_skb(skb, master);</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Announce (supervision frame) timer function</div><div class='ctx'>  */</div><div class='hunk'>@@ -332,53 +412,192 @@ static void hsr_announce(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='ctx'> 	struct hsr_port *master;</div><div class='add'>+	unsigned long interval;</div><div class='ctx'> </div><div class='del'>-	hsr = from_timer(hsr, t, announce_timer);</div><div class='add'>+	hsr = timer_container_of(hsr, t, announce_timer);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='add'>+	hsr-&gt;proto_ops-&gt;send_sv_frame(master, &amp;interval, master-&gt;dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	if (hsr-&gt;announce_count &lt; 3 &amp;&amp; hsr-&gt;protVersion == 0) {</div><div class='del'>-		send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE,</div><div class='del'>-				hsr-&gt;protVersion);</div><div class='del'>-		hsr-&gt;announce_count++;</div><div class='add'>+	if (is_admin_up(master-&gt;dev))</div><div class='add'>+		mod_timer(&amp;hsr-&gt;announce_timer, jiffies + interval);</div><div class='ctx'> </div><div class='del'>-		hsr-&gt;announce_timer.expires = jiffies +</div><div class='del'>-				msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);</div><div class='del'>-	} else {</div><div class='del'>-		send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK,</div><div class='del'>-				hsr-&gt;protVersion);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		hsr-&gt;announce_timer.expires = jiffies +</div><div class='del'>-				msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);</div><div class='add'>+/* Announce (supervision frame) timer function for RedBox</div><div class='add'>+ */</div><div class='add'>+static void hsr_proxy_announce(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = timer_container_of(hsr, t,</div><div class='add'>+						  announce_proxy_timer);</div><div class='add'>+	struct hsr_port *interlink;</div><div class='add'>+	unsigned long interval = 0;</div><div class='add'>+	struct hsr_node *node;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	/* RedBOX sends supervisory frames to HSR network with MAC addresses</div><div class='add'>+	 * of SAN nodes stored in ProxyNodeTable.</div><div class='add'>+	 */</div><div class='add'>+	interlink = hsr_port_get_hsr(hsr, HSR_PT_INTERLINK);</div><div class='add'>+	if (!interlink)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(node, &amp;hsr-&gt;proxy_node_db, mac_list) {</div><div class='add'>+		if (hsr_addr_is_redbox(hsr, node-&gt;macaddress_A))</div><div class='add'>+			continue;</div><div class='add'>+		hsr-&gt;proto_ops-&gt;send_sv_frame(interlink, &amp;interval,</div><div class='add'>+					      node-&gt;macaddress_A);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_admin_up(master-&gt;dev))</div><div class='del'>-		add_timer(&amp;hsr-&gt;announce_timer);</div><div class='add'>+	if (is_admin_up(interlink-&gt;dev)) {</div><div class='add'>+		if (!interval)</div><div class='add'>+			interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);</div><div class='ctx'> </div><div class='add'>+		mod_timer(&amp;hsr-&gt;announce_proxy_timer, jiffies + interval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hsr_del_ports(struct hsr_priv *hsr)</div><div class='add'>+{</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+</div><div class='add'>+	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_A);</div><div class='add'>+	if (port)</div><div class='add'>+		hsr_del_port(port);</div><div class='ctx'> </div><div class='del'>-/* According to comments in the declaration of struct net_device, this function</div><div class='del'>- * is "Called from unregister, can be used to call free_netdev". Ok then...</div><div class='del'>- */</div><div class='del'>-static void hsr_dev_destroy(struct net_device *hsr_dev)</div><div class='add'>+	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);</div><div class='add'>+	if (port)</div><div class='add'>+		hsr_del_port(port);</div><div class='add'>+</div><div class='add'>+	port = hsr_port_get_hsr(hsr, HSR_PT_INTERLINK);</div><div class='add'>+	if (port)</div><div class='add'>+		hsr_del_port(port);</div><div class='add'>+</div><div class='add'>+	port = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='add'>+	if (port)</div><div class='add'>+		hsr_del_port(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hsr_set_rx_mode(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct hsr_port *port;</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='add'>+</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER)</div><div class='add'>+			continue;</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case HSR_PT_SLAVE_A:</div><div class='add'>+		case HSR_PT_SLAVE_B:</div><div class='add'>+			dev_mc_sync_multiple(port-&gt;dev, dev);</div><div class='add'>+			dev_uc_sync_multiple(port-&gt;dev, dev);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hsr_change_rx_flags(struct net_device *dev, int change)</div><div class='add'>+{</div><div class='ctx'> 	struct hsr_port *port;</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='ctx'> </div><div class='del'>-	hsr = netdev_priv(hsr_dev);</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	hsr_for_each_port(hsr, port)</div><div class='del'>-		hsr_del_port(port);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER)</div><div class='add'>+			continue;</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case HSR_PT_SLAVE_A:</div><div class='add'>+		case HSR_PT_SLAVE_B:</div><div class='add'>+			if (change &amp; IFF_ALLMULTI)</div><div class='add'>+				dev_set_allmulti(port-&gt;dev,</div><div class='add'>+						 dev-&gt;flags &amp;</div><div class='add'>+						 IFF_ALLMULTI ? 1 : -1);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev,</div><div class='add'>+				   __be16 proto, u16 vid)</div><div class='add'>+{</div><div class='add'>+	bool is_slave_a_added = false;</div><div class='add'>+	bool is_slave_b_added = false;</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER ||</div><div class='add'>+		    port-&gt;type == HSR_PT_INTERLINK)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = vlan_vid_add(port-&gt;dev, proto, vid);</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case HSR_PT_SLAVE_A:</div><div class='add'>+			if (ret) {</div><div class='add'>+				/* clean up Slave-B */</div><div class='add'>+				netdev_err(dev, "add vid failed for Slave-A\n");</div><div class='add'>+				if (is_slave_b_added)</div><div class='add'>+					vlan_vid_del(port-&gt;dev, proto, vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			is_slave_a_added = true;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case HSR_PT_SLAVE_B:</div><div class='add'>+			if (ret) {</div><div class='add'>+				/* clean up Slave-A */</div><div class='add'>+				netdev_err(dev, "add vid failed for Slave-B\n");</div><div class='add'>+				if (is_slave_a_added)</div><div class='add'>+					vlan_vid_del(port-&gt;dev, proto, vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			is_slave_b_added = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hsr_ndo_vlan_rx_kill_vid(struct net_device *dev,</div><div class='add'>+				    __be16 proto, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='add'>+</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;hsr-&gt;prune_timer);</div><div class='del'>-	del_timer_sync(&amp;hsr-&gt;announce_timer);</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port) {</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case HSR_PT_SLAVE_A:</div><div class='add'>+		case HSR_PT_SLAVE_B:</div><div class='add'>+			vlan_vid_del(port-&gt;dev, proto, vid);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	synchronize_rcu();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops hsr_device_ops = {</div><div class='hunk'>@@ -386,13 +605,38 @@ static const struct net_device_ops hsr_device_ops = {</div><div class='ctx'> 	.ndo_open = hsr_dev_open,</div><div class='ctx'> 	.ndo_stop = hsr_dev_close,</div><div class='ctx'> 	.ndo_start_xmit = hsr_dev_xmit,</div><div class='add'>+	.ndo_change_rx_flags = hsr_change_rx_flags,</div><div class='ctx'> 	.ndo_fix_features = hsr_fix_features,</div><div class='add'>+	.ndo_set_rx_mode = hsr_set_rx_mode,</div><div class='add'>+	.ndo_vlan_rx_add_vid = hsr_ndo_vlan_rx_add_vid,</div><div class='add'>+	.ndo_vlan_rx_kill_vid = hsr_ndo_vlan_rx_kill_vid,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct device_type hsr_type = {</div><div class='add'>+static const struct device_type hsr_type = {</div><div class='ctx'> 	.name = "hsr",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct hsr_proto_ops hsr_ops = {</div><div class='add'>+	.send_sv_frame = send_hsr_supervision_frame,</div><div class='add'>+	.create_tagged_frame = hsr_create_tagged_frame,</div><div class='add'>+	.get_untagged_frame = hsr_get_untagged_frame,</div><div class='add'>+	.drop_frame = hsr_drop_frame,</div><div class='add'>+	.fill_frame_info = hsr_fill_frame_info,</div><div class='add'>+	.invalid_dan_ingress_frame = hsr_invalid_dan_ingress_frame,</div><div class='add'>+	.register_frame_out = hsr_register_frame_out,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hsr_proto_ops prp_ops = {</div><div class='add'>+	.send_sv_frame = send_prp_supervision_frame,</div><div class='add'>+	.create_tagged_frame = prp_create_tagged_frame,</div><div class='add'>+	.get_untagged_frame = prp_get_untagged_frame,</div><div class='add'>+	.drop_frame = prp_drop_frame,</div><div class='add'>+	.fill_frame_info = prp_fill_frame_info,</div><div class='add'>+	.handle_san_frame = prp_handle_san_frame,</div><div class='add'>+	.update_san_info = prp_update_san_info,</div><div class='add'>+	.register_frame_out = prp_register_frame_out,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void hsr_dev_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	eth_hw_addr_random(dev);</div><div class='hunk'>@@ -402,36 +646,69 @@ void hsr_dev_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;header_ops = &amp;hsr_header_ops;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;hsr_device_ops;</div><div class='ctx'> 	SET_NETDEV_DEVTYPE(dev, &amp;hsr_type);</div><div class='del'>-	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;priv_flags |= IFF_NO_QUEUE | IFF_DISABLE_NETPOLL;</div><div class='add'>+	/* Prevent recursive tx locking */</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	/* Not sure about this. Taken from bridge code. netdevice.h says</div><div class='add'>+	 * it means "Does not change network namespaces".</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='del'>-	dev-&gt;priv_destructor = hsr_dev_destroy;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |</div><div class='ctx'> 			   NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |</div><div class='del'>-			   NETIF_F_HW_VLAN_CTAG_TX;</div><div class='add'>+			   NETIF_F_HW_VLAN_CTAG_TX |</div><div class='add'>+			   NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features = dev-&gt;hw_features;</div><div class='del'>-</div><div class='del'>-	/* Prevent recursive tx locking */</div><div class='del'>-	dev-&gt;features |= NETIF_F_LLTX;</div><div class='del'>-	/* VLAN on top of HSR needs testing and probably some work on</div><div class='del'>-	 * hsr_header_create() etc.</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;features |= NETIF_F_VLAN_CHALLENGED;</div><div class='del'>-	/* Not sure about this. Taken from bridge code. netdev_features.h says</div><div class='del'>-	 * it means "Does not change network namespaces".</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Return true if dev is a HSR master; return false otherwise.</div><div class='ctx'>  */</div><div class='del'>-inline bool is_hsr_master(struct net_device *dev)</div><div class='add'>+bool is_hsr_master(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return (dev-&gt;netdev_ops-&gt;ndo_start_xmit == hsr_dev_xmit);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(is_hsr_master);</div><div class='add'>+</div><div class='add'>+struct net_device *hsr_get_port_ndev(struct net_device *ndev,</div><div class='add'>+				     enum hsr_port_type pt)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = netdev_priv(ndev);</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hsr_for_each_port(hsr, port)</div><div class='add'>+		if (port-&gt;type == pt) {</div><div class='add'>+			dev_hold(port-&gt;dev);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return port-&gt;dev;</div><div class='add'>+		}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hsr_get_port_ndev);</div><div class='add'>+</div><div class='add'>+int hsr_get_port_type(struct net_device *hsr_dev, struct net_device *dev,</div><div class='add'>+		      enum hsr_port_type *type)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = netdev_priv(hsr_dev);</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hsr_for_each_port(hsr, port) {</div><div class='add'>+		if (port-&gt;dev == dev) {</div><div class='add'>+			*type = port-&gt;type;</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hsr_get_port_type);</div><div class='ctx'> </div><div class='ctx'> /* Default multicast address for HSR Supervision frames */</div><div class='ctx'> static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = {</div><div class='hunk'>@@ -439,21 +716,34 @@ static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],</div><div class='del'>-		     unsigned char multicast_spec, u8 protocol_version)</div><div class='add'>+		     struct net_device *interlink, unsigned char multicast_spec,</div><div class='add'>+		     u8 protocol_version, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	bool unregister = false;</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='del'>-	struct hsr_port *port;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(hsr_dev);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hsr-&gt;ports);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hsr-&gt;node_db);</div><div class='del'>-	INIT_LIST_HEAD(&amp;hsr-&gt;self_node_db);</div><div class='del'>-</div><div class='del'>-	ether_addr_copy(hsr_dev-&gt;dev_addr, slave[0]-&gt;dev_addr);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hsr-&gt;proxy_node_db);</div><div class='add'>+	spin_lock_init(&amp;hsr-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_set(hsr_dev, slave[0]-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	/* initialize protocol specific functions */</div><div class='add'>+	if (protocol_version == PRP_V1) {</div><div class='add'>+		/* For PRP, lan_id has most significant 3 bits holding</div><div class='add'>+		 * the net_id of PRP_LAN_ID</div><div class='add'>+		 */</div><div class='add'>+		hsr-&gt;net_id = PRP_LAN_ID &lt;&lt; 1;</div><div class='add'>+		hsr-&gt;proto_ops = &amp;prp_ops;</div><div class='add'>+	} else {</div><div class='add'>+		hsr-&gt;proto_ops = &amp;hsr_ops;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we recognize frames from ourselves in hsr_rcv() */</div><div class='del'>-	res = hsr_create_self_node(&amp;hsr-&gt;self_node_db, hsr_dev-&gt;dev_addr,</div><div class='add'>+	res = hsr_create_self_node(hsr, hsr_dev-&gt;dev_addr,</div><div class='ctx'> 				   slave[1]-&gt;dev_addr);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='hunk'>@@ -465,47 +755,71 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;hsr-&gt;announce_timer, hsr_announce, 0);</div><div class='ctx'> 	timer_setup(&amp;hsr-&gt;prune_timer, hsr_prune_nodes, 0);</div><div class='add'>+	timer_setup(&amp;hsr-&gt;prune_proxy_timer, hsr_prune_proxy_nodes, 0);</div><div class='add'>+	timer_setup(&amp;hsr-&gt;announce_proxy_timer, hsr_proxy_announce, 0);</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(hsr-&gt;sup_multicast_addr, def_multicast_addr);</div><div class='ctx'> 	hsr-&gt;sup_multicast_addr[ETH_ALEN - 1] = multicast_spec;</div><div class='ctx'> </div><div class='del'>-	hsr-&gt;protVersion = protocol_version;</div><div class='del'>-</div><div class='del'>-	/* FIXME: should I modify the value of these?</div><div class='del'>-	 *</div><div class='del'>-	 * - hsr_dev-&gt;flags - i.e.</div><div class='del'>-	 *			IFF_MASTER/SLAVE?</div><div class='del'>-	 * - hsr_dev-&gt;priv_flags - i.e.</div><div class='del'>-	 *			IFF_EBRIDGE?</div><div class='del'>-	 *			IFF_TX_SKB_SHARING?</div><div class='del'>-	 *			IFF_HSR_MASTER/SLAVE?</div><div class='del'>-	 */</div><div class='add'>+	hsr-&gt;prot_version = protocol_version;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the 1st call to netif_carrier_on() gets through */</div><div class='ctx'> 	netif_carrier_off(hsr_dev);</div><div class='ctx'> </div><div class='del'>-	res = hsr_add_port(hsr, hsr_dev, HSR_PT_MASTER);</div><div class='add'>+	res = hsr_add_port(hsr, hsr_dev, HSR_PT_MASTER, extack);</div><div class='ctx'> 	if (res)</div><div class='del'>-		return res;</div><div class='add'>+		goto err_add_master;</div><div class='add'>+</div><div class='add'>+	/* HSR forwarding offload supported in lower device? */</div><div class='add'>+	if ((slave[0]-&gt;features &amp; NETIF_F_HW_HSR_FWD) &amp;&amp;</div><div class='add'>+	    (slave[1]-&gt;features &amp; NETIF_F_HW_HSR_FWD))</div><div class='add'>+		hsr-&gt;fwd_offloaded = true;</div><div class='add'>+</div><div class='add'>+	if ((slave[0]-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER) &amp;&amp;</div><div class='add'>+	    (slave[1]-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER))</div><div class='add'>+		hsr_dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> </div><div class='ctx'> 	res = register_netdevice(hsr_dev);</div><div class='ctx'> 	if (res)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto err_unregister;</div><div class='add'>+</div><div class='add'>+	unregister = true;</div><div class='ctx'> </div><div class='del'>-	res = hsr_add_port(hsr, slave[0], HSR_PT_SLAVE_A);</div><div class='add'>+	res = hsr_add_port(hsr, slave[0], HSR_PT_SLAVE_A, extack);</div><div class='ctx'> 	if (res)</div><div class='del'>-		goto fail;</div><div class='del'>-	res = hsr_add_port(hsr, slave[1], HSR_PT_SLAVE_B);</div><div class='add'>+		goto err_unregister;</div><div class='add'>+</div><div class='add'>+	res = hsr_add_port(hsr, slave[1], HSR_PT_SLAVE_B, extack);</div><div class='ctx'> 	if (res)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto err_unregister;</div><div class='add'>+</div><div class='add'>+	if (protocol_version == PRP_V1) {</div><div class='add'>+		eth_hw_addr_set(slave[1], slave[0]-&gt;dev_addr);</div><div class='add'>+		call_netdevice_notifiers(NETDEV_CHANGEADDR, slave[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (interlink) {</div><div class='add'>+		res = hsr_add_port(hsr, interlink, HSR_PT_INTERLINK, extack);</div><div class='add'>+		if (res)</div><div class='add'>+			goto err_unregister;</div><div class='ctx'> </div><div class='add'>+		hsr-&gt;redbox = true;</div><div class='add'>+		ether_addr_copy(hsr-&gt;macaddress_redbox, interlink-&gt;dev_addr);</div><div class='add'>+		mod_timer(&amp;hsr-&gt;prune_proxy_timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(PRUNE_PROXY_PERIOD));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hsr_debugfs_init(hsr, hsr_dev);</div><div class='ctx'> 	mod_timer(&amp;hsr-&gt;prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	hsr_for_each_port(hsr, port)</div><div class='del'>-		hsr_del_port(port);</div><div class='add'>+err_unregister:</div><div class='add'>+	hsr_del_ports(hsr);</div><div class='add'>+err_add_master:</div><div class='add'>+	hsr_del_self_node(hsr);</div><div class='ctx'> </div><div class='add'>+	if (unregister)</div><div class='add'>+		unregister_netdevice(hsr_dev);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/hsr/hsr_device.h b/net/hsr/hsr_device.h<br/>index 9975e31bbb82..655284095b78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_device.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_device.h</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_DEVICE_H</div><div class='hunk'>@@ -15,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include "hsr_main.h"</div><div class='ctx'> </div><div class='add'>+void hsr_del_ports(struct hsr_priv *hsr);</div><div class='ctx'> void hsr_dev_setup(struct net_device *dev);</div><div class='ctx'> int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],</div><div class='del'>-		     unsigned char multicast_spec, u8 protocol_version);</div><div class='add'>+		     struct net_device *interlink, unsigned char multicast_spec,</div><div class='add'>+		     u8 protocol_version, struct netlink_ext_ack *extack);</div><div class='ctx'> void hsr_check_carrier_and_operstate(struct hsr_priv *hsr);</div><div class='del'>-bool is_hsr_master(struct net_device *dev);</div><div class='ctx'> int hsr_get_max_mtu(struct hsr_priv *hsr);</div><div class='del'>-</div><div class='ctx'> #endif /* __HSR_DEVICE_H */</div><div class='head'>diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c<br/>index 04b5450c5a55..339f0d220212 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_forward.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_forward.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_forward.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_forward.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * Frame router for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hsr_forward.h"</div><div class='hunk'>@@ -17,22 +15,8 @@</div><div class='ctx'> #include "hsr_main.h"</div><div class='ctx'> #include "hsr_framereg.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct hsr_node;</div><div class='ctx'> </div><div class='del'>-struct hsr_frame_info {</div><div class='del'>-	struct sk_buff *skb_std;</div><div class='del'>-	struct sk_buff *skb_hsr;</div><div class='del'>-	struct hsr_port *port_rcv;</div><div class='del'>-	struct hsr_node *node_src;</div><div class='del'>-	u16 sequence_nr;</div><div class='del'>-	bool is_supervision;</div><div class='del'>-	bool is_vlan;</div><div class='del'>-	bool is_local_dest;</div><div class='del'>-	bool is_local_exclusive;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* The uses I can see for these HSR supervision frames are:</div><div class='ctx'>  * 1) Use the frames that are sent after node initialization ("HSR_TLV.Type =</div><div class='ctx'>  *    22") to reset any sequence_nr counters belonging to that node. Useful if</div><div class='hunk'>@@ -50,48 +34,120 @@ struct hsr_frame_info {</div><div class='ctx'>  */</div><div class='ctx'> static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ethhdr *ethHdr;</div><div class='del'>-	struct hsr_sup_tag *hsrSupTag;</div><div class='del'>-	struct hsrv1_ethhdr_sp *hsrV1Hdr;</div><div class='add'>+	struct ethhdr *eth_hdr;</div><div class='add'>+	struct hsr_sup_tag *hsr_sup_tag;</div><div class='add'>+	struct hsrv1_ethhdr_sp *hsr_V1_hdr;</div><div class='add'>+	struct hsr_sup_tlv *hsr_sup_tlv;</div><div class='add'>+	u16 total_length = 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!skb_mac_header_was_set(skb));</div><div class='del'>-	ethHdr = (struct ethhdr *) skb_mac_header(skb);</div><div class='add'>+	eth_hdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Correct addr? */</div><div class='del'>-	if (!ether_addr_equal(ethHdr-&gt;h_dest,</div><div class='add'>+	if (!ether_addr_equal(eth_hdr-&gt;h_dest,</div><div class='ctx'> 			      hsr-&gt;sup_multicast_addr))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Correct ether type?. */</div><div class='del'>-	if (!(ethHdr-&gt;h_proto == htons(ETH_P_PRP)</div><div class='del'>-			|| ethHdr-&gt;h_proto == htons(ETH_P_HSR)))</div><div class='add'>+	if (!(eth_hdr-&gt;h_proto == htons(ETH_P_PRP) ||</div><div class='add'>+	      eth_hdr-&gt;h_proto == htons(ETH_P_HSR)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the supervision header from correct location. */</div><div class='del'>-	if (ethHdr-&gt;h_proto == htons(ETH_P_HSR)) { /* Okay HSRv1. */</div><div class='del'>-		hsrV1Hdr = (struct hsrv1_ethhdr_sp *) skb_mac_header(skb);</div><div class='del'>-		if (hsrV1Hdr-&gt;hsr.encap_proto != htons(ETH_P_PRP))</div><div class='add'>+	if (eth_hdr-&gt;h_proto == htons(ETH_P_HSR)) { /* Okay HSRv1. */</div><div class='add'>+		total_length = sizeof(struct hsrv1_ethhdr_sp);</div><div class='add'>+		if (!pskb_may_pull(skb, total_length))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='del'>-		hsrSupTag = &amp;hsrV1Hdr-&gt;hsr_sup;</div><div class='add'>+		hsr_V1_hdr = (struct hsrv1_ethhdr_sp *)skb_mac_header(skb);</div><div class='add'>+		if (hsr_V1_hdr-&gt;hsr.encap_proto != htons(ETH_P_PRP))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		hsr_sup_tag = &amp;hsr_V1_hdr-&gt;hsr_sup;</div><div class='ctx'> 	} else {</div><div class='del'>-		hsrSupTag = &amp;((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))-&gt;hsr_sup;</div><div class='add'>+		total_length = sizeof(struct hsrv0_ethhdr_sp);</div><div class='add'>+		if (!pskb_may_pull(skb, total_length))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		hsr_sup_tag =</div><div class='add'>+		     &amp;((struct hsrv0_ethhdr_sp *)skb_mac_header(skb))-&gt;hsr_sup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((hsrSupTag-&gt;HSR_TLV_Type != HSR_TLV_ANNOUNCE) &amp;&amp;</div><div class='del'>-	    (hsrSupTag-&gt;HSR_TLV_Type != HSR_TLV_LIFE_CHECK))</div><div class='add'>+	if (hsr_sup_tag-&gt;tlv.HSR_TLV_type != HSR_TLV_ANNOUNCE &amp;&amp;</div><div class='add'>+	    hsr_sup_tag-&gt;tlv.HSR_TLV_type != HSR_TLV_LIFE_CHECK &amp;&amp;</div><div class='add'>+	    hsr_sup_tag-&gt;tlv.HSR_TLV_type != PRP_TLV_LIFE_CHECK_DD &amp;&amp;</div><div class='add'>+	    hsr_sup_tag-&gt;tlv.HSR_TLV_type != PRP_TLV_LIFE_CHECK_DA)</div><div class='ctx'> 		return false;</div><div class='del'>-	if ((hsrSupTag-&gt;HSR_TLV_Length != 12) &amp;&amp;</div><div class='del'>-			(hsrSupTag-&gt;HSR_TLV_Length !=</div><div class='del'>-					sizeof(struct hsr_sup_payload)))</div><div class='add'>+	if (hsr_sup_tag-&gt;tlv.HSR_TLV_length != 12 &amp;&amp;</div><div class='add'>+	    hsr_sup_tag-&gt;tlv.HSR_TLV_length != sizeof(struct hsr_sup_payload))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Get next tlv */</div><div class='add'>+	total_length += hsr_sup_tag-&gt;tlv.HSR_TLV_length;</div><div class='add'>+	if (!pskb_may_pull(skb, total_length))</div><div class='add'>+		return false;</div><div class='add'>+	skb_pull(skb, total_length);</div><div class='add'>+	hsr_sup_tlv = (struct hsr_sup_tlv *)skb-&gt;data;</div><div class='add'>+	skb_push(skb, total_length);</div><div class='add'>+</div><div class='add'>+	/* if this is a redbox supervision frame we need to verify</div><div class='add'>+	 * that more data is available</div><div class='add'>+	 */</div><div class='add'>+	if (hsr_sup_tlv-&gt;HSR_TLV_type == PRP_TLV_REDBOX_MAC) {</div><div class='add'>+		/* tlv length must be a length of a mac address */</div><div class='add'>+		if (hsr_sup_tlv-&gt;HSR_TLV_length != sizeof(struct hsr_sup_payload))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* make sure another tlv follows */</div><div class='add'>+		total_length += sizeof(struct hsr_sup_tlv) + hsr_sup_tlv-&gt;HSR_TLV_length;</div><div class='add'>+		if (!pskb_may_pull(skb, total_length))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* get next tlv */</div><div class='add'>+		skb_pull(skb, total_length);</div><div class='add'>+		hsr_sup_tlv = (struct hsr_sup_tlv *)skb-&gt;data;</div><div class='add'>+		skb_push(skb, total_length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* end of tlvs must follow at the end */</div><div class='add'>+	if (hsr_sup_tlv-&gt;HSR_TLV_type == HSR_TLV_EOT &amp;&amp;</div><div class='add'>+	    hsr_sup_tlv-&gt;HSR_TLV_length != 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_proxy_supervision_frame(struct hsr_priv *hsr,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hsr_sup_payload *payload;</div><div class='add'>+	struct ethhdr *eth_hdr;</div><div class='add'>+	u16 total_length = 0;</div><div class='add'>+</div><div class='add'>+	eth_hdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Get the HSR protocol revision. */</div><div class='add'>+	if (eth_hdr-&gt;h_proto == htons(ETH_P_HSR))</div><div class='add'>+		total_length = sizeof(struct hsrv1_ethhdr_sp);</div><div class='add'>+	else</div><div class='add'>+		total_length = sizeof(struct hsrv0_ethhdr_sp);</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, total_length + sizeof(struct hsr_sup_payload)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, total_length);</div><div class='add'>+	payload = (struct hsr_sup_payload *)skb-&gt;data;</div><div class='add'>+	skb_push(skb, total_length);</div><div class='add'>+</div><div class='add'>+	/* For RedBox (HSR-SAN) check if we have received the supervision</div><div class='add'>+	 * frame with MAC addresses from own ProxyNodeTable.</div><div class='add'>+	 */</div><div class='add'>+	return hsr_is_node_in_db(&amp;hsr-&gt;proxy_node_db,</div><div class='add'>+				 payload-&gt;macaddress_A);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *create_stripped_skb(struct sk_buff *skb_in,</div><div class='del'>-					   struct hsr_frame_info *frame)</div><div class='add'>+static struct sk_buff *create_stripped_skb_hsr(struct sk_buff *skb_in,</div><div class='add'>+					       struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int copylen;</div><div class='hunk'>@@ -100,7 +156,7 @@ static struct sk_buff *create_stripped_skb(struct sk_buff *skb_in,</div><div class='ctx'> 	skb_pull(skb_in, HSR_HLEN);</div><div class='ctx'> 	skb = __pskb_copy(skb_in, skb_headroom(skb_in) - HSR_HLEN, GFP_ATOMIC);</div><div class='ctx'> 	skb_push(skb_in, HSR_HLEN);</div><div class='del'>-	if (skb == NULL)</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='hunk'>@@ -108,7 +164,7 @@ static struct sk_buff *create_stripped_skb(struct sk_buff *skb_in,</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 		skb-&gt;csum_start -= HSR_HLEN;</div><div class='ctx'> </div><div class='del'>-	copylen = 2*ETH_ALEN;</div><div class='add'>+	copylen = 2 * ETH_ALEN;</div><div class='ctx'> 	if (frame-&gt;is_vlan)</div><div class='ctx'> 		copylen += VLAN_HLEN;</div><div class='ctx'> 	src = skb_mac_header(skb_in);</div><div class='hunk'>@@ -119,52 +175,179 @@ static struct sk_buff *create_stripped_skb(struct sk_buff *skb_in,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *frame_get_stripped_skb(struct hsr_frame_info *frame,</div><div class='del'>-					      struct hsr_port *port)</div><div class='add'>+struct sk_buff *hsr_get_untagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+				       struct hsr_port *port)</div><div class='ctx'> {</div><div class='del'>-	if (!frame-&gt;skb_std)</div><div class='del'>-		frame-&gt;skb_std = create_stripped_skb(frame-&gt;skb_hsr, frame);</div><div class='add'>+	if (!frame-&gt;skb_std) {</div><div class='add'>+		if (frame-&gt;skb_hsr)</div><div class='add'>+			frame-&gt;skb_std =</div><div class='add'>+				create_stripped_skb_hsr(frame-&gt;skb_hsr, frame);</div><div class='add'>+		else</div><div class='add'>+			netdev_warn_once(port-&gt;dev,</div><div class='add'>+					 "Unexpected frame received in hsr_get_untagged_frame()\n");</div><div class='add'>+</div><div class='add'>+		if (!frame-&gt;skb_std)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return skb_clone(frame-&gt;skb_std, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sk_buff *prp_get_untagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+				       struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	if (!frame-&gt;skb_std) {</div><div class='add'>+		if (frame-&gt;skb_prp) {</div><div class='add'>+			/* trim the skb by len - HSR_HLEN to exclude RCT */</div><div class='add'>+			skb_trim(frame-&gt;skb_prp,</div><div class='add'>+				 frame-&gt;skb_prp-&gt;len - HSR_HLEN);</div><div class='add'>+			frame-&gt;skb_std =</div><div class='add'>+				__pskb_copy(frame-&gt;skb_prp,</div><div class='add'>+					    skb_headroom(frame-&gt;skb_prp),</div><div class='add'>+					    GFP_ATOMIC);</div><div class='add'>+		} else {</div><div class='add'>+			/* Unexpected */</div><div class='add'>+			WARN_ONCE(1, "%s:%d: Unexpected frame received (port_src %s)\n",</div><div class='add'>+				  __FILE__, __LINE__, port-&gt;dev-&gt;name);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb_clone(frame-&gt;skb_std, GFP_ATOMIC);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void hsr_fill_tag(struct sk_buff *skb, struct hsr_frame_info *frame,</div><div class='del'>-			 struct hsr_port *port, u8 protoVersion)</div><div class='add'>+static void prp_set_lan_id(struct prp_rct *trailer,</div><div class='add'>+			   struct hsr_port *port)</div><div class='ctx'> {</div><div class='del'>-	struct hsr_ethhdr *hsr_ethhdr;</div><div class='ctx'> 	int lane_id;</div><div class='del'>-	int lsdu_size;</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;type == HSR_PT_SLAVE_A)</div><div class='ctx'> 		lane_id = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		lane_id = 1;</div><div class='ctx'> </div><div class='add'>+	/* Add net_id in the upper 3 bits of lane_id */</div><div class='add'>+	lane_id |= port-&gt;hsr-&gt;net_id;</div><div class='add'>+	set_prp_lan_id(trailer, lane_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Tailroom for PRP rct should have been created before calling this */</div><div class='add'>+static struct sk_buff *prp_fill_rct(struct sk_buff *skb,</div><div class='add'>+				    struct hsr_frame_info *frame,</div><div class='add'>+				    struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	struct prp_rct *trailer;</div><div class='add'>+	int min_size = ETH_ZLEN;</div><div class='add'>+	int lsdu_size;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;is_vlan)</div><div class='add'>+		min_size = VLAN_ETH_ZLEN;</div><div class='add'>+</div><div class='add'>+	if (skb_put_padto(skb, min_size))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	trailer = (struct prp_rct *)skb_put(skb, HSR_HLEN);</div><div class='ctx'> 	lsdu_size = skb-&gt;len - 14;</div><div class='ctx'> 	if (frame-&gt;is_vlan)</div><div class='ctx'> 		lsdu_size -= 4;</div><div class='add'>+	prp_set_lan_id(trailer, port);</div><div class='add'>+	set_prp_LSDU_size(trailer, lsdu_size);</div><div class='add'>+	trailer-&gt;sequence_nr = htons(frame-&gt;sequence_nr);</div><div class='add'>+	trailer-&gt;PRP_suffix = htons(ETH_P_PRP);</div><div class='add'>+	skb-&gt;protocol = eth_hdr(skb)-&gt;h_proto;</div><div class='ctx'> </div><div class='del'>-	hsr_ethhdr = (struct hsr_ethhdr *) skb_mac_header(skb);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	set_hsr_tag_path(&amp;hsr_ethhdr-&gt;hsr_tag, lane_id);</div><div class='add'>+static void hsr_set_path_id(struct hsr_frame_info *frame,</div><div class='add'>+			    struct hsr_ethhdr *hsr_ethhdr,</div><div class='add'>+			    struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	int path_id;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;hsr-&gt;prot_version) {</div><div class='add'>+		if (port-&gt;type == HSR_PT_SLAVE_A)</div><div class='add'>+			path_id = 0;</div><div class='add'>+		else</div><div class='add'>+			path_id = 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (frame-&gt;is_supervision)</div><div class='add'>+			path_id = 0xf;</div><div class='add'>+		else</div><div class='add'>+			path_id = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_hsr_tag_path(&amp;hsr_ethhdr-&gt;hsr_tag, path_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *hsr_fill_tag(struct sk_buff *skb,</div><div class='add'>+				    struct hsr_frame_info *frame,</div><div class='add'>+				    struct hsr_port *port, u8 proto_version)</div><div class='add'>+{</div><div class='add'>+	struct hsr_ethhdr *hsr_ethhdr;</div><div class='add'>+	unsigned char *pc;</div><div class='add'>+	int lsdu_size;</div><div class='add'>+</div><div class='add'>+	/* pad to minimum packet size which is 60 + 6 (HSR tag) */</div><div class='add'>+	if (skb_put_padto(skb, ETH_ZLEN + HSR_HLEN))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	lsdu_size = skb-&gt;len - 14;</div><div class='add'>+	if (frame-&gt;is_vlan)</div><div class='add'>+		lsdu_size -= 4;</div><div class='add'>+</div><div class='add'>+	pc = skb_mac_header(skb);</div><div class='add'>+	if (frame-&gt;is_vlan)</div><div class='add'>+		/* This 4-byte shift (size of a vlan tag) does not</div><div class='add'>+		 * mean that the ethhdr starts there. But rather it</div><div class='add'>+		 * provides the proper environment for accessing</div><div class='add'>+		 * the fields, such as hsr_tag etc., just like</div><div class='add'>+		 * when the vlan tag is not there. This is because</div><div class='add'>+		 * the hsr tag is after the vlan tag.</div><div class='add'>+		 */</div><div class='add'>+		hsr_ethhdr = (struct hsr_ethhdr *)(pc + VLAN_HLEN);</div><div class='add'>+	else</div><div class='add'>+		hsr_ethhdr = (struct hsr_ethhdr *)pc;</div><div class='add'>+</div><div class='add'>+	hsr_set_path_id(frame, hsr_ethhdr, port);</div><div class='ctx'> 	set_hsr_tag_LSDU_size(&amp;hsr_ethhdr-&gt;hsr_tag, lsdu_size);</div><div class='ctx'> 	hsr_ethhdr-&gt;hsr_tag.sequence_nr = htons(frame-&gt;sequence_nr);</div><div class='ctx'> 	hsr_ethhdr-&gt;hsr_tag.encap_proto = hsr_ethhdr-&gt;ethhdr.h_proto;</div><div class='del'>-	hsr_ethhdr-&gt;ethhdr.h_proto = htons(protoVersion ?</div><div class='add'>+	hsr_ethhdr-&gt;ethhdr.h_proto = htons(proto_version ?</div><div class='ctx'> 			ETH_P_HSR : ETH_P_PRP);</div><div class='add'>+	skb-&gt;protocol = hsr_ethhdr-&gt;ethhdr.h_proto;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *create_tagged_skb(struct sk_buff *skb_o,</div><div class='del'>-					 struct hsr_frame_info *frame,</div><div class='del'>-					 struct hsr_port *port)</div><div class='add'>+/* If the original frame was an HSR tagged frame, just clone it to be sent</div><div class='add'>+ * unchanged. Otherwise, create a private frame especially tagged for 'port'.</div><div class='add'>+ */</div><div class='add'>+struct sk_buff *hsr_create_tagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+					struct hsr_port *port)</div><div class='ctx'> {</div><div class='del'>-	int movelen;</div><div class='ctx'> 	unsigned char *dst, *src;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int movelen;</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;skb_hsr) {</div><div class='add'>+		struct hsr_ethhdr *hsr_ethhdr =</div><div class='add'>+			(struct hsr_ethhdr *)skb_mac_header(frame-&gt;skb_hsr);</div><div class='add'>+</div><div class='add'>+		/* set the lane id properly */</div><div class='add'>+		hsr_set_path_id(frame, hsr_ethhdr, port);</div><div class='add'>+		return skb_clone(frame-&gt;skb_hsr, GFP_ATOMIC);</div><div class='add'>+	} else if (port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_TAG_INS) {</div><div class='add'>+		return skb_clone(frame-&gt;skb_std, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create the new skb with enough headroom to fit the HSR tag */</div><div class='del'>-	skb = __pskb_copy(skb_o, skb_headroom(skb_o) + HSR_HLEN, GFP_ATOMIC);</div><div class='del'>-	if (skb == NULL)</div><div class='add'>+	skb = __pskb_copy(frame-&gt;skb_std,</div><div class='add'>+			  skb_headroom(frame-&gt;skb_std) + HSR_HLEN, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -180,44 +363,53 @@ static struct sk_buff *create_tagged_skb(struct sk_buff *skb_o,</div><div class='ctx'> 	memmove(dst, src, movelen);</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> </div><div class='del'>-	hsr_fill_tag(skb, frame, port, port-&gt;hsr-&gt;protVersion);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='add'>+	/* skb_put_padto free skb on error and hsr_fill_tag returns NULL in</div><div class='add'>+	 * that case</div><div class='add'>+	 */</div><div class='add'>+	return hsr_fill_tag(skb, frame, port, port-&gt;hsr-&gt;prot_version);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* If the original frame was an HSR tagged frame, just clone it to be sent</div><div class='del'>- * unchanged. Otherwise, create a private frame especially tagged for 'port'.</div><div class='del'>- */</div><div class='del'>-static struct sk_buff *frame_get_tagged_skb(struct hsr_frame_info *frame,</div><div class='del'>-					    struct hsr_port *port)</div><div class='add'>+struct sk_buff *prp_create_tagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+					struct hsr_port *port)</div><div class='ctx'> {</div><div class='del'>-	if (frame-&gt;skb_hsr)</div><div class='del'>-		return skb_clone(frame-&gt;skb_hsr, GFP_ATOMIC);</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if ((port-&gt;type != HSR_PT_SLAVE_A) &amp;&amp; (port-&gt;type != HSR_PT_SLAVE_B)) {</div><div class='del'>-		WARN_ONCE(1, "HSR: Bug: trying to create a tagged frame for a non-ring port");</div><div class='del'>-		return NULL;</div><div class='add'>+	if (frame-&gt;skb_prp) {</div><div class='add'>+		struct prp_rct *trailer = skb_get_PRP_rct(frame-&gt;skb_prp);</div><div class='add'>+</div><div class='add'>+		if (trailer) {</div><div class='add'>+			prp_set_lan_id(trailer, port);</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ONCE(!trailer, "errored PRP skb");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		return skb_clone(frame-&gt;skb_prp, GFP_ATOMIC);</div><div class='add'>+	} else if (port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_TAG_INS) {</div><div class='add'>+		return skb_clone(frame-&gt;skb_std, GFP_ATOMIC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return create_tagged_skb(frame-&gt;skb_std, frame, port);</div><div class='add'>+	skb = skb_copy_expand(frame-&gt;skb_std, skb_headroom(frame-&gt;skb_std),</div><div class='add'>+			      skb_tailroom(frame-&gt;skb_std) + HSR_HLEN,</div><div class='add'>+			      GFP_ATOMIC);</div><div class='add'>+	return prp_fill_rct(skb, frame, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void hsr_deliver_master(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			       struct hsr_node *node_src)</div><div class='ctx'> {</div><div class='ctx'> 	bool was_multicast_frame;</div><div class='del'>-	int res;</div><div class='add'>+	int res, recv_len;</div><div class='ctx'> </div><div class='ctx'> 	was_multicast_frame = (skb-&gt;pkt_type == PACKET_MULTICAST);</div><div class='ctx'> 	hsr_addr_subst_source(node_src, skb);</div><div class='ctx'> 	skb_pull(skb, ETH_HLEN);</div><div class='add'>+	recv_len = skb-&gt;len;</div><div class='ctx'> 	res = netif_rx(skb);</div><div class='ctx'> 	if (res == NET_RX_DROP) {</div><div class='ctx'> 		dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev-&gt;stats.rx_packets++;</div><div class='del'>-		dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='add'>+		dev-&gt;stats.rx_bytes += recv_len;</div><div class='ctx'> 		if (was_multicast_frame)</div><div class='ctx'> 			dev-&gt;stats.multicast++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -234,13 +426,86 @@ static int hsr_xmit(struct sk_buff *skb, struct hsr_port *port,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ether_addr_copy(eth_hdr(skb)-&gt;h_source, port-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* When HSR node is used as RedBox - the frame received from HSR ring</div><div class='add'>+	 * requires source MAC address (SA) replacement to one which can be</div><div class='add'>+	 * recognized by SAN devices (otherwise, frames are dropped by switch)</div><div class='add'>+	 */</div><div class='add'>+	if (port-&gt;type == HSR_PT_INTERLINK)</div><div class='add'>+		ether_addr_copy(eth_hdr(skb)-&gt;h_source,</div><div class='add'>+				port-&gt;hsr-&gt;macaddress_redbox);</div><div class='add'>+</div><div class='ctx'> 	return dev_queue_xmit(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool prp_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	return ((frame-&gt;port_rcv-&gt;type == HSR_PT_SLAVE_A &amp;&amp;</div><div class='add'>+		 port-&gt;type == HSR_PT_SLAVE_B) ||</div><div class='add'>+		(frame-&gt;port_rcv-&gt;type == HSR_PT_SLAVE_B &amp;&amp;</div><div class='add'>+		 port-&gt;type == HSR_PT_SLAVE_A));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hsr_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_FWD)</div><div class='add'>+		return prp_drop_frame(frame, port);</div><div class='add'>+</div><div class='add'>+	/* RedBox specific frames dropping policies</div><div class='add'>+	 *</div><div class='add'>+	 * Do not send HSR supervisory frames to SAN devices</div><div class='add'>+	 */</div><div class='add'>+	if (frame-&gt;is_supervision &amp;&amp; port-&gt;type == HSR_PT_INTERLINK)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Do not forward to other HSR port (A or B) unicast frames which</div><div class='add'>+	 * are addressed to interlink port (and are in the ProxyNodeTable).</div><div class='add'>+	 */</div><div class='add'>+	skb = frame-&gt;skb_hsr;</div><div class='add'>+	if (skb &amp;&amp; prp_drop_frame(frame, port) &amp;&amp;</div><div class='add'>+	    is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest) &amp;&amp;</div><div class='add'>+	    hsr_is_node_in_db(&amp;port-&gt;hsr-&gt;proxy_node_db,</div><div class='add'>+			      eth_hdr(skb)-&gt;h_dest)) {</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not forward to port C (Interlink) frames from nodes A and B</div><div class='add'>+	 * if DA is in NodeTable.</div><div class='add'>+	 */</div><div class='add'>+	if ((frame-&gt;port_rcv-&gt;type == HSR_PT_SLAVE_A ||</div><div class='add'>+	     frame-&gt;port_rcv-&gt;type == HSR_PT_SLAVE_B) &amp;&amp;</div><div class='add'>+	    port-&gt;type == HSR_PT_INTERLINK) {</div><div class='add'>+		skb = frame-&gt;skb_hsr;</div><div class='add'>+		if (skb &amp;&amp; is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest) &amp;&amp;</div><div class='add'>+		    hsr_is_node_in_db(&amp;port-&gt;hsr-&gt;node_db,</div><div class='add'>+				      eth_hdr(skb)-&gt;h_dest)) {</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not forward to port A and B unicast frames received on the</div><div class='add'>+	 * interlink port if it is addressed to one of nodes registered in</div><div class='add'>+	 * the ProxyNodeTable.</div><div class='add'>+	 */</div><div class='add'>+	if ((port-&gt;type == HSR_PT_SLAVE_A || port-&gt;type == HSR_PT_SLAVE_B) &amp;&amp;</div><div class='add'>+	    frame-&gt;port_rcv-&gt;type == HSR_PT_INTERLINK) {</div><div class='add'>+		skb = frame-&gt;skb_std;</div><div class='add'>+		if (skb &amp;&amp; is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest) &amp;&amp;</div><div class='add'>+		    hsr_is_node_in_db(&amp;port-&gt;hsr-&gt;proxy_node_db,</div><div class='add'>+				      eth_hdr(skb)-&gt;h_dest)) {</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Forward the frame through all devices except:</div><div class='ctx'>  * - Back through the receiving device</div><div class='ctx'>  * - If it's a HSR frame: through a device where it has passed before</div><div class='add'>+ * - if it's a PRP frame: through another PRP slave device (no bridge)</div><div class='ctx'>  * - To the local HSR master only if the frame is directly addressed to it, or</div><div class='ctx'>  *   a non-supervision multicast or broadcast frame.</div><div class='ctx'>  *</div><div class='hunk'>@@ -253,50 +518,72 @@ static void hsr_forward_do(struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_port *port;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	bool sent = false;</div><div class='ctx'> </div><div class='ctx'> 	hsr_for_each_port(frame-&gt;port_rcv-&gt;hsr, port) {</div><div class='add'>+		struct hsr_priv *hsr = port-&gt;hsr;</div><div class='ctx'> 		/* Don't send frame back the way it came */</div><div class='ctx'> 		if (port == frame-&gt;port_rcv)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Don't deliver locally unless we should */</div><div class='del'>-		if ((port-&gt;type == HSR_PT_MASTER) &amp;&amp; !frame-&gt;is_local_dest)</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER &amp;&amp; !frame-&gt;is_local_dest)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Deliver frames directly addressed to us to master only */</div><div class='del'>-		if ((port-&gt;type != HSR_PT_MASTER) &amp;&amp; frame-&gt;is_local_exclusive)</div><div class='add'>+		if (port-&gt;type != HSR_PT_MASTER &amp;&amp; frame-&gt;is_local_exclusive)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* Don't send frame over port where it has been sent before */</div><div class='del'>-		if (hsr_register_frame_out(port, frame-&gt;node_src,</div><div class='del'>-					   frame-&gt;sequence_nr))</div><div class='add'>+		/* If hardware duplicate generation is enabled, only send out</div><div class='add'>+		 * one port.</div><div class='add'>+		 */</div><div class='add'>+		if ((port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_DUP) &amp;&amp; sent)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (frame-&gt;is_supervision &amp;&amp; (port-&gt;type == HSR_PT_MASTER)) {</div><div class='del'>-			hsr_handle_sup_frame(frame-&gt;skb_hsr,</div><div class='del'>-					     frame-&gt;node_src,</div><div class='del'>-					     frame-&gt;port_rcv);</div><div class='add'>+		/* Don't send frame over port where it has been sent before.</div><div class='add'>+		 * Also for SAN, this shouldn't be done.</div><div class='add'>+		 */</div><div class='add'>+		if (!frame-&gt;is_from_san &amp;&amp;</div><div class='add'>+		    hsr-&gt;proto_ops-&gt;register_frame_out &amp;&amp;</div><div class='add'>+		    hsr-&gt;proto_ops-&gt;register_frame_out(port, frame))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (frame-&gt;is_supervision &amp;&amp; port-&gt;type == HSR_PT_MASTER &amp;&amp;</div><div class='add'>+		    !frame-&gt;is_proxy_supervision) {</div><div class='add'>+			hsr_handle_sup_frame(frame);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (port-&gt;type != HSR_PT_MASTER)</div><div class='del'>-			skb = frame_get_tagged_skb(frame, port);</div><div class='add'>+		/* Check if frame is to be dropped. Eg. for PRP no forward</div><div class='add'>+		 * between ports, or sending HSR supervision to RedBox.</div><div class='add'>+		 */</div><div class='add'>+		if (hsr-&gt;proto_ops-&gt;drop_frame &amp;&amp;</div><div class='add'>+		    hsr-&gt;proto_ops-&gt;drop_frame(frame, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (port-&gt;type == HSR_PT_SLAVE_A ||</div><div class='add'>+		    port-&gt;type == HSR_PT_SLAVE_B)</div><div class='add'>+			skb = hsr-&gt;proto_ops-&gt;create_tagged_frame(frame, port);</div><div class='ctx'> 		else</div><div class='del'>-			skb = frame_get_stripped_skb(frame, port);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			/* FIXME: Record the dropped frame? */</div><div class='add'>+			skb = hsr-&gt;proto_ops-&gt;get_untagged_frame(frame, port);</div><div class='add'>+</div><div class='add'>+		if (!skb) {</div><div class='add'>+			frame-&gt;port_rcv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;dev = port-&gt;dev;</div><div class='del'>-		if (port-&gt;type == HSR_PT_MASTER)</div><div class='add'>+		if (port-&gt;type == HSR_PT_MASTER) {</div><div class='ctx'> 			hsr_deliver_master(skb, port-&gt;dev, frame-&gt;node_src);</div><div class='del'>-		else</div><div class='del'>-			hsr_xmit(skb, port, frame);</div><div class='add'>+		} else {</div><div class='add'>+			if (!hsr_xmit(skb, port, frame))</div><div class='add'>+				if (port-&gt;type == HSR_PT_SLAVE_A ||</div><div class='add'>+				    port-&gt;type == HSR_PT_SLAVE_B)</div><div class='add'>+					sent = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void check_local_dest(struct hsr_priv *hsr, struct sk_buff *skb,</div><div class='ctx'> 			     struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='hunk'>@@ -307,50 +594,135 @@ static void check_local_dest(struct hsr_priv *hsr, struct sk_buff *skb,</div><div class='ctx'> 		frame-&gt;is_local_exclusive = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((skb-&gt;pkt_type == PACKET_HOST) ||</div><div class='del'>-	    (skb-&gt;pkt_type == PACKET_MULTICAST) ||</div><div class='del'>-	    (skb-&gt;pkt_type == PACKET_BROADCAST)) {</div><div class='add'>+	if (skb-&gt;pkt_type == PACKET_HOST ||</div><div class='add'>+	    skb-&gt;pkt_type == PACKET_MULTICAST ||</div><div class='add'>+	    skb-&gt;pkt_type == PACKET_BROADCAST) {</div><div class='ctx'> 		frame-&gt;is_local_dest = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		frame-&gt;is_local_dest = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void handle_std_frame(struct sk_buff *skb,</div><div class='add'>+			     struct hsr_frame_info *frame)</div><div class='add'>+{</div><div class='add'>+	struct hsr_port *port = frame-&gt;port_rcv;</div><div class='add'>+	struct hsr_priv *hsr = port-&gt;hsr;</div><div class='add'>+</div><div class='add'>+	frame-&gt;skb_hsr = NULL;</div><div class='add'>+	frame-&gt;skb_prp = NULL;</div><div class='add'>+	frame-&gt;skb_std = skb;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;type != HSR_PT_MASTER)</div><div class='add'>+		frame-&gt;is_from_san = true;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;type == HSR_PT_MASTER ||</div><div class='add'>+	    port-&gt;type == HSR_PT_INTERLINK) {</div><div class='add'>+		/* Sequence nr for the master/interlink node */</div><div class='add'>+		lockdep_assert_held(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+		frame-&gt;sequence_nr = hsr-&gt;sequence_nr;</div><div class='add'>+		hsr-&gt;sequence_nr++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int hsr_fill_frame_info(struct hsr_frame_info *frame,</div><div class='del'>-			       struct sk_buff *skb, struct hsr_port *port)</div><div class='add'>+int hsr_fill_frame_info(__be16 proto, struct sk_buff *skb,</div><div class='add'>+			struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='add'>+	struct hsr_port *port = frame-&gt;port_rcv;</div><div class='add'>+	struct hsr_priv *hsr = port-&gt;hsr;</div><div class='add'>+</div><div class='add'>+	/* HSRv0 supervisory frames double as a tag so treat them as tagged. */</div><div class='add'>+	if ((!hsr-&gt;prot_version &amp;&amp; proto == htons(ETH_P_PRP)) ||</div><div class='add'>+	    proto == htons(ETH_P_HSR)) {</div><div class='add'>+		/* Check if skb contains hsr_ethhdr */</div><div class='add'>+		if (skb-&gt;mac_len &lt; sizeof(struct hsr_ethhdr))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* HSR tagged frame :- Data or Supervision */</div><div class='add'>+		frame-&gt;skb_std = NULL;</div><div class='add'>+		frame-&gt;skb_prp = NULL;</div><div class='add'>+		frame-&gt;skb_hsr = skb;</div><div class='add'>+		frame-&gt;sequence_nr = hsr_get_skb_sequence_nr(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Standard frame or PRP from master port */</div><div class='add'>+	handle_std_frame(skb, frame);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int prp_fill_frame_info(__be16 proto, struct sk_buff *skb,</div><div class='add'>+			struct hsr_frame_info *frame)</div><div class='add'>+{</div><div class='add'>+	/* Supervision frame */</div><div class='add'>+	struct prp_rct *rct = skb_get_PRP_rct(skb);</div><div class='add'>+</div><div class='add'>+	if (rct &amp;&amp;</div><div class='add'>+	    prp_check_lsdu_size(skb, rct, frame-&gt;is_supervision)) {</div><div class='add'>+		frame-&gt;skb_hsr = NULL;</div><div class='add'>+		frame-&gt;skb_std = NULL;</div><div class='add'>+		frame-&gt;skb_prp = skb;</div><div class='add'>+		frame-&gt;sequence_nr = prp_get_skb_sequence_nr(rct);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	handle_std_frame(skb, frame);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_frame_info(struct hsr_frame_info *frame,</div><div class='add'>+			   struct sk_buff *skb, struct hsr_port *port)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = port-&gt;hsr;</div><div class='add'>+	struct hsr_vlan_ethhdr *vlan_hdr;</div><div class='add'>+	struct list_head *n_db;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='del'>-	unsigned long irqflags;</div><div class='add'>+	__be16 proto;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	/* Check if skb contains ethhdr */</div><div class='add'>+	if (skb-&gt;mac_len &lt; sizeof(struct ethhdr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(frame, 0, sizeof(*frame));</div><div class='ctx'> 	frame-&gt;is_supervision = is_supervision_frame(port-&gt;hsr, skb);</div><div class='del'>-	frame-&gt;node_src = hsr_get_node(port, skb, frame-&gt;is_supervision);</div><div class='del'>-	if (frame-&gt;node_src == NULL)</div><div class='add'>+	if (frame-&gt;is_supervision &amp;&amp; hsr-&gt;redbox)</div><div class='add'>+		frame-&gt;is_proxy_supervision =</div><div class='add'>+			is_proxy_supervision_frame(port-&gt;hsr, skb);</div><div class='add'>+</div><div class='add'>+	n_db = &amp;hsr-&gt;node_db;</div><div class='add'>+	if (port-&gt;type == HSR_PT_INTERLINK)</div><div class='add'>+		n_db = &amp;hsr-&gt;proxy_node_db;</div><div class='add'>+</div><div class='add'>+	frame-&gt;node_src = hsr_get_node(port, n_db, skb,</div><div class='add'>+				       frame-&gt;is_supervision, port-&gt;type);</div><div class='add'>+	if (!frame-&gt;node_src)</div><div class='ctx'> 		return -1; /* Unknown node and !is_supervision, or no mem */</div><div class='ctx'> </div><div class='del'>-	ethhdr = (struct ethhdr *) skb_mac_header(skb);</div><div class='add'>+	ethhdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='ctx'> 	frame-&gt;is_vlan = false;</div><div class='del'>-	if (ethhdr-&gt;h_proto == htons(ETH_P_8021Q)) {</div><div class='add'>+	proto = ethhdr-&gt;h_proto;</div><div class='add'>+</div><div class='add'>+	if (proto == htons(ETH_P_8021Q))</div><div class='ctx'> 		frame-&gt;is_vlan = true;</div><div class='del'>-		/* FIXME: */</div><div class='del'>-		WARN_ONCE(1, "HSR: VLAN not yet supported");</div><div class='del'>-	}</div><div class='del'>-	if (ethhdr-&gt;h_proto == htons(ETH_P_PRP)</div><div class='del'>-			|| ethhdr-&gt;h_proto == htons(ETH_P_HSR)) {</div><div class='del'>-		frame-&gt;skb_std = NULL;</div><div class='del'>-		frame-&gt;skb_hsr = skb;</div><div class='del'>-		frame-&gt;sequence_nr = hsr_get_skb_sequence_nr(skb);</div><div class='del'>-	} else {</div><div class='del'>-		frame-&gt;skb_std = skb;</div><div class='del'>-		frame-&gt;skb_hsr = NULL;</div><div class='del'>-		/* Sequence nr for the master node */</div><div class='del'>-		spin_lock_irqsave(&amp;port-&gt;hsr-&gt;seqnr_lock, irqflags);</div><div class='del'>-		frame-&gt;sequence_nr = port-&gt;hsr-&gt;sequence_nr;</div><div class='del'>-		port-&gt;hsr-&gt;sequence_nr++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;port-&gt;hsr-&gt;seqnr_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;is_vlan) {</div><div class='add'>+		/* Note: skb-&gt;mac_len might be wrong here. */</div><div class='add'>+		if (!pskb_may_pull(skb,</div><div class='add'>+				   skb_mac_offset(skb) +</div><div class='add'>+				   offsetofend(struct hsr_vlan_ethhdr, vlanhdr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		vlan_hdr = (struct hsr_vlan_ethhdr *)skb_mac_header(skb);</div><div class='add'>+		proto = vlan_hdr-&gt;vlanhdr.h_vlan_encapsulated_proto;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	frame-&gt;is_from_san = false;</div><div class='ctx'> 	frame-&gt;port_rcv = port;</div><div class='add'>+	ret = hsr-&gt;proto_ops-&gt;fill_frame_info(proto, skb, frame);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	check_local_dest(port-&gt;hsr, skb, frame);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -361,24 +733,28 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_frame_info frame;</div><div class='ctx'> </div><div class='del'>-	if (skb_mac_header(skb) != skb-&gt;data) {</div><div class='del'>-		WARN_ONCE(1, "%s:%d: Malformed frame (port_src %s)\n",</div><div class='del'>-			  __FILE__, __LINE__, port-&gt;dev-&gt;name);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (fill_frame_info(&amp;frame, skb, port) &lt; 0)</div><div class='ctx'> 		goto out_drop;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (hsr_fill_frame_info(&amp;frame, skb, port) &lt; 0)</div><div class='del'>-		goto out_drop;</div><div class='ctx'> 	hsr_register_frame_in(frame.node_src, port, frame.sequence_nr);</div><div class='ctx'> 	hsr_forward_do(&amp;frame);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	/* Gets called for ingress frames as well as egress from master port.</div><div class='add'>+	 * So check and increment stats for master port only here.</div><div class='add'>+	 */</div><div class='add'>+	if (port-&gt;type == HSR_PT_MASTER || port-&gt;type == HSR_PT_INTERLINK) {</div><div class='add'>+		port-&gt;dev-&gt;stats.tx_packets++;</div><div class='add'>+		port-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (frame.skb_hsr != NULL)</div><div class='del'>-		kfree_skb(frame.skb_hsr);</div><div class='del'>-	if (frame.skb_std != NULL)</div><div class='del'>-		kfree_skb(frame.skb_std);</div><div class='add'>+	kfree_skb(frame.skb_hsr);</div><div class='add'>+	kfree_skb(frame.skb_prp);</div><div class='add'>+	kfree_skb(frame.skb_std);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_drop:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	port-&gt;dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/hsr/hsr_forward.h b/net/hsr/hsr_forward.h<br/>index 5c5bc4b6b75f..206636750b30 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_forward.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_forward.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_forward.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_forward.h</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_FORWARD_H</div><div class='hunk'>@@ -16,5 +14,18 @@</div><div class='ctx'> #include "hsr_main.h"</div><div class='ctx'> </div><div class='ctx'> void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port);</div><div class='del'>-</div><div class='add'>+struct sk_buff *prp_create_tagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+					struct hsr_port *port);</div><div class='add'>+struct sk_buff *hsr_create_tagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+					struct hsr_port *port);</div><div class='add'>+struct sk_buff *hsr_get_untagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+				       struct hsr_port *port);</div><div class='add'>+struct sk_buff *prp_get_untagged_frame(struct hsr_frame_info *frame,</div><div class='add'>+				       struct hsr_port *port);</div><div class='add'>+bool prp_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port);</div><div class='add'>+bool hsr_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port);</div><div class='add'>+int prp_fill_frame_info(__be16 proto, struct sk_buff *skb,</div><div class='add'>+			struct hsr_frame_info *frame);</div><div class='add'>+int hsr_fill_frame_info(__be16 proto, struct sk_buff *skb,</div><div class='add'>+			struct hsr_frame_info *frame);</div><div class='ctx'> #endif /* __HSR_FORWARD_H */</div><div class='head'>diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c<br/>index 286ceb41ac0c..3a2a2fa7a0a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_framereg.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_framereg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_framereg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_framereg.c</a></div><div class='hunk'>@@ -1,10 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,6 +8,7 @@</div><div class='ctx'>  * interface. A frame is identified by its source MAC address and its HSR</div><div class='ctx'>  * sequence number. This code keeps track of senders and their sequence numbers</div><div class='ctx'>  * to allow filtering of duplicate frames, and to detect HSR ring errors.</div><div class='add'>+ * Same code handles filtering of duplicates for PRP as well.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='hunk'>@@ -22,23 +19,6 @@</div><div class='ctx'> #include "hsr_framereg.h"</div><div class='ctx'> #include "hsr_netlink.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct hsr_node {</div><div class='del'>-	struct list_head	mac_list;</div><div class='del'>-	unsigned char		MacAddressA[ETH_ALEN];</div><div class='del'>-	unsigned char		MacAddressB[ETH_ALEN];</div><div class='del'>-	/* Local slave through which AddrB frames are received from this node */</div><div class='del'>-	enum hsr_port_type	AddrB_port;</div><div class='del'>-	unsigned long		time_in[HSR_PT_PORTS];</div><div class='del'>-	bool			time_in_stale[HSR_PT_PORTS];</div><div class='del'>-	u16			seq_out[HSR_PT_PORTS];</div><div class='del'>-	struct rcu_head		rcu_head;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*	TODO: use hash lists for mac addresses (linux/jhash.h)?    */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* seq_nr_after(a, b) - return true if a is after (higher in sequence than) b,</div><div class='ctx'>  * false otherwise.</div><div class='ctx'>  */</div><div class='hunk'>@@ -47,221 +27,390 @@ static bool seq_nr_after(u16 a, u16 b)</div><div class='ctx'> 	/* Remove inconsistency where</div><div class='ctx'> 	 * seq_nr_after(a, b) == seq_nr_before(a, b)</div><div class='ctx'> 	 */</div><div class='del'>-	if ((int) b - a == 32768)</div><div class='add'>+	if ((int)b - a == 32768)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return (((s16) (b - a)) &lt; 0);</div><div class='add'>+	return (((s16)(b - a)) &lt; 0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #define seq_nr_before(a, b)		seq_nr_after((b), (a))</div><div class='del'>-#define seq_nr_after_or_eq(a, b)	(!seq_nr_before((a), (b)))</div><div class='ctx'> #define seq_nr_before_or_eq(a, b)	(!seq_nr_after((a), (b)))</div><div class='add'>+#define PRP_DROP_WINDOW_LEN 32768</div><div class='ctx'> </div><div class='add'>+bool hsr_addr_is_redbox(struct hsr_priv *hsr, unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	if (!hsr-&gt;redbox || !is_valid_ether_addr(hsr-&gt;macaddress_redbox))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return ether_addr_equal(addr, hsr-&gt;macaddress_redbox);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> bool hsr_addr_is_self(struct hsr_priv *hsr, unsigned char *addr)</div><div class='ctx'> {</div><div class='del'>-	struct hsr_node *node;</div><div class='add'>+	struct hsr_self_node *sn;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='del'>-	node = list_first_or_null_rcu(&amp;hsr-&gt;self_node_db, struct hsr_node,</div><div class='del'>-				      mac_list);</div><div class='del'>-	if (!node) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sn = rcu_dereference(hsr-&gt;self_node);</div><div class='add'>+	if (!sn) {</div><div class='ctx'> 		WARN_ONCE(1, "HSR: No self node\n");</div><div class='del'>-		return false;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ether_addr_equal(addr, node-&gt;MacAddressA))</div><div class='del'>-		return true;</div><div class='del'>-	if (ether_addr_equal(addr, node-&gt;MacAddressB))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	if (ether_addr_equal(addr, sn-&gt;macaddress_A) ||</div><div class='add'>+	    ether_addr_equal(addr, sn-&gt;macaddress_B))</div><div class='add'>+		ret = true;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Search for mac entry. Caller must hold rcu read lock.</div><div class='ctx'>  */</div><div class='del'>-static struct hsr_node *find_node_by_AddrA(struct list_head *node_db,</div><div class='del'>-					   const unsigned char addr[ETH_ALEN])</div><div class='add'>+static struct hsr_node *find_node_by_addr_A(struct list_head *node_db,</div><div class='add'>+					    const unsigned char addr[ETH_ALEN])</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_node *node;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(node, node_db, mac_list) {</div><div class='del'>-		if (ether_addr_equal(node-&gt;MacAddressA, addr))</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_A, addr))</div><div class='ctx'> 			return node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Check if node for a given MAC address is already present in data base</div><div class='add'>+ */</div><div class='add'>+bool hsr_is_node_in_db(struct list_head *node_db,</div><div class='add'>+		       const unsigned char addr[ETH_ALEN])</div><div class='add'>+{</div><div class='add'>+	return !!find_node_by_addr_A(node_db, addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* Helper for device init; the self_node_db is used in hsr_rcv() to recognize</div><div class='add'>+/* Helper for device init; the self_node is used in hsr_rcv() to recognize</div><div class='ctx'>  * frames from self that's been looped over the HSR ring.</div><div class='ctx'>  */</div><div class='del'>-int hsr_create_self_node(struct list_head *self_node_db,</div><div class='del'>-			 unsigned char addr_a[ETH_ALEN],</div><div class='del'>-			 unsigned char addr_b[ETH_ALEN])</div><div class='add'>+int hsr_create_self_node(struct hsr_priv *hsr,</div><div class='add'>+			 const unsigned char addr_a[ETH_ALEN],</div><div class='add'>+			 const unsigned char addr_b[ETH_ALEN])</div><div class='ctx'> {</div><div class='del'>-	struct hsr_node *node, *oldnode;</div><div class='add'>+	struct hsr_self_node *sn, *old;</div><div class='ctx'> </div><div class='del'>-	node = kmalloc(sizeof(*node), GFP_KERNEL);</div><div class='del'>-	if (!node)</div><div class='add'>+	sn = kmalloc(sizeof(*sn), GFP_KERNEL);</div><div class='add'>+	if (!sn)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(node-&gt;MacAddressA, addr_a);</div><div class='del'>-	ether_addr_copy(node-&gt;MacAddressB, addr_b);</div><div class='add'>+	ether_addr_copy(sn-&gt;macaddress_A, addr_a);</div><div class='add'>+	ether_addr_copy(sn-&gt;macaddress_B, addr_b);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	oldnode = list_first_or_null_rcu(self_node_db,</div><div class='del'>-						struct hsr_node, mac_list);</div><div class='del'>-	if (oldnode) {</div><div class='del'>-		list_replace_rcu(&amp;oldnode-&gt;mac_list, &amp;node-&gt;mac_list);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		synchronize_rcu();</div><div class='del'>-		kfree(oldnode);</div><div class='del'>-	} else {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		list_add_tail_rcu(&amp;node-&gt;mac_list, self_node_db);</div><div class='del'>-	}</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	old = rcu_replace_pointer(hsr-&gt;self_node, sn,</div><div class='add'>+				  lockdep_is_held(&amp;hsr-&gt;list_lock));</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='ctx'> </div><div class='add'>+	if (old)</div><div class='add'>+		kfree_rcu(old, rcu_head);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hsr_del_self_node(struct hsr_priv *hsr)</div><div class='add'>+{</div><div class='add'>+	struct hsr_self_node *old;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	old = rcu_replace_pointer(hsr-&gt;self_node, NULL,</div><div class='add'>+				  lockdep_is_held(&amp;hsr-&gt;list_lock));</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	if (old)</div><div class='add'>+		kfree_rcu(old, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hsr_del_nodes(struct list_head *node_db)</div><div class='add'>+{</div><div class='add'>+	struct hsr_node *node;</div><div class='add'>+	struct hsr_node *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(node, tmp, node_db, mac_list)</div><div class='add'>+		kfree(node);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* Allocate an hsr_node and add it to node_db. 'addr' is the node's AddressA;</div><div class='add'>+void prp_handle_san_frame(bool san, enum hsr_port_type port,</div><div class='add'>+			  struct hsr_node *node)</div><div class='add'>+{</div><div class='add'>+	/* Mark if the SAN node is over LAN_A or LAN_B */</div><div class='add'>+	if (port == HSR_PT_SLAVE_A) {</div><div class='add'>+		node-&gt;san_a = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port == HSR_PT_SLAVE_B)</div><div class='add'>+		node-&gt;san_b = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate an hsr_node and add it to node_db. 'addr' is the node's address_A;</div><div class='ctx'>  * seq_out is used to initialize filtering of outgoing duplicate frames</div><div class='ctx'>  * originating from the newly added node.</div><div class='ctx'>  */</div><div class='del'>-struct hsr_node *hsr_add_node(struct list_head *node_db, unsigned char addr[],</div><div class='del'>-			      u16 seq_out)</div><div class='add'>+static struct hsr_node *hsr_add_node(struct hsr_priv *hsr,</div><div class='add'>+				     struct list_head *node_db,</div><div class='add'>+				     unsigned char addr[],</div><div class='add'>+				     u16 seq_out, bool san,</div><div class='add'>+				     enum hsr_port_type rx_port)</div><div class='ctx'> {</div><div class='del'>-	struct hsr_node *node;</div><div class='add'>+	struct hsr_node *new_node, *node;</div><div class='ctx'> 	unsigned long now;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	node = kzalloc(sizeof(*node), GFP_ATOMIC);</div><div class='del'>-	if (!node)</div><div class='add'>+	new_node = kzalloc(sizeof(*new_node), GFP_ATOMIC);</div><div class='add'>+	if (!new_node)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(node-&gt;MacAddressA, addr);</div><div class='add'>+	ether_addr_copy(new_node-&gt;macaddress_A, addr);</div><div class='add'>+	spin_lock_init(&amp;new_node-&gt;seq_out_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* We are only interested in time diffs here, so use current jiffies</div><div class='ctx'> 	 * as initialization. (0 could trigger an spurious ring error warning).</div><div class='ctx'> 	 */</div><div class='ctx'> 	now = jiffies;</div><div class='del'>-	for (i = 0; i &lt; HSR_PT_PORTS; i++)</div><div class='del'>-		node-&gt;time_in[i] = now;</div><div class='del'>-	for (i = 0; i &lt; HSR_PT_PORTS; i++)</div><div class='del'>-		node-&gt;seq_out[i] = seq_out;</div><div class='add'>+	for (i = 0; i &lt; HSR_PT_PORTS; i++) {</div><div class='add'>+		new_node-&gt;time_in[i] = now;</div><div class='add'>+		new_node-&gt;time_out[i] = now;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; HSR_PT_PORTS; i++) {</div><div class='add'>+		new_node-&gt;seq_out[i] = seq_out;</div><div class='add'>+		new_node-&gt;seq_expected[i] = seq_out + 1;</div><div class='add'>+		new_node-&gt;seq_start[i] = seq_out + 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	list_add_tail_rcu(&amp;node-&gt;mac_list, node_db);</div><div class='add'>+	if (san &amp;&amp; hsr-&gt;proto_ops-&gt;handle_san_frame)</div><div class='add'>+		hsr-&gt;proto_ops-&gt;handle_san_frame(san, rx_port, new_node);</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	list_for_each_entry_rcu(node, node_db, mac_list,</div><div class='add'>+				lockdep_is_held(&amp;hsr-&gt;list_lock)) {</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_A, addr))</div><div class='add'>+			goto out;</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_B, addr))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	list_add_tail_rcu(&amp;new_node-&gt;mac_list, node_db);</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	return new_node;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	kfree(new_node);</div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void prp_update_san_info(struct hsr_node *node, bool is_sup)</div><div class='add'>+{</div><div class='add'>+	if (!is_sup)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	node-&gt;san_a = false;</div><div class='add'>+	node-&gt;san_b = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Get the hsr_node from which 'skb' was sent.</div><div class='ctx'>  */</div><div class='del'>-struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb,</div><div class='del'>-			      bool is_sup)</div><div class='add'>+struct hsr_node *hsr_get_node(struct hsr_port *port, struct list_head *node_db,</div><div class='add'>+			      struct sk_buff *skb, bool is_sup,</div><div class='add'>+			      enum hsr_port_type rx_port)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *node_db = &amp;port-&gt;hsr-&gt;node_db;</div><div class='add'>+	struct hsr_priv *hsr = port-&gt;hsr;</div><div class='ctx'> 	struct hsr_node *node;</div><div class='ctx'> 	struct ethhdr *ethhdr;</div><div class='add'>+	struct prp_rct *rct;</div><div class='add'>+	bool san = false;</div><div class='ctx'> 	u16 seq_out;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_mac_header_was_set(skb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	ethhdr = (struct ethhdr *) skb_mac_header(skb);</div><div class='add'>+	ethhdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(node, node_db, mac_list) {</div><div class='del'>-		if (ether_addr_equal(node-&gt;MacAddressA, ethhdr-&gt;h_source))</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_A, ethhdr-&gt;h_source)) {</div><div class='add'>+			if (hsr-&gt;proto_ops-&gt;update_san_info)</div><div class='add'>+				hsr-&gt;proto_ops-&gt;update_san_info(node, is_sup);</div><div class='add'>+			return node;</div><div class='add'>+		}</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_B, ethhdr-&gt;h_source)) {</div><div class='add'>+			if (hsr-&gt;proto_ops-&gt;update_san_info)</div><div class='add'>+				hsr-&gt;proto_ops-&gt;update_san_info(node, is_sup);</div><div class='ctx'> 			return node;</div><div class='del'>-		if (ether_addr_equal(node-&gt;MacAddressB, ethhdr-&gt;h_source))</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if required node is not in proxy nodes table */</div><div class='add'>+	list_for_each_entry_rcu(node, &amp;hsr-&gt;proxy_node_db, mac_list) {</div><div class='add'>+		if (ether_addr_equal(node-&gt;macaddress_A, ethhdr-&gt;h_source)) {</div><div class='add'>+			if (hsr-&gt;proto_ops-&gt;update_san_info)</div><div class='add'>+				hsr-&gt;proto_ops-&gt;update_san_info(node, is_sup);</div><div class='ctx'> 			return node;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Everyone may create a node entry, connected node to a HSR device. */</div><div class='add'>+	/* Everyone may create a node entry, connected node to a HSR/PRP</div><div class='add'>+	 * device.</div><div class='add'>+	 */</div><div class='add'>+	if (ethhdr-&gt;h_proto == htons(ETH_P_PRP) ||</div><div class='add'>+	    ethhdr-&gt;h_proto == htons(ETH_P_HSR)) {</div><div class='add'>+		/* Check if skb contains hsr_ethhdr */</div><div class='add'>+		if (skb-&gt;mac_len &lt; sizeof(struct hsr_ethhdr))</div><div class='add'>+			return NULL;</div><div class='ctx'> </div><div class='del'>-	if (ethhdr-&gt;h_proto == htons(ETH_P_PRP)</div><div class='del'>-			|| ethhdr-&gt;h_proto == htons(ETH_P_HSR)) {</div><div class='ctx'> 		/* Use the existing sequence_nr from the tag as starting point</div><div class='ctx'> 		 * for filtering duplicate frames.</div><div class='ctx'> 		 */</div><div class='ctx'> 		seq_out = hsr_get_skb_sequence_nr(skb) - 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		/* this is called also for frames from master port and</div><div class='del'>-		 * so warn only for non master ports</div><div class='del'>-		 */</div><div class='del'>-		if (port-&gt;type != HSR_PT_MASTER)</div><div class='del'>-			WARN_ONCE(1, "%s: Non-HSR frame\n", __func__);</div><div class='del'>-		seq_out = HSR_SEQNR_START;</div><div class='add'>+		rct = skb_get_PRP_rct(skb);</div><div class='add'>+		if (rct &amp;&amp; prp_check_lsdu_size(skb, rct, is_sup)) {</div><div class='add'>+			seq_out = prp_get_skb_sequence_nr(rct);</div><div class='add'>+		} else {</div><div class='add'>+			if (rx_port != HSR_PT_MASTER)</div><div class='add'>+				san = true;</div><div class='add'>+			seq_out = HSR_SEQNR_START;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return hsr_add_node(node_db, ethhdr-&gt;h_source, seq_out);</div><div class='add'>+	return hsr_add_node(hsr, node_db, ethhdr-&gt;h_source, seq_out,</div><div class='add'>+			    san, rx_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Use the Supervision frame's info about an eventual MacAddressB for merging</div><div class='del'>- * nodes that has previously had their MacAddressB registered as a separate</div><div class='add'>+/* Use the Supervision frame's info about an eventual macaddress_B for merging</div><div class='add'>+ * nodes that has previously had their macaddress_B registered as a separate</div><div class='ctx'>  * node.</div><div class='ctx'>  */</div><div class='del'>-void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr,</div><div class='del'>-			  struct hsr_port *port_rcv)</div><div class='add'>+void hsr_handle_sup_frame(struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='del'>-	struct ethhdr *ethhdr;</div><div class='del'>-	struct hsr_node *node_real;</div><div class='add'>+	struct hsr_node *node_curr = frame-&gt;node_src;</div><div class='add'>+	struct hsr_port *port_rcv = frame-&gt;port_rcv;</div><div class='add'>+	struct hsr_priv *hsr = port_rcv-&gt;hsr;</div><div class='ctx'> 	struct hsr_sup_payload *hsr_sp;</div><div class='add'>+	struct hsr_sup_tlv *hsr_sup_tlv;</div><div class='add'>+	struct hsr_node *node_real;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct list_head *node_db;</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned int pull_size = 0;</div><div class='add'>+	unsigned int total_pull_size = 0;</div><div class='ctx'> </div><div class='del'>-	ethhdr = (struct ethhdr *) skb_mac_header(skb);</div><div class='add'>+	/* Here either frame-&gt;skb_hsr or frame-&gt;skb_prp should be</div><div class='add'>+	 * valid as supervision frame always will have protocol</div><div class='add'>+	 * header info.</div><div class='add'>+	 */</div><div class='add'>+	if (frame-&gt;skb_hsr)</div><div class='add'>+		skb = frame-&gt;skb_hsr;</div><div class='add'>+	else if (frame-&gt;skb_prp)</div><div class='add'>+		skb = frame-&gt;skb_prp;</div><div class='add'>+	else if (frame-&gt;skb_std)</div><div class='add'>+		skb = frame-&gt;skb_std;</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Leave the ethernet header. */</div><div class='del'>-	skb_pull(skb, sizeof(struct ethhdr));</div><div class='add'>+	pull_size = sizeof(struct ethhdr);</div><div class='add'>+	skb_pull(skb, pull_size);</div><div class='add'>+	total_pull_size += pull_size;</div><div class='add'>+</div><div class='add'>+	ethhdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* And leave the HSR tag. */</div><div class='del'>-	if (ethhdr-&gt;h_proto == htons(ETH_P_HSR))</div><div class='del'>-		skb_pull(skb, sizeof(struct hsr_tag));</div><div class='add'>+	if (ethhdr-&gt;h_proto == htons(ETH_P_HSR)) {</div><div class='add'>+		pull_size = sizeof(struct hsr_tag);</div><div class='add'>+		skb_pull(skb, pull_size);</div><div class='add'>+		total_pull_size += pull_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* And leave the HSR sup tag. */</div><div class='del'>-	skb_pull(skb, sizeof(struct hsr_sup_tag));</div><div class='add'>+	pull_size = sizeof(struct hsr_sup_tag);</div><div class='add'>+	skb_pull(skb, pull_size);</div><div class='add'>+	total_pull_size += pull_size;</div><div class='ctx'> </div><div class='del'>-	hsr_sp = (struct hsr_sup_payload *) skb-&gt;data;</div><div class='add'>+	/* get HSR sup payload */</div><div class='add'>+	hsr_sp = (struct hsr_sup_payload *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	/* Merge node_curr (registered on MacAddressB) into node_real */</div><div class='add'>+	/* Merge node_curr (registered on macaddress_B) into node_real */</div><div class='ctx'> 	node_db = &amp;port_rcv-&gt;hsr-&gt;node_db;</div><div class='del'>-	node_real = find_node_by_AddrA(node_db, hsr_sp-&gt;MacAddressA);</div><div class='add'>+	node_real = find_node_by_addr_A(node_db, hsr_sp-&gt;macaddress_A);</div><div class='ctx'> 	if (!node_real)</div><div class='ctx'> 		/* No frame received from AddrA of this node yet */</div><div class='del'>-		node_real = hsr_add_node(node_db, hsr_sp-&gt;MacAddressA,</div><div class='del'>-					 HSR_SEQNR_START - 1);</div><div class='add'>+		node_real = hsr_add_node(hsr, node_db, hsr_sp-&gt;macaddress_A,</div><div class='add'>+					 HSR_SEQNR_START - 1, true,</div><div class='add'>+					 port_rcv-&gt;type);</div><div class='ctx'> 	if (!node_real)</div><div class='ctx'> 		goto done; /* No mem */</div><div class='ctx'> 	if (node_real == node_curr)</div><div class='ctx'> 		/* Node has already been merged */</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(node_real-&gt;MacAddressB, ethhdr-&gt;h_source);</div><div class='add'>+	/* Leave the first HSR sup payload. */</div><div class='add'>+	pull_size = sizeof(struct hsr_sup_payload);</div><div class='add'>+	skb_pull(skb, pull_size);</div><div class='add'>+	total_pull_size += pull_size;</div><div class='add'>+</div><div class='add'>+	/* Get second supervision tlv */</div><div class='add'>+	hsr_sup_tlv = (struct hsr_sup_tlv *)skb-&gt;data;</div><div class='add'>+	/* And check if it is a redbox mac TLV */</div><div class='add'>+	if (hsr_sup_tlv-&gt;HSR_TLV_type == PRP_TLV_REDBOX_MAC) {</div><div class='add'>+		/* We could stop here after pushing hsr_sup_payload,</div><div class='add'>+		 * or proceed and allow macaddress_B and for redboxes.</div><div class='add'>+		 */</div><div class='add'>+		/* Sanity check length */</div><div class='add'>+		if (hsr_sup_tlv-&gt;HSR_TLV_length != 6)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		/* Leave the second HSR sup tlv. */</div><div class='add'>+		pull_size = sizeof(struct hsr_sup_tlv);</div><div class='add'>+		skb_pull(skb, pull_size);</div><div class='add'>+		total_pull_size += pull_size;</div><div class='add'>+</div><div class='add'>+		/* Get redbox mac address. */</div><div class='add'>+		hsr_sp = (struct hsr_sup_payload *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* Check if redbox mac and node mac are equal. */</div><div class='add'>+		if (!ether_addr_equal(node_real-&gt;macaddress_A, hsr_sp-&gt;macaddress_A)) {</div><div class='add'>+			/* This is a redbox supervision frame for a VDAN! */</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(node_real-&gt;macaddress_B, ethhdr-&gt;h_source);</div><div class='add'>+	spin_lock_bh(&amp;node_real-&gt;seq_out_lock);</div><div class='ctx'> 	for (i = 0; i &lt; HSR_PT_PORTS; i++) {</div><div class='ctx'> 		if (!node_curr-&gt;time_in_stale[i] &amp;&amp;</div><div class='ctx'> 		    time_after(node_curr-&gt;time_in[i], node_real-&gt;time_in[i])) {</div><div class='ctx'> 			node_real-&gt;time_in[i] = node_curr-&gt;time_in[i];</div><div class='del'>-			node_real-&gt;time_in_stale[i] = node_curr-&gt;time_in_stale[i];</div><div class='add'>+			node_real-&gt;time_in_stale[i] =</div><div class='add'>+						node_curr-&gt;time_in_stale[i];</div><div class='ctx'> 		}</div><div class='ctx'> 		if (seq_nr_after(node_curr-&gt;seq_out[i], node_real-&gt;seq_out[i]))</div><div class='ctx'> 			node_real-&gt;seq_out[i] = node_curr-&gt;seq_out[i];</div><div class='ctx'> 	}</div><div class='del'>-	node_real-&gt;AddrB_port = port_rcv-&gt;type;</div><div class='del'>-</div><div class='del'>-	list_del_rcu(&amp;node_curr-&gt;mac_list);</div><div class='del'>-	kfree_rcu(node_curr, rcu_head);</div><div class='add'>+	spin_unlock_bh(&amp;node_real-&gt;seq_out_lock);</div><div class='add'>+	node_real-&gt;addr_B_port = port_rcv-&gt;type;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	if (!node_curr-&gt;removed) {</div><div class='add'>+		list_del_rcu(&amp;node_curr-&gt;mac_list);</div><div class='add'>+		node_curr-&gt;removed = true;</div><div class='add'>+		kfree_rcu(node_curr, rcu_head);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	skb_push(skb, sizeof(struct hsrv1_ethhdr_sp));</div><div class='add'>+	/* Push back here */</div><div class='add'>+	skb_push(skb, total_pull_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* 'skb' is a frame meant for this host, that is to be passed to upper layers.</div><div class='ctx'>  *</div><div class='ctx'>  * If the frame was sent by a node's B interface, replace the source</div><div class='del'>- * address with that node's "official" address (MacAddressA) so that upper</div><div class='add'>+ * address with that node's "official" address (macaddress_A) so that upper</div><div class='ctx'>  * layers recognize where it came from.</div><div class='ctx'>  */</div><div class='ctx'> void hsr_addr_subst_source(struct hsr_node *node, struct sk_buff *skb)</div><div class='hunk'>@@ -271,7 +420,7 @@ void hsr_addr_subst_source(struct hsr_node *node, struct sk_buff *skb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;eth_hdr(skb)-&gt;h_source, node-&gt;MacAddressA, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;eth_hdr(skb)-&gt;h_source, node-&gt;macaddress_A, ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 'skb' is a frame meant for another host.</div><div class='hunk'>@@ -296,18 +445,24 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,</div><div class='ctx'> 	if (!is_unicast_ether_addr(eth_hdr(skb)-&gt;h_dest))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	node_dst = find_node_by_AddrA(&amp;port-&gt;hsr-&gt;node_db, eth_hdr(skb)-&gt;h_dest);</div><div class='add'>+	node_dst = find_node_by_addr_A(&amp;port-&gt;hsr-&gt;node_db,</div><div class='add'>+				       eth_hdr(skb)-&gt;h_dest);</div><div class='add'>+	if (!node_dst &amp;&amp; port-&gt;hsr-&gt;redbox)</div><div class='add'>+		node_dst = find_node_by_addr_A(&amp;port-&gt;hsr-&gt;proxy_node_db,</div><div class='add'>+					       eth_hdr(skb)-&gt;h_dest);</div><div class='add'>+</div><div class='ctx'> 	if (!node_dst) {</div><div class='del'>-		WARN_ONCE(1, "%s: Unknown node\n", __func__);</div><div class='add'>+		if (port-&gt;hsr-&gt;prot_version != PRP_V1 &amp;&amp; net_ratelimit())</div><div class='add'>+			netdev_err(skb-&gt;dev, "%s: Unknown node\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (port-&gt;type != node_dst-&gt;AddrB_port)</div><div class='add'>+	if (port-&gt;type != node_dst-&gt;addr_B_port)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(eth_hdr(skb)-&gt;h_dest, node_dst-&gt;MacAddressB);</div><div class='add'>+	if (is_valid_ether_addr(node_dst-&gt;macaddress_B))</div><div class='add'>+		ether_addr_copy(eth_hdr(skb)-&gt;h_dest, node_dst-&gt;macaddress_B);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,</div><div class='ctx'> 			   u16 sequence_nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -315,7 +470,8 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,</div><div class='ctx'> 	 * ensures entries of restarted nodes gets pruned so that they can</div><div class='ctx'> 	 * re-register and resume communications.</div><div class='ctx'> 	 */</div><div class='del'>-	if (seq_nr_before(sequence_nr, node-&gt;seq_out[port-&gt;type]))</div><div class='add'>+	if (!(port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_TAG_RM) &amp;&amp;</div><div class='add'>+	    seq_nr_before(sequence_nr, node-&gt;seq_out[port-&gt;type]))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;time_in[port-&gt;type] = jiffies;</div><div class='hunk'>@@ -330,16 +486,111 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,</div><div class='ctx'>  *	 0 otherwise, or</div><div class='ctx'>  *	 negative error code on error</div><div class='ctx'>  */</div><div class='del'>-int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node,</div><div class='del'>-			   u16 sequence_nr)</div><div class='add'>+int hsr_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame)</div><div class='ctx'> {</div><div class='del'>-	if (seq_nr_before_or_eq(sequence_nr, node-&gt;seq_out[port-&gt;type]))</div><div class='add'>+	struct hsr_node *node = frame-&gt;node_src;</div><div class='add'>+	u16 sequence_nr = frame-&gt;sequence_nr;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;seq_out_lock);</div><div class='add'>+	if (seq_nr_before_or_eq(sequence_nr, node-&gt;seq_out[port-&gt;type]) &amp;&amp;</div><div class='add'>+	    time_is_after_jiffies(node-&gt;time_out[port-&gt;type] +</div><div class='add'>+	    msecs_to_jiffies(HSR_ENTRY_FORGET_TIME))) {</div><div class='add'>+		spin_unlock_bh(&amp;node-&gt;seq_out_lock);</div><div class='ctx'> 		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	node-&gt;time_out[port-&gt;type] = jiffies;</div><div class='ctx'> 	node-&gt;seq_out[port-&gt;type] = sequence_nr;</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;seq_out_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Adaptation of the PRP duplicate discard algorithm described in wireshark</div><div class='add'>+ * wiki (https://wiki.wireshark.org/PRP)</div><div class='add'>+ *</div><div class='add'>+ * A drop window is maintained for both LANs with start sequence set to the</div><div class='add'>+ * first sequence accepted on the LAN that has not been seen on the other LAN,</div><div class='add'>+ * and expected sequence set to the latest received sequence number plus one.</div><div class='add'>+ *</div><div class='add'>+ * When a frame is received on either LAN it is compared against the received</div><div class='add'>+ * frames on the other LAN. If it is outside the drop window of the other LAN</div><div class='add'>+ * the frame is accepted and the drop window is updated.</div><div class='add'>+ * The drop window for the other LAN is reset.</div><div class='add'>+ *</div><div class='add'>+ * 'port' is the outgoing interface</div><div class='add'>+ * 'frame' is the frame to be sent</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	 1 if frame can be shown to have been sent recently on this interface,</div><div class='add'>+ *	 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame)</div><div class='add'>+{</div><div class='add'>+	enum hsr_port_type other_port;</div><div class='add'>+	enum hsr_port_type rcv_port;</div><div class='add'>+	struct hsr_node *node;</div><div class='add'>+	u16 sequence_diff;</div><div class='add'>+	u16 sequence_exp;</div><div class='add'>+	u16 sequence_nr;</div><div class='add'>+</div><div class='add'>+	/* out-going frames are always in order</div><div class='add'>+	 * and can be checked the same way as for HSR</div><div class='add'>+	 */</div><div class='add'>+	if (frame-&gt;port_rcv-&gt;type == HSR_PT_MASTER)</div><div class='add'>+		return hsr_register_frame_out(port, frame);</div><div class='add'>+</div><div class='add'>+	/* for PRP we should only forward frames from the slave ports</div><div class='add'>+	 * to the master port</div><div class='add'>+	 */</div><div class='add'>+	if (port-&gt;type != HSR_PT_MASTER)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	node = frame-&gt;node_src;</div><div class='add'>+	sequence_nr = frame-&gt;sequence_nr;</div><div class='add'>+	sequence_exp = sequence_nr + 1;</div><div class='add'>+	rcv_port = frame-&gt;port_rcv-&gt;type;</div><div class='add'>+	other_port = rcv_port == HSR_PT_SLAVE_A ? HSR_PT_SLAVE_B :</div><div class='add'>+				 HSR_PT_SLAVE_A;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;seq_out_lock);</div><div class='add'>+	if (time_is_before_jiffies(node-&gt;time_out[port-&gt;type] +</div><div class='add'>+	    msecs_to_jiffies(HSR_ENTRY_FORGET_TIME)) ||</div><div class='add'>+	    (node-&gt;seq_start[rcv_port] == node-&gt;seq_expected[rcv_port] &amp;&amp;</div><div class='add'>+	     node-&gt;seq_start[other_port] == node-&gt;seq_expected[other_port])) {</div><div class='add'>+		/* the node hasn't been sending for a while</div><div class='add'>+		 * or both drop windows are empty, forward the frame</div><div class='add'>+		 */</div><div class='add'>+		node-&gt;seq_start[rcv_port] = sequence_nr;</div><div class='add'>+	} else if (seq_nr_before(sequence_nr, node-&gt;seq_expected[other_port]) &amp;&amp;</div><div class='add'>+		   seq_nr_before_or_eq(node-&gt;seq_start[other_port], sequence_nr)) {</div><div class='add'>+		/* drop the frame, update the drop window for the other port</div><div class='add'>+		 * and reset our drop window</div><div class='add'>+		 */</div><div class='add'>+		node-&gt;seq_start[other_port] = sequence_exp;</div><div class='add'>+		node-&gt;seq_expected[rcv_port] = sequence_exp;</div><div class='add'>+		node-&gt;seq_start[rcv_port] = node-&gt;seq_expected[rcv_port];</div><div class='add'>+		spin_unlock_bh(&amp;node-&gt;seq_out_lock);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update the drop window for the port where this frame was received</div><div class='add'>+	 * and clear the drop window for the other port</div><div class='add'>+	 */</div><div class='add'>+	node-&gt;seq_start[other_port] = node-&gt;seq_expected[other_port];</div><div class='add'>+	node-&gt;seq_expected[rcv_port] = sequence_exp;</div><div class='add'>+	sequence_diff = sequence_exp - node-&gt;seq_start[rcv_port];</div><div class='add'>+	if (sequence_diff &gt; PRP_DROP_WINDOW_LEN)</div><div class='add'>+		node-&gt;seq_start[rcv_port] = sequence_exp - PRP_DROP_WINDOW_LEN;</div><div class='add'>+</div><div class='add'>+	node-&gt;time_out[port-&gt;type] = jiffies;</div><div class='add'>+	node-&gt;seq_out[port-&gt;type] = sequence_nr;</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;seq_out_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_MODULE(CONFIG_PRP_DUP_DISCARD_KUNIT_TEST)</div><div class='add'>+EXPORT_SYMBOL(prp_register_frame_out);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct hsr_port *get_late_port(struct hsr_priv *hsr,</div><div class='ctx'> 				      struct hsr_node *node)</div><div class='hunk'>@@ -361,28 +612,36 @@ static struct hsr_port *get_late_port(struct hsr_priv *hsr,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Remove stale sequence_nr records. Called by timer every</div><div class='ctx'>  * HSR_LIFE_CHECK_INTERVAL (two seconds or so).</div><div class='ctx'>  */</div><div class='ctx'> void hsr_prune_nodes(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct hsr_priv *hsr = from_timer(hsr, t, prune_timer);</div><div class='add'>+	struct hsr_priv *hsr = timer_container_of(hsr, t, prune_timer);</div><div class='ctx'> 	struct hsr_node *node;</div><div class='add'>+	struct hsr_node *tmp;</div><div class='ctx'> 	struct hsr_port *port;</div><div class='ctx'> 	unsigned long timestamp;</div><div class='ctx'> 	unsigned long time_a, time_b;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(node, &amp;hsr-&gt;node_db, mac_list) {</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	list_for_each_entry_safe(node, tmp, &amp;hsr-&gt;node_db, mac_list) {</div><div class='add'>+		/* Don't prune own node. Neither time_in[HSR_PT_SLAVE_A]</div><div class='add'>+		 * nor time_in[HSR_PT_SLAVE_B], will ever be updated for</div><div class='add'>+		 * the master port. Thus the master node will be repeatedly</div><div class='add'>+		 * pruned leading to packet loss.</div><div class='add'>+		 */</div><div class='add'>+		if (hsr_addr_is_self(hsr, node-&gt;macaddress_A))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		/* Shorthand */</div><div class='ctx'> 		time_a = node-&gt;time_in[HSR_PT_SLAVE_A];</div><div class='ctx'> 		time_b = node-&gt;time_in[HSR_PT_SLAVE_B];</div><div class='ctx'> </div><div class='ctx'> 		/* Check for timestamps old enough to risk wrap-around */</div><div class='del'>-		if (time_after(jiffies, time_a + MAX_JIFFY_OFFSET/2))</div><div class='add'>+		if (time_after(jiffies, time_a + MAX_JIFFY_OFFSET / 2))</div><div class='ctx'> 			node-&gt;time_in_stale[HSR_PT_SLAVE_A] = true;</div><div class='del'>-		if (time_after(jiffies, time_b + MAX_JIFFY_OFFSET/2))</div><div class='add'>+		if (time_after(jiffies, time_b + MAX_JIFFY_OFFSET / 2))</div><div class='ctx'> 			node-&gt;time_in_stale[HSR_PT_SLAVE_B] = true;</div><div class='ctx'> </div><div class='ctx'> 		/* Get age of newest frame from node.</div><div class='hunk'>@@ -397,26 +656,67 @@ void hsr_prune_nodes(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 		/* Warn of ring error only as long as we get frames at all */</div><div class='ctx'> 		if (time_is_after_jiffies(timestamp +</div><div class='del'>-					msecs_to_jiffies(1.5*MAX_SLAVE_DIFF))) {</div><div class='add'>+				msecs_to_jiffies(1.5 * MAX_SLAVE_DIFF))) {</div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			port = get_late_port(hsr, node);</div><div class='del'>-			if (port != NULL)</div><div class='del'>-				hsr_nl_ringerror(hsr, node-&gt;MacAddressA, port);</div><div class='add'>+			if (port)</div><div class='add'>+				hsr_nl_ringerror(hsr, node-&gt;macaddress_A, port);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Prune old entries */</div><div class='ctx'> 		if (time_is_before_jiffies(timestamp +</div><div class='del'>-					msecs_to_jiffies(HSR_NODE_FORGET_TIME))) {</div><div class='del'>-			hsr_nl_nodedown(hsr, node-&gt;MacAddressA);</div><div class='del'>-			list_del_rcu(&amp;node-&gt;mac_list);</div><div class='del'>-			/* Note that we need to free this entry later: */</div><div class='del'>-			kfree_rcu(node, rcu_head);</div><div class='add'>+				msecs_to_jiffies(HSR_NODE_FORGET_TIME))) {</div><div class='add'>+			hsr_nl_nodedown(hsr, node-&gt;macaddress_A);</div><div class='add'>+			if (!node-&gt;removed) {</div><div class='add'>+				list_del_rcu(&amp;node-&gt;mac_list);</div><div class='add'>+				node-&gt;removed = true;</div><div class='add'>+				/* Note that we need to free this entry later: */</div><div class='add'>+				kfree_rcu(node, rcu_head);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	/* Restart timer */</div><div class='add'>+	mod_timer(&amp;hsr-&gt;prune_timer,</div><div class='add'>+		  jiffies + msecs_to_jiffies(PRUNE_PERIOD));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hsr_prune_proxy_nodes(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = timer_container_of(hsr, t, prune_proxy_timer);</div><div class='add'>+	unsigned long timestamp;</div><div class='add'>+	struct hsr_node *node;</div><div class='add'>+	struct hsr_node *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+	list_for_each_entry_safe(node, tmp, &amp;hsr-&gt;proxy_node_db, mac_list) {</div><div class='add'>+		/* Don't prune RedBox node. */</div><div class='add'>+		if (hsr_addr_is_redbox(hsr, node-&gt;macaddress_A))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		timestamp = node-&gt;time_in[HSR_PT_INTERLINK];</div><div class='add'>+</div><div class='add'>+		/* Prune old entries */</div><div class='add'>+		if (time_is_before_jiffies(timestamp +</div><div class='add'>+				msecs_to_jiffies(HSR_PROXY_NODE_FORGET_TIME))) {</div><div class='add'>+			hsr_nl_nodedown(hsr, node-&gt;macaddress_A);</div><div class='add'>+			if (!node-&gt;removed) {</div><div class='add'>+				list_del_rcu(&amp;node-&gt;mac_list);</div><div class='add'>+				node-&gt;removed = true;</div><div class='add'>+				/* Note that we need to free this entry later: */</div><div class='add'>+				kfree_rcu(node, rcu_head);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;hsr-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	/* Restart timer */</div><div class='add'>+	mod_timer(&amp;hsr-&gt;prune_proxy_timer,</div><div class='add'>+		  jiffies + msecs_to_jiffies(PRUNE_PROXY_PERIOD));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos,</div><div class='ctx'> 			unsigned char addr[ETH_ALEN])</div><div class='hunk'>@@ -427,20 +727,19 @@ void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos,</div><div class='ctx'> 		node = list_first_or_null_rcu(&amp;hsr-&gt;node_db,</div><div class='ctx'> 					      struct hsr_node, mac_list);</div><div class='ctx'> 		if (node)</div><div class='del'>-			ether_addr_copy(addr, node-&gt;MacAddressA);</div><div class='add'>+			ether_addr_copy(addr, node-&gt;macaddress_A);</div><div class='ctx'> 		return node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	node = _pos;</div><div class='ctx'> 	list_for_each_entry_continue_rcu(node, &amp;hsr-&gt;node_db, mac_list) {</div><div class='del'>-		ether_addr_copy(addr, node-&gt;MacAddressA);</div><div class='add'>+		ether_addr_copy(addr, node-&gt;macaddress_A);</div><div class='ctx'> 		return node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> int hsr_get_node_data(struct hsr_priv *hsr,</div><div class='ctx'> 		      const unsigned char *addr,</div><div class='ctx'> 		      unsigned char addr_b[ETH_ALEN],</div><div class='hunk'>@@ -454,15 +753,11 @@ int hsr_get_node_data(struct hsr_priv *hsr,</div><div class='ctx'> 	struct hsr_port *port;</div><div class='ctx'> 	unsigned long tdiff;</div><div class='ctx'> </div><div class='add'>+	node = find_node_by_addr_A(&amp;hsr-&gt;node_db, addr);</div><div class='add'>+	if (!node)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	node = find_node_by_AddrA(&amp;hsr-&gt;node_db, addr);</div><div class='del'>-	if (!node) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -ENOENT;	/* No such entry */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ether_addr_copy(addr_b, node-&gt;MacAddressB);</div><div class='add'>+	ether_addr_copy(addr_b, node-&gt;macaddress_B);</div><div class='ctx'> </div><div class='ctx'> 	tdiff = jiffies - node-&gt;time_in[HSR_PT_SLAVE_A];</div><div class='ctx'> 	if (node-&gt;time_in_stale[HSR_PT_SLAVE_A])</div><div class='hunk'>@@ -488,14 +783,12 @@ int hsr_get_node_data(struct hsr_priv *hsr,</div><div class='ctx'> 	*if1_seq = node-&gt;seq_out[HSR_PT_SLAVE_B];</div><div class='ctx'> 	*if2_seq = node-&gt;seq_out[HSR_PT_SLAVE_A];</div><div class='ctx'> </div><div class='del'>-	if (node-&gt;AddrB_port != HSR_PT_NONE) {</div><div class='del'>-		port = hsr_port_get_hsr(hsr, node-&gt;AddrB_port);</div><div class='add'>+	if (node-&gt;addr_B_port != HSR_PT_NONE) {</div><div class='add'>+		port = hsr_port_get_hsr(hsr, node-&gt;addr_B_port);</div><div class='ctx'> 		*addr_b_ifindex = port-&gt;dev-&gt;ifindex;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*addr_b_ifindex = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/hsr/hsr_framereg.h b/net/hsr/hsr_framereg.h<br/>index 370b45998121..b04948659d84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_framereg.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_framereg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_framereg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_framereg.h</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_FRAMEREG_H</div><div class='hunk'>@@ -16,13 +14,29 @@</div><div class='ctx'> </div><div class='ctx'> struct hsr_node;</div><div class='ctx'> </div><div class='del'>-struct hsr_node *hsr_add_node(struct list_head *node_db, unsigned char addr[],</div><div class='del'>-			      u16 seq_out);</div><div class='del'>-struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb,</div><div class='del'>-			      bool is_sup);</div><div class='del'>-void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr,</div><div class='del'>-			  struct hsr_port *port);</div><div class='add'>+struct hsr_frame_info {</div><div class='add'>+	struct sk_buff *skb_std;</div><div class='add'>+	struct sk_buff *skb_hsr;</div><div class='add'>+	struct sk_buff *skb_prp;</div><div class='add'>+	struct hsr_port *port_rcv;</div><div class='add'>+	struct hsr_node *node_src;</div><div class='add'>+	u16 sequence_nr;</div><div class='add'>+	bool is_supervision;</div><div class='add'>+	bool is_proxy_supervision;</div><div class='add'>+	bool is_vlan;</div><div class='add'>+	bool is_local_dest;</div><div class='add'>+	bool is_local_exclusive;</div><div class='add'>+	bool is_from_san;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void hsr_del_self_node(struct hsr_priv *hsr);</div><div class='add'>+void hsr_del_nodes(struct list_head *node_db);</div><div class='add'>+struct hsr_node *hsr_get_node(struct hsr_port *port, struct list_head *node_db,</div><div class='add'>+			      struct sk_buff *skb, bool is_sup,</div><div class='add'>+			      enum hsr_port_type rx_port);</div><div class='add'>+void hsr_handle_sup_frame(struct hsr_frame_info *frame);</div><div class='ctx'> bool hsr_addr_is_self(struct hsr_priv *hsr, unsigned char *addr);</div><div class='add'>+bool hsr_addr_is_redbox(struct hsr_priv *hsr, unsigned char *addr);</div><div class='ctx'> </div><div class='ctx'> void hsr_addr_subst_source(struct hsr_node *node, struct sk_buff *skb);</div><div class='ctx'> void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,</div><div class='hunk'>@@ -30,14 +44,14 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,</div><div class='ctx'> 			   u16 sequence_nr);</div><div class='del'>-int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node,</div><div class='del'>-			   u16 sequence_nr);</div><div class='add'>+int hsr_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame);</div><div class='ctx'> </div><div class='ctx'> void hsr_prune_nodes(struct timer_list *t);</div><div class='add'>+void hsr_prune_proxy_nodes(struct timer_list *t);</div><div class='ctx'> </div><div class='del'>-int hsr_create_self_node(struct list_head *self_node_db,</div><div class='del'>-			 unsigned char addr_a[ETH_ALEN],</div><div class='del'>-			 unsigned char addr_b[ETH_ALEN]);</div><div class='add'>+int hsr_create_self_node(struct hsr_priv *hsr,</div><div class='add'>+			 const unsigned char addr_a[ETH_ALEN],</div><div class='add'>+			 const unsigned char addr_b[ETH_ALEN]);</div><div class='ctx'> </div><div class='ctx'> void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos,</div><div class='ctx'> 			unsigned char addr[ETH_ALEN]);</div><div class='hunk'>@@ -51,4 +65,35 @@ int hsr_get_node_data(struct hsr_priv *hsr,</div><div class='ctx'> 		      int *if2_age,</div><div class='ctx'> 		      u16 *if2_seq);</div><div class='ctx'> </div><div class='add'>+void prp_handle_san_frame(bool san, enum hsr_port_type port,</div><div class='add'>+			  struct hsr_node *node);</div><div class='add'>+void prp_update_san_info(struct hsr_node *node, bool is_sup);</div><div class='add'>+</div><div class='add'>+bool hsr_is_node_in_db(struct list_head *node_db,</div><div class='add'>+		       const unsigned char addr[ETH_ALEN]);</div><div class='add'>+</div><div class='add'>+int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame);</div><div class='add'>+</div><div class='add'>+struct hsr_node {</div><div class='add'>+	struct list_head	mac_list;</div><div class='add'>+	/* Protect R/W access to seq_out */</div><div class='add'>+	spinlock_t		seq_out_lock;</div><div class='add'>+	unsigned char		macaddress_A[ETH_ALEN];</div><div class='add'>+	unsigned char		macaddress_B[ETH_ALEN];</div><div class='add'>+	/* Local slave through which AddrB frames are received from this node */</div><div class='add'>+	enum hsr_port_type	addr_B_port;</div><div class='add'>+	unsigned long		time_in[HSR_PT_PORTS];</div><div class='add'>+	bool			time_in_stale[HSR_PT_PORTS];</div><div class='add'>+	unsigned long		time_out[HSR_PT_PORTS];</div><div class='add'>+	/* if the node is a SAN */</div><div class='add'>+	bool			san_a;</div><div class='add'>+	bool			san_b;</div><div class='add'>+	u16			seq_out[HSR_PT_PORTS];</div><div class='add'>+	bool			removed;</div><div class='add'>+	/* PRP specific duplicate handling */</div><div class='add'>+	u16			seq_expected[HSR_PT_PORTS];</div><div class='add'>+	u16			seq_start[HSR_PT_PORTS];</div><div class='add'>+	struct rcu_head		rcu_head;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* __HSR_FRAMEREG_H */</div><div class='head'>diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c<br/>index cd37d0011b42..bc94b07101d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_main.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_main.c</a></div><div class='hunk'>@@ -1,15 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * Event handling for HSR and PRP devices.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -19,24 +18,34 @@</div><div class='ctx'> #include "hsr_framereg.h"</div><div class='ctx'> #include "hsr_slave.h"</div><div class='ctx'> </div><div class='add'>+static bool hsr_slave_empty(struct hsr_priv *hsr)</div><div class='add'>+{</div><div class='add'>+	struct hsr_port *port;</div><div class='add'>+</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port)</div><div class='add'>+		if (port-&gt;type != HSR_PT_MASTER)</div><div class='add'>+			return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 			     void *ptr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct hsr_port *port, *master;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='add'>+	LIST_HEAD(list_kill);</div><div class='ctx'> 	int mtu_max;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	dev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> 	port = hsr_port_get_rtnl(dev);</div><div class='del'>-	if (port == NULL) {</div><div class='add'>+	if (!port) {</div><div class='ctx'> 		if (!is_hsr_master(dev))</div><div class='ctx'> 			return NOTIFY_DONE;	/* Not an HSR device */</div><div class='ctx'> 		hsr = netdev_priv(dev);</div><div class='ctx'> 		port = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='del'>-		if (port == NULL) {</div><div class='add'>+		if (!port) {</div><div class='ctx'> 			/* Resend of notification concerning removed device? */</div><div class='ctx'> 			return NOTIFY_DONE;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -50,6 +59,10 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 	case NETDEV_CHANGE:	/* Link (carrier) state changes */</div><div class='ctx'> 		hsr_check_carrier_and_operstate(hsr);</div><div class='ctx'> 		break;</div><div class='add'>+	case NETDEV_CHANGENAME:</div><div class='add'>+		if (is_hsr_master(dev))</div><div class='add'>+			hsr_debugfs_rename(dev);</div><div class='add'>+		break;</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='ctx'> 		if (port-&gt;type == HSR_PT_MASTER) {</div><div class='ctx'> 			/* This should not happen since there's no</div><div class='hunk'>@@ -62,13 +75,23 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 		master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='ctx'> </div><div class='ctx'> 		if (port-&gt;type == HSR_PT_SLAVE_A) {</div><div class='del'>-			ether_addr_copy(master-&gt;dev-&gt;dev_addr, dev-&gt;dev_addr);</div><div class='del'>-			call_netdevice_notifiers(NETDEV_CHANGEADDR, master-&gt;dev);</div><div class='add'>+			eth_hw_addr_set(master-&gt;dev, dev-&gt;dev_addr);</div><div class='add'>+			call_netdevice_notifiers(NETDEV_CHANGEADDR,</div><div class='add'>+						 master-&gt;dev);</div><div class='add'>+</div><div class='add'>+			if (hsr-&gt;prot_version == PRP_V1) {</div><div class='add'>+				port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);</div><div class='add'>+				if (port) {</div><div class='add'>+					eth_hw_addr_set(port-&gt;dev, dev-&gt;dev_addr);</div><div class='add'>+					call_netdevice_notifiers(NETDEV_CHANGEADDR,</div><div class='add'>+								 port-&gt;dev);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure we recognize frames from ourselves in hsr_rcv() */</div><div class='ctx'> 		port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);</div><div class='del'>-		res = hsr_create_self_node(&amp;hsr-&gt;self_node_db,</div><div class='add'>+		res = hsr_create_self_node(hsr,</div><div class='ctx'> 					   master-&gt;dev-&gt;dev_addr,</div><div class='ctx'> 					   port ?</div><div class='ctx'> 						port-&gt;dev-&gt;dev_addr :</div><div class='hunk'>@@ -82,10 +105,20 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 			break; /* Handled in ndo_change_mtu() */</div><div class='ctx'> 		mtu_max = hsr_get_max_mtu(port-&gt;hsr);</div><div class='ctx'> 		master = hsr_port_get_hsr(port-&gt;hsr, HSR_PT_MASTER);</div><div class='del'>-		master-&gt;dev-&gt;mtu = mtu_max;</div><div class='add'>+		WRITE_ONCE(master-&gt;dev-&gt;mtu, mtu_max);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='del'>-		hsr_del_port(port);</div><div class='add'>+		if (!is_hsr_master(dev)) {</div><div class='add'>+			master = hsr_port_get_hsr(port-&gt;hsr, HSR_PT_MASTER);</div><div class='add'>+			hsr_del_port(port);</div><div class='add'>+			if (hsr_slave_empty(master-&gt;hsr)) {</div><div class='add'>+				const struct rtnl_link_ops *ops;</div><div class='add'>+</div><div class='add'>+				ops = master-&gt;dev-&gt;rtnl_link_ops;</div><div class='add'>+				ops-&gt;dellink(master-&gt;dev, &amp;list_kill);</div><div class='add'>+				unregister_netdevice_many(&amp;list_kill);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_PRE_TYPE_CHANGE:</div><div class='ctx'> 		/* HSR works only on Ethernet devices. Refuse slave to change</div><div class='hunk'>@@ -97,40 +130,58 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct hsr_port *hsr_port_get_hsr(struct hsr_priv *hsr, enum hsr_port_type pt)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_port *port;</div><div class='ctx'> </div><div class='del'>-	hsr_for_each_port(hsr, port)</div><div class='add'>+	hsr_for_each_port_rtnl(hsr, port)</div><div class='ctx'> 		if (port-&gt;type == pt)</div><div class='ctx'> 			return port;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hsr_get_version(struct net_device *dev, enum hsr_version *ver)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='add'>+</div><div class='add'>+	hsr = netdev_priv(dev);</div><div class='add'>+	*ver = hsr-&gt;prot_version;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hsr_get_version);</div><div class='add'>+</div><div class='ctx'> static struct notifier_block hsr_nb = {</div><div class='ctx'> 	.notifier_call = hsr_netdev_notify,	/* Slave event notifications */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int __init hsr_init(void)</div><div class='ctx'> {</div><div class='del'>-	int res;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct hsr_tag) != HSR_HLEN);</div><div class='ctx'> </div><div class='del'>-	register_netdevice_notifier(&amp;hsr_nb);</div><div class='del'>-	res = hsr_netlink_init();</div><div class='add'>+	err = register_netdevice_notifier(&amp;hsr_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hsr_netlink_init();</div><div class='add'>+	if (err) {</div><div class='add'>+		unregister_netdevice_notifier(&amp;hsr_nb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return res;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit hsr_exit(void)</div><div class='ctx'> {</div><div class='del'>-	unregister_netdevice_notifier(&amp;hsr_nb);</div><div class='ctx'> 	hsr_netlink_exit();</div><div class='add'>+	hsr_debugfs_remove_root();</div><div class='add'>+	unregister_netdevice_notifier(&amp;hsr_nb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(hsr_init);</div><div class='ctx'> module_exit(hsr_exit);</div><div class='add'>+MODULE_DESCRIPTION("High-availability Seamless Redundancy (HSR) driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h<br/>index 9b9909e89e9e..33b0d2460c9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_main.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_main.h</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_PRIVATE_H</div><div class='hunk'>@@ -14,7 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Time constants as specified in the HSR specification (IEC-62439-3 2010)</div><div class='ctx'>  * Table 8.</div><div class='hunk'>@@ -22,8 +21,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #define HSR_LIFE_CHECK_INTERVAL		 2000 /* ms */</div><div class='ctx'> #define HSR_NODE_FORGET_TIME		60000 /* ms */</div><div class='add'>+#define HSR_PROXY_NODE_FORGET_TIME	60000 /* ms */</div><div class='ctx'> #define HSR_ANNOUNCE_INTERVAL		  100 /* ms */</div><div class='del'>-</div><div class='add'>+#define HSR_ENTRY_FORGET_TIME		  400 /* ms */</div><div class='ctx'> </div><div class='ctx'> /* By how much may slave1 and slave2 timestamps of latest received frame from</div><div class='ctx'>  * each node differ before we notify of communication problem?</div><div class='hunk'>@@ -32,32 +32,20 @@</div><div class='ctx'> #define HSR_SEQNR_START			(USHRT_MAX - 1024)</div><div class='ctx'> #define HSR_SUP_SEQNR_START		(HSR_SEQNR_START / 2)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* How often shall we check for broken ring and remove node entries older than</div><div class='ctx'>  * HSR_NODE_FORGET_TIME?</div><div class='ctx'>  */</div><div class='ctx'> #define PRUNE_PERIOD			 3000 /* ms */</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+#define PRUNE_PROXY_PERIOD		 3000 /* ms */</div><div class='add'>+#define HSR_TLV_EOT				   0  /* End of TLVs */</div><div class='ctx'> #define HSR_TLV_ANNOUNCE		   22</div><div class='ctx'> #define HSR_TLV_LIFE_CHECK		   23</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* HSR Tag.</div><div class='del'>- * As defined in IEC-62439-3:2010, the HSR tag is really { ethertype = 0x88FB,</div><div class='del'>- * path, LSDU_size, sequence Nr }. But we let eth_header() create { h_dest,</div><div class='del'>- * h_source, h_proto = 0x88FB }, and add { path, LSDU_size, sequence Nr,</div><div class='del'>- * encapsulated protocol } instead.</div><div class='del'>- *</div><div class='del'>- * Field names as defined in the IEC:2010 standard for HSR.</div><div class='del'>- */</div><div class='del'>-struct hsr_tag {</div><div class='del'>-	__be16		path_and_LSDU_size;</div><div class='del'>-	__be16		sequence_nr;</div><div class='del'>-	__be16		encap_proto;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HSR_HLEN	6</div><div class='add'>+/* PRP V1 life check for Duplicate discard */</div><div class='add'>+#define PRP_TLV_LIFE_CHECK_DD		   20</div><div class='add'>+/* PRP V1 life check for Duplicate Accept */</div><div class='add'>+#define PRP_TLV_LIFE_CHECK_DA		   21</div><div class='add'>+/* PRP V1 life redundancy box MAC address */</div><div class='add'>+#define PRP_TLV_REDBOX_MAC		   30</div><div class='ctx'> </div><div class='ctx'> #define HSR_V1_SUP_LSDUSIZE		52</div><div class='ctx'> </div><div class='hunk'>@@ -71,27 +59,17 @@ struct hsr_tag {</div><div class='ctx'>  * with the path field in-between, which seems strange. I'm guessing the MAC</div><div class='ctx'>  * address definition is in error.</div><div class='ctx'>  */</div><div class='del'>-static inline u16 get_hsr_tag_path(struct hsr_tag *ht)</div><div class='del'>-{</div><div class='del'>-	return ntohs(ht-&gt;path_and_LSDU_size) &gt;&gt; 12;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 get_hsr_tag_LSDU_size(struct hsr_tag *ht)</div><div class='del'>-{</div><div class='del'>-	return ntohs(ht-&gt;path_and_LSDU_size) &amp; 0x0FFF;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline void set_hsr_tag_path(struct hsr_tag *ht, u16 path)</div><div class='ctx'> {</div><div class='del'>-	ht-&gt;path_and_LSDU_size = htons(</div><div class='del'>-			(ntohs(ht-&gt;path_and_LSDU_size) &amp; 0x0FFF) | (path &lt;&lt; 12));</div><div class='add'>+	ht-&gt;path_and_LSDU_size =</div><div class='add'>+		htons((ntohs(ht-&gt;path_and_LSDU_size) &amp; 0x0FFF) | (path &lt;&lt; 12));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_hsr_tag_LSDU_size(struct hsr_tag *ht, u16 LSDU_size)</div><div class='ctx'> {</div><div class='del'>-	ht-&gt;path_and_LSDU_size = htons(</div><div class='del'>-			(ntohs(ht-&gt;path_and_LSDU_size) &amp; 0xF000) |</div><div class='del'>-			(LSDU_size &amp; 0x0FFF));</div><div class='add'>+	ht-&gt;path_and_LSDU_size = htons((ntohs(ht-&gt;path_and_LSDU_size) &amp;</div><div class='add'>+				       0xF000) | (LSDU_size &amp; 0x0FFF));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hsr_ethhdr {</div><div class='hunk'>@@ -99,39 +77,37 @@ struct hsr_ethhdr {</div><div class='ctx'> 	struct hsr_tag	hsr_tag;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct hsr_vlan_ethhdr {</div><div class='add'>+	struct vlan_ethhdr vlanhdr;</div><div class='add'>+	struct hsr_tag	hsr_tag;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hsr_sup_tlv {</div><div class='add'>+	u8		HSR_TLV_type;</div><div class='add'>+	u8		HSR_TLV_length;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-/* HSR Supervision Frame data types.</div><div class='add'>+/* HSR/PRP Supervision Frame data types.</div><div class='ctx'>  * Field names as defined in the IEC:2010 standard for HSR.</div><div class='ctx'>  */</div><div class='ctx'> struct hsr_sup_tag {</div><div class='del'>-	__be16		path_and_HSR_Ver;</div><div class='del'>-	__be16		sequence_nr;</div><div class='del'>-	__u8		HSR_TLV_Type;</div><div class='del'>-	__u8		HSR_TLV_Length;</div><div class='add'>+	__be16				path_and_HSR_ver;</div><div class='add'>+	__be16				sequence_nr;</div><div class='add'>+	struct hsr_sup_tlv  tlv;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct hsr_sup_payload {</div><div class='del'>-	unsigned char	MacAddressA[ETH_ALEN];</div><div class='add'>+	unsigned char	macaddress_A[ETH_ALEN];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-static inline u16 get_hsr_stag_path(struct hsr_sup_tag *hst)</div><div class='del'>-{</div><div class='del'>-	return get_hsr_tag_path((struct hsr_tag *) hst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 get_hsr_stag_HSR_ver(struct hsr_sup_tag *hst)</div><div class='del'>-{</div><div class='del'>-	return get_hsr_tag_LSDU_size((struct hsr_tag *) hst);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void set_hsr_stag_path(struct hsr_sup_tag *hst, u16 path)</div><div class='ctx'> {</div><div class='del'>-	set_hsr_tag_path((struct hsr_tag *) hst, path);</div><div class='add'>+	set_hsr_tag_path((struct hsr_tag *)hst, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_hsr_stag_HSR_Ver(struct hsr_sup_tag *hst, u16 HSR_Ver)</div><div class='add'>+static inline void set_hsr_stag_HSR_ver(struct hsr_sup_tag *hst, u16 HSR_ver)</div><div class='ctx'> {</div><div class='del'>-	set_hsr_tag_LSDU_size((struct hsr_tag *) hst, HSR_Ver);</div><div class='add'>+	set_hsr_tag_LSDU_size((struct hsr_tag *)hst, HSR_ver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hsrv0_ethhdr_sp {</div><div class='hunk'>@@ -145,41 +121,112 @@ struct hsrv1_ethhdr_sp {</div><div class='ctx'> 	struct hsr_sup_tag	hsr_sup;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* PRP Redunancy Control Trailor (RCT).</div><div class='add'>+ * As defined in IEC-62439-4:2012, the PRP RCT is really { sequence Nr,</div><div class='add'>+ * Lan indentifier (LanId), LSDU_size and PRP_suffix = 0x88FB }.</div><div class='add'>+ *</div><div class='add'>+ * Field names as defined in the IEC:2012 standard for PRP.</div><div class='add'>+ */</div><div class='add'>+struct prp_rct {</div><div class='add'>+	__be16          sequence_nr;</div><div class='add'>+	__be16          lan_id_and_LSDU_size;</div><div class='add'>+	__be16          PRP_suffix;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline u16 get_prp_LSDU_size(struct prp_rct *rct)</div><div class='add'>+{</div><div class='add'>+	return ntohs(rct-&gt;lan_id_and_LSDU_size) &amp; 0x0FFF;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-enum hsr_port_type {</div><div class='del'>-	HSR_PT_NONE = 0,	/* Must be 0, used by framereg */</div><div class='del'>-	HSR_PT_SLAVE_A,</div><div class='del'>-	HSR_PT_SLAVE_B,</div><div class='del'>-	HSR_PT_INTERLINK,</div><div class='del'>-	HSR_PT_MASTER,</div><div class='del'>-	HSR_PT_PORTS,	/* This must be the last item in the enum */</div><div class='del'>-};</div><div class='add'>+static inline void set_prp_lan_id(struct prp_rct *rct, u16 lan_id)</div><div class='add'>+{</div><div class='add'>+	rct-&gt;lan_id_and_LSDU_size = htons((ntohs(rct-&gt;lan_id_and_LSDU_size) &amp;</div><div class='add'>+					  0x0FFF) | (lan_id &lt;&lt; 12));</div><div class='add'>+}</div><div class='add'>+static inline void set_prp_LSDU_size(struct prp_rct *rct, u16 LSDU_size)</div><div class='add'>+{</div><div class='add'>+	rct-&gt;lan_id_and_LSDU_size = htons((ntohs(rct-&gt;lan_id_and_LSDU_size) &amp;</div><div class='add'>+					  0xF000) | (LSDU_size &amp; 0x0FFF));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct hsr_port {</div><div class='ctx'> 	struct list_head	port_list;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='ctx'> 	struct hsr_priv		*hsr;</div><div class='ctx'> 	enum hsr_port_type	type;</div><div class='add'>+	struct rcu_head		rcu;</div><div class='add'>+	unsigned char		original_macaddress[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hsr_frame_info;</div><div class='add'>+struct hsr_node;</div><div class='add'>+</div><div class='add'>+struct hsr_proto_ops {</div><div class='add'>+	/* format and send supervision frame */</div><div class='add'>+	void (*send_sv_frame)(struct hsr_port *port, unsigned long *interval,</div><div class='add'>+			      const unsigned char addr[ETH_ALEN]);</div><div class='add'>+	void (*handle_san_frame)(bool san, enum hsr_port_type port,</div><div class='add'>+				 struct hsr_node *node);</div><div class='add'>+	bool (*drop_frame)(struct hsr_frame_info *frame, struct hsr_port *port);</div><div class='add'>+	struct sk_buff * (*get_untagged_frame)(struct hsr_frame_info *frame,</div><div class='add'>+					       struct hsr_port *port);</div><div class='add'>+	struct sk_buff * (*create_tagged_frame)(struct hsr_frame_info *frame,</div><div class='add'>+						struct hsr_port *port);</div><div class='add'>+	int (*fill_frame_info)(__be16 proto, struct sk_buff *skb,</div><div class='add'>+			       struct hsr_frame_info *frame);</div><div class='add'>+	bool (*invalid_dan_ingress_frame)(__be16 protocol);</div><div class='add'>+	void (*update_san_info)(struct hsr_node *node, bool is_sup);</div><div class='add'>+	int (*register_frame_out)(struct hsr_port *port,</div><div class='add'>+				  struct hsr_frame_info *frame);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hsr_self_node {</div><div class='add'>+	unsigned char	macaddress_A[ETH_ALEN];</div><div class='add'>+	unsigned char	macaddress_B[ETH_ALEN];</div><div class='add'>+	struct rcu_head	rcu_head;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hsr_priv {</div><div class='ctx'> 	struct rcu_head		rcu_head;</div><div class='ctx'> 	struct list_head	ports;</div><div class='ctx'> 	struct list_head	node_db;	/* Known HSR nodes */</div><div class='del'>-	struct list_head	self_node_db;	/* MACs of slaves */</div><div class='add'>+	struct list_head	proxy_node_db;	/* RedBox HSR proxy nodes */</div><div class='add'>+	struct hsr_self_node	__rcu *self_node;	/* MACs of slaves */</div><div class='ctx'> 	struct timer_list	announce_timer;	/* Supervision frame dispatch */</div><div class='add'>+	struct timer_list	announce_proxy_timer;</div><div class='ctx'> 	struct timer_list	prune_timer;</div><div class='add'>+	struct timer_list	prune_proxy_timer;</div><div class='ctx'> 	int announce_count;</div><div class='ctx'> 	u16 sequence_nr;</div><div class='del'>-	u16 sup_sequence_nr;			/* For HSRv1 separate seq_nr for supervision */</div><div class='del'>-	u8 protVersion;					/* Indicate if HSRv0 or HSRv1. */</div><div class='del'>-	spinlock_t seqnr_lock;			/* locking for sequence_nr */</div><div class='del'>-	unsigned char		sup_multicast_addr[ETH_ALEN];</div><div class='add'>+	u16 sup_sequence_nr;	/* For HSRv1 separate seq_nr for supervision */</div><div class='add'>+	enum hsr_version prot_version;	/* Indicate if HSRv0, HSRv1 or PRPv1 */</div><div class='add'>+	spinlock_t seqnr_lock;	/* locking for sequence_nr */</div><div class='add'>+	spinlock_t list_lock;	/* locking for node list */</div><div class='add'>+	struct hsr_proto_ops	*proto_ops;</div><div class='add'>+#define PRP_LAN_ID	0x5     /* 0x1010 for A and 0x1011 for B. Bit 0 is set</div><div class='add'>+				 * based on SLAVE_A or SLAVE_B</div><div class='add'>+				 */</div><div class='add'>+	u8 net_id;		/* for PRP, it occupies most significant 3 bits</div><div class='add'>+				 * of lan_id</div><div class='add'>+				 */</div><div class='add'>+	bool fwd_offloaded;	/* Forwarding offloaded to HW */</div><div class='add'>+	bool redbox;            /* Device supports HSR RedBox */</div><div class='add'>+	unsigned char		macaddress_redbox[ETH_ALEN];</div><div class='add'>+	unsigned char		sup_multicast_addr[ETH_ALEN] __aligned(sizeof(u16));</div><div class='add'>+				/* Align to u16 boundary to avoid unaligned access</div><div class='add'>+				 * in ether_addr_equal</div><div class='add'>+				 */</div><div class='add'>+#ifdef	CONFIG_DEBUG_FS</div><div class='add'>+	struct dentry *node_tbl_root;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define hsr_for_each_port(hsr, port) \</div><div class='ctx'> 	list_for_each_entry_rcu((port), &amp;(hsr)-&gt;ports, port_list)</div><div class='ctx'> </div><div class='add'>+#define hsr_for_each_port_rtnl(hsr, port) \</div><div class='add'>+	list_for_each_entry_rcu((port), &amp;(hsr)-&gt;ports, port_list, lockdep_rtnl_is_held())</div><div class='add'>+</div><div class='ctx'> struct hsr_port *hsr_port_get_hsr(struct hsr_priv *hsr, enum hsr_port_type pt);</div><div class='ctx'> </div><div class='ctx'> /* Caller must ensure skb is a valid HSR frame */</div><div class='hunk'>@@ -187,8 +234,67 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_ethhdr *hsr_ethhdr;</div><div class='ctx'> </div><div class='del'>-	hsr_ethhdr = (struct hsr_ethhdr *) skb_mac_header(skb);</div><div class='add'>+	hsr_ethhdr = (struct hsr_ethhdr *)skb_mac_header(skb);</div><div class='ctx'> 	return ntohs(hsr_ethhdr-&gt;hsr_tag.sequence_nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct prp_rct *skb_get_PRP_rct(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned char *tail = skb_tail_pointer(skb) - HSR_HLEN;</div><div class='add'>+</div><div class='add'>+	struct prp_rct *rct = (struct prp_rct *)tail;</div><div class='add'>+</div><div class='add'>+	if (rct-&gt;PRP_suffix == htons(ETH_P_PRP))</div><div class='add'>+		return rct;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assume caller has confirmed this skb is PRP suffixed */</div><div class='add'>+static inline u16 prp_get_skb_sequence_nr(struct prp_rct *rct)</div><div class='add'>+{</div><div class='add'>+	return ntohs(rct-&gt;sequence_nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* assume there is a valid rct */</div><div class='add'>+static inline bool prp_check_lsdu_size(struct sk_buff *skb,</div><div class='add'>+				       struct prp_rct *rct,</div><div class='add'>+				       bool is_sup)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *ethhdr;</div><div class='add'>+	int expected_lsdu_size;</div><div class='add'>+</div><div class='add'>+	if (is_sup) {</div><div class='add'>+		expected_lsdu_size = HSR_V1_SUP_LSDUSIZE;</div><div class='add'>+	} else {</div><div class='add'>+		ethhdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='add'>+		expected_lsdu_size = skb-&gt;len - 14;</div><div class='add'>+		if (ethhdr-&gt;h_proto == htons(ETH_P_8021Q))</div><div class='add'>+			expected_lsdu_size -= 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (expected_lsdu_size == get_prp_LSDU_size(rct));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_DEBUG_FS)</div><div class='add'>+void hsr_debugfs_rename(struct net_device *dev);</div><div class='add'>+void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev);</div><div class='add'>+void hsr_debugfs_term(struct hsr_priv *priv);</div><div class='add'>+void hsr_debugfs_create_root(void);</div><div class='add'>+void hsr_debugfs_remove_root(void);</div><div class='add'>+#else</div><div class='add'>+static inline void hsr_debugfs_rename(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void hsr_debugfs_init(struct hsr_priv *priv,</div><div class='add'>+				    struct net_device *hsr_dev)</div><div class='add'>+{}</div><div class='add'>+static inline void hsr_debugfs_term(struct hsr_priv *priv)</div><div class='add'>+{}</div><div class='add'>+static inline void hsr_debugfs_create_root(void)</div><div class='add'>+{}</div><div class='add'>+static inline void hsr_debugfs_remove_root(void)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /*  __HSR_PRIVATE_H */</div><div class='head'>diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c<br/>index b9cce0fd5696..db0b0af7a692 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_netlink.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='ctx'>  *</div><div class='del'>- * Routines for handling Netlink messages for HSR.</div><div class='add'>+ * Routines for handling Netlink messages for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hsr_netlink.h"</div><div class='hunk'>@@ -26,82 +22,166 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = {</div><div class='ctx'> 	[IFLA_HSR_VERSION]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_HSR_SUPERVISION_ADDR]	= { .len = ETH_ALEN },</div><div class='ctx'> 	[IFLA_HSR_SEQ_NR]		= { .type = NLA_U16 },</div><div class='add'>+	[IFLA_HSR_PROTOCOL]		= { .type = NLA_U8 },</div><div class='add'>+	[IFLA_HSR_INTERLINK]		= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Here, it seems a netdevice has already been allocated for us, and the</div><div class='ctx'>  * hsr_dev_setup routine has been executed. Nice!</div><div class='ctx'>  */</div><div class='del'>-static int hsr_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-		       struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int hsr_newlink(struct net_device *dev,</div><div class='add'>+		       struct rtnl_newlink_params *params,</div><div class='ctx'> 		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *link[2];</div><div class='del'>-	unsigned char multicast_spec, hsr_version;</div><div class='add'>+	struct net *link_net = rtnl_newlink_link_net(params);</div><div class='add'>+	struct net_device *link[2], *interlink = NULL;</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	enum hsr_version proto_version;</div><div class='add'>+	unsigned char multicast_spec;</div><div class='add'>+	u8 proto = HSR_PROTOCOL_HSR;</div><div class='add'>+</div><div class='add'>+	if (!net_eq(link_net, dev_net(dev))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "HSR slaves/interlink must be on the same net namespace than HSR link");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!data) {</div><div class='del'>-		netdev_info(dev, "HSR: No slave devices specified\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "No slave devices specified");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!data[IFLA_HSR_SLAVE1]) {</div><div class='del'>-		netdev_info(dev, "HSR: Slave1 device not specified\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave1 device not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	link[0] = __dev_get_by_index(link_net,</div><div class='add'>+				     nla_get_u32(data[IFLA_HSR_SLAVE1]));</div><div class='add'>+	if (!link[0]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave1 does not exist");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	link[0] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE1]));</div><div class='ctx'> 	if (!data[IFLA_HSR_SLAVE2]) {</div><div class='del'>-		netdev_info(dev, "HSR: Slave2 device not specified\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave2 device not specified");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	link[1] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE2]));</div><div class='add'>+	link[1] = __dev_get_by_index(link_net,</div><div class='add'>+				     nla_get_u32(data[IFLA_HSR_SLAVE2]));</div><div class='add'>+	if (!link[1]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave2 does not exist");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link[0] == link[1]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave1 and Slave2 are same");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_HSR_INTERLINK])</div><div class='add'>+		interlink = __dev_get_by_index(link_net,</div><div class='add'>+					       nla_get_u32(data[IFLA_HSR_INTERLINK]));</div><div class='ctx'> </div><div class='del'>-	if (!link[0] || !link[1])</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (link[0] == link[1])</div><div class='add'>+	if (interlink &amp;&amp; interlink == link[0]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Interlink and Slave1 are the same");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (interlink &amp;&amp; interlink == link[1]) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Interlink and Slave2 are the same");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	multicast_spec = nla_get_u8_default(data[IFLA_HSR_MULTICAST_SPEC], 0);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_HSR_PROTOCOL])</div><div class='add'>+		proto = nla_get_u8(data[IFLA_HSR_PROTOCOL]);</div><div class='add'>+</div><div class='add'>+	if (proto &gt;= HSR_PROTOCOL_MAX) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unsupported protocol");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_HSR_VERSION]) {</div><div class='add'>+		proto_version = HSR_V0;</div><div class='add'>+	} else {</div><div class='add'>+		if (proto == HSR_PROTOCOL_PRP) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "PRP version unsupported");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		proto_version = nla_get_u8(data[IFLA_HSR_VERSION]);</div><div class='add'>+		if (proto_version &gt; HSR_V1) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only HSR version 0/1 supported");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (proto == HSR_PROTOCOL_PRP) {</div><div class='add'>+		proto_version = PRP_V1;</div><div class='add'>+		if (interlink) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Interlink only works with HSR");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!data[IFLA_HSR_MULTICAST_SPEC])</div><div class='del'>-		multicast_spec = 0;</div><div class='del'>-	else</div><div class='del'>-		multicast_spec = nla_get_u8(data[IFLA_HSR_MULTICAST_SPEC]);</div><div class='add'>+	return hsr_dev_finalize(dev, link, interlink, multicast_spec,</div><div class='add'>+				proto_version, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hsr_dellink(struct net_device *dev, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct hsr_priv *hsr = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!data[IFLA_HSR_VERSION])</div><div class='del'>-		hsr_version = 0;</div><div class='del'>-	else</div><div class='del'>-		hsr_version = nla_get_u8(data[IFLA_HSR_VERSION]);</div><div class='add'>+	timer_delete_sync(&amp;hsr-&gt;prune_timer);</div><div class='add'>+	timer_delete_sync(&amp;hsr-&gt;prune_proxy_timer);</div><div class='add'>+	timer_delete_sync(&amp;hsr-&gt;announce_timer);</div><div class='add'>+	timer_delete_sync(&amp;hsr-&gt;announce_proxy_timer);</div><div class='ctx'> </div><div class='del'>-	return hsr_dev_finalize(dev, link, multicast_spec, hsr_version);</div><div class='add'>+	hsr_debugfs_term(hsr);</div><div class='add'>+	hsr_del_ports(hsr);</div><div class='add'>+</div><div class='add'>+	hsr_del_self_node(hsr);</div><div class='add'>+	hsr_del_nodes(&amp;hsr-&gt;node_db);</div><div class='add'>+	hsr_del_nodes(&amp;hsr-&gt;proxy_node_db);</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_queue(dev, head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hsr_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct hsr_priv *hsr;</div><div class='add'>+	struct hsr_priv *hsr = netdev_priv(dev);</div><div class='add'>+	u8 proto = HSR_PROTOCOL_HSR;</div><div class='ctx'> 	struct hsr_port *port;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	hsr = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	res = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_A);</div><div class='del'>-	if (port)</div><div class='del'>-		res = nla_put_u32(skb, IFLA_HSR_SLAVE1, port-&gt;dev-&gt;ifindex);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (res)</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	if (port) {</div><div class='add'>+		if (nla_put_u32(skb, IFLA_HSR_SLAVE1, port-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);</div><div class='del'>-	if (port)</div><div class='del'>-		res = nla_put_u32(skb, IFLA_HSR_SLAVE2, port-&gt;dev-&gt;ifindex);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (res)</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	if (port) {</div><div class='add'>+		if (nla_put_u32(skb, IFLA_HSR_SLAVE2, port-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port = hsr_port_get_hsr(hsr, HSR_PT_INTERLINK);</div><div class='add'>+	if (port) {</div><div class='add'>+		if (nla_put_u32(skb, IFLA_HSR_INTERLINK, port-&gt;dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put(skb, IFLA_HSR_SUPERVISION_ADDR, ETH_ALEN,</div><div class='ctx'> 		    hsr-&gt;sup_multicast_addr) ||</div><div class='ctx'> 	    nla_put_u16(skb, IFLA_HSR_SEQ_NR, hsr-&gt;sequence_nr))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='add'>+	if (hsr-&gt;prot_version == PRP_V1)</div><div class='add'>+		proto = HSR_PROTOCOL_PRP;</div><div class='add'>+	else if (nla_put_u8(skb, IFLA_HSR_VERSION, hsr-&gt;prot_version))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u8(skb, IFLA_HSR_PROTOCOL, proto))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -116,11 +196,10 @@ static struct rtnl_link_ops hsr_link_ops __read_mostly = {</div><div class='ctx'> 	.priv_size	= sizeof(struct hsr_priv),</div><div class='ctx'> 	.setup		= hsr_dev_setup,</div><div class='ctx'> 	.newlink	= hsr_newlink,</div><div class='add'>+	.dellink	= hsr_dellink,</div><div class='ctx'> 	.fill_info	= hsr_fill_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* attribute policy */</div><div class='ctx'> static const struct nla_policy hsr_genl_policy[HSR_A_MAX + 1] = {</div><div class='ctx'> 	[HSR_A_NODE_ADDR] = { .len = ETH_ALEN },</div><div class='hunk'>@@ -138,8 +217,6 @@ static const struct genl_multicast_group hsr_mcgrps[] = {</div><div class='ctx'> 	{ .name = "hsr-network", },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* This is called if for some node with MAC address addr, we only get frames</div><div class='ctx'>  * over one of the slave interfaces. This would indicate an open network ring</div><div class='ctx'>  * (i.e. a link has failed somewhere).</div><div class='hunk'>@@ -156,7 +233,8 @@ void hsr_nl_ringerror(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN],</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	msg_head = genlmsg_put(skb, 0, 0, &amp;hsr_genl_family, 0, HSR_C_RING_ERROR);</div><div class='add'>+	msg_head = genlmsg_put(skb, 0, 0, &amp;hsr_genl_family, 0,</div><div class='add'>+			       HSR_C_RING_ERROR);</div><div class='ctx'> 	if (!msg_head)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +279,6 @@ void hsr_nl_nodedown(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN])</div><div class='ctx'> 	if (!msg_head)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	res = nla_put(skb, HSR_A_NODE_ADDR, ETH_ALEN, addr);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -221,7 +298,6 @@ fail:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* HSR_C_GET_NODE_STATUS lets userspace query the internal HSR node table</div><div class='ctx'>  * about the status of a specific node in the network, defined by its MAC</div><div class='ctx'>  * address.</div><div class='hunk'>@@ -259,25 +335,24 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> 	if (!na)</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> </div><div class='del'>-	hsr_dev = __dev_get_by_index(genl_info_net(info),</div><div class='del'>-					nla_get_u32(info-&gt;attrs[HSR_A_IFINDEX]));</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hsr_dev = dev_get_by_index_rcu(genl_info_net(info),</div><div class='add'>+				       nla_get_u32(info-&gt;attrs[HSR_A_IFINDEX]));</div><div class='ctx'> 	if (!hsr_dev)</div><div class='del'>-		goto invalid;</div><div class='add'>+		goto rcu_unlock;</div><div class='ctx'> 	if (!is_hsr_master(hsr_dev))</div><div class='del'>-		goto invalid;</div><div class='del'>-</div><div class='add'>+		goto rcu_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Send reply */</div><div class='del'>-</div><div class='del'>-	skb_out = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	skb_out = genlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb_out) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid,</div><div class='del'>-				info-&gt;snd_seq, &amp;hsr_genl_family, 0,</div><div class='del'>-				HSR_C_SET_NODE_STATUS);</div><div class='add'>+			       info-&gt;snd_seq, &amp;hsr_genl_family, 0,</div><div class='add'>+			       HSR_C_SET_NODE_STATUS);</div><div class='ctx'> 	if (!msg_head) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -289,28 +364,30 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(hsr_dev);</div><div class='ctx'> 	res = hsr_get_node_data(hsr,</div><div class='del'>-			(unsigned char *) nla_data(info-&gt;attrs[HSR_A_NODE_ADDR]),</div><div class='del'>-			hsr_node_addr_b,</div><div class='del'>-			&amp;addr_b_ifindex,</div><div class='del'>-			&amp;hsr_node_if1_age,</div><div class='del'>-			&amp;hsr_node_if1_seq,</div><div class='del'>-			&amp;hsr_node_if2_age,</div><div class='del'>-			&amp;hsr_node_if2_seq);</div><div class='add'>+				(unsigned char *)</div><div class='add'>+				nla_data(info-&gt;attrs[HSR_A_NODE_ADDR]),</div><div class='add'>+					 hsr_node_addr_b,</div><div class='add'>+					 &amp;addr_b_ifindex,</div><div class='add'>+					 &amp;hsr_node_if1_age,</div><div class='add'>+					 &amp;hsr_node_if1_seq,</div><div class='add'>+					 &amp;hsr_node_if2_age,</div><div class='add'>+					 &amp;hsr_node_if2_seq);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	res = nla_put(skb_out, HSR_A_NODE_ADDR, ETH_ALEN,</div><div class='del'>-					nla_data(info-&gt;attrs[HSR_A_NODE_ADDR]));</div><div class='add'>+		      nla_data(info-&gt;attrs[HSR_A_NODE_ADDR]));</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_b_ifindex &gt; -1) {</div><div class='ctx'> 		res = nla_put(skb_out, HSR_A_NODE_ADDR_B, ETH_ALEN,</div><div class='del'>-								hsr_node_addr_b);</div><div class='add'>+			      hsr_node_addr_b);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-		res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX, addr_b_ifindex);</div><div class='add'>+		res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX,</div><div class='add'>+				  addr_b_ifindex);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -321,12 +398,10 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> 	res = nla_put_u16(skb_out, HSR_A_IF1_SEQ, hsr_node_if1_seq);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_A);</div><div class='ctx'> 	if (port)</div><div class='ctx'> 		res = nla_put_u32(skb_out, HSR_A_IF1_IFINDEX,</div><div class='ctx'> 				  port-&gt;dev-&gt;ifindex);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -336,20 +411,22 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> 	res = nla_put_u16(skb_out, HSR_A_IF2_SEQ, hsr_node_if2_seq);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);</div><div class='ctx'> 	if (port)</div><div class='ctx'> 		res = nla_put_u32(skb_out, HSR_A_IF2_IFINDEX,</div><div class='ctx'> 				  port-&gt;dev-&gt;ifindex);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	genlmsg_end(skb_out, msg_head);</div><div class='ctx'> 	genlmsg_unicast(genl_info_net(info), skb_out, info-&gt;snd_portid);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+rcu_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> invalid:</div><div class='ctx'> 	netlink_ack(skb_in, nlmsg_hdr(skb_in), -EINVAL, NULL);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -359,6 +436,7 @@ nla_put_failure:</div><div class='ctx'> 	/* Fall through */</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,16 +444,14 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> static int hsr_get_node_list(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> {</div><div class='del'>-	/* For receiving */</div><div class='del'>-	struct nlattr *na;</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='ctx'> 	struct net_device *hsr_dev;</div><div class='del'>-</div><div class='del'>-	/* For sending */</div><div class='ctx'> 	struct sk_buff *skb_out;</div><div class='del'>-	void *msg_head;</div><div class='ctx'> 	struct hsr_priv *hsr;</div><div class='del'>-	void *pos;</div><div class='del'>-	unsigned char addr[ETH_ALEN];</div><div class='add'>+	bool restart = false;</div><div class='add'>+	struct nlattr *na;</div><div class='add'>+	void *pos = NULL;</div><div class='add'>+	void *msg_head;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (!info)</div><div class='hunk'>@@ -385,42 +461,50 @@ static int hsr_get_node_list(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> 	if (!na)</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> </div><div class='del'>-	hsr_dev = __dev_get_by_index(genl_info_net(info),</div><div class='del'>-				     nla_get_u32(info-&gt;attrs[HSR_A_IFINDEX]));</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hsr_dev = dev_get_by_index_rcu(genl_info_net(info),</div><div class='add'>+				       nla_get_u32(info-&gt;attrs[HSR_A_IFINDEX]));</div><div class='ctx'> 	if (!hsr_dev)</div><div class='del'>-		goto invalid;</div><div class='add'>+		goto rcu_unlock;</div><div class='ctx'> 	if (!is_hsr_master(hsr_dev))</div><div class='del'>-		goto invalid;</div><div class='del'>-</div><div class='add'>+		goto rcu_unlock;</div><div class='ctx'> </div><div class='add'>+restart:</div><div class='ctx'> 	/* Send reply */</div><div class='del'>-</div><div class='del'>-	skb_out = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	skb_out = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb_out) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid,</div><div class='del'>-				info-&gt;snd_seq, &amp;hsr_genl_family, 0,</div><div class='del'>-				HSR_C_SET_NODE_LIST);</div><div class='add'>+			       info-&gt;snd_seq, &amp;hsr_genl_family, 0,</div><div class='add'>+			       HSR_C_SET_NODE_LIST);</div><div class='ctx'> 	if (!msg_head) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res = nla_put_u32(skb_out, HSR_A_IFINDEX, hsr_dev-&gt;ifindex);</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	if (!restart) {</div><div class='add'>+		res = nla_put_u32(skb_out, HSR_A_IFINDEX, hsr_dev-&gt;ifindex);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hsr = netdev_priv(hsr_dev);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	pos = hsr_get_next_node(hsr, NULL, addr);</div><div class='add'>+	if (!pos)</div><div class='add'>+		pos = hsr_get_next_node(hsr, NULL, addr);</div><div class='ctx'> 	while (pos) {</div><div class='ctx'> 		res = nla_put(skb_out, HSR_A_NODE_ADDR, ETH_ALEN, addr);</div><div class='ctx'> 		if (res &lt; 0) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+			if (res == -EMSGSIZE) {</div><div class='add'>+				genlmsg_end(skb_out, msg_head);</div><div class='add'>+				genlmsg_unicast(genl_info_net(info), skb_out,</div><div class='add'>+						info-&gt;snd_portid);</div><div class='add'>+				restart = true;</div><div class='add'>+				goto restart;</div><div class='add'>+			}</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		}</div><div class='ctx'> 		pos = hsr_get_next_node(hsr, pos, addr);</div><div class='hunk'>@@ -432,31 +516,33 @@ static int hsr_get_node_list(struct sk_buff *skb_in, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+rcu_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> invalid:</div><div class='ctx'> 	netlink_ack(skb_in, nlmsg_hdr(skb_in), -EINVAL, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='del'>-	kfree_skb(skb_out);</div><div class='add'>+	nlmsg_free(skb_out);</div><div class='ctx'> 	/* Fall through */</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static const struct genl_ops hsr_ops[] = {</div><div class='add'>+static const struct genl_small_ops hsr_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HSR_C_GET_NODE_STATUS,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.flags = 0,</div><div class='del'>-		.policy = hsr_genl_policy,</div><div class='ctx'> 		.doit = hsr_get_node_status,</div><div class='ctx'> 		.dumpit = NULL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HSR_C_GET_NODE_LIST,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.flags = 0,</div><div class='del'>-		.policy = hsr_genl_policy,</div><div class='ctx'> 		.doit = hsr_get_node_list,</div><div class='ctx'> 		.dumpit = NULL,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -467,9 +553,12 @@ static struct genl_family hsr_genl_family __ro_after_init = {</div><div class='ctx'> 	.name = "HSR",</div><div class='ctx'> 	.version = 1,</div><div class='ctx'> 	.maxattr = HSR_A_MAX,</div><div class='add'>+	.policy = hsr_genl_policy,</div><div class='add'>+	.netnsok = true,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='del'>-	.ops = hsr_ops,</div><div class='del'>-	.n_ops = ARRAY_SIZE(hsr_ops),</div><div class='add'>+	.small_ops = hsr_ops,</div><div class='add'>+	.n_small_ops = ARRAY_SIZE(hsr_ops),</div><div class='add'>+	.resv_start_op = HSR_C_SET_NODE_LIST + 1,</div><div class='ctx'> 	.mcgrps = hsr_mcgrps,</div><div class='ctx'> 	.n_mcgrps = ARRAY_SIZE(hsr_mcgrps),</div><div class='ctx'> };</div><div class='hunk'>@@ -486,6 +575,7 @@ int __init hsr_netlink_init(void)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail_genl_register_family;</div><div class='ctx'> </div><div class='add'>+	hsr_debugfs_create_root();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_genl_register_family:</div><div class='head'>diff --git a/net/hsr/hsr_netlink.h b/net/hsr/hsr_netlink.h<br/>index 3f6b95b5b6b8..8c99e64e1cea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_netlink.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_netlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_netlink.h</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_NETLINK_H</div><div class='hunk'>@@ -25,7 +23,5 @@ void __exit hsr_netlink_exit(void);</div><div class='ctx'> void hsr_nl_ringerror(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN],</div><div class='ctx'> 		      struct hsr_port *port);</div><div class='ctx'> void hsr_nl_nodedown(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN]);</div><div class='del'>-void hsr_nl_framedrop(int dropcount, int dev_idx);</div><div class='del'>-void hsr_nl_linkdown(int dev_idx);</div><div class='ctx'> </div><div class='ctx'> #endif /* __HSR_NETLINK_H */</div><div class='head'>diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c<br/>index 56080da4aa77..afe06ba00ea4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_slave.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_slave.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_slave.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_slave.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * Frame handler other utility functions for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hsr_slave.h"</div><div class='hunk'>@@ -18,20 +16,31 @@</div><div class='ctx'> #include "hsr_forward.h"</div><div class='ctx'> #include "hsr_framereg.h"</div><div class='ctx'> </div><div class='add'>+bool hsr_invalid_dan_ingress_frame(__be16 protocol)</div><div class='add'>+{</div><div class='add'>+	return (protocol != htons(ETH_P_PRP) &amp;&amp; protocol != htons(ETH_P_HSR));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = *pskb;</div><div class='ctx'> 	struct hsr_port *port;</div><div class='del'>-	u16 protocol;</div><div class='add'>+	struct hsr_priv *hsr;</div><div class='add'>+	__be16 protocol;</div><div class='add'>+</div><div class='add'>+	/* Packets from dev_loopback_xmit() do not have L2 header, bail out */</div><div class='add'>+	if (unlikely(skb-&gt;pkt_type == PACKET_LOOPBACK))</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_mac_header_was_set(skb)) {</div><div class='ctx'> 		WARN_ONCE(1, "%s: skb invalid", __func__);</div><div class='ctx'> 		return RX_HANDLER_PASS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock(); /* hsr-&gt;node_db, hsr-&gt;ports */</div><div class='ctx'> 	port = hsr_port_get_rcu(skb-&gt;dev);</div><div class='add'>+	if (!port)</div><div class='add'>+		goto finish_pass;</div><div class='add'>+	hsr = port-&gt;hsr;</div><div class='ctx'> </div><div class='ctx'> 	if (hsr_addr_is_self(port-&gt;hsr, eth_hdr(skb)-&gt;h_source)) {</div><div class='ctx'> 		/* Directly kill frames sent by ourselves */</div><div class='hunk'>@@ -39,20 +48,46 @@ static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> 		goto finish_consume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* For HSR, only tagged frames are expected (unless the device offloads</div><div class='add'>+	 * HSR tag removal), but for PRP there could be non tagged frames as</div><div class='add'>+	 * well from Single attached nodes (SANs).</div><div class='add'>+	 */</div><div class='ctx'> 	protocol = eth_hdr(skb)-&gt;h_proto;</div><div class='del'>-	if (protocol != htons(ETH_P_PRP) &amp;&amp; protocol != htons(ETH_P_HSR))</div><div class='add'>+</div><div class='add'>+	if (!(port-&gt;dev-&gt;features &amp; NETIF_F_HW_HSR_TAG_RM) &amp;&amp;</div><div class='add'>+	    port-&gt;type != HSR_PT_INTERLINK &amp;&amp;</div><div class='add'>+	    hsr-&gt;proto_ops-&gt;invalid_dan_ingress_frame &amp;&amp;</div><div class='add'>+	    hsr-&gt;proto_ops-&gt;invalid_dan_ingress_frame(protocol))</div><div class='ctx'> 		goto finish_pass;</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	if ((!hsr-&gt;prot_version &amp;&amp; protocol == htons(ETH_P_PRP)) ||</div><div class='add'>+	    protocol == htons(ETH_P_HSR)) {</div><div class='add'>+		if (!pskb_may_pull(skb, ETH_HLEN + HSR_HLEN)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			goto finish_consume;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_set_network_header(skb, ETH_HLEN + HSR_HLEN);</div><div class='add'>+	}</div><div class='add'>+	skb_reset_mac_len(skb);</div><div class='ctx'> </div><div class='del'>-	hsr_forward_skb(skb, port);</div><div class='add'>+	/* Only the frames received over the interlink port will assign a</div><div class='add'>+	 * sequence number and require synchronisation vs other sender.</div><div class='add'>+	 */</div><div class='add'>+	if (port-&gt;type == HSR_PT_INTERLINK) {</div><div class='add'>+		spin_lock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+		hsr_forward_skb(skb, port);</div><div class='add'>+		spin_unlock_bh(&amp;hsr-&gt;seqnr_lock);</div><div class='add'>+	} else {</div><div class='add'>+		hsr_forward_skb(skb, port);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> finish_consume:</div><div class='del'>-	rcu_read_unlock(); /* hsr-&gt;node_db, hsr-&gt;ports */</div><div class='ctx'> 	return RX_HANDLER_CONSUMED;</div><div class='ctx'> </div><div class='ctx'> finish_pass:</div><div class='del'>-	rcu_read_unlock(); /* hsr-&gt;node_db, hsr-&gt;ports */</div><div class='ctx'> 	return RX_HANDLER_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -61,34 +96,37 @@ bool hsr_port_exists(const struct net_device *dev)</div><div class='ctx'> 	return rcu_access_pointer(dev-&gt;rx_handler) == hsr_handle_frame;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int hsr_check_dev_ok(struct net_device *dev)</div><div class='add'>+static int hsr_check_dev_ok(struct net_device *dev,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	/* Don't allow HSR on non-ethernet like devices */</div><div class='del'>-	if ((dev-&gt;flags &amp; IFF_LOOPBACK) || (dev-&gt;type != ARPHRD_ETHER) ||</div><div class='del'>-	    (dev-&gt;addr_len != ETH_ALEN)) {</div><div class='del'>-		netdev_info(dev, "Cannot use loopback or non-ethernet device as HSR slave.\n");</div><div class='add'>+	if ((dev-&gt;flags &amp; IFF_LOOPBACK) || dev-&gt;type != ARPHRD_ETHER ||</div><div class='add'>+	    dev-&gt;addr_len != ETH_ALEN) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot use loopback or non-ethernet device as HSR slave.");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't allow enslaving hsr devices */</div><div class='ctx'> 	if (is_hsr_master(dev)) {</div><div class='del'>-		netdev_info(dev, "Cannot create trees of HSR devices.\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot create trees of HSR devices.");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hsr_port_exists(dev)) {</div><div class='del'>-		netdev_info(dev, "This device is already a HSR slave.\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "This device is already a HSR slave.");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_vlan_dev(dev)) {</div><div class='del'>-		netdev_info(dev, "HSR on top of VLAN is not yet supported in this driver.\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "HSR on top of VLAN is not yet supported in this driver.");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;priv_flags &amp; IFF_DONT_BRIDGE) {</div><div class='del'>-		netdev_info(dev, "This device does not support bridging.\n");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "This device does not support bridging.");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -99,21 +137,34 @@ static int hsr_check_dev_ok(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Setup device to be added to the HSR bridge. */</div><div class='del'>-static int hsr_portdev_setup(struct net_device *dev, struct hsr_port *port)</div><div class='add'>+static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,</div><div class='add'>+			     struct hsr_port *port,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+</div><div class='ctx'> {</div><div class='add'>+	struct netdev_lag_upper_info lag_upper_info;</div><div class='add'>+	struct net_device *hsr_dev;</div><div class='add'>+	struct hsr_port *master;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='del'>-	res = dev_set_promiscuity(dev, 1);</div><div class='del'>-	if (res)</div><div class='del'>-		goto fail_promiscuity;</div><div class='del'>-</div><div class='del'>-	/* FIXME:</div><div class='del'>-	 * What does net device "adjacency" mean? Should we do</div><div class='del'>-	 * res = netdev_master_upper_dev_link(port-&gt;dev, port-&gt;hsr-&gt;dev); ?</div><div class='add'>+	/* Don't use promiscuous mode for offload since L2 frame forward</div><div class='add'>+	 * happens at the offloaded hardware.</div><div class='ctx'> 	 */</div><div class='add'>+	if (!port-&gt;hsr-&gt;fwd_offloaded) {</div><div class='add'>+		res = dev_set_promiscuity(dev, 1);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='add'>+	hsr_dev = master-&gt;dev;</div><div class='add'>+</div><div class='add'>+	lag_upper_info.tx_type = NETDEV_LAG_TX_TYPE_BROADCAST;</div><div class='add'>+	lag_upper_info.hash_type = NETDEV_LAG_HASH_UNKNOWN;</div><div class='add'>+	res = netdev_master_upper_dev_link(dev, hsr_dev, NULL, &amp;lag_upper_info, extack);</div><div class='add'>+	if (res)</div><div class='add'>+		goto fail_upper_dev_link;</div><div class='ctx'> </div><div class='ctx'> 	res = netdev_rx_handler_register(dev, hsr_handle_frame, port);</div><div class='ctx'> 	if (res)</div><div class='hunk'>@@ -123,45 +174,46 @@ static int hsr_portdev_setup(struct net_device *dev, struct hsr_port *port)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_rx_handler:</div><div class='del'>-	dev_set_promiscuity(dev, -1);</div><div class='del'>-fail_promiscuity:</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_upper_dev_unlink(dev, hsr_dev);</div><div class='add'>+fail_upper_dev_link:</div><div class='add'>+	if (!port-&gt;hsr-&gt;fwd_offloaded)</div><div class='add'>+		dev_set_promiscuity(dev, -1);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,</div><div class='del'>-		 enum hsr_port_type type)</div><div class='add'>+		 enum hsr_port_type type, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct hsr_port *port, *master;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (type != HSR_PT_MASTER) {</div><div class='del'>-		res = hsr_check_dev_ok(dev);</div><div class='add'>+		res = hsr_check_dev_ok(dev, extack);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	port = hsr_port_get_hsr(hsr, type);</div><div class='del'>-	if (port != NULL)</div><div class='add'>+	if (port)</div><div class='ctx'> 		return -EBUSY;	/* This port already exists */</div><div class='ctx'> </div><div class='ctx'> 	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='del'>-	if (port == NULL)</div><div class='add'>+	if (!port)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (type != HSR_PT_MASTER) {</div><div class='del'>-		res = hsr_portdev_setup(dev, port);</div><div class='del'>-		if (res)</div><div class='del'>-			goto fail_dev_setup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	port-&gt;hsr = hsr;</div><div class='ctx'> 	port-&gt;dev = dev;</div><div class='ctx'> 	port-&gt;type = type;</div><div class='add'>+	ether_addr_copy(port-&gt;original_macaddress, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail_rcu(&amp;port-&gt;port_list, &amp;hsr-&gt;ports);</div><div class='del'>-	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	if (type != HSR_PT_MASTER) {</div><div class='add'>+		res = hsr_portdev_setup(hsr, dev, port, extack);</div><div class='add'>+		if (res)</div><div class='add'>+			goto fail_dev_setup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);</div><div class='ctx'> 	netdev_update_features(master-&gt;dev);</div><div class='hunk'>@@ -170,7 +222,8 @@ int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_dev_setup:</div><div class='del'>-	kfree(port);</div><div class='add'>+	list_del_rcu(&amp;port-&gt;port_list);</div><div class='add'>+	kfree_rcu(port, rcu);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,20 +237,14 @@ void hsr_del_port(struct hsr_port *port)</div><div class='ctx'> 	list_del_rcu(&amp;port-&gt;port_list);</div><div class='ctx'> </div><div class='ctx'> 	if (port != master) {</div><div class='del'>-		if (master != NULL) {</div><div class='del'>-			netdev_update_features(master-&gt;dev);</div><div class='del'>-			dev_set_mtu(master-&gt;dev, hsr_get_max_mtu(hsr));</div><div class='del'>-		}</div><div class='add'>+		netdev_update_features(master-&gt;dev);</div><div class='add'>+		dev_set_mtu(master-&gt;dev, hsr_get_max_mtu(hsr));</div><div class='ctx'> 		netdev_rx_handler_unregister(port-&gt;dev);</div><div class='del'>-		dev_set_promiscuity(port-&gt;dev, -1);</div><div class='add'>+		if (!port-&gt;hsr-&gt;fwd_offloaded)</div><div class='add'>+			dev_set_promiscuity(port-&gt;dev, -1);</div><div class='add'>+		netdev_upper_dev_unlink(port-&gt;dev, master-&gt;dev);</div><div class='add'>+		eth_hw_addr_set(port-&gt;dev, port-&gt;original_macaddress);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* FIXME?</div><div class='del'>-	 * netdev_upper_dev_unlink(port-&gt;dev, port-&gt;hsr-&gt;dev);</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	synchronize_rcu();</div><div class='del'>-</div><div class='del'>-	if (port != master)</div><div class='del'>-		dev_put(port-&gt;dev);</div><div class='add'>+	kfree_rcu(port, rcu);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/hsr/hsr_slave.h b/net/hsr/hsr_slave.h<br/>index 3ccfbf71c92e..edc4612bb009 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_slave.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/hsr/hsr_slave.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/hsr_slave.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/hsr_slave.h</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright 2011-2014 Autronica Fire and Security AS</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='del'>- * Author(s):</div><div class='ctx'>  *	2011-2014 Arvid Brodin, arvid.brodin@alten.se</div><div class='add'>+ *</div><div class='add'>+ * include file for HSR and PRP.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HSR_SLAVE_H</div><div class='hunk'>@@ -18,7 +15,7 @@</div><div class='ctx'> #include "hsr_main.h"</div><div class='ctx'> </div><div class='ctx'> int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,</div><div class='del'>-		 enum hsr_port_type pt);</div><div class='add'>+		 enum hsr_port_type pt, struct netlink_ext_ack *extack);</div><div class='ctx'> void hsr_del_port(struct hsr_port *port);</div><div class='ctx'> bool hsr_port_exists(const struct net_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -35,4 +32,6 @@ static inline struct hsr_port *hsr_port_get_rcu(const struct net_device *dev)</div><div class='ctx'> 				rcu_dereference(dev-&gt;rx_handler_data) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool hsr_invalid_dan_ingress_frame(__be16 protocol);</div><div class='add'>+</div><div class='ctx'> #endif /* __HSR_SLAVE_H */</div><div class='head'>diff --git a/net/hsr/prp_dup_discard_test.c b/net/hsr/prp_dup_discard_test.c<br/>new file mode 100644<br/>index 000000000000..e86b7b633ae8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/hsr/prp_dup_discard_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/hsr/prp_dup_discard_test.c</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hsr_main.h"</div><div class='add'>+#include "hsr_framereg.h"</div><div class='add'>+</div><div class='add'>+struct prp_test_data {</div><div class='add'>+	struct hsr_port port;</div><div class='add'>+	struct hsr_port port_rcv;</div><div class='add'>+	struct hsr_frame_info frame;</div><div class='add'>+	struct hsr_node node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct prp_test_data *build_prp_test_data(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct prp_test_data *data = kunit_kzalloc(test,</div><div class='add'>+		sizeof(struct prp_test_data), GFP_USER);</div><div class='add'>+	KUNIT_EXPECT_NOT_ERR_OR_NULL(test, data);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.node_src = &amp;data-&gt;node;</div><div class='add'>+	data-&gt;frame.port_rcv = &amp;data-&gt;port_rcv;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_A;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_A] = 1;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_A] = 1;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_B] = 1;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_B] = 1;</div><div class='add'>+	data-&gt;node.seq_out[HSR_PT_MASTER] = 0;</div><div class='add'>+	data-&gt;node.time_out[HSR_PT_MASTER] = jiffies;</div><div class='add'>+	data-&gt;port.type = HSR_PT_MASTER;</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_prp_counters(struct kunit *test,</div><div class='add'>+			       struct prp_test_data *data,</div><div class='add'>+			       u16 seq_start_a, u16 seq_expected_a,</div><div class='add'>+			       u16 seq_start_b, u16 seq_expected_b)</div><div class='add'>+{</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;node.seq_start[HSR_PT_SLAVE_A],</div><div class='add'>+			seq_start_a);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;node.seq_start[HSR_PT_SLAVE_B],</div><div class='add'>+			seq_start_b);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;node.seq_expected[HSR_PT_SLAVE_A],</div><div class='add'>+			seq_expected_a);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;node.seq_expected[HSR_PT_SLAVE_B],</div><div class='add'>+			seq_expected_b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prp_dup_discard_forward(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* Normal situation, both LANs in sync. Next frame is forwarded */</div><div class='add'>+	struct prp_test_data *data = build_prp_test_data(test);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 2;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, jiffies, data-&gt;node.time_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1, 1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prp_dup_discard_inside_dropwindow(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* Normal situation, other LAN ahead by one. Frame is dropped */</div><div class='add'>+	struct prp_test_data *data = build_prp_test_data(test);</div><div class='add'>+	unsigned long time = jiffies - 10;</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 1;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_B] = 3;</div><div class='add'>+	data-&gt;node.seq_out[HSR_PT_MASTER] = 2;</div><div class='add'>+	data-&gt;node.time_out[HSR_PT_MASTER] = time;</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 2, data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, time, data-&gt;node.time_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, 2, 2, 2, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prp_dup_discard_node_timeout(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* Timeout situation, node hasn't sent anything for a while */</div><div class='add'>+	struct prp_test_data *data = build_prp_test_data(test);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 7;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_A] = 1234;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_A] = 1235;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_B] = 1234;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_B] = 1234;</div><div class='add'>+	data-&gt;node.seq_out[HSR_PT_MASTER] = 1234;</div><div class='add'>+	data-&gt;node.time_out[HSR_PT_MASTER] =</div><div class='add'>+		jiffies - msecs_to_jiffies(HSR_ENTRY_FORGET_TIME) - 1;</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, jiffies, data-&gt;node.time_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1, 1234, 1234);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prp_dup_discard_out_of_sequence(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* One frame is received out of sequence on both LANs */</div><div class='add'>+	struct prp_test_data *data = build_prp_test_data(test);</div><div class='add'>+</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_A] = 10;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_A] = 10;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_B] = 10;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_B] = 10;</div><div class='add'>+	data-&gt;node.seq_out[HSR_PT_MASTER] = 9;</div><div class='add'>+</div><div class='add'>+	/* 1st old frame, should be accepted */</div><div class='add'>+	data-&gt;frame.sequence_nr = 8;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1, 10, 10);</div><div class='add'>+</div><div class='add'>+	/* 2nd frame should be dropped */</div><div class='add'>+	data-&gt;frame.sequence_nr = 8;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_B;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1);</div><div class='add'>+</div><div class='add'>+	/* Next frame, this is forwarded */</div><div class='add'>+	data-&gt;frame.sequence_nr = 10;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_A;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1, 9, 9);</div><div class='add'>+</div><div class='add'>+	/* and next one is dropped */</div><div class='add'>+	data-&gt;frame.sequence_nr = 10;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_B;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	check_prp_counters(test, data, data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1,</div><div class='add'>+			   data-&gt;frame.sequence_nr + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prp_dup_discard_lan_b_late(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* LAN B is behind */</div><div class='add'>+	struct prp_test_data *data = build_prp_test_data(test);</div><div class='add'>+</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_A] = 9;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_A] = 9;</div><div class='add'>+	data-&gt;node.seq_start[HSR_PT_SLAVE_B] = 9;</div><div class='add'>+	data-&gt;node.seq_expected[HSR_PT_SLAVE_B] = 9;</div><div class='add'>+	data-&gt;node.seq_out[HSR_PT_MASTER] = 8;</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 9;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, 9, 10, 9, 9);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 10;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, data-&gt;frame.sequence_nr,</div><div class='add'>+			data-&gt;node.seq_out[HSR_PT_MASTER]);</div><div class='add'>+	check_prp_counters(test, data, 9, 11, 9, 9);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 9;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_B;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	check_prp_counters(test, data, 10, 11, 10, 10);</div><div class='add'>+</div><div class='add'>+	data-&gt;frame.sequence_nr = 10;</div><div class='add'>+	data-&gt;port_rcv.type = HSR_PT_SLAVE_B;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1,</div><div class='add'>+			prp_register_frame_out(&amp;data-&gt;port, &amp;data-&gt;frame));</div><div class='add'>+	check_prp_counters(test, data,  11, 11, 11, 11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case prp_dup_discard_test_cases[] = {</div><div class='add'>+	KUNIT_CASE(prp_dup_discard_forward),</div><div class='add'>+	KUNIT_CASE(prp_dup_discard_inside_dropwindow),</div><div class='add'>+	KUNIT_CASE(prp_dup_discard_node_timeout),</div><div class='add'>+	KUNIT_CASE(prp_dup_discard_out_of_sequence),</div><div class='add'>+	KUNIT_CASE(prp_dup_discard_lan_b_late),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite prp_dup_discard_suite = {</div><div class='add'>+	.name = "prp_duplicate_discard",</div><div class='add'>+	.test_cases = prp_dup_discard_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(prp_dup_discard_suite);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for PRP duplicate discard");</div><div class='add'>+MODULE_AUTHOR("Jaakko Karrenpalo &lt;jkarrenpalo@gmail.com&gt;");</div><div class='head'>diff --git a/net/ieee802154/6lowpan/Kconfig b/net/ieee802154/6lowpan/Kconfig<br/>index d24f985b0bfd..e808e4db2678 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config IEEE802154_6LOWPAN</div><div class='ctx'> 	tristate "6lowpan support over IEEE 802.15.4"</div><div class='ctx'> 	depends on 6LOWPAN</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  IPv6 compression over IEEE 802.15.4.</div><div class='head'>diff --git a/net/ieee802154/6lowpan/Makefile b/net/ieee802154/6lowpan/Makefile<br/>index 6bfb270a81a6..f11d6376a891 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o</div><div class='ctx'> </div><div class='ctx'> ieee802154_6lowpan-y := core.o rx.o reassembly.o tx.o</div><div class='head'>diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c<br/>index 3297e7fa9945..018929563c6b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/core.c</a></div><div class='hunk'>@@ -47,8 +47,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ieee802154.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "6lowpan_i.h"</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +94,7 @@ static int lowpan_neigh_construct(struct net_device *dev, struct neighbour *n)</div><div class='ctx'> </div><div class='ctx'> static int lowpan_get_iflink(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return lowpan_802154_dev(dev)-&gt;wdev-&gt;ifindex;</div><div class='add'>+	return READ_ONCE(lowpan_802154_dev(dev)-&gt;wdev-&gt;ifindex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops lowpan_netdev_ops = {</div><div class='hunk'>@@ -115,7 +117,7 @@ static void lowpan_setup(struct net_device *ldev)</div><div class='ctx'> 	ldev-&gt;netdev_ops	= &amp;lowpan_netdev_ops;</div><div class='ctx'> 	ldev-&gt;header_ops	= &amp;lowpan_header_ops;</div><div class='ctx'> 	ldev-&gt;needs_free_netdev	= true;</div><div class='del'>-	ldev-&gt;features		|= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	ldev-&gt;netns_immutable	= true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='hunk'>@@ -128,10 +130,11 @@ static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lowpan_newlink(struct net *src_net, struct net_device *ldev,</div><div class='del'>-			  struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int lowpan_newlink(struct net_device *ldev,</div><div class='add'>+			  struct rtnl_newlink_params *params,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct net_device *wdev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -141,6 +144,8 @@ static int lowpan_newlink(struct net *src_net, struct net_device *ldev,</div><div class='ctx'> </div><div class='ctx'> 	if (!tb[IFLA_LINK])</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (params-&gt;link_net &amp;&amp; !net_eq(params-&gt;link_net, dev_net(ldev)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	/* find and hold wpan device */</div><div class='ctx'> 	wdev = dev_get_by_index(dev_net(ldev), nla_get_u32(tb[IFLA_LINK]));</div><div class='ctx'> 	if (!wdev)</div><div class='hunk'>@@ -157,7 +162,7 @@ static int lowpan_newlink(struct net *src_net, struct net_device *ldev,</div><div class='ctx'> </div><div class='ctx'> 	lowpan_802154_dev(ldev)-&gt;wdev = wdev;</div><div class='ctx'> 	/* Set the lowpan hardware address to the wpan hardware address. */</div><div class='del'>-	memcpy(ldev-&gt;dev_addr, wdev-&gt;dev_addr, IEEE802154_ADDR_LEN);</div><div class='add'>+	__dev_addr_set(ldev, wdev-&gt;dev_addr, IEEE802154_ADDR_LEN);</div><div class='ctx'> 	/* We need headroom for possible wpan_dev_hard_header call and tailroom</div><div class='ctx'> 	 * for encryption/fcs handling. The lowpan interface will replace</div><div class='ctx'> 	 * the IPv6 header with 6LoWPAN header. At worst case the 6LoWPAN</div><div class='hunk'>@@ -279,5 +284,6 @@ static void __exit lowpan_cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> module_init(lowpan_init_module);</div><div class='ctx'> module_exit(lowpan_cleanup_module);</div><div class='add'>+MODULE_DESCRIPTION("IPv6 over Low power Wireless Personal Area Network IEEE 802.15.4 core");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("lowpan");</div><div class='head'>diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c<br/>index e7857a8ac86d..ddb6a5817d09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/reassembly.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/reassembly.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/reassembly.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/reassembly.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*	6LoWPAN fragment reassembly</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Alexander Aring		&lt;aar@pengutronix.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on: net/ipv6/reassembly.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "6LoWPAN: " fmt</div><div class='hunk'>@@ -27,6 +22,7 @@</div><div class='ctx'> #include &lt;net/6lowpan.h&gt;</div><div class='ctx'> #include &lt;net/ipv6_frag.h&gt;</div><div class='ctx'> #include &lt;net/inet_frag.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "6lowpan_i.h"</div><div class='ctx'> </div><div class='hunk'>@@ -34,8 +30,9 @@ static const char lowpan_frags_cache_name[] = "lowpan-frags";</div><div class='ctx'> </div><div class='ctx'> static struct inet_frags lowpan_frags;</div><div class='ctx'> </div><div class='del'>-static int lowpan_frag_reasm(struct lowpan_frag_queue *fq,</div><div class='del'>-			     struct sk_buff *prev, struct net_device *ldev);</div><div class='add'>+static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			     struct sk_buff *prev, struct net_device *ldev,</div><div class='add'>+			     int *refs);</div><div class='ctx'> </div><div class='ctx'> static void lowpan_frag_init(struct inet_frag_queue *q, const void *a)</div><div class='ctx'> {</div><div class='hunk'>@@ -47,8 +44,9 @@ static void lowpan_frag_init(struct inet_frag_queue *q, const void *a)</div><div class='ctx'> </div><div class='ctx'> static void lowpan_frag_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frag_queue *frag = from_timer(frag, t, timer);</div><div class='add'>+	struct inet_frag_queue *frag = timer_container_of(frag, t, timer);</div><div class='ctx'> 	struct frag_queue *fq;</div><div class='add'>+	int refs = 1;</div><div class='ctx'> </div><div class='ctx'> 	fq = container_of(frag, struct frag_queue, q);</div><div class='ctx'> </div><div class='hunk'>@@ -57,10 +55,10 @@ static void lowpan_frag_expire(struct timer_list *t)</div><div class='ctx'> 	if (fq-&gt;q.flags &amp; INET_FRAG_COMPLETE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, &amp;refs);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;fq-&gt;q.lock);</div><div class='del'>-	inet_frag_put(&amp;fq-&gt;q);</div><div class='add'>+	inet_frag_putn(&amp;fq-&gt;q, refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct lowpan_frag_queue *</div><div class='hunk'>@@ -78,7 +76,7 @@ fq_find(struct net *net, const struct lowpan_802154_cb *cb,</div><div class='ctx'> 	key.src = *src;</div><div class='ctx'> 	key.dst = *dst;</div><div class='ctx'> </div><div class='del'>-	q = inet_frag_find(&amp;ieee802154_lowpan-&gt;frags, &amp;key);</div><div class='add'>+	q = inet_frag_find(ieee802154_lowpan-&gt;fqdir, &amp;key);</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -86,11 +84,18 @@ fq_find(struct net *net, const struct lowpan_802154_cb *cb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lowpan_frag_queue(struct lowpan_frag_queue *fq,</div><div class='del'>-			     struct sk_buff *skb, u8 frag_type)</div><div class='add'>+			     struct sk_buff *skb, u8 frag_type,</div><div class='add'>+			     int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *prev, *next;</div><div class='add'>+	struct sk_buff *prev_tail;</div><div class='ctx'> 	struct net_device *ldev;</div><div class='del'>-	int end, offset;</div><div class='add'>+	int end, offset, err;</div><div class='add'>+</div><div class='add'>+	/* inet_frag_queue_* functions use skb-&gt;cb; see struct ipfrag_skb_cb</div><div class='add'>+	 * in inet_fragment.c</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct lowpan_802154_cb) &gt; sizeof(struct inet_skb_parm));</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct lowpan_802154_cb) &gt; sizeof(struct inet6_skb_parm));</div><div class='ctx'> </div><div class='ctx'> 	if (fq-&gt;q.flags &amp; INET_FRAG_COMPLETE)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -117,45 +122,23 @@ static int lowpan_frag_queue(struct lowpan_frag_queue *fq,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Find out which fragments are in front and at the back of us</div><div class='del'>-	 * in the chain of fragments so far.  We must know where to put</div><div class='del'>-	 * this fragment, right?</div><div class='del'>-	 */</div><div class='del'>-	prev = fq-&gt;q.fragments_tail;</div><div class='del'>-	if (!prev ||</div><div class='del'>-	    lowpan_802154_cb(prev)-&gt;d_offset &lt;</div><div class='del'>-	    lowpan_802154_cb(skb)-&gt;d_offset) {</div><div class='del'>-		next = NULL;</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-	prev = NULL;</div><div class='del'>-	for (next = fq-&gt;q.fragments; next != NULL; next = next-&gt;next) {</div><div class='del'>-		if (lowpan_802154_cb(next)-&gt;d_offset &gt;=</div><div class='del'>-		    lowpan_802154_cb(skb)-&gt;d_offset)</div><div class='del'>-			break;	/* bingo! */</div><div class='del'>-		prev = next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	/* Insert this fragment in the chain of fragments. */</div><div class='del'>-	skb-&gt;next = next;</div><div class='del'>-	if (!next)</div><div class='del'>-		fq-&gt;q.fragments_tail = skb;</div><div class='del'>-	if (prev)</div><div class='del'>-		prev-&gt;next = skb;</div><div class='del'>-	else</div><div class='del'>-		fq-&gt;q.fragments = skb;</div><div class='del'>-</div><div class='ctx'> 	ldev = skb-&gt;dev;</div><div class='ctx'> 	if (ldev)</div><div class='ctx'> 		skb-&gt;dev = NULL;</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	prev_tail = fq-&gt;q.fragments_tail;</div><div class='add'>+	err = inet_frag_queue_insert(&amp;fq-&gt;q, skb, offset, end);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	fq-&gt;q.stamp = skb-&gt;tstamp;</div><div class='add'>+	fq-&gt;q.tstamp_type = skb-&gt;tstamp_type;</div><div class='ctx'> 	if (frag_type == LOWPAN_DISPATCH_FRAG1)</div><div class='ctx'> 		fq-&gt;q.flags |= INET_FRAG_FIRST_IN;</div><div class='ctx'> </div><div class='ctx'> 	fq-&gt;q.meat += skb-&gt;len;</div><div class='del'>-	add_frag_mem_limit(fq-&gt;q.net, skb-&gt;truesize);</div><div class='add'>+	add_frag_mem_limit(fq-&gt;q.fqdir, skb-&gt;truesize);</div><div class='ctx'> </div><div class='ctx'> 	if (fq-&gt;q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &amp;&amp;</div><div class='ctx'> 	    fq-&gt;q.meat == fq-&gt;q.len) {</div><div class='hunk'>@@ -163,10 +146,11 @@ found:</div><div class='ctx'> 		unsigned long orefdst = skb-&gt;_skb_refdst;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;_skb_refdst = 0UL;</div><div class='del'>-		res = lowpan_frag_reasm(fq, prev, ldev);</div><div class='add'>+		res = lowpan_frag_reasm(fq, skb, prev_tail, ldev, refs);</div><div class='ctx'> 		skb-&gt;_skb_refdst = orefdst;</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='add'>+	skb_dst_drop(skb);</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> err:</div><div class='hunk'>@@ -175,97 +159,29 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*	Check if this packet is complete.</div><div class='del'>- *	Returns NULL on failure by any reason, and pointer</div><div class='del'>- *	to current nexthdr field in reassembled frame.</div><div class='ctx'>  *</div><div class='ctx'>  *	It is called with locked fq, and caller must check that</div><div class='ctx'>  *	queue is eligible for reassembly i.e. it is not COMPLETE,</div><div class='ctx'>  *	the last and the first frames arrived and all the bits are here.</div><div class='ctx'>  */</div><div class='del'>-static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,</div><div class='del'>-			     struct net_device *ldev)</div><div class='add'>+static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			     struct sk_buff *prev_tail, struct net_device *ldev,</div><div class='add'>+			     int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *fp, *head = fq-&gt;q.fragments;</div><div class='del'>-	int sum_truesize;</div><div class='del'>-</div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='del'>-</div><div class='del'>-	/* Make the one we just received the head. */</div><div class='del'>-	if (prev) {</div><div class='del'>-		head = prev-&gt;next;</div><div class='del'>-		fp = skb_clone(head, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!fp)</div><div class='del'>-			goto out_oom;</div><div class='del'>-</div><div class='del'>-		fp-&gt;next = head-&gt;next;</div><div class='del'>-		if (!fp-&gt;next)</div><div class='del'>-			fq-&gt;q.fragments_tail = fp;</div><div class='del'>-		prev-&gt;next = fp;</div><div class='add'>+	void *reasm_data;</div><div class='ctx'> </div><div class='del'>-		skb_morph(head, fq-&gt;q.fragments);</div><div class='del'>-		head-&gt;next = fq-&gt;q.fragments-&gt;next;</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> </div><div class='del'>-		consume_skb(fq-&gt;q.fragments);</div><div class='del'>-		fq-&gt;q.fragments = head;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Head of list must not be cloned. */</div><div class='del'>-	if (skb_unclone(head, GFP_ATOMIC))</div><div class='add'>+	reasm_data = inet_frag_reasm_prepare(&amp;fq-&gt;q, skb, prev_tail);</div><div class='add'>+	if (!reasm_data)</div><div class='ctx'> 		goto out_oom;</div><div class='add'>+	inet_frag_reasm_finish(&amp;fq-&gt;q, skb, reasm_data, false);</div><div class='ctx'> </div><div class='del'>-	/* If the first fragment is fragmented itself, we split</div><div class='del'>-	 * it to two chunks: the first with data and paged part</div><div class='del'>-	 * and the second, holding only fragments.</div><div class='del'>-	 */</div><div class='del'>-	if (skb_has_frag_list(head)) {</div><div class='del'>-		struct sk_buff *clone;</div><div class='del'>-		int i, plen = 0;</div><div class='del'>-</div><div class='del'>-		clone = alloc_skb(0, GFP_ATOMIC);</div><div class='del'>-		if (!clone)</div><div class='del'>-			goto out_oom;</div><div class='del'>-		clone-&gt;next = head-&gt;next;</div><div class='del'>-		head-&gt;next = clone;</div><div class='del'>-		skb_shinfo(clone)-&gt;frag_list = skb_shinfo(head)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(head);</div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(head)-&gt;nr_frags; i++)</div><div class='del'>-			plen += skb_frag_size(&amp;skb_shinfo(head)-&gt;frags[i]);</div><div class='del'>-		clone-&gt;len = head-&gt;data_len - plen;</div><div class='del'>-		clone-&gt;data_len = clone-&gt;len;</div><div class='del'>-		head-&gt;data_len -= clone-&gt;len;</div><div class='del'>-		head-&gt;len -= clone-&gt;len;</div><div class='del'>-		add_frag_mem_limit(fq-&gt;q.net, clone-&gt;truesize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(head == NULL);</div><div class='del'>-</div><div class='del'>-	sum_truesize = head-&gt;truesize;</div><div class='del'>-	for (fp = head-&gt;next; fp;) {</div><div class='del'>-		bool headstolen;</div><div class='del'>-		int delta;</div><div class='del'>-		struct sk_buff *next = fp-&gt;next;</div><div class='del'>-</div><div class='del'>-		sum_truesize += fp-&gt;truesize;</div><div class='del'>-		if (skb_try_coalesce(head, fp, &amp;headstolen, &amp;delta)) {</div><div class='del'>-			kfree_skb_partial(fp, headstolen);</div><div class='del'>-		} else {</div><div class='del'>-			if (!skb_shinfo(head)-&gt;frag_list)</div><div class='del'>-				skb_shinfo(head)-&gt;frag_list = fp;</div><div class='del'>-			head-&gt;data_len += fp-&gt;len;</div><div class='del'>-			head-&gt;len += fp-&gt;len;</div><div class='del'>-			head-&gt;truesize += fp-&gt;truesize;</div><div class='del'>-		}</div><div class='del'>-		fp = next;</div><div class='del'>-	}</div><div class='del'>-	sub_frag_mem_limit(fq-&gt;q.net, sum_truesize);</div><div class='del'>-</div><div class='del'>-	head-&gt;next = NULL;</div><div class='del'>-	head-&gt;dev = ldev;</div><div class='del'>-	head-&gt;tstamp = fq-&gt;q.stamp;</div><div class='del'>-</div><div class='del'>-	fq-&gt;q.fragments = NULL;</div><div class='add'>+	skb-&gt;dev = ldev;</div><div class='add'>+	skb-&gt;tstamp = fq-&gt;q.stamp;</div><div class='add'>+	fq-&gt;q.rb_fragments = RB_ROOT;</div><div class='ctx'> 	fq-&gt;q.fragments_tail = NULL;</div><div class='add'>+	fq-&gt;q.last_run_head = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> out_oom:</div><div class='hunk'>@@ -284,7 +200,7 @@ static int lowpan_frag_rx_handlers_result(struct sk_buff *skb,</div><div class='ctx'> 		net_warn_ratelimited("%s: received unknown dispatch\n",</div><div class='ctx'> 				     __func__);</div><div class='ctx'> </div><div class='del'>-		/* fall-through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* all others failure */</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='hunk'>@@ -388,17 +304,20 @@ int lowpan_frag_rcv(struct sk_buff *skb, u8 frag_type)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	fq = fq_find(net, cb, &amp;hdr.source, &amp;hdr.dest);</div><div class='ctx'> 	if (fq != NULL) {</div><div class='del'>-		int ret;</div><div class='add'>+		int ret, refs = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;fq-&gt;q.lock);</div><div class='del'>-		ret = lowpan_frag_queue(fq, skb, frag_type);</div><div class='add'>+		ret = lowpan_frag_queue(fq, skb, frag_type, &amp;refs);</div><div class='ctx'> 		spin_unlock(&amp;fq-&gt;q.lock);</div><div class='ctx'> </div><div class='del'>-		inet_frag_put(&amp;fq-&gt;q);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		inet_frag_putn(&amp;fq-&gt;q, refs);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -410,28 +329,22 @@ err:</div><div class='ctx'> static struct ctl_table lowpan_frags_ns_ctl_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "6lowpanfrag_high_thresh",</div><div class='del'>-		.data		= &amp;init_net.ieee802154_lowpan.frags.high_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra1		= &amp;init_net.ieee802154_lowpan.frags.low_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "6lowpanfrag_low_thresh",</div><div class='del'>-		.data		= &amp;init_net.ieee802154_lowpan.frags.low_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra2		= &amp;init_net.ieee802154_lowpan.frags.high_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "6lowpanfrag_time",</div><div class='del'>-		.data		= &amp;init_net.ieee802154_lowpan.frags.timeout,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* secret interval has been deprecated */</div><div class='hunk'>@@ -444,7 +357,6 @@ static struct ctl_table lowpan_frags_ctl_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)</div><div class='hunk'>@@ -453,6 +365,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)</div><div class='ctx'> 	struct ctl_table_header *hdr;</div><div class='ctx'> 	struct netns_ieee802154_lowpan *ieee802154_lowpan =</div><div class='ctx'> 		net_ieee802154_lowpan(net);</div><div class='add'>+	size_t table_size = ARRAY_SIZE(lowpan_frags_ns_ctl_table);</div><div class='ctx'> </div><div class='ctx'> 	table = lowpan_frags_ns_ctl_table;</div><div class='ctx'> 	if (!net_eq(net, &amp;init_net)) {</div><div class='hunk'>@@ -461,19 +374,19 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)</div><div class='ctx'> 		if (table == NULL)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='del'>-		table[0].data = &amp;ieee802154_lowpan-&gt;frags.high_thresh;</div><div class='del'>-		table[0].extra1 = &amp;ieee802154_lowpan-&gt;frags.low_thresh;</div><div class='del'>-		table[0].extra2 = &amp;init_net.ieee802154_lowpan.frags.high_thresh;</div><div class='del'>-		table[1].data = &amp;ieee802154_lowpan-&gt;frags.low_thresh;</div><div class='del'>-		table[1].extra2 = &amp;ieee802154_lowpan-&gt;frags.high_thresh;</div><div class='del'>-		table[2].data = &amp;ieee802154_lowpan-&gt;frags.timeout;</div><div class='del'>-</div><div class='ctx'> 		/* Don't export sysctls to unprivileged users */</div><div class='ctx'> 		if (net-&gt;user_ns != &amp;init_user_ns)</div><div class='del'>-			table[0].procname = NULL;</div><div class='add'>+			table_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);</div><div class='add'>+	table[0].data	= &amp;ieee802154_lowpan-&gt;fqdir-&gt;high_thresh;</div><div class='add'>+	table[0].extra1	= &amp;ieee802154_lowpan-&gt;fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].data	= &amp;ieee802154_lowpan-&gt;fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].extra2	= &amp;ieee802154_lowpan-&gt;fqdir-&gt;high_thresh;</div><div class='add'>+	table[2].data	= &amp;ieee802154_lowpan-&gt;fqdir-&gt;timeout;</div><div class='add'>+</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/ieee802154/6lowpan", table,</div><div class='add'>+				     table_size);</div><div class='ctx'> 	if (hdr == NULL)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -489,7 +402,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit lowpan_frags_ns_sysctl_unregister(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> 	struct netns_ieee802154_lowpan *ieee802154_lowpan =</div><div class='ctx'> 		net_ieee802154_lowpan(net);</div><div class='ctx'> </div><div class='hunk'>@@ -539,32 +452,42 @@ static int __net_init lowpan_frags_init_net(struct net *net)</div><div class='ctx'> 		net_ieee802154_lowpan(net);</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	ieee802154_lowpan-&gt;frags.high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='del'>-	ieee802154_lowpan-&gt;frags.low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='del'>-	ieee802154_lowpan-&gt;frags.timeout = IPV6_FRAG_TIMEOUT;</div><div class='del'>-	ieee802154_lowpan-&gt;frags.f = &amp;lowpan_frags;</div><div class='ctx'> </div><div class='del'>-	res = inet_frags_init_net(&amp;ieee802154_lowpan-&gt;frags);</div><div class='add'>+	res = fqdir_init(&amp;ieee802154_lowpan-&gt;fqdir, &amp;lowpan_frags, net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='add'>+</div><div class='add'>+	ieee802154_lowpan-&gt;fqdir-&gt;high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='add'>+	ieee802154_lowpan-&gt;fqdir-&gt;low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='add'>+	ieee802154_lowpan-&gt;fqdir-&gt;timeout = IPV6_FRAG_TIMEOUT;</div><div class='add'>+</div><div class='ctx'> 	res = lowpan_frags_ns_sysctl_register(net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='del'>-		inet_frags_exit_net(&amp;ieee802154_lowpan-&gt;frags);</div><div class='add'>+		fqdir_exit(ieee802154_lowpan-&gt;fqdir);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit lowpan_frags_pre_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct netns_ieee802154_lowpan *ieee802154_lowpan =</div><div class='add'>+		net_ieee802154_lowpan(net);</div><div class='add'>+</div><div class='add'>+	fqdir_pre_exit(ieee802154_lowpan-&gt;fqdir);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit lowpan_frags_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct netns_ieee802154_lowpan *ieee802154_lowpan =</div><div class='ctx'> 		net_ieee802154_lowpan(net);</div><div class='ctx'> </div><div class='ctx'> 	lowpan_frags_ns_sysctl_unregister(net);</div><div class='del'>-	inet_frags_exit_net(&amp;ieee802154_lowpan-&gt;frags);</div><div class='add'>+	fqdir_exit(ieee802154_lowpan-&gt;fqdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations lowpan_frags_ops = {</div><div class='del'>-	.init = lowpan_frags_init_net,</div><div class='del'>-	.exit = lowpan_frags_exit_net,</div><div class='add'>+	.init		= lowpan_frags_init_net,</div><div class='add'>+	.pre_exit	= lowpan_frags_pre_exit_net,</div><div class='add'>+	.exit		= lowpan_frags_exit_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u32 lowpan_key_hashfn(const void *data, u32 len, u32 seed)</div><div class='hunk'>@@ -629,7 +552,7 @@ err_sysctl:</div><div class='ctx'> </div><div class='ctx'> void lowpan_net_frag_exit(void)</div><div class='ctx'> {</div><div class='del'>-	inet_frags_fini(&amp;lowpan_frags);</div><div class='ctx'> 	lowpan_frags_sysctl_unregister();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;lowpan_frags_ops);</div><div class='add'>+	inet_frags_fini(&amp;lowpan_frags);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ieee802154/6lowpan/rx.c b/net/ieee802154/6lowpan/rx.c<br/>index 649e7d45e88f..517e6493f5d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/rx.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/rx.c</a></div><div class='hunk'>@@ -1,12 +1,4 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -43,11 +35,11 @@ static int lowpan_rx_handlers_result(struct sk_buff *skb, lowpan_rx_result res)</div><div class='ctx'> 		net_warn_ratelimited("%s: received unknown dispatch\n",</div><div class='ctx'> 				     __func__);</div><div class='ctx'> </div><div class='del'>-		/* fall-through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case RX_DROP_UNUSABLE:</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-		/* fall-through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case RX_DROP:</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	case RX_QUEUED:</div><div class='hunk'>@@ -248,7 +240,7 @@ static inline bool lowpan_is_reserved(u8 dispatch)</div><div class='ctx'> 	return ((dispatch &gt;= 0x44 &amp;&amp; dispatch &lt;= 0x4F) ||</div><div class='ctx'> 		(dispatch &gt;= 0x51 &amp;&amp; dispatch &lt;= 0x5F) ||</div><div class='ctx'> 		(dispatch &gt;= 0xc8 &amp;&amp; dispatch &lt;= 0xdf) ||</div><div class='del'>-		(dispatch &gt;= 0xe8 &amp;&amp; dispatch &lt;= 0xff));</div><div class='add'>+		dispatch &gt;= 0xe8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* lowpan_rx_h_check checks on generic 6LoWPAN requirements</div><div class='head'>diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c<br/>index ca53efa17be1..0c07662b44c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/tx.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/6lowpan/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/6lowpan/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/6lowpan/tx.c</a></div><div class='hunk'>@@ -1,12 +1,4 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/6lowpan.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='hunk'>@@ -48,6 +40,9 @@ int lowpan_header_create(struct sk_buff *skb, struct net_device *ldev,</div><div class='ctx'> 	const struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='ctx'> 	struct neighbour *n;</div><div class='ctx'> </div><div class='add'>+	if (!daddr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* TODO:</div><div class='ctx'> 	 * if this package isn't ipv6 one, where should it be routed?</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig<br/>index 188135bcb803..bcb05ba97686 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> menuconfig IEEE802154</div><div class='ctx'> 	tristate "IEEE Std 802.15.4 Low-Rate Wireless Personal Area Networks support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  IEEE Std 802.15.4 defines a low data rate, low power and low</div><div class='ctx'> 	  complexity short range wireless personal area networks. It was</div><div class='ctx'> 	  designed to organise networks of sensors, switches, etc automation</div><div class='hunk'>@@ -14,13 +15,13 @@ if IEEE802154</div><div class='ctx'> </div><div class='ctx'> config IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> 	bool "IEEE 802.15.4 experimental netlink support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Adds experimental netlink support for nl802154.</div><div class='ctx'> </div><div class='ctx'> config IEEE802154_SOCKET</div><div class='ctx'> 	tristate "IEEE 802.15.4 socket interface"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Socket interface for IEEE 802.15.4. Contains DGRAM sockets interface</div><div class='ctx'> 	  for 802.15.4 dataframes. Also RAW socket interface to build MAC</div><div class='ctx'> 	  header from userspace.</div><div class='head'>diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile<br/>index f05b7bdae2aa..7bce67673e83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@ obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o</div><div class='ctx'> obj-y += 6lowpan/</div><div class='ctx'> </div><div class='ctx'> ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \</div><div class='del'>-                header_ops.o sysfs.o nl802154.o trace.o</div><div class='add'>+                header_ops.o sysfs.o nl802154.o trace.o pan.o</div><div class='ctx'> ieee802154_socket-y := socket.o</div><div class='ctx'> </div><div class='ctx'> CFLAGS_trace.o := -I$(src)</div><div class='head'>diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c<br/>index fe225d9a1877..89b671b12600 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/core.c</a></div><div class='hunk'>@@ -1,15 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007, 2008, 2009 Siemens AG</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -32,11 +23,6 @@</div><div class='ctx'> LIST_HEAD(cfg802154_rdev_list);</div><div class='ctx'> int cfg802154_rdev_list_generation;</div><div class='ctx'> </div><div class='del'>-static int wpan_phy_match(struct device *dev, const void *data)</div><div class='del'>-{</div><div class='del'>-	return !strcmp(dev_name(dev), (const char *)data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct wpan_phy *wpan_phy_find(const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -44,7 +30,7 @@ struct wpan_phy *wpan_phy_find(const char *str)</div><div class='ctx'> 	if (WARN_ON(!str))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	dev = class_find_device(&amp;wpan_phy_class, NULL, str, wpan_phy_match);</div><div class='add'>+	dev = class_find_device_by_name(&amp;wpan_phy_class, str);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +129,9 @@ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size)</div><div class='ctx'> 	wpan_phy_net_set(&amp;rdev-&gt;wpan_phy, &amp;init_net);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;rdev-&gt;dev_wait);</div><div class='add'>+	init_waitqueue_head(&amp;rdev-&gt;wpan_phy.sync_txq);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;rdev-&gt;wpan_phy.queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;rdev-&gt;wpan_phy;</div><div class='ctx'> }</div><div class='hunk'>@@ -209,6 +198,25 @@ void wpan_phy_free(struct wpan_phy *phy)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(wpan_phy_free);</div><div class='ctx'> </div><div class='add'>+static void cfg802154_free_peer_structures(struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	struct ieee802154_pan_device *child, *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	kfree(wpan_dev-&gt;parent);</div><div class='add'>+	wpan_dev-&gt;parent = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(child, tmp, &amp;wpan_dev-&gt;children, node) {</div><div class='add'>+		list_del(&amp;child-&gt;node);</div><div class='add'>+		kfree(child);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wpan_dev-&gt;nchildren = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int cfg802154_switch_netns(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 			   struct net *net)</div><div class='ctx'> {</div><div class='hunk'>@@ -218,11 +226,11 @@ int cfg802154_switch_netns(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 	list_for_each_entry(wpan_dev, &amp;rdev-&gt;wpan_dev_list, list) {</div><div class='ctx'> 		if (!wpan_dev-&gt;netdev)</div><div class='ctx'> 			continue;</div><div class='del'>-		wpan_dev-&gt;netdev-&gt;features &amp;= ~NETIF_F_NETNS_LOCAL;</div><div class='add'>+		wpan_dev-&gt;netdev-&gt;netns_immutable = false;</div><div class='ctx'> 		err = dev_change_net_namespace(wpan_dev-&gt;netdev, net, "wpan%d");</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		wpan_dev-&gt;netdev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+		wpan_dev-&gt;netdev-&gt;netns_immutable = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -234,11 +242,11 @@ int cfg802154_switch_netns(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 						     list) {</div><div class='ctx'> 			if (!wpan_dev-&gt;netdev)</div><div class='ctx'> 				continue;</div><div class='del'>-			wpan_dev-&gt;netdev-&gt;features &amp;= ~NETIF_F_NETNS_LOCAL;</div><div class='add'>+			wpan_dev-&gt;netdev-&gt;netns_immutable = false;</div><div class='ctx'> 			err = dev_change_net_namespace(wpan_dev-&gt;netdev, net,</div><div class='ctx'> 						       "wpan%d");</div><div class='ctx'> 			WARN_ON(err);</div><div class='del'>-			wpan_dev-&gt;netdev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+			wpan_dev-&gt;netdev-&gt;netns_immutable = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -283,10 +291,13 @@ static int cfg802154_netdev_notifier_call(struct notifier_block *nb,</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 		/* TODO NETDEV_DEVTYPE */</div><div class='ctx'> 	case NETDEV_REGISTER:</div><div class='del'>-		dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+		dev-&gt;netns_immutable = true;</div><div class='ctx'> 		wpan_dev-&gt;identifier = ++rdev-&gt;wpan_dev_id;</div><div class='ctx'> 		list_add_rcu(&amp;wpan_dev-&gt;list, &amp;rdev-&gt;wpan_dev_list);</div><div class='ctx'> 		rdev-&gt;devlist_generation++;</div><div class='add'>+		mutex_init(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+		INIT_LIST_HEAD(&amp;wpan_dev-&gt;children);</div><div class='add'>+		wpan_dev-&gt;max_associations = SZ_16K;</div><div class='ctx'> </div><div class='ctx'> 		wpan_dev-&gt;netdev = dev;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -302,6 +313,8 @@ static int cfg802154_netdev_notifier_call(struct notifier_block *nb,</div><div class='ctx'> 		rdev-&gt;opencount++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='add'>+		cfg802154_free_peer_structures(wpan_dev);</div><div class='add'>+</div><div class='ctx'> 		/* It is possible to get NETDEV_UNREGISTER</div><div class='ctx'> 		 * multiple times. To detect that, check</div><div class='ctx'> 		 * that the interface is still on the list</div><div class='head'>diff --git a/net/ieee802154/header_ops.c b/net/ieee802154/header_ops.c<br/>index c7439f0fbbdf..41a556be1017 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/header_ops.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/header_ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/header_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/header_ops.c</a></div><div class='hunk'>@@ -1,15 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2014 Fraunhofer ITWM</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * Written by:</div><div class='ctx'>  * Phoebe Buckheister &lt;phoebe.buckheister@itwm.fraunhofer.de&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -128,6 +120,53 @@ ieee802154_hdr_push(struct sk_buff *skb, struct ieee802154_hdr *hdr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ieee802154_hdr_push);</div><div class='ctx'> </div><div class='add'>+int ieee802154_mac_cmd_push(struct sk_buff *skb, void *f,</div><div class='add'>+			    const void *pl, unsigned int pl_len)</div><div class='add'>+{</div><div class='add'>+	struct ieee802154_mac_cmd_frame *frame = f;</div><div class='add'>+	struct ieee802154_mac_cmd_pl *mac_pl = &amp;frame-&gt;mac_pl;</div><div class='add'>+	struct ieee802154_hdr *mhr = &amp;frame-&gt;mhr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(*mhr));</div><div class='add'>+	ret = ieee802154_hdr_push(skb, mhr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb-&gt;mac_len = ret;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, mac_pl, sizeof(*mac_pl));</div><div class='add'>+	skb_put_data(skb, pl, pl_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee802154_mac_cmd_push);</div><div class='add'>+</div><div class='add'>+int ieee802154_beacon_push(struct sk_buff *skb,</div><div class='add'>+			   struct ieee802154_beacon_frame *beacon)</div><div class='add'>+{</div><div class='add'>+	struct ieee802154_beacon_hdr *mac_pl = &amp;beacon-&gt;mac_pl;</div><div class='add'>+	struct ieee802154_hdr *mhr = &amp;beacon-&gt;mhr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(*mhr));</div><div class='add'>+	ret = ieee802154_hdr_push(skb, mhr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb-&gt;mac_len = ret;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, mac_pl, sizeof(*mac_pl));</div><div class='add'>+</div><div class='add'>+	if (mac_pl-&gt;pend_short_addr_count || mac_pl-&gt;pend_ext_addr_count)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee802154_beacon_push);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ieee802154_hdr_get_addr(const u8 *buf, int mode, bool omit_pan,</div><div class='ctx'> 			struct ieee802154_addr *addr)</div><div class='hunk'>@@ -268,6 +307,19 @@ ieee802154_hdr_pull(struct sk_buff *skb, struct ieee802154_hdr *hdr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ieee802154_hdr_pull);</div><div class='ctx'> </div><div class='add'>+int ieee802154_mac_cmd_pl_pull(struct sk_buff *skb,</div><div class='add'>+			       struct ieee802154_mac_cmd_pl *mac_pl)</div><div class='add'>+{</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*mac_pl)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(mac_pl, skb-&gt;data, sizeof(*mac_pl));</div><div class='add'>+	skb_pull(skb, sizeof(*mac_pl));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee802154_mac_cmd_pl_pull);</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> ieee802154_hdr_peek_addrs(const struct sk_buff *skb, struct ieee802154_hdr *hdr)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h<br/>index a5d7515b7f62..c5d91f78301a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/ieee802154.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/ieee802154.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/ieee802154.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/ieee802154.h</a></div><div class='hunk'>@@ -1,15 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007, 2008, 2009 Siemens AG</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IEEE_802154_LOCAL_H</div><div class='ctx'> #define IEEE_802154_LOCAL_H</div><div class='hunk'>@@ -20,7 +11,6 @@ void ieee802154_nl_exit(void);</div><div class='ctx'> #define IEEE802154_OP(_cmd, _func)			\</div><div class='ctx'> 	{						\</div><div class='ctx'> 		.cmd	= _cmd,				\</div><div class='del'>-		.policy	= ieee802154_policy,		\</div><div class='ctx'> 		.doit	= _func,			\</div><div class='ctx'> 		.dumpit	= NULL,				\</div><div class='ctx'> 		.flags	= GENL_ADMIN_PERM,		\</div><div class='hunk'>@@ -29,7 +19,6 @@ void ieee802154_nl_exit(void);</div><div class='ctx'> #define IEEE802154_DUMP(_cmd, _func, _dump)		\</div><div class='ctx'> 	{						\</div><div class='ctx'> 		.cmd	= _cmd,				\</div><div class='del'>-		.policy	= ieee802154_policy,		\</div><div class='ctx'> 		.doit	= _func,			\</div><div class='ctx'> 		.dumpit	= _dump,			\</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c<br/>index 96636e3b7aa9..7d2de4ee6992 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/netlink.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Netlink interface for IEEE 802.15.4 stack</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007, 2008 Siemens AG</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * Written by:</div><div class='ctx'>  * Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='ctx'>  * Dmitry Eremin-Solenikov &lt;dbaryshkov@gmail.com&gt;</div><div class='hunk'>@@ -89,7 +81,7 @@ int ieee802154_nl_reply(struct sk_buff *msg, struct genl_info *info)</div><div class='ctx'> 	return genlmsg_reply(msg, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops ieee802154_ops[] = {</div><div class='add'>+static const struct genl_small_ops ieee802154_ops[] = {</div><div class='ctx'> 	/* see nl-phy.c */</div><div class='ctx'> 	IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy,</div><div class='ctx'> 			ieee802154_dump_phy),</div><div class='hunk'>@@ -136,9 +128,11 @@ struct genl_family nl802154_family __ro_after_init = {</div><div class='ctx'> 	.name		= IEEE802154_NL_NAME,</div><div class='ctx'> 	.version	= 1,</div><div class='ctx'> 	.maxattr	= IEEE802154_ATTR_MAX,</div><div class='add'>+	.policy		= ieee802154_policy,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= ieee802154_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(ieee802154_ops),</div><div class='add'>+	.small_ops	= ieee802154_ops,</div><div class='add'>+	.n_small_ops	= ARRAY_SIZE(ieee802154_ops),</div><div class='add'>+	.resv_start_op	= IEEE802154_LLSEC_DEL_SECLEVEL + 1,</div><div class='ctx'> 	.mcgrps		= ieee802154_mcgrps,</div><div class='ctx'> 	.n_mcgrps	= ARRAY_SIZE(ieee802154_mcgrps),</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c<br/>index d3cbb3258718..74ef0a310afb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl-mac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl-mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/nl-mac.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Netlink interface for IEEE 802.15.4 stack</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007, 2008 Siemens AG</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * Written by:</div><div class='ctx'>  * Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='ctx'>  * Dmitry Eremin-Solenikov &lt;dbaryshkov@gmail.com&gt;</div><div class='hunk'>@@ -157,7 +149,7 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)</div><div class='ctx'> 	if (info-&gt;attrs[IEEE802154_ATTR_DEV_NAME]) {</div><div class='ctx'> 		char name[IFNAMSIZ + 1];</div><div class='ctx'> </div><div class='del'>-		nla_strlcpy(name, info-&gt;attrs[IEEE802154_ATTR_DEV_NAME],</div><div class='add'>+		nla_strscpy(name, info-&gt;attrs[IEEE802154_ATTR_DEV_NAME],</div><div class='ctx'> 			    sizeof(name));</div><div class='ctx'> 		dev = dev_get_by_name(&amp;init_net, name);</div><div class='ctx'> 	} else if (info-&gt;attrs[IEEE802154_ATTR_DEV_INDEX]) {</div><div class='hunk'>@@ -210,10 +202,7 @@ int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	addr.pan_id = nla_get_shortaddr(</div><div class='ctx'> 			info-&gt;attrs[IEEE802154_ATTR_COORD_PAN_ID]);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[IEEE802154_ATTR_PAGE])</div><div class='del'>-		page = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_PAGE]);</div><div class='del'>-	else</div><div class='del'>-		page = 0;</div><div class='add'>+	page = nla_get_u8_default(info-&gt;attrs[IEEE802154_ATTR_PAGE], 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = ieee802154_mlme_ops(dev)-&gt;assoc_req(dev, &amp;addr,</div><div class='ctx'> 			nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_CHANNEL]),</div><div class='hunk'>@@ -346,10 +335,7 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	blx = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_BAT_EXT]);</div><div class='ctx'> 	coord_realign = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_COORD_REALIGN]);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[IEEE802154_ATTR_PAGE])</div><div class='del'>-		page = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_PAGE]);</div><div class='del'>-	else</div><div class='del'>-		page = 0;</div><div class='add'>+	page = nla_get_u8_default(info-&gt;attrs[IEEE802154_ATTR_PAGE], 0);</div><div class='ctx'> </div><div class='ctx'> 	if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) {</div><div class='ctx'> 		ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS);</div><div class='hunk'>@@ -396,10 +382,7 @@ int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	channels = nla_get_u32(info-&gt;attrs[IEEE802154_ATTR_CHANNELS]);</div><div class='ctx'> 	duration = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_DURATION]);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[IEEE802154_ATTR_PAGE])</div><div class='del'>-		page = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_PAGE]);</div><div class='del'>-	else</div><div class='del'>-		page = 0;</div><div class='add'>+	page = nla_get_u8_default(info-&gt;attrs[IEEE802154_ATTR_PAGE], 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = ieee802154_mlme_ops(dev)-&gt;scan_req(dev, type, channels,</div><div class='ctx'> 						 page, duration);</div><div class='hunk'>@@ -559,9 +542,7 @@ ieee802154_llsec_parse_key_id(struct genl_info *info,</div><div class='ctx'> 	desc-&gt;mode = nla_get_u8(info-&gt;attrs[IEEE802154_ATTR_LLSEC_KEY_MODE]);</div><div class='ctx'> </div><div class='ctx'> 	if (desc-&gt;mode == IEEE802154_SCF_KEY_IMPLICIT) {</div><div class='del'>-		if (!info-&gt;attrs[IEEE802154_ATTR_PAN_ID] &amp;&amp;</div><div class='del'>-		    !(info-&gt;attrs[IEEE802154_ATTR_SHORT_ADDR] ||</div><div class='del'>-		      info-&gt;attrs[IEEE802154_ATTR_HW_ADDR]))</div><div class='add'>+		if (!info-&gt;attrs[IEEE802154_ATTR_PAN_ID])</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;device_addr.pan_id = nla_get_shortaddr(info-&gt;attrs[IEEE802154_ATTR_PAN_ID]);</div><div class='hunk'>@@ -570,6 +551,9 @@ ieee802154_llsec_parse_key_id(struct genl_info *info,</div><div class='ctx'> 			desc-&gt;device_addr.mode = IEEE802154_ADDR_SHORT;</div><div class='ctx'> 			desc-&gt;device_addr.short_addr = nla_get_shortaddr(info-&gt;attrs[IEEE802154_ATTR_SHORT_ADDR]);</div><div class='ctx'> 		} else {</div><div class='add'>+			if (!info-&gt;attrs[IEEE802154_ATTR_HW_ADDR])</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 			desc-&gt;device_addr.mode = IEEE802154_ADDR_LONG;</div><div class='ctx'> 			desc-&gt;device_addr.extended_addr = nla_get_hwaddr(info-&gt;attrs[IEEE802154_ATTR_HW_ADDR]);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -687,8 +671,10 @@ int ieee802154_llsec_getparams(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	    nla_put_u8(msg, IEEE802154_ATTR_LLSEC_SECLEVEL, params.out_level) ||</div><div class='ctx'> 	    nla_put_u32(msg, IEEE802154_ATTR_LLSEC_FRAME_COUNTER,</div><div class='ctx'> 			be32_to_cpu(params.frame_counter)) ||</div><div class='del'>-	    ieee802154_llsec_fill_key_id(msg, &amp;params.out_key))</div><div class='add'>+	    ieee802154_llsec_fill_key_id(msg, &amp;params.out_key)) {</div><div class='add'>+		rc = -ENOBUFS;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_put(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1191,7 +1177,7 @@ static int llsec_iter_devkeys(struct llsec_dump_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee802154_llsec_device *dpos;</div><div class='ctx'> 	struct ieee802154_llsec_device_key *kpos;</div><div class='del'>-	int rc = 0, idx = 0, idx2;</div><div class='add'>+	int idx = 0, idx2;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(dpos, &amp;data-&gt;table-&gt;devices, list) {</div><div class='ctx'> 		if (idx++ &lt; data-&gt;s_idx)</div><div class='hunk'>@@ -1207,7 +1193,7 @@ static int llsec_iter_devkeys(struct llsec_dump_data *data)</div><div class='ctx'> 						      data-&gt;nlmsg_seq,</div><div class='ctx'> 						      dpos-&gt;hwaddr, kpos,</div><div class='ctx'> 						      data-&gt;dev)) {</div><div class='del'>-				return rc = -EMSGSIZE;</div><div class='add'>+				return -EMSGSIZE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			data-&gt;s_idx2++;</div><div class='hunk'>@@ -1216,7 +1202,7 @@ static int llsec_iter_devkeys(struct llsec_dump_data *data)</div><div class='ctx'> 		data-&gt;s_idx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ieee802154_llsec_dump_devkeys(struct sk_buff *skb,</div><div class='head'>diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c<br/>index b231e40f006a..4c07a475c567 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl-phy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl-phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl-phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/nl-phy.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Netlink interface for IEEE 802.15.4 stack</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007, 2008 Siemens AG</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * Written by:</div><div class='ctx'>  * Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='ctx'>  * Dmitry Eremin-Solenikov &lt;dbaryshkov@gmail.com&gt;</div><div class='hunk'>@@ -38,7 +30,7 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid,</div><div class='ctx'> {</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> 	int i, pages = 0;</div><div class='del'>-	uint32_t *buf = kcalloc(32, sizeof(uint32_t), GFP_KERNEL);</div><div class='add'>+	u32 *buf = kcalloc(IEEE802154_MAX_PAGE + 1, sizeof(u32), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +47,7 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid,</div><div class='ctx'> 	    nla_put_u8(msg, IEEE802154_ATTR_PAGE, phy-&gt;current_page) ||</div><div class='ctx'> 	    nla_put_u8(msg, IEEE802154_ATTR_CHANNEL, phy-&gt;current_channel))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+	for (i = 0; i &lt;= IEEE802154_MAX_PAGE; i++) {</div><div class='ctx'> 		if (phy-&gt;supported.channels[i])</div><div class='ctx'> 			buf[pages++] = phy-&gt;supported.channels[i] | (i &lt;&lt; 27);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -232,25 +224,27 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	dev_hold(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;attrs[IEEE802154_ATTR_HW_ADDR]) {</div><div class='del'>-		struct sockaddr addr;</div><div class='add'>+		struct sockaddr_storage addr;</div><div class='ctx'> </div><div class='del'>-		addr.sa_family = ARPHRD_IEEE802154;</div><div class='del'>-		nla_memcpy(&amp;addr.sa_data, info-&gt;attrs[IEEE802154_ATTR_HW_ADDR],</div><div class='add'>+		addr.ss_family = ARPHRD_IEEE802154;</div><div class='add'>+		nla_memcpy(&amp;addr.__data, info-&gt;attrs[IEEE802154_ATTR_HW_ADDR],</div><div class='ctx'> 			   IEEE802154_ADDR_LEN);</div><div class='ctx'> </div><div class='ctx'> 		/* strangely enough, some callbacks (inetdev_event) from</div><div class='ctx'> 		 * dev_set_mac_address require RTNL_LOCK</div><div class='ctx'> 		 */</div><div class='ctx'> 		rtnl_lock();</div><div class='del'>-		rc = dev_set_mac_address(dev, &amp;addr);</div><div class='add'>+		rc = dev_set_mac_address(dev, &amp;addr, NULL);</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto dev_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||</div><div class='del'>-	    nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev-&gt;name))</div><div class='add'>+	    nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev-&gt;name)) {</div><div class='add'>+		rc = -EMSGSIZE;</div><div class='ctx'> 		goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> 	dev_put(dev);</div><div class='ctx'> </div><div class='ctx'> 	wpan_phy_put(phy);</div><div class='hunk'>@@ -346,8 +340,7 @@ nla_put_failure:</div><div class='ctx'> out_dev:</div><div class='ctx'> 	wpan_phy_put(phy);</div><div class='ctx'> out:</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_put(dev);</div><div class='add'>+	dev_put(dev);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c<br/>index 99f6c254ea77..5a024ca60d35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl802154.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl802154.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl802154.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/nl802154.c</a></div><div class='hunk'>@@ -1,11 +1,5 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='hunk'>@@ -32,10 +26,12 @@ static struct genl_family nl802154_fam;</div><div class='ctx'> /* multicast groups */</div><div class='ctx'> enum nl802154_multicast_groups {</div><div class='ctx'> 	NL802154_MCGRP_CONFIG,</div><div class='add'>+	NL802154_MCGRP_SCAN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct genl_multicast_group nl802154_mcgrps[] = {</div><div class='ctx'> 	[NL802154_MCGRP_CONFIG] = { .name = "config", },</div><div class='add'>+	[NL802154_MCGRP_SCAN] = { .name = "scan", },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* returns ERR_PTR values */</div><div class='hunk'>@@ -191,8 +187,8 @@ static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX+1] = {</div><div class='ctx'> </div><div class='ctx'> 	[NL802154_ATTR_WPAN_DEV] = { .type = NLA_U64 },</div><div class='ctx'> </div><div class='del'>-	[NL802154_ATTR_PAGE] = { .type = NLA_U8, },</div><div class='del'>-	[NL802154_ATTR_CHANNEL] = { .type = NLA_U8, },</div><div class='add'>+	[NL802154_ATTR_PAGE] = NLA_POLICY_MAX(NLA_U8, IEEE802154_MAX_PAGE),</div><div class='add'>+	[NL802154_ATTR_CHANNEL] = NLA_POLICY_MAX(NLA_U8, IEEE802154_MAX_CHANNEL),</div><div class='ctx'> </div><div class='ctx'> 	[NL802154_ATTR_TX_POWER] = { .type = NLA_S32, },</div><div class='ctx'> </div><div class='hunk'>@@ -222,6 +218,25 @@ static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX+1] = {</div><div class='ctx'> </div><div class='ctx'> 	[NL802154_ATTR_PID] = { .type = NLA_U32 },</div><div class='ctx'> 	[NL802154_ATTR_NETNS_FD] = { .type = NLA_U32 },</div><div class='add'>+</div><div class='add'>+	[NL802154_ATTR_COORDINATOR] = { .type = NLA_NESTED },</div><div class='add'>+</div><div class='add'>+	[NL802154_ATTR_SCAN_TYPE] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U8, NL802154_SCAN_ED, NL802154_SCAN_RIT_PASSIVE),</div><div class='add'>+	[NL802154_ATTR_SCAN_CHANNELS] =</div><div class='add'>+		NLA_POLICY_MASK(NLA_U32, GENMASK(IEEE802154_MAX_CHANNEL, 0)),</div><div class='add'>+	[NL802154_ATTR_SCAN_PREAMBLE_CODES] = { .type = NLA_REJECT },</div><div class='add'>+	[NL802154_ATTR_SCAN_MEAN_PRF] = { .type = NLA_REJECT },</div><div class='add'>+	[NL802154_ATTR_SCAN_DURATION] =</div><div class='add'>+		NLA_POLICY_MAX(NLA_U8, IEEE802154_MAX_SCAN_DURATION),</div><div class='add'>+	[NL802154_ATTR_SCAN_DONE_REASON] =</div><div class='add'>+		NLA_POLICY_RANGE(NLA_U8, NL802154_SCAN_DONE_REASON_FINISHED,</div><div class='add'>+				 NL802154_SCAN_DONE_REASON_ABORTED),</div><div class='add'>+	[NL802154_ATTR_BEACON_INTERVAL] =</div><div class='add'>+		NLA_POLICY_MAX(NLA_U8, IEEE802154_ACTIVE_SCAN_DURATION),</div><div class='add'>+	[NL802154_ATTR_MAX_ASSOCIATIONS] = { .type = NLA_U32 },</div><div class='add'>+	[NL802154_ATTR_PEER] = { .type = NLA_NESTED },</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> 	[NL802154_ATTR_SEC_ENABLED] = { .type = NLA_U8, },</div><div class='ctx'> 	[NL802154_ATTR_SEC_OUT_LEVEL] = { .type = NLA_U32, },</div><div class='hunk'>@@ -235,26 +250,20 @@ static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX+1] = {</div><div class='ctx'> #endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> static int</div><div class='ctx'> nl802154_prepare_wpan_dev_dump(struct sk_buff *skb,</div><div class='ctx'> 			       struct netlink_callback *cb,</div><div class='ctx'> 			       struct cfg802154_registered_device **rdev,</div><div class='ctx'> 			       struct wpan_dev **wpan_dev)</div><div class='ctx'> {</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 	if (!cb-&gt;args[0]) {</div><div class='del'>-		err = nlmsg_parse(cb-&gt;nlh, GENL_HDRLEN + nl802154_fam.hdrsize,</div><div class='del'>-				  genl_family_attrbuf(&amp;nl802154_fam),</div><div class='del'>-				  nl802154_fam.maxattr, nl802154_policy, NULL);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-</div><div class='ctx'> 		*wpan_dev = __cfg802154_wpan_dev_from_attrs(sock_net(skb-&gt;sk),</div><div class='del'>-							    genl_family_attrbuf(&amp;nl802154_fam));</div><div class='add'>+							    info-&gt;info.attrs);</div><div class='ctx'> 		if (IS_ERR(*wpan_dev)) {</div><div class='ctx'> 			err = PTR_ERR(*wpan_dev);</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -299,7 +308,6 @@ nl802154_finish_wpan_dev_dump(struct cfg802154_registered_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */</div><div class='ctx'> </div><div class='ctx'> /* message building helper */</div><div class='ctx'> static inline void *nl802154hdr_put(struct sk_buff *skb, u32 portid, u32 seq,</div><div class='hunk'>@@ -312,7 +320,7 @@ static inline void *nl802154hdr_put(struct sk_buff *skb, u32 portid, u32 seq,</div><div class='ctx'> static int</div><div class='ctx'> nl802154_put_flags(struct sk_buff *msg, int attr, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr *nl_flags = nla_nest_start(msg, attr);</div><div class='add'>+	struct nlattr *nl_flags = nla_nest_start_noflag(msg, attr);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!nl_flags)</div><div class='hunk'>@@ -338,7 +346,7 @@ nl802154_send_wpan_phy_channels(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 	struct nlattr *nl_page;</div><div class='ctx'> 	unsigned long page;</div><div class='ctx'> </div><div class='del'>-	nl_page = nla_nest_start(msg, NL802154_ATTR_CHANNELS_SUPPORTED);</div><div class='add'>+	nl_page = nla_nest_start_noflag(msg, NL802154_ATTR_CHANNELS_SUPPORTED);</div><div class='ctx'> 	if (!nl_page)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -360,11 +368,11 @@ nl802154_put_capabilities(struct sk_buff *msg,</div><div class='ctx'> 	struct nlattr *nl_caps, *nl_channels;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	nl_caps = nla_nest_start(msg, NL802154_ATTR_WPAN_PHY_CAPS);</div><div class='add'>+	nl_caps = nla_nest_start_noflag(msg, NL802154_ATTR_WPAN_PHY_CAPS);</div><div class='ctx'> 	if (!nl_caps)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	nl_channels = nla_nest_start(msg, NL802154_CAP_ATTR_CHANNELS);</div><div class='add'>+	nl_channels = nla_nest_start_noflag(msg, NL802154_CAP_ATTR_CHANNELS);</div><div class='ctx'> 	if (!nl_channels)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -380,8 +388,8 @@ nl802154_put_capabilities(struct sk_buff *msg,</div><div class='ctx'> 	if (rdev-&gt;wpan_phy.flags &amp; WPAN_PHY_FLAG_CCA_ED_LEVEL) {</div><div class='ctx'> 		struct nlattr *nl_ed_lvls;</div><div class='ctx'> </div><div class='del'>-		nl_ed_lvls = nla_nest_start(msg,</div><div class='del'>-					    NL802154_CAP_ATTR_CCA_ED_LEVELS);</div><div class='add'>+		nl_ed_lvls = nla_nest_start_noflag(msg,</div><div class='add'>+						   NL802154_CAP_ATTR_CCA_ED_LEVELS);</div><div class='ctx'> 		if (!nl_ed_lvls)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +404,8 @@ nl802154_put_capabilities(struct sk_buff *msg,</div><div class='ctx'> 	if (rdev-&gt;wpan_phy.flags &amp; WPAN_PHY_FLAG_TXPOWER) {</div><div class='ctx'> 		struct nlattr *nl_tx_pwrs;</div><div class='ctx'> </div><div class='del'>-		nl_tx_pwrs = nla_nest_start(msg, NL802154_CAP_ATTR_TX_POWERS);</div><div class='add'>+		nl_tx_pwrs = nla_nest_start_noflag(msg,</div><div class='add'>+						   NL802154_CAP_ATTR_TX_POWERS);</div><div class='ctx'> 		if (!nl_tx_pwrs)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -504,7 +513,7 @@ static int nl802154_send_wpan_phy(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 	if (nl802154_put_capabilities(msg, rdev))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_cmds = nla_nest_start(msg, NL802154_ATTR_SUPPORTED_COMMANDS);</div><div class='add'>+	nl_cmds = nla_nest_start_noflag(msg, NL802154_ATTR_SUPPORTED_COMMANDS);</div><div class='ctx'> 	if (!nl_cmds)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -560,15 +569,8 @@ static int nl802154_dump_wpan_phy_parse(struct sk_buff *skb,</div><div class='ctx'> 					struct netlink_callback *cb,</div><div class='ctx'> 					struct nl802154_dump_wpan_phy_state *state)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr **tb = genl_family_attrbuf(&amp;nl802154_fam);</div><div class='del'>-	int ret = nlmsg_parse(cb-&gt;nlh, GENL_HDRLEN + nl802154_fam.hdrsize, tb,</div><div class='del'>-			      nl802154_fam.maxattr, nl802154_policy, NULL);</div><div class='del'>-</div><div class='del'>-	/* TODO check if we can handle error here,</div><div class='del'>-	 * we have no backward compatibility</div><div class='del'>-	 */</div><div class='del'>-	if (ret)</div><div class='del'>-		return 0;</div><div class='add'>+	const struct genl_dumpit_info *info = genl_dumpit_info(cb);</div><div class='add'>+	struct nlattr **tb = info-&gt;info.attrs;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[NL802154_ATTR_WPAN_PHY])</div><div class='ctx'> 		state-&gt;filter_wpan_phy = nla_get_u32(tb[NL802154_ATTR_WPAN_PHY]);</div><div class='hunk'>@@ -693,7 +695,8 @@ ieee802154_llsec_send_key_id(struct sk_buff *msg,</div><div class='ctx'> </div><div class='ctx'> 	switch (desc-&gt;mode) {</div><div class='ctx'> 	case NL802154_KEY_ID_MODE_IMPLICIT:</div><div class='del'>-		nl_dev_addr = nla_nest_start(msg, NL802154_KEY_ID_ATTR_IMPLICIT);</div><div class='add'>+		nl_dev_addr = nla_nest_start_noflag(msg,</div><div class='add'>+						    NL802154_KEY_ID_ATTR_IMPLICIT);</div><div class='ctx'> 		if (!nl_dev_addr)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -768,7 +771,7 @@ static int nl802154_get_llsec_params(struct sk_buff *msg,</div><div class='ctx'> 			 params.frame_counter))</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	nl_key_id = nla_nest_start(msg, NL802154_ATTR_SEC_OUT_KEY_ID);</div><div class='add'>+	nl_key_id = nla_nest_start_noflag(msg, NL802154_ATTR_SEC_OUT_KEY_ID);</div><div class='ctx'> 	if (!nl_key_id)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -836,8 +839,13 @@ nl802154_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (nl802154_get_llsec_params(msg, rdev, wpan_dev) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> #endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */</div><div class='ctx'> </div><div class='ctx'> 	genlmsg_end(msg, hdr);</div><div class='hunk'>@@ -975,8 +983,7 @@ static int nl802154_set_channel(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	channel = nla_get_u8(info-&gt;attrs[NL802154_ATTR_CHANNEL]);</div><div class='ctx'> </div><div class='ctx'> 	/* check 802.15.4 constraints */</div><div class='del'>-	if (page &gt; IEEE802154_MAX_PAGE || channel &gt; IEEE802154_MAX_CHANNEL ||</div><div class='del'>-	    !(rdev-&gt;wpan_phy.supported.channels[page] &amp; BIT(channel)))</div><div class='add'>+	if (!ieee802154_chan_is_valid(&amp;rdev-&gt;wpan_phy, page, channel))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return rdev_set_channel(rdev, page, channel);</div><div class='hunk'>@@ -1080,15 +1087,14 @@ static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	pan_id = nla_get_le16(info-&gt;attrs[NL802154_ATTR_PAN_ID]);</div><div class='ctx'> </div><div class='del'>-	/* TODO</div><div class='del'>-	 * I am not sure about to check here on broadcast pan_id.</div><div class='del'>-	 * Broadcast is a valid setting, comment from 802.15.4:</div><div class='del'>-	 * If this value is 0xffff, the device is not associated.</div><div class='del'>-	 *</div><div class='del'>-	 * This could useful to simple deassociate an device.</div><div class='add'>+	/* Only allow changing the PAN ID when the device has no more</div><div class='add'>+	 * associations ongoing to avoid confusing peers.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pan_id == cpu_to_le16(IEEE802154_PAN_ID_BROADCAST))</div><div class='add'>+	if (cfg802154_device_is_associated(wpan_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "Existing associations, changing PAN ID forbidden");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rdev_set_pan_id(rdev, wpan_dev, pan_id);</div><div class='ctx'> }</div><div class='hunk'>@@ -1116,20 +1122,17 @@ static int nl802154_set_short_addr(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	short_addr = nla_get_le16(info-&gt;attrs[NL802154_ATTR_SHORT_ADDR]);</div><div class='ctx'> </div><div class='del'>-	/* TODO</div><div class='del'>-	 * I am not sure about to check here on broadcast short_addr.</div><div class='del'>-	 * Broadcast is a valid setting, comment from 802.15.4:</div><div class='del'>-	 * A value of 0xfffe indicates that the device has</div><div class='del'>-	 * associated but has not been allocated an address. A</div><div class='del'>-	 * value of 0xffff indicates that the device does not</div><div class='del'>-	 * have a short address.</div><div class='del'>-	 *</div><div class='del'>-	 * I think we should allow to set these settings but</div><div class='del'>-	 * don't allow to allow socket communication with it.</div><div class='add'>+	/* The short address only has a meaning when part of a PAN, after a</div><div class='add'>+	 * proper association procedure. However, we want to still offer the</div><div class='add'>+	 * possibility to create static networks so changing the short address</div><div class='add'>+	 * is only allowed when not already associated to other devices with</div><div class='add'>+	 * the official handshake.</div><div class='ctx'> 	 */</div><div class='del'>-	if (short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC) ||</div><div class='del'>-	    short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_BROADCAST))</div><div class='add'>+	if (cfg802154_device_is_associated(wpan_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack,</div><div class='add'>+			       "Existing associations, changing short address forbidden");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rdev_set_short_addr(rdev, wpan_dev, short_addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -1292,6 +1295,522 @@ static int nl802154_wpan_phy_netns(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nl802154_prep_scan_event_msg(struct sk_buff *msg,</div><div class='add'>+					struct cfg802154_registered_device *rdev,</div><div class='add'>+					struct wpan_dev *wpan_dev,</div><div class='add'>+					u32 portid, u32 seq, int flags, u8 cmd,</div><div class='add'>+					struct ieee802154_coord_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NL802154_ATTR_WPAN_PHY, rdev-&gt;wpan_phy_idx))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;netdev &amp;&amp;</div><div class='add'>+	    nla_put_u32(msg, NL802154_ATTR_IFINDEX, wpan_dev-&gt;netdev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NL802154_ATTR_WPAN_DEV,</div><div class='add'>+			      wpan_dev_id(wpan_dev), NL802154_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla = nla_nest_start_noflag(msg, NL802154_ATTR_COORDINATOR);</div><div class='add'>+	if (!nla)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put(msg, NL802154_COORD_PANID, IEEE802154_PAN_ID_LEN,</div><div class='add'>+		    &amp;desc-&gt;addr.pan_id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;addr.mode == IEEE802154_ADDR_SHORT) {</div><div class='add'>+		if (nla_put(msg, NL802154_COORD_ADDR,</div><div class='add'>+			    IEEE802154_SHORT_ADDR_LEN,</div><div class='add'>+			    &amp;desc-&gt;addr.short_addr))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else {</div><div class='add'>+		if (nla_put(msg, NL802154_COORD_ADDR,</div><div class='add'>+			    IEEE802154_EXTENDED_ADDR_LEN,</div><div class='add'>+			    &amp;desc-&gt;addr.extended_addr))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NL802154_COORD_CHANNEL, desc-&gt;channel))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NL802154_COORD_PAGE, desc-&gt;page))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(msg, NL802154_COORD_SUPERFRAME_SPEC,</div><div class='add'>+			desc-&gt;superframe_spec))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NL802154_COORD_LINK_QUALITY, desc-&gt;link_quality))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;gts_permit &amp;&amp; nla_put_flag(msg, NL802154_COORD_GTS_PERMIT))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	/* TODO: NL802154_COORD_PAYLOAD_DATA if any */</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, nla);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nl802154_scan_event(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,</div><div class='add'>+			struct ieee802154_coord_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = wpan_phy_to_rdev(wpan_phy);</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = nl802154_prep_scan_event_msg(msg, rdev, wpan_dev, 0, 0, 0,</div><div class='add'>+					   NL802154_CMD_SCAN_EVENT,</div><div class='add'>+					   desc);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_multicast_netns(&amp;nl802154_fam, wpan_phy_net(wpan_phy),</div><div class='add'>+				       msg, 0, NL802154_MCGRP_SCAN, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nl802154_scan_event);</div><div class='add'>+</div><div class='add'>+static int nl802154_trigger_scan(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+	struct wpan_phy *wpan_phy = &amp;rdev-&gt;wpan_phy;</div><div class='add'>+	struct cfg802154_scan_request *request;</div><div class='add'>+	u8 type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Monitors are not allowed to perform scans");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_SCAN_TYPE]) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Malformed request, missing scan type");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wpan_phy-&gt;flags &amp; WPAN_PHY_FLAG_DATAGRAMS_ONLY) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "PHY only supports datagrams");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	request = kzalloc(sizeof(*request), GFP_KERNEL);</div><div class='add'>+	if (!request)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	request-&gt;wpan_dev = wpan_dev;</div><div class='add'>+	request-&gt;wpan_phy = wpan_phy;</div><div class='add'>+</div><div class='add'>+	type = nla_get_u8(info-&gt;attrs[NL802154_ATTR_SCAN_TYPE]);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL802154_SCAN_ACTIVE:</div><div class='add'>+	case NL802154_SCAN_PASSIVE:</div><div class='add'>+		request-&gt;type = type;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_FMT(info-&gt;extack, "Unsupported scan type: %d", type);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto free_request;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use current page by default */</div><div class='add'>+	request-&gt;page = nla_get_u8_default(info-&gt;attrs[NL802154_ATTR_PAGE],</div><div class='add'>+					   wpan_phy-&gt;current_page);</div><div class='add'>+</div><div class='add'>+	/* Scan all supported channels by default */</div><div class='add'>+	request-&gt;channels =</div><div class='add'>+		nla_get_u32_default(info-&gt;attrs[NL802154_ATTR_SCAN_CHANNELS],</div><div class='add'>+				    wpan_phy-&gt;supported.channels[request-&gt;page]);</div><div class='add'>+</div><div class='add'>+	/* Use maximum duration order by default */</div><div class='add'>+	request-&gt;duration =</div><div class='add'>+		nla_get_u8_default(info-&gt;attrs[NL802154_ATTR_SCAN_DURATION],</div><div class='add'>+				   IEEE802154_MAX_SCAN_DURATION);</div><div class='add'>+</div><div class='add'>+	err = rdev_trigger_scan(rdev, request);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failure starting scanning (%d)\n", err);</div><div class='add'>+		goto free_request;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_request:</div><div class='add'>+	kfree(request);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_prep_scan_msg(struct sk_buff *msg,</div><div class='add'>+				  struct cfg802154_registered_device *rdev,</div><div class='add'>+				  struct wpan_dev *wpan_dev, u32 portid,</div><div class='add'>+				  u32 seq, int flags, u8 cmd, u8 arg)</div><div class='add'>+{</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(msg, NL802154_ATTR_WPAN_PHY, rdev-&gt;wpan_phy_idx))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;netdev &amp;&amp;</div><div class='add'>+	    nla_put_u32(msg, NL802154_ATTR_IFINDEX, wpan_dev-&gt;netdev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(msg, NL802154_ATTR_WPAN_DEV,</div><div class='add'>+			      wpan_dev_id(wpan_dev), NL802154_ATTR_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (cmd == NL802154_CMD_SCAN_DONE &amp;&amp;</div><div class='add'>+	    nla_put_u8(msg, NL802154_ATTR_SCAN_DONE_REASON, arg))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_send_scan_msg(struct cfg802154_registered_device *rdev,</div><div class='add'>+				  struct wpan_dev *wpan_dev, u8 cmd, u8 arg)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = nl802154_prep_scan_msg(msg, rdev, wpan_dev, 0, 0, 0, cmd, arg);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		nlmsg_free(msg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return genlmsg_multicast_netns(&amp;nl802154_fam,</div><div class='add'>+				       wpan_phy_net(&amp;rdev-&gt;wpan_phy), msg, 0,</div><div class='add'>+				       NL802154_MCGRP_SCAN, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nl802154_scan_started(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = wpan_phy_to_rdev(wpan_phy);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Ignore errors when there are no listeners */</div><div class='add'>+	err = nl802154_send_scan_msg(rdev, wpan_dev, NL802154_CMD_TRIGGER_SCAN, 0);</div><div class='add'>+	if (err == -ESRCH)</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nl802154_scan_started);</div><div class='add'>+</div><div class='add'>+int nl802154_scan_done(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,</div><div class='add'>+		       enum nl802154_scan_done_reasons reason)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = wpan_phy_to_rdev(wpan_phy);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Ignore errors when there are no listeners */</div><div class='add'>+	err = nl802154_send_scan_msg(rdev, wpan_dev, NL802154_CMD_SCAN_DONE, reason);</div><div class='add'>+	if (err == -ESRCH)</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nl802154_scan_done);</div><div class='add'>+</div><div class='add'>+static int nl802154_abort_scan(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+</div><div class='add'>+	/* Resources are released in the notification helper above */</div><div class='add'>+	return rdev_abort_scan(rdev, wpan_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nl802154_send_beacons(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+	struct wpan_phy *wpan_phy = &amp;rdev-&gt;wpan_phy;</div><div class='add'>+	struct cfg802154_beacon_request *request;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;iftype != NL802154_IFTYPE_COORD) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Only coordinators can send beacons");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;pan_id == cpu_to_le16(IEEE802154_PANID_BROADCAST)) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Device is not part of any PAN");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wpan_phy-&gt;flags &amp; WPAN_PHY_FLAG_DATAGRAMS_ONLY) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "PHY only supports datagrams");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	request = kzalloc(sizeof(*request), GFP_KERNEL);</div><div class='add'>+	if (!request)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	request-&gt;wpan_dev = wpan_dev;</div><div class='add'>+	request-&gt;wpan_phy = wpan_phy;</div><div class='add'>+</div><div class='add'>+	/* Use maximum duration order by default */</div><div class='add'>+	request-&gt;interval = nla_get_u8_default(info-&gt;attrs[NL802154_ATTR_BEACON_INTERVAL],</div><div class='add'>+					       IEEE802154_MAX_SCAN_DURATION);</div><div class='add'>+</div><div class='add'>+	err = rdev_send_beacons(rdev, request);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failure starting sending beacons (%d)\n", err);</div><div class='add'>+		goto free_request;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_request:</div><div class='add'>+	kfree(request);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nl802154_beaconing_done(struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	/* NOP */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nl802154_beaconing_done);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nl802154_stop_beacons(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+</div><div class='add'>+	/* Resources are released in the notification helper above */</div><div class='add'>+	return rdev_stop_beacons(rdev, wpan_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_associate(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev;</div><div class='add'>+	struct wpan_phy *wpan_phy;</div><div class='add'>+	struct ieee802154_addr coord;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+	wpan_phy = &amp;rdev-&gt;wpan_phy;</div><div class='add'>+</div><div class='add'>+	if (wpan_phy-&gt;flags &amp; WPAN_PHY_FLAG_DATAGRAMS_ONLY) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "PHY only supports datagrams");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_PAN_ID] ||</div><div class='add'>+	    !info-&gt;attrs[NL802154_ATTR_EXTENDED_ADDR])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	coord.pan_id = nla_get_le16(info-&gt;attrs[NL802154_ATTR_PAN_ID]);</div><div class='add'>+	coord.mode = IEEE802154_ADDR_LONG;</div><div class='add'>+	coord.extended_addr = nla_get_le64(info-&gt;attrs[NL802154_ATTR_EXTENDED_ADDR]);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+	err = rdev_associate(rdev, wpan_dev, &amp;coord);</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("Association with PAN ID 0x%x failed (%d)\n",</div><div class='add'>+		       le16_to_cpu(coord.pan_id), err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_disassociate(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev = info-&gt;user_ptr[0];</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+	struct wpan_phy *wpan_phy = &amp;rdev-&gt;wpan_phy;</div><div class='add'>+	struct ieee802154_addr target;</div><div class='add'>+</div><div class='add'>+	if (wpan_phy-&gt;flags &amp; WPAN_PHY_FLAG_DATAGRAMS_ONLY) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "PHY only supports datagrams");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	target.pan_id = wpan_dev-&gt;pan_id;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NL802154_ATTR_EXTENDED_ADDR]) {</div><div class='add'>+		target.mode = IEEE802154_ADDR_LONG;</div><div class='add'>+		target.extended_addr = nla_get_le64(info-&gt;attrs[NL802154_ATTR_EXTENDED_ADDR]);</div><div class='add'>+	} else if (info-&gt;attrs[NL802154_ATTR_SHORT_ADDR]) {</div><div class='add'>+		target.mode = IEEE802154_ADDR_SHORT;</div><div class='add'>+		target.short_addr = nla_get_le16(info-&gt;attrs[NL802154_ATTR_SHORT_ADDR]);</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "Device address is missing");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+	rdev_disassociate(rdev, wpan_dev, &amp;target);</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_set_max_associations(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = info-&gt;user_ptr[1];</div><div class='add'>+	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='add'>+	unsigned int max_assoc;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_MAX_ASSOCIATIONS]) {</div><div class='add'>+		NL_SET_ERR_MSG(info-&gt;extack, "No maximum number of association given");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_assoc = nla_get_u32(info-&gt;attrs[NL802154_ATTR_MAX_ASSOCIATIONS]);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+	cfg802154_set_max_associations(wpan_dev, max_assoc);</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_send_peer_info(struct sk_buff *msg,</div><div class='add'>+				   struct netlink_callback *cb,</div><div class='add'>+				   u32 seq, int flags,</div><div class='add'>+				   struct cfg802154_registered_device *rdev,</div><div class='add'>+				   struct wpan_dev *wpan_dev,</div><div class='add'>+				   struct ieee802154_pan_device *peer,</div><div class='add'>+				   enum nl802154_peer_type type)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	hdr = nl802154hdr_put(msg, NETLINK_CB(cb-&gt;skb).portid, seq, flags,</div><div class='add'>+			      NL802154_CMD_LIST_ASSOCIATIONS);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	genl_dump_check_consistent(cb, hdr);</div><div class='add'>+</div><div class='add'>+	nla = nla_nest_start_noflag(msg, NL802154_ATTR_PEER);</div><div class='add'>+	if (!nla)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NL802154_DEV_ADDR_ATTR_PEER_TYPE, type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(msg, NL802154_DEV_ADDR_ATTR_MODE, peer-&gt;mode))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put(msg, NL802154_DEV_ADDR_ATTR_SHORT,</div><div class='add'>+		    IEEE802154_SHORT_ADDR_LEN, &amp;peer-&gt;short_addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put(msg, NL802154_DEV_ADDR_ATTR_EXTENDED,</div><div class='add'>+		    IEEE802154_EXTENDED_ADDR_LEN, &amp;peer-&gt;extended_addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(msg, nla);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ nla_put_failure:</div><div class='add'>+	genlmsg_cancel(msg, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nl802154_list_associations(struct sk_buff *skb,</div><div class='add'>+				      struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct cfg802154_registered_device *rdev;</div><div class='add'>+	struct ieee802154_pan_device *child;</div><div class='add'>+	struct wpan_dev *wpan_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nl802154_prepare_wpan_dev_dump(skb, cb, &amp;rdev, &amp;wpan_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;args[2])</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (wpan_dev-&gt;parent) {</div><div class='add'>+		err = nl802154_send_peer_info(skb, cb, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					      NLM_F_MULTI, rdev, wpan_dev,</div><div class='add'>+					      wpan_dev-&gt;parent,</div><div class='add'>+					      NL802154_PEER_TYPE_PARENT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(child, &amp;wpan_dev-&gt;children, node) {</div><div class='add'>+		err = nl802154_send_peer_info(skb, cb, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					      NLM_F_MULTI, rdev, wpan_dev,</div><div class='add'>+					      child,</div><div class='add'>+					      NL802154_PEER_TYPE_CHILD);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cb-&gt;args[2] = 1;</div><div class='add'>+out:</div><div class='add'>+	err = skb-&gt;len;</div><div class='add'>+out_err:</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	nl802154_finish_wpan_dev_dump(rdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> static const struct nla_policy nl802154_dev_addr_policy[NL802154_DEV_ADDR_ATTR_MAX + 1] = {</div><div class='ctx'> 	[NL802154_DEV_ADDR_ATTR_PAN_ID] = { .type = NLA_U16 },</div><div class='hunk'>@@ -1306,23 +1825,23 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla,</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *attrs[NL802154_DEV_ADDR_ATTR_MAX + 1];</div><div class='ctx'> </div><div class='del'>-	if (!nla || nla_parse_nested(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla,</div><div class='del'>-				     nl802154_dev_addr_policy, NULL))</div><div class='add'>+	if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla, nl802154_dev_addr_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] ||</div><div class='del'>-	    !attrs[NL802154_DEV_ADDR_ATTR_MODE] ||</div><div class='del'>-	    !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] ||</div><div class='del'>-	      attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]))</div><div class='add'>+	if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || !attrs[NL802154_DEV_ADDR_ATTR_MODE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	addr-&gt;pan_id = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_PAN_ID]);</div><div class='ctx'> 	addr-&gt;mode = nla_get_u32(attrs[NL802154_DEV_ADDR_ATTR_MODE]);</div><div class='ctx'> 	switch (addr-&gt;mode) {</div><div class='ctx'> 	case NL802154_DEV_ADDR_SHORT:</div><div class='add'>+		if (!attrs[NL802154_DEV_ADDR_ATTR_SHORT])</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		addr-&gt;short_addr = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_SHORT]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL802154_DEV_ADDR_EXTENDED:</div><div class='add'>+		if (!attrs[NL802154_DEV_ADDR_ATTR_EXTENDED])</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		addr-&gt;extended_addr = nla_get_le64(attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1346,8 +1865,7 @@ ieee802154_llsec_parse_key_id(struct nlattr *nla,</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *attrs[NL802154_KEY_ID_ATTR_MAX + 1];</div><div class='ctx'> </div><div class='del'>-	if (!nla || nla_parse_nested(attrs, NL802154_KEY_ID_ATTR_MAX, nla,</div><div class='del'>-				     nl802154_key_id_policy, NULL))</div><div class='add'>+	if (!nla || nla_parse_nested_deprecated(attrs, NL802154_KEY_ID_ATTR_MAX, nla, nl802154_key_id_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!attrs[NL802154_KEY_ID_ATTR_MODE])</div><div class='hunk'>@@ -1402,6 +1920,9 @@ static int nl802154_set_llsec_params(struct sk_buff *skb,</div><div class='ctx'> 	u32 changed = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (info-&gt;attrs[NL802154_ATTR_SEC_ENABLED]) {</div><div class='ctx'> 		u8 enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -1450,16 +1971,16 @@ static int nl802154_send_key(struct sk_buff *msg, u32 cmd, u32 portid,</div><div class='ctx'> </div><div class='ctx'> 	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_key = nla_nest_start(msg, NL802154_ATTR_SEC_KEY);</div><div class='add'>+	nl_key = nla_nest_start_noflag(msg, NL802154_ATTR_SEC_KEY);</div><div class='ctx'> 	if (!nl_key)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_key_id = nla_nest_start(msg, NL802154_KEY_ATTR_ID);</div><div class='add'>+	nl_key_id = nla_nest_start_noflag(msg, NL802154_KEY_ATTR_ID);</div><div class='ctx'> 	if (!nl_key_id)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1508,6 +2029,11 @@ nl802154_dump_llsec_key(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR) {</div><div class='add'>+		err = skb-&gt;len;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!wpan_dev-&gt;netdev) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -1562,9 +2088,11 @@ static int nl802154_add_llsec_key(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	struct ieee802154_llsec_key_id id = { };</div><div class='ctx'> 	u32 commands[NL802154_CMD_FRAME_NR_IDS / 32] = { };</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[NL802154_ATTR_SEC_KEY],</div><div class='del'>-			     nl802154_key_policy, info-&gt;extack))</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_SEC_KEY] ||</div><div class='add'>+	    nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info-&gt;attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info-&gt;extack))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!attrs[NL802154_KEY_ATTR_USAGE_FRAMES] ||</div><div class='hunk'>@@ -1612,9 +2140,11 @@ static int nl802154_del_llsec_key(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	struct nlattr *attrs[NL802154_KEY_ATTR_MAX + 1];</div><div class='ctx'> 	struct ieee802154_llsec_key_id id;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[NL802154_ATTR_SEC_KEY],</div><div class='del'>-			     nl802154_key_policy, info-&gt;extack))</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_SEC_KEY] ||</div><div class='add'>+	    nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info-&gt;attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info-&gt;extack))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ieee802154_llsec_parse_key_id(attrs[NL802154_KEY_ATTR_ID], &amp;id) &lt; 0)</div><div class='hunk'>@@ -1634,12 +2164,12 @@ static int nl802154_send_device(struct sk_buff *msg, u32 cmd, u32 portid,</div><div class='ctx'> </div><div class='ctx'> 	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_device = nla_nest_start(msg, NL802154_ATTR_SEC_DEVICE);</div><div class='add'>+	nl_device = nla_nest_start_noflag(msg, NL802154_ATTR_SEC_DEVICE);</div><div class='ctx'> 	if (!nl_device)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1678,6 +2208,11 @@ nl802154_dump_llsec_dev(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR) {</div><div class='add'>+		err = skb-&gt;len;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!wpan_dev-&gt;netdev) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -1728,8 +2263,7 @@ ieee802154_llsec_parse_device(struct nlattr *nla,</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *attrs[NL802154_DEV_ATTR_MAX + 1];</div><div class='ctx'> </div><div class='del'>-	if (!nla || nla_parse_nested(attrs, NL802154_DEV_ATTR_MAX,</div><div class='del'>-				     nla, nl802154_dev_policy, NULL))</div><div class='add'>+	if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ATTR_MAX, nla, nl802154_dev_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(dev, 0, sizeof(*dev));</div><div class='hunk'>@@ -1765,6 +2299,9 @@ static int nl802154_add_llsec_dev(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='ctx'> 	struct ieee802154_llsec_device dev_desc;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (ieee802154_llsec_parse_device(info-&gt;attrs[NL802154_ATTR_SEC_DEVICE],</div><div class='ctx'> 					  &amp;dev_desc) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1780,9 +2317,11 @@ static int nl802154_del_llsec_dev(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	struct nlattr *attrs[NL802154_DEV_ATTR_MAX + 1];</div><div class='ctx'> 	__le64 extended_addr;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(attrs, NL802154_DEV_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[NL802154_ATTR_SEC_DEVICE],</div><div class='del'>-			     nl802154_dev_policy, info-&gt;extack))</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_SEC_DEVICE] ||</div><div class='add'>+	    nla_parse_nested_deprecated(attrs, NL802154_DEV_ATTR_MAX, info-&gt;attrs[NL802154_ATTR_SEC_DEVICE], nl802154_dev_policy, info-&gt;extack))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!attrs[NL802154_DEV_ATTR_EXTENDED_ADDR])</div><div class='hunk'>@@ -1803,12 +2342,12 @@ static int nl802154_send_devkey(struct sk_buff *msg, u32 cmd, u32 portid,</div><div class='ctx'> </div><div class='ctx'> 	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_devkey = nla_nest_start(msg, NL802154_ATTR_SEC_DEVKEY);</div><div class='add'>+	nl_devkey = nla_nest_start_noflag(msg, NL802154_ATTR_SEC_DEVKEY);</div><div class='ctx'> 	if (!nl_devkey)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1818,7 +2357,7 @@ static int nl802154_send_devkey(struct sk_buff *msg, u32 cmd, u32 portid,</div><div class='ctx'> 			devkey-&gt;frame_counter))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_key_id = nla_nest_start(msg, NL802154_DEVKEY_ATTR_ID);</div><div class='add'>+	nl_key_id = nla_nest_start_noflag(msg, NL802154_DEVKEY_ATTR_ID);</div><div class='ctx'> 	if (!nl_key_id)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1850,6 +2389,11 @@ nl802154_dump_llsec_devkey(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR) {</div><div class='add'>+		err = skb-&gt;len;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!wpan_dev-&gt;netdev) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -1907,10 +2451,11 @@ static int nl802154_add_llsec_devkey(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> 	struct ieee802154_llsec_device_key key;</div><div class='ctx'> 	__le64 extended_addr;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (!info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY] ||</div><div class='del'>-	    nla_parse_nested(attrs, NL802154_DEVKEY_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY],</div><div class='del'>-			     nl802154_devkey_policy, info-&gt;extack) &lt; 0)</div><div class='add'>+	    nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info-&gt;extack) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!attrs[NL802154_DEVKEY_ATTR_FRAME_COUNTER] ||</div><div class='hunk'>@@ -1940,9 +2485,11 @@ static int nl802154_del_llsec_devkey(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> 	struct ieee802154_llsec_device_key key;</div><div class='ctx'> 	__le64 extended_addr;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(attrs, NL802154_DEVKEY_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY],</div><div class='del'>-			     nl802154_devkey_policy, info-&gt;extack))</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY] ||</div><div class='add'>+	    nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info-&gt;attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info-&gt;extack))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!attrs[NL802154_DEVKEY_ATTR_EXTENDED_ADDR])</div><div class='hunk'>@@ -1971,12 +2518,12 @@ static int nl802154_send_seclevel(struct sk_buff *msg, u32 cmd, u32 portid,</div><div class='ctx'> </div><div class='ctx'> 	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_seclevel = nla_nest_start(msg, NL802154_ATTR_SEC_LEVEL);</div><div class='add'>+	nl_seclevel = nla_nest_start_noflag(msg, NL802154_ATTR_SEC_LEVEL);</div><div class='ctx'> 	if (!nl_seclevel)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2015,6 +2562,11 @@ nl802154_dump_llsec_seclevel(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR) {</div><div class='add'>+		err = skb-&gt;len;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!wpan_dev-&gt;netdev) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -2062,8 +2614,7 @@ llsec_parse_seclevel(struct nlattr *nla, struct ieee802154_llsec_seclevel *sl)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *attrs[NL802154_SECLEVEL_ATTR_MAX + 1];</div><div class='ctx'> </div><div class='del'>-	if (!nla || nla_parse_nested(attrs, NL802154_SECLEVEL_ATTR_MAX,</div><div class='del'>-				     nla, nl802154_seclevel_policy, NULL))</div><div class='add'>+	if (!nla || nla_parse_nested_deprecated(attrs, NL802154_SECLEVEL_ATTR_MAX, nla, nl802154_seclevel_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(sl, 0, sizeof(*sl));</div><div class='hunk'>@@ -2100,6 +2651,9 @@ static int nl802154_add_llsec_seclevel(struct sk_buff *skb,</div><div class='ctx'> 	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='ctx'> 	struct ieee802154_llsec_seclevel sl;</div><div class='ctx'> </div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (llsec_parse_seclevel(info-&gt;attrs[NL802154_ATTR_SEC_LEVEL],</div><div class='ctx'> 				 &amp;sl) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2115,8 +2669,10 @@ static int nl802154_del_llsec_seclevel(struct sk_buff *skb,</div><div class='ctx'> 	struct wpan_dev *wpan_dev = dev-&gt;ieee802154_ptr;</div><div class='ctx'> 	struct ieee802154_llsec_seclevel sl;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[NL802154_ATTR_SEC_LEVEL] ||</div><div class='del'>-	    llsec_parse_seclevel(info-&gt;attrs[NL802154_ATTR_SEC_LEVEL],</div><div class='add'>+	if (wpan_dev-&gt;iftype == NL802154_IFTYPE_MONITOR)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (llsec_parse_seclevel(info-&gt;attrs[NL802154_ATTR_SEC_LEVEL],</div><div class='ctx'> 				 &amp;sl) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2128,13 +2684,10 @@ static int nl802154_del_llsec_seclevel(struct sk_buff *skb,</div><div class='ctx'> #define NL802154_FLAG_NEED_NETDEV	0x02</div><div class='ctx'> #define NL802154_FLAG_NEED_RTNL		0x04</div><div class='ctx'> #define NL802154_FLAG_CHECK_NETDEV_UP	0x08</div><div class='del'>-#define NL802154_FLAG_NEED_NETDEV_UP	(NL802154_FLAG_NEED_NETDEV |\</div><div class='del'>-					 NL802154_FLAG_CHECK_NETDEV_UP)</div><div class='ctx'> #define NL802154_FLAG_NEED_WPAN_DEV	0x10</div><div class='del'>-#define NL802154_FLAG_NEED_WPAN_DEV_UP	(NL802154_FLAG_NEED_WPAN_DEV |\</div><div class='del'>-					 NL802154_FLAG_CHECK_NETDEV_UP)</div><div class='ctx'> </div><div class='del'>-static int nl802154_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,</div><div class='add'>+static int nl802154_pre_doit(const struct genl_split_ops *ops,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='ctx'> 			     struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfg802154_registered_device *rdev;</div><div class='hunk'>@@ -2196,15 +2749,15 @@ static int nl802154_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nl802154_post_doit(const struct genl_ops *ops, struct sk_buff *skb,</div><div class='add'>+static void nl802154_post_doit(const struct genl_split_ops *ops,</div><div class='add'>+			       struct sk_buff *skb,</div><div class='ctx'> 			       struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (info-&gt;user_ptr[1]) {</div><div class='ctx'> 		if (ops-&gt;internal_flags &amp; NL802154_FLAG_NEED_WPAN_DEV) {</div><div class='ctx'> 			struct wpan_dev *wpan_dev = info-&gt;user_ptr[1];</div><div class='ctx'> </div><div class='del'>-			if (wpan_dev-&gt;netdev)</div><div class='del'>-				dev_put(wpan_dev-&gt;netdev);</div><div class='add'>+			dev_put(wpan_dev-&gt;netdev);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_put(info-&gt;user_ptr[1]);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2217,165 +2770,227 @@ static void nl802154_post_doit(const struct genl_ops *ops, struct sk_buff *skb,</div><div class='ctx'> static const struct genl_ops nl802154_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_WPAN_PHY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT |</div><div class='add'>+			    GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='ctx'> 		.doit = nl802154_get_wpan_phy,</div><div class='ctx'> 		.dumpit = nl802154_dump_wpan_phy,</div><div class='ctx'> 		.done = nl802154_dump_wpan_phy_done,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		/* can be retrieved by unprivileged users */</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_INTERFACE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_get_interface,</div><div class='ctx'> 		.dumpit = nl802154_dump_interface,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		/* can be retrieved by unprivileged users */</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_DEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_NEW_INTERFACE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_new_interface,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_DEL_INTERFACE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_del_interface,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_DEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_CHANNEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_channel,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_CCA_MODE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_cca_mode,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_CCA_ED_LEVEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_cca_ed_level,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_TX_POWER,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_tx_power,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_WPAN_PHY_NETNS,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_wpan_phy_netns,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_PAN_ID,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_pan_id,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_SHORT_ADDR,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_short_addr,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_BACKOFF_EXPONENT,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_backoff_exponent,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_MAX_CSMA_BACKOFFS,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_max_csma_backoffs,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_MAX_FRAME_RETRIES,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_max_frame_retries,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_LBT_MODE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_lbt_mode,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_ACKREQ_DEFAULT,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_ackreq_default,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_TRIGGER_SCAN,</div><div class='add'>+		.doit = nl802154_trigger_scan,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_ABORT_SCAN,</div><div class='add'>+		.doit = nl802154_abort_scan,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_SEND_BEACONS,</div><div class='add'>+		.doit = nl802154_send_beacons,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_STOP_BEACONS,</div><div class='add'>+		.doit = nl802154_stop_beacons,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_ASSOCIATE,</div><div class='add'>+		.doit = nl802154_associate,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_DISASSOCIATE,</div><div class='add'>+		.doit = nl802154_disassociate,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_CHECK_NETDEV_UP |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_SET_MAX_ASSOCIATIONS,</div><div class='add'>+		.doit = nl802154_set_max_associations,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='add'>+				  NL802154_FLAG_NEED_RTNL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = NL802154_CMD_LIST_ASSOCIATIONS,</div><div class='add'>+		.dumpit = nl802154_list_associations,</div><div class='add'>+		/* can be retrieved by unprivileged users */</div><div class='add'>+	},</div><div class='ctx'> #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_SET_SEC_PARAMS,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_set_llsec_params,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_SEC_KEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT |</div><div class='add'>+			    GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='ctx'> 		/* TODO .doit by matching key id? */</div><div class='ctx'> 		.dumpit = nl802154_dump_llsec_key,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_NEW_SEC_KEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_add_llsec_key,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_DEL_SEC_KEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_del_llsec_key,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='hunk'>@@ -2383,25 +2998,26 @@ static const struct genl_ops nl802154_ops[] = {</div><div class='ctx'> 	/* TODO unique identifier must short+pan OR extended_addr */</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_SEC_DEV,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT |</div><div class='add'>+			    GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='ctx'> 		/* TODO .doit by matching extended_addr? */</div><div class='ctx'> 		.dumpit = nl802154_dump_llsec_dev,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_NEW_SEC_DEV,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_add_llsec_dev,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_DEL_SEC_DEV,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_del_llsec_dev,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='hunk'>@@ -2409,51 +3025,53 @@ static const struct genl_ops nl802154_ops[] = {</div><div class='ctx'> 	/* TODO remove complete devkey, put it as nested? */</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_SEC_DEVKEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT |</div><div class='add'>+			    GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='ctx'> 		/* TODO doit by matching ??? */</div><div class='ctx'> 		.dumpit = nl802154_dump_llsec_devkey,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_NEW_SEC_DEVKEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_add_llsec_devkey,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_DEL_SEC_DEVKEY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_del_llsec_devkey,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_GET_SEC_LEVEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT |</div><div class='add'>+			    GENL_DONT_VALIDATE_DUMP_STRICT,</div><div class='ctx'> 		/* TODO .doit by matching frame_type? */</div><div class='ctx'> 		.dumpit = nl802154_dump_llsec_seclevel,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_NEW_SEC_LEVEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = nl802154_add_llsec_seclevel,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = NL802154_CMD_DEL_SEC_LEVEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		/* TODO match frame_type only? */</div><div class='ctx'> 		.doit = nl802154_del_llsec_seclevel,</div><div class='del'>-		.policy = nl802154_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 		.internal_flags = NL802154_FLAG_NEED_NETDEV |</div><div class='ctx'> 				  NL802154_FLAG_NEED_RTNL,</div><div class='hunk'>@@ -2466,12 +3084,14 @@ static struct genl_family nl802154_fam __ro_after_init = {</div><div class='ctx'> 	.hdrsize = 0,			/* no private header */</div><div class='ctx'> 	.version = 1,			/* no particular meaning now */</div><div class='ctx'> 	.maxattr = NL802154_ATTR_MAX,</div><div class='add'>+	.policy = nl802154_policy,</div><div class='ctx'> 	.netnsok = true,</div><div class='ctx'> 	.pre_doit = nl802154_pre_doit,</div><div class='ctx'> 	.post_doit = nl802154_post_doit,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> 	.ops = nl802154_ops,</div><div class='ctx'> 	.n_ops = ARRAY_SIZE(nl802154_ops),</div><div class='add'>+	.resv_start_op = NL802154_CMD_DEL_SEC_LEVEL + 1,</div><div class='ctx'> 	.mcgrps = nl802154_mcgrps,</div><div class='ctx'> 	.n_mcgrps = ARRAY_SIZE(nl802154_mcgrps),</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ieee802154/nl802154.h b/net/ieee802154/nl802154.h<br/>index 8c4b6d08954c..d69d950f9a6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl802154.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl802154.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl802154.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/nl802154.h</a></div><div class='hunk'>@@ -4,5 +4,11 @@</div><div class='ctx'> </div><div class='ctx'> int nl802154_init(void);</div><div class='ctx'> void nl802154_exit(void);</div><div class='add'>+int nl802154_scan_event(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,</div><div class='add'>+			struct ieee802154_coord_desc *desc);</div><div class='add'>+int nl802154_scan_started(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev);</div><div class='add'>+int nl802154_scan_done(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,</div><div class='add'>+		       enum nl802154_scan_done_reasons reason);</div><div class='add'>+void nl802154_beaconing_done(struct wpan_dev *wpan_dev);</div><div class='ctx'> </div><div class='ctx'> #endif /* __IEEE802154_NL802154_H */</div><div class='head'>diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c<br/>index 78f6f1233194..0672b2f01586 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl_policy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/nl_policy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/nl_policy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/nl_policy.c</a></div><div class='hunk'>@@ -1,17 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * nl802154.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007, 2008 Siemens AG</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -30,7 +21,13 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = {</div><div class='ctx'> 	[IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, },</div><div class='ctx'> 	[IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, },</div><div class='ctx'> 	[IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_BCN_ORD] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_SF_ORD] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_PAN_COORD] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_BAT_EXT] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_COORD_REALIGN] = { .type = NLA_U8, },</div><div class='ctx'> 	[IEEE802154_ATTR_PAGE] = { .type = NLA_U8, },</div><div class='add'>+	[IEEE802154_ATTR_DEV_TYPE] = { .type = NLA_U8, },</div><div class='ctx'> 	[IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, },</div><div class='ctx'> 	[IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, },</div><div class='ctx'> 	[IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, },</div><div class='head'>diff --git a/net/ieee802154/pan.c b/net/ieee802154/pan.c<br/>new file mode 100644<br/>index 000000000000..249df7364b3e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/pan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/pan.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.15.4 PAN management</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 Qorvo US, Inc</div><div class='add'>+ * Authors:</div><div class='add'>+ *   - David Girault &lt;david.girault@qorvo.com&gt;</div><div class='add'>+ *   - Miquel Raynal &lt;miquel.raynal@bootlin.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/cfg802154.h&gt;</div><div class='add'>+#include &lt;net/af_ieee802154.h&gt;</div><div class='add'>+</div><div class='add'>+/* Checks whether a device address matches one from the PAN list.</div><div class='add'>+ * This helper is meant to be used only during PAN management, when we expect</div><div class='add'>+ * extended addresses to be used.</div><div class='add'>+ */</div><div class='add'>+static bool cfg802154_pan_device_is_matching(struct ieee802154_pan_device *pan_dev,</div><div class='add'>+					     struct ieee802154_addr *ext_dev)</div><div class='add'>+{</div><div class='add'>+	if (!pan_dev || !ext_dev)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ext_dev-&gt;mode == IEEE802154_ADDR_SHORT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return pan_dev-&gt;extended_addr == ext_dev-&gt;extended_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool cfg802154_device_is_associated(struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	bool is_assoc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+	is_assoc = !list_empty(&amp;wpan_dev-&gt;children) || wpan_dev-&gt;parent;</div><div class='add'>+	mutex_unlock(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	return is_assoc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool cfg802154_device_is_parent(struct wpan_dev *wpan_dev,</div><div class='add'>+				struct ieee802154_addr *target)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	return cfg802154_pan_device_is_matching(wpan_dev-&gt;parent, target);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cfg802154_device_is_parent);</div><div class='add'>+</div><div class='add'>+struct ieee802154_pan_device *</div><div class='add'>+cfg802154_device_is_child(struct wpan_dev *wpan_dev,</div><div class='add'>+			  struct ieee802154_addr *target)</div><div class='add'>+{</div><div class='add'>+	struct ieee802154_pan_device *child;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(child, &amp;wpan_dev-&gt;children, node)</div><div class='add'>+		if (cfg802154_pan_device_is_matching(child, target))</div><div class='add'>+			return child;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cfg802154_device_is_child);</div><div class='add'>+</div><div class='add'>+__le16 cfg802154_get_free_short_addr(struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	struct ieee802154_pan_device *child;</div><div class='add'>+	__le16 addr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		get_random_bytes(&amp;addr, 2);</div><div class='add'>+		if (addr == cpu_to_le16(IEEE802154_ADDR_SHORT_BROADCAST) ||</div><div class='add'>+		    addr == cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (wpan_dev-&gt;short_addr == addr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (wpan_dev-&gt;parent &amp;&amp; wpan_dev-&gt;parent-&gt;short_addr == addr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(child, &amp;wpan_dev-&gt;children, node)</div><div class='add'>+			if (child-&gt;short_addr == addr)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cfg802154_get_free_short_addr);</div><div class='add'>+</div><div class='add'>+unsigned int cfg802154_set_max_associations(struct wpan_dev *wpan_dev,</div><div class='add'>+					    unsigned int max)</div><div class='add'>+{</div><div class='add'>+	unsigned int old_max;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;wpan_dev-&gt;association_lock);</div><div class='add'>+</div><div class='add'>+	old_max = wpan_dev-&gt;max_associations;</div><div class='add'>+	wpan_dev-&gt;max_associations = max;</div><div class='add'>+</div><div class='add'>+	return old_max;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cfg802154_set_max_associations);</div><div class='head'>diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h<br/>index 598f5af49775..64071ef6f57b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/rdev-ops.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/rdev-ops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/rdev-ops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/rdev-ops.h</a></div><div class='hunk'>@@ -209,6 +209,92 @@ rdev_set_ackreq_default(struct cfg802154_registered_device *rdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int rdev_trigger_scan(struct cfg802154_registered_device *rdev,</div><div class='add'>+				    struct cfg802154_scan_request *request)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;trigger_scan)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_trigger_scan(&amp;rdev-&gt;wpan_phy, request);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;trigger_scan(&amp;rdev-&gt;wpan_phy, request);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdev_abort_scan(struct cfg802154_registered_device *rdev,</div><div class='add'>+				  struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;abort_scan)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_abort_scan(&amp;rdev-&gt;wpan_phy, wpan_dev);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;abort_scan(&amp;rdev-&gt;wpan_phy, wpan_dev);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdev_send_beacons(struct cfg802154_registered_device *rdev,</div><div class='add'>+				    struct cfg802154_beacon_request *request)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;send_beacons)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_send_beacons(&amp;rdev-&gt;wpan_phy, request);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;send_beacons(&amp;rdev-&gt;wpan_phy, request);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdev_stop_beacons(struct cfg802154_registered_device *rdev,</div><div class='add'>+				    struct wpan_dev *wpan_dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;stop_beacons)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_stop_beacons(&amp;rdev-&gt;wpan_phy, wpan_dev);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;stop_beacons(&amp;rdev-&gt;wpan_phy, wpan_dev);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdev_associate(struct cfg802154_registered_device *rdev,</div><div class='add'>+				 struct wpan_dev *wpan_dev,</div><div class='add'>+				 struct ieee802154_addr *coord)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;associate)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_associate(&amp;rdev-&gt;wpan_phy, wpan_dev, coord);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;associate(&amp;rdev-&gt;wpan_phy, wpan_dev, coord);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdev_disassociate(struct cfg802154_registered_device *rdev,</div><div class='add'>+				    struct wpan_dev *wpan_dev,</div><div class='add'>+				    struct ieee802154_addr *target)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;ops-&gt;disassociate)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	trace_802154_rdev_disassociate(&amp;rdev-&gt;wpan_phy, wpan_dev, target);</div><div class='add'>+	ret = rdev-&gt;ops-&gt;disassociate(&amp;rdev-&gt;wpan_phy, wpan_dev, target);</div><div class='add'>+	trace_802154_rdev_return_int(&amp;rdev-&gt;wpan_phy, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL</div><div class='ctx'> /* TODO this is already a nl802154, so move into ieee802154 */</div><div class='ctx'> static inline void</div><div class='head'>diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c<br/>index bc6b912603f1..e542fbe113e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/socket.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/socket.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/socket.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/socket.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IEEE802154.4 socket interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007, 2008 Siemens AG</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * Written by:</div><div class='ctx'>  * Sergey Lapin &lt;slapin@ossfans.org&gt;</div><div class='ctx'>  * Maxim Gorbachyov &lt;maxim.gorbachev@siemens.com&gt;</div><div class='hunk'>@@ -49,8 +41,7 @@ ieee802154_get_dev(struct net *net, const struct ieee802154_addr *addr)</div><div class='ctx'> 		ieee802154_devaddr_to_raw(hwaddr, addr-&gt;extended_addr);</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		dev = dev_getbyhwaddr_rcu(net, ARPHRD_IEEE802154, hwaddr);</div><div class='del'>-		if (dev)</div><div class='del'>-			dev_hold(dev);</div><div class='add'>+		dev_hold(dev);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE802154_ADDR_SHORT:</div><div class='hunk'>@@ -105,7 +96,7 @@ static int ieee802154_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	return sk-&gt;sk_prot-&gt;sendmsg(sk, msg, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+static int ieee802154_sock_bind(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 				int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -116,7 +107,7 @@ static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 	return sock_no_bind(sock, uaddr, addr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee802154_sock_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+static int ieee802154_sock_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 				   int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -137,7 +128,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,</div><div class='ctx'> 	int ret = -ENOIOCTLCMD;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;ifr, arg, sizeof(struct ifreq)))</div><div class='add'>+	if (get_user_ifreq(&amp;ifr, NULL, arg))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	ifr.ifr_name[IFNAMSIZ-1] = 0;</div><div class='hunk'>@@ -151,7 +142,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,</div><div class='ctx'> 	if (dev-&gt;type == ARPHRD_IEEE802154 &amp;&amp; dev-&gt;netdev_ops-&gt;ndo_do_ioctl)</div><div class='ctx'> 		ret = dev-&gt;netdev_ops-&gt;ndo_do_ioctl(dev, &amp;ifr, cmd);</div><div class='ctx'> </div><div class='del'>-	if (!ret &amp;&amp; copy_to_user(arg, &amp;ifr, sizeof(struct ifreq)))</div><div class='add'>+	if (!ret &amp;&amp; put_user_ifreq(&amp;ifr, arg))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	dev_put(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -164,10 +155,6 @@ static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		return sock_get_timestamp(sk, (struct timeval __user *)arg);</div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		return sock_get_timestampns(sk, (struct timespec __user *)arg);</div><div class='ctx'> 	case SIOCGIFADDR:</div><div class='ctx'> 	case SIOCSIFADDR:</div><div class='ctx'> 		return ieee802154_dev_ioctl(sk, (struct ifreq __user *)arg,</div><div class='hunk'>@@ -175,7 +162,7 @@ static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (!sk-&gt;sk_prot-&gt;ioctl)</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='del'>-		return sk-&gt;sk_prot-&gt;ioctl(sk, cmd, arg);</div><div class='add'>+		return sk_ioctl(sk, cmd, (void __user *)arg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,8 +174,8 @@ static int raw_hash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	write_lock_bh(&amp;raw_lock);</div><div class='ctx'> 	sk_add_node(sk, &amp;raw_head);</div><div class='del'>-	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> 	write_unlock_bh(&amp;raw_lock);</div><div class='add'>+	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -206,15 +193,16 @@ static void raw_close(struct sock *sk, long timeout)</div><div class='ctx'> 	sk_common_release(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_bind(struct sock *sk, struct sockaddr *_uaddr, int len)</div><div class='add'>+static int raw_bind(struct sock *sk, struct sockaddr_unsized *_uaddr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee802154_addr addr;</div><div class='ctx'> 	struct sockaddr_ieee802154 *uaddr = (struct sockaddr_ieee802154 *)_uaddr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(*uaddr))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = ieee802154_sockaddr_check_size(uaddr, len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	uaddr = (struct sockaddr_ieee802154 *)_uaddr;</div><div class='ctx'> 	if (uaddr-&gt;family != AF_IEEE802154)</div><div class='hunk'>@@ -239,7 +227,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int raw_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 		       int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='hunk'>@@ -284,6 +272,10 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 		err = -EMSGSIZE;</div><div class='ctx'> 		goto out_dev;</div><div class='ctx'> 	}</div><div class='add'>+	if (!size) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hlen = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	tlen = dev-&gt;needed_tailroom;</div><div class='hunk'>@@ -321,13 +313,13 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-		       int noblock, int flags, int *addr_len)</div><div class='add'>+		       int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	size_t copied = 0;</div><div class='ctx'> 	int err = -EOPNOTSUPP;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +333,7 @@ static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_TRUNC)</div><div class='ctx'> 		copied = skb-&gt;len;</div><div class='hunk'>@@ -394,7 +386,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -426,6 +418,7 @@ static const struct proto_ops ieee802154_raw_ops = {</div><div class='ctx'> 	.getname	   = sock_no_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,</div><div class='ctx'> 	.ioctl		   = ieee802154_sock_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = sock_no_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -433,11 +426,6 @@ static const struct proto_ops ieee802154_raw_ops = {</div><div class='ctx'> 	.sendmsg	   = ieee802154_sock_sendmsg,</div><div class='ctx'> 	.recvmsg	   = sock_common_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DGRAM Sockets (802.15.4 dataframes) */</div><div class='hunk'>@@ -469,8 +457,8 @@ static int dgram_hash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	write_lock_bh(&amp;dgram_lock);</div><div class='ctx'> 	sk_add_node(sk, &amp;dgram_head);</div><div class='del'>-	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> 	write_unlock_bh(&amp;dgram_lock);</div><div class='add'>+	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -497,7 +485,7 @@ static void dgram_close(struct sock *sk, long timeout)</div><div class='ctx'> 	sk_common_release(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len)</div><div class='add'>+static int dgram_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr;</div><div class='ctx'> 	struct ieee802154_addr haddr;</div><div class='hunk'>@@ -509,11 +497,14 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len)</div><div class='ctx'> </div><div class='ctx'> 	ro-&gt;bound = 0;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(*addr))</div><div class='add'>+	err = ieee802154_sockaddr_check_size(addr, len);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;family != AF_IEEE802154)</div><div class='add'>+	if (addr-&gt;family != AF_IEEE802154) {</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ieee802154_addr_from_sa(&amp;haddr, &amp;addr-&gt;addr);</div><div class='ctx'> 	dev = ieee802154_get_dev(sock_net(sk), &amp;haddr);</div><div class='hunk'>@@ -539,22 +530,21 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+static int dgram_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCOUTQ:</div><div class='ctx'> 	{</div><div class='del'>-		int amount = sk_wmem_alloc_get(sk);</div><div class='add'>+		*karg = sk_wmem_alloc_get(sk);</div><div class='ctx'> </div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case SIOCINQ:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		unsigned long amount;</div><div class='ctx'> </div><div class='del'>-		amount = 0;</div><div class='add'>+		*karg = 0;</div><div class='ctx'> 		spin_lock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		if (skb) {</div><div class='hunk'>@@ -562,10 +552,10 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> 			 * of this packet since that is all</div><div class='ctx'> 			 * that will be read.</div><div class='ctx'> 			 */</div><div class='del'>-			amount = skb-&gt;len - ieee802154_hdr_length(skb);</div><div class='add'>+			*karg = skb-&gt;len - ieee802154_hdr_length(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -573,15 +563,16 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* FIXME: autobind */</div><div class='del'>-static int dgram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int dgram_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			 int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr;</div><div class='ctx'> 	struct dgram_sock *ro = dgram_sk(sk);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(*addr))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = ieee802154_sockaddr_check_size(addr, len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (addr-&gt;family != AF_IEEE802154)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -620,6 +611,7 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 	struct ieee802154_mac_cb *cb;</div><div class='ctx'> 	struct dgram_sock *ro = dgram_sk(sk);</div><div class='ctx'> 	struct ieee802154_addr dst_addr;</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_ieee802154*, daddr, msg-&gt;msg_name);</div><div class='ctx'> 	int hlen, tlen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -628,10 +620,20 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ro-&gt;connected &amp;&amp; !msg-&gt;msg_name)</div><div class='del'>-		return -EDESTADDRREQ;</div><div class='del'>-	else if (ro-&gt;connected &amp;&amp; msg-&gt;msg_name)</div><div class='del'>-		return -EISCONN;</div><div class='add'>+	if (msg-&gt;msg_name) {</div><div class='add'>+		if (ro-&gt;connected)</div><div class='add'>+			return -EISCONN;</div><div class='add'>+		if (msg-&gt;msg_namelen &lt; IEEE802154_MIN_NAMELEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = ieee802154_sockaddr_check_size(daddr, msg-&gt;msg_namelen);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		ieee802154_addr_from_sa(&amp;dst_addr, &amp;daddr-&gt;addr);</div><div class='add'>+	} else {</div><div class='add'>+		if (!ro-&gt;connected)</div><div class='add'>+			return -EDESTADDRREQ;</div><div class='add'>+		dst_addr = ro-&gt;dst_addr;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ro-&gt;bound)</div><div class='ctx'> 		dev = dev_getfirstbyhwtype(sock_net(sk), ARPHRD_IEEE802154);</div><div class='hunk'>@@ -667,16 +669,6 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 	cb = mac_cb_init(skb);</div><div class='ctx'> 	cb-&gt;type = IEEE802154_FC_TYPE_DATA;</div><div class='ctx'> 	cb-&gt;ackreq = ro-&gt;want_ack;</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;msg_name) {</div><div class='del'>-		DECLARE_SOCKADDR(struct sockaddr_ieee802154*,</div><div class='del'>-				 daddr, msg-&gt;msg_name);</div><div class='del'>-</div><div class='del'>-		ieee802154_addr_from_sa(&amp;dst_addr, &amp;daddr-&gt;addr);</div><div class='del'>-	} else {</div><div class='del'>-		dst_addr = ro-&gt;dst_addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	cb-&gt;secen = ro-&gt;secen;</div><div class='ctx'> 	cb-&gt;secen_override = ro-&gt;secen_override;</div><div class='ctx'> 	cb-&gt;seclevel = ro-&gt;seclevel;</div><div class='hunk'>@@ -711,7 +703,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-			 int noblock, int flags, int *addr_len)</div><div class='add'>+			 int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	size_t copied = 0;</div><div class='ctx'> 	int err = -EOPNOTSUPP;</div><div class='hunk'>@@ -719,7 +711,7 @@ static int dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	struct dgram_sock *ro = dgram_sk(sk);</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_ieee802154 *, saddr, msg-&gt;msg_name);</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +726,7 @@ static int dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (saddr) {</div><div class='ctx'> 		/* Clear the implicit padding in struct sockaddr_ieee802154</div><div class='hunk'>@@ -887,7 +879,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dgram_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, unsigned int optlen)</div><div class='add'>+			    sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct dgram_sock *ro = dgram_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='hunk'>@@ -897,7 +889,7 @@ static int dgram_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -988,6 +980,7 @@ static const struct proto_ops ieee802154_dgram_ops = {</div><div class='ctx'> 	.getname	   = sock_no_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,</div><div class='ctx'> 	.ioctl		   = ieee802154_sock_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = sock_no_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -995,13 +988,13 @@ static const struct proto_ops ieee802154_dgram_ops = {</div><div class='ctx'> 	.sendmsg	   = ieee802154_sock_sendmsg,</div><div class='ctx'> 	.recvmsg	   = sock_common_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void ieee802154_sock_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Create a socket. Initialise the socket, blank the addresses</div><div class='ctx'>  * set the state.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1018,6 +1011,9 @@ static int ieee802154_create(struct net *net, struct socket *sock,</div><div class='ctx'> </div><div class='ctx'> 	switch (sock-&gt;type) {</div><div class='ctx'> 	case SOCK_RAW:</div><div class='add'>+		rc = -EPERM;</div><div class='add'>+		if (!capable(CAP_NET_RAW))</div><div class='add'>+			goto out;</div><div class='ctx'> 		proto = &amp;ieee802154_raw_prot;</div><div class='ctx'> 		ops = &amp;ieee802154_raw_ops;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1039,7 +1035,7 @@ static int ieee802154_create(struct net *net, struct socket *sock,</div><div class='ctx'> 	sock-&gt;ops = ops;</div><div class='ctx'> </div><div class='ctx'> 	sock_init_data(sock, sk);</div><div class='del'>-	/* FIXME: sk-&gt;sk_destruct */</div><div class='add'>+	sk-&gt;sk_destruct = ieee802154_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_family = PF_IEEE802154;</div><div class='ctx'> </div><div class='ctx'> 	/* Checksums on by default */</div><div class='hunk'>@@ -1047,19 +1043,21 @@ static int ieee802154_create(struct net *net, struct socket *sock,</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;hash) {</div><div class='ctx'> 		rc = sk-&gt;sk_prot-&gt;hash(sk);</div><div class='del'>-		if (rc) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;init) {</div><div class='ctx'> 		rc = sk-&gt;sk_prot-&gt;init(sk);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			sk_common_release(sk);</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='add'>+out_sk_release:</div><div class='add'>+	sk_common_release(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_proto_family ieee802154_family_ops = {</div><div class='hunk'>@@ -1102,7 +1100,7 @@ static struct packet_type ieee802154_packet_type = {</div><div class='ctx'> </div><div class='ctx'> static int __init af_ieee802154_init(void)</div><div class='ctx'> {</div><div class='del'>-	int rc = -EINVAL;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = proto_register(&amp;ieee802154_raw_prot, 1);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -1141,4 +1139,5 @@ module_init(af_ieee802154_init);</div><div class='ctx'> module_exit(af_ieee802154_remove);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IEEE 802.15.4 socket interface");</div><div class='ctx'> MODULE_ALIAS_NETPROTO(PF_IEEE802154);</div><div class='head'>diff --git a/net/ieee802154/sysfs.c b/net/ieee802154/sysfs.c<br/>index bd88525b041e..6708160ebf9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/sysfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/sysfs.c</a></div><div class='hunk'>@@ -1,11 +1,5 @@</div><div class='del'>-/* This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='hunk'>@@ -99,7 +93,7 @@ static SIMPLE_DEV_PM_OPS(wpan_phy_pm_ops, wpan_phy_suspend, wpan_phy_resume);</div><div class='ctx'> #define WPAN_PHY_PM_OPS NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct class wpan_phy_class = {</div><div class='add'>+const struct class wpan_phy_class = {</div><div class='ctx'> 	.name = "ieee802154",</div><div class='ctx'> 	.dev_release = wpan_phy_release,</div><div class='ctx'> 	.dev_groups = pmib_groups,</div><div class='head'>diff --git a/net/ieee802154/sysfs.h b/net/ieee802154/sysfs.h<br/>index 337545b639e9..69961e166257 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/sysfs.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/sysfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/sysfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/sysfs.h</a></div><div class='hunk'>@@ -5,6 +5,6 @@</div><div class='ctx'> int wpan_phy_sysfs_init(void);</div><div class='ctx'> void wpan_phy_sysfs_exit(void);</div><div class='ctx'> </div><div class='del'>-extern struct class wpan_phy_class;</div><div class='add'>+extern const struct class wpan_phy_class;</div><div class='ctx'> </div><div class='ctx'> #endif /* __IEEE802154_SYSFS_H */</div><div class='head'>diff --git a/net/ieee802154/trace.h b/net/ieee802154/trace.h<br/>index 19c2e5d60e76..591ce0a16fc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ieee802154/trace.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ieee802154/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ieee802154/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ieee802154/trace.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MAXNAME		32</div><div class='ctx'> #define WPAN_PHY_ENTRY	__array(char, wpan_phy_name, MAXNAME)</div><div class='del'>-#define WPAN_PHY_ASSIGN	strlcpy(__entry-&gt;wpan_phy_name,	 \</div><div class='add'>+#define WPAN_PHY_ASSIGN	strscpy(__entry-&gt;wpan_phy_name,	 \</div><div class='ctx'> 				wpan_phy_name(wpan_phy), \</div><div class='ctx'> 				MAXNAME)</div><div class='ctx'> #define WPAN_PHY_PR_FMT	"%s"</div><div class='hunk'>@@ -75,7 +75,7 @@ TRACE_EVENT(802154_rdev_add_virtual_intf,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		WPAN_PHY_ASSIGN;</div><div class='del'>-		__assign_str(vir_intf_name, name ? name : "&lt;noname&gt;");</div><div class='add'>+		__assign_str(vir_intf_name);</div><div class='ctx'> 		__entry-&gt;type = type;</div><div class='ctx'> 		__entry-&gt;extended_addr = extended_addr;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -295,6 +295,105 @@ TRACE_EVENT(802154_rdev_set_ackreq_default,</div><div class='ctx'> 		WPAN_DEV_PR_ARG, BOOL_TO_STR(__entry-&gt;ackreq))</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(802154_rdev_trigger_scan,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy,</div><div class='add'>+		 struct cfg802154_scan_request *request),</div><div class='add'>+	TP_ARGS(wpan_phy, request),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		WPAN_PHY_ENTRY</div><div class='add'>+		__field(u8, page)</div><div class='add'>+		__field(u32, channels)</div><div class='add'>+		__field(u8, duration)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		WPAN_PHY_ASSIGN;</div><div class='add'>+		__entry-&gt;page = request-&gt;page;</div><div class='add'>+		__entry-&gt;channels = request-&gt;channels;</div><div class='add'>+		__entry-&gt;duration = request-&gt;duration;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(WPAN_PHY_PR_FMT ", scan, page: %d, channels: %x, duration %d",</div><div class='add'>+		  WPAN_PHY_PR_ARG, __entry-&gt;page, __entry-&gt;channels, __entry-&gt;duration)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(802154_rdev_send_beacons,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy,</div><div class='add'>+		 struct cfg802154_beacon_request *request),</div><div class='add'>+	TP_ARGS(wpan_phy, request),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		WPAN_PHY_ENTRY</div><div class='add'>+		__field(u8, interval)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		WPAN_PHY_ASSIGN;</div><div class='add'>+		__entry-&gt;interval = request-&gt;interval;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(WPAN_PHY_PR_FMT ", sending beacons (interval order: %d)",</div><div class='add'>+		  WPAN_PHY_PR_ARG, __entry-&gt;interval)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(802154_wdev_template,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev),</div><div class='add'>+	TP_ARGS(wpan_phy, wpan_dev),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		WPAN_PHY_ENTRY</div><div class='add'>+		WPAN_DEV_ENTRY</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		WPAN_PHY_ASSIGN;</div><div class='add'>+		WPAN_DEV_ASSIGN;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT,</div><div class='add'>+		  WPAN_PHY_PR_ARG, WPAN_DEV_PR_ARG)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(802154_wdev_template, 802154_rdev_abort_scan,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev),</div><div class='add'>+	TP_ARGS(wpan_phy, wpan_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(802154_wdev_template, 802154_rdev_stop_beacons,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev),</div><div class='add'>+	TP_ARGS(wpan_phy, wpan_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(802154_rdev_associate,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy,</div><div class='add'>+		 struct wpan_dev *wpan_dev,</div><div class='add'>+		 struct ieee802154_addr *coord),</div><div class='add'>+	TP_ARGS(wpan_phy, wpan_dev, coord),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		WPAN_PHY_ENTRY</div><div class='add'>+		WPAN_DEV_ENTRY</div><div class='add'>+		__field(__le64, addr)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		WPAN_PHY_ASSIGN;</div><div class='add'>+		WPAN_DEV_ASSIGN;</div><div class='add'>+		__entry-&gt;addr = coord-&gt;extended_addr;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT ", associating with: 0x%llx",</div><div class='add'>+		  WPAN_PHY_PR_ARG, WPAN_DEV_PR_ARG, __entry-&gt;addr)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(802154_rdev_disassociate,</div><div class='add'>+	TP_PROTO(struct wpan_phy *wpan_phy,</div><div class='add'>+		 struct wpan_dev *wpan_dev,</div><div class='add'>+		 struct ieee802154_addr *target),</div><div class='add'>+	TP_ARGS(wpan_phy, wpan_dev, target),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		WPAN_PHY_ENTRY</div><div class='add'>+		WPAN_DEV_ENTRY</div><div class='add'>+		__field(__le64, addr)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		WPAN_PHY_ASSIGN;</div><div class='add'>+		WPAN_DEV_ASSIGN;</div><div class='add'>+		__entry-&gt;addr = target-&gt;extended_addr;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT ", disassociating with: 0x%llx",</div><div class='add'>+		  WPAN_PHY_PR_ARG, WPAN_DEV_PR_ARG, __entry-&gt;addr)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(802154_rdev_return_int,</div><div class='ctx'> 	TP_PROTO(struct wpan_phy *wpan_phy, int ret),</div><div class='ctx'> 	TP_ARGS(wpan_phy, ret),</div><div class='head'>diff --git a/net/ife/Kconfig b/net/ife/Kconfig<br/>index 31e48b652c7c..de36a5b91e50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ife/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ife/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ife/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IFE subsystem configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig NET_IFE</div><div class='del'>-	depends on NET</div><div class='del'>-        tristate "Inter-FE based on IETF ForCES InterFE LFB"</div><div class='add'>+	tristate "Inter-FE based on IETF ForCES InterFE LFB"</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to add support of IFE encapsulation protocol</div><div class='head'>diff --git a/net/ife/Makefile b/net/ife/Makefile<br/>index 2a90d97746cc..1258fcb07f67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ife/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ife/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ife/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the IFE encapsulation protocol</div><div class='ctx'> #</div><div class='head'>diff --git a/net/ife/ife.c b/net/ife/ife.c<br/>index 13bbf8cb6a39..be05b690b9ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ife/ife.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ife/ife.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ife/ife.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ife/ife.c</a></div><div class='hunk'>@@ -82,6 +82,7 @@ void *ife_decode(struct sk_buff *skb, u16 *metalen)</div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, total_pull)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	ifehdr = (struct ifeheadr *)(skb-&gt;data + skb-&gt;dev-&gt;hard_header_len);</div><div class='ctx'> 	skb_set_mac_header(skb, total_pull);</div><div class='ctx'> 	__skb_pull(skb, total_pull);</div><div class='ctx'> 	*metalen = ifehdrln - IFE_METAHDRLEN;</div><div class='head'>diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig<br/>index 32cae39cdff6..b71c22475c51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IP configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -9,11 +10,11 @@ config IP_MULTICAST</div><div class='ctx'> 	  intend to participate in the MBONE, a high bandwidth network on top</div><div class='ctx'> 	  of the Internet which carries audio and video broadcasts. More</div><div class='ctx'> 	  information about the MBONE is on the WWW at</div><div class='del'>-	  &lt;http://www.savetz.com/mbone/&gt;. For most people, it's safe to say N.</div><div class='add'>+	  &lt;https://www.savetz.com/mbone/&gt;. For most people, it's safe to say N.</div><div class='ctx'> </div><div class='ctx'> config IP_ADVANCED_ROUTER</div><div class='ctx'> 	bool "IP: advanced router"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you intend to run your Linux box mostly as a router, i.e. as a</div><div class='ctx'> 	  computer that forwards and redistributes network packets, say Y; you</div><div class='ctx'> 	  will then be presented with several options that allow more precise</div><div class='hunk'>@@ -48,14 +49,14 @@ config IP_ADVANCED_ROUTER</div><div class='ctx'> </div><div class='ctx'> 	  Note that some distributions enable it in startup scripts.</div><div class='ctx'> 	  For details about rp_filter strict and loose mode read</div><div class='del'>-	  &lt;file:Documentation/networking/ip-sysctl.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/ip-sysctl.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N here.</div><div class='ctx'> </div><div class='ctx'> config IP_FIB_TRIE_STATS</div><div class='ctx'> 	bool "FIB TRIE statistics"</div><div class='ctx'> 	depends on IP_ADVANCED_ROUTER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Keep track of statistics on structure of FIB TRIE table.</div><div class='ctx'> 	  Useful for testing and measuring TRIE performance.</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +64,7 @@ config IP_MULTIPLE_TABLES</div><div class='ctx'> 	bool "IP: policy routing"</div><div class='ctx'> 	depends on IP_ADVANCED_ROUTER</div><div class='ctx'> 	select FIB_RULES</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Normally, a router decides what to do with a received packet based</div><div class='ctx'> 	  solely on the packet's final destination address. If you say Y here,</div><div class='ctx'> 	  the Linux router will also be able to take the packet's source</div><div class='hunk'>@@ -72,7 +73,7 @@ config IP_MULTIPLE_TABLES</div><div class='ctx'> </div><div class='ctx'> 	  If you need more information, see the Linux Advanced</div><div class='ctx'> 	  Routing and Traffic Control documentation at</div><div class='del'>-	  &lt;http://lartc.org/howto/lartc.rpdb.html&gt;</div><div class='add'>+	  &lt;https://lartc.org/howto/lartc.rpdb.html&gt;</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +117,7 @@ config IP_PNP</div><div class='ctx'> config IP_PNP_DHCP</div><div class='ctx'> 	bool "IP: DHCP support"</div><div class='ctx'> 	depends on IP_PNP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you want your Linux box to mount its whole root file system (the</div><div class='ctx'> 	  one containing the directory /) from some other computer over the</div><div class='ctx'> 	  net via NFS and you want the IP address of your computer to be</div><div class='hunk'>@@ -128,12 +129,12 @@ config IP_PNP_DHCP</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y. Note that if you want to use DHCP, a DHCP server</div><div class='ctx'> 	  must be operating on your network.  Read</div><div class='del'>-	  &lt;file:Documentation/filesystems/nfs/nfsroot.txt&gt; for details.</div><div class='add'>+	  &lt;file:Documentation/admin-guide/nfs/nfsroot.rst&gt; for details.</div><div class='ctx'> </div><div class='ctx'> config IP_PNP_BOOTP</div><div class='ctx'> 	bool "IP: BOOTP support"</div><div class='ctx'> 	depends on IP_PNP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you want your Linux box to mount its whole root file system (the</div><div class='ctx'> 	  one containing the directory /) from some other computer over the</div><div class='ctx'> 	  net via NFS and you want the IP address of your computer to be</div><div class='hunk'>@@ -143,7 +144,7 @@ config IP_PNP_BOOTP</div><div class='ctx'> 	  does BOOTP itself, providing all necessary information on the kernel</div><div class='ctx'> 	  command line, you can say N here. If unsure, say Y. Note that if you</div><div class='ctx'> 	  want to use BOOTP, a BOOTP server must be operating on your network.</div><div class='del'>-	  Read &lt;file:Documentation/filesystems/nfs/nfsroot.txt&gt; for details.</div><div class='add'>+	  Read &lt;file:Documentation/admin-guide/nfs/nfsroot.rst&gt; for details.</div><div class='ctx'> </div><div class='ctx'> config IP_PNP_RARP</div><div class='ctx'> 	bool "IP: RARP support"</div><div class='hunk'>@@ -156,13 +157,13 @@ config IP_PNP_RARP</div><div class='ctx'> 	  older protocol which is being obsoleted by BOOTP and DHCP), say Y</div><div class='ctx'> 	  here. Note that if you want to use RARP, a RARP server must be</div><div class='ctx'> 	  operating on your network. Read</div><div class='del'>-	  &lt;file:Documentation/filesystems/nfs/nfsroot.txt&gt; for details.</div><div class='add'>+	  &lt;file:Documentation/admin-guide/nfs/nfsroot.rst&gt; for details.</div><div class='ctx'> </div><div class='ctx'> config NET_IPIP</div><div class='ctx'> 	tristate "IP: tunneling"</div><div class='ctx'> 	select INET_TUNNEL</div><div class='ctx'> 	select NET_IP_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Tunneling means encapsulating data of one protocol type within</div><div class='ctx'> 	  another protocol and sending it over a channel that understands the</div><div class='ctx'> 	  encapsulating protocol. This particular tunneling driver implements</div><div class='hunk'>@@ -179,8 +180,8 @@ config NET_IPIP</div><div class='ctx'> config NET_IPGRE_DEMUX</div><div class='ctx'> 	tristate "IP: GRE demultiplexer"</div><div class='ctx'> 	help</div><div class='del'>-	 This is helper module to demultiplex GRE packets on GRE version field criteria.</div><div class='del'>-	 Required by ip_gre and pptp modules.</div><div class='add'>+	  This is helper module to demultiplex GRE packets on GRE version field criteria.</div><div class='add'>+	  Required by ip_gre and pptp modules.</div><div class='ctx'> </div><div class='ctx'> config NET_IP_TUNNEL</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -266,7 +267,7 @@ config IP_PIMSM_V2</div><div class='ctx'> </div><div class='ctx'> config SYN_COOKIES</div><div class='ctx'> 	bool "IP: TCP syncookie support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Normal TCP/IP networking is open to an attack known as "SYN</div><div class='ctx'> 	  flooding". This denial-of-service attack prevents legitimate remote</div><div class='ctx'> 	  users from being able to connect to your computer during an ongoing</div><div class='hunk'>@@ -279,7 +280,7 @@ config SYN_COOKIES</div><div class='ctx'> 	  continue to connect, even when your machine is under attack. There</div><div class='ctx'> 	  is no need for the legitimate users to change their TCP/IP software;</div><div class='ctx'> 	  SYN cookies work transparently to them. For technical information</div><div class='del'>-	  about SYN cookies, check out &lt;http://cr.yp.to/syncookies.html&gt;.</div><div class='add'>+	  about SYN cookies, check out &lt;https://cr.yp.to/syncookies.html&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  If you are SYN flooded, the source address reported by the kernel is</div><div class='ctx'> 	  likely to have been forged by the attacker; it is only reported as</div><div class='hunk'>@@ -302,10 +303,11 @@ config SYN_COOKIES</div><div class='ctx'> </div><div class='ctx'> config NET_IPVTI</div><div class='ctx'> 	tristate "Virtual (secure) IP: tunneling"</div><div class='add'>+	depends on IPV6 || IPV6=n</div><div class='ctx'> 	select INET_TUNNEL</div><div class='ctx'> 	select NET_IP_TUNNEL</div><div class='del'>-	depends on INET_XFRM_MODE_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	select XFRM</div><div class='add'>+	help</div><div class='ctx'> 	  Tunneling means encapsulating data of one protocol type within</div><div class='ctx'> 	  another protocol and sending it over a channel that understands the</div><div class='ctx'> 	  encapsulating protocol. This can be used with xfrm mode tunnel to give</div><div class='hunk'>@@ -319,9 +321,8 @@ config NET_UDP_TUNNEL</div><div class='ctx'> </div><div class='ctx'> config NET_FOU</div><div class='ctx'> 	tristate "IP: Foo (IP protocols) over UDP"</div><div class='del'>-	select XFRM</div><div class='ctx'> 	select NET_UDP_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Foo over UDP allows any IP protocol to be directly encapsulated</div><div class='ctx'> 	  over UDP include tunnels (IPIP, GRE, SIT). By encapsulating in UDP</div><div class='ctx'> 	  network mechanisms and optimizations for UDP (such as ECMP</div><div class='hunk'>@@ -331,36 +332,38 @@ config NET_FOU_IP_TUNNELS</div><div class='ctx'> 	bool "IP: FOU encapsulation of IP tunnels"</div><div class='ctx'> 	depends on NET_IPIP || NET_IPGRE || IPV6_SIT</div><div class='ctx'> 	select NET_FOU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Allow configuration of FOU or GUE encapsulation for IP tunnels.</div><div class='ctx'> 	  When this option is enabled IP tunnels can be configured to use</div><div class='ctx'> 	  FOU or GUE encapsulation.</div><div class='ctx'> </div><div class='ctx'> config INET_AH</div><div class='ctx'> 	tristate "IP: AH transformation"</div><div class='del'>-	select XFRM_ALGO</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_HMAC</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO_SHA1</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec AH.</div><div class='add'>+	select XFRM_AH</div><div class='add'>+	help</div><div class='add'>+	  Support for IPsec AH (Authentication Header).</div><div class='add'>+</div><div class='add'>+	  AH can be used with various authentication algorithms.  Besides</div><div class='add'>+	  enabling AH support itself, this option enables the generic</div><div class='add'>+	  implementations of the algorithms that RFC 8221 lists as MUST be</div><div class='add'>+	  implemented.  If you need any other algorithms, you'll need to enable</div><div class='add'>+	  them in the crypto API.  You should also enable accelerated</div><div class='add'>+	  implementations of any needed algorithms when available.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config INET_ESP</div><div class='ctx'> 	tristate "IP: ESP transformation"</div><div class='del'>-	select XFRM_ALGO</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_AUTHENC</div><div class='del'>-	select CRYPTO_HMAC</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO_CBC</div><div class='del'>-	select CRYPTO_SHA1</div><div class='del'>-	select CRYPTO_DES</div><div class='del'>-	select CRYPTO_ECHAINIV</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec ESP.</div><div class='add'>+	select XFRM_ESP</div><div class='add'>+	help</div><div class='add'>+	  Support for IPsec ESP (Encapsulating Security Payload).</div><div class='add'>+</div><div class='add'>+	  ESP can be used with various encryption and authentication algorithms.</div><div class='add'>+	  Besides enabling ESP support itself, this option enables the generic</div><div class='add'>+	  implementations of the algorithms that RFC 8221 lists as MUST be</div><div class='add'>+	  implemented.  If you need any other algorithms, you'll need to enable</div><div class='add'>+	  them in the crypto API.  You should also enable accelerated</div><div class='add'>+	  implementations of any needed algorithms when available.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +372,7 @@ config INET_ESP_OFFLOAD</div><div class='ctx'> 	depends on INET_ESP</div><div class='ctx'> 	select XFRM_OFFLOAD</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for ESP transformation offload. This makes sense</div><div class='ctx'> 	  only if this system really does IPsec and want to do it</div><div class='ctx'> 	  with high throughput. A typical desktop system does not</div><div class='hunk'>@@ -377,16 +380,38 @@ config INET_ESP_OFFLOAD</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config INET_ESPINTCP</div><div class='add'>+	bool "IP: ESP in TCP encapsulation (RFC 8229)"</div><div class='add'>+	depends on XFRM &amp;&amp; INET_ESP</div><div class='add'>+	select STREAM_PARSER</div><div class='add'>+	select NET_SOCK_MSG</div><div class='add'>+	select XFRM_ESPINTCP</div><div class='add'>+	help</div><div class='add'>+	  Support for RFC 8229 encapsulation of ESP and IKE over</div><div class='add'>+	  TCP/IPv4 sockets.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config INET_IPCOMP</div><div class='ctx'> 	tristate "IP: IPComp transformation"</div><div class='ctx'> 	select INET_XFRM_TUNNEL</div><div class='ctx'> 	select XFRM_IPCOMP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IP Payload Compression Protocol (IPComp) (RFC3173),</div><div class='ctx'> 	  typically needed for IPsec.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config INET_TABLE_PERTURB_ORDER</div><div class='add'>+	int "INET: Source port perturbation table size (as power of 2)" if EXPERT</div><div class='add'>+	default 16</div><div class='add'>+	help</div><div class='add'>+	  Source port perturbation table size (as power of 2) for</div><div class='add'>+	  RFC 6056 3.3.4.  Algorithm 4: Double-Hash Port Selection Algorithm.</div><div class='add'>+</div><div class='add'>+	  The default is almost always what you want.</div><div class='add'>+	  Only change this if you know what you are doing.</div><div class='add'>+</div><div class='ctx'> config INET_XFRM_TUNNEL</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select INET_TUNNEL</div><div class='hunk'>@@ -396,38 +421,11 @@ config INET_TUNNEL</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='del'>-config INET_XFRM_MODE_TRANSPORT</div><div class='del'>-	tristate "IP: IPsec transport mode"</div><div class='del'>-	default y</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec transport mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config INET_XFRM_MODE_TUNNEL</div><div class='del'>-	tristate "IP: IPsec tunnel mode"</div><div class='del'>-	default y</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec tunnel mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config INET_XFRM_MODE_BEET</div><div class='del'>-	tristate "IP: IPsec BEET mode"</div><div class='del'>-	default y</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec BEET mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='ctx'> config INET_DIAG</div><div class='ctx'> 	tristate "INET: socket monitoring interface"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='del'>-	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by</div><div class='add'>+	help</div><div class='add'>+	  Support for INET (TCP, UDP, etc) socket monitoring interface used by</div><div class='ctx'> 	  native Linux tools such as ss. ss is included in iproute2, currently</div><div class='ctx'> 	  downloadable at:</div><div class='ctx'> </div><div class='hunk'>@@ -443,7 +441,7 @@ config INET_UDP_DIAG</div><div class='ctx'> 	tristate "UDP: socket monitoring interface"</div><div class='ctx'> 	depends on INET_DIAG &amp;&amp; (IPV6 || IPV6=n)</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for UDP socket monitoring interface used by the ss tool.</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -451,7 +449,7 @@ config INET_RAW_DIAG</div><div class='ctx'> 	tristate "RAW: socket monitoring interface"</div><div class='ctx'> 	depends on INET_DIAG &amp;&amp; (IPV6 || IPV6=n)</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for RAW socket monitoring interface used by the ss tool.</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -459,7 +457,7 @@ config INET_DIAG_DESTROY</div><div class='ctx'> 	bool "INET: allow privileged process to administratively close sockets"</div><div class='ctx'> 	depends on INET_DIAG</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Provides a SOCK_DESTROY operation that allows privileged processes</div><div class='ctx'> 	  (e.g., a connection manager or a network administration tool such as</div><div class='ctx'> 	  ss) to close sockets opened by other processes. Closing a socket in</div><div class='hunk'>@@ -470,7 +468,7 @@ config INET_DIAG_DESTROY</div><div class='ctx'> </div><div class='ctx'> menuconfig TCP_CONG_ADVANCED</div><div class='ctx'> 	bool "TCP: advanced congestion control"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for selection of various TCP congestion control</div><div class='ctx'> 	  modules.</div><div class='ctx'> </div><div class='hunk'>@@ -484,201 +482,202 @@ if TCP_CONG_ADVANCED</div><div class='ctx'> config TCP_CONG_BIC</div><div class='ctx'> 	tristate "Binary Increase Congestion (BIC) control"</div><div class='ctx'> 	default m</div><div class='del'>-	---help---</div><div class='del'>-	BIC-TCP is a sender-side only change that ensures a linear RTT</div><div class='del'>-	fairness under large windows while offering both scalability and</div><div class='del'>-	bounded TCP-friendliness. The protocol combines two schemes</div><div class='del'>-	called additive increase and binary search increase. When the</div><div class='del'>-	congestion window is large, additive increase with a large</div><div class='del'>-	increment ensures linear RTT fairness as well as good</div><div class='del'>-	scalability. Under small congestion windows, binary search</div><div class='del'>-	increase provides TCP friendliness.</div><div class='del'>-	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/</div><div class='add'>+	help</div><div class='add'>+	  BIC-TCP is a sender-side only change that ensures a linear RTT</div><div class='add'>+	  fairness under large windows while offering both scalability and</div><div class='add'>+	  bounded TCP-friendliness. The protocol combines two schemes</div><div class='add'>+	  called additive increase and binary search increase. When the</div><div class='add'>+	  congestion window is large, additive increase with a large</div><div class='add'>+	  increment ensures linear RTT fairness as well as good</div><div class='add'>+	  scalability. Under small congestion windows, binary search</div><div class='add'>+	  increase provides TCP friendliness.</div><div class='add'>+	  See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_CUBIC</div><div class='ctx'> 	tristate "CUBIC TCP"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='del'>-	This is version 2.0 of BIC-TCP which uses a cubic growth function</div><div class='del'>-	among other techniques.</div><div class='del'>-	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf</div><div class='add'>+	help</div><div class='add'>+	  This is version 2.0 of BIC-TCP which uses a cubic growth function</div><div class='add'>+	  among other techniques.</div><div class='add'>+	  See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_WESTWOOD</div><div class='ctx'> 	tristate "TCP Westwood+"</div><div class='ctx'> 	default m</div><div class='del'>-	---help---</div><div class='del'>-	TCP Westwood+ is a sender-side only modification of the TCP Reno</div><div class='del'>-	protocol stack that optimizes the performance of TCP congestion</div><div class='del'>-	control. It is based on end-to-end bandwidth estimation to set</div><div class='del'>-	congestion window and slow start threshold after a congestion</div><div class='del'>-	episode. Using this estimation, TCP Westwood+ adaptively sets a</div><div class='del'>-	slow start threshold and a congestion window which takes into</div><div class='del'>-	account the bandwidth used  at the time congestion is experienced.</div><div class='del'>-	TCP Westwood+ significantly increases fairness wrt TCP Reno in</div><div class='del'>-	wired networks and throughput over wireless links.</div><div class='add'>+	help</div><div class='add'>+	  TCP Westwood+ is a sender-side only modification of the TCP Reno</div><div class='add'>+	  protocol stack that optimizes the performance of TCP congestion</div><div class='add'>+	  control. It is based on end-to-end bandwidth estimation to set</div><div class='add'>+	  congestion window and slow start threshold after a congestion</div><div class='add'>+	  episode. Using this estimation, TCP Westwood+ adaptively sets a</div><div class='add'>+	  slow start threshold and a congestion window which takes into</div><div class='add'>+	  account the bandwidth used  at the time congestion is experienced.</div><div class='add'>+	  TCP Westwood+ significantly increases fairness wrt TCP Reno in</div><div class='add'>+	  wired networks and throughput over wireless links.</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_HTCP</div><div class='del'>-        tristate "H-TCP"</div><div class='del'>-        default m</div><div class='del'>-	---help---</div><div class='del'>-	H-TCP is a send-side only modifications of the TCP Reno</div><div class='del'>-	protocol stack that optimizes the performance of TCP</div><div class='del'>-	congestion control for high speed network links. It uses a</div><div class='del'>-	modeswitch to change the alpha and beta parameters of TCP Reno</div><div class='del'>-	based on network conditions and in a way so as to be fair with</div><div class='del'>-	other Reno and H-TCP flows.</div><div class='add'>+	tristate "H-TCP"</div><div class='add'>+	default m</div><div class='add'>+	help</div><div class='add'>+	  H-TCP is a send-side only modifications of the TCP Reno</div><div class='add'>+	  protocol stack that optimizes the performance of TCP</div><div class='add'>+	  congestion control for high speed network links. It uses a</div><div class='add'>+	  modeswitch to change the alpha and beta parameters of TCP Reno</div><div class='add'>+	  based on network conditions and in a way so as to be fair with</div><div class='add'>+	  other Reno and H-TCP flows.</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_HSTCP</div><div class='ctx'> 	tristate "High Speed TCP"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	Sally Floyd's High Speed TCP (RFC 3649) congestion control.</div><div class='del'>-	A modification to TCP's congestion control mechanism for use</div><div class='del'>-	with large congestion windows. A table indicates how much to</div><div class='del'>-	increase the congestion window by when an ACK is received.</div><div class='del'>- 	For more detail	see http://www.icir.org/floyd/hstcp.html</div><div class='add'>+	help</div><div class='add'>+	  Sally Floyd's High Speed TCP (RFC 3649) congestion control.</div><div class='add'>+	  A modification to TCP's congestion control mechanism for use</div><div class='add'>+	  with large congestion windows. A table indicates how much to</div><div class='add'>+	  increase the congestion window by when an ACK is received.</div><div class='add'>+	  For more detail see https://www.icir.org/floyd/hstcp.html</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_HYBLA</div><div class='ctx'> 	tristate "TCP-Hybla congestion control algorithm"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	TCP-Hybla is a sender-side only change that eliminates penalization of</div><div class='del'>-	long-RTT, large-bandwidth connections, like when satellite legs are</div><div class='del'>-	involved, especially when sharing a common bottleneck with normal</div><div class='del'>-	terrestrial connections.</div><div class='add'>+	help</div><div class='add'>+	  TCP-Hybla is a sender-side only change that eliminates penalization of</div><div class='add'>+	  long-RTT, large-bandwidth connections, like when satellite legs are</div><div class='add'>+	  involved, especially when sharing a common bottleneck with normal</div><div class='add'>+	  terrestrial connections.</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_VEGAS</div><div class='ctx'> 	tristate "TCP Vegas"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	TCP Vegas is a sender-side only change to TCP that anticipates</div><div class='del'>-	the onset of congestion by estimating the bandwidth. TCP Vegas</div><div class='del'>-	adjusts the sending rate by modifying the congestion</div><div class='del'>-	window. TCP Vegas should provide less packet loss, but it is</div><div class='del'>-	not as aggressive as TCP Reno.</div><div class='add'>+	help</div><div class='add'>+	  TCP Vegas is a sender-side only change to TCP that anticipates</div><div class='add'>+	  the onset of congestion by estimating the bandwidth. TCP Vegas</div><div class='add'>+	  adjusts the sending rate by modifying the congestion</div><div class='add'>+	  window. TCP Vegas should provide less packet loss, but it is</div><div class='add'>+	  not as aggressive as TCP Reno.</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_NV</div><div class='del'>-       tristate "TCP NV"</div><div class='del'>-       default n</div><div class='del'>-       ---help---</div><div class='del'>-       TCP NV is a follow up to TCP Vegas. It has been modified to deal with</div><div class='del'>-       10G networks, measurement noise introduced by LRO, GRO and interrupt</div><div class='del'>-       coalescence. In addition, it will decrease its cwnd multiplicatively</div><div class='del'>-       instead of linearly.</div><div class='add'>+	tristate "TCP NV"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  TCP NV is a follow up to TCP Vegas. It has been modified to deal with</div><div class='add'>+	  10G networks, measurement noise introduced by LRO, GRO and interrupt</div><div class='add'>+	  coalescence. In addition, it will decrease its cwnd multiplicatively</div><div class='add'>+	  instead of linearly.</div><div class='ctx'> </div><div class='del'>-       Note that in general congestion avoidance (cwnd decreased when # packets</div><div class='del'>-       queued grows) cannot coexist with congestion control (cwnd decreased only</div><div class='del'>-       when there is packet loss) due to fairness issues. One scenario when they</div><div class='del'>-       can coexist safely is when the CA flows have RTTs &lt;&lt; CC flows RTTs.</div><div class='add'>+	  Note that in general congestion avoidance (cwnd decreased when # packets</div><div class='add'>+	  queued grows) cannot coexist with congestion control (cwnd decreased only</div><div class='add'>+	  when there is packet loss) due to fairness issues. One scenario when they</div><div class='add'>+	  can coexist safely is when the CA flows have RTTs &lt;&lt; CC flows RTTs.</div><div class='ctx'> </div><div class='del'>-       For further details see http://www.brakmo.org/networking/tcp-nv/</div><div class='add'>+	  For further details see http://www.brakmo.org/networking/tcp-nv/</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_SCALABLE</div><div class='ctx'> 	tristate "Scalable TCP"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	Scalable TCP is a sender-side only change to TCP which uses a</div><div class='del'>-	MIMD congestion control algorithm which has some nice scaling</div><div class='del'>-	properties, though is known to have fairness issues.</div><div class='del'>-	See http://www.deneholme.net/tom/scalable/</div><div class='add'>+	help</div><div class='add'>+	  Scalable TCP is a sender-side only change to TCP which uses a</div><div class='add'>+	  MIMD congestion control algorithm which has some nice scaling</div><div class='add'>+	  properties, though is known to have fairness issues.</div><div class='add'>+	  See http://www.deneholme.net/tom/scalable/</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_LP</div><div class='ctx'> 	tristate "TCP Low Priority"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	TCP Low Priority (TCP-LP), a distributed algorithm whose goal is</div><div class='del'>-	to utilize only the excess network bandwidth as compared to the</div><div class='del'>-	``fair share`` of bandwidth as targeted by TCP.</div><div class='del'>-	See http://www-ece.rice.edu/networks/TCP-LP/</div><div class='add'>+	help</div><div class='add'>+	  TCP Low Priority (TCP-LP), a distributed algorithm whose goal is</div><div class='add'>+	  to utilize only the excess network bandwidth as compared to the</div><div class='add'>+	  ``fair share`` of bandwidth as targeted by TCP.</div><div class='add'>+	  See http://www-ece.rice.edu/networks/TCP-LP/</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_VENO</div><div class='ctx'> 	tristate "TCP Veno"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	TCP Veno is a sender-side only enhancement of TCP to obtain better</div><div class='del'>-	throughput over wireless networks. TCP Veno makes use of state</div><div class='del'>-	distinguishing to circumvent the difficult judgment of the packet loss</div><div class='del'>-	type. TCP Veno cuts down less congestion window in response to random</div><div class='del'>-	loss packets.</div><div class='del'>-	See &lt;http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186&gt;</div><div class='add'>+	help</div><div class='add'>+	  TCP Veno is a sender-side only enhancement of TCP to obtain better</div><div class='add'>+	  throughput over wireless networks. TCP Veno makes use of state</div><div class='add'>+	  distinguishing to circumvent the difficult judgment of the packet loss</div><div class='add'>+	  type. TCP Veno cuts down less congestion window in response to random</div><div class='add'>+	  loss packets.</div><div class='add'>+	  See &lt;http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186&gt;</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_YEAH</div><div class='ctx'> 	tristate "YeAH TCP"</div><div class='ctx'> 	select TCP_CONG_VEGAS</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	YeAH-TCP is a sender-side high-speed enabled TCP congestion control</div><div class='del'>-	algorithm, which uses a mixed loss/delay approach to compute the</div><div class='del'>-	congestion window. It's design goals target high efficiency,</div><div class='del'>-	internal, RTT and Reno fairness, resilience to link loss while</div><div class='del'>-	keeping network elements load as low as possible.</div><div class='add'>+	help</div><div class='add'>+	  YeAH-TCP is a sender-side high-speed enabled TCP congestion control</div><div class='add'>+	  algorithm, which uses a mixed loss/delay approach to compute the</div><div class='add'>+	  congestion window. It's design goals target high efficiency,</div><div class='add'>+	  internal, RTT and Reno fairness, resilience to link loss while</div><div class='add'>+	  keeping network elements load as low as possible.</div><div class='ctx'> </div><div class='del'>-	For further details look here:</div><div class='del'>-	  http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf</div><div class='add'>+	  For further details look here:</div><div class='add'>+	    http://wil.cs.caltech.edu/pfldnet2007/paper/YeAH_TCP.pdf</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_ILLINOIS</div><div class='ctx'> 	tristate "TCP Illinois"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	TCP-Illinois is a sender-side modification of TCP Reno for</div><div class='del'>-	high speed long delay links. It uses round-trip-time to</div><div class='del'>-	adjust the alpha and beta parameters to achieve a higher average</div><div class='del'>-	throughput and maintain fairness.</div><div class='add'>+	help</div><div class='add'>+	  TCP-Illinois is a sender-side modification of TCP Reno for</div><div class='add'>+	  high speed long delay links. It uses round-trip-time to</div><div class='add'>+	  adjust the alpha and beta parameters to achieve a higher average</div><div class='add'>+	  throughput and maintain fairness.</div><div class='ctx'> </div><div class='del'>-	For further details see:</div><div class='del'>-	  http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html</div><div class='add'>+	  For further details see:</div><div class='add'>+	    http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_DCTCP</div><div class='ctx'> 	tristate "DataCenter TCP (DCTCP)"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	DCTCP leverages Explicit Congestion Notification (ECN) in the network to</div><div class='del'>-	provide multi-bit feedback to the end hosts. It is designed to provide:</div><div class='add'>+	help</div><div class='add'>+	  DCTCP leverages Explicit Congestion Notification (ECN) in the network to</div><div class='add'>+	  provide multi-bit feedback to the end hosts. It is designed to provide:</div><div class='ctx'> </div><div class='del'>-	- High burst tolerance (incast due to partition/aggregate),</div><div class='del'>-	- Low latency (short flows, queries),</div><div class='del'>-	- High throughput (continuous data updates, large file transfers) with</div><div class='del'>-	  commodity, shallow-buffered switches.</div><div class='add'>+	  - High burst tolerance (incast due to partition/aggregate),</div><div class='add'>+	  - Low latency (short flows, queries),</div><div class='add'>+	  - High throughput (continuous data updates, large file transfers) with</div><div class='add'>+	    commodity, shallow-buffered switches.</div><div class='ctx'> </div><div class='del'>-	All switches in the data center network running DCTCP must support</div><div class='del'>-	ECN marking and be configured for marking when reaching defined switch</div><div class='del'>-	buffer thresholds. The default ECN marking threshold heuristic for</div><div class='del'>-	DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets</div><div class='del'>-	(~100KB) at 10Gbps, but might need further careful tweaking.</div><div class='add'>+	  All switches in the data center network running DCTCP must support</div><div class='add'>+	  ECN marking and be configured for marking when reaching defined switch</div><div class='add'>+	  buffer thresholds. The default ECN marking threshold heuristic for</div><div class='add'>+	  DCTCP on switches is 20 packets (30KB) at 1Gbps, and 65 packets</div><div class='add'>+	  (~100KB) at 10Gbps, but might need further careful tweaking.</div><div class='ctx'> </div><div class='del'>-	For further details see:</div><div class='del'>-	  http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf</div><div class='add'>+	  For further details see:</div><div class='add'>+	    http://simula.stanford.edu/~alizade/Site/DCTCP_files/dctcp-final.pdf</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_CDG</div><div class='ctx'> 	tristate "CAIA Delay-Gradient (CDG)"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies</div><div class='del'>-	the TCP sender in order to:</div><div class='add'>+	help</div><div class='add'>+	  CAIA Delay-Gradient (CDG) is a TCP congestion control that modifies</div><div class='add'>+	  the TCP sender in order to:</div><div class='ctx'> </div><div class='ctx'> 	  o Use the delay gradient as a congestion signal.</div><div class='ctx'> 	  o Back off with an average probability that is independent of the RTT.</div><div class='ctx'> 	  o Coexist with flows that use loss-based congestion control.</div><div class='ctx'> 	  o Tolerate packet loss unrelated to congestion.</div><div class='ctx'> </div><div class='del'>-	For further details see:</div><div class='del'>-	  D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using</div><div class='del'>-	  delay gradients." In Networking 2011. Preprint: http://goo.gl/No3vdg</div><div class='add'>+	  For further details see:</div><div class='add'>+	    D.A. Hayes and G. Armitage. "Revisiting TCP congestion control using</div><div class='add'>+	    delay gradients." In Networking 2011. Preprint:</div><div class='add'>+	    http://caia.swin.edu.au/cv/dahayes/content/networking2011-cdg-preprint.pdf</div><div class='ctx'> </div><div class='ctx'> config TCP_CONG_BBR</div><div class='ctx'> 	tristate "BBR TCP"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-</div><div class='del'>-	BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to</div><div class='del'>-	maximize network utilization and minimize queues. It builds an explicit</div><div class='del'>-	model of the the bottleneck delivery rate and path round-trip</div><div class='del'>-	propagation delay. It tolerates packet loss and delay unrelated to</div><div class='del'>-	congestion. It can operate over LAN, WAN, cellular, wifi, or cable</div><div class='del'>-	modem links. It can coexist with flows that use loss-based congestion</div><div class='del'>-	control, and can operate with shallow buffers, deep buffers,</div><div class='del'>-	bufferbloat, policers, or AQM schemes that do not provide a delay</div><div class='del'>-	signal. It requires the fq ("Fair Queue") pacing packet scheduler.</div><div class='add'>+	help</div><div class='add'>+</div><div class='add'>+	  BBR (Bottleneck Bandwidth and RTT) TCP congestion control aims to</div><div class='add'>+	  maximize network utilization and minimize queues. It builds an explicit</div><div class='add'>+	  model of the bottleneck delivery rate and path round-trip propagation</div><div class='add'>+	  delay. It tolerates packet loss and delay unrelated to congestion. It</div><div class='add'>+	  can operate over LAN, WAN, cellular, wifi, or cable modem links. It can</div><div class='add'>+	  coexist with flows that use loss-based congestion control, and can</div><div class='add'>+	  operate with shallow buffers, deep buffers, bufferbloat, policers, or</div><div class='add'>+	  AQM schemes that do not provide a delay signal. It requires the fq</div><div class='add'>+	  ("Fair Queue") pacing packet scheduler.</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Default TCP congestion control"</div><div class='hunk'>@@ -743,11 +742,26 @@ config DEFAULT_TCP_CONG</div><div class='ctx'> 	default "bbr" if DEFAULT_BBR</div><div class='ctx'> 	default "cubic"</div><div class='ctx'> </div><div class='add'>+config TCP_SIGPOOL</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config TCP_AO</div><div class='add'>+	bool "TCP: Authentication Option (RFC5925)"</div><div class='add'>+	select CRYPTO</div><div class='add'>+	select TCP_SIGPOOL</div><div class='add'>+	depends on 64BIT &amp;&amp; IPV6 != m # seq-number extension needs WRITE_ONCE(u64)</div><div class='add'>+	help</div><div class='add'>+	  TCP-AO specifies the use of stronger Message Authentication Codes (MACs),</div><div class='add'>+	  protects against replays for long-lived TCP connections, and</div><div class='add'>+	  provides more details on the association of security with TCP</div><div class='add'>+	  connections than TCP MD5 (See RFC5925)</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config TCP_MD5SIG</div><div class='ctx'> 	bool "TCP: MD5 Signature Option support (RFC2385)"</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	---help---</div><div class='add'>+	select CRYPTO_LIB_MD5</div><div class='add'>+	help</div><div class='ctx'> 	  RFC2385 specifies a method of giving MD5 protection to TCP sessions.</div><div class='ctx'> 	  Its main (only?) use is to protect BGP sessions between core routers</div><div class='ctx'> 	  on the Internet.</div><div class='head'>diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile<br/>index 7446b98661d8..ec36d2ec059e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/Makefile</a></div><div class='hunk'>@@ -10,13 +10,11 @@ obj-y     := route.o inetpeer.o protocol.o \</div><div class='ctx'> 	     tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \</div><div class='ctx'> 	     tcp_minisocks.o tcp_cong.o tcp_metrics.o tcp_fastopen.o \</div><div class='ctx'> 	     tcp_rate.o tcp_recovery.o tcp_ulp.o \</div><div class='del'>-	     tcp_offload.o datagram.o raw.o udp.o udplite.o \</div><div class='add'>+	     tcp_offload.o tcp_plb.o datagram.o raw.o udp.o udplite.o \</div><div class='ctx'> 	     udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \</div><div class='ctx'> 	     fib_frontend.o fib_semantics.o fib_trie.o fib_notifier.o \</div><div class='ctx'> 	     inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o \</div><div class='del'>-	     metrics.o netlink.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_BPFILTER) += bpfilter/</div><div class='add'>+	     metrics.o netlink.o nexthop.o udp_tunnel_stub.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NET_IP_TUNNEL) += ip_tunnel.o</div><div class='ctx'> obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o</div><div class='hunk'>@@ -26,9 +24,11 @@ obj-$(CONFIG_IP_MROUTE) += ipmr.o</div><div class='ctx'> obj-$(CONFIG_IP_MROUTE_COMMON) += ipmr_base.o</div><div class='ctx'> obj-$(CONFIG_NET_IPIP) += ipip.o</div><div class='ctx'> gre-y := gre_demux.o</div><div class='add'>+fou-y := fou_core.o fou_nl.o fou_bpf.o</div><div class='ctx'> obj-$(CONFIG_NET_FOU) += fou.o</div><div class='ctx'> obj-$(CONFIG_NET_IPGRE_DEMUX) += gre.o</div><div class='ctx'> obj-$(CONFIG_NET_IPGRE) += ip_gre.o</div><div class='add'>+udp_tunnel-y := udp_tunnel_core.o udp_tunnel_nic.o</div><div class='ctx'> obj-$(CONFIG_NET_UDP_TUNNEL) += udp_tunnel.o</div><div class='ctx'> obj-$(CONFIG_NET_IPVTI) += ip_vti.o</div><div class='ctx'> obj-$(CONFIG_SYN_COOKIES) += syncookies.o</div><div class='hunk'>@@ -37,10 +37,7 @@ obj-$(CONFIG_INET_ESP) += esp4.o</div><div class='ctx'> obj-$(CONFIG_INET_ESP_OFFLOAD) += esp4_offload.o</div><div class='ctx'> obj-$(CONFIG_INET_IPCOMP) += ipcomp.o</div><div class='ctx'> obj-$(CONFIG_INET_XFRM_TUNNEL) += xfrm4_tunnel.o</div><div class='del'>-obj-$(CONFIG_INET_XFRM_MODE_BEET) += xfrm4_mode_beet.o</div><div class='ctx'> obj-$(CONFIG_INET_TUNNEL) += tunnel4.o</div><div class='del'>-obj-$(CONFIG_INET_XFRM_MODE_TRANSPORT) += xfrm4_mode_transport.o</div><div class='del'>-obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o</div><div class='ctx'> obj-$(CONFIG_IP_PNP) += ipconfig.o</div><div class='ctx'> obj-$(CONFIG_NETFILTER)	+= netfilter.o netfilter/</div><div class='ctx'> obj-$(CONFIG_INET_DIAG) += inet_diag.o</div><div class='hunk'>@@ -63,7 +60,15 @@ obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o</div><div class='ctx'> obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o</div><div class='ctx'> obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o</div><div class='ctx'> obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o</div><div class='add'>+obj-$(CONFIG_TCP_SIGPOOL) += tcp_sigpool.o</div><div class='add'>+obj-$(CONFIG_NET_SOCK_MSG) += tcp_bpf.o</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL) += udp_bpf.o</div><div class='ctx'> obj-$(CONFIG_NETLABEL) += cipso_ipv4.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \</div><div class='ctx'> 		      xfrm4_output.o xfrm4_protocol.o</div><div class='add'>+obj-$(CONFIG_TCP_AO) += tcp_ao.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_BPF_JIT),y)</div><div class='add'>+obj-$(CONFIG_BPF_SYSCALL) += bpf_tcp_ca.o</div><div class='add'>+endif</div><div class='head'>diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c<br/>index 1fbe2f815474..08d811f11896 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/af_inet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/af_inet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/af_inet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/af_inet.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -58,11 +59,6 @@</div><div class='ctx'>  *					Some other random speedups.</div><div class='ctx'>  *		Cyrus Durgin	:	Cleaned up file for kmod hacks.</div><div class='ctx'>  *		Andi Kleen	:	Fix inet_stream_connect TCP race.</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv4: " fmt</div><div class='hunk'>@@ -103,7 +99,10 @@</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/inet_connection_sock.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udplite.h&gt;</div><div class='ctx'> #include &lt;net/ping.h&gt;</div><div class='hunk'>@@ -120,6 +119,8 @@</div><div class='ctx'> #include &lt;linux/mroute.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='add'>+#include &lt;net/compat.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/sock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +139,7 @@ void inet_sock_destruct(struct sock *sk)</div><div class='ctx'> 	__skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 	__skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='ctx'> </div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='add'>+	sk_mem_reclaim_final(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type == SOCK_STREAM &amp;&amp; sk-&gt;sk_state != TCP_CLOSE) {</div><div class='ctx'> 		pr_err("Attempt to release TCP socket in state %d %p\n",</div><div class='hunk'>@@ -150,15 +151,15 @@ void inet_sock_destruct(struct sock *sk)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(atomic_read(&amp;sk-&gt;sk_rmem_alloc));</div><div class='del'>-	WARN_ON(refcount_read(&amp;sk-&gt;sk_wmem_alloc));</div><div class='del'>-	WARN_ON(sk-&gt;sk_wmem_queued);</div><div class='del'>-	WARN_ON(sk-&gt;sk_forward_alloc);</div><div class='add'>+	WARN_ON_ONCE(atomic_read(&amp;sk-&gt;sk_rmem_alloc));</div><div class='add'>+	WARN_ON_ONCE(refcount_read(&amp;sk-&gt;sk_wmem_alloc));</div><div class='add'>+	WARN_ON_ONCE(sk-&gt;sk_wmem_queued);</div><div class='add'>+	WARN_ON_ONCE(sk-&gt;sk_forward_alloc);</div><div class='ctx'> </div><div class='ctx'> 	kfree(rcu_dereference_protected(inet-&gt;inet_opt, 1));</div><div class='del'>-	dst_release(rcu_dereference_check(sk-&gt;sk_dst_cache, 1));</div><div class='del'>-	dst_release(sk-&gt;sk_rx_dst);</div><div class='del'>-	sk_refcnt_debug_dec(sk);</div><div class='add'>+	dst_release(rcu_dereference_protected(sk-&gt;sk_dst_cache, 1));</div><div class='add'>+	dst_release(rcu_dereference_protected(sk-&gt;sk_rx_dst, 1));</div><div class='add'>+	psp_sk_assoc_free(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_sock_destruct);</div><div class='ctx'> </div><div class='hunk'>@@ -189,25 +190,15 @@ static int inet_autobind(struct sock *sk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Move a socket into listening state.</div><div class='del'>- */</div><div class='del'>-int inet_listen(struct socket *sock, int backlog)</div><div class='add'>+int __inet_listen_sk(struct sock *sk, int backlog)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	unsigned char old_state;</div><div class='add'>+	unsigned char old_state = sk-&gt;sk_state;</div><div class='ctx'> 	int err, tcp_fastopen;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (sock-&gt;state != SS_UNCONNECTED || sock-&gt;type != SOCK_STREAM)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	old_state = sk-&gt;sk_state;</div><div class='ctx'> 	if (!((1 &lt;&lt; old_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_max_ack_backlog, backlog);</div><div class='ctx'> 	/* Really, if the socket is already in listen state</div><div class='ctx'> 	 * we can only allow the backlog to be adjusted.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -218,7 +209,7 @@ int inet_listen(struct socket *sock, int backlog)</div><div class='ctx'> 		 * because the socket was in TCP_LISTEN state previously but</div><div class='ctx'> 		 * was shutdown() rather than close().</div><div class='ctx'> 		 */</div><div class='del'>-		tcp_fastopen = sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen;</div><div class='add'>+		tcp_fastopen = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen);</div><div class='ctx'> 		if ((tcp_fastopen &amp; TFO_SERVER_WO_SOCKOPT1) &amp;&amp;</div><div class='ctx'> 		    (tcp_fastopen &amp; TFO_SERVER_ENABLE) &amp;&amp;</div><div class='ctx'> 		    !inet_csk(sk)-&gt;icsk_accept_queue.fastopenq.max_qlen) {</div><div class='hunk'>@@ -226,13 +217,29 @@ int inet_listen(struct socket *sock, int backlog)</div><div class='ctx'> 			tcp_fastopen_init_key_once(sock_net(sk));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = inet_csk_listen_start(sk, backlog);</div><div class='add'>+		err = inet_csk_listen_start(sk);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	sk-&gt;sk_max_ack_backlog = backlog;</div><div class='del'>-	err = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Move a socket into listening state.</div><div class='add'>+ */</div><div class='add'>+int inet_listen(struct socket *sock, int backlog)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (sock-&gt;state != SS_UNCONNECTED || sock-&gt;type != SOCK_STREAM)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __inet_listen_sk(sk, backlog);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -317,7 +324,7 @@ lookup_protocol:</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!answer_prot-&gt;slab);</div><div class='ctx'> </div><div class='del'>-	err = -ENOBUFS;</div><div class='add'>+	err = -ENOMEM;</div><div class='ctx'> 	sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot, kern);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -326,40 +333,42 @@ lookup_protocol:</div><div class='ctx'> 	if (INET_PROTOSW_REUSE &amp; answer_flags)</div><div class='ctx'> 		sk-&gt;sk_reuse = SK_CAN_REUSE;</div><div class='ctx'> </div><div class='add'>+	if (INET_PROTOSW_ICSK &amp; answer_flags)</div><div class='add'>+		inet_init_csk_locks(sk);</div><div class='add'>+</div><div class='ctx'> 	inet = inet_sk(sk);</div><div class='del'>-	inet-&gt;is_icsk = (INET_PROTOSW_ICSK &amp; answer_flags) != 0;</div><div class='add'>+	inet_assign_bit(IS_ICSK, sk, INET_PROTOSW_ICSK &amp; answer_flags);</div><div class='ctx'> </div><div class='del'>-	inet-&gt;nodefrag = 0;</div><div class='add'>+	inet_clear_bit(NODEFRAG, sk);</div><div class='ctx'> </div><div class='ctx'> 	if (SOCK_RAW == sock-&gt;type) {</div><div class='ctx'> 		inet-&gt;inet_num = protocol;</div><div class='ctx'> 		if (IPPROTO_RAW == protocol)</div><div class='del'>-			inet-&gt;hdrincl = 1;</div><div class='add'>+			inet_set_bit(HDRINCL, sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_ip_no_pmtu_disc)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_no_pmtu_disc))</div><div class='ctx'> 		inet-&gt;pmtudisc = IP_PMTUDISC_DONT;</div><div class='ctx'> 	else</div><div class='ctx'> 		inet-&gt;pmtudisc = IP_PMTUDISC_WANT;</div><div class='ctx'> </div><div class='del'>-	inet-&gt;inet_id = 0;</div><div class='add'>+	atomic_set(&amp;inet-&gt;inet_id, 0);</div><div class='ctx'> </div><div class='ctx'> 	sock_init_data(sock, sk);</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_destruct	   = inet_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_protocol	   = protocol;</div><div class='ctx'> 	sk-&gt;sk_backlog_rcv = sk-&gt;sk_prot-&gt;backlog_rcv;</div><div class='add'>+	sk-&gt;sk_txrehash = READ_ONCE(net-&gt;core.sysctl_txrehash);</div><div class='ctx'> </div><div class='ctx'> 	inet-&gt;uc_ttl	= -1;</div><div class='del'>-	inet-&gt;mc_loop	= 1;</div><div class='add'>+	inet_set_bit(MC_LOOP, sk);</div><div class='ctx'> 	inet-&gt;mc_ttl	= 1;</div><div class='del'>-	inet-&gt;mc_all	= 1;</div><div class='add'>+	inet_set_bit(MC_ALL, sk);</div><div class='ctx'> 	inet-&gt;mc_index	= 0;</div><div class='ctx'> 	inet-&gt;mc_list	= NULL;</div><div class='ctx'> 	inet-&gt;rcv_tos	= 0;</div><div class='ctx'> </div><div class='del'>-	sk_refcnt_debug_inc(sk);</div><div class='del'>-</div><div class='ctx'> 	if (inet-&gt;inet_num) {</div><div class='ctx'> 		/* It assumes that any protocol which allows</div><div class='ctx'> 		 * the user to assign a number at socket</div><div class='hunk'>@@ -369,32 +378,30 @@ lookup_protocol:</div><div class='ctx'> 		inet-&gt;inet_sport = htons(inet-&gt;inet_num);</div><div class='ctx'> 		/* Add to protocol hash chains. */</div><div class='ctx'> 		err = sk-&gt;sk_prot-&gt;hash(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;init) {</div><div class='ctx'> 		err = sk-&gt;sk_prot-&gt;init(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!kern) {</div><div class='ctx'> 		err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> out_rcu_unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	goto out;</div><div class='add'>+out_sk_release:</div><div class='add'>+	sk_common_release(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +417,9 @@ int inet_release(struct socket *sock)</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		long timeout;</div><div class='ctx'> </div><div class='add'>+		if (!sk-&gt;sk_kern_sock)</div><div class='add'>+			BPF_CGROUP_RUN_PROG_INET_SOCK_RELEASE(sk);</div><div class='add'>+</div><div class='ctx'> 		/* Applications forget to leave groups before exiting */</div><div class='ctx'> 		ip_mc_drop_socket(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -424,16 +434,16 @@ int inet_release(struct socket *sock)</div><div class='ctx'> 		if (sock_flag(sk, SOCK_LINGER) &amp;&amp;</div><div class='ctx'> 		    !(current-&gt;flags &amp; PF_EXITING))</div><div class='ctx'> 			timeout = sk-&gt;sk_lingertime;</div><div class='del'>-		sock-&gt;sk = NULL;</div><div class='ctx'> 		sk-&gt;sk_prot-&gt;close(sk, timeout);</div><div class='add'>+		sock-&gt;sk = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_release);</div><div class='ctx'> </div><div class='del'>-int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int inet_bind_sk(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	u32 flags = BIND_WITH_LOCK;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* If the socket has its own bind function then use it. (RAW) */</div><div class='hunk'>@@ -446,16 +456,22 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	/* BPF prog is run before any checks are done so that if the prog</div><div class='ctx'> 	 * changes context in a wrong way it will be caught.</div><div class='ctx'> 	 */</div><div class='del'>-	err = BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr);</div><div class='add'>+	err = BPF_CGROUP_RUN_PROG_INET_BIND_LOCK(sk, uaddr, &amp;addr_len,</div><div class='add'>+						 CGROUP_INET4_BIND, &amp;flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return __inet_bind(sk, uaddr, addr_len, false, true);</div><div class='add'>+	return __inet_bind(sk, uaddr, addr_len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int inet_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='add'>+{</div><div class='add'>+	return inet_bind_sk(sock-&gt;sk, uaddr, addr_len);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_bind);</div><div class='ctx'> </div><div class='del'>-int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='del'>-		bool force_bind_address_no_port, bool with_lock)</div><div class='add'>+int __inet_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,</div><div class='add'>+		u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='hunk'>@@ -486,16 +502,14 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 	 *  is temporarily down)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = -EADDRNOTAVAIL;</div><div class='del'>-	if (!inet_can_nonlocal_bind(net, inet) &amp;&amp;</div><div class='del'>-	    addr-&gt;sin_addr.s_addr != htonl(INADDR_ANY) &amp;&amp;</div><div class='del'>-	    chk_addr_ret != RTN_LOCAL &amp;&amp;</div><div class='del'>-	    chk_addr_ret != RTN_MULTICAST &amp;&amp;</div><div class='del'>-	    chk_addr_ret != RTN_BROADCAST)</div><div class='add'>+	if (!inet_addr_valid_or_nonlocal(net, inet, addr-&gt;sin_addr.s_addr,</div><div class='add'>+	                                 chk_addr_ret))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	snum = ntohs(addr-&gt;sin_port);</div><div class='ctx'> 	err = -EACCES;</div><div class='del'>-	if (snum &amp;&amp; snum &lt; inet_prot_sock(net) &amp;&amp;</div><div class='add'>+	if (!(flags &amp; BIND_NO_CAP_NET_BIND_SERVICE) &amp;&amp;</div><div class='add'>+	    snum &amp;&amp; inet_port_requires_bind_service(net, snum) &amp;&amp;</div><div class='ctx'> 	    !ns_capable(net-&gt;user_ns, CAP_NET_BIND_SERVICE))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +520,7 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 	 *      would be illegal to use them (multicast/broadcast) in</div><div class='ctx'> 	 *      which case the sending device address is used.</div><div class='ctx'> 	 */</div><div class='del'>-	if (with_lock)</div><div class='add'>+	if (flags &amp; BIND_WITH_LOCK)</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Check these errors (active socket, double bind). */</div><div class='hunk'>@@ -519,18 +533,22 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 		inet-&gt;inet_saddr = 0;  /* Use device */</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we are allowed to bind here. */</div><div class='del'>-	if (snum || !(inet-&gt;bind_address_no_port ||</div><div class='del'>-		      force_bind_address_no_port)) {</div><div class='del'>-		if (sk-&gt;sk_prot-&gt;get_port(sk, snum)) {</div><div class='del'>-			inet-&gt;inet_saddr = inet-&gt;inet_rcv_saddr = 0;</div><div class='del'>-			err = -EADDRINUSE;</div><div class='del'>-			goto out_release_sock;</div><div class='del'>-		}</div><div class='del'>-		err = BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk);</div><div class='add'>+	if (snum || !(inet_test_bit(BIND_ADDRESS_NO_PORT, sk) ||</div><div class='add'>+		      (flags &amp; BIND_FORCE_ADDRESS_NO_PORT))) {</div><div class='add'>+		err = sk-&gt;sk_prot-&gt;get_port(sk, snum);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			inet-&gt;inet_saddr = inet-&gt;inet_rcv_saddr = 0;</div><div class='ctx'> 			goto out_release_sock;</div><div class='ctx'> 		}</div><div class='add'>+		if (!(flags &amp; BIND_FROM_BPF)) {</div><div class='add'>+			err = BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk);</div><div class='add'>+			if (err) {</div><div class='add'>+				inet-&gt;inet_saddr = inet-&gt;inet_rcv_saddr = 0;</div><div class='add'>+				if (sk-&gt;sk_prot-&gt;put_port)</div><div class='add'>+					sk-&gt;sk_prot-&gt;put_port(sk);</div><div class='add'>+				goto out_release_sock;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (inet-&gt;inet_rcv_saddr)</div><div class='hunk'>@@ -543,32 +561,37 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 	sk_dst_reset(sk);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> out_release_sock:</div><div class='del'>-	if (with_lock)</div><div class='add'>+	if (flags &amp; BIND_WITH_LOCK)</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+int inet_dgram_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 		       int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	const struct proto *prot;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; sizeof(uaddr-&gt;sa_family))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+</div><div class='ctx'> 	if (uaddr-&gt;sa_family == AF_UNSPEC)</div><div class='del'>-		return sk-&gt;sk_prot-&gt;disconnect(sk, flags);</div><div class='add'>+		return prot-&gt;disconnect(sk, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (BPF_CGROUP_PRE_CONNECT_ENABLED(sk)) {</div><div class='del'>-		err = sk-&gt;sk_prot-&gt;pre_connect(sk, uaddr, addr_len);</div><div class='add'>+		err = prot-&gt;pre_connect(sk, uaddr, addr_len);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!inet_sk(sk)-&gt;inet_num &amp;&amp; inet_autobind(sk))</div><div class='add'>+	if (data_race(!inet_sk(sk)-&gt;inet_num) &amp;&amp; inet_autobind(sk))</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	return sk-&gt;sk_prot-&gt;connect(sk, uaddr, addr_len);</div><div class='add'>+	return prot-&gt;connect(sk, uaddr, addr_len);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_dgram_connect);</div><div class='ctx'> </div><div class='hunk'>@@ -600,7 +623,7 @@ static long inet_wait_for_connect(struct sock *sk, long timeo, int writebias)</div><div class='ctx'>  *	Connect to a remote host. There is regrettably still a little</div><div class='ctx'>  *	TCP 'magic' in here.</div><div class='ctx'>  */</div><div class='del'>-int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+int __inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			  int addr_len, int flags, int is_sendmsg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -621,6 +644,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (uaddr-&gt;sa_family == AF_UNSPEC) {</div><div class='add'>+			sk-&gt;sk_disconnects++;</div><div class='ctx'> 			err = sk-&gt;sk_prot-&gt;disconnect(sk, flags);</div><div class='ctx'> 			sock-&gt;state = err ? SS_DISCONNECTING : SS_UNCONNECTED;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -635,7 +659,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		err = -EISCONN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	case SS_CONNECTING:</div><div class='del'>-		if (inet_sk(sk)-&gt;defer_connect)</div><div class='add'>+		if (inet_test_bit(DEFER_CONNECT, sk))</div><div class='ctx'> 			err = is_sendmsg ? -EINPROGRESS : -EISCONN;</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EALREADY;</div><div class='hunk'>@@ -658,7 +682,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 		sock-&gt;state = SS_CONNECTING;</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; inet_sk(sk)-&gt;defer_connect)</div><div class='add'>+		if (!err &amp;&amp; inet_test_bit(DEFER_CONNECT, sk))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* Just entered SS_CONNECTING state; the only</div><div class='hunk'>@@ -675,6 +699,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		int writebias = (sk-&gt;sk_protocol == IPPROTO_TCP) &amp;&amp;</div><div class='ctx'> 				tcp_sk(sk)-&gt;fastopen_req &amp;&amp;</div><div class='ctx'> 				tcp_sk(sk)-&gt;fastopen_req-&gt;data ? 1 : 0;</div><div class='add'>+		int dis = sk-&gt;sk_disconnects;</div><div class='ctx'> </div><div class='ctx'> 		/* Error code is set above */</div><div class='ctx'> 		if (!timeo || !inet_wait_for_connect(sk, timeo, writebias))</div><div class='hunk'>@@ -683,6 +708,11 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		err = sock_intr_errno(timeo);</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			goto out;</div><div class='add'>+</div><div class='add'>+		if (dis != sk-&gt;sk_disconnects) {</div><div class='add'>+			err = -EPIPE;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Connection was closed by RST, timeout, ICMP error</div><div class='hunk'>@@ -704,13 +734,14 @@ out:</div><div class='ctx'> sock_error:</div><div class='ctx'> 	err = sock_error(sk) ? : -ECONNABORTED;</div><div class='ctx'> 	sock-&gt;state = SS_UNCONNECTED;</div><div class='add'>+	sk-&gt;sk_disconnects++;</div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;disconnect(sk, flags))</div><div class='ctx'> 		sock-&gt;state = SS_DISCONNECTING;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__inet_stream_connect);</div><div class='ctx'> </div><div class='del'>-int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+int inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			int addr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -722,101 +753,131 @@ int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_stream_connect);</div><div class='ctx'> </div><div class='add'>+void __inet_accept(struct socket *sock, struct socket *newsock, struct sock *newsk)</div><div class='add'>+{</div><div class='add'>+	if (mem_cgroup_sockets_enabled) {</div><div class='add'>+		mem_cgroup_sk_alloc(newsk);</div><div class='add'>+		__sk_charge(newsk, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_rps_record_flow(newsk);</div><div class='add'>+	WARN_ON(!((1 &lt;&lt; newsk-&gt;sk_state) &amp;</div><div class='add'>+		  (TCPF_ESTABLISHED | TCPF_SYN_RECV |</div><div class='add'>+		   TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 |</div><div class='add'>+		   TCPF_CLOSING | TCPF_CLOSE_WAIT |</div><div class='add'>+		   TCPF_CLOSE)));</div><div class='add'>+</div><div class='add'>+	if (test_bit(SOCK_SUPPORT_ZC, &amp;sock-&gt;flags))</div><div class='add'>+		set_bit(SOCK_SUPPORT_ZC, &amp;newsock-&gt;flags);</div><div class='add'>+	sock_graft(newsk, newsock);</div><div class='add'>+</div><div class='add'>+	newsock-&gt;state = SS_CONNECTED;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__inet_accept);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Accept a pending connection. The TCP layer now gives BSD semantics.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int inet_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-		bool kern)</div><div class='add'>+int inet_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+		struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk1 = sock-&gt;sk;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	struct sock *sk2 = sk1-&gt;sk_prot-&gt;accept(sk1, flags, &amp;err, kern);</div><div class='add'>+	struct sock *sk1 = sock-&gt;sk, *sk2;</div><div class='ctx'> </div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	arg-&gt;err = -EINVAL;</div><div class='add'>+	sk2 = READ_ONCE(sk1-&gt;sk_prot)-&gt;accept(sk1, arg);</div><div class='ctx'> 	if (!sk2)</div><div class='del'>-		goto do_err;</div><div class='add'>+		return arg-&gt;err;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk2);</div><div class='del'>-</div><div class='del'>-	sock_rps_record_flow(sk2);</div><div class='del'>-	WARN_ON(!((1 &lt;&lt; sk2-&gt;sk_state) &amp;</div><div class='del'>-		  (TCPF_ESTABLISHED | TCPF_SYN_RECV |</div><div class='del'>-		  TCPF_CLOSE_WAIT | TCPF_CLOSE)));</div><div class='del'>-</div><div class='del'>-	sock_graft(sk2, newsock);</div><div class='del'>-</div><div class='del'>-	newsock-&gt;state = SS_CONNECTED;</div><div class='del'>-	err = 0;</div><div class='add'>+	__inet_accept(sock, newsock, sk2);</div><div class='ctx'> 	release_sock(sk2);</div><div class='del'>-do_err:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_accept);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	This does both peername and sockname.</div><div class='ctx'>  */</div><div class='ctx'> int inet_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='del'>-			int peer)</div><div class='add'>+		 int peer)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk		= sock-&gt;sk;</div><div class='ctx'> 	struct inet_sock *inet	= inet_sk(sk);</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);</div><div class='add'>+	int sin_addr_len = sizeof(*sin);</div><div class='ctx'> </div><div class='ctx'> 	sin-&gt;sin_family = AF_INET;</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	if (peer) {</div><div class='ctx'> 		if (!inet-&gt;inet_dport ||</div><div class='ctx'> 		    (((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_SYN_SENT)) &amp;&amp;</div><div class='del'>-		     peer == 1))</div><div class='add'>+		     peer == 1)) {</div><div class='add'>+			release_sock(sk);</div><div class='ctx'> 			return -ENOTCONN;</div><div class='add'>+		}</div><div class='ctx'> 		sin-&gt;sin_port = inet-&gt;inet_dport;</div><div class='ctx'> 		sin-&gt;sin_addr.s_addr = inet-&gt;inet_daddr;</div><div class='add'>+		BPF_CGROUP_RUN_SA_PROG(sk, sin, &amp;sin_addr_len,</div><div class='add'>+				       CGROUP_INET4_GETPEERNAME);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__be32 addr = inet-&gt;inet_rcv_saddr;</div><div class='ctx'> 		if (!addr)</div><div class='ctx'> 			addr = inet-&gt;inet_saddr;</div><div class='ctx'> 		sin-&gt;sin_port = inet-&gt;inet_sport;</div><div class='ctx'> 		sin-&gt;sin_addr.s_addr = addr;</div><div class='add'>+		BPF_CGROUP_RUN_SA_PROG(sk, sin, &amp;sin_addr_len,</div><div class='add'>+				       CGROUP_INET4_GETSOCKNAME);</div><div class='ctx'> 	}</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> 	memset(sin-&gt;sin_zero, 0, sizeof(sin-&gt;sin_zero));</div><div class='del'>-	return sizeof(*sin);</div><div class='add'>+	return sin_addr_len;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_getname);</div><div class='ctx'> </div><div class='del'>-int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='add'>+int inet_send_prepare(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-</div><div class='ctx'> 	sock_rps_record_flow(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* We may need to bind the socket. */</div><div class='del'>-	if (!inet_sk(sk)-&gt;inet_num &amp;&amp; !sk-&gt;sk_prot-&gt;no_autobind &amp;&amp;</div><div class='add'>+	if (data_race(!inet_sk(sk)-&gt;inet_num) &amp;&amp; !sk-&gt;sk_prot-&gt;no_autobind &amp;&amp;</div><div class='ctx'> 	    inet_autobind(sk))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	return sk-&gt;sk_prot-&gt;sendmsg(sk, msg, size);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_sendmsg);</div><div class='add'>+EXPORT_SYMBOL_GPL(inet_send_prepare);</div><div class='ctx'> </div><div class='del'>-ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,</div><div class='del'>-		      size_t size, int flags)</div><div class='add'>+int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	sock_rps_record_flow(sk);</div><div class='del'>-</div><div class='del'>-	/* We may need to bind the socket. */</div><div class='del'>-	if (!inet_sk(sk)-&gt;inet_num &amp;&amp; !sk-&gt;sk_prot-&gt;no_autobind &amp;&amp;</div><div class='del'>-	    inet_autobind(sk))</div><div class='add'>+	if (unlikely(inet_send_prepare(sk)))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_prot-&gt;sendpage)</div><div class='del'>-		return sk-&gt;sk_prot-&gt;sendpage(sk, page, offset, size, flags);</div><div class='del'>-	return sock_no_sendpage(sock, page, offset, size, flags);</div><div class='add'>+	return INDIRECT_CALL_2(sk-&gt;sk_prot-&gt;sendmsg, tcp_sendmsg, udp_sendmsg,</div><div class='add'>+			       sk, msg, size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_sendmsg);</div><div class='add'>+</div><div class='add'>+void inet_splice_eof(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	const struct proto *prot;</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(inet_send_prepare(sk)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+	if (prot-&gt;splice_eof)</div><div class='add'>+		prot-&gt;splice_eof(sock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_sendpage);</div><div class='add'>+EXPORT_SYMBOL_GPL(inet_splice_eof);</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int udp_recvmsg(struct sock *, struct msghdr *,</div><div class='add'>+					  size_t, int, int *));</div><div class='ctx'> int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 		 int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -827,8 +888,8 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='ctx'> 	if (likely(!(flags &amp; MSG_ERRQUEUE)))</div><div class='ctx'> 		sock_rps_record_flow(sk);</div><div class='ctx'> </div><div class='del'>-	err = sk-&gt;sk_prot-&gt;recvmsg(sk, msg, size, flags &amp; MSG_DONTWAIT,</div><div class='del'>-				   flags &amp; ~MSG_DONTWAIT, &amp;addr_len);</div><div class='add'>+	err = INDIRECT_CALL_2(sk-&gt;sk_prot-&gt;recvmsg, tcp_recvmsg, udp_recvmsg,</div><div class='add'>+			      sk, msg, size, flags, &amp;addr_len);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='ctx'> 		msg-&gt;msg_namelen = addr_len;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -863,9 +924,9 @@ int inet_shutdown(struct socket *sock, int how)</div><div class='ctx'> 		err = -ENOTCONN;</div><div class='ctx'> 		/* Hack to wake up other listeners, who can poll for</div><div class='ctx'> 		   EPOLLHUP, even on eg. unconnected UDP sockets -- RR */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		sk-&gt;sk_shutdown |= how;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_shutdown, sk-&gt;sk_shutdown | how);</div><div class='ctx'> 		if (sk-&gt;sk_prot-&gt;shutdown)</div><div class='ctx'> 			sk-&gt;sk_prot-&gt;shutdown(sk, how);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -877,7 +938,7 @@ int inet_shutdown(struct socket *sock, int how)</div><div class='ctx'> 	case TCP_LISTEN:</div><div class='ctx'> 		if (!(how &amp; RCV_SHUTDOWN))</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_SYN_SENT:</div><div class='ctx'> 		err = sk-&gt;sk_prot-&gt;disconnect(sk, O_NONBLOCK);</div><div class='ctx'> 		sock-&gt;state = err ? SS_DISCONNECTING : SS_UNCONNECTED;</div><div class='hunk'>@@ -911,12 +972,6 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	struct rtentry rt;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		err = sock_get_timestamp(sk, (struct timeval __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		err = sock_get_timestampns(sk, (struct timespec __user *)arg);</div><div class='del'>-		break;</div><div class='ctx'> 	case SIOCADDRT:</div><div class='ctx'> 	case SIOCDELRT:</div><div class='ctx'> 		if (copy_from_user(&amp;rt, p, sizeof(struct rtentry)))</div><div class='hunk'>@@ -936,10 +991,10 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case SIOCGIFNETMASK:</div><div class='ctx'> 	case SIOCGIFDSTADDR:</div><div class='ctx'> 	case SIOCGIFPFLAGS:</div><div class='del'>-		if (copy_from_user(&amp;ifr, p, sizeof(struct ifreq)))</div><div class='add'>+		if (get_user_ifreq(&amp;ifr, NULL, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		err = devinet_ioctl(net, cmd, &amp;ifr);</div><div class='del'>-		if (!err &amp;&amp; copy_to_user(p, &amp;ifr, sizeof(struct ifreq)))</div><div class='add'>+		if (!err &amp;&amp; put_user_ifreq(&amp;ifr, p))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -949,13 +1004,13 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case SIOCSIFDSTADDR:</div><div class='ctx'> 	case SIOCSIFPFLAGS:</div><div class='ctx'> 	case SIOCSIFFLAGS:</div><div class='del'>-		if (copy_from_user(&amp;ifr, p, sizeof(struct ifreq)))</div><div class='add'>+		if (get_user_ifreq(&amp;ifr, NULL, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		err = devinet_ioctl(net, cmd, &amp;ifr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (sk-&gt;sk_prot-&gt;ioctl)</div><div class='del'>-			err = sk-&gt;sk_prot-&gt;ioctl(sk, cmd, arg);</div><div class='add'>+			err = sk_ioctl(sk, cmd, (void __user *)arg);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -ENOIOCTLCMD;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -965,17 +1020,42 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> EXPORT_SYMBOL(inet_ioctl);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='add'>+static int inet_compat_routing_ioctl(struct sock *sk, unsigned int cmd,</div><div class='add'>+		struct compat_rtentry __user *ur)</div><div class='add'>+{</div><div class='add'>+	compat_uptr_t rtdev;</div><div class='add'>+	struct rtentry rt;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;rt.rt_dst, &amp;ur-&gt;rt_dst,</div><div class='add'>+			3 * sizeof(struct sockaddr)) ||</div><div class='add'>+	    get_user(rt.rt_flags, &amp;ur-&gt;rt_flags) ||</div><div class='add'>+	    get_user(rt.rt_metric, &amp;ur-&gt;rt_metric) ||</div><div class='add'>+	    get_user(rt.rt_mtu, &amp;ur-&gt;rt_mtu) ||</div><div class='add'>+	    get_user(rt.rt_window, &amp;ur-&gt;rt_window) ||</div><div class='add'>+	    get_user(rt.rt_irtt, &amp;ur-&gt;rt_irtt) ||</div><div class='add'>+	    get_user(rtdev, &amp;ur-&gt;rt_dev))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	rt.rt_dev = compat_ptr(rtdev);</div><div class='add'>+	return ip_rt_ioctl(sock_net(sk), cmd, &amp;rt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	int err = -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_prot-&gt;compat_ioctl)</div><div class='del'>-		err = sk-&gt;sk_prot-&gt;compat_ioctl(sk, cmd, arg);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+	case SIOCDELRT:</div><div class='add'>+		return inet_compat_routing_ioctl(sk, cmd, argp);</div><div class='add'>+	default:</div><div class='add'>+		if (!sk-&gt;sk_prot-&gt;compat_ioctl)</div><div class='add'>+			return -ENOIOCTLCMD;</div><div class='add'>+		return sk-&gt;sk_prot-&gt;compat_ioctl(sk, cmd, arg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_COMPAT */</div><div class='ctx'> </div><div class='ctx'> const struct proto_ops inet_stream_ops = {</div><div class='ctx'> 	.family		   = PF_INET,</div><div class='hunk'>@@ -988,6 +1068,7 @@ const struct proto_ops inet_stream_ops = {</div><div class='ctx'> 	.getname	   = inet_getname,</div><div class='ctx'> 	.poll		   = tcp_poll,</div><div class='ctx'> 	.ioctl		   = inet_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = inet_listen,</div><div class='ctx'> 	.shutdown	   = inet_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -997,15 +1078,14 @@ const struct proto_ops inet_stream_ops = {</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	.mmap		   = tcp_mmap,</div><div class='ctx'> #endif</div><div class='del'>-	.sendpage	   = inet_sendpage,</div><div class='add'>+	.splice_eof	   = inet_splice_eof,</div><div class='ctx'> 	.splice_read	   = tcp_splice_read,</div><div class='add'>+	.set_peek_off      = sk_set_peek_off,</div><div class='ctx'> 	.read_sock	   = tcp_read_sock,</div><div class='add'>+	.read_skb	   = tcp_read_skb,</div><div class='ctx'> 	.sendmsg_locked    = tcp_sendmsg_locked,</div><div class='del'>-	.sendpage_locked   = tcp_sendpage_locked,</div><div class='ctx'> 	.peek_len	   = tcp_peek_len,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='ctx'> 	.compat_ioctl	   = inet_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.set_rcvlowat	   = tcp_set_rcvlowat,</div><div class='hunk'>@@ -1023,18 +1103,18 @@ const struct proto_ops inet_dgram_ops = {</div><div class='ctx'> 	.getname	   = inet_getname,</div><div class='ctx'> 	.poll		   = udp_poll,</div><div class='ctx'> 	.ioctl		   = inet_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = inet_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='ctx'> 	.getsockopt	   = sock_common_getsockopt,</div><div class='ctx'> 	.sendmsg	   = inet_sendmsg,</div><div class='add'>+	.read_skb	   = udp_read_skb,</div><div class='ctx'> 	.recvmsg	   = inet_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = inet_sendpage,</div><div class='del'>-	.set_peek_off	   = sk_set_peek_off,</div><div class='add'>+	.splice_eof	   = inet_splice_eof,</div><div class='add'>+	.set_peek_off	   = udp_set_peek_off,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='ctx'> 	.compat_ioctl	   = inet_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -1055,6 +1135,7 @@ static const struct proto_ops inet_sockraw_ops = {</div><div class='ctx'> 	.getname	   = inet_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,</div><div class='ctx'> 	.ioctl		   = inet_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = inet_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -1062,10 +1143,8 @@ static const struct proto_ops inet_sockraw_ops = {</div><div class='ctx'> 	.sendmsg	   = inet_sendmsg,</div><div class='ctx'> 	.recvmsg	   = inet_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = inet_sendpage,</div><div class='add'>+	.splice_eof	   = inet_splice_eof,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='ctx'> 	.compat_ioctl	   = inet_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -1188,6 +1267,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	__be32 new_saddr;</div><div class='ctx'> 	struct ip_options_rcu *inet_opt;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	inet_opt = rcu_dereference_protected(inet-&gt;inet_opt,</div><div class='ctx'> 					     lockdep_sock_is_held(sk));</div><div class='hunk'>@@ -1196,26 +1276,32 @@ static int inet_sk_reselect_saddr(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	/* Query new route. */</div><div class='ctx'> 	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='del'>-	rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),</div><div class='del'>-			      sk-&gt;sk_bound_dev_if, sk-&gt;sk_protocol,</div><div class='del'>-			      inet-&gt;inet_sport, inet-&gt;inet_dport, sk);</div><div class='add'>+	rt = ip_route_connect(fl4, daddr, 0, sk-&gt;sk_bound_dev_if,</div><div class='add'>+			      sk-&gt;sk_protocol, inet-&gt;inet_sport,</div><div class='add'>+			      inet-&gt;inet_dport, sk);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return PTR_ERR(rt);</div><div class='ctx'> </div><div class='del'>-	sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='del'>-</div><div class='ctx'> 	new_saddr = fl4-&gt;saddr;</div><div class='ctx'> </div><div class='del'>-	if (new_saddr == old_saddr)</div><div class='add'>+	if (new_saddr == old_saddr) {</div><div class='add'>+		sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = inet_bhash2_update_saddr(sk, &amp;new_saddr, AF_INET);</div><div class='add'>+	if (err) {</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='ctx'> </div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_ip_dynaddr &gt; 1) {</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_ip_dynaddr) &gt; 1) {</div><div class='ctx'> 		pr_info("%s(): shifting inet-&gt;saddr from %pI4 to %pI4\n",</div><div class='ctx'> 			__func__, &amp;old_saddr, &amp;new_saddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inet-&gt;inet_saddr = inet-&gt;inet_rcv_saddr = new_saddr;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * XXX The only one ugly spot where we need to</div><div class='ctx'> 	 * XXX really change the sockets identity after</div><div class='hunk'>@@ -1229,10 +1315,8 @@ static int inet_sk_reselect_saddr(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> int inet_sk_rebuild_header(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	struct rtable *rt = dst_rtable(__sk_dst_check(sk, 0));</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0);</div><div class='del'>-	__be32 daddr;</div><div class='del'>-	struct ip_options_rcu *inet_opt;</div><div class='ctx'> 	struct flowi4 *fl4;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1241,17 +1325,9 @@ int inet_sk_rebuild_header(struct sock *sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Reroute. */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='del'>-	daddr = inet-&gt;inet_daddr;</div><div class='del'>-	if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='del'>-		daddr = inet_opt-&gt;opt.faddr;</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='del'>-	rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr, inet-&gt;inet_saddr,</div><div class='del'>-				   inet-&gt;inet_dport, inet-&gt;inet_sport,</div><div class='del'>-				   sk-&gt;sk_protocol, RT_CONN_FLAGS(sk),</div><div class='del'>-				   sk-&gt;sk_bound_dev_if);</div><div class='add'>+	inet_sk_init_flowi4(inet, fl4);</div><div class='add'>+	rt = ip_route_output_flow(sock_net(sk), fl4, sk);</div><div class='ctx'> 	if (!IS_ERR(rt)) {</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='hunk'>@@ -1260,15 +1336,12 @@ int inet_sk_rebuild_header(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 		/* Routing failed... */</div><div class='ctx'> 		sk-&gt;sk_route_caps = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * Other protocols have to map its equivalent state to TCP_SYN_SENT.</div><div class='del'>-		 * DCCP maps its DCCP_REQUESTING state to TCP_SYN_SENT. -acme</div><div class='del'>-		 */</div><div class='del'>-		if (!sock_net(sk)-&gt;ipv4.sysctl_ip_dynaddr ||</div><div class='add'>+</div><div class='add'>+		if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_ip_dynaddr) ||</div><div class='ctx'> 		    sk-&gt;sk_state != TCP_SYN_SENT ||</div><div class='ctx'> 		    (sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK) ||</div><div class='ctx'> 		    (err = inet_sk_reselect_saddr(sk)) != 0)</div><div class='del'>-			sk-&gt;sk_err_soft = -err;</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_err_soft, -err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1328,18 +1401,17 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	segs = ERR_PTR(-EPROTONOSUPPORT);</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;encapsulation || encap) {</div><div class='del'>-		udpfrag = !!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP);</div><div class='del'>-		fixedid = !!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TCP_FIXEDID);</div><div class='add'>+	fixedid = !!(skb_shinfo(skb)-&gt;gso_type &amp; (SKB_GSO_TCP_FIXEDID &lt;&lt; encap));</div><div class='ctx'> </div><div class='del'>-		/* fixed ID is invalid if DF bit is not set */</div><div class='del'>-		if (fixedid &amp;&amp; !(ip_hdr(skb)-&gt;frag_off &amp; htons(IP_DF)))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!skb-&gt;encapsulation || encap)</div><div class='add'>+		udpfrag = !!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP);</div><div class='ctx'> </div><div class='ctx'> 	ops = rcu_dereference(inet_offloads[proto]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment)) {</div><div class='ctx'> 		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+		if (!segs)</div><div class='add'>+			skb-&gt;network_header = skb_mac_header(skb) + nhoff - skb-&gt;head;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR_OR_NULL(segs))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1383,7 +1455,15 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb,</div><div class='ctx'> out:</div><div class='ctx'> 	return segs;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_gso_segment);</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ipip_gso_segment(struct sk_buff *skb,</div><div class='add'>+					netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_IPXIP4))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return inet_gso_segment(skb, features);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1393,42 +1473,35 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> 	unsigned int hlen;</div><div class='ctx'> 	unsigned int off;</div><div class='del'>-	unsigned int id;</div><div class='ctx'> 	int flush = 1;</div><div class='ctx'> 	int proto;</div><div class='ctx'> </div><div class='ctx'> 	off = skb_gro_offset(skb);</div><div class='ctx'> 	hlen = off + sizeof(*iph);</div><div class='del'>-	iph = skb_gro_header_fast(skb, off);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		iph = skb_gro_header_slow(skb, hlen, off);</div><div class='del'>-		if (unlikely(!iph))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	iph = skb_gro_header(skb, hlen, off);</div><div class='add'>+	if (unlikely(!iph))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	proto = iph-&gt;protocol;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(inet_offloads[proto]);</div><div class='ctx'> 	if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (*(u8 *)iph != 0x45)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (ip_is_fragment(iph))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ip_fast_csum((u8 *)iph, 5)))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	id = ntohl(*(__be32 *)&amp;iph-&gt;id);</div><div class='del'>-	flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id &amp; ~IP_DF));</div><div class='del'>-	id &gt;&gt;= 16;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;proto = proto;</div><div class='add'>+	flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (ntohl(*(__be32 *)&amp;iph-&gt;id) &amp; ~IP_DF));</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, head, list) {</div><div class='ctx'> 		struct iphdr *iph2;</div><div class='del'>-		u16 flush_id;</div><div class='ctx'> </div><div class='ctx'> 		if (!NAPI_GRO_CB(p)-&gt;same_flow)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1445,48 +1518,10 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> 			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* All fields must match except length and checksum. */</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;flush |=</div><div class='del'>-			(iph-&gt;ttl ^ iph2-&gt;ttl) |</div><div class='del'>-			(iph-&gt;tos ^ iph2-&gt;tos) |</div><div class='del'>-			((iph-&gt;frag_off ^ iph2-&gt;frag_off) &amp; htons(IP_DF));</div><div class='del'>-</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;flush |= flush;</div><div class='del'>-</div><div class='del'>-		/* We need to store of the IP ID check to be included later</div><div class='del'>-		 * when we can verify that this packet does in fact belong</div><div class='del'>-		 * to a given flow.</div><div class='del'>-		 */</div><div class='del'>-		flush_id = (u16)(id - ntohs(iph2-&gt;id));</div><div class='del'>-</div><div class='del'>-		/* This bit of code makes it much easier for us to identify</div><div class='del'>-		 * the cases where we are doing atomic vs non-atomic IP ID</div><div class='del'>-		 * checks.  Specifically an atomic check can return IP ID</div><div class='del'>-		 * values 0 - 0xFFFF, while a non-atomic check can only</div><div class='del'>-		 * return 0 or 0xFFFF.</div><div class='del'>-		 */</div><div class='del'>-		if (!NAPI_GRO_CB(p)-&gt;is_atomic ||</div><div class='del'>-		    !(iph-&gt;frag_off &amp; htons(IP_DF))) {</div><div class='del'>-			flush_id ^= NAPI_GRO_CB(p)-&gt;count;</div><div class='del'>-			flush_id = flush_id ? 0xFFFF : 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If the previous IP ID value was based on an atomic</div><div class='del'>-		 * datagram we can overwrite the value and ignore it.</div><div class='del'>-		 */</div><div class='del'>-		if (NAPI_GRO_CB(skb)-&gt;is_atomic)</div><div class='del'>-			NAPI_GRO_CB(p)-&gt;flush_id = flush_id;</div><div class='del'>-		else</div><div class='del'>-			NAPI_GRO_CB(p)-&gt;flush_id |= flush_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;is_atomic = !!(iph-&gt;frag_off &amp; htons(IP_DF));</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;flush |= flush;</div><div class='del'>-	skb_set_network_header(skb, off);</div><div class='del'>-	/* The above will be needed by the transport layer if there is one</div><div class='del'>-	 * immediately following this IP hdr.</div><div class='del'>-	 */</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;network_offsets[NAPI_GRO_CB(skb)-&gt;encap_mark] = off;</div><div class='ctx'> </div><div class='ctx'> 	/* Note : No need to call skb_gro_postpull_rcsum() here,</div><div class='ctx'> 	 * as we already checked checksum over ipv4 header was 0</div><div class='hunk'>@@ -1494,17 +1529,14 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> 	skb_gro_pull(skb, sizeof(*iph));</div><div class='ctx'> 	skb_set_transport_header(skb, skb_gro_offset(skb));</div><div class='ctx'> </div><div class='del'>-	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	pp = indirect_call_gro_receive(tcp4_gro_receive, udp4_gro_receive,</div><div class='add'>+				       ops-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final(skb, pp, flush);</div><div class='ctx'> </div><div class='ctx'> 	return pp;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_gro_receive);</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *ipip_gro_receive(struct list_head *head,</div><div class='ctx'> 					struct sk_buff *skb)</div><div class='hunk'>@@ -1547,20 +1579,23 @@ EXPORT_SYMBOL(inet_current_timestamp);</div><div class='ctx'> </div><div class='ctx'> int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)</div><div class='ctx'> {</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET)</div><div class='add'>+	unsigned int family = READ_ONCE(sk-&gt;sk_family);</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET)</div><div class='ctx'> 		return ip_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+	if (family == AF_INET6)</div><div class='ctx'> 		return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> #endif</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(inet_recv_error);</div><div class='ctx'> </div><div class='ctx'> int inet_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='del'>-	__be16 newlen = htons(skb-&gt;len - nhoff);</div><div class='ctx'> 	struct iphdr *iph = (struct iphdr *)(skb-&gt;data + nhoff);</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='add'>+	__be16 totlen = iph-&gt;tot_len;</div><div class='ctx'> 	int proto = iph-&gt;protocol;</div><div class='ctx'> 	int err = -ENOSYS;</div><div class='ctx'> </div><div class='hunk'>@@ -1569,26 +1604,24 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> 		skb_set_inner_network_header(skb, nhoff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	csum_replace2(&amp;iph-&gt;check, iph-&gt;tot_len, newlen);</div><div class='del'>-	iph-&gt;tot_len = newlen;</div><div class='add'>+	iph_set_totlen(iph, skb-&gt;len - nhoff);</div><div class='add'>+	csum_replace2(&amp;iph-&gt;check, totlen, iph-&gt;tot_len);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ops = rcu_dereference(inet_offloads[proto]);</div><div class='ctx'> 	if (WARN_ON(!ops || !ops-&gt;callbacks.gro_complete))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Only need to add sizeof(*iph) to get to the next hdr below</div><div class='ctx'> 	 * because any hdr with option will have been flushed in</div><div class='ctx'> 	 * inet_gro_receive().</div><div class='ctx'> 	 */</div><div class='del'>-	err = ops-&gt;callbacks.gro_complete(skb, nhoff + sizeof(*iph));</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	err = INDIRECT_CALL_2(ops-&gt;callbacks.gro_complete,</div><div class='add'>+			      tcp4_gro_complete, udp4_gro_complete,</div><div class='add'>+			      skb, nhoff + sizeof(*iph));</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_gro_complete);</div><div class='ctx'> </div><div class='ctx'> static int ipip_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='hunk'>@@ -1607,6 +1640,7 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		*sk = sock-&gt;sk;</div><div class='ctx'> 		(*sk)-&gt;sk_allocation = GFP_ATOMIC;</div><div class='add'>+		(*sk)-&gt;sk_use_task_frag = false;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Unhash it so that IP input processing does not even see it,</div><div class='ctx'> 		 * we do not wish this socket to see incoming packets.</div><div class='hunk'>@@ -1617,12 +1651,6 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_ctl_sock_create);</div><div class='ctx'> </div><div class='del'>-u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offt)</div><div class='del'>-{</div><div class='del'>-	return  *(((unsigned long *)per_cpu_ptr(mib, cpu)) + offt);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(snmp_get_cpu_field);</div><div class='del'>-</div><div class='ctx'> unsigned long snmp_fold_field(void __percpu *mib, int offt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long res = 0;</div><div class='hunk'>@@ -1647,9 +1675,9 @@ u64 snmp_get_cpu_field64(void __percpu *mib, int cpu, int offt,</div><div class='ctx'> 	bhptr = per_cpu_ptr(mib, cpu);</div><div class='ctx'> 	syncp = (struct u64_stats_sync *)(bhptr + syncp_offset);</div><div class='ctx'> 	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(syncp);</div><div class='ctx'> 		v = *(((u64 *)bhptr) + offt);</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(syncp, start));</div><div class='add'>+	} while (u64_stats_fetch_retry(syncp, start));</div><div class='ctx'> </div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='hunk'>@@ -1671,40 +1699,13 @@ EXPORT_SYMBOL_GPL(snmp_fold_field64);</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> static const struct net_protocol igmp_protocol = {</div><div class='ctx'> 	.handler =	igmp_rcv,</div><div class='del'>-	.netns_ok =	1,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* thinking of making this const? Don't.</div><div class='del'>- * early_demux can change based on sysctl.</div><div class='del'>- */</div><div class='del'>-static struct net_protocol tcp_protocol = {</div><div class='del'>-	.early_demux	=	tcp_v4_early_demux,</div><div class='del'>-	.early_demux_handler =  tcp_v4_early_demux,</div><div class='del'>-	.handler	=	tcp_v4_rcv,</div><div class='del'>-	.err_handler	=	tcp_v4_err,</div><div class='del'>-	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='del'>-	.icmp_strict_tag_validation = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* thinking of making this const? Don't.</div><div class='del'>- * early_demux can change based on sysctl.</div><div class='del'>- */</div><div class='del'>-static struct net_protocol udp_protocol = {</div><div class='del'>-	.early_demux =	udp_v4_early_demux,</div><div class='del'>-	.early_demux_handler =	udp_v4_early_demux,</div><div class='del'>-	.handler =	udp_rcv,</div><div class='del'>-	.err_handler =	udp_err,</div><div class='del'>-	.no_policy =	1,</div><div class='del'>-	.netns_ok =	1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct net_protocol icmp_protocol = {</div><div class='ctx'> 	.handler =	icmp_rcv,</div><div class='ctx'> 	.err_handler =	icmp_err,</div><div class='ctx'> 	.no_policy =	1,</div><div class='del'>-	.netns_ok =	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __net_init int ipv4_mib_init_net(struct net *net)</div><div class='hunk'>@@ -1769,6 +1770,10 @@ static __net_exit void ipv4_mib_exit_net(struct net *net)</div><div class='ctx'> 	free_percpu(net-&gt;mib.net_statistics);</div><div class='ctx'> 	free_percpu(net-&gt;mib.ip_statistics);</div><div class='ctx'> 	free_percpu(net-&gt;mib.tcp_statistics);</div><div class='add'>+#ifdef CONFIG_MPTCP</div><div class='add'>+	/* allocated on demand, see mptcp_init_sock() */</div><div class='add'>+	free_percpu(net-&gt;mib.mptcp_statistics);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __net_initdata struct pernet_operations ipv4_mib_ops = {</div><div class='hunk'>@@ -1786,9 +1791,7 @@ static __net_init int inet_init_net(struct net *net)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set defaults for local port range</div><div class='ctx'> 	 */</div><div class='del'>-	seqlock_init(&amp;net-&gt;ipv4.ip_local_ports.lock);</div><div class='del'>-	net-&gt;ipv4.ip_local_ports.range[0] =  32768;</div><div class='del'>-	net-&gt;ipv4.ip_local_ports.range[1] =  60999;</div><div class='add'>+	net-&gt;ipv4.ip_local_ports.range = 60999u &lt;&lt; 16 | 32768u;</div><div class='ctx'> </div><div class='ctx'> 	seqlock_init(&amp;net-&gt;ipv4.ping_group_range.lock);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1807,6 +1810,7 @@ static __net_init int inet_init_net(struct net *net)</div><div class='ctx'> 	net-&gt;ipv4.sysctl_ip_early_demux = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_udp_early_demux = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_early_demux = 1;</div><div class='add'>+	net-&gt;ipv4.sysctl_nexthop_compat_mode = 1;</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> 	net-&gt;ipv4.sysctl_ip_prot_sock = PROT_SOCK;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1818,16 +1822,13 @@ static __net_init int inet_init_net(struct net *net)</div><div class='ctx'> 	net-&gt;ipv4.sysctl_igmp_llm_reports = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_igmp_qrv = 2;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	net-&gt;ipv4.sysctl_fib_notify_on_flag_change = 0;</div><div class='ctx'> </div><div class='del'>-static __net_exit void inet_exit_net(struct net *net)</div><div class='del'>-{</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __net_initdata struct pernet_operations af_inet_ops = {</div><div class='ctx'> 	.init = inet_init_net,</div><div class='del'>-	.exit = inet_exit_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init_inet_pernet_ops(void)</div><div class='hunk'>@@ -1841,18 +1842,10 @@ static int ipv4_proc_init(void);</div><div class='ctx'>  *	IP protocol layer initialiser</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct packet_offload ip_packet_offload __read_mostly = {</div><div class='del'>-	.type = cpu_to_be16(ETH_P_IP),</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment = inet_gso_segment,</div><div class='del'>-		.gro_receive = inet_gro_receive,</div><div class='del'>-		.gro_complete = inet_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static const struct net_offload ipip_offload = {</div><div class='ctx'> 	.callbacks = {</div><div class='del'>-		.gso_segment	= inet_gso_segment,</div><div class='add'>+		.gso_segment	= ipip_gso_segment,</div><div class='ctx'> 		.gro_receive	= ipip_gro_receive,</div><div class='ctx'> 		.gro_complete	= ipip_gro_complete,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1875,7 +1868,15 @@ static int __init ipv4_offload_init(void)</div><div class='ctx'> 	if (ipip_offload_init() &lt; 0)</div><div class='ctx'> 		pr_crit("%s: Cannot add IPIP protocol offload\n", __func__);</div><div class='ctx'> </div><div class='del'>-	dev_add_offload(&amp;ip_packet_offload);</div><div class='add'>+	net_hotdata.ip_packet_offload = (struct packet_offload) {</div><div class='add'>+		.type = cpu_to_be16(ETH_P_IP),</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment = inet_gso_segment,</div><div class='add'>+			.gro_receive = inet_gro_receive,</div><div class='add'>+			.gro_complete = inet_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	dev_add_offload(&amp;net_hotdata.ip_packet_offload);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1891,10 +1892,12 @@ static int __init inet_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_protosw *q;</div><div class='ctx'> 	struct list_head *r;</div><div class='del'>-	int rc = -EINVAL;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	sock_skb_cb_check_size(sizeof(struct inet_skb_parm));</div><div class='ctx'> </div><div class='add'>+	raw_hashinfo_init(&amp;raw_v4_hashinfo);</div><div class='add'>+</div><div class='ctx'> 	rc = proto_register(&amp;tcp_prot, 1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1927,9 +1930,22 @@ static int __init inet_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (inet_add_protocol(&amp;icmp_protocol, IPPROTO_ICMP) &lt; 0)</div><div class='ctx'> 		pr_crit("%s: Cannot add ICMP protocol\n", __func__);</div><div class='del'>-	if (inet_add_protocol(&amp;udp_protocol, IPPROTO_UDP) &lt; 0)</div><div class='add'>+</div><div class='add'>+	net_hotdata.udp_protocol = (struct net_protocol) {</div><div class='add'>+		.handler =	udp_rcv,</div><div class='add'>+		.err_handler =	udp_err,</div><div class='add'>+		.no_policy =	1,</div><div class='add'>+	};</div><div class='add'>+	if (inet_add_protocol(&amp;net_hotdata.udp_protocol, IPPROTO_UDP) &lt; 0)</div><div class='ctx'> 		pr_crit("%s: Cannot add UDP protocol\n", __func__);</div><div class='del'>-	if (inet_add_protocol(&amp;tcp_protocol, IPPROTO_TCP) &lt; 0)</div><div class='add'>+</div><div class='add'>+	net_hotdata.tcp_protocol = (struct net_protocol) {</div><div class='add'>+		.handler	=	tcp_v4_rcv,</div><div class='add'>+		.err_handler	=	tcp_v4_err,</div><div class='add'>+		.no_policy	=	1,</div><div class='add'>+		.icmp_strict_tag_validation = 1,</div><div class='add'>+	};</div><div class='add'>+	if (inet_add_protocol(&amp;net_hotdata.tcp_protocol, IPPROTO_TCP) &lt; 0)</div><div class='ctx'> 		pr_crit("%s: Cannot add TCP protocol\n", __func__);</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 	if (inet_add_protocol(&amp;igmp_protocol, IPPROTO_IGMP) &lt; 0)</div><div class='hunk'>@@ -1955,6 +1971,10 @@ static int __init inet_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ip_init();</div><div class='ctx'> </div><div class='add'>+	/* Initialise per-cpu ipv4 mibs */</div><div class='add'>+	if (init_ipv4_mibs())</div><div class='add'>+		panic("%s: Cannot init ipv4 mibs\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	/* Setup TCP slab cache for open requests. */</div><div class='ctx'> 	tcp_init();</div><div class='ctx'> </div><div class='hunk'>@@ -1964,6 +1984,8 @@ static int __init inet_init(void)</div><div class='ctx'> 	/* Add UDP-Lite (RFC 3828) */</div><div class='ctx'> 	udplite4_register();</div><div class='ctx'> </div><div class='add'>+	raw_init();</div><div class='add'>+</div><div class='ctx'> 	ping_init();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1983,12 +2005,6 @@ static int __init inet_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (init_inet_pernet_ops())</div><div class='ctx'> 		pr_crit("%s: Cannot init ipv4 inet pernet ops\n", __func__);</div><div class='del'>-	/*</div><div class='del'>-	 *	Initialise per-cpu ipv4 mibs</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (init_ipv4_mibs())</div><div class='del'>-		pr_crit("%s: Cannot init ipv4 mibs\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ipv4_proc_init();</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c<br/>index 4dd95cdd8070..64aec3dff8ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ah4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ah4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ah4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ah4.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #define pr_fmt(fmt) "IPsec: " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/utils.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -26,9 +27,7 @@ static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> </div><div class='del'>-	len = size + crypto_ahash_digestsize(ahash) +</div><div class='del'>-	      (crypto_ahash_alignmask(ahash) &amp;</div><div class='del'>-	       ~(crypto_tfm_ctx_alignment() - 1));</div><div class='add'>+	len = size + crypto_ahash_digestsize(ahash);</div><div class='ctx'> </div><div class='ctx'> 	len = ALIGN(len, crypto_tfm_ctx_alignment());</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +44,9 @@ static inline u8 *ah_tmp_auth(void *tmp, unsigned int offset)</div><div class='ctx'> 	return tmp + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 *ah_tmp_icv(struct crypto_ahash *ahash, void *tmp,</div><div class='del'>-			     unsigned int offset)</div><div class='add'>+static inline u8 *ah_tmp_icv(void *tmp, unsigned int offset)</div><div class='ctx'> {</div><div class='del'>-	return PTR_ALIGN((u8 *)tmp + offset, crypto_ahash_alignmask(ahash) + 1);</div><div class='add'>+	return tmp + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ahash_request *ah_tmp_req(struct crypto_ahash *ahash,</div><div class='hunk'>@@ -106,7 +104,7 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)</div><div class='ctx'> 			if (optlen &lt; 6)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			memcpy(daddr, optptr+optlen-4, 4);</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		default:</div><div class='ctx'> 			memset(optptr, 0, optlen);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -116,11 +114,11 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ah_output_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void ah_output_done(void *data, int err)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *icv;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_state *x = skb_dst(skb)-&gt;xfrm;</div><div class='ctx'> 	struct ah_data *ahp = x-&gt;data;</div><div class='ctx'> 	struct iphdr *top_iph = ip_hdr(skb);</div><div class='hunk'>@@ -128,7 +126,7 @@ static void ah_output_done(struct crypto_async_request *base, int err)</div><div class='ctx'> 	int ihl = ip_hdrlen(skb);</div><div class='ctx'> </div><div class='ctx'> 	iph = AH_SKB_CB(skb)-&gt;tmp;</div><div class='del'>-	icv = ah_tmp_icv(ahp-&gt;ahash, iph, ihl);</div><div class='add'>+	icv = ah_tmp_icv(iph, ihl);</div><div class='ctx'> 	memcpy(ah-&gt;auth_data, icv, ahp-&gt;icv_trunc_len);</div><div class='ctx'> </div><div class='ctx'> 	top_iph-&gt;tos = iph-&gt;tos;</div><div class='hunk'>@@ -140,7 +138,7 @@ static void ah_output_done(struct crypto_async_request *base, int err)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(AH_SKB_CB(skb)-&gt;tmp);</div><div class='del'>-	xfrm_output_resume(skb, err);</div><div class='add'>+	xfrm_output_resume(skb-&gt;sk, skb, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ah_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -181,7 +179,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	if (!iph)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	seqhi = (__be32 *)((char *)iph + ihl);</div><div class='del'>-	icv = ah_tmp_icv(ahash, seqhi, seqhi_len);</div><div class='add'>+	icv = ah_tmp_icv(seqhi, seqhi_len);</div><div class='ctx'> 	req = ah_tmp_req(ahash, icv);</div><div class='ctx'> 	sg = ah_req_sg(ahash, req);</div><div class='ctx'> 	seqhisg = sg + nfrags;</div><div class='hunk'>@@ -261,12 +259,12 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ah_input_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void ah_input_done(void *data, int err)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *auth_data;</div><div class='ctx'> 	u8 *icv;</div><div class='ctx'> 	struct iphdr *work_iph;</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='ctx'> 	struct ah_data *ahp = x-&gt;data;</div><div class='ctx'> 	struct ip_auth_hdr *ah = ip_auth_hdr(skb);</div><div class='hunk'>@@ -278,7 +276,7 @@ static void ah_input_done(struct crypto_async_request *base, int err)</div><div class='ctx'> </div><div class='ctx'> 	work_iph = AH_SKB_CB(skb)-&gt;tmp;</div><div class='ctx'> 	auth_data = ah_tmp_auth(work_iph, ihl);</div><div class='del'>-	icv = ah_tmp_icv(ahp-&gt;ahash, auth_data, ahp-&gt;icv_trunc_len);</div><div class='add'>+	icv = ah_tmp_icv(auth_data, ahp-&gt;icv_trunc_len);</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_memneq(icv, auth_data, ahp-&gt;icv_trunc_len) ? -EBADMSG : 0;</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -373,7 +371,7 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	seqhi = (__be32 *)((char *)work_iph + ihl);</div><div class='ctx'> 	auth_data = ah_tmp_auth(seqhi, seqhi_len);</div><div class='del'>-	icv = ah_tmp_icv(ahash, auth_data, ahp-&gt;icv_trunc_len);</div><div class='add'>+	icv = ah_tmp_icv(auth_data, ahp-&gt;icv_trunc_len);</div><div class='ctx'> 	req = ah_tmp_req(ahash, icv);</div><div class='ctx'> 	sg = ah_req_sg(ahash, req);</div><div class='ctx'> 	seqhisg = sg + nfrags;</div><div class='hunk'>@@ -449,6 +447,7 @@ static int ah4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		if (icmp_hdr(skb)-&gt;code != ICMP_FRAG_NEEDED)</div><div class='ctx'> 			return 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -461,38 +460,46 @@ static int ah4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (icmp_hdr(skb)-&gt;type == ICMP_DEST_UNREACH)</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, 0, IPPROTO_AH);</div><div class='ctx'> 	else</div><div class='del'>-		ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0);</div><div class='add'>+		ipv4_redirect(skb, net, 0, IPPROTO_AH);</div><div class='ctx'> 	xfrm_state_put(x);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ah_init_state(struct xfrm_state *x)</div><div class='add'>+static int ah_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ah_data *ahp = NULL;</div><div class='ctx'> 	struct xfrm_algo_desc *aalg_desc;</div><div class='ctx'> 	struct crypto_ahash *ahash;</div><div class='ctx'> </div><div class='del'>-	if (!x-&gt;aalg)</div><div class='add'>+	if (!x-&gt;aalg) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "AH requires a state with an AUTH algorithm");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;encap)</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "AH is not compatible with encapsulation");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ahp = kzalloc(sizeof(*ahp), GFP_KERNEL);</div><div class='ctx'> 	if (!ahp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ahash = crypto_alloc_ahash(x-&gt;aalg-&gt;alg_name, 0, 0);</div><div class='del'>-	if (IS_ERR(ahash))</div><div class='add'>+	if (IS_ERR(ahash)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ahp-&gt;ahash = ahash;</div><div class='ctx'> 	if (crypto_ahash_setkey(ahash, x-&gt;aalg-&gt;alg_key,</div><div class='del'>-				(x-&gt;aalg-&gt;alg_key_len + 7) / 8))</div><div class='add'>+				(x-&gt;aalg-&gt;alg_key_len + 7) / 8)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lookup the algorithm description maintained by xfrm_algo,</div><div class='hunk'>@@ -505,10 +512,7 @@ static int ah_init_state(struct xfrm_state *x)</div><div class='ctx'> </div><div class='ctx'> 	if (aalg_desc-&gt;uinfo.auth.icv_fullbits/8 !=</div><div class='ctx'> 	    crypto_ahash_digestsize(ahash)) {</div><div class='del'>-		pr_info("%s: %s digestsize %u != %hu\n",</div><div class='del'>-			__func__, x-&gt;aalg-&gt;alg_name,</div><div class='del'>-			crypto_ahash_digestsize(ahash),</div><div class='del'>-			aalg_desc-&gt;uinfo.auth.icv_fullbits / 8);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -553,7 +557,6 @@ static int ah4_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type ah_type =</div><div class='ctx'> {</div><div class='del'>-	.description	= "AH4",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_AH,</div><div class='ctx'> 	.flags		= XFRM_TYPE_REPLAY_PROT,</div><div class='hunk'>@@ -589,11 +592,11 @@ static void __exit ah4_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfrm4_protocol_deregister(&amp;ah4_protocol, IPPROTO_AH) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;ah_type, AF_INET) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;ah_type, AF_INET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ah4_init);</div><div class='ctx'> module_exit(ah4_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv4 AH transformation library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_AH);</div><div class='head'>diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c<br/>index e90c89ef8c08..7f3863daaa40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/arp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/arp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/arp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/arp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* linux/net/ipv4/arp.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994 by Florian  La Roche</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  * high-level addresses) into a low-level hardware address (like an Ethernet</div><div class='ctx'>  * address).</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Fixes:</div><div class='ctx'>  *		Alan Cox	:	Removed the Ethernet assumptions in</div><div class='ctx'>  *					Florian's code</div><div class='hunk'>@@ -129,6 +125,7 @@ static int arp_constructor(struct neighbour *neigh);</div><div class='ctx'> static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb);</div><div class='ctx'> static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb);</div><div class='ctx'> static void parp_redo(struct sk_buff *skb);</div><div class='add'>+static int arp_is_multicast(const void *pkey);</div><div class='ctx'> </div><div class='ctx'> static const struct neigh_ops arp_generic_ops = {</div><div class='ctx'> 	.family =		AF_INET,</div><div class='hunk'>@@ -160,6 +157,7 @@ struct neigh_table arp_tbl = {</div><div class='ctx'> 	.key_eq		= arp_key_eq,</div><div class='ctx'> 	.constructor	= arp_constructor,</div><div class='ctx'> 	.proxy_redo	= parp_redo,</div><div class='add'>+	.is_multicast	= arp_is_multicast,</div><div class='ctx'> 	.id		= "arp_cache",</div><div class='ctx'> 	.parms		= {</div><div class='ctx'> 		.tbl			= &amp;arp_tbl,</div><div class='hunk'>@@ -170,8 +168,9 @@ struct neigh_table arp_tbl = {</div><div class='ctx'> 			[NEIGH_VAR_RETRANS_TIME] = 1 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_BASE_REACHABLE_TIME] = 30 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ,</div><div class='add'>+			[NEIGH_VAR_INTERVAL_PROBE_TIME_MS] = 5 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_GC_STALETIME] = 60 * HZ,</div><div class='del'>-			[NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX,</div><div class='add'>+			[NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_DEFAULT,</div><div class='ctx'> 			[NEIGH_VAR_PROXY_QLEN] = 64,</div><div class='ctx'> 			[NEIGH_VAR_ANYCAST_DELAY] = 1 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_PROXY_DELAY]	= (8 * HZ) / 10,</div><div class='hunk'>@@ -295,7 +294,7 @@ static int arp_constructor(struct neighbour *neigh)</div><div class='ctx'> static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_FAILED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Create and send an arp packet. */</div><div class='hunk'>@@ -376,7 +375,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	probes -= NEIGH_VAR(neigh-&gt;parms, UCAST_PROBES);</div><div class='ctx'> 	if (probes &lt; 0) {</div><div class='del'>-		if (!(neigh-&gt;nud_state &amp; NUD_VALID))</div><div class='add'>+		if (!(READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID))</div><div class='ctx'> 			pr_debug("trying to ucast probe in NUD_INVALID\n");</div><div class='ctx'> 		neigh_ha_snapshot(dst_ha, neigh, dev);</div><div class='ctx'> 		dst_hw = dst_ha;</div><div class='hunk'>@@ -430,6 +429,26 @@ static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)</div><div class='ctx'> 	return !inet_confirm_addr(net, in_dev, sip, tip, scope);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int arp_accept(struct in_device *in_dev, __be32 sip)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='add'>+	int scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+	switch (IN_DEV_ARP_ACCEPT(in_dev)) {</div><div class='add'>+	case 0: /* Don't create new entries from garp */</div><div class='add'>+		return 0;</div><div class='add'>+	case 1: /* Create new entries from garp */</div><div class='add'>+		return 1;</div><div class='add'>+	case 2: /* Create a neighbor in the arp table only if sip</div><div class='add'>+		 * is in the same subnet as an address configured</div><div class='add'>+		 * on the interface that received the garp message</div><div class='add'>+		 */</div><div class='add'>+		return !!inet_confirm_addr(net, in_dev, sip, 0, scope);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt;</div><div class='hunk'>@@ -437,7 +456,8 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)</div><div class='ctx'> 	/*unsigned long now; */</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-	rt = ip_route_output(net, sip, tip, 0, l3mdev_master_ifindex_rcu(dev));</div><div class='add'>+	rt = ip_route_output(net, sip, tip, 0, l3mdev_master_ifindex_rcu(dev),</div><div class='add'>+			     RT_SCOPE_UNIVERSE);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (rt-&gt;dst.dev != dev) {</div><div class='hunk'>@@ -639,10 +659,12 @@ static int arp_xmit_finish(struct net *net, struct sock *sk, struct sk_buff *skb</div><div class='ctx'>  */</div><div class='ctx'> void arp_xmit(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	/* Send it off, maybe filter it using firewalling first.  */</div><div class='ctx'> 	NF_HOOK(NFPROTO_ARP, NF_ARP_OUT,</div><div class='del'>-		dev_net(skb-&gt;dev), NULL, skb, NULL, skb-&gt;dev,</div><div class='add'>+		dev_net_rcu(skb-&gt;dev), NULL, skb, NULL, skb-&gt;dev,</div><div class='ctx'> 		arp_xmit_finish);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(arp_xmit);</div><div class='ctx'> </div><div class='hunk'>@@ -842,7 +864,7 @@ static int arp_process(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			    (arp_fwd_proxy(in_dev, dev, rt) ||</div><div class='ctx'> 			     arp_fwd_pvlan(in_dev, dev, rt, sip, tip) ||</div><div class='ctx'> 			     (rt-&gt;dst.dev != dev &amp;&amp;</div><div class='del'>-			      pneigh_lookup(&amp;arp_tbl, net, &amp;tip, dev, 0)))) {</div><div class='add'>+			      pneigh_lookup(&amp;arp_tbl, net, &amp;tip, dev)))) {</div><div class='ctx'> 				n = neigh_event_ns(&amp;arp_tbl, sha, &amp;sip, dev);</div><div class='ctx'> 				if (n)</div><div class='ctx'> 					neigh_release(n);</div><div class='hunk'>@@ -869,12 +891,12 @@ static int arp_process(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	n = __neigh_lookup(&amp;arp_tbl, &amp;sip, dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	addr_type = -1;</div><div class='del'>-	if (n || IN_DEV_ARP_ACCEPT(in_dev)) {</div><div class='add'>+	if (n || arp_accept(in_dev, sip)) {</div><div class='ctx'> 		is_garp = arp_is_garp(net, dev, &amp;addr_type, arp-&gt;ar_op,</div><div class='ctx'> 				      sip, tip, sha, tha);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IN_DEV_ARP_ACCEPT(in_dev)) {</div><div class='add'>+	if (arp_accept(in_dev, sip)) {</div><div class='ctx'> 		/* Unsolicited ARP is not accepted by default.</div><div class='ctx'> 		   It is possible, that this option should be enabled for some</div><div class='ctx'> 		   devices (strip is candidate)</div><div class='hunk'>@@ -932,6 +954,10 @@ static void parp_redo(struct sk_buff *skb)</div><div class='ctx'> 	arp_process(dev_net(skb-&gt;dev), NULL, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int arp_is_multicast(const void *pkey)</div><div class='add'>+{</div><div class='add'>+	return ipv4_is_multicast(*((__be32 *)pkey));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Receive an arp request from the device layer.</div><div class='hunk'>@@ -940,6 +966,7 @@ static void parp_redo(struct sk_buff *skb)</div><div class='ctx'> static int arp_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		   struct packet_type *pt, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason drop_reason;</div><div class='ctx'> 	const struct arphdr *arp;</div><div class='ctx'> </div><div class='ctx'> 	/* do not tweak dropwatch on an ARP we will ignore */</div><div class='hunk'>@@ -953,12 +980,15 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		goto out_of_mem;</div><div class='ctx'> </div><div class='ctx'> 	/* ARP header, plus 2 device addresses, plus 2 IP addresses.  */</div><div class='del'>-	if (!pskb_may_pull(skb, arp_hdr_len(dev)))</div><div class='add'>+	drop_reason = pskb_may_pull_reason(skb, arp_hdr_len(dev));</div><div class='add'>+	if (drop_reason != SKB_NOT_DROPPED_YET)</div><div class='ctx'> 		goto freeskb;</div><div class='ctx'> </div><div class='ctx'> 	arp = arp_hdr(skb);</div><div class='del'>-	if (arp-&gt;ar_hln != dev-&gt;addr_len || arp-&gt;ar_pln != 4)</div><div class='add'>+	if (arp-&gt;ar_hln != dev-&gt;addr_len || arp-&gt;ar_pln != 4) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 		goto freeskb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));</div><div class='ctx'> </div><div class='hunk'>@@ -970,7 +1000,7 @@ consumeskb:</div><div class='ctx'> 	consume_skb(skb);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> freeskb:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, drop_reason);</div><div class='ctx'> out_of_mem:</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> }</div><div class='hunk'>@@ -979,6 +1009,55 @@ out_of_mem:</div><div class='ctx'>  *	User level interface (ioctl)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static struct net_device *arp_req_dev_by_name(struct net *net, struct arpreq *r,</div><div class='add'>+					      bool getarp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	if (getarp)</div><div class='add'>+		dev = dev_get_by_name_rcu(net, r-&gt;arp_dev);</div><div class='add'>+	else</div><div class='add'>+		dev = __dev_get_by_name(net, r-&gt;arp_dev);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	/* Mmmm... It is wrong... ARPHRD_NETROM == 0 */</div><div class='add'>+	if (!r-&gt;arp_ha.sa_family)</div><div class='add'>+		r-&gt;arp_ha.sa_family = dev-&gt;type;</div><div class='add'>+</div><div class='add'>+	if ((r-&gt;arp_flags &amp; ATF_COM) &amp;&amp; r-&gt;arp_ha.sa_family != dev-&gt;type)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *arp_req_dev(struct net *net, struct arpreq *r)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	__be32 ip;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;arp_dev[0])</div><div class='add'>+		return arp_req_dev_by_name(net, r, false);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;arp_flags &amp; ATF_PUBL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='add'>+</div><div class='add'>+	rt = ip_route_output(net, ip, 0, 0, 0, RT_SCOPE_LINK);</div><div class='add'>+	if (IS_ERR(rt))</div><div class='add'>+		return ERR_CAST(rt);</div><div class='add'>+</div><div class='add'>+	dev = rt-&gt;dst.dev;</div><div class='add'>+	ip_rt_put(rt);</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Set (create) an ARP cache entry.</div><div class='ctx'>  */</div><div class='hunk'>@@ -989,8 +1068,8 @@ static int arp_req_set_proxy(struct net *net, struct net_device *dev, int on)</div><div class='ctx'> 		IPV4_DEVCONF_ALL(net, PROXY_ARP) = on;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (__in_dev_get_rtnl(dev)) {</div><div class='del'>-		IN_DEV_CONF_SET(__in_dev_get_rtnl(dev), PROXY_ARP, on);</div><div class='add'>+	if (__in_dev_get_rtnl_net(dev)) {</div><div class='add'>+		IN_DEV_CONF_SET(__in_dev_get_rtnl_net(dev), PROXY_ARP, on);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENXIO;</div><div class='hunk'>@@ -999,49 +1078,37 @@ static int arp_req_set_proxy(struct net *net, struct net_device *dev, int on)</div><div class='ctx'> static int arp_req_set_public(struct net *net, struct arpreq *r,</div><div class='ctx'> 		struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	__be32 ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='ctx'> 	__be32 mask = ((struct sockaddr_in *)&amp;r-&gt;arp_netmask)-&gt;sin_addr.s_addr;</div><div class='ctx'> </div><div class='del'>-	if (mask &amp;&amp; mask != htonl(0xFFFFFFFF))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (!dev &amp;&amp; (r-&gt;arp_flags &amp; ATF_COM)) {</div><div class='del'>-		dev = dev_getbyhwaddr_rcu(net, r-&gt;arp_ha.sa_family,</div><div class='add'>+		dev = dev_getbyhwaddr(net, r-&gt;arp_ha.sa_family,</div><div class='ctx'> 				      r-&gt;arp_ha.sa_data);</div><div class='ctx'> 		if (!dev)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mask) {</div><div class='del'>-		if (!pneigh_lookup(&amp;arp_tbl, net, &amp;ip, dev, 1))</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		return 0;</div><div class='add'>+		__be32 ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='add'>+</div><div class='add'>+		return pneigh_create(&amp;arp_tbl, net, &amp;ip, dev, 0, 0, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return arp_req_set_proxy(net, dev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int arp_req_set(struct net *net, struct arpreq *r,</div><div class='del'>-		       struct net_device *dev)</div><div class='add'>+static int arp_req_set(struct net *net, struct arpreq *r)</div><div class='ctx'> {</div><div class='del'>-	__be32 ip;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	__be32 ip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	dev = arp_req_dev(net, r);</div><div class='add'>+	if (IS_ERR(dev))</div><div class='add'>+		return PTR_ERR(dev);</div><div class='add'>+</div><div class='ctx'> 	if (r-&gt;arp_flags &amp; ATF_PUBL)</div><div class='ctx'> 		return arp_req_set_public(net, r, dev);</div><div class='ctx'> </div><div class='del'>-	ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='del'>-	if (r-&gt;arp_flags &amp; ATF_PERM)</div><div class='del'>-		r-&gt;arp_flags |= ATF_COM;</div><div class='del'>-	if (!dev) {</div><div class='del'>-		struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(rt))</div><div class='del'>-			return PTR_ERR(rt);</div><div class='del'>-		dev = rt-&gt;dst.dev;</div><div class='del'>-		ip_rt_put(rt);</div><div class='del'>-		if (!dev)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	switch (dev-&gt;type) {</div><div class='ctx'> #if IS_ENABLED(CONFIG_FDDI)</div><div class='ctx'> 	case ARPHRD_FDDI:</div><div class='hunk'>@@ -1063,12 +1130,18 @@ static int arp_req_set(struct net *net, struct arpreq *r,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='add'>+</div><div class='ctx'> 	neigh = __neigh_lookup_errno(&amp;arp_tbl, &amp;ip, dev);</div><div class='ctx'> 	err = PTR_ERR(neigh);</div><div class='ctx'> 	if (!IS_ERR(neigh)) {</div><div class='ctx'> 		unsigned int state = NUD_STALE;</div><div class='del'>-		if (r-&gt;arp_flags &amp; ATF_PERM)</div><div class='add'>+</div><div class='add'>+		if (r-&gt;arp_flags &amp; ATF_PERM) {</div><div class='add'>+			r-&gt;arp_flags |= ATF_COM;</div><div class='ctx'> 			state = NUD_PERMANENT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		err = neigh_update(neigh, (r-&gt;arp_flags &amp; ATF_COM) ?</div><div class='ctx'> 				   r-&gt;arp_ha.sa_data : NULL, state,</div><div class='ctx'> 				   NEIGH_UPDATE_F_OVERRIDE |</div><div class='hunk'>@@ -1092,43 +1165,62 @@ static unsigned int arp_state_to_flags(struct neighbour *neigh)</div><div class='ctx'>  *	Get an ARP cache entry.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int arp_req_get(struct arpreq *r, struct net_device *dev)</div><div class='add'>+static int arp_req_get(struct net *net, struct arpreq *r)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 ip = ((struct sockaddr_in *) &amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='del'>-	int err = -ENXIO;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;arp_dev[0])</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dev = arp_req_dev_by_name(net, r, true);</div><div class='add'>+	if (IS_ERR(dev))</div><div class='add'>+		return PTR_ERR(dev);</div><div class='ctx'> </div><div class='ctx'> 	neigh = neigh_lookup(&amp;arp_tbl, &amp;ip, dev);</div><div class='del'>-	if (neigh) {</div><div class='del'>-		if (!(neigh-&gt;nud_state &amp; NUD_NOARP)) {</div><div class='del'>-			read_lock_bh(&amp;neigh-&gt;lock);</div><div class='del'>-			memcpy(r-&gt;arp_ha.sa_data, neigh-&gt;ha, dev-&gt;addr_len);</div><div class='del'>-			r-&gt;arp_flags = arp_state_to_flags(neigh);</div><div class='del'>-			read_unlock_bh(&amp;neigh-&gt;lock);</div><div class='del'>-			r-&gt;arp_ha.sa_family = dev-&gt;type;</div><div class='del'>-			strlcpy(r-&gt;arp_dev, dev-&gt;name, sizeof(r-&gt;arp_dev));</div><div class='del'>-			err = 0;</div><div class='del'>-		}</div><div class='add'>+	if (!neigh)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(neigh-&gt;nud_state) &amp; NUD_NOARP) {</div><div class='ctx'> 		neigh_release(neigh);</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;neigh-&gt;lock);</div><div class='add'>+	memcpy(r-&gt;arp_ha.sa_data, neigh-&gt;ha,</div><div class='add'>+	       min(dev-&gt;addr_len, sizeof(r-&gt;arp_ha.sa_data)));</div><div class='add'>+	r-&gt;arp_flags = arp_state_to_flags(neigh);</div><div class='add'>+	read_unlock_bh(&amp;neigh-&gt;lock);</div><div class='add'>+</div><div class='add'>+	neigh_release(neigh);</div><div class='add'>+</div><div class='add'>+	r-&gt;arp_ha.sa_family = dev-&gt;type;</div><div class='add'>+	netdev_copy_name(dev, r-&gt;arp_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int arp_invalidate(struct net_device *dev, __be32 ip)</div><div class='add'>+int arp_invalidate(struct net_device *dev, __be32 ip, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct neighbour *neigh = neigh_lookup(&amp;arp_tbl, &amp;ip, dev);</div><div class='ctx'> 	int err = -ENXIO;</div><div class='ctx'> 	struct neigh_table *tbl = &amp;arp_tbl;</div><div class='ctx'> </div><div class='ctx'> 	if (neigh) {</div><div class='del'>-		if (neigh-&gt;nud_state &amp; ~NUD_NOARP)</div><div class='add'>+		if ((READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID) &amp;&amp; !force) {</div><div class='add'>+			neigh_release(neigh);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(neigh-&gt;nud_state) &amp; ~NUD_NOARP)</div><div class='ctx'> 			err = neigh_update(neigh, NULL, NUD_FAILED,</div><div class='ctx'> 					   NEIGH_UPDATE_F_OVERRIDE|</div><div class='ctx'> 					   NEIGH_UPDATE_F_ADMIN, 0);</div><div class='del'>-		write_lock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		spin_lock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 		neigh_release(neigh);</div><div class='del'>-		neigh_remove_one(neigh, tbl);</div><div class='del'>-		write_unlock_bh(&amp;tbl-&gt;lock);</div><div class='add'>+		neigh_remove_one(neigh);</div><div class='add'>+		spin_unlock_bh(&amp;tbl-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1137,37 +1229,32 @@ static int arp_invalidate(struct net_device *dev, __be32 ip)</div><div class='ctx'> static int arp_req_delete_public(struct net *net, struct arpreq *r,</div><div class='ctx'> 		struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	__be32 ip = ((struct sockaddr_in *) &amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='ctx'> 	__be32 mask = ((struct sockaddr_in *)&amp;r-&gt;arp_netmask)-&gt;sin_addr.s_addr;</div><div class='ctx'> </div><div class='del'>-	if (mask == htonl(0xFFFFFFFF))</div><div class='del'>-		return pneigh_delete(&amp;arp_tbl, net, &amp;ip, dev);</div><div class='add'>+	if (mask) {</div><div class='add'>+		__be32 ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='ctx'> </div><div class='del'>-	if (mask)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return pneigh_delete(&amp;arp_tbl, net, &amp;ip, dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return arp_req_set_proxy(net, dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int arp_req_delete(struct net *net, struct arpreq *r,</div><div class='del'>-			  struct net_device *dev)</div><div class='add'>+static int arp_req_delete(struct net *net, struct arpreq *r)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	__be32 ip;</div><div class='ctx'> </div><div class='add'>+	dev = arp_req_dev(net, r);</div><div class='add'>+	if (IS_ERR(dev))</div><div class='add'>+		return PTR_ERR(dev);</div><div class='add'>+</div><div class='ctx'> 	if (r-&gt;arp_flags &amp; ATF_PUBL)</div><div class='ctx'> 		return arp_req_delete_public(net, r, dev);</div><div class='ctx'> </div><div class='ctx'> 	ip = ((struct sockaddr_in *)&amp;r-&gt;arp_pa)-&gt;sin_addr.s_addr;</div><div class='del'>-	if (!dev) {</div><div class='del'>-		struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);</div><div class='del'>-		if (IS_ERR(rt))</div><div class='del'>-			return PTR_ERR(rt);</div><div class='del'>-		dev = rt-&gt;dst.dev;</div><div class='del'>-		ip_rt_put(rt);</div><div class='del'>-		if (!dev)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return arp_invalidate(dev, ip);</div><div class='add'>+</div><div class='add'>+	return arp_invalidate(dev, ip, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1176,16 +1263,16 @@ static int arp_req_delete(struct net *net, struct arpreq *r,</div><div class='ctx'> </div><div class='ctx'> int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct arpreq r;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='add'>+	__be32 *netmask;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCDARP:</div><div class='ctx'> 	case SIOCSARP:</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGARP:</div><div class='ctx'> 		err = copy_from_user(&amp;r, arg, sizeof(struct arpreq));</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1201,42 +1288,34 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)</div><div class='ctx'> 	if (!(r.arp_flags &amp; ATF_PUBL) &amp;&amp;</div><div class='ctx'> 	    (r.arp_flags &amp; (ATF_NETMASK | ATF_DONTPUB)))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	netmask = &amp;((struct sockaddr_in *)&amp;r.arp_netmask)-&gt;sin_addr.s_addr;</div><div class='ctx'> 	if (!(r.arp_flags &amp; ATF_NETMASK))</div><div class='del'>-		((struct sockaddr_in *)&amp;r.arp_netmask)-&gt;sin_addr.s_addr =</div><div class='del'>-							   htonl(0xFFFFFFFFUL);</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	if (r.arp_dev[0]) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		dev = __dev_get_by_name(net, r.arp_dev);</div><div class='del'>-		if (!dev)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/* Mmmm... It is wrong... ARPHRD_NETROM==0 */</div><div class='del'>-		if (!r.arp_ha.sa_family)</div><div class='del'>-			r.arp_ha.sa_family = dev-&gt;type;</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if ((r.arp_flags &amp; ATF_COM) &amp;&amp; r.arp_ha.sa_family != dev-&gt;type)</div><div class='del'>-			goto out;</div><div class='del'>-	} else if (cmd == SIOCGARP) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		*netmask = htonl(0xFFFFFFFFUL);</div><div class='add'>+	else if (*netmask &amp;&amp; *netmask != htonl(0xFFFFFFFFUL))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCDARP:</div><div class='del'>-		err = arp_req_delete(net, &amp;r, dev);</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+		err = arp_req_delete(net, &amp;r);</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCSARP:</div><div class='del'>-		err = arp_req_set(net, &amp;r, dev);</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+		err = arp_req_set(net, &amp;r);</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCGARP:</div><div class='del'>-		err = arp_req_get(&amp;r, dev);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		err = arp_req_get(net, &amp;r);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (!err &amp;&amp; copy_to_user(arg, &amp;r, sizeof(r)))</div><div class='add'>+			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	if (cmd == SIOCGARP &amp;&amp; !err &amp;&amp; copy_to_user(arg, &amp;r, sizeof(r)))</div><div class='del'>-		err = -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,6 +1324,8 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> 	struct netdev_notifier_change_info *change_info;</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	bool evict_nocarrier;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='hunk'>@@ -1255,6 +1336,15 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 		change_info = ptr;</div><div class='ctx'> 		if (change_info-&gt;flags_changed &amp; IFF_NOARP)</div><div class='ctx'> 			neigh_changeaddr(&amp;arp_tbl, dev);</div><div class='add'>+</div><div class='add'>+		in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+		if (!in_dev)</div><div class='add'>+			evict_nocarrier = true;</div><div class='add'>+		else</div><div class='add'>+			evict_nocarrier = IN_DEV_ARP_EVICT_NOCARRIER(in_dev);</div><div class='add'>+</div><div class='add'>+		if (evict_nocarrier &amp;&amp; !netif_carrier_ok(dev))</div><div class='add'>+			neigh_carrier_down(&amp;arp_tbl, dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1286,24 +1376,9 @@ static struct packet_type arp_packet_type __read_mostly = {</div><div class='ctx'> 	.func =	arp_rcv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int arp_proc_init(void);</div><div class='del'>-</div><div class='del'>-void __init arp_init(void)</div><div class='del'>-{</div><div class='del'>-	neigh_table_init(NEIGH_ARP_TABLE, &amp;arp_tbl);</div><div class='del'>-</div><div class='del'>-	dev_add_pack(&amp;arp_packet_type);</div><div class='del'>-	arp_proc_init();</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-	neigh_sysctl_register(NULL, &amp;arp_tbl.parms, NULL);</div><div class='del'>-#endif</div><div class='del'>-	register_netdevice_notifier(&amp;arp_netdev_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> #if IS_ENABLED(CONFIG_AX25)</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------------ */</div><div class='ctx'> /*</div><div class='ctx'>  *	ax25 -&gt; ASCII conversion</div><div class='ctx'>  */</div><div class='hunk'>@@ -1409,16 +1484,13 @@ static void *arp_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	return neigh_seq_start(seq, pos, &amp;arp_tbl, NEIGH_SEQ_SKIP_NOARP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------------ */</div><div class='del'>-</div><div class='ctx'> static const struct seq_operations arp_seq_ops = {</div><div class='ctx'> 	.start	= arp_seq_start,</div><div class='ctx'> 	.next	= neigh_seq_next,</div><div class='ctx'> 	.stop	= neigh_seq_stop,</div><div class='ctx'> 	.show	= arp_seq_show,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------ */</div><div class='add'>+#endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> static int __net_init arp_net_init(struct net *net)</div><div class='ctx'> {</div><div class='hunk'>@@ -1438,16 +1510,14 @@ static struct pernet_operations arp_net_ops = {</div><div class='ctx'> 	.exit = arp_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init arp_proc_init(void)</div><div class='add'>+void __init arp_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_pernet_subsys(&amp;arp_net_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_PROC_FS */</div><div class='add'>+	neigh_table_init(NEIGH_ARP_TABLE, &amp;arp_tbl);</div><div class='ctx'> </div><div class='del'>-static int __init arp_proc_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	dev_add_pack(&amp;arp_packet_type);</div><div class='add'>+	register_pernet_subsys(&amp;arp_net_ops);</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+	neigh_sysctl_register(NULL, &amp;arp_tbl.parms, NULL);</div><div class='add'>+#endif</div><div class='add'>+	register_netdevice_notifier(&amp;arp_netdev_notifier);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='head'>diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c<br/>new file mode 100644<br/>index 000000000000..e01492234b0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/bpf_tcp_ca.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/bpf_tcp_ca.c</a></div><div class='hunk'>@@ -0,0 +1,349 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019 Facebook  */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bpf_verifier.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='add'>+</div><div class='add'>+/* "extern" is to avoid sparse warning.  It is only used in bpf_struct_ops.c. */</div><div class='add'>+static struct bpf_struct_ops bpf_tcp_congestion_ops;</div><div class='add'>+</div><div class='add'>+static const struct btf_type *tcp_sock_type;</div><div class='add'>+static u32 tcp_sock_id, sock_id;</div><div class='add'>+static const struct btf_type *tcp_congestion_ops_type;</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_init(struct btf *btf)</div><div class='add'>+{</div><div class='add'>+	s32 type_id;</div><div class='add'>+</div><div class='add'>+	type_id = btf_find_by_name_kind(btf, "sock", BTF_KIND_STRUCT);</div><div class='add'>+	if (type_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	sock_id = type_id;</div><div class='add'>+</div><div class='add'>+	type_id = btf_find_by_name_kind(btf, "tcp_sock", BTF_KIND_STRUCT);</div><div class='add'>+	if (type_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	tcp_sock_id = type_id;</div><div class='add'>+	tcp_sock_type = btf_type_by_id(btf, tcp_sock_id);</div><div class='add'>+</div><div class='add'>+	type_id = btf_find_by_name_kind(btf, "tcp_congestion_ops", BTF_KIND_STRUCT);</div><div class='add'>+	if (type_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	tcp_congestion_ops_type = btf_type_by_id(btf, type_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_tcp_ca_is_valid_access(int off, int size,</div><div class='add'>+				       enum bpf_access_type type,</div><div class='add'>+				       const struct bpf_prog *prog,</div><div class='add'>+				       struct bpf_insn_access_aux *info)</div><div class='add'>+{</div><div class='add'>+	if (!bpf_tracing_btf_ctx_access(off, size, type, prog, info))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (base_type(info-&gt;reg_type) == PTR_TO_BTF_ID &amp;&amp;</div><div class='add'>+	    !bpf_type_has_unsafe_modifiers(info-&gt;reg_type) &amp;&amp;</div><div class='add'>+	    info-&gt;btf_id == sock_id)</div><div class='add'>+		/* promote it to tcp_sock */</div><div class='add'>+		info-&gt;btf_id = tcp_sock_id;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_btf_struct_access(struct bpf_verifier_log *log,</div><div class='add'>+					const struct bpf_reg_state *reg,</div><div class='add'>+					int off, int size)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	size_t end;</div><div class='add'>+</div><div class='add'>+	t = btf_type_by_id(reg-&gt;btf, reg-&gt;btf_id);</div><div class='add'>+	if (t != tcp_sock_type) {</div><div class='add'>+		bpf_log(log, "only read is supported\n");</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (off) {</div><div class='add'>+	case offsetof(struct sock, sk_pacing_rate):</div><div class='add'>+		end = offsetofend(struct sock, sk_pacing_rate);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct sock, sk_pacing_status):</div><div class='add'>+		end = offsetofend(struct sock, sk_pacing_status);</div><div class='add'>+		break;</div><div class='add'>+	case bpf_ctx_range(struct inet_connection_sock, icsk_ca_priv):</div><div class='add'>+		end = offsetofend(struct inet_connection_sock, icsk_ca_priv);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct inet_connection_sock, icsk_ack.pending):</div><div class='add'>+		end = offsetofend(struct inet_connection_sock,</div><div class='add'>+				  icsk_ack.pending);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, snd_cwnd):</div><div class='add'>+		end = offsetofend(struct tcp_sock, snd_cwnd);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, snd_cwnd_cnt):</div><div class='add'>+		end = offsetofend(struct tcp_sock, snd_cwnd_cnt);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, snd_cwnd_stamp):</div><div class='add'>+		end = offsetofend(struct tcp_sock, snd_cwnd_stamp);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, snd_ssthresh):</div><div class='add'>+		end = offsetofend(struct tcp_sock, snd_ssthresh);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, ecn_flags):</div><div class='add'>+		end = offsetofend(struct tcp_sock, ecn_flags);</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct tcp_sock, app_limited):</div><div class='add'>+		end = offsetofend(struct tcp_sock, app_limited);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bpf_log(log, "no write support to tcp_sock at off %d\n", off);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (off + size &gt; end) {</div><div class='add'>+		bpf_log(log,</div><div class='add'>+			"write access at off %d with size %d beyond the member of tcp_sock ended at %zu\n",</div><div class='add'>+			off, size, end);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BPF_CALL_2(bpf_tcp_send_ack, struct tcp_sock *, tp, u32, rcv_nxt)</div><div class='add'>+{</div><div class='add'>+	/* bpf_tcp_ca prog cannot have NULL tp */</div><div class='add'>+	__tcp_send_ack((struct sock *)tp, rcv_nxt, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto bpf_tcp_send_ack_proto = {</div><div class='add'>+	.func		= bpf_tcp_send_ack,</div><div class='add'>+	.gpl_only	= false,</div><div class='add'>+	/* In case we want to report error later */</div><div class='add'>+	.ret_type	= RET_INTEGER,</div><div class='add'>+	.arg1_type	= ARG_PTR_TO_BTF_ID,</div><div class='add'>+	.arg1_btf_id	= &amp;tcp_sock_id,</div><div class='add'>+	.arg2_type	= ARG_ANYTHING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 prog_ops_moff(const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	const struct btf_member *m;</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	u32 midx;</div><div class='add'>+</div><div class='add'>+	midx = prog-&gt;expected_attach_type;</div><div class='add'>+	t = tcp_congestion_ops_type;</div><div class='add'>+	m = &amp;btf_type_member(t)[midx];</div><div class='add'>+</div><div class='add'>+	return __btf_member_bit_offset(t, m) / 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+bpf_tcp_ca_get_func_proto(enum bpf_func_id func_id,</div><div class='add'>+			  const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	switch (func_id) {</div><div class='add'>+	case BPF_FUNC_tcp_send_ack:</div><div class='add'>+		return &amp;bpf_tcp_send_ack_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_get:</div><div class='add'>+		return &amp;bpf_sk_storage_get_proto;</div><div class='add'>+	case BPF_FUNC_sk_storage_delete:</div><div class='add'>+		return &amp;bpf_sk_storage_delete_proto;</div><div class='add'>+	case BPF_FUNC_setsockopt:</div><div class='add'>+		/* Does not allow release() to call setsockopt.</div><div class='add'>+		 * release() is called when the current bpf-tcp-cc</div><div class='add'>+		 * is retiring.  It is not allowed to call</div><div class='add'>+		 * setsockopt() to make further changes which</div><div class='add'>+		 * may potentially allocate new resources.</div><div class='add'>+		 */</div><div class='add'>+		if (prog_ops_moff(prog) !=</div><div class='add'>+		    offsetof(struct tcp_congestion_ops, release))</div><div class='add'>+			return &amp;bpf_sk_setsockopt_proto;</div><div class='add'>+		return NULL;</div><div class='add'>+	case BPF_FUNC_getsockopt:</div><div class='add'>+		/* Since get/setsockopt is usually expected to</div><div class='add'>+		 * be available together, disable getsockopt for</div><div class='add'>+		 * release also to avoid usage surprise.</div><div class='add'>+		 * The bpf-tcp-cc already has a more powerful way</div><div class='add'>+		 * to read tcp_sock from the PTR_TO_BTF_ID.</div><div class='add'>+		 */</div><div class='add'>+		if (prog_ops_moff(prog) !=</div><div class='add'>+		    offsetof(struct tcp_congestion_ops, release))</div><div class='add'>+			return &amp;bpf_sk_getsockopt_proto;</div><div class='add'>+		return NULL;</div><div class='add'>+	case BPF_FUNC_ktime_get_coarse_ns:</div><div class='add'>+		return &amp;bpf_ktime_get_coarse_ns_proto;</div><div class='add'>+	default:</div><div class='add'>+		return bpf_base_func_proto(func_id, prog);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_tcp_ca_check_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, tcp_reno_ssthresh)</div><div class='add'>+BTF_ID_FLAGS(func, tcp_reno_cong_avoid)</div><div class='add'>+BTF_ID_FLAGS(func, tcp_reno_undo_cwnd)</div><div class='add'>+BTF_ID_FLAGS(func, tcp_slow_start)</div><div class='add'>+BTF_ID_FLAGS(func, tcp_cong_avoid_ai)</div><div class='add'>+BTF_KFUNCS_END(bpf_tcp_ca_check_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_tcp_ca_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;bpf_tcp_ca_check_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_verifier_ops bpf_tcp_ca_verifier_ops = {</div><div class='add'>+	.get_func_proto		= bpf_tcp_ca_get_func_proto,</div><div class='add'>+	.is_valid_access	= bpf_tcp_ca_is_valid_access,</div><div class='add'>+	.btf_struct_access	= bpf_tcp_ca_btf_struct_access,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_init_member(const struct btf_type *t,</div><div class='add'>+				  const struct btf_member *member,</div><div class='add'>+				  void *kdata, const void *udata)</div><div class='add'>+{</div><div class='add'>+	const struct tcp_congestion_ops *utcp_ca;</div><div class='add'>+	struct tcp_congestion_ops *tcp_ca;</div><div class='add'>+	u32 moff;</div><div class='add'>+</div><div class='add'>+	utcp_ca = (const struct tcp_congestion_ops *)udata;</div><div class='add'>+	tcp_ca = (struct tcp_congestion_ops *)kdata;</div><div class='add'>+</div><div class='add'>+	moff = __btf_member_bit_offset(t, member) / 8;</div><div class='add'>+	switch (moff) {</div><div class='add'>+	case offsetof(struct tcp_congestion_ops, flags):</div><div class='add'>+		if (utcp_ca-&gt;flags &amp; ~TCP_CONG_MASK)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tcp_ca-&gt;flags = utcp_ca-&gt;flags;</div><div class='add'>+		return 1;</div><div class='add'>+	case offsetof(struct tcp_congestion_ops, name):</div><div class='add'>+		if (bpf_obj_name_cpy(tcp_ca-&gt;name, utcp_ca-&gt;name,</div><div class='add'>+				     sizeof(tcp_ca-&gt;name)) &lt;= 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_reg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	return tcp_register_congestion_control(kdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_unreg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	tcp_unregister_congestion_control(kdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_update(void *kdata, void *old_kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	return tcp_update_congestion_control(kdata, old_kdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ca_validate(void *kdata)</div><div class='add'>+{</div><div class='add'>+	return tcp_validate_congestion_control(kdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bpf_tcp_ca_ssthresh(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_set_state(struct sock *sk, u8 new_state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_cwnd_event(struct sock *sk, enum tcp_ca_event ev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_in_ack_event(struct sock *sk, u32 flags)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_pkts_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bpf_tcp_ca_min_tso_segs(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_tcp_ca_cong_control(struct sock *sk, u32 ack, int flag,</div><div class='add'>+				    const struct rate_sample *rs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bpf_tcp_ca_undo_cwnd(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bpf_tcp_ca_sndbuf_expand(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bpf_tcp_ca_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bpf_tcp_ca_release(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_congestion_ops __bpf_ops_tcp_congestion_ops = {</div><div class='add'>+	.ssthresh = bpf_tcp_ca_ssthresh,</div><div class='add'>+	.cong_avoid = bpf_tcp_ca_cong_avoid,</div><div class='add'>+	.set_state = bpf_tcp_ca_set_state,</div><div class='add'>+	.cwnd_event = bpf_tcp_ca_cwnd_event,</div><div class='add'>+	.in_ack_event = bpf_tcp_ca_in_ack_event,</div><div class='add'>+	.pkts_acked = bpf_tcp_ca_pkts_acked,</div><div class='add'>+	.min_tso_segs = bpf_tcp_ca_min_tso_segs,</div><div class='add'>+	.cong_control = bpf_tcp_ca_cong_control,</div><div class='add'>+	.undo_cwnd = bpf_tcp_ca_undo_cwnd,</div><div class='add'>+	.sndbuf_expand = bpf_tcp_ca_sndbuf_expand,</div><div class='add'>+</div><div class='add'>+	.init = __bpf_tcp_ca_init,</div><div class='add'>+	.release = __bpf_tcp_ca_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bpf_struct_ops bpf_tcp_congestion_ops = {</div><div class='add'>+	.verifier_ops = &amp;bpf_tcp_ca_verifier_ops,</div><div class='add'>+	.reg = bpf_tcp_ca_reg,</div><div class='add'>+	.unreg = bpf_tcp_ca_unreg,</div><div class='add'>+	.update = bpf_tcp_ca_update,</div><div class='add'>+	.init_member = bpf_tcp_ca_init_member,</div><div class='add'>+	.init = bpf_tcp_ca_init,</div><div class='add'>+	.validate = bpf_tcp_ca_validate,</div><div class='add'>+	.name = "tcp_congestion_ops",</div><div class='add'>+	.cfi_stubs = &amp;__bpf_ops_tcp_congestion_ops,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_tcp_ca_kfunc_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &amp;bpf_tcp_ca_kfunc_set);</div><div class='add'>+	ret = ret ?: register_bpf_struct_ops(&amp;bpf_tcp_congestion_ops, tcp_congestion_ops);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+late_initcall(bpf_tcp_ca_kfunc_init);</div><div class='head'>diff --git a/net/ipv4/bpfilter/Makefile b/net/ipv4/bpfilter/Makefile<br/>deleted file mode 100644<br/>index e9e42f99725e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/bpfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/bpfilter/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-$(CONFIG_BPFILTER) += sockopt.o</div><div class='head'>diff --git a/net/ipv4/bpfilter/sockopt.c b/net/ipv4/bpfilter/sockopt.c<br/>deleted file mode 100644<br/>index 5e04ed25bc0e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/bpfilter/sockopt.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/bpfilter/sockopt.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/bpfilter.h&gt;</div><div class='del'>-#include &lt;uapi/linux/bpf.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-</div><div class='del'>-int (*bpfilter_process_sockopt)(struct sock *sk, int optname,</div><div class='del'>-				char __user *optval,</div><div class='del'>-				unsigned int optlen, bool is_set);</div><div class='del'>-EXPORT_SYMBOL_GPL(bpfilter_process_sockopt);</div><div class='del'>-</div><div class='del'>-static int bpfilter_mbox_request(struct sock *sk, int optname,</div><div class='del'>-				 char __user *optval,</div><div class='del'>-				 unsigned int optlen, bool is_set)</div><div class='del'>-{</div><div class='del'>-	if (!bpfilter_process_sockopt) {</div><div class='del'>-		int err = request_module("bpfilter");</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		if (!bpfilter_process_sockopt)</div><div class='del'>-			return -ECHILD;</div><div class='del'>-	}</div><div class='del'>-	return bpfilter_process_sockopt(sk, optname, optval, optlen, is_set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval,</div><div class='del'>-			    unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	return bpfilter_mbox_request(sk, optname, optval, optlen, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,</div><div class='del'>-			    int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (get_user(len, optlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return bpfilter_mbox_request(sk, optname, optval, len, false);</div><div class='del'>-}</div><div class='head'>diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c<br/>index 82178cc69c96..709021197e1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/cipso_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/cipso_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/cipso_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/cipso_ipv4.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * CIPSO - Commercial IP Security Option</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,30 +10,15 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The CIPSO draft specification can be found in the kernel's Documentation</div><div class='ctx'>  * directory as well as the following URL:</div><div class='del'>- *   http://tools.ietf.org/id/draft-ietf-cipso-ipsecurity-01.txt</div><div class='add'>+ *   https://tools.ietf.org/id/draft-ietf-cipso-ipsecurity-01.txt</div><div class='ctx'>  * The FIPS-188 specification can be found at the following URL:</div><div class='del'>- *   http://www.itl.nist.gov/fipspubs/fip188.htm</div><div class='add'>+ *   https://www.itl.nist.gov/fipspubs/fip188.htm</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Paul Moore &lt;paul.moore@hp.com&gt;</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * (c) Copyright Hewlett-Packard Development Company, L.P., 2006, 2008</div><div class='del'>- *</div><div class='del'>- * This program is free software;  you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY;  without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See</div><div class='del'>- * the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program;  if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -51,7 +37,7 @@</div><div class='ctx'> #include &lt;net/cipso_ipv4.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* List of available DOI definitions */</div><div class='ctx'> /* XXX - This currently assumes a minimal number of different DOIs in use,</div><div class='hunk'>@@ -87,7 +73,7 @@ struct cipso_v4_map_cache_entry {</div><div class='ctx'> static struct cipso_v4_map_cache_bkt *cipso_v4_cache;</div><div class='ctx'> </div><div class='ctx'> /* Restricted bitmap (tag #1) flags */</div><div class='del'>-int cipso_v4_rbm_optfmt = 0;</div><div class='add'>+int cipso_v4_rbm_optfmt;</div><div class='ctx'> int cipso_v4_rbm_strictvalid = 1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -201,8 +187,7 @@ static int __init cipso_v4_cache_init(void)</div><div class='ctx'>  * cipso_v4_cache_invalidate - Invalidates the current CIPSO cache</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- * Invalidates and frees any entries in the CIPSO cache.  Returns zero on</div><div class='del'>- * success and negative values on failure.</div><div class='add'>+ * Invalidates and frees any entries in the CIPSO cache.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void cipso_v4_cache_invalidate(void)</div><div class='hunk'>@@ -254,7 +239,7 @@ static int cipso_v4_cache_check(const unsigned char *key,</div><div class='ctx'> 	struct cipso_v4_map_cache_entry *prev_entry = NULL;</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> </div><div class='del'>-	if (!cipso_v4_cache_enabled)</div><div class='add'>+	if (!READ_ONCE(cipso_v4_cache_enabled))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	hash = cipso_v4_map_cache_hash(key, key_len);</div><div class='hunk'>@@ -297,7 +282,7 @@ static int cipso_v4_cache_check(const unsigned char *key,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_cache_add - Add an entry to the CIPSO cache</div><div class='del'>- * @skb: the packet</div><div class='add'>+ * @cipso_ptr: pointer to CIPSO IP option</div><div class='ctx'>  * @secattr: the packet's security attributes</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -311,13 +296,14 @@ static int cipso_v4_cache_check(const unsigned char *key,</div><div class='ctx'> int cipso_v4_cache_add(const unsigned char *cipso_ptr,</div><div class='ctx'> 		       const struct netlbl_lsm_secattr *secattr)</div><div class='ctx'> {</div><div class='add'>+	int bkt_size = READ_ONCE(cipso_v4_cache_bucketsize);</div><div class='ctx'> 	int ret_val = -EPERM;</div><div class='ctx'> 	u32 bkt;</div><div class='ctx'> 	struct cipso_v4_map_cache_entry *entry = NULL;</div><div class='ctx'> 	struct cipso_v4_map_cache_entry *old_entry = NULL;</div><div class='ctx'> 	u32 cipso_ptr_len;</div><div class='ctx'> </div><div class='del'>-	if (!cipso_v4_cache_enabled || cipso_v4_cache_bucketsize &lt;= 0)</div><div class='add'>+	if (!READ_ONCE(cipso_v4_cache_enabled) || bkt_size &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cipso_ptr_len = cipso_ptr[1];</div><div class='hunk'>@@ -337,7 +323,7 @@ int cipso_v4_cache_add(const unsigned char *cipso_ptr,</div><div class='ctx'> </div><div class='ctx'> 	bkt = entry-&gt;hash &amp; (CIPSO_V4_CACHE_BUCKETS - 1);</div><div class='ctx'> 	spin_lock_bh(&amp;cipso_v4_cache[bkt].lock);</div><div class='del'>-	if (cipso_v4_cache[bkt].size &lt; cipso_v4_cache_bucketsize) {</div><div class='add'>+	if (cipso_v4_cache[bkt].size &lt; bkt_size) {</div><div class='ctx'> 		list_add(&amp;entry-&gt;list, &amp;cipso_v4_cache[bkt].list);</div><div class='ctx'> 		cipso_v4_cache[bkt].size += 1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -486,6 +472,7 @@ void cipso_v4_doi_free(struct cipso_v4_doi *doi_def)</div><div class='ctx'> 		kfree(doi_def-&gt;map.std-&gt;lvl.local);</div><div class='ctx'> 		kfree(doi_def-&gt;map.std-&gt;cat.cipso);</div><div class='ctx'> 		kfree(doi_def-&gt;map.std-&gt;cat.local);</div><div class='add'>+		kfree(doi_def-&gt;map.std);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(doi_def);</div><div class='hunk'>@@ -512,7 +499,7 @@ static void cipso_v4_doi_free_rcu(struct rcu_head *entry)</div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_doi_remove - Remove an existing DOI from the CIPSO protocol engine</div><div class='ctx'>  * @doi: the DOI value</div><div class='del'>- * @audit_secid: the LSM secid to use in the audit message</div><div class='add'>+ * @audit_info: NetLabel audit information</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Removes a DOI definition from the CIPSO engine.  The NetLabel routines will</div><div class='hunk'>@@ -533,16 +520,10 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info)</div><div class='ctx'> 		ret_val = -ENOENT;</div><div class='ctx'> 		goto doi_remove_return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!refcount_dec_and_test(&amp;doi_def-&gt;refcount)) {</div><div class='del'>-		spin_unlock(&amp;cipso_v4_doi_list_lock);</div><div class='del'>-		ret_val = -EBUSY;</div><div class='del'>-		goto doi_remove_return;</div><div class='del'>-	}</div><div class='ctx'> 	list_del_rcu(&amp;doi_def-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;cipso_v4_doi_list_lock);</div><div class='ctx'> </div><div class='del'>-	cipso_v4_cache_invalidate();</div><div class='del'>-	call_rcu(&amp;doi_def-&gt;rcu, cipso_v4_doi_free_rcu);</div><div class='add'>+	cipso_v4_doi_putdef(doi_def);</div><div class='ctx'> 	ret_val = 0;</div><div class='ctx'> </div><div class='ctx'> doi_remove_return:</div><div class='hunk'>@@ -599,9 +580,6 @@ void cipso_v4_doi_putdef(struct cipso_v4_doi *doi_def)</div><div class='ctx'> </div><div class='ctx'> 	if (!refcount_dec_and_test(&amp;doi_def-&gt;refcount))</div><div class='ctx'> 		return;</div><div class='del'>-	spin_lock(&amp;cipso_v4_doi_list_lock);</div><div class='del'>-	list_del_rcu(&amp;doi_def-&gt;list);</div><div class='del'>-	spin_unlock(&amp;cipso_v4_doi_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	cipso_v4_cache_invalidate();</div><div class='ctx'> 	call_rcu(&amp;doi_def-&gt;rcu, cipso_v4_doi_free_rcu);</div><div class='hunk'>@@ -667,7 +645,8 @@ static int cipso_v4_map_lvl_valid(const struct cipso_v4_doi *doi_def, u8 level)</div><div class='ctx'> 	case CIPSO_V4_MAP_PASS:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case CIPSO_V4_MAP_TRANS:</div><div class='del'>-		if (doi_def-&gt;map.std-&gt;lvl.cipso[level] &lt; CIPSO_V4_INV_LVL)</div><div class='add'>+		if ((level &lt; doi_def-&gt;map.std-&gt;lvl.cipso_size) &amp;&amp;</div><div class='add'>+		    (doi_def-&gt;map.std-&gt;lvl.cipso[level] &lt; CIPSO_V4_INV_LVL))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -885,11 +864,8 @@ static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,</div><div class='ctx'> 					      net_clen_bits,</div><div class='ctx'> 					      net_spot + 1,</div><div class='ctx'> 					      1);</div><div class='del'>-		if (net_spot &lt; 0) {</div><div class='del'>-			if (net_spot == -2)</div><div class='del'>-				return -EFAULT;</div><div class='add'>+		if (net_spot &lt; 0)</div><div class='ctx'> 			return 0;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		switch (doi_def-&gt;type) {</div><div class='ctx'> 		case CIPSO_V4_MAP_PASS:</div><div class='hunk'>@@ -1175,7 +1151,7 @@ static void cipso_v4_gentag_hdr(const struct cipso_v4_doi *doi_def,</div><div class='ctx'> {</div><div class='ctx'> 	buf[0] = IPOPT_CIPSO;</div><div class='ctx'> 	buf[1] = CIPSO_V4_HDR_LEN + len;</div><div class='del'>-	*(__be32 *)&amp;buf[2] = htonl(doi_def-&gt;doi);</div><div class='add'>+	put_unaligned_be32(doi_def-&gt;doi, &amp;buf[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1221,7 +1197,8 @@ static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def,</div><div class='ctx'> 		/* This will send packets using the "optimized" format when</div><div class='ctx'> 		 * possible as specified in  section 3.4.2.6 of the</div><div class='ctx'> 		 * CIPSO draft. */</div><div class='del'>-		if (cipso_v4_rbm_optfmt &amp;&amp; ret_val &gt; 0 &amp;&amp; ret_val &lt;= 10)</div><div class='add'>+		if (READ_ONCE(cipso_v4_rbm_optfmt) &amp;&amp; ret_val &gt; 0 &amp;&amp;</div><div class='add'>+		    ret_val &lt;= 10)</div><div class='ctx'> 			tag_len = 14;</div><div class='ctx'> 		else</div><div class='ctx'> 			tag_len = 4 + ret_val;</div><div class='hunk'>@@ -1271,7 +1248,8 @@ static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def,</div><div class='ctx'> 			return ret_val;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='add'>+		if (secattr-&gt;attr.mls.cat)</div><div class='add'>+			secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1452,7 +1430,8 @@ static int cipso_v4_parsetag_rng(const struct cipso_v4_doi *doi_def,</div><div class='ctx'> 			return ret_val;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='add'>+		if (secattr-&gt;attr.mls.cat)</div><div class='add'>+			secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1512,7 +1491,7 @@ static int cipso_v4_parsetag_loc(const struct cipso_v4_doi *doi_def,</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Parse the packet's IP header looking for a CIPSO option.  Returns a pointer</div><div class='del'>- * to the start of the CIPSO option on success, NULL if one if not found.</div><div class='add'>+ * to the start of the CIPSO option on success, NULL if one is not found.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> unsigned char *cipso_v4_optptr(const struct sk_buff *skb)</div><div class='hunk'>@@ -1522,10 +1501,8 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)</div><div class='ctx'> 	int optlen;</div><div class='ctx'> 	int taglen;</div><div class='ctx'> </div><div class='del'>-	for (optlen = iph-&gt;ihl*4 - sizeof(struct iphdr); optlen &gt; 0; ) {</div><div class='add'>+	for (optlen = iph-&gt;ihl*4 - sizeof(struct iphdr); optlen &gt; 1; ) {</div><div class='ctx'> 		switch (optptr[0]) {</div><div class='del'>-		case IPOPT_CIPSO:</div><div class='del'>-			return optptr;</div><div class='ctx'> 		case IPOPT_END:</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		case IPOPT_NOOP:</div><div class='hunk'>@@ -1534,6 +1511,11 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)</div><div class='ctx'> 		default:</div><div class='ctx'> 			taglen = optptr[1];</div><div class='ctx'> 		}</div><div class='add'>+		if (!taglen || taglen &gt; optlen)</div><div class='add'>+			return NULL;</div><div class='add'>+		if (optptr[0] == IPOPT_CIPSO)</div><div class='add'>+			return optptr;</div><div class='add'>+</div><div class='ctx'> 		optlen -= taglen;</div><div class='ctx'> 		optptr += taglen;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1543,6 +1525,7 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_validate - Validate a CIPSO option</div><div class='add'>+ * @skb: the packet</div><div class='ctx'>  * @option: the start of the option, on error it is set to point to the error</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -1619,7 +1602,7 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option)</div><div class='ctx'> 			 * all the CIPSO validations here but it doesn't</div><div class='ctx'> 			 * really specify _exactly_ what we need to validate</div><div class='ctx'> 			 * ... so, just make it a sysctl tunable. */</div><div class='del'>-			if (cipso_v4_rbm_strictvalid) {</div><div class='add'>+			if (READ_ONCE(cipso_v4_rbm_strictvalid)) {</div><div class='ctx'> 				if (cipso_v4_map_lvl_valid(doi_def,</div><div class='ctx'> 							   tag[3]) &lt; 0) {</div><div class='ctx'> 					err_offset = opt_iter + 3;</div><div class='hunk'>@@ -1732,13 +1715,30 @@ validate_return:</div><div class='ctx'>  */</div><div class='ctx'> void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway)</div><div class='ctx'> {</div><div class='add'>+	struct inet_skb_parm parm;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='ctx'> 	if (ip_hdr(skb)-&gt;protocol == IPPROTO_ICMP || error != -EACCES)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We might be called above the IP layer,</div><div class='add'>+	 * so we can not use icmp_send and IPCB here.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	memset(&amp;parm, 0, sizeof(parm));</div><div class='add'>+	parm.opt.optlen = ip_hdr(skb)-&gt;ihl * 4 - sizeof(struct iphdr);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	res = __ip_options_compile(dev_net(skb-&gt;dev), &amp;parm.opt, skb, NULL);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (gateway)</div><div class='del'>-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0);</div><div class='add'>+		__icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0, &amp;parm);</div><div class='ctx'> 	else</div><div class='del'>-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0);</div><div class='add'>+		__icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0, &amp;parm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1809,11 +1809,35 @@ static int cipso_v4_genopt(unsigned char *buf, u32 buf_len,</div><div class='ctx'> 	return CIPSO_V4_HDR_LEN + ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cipso_v4_get_actual_opt_len(const unsigned char *data, int len)</div><div class='add'>+{</div><div class='add'>+	int iter = 0, optlen = 0;</div><div class='add'>+</div><div class='add'>+	/* determining the new total option length is tricky because of</div><div class='add'>+	 * the padding necessary, the only thing i can think to do at</div><div class='add'>+	 * this point is walk the options one-by-one, skipping the</div><div class='add'>+	 * padding at the end to determine the actual option size and</div><div class='add'>+	 * from there we can determine the new total option length</div><div class='add'>+	 */</div><div class='add'>+	while (iter &lt; len) {</div><div class='add'>+		if (data[iter] == IPOPT_END) {</div><div class='add'>+			break;</div><div class='add'>+		} else if (data[iter] == IPOPT_NOP) {</div><div class='add'>+			iter++;</div><div class='add'>+		} else {</div><div class='add'>+			iter += data[iter + 1];</div><div class='add'>+			optlen = iter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return optlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_sock_setattr - Add a CIPSO option to a socket</div><div class='ctx'>  * @sk: the socket</div><div class='ctx'>  * @doi_def: the CIPSO DOI to use</div><div class='ctx'>  * @secattr: the specific security attributes of the socket</div><div class='add'>+ * @sk_locked: true if caller holds the socket lock</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Set the CIPSO option on the given socket using the DOI definition and</div><div class='hunk'>@@ -1825,7 +1849,8 @@ static int cipso_v4_genopt(unsigned char *buf, u32 buf_len,</div><div class='ctx'>  */</div><div class='ctx'> int cipso_v4_sock_setattr(struct sock *sk,</div><div class='ctx'> 			  const struct cipso_v4_doi *doi_def,</div><div class='del'>-			  const struct netlbl_lsm_secattr *secattr)</div><div class='add'>+			  const struct netlbl_lsm_secattr *secattr,</div><div class='add'>+			  bool sk_locked)</div><div class='ctx'> {</div><div class='ctx'> 	int ret_val = -EPERM;</div><div class='ctx'> 	unsigned char *buf = NULL;</div><div class='hunk'>@@ -1875,9 +1900,8 @@ int cipso_v4_sock_setattr(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	sk_inet = inet_sk(sk);</div><div class='ctx'> </div><div class='del'>-	old = rcu_dereference_protected(sk_inet-&gt;inet_opt,</div><div class='del'>-					lockdep_sock_is_held(sk));</div><div class='del'>-	if (sk_inet-&gt;is_icsk) {</div><div class='add'>+	old = rcu_dereference_protected(sk_inet-&gt;inet_opt, sk_locked);</div><div class='add'>+	if (inet_test_bit(IS_ICSK, sk)) {</div><div class='ctx'> 		sk_conn = inet_csk(sk);</div><div class='ctx'> 		if (old)</div><div class='ctx'> 			sk_conn-&gt;icsk_ext_hdr_len -= old-&gt;opt.optlen;</div><div class='hunk'>@@ -1951,7 +1975,7 @@ int cipso_v4_req_setattr(struct request_sock *req,</div><div class='ctx'> 	buf = NULL;</div><div class='ctx'> </div><div class='ctx'> 	req_inet = inet_rsk(req);</div><div class='del'>-	opt = xchg((__force struct ip_options_rcu **)&amp;req_inet-&gt;ireq_opt, opt);</div><div class='add'>+	opt = unrcu_pointer(xchg(&amp;req_inet-&gt;ireq_opt, RCU_INITIALIZER(opt)));</div><div class='ctx'> 	if (opt)</div><div class='ctx'> 		kfree_rcu(opt, rcu);</div><div class='ctx'> </div><div class='hunk'>@@ -1984,7 +2008,6 @@ static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr)</div><div class='ctx'> 		u8 cipso_len;</div><div class='ctx'> 		u8 cipso_off;</div><div class='ctx'> 		unsigned char *cipso_ptr;</div><div class='del'>-		int iter;</div><div class='ctx'> 		int optlen_new;</div><div class='ctx'> </div><div class='ctx'> 		cipso_off = opt-&gt;opt.cipso - sizeof(struct iphdr);</div><div class='hunk'>@@ -2004,19 +2027,8 @@ static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr)</div><div class='ctx'> 		memmove(cipso_ptr, cipso_ptr + cipso_len,</div><div class='ctx'> 			opt-&gt;opt.optlen - cipso_off - cipso_len);</div><div class='ctx'> </div><div class='del'>-		/* determining the new total option length is tricky because of</div><div class='del'>-		 * the padding necessary, the only thing i can think to do at</div><div class='del'>-		 * this point is walk the options one-by-one, skipping the</div><div class='del'>-		 * padding at the end to determine the actual option size and</div><div class='del'>-		 * from there we can determine the new total option length */</div><div class='del'>-		iter = 0;</div><div class='del'>-		optlen_new = 0;</div><div class='del'>-		while (iter &lt; opt-&gt;opt.optlen)</div><div class='del'>-			if (opt-&gt;opt.__data[iter] != IPOPT_NOP) {</div><div class='del'>-				iter += opt-&gt;opt.__data[iter + 1];</div><div class='del'>-				optlen_new = iter;</div><div class='del'>-			} else</div><div class='del'>-				iter++;</div><div class='add'>+		optlen_new = cipso_v4_get_actual_opt_len(opt-&gt;opt.__data,</div><div class='add'>+							 opt-&gt;opt.optlen);</div><div class='ctx'> 		hdr_delta = opt-&gt;opt.optlen;</div><div class='ctx'> 		opt-&gt;opt.optlen = (optlen_new + 3) &amp; ~3;</div><div class='ctx'> 		hdr_delta -= opt-&gt;opt.optlen;</div><div class='hunk'>@@ -2047,7 +2059,7 @@ void cipso_v4_sock_delattr(struct sock *sk)</div><div class='ctx'> 	sk_inet = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	hdr_delta = cipso_v4_delopt(&amp;sk_inet-&gt;inet_opt);</div><div class='del'>-	if (sk_inet-&gt;is_icsk &amp;&amp; hdr_delta &gt; 0) {</div><div class='add'>+	if (inet_test_bit(IS_ICSK, sk) &amp;&amp; hdr_delta &gt; 0) {</div><div class='ctx'> 		struct inet_connection_sock *sk_conn = inet_csk(sk);</div><div class='ctx'> 		sk_conn-&gt;icsk_ext_hdr_len -= hdr_delta;</div><div class='ctx'> 		sk_conn-&gt;icsk_sync_mss(sk, sk_conn-&gt;icsk_pmtu_cookie);</div><div class='hunk'>@@ -2056,7 +2068,7 @@ void cipso_v4_sock_delattr(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_req_delattr - Delete the CIPSO option from a request socket</div><div class='del'>- * @reg: the request socket</div><div class='add'>+ * @req: the request socket</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Removes the CIPSO option from a request socket, if present.</div><div class='hunk'>@@ -2148,6 +2160,7 @@ int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)</div><div class='ctx'> /**</div><div class='ctx'>  * cipso_v4_skbuff_setattr - Set the CIPSO option on a packet</div><div class='ctx'>  * @skb: the packet</div><div class='add'>+ * @doi_def: the DOI structure</div><div class='ctx'>  * @secattr: the security attributes</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -2217,7 +2230,7 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb,</div><div class='ctx'> 		memset((char *)(iph + 1) + buf_len, 0, opt_len - buf_len);</div><div class='ctx'> 	if (len_delta != 0) {</div><div class='ctx'> 		iph-&gt;ihl = 5 + (opt_len &gt;&gt; 2);</div><div class='del'>-		iph-&gt;tot_len = htons(skb-&gt;len);</div><div class='add'>+		iph_set_totlen(iph, skb-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='hunk'>@@ -2235,7 +2248,8 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb,</div><div class='ctx'>  */</div><div class='ctx'> int cipso_v4_skbuff_delattr(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int ret_val;</div><div class='add'>+	int ret_val, cipso_len, hdr_len_actual, new_hdr_len_actual, new_hdr_len,</div><div class='add'>+	    hdr_len_delta;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> 	struct ip_options *opt = &amp;IPCB(skb)-&gt;opt;</div><div class='ctx'> 	unsigned char *cipso_ptr;</div><div class='hunk'>@@ -2248,16 +2262,37 @@ int cipso_v4_skbuff_delattr(struct sk_buff *skb)</div><div class='ctx'> 	if (ret_val &lt; 0)</div><div class='ctx'> 		return ret_val;</div><div class='ctx'> </div><div class='del'>-	/* the easiest thing to do is just replace the cipso option with noop</div><div class='del'>-	 * options since we don't change the size of the packet, although we</div><div class='del'>-	 * still need to recalculate the checksum */</div><div class='del'>-</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> 	cipso_ptr = (unsigned char *)iph + opt-&gt;cipso;</div><div class='del'>-	memset(cipso_ptr, IPOPT_NOOP, cipso_ptr[1]);</div><div class='add'>+	cipso_len = cipso_ptr[1];</div><div class='add'>+</div><div class='add'>+	hdr_len_actual = sizeof(struct iphdr) +</div><div class='add'>+			 cipso_v4_get_actual_opt_len((unsigned char *)(iph + 1),</div><div class='add'>+						     opt-&gt;optlen);</div><div class='add'>+	new_hdr_len_actual = hdr_len_actual - cipso_len;</div><div class='add'>+	new_hdr_len = (new_hdr_len_actual + 3) &amp; ~3;</div><div class='add'>+	hdr_len_delta = (iph-&gt;ihl &lt;&lt; 2) - new_hdr_len;</div><div class='add'>+</div><div class='add'>+	/* 1. shift any options after CIPSO to the left */</div><div class='add'>+	memmove(cipso_ptr, cipso_ptr + cipso_len,</div><div class='add'>+		new_hdr_len_actual - opt-&gt;cipso);</div><div class='add'>+	/* 2. move the whole IP header to its new place */</div><div class='add'>+	memmove((unsigned char *)iph + hdr_len_delta, iph, new_hdr_len_actual);</div><div class='add'>+	/* 3. adjust the skb layout */</div><div class='add'>+	skb_pull(skb, hdr_len_delta);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	/* 4. re-fill new padding with IPOPT_END (may now be longer) */</div><div class='add'>+	memset((unsigned char *)iph + new_hdr_len_actual, IPOPT_END,</div><div class='add'>+	       new_hdr_len - new_hdr_len_actual);</div><div class='add'>+</div><div class='add'>+	opt-&gt;optlen -= hdr_len_delta;</div><div class='ctx'> 	opt-&gt;cipso = 0;</div><div class='ctx'> 	opt-&gt;is_changed = 1;</div><div class='del'>-</div><div class='add'>+	if (hdr_len_delta != 0) {</div><div class='add'>+		iph-&gt;ihl = new_hdr_len &gt;&gt; 2;</div><div class='add'>+		iph_set_totlen(iph, skb-&gt;len);</div><div class='add'>+	}</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c<br/>index f915abff1350..1614593b6d72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/datagram.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/datagram.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/datagram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/datagram.c</a></div><div class='hunk'>@@ -1,26 +1,22 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	common UDP/RAW code</div><div class='ctx'>  *	Linux INET implementation</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * 	Hideaki YOSHIFUJI &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='del'>- *</div><div class='del'>- * 	This program is free software; you can redistribute it and/or</div><div class='del'>- * 	modify it under the terms of the GNU General Public License</div><div class='del'>- * 	as published by the Free Software Foundation; either version</div><div class='del'>- * 	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='add'>+#include &lt;net/sock_reuseport.h&gt;</div><div class='ctx'> </div><div class='del'>-int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int __ip4_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;</div><div class='hunk'>@@ -42,16 +38,17 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len</div><div class='ctx'> 	oif = sk-&gt;sk_bound_dev_if;</div><div class='ctx'> 	saddr = inet-&gt;inet_saddr;</div><div class='ctx'> 	if (ipv4_is_multicast(usin-&gt;sin_addr.s_addr)) {</div><div class='del'>-		if (!oif)</div><div class='del'>-			oif = inet-&gt;mc_index;</div><div class='add'>+		if (!oif || netif_index_is_l3_master(sock_net(sk), oif))</div><div class='add'>+			oif = READ_ONCE(inet-&gt;mc_index);</div><div class='ctx'> 		if (!saddr)</div><div class='del'>-			saddr = inet-&gt;mc_addr;</div><div class='add'>+			saddr = READ_ONCE(inet-&gt;mc_addr);</div><div class='add'>+	} else if (!oif) {</div><div class='add'>+		oif = READ_ONCE(inet-&gt;uc_index);</div><div class='ctx'> 	}</div><div class='ctx'> 	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='del'>-	rt = ip_route_connect(fl4, usin-&gt;sin_addr.s_addr, saddr,</div><div class='del'>-			      RT_CONN_FLAGS(sk), oif,</div><div class='del'>-			      sk-&gt;sk_protocol,</div><div class='del'>-			      inet-&gt;inet_sport, usin-&gt;sin_port, sk);</div><div class='add'>+	rt = ip_route_connect(fl4, usin-&gt;sin_addr.s_addr, saddr, oif,</div><div class='add'>+			      sk-&gt;sk_protocol, inet-&gt;inet_sport,</div><div class='add'>+			      usin-&gt;sin_port, sk);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='ctx'> 		err = PTR_ERR(rt);</div><div class='ctx'> 		if (err == -ENETUNREACH)</div><div class='hunk'>@@ -64,18 +61,21 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len</div><div class='ctx'> 		err = -EACCES;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Update addresses before rehashing */</div><div class='add'>+	inet-&gt;inet_daddr = fl4-&gt;daddr;</div><div class='add'>+	inet-&gt;inet_dport = usin-&gt;sin_port;</div><div class='ctx'> 	if (!inet-&gt;inet_saddr)</div><div class='del'>-		inet-&gt;inet_saddr = fl4-&gt;saddr;	/* Update source address */</div><div class='add'>+		inet-&gt;inet_saddr = fl4-&gt;saddr;</div><div class='ctx'> 	if (!inet-&gt;inet_rcv_saddr) {</div><div class='ctx'> 		inet-&gt;inet_rcv_saddr = fl4-&gt;saddr;</div><div class='ctx'> 		if (sk-&gt;sk_prot-&gt;rehash)</div><div class='ctx'> 			sk-&gt;sk_prot-&gt;rehash(sk);</div><div class='ctx'> 	}</div><div class='del'>-	inet-&gt;inet_daddr = fl4-&gt;daddr;</div><div class='del'>-	inet-&gt;inet_dport = usin-&gt;sin_port;</div><div class='add'>+	reuseport_has_conns_set(sk);</div><div class='ctx'> 	sk-&gt;sk_state = TCP_ESTABLISHED;</div><div class='ctx'> 	sk_set_txhash(sk);</div><div class='del'>-	inet-&gt;inet_id = jiffies;</div><div class='add'>+	atomic_set(&amp;inet-&gt;inet_id, get_random_u16());</div><div class='ctx'> </div><div class='ctx'> 	sk_dst_set(sk, &amp;rt-&gt;dst);</div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -84,7 +84,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ip4_datagram_connect);</div><div class='ctx'> </div><div class='del'>-int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int ip4_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='hunk'>@@ -102,8 +102,6 @@ EXPORT_SYMBOL(ip4_datagram_connect);</div><div class='ctx'> void ip4_datagram_release_cb(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	const struct ip_options_rcu *inet_opt;</div><div class='del'>-	__be32 daddr = inet-&gt;inet_daddr;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='hunk'>@@ -111,18 +109,13 @@ void ip4_datagram_release_cb(struct sock *sk)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	dst = __sk_dst_get(sk);</div><div class='del'>-	if (!dst || !dst-&gt;obsolete || dst-&gt;ops-&gt;check(dst, 0)) {</div><div class='add'>+	if (!dst || !READ_ONCE(dst-&gt;obsolete) || dst-&gt;ops-&gt;check(dst, 0)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='del'>-	if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='del'>-		daddr = inet_opt-&gt;opt.faddr;</div><div class='del'>-	rt = ip_route_output_ports(sock_net(sk), &amp;fl4, sk, daddr,</div><div class='del'>-				   inet-&gt;inet_saddr, inet-&gt;inet_dport,</div><div class='del'>-				   inet-&gt;inet_sport, sk-&gt;sk_protocol,</div><div class='del'>-				   RT_CONN_FLAGS(sk), sk-&gt;sk_bound_dev_if);</div><div class='ctx'> </div><div class='add'>+	inet_sk_init_flowi4(inet, &amp;fl4);</div><div class='add'>+	rt = ip_route_output_flow(sock_net(sk), &amp;fl4, sk);</div><div class='ctx'> 	dst = !IS_ERR(rt) ? &amp;rt-&gt;dst : NULL;</div><div class='ctx'> 	sk_dst_set(sk, dst);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c<br/>index ea4bd8a52422..942a887bf089 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/devinet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/devinet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/devinet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/devinet.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	NET3	IP device support routines.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Derived from the IP parts of dev.c 1.0.19</div><div class='ctx'>  * 		Authors:	Ross Biro</div><div class='ctx'>  *				Fred N. van Kempen, &lt;waltje@uWalt.NL.Mugnet.ORG&gt;</div><div class='hunk'>@@ -50,6 +46,7 @@</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/igmp.h&gt;</div><div class='add'>+#include "igmp_internal.h"</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -66,6 +63,11 @@</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> </div><div class='add'>+#define IPV6ONLY_FLAGS	\</div><div class='add'>+		(IFA_F_NODAD | IFA_F_OPTIMISTIC | IFA_F_DADFAILED | \</div><div class='add'>+		 IFA_F_HOMEADDRESS | IFA_F_TENTATIVE | \</div><div class='add'>+		 IFA_F_MANAGETEMPADDR | IFA_F_STABLE_PRIVACY)</div><div class='add'>+</div><div class='ctx'> static struct ipv4_devconf ipv4_devconf = {</div><div class='ctx'> 	.data = {</div><div class='ctx'> 		[IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,</div><div class='hunk'>@@ -74,6 +76,7 @@ static struct ipv4_devconf ipv4_devconf = {</div><div class='ctx'> 		[IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,</div><div class='ctx'> 		[IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL - 1] = 10000 /*ms*/,</div><div class='ctx'> 		[IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL - 1] =  1000 /*ms*/,</div><div class='add'>+		[IPV4_DEVCONF_ARP_EVICT_NOCARRIER - 1] = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -86,6 +89,7 @@ static struct ipv4_devconf ipv4_devconf_dflt = {</div><div class='ctx'> 		[IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE - 1] = 1,</div><div class='ctx'> 		[IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL - 1] = 10000 /*ms*/,</div><div class='ctx'> 		[IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL - 1] =  1000 /*ms*/,</div><div class='add'>+		[IPV4_DEVCONF_ARP_EVICT_NOCARRIER - 1] = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -100,16 +104,16 @@ static const struct nla_policy ifa_ipv4_policy[IFA_MAX+1] = {</div><div class='ctx'> 	[IFA_CACHEINFO]		= { .len = sizeof(struct ifa_cacheinfo) },</div><div class='ctx'> 	[IFA_FLAGS]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFA_RT_PRIORITY]	= { .type = NLA_U32 },</div><div class='add'>+	[IFA_TARGET_NETNSID]	= { .type = NLA_S32 },</div><div class='add'>+	[IFA_PROTO]		= { .type = NLA_U8 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IN4_ADDR_HSIZE_SHIFT	8</div><div class='ctx'> #define IN4_ADDR_HSIZE		(1U &lt;&lt; IN4_ADDR_HSIZE_SHIFT)</div><div class='ctx'> </div><div class='del'>-static struct hlist_head inet_addr_lst[IN4_ADDR_HSIZE];</div><div class='del'>-</div><div class='ctx'> static u32 inet_addr_hash(const struct net *net, __be32 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 val = (__force u32) addr ^ net_hash_mix(net);</div><div class='add'>+	u32 val = __ipv4_addr_hash(addr, net_hash_mix(net));</div><div class='ctx'> </div><div class='ctx'> 	return hash_32(val, IN4_ADDR_HSIZE_SHIFT);</div><div class='ctx'> }</div><div class='hunk'>@@ -119,13 +123,13 @@ static void inet_hash_insert(struct net *net, struct in_ifaddr *ifa)</div><div class='ctx'> 	u32 hash = inet_addr_hash(net, ifa-&gt;ifa_local);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-	hlist_add_head_rcu(&amp;ifa-&gt;hash, &amp;inet_addr_lst[hash]);</div><div class='add'>+	hlist_add_head_rcu(&amp;ifa-&gt;addr_lst, &amp;net-&gt;ipv4.inet_addr_lst[hash]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inet_hash_remove(struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-	hlist_del_init_rcu(&amp;ifa-&gt;hash);</div><div class='add'>+	hlist_del_init_rcu(&amp;ifa-&gt;addr_lst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -172,9 +176,8 @@ struct in_ifaddr *inet_lookup_ifaddr_rcu(struct net *net, __be32 addr)</div><div class='ctx'> 	u32 hash = inet_addr_hash(net, addr);</div><div class='ctx'> 	struct in_ifaddr *ifa;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(ifa, &amp;inet_addr_lst[hash], hash)</div><div class='del'>-		if (ifa-&gt;ifa_local == addr &amp;&amp;</div><div class='del'>-		    net_eq(dev_net(ifa-&gt;ifa_dev-&gt;dev), net))</div><div class='add'>+	hlist_for_each_entry_rcu(ifa, &amp;net-&gt;ipv4.inet_addr_lst[hash], addr_lst)</div><div class='add'>+		if (ifa-&gt;ifa_local == addr)</div><div class='ctx'> 			return ifa;</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -184,7 +187,8 @@ static void rtmsg_ifa(int event, struct in_ifaddr *, struct nlmsghdr *, u32);</div><div class='ctx'> </div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(inetaddr_chain);</div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(inetaddr_validator_chain);</div><div class='del'>-static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,</div><div class='add'>+static void inet_del_ifa(struct in_device *in_dev,</div><div class='add'>+			 struct in_ifaddr __rcu **ifap,</div><div class='ctx'> 			 int destroy);</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> static int devinet_sysctl_register(struct in_device *idev);</div><div class='hunk'>@@ -201,22 +205,45 @@ static void devinet_sysctl_unregister(struct in_device *idev)</div><div class='ctx'> </div><div class='ctx'> /* Locks all the inet devices. */</div><div class='ctx'> </div><div class='del'>-static struct in_ifaddr *inet_alloc_ifa(void)</div><div class='add'>+static struct in_ifaddr *inet_alloc_ifa(struct in_device *in_dev)</div><div class='ctx'> {</div><div class='del'>-	return kzalloc(sizeof(struct in_ifaddr), GFP_KERNEL);</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='add'>+	ifa = kzalloc(sizeof(*ifa), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ifa)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	in_dev_hold(in_dev);</div><div class='add'>+	ifa-&gt;ifa_dev = in_dev;</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_NODE(&amp;ifa-&gt;addr_lst);</div><div class='add'>+</div><div class='add'>+	return ifa;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inet_rcu_free_ifa(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_ifaddr *ifa = container_of(head, struct in_ifaddr, rcu_head);</div><div class='del'>-	if (ifa-&gt;ifa_dev)</div><div class='del'>-		in_dev_put(ifa-&gt;ifa_dev);</div><div class='add'>+</div><div class='add'>+	in_dev_put(ifa-&gt;ifa_dev);</div><div class='ctx'> 	kfree(ifa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inet_free_ifa(struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='del'>-	call_rcu(&amp;ifa-&gt;rcu_head, inet_rcu_free_ifa);</div><div class='add'>+	/* Our reference to ifa-&gt;ifa_dev must be freed ASAP</div><div class='add'>+	 * to release the reference to the netdev the same way.</div><div class='add'>+	 * in_dev_put() -&gt; in_dev_finish_destroy() -&gt; netdev_put()</div><div class='add'>+	 */</div><div class='add'>+	call_rcu_hurry(&amp;ifa-&gt;rcu_head, inet_rcu_free_ifa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void in_dev_free_rcu(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct in_device *idev = container_of(head, struct in_device, rcu_head);</div><div class='add'>+</div><div class='add'>+	kfree(rcu_dereference_protected(idev-&gt;mc_hash, 1));</div><div class='add'>+	kfree(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void in_dev_finish_destroy(struct in_device *idev)</div><div class='hunk'>@@ -225,15 +252,14 @@ void in_dev_finish_destroy(struct in_device *idev)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(idev-&gt;ifa_list);</div><div class='ctx'> 	WARN_ON(idev-&gt;mc_list);</div><div class='del'>-	kfree(rcu_dereference_protected(idev-&gt;mc_hash, 1));</div><div class='ctx'> #ifdef NET_REFCNT_DEBUG</div><div class='ctx'> 	pr_debug("%s: %p=%s\n", __func__, idev, dev ? dev-&gt;name : "NIL");</div><div class='ctx'> #endif</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;idev-&gt;dev_tracker);</div><div class='ctx'> 	if (!idev-&gt;dead)</div><div class='ctx'> 		pr_err("Freeing alive in_device %p\n", idev);</div><div class='ctx'> 	else</div><div class='del'>-		kfree(idev);</div><div class='add'>+		call_rcu(&amp;idev-&gt;rcu_head, in_dev_free_rcu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(in_dev_finish_destroy);</div><div class='ctx'> </div><div class='hunk'>@@ -255,22 +281,25 @@ static struct in_device *inetdev_init(struct net_device *dev)</div><div class='ctx'> 	if (!in_dev-&gt;arp_parms)</div><div class='ctx'> 		goto out_kfree;</div><div class='ctx'> 	if (IPV4_DEVCONF(in_dev-&gt;cnf, FORWARDING))</div><div class='del'>-		dev_disable_lro(dev);</div><div class='add'>+		netif_disable_lro(dev);</div><div class='ctx'> 	/* Reference in_dev-&gt;dev */</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;in_dev-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> 	/* Account for reference dev-&gt;ip_ptr (below) */</div><div class='ctx'> 	refcount_set(&amp;in_dev-&gt;refcnt, 1);</div><div class='ctx'> </div><div class='del'>-	err = devinet_sysctl_register(in_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		in_dev-&gt;dead = 1;</div><div class='del'>-		in_dev_put(in_dev);</div><div class='del'>-		in_dev = NULL;</div><div class='del'>-		goto out;</div><div class='add'>+	if (dev != blackhole_netdev) {</div><div class='add'>+		err = devinet_sysctl_register(in_dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			in_dev-&gt;dead = 1;</div><div class='add'>+			neigh_parms_release(&amp;arp_tbl, in_dev-&gt;arp_parms);</div><div class='add'>+			in_dev_put(in_dev);</div><div class='add'>+			in_dev = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		ip_mc_init_dev(in_dev);</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+			ip_mc_up(in_dev);</div><div class='ctx'> 	}</div><div class='del'>-	ip_mc_init_dev(in_dev);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-		ip_mc_up(in_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* we can receive as soon as ip_ptr is set -- do this last */</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;ip_ptr, in_dev);</div><div class='hunk'>@@ -282,16 +311,10 @@ out_kfree:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void in_dev_rcu_put(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct in_device *idev = container_of(head, struct in_device, rcu_head);</div><div class='del'>-	in_dev_put(idev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void inetdev_destroy(struct in_device *in_dev)</div><div class='ctx'> {</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +324,7 @@ static void inetdev_destroy(struct in_device *in_dev)</div><div class='ctx'> </div><div class='ctx'> 	ip_mc_destroy_dev(in_dev);</div><div class='ctx'> </div><div class='del'>-	while ((ifa = in_dev-&gt;ifa_list) != NULL) {</div><div class='add'>+	while ((ifa = rtnl_dereference(in_dev-&gt;ifa_list)) != NULL) {</div><div class='ctx'> 		inet_del_ifa(in_dev, &amp;in_dev-&gt;ifa_list, 0);</div><div class='ctx'> 		inet_free_ifa(ifa);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -312,35 +335,52 @@ static void inetdev_destroy(struct in_device *in_dev)</div><div class='ctx'> 	neigh_parms_release(&amp;arp_tbl, in_dev-&gt;arp_parms);</div><div class='ctx'> 	arp_ifdown(dev);</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;in_dev-&gt;rcu_head, in_dev_rcu_put);</div><div class='add'>+	in_dev_put(in_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init inet_blackhole_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	in_dev = inetdev_init(blackhole_netdev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(in_dev);</div><div class='ctx'> }</div><div class='add'>+late_initcall(inet_blackhole_dev_init);</div><div class='ctx'> </div><div class='ctx'> int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b)</div><div class='ctx'> {</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	for_primary_ifa(in_dev) {</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='ctx'> 		if (inet_ifa_match(a, ifa)) {</div><div class='ctx'> 			if (!b || inet_ifa_match(b, ifa)) {</div><div class='ctx'> 				rcu_read_unlock();</div><div class='ctx'> 				return 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,</div><div class='del'>-			 int destroy, struct nlmsghdr *nlh, u32 portid)</div><div class='add'>+static void __inet_del_ifa(struct in_device *in_dev,</div><div class='add'>+			   struct in_ifaddr __rcu **ifap,</div><div class='add'>+			   int destroy, struct nlmsghdr *nlh, u32 portid)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_ifaddr *promote = NULL;</div><div class='del'>-	struct in_ifaddr *ifa, *ifa1 = *ifap;</div><div class='del'>-	struct in_ifaddr *last_prim = in_dev-&gt;ifa_list;</div><div class='add'>+	struct in_ifaddr *ifa, *ifa1;</div><div class='add'>+	struct in_ifaddr __rcu **last_prim;</div><div class='ctx'> 	struct in_ifaddr *prev_prom = NULL;</div><div class='ctx'> 	int do_promote = IN_DEV_PROMOTE_SECONDARIES(in_dev);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='add'>+	ifa1 = rtnl_dereference(*ifap);</div><div class='add'>+	last_prim = ifap;</div><div class='ctx'> 	if (in_dev-&gt;dead)</div><div class='ctx'> 		goto no_promotions;</div><div class='ctx'> </div><div class='hunk'>@@ -349,12 +389,12 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,</div><div class='ctx'> 	 **/</div><div class='ctx'> </div><div class='ctx'> 	if (!(ifa1-&gt;ifa_flags &amp; IFA_F_SECONDARY)) {</div><div class='del'>-		struct in_ifaddr **ifap1 = &amp;ifa1-&gt;ifa_next;</div><div class='add'>+		struct in_ifaddr __rcu **ifap1 = &amp;ifa1-&gt;ifa_next;</div><div class='ctx'> </div><div class='del'>-		while ((ifa = *ifap1) != NULL) {</div><div class='add'>+		while ((ifa = rtnl_dereference(*ifap1)) != NULL) {</div><div class='ctx'> 			if (!(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY) &amp;&amp;</div><div class='ctx'> 			    ifa1-&gt;ifa_scope &lt;= ifa-&gt;ifa_scope)</div><div class='del'>-				last_prim = ifa;</div><div class='add'>+				last_prim = &amp;ifa-&gt;ifa_next;</div><div class='ctx'> </div><div class='ctx'> 			if (!(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY) ||</div><div class='ctx'> 			    ifa1-&gt;ifa_mask != ifa-&gt;ifa_mask ||</div><div class='hunk'>@@ -384,7 +424,7 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,</div><div class='ctx'> 	 * and later to add them back with new prefsrc. Do this</div><div class='ctx'> 	 * while all addresses are on the device list.</div><div class='ctx'> 	 */</div><div class='del'>-	for (ifa = promote; ifa; ifa = ifa-&gt;ifa_next) {</div><div class='add'>+	for (ifa = promote; ifa; ifa = rtnl_dereference(ifa-&gt;ifa_next)) {</div><div class='ctx'> 		if (ifa1-&gt;ifa_mask == ifa-&gt;ifa_mask &amp;&amp;</div><div class='ctx'> 		    inet_ifa_match(ifa1-&gt;ifa_address, ifa))</div><div class='ctx'> 			fib_del_ifaddr(ifa, ifa1);</div><div class='hunk'>@@ -410,19 +450,25 @@ no_promotions:</div><div class='ctx'> 	blocking_notifier_call_chain(&amp;inetaddr_chain, NETDEV_DOWN, ifa1);</div><div class='ctx'> </div><div class='ctx'> 	if (promote) {</div><div class='del'>-		struct in_ifaddr *next_sec = promote-&gt;ifa_next;</div><div class='add'>+		struct in_ifaddr *next_sec;</div><div class='ctx'> </div><div class='add'>+		next_sec = rtnl_dereference(promote-&gt;ifa_next);</div><div class='ctx'> 		if (prev_prom) {</div><div class='del'>-			prev_prom-&gt;ifa_next = promote-&gt;ifa_next;</div><div class='del'>-			promote-&gt;ifa_next = last_prim-&gt;ifa_next;</div><div class='del'>-			last_prim-&gt;ifa_next = promote;</div><div class='add'>+			struct in_ifaddr *last_sec;</div><div class='add'>+</div><div class='add'>+			rcu_assign_pointer(prev_prom-&gt;ifa_next, next_sec);</div><div class='add'>+</div><div class='add'>+			last_sec = rtnl_dereference(*last_prim);</div><div class='add'>+			rcu_assign_pointer(promote-&gt;ifa_next, last_sec);</div><div class='add'>+			rcu_assign_pointer(*last_prim, promote);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		promote-&gt;ifa_flags &amp;= ~IFA_F_SECONDARY;</div><div class='ctx'> 		rtmsg_ifa(RTM_NEWADDR, promote, nlh, portid);</div><div class='ctx'> 		blocking_notifier_call_chain(&amp;inetaddr_chain,</div><div class='ctx'> 				NETDEV_UP, promote);</div><div class='del'>-		for (ifa = next_sec; ifa; ifa = ifa-&gt;ifa_next) {</div><div class='add'>+		for (ifa = next_sec; ifa;</div><div class='add'>+		     ifa = rtnl_dereference(ifa-&gt;ifa_next)) {</div><div class='ctx'> 			if (ifa1-&gt;ifa_mask != ifa-&gt;ifa_mask ||</div><div class='ctx'> 			    !inet_ifa_match(ifa1-&gt;ifa_address, ifa))</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -434,36 +480,35 @@ no_promotions:</div><div class='ctx'> 		inet_free_ifa(ifa1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,</div><div class='add'>+static void inet_del_ifa(struct in_device *in_dev,</div><div class='add'>+			 struct in_ifaddr __rcu **ifap,</div><div class='ctx'> 			 int destroy)</div><div class='ctx'> {</div><div class='ctx'> 	__inet_del_ifa(in_dev, ifap, destroy, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void check_lifetime(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-static DECLARE_DELAYED_WORK(check_lifetime_work, check_lifetime);</div><div class='del'>-</div><div class='ctx'> static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 			     u32 portid, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct in_ifaddr __rcu **last_primary, **ifap;</div><div class='ctx'> 	struct in_device *in_dev = ifa-&gt;ifa_dev;</div><div class='del'>-	struct in_ifaddr *ifa1, **ifap, **last_primary;</div><div class='add'>+	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='ctx'> 	struct in_validator_info ivi;</div><div class='add'>+	struct in_ifaddr *ifa1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	if (!ifa-&gt;ifa_local) {</div><div class='del'>-		inet_free_ifa(ifa);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ifa-&gt;ifa_flags &amp;= ~IFA_F_SECONDARY;</div><div class='ctx'> 	last_primary = &amp;in_dev-&gt;ifa_list;</div><div class='ctx'> </div><div class='del'>-	for (ifap = &amp;in_dev-&gt;ifa_list; (ifa1 = *ifap) != NULL;</div><div class='del'>-	     ifap = &amp;ifa1-&gt;ifa_next) {</div><div class='add'>+	/* Don't set IPv6 only flags to IPv4 addresses */</div><div class='add'>+	ifa-&gt;ifa_flags &amp;= ~IPV6ONLY_FLAGS;</div><div class='add'>+</div><div class='add'>+	ifap = &amp;in_dev-&gt;ifa_list;</div><div class='add'>+	ifa1 = rtnl_dereference(*ifap);</div><div class='add'>+</div><div class='add'>+	while (ifa1) {</div><div class='ctx'> 		if (!(ifa1-&gt;ifa_flags &amp; IFA_F_SECONDARY) &amp;&amp;</div><div class='ctx'> 		    ifa-&gt;ifa_scope &lt;= ifa1-&gt;ifa_scope)</div><div class='ctx'> 			last_primary = &amp;ifa1-&gt;ifa_next;</div><div class='hunk'>@@ -474,11 +519,15 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 				return -EEXIST;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (ifa1-&gt;ifa_scope != ifa-&gt;ifa_scope) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "ipv4: Invalid scope value");</div><div class='ctx'> 				inet_free_ifa(ifa);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			ifa-&gt;ifa_flags |= IFA_F_SECONDARY;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ifap = &amp;ifa1-&gt;ifa_next;</div><div class='add'>+		ifa1 = rtnl_dereference(*ifap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allow any devices that wish to register ifaddr validtors to weigh</div><div class='hunk'>@@ -499,18 +548,16 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY)) {</div><div class='del'>-		prandom_seed((__force u32) ifa-&gt;ifa_local);</div><div class='add'>+	if (!(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY))</div><div class='ctx'> 		ifap = last_primary;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	ifa-&gt;ifa_next = *ifap;</div><div class='del'>-	*ifap = ifa;</div><div class='add'>+	rcu_assign_pointer(ifa-&gt;ifa_next, *ifap);</div><div class='add'>+	rcu_assign_pointer(*ifap, ifa);</div><div class='ctx'> </div><div class='ctx'> 	inet_hash_insert(dev_net(in_dev-&gt;dev), ifa);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;check_lifetime_work);</div><div class='del'>-	queue_delayed_work(system_power_efficient_wq, &amp;check_lifetime_work, 0);</div><div class='add'>+	cancel_delayed_work(&amp;net-&gt;ipv4.addr_chk_work);</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;net-&gt;ipv4.addr_chk_work, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Send message first, then call notifier.</div><div class='ctx'> 	   Notifier will trigger FIB update, so that</div><div class='hunk'>@@ -523,26 +570,21 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> static int inet_insert_ifa(struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='add'>+	if (!ifa-&gt;ifa_local) {</div><div class='add'>+		inet_free_ifa(ifa);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return __inet_insert_ifa(ifa, NULL, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = __in_dev_get_rtnl(dev);</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct in_device *in_dev = __in_dev_get_rtnl_net(dev);</div><div class='ctx'> </div><div class='del'>-	if (!in_dev) {</div><div class='del'>-		inet_free_ifa(ifa);</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-	}</div><div class='ctx'> 	ipv4_devconf_setall(in_dev);</div><div class='ctx'> 	neigh_parms_data_state_setall(in_dev-&gt;arp_parms);</div><div class='del'>-	if (ifa-&gt;ifa_dev != in_dev) {</div><div class='del'>-		WARN_ON(ifa-&gt;ifa_dev);</div><div class='del'>-		in_dev_hold(in_dev);</div><div class='del'>-		ifa-&gt;ifa_dev = in_dev;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (ipv4_is_loopback(ifa-&gt;ifa_local))</div><div class='ctx'> 		ifa-&gt;ifa_scope = RT_SCOPE_HOST;</div><div class='ctx'> 	return inet_insert_ifa(ifa);</div><div class='hunk'>@@ -570,24 +612,29 @@ EXPORT_SYMBOL(inetdev_by_index);</div><div class='ctx'> struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,</div><div class='ctx'> 				    __be32 mask)</div><div class='ctx'> {</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	for_primary_ifa(in_dev) {</div><div class='add'>+	in_dev_for_each_ifa_rtnl(ifa, in_dev) {</div><div class='ctx'> 		if (ifa-&gt;ifa_mask == mask &amp;&amp; inet_ifa_match(prefix, ifa))</div><div class='ctx'> 			return ifa;</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip_mc_config(struct sock *sk, bool join, const struct in_ifaddr *ifa)</div><div class='add'>+static int ip_mc_autojoin_config(struct net *net, bool join,</div><div class='add'>+				 const struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_IP_MULTICAST)</div><div class='ctx'> 	struct ip_mreqn mreq = {</div><div class='ctx'> 		.imr_multiaddr.s_addr = ifa-&gt;ifa_address,</div><div class='ctx'> 		.imr_ifindex = ifa-&gt;ifa_dev-&gt;dev-&gt;ifindex,</div><div class='ctx'> 	};</div><div class='add'>+	struct sock *sk = net-&gt;ipv4.mc_autojoin_sk;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (join)</div><div class='hunk'>@@ -597,33 +644,40 @@ static int ip_mc_config(struct sock *sk, bool join, const struct in_ifaddr *ifa)</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='add'>+#else</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct in_ifaddr __rcu **ifap;</div><div class='ctx'> 	struct nlattr *tb[IFA_MAX+1];</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='ctx'> 	struct ifaddrmsg *ifm;</div><div class='del'>-	struct in_ifaddr *ifa, **ifap;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+				     ifa_ipv4_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ifm = nlmsg_data(nlh);</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='ctx'> 	in_dev = inetdev_by_index(net, ifm-&gt;ifa_index);</div><div class='ctx'> 	if (!in_dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Device not found");</div><div class='ctx'> 		err = -ENODEV;</div><div class='del'>-		goto errout;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (ifap = &amp;in_dev-&gt;ifa_list; (ifa = *ifap) != NULL;</div><div class='add'>+	for (ifap = &amp;in_dev-&gt;ifa_list;</div><div class='add'>+	     (ifa = rtnl_net_dereference(net, *ifap)) != NULL;</div><div class='ctx'> 	     ifap = &amp;ifa-&gt;ifa_next) {</div><div class='ctx'> 		if (tb[IFA_LOCAL] &amp;&amp;</div><div class='ctx'> 		    ifa-&gt;ifa_local != nla_get_in_addr(tb[IFA_LOCAL]))</div><div class='hunk'>@@ -638,68 +692,77 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (ipv4_is_multicast(ifa-&gt;ifa_address))</div><div class='del'>-			ip_mc_config(net-&gt;ipv4.mc_autojoin_sk, false, ifa);</div><div class='add'>+			ip_mc_autojoin_config(net, false, ifa);</div><div class='add'>+</div><div class='ctx'> 		__inet_del_ifa(in_dev, ifap, 1, nlh, NETLINK_CB(skb).portid);</div><div class='del'>-		return 0;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	NL_SET_ERR_MSG(extack, "ipv4: Address not found");</div><div class='ctx'> 	err = -EADDRNOTAVAIL;</div><div class='del'>-errout:</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define INFINITY_LIFE_TIME	0xFFFFFFFF</div><div class='del'>-</div><div class='ctx'> static void check_lifetime(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now, next, next_sec, next_sched;</div><div class='ctx'> 	struct in_ifaddr *ifa;</div><div class='ctx'> 	struct hlist_node *n;</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	net = container_of(to_delayed_work(work), struct net, ipv4.addr_chk_work);</div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	next = round_jiffies_up(now + ADDR_CHECK_FREQUENCY);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IN4_ADDR_HSIZE; i++) {</div><div class='add'>+		struct hlist_head *head = &amp;net-&gt;ipv4.inet_addr_lst[i];</div><div class='ctx'> 		bool change_needed = false;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(ifa, &amp;inet_addr_lst[i], hash) {</div><div class='del'>-			unsigned long age;</div><div class='del'>-</div><div class='del'>-			if (ifa-&gt;ifa_flags &amp; IFA_F_PERMANENT)</div><div class='add'>+		hlist_for_each_entry_rcu(ifa, head, addr_lst) {</div><div class='add'>+			unsigned long age, tstamp;</div><div class='add'>+			u32 preferred_lft;</div><div class='add'>+			u32 valid_lft;</div><div class='add'>+			u32 flags;</div><div class='add'>+</div><div class='add'>+			flags = READ_ONCE(ifa-&gt;ifa_flags);</div><div class='add'>+			if (flags &amp; IFA_F_PERMANENT)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='add'>+			preferred_lft = READ_ONCE(ifa-&gt;ifa_preferred_lft);</div><div class='add'>+			valid_lft = READ_ONCE(ifa-&gt;ifa_valid_lft);</div><div class='add'>+			tstamp = READ_ONCE(ifa-&gt;ifa_tstamp);</div><div class='ctx'> 			/* We try to batch several events at once. */</div><div class='del'>-			age = (now - ifa-&gt;ifa_tstamp +</div><div class='add'>+			age = (now - tstamp +</div><div class='ctx'> 			       ADDRCONF_TIMER_FUZZ_MINUS) / HZ;</div><div class='ctx'> </div><div class='del'>-			if (ifa-&gt;ifa_valid_lft != INFINITY_LIFE_TIME &amp;&amp;</div><div class='del'>-			    age &gt;= ifa-&gt;ifa_valid_lft) {</div><div class='add'>+			if (valid_lft != INFINITY_LIFE_TIME &amp;&amp;</div><div class='add'>+			    age &gt;= valid_lft) {</div><div class='ctx'> 				change_needed = true;</div><div class='del'>-			} else if (ifa-&gt;ifa_preferred_lft ==</div><div class='add'>+			} else if (preferred_lft ==</div><div class='ctx'> 				   INFINITY_LIFE_TIME) {</div><div class='ctx'> 				continue;</div><div class='del'>-			} else if (age &gt;= ifa-&gt;ifa_preferred_lft) {</div><div class='del'>-				if (time_before(ifa-&gt;ifa_tstamp +</div><div class='del'>-						ifa-&gt;ifa_valid_lft * HZ, next))</div><div class='del'>-					next = ifa-&gt;ifa_tstamp +</div><div class='del'>-					       ifa-&gt;ifa_valid_lft * HZ;</div><div class='add'>+			} else if (age &gt;= preferred_lft) {</div><div class='add'>+				if (time_before(tstamp + valid_lft * HZ, next))</div><div class='add'>+					next = tstamp + valid_lft * HZ;</div><div class='ctx'> </div><div class='del'>-				if (!(ifa-&gt;ifa_flags &amp; IFA_F_DEPRECATED))</div><div class='add'>+				if (!(flags &amp; IFA_F_DEPRECATED))</div><div class='ctx'> 					change_needed = true;</div><div class='del'>-			} else if (time_before(ifa-&gt;ifa_tstamp +</div><div class='del'>-					       ifa-&gt;ifa_preferred_lft * HZ,</div><div class='add'>+			} else if (time_before(tstamp + preferred_lft * HZ,</div><div class='ctx'> 					       next)) {</div><div class='del'>-				next = ifa-&gt;ifa_tstamp +</div><div class='del'>-				       ifa-&gt;ifa_preferred_lft * HZ;</div><div class='add'>+				next = tstamp + preferred_lft * HZ;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		if (!change_needed)</div><div class='ctx'> 			continue;</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		hlist_for_each_entry_safe(ifa, n, &amp;inet_addr_lst[i], hash) {</div><div class='add'>+</div><div class='add'>+		rtnl_net_lock(net);</div><div class='add'>+		hlist_for_each_entry_safe(ifa, n, head, addr_lst) {</div><div class='ctx'> 			unsigned long age;</div><div class='ctx'> </div><div class='ctx'> 			if (ifa-&gt;ifa_flags &amp; IFA_F_PERMANENT)</div><div class='hunk'>@@ -711,15 +774,19 @@ static void check_lifetime(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 			if (ifa-&gt;ifa_valid_lft != INFINITY_LIFE_TIME &amp;&amp;</div><div class='ctx'> 			    age &gt;= ifa-&gt;ifa_valid_lft) {</div><div class='del'>-				struct in_ifaddr **ifap;</div><div class='add'>+				struct in_ifaddr __rcu **ifap;</div><div class='add'>+				struct in_ifaddr *tmp;</div><div class='ctx'> </div><div class='del'>-				for (ifap = &amp;ifa-&gt;ifa_dev-&gt;ifa_list;</div><div class='del'>-				     *ifap != NULL; ifap = &amp;(*ifap)-&gt;ifa_next) {</div><div class='del'>-					if (*ifap == ifa) {</div><div class='add'>+				ifap = &amp;ifa-&gt;ifa_dev-&gt;ifa_list;</div><div class='add'>+				tmp = rtnl_net_dereference(net, *ifap);</div><div class='add'>+				while (tmp) {</div><div class='add'>+					if (tmp == ifa) {</div><div class='ctx'> 						inet_del_ifa(ifa-&gt;ifa_dev,</div><div class='ctx'> 							     ifap, 1);</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='add'>+					ifap = &amp;tmp-&gt;ifa_next;</div><div class='add'>+					tmp = rtnl_net_dereference(net, *ifap);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if (ifa-&gt;ifa_preferred_lft !=</div><div class='ctx'> 				   INFINITY_LIFE_TIME &amp;&amp;</div><div class='hunk'>@@ -729,7 +796,7 @@ static void check_lifetime(struct work_struct *work)</div><div class='ctx'> 				rtmsg_ifa(RTM_NEWADDR, ifa, NULL, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	next_sec = round_jiffies_up(next);</div><div class='hunk'>@@ -744,65 +811,97 @@ static void check_lifetime(struct work_struct *work)</div><div class='ctx'> 	if (time_before(next_sched, now + ADDRCONF_TIMER_FUZZ_MAX))</div><div class='ctx'> 		next_sched = now + ADDRCONF_TIMER_FUZZ_MAX;</div><div class='ctx'> </div><div class='del'>-	queue_delayed_work(system_power_efficient_wq, &amp;check_lifetime_work,</div><div class='del'>-			next_sched - now);</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;net-&gt;ipv4.addr_chk_work,</div><div class='add'>+			   next_sched - now);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_ifa_lifetime(struct in_ifaddr *ifa, __u32 valid_lft,</div><div class='ctx'> 			     __u32 prefered_lft)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout;</div><div class='add'>+	u32 flags;</div><div class='ctx'> </div><div class='del'>-	ifa-&gt;ifa_flags &amp;= ~(IFA_F_PERMANENT | IFA_F_DEPRECATED);</div><div class='add'>+	flags = ifa-&gt;ifa_flags &amp; ~(IFA_F_PERMANENT | IFA_F_DEPRECATED);</div><div class='ctx'> </div><div class='ctx'> 	timeout = addrconf_timeout_fixup(valid_lft, HZ);</div><div class='ctx'> 	if (addrconf_finite_timeout(timeout))</div><div class='del'>-		ifa-&gt;ifa_valid_lft = timeout;</div><div class='add'>+		WRITE_ONCE(ifa-&gt;ifa_valid_lft, timeout);</div><div class='ctx'> 	else</div><div class='del'>-		ifa-&gt;ifa_flags |= IFA_F_PERMANENT;</div><div class='add'>+		flags |= IFA_F_PERMANENT;</div><div class='ctx'> </div><div class='ctx'> 	timeout = addrconf_timeout_fixup(prefered_lft, HZ);</div><div class='ctx'> 	if (addrconf_finite_timeout(timeout)) {</div><div class='ctx'> 		if (timeout == 0)</div><div class='del'>-			ifa-&gt;ifa_flags |= IFA_F_DEPRECATED;</div><div class='del'>-		ifa-&gt;ifa_preferred_lft = timeout;</div><div class='add'>+			flags |= IFA_F_DEPRECATED;</div><div class='add'>+		WRITE_ONCE(ifa-&gt;ifa_preferred_lft, timeout);</div><div class='ctx'> 	}</div><div class='del'>-	ifa-&gt;ifa_tstamp = jiffies;</div><div class='add'>+	WRITE_ONCE(ifa-&gt;ifa_flags, flags);</div><div class='add'>+	WRITE_ONCE(ifa-&gt;ifa_tstamp, jiffies);</div><div class='ctx'> 	if (!ifa-&gt;ifa_cstamp)</div><div class='del'>-		ifa-&gt;ifa_cstamp = ifa-&gt;ifa_tstamp;</div><div class='add'>+		WRITE_ONCE(ifa-&gt;ifa_cstamp, ifa-&gt;ifa_tstamp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,</div><div class='del'>-				       __u32 *pvalid_lft, __u32 *pprefered_lft)</div><div class='add'>+static int inet_validate_rtm(struct nlmsghdr *nlh, struct nlattr **tb,</div><div class='add'>+			     struct netlink_ext_ack *extack,</div><div class='add'>+			     __u32 *valid_lft, __u32 *prefered_lft)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr *tb[IFA_MAX+1];</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='del'>-	struct ifaddrmsg *ifm;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct in_device *in_dev;</div><div class='add'>+	struct ifaddrmsg *ifm = nlmsg_data(nlh);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,</div><div class='del'>-			  NULL);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+				     ifa_ipv4_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	ifm = nlmsg_data(nlh);</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (ifm-&gt;ifa_prefixlen &gt; 32 || !tb[IFA_LOCAL])</div><div class='del'>-		goto errout;</div><div class='add'>+	if (ifm-&gt;ifa_prefixlen &gt; 32) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid prefix length");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[IFA_LOCAL]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Local address is not supplied");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IFA_CACHEINFO]) {</div><div class='add'>+		struct ifa_cacheinfo *ci;</div><div class='add'>+</div><div class='add'>+		ci = nla_data(tb[IFA_CACHEINFO]);</div><div class='add'>+		if (!ci-&gt;ifa_valid || ci-&gt;ifa_prefered &gt; ci-&gt;ifa_valid) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: address lifetime invalid");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*valid_lft = ci-&gt;ifa_valid;</div><div class='add'>+		*prefered_lft = ci-&gt;ifa_prefered;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct in_ifaddr *inet_rtm_to_ifa(struct net *net, struct nlmsghdr *nlh,</div><div class='add'>+					 struct nlattr **tb,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifaddrmsg *ifm = nlmsg_data(nlh);</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dev = __dev_get_by_index(net, ifm-&gt;ifa_index);</div><div class='ctx'> 	err = -ENODEV;</div><div class='del'>-	if (!dev)</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Device not found");</div><div class='ctx'> 		goto errout;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+	in_dev = __in_dev_get_rtnl_net(dev);</div><div class='ctx'> 	err = -ENOBUFS;</div><div class='ctx'> 	if (!in_dev)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	ifa = inet_alloc_ifa();</div><div class='add'>+	ifa = inet_alloc_ifa(in_dev);</div><div class='ctx'> 	if (!ifa)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * A potential indev allocation can be left alive, it stays</div><div class='hunk'>@@ -812,19 +911,14 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	ipv4_devconf_setall(in_dev);</div><div class='ctx'> 	neigh_parms_data_state_setall(in_dev-&gt;arp_parms);</div><div class='del'>-	in_dev_hold(in_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!tb[IFA_ADDRESS])</div><div class='ctx'> 		tb[IFA_ADDRESS] = tb[IFA_LOCAL];</div><div class='ctx'> </div><div class='del'>-	INIT_HLIST_NODE(&amp;ifa-&gt;hash);</div><div class='ctx'> 	ifa-&gt;ifa_prefixlen = ifm-&gt;ifa_prefixlen;</div><div class='ctx'> 	ifa-&gt;ifa_mask = inet_make_mask(ifm-&gt;ifa_prefixlen);</div><div class='del'>-	ifa-&gt;ifa_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) :</div><div class='del'>-					 ifm-&gt;ifa_flags;</div><div class='add'>+	ifa-&gt;ifa_flags = nla_get_u32_default(tb[IFA_FLAGS], ifm-&gt;ifa_flags);</div><div class='ctx'> 	ifa-&gt;ifa_scope = ifm-&gt;ifa_scope;</div><div class='del'>-	ifa-&gt;ifa_dev = in_dev;</div><div class='del'>-</div><div class='ctx'> 	ifa-&gt;ifa_local = nla_get_in_addr(tb[IFA_LOCAL]);</div><div class='ctx'> 	ifa-&gt;ifa_address = nla_get_in_addr(tb[IFA_ADDRESS]);</div><div class='ctx'> </div><div class='hunk'>@@ -832,91 +926,91 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,</div><div class='ctx'> 		ifa-&gt;ifa_broadcast = nla_get_in_addr(tb[IFA_BROADCAST]);</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFA_LABEL])</div><div class='del'>-		nla_strlcpy(ifa-&gt;ifa_label, tb[IFA_LABEL], IFNAMSIZ);</div><div class='add'>+		nla_strscpy(ifa-&gt;ifa_label, tb[IFA_LABEL], IFNAMSIZ);</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy(ifa-&gt;ifa_label, dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFA_RT_PRIORITY])</div><div class='ctx'> 		ifa-&gt;ifa_rt_priority = nla_get_u32(tb[IFA_RT_PRIORITY]);</div><div class='ctx'> </div><div class='del'>-	if (tb[IFA_CACHEINFO]) {</div><div class='del'>-		struct ifa_cacheinfo *ci;</div><div class='del'>-</div><div class='del'>-		ci = nla_data(tb[IFA_CACHEINFO]);</div><div class='del'>-		if (!ci-&gt;ifa_valid || ci-&gt;ifa_prefered &gt; ci-&gt;ifa_valid) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto errout_free;</div><div class='del'>-		}</div><div class='del'>-		*pvalid_lft = ci-&gt;ifa_valid;</div><div class='del'>-		*pprefered_lft = ci-&gt;ifa_prefered;</div><div class='del'>-	}</div><div class='add'>+	if (tb[IFA_PROTO])</div><div class='add'>+		ifa-&gt;ifa_proto = nla_get_u8(tb[IFA_PROTO]);</div><div class='ctx'> </div><div class='ctx'> 	return ifa;</div><div class='ctx'> </div><div class='del'>-errout_free:</div><div class='del'>-	inet_free_ifa(ifa);</div><div class='ctx'> errout:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct in_ifaddr *find_matching_ifa(struct in_ifaddr *ifa)</div><div class='add'>+static struct in_ifaddr *find_matching_ifa(struct net *net, struct in_ifaddr *ifa)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_device *in_dev = ifa-&gt;ifa_dev;</div><div class='del'>-	struct in_ifaddr *ifa1, **ifap;</div><div class='del'>-</div><div class='del'>-	if (!ifa-&gt;ifa_local)</div><div class='del'>-		return NULL;</div><div class='add'>+	struct in_ifaddr *ifa1;</div><div class='ctx'> </div><div class='del'>-	for (ifap = &amp;in_dev-&gt;ifa_list; (ifa1 = *ifap) != NULL;</div><div class='del'>-	     ifap = &amp;ifa1-&gt;ifa_next) {</div><div class='add'>+	in_dev_for_each_ifa_rtnl_net(net, ifa1, in_dev) {</div><div class='ctx'> 		if (ifa1-&gt;ifa_mask == ifa-&gt;ifa_mask &amp;&amp;</div><div class='ctx'> 		    inet_ifa_match(ifa1-&gt;ifa_address, ifa) &amp;&amp;</div><div class='ctx'> 		    ifa1-&gt;ifa_local == ifa-&gt;ifa_local)</div><div class='ctx'> 			return ifa1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	__u32 prefered_lft = INFINITY_LIFE_TIME;</div><div class='add'>+	__u32 valid_lft = INFINITY_LIFE_TIME;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='ctx'> 	struct in_ifaddr *ifa_existing;</div><div class='del'>-	__u32 valid_lft = INFINITY_LIFE_TIME;</div><div class='del'>-	__u32 prefered_lft = INFINITY_LIFE_TIME;</div><div class='add'>+	struct nlattr *tb[IFA_MAX + 1];</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	ret = inet_validate_rtm(nlh, tb, extack, &amp;valid_lft, &amp;prefered_lft);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ifa = rtm_to_ifaddr(net, nlh, &amp;valid_lft, &amp;prefered_lft);</div><div class='del'>-	if (IS_ERR(ifa))</div><div class='del'>-		return PTR_ERR(ifa);</div><div class='add'>+	if (!nla_get_in_addr(tb[IFA_LOCAL]))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	ifa = inet_rtm_to_ifa(net, nlh, tb, extack);</div><div class='add'>+	if (IS_ERR(ifa)) {</div><div class='add'>+		ret = PTR_ERR(ifa);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ifa_existing = find_matching_ifa(ifa);</div><div class='add'>+	ifa_existing = find_matching_ifa(net, ifa);</div><div class='ctx'> 	if (!ifa_existing) {</div><div class='ctx'> 		/* It would be best to check for !NLM_F_CREATE here but</div><div class='ctx'> 		 * userspace already relies on not having to provide this.</div><div class='ctx'> 		 */</div><div class='ctx'> 		set_ifa_lifetime(ifa, valid_lft, prefered_lft);</div><div class='ctx'> 		if (ifa-&gt;ifa_flags &amp; IFA_F_MCAUTOJOIN) {</div><div class='del'>-			int ret = ip_mc_config(net-&gt;ipv4.mc_autojoin_sk,</div><div class='del'>-					       true, ifa);</div><div class='del'>-</div><div class='add'>+			ret = ip_mc_autojoin_config(net, true, ifa);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "ipv4: Multicast auto join failed");</div><div class='ctx'> 				inet_free_ifa(ifa);</div><div class='del'>-				return ret;</div><div class='add'>+				goto unlock;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		return __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid,</div><div class='del'>-					 extack);</div><div class='add'>+</div><div class='add'>+		ret = __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid, extack);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 new_metric = ifa-&gt;ifa_rt_priority;</div><div class='add'>+		u8 new_proto = ifa-&gt;ifa_proto;</div><div class='ctx'> </div><div class='ctx'> 		inet_free_ifa(ifa);</div><div class='ctx'> </div><div class='ctx'> 		if (nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL ||</div><div class='del'>-		    !(nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE))</div><div class='del'>-			return -EEXIST;</div><div class='add'>+		    !(nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Address already assigned");</div><div class='add'>+			ret = -EEXIST;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> 		ifa = ifa_existing;</div><div class='ctx'> </div><div class='ctx'> 		if (ifa-&gt;ifa_rt_priority != new_metric) {</div><div class='hunk'>@@ -924,13 +1018,19 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			ifa-&gt;ifa_rt_priority = new_metric;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ifa-&gt;ifa_proto = new_proto;</div><div class='add'>+</div><div class='ctx'> 		set_ifa_lifetime(ifa, valid_lft, prefered_lft);</div><div class='del'>-		cancel_delayed_work(&amp;check_lifetime_work);</div><div class='add'>+		cancel_delayed_work(&amp;net-&gt;ipv4.addr_chk_work);</div><div class='ctx'> 		queue_delayed_work(system_power_efficient_wq,</div><div class='del'>-				&amp;check_lifetime_work, 0);</div><div class='add'>+				   &amp;net-&gt;ipv4.addr_chk_work, 0);</div><div class='ctx'> 		rtmsg_ifa(RTM_NEWADDR, ifa, nlh, NETLINK_CB(skb).portid);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -941,17 +1041,18 @@ static int inet_abc_len(__be32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = -1;	/* Something else, probably a multicast. */</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_zeronet(addr))</div><div class='add'>+	if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 	else {</div><div class='ctx'> 		__u32 haddr = ntohl(addr);</div><div class='del'>-</div><div class='ctx'> 		if (IN_CLASSA(haddr))</div><div class='ctx'> 			rc = 8;</div><div class='ctx'> 		else if (IN_CLASSB(haddr))</div><div class='ctx'> 			rc = 16;</div><div class='ctx'> 		else if (IN_CLASSC(haddr))</div><div class='ctx'> 			rc = 24;</div><div class='add'>+		else if (IN_CLASSE(haddr))</div><div class='add'>+			rc = 32;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -962,8 +1063,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in sin_orig;</div><div class='ctx'> 	struct sockaddr_in *sin = (struct sockaddr_in *)&amp;ifr-&gt;ifr_addr;</div><div class='add'>+	struct in_ifaddr __rcu **ifap = NULL;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='del'>-	struct in_ifaddr **ifap = NULL;</div><div class='ctx'> 	struct in_ifaddr *ifa = NULL;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	char *colon;</div><div class='hunk'>@@ -1016,7 +1117,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENODEV;</div><div class='ctx'> 	dev = __dev_get_by_name(net, ifr-&gt;ifr_name);</div><div class='hunk'>@@ -1026,7 +1127,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 	if (colon)</div><div class='ctx'> 		*colon = ':';</div><div class='ctx'> </div><div class='del'>-	in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+	in_dev = __in_dev_get_rtnl_net(dev);</div><div class='ctx'> 	if (in_dev) {</div><div class='ctx'> 		if (tryaddrmatch) {</div><div class='ctx'> 			/* Matthias Andree */</div><div class='hunk'>@@ -1034,7 +1135,9 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 			/* note: we only do this for a limited set of ioctls</div><div class='ctx'> 			   and only if the original address family was AF_INET.</div><div class='ctx'> 			   This is checked above. */</div><div class='del'>-			for (ifap = &amp;in_dev-&gt;ifa_list; (ifa = *ifap) != NULL;</div><div class='add'>+</div><div class='add'>+			for (ifap = &amp;in_dev-&gt;ifa_list;</div><div class='add'>+			     (ifa = rtnl_net_dereference(net, *ifap)) != NULL;</div><div class='ctx'> 			     ifap = &amp;ifa-&gt;ifa_next) {</div><div class='ctx'> 				if (!strcmp(ifr-&gt;ifr_name, ifa-&gt;ifa_label) &amp;&amp;</div><div class='ctx'> 				    sin_orig.sin_addr.s_addr ==</div><div class='hunk'>@@ -1047,7 +1150,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 		   4.3BSD-style and passed in junk so we fall back to</div><div class='ctx'> 		   comparing just the label */</div><div class='ctx'> 		if (!ifa) {</div><div class='del'>-			for (ifap = &amp;in_dev-&gt;ifa_list; (ifa = *ifap) != NULL;</div><div class='add'>+			for (ifap = &amp;in_dev-&gt;ifa_list;</div><div class='add'>+			     (ifa = rtnl_net_dereference(net, *ifap)) != NULL;</div><div class='ctx'> 			     ifap = &amp;ifa-&gt;ifa_next)</div><div class='ctx'> 				if (!strcmp(ifr-&gt;ifr_name, ifa-&gt;ifa_label))</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -1089,7 +1193,10 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 				inet_del_ifa(in_dev, ifap, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		ret = dev_change_flags(dev, ifr-&gt;ifr_flags);</div><div class='add'>+</div><div class='add'>+		/* NETDEV_UP/DOWN/CHANGE could touch a peer dev */</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+		ret = dev_change_flags(dev, ifr-&gt;ifr_flags, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCSIFADDR:	/* Set interface address (and family) */</div><div class='hunk'>@@ -1099,10 +1206,12 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> </div><div class='ctx'> 		if (!ifa) {</div><div class='ctx'> 			ret = -ENOBUFS;</div><div class='del'>-			ifa = inet_alloc_ifa();</div><div class='add'>+			if (!in_dev)</div><div class='add'>+				break;</div><div class='add'>+			ifa = inet_alloc_ifa(in_dev);</div><div class='ctx'> 			if (!ifa)</div><div class='ctx'> 				break;</div><div class='del'>-			INIT_HLIST_NODE(&amp;ifa-&gt;hash);</div><div class='add'>+</div><div class='ctx'> 			if (colon)</div><div class='ctx'> 				memcpy(ifa-&gt;ifa_label, ifr-&gt;ifr_name, IFNAMSIZ);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -1188,15 +1297,15 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_gifconf(struct net_device *dev, char __user *buf, int len, int size)</div><div class='add'>+int inet_gifconf(struct net_device *dev, char __user *buf, int len, int size)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = __in_dev_get_rtnl(dev);</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='add'>+	struct in_device *in_dev = __in_dev_get_rtnl_net(dev);</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> 	struct ifreq ifr;</div><div class='ctx'> 	int done = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1206,7 +1315,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len, int s</div><div class='ctx'> 	if (!in_dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (ifa = in_dev-&gt;ifa_list; ifa; ifa = ifa-&gt;ifa_next) {</div><div class='add'>+	in_dev_for_each_ifa_rtnl_net(dev_net(dev), ifa, in_dev) {</div><div class='ctx'> 		if (!buf) {</div><div class='ctx'> 			done += size;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1234,29 +1343,41 @@ out:</div><div class='ctx'> static __be32 in_dev_select_addr(const struct in_device *in_dev,</div><div class='ctx'> 				 int scope)</div><div class='ctx'> {</div><div class='del'>-	for_primary_ifa(in_dev) {</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='add'>+		if (READ_ONCE(ifa-&gt;ifa_flags) &amp; IFA_F_SECONDARY)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (ifa-&gt;ifa_scope != RT_SCOPE_LINK &amp;&amp;</div><div class='ctx'> 		    ifa-&gt;ifa_scope &lt;= scope)</div><div class='ctx'> 			return ifa-&gt;ifa_local;</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope)</div><div class='ctx'> {</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> 	__be32 addr = 0;</div><div class='add'>+	unsigned char localnet_scope = RT_SCOPE_HOST;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int master_idx;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	net = dev_net_rcu(dev);</div><div class='ctx'> 	in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 	if (!in_dev)</div><div class='ctx'> 		goto no_in_dev;</div><div class='ctx'> </div><div class='del'>-	for_primary_ifa(in_dev) {</div><div class='del'>-		if (ifa-&gt;ifa_scope &gt; scope)</div><div class='add'>+	if (unlikely(IN_DEV_ROUTE_LOCALNET(in_dev)))</div><div class='add'>+		localnet_scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='add'>+		if (READ_ONCE(ifa-&gt;ifa_flags) &amp; IFA_F_SECONDARY)</div><div class='add'>+			continue;</div><div class='add'>+		if (min(ifa-&gt;ifa_scope, localnet_scope) &gt; scope)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!dst || inet_ifa_match(dst, ifa)) {</div><div class='ctx'> 			addr = ifa-&gt;ifa_local;</div><div class='hunk'>@@ -1264,7 +1385,7 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!addr)</div><div class='ctx'> 			addr = ifa-&gt;ifa_local;</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (addr)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -1309,13 +1430,20 @@ EXPORT_SYMBOL(inet_select_addr);</div><div class='ctx'> static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,</div><div class='ctx'> 			      __be32 local, int scope)</div><div class='ctx'> {</div><div class='del'>-	int same = 0;</div><div class='add'>+	unsigned char localnet_scope = RT_SCOPE_HOST;</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> 	__be32 addr = 0;</div><div class='add'>+	int same = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(IN_DEV_ROUTE_LOCALNET(in_dev)))</div><div class='add'>+		localnet_scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='add'>+		unsigned char min_scope = min(ifa-&gt;ifa_scope, localnet_scope);</div><div class='ctx'> </div><div class='del'>-	for_ifa(in_dev) {</div><div class='ctx'> 		if (!addr &amp;&amp;</div><div class='ctx'> 		    (local == ifa-&gt;ifa_local || !local) &amp;&amp;</div><div class='del'>-		    ifa-&gt;ifa_scope &lt;= scope) {</div><div class='add'>+		    min_scope &lt;= scope) {</div><div class='ctx'> 			addr = ifa-&gt;ifa_local;</div><div class='ctx'> 			if (same)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1330,7 +1458,7 @@ static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,</div><div class='ctx'> 				if (inet_ifa_match(addr, ifa))</div><div class='ctx'> 					break;</div><div class='ctx'> 				/* No, then can we use new local src? */</div><div class='del'>-				if (ifa-&gt;ifa_scope &lt;= scope) {</div><div class='add'>+				if (min_scope &lt;= scope) {</div><div class='ctx'> 					addr = ifa-&gt;ifa_local;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1338,7 +1466,7 @@ static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,</div><div class='ctx'> 				same = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return same ? addr : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1412,7 +1540,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev)</div><div class='ctx'> 	struct in_ifaddr *ifa;</div><div class='ctx'> 	int named = 0;</div><div class='ctx'> </div><div class='del'>-	for (ifa = in_dev-&gt;ifa_list; ifa; ifa = ifa-&gt;ifa_next) {</div><div class='add'>+	in_dev_for_each_ifa_rtnl(ifa, in_dev) {</div><div class='ctx'> 		char old[IFNAMSIZ], *dot;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(old, ifa-&gt;ifa_label, IFNAMSIZ);</div><div class='hunk'>@@ -1433,19 +1561,13 @@ skip:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool inetdev_valid_mtu(unsigned int mtu)</div><div class='del'>-{</div><div class='del'>-	return mtu &gt;= IPV4_MIN_MTU;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void inetdev_send_gratuitous_arp(struct net_device *dev,</div><div class='ctx'> 					struct in_device *in_dev)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> </div><div class='del'>-	for (ifa = in_dev-&gt;ifa_list; ifa;</div><div class='del'>-	     ifa = ifa-&gt;ifa_next) {</div><div class='add'>+	in_dev_for_each_ifa_rtnl(ifa, in_dev) {</div><div class='ctx'> 		arp_send(ARPOP_REQUEST, ETH_P_ARP,</div><div class='ctx'> 			 ifa-&gt;ifa_local, dev,</div><div class='ctx'> 			 ifa-&gt;ifa_local, NULL,</div><div class='hunk'>@@ -1489,16 +1611,13 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 		if (!inetdev_valid_mtu(dev-&gt;mtu))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='del'>-			struct in_ifaddr *ifa = inet_alloc_ifa();</div><div class='add'>+			struct in_ifaddr *ifa = inet_alloc_ifa(in_dev);</div><div class='ctx'> </div><div class='ctx'> 			if (ifa) {</div><div class='del'>-				INIT_HLIST_NODE(&amp;ifa-&gt;hash);</div><div class='ctx'> 				ifa-&gt;ifa_local =</div><div class='ctx'> 				  ifa-&gt;ifa_address = htonl(INADDR_LOOPBACK);</div><div class='ctx'> 				ifa-&gt;ifa_prefixlen = 8;</div><div class='ctx'> 				ifa-&gt;ifa_mask = inet_make_mask(8);</div><div class='del'>-				in_dev_hold(in_dev);</div><div class='del'>-				ifa-&gt;ifa_dev = in_dev;</div><div class='ctx'> 				ifa-&gt;ifa_scope = RT_SCOPE_HOST;</div><div class='ctx'> 				memcpy(ifa-&gt;ifa_label, dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> 				set_ifa_lifetime(ifa, INFINITY_LIFE_TIME,</div><div class='hunk'>@@ -1509,11 +1628,11 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ip_mc_up(in_dev);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='ctx'> 		if (!IN_DEV_ARP_NOTIFY(in_dev))</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_NOTIFY_PEERS:</div><div class='ctx'> 		/* Send gratuitous ARP to notify of link change */</div><div class='ctx'> 		inetdev_send_gratuitous_arp(dev, in_dev);</div><div class='hunk'>@@ -1531,7 +1650,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 		if (inetdev_valid_mtu(dev-&gt;mtu))</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* disable IP when MTU is not enough */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='ctx'> 		inetdev_destroy(in_dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1561,6 +1680,7 @@ static size_t inet_nlmsg_size(void)</div><div class='ctx'> 	       + nla_total_size(4) /* IFA_BROADCAST */</div><div class='ctx'> 	       + nla_total_size(IFNAMSIZ) /* IFA_LABEL */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFA_FLAGS */</div><div class='add'>+	       + nla_total_size(1)  /* IFA_PROTO */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFA_RT_PRIORITY */</div><div class='ctx'> 	       + nla_total_size(sizeof(struct ifa_cacheinfo)); /* IFA_CACHEINFO */</div><div class='ctx'> }</div><div class='hunk'>@@ -1583,29 +1703,43 @@ static int put_cacheinfo(struct sk_buff *skb, unsigned long cstamp,</div><div class='ctx'> 	return nla_put(skb, IFA_CACHEINFO, sizeof(ci), &amp;ci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,</div><div class='del'>-			    u32 portid, u32 seq, int event, unsigned int flags)</div><div class='add'>+static int inet_fill_ifaddr(struct sk_buff *skb, const struct in_ifaddr *ifa,</div><div class='add'>+			    struct inet_fill_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifaddrmsg *ifm;</div><div class='ctx'> 	struct nlmsghdr  *nlh;</div><div class='add'>+	unsigned long tstamp;</div><div class='ctx'> 	u32 preferred, valid;</div><div class='add'>+	u32 flags;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*ifm), flags);</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;event, sizeof(*ifm),</div><div class='add'>+			args-&gt;flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	ifm = nlmsg_data(nlh);</div><div class='ctx'> 	ifm-&gt;ifa_family = AF_INET;</div><div class='ctx'> 	ifm-&gt;ifa_prefixlen = ifa-&gt;ifa_prefixlen;</div><div class='del'>-	ifm-&gt;ifa_flags = ifa-&gt;ifa_flags;</div><div class='add'>+</div><div class='add'>+	flags = READ_ONCE(ifa-&gt;ifa_flags);</div><div class='add'>+	/* Warning : ifm-&gt;ifa_flags is an __u8, it holds only 8 bits.</div><div class='add'>+	 * The 32bit value is given in IFA_FLAGS attribute.</div><div class='add'>+	 */</div><div class='add'>+	ifm-&gt;ifa_flags = (__u8)flags;</div><div class='add'>+</div><div class='ctx'> 	ifm-&gt;ifa_scope = ifa-&gt;ifa_scope;</div><div class='ctx'> 	ifm-&gt;ifa_index = ifa-&gt;ifa_dev-&gt;dev-&gt;ifindex;</div><div class='ctx'> </div><div class='del'>-	if (!(ifm-&gt;ifa_flags &amp; IFA_F_PERMANENT)) {</div><div class='del'>-		preferred = ifa-&gt;ifa_preferred_lft;</div><div class='del'>-		valid = ifa-&gt;ifa_valid_lft;</div><div class='add'>+	if (args-&gt;netnsid &gt;= 0 &amp;&amp;</div><div class='add'>+	    nla_put_s32(skb, IFA_TARGET_NETNSID, args-&gt;netnsid))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	tstamp = READ_ONCE(ifa-&gt;ifa_tstamp);</div><div class='add'>+	if (!(flags &amp; IFA_F_PERMANENT)) {</div><div class='add'>+		preferred = READ_ONCE(ifa-&gt;ifa_preferred_lft);</div><div class='add'>+		valid = READ_ONCE(ifa-&gt;ifa_valid_lft);</div><div class='ctx'> 		if (preferred != INFINITY_LIFE_TIME) {</div><div class='del'>-			long tval = (jiffies - ifa-&gt;ifa_tstamp) / HZ;</div><div class='add'>+			long tval = (jiffies - tstamp) / HZ;</div><div class='ctx'> </div><div class='ctx'> 			if (preferred &gt; tval)</div><div class='ctx'> 				preferred -= tval;</div><div class='hunk'>@@ -1630,10 +1764,12 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,</div><div class='ctx'> 	     nla_put_in_addr(skb, IFA_BROADCAST, ifa-&gt;ifa_broadcast)) ||</div><div class='ctx'> 	    (ifa-&gt;ifa_label[0] &amp;&amp;</div><div class='ctx'> 	     nla_put_string(skb, IFA_LABEL, ifa-&gt;ifa_label)) ||</div><div class='del'>-	    nla_put_u32(skb, IFA_FLAGS, ifa-&gt;ifa_flags) ||</div><div class='add'>+	    (ifa-&gt;ifa_proto &amp;&amp;</div><div class='add'>+	     nla_put_u8(skb, IFA_PROTO, ifa-&gt;ifa_proto)) ||</div><div class='add'>+	    nla_put_u32(skb, IFA_FLAGS, flags) ||</div><div class='ctx'> 	    (ifa-&gt;ifa_rt_priority &amp;&amp;</div><div class='ctx'> 	     nla_put_u32(skb, IFA_RT_PRIORITY, ifa-&gt;ifa_rt_priority)) ||</div><div class='del'>-	    put_cacheinfo(skb, ifa-&gt;ifa_cstamp, ifa-&gt;ifa_tstamp,</div><div class='add'>+	    put_cacheinfo(skb, READ_ONCE(ifa-&gt;ifa_cstamp), tstamp,</div><div class='ctx'> 			  preferred, valid))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1645,68 +1781,232 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,</div><div class='add'>+				      struct inet_fill_args *fillargs,</div><div class='add'>+				      struct net **tgt_net, struct sock *sk,</div><div class='add'>+				      struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct nlattr *tb[IFA_MAX+1];</div><div class='add'>+	struct ifaddrmsg *ifm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid header for address dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;ifa_prefixlen || ifm-&gt;ifa_flags || ifm-&gt;ifa_scope) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid values in header for address dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fillargs-&gt;ifindex = ifm-&gt;ifa_index;</div><div class='add'>+	if (fillargs-&gt;ifindex) {</div><div class='add'>+		cb-&gt;answer_flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+		fillargs-&gt;flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+					    ifa_ipv4_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IFA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i == IFA_TARGET_NETNSID) {</div><div class='add'>+			struct net *net;</div><div class='add'>+</div><div class='add'>+			fillargs-&gt;netnsid = nla_get_s32(tb[i]);</div><div class='add'>+</div><div class='add'>+			net = rtnl_get_net_ns_capable(sk, fillargs-&gt;netnsid);</div><div class='add'>+			if (IS_ERR(net)) {</div><div class='add'>+				fillargs-&gt;netnsid = -1;</div><div class='add'>+				NL_SET_ERR_MSG(extack, "ipv4: Invalid target network namespace id");</div><div class='add'>+				return PTR_ERR(net);</div><div class='add'>+			}</div><div class='add'>+			*tgt_net = net;</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Unsupported attribute in dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_dev_dump_ifmcaddr(struct in_device *in_dev, struct sk_buff *skb,</div><div class='add'>+				struct netlink_callback *cb, int *s_ip_idx,</div><div class='add'>+				struct inet_fill_args *fillargs)</div><div class='add'>+{</div><div class='add'>+	struct ip_mc_list *im;</div><div class='add'>+	int ip_idx = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (im = rcu_dereference(in_dev-&gt;mc_list);</div><div class='add'>+	     im;</div><div class='add'>+	     im = rcu_dereference(im-&gt;next_rcu)) {</div><div class='add'>+		if (ip_idx &lt; *s_ip_idx) {</div><div class='add'>+			ip_idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = inet_fill_ifmcaddr(skb, in_dev-&gt;dev, im, fillargs);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+		ip_idx++;</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+	ip_idx = 0;</div><div class='add'>+done:</div><div class='add'>+	*s_ip_idx = ip_idx;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_dev_dump_ifaddr(struct in_device *in_dev, struct sk_buff *skb,</div><div class='add'>+			      struct netlink_callback *cb, int *s_ip_idx,</div><div class='add'>+			      struct inet_fill_args *fillargs)</div><div class='add'>+{</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+	int ip_idx = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='add'>+		if (ip_idx &lt; *s_ip_idx) {</div><div class='add'>+			ip_idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		err = inet_fill_ifaddr(skb, ifa, fillargs);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+		ip_idx++;</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+	ip_idx = 0;</div><div class='add'>+done:</div><div class='add'>+	*s_ip_idx = ip_idx;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_dev_dump_addr(struct in_device *in_dev, struct sk_buff *skb,</div><div class='add'>+			    struct netlink_callback *cb, int *s_ip_idx,</div><div class='add'>+			    struct inet_fill_args *fillargs)</div><div class='add'>+{</div><div class='add'>+	switch (fillargs-&gt;event) {</div><div class='add'>+	case RTM_NEWADDR:</div><div class='add'>+		return in_dev_dump_ifaddr(in_dev, skb, cb, s_ip_idx, fillargs);</div><div class='add'>+	case RTM_GETMULTICAST:</div><div class='add'>+		return in_dev_dump_ifmcaddr(in_dev, skb, cb, s_ip_idx,</div><div class='add'>+					    fillargs);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Combine dev_addr_genid and dev_base_seq to detect changes.</div><div class='add'>+ */</div><div class='add'>+static u32 inet_base_seq(const struct net *net)</div><div class='ctx'> {</div><div class='add'>+	u32 res = atomic_read(&amp;net-&gt;ipv4.dev_addr_genid) +</div><div class='add'>+		  READ_ONCE(net-&gt;dev_base_seq);</div><div class='add'>+</div><div class='add'>+	/* Must not return 0 (see nl_dump_check_consistent()).</div><div class='add'>+	 * Chose a value far away from 0.</div><div class='add'>+	 */</div><div class='add'>+	if (!res)</div><div class='add'>+		res = 0x80000000;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inet_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+			  int event)</div><div class='add'>+{</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct inet_fill_args fillargs = {</div><div class='add'>+		.portid = NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+		.seq = nlh-&gt;nlmsg_seq,</div><div class='add'>+		.event = event,</div><div class='add'>+		.flags = NLM_F_MULTI,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+	};</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx, s_idx;</div><div class='del'>-	int ip_idx, s_ip_idx;</div><div class='del'>-	struct net_device *dev;</div><div class='add'>+	struct net *tgt_net = net;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+		int ip_idx;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='del'>-	struct in_ifaddr *ifa;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = idx = cb-&gt;args[1];</div><div class='del'>-	s_ip_idx = ip_idx = cb-&gt;args[2];</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = inet_valid_dump_ifaddr_req(nlh, &amp;fillargs, &amp;tgt_net,</div><div class='add'>+						 skb-&gt;sk, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		cb-&gt;seq = atomic_read(&amp;net-&gt;ipv4.dev_addr_genid) ^</div><div class='del'>-			  net-&gt;dev_base_seq;</div><div class='del'>-		hlist_for_each_entry_rcu(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			if (h &gt; s_h || idx &gt; s_idx)</div><div class='del'>-				s_ip_idx = 0;</div><div class='add'>+		if (fillargs.ifindex) {</div><div class='add'>+			dev = dev_get_by_index_rcu(tgt_net, fillargs.ifindex);</div><div class='add'>+			if (!dev) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='ctx'> 			in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 			if (!in_dev)</div><div class='del'>-				goto cont;</div><div class='del'>-</div><div class='del'>-			for (ifa = in_dev-&gt;ifa_list, ip_idx = 0; ifa;</div><div class='del'>-			     ifa = ifa-&gt;ifa_next, ip_idx++) {</div><div class='del'>-				if (ip_idx &lt; s_ip_idx)</div><div class='del'>-					continue;</div><div class='del'>-				if (inet_fill_ifaddr(skb, ifa,</div><div class='del'>-					     NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					     cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					     RTM_NEWADDR, NLM_F_MULTI) &lt; 0) {</div><div class='del'>-					rcu_read_unlock();</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-				nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='del'>-			}</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='add'>+				goto done;</div><div class='add'>+			err = in_dev_dump_addr(in_dev, skb, cb, &amp;ctx-&gt;ip_idx,</div><div class='add'>+					       &amp;fillargs);</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cb-&gt;seq = inet_base_seq(tgt_net);</div><div class='add'>+</div><div class='add'>+	for_each_netdev_dump(tgt_net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+		if (!in_dev)</div><div class='add'>+			continue;</div><div class='add'>+		err = in_dev_dump_addr(in_dev, skb, cb, &amp;ctx-&gt;ip_idx,</div><div class='add'>+				       &amp;fillargs);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='ctx'> done:</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[2] = ip_idx;</div><div class='add'>+	if (fillargs.netnsid &gt;= 0)</div><div class='add'>+		put_net(tgt_net);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return inet_dump_addr(skb, cb, RTM_NEWADDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inet_dump_ifmcaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return inet_dump_addr(skb, cb, RTM_GETMULTICAST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 		      u32 portid)</div><div class='ctx'> {</div><div class='add'>+	struct inet_fill_args fillargs = {</div><div class='add'>+		.portid = portid,</div><div class='add'>+		.seq = nlh ? nlh-&gt;nlmsg_seq : 0,</div><div class='add'>+		.event = event,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+	};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	u32 seq = nlh ? nlh-&gt;nlmsg_seq : 0;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> </div><div class='hunk'>@@ -1715,7 +2015,7 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = inet_fill_ifaddr(skb, ifa, portid, seq, event, 0);</div><div class='add'>+	err = inet_fill_ifaddr(skb, ifa, &amp;fillargs);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in inet_nlmsg_size() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -1725,8 +2025,7 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,</div><div class='ctx'> 	rtnl_notify(skb, net, portid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t inet_get_link_af_size(const struct net_device *dev,</div><div class='hunk'>@@ -1755,7 +2054,7 @@ static int inet_fill_link_af(struct sk_buff *skb, const struct net_device *dev,</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IPV4_DEVCONF_MAX; i++)</div><div class='del'>-		((u32 *) nla_data(nla))[i] = in_dev-&gt;cnf.data[i];</div><div class='add'>+		((u32 *) nla_data(nla))[i] = READ_ONCE(in_dev-&gt;cnf.data[i]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1765,15 +2064,17 @@ static const struct nla_policy inet_af_policy[IFLA_INET_MAX+1] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int inet_validate_link_af(const struct net_device *dev,</div><div class='del'>-				 const struct nlattr *nla)</div><div class='add'>+				 const struct nlattr *nla,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *a, *tb[IFLA_INET_MAX+1];</div><div class='ctx'> 	int err, rem;</div><div class='ctx'> </div><div class='del'>-	if (dev &amp;&amp; !__in_dev_get_rcu(dev))</div><div class='add'>+	if (dev &amp;&amp; !__in_dev_get_rtnl(dev))</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, IFLA_INET_MAX, nla, inet_af_policy, NULL);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla,</div><div class='add'>+					  inet_af_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1792,17 +2093,18 @@ static int inet_validate_link_af(const struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla)</div><div class='add'>+static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	struct in_device *in_dev = __in_dev_get_rtnl(dev);</div><div class='ctx'> 	struct nlattr *a, *tb[IFLA_INET_MAX+1];</div><div class='ctx'> 	int rem;</div><div class='ctx'> </div><div class='ctx'> 	if (!in_dev)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(tb, IFLA_INET_MAX, nla, NULL, NULL) &lt; 0)</div><div class='del'>-		BUG();</div><div class='add'>+	if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_INET_CONF]) {</div><div class='ctx'> 		nla_for_each_nested(a, tb[IFLA_INET_CONF], rem)</div><div class='hunk'>@@ -1838,9 +2140,9 @@ static int inet_netconf_msgsize_devconf(int type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex,</div><div class='del'>-				     struct ipv4_devconf *devconf, u32 portid,</div><div class='del'>-				     u32 seq, int event, unsigned int flags,</div><div class='del'>-				     int type)</div><div class='add'>+				     const struct ipv4_devconf *devconf,</div><div class='add'>+				     u32 portid, u32 seq, int event,</div><div class='add'>+				     unsigned int flags, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlmsghdr  *nlh;</div><div class='ctx'> 	struct netconfmsg *ncm;</div><div class='hunk'>@@ -1865,27 +2167,28 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex,</div><div class='ctx'> </div><div class='ctx'> 	if ((all || type == NETCONFA_FORWARDING) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_FORWARDING,</div><div class='del'>-			IPV4_DEVCONF(*devconf, FORWARDING)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf, FORWARDING)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if ((all || type == NETCONFA_RP_FILTER) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_RP_FILTER,</div><div class='del'>-			IPV4_DEVCONF(*devconf, RP_FILTER)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf, RP_FILTER)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if ((all || type == NETCONFA_MC_FORWARDING) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_MC_FORWARDING,</div><div class='del'>-			IPV4_DEVCONF(*devconf, MC_FORWARDING)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf, MC_FORWARDING)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if ((all || type == NETCONFA_BC_FORWARDING) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_BC_FORWARDING,</div><div class='del'>-			IPV4_DEVCONF(*devconf, BC_FORWARDING)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf, BC_FORWARDING)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if ((all || type == NETCONFA_PROXY_NEIGH) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_PROXY_NEIGH,</div><div class='del'>-			IPV4_DEVCONF(*devconf, PROXY_ARP)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf, PROXY_ARP)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if ((all || type == NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,</div><div class='del'>-			IPV4_DEVCONF(*devconf, IGNORE_ROUTES_WITH_LINKDOWN)) &lt; 0)</div><div class='add'>+			IPV4_DEVCONF_RO(*devconf,</div><div class='add'>+					IGNORE_ROUTES_WITH_LINKDOWN)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1918,8 +2221,7 @@ void inet_netconf_notify_devconf(struct net *net, int event, int type,</div><div class='ctx'> 	rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {</div><div class='hunk'>@@ -1930,28 +2232,64 @@ static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {</div><div class='ctx'> 	[NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN]	= { .len = sizeof(int) },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int inet_netconf_valid_get_req(struct sk_buff *skb,</div><div class='add'>+				      const struct nlmsghdr *nlh,</div><div class='add'>+				      struct nlattr **tb,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(struct netconfmsg))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid header for netconf get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),</div><div class='add'>+					      tb, NETCONFA_MAX,</div><div class='add'>+					      devconf_ipv4_policy, extack);</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),</div><div class='add'>+					    tb, NETCONFA_MAX,</div><div class='add'>+					    devconf_ipv4_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NETCONFA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NETCONFA_IFINDEX:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Unsupported attribute in netconf get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> 				    struct nlmsghdr *nlh,</div><div class='ctx'> 				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='del'>-	struct nlattr *tb[NETCONFA_MAX+1];</div><div class='del'>-	struct netconfmsg *ncm;</div><div class='add'>+	struct nlattr *tb[NETCONFA_MAX + 1];</div><div class='add'>+	const struct ipv4_devconf *devconf;</div><div class='add'>+	struct in_device *in_dev = NULL;</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct ipv4_devconf *devconf;</div><div class='del'>-	struct in_device *in_dev;</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	int ifindex;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,</div><div class='del'>-			  devconf_ipv4_policy, extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='add'>+	err = inet_netconf_valid_get_req(in_skb, nlh, tb, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (!tb[NETCONFA_IFINDEX])</div><div class='del'>-		goto errout;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ifindex = nla_get_s32(tb[NETCONFA_IFINDEX]);</div><div class='ctx'> 	switch (ifindex) {</div><div class='hunk'>@@ -1962,10 +2300,10 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> 		devconf = net-&gt;ipv4.devconf_dflt;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev = __dev_get_by_index(net, ifindex);</div><div class='del'>-		if (!dev)</div><div class='del'>-			goto errout;</div><div class='del'>-		in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		dev = dev_get_by_index(net, ifindex);</div><div class='add'>+		if (dev)</div><div class='add'>+			in_dev = in_dev_get(dev);</div><div class='ctx'> 		if (!in_dev)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		devconf = &amp;in_dev-&gt;cnf;</div><div class='hunk'>@@ -1989,78 +2327,79 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='ctx'> errout:</div><div class='add'>+	if (in_dev)</div><div class='add'>+		in_dev_put(in_dev);</div><div class='add'>+	dev_put(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_netconf_dump_devconf(struct sk_buff *skb,</div><div class='ctx'> 				     struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx, s_idx;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+		unsigned int all_default;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+	const struct in_device *in_dev;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct in_device *in_dev;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = idx = cb-&gt;args[1];</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+		struct netconfmsg *ncm;</div><div class='ctx'> </div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		cb-&gt;seq = atomic_read(&amp;net-&gt;ipv4.dev_addr_genid) ^</div><div class='del'>-			  net-&gt;dev_base_seq;</div><div class='del'>-		hlist_for_each_entry_rcu(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			in_dev = __in_dev_get_rcu(dev);</div><div class='del'>-			if (!in_dev)</div><div class='del'>-				goto cont;</div><div class='del'>-</div><div class='del'>-			if (inet_netconf_fill_devconf(skb, dev-&gt;ifindex,</div><div class='del'>-						      &amp;in_dev-&gt;cnf,</div><div class='del'>-						      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						      RTM_NEWNETCONF,</div><div class='del'>-						      NLM_F_MULTI,</div><div class='del'>-						      NETCONFA_ALL) &lt; 0) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='add'>+		if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(*ncm))) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Invalid header for netconf dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (nlmsg_attrlen(nlh, sizeof(*ncm))) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Invalid data after header in netconf dump request");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='del'>-	if (h == NETDEV_HASHENTRIES) {</div><div class='del'>-		if (inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,</div><div class='del'>-					      net-&gt;ipv4.devconf_all,</div><div class='del'>-					      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					      RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='del'>-					      NETCONFA_ALL) &lt; 0)</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+		if (!in_dev)</div><div class='add'>+			continue;</div><div class='add'>+		err = inet_netconf_fill_devconf(skb, dev-&gt;ifindex,</div><div class='add'>+						&amp;in_dev-&gt;cnf,</div><div class='add'>+						NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						nlh-&gt;nlmsg_seq,</div><div class='add'>+						RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='add'>+						NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='del'>-		else</div><div class='del'>-			h++;</div><div class='del'>-	}</div><div class='del'>-	if (h == NETDEV_HASHENTRIES + 1) {</div><div class='del'>-		if (inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,</div><div class='del'>-					      net-&gt;ipv4.devconf_dflt,</div><div class='del'>-					      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					      RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='del'>-					      NETCONFA_ALL) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;all_default == 0) {</div><div class='add'>+		err = inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,</div><div class='add'>+						net-&gt;ipv4.devconf_all,</div><div class='add'>+						NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						nlh-&gt;nlmsg_seq,</div><div class='add'>+						RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='add'>+						NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='del'>-		else</div><div class='del'>-			h++;</div><div class='add'>+		ctx-&gt;all_default++;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;all_default == 1) {</div><div class='add'>+		err = inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,</div><div class='add'>+						net-&gt;ipv4.devconf_dflt,</div><div class='add'>+						NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						nlh-&gt;nlmsg_seq,</div><div class='add'>+						RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='add'>+						NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+		ctx-&gt;all_default++;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -2103,7 +2442,7 @@ static void inet_forward_change(struct net *net)</div><div class='ctx'> 		if (on)</div><div class='ctx'> 			dev_disable_lro(dev);</div><div class='ctx'> </div><div class='del'>-		in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+		in_dev = __in_dev_get_rtnl_net(dev);</div><div class='ctx'> 		if (in_dev) {</div><div class='ctx'> 			IN_DEV_CONF_SET(in_dev, FORWARDING, on);</div><div class='ctx'> 			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='hunk'>@@ -2126,9 +2465,8 @@ static int devinet_conf_ifindex(struct net *net, struct ipv4_devconf *cnf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int devinet_conf_proc(struct ctl_table *ctl, int write,</div><div class='del'>-			     void __user *buffer,</div><div class='del'>-			     size_t *lenp, loff_t *ppos)</div><div class='add'>+static int devinet_conf_proc(const struct ctl_table *ctl, int write,</div><div class='add'>+			     void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int old_value = *(int *)ctl-&gt;data;</div><div class='ctx'> 	int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='hunk'>@@ -2179,20 +2517,23 @@ static int devinet_conf_proc(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int devinet_sysctl_forward(struct ctl_table *ctl, int write,</div><div class='del'>-				  void __user *buffer,</div><div class='del'>-				  size_t *lenp, loff_t *ppos)</div><div class='add'>+static int devinet_sysctl_forward(const struct ctl_table *ctl, int write,</div><div class='add'>+				  void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int val = *valp;</div><div class='ctx'> 	loff_t pos = *ppos;</div><div class='del'>-	int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='add'>+	struct net *net = ctl-&gt;extra2;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (write &amp;&amp; *valp != val) {</div><div class='del'>-		struct net *net = ctl-&gt;extra2;</div><div class='add'>+	if (write &amp;&amp; !ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='add'>+	if (write &amp;&amp; *valp != val) {</div><div class='ctx'> 		if (valp != &amp;IPV4_DEVCONF_DFLT(net, FORWARDING)) {</div><div class='del'>-			if (!rtnl_trylock()) {</div><div class='add'>+			if (!rtnl_net_trylock(net)) {</div><div class='ctx'> 				/* Restore the original values before restarting */</div><div class='ctx'> 				*valp = val;</div><div class='ctx'> 				*ppos = pos;</div><div class='hunk'>@@ -2211,7 +2552,7 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write,</div><div class='ctx'> 							    idev-&gt;dev-&gt;ifindex,</div><div class='ctx'> 							    cnf);</div><div class='ctx'> 			}</div><div class='del'>-			rtnl_unlock();</div><div class='add'>+			rtnl_net_unlock(net);</div><div class='ctx'> 			rt_cache_flush(net);</div><div class='ctx'> 		} else</div><div class='ctx'> 			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='hunk'>@@ -2223,9 +2564,8 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,</div><div class='del'>-				void __user *buffer,</div><div class='del'>-				size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_doint_and_flush(const struct ctl_table *ctl, int write,</div><div class='add'>+				void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int val = *valp;</div><div class='hunk'>@@ -2263,7 +2603,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,</div><div class='ctx'> </div><div class='ctx'> static struct devinet_sysctl_table {</div><div class='ctx'> 	struct ctl_table_header *sysctl_header;</div><div class='del'>-	struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];</div><div class='add'>+	struct ctl_table devinet_vars[IPV4_DEVCONF_MAX];</div><div class='ctx'> } devinet_sysctl = {</div><div class='ctx'> 	.devinet_vars = {</div><div class='ctx'> 		DEVINET_SYSCTL_COMPLEX_ENTRY(FORWARDING, "forwarding",</div><div class='hunk'>@@ -2290,6 +2630,8 @@ static struct devinet_sysctl_table {</div><div class='ctx'> 		DEVINET_SYSCTL_RW_ENTRY(ARP_IGNORE, "arp_ignore"),</div><div class='ctx'> 		DEVINET_SYSCTL_RW_ENTRY(ARP_ACCEPT, "arp_accept"),</div><div class='ctx'> 		DEVINET_SYSCTL_RW_ENTRY(ARP_NOTIFY, "arp_notify"),</div><div class='add'>+		DEVINET_SYSCTL_RW_ENTRY(ARP_EVICT_NOCARRIER,</div><div class='add'>+					"arp_evict_nocarrier"),</div><div class='ctx'> 		DEVINET_SYSCTL_RW_ENTRY(PROXY_ARP_PVLAN, "proxy_arp_pvlan"),</div><div class='ctx'> 		DEVINET_SYSCTL_RW_ENTRY(FORCE_IGMP_VERSION,</div><div class='ctx'> 					"force_igmp_version"),</div><div class='hunk'>@@ -2320,11 +2662,11 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name,</div><div class='ctx'> 	struct devinet_sysctl_table *t;</div><div class='ctx'> 	char path[sizeof("net/ipv4/conf/") + IFNAMSIZ];</div><div class='ctx'> </div><div class='del'>-	t = kmemdup(&amp;devinet_sysctl, sizeof(*t), GFP_KERNEL);</div><div class='add'>+	t = kmemdup(&amp;devinet_sysctl, sizeof(*t), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(t-&gt;devinet_vars) - 1; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(t-&gt;devinet_vars); i++) {</div><div class='ctx'> 		t-&gt;devinet_vars[i].data += (char *)p - (char *)&amp;ipv4_devconf;</div><div class='ctx'> 		t-&gt;devinet_vars[i].extra1 = p;</div><div class='ctx'> 		t-&gt;devinet_vars[i].extra2 = net;</div><div class='hunk'>@@ -2345,7 +2687,7 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name,</div><div class='ctx'> free:</div><div class='ctx'> 	kfree(t);</div><div class='ctx'> out:</div><div class='del'>-	return -ENOBUFS;</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devinet_sysctl_unregister(struct net *net,</div><div class='hunk'>@@ -2398,41 +2740,66 @@ static struct ctl_table ctl_forward_entry[] = {</div><div class='ctx'> 		.extra1		= &amp;ipv4_devconf,</div><div class='ctx'> 		.extra2		= &amp;init_net,</div><div class='ctx'> 	},</div><div class='del'>-	{ },</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static __net_init int devinet_init_net(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct ipv4_devconf *all, *dflt;</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-	struct ctl_table *tbl = ctl_forward_entry;</div><div class='ctx'> 	struct ctl_table_header *forw_hdr;</div><div class='add'>+	struct ctl_table *tbl;</div><div class='ctx'> #endif</div><div class='add'>+	struct ipv4_devconf *all, *dflt;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	all = &amp;ipv4_devconf;</div><div class='del'>-	dflt = &amp;ipv4_devconf_dflt;</div><div class='add'>+	net-&gt;ipv4.inet_addr_lst = kmalloc_array(IN4_ADDR_HSIZE,</div><div class='add'>+						sizeof(struct hlist_head),</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;ipv4.inet_addr_lst)</div><div class='add'>+		goto err_alloc_hash;</div><div class='ctx'> </div><div class='del'>-	if (!net_eq(net, &amp;init_net)) {</div><div class='del'>-		all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);</div><div class='del'>-		if (!all)</div><div class='del'>-			goto err_alloc_all;</div><div class='add'>+	all = kmemdup(&amp;ipv4_devconf, sizeof(ipv4_devconf), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		goto err_alloc_all;</div><div class='ctx'> </div><div class='del'>-		dflt = kmemdup(dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL);</div><div class='del'>-		if (!dflt)</div><div class='del'>-			goto err_alloc_dflt;</div><div class='add'>+	dflt = kmemdup(&amp;ipv4_devconf_dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL);</div><div class='add'>+	if (!dflt)</div><div class='add'>+		goto err_alloc_dflt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-		tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);</div><div class='del'>-		if (!tbl)</div><div class='del'>-			goto err_alloc_ctl;</div><div class='add'>+	tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);</div><div class='add'>+	if (!tbl)</div><div class='add'>+		goto err_alloc_ctl;</div><div class='ctx'> </div><div class='del'>-		tbl[0].data = &amp;all-&gt;data[IPV4_DEVCONF_FORWARDING - 1];</div><div class='del'>-		tbl[0].extra1 = all;</div><div class='del'>-		tbl[0].extra2 = net;</div><div class='add'>+	tbl[0].data = &amp;all-&gt;data[IPV4_DEVCONF_FORWARDING - 1];</div><div class='add'>+	tbl[0].extra1 = all;</div><div class='add'>+	tbl[0].extra2 = net;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	if (!net_eq(net, &amp;init_net)) {</div><div class='add'>+		switch (net_inherit_devconf()) {</div><div class='add'>+		case 3:</div><div class='add'>+			/* copy from the current netns */</div><div class='add'>+			memcpy(all, current-&gt;nsproxy-&gt;net_ns-&gt;ipv4.devconf_all,</div><div class='add'>+			       sizeof(ipv4_devconf));</div><div class='add'>+			memcpy(dflt,</div><div class='add'>+			       current-&gt;nsproxy-&gt;net_ns-&gt;ipv4.devconf_dflt,</div><div class='add'>+			       sizeof(ipv4_devconf_dflt));</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+		case 1:</div><div class='add'>+			/* copy from init_net */</div><div class='add'>+			memcpy(all, init_net.ipv4.devconf_all,</div><div class='add'>+			       sizeof(ipv4_devconf));</div><div class='add'>+			memcpy(dflt, init_net.ipv4.devconf_dflt,</div><div class='add'>+			       sizeof(ipv4_devconf_dflt));</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			/* use compiled values */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -2446,12 +2813,18 @@ static __net_init int devinet_init_net(struct net *net)</div><div class='ctx'> 		goto err_reg_dflt;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);</div><div class='add'>+	forw_hdr = register_net_sysctl_sz(net, "net/ipv4", tbl,</div><div class='add'>+					  ARRAY_SIZE(ctl_forward_entry));</div><div class='ctx'> 	if (!forw_hdr)</div><div class='ctx'> 		goto err_reg_ctl;</div><div class='ctx'> 	net-&gt;ipv4.forw_hdr = forw_hdr;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; IN4_ADDR_HSIZE; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;net-&gt;ipv4.inet_addr_lst[i]);</div><div class='add'>+</div><div class='add'>+	INIT_DEFERRABLE_WORK(&amp;net-&gt;ipv4.addr_chk_work, check_lifetime);</div><div class='add'>+</div><div class='ctx'> 	net-&gt;ipv4.devconf_all = all;</div><div class='ctx'> 	net-&gt;ipv4.devconf_dflt = dflt;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2462,24 +2835,27 @@ err_reg_ctl:</div><div class='ctx'> err_reg_dflt:</div><div class='ctx'> 	__devinet_sysctl_unregister(net, all, NETCONFA_IFINDEX_ALL);</div><div class='ctx'> err_reg_all:</div><div class='del'>-	if (tbl != ctl_forward_entry)</div><div class='del'>-		kfree(tbl);</div><div class='add'>+	kfree(tbl);</div><div class='ctx'> err_alloc_ctl:</div><div class='ctx'> #endif</div><div class='del'>-	if (dflt != &amp;ipv4_devconf_dflt)</div><div class='del'>-		kfree(dflt);</div><div class='add'>+	kfree(dflt);</div><div class='ctx'> err_alloc_dflt:</div><div class='del'>-	if (all != &amp;ipv4_devconf)</div><div class='del'>-		kfree(all);</div><div class='add'>+	kfree(all);</div><div class='ctx'> err_alloc_all:</div><div class='add'>+	kfree(net-&gt;ipv4.inet_addr_lst);</div><div class='add'>+err_alloc_hash:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __net_exit void devinet_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-	struct ctl_table *tbl;</div><div class='add'>+	const struct ctl_table *tbl;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;net-&gt;ipv4.addr_chk_work);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='ctx'> 	tbl = net-&gt;ipv4.forw_hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	unregister_net_sysctl_table(net-&gt;ipv4.forw_hdr);</div><div class='ctx'> 	__devinet_sysctl_unregister(net, net-&gt;ipv4.devconf_dflt,</div><div class='hunk'>@@ -2490,6 +2866,7 @@ static __net_exit void devinet_exit_net(struct net *net)</div><div class='ctx'> #endif</div><div class='ctx'> 	kfree(net-&gt;ipv4.devconf_dflt);</div><div class='ctx'> 	kfree(net-&gt;ipv4.devconf_all);</div><div class='add'>+	kfree(net-&gt;ipv4.inet_addr_lst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __net_initdata struct pernet_operations devinet_ops = {</div><div class='hunk'>@@ -2505,25 +2882,27 @@ static struct rtnl_af_ops inet_af_ops __read_mostly = {</div><div class='ctx'> 	.set_link_af	  = inet_set_link_af,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler devinet_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_NEWADDR, .doit = inet_rtm_newaddr,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_DELADDR, .doit = inet_rtm_deladdr,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_GETADDR, .dumpit = inet_dump_ifaddr,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_GETNETCONF,</div><div class='add'>+	 .doit = inet_netconf_get_devconf, .dumpit = inet_netconf_dump_devconf,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET, .msgtype = RTM_GETMULTICAST,</div><div class='add'>+	 .dumpit = inet_dump_ifmcaddr, .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init devinet_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IN4_ADDR_HSIZE; i++)</div><div class='del'>-		INIT_HLIST_HEAD(&amp;inet_addr_lst[i]);</div><div class='del'>-</div><div class='ctx'> 	register_pernet_subsys(&amp;devinet_ops);</div><div class='del'>-</div><div class='del'>-	register_gifconf(PF_INET, inet_gifconf);</div><div class='ctx'> 	register_netdevice_notifier(&amp;ip_netdev_notifier);</div><div class='ctx'> </div><div class='del'>-	queue_delayed_work(system_power_efficient_wq, &amp;check_lifetime_work, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_af_register(&amp;inet_af_ops);</div><div class='add'>+	if (rtnl_af_register(&amp;inet_af_ops))</div><div class='add'>+		panic("Unable to register inet_af_ops\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_register(PF_INET, RTM_NEWADDR, inet_rtm_newaddr, NULL, 0);</div><div class='del'>-	rtnl_register(PF_INET, RTM_DELADDR, inet_rtm_deladdr, NULL, 0);</div><div class='del'>-	rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr, 0);</div><div class='del'>-	rtnl_register(PF_INET, RTM_GETNETCONF, inet_netconf_get_devconf,</div><div class='del'>-		      inet_netconf_dump_devconf, 0);</div><div class='add'>+	rtnl_register_many(devinet_rtnl_msg_handlers);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c<br/>index 97689012b357..2c922afadb8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/esp4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/esp4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/esp4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/esp4.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #define pr_fmt(fmt) "IPsec: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/aead.h&gt;</div><div class='hunk'>@@ -17,6 +18,9 @@</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/espintcp.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -32,8 +36,6 @@ struct esp_output_extra {</div><div class='ctx'> </div><div class='ctx'> #define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='ctx'> </div><div class='del'>-static u32 esp4_get_mtu(struct xfrm_state *x, int mtu);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate an AEAD request structure with extra space for SG and IV.</div><div class='ctx'>  *</div><div class='hunk'>@@ -94,9 +96,8 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead,</div><div class='ctx'> 			     __alignof__(struct scatterlist));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_ssg_unref(struct xfrm_state *x, void *tmp)</div><div class='add'>+static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct esp_output_extra *extra = esp_tmp_extra(tmp);</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='ctx'> 	int extralen = 0;</div><div class='ctx'> 	u8 *iv;</div><div class='hunk'>@@ -104,9 +105,8 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.flags &amp; XFRM_STATE_ESN)</div><div class='del'>-		extralen += sizeof(*extra);</div><div class='add'>+		extralen += sizeof(struct esp_output_extra);</div><div class='ctx'> </div><div class='del'>-	extra = esp_tmp_extra(tmp);</div><div class='ctx'> 	iv = esp_tmp_iv(aead, tmp, extralen);</div><div class='ctx'> 	req = esp_tmp_req(aead, iv);</div><div class='ctx'> </div><div class='hunk'>@@ -115,23 +115,112 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req-&gt;src != req-&gt;dst)</div><div class='ctx'> 		for (sg = sg_next(req-&gt;src); sg; sg = sg_next(sg))</div><div class='del'>-			put_page(sg_page(sg));</div><div class='add'>+			skb_page_unref(page_to_netmem(sg_page(sg)),</div><div class='add'>+				       skb-&gt;pp_recycle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET_ESPINTCP</div><div class='add'>+static struct sock *esp_find_tcp_sk(struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+	struct net *net = xs_net(x);</div><div class='add'>+	__be16 sport, dport;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;x-&gt;lock);</div><div class='add'>+	sport = encap-&gt;encap_sport;</div><div class='add'>+	dport = encap-&gt;encap_dport;</div><div class='add'>+	spin_unlock_bh(&amp;x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	sk = inet_lookup_established(net, x-&gt;id.daddr.a4, dport,</div><div class='add'>+				     x-&gt;props.saddr.a4, sport, 0);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	if (!tcp_is_ulp_esp(sk)) {</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esp_output_tcp_finish(struct xfrm_state *x, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sk = esp_find_tcp_sk(x);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(sk);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+	if (sock_owned_by_user(sk))</div><div class='add'>+		err = espintcp_queue_out(sk, skb);</div><div class='add'>+	else</div><div class='add'>+		err = espintcp_push_skb(sk, skb);</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esp_output_tcp_encap_cb(struct net *net, struct sock *sk,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct xfrm_state *x = dst-&gt;xfrm;</div><div class='add'>+</div><div class='add'>+	return esp_output_tcp_finish(x, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_done(struct crypto_async_request *base, int err)</div><div class='add'>+static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	err = xfrm_trans_queue_net(xs_net(x), skb, esp_output_tcp_encap_cb);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	/* EINPROGRESS just happens to do the right thing.  It</div><div class='add'>+	 * actually means that the skb has been consumed and</div><div class='add'>+	 * isn't coming back.</div><div class='add'>+	 */</div><div class='add'>+	return err ?: -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void esp_output_done(void *data, int err)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='ctx'> </div><div class='del'>-	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME))</div><div class='del'>-		x = skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len - 1];</div><div class='del'>-	else</div><div class='add'>+	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME)) {</div><div class='add'>+		struct sec_path *sp = skb_sec_path(skb);</div><div class='add'>+</div><div class='add'>+		x = sp-&gt;xvec[sp-&gt;len - 1];</div><div class='add'>+	} else {</div><div class='ctx'> 		x = skb_dst(skb)-&gt;xfrm;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = ESP_SKB_CB(skb)-&gt;tmp;</div><div class='del'>-	esp_ssg_unref(x, tmp);</div><div class='add'>+	esp_ssg_unref(x, tmp, skb);</div><div class='ctx'> 	kfree(tmp);</div><div class='ctx'> </div><div class='ctx'> 	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME)) {</div><div class='hunk'>@@ -145,7 +234,11 @@ static void esp_output_done(struct crypto_async_request *base, int err)</div><div class='ctx'> 		secpath_reset(skb);</div><div class='ctx'> 		xfrm_dev_resume(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		xfrm_output_resume(skb, err);</div><div class='add'>+		if (!err &amp;&amp;</div><div class='add'>+		    x-&gt;encap &amp;&amp; x-&gt;encap-&gt;encap_type == TCP_ENCAP_ESPINTCP)</div><div class='add'>+			esp_output_tail_tcp(x, skb);</div><div class='add'>+		else</div><div class='add'>+			xfrm_output_resume(skb_to_full_sk(skb), skb, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +268,7 @@ static struct ip_esp_hdr *esp_output_set_extra(struct sk_buff *skb,</div><div class='ctx'> 					       struct esp_output_extra *extra)</div><div class='ctx'> {</div><div class='ctx'> 	/* For ESN we move the header forward by 4 bytes to</div><div class='del'>-	 * accomodate the high bits.  We will move it back after</div><div class='add'>+	 * accommodate the high bits.  We will move it back after</div><div class='ctx'> 	 * encryption.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='hunk'>@@ -199,38 +292,88 @@ static struct ip_esp_hdr *esp_output_set_extra(struct sk_buff *skb,</div><div class='ctx'> 	return esph;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_done_esn(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_output_done_esn(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	esp_output_restore_header(skb);</div><div class='del'>-	esp_output_done(base, err);</div><div class='add'>+	esp_output_done(data, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)</div><div class='add'>+static struct ip_esp_hdr *esp_output_udp_encap(struct sk_buff *skb,</div><div class='add'>+					       int encap_type,</div><div class='add'>+					       struct esp_info *esp,</div><div class='add'>+					       __be16 sport,</div><div class='add'>+					       __be16 dport)</div><div class='ctx'> {</div><div class='del'>-	/* Fill padding... */</div><div class='del'>-	if (tfclen) {</div><div class='del'>-		memset(tail, 0, tfclen);</div><div class='del'>-		tail += tfclen;</div><div class='del'>-	}</div><div class='del'>-	do {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; plen - 2; i++)</div><div class='del'>-			tail[i] = i + 1;</div><div class='del'>-	} while (0);</div><div class='del'>-	tail[plen - 2] = plen - 2;</div><div class='del'>-	tail[plen - 1] = proto;</div><div class='add'>+	struct udphdr *uh;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + esp-&gt;tailen - skb_transport_offset(skb);</div><div class='add'>+	if (len + sizeof(struct iphdr) &gt; IP_MAX_MTU)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	uh = (struct udphdr *)esp-&gt;esph;</div><div class='add'>+	uh-&gt;source = sport;</div><div class='add'>+	uh-&gt;dest = dport;</div><div class='add'>+	uh-&gt;len = htons(len);</div><div class='add'>+	uh-&gt;check = 0;</div><div class='add'>+</div><div class='add'>+	/* For IPv4 ESP with UDP encapsulation, if xo is not null, the skb is in the crypto offload</div><div class='add'>+	 * data path, which means that esp_output_udp_encap is called outside of the XFRM stack.</div><div class='add'>+	 * In this case, the mac header doesn't point to the IPv4 protocol field, so don't set it.</div><div class='add'>+	 */</div><div class='add'>+	if (!xo || encap_type != UDP_ENCAP_ESPINUDP)</div><div class='add'>+		*skb_mac_header(skb) = IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+	return (struct ip_esp_hdr *)(uh + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp)</div><div class='add'>+#ifdef CONFIG_INET_ESPINTCP</div><div class='add'>+static struct ip_esp_hdr *esp_output_tcp_encap(struct xfrm_state *x,</div><div class='add'>+						    struct sk_buff *skb,</div><div class='add'>+						    struct esp_info *esp)</div><div class='add'>+{</div><div class='add'>+	__be16 *lenp = (void *)esp-&gt;esph;</div><div class='add'>+	struct ip_esp_hdr *esph;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + esp-&gt;tailen - skb_transport_offset(skb);</div><div class='add'>+	if (len &gt; IP_MAX_MTU)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk = esp_find_tcp_sk(x);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(sk))</div><div class='add'>+		return ERR_CAST(sk);</div><div class='add'>+</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	*lenp = htons(len);</div><div class='add'>+	esph = (struct ip_esp_hdr *)(lenp + 1);</div><div class='add'>+</div><div class='add'>+	return esph;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static struct ip_esp_hdr *esp_output_tcp_encap(struct xfrm_state *x,</div><div class='add'>+						    struct sk_buff *skb,</div><div class='add'>+						    struct esp_info *esp)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int esp_output_encap(struct xfrm_state *x, struct sk_buff *skb,</div><div class='add'>+			    struct esp_info *esp)</div><div class='ctx'> {</div><div class='del'>-	int encap_type;</div><div class='del'>-	struct udphdr *uh;</div><div class='del'>-	__be32 *udpdata32;</div><div class='del'>-	__be16 sport, dport;</div><div class='ctx'> 	struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='del'>-	struct ip_esp_hdr *esph = esp-&gt;esph;</div><div class='add'>+	struct ip_esp_hdr *esph;</div><div class='add'>+	__be16 sport, dport;</div><div class='add'>+	int encap_type;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;x-&gt;lock);</div><div class='ctx'> 	sport = encap-&gt;encap_sport;</div><div class='hunk'>@@ -238,42 +381,44 @@ static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, stru</div><div class='ctx'> 	encap_type = encap-&gt;encap_type;</div><div class='ctx'> 	spin_unlock_bh(&amp;x-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	uh = (struct udphdr *)esph;</div><div class='del'>-	uh-&gt;source = sport;</div><div class='del'>-	uh-&gt;dest = dport;</div><div class='del'>-	uh-&gt;len = htons(skb-&gt;len + esp-&gt;tailen</div><div class='del'>-		  - skb_transport_offset(skb));</div><div class='del'>-	uh-&gt;check = 0;</div><div class='del'>-</div><div class='ctx'> 	switch (encap_type) {</div><div class='ctx'> 	default:</div><div class='ctx'> 	case UDP_ENCAP_ESPINUDP:</div><div class='del'>-		esph = (struct ip_esp_hdr *)(uh + 1);</div><div class='add'>+		esph = esp_output_udp_encap(skb, encap_type, esp, sport, dport);</div><div class='ctx'> 		break;</div><div class='del'>-	case UDP_ENCAP_ESPINUDP_NON_IKE:</div><div class='del'>-		udpdata32 = (__be32 *)(uh + 1);</div><div class='del'>-		udpdata32[0] = udpdata32[1] = 0;</div><div class='del'>-		esph = (struct ip_esp_hdr *)(udpdata32 + 2);</div><div class='add'>+	case TCP_ENCAP_ESPINTCP:</div><div class='add'>+		esph = esp_output_tcp_encap(x, skb, esp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*skb_mac_header(skb) = IPPROTO_UDP;</div><div class='add'>+	if (IS_ERR(esph))</div><div class='add'>+		return PTR_ERR(esph);</div><div class='add'>+</div><div class='ctx'> 	esp-&gt;esph = esph;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *tail;</div><div class='del'>-	u8 *vaddr;</div><div class='ctx'> 	int nfrags;</div><div class='ctx'> 	int esph_offset;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	struct sk_buff *trailer;</div><div class='ctx'> 	int tailen = esp-&gt;tailen;</div><div class='ctx'> </div><div class='del'>-	/* this is non-NULL only with UDP Encapsulation */</div><div class='del'>-	if (x-&gt;encap)</div><div class='del'>-		esp_output_udp_encap(x, skb, esp);</div><div class='add'>+	/* this is non-NULL only with TCP/UDP Encapsulation */</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		int err = esp_output_encap(x, skb, esp);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ALIGN(tailen, L1_CACHE_BYTES) &gt; PAGE_SIZE ||</div><div class='add'>+	    ALIGN(skb-&gt;data_len, L1_CACHE_BYTES) &gt; PAGE_SIZE)</div><div class='add'>+		goto cow;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_cloned(skb)) {</div><div class='ctx'> 		if (tailen &lt;= skb_tailroom(skb)) {</div><div class='hunk'>@@ -302,14 +447,10 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *</div><div class='ctx'> 			page = pfrag-&gt;page;</div><div class='ctx'> 			get_page(page);</div><div class='ctx'> </div><div class='del'>-			vaddr = kmap_atomic(page);</div><div class='del'>-</div><div class='del'>-			tail = vaddr + pfrag-&gt;offset;</div><div class='add'>+			tail = page_address(page) + pfrag-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 			esp_output_fill_trailer(tail, esp-&gt;tfclen, esp-&gt;plen, esp-&gt;proto);</div><div class='ctx'> </div><div class='del'>-			kunmap_atomic(vaddr);</div><div class='del'>-</div><div class='ctx'> 			nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 			__skb_fill_page_desc(skb, nfrags, page, pfrag-&gt;offset,</div><div class='hunk'>@@ -322,10 +463,8 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *</div><div class='ctx'> </div><div class='ctx'> 			nfrags++;</div><div class='ctx'> </div><div class='del'>-			skb-&gt;len += tailen;</div><div class='del'>-			skb-&gt;data_len += tailen;</div><div class='del'>-			skb-&gt;truesize += tailen;</div><div class='del'>-			if (sk)</div><div class='add'>+			skb_len_add(skb, tailen);</div><div class='add'>+			if (sk &amp;&amp; sk_fullsock(sk))</div><div class='ctx'> 				refcount_add(tailen, &amp;sk-&gt;sk_wmem_alloc);</div><div class='ctx'> </div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -460,7 +599,10 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sg != dsg)</div><div class='del'>-		esp_ssg_unref(x, tmp);</div><div class='add'>+		esp_ssg_unref(x, tmp, skb);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; x-&gt;encap &amp;&amp; x-&gt;encap-&gt;encap_type == TCP_ENCAP_ESPINTCP)</div><div class='add'>+		err = esp_output_tail_tcp(x, skb);</div><div class='ctx'> </div><div class='ctx'> error_free:</div><div class='ctx'> 	kfree(tmp);</div><div class='hunk'>@@ -492,7 +634,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);</div><div class='ctx'> 		u32 padto;</div><div class='ctx'> </div><div class='del'>-		padto = min(x-&gt;tfcpad, esp4_get_mtu(x, dst-&gt;child_mtu_cached));</div><div class='add'>+		padto = min(x-&gt;tfcpad, xfrm_state_mtu(x, dst-&gt;child_mtu_cached));</div><div class='ctx'> 		if (skb-&gt;len &lt; padto)</div><div class='ctx'> 			esp.tfclen = padto - skb-&gt;len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -522,7 +664,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='ctx'> 	int alen, hlen, elen;</div><div class='ctx'> 	int padlen, trimlen;</div><div class='hunk'>@@ -534,11 +675,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> 	hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);</div><div class='ctx'> 	elen = skb-&gt;len - hlen;</div><div class='ctx'> </div><div class='del'>-	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_ESP_NO_TRAILER)) {</div><div class='del'>-		ret = xo-&gt;proto;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (skb_copy_bits(skb, skb-&gt;len - alen - 2, nexthdr, 2))</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='hunk'>@@ -556,7 +692,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> 		skb-&gt;csum = csum_block_sub(skb-&gt;csum, csumdiff,</div><div class='ctx'> 					   skb-&gt;len - trimlen);</div><div class='ctx'> 	}</div><div class='del'>-	pskb_trim(skb, skb-&gt;len - trimlen);</div><div class='add'>+	ret = pskb_trim(skb, skb-&gt;len - trimlen);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nexthdr[1];</div><div class='ctx'> </div><div class='hunk'>@@ -573,7 +711,7 @@ int esp_input_done2(struct sk_buff *skb, int err)</div><div class='ctx'> 	int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);</div><div class='ctx'> 	int ihl;</div><div class='ctx'> </div><div class='del'>-	if (!xo || (xo &amp;&amp; !(xo-&gt;flags &amp; CRYPTO_DONE)))</div><div class='add'>+	if (!xo || !(xo-&gt;flags &amp; CRYPTO_DONE))</div><div class='ctx'> 		kfree(ESP_SKB_CB(skb)-&gt;tmp);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(err))</div><div class='hunk'>@@ -588,20 +726,35 @@ int esp_input_done2(struct sk_buff *skb, int err)</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;encap) {</div><div class='ctx'> 		struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+		struct tcphdr *th = (void *)(skb_network_header(skb) + ihl);</div><div class='ctx'> 		struct udphdr *uh = (void *)(skb_network_header(skb) + ihl);</div><div class='add'>+		__be16 source;</div><div class='add'>+</div><div class='add'>+		switch (x-&gt;encap-&gt;encap_type) {</div><div class='add'>+		case TCP_ENCAP_ESPINTCP:</div><div class='add'>+			source = th-&gt;source;</div><div class='add'>+			break;</div><div class='add'>+		case UDP_ENCAP_ESPINUDP:</div><div class='add'>+			source = uh-&gt;source;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 1) if the NAT-T peer's IP or port changed then</div><div class='del'>-		 *    advertize the change to the keying daemon.</div><div class='add'>+		 *    advertise the change to the keying daemon.</div><div class='ctx'> 		 *    This is an inbound SA, so just compare</div><div class='ctx'> 		 *    SRC ports.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (iph-&gt;saddr != x-&gt;props.saddr.a4 ||</div><div class='del'>-		    uh-&gt;source != encap-&gt;encap_sport) {</div><div class='add'>+		    source != encap-&gt;encap_sport) {</div><div class='ctx'> 			xfrm_address_t ipaddr;</div><div class='ctx'> </div><div class='ctx'> 			ipaddr.a4 = iph-&gt;saddr;</div><div class='del'>-			km_new_mapping(x, &amp;ipaddr, uh-&gt;source);</div><div class='add'>+			km_new_mapping(x, &amp;ipaddr, source);</div><div class='ctx'> </div><div class='ctx'> 			/* XXX: perhaps add an extra</div><div class='ctx'> 			 * policy check here, to see</div><div class='hunk'>@@ -624,7 +777,8 @@ int esp_input_done2(struct sk_buff *skb, int err)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_pull_rcsum(skb, hlen);</div><div class='del'>-	if (x-&gt;props.mode == XFRM_MODE_TUNNEL)</div><div class='add'>+	if (x-&gt;props.mode == XFRM_MODE_TUNNEL ||</div><div class='add'>+	    x-&gt;props.mode == XFRM_MODE_IPTFS)</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='ctx'> 	else</div><div class='ctx'> 		skb_set_transport_header(skb, -ihl);</div><div class='hunk'>@@ -638,9 +792,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(esp_input_done2);</div><div class='ctx'> </div><div class='del'>-static void esp_input_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_input_done(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	xfrm_input_resume(skb, esp_input_done2(skb, err));</div><div class='ctx'> }</div><div class='hunk'>@@ -657,7 +811,7 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)</div><div class='ctx'> 	struct ip_esp_hdr *esph;</div><div class='ctx'> </div><div class='ctx'> 	/* For ESN we move the header forward by 4 bytes to</div><div class='del'>-	 * accomodate the high bits.  We will move it back after</div><div class='add'>+	 * accommodate the high bits.  We will move it back after</div><div class='ctx'> 	 * decryption.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='hunk'>@@ -668,12 +822,12 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_input_done_esn(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_input_done_esn(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	esp_input_restore_header(skb);</div><div class='del'>-	esp_input_done(base, err);</div><div class='add'>+	esp_input_done(data, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -683,12 +837,11 @@ static void esp_input_done_esn(struct crypto_async_request *base, int err)</div><div class='ctx'>  */</div><div class='ctx'> static int esp_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ip_esp_hdr *esph;</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='ctx'> 	struct aead_request *req;</div><div class='ctx'> 	struct sk_buff *trailer;</div><div class='ctx'> 	int ivlen = crypto_aead_ivsize(aead);</div><div class='del'>-	int elen = skb-&gt;len - sizeof(*esph) - ivlen;</div><div class='add'>+	int elen = skb-&gt;len - sizeof(struct ip_esp_hdr) - ivlen;</div><div class='ctx'> 	int nfrags;</div><div class='ctx'> 	int assoclen;</div><div class='ctx'> 	int seqhilen;</div><div class='hunk'>@@ -698,13 +851,13 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(*esph) + ivlen))</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (elen &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	assoclen = sizeof(*esph);</div><div class='add'>+	assoclen = sizeof(struct ip_esp_hdr);</div><div class='ctx'> 	seqhilen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.flags &amp; XFRM_STATE_ESN) {</div><div class='hunk'>@@ -775,28 +928,6 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = x-&gt;data;</div><div class='del'>-	u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);</div><div class='del'>-	unsigned int net_adj;</div><div class='del'>-</div><div class='del'>-	switch (x-&gt;props.mode) {</div><div class='del'>-	case XFRM_MODE_TRANSPORT:</div><div class='del'>-	case XFRM_MODE_BEET:</div><div class='del'>-		net_adj = sizeof(struct iphdr);</div><div class='del'>-		break;</div><div class='del'>-	case XFRM_MODE_TUNNEL:</div><div class='del'>-		net_adj = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ((mtu - x-&gt;props.header_len - crypto_aead_authsize(aead) -</div><div class='del'>-		 net_adj) &amp; ~(blksize - 1)) + net_adj - 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int esp4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='hunk'>@@ -808,6 +939,7 @@ static int esp4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		if (icmp_hdr(skb)-&gt;code != ICMP_FRAG_NEEDED)</div><div class='ctx'> 			return 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -820,9 +952,9 @@ static int esp4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (icmp_hdr(skb)-&gt;type == ICMP_DEST_UNREACH)</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ESP);</div><div class='ctx'> 	else</div><div class='del'>-		ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0);</div><div class='add'>+		ipv4_redirect(skb, net, 0, IPPROTO_ESP);</div><div class='ctx'> 	xfrm_state_put(x);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -838,16 +970,17 @@ static void esp_destroy(struct xfrm_state *x)</div><div class='ctx'> 	crypto_free_aead(aead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp_init_aead(struct xfrm_state *x)</div><div class='add'>+static int esp_init_aead(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	char aead_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -ENAMETOOLONG;</div><div class='ctx'> 	if (snprintf(aead_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",</div><div class='del'>-		     x-&gt;geniv, x-&gt;aead-&gt;alg_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		goto error;</div><div class='add'>+		     x-&gt;geniv, x-&gt;aead-&gt;alg_name) &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	aead = crypto_alloc_aead(aead_name, 0, 0);</div><div class='ctx'> 	err = PTR_ERR(aead);</div><div class='hunk'>@@ -865,11 +998,15 @@ static int esp_init_aead(struct xfrm_state *x)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> error:</div><div class='add'>+	NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp_init_authenc(struct xfrm_state *x)</div><div class='add'>+static int esp_init_authenc(struct xfrm_state *x,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	struct crypto_authenc_key_param *param;</div><div class='hunk'>@@ -880,10 +1017,6 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 	unsigned int keylen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (!x-&gt;ealg)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='ctx'> </div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='hunk'>@@ -892,22 +1025,28 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 			     x-&gt;geniv ?: "", x-&gt;geniv ? "(" : "",</div><div class='ctx'> 			     x-&gt;aalg ? x-&gt;aalg-&gt;alg_name : "digest_null",</div><div class='ctx'> 			     x-&gt;ealg-&gt;alg_name,</div><div class='del'>-			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (snprintf(authenc_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 			     "%s%sauthenc(%s,%s)%s",</div><div class='ctx'> 			     x-&gt;geniv ?: "", x-&gt;geniv ? "(" : "",</div><div class='ctx'> 			     x-&gt;aalg ? x-&gt;aalg-&gt;alg_name : "digest_null",</div><div class='ctx'> 			     x-&gt;ealg-&gt;alg_name,</div><div class='del'>-			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aead = crypto_alloc_aead(authenc_name, 0, 0);</div><div class='ctx'> 	err = PTR_ERR(aead);</div><div class='del'>-	if (IS_ERR(aead))</div><div class='add'>+	if (IS_ERR(aead)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	x-&gt;data = aead;</div><div class='ctx'> </div><div class='hunk'>@@ -937,17 +1076,16 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (aalg_desc-&gt;uinfo.auth.icv_fullbits / 8 !=</div><div class='ctx'> 		    crypto_aead_authsize(aead)) {</div><div class='del'>-			pr_info("ESP: %s digestsize %u != %hu\n",</div><div class='del'>-				x-&gt;aalg-&gt;alg_name,</div><div class='del'>-				crypto_aead_authsize(aead),</div><div class='del'>-				aalg_desc-&gt;uinfo.auth.icv_fullbits / 8);</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 			goto free_key;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = crypto_aead_setauthsize(</div><div class='ctx'> 			aead, x-&gt;aalg-&gt;alg_trunc_len / 8);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 			goto free_key;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;enckeylen = cpu_to_be32((x-&gt;ealg-&gt;alg_key_len + 7) / 8);</div><div class='hunk'>@@ -956,13 +1094,13 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 	err = crypto_aead_setkey(aead, key, keylen);</div><div class='ctx'> </div><div class='ctx'> free_key:</div><div class='del'>-	kfree(key);</div><div class='add'>+	kfree_sensitive(key);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp_init_state(struct xfrm_state *x)</div><div class='add'>+static int esp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	u32 align;</div><div class='hunk'>@@ -970,10 +1108,14 @@ static int esp_init_state(struct xfrm_state *x)</div><div class='ctx'> </div><div class='ctx'> 	x-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;aead)</div><div class='del'>-		err = esp_init_aead(x);</div><div class='del'>-	else</div><div class='del'>-		err = esp_init_authenc(x);</div><div class='add'>+	if (x-&gt;aead) {</div><div class='add'>+		err = esp_init_aead(x, extack);</div><div class='add'>+	} else if (x-&gt;ealg) {</div><div class='add'>+		err = esp_init_authenc(x, extack);</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ESP: AEAD or CRYPT must be provided");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -991,14 +1133,20 @@ static int esp_init_state(struct xfrm_state *x)</div><div class='ctx'> </div><div class='ctx'> 		switch (encap-&gt;encap_type) {</div><div class='ctx'> 		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported encapsulation type for ESP");</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		case UDP_ENCAP_ESPINUDP:</div><div class='ctx'> 			x-&gt;props.header_len += sizeof(struct udphdr);</div><div class='ctx'> 			break;</div><div class='del'>-		case UDP_ENCAP_ESPINUDP_NON_IKE:</div><div class='del'>-			x-&gt;props.header_len += sizeof(struct udphdr) + 2 * sizeof(u32);</div><div class='add'>+#ifdef CONFIG_INET_ESPINTCP</div><div class='add'>+		case TCP_ENCAP_ESPINTCP:</div><div class='add'>+			/* only the length field, TCP encap is done by</div><div class='add'>+			 * the socket</div><div class='add'>+			 */</div><div class='add'>+			x-&gt;props.header_len += 2;</div><div class='ctx'> 			break;</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1016,13 +1164,11 @@ static int esp4_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type esp_type =</div><div class='ctx'> {</div><div class='del'>-	.description	= "ESP4",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_ESP,</div><div class='ctx'> 	.flags		= XFRM_TYPE_REPLAY_PROT,</div><div class='ctx'> 	.init_state	= esp_init_state,</div><div class='ctx'> 	.destructor	= esp_destroy,</div><div class='del'>-	.get_mtu	= esp4_get_mtu,</div><div class='ctx'> 	.input		= esp_input,</div><div class='ctx'> 	.output		= esp_output,</div><div class='ctx'> };</div><div class='hunk'>@@ -1053,11 +1199,11 @@ static void __exit esp4_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfrm4_protocol_deregister(&amp;esp4_protocol, IPPROTO_ESP) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;esp_type, AF_INET) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;esp_type, AF_INET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(esp4_init);</div><div class='ctx'> module_exit(esp4_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv4 ESP transformation library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_ESP);</div><div class='head'>diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c<br/>index 58834a10c0be..05828d4cb6cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/esp4_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/esp4_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/esp4_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/esp4_offload.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPV4 GSO/GRO offload support</div><div class='ctx'>  * Linux INET implementation</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  * Copyright (C) 2016 secunet Security Networks AG</div><div class='ctx'>  * Author: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * ESP GRO support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -19,6 +16,8 @@</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/esp.h&gt;</div><div class='hunk'>@@ -34,43 +33,54 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head,</div><div class='ctx'> 	int offset = skb_gro_offset(skb);</div><div class='ctx'> 	struct xfrm_offload *xo;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='add'>+	int encap_type = 0;</div><div class='ctx'> 	__be32 seq;</div><div class='ctx'> 	__be32 spi;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_pull(skb, offset))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if ((err = xfrm_parse_spi(skb, IPPROTO_ESP, &amp;spi, &amp;seq)) != 0)</div><div class='add'>+	if (xfrm_parse_spi(skb, IPPROTO_ESP, &amp;spi, &amp;seq) != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	xo = xfrm_offload(skb);</div><div class='ctx'> 	if (!xo || !(xo-&gt;flags &amp; CRYPTO_DONE)) {</div><div class='del'>-		err = secpath_set(skb);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+		struct sec_path *sp = secpath_set(skb);</div><div class='ctx'> </div><div class='del'>-		if (skb-&gt;sp-&gt;len == XFRM_MAX_DEPTH)</div><div class='add'>+		if (!sp)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		x = xfrm_state_lookup(dev_net(skb-&gt;dev), skb-&gt;mark,</div><div class='del'>-				      (xfrm_address_t *)&amp;ip_hdr(skb)-&gt;daddr,</div><div class='del'>-				      spi, IPPROTO_ESP, AF_INET);</div><div class='del'>-		if (!x)</div><div class='del'>-			goto out;</div><div class='add'>+		if (sp-&gt;len == XFRM_MAX_DEPTH)</div><div class='add'>+			goto out_reset;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len++] = x;</div><div class='del'>-		skb-&gt;sp-&gt;olen++;</div><div class='add'>+		x = xfrm_input_state_lookup(dev_net(skb-&gt;dev), skb-&gt;mark,</div><div class='add'>+					    (xfrm_address_t *)&amp;ip_hdr(skb)-&gt;daddr,</div><div class='add'>+					    spi, IPPROTO_ESP, AF_INET);</div><div class='ctx'> </div><div class='del'>-		xo = xfrm_offload(skb);</div><div class='del'>-		if (!xo) {</div><div class='add'>+		if (unlikely(x &amp;&amp; x-&gt;dir &amp;&amp; x-&gt;dir != XFRM_SA_DIR_IN)) {</div><div class='add'>+			/* non-offload path will record the error and audit log */</div><div class='ctx'> 			xfrm_state_put(x);</div><div class='del'>-			goto out;</div><div class='add'>+			x = NULL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!x)</div><div class='add'>+			goto out_reset;</div><div class='add'>+</div><div class='add'>+		skb-&gt;mark = xfrm_smark_get(skb-&gt;mark, x);</div><div class='add'>+</div><div class='add'>+		sp-&gt;xvec[sp-&gt;len++] = x;</div><div class='add'>+		sp-&gt;olen++;</div><div class='add'>+</div><div class='add'>+		xo = xfrm_offload(skb);</div><div class='add'>+		if (!xo)</div><div class='add'>+			goto out_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xo-&gt;flags |= XFRM_GRO;</div><div class='ctx'> </div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;proto == IPPROTO_UDP)</div><div class='add'>+		encap_type = UDP_ENCAP_ESPINUDP;</div><div class='add'>+</div><div class='ctx'> 	XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip4 = NULL;</div><div class='ctx'> 	XFRM_SPI_SKB_CB(skb)-&gt;family = AF_INET;</div><div class='ctx'> 	XFRM_SPI_SKB_CB(skb)-&gt;daddroff = offsetof(struct iphdr, daddr);</div><div class='hunk'>@@ -78,9 +88,11 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	/* We don't need to handle errors from xfrm_input, it does all</div><div class='ctx'> 	 * the error handling and frees the resources on error. */</div><div class='del'>-	xfrm_input(skb, IPPROTO_ESP, spi, -2);</div><div class='add'>+	xfrm_input(skb, IPPROTO_ESP, spi, encap_type);</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-EINPROGRESS);</div><div class='add'>+out_reset:</div><div class='add'>+	secpath_reset(skb);</div><div class='ctx'> out:</div><div class='ctx'> 	skb_push(skb, offset);</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;same_flow = 0;</div><div class='hunk'>@@ -106,6 +118,91 @@ static void esp4_gso_encap(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	xo-&gt;proto = proto;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *xfrm4_tunnel_gso_segment(struct xfrm_state *x,</div><div class='add'>+						struct sk_buff *skb,</div><div class='add'>+						netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	const struct xfrm_mode *inner_mode = xfrm_ip2inner_mode(x,</div><div class='add'>+					XFRM_MODE_SKB_CB(skb)-&gt;protocol);</div><div class='add'>+	__be16 type = inner_mode-&gt;family == AF_INET6 ? htons(ETH_P_IPV6)</div><div class='add'>+						     : htons(ETH_P_IP);</div><div class='add'>+</div><div class='add'>+	return skb_eth_gso_segment(skb, features, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,</div><div class='add'>+						   struct sk_buff *skb,</div><div class='add'>+						   netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='add'>+	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='add'>+	ops = rcu_dereference(inet_offloads[xo-&gt;proto]);</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='add'>+		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm4_beet_gso_segment(struct xfrm_state *x,</div><div class='add'>+					      struct sk_buff *skb,</div><div class='add'>+					      netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	u8 proto = xo-&gt;proto;</div><div class='add'>+</div><div class='add'>+	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='add'>+</div><div class='add'>+	if (x-&gt;sel.family != AF_INET6) {</div><div class='add'>+		if (proto == IPPROTO_BEETPH) {</div><div class='add'>+			struct ip_beet_phdr *ph =</div><div class='add'>+				(struct ip_beet_phdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+			skb-&gt;transport_header += ph-&gt;hdrlen * 8;</div><div class='add'>+			proto = ph-&gt;nexthdr;</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;transport_header -= IPV4_BEET_PHMAXLEN;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		__be16 frag;</div><div class='add'>+</div><div class='add'>+		skb-&gt;transport_header +=</div><div class='add'>+			ipv6_skip_exthdr(skb, 0, &amp;proto, &amp;frag);</div><div class='add'>+		if (proto == IPPROTO_TCP)</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCPV4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (proto == IPPROTO_IPV6)</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_IPXIP4;</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, skb_transport_offset(skb));</div><div class='add'>+	ops = rcu_dereference(inet_offloads[proto]);</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='add'>+		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm4_outer_mode_gso_segment(struct xfrm_state *x,</div><div class='add'>+						    struct sk_buff *skb,</div><div class='add'>+						    netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	switch (x-&gt;outer_mode.encap) {</div><div class='add'>+	case XFRM_MODE_TUNNEL:</div><div class='add'>+		return xfrm4_tunnel_gso_segment(x, skb, features);</div><div class='add'>+	case XFRM_MODE_TRANSPORT:</div><div class='add'>+		return xfrm4_transport_gso_segment(x, skb, features);</div><div class='add'>+	case XFRM_MODE_BEET:</div><div class='add'>+		return xfrm4_beet_gso_segment(x, skb, features);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 				        netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,6 +211,7 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	netdev_features_t esp_features = features;</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+	struct sec_path *sp;</div><div class='ctx'> </div><div class='ctx'> 	if (!xo)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -121,7 +219,8 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_ESP))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	x = skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len - 1];</div><div class='add'>+	sp = skb_sec_path(skb);</div><div class='add'>+	x = sp-&gt;xvec[sp-&gt;len - 1];</div><div class='ctx'> 	aead = x-&gt;data;</div><div class='ctx'> 	esph = ip_esp_hdr(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -135,14 +234,18 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;encap_hdr_csum = 1;</div><div class='ctx'> </div><div class='del'>-	if (!(features &amp; NETIF_F_HW_ESP) || x-&gt;xso.dev != skb-&gt;dev)</div><div class='del'>-		esp_features = features &amp; ~(NETIF_F_SG | NETIF_F_CSUM_MASK);</div><div class='del'>-	else if (!(features &amp; NETIF_F_HW_ESP_TX_CSUM))</div><div class='del'>-		esp_features = features &amp; ~NETIF_F_CSUM_MASK;</div><div class='add'>+	if ((!(skb-&gt;dev-&gt;gso_partial_features &amp; NETIF_F_HW_ESP) &amp;&amp;</div><div class='add'>+	     !(features &amp; NETIF_F_HW_ESP)) || x-&gt;xso.dev != skb-&gt;dev)</div><div class='add'>+		esp_features = features &amp; ~(NETIF_F_SG | NETIF_F_CSUM_MASK |</div><div class='add'>+					    NETIF_F_SCTP_CRC);</div><div class='add'>+	else if (!(features &amp; NETIF_F_HW_ESP_TX_CSUM) &amp;&amp;</div><div class='add'>+		 !(skb-&gt;dev-&gt;gso_partial_features &amp; NETIF_F_HW_ESP_TX_CSUM))</div><div class='add'>+		esp_features = features &amp; ~(NETIF_F_CSUM_MASK |</div><div class='add'>+					    NETIF_F_SCTP_CRC);</div><div class='ctx'> </div><div class='ctx'> 	xo-&gt;flags |= XFRM_GSO_SEGMENT;</div><div class='ctx'> </div><div class='del'>-	return x-&gt;outer_mode-&gt;gso_segment(x, skb, esp_features);</div><div class='add'>+	return xfrm4_outer_mode_gso_segment(x, skb, esp_features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int esp_input_tail(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -170,6 +273,7 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_</div><div class='ctx'> 	struct esp_info esp;</div><div class='ctx'> 	bool hw_offload = true;</div><div class='ctx'> 	__u32 seq;</div><div class='add'>+	int encap_type = 0;</div><div class='ctx'> </div><div class='ctx'> 	esp.inplace = true;</div><div class='ctx'> </div><div class='hunk'>@@ -178,7 +282,9 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_</div><div class='ctx'> 	if (!xo)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!(features &amp; NETIF_F_HW_ESP) || x-&gt;xso.dev != skb-&gt;dev) {</div><div class='add'>+	if ((!(features &amp; NETIF_F_HW_ESP) &amp;&amp;</div><div class='add'>+	     !(skb-&gt;dev-&gt;gso_partial_features &amp; NETIF_F_HW_ESP)) ||</div><div class='add'>+	    x-&gt;xso.dev != skb-&gt;dev) {</div><div class='ctx'> 		xo-&gt;flags |= CRYPTO_FALLBACK;</div><div class='ctx'> 		hw_offload = false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,8 +306,10 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_</div><div class='ctx'> </div><div class='ctx'> 	esp.esph = ip_esp_hdr(skb);</div><div class='ctx'> </div><div class='add'>+	if (x-&gt;encap)</div><div class='add'>+		encap_type = x-&gt;encap-&gt;encap_type;</div><div class='ctx'> </div><div class='del'>-	if (!hw_offload || (hw_offload &amp;&amp; !skb_is_gso(skb))) {</div><div class='add'>+	if (!hw_offload || !skb_is_gso(skb) || (hw_offload &amp;&amp; encap_type == UDP_ENCAP_ESPINUDP)) {</div><div class='ctx'> 		esp.nfrags = esp_output_head(x, skb, &amp;esp);</div><div class='ctx'> 		if (esp.nfrags &lt; 0)</div><div class='ctx'> 			return esp.nfrags;</div><div class='hunk'>@@ -223,13 +331,37 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_</div><div class='ctx'> 			xo-&gt;seq.low += skb_shinfo(skb)-&gt;gso_segs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (xo-&gt;seq.low &lt; seq)</div><div class='add'>+		xo-&gt;seq.hi++;</div><div class='add'>+</div><div class='ctx'> 	esp.seqno = cpu_to_be64(seq + ((u64)xo-&gt;seq.hi &lt;&lt; 32));</div><div class='ctx'> </div><div class='add'>+	if (hw_offload &amp;&amp; encap_type == UDP_ENCAP_ESPINUDP) {</div><div class='add'>+		/* In the XFRM stack, the encapsulation protocol is set to iphdr-&gt;protocol by</div><div class='add'>+		 * setting *skb_mac_header(skb) (see esp_output_udp_encap()) where skb-&gt;mac_header</div><div class='add'>+		 * points to iphdr-&gt;protocol (see xfrm4_tunnel_encap_add()).</div><div class='add'>+		 * However, in esp_xmit(), skb-&gt;mac_header doesn't point to iphdr-&gt;protocol.</div><div class='add'>+		 * Therefore, the protocol field needs to be corrected.</div><div class='add'>+		 */</div><div class='add'>+		ip_hdr(skb)-&gt;protocol = IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+		esph-&gt;seq_no = htonl(seq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ip_hdr(skb)-&gt;tot_len = htons(skb-&gt;len);</div><div class='ctx'> 	ip_send_check(ip_hdr(skb));</div><div class='ctx'> </div><div class='del'>-	if (hw_offload)</div><div class='add'>+	if (hw_offload) {</div><div class='add'>+		if (!skb_ext_add(skb, SKB_EXT_SEC_PATH))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		xo = xfrm_offload(skb);</div><div class='add'>+		if (!xo)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		xo-&gt;flags |= XFRM_XMIT;</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = esp_output_tail(x, skb, &amp;esp);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -237,6 +369,9 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_</div><div class='ctx'> </div><div class='ctx'> 	secpath_reset(skb);</div><div class='ctx'> </div><div class='add'>+	if (skb_needs_linearize(skb, skb-&gt;dev-&gt;features) &amp;&amp;</div><div class='add'>+	    __skb_linearize(skb))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +383,6 @@ static const struct net_offload esp4_offload = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type_offload esp_type_offload = {</div><div class='del'>-	.description	= "ESP4 OFFLOAD",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_ESP,</div><div class='ctx'> 	.input_tail	= esp_input_tail,</div><div class='hunk'>@@ -268,9 +402,7 @@ static int __init esp4_offload_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit esp4_offload_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (xfrm_unregister_type_offload(&amp;esp_type_offload, AF_INET) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type offload\n", __func__);</div><div class='del'>-</div><div class='add'>+	xfrm_unregister_type_offload(&amp;esp_type_offload, AF_INET);</div><div class='ctx'> 	inet_del_offload(&amp;esp4_offload, IPPROTO_ESP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -279,3 +411,4 @@ module_exit(esp4_offload_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Steffen Klassert &lt;steffen.klassert@secunet.com&gt;");</div><div class='ctx'> MODULE_ALIAS_XFRM_OFFLOAD_TYPE(AF_INET, XFRM_PROTO_ESP);</div><div class='add'>+MODULE_DESCRIPTION("IPV4 GSO/GRO offload support");</div><div class='head'>diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c<br/>index 2998b0e47d4b..1dab44e13d3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_frontend.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_frontend.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_frontend.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_frontend.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *		IPv4 Forwarding Information Base: FIB frontend.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -36,6 +32,8 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -43,6 +41,7 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='hunk'>@@ -73,11 +72,6 @@ fail:</div><div class='ctx'> 	fib_free_table(main_table);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static bool fib4_has_custom_rules(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> struct fib_table *fib_new_table(struct net *net, u32 id)</div><div class='hunk'>@@ -127,17 +121,13 @@ struct fib_table *fib_get_table(struct net *net, u32 id)</div><div class='ctx'> 	h = id &amp; (FIB_TABLE_HASHSZ - 1);</div><div class='ctx'> </div><div class='ctx'> 	head = &amp;net-&gt;ipv4.fib_table_hash[h];</div><div class='del'>-	hlist_for_each_entry_rcu(tb, head, tb_hlist) {</div><div class='add'>+	hlist_for_each_entry_rcu(tb, head, tb_hlist,</div><div class='add'>+				 lockdep_rtnl_is_held()) {</div><div class='ctx'> 		if (tb-&gt;tb_id == id)</div><div class='ctx'> 			return tb;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static bool fib4_has_custom_rules(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return net-&gt;ipv4.fib_has_custom_rules;</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_IP_MULTIPLE_TABLES */</div><div class='ctx'> </div><div class='ctx'> static void fib_replace_table(struct net *net, struct fib_table *old,</div><div class='hunk'>@@ -192,7 +182,7 @@ int fib_unmerge(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib_flush(struct net *net)</div><div class='add'>+void fib_flush(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int flushed = 0;</div><div class='ctx'> 	unsigned int h;</div><div class='hunk'>@@ -203,7 +193,7 @@ static void fib_flush(struct net *net)</div><div class='ctx'> 		struct fib_table *tb;</div><div class='ctx'> </div><div class='ctx'> 		hlist_for_each_entry_safe(tb, tmp, head, tb_hlist)</div><div class='del'>-			flushed += fib_table_flush(net, tb);</div><div class='add'>+			flushed += fib_table_flush(net, tb, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flushed)</div><div class='hunk'>@@ -234,7 +224,9 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,</div><div class='ctx'> 	if (table) {</div><div class='ctx'> 		ret = RTN_UNICAST;</div><div class='ctx'> 		if (!fib_table_lookup(table, &amp;fl4, &amp;res, FIB_LOOKUP_NOREF)) {</div><div class='del'>-			if (!dev || dev == res.fi-&gt;fib_dev)</div><div class='add'>+			struct fib_nh_common *nhc = fib_info_nhc(res.fi, 0);</div><div class='add'>+</div><div class='add'>+			if (!dev || dev == nhc-&gt;nhc_dev)</div><div class='ctx'> 				ret = res.type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -300,14 +292,14 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)</div><div class='ctx'> 		bool vmark = in_dev &amp;&amp; IN_DEV_SRC_VMARK(in_dev);</div><div class='ctx'> 		struct flowi4 fl4 = {</div><div class='ctx'> 			.flowi4_iif = LOOPBACK_IFINDEX,</div><div class='del'>-			.flowi4_oif = l3mdev_master_ifindex_rcu(dev),</div><div class='add'>+			.flowi4_l3mdev = l3mdev_master_ifindex_rcu(dev),</div><div class='ctx'> 			.daddr = ip_hdr(skb)-&gt;saddr,</div><div class='del'>-			.flowi4_tos = RT_TOS(ip_hdr(skb)-&gt;tos),</div><div class='add'>+			.flowi4_dscp = ip4h_dscp(ip_hdr(skb)),</div><div class='ctx'> 			.flowi4_scope = scope,</div><div class='ctx'> 			.flowi4_mark = vmark ? skb-&gt;mark : 0,</div><div class='ctx'> 		};</div><div class='ctx'> 		if (!fib_lookup(net, &amp;fl4, &amp;res, 0))</div><div class='del'>-			return FIB_RES_PREFSRC(net, res);</div><div class='add'>+			return fib_result_prefsrc(net, &amp;res);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		scope = RT_SCOPE_LINK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -315,6 +307,33 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)</div><div class='ctx'> 	return inet_select_addr(dev, ip_hdr(skb)-&gt;saddr, scope);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	bool dev_match = false;</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+	if (unlikely(fi-&gt;nh)) {</div><div class='add'>+		dev_match = nexthop_uses_dev(fi-&gt;nh, dev);</div><div class='add'>+	} else {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		for (ret = 0; ret &lt; fib_info_num_path(fi); ret++) {</div><div class='add'>+			const struct fib_nh_common *nhc = fib_info_nhc(fi, ret);</div><div class='add'>+</div><div class='add'>+			if (nhc_l3mdev_matches_dev(nhc, dev)) {</div><div class='add'>+				dev_match = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (fib_info_nhc(fi, 0)-&gt;nhc_dev == dev)</div><div class='add'>+		dev_match = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return dev_match;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_info_nh_uses_dev);</div><div class='add'>+</div><div class='ctx'> /* Given (packet source, input interface) and optional (dst, oif, tos):</div><div class='ctx'>  * - (main) check, that source is valid i.e. not broadcast or our local</div><div class='ctx'>  *   address.</div><div class='hunk'>@@ -324,10 +343,11 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)</div><div class='ctx'>  * called with rcu_read_lock()</div><div class='ctx'>  */</div><div class='ctx'> static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='del'>-				 u8 tos, int oif, struct net_device *dev,</div><div class='add'>+				 dscp_t dscp, int oif, struct net_device *dev,</div><div class='ctx'> 				 int rpf, struct in_device *idev, u32 *itag)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct flow_keys flkeys;</div><div class='ctx'> 	int ret, no_addr;</div><div class='ctx'> 	struct fib_result res;</div><div class='hunk'>@@ -335,16 +355,16 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='ctx'> 	bool dev_match;</div><div class='ctx'> </div><div class='ctx'> 	fl4.flowi4_oif = 0;</div><div class='del'>-	fl4.flowi4_iif = l3mdev_master_ifindex_rcu(dev);</div><div class='del'>-	if (!fl4.flowi4_iif)</div><div class='del'>-		fl4.flowi4_iif = oif ? : LOOPBACK_IFINDEX;</div><div class='add'>+	fl4.flowi4_l3mdev = l3mdev_master_ifindex_rcu(dev);</div><div class='add'>+	fl4.flowi4_iif = oif ? : LOOPBACK_IFINDEX;</div><div class='ctx'> 	fl4.daddr = src;</div><div class='ctx'> 	fl4.saddr = dst;</div><div class='del'>-	fl4.flowi4_tos = tos;</div><div class='add'>+	fl4.flowi4_dscp = dscp;</div><div class='ctx'> 	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	fl4.flowi4_tun_key.tun_id = 0;</div><div class='ctx'> 	fl4.flowi4_flags = 0;</div><div class='ctx'> 	fl4.flowi4_uid = sock_net_uid(net, NULL);</div><div class='add'>+	fl4.flowi4_multipath_hash = 0;</div><div class='ctx'> </div><div class='ctx'> 	no_addr = idev-&gt;ifa_list == NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -353,34 +373,31 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='ctx'> 		fl4.flowi4_proto = 0;</div><div class='ctx'> 		fl4.fl4_sport = 0;</div><div class='ctx'> 		fl4.fl4_dport = 0;</div><div class='add'>+	} else {</div><div class='add'>+		swap(fl4.fl4_sport, fl4.fl4_dport);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fib_lookup(net, &amp;fl4, &amp;res, 0))</div><div class='ctx'> 		goto last_resort;</div><div class='del'>-	if (res.type != RTN_UNICAST &amp;&amp;</div><div class='del'>-	    (res.type != RTN_LOCAL || !IN_DEV_ACCEPT_LOCAL(idev)))</div><div class='del'>-		goto e_inval;</div><div class='del'>-	fib_combine_itag(itag, &amp;res);</div><div class='del'>-	dev_match = false;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	for (ret = 0; ret &lt; res.fi-&gt;fib_nhs; ret++) {</div><div class='del'>-		struct fib_nh *nh = &amp;res.fi-&gt;fib_nh[ret];</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_dev == dev) {</div><div class='del'>-			dev_match = true;</div><div class='del'>-			break;</div><div class='del'>-		} else if (l3mdev_master_ifindex_rcu(nh-&gt;nh_dev) == dev-&gt;ifindex) {</div><div class='del'>-			dev_match = true;</div><div class='del'>-			break;</div><div class='add'>+	if (res.type != RTN_UNICAST) {</div><div class='add'>+		if (res.type != RTN_LOCAL) {</div><div class='add'>+			reason = SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='add'>+			goto e_inval;</div><div class='add'>+		} else if (!IN_DEV_ACCEPT_LOCAL(idev)) {</div><div class='add'>+			reason = SKB_DROP_REASON_IP_LOCAL_SOURCE;</div><div class='add'>+			goto e_inval;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#else</div><div class='del'>-	if (FIB_RES_DEV(res) == dev)</div><div class='del'>-		dev_match = true;</div><div class='del'>-#endif</div><div class='add'>+	fib_combine_itag(itag, &amp;res);</div><div class='add'>+</div><div class='add'>+	dev_match = fib_info_nh_uses_dev(res.fi, dev);</div><div class='add'>+	/* This is not common, loopback packets retain skb_dst so normally they</div><div class='add'>+	 * would not even hit this slow path.</div><div class='add'>+	 */</div><div class='add'>+	dev_match = dev_match || (res.type == RTN_LOCAL &amp;&amp;</div><div class='add'>+				  dev == net-&gt;loopback_dev);</div><div class='ctx'> 	if (dev_match) {</div><div class='del'>-		ret = FIB_RES_NH(res).nh_scope &gt;= RT_SCOPE_HOST;</div><div class='add'>+		ret = FIB_RES_NHC(res)-&gt;nhc_scope &gt;= RT_SCOPE_HOST;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (no_addr)</div><div class='hunk'>@@ -392,7 +409,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (fib_lookup(net, &amp;fl4, &amp;res, FIB_LOOKUP_IGNORE_LINKSTATE) == 0) {</div><div class='ctx'> 		if (res.type == RTN_UNICAST)</div><div class='del'>-			ret = FIB_RES_NH(res).nh_scope &gt;= RT_SCOPE_HOST;</div><div class='add'>+			ret = FIB_RES_NHC(res)-&gt;nhc_scope &gt;= RT_SCOPE_HOST;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -403,14 +420,14 @@ last_resort:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> e_inval:</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return -reason;</div><div class='ctx'> e_rpf:</div><div class='del'>-	return -EXDEV;</div><div class='add'>+	return -SKB_DROP_REASON_IP_RPFILTER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Ignore rp_filter for packets protected by IPsec. */</div><div class='ctx'> int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='del'>-			u8 tos, int oif, struct net_device *dev,</div><div class='add'>+			dscp_t dscp, int oif, struct net_device *dev,</div><div class='ctx'> 			struct in_device *idev, u32 *itag)</div><div class='ctx'> {</div><div class='ctx'> 	int r = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(idev);</div><div class='hunk'>@@ -427,8 +444,11 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,</div><div class='ctx'> 		if (net-&gt;ipv4.fib_has_custom_local_routes ||</div><div class='ctx'> 		    fib4_has_custom_rules(net))</div><div class='ctx'> 			goto full_check;</div><div class='add'>+		/* Within the same container, it is regarded as a martian source,</div><div class='add'>+		 * and the same host but different containers are not.</div><div class='add'>+		 */</div><div class='ctx'> 		if (inet_lookup_ifaddr_rcu(net, src))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return -SKB_DROP_REASON_IP_LOCAL_SOURCE;</div><div class='ctx'> </div><div class='ctx'> ok:</div><div class='ctx'> 		*itag = 0;</div><div class='hunk'>@@ -436,7 +456,8 @@ ok:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> full_check:</div><div class='del'>-	return __fib_validate_source(skb, src, dst, tos, oif, dev, r, idev, itag);</div><div class='add'>+	return __fib_validate_source(skb, src, dst, dscp, oif, dev, r, idev,</div><div class='add'>+				     itag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline __be32 sk_extract_addr(struct sockaddr *addr)</div><div class='hunk'>@@ -530,14 +551,20 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt,</div><div class='ctx'> 		cfg-&gt;fc_oif = dev-&gt;ifindex;</div><div class='ctx'> 		cfg-&gt;fc_table = l3mdev_fib_table(dev);</div><div class='ctx'> 		if (colon) {</div><div class='del'>-			struct in_ifaddr *ifa;</div><div class='del'>-			struct in_device *in_dev = __in_dev_get_rtnl(dev);</div><div class='add'>+			const struct in_ifaddr *ifa;</div><div class='add'>+			struct in_device *in_dev;</div><div class='add'>+</div><div class='add'>+			in_dev = __in_dev_get_rtnl_net(dev);</div><div class='ctx'> 			if (!in_dev)</div><div class='ctx'> 				return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 			*colon = ':';</div><div class='del'>-			for (ifa = in_dev-&gt;ifa_list; ifa; ifa = ifa-&gt;ifa_next)</div><div class='add'>+</div><div class='add'>+			in_dev_for_each_ifa_rtnl_net(net, ifa, in_dev) {</div><div class='ctx'> 				if (strcmp(ifa-&gt;ifa_label, devname) == 0)</div><div class='ctx'> 					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (!ifa)</div><div class='ctx'> 				return -ENODEV;</div><div class='ctx'> 			cfg-&gt;fc_prefsrc = ifa-&gt;ifa_local;</div><div class='hunk'>@@ -548,17 +575,21 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt,</div><div class='ctx'> 	if (rt-&gt;rt_gateway.sa_family == AF_INET &amp;&amp; addr) {</div><div class='ctx'> 		unsigned int addr_type;</div><div class='ctx'> </div><div class='del'>-		cfg-&gt;fc_gw = addr;</div><div class='add'>+		cfg-&gt;fc_gw4 = addr;</div><div class='add'>+		cfg-&gt;fc_gw_family = AF_INET;</div><div class='ctx'> 		addr_type = inet_addr_type_table(net, addr, cfg-&gt;fc_table);</div><div class='ctx'> 		if (rt-&gt;rt_flags &amp; RTF_GATEWAY &amp;&amp;</div><div class='ctx'> 		    addr_type == RTN_UNICAST)</div><div class='ctx'> 			cfg-&gt;fc_scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!cfg-&gt;fc_table)</div><div class='add'>+		cfg-&gt;fc_table = RT_TABLE_MAIN;</div><div class='add'>+</div><div class='ctx'> 	if (cmd == SIOCDELRT)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;rt_flags &amp; RTF_GATEWAY &amp;&amp; !cfg-&gt;fc_gw)</div><div class='add'>+	if (rt-&gt;rt_flags &amp; RTF_GATEWAY &amp;&amp; !cfg-&gt;fc_gw_family)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_scope == RT_SCOPE_NOWHERE)</div><div class='hunk'>@@ -603,7 +634,7 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, struct rtentry *rt)</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		rtnl_lock();</div><div class='add'>+		rtnl_net_lock(net);</div><div class='ctx'> 		err = rtentry_to_fib_config(net, cmd, rt, &amp;cfg);</div><div class='ctx'> 		if (err == 0) {</div><div class='ctx'> 			struct fib_table *tb;</div><div class='hunk'>@@ -627,13 +658,14 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, struct rtentry *rt)</div><div class='ctx'> 			/* allocated by rtentry_to_fib_config() */</div><div class='ctx'> 			kfree(cfg.fc_mx);</div><div class='ctx'> 		}</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct nla_policy rtm_ipv4_policy[RTA_MAX + 1] = {</div><div class='add'>+	[RTA_UNSPEC]		= { .strict_start_type = RTA_DPORT + 1 },</div><div class='ctx'> 	[RTA_DST]		= { .type = NLA_U32 },</div><div class='ctx'> 	[RTA_SRC]		= { .type = NLA_U32 },</div><div class='ctx'> 	[RTA_IIF]		= { .type = NLA_U32 },</div><div class='hunk'>@@ -652,26 +684,80 @@ const struct nla_policy rtm_ipv4_policy[RTA_MAX + 1] = {</div><div class='ctx'> 	[RTA_IP_PROTO]		= { .type = NLA_U8 },</div><div class='ctx'> 	[RTA_SPORT]		= { .type = NLA_U16 },</div><div class='ctx'> 	[RTA_DPORT]		= { .type = NLA_U16 },</div><div class='add'>+	[RTA_NH_ID]		= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int fib_gw_from_via(struct fib_config *cfg, struct nlattr *nla,</div><div class='add'>+		    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rtvia *via;</div><div class='add'>+	int alen;</div><div class='add'>+</div><div class='add'>+	if (nla_len(nla) &lt; offsetof(struct rtvia, rtvia_addr)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid attribute length for RTA_VIA");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	via = nla_data(nla);</div><div class='add'>+	alen = nla_len(nla) - offsetof(struct rtvia, rtvia_addr);</div><div class='add'>+</div><div class='add'>+	switch (via-&gt;rtvia_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		if (alen != sizeof(__be32)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid IPv4 address in RTA_VIA");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;fc_gw_family = AF_INET;</div><div class='add'>+		cfg-&gt;fc_gw4 = *((__be32 *)via-&gt;rtvia_addr);</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		if (alen != sizeof(struct in6_addr)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid IPv6 address in RTA_VIA");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;fc_gw_family = AF_INET6;</div><div class='add'>+		cfg-&gt;fc_gw6 = *((struct in6_addr *)via-&gt;rtvia_addr);</div><div class='add'>+#else</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 support not enabled in kernel");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported address family in RTA_VIA");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			     struct nlmsghdr *nlh, struct fib_config *cfg,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	bool has_gw = false, has_via = false;</div><div class='ctx'> 	struct nlattr *attr;</div><div class='ctx'> 	int err, remaining;</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipv4_policy,</div><div class='del'>-			     extack);</div><div class='add'>+	err = nlmsg_validate_deprecated(nlh, sizeof(*rtm), RTA_MAX,</div><div class='add'>+					rtm_ipv4_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	memset(cfg, 0, sizeof(*cfg));</div><div class='ctx'> </div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='add'>+</div><div class='add'>+	if (!inet_validate_dscp(rtm-&gt;rtm_tos)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid dsfield (tos): ECN bits must be 0");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+	cfg-&gt;fc_dscp = inet_dsfield_to_dscp(rtm-&gt;rtm_tos);</div><div class='add'>+</div><div class='ctx'> 	cfg-&gt;fc_dst_len = rtm-&gt;rtm_dst_len;</div><div class='del'>-	cfg-&gt;fc_tos = rtm-&gt;rtm_tos;</div><div class='ctx'> 	cfg-&gt;fc_table = rtm-&gt;rtm_table;</div><div class='ctx'> 	cfg-&gt;fc_protocol = rtm-&gt;rtm_protocol;</div><div class='ctx'> 	cfg-&gt;fc_scope = rtm-&gt;rtm_scope;</div><div class='hunk'>@@ -698,7 +784,16 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			cfg-&gt;fc_oif = nla_get_u32(attr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case RTA_GATEWAY:</div><div class='del'>-			cfg-&gt;fc_gw = nla_get_be32(attr);</div><div class='add'>+			has_gw = true;</div><div class='add'>+			cfg-&gt;fc_gw4 = nla_get_be32(attr);</div><div class='add'>+			if (cfg-&gt;fc_gw4)</div><div class='add'>+				cfg-&gt;fc_gw_family = AF_INET;</div><div class='add'>+			break;</div><div class='add'>+		case RTA_VIA:</div><div class='add'>+			has_via = true;</div><div class='add'>+			err = fib_gw_from_via(cfg, attr, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				goto errout;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case RTA_PRIORITY:</div><div class='ctx'> 			cfg-&gt;fc_priority = nla_get_u32(attr);</div><div class='hunk'>@@ -735,9 +830,44 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto errout;</div><div class='ctx'> 			break;</div><div class='add'>+		case RTA_NH_ID:</div><div class='add'>+			cfg-&gt;fc_nh_id = nla_get_u32(attr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_dst_len &gt; 32) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid prefix length");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_dst_len &lt; 32 &amp;&amp; (ntohl(cfg-&gt;fc_dst) &lt;&lt; cfg-&gt;fc_dst_len)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid prefix for given prefix length");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_nh_id) {</div><div class='add'>+		if (cfg-&gt;fc_oif || cfg-&gt;fc_gw_family ||</div><div class='add'>+		    cfg-&gt;fc_encap || cfg-&gt;fc_mp) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Nexthop specification and nexthop id are mutually exclusive");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (has_gw &amp;&amp; has_via) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Nexthop configuration can not contain both GATEWAY and VIA");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;fc_table)</div><div class='add'>+		cfg-&gt;fc_table = RT_TABLE_MAIN;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> errout:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -755,14 +885,24 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	if (cfg.fc_nh_id &amp;&amp; !nexthop_find_by_id(net, cfg.fc_nh_id)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop id does not exist");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tb = fib_get_table(net, cfg.fc_table);</div><div class='ctx'> 	if (!tb) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "FIB table does not exist");</div><div class='ctx'> 		err = -ESRCH;</div><div class='del'>-		goto errout;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = fib_table_delete(net, tb, &amp;cfg, extack);</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> errout:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -779,37 +919,150 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='ctx'> 	tb = fib_new_table(net, cfg.fc_table);</div><div class='ctx'> 	if (!tb) {</div><div class='ctx'> 		err = -ENOBUFS;</div><div class='del'>-		goto errout;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = fib_table_insert(net, tb, &amp;cfg, extack);</div><div class='ctx'> 	if (!err &amp;&amp; cfg.fc_type == RTN_LOCAL)</div><div class='ctx'> 		net-&gt;ipv4.fib_has_custom_local_routes = true;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> errout:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,</div><div class='add'>+			  struct fib_dump_filter *filter,</div><div class='add'>+			  struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct nlattr *tb[RTA_MAX + 1];</div><div class='add'>+	struct rtmsg *rtm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;rtnl_held)</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	rtm = nlmsg_payload(nlh, sizeof(*rtm));</div><div class='add'>+	if (!rtm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid header for FIB dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rtm-&gt;rtm_dst_len || rtm-&gt;rtm_src_len  || rtm-&gt;rtm_tos   ||</div><div class='add'>+	    rtm-&gt;rtm_scope) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for FIB dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rtm-&gt;rtm_flags &amp; ~(RTM_F_CLONED | RTM_F_PREFIX)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid flags for FIB dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (rtm-&gt;rtm_flags &amp; RTM_F_CLONED)</div><div class='add'>+		filter-&gt;dump_routes = false;</div><div class='add'>+	else</div><div class='add'>+		filter-&gt;dump_exceptions = false;</div><div class='add'>+</div><div class='add'>+	filter-&gt;flags    = rtm-&gt;rtm_flags;</div><div class='add'>+	filter-&gt;protocol = rtm-&gt;rtm_protocol;</div><div class='add'>+	filter-&gt;rt_type  = rtm-&gt;rtm_type;</div><div class='add'>+	filter-&gt;table_id = rtm-&gt;rtm_table;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					    rtm_ipv4_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= RTA_MAX; ++i) {</div><div class='add'>+		int ifindex;</div><div class='add'>+</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case RTA_TABLE:</div><div class='add'>+			filter-&gt;table_id = nla_get_u32(tb[i]);</div><div class='add'>+			break;</div><div class='add'>+		case RTA_OIF:</div><div class='add'>+			ifindex = nla_get_u32(tb[i]);</div><div class='add'>+			if (filter-&gt;rtnl_held)</div><div class='add'>+				filter-&gt;dev = __dev_get_by_index(net, ifindex);</div><div class='add'>+			else</div><div class='add'>+				filter-&gt;dev = dev_get_by_index_rcu(net, ifindex);</div><div class='add'>+			if (!filter-&gt;dev)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported attribute in dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;flags || filter-&gt;protocol || filter-&gt;rt_type ||</div><div class='add'>+	    filter-&gt;table_id || filter-&gt;dev) {</div><div class='add'>+		filter-&gt;filter_set = 1;</div><div class='add'>+		cb-&gt;answer_flags = NLM_F_DUMP_FILTERED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_valid_fib_dump_req);</div><div class='add'>+</div><div class='ctx'> static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	struct fib_dump_filter filter = {</div><div class='add'>+		.dump_routes = true,</div><div class='add'>+		.dump_exceptions = true,</div><div class='add'>+		.rtnl_held = false,</div><div class='add'>+	};</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	unsigned int h, s_h;</div><div class='ctx'> 	unsigned int e = 0, s_e;</div><div class='ctx'> 	struct fib_table *tb;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='del'>-	int dumped = 0, err;</div><div class='add'>+	int dumped = 0, err = 0;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_len(cb-&gt;nlh) &gt;= sizeof(struct rtmsg) &amp;&amp;</div><div class='del'>-	    ((struct rtmsg *) nlmsg_data(cb-&gt;nlh))-&gt;rtm_flags &amp; RTM_F_CLONED)</div><div class='del'>-		return skb-&gt;len;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = ip_valid_fib_dump_req(net, nlh, &amp;filter, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto unlock;</div><div class='add'>+	} else if (nlmsg_len(nlh) &gt;= sizeof(struct rtmsg)) {</div><div class='add'>+		struct rtmsg *rtm = nlmsg_data(nlh);</div><div class='add'>+</div><div class='add'>+		filter.flags = rtm-&gt;rtm_flags &amp; (RTM_F_PREFIX | RTM_F_CLONED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ipv4 does not use prefix flag */</div><div class='add'>+	if (filter.flags &amp; RTM_F_PREFIX)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (filter.table_id) {</div><div class='add'>+		tb = fib_get_table(net, filter.table_id);</div><div class='add'>+		if (!tb) {</div><div class='add'>+			if (rtnl_msg_family(cb-&gt;nlh) != PF_INET)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='add'>+			NL_SET_ERR_MSG(cb-&gt;extack, "ipv4: FIB table does not exist");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		err = fib_table_dump(tb, skb, cb, &amp;filter);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	s_h = cb-&gt;args[0];</div><div class='ctx'> 	s_e = cb-&gt;args[1];</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='add'>+	err = 0;</div><div class='ctx'> 	for (h = s_h; h &lt; FIB_TABLE_HASHSZ; h++, s_e = 0) {</div><div class='ctx'> 		e = 0;</div><div class='ctx'> 		head = &amp;net-&gt;ipv4.fib_table_hash[h];</div><div class='hunk'>@@ -819,26 +1072,21 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 			if (dumped)</div><div class='ctx'> 				memset(&amp;cb-&gt;args[2], 0, sizeof(cb-&gt;args) -</div><div class='ctx'> 						 2 * sizeof(cb-&gt;args[0]));</div><div class='del'>-			err = fib_table_dump(tb, skb, cb);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				if (likely(skb-&gt;len))</div><div class='del'>-					goto out;</div><div class='del'>-</div><div class='del'>-				goto out_err;</div><div class='del'>-			}</div><div class='add'>+			err = fib_table_dump(tb, skb, cb, &amp;filter);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto out;</div><div class='ctx'> 			dumped = 1;</div><div class='ctx'> next:</div><div class='ctx'> 			e++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	err = skb-&gt;len;</div><div class='del'>-out_err:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[1] = e;</div><div class='ctx'> 	cb-&gt;args[0] = h;</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -911,9 +1159,11 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Add broadcast address, if it is explicitly assigned. */</div><div class='del'>-	if (ifa-&gt;ifa_broadcast &amp;&amp; ifa-&gt;ifa_broadcast != htonl(0xFFFFFFFF))</div><div class='add'>+	if (ifa-&gt;ifa_broadcast &amp;&amp; ifa-&gt;ifa_broadcast != htonl(0xFFFFFFFF)) {</div><div class='ctx'> 		fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa-&gt;ifa_broadcast, 32,</div><div class='ctx'> 			  prim, 0);</div><div class='add'>+		arp_invalidate(dev, ifa-&gt;ifa_broadcast, false);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv4_is_zeronet(prefix) &amp;&amp; !(ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY) &amp;&amp;</div><div class='ctx'> 	    (prefix != addr || ifa-&gt;ifa_prefixlen &lt; 32)) {</div><div class='hunk'>@@ -923,12 +1173,11 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)</div><div class='ctx'> 				  prefix, ifa-&gt;ifa_prefixlen, prim,</div><div class='ctx'> 				  ifa-&gt;ifa_rt_priority);</div><div class='ctx'> </div><div class='del'>-		/* Add network specific broadcasts, when it takes a sense */</div><div class='add'>+		/* Add the network broadcast address, when it makes sense */</div><div class='ctx'> 		if (ifa-&gt;ifa_prefixlen &lt; 31) {</div><div class='del'>-			fib_magic(RTM_NEWROUTE, RTN_BROADCAST, prefix, 32,</div><div class='del'>-				  prim, 0);</div><div class='ctx'> 			fib_magic(RTM_NEWROUTE, RTN_BROADCAST, prefix | ~mask,</div><div class='ctx'> 				  32, prim, 0);</div><div class='add'>+			arp_invalidate(dev, prefix | ~mask, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -942,7 +1191,7 @@ void fib_modify_prefix_metric(struct in_ifaddr *ifa, u32 new_metric)</div><div class='ctx'> 	if (!(dev-&gt;flags &amp; IFF_UP) ||</div><div class='ctx'> 	    ifa-&gt;ifa_flags &amp; (IFA_F_SECONDARY | IFA_F_NOPREFIXROUTE) ||</div><div class='ctx'> 	    ipv4_is_zeronet(prefix) ||</div><div class='del'>-	    prefix == ifa-&gt;ifa_local || ifa-&gt;ifa_prefixlen == 32)</div><div class='add'>+	    (prefix == ifa-&gt;ifa_local &amp;&amp; ifa-&gt;ifa_prefixlen == 32))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* add the new */</div><div class='hunk'>@@ -1009,8 +1258,8 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Scan address list to be sure that addresses are really gone.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	for (ifa1 = in_dev-&gt;ifa_list; ifa1; ifa1 = ifa1-&gt;ifa_next) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa1, in_dev) {</div><div class='ctx'> 		if (ifa1 == ifa) {</div><div class='ctx'> 			/* promotion, keep the IP */</div><div class='ctx'> 			gone = 0;</div><div class='hunk'>@@ -1078,6 +1327,7 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> no_promotions:</div><div class='ctx'> 	if (!(ok &amp; BRD_OK))</div><div class='hunk'>@@ -1123,7 +1373,7 @@ static void nl_fib_lookup(struct net *net, struct fib_result_nl *frn)</div><div class='ctx'> 	struct flowi4           fl4 = {</div><div class='ctx'> 		.flowi4_mark = frn-&gt;fl_mark,</div><div class='ctx'> 		.daddr = frn-&gt;fl_addr,</div><div class='del'>-		.flowi4_tos = frn-&gt;fl_tos,</div><div class='add'>+		.flowi4_dscp = inet_dsfield_to_dscp(frn-&gt;fl_tos),</div><div class='ctx'> 		.flowi4_scope = frn-&gt;fl_scope,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct fib_table *tb;</div><div class='hunk'>@@ -1170,13 +1420,13 @@ static void nl_fib_input(struct sk_buff *skb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	nlh = nlmsg_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	frn = (struct fib_result_nl *) nlmsg_data(nlh);</div><div class='add'>+	frn = nlmsg_data(nlh);</div><div class='ctx'> 	nl_fib_lookup(net, frn);</div><div class='ctx'> </div><div class='ctx'> 	portid = NETLINK_CB(skb).portid;      /* netlink portid */</div><div class='ctx'> 	NETLINK_CB(skb).portid = 0;        /* from kernel */</div><div class='ctx'> 	NETLINK_CB(skb).dst_group = 0;  /* unicast */</div><div class='del'>-	netlink_unicast(net-&gt;ipv4.fibnl, skb, portid, MSG_DONTWAIT);</div><div class='add'>+	nlmsg_unicast(net-&gt;ipv4.fibnl, skb, portid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __net_init nl_fib_lookup_init(struct net *net)</div><div class='hunk'>@@ -1211,7 +1461,7 @@ static void fib_disable_ip(struct net_device *dev, unsigned long event,</div><div class='ctx'> </div><div class='ctx'> static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='del'>-	struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;</div><div class='add'>+	struct in_ifaddr *ifa = ptr;</div><div class='ctx'> 	struct net_device *dev = ifa-&gt;ifa_dev-&gt;dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1222,7 +1472,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 		fib_sync_up(dev, RTNH_F_DEAD);</div><div class='ctx'> #endif</div><div class='ctx'> 		atomic_inc(&amp;net-&gt;ipv4.dev_addr_genid);</div><div class='del'>-		rt_cache_flush(dev_net(dev));</div><div class='add'>+		rt_cache_flush(net);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='ctx'> 		fib_del_ifaddr(ifa, NULL);</div><div class='hunk'>@@ -1233,7 +1483,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 			 */</div><div class='ctx'> 			fib_disable_ip(dev, event, true);</div><div class='ctx'> 		} else {</div><div class='del'>-			rt_cache_flush(dev_net(dev));</div><div class='add'>+			rt_cache_flush(net);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1243,9 +1493,11 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> static int fib_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct netdev_notifier_changeupper_info *info;</div><div class='add'>+	struct netdev_notifier_changeupper_info *upper_info = ptr;</div><div class='add'>+	struct netdev_notifier_info_ext *info_ext = ptr;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> </div><div class='ctx'> 	if (event == NETDEV_UNREGISTER) {</div><div class='hunk'>@@ -1260,9 +1512,9 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_UP:</div><div class='del'>-		for_ifa(in_dev) {</div><div class='add'>+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {</div><div class='ctx'> 			fib_add_ifaddr(ifa);</div><div class='del'>-		} endfor_ifa(in_dev);</div><div class='add'>+		}</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> 		fib_sync_up(dev, RTNH_F_DEAD);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1273,21 +1525,24 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo</div><div class='ctx'> 		fib_disable_ip(dev, event, false);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='del'>-		flags = dev_get_flags(dev);</div><div class='add'>+		flags = netif_get_flags(dev);</div><div class='ctx'> 		if (flags &amp; (IFF_RUNNING | IFF_LOWER_UP))</div><div class='ctx'> 			fib_sync_up(dev, RTNH_F_LINKDOWN);</div><div class='ctx'> 		else</div><div class='ctx'> 			fib_sync_down_dev(dev, event, false);</div><div class='del'>-		/* fall through */</div><div class='add'>+		rt_cache_flush(net);</div><div class='add'>+		break;</div><div class='ctx'> 	case NETDEV_CHANGEMTU:</div><div class='add'>+		fib_sync_mtu(dev, info_ext-&gt;ext.mtu);</div><div class='ctx'> 		rt_cache_flush(net);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_CHANGEUPPER:</div><div class='del'>-		info = ptr;</div><div class='add'>+		upper_info = ptr;</div><div class='ctx'> 		/* flush all routes if dev is linked to or unlinked from</div><div class='ctx'> 		 * an L3 master device (e.g., VRF)</div><div class='ctx'> 		 */</div><div class='del'>-		if (info-&gt;upper_dev &amp;&amp; netif_is_l3_master(info-&gt;upper_dev))</div><div class='add'>+		if (upper_info-&gt;upper_dev &amp;&amp;</div><div class='add'>+		    netif_is_l3_master(upper_info-&gt;upper_dev))</div><div class='ctx'> 			fib_disable_ip(dev, NETDEV_DOWN, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1311,6 +1566,12 @@ static int __net_init ip_fib_net_init(struct net *net)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+	/* Default to 3-tuple */</div><div class='add'>+	net-&gt;ipv4.sysctl_fib_multipath_hash_fields =</div><div class='add'>+		FIB_MULTIPATH_HASH_FIELD_DEFAULT_MASK;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Avoid false sharing : Use at least a full cache line */</div><div class='ctx'> 	size = max_t(size_t, size, L1_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -1336,7 +1597,7 @@ static void ip_fib_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='ctx'> #ifdef CONFIG_IP_MULTIPLE_TABLES</div><div class='ctx'> 	RCU_INIT_POINTER(net-&gt;ipv4.fib_main, NULL);</div><div class='ctx'> 	RCU_INIT_POINTER(net-&gt;ipv4.fib_default, NULL);</div><div class='hunk'>@@ -1353,7 +1614,7 @@ static void ip_fib_net_exit(struct net *net)</div><div class='ctx'> </div><div class='ctx'> 		hlist_for_each_entry_safe(tb, tmp, head, tb_hlist) {</div><div class='ctx'> 			hlist_del(&amp;tb-&gt;tb_hlist);</div><div class='del'>-			fib_table_flush(net, tb);</div><div class='add'>+			fib_table_flush(net, tb, true);</div><div class='ctx'> 			fib_free_table(tb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1361,7 +1622,7 @@ static void ip_fib_net_exit(struct net *net)</div><div class='ctx'> #ifdef CONFIG_IP_MULTIPLE_TABLES</div><div class='ctx'> 	fib4_rules_exit(net);</div><div class='ctx'> #endif</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 	kfree(net-&gt;ipv4.fib_table_hash);</div><div class='ctx'> 	fib4_notifier_exit(net);</div><div class='ctx'> }</div><div class='hunk'>@@ -1371,14 +1632,20 @@ static int __net_init fib_net_init(struct net *net)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-	net-&gt;ipv4.fib_num_tclassid_users = 0;</div><div class='add'>+	atomic_set(&amp;net-&gt;ipv4.fib_num_tclassid_users, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	error = ip_fib_net_init(net);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='add'>+	error = fib4_semantics_init(net);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_semantics;</div><div class='add'>+</div><div class='ctx'> 	error = nl_fib_lookup_init(net);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto out_nlfl;</div><div class='add'>+</div><div class='ctx'> 	error = fib_proc_init(net);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto out_proc;</div><div class='hunk'>@@ -1388,7 +1655,11 @@ out:</div><div class='ctx'> out_proc:</div><div class='ctx'> 	nl_fib_lookup_exit(net);</div><div class='ctx'> out_nlfl:</div><div class='add'>+	fib4_semantics_exit(net);</div><div class='add'>+out_semantics:</div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> 	ip_fib_net_exit(net);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1396,12 +1667,37 @@ static void __net_exit fib_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	fib_proc_exit(net);</div><div class='ctx'> 	nl_fib_lookup_exit(net);</div><div class='del'>-	ip_fib_net_exit(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit fib_net_exit_batch(struct list_head *net_list)</div><div class='add'>+{</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list) {</div><div class='add'>+		__rtnl_net_lock(net);</div><div class='add'>+		ip_fib_net_exit(net);</div><div class='add'>+		__rtnl_net_unlock(net);</div><div class='add'>+	}</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list)</div><div class='add'>+		fib4_semantics_exit(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations fib_net_ops = {</div><div class='ctx'> 	.init = fib_net_init,</div><div class='ctx'> 	.exit = fib_net_exit,</div><div class='add'>+	.exit_batch = fib_net_exit_batch,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler fib_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_NEWROUTE,</div><div class='add'>+	 .doit = inet_rtm_newroute, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_DELROUTE,</div><div class='add'>+	 .doit = inet_rtm_delroute, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_GETROUTE, .dumpit = inet_dump_fib,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init ip_fib_init(void)</div><div class='hunk'>@@ -1413,7 +1709,5 @@ void __init ip_fib_init(void)</div><div class='ctx'> 	register_netdevice_notifier(&amp;fib_netdev_notifier);</div><div class='ctx'> 	register_inetaddr_notifier(&amp;fib_inetaddr_notifier);</div><div class='ctx'> </div><div class='del'>-	rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL, 0);</div><div class='del'>-	rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL, 0);</div><div class='del'>-	rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib, 0);</div><div class='add'>+	rtnl_register_many(fib_rtnl_msg_handlers);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h<br/>index e6ff282bb7f4..f9b9e26c32c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_lookup.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_lookup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_lookup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_lookup.h</a></div><div class='hunk'>@@ -4,23 +4,28 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fib_alias {</div><div class='ctx'> 	struct hlist_node	fa_list;</div><div class='ctx'> 	struct fib_info		*fa_info;</div><div class='del'>-	u8			fa_tos;</div><div class='add'>+	dscp_t			fa_dscp;</div><div class='ctx'> 	u8			fa_type;</div><div class='ctx'> 	u8			fa_state;</div><div class='ctx'> 	u8			fa_slen;</div><div class='ctx'> 	u32			tb_id;</div><div class='ctx'> 	s16			fa_default;</div><div class='add'>+	u8			offload;</div><div class='add'>+	u8			trap;</div><div class='add'>+	u8			offload_failed;</div><div class='ctx'> 	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FA_S_ACCESSED	0x01</div><div class='ctx'> </div><div class='del'>-/* Dont write on fa_state unless needed, to keep it shared on all cpus */</div><div class='add'>+/* Don't write on fa_state unless needed, to keep it shared on all cpus */</div><div class='ctx'> static inline void fib_alias_accessed(struct fib_alias *fa)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(fa-&gt;fa_state &amp; FA_S_ACCESSED))</div><div class='hunk'>@@ -31,20 +36,21 @@ static inline void fib_alias_accessed(struct fib_alias *fa)</div><div class='ctx'> void fib_release_info(struct fib_info *);</div><div class='ctx'> struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 				 struct netlink_ext_ack *extack);</div><div class='del'>-int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,</div><div class='add'>+int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,</div><div class='ctx'> 		 struct netlink_ext_ack *extack);</div><div class='ctx'> bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi);</div><div class='del'>-int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, u32 tb_id,</div><div class='del'>-		  u8 type, __be32 dst, int dst_len, u8 tos, struct fib_info *fi,</div><div class='del'>-		  unsigned int);</div><div class='add'>+int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,</div><div class='add'>+		  const struct fib_rt_info *fri, unsigned int flags);</div><div class='ctx'> void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, int dst_len,</div><div class='ctx'> 	       u32 tb_id, const struct nl_info *info, unsigned int nlm_flags);</div><div class='add'>+size_t fib_nlmsg_size(struct fib_info *fi);</div><div class='ctx'> </div><div class='ctx'> static inline void fib_result_assign(struct fib_result *res,</div><div class='ctx'> 				     struct fib_info *fi)</div><div class='ctx'> {</div><div class='ctx'> 	/* we used to play games with refcounts, but we now use RCU */</div><div class='ctx'> 	res-&gt;fi = fi;</div><div class='add'>+	res-&gt;nhc = fib_info_nhc(fi, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct fib_prop {</div><div class='head'>diff --git a/net/ipv4/fib_notifier.c b/net/ipv4/fib_notifier.c<br/>index b804ccbdb241..b1551c26554b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_notifier.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_notifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_notifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_notifier.c</a></div><div class='hunk'>@@ -6,15 +6,14 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/fib_notifier.h&gt;</div><div class='del'>-#include &lt;net/netns/ipv4.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> </div><div class='del'>-int call_fib4_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+int call_fib4_notifier(struct notifier_block *nb,</div><div class='ctx'> 		       enum fib_event_type event_type,</div><div class='ctx'> 		       struct fib_notifier_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;family = AF_INET;</div><div class='del'>-	return call_fib_notifier(nb, net, event_type, info);</div><div class='add'>+	return call_fib_notifier(nb, event_type, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int call_fib4_notifiers(struct net *net, enum fib_event_type event_type,</div><div class='hunk'>@@ -23,28 +22,27 @@ int call_fib4_notifiers(struct net *net, enum fib_event_type event_type,</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;family = AF_INET;</div><div class='del'>-	net-&gt;ipv4.fib_seq++;</div><div class='add'>+	/* Paired with READ_ONCE() in fib4_seq_read() */</div><div class='add'>+	WRITE_ONCE(net-&gt;ipv4.fib_seq, net-&gt;ipv4.fib_seq + 1);</div><div class='ctx'> 	return call_fib_notifiers(net, event_type, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int fib4_seq_read(struct net *net)</div><div class='add'>+static unsigned int fib4_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	return net-&gt;ipv4.fib_seq + fib4_rules_seq_read(net);</div><div class='add'>+	/* Paired with WRITE_ONCE() in call_fib4_notifiers() */</div><div class='add'>+	return READ_ONCE(net-&gt;ipv4.fib_seq) + fib4_rules_seq_read(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib4_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int fib4_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = fib4_rules_dump(net, nb);</div><div class='add'>+	err = fib4_rules_dump(net, nb, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	fib_notify(net, nb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return fib_notify(net, nb, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fib_notifier_ops fib4_notifier_ops_template = {</div><div class='head'>diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c<br/>index f8eb78d042a4..51f0193092f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_rules.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_rules.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_rules.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_rules.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -8,11 +9,6 @@</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *		Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Fixes:</div><div class='ctx'>  *		Rani Assaf	:	local_rule cannot be deleted</div><div class='ctx'>  *		Marc Boucher	:	routing by fwmark</div><div class='hunk'>@@ -27,17 +23,23 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fib4_rule {</div><div class='ctx'> 	struct fib_rule		common;</div><div class='ctx'> 	u8			dst_len;</div><div class='ctx'> 	u8			src_len;</div><div class='del'>-	u8			tos;</div><div class='add'>+	dscp_t			dscp;</div><div class='add'>+	dscp_t			dscp_mask;</div><div class='add'>+	u8			dscp_full:1;	/* DSCP or TOS selector */</div><div class='ctx'> 	__be32			src;</div><div class='ctx'> 	__be32			srcmask;</div><div class='ctx'> 	__be32			dst;</div><div class='hunk'>@@ -51,7 +53,7 @@ static bool fib4_rule_matchall(const struct fib_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib4_rule *r = container_of(rule, struct fib4_rule, common);</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;dst_len || r-&gt;src_len || r-&gt;tos)</div><div class='add'>+	if (r-&gt;dst_len || r-&gt;src_len || r-&gt;dscp)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return fib_rule_matchall(rule);</div><div class='ctx'> }</div><div class='hunk'>@@ -68,12 +70,13 @@ bool fib4_rule_default(const struct fib_rule *rule)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib4_rule_default);</div><div class='ctx'> </div><div class='del'>-int fib4_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+int fib4_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return fib_rules_dump(net, nb, AF_INET);</div><div class='add'>+	return fib_rules_dump(net, nb, AF_INET, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int fib4_rules_seq_read(struct net *net)</div><div class='add'>+unsigned int fib4_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return fib_rules_seq_read(net, AF_INET);</div><div class='ctx'> }</div><div class='hunk'>@@ -105,8 +108,9 @@ int __fib_lookup(struct net *net, struct flowi4 *flp,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__fib_lookup);</div><div class='ctx'> </div><div class='del'>-static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='del'>-			    int flags, struct fib_lookup_arg *arg)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int fib4_rule_action(struct fib_rule *rule,</div><div class='add'>+					     struct flowi *flp, int flags,</div><div class='add'>+					     struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EAGAIN;</div><div class='ctx'> 	struct fib_table *tbl;</div><div class='hunk'>@@ -140,13 +144,18 @@ static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fib4_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE bool fib4_rule_suppress(struct fib_rule *rule,</div><div class='add'>+						int flags,</div><div class='add'>+						struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	struct fib_result *result = (struct fib_result *) arg-&gt;result;</div><div class='add'>+	struct fib_result *result = arg-&gt;result;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> </div><div class='del'>-	if (result-&gt;fi)</div><div class='del'>-		dev = result-&gt;fi-&gt;fib_dev;</div><div class='add'>+	if (result-&gt;fi) {</div><div class='add'>+		struct fib_nh_common *nhc = fib_info_nhc(result-&gt;fi, 0);</div><div class='add'>+</div><div class='add'>+		dev = nhc-&gt;nhc_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* do not accept result if the route does</div><div class='ctx'> 	 * not meet the required prefix length</div><div class='hunk'>@@ -168,7 +177,8 @@ suppress_route:</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int fib4_rule_match(struct fib_rule *rule,</div><div class='add'>+					    struct flowi *fl, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib4_rule *r = (struct fib4_rule *) rule;</div><div class='ctx'> 	struct flowi4 *fl4 = &amp;fl-&gt;u.ip4;</div><div class='hunk'>@@ -179,18 +189,26 @@ static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='ctx'> 	    ((daddr ^ r-&gt;dst) &amp; r-&gt;dstmask))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;tos &amp;&amp; (r-&gt;tos != fl4-&gt;flowi4_tos))</div><div class='add'>+	/* When DSCP selector is used we need to match on the entire DSCP field</div><div class='add'>+	 * in the flow information structure. When TOS selector is used we need</div><div class='add'>+	 * to mask the upper three DSCP bits prior to matching to maintain</div><div class='add'>+	 * legacy behavior.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;dscp_full &amp;&amp; (r-&gt;dscp ^ fl4-&gt;flowi4_dscp) &amp; r-&gt;dscp_mask)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (!r-&gt;dscp_full &amp;&amp; r-&gt;dscp &amp;&amp;</div><div class='add'>+		 !fib_dscp_masked_match(r-&gt;dscp, fl4))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;ip_proto &amp;&amp; (rule-&gt;ip_proto != fl4-&gt;flowi4_proto))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (fib_rule_port_range_set(&amp;rule-&gt;sport_range) &amp;&amp;</div><div class='del'>-	    !fib_rule_port_inrange(&amp;rule-&gt;sport_range, fl4-&gt;fl4_sport))</div><div class='add'>+	if (!fib_rule_port_match(&amp;rule-&gt;sport_range, rule-&gt;sport_mask,</div><div class='add'>+				 fl4-&gt;fl4_sport))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (fib_rule_port_range_set(&amp;rule-&gt;dport_range) &amp;&amp;</div><div class='del'>-	    !fib_rule_port_inrange(&amp;rule-&gt;dport_range, fl4-&gt;fl4_dport))</div><div class='add'>+	if (!fib_rule_port_match(&amp;rule-&gt;dport_range, rule-&gt;dport_mask,</div><div class='add'>+				 fl4-&gt;fl4_dport))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -198,32 +216,90 @@ static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='ctx'> </div><div class='ctx'> static struct fib_table *fib_empty_table(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	u32 id;</div><div class='add'>+	u32 id = 1;</div><div class='ctx'> </div><div class='del'>-	for (id = 1; id &lt;= RT_TABLE_MAX; id++)</div><div class='add'>+	while (1) {</div><div class='ctx'> 		if (!fib_get_table(net, id))</div><div class='ctx'> 			return fib_new_table(net, id);</div><div class='add'>+</div><div class='add'>+		if (id++ == RT_TABLE_MAX)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy fib4_rule_policy[FRA_MAX+1] = {</div><div class='del'>-	FRA_GENERIC_POLICY,</div><div class='del'>-	[FRA_FLOW]	= { .type = NLA_U32 },</div><div class='del'>-};</div><div class='add'>+static int fib4_nl2rule_dscp(const struct nlattr *nla, struct fib4_rule *rule4,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (rule4-&gt;dscp) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot specify both TOS and DSCP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule4-&gt;dscp = inet_dsfield_to_dscp(nla_get_u8(nla) &lt;&lt; 2);</div><div class='add'>+	rule4-&gt;dscp_mask = inet_dsfield_to_dscp(INET_DSCP_MASK);</div><div class='add'>+	rule4-&gt;dscp_full = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib4_nl2rule_dscp_mask(const struct nlattr *nla,</div><div class='add'>+				  struct fib4_rule *rule4,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	dscp_t dscp_mask;</div><div class='add'>+</div><div class='add'>+	if (!rule4-&gt;dscp_full) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla,</div><div class='add'>+				    "Cannot specify DSCP mask without DSCP value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dscp_mask = inet_dsfield_to_dscp(nla_get_u8(nla) &lt;&lt; 2);</div><div class='add'>+	if (rule4-&gt;dscp &amp; ~dscp_mask) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla, "Invalid DSCP mask");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule4-&gt;dscp_mask = dscp_mask;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 			       struct fib_rule_hdr *frh,</div><div class='ctx'> 			       struct nlattr **tb,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct fib4_rule *rule4 = (struct fib4_rule *)rule;</div><div class='add'>+	struct net *net = rule-&gt;fr_net;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='del'>-	struct fib4_rule *rule4 = (struct fib4_rule *) rule;</div><div class='ctx'> </div><div class='add'>+	if (tb[FRA_FLOWLABEL] || tb[FRA_FLOWLABEL_MASK]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Flow label cannot be specified for IPv4 FIB rules");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!inet_validate_dscp(frh-&gt;tos)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid dsfield (tos): ECN bits must be 0");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+	/* IPv4 currently doesn't handle high order DSCP bits correctly */</div><div class='ctx'> 	if (frh-&gt;tos &amp; ~IPTOS_TOS_MASK) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid tos");</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='add'>+	rule4-&gt;dscp = inet_dsfield_to_dscp(frh-&gt;tos);</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP] &amp;&amp;</div><div class='add'>+	    fib4_nl2rule_dscp(tb[FRA_DSCP], rule4, extack) &lt; 0)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP_MASK] &amp;&amp;</div><div class='add'>+	    fib4_nl2rule_dscp_mask(tb[FRA_DSCP_MASK], rule4, extack) &lt; 0)</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	/* split local/main if they are not already split */</div><div class='ctx'> 	err = fib_unmerge(net);</div><div class='hunk'>@@ -254,7 +330,7 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 	if (tb[FRA_FLOW]) {</div><div class='ctx'> 		rule4-&gt;tclassid = nla_get_u32(tb[FRA_FLOW]);</div><div class='ctx'> 		if (rule4-&gt;tclassid)</div><div class='del'>-			net-&gt;ipv4.fib_num_tclassid_users++;</div><div class='add'>+			atomic_inc(&amp;net-&gt;ipv4.fib_num_tclassid_users);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +341,6 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 	rule4-&gt;srcmask = inet_make_mask(rule4-&gt;src_len);</div><div class='ctx'> 	rule4-&gt;dst_len = frh-&gt;dst_len;</div><div class='ctx'> 	rule4-&gt;dstmask = inet_make_mask(rule4-&gt;dst_len);</div><div class='del'>-	rule4-&gt;tos = frh-&gt;tos;</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv4.fib_has_custom_rules = true;</div><div class='ctx'> </div><div class='hunk'>@@ -286,7 +361,7 @@ static int fib4_rule_delete(struct fib_rule *rule)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 	if (((struct fib4_rule *)rule)-&gt;tclassid)</div><div class='del'>-		net-&gt;ipv4.fib_num_tclassid_users--;</div><div class='add'>+		atomic_dec(&amp;net-&gt;ipv4.fib_num_tclassid_users);</div><div class='ctx'> #endif</div><div class='ctx'> 	net-&gt;ipv4.fib_has_custom_rules = true;</div><div class='ctx'> </div><div class='hunk'>@@ -308,9 +383,27 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,</div><div class='ctx'> 	if (frh-&gt;dst_len &amp;&amp; (rule4-&gt;dst_len != frh-&gt;dst_len))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (frh-&gt;tos &amp;&amp; (rule4-&gt;tos != frh-&gt;tos))</div><div class='add'>+	if (frh-&gt;tos &amp;&amp;</div><div class='add'>+	    (rule4-&gt;dscp_full ||</div><div class='add'>+	     inet_dscp_to_dsfield(rule4-&gt;dscp) != frh-&gt;tos))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (tb[FRA_DSCP]) {</div><div class='add'>+		dscp_t dscp;</div><div class='add'>+</div><div class='add'>+		dscp = inet_dsfield_to_dscp(nla_get_u8(tb[FRA_DSCP]) &lt;&lt; 2);</div><div class='add'>+		if (!rule4-&gt;dscp_full || rule4-&gt;dscp != dscp)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP_MASK]) {</div><div class='add'>+		dscp_t dscp_mask;</div><div class='add'>+</div><div class='add'>+		dscp_mask = inet_dsfield_to_dscp(nla_get_u8(tb[FRA_DSCP_MASK]) &lt;&lt; 2);</div><div class='add'>+		if (!rule4-&gt;dscp_full || rule4-&gt;dscp_mask != dscp_mask)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 	if (tb[FRA_FLOW] &amp;&amp; (rule4-&gt;tclassid != nla_get_u32(tb[FRA_FLOW])))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -332,7 +425,17 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	frh-&gt;dst_len = rule4-&gt;dst_len;</div><div class='ctx'> 	frh-&gt;src_len = rule4-&gt;src_len;</div><div class='del'>-	frh-&gt;tos = rule4-&gt;tos;</div><div class='add'>+</div><div class='add'>+	if (rule4-&gt;dscp_full) {</div><div class='add'>+		frh-&gt;tos = 0;</div><div class='add'>+		if (nla_put_u8(skb, FRA_DSCP,</div><div class='add'>+			       inet_dscp_to_dsfield(rule4-&gt;dscp) &gt;&gt; 2) ||</div><div class='add'>+		    nla_put_u8(skb, FRA_DSCP_MASK,</div><div class='add'>+			       inet_dscp_to_dsfield(rule4-&gt;dscp_mask) &gt;&gt; 2))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else {</div><div class='add'>+		frh-&gt;tos = inet_dscp_to_dsfield(rule4-&gt;dscp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((rule4-&gt;dst_len &amp;&amp;</div><div class='ctx'> 	     nla_put_in_addr(skb, FRA_DST, rule4-&gt;dst)) ||</div><div class='hunk'>@@ -354,7 +457,9 @@ static size_t fib4_rule_nlmsg_payload(struct fib_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	return nla_total_size(4) /* dst */</div><div class='ctx'> 	       + nla_total_size(4) /* src */</div><div class='del'>-	       + nla_total_size(4); /* flow */</div><div class='add'>+	       + nla_total_size(4) /* flow */</div><div class='add'>+	       + nla_total_size(1) /* dscp */</div><div class='add'>+	       + nla_total_size(1); /* dscp mask */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fib4_rule_flush_cache(struct fib_rules_ops *ops)</div><div class='hunk'>@@ -376,7 +481,6 @@ static const struct fib_rules_ops __net_initconst fib4_rules_ops_template = {</div><div class='ctx'> 	.nlmsg_payload	= fib4_rule_nlmsg_payload,</div><div class='ctx'> 	.flush_cache	= fib4_rule_flush_cache,</div><div class='ctx'> 	.nlgroup	= RTNLGRP_IPV4_RULE,</div><div class='del'>-	.policy		= fib4_rule_policy,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -384,13 +488,13 @@ static int fib_default_rules_init(struct fib_rules_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c<br/>index f3c89ccf14c5..a5f3c8459758 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_semantics.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_semantics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_semantics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_semantics.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *		IPv4 Forwarding Information Base: semantics.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -33,43 +29,42 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/ip6_fib.h&gt;</div><div class='ctx'> #include &lt;net/nexthop.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/rtnh.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='ctx'> #include &lt;net/fib_notifier.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fib_lookup.h"</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(fib_info_lock);</div><div class='del'>-static struct hlist_head *fib_info_hash;</div><div class='del'>-static struct hlist_head *fib_info_laddrhash;</div><div class='del'>-static unsigned int fib_info_hash_size;</div><div class='del'>-static unsigned int fib_info_cnt;</div><div class='del'>-</div><div class='del'>-#define DEVINDEX_HASHBITS 8</div><div class='del'>-#define DEVINDEX_HASHSIZE (1U &lt;&lt; DEVINDEX_HASHBITS)</div><div class='del'>-static struct hlist_head fib_info_devhash[DEVINDEX_HASHSIZE];</div><div class='del'>-</div><div class='add'>+/* for_nexthops and change_nexthops only used when nexthop object</div><div class='add'>+ * is not set in a fib_info. The logic within can reference fib_nh.</div><div class='add'>+ */</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> </div><div class='ctx'> #define for_nexthops(fi) {						\</div><div class='ctx'> 	int nhsel; const struct fib_nh *nh;				\</div><div class='ctx'> 	for (nhsel = 0, nh = (fi)-&gt;fib_nh;				\</div><div class='del'>-	     nhsel &lt; (fi)-&gt;fib_nhs;					\</div><div class='add'>+	     nhsel &lt; fib_info_num_path((fi));				\</div><div class='ctx'> 	     nh++, nhsel++)</div><div class='ctx'> </div><div class='ctx'> #define change_nexthops(fi) {						\</div><div class='ctx'> 	int nhsel; struct fib_nh *nexthop_nh;				\</div><div class='ctx'> 	for (nhsel = 0,	nexthop_nh = (struct fib_nh *)((fi)-&gt;fib_nh);	\</div><div class='del'>-	     nhsel &lt; (fi)-&gt;fib_nhs;					\</div><div class='add'>+	     nhsel &lt; fib_info_num_path((fi));				\</div><div class='ctx'> 	     nexthop_nh++, nhsel++)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_IP_ROUTE_MULTIPATH */</div><div class='hunk'>@@ -157,12 +152,12 @@ static void rt_fibinfo_free(struct rtable __rcu **rtp)</div><div class='ctx'> 	dst_release_immediate(&amp;rt-&gt;dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_nh_exceptions(struct fib_nh *nh)</div><div class='add'>+static void free_nh_exceptions(struct fib_nh_common *nhc)</div><div class='ctx'> {</div><div class='ctx'> 	struct fnhe_hash_bucket *hash;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	hash = rcu_dereference_protected(nh-&gt;nh_exceptions, 1);</div><div class='add'>+	hash = rcu_dereference_protected(nhc-&gt;nhc_exceptions, 1);</div><div class='ctx'> 	if (!hash)</div><div class='ctx'> 		return;</div><div class='ctx'> 	for (i = 0; i &lt; FNHE_HASH_SIZE; i++) {</div><div class='hunk'>@@ -204,24 +199,40 @@ static void rt_fibinfo_free_cpus(struct rtable __rcu * __percpu *rtp)</div><div class='ctx'> 	free_percpu(rtp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fib_nh_common_release(struct fib_nh_common *nhc)</div><div class='add'>+{</div><div class='add'>+	netdev_put(nhc-&gt;nhc_dev, &amp;nhc-&gt;nhc_dev_tracker);</div><div class='add'>+	lwtstate_put(nhc-&gt;nhc_lwtstate);</div><div class='add'>+	rt_fibinfo_free_cpus(nhc-&gt;nhc_pcpu_rth_output);</div><div class='add'>+	rt_fibinfo_free(&amp;nhc-&gt;nhc_rth_input);</div><div class='add'>+	free_nh_exceptions(nhc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_nh_common_release);</div><div class='add'>+</div><div class='add'>+void fib_nh_release(struct net *net, struct fib_nh *fib_nh)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='add'>+	if (fib_nh-&gt;nh_tclassid)</div><div class='add'>+		atomic_dec(&amp;net-&gt;ipv4.fib_num_tclassid_users);</div><div class='add'>+#endif</div><div class='add'>+	fib_nh_common_release(&amp;fib_nh-&gt;nh_common);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Release a nexthop info record */</div><div class='ctx'> static void free_fib_info_rcu(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_info *fi = container_of(head, struct fib_info, rcu);</div><div class='del'>-	struct dst_metrics *m;</div><div class='ctx'> </div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		if (nexthop_nh-&gt;nh_dev)</div><div class='del'>-			dev_put(nexthop_nh-&gt;nh_dev);</div><div class='del'>-		lwtstate_put(nexthop_nh-&gt;nh_lwtstate);</div><div class='del'>-		free_nh_exceptions(nexthop_nh);</div><div class='del'>-		rt_fibinfo_free_cpus(nexthop_nh-&gt;nh_pcpu_rth_output);</div><div class='del'>-		rt_fibinfo_free(&amp;nexthop_nh-&gt;nh_rth_input);</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		nexthop_put(fi-&gt;nh);</div><div class='add'>+	} else {</div><div class='add'>+		change_nexthops(fi) {</div><div class='add'>+			fib_nh_release(fi-&gt;fib_net, nexthop_nh);</div><div class='add'>+		} endfor_nexthops(fi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ip_fib_metrics_put(fi-&gt;fib_metrics);</div><div class='ctx'> </div><div class='del'>-	m = fi-&gt;fib_metrics;</div><div class='del'>-	if (m != &amp;dst_default_metrics &amp;&amp; refcount_dec_and_test(&amp;m-&gt;refcnt))</div><div class='del'>-		kfree(m);</div><div class='ctx'> 	kfree(fi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -231,104 +242,229 @@ void free_fib_info(struct fib_info *fi)</div><div class='ctx'> 		pr_warn("Freeing alive fib_info %p\n", fi);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	fib_info_cnt--;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		if (nexthop_nh-&gt;nh_tclassid)</div><div class='del'>-			fi-&gt;fib_net-&gt;ipv4.fib_num_tclassid_users--;</div><div class='del'>-	} endfor_nexthops(fi);</div><div class='del'>-#endif</div><div class='del'>-	call_rcu(&amp;fi-&gt;rcu, free_fib_info_rcu);</div><div class='add'>+</div><div class='add'>+	call_rcu_hurry(&amp;fi-&gt;rcu, free_fib_info_rcu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(free_fib_info);</div><div class='ctx'> </div><div class='ctx'> void fib_release_info(struct fib_info *fi)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;fib_info_lock);</div><div class='del'>-	if (fi &amp;&amp; --fi-&gt;fib_treeref == 0) {</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	if (fi &amp;&amp; refcount_dec_and_test(&amp;fi-&gt;fib_treeref)) {</div><div class='ctx'> 		hlist_del(&amp;fi-&gt;fib_hash);</div><div class='add'>+		fi-&gt;fib_net-&gt;ipv4.fib_info_cnt--;</div><div class='add'>+</div><div class='ctx'> 		if (fi-&gt;fib_prefsrc)</div><div class='ctx'> 			hlist_del(&amp;fi-&gt;fib_lhash);</div><div class='del'>-		change_nexthops(fi) {</div><div class='del'>-			if (!nexthop_nh-&gt;nh_dev)</div><div class='del'>-				continue;</div><div class='del'>-			hlist_del(&amp;nexthop_nh-&gt;nh_hash);</div><div class='del'>-		} endfor_nexthops(fi)</div><div class='del'>-		fi-&gt;fib_dead = 1;</div><div class='add'>+		if (fi-&gt;nh) {</div><div class='add'>+			list_del(&amp;fi-&gt;nh_list);</div><div class='add'>+		} else {</div><div class='add'>+			change_nexthops(fi) {</div><div class='add'>+				if (!nexthop_nh-&gt;fib_nh_dev)</div><div class='add'>+					continue;</div><div class='add'>+				hlist_del_rcu(&amp;nexthop_nh-&gt;nh_hash);</div><div class='add'>+			} endfor_nexthops(fi)</div><div class='add'>+		}</div><div class='add'>+		/* Paired with READ_ONCE() from fib_table_lookup() */</div><div class='add'>+		WRITE_ONCE(fi-&gt;fib_dead, 1);</div><div class='ctx'> 		fib_info_put(fi);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;fib_info_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)</div><div class='add'>+static inline int nh_comp(struct fib_info *fi, struct fib_info *ofi)</div><div class='ctx'> {</div><div class='del'>-	const struct fib_nh *onh = ofi-&gt;fib_nh;</div><div class='add'>+	const struct fib_nh *onh;</div><div class='add'>+</div><div class='add'>+	if (fi-&gt;nh || ofi-&gt;nh)</div><div class='add'>+		return nexthop_cmp(fi-&gt;nh, ofi-&gt;nh) ? 0 : -1;</div><div class='add'>+</div><div class='add'>+	if (ofi-&gt;fib_nhs == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for_nexthops(fi) {</div><div class='del'>-		if (nh-&gt;nh_oif != onh-&gt;nh_oif ||</div><div class='del'>-		    nh-&gt;nh_gw  != onh-&gt;nh_gw ||</div><div class='del'>-		    nh-&gt;nh_scope != onh-&gt;nh_scope ||</div><div class='add'>+		onh = fib_info_nh(ofi, nhsel);</div><div class='add'>+</div><div class='add'>+		if (nh-&gt;fib_nh_oif != onh-&gt;fib_nh_oif ||</div><div class='add'>+		    nh-&gt;fib_nh_gw_family != onh-&gt;fib_nh_gw_family ||</div><div class='add'>+		    nh-&gt;fib_nh_scope != onh-&gt;fib_nh_scope ||</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-		    nh-&gt;nh_weight != onh-&gt;nh_weight ||</div><div class='add'>+		    nh-&gt;fib_nh_weight != onh-&gt;fib_nh_weight ||</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 		    nh-&gt;nh_tclassid != onh-&gt;nh_tclassid ||</div><div class='ctx'> #endif</div><div class='del'>-		    lwtunnel_cmp_encap(nh-&gt;nh_lwtstate, onh-&gt;nh_lwtstate) ||</div><div class='del'>-		    ((nh-&gt;nh_flags ^ onh-&gt;nh_flags) &amp; ~RTNH_COMPARE_MASK))</div><div class='add'>+		    lwtunnel_cmp_encap(nh-&gt;fib_nh_lws, onh-&gt;fib_nh_lws) ||</div><div class='add'>+		    ((nh-&gt;fib_nh_flags ^ onh-&gt;fib_nh_flags) &amp; ~RTNH_COMPARE_MASK))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (nh-&gt;fib_nh_gw_family == AF_INET &amp;&amp;</div><div class='add'>+		    nh-&gt;fib_nh_gw4 != onh-&gt;fib_nh_gw4)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (nh-&gt;fib_nh_gw_family == AF_INET6 &amp;&amp;</div><div class='add'>+		    ipv6_addr_cmp(&amp;nh-&gt;fib_nh_gw6, &amp;onh-&gt;fib_nh_gw6))</div><div class='ctx'> 			return -1;</div><div class='del'>-		onh++;</div><div class='ctx'> 	} endfor_nexthops(fi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int fib_devindex_hashfn(unsigned int val)</div><div class='add'>+static struct hlist_head *fib_nh_head(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return &amp;dev-&gt;fib_nh_head;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int fib_info_hashfn_1(int init_val, u8 protocol, u8 scope,</div><div class='add'>+				      u32 prefsrc, u32 priority)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = DEVINDEX_HASHSIZE - 1;</div><div class='add'>+	unsigned int val = init_val;</div><div class='ctx'> </div><div class='del'>-	return (val ^</div><div class='del'>-		(val &gt;&gt; DEVINDEX_HASHBITS) ^</div><div class='del'>-		(val &gt;&gt; (DEVINDEX_HASHBITS * 2))) &amp; mask;</div><div class='add'>+	val ^= (protocol &lt;&lt; 8) | scope;</div><div class='add'>+	val ^= prefsrc;</div><div class='add'>+	val ^= priority;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int fib_info_hashfn(const struct fib_info *fi)</div><div class='add'>+static unsigned int fib_info_hashfn_result(const struct net *net,</div><div class='add'>+					   unsigned int val)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = (fib_info_hash_size - 1);</div><div class='del'>-	unsigned int val = fi-&gt;fib_nhs;</div><div class='add'>+	return hash_32(val ^ net_hash_mix(net), net-&gt;ipv4.fib_info_hash_bits);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	val ^= (fi-&gt;fib_protocol &lt;&lt; 8) | fi-&gt;fib_scope;</div><div class='del'>-	val ^= (__force u32)fi-&gt;fib_prefsrc;</div><div class='del'>-	val ^= fi-&gt;fib_priority;</div><div class='del'>-	for_nexthops(fi) {</div><div class='del'>-		val ^= fib_devindex_hashfn(nh-&gt;nh_oif);</div><div class='del'>-	} endfor_nexthops(fi)</div><div class='add'>+static struct hlist_head *fib_info_hash_bucket(struct fib_info *fi)</div><div class='add'>+{</div><div class='add'>+	struct net *net = fi-&gt;fib_net;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	return (val ^ (val &gt;&gt; 7) ^ (val &gt;&gt; 12)) &amp; mask;</div><div class='add'>+	val = fib_info_hashfn_1(fi-&gt;fib_nhs, fi-&gt;fib_protocol,</div><div class='add'>+				fi-&gt;fib_scope, (__force u32)fi-&gt;fib_prefsrc,</div><div class='add'>+				fi-&gt;fib_priority);</div><div class='add'>+</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		val ^= fi-&gt;nh-&gt;id;</div><div class='add'>+	} else {</div><div class='add'>+		for_nexthops(fi) {</div><div class='add'>+			val ^= nh-&gt;fib_nh_oif;</div><div class='add'>+		} endfor_nexthops(fi)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;net-&gt;ipv4.fib_info_hash[fib_info_hashfn_result(net, val)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib_info *fib_find_info(const struct fib_info *nfi)</div><div class='add'>+static struct hlist_head *fib_info_laddrhash_bucket(const struct net *net,</div><div class='add'>+						    __be32 val)</div><div class='add'>+{</div><div class='add'>+	unsigned int hash_bits = net-&gt;ipv4.fib_info_hash_bits;</div><div class='add'>+	u32 slot;</div><div class='add'>+</div><div class='add'>+	slot = hash_32(net_hash_mix(net) ^ (__force u32)val, hash_bits);</div><div class='add'>+</div><div class='add'>+	return &amp;net-&gt;ipv4.fib_info_hash[(1 &lt;&lt; hash_bits) + slot];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hlist_head *fib_info_hash_alloc(unsigned int hash_bits)</div><div class='add'>+{</div><div class='add'>+	/* The second half is used for prefsrc */</div><div class='add'>+	return kvcalloc((1 &lt;&lt; hash_bits) * 2, sizeof(struct hlist_head),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fib_info_hash_free(struct hlist_head *head)</div><div class='add'>+{</div><div class='add'>+	kvfree(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fib_info_hash_grow(struct net *net)</div><div class='add'>+{</div><div class='add'>+	unsigned int old_size = 1 &lt;&lt; net-&gt;ipv4.fib_info_hash_bits;</div><div class='add'>+	struct hlist_head *new_info_hash, *old_info_hash;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (net-&gt;ipv4.fib_info_cnt &lt; old_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	new_info_hash = fib_info_hash_alloc(net-&gt;ipv4.fib_info_hash_bits + 1);</div><div class='add'>+	if (!new_info_hash)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	old_info_hash = net-&gt;ipv4.fib_info_hash;</div><div class='add'>+	net-&gt;ipv4.fib_info_hash = new_info_hash;</div><div class='add'>+	net-&gt;ipv4.fib_info_hash_bits += 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; old_size; i++) {</div><div class='add'>+		struct hlist_head *head = &amp;old_info_hash[i];</div><div class='add'>+		struct hlist_node *n;</div><div class='add'>+		struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_safe(fi, n, head, fib_hash)</div><div class='add'>+			hlist_add_head(&amp;fi-&gt;fib_hash, fib_info_hash_bucket(fi));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; old_size; i++) {</div><div class='add'>+		struct hlist_head *lhead = &amp;old_info_hash[old_size + i];</div><div class='add'>+		struct hlist_node *n;</div><div class='add'>+		struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_safe(fi, n, lhead, fib_lhash)</div><div class='add'>+			hlist_add_head(&amp;fi-&gt;fib_lhash,</div><div class='add'>+				       fib_info_laddrhash_bucket(fi-&gt;fib_net,</div><div class='add'>+								 fi-&gt;fib_prefsrc));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fib_info_hash_free(old_info_hash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* no metrics, only nexthop id */</div><div class='add'>+static struct fib_info *fib_find_info_nh(struct net *net,</div><div class='add'>+					 const struct fib_config *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head;</div><div class='ctx'> 	struct fib_info *fi;</div><div class='ctx'> 	unsigned int hash;</div><div class='ctx'> </div><div class='del'>-	hash = fib_info_hashfn(nfi);</div><div class='del'>-	head = &amp;fib_info_hash[hash];</div><div class='add'>+	hash = fib_info_hashfn_1(cfg-&gt;fc_nh_id,</div><div class='add'>+				 cfg-&gt;fc_protocol, cfg-&gt;fc_scope,</div><div class='add'>+				 (__force u32)cfg-&gt;fc_prefsrc,</div><div class='add'>+				 cfg-&gt;fc_priority);</div><div class='add'>+	hash = fib_info_hashfn_result(net, hash);</div><div class='add'>+	head = &amp;net-&gt;ipv4.fib_info_hash[hash];</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(fi, head, fib_hash) {</div><div class='del'>-		if (!net_eq(fi-&gt;fib_net, nfi-&gt;fib_net))</div><div class='add'>+		if (!fi-&gt;nh || fi-&gt;nh-&gt;id != cfg-&gt;fc_nh_id)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;fc_protocol == fi-&gt;fib_protocol &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_scope == fi-&gt;fib_scope &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_prefsrc == fi-&gt;fib_prefsrc &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_priority == fi-&gt;fib_priority &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_type == fi-&gt;fib_type &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_table == fi-&gt;fib_tb_id &amp;&amp;</div><div class='add'>+		    !((cfg-&gt;fc_flags ^ fi-&gt;fib_flags) &amp; ~RTNH_COMPARE_MASK))</div><div class='add'>+			return fi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fib_info *fib_find_info(struct fib_info *nfi)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = fib_info_hash_bucket(nfi);</div><div class='add'>+	struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(fi, head, fib_hash) {</div><div class='ctx'> 		if (fi-&gt;fib_nhs != nfi-&gt;fib_nhs)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		if (nfi-&gt;fib_protocol == fi-&gt;fib_protocol &amp;&amp;</div><div class='ctx'> 		    nfi-&gt;fib_scope == fi-&gt;fib_scope &amp;&amp;</div><div class='ctx'> 		    nfi-&gt;fib_prefsrc == fi-&gt;fib_prefsrc &amp;&amp;</div><div class='ctx'> 		    nfi-&gt;fib_priority == fi-&gt;fib_priority &amp;&amp;</div><div class='ctx'> 		    nfi-&gt;fib_type == fi-&gt;fib_type &amp;&amp;</div><div class='add'>+		    nfi-&gt;fib_tb_id == fi-&gt;fib_tb_id &amp;&amp;</div><div class='ctx'> 		    memcmp(nfi-&gt;fib_metrics, fi-&gt;fib_metrics,</div><div class='ctx'> 			   sizeof(u32) * RTAX_MAX) == 0 &amp;&amp;</div><div class='ctx'> 		    !((nfi-&gt;fib_flags ^ fi-&gt;fib_flags) &amp; ~RTNH_COMPARE_MASK) &amp;&amp;</div><div class='del'>-		    (nfi-&gt;fib_nhs == 0 || nh_comp(fi, nfi) == 0))</div><div class='add'>+		    nh_comp(fi, nfi) == 0)</div><div class='ctx'> 			return fi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -336,33 +472,27 @@ static struct fib_info *fib_find_info(const struct fib_info *nfi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Check, that the gateway is already configured.</div><div class='del'>- * Used only by redirect accept routine.</div><div class='add'>+ * Used only by redirect accept routine, under rcu_read_lock();</div><div class='ctx'>  */</div><div class='ctx'> int ip_fib_check_default(__be32 gw, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head;</div><div class='ctx'> 	struct fib_nh *nh;</div><div class='del'>-	unsigned int hash;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fib_info_lock);</div><div class='add'>+	head = fib_nh_head(dev);</div><div class='ctx'> </div><div class='del'>-	hash = fib_devindex_hashfn(dev-&gt;ifindex);</div><div class='del'>-	head = &amp;fib_info_devhash[hash];</div><div class='del'>-	hlist_for_each_entry(nh, head, nh_hash) {</div><div class='del'>-		if (nh-&gt;nh_dev == dev &amp;&amp;</div><div class='del'>-		    nh-&gt;nh_gw == gw &amp;&amp;</div><div class='del'>-		    !(nh-&gt;nh_flags &amp; RTNH_F_DEAD)) {</div><div class='del'>-			spin_unlock(&amp;fib_info_lock);</div><div class='add'>+	hlist_for_each_entry_rcu(nh, head, nh_hash) {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(nh-&gt;fib_nh_dev != dev);</div><div class='add'>+		if (nh-&gt;fib_nh_gw4 == gw &amp;&amp;</div><div class='add'>+		    !(nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)) {</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;fib_info_lock);</div><div class='del'>-</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t fib_nlmsg_size(struct fib_info *fi)</div><div class='add'>+size_t fib_nlmsg_size(struct fib_info *fi)</div><div class='ctx'> {</div><div class='ctx'> 	size_t payload = NLMSG_ALIGN(sizeof(struct rtmsg))</div><div class='ctx'> 			 + nla_total_size(4) /* RTA_TABLE */</div><div class='hunk'>@@ -370,34 +500,40 @@ static inline size_t fib_nlmsg_size(struct fib_info *fi)</div><div class='ctx'> 			 + nla_total_size(4) /* RTA_PRIORITY */</div><div class='ctx'> 			 + nla_total_size(4) /* RTA_PREFSRC */</div><div class='ctx'> 			 + nla_total_size(TCP_CA_NAME_MAX); /* RTAX_CC_ALGO */</div><div class='add'>+	unsigned int nhs = fib_info_num_path(fi);</div><div class='ctx'> </div><div class='ctx'> 	/* space for nested metrics */</div><div class='ctx'> 	payload += nla_total_size((RTAX_MAX * nla_total_size(4)));</div><div class='ctx'> </div><div class='del'>-	if (fi-&gt;fib_nhs) {</div><div class='add'>+	if (fi-&gt;nh)</div><div class='add'>+		payload += nla_total_size(4); /* RTA_NH_ID */</div><div class='add'>+</div><div class='add'>+	if (nhs) {</div><div class='ctx'> 		size_t nh_encapsize = 0;</div><div class='del'>-		/* Also handles the special case fib_nhs == 1 */</div><div class='add'>+		/* Also handles the special case nhs == 1 */</div><div class='ctx'> </div><div class='ctx'> 		/* each nexthop is packed in an attribute */</div><div class='ctx'> 		size_t nhsize = nla_total_size(sizeof(struct rtnexthop));</div><div class='add'>+		unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 		/* may contain flow and gateway attribute */</div><div class='ctx'> 		nhsize += 2 * nla_total_size(4);</div><div class='ctx'> </div><div class='ctx'> 		/* grab encap info */</div><div class='del'>-		for_nexthops(fi) {</div><div class='del'>-			if (nh-&gt;nh_lwtstate) {</div><div class='add'>+		for (i = 0; i &lt; fib_info_num_path(fi); i++) {</div><div class='add'>+			struct fib_nh_common *nhc = fib_info_nhc(fi, i);</div><div class='add'>+</div><div class='add'>+			if (nhc-&gt;nhc_lwtstate) {</div><div class='ctx'> 				/* RTA_ENCAP_TYPE */</div><div class='ctx'> 				nh_encapsize += lwtunnel_get_encap_size(</div><div class='del'>-						nh-&gt;nh_lwtstate);</div><div class='add'>+						nhc-&gt;nhc_lwtstate);</div><div class='ctx'> 				/* RTA_ENCAP */</div><div class='ctx'> 				nh_encapsize +=  nla_total_size(2);</div><div class='ctx'> 			}</div><div class='del'>-		} endfor_nexthops(fi);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* all nexthops are packed in a nested attribute */</div><div class='del'>-		payload += nla_total_size((fi-&gt;fib_nhs * nhsize) +</div><div class='del'>-					  nh_encapsize);</div><div class='add'>+		payload += nla_total_size((nhs * nhsize) + nh_encapsize);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -408,6 +544,7 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,</div><div class='ctx'> 	       int dst_len, u32 tb_id, const struct nl_info *info,</div><div class='ctx'> 	       unsigned int nlm_flags)</div><div class='ctx'> {</div><div class='add'>+	struct fib_rt_info fri;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u32 seq = info-&gt;nlh ? info-&gt;nlh-&gt;nlmsg_seq : 0;</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='hunk'>@@ -416,9 +553,16 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = fib_dump_info(skb, info-&gt;portid, seq, event, tb_id,</div><div class='del'>-			    fa-&gt;fa_type, key, dst_len,</div><div class='del'>-			    fa-&gt;fa_tos, fa-&gt;fa_info, nlm_flags);</div><div class='add'>+	fri.fi = fa-&gt;fa_info;</div><div class='add'>+	fri.tb_id = tb_id;</div><div class='add'>+	fri.dst = key;</div><div class='add'>+	fri.dst_len = dst_len;</div><div class='add'>+	fri.dscp = fa-&gt;fa_dscp;</div><div class='add'>+	fri.type = fa-&gt;fa_type;</div><div class='add'>+	fri.offload = READ_ONCE(fa-&gt;offload);</div><div class='add'>+	fri.trap = READ_ONCE(fa-&gt;trap);</div><div class='add'>+	fri.offload_failed = READ_ONCE(fa-&gt;offload_failed);</div><div class='add'>+	err = fib_dump_info(skb, info-&gt;portid, seq, event, &amp;fri, nlm_flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in fib_nlmsg_size() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -429,20 +573,27 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,</div><div class='ctx'> 		    info-&gt;nlh, GFP_KERNEL);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(info-&gt;nl_net, RTNLGRP_IPV4_ROUTE, err);</div><div class='add'>+	rtnl_set_sk_err(info-&gt;nl_net, RTNLGRP_IPV4_ROUTE, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fib_detect_death(struct fib_info *fi, int order,</div><div class='ctx'> 			    struct fib_info **last_resort, int *last_idx,</div><div class='ctx'> 			    int dflt)</div><div class='ctx'> {</div><div class='add'>+	const struct fib_nh_common *nhc = fib_info_nhc(fi, 0);</div><div class='ctx'> 	struct neighbour *n;</div><div class='ctx'> 	int state = NUD_NONE;</div><div class='ctx'> </div><div class='del'>-	n = neigh_lookup(&amp;arp_tbl, &amp;fi-&gt;fib_nh[0].nh_gw, fi-&gt;fib_dev);</div><div class='add'>+	if (likely(nhc-&gt;nhc_gw_family == AF_INET))</div><div class='add'>+		n = neigh_lookup(&amp;arp_tbl, &amp;nhc-&gt;nhc_gw.ipv4, nhc-&gt;nhc_dev);</div><div class='add'>+	else if (nhc-&gt;nhc_gw_family == AF_INET6)</div><div class='add'>+		n = neigh_lookup(ipv6_stub-&gt;nd_tbl, &amp;nhc-&gt;nhc_gw.ipv6,</div><div class='add'>+				 nhc-&gt;nhc_dev);</div><div class='add'>+	else</div><div class='add'>+		n = NULL;</div><div class='add'>+</div><div class='ctx'> 	if (n) {</div><div class='del'>-		state = n-&gt;nud_state;</div><div class='add'>+		state = READ_ONCE(n-&gt;nud_state);</div><div class='ctx'> 		neigh_release(n);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -459,6 +610,72 @@ static int fib_detect_death(struct fib_info *fi, int order,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int fib_nh_common_init(struct net *net, struct fib_nh_common *nhc,</div><div class='add'>+		       struct nlattr *encap, u16 encap_type,</div><div class='add'>+		       void *cfg, gfp_t gfp_flags,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nhc-&gt;nhc_pcpu_rth_output = alloc_percpu_gfp(struct rtable __rcu *,</div><div class='add'>+						    gfp_flags);</div><div class='add'>+	if (!nhc-&gt;nhc_pcpu_rth_output)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (encap) {</div><div class='add'>+		struct lwtunnel_state *lwtstate;</div><div class='add'>+</div><div class='add'>+		err = lwtunnel_build_state(net, encap_type, encap,</div><div class='add'>+					   nhc-&gt;nhc_family, cfg, &amp;lwtstate,</div><div class='add'>+					   extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto lwt_failure;</div><div class='add'>+</div><div class='add'>+		nhc-&gt;nhc_lwtstate = lwtstate_get(lwtstate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+lwt_failure:</div><div class='add'>+	rt_fibinfo_free_cpus(nhc-&gt;nhc_pcpu_rth_output);</div><div class='add'>+	nhc-&gt;nhc_pcpu_rth_output = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_nh_common_init);</div><div class='add'>+</div><div class='add'>+int fib_nh_init(struct net *net, struct fib_nh *nh,</div><div class='add'>+		struct fib_config *cfg, int nh_weight,</div><div class='add'>+		struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nh-&gt;fib_nh_family = AF_INET;</div><div class='add'>+</div><div class='add'>+	err = fib_nh_common_init(net, &amp;nh-&gt;nh_common, cfg-&gt;fc_encap,</div><div class='add'>+				 cfg-&gt;fc_encap_type, cfg, GFP_KERNEL, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nh-&gt;fib_nh_oif = cfg-&gt;fc_oif;</div><div class='add'>+	nh-&gt;fib_nh_gw_family = cfg-&gt;fc_gw_family;</div><div class='add'>+	if (cfg-&gt;fc_gw_family == AF_INET)</div><div class='add'>+		nh-&gt;fib_nh_gw4 = cfg-&gt;fc_gw4;</div><div class='add'>+	else if (cfg-&gt;fc_gw_family == AF_INET6)</div><div class='add'>+		nh-&gt;fib_nh_gw6 = cfg-&gt;fc_gw6;</div><div class='add'>+</div><div class='add'>+	nh-&gt;fib_nh_flags = cfg-&gt;fc_flags;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='add'>+	nh-&gt;nh_tclassid = cfg-&gt;fc_flow;</div><div class='add'>+	if (nh-&gt;nh_tclassid)</div><div class='add'>+		atomic_inc(&amp;net-&gt;ipv4.fib_num_tclassid_users);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+	nh-&gt;fib_nh_weight = nh_weight;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> </div><div class='ctx'> static int fib_count_nexthops(struct rtnexthop *rtnh, int remaining,</div><div class='hunk'>@@ -481,15 +698,34 @@ static int fib_count_nexthops(struct rtnexthop *rtnh, int remaining,</div><div class='ctx'> 	return nhs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fib_gw_from_attr(__be32 *gw, struct nlattr *nla,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (nla_len(nla) &lt; sizeof(*gw)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid IPv4 address in RTA_GATEWAY");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*gw = nla_get_in_addr(nla);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* only called when fib_nh is integrated into fib_info */</div><div class='ctx'> static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,</div><div class='ctx'> 		       int remaining, struct fib_config *cfg,</div><div class='ctx'> 		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = fi-&gt;fib_net;</div><div class='add'>+	struct fib_config fib_cfg;</div><div class='add'>+	struct fib_nh *nh;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	change_nexthops(fi) {</div><div class='ctx'> 		int attrlen;</div><div class='ctx'> </div><div class='add'>+		memset(&amp;fib_cfg, 0, sizeof(fib_cfg));</div><div class='add'>+</div><div class='ctx'> 		if (!rtnh_ok(rtnh, remaining)) {</div><div class='ctx'> 			NL_SET_ERR_MSG(extack,</div><div class='ctx'> 				       "Invalid nexthop configuration - extra data after nexthop");</div><div class='hunk'>@@ -502,112 +738,145 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nexthop_nh-&gt;nh_flags =</div><div class='del'>-			(cfg-&gt;fc_flags &amp; ~0xFF) | rtnh-&gt;rtnh_flags;</div><div class='del'>-		nexthop_nh-&gt;nh_oif = rtnh-&gt;rtnh_ifindex;</div><div class='del'>-		nexthop_nh-&gt;nh_weight = rtnh-&gt;rtnh_hops + 1;</div><div class='add'>+		fib_cfg.fc_flags = (cfg-&gt;fc_flags &amp; ~0xFF) | rtnh-&gt;rtnh_flags;</div><div class='add'>+		fib_cfg.fc_oif = rtnh-&gt;rtnh_ifindex;</div><div class='ctx'> </div><div class='ctx'> 		attrlen = rtnh_attrlen(rtnh);</div><div class='ctx'> 		if (attrlen &gt; 0) {</div><div class='del'>-			struct nlattr *nla, *attrs = rtnh_attrs(rtnh);</div><div class='add'>+			struct nlattr *nla, *nlav, *attrs = rtnh_attrs(rtnh);</div><div class='ctx'> </div><div class='ctx'> 			nla = nla_find(attrs, attrlen, RTA_GATEWAY);</div><div class='del'>-			nexthop_nh-&gt;nh_gw = nla ? nla_get_in_addr(nla) : 0;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-			nla = nla_find(attrs, attrlen, RTA_FLOW);</div><div class='del'>-			nexthop_nh-&gt;nh_tclassid = nla ? nla_get_u32(nla) : 0;</div><div class='del'>-			if (nexthop_nh-&gt;nh_tclassid)</div><div class='del'>-				fi-&gt;fib_net-&gt;ipv4.fib_num_tclassid_users++;</div><div class='del'>-#endif</div><div class='del'>-			nla = nla_find(attrs, attrlen, RTA_ENCAP);</div><div class='add'>+			nlav = nla_find(attrs, attrlen, RTA_VIA);</div><div class='add'>+			if (nla &amp;&amp; nlav) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Nexthop configuration can not contain both GATEWAY and VIA");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			if (nla) {</div><div class='del'>-				struct lwtunnel_state *lwtstate;</div><div class='del'>-				struct nlattr *nla_entype;</div><div class='del'>-</div><div class='del'>-				nla_entype = nla_find(attrs, attrlen,</div><div class='del'>-						      RTA_ENCAP_TYPE);</div><div class='del'>-				if (!nla_entype) {</div><div class='del'>-					NL_SET_BAD_ATTR(extack, nla);</div><div class='del'>-					NL_SET_ERR_MSG(extack,</div><div class='del'>-						       "Encap type is missing");</div><div class='del'>-					goto err_inval;</div><div class='del'>-				}</div><div class='add'>+				ret = fib_gw_from_attr(&amp;fib_cfg.fc_gw4, nla,</div><div class='add'>+						       extack);</div><div class='add'>+				if (ret)</div><div class='add'>+					goto errout;</div><div class='ctx'> </div><div class='del'>-				ret = lwtunnel_build_state(nla_get_u16(</div><div class='del'>-							   nla_entype),</div><div class='del'>-							   nla,  AF_INET, cfg,</div><div class='del'>-							   &amp;lwtstate, extack);</div><div class='add'>+				if (fib_cfg.fc_gw4)</div><div class='add'>+					fib_cfg.fc_gw_family = AF_INET;</div><div class='add'>+			} else if (nlav) {</div><div class='add'>+				ret = fib_gw_from_via(&amp;fib_cfg, nlav, extack);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto errout;</div><div class='del'>-				nexthop_nh-&gt;nh_lwtstate =</div><div class='del'>-					lwtstate_get(lwtstate);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			nla = nla_find(attrs, attrlen, RTA_FLOW);</div><div class='add'>+			if (nla) {</div><div class='add'>+				if (nla_len(nla) &lt; sizeof(u32)) {</div><div class='add'>+					NL_SET_ERR_MSG(extack, "Invalid RTA_FLOW");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				fib_cfg.fc_flow = nla_get_u32(nla);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fib_cfg.fc_encap = nla_find(attrs, attrlen, RTA_ENCAP);</div><div class='add'>+			/* RTA_ENCAP_TYPE length checked in</div><div class='add'>+			 * lwtunnel_valid_encap_type_attr</div><div class='add'>+			 */</div><div class='add'>+			nla = nla_find(attrs, attrlen, RTA_ENCAP_TYPE);</div><div class='add'>+			if (nla)</div><div class='add'>+				fib_cfg.fc_encap_type = nla_get_u16(nla);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ret = fib_nh_init(net, nexthop_nh, &amp;fib_cfg,</div><div class='add'>+				  rtnh-&gt;rtnh_hops + 1, extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto errout;</div><div class='add'>+</div><div class='ctx'> 		rtnh = rtnh_next(rtnh, &amp;remaining);</div><div class='ctx'> 	} endfor_nexthops(fi);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_inval:</div><div class='ctx'> 	ret = -EINVAL;</div><div class='del'>-</div><div class='add'>+	nh = fib_info_nh(fi, 0);</div><div class='add'>+	if (cfg-&gt;fc_oif &amp;&amp; nh-&gt;fib_nh_oif != cfg-&gt;fc_oif) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Nexthop device index does not match RTA_OIF");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+	if (cfg-&gt;fc_gw_family) {</div><div class='add'>+		if (cfg-&gt;fc_gw_family != nh-&gt;fib_nh_gw_family ||</div><div class='add'>+		    (cfg-&gt;fc_gw_family == AF_INET &amp;&amp;</div><div class='add'>+		     nh-&gt;fib_nh_gw4 != cfg-&gt;fc_gw4) ||</div><div class='add'>+		    (cfg-&gt;fc_gw_family == AF_INET6 &amp;&amp;</div><div class='add'>+		     ipv6_addr_cmp(&amp;nh-&gt;fib_nh_gw6, &amp;cfg-&gt;fc_gw6))) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Nexthop gateway does not match RTA_GATEWAY or RTA_VIA");</div><div class='add'>+			goto errout;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='add'>+	if (cfg-&gt;fc_flow &amp;&amp; nh-&gt;nh_tclassid != cfg-&gt;fc_flow) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Nexthop class id does not match RTA_FLOW");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	ret = 0;</div><div class='ctx'> errout:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* only called when fib_nh is integrated into fib_info */</div><div class='ctx'> static void fib_rebalance(struct fib_info *fi)</div><div class='ctx'> {</div><div class='ctx'> 	int total;</div><div class='ctx'> 	int w;</div><div class='del'>-	struct in_device *in_dev;</div><div class='ctx'> </div><div class='del'>-	if (fi-&gt;fib_nhs &lt; 2)</div><div class='add'>+	if (fib_info_num_path(fi) &lt; 2)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	total = 0;</div><div class='ctx'> 	for_nexthops(fi) {</div><div class='del'>-		if (nh-&gt;nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		in_dev = __in_dev_get_rtnl(nh-&gt;nh_dev);</div><div class='del'>-</div><div class='del'>-		if (in_dev &amp;&amp;</div><div class='del'>-		    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-		    nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='add'>+		if (ip_ignore_linkdown(nh-&gt;fib_nh_dev) &amp;&amp;</div><div class='add'>+		    nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		total += nh-&gt;nh_weight;</div><div class='add'>+		total += nh-&gt;fib_nh_weight;</div><div class='ctx'> 	} endfor_nexthops(fi);</div><div class='ctx'> </div><div class='ctx'> 	w = 0;</div><div class='ctx'> 	change_nexthops(fi) {</div><div class='ctx'> 		int upper_bound;</div><div class='ctx'> </div><div class='del'>-		in_dev = __in_dev_get_rtnl(nexthop_nh-&gt;nh_dev);</div><div class='del'>-</div><div class='del'>-		if (nexthop_nh-&gt;nh_flags &amp; RTNH_F_DEAD) {</div><div class='add'>+		if (nexthop_nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD) {</div><div class='ctx'> 			upper_bound = -1;</div><div class='del'>-		} else if (in_dev &amp;&amp;</div><div class='del'>-			   IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-			   nexthop_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN) {</div><div class='add'>+		} else if (ip_ignore_linkdown(nexthop_nh-&gt;fib_nh_dev) &amp;&amp;</div><div class='add'>+			   nexthop_nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN) {</div><div class='ctx'> 			upper_bound = -1;</div><div class='ctx'> 		} else {</div><div class='del'>-			w += nexthop_nh-&gt;nh_weight;</div><div class='add'>+			w += nexthop_nh-&gt;fib_nh_weight;</div><div class='ctx'> 			upper_bound = DIV_ROUND_CLOSEST_ULL((u64)w &lt;&lt; 31,</div><div class='ctx'> 							    total) - 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		atomic_set(&amp;nexthop_nh-&gt;nh_upper_bound, upper_bound);</div><div class='add'>+		atomic_set(&amp;nexthop_nh-&gt;fib_nh_upper_bound, upper_bound);</div><div class='ctx'> 	} endfor_nexthops(fi);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_IP_ROUTE_MULTIPATH */</div><div class='ctx'> </div><div class='add'>+static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,</div><div class='add'>+		       int remaining, struct fib_config *cfg,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG(extack, "Multipath support not enabled in kernel");</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define fib_rebalance(fi) do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_IP_ROUTE_MULTIPATH */</div><div class='ctx'> </div><div class='del'>-static int fib_encap_match(u16 encap_type,</div><div class='add'>+static int fib_encap_match(struct net *net, u16 encap_type,</div><div class='ctx'> 			   struct nlattr *encap,</div><div class='ctx'> 			   const struct fib_nh *nh,</div><div class='ctx'> 			   const struct fib_config *cfg,</div><div class='hunk'>@@ -619,17 +888,17 @@ static int fib_encap_match(u16 encap_type,</div><div class='ctx'> 	if (encap_type == LWTUNNEL_ENCAP_NONE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = lwtunnel_build_state(encap_type, encap, AF_INET,</div><div class='add'>+	ret = lwtunnel_build_state(net, encap_type, encap, AF_INET,</div><div class='ctx'> 				   cfg, &amp;lwtstate, extack);</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		result = lwtunnel_cmp_encap(lwtstate, nh-&gt;nh_lwtstate);</div><div class='add'>+		result = lwtunnel_cmp_encap(lwtstate, nh-&gt;fib_nh_lws);</div><div class='ctx'> 		lwtstate_free(lwtstate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,</div><div class='add'>+int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,</div><div class='ctx'> 		 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='hunk'>@@ -640,21 +909,46 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,</div><div class='ctx'> 	if (cfg-&gt;fc_priority &amp;&amp; cfg-&gt;fc_priority != fi-&gt;fib_priority)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;fc_oif || cfg-&gt;fc_gw) {</div><div class='add'>+	if (cfg-&gt;fc_nh_id) {</div><div class='add'>+		if (fi-&gt;nh &amp;&amp; cfg-&gt;fc_nh_id == fi-&gt;nh-&gt;id)</div><div class='add'>+			return 0;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		if (cfg-&gt;fc_oif || cfg-&gt;fc_gw_family || cfg-&gt;fc_mp)</div><div class='add'>+			return 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_oif || cfg-&gt;fc_gw_family) {</div><div class='add'>+		struct fib_nh *nh;</div><div class='add'>+</div><div class='add'>+		nh = fib_info_nh(fi, 0);</div><div class='ctx'> 		if (cfg-&gt;fc_encap) {</div><div class='del'>-			if (fib_encap_match(cfg-&gt;fc_encap_type, cfg-&gt;fc_encap,</div><div class='del'>-					    fi-&gt;fib_nh, cfg, extack))</div><div class='add'>+			if (fib_encap_match(net, cfg-&gt;fc_encap_type,</div><div class='add'>+					    cfg-&gt;fc_encap, nh, cfg, extack))</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 		if (cfg-&gt;fc_flow &amp;&amp;</div><div class='del'>-		    cfg-&gt;fc_flow != fi-&gt;fib_nh-&gt;nh_tclassid)</div><div class='add'>+		    cfg-&gt;fc_flow != nh-&gt;nh_tclassid)</div><div class='ctx'> 			return 1;</div><div class='ctx'> #endif</div><div class='del'>-		if ((!cfg-&gt;fc_oif || cfg-&gt;fc_oif == fi-&gt;fib_nh-&gt;nh_oif) &amp;&amp;</div><div class='del'>-		    (!cfg-&gt;fc_gw  || cfg-&gt;fc_gw == fi-&gt;fib_nh-&gt;nh_gw))</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='add'>+		if ((cfg-&gt;fc_oif &amp;&amp; cfg-&gt;fc_oif != nh-&gt;fib_nh_oif) ||</div><div class='add'>+		    (cfg-&gt;fc_gw_family &amp;&amp;</div><div class='add'>+		     cfg-&gt;fc_gw_family != nh-&gt;fib_nh_gw_family))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;fc_gw_family == AF_INET &amp;&amp;</div><div class='add'>+		    cfg-&gt;fc_gw4 != nh-&gt;fib_nh_gw4)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;fc_gw_family == AF_INET6 &amp;&amp;</div><div class='add'>+		    ipv6_addr_cmp(&amp;cfg-&gt;fc_gw6, &amp;nh-&gt;fib_nh_gw6))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='hunk'>@@ -670,20 +964,64 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,</div><div class='ctx'> 		if (!rtnh_ok(rtnh, remaining))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (rtnh-&gt;rtnh_ifindex &amp;&amp; rtnh-&gt;rtnh_ifindex != nh-&gt;nh_oif)</div><div class='add'>+		if (rtnh-&gt;rtnh_ifindex &amp;&amp; rtnh-&gt;rtnh_ifindex != nh-&gt;fib_nh_oif)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='ctx'> 		attrlen = rtnh_attrlen(rtnh);</div><div class='ctx'> 		if (attrlen &gt; 0) {</div><div class='del'>-			struct nlattr *nla, *attrs = rtnh_attrs(rtnh);</div><div class='add'>+			struct nlattr *nla, *nlav, *attrs = rtnh_attrs(rtnh);</div><div class='add'>+			int err;</div><div class='ctx'> </div><div class='ctx'> 			nla = nla_find(attrs, attrlen, RTA_GATEWAY);</div><div class='del'>-			if (nla &amp;&amp; nla_get_in_addr(nla) != nh-&gt;nh_gw)</div><div class='del'>-				return 1;</div><div class='add'>+			nlav = nla_find(attrs, attrlen, RTA_VIA);</div><div class='add'>+			if (nla &amp;&amp; nlav) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Nexthop configuration can not contain both GATEWAY and VIA");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (nla) {</div><div class='add'>+				__be32 gw;</div><div class='add'>+</div><div class='add'>+				err = fib_gw_from_attr(&amp;gw, nla, extack);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='add'>+				if (nh-&gt;fib_nh_gw_family != AF_INET ||</div><div class='add'>+				    gw != nh-&gt;fib_nh_gw4)</div><div class='add'>+					return 1;</div><div class='add'>+			} else if (nlav) {</div><div class='add'>+				struct fib_config cfg2;</div><div class='add'>+</div><div class='add'>+				err = fib_gw_from_via(&amp;cfg2, nlav, extack);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='add'>+				switch (nh-&gt;fib_nh_gw_family) {</div><div class='add'>+				case AF_INET:</div><div class='add'>+					if (cfg2.fc_gw_family != AF_INET ||</div><div class='add'>+					    cfg2.fc_gw4 != nh-&gt;fib_nh_gw4)</div><div class='add'>+						return 1;</div><div class='add'>+					break;</div><div class='add'>+				case AF_INET6:</div><div class='add'>+					if (cfg2.fc_gw_family != AF_INET6 ||</div><div class='add'>+					    ipv6_addr_cmp(&amp;cfg2.fc_gw6,</div><div class='add'>+							  &amp;nh-&gt;fib_nh_gw6))</div><div class='add'>+						return 1;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 			nla = nla_find(attrs, attrlen, RTA_FLOW);</div><div class='del'>-			if (nla &amp;&amp; nla_get_u32(nla) != nh-&gt;nh_tclassid)</div><div class='del'>-				return 1;</div><div class='add'>+			if (nla) {</div><div class='add'>+				if (nla_len(nla) &lt; sizeof(u32)) {</div><div class='add'>+					NL_SET_ERR_MSG(extack, "Invalid RTA_FLOW");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				if (nla_get_u32(nla) != nh-&gt;nh_tclassid)</div><div class='add'>+					return 1;</div><div class='add'>+			}</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -710,12 +1048,13 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)</div><div class='ctx'> 		if (type &gt; RTAX_MAX)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='add'>+		type = array_index_nospec(type, RTAX_MAX + 1);</div><div class='ctx'> 		if (type == RTAX_CC_ALGO) {</div><div class='ctx'> 			char tmp[TCP_CA_NAME_MAX];</div><div class='ctx'> 			bool ecn_ca = false;</div><div class='ctx'> </div><div class='del'>-			nla_strlcpy(tmp, nla, sizeof(tmp));</div><div class='del'>-			val = tcp_ca_get_key_by_name(fi-&gt;fib_net, tmp, &amp;ecn_ca);</div><div class='add'>+			nla_strscpy(tmp, nla, sizeof(tmp));</div><div class='add'>+			val = tcp_ca_get_key_by_name(tmp, &amp;ecn_ca);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (nla_len(nla) != sizeof(u32))</div><div class='ctx'> 				return false;</div><div class='hunk'>@@ -733,6 +1072,31 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fib_check_nh_v6_gw(struct net *net, struct fib_nh *nh,</div><div class='add'>+			      u32 table, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib6_config cfg = {</div><div class='add'>+		.fc_table = table,</div><div class='add'>+		.fc_flags = nh-&gt;fib_nh_flags | RTF_GATEWAY,</div><div class='add'>+		.fc_ifindex = nh-&gt;fib_nh_oif,</div><div class='add'>+		.fc_gateway = nh-&gt;fib_nh_gw6,</div><div class='add'>+	};</div><div class='add'>+	struct fib6_nh fib6_nh = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ipv6_stub-&gt;fib6_nh_init(net, &amp;fib6_nh, &amp;cfg, GFP_KERNEL, extack);</div><div class='add'>+	if (!err) {</div><div class='add'>+		nh-&gt;fib_nh_dev = fib6_nh.fib_nh_dev;</div><div class='add'>+		netdev_hold(nh-&gt;fib_nh_dev, &amp;nh-&gt;fib_nh_dev_tracker,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+		nh-&gt;fib_nh_oif = nh-&gt;fib_nh_dev-&gt;ifindex;</div><div class='add'>+		nh-&gt;fib_nh_scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+		ipv6_stub-&gt;fib6_nh_release(&amp;fib6_nh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Picture</div><div class='hunk'>@@ -777,221 +1141,185 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)</div><div class='ctx'>  *					|</div><div class='ctx'>  *					|-&gt; {local prefix} (terminal node)</div><div class='ctx'>  */</div><div class='del'>-static int fib_check_nh(struct fib_config *cfg, struct fib_nh *nh,</div><div class='del'>-			struct netlink_ext_ack *extack)</div><div class='add'>+static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table,</div><div class='add'>+			      u8 scope, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct net *net;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	struct fib_result res;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	net = cfg-&gt;fc_nlinfo.nl_net;</div><div class='del'>-	if (nh-&gt;nh_gw) {</div><div class='del'>-		struct fib_result res;</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_flags &amp; RTNH_F_ONLINK) {</div><div class='del'>-			unsigned int addr_type;</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; RTNH_F_ONLINK) {</div><div class='add'>+		unsigned int addr_type;</div><div class='ctx'> </div><div class='del'>-			if (cfg-&gt;fc_scope &gt;= RT_SCOPE_LINK) {</div><div class='del'>-				NL_SET_ERR_MSG(extack,</div><div class='del'>-					       "Nexthop has invalid scope");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			dev = __dev_get_by_index(net, nh-&gt;nh_oif);</div><div class='del'>-			if (!dev)</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-				NL_SET_ERR_MSG(extack,</div><div class='del'>-					       "Nexthop device is not up");</div><div class='del'>-				return -ENETDOWN;</div><div class='del'>-			}</div><div class='del'>-			addr_type = inet_addr_type_dev_table(net, dev, nh-&gt;nh_gw);</div><div class='del'>-			if (addr_type != RTN_UNICAST) {</div><div class='del'>-				NL_SET_ERR_MSG(extack,</div><div class='del'>-					       "Nexthop has invalid gateway");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			if (!netif_carrier_ok(dev))</div><div class='del'>-				nh-&gt;nh_flags |= RTNH_F_LINKDOWN;</div><div class='del'>-			nh-&gt;nh_dev = dev;</div><div class='del'>-			dev_hold(dev);</div><div class='del'>-			nh-&gt;nh_scope = RT_SCOPE_LINK;</div><div class='del'>-			return 0;</div><div class='add'>+		if (scope &gt;= RT_SCOPE_LINK) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop has invalid scope");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		{</div><div class='del'>-			struct fib_table *tbl = NULL;</div><div class='del'>-			struct flowi4 fl4 = {</div><div class='del'>-				.daddr = nh-&gt;nh_gw,</div><div class='del'>-				.flowi4_scope = cfg-&gt;fc_scope + 1,</div><div class='del'>-				.flowi4_oif = nh-&gt;nh_oif,</div><div class='del'>-				.flowi4_iif = LOOPBACK_IFINDEX,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* It is not necessary, but requires a bit of thinking */</div><div class='del'>-			if (fl4.flowi4_scope &lt; RT_SCOPE_LINK)</div><div class='del'>-				fl4.flowi4_scope = RT_SCOPE_LINK;</div><div class='del'>-</div><div class='del'>-			if (cfg-&gt;fc_table)</div><div class='del'>-				tbl = fib_get_table(net, cfg-&gt;fc_table);</div><div class='del'>-</div><div class='del'>-			if (tbl)</div><div class='del'>-				err = fib_table_lookup(tbl, &amp;fl4, &amp;res,</div><div class='del'>-						       FIB_LOOKUP_IGNORE_LINKSTATE |</div><div class='del'>-						       FIB_LOOKUP_NOREF);</div><div class='del'>-</div><div class='del'>-			/* on error or if no table given do full lookup. This</div><div class='del'>-			 * is needed for example when nexthops are in the local</div><div class='del'>-			 * table rather than the given table</div><div class='del'>-			 */</div><div class='del'>-			if (!tbl || err) {</div><div class='del'>-				err = fib_lookup(net, &amp;fl4, &amp;res,</div><div class='del'>-						 FIB_LOOKUP_IGNORE_LINKSTATE);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (err) {</div><div class='del'>-				NL_SET_ERR_MSG(extack,</div><div class='del'>-					       "Nexthop has invalid gateway");</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='add'>+		dev = __dev_get_by_index(net, nh-&gt;fib_nh_oif);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop device required for onlink");</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (res.type != RTN_UNICAST &amp;&amp; res.type != RTN_LOCAL) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "Nexthop has invalid gateway");</div><div class='del'>-			goto out;</div><div class='add'>+		if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='add'>+			return -ENETDOWN;</div><div class='ctx'> 		}</div><div class='del'>-		nh-&gt;nh_scope = res.scope;</div><div class='del'>-		nh-&gt;nh_oif = FIB_RES_OIF(res);</div><div class='del'>-		nh-&gt;nh_dev = dev = FIB_RES_DEV(res);</div><div class='del'>-		if (!dev) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "No egress device for nexthop gateway");</div><div class='del'>-			goto out;</div><div class='add'>+		addr_type = inet_addr_type_dev_table(net, dev, nh-&gt;fib_nh_gw4);</div><div class='add'>+		if (addr_type != RTN_UNICAST) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop has invalid gateway");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		dev_hold(dev);</div><div class='ctx'> 		if (!netif_carrier_ok(dev))</div><div class='del'>-			nh-&gt;nh_flags |= RTNH_F_LINKDOWN;</div><div class='del'>-		err = (dev-&gt;flags &amp; IFF_UP) ? 0 : -ENETDOWN;</div><div class='del'>-	} else {</div><div class='del'>-		struct in_device *in_dev;</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_flags &amp; (RTNH_F_PERVASIVE | RTNH_F_ONLINK)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Invalid flags for nexthop - PERVASIVE and ONLINK can not be set");</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+		nh-&gt;fib_nh_dev = dev;</div><div class='add'>+		netdev_hold(dev, &amp;nh-&gt;fib_nh_dev_tracker, GFP_ATOMIC);</div><div class='add'>+		nh-&gt;fib_nh_scope = RT_SCOPE_LINK;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	{</div><div class='add'>+		struct fib_table *tbl = NULL;</div><div class='add'>+		struct flowi4 fl4 = {</div><div class='add'>+			.daddr = nh-&gt;fib_nh_gw4,</div><div class='add'>+			.flowi4_scope = scope + 1,</div><div class='add'>+			.flowi4_oif = nh-&gt;fib_nh_oif,</div><div class='add'>+			.flowi4_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* It is not necessary, but requires a bit of thinking */</div><div class='add'>+		if (fl4.flowi4_scope &lt; RT_SCOPE_LINK)</div><div class='add'>+			fl4.flowi4_scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+		if (table &amp;&amp; table != RT_TABLE_MAIN)</div><div class='add'>+			tbl = fib_get_table(net, table);</div><div class='add'>+</div><div class='add'>+		if (tbl)</div><div class='add'>+			err = fib_table_lookup(tbl, &amp;fl4, &amp;res,</div><div class='add'>+					       FIB_LOOKUP_IGNORE_LINKSTATE |</div><div class='add'>+					       FIB_LOOKUP_NOREF);</div><div class='add'>+</div><div class='add'>+		/* on error or if no table given do full lookup. This</div><div class='add'>+		 * is needed for example when nexthops are in the local</div><div class='add'>+		 * table rather than the given table</div><div class='add'>+		 */</div><div class='add'>+		if (!tbl || err) {</div><div class='add'>+			err = fib_lookup(net, &amp;fl4, &amp;res,</div><div class='add'>+					 FIB_LOOKUP_IGNORE_LINKSTATE);</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		in_dev = inetdev_by_index(net, nh-&gt;nh_oif);</div><div class='del'>-		if (!in_dev)</div><div class='del'>-			goto out;</div><div class='del'>-		err = -ENETDOWN;</div><div class='del'>-		if (!(in_dev-&gt;dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "Device for nexthop is not up");</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop has invalid gateway");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		nh-&gt;nh_dev = in_dev-&gt;dev;</div><div class='del'>-		dev_hold(nh-&gt;nh_dev);</div><div class='del'>-		nh-&gt;nh_scope = RT_SCOPE_HOST;</div><div class='del'>-		if (!netif_carrier_ok(nh-&gt;nh_dev))</div><div class='del'>-			nh-&gt;nh_flags |= RTNH_F_LINKDOWN;</div><div class='del'>-		err = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (res.type != RTN_UNICAST &amp;&amp; res.type != RTN_LOCAL) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop has invalid gateway");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	nh-&gt;fib_nh_scope = res.scope;</div><div class='add'>+	nh-&gt;fib_nh_oif = FIB_RES_OIF(res);</div><div class='add'>+	nh-&gt;fib_nh_dev = dev = FIB_RES_DEV(res);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "No egress device for nexthop gateway");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	netdev_hold(dev, &amp;nh-&gt;fib_nh_dev_tracker, GFP_ATOMIC);</div><div class='add'>+	if (!netif_carrier_ok(dev))</div><div class='add'>+		nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+	err = (dev-&gt;flags &amp; IFF_UP) ? 0 : -ENETDOWN;</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int fib_laddr_hashfn(__be32 val)</div><div class='add'>+static int fib_check_nh_nongw(struct net *net, struct fib_nh *nh,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = (fib_info_hash_size - 1);</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return ((__force u32)val ^</div><div class='del'>-		((__force u32)val &gt;&gt; 7) ^</div><div class='del'>-		((__force u32)val &gt;&gt; 14)) &amp; mask;</div><div class='del'>-}</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; (RTNH_F_PERVASIVE | RTNH_F_ONLINK)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid flags for nexthop - PERVASIVE and ONLINK can not be set");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static struct hlist_head *fib_info_hash_alloc(int bytes)</div><div class='del'>-{</div><div class='del'>-	if (bytes &lt;= PAGE_SIZE)</div><div class='del'>-		return kzalloc(bytes, GFP_KERNEL);</div><div class='del'>-	else</div><div class='del'>-		return (struct hlist_head *)</div><div class='del'>-			__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='del'>-					 get_order(bytes));</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	in_dev = inetdev_by_index(net, nh-&gt;fib_nh_oif);</div><div class='add'>+	if (!in_dev)</div><div class='add'>+		goto out;</div><div class='add'>+	err = -ENETDOWN;</div><div class='add'>+	if (!(in_dev-&gt;dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device for nexthop is not up");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nh-&gt;fib_nh_dev = in_dev-&gt;dev;</div><div class='add'>+	netdev_hold(nh-&gt;fib_nh_dev, &amp;nh-&gt;fib_nh_dev_tracker, GFP_ATOMIC);</div><div class='add'>+	nh-&gt;fib_nh_scope = RT_SCOPE_HOST;</div><div class='add'>+	if (!netif_carrier_ok(nh-&gt;fib_nh_dev))</div><div class='add'>+		nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib_info_hash_free(struct hlist_head *hash, int bytes)</div><div class='add'>+int fib_check_nh(struct net *net, struct fib_nh *nh, u32 table, u8 scope,</div><div class='add'>+		 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	if (!hash)</div><div class='del'>-		return;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (bytes &lt;= PAGE_SIZE)</div><div class='del'>-		kfree(hash);</div><div class='add'>+	if (nh-&gt;fib_nh_gw_family == AF_INET)</div><div class='add'>+		err = fib_check_nh_v4_gw(net, nh, table, scope, extack);</div><div class='add'>+	else if (nh-&gt;fib_nh_gw_family == AF_INET6)</div><div class='add'>+		err = fib_check_nh_v6_gw(net, nh, table, extack);</div><div class='ctx'> 	else</div><div class='del'>-		free_pages((unsigned long) hash, get_order(bytes));</div><div class='add'>+		err = fib_check_nh_nongw(net, nh, extack);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib_info_hash_move(struct hlist_head *new_info_hash,</div><div class='del'>-			       struct hlist_head *new_laddrhash,</div><div class='del'>-			       unsigned int new_size)</div><div class='add'>+__be32 fib_info_update_nhc_saddr(struct net *net, struct fib_nh_common *nhc,</div><div class='add'>+				 unsigned char scope)</div><div class='ctx'> {</div><div class='del'>-	struct hlist_head *old_info_hash, *old_laddrhash;</div><div class='del'>-	unsigned int old_size = fib_info_hash_size;</div><div class='del'>-	unsigned int i, bytes;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;fib_info_lock);</div><div class='del'>-	old_info_hash = fib_info_hash;</div><div class='del'>-	old_laddrhash = fib_info_laddrhash;</div><div class='del'>-	fib_info_hash_size = new_size;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; old_size; i++) {</div><div class='del'>-		struct hlist_head *head = &amp;fib_info_hash[i];</div><div class='del'>-		struct hlist_node *n;</div><div class='del'>-		struct fib_info *fi;</div><div class='add'>+	struct fib_nh *nh;</div><div class='add'>+	__be32 saddr;</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_safe(fi, n, head, fib_hash) {</div><div class='del'>-			struct hlist_head *dest;</div><div class='del'>-			unsigned int new_hash;</div><div class='add'>+	if (nhc-&gt;nhc_family != AF_INET)</div><div class='add'>+		return inet_select_addr(nhc-&gt;nhc_dev, 0, scope);</div><div class='ctx'> </div><div class='del'>-			new_hash = fib_info_hashfn(fi);</div><div class='del'>-			dest = &amp;new_info_hash[new_hash];</div><div class='del'>-			hlist_add_head(&amp;fi-&gt;fib_hash, dest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	fib_info_hash = new_info_hash;</div><div class='add'>+	nh = container_of(nhc, struct fib_nh, nh_common);</div><div class='add'>+	saddr = inet_select_addr(nh-&gt;fib_nh_dev, nh-&gt;fib_nh_gw4, scope);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; old_size; i++) {</div><div class='del'>-		struct hlist_head *lhead = &amp;fib_info_laddrhash[i];</div><div class='del'>-		struct hlist_node *n;</div><div class='del'>-		struct fib_info *fi;</div><div class='add'>+	WRITE_ONCE(nh-&gt;nh_saddr, saddr);</div><div class='add'>+	WRITE_ONCE(nh-&gt;nh_saddr_genid, atomic_read(&amp;net-&gt;ipv4.dev_addr_genid));</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_safe(fi, n, lhead, fib_lhash) {</div><div class='del'>-			struct hlist_head *ldest;</div><div class='del'>-			unsigned int new_hash;</div><div class='add'>+	return saddr;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			new_hash = fib_laddr_hashfn(fi-&gt;fib_prefsrc);</div><div class='del'>-			ldest = &amp;new_laddrhash[new_hash];</div><div class='del'>-			hlist_add_head(&amp;fi-&gt;fib_lhash, ldest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	fib_info_laddrhash = new_laddrhash;</div><div class='add'>+__be32 fib_result_prefsrc(struct net *net, struct fib_result *res)</div><div class='add'>+{</div><div class='add'>+	struct fib_nh_common *nhc = res-&gt;nhc;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;fib_info_lock);</div><div class='add'>+	if (res-&gt;fi-&gt;fib_prefsrc)</div><div class='add'>+		return res-&gt;fi-&gt;fib_prefsrc;</div><div class='ctx'> </div><div class='del'>-	bytes = old_size * sizeof(struct hlist_head *);</div><div class='del'>-	fib_info_hash_free(old_info_hash, bytes);</div><div class='del'>-	fib_info_hash_free(old_laddrhash, bytes);</div><div class='del'>-}</div><div class='add'>+	if (nhc-&gt;nhc_family == AF_INET) {</div><div class='add'>+		struct fib_nh *nh;</div><div class='ctx'> </div><div class='del'>-__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)</div><div class='del'>-{</div><div class='del'>-	nh-&gt;nh_saddr = inet_select_addr(nh-&gt;nh_dev,</div><div class='del'>-					nh-&gt;nh_gw,</div><div class='del'>-					nh-&gt;nh_parent-&gt;fib_scope);</div><div class='del'>-	nh-&gt;nh_saddr_genid = atomic_read(&amp;net-&gt;ipv4.dev_addr_genid);</div><div class='add'>+		nh = container_of(nhc, struct fib_nh, nh_common);</div><div class='add'>+		if (READ_ONCE(nh-&gt;nh_saddr_genid) ==</div><div class='add'>+		    atomic_read(&amp;net-&gt;ipv4.dev_addr_genid))</div><div class='add'>+			return READ_ONCE(nh-&gt;nh_saddr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return nh-&gt;nh_saddr;</div><div class='add'>+	return fib_info_update_nhc_saddr(net, nhc, res-&gt;fi-&gt;fib_scope);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc)</div><div class='hunk'>@@ -1018,22 +1346,17 @@ static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)</div><div class='del'>-{</div><div class='del'>-	return ip_metrics_convert(fi-&gt;fib_net, cfg-&gt;fc_mx, cfg-&gt;fc_mx_len,</div><div class='del'>-				  fi-&gt;fib_metrics-&gt;metrics);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct fib_info *fi = NULL;</div><div class='add'>+	struct nexthop *nh = NULL;</div><div class='ctx'> 	struct fib_info *ofi;</div><div class='ctx'> 	int nhs = 1;</div><div class='ctx'> 	struct net *net = cfg-&gt;fc_nlinfo.nl_net;</div><div class='ctx'> </div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	if (cfg-&gt;fc_type &gt; RTN_MAX)</div><div class='ctx'> 		goto err_inval;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,6 +1372,23 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 		goto err_inval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;fc_nh_id) {</div><div class='add'>+		if (!cfg-&gt;fc_mx) {</div><div class='add'>+			fi = fib_find_info_nh(net, cfg);</div><div class='add'>+			if (fi) {</div><div class='add'>+				refcount_inc(&amp;fi-&gt;fib_treeref);</div><div class='add'>+				return fi;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nh = nexthop_find_by_id(net, cfg-&gt;fc_nh_id);</div><div class='add'>+		if (!nh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop id does not exist");</div><div class='add'>+			goto err_inval;</div><div class='add'>+		}</div><div class='add'>+		nhs = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> 	if (cfg-&gt;fc_mp) {</div><div class='ctx'> 		nhs = fib_count_nexthops(cfg-&gt;fc_mp, cfg-&gt;fc_mp_len, extack);</div><div class='hunk'>@@ -1057,42 +1397,21 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	err = -ENOBUFS;</div><div class='del'>-	if (fib_info_cnt &gt;= fib_info_hash_size) {</div><div class='del'>-		unsigned int new_size = fib_info_hash_size &lt;&lt; 1;</div><div class='del'>-		struct hlist_head *new_info_hash;</div><div class='del'>-		struct hlist_head *new_laddrhash;</div><div class='del'>-		unsigned int bytes;</div><div class='del'>-</div><div class='del'>-		if (!new_size)</div><div class='del'>-			new_size = 16;</div><div class='del'>-		bytes = new_size * sizeof(struct hlist_head *);</div><div class='del'>-		new_info_hash = fib_info_hash_alloc(bytes);</div><div class='del'>-		new_laddrhash = fib_info_hash_alloc(bytes);</div><div class='del'>-		if (!new_info_hash || !new_laddrhash) {</div><div class='del'>-			fib_info_hash_free(new_info_hash, bytes);</div><div class='del'>-			fib_info_hash_free(new_laddrhash, bytes);</div><div class='del'>-		} else</div><div class='del'>-			fib_info_hash_move(new_info_hash, new_laddrhash, new_size);</div><div class='del'>-</div><div class='del'>-		if (!fib_info_hash_size)</div><div class='del'>-			goto failure;</div><div class='del'>-	}</div><div class='add'>+	fib_info_hash_grow(net);</div><div class='ctx'> </div><div class='del'>-	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);</div><div class='del'>-	if (!fi)</div><div class='add'>+	fi = kzalloc(struct_size(fi, fib_nh, nhs), GFP_KERNEL);</div><div class='add'>+	if (!fi) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='ctx'> 		goto failure;</div><div class='del'>-	if (cfg-&gt;fc_mx) {</div><div class='del'>-		fi-&gt;fib_metrics = kzalloc(sizeof(*fi-&gt;fib_metrics), GFP_KERNEL);</div><div class='del'>-		if (unlikely(!fi-&gt;fib_metrics)) {</div><div class='del'>-			kfree(fi);</div><div class='del'>-			return ERR_PTR(err);</div><div class='del'>-		}</div><div class='del'>-		refcount_set(&amp;fi-&gt;fib_metrics-&gt;refcnt, 1);</div><div class='del'>-	} else {</div><div class='del'>-		fi-&gt;fib_metrics = (struct dst_metrics *)&amp;dst_default_metrics;</div><div class='ctx'> 	}</div><div class='del'>-	fib_info_cnt++;</div><div class='add'>+</div><div class='add'>+	fi-&gt;fib_metrics = ip_fib_metrics_init(cfg-&gt;fc_mx, cfg-&gt;fc_mx_len, extack);</div><div class='add'>+	if (IS_ERR(fi-&gt;fib_metrics)) {</div><div class='add'>+		err = PTR_ERR(fi-&gt;fib_metrics);</div><div class='add'>+		kfree(fi);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fi-&gt;fib_net = net;</div><div class='ctx'> 	fi-&gt;fib_protocol = cfg-&gt;fc_protocol;</div><div class='ctx'> 	fi-&gt;fib_scope = cfg-&gt;fc_scope;</div><div class='hunk'>@@ -1103,78 +1422,31 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 	fi-&gt;fib_tb_id = cfg-&gt;fc_table;</div><div class='ctx'> </div><div class='ctx'> 	fi-&gt;fib_nhs = nhs;</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		nexthop_nh-&gt;nh_parent = fi;</div><div class='del'>-		nexthop_nh-&gt;nh_pcpu_rth_output = alloc_percpu(struct rtable __rcu *);</div><div class='del'>-		if (!nexthop_nh-&gt;nh_pcpu_rth_output)</div><div class='del'>-			goto failure;</div><div class='del'>-	} endfor_nexthops(fi)</div><div class='del'>-</div><div class='del'>-	err = fib_convert_metrics(fi, cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;fc_mp) {</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-		err = fib_get_nhs(fi, cfg-&gt;fc_mp, cfg-&gt;fc_mp_len, cfg, extack);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto failure;</div><div class='del'>-		if (cfg-&gt;fc_oif &amp;&amp; fi-&gt;fib_nh-&gt;nh_oif != cfg-&gt;fc_oif) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Nexthop device index does not match RTA_OIF");</div><div class='del'>-			goto err_inval;</div><div class='del'>-		}</div><div class='del'>-		if (cfg-&gt;fc_gw &amp;&amp; fi-&gt;fib_nh-&gt;nh_gw != cfg-&gt;fc_gw) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Nexthop gateway does not match RTA_GATEWAY");</div><div class='del'>-			goto err_inval;</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-		if (cfg-&gt;fc_flow &amp;&amp; fi-&gt;fib_nh-&gt;nh_tclassid != cfg-&gt;fc_flow) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Nexthop class id does not match RTA_FLOW");</div><div class='del'>-			goto err_inval;</div><div class='add'>+	if (nh) {</div><div class='add'>+		if (!nexthop_get(nh)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop has been deleted");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			err = 0;</div><div class='add'>+			fi-&gt;nh = nh;</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-		NL_SET_ERR_MSG(extack,</div><div class='del'>-			       "Multipath support not enabled in kernel");</div><div class='del'>-		goto err_inval;</div><div class='del'>-#endif</div><div class='ctx'> 	} else {</div><div class='del'>-		struct fib_nh *nh = fi-&gt;fib_nh;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;fc_encap) {</div><div class='del'>-			struct lwtunnel_state *lwtstate;</div><div class='del'>-</div><div class='del'>-			if (cfg-&gt;fc_encap_type == LWTUNNEL_ENCAP_NONE) {</div><div class='del'>-				NL_SET_ERR_MSG(extack,</div><div class='del'>-					       "LWT encap type not specified");</div><div class='del'>-				goto err_inval;</div><div class='del'>-			}</div><div class='del'>-			err = lwtunnel_build_state(cfg-&gt;fc_encap_type,</div><div class='del'>-						   cfg-&gt;fc_encap, AF_INET, cfg,</div><div class='del'>-						   &amp;lwtstate, extack);</div><div class='del'>-			if (err)</div><div class='del'>-				goto failure;</div><div class='add'>+		change_nexthops(fi) {</div><div class='add'>+			nexthop_nh-&gt;nh_parent = fi;</div><div class='add'>+		} endfor_nexthops(fi)</div><div class='ctx'> </div><div class='del'>-			nh-&gt;nh_lwtstate = lwtstate_get(lwtstate);</div><div class='del'>-		}</div><div class='del'>-		nh-&gt;nh_oif = cfg-&gt;fc_oif;</div><div class='del'>-		nh-&gt;nh_gw = cfg-&gt;fc_gw;</div><div class='del'>-		nh-&gt;nh_flags = cfg-&gt;fc_flags;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-		nh-&gt;nh_tclassid = cfg-&gt;fc_flow;</div><div class='del'>-		if (nh-&gt;nh_tclassid)</div><div class='del'>-			fi-&gt;fib_net-&gt;ipv4.fib_num_tclassid_users++;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-		nh-&gt;nh_weight = 1;</div><div class='del'>-#endif</div><div class='add'>+		if (cfg-&gt;fc_mp)</div><div class='add'>+			err = fib_get_nhs(fi, cfg-&gt;fc_mp, cfg-&gt;fc_mp_len, cfg,</div><div class='add'>+					  extack);</div><div class='add'>+		else</div><div class='add'>+			err = fib_nh_init(net, fi-&gt;fib_nh, cfg, 1, extack);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='ctx'> 	if (fib_props[cfg-&gt;fc_type].error) {</div><div class='del'>-		if (cfg-&gt;fc_gw || cfg-&gt;fc_oif || cfg-&gt;fc_mp) {</div><div class='add'>+		if (cfg-&gt;fc_gw_family || cfg-&gt;fc_oif || cfg-&gt;fc_mp) {</div><div class='ctx'> 			NL_SET_ERR_MSG(extack,</div><div class='ctx'> 				       "Gateway, device and multipath can not be specified for this route type");</div><div class='ctx'> 			goto err_inval;</div><div class='hunk'>@@ -1199,7 +1471,11 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 		goto err_inval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;fc_scope == RT_SCOPE_HOST) {</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		err = fib_check_nexthop(fi-&gt;nh, cfg-&gt;fc_scope, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto failure;</div><div class='add'>+	} else if (cfg-&gt;fc_scope == RT_SCOPE_HOST) {</div><div class='ctx'> 		struct fib_nh *nh = fi-&gt;fib_nh;</div><div class='ctx'> </div><div class='ctx'> 		/* Local address is added. */</div><div class='hunk'>@@ -1208,24 +1484,28 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 				       "Route with host scope can not have multiple nexthops");</div><div class='ctx'> 			goto err_inval;</div><div class='ctx'> 		}</div><div class='del'>-		if (nh-&gt;nh_gw) {</div><div class='add'>+		if (nh-&gt;fib_nh_gw_family) {</div><div class='ctx'> 			NL_SET_ERR_MSG(extack,</div><div class='ctx'> 				       "Route with host scope can not have a gateway");</div><div class='ctx'> 			goto err_inval;</div><div class='ctx'> 		}</div><div class='del'>-		nh-&gt;nh_scope = RT_SCOPE_NOWHERE;</div><div class='del'>-		nh-&gt;nh_dev = dev_get_by_index(net, fi-&gt;fib_nh-&gt;nh_oif);</div><div class='add'>+		nh-&gt;fib_nh_scope = RT_SCOPE_NOWHERE;</div><div class='add'>+		nh-&gt;fib_nh_dev = dev_get_by_index(net, nh-&gt;fib_nh_oif);</div><div class='ctx'> 		err = -ENODEV;</div><div class='del'>-		if (!nh-&gt;nh_dev)</div><div class='add'>+		if (!nh-&gt;fib_nh_dev)</div><div class='ctx'> 			goto failure;</div><div class='add'>+		netdev_tracker_alloc(nh-&gt;fib_nh_dev, &amp;nh-&gt;fib_nh_dev_tracker,</div><div class='add'>+				     GFP_KERNEL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int linkdown = 0;</div><div class='ctx'> </div><div class='ctx'> 		change_nexthops(fi) {</div><div class='del'>-			err = fib_check_nh(cfg, nexthop_nh, extack);</div><div class='add'>+			err = fib_check_nh(cfg-&gt;fc_nlinfo.nl_net, nexthop_nh,</div><div class='add'>+					   cfg-&gt;fc_table, cfg-&gt;fc_scope,</div><div class='add'>+					   extack);</div><div class='ctx'> 			if (err != 0)</div><div class='ctx'> 				goto failure;</div><div class='del'>-			if (nexthop_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='add'>+			if (nexthop_nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='ctx'> 				linkdown++;</div><div class='ctx'> 		} endfor_nexthops(fi)</div><div class='ctx'> 		if (linkdown == fi-&gt;fib_nhs)</div><div class='hunk'>@@ -1237,43 +1517,51 @@ struct fib_info *fib_create_info(struct fib_config *cfg,</div><div class='ctx'> 		goto err_inval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		fib_info_update_nh_saddr(net, nexthop_nh);</div><div class='del'>-	} endfor_nexthops(fi)</div><div class='add'>+	if (!fi-&gt;nh) {</div><div class='add'>+		change_nexthops(fi) {</div><div class='add'>+			fib_info_update_nhc_saddr(net, &amp;nexthop_nh-&gt;nh_common,</div><div class='add'>+						  fi-&gt;fib_scope);</div><div class='add'>+			if (nexthop_nh-&gt;fib_nh_gw_family == AF_INET6)</div><div class='add'>+				fi-&gt;fib_nh_is_v6 = true;</div><div class='add'>+		} endfor_nexthops(fi)</div><div class='ctx'> </div><div class='del'>-	fib_rebalance(fi);</div><div class='add'>+		fib_rebalance(fi);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> link_it:</div><div class='ctx'> 	ofi = fib_find_info(fi);</div><div class='ctx'> 	if (ofi) {</div><div class='add'>+		/* fib_table_lookup() should not see @fi yet. */</div><div class='ctx'> 		fi-&gt;fib_dead = 1;</div><div class='ctx'> 		free_fib_info(fi);</div><div class='del'>-		ofi-&gt;fib_treeref++;</div><div class='add'>+		refcount_inc(&amp;ofi-&gt;fib_treeref);</div><div class='ctx'> 		return ofi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fi-&gt;fib_treeref++;</div><div class='add'>+	refcount_set(&amp;fi-&gt;fib_treeref, 1);</div><div class='ctx'> 	refcount_set(&amp;fi-&gt;fib_clntref, 1);</div><div class='del'>-	spin_lock_bh(&amp;fib_info_lock);</div><div class='del'>-	hlist_add_head(&amp;fi-&gt;fib_hash,</div><div class='del'>-		       &amp;fib_info_hash[fib_info_hashfn(fi)]);</div><div class='add'>+</div><div class='add'>+	net-&gt;ipv4.fib_info_cnt++;</div><div class='add'>+	hlist_add_head(&amp;fi-&gt;fib_hash, fib_info_hash_bucket(fi));</div><div class='add'>+</div><div class='ctx'> 	if (fi-&gt;fib_prefsrc) {</div><div class='ctx'> 		struct hlist_head *head;</div><div class='ctx'> </div><div class='del'>-		head = &amp;fib_info_laddrhash[fib_laddr_hashfn(fi-&gt;fib_prefsrc)];</div><div class='add'>+		head = fib_info_laddrhash_bucket(net, fi-&gt;fib_prefsrc);</div><div class='ctx'> 		hlist_add_head(&amp;fi-&gt;fib_lhash, head);</div><div class='ctx'> 	}</div><div class='del'>-	change_nexthops(fi) {</div><div class='del'>-		struct hlist_head *head;</div><div class='del'>-		unsigned int hash;</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		list_add(&amp;fi-&gt;nh_list, &amp;nh-&gt;fi_list);</div><div class='add'>+	} else {</div><div class='add'>+		change_nexthops(fi) {</div><div class='add'>+			struct hlist_head *head;</div><div class='ctx'> </div><div class='del'>-		if (!nexthop_nh-&gt;nh_dev)</div><div class='del'>-			continue;</div><div class='del'>-		hash = fib_devindex_hashfn(nexthop_nh-&gt;nh_dev-&gt;ifindex);</div><div class='del'>-		head = &amp;fib_info_devhash[hash];</div><div class='del'>-		hlist_add_head(&amp;nexthop_nh-&gt;nh_hash, head);</div><div class='del'>-	} endfor_nexthops(fi)</div><div class='del'>-	spin_unlock_bh(&amp;fib_info_lock);</div><div class='add'>+			if (!nexthop_nh-&gt;fib_nh_dev)</div><div class='add'>+				continue;</div><div class='add'>+			head = fib_nh_head(nexthop_nh-&gt;fib_nh_dev);</div><div class='add'>+			hlist_add_head_rcu(&amp;nexthop_nh-&gt;nh_hash, head);</div><div class='add'>+		} endfor_nexthops(fi)</div><div class='add'>+	}</div><div class='ctx'> 	return fi;</div><div class='ctx'> </div><div class='ctx'> err_inval:</div><div class='hunk'>@@ -1281,6 +1569,7 @@ err_inval:</div><div class='ctx'> </div><div class='ctx'> failure:</div><div class='ctx'> 	if (fi) {</div><div class='add'>+		/* fib_table_lookup() should not see @fi yet. */</div><div class='ctx'> 		fi-&gt;fib_dead = 1;</div><div class='ctx'> 		free_fib_info(fi);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1288,10 +1577,155 @@ failure:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int fib_nexthop_info(struct sk_buff *skb, const struct fib_nh_common *nhc,</div><div class='add'>+		     u8 rt_family, unsigned char *flags, bool skip_oif)</div><div class='add'>+{</div><div class='add'>+	if (nhc-&gt;nhc_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		*flags |= RTNH_F_DEAD;</div><div class='add'>+</div><div class='add'>+	if (nhc-&gt;nhc_flags &amp; RTNH_F_LINKDOWN) {</div><div class='add'>+		*flags |= RTNH_F_LINKDOWN;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		switch (nhc-&gt;nhc_family) {</div><div class='add'>+		case AF_INET:</div><div class='add'>+			if (ip_ignore_linkdown(nhc-&gt;nhc_dev))</div><div class='add'>+				*flags |= RTNH_F_DEAD;</div><div class='add'>+			break;</div><div class='add'>+		case AF_INET6:</div><div class='add'>+			if (ip6_ignore_linkdown(nhc-&gt;nhc_dev))</div><div class='add'>+				*flags |= RTNH_F_DEAD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (nhc-&gt;nhc_gw_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		if (nla_put_in_addr(skb, RTA_GATEWAY, nhc-&gt;nhc_gw.ipv4))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		/* if gateway family does not match nexthop family</div><div class='add'>+		 * gateway is encoded as RTA_VIA</div><div class='add'>+		 */</div><div class='add'>+		if (rt_family != nhc-&gt;nhc_gw_family) {</div><div class='add'>+			int alen = sizeof(struct in6_addr);</div><div class='add'>+			struct nlattr *nla;</div><div class='add'>+			struct rtvia *via;</div><div class='add'>+</div><div class='add'>+			nla = nla_reserve(skb, RTA_VIA, alen + 2);</div><div class='add'>+			if (!nla)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			via = nla_data(nla);</div><div class='add'>+			via-&gt;rtvia_family = AF_INET6;</div><div class='add'>+			memcpy(via-&gt;rtvia_addr, &amp;nhc-&gt;nhc_gw.ipv6, alen);</div><div class='add'>+		} else if (nla_put_in6_addr(skb, RTA_GATEWAY,</div><div class='add'>+					    &amp;nhc-&gt;nhc_gw.ipv6) &lt; 0) {</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*flags |= (nhc-&gt;nhc_flags &amp;</div><div class='add'>+		   (RTNH_F_ONLINK | RTNH_F_OFFLOAD | RTNH_F_TRAP));</div><div class='add'>+</div><div class='add'>+	if (!skip_oif &amp;&amp; nhc-&gt;nhc_dev &amp;&amp;</div><div class='add'>+	    nla_put_u32(skb, RTA_OIF, nhc-&gt;nhc_dev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (lwtunnel_fill_encap(skb, nhc-&gt;nhc_lwtstate,</div><div class='add'>+				RTA_ENCAP, RTA_ENCAP_TYPE) &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_nexthop_info);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IP_ROUTE_MULTIPATH) || IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+int fib_add_nexthop(struct sk_buff *skb, const struct fib_nh_common *nhc,</div><div class='add'>+		    int nh_weight, u8 rt_family, u32 nh_tclassid)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *dev = nhc-&gt;nhc_dev;</div><div class='add'>+	struct rtnexthop *rtnh;</div><div class='add'>+	unsigned char flags = 0;</div><div class='add'>+</div><div class='add'>+	rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));</div><div class='add'>+	if (!rtnh)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rtnh-&gt;rtnh_hops = nh_weight - 1;</div><div class='add'>+	rtnh-&gt;rtnh_ifindex = dev ? dev-&gt;ifindex : 0;</div><div class='add'>+</div><div class='add'>+	if (fib_nexthop_info(skb, nhc, rt_family, &amp;flags, true) &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rtnh-&gt;rtnh_flags = flags;</div><div class='add'>+</div><div class='add'>+	if (nh_tclassid &amp;&amp; nla_put_u32(skb, RTA_FLOW, nh_tclassid))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	/* length of rtnetlink header + attributes */</div><div class='add'>+	rtnh-&gt;rtnh_len = nlmsg_get_pos(skb) - (void *)rtnh;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_add_nexthop);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+static int fib_add_multipath(struct sk_buff *skb, struct fib_info *fi)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *mp;</div><div class='add'>+</div><div class='add'>+	mp = nla_nest_start_noflag(skb, RTA_MULTIPATH);</div><div class='add'>+	if (!mp)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (unlikely(fi-&gt;nh)) {</div><div class='add'>+		if (nexthop_mpath_fill_node(skb, fi-&gt;nh, AF_INET) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		goto mp_end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_nexthops(fi) {</div><div class='add'>+		u32 nh_tclassid = 0;</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='add'>+		nh_tclassid = nh-&gt;nh_tclassid;</div><div class='add'>+#endif</div><div class='add'>+		if (fib_add_nexthop(skb, &amp;nh-&gt;nh_common, nh-&gt;fib_nh_weight,</div><div class='add'>+				    AF_INET, nh_tclassid) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} endfor_nexthops(fi);</div><div class='add'>+</div><div class='add'>+mp_end:</div><div class='add'>+	nla_nest_end(skb, mp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int fib_add_multipath(struct sk_buff *skb, struct fib_info *fi)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,</div><div class='del'>-		  u32 tb_id, u8 type, __be32 dst, int dst_len, u8 tos,</div><div class='del'>-		  struct fib_info *fi, unsigned int flags)</div><div class='add'>+		  const struct fib_rt_info *fri, unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	unsigned int nhs = fib_info_num_path(fri-&gt;fi);</div><div class='add'>+	struct fib_info *fi = fri-&gt;fi;</div><div class='add'>+	u32 tb_id = fri-&gt;tb_id;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='ctx'> </div><div class='hunk'>@@ -1301,22 +1735,22 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,</div><div class='ctx'> </div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='ctx'> 	rtm-&gt;rtm_family = AF_INET;</div><div class='del'>-	rtm-&gt;rtm_dst_len = dst_len;</div><div class='add'>+	rtm-&gt;rtm_dst_len = fri-&gt;dst_len;</div><div class='ctx'> 	rtm-&gt;rtm_src_len = 0;</div><div class='del'>-	rtm-&gt;rtm_tos = tos;</div><div class='add'>+	rtm-&gt;rtm_tos = inet_dscp_to_dsfield(fri-&gt;dscp);</div><div class='ctx'> 	if (tb_id &lt; 256)</div><div class='ctx'> 		rtm-&gt;rtm_table = tb_id;</div><div class='ctx'> 	else</div><div class='ctx'> 		rtm-&gt;rtm_table = RT_TABLE_COMPAT;</div><div class='ctx'> 	if (nla_put_u32(skb, RTA_TABLE, tb_id))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	rtm-&gt;rtm_type = type;</div><div class='add'>+	rtm-&gt;rtm_type = fri-&gt;type;</div><div class='ctx'> 	rtm-&gt;rtm_flags = fi-&gt;fib_flags;</div><div class='ctx'> 	rtm-&gt;rtm_scope = fi-&gt;fib_scope;</div><div class='ctx'> 	rtm-&gt;rtm_protocol = fi-&gt;fib_protocol;</div><div class='ctx'> </div><div class='ctx'> 	if (rtm-&gt;rtm_dst_len &amp;&amp;</div><div class='del'>-	    nla_put_in_addr(skb, RTA_DST, dst))</div><div class='add'>+	    nla_put_in_addr(skb, RTA_DST, fri-&gt;dst))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (fi-&gt;fib_priority &amp;&amp;</div><div class='ctx'> 	    nla_put_u32(skb, RTA_PRIORITY, fi-&gt;fib_priority))</div><div class='hunk'>@@ -1327,81 +1761,47 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,</div><div class='ctx'> 	if (fi-&gt;fib_prefsrc &amp;&amp;</div><div class='ctx'> 	    nla_put_in_addr(skb, RTA_PREFSRC, fi-&gt;fib_prefsrc))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	if (fi-&gt;fib_nhs == 1) {</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_gw &amp;&amp;</div><div class='del'>-		    nla_put_in_addr(skb, RTA_GATEWAY, fi-&gt;fib_nh-&gt;nh_gw))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_oif &amp;&amp;</div><div class='del'>-		    nla_put_u32(skb, RTA_OIF, fi-&gt;fib_nh-&gt;nh_oif))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN) {</div><div class='del'>-			struct in_device *in_dev;</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			in_dev = __in_dev_get_rcu(fi-&gt;fib_nh-&gt;nh_dev);</div><div class='del'>-			if (in_dev &amp;&amp;</div><div class='del'>-			    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev))</div><div class='del'>-				rtm-&gt;rtm_flags |= RTNH_F_DEAD;</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-		}</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_flags &amp; RTNH_F_OFFLOAD)</div><div class='del'>-			rtm-&gt;rtm_flags |= RTNH_F_OFFLOAD;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-		if (fi-&gt;fib_nh[0].nh_tclassid &amp;&amp;</div><div class='del'>-		    nla_put_u32(skb, RTA_FLOW, fi-&gt;fib_nh[0].nh_tclassid))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-#endif</div><div class='del'>-		if (fi-&gt;fib_nh-&gt;nh_lwtstate &amp;&amp;</div><div class='del'>-		    lwtunnel_fill_encap(skb, fi-&gt;fib_nh-&gt;nh_lwtstate) &lt; 0)</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	if (fi-&gt;fib_nhs &gt; 1) {</div><div class='del'>-		struct rtnexthop *rtnh;</div><div class='del'>-		struct nlattr *mp;</div><div class='ctx'> </div><div class='del'>-		mp = nla_nest_start(skb, RTA_MULTIPATH);</div><div class='del'>-		if (!mp)</div><div class='add'>+	if (fi-&gt;nh) {</div><div class='add'>+		if (nla_put_u32(skb, RTA_NH_ID, fi-&gt;nh-&gt;id))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+		if (nexthop_is_blackhole(fi-&gt;nh))</div><div class='add'>+			rtm-&gt;rtm_type = RTN_BLACKHOLE;</div><div class='add'>+		if (!READ_ONCE(fi-&gt;fib_net-&gt;ipv4.sysctl_nexthop_compat_mode))</div><div class='add'>+			goto offload;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		for_nexthops(fi) {</div><div class='del'>-			rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));</div><div class='del'>-			if (!rtnh)</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-			rtnh-&gt;rtnh_flags = nh-&gt;nh_flags &amp; 0xFF;</div><div class='del'>-			if (nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN) {</div><div class='del'>-				struct in_device *in_dev;</div><div class='add'>+	if (nhs == 1) {</div><div class='add'>+		const struct fib_nh_common *nhc = fib_info_nhc(fi, 0);</div><div class='add'>+		unsigned char flags = 0;</div><div class='ctx'> </div><div class='del'>-				rcu_read_lock();</div><div class='del'>-				in_dev = __in_dev_get_rcu(nh-&gt;nh_dev);</div><div class='del'>-				if (in_dev &amp;&amp;</div><div class='del'>-				    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev))</div><div class='del'>-					rtnh-&gt;rtnh_flags |= RTNH_F_DEAD;</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-			}</div><div class='del'>-			rtnh-&gt;rtnh_hops = nh-&gt;nh_weight - 1;</div><div class='del'>-			rtnh-&gt;rtnh_ifindex = nh-&gt;nh_oif;</div><div class='add'>+		if (fib_nexthop_info(skb, nhc, AF_INET, &amp;flags, false) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-			if (nh-&gt;nh_gw &amp;&amp;</div><div class='del'>-			    nla_put_in_addr(skb, RTA_GATEWAY, nh-&gt;nh_gw))</div><div class='del'>-				goto nla_put_failure;</div><div class='add'>+		rtm-&gt;rtm_flags = flags;</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='add'>+		if (nhc-&gt;nhc_family == AF_INET) {</div><div class='add'>+			struct fib_nh *nh;</div><div class='add'>+</div><div class='add'>+			nh = container_of(nhc, struct fib_nh, nh_common);</div><div class='ctx'> 			if (nh-&gt;nh_tclassid &amp;&amp;</div><div class='ctx'> 			    nla_put_u32(skb, RTA_FLOW, nh-&gt;nh_tclassid))</div><div class='ctx'> 				goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-			if (nh-&gt;nh_lwtstate &amp;&amp;</div><div class='del'>-			    lwtunnel_fill_encap(skb, nh-&gt;nh_lwtstate) &lt; 0)</div><div class='del'>-				goto nla_put_failure;</div><div class='add'>+	} else {</div><div class='add'>+		if (fib_add_multipath(skb, fi) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			/* length of rtnetlink header + attributes */</div><div class='del'>-			rtnh-&gt;rtnh_len = nlmsg_get_pos(skb) - (void *) rtnh;</div><div class='del'>-		} endfor_nexthops(fi);</div><div class='add'>+offload:</div><div class='add'>+	if (fri-&gt;offload)</div><div class='add'>+		rtm-&gt;rtm_flags |= RTM_F_OFFLOAD;</div><div class='add'>+	if (fri-&gt;trap)</div><div class='add'>+		rtm-&gt;rtm_flags |= RTM_F_TRAP;</div><div class='add'>+	if (fri-&gt;offload_failed)</div><div class='add'>+		rtm-&gt;rtm_flags |= RTM_F_OFFLOAD_FAILED;</div><div class='ctx'> </div><div class='del'>-		nla_nest_end(skb, mp);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1418,51 +1818,51 @@ nla_put_failure:</div><div class='ctx'>  */</div><div class='ctx'> int fib_sync_down_addr(struct net_device *dev, __be32 local)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned int hash = fib_laddr_hashfn(local);</div><div class='del'>-	struct hlist_head *head = &amp;fib_info_laddrhash[hash];</div><div class='add'>+	int tb_id = l3mdev_fib_table(dev) ? : RT_TABLE_MAIN;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='del'>-	int tb_id = l3mdev_fib_table(dev);</div><div class='add'>+	struct hlist_head *head;</div><div class='ctx'> 	struct fib_info *fi;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!fib_info_laddrhash || local == 0)</div><div class='add'>+	if (!local)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	head = fib_info_laddrhash_bucket(net, local);</div><div class='ctx'> 	hlist_for_each_entry(fi, head, fib_lhash) {</div><div class='ctx'> 		if (!net_eq(fi-&gt;fib_net, net) ||</div><div class='ctx'> 		    fi-&gt;fib_tb_id != tb_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fi-&gt;fib_prefsrc == local) {</div><div class='ctx'> 			fi-&gt;fib_flags |= RTNH_F_DEAD;</div><div class='add'>+			fi-&gt;pfsrc_removed = true;</div><div class='ctx'> 			ret++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int call_fib_nh_notifiers(struct fib_nh *fib_nh,</div><div class='add'>+static int call_fib_nh_notifiers(struct fib_nh *nh,</div><div class='ctx'> 				 enum fib_event_type event_type)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = __in_dev_get_rtnl(fib_nh-&gt;nh_dev);</div><div class='add'>+	bool ignore_link_down = ip_ignore_linkdown(nh-&gt;fib_nh_dev);</div><div class='ctx'> 	struct fib_nh_notifier_info info = {</div><div class='del'>-		.fib_nh = fib_nh,</div><div class='add'>+		.fib_nh = nh,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	switch (event_type) {</div><div class='ctx'> 	case FIB_EVENT_NH_ADD:</div><div class='del'>-		if (fib_nh-&gt;nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 			break;</div><div class='del'>-		if (IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-		    fib_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='add'>+		if (ignore_link_down &amp;&amp; nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='ctx'> 			break;</div><div class='del'>-		return call_fib4_notifiers(dev_net(fib_nh-&gt;nh_dev), event_type,</div><div class='add'>+		return call_fib4_notifiers(dev_net(nh-&gt;fib_nh_dev), event_type,</div><div class='ctx'> 					   &amp;info.info);</div><div class='ctx'> 	case FIB_EVENT_NH_DEL:</div><div class='del'>-		if ((in_dev &amp;&amp; IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-		     fib_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN) ||</div><div class='del'>-		    (fib_nh-&gt;nh_flags &amp; RTNH_F_DEAD))</div><div class='del'>-			return call_fib4_notifiers(dev_net(fib_nh-&gt;nh_dev),</div><div class='add'>+		if ((ignore_link_down &amp;&amp; nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN) ||</div><div class='add'>+		    (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD))</div><div class='add'>+			return call_fib4_notifiers(dev_net(nh-&gt;fib_nh_dev),</div><div class='ctx'> 						   event_type, &amp;info.info);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1470,20 +1870,70 @@ static int call_fib_nh_notifiers(struct fib_nh *fib_nh,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Update the PMTU of exceptions when:</div><div class='add'>+ * - the new MTU of the first hop becomes smaller than the PMTU</div><div class='add'>+ * - the old MTU was the same as the PMTU, and it limited discovery of</div><div class='add'>+ *   larger MTUs on the path. With that limit raised, we can now</div><div class='add'>+ *   discover larger MTUs</div><div class='add'>+ * A special case is locked exceptions, for which the PMTU is smaller</div><div class='add'>+ * than the minimal accepted PMTU:</div><div class='add'>+ * - if the new MTU is greater than the PMTU, don't make any change</div><div class='add'>+ * - otherwise, unlock and set PMTU</div><div class='add'>+ */</div><div class='add'>+void fib_nhc_update_mtu(struct fib_nh_common *nhc, u32 new, u32 orig)</div><div class='add'>+{</div><div class='add'>+	struct fnhe_hash_bucket *bucket;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bucket = rcu_dereference_protected(nhc-&gt;nhc_exceptions, 1);</div><div class='add'>+	if (!bucket)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FNHE_HASH_SIZE; i++) {</div><div class='add'>+		struct fib_nh_exception *fnhe;</div><div class='add'>+</div><div class='add'>+		for (fnhe = rcu_dereference_protected(bucket[i].chain, 1);</div><div class='add'>+		     fnhe;</div><div class='add'>+		     fnhe = rcu_dereference_protected(fnhe-&gt;fnhe_next, 1)) {</div><div class='add'>+			if (fnhe-&gt;fnhe_mtu_locked) {</div><div class='add'>+				if (new &lt;= fnhe-&gt;fnhe_pmtu) {</div><div class='add'>+					fnhe-&gt;fnhe_pmtu = new;</div><div class='add'>+					fnhe-&gt;fnhe_mtu_locked = false;</div><div class='add'>+				}</div><div class='add'>+			} else if (new &lt; fnhe-&gt;fnhe_pmtu ||</div><div class='add'>+				   orig == fnhe-&gt;fnhe_pmtu) {</div><div class='add'>+				fnhe-&gt;fnhe_pmtu = new;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib_sync_mtu(struct net_device *dev, u32 orig_mtu)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = fib_nh_head(dev);</div><div class='add'>+	struct fib_nh *nh;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(nh, head, nh_hash) {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(nh-&gt;fib_nh_dev != dev);</div><div class='add'>+		fib_nhc_update_mtu(&amp;nh-&gt;nh_common, dev-&gt;mtu, orig_mtu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Event              force Flags           Description</div><div class='ctx'>  * NETDEV_CHANGE      0     LINKDOWN        Carrier OFF, not for scope host</div><div class='ctx'>  * NETDEV_DOWN        0     LINKDOWN|DEAD   Link down, not for scope host</div><div class='ctx'>  * NETDEV_DOWN        1     LINKDOWN|DEAD   Last address removed</div><div class='ctx'>  * NETDEV_UNREGISTER  1     LINKDOWN|DEAD   Device removed</div><div class='add'>+ *</div><div class='add'>+ * only used when fib_nh is built into fib_info</div><div class='ctx'>  */</div><div class='ctx'> int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int scope = RT_SCOPE_NOWHERE;</div><div class='add'>+	struct hlist_head *head = fib_nh_head(dev);</div><div class='ctx'> 	struct fib_info *prev_fi = NULL;</div><div class='del'>-	unsigned int hash = fib_devindex_hashfn(dev-&gt;ifindex);</div><div class='del'>-	struct hlist_head *head = &amp;fib_info_devhash[hash];</div><div class='add'>+	int scope = RT_SCOPE_NOWHERE;</div><div class='ctx'> 	struct fib_nh *nh;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (force)</div><div class='ctx'> 		scope = -1;</div><div class='hunk'>@@ -1493,22 +1943,23 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)</div><div class='ctx'> 		int dead;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(!fi-&gt;fib_nhs);</div><div class='del'>-		if (nh-&gt;nh_dev != dev || fi == prev_fi)</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(nh-&gt;fib_nh_dev != dev);</div><div class='add'>+		if (fi == prev_fi)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		prev_fi = fi;</div><div class='ctx'> 		dead = 0;</div><div class='ctx'> 		change_nexthops(fi) {</div><div class='del'>-			if (nexthop_nh-&gt;nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+			if (nexthop_nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 				dead++;</div><div class='del'>-			else if (nexthop_nh-&gt;nh_dev == dev &amp;&amp;</div><div class='del'>-				 nexthop_nh-&gt;nh_scope != scope) {</div><div class='add'>+			else if (nexthop_nh-&gt;fib_nh_dev == dev &amp;&amp;</div><div class='add'>+				 nexthop_nh-&gt;fib_nh_scope != scope) {</div><div class='ctx'> 				switch (event) {</div><div class='ctx'> 				case NETDEV_DOWN:</div><div class='ctx'> 				case NETDEV_UNREGISTER:</div><div class='del'>-					nexthop_nh-&gt;nh_flags |= RTNH_F_DEAD;</div><div class='del'>-					/* fall through */</div><div class='add'>+					nexthop_nh-&gt;fib_nh_flags |= RTNH_F_DEAD;</div><div class='add'>+					fallthrough;</div><div class='ctx'> 				case NETDEV_CHANGE:</div><div class='del'>-					nexthop_nh-&gt;nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+					nexthop_nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				call_fib_nh_notifiers(nexthop_nh,</div><div class='hunk'>@@ -1517,7 +1968,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)</div><div class='ctx'> 			}</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> 			if (event == NETDEV_UNREGISTER &amp;&amp;</div><div class='del'>-			    nexthop_nh-&gt;nh_dev == dev) {</div><div class='add'>+			    nexthop_nh-&gt;fib_nh_dev == dev) {</div><div class='ctx'> 				dead = fi-&gt;fib_nhs;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1528,7 +1979,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)</div><div class='ctx'> 			case NETDEV_DOWN:</div><div class='ctx'> 			case NETDEV_UNREGISTER:</div><div class='ctx'> 				fi-&gt;fib_flags |= RTNH_F_DEAD;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case NETDEV_CHANGE:</div><div class='ctx'> 				fi-&gt;fib_flags |= RTNH_F_LINKDOWN;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1552,33 +2003,35 @@ static void fib_select_default(const struct flowi4 *flp, struct fib_result *res)</div><div class='ctx'> 	int order = -1, last_idx = -1;</div><div class='ctx'> 	struct fib_alias *fa, *fa1 = NULL;</div><div class='ctx'> 	u32 last_prio = res-&gt;fi-&gt;fib_priority;</div><div class='del'>-	u8 last_tos = 0;</div><div class='add'>+	dscp_t last_dscp = 0;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(fa, fa_head, fa_list) {</div><div class='ctx'> 		struct fib_info *next_fi = fa-&gt;fa_info;</div><div class='add'>+		struct fib_nh_common *nhc;</div><div class='ctx'> </div><div class='ctx'> 		if (fa-&gt;fa_slen != slen)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (fa-&gt;fa_tos &amp;&amp; fa-&gt;fa_tos != flp-&gt;flowi4_tos)</div><div class='add'>+		if (fa-&gt;fa_dscp &amp;&amp; !fib_dscp_masked_match(fa-&gt;fa_dscp, flp))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fa-&gt;tb_id != tb-&gt;tb_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (next_fi-&gt;fib_priority &gt; last_prio &amp;&amp;</div><div class='del'>-		    fa-&gt;fa_tos == last_tos) {</div><div class='del'>-			if (last_tos)</div><div class='add'>+		    fa-&gt;fa_dscp == last_dscp) {</div><div class='add'>+			if (last_dscp)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (next_fi-&gt;fib_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 			continue;</div><div class='del'>-		last_tos = fa-&gt;fa_tos;</div><div class='add'>+		last_dscp = fa-&gt;fa_dscp;</div><div class='ctx'> 		last_prio = next_fi-&gt;fib_priority;</div><div class='ctx'> </div><div class='ctx'> 		if (next_fi-&gt;fib_scope != res-&gt;scope ||</div><div class='ctx'> 		    fa-&gt;fa_type != RTN_UNICAST)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!next_fi-&gt;fib_nh[0].nh_gw ||</div><div class='del'>-		    next_fi-&gt;fib_nh[0].nh_scope != RT_SCOPE_LINK)</div><div class='add'>+</div><div class='add'>+		nhc = fib_info_nhc(next_fi, 0);</div><div class='add'>+		if (!nhc-&gt;nhc_gw_family || nhc-&gt;nhc_scope != RT_SCOPE_LINK)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		fib_alias_accessed(fa);</div><div class='hunk'>@@ -1620,11 +2073,12 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Dead device goes up. We wake up dead nexthops.</div><div class='ctx'>  * It takes sense only on multipath routes.</div><div class='add'>+ *</div><div class='add'>+ * only used when fib_nh is built into fib_info</div><div class='ctx'>  */</div><div class='del'>-int fib_sync_up(struct net_device *dev, unsigned int nh_flags)</div><div class='add'>+int fib_sync_up(struct net_device *dev, unsigned char nh_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_info *prev_fi;</div><div class='del'>-	unsigned int hash;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='ctx'> 	struct fib_nh *nh;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1633,15 +2087,14 @@ int fib_sync_up(struct net_device *dev, unsigned int nh_flags)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (nh_flags &amp; RTNH_F_DEAD) {</div><div class='del'>-		unsigned int flags = dev_get_flags(dev);</div><div class='add'>+		unsigned int flags = netif_get_flags(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (flags &amp; (IFF_RUNNING | IFF_LOWER_UP))</div><div class='ctx'> 			nh_flags |= RTNH_F_LINKDOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	prev_fi = NULL;</div><div class='del'>-	hash = fib_devindex_hashfn(dev-&gt;ifindex);</div><div class='del'>-	head = &amp;fib_info_devhash[hash];</div><div class='add'>+	head = fib_nh_head(dev);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(nh, head, nh_hash) {</div><div class='hunk'>@@ -1649,24 +2102,25 @@ int fib_sync_up(struct net_device *dev, unsigned int nh_flags)</div><div class='ctx'> 		int alive;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(!fi-&gt;fib_nhs);</div><div class='del'>-		if (nh-&gt;nh_dev != dev || fi == prev_fi)</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(nh-&gt;fib_nh_dev != dev);</div><div class='add'>+		if (fi == prev_fi)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		prev_fi = fi;</div><div class='ctx'> 		alive = 0;</div><div class='ctx'> 		change_nexthops(fi) {</div><div class='del'>-			if (!(nexthop_nh-&gt;nh_flags &amp; nh_flags)) {</div><div class='add'>+			if (!(nexthop_nh-&gt;fib_nh_flags &amp; nh_flags)) {</div><div class='ctx'> 				alive++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (!nexthop_nh-&gt;nh_dev ||</div><div class='del'>-			    !(nexthop_nh-&gt;nh_dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			if (!nexthop_nh-&gt;fib_nh_dev ||</div><div class='add'>+			    !(nexthop_nh-&gt;fib_nh_dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (nexthop_nh-&gt;nh_dev != dev ||</div><div class='add'>+			if (nexthop_nh-&gt;fib_nh_dev != dev ||</div><div class='ctx'> 			    !__in_dev_get_rtnl(dev))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			alive++;</div><div class='del'>-			nexthop_nh-&gt;nh_flags &amp;= ~nh_flags;</div><div class='add'>+			nexthop_nh-&gt;fib_nh_flags &amp;= ~nh_flags;</div><div class='ctx'> 			call_fib_nh_notifiers(nexthop_nh, FIB_EVENT_NH_ADD);</div><div class='ctx'> 		} endfor_nexthops(fi)</div><div class='ctx'> </div><div class='hunk'>@@ -1686,43 +2140,74 @@ static bool fib_good_nh(const struct fib_nh *nh)</div><div class='ctx'> {</div><div class='ctx'> 	int state = NUD_REACHABLE;</div><div class='ctx'> </div><div class='del'>-	if (nh-&gt;nh_scope == RT_SCOPE_LINK) {</div><div class='add'>+	if (nh-&gt;fib_nh_scope == RT_SCOPE_LINK) {</div><div class='ctx'> 		struct neighbour *n;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock_bh();</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-		n = __ipv4_neigh_lookup_noref(nh-&gt;nh_dev,</div><div class='del'>-					      (__force u32)nh-&gt;nh_gw);</div><div class='add'>+		if (likely(nh-&gt;fib_nh_gw_family == AF_INET))</div><div class='add'>+			n = __ipv4_neigh_lookup_noref(nh-&gt;fib_nh_dev,</div><div class='add'>+						   (__force u32)nh-&gt;fib_nh_gw4);</div><div class='add'>+		else if (nh-&gt;fib_nh_gw_family == AF_INET6)</div><div class='add'>+			n = __ipv6_neigh_lookup_noref_stub(nh-&gt;fib_nh_dev,</div><div class='add'>+							   &amp;nh-&gt;fib_nh_gw6);</div><div class='add'>+		else</div><div class='add'>+			n = NULL;</div><div class='ctx'> 		if (n)</div><div class='del'>-			state = n-&gt;nud_state;</div><div class='add'>+			state = READ_ONCE(n-&gt;nud_state);</div><div class='ctx'> </div><div class='del'>-		rcu_read_unlock_bh();</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return !!(state &amp; NUD_VALID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fib_select_multipath(struct fib_result *res, int hash)</div><div class='add'>+void fib_select_multipath(struct fib_result *res, int hash,</div><div class='add'>+			  const struct flowi4 *fl4)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_info *fi = res-&gt;fi;</div><div class='ctx'> 	struct net *net = fi-&gt;fib_net;</div><div class='del'>-	bool first = false;</div><div class='add'>+	bool found = false;</div><div class='add'>+	bool use_neigh;</div><div class='add'>+	__be32 saddr;</div><div class='ctx'> </div><div class='del'>-	for_nexthops(fi) {</div><div class='del'>-		if (net-&gt;ipv4.sysctl_fib_multipath_use_neigh) {</div><div class='del'>-			if (!fib_good_nh(nh))</div><div class='del'>-				continue;</div><div class='del'>-			if (!first) {</div><div class='del'>-				res-&gt;nh_sel = nhsel;</div><div class='del'>-				first = true;</div><div class='del'>-			}</div><div class='add'>+	if (unlikely(res-&gt;fi-&gt;nh)) {</div><div class='add'>+		nexthop_path_fib_result(res, hash);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	use_neigh = READ_ONCE(net-&gt;ipv4.sysctl_fib_multipath_use_neigh);</div><div class='add'>+	saddr = fl4 ? fl4-&gt;saddr : 0;</div><div class='add'>+</div><div class='add'>+	change_nexthops(fi) {</div><div class='add'>+		int nh_upper_bound;</div><div class='add'>+</div><div class='add'>+		/* Nexthops without a carrier are assigned an upper bound of</div><div class='add'>+		 * minus one when "ignore_routes_with_linkdown" is set.</div><div class='add'>+		 */</div><div class='add'>+		nh_upper_bound = atomic_read(&amp;nexthop_nh-&gt;fib_nh_upper_bound);</div><div class='add'>+		if (nh_upper_bound == -1 ||</div><div class='add'>+		    (use_neigh &amp;&amp; !fib_good_nh(nexthop_nh)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!found) {</div><div class='add'>+			res-&gt;nh_sel = nhsel;</div><div class='add'>+			res-&gt;nhc = &amp;nexthop_nh-&gt;nh_common;</div><div class='add'>+			found = !saddr || nexthop_nh-&gt;nh_saddr == saddr;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (hash &gt; atomic_read(&amp;nh-&gt;nh_upper_bound))</div><div class='add'>+		if (hash &gt; nh_upper_bound)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		res-&gt;nh_sel = nhsel;</div><div class='del'>-		return;</div><div class='add'>+		if (!saddr || nexthop_nh-&gt;nh_saddr == saddr) {</div><div class='add'>+			res-&gt;nh_sel = nhsel;</div><div class='add'>+			res-&gt;nhc = &amp;nexthop_nh-&gt;nh_common;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (found)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 	} endfor_nexthops(fi);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1730,14 +2215,14 @@ void fib_select_multipath(struct fib_result *res, int hash)</div><div class='ctx'> void fib_select_path(struct net *net, struct fib_result *res,</div><div class='ctx'> 		     struct flowi4 *fl4, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (fl4-&gt;flowi4_oif &amp;&amp; !(fl4-&gt;flowi4_flags &amp; FLOWI_FLAG_SKIP_NH_OIF))</div><div class='add'>+	if (fl4-&gt;flowi4_oif)</div><div class='ctx'> 		goto check_saddr;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	if (res-&gt;fi-&gt;fib_nhs &gt; 1) {</div><div class='add'>+	if (fib_info_num_path(res-&gt;fi) &gt; 1) {</div><div class='ctx'> 		int h = fib_multipath_hash(net, fl4, skb, NULL);</div><div class='ctx'> </div><div class='del'>-		fib_select_multipath(res, h);</div><div class='add'>+		fib_select_multipath(res, h, fl4);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1747,6 +2232,34 @@ void fib_select_path(struct net *net, struct fib_result *res,</div><div class='ctx'> 		fib_select_default(fl4, res);</div><div class='ctx'> </div><div class='ctx'> check_saddr:</div><div class='del'>-	if (!fl4-&gt;saddr)</div><div class='del'>-		fl4-&gt;saddr = FIB_RES_PREFSRC(net, *res);</div><div class='add'>+	if (!fl4-&gt;saddr) {</div><div class='add'>+		struct net_device *l3mdev;</div><div class='add'>+</div><div class='add'>+		l3mdev = dev_get_by_index_rcu(net, fl4-&gt;flowi4_l3mdev);</div><div class='add'>+</div><div class='add'>+		if (!l3mdev ||</div><div class='add'>+		    l3mdev_master_dev_rcu(FIB_RES_DEV(*res)) == l3mdev)</div><div class='add'>+			fl4-&gt;saddr = fib_result_prefsrc(net, res);</div><div class='add'>+		else</div><div class='add'>+			fl4-&gt;saddr = inet_select_addr(l3mdev, 0, RT_SCOPE_LINK);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __net_init fib4_semantics_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	unsigned int hash_bits = 4;</div><div class='add'>+</div><div class='add'>+	net-&gt;ipv4.fib_info_hash = fib_info_hash_alloc(hash_bits);</div><div class='add'>+	if (!net-&gt;ipv4.fib_info_hash)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	net-&gt;ipv4.fib_info_hash_bits = hash_bits;</div><div class='add'>+	net-&gt;ipv4.fib_info_cnt = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __net_exit fib4_semantics_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	fib_info_hash_free(net-&gt;ipv4.fib_info_hash);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c<br/>index 5bc0c89e81e4..59a6f0a9638f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_trie.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fib_trie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fib_trie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fib_trie.c</a></div><div class='hunk'>@@ -1,8 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *   This program is free software; you can redistribute it and/or</div><div class='del'>- *   modify it under the terms of the GNU General Public License</div><div class='del'>- *   as published by the Free Software Foundation; either version</div><div class='del'>- *   2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  *   Robert Olsson &lt;robert.olsson@its.uu.se&gt; Uppsala Universitet</div><div class='ctx'>  *     &amp; Swedish University of Agricultural Sciences.</div><div class='hunk'>@@ -16,30 +13,21 @@</div><div class='ctx'>  *</div><div class='ctx'>  * An experimental study of compression methods for dynamic tries</div><div class='ctx'>  * Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.</div><div class='del'>- * http://www.csc.kth.se/~snilsson/software/dyntrie2/</div><div class='del'>- *</div><div class='add'>+ * https://www.csc.kth.se/~snilsson/software/dyntrie2/</div><div class='ctx'>  *</div><div class='ctx'>  * IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson</div><div class='ctx'>  * IEEE Journal on Selected Areas in Communications, 17(6):1083-1092, June 1999</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * Code from fib_hash has been reused which includes the following header:</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='ctx'>  *		interface as the means of communication with the user level.</div><div class='ctx'>  *</div><div class='ctx'>  *		IPv4 FIB: lookup engine and maintenance routines.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Substantial contributions to this work comes from:</div><div class='ctx'>  *</div><div class='ctx'>  *		David S. Miller, &lt;davem@davemloft.net&gt;</div><div class='hunk'>@@ -47,9 +35,6 @@</div><div class='ctx'>  *		Paul E. McKenney &lt;paulmck@us.ibm.com&gt;</div><div class='ctx'>  *		Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#define VERSION "0.409"</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -67,6 +52,7 @@</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate_wait.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -76,6 +62,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -86,19 +73,21 @@</div><div class='ctx'> #include &lt;trace/events/fib.h&gt;</div><div class='ctx'> #include "fib_lookup.h"</div><div class='ctx'> </div><div class='del'>-static int call_fib_entry_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+static int call_fib_entry_notifier(struct notifier_block *nb,</div><div class='ctx'> 				   enum fib_event_type event_type, u32 dst,</div><div class='del'>-				   int dst_len, struct fib_alias *fa)</div><div class='add'>+				   int dst_len, struct fib_alias *fa,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_entry_notifier_info info = {</div><div class='add'>+		.info.extack = extack,</div><div class='ctx'> 		.dst = dst,</div><div class='ctx'> 		.dst_len = dst_len,</div><div class='ctx'> 		.fi = fa-&gt;fa_info,</div><div class='del'>-		.tos = fa-&gt;fa_tos,</div><div class='add'>+		.dscp = fa-&gt;fa_dscp,</div><div class='ctx'> 		.type = fa-&gt;fa_type,</div><div class='ctx'> 		.tb_id = fa-&gt;tb_id,</div><div class='ctx'> 	};</div><div class='del'>-	return call_fib4_notifier(nb, net, event_type, &amp;info.info);</div><div class='add'>+	return call_fib4_notifier(nb, event_type, &amp;info.info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int call_fib_entry_notifiers(struct net *net,</div><div class='hunk'>@@ -111,7 +100,7 @@ static int call_fib_entry_notifiers(struct net *net,</div><div class='ctx'> 		.dst = dst,</div><div class='ctx'> 		.dst_len = dst_len,</div><div class='ctx'> 		.fi = fa-&gt;fa_info,</div><div class='del'>-		.tos = fa-&gt;fa_tos,</div><div class='add'>+		.dscp = fa-&gt;fa_dscp,</div><div class='ctx'> 		.type = fa-&gt;fa_type,</div><div class='ctx'> 		.tb_id = fa-&gt;tb_id,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -138,7 +127,7 @@ struct key_vector {</div><div class='ctx'> 		/* This list pointer if valid if (pos | bits) == 0 (LEAF) */</div><div class='ctx'> 		struct hlist_head leaf;</div><div class='ctx'> 		/* This array is valid if (pos | bits) &gt; 0 (TNODE) */</div><div class='del'>-		struct key_vector __rcu *tnode[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct key_vector __rcu *, tnode);</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -183,14 +172,16 @@ struct trie {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct key_vector *resize(struct trie *t, struct key_vector *tn);</div><div class='del'>-static size_t tnode_free_size;</div><div class='add'>+static unsigned int tnode_free_size;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * synchronize_rcu after call_rcu for that many pages; it should be especially</div><div class='del'>- * useful before resizing the root node with PREEMPT_NONE configs; the value was</div><div class='del'>- * obtained experimentally, aiming to avoid visible slowdown.</div><div class='add'>+ * synchronize_rcu after call_rcu for outstanding dirty memory; it should be</div><div class='add'>+ * especially useful before resizing the root node with PREEMPT_NONE configs;</div><div class='add'>+ * the value was obtained experimentally, aiming to avoid visible slowdown.</div><div class='ctx'>  */</div><div class='del'>-static const int sync_pages = 128;</div><div class='add'>+unsigned int sysctl_fib_sync_mem = 512 * 1024;</div><div class='add'>+unsigned int sysctl_fib_sync_mem_min = 64 * 1024;</div><div class='add'>+unsigned int sysctl_fib_sync_mem_max = 64 * 1024 * 1024;</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *fn_alias_kmem __ro_after_init;</div><div class='ctx'> static struct kmem_cache *trie_leaf_kmem __ro_after_init;</div><div class='hunk'>@@ -301,19 +292,11 @@ static const int inflate_threshold = 50;</div><div class='ctx'> static const int halve_threshold_root = 15;</div><div class='ctx'> static const int inflate_threshold_root = 30;</div><div class='ctx'> </div><div class='del'>-static void __alias_free_mem(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct fib_alias *fa = container_of(head, struct fib_alias, rcu);</div><div class='del'>-	kmem_cache_free(fn_alias_kmem, fa);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void alias_free_mem_rcu(struct fib_alias *fa)</div><div class='ctx'> {</div><div class='del'>-	call_rcu(&amp;fa-&gt;rcu, __alias_free_mem);</div><div class='add'>+	kfree_rcu(fa, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TNODE_KMALLOC_MAX \</div><div class='del'>-	ilog2((PAGE_SIZE - TNODE_SIZE(0)) / sizeof(struct key_vector *))</div><div class='ctx'> #define TNODE_VMALLOC_MAX \</div><div class='ctx'> 	ilog2((SIZE_MAX - TNODE_SIZE(0)) / sizeof(struct key_vector *))</div><div class='ctx'> </div><div class='hunk'>@@ -348,12 +331,18 @@ static struct tnode *tnode_alloc(int bits)</div><div class='ctx'> </div><div class='ctx'> static inline void empty_child_inc(struct key_vector *n)</div><div class='ctx'> {</div><div class='del'>-	++tn_info(n)-&gt;empty_children ? : ++tn_info(n)-&gt;full_children;</div><div class='add'>+	tn_info(n)-&gt;empty_children++;</div><div class='add'>+</div><div class='add'>+	if (!tn_info(n)-&gt;empty_children)</div><div class='add'>+		tn_info(n)-&gt;full_children++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void empty_child_dec(struct key_vector *n)</div><div class='ctx'> {</div><div class='del'>-	tn_info(n)-&gt;empty_children-- ? : tn_info(n)-&gt;full_children--;</div><div class='add'>+	if (!tn_info(n)-&gt;empty_children)</div><div class='add'>+		tn_info(n)-&gt;full_children--;</div><div class='add'>+</div><div class='add'>+	tn_info(n)-&gt;empty_children--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct key_vector *leaf_new(t_key key, struct fib_alias *fa)</div><div class='hunk'>@@ -504,9 +493,9 @@ static void tnode_free(struct key_vector *tn)</div><div class='ctx'> 		tn = container_of(head, struct tnode, rcu)-&gt;kv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tnode_free_size &gt;= PAGE_SIZE * sync_pages) {</div><div class='add'>+	if (tnode_free_size &gt;= READ_ONCE(sysctl_fib_sync_mem)) {</div><div class='ctx'> 		tnode_free_size = 0;</div><div class='del'>-		synchronize_rcu();</div><div class='add'>+		synchronize_net();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -980,11 +969,14 @@ static struct key_vector *fib_find_node(struct trie *t,</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return the first fib alias matching TOS with</div><div class='add'>+/* Return the first fib alias matching DSCP with</div><div class='ctx'>  * priority less than or equal to PRIO.</div><div class='add'>+ * If 'find_first' is set, return the first matching</div><div class='add'>+ * fib alias, regardless of DSCP and priority.</div><div class='ctx'>  */</div><div class='ctx'> static struct fib_alias *fib_find_alias(struct hlist_head *fah, u8 slen,</div><div class='del'>-					u8 tos, u32 prio, u32 tb_id)</div><div class='add'>+					dscp_t dscp, u32 prio, u32 tb_id,</div><div class='add'>+					bool find_first)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_alias *fa;</div><div class='ctx'> </div><div class='hunk'>@@ -992,6 +984,10 @@ static struct fib_alias *fib_find_alias(struct hlist_head *fah, u8 slen,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(fa, fah, fa_list) {</div><div class='add'>+		/* Avoid Sparse warning when using dscp_t in inequalities */</div><div class='add'>+		u8 __fa_dscp = inet_dscp_to_dsfield(fa-&gt;fa_dscp);</div><div class='add'>+		u8 __dscp = inet_dscp_to_dsfield(dscp);</div><div class='add'>+</div><div class='ctx'> 		if (fa-&gt;fa_slen &lt; slen)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fa-&gt;fa_slen != slen)</div><div class='hunk'>@@ -1000,15 +996,105 @@ static struct fib_alias *fib_find_alias(struct hlist_head *fah, u8 slen,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fa-&gt;tb_id != tb_id)</div><div class='ctx'> 			break;</div><div class='del'>-		if (fa-&gt;fa_tos &gt; tos)</div><div class='add'>+		if (find_first)</div><div class='add'>+			return fa;</div><div class='add'>+		if (__fa_dscp &gt; __dscp)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (fa-&gt;fa_info-&gt;fib_priority &gt;= prio || fa-&gt;fa_tos &lt; tos)</div><div class='add'>+		if (fa-&gt;fa_info-&gt;fib_priority &gt;= prio || __fa_dscp &lt; __dscp)</div><div class='ctx'> 			return fa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct fib_alias *</div><div class='add'>+fib_find_matching_alias(struct net *net, const struct fib_rt_info *fri)</div><div class='add'>+{</div><div class='add'>+	u8 slen = KEYLENGTH - fri-&gt;dst_len;</div><div class='add'>+	struct key_vector *l, *tp;</div><div class='add'>+	struct fib_table *tb;</div><div class='add'>+	struct fib_alias *fa;</div><div class='add'>+	struct trie *t;</div><div class='add'>+</div><div class='add'>+	tb = fib_get_table(net, fri-&gt;tb_id);</div><div class='add'>+	if (!tb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	t = (struct trie *)tb-&gt;tb_data;</div><div class='add'>+	l = fib_find_node(t, &amp;tp, be32_to_cpu(fri-&gt;dst));</div><div class='add'>+	if (!l)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='add'>+		if (fa-&gt;fa_slen == slen &amp;&amp; fa-&gt;tb_id == fri-&gt;tb_id &amp;&amp;</div><div class='add'>+		    fa-&gt;fa_dscp == fri-&gt;dscp &amp;&amp; fa-&gt;fa_info == fri-&gt;fi &amp;&amp;</div><div class='add'>+		    fa-&gt;fa_type == fri-&gt;type)</div><div class='add'>+			return fa;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib_alias_hw_flags_set(struct net *net, const struct fib_rt_info *fri)</div><div class='add'>+{</div><div class='add'>+	u8 fib_notify_on_flag_change;</div><div class='add'>+	struct fib_alias *fa_match;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	fa_match = fib_find_matching_alias(net, fri);</div><div class='add'>+	if (!fa_match)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* These are paired with the WRITE_ONCE() happening in this function.</div><div class='add'>+	 * The reason is that we are only protected by RCU at this point.</div><div class='add'>+	 */</div><div class='add'>+	if (READ_ONCE(fa_match-&gt;offload) == fri-&gt;offload &amp;&amp;</div><div class='add'>+	    READ_ONCE(fa_match-&gt;trap) == fri-&gt;trap &amp;&amp;</div><div class='add'>+	    READ_ONCE(fa_match-&gt;offload_failed) == fri-&gt;offload_failed)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(fa_match-&gt;offload, fri-&gt;offload);</div><div class='add'>+	WRITE_ONCE(fa_match-&gt;trap, fri-&gt;trap);</div><div class='add'>+</div><div class='add'>+	fib_notify_on_flag_change = READ_ONCE(net-&gt;ipv4.sysctl_fib_notify_on_flag_change);</div><div class='add'>+</div><div class='add'>+	/* 2 means send notifications only if offload_failed was changed. */</div><div class='add'>+	if (fib_notify_on_flag_change == 2 &amp;&amp;</div><div class='add'>+	    READ_ONCE(fa_match-&gt;offload_failed) == fri-&gt;offload_failed)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(fa_match-&gt;offload_failed, fri-&gt;offload_failed);</div><div class='add'>+</div><div class='add'>+	if (!fib_notify_on_flag_change)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(fib_nlmsg_size(fa_match-&gt;fa_info), GFP_ATOMIC);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fib_dump_info(skb, 0, 0, RTM_NEWROUTE, fri, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* -EMSGSIZE implies BUG in fib_nlmsg_size() */</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_IPV4_ROUTE, NULL, GFP_ATOMIC);</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV4_ROUTE, err);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib_alias_hw_flags_set);</div><div class='add'>+</div><div class='ctx'> static void trie_rebalance(struct trie *t, struct key_vector *tn)</div><div class='ctx'> {</div><div class='ctx'> 	while (!IS_TRIE(tn))</div><div class='hunk'>@@ -1065,9 +1151,6 @@ noleaf:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* fib notifier for ADD is sent before calling fib_insert_alias with</div><div class='del'>- * the expectation that the only possible failure ENOMEM</div><div class='del'>- */</div><div class='ctx'> static int fib_insert_alias(struct trie *t, struct key_vector *tp,</div><div class='ctx'> 			    struct key_vector *l, struct fib_alias *new,</div><div class='ctx'> 			    struct fib_alias *fa, t_key key)</div><div class='hunk'>@@ -1104,27 +1187,13 @@ static int fib_insert_alias(struct trie *t, struct key_vector *tp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fib_valid_key_len(u32 key, u8 plen, struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	if (plen &gt; KEYLENGTH) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Invalid prefix length");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((plen &lt; KEYLENGTH) &amp;&amp; (key &lt;&lt; plen)) {</div><div class='del'>-		NL_SET_ERR_MSG(extack,</div><div class='del'>-			       "Invalid prefix for given prefix length");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='add'>+static void fib_remove_alias(struct trie *t, struct key_vector *tp,</div><div class='add'>+			     struct key_vector *l, struct fib_alias *old);</div><div class='ctx'> </div><div class='ctx'> /* Caller must hold RTNL. */</div><div class='ctx'> int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		     struct fib_config *cfg, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	enum fib_event_type event = FIB_EVENT_ENTRY_ADD;</div><div class='ctx'> 	struct trie *t = (struct trie *)tb-&gt;tb_data;</div><div class='ctx'> 	struct fib_alias *fa, *new_fa;</div><div class='ctx'> 	struct key_vector *l, *tp;</div><div class='hunk'>@@ -1132,15 +1201,12 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 	struct fib_info *fi;</div><div class='ctx'> 	u8 plen = cfg-&gt;fc_dst_len;</div><div class='ctx'> 	u8 slen = KEYLENGTH - plen;</div><div class='del'>-	u8 tos = cfg-&gt;fc_tos;</div><div class='add'>+	dscp_t dscp;</div><div class='ctx'> 	u32 key;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	key = ntohl(cfg-&gt;fc_dst);</div><div class='ctx'> </div><div class='del'>-	if (!fib_valid_key_len(key, plen, extack))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	pr_debug("Insert table=%u %08x/%d\n", tb-&gt;tb_id, key, plen);</div><div class='ctx'> </div><div class='ctx'> 	fi = fib_create_info(cfg, extack);</div><div class='hunk'>@@ -1149,12 +1215,13 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dscp = cfg-&gt;fc_dscp;</div><div class='ctx'> 	l = fib_find_node(t, &amp;tp, key);</div><div class='del'>-	fa = l ? fib_find_alias(&amp;l-&gt;leaf, slen, tos, fi-&gt;fib_priority,</div><div class='del'>-				tb-&gt;tb_id) : NULL;</div><div class='add'>+	fa = l ? fib_find_alias(&amp;l-&gt;leaf, slen, dscp, fi-&gt;fib_priority,</div><div class='add'>+				tb-&gt;tb_id, false) : NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Now fa, if non-NULL, points to the first fib alias</div><div class='del'>-	 * with the same keys [prefix,tos,priority], if such key already</div><div class='add'>+	 * with the same keys [prefix,dscp,priority], if such key already</div><div class='ctx'> 	 * exists or to the node before which we will insert new one.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If fa is NULL, we will need to allocate a new one and</div><div class='hunk'>@@ -1162,7 +1229,7 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 	 * of the new alias.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (fa &amp;&amp; fa-&gt;fa_tos == tos &amp;&amp;</div><div class='add'>+	if (fa &amp;&amp; fa-&gt;fa_dscp == dscp &amp;&amp;</div><div class='ctx'> 	    fa-&gt;fa_info-&gt;fib_priority == fi-&gt;fib_priority) {</div><div class='ctx'> 		struct fib_alias *fa_first, *fa_match;</div><div class='ctx'> </div><div class='hunk'>@@ -1182,7 +1249,7 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		hlist_for_each_entry_from(fa, fa_list) {</div><div class='ctx'> 			if ((fa-&gt;fa_slen != slen) ||</div><div class='ctx'> 			    (fa-&gt;tb_id != tb-&gt;tb_id) ||</div><div class='del'>-			    (fa-&gt;fa_tos != tos))</div><div class='add'>+			    (fa-&gt;fa_dscp != dscp))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (fa-&gt;fa_info-&gt;fib_priority != fi-&gt;fib_priority)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1210,7 +1277,7 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			fi_drop = fa-&gt;fa_info;</div><div class='del'>-			new_fa-&gt;fa_tos = fa-&gt;fa_tos;</div><div class='add'>+			new_fa-&gt;fa_dscp = fa-&gt;fa_dscp;</div><div class='ctx'> 			new_fa-&gt;fa_info = fi;</div><div class='ctx'> 			new_fa-&gt;fa_type = cfg-&gt;fc_type;</div><div class='ctx'> 			state = fa-&gt;fa_state;</div><div class='hunk'>@@ -1218,19 +1285,30 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 			new_fa-&gt;fa_slen = fa-&gt;fa_slen;</div><div class='ctx'> 			new_fa-&gt;tb_id = tb-&gt;tb_id;</div><div class='ctx'> 			new_fa-&gt;fa_default = -1;</div><div class='add'>+			new_fa-&gt;offload = 0;</div><div class='add'>+			new_fa-&gt;trap = 0;</div><div class='add'>+			new_fa-&gt;offload_failed = 0;</div><div class='ctx'> </div><div class='del'>-			err = call_fib_entry_notifiers(net,</div><div class='del'>-						       FIB_EVENT_ENTRY_REPLACE,</div><div class='del'>-						       key, plen, new_fa,</div><div class='del'>-						       extack);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out_free_new_fa;</div><div class='add'>+			hlist_replace_rcu(&amp;fa-&gt;fa_list, &amp;new_fa-&gt;fa_list);</div><div class='add'>+</div><div class='add'>+			if (fib_find_alias(&amp;l-&gt;leaf, fa-&gt;fa_slen, 0, 0,</div><div class='add'>+					   tb-&gt;tb_id, true) == new_fa) {</div><div class='add'>+				enum fib_event_type fib_event;</div><div class='add'>+</div><div class='add'>+				fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+				err = call_fib_entry_notifiers(net, fib_event,</div><div class='add'>+							       key, plen,</div><div class='add'>+							       new_fa, extack);</div><div class='add'>+				if (err) {</div><div class='add'>+					hlist_replace_rcu(&amp;new_fa-&gt;fa_list,</div><div class='add'>+							  &amp;fa-&gt;fa_list);</div><div class='add'>+					goto out_free_new_fa;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen,</div><div class='ctx'> 				  tb-&gt;tb_id, &amp;cfg-&gt;fc_nlinfo, nlflags);</div><div class='ctx'> </div><div class='del'>-			hlist_replace_rcu(&amp;fa-&gt;fa_list, &amp;new_fa-&gt;fa_list);</div><div class='del'>-</div><div class='ctx'> 			alias_free_mem_rcu(fa);</div><div class='ctx'> </div><div class='ctx'> 			fib_release_info(fi_drop);</div><div class='hunk'>@@ -1246,12 +1324,10 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		if (fa_match)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (cfg-&gt;fc_nlflags &amp; NLM_F_APPEND) {</div><div class='del'>-			event = FIB_EVENT_ENTRY_APPEND;</div><div class='add'>+		if (cfg-&gt;fc_nlflags &amp; NLM_F_APPEND)</div><div class='ctx'> 			nlflags |= NLM_F_APPEND;</div><div class='del'>-		} else {</div><div class='add'>+		else</div><div class='ctx'> 			fa = fa_first;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = -ENOENT;</div><div class='ctx'> 	if (!(cfg-&gt;fc_nlflags &amp; NLM_F_CREATE))</div><div class='hunk'>@@ -1264,21 +1340,38 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	new_fa-&gt;fa_info = fi;</div><div class='del'>-	new_fa-&gt;fa_tos = tos;</div><div class='add'>+	new_fa-&gt;fa_dscp = dscp;</div><div class='ctx'> 	new_fa-&gt;fa_type = cfg-&gt;fc_type;</div><div class='ctx'> 	new_fa-&gt;fa_state = 0;</div><div class='ctx'> 	new_fa-&gt;fa_slen = slen;</div><div class='ctx'> 	new_fa-&gt;tb_id = tb-&gt;tb_id;</div><div class='ctx'> 	new_fa-&gt;fa_default = -1;</div><div class='del'>-</div><div class='del'>-	err = call_fib_entry_notifiers(net, event, key, plen, new_fa, extack);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_new_fa;</div><div class='add'>+	new_fa-&gt;offload = 0;</div><div class='add'>+	new_fa-&gt;trap = 0;</div><div class='add'>+	new_fa-&gt;offload_failed = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Insert new entry to the list. */</div><div class='ctx'> 	err = fib_insert_alias(t, tp, l, new_fa, fa, key);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_fib_notif;</div><div class='add'>+		goto out_free_new_fa;</div><div class='add'>+</div><div class='add'>+	/* The alias was already inserted, so the node must exist. */</div><div class='add'>+	l = l ? l : fib_find_node(t, &amp;tp, key);</div><div class='add'>+	if (WARN_ON_ONCE(!l)) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out_free_new_fa;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fib_find_alias(&amp;l-&gt;leaf, new_fa-&gt;fa_slen, 0, 0, tb-&gt;tb_id, true) ==</div><div class='add'>+	    new_fa) {</div><div class='add'>+		enum fib_event_type fib_event;</div><div class='add'>+</div><div class='add'>+		fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+		err = call_fib_entry_notifiers(net, fib_event, key, plen,</div><div class='add'>+					       new_fa, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_remove_new_fa;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!plen)</div><div class='ctx'> 		tb-&gt;tb_num_default++;</div><div class='hunk'>@@ -1289,14 +1382,8 @@ int fib_table_insert(struct net *net, struct fib_table *tb,</div><div class='ctx'> succeeded:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_fib_notif:</div><div class='del'>-	/* notifier was sent that entry would be added to trie, but</div><div class='del'>-	 * the add failed and need to recover. Only failure for</div><div class='del'>-	 * fib_insert_alias is ENOMEM.</div><div class='del'>-	 */</div><div class='del'>-	NL_SET_ERR_MSG(extack, "Failed to insert route into trie");</div><div class='del'>-	call_fib_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, key,</div><div class='del'>-				 plen, new_fa, NULL);</div><div class='add'>+out_remove_new_fa:</div><div class='add'>+	fib_remove_alias(t, tp, l, new_fa);</div><div class='ctx'> out_free_new_fa:</div><div class='ctx'> 	kmem_cache_free(fn_alias_kmem, new_fa);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1312,6 +1399,23 @@ static inline t_key prefix_mismatch(t_key key, struct key_vector *n)</div><div class='ctx'> 	return (key ^ prefix) &amp; (prefix | -prefix);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool fib_lookup_good_nhc(const struct fib_nh_common *nhc, int fib_flags,</div><div class='add'>+			 const struct flowi4 *flp)</div><div class='add'>+{</div><div class='add'>+	if (nhc-&gt;nhc_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ip_ignore_linkdown(nhc-&gt;nhc_dev) &amp;&amp;</div><div class='add'>+	    nhc-&gt;nhc_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='add'>+	    !(fib_flags &amp; FIB_LOOKUP_IGNORE_LINKSTATE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (flp-&gt;flowi4_oif &amp;&amp; flp-&gt;flowi4_oif != nhc-&gt;nhc_oif)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* should be called with rcu_read_lock */</div><div class='ctx'> int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,</div><div class='ctx'> 		     struct fib_result *res, int fib_flags)</div><div class='hunk'>@@ -1444,21 +1548,24 @@ found:</div><div class='ctx'> 	/* Step 3: Process the leaf, if that fails fall back to backtracing */</div><div class='ctx'> 	hlist_for_each_entry_rcu(fa, &amp;n-&gt;leaf, fa_list) {</div><div class='ctx'> 		struct fib_info *fi = fa-&gt;fa_info;</div><div class='add'>+		struct fib_nh_common *nhc;</div><div class='ctx'> 		int nhsel, err;</div><div class='ctx'> </div><div class='ctx'> 		if ((BITS_PER_LONG &gt; KEYLENGTH) || (fa-&gt;fa_slen &lt; KEYLENGTH)) {</div><div class='ctx'> 			if (index &gt;= (1ul &lt;&lt; fa-&gt;fa_slen))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (fa-&gt;fa_tos &amp;&amp; fa-&gt;fa_tos != flp-&gt;flowi4_tos)</div><div class='add'>+		if (fa-&gt;fa_dscp &amp;&amp; !fib_dscp_masked_match(fa-&gt;fa_dscp, flp))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (fi-&gt;fib_dead)</div><div class='add'>+		/* Paired with WRITE_ONCE() in fib_release_info() */</div><div class='add'>+		if (READ_ONCE(fi-&gt;fib_dead))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fa-&gt;fa_info-&gt;fib_scope &lt; flp-&gt;flowi4_scope)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		fib_alias_accessed(fa);</div><div class='ctx'> 		err = fib_props[fa-&gt;fa_type].error;</div><div class='ctx'> 		if (unlikely(err &lt; 0)) {</div><div class='add'>+out_reject:</div><div class='ctx'> #ifdef CONFIG_IP_FIB_TRIE_STATS</div><div class='ctx'> 			this_cpu_inc(stats-&gt;semantic_match_passed);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1467,42 +1574,48 @@ found:</div><div class='ctx'> 		}</div><div class='ctx'> 		if (fi-&gt;fib_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 			continue;</div><div class='del'>-		for (nhsel = 0; nhsel &lt; fi-&gt;fib_nhs; nhsel++) {</div><div class='del'>-			const struct fib_nh *nh = &amp;fi-&gt;fib_nh[nhsel];</div><div class='del'>-			struct in_device *in_dev = __in_dev_get_rcu(nh-&gt;nh_dev);</div><div class='ctx'> </div><div class='del'>-			if (nh-&gt;nh_flags &amp; RTNH_F_DEAD)</div><div class='del'>-				continue;</div><div class='del'>-			if (in_dev &amp;&amp;</div><div class='del'>-			    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-			    nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='del'>-			    !(fib_flags &amp; FIB_LOOKUP_IGNORE_LINKSTATE))</div><div class='del'>-				continue;</div><div class='del'>-			if (!(flp-&gt;flowi4_flags &amp; FLOWI_FLAG_SKIP_NH_OIF)) {</div><div class='del'>-				if (flp-&gt;flowi4_oif &amp;&amp;</div><div class='del'>-				    flp-&gt;flowi4_oif != nh-&gt;nh_oif)</div><div class='del'>-					continue;</div><div class='add'>+		if (unlikely(fi-&gt;nh)) {</div><div class='add'>+			if (nexthop_is_blackhole(fi-&gt;nh)) {</div><div class='add'>+				err = fib_props[RTN_BLACKHOLE].error;</div><div class='add'>+				goto out_reject;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			nhc = nexthop_get_nhc_lookup(fi-&gt;nh, fib_flags, flp,</div><div class='add'>+						     &amp;nhsel);</div><div class='add'>+			if (nhc)</div><div class='add'>+				goto set_result;</div><div class='add'>+			goto miss;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (nhsel = 0; nhsel &lt; fib_info_num_path(fi); nhsel++) {</div><div class='add'>+			nhc = fib_info_nhc(fi, nhsel);</div><div class='add'>+</div><div class='add'>+			if (!fib_lookup_good_nhc(nhc, fib_flags, flp))</div><div class='add'>+				continue;</div><div class='add'>+set_result:</div><div class='ctx'> 			if (!(fib_flags &amp; FIB_LOOKUP_NOREF))</div><div class='ctx'> 				refcount_inc(&amp;fi-&gt;fib_clntref);</div><div class='ctx'> </div><div class='ctx'> 			res-&gt;prefix = htonl(n-&gt;key);</div><div class='ctx'> 			res-&gt;prefixlen = KEYLENGTH - fa-&gt;fa_slen;</div><div class='ctx'> 			res-&gt;nh_sel = nhsel;</div><div class='add'>+			res-&gt;nhc = nhc;</div><div class='ctx'> 			res-&gt;type = fa-&gt;fa_type;</div><div class='ctx'> 			res-&gt;scope = fi-&gt;fib_scope;</div><div class='add'>+			res-&gt;dscp = fa-&gt;fa_dscp;</div><div class='ctx'> 			res-&gt;fi = fi;</div><div class='ctx'> 			res-&gt;table = tb;</div><div class='ctx'> 			res-&gt;fa_head = &amp;n-&gt;leaf;</div><div class='ctx'> #ifdef CONFIG_IP_FIB_TRIE_STATS</div><div class='ctx'> 			this_cpu_inc(stats-&gt;semantic_match_passed);</div><div class='ctx'> #endif</div><div class='del'>-			trace_fib_table_lookup(tb-&gt;tb_id, flp, nh, err);</div><div class='add'>+			trace_fib_table_lookup(tb-&gt;tb_id, flp, nhc, err);</div><div class='ctx'> </div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+miss:</div><div class='ctx'> #ifdef CONFIG_IP_FIB_TRIE_STATS</div><div class='ctx'> 	this_cpu_inc(stats-&gt;semantic_match_miss);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1541,6 +1654,36 @@ static void fib_remove_alias(struct trie *t, struct key_vector *tp,</div><div class='ctx'> 	node_pull_suffix(tp, fa-&gt;fa_slen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fib_notify_alias_delete(struct net *net, u32 key,</div><div class='add'>+				    struct hlist_head *fah,</div><div class='add'>+				    struct fib_alias *fa_to_delete,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib_alias *fa_next, *fa_to_notify;</div><div class='add'>+	u32 tb_id = fa_to_delete-&gt;tb_id;</div><div class='add'>+	u8 slen = fa_to_delete-&gt;fa_slen;</div><div class='add'>+	enum fib_event_type fib_event;</div><div class='add'>+</div><div class='add'>+	/* Do not notify if we do not care about the route. */</div><div class='add'>+	if (fib_find_alias(fah, slen, 0, 0, tb_id, true) != fa_to_delete)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Determine if the route should be replaced by the next route in the</div><div class='add'>+	 * list.</div><div class='add'>+	 */</div><div class='add'>+	fa_next = hlist_entry_safe(fa_to_delete-&gt;fa_list.next,</div><div class='add'>+				   struct fib_alias, fa_list);</div><div class='add'>+	if (fa_next &amp;&amp; fa_next-&gt;fa_slen == slen &amp;&amp; fa_next-&gt;tb_id == tb_id) {</div><div class='add'>+		fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+		fa_to_notify = fa_next;</div><div class='add'>+	} else {</div><div class='add'>+		fib_event = FIB_EVENT_ENTRY_DEL;</div><div class='add'>+		fa_to_notify = fa_to_delete;</div><div class='add'>+	}</div><div class='add'>+	call_fib_entry_notifiers(net, fib_event, key, KEYLENGTH - slen,</div><div class='add'>+				 fa_to_notify, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Caller must hold RTNL. */</div><div class='ctx'> int fib_table_delete(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		     struct fib_config *cfg, struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -1550,23 +1693,22 @@ int fib_table_delete(struct net *net, struct fib_table *tb,</div><div class='ctx'> 	struct key_vector *l, *tp;</div><div class='ctx'> 	u8 plen = cfg-&gt;fc_dst_len;</div><div class='ctx'> 	u8 slen = KEYLENGTH - plen;</div><div class='del'>-	u8 tos = cfg-&gt;fc_tos;</div><div class='add'>+	dscp_t dscp;</div><div class='ctx'> 	u32 key;</div><div class='ctx'> </div><div class='ctx'> 	key = ntohl(cfg-&gt;fc_dst);</div><div class='ctx'> </div><div class='del'>-	if (!fib_valid_key_len(key, plen, extack))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	l = fib_find_node(t, &amp;tp, key);</div><div class='ctx'> 	if (!l)</div><div class='ctx'> 		return -ESRCH;</div><div class='ctx'> </div><div class='del'>-	fa = fib_find_alias(&amp;l-&gt;leaf, slen, tos, 0, tb-&gt;tb_id);</div><div class='add'>+	dscp = cfg-&gt;fc_dscp;</div><div class='add'>+	fa = fib_find_alias(&amp;l-&gt;leaf, slen, dscp, 0, tb-&gt;tb_id, false);</div><div class='ctx'> 	if (!fa)</div><div class='ctx'> 		return -ESRCH;</div><div class='ctx'> </div><div class='del'>-	pr_debug("Deleting %08x/%d tos=%d t=%p\n", key, plen, tos, t);</div><div class='add'>+	pr_debug("Deleting %08x/%d dsfield=0x%02x t=%p\n", key, plen,</div><div class='add'>+		 inet_dscp_to_dsfield(dscp), t);</div><div class='ctx'> </div><div class='ctx'> 	fa_to_delete = NULL;</div><div class='ctx'> 	hlist_for_each_entry_from(fa, fa_list) {</div><div class='hunk'>@@ -1574,7 +1716,7 @@ int fib_table_delete(struct net *net, struct fib_table *tb,</div><div class='ctx'> </div><div class='ctx'> 		if ((fa-&gt;fa_slen != slen) ||</div><div class='ctx'> 		    (fa-&gt;tb_id != tb-&gt;tb_id) ||</div><div class='del'>-		    (fa-&gt;fa_tos != tos))</div><div class='add'>+		    (fa-&gt;fa_dscp != dscp))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if ((!cfg-&gt;fc_type || fa-&gt;fa_type == cfg-&gt;fc_type) &amp;&amp;</div><div class='hunk'>@@ -1584,7 +1726,7 @@ int fib_table_delete(struct net *net, struct fib_table *tb,</div><div class='ctx'> 		     fi-&gt;fib_prefsrc == cfg-&gt;fc_prefsrc) &amp;&amp;</div><div class='ctx'> 		    (!cfg-&gt;fc_protocol ||</div><div class='ctx'> 		     fi-&gt;fib_protocol == cfg-&gt;fc_protocol) &amp;&amp;</div><div class='del'>-		    fib_nh_match(cfg, fi, extack) == 0 &amp;&amp;</div><div class='add'>+		    fib_nh_match(net, cfg, fi, extack) == 0 &amp;&amp;</div><div class='ctx'> 		    fib_metrics_match(cfg, fi)) {</div><div class='ctx'> 			fa_to_delete = fa;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1594,8 +1736,7 @@ int fib_table_delete(struct net *net, struct fib_table *tb,</div><div class='ctx'> 	if (!fa_to_delete)</div><div class='ctx'> 		return -ESRCH;</div><div class='ctx'> </div><div class='del'>-	call_fib_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, key, plen,</div><div class='del'>-				 fa_to_delete, extack);</div><div class='add'>+	fib_notify_alias_delete(net, key, &amp;l-&gt;leaf, fa_to_delete, extack);</div><div class='ctx'> 	rtmsg_fib(RTM_DELROUTE, htonl(key), fa_to_delete, plen, tb-&gt;tb_id,</div><div class='ctx'> 		  &amp;cfg-&gt;fc_nlinfo, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1749,7 +1890,7 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb)</div><div class='ctx'> 	while ((l = leaf_walk_rcu(&amp;tp, key)) != NULL) {</div><div class='ctx'> 		struct key_vector *local_l = NULL, *local_tp;</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_rcu(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='add'>+		hlist_for_each_entry(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='ctx'> 			struct fib_alias *new_fa;</div><div class='ctx'> </div><div class='ctx'> 			if (local_tb-&gt;tb_id != fa-&gt;tb_id)</div><div class='hunk'>@@ -1856,9 +1997,10 @@ void fib_table_flush_external(struct fib_table *tb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Caller must hold RTNL. */</div><div class='del'>-int fib_table_flush(struct net *net, struct fib_table *tb)</div><div class='add'>+int fib_table_flush(struct net *net, struct fib_table *tb, bool flush_all)</div><div class='ctx'> {</div><div class='ctx'> 	struct trie *t = (struct trie *)tb-&gt;tb_data;</div><div class='add'>+	struct nl_info info = { .nl_net = net };</div><div class='ctx'> 	struct key_vector *pn = t-&gt;kv;</div><div class='ctx'> 	unsigned long cindex = 1;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='hunk'>@@ -1904,16 +2046,26 @@ int fib_table_flush(struct net *net, struct fib_table *tb)</div><div class='ctx'> 		hlist_for_each_entry_safe(fa, tmp, &amp;n-&gt;leaf, fa_list) {</div><div class='ctx'> 			struct fib_info *fi = fa-&gt;fa_info;</div><div class='ctx'> </div><div class='del'>-			if (!fi || !(fi-&gt;fib_flags &amp; RTNH_F_DEAD) ||</div><div class='del'>-			    tb-&gt;tb_id != fa-&gt;tb_id) {</div><div class='add'>+			if (!fi || tb-&gt;tb_id != fa-&gt;tb_id ||</div><div class='add'>+			    (!(fi-&gt;fib_flags &amp; RTNH_F_DEAD) &amp;&amp;</div><div class='add'>+			     !fib_props[fa-&gt;fa_type].error)) {</div><div class='ctx'> 				slen = fa-&gt;fa_slen;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			call_fib_entry_notifiers(net, FIB_EVENT_ENTRY_DEL,</div><div class='del'>-						 n-&gt;key,</div><div class='del'>-						 KEYLENGTH - fa-&gt;fa_slen, fa,</div><div class='del'>-						 NULL);</div><div class='add'>+			/* Do not flush error routes if network namespace is</div><div class='add'>+			 * not being dismantled</div><div class='add'>+			 */</div><div class='add'>+			if (!flush_all &amp;&amp; fib_props[fa-&gt;fa_type].error) {</div><div class='add'>+				slen = fa-&gt;fa_slen;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fib_notify_alias_delete(net, n-&gt;key, &amp;n-&gt;leaf, fa,</div><div class='add'>+						NULL);</div><div class='add'>+			if (fi-&gt;pfsrc_removed)</div><div class='add'>+				rtmsg_fib(RTM_DELROUTE, htonl(n-&gt;key), fa,</div><div class='add'>+					  KEYLENGTH - fa-&gt;fa_slen, tb-&gt;tb_id, &amp;info, 0);</div><div class='ctx'> 			hlist_del_rcu(&amp;fa-&gt;fa_list);</div><div class='ctx'> 			fib_release_info(fa-&gt;fa_info);</div><div class='ctx'> 			alias_free_mem_rcu(fa);</div><div class='hunk'>@@ -1933,10 +2085,76 @@ int fib_table_flush(struct net *net, struct fib_table *tb)</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib_leaf_notify(struct net *net, struct key_vector *l,</div><div class='del'>-			    struct fib_table *tb, struct notifier_block *nb)</div><div class='add'>+/* derived from fib_trie_free */</div><div class='add'>+static void __fib_info_notify_update(struct net *net, struct fib_table *tb,</div><div class='add'>+				     struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct trie *t = (struct trie *)tb-&gt;tb_data;</div><div class='add'>+	struct key_vector *pn = t-&gt;kv;</div><div class='add'>+	unsigned long cindex = 1;</div><div class='add'>+	struct fib_alias *fa;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct key_vector *n;</div><div class='add'>+</div><div class='add'>+		if (!(cindex--)) {</div><div class='add'>+			t_key pkey = pn-&gt;key;</div><div class='add'>+</div><div class='add'>+			if (IS_TRIE(pn))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			pn = node_parent(pn);</div><div class='add'>+			cindex = get_index(pkey, pn);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* grab the next available node */</div><div class='add'>+		n = get_child(pn, cindex);</div><div class='add'>+		if (!n)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (IS_TNODE(n)) {</div><div class='add'>+			/* record pn and cindex for leaf walking */</div><div class='add'>+			pn = n;</div><div class='add'>+			cindex = 1ul &lt;&lt; n-&gt;bits;</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry(fa, &amp;n-&gt;leaf, fa_list) {</div><div class='add'>+			struct fib_info *fi = fa-&gt;fa_info;</div><div class='add'>+</div><div class='add'>+			if (!fi || !fi-&gt;nh_updated || fa-&gt;tb_id != tb-&gt;tb_id)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rtmsg_fib(RTM_NEWROUTE, htonl(n-&gt;key), fa,</div><div class='add'>+				  KEYLENGTH - fa-&gt;fa_slen, tb-&gt;tb_id,</div><div class='add'>+				  info, NLM_F_REPLACE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib_info_notify_update(struct net *net, struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned int h;</div><div class='add'>+</div><div class='add'>+	for (h = 0; h &lt; FIB_TABLE_HASHSZ; h++) {</div><div class='add'>+		struct hlist_head *head = &amp;net-&gt;ipv4.fib_table_hash[h];</div><div class='add'>+		struct fib_table *tb;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_rcu(tb, head, tb_hlist,</div><div class='add'>+					 lockdep_rtnl_is_held())</div><div class='add'>+			__fib_info_notify_update(net, tb, info);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib_leaf_notify(struct key_vector *l, struct fib_table *tb,</div><div class='add'>+			   struct notifier_block *nb,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_alias *fa;</div><div class='add'>+	int last_slen = -1;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='ctx'> 		struct fib_info *fi = fa-&gt;fa_info;</div><div class='hunk'>@@ -1950,39 +2168,57 @@ static void fib_leaf_notify(struct net *net, struct key_vector *l,</div><div class='ctx'> 		if (tb-&gt;tb_id != fa-&gt;tb_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		call_fib_entry_notifier(nb, net, FIB_EVENT_ENTRY_ADD, l-&gt;key,</div><div class='del'>-					KEYLENGTH - fa-&gt;fa_slen, fa);</div><div class='add'>+		if (fa-&gt;fa_slen == last_slen)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		last_slen = fa-&gt;fa_slen;</div><div class='add'>+		err = call_fib_entry_notifier(nb, FIB_EVENT_ENTRY_REPLACE,</div><div class='add'>+					      l-&gt;key, KEYLENGTH - fa-&gt;fa_slen,</div><div class='add'>+					      fa, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib_table_notify(struct net *net, struct fib_table *tb,</div><div class='del'>-			     struct notifier_block *nb)</div><div class='add'>+static int fib_table_notify(struct fib_table *tb, struct notifier_block *nb,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct trie *t = (struct trie *)tb-&gt;tb_data;</div><div class='ctx'> 	struct key_vector *l, *tp = t-&gt;kv;</div><div class='ctx'> 	t_key key = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	while ((l = leaf_walk_rcu(&amp;tp, key)) != NULL) {</div><div class='del'>-		fib_leaf_notify(net, l, tb, nb);</div><div class='add'>+		err = fib_leaf_notify(l, tb, nb, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		key = l-&gt;key + 1;</div><div class='ctx'> 		/* stop in case of wrap around */</div><div class='ctx'> 		if (key &lt; l-&gt;key)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fib_notify(struct net *net, struct notifier_block *nb)</div><div class='add'>+int fib_notify(struct net *net, struct notifier_block *nb,</div><div class='add'>+	       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int h;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; FIB_TABLE_HASHSZ; h++) {</div><div class='ctx'> 		struct hlist_head *head = &amp;net-&gt;ipv4.fib_table_hash[h];</div><div class='ctx'> 		struct fib_table *tb;</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_rcu(tb, head, tb_hlist)</div><div class='del'>-			fib_table_notify(net, tb, nb);</div><div class='add'>+		hlist_for_each_entry_rcu(tb, head, tb_hlist) {</div><div class='add'>+			err = fib_table_notify(tb, nb, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __trie_free_rcu(struct rcu_head *head)</div><div class='hunk'>@@ -2003,48 +2239,94 @@ void fib_free_table(struct fib_table *tb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fn_trie_dump_leaf(struct key_vector *l, struct fib_table *tb,</div><div class='del'>-			     struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+			     struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+			     struct fib_dump_filter *filter)</div><div class='ctx'> {</div><div class='add'>+	unsigned int flags = NLM_F_MULTI;</div><div class='ctx'> 	__be32 xkey = htonl(l-&gt;key);</div><div class='add'>+	int i, s_i, i_fa, s_fa, err;</div><div class='ctx'> 	struct fib_alias *fa;</div><div class='del'>-	int i, s_i;</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;filter_set ||</div><div class='add'>+	    !filter-&gt;dump_exceptions || !filter-&gt;dump_routes)</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='ctx'> </div><div class='ctx'> 	s_i = cb-&gt;args[4];</div><div class='add'>+	s_fa = cb-&gt;args[5];</div><div class='ctx'> 	i = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* rcu_read_lock is hold by caller */</div><div class='ctx'> 	hlist_for_each_entry_rcu(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='del'>-		int err;</div><div class='add'>+		struct fib_info *fi = fa-&gt;fa_info;</div><div class='ctx'> </div><div class='del'>-		if (i &lt; s_i) {</div><div class='del'>-			i++;</div><div class='del'>-			continue;</div><div class='add'>+		if (i &lt; s_i)</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='add'>+		i_fa = 0;</div><div class='add'>+</div><div class='add'>+		if (tb-&gt;tb_id != fa-&gt;tb_id)</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='add'>+		if (filter-&gt;filter_set) {</div><div class='add'>+			if (filter-&gt;rt_type &amp;&amp; fa-&gt;fa_type != filter-&gt;rt_type)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			if ((filter-&gt;protocol &amp;&amp;</div><div class='add'>+			     fi-&gt;fib_protocol != filter-&gt;protocol))</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			if (filter-&gt;dev &amp;&amp;</div><div class='add'>+			    !fib_info_nh_uses_dev(fi, filter-&gt;dev))</div><div class='add'>+				goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (tb-&gt;tb_id != fa-&gt;tb_id) {</div><div class='del'>-			i++;</div><div class='del'>-			continue;</div><div class='add'>+		if (filter-&gt;dump_routes) {</div><div class='add'>+			if (!s_fa) {</div><div class='add'>+				struct fib_rt_info fri;</div><div class='add'>+</div><div class='add'>+				fri.fi = fi;</div><div class='add'>+				fri.tb_id = tb-&gt;tb_id;</div><div class='add'>+				fri.dst = xkey;</div><div class='add'>+				fri.dst_len = KEYLENGTH - fa-&gt;fa_slen;</div><div class='add'>+				fri.dscp = fa-&gt;fa_dscp;</div><div class='add'>+				fri.type = fa-&gt;fa_type;</div><div class='add'>+				fri.offload = READ_ONCE(fa-&gt;offload);</div><div class='add'>+				fri.trap = READ_ONCE(fa-&gt;trap);</div><div class='add'>+				fri.offload_failed = READ_ONCE(fa-&gt;offload_failed);</div><div class='add'>+				err = fib_dump_info(skb,</div><div class='add'>+						    NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						    cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+						    RTM_NEWROUTE, &amp;fri, flags);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto stop;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			i_fa++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = fib_dump_info(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				    cb-&gt;nlh-&gt;nlmsg_seq, RTM_NEWROUTE,</div><div class='del'>-				    tb-&gt;tb_id, fa-&gt;fa_type,</div><div class='del'>-				    xkey, KEYLENGTH - fa-&gt;fa_slen,</div><div class='del'>-				    fa-&gt;fa_tos, fa-&gt;fa_info, NLM_F_MULTI);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			cb-&gt;args[4] = i;</div><div class='del'>-			return err;</div><div class='add'>+		if (filter-&gt;dump_exceptions) {</div><div class='add'>+			err = fib_dump_info_fnhe(skb, cb, tb-&gt;tb_id, fi,</div><div class='add'>+						 &amp;i_fa, s_fa, flags);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto stop;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+next:</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[4] = i;</div><div class='ctx'> 	return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+stop:</div><div class='add'>+	cb-&gt;args[4] = i;</div><div class='add'>+	cb-&gt;args[5] = i_fa;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* rcu_read_lock needs to be hold by caller from readside */</div><div class='ctx'> int fib_table_dump(struct fib_table *tb, struct sk_buff *skb,</div><div class='del'>-		   struct netlink_callback *cb)</div><div class='add'>+		   struct netlink_callback *cb, struct fib_dump_filter *filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct trie *t = (struct trie *)tb-&gt;tb_data;</div><div class='ctx'> 	struct key_vector *l, *tp = t-&gt;kv;</div><div class='hunk'>@@ -2054,10 +2336,16 @@ int fib_table_dump(struct fib_table *tb, struct sk_buff *skb,</div><div class='ctx'> 	int count = cb-&gt;args[2];</div><div class='ctx'> 	t_key key = cb-&gt;args[3];</div><div class='ctx'> </div><div class='add'>+	/* First time here, count and key are both always 0. Count &gt; 0</div><div class='add'>+	 * and key == 0 means the dump has wrapped around and we are done.</div><div class='add'>+	 */</div><div class='add'>+	if (count &amp;&amp; !key)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	while ((l = leaf_walk_rcu(&amp;tp, key)) != NULL) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = fn_trie_dump_leaf(l, tb, skb, cb);</div><div class='add'>+		err = fn_trie_dump_leaf(l, tb, skb, cb, filter);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			cb-&gt;args[3] = key;</div><div class='ctx'> 			cb-&gt;args[2] = count;</div><div class='hunk'>@@ -2078,18 +2366,18 @@ int fib_table_dump(struct fib_table *tb, struct sk_buff *skb,</div><div class='ctx'> 	cb-&gt;args[3] = key;</div><div class='ctx'> 	cb-&gt;args[2] = count;</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init fib_trie_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	fn_alias_kmem = kmem_cache_create("ip_fib_alias",</div><div class='ctx'> 					  sizeof(struct fib_alias),</div><div class='del'>-					  0, SLAB_PANIC, NULL);</div><div class='add'>+					  0, SLAB_PANIC | SLAB_ACCOUNT, NULL);</div><div class='ctx'> </div><div class='ctx'> 	trie_leaf_kmem = kmem_cache_create("ip_fib_trie",</div><div class='ctx'> 					   LEAF_SIZE,</div><div class='del'>-					   0, SLAB_PANIC, NULL);</div><div class='add'>+					   0, SLAB_PANIC | SLAB_ACCOUNT, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct fib_table *fib_trie_table(u32 id, struct fib_table *alias)</div><div class='hunk'>@@ -2320,7 +2608,7 @@ static void fib_table_print(struct seq_file *seq, struct fib_table *tb)</div><div class='ctx'> </div><div class='ctx'> static int fib_triestat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = (struct net *)seq-&gt;private;</div><div class='add'>+	struct net *net = seq-&gt;private;</div><div class='ctx'> 	unsigned int h;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq,</div><div class='hunk'>@@ -2328,6 +2616,7 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   " %zd bytes, size of tnode: %zd bytes.\n",</div><div class='ctx'> 		   LEAF_SIZE, TNODE_SIZE(0));</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (h = 0; h &lt; FIB_TABLE_HASHSZ; h++) {</div><div class='ctx'> 		struct hlist_head *head = &amp;net-&gt;ipv4.fib_table_hash[h];</div><div class='ctx'> 		struct fib_table *tb;</div><div class='hunk'>@@ -2347,7 +2636,9 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			trie_show_usage(seq, t-&gt;stats);</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='add'>+		cond_resched_rcu();</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2509,8 +2800,9 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 					     fa-&gt;fa_info-&gt;fib_scope),</div><div class='ctx'> 				   rtn_type(buf2, sizeof(buf2),</div><div class='ctx'> 					    fa-&gt;fa_type));</div><div class='del'>-			if (fa-&gt;fa_tos)</div><div class='del'>-				seq_printf(seq, " tos=%d", fa-&gt;fa_tos);</div><div class='add'>+			if (fa-&gt;fa_dscp)</div><div class='add'>+				seq_printf(seq, " tos=%d",</div><div class='add'>+					   inet_dscp_to_dsfield(fa-&gt;fa_dscp));</div><div class='ctx'> 			seq_putc(seq, '\n');</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2621,14 +2913,18 @@ static void fib_route_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int fib_flag_trans(int type, __be32 mask, const struct fib_info *fi)</div><div class='add'>+static unsigned int fib_flag_trans(int type, __be32 mask, struct fib_info *fi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (type == RTN_UNREACHABLE || type == RTN_PROHIBIT)</div><div class='ctx'> 		flags = RTF_REJECT;</div><div class='del'>-	if (fi &amp;&amp; fi-&gt;fib_nh-&gt;nh_gw)</div><div class='del'>-		flags |= RTF_GATEWAY;</div><div class='add'>+	if (fi) {</div><div class='add'>+		const struct fib_nh_common *nhc = fib_info_nhc(fi, 0);</div><div class='add'>+</div><div class='add'>+		if (nhc-&gt;nhc_gw.ipv4)</div><div class='add'>+			flags |= RTF_GATEWAY;</div><div class='add'>+	}</div><div class='ctx'> 	if (mask == htonl(0xFFFFFFFF))</div><div class='ctx'> 		flags |= RTF_HOST;</div><div class='ctx'> 	flags |= RTF_UP;</div><div class='hunk'>@@ -2659,7 +2955,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	prefix = htonl(l-&gt;key);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(fa, &amp;l-&gt;leaf, fa_list) {</div><div class='del'>-		const struct fib_info *fi = fa-&gt;fa_info;</div><div class='add'>+		struct fib_info *fi = fa-&gt;fa_info;</div><div class='ctx'> 		__be32 mask = inet_make_mask(KEYLENGTH - fa-&gt;fa_slen);</div><div class='ctx'> 		unsigned int flags = fib_flag_trans(fa-&gt;fa_type, mask, fi);</div><div class='ctx'> </div><div class='hunk'>@@ -2672,26 +2968,31 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 		seq_setwidth(seq, 127);</div><div class='ctx'> </div><div class='del'>-		if (fi)</div><div class='add'>+		if (fi) {</div><div class='add'>+			struct fib_nh_common *nhc = fib_info_nhc(fi, 0);</div><div class='add'>+			__be32 gw = 0;</div><div class='add'>+</div><div class='add'>+			if (nhc-&gt;nhc_gw_family == AF_INET)</div><div class='add'>+				gw = nhc-&gt;nhc_gw.ipv4;</div><div class='add'>+</div><div class='ctx'> 			seq_printf(seq,</div><div class='ctx'> 				   "%s\t%08X\t%08X\t%04X\t%d\t%u\t"</div><div class='del'>-				   "%d\t%08X\t%d\t%u\t%u",</div><div class='del'>-				   fi-&gt;fib_dev ? fi-&gt;fib_dev-&gt;name : "*",</div><div class='del'>-				   prefix,</div><div class='del'>-				   fi-&gt;fib_nh-&gt;nh_gw, flags, 0, 0,</div><div class='add'>+				   "%u\t%08X\t%d\t%u\t%u",</div><div class='add'>+				   nhc-&gt;nhc_dev ? nhc-&gt;nhc_dev-&gt;name : "*",</div><div class='add'>+				   prefix, gw, flags, 0, 0,</div><div class='ctx'> 				   fi-&gt;fib_priority,</div><div class='ctx'> 				   mask,</div><div class='ctx'> 				   (fi-&gt;fib_advmss ?</div><div class='ctx'> 				    fi-&gt;fib_advmss + 40 : 0),</div><div class='ctx'> 				   fi-&gt;fib_window,</div><div class='ctx'> 				   fi-&gt;fib_rtt &gt;&gt; 3);</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			seq_printf(seq,</div><div class='ctx'> 				   "*\t%08X\t%08X\t%04X\t%d\t%u\t"</div><div class='del'>-				   "%d\t%08X\t%d\t%u\t%u",</div><div class='add'>+				   "%u\t%08X\t%d\t%u\t%u",</div><div class='ctx'> 				   prefix, 0, flags, 0, 0, 0,</div><div class='ctx'> 				   mask, 0, 0, 0);</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		seq_pad(seq, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/fou_bpf.c b/net/ipv4/fou_bpf.c<br/>new file mode 100644<br/>index 000000000000..54984f3170a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fou_bpf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fou_bpf.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Unstable Fou Helpers for TC-BPF hook</div><div class='add'>+ *</div><div class='add'>+ * These are called from SCHED_CLS BPF programs. Note that it is</div><div class='add'>+ * allowed to break compatibility for these functions since the interface they</div><div class='add'>+ * are exposed through to BPF programs is explicitly unstable.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/fou.h&gt;</div><div class='add'>+</div><div class='add'>+struct bpf_fou_encap {</div><div class='add'>+	__be16 sport;</div><div class='add'>+	__be16 dport;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bpf_fou_encap_type {</div><div class='add'>+	FOU_BPF_ENCAP_FOU,</div><div class='add'>+	FOU_BPF_ENCAP_GUE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+/* bpf_skb_set_fou_encap - Set FOU encap parameters</div><div class='add'>+ *</div><div class='add'>+ * This function allows for using GUE or FOU encapsulation together with an</div><div class='add'>+ * ipip device in collect-metadata mode.</div><div class='add'>+ *</div><div class='add'>+ * It is meant to be used in BPF tc-hooks and after a call to the</div><div class='add'>+ * bpf_skb_set_tunnel_key helper, responsible for setting IP addresses.</div><div class='add'>+ *</div><div class='add'>+ * Parameters:</div><div class='add'>+ * @skb_ctx	Pointer to ctx (__sk_buff) in TC program. Cannot be NULL</div><div class='add'>+ * @encap	Pointer to a `struct bpf_fou_encap` storing UDP src and</div><div class='add'>+ * 		dst ports. If sport is set to 0 the kernel will auto-assign a</div><div class='add'>+ * 		port. This is similar to using `encap-sport auto`.</div><div class='add'>+ * 		Cannot be NULL</div><div class='add'>+ * @type	Encapsulation type for the packet. Their definitions are</div><div class='add'>+ * 		specified in `enum bpf_fou_encap_type`</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_skb_set_fou_encap(struct __sk_buff *skb_ctx,</div><div class='add'>+				      struct bpf_fou_encap *encap, int type)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)skb_ctx;</div><div class='add'>+	struct ip_tunnel_info *info = skb_tunnel_info(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!encap))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!info || !(info-&gt;mode &amp; IP_TUNNEL_INFO_TX)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case FOU_BPF_ENCAP_FOU:</div><div class='add'>+		info-&gt;encap.type = TUNNEL_ENCAP_FOU;</div><div class='add'>+		break;</div><div class='add'>+	case FOU_BPF_ENCAP_GUE:</div><div class='add'>+		info-&gt;encap.type = TUNNEL_ENCAP_GUE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		info-&gt;encap.type = TUNNEL_ENCAP_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags))</div><div class='add'>+		info-&gt;encap.flags |= TUNNEL_ENCAP_FLAG_CSUM;</div><div class='add'>+</div><div class='add'>+	info-&gt;encap.sport = encap-&gt;sport;</div><div class='add'>+	info-&gt;encap.dport = encap-&gt;dport;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* bpf_skb_get_fou_encap - Get FOU encap parameters</div><div class='add'>+ *</div><div class='add'>+ * This function allows for reading encap metadata from a packet received</div><div class='add'>+ * on an ipip device in collect-metadata mode.</div><div class='add'>+ *</div><div class='add'>+ * Parameters:</div><div class='add'>+ * @skb_ctx	Pointer to ctx (__sk_buff) in TC program. Cannot be NULL</div><div class='add'>+ * @encap	Pointer to a struct bpf_fou_encap storing UDP source and</div><div class='add'>+ * 		destination port. Cannot be NULL</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_skb_get_fou_encap(struct __sk_buff *skb_ctx,</div><div class='add'>+				      struct bpf_fou_encap *encap)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)skb_ctx;</div><div class='add'>+	struct ip_tunnel_info *info = skb_tunnel_info(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!info))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	encap-&gt;sport = info-&gt;encap.sport;</div><div class='add'>+	encap-&gt;dport = info-&gt;encap.dport;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(fou_kfunc_set)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_skb_set_fou_encap)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_skb_get_fou_encap)</div><div class='add'>+BTF_KFUNCS_END(fou_kfunc_set)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set fou_bpf_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;fou_kfunc_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int register_fou_bpf(void)</div><div class='add'>+{</div><div class='add'>+	return register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS,</div><div class='add'>+					 &amp;fou_bpf_kfunc_set);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv4/fou.c b/net/ipv4/fou_core.c<br/>index 500a59906b87..3970b6b7ace5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/fou.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/fou.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fou_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fou_core.c</a></div><div class='hunk'>@@ -1,22 +1,26 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/icmp.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include &lt;net/gue.h&gt;</div><div class='ctx'> #include &lt;net/fou.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udp_tunnel.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/fou.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/genetlink.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "fou_nl.h"</div><div class='add'>+</div><div class='ctx'> struct fou {</div><div class='ctx'> 	struct socket *sock;</div><div class='ctx'> 	u8 protocol;</div><div class='hunk'>@@ -46,7 +50,7 @@ struct fou_net {</div><div class='ctx'> </div><div class='ctx'> static inline struct fou *fou_from_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return sk-&gt;sk_user_data;</div><div class='add'>+	return rcu_dereference_sk_user_data(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fou_recv_pull(struct sk_buff *skb, struct fou *fou, size_t len)</div><div class='hunk'>@@ -120,6 +124,7 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct guehdr *guehdr;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	u16 doffset = 0;</div><div class='add'>+	u8 proto_ctype;</div><div class='ctx'> </div><div class='ctx'> 	if (!fou)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -135,7 +140,7 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 1: {</div><div class='del'>-		/* Direct encasulation of IPv4 or IPv6 */</div><div class='add'>+		/* Direct encapsulation of IPv4 or IPv6 */</div><div class='ctx'> </div><div class='ctx'> 		int prot;</div><div class='ctx'> </div><div class='hunk'>@@ -169,9 +174,7 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	/* guehdr may change after pull */</div><div class='ctx'> 	guehdr = (struct guehdr *)&amp;udp_hdr(skb)[1];</div><div class='ctx'> </div><div class='del'>-	hdrlen = sizeof(struct guehdr) + optlen;</div><div class='del'>-</div><div class='del'>-	if (guehdr-&gt;version != 0 || validate_gue_flags(guehdr, optlen))</div><div class='add'>+	if (validate_gue_flags(guehdr, optlen))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	hdrlen = sizeof(struct guehdr) + optlen;</div><div class='hunk'>@@ -211,31 +214,44 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (unlikely(guehdr-&gt;control))</div><div class='ctx'> 		return gue_control_message(skb, guehdr);</div><div class='ctx'> </div><div class='add'>+	proto_ctype = guehdr-&gt;proto_ctype;</div><div class='ctx'> 	__skb_pull(skb, sizeof(struct udphdr) + hdrlen);</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (iptunnel_pull_offloads(skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	return -guehdr-&gt;proto_ctype;</div><div class='add'>+	return -proto_ctype;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct net_offload *fou_gro_ops(const struct sock *sk,</div><div class='add'>+					     int proto)</div><div class='add'>+{</div><div class='add'>+	const struct net_offload __rcu **offloads;</div><div class='add'>+</div><div class='add'>+	/* FOU doesn't allow IPv4 on IPv6 sockets. */</div><div class='add'>+	offloads = sk-&gt;sk_family == AF_INET6 ? inet6_offloads : inet_offloads;</div><div class='add'>+	return rcu_dereference(offloads[proto]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *fou_gro_receive(struct sock *sk,</div><div class='ctx'> 				       struct list_head *head,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 proto = fou_from_sock(sk)-&gt;protocol;</div><div class='del'>-	const struct net_offload **offloads;</div><div class='add'>+	struct fou *fou = fou_from_sock(sk);</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='ctx'> 	struct sk_buff *pp = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!fou)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* We can clear the encap_mark for FOU as we are essentially doing</div><div class='ctx'> 	 * one of two possible things.  We are either adding an L4 tunnel</div><div class='del'>-	 * header to the outer L3 tunnel header, or we are are simply</div><div class='add'>+	 * header to the outer L3 tunnel header, or we are simply</div><div class='ctx'> 	 * treating the GRE tunnel header as though it is a UDP protocol</div><div class='ctx'> 	 * specific header such as VXLAN or GENEVE.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -244,41 +260,39 @@ static struct sk_buff *fou_gro_receive(struct sock *sk,</div><div class='ctx'> 	/* Flag this frame as already having an outer encap header */</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;is_fou = 1;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	offloads = NAPI_GRO_CB(skb)-&gt;is_ipv6 ? inet6_offloads : inet_offloads;</div><div class='del'>-	ops = rcu_dereference(offloads[proto]);</div><div class='add'>+	ops = fou_gro_ops(sk, fou-&gt;protocol);</div><div class='ctx'> 	if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	return pp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fou_gro_complete(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			    int nhoff)</div><div class='ctx'> {</div><div class='add'>+	struct fou *fou = fou_from_sock(sk);</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='del'>-	u8 proto = fou_from_sock(sk)-&gt;protocol;</div><div class='del'>-	int err = -ENOSYS;</div><div class='del'>-	const struct net_offload **offloads;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	offloads = NAPI_GRO_CB(skb)-&gt;is_ipv6 ? inet6_offloads : inet_offloads;</div><div class='del'>-	ops = rcu_dereference(offloads[proto]);</div><div class='del'>-	if (WARN_ON(!ops || !ops-&gt;callbacks.gro_complete))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (!fou) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = fou_gro_ops(sk, fou-&gt;protocol);</div><div class='add'>+	if (WARN_ON(!ops || !ops-&gt;callbacks.gro_complete)) {</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = ops-&gt;callbacks.gro_complete(skb, nhoff);</div><div class='ctx'> </div><div class='ctx'> 	skb_set_inner_mac_header(skb, nhoff);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -309,7 +323,6 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,</div><div class='ctx'> 				       struct list_head *head,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	const struct net_offload **offloads;</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='ctx'> 	struct sk_buff *pp = NULL;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='hunk'>@@ -324,15 +337,15 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	skb_gro_remcsum_init(&amp;grc);</div><div class='ctx'> </div><div class='add'>+	if (!fou)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	off = skb_gro_offset(skb);</div><div class='ctx'> 	len = off + sizeof(*guehdr);</div><div class='ctx'> </div><div class='del'>-	guehdr = skb_gro_header_fast(skb, off);</div><div class='del'>-	if (skb_gro_header_hard(skb, len)) {</div><div class='del'>-		guehdr = skb_gro_header_slow(skb, len, off);</div><div class='del'>-		if (unlikely(!guehdr))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	guehdr = skb_gro_header(skb, len, off);</div><div class='add'>+	if (unlikely(!guehdr))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (guehdr-&gt;version) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -356,7 +369,7 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,</div><div class='ctx'> 	optlen = guehdr-&gt;hlen &lt;&lt; 2;</div><div class='ctx'> 	len += optlen;</div><div class='ctx'> </div><div class='del'>-	if (skb_gro_header_hard(skb, len)) {</div><div class='add'>+	if (!skb_gro_may_pull(skb, len)) {</div><div class='ctx'> 		guehdr = skb_gro_header_slow(skb, len, off);</div><div class='ctx'> 		if (unlikely(!guehdr))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -427,7 +440,7 @@ next_proto:</div><div class='ctx'> </div><div class='ctx'> 	/* We can clear the encap_mark for GUE as we are essentially doing</div><div class='ctx'> 	 * one of two possible things.  We are either adding an L4 tunnel</div><div class='del'>-	 * header to the outer L3 tunnel header, or we are are simply</div><div class='add'>+	 * header to the outer L3 tunnel header, or we are simply</div><div class='ctx'> 	 * treating the GRE tunnel header as though it is a UDP protocol</div><div class='ctx'> 	 * specific header such as VXLAN or GENEVE.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -436,17 +449,13 @@ next_proto:</div><div class='ctx'> 	/* Flag this frame as already having an outer encap header */</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;is_fou = 1;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	offloads = NAPI_GRO_CB(skb)-&gt;is_ipv6 ? inet6_offloads : inet_offloads;</div><div class='del'>-	ops = rcu_dereference(offloads[proto]);</div><div class='del'>-	if (WARN_ON_ONCE(!ops || !ops-&gt;callbacks.gro_receive))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	ops = fou_gro_ops(sk, proto);</div><div class='add'>+	if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> 	flush = 0;</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final_remcsum(skb, pp, flush, &amp;grc);</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +464,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='del'>-	const struct net_offload **offloads;</div><div class='ctx'> 	struct guehdr *guehdr = (struct guehdr *)(skb-&gt;data + nhoff);</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='ctx'> 	unsigned int guehlen = 0;</div><div class='hunk'>@@ -483,30 +491,57 @@ static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	offloads = NAPI_GRO_CB(skb)-&gt;is_ipv6 ? inet6_offloads : inet_offloads;</div><div class='del'>-	ops = rcu_dereference(offloads[proto]);</div><div class='add'>+	ops = fou_gro_ops(sk, proto);</div><div class='ctx'> 	if (WARN_ON(!ops || !ops-&gt;callbacks.gro_complete))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = ops-&gt;callbacks.gro_complete(skb, nhoff + guehlen);</div><div class='ctx'> </div><div class='ctx'> 	skb_set_inner_mac_header(skb, nhoff + guehlen);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fou_add_to_port_list(struct net *net, struct fou *fou)</div><div class='add'>+static bool fou_cfg_cmp(struct fou *fou, struct fou_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = fou-&gt;sock-&gt;sk;</div><div class='add'>+	struct udp_port_cfg *udp_cfg = &amp;cfg-&gt;udp_config;</div><div class='add'>+</div><div class='add'>+	if (fou-&gt;family != udp_cfg-&gt;family ||</div><div class='add'>+	    fou-&gt;port != udp_cfg-&gt;local_udp_port ||</div><div class='add'>+	    sk-&gt;sk_dport != udp_cfg-&gt;peer_udp_port ||</div><div class='add'>+	    sk-&gt;sk_bound_dev_if != udp_cfg-&gt;bind_ifindex)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (fou-&gt;family == AF_INET) {</div><div class='add'>+		if (sk-&gt;sk_rcv_saddr != udp_cfg-&gt;local_ip.s_addr ||</div><div class='add'>+		    sk-&gt;sk_daddr != udp_cfg-&gt;peer_ip.s_addr)</div><div class='add'>+			return false;</div><div class='add'>+		else</div><div class='add'>+			return true;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (ipv6_addr_cmp(&amp;sk-&gt;sk_v6_rcv_saddr, &amp;udp_cfg-&gt;local_ip6) ||</div><div class='add'>+		    ipv6_addr_cmp(&amp;sk-&gt;sk_v6_daddr, &amp;udp_cfg-&gt;peer_ip6))</div><div class='add'>+			return false;</div><div class='add'>+		else</div><div class='add'>+			return true;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fou_add_to_port_list(struct net *net, struct fou *fou,</div><div class='add'>+				struct fou_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fou_net *fn = net_generic(net, fou_net_id);</div><div class='ctx'> 	struct fou *fout;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fn-&gt;fou_lock);</div><div class='ctx'> 	list_for_each_entry(fout, &amp;fn-&gt;fou_list, list) {</div><div class='del'>-		if (fou-&gt;port == fout-&gt;port &amp;&amp;</div><div class='del'>-		    fou-&gt;family == fout-&gt;family) {</div><div class='add'>+		if (fou_cfg_cmp(fout, cfg)) {</div><div class='ctx'> 			mutex_unlock(&amp;fn-&gt;fou_lock);</div><div class='ctx'> 			return -EALREADY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -584,7 +619,7 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_allocation = GFP_ATOMIC;</div><div class='ctx'> </div><div class='del'>-	err = fou_add_to_port_list(net, fou);</div><div class='add'>+	err = fou_add_to_port_list(net, fou, cfg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -604,14 +639,12 @@ error:</div><div class='ctx'> static int fou_destroy(struct net *net, struct fou_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fou_net *fn = net_generic(net, fou_net_id);</div><div class='del'>-	__be16 port = cfg-&gt;udp_config.local_udp_port;</div><div class='del'>-	u8 family = cfg-&gt;udp_config.family;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	struct fou *fou;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fn-&gt;fou_lock);</div><div class='ctx'> 	list_for_each_entry(fou, &amp;fn-&gt;fou_list, list) {</div><div class='del'>-		if (fou-&gt;port == port &amp;&amp; fou-&gt;family == family) {</div><div class='add'>+		if (fou_cfg_cmp(fou, cfg)) {</div><div class='ctx'> 			fou_release(fou);</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -624,17 +657,14 @@ static int fou_destroy(struct net *net, struct fou_cfg *cfg)</div><div class='ctx'> </div><div class='ctx'> static struct genl_family fou_nl_family;</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy fou_nl_policy[FOU_ATTR_MAX + 1] = {</div><div class='del'>-	[FOU_ATTR_PORT] = { .type = NLA_U16, },</div><div class='del'>-	[FOU_ATTR_AF] = { .type = NLA_U8, },</div><div class='del'>-	[FOU_ATTR_IPPROTO] = { .type = NLA_U8, },</div><div class='del'>-	[FOU_ATTR_TYPE] = { .type = NLA_U8, },</div><div class='del'>-	[FOU_ATTR_REMCSUM_NOPARTIAL] = { .type = NLA_FLAG, },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int parse_nl_config(struct genl_info *info,</div><div class='ctx'> 			   struct fou_cfg *cfg)</div><div class='ctx'> {</div><div class='add'>+	bool has_local = false, has_peer = false;</div><div class='add'>+	struct nlattr *attr;</div><div class='add'>+	int ifindex;</div><div class='add'>+	__be16 port;</div><div class='add'>+</div><div class='ctx'> 	memset(cfg, 0, sizeof(*cfg));</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;udp_config.family = AF_INET;</div><div class='hunk'>@@ -656,8 +686,7 @@ static int parse_nl_config(struct genl_info *info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;attrs[FOU_ATTR_PORT]) {</div><div class='del'>-		__be16 port = nla_get_be16(info-&gt;attrs[FOU_ATTR_PORT]);</div><div class='del'>-</div><div class='add'>+		port = nla_get_be16(info-&gt;attrs[FOU_ATTR_PORT]);</div><div class='ctx'> 		cfg-&gt;udp_config.local_udp_port = port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -670,10 +699,56 @@ static int parse_nl_config(struct genl_info *info,</div><div class='ctx'> 	if (info-&gt;attrs[FOU_ATTR_REMCSUM_NOPARTIAL])</div><div class='ctx'> 		cfg-&gt;flags |= FOU_F_REMCSUM_NOPARTIAL;</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;udp_config.family == AF_INET) {</div><div class='add'>+		if (info-&gt;attrs[FOU_ATTR_LOCAL_V4]) {</div><div class='add'>+			attr = info-&gt;attrs[FOU_ATTR_LOCAL_V4];</div><div class='add'>+			cfg-&gt;udp_config.local_ip.s_addr = nla_get_in_addr(attr);</div><div class='add'>+			has_local = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info-&gt;attrs[FOU_ATTR_PEER_V4]) {</div><div class='add'>+			attr = info-&gt;attrs[FOU_ATTR_PEER_V4];</div><div class='add'>+			cfg-&gt;udp_config.peer_ip.s_addr = nla_get_in_addr(attr);</div><div class='add'>+			has_peer = true;</div><div class='add'>+		}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (info-&gt;attrs[FOU_ATTR_LOCAL_V6]) {</div><div class='add'>+			attr = info-&gt;attrs[FOU_ATTR_LOCAL_V6];</div><div class='add'>+			cfg-&gt;udp_config.local_ip6 = nla_get_in6_addr(attr);</div><div class='add'>+			has_local = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info-&gt;attrs[FOU_ATTR_PEER_V6]) {</div><div class='add'>+			attr = info-&gt;attrs[FOU_ATTR_PEER_V6];</div><div class='add'>+			cfg-&gt;udp_config.peer_ip6 = nla_get_in6_addr(attr);</div><div class='add'>+			has_peer = true;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_peer) {</div><div class='add'>+		if (info-&gt;attrs[FOU_ATTR_PEER_PORT]) {</div><div class='add'>+			port = nla_get_be16(info-&gt;attrs[FOU_ATTR_PEER_PORT]);</div><div class='add'>+			cfg-&gt;udp_config.peer_udp_port = port;</div><div class='add'>+		} else {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[FOU_ATTR_IFINDEX]) {</div><div class='add'>+		if (!has_local)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ifindex = nla_get_s32(info-&gt;attrs[FOU_ATTR_IFINDEX]);</div><div class='add'>+</div><div class='add'>+		cfg-&gt;udp_config.bind_ifindex = ifindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fou_nl_cmd_add_port(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+int fou_nl_add_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = genl_info_net(info);</div><div class='ctx'> 	struct fou_cfg cfg;</div><div class='hunk'>@@ -686,7 +761,7 @@ static int fou_nl_cmd_add_port(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	return fou_create(net, &amp;cfg, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fou_nl_cmd_rm_port(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+int fou_nl_del_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = genl_info_net(info);</div><div class='ctx'> 	struct fou_cfg cfg;</div><div class='hunk'>@@ -701,15 +776,37 @@ static int fou_nl_cmd_rm_port(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> static int fou_fill_info(struct fou *fou, struct sk_buff *msg)</div><div class='ctx'> {</div><div class='add'>+	struct sock *sk = fou-&gt;sock-&gt;sk;</div><div class='add'>+</div><div class='ctx'> 	if (nla_put_u8(msg, FOU_ATTR_AF, fou-&gt;sock-&gt;sk-&gt;sk_family) ||</div><div class='ctx'> 	    nla_put_be16(msg, FOU_ATTR_PORT, fou-&gt;port) ||</div><div class='add'>+	    nla_put_be16(msg, FOU_ATTR_PEER_PORT, sk-&gt;sk_dport) ||</div><div class='ctx'> 	    nla_put_u8(msg, FOU_ATTR_IPPROTO, fou-&gt;protocol) ||</div><div class='del'>-	    nla_put_u8(msg, FOU_ATTR_TYPE, fou-&gt;type))</div><div class='add'>+	    nla_put_u8(msg, FOU_ATTR_TYPE, fou-&gt;type) ||</div><div class='add'>+	    nla_put_s32(msg, FOU_ATTR_IFINDEX, sk-&gt;sk_bound_dev_if))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (fou-&gt;flags &amp; FOU_F_REMCSUM_NOPARTIAL)</div><div class='ctx'> 		if (nla_put_flag(msg, FOU_ATTR_REMCSUM_NOPARTIAL))</div><div class='ctx'> 			return -1;</div><div class='add'>+</div><div class='add'>+	if (fou-&gt;sock-&gt;sk-&gt;sk_family == AF_INET) {</div><div class='add'>+		if (nla_put_in_addr(msg, FOU_ATTR_LOCAL_V4, sk-&gt;sk_rcv_saddr))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (nla_put_in_addr(msg, FOU_ATTR_PEER_V4, sk-&gt;sk_daddr))</div><div class='add'>+			return -1;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (nla_put_in6_addr(msg, FOU_ATTR_LOCAL_V6,</div><div class='add'>+				     &amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (nla_put_in6_addr(msg, FOU_ATTR_PEER_V6, &amp;sk-&gt;sk_v6_daddr))</div><div class='add'>+			return -1;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +830,7 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fou_nl_cmd_get_port(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+int fou_nl_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = genl_info_net(info);</div><div class='ctx'> 	struct fou_net *fn = net_generic(net, fou_net_id);</div><div class='hunk'>@@ -762,7 +859,7 @@ static int fou_nl_cmd_get_port(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	ret = -ESRCH;</div><div class='ctx'> 	mutex_lock(&amp;fn-&gt;fou_lock);</div><div class='ctx'> 	list_for_each_entry(fout, &amp;fn-&gt;fou_list, list) {</div><div class='del'>-		if (port == fout-&gt;port &amp;&amp; family == fout-&gt;family) {</div><div class='add'>+		if (fou_cfg_cmp(fout, &amp;cfg)) {</div><div class='ctx'> 			ret = fou_dump_info(fout, info-&gt;snd_portid,</div><div class='ctx'> 					    info-&gt;snd_seq, 0, msg,</div><div class='ctx'> 					    info-&gt;genlhdr-&gt;cmd);</div><div class='hunk'>@@ -780,7 +877,7 @@ out_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fou_nl_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+int fou_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct fou_net *fn = net_generic(net, fou_net_id);</div><div class='hunk'>@@ -803,36 +900,17 @@ static int fou_nl_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	return skb-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops fou_nl_ops[] = {</div><div class='del'>-	{</div><div class='del'>-		.cmd = FOU_CMD_ADD,</div><div class='del'>-		.doit = fou_nl_cmd_add_port,</div><div class='del'>-		.policy = fou_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = FOU_CMD_DEL,</div><div class='del'>-		.doit = fou_nl_cmd_rm_port,</div><div class='del'>-		.policy = fou_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.cmd = FOU_CMD_GET,</div><div class='del'>-		.doit = fou_nl_cmd_get_port,</div><div class='del'>-		.dumpit = fou_nl_dump,</div><div class='del'>-		.policy = fou_nl_policy,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct genl_family fou_nl_family __ro_after_init = {</div><div class='ctx'> 	.hdrsize	= 0,</div><div class='ctx'> 	.name		= FOU_GENL_NAME,</div><div class='ctx'> 	.version	= FOU_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= FOU_ATTR_MAX,</div><div class='add'>+	.policy		= fou_nl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= fou_nl_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(fou_nl_ops),</div><div class='add'>+	.small_ops	= fou_nl_ops,</div><div class='add'>+	.n_small_ops	= ARRAY_SIZE(fou_nl_ops),</div><div class='add'>+	.resv_start_op	= FOU_CMD_GET + 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> size_t fou_encap_hlen(struct ip_tunnel_encap *e)</div><div class='hunk'>@@ -1003,15 +1081,95 @@ static int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gue_err_proto_handler(int proto, struct sk_buff *skb, u32 info)</div><div class='add'>+{</div><div class='add'>+	const struct net_protocol *ipprot = rcu_dereference(inet_protos[proto]);</div><div class='add'>+</div><div class='add'>+	if (ipprot &amp;&amp; ipprot-&gt;err_handler) {</div><div class='add'>+		if (!ipprot-&gt;err_handler(skb, info))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gue_err(struct sk_buff *skb, u32 info)</div><div class='add'>+{</div><div class='add'>+	int transport_offset = skb_transport_offset(skb);</div><div class='add'>+	struct guehdr *guehdr;</div><div class='add'>+	size_t len, optlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len = sizeof(struct udphdr) + sizeof(struct guehdr);</div><div class='add'>+	if (!pskb_may_pull(skb, transport_offset + len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guehdr = (struct guehdr *)&amp;udp_hdr(skb)[1];</div><div class='add'>+</div><div class='add'>+	switch (guehdr-&gt;version) {</div><div class='add'>+	case 0: /* Full GUE header present */</div><div class='add'>+		break;</div><div class='add'>+	case 1: {</div><div class='add'>+		/* Direct encapsulation of IPv4 or IPv6 */</div><div class='add'>+		skb_set_transport_header(skb, -(int)sizeof(struct icmphdr));</div><div class='add'>+</div><div class='add'>+		switch (((struct iphdr *)guehdr)-&gt;version) {</div><div class='add'>+		case 4:</div><div class='add'>+			ret = gue_err_proto_handler(IPPROTO_IPIP, skb, info);</div><div class='add'>+			goto out;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		case 6:</div><div class='add'>+			ret = gue_err_proto_handler(IPPROTO_IPV6, skb, info);</div><div class='add'>+			goto out;</div><div class='add'>+#endif</div><div class='add'>+		default:</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	default: /* Undefined version */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (guehdr-&gt;control)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	optlen = guehdr-&gt;hlen &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, transport_offset + len + optlen))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guehdr = (struct guehdr *)&amp;udp_hdr(skb)[1];</div><div class='add'>+	if (validate_gue_flags(guehdr, optlen))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Handling exceptions for direct UDP encapsulation in GUE would lead to</div><div class='add'>+	 * recursion. Besides, this kind of encapsulation can't even be</div><div class='add'>+	 * configured currently. Discard this.</div><div class='add'>+	 */</div><div class='add'>+	if (guehdr-&gt;proto_ctype == IPPROTO_UDP ||</div><div class='add'>+	    guehdr-&gt;proto_ctype == IPPROTO_UDPLITE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, -(int)sizeof(struct icmphdr));</div><div class='add'>+	ret = gue_err_proto_handler(guehdr-&gt;proto_ctype, skb, info);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	skb_set_transport_header(skb, transport_offset);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static const struct ip_tunnel_encap_ops fou_iptun_ops = {</div><div class='ctx'> 	.encap_hlen = fou_encap_hlen,</div><div class='ctx'> 	.build_header = fou_build_header,</div><div class='add'>+	.err_handler = gue_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ip_tunnel_encap_ops gue_iptun_ops = {</div><div class='ctx'> 	.encap_hlen = gue_encap_hlen,</div><div class='ctx'> 	.build_header = gue_build_header,</div><div class='add'>+	.err_handler = gue_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ip_tunnel_encap_add_fou_ops(void)</div><div class='hunk'>@@ -1093,10 +1251,15 @@ static int __init fou_init(void)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto unregister;</div><div class='ctx'> </div><div class='add'>+	ret = register_fou_bpf();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto kfunc_failed;</div><div class='add'>+</div><div class='ctx'> 	ret = ip_tunnel_encap_add_fou_ops();</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+kfunc_failed:</div><div class='ctx'> 	genl_unregister_family(&amp;fou_nl_family);</div><div class='ctx'> unregister:</div><div class='ctx'> 	unregister_pernet_device(&amp;fou_net_ops);</div><div class='hunk'>@@ -1115,3 +1278,4 @@ module_init(fou_init);</div><div class='ctx'> module_exit(fou_fini);</div><div class='ctx'> MODULE_AUTHOR("Tom Herbert &lt;therbert@google.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Foo over UDP");</div><div class='head'>diff --git a/net/ipv4/fou_nl.c b/net/ipv4/fou_nl.c<br/>new file mode 100644<br/>index 000000000000..7a99639204b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fou_nl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fou_nl.c</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/fou.yaml */</div><div class='add'>+/* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fou_nl.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/fou.h&gt;</div><div class='add'>+</div><div class='add'>+/* Global operation policy for fou */</div><div class='add'>+const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = {</div><div class='add'>+	[FOU_ATTR_PORT] = { .type = NLA_BE16, },</div><div class='add'>+	[FOU_ATTR_AF] = { .type = NLA_U8, },</div><div class='add'>+	[FOU_ATTR_IPPROTO] = { .type = NLA_U8, },</div><div class='add'>+	[FOU_ATTR_TYPE] = { .type = NLA_U8, },</div><div class='add'>+	[FOU_ATTR_REMCSUM_NOPARTIAL] = { .type = NLA_FLAG, },</div><div class='add'>+	[FOU_ATTR_LOCAL_V4] = { .type = NLA_U32, },</div><div class='add'>+	[FOU_ATTR_LOCAL_V6] = NLA_POLICY_EXACT_LEN(16),</div><div class='add'>+	[FOU_ATTR_PEER_V4] = { .type = NLA_U32, },</div><div class='add'>+	[FOU_ATTR_PEER_V6] = NLA_POLICY_EXACT_LEN(16),</div><div class='add'>+	[FOU_ATTR_PEER_PORT] = { .type = NLA_BE16, },</div><div class='add'>+	[FOU_ATTR_IFINDEX] = { .type = NLA_S32, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ops table for fou */</div><div class='add'>+const struct genl_small_ops fou_nl_ops[3] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd		= FOU_CMD_ADD,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit		= fou_nl_add_doit,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= FOU_CMD_DEL,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit		= fou_nl_del_doit,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= FOU_CMD_GET,</div><div class='add'>+		.validate	= GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit		= fou_nl_get_doit,</div><div class='add'>+		.dumpit		= fou_nl_get_dumpit,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/net/ipv4/fou_nl.h b/net/ipv4/fou_nl.h<br/>new file mode 100644<br/>index 000000000000..438342dc8507<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/fou_nl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/fou_nl.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/fou.yaml */</div><div class='add'>+/* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_FOU_GEN_H</div><div class='add'>+#define _LINUX_FOU_GEN_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/fou.h&gt;</div><div class='add'>+</div><div class='add'>+/* Global operation policy for fou */</div><div class='add'>+extern const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1];</div><div class='add'>+</div><div class='add'>+/* Ops table for fou */</div><div class='add'>+extern const struct genl_small_ops fou_nl_ops[3];</div><div class='add'>+</div><div class='add'>+int fou_nl_add_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int fou_nl_del_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int fou_nl_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int fou_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_FOU_GEN_H */</div><div class='head'>diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c<br/>index b798862b6be5..dafd68f3436a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/gre_demux.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/gre_demux.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/gre_demux.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/gre_demux.c</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	GRE over IPv4 demultiplexer driver</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors: Dmitry Kozlov (xeb@mail.ru)</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -25,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/gre.h&gt;</div><div class='add'>+#include &lt;net/erspan.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -60,7 +56,9 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(gre_del_protocol);</div><div class='ctx'> </div><div class='del'>-/* Fills in tpi and returns header length to be pulled. */</div><div class='add'>+/* Fills in tpi and returns header length to be pulled.</div><div class='add'>+ * Note that caller must use pskb_may_pull() before pulling GRE header.</div><div class='add'>+ */</div><div class='ctx'> int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 		     bool *csum_err, __be16 proto, int nhs)</div><div class='ctx'> {</div><div class='hunk'>@@ -75,7 +73,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 	if (unlikely(greh-&gt;flags &amp; (GRE_VERSION | GRE_ROUTING)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tpi-&gt;flags = gre_flags_to_tnl_flags(greh-&gt;flags);</div><div class='add'>+	gre_flags_to_tnl_flags(tpi-&gt;flags, greh-&gt;flags);</div><div class='ctx'> 	hdr_len = gre_calc_hlen(tpi-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, nhs + hdr_len))</div><div class='hunk'>@@ -86,13 +84,14 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> </div><div class='ctx'> 	options = (__be32 *)(greh + 1);</div><div class='ctx'> 	if (greh-&gt;flags &amp; GRE_CSUM) {</div><div class='del'>-		if (skb_checksum_simple_validate(skb)) {</div><div class='add'>+		if (!skb_checksum_simple_validate(skb)) {</div><div class='add'>+			skb_checksum_try_convert(skb, IPPROTO_GRE,</div><div class='add'>+						 null_compute_pseudo);</div><div class='add'>+		} else if (csum_err) {</div><div class='ctx'> 			*csum_err = true;</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_checksum_try_convert(skb, IPPROTO_GRE, 0,</div><div class='del'>-					 null_compute_pseudo);</div><div class='ctx'> 		options++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -113,11 +112,33 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 	 * - When dealing with WCCPv2, Skip extra 4 bytes in GRE header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (greh-&gt;flags == 0 &amp;&amp; tpi-&gt;proto == htons(ETH_P_WCCP)) {</div><div class='add'>+		u8 _val, *val;</div><div class='add'>+</div><div class='add'>+		val = skb_header_pointer(skb, nhs + hdr_len,</div><div class='add'>+					 sizeof(_val), &amp;_val);</div><div class='add'>+		if (!val)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		tpi-&gt;proto = proto;</div><div class='del'>-		if ((*(u8 *)options &amp; 0xF0) != 0x40)</div><div class='add'>+		if ((*val &amp; 0xF0) != 0x40)</div><div class='ctx'> 			hdr_len += 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	tpi-&gt;hdr_len = hdr_len;</div><div class='add'>+</div><div class='add'>+	/* ERSPAN ver 1 and 2 protocol sets GRE key field</div><div class='add'>+	 * to 0 and sets the configured key in the</div><div class='add'>+	 * inner erspan header field</div><div class='add'>+	 */</div><div class='add'>+	if ((greh-&gt;protocol == htons(ETH_P_ERSPAN) &amp;&amp; hdr_len != 4) ||</div><div class='add'>+	    greh-&gt;protocol == htons(ETH_P_ERSPAN2)) {</div><div class='add'>+		struct erspan_base_hdr *ershdr;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, nhs + hdr_len + sizeof(*ershdr)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ershdr = (struct erspan_base_hdr *)(skb-&gt;data + nhs + hdr_len);</div><div class='add'>+		tpi-&gt;key = cpu_to_be32(get_session_id(ershdr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return hdr_len;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gre_parse_header);</div><div class='hunk'>@@ -150,31 +171,35 @@ drop:</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gre_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int gre_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct gre_protocol *proto;</div><div class='ctx'> 	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	u8 ver = skb-&gt;data[(iph-&gt;ihl&lt;&lt;2) + 1]&amp;0x7f;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ver &gt;= GREPROTO_MAX)</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	proto = rcu_dereference(gre_proto[ver]);</div><div class='ctx'> 	if (proto &amp;&amp; proto-&gt;err_handler)</div><div class='ctx'> 		proto-&gt;err_handler(skb, info);</div><div class='add'>+	else</div><div class='add'>+		err = -EPROTONOSUPPORT;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_protocol net_gre_protocol = {</div><div class='ctx'> 	.handler     = gre_rcv,</div><div class='ctx'> 	.err_handler = gre_err,</div><div class='del'>-	.netns_ok    = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init gre_init(void)</div><div class='ctx'> {</div><div class='del'>-	pr_info("GRE over IPv4 demultiplexor driver\n");</div><div class='add'>+	pr_info("GRE over IPv4 demultiplexer driver\n");</div><div class='ctx'> </div><div class='ctx'> 	if (inet_add_protocol(&amp;net_gre_protocol, IPPROTO_GRE) &lt; 0) {</div><div class='ctx'> 		pr_err("can't add protocol\n");</div><div class='hunk'>@@ -192,5 +217,5 @@ module_init(gre_init);</div><div class='ctx'> module_exit(gre_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("GRE over IPv4 demultiplexer driver");</div><div class='del'>-MODULE_AUTHOR("D. Kozlov (xeb@mail.ru)");</div><div class='add'>+MODULE_AUTHOR("D. Kozlov &lt;xeb@mail.ru&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c<br/>index 6c63524f598a..5028c72d494a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/gre_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/gre_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/gre_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/gre_offload.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV4 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	GRE GSO support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -14,17 +10,19 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/gre.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *gre_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 				       netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);</div><div class='add'>+	bool need_csum, offload_csum, gso_partial, need_ipsec;</div><div class='ctx'> 	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='ctx'> 	u16 mac_offset = skb-&gt;mac_header;</div><div class='ctx'> 	__be16 protocol = skb-&gt;protocol;</div><div class='ctx'> 	u16 mac_len = skb-&gt;mac_len;</div><div class='ctx'> 	int gre_offset, outer_hlen;</div><div class='del'>-	bool need_csum, gso_partial;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb-&gt;encapsulation)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -48,6 +46,13 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	skb-&gt;encap_hdr_csum = need_csum;</div><div class='ctx'> </div><div class='ctx'> 	features &amp;= skb-&gt;dev-&gt;hw_enc_features;</div><div class='add'>+	if (need_csum)</div><div class='add'>+		features &amp;= ~NETIF_F_SCTP_CRC;</div><div class='add'>+</div><div class='add'>+	need_ipsec = skb_dst(skb) &amp;&amp; dst_xfrm(skb_dst(skb));</div><div class='add'>+	/* Try to offload checksum if possible */</div><div class='add'>+	offload_csum = !!(need_csum &amp;&amp; !need_ipsec &amp;&amp;</div><div class='add'>+			  (skb-&gt;dev-&gt;features &amp; NETIF_F_HW_CSUM));</div><div class='ctx'> </div><div class='ctx'> 	/* segment inner packet. */</div><div class='ctx'> 	segs = skb_mac_gso_segment(skb, features);</div><div class='hunk'>@@ -102,7 +107,13 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		*(pcsum + 1) = 0;</div><div class='del'>-		*pcsum = gso_make_checksum(skb, 0);</div><div class='add'>+		if (skb-&gt;encapsulation || !offload_csum) {</div><div class='add'>+			*pcsum = gso_make_checksum(skb, 0);</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='add'>+			skb-&gt;csum_start = skb_transport_header(skb) - skb-&gt;head;</div><div class='add'>+			skb-&gt;csum_offset = sizeof(*greh);</div><div class='add'>+		}</div><div class='ctx'> 	} while ((skb = skb-&gt;next));</div><div class='ctx'> out:</div><div class='ctx'> 	return segs;</div><div class='hunk'>@@ -127,12 +138,9 @@ static struct sk_buff *gre_gro_receive(struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	off = skb_gro_offset(skb);</div><div class='ctx'> 	hlen = off + sizeof(*greh);</div><div class='del'>-	greh = skb_gro_header_fast(skb, off);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		greh = skb_gro_header_slow(skb, hlen, off);</div><div class='del'>-		if (unlikely(!greh))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	greh = skb_gro_header(skb, hlen, off);</div><div class='add'>+	if (unlikely(!greh))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Only support version 0 and K (key), C (csum) flags. Note that</div><div class='ctx'> 	 * although the support for the S (seq#) flag can be added easily</div><div class='hunk'>@@ -153,10 +161,9 @@ static struct sk_buff *gre_gro_receive(struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	type = greh-&gt;protocol;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ptype = gro_find_receive_by_type(type);</div><div class='ctx'> 	if (!ptype)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	grehlen = GRE_HEADER_SECTION;</div><div class='ctx'> </div><div class='hunk'>@@ -167,18 +174,18 @@ static struct sk_buff *gre_gro_receive(struct list_head *head,</div><div class='ctx'> 		grehlen += GRE_HEADER_SECTION;</div><div class='ctx'> </div><div class='ctx'> 	hlen = off + grehlen;</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='add'>+	if (!skb_gro_may_pull(skb, hlen)) {</div><div class='ctx'> 		greh = skb_gro_header_slow(skb, hlen, off);</div><div class='ctx'> 		if (unlikely(!greh))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't bother verifying checksum if we're going to flush anyway. */</div><div class='ctx'> 	if ((greh-&gt;flags &amp; GRE_CSUM) &amp;&amp; !NAPI_GRO_CB(skb)-&gt;flush) {</div><div class='ctx'> 		if (skb_gro_checksum_simple_validate(skb))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-		skb_gro_checksum_try_convert(skb, IPPROTO_GRE, 0,</div><div class='add'>+		skb_gro_checksum_try_convert(skb, IPPROTO_GRE,</div><div class='ctx'> 					     null_compute_pseudo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -220,8 +227,6 @@ static struct sk_buff *gre_gro_receive(struct list_head *head,</div><div class='ctx'> 	pp = call_gro_receive(ptype-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> 	flush = 0;</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final(skb, pp, flush);</div><div class='ctx'> </div><div class='hunk'>@@ -246,13 +251,10 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> 	if (greh-&gt;flags &amp; GRE_CSUM)</div><div class='ctx'> 		grehlen += GRE_HEADER_SECTION;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	ptype = gro_find_complete_by_type(type);</div><div class='ctx'> 	if (ptype)</div><div class='ctx'> 		err = ptype-&gt;callbacks.gro_complete(skb, nhoff + grehlen);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='ctx'> 	skb_set_inner_mac_header(skb, nhoff + grehlen);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c<br/>index 695979b7ef6d..4abbec2f47ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/icmp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/icmp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/icmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/icmp.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	NET3:	Implementation of the ICMP protocol layer.</div><div class='ctx'>  *</div><div class='ctx'>  *		Alan Cox, &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Some of the function names and the icmp unreach table for this</div><div class='ctx'>  *	module were derived from [icmp.c 1.0.11 06/02/93] by</div><div class='ctx'>  *	Ross Biro, Fred N. van Kempen, Mark Evans, Alan Cox, Gerhard Koerting.</div><div class='hunk'>@@ -59,7 +55,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	- Should use skb_pull() instead of all the manual checking.</div><div class='ctx'>  *	  This would also greatly simply some upper layer error handlers. --AK</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -77,6 +72,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv4.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -97,6 +93,10 @@</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/icmp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Build xmit assembly blocks</div><div class='hunk'>@@ -191,30 +191,20 @@ EXPORT_SYMBOL(icmp_err_convert);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct icmp_control {</div><div class='del'>-	bool (*handler)(struct sk_buff *skb);</div><div class='add'>+	enum skb_drop_reason (*handler)(struct sk_buff *skb);</div><div class='ctx'> 	short   error;		/* This ICMP is classed as an error message */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	The ICMP socket(s). This is the most convenient way to flow control</div><div class='del'>- *	our ICMP output as well as maintain a clean interface throughout</div><div class='del'>- *	all layers. All Socketless IP sends will soon be gone.</div><div class='del'>- *</div><div class='del'>- *	On SMP we have one ICMP socket per-cpu.</div><div class='del'>- */</div><div class='del'>-static struct sock *icmp_sk(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return *this_cpu_ptr(net-&gt;ipv4.icmp_sk);</div><div class='del'>-}</div><div class='add'>+static DEFINE_PER_CPU(struct sock *, ipv4_icmp_sk);</div><div class='ctx'> </div><div class='ctx'> /* Called with BH disabled */</div><div class='ctx'> static inline struct sock *icmp_xmit_lock(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk = icmp_sk(net);</div><div class='add'>+	sk = this_cpu_read(ipv4_icmp_sk);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!spin_trylock(&amp;sk-&gt;sk_lock.slock))) {</div><div class='ctx'> 		/* This can happen if the output path signals a</div><div class='hunk'>@@ -222,64 +212,66 @@ static inline struct sock *icmp_xmit_lock(struct net *net)</div><div class='ctx'> 		 */</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	sock_net_set(sk, net);</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void icmp_xmit_unlock(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	sock_net_set(sk, &amp;init_net);</div><div class='ctx'> 	spin_unlock(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sysctl_icmp_msgs_per_sec __read_mostly = 1000;</div><div class='del'>-int sysctl_icmp_msgs_burst __read_mostly = 50;</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-	u32		credit;</div><div class='del'>-	u32		stamp;</div><div class='del'>-} icmp_global = {</div><div class='del'>-	.lock		= __SPIN_LOCK_UNLOCKED(icmp_global.lock),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * icmp_global_allow - Are we allowed to send one more ICMP message ?</div><div class='add'>+ * @net: network namespace</div><div class='ctx'>  *</div><div class='del'>- * Uses a token bucket to limit our ICMP messages to sysctl_icmp_msgs_per_sec.</div><div class='add'>+ * Uses a token bucket to limit our ICMP messages to ~sysctl_icmp_msgs_per_sec.</div><div class='ctx'>  * Returns false if we reached the limit and can not send another packet.</div><div class='del'>- * Note: called with BH disabled</div><div class='add'>+ * Works in tandem with icmp_global_consume().</div><div class='ctx'>  */</div><div class='del'>-bool icmp_global_allow(void)</div><div class='add'>+bool icmp_global_allow(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	u32 credit, delta, incr = 0, now = (u32)jiffies;</div><div class='del'>-	bool rc = false;</div><div class='add'>+	u32 delta, now, oldstamp;</div><div class='add'>+	int incr, new, old;</div><div class='ctx'> </div><div class='del'>-	/* Check if token bucket is empty and cannot be refilled</div><div class='del'>-	 * without taking the spinlock.</div><div class='add'>+	/* Note: many cpus could find this condition true.</div><div class='add'>+	 * Then later icmp_global_consume() could consume more credits,</div><div class='add'>+	 * this is an acceptable race.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!icmp_global.credit) {</div><div class='del'>-		delta = min_t(u32, now - icmp_global.stamp, HZ);</div><div class='del'>-		if (delta &lt; HZ / 50)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='add'>+	if (atomic_read(&amp;net-&gt;ipv4.icmp_global_credit) &gt; 0)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;icmp_global.lock);</div><div class='del'>-	delta = min_t(u32, now - icmp_global.stamp, HZ);</div><div class='del'>-	if (delta &gt;= HZ / 50) {</div><div class='del'>-		incr = sysctl_icmp_msgs_per_sec * delta / HZ ;</div><div class='del'>-		if (incr)</div><div class='del'>-			icmp_global.stamp = now;</div><div class='del'>-	}</div><div class='del'>-	credit = min_t(u32, icmp_global.credit + incr, sysctl_icmp_msgs_burst);</div><div class='del'>-	if (credit) {</div><div class='del'>-		credit--;</div><div class='del'>-		rc = true;</div><div class='add'>+	now = jiffies;</div><div class='add'>+	oldstamp = READ_ONCE(net-&gt;ipv4.icmp_global_stamp);</div><div class='add'>+	delta = min_t(u32, now - oldstamp, HZ);</div><div class='add'>+	if (delta &lt; HZ / 50)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	incr = READ_ONCE(net-&gt;ipv4.sysctl_icmp_msgs_per_sec) * delta / HZ;</div><div class='add'>+	if (!incr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cmpxchg(&amp;net-&gt;ipv4.icmp_global_stamp, oldstamp, now) == oldstamp) {</div><div class='add'>+		old = atomic_read(&amp;net-&gt;ipv4.icmp_global_credit);</div><div class='add'>+		do {</div><div class='add'>+			new = min(old + incr, READ_ONCE(net-&gt;ipv4.sysctl_icmp_msgs_burst));</div><div class='add'>+		} while (!atomic_try_cmpxchg(&amp;net-&gt;ipv4.icmp_global_credit, &amp;old, new));</div><div class='ctx'> 	}</div><div class='del'>-	icmp_global.credit = credit;</div><div class='del'>-	spin_unlock(&amp;icmp_global.lock);</div><div class='del'>-	return rc;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(icmp_global_allow);</div><div class='ctx'> </div><div class='add'>+void icmp_global_consume(struct net *net)</div><div class='add'>+{</div><div class='add'>+	int credits = get_random_u32_below(3);</div><div class='add'>+</div><div class='add'>+	/* Note: this might make icmp_global.credit negative. */</div><div class='add'>+	if (credits)</div><div class='add'>+		atomic_sub(credits, &amp;net-&gt;ipv4.icmp_global_credit);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(icmp_global_consume);</div><div class='add'>+</div><div class='ctx'> static bool icmpv4_mask_allow(struct net *net, int type, int code)</div><div class='ctx'> {</div><div class='ctx'> 	if (type &gt; NR_ICMP_TYPES)</div><div class='hunk'>@@ -290,20 +282,23 @@ static bool icmpv4_mask_allow(struct net *net, int type, int code)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Limit if icmp type is enabled in ratemask. */</div><div class='del'>-	if (!((1 &lt;&lt; type) &amp; net-&gt;ipv4.sysctl_icmp_ratemask))</div><div class='add'>+	if (!((1 &lt;&lt; type) &amp; READ_ONCE(net-&gt;ipv4.sysctl_icmp_ratemask)))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool icmpv4_global_allow(struct net *net, int type, int code)</div><div class='add'>+static bool icmpv4_global_allow(struct net *net, int type, int code,</div><div class='add'>+				bool *apply_ratelimit)</div><div class='ctx'> {</div><div class='ctx'> 	if (icmpv4_mask_allow(net, type, code))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (icmp_global_allow())</div><div class='add'>+	if (icmp_global_allow(net)) {</div><div class='add'>+		*apply_ratelimit = true;</div><div class='ctx'> 		return true;</div><div class='del'>-</div><div class='add'>+	}</div><div class='add'>+	__ICMP_INC_STATS(net, ICMP_MIB_RATELIMITGLOBAL);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -312,26 +307,33 @@ static bool icmpv4_global_allow(struct net *net, int type, int code)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,</div><div class='del'>-			       struct flowi4 *fl4, int type, int code)</div><div class='add'>+			       struct flowi4 *fl4, int type, int code,</div><div class='add'>+			       bool apply_ratelimit)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = &amp;rt-&gt;dst;</div><div class='ctx'> 	struct inet_peer *peer;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	bool rc = true;</div><div class='del'>-	int vif;</div><div class='ctx'> </div><div class='del'>-	if (icmpv4_mask_allow(net, type, code))</div><div class='del'>-		goto out;</div><div class='add'>+	if (!apply_ratelimit)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* No rate limit on loopback */</div><div class='del'>-	if (dst-&gt;dev &amp;&amp; (dst-&gt;dev-&gt;flags&amp;IFF_LOOPBACK))</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	if (dev &amp;&amp; (dev-&gt;flags &amp; IFF_LOOPBACK))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	vif = l3mdev_master_ifindex(dst-&gt;dev);</div><div class='del'>-	peer = inet_getpeer_v4(net-&gt;ipv4.peers, fl4-&gt;daddr, vif, 1);</div><div class='del'>-	rc = inet_peer_xrlim_allow(peer, net-&gt;ipv4.sysctl_icmp_ratelimit);</div><div class='del'>-	if (peer)</div><div class='del'>-		inet_putpeer(peer);</div><div class='add'>+	peer = inet_getpeer_v4(net-&gt;ipv4.peers, fl4-&gt;daddr,</div><div class='add'>+			       l3mdev_master_ifindex_rcu(dev));</div><div class='add'>+	rc = inet_peer_xrlim_allow(peer,</div><div class='add'>+				   READ_ONCE(net-&gt;ipv4.sysctl_icmp_ratelimit));</div><div class='ctx'> out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!rc)</div><div class='add'>+		__ICMP_INC_STATS(net, ICMP_MIB_RATELIMITHOST);</div><div class='add'>+	else</div><div class='add'>+		icmp_global_consume(net);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -351,12 +353,12 @@ void icmp_out_count(struct net *net, unsigned char type)</div><div class='ctx'> static int icmp_glue_bits(void *from, char *to, int offset, int len, int odd,</div><div class='ctx'> 			  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct icmp_bxm *icmp_param = (struct icmp_bxm *)from;</div><div class='add'>+	struct icmp_bxm *icmp_param = from;</div><div class='ctx'> 	__wsum csum;</div><div class='ctx'> </div><div class='ctx'> 	csum = skb_copy_and_csum_bits(icmp_param-&gt;skb,</div><div class='ctx'> 				      icmp_param-&gt;offset + offset,</div><div class='del'>-				      to, len, 0);</div><div class='add'>+				      to, len);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, odd);</div><div class='ctx'> 	if (icmp_pointers[icmp_param-&gt;data.icmph.type].error)</div><div class='hunk'>@@ -364,14 +366,13 @@ static int icmp_glue_bits(void *from, char *to, int offset, int len, int odd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void icmp_push_reply(struct icmp_bxm *icmp_param,</div><div class='add'>+static void icmp_push_reply(struct sock *sk,</div><div class='add'>+			    struct icmp_bxm *icmp_param,</div><div class='ctx'> 			    struct flowi4 *fl4,</div><div class='ctx'> 			    struct ipcm_cookie *ipc, struct rtable **rt)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	sk = icmp_sk(dev_net((*rt)-&gt;dst.dev));</div><div class='ctx'> 	if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param,</div><div class='ctx'> 			   icmp_param-&gt;data_len+icmp_param-&gt;head_len,</div><div class='ctx'> 			   icmp_param-&gt;head_len,</div><div class='hunk'>@@ -380,15 +381,15 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,</div><div class='ctx'> 		ip_flush_pending_frames(sk);</div><div class='ctx'> 	} else if ((skb = skb_peek(&amp;sk-&gt;sk_write_queue)) != NULL) {</div><div class='ctx'> 		struct icmphdr *icmph = icmp_hdr(skb);</div><div class='del'>-		__wsum csum = 0;</div><div class='add'>+		__wsum csum;</div><div class='ctx'> 		struct sk_buff *skb1;</div><div class='ctx'> </div><div class='add'>+		csum = csum_partial_copy_nocheck((void *)&amp;icmp_param-&gt;data,</div><div class='add'>+						 (char *)icmph,</div><div class='add'>+						 icmp_param-&gt;head_len);</div><div class='ctx'> 		skb_queue_walk(&amp;sk-&gt;sk_write_queue, skb1) {</div><div class='ctx'> 			csum = csum_add(csum, skb1-&gt;csum);</div><div class='ctx'> 		}</div><div class='del'>-		csum = csum_partial_copy_nocheck((void *)&amp;icmp_param-&gt;data,</div><div class='del'>-						 (char *)icmph,</div><div class='del'>-						 icmp_param-&gt;head_len, csum);</div><div class='ctx'> 		icmph-&gt;checksum = csum_fold(csum);</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 		ip_push_pending_frames(sk, fl4);</div><div class='hunk'>@@ -401,12 +402,12 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,</div><div class='ctx'> </div><div class='ctx'> static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ipcm_cookie ipc;</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb);</div><div class='del'>-	struct net *net = dev_net(rt-&gt;dst.dev);</div><div class='add'>+	struct net *net = dev_net_rcu(rt-&gt;dst.dev);</div><div class='add'>+	bool apply_ratelimit = false;</div><div class='add'>+	struct ipcm_cookie ipc;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct sock *sk;</div><div class='del'>-	struct inet_sock *inet;</div><div class='ctx'> 	__be32 daddr, saddr;</div><div class='ctx'> 	u32 mark = IP4_REPLY_MARK(net, skb-&gt;mark);</div><div class='ctx'> 	int type = icmp_param-&gt;data.icmph.type;</div><div class='hunk'>@@ -415,23 +416,22 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)</div><div class='ctx'> 	if (ip_options_echo(net, &amp;icmp_param-&gt;replyopts.opt.opt, skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Needed by both icmp_global_allow and icmp_xmit_lock */</div><div class='add'>+	/* Needed by both icmpv4_global_allow and icmp_xmit_lock */</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> </div><div class='del'>-	/* global icmp_msgs_per_sec */</div><div class='del'>-	if (!icmpv4_global_allow(net, type, code))</div><div class='add'>+	/* is global icmp_msgs_per_sec exhausted ? */</div><div class='add'>+	if (!icmpv4_global_allow(net, type, code, &amp;apply_ratelimit))</div><div class='ctx'> 		goto out_bh_enable;</div><div class='ctx'> </div><div class='ctx'> 	sk = icmp_xmit_lock(net);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto out_bh_enable;</div><div class='del'>-	inet = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	icmp_param-&gt;data.icmph.checksum = 0;</div><div class='ctx'> </div><div class='ctx'> 	ipcm_init(&amp;ipc);</div><div class='del'>-	inet-&gt;tos = ip_hdr(skb)-&gt;tos;</div><div class='del'>-	sk-&gt;sk_mark = mark;</div><div class='add'>+	ipc.tos = ip_hdr(skb)-&gt;tos;</div><div class='add'>+	ipc.sockc.mark = mark;</div><div class='ctx'> 	daddr = ipc.addr = ip_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	saddr = fib_compute_spec_dst(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -445,15 +445,15 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)</div><div class='ctx'> 	fl4.saddr = saddr;</div><div class='ctx'> 	fl4.flowi4_mark = mark;</div><div class='ctx'> 	fl4.flowi4_uid = sock_net_uid(net, NULL);</div><div class='del'>-	fl4.flowi4_tos = RT_TOS(ip_hdr(skb)-&gt;tos);</div><div class='add'>+	fl4.flowi4_dscp = ip4h_dscp(ip_hdr(skb));</div><div class='ctx'> 	fl4.flowi4_proto = IPPROTO_ICMP;</div><div class='ctx'> 	fl4.flowi4_oif = l3mdev_master_ifindex(skb-&gt;dev);</div><div class='del'>-	security_skb_classify_flow(skb, flowi4_to_flowi(&amp;fl4));</div><div class='add'>+	security_skb_classify_flow(skb, flowi4_to_flowi_common(&amp;fl4));</div><div class='ctx'> 	rt = ip_route_output_key(net, &amp;fl4);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	if (icmpv4_xrlim_allow(net, rt, &amp;fl4, type, code))</div><div class='del'>-		icmp_push_reply(icmp_param, &amp;fl4, &amp;ipc, &amp;rt);</div><div class='add'>+	if (icmpv4_xrlim_allow(net, rt, &amp;fl4, type, code, apply_ratelimit))</div><div class='add'>+		icmp_push_reply(sk, icmp_param, &amp;fl4, &amp;ipc, &amp;rt);</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	icmp_xmit_unlock(sk);</div><div class='hunk'>@@ -461,14 +461,31 @@ out_bh_enable:</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rtable *icmp_route_lookup(struct net *net,</div><div class='del'>-					struct flowi4 *fl4,</div><div class='add'>+/*</div><div class='add'>+ * The device used for looking up which routing table to use for sending an ICMP</div><div class='add'>+ * error is preferably the source whenever it is set, which should ensure the</div><div class='add'>+ * icmp error can be sent to the source host, else lookup using the routing</div><div class='add'>+ * table of the destination device, else use the main routing table (index 0).</div><div class='add'>+ */</div><div class='add'>+static struct net_device *icmp_get_route_lookup_dev(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	const struct dst_entry *dst;</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		return dev;</div><div class='add'>+	dst = skb_dst(skb);</div><div class='add'>+	return dst ? dst_dev(dst) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtable *icmp_route_lookup(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 					struct sk_buff *skb_in,</div><div class='del'>-					const struct iphdr *iph,</div><div class='del'>-					__be32 saddr, u8 tos, u32 mark,</div><div class='del'>-					int type, int code,</div><div class='del'>-					struct icmp_bxm *param)</div><div class='add'>+					const struct iphdr *iph, __be32 saddr,</div><div class='add'>+					dscp_t dscp, u32 mark, int type,</div><div class='add'>+					int code, struct icmp_bxm *param)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *route_lookup_dev;</div><div class='add'>+	struct dst_entry *dst, *dst2;</div><div class='ctx'> 	struct rtable *rt, *rt2;</div><div class='ctx'> 	struct flowi4 fl4_dec;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -479,13 +496,14 @@ static struct rtable *icmp_route_lookup(struct net *net,</div><div class='ctx'> 	fl4-&gt;saddr = saddr;</div><div class='ctx'> 	fl4-&gt;flowi4_mark = mark;</div><div class='ctx'> 	fl4-&gt;flowi4_uid = sock_net_uid(net, NULL);</div><div class='del'>-	fl4-&gt;flowi4_tos = RT_TOS(tos);</div><div class='add'>+	fl4-&gt;flowi4_dscp = dscp;</div><div class='ctx'> 	fl4-&gt;flowi4_proto = IPPROTO_ICMP;</div><div class='ctx'> 	fl4-&gt;fl4_icmp_type = type;</div><div class='ctx'> 	fl4-&gt;fl4_icmp_code = code;</div><div class='del'>-	fl4-&gt;flowi4_oif = l3mdev_master_ifindex(skb_dst(skb_in)-&gt;dev);</div><div class='add'>+	route_lookup_dev = icmp_get_route_lookup_dev(skb_in);</div><div class='add'>+	fl4-&gt;flowi4_oif = l3mdev_master_ifindex(route_lookup_dev);</div><div class='ctx'> </div><div class='del'>-	security_skb_classify_flow(skb_in, flowi4_to_flowi(fl4));</div><div class='add'>+	security_skb_classify_flow(skb_in, flowi4_to_flowi_common(fl4));</div><div class='ctx'> 	rt = ip_route_output_key_hash(net, fl4, skb_in);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return rt;</div><div class='hunk'>@@ -493,21 +511,25 @@ static struct rtable *icmp_route_lookup(struct net *net,</div><div class='ctx'> 	/* No need to clone since we're just using its address. */</div><div class='ctx'> 	rt2 = rt;</div><div class='ctx'> </div><div class='del'>-	rt = (struct rtable *) xfrm_lookup(net, &amp;rt-&gt;dst,</div><div class='del'>-					   flowi4_to_flowi(fl4), NULL, 0);</div><div class='del'>-	if (!IS_ERR(rt)) {</div><div class='add'>+	dst = xfrm_lookup(net, &amp;rt-&gt;dst,</div><div class='add'>+			  flowi4_to_flowi(fl4), NULL, 0);</div><div class='add'>+	rt = dst_rtable(dst);</div><div class='add'>+	if (!IS_ERR(dst)) {</div><div class='ctx'> 		if (rt != rt2)</div><div class='ctx'> 			return rt;</div><div class='del'>-	} else if (PTR_ERR(rt) == -EPERM) {</div><div class='add'>+		if (inet_addr_type_dev_table(net, route_lookup_dev,</div><div class='add'>+					     fl4-&gt;daddr) == RTN_LOCAL)</div><div class='add'>+			return rt;</div><div class='add'>+	} else if (PTR_ERR(dst) == -EPERM) {</div><div class='ctx'> 		rt = NULL;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		return rt;</div><div class='del'>-</div><div class='del'>-	err = xfrm_decode_session_reverse(skb_in, flowi4_to_flowi(&amp;fl4_dec), AF_INET);</div><div class='add'>+	}</div><div class='add'>+	err = xfrm_decode_session_reverse(net, skb_in, flowi4_to_flowi(&amp;fl4_dec), AF_INET);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto relookup_failed;</div><div class='ctx'> </div><div class='del'>-	if (inet_addr_type_dev_table(net, skb_dst(skb_in)-&gt;dev,</div><div class='add'>+	if (inet_addr_type_dev_table(net, route_lookup_dev,</div><div class='ctx'> 				     fl4_dec.saddr) == RTN_LOCAL) {</div><div class='ctx'> 		rt2 = __ip_route_output_key(net, &amp;fl4_dec);</div><div class='ctx'> 		if (IS_ERR(rt2))</div><div class='hunk'>@@ -523,32 +545,33 @@ static struct rtable *icmp_route_lookup(struct net *net,</div><div class='ctx'> 			goto relookup_failed;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Ugh! */</div><div class='del'>-		orefdst = skb_in-&gt;_skb_refdst; /* save old refdst */</div><div class='del'>-		skb_dst_set(skb_in, NULL);</div><div class='add'>+		orefdst = skb_dstref_steal(skb_in);</div><div class='ctx'> 		err = ip_route_input(skb_in, fl4_dec.daddr, fl4_dec.saddr,</div><div class='del'>-				     RT_TOS(tos), rt2-&gt;dst.dev);</div><div class='add'>+				     dscp, rt2-&gt;dst.dev) ? -EINVAL : 0;</div><div class='ctx'> </div><div class='ctx'> 		dst_release(&amp;rt2-&gt;dst);</div><div class='ctx'> 		rt2 = skb_rtable(skb_in);</div><div class='del'>-		skb_in-&gt;_skb_refdst = orefdst; /* restore old refdst */</div><div class='add'>+		/* steal dst entry from skb_in, don't drop refcnt */</div><div class='add'>+		skb_dstref_steal(skb_in);</div><div class='add'>+		skb_dstref_restore(skb_in, orefdst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto relookup_failed;</div><div class='ctx'> </div><div class='del'>-	rt2 = (struct rtable *) xfrm_lookup(net, &amp;rt2-&gt;dst,</div><div class='del'>-					    flowi4_to_flowi(&amp;fl4_dec), NULL,</div><div class='del'>-					    XFRM_LOOKUP_ICMP);</div><div class='del'>-	if (!IS_ERR(rt2)) {</div><div class='add'>+	dst2 = xfrm_lookup(net, &amp;rt2-&gt;dst, flowi4_to_flowi(&amp;fl4_dec), NULL,</div><div class='add'>+			   XFRM_LOOKUP_ICMP);</div><div class='add'>+	rt2 = dst_rtable(dst2);</div><div class='add'>+	if (!IS_ERR(dst2)) {</div><div class='ctx'> 		dst_release(&amp;rt-&gt;dst);</div><div class='ctx'> 		memcpy(fl4, &amp;fl4_dec, sizeof(*fl4));</div><div class='ctx'> 		rt = rt2;</div><div class='del'>-	} else if (PTR_ERR(rt2) == -EPERM) {</div><div class='add'>+	} else if (PTR_ERR(dst2) == -EPERM) {</div><div class='ctx'> 		if (rt)</div><div class='ctx'> 			dst_release(&amp;rt-&gt;dst);</div><div class='ctx'> 		return rt2;</div><div class='ctx'> 	} else {</div><div class='del'>-		err = PTR_ERR(rt2);</div><div class='add'>+		err = PTR_ERR(dst2);</div><div class='ctx'> 		goto relookup_failed;</div><div class='ctx'> 	}</div><div class='ctx'> 	return rt;</div><div class='hunk'>@@ -559,6 +582,185 @@ relookup_failed:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct icmp_ext_iio_addr4_subobj {</div><div class='add'>+	__be16 afi;</div><div class='add'>+	__be16 reserved;</div><div class='add'>+	__be32 addr4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int icmp_ext_iio_len(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct icmp_extobj_hdr) +</div><div class='add'>+		/* ifIndex */</div><div class='add'>+		sizeof(__be32) +</div><div class='add'>+		/* Interface Address Sub-Object */</div><div class='add'>+		sizeof(struct icmp_ext_iio_addr4_subobj) +</div><div class='add'>+		/* Interface Name Sub-Object. Length must be a multiple of 4</div><div class='add'>+		 * bytes.</div><div class='add'>+		 */</div><div class='add'>+		ALIGN(sizeof(struct icmp_ext_iio_name_subobj), 4) +</div><div class='add'>+		/* MTU */</div><div class='add'>+		sizeof(__be32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int icmp_ext_max_len(u8 ext_objs)</div><div class='add'>+{</div><div class='add'>+	unsigned int ext_max_len;</div><div class='add'>+</div><div class='add'>+	ext_max_len = sizeof(struct icmp_ext_hdr);</div><div class='add'>+</div><div class='add'>+	if (ext_objs &amp; BIT(ICMP_ERR_EXT_IIO_IIF))</div><div class='add'>+		ext_max_len += icmp_ext_iio_len();</div><div class='add'>+</div><div class='add'>+	return ext_max_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32 icmp_ext_iio_addr4_find(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	struct in_ifaddr *ifa;</div><div class='add'>+</div><div class='add'>+	in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	if (!in_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* It is unclear from RFC 5837 which IP address should be chosen, but</div><div class='add'>+	 * it makes sense to choose a global unicast address.</div><div class='add'>+	 */</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='add'>+		if (READ_ONCE(ifa-&gt;ifa_flags) &amp; IFA_F_SECONDARY)</div><div class='add'>+			continue;</div><div class='add'>+		if (ifa-&gt;ifa_scope != RT_SCOPE_UNIVERSE ||</div><div class='add'>+		    ipv4_is_multicast(ifa-&gt;ifa_address))</div><div class='add'>+			continue;</div><div class='add'>+		return ifa-&gt;ifa_address;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void icmp_ext_iio_iif_append(struct net *net, struct sk_buff *skb,</div><div class='add'>+				    int iif)</div><div class='add'>+{</div><div class='add'>+	struct icmp_ext_iio_name_subobj *name_subobj;</div><div class='add'>+	struct icmp_extobj_hdr *objh;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	__be32 data;</div><div class='add'>+</div><div class='add'>+	if (!iif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Add the fields in the order specified by RFC 5837. */</div><div class='add'>+	objh = skb_put(skb, sizeof(*objh));</div><div class='add'>+	objh-&gt;class_num = ICMP_EXT_OBJ_CLASS_IIO;</div><div class='add'>+	objh-&gt;class_type = ICMP_EXT_CTYPE_IIO_ROLE(ICMP_EXT_CTYPE_IIO_ROLE_IIF);</div><div class='add'>+</div><div class='add'>+	data = htonl(iif);</div><div class='add'>+	skb_put_data(skb, &amp;data, sizeof(__be32));</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_IFINDEX;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index_rcu(net, iif);</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data = icmp_ext_iio_addr4_find(dev);</div><div class='add'>+	if (data) {</div><div class='add'>+		struct icmp_ext_iio_addr4_subobj *addr4_subobj;</div><div class='add'>+</div><div class='add'>+		addr4_subobj = skb_put_zero(skb, sizeof(*addr4_subobj));</div><div class='add'>+		addr4_subobj-&gt;afi = htons(ICMP_AFI_IP);</div><div class='add'>+		addr4_subobj-&gt;addr4 = data;</div><div class='add'>+		objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_IPADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	name_subobj = skb_put_zero(skb, ALIGN(sizeof(*name_subobj), 4));</div><div class='add'>+	name_subobj-&gt;len = ALIGN(sizeof(*name_subobj), 4);</div><div class='add'>+	netdev_copy_name(dev, name_subobj-&gt;name);</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_NAME;</div><div class='add'>+</div><div class='add'>+	data = htonl(READ_ONCE(dev-&gt;mtu));</div><div class='add'>+	skb_put_data(skb, &amp;data, sizeof(__be32));</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_MTU;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	objh-&gt;length = htons(skb_tail_pointer(skb) - (unsigned char *)objh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void icmp_ext_objs_append(struct net *net, struct sk_buff *skb,</div><div class='add'>+				 u8 ext_objs, int iif)</div><div class='add'>+{</div><div class='add'>+	if (ext_objs &amp; BIT(ICMP_ERR_EXT_IIO_IIF))</div><div class='add'>+		icmp_ext_iio_iif_append(net, skb, iif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+icmp_ext_append(struct net *net, struct sk_buff *skb_in, struct icmphdr *icmph,</div><div class='add'>+		unsigned int room, int iif)</div><div class='add'>+{</div><div class='add'>+	unsigned int payload_len, ext_max_len, ext_len;</div><div class='add'>+	struct icmp_ext_hdr *ext_hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 ext_objs;</div><div class='add'>+	int nhoff;</div><div class='add'>+</div><div class='add'>+	switch (icmph-&gt;type) {</div><div class='add'>+	case ICMP_DEST_UNREACH:</div><div class='add'>+	case ICMP_TIME_EXCEEDED:</div><div class='add'>+	case ICMP_PARAMETERPROB:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ext_objs = READ_ONCE(net-&gt;ipv4.sysctl_icmp_errors_extension_mask);</div><div class='add'>+	if (!ext_objs)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ext_max_len = icmp_ext_max_len(ext_objs);</div><div class='add'>+	if (ICMP_EXT_ORIG_DGRAM_MIN_LEN + ext_max_len &gt; room)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(skb_in, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='add'>+	payload_len = min(skb-&gt;len - nhoff, ICMP_EXT_ORIG_DGRAM_MIN_LEN);</div><div class='add'>+</div><div class='add'>+	if (!pskb_network_may_pull(skb, payload_len))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim(skb, nhoff + ICMP_EXT_ORIG_DGRAM_MIN_LEN) ||</div><div class='add'>+	    __skb_put_padto(skb, nhoff + ICMP_EXT_ORIG_DGRAM_MIN_LEN, false))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	if (pskb_expand_head(skb, 0, ext_max_len, GFP_ATOMIC))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ext_hdr = skb_put_zero(skb, sizeof(*ext_hdr));</div><div class='add'>+	ext_hdr-&gt;version = ICMP_EXT_VERSION_2;</div><div class='add'>+</div><div class='add'>+	icmp_ext_objs_append(net, skb, ext_objs, iif);</div><div class='add'>+</div><div class='add'>+	/* Do not send an empty extension structure. */</div><div class='add'>+	ext_len = skb_tail_pointer(skb) - (unsigned char *)ext_hdr;</div><div class='add'>+	if (ext_len == sizeof(*ext_hdr))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ext_hdr-&gt;checksum = ip_compute_csum(ext_hdr, ext_len);</div><div class='add'>+	/* The length of the original datagram in 32-bit words (RFC 4884). */</div><div class='add'>+	icmph-&gt;un.reserved[1] = ICMP_EXT_ORIG_DGRAM_MIN_LEN / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Send an ICMP message in response to a situation</div><div class='ctx'>  *</div><div class='hunk'>@@ -570,12 +772,15 @@ relookup_failed:</div><div class='ctx'>  *			MUST reply to only the first fragment.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='add'>+void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,</div><div class='add'>+		 const struct inet_skb_parm *parm)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> 	int room;</div><div class='ctx'> 	struct icmp_bxm icmp_param;</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb_in);</div><div class='add'>+	bool apply_ratelimit = false;</div><div class='add'>+	struct sk_buff *ext_skb;</div><div class='ctx'> 	struct ipcm_cookie ipc;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	__be32 saddr;</div><div class='hunk'>@@ -585,8 +790,16 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	if (!rt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;dst.dev)</div><div class='add'>+		net = dev_net_rcu(rt-&gt;dst.dev);</div><div class='add'>+	else if (skb_in-&gt;dev)</div><div class='add'>+		net = dev_net_rcu(skb_in-&gt;dev);</div><div class='add'>+	else</div><div class='ctx'> 		goto out;</div><div class='del'>-	net = dev_net(rt-&gt;dst.dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Find the original header. It is expected to be valid, of course.</div><div class='hunk'>@@ -651,7 +864,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Needed by both icmp_global_allow and icmp_xmit_lock */</div><div class='add'>+	/* Needed by both icmpv4_global_allow and icmp_xmit_lock */</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> </div><div class='ctx'> 	/* Check global sysctl_icmp_msgs_per_sec ratelimit, unless</div><div class='hunk'>@@ -659,7 +872,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> 	 * loopback, then peer ratelimit still work (in icmpv4_xrlim_allow)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(skb_in-&gt;dev &amp;&amp; (skb_in-&gt;dev-&gt;flags&amp;IFF_LOOPBACK)) &amp;&amp;</div><div class='del'>-	      !icmpv4_global_allow(net, type, code))</div><div class='add'>+	      !icmpv4_global_allow(net, type, code, &amp;apply_ratelimit))</div><div class='ctx'> 		goto out_bh_enable;</div><div class='ctx'> </div><div class='ctx'> 	sk = icmp_xmit_lock(net);</div><div class='hunk'>@@ -676,22 +889,25 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		if (rt_is_input_route(rt) &amp;&amp;</div><div class='del'>-		    net-&gt;ipv4.sysctl_icmp_errors_use_inbound_ifaddr)</div><div class='del'>-			dev = dev_get_by_index_rcu(net, inet_iif(skb_in));</div><div class='add'>+		    READ_ONCE(net-&gt;ipv4.sysctl_icmp_errors_use_inbound_ifaddr))</div><div class='add'>+			dev = dev_get_by_index_rcu(net, parm-&gt;iif ? parm-&gt;iif :</div><div class='add'>+						   inet_iif(skb_in));</div><div class='ctx'> </div><div class='ctx'> 		if (dev)</div><div class='del'>-			saddr = inet_select_addr(dev, 0, RT_SCOPE_LINK);</div><div class='add'>+			saddr = inet_select_addr(dev, iph-&gt;saddr,</div><div class='add'>+						 RT_SCOPE_LINK);</div><div class='ctx'> 		else</div><div class='ctx'> 			saddr = 0;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tos = icmp_pointers[type].error ? ((iph-&gt;tos &amp; IPTOS_TOS_MASK) |</div><div class='add'>+	tos = icmp_pointers[type].error ? (RT_TOS(iph-&gt;tos) |</div><div class='ctx'> 					   IPTOS_PREC_INTERNETCONTROL) :</div><div class='del'>-					  iph-&gt;tos;</div><div class='add'>+					   iph-&gt;tos;</div><div class='ctx'> 	mark = IP4_REPLY_MARK(net, skb_in-&gt;mark);</div><div class='ctx'> </div><div class='del'>-	if (ip_options_echo(net, &amp;icmp_param.replyopts.opt.opt, skb_in))</div><div class='add'>+	if (__ip_options_echo(net, &amp;icmp_param.replyopts.opt.opt, skb_in,</div><div class='add'>+			      &amp;parm-&gt;opt))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -705,19 +921,20 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> 	icmp_param.data.icmph.checksum	 = 0;</div><div class='ctx'> 	icmp_param.skb	  = skb_in;</div><div class='ctx'> 	icmp_param.offset = skb_network_offset(skb_in);</div><div class='del'>-	inet_sk(sk)-&gt;tos = tos;</div><div class='del'>-	sk-&gt;sk_mark = mark;</div><div class='ctx'> 	ipcm_init(&amp;ipc);</div><div class='add'>+	ipc.tos = tos;</div><div class='ctx'> 	ipc.addr = iph-&gt;saddr;</div><div class='ctx'> 	ipc.opt = &amp;icmp_param.replyopts.opt;</div><div class='add'>+	ipc.sockc.mark = mark;</div><div class='ctx'> </div><div class='del'>-	rt = icmp_route_lookup(net, &amp;fl4, skb_in, iph, saddr, tos, mark,</div><div class='del'>-			       type, code, &amp;icmp_param);</div><div class='add'>+	rt = icmp_route_lookup(net, &amp;fl4, skb_in, iph, saddr,</div><div class='add'>+			       inet_dsfield_to_dscp(tos), mark, type, code,</div><div class='add'>+			       &amp;icmp_param);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* peer icmp_ratelimit */</div><div class='del'>-	if (!icmpv4_xrlim_allow(net, rt, &amp;fl4, type, code))</div><div class='add'>+	if (!icmpv4_xrlim_allow(net, rt, &amp;fl4, type, code, apply_ratelimit))</div><div class='ctx'> 		goto ende;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC says return as much as we can without exceeding 576 bytes. */</div><div class='hunk'>@@ -727,27 +944,87 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='ctx'> 		room = 576;</div><div class='ctx'> 	room -= sizeof(struct iphdr) + icmp_param.replyopts.opt.opt.optlen;</div><div class='ctx'> 	room -= sizeof(struct icmphdr);</div><div class='add'>+	/* Guard against tiny mtu. We need to include at least one</div><div class='add'>+	 * IP network header for this message to make any sense.</div><div class='add'>+	 */</div><div class='add'>+	if (room &lt;= (int)sizeof(struct iphdr))</div><div class='add'>+		goto ende;</div><div class='add'>+</div><div class='add'>+	ext_skb = icmp_ext_append(net, skb_in, &amp;icmp_param.data.icmph, room,</div><div class='add'>+				  parm-&gt;iif);</div><div class='add'>+	if (ext_skb)</div><div class='add'>+		icmp_param.skb = ext_skb;</div><div class='ctx'> </div><div class='del'>-	icmp_param.data_len = skb_in-&gt;len - icmp_param.offset;</div><div class='add'>+	icmp_param.data_len = icmp_param.skb-&gt;len - icmp_param.offset;</div><div class='ctx'> 	if (icmp_param.data_len &gt; room)</div><div class='ctx'> 		icmp_param.data_len = room;</div><div class='ctx'> 	icmp_param.head_len = sizeof(struct icmphdr);</div><div class='ctx'> </div><div class='del'>-	icmp_push_reply(&amp;icmp_param, &amp;fl4, &amp;ipc, &amp;rt);</div><div class='add'>+	/* if we don't have a source address at this point, fall back to the</div><div class='add'>+	 * dummy address instead of sending out a packet with a source address</div><div class='add'>+	 * of 0.0.0.0</div><div class='add'>+	 */</div><div class='add'>+	if (!fl4.saddr)</div><div class='add'>+		fl4.saddr = htonl(INADDR_DUMMY);</div><div class='add'>+</div><div class='add'>+	trace_icmp_send(skb_in, type, code);</div><div class='add'>+</div><div class='add'>+	icmp_push_reply(sk, &amp;icmp_param, &amp;fl4, &amp;ipc, &amp;rt);</div><div class='add'>+</div><div class='add'>+	if (ext_skb)</div><div class='add'>+		consume_skb(ext_skb);</div><div class='ctx'> ende:</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	icmp_xmit_unlock(sk);</div><div class='ctx'> out_bh_enable:</div><div class='ctx'> 	local_bh_enable();</div><div class='del'>-out:;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(icmp_send);</div><div class='add'>+EXPORT_SYMBOL(__icmp_send);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NF_NAT)</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='add'>+void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *cloned_skb = NULL;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	enum ip_conntrack_dir dir;</div><div class='add'>+	struct inet_skb_parm parm;</div><div class='add'>+	struct nf_conn *ct;</div><div class='add'>+	__be32 orig_ip;</div><div class='add'>+</div><div class='add'>+	memset(&amp;parm, 0, sizeof(parm));</div><div class='add'>+	ct = nf_ct_get(skb_in, &amp;ctinfo);</div><div class='add'>+	if (!ct || !(READ_ONCE(ct-&gt;status) &amp; IPS_NAT_MASK)) {</div><div class='add'>+		__icmp_send(skb_in, type, code, info, &amp;parm);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_shared(skb_in))</div><div class='add'>+		skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb_in || skb_network_header(skb_in) &lt; skb_in-&gt;head ||</div><div class='add'>+	    (skb_network_header(skb_in) + sizeof(struct iphdr)) &gt;</div><div class='add'>+	    skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in,</div><div class='add'>+	    skb_network_offset(skb_in) + sizeof(struct iphdr))))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	orig_ip = ip_hdr(skb_in)-&gt;saddr;</div><div class='add'>+	dir = CTINFO2DIR(ctinfo);</div><div class='add'>+	ip_hdr(skb_in)-&gt;saddr = ct-&gt;tuplehash[dir].tuple.src.u3.ip;</div><div class='add'>+	__icmp_send(skb_in, type, code, info, &amp;parm);</div><div class='add'>+	ip_hdr(skb_in)-&gt;saddr = orig_ip;</div><div class='add'>+out:</div><div class='add'>+	consume_skb(cloned_skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(icmp_ndo_send);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void icmp_socket_deliver(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	const struct net_protocol *ipprot;</div><div class='ctx'> 	int protocol = iph-&gt;protocol;</div><div class='ctx'> </div><div class='hunk'>@@ -755,7 +1032,7 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	 * avoid additional coding at protocol handlers.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!pskb_may_pull(skb, iph-&gt;ihl * 4 + 8)) {</div><div class='del'>-		__ICMP_INC_STATS(dev_net(skb-&gt;dev), ICMP_MIB_INERRORS);</div><div class='add'>+		__ICMP_INC_STATS(dev_net_rcu(skb-&gt;dev), ICMP_MIB_INERRORS);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -781,14 +1058,15 @@ static bool icmp_tag_validation(int proto)</div><div class='ctx'>  *	ICMP_PARAMETERPROB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static bool icmp_unreach(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_NOT_DROPPED_YET;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	struct icmphdr *icmph;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	u32 info = 0;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+	net = skb_dst_dev_net_rcu(skb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Incomplete header ?</div><div class='hunk'>@@ -802,8 +1080,10 @@ static bool icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> 	icmph = icmp_hdr(skb);</div><div class='ctx'> 	iph   = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (iph-&gt;ihl &lt; 5) /* Mangled header, drop. */</div><div class='add'>+	if (iph-&gt;ihl &lt; 5)  { /* Mangled header, drop. */</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INHDR;</div><div class='ctx'> 		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (icmph-&gt;type) {</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='hunk'>@@ -816,9 +1096,9 @@ static bool icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> 		case ICMP_FRAG_NEEDED:</div><div class='ctx'> 			/* for documentation of the ip_no_pmtu_disc</div><div class='ctx'> 			 * values please see</div><div class='del'>-			 * Documentation/networking/ip-sysctl.txt</div><div class='add'>+			 * Documentation/networking/ip-sysctl.rst</div><div class='ctx'> 			 */</div><div class='del'>-			switch (net-&gt;ipv4.sysctl_ip_no_pmtu_disc) {</div><div class='add'>+			switch (READ_ONCE(net-&gt;ipv4.sysctl_ip_no_pmtu_disc)) {</div><div class='ctx'> 			default:</div><div class='ctx'> 				net_dbg_ratelimited("%pI4: fragmentation needed and DF set\n",</div><div class='ctx'> 						    &amp;iph-&gt;daddr);</div><div class='hunk'>@@ -828,7 +1108,7 @@ static bool icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> 			case 3:</div><div class='ctx'> 				if (!icmp_tag_validation(iph-&gt;protocol))</div><div class='ctx'> 					goto out;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case 0:</div><div class='ctx'> 				info = ntohs(icmph-&gt;un.frag.mtu);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -871,7 +1151,7 @@ static bool icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> 	 *	get the other vendor to fix their kit.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (!net-&gt;ipv4.sysctl_icmp_ignore_bogus_error_responses &amp;&amp;</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_icmp_ignore_bogus_error_responses) &amp;&amp;</div><div class='ctx'> 	    inet_addr_type_dev_table(net, skb-&gt;dev, iph-&gt;daddr) == RTN_BROADCAST) {</div><div class='ctx'> 		net_warn_ratelimited("%pI4 sent an invalid ICMP type %u, code %u error to a broadcast: %pI4 on %s\n",</div><div class='ctx'> 				     &amp;ip_hdr(skb)-&gt;saddr,</div><div class='hunk'>@@ -883,10 +1163,10 @@ static bool icmp_unreach(struct sk_buff *skb)</div><div class='ctx'> 	icmp_socket_deliver(skb, info);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return true;</div><div class='add'>+	return reason;</div><div class='ctx'> out_err:</div><div class='ctx'> 	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='del'>-	return false;</div><div class='add'>+	return reason ?: SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -894,24 +1174,24 @@ out_err:</div><div class='ctx'>  *	Handle ICMP_REDIRECT.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static bool icmp_redirect(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmp_redirect(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(struct iphdr)) {</div><div class='del'>-		__ICMP_INC_STATS(dev_net(skb-&gt;dev), ICMP_MIB_INERRORS);</div><div class='del'>-		return false;</div><div class='add'>+		__ICMP_INC_STATS(dev_net_rcu(skb-&gt;dev), ICMP_MIB_INERRORS);</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct iphdr))) {</div><div class='ctx'> 		/* there aught to be a stat */</div><div class='del'>-		return false;</div><div class='add'>+		return SKB_DROP_REASON_NOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	icmp_socket_deliver(skb, icmp_hdr(skb)-&gt;un.gateway);</div><div class='del'>-	return true;</div><div class='add'>+	icmp_socket_deliver(skb, ntohl(icmp_hdr(skb)-&gt;un.gateway));</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Handle ICMP_ECHO ("ping") requests.</div><div class='add'>+ *	Handle ICMP_ECHO ("ping") and ICMP_EXT_ECHO ("PROBE") requests.</div><div class='ctx'>  *</div><div class='ctx'>  *	RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo</div><div class='ctx'>  *		  requests.</div><div class='hunk'>@@ -919,28 +1199,150 @@ static bool icmp_redirect(struct sk_buff *skb)</div><div class='ctx'>  *		  included in the reply.</div><div class='ctx'>  *	RFC 1812: 4.3.3.6 SHOULD have a config option for silently ignoring</div><div class='ctx'>  *		  echo requests, MUST have default=NOT.</div><div class='add'>+ *	RFC 8335: 8 MUST have a config option to enable/disable ICMP</div><div class='add'>+ *		  Extended Echo Functionality, MUST be disabled by default</div><div class='ctx'>  *	See also WRT handling of options once they are done and working.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static bool icmp_echo(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmp_echo(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct icmp_bxm icmp_param;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='del'>-	if (!net-&gt;ipv4.sysctl_icmp_echo_ignore_all) {</div><div class='del'>-		struct icmp_bxm icmp_param;</div><div class='add'>+	net = skb_dst_dev_net_rcu(skb);</div><div class='add'>+	/* should there be an ICMP stat for ignored echos? */</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_icmp_echo_ignore_all))</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='add'>+</div><div class='add'>+	icmp_param.data.icmph	   = *icmp_hdr(skb);</div><div class='add'>+	icmp_param.skb		   = skb;</div><div class='add'>+	icmp_param.offset	   = 0;</div><div class='add'>+	icmp_param.data_len	   = skb-&gt;len;</div><div class='add'>+	icmp_param.head_len	   = sizeof(struct icmphdr);</div><div class='ctx'> </div><div class='del'>-		icmp_param.data.icmph	   = *icmp_hdr(skb);</div><div class='add'>+	if (icmp_param.data.icmph.type == ICMP_ECHO)</div><div class='ctx'> 		icmp_param.data.icmph.type = ICMP_ECHOREPLY;</div><div class='del'>-		icmp_param.skb		   = skb;</div><div class='del'>-		icmp_param.offset	   = 0;</div><div class='del'>-		icmp_param.data_len	   = skb-&gt;len;</div><div class='del'>-		icmp_param.head_len	   = sizeof(struct icmphdr);</div><div class='del'>-		icmp_reply(&amp;icmp_param, skb);</div><div class='add'>+	else if (!icmp_build_probe(skb, &amp;icmp_param.data.icmph))</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='add'>+</div><div class='add'>+	icmp_reply(&amp;icmp_param, skb);</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*	Helper for icmp_echo and icmpv6_echo_reply.</div><div class='add'>+ *	Searches for net_device that matches PROBE interface identifier</div><div class='add'>+ *		and builds PROBE reply message in icmphdr.</div><div class='add'>+ *</div><div class='add'>+ *	Returns false if PROBE responses are disabled via sysctl</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+bool icmp_build_probe(struct sk_buff *skb, struct icmphdr *icmphdr)</div><div class='add'>+{</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	struct icmp_ext_hdr *ext_hdr, _ext_hdr;</div><div class='add'>+	struct icmp_ext_echo_iio *iio, _iio;</div><div class='add'>+	struct inet6_dev *in6_dev;</div><div class='add'>+	struct in_device *in_dev;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	char buff[IFNAMSIZ];</div><div class='add'>+	u16 ident_len;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_icmp_echo_enable_probe))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We currently only support probing interfaces on the proxy node</div><div class='add'>+	 * Check to ensure L-bit is set</div><div class='add'>+	 */</div><div class='add'>+	if (!(ntohs(icmphdr-&gt;un.echo.sequence) &amp; 1))</div><div class='add'>+		return false;</div><div class='add'>+	/* Clear status bits in reply message */</div><div class='add'>+	icmphdr-&gt;un.echo.sequence &amp;= htons(0xFF00);</div><div class='add'>+	if (icmphdr-&gt;type == ICMP_EXT_ECHO)</div><div class='add'>+		icmphdr-&gt;type = ICMP_EXT_ECHOREPLY;</div><div class='add'>+	else</div><div class='add'>+		icmphdr-&gt;type = ICMPV6_EXT_ECHO_REPLY;</div><div class='add'>+	ext_hdr = skb_header_pointer(skb, 0, sizeof(_ext_hdr), &amp;_ext_hdr);</div><div class='add'>+	/* Size of iio is class_type dependent.</div><div class='add'>+	 * Only check header here and assign length based on ctype in the switch statement</div><div class='add'>+	 */</div><div class='add'>+	iio = skb_header_pointer(skb, sizeof(_ext_hdr), sizeof(iio-&gt;extobj_hdr), &amp;_iio);</div><div class='add'>+	if (!ext_hdr || !iio)</div><div class='add'>+		goto send_mal_query;</div><div class='add'>+	if (ntohs(iio-&gt;extobj_hdr.length) &lt;= sizeof(iio-&gt;extobj_hdr) ||</div><div class='add'>+	    ntohs(iio-&gt;extobj_hdr.length) &gt; sizeof(_iio))</div><div class='add'>+		goto send_mal_query;</div><div class='add'>+	ident_len = ntohs(iio-&gt;extobj_hdr.length) - sizeof(iio-&gt;extobj_hdr);</div><div class='add'>+	iio = skb_header_pointer(skb, sizeof(_ext_hdr),</div><div class='add'>+				 sizeof(iio-&gt;extobj_hdr) + ident_len, &amp;_iio);</div><div class='add'>+	if (!iio)</div><div class='add'>+		goto send_mal_query;</div><div class='add'>+</div><div class='add'>+	status = 0;</div><div class='add'>+	dev = NULL;</div><div class='add'>+	switch (iio-&gt;extobj_hdr.class_type) {</div><div class='add'>+	case ICMP_EXT_ECHO_CTYPE_NAME:</div><div class='add'>+		if (ident_len &gt;= IFNAMSIZ)</div><div class='add'>+			goto send_mal_query;</div><div class='add'>+		memset(buff, 0, sizeof(buff));</div><div class='add'>+		memcpy(buff, &amp;iio-&gt;ident.name, ident_len);</div><div class='add'>+		dev = dev_get_by_name(net, buff);</div><div class='add'>+		break;</div><div class='add'>+	case ICMP_EXT_ECHO_CTYPE_INDEX:</div><div class='add'>+		if (ident_len != sizeof(iio-&gt;ident.ifindex))</div><div class='add'>+			goto send_mal_query;</div><div class='add'>+		dev = dev_get_by_index(net, ntohl(iio-&gt;ident.ifindex));</div><div class='add'>+		break;</div><div class='add'>+	case ICMP_EXT_ECHO_CTYPE_ADDR:</div><div class='add'>+		if (ident_len &lt; sizeof(iio-&gt;ident.addr.ctype3_hdr) ||</div><div class='add'>+		    ident_len != sizeof(iio-&gt;ident.addr.ctype3_hdr) +</div><div class='add'>+				 iio-&gt;ident.addr.ctype3_hdr.addrlen)</div><div class='add'>+			goto send_mal_query;</div><div class='add'>+		switch (ntohs(iio-&gt;ident.addr.ctype3_hdr.afi)) {</div><div class='add'>+		case ICMP_AFI_IP:</div><div class='add'>+			if (iio-&gt;ident.addr.ctype3_hdr.addrlen != sizeof(struct in_addr))</div><div class='add'>+				goto send_mal_query;</div><div class='add'>+			dev = ip_dev_find(net, iio-&gt;ident.addr.ip_addr.ipv4_addr);</div><div class='add'>+			break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		case ICMP_AFI_IP6:</div><div class='add'>+			if (iio-&gt;ident.addr.ctype3_hdr.addrlen != sizeof(struct in6_addr))</div><div class='add'>+				goto send_mal_query;</div><div class='add'>+			dev = ipv6_stub-&gt;ipv6_dev_find(net, &amp;iio-&gt;ident.addr.ip_addr.ipv6_addr, dev);</div><div class='add'>+			dev_hold(dev);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		default:</div><div class='add'>+			goto send_mal_query;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto send_mal_query;</div><div class='ctx'> 	}</div><div class='del'>-	/* should there be an ICMP stat for ignored echos? */</div><div class='add'>+	if (!dev) {</div><div class='add'>+		icmphdr-&gt;code = ICMP_EXT_CODE_NO_IF;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	/* Fill bits in reply message */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		status |= ICMP_EXT_ECHOREPLY_ACTIVE;</div><div class='add'>+</div><div class='add'>+	in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	if (in_dev &amp;&amp; rcu_access_pointer(in_dev-&gt;ifa_list))</div><div class='add'>+		status |= ICMP_EXT_ECHOREPLY_IPV4;</div><div class='add'>+</div><div class='add'>+	in6_dev = __in6_dev_get(dev);</div><div class='add'>+	if (in6_dev &amp;&amp; !list_empty(&amp;in6_dev-&gt;addr_list))</div><div class='add'>+		status |= ICMP_EXT_ECHOREPLY_IPV6;</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	icmphdr-&gt;un.echo.sequence |= htons(status);</div><div class='add'>+	return true;</div><div class='add'>+send_mal_query:</div><div class='add'>+	icmphdr-&gt;code = ICMP_EXT_CODE_MAL_QUERY;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(icmp_build_probe);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Handle ICMP Timestamp requests.</div><div class='hunk'>@@ -949,7 +1351,7 @@ static bool icmp_echo(struct sk_buff *skb)</div><div class='ctx'>  *		  MUST be accurate to a few minutes.</div><div class='ctx'>  *		  MUST be updated at least at 15Hz.</div><div class='ctx'>  */</div><div class='del'>-static bool icmp_timestamp(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmp_timestamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct icmp_bxm icmp_param;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -974,17 +1376,17 @@ static bool icmp_timestamp(struct sk_buff *skb)</div><div class='ctx'> 	icmp_param.data_len	   = 0;</div><div class='ctx'> 	icmp_param.head_len	   = sizeof(struct icmphdr) + 12;</div><div class='ctx'> 	icmp_reply(&amp;icmp_param, skb);</div><div class='del'>-	return true;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	__ICMP_INC_STATS(dev_net(skb_dst(skb)-&gt;dev), ICMP_MIB_INERRORS);</div><div class='del'>-	return false;</div><div class='add'>+	__ICMP_INC_STATS(skb_dst_dev_net_rcu(skb), ICMP_MIB_INERRORS);</div><div class='add'>+	return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool icmp_discard(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmp_discard(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* pretend it was a success */</div><div class='del'>-	return true;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -992,18 +1394,20 @@ static bool icmp_discard(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> int icmp_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct icmphdr *icmph;</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb);</div><div class='del'>-	struct net *net = dev_net(rt-&gt;dst.dev);</div><div class='del'>-	bool success;</div><div class='add'>+	struct net *net = dev_net_rcu(rt-&gt;dst.dev);</div><div class='add'>+	struct icmphdr *icmph;</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='ctx'> 		struct sec_path *sp = skb_sec_path(skb);</div><div class='ctx'> 		int nh;</div><div class='ctx'> </div><div class='ctx'> 		if (!(sp &amp;&amp; sp-&gt;xvec[sp-&gt;len - 1]-&gt;props.flags &amp;</div><div class='del'>-				 XFRM_STATE_ICMP))</div><div class='add'>+				 XFRM_STATE_ICMP)) {</div><div class='add'>+			reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 			goto drop;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!pskb_may_pull(skb, sizeof(*icmph) + sizeof(struct iphdr)))</div><div class='ctx'> 			goto drop;</div><div class='hunk'>@@ -1011,8 +1415,11 @@ int icmp_rcv(struct sk_buff *skb)</div><div class='ctx'> 		nh = skb_network_offset(skb);</div><div class='ctx'> 		skb_set_network_header(skb, sizeof(*icmph));</div><div class='ctx'> </div><div class='del'>-		if (!xfrm4_policy_check_reverse(NULL, XFRM_POLICY_IN, skb))</div><div class='add'>+		if (!xfrm4_policy_check_reverse(NULL, XFRM_POLICY_IN,</div><div class='add'>+						skb)) {</div><div class='add'>+			reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 			goto drop;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		skb_set_network_header(skb, nh);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1028,15 +1435,15 @@ int icmp_rcv(struct sk_buff *skb)</div><div class='ctx'> 	icmph = icmp_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 	ICMPMSGIN_INC_STATS(net, icmph-&gt;type);</div><div class='del'>-	/*</div><div class='del'>-	 *	18 is the highest 'known' ICMP type. Anything else is a mystery</div><div class='del'>-	 *</div><div class='del'>-	 *	RFC 1122: 3.2.2  Unknown ICMP messages types MUST be silently</div><div class='del'>-	 *		  discarded.</div><div class='del'>-	 */</div><div class='del'>-	if (icmph-&gt;type &gt; NR_ICMP_TYPES)</div><div class='del'>-		goto error;</div><div class='ctx'> </div><div class='add'>+	/* Check for ICMP Extended Echo (PROBE) messages */</div><div class='add'>+	if (icmph-&gt;type == ICMP_EXT_ECHO) {</div><div class='add'>+		/* We can't use icmp_pointers[].handler() because it is an array of</div><div class='add'>+		 * size NR_ICMP_TYPES + 1 (19 elements) and PROBE has code 42.</div><div class='add'>+		 */</div><div class='add'>+		reason = icmp_echo(skb);</div><div class='add'>+		goto reason_check;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Parse the ICMP message</div><div class='hunk'>@@ -1051,42 +1458,121 @@ int icmp_rcv(struct sk_buff *skb)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((icmph-&gt;type == ICMP_ECHO ||</div><div class='ctx'> 		     icmph-&gt;type == ICMP_TIMESTAMP) &amp;&amp;</div><div class='del'>-		    net-&gt;ipv4.sysctl_icmp_echo_ignore_broadcasts) {</div><div class='add'>+		    READ_ONCE(net-&gt;ipv4.sysctl_icmp_echo_ignore_broadcasts)) {</div><div class='add'>+			reason = SKB_DROP_REASON_INVALID_PROTO;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (icmph-&gt;type != ICMP_ECHO &amp;&amp;</div><div class='ctx'> 		    icmph-&gt;type != ICMP_TIMESTAMP &amp;&amp;</div><div class='ctx'> 		    icmph-&gt;type != ICMP_ADDRESS &amp;&amp;</div><div class='ctx'> 		    icmph-&gt;type != ICMP_ADDRESSREPLY) {</div><div class='add'>+			reason = SKB_DROP_REASON_INVALID_PROTO;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	success = icmp_pointers[icmph-&gt;type].handler(skb);</div><div class='add'>+	if (icmph-&gt;type == ICMP_EXT_ECHOREPLY ||</div><div class='add'>+	    icmph-&gt;type == ICMP_ECHOREPLY) {</div><div class='add'>+		reason = ping_rcv(skb);</div><div class='add'>+		return reason ? NET_RX_DROP : NET_RX_SUCCESS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (success)  {</div><div class='add'>+	/*</div><div class='add'>+	 *	18 is the highest 'known' ICMP type. Anything else is a mystery</div><div class='add'>+	 *</div><div class='add'>+	 *	RFC 1122: 3.2.2  Unknown ICMP messages types MUST be silently</div><div class='add'>+	 *		  discarded.</div><div class='add'>+	 */</div><div class='add'>+	if (icmph-&gt;type &gt; NR_ICMP_TYPES) {</div><div class='add'>+		reason = SKB_DROP_REASON_UNHANDLED_PROTO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reason = icmp_pointers[icmph-&gt;type].handler(skb);</div><div class='add'>+reason_check:</div><div class='add'>+	if (!reason)  {</div><div class='ctx'> 		consume_skb(skb);</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> csum_error:</div><div class='add'>+	reason = SKB_DROP_REASON_ICMP_CSUM;</div><div class='ctx'> 	__ICMP_INC_STATS(net, ICMP_MIB_CSUMERRORS);</div><div class='ctx'> error:</div><div class='ctx'> 	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='ctx'> 	goto drop;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void icmp_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static bool ip_icmp_error_rfc4884_validate(const struct sk_buff *skb, int off)</div><div class='add'>+{</div><div class='add'>+	struct icmp_extobj_hdr *objh, _objh;</div><div class='add'>+	struct icmp_ext_hdr *exth, _exth;</div><div class='add'>+	u16 olen;</div><div class='add'>+</div><div class='add'>+	exth = skb_header_pointer(skb, off, sizeof(_exth), &amp;_exth);</div><div class='add'>+	if (!exth)</div><div class='add'>+		return false;</div><div class='add'>+	if (exth-&gt;version != 2)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (exth-&gt;checksum &amp;&amp;</div><div class='add'>+	    csum_fold(skb_checksum(skb, off, skb-&gt;len - off, 0)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	off += sizeof(_exth);</div><div class='add'>+	while (off &lt; skb-&gt;len) {</div><div class='add'>+		objh = skb_header_pointer(skb, off, sizeof(_objh), &amp;_objh);</div><div class='add'>+		if (!objh)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		olen = ntohs(objh-&gt;length);</div><div class='add'>+		if (olen &lt; sizeof(_objh))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		off += olen;</div><div class='add'>+		if (off &gt; skb-&gt;len)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ip_icmp_error_rfc4884(const struct sk_buff *skb,</div><div class='add'>+			   struct sock_ee_data_rfc4884 *out,</div><div class='add'>+			   int thlen, int off)</div><div class='add'>+{</div><div class='add'>+	int hlen;</div><div class='add'>+</div><div class='add'>+	/* original datagram headers: end of icmph to payload (skb-&gt;data) */</div><div class='add'>+	hlen = -skb_transport_offset(skb) - thlen;</div><div class='add'>+</div><div class='add'>+	/* per rfc 4884: minimal datagram length of 128 bytes */</div><div class='add'>+	if (off &lt; 128 || off &lt; hlen)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* kernel has stripped headers: return payload offset in bytes */</div><div class='add'>+	off -= hlen;</div><div class='add'>+	if (off + sizeof(struct icmp_ext_hdr) &gt; skb-&gt;len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	out-&gt;len = off;</div><div class='add'>+</div><div class='add'>+	if (!ip_icmp_error_rfc4884_validate(skb, off))</div><div class='add'>+		out-&gt;flags |= SO_EE_RFC4884_FLAG_INVALID;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_icmp_error_rfc4884);</div><div class='add'>+</div><div class='add'>+int icmp_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph = (struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	int offset = iph-&gt;ihl&lt;&lt;2;</div><div class='ctx'> 	struct icmphdr *icmph = (struct icmphdr *)(skb-&gt;data + offset);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	int code = icmp_hdr(skb)-&gt;code;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use ping_err to handle all icmp errors except those</div><div class='hunk'>@@ -1094,13 +1580,15 @@ void icmp_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (icmph-&gt;type != ICMP_ECHOREPLY) {</div><div class='ctx'> 		ping_err(skb, offset, info);</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMP_DEST_UNREACH &amp;&amp; code == ICMP_FRAG_NEEDED)</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ICMP, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ICMP);</div><div class='ctx'> 	else if (type == ICMP_REDIRECT)</div><div class='del'>-		ipv4_redirect(skb, net, 0, 0, IPPROTO_ICMP, 0);</div><div class='add'>+		ipv4_redirect(skb, net, 0, IPPROTO_ICMP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1177,48 +1665,11 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __net_exit icmp_sk_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i)</div><div class='del'>-		inet_ctl_sock_destroy(*per_cpu_ptr(net-&gt;ipv4.icmp_sk, i));</div><div class='del'>-	free_percpu(net-&gt;ipv4.icmp_sk);</div><div class='del'>-	net-&gt;ipv4.icmp_sk = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __net_init icmp_sk_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	net-&gt;ipv4.icmp_sk = alloc_percpu(struct sock *);</div><div class='del'>-	if (!net-&gt;ipv4.icmp_sk)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		struct sock *sk;</div><div class='del'>-</div><div class='del'>-		err = inet_ctl_sock_create(&amp;sk, PF_INET,</div><div class='del'>-					   SOCK_RAW, IPPROTO_ICMP, net);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		*per_cpu_ptr(net-&gt;ipv4.icmp_sk, i) = sk;</div><div class='del'>-</div><div class='del'>-		/* Enough space for 2 64K ICMP packets, including</div><div class='del'>-		 * sk_buff/skb_shared_info struct overhead.</div><div class='del'>-		 */</div><div class='del'>-		sk-&gt;sk_sndbuf =	2 * SKB_TRUESIZE(64 * 1024);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Speedup sock_wfree()</div><div class='del'>-		 */</div><div class='del'>-		sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);</div><div class='del'>-		inet_sk(sk)-&gt;pmtudisc = IP_PMTUDISC_DONT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Control parameters for ECHO replies. */</div><div class='ctx'> 	net-&gt;ipv4.sysctl_icmp_echo_ignore_all = 0;</div><div class='add'>+	net-&gt;ipv4.sysctl_icmp_echo_enable_probe = 0;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_icmp_echo_ignore_broadcasts = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Control parameter - ignore bogus broadcast responses? */</div><div class='hunk'>@@ -1239,22 +1690,41 @@ static int __net_init icmp_sk_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv4.sysctl_icmp_ratelimit = 1 * HZ;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_icmp_ratemask = 0x1818;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_icmp_errors_use_inbound_ifaddr = 0;</div><div class='add'>+	net-&gt;ipv4.sysctl_icmp_errors_extension_mask = 0;</div><div class='add'>+	net-&gt;ipv4.sysctl_icmp_msgs_per_sec = 1000;</div><div class='add'>+	net-&gt;ipv4.sysctl_icmp_msgs_burst = 50;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	for_each_possible_cpu(i)</div><div class='del'>-		inet_ctl_sock_destroy(*per_cpu_ptr(net-&gt;ipv4.icmp_sk, i));</div><div class='del'>-	free_percpu(net-&gt;ipv4.icmp_sk);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations __net_initdata icmp_sk_ops = {</div><div class='ctx'>        .init = icmp_sk_init,</div><div class='del'>-       .exit = icmp_sk_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init icmp_init(void)</div><div class='ctx'> {</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		struct sock *sk;</div><div class='add'>+</div><div class='add'>+		err = inet_ctl_sock_create(&amp;sk, PF_INET,</div><div class='add'>+					   SOCK_RAW, IPPROTO_ICMP, &amp;init_net);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		per_cpu(ipv4_icmp_sk, i) = sk;</div><div class='add'>+</div><div class='add'>+		/* Enough space for 2 64K ICMP packets, including</div><div class='add'>+		 * sk_buff/skb_shared_info struct overhead.</div><div class='add'>+		 */</div><div class='add'>+		sk-&gt;sk_sndbuf =	2 * SKB_TRUESIZE(64 * 1024);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Speedup sock_wfree()</div><div class='add'>+		 */</div><div class='add'>+		sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);</div><div class='add'>+		inet_sk(sk)-&gt;pmtudisc = IP_PMTUDISC_DONT;</div><div class='add'>+	}</div><div class='ctx'> 	return register_pernet_subsys(&amp;icmp_sk_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c<br/>index 4da39446da2d..7182f1419c2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/igmp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/igmp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/igmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/igmp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux NET3:	Internet Group Management Protocol  [IGMP]</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +12,6 @@</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *		Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Fixes:</div><div class='ctx'>  *</div><div class='ctx'>  *		Alan Cox	:	Added lots of __inline__ to optimise</div><div class='hunk'>@@ -85,6 +81,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/igmp.h&gt;</div><div class='add'>+#include "igmp_internal.h"</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='hunk'>@@ -92,6 +89,8 @@</div><div class='ctx'> #include &lt;linux/byteorder/generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -111,13 +110,8 @@</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> /* Parameter names and values are taken from igmp-v2-06 draft */</div><div class='ctx'> </div><div class='del'>-#define IGMP_V1_ROUTER_PRESENT_TIMEOUT		(400*HZ)</div><div class='del'>-#define IGMP_V2_ROUTER_PRESENT_TIMEOUT		(400*HZ)</div><div class='del'>-#define IGMP_V2_UNSOLICITED_REPORT_INTERVAL	(10*HZ)</div><div class='del'>-#define IGMP_V3_UNSOLICITED_REPORT_INTERVAL	(1*HZ)</div><div class='add'>+#define IGMP_QUERY_INTERVAL			(125*HZ)</div><div class='ctx'> #define IGMP_QUERY_RESPONSE_INTERVAL		(10*HZ)</div><div class='del'>-#define IGMP_QUERY_ROBUSTNESS_VARIABLE		2</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #define IGMP_INITIAL_REPORT_DELAY		(1)</div><div class='ctx'> </div><div class='hunk'>@@ -129,12 +123,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define IGMP_V1_SEEN(in_dev) \</div><div class='del'>-	(IPV4_DEVCONF_ALL(dev_net(in_dev-&gt;dev), FORCE_IGMP_VERSION) == 1 || \</div><div class='add'>+	(IPV4_DEVCONF_ALL_RO(dev_net(in_dev-&gt;dev), FORCE_IGMP_VERSION) == 1 || \</div><div class='ctx'> 	 IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 1 || \</div><div class='ctx'> 	 ((in_dev)-&gt;mr_v1_seen &amp;&amp; \</div><div class='ctx'> 	  time_before(jiffies, (in_dev)-&gt;mr_v1_seen)))</div><div class='ctx'> #define IGMP_V2_SEEN(in_dev) \</div><div class='del'>-	(IPV4_DEVCONF_ALL(dev_net(in_dev-&gt;dev), FORCE_IGMP_VERSION) == 2 || \</div><div class='add'>+	(IPV4_DEVCONF_ALL_RO(dev_net(in_dev-&gt;dev), FORCE_IGMP_VERSION) == 2 || \</div><div class='ctx'> 	 IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 2 || \</div><div class='ctx'> 	 ((in_dev)-&gt;mr_v2_seen &amp;&amp; \</div><div class='ctx'> 	  time_before(jiffies, (in_dev)-&gt;mr_v2_seen)))</div><div class='hunk'>@@ -162,7 +156,8 @@ static int unsolicited_report_interval(struct in_device *in_dev)</div><div class='ctx'> 	return interval_jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im);</div><div class='add'>+static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im,</div><div class='add'>+			      gfp_t gfp);</div><div class='ctx'> static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im);</div><div class='ctx'> static void igmpv3_clear_delrec(struct in_device *in_dev);</div><div class='ctx'> static int sf_setstate(struct ip_mc_list *pmc);</div><div class='hunk'>@@ -190,6 +185,17 @@ static void ip_ma_put(struct ip_mc_list *im)</div><div class='ctx'> 	     pmc != NULL;					\</div><div class='ctx'> 	     pmc = rtnl_dereference(pmc-&gt;next_rcu))</div><div class='ctx'> </div><div class='add'>+static void ip_sf_list_clear_all(struct ip_sf_list *psf)</div><div class='add'>+{</div><div class='add'>+	struct ip_sf_list *next;</div><div class='add'>+</div><div class='add'>+	while (psf) {</div><div class='add'>+		next = psf-&gt;sf_next;</div><div class='add'>+		kfree(psf);</div><div class='add'>+		psf = next;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -199,7 +205,7 @@ static void ip_ma_put(struct ip_mc_list *im)</div><div class='ctx'> static void igmp_stop_timer(struct ip_mc_list *im)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;im-&gt;lock);</div><div class='del'>-	if (del_timer(&amp;im-&gt;timer))</div><div class='add'>+	if (timer_delete(&amp;im-&gt;timer))</div><div class='ctx'> 		refcount_dec(&amp;im-&gt;refcnt);</div><div class='ctx'> 	im-&gt;tm_running = 0;</div><div class='ctx'> 	im-&gt;reporter = 0;</div><div class='hunk'>@@ -210,16 +216,18 @@ static void igmp_stop_timer(struct ip_mc_list *im)</div><div class='ctx'> /* It must be called with locked im-&gt;lock */</div><div class='ctx'> static void igmp_start_timer(struct ip_mc_list *im, int max_delay)</div><div class='ctx'> {</div><div class='del'>-	int tv = prandom_u32() % max_delay;</div><div class='add'>+	int tv = get_random_u32_below(max_delay);</div><div class='ctx'> </div><div class='ctx'> 	im-&gt;tm_running = 1;</div><div class='del'>-	if (!mod_timer(&amp;im-&gt;timer, jiffies+tv+2))</div><div class='del'>-		refcount_inc(&amp;im-&gt;refcnt);</div><div class='add'>+	if (refcount_inc_not_zero(&amp;im-&gt;refcnt)) {</div><div class='add'>+		if (mod_timer(&amp;im-&gt;timer, jiffies + tv + 2))</div><div class='add'>+			ip_ma_put(im);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void igmp_gq_start_timer(struct in_device *in_dev)</div><div class='ctx'> {</div><div class='del'>-	int tv = prandom_u32() % in_dev-&gt;mr_maxdelay;</div><div class='add'>+	int tv = get_random_u32_below(in_dev-&gt;mr_maxdelay);</div><div class='ctx'> 	unsigned long exp = jiffies + tv + 2;</div><div class='ctx'> </div><div class='ctx'> 	if (in_dev-&gt;mr_gq_running &amp;&amp;</div><div class='hunk'>@@ -233,7 +241,7 @@ static void igmp_gq_start_timer(struct in_device *in_dev)</div><div class='ctx'> </div><div class='ctx'> static void igmp_ifc_start_timer(struct in_device *in_dev, int delay)</div><div class='ctx'> {</div><div class='del'>-	int tv = prandom_u32() % delay;</div><div class='add'>+	int tv = get_random_u32_below(delay);</div><div class='ctx'> </div><div class='ctx'> 	if (!mod_timer(&amp;in_dev-&gt;mr_ifc_timer, jiffies+tv+2))</div><div class='ctx'> 		in_dev_hold(in_dev);</div><div class='hunk'>@@ -243,7 +251,7 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;im-&gt;lock);</div><div class='ctx'> 	im-&gt;unsolicit_count = 0;</div><div class='del'>-	if (del_timer(&amp;im-&gt;timer)) {</div><div class='add'>+	if (timer_delete(&amp;im-&gt;timer)) {</div><div class='ctx'> 		if ((long)(im-&gt;timer.expires-jiffies) &lt; max_delay) {</div><div class='ctx'> 			add_timer(&amp;im-&gt;timer);</div><div class='ctx'> 			im-&gt;tm_running = 1;</div><div class='hunk'>@@ -327,14 +335,15 @@ static __be32 igmpv3_get_srcaddr(struct net_device *dev,</div><div class='ctx'> 				 const struct flowi4 *fl4)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> </div><div class='ctx'> 	if (!in_dev)</div><div class='ctx'> 		return htonl(INADDR_ANY);</div><div class='ctx'> </div><div class='del'>-	for_ifa(in_dev) {</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, in_dev) {</div><div class='ctx'> 		if (fl4-&gt;saddr == ifa-&gt;ifa_local)</div><div class='ctx'> 			return fl4-&gt;saddr;</div><div class='del'>-	} endfor_ifa(in_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return htonl(INADDR_ANY);</div><div class='ctx'> }</div><div class='hunk'>@@ -349,8 +358,9 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, unsigned int mtu)</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	int hlen = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	int tlen = dev-&gt;needed_tailroom;</div><div class='del'>-	unsigned int size = mtu;</div><div class='add'>+	unsigned int size;</div><div class='ctx'> </div><div class='add'>+	size = min(mtu, IP_MAX_MTU);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		skb = alloc_skb(size + hlen + tlen,</div><div class='ctx'> 				GFP_ATOMIC | __GFP_NOWARN);</div><div class='hunk'>@@ -417,7 +427,7 @@ static int igmpv3_sendpack(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	pig-&gt;csum = ip_compute_csum(igmp_hdr(skb), igmplen);</div><div class='ctx'> </div><div class='del'>-	return ip_local_out(dev_net(skb_dst(skb)-&gt;dev), skb-&gt;sk, skb);</div><div class='add'>+	return ip_local_out(skb_dst_dev_net(skb), skb-&gt;sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int grec_size(struct ip_mc_list *pmc, int type, int gdel, int sdel)</div><div class='hunk'>@@ -463,7 +473,8 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,</div><div class='ctx'> </div><div class='ctx'> 	if (pmc-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 		return skb;</div><div class='del'>-	if (ipv4_is_local_multicast(pmc-&gt;multiaddr) &amp;&amp; !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+	if (ipv4_is_local_multicast(pmc-&gt;multiaddr) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 		return skb;</div><div class='ctx'> </div><div class='ctx'> 	mtu = READ_ONCE(dev-&gt;mtu);</div><div class='hunk'>@@ -589,7 +600,7 @@ static int igmpv3_send_report(struct in_device *in_dev, struct ip_mc_list *pmc)</div><div class='ctx'> 			if (pmc-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (ipv4_is_local_multicast(pmc-&gt;multiaddr) &amp;&amp;</div><div class='del'>-			     !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+			    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			spin_lock_bh(&amp;pmc-&gt;lock);</div><div class='ctx'> 			if (pmc-&gt;sfcount[MCAST_EXCLUDE])</div><div class='hunk'>@@ -635,6 +646,13 @@ static void igmpv3_clear_zeros(struct ip_sf_list **ppsf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kfree_pmc(struct ip_mc_list *pmc)</div><div class='add'>+{</div><div class='add'>+	ip_sf_list_clear_all(pmc-&gt;sources);</div><div class='add'>+	ip_sf_list_clear_all(pmc-&gt;tomb);</div><div class='add'>+	kfree(pmc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void igmpv3_send_cr(struct in_device *in_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_mc_list *pmc, *pmc_prev, *pmc_next;</div><div class='hunk'>@@ -671,7 +689,7 @@ static void igmpv3_send_cr(struct in_device *in_dev)</div><div class='ctx'> 			else</div><div class='ctx'> 				in_dev-&gt;mc_tomb = pmc_next;</div><div class='ctx'> 			in_dev_put(pmc-&gt;interface);</div><div class='del'>-			kfree(pmc);</div><div class='add'>+			kfree_pmc(pmc);</div><div class='ctx'> 		} else</div><div class='ctx'> 			pmc_prev = pmc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -725,7 +743,8 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,</div><div class='ctx'> 	if (type == IGMPV3_HOST_MEMBERSHIP_REPORT)</div><div class='ctx'> 		return igmpv3_send_report(in_dev, pmc);</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_local_multicast(group) &amp;&amp; !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+	if (ipv4_is_local_multicast(group) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (type == IGMP_HOST_LEAVE_MESSAGE)</div><div class='hunk'>@@ -782,7 +801,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,</div><div class='ctx'> </div><div class='ctx'> static void igmp_gq_timer_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = from_timer(in_dev, t, mr_gq_timer);</div><div class='add'>+	struct in_device *in_dev = timer_container_of(in_dev, t, mr_gq_timer);</div><div class='ctx'> </div><div class='ctx'> 	in_dev-&gt;mr_gq_running = 0;</div><div class='ctx'> 	igmpv3_send_report(in_dev, NULL);</div><div class='hunk'>@@ -791,11 +810,18 @@ static void igmp_gq_timer_expire(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void igmp_ifc_timer_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct in_device *in_dev = from_timer(in_dev, t, mr_ifc_timer);</div><div class='add'>+	struct in_device *in_dev = timer_container_of(in_dev, t, mr_ifc_timer);</div><div class='add'>+	u32 mr_ifc_count;</div><div class='ctx'> </div><div class='ctx'> 	igmpv3_send_cr(in_dev);</div><div class='del'>-	if (in_dev-&gt;mr_ifc_count) {</div><div class='del'>-		in_dev-&gt;mr_ifc_count--;</div><div class='add'>+restart:</div><div class='add'>+	mr_ifc_count = READ_ONCE(in_dev-&gt;mr_ifc_count);</div><div class='add'>+</div><div class='add'>+	if (mr_ifc_count) {</div><div class='add'>+		if (cmpxchg(&amp;in_dev-&gt;mr_ifc_count,</div><div class='add'>+			    mr_ifc_count,</div><div class='add'>+			    mr_ifc_count - 1) != mr_ifc_count)</div><div class='add'>+			goto restart;</div><div class='ctx'> 		igmp_ifc_start_timer(in_dev,</div><div class='ctx'> 				     unsolicited_report_interval(in_dev));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -807,14 +833,14 @@ static void igmp_ifc_event(struct in_device *in_dev)</div><div class='ctx'> 	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='ctx'> 	if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev))</div><div class='ctx'> 		return;</div><div class='del'>-	in_dev-&gt;mr_ifc_count = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+	WRITE_ONCE(in_dev-&gt;mr_ifc_count, in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv));</div><div class='ctx'> 	igmp_ifc_start_timer(in_dev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void igmp_timer_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ip_mc_list *im = from_timer(im, t, timer);</div><div class='add'>+	struct ip_mc_list *im = timer_container_of(im, t, timer);</div><div class='ctx'> 	struct in_device *in_dev = im-&gt;interface;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;im-&gt;lock);</div><div class='hunk'>@@ -902,7 +928,8 @@ static bool igmp_heard_report(struct in_device *in_dev, __be32 group)</div><div class='ctx'> </div><div class='ctx'> 	if (group == IGMP_ALL_HOSTS)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (ipv4_is_local_multicast(group) &amp;&amp; !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+	if (ipv4_is_local_multicast(group) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -935,17 +962,19 @@ static bool igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 			max_delay = IGMP_QUERY_RESPONSE_INTERVAL;</div><div class='ctx'> 			in_dev-&gt;mr_v1_seen = jiffies +</div><div class='del'>-				IGMP_V1_ROUTER_PRESENT_TIMEOUT;</div><div class='add'>+				(in_dev-&gt;mr_qrv * in_dev-&gt;mr_qi) +</div><div class='add'>+				in_dev-&gt;mr_qri;</div><div class='ctx'> 			group = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* v2 router present */</div><div class='ctx'> 			max_delay = ih-&gt;code*(HZ/IGMP_TIMER_SCALE);</div><div class='ctx'> 			in_dev-&gt;mr_v2_seen = jiffies +</div><div class='del'>-				IGMP_V2_ROUTER_PRESENT_TIMEOUT;</div><div class='add'>+				(in_dev-&gt;mr_qrv * in_dev-&gt;mr_qi) +</div><div class='add'>+				in_dev-&gt;mr_qri;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* cancel the interface change timer */</div><div class='del'>-		in_dev-&gt;mr_ifc_count = 0;</div><div class='del'>-		if (del_timer(&amp;in_dev-&gt;mr_ifc_timer))</div><div class='add'>+		WRITE_ONCE(in_dev-&gt;mr_ifc_count, 0);</div><div class='add'>+		if (timer_delete(&amp;in_dev-&gt;mr_ifc_timer))</div><div class='ctx'> 			__in_dev_put(in_dev);</div><div class='ctx'> 		/* clear deleted report items */</div><div class='ctx'> 		igmpv3_clear_delrec(in_dev);</div><div class='hunk'>@@ -981,8 +1010,21 @@ static bool igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,</div><div class='ctx'> 		if (!max_delay)</div><div class='ctx'> 			max_delay = 1;	/* can't mod w/ 0 */</div><div class='ctx'> 		in_dev-&gt;mr_maxdelay = max_delay;</div><div class='del'>-		if (ih3-&gt;qrv)</div><div class='del'>-			in_dev-&gt;mr_qrv = ih3-&gt;qrv;</div><div class='add'>+</div><div class='add'>+		/* RFC3376, 4.1.6. QRV and 4.1.7. QQIC, when the most recently</div><div class='add'>+		 * received value was zero, use the default or statically</div><div class='add'>+		 * configured value.</div><div class='add'>+		 */</div><div class='add'>+		in_dev-&gt;mr_qrv = ih3-&gt;qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+		in_dev-&gt;mr_qi = IGMPV3_QQIC(ih3-&gt;qqic)*HZ ?: IGMP_QUERY_INTERVAL;</div><div class='add'>+</div><div class='add'>+		/* RFC3376, 8.3. Query Response Interval:</div><div class='add'>+		 * The number of seconds represented by the [Query Response</div><div class='add'>+		 * Interval] must be less than the [Query Interval].</div><div class='add'>+		 */</div><div class='add'>+		if (in_dev-&gt;mr_qri &gt;= in_dev-&gt;mr_qi)</div><div class='add'>+			in_dev-&gt;mr_qri = (in_dev-&gt;mr_qi/HZ - 1)*HZ;</div><div class='add'>+</div><div class='ctx'> 		if (!group) { /* general query */</div><div class='ctx'> 			if (ih3-&gt;nsrcs)</div><div class='ctx'> 				return true;	/* no sources allowed */</div><div class='hunk'>@@ -1012,7 +1054,7 @@ static bool igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,</div><div class='ctx'> 		if (im-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp;</div><div class='del'>-		    !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+		    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_lock_bh(&amp;im-&gt;lock);</div><div class='ctx'> 		if (im-&gt;tm_running)</div><div class='hunk'>@@ -1133,7 +1175,8 @@ static void ip_mc_filter_del(struct in_device *in_dev, __be32 addr)</div><div class='ctx'> /*</div><div class='ctx'>  * deleted ip_mc_list manipulation</div><div class='ctx'>  */</div><div class='del'>-static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)</div><div class='add'>+static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im,</div><div class='add'>+			      gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_mc_list *pmc;</div><div class='ctx'> 	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='hunk'>@@ -1144,7 +1187,7 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)</div><div class='ctx'> 	 * for deleted items allows change reports to use common code with</div><div class='ctx'> 	 * non-deleted or query-response MCA's.</div><div class='ctx'> 	 */</div><div class='del'>-	pmc = kzalloc(sizeof(*pmc), GFP_KERNEL);</div><div class='add'>+	pmc = kzalloc(sizeof(*pmc), gfp);</div><div class='ctx'> 	if (!pmc)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock_init(&amp;pmc-&gt;lock);</div><div class='hunk'>@@ -1152,7 +1195,7 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)</div><div class='ctx'> 	pmc-&gt;interface = im-&gt;interface;</div><div class='ctx'> 	in_dev_hold(in_dev);</div><div class='ctx'> 	pmc-&gt;multiaddr = im-&gt;multiaddr;</div><div class='del'>-	pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+	pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> 	pmc-&gt;sfmode = im-&gt;sfmode;</div><div class='ctx'> 	if (pmc-&gt;sfmode == MCAST_INCLUDE) {</div><div class='ctx'> 		struct ip_sf_list *psf;</div><div class='hunk'>@@ -1200,15 +1243,17 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im)</div><div class='ctx'> 	if (pmc) {</div><div class='ctx'> 		im-&gt;interface = pmc-&gt;interface;</div><div class='ctx'> 		if (im-&gt;sfmode == MCAST_INCLUDE) {</div><div class='del'>-			im-&gt;tomb = pmc-&gt;tomb;</div><div class='del'>-			im-&gt;sources = pmc-&gt;sources;</div><div class='add'>+			swap(im-&gt;tomb, pmc-&gt;tomb);</div><div class='add'>+			swap(im-&gt;sources, pmc-&gt;sources);</div><div class='ctx'> 			for (psf = im-&gt;sources; psf; psf = psf-&gt;sf_next)</div><div class='del'>-				psf-&gt;sf_crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+				psf-&gt;sf_crcount = in_dev-&gt;mr_qrv ?:</div><div class='add'>+					READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> 		} else {</div><div class='del'>-			im-&gt;crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+			im-&gt;crcount = in_dev-&gt;mr_qrv ?:</div><div class='add'>+				READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> 		}</div><div class='ctx'> 		in_dev_put(pmc-&gt;interface);</div><div class='del'>-		kfree(pmc);</div><div class='add'>+		kfree_pmc(pmc);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;im-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1229,27 +1274,24 @@ static void igmpv3_clear_delrec(struct in_device *in_dev)</div><div class='ctx'> 		nextpmc = pmc-&gt;next;</div><div class='ctx'> 		ip_mc_clear_src(pmc);</div><div class='ctx'> 		in_dev_put(pmc-&gt;interface);</div><div class='del'>-		kfree(pmc);</div><div class='add'>+		kfree_pmc(pmc);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clear dead sources, too */</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for_each_pmc_rcu(in_dev, pmc) {</div><div class='del'>-		struct ip_sf_list *psf, *psf_next;</div><div class='add'>+		struct ip_sf_list *psf;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;pmc-&gt;lock);</div><div class='ctx'> 		psf = pmc-&gt;tomb;</div><div class='ctx'> 		pmc-&gt;tomb = NULL;</div><div class='ctx'> 		spin_unlock_bh(&amp;pmc-&gt;lock);</div><div class='del'>-		for (; psf; psf = psf_next) {</div><div class='del'>-			psf_next = psf-&gt;sf_next;</div><div class='del'>-			kfree(psf);</div><div class='del'>-		}</div><div class='add'>+		ip_sf_list_clear_all(psf);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void igmp_group_dropped(struct ip_mc_list *im)</div><div class='add'>+static void __igmp_group_dropped(struct ip_mc_list *im, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_device *in_dev = im-&gt;interface;</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='hunk'>@@ -1265,7 +1307,8 @@ static void igmp_group_dropped(struct ip_mc_list *im)</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 	if (im-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 		return;</div><div class='del'>-	if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp; !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+	if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	reporter = im-&gt;reporter;</div><div class='hunk'>@@ -1280,13 +1323,18 @@ static void igmp_group_dropped(struct ip_mc_list *im)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* IGMPv3 */</div><div class='del'>-		igmpv3_add_delrec(in_dev, im);</div><div class='add'>+		igmpv3_add_delrec(in_dev, im, gfp);</div><div class='ctx'> </div><div class='ctx'> 		igmp_ifc_event(in_dev);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void igmp_group_dropped(struct ip_mc_list *im)</div><div class='add'>+{</div><div class='add'>+	__igmp_group_dropped(im, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void igmp_group_added(struct ip_mc_list *im)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_device *in_dev = im-&gt;interface;</div><div class='hunk'>@@ -1302,13 +1350,14 @@ static void igmp_group_added(struct ip_mc_list *im)</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 	if (im-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 		return;</div><div class='del'>-	if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp; !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+	if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (in_dev-&gt;dead)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	im-&gt;unsolicit_count = net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+	im-&gt;unsolicit_count = READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> 	if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev)) {</div><div class='ctx'> 		spin_lock_bh(&amp;im-&gt;lock);</div><div class='ctx'> 		igmp_start_timer(im, IGMP_INITIAL_REPORT_DELAY);</div><div class='hunk'>@@ -1322,7 +1371,7 @@ static void igmp_group_added(struct ip_mc_list *im)</div><div class='ctx'> 	 * IN() to IN(A).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (im-&gt;sfmode == MCAST_EXCLUDE)</div><div class='del'>-		im-&gt;crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+		im-&gt;crcount = in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> </div><div class='ctx'> 	igmp_ifc_event(in_dev);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1384,26 +1433,106 @@ static void ip_mc_hash_remove(struct in_device *in_dev,</div><div class='ctx'> 	*mc_hash = im-&gt;next_hash;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		       const struct ip_mc_list *im,</div><div class='add'>+		       struct inet_fill_args *args)</div><div class='add'>+{</div><div class='add'>+	struct ifa_cacheinfo ci;</div><div class='add'>+	struct ifaddrmsg *ifm;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;event,</div><div class='add'>+			sizeof(struct ifaddrmsg), args-&gt;flags);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_data(nlh);</div><div class='add'>+	ifm-&gt;ifa_family = AF_INET;</div><div class='add'>+	ifm-&gt;ifa_prefixlen = 32;</div><div class='add'>+	ifm-&gt;ifa_flags = IFA_F_PERMANENT;</div><div class='add'>+	ifm-&gt;ifa_scope = RT_SCOPE_UNIVERSE;</div><div class='add'>+	ifm-&gt;ifa_index = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	ci.cstamp = (READ_ONCE(im-&gt;mca_cstamp) - INITIAL_JIFFIES) * 100UL / HZ;</div><div class='add'>+	ci.tstamp = ci.cstamp;</div><div class='add'>+	ci.ifa_prefered = INFINITY_LIFE_TIME;</div><div class='add'>+	ci.ifa_valid = INFINITY_LIFE_TIME;</div><div class='add'>+</div><div class='add'>+	if (nla_put_in_addr(skb, IFA_MULTICAST, im-&gt;multiaddr) &lt; 0 ||</div><div class='add'>+	    nla_put(skb, IFA_CACHEINFO, sizeof(ci), &amp;ci) &lt; 0) {</div><div class='add'>+		nlmsg_cancel(skb, nlh);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inet_ifmcaddr_notify(struct net_device *dev,</div><div class='add'>+				 const struct ip_mc_list *im, int event)</div><div class='add'>+{</div><div class='add'>+	struct inet_fill_args fillargs = {</div><div class='add'>+		.event = event,</div><div class='add'>+	};</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +</div><div class='add'>+			nla_total_size(sizeof(__be32)) +</div><div class='add'>+			nla_total_size(sizeof(struct ifa_cacheinfo)),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = inet_fill_ifmcaddr(skb, dev, im, &amp;fillargs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		WARN_ON_ONCE(err == -EMSGSIZE);</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_IPV4_MCADDR, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV4_MCADDR, err);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	A socket has joined a multicast group on device dev.</div><div class='ctx'>  */</div><div class='del'>-static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,</div><div class='del'>-			      unsigned int mode)</div><div class='add'>+static void ____ip_mc_inc_group(struct in_device *in_dev, __be32 addr,</div><div class='add'>+				unsigned int mode, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	struct ip_mc_list __rcu **mc_hash;</div><div class='ctx'> 	struct ip_mc_list *im;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	for_each_pmc_rtnl(in_dev, im) {</div><div class='del'>-		if (im-&gt;multiaddr == addr) {</div><div class='del'>-			im-&gt;users++;</div><div class='del'>-			ip_mc_add_src(in_dev, &amp;addr, mode, 0, NULL, 0);</div><div class='del'>-			goto out;</div><div class='add'>+	mc_hash = rtnl_dereference(in_dev-&gt;mc_hash);</div><div class='add'>+	if (mc_hash) {</div><div class='add'>+		u32 hash = hash_32((__force u32)addr, MC_HASH_SZ_LOG);</div><div class='add'>+</div><div class='add'>+		for (im = rtnl_dereference(mc_hash[hash]);</div><div class='add'>+		     im;</div><div class='add'>+		     im = rtnl_dereference(im-&gt;next_hash)) {</div><div class='add'>+			if (im-&gt;multiaddr == addr)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		for_each_pmc_rtnl(in_dev, im) {</div><div class='add'>+			if (im-&gt;multiaddr == addr)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if  (im) {</div><div class='add'>+		im-&gt;users++;</div><div class='add'>+		ip_mc_add_src(in_dev, &amp;addr, mode, 0, NULL, 0);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	im = kzalloc(sizeof(*im), GFP_KERNEL);</div><div class='add'>+	im = kzalloc(sizeof(*im), gfp);</div><div class='ctx'> 	if (!im)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1411,6 +1540,8 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,</div><div class='ctx'> 	im-&gt;interface = in_dev;</div><div class='ctx'> 	in_dev_hold(in_dev);</div><div class='ctx'> 	im-&gt;multiaddr = addr;</div><div class='add'>+	im-&gt;mca_cstamp = jiffies;</div><div class='add'>+	im-&gt;mca_tstamp = im-&gt;mca_cstamp;</div><div class='ctx'> 	/* initial mode is (EX, empty) */</div><div class='ctx'> 	im-&gt;sfmode = mode;</div><div class='ctx'> 	im-&gt;sfcount[mode] = 1;</div><div class='hunk'>@@ -1430,15 +1561,22 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,</div><div class='ctx'> 	igmpv3_del_delrec(in_dev, im);</div><div class='ctx'> #endif</div><div class='ctx'> 	igmp_group_added(im);</div><div class='add'>+	inet_ifmcaddr_notify(in_dev-&gt;dev, im, RTM_NEWMULTICAST);</div><div class='ctx'> 	if (!in_dev-&gt;dead)</div><div class='ctx'> 		ip_rt_multicast_event(in_dev);</div><div class='ctx'> out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	____ip_mc_inc_group(in_dev, addr, MCAST_EXCLUDE, gfp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__ip_mc_inc_group);</div><div class='add'>+</div><div class='ctx'> void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)</div><div class='ctx'> {</div><div class='del'>-	__ip_mc_inc_group(in_dev, addr, MCAST_EXCLUDE);</div><div class='add'>+	__ip_mc_inc_group(in_dev, addr, GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_mc_inc_group);</div><div class='ctx'> </div><div class='hunk'>@@ -1481,22 +1619,22 @@ static int ip_mc_check_igmp_reportv3(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	len += sizeof(struct igmpv3_report);</div><div class='ctx'> </div><div class='del'>-	return pskb_may_pull(skb, len) ? 0 : -EINVAL;</div><div class='add'>+	return ip_mc_may_pull(skb, len) ? 0 : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip_mc_check_igmp_query(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = skb_transport_offset(skb);</div><div class='del'>-</div><div class='del'>-	len += sizeof(struct igmphdr);</div><div class='del'>-	if (skb-&gt;len &lt; len)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	unsigned int transport_len = ip_transport_len(skb);</div><div class='add'>+	unsigned int len;</div><div class='ctx'> </div><div class='ctx'> 	/* IGMPv{1,2}? */</div><div class='del'>-	if (skb-&gt;len != len) {</div><div class='add'>+	if (transport_len != sizeof(struct igmphdr)) {</div><div class='ctx'> 		/* or IGMPv3? */</div><div class='del'>-		len += sizeof(struct igmpv3_query) - sizeof(struct igmphdr);</div><div class='del'>-		if (skb-&gt;len &lt; len || !pskb_may_pull(skb, len))</div><div class='add'>+		if (transport_len &lt; sizeof(struct igmpv3_query))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		len = skb_transport_offset(skb) + sizeof(struct igmpv3_query);</div><div class='add'>+		if (!ip_mc_may_pull(skb, len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1516,7 +1654,6 @@ static int ip_mc_check_igmp_msg(struct sk_buff *skb)</div><div class='ctx'> 	case IGMP_HOST_LEAVE_MESSAGE:</div><div class='ctx'> 	case IGMP_HOST_MEMBERSHIP_REPORT:</div><div class='ctx'> 	case IGMPV2_HOST_MEMBERSHIP_REPORT:</div><div class='del'>-		/* fall through */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case IGMPV3_HOST_MEMBERSHIP_REPORT:</div><div class='ctx'> 		return ip_mc_check_igmp_reportv3(skb);</div><div class='hunk'>@@ -1527,52 +1664,34 @@ static int ip_mc_check_igmp_msg(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __sum16 ip_mc_validate_checksum(struct sk_buff *skb)</div><div class='add'>+static __sum16 ip_mc_validate_checksum(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return skb_checksum_simple_validate(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed)</div><div class='del'>-</div><div class='add'>+static int ip_mc_check_igmp_csum(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb_chk;</div><div class='del'>-	unsigned int transport_len;</div><div class='ctx'> 	unsigned int len = skb_transport_offset(skb) + sizeof(struct igmphdr);</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	unsigned int transport_len = ip_transport_len(skb);</div><div class='add'>+	struct sk_buff *skb_chk;</div><div class='ctx'> </div><div class='del'>-	transport_len = ntohs(ip_hdr(skb)-&gt;tot_len) - ip_hdrlen(skb);</div><div class='add'>+	if (!ip_mc_may_pull(skb, len))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	skb_chk = skb_checksum_trimmed(skb, transport_len,</div><div class='ctx'> 				       ip_mc_validate_checksum);</div><div class='ctx'> 	if (!skb_chk)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb_chk, len))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = ip_mc_check_igmp_msg(skb_chk);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (skb_trimmed)</div><div class='del'>-		*skb_trimmed = skb_chk;</div><div class='del'>-	/* free now unneeded clone */</div><div class='del'>-	else if (skb_chk != skb)</div><div class='del'>-		kfree_skb(skb_chk);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-err:</div><div class='del'>-	if (ret &amp;&amp; skb_chk &amp;&amp; skb_chk != skb)</div><div class='add'>+	if (skb_chk != skb)</div><div class='ctx'> 		kfree_skb(skb_chk);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip_mc_check_igmp - checks whether this is a sane IGMP packet</div><div class='ctx'>  * @skb: the skb to validate</div><div class='del'>- * @skb_trimmed: to store an skb pointer trimmed to IPv4 packet tail (optional)</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether an IPv4 packet is a valid IGMP packet. If so sets</div><div class='ctx'>  * skb transport header accordingly and returns zero.</div><div class='hunk'>@@ -1582,18 +1701,10 @@ err:</div><div class='ctx'>  * -ENOMSG: IP header validation succeeded but it is not an IGMP packet.</div><div class='ctx'>  * -ENOMEM: A memory allocation failure happened.</div><div class='ctx'>  *</div><div class='del'>- * Optionally, an skb pointer might be provided via skb_trimmed (or set it</div><div class='del'>- * to NULL): After parsing an IGMP packet successfully it will point to</div><div class='del'>- * an skb which has its tail aligned to the IP packet end. This might</div><div class='del'>- * either be the originally provided skb or a trimmed, cloned version if</div><div class='del'>- * the skb frame had data beyond the IP packet. A cloned skb allows us</div><div class='del'>- * to leave the original skb and its full frame unchanged (which might be</div><div class='del'>- * desirable for layer 2 frame jugglers).</div><div class='del'>- *</div><div class='ctx'>  * Caller needs to set the skb network header and free any returned skb if it</div><div class='ctx'>  * differs from the provided skb.</div><div class='ctx'>  */</div><div class='del'>-int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed)</div><div class='add'>+int ip_mc_check_igmp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = ip_mc_check_iphdr(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -1603,7 +1714,11 @@ int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed)</div><div class='ctx'> 	if (ip_hdr(skb)-&gt;protocol != IPPROTO_IGMP)</div><div class='ctx'> 		return -ENOMSG;</div><div class='ctx'> </div><div class='del'>-	return __ip_mc_check_igmp(skb, skb_trimmed);</div><div class='add'>+	ret = ip_mc_check_igmp_csum(skb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ip_mc_check_igmp_msg(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_mc_check_igmp);</div><div class='ctx'> </div><div class='hunk'>@@ -1623,7 +1738,7 @@ static void ip_mc_rejoin_groups(struct in_device *in_dev)</div><div class='ctx'> 		if (im-&gt;multiaddr == IGMP_ALL_HOSTS)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ipv4_is_local_multicast(im-&gt;multiaddr) &amp;&amp;</div><div class='del'>-		    !net-&gt;ipv4.sysctl_igmp_llm_reports)</div><div class='add'>+		    !READ_ONCE(net-&gt;ipv4.sysctl_igmp_llm_reports))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* a failover is happening and switches</div><div class='hunk'>@@ -1644,7 +1759,7 @@ static void ip_mc_rejoin_groups(struct in_device *in_dev)</div><div class='ctx'>  *	A socket has left a multicast group on device dev</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)</div><div class='add'>+void __ip_mc_dec_group(struct in_device *in_dev, __be32 addr, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_mc_list *i;</div><div class='ctx'> 	struct ip_mc_list __rcu **ip;</div><div class='hunk'>@@ -1659,7 +1774,9 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)</div><div class='ctx'> 				ip_mc_hash_remove(in_dev, i);</div><div class='ctx'> 				*ip = i-&gt;next_rcu;</div><div class='ctx'> 				in_dev-&gt;mc_count--;</div><div class='del'>-				igmp_group_dropped(i);</div><div class='add'>+				__igmp_group_dropped(i, gfp);</div><div class='add'>+				inet_ifmcaddr_notify(in_dev-&gt;dev, i,</div><div class='add'>+						     RTM_DELMULTICAST);</div><div class='ctx'> 				ip_mc_clear_src(i);</div><div class='ctx'> </div><div class='ctx'> 				if (!in_dev-&gt;dead)</div><div class='hunk'>@@ -1672,7 +1789,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ip_mc_dec_group);</div><div class='add'>+EXPORT_SYMBOL(__ip_mc_dec_group);</div><div class='ctx'> </div><div class='ctx'> /* Device changing type */</div><div class='ctx'> </div><div class='hunk'>@@ -1712,29 +1829,41 @@ void ip_mc_down(struct in_device *in_dev)</div><div class='ctx'> 		igmp_group_dropped(pmc);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='del'>-	in_dev-&gt;mr_ifc_count = 0;</div><div class='del'>-	if (del_timer(&amp;in_dev-&gt;mr_ifc_timer))</div><div class='add'>+	WRITE_ONCE(in_dev-&gt;mr_ifc_count, 0);</div><div class='add'>+	if (timer_delete(&amp;in_dev-&gt;mr_ifc_timer))</div><div class='ctx'> 		__in_dev_put(in_dev);</div><div class='ctx'> 	in_dev-&gt;mr_gq_running = 0;</div><div class='del'>-	if (del_timer(&amp;in_dev-&gt;mr_gq_timer))</div><div class='add'>+	if (timer_delete(&amp;in_dev-&gt;mr_gq_timer))</div><div class='ctx'> 		__in_dev_put(in_dev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ip_mc_dec_group(in_dev, IGMP_ALL_HOSTS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ip_mc_init_dev(struct in_device *in_dev)</div><div class='del'>-{</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='add'>+static void ip_mc_reset(struct in_device *in_dev)</div><div class='add'>+{</div><div class='ctx'> 	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	in_dev-&gt;mr_qi = IGMP_QUERY_INTERVAL;</div><div class='add'>+	in_dev-&gt;mr_qri = IGMP_QUERY_RESPONSE_INTERVAL;</div><div class='add'>+	in_dev-&gt;mr_qrv = READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void ip_mc_reset(struct in_device *in_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+void ip_mc_init_dev(struct in_device *in_dev)</div><div class='add'>+{</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 	timer_setup(&amp;in_dev-&gt;mr_gq_timer, igmp_gq_timer_expire, 0);</div><div class='ctx'> 	timer_setup(&amp;in_dev-&gt;mr_ifc_timer, igmp_ifc_timer_expire, 0);</div><div class='del'>-	in_dev-&gt;mr_qrv = net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='ctx'> #endif</div><div class='add'>+	ip_mc_reset(in_dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;in_dev-&gt;mc_tomb_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1744,15 +1873,10 @@ void ip_mc_init_dev(struct in_device *in_dev)</div><div class='ctx'> void ip_mc_up(struct in_device *in_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_mc_list *pmc;</div><div class='del'>-#ifdef CONFIG_IP_MULTICAST</div><div class='del'>-	struct net *net = dev_net(in_dev-&gt;dev);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IP_MULTICAST</div><div class='del'>-	in_dev-&gt;mr_qrv = net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='del'>-#endif</div><div class='add'>+	ip_mc_reset(in_dev);</div><div class='ctx'> 	ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);</div><div class='ctx'> </div><div class='ctx'> 	for_each_pmc_rtnl(in_dev, pmc) {</div><div class='hunk'>@@ -1782,6 +1906,7 @@ void ip_mc_destroy_dev(struct in_device *in_dev)</div><div class='ctx'> 	while ((i = rtnl_dereference(in_dev-&gt;mc_list)) != NULL) {</div><div class='ctx'> 		in_dev-&gt;mc_list = i-&gt;next_rcu;</div><div class='ctx'> 		in_dev-&gt;mc_count--;</div><div class='add'>+		ip_mc_clear_src(i);</div><div class='ctx'> 		ip_ma_put(i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1805,7 +1930,8 @@ static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr)</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		struct rtable *rt = ip_route_output(net,</div><div class='ctx'> 						    imr-&gt;imr_multiaddr.s_addr,</div><div class='del'>-						    0, 0, 0);</div><div class='add'>+						    0, 0, 0,</div><div class='add'>+						    RT_SCOPE_UNIVERSE);</div><div class='ctx'> 		if (!IS_ERR(rt)) {</div><div class='ctx'> 			dev = rt-&gt;dst.dev;</div><div class='ctx'> 			ip_rt_put(rt);</div><div class='hunk'>@@ -1856,7 +1982,7 @@ static int ip_mc_del1_src(struct ip_mc_list *pmc, int sfmode,</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 		if (psf-&gt;sf_oldin &amp;&amp;</div><div class='ctx'> 		    !IGMP_V1_SEEN(in_dev) &amp;&amp; !IGMP_V2_SEEN(in_dev)) {</div><div class='del'>-			psf-&gt;sf_crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='add'>+			psf-&gt;sf_crcount = in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='ctx'> 			psf-&gt;sf_next = pmc-&gt;tomb;</div><div class='ctx'> 			pmc-&gt;tomb = psf;</div><div class='ctx'> 			rv = 1;</div><div class='hunk'>@@ -1920,8 +2046,8 @@ static int ip_mc_del_src(struct in_device *in_dev, __be32 *pmca, int sfmode,</div><div class='ctx'> 		/* filter mode change */</div><div class='ctx'> 		pmc-&gt;sfmode = MCAST_INCLUDE;</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='del'>-		pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='del'>-		in_dev-&gt;mr_ifc_count = pmc-&gt;crcount;</div><div class='add'>+		pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+		WRITE_ONCE(in_dev-&gt;mr_ifc_count, pmc-&gt;crcount);</div><div class='ctx'> 		for (psf = pmc-&gt;sources; psf; psf = psf-&gt;sf_next)</div><div class='ctx'> 			psf-&gt;sf_crcount = 0;</div><div class='ctx'> 		igmp_ifc_event(pmc-&gt;interface);</div><div class='hunk'>@@ -2099,8 +2225,8 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode,</div><div class='ctx'> #ifdef CONFIG_IP_MULTICAST</div><div class='ctx'> 		/* else no filters; keep old mode for reports */</div><div class='ctx'> </div><div class='del'>-		pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: net-&gt;ipv4.sysctl_igmp_qrv;</div><div class='del'>-		in_dev-&gt;mr_ifc_count = pmc-&gt;crcount;</div><div class='add'>+		pmc-&gt;crcount = in_dev-&gt;mr_qrv ?: READ_ONCE(net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+		WRITE_ONCE(in_dev-&gt;mr_ifc_count, pmc-&gt;crcount);</div><div class='ctx'> 		for (psf = pmc-&gt;sources; psf; psf = psf-&gt;sf_next)</div><div class='ctx'> 			psf-&gt;sf_crcount = 0;</div><div class='ctx'> 		igmp_ifc_event(in_dev);</div><div class='hunk'>@@ -2114,7 +2240,7 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode,</div><div class='ctx'> </div><div class='ctx'> static void ip_mc_clear_src(struct ip_mc_list *pmc)</div><div class='ctx'> {</div><div class='del'>-	struct ip_sf_list *psf, *nextpsf, *tomb, *sources;</div><div class='add'>+	struct ip_sf_list *tomb, *sources;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;pmc-&gt;lock);</div><div class='ctx'> 	tomb = pmc-&gt;tomb;</div><div class='hunk'>@@ -2126,14 +2252,8 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)</div><div class='ctx'> 	pmc-&gt;sfcount[MCAST_EXCLUDE] = 1;</div><div class='ctx'> 	spin_unlock_bh(&amp;pmc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	for (psf = tomb; psf; psf = nextpsf) {</div><div class='del'>-		nextpsf = psf-&gt;sf_next;</div><div class='del'>-		kfree(psf);</div><div class='del'>-	}</div><div class='del'>-	for (psf = sources; psf; psf = nextpsf) {</div><div class='del'>-		nextpsf = psf-&gt;sf_next;</div><div class='del'>-		kfree(psf);</div><div class='del'>-	}</div><div class='add'>+	ip_sf_list_clear_all(tomb);</div><div class='add'>+	ip_sf_list_clear_all(sources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Join a multicast group</div><div class='hunk'>@@ -2171,7 +2291,7 @@ static int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr,</div><div class='ctx'> 		count++;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = -ENOBUFS;</div><div class='del'>-	if (count &gt;= net-&gt;ipv4.sysctl_igmp_max_memberships)</div><div class='add'>+	if (count &gt;= READ_ONCE(net-&gt;ipv4.sysctl_igmp_max_memberships))</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	iml = sock_kmalloc(sk, sizeof(*iml), GFP_KERNEL);</div><div class='ctx'> 	if (!iml)</div><div class='hunk'>@@ -2182,7 +2302,7 @@ static int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr,</div><div class='ctx'> 	iml-&gt;sflist = NULL;</div><div class='ctx'> 	iml-&gt;sfmode = mode;</div><div class='ctx'> 	rcu_assign_pointer(inet-&gt;mc_list, iml);</div><div class='del'>-	__ip_mc_inc_group(in_dev, addr, mode);</div><div class='add'>+	____ip_mc_inc_group(in_dev, addr, mode, GFP_KERNEL);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> done:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2219,7 +2339,7 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,</div><div class='ctx'> 			iml-&gt;sfmode, psf-&gt;sl_count, psf-&gt;sl_addr, 0);</div><div class='ctx'> 	RCU_INIT_POINTER(iml-&gt;sflist, NULL);</div><div class='ctx'> 	/* decrease mem now to avoid the memleak warning */</div><div class='del'>-	atomic_sub(IP_SFLSIZE(psf-&gt;sl_max), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	atomic_sub(struct_size(psf, sl_addr, psf-&gt;sl_max), &amp;sk-&gt;sk_omem_alloc);</div><div class='ctx'> 	kfree_rcu(psf, rcu);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2358,7 +2478,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct</div><div class='ctx'> 	}</div><div class='ctx'> 	/* else, add a new source to the filter */</div><div class='ctx'> </div><div class='del'>-	if (psl &amp;&amp; psl-&gt;sl_count &gt;= net-&gt;ipv4.sysctl_igmp_max_msf) {</div><div class='add'>+	if (psl &amp;&amp; psl-&gt;sl_count &gt;= READ_ONCE(net-&gt;ipv4.sysctl_igmp_max_msf)) {</div><div class='ctx'> 		err = -ENOBUFS;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2368,7 +2488,8 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct</div><div class='ctx'> </div><div class='ctx'> 		if (psl)</div><div class='ctx'> 			count += psl-&gt;sl_max;</div><div class='del'>-		newpsl = sock_kmalloc(sk, IP_SFLSIZE(count), GFP_KERNEL);</div><div class='add'>+		newpsl = sock_kmalloc(sk, struct_size(newpsl, sl_addr, count),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (!newpsl) {</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -2379,10 +2500,12 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct</div><div class='ctx'> 			for (i = 0; i &lt; psl-&gt;sl_count; i++)</div><div class='ctx'> 				newpsl-&gt;sl_addr[i] = psl-&gt;sl_addr[i];</div><div class='ctx'> 			/* decrease mem now to avoid the memleak warning */</div><div class='del'>-			atomic_sub(IP_SFLSIZE(psl-&gt;sl_max), &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-			kfree_rcu(psl, rcu);</div><div class='add'>+			atomic_sub(struct_size(psl, sl_addr, psl-&gt;sl_max),</div><div class='add'>+				   &amp;sk-&gt;sk_omem_alloc);</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_assign_pointer(pmc-&gt;sflist, newpsl);</div><div class='add'>+		if (psl)</div><div class='add'>+			kfree_rcu(psl, rcu);</div><div class='ctx'> 		psl = newpsl;</div><div class='ctx'> 	}</div><div class='ctx'> 	rv = 1;	/* &gt; 0 for insert logic below if sl_count is 0 */</div><div class='hunk'>@@ -2454,19 +2577,22 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (msf-&gt;imsf_numsrc) {</div><div class='del'>-		newpsl = sock_kmalloc(sk, IP_SFLSIZE(msf-&gt;imsf_numsrc),</div><div class='del'>-							   GFP_KERNEL);</div><div class='add'>+		newpsl = sock_kmalloc(sk, struct_size(newpsl, sl_addr,</div><div class='add'>+						      msf-&gt;imsf_numsrc),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (!newpsl) {</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		newpsl-&gt;sl_max = newpsl-&gt;sl_count = msf-&gt;imsf_numsrc;</div><div class='del'>-		memcpy(newpsl-&gt;sl_addr, msf-&gt;imsf_slist,</div><div class='del'>-			msf-&gt;imsf_numsrc * sizeof(msf-&gt;imsf_slist[0]));</div><div class='add'>+		memcpy(newpsl-&gt;sl_addr, msf-&gt;imsf_slist_flex,</div><div class='add'>+		       flex_array_size(msf, imsf_slist_flex, msf-&gt;imsf_numsrc));</div><div class='ctx'> 		err = ip_mc_add_src(in_dev, &amp;msf-&gt;imsf_multiaddr,</div><div class='ctx'> 			msf-&gt;imsf_fmode, newpsl-&gt;sl_count, newpsl-&gt;sl_addr, 0);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			sock_kfree_s(sk, newpsl, IP_SFLSIZE(newpsl-&gt;sl_max));</div><div class='add'>+			sock_kfree_s(sk, newpsl,</div><div class='add'>+				     struct_size(newpsl, sl_addr,</div><div class='add'>+						 newpsl-&gt;sl_max));</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2479,12 +2605,15 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)</div><div class='ctx'> 		(void) ip_mc_del_src(in_dev, &amp;msf-&gt;imsf_multiaddr, pmc-&gt;sfmode,</div><div class='ctx'> 			psl-&gt;sl_count, psl-&gt;sl_addr, 0);</div><div class='ctx'> 		/* decrease mem now to avoid the memleak warning */</div><div class='del'>-		atomic_sub(IP_SFLSIZE(psl-&gt;sl_max), &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-		kfree_rcu(psl, rcu);</div><div class='del'>-	} else</div><div class='add'>+		atomic_sub(struct_size(psl, sl_addr, psl-&gt;sl_max),</div><div class='add'>+			   &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	} else {</div><div class='ctx'> 		(void) ip_mc_del_src(in_dev, &amp;msf-&gt;imsf_multiaddr, pmc-&gt;sfmode,</div><div class='ctx'> 			0, NULL, 0);</div><div class='add'>+	}</div><div class='ctx'> 	rcu_assign_pointer(pmc-&gt;sflist, newpsl);</div><div class='add'>+	if (psl)</div><div class='add'>+		kfree_rcu(psl, rcu);</div><div class='ctx'> 	pmc-&gt;sfmode = msf-&gt;imsf_fmode;</div><div class='ctx'> 	err = 0;</div><div class='ctx'> done:</div><div class='hunk'>@@ -2492,11 +2621,10 @@ done:</div><div class='ctx'> 		err = ip_mc_leave_group(sk, &amp;imr);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,</div><div class='del'>-	struct ip_msfilter __user *optval, int __user *optlen)</div><div class='add'>+		 sockptr_t optval, sockptr_t optlen)</div><div class='ctx'> {</div><div class='del'>-	int err, len, count, copycount;</div><div class='add'>+	int err, len, count, copycount, msf_size;</div><div class='ctx'> 	struct ip_mreqn	imr;</div><div class='ctx'> 	__be32 addr = msf-&gt;imsf_multiaddr;</div><div class='ctx'> 	struct ip_mc_socklist *pmc;</div><div class='hunk'>@@ -2531,20 +2659,22 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,</div><div class='ctx'> 	msf-&gt;imsf_fmode = pmc-&gt;sfmode;</div><div class='ctx'> 	psl = rtnl_dereference(pmc-&gt;sflist);</div><div class='ctx'> 	if (!psl) {</div><div class='del'>-		len = 0;</div><div class='ctx'> 		count = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		count = psl-&gt;sl_count;</div><div class='ctx'> 	}</div><div class='ctx'> 	copycount = count &lt; msf-&gt;imsf_numsrc ? count : msf-&gt;imsf_numsrc;</div><div class='del'>-	len = copycount * sizeof(psl-&gt;sl_addr[0]);</div><div class='add'>+	len = flex_array_size(psl, sl_addr, copycount);</div><div class='ctx'> 	msf-&gt;imsf_numsrc = count;</div><div class='del'>-	if (put_user(IP_MSFILTER_SIZE(copycount), optlen) ||</div><div class='del'>-	    copy_to_user(optval, msf, IP_MSFILTER_SIZE(0))) {</div><div class='add'>+	msf_size = IP_MSFILTER_SIZE(copycount);</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;msf_size, sizeof(int)) ||</div><div class='add'>+	    copy_to_sockptr(optval, msf, IP_MSFILTER_SIZE(0))) {</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (len &amp;&amp;</div><div class='del'>-	    copy_to_user(&amp;optval-&gt;imsf_slist[0], psl-&gt;sl_addr, len))</div><div class='add'>+	    copy_to_sockptr_offset(optval,</div><div class='add'>+				   offsetof(struct ip_msfilter, imsf_slist_flex),</div><div class='add'>+				   psl-&gt;sl_addr, len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> done:</div><div class='hunk'>@@ -2552,9 +2682,9 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,</div><div class='del'>-	struct group_filter __user *optval, int __user *optlen)</div><div class='add'>+		 sockptr_t optval, size_t ss_offset)</div><div class='ctx'> {</div><div class='del'>-	int err, i, count, copycount;</div><div class='add'>+	int i, count, copycount;</div><div class='ctx'> 	struct sockaddr_in *psin;</div><div class='ctx'> 	__be32 addr;</div><div class='ctx'> 	struct ip_mc_socklist *pmc;</div><div class='hunk'>@@ -2570,24 +2700,18 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,</div><div class='ctx'> 	if (!ipv4_is_multicast(addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = -EADDRNOTAVAIL;</div><div class='del'>-</div><div class='ctx'> 	for_each_pmc_rtnl(inet, pmc) {</div><div class='ctx'> 		if (pmc-&gt;multi.imr_multiaddr.s_addr == addr &amp;&amp;</div><div class='ctx'> 		    pmc-&gt;multi.imr_ifindex == gsf-&gt;gf_interface)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!pmc)		/* must have a prior join */</div><div class='del'>-		goto done;</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='ctx'> 	gsf-&gt;gf_fmode = pmc-&gt;sfmode;</div><div class='ctx'> 	psl = rtnl_dereference(pmc-&gt;sflist);</div><div class='ctx'> 	count = psl ? psl-&gt;sl_count : 0;</div><div class='ctx'> 	copycount = count &lt; gsf-&gt;gf_numsrc ? count : gsf-&gt;gf_numsrc;</div><div class='ctx'> 	gsf-&gt;gf_numsrc = count;</div><div class='del'>-	if (put_user(GROUP_FILTER_SIZE(copycount), optlen) ||</div><div class='del'>-	    copy_to_user(optval, gsf, GROUP_FILTER_SIZE(0))) {</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='ctx'> 	for (i = 0; i &lt; copycount; i++) {</div><div class='ctx'> 		struct sockaddr_storage ss;</div><div class='ctx'> </div><div class='hunk'>@@ -2595,21 +2719,21 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,</div><div class='ctx'> 		memset(&amp;ss, 0, sizeof(ss));</div><div class='ctx'> 		psin-&gt;sin_family = AF_INET;</div><div class='ctx'> 		psin-&gt;sin_addr.s_addr = psl-&gt;sl_addr[i];</div><div class='del'>-		if (copy_to_user(&amp;optval-&gt;gf_slist[i], &amp;ss, sizeof(ss)))</div><div class='add'>+		if (copy_to_sockptr_offset(optval, ss_offset,</div><div class='add'>+					   &amp;ss, sizeof(ss)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+		ss_offset += sizeof(ss);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-done:</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * check if a multicast source filter allows delivery for a given &lt;src,dst,intf&gt;</div><div class='ctx'>  */</div><div class='del'>-int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr,</div><div class='add'>+int ip_mc_sf_allow(const struct sock *sk, __be32 loc_addr, __be32 rmt_addr,</div><div class='ctx'> 		   int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct ip_mc_socklist *pmc;</div><div class='ctx'> 	struct ip_sf_socklist *psl;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2626,7 +2750,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr,</div><div class='ctx'> 		     (sdif &amp;&amp; pmc-&gt;multi.imr_ifindex == sdif)))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	ret = inet-&gt;mc_all;</div><div class='add'>+	ret = inet_test_bit(MC_ALL, sk);</div><div class='ctx'> 	if (!pmc)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	psl = rcu_dereference(pmc-&gt;sflist);</div><div class='hunk'>@@ -2707,6 +2831,7 @@ int ip_check_mc_rcu(struct in_device *in_dev, __be32 mc_addr, __be32 src_addr, u</div><div class='ctx'> 		rv = 1;</div><div class='ctx'> 	} else if (im) {</div><div class='ctx'> 		if (src_addr) {</div><div class='add'>+			spin_lock_bh(&amp;im-&gt;lock);</div><div class='ctx'> 			for (psf = im-&gt;sources; psf; psf = psf-&gt;sf_next) {</div><div class='ctx'> 				if (psf-&gt;sf_inaddr == src_addr)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -2717,6 +2842,7 @@ int ip_check_mc_rcu(struct in_device *in_dev, __be32 mc_addr, __be32 src_addr, u</div><div class='ctx'> 					im-&gt;sfcount[MCAST_EXCLUDE];</div><div class='ctx'> 			else</div><div class='ctx'> 				rv = im-&gt;sfcount[MCAST_EXCLUDE] != 0;</div><div class='add'>+			spin_unlock_bh(&amp;im-&gt;lock);</div><div class='ctx'> 		} else</div><div class='ctx'> 			rv = 1; /* unspecified source; tentatively allow */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2816,7 +2942,7 @@ static int igmp_mc_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_puts(seq,</div><div class='ctx'> 			 "Idx\tDevice    : Count Querier\tGroup    Users Timer\tReporter\n");</div><div class='ctx'> 	else {</div><div class='del'>-		struct ip_mc_list *im = (struct ip_mc_list *)v;</div><div class='add'>+		struct ip_mc_list *im = v;</div><div class='ctx'> 		struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);</div><div class='ctx'> 		char   *querier;</div><div class='ctx'> 		long delta;</div><div class='hunk'>@@ -2909,8 +3035,6 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l</div><div class='ctx'> 				continue;</div><div class='ctx'> 			state-&gt;im = rcu_dereference(state-&gt;idev-&gt;mc_list);</div><div class='ctx'> 		}</div><div class='del'>-		if (!state-&gt;im)</div><div class='del'>-			break;</div><div class='ctx'> 		spin_lock_bh(&amp;state-&gt;im-&gt;lock);</div><div class='ctx'> 		psf = state-&gt;im-&gt;sources;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2960,7 +3084,7 @@ static void igmp_mcf_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> static int igmp_mcf_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct ip_sf_list *psf = (struct ip_sf_list *)v;</div><div class='add'>+	struct ip_sf_list *psf = v;</div><div class='ctx'> 	struct igmp_mcf_iter_state *state = igmp_mcf_seq_private(seq);</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN) {</div><div class='head'>diff --git a/net/ipv4/igmp_internal.h b/net/ipv4/igmp_internal.h<br/>new file mode 100644<br/>index 000000000000..0a1bcc8ec8e1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/igmp_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/igmp_internal.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _LINUX_IGMP_INTERNAL_H</div><div class='add'>+#define _LINUX_IGMP_INTERNAL_H</div><div class='add'>+</div><div class='add'>+struct inet_fill_args {</div><div class='add'>+	u32 portid;</div><div class='add'>+	u32 seq;</div><div class='add'>+	int event;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	int netnsid;</div><div class='add'>+	int ifindex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		       const struct ip_mc_list *im,</div><div class='add'>+		       struct inet_fill_args *args);</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c<br/>index 15e7f7915a21..97d57c52b9ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_connection_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_connection_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_connection_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inet_connection_sock.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *		Support for INET connection oriented protocols.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	See the TCP sources</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or(at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -28,17 +24,19 @@</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-/* match_wildcard == true:  IPV6_ADDR_ANY equals to any IPv6 addresses if IPv6</div><div class='del'>- *                          only, and any IPv4 addresses if not IPv6 only</div><div class='del'>- * match_wildcard == false: addresses must be exactly the same, i.e.</div><div class='del'>- *                          IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,</div><div class='del'>- *                          and 0.0.0.0 equals to 0.0.0.0 only</div><div class='add'>+/* match_sk*_wildcard == true:  IPV6_ADDR_ANY equals to any IPv6 addresses</div><div class='add'>+ *				if IPv6 only, and any IPv4 addresses</div><div class='add'>+ *				if not IPv6 only</div><div class='add'>+ * match_sk*_wildcard == false: addresses must be exactly the same, i.e.</div><div class='add'>+ *				IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,</div><div class='add'>+ *				and 0.0.0.0 equals to 0.0.0.0 only</div><div class='ctx'>  */</div><div class='ctx'> static bool ipv6_rcv_saddr_equal(const struct in6_addr *sk1_rcv_saddr6,</div><div class='ctx'> 				 const struct in6_addr *sk2_rcv_saddr6,</div><div class='ctx'> 				 __be32 sk1_rcv_saddr, __be32 sk2_rcv_saddr,</div><div class='ctx'> 				 bool sk1_ipv6only, bool sk2_ipv6only,</div><div class='del'>-				 bool match_wildcard)</div><div class='add'>+				 bool match_sk1_wildcard,</div><div class='add'>+				 bool match_sk2_wildcard)</div><div class='ctx'> {</div><div class='ctx'> 	int addr_type = ipv6_addr_type(sk1_rcv_saddr6);</div><div class='ctx'> 	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;</div><div class='hunk'>@@ -48,8 +46,8 @@ static bool ipv6_rcv_saddr_equal(const struct in6_addr *sk1_rcv_saddr6,</div><div class='ctx'> 		if (!sk2_ipv6only) {</div><div class='ctx'> 			if (sk1_rcv_saddr == sk2_rcv_saddr)</div><div class='ctx'> 				return true;</div><div class='del'>-			if (!sk1_rcv_saddr || !sk2_rcv_saddr)</div><div class='del'>-				return match_wildcard;</div><div class='add'>+			return (match_sk1_wildcard &amp;&amp; !sk1_rcv_saddr) ||</div><div class='add'>+				(match_sk2_wildcard &amp;&amp; !sk2_rcv_saddr);</div><div class='ctx'> 		}</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -57,11 +55,11 @@ static bool ipv6_rcv_saddr_equal(const struct in6_addr *sk1_rcv_saddr6,</div><div class='ctx'> 	if (addr_type == IPV6_ADDR_ANY &amp;&amp; addr_type2 == IPV6_ADDR_ANY)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (addr_type2 == IPV6_ADDR_ANY &amp;&amp; match_wildcard &amp;&amp;</div><div class='add'>+	if (addr_type2 == IPV6_ADDR_ANY &amp;&amp; match_sk2_wildcard &amp;&amp;</div><div class='ctx'> 	    !(sk2_ipv6only &amp;&amp; addr_type == IPV6_ADDR_MAPPED))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (addr_type == IPV6_ADDR_ANY &amp;&amp; match_wildcard &amp;&amp;</div><div class='add'>+	if (addr_type == IPV6_ADDR_ANY &amp;&amp; match_sk1_wildcard &amp;&amp;</div><div class='ctx'> 	    !(sk1_ipv6only &amp;&amp; addr_type2 == IPV6_ADDR_MAPPED))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -73,18 +71,19 @@ static bool ipv6_rcv_saddr_equal(const struct in6_addr *sk1_rcv_saddr6,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* match_wildcard == true:  0.0.0.0 equals to any IPv4 addresses</div><div class='del'>- * match_wildcard == false: addresses must be exactly the same, i.e.</div><div class='del'>- *                          0.0.0.0 only equals to 0.0.0.0</div><div class='add'>+/* match_sk*_wildcard == true:  0.0.0.0 equals to any IPv4 addresses</div><div class='add'>+ * match_sk*_wildcard == false: addresses must be exactly the same, i.e.</div><div class='add'>+ *				0.0.0.0 only equals to 0.0.0.0</div><div class='ctx'>  */</div><div class='ctx'> static bool ipv4_rcv_saddr_equal(__be32 sk1_rcv_saddr, __be32 sk2_rcv_saddr,</div><div class='del'>-				 bool sk2_ipv6only, bool match_wildcard)</div><div class='add'>+				 bool sk2_ipv6only, bool match_sk1_wildcard,</div><div class='add'>+				 bool match_sk2_wildcard)</div><div class='ctx'> {</div><div class='ctx'> 	if (!sk2_ipv6only) {</div><div class='ctx'> 		if (sk1_rcv_saddr == sk2_rcv_saddr)</div><div class='ctx'> 			return true;</div><div class='del'>-		if (!sk1_rcv_saddr || !sk2_rcv_saddr)</div><div class='del'>-			return match_wildcard;</div><div class='add'>+		return (match_sk1_wildcard &amp;&amp; !sk1_rcv_saddr) ||</div><div class='add'>+			(match_sk2_wildcard &amp;&amp; !sk2_rcv_saddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -100,10 +99,12 @@ bool inet_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,</div><div class='ctx'> 					    sk2-&gt;sk_rcv_saddr,</div><div class='ctx'> 					    ipv6_only_sock(sk),</div><div class='ctx'> 					    ipv6_only_sock(sk2),</div><div class='add'>+					    match_wildcard,</div><div class='ctx'> 					    match_wildcard);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ipv4_rcv_saddr_equal(sk-&gt;sk_rcv_saddr, sk2-&gt;sk_rcv_saddr,</div><div class='del'>-				    ipv6_only_sock(sk2), match_wildcard);</div><div class='add'>+				    ipv6_only_sock(sk2), match_wildcard,</div><div class='add'>+				    match_wildcard);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_rcv_saddr_equal);</div><div class='ctx'> </div><div class='hunk'>@@ -116,77 +117,233 @@ bool inet_rcv_saddr_any(const struct sock *sk)</div><div class='ctx'> 	return !sk-&gt;sk_rcv_saddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void inet_get_local_port_range(struct net *net, int *low, int *high)</div><div class='add'>+/**</div><div class='add'>+ *	inet_sk_get_local_port_range - fetch ephemeral ports range</div><div class='add'>+ *	@sk: socket</div><div class='add'>+ *	@low: pointer to low port</div><div class='add'>+ *	@high: pointer to high port</div><div class='add'>+ *</div><div class='add'>+ *	Fetch netns port range (/proc/sys/net/ipv4/ip_local_port_range)</div><div class='add'>+ *	Range can be overridden if socket got IP_LOCAL_PORT_RANGE option.</div><div class='add'>+ *	Returns true if IP_LOCAL_PORT_RANGE was set on this socket.</div><div class='add'>+ */</div><div class='add'>+bool inet_sk_get_local_port_range(const struct sock *sk, int *low, int *high)</div><div class='add'>+{</div><div class='add'>+	int lo, hi, sk_lo, sk_hi;</div><div class='add'>+	bool local_range = false;</div><div class='add'>+	u32 sk_range;</div><div class='add'>+</div><div class='add'>+	inet_get_local_port_range(sock_net(sk), &amp;lo, &amp;hi);</div><div class='add'>+</div><div class='add'>+	sk_range = READ_ONCE(inet_sk(sk)-&gt;local_port_range);</div><div class='add'>+	if (unlikely(sk_range)) {</div><div class='add'>+		sk_lo = sk_range &amp; 0xffff;</div><div class='add'>+		sk_hi = sk_range &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+		if (lo &lt;= sk_lo &amp;&amp; sk_lo &lt;= hi)</div><div class='add'>+			lo = sk_lo;</div><div class='add'>+		if (lo &lt;= sk_hi &amp;&amp; sk_hi &lt;= hi)</div><div class='add'>+			hi = sk_hi;</div><div class='add'>+		local_range = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*low = lo;</div><div class='add'>+	*high = hi;</div><div class='add'>+	return local_range;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_sk_get_local_port_range);</div><div class='add'>+</div><div class='add'>+static bool inet_use_bhash2_on_bind(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+		if (ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return sk-&gt;sk_rcv_saddr != htonl(INADDR_ANY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2,</div><div class='add'>+			       kuid_t uid, bool relax,</div><div class='add'>+			       bool reuseport_cb_ok, bool reuseport_ok)</div><div class='add'>+{</div><div class='add'>+	int bound_dev_if2;</div><div class='add'>+</div><div class='add'>+	if (sk == sk2)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	bound_dev_if2 = READ_ONCE(sk2-&gt;sk_bound_dev_if);</div><div class='add'>+</div><div class='add'>+	if (!sk-&gt;sk_bound_dev_if || !bound_dev_if2 ||</div><div class='add'>+	    sk-&gt;sk_bound_dev_if == bound_dev_if2) {</div><div class='add'>+		if (sk-&gt;sk_reuse &amp;&amp; sk2-&gt;sk_reuse &amp;&amp;</div><div class='add'>+		    sk2-&gt;sk_state != TCP_LISTEN) {</div><div class='add'>+			if (!relax || (!reuseport_ok &amp;&amp; sk-&gt;sk_reuseport &amp;&amp;</div><div class='add'>+				       sk2-&gt;sk_reuseport &amp;&amp; reuseport_cb_ok &amp;&amp;</div><div class='add'>+				       (sk2-&gt;sk_state == TCP_TIME_WAIT ||</div><div class='add'>+					uid_eq(uid, sk_uid(sk2)))))</div><div class='add'>+				return true;</div><div class='add'>+		} else if (!reuseport_ok || !sk-&gt;sk_reuseport ||</div><div class='add'>+			   !sk2-&gt;sk_reuseport || !reuseport_cb_ok ||</div><div class='add'>+			   (sk2-&gt;sk_state != TCP_TIME_WAIT &amp;&amp;</div><div class='add'>+			    !uid_eq(uid, sk_uid(sk2)))) {</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2,</div><div class='add'>+				   kuid_t uid, bool relax,</div><div class='add'>+				   bool reuseport_cb_ok, bool reuseport_ok)</div><div class='add'>+{</div><div class='add'>+	if (ipv6_only_sock(sk2)) {</div><div class='add'>+		if (sk-&gt;sk_family == AF_INET)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		if (ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+			return false;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return inet_bind_conflict(sk, sk2, uid, relax,</div><div class='add'>+				  reuseport_cb_ok, reuseport_ok);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool inet_bhash2_conflict(const struct sock *sk,</div><div class='add'>+				 const struct inet_bind2_bucket *tb2,</div><div class='add'>+				 kuid_t uid,</div><div class='add'>+				 bool relax, bool reuseport_cb_ok,</div><div class='add'>+				 bool reuseport_ok)</div><div class='ctx'> {</div><div class='del'>-	unsigned int seq;</div><div class='add'>+	struct sock *sk2;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;net-&gt;ipv4.ip_local_ports.lock);</div><div class='add'>+	sk_for_each_bound(sk2, &amp;tb2-&gt;owners) {</div><div class='add'>+		if (__inet_bhash2_conflict(sk, sk2, uid, relax,</div><div class='add'>+					   reuseport_cb_ok, reuseport_ok))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		*low = net-&gt;ipv4.ip_local_ports.range[0];</div><div class='del'>-		*high = net-&gt;ipv4.ip_local_ports.range[1];</div><div class='del'>-	} while (read_seqretry(&amp;net-&gt;ipv4.ip_local_ports.lock, seq));</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_get_local_port_range);</div><div class='ctx'> </div><div class='add'>+#define sk_for_each_bound_bhash(__sk, __tb2, __tb)			\</div><div class='add'>+	hlist_for_each_entry(__tb2, &amp;(__tb)-&gt;bhash2, bhash_node)	\</div><div class='add'>+		sk_for_each_bound((__sk), &amp;(__tb2)-&gt;owners)</div><div class='add'>+</div><div class='add'>+/* This should be called only when the tb and tb2 hashbuckets' locks are held */</div><div class='ctx'> static int inet_csk_bind_conflict(const struct sock *sk,</div><div class='ctx'> 				  const struct inet_bind_bucket *tb,</div><div class='add'>+				  const struct inet_bind2_bucket *tb2, /* may be null */</div><div class='ctx'> 				  bool relax, bool reuseport_ok)</div><div class='ctx'> {</div><div class='add'>+	struct sock_reuseport *reuseport_cb;</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='add'>+	bool reuseport_cb_ok;</div><div class='ctx'> 	struct sock *sk2;</div><div class='del'>-	bool reuse = sk-&gt;sk_reuse;</div><div class='del'>-	bool reuseport = !!sk-&gt;sk_reuseport &amp;&amp; reuseport_ok;</div><div class='del'>-	kuid_t uid = sock_i_uid((struct sock *)sk);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Unlike other sk lookup places we do not check</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	reuseport_cb = rcu_dereference(sk-&gt;sk_reuseport_cb);</div><div class='add'>+	/* paired with WRITE_ONCE() in __reuseport_(add|detach)_closed_sock */</div><div class='add'>+	reuseport_cb_ok = !reuseport_cb || READ_ONCE(reuseport_cb-&gt;num_closed_socks);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* Conflicts with an existing IPV6_ADDR_ANY (if ipv6) or INADDR_ANY (if</div><div class='add'>+	 * ipv4) should have been checked already. We need to do these two</div><div class='add'>+	 * checks separately because their spinlocks have to be acquired/released</div><div class='add'>+	 * independently of each other, to prevent possible deadlocks</div><div class='add'>+	 */</div><div class='add'>+	if (inet_use_bhash2_on_bind(sk))</div><div class='add'>+		return tb2 &amp;&amp; inet_bhash2_conflict(sk, tb2, uid, relax,</div><div class='add'>+						   reuseport_cb_ok, reuseport_ok);</div><div class='add'>+</div><div class='add'>+	/* Unlike other sk lookup places we do not check</div><div class='ctx'> 	 * for sk_net here, since _all_ the socks listed</div><div class='del'>-	 * in tb-&gt;owners list belong to the same net - the</div><div class='del'>-	 * one this bucket belongs to.</div><div class='add'>+	 * in tb-&gt;owners and tb2-&gt;owners list belong</div><div class='add'>+	 * to the same net - the one this bucket belongs to.</div><div class='ctx'> 	 */</div><div class='add'>+	sk_for_each_bound_bhash(sk2, tb2, tb) {</div><div class='add'>+		if (!inet_bind_conflict(sk, sk2, uid, relax, reuseport_cb_ok, reuseport_ok))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	sk_for_each_bound(sk2, &amp;tb-&gt;owners) {</div><div class='del'>-		if (sk != sk2 &amp;&amp;</div><div class='del'>-		    (!sk-&gt;sk_bound_dev_if ||</div><div class='del'>-		     !sk2-&gt;sk_bound_dev_if ||</div><div class='del'>-		     sk-&gt;sk_bound_dev_if == sk2-&gt;sk_bound_dev_if)) {</div><div class='del'>-			if ((!reuse || !sk2-&gt;sk_reuse ||</div><div class='del'>-			    sk2-&gt;sk_state == TCP_LISTEN) &amp;&amp;</div><div class='del'>-			    (!reuseport || !sk2-&gt;sk_reuseport ||</div><div class='del'>-			     rcu_access_pointer(sk-&gt;sk_reuseport_cb) ||</div><div class='del'>-			     (sk2-&gt;sk_state != TCP_TIME_WAIT &amp;&amp;</div><div class='del'>-			     !uid_eq(uid, sock_i_uid(sk2))))) {</div><div class='del'>-				if (inet_rcv_saddr_equal(sk, sk2, true))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (!relax &amp;&amp; reuse &amp;&amp; sk2-&gt;sk_reuse &amp;&amp;</div><div class='del'>-			    sk2-&gt;sk_state != TCP_LISTEN) {</div><div class='del'>-				if (inet_rcv_saddr_equal(sk, sk2, true))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (inet_rcv_saddr_equal(sk, sk2, true))</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='del'>-	return sk2 != NULL;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if there is a bind conflict with an existing IPV6_ADDR_ANY (if ipv6) or</div><div class='add'>+ * INADDR_ANY (if ipv4) socket.</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold bhash hashbucket lock with local bh disabled, to protect</div><div class='add'>+ * against concurrent binds on the port for addr any</div><div class='add'>+ */</div><div class='add'>+static bool inet_bhash2_addr_any_conflict(const struct sock *sk, int port, int l3mdev,</div><div class='add'>+					  bool relax, bool reuseport_ok)</div><div class='add'>+{</div><div class='add'>+	const struct net *net = sock_net(sk);</div><div class='add'>+	struct sock_reuseport *reuseport_cb;</div><div class='add'>+	struct inet_bind_hashbucket *head2;</div><div class='add'>+	struct inet_bind2_bucket *tb2;</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='add'>+	bool conflict = false;</div><div class='add'>+	bool reuseport_cb_ok;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	reuseport_cb = rcu_dereference(sk-&gt;sk_reuseport_cb);</div><div class='add'>+	/* paired with WRITE_ONCE() in __reuseport_(add|detach)_closed_sock */</div><div class='add'>+	reuseport_cb_ok = !reuseport_cb || READ_ONCE(reuseport_cb-&gt;num_closed_socks);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	head2 = inet_bhash2_addr_any_hashbucket(sk, net, port);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	inet_bind_bucket_for_each(tb2, &amp;head2-&gt;chain) {</div><div class='add'>+		if (!inet_bind2_bucket_match_addr_any(tb2, net, port, l3mdev, sk))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!inet_bhash2_conflict(sk, tb2, uid, relax, reuseport_cb_ok,	reuseport_ok))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		conflict = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return conflict;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Find an open port number for the socket.  Returns with the</div><div class='del'>- * inet_bind_hashbucket lock held.</div><div class='add'>+ * inet_bind_hashbucket locks held if successful.</div><div class='ctx'>  */</div><div class='ctx'> static struct inet_bind_hashbucket *</div><div class='del'>-inet_csk_find_open_port(struct sock *sk, struct inet_bind_bucket **tb_ret, int *port_ret)</div><div class='add'>+inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,</div><div class='add'>+			struct inet_bind2_bucket **tb2_ret,</div><div class='add'>+			struct inet_bind_hashbucket **head2_ret, int *port_ret)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	int port = 0;</div><div class='del'>-	struct inet_bind_hashbucket *head;</div><div class='add'>+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	int i, low, high, attempt_half, port, l3mdev;</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	int i, low, high, attempt_half;</div><div class='add'>+	struct inet_bind2_bucket *tb2;</div><div class='ctx'> 	struct inet_bind_bucket *tb;</div><div class='ctx'> 	u32 remaining, offset;</div><div class='add'>+	bool relax = false;</div><div class='ctx'> </div><div class='add'>+	l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+ports_exhausted:</div><div class='ctx'> 	attempt_half = (sk-&gt;sk_reuse == SK_CAN_REUSE) ? 1 : 0;</div><div class='ctx'> other_half_scan:</div><div class='del'>-	inet_get_local_port_range(net, &amp;low, &amp;high);</div><div class='add'>+	inet_sk_get_local_port_range(sk, &amp;low, &amp;high);</div><div class='ctx'> 	high++; /* [32768, 60999] -&gt; [32768, 61000[ */</div><div class='ctx'> 	if (high - low &lt; 4)</div><div class='ctx'> 		attempt_half = 0;</div><div class='hunk'>@@ -202,7 +359,7 @@ other_half_scan:</div><div class='ctx'> 	if (likely(remaining &gt; 1))</div><div class='ctx'> 		remaining &amp;= ~1U;</div><div class='ctx'> </div><div class='del'>-	offset = prandom_u32() % remaining;</div><div class='add'>+	offset = get_random_u32_below(remaining);</div><div class='ctx'> 	/* __inet_hash_connect() favors ports having @low parity</div><div class='ctx'> 	 * We do the opposite to not pollute connect() users.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -218,10 +375,20 @@ other_parity_scan:</div><div class='ctx'> 		head = &amp;hinfo-&gt;bhash[inet_bhashfn(net, port,</div><div class='ctx'> 						  hinfo-&gt;bhash_size)];</div><div class='ctx'> 		spin_lock_bh(&amp;head-&gt;lock);</div><div class='add'>+		if (inet_use_bhash2_on_bind(sk)) {</div><div class='add'>+			if (inet_bhash2_addr_any_conflict(sk, port, l3mdev, relax, false))</div><div class='add'>+				goto next_port;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);</div><div class='add'>+		spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+		tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk);</div><div class='ctx'> 		inet_bind_bucket_for_each(tb, &amp;head-&gt;chain)</div><div class='del'>-			if (net_eq(ib_net(tb), net) &amp;&amp; tb-&gt;port == port) {</div><div class='del'>-				if (!inet_csk_bind_conflict(sk, tb, false, false))</div><div class='add'>+			if (inet_bind_bucket_match(tb, net, port, l3mdev)) {</div><div class='add'>+				if (!inet_csk_bind_conflict(sk, tb, tb2,</div><div class='add'>+							    relax, false))</div><div class='ctx'> 					goto success;</div><div class='add'>+				spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 				goto next_port;</div><div class='ctx'> 			}</div><div class='ctx'> 		tb = NULL;</div><div class='hunk'>@@ -240,25 +407,31 @@ next_port:</div><div class='ctx'> 		attempt_half = 2;</div><div class='ctx'> 		goto other_half_scan;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_autobind_reuse) &amp;&amp; !relax) {</div><div class='add'>+		/* We still have a chance to connect to different destinations */</div><div class='add'>+		relax = true;</div><div class='add'>+		goto ports_exhausted;</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> success:</div><div class='ctx'> 	*port_ret = port;</div><div class='ctx'> 	*tb_ret = tb;</div><div class='add'>+	*tb2_ret = tb2;</div><div class='add'>+	*head2_ret = head2;</div><div class='ctx'> 	return head;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int sk_reuseport_match(struct inet_bind_bucket *tb,</div><div class='del'>-				     struct sock *sk)</div><div class='add'>+				     const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='del'>-</div><div class='ctx'> 	if (tb-&gt;fastreuseport &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!sk-&gt;sk_reuseport)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!uid_eq(tb-&gt;fastuid, uid))</div><div class='add'>+	if (!uid_eq(tb-&gt;fastuid, sk_uid(sk)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* We only need to check the rcv_saddr if this tb was once marked</div><div class='ctx'> 	 * without fastreuseport and then was reset, as we can only know that</div><div class='hunk'>@@ -274,62 +447,23 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb,</div><div class='ctx'> 					    tb-&gt;fast_rcv_saddr,</div><div class='ctx'> 					    sk-&gt;sk_rcv_saddr,</div><div class='ctx'> 					    tb-&gt;fast_ipv6_only,</div><div class='del'>-					    ipv6_only_sock(sk), true);</div><div class='add'>+					    ipv6_only_sock(sk), true, false);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ipv4_rcv_saddr_equal(tb-&gt;fast_rcv_saddr, sk-&gt;sk_rcv_saddr,</div><div class='del'>-				    ipv6_only_sock(sk), true);</div><div class='add'>+				    ipv6_only_sock(sk), true, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Obtain a reference to a local port for the given sock,</div><div class='del'>- * if snum is zero it means select any available local port.</div><div class='del'>- * We try to allocate an odd port (and leave even ports for connect())</div><div class='del'>- */</div><div class='del'>-int inet_csk_get_port(struct sock *sk, unsigned short snum)</div><div class='add'>+void inet_csk_update_fastreuse(const struct sock *sk,</div><div class='add'>+			       struct inet_bind_bucket *tb,</div><div class='add'>+			       struct inet_bind2_bucket *tb2)</div><div class='ctx'> {</div><div class='ctx'> 	bool reuse = sk-&gt;sk_reuse &amp;&amp; sk-&gt;sk_state != TCP_LISTEN;</div><div class='del'>-	struct inet_hashinfo *hinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	int ret = 1, port = snum;</div><div class='del'>-	struct inet_bind_hashbucket *head;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-	struct inet_bind_bucket *tb = NULL;</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='ctx'> </div><div class='del'>-	if (!port) {</div><div class='del'>-		head = inet_csk_find_open_port(sk, &amp;tb, &amp;port);</div><div class='del'>-		if (!head)</div><div class='del'>-			return ret;</div><div class='del'>-		if (!tb)</div><div class='del'>-			goto tb_not_found;</div><div class='del'>-		goto success;</div><div class='del'>-	}</div><div class='del'>-	head = &amp;hinfo-&gt;bhash[inet_bhashfn(net, port,</div><div class='del'>-					  hinfo-&gt;bhash_size)];</div><div class='del'>-	spin_lock_bh(&amp;head-&gt;lock);</div><div class='del'>-	inet_bind_bucket_for_each(tb, &amp;head-&gt;chain)</div><div class='del'>-		if (net_eq(ib_net(tb), net) &amp;&amp; tb-&gt;port == port)</div><div class='del'>-			goto tb_found;</div><div class='del'>-tb_not_found:</div><div class='del'>-	tb = inet_bind_bucket_create(hinfo-&gt;bind_bucket_cachep,</div><div class='del'>-				     net, head, port);</div><div class='del'>-	if (!tb)</div><div class='del'>-		goto fail_unlock;</div><div class='del'>-tb_found:</div><div class='del'>-	if (!hlist_empty(&amp;tb-&gt;owners)) {</div><div class='del'>-		if (sk-&gt;sk_reuse == SK_FORCE_REUSE)</div><div class='del'>-			goto success;</div><div class='del'>-</div><div class='del'>-		if ((tb-&gt;fastreuse &gt; 0 &amp;&amp; reuse) ||</div><div class='del'>-		    sk_reuseport_match(tb, sk))</div><div class='del'>-			goto success;</div><div class='del'>-		if (inet_csk_bind_conflict(sk, tb, true, true))</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-	}</div><div class='del'>-success:</div><div class='del'>-	if (hlist_empty(&amp;tb-&gt;owners)) {</div><div class='add'>+	if (hlist_empty(&amp;tb-&gt;bhash2)) {</div><div class='ctx'> 		tb-&gt;fastreuse = reuse;</div><div class='ctx'> 		if (sk-&gt;sk_reuseport) {</div><div class='ctx'> 			tb-&gt;fastreuseport = FASTREUSEPORT_ANY;</div><div class='del'>-			tb-&gt;fastuid = uid;</div><div class='add'>+			tb-&gt;fastuid = sk_uid(sk);</div><div class='ctx'> 			tb-&gt;fast_rcv_saddr = sk-&gt;sk_rcv_saddr;</div><div class='ctx'> 			tb-&gt;fast_ipv6_only = ipv6_only_sock(sk);</div><div class='ctx'> 			tb-&gt;fast_sk_family = sk-&gt;sk_family;</div><div class='hunk'>@@ -356,7 +490,7 @@ success:</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!sk_reuseport_match(tb, sk)) {</div><div class='ctx'> 				tb-&gt;fastreuseport = FASTREUSEPORT_STRICT;</div><div class='del'>-				tb-&gt;fastuid = uid;</div><div class='add'>+				tb-&gt;fastuid = sk_uid(sk);</div><div class='ctx'> 				tb-&gt;fast_rcv_saddr = sk-&gt;sk_rcv_saddr;</div><div class='ctx'> 				tb-&gt;fast_ipv6_only = ipv6_only_sock(sk);</div><div class='ctx'> 				tb-&gt;fast_sk_family = sk-&gt;sk_family;</div><div class='hunk'>@@ -368,12 +502,107 @@ success:</div><div class='ctx'> 			tb-&gt;fastreuseport = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	tb2-&gt;fastreuse = tb-&gt;fastreuse;</div><div class='add'>+	tb2-&gt;fastreuseport = tb-&gt;fastreuseport;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Obtain a reference to a local port for the given sock,</div><div class='add'>+ * if snum is zero it means select any available local port.</div><div class='add'>+ * We try to allocate an odd port (and leave even ports for connect())</div><div class='add'>+ */</div><div class='add'>+int inet_csk_get_port(struct sock *sk, unsigned short snum)</div><div class='add'>+{</div><div class='add'>+	bool reuse = sk-&gt;sk_reuse &amp;&amp; sk-&gt;sk_state != TCP_LISTEN;</div><div class='add'>+	bool found_port = false, check_bind_conflict = true;</div><div class='add'>+	bool bhash_created = false, bhash2_created = false;</div><div class='add'>+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	int ret = -EADDRINUSE, port = snum, l3mdev;</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='add'>+	struct inet_bind2_bucket *tb2 = NULL;</div><div class='add'>+	struct inet_bind_bucket *tb = NULL;</div><div class='add'>+	bool head2_lock_acquired = false;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+</div><div class='add'>+	if (!port) {</div><div class='add'>+		head = inet_csk_find_open_port(sk, &amp;tb, &amp;tb2, &amp;head2, &amp;port);</div><div class='add'>+		if (!head)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		head2_lock_acquired = true;</div><div class='add'>+</div><div class='add'>+		if (tb &amp;&amp; tb2)</div><div class='add'>+			goto success;</div><div class='add'>+		found_port = true;</div><div class='add'>+	} else {</div><div class='add'>+		head = &amp;hinfo-&gt;bhash[inet_bhashfn(net, port,</div><div class='add'>+						  hinfo-&gt;bhash_size)];</div><div class='add'>+		spin_lock_bh(&amp;head-&gt;lock);</div><div class='add'>+		inet_bind_bucket_for_each(tb, &amp;head-&gt;chain)</div><div class='add'>+			if (inet_bind_bucket_match(tb, net, port, l3mdev))</div><div class='add'>+				break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb) {</div><div class='add'>+		tb = inet_bind_bucket_create(hinfo-&gt;bind_bucket_cachep, net,</div><div class='add'>+					     head, port, l3mdev);</div><div class='add'>+		if (!tb)</div><div class='add'>+			goto fail_unlock;</div><div class='add'>+		bhash_created = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!found_port) {</div><div class='add'>+		if (!hlist_empty(&amp;tb-&gt;bhash2)) {</div><div class='add'>+			if (sk-&gt;sk_reuse == SK_FORCE_REUSE ||</div><div class='add'>+			    (tb-&gt;fastreuse &gt; 0 &amp;&amp; reuse) ||</div><div class='add'>+			    sk_reuseport_match(tb, sk))</div><div class='add'>+				check_bind_conflict = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (check_bind_conflict &amp;&amp; inet_use_bhash2_on_bind(sk)) {</div><div class='add'>+			if (inet_bhash2_addr_any_conflict(sk, port, l3mdev, true, true))</div><div class='add'>+				goto fail_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);</div><div class='add'>+		spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+		head2_lock_acquired = true;</div><div class='add'>+		tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb2) {</div><div class='add'>+		tb2 = inet_bind2_bucket_create(hinfo-&gt;bind2_bucket_cachep,</div><div class='add'>+					       net, head2, tb, sk);</div><div class='add'>+		if (!tb2)</div><div class='add'>+			goto fail_unlock;</div><div class='add'>+		bhash2_created = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!found_port &amp;&amp; check_bind_conflict) {</div><div class='add'>+		if (inet_csk_bind_conflict(sk, tb, tb2, true, true))</div><div class='add'>+			goto fail_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+	inet_csk_update_fastreuse(sk, tb, tb2);</div><div class='add'>+</div><div class='ctx'> 	if (!inet_csk(sk)-&gt;icsk_bind_hash)</div><div class='del'>-		inet_bind_hash(sk, tb, port);</div><div class='add'>+		inet_bind_hash(sk, tb, tb2, port);</div><div class='ctx'> 	WARN_ON(inet_csk(sk)-&gt;icsk_bind_hash != tb);</div><div class='add'>+	WARN_ON(inet_csk(sk)-&gt;icsk_bind2_hash != tb2);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> fail_unlock:</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (bhash2_created)</div><div class='add'>+			inet_bind2_bucket_destroy(hinfo-&gt;bind2_bucket_cachep, tb2);</div><div class='add'>+		if (bhash_created)</div><div class='add'>+			inet_bind_bucket_destroy(tb);</div><div class='add'>+	}</div><div class='add'>+	if (head2_lock_acquired)</div><div class='add'>+		spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 	spin_unlock_bh(&amp;head-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -431,7 +660,7 @@ static int inet_csk_wait_for_connect(struct sock *sk, long timeo)</div><div class='ctx'> /*</div><div class='ctx'>  * This will accept the next outstanding connection.</div><div class='ctx'>  */</div><div class='del'>-struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern)</div><div class='add'>+struct sock *inet_csk_accept(struct sock *sk, struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct request_sock_queue *queue = &amp;icsk-&gt;icsk_accept_queue;</div><div class='hunk'>@@ -450,7 +679,7 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern)</div><div class='ctx'> </div><div class='ctx'> 	/* Find already established connection */</div><div class='ctx'> 	if (reqsk_queue_empty(queue)) {</div><div class='del'>-		long timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+		long timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 		/* If this is a non blocking socket don't sleep */</div><div class='ctx'> 		error = -EAGAIN;</div><div class='hunk'>@@ -462,6 +691,7 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	req = reqsk_queue_remove(queue, sk);</div><div class='add'>+	arg-&gt;is_empty = reqsk_queue_empty(queue);</div><div class='ctx'> 	newsk = req-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp;</div><div class='hunk'>@@ -479,16 +709,19 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;queue-&gt;fastopenq.lock);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+</div><div class='ctx'> 	if (req)</div><div class='ctx'> 		reqsk_put(req);</div><div class='add'>+</div><div class='add'>+	inet_init_csk_locks(newsk);</div><div class='ctx'> 	return newsk;</div><div class='add'>+</div><div class='ctx'> out_err:</div><div class='del'>-	newsk = NULL;</div><div class='del'>-	req = NULL;</div><div class='del'>-	*err = error;</div><div class='del'>-	goto out;</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	arg-&gt;err = error;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_csk_accept);</div><div class='ctx'> </div><div class='hunk'>@@ -504,36 +737,38 @@ void inet_csk_init_xmit_timers(struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-	timer_setup(&amp;icsk-&gt;icsk_retransmit_timer, retransmit_handler, 0);</div><div class='add'>+	timer_setup(&amp;sk-&gt;tcp_retransmit_timer, retransmit_handler, 0);</div><div class='ctx'> 	timer_setup(&amp;icsk-&gt;icsk_delack_timer, delack_handler, 0);</div><div class='del'>-	timer_setup(&amp;sk-&gt;sk_timer, keepalive_handler, 0);</div><div class='add'>+	timer_setup(&amp;icsk-&gt;icsk_keepalive_timer, keepalive_handler, 0);</div><div class='ctx'> 	icsk-&gt;icsk_pending = icsk-&gt;icsk_ack.pending = 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_init_xmit_timers);</div><div class='ctx'> </div><div class='ctx'> void inet_csk_clear_xmit_timers(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-	icsk-&gt;icsk_pending = icsk-&gt;icsk_ack.pending = icsk-&gt;icsk_ack.blocked = 0;</div><div class='add'>+	smp_store_release(&amp;icsk-&gt;icsk_pending, 0);</div><div class='add'>+	smp_store_release(&amp;icsk-&gt;icsk_ack.pending, 0);</div><div class='ctx'> </div><div class='del'>-	sk_stop_timer(sk, &amp;icsk-&gt;icsk_retransmit_timer);</div><div class='add'>+	sk_stop_timer(sk, &amp;sk-&gt;tcp_retransmit_timer);</div><div class='ctx'> 	sk_stop_timer(sk, &amp;icsk-&gt;icsk_delack_timer);</div><div class='del'>-	sk_stop_timer(sk, &amp;sk-&gt;sk_timer);</div><div class='add'>+	sk_stop_timer(sk, &amp;icsk-&gt;icsk_keepalive_timer);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_clear_xmit_timers);</div><div class='ctx'> </div><div class='del'>-void inet_csk_delete_keepalive_timer(struct sock *sk)</div><div class='add'>+void inet_csk_clear_xmit_timers_sync(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	sk_stop_timer(sk, &amp;sk-&gt;sk_timer);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(inet_csk_delete_keepalive_timer);</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long len)</div><div class='del'>-{</div><div class='del'>-	sk_reset_timer(sk, &amp;sk-&gt;sk_timer, jiffies + len);</div><div class='add'>+	/* ongoing timer handlers need to acquire socket lock. */</div><div class='add'>+	sock_not_owned_by_me(sk);</div><div class='add'>+</div><div class='add'>+	smp_store_release(&amp;icsk-&gt;icsk_pending, 0);</div><div class='add'>+	smp_store_release(&amp;icsk-&gt;icsk_ack.pending, 0);</div><div class='add'>+</div><div class='add'>+	sk_stop_timer_sync(sk, &amp;sk-&gt;tcp_retransmit_timer);</div><div class='add'>+	sk_stop_timer_sync(sk, &amp;icsk-&gt;icsk_delack_timer);</div><div class='add'>+	sk_stop_timer_sync(sk, &amp;icsk-&gt;icsk_keepalive_timer);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *inet_csk_route_req(const struct sock *sk,</div><div class='ctx'> 				     struct flowi4 *fl4,</div><div class='hunk'>@@ -548,12 +783,12 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk,</div><div class='ctx'> 	opt = rcu_dereference(ireq-&gt;ireq_opt);</div><div class='ctx'> </div><div class='ctx'> 	flowi4_init_output(fl4, ireq-&gt;ir_iif, ireq-&gt;ir_mark,</div><div class='del'>-			   RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,</div><div class='add'>+			   ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),</div><div class='ctx'> 			   sk-&gt;sk_protocol, inet_sk_flowi_flags(sk),</div><div class='ctx'> 			   (opt &amp;&amp; opt-&gt;opt.srr) ? opt-&gt;opt.faddr : ireq-&gt;ir_rmt_addr,</div><div class='ctx'> 			   ireq-&gt;ir_loc_addr, ireq-&gt;ir_rmt_port,</div><div class='del'>-			   htons(ireq-&gt;ir_num), sk-&gt;sk_uid);</div><div class='del'>-	security_req_classify_flow(req, flowi4_to_flowi(fl4));</div><div class='add'>+			   htons(ireq-&gt;ir_num), sk_uid(sk));</div><div class='add'>+	security_req_classify_flow(req, flowi4_to_flowi_common(fl4));</div><div class='ctx'> 	rt = ip_route_output_flow(net, fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		goto no_route;</div><div class='hunk'>@@ -569,7 +804,6 @@ no_route:</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_route_req);</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,</div><div class='ctx'> 					    struct sock *newsk,</div><div class='hunk'>@@ -586,12 +820,12 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,</div><div class='ctx'> 	fl4 = &amp;newinet-&gt;cork.fl.u.ip4;</div><div class='ctx'> </div><div class='ctx'> 	flowi4_init_output(fl4, ireq-&gt;ir_iif, ireq-&gt;ir_mark,</div><div class='del'>-			   RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,</div><div class='add'>+			   ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),</div><div class='ctx'> 			   sk-&gt;sk_protocol, inet_sk_flowi_flags(sk),</div><div class='ctx'> 			   (opt &amp;&amp; opt-&gt;opt.srr) ? opt-&gt;opt.faddr : ireq-&gt;ir_rmt_addr,</div><div class='ctx'> 			   ireq-&gt;ir_loc_addr, ireq-&gt;ir_rmt_port,</div><div class='del'>-			   htons(ireq-&gt;ir_num), sk-&gt;sk_uid);</div><div class='del'>-	security_req_classify_flow(req, flowi4_to_flowi(fl4));</div><div class='add'>+			   htons(ireq-&gt;ir_num), sk_uid(sk));</div><div class='add'>+	security_req_classify_flow(req, flowi4_to_flowi_common(fl4));</div><div class='ctx'> 	rt = ip_route_output_flow(net, fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		goto no_route;</div><div class='hunk'>@@ -607,27 +841,20 @@ no_route:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_csk_route_child_sock);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-#define AF_INET_FAMILY(fam) ((fam) == AF_INET)</div><div class='del'>-#else</div><div class='del'>-#define AF_INET_FAMILY(fam) true</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* Decide when to expire the request and when to resend SYN-ACK */</div><div class='del'>-static inline void syn_ack_recalc(struct request_sock *req, const int thresh,</div><div class='del'>-				  const int max_retries,</div><div class='del'>-				  const u8 rskq_defer_accept,</div><div class='del'>-				  int *expire, int *resend)</div><div class='add'>+static void syn_ack_recalc(struct request_sock *req,</div><div class='add'>+			   const int max_syn_ack_retries,</div><div class='add'>+			   const u8 rskq_defer_accept,</div><div class='add'>+			   int *expire, int *resend)</div><div class='ctx'> {</div><div class='ctx'> 	if (!rskq_defer_accept) {</div><div class='del'>-		*expire = req-&gt;num_timeout &gt;= thresh;</div><div class='add'>+		*expire = req-&gt;num_timeout &gt;= max_syn_ack_retries;</div><div class='ctx'> 		*resend = 1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	*expire = req-&gt;num_timeout &gt;= thresh &amp;&amp;</div><div class='del'>-		  (!inet_rsk(req)-&gt;acked || req-&gt;num_timeout &gt;= max_retries);</div><div class='del'>-	/*</div><div class='del'>-	 * Do not resend while waiting for data after ACK,</div><div class='add'>+	*expire = req-&gt;num_timeout &gt;= max_syn_ack_retries &amp;&amp;</div><div class='add'>+		  (!inet_rsk(req)-&gt;acked || req-&gt;num_timeout &gt;= rskq_defer_accept);</div><div class='add'>+	/* Do not resend while waiting for data after ACK,</div><div class='ctx'> 	 * start to resend on end of deferring period to give</div><div class='ctx'> 	 * last chance for data or ACK to create established socket.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -635,67 +862,209 @@ static inline void syn_ack_recalc(struct request_sock *req, const int thresh,</div><div class='ctx'> 		  req-&gt;num_timeout &gt;= rskq_defer_accept - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req)</div><div class='add'>+static struct request_sock *</div><div class='add'>+reqsk_alloc_noprof(const struct request_sock_ops *ops, struct sock *sk_listener,</div><div class='add'>+		   bool attach_listener)</div><div class='ctx'> {</div><div class='del'>-	int err = req-&gt;rsk_ops-&gt;rtx_syn_ack(parent, req);</div><div class='add'>+	struct request_sock *req;</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		req-&gt;num_retrans++;</div><div class='del'>-	return err;</div><div class='add'>+	req = kmem_cache_alloc_noprof(ops-&gt;slab, GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+	req-&gt;rsk_listener = NULL;</div><div class='add'>+	if (attach_listener) {</div><div class='add'>+		if (unlikely(!refcount_inc_not_zero(&amp;sk_listener-&gt;sk_refcnt))) {</div><div class='add'>+			kmem_cache_free(ops-&gt;slab, req);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		req-&gt;rsk_listener = sk_listener;</div><div class='add'>+	}</div><div class='add'>+	req-&gt;rsk_ops = ops;</div><div class='add'>+	req_to_sk(req)-&gt;sk_prot = sk_listener-&gt;sk_prot;</div><div class='add'>+	sk_node_init(&amp;req_to_sk(req)-&gt;sk_node);</div><div class='add'>+	sk_tx_queue_clear(req_to_sk(req));</div><div class='add'>+	req-&gt;saved_syn = NULL;</div><div class='add'>+	req-&gt;syncookie = 0;</div><div class='add'>+	req-&gt;num_timeout = 0;</div><div class='add'>+	req-&gt;num_retrans = 0;</div><div class='add'>+	req-&gt;sk = NULL;</div><div class='add'>+	refcount_set(&amp;req-&gt;rsk_refcnt, 0);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+#define reqsk_alloc(...)	alloc_hooks(reqsk_alloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,</div><div class='add'>+				      struct sock *sk_listener,</div><div class='add'>+				      bool attach_listener)</div><div class='add'>+{</div><div class='add'>+	struct request_sock *req = reqsk_alloc(ops, sk_listener,</div><div class='add'>+					       attach_listener);</div><div class='add'>+</div><div class='add'>+	if (req) {</div><div class='add'>+		struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+</div><div class='add'>+		ireq-&gt;ireq_opt = NULL;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		ireq-&gt;pktopts = NULL;</div><div class='add'>+#endif</div><div class='add'>+		atomic64_set(&amp;ireq-&gt;ir_cookie, 0);</div><div class='add'>+		ireq-&gt;ireq_state = TCP_NEW_SYN_RECV;</div><div class='add'>+		write_pnet(&amp;ireq-&gt;ireq_net, sock_net(sk_listener));</div><div class='add'>+		ireq-&gt;ireq_family = sk_listener-&gt;sk_family;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_reqsk_alloc);</div><div class='add'>+</div><div class='add'>+static struct request_sock *inet_reqsk_clone(struct request_sock *req,</div><div class='add'>+					     struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sock *req_sk, *nreq_sk;</div><div class='add'>+	struct request_sock *nreq;</div><div class='add'>+</div><div class='add'>+	nreq = kmem_cache_alloc(req-&gt;rsk_ops-&gt;slab, GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+	if (!nreq) {</div><div class='add'>+		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+</div><div class='add'>+		/* paired with refcount_inc_not_zero() in reuseport_migrate_sock() */</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_sk = req_to_sk(req);</div><div class='add'>+	nreq_sk = req_to_sk(nreq);</div><div class='add'>+</div><div class='add'>+	memcpy(nreq_sk, req_sk,</div><div class='add'>+	       offsetof(struct sock, sk_dontcopy_begin));</div><div class='add'>+	unsafe_memcpy(&amp;nreq_sk-&gt;sk_dontcopy_end, &amp;req_sk-&gt;sk_dontcopy_end,</div><div class='add'>+		      req-&gt;rsk_ops-&gt;obj_size - offsetof(struct sock, sk_dontcopy_end),</div><div class='add'>+		      /* alloc is larger than struct, see above */);</div><div class='add'>+</div><div class='add'>+	sk_node_init(&amp;nreq_sk-&gt;sk_node);</div><div class='add'>+	nreq_sk-&gt;sk_tx_queue_mapping = req_sk-&gt;sk_tx_queue_mapping;</div><div class='add'>+#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING</div><div class='add'>+	nreq_sk-&gt;sk_rx_queue_mapping = req_sk-&gt;sk_rx_queue_mapping;</div><div class='add'>+#endif</div><div class='add'>+	nreq_sk-&gt;sk_incoming_cpu = req_sk-&gt;sk_incoming_cpu;</div><div class='add'>+</div><div class='add'>+	nreq-&gt;rsk_listener = sk;</div><div class='add'>+</div><div class='add'>+	/* We need not acquire fastopenq-&gt;lock</div><div class='add'>+	 * because the child socket is locked in inet_csk_listen_stop().</div><div class='add'>+	 */</div><div class='add'>+	if (sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp; tcp_rsk(nreq)-&gt;tfo_listener)</div><div class='add'>+		rcu_assign_pointer(tcp_sk(nreq-&gt;sk)-&gt;fastopen_rsk, nreq);</div><div class='add'>+</div><div class='add'>+	return nreq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reqsk_queue_migrated(struct request_sock_queue *queue,</div><div class='add'>+				 const struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;num_timeout == 0)</div><div class='add'>+		atomic_inc(&amp;queue-&gt;young);</div><div class='add'>+	atomic_inc(&amp;queue-&gt;qlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reqsk_migrate_reset(struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;saved_syn = NULL;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	inet_rsk(req)-&gt;ipv6_opt = NULL;</div><div class='add'>+	inet_rsk(req)-&gt;pktopts = NULL;</div><div class='add'>+#else</div><div class='add'>+	inet_rsk(req)-&gt;ireq_opt = NULL;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_rtx_syn_ack);</div><div class='ctx'> </div><div class='ctx'> /* return true if req was found in the ehash table */</div><div class='del'>-static bool reqsk_queue_unlink(struct request_sock_queue *queue,</div><div class='del'>-			       struct request_sock *req)</div><div class='add'>+static bool reqsk_queue_unlink(struct request_sock *req)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hashinfo = req_to_sk(req)-&gt;sk_prot-&gt;h.hashinfo;</div><div class='add'>+	struct sock *sk = req_to_sk(req);</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> </div><div class='del'>-	if (sk_hashed(req_to_sk(req))) {</div><div class='del'>-		spinlock_t *lock = inet_ehash_lockp(hashinfo, req-&gt;rsk_hash);</div><div class='add'>+	if (sk_hashed(sk)) {</div><div class='add'>+		struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);</div><div class='add'>+		spinlock_t *lock;</div><div class='ctx'> </div><div class='add'>+		lock = inet_ehash_lockp(hashinfo, req-&gt;rsk_hash);</div><div class='ctx'> 		spin_lock(lock);</div><div class='del'>-		found = __sk_nulls_del_node_init_rcu(req_to_sk(req));</div><div class='add'>+		found = __sk_nulls_del_node_init_rcu(sk);</div><div class='ctx'> 		spin_unlock(lock);</div><div class='ctx'> 	}</div><div class='del'>-	if (timer_pending(&amp;req-&gt;rsk_timer) &amp;&amp; del_timer_sync(&amp;req-&gt;rsk_timer))</div><div class='del'>-		reqsk_put(req);</div><div class='add'>+</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)</div><div class='add'>+static bool __inet_csk_reqsk_queue_drop(struct sock *sk,</div><div class='add'>+					struct request_sock *req,</div><div class='add'>+					bool from_timer)</div><div class='ctx'> {</div><div class='del'>-	if (reqsk_queue_unlink(&amp;inet_csk(sk)-&gt;icsk_accept_queue, req)) {</div><div class='add'>+	bool unlinked = reqsk_queue_unlink(req);</div><div class='add'>+</div><div class='add'>+	if (!from_timer &amp;&amp; timer_delete_sync(&amp;req-&gt;rsk_timer))</div><div class='add'>+		reqsk_put(req);</div><div class='add'>+</div><div class='add'>+	if (unlinked) {</div><div class='ctx'> 		reqsk_queue_removed(&amp;inet_csk(sk)-&gt;icsk_accept_queue, req);</div><div class='ctx'> 		reqsk_put(req);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return unlinked;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	return __inet_csk_reqsk_queue_drop(sk, req, false);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);</div><div class='ctx'> </div><div class='ctx'> void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)</div><div class='ctx'> {</div><div class='ctx'> 	inet_csk_reqsk_queue_drop(sk, req);</div><div class='ctx'> 	reqsk_put(req);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_reqsk_queue_drop_and_put);</div><div class='add'>+EXPORT_IPV6_MOD(inet_csk_reqsk_queue_drop_and_put);</div><div class='ctx'> </div><div class='ctx'> static void reqsk_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct request_sock *req = from_timer(req, t, rsk_timer);</div><div class='add'>+	struct request_sock *req = timer_container_of(req, t, rsk_timer);</div><div class='add'>+	struct request_sock *nreq = NULL, *oreq = req;</div><div class='ctx'> 	struct sock *sk_listener = req-&gt;rsk_listener;</div><div class='del'>-	struct net *net = sock_net(sk_listener);</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk_listener);</div><div class='del'>-	struct request_sock_queue *queue = &amp;icsk-&gt;icsk_accept_queue;</div><div class='del'>-	int qlen, expire = 0, resend = 0;</div><div class='del'>-	int max_retries, thresh;</div><div class='del'>-	u8 defer_accept;</div><div class='add'>+	struct inet_connection_sock *icsk;</div><div class='add'>+	struct request_sock_queue *queue;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int max_syn_ack_retries, qlen, expire = 0, resend = 0;</div><div class='add'>+</div><div class='add'>+	if (inet_sk_state_load(sk_listener) != TCP_LISTEN) {</div><div class='add'>+		struct sock *nsk;</div><div class='add'>+</div><div class='add'>+		nsk = reuseport_migrate_sock(sk_listener, req_to_sk(req), NULL);</div><div class='add'>+		if (!nsk)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		nreq = inet_reqsk_clone(req, nsk);</div><div class='add'>+		if (!nreq)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* The new timer for the cloned req can decrease the 2</div><div class='add'>+		 * by calling inet_csk_reqsk_queue_drop_and_put(), so</div><div class='add'>+		 * hold another count to prevent use-after-free and</div><div class='add'>+		 * call reqsk_put() just before return.</div><div class='add'>+		 */</div><div class='add'>+		refcount_set(&amp;nreq-&gt;rsk_refcnt, 2 + 1);</div><div class='add'>+		timer_setup(&amp;nreq-&gt;rsk_timer, reqsk_timer_handler, TIMER_PINNED);</div><div class='add'>+		reqsk_queue_migrated(&amp;inet_csk(nsk)-&gt;icsk_accept_queue, req);</div><div class='ctx'> </div><div class='del'>-	if (inet_sk_state_load(sk_listener) != TCP_LISTEN)</div><div class='del'>-		goto drop;</div><div class='add'>+		req = nreq;</div><div class='add'>+		sk_listener = nsk;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	max_retries = icsk-&gt;icsk_syn_retries ? : net-&gt;ipv4.sysctl_tcp_synack_retries;</div><div class='del'>-	thresh = max_retries;</div><div class='add'>+	icsk = inet_csk(sk_listener);</div><div class='add'>+	net = sock_net(sk_listener);</div><div class='add'>+	max_syn_ack_retries = READ_ONCE(icsk-&gt;icsk_syn_retries) ? :</div><div class='add'>+		READ_ONCE(net-&gt;ipv4.sysctl_tcp_synack_retries);</div><div class='ctx'> 	/* Normally all the openreqs are young and become mature</div><div class='ctx'> 	 * (i.e. converted to established socket) for first timeout.</div><div class='ctx'> 	 * If synack was not acknowledged for 1 second, it means</div><div class='hunk'>@@ -713,64 +1082,105 @@ static void reqsk_timer_handler(struct timer_list *t)</div><div class='ctx'> 	 * embrions; and abort old ones without pity, if old</div><div class='ctx'> 	 * ones are about to clog our table.</div><div class='ctx'> 	 */</div><div class='add'>+	queue = &amp;icsk-&gt;icsk_accept_queue;</div><div class='ctx'> 	qlen = reqsk_queue_len(queue);</div><div class='del'>-	if ((qlen &lt;&lt; 1) &gt; max(8U, sk_listener-&gt;sk_max_ack_backlog)) {</div><div class='add'>+	if ((qlen &lt;&lt; 1) &gt; max(8U, READ_ONCE(sk_listener-&gt;sk_max_ack_backlog))) {</div><div class='ctx'> 		int young = reqsk_queue_len_young(queue) &lt;&lt; 1;</div><div class='ctx'> </div><div class='del'>-		while (thresh &gt; 2) {</div><div class='add'>+		while (max_syn_ack_retries &gt; 2) {</div><div class='ctx'> 			if (qlen &lt; young)</div><div class='ctx'> 				break;</div><div class='del'>-			thresh--;</div><div class='add'>+			max_syn_ack_retries--;</div><div class='ctx'> 			young &lt;&lt;= 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	defer_accept = READ_ONCE(queue-&gt;rskq_defer_accept);</div><div class='del'>-	if (defer_accept)</div><div class='del'>-		max_retries = defer_accept;</div><div class='del'>-	syn_ack_recalc(req, thresh, max_retries, defer_accept,</div><div class='add'>+</div><div class='add'>+	syn_ack_recalc(req, max_syn_ack_retries, READ_ONCE(queue-&gt;rskq_defer_accept),</div><div class='ctx'> 		       &amp;expire, &amp;resend);</div><div class='del'>-	req-&gt;rsk_ops-&gt;syn_ack_timeout(req);</div><div class='add'>+	tcp_syn_ack_timeout(req);</div><div class='add'>+</div><div class='ctx'> 	if (!expire &amp;&amp;</div><div class='ctx'> 	    (!resend ||</div><div class='del'>-	     !inet_rtx_syn_ack(sk_listener, req) ||</div><div class='add'>+	     !tcp_rtx_synack(sk_listener, req) ||</div><div class='ctx'> 	     inet_rsk(req)-&gt;acked)) {</div><div class='del'>-		unsigned long timeo;</div><div class='del'>-</div><div class='ctx'> 		if (req-&gt;num_timeout++ == 0)</div><div class='ctx'> 			atomic_dec(&amp;queue-&gt;young);</div><div class='del'>-		timeo = min(TCP_TIMEOUT_INIT &lt;&lt; req-&gt;num_timeout, TCP_RTO_MAX);</div><div class='del'>-		mod_timer(&amp;req-&gt;rsk_timer, jiffies + timeo);</div><div class='add'>+		mod_timer(&amp;req-&gt;rsk_timer, jiffies + tcp_reqsk_timeout(req));</div><div class='add'>+</div><div class='add'>+		if (!nreq)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (!inet_ehash_insert(req_to_sk(nreq), req_to_sk(oreq), NULL)) {</div><div class='add'>+			/* delete timer */</div><div class='add'>+			__inet_csk_reqsk_queue_drop(sk_listener, nreq, true);</div><div class='add'>+			goto no_ownership;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__NET_INC_STATS(net, LINUX_MIB_TCPMIGRATEREQSUCCESS);</div><div class='add'>+		reqsk_migrate_reset(oreq);</div><div class='add'>+		reqsk_queue_removed(&amp;inet_csk(oreq-&gt;rsk_listener)-&gt;icsk_accept_queue, oreq);</div><div class='add'>+		reqsk_put(oreq);</div><div class='add'>+</div><div class='add'>+		reqsk_put(nreq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Even if we can clone the req, we may need not retransmit any more</div><div class='add'>+	 * SYN+ACKs (nreq-&gt;num_timeout &gt; max_syn_ack_retries, etc), or another</div><div class='add'>+	 * CPU may win the "own_req" race so that inet_ehash_insert() fails.</div><div class='add'>+	 */</div><div class='add'>+	if (nreq) {</div><div class='add'>+		__NET_INC_STATS(net, LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+no_ownership:</div><div class='add'>+		reqsk_migrate_reset(nreq);</div><div class='add'>+		reqsk_queue_removed(queue, nreq);</div><div class='add'>+		__reqsk_free(nreq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> drop:</div><div class='del'>-	inet_csk_reqsk_queue_drop_and_put(sk_listener, req);</div><div class='add'>+	__inet_csk_reqsk_queue_drop(sk_listener, oreq, true);</div><div class='add'>+	reqsk_put(oreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reqsk_queue_hash_req(struct request_sock *req,</div><div class='del'>-				 unsigned long timeout)</div><div class='add'>+static bool reqsk_queue_hash_req(struct request_sock *req)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;num_retrans = 0;</div><div class='del'>-	req-&gt;num_timeout = 0;</div><div class='del'>-	req-&gt;sk = NULL;</div><div class='add'>+	bool found_dup_sk = false;</div><div class='ctx'> </div><div class='add'>+	if (!inet_ehash_insert(req_to_sk(req), NULL, &amp;found_dup_sk))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* The timer needs to be setup after a successful insertion. */</div><div class='add'>+	req-&gt;timeout = tcp_timeout_init((struct sock *)req);</div><div class='ctx'> 	timer_setup(&amp;req-&gt;rsk_timer, reqsk_timer_handler, TIMER_PINNED);</div><div class='del'>-	mod_timer(&amp;req-&gt;rsk_timer, jiffies + timeout);</div><div class='add'>+	mod_timer(&amp;req-&gt;rsk_timer, jiffies + req-&gt;timeout);</div><div class='ctx'> </div><div class='del'>-	inet_ehash_insert(req_to_sk(req), NULL);</div><div class='ctx'> 	/* before letting lookups find us, make sure all req fields</div><div class='ctx'> 	 * are committed to memory and refcnt initialized.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	refcount_set(&amp;req-&gt;rsk_refcnt, 2 + 1);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req,</div><div class='del'>-				   unsigned long timeout)</div><div class='add'>+bool inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req)</div><div class='ctx'> {</div><div class='del'>-	reqsk_queue_hash_req(req, timeout);</div><div class='add'>+	if (!reqsk_queue_hash_req(req))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	inet_csk_reqsk_queue_added(sk);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inet_clone_ulp(const struct request_sock *req, struct sock *newsk,</div><div class='add'>+			   const gfp_t priority)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(newsk);</div><div class='add'>+</div><div class='add'>+	if (!icsk-&gt;icsk_ulp_ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	icsk-&gt;icsk_ulp_ops-&gt;clone(req, newsk, priority);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_reqsk_queue_hash_add);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	inet_csk_clone_lock - clone an inet socket, and lock its clone</div><div class='hunk'>@@ -785,38 +1195,61 @@ struct sock *inet_csk_clone_lock(const struct sock *sk,</div><div class='ctx'> 				 const gfp_t priority)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *newsk = sk_clone_lock(sk, priority);</div><div class='add'>+	struct inet_connection_sock *newicsk;</div><div class='add'>+	struct inet_request_sock *ireq;</div><div class='add'>+	struct inet_sock *newinet;</div><div class='ctx'> </div><div class='del'>-	if (newsk) {</div><div class='del'>-		struct inet_connection_sock *newicsk = inet_csk(newsk);</div><div class='add'>+	if (!newsk)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		inet_sk_set_state(newsk, TCP_SYN_RECV);</div><div class='del'>-		newicsk-&gt;icsk_bind_hash = NULL;</div><div class='add'>+	newicsk = inet_csk(newsk);</div><div class='add'>+	newinet = inet_sk(newsk);</div><div class='add'>+	ireq = inet_rsk(req);</div><div class='ctx'> </div><div class='del'>-		inet_sk(newsk)-&gt;inet_dport = inet_rsk(req)-&gt;ir_rmt_port;</div><div class='del'>-		inet_sk(newsk)-&gt;inet_num = inet_rsk(req)-&gt;ir_num;</div><div class='del'>-		inet_sk(newsk)-&gt;inet_sport = htons(inet_rsk(req)-&gt;ir_num);</div><div class='add'>+	newicsk-&gt;icsk_bind_hash = NULL;</div><div class='add'>+	newicsk-&gt;icsk_bind2_hash = NULL;</div><div class='ctx'> </div><div class='del'>-		/* listeners have SOCK_RCU_FREE, not the children */</div><div class='del'>-		sock_reset_flag(newsk, SOCK_RCU_FREE);</div><div class='add'>+	newinet-&gt;inet_dport = ireq-&gt;ir_rmt_port;</div><div class='add'>+	newinet-&gt;inet_num = ireq-&gt;ir_num;</div><div class='add'>+	newinet-&gt;inet_sport = htons(ireq-&gt;ir_num);</div><div class='ctx'> </div><div class='del'>-		inet_sk(newsk)-&gt;mc_list = NULL;</div><div class='add'>+	newsk-&gt;sk_bound_dev_if = ireq-&gt;ir_iif;</div><div class='ctx'> </div><div class='del'>-		newsk-&gt;sk_mark = inet_rsk(req)-&gt;ir_mark;</div><div class='del'>-		atomic64_set(&amp;newsk-&gt;sk_cookie,</div><div class='del'>-			     atomic64_read(&amp;inet_rsk(req)-&gt;ir_cookie));</div><div class='add'>+	newsk-&gt;sk_daddr = ireq-&gt;ir_rmt_addr;</div><div class='add'>+	newsk-&gt;sk_rcv_saddr = ireq-&gt;ir_loc_addr;</div><div class='add'>+	newinet-&gt;inet_saddr = ireq-&gt;ir_loc_addr;</div><div class='ctx'> </div><div class='del'>-		newicsk-&gt;icsk_retransmits = 0;</div><div class='del'>-		newicsk-&gt;icsk_backoff	  = 0;</div><div class='del'>-		newicsk-&gt;icsk_probes_out  = 0;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	newsk-&gt;sk_v6_daddr = ireq-&gt;ir_v6_rmt_addr;</div><div class='add'>+	newsk-&gt;sk_v6_rcv_saddr = ireq-&gt;ir_v6_loc_addr;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		/* Deinitialize accept_queue to trap illegal accesses. */</div><div class='del'>-		memset(&amp;newicsk-&gt;icsk_accept_queue, 0, sizeof(newicsk-&gt;icsk_accept_queue));</div><div class='add'>+	/* listeners have SOCK_RCU_FREE, not the children */</div><div class='add'>+	sock_reset_flag(newsk, SOCK_RCU_FREE);</div><div class='add'>+</div><div class='add'>+	inet_sk(newsk)-&gt;mc_list = NULL;</div><div class='add'>+</div><div class='add'>+	newsk-&gt;sk_mark = inet_rsk(req)-&gt;ir_mark;</div><div class='add'>+	atomic64_set(&amp;newsk-&gt;sk_cookie,</div><div class='add'>+		     atomic64_read(&amp;inet_rsk(req)-&gt;ir_cookie));</div><div class='add'>+</div><div class='add'>+	newicsk-&gt;icsk_retransmits = 0;</div><div class='add'>+	newicsk-&gt;icsk_backoff	  = 0;</div><div class='add'>+	newicsk-&gt;icsk_probes_out  = 0;</div><div class='add'>+	newicsk-&gt;icsk_probes_tstamp = 0;</div><div class='add'>+</div><div class='add'>+	/* Deinitialize accept_queue to trap illegal accesses. */</div><div class='add'>+	memset(&amp;newicsk-&gt;icsk_accept_queue, 0,</div><div class='add'>+	       sizeof(newicsk-&gt;icsk_accept_queue));</div><div class='add'>+</div><div class='add'>+	inet_sk_set_state(newsk, TCP_SYN_RECV);</div><div class='add'>+</div><div class='add'>+	inet_clone_ulp(req, newsk, priority);</div><div class='add'>+</div><div class='add'>+	security_inet_csk_clone(newsk, req);</div><div class='ctx'> </div><div class='del'>-		security_inet_csk_clone(newsk, req);</div><div class='del'>-	}</div><div class='ctx'> 	return newsk;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_clone_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * At this point, there should be no process reference to this</div><div class='hunk'>@@ -841,16 +1274,21 @@ void inet_csk_destroy_sock(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	xfrm_sk_free_policy(sk);</div><div class='ctx'> </div><div class='del'>-	sk_refcnt_debug_release(sk);</div><div class='del'>-</div><div class='del'>-	percpu_counter_dec(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='add'>+	tcp_orphan_count_dec();</div><div class='ctx'> </div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_csk_destroy_sock);</div><div class='ctx'> </div><div class='add'>+void inet_csk_prepare_for_destroy_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	/* The below has to be done to allow calling inet_csk_destroy_sock */</div><div class='add'>+	sock_set_flag(sk, SOCK_DEAD);</div><div class='add'>+	tcp_orphan_count_inc();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function allows to force a closure of a socket after the call to</div><div class='del'>- * tcp/dccp_create_openreq_child().</div><div class='add'>+ * tcp_create_openreq_child().</div><div class='ctx'>  */</div><div class='ctx'> void inet_csk_prepare_forced_close(struct sock *sk)</div><div class='ctx'> 	__releases(&amp;sk-&gt;sk_lock.slock)</div><div class='hunk'>@@ -858,23 +1296,33 @@ void inet_csk_prepare_forced_close(struct sock *sk)</div><div class='ctx'> 	/* sk_clone_lock locked the socket and set refcnt to 2 */</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='del'>-</div><div class='del'>-	/* The below has to be done to allow calling inet_csk_destroy_sock */</div><div class='del'>-	sock_set_flag(sk, SOCK_DEAD);</div><div class='del'>-	percpu_counter_inc(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='add'>+	inet_csk_prepare_for_destroy_sock(sk);</div><div class='ctx'> 	inet_sk(sk)-&gt;inet_num = 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_csk_prepare_forced_close);</div><div class='ctx'> </div><div class='del'>-int inet_csk_listen_start(struct sock *sk, int backlog)</div><div class='add'>+static int inet_ulp_can_listen(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+	if (icsk-&gt;icsk_ulp_ops &amp;&amp; !icsk-&gt;icsk_ulp_ops-&gt;clone)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int inet_csk_listen_start(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	int err = -EADDRINUSE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = inet_ulp_can_listen(sk);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	reqsk_queue_alloc(&amp;icsk-&gt;icsk_accept_queue);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_max_ack_backlog = backlog;</div><div class='ctx'> 	sk-&gt;sk_ack_backlog = 0;</div><div class='ctx'> 	inet_csk_delack_init(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -884,7 +1332,8 @@ int inet_csk_listen_start(struct sock *sk, int backlog)</div><div class='ctx'> 	 * after validation is complete.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inet_sk_state_store(sk, TCP_LISTEN);</div><div class='del'>-	if (!sk-&gt;sk_prot-&gt;get_port(sk, inet-&gt;inet_num)) {</div><div class='add'>+	err = sk-&gt;sk_prot-&gt;get_port(sk, inet-&gt;inet_num);</div><div class='add'>+	if (!err) {</div><div class='ctx'> 		inet-&gt;inet_sport = htons(inet-&gt;inet_num);</div><div class='ctx'> </div><div class='ctx'> 		sk_dst_reset(sk);</div><div class='hunk'>@@ -897,7 +1346,6 @@ int inet_csk_listen_start(struct sock *sk, int backlog)</div><div class='ctx'> 	inet_sk_set_state(sk, TCP_CLOSE);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_listen_start);</div><div class='ctx'> </div><div class='ctx'> static void inet_child_forget(struct sock *sk, struct request_sock *req,</div><div class='ctx'> 			      struct sock *child)</div><div class='hunk'>@@ -906,10 +1354,10 @@ static void inet_child_forget(struct sock *sk, struct request_sock *req,</div><div class='ctx'> </div><div class='ctx'> 	sock_orphan(child);</div><div class='ctx'> </div><div class='del'>-	percpu_counter_inc(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='add'>+	tcp_orphan_count_inc();</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_protocol == IPPROTO_TCP &amp;&amp; tcp_rsk(req)-&gt;tfo_listener) {</div><div class='del'>-		BUG_ON(tcp_sk(child)-&gt;fastopen_rsk != req);</div><div class='add'>+		BUG_ON(rcu_access_pointer(tcp_sk(child)-&gt;fastopen_rsk) != req);</div><div class='ctx'> 		BUG_ON(sk != req-&gt;rsk_listener);</div><div class='ctx'> </div><div class='ctx'> 		/* Paranoid, to prevent race condition if</div><div class='hunk'>@@ -918,7 +1366,7 @@ static void inet_child_forget(struct sock *sk, struct request_sock *req,</div><div class='ctx'> 		 * Also to satisfy an assertion in</div><div class='ctx'> 		 * tcp_v4_destroy_sock().</div><div class='ctx'> 		 */</div><div class='del'>-		tcp_sk(child)-&gt;fastopen_rsk = NULL;</div><div class='add'>+		RCU_INIT_POINTER(tcp_sk(child)-&gt;fastopen_rsk, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	inet_csk_destroy_sock(child);</div><div class='ctx'> }</div><div class='hunk'>@@ -937,7 +1385,7 @@ struct sock *inet_csk_reqsk_queue_add(struct sock *sk,</div><div class='ctx'> 		req-&gt;sk = child;</div><div class='ctx'> 		req-&gt;dl_next = NULL;</div><div class='ctx'> 		if (queue-&gt;rskq_accept_head == NULL)</div><div class='del'>-			queue-&gt;rskq_accept_head = req;</div><div class='add'>+			WRITE_ONCE(queue-&gt;rskq_accept_head, req);</div><div class='ctx'> 		else</div><div class='ctx'> 			queue-&gt;rskq_accept_tail-&gt;dl_next = req;</div><div class='ctx'> 		queue-&gt;rskq_accept_tail = req;</div><div class='hunk'>@@ -952,17 +1400,46 @@ struct sock *inet_csk_complete_hashdance(struct sock *sk, struct sock *child,</div><div class='ctx'> 					 struct request_sock *req, bool own_req)</div><div class='ctx'> {</div><div class='ctx'> 	if (own_req) {</div><div class='del'>-		inet_csk_reqsk_queue_drop(sk, req);</div><div class='del'>-		reqsk_queue_removed(&amp;inet_csk(sk)-&gt;icsk_accept_queue, req);</div><div class='del'>-		if (inet_csk_reqsk_queue_add(sk, req, child))</div><div class='add'>+		inet_csk_reqsk_queue_drop(req-&gt;rsk_listener, req);</div><div class='add'>+		reqsk_queue_removed(&amp;inet_csk(req-&gt;rsk_listener)-&gt;icsk_accept_queue, req);</div><div class='add'>+</div><div class='add'>+		if (sk != req-&gt;rsk_listener) {</div><div class='add'>+			/* another listening sk has been selected,</div><div class='add'>+			 * migrate the req to it.</div><div class='add'>+			 */</div><div class='add'>+			struct request_sock *nreq;</div><div class='add'>+</div><div class='add'>+			/* hold a refcnt for the nreq-&gt;rsk_listener</div><div class='add'>+			 * which is assigned in inet_reqsk_clone()</div><div class='add'>+			 */</div><div class='add'>+			sock_hold(sk);</div><div class='add'>+			nreq = inet_reqsk_clone(req, sk);</div><div class='add'>+			if (!nreq) {</div><div class='add'>+				inet_child_forget(sk, req, child);</div><div class='add'>+				goto child_put;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			refcount_set(&amp;nreq-&gt;rsk_refcnt, 1);</div><div class='add'>+			if (inet_csk_reqsk_queue_add(sk, nreq, child)) {</div><div class='add'>+				__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQSUCCESS);</div><div class='add'>+				reqsk_migrate_reset(req);</div><div class='add'>+				reqsk_put(req);</div><div class='add'>+				return child;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+			reqsk_migrate_reset(nreq);</div><div class='add'>+			__reqsk_free(nreq);</div><div class='add'>+		} else if (inet_csk_reqsk_queue_add(sk, req, child)) {</div><div class='ctx'> 			return child;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Too bad, another child took ownership of the request, undo. */</div><div class='add'>+child_put:</div><div class='ctx'> 	bh_unlock_sock(child);</div><div class='ctx'> 	sock_put(child);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_csk_complete_hashdance);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	This routine closes sockets which have been at least partially</div><div class='hunk'>@@ -983,14 +1460,40 @@ void inet_csk_listen_stop(struct sock *sk)</div><div class='ctx'> 	 * of the variants now.			--ANK</div><div class='ctx'> 	 */</div><div class='ctx'> 	while ((req = reqsk_queue_remove(queue, sk)) != NULL) {</div><div class='del'>-		struct sock *child = req-&gt;sk;</div><div class='add'>+		struct sock *child = req-&gt;sk, *nsk;</div><div class='add'>+		struct request_sock *nreq;</div><div class='ctx'> </div><div class='ctx'> 		local_bh_disable();</div><div class='ctx'> 		bh_lock_sock(child);</div><div class='ctx'> 		WARN_ON(sock_owned_by_user(child));</div><div class='ctx'> 		sock_hold(child);</div><div class='ctx'> </div><div class='add'>+		nsk = reuseport_migrate_sock(sk, child, NULL);</div><div class='add'>+		if (nsk) {</div><div class='add'>+			nreq = inet_reqsk_clone(req, nsk);</div><div class='add'>+			if (nreq) {</div><div class='add'>+				refcount_set(&amp;nreq-&gt;rsk_refcnt, 1);</div><div class='add'>+</div><div class='add'>+				if (inet_csk_reqsk_queue_add(nsk, nreq, child)) {</div><div class='add'>+					__NET_INC_STATS(sock_net(nsk),</div><div class='add'>+							LINUX_MIB_TCPMIGRATEREQSUCCESS);</div><div class='add'>+					reqsk_migrate_reset(req);</div><div class='add'>+				} else {</div><div class='add'>+					__NET_INC_STATS(sock_net(nsk),</div><div class='add'>+							LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+					reqsk_migrate_reset(nreq);</div><div class='add'>+					__reqsk_free(nreq);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* inet_csk_reqsk_queue_add() has already</div><div class='add'>+				 * called inet_child_forget() on failure case.</div><div class='add'>+				 */</div><div class='add'>+				goto skip_child_forget;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		inet_child_forget(sk, req, child);</div><div class='add'>+skip_child_forget:</div><div class='ctx'> 		reqsk_put(req);</div><div class='ctx'> 		bh_unlock_sock(child);</div><div class='ctx'> 		local_bh_enable();</div><div class='hunk'>@@ -1014,62 +1517,16 @@ void inet_csk_listen_stop(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_csk_listen_stop);</div><div class='ctx'> </div><div class='del'>-void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;</div><div class='del'>-	const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-</div><div class='del'>-	sin-&gt;sin_family		= AF_INET;</div><div class='del'>-	sin-&gt;sin_addr.s_addr	= inet-&gt;inet_daddr;</div><div class='del'>-	sin-&gt;sin_port		= inet-&gt;inet_dport;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_addr2sockaddr);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			       char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	if (icsk-&gt;icsk_af_ops-&gt;compat_getsockopt)</div><div class='del'>-		return icsk-&gt;icsk_af_ops-&gt;compat_getsockopt(sk, level, optname,</div><div class='del'>-							    optval, optlen);</div><div class='del'>-	return icsk-&gt;icsk_af_ops-&gt;getsockopt(sk, level, optname,</div><div class='del'>-					     optval, optlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_compat_getsockopt);</div><div class='del'>-</div><div class='del'>-int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			       char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	if (icsk-&gt;icsk_af_ops-&gt;compat_setsockopt)</div><div class='del'>-		return icsk-&gt;icsk_af_ops-&gt;compat_setsockopt(sk, level, optname,</div><div class='del'>-							    optval, optlen);</div><div class='del'>-	return icsk-&gt;icsk_af_ops-&gt;setsockopt(sk, level, optname,</div><div class='del'>-					     optval, optlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_compat_setsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct dst_entry *inet_csk_rebuild_route(struct sock *sk, struct flowi *fl)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	const struct ip_options_rcu *inet_opt;</div><div class='del'>-	__be32 daddr = inet-&gt;inet_daddr;</div><div class='ctx'> 	struct flowi4 *fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='del'>-	if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='del'>-		daddr = inet_opt-&gt;opt.faddr;</div><div class='ctx'> 	fl4 = &amp;fl-&gt;u.ip4;</div><div class='del'>-	rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr,</div><div class='del'>-				   inet-&gt;inet_saddr, inet-&gt;inet_dport,</div><div class='del'>-				   inet-&gt;inet_sport, sk-&gt;sk_protocol,</div><div class='del'>-				   RT_CONN_FLAGS(sk), sk-&gt;sk_bound_dev_if);</div><div class='add'>+	inet_sk_init_flowi4(inet, fl4);</div><div class='add'>+	rt = ip_route_output_flow(sock_net(sk), fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		rt = NULL;</div><div class='ctx'> 	if (rt)</div><div class='hunk'>@@ -1089,7 +1546,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu)</div><div class='ctx'> 		if (!dst)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	dst-&gt;ops-&gt;update_pmtu(dst, sk, NULL, mtu);</div><div class='add'>+	dst-&gt;ops-&gt;update_pmtu(dst, sk, NULL, mtu, true);</div><div class='ctx'> </div><div class='ctx'> 	dst = __sk_dst_check(sk, 0);</div><div class='ctx'> 	if (!dst)</div><div class='hunk'>@@ -1097,4 +1554,3 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu)</div><div class='ctx'> out:</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_csk_update_pmtu);</div><div class='head'>diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c<br/>index 4e5bc4b2f14e..3f5b1418a610 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_diag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_diag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inet_diag.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * inet_diag.c	Module for monitoring INET transport protocols sockets.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -24,9 +20,7 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='ctx'> #include &lt;net/inet_connection_sock.h&gt;</div><div class='del'>-#include &lt;net/inet_hashtables.h&gt;</div><div class='del'>-#include &lt;net/inet_timewait_sock.h&gt;</div><div class='del'>-#include &lt;net/inet6_hashtables.h&gt;</div><div class='add'>+#include &lt;net/bpf_sk_storage.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='hunk'>@@ -35,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/inet_diag.h&gt;</div><div class='ctx'> #include &lt;linux/sock_diag.h&gt;</div><div class='ctx'> </div><div class='del'>-static const struct inet_diag_handler **inet_diag_table;</div><div class='add'>+static const struct inet_diag_handler __rcu **inet_diag_table;</div><div class='ctx'> </div><div class='ctx'> struct inet_diag_entry {</div><div class='ctx'> 	const __be32 *saddr;</div><div class='hunk'>@@ -46,83 +40,67 @@ struct inet_diag_entry {</div><div class='ctx'> 	u16 userlocks;</div><div class='ctx'> 	u32 ifindex;</div><div class='ctx'> 	u32 mark;</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+	u64 cgroup_id;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX(inet_diag_table_mutex);</div><div class='del'>-</div><div class='ctx'> static const struct inet_diag_handler *inet_diag_lock_handler(int proto)</div><div class='ctx'> {</div><div class='del'>-	if (!inet_diag_table[proto])</div><div class='add'>+	const struct inet_diag_handler *handler;</div><div class='add'>+</div><div class='add'>+	if (proto &lt; 0 || proto &gt;= IPPROTO_MAX)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(inet_diag_table[proto]))</div><div class='ctx'> 		sock_load_diag_module(AF_INET, proto);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;inet_diag_table_mutex);</div><div class='del'>-	if (!inet_diag_table[proto])</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	handler = rcu_dereference(inet_diag_table[proto]);</div><div class='add'>+	if (handler &amp;&amp; !try_module_get(handler-&gt;owner))</div><div class='add'>+		handler = NULL;</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return inet_diag_table[proto];</div><div class='add'>+	return handler;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inet_diag_unlock_handler(const struct inet_diag_handler *handler)</div><div class='ctx'> {</div><div class='del'>-	mutex_unlock(&amp;inet_diag_table_mutex);</div><div class='add'>+	module_put(handler-&gt;owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	r-&gt;idiag_family = sk-&gt;sk_family;</div><div class='add'>+	r-&gt;idiag_family = READ_ONCE(sk-&gt;sk_family);</div><div class='ctx'> </div><div class='del'>-	r-&gt;id.idiag_sport = htons(sk-&gt;sk_num);</div><div class='del'>-	r-&gt;id.idiag_dport = sk-&gt;sk_dport;</div><div class='del'>-	r-&gt;id.idiag_if = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	r-&gt;id.idiag_sport = htons(READ_ONCE(sk-&gt;sk_num));</div><div class='add'>+	r-&gt;id.idiag_dport = READ_ONCE(sk-&gt;sk_dport);</div><div class='add'>+	r-&gt;id.idiag_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='ctx'> 	sock_diag_save_cookie(sk, r-&gt;id.idiag_cookie);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET6) {</div><div class='del'>-		*(struct in6_addr *)r-&gt;id.idiag_src = sk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-		*(struct in6_addr *)r-&gt;id.idiag_dst = sk-&gt;sk_v6_daddr;</div><div class='add'>+	if (r-&gt;idiag_family == AF_INET6) {</div><div class='add'>+		data_race(*(struct in6_addr *)r-&gt;id.idiag_src = sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+		data_race(*(struct in6_addr *)r-&gt;id.idiag_dst = sk-&gt;sk_v6_daddr);</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 	memset(&amp;r-&gt;id.idiag_src, 0, sizeof(r-&gt;id.idiag_src));</div><div class='ctx'> 	memset(&amp;r-&gt;id.idiag_dst, 0, sizeof(r-&gt;id.idiag_dst));</div><div class='ctx'> </div><div class='del'>-	r-&gt;id.idiag_src[0] = sk-&gt;sk_rcv_saddr;</div><div class='del'>-	r-&gt;id.idiag_dst[0] = sk-&gt;sk_daddr;</div><div class='add'>+	r-&gt;id.idiag_src[0] = READ_ONCE(sk-&gt;sk_rcv_saddr);</div><div class='add'>+	r-&gt;id.idiag_dst[0] = READ_ONCE(sk-&gt;sk_daddr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill);</div><div class='ctx'> </div><div class='del'>-static size_t inet_sk_attr_size(struct sock *sk,</div><div class='del'>-				const struct inet_diag_req_v2 *req,</div><div class='del'>-				bool net_admin)</div><div class='del'>-{</div><div class='del'>-	const struct inet_diag_handler *handler;</div><div class='del'>-	size_t aux = 0;</div><div class='del'>-</div><div class='del'>-	handler = inet_diag_table[req-&gt;sdiag_protocol];</div><div class='del'>-	if (handler &amp;&amp; handler-&gt;idiag_get_aux_size)</div><div class='del'>-		aux = handler-&gt;idiag_get_aux_size(sk, net_admin);</div><div class='del'>-</div><div class='del'>-	return	  nla_total_size(sizeof(struct tcp_info))</div><div class='del'>-		+ nla_total_size(1) /* INET_DIAG_SHUTDOWN */</div><div class='del'>-		+ nla_total_size(1) /* INET_DIAG_TOS */</div><div class='del'>-		+ nla_total_size(1) /* INET_DIAG_TCLASS */</div><div class='del'>-		+ nla_total_size(4) /* INET_DIAG_MARK */</div><div class='del'>-		+ nla_total_size(sizeof(struct inet_diag_meminfo))</div><div class='del'>-		+ nla_total_size(sizeof(struct inet_diag_msg))</div><div class='del'>-		+ nla_total_size(SK_MEMINFO_VARS * sizeof(u32))</div><div class='del'>-		+ nla_total_size(TCP_CA_NAME_MAX)</div><div class='del'>-		+ nla_total_size(sizeof(struct tcpvegas_info))</div><div class='del'>-		+ aux</div><div class='del'>-		+ 64;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			     struct inet_diag_msg *r, int ext,</div><div class='ctx'> 			     struct user_namespace *user_ns,</div><div class='ctx'> 			     bool net_admin)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct inet_diag_sockopt inet_sockopt;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk-&gt;sk_shutdown))</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -131,7 +109,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	 * hence this needs to be included regardless of socket family.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ext &amp; (1 &lt;&lt; (INET_DIAG_TOS - 1)))</div><div class='del'>-		if (nla_put_u8(skb, INET_DIAG_TOS, inet-&gt;tos) &lt; 0)</div><div class='add'>+		if (nla_put_u8(skb, INET_DIAG_TOS, READ_ONCE(inet-&gt;tos)) &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='hunk'>@@ -147,38 +125,114 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (net_admin &amp;&amp; nla_put_u32(skb, INET_DIAG_MARK, sk-&gt;sk_mark))</div><div class='add'>+	if (net_admin &amp;&amp; nla_put_u32(skb, INET_DIAG_MARK, READ_ONCE(sk-&gt;sk_mark)))</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	r-&gt;idiag_uid = from_kuid_munged(user_ns, sock_i_uid(sk));</div><div class='add'>+	if (ext &amp; (1 &lt;&lt; (INET_DIAG_CLASS_ID - 1)) ||</div><div class='add'>+	    ext &amp; (1 &lt;&lt; (INET_DIAG_TCLASS - 1))) {</div><div class='add'>+		u32 classid = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='add'>+		classid = sock_cgroup_classid(&amp;sk-&gt;sk_cgrp_data);</div><div class='add'>+#endif</div><div class='add'>+		/* Fallback to socket priority if class id isn't set.</div><div class='add'>+		 * Classful qdiscs use it as direct reference to class.</div><div class='add'>+		 * For cgroup2 classid is always zero.</div><div class='add'>+		 */</div><div class='add'>+		if (!classid)</div><div class='add'>+			classid = READ_ONCE(sk-&gt;sk_priority);</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, INET_DIAG_CLASS_ID, classid))</div><div class='add'>+			goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+	if (nla_put_u64_64bit(skb, INET_DIAG_CGROUP_ID,</div><div class='add'>+			      cgroup_id(sock_cgroup_ptr(&amp;sk-&gt;sk_cgrp_data)),</div><div class='add'>+			      INET_DIAG_PAD))</div><div class='add'>+		goto errout;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	r-&gt;idiag_uid = from_kuid_munged(user_ns, sk_uid(sk));</div><div class='ctx'> 	r-&gt;idiag_inode = sock_i_ino(sk);</div><div class='ctx'> </div><div class='add'>+	memset(&amp;inet_sockopt, 0, sizeof(inet_sockopt));</div><div class='add'>+	inet_sockopt.recverr	= inet_test_bit(RECVERR, sk);</div><div class='add'>+	inet_sockopt.is_icsk	= inet_test_bit(IS_ICSK, sk);</div><div class='add'>+	inet_sockopt.freebind	= inet_test_bit(FREEBIND, sk);</div><div class='add'>+	inet_sockopt.hdrincl	= inet_test_bit(HDRINCL, sk);</div><div class='add'>+	inet_sockopt.mc_loop	= inet_test_bit(MC_LOOP, sk);</div><div class='add'>+	inet_sockopt.transparent = inet_test_bit(TRANSPARENT, sk);</div><div class='add'>+	inet_sockopt.mc_all	= inet_test_bit(MC_ALL, sk);</div><div class='add'>+	inet_sockopt.nodefrag	= inet_test_bit(NODEFRAG, sk);</div><div class='add'>+	inet_sockopt.bind_address_no_port = inet_test_bit(BIND_ADDRESS_NO_PORT, sk);</div><div class='add'>+	inet_sockopt.recverr_rfc4884 = inet_test_bit(RECVERR_RFC4884, sk);</div><div class='add'>+	inet_sockopt.defer_connect = inet_test_bit(DEFER_CONNECT, sk);</div><div class='add'>+	if (nla_put(skb, INET_DIAG_SOCKOPT, sizeof(inet_sockopt),</div><div class='add'>+		    &amp;inet_sockopt))</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> errout:</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_diag_msg_attrs_fill);</div><div class='ctx'> </div><div class='add'>+static int inet_diag_parse_attrs(const struct nlmsghdr *nlh, int hdrlen,</div><div class='add'>+				 struct nlattr **req_nlas)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	int remaining;</div><div class='add'>+</div><div class='add'>+	nlmsg_for_each_attr(nla, nlh, hdrlen, remaining) {</div><div class='add'>+		int type = nla_type(nla);</div><div class='add'>+</div><div class='add'>+		if (type == INET_DIAG_REQ_PROTOCOL &amp;&amp; nla_len(nla) != sizeof(u32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (type &lt; __INET_DIAG_REQ_MAX)</div><div class='add'>+			req_nlas[type] = nla;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inet_diag_get_protocol(const struct inet_diag_req_v2 *req,</div><div class='add'>+				  const struct inet_diag_dump_data *data)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;req_nlas[INET_DIAG_REQ_PROTOCOL])</div><div class='add'>+		return nla_get_u32(data-&gt;req_nlas[INET_DIAG_REQ_PROTOCOL]);</div><div class='add'>+	return req-&gt;sdiag_protocol;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_DUMP_ALLOC_SIZE (KMALLOC_MAX_SIZE - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+</div><div class='ctx'> int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,</div><div class='del'>-		      struct sk_buff *skb, const struct inet_diag_req_v2 *req,</div><div class='del'>-		      struct user_namespace *user_ns,</div><div class='del'>-		      u32 portid, u32 seq, u16 nlmsg_flags,</div><div class='del'>-		      const struct nlmsghdr *unlh,</div><div class='del'>-		      bool net_admin)</div><div class='add'>+		      struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+		      const struct inet_diag_req_v2 *req,</div><div class='add'>+		      u16 nlmsg_flags, bool net_admin)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_congestion_ops *ca_ops;</div><div class='ctx'> 	const struct inet_diag_handler *handler;</div><div class='add'>+	struct inet_diag_dump_data *cb_data;</div><div class='ctx'> 	int ext = req-&gt;idiag_ext;</div><div class='ctx'> 	struct inet_diag_msg *r;</div><div class='ctx'> 	struct nlmsghdr  *nlh;</div><div class='ctx'> 	struct nlattr *attr;</div><div class='ctx'> 	void *info = NULL;</div><div class='add'>+	u8 icsk_pending;</div><div class='add'>+	int protocol;</div><div class='ctx'> </div><div class='del'>-	handler = inet_diag_table[req-&gt;sdiag_protocol];</div><div class='del'>-	BUG_ON(!handler);</div><div class='add'>+	cb_data = cb-&gt;data;</div><div class='add'>+	protocol = inet_diag_get_protocol(req, cb_data);</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, unlh-&gt;nlmsg_type, sizeof(*r),</div><div class='del'>-			nlmsg_flags);</div><div class='add'>+	/* inet_diag_lock_handler() made sure inet_diag_table[] is stable. */</div><div class='add'>+	handler = rcu_dereference_protected(inet_diag_table[protocol], 1);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(!handler);</div><div class='add'>+	if (!handler)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			cb-&gt;nlh-&gt;nlmsg_type, sizeof(*r), nlmsg_flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -189,15 +243,18 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,</div><div class='ctx'> 	r-&gt;idiag_state = sk-&gt;sk_state;</div><div class='ctx'> 	r-&gt;idiag_timer = 0;</div><div class='ctx'> 	r-&gt;idiag_retrans = 0;</div><div class='add'>+	r-&gt;idiag_expires = 0;</div><div class='ctx'> </div><div class='del'>-	if (inet_diag_msg_attrs_fill(sk, skb, r, ext, user_ns, net_admin))</div><div class='add'>+	if (inet_diag_msg_attrs_fill(sk, skb, r, ext,</div><div class='add'>+				     sk_user_ns(NETLINK_CB(cb-&gt;skb).sk),</div><div class='add'>+				     net_admin))</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	if (ext &amp; (1 &lt;&lt; (INET_DIAG_MEMINFO - 1))) {</div><div class='ctx'> 		struct inet_diag_meminfo minfo = {</div><div class='ctx'> 			.idiag_rmem = sk_rmem_alloc_get(sk),</div><div class='del'>-			.idiag_wmem = sk-&gt;sk_wmem_queued,</div><div class='del'>-			.idiag_fmem = sk-&gt;sk_forward_alloc,</div><div class='add'>+			.idiag_wmem = READ_ONCE(sk-&gt;sk_wmem_queued),</div><div class='add'>+			.idiag_fmem = READ_ONCE(sk-&gt;sk_forward_alloc),</div><div class='ctx'> 			.idiag_tmem = sk_wmem_alloc_get(sk),</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -223,26 +280,24 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_pending == ICSK_TIME_RETRANS ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='add'>+	icsk_pending = smp_load_acquire(&amp;icsk-&gt;icsk_pending);</div><div class='add'>+	if (icsk_pending == ICSK_TIME_RETRANS ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='ctx'> 		r-&gt;idiag_timer = 1;</div><div class='del'>-		r-&gt;idiag_retrans = icsk-&gt;icsk_retransmits;</div><div class='add'>+		r-&gt;idiag_retrans = READ_ONCE(icsk-&gt;icsk_retransmits);</div><div class='ctx'> 		r-&gt;idiag_expires =</div><div class='del'>-			jiffies_to_msecs(icsk-&gt;icsk_timeout - jiffies);</div><div class='del'>-	} else if (icsk-&gt;icsk_pending == ICSK_TIME_PROBE0) {</div><div class='add'>+			jiffies_delta_to_msecs(tcp_timeout_expires(sk) - jiffies);</div><div class='add'>+	} else if (icsk_pending == ICSK_TIME_PROBE0) {</div><div class='ctx'> 		r-&gt;idiag_timer = 4;</div><div class='del'>-		r-&gt;idiag_retrans = icsk-&gt;icsk_probes_out;</div><div class='add'>+		r-&gt;idiag_retrans = READ_ONCE(icsk-&gt;icsk_probes_out);</div><div class='ctx'> 		r-&gt;idiag_expires =</div><div class='del'>-			jiffies_to_msecs(icsk-&gt;icsk_timeout - jiffies);</div><div class='del'>-	} else if (timer_pending(&amp;sk-&gt;sk_timer)) {</div><div class='add'>+			jiffies_delta_to_msecs(tcp_timeout_expires(sk) - jiffies);</div><div class='add'>+	} else if (timer_pending(&amp;icsk-&gt;icsk_keepalive_timer)) {</div><div class='ctx'> 		r-&gt;idiag_timer = 2;</div><div class='del'>-		r-&gt;idiag_retrans = icsk-&gt;icsk_probes_out;</div><div class='add'>+		r-&gt;idiag_retrans = READ_ONCE(icsk-&gt;icsk_probes_out);</div><div class='ctx'> 		r-&gt;idiag_expires =</div><div class='del'>-			jiffies_to_msecs(sk-&gt;sk_timer.expires - jiffies);</div><div class='del'>-	} else {</div><div class='del'>-		r-&gt;idiag_timer = 0;</div><div class='del'>-		r-&gt;idiag_expires = 0;</div><div class='add'>+			jiffies_delta_to_msecs(icsk-&gt;icsk_keepalive_timer.expires - jiffies);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((ext &amp; (1 &lt;&lt; (INET_DIAG_INFO - 1))) &amp;&amp; handler-&gt;idiag_info_size) {</div><div class='hunk'>@@ -287,15 +342,46 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext &amp; (1 &lt;&lt; (INET_DIAG_CLASS_ID - 1))) {</div><div class='del'>-		u32 classid = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='del'>-		classid = sock_cgroup_classid(&amp;sk-&gt;sk_cgrp_data);</div><div class='del'>-#endif</div><div class='add'>+	/* Keep it at the end for potential retry with a larger skb,</div><div class='add'>+	 * or else do best-effort fitting, which is only done for the</div><div class='add'>+	 * first_nlmsg.</div><div class='add'>+	 */</div><div class='add'>+	if (cb_data-&gt;bpf_stg_diag) {</div><div class='add'>+		bool first_nlmsg = ((unsigned char *)nlh == skb-&gt;data);</div><div class='add'>+		unsigned int prev_min_dump_alloc;</div><div class='add'>+		unsigned int total_nla_size = 0;</div><div class='add'>+		unsigned int msg_len;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		msg_len = skb_tail_pointer(skb) - (unsigned char *)nlh;</div><div class='add'>+		err = bpf_sk_storage_diag_put(cb_data-&gt;bpf_stg_diag, sk, skb,</div><div class='add'>+					      INET_DIAG_SK_BPF_STORAGES,</div><div class='add'>+					      &amp;total_nla_size);</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		total_nla_size += msg_len;</div><div class='add'>+		prev_min_dump_alloc = cb-&gt;min_dump_alloc;</div><div class='add'>+		if (total_nla_size &gt; prev_min_dump_alloc)</div><div class='add'>+			cb-&gt;min_dump_alloc = min_t(u32, total_nla_size,</div><div class='add'>+						   MAX_DUMP_ALLOC_SIZE);</div><div class='add'>+</div><div class='add'>+		if (!first_nlmsg)</div><div class='add'>+			goto errout;</div><div class='ctx'> </div><div class='del'>-		if (nla_put_u32(skb, INET_DIAG_CLASS_ID, classid))</div><div class='add'>+		if (cb-&gt;min_dump_alloc &gt; prev_min_dump_alloc)</div><div class='add'>+			/* Retry with pskb_expand_head() with</div><div class='add'>+			 * __GFP_DIRECT_RECLAIM</div><div class='add'>+			 */</div><div class='ctx'> 			goto errout;</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(total_nla_size &lt;= prev_min_dump_alloc);</div><div class='add'>+</div><div class='add'>+		/* Send what we have for this sk</div><div class='add'>+		 * and move on to the next sk in the following</div><div class='add'>+		 * dump()</div><div class='add'>+		 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -308,214 +394,38 @@ errout:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_sk_diag_fill);</div><div class='ctx'> </div><div class='del'>-static int inet_csk_diag_fill(struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb,</div><div class='del'>-			      const struct inet_diag_req_v2 *req,</div><div class='del'>-			      struct user_namespace *user_ns,</div><div class='del'>-			      u32 portid, u32 seq, u16 nlmsg_flags,</div><div class='del'>-			      const struct nlmsghdr *unlh,</div><div class='del'>-			      bool net_admin)</div><div class='del'>-{</div><div class='del'>-	return inet_sk_diag_fill(sk, inet_csk(sk), skb, req, user_ns,</div><div class='del'>-				 portid, seq, nlmsg_flags, unlh, net_admin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int inet_twsk_diag_fill(struct sock *sk,</div><div class='del'>-			       struct sk_buff *skb,</div><div class='del'>-			       u32 portid, u32 seq, u16 nlmsg_flags,</div><div class='del'>-			       const struct nlmsghdr *unlh)</div><div class='del'>-{</div><div class='del'>-	struct inet_timewait_sock *tw = inet_twsk(sk);</div><div class='del'>-	struct inet_diag_msg *r;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	long tmo;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, unlh-&gt;nlmsg_type, sizeof(*r),</div><div class='del'>-			nlmsg_flags);</div><div class='del'>-	if (!nlh)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	r = nlmsg_data(nlh);</div><div class='del'>-	BUG_ON(tw-&gt;tw_state != TCP_TIME_WAIT);</div><div class='del'>-</div><div class='del'>-	tmo = tw-&gt;tw_timer.expires - jiffies;</div><div class='del'>-	if (tmo &lt; 0)</div><div class='del'>-		tmo = 0;</div><div class='del'>-</div><div class='del'>-	inet_diag_msg_common_fill(r, sk);</div><div class='del'>-	r-&gt;idiag_retrans      = 0;</div><div class='del'>-</div><div class='del'>-	r-&gt;idiag_state	      = tw-&gt;tw_substate;</div><div class='del'>-	r-&gt;idiag_timer	      = 3;</div><div class='del'>-	r-&gt;idiag_expires      = jiffies_to_msecs(tmo);</div><div class='del'>-	r-&gt;idiag_rqueue	      = 0;</div><div class='del'>-	r-&gt;idiag_wqueue	      = 0;</div><div class='del'>-	r-&gt;idiag_uid	      = 0;</div><div class='del'>-	r-&gt;idiag_inode	      = 0;</div><div class='del'>-</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int inet_req_diag_fill(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			      u32 portid, u32 seq, u16 nlmsg_flags,</div><div class='del'>-			      const struct nlmsghdr *unlh, bool net_admin)</div><div class='del'>-{</div><div class='del'>-	struct request_sock *reqsk = inet_reqsk(sk);</div><div class='del'>-	struct inet_diag_msg *r;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='del'>-	long tmo;</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, unlh-&gt;nlmsg_type, sizeof(*r),</div><div class='del'>-			nlmsg_flags);</div><div class='del'>-	if (!nlh)</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	r = nlmsg_data(nlh);</div><div class='del'>-	inet_diag_msg_common_fill(r, sk);</div><div class='del'>-	r-&gt;idiag_state = TCP_SYN_RECV;</div><div class='del'>-	r-&gt;idiag_timer = 1;</div><div class='del'>-	r-&gt;idiag_retrans = reqsk-&gt;num_retrans;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) !=</div><div class='del'>-		     offsetof(struct sock, sk_cookie));</div><div class='del'>-</div><div class='del'>-	tmo = inet_reqsk(sk)-&gt;rsk_timer.expires - jiffies;</div><div class='del'>-	r-&gt;idiag_expires = (tmo &gt;= 0) ? jiffies_to_msecs(tmo) : 0;</div><div class='del'>-	r-&gt;idiag_rqueue	= 0;</div><div class='del'>-	r-&gt;idiag_wqueue	= 0;</div><div class='del'>-	r-&gt;idiag_uid	= 0;</div><div class='del'>-	r-&gt;idiag_inode	= 0;</div><div class='del'>-</div><div class='del'>-	if (net_admin &amp;&amp; nla_put_u32(skb, INET_DIAG_MARK,</div><div class='del'>-				     inet_rsk(reqsk)-&gt;ir_mark))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	nlmsg_end(skb, nlh);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			const struct inet_diag_req_v2 *r,</div><div class='del'>-			struct user_namespace *user_ns,</div><div class='del'>-			u32 portid, u32 seq, u16 nlmsg_flags,</div><div class='del'>-			const struct nlmsghdr *unlh, bool net_admin)</div><div class='del'>-{</div><div class='del'>-	if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='del'>-		return inet_twsk_diag_fill(sk, skb, portid, seq,</div><div class='del'>-					   nlmsg_flags, unlh);</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='del'>-		return inet_req_diag_fill(sk, skb, portid, seq,</div><div class='del'>-					  nlmsg_flags, unlh, net_admin);</div><div class='del'>-</div><div class='del'>-	return inet_csk_diag_fill(sk, skb, r, user_ns, portid, seq,</div><div class='del'>-				  nlmsg_flags, unlh, net_admin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sock *inet_diag_find_one_icsk(struct net *net,</div><div class='del'>-				     struct inet_hashinfo *hashinfo,</div><div class='del'>-				     const struct inet_diag_req_v2 *req)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (req-&gt;sdiag_family == AF_INET)</div><div class='del'>-		sk = inet_lookup(net, hashinfo, NULL, 0, req-&gt;id.idiag_dst[0],</div><div class='del'>-				 req-&gt;id.idiag_dport, req-&gt;id.idiag_src[0],</div><div class='del'>-				 req-&gt;id.idiag_sport, req-&gt;id.idiag_if);</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	else if (req-&gt;sdiag_family == AF_INET6) {</div><div class='del'>-		if (ipv6_addr_v4mapped((struct in6_addr *)req-&gt;id.idiag_dst) &amp;&amp;</div><div class='del'>-		    ipv6_addr_v4mapped((struct in6_addr *)req-&gt;id.idiag_src))</div><div class='del'>-			sk = inet_lookup(net, hashinfo, NULL, 0, req-&gt;id.idiag_dst[3],</div><div class='del'>-					 req-&gt;id.idiag_dport, req-&gt;id.idiag_src[3],</div><div class='del'>-					 req-&gt;id.idiag_sport, req-&gt;id.idiag_if);</div><div class='del'>-		else</div><div class='del'>-			sk = inet6_lookup(net, hashinfo, NULL, 0,</div><div class='del'>-					  (struct in6_addr *)req-&gt;id.idiag_dst,</div><div class='del'>-					  req-&gt;id.idiag_dport,</div><div class='del'>-					  (struct in6_addr *)req-&gt;id.idiag_src,</div><div class='del'>-					  req-&gt;id.idiag_sport,</div><div class='del'>-					  req-&gt;id.idiag_if);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	else {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!sk)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-</div><div class='del'>-	if (sock_diag_check_cookie(sk, req-&gt;id.idiag_cookie)) {</div><div class='del'>-		sock_gen_put(sk);</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sk;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_diag_find_one_icsk);</div><div class='del'>-</div><div class='del'>-int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,</div><div class='del'>-			    struct sk_buff *in_skb,</div><div class='del'>-			    const struct nlmsghdr *nlh,</div><div class='del'>-			    const struct inet_diag_req_v2 *req)</div><div class='del'>-{</div><div class='del'>-	bool net_admin = netlink_net_capable(in_skb, CAP_NET_ADMIN);</div><div class='del'>-	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='del'>-	struct sk_buff *rep;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sk = inet_diag_find_one_icsk(net, hashinfo, req);</div><div class='del'>-	if (IS_ERR(sk))</div><div class='del'>-		return PTR_ERR(sk);</div><div class='del'>-</div><div class='del'>-	rep = nlmsg_new(inet_sk_attr_size(sk, req, net_admin), GFP_KERNEL);</div><div class='del'>-	if (!rep) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = sk_diag_fill(sk, rep, req,</div><div class='del'>-			   sk_user_ns(NETLINK_CB(in_skb).sk),</div><div class='del'>-			   NETLINK_CB(in_skb).portid,</div><div class='del'>-			   nlh-&gt;nlmsg_seq, 0, nlh, net_admin);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		WARN_ON(err == -EMSGSIZE);</div><div class='del'>-		nlmsg_free(rep);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	err = netlink_unicast(net-&gt;diag_nlsk, rep, NETLINK_CB(in_skb).portid,</div><div class='del'>-			      MSG_DONTWAIT);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (sk)</div><div class='del'>-		sock_gen_put(sk);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_diag_dump_one_icsk);</div><div class='del'>-</div><div class='ctx'> static int inet_diag_cmd_exact(int cmd, struct sk_buff *in_skb,</div><div class='ctx'> 			       const struct nlmsghdr *nlh,</div><div class='add'>+			       int hdrlen,</div><div class='ctx'> 			       const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_diag_handler *handler;</div><div class='del'>-	int err;</div><div class='add'>+	struct inet_diag_dump_data dump_data;</div><div class='add'>+	int err, protocol;</div><div class='add'>+</div><div class='add'>+	memset(&amp;dump_data, 0, sizeof(dump_data));</div><div class='add'>+	err = inet_diag_parse_attrs(nlh, hdrlen, dump_data.req_nlas);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	protocol = inet_diag_get_protocol(req, &amp;dump_data);</div><div class='add'>+</div><div class='add'>+	handler = inet_diag_lock_handler(protocol);</div><div class='add'>+	if (!handler)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	handler = inet_diag_lock_handler(req-&gt;sdiag_protocol);</div><div class='del'>-	if (IS_ERR(handler))</div><div class='del'>-		err = PTR_ERR(handler);</div><div class='del'>-	else if (cmd == SOCK_DIAG_BY_FAMILY)</div><div class='del'>-		err = handler-&gt;dump_one(in_skb, nlh, req);</div><div class='del'>-	else if (cmd == SOCK_DESTROY &amp;&amp; handler-&gt;destroy)</div><div class='add'>+	if (cmd == SOCK_DIAG_BY_FAMILY) {</div><div class='add'>+		struct netlink_callback cb = {</div><div class='add'>+			.nlh = nlh,</div><div class='add'>+			.skb = in_skb,</div><div class='add'>+			.data = &amp;dump_data,</div><div class='add'>+		};</div><div class='add'>+		err = handler-&gt;dump_one(&amp;cb, req);</div><div class='add'>+	} else if (cmd == SOCK_DESTROY &amp;&amp; handler-&gt;destroy) {</div><div class='ctx'> 		err = handler-&gt;destroy(in_skb, req);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> 	inet_diag_unlock_handler(handler);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -641,6 +551,16 @@ static int inet_diag_bc_run(const struct nlattr *_bc,</div><div class='ctx'> 				yes = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+		case INET_DIAG_BC_CGROUP_COND: {</div><div class='add'>+			u64 cgroup_id;</div><div class='add'>+</div><div class='add'>+			cgroup_id = get_unaligned((const u64 *)(op + 1));</div><div class='add'>+			if (cgroup_id != entry-&gt;cgroup_id)</div><div class='add'>+				yes = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (yes) {</div><div class='hunk'>@@ -660,7 +580,7 @@ static void entry_fill_addrs(struct inet_diag_entry *entry,</div><div class='ctx'> 			     const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+	if (entry-&gt;family == AF_INET6) {</div><div class='ctx'> 		entry-&gt;saddr = sk-&gt;sk_v6_rcv_saddr.s6_addr32;</div><div class='ctx'> 		entry-&gt;daddr = sk-&gt;sk_v6_daddr.s6_addr32;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -671,26 +591,37 @@ static void entry_fill_addrs(struct inet_diag_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk)</div><div class='add'>+int inet_diag_bc_sk(const struct inet_diag_dump_data *cb_data, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct nlattr *bc = cb_data-&gt;inet_diag_nla_bc;</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct inet_diag_entry entry;</div><div class='ctx'> </div><div class='ctx'> 	if (!bc)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	entry.family = sk-&gt;sk_family;</div><div class='add'>+	entry.family = READ_ONCE(sk-&gt;sk_family);</div><div class='ctx'> 	entry_fill_addrs(&amp;entry, sk);</div><div class='del'>-	entry.sport = inet-&gt;inet_num;</div><div class='del'>-	entry.dport = ntohs(inet-&gt;inet_dport);</div><div class='del'>-	entry.ifindex = sk-&gt;sk_bound_dev_if;</div><div class='del'>-	entry.userlocks = sk_fullsock(sk) ? sk-&gt;sk_userlocks : 0;</div><div class='del'>-	if (sk_fullsock(sk))</div><div class='del'>-		entry.mark = sk-&gt;sk_mark;</div><div class='del'>-	else if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='del'>-		entry.mark = inet_rsk(inet_reqsk(sk))-&gt;ir_mark;</div><div class='del'>-	else</div><div class='del'>-		entry.mark = 0;</div><div class='add'>+	entry.sport = READ_ONCE(inet-&gt;inet_num);</div><div class='add'>+	entry.dport = ntohs(READ_ONCE(inet-&gt;inet_dport));</div><div class='add'>+	entry.ifindex = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+	if (cb_data-&gt;userlocks_needed)</div><div class='add'>+		entry.userlocks = sk_fullsock(sk) ? READ_ONCE(sk-&gt;sk_userlocks) : 0;</div><div class='add'>+	if (cb_data-&gt;mark_needed) {</div><div class='add'>+		if (sk_fullsock(sk))</div><div class='add'>+			entry.mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+		else if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='add'>+			entry.mark = inet_rsk(inet_reqsk(sk))-&gt;ir_mark;</div><div class='add'>+		else if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+			entry.mark = inet_twsk(sk)-&gt;tw_mark;</div><div class='add'>+		else</div><div class='add'>+			entry.mark = 0;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+	if (cb_data-&gt;cgroup_needed)</div><div class='add'>+		entry.cgroup_id = sk_fullsock(sk) ?</div><div class='add'>+			cgroup_id(sock_cgroup_ptr(&amp;sk-&gt;sk_cgrp_data)) : 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return inet_diag_bc_run(bc, &amp;entry);</div><div class='ctx'> }</div><div class='hunk'>@@ -780,16 +711,30 @@ static bool valid_markcond(const struct inet_diag_bc_op *op, int len,</div><div class='ctx'> 	return len &gt;= *min_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_diag_bc_audit(const struct nlattr *attr,</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+static bool valid_cgroupcond(const struct inet_diag_bc_op *op, int len,</div><div class='add'>+			     int *min_len)</div><div class='add'>+{</div><div class='add'>+	*min_len += sizeof(u64);</div><div class='add'>+	return len &gt;= *min_len;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int inet_diag_bc_audit(struct inet_diag_dump_data *cb_data,</div><div class='ctx'> 			      const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	bool net_admin = netlink_net_capable(skb, CAP_NET_ADMIN);</div><div class='add'>+	const struct nlattr *attr = cb_data-&gt;inet_diag_nla_bc;</div><div class='ctx'> 	const void *bytecode, *bc;</div><div class='ctx'> 	int bytecode_len, len;</div><div class='add'>+	bool net_admin;</div><div class='ctx'> </div><div class='del'>-	if (!attr || nla_len(attr) &lt; sizeof(struct inet_diag_bc_op))</div><div class='add'>+	if (!attr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (nla_len(attr) &lt; sizeof(struct inet_diag_bc_op))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	net_admin = netlink_net_capable(skb, CAP_NET_ADMIN);</div><div class='ctx'> 	bytecode = bc = nla_data(attr);</div><div class='ctx'> 	len = bytecode_len = nla_len(attr);</div><div class='ctx'> </div><div class='hunk'>@@ -821,8 +766,18 @@ static int inet_diag_bc_audit(const struct nlattr *attr,</div><div class='ctx'> 				return -EPERM;</div><div class='ctx'> 			if (!valid_markcond(bc, len, &amp;min_len))</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+			cb_data-&gt;mark_needed = true;</div><div class='add'>+			break;</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+		case INET_DIAG_BC_CGROUP_COND:</div><div class='add'>+			if (!valid_cgroupcond(bc, len, &amp;min_len))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			cb_data-&gt;cgroup_needed = true;</div><div class='ctx'> 			break;</div><div class='add'>+#endif</div><div class='ctx'> 		case INET_DIAG_BC_AUTO:</div><div class='add'>+			cb_data-&gt;userlocks_needed = true;</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case INET_DIAG_BC_JMP:</div><div class='ctx'> 		case INET_DIAG_BC_NOP:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -846,223 +801,99 @@ static int inet_diag_bc_audit(const struct nlattr *attr,</div><div class='ctx'> 	return len == 0 ? 0 : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_csk_diag_dump(struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb,</div><div class='del'>-			      struct netlink_callback *cb,</div><div class='del'>-			      const struct inet_diag_req_v2 *r,</div><div class='del'>-			      const struct nlattr *bc,</div><div class='del'>-			      bool net_admin)</div><div class='del'>-{</div><div class='del'>-	if (!inet_diag_bc_sk(bc, sk))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return inet_csk_diag_fill(sk, skb, r,</div><div class='del'>-				  sk_user_ns(NETLINK_CB(cb-&gt;skb).sk),</div><div class='del'>-				  NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				  cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI, cb-&gt;nlh,</div><div class='del'>-				  net_admin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void twsk_build_assert(void)</div><div class='add'>+static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+			    const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_family) !=</div><div class='del'>-		     offsetof(struct sock, sk_family));</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_num) !=</div><div class='del'>-		     offsetof(struct inet_sock, inet_num));</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_dport) !=</div><div class='del'>-		     offsetof(struct inet_sock, inet_dport));</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_rcv_saddr) !=</div><div class='del'>-		     offsetof(struct inet_sock, inet_rcv_saddr));</div><div class='add'>+	struct inet_diag_dump_data *cb_data = cb-&gt;data;</div><div class='add'>+	const struct inet_diag_handler *handler;</div><div class='add'>+	u32 prev_min_dump_alloc;</div><div class='add'>+	int protocol, err = 0;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_daddr) !=</div><div class='del'>-		     offsetof(struct inet_sock, inet_daddr));</div><div class='add'>+	protocol = inet_diag_get_protocol(r, cb_data);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_v6_rcv_saddr) !=</div><div class='del'>-		     offsetof(struct sock, sk_v6_rcv_saddr));</div><div class='add'>+again:</div><div class='add'>+	prev_min_dump_alloc = cb-&gt;min_dump_alloc;</div><div class='add'>+	handler = inet_diag_lock_handler(protocol);</div><div class='add'>+	if (handler) {</div><div class='add'>+		handler-&gt;dump(skb, cb, r);</div><div class='add'>+		inet_diag_unlock_handler(handler);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	/* The skb is not large enough to fit one sk info and</div><div class='add'>+	 * inet_sk_diag_fill() has requested for a larger skb.</div><div class='add'>+	 */</div><div class='add'>+	if (!skb-&gt;len &amp;&amp; cb-&gt;min_dump_alloc &gt; prev_min_dump_alloc) {</div><div class='add'>+		err = pskb_expand_head(skb, 0, cb-&gt;min_dump_alloc, GFP_KERNEL);</div><div class='add'>+		if (!err)</div><div class='add'>+			goto again;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_v6_daddr) !=</div><div class='del'>-		     offsetof(struct sock, sk_v6_daddr));</div><div class='del'>-#endif</div><div class='add'>+	return err ? : skb-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,</div><div class='del'>-			 struct netlink_callback *cb,</div><div class='del'>-			 const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='add'>+static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	bool net_admin = netlink_net_capable(cb-&gt;skb, CAP_NET_ADMIN);</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	u32 idiag_states = r-&gt;idiag_states;</div><div class='del'>-	int i, num, s_i, s_num;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	if (idiag_states &amp; TCPF_SYN_RECV)</div><div class='del'>-		idiag_states |= TCPF_NEW_SYN_RECV;</div><div class='del'>-	s_i = cb-&gt;args[1];</div><div class='del'>-	s_num = num = cb-&gt;args[2];</div><div class='del'>-</div><div class='del'>-	if (cb-&gt;args[0] == 0) {</div><div class='del'>-		if (!(idiag_states &amp; TCPF_LISTEN) || r-&gt;id.idiag_dport)</div><div class='del'>-			goto skip_listen_ht;</div><div class='del'>-</div><div class='del'>-		for (i = s_i; i &lt; INET_LHTABLE_SIZE; i++) {</div><div class='del'>-			struct inet_listen_hashbucket *ilb;</div><div class='del'>-</div><div class='del'>-			num = 0;</div><div class='del'>-			ilb = &amp;hashinfo-&gt;listening_hash[i];</div><div class='del'>-			spin_lock(&amp;ilb-&gt;lock);</div><div class='del'>-			sk_for_each(sk, &amp;ilb-&gt;head) {</div><div class='del'>-				struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-</div><div class='del'>-				if (!net_eq(sock_net(sk), net))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				if (num &lt; s_num) {</div><div class='del'>-					num++;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (r-&gt;sdiag_family != AF_UNSPEC &amp;&amp;</div><div class='del'>-				    sk-&gt;sk_family != r-&gt;sdiag_family)</div><div class='del'>-					goto next_listen;</div><div class='del'>-</div><div class='del'>-				if (r-&gt;id.idiag_sport != inet-&gt;inet_sport &amp;&amp;</div><div class='del'>-				    r-&gt;id.idiag_sport)</div><div class='del'>-					goto next_listen;</div><div class='add'>+	return __inet_diag_dump(skb, cb, nlmsg_data(cb-&gt;nlh));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				if (inet_csk_diag_dump(sk, skb, cb, r,</div><div class='del'>-						       bc, net_admin) &lt; 0) {</div><div class='del'>-					spin_unlock(&amp;ilb-&gt;lock);</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='add'>+static int __inet_diag_dump_start(struct netlink_callback *cb, int hdrlen)</div><div class='add'>+{</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct inet_diag_dump_data *cb_data;</div><div class='add'>+	struct sk_buff *skb = cb-&gt;skb;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-next_listen:</div><div class='del'>-				++num;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock(&amp;ilb-&gt;lock);</div><div class='add'>+	cb_data = kzalloc(sizeof(*cb_data), GFP_KERNEL);</div><div class='add'>+	if (!cb_data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-			s_num = 0;</div><div class='del'>-		}</div><div class='del'>-skip_listen_ht:</div><div class='del'>-		cb-&gt;args[0] = 1;</div><div class='del'>-		s_i = num = s_num = 0;</div><div class='add'>+	err = inet_diag_parse_attrs(nlh, hdrlen, cb_data-&gt;req_nlas);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(cb_data);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = inet_diag_bc_audit(cb_data, skb);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(cb_data);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(idiag_states &amp; ~TCPF_LISTEN))</div><div class='del'>-		goto out;</div><div class='add'>+	nla = cb_data-&gt;inet_diag_nla_bpf_stgs;</div><div class='add'>+	if (nla) {</div><div class='add'>+		struct bpf_sk_storage_diag *bpf_stg_diag;</div><div class='ctx'> </div><div class='del'>-#define SKARR_SZ 16</div><div class='del'>-	for (i = s_i; i &lt;= hashinfo-&gt;ehash_mask; i++) {</div><div class='del'>-		struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[i];</div><div class='del'>-		spinlock_t *lock = inet_ehash_lockp(hashinfo, i);</div><div class='del'>-		struct hlist_nulls_node *node;</div><div class='del'>-		struct sock *sk_arr[SKARR_SZ];</div><div class='del'>-		int num_arr[SKARR_SZ];</div><div class='del'>-		int idx, accum, res;</div><div class='del'>-</div><div class='del'>-		if (hlist_nulls_empty(&amp;head-&gt;chain))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (i &gt; s_i)</div><div class='del'>-			s_num = 0;</div><div class='del'>-</div><div class='del'>-next_chunk:</div><div class='del'>-		num = 0;</div><div class='del'>-		accum = 0;</div><div class='del'>-		spin_lock_bh(lock);</div><div class='del'>-		sk_nulls_for_each(sk, node, &amp;head-&gt;chain) {</div><div class='del'>-			int state;</div><div class='del'>-</div><div class='del'>-			if (!net_eq(sock_net(sk), net))</div><div class='del'>-				continue;</div><div class='del'>-			if (num &lt; s_num)</div><div class='del'>-				goto next_normal;</div><div class='del'>-			state = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='del'>-				inet_twsk(sk)-&gt;tw_substate : sk-&gt;sk_state;</div><div class='del'>-			if (!(idiag_states &amp; (1 &lt;&lt; state)))</div><div class='del'>-				goto next_normal;</div><div class='del'>-			if (r-&gt;sdiag_family != AF_UNSPEC &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_family != r-&gt;sdiag_family)</div><div class='del'>-				goto next_normal;</div><div class='del'>-			if (r-&gt;id.idiag_sport != htons(sk-&gt;sk_num) &amp;&amp;</div><div class='del'>-			    r-&gt;id.idiag_sport)</div><div class='del'>-				goto next_normal;</div><div class='del'>-			if (r-&gt;id.idiag_dport != sk-&gt;sk_dport &amp;&amp;</div><div class='del'>-			    r-&gt;id.idiag_dport)</div><div class='del'>-				goto next_normal;</div><div class='del'>-			twsk_build_assert();</div><div class='del'>-</div><div class='del'>-			if (!inet_diag_bc_sk(bc, sk))</div><div class='del'>-				goto next_normal;</div><div class='del'>-</div><div class='del'>-			sock_hold(sk);</div><div class='del'>-			num_arr[accum] = num;</div><div class='del'>-			sk_arr[accum] = sk;</div><div class='del'>-			if (++accum == SKARR_SZ)</div><div class='del'>-				break;</div><div class='del'>-next_normal:</div><div class='del'>-			++num;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(lock);</div><div class='del'>-		res = 0;</div><div class='del'>-		for (idx = 0; idx &lt; accum; idx++) {</div><div class='del'>-			if (res &gt;= 0) {</div><div class='del'>-				res = sk_diag_fill(sk_arr[idx], skb, r,</div><div class='del'>-					   sk_user_ns(NETLINK_CB(cb-&gt;skb).sk),</div><div class='del'>-					   NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					   cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='del'>-					   cb-&gt;nlh, net_admin);</div><div class='del'>-				if (res &lt; 0)</div><div class='del'>-					num = num_arr[idx];</div><div class='del'>-			}</div><div class='del'>-			sock_gen_put(sk_arr[idx]);</div><div class='del'>-		}</div><div class='del'>-		if (res &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		cond_resched();</div><div class='del'>-		if (accum == SKARR_SZ) {</div><div class='del'>-			s_num = num + 1;</div><div class='del'>-			goto next_chunk;</div><div class='add'>+		bpf_stg_diag = bpf_sk_storage_diag_alloc(nla);</div><div class='add'>+		if (IS_ERR(bpf_stg_diag)) {</div><div class='add'>+			kfree(cb_data);</div><div class='add'>+			return PTR_ERR(bpf_stg_diag);</div><div class='ctx'> 		}</div><div class='add'>+		cb_data-&gt;bpf_stg_diag = bpf_stg_diag;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	cb-&gt;args[1] = i;</div><div class='del'>-	cb-&gt;args[2] = num;</div><div class='del'>-out:</div><div class='del'>-	;</div><div class='add'>+	cb-&gt;data = cb_data;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_diag_dump_icsk);</div><div class='ctx'> </div><div class='del'>-static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			    const struct inet_diag_req_v2 *r,</div><div class='del'>-			    struct nlattr *bc)</div><div class='add'>+static int inet_diag_dump_start(struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	const struct inet_diag_handler *handler;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	handler = inet_diag_lock_handler(r-&gt;sdiag_protocol);</div><div class='del'>-	if (!IS_ERR(handler))</div><div class='del'>-		handler-&gt;dump(skb, cb, r, bc);</div><div class='del'>-	else</div><div class='del'>-		err = PTR_ERR(handler);</div><div class='del'>-	inet_diag_unlock_handler(handler);</div><div class='add'>+	return __inet_diag_dump_start(cb, sizeof(struct inet_diag_req_v2));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return err ? : skb-&gt;len;</div><div class='add'>+static int inet_diag_dump_start_compat(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	return __inet_diag_dump_start(cb, sizeof(struct inet_diag_req));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+static int inet_diag_dump_done(struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	int hdrlen = sizeof(struct inet_diag_req_v2);</div><div class='del'>-	struct nlattr *bc = NULL;</div><div class='add'>+	struct inet_diag_dump_data *cb_data = cb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_attrlen(cb-&gt;nlh, hdrlen))</div><div class='del'>-		bc = nlmsg_find_attr(cb-&gt;nlh, hdrlen, INET_DIAG_REQ_BYTECODE);</div><div class='add'>+	bpf_sk_storage_diag_free(cb_data-&gt;bpf_stg_diag);</div><div class='add'>+	kfree(cb-&gt;data);</div><div class='ctx'> </div><div class='del'>-	return __inet_diag_dump(skb, cb, nlmsg_data(cb-&gt;nlh), bc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_diag_type2proto(int type)</div><div class='hunk'>@@ -1070,8 +901,6 @@ static int inet_diag_type2proto(int type)</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case TCPDIAG_GETSOCK:</div><div class='ctx'> 		return IPPROTO_TCP;</div><div class='del'>-	case DCCPDIAG_GETSOCK:</div><div class='del'>-		return IPPROTO_DCCP;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1081,20 +910,16 @@ static int inet_diag_dump_compat(struct sk_buff *skb,</div><div class='ctx'> 				 struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_diag_req *rc = nlmsg_data(cb-&gt;nlh);</div><div class='del'>-	int hdrlen = sizeof(struct inet_diag_req);</div><div class='ctx'> 	struct inet_diag_req_v2 req;</div><div class='del'>-	struct nlattr *bc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	req.sdiag_family = AF_UNSPEC; /* compatibility */</div><div class='ctx'> 	req.sdiag_protocol = inet_diag_type2proto(cb-&gt;nlh-&gt;nlmsg_type);</div><div class='ctx'> 	req.idiag_ext = rc-&gt;idiag_ext;</div><div class='add'>+	req.pad = 0;</div><div class='ctx'> 	req.idiag_states = rc-&gt;idiag_states;</div><div class='ctx'> 	req.id = rc-&gt;id;</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_attrlen(cb-&gt;nlh, hdrlen))</div><div class='del'>-		bc = nlmsg_find_attr(cb-&gt;nlh, hdrlen, INET_DIAG_REQ_BYTECODE);</div><div class='del'>-</div><div class='del'>-	return __inet_diag_dump(skb, cb, &amp;req, bc);</div><div class='add'>+	return __inet_diag_dump(skb, cb, &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_diag_get_exact_compat(struct sk_buff *in_skb,</div><div class='hunk'>@@ -1106,10 +931,12 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb,</div><div class='ctx'> 	req.sdiag_family = rc-&gt;idiag_family;</div><div class='ctx'> 	req.sdiag_protocol = inet_diag_type2proto(nlh-&gt;nlmsg_type);</div><div class='ctx'> 	req.idiag_ext = rc-&gt;idiag_ext;</div><div class='add'>+	req.pad = 0;</div><div class='ctx'> 	req.idiag_states = rc-&gt;idiag_states;</div><div class='ctx'> 	req.id = rc-&gt;id;</div><div class='ctx'> </div><div class='del'>-	return inet_diag_cmd_exact(SOCK_DIAG_BY_FAMILY, in_skb, nlh, &amp;req);</div><div class='add'>+	return inet_diag_cmd_exact(SOCK_DIAG_BY_FAMILY, in_skb, nlh,</div><div class='add'>+				   sizeof(struct inet_diag_req), &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='hunk'>@@ -1122,22 +949,12 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (nlh-&gt;nlmsg_flags &amp; NLM_F_DUMP) {</div><div class='del'>-		if (nlmsg_attrlen(nlh, hdrlen)) {</div><div class='del'>-			struct nlattr *attr;</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			attr = nlmsg_find_attr(nlh, hdrlen,</div><div class='del'>-					       INET_DIAG_REQ_BYTECODE);</div><div class='del'>-			err = inet_diag_bc_audit(attr, skb);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		{</div><div class='del'>-			struct netlink_dump_control c = {</div><div class='del'>-				.dump = inet_diag_dump_compat,</div><div class='del'>-			};</div><div class='del'>-			return netlink_dump_start(net-&gt;diag_nlsk, skb, nlh, &amp;c);</div><div class='del'>-		}</div><div class='add'>+		struct netlink_dump_control c = {</div><div class='add'>+			.start = inet_diag_dump_start_compat,</div><div class='add'>+			.done = inet_diag_dump_done,</div><div class='add'>+			.dump = inet_diag_dump_compat,</div><div class='add'>+		};</div><div class='add'>+		return netlink_dump_start(net-&gt;diag_nlsk, skb, nlh, &amp;c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return inet_diag_get_exact_compat(skb, nlh);</div><div class='hunk'>@@ -1153,25 +970,16 @@ static int inet_diag_handler_cmd(struct sk_buff *skb, struct nlmsghdr *h)</div><div class='ctx'> </div><div class='ctx'> 	if (h-&gt;nlmsg_type == SOCK_DIAG_BY_FAMILY &amp;&amp;</div><div class='ctx'> 	    h-&gt;nlmsg_flags &amp; NLM_F_DUMP) {</div><div class='del'>-		if (nlmsg_attrlen(h, hdrlen)) {</div><div class='del'>-			struct nlattr *attr;</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			attr = nlmsg_find_attr(h, hdrlen,</div><div class='del'>-					       INET_DIAG_REQ_BYTECODE);</div><div class='del'>-			err = inet_diag_bc_audit(attr, skb);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		{</div><div class='del'>-			struct netlink_dump_control c = {</div><div class='del'>-				.dump = inet_diag_dump,</div><div class='del'>-			};</div><div class='del'>-			return netlink_dump_start(net-&gt;diag_nlsk, skb, h, &amp;c);</div><div class='del'>-		}</div><div class='add'>+		struct netlink_dump_control c = {</div><div class='add'>+			.start = inet_diag_dump_start,</div><div class='add'>+			.done = inet_diag_dump_done,</div><div class='add'>+			.dump = inet_diag_dump,</div><div class='add'>+		};</div><div class='add'>+		return netlink_dump_start(net-&gt;diag_nlsk, skb, h, &amp;c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return inet_diag_cmd_exact(h-&gt;nlmsg_type, skb, h, nlmsg_data(h));</div><div class='add'>+	return inet_diag_cmd_exact(h-&gt;nlmsg_type, skb, h, hdrlen,</div><div class='add'>+				   nlmsg_data(h));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='hunk'>@@ -1201,10 +1009,9 @@ int inet_diag_handler_get_info(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	handler = inet_diag_lock_handler(sk-&gt;sk_protocol);</div><div class='del'>-	if (IS_ERR(handler)) {</div><div class='del'>-		inet_diag_unlock_handler(handler);</div><div class='add'>+	if (!handler) {</div><div class='ctx'> 		nlmsg_cancel(skb, nlh);</div><div class='del'>-		return PTR_ERR(handler);</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr = handler-&gt;idiag_info_size</div><div class='hunk'>@@ -1223,6 +1030,7 @@ int inet_diag_handler_get_info(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct sock_diag_handler inet_diag_handler = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='ctx'> 	.family = AF_INET,</div><div class='ctx'> 	.dump = inet_diag_handler_cmd,</div><div class='ctx'> 	.get_info = inet_diag_handler_get_info,</div><div class='hunk'>@@ -1230,6 +1038,7 @@ static const struct sock_diag_handler inet_diag_handler = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sock_diag_handler inet6_diag_handler = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='ctx'> 	.family = AF_INET6,</div><div class='ctx'> 	.dump = inet_diag_handler_cmd,</div><div class='ctx'> 	.get_info = inet_diag_handler_get_info,</div><div class='hunk'>@@ -1239,20 +1048,12 @@ static const struct sock_diag_handler inet6_diag_handler = {</div><div class='ctx'> int inet_diag_register(const struct inet_diag_handler *h)</div><div class='ctx'> {</div><div class='ctx'> 	const __u16 type = h-&gt;idiag_type;</div><div class='del'>-	int err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (type &gt;= IPPROTO_MAX)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;inet_diag_table_mutex);</div><div class='del'>-	err = -EEXIST;</div><div class='del'>-	if (!inet_diag_table[type]) {</div><div class='del'>-		inet_diag_table[type] = h;</div><div class='del'>-		err = 0;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;inet_diag_table_mutex);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return !cmpxchg((const struct inet_diag_handler **)&amp;inet_diag_table[type],</div><div class='add'>+			NULL, h) ? 0 : -EEXIST;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_diag_register);</div><div class='ctx'> </div><div class='hunk'>@@ -1263,12 +1064,16 @@ void inet_diag_unregister(const struct inet_diag_handler *h)</div><div class='ctx'> 	if (type &gt;= IPPROTO_MAX)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;inet_diag_table_mutex);</div><div class='del'>-	inet_diag_table[type] = NULL;</div><div class='del'>-	mutex_unlock(&amp;inet_diag_table_mutex);</div><div class='add'>+	xchg((const struct inet_diag_handler **)&amp;inet_diag_table[type],</div><div class='add'>+	     NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_diag_unregister);</div><div class='ctx'> </div><div class='add'>+static const struct sock_diag_inet_compat inet_diag_compat = {</div><div class='add'>+	.owner	= THIS_MODULE,</div><div class='add'>+	.fn	= inet_diag_rcv_msg_compat,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init inet_diag_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	const int inet_diag_table_size = (IPPROTO_MAX *</div><div class='hunk'>@@ -1287,7 +1092,7 @@ static int __init inet_diag_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free_inet;</div><div class='ctx'> </div><div class='del'>-	sock_diag_register_inet_compat(inet_diag_rcv_msg_compat);</div><div class='add'>+	sock_diag_register_inet_compat(&amp;inet_diag_compat);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1302,12 +1107,13 @@ static void __exit inet_diag_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	sock_diag_unregister(&amp;inet6_diag_handler);</div><div class='ctx'> 	sock_diag_unregister(&amp;inet_diag_handler);</div><div class='del'>-	sock_diag_unregister_inet_compat(inet_diag_rcv_msg_compat);</div><div class='add'>+	sock_diag_unregister_inet_compat(&amp;inet_diag_compat);</div><div class='ctx'> 	kfree(inet_diag_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(inet_diag_init);</div><div class='ctx'> module_exit(inet_diag_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("INET/INET6: socket monitoring via SOCK_DIAG");</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2 /* AF_INET */);</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10 /* AF_INET6 */);</div><div class='head'>diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c<br/>index bcb11f3a27c0..025895eb6ec5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_fragment.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_fragment.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_fragment.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inet_fragment.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * inet fragments management</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * 		Authors:	Pavel Emelyanov &lt;xemul@openvz.org&gt;</div><div class='ctx'>  *				Started as consolidation of ipv4/ip_fragment.c,</div><div class='ctx'>  *				ipv6/reassembly. and ipv6 nf conntrack reassembly</div><div class='hunk'>@@ -25,6 +21,65 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/inet_frag.h&gt;</div><div class='ctx'> #include &lt;net/inet_ecn.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../core/sock_destructor.h"</div><div class='add'>+</div><div class='add'>+/* Use skb-&gt;cb to track consecutive/adjacent fragments coming at</div><div class='add'>+ * the end of the queue. Nodes in the rb-tree queue will</div><div class='add'>+ * contain "runs" of one or more adjacent fragments.</div><div class='add'>+ *</div><div class='add'>+ * Invariants:</div><div class='add'>+ * - next_frag is NULL at the tail of a "run";</div><div class='add'>+ * - the head of a "run" has the sum of all fragment lengths in frag_run_len.</div><div class='add'>+ */</div><div class='add'>+struct ipfrag_skb_cb {</div><div class='add'>+	union {</div><div class='add'>+		struct inet_skb_parm	h4;</div><div class='add'>+		struct inet6_skb_parm	h6;</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff		*next_frag;</div><div class='add'>+	int			frag_run_len;</div><div class='add'>+	int			ip_defrag_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FRAG_CB(skb)		((struct ipfrag_skb_cb *)((skb)-&gt;cb))</div><div class='add'>+</div><div class='add'>+static void fragcb_clear(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	RB_CLEAR_NODE(&amp;skb-&gt;rbnode);</div><div class='add'>+	FRAG_CB(skb)-&gt;next_frag = NULL;</div><div class='add'>+	FRAG_CB(skb)-&gt;frag_run_len = skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Append skb to the last "run". */</div><div class='add'>+static void fragrun_append_to_last(struct inet_frag_queue *q,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	fragcb_clear(skb);</div><div class='add'>+</div><div class='add'>+	FRAG_CB(q-&gt;last_run_head)-&gt;frag_run_len += skb-&gt;len;</div><div class='add'>+	FRAG_CB(q-&gt;fragments_tail)-&gt;next_frag = skb;</div><div class='add'>+	q-&gt;fragments_tail = skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Create a new "run" with the skb. */</div><div class='add'>+static void fragrun_create(struct inet_frag_queue *q, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ipfrag_skb_cb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+	fragcb_clear(skb);</div><div class='add'>+</div><div class='add'>+	if (q-&gt;last_run_head)</div><div class='add'>+		rb_link_node(&amp;skb-&gt;rbnode, &amp;q-&gt;last_run_head-&gt;rbnode,</div><div class='add'>+			     &amp;q-&gt;last_run_head-&gt;rbnode.rb_right);</div><div class='add'>+	else</div><div class='add'>+		rb_link_node(&amp;skb-&gt;rbnode, NULL, &amp;q-&gt;rb_fragments.rb_node);</div><div class='add'>+	rb_insert_color(&amp;skb-&gt;rbnode, &amp;q-&gt;rb_fragments);</div><div class='add'>+</div><div class='add'>+	q-&gt;fragments_tail = skb;</div><div class='add'>+	q-&gt;last_run_head = skb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Given the OR values of all fragments, apply RFC 3168 5.3 requirements</div><div class='ctx'>  * Value : 0xff if frame should be dropped.</div><div class='hunk'>@@ -54,60 +109,145 @@ int inet_frags_init(struct inet_frags *f)</div><div class='ctx'> 	if (!f-&gt;frags_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	refcount_set(&amp;f-&gt;refcnt, 1);</div><div class='add'>+	init_completion(&amp;f-&gt;completion);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_frags_init);</div><div class='ctx'> </div><div class='ctx'> void inet_frags_fini(struct inet_frags *f)</div><div class='ctx'> {</div><div class='del'>-	/* We must wait that all inet_frag_destroy_rcu() have completed. */</div><div class='del'>-	rcu_barrier();</div><div class='add'>+	if (refcount_dec_and_test(&amp;f-&gt;refcnt))</div><div class='add'>+		complete(&amp;f-&gt;completion);</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;f-&gt;completion);</div><div class='ctx'> </div><div class='ctx'> 	kmem_cache_destroy(f-&gt;frags_cachep);</div><div class='ctx'> 	f-&gt;frags_cachep = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_frags_fini);</div><div class='ctx'> </div><div class='add'>+/* called from rhashtable_free_and_destroy() at netns_frags dismantle */</div><div class='ctx'> static void inet_frags_free_cb(void *ptr, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_frag_queue *fq = ptr;</div><div class='add'>+	int count;</div><div class='ctx'> </div><div class='del'>-	/* If we can not cancel the timer, it means this frag_queue</div><div class='del'>-	 * is already disappearing, we have nothing to do.</div><div class='del'>-	 * Otherwise, we own a refcount until the end of this function.</div><div class='del'>-	 */</div><div class='del'>-	if (!del_timer(&amp;fq-&gt;timer))</div><div class='del'>-		return;</div><div class='add'>+	count = timer_delete_sync(&amp;fq-&gt;timer) ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;fq-&gt;lock);</div><div class='add'>+	fq-&gt;flags |= INET_FRAG_DROP;</div><div class='ctx'> 	if (!(fq-&gt;flags &amp; INET_FRAG_COMPLETE)) {</div><div class='ctx'> 		fq-&gt;flags |= INET_FRAG_COMPLETE;</div><div class='del'>-		refcount_dec(&amp;fq-&gt;refcnt);</div><div class='add'>+		count++;</div><div class='add'>+	} else if (fq-&gt;flags &amp; INET_FRAG_HASH_DEAD) {</div><div class='add'>+		count++;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;fq-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	inet_frag_put(fq);</div><div class='add'>+	inet_frag_putn(fq, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void inet_frags_exit_net(struct netns_frags *nf)</div><div class='add'>+static LLIST_HEAD(fqdir_free_list);</div><div class='add'>+</div><div class='add'>+static void fqdir_free_fn(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	nf-&gt;high_thresh = 0; /* prevent creation of new frags */</div><div class='add'>+	struct llist_node *kill_list;</div><div class='add'>+	struct fqdir *fqdir, *tmp;</div><div class='add'>+	struct inet_frags *f;</div><div class='add'>+</div><div class='add'>+	/* Atomically snapshot the list of fqdirs to free */</div><div class='add'>+	kill_list = llist_del_all(&amp;fqdir_free_list);</div><div class='ctx'> </div><div class='del'>-	rhashtable_free_and_destroy(&amp;nf-&gt;rhashtable, inet_frags_free_cb, NULL);</div><div class='add'>+	/* We need to make sure all ongoing call_rcu(..., inet_frag_destroy_rcu)</div><div class='add'>+	 * have completed, since they need to dereference fqdir.</div><div class='add'>+	 * Would it not be nice to have kfree_rcu_barrier() ? :)</div><div class='add'>+	 */</div><div class='add'>+	rcu_barrier();</div><div class='add'>+</div><div class='add'>+	llist_for_each_entry_safe(fqdir, tmp, kill_list, free_list) {</div><div class='add'>+		f = fqdir-&gt;f;</div><div class='add'>+		if (refcount_dec_and_test(&amp;f-&gt;refcnt))</div><div class='add'>+			complete(&amp;f-&gt;completion);</div><div class='add'>+</div><div class='add'>+		kfree(fqdir);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_frags_exit_net);</div><div class='ctx'> </div><div class='del'>-void inet_frag_kill(struct inet_frag_queue *fq)</div><div class='add'>+static DECLARE_DELAYED_WORK(fqdir_free_work, fqdir_free_fn);</div><div class='add'>+</div><div class='add'>+static void fqdir_work_fn(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer(&amp;fq-&gt;timer))</div><div class='del'>-		refcount_dec(&amp;fq-&gt;refcnt);</div><div class='add'>+	struct fqdir *fqdir = container_of(work, struct fqdir, destroy_work);</div><div class='add'>+</div><div class='add'>+	rhashtable_free_and_destroy(&amp;fqdir-&gt;rhashtable, inet_frags_free_cb, NULL);</div><div class='add'>+</div><div class='add'>+	if (llist_add(&amp;fqdir-&gt;free_list, &amp;fqdir_free_list))</div><div class='add'>+		queue_delayed_work(system_percpu_wq, &amp;fqdir_free_work, HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct fqdir *fqdir = kzalloc(sizeof(*fqdir), GFP_KERNEL);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (!fqdir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	fqdir-&gt;f = f;</div><div class='add'>+	fqdir-&gt;net = net;</div><div class='add'>+	res = rhashtable_init(&amp;fqdir-&gt;rhashtable, &amp;fqdir-&gt;f-&gt;rhash_params);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		kfree(fqdir);</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+	refcount_inc(&amp;f-&gt;refcnt);</div><div class='add'>+	*fqdirp = fqdir;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fqdir_init);</div><div class='add'>+</div><div class='add'>+static struct workqueue_struct *inet_frag_wq;</div><div class='add'>+</div><div class='add'>+static int __init inet_frag_wq_init(void)</div><div class='add'>+{</div><div class='add'>+	inet_frag_wq = create_workqueue("inet_frag_wq");</div><div class='add'>+	if (!inet_frag_wq)</div><div class='add'>+		panic("Could not create inet frag workq");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+pure_initcall(inet_frag_wq_init);</div><div class='add'>+</div><div class='add'>+void fqdir_exit(struct fqdir *fqdir)</div><div class='add'>+{</div><div class='add'>+	INIT_WORK(&amp;fqdir-&gt;destroy_work, fqdir_work_fn);</div><div class='add'>+	queue_work(inet_frag_wq, &amp;fqdir-&gt;destroy_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fqdir_exit);</div><div class='add'>+</div><div class='add'>+void inet_frag_kill(struct inet_frag_queue *fq, int *refs)</div><div class='add'>+{</div><div class='add'>+	if (timer_delete(&amp;fq-&gt;timer))</div><div class='add'>+		(*refs)++;</div><div class='ctx'> </div><div class='ctx'> 	if (!(fq-&gt;flags &amp; INET_FRAG_COMPLETE)) {</div><div class='del'>-		struct netns_frags *nf = fq-&gt;net;</div><div class='add'>+		struct fqdir *fqdir = fq-&gt;fqdir;</div><div class='ctx'> </div><div class='ctx'> 		fq-&gt;flags |= INET_FRAG_COMPLETE;</div><div class='del'>-		rhashtable_remove_fast(&amp;nf-&gt;rhashtable, &amp;fq-&gt;node, nf-&gt;f-&gt;rhash_params);</div><div class='del'>-		refcount_dec(&amp;fq-&gt;refcnt);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		/* The RCU read lock provides a memory barrier</div><div class='add'>+		 * guaranteeing that if fqdir-&gt;dead is false then</div><div class='add'>+		 * the hash table destruction will not start until</div><div class='add'>+		 * after we unlock.  Paired with fqdir_pre_exit().</div><div class='add'>+		 */</div><div class='add'>+		if (!READ_ONCE(fqdir-&gt;dead)) {</div><div class='add'>+			rhashtable_remove_fast(&amp;fqdir-&gt;rhashtable, &amp;fq-&gt;node,</div><div class='add'>+					       fqdir-&gt;f-&gt;rhash_params);</div><div class='add'>+			(*refs)++;</div><div class='add'>+		} else {</div><div class='add'>+			fq-&gt;flags |= INET_FRAG_HASH_DEAD;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_frag_kill);</div><div class='hunk'>@@ -116,47 +256,62 @@ static void inet_frag_destroy_rcu(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_frag_queue *q = container_of(head, struct inet_frag_queue,</div><div class='ctx'> 						 rcu);</div><div class='del'>-	struct inet_frags *f = q-&gt;net-&gt;f;</div><div class='add'>+	struct inet_frags *f = q-&gt;fqdir-&gt;f;</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;destructor)</div><div class='ctx'> 		f-&gt;destructor(q);</div><div class='ctx'> 	kmem_cache_free(f-&gt;frags_cachep, q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned int inet_frag_rbtree_purge(struct rb_root *root,</div><div class='add'>+				    enum skb_drop_reason reason)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *p = rb_first(root);</div><div class='add'>+	unsigned int sum = 0;</div><div class='add'>+</div><div class='add'>+	while (p) {</div><div class='add'>+		struct sk_buff *skb = rb_entry(p, struct sk_buff, rbnode);</div><div class='add'>+</div><div class='add'>+		p = rb_next(p);</div><div class='add'>+		rb_erase(&amp;skb-&gt;rbnode, root);</div><div class='add'>+		while (skb) {</div><div class='add'>+			struct sk_buff *next = FRAG_CB(skb)-&gt;next_frag;</div><div class='add'>+</div><div class='add'>+			sum += skb-&gt;truesize;</div><div class='add'>+			kfree_skb_reason(skb, reason);</div><div class='add'>+			skb = next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_frag_rbtree_purge);</div><div class='add'>+</div><div class='ctx'> void inet_frag_destroy(struct inet_frag_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *fp;</div><div class='del'>-	struct netns_frags *nf;</div><div class='ctx'> 	unsigned int sum, sum_truesize = 0;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct inet_frags *f;</div><div class='add'>+	struct fqdir *fqdir;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!(q-&gt;flags &amp; INET_FRAG_COMPLETE));</div><div class='del'>-	WARN_ON(del_timer(&amp;q-&gt;timer) != 0);</div><div class='add'>+	reason = (q-&gt;flags &amp; INET_FRAG_DROP) ?</div><div class='add'>+			SKB_DROP_REASON_FRAG_REASM_TIMEOUT :</div><div class='add'>+			SKB_CONSUMED;</div><div class='add'>+	WARN_ON(timer_delete(&amp;q-&gt;timer) != 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Release all fragment data. */</div><div class='del'>-	fp = q-&gt;fragments;</div><div class='del'>-	nf = q-&gt;net;</div><div class='del'>-	f = nf-&gt;f;</div><div class='del'>-	if (fp) {</div><div class='del'>-		do {</div><div class='del'>-			struct sk_buff *xp = fp-&gt;next;</div><div class='del'>-</div><div class='del'>-			sum_truesize += fp-&gt;truesize;</div><div class='del'>-			kfree_skb(fp);</div><div class='del'>-			fp = xp;</div><div class='del'>-		} while (fp);</div><div class='del'>-	} else {</div><div class='del'>-		sum_truesize = inet_frag_rbtree_purge(&amp;q-&gt;rb_fragments);</div><div class='del'>-	}</div><div class='add'>+	fqdir = q-&gt;fqdir;</div><div class='add'>+	f = fqdir-&gt;f;</div><div class='add'>+	sum_truesize = inet_frag_rbtree_purge(&amp;q-&gt;rb_fragments, reason);</div><div class='ctx'> 	sum = sum_truesize + f-&gt;qsize;</div><div class='ctx'> </div><div class='ctx'> 	call_rcu(&amp;q-&gt;rcu, inet_frag_destroy_rcu);</div><div class='ctx'> </div><div class='del'>-	sub_frag_mem_limit(nf, sum);</div><div class='add'>+	sub_frag_mem_limit(fqdir, sum);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet_frag_destroy);</div><div class='ctx'> </div><div class='del'>-static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,</div><div class='add'>+static struct inet_frag_queue *inet_frag_alloc(struct fqdir *fqdir,</div><div class='ctx'> 					       struct inet_frags *f,</div><div class='ctx'> 					       void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -166,60 +321,331 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q-&gt;net = nf;</div><div class='add'>+	q-&gt;fqdir = fqdir;</div><div class='ctx'> 	f-&gt;constructor(q, arg);</div><div class='del'>-	add_frag_mem_limit(nf, f-&gt;qsize);</div><div class='add'>+	add_frag_mem_limit(fqdir, f-&gt;qsize);</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;q-&gt;timer, f-&gt;frag_expire, 0);</div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;lock);</div><div class='del'>-	refcount_set(&amp;q-&gt;refcnt, 3);</div><div class='add'>+	/* One reference for the timer, one for the hash table. */</div><div class='add'>+	refcount_set(&amp;q-&gt;refcnt, 2);</div><div class='ctx'> </div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inet_frag_queue *inet_frag_create(struct netns_frags *nf,</div><div class='del'>-						void *arg)</div><div class='add'>+static struct inet_frag_queue *inet_frag_create(struct fqdir *fqdir,</div><div class='add'>+						void *arg,</div><div class='add'>+						struct inet_frag_queue **prev)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frags *f = nf-&gt;f;</div><div class='add'>+	struct inet_frags *f = fqdir-&gt;f;</div><div class='ctx'> 	struct inet_frag_queue *q;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	q = inet_frag_alloc(nf, f, arg);</div><div class='del'>-	if (!q)</div><div class='add'>+	q = inet_frag_alloc(fqdir, f, arg);</div><div class='add'>+	if (!q) {</div><div class='add'>+		*prev = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='add'>+	mod_timer(&amp;q-&gt;timer, jiffies + fqdir-&gt;timeout);</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;q-&gt;timer, jiffies + nf-&gt;timeout);</div><div class='add'>+	*prev = rhashtable_lookup_get_insert_key(&amp;fqdir-&gt;rhashtable, &amp;q-&gt;key,</div><div class='add'>+						 &amp;q-&gt;node, f-&gt;rhash_params);</div><div class='add'>+	if (*prev) {</div><div class='add'>+		/* We could not insert in the hash table,</div><div class='add'>+		 * we need to cancel what inet_frag_alloc()</div><div class='add'>+		 * anticipated.</div><div class='add'>+		 */</div><div class='add'>+		int refs = 1;</div><div class='ctx'> </div><div class='del'>-	err = rhashtable_insert_fast(&amp;nf-&gt;rhashtable, &amp;q-&gt;node,</div><div class='del'>-				     f-&gt;rhash_params);</div><div class='del'>-	if (err &lt; 0) {</div><div class='ctx'> 		q-&gt;flags |= INET_FRAG_COMPLETE;</div><div class='del'>-		inet_frag_kill(q);</div><div class='del'>-		inet_frag_destroy(q);</div><div class='add'>+		inet_frag_kill(q, &amp;refs);</div><div class='add'>+		inet_frag_putn(q, refs);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TODO : call from rcu_read_lock() and no longer use refcount_inc_not_zero() */</div><div class='del'>-struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, void *key)</div><div class='add'>+struct inet_frag_queue *inet_frag_find(struct fqdir *fqdir, void *key)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frag_queue *fq;</div><div class='add'>+	/* This pairs with WRITE_ONCE() in fqdir_pre_exit(). */</div><div class='add'>+	long high_thresh = READ_ONCE(fqdir-&gt;high_thresh);</div><div class='add'>+	struct inet_frag_queue *fq = NULL, *prev;</div><div class='ctx'> </div><div class='del'>-	if (!nf-&gt;high_thresh || frag_mem_limit(nf) &gt; nf-&gt;high_thresh)</div><div class='add'>+	if (!high_thresh || frag_mem_limit(fqdir) &gt; high_thresh)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	prev = rhashtable_lookup(&amp;fqdir-&gt;rhashtable, key, fqdir-&gt;f-&gt;rhash_params);</div><div class='add'>+	if (!prev)</div><div class='add'>+		fq = inet_frag_create(fqdir, key, &amp;prev);</div><div class='add'>+	if (!IS_ERR_OR_NULL(prev))</div><div class='add'>+		fq = prev;</div><div class='add'>+	return fq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_frag_find);</div><div class='ctx'> </div><div class='del'>-	fq = rhashtable_lookup(&amp;nf-&gt;rhashtable, key, nf-&gt;f-&gt;rhash_params);</div><div class='del'>-	if (fq) {</div><div class='del'>-		if (!refcount_inc_not_zero(&amp;fq-&gt;refcnt))</div><div class='del'>-			fq = NULL;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return fq;</div><div class='add'>+int inet_frag_queue_insert(struct inet_frag_queue *q, struct sk_buff *skb,</div><div class='add'>+			   int offset, int end)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *last = q-&gt;fragments_tail;</div><div class='add'>+</div><div class='add'>+	/* RFC5722, Section 4, amended by Errata ID : 3089</div><div class='add'>+	 *                          When reassembling an IPv6 datagram, if</div><div class='add'>+	 *   one or more its constituent fragments is determined to be an</div><div class='add'>+	 *   overlapping fragment, the entire datagram (and any constituent</div><div class='add'>+	 *   fragments) MUST be silently discarded.</div><div class='add'>+	 *</div><div class='add'>+	 * Duplicates, however, should be ignored (i.e. skb dropped, but the</div><div class='add'>+	 * queue/fragments kept for later reassembly).</div><div class='add'>+	 */</div><div class='add'>+	if (!last)</div><div class='add'>+		fragrun_create(q, skb);  /* First fragment. */</div><div class='add'>+	else if (FRAG_CB(last)-&gt;ip_defrag_offset + last-&gt;len &lt; end) {</div><div class='add'>+		/* This is the common case: skb goes to the end. */</div><div class='add'>+		/* Detect and discard overlaps. */</div><div class='add'>+		if (offset &lt; FRAG_CB(last)-&gt;ip_defrag_offset + last-&gt;len)</div><div class='add'>+			return IPFRAG_OVERLAP;</div><div class='add'>+		if (offset == FRAG_CB(last)-&gt;ip_defrag_offset + last-&gt;len)</div><div class='add'>+			fragrun_append_to_last(q, skb);</div><div class='add'>+		else</div><div class='add'>+			fragrun_create(q, skb);</div><div class='add'>+	} else {</div><div class='add'>+		/* Binary search. Note that skb can become the first fragment,</div><div class='add'>+		 * but not the last (covered above).</div><div class='add'>+		 */</div><div class='add'>+		struct rb_node **rbn, *parent;</div><div class='add'>+</div><div class='add'>+		rbn = &amp;q-&gt;rb_fragments.rb_node;</div><div class='add'>+		do {</div><div class='add'>+			struct sk_buff *curr;</div><div class='add'>+			int curr_run_end;</div><div class='add'>+</div><div class='add'>+			parent = *rbn;</div><div class='add'>+			curr = rb_to_skb(parent);</div><div class='add'>+			curr_run_end = FRAG_CB(curr)-&gt;ip_defrag_offset +</div><div class='add'>+					FRAG_CB(curr)-&gt;frag_run_len;</div><div class='add'>+			if (end &lt;= FRAG_CB(curr)-&gt;ip_defrag_offset)</div><div class='add'>+				rbn = &amp;parent-&gt;rb_left;</div><div class='add'>+			else if (offset &gt;= curr_run_end)</div><div class='add'>+				rbn = &amp;parent-&gt;rb_right;</div><div class='add'>+			else if (offset &gt;= FRAG_CB(curr)-&gt;ip_defrag_offset &amp;&amp;</div><div class='add'>+				 end &lt;= curr_run_end)</div><div class='add'>+				return IPFRAG_DUP;</div><div class='add'>+			else</div><div class='add'>+				return IPFRAG_OVERLAP;</div><div class='add'>+		} while (*rbn);</div><div class='add'>+		/* Here we have parent properly set, and rbn pointing to</div><div class='add'>+		 * one of its NULL left/right children. Insert skb.</div><div class='add'>+		 */</div><div class='add'>+		fragcb_clear(skb);</div><div class='add'>+		rb_link_node(&amp;skb-&gt;rbnode, parent, rbn);</div><div class='add'>+		rb_insert_color(&amp;skb-&gt;rbnode, &amp;q-&gt;rb_fragments);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return inet_frag_create(nf, key);</div><div class='add'>+	FRAG_CB(skb)-&gt;ip_defrag_offset = offset;</div><div class='add'>+</div><div class='add'>+	return IPFRAG_OK;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_frag_find);</div><div class='add'>+EXPORT_SYMBOL(inet_frag_queue_insert);</div><div class='add'>+</div><div class='add'>+void *inet_frag_reasm_prepare(struct inet_frag_queue *q, struct sk_buff *skb,</div><div class='add'>+			      struct sk_buff *parent)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *fp, *head = skb_rb_first(&amp;q-&gt;rb_fragments);</div><div class='add'>+	void (*destructor)(struct sk_buff *);</div><div class='add'>+	unsigned int orig_truesize = 0;</div><div class='add'>+	struct sk_buff **nextp = NULL;</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+	int delta;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; is_skb_wmem(skb)) {</div><div class='add'>+		/* TX: skb-&gt;sk might have been passed as argument to</div><div class='add'>+		 * dst-&gt;output and must remain valid until tx completes.</div><div class='add'>+		 *</div><div class='add'>+		 * Move sk to reassembled skb and fix up wmem accounting.</div><div class='add'>+		 */</div><div class='add'>+		orig_truesize = skb-&gt;truesize;</div><div class='add'>+		destructor = skb-&gt;destructor;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (head != skb) {</div><div class='add'>+		fp = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+		if (!fp) {</div><div class='add'>+			head = skb;</div><div class='add'>+			goto out_restore_sk;</div><div class='add'>+		}</div><div class='add'>+		FRAG_CB(fp)-&gt;next_frag = FRAG_CB(skb)-&gt;next_frag;</div><div class='add'>+		if (RB_EMPTY_NODE(&amp;skb-&gt;rbnode))</div><div class='add'>+			FRAG_CB(parent)-&gt;next_frag = fp;</div><div class='add'>+		else</div><div class='add'>+			rb_replace_node(&amp;skb-&gt;rbnode, &amp;fp-&gt;rbnode,</div><div class='add'>+					&amp;q-&gt;rb_fragments);</div><div class='add'>+		if (q-&gt;fragments_tail == skb)</div><div class='add'>+			q-&gt;fragments_tail = fp;</div><div class='add'>+</div><div class='add'>+		if (orig_truesize) {</div><div class='add'>+			/* prevent skb_morph from releasing sk */</div><div class='add'>+			skb-&gt;sk = NULL;</div><div class='add'>+			skb-&gt;destructor = NULL;</div><div class='add'>+		}</div><div class='add'>+		skb_morph(skb, head);</div><div class='add'>+		FRAG_CB(skb)-&gt;next_frag = FRAG_CB(head)-&gt;next_frag;</div><div class='add'>+		rb_replace_node(&amp;head-&gt;rbnode, &amp;skb-&gt;rbnode,</div><div class='add'>+				&amp;q-&gt;rb_fragments);</div><div class='add'>+		consume_skb(head);</div><div class='add'>+		head = skb;</div><div class='add'>+	}</div><div class='add'>+	WARN_ON(FRAG_CB(head)-&gt;ip_defrag_offset != 0);</div><div class='add'>+</div><div class='add'>+	delta = -head-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	/* Head of list must not be cloned. */</div><div class='add'>+	if (skb_unclone(head, GFP_ATOMIC))</div><div class='add'>+		goto out_restore_sk;</div><div class='add'>+</div><div class='add'>+	delta += head-&gt;truesize;</div><div class='add'>+	if (delta)</div><div class='add'>+		add_frag_mem_limit(q-&gt;fqdir, delta);</div><div class='add'>+</div><div class='add'>+	/* If the first fragment is fragmented itself, we split</div><div class='add'>+	 * it to two chunks: the first with data and paged part</div><div class='add'>+	 * and the second, holding only fragments.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_has_frag_list(head)) {</div><div class='add'>+		struct sk_buff *clone;</div><div class='add'>+		int i, plen = 0;</div><div class='add'>+</div><div class='add'>+		clone = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+		if (!clone)</div><div class='add'>+			goto out_restore_sk;</div><div class='add'>+		skb_shinfo(clone)-&gt;frag_list = skb_shinfo(head)-&gt;frag_list;</div><div class='add'>+		skb_frag_list_init(head);</div><div class='add'>+		for (i = 0; i &lt; skb_shinfo(head)-&gt;nr_frags; i++)</div><div class='add'>+			plen += skb_frag_size(&amp;skb_shinfo(head)-&gt;frags[i]);</div><div class='add'>+		clone-&gt;data_len = head-&gt;data_len - plen;</div><div class='add'>+		clone-&gt;len = clone-&gt;data_len;</div><div class='add'>+		head-&gt;truesize += clone-&gt;truesize;</div><div class='add'>+		clone-&gt;csum = 0;</div><div class='add'>+		clone-&gt;ip_summed = head-&gt;ip_summed;</div><div class='add'>+		add_frag_mem_limit(q-&gt;fqdir, clone-&gt;truesize);</div><div class='add'>+		skb_shinfo(head)-&gt;frag_list = clone;</div><div class='add'>+		nextp = &amp;clone-&gt;next;</div><div class='add'>+	} else {</div><div class='add'>+		nextp = &amp;skb_shinfo(head)-&gt;frag_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_restore_sk:</div><div class='add'>+	if (orig_truesize) {</div><div class='add'>+		int ts_delta = head-&gt;truesize - orig_truesize;</div><div class='add'>+</div><div class='add'>+		/* if this reassembled skb is fragmented later,</div><div class='add'>+		 * fraglist skbs will get skb-&gt;sk assigned from head-&gt;sk,</div><div class='add'>+		 * and each frag skb will be released via sock_wfree.</div><div class='add'>+		 *</div><div class='add'>+		 * Update sk_wmem_alloc.</div><div class='add'>+		 */</div><div class='add'>+		head-&gt;sk = sk;</div><div class='add'>+		head-&gt;destructor = destructor;</div><div class='add'>+		refcount_add(ts_delta, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nextp;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_frag_reasm_prepare);</div><div class='add'>+</div><div class='add'>+void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,</div><div class='add'>+			    void *reasm_data, bool try_coalesce)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = is_skb_wmem(head) ? head-&gt;sk : NULL;</div><div class='add'>+	const unsigned int head_truesize = head-&gt;truesize;</div><div class='add'>+	struct sk_buff **nextp = reasm_data;</div><div class='add'>+	struct rb_node *rbn;</div><div class='add'>+	struct sk_buff *fp;</div><div class='add'>+	int sum_truesize;</div><div class='add'>+</div><div class='add'>+	skb_push(head, head-&gt;data - skb_network_header(head));</div><div class='add'>+</div><div class='add'>+	/* Traverse the tree in order, to build frag_list. */</div><div class='add'>+	fp = FRAG_CB(head)-&gt;next_frag;</div><div class='add'>+	rbn = rb_next(&amp;head-&gt;rbnode);</div><div class='add'>+	rb_erase(&amp;head-&gt;rbnode, &amp;q-&gt;rb_fragments);</div><div class='add'>+</div><div class='add'>+	sum_truesize = head-&gt;truesize;</div><div class='add'>+	while (rbn || fp) {</div><div class='add'>+		/* fp points to the next sk_buff in the current run;</div><div class='add'>+		 * rbn points to the next run.</div><div class='add'>+		 */</div><div class='add'>+		/* Go through the current run. */</div><div class='add'>+		while (fp) {</div><div class='add'>+			struct sk_buff *next_frag = FRAG_CB(fp)-&gt;next_frag;</div><div class='add'>+			bool stolen;</div><div class='add'>+			int delta;</div><div class='add'>+</div><div class='add'>+			sum_truesize += fp-&gt;truesize;</div><div class='add'>+			if (head-&gt;ip_summed != fp-&gt;ip_summed)</div><div class='add'>+				head-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+			else if (head-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='add'>+				head-&gt;csum = csum_add(head-&gt;csum, fp-&gt;csum);</div><div class='add'>+</div><div class='add'>+			if (try_coalesce &amp;&amp; skb_try_coalesce(head, fp, &amp;stolen,</div><div class='add'>+							     &amp;delta)) {</div><div class='add'>+				kfree_skb_partial(fp, stolen);</div><div class='add'>+			} else {</div><div class='add'>+				fp-&gt;prev = NULL;</div><div class='add'>+				memset(&amp;fp-&gt;rbnode, 0, sizeof(fp-&gt;rbnode));</div><div class='add'>+				fp-&gt;sk = NULL;</div><div class='add'>+</div><div class='add'>+				head-&gt;data_len += fp-&gt;len;</div><div class='add'>+				head-&gt;len += fp-&gt;len;</div><div class='add'>+				head-&gt;truesize += fp-&gt;truesize;</div><div class='add'>+</div><div class='add'>+				*nextp = fp;</div><div class='add'>+				nextp = &amp;fp-&gt;next;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fp = next_frag;</div><div class='add'>+		}</div><div class='add'>+		/* Move to the next run. */</div><div class='add'>+		if (rbn) {</div><div class='add'>+			struct rb_node *rbnext = rb_next(rbn);</div><div class='add'>+</div><div class='add'>+			fp = rb_to_skb(rbn);</div><div class='add'>+			rb_erase(rbn, &amp;q-&gt;rb_fragments);</div><div class='add'>+			rbn = rbnext;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sub_frag_mem_limit(q-&gt;fqdir, sum_truesize);</div><div class='add'>+</div><div class='add'>+	*nextp = NULL;</div><div class='add'>+	skb_mark_not_on_list(head);</div><div class='add'>+	head-&gt;prev = NULL;</div><div class='add'>+	head-&gt;tstamp = q-&gt;stamp;</div><div class='add'>+	head-&gt;tstamp_type = q-&gt;tstamp_type;</div><div class='add'>+</div><div class='add'>+	if (sk)</div><div class='add'>+		refcount_add(sum_truesize - head_truesize, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_frag_reasm_finish);</div><div class='add'>+</div><div class='add'>+struct sk_buff *inet_frag_pull_head(struct inet_frag_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *head, *skb;</div><div class='add'>+</div><div class='add'>+	head = skb_rb_first(&amp;q-&gt;rb_fragments);</div><div class='add'>+	if (!head)</div><div class='add'>+		return NULL;</div><div class='add'>+	skb = FRAG_CB(head)-&gt;next_frag;</div><div class='add'>+	if (skb)</div><div class='add'>+		rb_replace_node(&amp;head-&gt;rbnode, &amp;skb-&gt;rbnode,</div><div class='add'>+				&amp;q-&gt;rb_fragments);</div><div class='add'>+	else</div><div class='add'>+		rb_erase(&amp;head-&gt;rbnode, &amp;q-&gt;rb_fragments);</div><div class='add'>+	memset(&amp;head-&gt;rbnode, 0, sizeof(head-&gt;rbnode));</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	if (head == q-&gt;fragments_tail)</div><div class='add'>+		q-&gt;fragments_tail = NULL;</div><div class='add'>+</div><div class='add'>+	sub_frag_mem_limit(q-&gt;fqdir, head-&gt;truesize);</div><div class='add'>+</div><div class='add'>+	return head;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inet_frag_pull_head);</div><div class='head'>diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c<br/>index f5c9ef2586de..f5826ec4bcaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_hashtables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_hashtables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_hashtables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inet_hashtables.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *		Generic INET transport hashtables</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Lotsa people, from code originally in tcp</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -19,27 +15,31 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/inet_connection_sock.h&gt;</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='del'>-#include &lt;net/secure_seq.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#include &lt;net/inet6_hashtables.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='add'>+#include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='del'>-static u32 inet_ehashfn(const struct net *net, const __be32 laddr,</div><div class='del'>-			const __u16 lport, const __be32 faddr,</div><div class='del'>-			const __be16 fport)</div><div class='add'>+u32 inet_ehashfn(const struct net *net, const __be32 laddr,</div><div class='add'>+		 const __u16 lport, const __be32 faddr,</div><div class='add'>+		 const __be16 fport)</div><div class='ctx'> {</div><div class='del'>-	static u32 inet_ehash_secret __read_mostly;</div><div class='del'>-</div><div class='ctx'> 	net_get_random_once(&amp;inet_ehash_secret, sizeof(inet_ehash_secret));</div><div class='ctx'> </div><div class='del'>-	return __inet_ehashfn(laddr, lport, faddr, fport,</div><div class='del'>-			      inet_ehash_secret + net_hash_mix(net));</div><div class='add'>+	return lport + __inet_ehashfn(laddr, 0, faddr, fport,</div><div class='add'>+				      inet_ehash_secret + net_hash_mix(net));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inet_ehashfn);</div><div class='ctx'> </div><div class='ctx'> /* This function handles inet_sock, but also timewait and request sockets</div><div class='ctx'>  * for IPv4/IPv6.</div><div class='hunk'>@@ -58,6 +58,14 @@ static u32 sk_ehashfn(const struct sock *sk)</div><div class='ctx'> 			    sk-&gt;sk_daddr, sk-&gt;sk_dport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool sk_is_connect_bind(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+		return inet_twsk(sk)-&gt;tw_connect_bind;</div><div class='add'>+	else</div><div class='add'>+		return sk-&gt;sk_userlocks &amp; SOCK_CONNECT_BIND;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate and initialize a new local port bind bucket.</div><div class='ctx'>  * The bindhash mutex for snum's hash chain must be held here.</div><div class='hunk'>@@ -65,17 +73,19 @@ static u32 sk_ehashfn(const struct sock *sk)</div><div class='ctx'> struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep,</div><div class='ctx'> 						 struct net *net,</div><div class='ctx'> 						 struct inet_bind_hashbucket *head,</div><div class='del'>-						 const unsigned short snum)</div><div class='add'>+						 const unsigned short snum,</div><div class='add'>+						 int l3mdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_bind_bucket *tb = kmem_cache_alloc(cachep, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (tb) {</div><div class='ctx'> 		write_pnet(&amp;tb-&gt;ib_net, net);</div><div class='add'>+		tb-&gt;l3mdev    = l3mdev;</div><div class='ctx'> 		tb-&gt;port      = snum;</div><div class='ctx'> 		tb-&gt;fastreuse = 0;</div><div class='ctx'> 		tb-&gt;fastreuseport = 0;</div><div class='del'>-		INIT_HLIST_HEAD(&amp;tb-&gt;owners);</div><div class='del'>-		hlist_add_head(&amp;tb-&gt;node, &amp;head-&gt;chain);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;tb-&gt;bhash2);</div><div class='add'>+		hlist_add_head_rcu(&amp;tb-&gt;node, &amp;head-&gt;chain);</div><div class='ctx'> 	}</div><div class='ctx'> 	return tb;</div><div class='ctx'> }</div><div class='hunk'>@@ -83,20 +93,117 @@ struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep,</div><div class='ctx'> /*</div><div class='ctx'>  * Caller must hold hashbucket lock for this tb with local BH disabled</div><div class='ctx'>  */</div><div class='del'>-void inet_bind_bucket_destroy(struct kmem_cache *cachep, struct inet_bind_bucket *tb)</div><div class='add'>+void inet_bind_bucket_destroy(struct inet_bind_bucket *tb)</div><div class='add'>+{</div><div class='add'>+	const struct inet_bind2_bucket *tb2;</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;tb-&gt;bhash2)) {</div><div class='add'>+		hlist_del_rcu(&amp;tb-&gt;node);</div><div class='add'>+		kfree_rcu(tb, rcu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb-&gt;fastreuse == -1 &amp;&amp; tb-&gt;fastreuseport == -1)</div><div class='add'>+		return;</div><div class='add'>+	hlist_for_each_entry(tb2, &amp;tb-&gt;bhash2, bhash_node) {</div><div class='add'>+		if (tb2-&gt;fastreuse != -1 || tb2-&gt;fastreuseport != -1)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	tb-&gt;fastreuse = -1;</div><div class='add'>+	tb-&gt;fastreuseport = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool inet_bind_bucket_match(const struct inet_bind_bucket *tb, const struct net *net,</div><div class='add'>+			    unsigned short port, int l3mdev)</div><div class='ctx'> {</div><div class='add'>+	return net_eq(ib_net(tb), net) &amp;&amp; tb-&gt;port == port &amp;&amp;</div><div class='add'>+		tb-&gt;l3mdev == l3mdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inet_bind2_bucket_init(struct inet_bind2_bucket *tb2,</div><div class='add'>+				   struct net *net,</div><div class='add'>+				   struct inet_bind_hashbucket *head,</div><div class='add'>+				   struct inet_bind_bucket *tb,</div><div class='add'>+				   const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	write_pnet(&amp;tb2-&gt;ib_net, net);</div><div class='add'>+	tb2-&gt;l3mdev = tb-&gt;l3mdev;</div><div class='add'>+	tb2-&gt;port = tb-&gt;port;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	BUILD_BUG_ON(USHRT_MAX &lt; (IPV6_ADDR_ANY | IPV6_ADDR_MAPPED));</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+		tb2-&gt;addr_type = ipv6_addr_type(&amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+		tb2-&gt;v6_rcv_saddr = sk-&gt;sk_v6_rcv_saddr;</div><div class='add'>+	} else {</div><div class='add'>+		tb2-&gt;addr_type = IPV6_ADDR_MAPPED;</div><div class='add'>+		ipv6_addr_set_v4mapped(sk-&gt;sk_rcv_saddr, &amp;tb2-&gt;v6_rcv_saddr);</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	tb2-&gt;rcv_saddr = sk-&gt;sk_rcv_saddr;</div><div class='add'>+#endif</div><div class='add'>+	tb2-&gt;fastreuse = 0;</div><div class='add'>+	tb2-&gt;fastreuseport = 0;</div><div class='add'>+	INIT_HLIST_HEAD(&amp;tb2-&gt;owners);</div><div class='add'>+	hlist_add_head(&amp;tb2-&gt;node, &amp;head-&gt;chain);</div><div class='add'>+	hlist_add_head(&amp;tb2-&gt;bhash_node, &amp;tb-&gt;bhash2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct inet_bind2_bucket *inet_bind2_bucket_create(struct kmem_cache *cachep,</div><div class='add'>+						   struct net *net,</div><div class='add'>+						   struct inet_bind_hashbucket *head,</div><div class='add'>+						   struct inet_bind_bucket *tb,</div><div class='add'>+						   const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct inet_bind2_bucket *tb2 = kmem_cache_alloc(cachep, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (tb2)</div><div class='add'>+		inet_bind2_bucket_init(tb2, net, head, tb, sk);</div><div class='add'>+</div><div class='add'>+	return tb2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold hashbucket lock for this tb with local BH disabled */</div><div class='add'>+void inet_bind2_bucket_destroy(struct kmem_cache *cachep, struct inet_bind2_bucket *tb)</div><div class='add'>+{</div><div class='add'>+	const struct sock *sk;</div><div class='add'>+</div><div class='ctx'> 	if (hlist_empty(&amp;tb-&gt;owners)) {</div><div class='ctx'> 		__hlist_del(&amp;tb-&gt;node);</div><div class='add'>+		__hlist_del(&amp;tb-&gt;bhash_node);</div><div class='ctx'> 		kmem_cache_free(cachep, tb);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (tb-&gt;fastreuse == -1 &amp;&amp; tb-&gt;fastreuseport == -1)</div><div class='add'>+		return;</div><div class='add'>+	sk_for_each_bound(sk, &amp;tb-&gt;owners) {</div><div class='add'>+		if (!sk_is_connect_bind(sk))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	tb-&gt;fastreuse = -1;</div><div class='add'>+	tb-&gt;fastreuseport = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool inet_bind2_bucket_addr_match(const struct inet_bind2_bucket *tb2,</div><div class='add'>+					 const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		return ipv6_addr_equal(&amp;tb2-&gt;v6_rcv_saddr, &amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+</div><div class='add'>+	if (tb2-&gt;addr_type != IPV6_ADDR_MAPPED)</div><div class='add'>+		return false;</div><div class='add'>+#endif</div><div class='add'>+	return tb2-&gt;rcv_saddr == sk-&gt;sk_rcv_saddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,</div><div class='del'>-		    const unsigned short snum)</div><div class='add'>+		    struct inet_bind2_bucket *tb2, unsigned short port)</div><div class='ctx'> {</div><div class='del'>-	inet_sk(sk)-&gt;inet_num = snum;</div><div class='del'>-	sk_add_bind_node(sk, &amp;tb-&gt;owners);</div><div class='add'>+	inet_sk(sk)-&gt;inet_num = port;</div><div class='ctx'> 	inet_csk(sk)-&gt;icsk_bind_hash = tb;</div><div class='add'>+	inet_csk(sk)-&gt;icsk_bind2_hash = tb2;</div><div class='add'>+	sk_add_bind_node(sk, &amp;tb2-&gt;owners);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -104,18 +211,33 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,</div><div class='ctx'>  */</div><div class='ctx'> static void __inet_put_port(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hashinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	const int bhash = inet_bhashfn(sock_net(sk), inet_sk(sk)-&gt;inet_num,</div><div class='del'>-			hashinfo-&gt;bhash_size);</div><div class='del'>-	struct inet_bind_hashbucket *head = &amp;hashinfo-&gt;bhash[bhash];</div><div class='add'>+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct inet_bind_bucket *tb;</div><div class='add'>+	int bhash;</div><div class='add'>+</div><div class='add'>+	bhash = inet_bhashfn(net, inet_sk(sk)-&gt;inet_num, hashinfo-&gt;bhash_size);</div><div class='add'>+	head = &amp;hashinfo-&gt;bhash[bhash];</div><div class='add'>+	head2 = inet_bhashfn_portaddr(hashinfo, sk, net, inet_sk(sk)-&gt;inet_num);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;head-&gt;lock);</div><div class='ctx'> 	tb = inet_csk(sk)-&gt;icsk_bind_hash;</div><div class='del'>-	__sk_del_bind_node(sk);</div><div class='ctx'> 	inet_csk(sk)-&gt;icsk_bind_hash = NULL;</div><div class='ctx'> 	inet_sk(sk)-&gt;inet_num = 0;</div><div class='del'>-	inet_bind_bucket_destroy(hashinfo-&gt;bind_bucket_cachep, tb);</div><div class='add'>+	sk-&gt;sk_userlocks &amp;= ~SOCK_CONNECT_BIND;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+	if (inet_csk(sk)-&gt;icsk_bind2_hash) {</div><div class='add'>+		struct inet_bind2_bucket *tb2 = inet_csk(sk)-&gt;icsk_bind2_hash;</div><div class='add'>+</div><div class='add'>+		__sk_del_bind_node(sk);</div><div class='add'>+		inet_csk(sk)-&gt;icsk_bind2_hash = NULL;</div><div class='add'>+		inet_bind2_bucket_destroy(hashinfo-&gt;bind2_bucket_cachep, tb2);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	inet_bind_bucket_destroy(tb);</div><div class='ctx'> 	spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,43 +251,80 @@ EXPORT_SYMBOL(inet_put_port);</div><div class='ctx'> </div><div class='ctx'> int __inet_inherit_port(const struct sock *sk, struct sock *child)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *table = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='add'>+	struct inet_hashinfo *table = tcp_get_hashinfo(sk);</div><div class='ctx'> 	unsigned short port = inet_sk(child)-&gt;inet_num;</div><div class='del'>-	const int bhash = inet_bhashfn(sock_net(sk), port,</div><div class='del'>-			table-&gt;bhash_size);</div><div class='del'>-	struct inet_bind_hashbucket *head = &amp;table-&gt;bhash[bhash];</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='add'>+	bool created_inet_bind_bucket = false;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	bool update_fastreuse = false;</div><div class='add'>+	struct inet_bind2_bucket *tb2;</div><div class='ctx'> 	struct inet_bind_bucket *tb;</div><div class='add'>+	int bhash, l3mdev;</div><div class='add'>+</div><div class='add'>+	bhash = inet_bhashfn(net, port, table-&gt;bhash_size);</div><div class='add'>+	head = &amp;table-&gt;bhash[bhash];</div><div class='add'>+	head2 = inet_bhashfn_portaddr(table, child, net, port);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='ctx'> 	tb = inet_csk(sk)-&gt;icsk_bind_hash;</div><div class='del'>-	if (unlikely(!tb)) {</div><div class='add'>+	tb2 = inet_csk(sk)-&gt;icsk_bind2_hash;</div><div class='add'>+	if (unlikely(!tb || !tb2)) {</div><div class='add'>+		spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 		spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tb-&gt;port != port) {</div><div class='add'>+		l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+</div><div class='ctx'> 		/* NOTE: using tproxy and redirecting skbs to a proxy</div><div class='ctx'> 		 * on a different listener port breaks the assumption</div><div class='ctx'> 		 * that the listener socket's icsk_bind_hash is the same</div><div class='ctx'> 		 * as that of the child socket. We have to look up or</div><div class='ctx'> 		 * create a new bind bucket for the child here. */</div><div class='ctx'> 		inet_bind_bucket_for_each(tb, &amp;head-&gt;chain) {</div><div class='del'>-			if (net_eq(ib_net(tb), sock_net(sk)) &amp;&amp;</div><div class='del'>-			    tb-&gt;port == port)</div><div class='add'>+			if (inet_bind_bucket_match(tb, net, port, l3mdev))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!tb) {</div><div class='ctx'> 			tb = inet_bind_bucket_create(table-&gt;bind_bucket_cachep,</div><div class='del'>-						     sock_net(sk), head, port);</div><div class='add'>+						     net, head, port, l3mdev);</div><div class='ctx'> 			if (!tb) {</div><div class='add'>+				spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 				spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='add'>+			created_inet_bind_bucket = true;</div><div class='add'>+		}</div><div class='add'>+		update_fastreuse = true;</div><div class='add'>+</div><div class='add'>+		goto bhash2_find;</div><div class='add'>+	} else if (!inet_bind2_bucket_addr_match(tb2, child)) {</div><div class='add'>+		l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+</div><div class='add'>+bhash2_find:</div><div class='add'>+		tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, child);</div><div class='add'>+		if (!tb2) {</div><div class='add'>+			tb2 = inet_bind2_bucket_create(table-&gt;bind2_bucket_cachep,</div><div class='add'>+						       net, head2, tb, child);</div><div class='add'>+			if (!tb2)</div><div class='add'>+				goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	inet_bind_hash(child, tb, port);</div><div class='add'>+	if (update_fastreuse)</div><div class='add'>+		inet_csk_update_fastreuse(child, tb, tb2);</div><div class='add'>+	inet_bind_hash(child, tb, tb2, port);</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (created_inet_bind_bucket)</div><div class='add'>+		inet_bind_bucket_destroy(tb);</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__inet_inherit_port);</div><div class='ctx'> </div><div class='hunk'>@@ -187,72 +346,61 @@ inet_lhash2_bucket_sk(struct inet_hashinfo *h, struct sock *sk)</div><div class='ctx'> 	return inet_lhash2_bucket(h, hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inet_hash2(struct inet_hashinfo *h, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct inet_listen_hashbucket *ilb2;</div><div class='del'>-</div><div class='del'>-	if (!h-&gt;lhash2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ilb2 = inet_lhash2_bucket_sk(h, sk);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ilb2-&gt;lock);</div><div class='del'>-	if (sk-&gt;sk_reuseport &amp;&amp; sk-&gt;sk_family == AF_INET6)</div><div class='del'>-		hlist_add_tail_rcu(&amp;inet_csk(sk)-&gt;icsk_listen_portaddr_node,</div><div class='del'>-				   &amp;ilb2-&gt;head);</div><div class='del'>-	else</div><div class='del'>-		hlist_add_head_rcu(&amp;inet_csk(sk)-&gt;icsk_listen_portaddr_node,</div><div class='del'>-				   &amp;ilb2-&gt;head);</div><div class='del'>-	ilb2-&gt;count++;</div><div class='del'>-	spin_unlock(&amp;ilb2-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inet_unhash2(struct inet_hashinfo *h, struct sock *sk)</div><div class='add'>+static inline int compute_score(struct sock *sk, const struct net *net,</div><div class='add'>+				const unsigned short hnum, const __be32 daddr,</div><div class='add'>+				const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	struct inet_listen_hashbucket *ilb2;</div><div class='add'>+	int score = -1;</div><div class='ctx'> </div><div class='del'>-	if (!h-&gt;lhash2 ||</div><div class='del'>-	    WARN_ON_ONCE(hlist_unhashed(&amp;inet_csk(sk)-&gt;icsk_listen_portaddr_node)))</div><div class='del'>-		return;</div><div class='add'>+	if (net_eq(sock_net(sk), net) &amp;&amp; sk-&gt;sk_num == hnum &amp;&amp;</div><div class='add'>+			!ipv6_only_sock(sk)) {</div><div class='add'>+		if (sk-&gt;sk_rcv_saddr != daddr)</div><div class='add'>+			return -1;</div><div class='ctx'> </div><div class='del'>-	ilb2 = inet_lhash2_bucket_sk(h, sk);</div><div class='add'>+		if (!inet_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if, dif, sdif))</div><div class='add'>+			return -1;</div><div class='add'>+		score =  sk-&gt;sk_bound_dev_if ? 2 : 1;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ilb2-&gt;lock);</div><div class='del'>-	hlist_del_init_rcu(&amp;inet_csk(sk)-&gt;icsk_listen_portaddr_node);</div><div class='del'>-	ilb2-&gt;count--;</div><div class='del'>-	spin_unlock(&amp;ilb2-&gt;lock);</div><div class='add'>+		if (sk-&gt;sk_family == PF_INET)</div><div class='add'>+			score++;</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_incoming_cpu) == raw_smp_processor_id())</div><div class='add'>+			score++;</div><div class='add'>+	}</div><div class='add'>+	return score;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int compute_score(struct sock *sk, struct net *net,</div><div class='del'>-				const unsigned short hnum, const __be32 daddr,</div><div class='del'>-				const int dif, const int sdif, bool exact_dif)</div><div class='add'>+/**</div><div class='add'>+ * inet_lookup_reuseport() - execute reuseport logic on AF_INET socket if necessary.</div><div class='add'>+ * @net: network namespace.</div><div class='add'>+ * @sk: AF_INET socket, must be in TCP_LISTEN state for TCP or TCP_CLOSE for UDP.</div><div class='add'>+ * @skb: context for a potential SK_REUSEPORT program.</div><div class='add'>+ * @doff: header offset.</div><div class='add'>+ * @saddr: source address.</div><div class='add'>+ * @sport: source port.</div><div class='add'>+ * @daddr: destination address.</div><div class='add'>+ * @hnum: destination port in host byte order.</div><div class='add'>+ * @ehashfn: hash function used to generate the fallback hash.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL if sk doesn't have SO_REUSEPORT set, otherwise a pointer to</div><div class='add'>+ *         the selected sock or an error.</div><div class='add'>+ */</div><div class='add'>+struct sock *inet_lookup_reuseport(const struct net *net, struct sock *sk,</div><div class='add'>+				   struct sk_buff *skb, int doff,</div><div class='add'>+				   __be32 saddr, __be16 sport,</div><div class='add'>+				   __be32 daddr, unsigned short hnum,</div><div class='add'>+				   inet_ehashfn_t *ehashfn)</div><div class='ctx'> {</div><div class='del'>-	int score = -1;</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct sock *reuse_sk = NULL;</div><div class='add'>+	u32 phash;</div><div class='ctx'> </div><div class='del'>-	if (net_eq(sock_net(sk), net) &amp;&amp; inet-&gt;inet_num == hnum &amp;&amp;</div><div class='del'>-			!ipv6_only_sock(sk)) {</div><div class='del'>-		__be32 rcv_saddr = inet-&gt;inet_rcv_saddr;</div><div class='del'>-		score = sk-&gt;sk_family == PF_INET ? 2 : 1;</div><div class='del'>-		if (rcv_saddr) {</div><div class='del'>-			if (rcv_saddr != daddr)</div><div class='del'>-				return -1;</div><div class='del'>-			score += 4;</div><div class='del'>-		}</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if || exact_dif) {</div><div class='del'>-			bool dev_match = (sk-&gt;sk_bound_dev_if == dif ||</div><div class='del'>-					  sk-&gt;sk_bound_dev_if == sdif);</div><div class='del'>-</div><div class='del'>-			if (!dev_match)</div><div class='del'>-				return -1;</div><div class='del'>-			if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-				score += 4;</div><div class='del'>-		}</div><div class='del'>-		if (sk-&gt;sk_incoming_cpu == raw_smp_processor_id())</div><div class='del'>-			score++;</div><div class='add'>+	if (sk-&gt;sk_reuseport) {</div><div class='add'>+		phash = INDIRECT_CALL_2(ehashfn, udp_ehashfn, inet_ehashfn,</div><div class='add'>+					net, daddr, hnum, saddr, sport);</div><div class='add'>+		reuse_sk = reuseport_select_sock(sk, phash, skb, doff);</div><div class='ctx'> 	}</div><div class='del'>-	return score;</div><div class='add'>+	return reuse_sk;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inet_lookup_reuseport);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Here are some nice properties to exploit here. The BSD API</div><div class='hunk'>@@ -262,32 +410,25 @@ static inline int compute_score(struct sock *sk, struct net *net,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock() : No refcount taken on the socket */</div><div class='del'>-static struct sock *inet_lhash2_lookup(struct net *net,</div><div class='add'>+static struct sock *inet_lhash2_lookup(const struct net *net,</div><div class='ctx'> 				struct inet_listen_hashbucket *ilb2,</div><div class='ctx'> 				struct sk_buff *skb, int doff,</div><div class='ctx'> 				const __be32 saddr, __be16 sport,</div><div class='ctx'> 				const __be32 daddr, const unsigned short hnum,</div><div class='ctx'> 				const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	bool exact_dif = inet_exact_dif_match(net, skb);</div><div class='del'>-	struct inet_connection_sock *icsk;</div><div class='ctx'> 	struct sock *sk, *result = NULL;</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='ctx'> 	int score, hiscore = 0;</div><div class='del'>-	u32 phash = 0;</div><div class='ctx'> </div><div class='del'>-	inet_lhash2_for_each_icsk_rcu(icsk, &amp;ilb2-&gt;head) {</div><div class='del'>-		sk = (struct sock *)icsk;</div><div class='del'>-		score = compute_score(sk, net, hnum, daddr,</div><div class='del'>-				      dif, sdif, exact_dif);</div><div class='add'>+	sk_nulls_for_each_rcu(sk, node, &amp;ilb2-&gt;nulls_head) {</div><div class='add'>+		score = compute_score(sk, net, hnum, daddr, dif, sdif);</div><div class='ctx'> 		if (score &gt; hiscore) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				phash = inet_ehashfn(net, daddr, hnum,</div><div class='del'>-						     saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, phash,</div><div class='del'>-							       skb, doff);</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='add'>+			result = inet_lookup_reuseport(net, sk, skb, doff,</div><div class='add'>+						       saddr, sport, daddr, hnum, inet_ehashfn);</div><div class='add'>+			if (result)</div><div class='add'>+				return result;</div><div class='add'>+</div><div class='ctx'> 			result = sk;</div><div class='ctx'> 			hiscore = score;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -296,33 +437,51 @@ static struct sock *inet_lhash2_lookup(struct net *net,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sock *__inet_lookup_listener(struct net *net,</div><div class='del'>-				    struct inet_hashinfo *hashinfo,</div><div class='add'>+struct sock *inet_lookup_run_sk_lookup(const struct net *net,</div><div class='add'>+				       int protocol,</div><div class='add'>+				       struct sk_buff *skb, int doff,</div><div class='add'>+				       __be32 saddr, __be16 sport,</div><div class='add'>+				       __be32 daddr, u16 hnum, const int dif,</div><div class='add'>+				       inet_ehashfn_t *ehashfn)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk, *reuse_sk;</div><div class='add'>+	bool no_reuseport;</div><div class='add'>+</div><div class='add'>+	no_reuseport = bpf_sk_lookup_run_v4(net, protocol, saddr, sport,</div><div class='add'>+					    daddr, hnum, dif, &amp;sk);</div><div class='add'>+	if (no_reuseport || IS_ERR_OR_NULL(sk))</div><div class='add'>+		return sk;</div><div class='add'>+</div><div class='add'>+	reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum,</div><div class='add'>+					 ehashfn);</div><div class='add'>+	if (reuse_sk)</div><div class='add'>+		sk = reuse_sk;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sock *__inet_lookup_listener(const struct net *net,</div><div class='ctx'> 				    struct sk_buff *skb, int doff,</div><div class='ctx'> 				    const __be32 saddr, __be16 sport,</div><div class='ctx'> 				    const __be32 daddr, const unsigned short hnum,</div><div class='ctx'> 				    const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hash = inet_lhashfn(net, hnum);</div><div class='del'>-	struct inet_listen_hashbucket *ilb = &amp;hashinfo-&gt;listening_hash[hash];</div><div class='del'>-	bool exact_dif = inet_exact_dif_match(net, skb);</div><div class='ctx'> 	struct inet_listen_hashbucket *ilb2;</div><div class='del'>-	struct sock *sk, *result = NULL;</div><div class='del'>-	int score, hiscore = 0;</div><div class='add'>+	struct inet_hashinfo *hashinfo;</div><div class='add'>+	struct sock *result = NULL;</div><div class='ctx'> 	unsigned int hash2;</div><div class='del'>-	u32 phash = 0;</div><div class='del'>-</div><div class='del'>-	if (ilb-&gt;count &lt;= 10 || !hashinfo-&gt;lhash2)</div><div class='del'>-		goto port_lookup;</div><div class='ctx'> </div><div class='del'>-	/* Too many sk in the ilb bucket (which is hashed by port alone).</div><div class='del'>-	 * Try lhash2 (which is hashed by port and addr) instead.</div><div class='del'>-	 */</div><div class='add'>+	/* Lookup redirect from BPF */</div><div class='add'>+	if (static_branch_unlikely(&amp;bpf_sk_lookup_enabled)) {</div><div class='add'>+		result = inet_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,</div><div class='add'>+						   saddr, sport, daddr, hnum, dif,</div><div class='add'>+						   inet_ehashfn);</div><div class='add'>+		if (result)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	hashinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	hash2 = ipv4_portaddr_hash(net, daddr, hnum);</div><div class='ctx'> 	ilb2 = inet_lhash2_bucket(hashinfo, hash2);</div><div class='del'>-	if (ilb2-&gt;count &gt; ilb-&gt;count)</div><div class='del'>-		goto port_lookup;</div><div class='ctx'> </div><div class='ctx'> 	result = inet_lhash2_lookup(net, ilb2, skb, doff,</div><div class='ctx'> 				    saddr, sport, daddr, hnum,</div><div class='hunk'>@@ -331,36 +490,14 @@ struct sock *__inet_lookup_listener(struct net *net,</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* Lookup lhash2 with INADDR_ANY */</div><div class='del'>-</div><div class='ctx'> 	hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum);</div><div class='ctx'> 	ilb2 = inet_lhash2_bucket(hashinfo, hash2);</div><div class='del'>-	if (ilb2-&gt;count &gt; ilb-&gt;count)</div><div class='del'>-		goto port_lookup;</div><div class='ctx'> </div><div class='ctx'> 	result = inet_lhash2_lookup(net, ilb2, skb, doff,</div><div class='del'>-				    saddr, sport, daddr, hnum,</div><div class='add'>+				    saddr, sport, htonl(INADDR_ANY), hnum,</div><div class='ctx'> 				    dif, sdif);</div><div class='del'>-	goto done;</div><div class='del'>-</div><div class='del'>-port_lookup:</div><div class='del'>-	sk_for_each_rcu(sk, &amp;ilb-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, hnum, daddr,</div><div class='del'>-				      dif, sdif, exact_dif);</div><div class='del'>-		if (score &gt; hiscore) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				phash = inet_ehashfn(net, daddr, hnum,</div><div class='del'>-						     saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, phash,</div><div class='del'>-							       skb, doff);</div><div class='del'>-				if (result)</div><div class='del'>-					goto done;</div><div class='del'>-			}</div><div class='del'>-			result = sk;</div><div class='del'>-			hiscore = score;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> done:</div><div class='del'>-	if (unlikely(IS_ERR(result)))</div><div class='add'>+	if (IS_ERR(result))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -387,34 +524,33 @@ void sock_edemux(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sock_edemux);</div><div class='ctx'> </div><div class='del'>-struct sock *__inet_lookup_established(struct net *net,</div><div class='del'>-				  struct inet_hashinfo *hashinfo,</div><div class='del'>-				  const __be32 saddr, const __be16 sport,</div><div class='del'>-				  const __be32 daddr, const u16 hnum,</div><div class='del'>-				  const int dif, const int sdif)</div><div class='add'>+struct sock *__inet_lookup_established(const struct net *net,</div><div class='add'>+				       const __be32 saddr, const __be16 sport,</div><div class='add'>+				       const __be32 daddr, const u16 hnum,</div><div class='add'>+				       const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	INET_ADDR_COOKIE(acookie, saddr, daddr);</div><div class='ctx'> 	const __portpair ports = INET_COMBINED_PORTS(sport, hnum);</div><div class='del'>-	struct sock *sk;</div><div class='add'>+	INET_ADDR_COOKIE(acookie, saddr, daddr);</div><div class='ctx'> 	const struct hlist_nulls_node *node;</div><div class='del'>-	/* Optimize here for direct hit, only listening connections can</div><div class='del'>-	 * have wildcards anyways.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int hash = inet_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='del'>-	unsigned int slot = hash &amp; hashinfo-&gt;ehash_mask;</div><div class='del'>-	struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[slot];</div><div class='add'>+	struct inet_ehash_bucket *head;</div><div class='add'>+	struct inet_hashinfo *hashinfo;</div><div class='add'>+	unsigned int hash, slot;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	hashinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	hash = inet_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='add'>+	slot = hash &amp; hashinfo-&gt;ehash_mask;</div><div class='add'>+	head = &amp;hashinfo-&gt;ehash[slot];</div><div class='ctx'> </div><div class='ctx'> begin:</div><div class='ctx'> 	sk_nulls_for_each_rcu(sk, node, &amp;head-&gt;chain) {</div><div class='ctx'> 		if (sk-&gt;sk_hash != hash)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (likely(INET_MATCH(sk, net, acookie,</div><div class='del'>-				      saddr, daddr, ports, dif, sdif))) {</div><div class='add'>+		if (likely(inet_match(net, sk, acookie, ports, dif, sdif))) {</div><div class='ctx'> 			if (unlikely(!refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)))</div><div class='ctx'> 				goto out;</div><div class='del'>-			if (unlikely(!INET_MATCH(sk, net, acookie,</div><div class='del'>-						 saddr, daddr, ports,</div><div class='del'>-						 dif, sdif))) {</div><div class='add'>+			if (unlikely(!inet_match(net, sk, acookie,</div><div class='add'>+						 ports, dif, sdif))) {</div><div class='ctx'> 				sock_gen_put(sk);</div><div class='ctx'> 				goto begin;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -438,7 +574,9 @@ EXPORT_SYMBOL_GPL(__inet_lookup_established);</div><div class='ctx'> /* called with local bh disabled */</div><div class='ctx'> static int __inet_check_established(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 				    struct sock *sk, __u16 lport,</div><div class='del'>-				    struct inet_timewait_sock **twp)</div><div class='add'>+				    struct inet_timewait_sock **twp,</div><div class='add'>+				    bool rcu_lookup,</div><div class='add'>+				    u32 hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_hashinfo *hinfo = death_row-&gt;hashinfo;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='hunk'>@@ -449,25 +587,35 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 	int sdif = l3mdev_master_ifindex_by_index(net, dif);</div><div class='ctx'> 	INET_ADDR_COOKIE(acookie, saddr, daddr);</div><div class='ctx'> 	const __portpair ports = INET_COMBINED_PORTS(inet-&gt;inet_dport, lport);</div><div class='del'>-	unsigned int hash = inet_ehashfn(net, daddr, lport,</div><div class='del'>-					 saddr, inet-&gt;inet_dport);</div><div class='ctx'> 	struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);</div><div class='del'>-	spinlock_t *lock = inet_ehash_lockp(hinfo, hash);</div><div class='del'>-	struct sock *sk2;</div><div class='del'>-	const struct hlist_nulls_node *node;</div><div class='ctx'> 	struct inet_timewait_sock *tw = NULL;</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct sock *sk2;</div><div class='add'>+	spinlock_t *lock;</div><div class='ctx'> </div><div class='add'>+	if (rcu_lookup) {</div><div class='add'>+		sk_nulls_for_each(sk2, node, &amp;head-&gt;chain) {</div><div class='add'>+			if (sk2-&gt;sk_hash != hash ||</div><div class='add'>+			    !inet_match(net, sk2, acookie, ports, dif, sdif))</div><div class='add'>+				continue;</div><div class='add'>+			if (sk2-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+				break;</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lock = inet_ehash_lockp(hinfo, hash);</div><div class='ctx'> 	spin_lock(lock);</div><div class='ctx'> </div><div class='ctx'> 	sk_nulls_for_each(sk2, node, &amp;head-&gt;chain) {</div><div class='ctx'> 		if (sk2-&gt;sk_hash != hash)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (likely(INET_MATCH(sk2, net, acookie,</div><div class='del'>-					 saddr, daddr, ports, dif, sdif))) {</div><div class='add'>+		if (likely(inet_match(net, sk2, acookie, ports, dif, sdif))) {</div><div class='ctx'> 			if (sk2-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='ctx'> 				tw = inet_twsk(sk2);</div><div class='del'>-				if (twsk_unique(sk, sk2, twp))</div><div class='add'>+				if (tcp_twsk_unique(sk, sk2, twp))</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 			goto not_unique;</div><div class='hunk'>@@ -502,7 +650,7 @@ not_unique:</div><div class='ctx'> 	return -EADDRNOTAVAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 inet_sk_port_offset(const struct sock *sk)</div><div class='add'>+static u64 inet_sk_port_offset(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -511,14 +659,54 @@ static u32 inet_sk_port_offset(const struct sock *sk)</div><div class='ctx'> 					  inet-&gt;inet_dport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* insert a socket into ehash, and eventually remove another one</div><div class='del'>- * (The another one can be a SYN_RECV or TIMEWAIT</div><div class='add'>+/* Searches for an exsiting socket in the ehash bucket list.</div><div class='add'>+ * Returns true if found, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-bool inet_ehash_insert(struct sock *sk, struct sock *osk)</div><div class='add'>+static bool inet_ehash_lookup_by_sk(struct sock *sk,</div><div class='add'>+				    struct hlist_nulls_head *list)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hashinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	struct hlist_nulls_head *list;</div><div class='add'>+	const __portpair ports = INET_COMBINED_PORTS(sk-&gt;sk_dport, sk-&gt;sk_num);</div><div class='add'>+	const int sdif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	const int dif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct sock *esk;</div><div class='add'>+</div><div class='add'>+	INET_ADDR_COOKIE(acookie, sk-&gt;sk_daddr, sk-&gt;sk_rcv_saddr);</div><div class='add'>+</div><div class='add'>+	sk_nulls_for_each_rcu(esk, node, list) {</div><div class='add'>+		if (esk-&gt;sk_hash != sk-&gt;sk_hash)</div><div class='add'>+			continue;</div><div class='add'>+		if (sk-&gt;sk_family == AF_INET) {</div><div class='add'>+			if (unlikely(inet_match(net, esk, acookie,</div><div class='add'>+						ports, dif, sdif))) {</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		else if (sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+			if (unlikely(inet6_match(net, esk,</div><div class='add'>+						 &amp;sk-&gt;sk_v6_daddr,</div><div class='add'>+						 &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+						 ports, dif, sdif))) {</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Insert a socket into ehash, and eventually remove another one</div><div class='add'>+ * (The another one can be a SYN_RECV or TIMEWAIT)</div><div class='add'>+ * If an existing socket already exists, socket sk is not inserted,</div><div class='add'>+ * and sets found_dup_sk parameter to true.</div><div class='add'>+ */</div><div class='add'>+bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);</div><div class='ctx'> 	struct inet_ehash_bucket *head;</div><div class='add'>+	struct hlist_nulls_head *list;</div><div class='ctx'> 	spinlock_t *lock;</div><div class='ctx'> 	bool ret = true;</div><div class='ctx'> </div><div class='hunk'>@@ -532,44 +720,56 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk)</div><div class='ctx'> 	spin_lock(lock);</div><div class='ctx'> 	if (osk) {</div><div class='ctx'> 		WARN_ON_ONCE(sk-&gt;sk_hash != osk-&gt;sk_hash);</div><div class='del'>-		ret = sk_nulls_del_node_init_rcu(osk);</div><div class='add'>+		ret = sk_nulls_replace_node_init_rcu(osk, sk);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (found_dup_sk) {</div><div class='add'>+		*found_dup_sk = inet_ehash_lookup_by_sk(sk, list);</div><div class='add'>+		if (*found_dup_sk)</div><div class='add'>+			ret = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		__sk_nulls_add_node_rcu(sk, list);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='ctx'> 	spin_unlock(lock);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool inet_ehash_nolisten(struct sock *sk, struct sock *osk)</div><div class='add'>+bool inet_ehash_nolisten(struct sock *sk, struct sock *osk, bool *found_dup_sk)</div><div class='ctx'> {</div><div class='del'>-	bool ok = inet_ehash_insert(sk, osk);</div><div class='add'>+	bool ok = inet_ehash_insert(sk, osk, found_dup_sk);</div><div class='ctx'> </div><div class='ctx'> 	if (ok) {</div><div class='ctx'> 		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		percpu_counter_inc(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='add'>+		tcp_orphan_count_inc();</div><div class='ctx'> 		inet_sk_set_state(sk, TCP_CLOSE);</div><div class='ctx'> 		sock_set_flag(sk, SOCK_DEAD);</div><div class='ctx'> 		inet_csk_destroy_sock(sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ok;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_ehash_nolisten);</div><div class='add'>+EXPORT_IPV6_MOD(inet_ehash_nolisten);</div><div class='ctx'> </div><div class='ctx'> static int inet_reuseport_add_sock(struct sock *sk,</div><div class='ctx'> 				   struct inet_listen_hashbucket *ilb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_bind_bucket *tb = inet_csk(sk)-&gt;icsk_bind_hash;</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='ctx'> 	struct sock *sk2;</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='ctx'> </div><div class='del'>-	sk_for_each_rcu(sk2, &amp;ilb-&gt;head) {</div><div class='add'>+	sk_nulls_for_each_rcu(sk2, node, &amp;ilb-&gt;nulls_head) {</div><div class='ctx'> 		if (sk2 != sk &amp;&amp;</div><div class='ctx'> 		    sk2-&gt;sk_family == sk-&gt;sk_family &amp;&amp;</div><div class='ctx'> 		    ipv6_only_sock(sk2) == ipv6_only_sock(sk) &amp;&amp;</div><div class='ctx'> 		    sk2-&gt;sk_bound_dev_if == sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='ctx'> 		    inet_csk(sk2)-&gt;icsk_bind_hash == tb &amp;&amp;</div><div class='del'>-		    sk2-&gt;sk_reuseport &amp;&amp; uid_eq(uid, sock_i_uid(sk2)) &amp;&amp;</div><div class='add'>+		    sk2-&gt;sk_reuseport &amp;&amp; uid_eq(uid, sk_uid(sk2)) &amp;&amp;</div><div class='ctx'> 		    inet_rcv_saddr_equal(sk, sk2, false))</div><div class='ctx'> 			return reuseport_add_sock(sk, sk2,</div><div class='ctx'> 						  inet_rcv_saddr_any(sk));</div><div class='hunk'>@@ -578,195 +778,451 @@ static int inet_reuseport_add_sock(struct sock *sk,</div><div class='ctx'> 	return reuseport_alloc(sk, inet_rcv_saddr_any(sk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __inet_hash(struct sock *sk, struct sock *osk)</div><div class='add'>+int inet_hash(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hashinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	struct inet_listen_hashbucket *ilb;</div><div class='add'>+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	struct inet_listen_hashbucket *ilb2;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_LISTEN) {</div><div class='del'>-		inet_ehash_nolisten(sk, osk);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		inet_ehash_nolisten(sk, NULL, NULL);</div><div class='add'>+		local_bh_enable();</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN_ON(!sk_unhashed(sk));</div><div class='del'>-	ilb = &amp;hashinfo-&gt;listening_hash[inet_sk_listen_hashfn(sk)];</div><div class='add'>+	ilb2 = inet_lhash2_bucket_sk(hashinfo, sk);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ilb-&gt;lock);</div><div class='add'>+	spin_lock(&amp;ilb2-&gt;lock);</div><div class='ctx'> 	if (sk-&gt;sk_reuseport) {</div><div class='del'>-		err = inet_reuseport_add_sock(sk, ilb);</div><div class='add'>+		err = inet_reuseport_add_sock(sk, ilb2);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 	}</div><div class='add'>+	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; sk-&gt;sk_reuseport &amp;&amp;</div><div class='ctx'> 		sk-&gt;sk_family == AF_INET6)</div><div class='del'>-		hlist_add_tail_rcu(&amp;sk-&gt;sk_node, &amp;ilb-&gt;head);</div><div class='add'>+		__sk_nulls_add_node_tail_rcu(sk, &amp;ilb2-&gt;nulls_head);</div><div class='ctx'> 	else</div><div class='del'>-		hlist_add_head_rcu(&amp;sk-&gt;sk_node, &amp;ilb-&gt;head);</div><div class='del'>-	inet_hash2(hashinfo, sk);</div><div class='del'>-	ilb-&gt;count++;</div><div class='del'>-	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+		__sk_nulls_add_node_rcu(sk, &amp;ilb2-&gt;nulls_head);</div><div class='ctx'> 	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock(&amp;ilb-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;ilb2-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__inet_hash);</div><div class='add'>+EXPORT_IPV6_MOD(inet_hash);</div><div class='ctx'> </div><div class='del'>-int inet_hash(struct sock *sk)</div><div class='add'>+void inet_unhash(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		err = __inet_hash(sk, NULL);</div><div class='del'>-		local_bh_enable();</div><div class='add'>+	if (sk_unhashed(sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sock_rps_delete_flow(sk);</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN) {</div><div class='add'>+		struct inet_listen_hashbucket *ilb2;</div><div class='add'>+</div><div class='add'>+		ilb2 = inet_lhash2_bucket_sk(hashinfo, sk);</div><div class='add'>+		/* Don't disable bottom halves while acquiring the lock to</div><div class='add'>+		 * avoid circular locking dependency on PREEMPT_RT.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;ilb2-&gt;lock);</div><div class='add'>+		if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='add'>+			reuseport_stop_listen_sock(sk);</div><div class='add'>+</div><div class='add'>+		__sk_nulls_del_node_init_rcu(sk);</div><div class='add'>+		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='add'>+		spin_unlock(&amp;ilb2-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		spinlock_t *lock = inet_ehash_lockp(hashinfo, sk-&gt;sk_hash);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(lock);</div><div class='add'>+		__sk_nulls_del_node_init_rcu(sk);</div><div class='add'>+		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='add'>+		spin_unlock_bh(lock);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(inet_unhash);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+static bool inet_bind2_bucket_match(const struct inet_bind2_bucket *tb,</div><div class='add'>+				    const struct net *net, unsigned short port,</div><div class='add'>+				    int l3mdev, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (!net_eq(ib2_net(tb), net) || tb-&gt;port != port ||</div><div class='add'>+	    tb-&gt;l3mdev != l3mdev)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return inet_bind2_bucket_addr_match(tb, sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_hash);</div><div class='ctx'> </div><div class='del'>-void inet_unhash(struct sock *sk)</div><div class='add'>+bool inet_bind2_bucket_match_addr_any(const struct inet_bind2_bucket *tb, const struct net *net,</div><div class='add'>+				      unsigned short port, int l3mdev, const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct inet_hashinfo *hashinfo = sk-&gt;sk_prot-&gt;h.hashinfo;</div><div class='del'>-	struct inet_listen_hashbucket *ilb = NULL;</div><div class='del'>-	spinlock_t *lock;</div><div class='add'>+	if (!net_eq(ib2_net(tb), net) || tb-&gt;port != port ||</div><div class='add'>+	    tb-&gt;l3mdev != l3mdev)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (sk_unhashed(sk))</div><div class='del'>-		return;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (tb-&gt;addr_type == IPV6_ADDR_ANY)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_state == TCP_LISTEN) {</div><div class='del'>-		ilb = &amp;hashinfo-&gt;listening_hash[inet_sk_listen_hashfn(sk)];</div><div class='del'>-		lock = &amp;ilb-&gt;lock;</div><div class='del'>-	} else {</div><div class='del'>-		lock = inet_ehash_lockp(hashinfo, sk-&gt;sk_hash);</div><div class='add'>+	if (tb-&gt;addr_type != IPV6_ADDR_MAPPED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6 &amp;&amp;</div><div class='add'>+	    !ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+		return false;</div><div class='add'>+#endif</div><div class='add'>+	return tb-&gt;rcv_saddr == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The socket's bhash2 hashbucket spinlock must be held when this is called */</div><div class='add'>+struct inet_bind2_bucket *</div><div class='add'>+inet_bind2_bucket_find(const struct inet_bind_hashbucket *head, const struct net *net,</div><div class='add'>+		       unsigned short port, int l3mdev, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct inet_bind2_bucket *bhash2 = NULL;</div><div class='add'>+</div><div class='add'>+	inet_bind_bucket_for_each(bhash2, &amp;head-&gt;chain)</div><div class='add'>+		if (inet_bind2_bucket_match(bhash2, net, port, l3mdev, sk))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return bhash2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct inet_bind_hashbucket *</div><div class='add'>+inet_bhash2_addr_any_hashbucket(const struct sock *sk, const struct net *net, int port)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		hash = ipv6_portaddr_hash(net, &amp;in6addr_any, port);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		hash = ipv4_portaddr_hash(net, 0, port);</div><div class='add'>+</div><div class='add'>+	return &amp;hinfo-&gt;bhash2[hash &amp; (hinfo-&gt;bhash_size - 1)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inet_update_saddr(struct sock *sk, void *saddr, int family)</div><div class='add'>+{</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		inet_sk(sk)-&gt;inet_saddr = *(__be32 *)saddr;</div><div class='add'>+		sk_rcv_saddr_set(sk, inet_sk(sk)-&gt;inet_saddr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_bh(lock);</div><div class='del'>-	if (sk_unhashed(sk))</div><div class='del'>-		goto unlock;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else {</div><div class='add'>+		sk-&gt;sk_v6_rcv_saddr = *(struct in6_addr *)saddr;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='del'>-		reuseport_detach_sock(sk);</div><div class='del'>-	if (ilb) {</div><div class='del'>-		inet_unhash2(hashinfo, sk);</div><div class='del'>-		 __sk_del_node_init(sk);</div><div class='del'>-		 ilb-&gt;count--;</div><div class='del'>-	} else {</div><div class='del'>-		__sk_nulls_del_node_init_rcu(sk);</div><div class='add'>+static int __inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family, bool reset)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='add'>+	struct inet_bind2_bucket *tb2, *new_tb2;</div><div class='add'>+	int l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+	int port = inet_sk(sk)-&gt;inet_num;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	int bhash;</div><div class='add'>+</div><div class='add'>+	if (!inet_csk(sk)-&gt;icsk_bind2_hash) {</div><div class='add'>+		/* Not bind()ed before. */</div><div class='add'>+		if (reset)</div><div class='add'>+			inet_reset_saddr(sk);</div><div class='add'>+		else</div><div class='add'>+			inet_update_saddr(sk, saddr, family);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_bh(lock);</div><div class='add'>+</div><div class='add'>+	/* Allocate a bind2 bucket ahead of time to avoid permanently putting</div><div class='add'>+	 * the bhash2 table in an inconsistent state if a new tb2 bucket</div><div class='add'>+	 * allocation fails.</div><div class='add'>+	 */</div><div class='add'>+	new_tb2 = kmem_cache_alloc(hinfo-&gt;bind2_bucket_cachep, GFP_ATOMIC);</div><div class='add'>+	if (!new_tb2) {</div><div class='add'>+		if (reset) {</div><div class='add'>+			/* The (INADDR_ANY, port) bucket might have already</div><div class='add'>+			 * been freed, then we cannot fixup icsk_bind2_hash,</div><div class='add'>+			 * so we give up and unlink sk from bhash/bhash2 not</div><div class='add'>+			 * to leave inconsistency in bhash2.</div><div class='add'>+			 */</div><div class='add'>+			inet_put_port(sk);</div><div class='add'>+			inet_reset_saddr(sk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bhash = inet_bhashfn(net, port, hinfo-&gt;bhash_size);</div><div class='add'>+	head = &amp;hinfo-&gt;bhash[bhash];</div><div class='add'>+	head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);</div><div class='add'>+</div><div class='add'>+	/* If we change saddr locklessly, another thread</div><div class='add'>+	 * iterating over bhash might see corrupted address.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;head-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+	__sk_del_bind_node(sk);</div><div class='add'>+	inet_bind2_bucket_destroy(hinfo-&gt;bind2_bucket_cachep, inet_csk(sk)-&gt;icsk_bind2_hash);</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (reset)</div><div class='add'>+		inet_reset_saddr(sk);</div><div class='add'>+	else</div><div class='add'>+		inet_update_saddr(sk, saddr, family);</div><div class='add'>+</div><div class='add'>+	head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+	tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk);</div><div class='add'>+	if (!tb2) {</div><div class='add'>+		tb2 = new_tb2;</div><div class='add'>+		inet_bind2_bucket_init(tb2, net, head2, inet_csk(sk)-&gt;icsk_bind_hash, sk);</div><div class='add'>+		if (sk_is_connect_bind(sk)) {</div><div class='add'>+			tb2-&gt;fastreuse = -1;</div><div class='add'>+			tb2-&gt;fastreuseport = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	inet_csk(sk)-&gt;icsk_bind2_hash = tb2;</div><div class='add'>+	sk_add_bind_node(sk, &amp;tb2-&gt;owners);</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;head-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (tb2 != new_tb2)</div><div class='add'>+		kmem_cache_free(hinfo-&gt;bind2_bucket_cachep, new_tb2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family)</div><div class='add'>+{</div><div class='add'>+	return __inet_bhash2_update_saddr(sk, saddr, family, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(inet_bhash2_update_saddr);</div><div class='add'>+</div><div class='add'>+void inet_bhash2_reset_saddr(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK))</div><div class='add'>+		__inet_bhash2_update_saddr(sk, NULL, 0, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_unhash);</div><div class='add'>+EXPORT_IPV6_MOD(inet_bhash2_reset_saddr);</div><div class='add'>+</div><div class='add'>+/* RFC 6056 3.3.4.  Algorithm 4: Double-Hash Port Selection Algorithm</div><div class='add'>+ * Note that we use 32bit integers (vs RFC 'short integers')</div><div class='add'>+ * because 2^16 is not a multiple of num_ephemeral and this</div><div class='add'>+ * property might be used by clever attacker.</div><div class='add'>+ *</div><div class='add'>+ * RFC claims using TABLE_LENGTH=10 buckets gives an improvement, though</div><div class='add'>+ * attacks were since demonstrated, thus we use 65536 by default instead</div><div class='add'>+ * to really give more isolation and privacy, at the expense of 256kB</div><div class='add'>+ * of kernel memory.</div><div class='add'>+ */</div><div class='add'>+#define INET_TABLE_PERTURB_SIZE (1 &lt;&lt; CONFIG_INET_TABLE_PERTURB_ORDER)</div><div class='add'>+static u32 *table_perturb;</div><div class='ctx'> </div><div class='ctx'> int __inet_hash_connect(struct inet_timewait_death_row *death_row,</div><div class='del'>-		struct sock *sk, u32 port_offset,</div><div class='add'>+		struct sock *sk, u64 port_offset,</div><div class='add'>+		u32 hash_port0,</div><div class='ctx'> 		int (*check_established)(struct inet_timewait_death_row *,</div><div class='del'>-			struct sock *, __u16, struct inet_timewait_sock **))</div><div class='add'>+			struct sock *, __u16, struct inet_timewait_sock **,</div><div class='add'>+			bool rcu_lookup, u32 hash))</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_hashinfo *hinfo = death_row-&gt;hashinfo;</div><div class='add'>+	struct inet_bind_hashbucket *head, *head2;</div><div class='ctx'> 	struct inet_timewait_sock *tw = NULL;</div><div class='del'>-	struct inet_bind_hashbucket *head;</div><div class='ctx'> 	int port = inet_sk(sk)-&gt;inet_num;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct inet_bind2_bucket *tb2;</div><div class='ctx'> 	struct inet_bind_bucket *tb;</div><div class='add'>+	bool tb_created = false;</div><div class='ctx'> 	u32 remaining, offset;</div><div class='ctx'> 	int ret, i, low, high;</div><div class='del'>-	static u32 hint;</div><div class='add'>+	bool local_ports;</div><div class='add'>+	int step, l3mdev;</div><div class='add'>+	u32 index;</div><div class='ctx'> </div><div class='ctx'> 	if (port) {</div><div class='del'>-		head = &amp;hinfo-&gt;bhash[inet_bhashfn(net, port,</div><div class='del'>-						  hinfo-&gt;bhash_size)];</div><div class='del'>-		tb = inet_csk(sk)-&gt;icsk_bind_hash;</div><div class='del'>-		spin_lock_bh(&amp;head-&gt;lock);</div><div class='del'>-		if (sk_head(&amp;tb-&gt;owners) == sk &amp;&amp; !sk-&gt;sk_bind_node.next) {</div><div class='del'>-			inet_ehash_nolisten(sk, NULL);</div><div class='del'>-			spin_unlock_bh(&amp;head-&gt;lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;head-&gt;lock);</div><div class='del'>-		/* No definite answer... Walk to established hash table */</div><div class='del'>-		ret = check_established(death_row, sk, port, NULL);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		ret = check_established(death_row, sk, port, NULL, false,</div><div class='add'>+					hash_port0 + port);</div><div class='ctx'> 		local_bh_enable();</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inet_get_local_port_range(net, &amp;low, &amp;high);</div><div class='add'>+	l3mdev = inet_sk_bound_l3mdev(sk);</div><div class='add'>+</div><div class='add'>+	local_ports = inet_sk_get_local_port_range(sk, &amp;low, &amp;high);</div><div class='add'>+	step = local_ports ? 1 : 2;</div><div class='add'>+</div><div class='ctx'> 	high++; /* [32768, 60999] -&gt; [32768, 61000[ */</div><div class='ctx'> 	remaining = high - low;</div><div class='del'>-	if (likely(remaining &gt; 1))</div><div class='add'>+	if (!local_ports &amp;&amp; remaining &gt; 1)</div><div class='ctx'> 		remaining &amp;= ~1U;</div><div class='ctx'> </div><div class='del'>-	offset = (hint + port_offset) % remaining;</div><div class='add'>+	get_random_sleepable_once(table_perturb,</div><div class='add'>+				  INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb));</div><div class='add'>+	index = port_offset &amp; (INET_TABLE_PERTURB_SIZE - 1);</div><div class='add'>+</div><div class='add'>+	offset = READ_ONCE(table_perturb[index]) + (port_offset &gt;&gt; 32);</div><div class='add'>+	offset %= remaining;</div><div class='add'>+</div><div class='ctx'> 	/* In first pass we try ports of @low parity.</div><div class='ctx'> 	 * inet_csk_get_port() does the opposite choice.</div><div class='ctx'> 	 */</div><div class='del'>-	offset &amp;= ~1U;</div><div class='add'>+	if (!local_ports)</div><div class='add'>+		offset &amp;= ~1U;</div><div class='ctx'> other_parity_scan:</div><div class='ctx'> 	port = low + offset;</div><div class='del'>-	for (i = 0; i &lt; remaining; i += 2, port += 2) {</div><div class='add'>+	for (i = 0; i &lt; remaining; i += step, port += step) {</div><div class='ctx'> 		if (unlikely(port &gt;= high))</div><div class='ctx'> 			port -= remaining;</div><div class='ctx'> 		if (inet_is_local_reserved_port(net, port))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		head = &amp;hinfo-&gt;bhash[inet_bhashfn(net, port,</div><div class='ctx'> 						  hinfo-&gt;bhash_size)];</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		hlist_for_each_entry_rcu(tb, &amp;head-&gt;chain, node) {</div><div class='add'>+			if (!inet_bind_bucket_match(tb, net, port, l3mdev))</div><div class='add'>+				continue;</div><div class='add'>+			if (tb-&gt;fastreuse &gt;= 0 || tb-&gt;fastreuseport &gt;= 0) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				goto next_port;</div><div class='add'>+			}</div><div class='add'>+			if (!check_established(death_row, sk, port, &amp;tw, true,</div><div class='add'>+					       hash_port0 + port))</div><div class='add'>+				break;</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			goto next_port;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 		spin_lock_bh(&amp;head-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/* Does not bother with rcv_saddr checks, because</div><div class='ctx'> 		 * the established check is already unique enough.</div><div class='ctx'> 		 */</div><div class='ctx'> 		inet_bind_bucket_for_each(tb, &amp;head-&gt;chain) {</div><div class='del'>-			if (net_eq(ib_net(tb), net) &amp;&amp; tb-&gt;port == port) {</div><div class='add'>+			if (inet_bind_bucket_match(tb, net, port, l3mdev)) {</div><div class='ctx'> 				if (tb-&gt;fastreuse &gt;= 0 ||</div><div class='ctx'> 				    tb-&gt;fastreuseport &gt;= 0)</div><div class='del'>-					goto next_port;</div><div class='del'>-				WARN_ON(hlist_empty(&amp;tb-&gt;owners));</div><div class='add'>+					goto next_port_unlock;</div><div class='add'>+				WARN_ON(hlist_empty(&amp;tb-&gt;bhash2));</div><div class='ctx'> 				if (!check_established(death_row, sk,</div><div class='del'>-						       port, &amp;tw))</div><div class='add'>+						       port, &amp;tw, false,</div><div class='add'>+						       hash_port0 + port))</div><div class='ctx'> 					goto ok;</div><div class='del'>-				goto next_port;</div><div class='add'>+				goto next_port_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tb = inet_bind_bucket_create(hinfo-&gt;bind_bucket_cachep,</div><div class='del'>-					     net, head, port);</div><div class='add'>+					     net, head, port, l3mdev);</div><div class='ctx'> 		if (!tb) {</div><div class='ctx'> 			spin_unlock_bh(&amp;head-&gt;lock);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='add'>+		tb_created = true;</div><div class='ctx'> 		tb-&gt;fastreuse = -1;</div><div class='ctx'> 		tb-&gt;fastreuseport = -1;</div><div class='ctx'> 		goto ok;</div><div class='del'>-next_port:</div><div class='add'>+next_port_unlock:</div><div class='ctx'> 		spin_unlock_bh(&amp;head-&gt;lock);</div><div class='add'>+next_port:</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	offset++;</div><div class='del'>-	if ((offset &amp; 1) &amp;&amp; remaining &gt; 1)</div><div class='del'>-		goto other_parity_scan;</div><div class='del'>-</div><div class='add'>+	if (!local_ports) {</div><div class='add'>+		offset++;</div><div class='add'>+		if ((offset &amp; 1) &amp;&amp; remaining &gt; 1)</div><div class='add'>+			goto other_parity_scan;</div><div class='add'>+	}</div><div class='ctx'> 	return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> ok:</div><div class='del'>-	hint += i + 2;</div><div class='add'>+	/* Find the corresponding tb2 bucket since we need to</div><div class='add'>+	 * add the socket to the bhash2 table as well</div><div class='add'>+	 */</div><div class='add'>+	head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);</div><div class='add'>+	spin_lock(&amp;head2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk);</div><div class='add'>+	if (!tb2) {</div><div class='add'>+		tb2 = inet_bind2_bucket_create(hinfo-&gt;bind2_bucket_cachep, net,</div><div class='add'>+					       head2, tb, sk);</div><div class='add'>+		if (!tb2)</div><div class='add'>+			goto error;</div><div class='add'>+		tb2-&gt;fastreuse = -1;</div><div class='add'>+		tb2-&gt;fastreuseport = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Here we want to add a little bit of randomness to the next source</div><div class='add'>+	 * port that will be chosen. We use a max() with a random here so that</div><div class='add'>+	 * on low contention the randomness is maximal and on high contention</div><div class='add'>+	 * it may be inexistent.</div><div class='add'>+	 */</div><div class='add'>+	i = max_t(int, i, get_random_u32_below(8) * step);</div><div class='add'>+	WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + i + step);</div><div class='ctx'> </div><div class='ctx'> 	/* Head lock still held and bh's disabled */</div><div class='del'>-	inet_bind_hash(sk, tb, port);</div><div class='add'>+	inet_bind_hash(sk, tb, tb2, port);</div><div class='add'>+	sk-&gt;sk_userlocks |= SOCK_CONNECT_BIND;</div><div class='add'>+</div><div class='ctx'> 	if (sk_unhashed(sk)) {</div><div class='ctx'> 		inet_sk(sk)-&gt;inet_sport = htons(port);</div><div class='del'>-		inet_ehash_nolisten(sk, (struct sock *)tw);</div><div class='add'>+		inet_ehash_nolisten(sk, (struct sock *)tw, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tw)</div><div class='ctx'> 		inet_twsk_bind_unhash(tw, hinfo);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (tw)</div><div class='ctx'> 		inet_twsk_deschedule_put(tw);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (sk_hashed(sk)) {</div><div class='add'>+		spinlock_t *lock = inet_ehash_lockp(hinfo, sk-&gt;sk_hash);</div><div class='add'>+</div><div class='add'>+		sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='add'>+</div><div class='add'>+		spin_lock(lock);</div><div class='add'>+		__sk_nulls_del_node_init_rcu(sk);</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+		sk-&gt;sk_hash = 0;</div><div class='add'>+		inet_sk(sk)-&gt;inet_sport = 0;</div><div class='add'>+		inet_sk(sk)-&gt;inet_num = 0;</div><div class='add'>+</div><div class='add'>+		if (tw)</div><div class='add'>+			inet_twsk_bind_unhash(tw, hinfo);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;head2-&gt;lock);</div><div class='add'>+	if (tb_created)</div><div class='add'>+		inet_bind_bucket_destroy(tb);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (tw)</div><div class='add'>+		inet_twsk_deschedule_put(tw);</div><div class='add'>+</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -775,36 +1231,37 @@ ok:</div><div class='ctx'> int inet_hash_connect(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 		      struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	u32 port_offset = 0;</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct net *net = sock_net(sk);</div><div class='add'>+	u64 port_offset = 0;</div><div class='add'>+	u32 hash_port0;</div><div class='ctx'> </div><div class='ctx'> 	if (!inet_sk(sk)-&gt;inet_num)</div><div class='ctx'> 		port_offset = inet_sk_port_offset(sk);</div><div class='del'>-	return __inet_hash_connect(death_row, sk, port_offset,</div><div class='add'>+</div><div class='add'>+	hash_port0 = inet_ehashfn(net, inet-&gt;inet_rcv_saddr, 0,</div><div class='add'>+				  inet-&gt;inet_daddr, inet-&gt;inet_dport);</div><div class='add'>+</div><div class='add'>+	return __inet_hash_connect(death_row, sk, port_offset, hash_port0,</div><div class='ctx'> 				   __inet_check_established);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_hash_connect);</div><div class='ctx'> </div><div class='del'>-void inet_hashinfo_init(struct inet_hashinfo *h)</div><div class='add'>+static void init_hashinfo_lhash2(struct inet_hashinfo *h)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; INET_LHTABLE_SIZE; i++) {</div><div class='del'>-		spin_lock_init(&amp;h-&gt;listening_hash[i].lock);</div><div class='del'>-		INIT_HLIST_HEAD(&amp;h-&gt;listening_hash[i].head);</div><div class='del'>-		h-&gt;listening_hash[i].count = 0;</div><div class='add'>+	for (i = 0; i &lt;= h-&gt;lhash2_mask; i++) {</div><div class='add'>+		spin_lock_init(&amp;h-&gt;lhash2[i].lock);</div><div class='add'>+		INIT_HLIST_NULLS_HEAD(&amp;h-&gt;lhash2[i].nulls_head,</div><div class='add'>+				      i + LISTENING_NULLS_BASE);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	h-&gt;lhash2 = NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_hashinfo_init);</div><div class='ctx'> </div><div class='ctx'> void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,</div><div class='ctx'> 				unsigned long numentries, int scale,</div><div class='ctx'> 				unsigned long low_limit,</div><div class='ctx'> 				unsigned long high_limit)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='ctx'> 	h-&gt;lhash2 = alloc_large_system_hash(name,</div><div class='ctx'> 					    sizeof(*h-&gt;lhash2),</div><div class='ctx'> 					    numentries,</div><div class='hunk'>@@ -814,35 +1271,111 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,</div><div class='ctx'> 					    &amp;h-&gt;lhash2_mask,</div><div class='ctx'> 					    low_limit,</div><div class='ctx'> 					    high_limit);</div><div class='add'>+	init_hashinfo_lhash2(h);</div><div class='add'>+</div><div class='add'>+	/* this one is used for source ports of outgoing connections */</div><div class='add'>+	table_perturb = alloc_large_system_hash("Table-perturb",</div><div class='add'>+						sizeof(*table_perturb),</div><div class='add'>+						INET_TABLE_PERTURB_SIZE,</div><div class='add'>+						0, 0, NULL, NULL,</div><div class='add'>+						INET_TABLE_PERTURB_SIZE,</div><div class='add'>+						INET_TABLE_PERTURB_SIZE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= h-&gt;lhash2_mask; i++) {</div><div class='del'>-		spin_lock_init(&amp;h-&gt;lhash2[i].lock);</div><div class='del'>-		INIT_HLIST_HEAD(&amp;h-&gt;lhash2[i].head);</div><div class='del'>-		h-&gt;lhash2[i].count = 0;</div><div class='del'>-	}</div><div class='add'>+int inet_hashinfo2_init_mod(struct inet_hashinfo *h)</div><div class='add'>+{</div><div class='add'>+	h-&gt;lhash2 = kmalloc_array(INET_LHTABLE_SIZE, sizeof(*h-&gt;lhash2), GFP_KERNEL);</div><div class='add'>+	if (!h-&gt;lhash2)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	h-&gt;lhash2_mask = INET_LHTABLE_SIZE - 1;</div><div class='add'>+	/* INET_LHTABLE_SIZE must be a power of 2 */</div><div class='add'>+	BUG_ON(INET_LHTABLE_SIZE &amp; h-&gt;lhash2_mask);</div><div class='add'>+</div><div class='add'>+	init_hashinfo_lhash2(h);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int locksz = sizeof(spinlock_t);</div><div class='ctx'> 	unsigned int i, nblocks = 1;</div><div class='add'>+	spinlock_t *ptr = NULL;</div><div class='ctx'> </div><div class='del'>-	if (locksz != 0) {</div><div class='del'>-		/* allocate 2 cache lines or at least one spinlock per cpu */</div><div class='del'>-		nblocks = max(2U * L1_CACHE_BYTES / locksz, 1U);</div><div class='del'>-		nblocks = roundup_pow_of_two(nblocks * num_possible_cpus());</div><div class='add'>+	if (locksz == 0)</div><div class='add'>+		goto set_mask;</div><div class='ctx'> </div><div class='del'>-		/* no more locks than number of hash buckets */</div><div class='del'>-		nblocks = min(nblocks, hashinfo-&gt;ehash_mask + 1);</div><div class='add'>+	/* Allocate 2 cache lines or at least one spinlock per cpu. */</div><div class='add'>+	nblocks = max(2U * L1_CACHE_BYTES / locksz, 1U) * num_possible_cpus();</div><div class='ctx'> </div><div class='del'>-		hashinfo-&gt;ehash_locks = kvmalloc_array(nblocks, locksz, GFP_KERNEL);</div><div class='del'>-		if (!hashinfo-&gt;ehash_locks)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	/* At least one page per NUMA node. */</div><div class='add'>+	nblocks = max(nblocks, num_online_nodes() * PAGE_SIZE / locksz);</div><div class='add'>+</div><div class='add'>+	nblocks = roundup_pow_of_two(nblocks);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; nblocks; i++)</div><div class='del'>-			spin_lock_init(&amp;hashinfo-&gt;ehash_locks[i]);</div><div class='add'>+	/* No more locks than number of hash buckets. */</div><div class='add'>+	nblocks = min(nblocks, hashinfo-&gt;ehash_mask + 1);</div><div class='add'>+</div><div class='add'>+	if (num_online_nodes() &gt; 1) {</div><div class='add'>+		/* Use vmalloc() to allow NUMA policy to spread pages</div><div class='add'>+		 * on all available nodes if desired.</div><div class='add'>+		 */</div><div class='add'>+		ptr = vmalloc_array(nblocks, locksz);</div><div class='add'>+	}</div><div class='add'>+	if (!ptr) {</div><div class='add'>+		ptr = kvmalloc_array(nblocks, locksz, GFP_KERNEL);</div><div class='add'>+		if (!ptr)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	for (i = 0; i &lt; nblocks; i++)</div><div class='add'>+		spin_lock_init(&amp;ptr[i]);</div><div class='add'>+	hashinfo-&gt;ehash_locks = ptr;</div><div class='add'>+set_mask:</div><div class='ctx'> 	hashinfo-&gt;ehash_locks_mask = nblocks - 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_ehash_locks_alloc);</div><div class='add'>+</div><div class='add'>+struct inet_hashinfo *inet_pernet_hashinfo_alloc(struct inet_hashinfo *hashinfo,</div><div class='add'>+						 unsigned int ehash_entries)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *new_hashinfo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	new_hashinfo = kmemdup(hashinfo, sizeof(*hashinfo), GFP_KERNEL);</div><div class='add'>+	if (!new_hashinfo)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	new_hashinfo-&gt;ehash = vmalloc_huge(ehash_entries * sizeof(struct inet_ehash_bucket),</div><div class='add'>+					   GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!new_hashinfo-&gt;ehash)</div><div class='add'>+		goto free_hashinfo;</div><div class='add'>+</div><div class='add'>+	new_hashinfo-&gt;ehash_mask = ehash_entries - 1;</div><div class='add'>+</div><div class='add'>+	if (inet_ehash_locks_alloc(new_hashinfo))</div><div class='add'>+		goto free_ehash;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ehash_entries; i++)</div><div class='add'>+		INIT_HLIST_NULLS_HEAD(&amp;new_hashinfo-&gt;ehash[i].chain, i);</div><div class='add'>+</div><div class='add'>+	new_hashinfo-&gt;pernet = true;</div><div class='add'>+</div><div class='add'>+	return new_hashinfo;</div><div class='add'>+</div><div class='add'>+free_ehash:</div><div class='add'>+	vfree(new_hashinfo-&gt;ehash);</div><div class='add'>+free_hashinfo:</div><div class='add'>+	kfree(new_hashinfo);</div><div class='add'>+err:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void inet_pernet_hashinfo_free(struct inet_hashinfo *hashinfo)</div><div class='add'>+{</div><div class='add'>+	if (!hashinfo-&gt;pernet)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	inet_ehash_locks_free(hashinfo);</div><div class='add'>+	vfree(hashinfo-&gt;ehash);</div><div class='add'>+	kfree(hashinfo);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c<br/>index 88c5069b5d20..d4c781a0667f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_timewait_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inet_timewait_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inet_timewait_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inet_timewait_sock.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -14,7 +15,8 @@</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/inet_timewait_sock.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	inet_twsk_bind_unhash - unhash a timewait socket from bind hash</div><div class='hunk'>@@ -28,14 +30,18 @@</div><div class='ctx'> void inet_twsk_bind_unhash(struct inet_timewait_sock *tw,</div><div class='ctx'> 			  struct inet_hashinfo *hashinfo)</div><div class='ctx'> {</div><div class='add'>+	struct inet_bind2_bucket *tb2 = tw-&gt;tw_tb2;</div><div class='ctx'> 	struct inet_bind_bucket *tb = tw-&gt;tw_tb;</div><div class='ctx'> </div><div class='ctx'> 	if (!tb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	__hlist_del(&amp;tw-&gt;tw_bind_node);</div><div class='add'>+	__sk_del_bind_node((struct sock *)tw);</div><div class='ctx'> 	tw-&gt;tw_tb = NULL;</div><div class='del'>-	inet_bind_bucket_destroy(hashinfo-&gt;bind_bucket_cachep, tb);</div><div class='add'>+	tw-&gt;tw_tb2 = NULL;</div><div class='add'>+	inet_bind2_bucket_destroy(hashinfo-&gt;bind2_bucket_cachep, tb2);</div><div class='add'>+	inet_bind_bucket_destroy(tb);</div><div class='add'>+</div><div class='ctx'> 	__sock_put((struct sock *)tw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +50,7 @@ static void inet_twsk_kill(struct inet_timewait_sock *tw)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_hashinfo *hashinfo = tw-&gt;tw_dr-&gt;hashinfo;</div><div class='ctx'> 	spinlock_t *lock = inet_ehash_lockp(hashinfo, tw-&gt;tw_hash);</div><div class='del'>-	struct inet_bind_hashbucket *bhead;</div><div class='add'>+	struct inet_bind_hashbucket *bhead, *bhead2;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(lock);</div><div class='ctx'> 	sk_nulls_del_node_init_rcu((struct sock *)tw);</div><div class='hunk'>@@ -53,22 +59,24 @@ static void inet_twsk_kill(struct inet_timewait_sock *tw)</div><div class='ctx'> 	/* Disassociate with bind bucket. */</div><div class='ctx'> 	bhead = &amp;hashinfo-&gt;bhash[inet_bhashfn(twsk_net(tw), tw-&gt;tw_num,</div><div class='ctx'> 			hashinfo-&gt;bhash_size)];</div><div class='add'>+	bhead2 = inet_bhashfn_portaddr(hashinfo, (struct sock *)tw,</div><div class='add'>+				       twsk_net(tw), tw-&gt;tw_num);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;bhead-&gt;lock);</div><div class='add'>+	spin_lock(&amp;bhead2-&gt;lock);</div><div class='ctx'> 	inet_twsk_bind_unhash(tw, hashinfo);</div><div class='add'>+	spin_unlock(&amp;bhead2-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;bhead-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	atomic_dec(&amp;tw-&gt;tw_dr-&gt;tw_count);</div><div class='add'>+	refcount_dec(&amp;tw-&gt;tw_dr-&gt;tw_refcount);</div><div class='ctx'> 	inet_twsk_put(tw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void inet_twsk_free(struct inet_timewait_sock *tw)</div><div class='ctx'> {</div><div class='ctx'> 	struct module *owner = tw-&gt;tw_prot-&gt;owner;</div><div class='del'>-	twsk_destructor((struct sock *)tw);</div><div class='del'>-#ifdef SOCK_REFCNT_DEBUG</div><div class='del'>-	pr_debug("%s timewait_sock %p released\n", tw-&gt;tw_prot-&gt;name, tw);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	tcp_twsk_destructor((struct sock *)tw);</div><div class='ctx'> 	kmem_cache_free(tw-&gt;tw_prot-&gt;twsk_prot-&gt;twsk_slab, tw);</div><div class='ctx'> 	module_put(owner);</div><div class='ctx'> }</div><div class='hunk'>@@ -80,74 +88,80 @@ void inet_twsk_put(struct inet_timewait_sock *tw)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet_twsk_put);</div><div class='ctx'> </div><div class='del'>-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,</div><div class='del'>-				   struct hlist_nulls_head *list)</div><div class='add'>+static void inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo)</div><div class='ctx'> {</div><div class='del'>-	hlist_nulls_add_head_rcu(&amp;tw-&gt;tw_node, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,</div><div class='del'>-				    struct hlist_head *list)</div><div class='del'>-{</div><div class='del'>-	hlist_add_head(&amp;tw-&gt;tw_bind_node, list);</div><div class='add'>+	__inet_twsk_schedule(tw, timeo, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Enter the time wait state. This is called with locally disabled BH.</div><div class='add'>+ * Enter the time wait state.</div><div class='ctx'>  * Essentially we whip up a timewait bucket, copy the relevant info into it</div><div class='ctx'>  * from the SK, and mess with hash chains and list linkage.</div><div class='add'>+ *</div><div class='add'>+ * The caller must not access @tw anymore after this function returns.</div><div class='ctx'>  */</div><div class='del'>-void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,</div><div class='del'>-			   struct inet_hashinfo *hashinfo)</div><div class='add'>+void inet_twsk_hashdance_schedule(struct inet_timewait_sock *tw,</div><div class='add'>+				  struct sock *sk,</div><div class='add'>+				  struct inet_hashinfo *hashinfo,</div><div class='add'>+				  int timeo)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct inet_ehash_bucket *ehead = inet_ehash_bucket(hashinfo, sk-&gt;sk_hash);</div><div class='ctx'> 	spinlock_t *lock = inet_ehash_lockp(hashinfo, sk-&gt;sk_hash);</div><div class='del'>-	struct inet_bind_hashbucket *bhead;</div><div class='del'>-	/* Step 1: Put TW into bind hash. Original socket stays there too.</div><div class='del'>-	   Note, that any socket with inet-&gt;num != 0 MUST be bound in</div><div class='del'>-	   binding cache, even if it is closed.</div><div class='add'>+	struct inet_bind_hashbucket *bhead, *bhead2;</div><div class='add'>+</div><div class='add'>+	/* Put TW into bind hash. Original socket stays there too.</div><div class='add'>+	 * Note, that any socket with inet-&gt;num != 0 MUST be bound in</div><div class='add'>+	 * binding cache, even if it is closed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bhead = &amp;hashinfo-&gt;bhash[inet_bhashfn(twsk_net(tw), inet-&gt;inet_num,</div><div class='ctx'> 			hashinfo-&gt;bhash_size)];</div><div class='add'>+	bhead2 = inet_bhashfn_portaddr(hashinfo, sk, twsk_net(tw), inet-&gt;inet_num);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='ctx'> 	spin_lock(&amp;bhead-&gt;lock);</div><div class='add'>+	spin_lock(&amp;bhead2-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	tw-&gt;tw_tb = icsk-&gt;icsk_bind_hash;</div><div class='ctx'> 	WARN_ON(!icsk-&gt;icsk_bind_hash);</div><div class='del'>-	inet_twsk_add_bind_node(tw, &amp;tw-&gt;tw_tb-&gt;owners);</div><div class='del'>-	spin_unlock(&amp;bhead-&gt;lock);</div><div class='del'>-</div><div class='del'>-	spin_lock(lock);</div><div class='ctx'> </div><div class='del'>-	inet_twsk_add_node_rcu(tw, &amp;ehead-&gt;chain);</div><div class='add'>+	tw-&gt;tw_tb2 = icsk-&gt;icsk_bind2_hash;</div><div class='add'>+	WARN_ON(!icsk-&gt;icsk_bind2_hash);</div><div class='add'>+	sk_add_bind_node((struct sock *)tw, &amp;tw-&gt;tw_tb2-&gt;owners);</div><div class='ctx'> </div><div class='del'>-	/* Step 3: Remove SK from hash chain */</div><div class='del'>-	if (__sk_nulls_del_node_init_rcu(sk))</div><div class='del'>-		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='add'>+	spin_unlock(&amp;bhead2-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;bhead-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(lock);</div><div class='add'>+	spin_lock(lock);</div><div class='ctx'> </div><div class='ctx'> 	/* tw_refcnt is set to 3 because we have :</div><div class='ctx'> 	 * - one reference for bhash chain.</div><div class='ctx'> 	 * - one reference for ehash chain.</div><div class='ctx'> 	 * - one reference for timer.</div><div class='del'>-	 * We can use atomic_set() because prior spin_lock()/spin_unlock()</div><div class='del'>-	 * committed into memory all tw fields.</div><div class='ctx'> 	 * Also note that after this point, we lost our implicit reference</div><div class='ctx'> 	 * so we are not allowed to use tw anymore.</div><div class='ctx'> 	 */</div><div class='ctx'> 	refcount_set(&amp;tw-&gt;tw_refcnt, 3);</div><div class='add'>+</div><div class='add'>+	/* Ensure tw_refcnt has been set before tw is published.</div><div class='add'>+	 * smp_wmb() provides the necessary memory barrier to enforce this</div><div class='add'>+	 * ordering.</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	hlist_nulls_replace_init_rcu(&amp;sk-&gt;sk_nulls_node, &amp;tw-&gt;tw_node);</div><div class='add'>+	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='add'>+</div><div class='add'>+	inet_twsk_schedule(tw, timeo);</div><div class='add'>+</div><div class='add'>+	spin_unlock(lock);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_twsk_hashdance);</div><div class='ctx'> </div><div class='ctx'> static void tw_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_timewait_sock *tw = from_timer(tw, t, tw_timer);</div><div class='add'>+	struct inet_timewait_sock *tw = timer_container_of(tw, t, tw_timer);</div><div class='ctx'> </div><div class='del'>-	if (tw-&gt;tw_kill)</div><div class='del'>-		__NET_INC_STATS(twsk_net(tw), LINUX_MIB_TIMEWAITKILLED);</div><div class='del'>-	else</div><div class='del'>-		__NET_INC_STATS(twsk_net(tw), LINUX_MIB_TIMEWAITED);</div><div class='ctx'> 	inet_twsk_kill(tw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +171,8 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_timewait_sock *tw;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;dr-&gt;tw_count) &gt;= dr-&gt;sysctl_max_tw_buckets)</div><div class='add'>+	if (refcount_read(&amp;dr-&gt;tw_refcount) - 1 &gt;=</div><div class='add'>+	    READ_ONCE(dr-&gt;sysctl_max_tw_buckets))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	tw = kmem_cache_alloc(sk-&gt;sk_prot_creator-&gt;twsk_prot-&gt;twsk_slab,</div><div class='hunk'>@@ -181,11 +196,15 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,</div><div class='ctx'> 		tw-&gt;tw_reuseport    = sk-&gt;sk_reuseport;</div><div class='ctx'> 		tw-&gt;tw_hash	    = sk-&gt;sk_hash;</div><div class='ctx'> 		tw-&gt;tw_ipv6only	    = 0;</div><div class='del'>-		tw-&gt;tw_transparent  = inet-&gt;transparent;</div><div class='add'>+		tw-&gt;tw_transparent  = inet_test_bit(TRANSPARENT, sk);</div><div class='add'>+		tw-&gt;tw_connect_bind = !!(sk-&gt;sk_userlocks &amp; SOCK_CONNECT_BIND);</div><div class='ctx'> 		tw-&gt;tw_prot	    = sk-&gt;sk_prot_creator;</div><div class='ctx'> 		atomic64_set(&amp;tw-&gt;tw_cookie, atomic64_read(&amp;sk-&gt;sk_cookie));</div><div class='ctx'> 		twsk_net_set(tw, sock_net(sk));</div><div class='del'>-		timer_setup(&amp;tw-&gt;tw_timer, tw_timer_handler, TIMER_PINNED);</div><div class='add'>+		timer_setup(&amp;tw-&gt;tw_timer, tw_timer_handler, 0);</div><div class='add'>+#ifdef CONFIG_SOCK_VALIDATE_XMIT</div><div class='add'>+		tw-&gt;tw_validate_xmit_skb = NULL;</div><div class='add'>+#endif</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Because we use RCU lookups, we should not set tw_refcnt</div><div class='ctx'> 		 * to a non null value before everything is setup for this</div><div class='hunk'>@@ -194,11 +213,11 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,</div><div class='ctx'> 		refcount_set(&amp;tw-&gt;tw_refcnt, 0);</div><div class='ctx'> </div><div class='ctx'> 		__module_get(tw-&gt;tw_prot-&gt;owner);</div><div class='add'>+		psp_twsk_init(tw, sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return tw;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_twsk_alloc);</div><div class='ctx'> </div><div class='ctx'> /* These are always called from BH context.  See callers in</div><div class='ctx'>  * tcp_input.c to verify this.</div><div class='hunk'>@@ -210,7 +229,34 @@ EXPORT_SYMBOL_GPL(inet_twsk_alloc);</div><div class='ctx'>  */</div><div class='ctx'> void inet_twsk_deschedule_put(struct inet_timewait_sock *tw)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer_sync(&amp;tw-&gt;tw_timer))</div><div class='add'>+	struct inet_hashinfo *hashinfo = tw-&gt;tw_dr-&gt;hashinfo;</div><div class='add'>+	spinlock_t *lock = inet_ehash_lockp(hashinfo, tw-&gt;tw_hash);</div><div class='add'>+</div><div class='add'>+	/* inet_twsk_purge() walks over all sockets, including tw ones,</div><div class='add'>+	 * and removes them via inet_twsk_deschedule_put() after a</div><div class='add'>+	 * refcount_inc_not_zero().</div><div class='add'>+	 *</div><div class='add'>+	 * inet_twsk_hashdance_schedule() must (re)init the refcount before</div><div class='add'>+	 * arming the timer, i.e. inet_twsk_purge can obtain a reference to</div><div class='add'>+	 * a twsk that did not yet schedule the timer.</div><div class='add'>+	 *</div><div class='add'>+	 * The ehash lock synchronizes these two:</div><div class='add'>+	 * After acquiring the lock, the timer is always scheduled (else</div><div class='add'>+	 * timer_shutdown returns false), because hashdance_schedule releases</div><div class='add'>+	 * the ehash lock only after completing the timer initialization.</div><div class='add'>+	 *</div><div class='add'>+	 * Without grabbing the ehash lock, we get:</div><div class='add'>+	 * 1) cpu x sets twsk refcount to 3</div><div class='add'>+	 * 2) cpu y bumps refcount to 4</div><div class='add'>+	 * 3) cpu y calls inet_twsk_deschedule_put() and shuts timer down</div><div class='add'>+	 * 4) cpu x tries to start timer, but mod_timer is a noop post-shutdown</div><div class='add'>+	 * -&gt; timer refcount is never decremented.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+	/*  Makes sure hashdance_schedule() has completed */</div><div class='add'>+	spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+	if (timer_shutdown_sync(&amp;tw-&gt;tw_timer))</div><div class='ctx'> 		inet_twsk_kill(tw);</div><div class='ctx'> 	inet_twsk_put(tw);</div><div class='ctx'> }</div><div class='hunk'>@@ -243,49 +289,63 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm)</div><div class='ctx'> 	 * of PAWS.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	tw-&gt;tw_kill = timeo &lt;= 4*HZ;</div><div class='ctx'> 	if (!rearm) {</div><div class='add'>+		bool kill = timeo &lt;= 4*HZ;</div><div class='add'>+</div><div class='add'>+		__NET_INC_STATS(twsk_net(tw), kill ? LINUX_MIB_TIMEWAITKILLED :</div><div class='add'>+						     LINUX_MIB_TIMEWAITED);</div><div class='ctx'> 		BUG_ON(mod_timer(&amp;tw-&gt;tw_timer, jiffies + timeo));</div><div class='del'>-		atomic_inc(&amp;tw-&gt;tw_dr-&gt;tw_count);</div><div class='add'>+		refcount_inc(&amp;tw-&gt;tw_dr-&gt;tw_refcount);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mod_timer_pending(&amp;tw-&gt;tw_timer, jiffies + timeo);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__inet_twsk_schedule);</div><div class='ctx'> </div><div class='del'>-void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family)</div><div class='add'>+/* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */</div><div class='add'>+void inet_twsk_purge(struct inet_hashinfo *hashinfo)</div><div class='ctx'> {</div><div class='del'>-	struct inet_timewait_sock *tw;</div><div class='del'>-	struct sock *sk;</div><div class='add'>+	struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[0];</div><div class='add'>+	unsigned int ehash_mask = hashinfo-&gt;ehash_mask;</div><div class='ctx'> 	struct hlist_nulls_node *node;</div><div class='ctx'> 	unsigned int slot;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	for (slot = 0; slot &lt;= ehash_mask; slot++, head++) {</div><div class='add'>+		if (hlist_nulls_empty(&amp;head-&gt;chain))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	for (slot = 0; slot &lt;= hashinfo-&gt;ehash_mask; slot++) {</div><div class='del'>-		struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[slot];</div><div class='ctx'> restart_rcu:</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> restart:</div><div class='ctx'> 		sk_nulls_for_each_rcu(sk, node, &amp;head-&gt;chain) {</div><div class='del'>-			if (sk-&gt;sk_state != TCP_TIME_WAIT)</div><div class='add'>+			int state = inet_sk_state_load(sk);</div><div class='add'>+</div><div class='add'>+			if ((1 &lt;&lt; state) &amp; ~(TCPF_TIME_WAIT |</div><div class='add'>+					     TCPF_NEW_SYN_RECV))</div><div class='ctx'> 				continue;</div><div class='del'>-			tw = inet_twsk(sk);</div><div class='del'>-			if ((tw-&gt;tw_family != family) ||</div><div class='del'>-				refcount_read(&amp;twsk_net(tw)-&gt;count))</div><div class='add'>+</div><div class='add'>+			if (check_net(sock_net(sk)))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (unlikely(!refcount_inc_not_zero(&amp;tw-&gt;tw_refcnt)))</div><div class='add'>+			if (unlikely(!refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (unlikely((tw-&gt;tw_family != family) ||</div><div class='del'>-				     refcount_read(&amp;twsk_net(tw)-&gt;count))) {</div><div class='del'>-				inet_twsk_put(tw);</div><div class='add'>+			if (check_net(sock_net(sk))) {</div><div class='add'>+				sock_gen_put(sk);</div><div class='ctx'> 				goto restart;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			local_bh_disable();</div><div class='del'>-			inet_twsk_deschedule_put(tw);</div><div class='add'>+			if (state == TCP_TIME_WAIT) {</div><div class='add'>+				inet_twsk_deschedule_put(inet_twsk(sk));</div><div class='add'>+			} else {</div><div class='add'>+				struct request_sock *req = inet_reqsk(sk);</div><div class='add'>+</div><div class='add'>+				inet_csk_reqsk_queue_drop_and_put(req-&gt;rsk_listener,</div><div class='add'>+								  req);</div><div class='add'>+			}</div><div class='ctx'> 			local_bh_enable();</div><div class='ctx'> 			goto restart_rcu;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -298,4 +358,3 @@ restart:</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_twsk_purge);</div><div class='head'>diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c<br/>index d757b9642d0d..7b1e0a2d6906 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/inetpeer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/inetpeer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/inetpeer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/inetpeer.c</a></div><div class='hunk'>@@ -60,12 +60,12 @@ void inet_peer_base_init(struct inet_peer_base *bp)</div><div class='ctx'> 	seqlock_init(&amp;bp-&gt;lock);</div><div class='ctx'> 	bp-&gt;total = 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_peer_base_init);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(inet_peer_base_init);</div><div class='ctx'> </div><div class='ctx'> #define PEER_MAX_GC 32</div><div class='ctx'> </div><div class='ctx'> /* Exported for sysctl_net_ipv4.  */</div><div class='del'>-int inet_peer_threshold __read_mostly = 65536 + 128;	/* start to throw entries more</div><div class='add'>+int inet_peer_threshold __read_mostly;	/* start to throw entries more</div><div class='ctx'> 					 * aggressively at this stage */</div><div class='ctx'> int inet_peer_minttl __read_mostly = 120 * HZ;	/* TTL under high load: 120 sec */</div><div class='ctx'> int inet_peer_maxttl __read_mostly = 10 * 60 * HZ;	/* usual time to live: 10 min */</div><div class='hunk'>@@ -73,25 +73,15 @@ int inet_peer_maxttl __read_mostly = 10 * 60 * HZ;	/* usual time to live: 10 min</div><div class='ctx'> /* Called from ip_output.c:ip_init  */</div><div class='ctx'> void __init inet_initpeers(void)</div><div class='ctx'> {</div><div class='del'>-	struct sysinfo si;</div><div class='add'>+	u64 nr_entries;</div><div class='ctx'> </div><div class='del'>-	/* Use the straight interface to information about memory. */</div><div class='del'>-	si_meminfo(&amp;si);</div><div class='del'>-	/* The values below were suggested by Alexey Kuznetsov</div><div class='del'>-	 * &lt;kuznet@ms2.inr.ac.ru&gt;.  I don't have any opinion about the values</div><div class='del'>-	 * myself.  --SAW</div><div class='del'>-	 */</div><div class='del'>-	if (si.totalram &lt;= (32768*1024)/PAGE_SIZE)</div><div class='del'>-		inet_peer_threshold &gt;&gt;= 1; /* max pool size about 1MB on IA32 */</div><div class='del'>-	if (si.totalram &lt;= (16384*1024)/PAGE_SIZE)</div><div class='del'>-		inet_peer_threshold &gt;&gt;= 1; /* about 512KB */</div><div class='del'>-	if (si.totalram &lt;= (8192*1024)/PAGE_SIZE)</div><div class='del'>-		inet_peer_threshold &gt;&gt;= 2; /* about 128KB */</div><div class='del'>-</div><div class='del'>-	peer_cachep = kmem_cache_create("inet_peer_cache",</div><div class='del'>-			sizeof(struct inet_peer),</div><div class='del'>-			0, SLAB_HWCACHE_ALIGN | SLAB_PANIC,</div><div class='del'>-			NULL);</div><div class='add'>+	 /* 1% of physical memory */</div><div class='add'>+	nr_entries = div64_ul((u64)totalram_pages() &lt;&lt; PAGE_SHIFT,</div><div class='add'>+			      100 * L1_CACHE_ALIGN(sizeof(struct inet_peer)));</div><div class='add'>+</div><div class='add'>+	inet_peer_threshold = clamp_val(nr_entries, 4096, 65536 + 128);</div><div class='add'>+</div><div class='add'>+	peer_cachep = KMEM_CACHE(inet_peer, SLAB_HWCACHE_ALIGN | SLAB_PANIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with rcu_read_lock() or base-&gt;lock held */</div><div class='hunk'>@@ -105,6 +95,7 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **pp, *parent, *next;</div><div class='ctx'> 	struct inet_peer *p;</div><div class='add'>+	u32 now;</div><div class='ctx'> </div><div class='ctx'> 	pp = &amp;base-&gt;rb_root.rb_node;</div><div class='ctx'> 	parent = NULL;</div><div class='hunk'>@@ -118,8 +109,9 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,</div><div class='ctx'> 		p = rb_entry(parent, struct inet_peer, rb_node);</div><div class='ctx'> 		cmp = inetpeer_addr_cmp(daddr, &amp;p-&gt;daddr);</div><div class='ctx'> 		if (cmp == 0) {</div><div class='del'>-			if (!refcount_inc_not_zero(&amp;p-&gt;refcnt))</div><div class='del'>-				break;</div><div class='add'>+			now = jiffies;</div><div class='add'>+			if (READ_ONCE(p-&gt;dtime) != now)</div><div class='add'>+				WRITE_ONCE(p-&gt;dtime, now);</div><div class='ctx'> 			return p;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (gc_stack) {</div><div class='hunk'>@@ -138,29 +130,30 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inetpeer_free_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(peer_cachep, container_of(head, struct inet_peer, rcu));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* perform garbage collect on all items stacked during a lookup */</div><div class='ctx'> static void inet_peer_gc(struct inet_peer_base *base,</div><div class='ctx'> 			 struct inet_peer *gc_stack[],</div><div class='ctx'> 			 unsigned int gc_cnt)</div><div class='ctx'> {</div><div class='add'>+	int peer_threshold, peer_maxttl, peer_minttl;</div><div class='ctx'> 	struct inet_peer *p;</div><div class='ctx'> 	__u32 delta, ttl;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (base-&gt;total &gt;= inet_peer_threshold)</div><div class='add'>+	peer_threshold = READ_ONCE(inet_peer_threshold);</div><div class='add'>+	peer_maxttl = READ_ONCE(inet_peer_maxttl);</div><div class='add'>+	peer_minttl = READ_ONCE(inet_peer_minttl);</div><div class='add'>+</div><div class='add'>+	if (base-&gt;total &gt;= peer_threshold)</div><div class='ctx'> 		ttl = 0; /* be aggressive */</div><div class='ctx'> 	else</div><div class='del'>-		ttl = inet_peer_maxttl</div><div class='del'>-				- (inet_peer_maxttl - inet_peer_minttl) / HZ *</div><div class='del'>-					base-&gt;total / inet_peer_threshold * HZ;</div><div class='add'>+		ttl = peer_maxttl - (peer_maxttl - peer_minttl) / HZ *</div><div class='add'>+			base-&gt;total / peer_threshold * HZ;</div><div class='ctx'> 	for (i = 0; i &lt; gc_cnt; i++) {</div><div class='ctx'> 		p = gc_stack[i];</div><div class='del'>-		delta = (__u32)jiffies - p-&gt;dtime;</div><div class='add'>+</div><div class='add'>+		delta = (__u32)jiffies - READ_ONCE(p-&gt;dtime);</div><div class='add'>+</div><div class='ctx'> 		if (delta &lt; ttl || !refcount_dec_if_one(&amp;p-&gt;refcnt))</div><div class='ctx'> 			gc_stack[i] = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -169,36 +162,28 @@ static void inet_peer_gc(struct inet_peer_base *base,</div><div class='ctx'> 		if (p) {</div><div class='ctx'> 			rb_erase(&amp;p-&gt;rb_node, &amp;base-&gt;rb_root);</div><div class='ctx'> 			base-&gt;total--;</div><div class='del'>-			call_rcu(&amp;p-&gt;rcu, inetpeer_free_rcu);</div><div class='add'>+			kfree_rcu(p, rcu);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Must be called under RCU : No refcount change is done here. */</div><div class='ctx'> struct inet_peer *inet_getpeer(struct inet_peer_base *base,</div><div class='del'>-			       const struct inetpeer_addr *daddr,</div><div class='del'>-			       int create)</div><div class='add'>+			       const struct inetpeer_addr *daddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_peer *p, *gc_stack[PEER_MAX_GC];</div><div class='ctx'> 	struct rb_node **pp, *parent;</div><div class='ctx'> 	unsigned int gc_cnt, seq;</div><div class='del'>-	int invalidated;</div><div class='ctx'> </div><div class='ctx'> 	/* Attempt a lockless lookup first.</div><div class='ctx'> 	 * Because of a concurrent writer, we might not find an existing entry.</div><div class='ctx'> 	 */</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	seq = read_seqbegin(&amp;base-&gt;lock);</div><div class='ctx'> 	p = lookup(daddr, base, seq, NULL, &amp;gc_cnt, &amp;parent, &amp;pp);</div><div class='del'>-	invalidated = read_seqretry(&amp;base-&gt;lock, seq);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (p)</div><div class='ctx'> 		return p;</div><div class='ctx'> </div><div class='del'>-	/* If no writer did a change during our lookup, we can return early. */</div><div class='del'>-	if (!create &amp;&amp; !invalidated)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	/* retry an exact lookup, taking the lock before.</div><div class='ctx'> 	 * At least, nodes should be hot in our cache.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -207,15 +192,16 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,</div><div class='ctx'> </div><div class='ctx'> 	gc_cnt = 0;</div><div class='ctx'> 	p = lookup(daddr, base, seq, gc_stack, &amp;gc_cnt, &amp;parent, &amp;pp);</div><div class='del'>-	if (!p &amp;&amp; create) {</div><div class='add'>+	if (!p) {</div><div class='ctx'> 		p = kmem_cache_alloc(peer_cachep, GFP_ATOMIC);</div><div class='ctx'> 		if (p) {</div><div class='ctx'> 			p-&gt;daddr = *daddr;</div><div class='ctx'> 			p-&gt;dtime = (__u32)jiffies;</div><div class='del'>-			refcount_set(&amp;p-&gt;refcnt, 2);</div><div class='add'>+			refcount_set(&amp;p-&gt;refcnt, 1);</div><div class='ctx'> 			atomic_set(&amp;p-&gt;rid, 0);</div><div class='ctx'> 			p-&gt;metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;</div><div class='ctx'> 			p-&gt;rate_tokens = 0;</div><div class='add'>+			p-&gt;n_redirects = 0;</div><div class='ctx'> 			/* 60*HZ is arbitrary, but chosen enough high so that the first</div><div class='ctx'> 			 * calculation of tokens is at its maximum.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -232,16 +218,13 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,</div><div class='ctx'> </div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_getpeer);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(inet_getpeer);</div><div class='ctx'> </div><div class='ctx'> void inet_putpeer(struct inet_peer *p)</div><div class='ctx'> {</div><div class='del'>-	p-&gt;dtime = (__u32)jiffies;</div><div class='del'>-</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;p-&gt;refcnt))</div><div class='del'>-		call_rcu(&amp;p-&gt;rcu, inetpeer_free_rcu);</div><div class='add'>+		kfree_rcu(p, rcu);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet_putpeer);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Check transmit rate limitation for given message.</div><div class='hunk'>@@ -263,26 +246,30 @@ EXPORT_SYMBOL_GPL(inet_putpeer);</div><div class='ctx'> #define XRLIM_BURST_FACTOR 6</div><div class='ctx'> bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout)</div><div class='ctx'> {</div><div class='del'>-	unsigned long now, token;</div><div class='add'>+	unsigned long now, token, otoken, delta;</div><div class='ctx'> 	bool rc = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!peer)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	token = peer-&gt;rate_tokens;</div><div class='add'>+	token = otoken = READ_ONCE(peer-&gt;rate_tokens);</div><div class='ctx'> 	now = jiffies;</div><div class='del'>-	token += now - peer-&gt;rate_last;</div><div class='del'>-	peer-&gt;rate_last = now;</div><div class='del'>-	if (token &gt; XRLIM_BURST_FACTOR * timeout)</div><div class='del'>-		token = XRLIM_BURST_FACTOR * timeout;</div><div class='add'>+	delta = now - READ_ONCE(peer-&gt;rate_last);</div><div class='add'>+	if (delta) {</div><div class='add'>+		WRITE_ONCE(peer-&gt;rate_last, now);</div><div class='add'>+		token += delta;</div><div class='add'>+		if (token &gt; XRLIM_BURST_FACTOR * timeout)</div><div class='add'>+			token = XRLIM_BURST_FACTOR * timeout;</div><div class='add'>+	}</div><div class='ctx'> 	if (token &gt;= timeout) {</div><div class='ctx'> 		token -= timeout;</div><div class='ctx'> 		rc = true;</div><div class='ctx'> 	}</div><div class='del'>-	peer-&gt;rate_tokens = token;</div><div class='add'>+	if (token != otoken)</div><div class='add'>+		WRITE_ONCE(peer-&gt;rate_tokens, token);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_peer_xrlim_allow);</div><div class='add'>+EXPORT_IPV6_MOD(inet_peer_xrlim_allow);</div><div class='ctx'> </div><div class='ctx'> void inetpeer_invalidate_tree(struct inet_peer_base *base)</div><div class='ctx'> {</div><div class='hunk'>@@ -299,4 +286,4 @@ void inetpeer_invalidate_tree(struct inet_peer_base *base)</div><div class='ctx'> </div><div class='ctx'> 	base-&gt;total = 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inetpeer_invalidate_tree);</div><div class='add'>+EXPORT_IPV6_MOD(inetpeer_invalidate_tree);</div><div class='head'>diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c<br/>index 32662e9e5d21..8b65f12583eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_forward.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_forward.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_forward.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_forward.c</a></div><div class='hunk'>@@ -66,12 +66,17 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *s</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_options *opt	= &amp;(IPCB(skb)-&gt;opt);</div><div class='ctx'> </div><div class='del'>-	__IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='del'>-	__IP_ADD_STATS(net, IPSTATS_MIB_OUTOCTETS, skb-&gt;len);</div><div class='add'>+#ifdef CONFIG_NET_SWITCHDEV</div><div class='add'>+	if (skb-&gt;offload_l3_fwd_mark) {</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(opt-&gt;optlen))</div><div class='ctx'> 		ip_forward_options(skb);</div><div class='ctx'> </div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='ctx'> 	return dst_output(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -82,6 +87,7 @@ int ip_forward(struct sk_buff *skb)</div><div class='ctx'> 	struct rtable *rt;	/* Route we use */</div><div class='ctx'> 	struct ip_options *opt	= &amp;(IPCB(skb)-&gt;opt);</div><div class='ctx'> 	struct net *net;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	/* that should never happen */</div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='hunk'>@@ -93,8 +99,10 @@ int ip_forward(struct sk_buff *skb)</div><div class='ctx'> 	if (skb_warn_if_lro(skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (!xfrm4_policy_check(NULL, XFRM_POLICY_FWD, skb))</div><div class='add'>+	if (!xfrm4_policy_check(NULL, XFRM_POLICY_FWD, skb)) {</div><div class='add'>+		SKB_DR_SET(reason, XFRM_POLICY);</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (IPCB(skb)-&gt;opt.router_alert &amp;&amp; ip_call_ra_chain(skb))</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='hunk'>@@ -110,20 +118,25 @@ int ip_forward(struct sk_buff *skb)</div><div class='ctx'> 	if (ip_hdr(skb)-&gt;ttl &lt;= 1)</div><div class='ctx'> 		goto too_many_hops;</div><div class='ctx'> </div><div class='del'>-	if (!xfrm4_route_forward(skb))</div><div class='add'>+	if (!xfrm4_route_forward(skb)) {</div><div class='add'>+		SKB_DR_SET(reason, XFRM_POLICY);</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rt = skb_rtable(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;is_strictroute &amp;&amp; rt-&gt;rt_uses_gateway)</div><div class='ctx'> 		goto sr_failed;</div><div class='ctx'> </div><div class='add'>+	__IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='add'>+</div><div class='ctx'> 	IPCB(skb)-&gt;flags |= IPSKB_FORWARDED;</div><div class='ctx'> 	mtu = ip_dst_mtu_maybe_forward(&amp;rt-&gt;dst, true);</div><div class='ctx'> 	if (ip_exceeds_mtu(skb, mtu)) {</div><div class='ctx'> 		IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);</div><div class='ctx'> 		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='ctx'> 			  htonl(mtu));</div><div class='add'>+		SKB_DR_SET(reason, PKT_TOO_BIG);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +156,7 @@ int ip_forward(struct sk_buff *skb)</div><div class='ctx'> 	    !skb_sec_path(skb))</div><div class='ctx'> 		ip_rt_send_redirect(skb);</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_ip_fwd_update_priority)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_fwd_update_priority))</div><div class='ctx'> 		skb-&gt;priority = rt_tos2priority(iph-&gt;tos);</div><div class='ctx'> </div><div class='ctx'> 	return NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD,</div><div class='hunk'>@@ -161,7 +174,8 @@ too_many_hops:</div><div class='ctx'> 	/* Tell the sender its packet died... */</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> 	icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0);</div><div class='add'>+	SKB_DR_SET(reason, IP_INHDR);</div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c<br/>index e7227128df2c..f7012479713b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_fragment.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_fragment.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_fragment.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_fragment.c</a></div><div class='hunk'>@@ -57,57 +57,6 @@</div><div class='ctx'>  */</div><div class='ctx'> static const char ip_frag_cache_name[] = "ip4-frags";</div><div class='ctx'> </div><div class='del'>-/* Use skb-&gt;cb to track consecutive/adjacent fragments coming at</div><div class='del'>- * the end of the queue. Nodes in the rb-tree queue will</div><div class='del'>- * contain "runs" of one or more adjacent fragments.</div><div class='del'>- *</div><div class='del'>- * Invariants:</div><div class='del'>- * - next_frag is NULL at the tail of a "run";</div><div class='del'>- * - the head of a "run" has the sum of all fragment lengths in frag_run_len.</div><div class='del'>- */</div><div class='del'>-struct ipfrag_skb_cb {</div><div class='del'>-	struct inet_skb_parm	h;</div><div class='del'>-	struct sk_buff		*next_frag;</div><div class='del'>-	int			frag_run_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FRAG_CB(skb)		((struct ipfrag_skb_cb *)((skb)-&gt;cb))</div><div class='del'>-</div><div class='del'>-static void ip4_frag_init_run(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct ipfrag_skb_cb) &gt; sizeof(skb-&gt;cb));</div><div class='del'>-</div><div class='del'>-	FRAG_CB(skb)-&gt;next_frag = NULL;</div><div class='del'>-	FRAG_CB(skb)-&gt;frag_run_len = skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Append skb to the last "run". */</div><div class='del'>-static void ip4_frag_append_to_last_run(struct inet_frag_queue *q,</div><div class='del'>-					struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	RB_CLEAR_NODE(&amp;skb-&gt;rbnode);</div><div class='del'>-	FRAG_CB(skb)-&gt;next_frag = NULL;</div><div class='del'>-</div><div class='del'>-	FRAG_CB(q-&gt;last_run_head)-&gt;frag_run_len += skb-&gt;len;</div><div class='del'>-	FRAG_CB(q-&gt;fragments_tail)-&gt;next_frag = skb;</div><div class='del'>-	q-&gt;fragments_tail = skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Create a new "run" with the skb. */</div><div class='del'>-static void ip4_frag_create_run(struct inet_frag_queue *q, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (q-&gt;last_run_head)</div><div class='del'>-		rb_link_node(&amp;skb-&gt;rbnode, &amp;q-&gt;last_run_head-&gt;rbnode,</div><div class='del'>-			     &amp;q-&gt;last_run_head-&gt;rbnode.rb_right);</div><div class='del'>-	else</div><div class='del'>-		rb_link_node(&amp;skb-&gt;rbnode, NULL, &amp;q-&gt;rb_fragments.rb_node);</div><div class='del'>-	rb_insert_color(&amp;skb-&gt;rbnode, &amp;q-&gt;rb_fragments);</div><div class='del'>-</div><div class='del'>-	ip4_frag_init_run(skb);</div><div class='del'>-	q-&gt;fragments_tail = skb;</div><div class='del'>-	q-&gt;last_run_head = skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Describe an entry in the "incomplete datagrams" queue. */</div><div class='ctx'> struct ipq {</div><div class='ctx'> 	struct inet_frag_queue q;</div><div class='hunk'>@@ -127,23 +76,27 @@ static u8 ip4_frag_ecn(u8 tos)</div><div class='ctx'> static struct inet_frags ip4_frags;</div><div class='ctx'> </div><div class='ctx'> static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,</div><div class='del'>-			 struct sk_buff *prev_tail, struct net_device *dev);</div><div class='add'>+			 struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			 int *refs);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void ip4_frag_init(struct inet_frag_queue *q, const void *a)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipq *qp = container_of(q, struct ipq, q);</div><div class='del'>-	struct netns_ipv4 *ipv4 = container_of(q-&gt;net, struct netns_ipv4,</div><div class='del'>-					       frags);</div><div class='del'>-	struct net *net = container_of(ipv4, struct net, ipv4);</div><div class='del'>-</div><div class='ctx'> 	const struct frag_v4_compare_key *key = a;</div><div class='add'>+	struct net *net = q-&gt;fqdir-&gt;net;</div><div class='add'>+	struct inet_peer *p = NULL;</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;key.v4 = *key;</div><div class='ctx'> 	qp-&gt;ecn = 0;</div><div class='del'>-	qp-&gt;peer = q-&gt;net-&gt;max_dist ?</div><div class='del'>-		inet_getpeer_v4(net-&gt;ipv4.peers, key-&gt;saddr, key-&gt;vif, 1) :</div><div class='del'>-		NULL;</div><div class='add'>+	if (q-&gt;fqdir-&gt;max_dist) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		p = inet_getpeer_v4(net-&gt;ipv4.peers, key-&gt;saddr, key-&gt;vif);</div><div class='add'>+		if (p &amp;&amp; !refcount_inc_not_zero(&amp;p-&gt;refcnt))</div><div class='add'>+			p = NULL;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+	qp-&gt;peer = p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip4_frag_free(struct inet_frag_queue *q)</div><div class='hunk'>@@ -155,22 +108,6 @@ static void ip4_frag_free(struct inet_frag_queue *q)</div><div class='ctx'> 		inet_putpeer(qp-&gt;peer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Destruction primitives. */</div><div class='del'>-</div><div class='del'>-static void ipq_put(struct ipq *ipq)</div><div class='del'>-{</div><div class='del'>-	inet_frag_put(&amp;ipq-&gt;q);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Kill ipq entry. It is not destroyed immediately,</div><div class='del'>- * because caller (and someone more) holds reference count.</div><div class='del'>- */</div><div class='del'>-static void ipq_kill(struct ipq *ipq)</div><div class='del'>-{</div><div class='del'>-	inet_frag_kill(&amp;ipq-&gt;q);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool frag_expire_skip_icmp(u32 user)</div><div class='ctx'> {</div><div class='ctx'> 	return user == IP_DEFRAG_AF_PACKET ||</div><div class='hunk'>@@ -185,23 +122,30 @@ static bool frag_expire_skip_icmp(u32 user)</div><div class='ctx'>  */</div><div class='ctx'> static void ip_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frag_queue *frag = from_timer(frag, t, timer);</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_FRAG_REASM_TIMEOUT;</div><div class='add'>+	struct inet_frag_queue *frag = timer_container_of(frag, t, timer);</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	struct sk_buff *head = NULL;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	struct ipq *qp;</div><div class='del'>-	int err;</div><div class='add'>+	int refs = 1;</div><div class='ctx'> </div><div class='ctx'> 	qp = container_of(frag, struct ipq, q);</div><div class='del'>-	net = container_of(qp-&gt;q.net, struct net, ipv4.frags);</div><div class='add'>+	net = qp-&gt;q.fqdir-&gt;net;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* Paired with WRITE_ONCE() in fqdir_pre_exit(). */</div><div class='add'>+	if (READ_ONCE(qp-&gt;q.fqdir-&gt;dead))</div><div class='add'>+		goto out_rcu_unlock;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;qp-&gt;q.lock);</div><div class='ctx'> </div><div class='ctx'> 	if (qp-&gt;q.flags &amp; INET_FRAG_COMPLETE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ipq_kill(qp);</div><div class='add'>+	qp-&gt;q.flags |= INET_FRAG_DROP;</div><div class='add'>+	inet_frag_kill(&amp;qp-&gt;q, &amp;refs);</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS);</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASMTIMEOUT);</div><div class='ctx'> </div><div class='hunk'>@@ -212,27 +156,9 @@ static void ip_expire(struct timer_list *t)</div><div class='ctx'> 	 * pull the head out of the tree in order to be able to</div><div class='ctx'> 	 * deal with head-&gt;dev.</div><div class='ctx'> 	 */</div><div class='del'>-	if (qp-&gt;q.fragments) {</div><div class='del'>-		head = qp-&gt;q.fragments;</div><div class='del'>-		qp-&gt;q.fragments = head-&gt;next;</div><div class='del'>-	} else {</div><div class='del'>-		head = skb_rb_first(&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-		if (!head)</div><div class='del'>-			goto out;</div><div class='del'>-		if (FRAG_CB(head)-&gt;next_frag)</div><div class='del'>-			rb_replace_node(&amp;head-&gt;rbnode,</div><div class='del'>-					&amp;FRAG_CB(head)-&gt;next_frag-&gt;rbnode,</div><div class='del'>-					&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-		else</div><div class='del'>-			rb_erase(&amp;head-&gt;rbnode, &amp;qp-&gt;q.rb_fragments);</div><div class='del'>-		memset(&amp;head-&gt;rbnode, 0, sizeof(head-&gt;rbnode));</div><div class='del'>-		barrier();</div><div class='del'>-	}</div><div class='del'>-	if (head == qp-&gt;q.fragments_tail)</div><div class='del'>-		qp-&gt;q.fragments_tail = NULL;</div><div class='del'>-</div><div class='del'>-	sub_frag_mem_limit(qp-&gt;q.net, head-&gt;truesize);</div><div class='del'>-</div><div class='add'>+	head = inet_frag_pull_head(&amp;qp-&gt;q);</div><div class='add'>+	if (!head)</div><div class='add'>+		goto out;</div><div class='ctx'> 	head-&gt;dev = dev_get_by_index_rcu(net, qp-&gt;iif);</div><div class='ctx'> 	if (!head-&gt;dev)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -240,14 +166,15 @@ static void ip_expire(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	/* skb has no dst, perform route lookup again */</div><div class='ctx'> 	iph = ip_hdr(head);</div><div class='del'>-	err = ip_route_input_noref(head, iph-&gt;daddr, iph-&gt;saddr,</div><div class='del'>-					   iph-&gt;tos, head-&gt;dev);</div><div class='del'>-	if (err)</div><div class='add'>+	reason = ip_route_input_noref(head, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+				      ip4h_dscp(iph), head-&gt;dev);</div><div class='add'>+	if (reason)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Only an end host needs to send an ICMP</div><div class='ctx'> 	 * "Fragment Reassembly Timeout" message, per RFC792.</div><div class='ctx'> 	 */</div><div class='add'>+	reason = SKB_DROP_REASON_FRAG_REASM_TIMEOUT;</div><div class='ctx'> 	if (frag_expire_skip_icmp(qp-&gt;q.key.v4.user) &amp;&amp;</div><div class='ctx'> 	    (skb_rtable(head)-&gt;rt_type != RTN_LOCAL))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -260,9 +187,8 @@ out:</div><div class='ctx'> 	spin_unlock(&amp;qp-&gt;q.lock);</div><div class='ctx'> out_rcu_unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	if (head)</div><div class='del'>-		kfree_skb(head);</div><div class='del'>-	ipq_put(qp);</div><div class='add'>+	kfree_skb_reason(head, reason);</div><div class='add'>+	inet_frag_putn(&amp;qp-&gt;q, refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Find the correct entry in the "incomplete datagrams" queue for</div><div class='hunk'>@@ -281,7 +207,7 @@ static struct ipq *ip_find(struct net *net, struct iphdr *iph,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inet_frag_queue *q;</div><div class='ctx'> </div><div class='del'>-	q = inet_frag_find(&amp;net-&gt;ipv4.frags, &amp;key);</div><div class='add'>+	q = inet_frag_find(net-&gt;ipv4.fqdir, &amp;key);</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +218,7 @@ static struct ipq *ip_find(struct net *net, struct iphdr *iph,</div><div class='ctx'> static int ip_frag_too_far(struct ipq *qp)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_peer *peer = qp-&gt;peer;</div><div class='del'>-	unsigned int max = qp-&gt;q.net-&gt;max_dist;</div><div class='add'>+	unsigned int max = qp-&gt;q.fqdir-&gt;max_dist;</div><div class='ctx'> 	unsigned int start, end;</div><div class='ctx'> </div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -306,12 +232,8 @@ static int ip_frag_too_far(struct ipq *qp)</div><div class='ctx'> </div><div class='ctx'> 	rc = qp-&gt;q.fragments_tail &amp;&amp; (end - start) &gt; max;</div><div class='ctx'> </div><div class='del'>-	if (rc) {</div><div class='del'>-		struct net *net;</div><div class='del'>-</div><div class='del'>-		net = container_of(qp-&gt;q.net, struct net, ipv4.frags);</div><div class='del'>-		__IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS);</div><div class='del'>-	}</div><div class='add'>+	if (rc)</div><div class='add'>+		__IP_INC_STATS(qp-&gt;q.fqdir-&gt;net, IPSTATS_MIB_REASMFAILS);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -320,18 +242,18 @@ static int ip_frag_reinit(struct ipq *qp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int sum_truesize = 0;</div><div class='ctx'> </div><div class='del'>-	if (!mod_timer(&amp;qp-&gt;q.timer, jiffies + qp-&gt;q.net-&gt;timeout)) {</div><div class='add'>+	if (!mod_timer(&amp;qp-&gt;q.timer, jiffies + qp-&gt;q.fqdir-&gt;timeout)) {</div><div class='ctx'> 		refcount_inc(&amp;qp-&gt;q.refcnt);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sum_truesize = inet_frag_rbtree_purge(&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-	sub_frag_mem_limit(qp-&gt;q.net, sum_truesize);</div><div class='add'>+	sum_truesize = inet_frag_rbtree_purge(&amp;qp-&gt;q.rb_fragments,</div><div class='add'>+					      SKB_DROP_REASON_FRAG_TOO_FAR);</div><div class='add'>+	sub_frag_mem_limit(qp-&gt;q.fqdir, sum_truesize);</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;q.flags = 0;</div><div class='ctx'> 	qp-&gt;q.len = 0;</div><div class='ctx'> 	qp-&gt;q.meat = 0;</div><div class='del'>-	qp-&gt;q.fragments = NULL;</div><div class='ctx'> 	qp-&gt;q.rb_fragments = RB_ROOT;</div><div class='ctx'> 	qp-&gt;q.fragments_tail = NULL;</div><div class='ctx'> 	qp-&gt;q.last_run_head = NULL;</div><div class='hunk'>@@ -342,25 +264,27 @@ static int ip_frag_reinit(struct ipq *qp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Add new segment to existing queue. */</div><div class='del'>-static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)</div><div class='add'>+static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb, int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = container_of(qp-&gt;q.net, struct net, ipv4.frags);</div><div class='del'>-	struct rb_node **rbn, *parent;</div><div class='del'>-	struct sk_buff *skb1, *prev_tail;</div><div class='add'>+	struct net *net = qp-&gt;q.fqdir-&gt;net;</div><div class='add'>+	int ihl, end, flags, offset;</div><div class='add'>+	struct sk_buff *prev_tail;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	unsigned int fragsize;</div><div class='del'>-	int flags, offset;</div><div class='del'>-	int ihl, end;</div><div class='ctx'> 	int err = -ENOENT;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='del'>-	if (qp-&gt;q.flags &amp; INET_FRAG_COMPLETE)</div><div class='add'>+	/* If reassembly is already done, @skb must be a duplicate frag. */</div><div class='add'>+	if (qp-&gt;q.flags &amp; INET_FRAG_COMPLETE) {</div><div class='add'>+		SKB_DR_SET(reason, DUP_FRAG);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(IPCB(skb)-&gt;flags &amp; IPSKB_FRAG_COMPLETE) &amp;&amp;</div><div class='ctx'> 	    unlikely(ip_frag_too_far(qp)) &amp;&amp;</div><div class='ctx'> 	    unlikely(err = ip_frag_reinit(qp))) {</div><div class='del'>-		ipq_kill(qp);</div><div class='add'>+		inet_frag_kill(&amp;qp-&gt;q, refs);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -382,7 +306,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (end &lt; qp-&gt;q.len ||</div><div class='ctx'> 		    ((qp-&gt;q.flags &amp; INET_FRAG_LAST_IN) &amp;&amp; end != qp-&gt;q.len))</div><div class='del'>-			goto err;</div><div class='add'>+			goto discard_qp;</div><div class='ctx'> 		qp-&gt;q.flags |= INET_FRAG_LAST_IN;</div><div class='ctx'> 		qp-&gt;q.len = end;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -394,80 +318,39 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)</div><div class='ctx'> 		if (end &gt; qp-&gt;q.len) {</div><div class='ctx'> 			/* Some bits beyond end -&gt; corruption. */</div><div class='ctx'> 			if (qp-&gt;q.flags &amp; INET_FRAG_LAST_IN)</div><div class='del'>-				goto err;</div><div class='add'>+				goto discard_qp;</div><div class='ctx'> 			qp-&gt;q.len = end;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (end == offset)</div><div class='del'>-		goto err;</div><div class='add'>+		goto discard_qp;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!pskb_pull(skb, skb_network_offset(skb) + ihl))</div><div class='del'>-		goto err;</div><div class='add'>+		goto discard_qp;</div><div class='ctx'> </div><div class='ctx'> 	err = pskb_trim_rcsum(skb, end - offset);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		goto discard_qp;</div><div class='ctx'> </div><div class='ctx'> 	/* Note : skb-&gt;rbnode and skb-&gt;dev share the same location. */</div><div class='ctx'> 	dev = skb-&gt;dev;</div><div class='ctx'> 	/* Makes sure compiler wont do silly aliasing games */</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='del'>-	/* RFC5722, Section 4, amended by Errata ID : 3089</div><div class='del'>-	 *                          When reassembling an IPv6 datagram, if</div><div class='del'>-	 *   one or more its constituent fragments is determined to be an</div><div class='del'>-	 *   overlapping fragment, the entire datagram (and any constituent</div><div class='del'>-	 *   fragments) MUST be silently discarded.</div><div class='del'>-	 *</div><div class='del'>-	 * We do the same here for IPv4 (and increment an snmp counter).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Find out where to put this fragment.  */</div><div class='ctx'> 	prev_tail = qp-&gt;q.fragments_tail;</div><div class='del'>-	if (!prev_tail)</div><div class='del'>-		ip4_frag_create_run(&amp;qp-&gt;q, skb);  /* First fragment. */</div><div class='del'>-	else if (prev_tail-&gt;ip_defrag_offset + prev_tail-&gt;len &lt; end) {</div><div class='del'>-		/* This is the common case: skb goes to the end. */</div><div class='del'>-		/* Detect and discard overlaps. */</div><div class='del'>-		if (offset &lt; prev_tail-&gt;ip_defrag_offset + prev_tail-&gt;len)</div><div class='del'>-			goto discard_qp;</div><div class='del'>-		if (offset == prev_tail-&gt;ip_defrag_offset + prev_tail-&gt;len)</div><div class='del'>-			ip4_frag_append_to_last_run(&amp;qp-&gt;q, skb);</div><div class='del'>-		else</div><div class='del'>-			ip4_frag_create_run(&amp;qp-&gt;q, skb);</div><div class='del'>-	} else {</div><div class='del'>-		/* Binary search. Note that skb can become the first fragment,</div><div class='del'>-		 * but not the last (covered above).</div><div class='del'>-		 */</div><div class='del'>-		rbn = &amp;qp-&gt;q.rb_fragments.rb_node;</div><div class='del'>-		do {</div><div class='del'>-			parent = *rbn;</div><div class='del'>-			skb1 = rb_to_skb(parent);</div><div class='del'>-			if (end &lt;= skb1-&gt;ip_defrag_offset)</div><div class='del'>-				rbn = &amp;parent-&gt;rb_left;</div><div class='del'>-			else if (offset &gt;= skb1-&gt;ip_defrag_offset +</div><div class='del'>-						FRAG_CB(skb1)-&gt;frag_run_len)</div><div class='del'>-				rbn = &amp;parent-&gt;rb_right;</div><div class='del'>-			else /* Found an overlap with skb1. */</div><div class='del'>-				goto discard_qp;</div><div class='del'>-		} while (*rbn);</div><div class='del'>-		/* Here we have parent properly set, and rbn pointing to</div><div class='del'>-		 * one of its NULL left/right children. Insert skb.</div><div class='del'>-		 */</div><div class='del'>-		ip4_frag_init_run(skb);</div><div class='del'>-		rb_link_node(&amp;skb-&gt;rbnode, parent, rbn);</div><div class='del'>-		rb_insert_color(&amp;skb-&gt;rbnode, &amp;qp-&gt;q.rb_fragments);</div><div class='del'>-	}</div><div class='add'>+	err = inet_frag_queue_insert(&amp;qp-&gt;q, skb, offset, end);</div><div class='add'>+	if (err)</div><div class='add'>+		goto insert_error;</div><div class='ctx'> </div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		qp-&gt;iif = dev-&gt;ifindex;</div><div class='del'>-	skb-&gt;ip_defrag_offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;q.stamp = skb-&gt;tstamp;</div><div class='add'>+	qp-&gt;q.tstamp_type = skb-&gt;tstamp_type;</div><div class='ctx'> 	qp-&gt;q.meat += skb-&gt;len;</div><div class='ctx'> 	qp-&gt;ecn |= ecn;</div><div class='del'>-	add_frag_mem_limit(qp-&gt;q.net, skb-&gt;truesize);</div><div class='add'>+	add_frag_mem_limit(qp-&gt;q.fqdir, skb-&gt;truesize);</div><div class='ctx'> 	if (offset == 0)</div><div class='ctx'> 		qp-&gt;q.flags |= INET_FRAG_FIRST_IN;</div><div class='ctx'> </div><div class='hunk'>@@ -485,149 +368,74 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)</div><div class='ctx'> 		unsigned long orefdst = skb-&gt;_skb_refdst;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;_skb_refdst = 0UL;</div><div class='del'>-		err = ip_frag_reasm(qp, skb, prev_tail, dev);</div><div class='add'>+		err = ip_frag_reasm(qp, skb, prev_tail, dev, refs);</div><div class='ctx'> 		skb-&gt;_skb_refdst = orefdst;</div><div class='add'>+		if (err)</div><div class='add'>+			inet_frag_kill(&amp;qp-&gt;q, refs);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='add'>+	skb_orphan(skb);</div><div class='ctx'> 	return -EINPROGRESS;</div><div class='ctx'> </div><div class='del'>-discard_qp:</div><div class='del'>-	inet_frag_kill(&amp;qp-&gt;q);</div><div class='add'>+insert_error:</div><div class='add'>+	if (err == IPFRAG_DUP) {</div><div class='add'>+		SKB_DR_SET(reason, DUP_FRAG);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASM_OVERLAPS);</div><div class='add'>+discard_qp:</div><div class='add'>+	inet_frag_kill(&amp;qp-&gt;q, refs);</div><div class='add'>+	__IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS);</div><div class='ctx'> err:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ip_frag_coalesce_ok(const struct ipq *qp)</div><div class='add'>+{</div><div class='add'>+	return qp-&gt;q.key.v4.user == IP_DEFRAG_LOCAL_DELIVER;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Build a new IP datagram from all its fragments. */</div><div class='ctx'> static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,</div><div class='del'>-			 struct sk_buff *prev_tail, struct net_device *dev)</div><div class='add'>+			 struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			 int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = container_of(qp-&gt;q.net, struct net, ipv4.frags);</div><div class='add'>+	struct net *net = qp-&gt;q.fqdir-&gt;net;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='del'>-	struct sk_buff *fp, *head = skb_rb_first(&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-	struct sk_buff **nextp; /* To build frag_list. */</div><div class='del'>-	struct rb_node *rbn;</div><div class='del'>-	int len;</div><div class='del'>-	int ihlen;</div><div class='del'>-	int err;</div><div class='add'>+	void *reasm_data;</div><div class='add'>+	int len, err;</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='del'>-	ipq_kill(qp);</div><div class='add'>+	inet_frag_kill(&amp;qp-&gt;q, refs);</div><div class='ctx'> </div><div class='ctx'> 	ecn = ip_frag_ecn_table[qp-&gt;ecn];</div><div class='ctx'> 	if (unlikely(ecn == 0xff)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> 	}</div><div class='del'>-	/* Make the one we just received the head. */</div><div class='del'>-	if (head != skb) {</div><div class='del'>-		fp = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-		if (!fp)</div><div class='del'>-			goto out_nomem;</div><div class='del'>-		FRAG_CB(fp)-&gt;next_frag = FRAG_CB(skb)-&gt;next_frag;</div><div class='del'>-		if (RB_EMPTY_NODE(&amp;skb-&gt;rbnode))</div><div class='del'>-			FRAG_CB(prev_tail)-&gt;next_frag = fp;</div><div class='del'>-		else</div><div class='del'>-			rb_replace_node(&amp;skb-&gt;rbnode, &amp;fp-&gt;rbnode,</div><div class='del'>-					&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-		if (qp-&gt;q.fragments_tail == skb)</div><div class='del'>-			qp-&gt;q.fragments_tail = fp;</div><div class='del'>-		skb_morph(skb, head);</div><div class='del'>-		FRAG_CB(skb)-&gt;next_frag = FRAG_CB(head)-&gt;next_frag;</div><div class='del'>-		rb_replace_node(&amp;head-&gt;rbnode, &amp;skb-&gt;rbnode,</div><div class='del'>-				&amp;qp-&gt;q.rb_fragments);</div><div class='del'>-		consume_skb(head);</div><div class='del'>-		head = skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(head-&gt;ip_defrag_offset != 0);</div><div class='ctx'> </div><div class='del'>-	/* Allocate a new buffer for the datagram. */</div><div class='del'>-	ihlen = ip_hdrlen(head);</div><div class='del'>-	len = ihlen + qp-&gt;q.len;</div><div class='add'>+	/* Make the one we just received the head. */</div><div class='add'>+	reasm_data = inet_frag_reasm_prepare(&amp;qp-&gt;q, skb, prev_tail);</div><div class='add'>+	if (!reasm_data)</div><div class='add'>+		goto out_nomem;</div><div class='ctx'> </div><div class='add'>+	len = ip_hdrlen(skb) + qp-&gt;q.len;</div><div class='ctx'> 	err = -E2BIG;</div><div class='ctx'> 	if (len &gt; 65535)</div><div class='ctx'> 		goto out_oversize;</div><div class='ctx'> </div><div class='del'>-	/* Head of list must not be cloned. */</div><div class='del'>-	if (skb_unclone(head, GFP_ATOMIC))</div><div class='del'>-		goto out_nomem;</div><div class='del'>-</div><div class='del'>-	/* If the first fragment is fragmented itself, we split</div><div class='del'>-	 * it to two chunks: the first with data and paged part</div><div class='del'>-	 * and the second, holding only fragments. */</div><div class='del'>-	if (skb_has_frag_list(head)) {</div><div class='del'>-		struct sk_buff *clone;</div><div class='del'>-		int i, plen = 0;</div><div class='del'>-</div><div class='del'>-		clone = alloc_skb(0, GFP_ATOMIC);</div><div class='del'>-		if (!clone)</div><div class='del'>-			goto out_nomem;</div><div class='del'>-		skb_shinfo(clone)-&gt;frag_list = skb_shinfo(head)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(head);</div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(head)-&gt;nr_frags; i++)</div><div class='del'>-			plen += skb_frag_size(&amp;skb_shinfo(head)-&gt;frags[i]);</div><div class='del'>-		clone-&gt;len = clone-&gt;data_len = head-&gt;data_len - plen;</div><div class='del'>-		head-&gt;truesize += clone-&gt;truesize;</div><div class='del'>-		clone-&gt;csum = 0;</div><div class='del'>-		clone-&gt;ip_summed = head-&gt;ip_summed;</div><div class='del'>-		add_frag_mem_limit(qp-&gt;q.net, clone-&gt;truesize);</div><div class='del'>-		skb_shinfo(head)-&gt;frag_list = clone;</div><div class='del'>-		nextp = &amp;clone-&gt;next;</div><div class='del'>-	} else {</div><div class='del'>-		nextp = &amp;skb_shinfo(head)-&gt;frag_list;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_push(head, head-&gt;data - skb_network_header(head));</div><div class='del'>-</div><div class='del'>-	/* Traverse the tree in order, to build frag_list. */</div><div class='del'>-	fp = FRAG_CB(head)-&gt;next_frag;</div><div class='del'>-	rbn = rb_next(&amp;head-&gt;rbnode);</div><div class='del'>-	rb_erase(&amp;head-&gt;rbnode, &amp;qp-&gt;q.rb_fragments);</div><div class='del'>-	while (rbn || fp) {</div><div class='del'>-		/* fp points to the next sk_buff in the current run;</div><div class='del'>-		 * rbn points to the next run.</div><div class='del'>-		 */</div><div class='del'>-		/* Go through the current run. */</div><div class='del'>-		while (fp) {</div><div class='del'>-			*nextp = fp;</div><div class='del'>-			nextp = &amp;fp-&gt;next;</div><div class='del'>-			fp-&gt;prev = NULL;</div><div class='del'>-			memset(&amp;fp-&gt;rbnode, 0, sizeof(fp-&gt;rbnode));</div><div class='del'>-			fp-&gt;sk = NULL;</div><div class='del'>-			head-&gt;data_len += fp-&gt;len;</div><div class='del'>-			head-&gt;len += fp-&gt;len;</div><div class='del'>-			if (head-&gt;ip_summed != fp-&gt;ip_summed)</div><div class='del'>-				head-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-			else if (head-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='del'>-				head-&gt;csum = csum_add(head-&gt;csum, fp-&gt;csum);</div><div class='del'>-			head-&gt;truesize += fp-&gt;truesize;</div><div class='del'>-			fp = FRAG_CB(fp)-&gt;next_frag;</div><div class='del'>-		}</div><div class='del'>-		/* Move to the next run. */</div><div class='del'>-		if (rbn) {</div><div class='del'>-			struct rb_node *rbnext = rb_next(rbn);</div><div class='del'>-</div><div class='del'>-			fp = rb_to_skb(rbn);</div><div class='del'>-			rb_erase(rbn, &amp;qp-&gt;q.rb_fragments);</div><div class='del'>-			rbn = rbnext;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	sub_frag_mem_limit(qp-&gt;q.net, head-&gt;truesize);</div><div class='add'>+	inet_frag_reasm_finish(&amp;qp-&gt;q, skb, reasm_data,</div><div class='add'>+			       ip_frag_coalesce_ok(qp));</div><div class='ctx'> </div><div class='del'>-	*nextp = NULL;</div><div class='del'>-	head-&gt;next = NULL;</div><div class='del'>-	head-&gt;prev = NULL;</div><div class='del'>-	head-&gt;dev = dev;</div><div class='del'>-	head-&gt;tstamp = qp-&gt;q.stamp;</div><div class='del'>-	IPCB(head)-&gt;frag_max_size = max(qp-&gt;max_df_size, qp-&gt;q.max_size);</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	IPCB(skb)-&gt;frag_max_size = max(qp-&gt;max_df_size, qp-&gt;q.max_size);</div><div class='ctx'> </div><div class='del'>-	iph = ip_hdr(head);</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='ctx'> 	iph-&gt;tot_len = htons(len);</div><div class='ctx'> 	iph-&gt;tos |= ecn;</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +448,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,</div><div class='ctx'> 	 * from one very small df-fragment and one large non-df frag.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (qp-&gt;max_df_size == qp-&gt;q.max_size) {</div><div class='del'>-		IPCB(head)-&gt;flags |= IPSKB_FRAG_PMTU;</div><div class='add'>+		IPCB(skb)-&gt;flags |= IPSKB_FRAG_PMTU;</div><div class='ctx'> 		iph-&gt;frag_off = htons(IP_DF);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iph-&gt;frag_off = 0;</div><div class='hunk'>@@ -649,7 +457,6 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASMOKS);</div><div class='del'>-	qp-&gt;q.fragments = NULL;</div><div class='ctx'> 	qp-&gt;q.rb_fragments = RB_ROOT;</div><div class='ctx'> 	qp-&gt;q.fragments_tail = NULL;</div><div class='ctx'> 	qp-&gt;q.last_run_head = NULL;</div><div class='hunk'>@@ -669,26 +476,30 @@ out_fail:</div><div class='ctx'> /* Process an incoming IP datagram fragment. */</div><div class='ctx'> int ip_defrag(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = skb-&gt;dev ? : skb_dst(skb)-&gt;dev;</div><div class='del'>-	int vif = l3mdev_master_ifindex_rcu(dev);</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct ipq *qp;</div><div class='add'>+	int vif;</div><div class='ctx'> </div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASMREQDS);</div><div class='del'>-	skb_orphan(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Lookup (or create) queue header */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = skb-&gt;dev ? : skb_dst_dev_rcu(skb);</div><div class='add'>+	vif = l3mdev_master_ifindex_rcu(dev);</div><div class='ctx'> 	qp = ip_find(net, ip_hdr(skb), user, vif);</div><div class='ctx'> 	if (qp) {</div><div class='del'>-		int ret;</div><div class='add'>+		int ret, refs = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;qp-&gt;q.lock);</div><div class='ctx'> </div><div class='del'>-		ret = ip_frag_queue(qp, skb);</div><div class='add'>+		ret = ip_frag_queue(qp, skb, &amp;refs);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;qp-&gt;q.lock);</div><div class='del'>-		ipq_put(qp);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		inet_frag_putn(&amp;qp-&gt;q, refs);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -720,10 +531,14 @@ struct sk_buff *ip_check_defrag(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> 	if (ip_is_fragment(&amp;iph)) {</div><div class='ctx'> 		skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			if (!pskb_may_pull(skb, netoff + iph.ihl * 4))</div><div class='del'>-				return skb;</div><div class='del'>-			if (pskb_trim_rcsum(skb, netoff + len))</div><div class='del'>-				return skb;</div><div class='add'>+			if (!pskb_may_pull(skb, netoff + iph.ihl * 4)) {</div><div class='add'>+				kfree_skb(skb);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			if (pskb_trim_rcsum(skb, netoff + len)) {</div><div class='add'>+				kfree_skb(skb);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='ctx'> 			memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));</div><div class='ctx'> 			if (ip_defrag(net, skb, user))</div><div class='ctx'> 				return NULL;</div><div class='hunk'>@@ -734,64 +549,35 @@ struct sk_buff *ip_check_defrag(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_check_defrag);</div><div class='ctx'> </div><div class='del'>-unsigned int inet_frag_rbtree_purge(struct rb_root *root)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *p = rb_first(root);</div><div class='del'>-	unsigned int sum = 0;</div><div class='del'>-</div><div class='del'>-	while (p) {</div><div class='del'>-		struct sk_buff *skb = rb_entry(p, struct sk_buff, rbnode);</div><div class='del'>-</div><div class='del'>-		p = rb_next(p);</div><div class='del'>-		rb_erase(&amp;skb-&gt;rbnode, root);</div><div class='del'>-		while (skb) {</div><div class='del'>-			struct sk_buff *next = FRAG_CB(skb)-&gt;next_frag;</div><div class='del'>-</div><div class='del'>-			sum += skb-&gt;truesize;</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			skb = next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return sum;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(inet_frag_rbtree_purge);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> static int dist_min;</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table ip4_frags_ns_ctl_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ipfrag_high_thresh",</div><div class='del'>-		.data		= &amp;init_net.ipv4.frags.high_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra1		= &amp;init_net.ipv4.frags.low_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ipfrag_low_thresh",</div><div class='del'>-		.data		= &amp;init_net.ipv4.frags.low_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra2		= &amp;init_net.ipv4.frags.high_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ipfrag_time",</div><div class='del'>-		.data		= &amp;init_net.ipv4.frags.timeout,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ipfrag_max_dist",</div><div class='del'>-		.data		= &amp;init_net.ipv4.frags.max_dist,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='ctx'> 		.extra1		= &amp;dist_min,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* secret interval has been deprecated */</div><div class='hunk'>@@ -804,7 +590,6 @@ static struct ctl_table ip4_frags_ctl_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init ip4_frags_ns_ctl_register(struct net *net)</div><div class='hunk'>@@ -818,16 +603,16 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)</div><div class='ctx'> 		if (!table)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='del'>-		table[0].data = &amp;net-&gt;ipv4.frags.high_thresh;</div><div class='del'>-		table[0].extra1 = &amp;net-&gt;ipv4.frags.low_thresh;</div><div class='del'>-		table[0].extra2 = &amp;init_net.ipv4.frags.high_thresh;</div><div class='del'>-		table[1].data = &amp;net-&gt;ipv4.frags.low_thresh;</div><div class='del'>-		table[1].extra2 = &amp;net-&gt;ipv4.frags.high_thresh;</div><div class='del'>-		table[2].data = &amp;net-&gt;ipv4.frags.timeout;</div><div class='del'>-		table[3].data = &amp;net-&gt;ipv4.frags.max_dist;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hdr = register_net_sysctl(net, "net/ipv4", table);</div><div class='add'>+	table[0].data	= &amp;net-&gt;ipv4.fqdir-&gt;high_thresh;</div><div class='add'>+	table[0].extra1	= &amp;net-&gt;ipv4.fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].data	= &amp;net-&gt;ipv4.fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].extra2	= &amp;net-&gt;ipv4.fqdir-&gt;high_thresh;</div><div class='add'>+	table[2].data	= &amp;net-&gt;ipv4.fqdir-&gt;timeout;</div><div class='add'>+	table[3].data	= &amp;net-&gt;ipv4.fqdir-&gt;max_dist;</div><div class='add'>+</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/ipv4", table,</div><div class='add'>+				     ARRAY_SIZE(ip4_frags_ns_ctl_table));</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -843,7 +628,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit ip4_frags_ns_ctl_unregister(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	table = net-&gt;ipv4.frags_hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	unregister_net_sysctl_table(net-&gt;ipv4.frags_hdr);</div><div class='hunk'>@@ -873,6 +658,9 @@ static int __net_init ipv4_frags_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='add'>+	res = fqdir_init(&amp;net-&gt;ipv4.fqdir, &amp;ip4_frags, net);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return res;</div><div class='ctx'> 	/* Fragment cache limits.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The fragment memory accounting code, (tries to) account for</div><div class='hunk'>@@ -887,36 +675,38 @@ static int __net_init ipv4_frags_init_net(struct net *net)</div><div class='ctx'> 	 * we will prune down to 3MB, making room for approx 8 big 64K</div><div class='ctx'> 	 * fragments 8x128k.</div><div class='ctx'> 	 */</div><div class='del'>-	net-&gt;ipv4.frags.high_thresh = 4 * 1024 * 1024;</div><div class='del'>-	net-&gt;ipv4.frags.low_thresh  = 3 * 1024 * 1024;</div><div class='add'>+	net-&gt;ipv4.fqdir-&gt;high_thresh = 4 * 1024 * 1024;</div><div class='add'>+	net-&gt;ipv4.fqdir-&gt;low_thresh  = 3 * 1024 * 1024;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Important NOTE! Fragment queue must be destroyed before MSL expires.</div><div class='ctx'> 	 * RFC791 is wrong proposing to prolongate timer each fragment arrival</div><div class='ctx'> 	 * by TTL.</div><div class='ctx'> 	 */</div><div class='del'>-	net-&gt;ipv4.frags.timeout = IP_FRAG_TIME;</div><div class='add'>+	net-&gt;ipv4.fqdir-&gt;timeout = IP_FRAG_TIME;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.frags.max_dist = 64;</div><div class='del'>-	net-&gt;ipv4.frags.f = &amp;ip4_frags;</div><div class='add'>+	net-&gt;ipv4.fqdir-&gt;max_dist = 64;</div><div class='ctx'> </div><div class='del'>-	res = inet_frags_init_net(&amp;net-&gt;ipv4.frags);</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		return res;</div><div class='ctx'> 	res = ip4_frags_ns_ctl_register(net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='del'>-		inet_frags_exit_net(&amp;net-&gt;ipv4.frags);</div><div class='add'>+		fqdir_exit(net-&gt;ipv4.fqdir);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ipv4_frags_pre_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	fqdir_pre_exit(net-&gt;ipv4.fqdir);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit ipv4_frags_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	ip4_frags_ns_ctl_unregister(net);</div><div class='del'>-	inet_frags_exit_net(&amp;net-&gt;ipv4.frags);</div><div class='add'>+	fqdir_exit(net-&gt;ipv4.fqdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip4_frags_ops = {</div><div class='del'>-	.init = ipv4_frags_init_net,</div><div class='del'>-	.exit = ipv4_frags_exit_net,</div><div class='add'>+	.init		= ipv4_frags_init_net,</div><div class='add'>+	.pre_exit	= ipv4_frags_pre_exit_net,</div><div class='add'>+	.exit		= ipv4_frags_exit_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c<br/>index 8cce0e9ea08c..761a53c6a89a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_gre.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_gre.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_gre.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_gre.c</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux NET3:	GRE over IP protocol decoder.</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors: Alexey Kuznetsov (kuznet@ms2.inr.ac.ru)</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -33,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='hunk'>@@ -112,6 +108,8 @@ module_param(log_ecn_error, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");</div><div class='ctx'> </div><div class='ctx'> static struct rtnl_link_ops ipgre_link_ops __read_mostly;</div><div class='add'>+static const struct header_ops ipgre_header_ops;</div><div class='add'>+</div><div class='ctx'> static int ipgre_tunnel_init(struct net_device *dev);</div><div class='ctx'> static void erspan_build_header(struct sk_buff *skb,</div><div class='ctx'> 				u32 id, u32 index,</div><div class='hunk'>@@ -121,8 +119,8 @@ static unsigned int ipgre_net_id __read_mostly;</div><div class='ctx'> static unsigned int gre_tap_net_id __read_mostly;</div><div class='ctx'> static unsigned int erspan_net_id __read_mostly;</div><div class='ctx'> </div><div class='del'>-static void ipgre_err(struct sk_buff *skb, u32 info,</div><div class='del'>-		      const struct tnl_ptk_info *tpi)</div><div class='add'>+static int ipgre_err(struct sk_buff *skb, u32 info,</div><div class='add'>+		     const struct tnl_ptk_info *tpi)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	/* All the routers (except for Linux) return only</div><div class='hunk'>@@ -143,20 +141,34 @@ static void ipgre_err(struct sk_buff *skb, u32 info,</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	const int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	const int code = icmp_hdr(skb)-&gt;code;</div><div class='del'>-	unsigned int data_len = 0;</div><div class='ctx'> 	struct ip_tunnel *t;</div><div class='ctx'> </div><div class='add'>+	if (tpi-&gt;proto == htons(ETH_P_TEB))</div><div class='add'>+		itn = net_generic(net, gre_tap_net_id);</div><div class='add'>+	else if (tpi-&gt;proto == htons(ETH_P_ERSPAN) ||</div><div class='add'>+		 tpi-&gt;proto == htons(ETH_P_ERSPAN2))</div><div class='add'>+		itn = net_generic(net, erspan_net_id);</div><div class='add'>+	else</div><div class='add'>+		itn = net_generic(net, ipgre_net_id);</div><div class='add'>+</div><div class='add'>+	iph = (const struct iphdr *)(icmp_hdr(skb) + 1);</div><div class='add'>+	t = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, tpi-&gt;flags,</div><div class='add'>+			     iph-&gt;daddr, iph-&gt;saddr, tpi-&gt;key);</div><div class='add'>+</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	default:</div><div class='ctx'> 	case ICMP_PARAMETERPROB:</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		switch (code) {</div><div class='ctx'> 		case ICMP_SR_FAILED:</div><div class='ctx'> 		case ICMP_PORT_UNREACH:</div><div class='ctx'> 			/* Impossible event. */</div><div class='del'>-			return;</div><div class='add'>+			return 0;</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* All others are translated to HOST_UNREACH.</div><div class='ctx'> 			   rfc2003 contains "deep thoughts" about NET_UNREACH,</div><div class='hunk'>@@ -168,48 +180,40 @@ static void ipgre_err(struct sk_buff *skb, u32 info,</div><div class='ctx'> </div><div class='ctx'> 	case ICMP_TIME_EXCEEDED:</div><div class='ctx'> 		if (code != ICMP_EXC_TTL)</div><div class='del'>-			return;</div><div class='del'>-		data_len = icmp_hdr(skb)-&gt;un.reserved[1] * 4; /* RFC 4884 4.1 */</div><div class='add'>+			return 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tpi-&gt;proto == htons(ETH_P_TEB))</div><div class='del'>-		itn = net_generic(net, gre_tap_net_id);</div><div class='del'>-	else if (tpi-&gt;proto == htons(ETH_P_ERSPAN) ||</div><div class='del'>-		 tpi-&gt;proto == htons(ETH_P_ERSPAN2))</div><div class='del'>-		itn = net_generic(net, erspan_net_id);</div><div class='del'>-	else</div><div class='del'>-		itn = net_generic(net, ipgre_net_id);</div><div class='del'>-</div><div class='del'>-	iph = (const struct iphdr *)(icmp_hdr(skb) + 1);</div><div class='del'>-	t = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, tpi-&gt;flags,</div><div class='del'>-			     iph-&gt;daddr, iph-&gt;saddr, tpi-&gt;key);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (tpi-&gt;proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		unsigned int data_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (!t)</div><div class='del'>-		return;</div><div class='add'>+		if (type == ICMP_TIME_EXCEEDED)</div><div class='add'>+			data_len = icmp_hdr(skb)-&gt;un.reserved[1] * 4; /* RFC 4884 4.1 */</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-       if (tpi-&gt;proto == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-           !ip6_err_gen_icmpv6_unreach(skb, iph-&gt;ihl * 4 + tpi-&gt;hdr_len,</div><div class='del'>-				       type, data_len))</div><div class='del'>-               return;</div><div class='add'>+		if (!ip6_err_gen_icmpv6_unreach(skb, iph-&gt;ihl * 4 + tpi-&gt;hdr_len,</div><div class='add'>+						type, data_len))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;parms.iph.daddr == 0 ||</div><div class='ctx'> 	    ipv4_is_multicast(t-&gt;parms.iph.daddr))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;parms.iph.ttl == 0 &amp;&amp; type == ICMP_TIME_EXCEEDED)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (time_before(jiffies, t-&gt;err_time + IPTUNNEL_ERR_TIMEO))</div><div class='ctx'> 		t-&gt;err_count++;</div><div class='ctx'> 	else</div><div class='ctx'> 		t-&gt;err_count = 1;</div><div class='ctx'> 	t-&gt;err_time = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gre_err(struct sk_buff *skb, u32 info)</div><div class='hunk'>@@ -232,35 +236,41 @@ static void gre_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	const int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	const int code = icmp_hdr(skb)-&gt;code;</div><div class='ctx'> 	struct tnl_ptk_info tpi;</div><div class='del'>-	bool csum_err = false;</div><div class='ctx'> </div><div class='del'>-	if (gre_parse_header(skb, &amp;tpi, &amp;csum_err, htons(ETH_P_IP),</div><div class='del'>-			     iph-&gt;ihl * 4) &lt; 0) {</div><div class='del'>-		if (!csum_err)		/* ignore csum errors. */</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='add'>+	if (gre_parse_header(skb, &amp;tpi, NULL, htons(ETH_P_IP),</div><div class='add'>+			     iph-&gt;ihl * 4) &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMP_DEST_UNREACH &amp;&amp; code == ICMP_FRAG_NEEDED) {</div><div class='ctx'> 		ipv4_update_pmtu(skb, dev_net(skb-&gt;dev), info,</div><div class='del'>-				 skb-&gt;dev-&gt;ifindex, 0, IPPROTO_GRE, 0);</div><div class='add'>+				 skb-&gt;dev-&gt;ifindex, IPPROTO_GRE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (type == ICMP_REDIRECT) {</div><div class='del'>-		ipv4_redirect(skb, dev_net(skb-&gt;dev), skb-&gt;dev-&gt;ifindex, 0,</div><div class='del'>-			      IPPROTO_GRE, 0);</div><div class='add'>+		ipv4_redirect(skb, dev_net(skb-&gt;dev), skb-&gt;dev-&gt;ifindex,</div><div class='add'>+			      IPPROTO_GRE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipgre_err(skb, info, &amp;tpi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_erspan_type1(int gre_hdr_len)</div><div class='add'>+{</div><div class='add'>+	/* Both ERSPAN type I (version 0) and type II (version 1) use</div><div class='add'>+	 * protocol 0x88BE, but the type I has only 4-byte GRE header,</div><div class='add'>+	 * while type II has 8-byte.</div><div class='add'>+	 */</div><div class='add'>+	return gre_hdr_len == 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 		      int gre_hdr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct metadata_dst *tun_dst = NULL;</div><div class='ctx'> 	struct erspan_base_hdr *ershdr;</div><div class='del'>-	struct erspan_metadata *pkt_md;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> 	struct ip_tunnel_net *itn;</div><div class='ctx'> 	struct ip_tunnel *tunnel;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='hunk'>@@ -268,33 +278,37 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 	int ver;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	itn = net_generic(net, erspan_net_id);</div><div class='del'>-	len = gre_hdr_len + sizeof(*ershdr);</div><div class='del'>-</div><div class='del'>-	/* Check based hdr len */</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, len)))</div><div class='del'>-		return PACKET_REJECT;</div><div class='add'>+	ip_tunnel_flags_copy(flags, tpi-&gt;flags);</div><div class='ctx'> </div><div class='add'>+	itn = net_generic(net, erspan_net_id);</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='del'>-	ershdr = (struct erspan_base_hdr *)(skb-&gt;data + gre_hdr_len);</div><div class='del'>-	ver = ershdr-&gt;ver;</div><div class='add'>+	if (is_erspan_type1(gre_hdr_len)) {</div><div class='add'>+		ver = 0;</div><div class='add'>+		__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);</div><div class='add'>+		tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags,</div><div class='add'>+					  iph-&gt;saddr, iph-&gt;daddr, 0);</div><div class='add'>+	} else {</div><div class='add'>+		if (unlikely(!pskb_may_pull(skb,</div><div class='add'>+					    gre_hdr_len + sizeof(*ershdr))))</div><div class='add'>+			return PACKET_REJECT;</div><div class='ctx'> </div><div class='del'>-	/* The original GRE header does not have key field,</div><div class='del'>-	 * Use ERSPAN 10-bit session ID as key.</div><div class='del'>-	 */</div><div class='del'>-	tpi-&gt;key = cpu_to_be32(get_session_id(ershdr));</div><div class='del'>-	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex,</div><div class='del'>-				  tpi-&gt;flags | TUNNEL_KEY,</div><div class='del'>-				  iph-&gt;saddr, iph-&gt;daddr, tpi-&gt;key);</div><div class='add'>+		ershdr = (struct erspan_base_hdr *)(skb-&gt;data + gre_hdr_len);</div><div class='add'>+		ver = ershdr-&gt;ver;</div><div class='add'>+		iph = ip_hdr(skb);</div><div class='add'>+		__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+		tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags,</div><div class='add'>+					  iph-&gt;saddr, iph-&gt;daddr, tpi-&gt;key);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel) {</div><div class='del'>-		len = gre_hdr_len + erspan_hdr_len(ver);</div><div class='add'>+		if (is_erspan_type1(gre_hdr_len))</div><div class='add'>+			len = gre_hdr_len;</div><div class='add'>+		else</div><div class='add'>+			len = gre_hdr_len + erspan_hdr_len(ver);</div><div class='add'>+</div><div class='ctx'> 		if (unlikely(!pskb_may_pull(skb, len)))</div><div class='ctx'> 			return PACKET_REJECT;</div><div class='ctx'> </div><div class='del'>-		ershdr = (struct erspan_base_hdr *)(skb-&gt;data + gre_hdr_len);</div><div class='del'>-		pkt_md = (struct erspan_metadata *)(ershdr + 1);</div><div class='del'>-</div><div class='ctx'> 		if (__iptunnel_pull_header(skb,</div><div class='ctx'> 					   len,</div><div class='ctx'> 					   htons(ETH_P_TEB),</div><div class='hunk'>@@ -302,13 +316,13 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='ctx'> 		if (tunnel-&gt;collect_md) {</div><div class='add'>+			struct erspan_metadata *pkt_md, *md;</div><div class='ctx'> 			struct ip_tunnel_info *info;</div><div class='del'>-			struct erspan_metadata *md;</div><div class='add'>+			unsigned char *gh;</div><div class='ctx'> 			__be64 tun_id;</div><div class='del'>-			__be16 flags;</div><div class='ctx'> </div><div class='del'>-			tpi-&gt;flags |= TUNNEL_KEY;</div><div class='del'>-			flags = tpi-&gt;flags;</div><div class='add'>+			__set_bit(IP_TUNNEL_KEY_BIT, tpi-&gt;flags);</div><div class='add'>+			ip_tunnel_flags_copy(flags, tpi-&gt;flags);</div><div class='ctx'> 			tun_id = key32_to_tunnel_id(tpi-&gt;key);</div><div class='ctx'> </div><div class='ctx'> 			tun_dst = ip_tun_rx_dst(skb, flags,</div><div class='hunk'>@@ -316,6 +330,14 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 			if (!tun_dst)</div><div class='ctx'> 				return PACKET_REJECT;</div><div class='ctx'> </div><div class='add'>+			/* skb can be uncloned in __iptunnel_pull_header, so</div><div class='add'>+			 * old pkt_md is no longer valid and we need to reset</div><div class='add'>+			 * it</div><div class='add'>+			 */</div><div class='add'>+			gh = skb_network_header(skb) +</div><div class='add'>+			     skb_network_header_len(skb);</div><div class='add'>+			pkt_md = (struct erspan_metadata *)(gh + gre_hdr_len +</div><div class='add'>+							    sizeof(*ershdr));</div><div class='ctx'> 			md = ip_tunnel_info_opts(&amp;tun_dst-&gt;u.tun_info);</div><div class='ctx'> 			md-&gt;version = ver;</div><div class='ctx'> 			md2 = &amp;md-&gt;u.md2;</div><div class='hunk'>@@ -323,7 +345,8 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,</div><div class='ctx'> 						       ERSPAN_V2_MDSIZE);</div><div class='ctx'> </div><div class='ctx'> 			info = &amp;tun_dst-&gt;u.tun_info;</div><div class='del'>-			info-&gt;key.tun_flags |= TUNNEL_ERSPAN_OPT;</div><div class='add'>+			__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT,</div><div class='add'>+				  info-&gt;key.tun_flags);</div><div class='ctx'> 			info-&gt;options_len = sizeof(*md);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -350,19 +373,29 @@ static int __ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi,</div><div class='ctx'> 				  iph-&gt;saddr, iph-&gt;daddr, tpi-&gt;key);</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel) {</div><div class='add'>+		const struct iphdr *tnl_params;</div><div class='add'>+</div><div class='ctx'> 		if (__iptunnel_pull_header(skb, hdr_len, tpi-&gt;proto,</div><div class='ctx'> 					   raw_proto, false) &lt; 0)</div><div class='ctx'> 			goto drop;</div><div class='ctx'> </div><div class='del'>-		if (tunnel-&gt;dev-&gt;type != ARPHRD_NONE)</div><div class='add'>+		/* Special case for ipgre_header_parse(), which expects the</div><div class='add'>+		 * mac_header to point to the outer IP header.</div><div class='add'>+		 */</div><div class='add'>+		if (tunnel-&gt;dev-&gt;header_ops == &amp;ipgre_header_ops)</div><div class='ctx'> 			skb_pop_mac_header(skb);</div><div class='ctx'> 		else</div><div class='ctx'> 			skb_reset_mac_header(skb);</div><div class='del'>-		if (tunnel-&gt;collect_md) {</div><div class='del'>-			__be16 flags;</div><div class='add'>+</div><div class='add'>+		tnl_params = &amp;tunnel-&gt;parms.iph;</div><div class='add'>+		if (tunnel-&gt;collect_md || tnl_params-&gt;daddr == 0) {</div><div class='add'>+			IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 			__be64 tun_id;</div><div class='ctx'> </div><div class='del'>-			flags = tpi-&gt;flags &amp; (TUNNEL_CSUM | TUNNEL_KEY);</div><div class='add'>+			__set_bit(IP_TUNNEL_CSUM_BIT, flags);</div><div class='add'>+			__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+			ip_tunnel_flags_and(flags, tpi-&gt;flags, flags);</div><div class='add'>+</div><div class='ctx'> 			tun_id = key32_to_tunnel_id(tpi-&gt;key);</div><div class='ctx'> 			tun_dst = ip_tun_rx_dst(skb, flags, tun_id, 0);</div><div class='ctx'> 			if (!tun_dst)</div><div class='hunk'>@@ -442,14 +475,15 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		       __be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> </div><div class='del'>-	if (tunnel-&gt;parms.o_flags &amp; TUNNEL_SEQ)</div><div class='del'>-		tunnel-&gt;o_seqno++;</div><div class='add'>+	ip_tunnel_flags_copy(flags, tunnel-&gt;parms.o_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Push GRE header. */</div><div class='ctx'> 	gre_build_header(skb, tunnel-&gt;tun_hlen,</div><div class='del'>-			 tunnel-&gt;parms.o_flags, proto, tunnel-&gt;parms.o_key,</div><div class='del'>-			 htonl(tunnel-&gt;o_seqno));</div><div class='add'>+			 flags, proto, tunnel-&gt;parms.o_key,</div><div class='add'>+			 test_bit(IP_TUNNEL_SEQ_BIT, flags) ?</div><div class='add'>+			 htonl(atomic_fetch_inc(&amp;tunnel-&gt;o_seqno)) : 0);</div><div class='ctx'> </div><div class='ctx'> 	ip_tunnel_xmit(skb, dev, tnl_params, tnl_params-&gt;protocol);</div><div class='ctx'> }</div><div class='hunk'>@@ -459,81 +493,14 @@ static int gre_handle_offloads(struct sk_buff *skb, bool csum)</div><div class='ctx'> 	return iptunnel_handle_offloads(skb, csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rtable *gre_get_rt(struct sk_buff *skb,</div><div class='del'>-				 struct net_device *dev,</div><div class='del'>-				 struct flowi4 *fl,</div><div class='del'>-				 const struct ip_tunnel_key *key)</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	memset(fl, 0, sizeof(*fl));</div><div class='del'>-	fl-&gt;daddr = key-&gt;u.ipv4.dst;</div><div class='del'>-	fl-&gt;saddr = key-&gt;u.ipv4.src;</div><div class='del'>-	fl-&gt;flowi4_tos = RT_TOS(key-&gt;tos);</div><div class='del'>-	fl-&gt;flowi4_mark = skb-&gt;mark;</div><div class='del'>-	fl-&gt;flowi4_proto = IPPROTO_GRE;</div><div class='del'>-</div><div class='del'>-	return ip_route_output_key(net, fl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtable *prepare_fb_xmit(struct sk_buff *skb,</div><div class='del'>-				      struct net_device *dev,</div><div class='del'>-				      struct flowi4 *fl,</div><div class='del'>-				      int tunnel_hlen)</div><div class='del'>-{</div><div class='del'>-	struct ip_tunnel_info *tun_info;</div><div class='del'>-	const struct ip_tunnel_key *key;</div><div class='del'>-	struct rtable *rt = NULL;</div><div class='del'>-	int min_headroom;</div><div class='del'>-	bool use_cache;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	tun_info = skb_tunnel_info(skb);</div><div class='del'>-	key = &amp;tun_info-&gt;key;</div><div class='del'>-	use_cache = ip_tunnel_dst_cache_usable(skb, tun_info);</div><div class='del'>-</div><div class='del'>-	if (use_cache)</div><div class='del'>-		rt = dst_cache_get_ip4(&amp;tun_info-&gt;dst_cache, &amp;fl-&gt;saddr);</div><div class='del'>-	if (!rt) {</div><div class='del'>-		rt = gre_get_rt(skb, dev, fl, key);</div><div class='del'>-		if (IS_ERR(rt))</div><div class='del'>-			goto err_free_skb;</div><div class='del'>-		if (use_cache)</div><div class='del'>-			dst_cache_set_ip4(&amp;tun_info-&gt;dst_cache, &amp;rt-&gt;dst,</div><div class='del'>-					  fl-&gt;saddr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	min_headroom = LL_RESERVED_SPACE(rt-&gt;dst.dev) + rt-&gt;dst.header_len</div><div class='del'>-			+ tunnel_hlen + sizeof(struct iphdr);</div><div class='del'>-	if (skb_headroom(skb) &lt; min_headroom || skb_header_cloned(skb)) {</div><div class='del'>-		int head_delta = SKB_DATA_ALIGN(min_headroom -</div><div class='del'>-						skb_headroom(skb) +</div><div class='del'>-						16);</div><div class='del'>-		err = pskb_expand_head(skb, max_t(int, head_delta, 0),</div><div class='del'>-				       0, GFP_ATOMIC);</div><div class='del'>-		if (unlikely(err))</div><div class='del'>-			goto err_free_rt;</div><div class='del'>-	}</div><div class='del'>-	return rt;</div><div class='del'>-</div><div class='del'>-err_free_rt:</div><div class='del'>-	ip_rt_put(rt);</div><div class='del'>-err_free_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void gre_fb_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			__be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	struct ip_tunnel_info *tun_info;</div><div class='ctx'> 	const struct ip_tunnel_key *key;</div><div class='del'>-	struct rtable *rt = NULL;</div><div class='del'>-	struct flowi4 fl;</div><div class='ctx'> 	int tunnel_hlen;</div><div class='del'>-	__be16 df, flags;</div><div class='ctx'> </div><div class='ctx'> 	tun_info = skb_tunnel_info(skb);</div><div class='ctx'> 	if (unlikely(!tun_info || !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='hunk'>@@ -543,48 +510,45 @@ static void gre_fb_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	key = &amp;tun_info-&gt;key;</div><div class='ctx'> 	tunnel_hlen = gre_calc_hlen(key-&gt;tun_flags);</div><div class='ctx'> </div><div class='del'>-	rt = prepare_fb_xmit(skb, dev, &amp;fl, tunnel_hlen);</div><div class='del'>-	if (!rt)</div><div class='del'>-		return;</div><div class='add'>+	if (skb_cow_head(skb, dev-&gt;needed_headroom))</div><div class='add'>+		goto err_free_skb;</div><div class='ctx'> </div><div class='ctx'> 	/* Push Tunnel header. */</div><div class='del'>-	if (gre_handle_offloads(skb, !!(tun_info-&gt;key.tun_flags &amp; TUNNEL_CSUM)))</div><div class='del'>-		goto err_free_rt;</div><div class='add'>+	if (gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+					      tunnel-&gt;parms.o_flags)))</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+</div><div class='add'>+	__set_bit(IP_TUNNEL_CSUM_BIT, flags);</div><div class='add'>+	__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+	__set_bit(IP_TUNNEL_SEQ_BIT, flags);</div><div class='add'>+	ip_tunnel_flags_and(flags, tun_info-&gt;key.tun_flags, flags);</div><div class='ctx'> </div><div class='del'>-	flags = tun_info-&gt;key.tun_flags &amp;</div><div class='del'>-		(TUNNEL_CSUM | TUNNEL_KEY | TUNNEL_SEQ);</div><div class='ctx'> 	gre_build_header(skb, tunnel_hlen, flags, proto,</div><div class='ctx'> 			 tunnel_id_to_key32(tun_info-&gt;key.tun_id),</div><div class='del'>-			 (flags &amp; TUNNEL_SEQ) ? htonl(tunnel-&gt;o_seqno++) : 0);</div><div class='add'>+			 test_bit(IP_TUNNEL_SEQ_BIT, flags) ?</div><div class='add'>+			 htonl(atomic_fetch_inc(&amp;tunnel-&gt;o_seqno)) : 0);</div><div class='ctx'> </div><div class='del'>-	df = key-&gt;tun_flags &amp; TUNNEL_DONT_FRAGMENT ?  htons(IP_DF) : 0;</div><div class='add'>+	ip_md_tunnel_xmit(skb, dev, IPPROTO_GRE, tunnel_hlen);</div><div class='ctx'> </div><div class='del'>-	iptunnel_xmit(skb-&gt;sk, rt, skb, fl.saddr, key-&gt;u.ipv4.dst, IPPROTO_GRE,</div><div class='del'>-		      key-&gt;tos, key-&gt;ttl, df, false);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-err_free_rt:</div><div class='del'>-	ip_rt_put(rt);</div><div class='ctx'> err_free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			   __be16 proto)</div><div class='add'>+static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	struct ip_tunnel_info *tun_info;</div><div class='ctx'> 	const struct ip_tunnel_key *key;</div><div class='ctx'> 	struct erspan_metadata *md;</div><div class='del'>-	struct rtable *rt = NULL;</div><div class='ctx'> 	bool truncate = false;</div><div class='del'>-	struct flowi4 fl;</div><div class='add'>+	__be16 proto;</div><div class='ctx'> 	int tunnel_hlen;</div><div class='ctx'> 	int version;</div><div class='del'>-	__be16 df;</div><div class='ctx'> 	int nhoff;</div><div class='del'>-	int thoff;</div><div class='ctx'> </div><div class='ctx'> 	tun_info = skb_tunnel_info(skb);</div><div class='ctx'> 	if (unlikely(!tun_info || !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='hunk'>@@ -592,77 +556,88 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		goto err_free_skb;</div><div class='ctx'> </div><div class='ctx'> 	key = &amp;tun_info-&gt;key;</div><div class='del'>-	if (!(tun_info-&gt;key.tun_flags &amp; TUNNEL_ERSPAN_OPT))</div><div class='del'>-		goto err_free_rt;</div><div class='add'>+	if (!test_bit(IP_TUNNEL_ERSPAN_OPT_BIT, tun_info-&gt;key.tun_flags))</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	if (tun_info-&gt;options_len &lt; sizeof(*md))</div><div class='add'>+		goto err_free_skb;</div><div class='ctx'> 	md = ip_tunnel_info_opts(tun_info);</div><div class='del'>-	if (!md)</div><div class='del'>-		goto err_free_rt;</div><div class='ctx'> </div><div class='ctx'> 	/* ERSPAN has fixed 8 byte GRE header */</div><div class='ctx'> 	version = md-&gt;version;</div><div class='ctx'> 	tunnel_hlen = 8 + erspan_hdr_len(version);</div><div class='ctx'> </div><div class='del'>-	rt = prepare_fb_xmit(skb, dev, &amp;fl, tunnel_hlen);</div><div class='del'>-	if (!rt)</div><div class='del'>-		return;</div><div class='add'>+	if (skb_cow_head(skb, dev-&gt;needed_headroom))</div><div class='add'>+		goto err_free_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (gre_handle_offloads(skb, false))</div><div class='del'>-		goto err_free_rt;</div><div class='add'>+		goto err_free_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &gt; dev-&gt;mtu + dev-&gt;hard_header_len) {</div><div class='del'>-		pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len);</div><div class='add'>+		if (pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len))</div><div class='add'>+			goto err_free_skb;</div><div class='ctx'> 		truncate = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nhoff = skb_network_header(skb) - skb_mac_header(skb);</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='ctx'> 	    (ntohs(ip_hdr(skb)-&gt;tot_len) &gt; skb-&gt;len - nhoff))</div><div class='ctx'> 		truncate = true;</div><div class='ctx'> </div><div class='del'>-	thoff = skb_transport_header(skb) - skb_mac_header(skb);</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-	    (ntohs(ipv6_hdr(skb)-&gt;payload_len) &gt; skb-&gt;len - thoff))</div><div class='del'>-		truncate = true;</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		int thoff;</div><div class='add'>+</div><div class='add'>+		if (skb_transport_header_was_set(skb))</div><div class='add'>+			thoff = skb_transport_offset(skb);</div><div class='add'>+		else</div><div class='add'>+			thoff = nhoff + sizeof(struct ipv6hdr);</div><div class='add'>+		if (ntohs(ipv6_hdr(skb)-&gt;payload_len) &gt; skb-&gt;len - thoff)</div><div class='add'>+			truncate = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (version == 1) {</div><div class='ctx'> 		erspan_build_header(skb, ntohl(tunnel_id_to_key32(key-&gt;tun_id)),</div><div class='ctx'> 				    ntohl(md-&gt;u.index), truncate, true);</div><div class='add'>+		proto = htons(ETH_P_ERSPAN);</div><div class='ctx'> 	} else if (version == 2) {</div><div class='ctx'> 		erspan_build_header_v2(skb,</div><div class='ctx'> 				       ntohl(tunnel_id_to_key32(key-&gt;tun_id)),</div><div class='ctx'> 				       md-&gt;u.md2.dir,</div><div class='ctx'> 				       get_hwid(&amp;md-&gt;u.md2),</div><div class='ctx'> 				       truncate, true);</div><div class='add'>+		proto = htons(ETH_P_ERSPAN2);</div><div class='ctx'> 	} else {</div><div class='del'>-		goto err_free_rt;</div><div class='add'>+		goto err_free_skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gre_build_header(skb, 8, TUNNEL_SEQ,</div><div class='del'>-			 htons(ETH_P_ERSPAN), 0, htonl(tunnel-&gt;o_seqno++));</div><div class='add'>+	__set_bit(IP_TUNNEL_SEQ_BIT, flags);</div><div class='add'>+	gre_build_header(skb, 8, flags, proto, 0,</div><div class='add'>+			 htonl(atomic_fetch_inc(&amp;tunnel-&gt;o_seqno)));</div><div class='ctx'> </div><div class='del'>-	df = key-&gt;tun_flags &amp; TUNNEL_DONT_FRAGMENT ?  htons(IP_DF) : 0;</div><div class='add'>+	ip_md_tunnel_xmit(skb, dev, IPPROTO_GRE, tunnel_hlen);</div><div class='ctx'> </div><div class='del'>-	iptunnel_xmit(skb-&gt;sk, rt, skb, fl.saddr, key-&gt;u.ipv4.dst, IPPROTO_GRE,</div><div class='del'>-		      key-&gt;tos, key-&gt;ttl, df, false);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-err_free_rt:</div><div class='del'>-	ip_rt_put(rt);</div><div class='ctx'> err_free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gre_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel_info *info = skb_tunnel_info(skb);</div><div class='add'>+	const struct ip_tunnel_key *key;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> </div><div class='ctx'> 	if (ip_tunnel_info_af(info) != AF_INET)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rt = gre_get_rt(skb, dev, &amp;fl4, &amp;info-&gt;key);</div><div class='add'>+	key = &amp;info-&gt;key;</div><div class='add'>+	ip_tunnel_init_flow(&amp;fl4, IPPROTO_GRE, key-&gt;u.ipv4.dst, key-&gt;u.ipv4.src,</div><div class='add'>+			    tunnel_id_to_key32(key-&gt;tun_id),</div><div class='add'>+			    key-&gt;tos &amp; ~INET_ECN_MASK, dev_net(dev), 0,</div><div class='add'>+			    skb-&gt;mark, skb_get_hash(skb), key-&gt;flow_flags);</div><div class='add'>+	rt = ip_route_output_key(dev_net(dev), &amp;fl4);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return PTR_ERR(rt);</div><div class='ctx'> </div><div class='hunk'>@@ -677,24 +652,32 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	const struct iphdr *tnl_params;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	if (tunnel-&gt;collect_md) {</div><div class='ctx'> 		gre_fb_xmit(skb, dev, skb-&gt;protocol);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;header_ops) {</div><div class='del'>-		/* Need space for new headers */</div><div class='del'>-		if (skb_cow_head(skb, dev-&gt;needed_headroom -</div><div class='del'>-				      (tunnel-&gt;hlen + sizeof(struct iphdr))))</div><div class='add'>+		int pull_len = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+		if (skb_cow_head(skb, 0))</div><div class='add'>+			goto free_skb;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, pull_len))</div><div class='ctx'> 			goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 		tnl_params = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-		/* Pull skb since ip_tunnel_xmit() needs skb-&gt;data pointing</div><div class='del'>-		 * to gre header.</div><div class='del'>-		 */</div><div class='del'>-		skb_pull(skb, tunnel-&gt;hlen + sizeof(struct iphdr));</div><div class='add'>+		/* ip_tunnel_xmit() needs skb-&gt;data pointing to gre header. */</div><div class='add'>+		skb_pull(skb, pull_len);</div><div class='ctx'> 		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+		    skb_checksum_start(skb) &lt; skb-&gt;data)</div><div class='add'>+			goto free_skb;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (skb_cow_head(skb, dev-&gt;needed_headroom))</div><div class='ctx'> 			goto free_skb;</div><div class='hunk'>@@ -702,7 +685,8 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,</div><div class='ctx'> 		tnl_params = &amp;tunnel-&gt;parms.iph;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gre_handle_offloads(skb, !!(tunnel-&gt;parms.o_flags &amp; TUNNEL_CSUM)))</div><div class='add'>+	if (gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+					      tunnel-&gt;parms.o_flags)))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	__gre_xmit(skb, dev, tnl_params, skb-&gt;protocol);</div><div class='hunk'>@@ -710,7 +694,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -719,9 +703,13 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	bool truncate = false;</div><div class='add'>+	__be16 proto;</div><div class='add'>+</div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;collect_md) {</div><div class='del'>-		erspan_fb_xmit(skb, dev, skb-&gt;protocol);</div><div class='add'>+		erspan_fb_xmit(skb, dev);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -732,29 +720,36 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &gt; dev-&gt;mtu + dev-&gt;hard_header_len) {</div><div class='del'>-		pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len);</div><div class='add'>+		if (pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len))</div><div class='add'>+			goto free_skb;</div><div class='ctx'> 		truncate = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Push ERSPAN header */</div><div class='del'>-	if (tunnel-&gt;erspan_ver == 1)</div><div class='add'>+	if (tunnel-&gt;erspan_ver == 0) {</div><div class='add'>+		proto = htons(ETH_P_ERSPAN);</div><div class='add'>+		__clear_bit(IP_TUNNEL_SEQ_BIT, tunnel-&gt;parms.o_flags);</div><div class='add'>+	} else if (tunnel-&gt;erspan_ver == 1) {</div><div class='ctx'> 		erspan_build_header(skb, ntohl(tunnel-&gt;parms.o_key),</div><div class='ctx'> 				    tunnel-&gt;index,</div><div class='ctx'> 				    truncate, true);</div><div class='del'>-	else if (tunnel-&gt;erspan_ver == 2)</div><div class='add'>+		proto = htons(ETH_P_ERSPAN);</div><div class='add'>+	} else if (tunnel-&gt;erspan_ver == 2) {</div><div class='ctx'> 		erspan_build_header_v2(skb, ntohl(tunnel-&gt;parms.o_key),</div><div class='ctx'> 				       tunnel-&gt;dir, tunnel-&gt;hwid,</div><div class='ctx'> 				       truncate, true);</div><div class='del'>-	else</div><div class='add'>+		proto = htons(ETH_P_ERSPAN2);</div><div class='add'>+	} else {</div><div class='ctx'> 		goto free_skb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	tunnel-&gt;parms.o_flags &amp;= ~TUNNEL_KEY;</div><div class='del'>-	__gre_xmit(skb, dev, &amp;tunnel-&gt;parms.iph, htons(ETH_P_ERSPAN));</div><div class='add'>+	__clear_bit(IP_TUNNEL_KEY_BIT, tunnel-&gt;parms.o_flags);</div><div class='add'>+	__gre_xmit(skb, dev, &amp;tunnel-&gt;parms.iph, proto);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -763,12 +758,16 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	if (tunnel-&gt;collect_md) {</div><div class='ctx'> 		gre_fb_xmit(skb, dev, htons(ETH_P_TEB));</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gre_handle_offloads(skb, !!(tunnel-&gt;parms.o_flags &amp; TUNNEL_CSUM)))</div><div class='add'>+	if (gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+					      tunnel-&gt;parms.o_flags)))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cow_head(skb, dev-&gt;needed_headroom))</div><div class='hunk'>@@ -779,7 +778,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -793,64 +792,67 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)</div><div class='ctx'> 	len = tunnel-&gt;tun_hlen - len;</div><div class='ctx'> 	tunnel-&gt;hlen = tunnel-&gt;hlen + len;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;needed_headroom = dev-&gt;needed_headroom + len;</div><div class='add'>+	if (dev-&gt;header_ops)</div><div class='add'>+		dev-&gt;hard_header_len += len;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;needed_headroom += len;</div><div class='add'>+</div><div class='ctx'> 	if (set_mtu)</div><div class='del'>-		dev-&gt;mtu = max_t(int, dev-&gt;mtu - len, 68);</div><div class='del'>-</div><div class='del'>-	if (!(tunnel-&gt;parms.o_flags &amp; TUNNEL_SEQ)) {</div><div class='del'>-		if (!(tunnel-&gt;parms.o_flags &amp; TUNNEL_CSUM) ||</div><div class='del'>-		    tunnel-&gt;encap.type == TUNNEL_ENCAP_NONE) {</div><div class='del'>-			dev-&gt;features |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-			dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-		} else {</div><div class='del'>-			dev-&gt;features &amp;= ~NETIF_F_GSO_SOFTWARE;</div><div class='del'>-			dev-&gt;hw_features &amp;= ~NETIF_F_GSO_SOFTWARE;</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;features |= NETIF_F_LLTX;</div><div class='del'>-	} else {</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, max_t(int, dev-&gt;mtu - len, 68));</div><div class='add'>+</div><div class='add'>+	if (test_bit(IP_TUNNEL_SEQ_BIT, tunnel-&gt;parms.o_flags) ||</div><div class='add'>+	    (test_bit(IP_TUNNEL_CSUM_BIT, tunnel-&gt;parms.o_flags) &amp;&amp;</div><div class='add'>+	     tunnel-&gt;encap.type != TUNNEL_ENCAP_NONE)) {</div><div class='add'>+		dev-&gt;features &amp;= ~NETIF_F_GSO_SOFTWARE;</div><div class='ctx'> 		dev-&gt;hw_features &amp;= ~NETIF_F_GSO_SOFTWARE;</div><div class='del'>-		dev-&gt;features &amp;= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+		dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipgre_tunnel_ioctl(struct net_device *dev,</div><div class='del'>-			      struct ifreq *ifr, int cmd)</div><div class='add'>+static int ipgre_tunnel_ctl(struct net_device *dev,</div><div class='add'>+			    struct ip_tunnel_parm_kern *p,</div><div class='add'>+			    int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='add'>+	__be16 i_flags, o_flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!ip_tunnel_flags_is_be16_compat(p-&gt;i_flags) ||</div><div class='add'>+	    !ip_tunnel_flags_is_be16_compat(p-&gt;o_flags))</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	i_flags = ip_tunnel_flags_to_be16(p-&gt;i_flags);</div><div class='add'>+	o_flags = ip_tunnel_flags_to_be16(p-&gt;o_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SIOCADDTUNNEL || cmd == SIOCCHGTUNNEL) {</div><div class='del'>-		if (p.iph.version != 4 || p.iph.protocol != IPPROTO_GRE ||</div><div class='del'>-		    p.iph.ihl != 5 || (p.iph.frag_off &amp; htons(~IP_DF)) ||</div><div class='del'>-		    ((p.i_flags | p.o_flags) &amp; (GRE_VERSION | GRE_ROUTING)))</div><div class='add'>+		if (p-&gt;iph.version != 4 || p-&gt;iph.protocol != IPPROTO_GRE ||</div><div class='add'>+		    p-&gt;iph.ihl != 5 || (p-&gt;iph.frag_off &amp; htons(~IP_DF)) ||</div><div class='add'>+		    ((i_flags | o_flags) &amp; (GRE_VERSION | GRE_ROUTING)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p.i_flags = gre_flags_to_tnl_flags(p.i_flags);</div><div class='del'>-	p.o_flags = gre_flags_to_tnl_flags(p.o_flags);</div><div class='add'>+	gre_flags_to_tnl_flags(p-&gt;i_flags, i_flags);</div><div class='add'>+	gre_flags_to_tnl_flags(p-&gt;o_flags, o_flags);</div><div class='ctx'> </div><div class='del'>-	err = ip_tunnel_ioctl(dev, &amp;p, cmd);</div><div class='add'>+	err = ip_tunnel_ctl(dev, p, cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SIOCCHGTUNNEL) {</div><div class='ctx'> 		struct ip_tunnel *t = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-		t-&gt;parms.i_flags = p.i_flags;</div><div class='del'>-		t-&gt;parms.o_flags = p.o_flags;</div><div class='add'>+		ip_tunnel_flags_copy(t-&gt;parms.i_flags, p-&gt;i_flags);</div><div class='add'>+		ip_tunnel_flags_copy(t-&gt;parms.o_flags, p-&gt;o_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (strcmp(dev-&gt;rtnl_link_ops-&gt;kind, "erspan"))</div><div class='ctx'> 			ipgre_link_update(dev, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p.i_flags = gre_tnl_flags_to_gre_flags(p.i_flags);</div><div class='del'>-	p.o_flags = gre_tnl_flags_to_gre_flags(p.o_flags);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	i_flags = gre_tnl_flags_to_gre_flags(p-&gt;i_flags);</div><div class='add'>+	ip_tunnel_flags_from_be16(p-&gt;i_flags, i_flags);</div><div class='add'>+	o_flags = gre_tnl_flags_to_gre_flags(p-&gt;o_flags);</div><div class='add'>+	ip_tunnel_flags_from_be16(p-&gt;o_flags, o_flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -926,15 +928,18 @@ static int ipgre_open(struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ipv4_is_multicast(t-&gt;parms.iph.daddr)) {</div><div class='del'>-		struct flowi4 fl4;</div><div class='add'>+		struct flowi4 fl4 = {</div><div class='add'>+			.flowi4_oif = t-&gt;parms.link,</div><div class='add'>+			.flowi4_dscp = ip4h_dscp(&amp;t-&gt;parms.iph),</div><div class='add'>+			.flowi4_scope = RT_SCOPE_UNIVERSE,</div><div class='add'>+			.flowi4_proto = IPPROTO_GRE,</div><div class='add'>+			.saddr = t-&gt;parms.iph.saddr,</div><div class='add'>+			.daddr = t-&gt;parms.iph.daddr,</div><div class='add'>+			.fl4_gre_key = t-&gt;parms.o_key,</div><div class='add'>+		};</div><div class='ctx'> 		struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-		rt = ip_route_output_gre(t-&gt;net, &amp;fl4,</div><div class='del'>-					 t-&gt;parms.iph.daddr,</div><div class='del'>-					 t-&gt;parms.iph.saddr,</div><div class='del'>-					 t-&gt;parms.o_key,</div><div class='del'>-					 RT_TOS(t-&gt;parms.iph.tos),</div><div class='del'>-					 t-&gt;parms.link);</div><div class='add'>+		rt = ip_route_output_key(t-&gt;net, &amp;fl4);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='ctx'> 			return -EADDRNOTAVAIL;</div><div class='ctx'> 		dev = rt-&gt;dst.dev;</div><div class='hunk'>@@ -969,10 +974,11 @@ static const struct net_device_ops ipgre_netdev_ops = {</div><div class='ctx'> 	.ndo_stop		= ipgre_close,</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_start_xmit		= ipgre_xmit,</div><div class='del'>-	.ndo_do_ioctl		= ipgre_tunnel_ioctl,</div><div class='add'>+	.ndo_siocdevprivate	= ip_tunnel_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu		= ip_tunnel_change_mtu,</div><div class='del'>-	.ndo_get_stats64	= ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_get_stats64	= dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink		= ip_tunnel_get_iflink,</div><div class='add'>+	.ndo_tunnel_ctl		= ipgre_tunnel_ctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define GRE_FEATURES (NETIF_F_SG |		\</div><div class='hunk'>@@ -996,26 +1002,24 @@ static void __gre_tunnel_init(struct net_device *dev)</div><div class='ctx'> 	tunnel-&gt;parms.iph.protocol = IPPROTO_GRE;</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;hlen = tunnel-&gt;tun_hlen + tunnel-&gt;encap_hlen;</div><div class='add'>+	dev-&gt;needed_headroom = tunnel-&gt;hlen + sizeof(tunnel-&gt;parms.iph);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features		|= GRE_FEATURES;</div><div class='ctx'> 	dev-&gt;hw_features	|= GRE_FEATURES;</div><div class='ctx'> </div><div class='del'>-	if (!(tunnel-&gt;parms.o_flags &amp; TUNNEL_SEQ)) {</div><div class='del'>-		/* TCP offload with GRE SEQ is not supported, nor</div><div class='del'>-		 * can we support 2 levels of outer headers requiring</div><div class='del'>-		 * an update.</div><div class='del'>-		 */</div><div class='del'>-		if (!(tunnel-&gt;parms.o_flags &amp; TUNNEL_CSUM) ||</div><div class='del'>-		    (tunnel-&gt;encap.type == TUNNEL_ENCAP_NONE)) {</div><div class='del'>-			dev-&gt;features    |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-			dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-		}</div><div class='add'>+	/* TCP offload with GRE SEQ is not supported, nor can we support 2</div><div class='add'>+	 * levels of outer headers requiring an update.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(IP_TUNNEL_SEQ_BIT, tunnel-&gt;parms.o_flags))</div><div class='add'>+		return;</div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, tunnel-&gt;parms.o_flags) &amp;&amp;</div><div class='add'>+	    tunnel-&gt;encap.type != TUNNEL_ENCAP_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		/* Can use a lockless transmit, unless we generate</div><div class='del'>-		 * output sequences</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;features |= NETIF_F_LLTX;</div><div class='del'>-	}</div><div class='add'>+	dev-&gt;features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipgre_tunnel_init(struct net_device *dev)</div><div class='hunk'>@@ -1025,7 +1029,7 @@ static int ipgre_tunnel_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	__gre_tunnel_init(dev);</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;iph-&gt;saddr, 4);</div><div class='add'>+	__dev_addr_set(dev, &amp;iph-&gt;saddr, 4);</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;iph-&gt;daddr, 4);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='hunk'>@@ -1039,10 +1043,14 @@ static int ipgre_tunnel_init(struct net_device *dev)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			dev-&gt;flags = IFF_BROADCAST;</div><div class='ctx'> 			dev-&gt;header_ops = &amp;ipgre_header_ops;</div><div class='add'>+			dev-&gt;hard_header_len = tunnel-&gt;hlen + sizeof(*iph);</div><div class='add'>+			dev-&gt;needed_headroom = 0;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (!tunnel-&gt;collect_md) {</div><div class='ctx'> 		dev-&gt;header_ops = &amp;ipgre_header_ops;</div><div class='add'>+		dev-&gt;hard_header_len = tunnel-&gt;hlen + sizeof(*iph);</div><div class='add'>+		dev-&gt;needed_headroom = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ip_tunnel_init(dev);</div><div class='hunk'>@@ -1058,14 +1066,15 @@ static int __net_init ipgre_init_net(struct net *net)</div><div class='ctx'> 	return ip_tunnel_init_net(net, ipgre_net_id, &amp;ipgre_link_ops, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ipgre_exit_batch_net(struct list_head *list_net)</div><div class='add'>+static void __net_exit ipgre_exit_rtnl(struct net *net,</div><div class='add'>+				       struct list_head *dev_to_kill)</div><div class='ctx'> {</div><div class='del'>-	ip_tunnel_delete_nets(list_net, ipgre_net_id, &amp;ipgre_link_ops);</div><div class='add'>+	ip_tunnel_delete_net(net, ipgre_net_id, &amp;ipgre_link_ops, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ipgre_net_ops = {</div><div class='ctx'> 	.init = ipgre_init_net,</div><div class='del'>-	.exit_batch = ipgre_exit_batch_net,</div><div class='add'>+	.exit_rtnl = ipgre_exit_rtnl,</div><div class='ctx'> 	.id   = &amp;ipgre_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip_tunnel_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -1132,7 +1141,11 @@ static int erspan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* ERSPAN should only have GRE sequence and key flag */</div><div class='add'>+	if (data[IFLA_GRE_ERSPAN_VER] &amp;&amp;</div><div class='add'>+	    nla_get_u8(data[IFLA_GRE_ERSPAN_VER]) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* ERSPAN type II/III should only have GRE sequence and key flag */</div><div class='ctx'> 	if (data[IFLA_GRE_OFLAGS])</div><div class='ctx'> 		flags |= nla_get_be16(data[IFLA_GRE_OFLAGS]);</div><div class='ctx'> 	if (data[IFLA_GRE_IFLAGS])</div><div class='hunk'>@@ -1158,7 +1171,7 @@ static int erspan_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> static int ipgre_netlink_parms(struct net_device *dev,</div><div class='ctx'> 				struct nlattr *data[],</div><div class='ctx'> 				struct nlattr *tb[],</div><div class='del'>-				struct ip_tunnel_parm *parms,</div><div class='add'>+				struct ip_tunnel_parm_kern *parms,</div><div class='ctx'> 				__u32 *fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='hunk'>@@ -1174,10 +1187,12 @@ static int ipgre_netlink_parms(struct net_device *dev,</div><div class='ctx'> 		parms-&gt;link = nla_get_u32(data[IFLA_GRE_LINK]);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_IFLAGS])</div><div class='del'>-		parms-&gt;i_flags = gre_flags_to_tnl_flags(nla_get_be16(data[IFLA_GRE_IFLAGS]));</div><div class='add'>+		gre_flags_to_tnl_flags(parms-&gt;i_flags,</div><div class='add'>+				       nla_get_be16(data[IFLA_GRE_IFLAGS]));</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_OFLAGS])</div><div class='del'>-		parms-&gt;o_flags = gre_flags_to_tnl_flags(nla_get_be16(data[IFLA_GRE_OFLAGS]));</div><div class='add'>+		gre_flags_to_tnl_flags(parms-&gt;o_flags,</div><div class='add'>+				       nla_get_be16(data[IFLA_GRE_OFLAGS]));</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_IKEY])</div><div class='ctx'> 		parms-&gt;i_key = nla_get_be32(data[IFLA_GRE_IKEY]);</div><div class='hunk'>@@ -1219,10 +1234,28 @@ static int ipgre_netlink_parms(struct net_device *dev,</div><div class='ctx'> 	if (data[IFLA_GRE_FWMARK])</div><div class='ctx'> 		*fwmark = nla_get_u32(data[IFLA_GRE_FWMARK]);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erspan_netlink_parms(struct net_device *dev,</div><div class='add'>+				struct nlattr *data[],</div><div class='add'>+				struct nlattr *tb[],</div><div class='add'>+				struct ip_tunnel_parm_kern *parms,</div><div class='add'>+				__u32 *fwmark)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ipgre_netlink_parms(dev, data, tb, parms, fwmark);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (data[IFLA_GRE_ERSPAN_VER]) {</div><div class='ctx'> 		t-&gt;erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;erspan_ver != 1 &amp;&amp; t-&gt;erspan_ver != 2)</div><div class='add'>+		if (t-&gt;erspan_ver &gt; 2)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1298,7 +1331,7 @@ static const struct net_device_ops gre_tap_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_change_mtu		= ip_tunnel_change_mtu,</div><div class='del'>-	.ndo_get_stats64	= ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_get_stats64	= dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink		= ip_tunnel_get_iflink,</div><div class='ctx'> 	.ndo_fill_metadata_dst	= gre_fill_metadata_dst,</div><div class='ctx'> };</div><div class='hunk'>@@ -1307,7 +1340,11 @@ static int erspan_tunnel_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	tunnel-&gt;tun_hlen = 8;</div><div class='add'>+	if (tunnel-&gt;erspan_ver == 0)</div><div class='add'>+		tunnel-&gt;tun_hlen = 4; /* 4-byte GRE hdr. */</div><div class='add'>+	else</div><div class='add'>+		tunnel-&gt;tun_hlen = 8; /* 8-byte GRE hdr. */</div><div class='add'>+</div><div class='ctx'> 	tunnel-&gt;parms.iph.protocol = IPPROTO_GRE;</div><div class='ctx'> 	tunnel-&gt;hlen = tunnel-&gt;tun_hlen + tunnel-&gt;encap_hlen +</div><div class='ctx'> 		       erspan_hdr_len(tunnel-&gt;erspan_ver);</div><div class='hunk'>@@ -1327,7 +1364,7 @@ static const struct net_device_ops erspan_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_change_mtu		= ip_tunnel_change_mtu,</div><div class='del'>-	.ndo_get_stats64	= ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_get_stats64	= dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink		= ip_tunnel_get_iflink,</div><div class='ctx'> 	.ndo_fill_metadata_dst	= gre_fill_metadata_dst,</div><div class='ctx'> };</div><div class='hunk'>@@ -1342,33 +1379,62 @@ static void ipgre_tap_setup(struct net_device *dev)</div><div class='ctx'> 	ip_tunnel_setup(dev, gre_tap_net_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool is_gretap_dev(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;netdev_ops == &amp;gre_tap_netdev_ops;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(is_gretap_dev);</div><div class='del'>-</div><div class='del'>-static int ipgre_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			 struct nlattr *tb[], struct nlattr *data[],</div><div class='del'>-			 struct netlink_ext_ack *extack)</div><div class='add'>+static int</div><div class='add'>+ipgre_newlink_encap_setup(struct net_device *dev, struct nlattr *data[])</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='del'>-	__u32 fwmark = 0;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (ipgre_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-		err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='add'>+		int err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipgre_newlink(struct net_device *dev,</div><div class='add'>+			 struct rtnl_newlink_params *params,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='add'>+	__u32 fwmark = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ipgre_newlink_encap_setup(dev, data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = ipgre_netlink_parms(dev, data, tb, &amp;p, &amp;fwmark);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	return ip_tunnel_newlink(dev, tb, &amp;p, fwmark);</div><div class='add'>+	return ip_tunnel_newlink(params-&gt;link_net ? : dev_net(dev), dev, tb, &amp;p,</div><div class='add'>+				 fwmark);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erspan_newlink(struct net_device *dev,</div><div class='add'>+			  struct rtnl_newlink_params *params,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='add'>+	__u32 fwmark = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ipgre_newlink_encap_setup(dev, data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = erspan_netlink_parms(dev, data, tb, &amp;p, &amp;fwmark);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return ip_tunnel_newlink(params-&gt;link_net ? : dev_net(dev), dev, tb, &amp;p,</div><div class='add'>+				 fwmark);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='hunk'>@@ -1376,17 +1442,13 @@ static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_encap ipencap;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='ctx'> 	__u32 fwmark = t-&gt;fwmark;</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (ipgre_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='del'>-		err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='del'>-</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	err = ipgre_newlink_encap_setup(dev, data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = ipgre_netlink_parms(dev, data, tb, &amp;p, &amp;fwmark);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1396,11 +1458,37 @@ static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	t-&gt;parms.i_flags = p.i_flags;</div><div class='del'>-	t-&gt;parms.o_flags = p.o_flags;</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.i_flags, p.i_flags);</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.o_flags, p.o_flags);</div><div class='add'>+</div><div class='add'>+	ipgre_link_update(dev, !tb[IFLA_MTU]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erspan_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			     struct nlattr *data[],</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='add'>+	__u32 fwmark = t-&gt;fwmark;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ipgre_newlink_encap_setup(dev, data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = erspan_netlink_parms(dev, data, tb, &amp;p, &amp;fwmark);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ip_tunnel_changelink(dev, tb, &amp;p, fwmark);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(dev-&gt;rtnl_link_ops-&gt;kind, "erspan"))</div><div class='del'>-		ipgre_link_update(dev, !tb[IFLA_MTU]);</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.i_flags, p.i_flags);</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.o_flags, p.o_flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1456,13 +1544,16 @@ static size_t ipgre_get_size(const struct net_device *dev)</div><div class='ctx'> static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm *p = &amp;t-&gt;parms;</div><div class='add'>+	struct ip_tunnel_parm_kern *p = &amp;t-&gt;parms;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(o_flags);</div><div class='add'>+</div><div class='add'>+	ip_tunnel_flags_copy(o_flags, p-&gt;o_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_GRE_LINK, p-&gt;link) ||</div><div class='ctx'> 	    nla_put_be16(skb, IFLA_GRE_IFLAGS,</div><div class='ctx'> 			 gre_tnl_flags_to_gre_flags(p-&gt;i_flags)) ||</div><div class='ctx'> 	    nla_put_be16(skb, IFLA_GRE_OFLAGS,</div><div class='del'>-			 gre_tnl_flags_to_gre_flags(p-&gt;o_flags)) ||</div><div class='add'>+			 gre_tnl_flags_to_gre_flags(o_flags)) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_GRE_IKEY, p-&gt;i_key) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_GRE_OKEY, p-&gt;o_key) ||</div><div class='ctx'> 	    nla_put_in_addr(skb, IFLA_GRE_LOCAL, p-&gt;iph.saddr) ||</div><div class='hunk'>@@ -1492,20 +1583,35 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t-&gt;erspan_ver))</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;erspan_ver == 1) {</div><div class='del'>-		if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t-&gt;index))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	} else if (t-&gt;erspan_ver == 2) {</div><div class='del'>-		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t-&gt;dir))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t-&gt;hwid))</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erspan_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (t-&gt;erspan_ver &lt;= 2) {</div><div class='add'>+		if (t-&gt;erspan_ver != 0 &amp;&amp; !t-&gt;collect_md)</div><div class='add'>+			__set_bit(IP_TUNNEL_KEY_BIT, t-&gt;parms.o_flags);</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t-&gt;erspan_ver))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (t-&gt;erspan_ver == 1) {</div><div class='add'>+			if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t-&gt;index))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		} else if (t-&gt;erspan_ver == 2) {</div><div class='add'>+			if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t-&gt;dir))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t-&gt;hwid))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ipgre_fill_info(skb, dev);</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='hunk'>@@ -1516,6 +1622,7 @@ static void erspan_setup(struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	ether_setup(dev);</div><div class='add'>+	dev-&gt;max_mtu = 0;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;erspan_netdev_ops;</div><div class='ctx'> 	dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='hunk'>@@ -1529,8 +1636,8 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {</div><div class='ctx'> 	[IFLA_GRE_OFLAGS]	= { .type = NLA_U16 },</div><div class='ctx'> 	[IFLA_GRE_IKEY]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_GRE_OKEY]		= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_GRE_LOCAL]	= { .len = FIELD_SIZEOF(struct iphdr, saddr) },</div><div class='del'>-	[IFLA_GRE_REMOTE]	= { .len = FIELD_SIZEOF(struct iphdr, daddr) },</div><div class='add'>+	[IFLA_GRE_LOCAL]	= { .len = sizeof_field(struct iphdr, saddr) },</div><div class='add'>+	[IFLA_GRE_REMOTE]	= { .len = sizeof_field(struct iphdr, daddr) },</div><div class='ctx'> 	[IFLA_GRE_TTL]		= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_GRE_TOS]		= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_GRE_PMTUDISC]	= { .type = NLA_U8 },</div><div class='hunk'>@@ -1584,17 +1691,18 @@ static struct rtnl_link_ops erspan_link_ops __read_mostly = {</div><div class='ctx'> 	.priv_size	= sizeof(struct ip_tunnel),</div><div class='ctx'> 	.setup		= erspan_setup,</div><div class='ctx'> 	.validate	= erspan_validate,</div><div class='del'>-	.newlink	= ipgre_newlink,</div><div class='del'>-	.changelink	= ipgre_changelink,</div><div class='add'>+	.newlink	= erspan_newlink,</div><div class='add'>+	.changelink	= erspan_changelink,</div><div class='ctx'> 	.dellink	= ip_tunnel_dellink,</div><div class='ctx'> 	.get_size	= ipgre_get_size,</div><div class='del'>-	.fill_info	= ipgre_fill_info,</div><div class='add'>+	.fill_info	= erspan_fill_info,</div><div class='ctx'> 	.get_link_net	= ip_tunnel_get_link_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct net_device *gretap_fb_dev_create(struct net *net, const char *name,</div><div class='ctx'> 					u8 name_assign_type)</div><div class='ctx'> {</div><div class='add'>+	struct rtnl_newlink_params params = { .src_net = net };</div><div class='ctx'> 	struct nlattr *tb[IFLA_MAX + 1];</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	LIST_HEAD(list_kill);</div><div class='hunk'>@@ -1602,9 +1710,10 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;tb, 0, sizeof(tb));</div><div class='add'>+	params.tb = tb;</div><div class='ctx'> </div><div class='ctx'> 	dev = rtnl_create_link(net, name, name_assign_type,</div><div class='del'>-			       &amp;ipgre_tap_ops, tb);</div><div class='add'>+			       &amp;ipgre_tap_ops, tb, NULL);</div><div class='ctx'> 	if (IS_ERR(dev))</div><div class='ctx'> 		return dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1612,7 +1721,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,</div><div class='ctx'> 	t = netdev_priv(dev);</div><div class='ctx'> 	t-&gt;collect_md = true;</div><div class='ctx'> </div><div class='del'>-	err = ipgre_newlink(net, dev, tb, NULL, NULL);</div><div class='add'>+	err = ipgre_newlink(dev, &amp;params, NULL);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='hunk'>@@ -1625,7 +1734,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = rtnl_configure_link(dev, NULL);</div><div class='add'>+	err = rtnl_configure_link(dev, NULL, 0, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1642,14 +1751,15 @@ static int __net_init ipgre_tap_init_net(struct net *net)</div><div class='ctx'> 	return ip_tunnel_init_net(net, gre_tap_net_id, &amp;ipgre_tap_ops, "gretap0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ipgre_tap_exit_batch_net(struct list_head *list_net)</div><div class='add'>+static void __net_exit ipgre_tap_exit_rtnl(struct net *net,</div><div class='add'>+					   struct list_head *dev_to_kill)</div><div class='ctx'> {</div><div class='del'>-	ip_tunnel_delete_nets(list_net, gre_tap_net_id, &amp;ipgre_tap_ops);</div><div class='add'>+	ip_tunnel_delete_net(net, gre_tap_net_id, &amp;ipgre_tap_ops, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ipgre_tap_net_ops = {</div><div class='ctx'> 	.init = ipgre_tap_init_net,</div><div class='del'>-	.exit_batch = ipgre_tap_exit_batch_net,</div><div class='add'>+	.exit_rtnl = ipgre_tap_exit_rtnl,</div><div class='ctx'> 	.id   = &amp;gre_tap_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip_tunnel_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -1660,14 +1770,15 @@ static int __net_init erspan_init_net(struct net *net)</div><div class='ctx'> 				  &amp;erspan_link_ops, "erspan0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit erspan_exit_batch_net(struct list_head *net_list)</div><div class='add'>+static void __net_exit erspan_exit_rtnl(struct net *net,</div><div class='add'>+					struct list_head *dev_to_kill)</div><div class='ctx'> {</div><div class='del'>-	ip_tunnel_delete_nets(net_list, erspan_net_id, &amp;erspan_link_ops);</div><div class='add'>+	ip_tunnel_delete_net(net, erspan_net_id, &amp;erspan_link_ops, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations erspan_net_ops = {</div><div class='ctx'> 	.init = erspan_init_net,</div><div class='del'>-	.exit_batch = erspan_exit_batch_net,</div><div class='add'>+	.exit_rtnl = erspan_exit_rtnl,</div><div class='ctx'> 	.id   = &amp;erspan_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip_tunnel_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -1738,6 +1849,7 @@ static void __exit ipgre_fini(void)</div><div class='ctx'> </div><div class='ctx'> module_init(ipgre_init);</div><div class='ctx'> module_exit(ipgre_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv4 GRE tunnels over IP library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("gre");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("gretap");</div><div class='head'>diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c<br/>index 3196cf58f418..19d3141dad1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_input.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -14,7 +15,6 @@</div><div class='ctx'>  *		Jorge Cwik, &lt;jorge@laser.satlink.net&gt;</div><div class='ctx'>  *		Arnt Gulbrandsen, &lt;agulbra@nvg.unit.no&gt;</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * Fixes:</div><div class='ctx'>  *		Alan Cox	:	Commented a couple of minor bits of surplus code</div><div class='ctx'>  *		Alan Cox	:	Undefining IP_FORWARD doesn't include the code</div><div class='hunk'>@@ -96,8 +96,6 @@</div><div class='ctx'>  *		Jos Vos		:	Do accounting *before* call_in_firewall</div><div class='ctx'>  *	Willy Konynenberg	:	Transparent proxying support</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * To Fix:</div><div class='ctx'>  *		IP fragmentation wants rewriting cleanly. The RFC815 algorithm is much more efficient</div><div class='ctx'>  *		and could be made very efficient with the addition of some virtual memory hacks to permit</div><div class='hunk'>@@ -106,11 +104,6 @@</div><div class='ctx'>  *		interleaved copy algorithm so that fragmenting has a one copy overhead. Actual packet</div><div class='ctx'>  *		output should probably do its own fragmentation at the UDP/RAW layer. TCP shouldn't cause</div><div class='ctx'>  *		fragmentation anyway.</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv4: " fmt</div><div class='hunk'>@@ -130,6 +123,7 @@</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='hunk'>@@ -147,6 +141,8 @@</div><div class='ctx'> #include &lt;linux/mroute.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Process Router Attention IP option (RFC 2113)</div><div class='hunk'>@@ -188,51 +184,61 @@ bool ip_call_ra_chain(struct sk_buff *skb)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int udp_rcv(struct sk_buff *));</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int tcp_v4_rcv(struct sk_buff *));</div><div class='add'>+void ip_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int protocol)</div><div class='ctx'> {</div><div class='del'>-	__skb_pull(skb, skb_network_header_len(skb));</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	{</div><div class='del'>-		int protocol = ip_hdr(skb)-&gt;protocol;</div><div class='del'>-		const struct net_protocol *ipprot;</div><div class='del'>-		int raw;</div><div class='del'>-</div><div class='del'>-	resubmit:</div><div class='del'>-		raw = raw_local_deliver(skb, protocol);</div><div class='del'>-</div><div class='del'>-		ipprot = rcu_dereference(inet_protos[protocol]);</div><div class='del'>-		if (ipprot) {</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			if (!ipprot-&gt;no_policy) {</div><div class='del'>-				if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='del'>-					kfree_skb(skb);</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				nf_reset(skb);</div><div class='add'>+	const struct net_protocol *ipprot;</div><div class='add'>+	int raw, ret;</div><div class='add'>+</div><div class='add'>+resubmit:</div><div class='add'>+	raw = raw_local_deliver(skb, protocol);</div><div class='add'>+</div><div class='add'>+	ipprot = rcu_dereference(inet_protos[protocol]);</div><div class='add'>+	if (ipprot) {</div><div class='add'>+		if (!ipprot-&gt;no_policy) {</div><div class='add'>+			if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='add'>+				kfree_skb_reason(skb,</div><div class='add'>+						 SKB_DROP_REASON_XFRM_POLICY);</div><div class='add'>+				return;</div><div class='ctx'> 			}</div><div class='del'>-			ret = ipprot-&gt;handler(skb);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				protocol = -ret;</div><div class='del'>-				goto resubmit;</div><div class='add'>+			nf_reset_ct(skb);</div><div class='add'>+		}</div><div class='add'>+		ret = INDIRECT_CALL_2(ipprot-&gt;handler, tcp_v4_rcv, udp_rcv,</div><div class='add'>+				      skb);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			protocol = -ret;</div><div class='add'>+			goto resubmit;</div><div class='add'>+		}</div><div class='add'>+		__IP_INC_STATS(net, IPSTATS_MIB_INDELIVERS);</div><div class='add'>+	} else {</div><div class='add'>+		if (!raw) {</div><div class='add'>+			if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='add'>+				__IP_INC_STATS(net, IPSTATS_MIB_INUNKNOWNPROTOS);</div><div class='add'>+				icmp_send(skb, ICMP_DEST_UNREACH,</div><div class='add'>+					  ICMP_PROT_UNREACH, 0);</div><div class='ctx'> 			}</div><div class='del'>-			__IP_INC_STATS(net, IPSTATS_MIB_INDELIVERS);</div><div class='add'>+			kfree_skb_reason(skb, SKB_DROP_REASON_IP_NOPROTO);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (!raw) {</div><div class='del'>-				if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='del'>-					__IP_INC_STATS(net, IPSTATS_MIB_INUNKNOWNPROTOS);</div><div class='del'>-					icmp_send(skb, ICMP_DEST_UNREACH,</div><div class='del'>-						  ICMP_PROT_UNREACH, 0);</div><div class='del'>-				}</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-			} else {</div><div class='del'>-				__IP_INC_STATS(net, IPSTATS_MIB_INDELIVERS);</div><div class='del'>-				consume_skb(skb);</div><div class='del'>-			}</div><div class='add'>+			__IP_INC_STATS(net, IPSTATS_MIB_INDELIVERS);</div><div class='add'>+			consume_skb(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC))) {</div><div class='add'>+		__IP_INC_STATS(net, IPSTATS_MIB_INDISCARDS);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_NOMEM);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_clear_delivery_time(skb);</div><div class='add'>+	__skb_pull(skb, skb_network_header_len(skb));</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ip_protocol_deliver_rcu(net, skb, ip_hdr(skb)-&gt;protocol);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -257,12 +263,13 @@ int ip_local_deliver(struct sk_buff *skb)</div><div class='ctx'> 		       net, NULL, skb, skb-&gt;dev, NULL,</div><div class='ctx'> 		       ip_local_deliver_finish);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ip_local_deliver);</div><div class='ctx'> </div><div class='del'>-static inline bool ip_rcv_options(struct sk_buff *skb)</div><div class='add'>+static inline enum skb_drop_reason</div><div class='add'>+ip_rcv_options(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ip_options *opt;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	struct ip_options *opt;</div><div class='ctx'> </div><div class='ctx'> 	/* It looks as overkill, because not all</div><div class='ctx'> 	   IP options require packet mangling.</div><div class='hunk'>@@ -273,7 +280,7 @@ static inline bool ip_rcv_options(struct sk_buff *skb)</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (skb_cow(skb, skb_headroom(skb))) {</div><div class='ctx'> 		__IP_INC_STATS(dev_net(dev), IPSTATS_MIB_INDISCARDS);</div><div class='del'>-		goto drop;</div><div class='add'>+		return SKB_DROP_REASON_NOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='hunk'>@@ -282,7 +289,7 @@ static inline bool ip_rcv_options(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (ip_options_compile(dev_net(dev), opt, skb)) {</div><div class='ctx'> 		__IP_INC_STATS(dev_net(dev), IPSTATS_MIB_INHDRERRORS);</div><div class='del'>-		goto drop;</div><div class='add'>+		return SKB_DROP_REASON_IP_INHDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(opt-&gt;srr)) {</div><div class='hunk'>@@ -294,42 +301,62 @@ static inline bool ip_rcv_options(struct sk_buff *skb)</div><div class='ctx'> 					net_info_ratelimited("source route option %pI4 -&gt; %pI4\n",</div><div class='ctx'> 							     &amp;iph-&gt;saddr,</div><div class='ctx'> 							     &amp;iph-&gt;daddr);</div><div class='del'>-				goto drop;</div><div class='add'>+				return SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ip_options_rcv_srr(skb))</div><div class='del'>-			goto drop;</div><div class='add'>+		if (ip_options_rcv_srr(skb, dev))</div><div class='add'>+			return SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='del'>-drop:</div><div class='del'>-	return true;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip_rcv_finish_core(struct net *net, struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb)</div><div class='add'>+static bool ip_can_use_hint(const struct sk_buff *skb, const struct iphdr *iph,</div><div class='add'>+			    const struct sk_buff *hint)</div><div class='add'>+{</div><div class='add'>+	return hint &amp;&amp; !skb_dst(skb) &amp;&amp; ip_hdr(hint)-&gt;daddr == iph-&gt;daddr &amp;&amp;</div><div class='add'>+	       ip_hdr(hint)-&gt;tos == iph-&gt;tos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_rcv_finish_core(struct net *net,</div><div class='add'>+			      struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			      const struct sk_buff *hint)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	int (*edemux)(struct sk_buff *skb);</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	int err;</div><div class='add'>+	int drop_reason;</div><div class='add'>+</div><div class='add'>+	if (ip_can_use_hint(skb, iph, hint)) {</div><div class='add'>+		drop_reason = ip_route_use_hint(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+						ip4h_dscp(iph), dev, hint);</div><div class='add'>+		if (unlikely(drop_reason))</div><div class='add'>+			goto drop_error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_ip_early_demux &amp;&amp;</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_early_demux) &amp;&amp;</div><div class='ctx'> 	    !skb_dst(skb) &amp;&amp;</div><div class='ctx'> 	    !skb-&gt;sk &amp;&amp;</div><div class='ctx'> 	    !ip_is_fragment(iph)) {</div><div class='del'>-		const struct net_protocol *ipprot;</div><div class='del'>-		int protocol = iph-&gt;protocol;</div><div class='del'>-</div><div class='del'>-		ipprot = rcu_dereference(inet_protos[protocol]);</div><div class='del'>-		if (ipprot &amp;&amp; (edemux = READ_ONCE(ipprot-&gt;early_demux))) {</div><div class='del'>-			err = edemux(skb);</div><div class='del'>-			if (unlikely(err))</div><div class='del'>-				goto drop_error;</div><div class='del'>-			/* must reload iph, skb-&gt;head might have changed */</div><div class='del'>-			iph = ip_hdr(skb);</div><div class='add'>+		switch (iph-&gt;protocol) {</div><div class='add'>+		case IPPROTO_TCP:</div><div class='add'>+			if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_early_demux)) {</div><div class='add'>+				tcp_v4_early_demux(skb);</div><div class='add'>+</div><div class='add'>+				/* must reload iph, skb-&gt;head might have changed */</div><div class='add'>+				iph = ip_hdr(skb);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_UDP:</div><div class='add'>+			if (READ_ONCE(net-&gt;ipv4.sysctl_udp_early_demux)) {</div><div class='add'>+				drop_reason = udp_v4_early_demux(skb);</div><div class='add'>+				if (unlikely(drop_reason))</div><div class='add'>+					goto drop_error;</div><div class='add'>+</div><div class='add'>+				/* must reload iph, skb-&gt;head might have changed */</div><div class='add'>+				iph = ip_hdr(skb);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -338,10 +365,15 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk,</div><div class='ctx'> 	 *	how the packet travels inside Linux networking.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!skb_valid_dst(skb)) {</div><div class='del'>-		err = ip_route_input_noref(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='del'>-					   iph-&gt;tos, dev);</div><div class='del'>-		if (unlikely(err))</div><div class='add'>+		drop_reason = ip_route_input_noref(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+						   ip4h_dscp(iph), dev);</div><div class='add'>+		if (unlikely(drop_reason))</div><div class='ctx'> 			goto drop_error;</div><div class='add'>+	} else {</div><div class='add'>+		struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+</div><div class='add'>+		if (in_dev &amp;&amp; IN_DEV_ORCONF(in_dev, NOPOLICY))</div><div class='add'>+			IPCB(skb)-&gt;flags |= IPSKB_NOPOLICY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='hunk'>@@ -355,8 +387,11 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (iph-&gt;ihl &gt; 5 &amp;&amp; ip_rcv_options(skb))</div><div class='del'>-		goto drop;</div><div class='add'>+	if (iph-&gt;ihl &gt; 5) {</div><div class='add'>+		drop_reason = ip_rcv_options(skb, dev);</div><div class='add'>+		if (drop_reason)</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rt = skb_rtable(skb);</div><div class='ctx'> 	if (rt-&gt;rt_type == RTN_MULTICAST) {</div><div class='hunk'>@@ -383,24 +418,27 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk,</div><div class='ctx'> 		 * so-called "hole-196" attack) so do it for both.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (in_dev &amp;&amp;</div><div class='del'>-		    IN_DEV_ORCONF(in_dev, DROP_UNICAST_IN_L2_MULTICAST))</div><div class='add'>+		    IN_DEV_ORCONF(in_dev, DROP_UNICAST_IN_L2_MULTICAST)) {</div><div class='add'>+			drop_reason = SKB_DROP_REASON_UNICAST_IN_L2_MULTICAST;</div><div class='ctx'> 			goto drop;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, drop_reason);</div><div class='ctx'> 	return NET_RX_DROP;</div><div class='ctx'> </div><div class='ctx'> drop_error:</div><div class='del'>-	if (err == -EXDEV)</div><div class='add'>+	if (drop_reason == SKB_DROP_REASON_IP_RPFILTER)</div><div class='ctx'> 		__NET_INC_STATS(net, LINUX_MIB_IPRPFILTER);</div><div class='ctx'> 	goto drop;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* if ingress device is enslaved to an L3 master device pass the</div><div class='hunk'>@@ -410,7 +448,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	ret = ip_rcv_finish_core(net, sk, skb);</div><div class='add'>+	ret = ip_rcv_finish_core(net, skb, dev, NULL);</div><div class='ctx'> 	if (ret != NET_RX_DROP)</div><div class='ctx'> 		ret = dst_input(skb);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -422,14 +460,17 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='add'>+	int drop_reason;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='ctx'> 	/* When the interface is in promisc. mode, drop all the crap</div><div class='ctx'> 	 * that it receives, do not try to analyse it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (skb-&gt;pkt_type == PACKET_OTHERHOST)</div><div class='add'>+	if (skb-&gt;pkt_type == PACKET_OTHERHOST) {</div><div class='add'>+		dev_core_stats_rx_otherhost_dropped_inc(skb-&gt;dev);</div><div class='add'>+		drop_reason = SKB_DROP_REASON_OTHERHOST;</div><div class='ctx'> 		goto drop;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__IP_UPD_PO_STATS(net, IPSTATS_MIB_IN, skb-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -439,6 +480,7 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='ctx'> 		goto inhdr_error;</div><div class='ctx'> </div><div class='hunk'>@@ -473,8 +515,9 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net)</div><div class='ctx'> 	if (unlikely(ip_fast_csum((u8 *)iph, iph-&gt;ihl)))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='del'>-	len = ntohs(iph-&gt;tot_len);</div><div class='add'>+	len = iph_totlen(skb, iph);</div><div class='ctx'> 	if (skb-&gt;len &lt; len) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 		__IP_INC_STATS(net, IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	} else if (len &lt; (iph-&gt;ihl*4))</div><div class='hunk'>@@ -489,6 +532,7 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	iph = ip_hdr(skb);</div><div class='ctx'> 	skb-&gt;transport_header = skb-&gt;network_header + iph-&gt;ihl*4;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove any debris in the socket control block */</div><div class='hunk'>@@ -496,16 +540,20 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net)</div><div class='ctx'> 	IPCB(skb)-&gt;iif = skb-&gt;skb_iif;</div><div class='ctx'> </div><div class='ctx'> 	/* Must drop socket now because of tproxy. */</div><div class='del'>-	skb_orphan(skb);</div><div class='add'>+	if (!skb_sk_is_prefetched(skb))</div><div class='add'>+		skb_orphan(skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='ctx'> csum_error:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_IP_CSUM;</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_CSUMERRORS);</div><div class='ctx'> inhdr_error:</div><div class='add'>+	if (drop_reason == SKB_DROP_REASON_NOT_SPECIFIED)</div><div class='add'>+		drop_reason = SKB_DROP_REASON_IP_INHDR;</div><div class='ctx'> 	__IP_INC_STATS(net, IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, drop_reason);</div><div class='ctx'> out:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -521,6 +569,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,</div><div class='ctx'> 	skb = ip_rcv_core(skb, net);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='add'>+</div><div class='ctx'> 	return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING,</div><div class='ctx'> 		       net, NULL, skb, dev, NULL,</div><div class='ctx'> 		       ip_rcv_finish);</div><div class='hunk'>@@ -531,38 +580,49 @@ static void ip_sublist_rcv_finish(struct list_head *head)</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='del'>-		/* Handle ip{6}_forward case, as sch_direct_xmit have</div><div class='del'>-		 * another kind of SKB-list usage (see validate_xmit_skb_list)</div><div class='del'>-		 */</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		dst_input(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip_list_rcv_finish(struct net *net, struct sock *sk,</div><div class='del'>-			       struct list_head *head)</div><div class='add'>+static struct sk_buff *ip_extract_route_hint(const struct net *net,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (fib4_has_custom_rules(net) ||</div><div class='add'>+	    ipv4_is_lbcast(iph-&gt;daddr) ||</div><div class='add'>+	    ipv4_is_zeronet(iph-&gt;daddr) ||</div><div class='add'>+	    IPCB(skb)-&gt;flags &amp; IPSKB_MULTIPATH)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ip_list_rcv_finish(struct net *net, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *next, *hint = NULL;</div><div class='ctx'> 	struct dst_entry *curr_dst = NULL;</div><div class='del'>-	struct sk_buff *skb, *next;</div><div class='del'>-	struct list_head sublist;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='add'>+		struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 		struct dst_entry *dst;</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		/* if ingress device is enslaved to an L3 master device pass the</div><div class='ctx'> 		 * skb to its handler for processing</div><div class='ctx'> 		 */</div><div class='ctx'> 		skb = l3mdev_ip_rcv(skb);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (ip_rcv_finish_core(net, sk, skb) == NET_RX_DROP)</div><div class='add'>+		if (ip_rcv_finish_core(net, skb, dev, hint) == NET_RX_DROP)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dst = skb_dst(skb);</div><div class='ctx'> 		if (curr_dst != dst) {</div><div class='add'>+			hint = ip_extract_route_hint(net, skb);</div><div class='add'>+</div><div class='ctx'> 			/* dispatch old sublist */</div><div class='ctx'> 			if (!list_empty(&amp;sublist))</div><div class='ctx'> 				ip_sublist_rcv_finish(&amp;sublist);</div><div class='hunk'>@@ -581,7 +641,7 @@ static void ip_sublist_rcv(struct list_head *head, struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	NF_HOOK_LIST(NFPROTO_IPV4, NF_INET_PRE_ROUTING, net, NULL,</div><div class='ctx'> 		     head, dev, NULL, ip_rcv_finish);</div><div class='del'>-	ip_list_rcv_finish(net, NULL, head);</div><div class='add'>+	ip_list_rcv_finish(net, head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Receive a list of IP packets */</div><div class='hunk'>@@ -591,14 +651,13 @@ void ip_list_rcv(struct list_head *head, struct packet_type *pt,</div><div class='ctx'> 	struct net_device *curr_dev = NULL;</div><div class='ctx'> 	struct net *curr_net = NULL;</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='del'>-	struct list_head sublist;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='ctx'> 		struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 		struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		skb = ip_rcv_core(skb, net);</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -615,5 +674,6 @@ void ip_list_rcv(struct list_head *head, struct packet_type *pt,</div><div class='ctx'> 		list_add_tail(&amp;skb-&gt;list, &amp;sublist);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* dispatch final sublist */</div><div class='del'>-	ip_sublist_rcv(&amp;sublist, curr_dev, curr_net);</div><div class='add'>+	if (!list_empty(&amp;sublist))</div><div class='add'>+		ip_sublist_rcv(&amp;sublist, curr_dev, curr_net);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c<br/>index ed194d46c00e..be8815ce3ac2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_options.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_options.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/icmp.h&gt;</div><div class='hunk'>@@ -42,39 +42,26 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ip_options_build(struct sk_buff *skb, struct ip_options *opt,</div><div class='del'>-		      __be32 daddr, struct rtable *rt, int is_frag)</div><div class='add'>+		      __be32 daddr, struct rtable *rt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *iph = skb_network_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;(IPCB(skb)-&gt;opt), opt, sizeof(struct ip_options));</div><div class='del'>-	memcpy(iph+sizeof(struct iphdr), opt-&gt;__data, opt-&gt;optlen);</div><div class='add'>+	memcpy(iph + sizeof(struct iphdr), opt-&gt;__data, opt-&gt;optlen);</div><div class='ctx'> 	opt = &amp;(IPCB(skb)-&gt;opt);</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;srr)</div><div class='del'>-		memcpy(iph+opt-&gt;srr+iph[opt-&gt;srr+1]-4, &amp;daddr, 4);</div><div class='add'>+		memcpy(iph + opt-&gt;srr + iph[opt-&gt;srr + 1] - 4, &amp;daddr, 4);</div><div class='ctx'> </div><div class='del'>-	if (!is_frag) {</div><div class='del'>-		if (opt-&gt;rr_needaddr)</div><div class='del'>-			ip_rt_get_source(iph+opt-&gt;rr+iph[opt-&gt;rr+2]-5, skb, rt);</div><div class='del'>-		if (opt-&gt;ts_needaddr)</div><div class='del'>-			ip_rt_get_source(iph+opt-&gt;ts+iph[opt-&gt;ts+2]-9, skb, rt);</div><div class='del'>-		if (opt-&gt;ts_needtime) {</div><div class='del'>-			__be32 midtime;</div><div class='add'>+	if (opt-&gt;rr_needaddr)</div><div class='add'>+		ip_rt_get_source(iph + opt-&gt;rr + iph[opt-&gt;rr + 2] - 5, skb, rt);</div><div class='add'>+	if (opt-&gt;ts_needaddr)</div><div class='add'>+		ip_rt_get_source(iph + opt-&gt;ts + iph[opt-&gt;ts + 2] - 9, skb, rt);</div><div class='add'>+	if (opt-&gt;ts_needtime) {</div><div class='add'>+		__be32 midtime;</div><div class='ctx'> </div><div class='del'>-			midtime = inet_current_timestamp();</div><div class='del'>-			memcpy(iph+opt-&gt;ts+iph[opt-&gt;ts+2]-5, &amp;midtime, 4);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (opt-&gt;rr) {</div><div class='del'>-		memset(iph+opt-&gt;rr, IPOPT_NOP, iph[opt-&gt;rr+1]);</div><div class='del'>-		opt-&gt;rr = 0;</div><div class='del'>-		opt-&gt;rr_needaddr = 0;</div><div class='del'>-	}</div><div class='del'>-	if (opt-&gt;ts) {</div><div class='del'>-		memset(iph+opt-&gt;ts, IPOPT_NOP, iph[opt-&gt;ts+1]);</div><div class='del'>-		opt-&gt;ts = 0;</div><div class='del'>-		opt-&gt;ts_needaddr = opt-&gt;ts_needtime = 0;</div><div class='add'>+		midtime = inet_current_timestamp();</div><div class='add'>+		memcpy(iph + opt-&gt;ts + iph[opt-&gt;ts + 2] - 5, &amp;midtime, 4);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -251,8 +238,9 @@ static void spec_dst_fill(__be32 *spec_dst, struct sk_buff *skb)</div><div class='ctx'>  * If opt == NULL, then skb-&gt;data should point to IP header.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ip_options_compile(struct net *net,</div><div class='del'>-		       struct ip_options *opt, struct sk_buff *skb)</div><div class='add'>+int __ip_options_compile(struct net *net,</div><div class='add'>+			 struct ip_options *opt, struct sk_buff *skb,</div><div class='add'>+			 __be32 *info)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 spec_dst = htonl(INADDR_ANY);</div><div class='ctx'> 	unsigned char *pp_ptr = NULL;</div><div class='hunk'>@@ -468,11 +456,23 @@ eol:</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	if (skb) {</div><div class='del'>-		icmp_send(skb, ICMP_PARAMETERPROB, 0, htonl((pp_ptr-iph)&lt;&lt;24));</div><div class='del'>-	}</div><div class='add'>+	if (info)</div><div class='add'>+		*info = htonl((pp_ptr-iph)&lt;&lt;24);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__ip_options_compile);</div><div class='add'>+</div><div class='add'>+int ip_options_compile(struct net *net,</div><div class='add'>+		       struct ip_options *opt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	__be32 info;</div><div class='add'>+</div><div class='add'>+	ret = __ip_options_compile(net, opt, skb, &amp;info);</div><div class='add'>+	if (ret != 0 &amp;&amp; skb)</div><div class='add'>+		icmp_send(skb, ICMP_PARAMETERPROB, 0, info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ip_options_compile);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -482,39 +482,47 @@ EXPORT_SYMBOL(ip_options_compile);</div><div class='ctx'> void ip_options_undo(struct ip_options *opt)</div><div class='ctx'> {</div><div class='ctx'> 	if (opt-&gt;srr) {</div><div class='del'>-		unsigned  char *optptr = opt-&gt;__data+opt-&gt;srr-sizeof(struct  iphdr);</div><div class='del'>-		memmove(optptr+7, optptr+3, optptr[1]-7);</div><div class='del'>-		memcpy(optptr+3, &amp;opt-&gt;faddr, 4);</div><div class='add'>+		unsigned char *optptr = opt-&gt;__data + opt-&gt;srr - sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+		memmove(optptr + 7, optptr + 3, optptr[1] - 7);</div><div class='add'>+		memcpy(optptr + 3, &amp;opt-&gt;faddr, 4);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (opt-&gt;rr_needaddr) {</div><div class='del'>-		unsigned  char *optptr = opt-&gt;__data+opt-&gt;rr-sizeof(struct  iphdr);</div><div class='add'>+		unsigned char *optptr = opt-&gt;__data + opt-&gt;rr - sizeof(struct iphdr);</div><div class='add'>+</div><div class='ctx'> 		optptr[2] -= 4;</div><div class='del'>-		memset(&amp;optptr[optptr[2]-1], 0, 4);</div><div class='add'>+		memset(&amp;optptr[optptr[2] - 1], 0, 4);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (opt-&gt;ts) {</div><div class='del'>-		unsigned  char *optptr = opt-&gt;__data+opt-&gt;ts-sizeof(struct  iphdr);</div><div class='add'>+		unsigned char *optptr = opt-&gt;__data + opt-&gt;ts - sizeof(struct iphdr);</div><div class='add'>+</div><div class='ctx'> 		if (opt-&gt;ts_needtime) {</div><div class='ctx'> 			optptr[2] -= 4;</div><div class='del'>-			memset(&amp;optptr[optptr[2]-1], 0, 4);</div><div class='del'>-			if ((optptr[3]&amp;0xF) == IPOPT_TS_PRESPEC)</div><div class='add'>+			memset(&amp;optptr[optptr[2] - 1], 0, 4);</div><div class='add'>+			if ((optptr[3] &amp; 0xF) == IPOPT_TS_PRESPEC)</div><div class='ctx'> 				optptr[2] -= 4;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (opt-&gt;ts_needaddr) {</div><div class='ctx'> 			optptr[2] -= 4;</div><div class='del'>-			memset(&amp;optptr[optptr[2]-1], 0, 4);</div><div class='add'>+			memset(&amp;optptr[optptr[2] - 1], 0, 4);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ip_options_rcu *ip_options_get_alloc(const int optlen)</div><div class='add'>+int ip_options_get(struct net *net, struct ip_options_rcu **optp,</div><div class='add'>+		   sockptr_t data, int optlen)</div><div class='ctx'> {</div><div class='del'>-	return kzalloc(sizeof(struct ip_options_rcu) + ((optlen + 3) &amp; ~3),</div><div class='add'>+	struct ip_options_rcu *opt;</div><div class='add'>+</div><div class='add'>+	opt = kzalloc(sizeof(struct ip_options_rcu) + ((optlen + 3) &amp; ~3),</div><div class='ctx'> 		       GFP_KERNEL);</div><div class='del'>-}</div><div class='add'>+	if (!opt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (optlen &amp;&amp; copy_from_sockptr(opt-&gt;opt.__data, data, optlen)) {</div><div class='add'>+		kfree(opt);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int ip_options_get_finish(struct net *net, struct ip_options_rcu **optp,</div><div class='del'>-				 struct ip_options_rcu *opt, int optlen)</div><div class='del'>-{</div><div class='ctx'> 	while (optlen &amp; 3)</div><div class='ctx'> 		opt-&gt;opt.__data[optlen++] = IPOPT_END;</div><div class='ctx'> 	opt-&gt;opt.optlen = optlen;</div><div class='hunk'>@@ -527,32 +535,6 @@ static int ip_options_get_finish(struct net *net, struct ip_options_rcu **optp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip_options_get_from_user(struct net *net, struct ip_options_rcu **optp,</div><div class='del'>-			     unsigned char __user *data, int optlen)</div><div class='del'>-{</div><div class='del'>-	struct ip_options_rcu *opt = ip_options_get_alloc(optlen);</div><div class='del'>-</div><div class='del'>-	if (!opt)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (optlen &amp;&amp; copy_from_user(opt-&gt;opt.__data, data, optlen)) {</div><div class='del'>-		kfree(opt);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return ip_options_get_finish(net, optp, opt, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ip_options_get(struct net *net, struct ip_options_rcu **optp,</div><div class='del'>-		   unsigned char *data, int optlen)</div><div class='del'>-{</div><div class='del'>-	struct ip_options_rcu *opt = ip_options_get_alloc(optlen);</div><div class='del'>-</div><div class='del'>-	if (!opt)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (optlen)</div><div class='del'>-		memcpy(opt-&gt;opt.__data, data, optlen);</div><div class='del'>-	return ip_options_get_finish(net, optp, opt, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ip_forward_options(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct   ip_options *opt	= &amp;(IPCB(skb)-&gt;opt);</div><div class='hunk'>@@ -600,7 +582,7 @@ void ip_forward_options(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip_options_rcv_srr(struct sk_buff *skb)</div><div class='add'>+int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_options *opt = &amp;(IPCB(skb)-&gt;opt);</div><div class='ctx'> 	int srrspace, srrptr;</div><div class='hunk'>@@ -633,13 +615,13 @@ int ip_options_rcv_srr(struct sk_buff *skb)</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(&amp;nexthop, &amp;optptr[srrptr-1], 4);</div><div class='ctx'> </div><div class='del'>-		orefdst = skb-&gt;_skb_refdst;</div><div class='del'>-		skb_dst_set(skb, NULL);</div><div class='del'>-		err = ip_route_input(skb, nexthop, iph-&gt;saddr, iph-&gt;tos, skb-&gt;dev);</div><div class='add'>+		orefdst = skb_dstref_steal(skb);</div><div class='add'>+		err = ip_route_input(skb, nexthop, iph-&gt;saddr, ip4h_dscp(iph),</div><div class='add'>+				     dev) ? -EINVAL : 0;</div><div class='ctx'> 		rt2 = skb_rtable(skb);</div><div class='ctx'> 		if (err || (rt2-&gt;rt_type != RTN_UNICAST &amp;&amp; rt2-&gt;rt_type != RTN_LOCAL)) {</div><div class='ctx'> 			skb_dst_drop(skb);</div><div class='del'>-			skb-&gt;_skb_refdst = orefdst;</div><div class='add'>+			skb_dstref_restore(skb, orefdst);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		refdst_drop(orefdst);</div><div class='head'>diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c<br/>index 9c4e72e9c60a..ff11d3a85a36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_output.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -33,7 +34,7 @@</div><div class='ctx'>  *		Andi Kleen	: 	Replace ip_reply with ip_send_reply.</div><div class='ctx'>  *		Andi Kleen	:	Split fast and slow ip_build_xmit path</div><div class='ctx'>  *					for decreased register pressure on x86</div><div class='del'>- *					and more readibility.</div><div class='add'>+ *					and more readability.</div><div class='ctx'>  *		Marc Boucher	:	When call_out_firewall returns FW_QUEUE,</div><div class='ctx'>  *					silently drop skb instead of failing with -EPERM.</div><div class='ctx'>  *		Detlev Wengorz	:	Copy protocol for fragments.</div><div class='hunk'>@@ -62,6 +63,7 @@</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -72,14 +74,17 @@</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/inetpeer.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;linux/igmp.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv4.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> ip_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='hunk'>@@ -98,7 +103,9 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	iph-&gt;tot_len = htons(skb-&gt;len);</div><div class='add'>+	IP_INC_STATS(net, IPSTATS_MIB_OUTREQUESTS);</div><div class='add'>+</div><div class='add'>+	iph_set_totlen(iph, skb-&gt;len);</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='ctx'> 	/* if egress device is enslaved to an L3 master device pass the</div><div class='hunk'>@@ -111,7 +118,7 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='ctx'> 	return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT,</div><div class='del'>-		       net, sk, skb, NULL, skb_dst(skb)-&gt;dev,</div><div class='add'>+		       net, sk, skb, NULL, skb_dst_dev(skb),</div><div class='ctx'> 		       dst_output);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -127,9 +134,10 @@ int ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_local_out);</div><div class='ctx'> </div><div class='del'>-static inline int ip_select_ttl(struct inet_sock *inet, struct dst_entry *dst)</div><div class='add'>+static inline int ip_select_ttl(const struct inet_sock *inet,</div><div class='add'>+				const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	int ttl = inet-&gt;uc_ttl;</div><div class='add'>+	int ttl = READ_ONCE(inet-&gt;uc_ttl);</div><div class='ctx'> </div><div class='ctx'> 	if (ttl &lt; 0)</div><div class='ctx'> 		ttl = ip4_dst_hoplimit(dst);</div><div class='hunk'>@@ -141,9 +149,10 @@ static inline int ip_select_ttl(struct inet_sock *inet, struct dst_entry *dst)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,</div><div class='del'>-			  __be32 saddr, __be32 daddr, struct ip_options_rcu *opt)</div><div class='add'>+			  __be32 saddr, __be32 daddr, struct ip_options_rcu *opt,</div><div class='add'>+			  u8 tos)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct iphdr *iph;</div><div class='hunk'>@@ -154,27 +163,34 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> 	iph-&gt;version  = 4;</div><div class='ctx'> 	iph-&gt;ihl      = 5;</div><div class='del'>-	iph-&gt;tos      = inet-&gt;tos;</div><div class='add'>+	iph-&gt;tos      = tos;</div><div class='ctx'> 	iph-&gt;ttl      = ip_select_ttl(inet, &amp;rt-&gt;dst);</div><div class='ctx'> 	iph-&gt;daddr    = (opt &amp;&amp; opt-&gt;opt.srr ? opt-&gt;opt.faddr : daddr);</div><div class='ctx'> 	iph-&gt;saddr    = saddr;</div><div class='ctx'> 	iph-&gt;protocol = sk-&gt;sk_protocol;</div><div class='del'>-	if (ip_dont_fragment(sk, &amp;rt-&gt;dst)) {</div><div class='add'>+	/* Do not bother generating IPID for small packets (eg SYNACK) */</div><div class='add'>+	if (skb-&gt;len &lt;= IPV4_MIN_MTU || ip_dont_fragment(sk, &amp;rt-&gt;dst)) {</div><div class='ctx'> 		iph-&gt;frag_off = htons(IP_DF);</div><div class='ctx'> 		iph-&gt;id = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iph-&gt;frag_off = 0;</div><div class='del'>-		__ip_select_ident(net, iph, 1);</div><div class='add'>+		/* TCP packets here are SYNACK with fat IPv4/TCP options.</div><div class='add'>+		 * Avoid using the hashed IP ident generator.</div><div class='add'>+		 */</div><div class='add'>+		if (sk-&gt;sk_protocol == IPPROTO_TCP)</div><div class='add'>+			iph-&gt;id = (__force __be16)get_random_u16();</div><div class='add'>+		else</div><div class='add'>+			__ip_select_ident(net, iph, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (opt &amp;&amp; opt-&gt;opt.optlen) {</div><div class='ctx'> 		iph-&gt;ihl += opt-&gt;opt.optlen&gt;&gt;2;</div><div class='del'>-		ip_options_build(skb, &amp;opt-&gt;opt, daddr, rt, 0);</div><div class='add'>+		ip_options_build(skb, &amp;opt-&gt;opt, daddr, rt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='add'>+	skb-&gt;priority = READ_ONCE(sk-&gt;sk_priority);</div><div class='ctx'> 	if (!skb-&gt;mark)</div><div class='del'>-		skb-&gt;mark = sk-&gt;sk_mark;</div><div class='add'>+		skb-&gt;mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='ctx'> </div><div class='ctx'> 	/* Send it out. */</div><div class='ctx'> 	return ip_local_out(net, skb-&gt;sk, skb);</div><div class='hunk'>@@ -184,66 +200,57 @@ EXPORT_SYMBOL_GPL(ip_build_and_send_pkt);</div><div class='ctx'> static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct rtable *rt = (struct rtable *)dst;</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='add'>+	struct rtable *rt = dst_rtable(dst);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='ctx'> 	unsigned int hh_len = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='del'>-	u32 nexthop;</div><div class='add'>+	bool is_v6gw = false;</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;rt_type == RTN_MULTICAST) {</div><div class='ctx'> 		IP_UPD_PO_STATS(net, IPSTATS_MIB_OUTMCAST, skb-&gt;len);</div><div class='ctx'> 	} else if (rt-&gt;rt_type == RTN_BROADCAST)</div><div class='ctx'> 		IP_UPD_PO_STATS(net, IPSTATS_MIB_OUTBCAST, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* Be paranoid, rather than too clever. */</div><div class='del'>-	if (unlikely(skb_headroom(skb) &lt; hh_len &amp;&amp; dev-&gt;header_ops)) {</div><div class='del'>-		struct sk_buff *skb2;</div><div class='add'>+	/* OUTOCTETS should be counted after fragment */</div><div class='add'>+	IP_UPD_PO_STATS(net, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-		skb2 = skb_realloc_headroom(skb, LL_RESERVED_SPACE(dev));</div><div class='del'>-		if (!skb2) {</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; hh_len &amp;&amp; dev-&gt;header_ops)) {</div><div class='add'>+		skb = skb_expand_head(skb, hh_len);</div><div class='add'>+		if (!skb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		if (skb-&gt;sk)</div><div class='del'>-			skb_set_owner_w(skb2, skb-&gt;sk);</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = skb2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lwtunnel_xmit_redirect(dst-&gt;lwtstate)) {</div><div class='ctx'> 		int res = lwtunnel_xmit(skb);</div><div class='ctx'> </div><div class='del'>-		if (res &lt; 0 || res == LWTUNNEL_XMIT_DONE)</div><div class='add'>+		if (res != LWTUNNEL_XMIT_CONTINUE)</div><div class='ctx'> 			return res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	nexthop = (__force u32) rt_nexthop(rt, ip_hdr(skb)-&gt;daddr);</div><div class='del'>-	neigh = __ipv4_neigh_lookup_noref(dev, nexthop);</div><div class='del'>-	if (unlikely(!neigh))</div><div class='del'>-		neigh = __neigh_create(&amp;arp_tbl, &amp;nexthop, dev, false);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	neigh = ip_neigh_for_gw(rt, skb, &amp;is_v6gw);</div><div class='ctx'> 	if (!IS_ERR(neigh)) {</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='ctx'> 		sock_confirm_neigh(skb, neigh);</div><div class='del'>-		res = neigh_output(neigh, skb);</div><div class='del'>-</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='add'>+		/* if crossing protocols, can not use the cached header */</div><div class='add'>+		res = neigh_output(neigh, skb, is_v6gw);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	net_dbg_ratelimited("%s: No header cache and no neighbour!\n",</div><div class='ctx'> 			    __func__);</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_CREATEFAIL);</div><div class='add'>+	return PTR_ERR(neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip_finish_output_gso(struct net *net, struct sock *sk,</div><div class='ctx'> 				struct sk_buff *skb, unsigned int mtu)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *segs, *nskb;</div><div class='ctx'> 	netdev_features_t features;</div><div class='del'>-	struct sk_buff *segs;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* common case: seglen is &lt;= mtu</div><div class='hunk'>@@ -262,10 +269,10 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk,</div><div class='ctx'> 	 *    interface with a smaller MTU.</div><div class='ctx'> 	 *  - Arriving GRO skb (or GSO skb in a virtualized environment) that is</div><div class='ctx'> 	 *    bridged to a NETIF_F_TSO tunnel stacked over an interface with an</div><div class='del'>-	 *    insufficent MTU.</div><div class='add'>+	 *    insufficient MTU.</div><div class='ctx'> 	 */</div><div class='ctx'> 	features = netif_skb_features(skb);</div><div class='del'>-	BUILD_BUG_ON(sizeof(*IPCB(skb)) &gt; SKB_SGO_CB_OFFSET);</div><div class='add'>+	BUILD_BUG_ON(sizeof(*IPCB(skb)) &gt; SKB_GSO_CB_OFFSET);</div><div class='ctx'> 	segs = skb_gso_segment(skb, features &amp; ~NETIF_F_GSO_MASK);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(segs)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -274,31 +281,22 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	consume_skb(skb);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		struct sk_buff *nskb = segs-&gt;next;</div><div class='add'>+	skb_list_walk_safe(segs, segs, nskb) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		segs-&gt;next = NULL;</div><div class='add'>+		skb_mark_not_on_list(segs);</div><div class='ctx'> 		err = ip_fragment(net, sk, segs, mtu, ip_finish_output2);</div><div class='ctx'> </div><div class='ctx'> 		if (err &amp;&amp; ret == 0)</div><div class='ctx'> 			ret = err;</div><div class='del'>-		segs = nskb;</div><div class='del'>-	} while (segs);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int __ip_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mtu;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = BPF_CGROUP_RUN_PROG_INET_EGRESS(sk, skb);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NETFILTER) &amp;&amp; defined(CONFIG_XFRM)</div><div class='ctx'> 	/* Policy lookup after SNAT yielded a new policy */</div><div class='hunk'>@@ -311,24 +309,60 @@ static int ip_finish_output(struct net *net, struct sock *sk, struct sk_buff *sk</div><div class='ctx'> 	if (skb_is_gso(skb))</div><div class='ctx'> 		return ip_finish_output_gso(net, sk, skb, mtu);</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &gt; mtu || (IPCB(skb)-&gt;flags &amp; IPSKB_FRAG_PMTU))</div><div class='add'>+	if (skb-&gt;len &gt; mtu || IPCB(skb)-&gt;frag_max_size)</div><div class='ctx'> 		return ip_fragment(net, sk, skb, mtu, ip_finish_output2);</div><div class='ctx'> </div><div class='ctx'> 	return ip_finish_output2(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ip_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = BPF_CGROUP_RUN_PROG_INET_EGRESS(sk, skb);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case NET_XMIT_SUCCESS:</div><div class='add'>+		return __ip_finish_output(net, sk, skb);</div><div class='add'>+	case NET_XMIT_CN:</div><div class='add'>+		return __ip_finish_output(net, sk, skb) ? : ret;</div><div class='add'>+	default:</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_BPF_CGROUP_EGRESS);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip_mc_finish_output(struct net *net, struct sock *sk,</div><div class='ctx'> 			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct rtable *new_rt;</div><div class='add'>+	bool do_cn = false;</div><div class='add'>+	int ret, err;</div><div class='ctx'> </div><div class='ctx'> 	ret = BPF_CGROUP_RUN_PROG_INET_EGRESS(sk, skb);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case NET_XMIT_CN:</div><div class='add'>+		do_cn = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NET_XMIT_SUCCESS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_BPF_CGROUP_EGRESS);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return dev_loopback_xmit(net, sk, skb);</div><div class='add'>+	/* Reset rt_iif so that inet_iif() will return skb-&gt;skb_iif. Setting</div><div class='add'>+	 * this to non-zero causes ipi_ifindex in in_pktinfo to be overwritten,</div><div class='add'>+	 * see ipv4_pktinfo_prepare().</div><div class='add'>+	 */</div><div class='add'>+	new_rt = rt_dst_clone(net-&gt;loopback_dev, skb_rtable(skb));</div><div class='add'>+	if (new_rt) {</div><div class='add'>+		new_rt-&gt;rt_iif = 0;</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_dst_set(skb, &amp;new_rt-&gt;dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dev_loopback_xmit(net, sk, skb);</div><div class='add'>+	return (do_cn &amp;&amp; err) ? ret : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='hunk'>@@ -339,8 +373,6 @@ int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	If the indicated interface is up and running, send the packet.</div><div class='ctx'> 	 */</div><div class='del'>-	IP_UPD_PO_STATS(net, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='del'>-</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='hunk'>@@ -395,18 +427,22 @@ int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = skb_dst(skb)-&gt;dev;</div><div class='del'>-</div><div class='del'>-	IP_UPD_PO_STATS(net, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+	struct net_device *dev, *indev = skb-&gt;dev;</div><div class='add'>+	int ret_val;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = skb_dst_dev_rcu(skb);</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='del'>-	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,</div><div class='del'>-			    net, sk, skb, NULL, dev,</div><div class='del'>-			    ip_finish_output,</div><div class='del'>-			    !(IPCB(skb)-&gt;flags &amp; IPSKB_REROUTED));</div><div class='add'>+	ret_val = NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,</div><div class='add'>+				net, sk, skb, indev, dev,</div><div class='add'>+				ip_finish_output,</div><div class='add'>+				!(IPCB(skb)-&gt;flags &amp; IPSKB_REROUTED));</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret_val;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ip_output);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * copy saddr and daddr, possibly using 64bit load/stores</div><div class='hunk'>@@ -418,8 +454,9 @@ static void ip_copy_addrs(struct iphdr *iph, const struct flowi4 *fl4)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(offsetof(typeof(*fl4), daddr) !=</div><div class='ctx'> 		     offsetof(typeof(*fl4), saddr) + sizeof(fl4-&gt;saddr));</div><div class='del'>-	memcpy(&amp;iph-&gt;saddr, &amp;fl4-&gt;saddr,</div><div class='del'>-	       sizeof(fl4-&gt;saddr) + sizeof(fl4-&gt;daddr));</div><div class='add'>+</div><div class='add'>+	iph-&gt;saddr = fl4-&gt;saddr;</div><div class='add'>+	iph-&gt;daddr = fl4-&gt;daddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Note: skb-&gt;sk can be different from sk, in case of tunnels */</div><div class='hunk'>@@ -445,26 +482,18 @@ int __ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,</div><div class='ctx'> 		goto packet_routed;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we can route this packet. */</div><div class='del'>-	rt = (struct rtable *)__sk_dst_check(sk, 0);</div><div class='add'>+	rt = dst_rtable(__sk_dst_check(sk, 0));</div><div class='ctx'> 	if (!rt) {</div><div class='del'>-		__be32 daddr;</div><div class='add'>+		inet_sk_init_flowi4(inet, fl4);</div><div class='ctx'> </div><div class='del'>-		/* Use correct destination address if we have options. */</div><div class='del'>-		daddr = inet-&gt;inet_daddr;</div><div class='del'>-		if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='del'>-			daddr = inet_opt-&gt;opt.faddr;</div><div class='add'>+		/* sctp_v4_xmit() uses its own DSCP value */</div><div class='add'>+		fl4-&gt;flowi4_dscp = inet_dsfield_to_dscp(tos);</div><div class='ctx'> </div><div class='ctx'> 		/* If this fails, retransmit mechanism of transport layer will</div><div class='ctx'> 		 * keep trying until route appears or the connection times</div><div class='ctx'> 		 * itself out.</div><div class='ctx'> 		 */</div><div class='del'>-		rt = ip_route_output_ports(net, fl4, sk,</div><div class='del'>-					   daddr, inet-&gt;inet_saddr,</div><div class='del'>-					   inet-&gt;inet_dport,</div><div class='del'>-					   inet-&gt;inet_sport,</div><div class='del'>-					   sk-&gt;sk_protocol,</div><div class='del'>-					   RT_CONN_FLAGS_TOS(sk, tos),</div><div class='del'>-					   sk-&gt;sk_bound_dev_if);</div><div class='add'>+		rt = ip_route_output_flow(net, fl4, sk);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='ctx'> 			goto no_route;</div><div class='ctx'> 		sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='hunk'>@@ -492,15 +521,15 @@ packet_routed:</div><div class='ctx'> </div><div class='ctx'> 	if (inet_opt &amp;&amp; inet_opt-&gt;opt.optlen) {</div><div class='ctx'> 		iph-&gt;ihl += inet_opt-&gt;opt.optlen &gt;&gt; 2;</div><div class='del'>-		ip_options_build(skb, &amp;inet_opt-&gt;opt, inet-&gt;inet_daddr, rt, 0);</div><div class='add'>+		ip_options_build(skb, &amp;inet_opt-&gt;opt, inet-&gt;inet_daddr, rt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ip_select_ident_segs(net, skb, sk,</div><div class='ctx'> 			     skb_shinfo(skb)-&gt;gso_segs ?: 1);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO : should we use skb-&gt;sk here instead of sk ? */</div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='del'>-	skb-&gt;mark = sk-&gt;sk_mark;</div><div class='add'>+	skb-&gt;priority = READ_ONCE(sk-&gt;sk_priority);</div><div class='add'>+	skb-&gt;mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='ctx'> </div><div class='ctx'> 	res = ip_local_out(net, sk, skb);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -509,16 +538,23 @@ packet_routed:</div><div class='ctx'> no_route:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_IP_OUTNOROUTES);</div><div class='ctx'> 	return -EHOSTUNREACH;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ip_queue_xmit);</div><div class='ctx'> </div><div class='add'>+int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl)</div><div class='add'>+{</div><div class='add'>+	return __ip_queue_xmit(sk, skb, fl, READ_ONCE(inet_sk(sk)-&gt;tos));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_queue_xmit);</div><div class='add'>+</div><div class='ctx'> static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)</div><div class='ctx'> {</div><div class='ctx'> 	to-&gt;pkt_type = from-&gt;pkt_type;</div><div class='ctx'> 	to-&gt;priority = from-&gt;priority;</div><div class='ctx'> 	to-&gt;protocol = from-&gt;protocol;</div><div class='add'>+	to-&gt;skb_iif = from-&gt;skb_iif;</div><div class='ctx'> 	skb_dst_drop(to);</div><div class='ctx'> 	skb_dst_copy(to, from);</div><div class='ctx'> 	to-&gt;dev = from-&gt;dev;</div><div class='hunk'>@@ -526,13 +562,11 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)</div><div class='ctx'> </div><div class='ctx'> 	skb_copy_hash(to, from);</div><div class='ctx'> </div><div class='del'>-	/* Copy the flags to each fragment. */</div><div class='del'>-	IPCB(to)-&gt;flags = IPCB(from)-&gt;flags;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NET_SCHED</div><div class='ctx'> 	to-&gt;tc_index = from-&gt;tc_index;</div><div class='ctx'> #endif</div><div class='ctx'> 	nf_copy(to, from);</div><div class='add'>+	skb_ext_copy(to, from);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IP_VS)</div><div class='ctx'> 	to-&gt;ipvs_property = from-&gt;ipvs_property;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -561,6 +595,162 @@ static int ip_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	return ip_do_fragment(net, sk, skb, output);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ip_fraglist_init(struct sk_buff *skb, struct iphdr *iph,</div><div class='add'>+		      unsigned int hlen, struct ip_fraglist_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned int first_len = skb_pagelen(skb);</div><div class='add'>+</div><div class='add'>+	iter-&gt;frag = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+	skb_frag_list_init(skb);</div><div class='add'>+</div><div class='add'>+	iter-&gt;offset = 0;</div><div class='add'>+	iter-&gt;iph = iph;</div><div class='add'>+	iter-&gt;hlen = hlen;</div><div class='add'>+</div><div class='add'>+	skb-&gt;data_len = first_len - skb_headlen(skb);</div><div class='add'>+	skb-&gt;len = first_len;</div><div class='add'>+	iph-&gt;tot_len = htons(first_len);</div><div class='add'>+	iph-&gt;frag_off = htons(IP_MF);</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_fraglist_init);</div><div class='add'>+</div><div class='add'>+void ip_fraglist_prepare(struct sk_buff *skb, struct ip_fraglist_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned int hlen = iter-&gt;hlen;</div><div class='add'>+	struct iphdr *iph = iter-&gt;iph;</div><div class='add'>+	struct sk_buff *frag;</div><div class='add'>+</div><div class='add'>+	frag = iter-&gt;frag;</div><div class='add'>+	frag-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	skb_reset_transport_header(frag);</div><div class='add'>+	__skb_push(frag, hlen);</div><div class='add'>+	skb_reset_network_header(frag);</div><div class='add'>+	memcpy(skb_network_header(frag), iph, hlen);</div><div class='add'>+	iter-&gt;iph = ip_hdr(frag);</div><div class='add'>+	iph = iter-&gt;iph;</div><div class='add'>+	iph-&gt;tot_len = htons(frag-&gt;len);</div><div class='add'>+	ip_copy_metadata(frag, skb);</div><div class='add'>+	iter-&gt;offset += skb-&gt;len - hlen;</div><div class='add'>+	iph-&gt;frag_off = htons(iter-&gt;offset &gt;&gt; 3);</div><div class='add'>+	if (frag-&gt;next)</div><div class='add'>+		iph-&gt;frag_off |= htons(IP_MF);</div><div class='add'>+	/* Ready, complete checksum */</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_fraglist_prepare);</div><div class='add'>+</div><div class='add'>+void ip_frag_init(struct sk_buff *skb, unsigned int hlen,</div><div class='add'>+		  unsigned int ll_rs, unsigned int mtu, bool DF,</div><div class='add'>+		  struct ip_frag_state *state)</div><div class='add'>+{</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	state-&gt;DF = DF;</div><div class='add'>+	state-&gt;hlen = hlen;</div><div class='add'>+	state-&gt;ll_rs = ll_rs;</div><div class='add'>+	state-&gt;mtu = mtu;</div><div class='add'>+</div><div class='add'>+	state-&gt;left = skb-&gt;len - hlen;	/* Space per frame */</div><div class='add'>+	state-&gt;ptr = hlen;		/* Where to start from */</div><div class='add'>+</div><div class='add'>+	state-&gt;offset = (ntohs(iph-&gt;frag_off) &amp; IP_OFFSET) &lt;&lt; 3;</div><div class='add'>+	state-&gt;not_last_frag = iph-&gt;frag_off &amp; htons(IP_MF);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_frag_init);</div><div class='add'>+</div><div class='add'>+static void ip_frag_ipcb(struct sk_buff *from, struct sk_buff *to,</div><div class='add'>+			 bool first_frag)</div><div class='add'>+{</div><div class='add'>+	/* Copy the flags to each fragment. */</div><div class='add'>+	IPCB(to)-&gt;flags = IPCB(from)-&gt;flags;</div><div class='add'>+</div><div class='add'>+	/* ANK: dirty, but effective trick. Upgrade options only if</div><div class='add'>+	 * the segment to be fragmented was THE FIRST (otherwise,</div><div class='add'>+	 * options are already fixed) and make it ONCE</div><div class='add'>+	 * on the initial skb, so that all the following fragments</div><div class='add'>+	 * will inherit fixed options.</div><div class='add'>+	 */</div><div class='add'>+	if (first_frag)</div><div class='add'>+		ip_options_fragment(from);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *ip_frag_next(struct sk_buff *skb, struct ip_frag_state *state)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = state-&gt;left;</div><div class='add'>+	struct sk_buff *skb2;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	/* IF: it doesn't fit, use 'mtu' - the data space left */</div><div class='add'>+	if (len &gt; state-&gt;mtu)</div><div class='add'>+		len = state-&gt;mtu;</div><div class='add'>+	/* IF: we are not sending up to and including the packet end</div><div class='add'>+	   then align the next start on an eight byte boundary */</div><div class='add'>+	if (len &lt; state-&gt;left)	{</div><div class='add'>+		len &amp;= ~7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate buffer */</div><div class='add'>+	skb2 = alloc_skb(len + state-&gt;hlen + state-&gt;ll_rs, GFP_ATOMIC);</div><div class='add'>+	if (!skb2)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Set up data on packet</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ip_copy_metadata(skb2, skb);</div><div class='add'>+	skb_reserve(skb2, state-&gt;ll_rs);</div><div class='add'>+	skb_put(skb2, len + state-&gt;hlen);</div><div class='add'>+	skb_reset_network_header(skb2);</div><div class='add'>+	skb2-&gt;transport_header = skb2-&gt;network_header + state-&gt;hlen;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Charge the memory for the fragment to any owner</div><div class='add'>+	 *	it might possess</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;sk)</div><div class='add'>+		skb_set_owner_w(skb2, skb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy the packet header into the new buffer.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	skb_copy_from_linear_data(skb, skb_network_header(skb2), state-&gt;hlen);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy a block of the IP datagram.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_copy_bits(skb, state-&gt;ptr, skb_transport_header(skb2), len))</div><div class='add'>+		BUG();</div><div class='add'>+	state-&gt;left -= len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Fill in the new header fields.</div><div class='add'>+	 */</div><div class='add'>+	iph = ip_hdr(skb2);</div><div class='add'>+	iph-&gt;frag_off = htons((state-&gt;offset &gt;&gt; 3));</div><div class='add'>+	if (state-&gt;DF)</div><div class='add'>+		iph-&gt;frag_off |= htons(IP_DF);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Added AC : If we are fragmenting a fragment that's not the</div><div class='add'>+	 *		   last fragment then keep MF on each bit</div><div class='add'>+	 */</div><div class='add'>+	if (state-&gt;left &gt; 0 || state-&gt;not_last_frag)</div><div class='add'>+		iph-&gt;frag_off |= htons(IP_MF);</div><div class='add'>+	state-&gt;ptr += len;</div><div class='add'>+	state-&gt;offset += len;</div><div class='add'>+</div><div class='add'>+	iph-&gt;tot_len = htons(len + state-&gt;hlen);</div><div class='add'>+</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+</div><div class='add'>+	return skb2;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_frag_next);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	This IP datagram is too large to be sent in one piece.  Break it up into</div><div class='ctx'>  *	smaller pieces (each of size equal to IP header plus</div><div class='hunk'>@@ -572,12 +762,13 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		   int (*output)(struct net *, struct sock *, struct sk_buff *))</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph;</div><div class='del'>-	int ptr;</div><div class='ctx'> 	struct sk_buff *skb2;</div><div class='del'>-	unsigned int mtu, hlen, left, len, ll_rs;</div><div class='del'>-	int offset;</div><div class='del'>-	__be16 not_last_frag;</div><div class='add'>+	u8 tstamp_type = skb-&gt;tstamp_type;</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb);</div><div class='add'>+	unsigned int mtu, hlen, ll_rs;</div><div class='add'>+	struct ip_fraglist_iter iter;</div><div class='add'>+	ktime_t tstamp = skb-&gt;tstamp;</div><div class='add'>+	struct ip_frag_state state;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* for offloaded checksums cleanup checksum before fragmentation */</div><div class='hunk'>@@ -642,49 +833,37 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Everything is OK. Generate! */</div><div class='del'>-</div><div class='del'>-		err = 0;</div><div class='del'>-		offset = 0;</div><div class='del'>-		frag = skb_shinfo(skb)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(skb);</div><div class='del'>-		skb-&gt;data_len = first_len - skb_headlen(skb);</div><div class='del'>-		skb-&gt;len = first_len;</div><div class='del'>-		iph-&gt;tot_len = htons(first_len);</div><div class='del'>-		iph-&gt;frag_off = htons(IP_MF);</div><div class='del'>-		ip_send_check(iph);</div><div class='add'>+		ip_fraglist_init(skb, iph, hlen, &amp;iter);</div><div class='ctx'> </div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			/* Prepare header of the next frame,</div><div class='ctx'> 			 * before previous one went down. */</div><div class='del'>-			if (frag) {</div><div class='del'>-				frag-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-				skb_reset_transport_header(frag);</div><div class='del'>-				__skb_push(frag, hlen);</div><div class='del'>-				skb_reset_network_header(frag);</div><div class='del'>-				memcpy(skb_network_header(frag), iph, hlen);</div><div class='del'>-				iph = ip_hdr(frag);</div><div class='del'>-				iph-&gt;tot_len = htons(frag-&gt;len);</div><div class='del'>-				ip_copy_metadata(frag, skb);</div><div class='del'>-				if (offset == 0)</div><div class='del'>-					ip_options_fragment(frag);</div><div class='del'>-				offset += skb-&gt;len - hlen;</div><div class='del'>-				iph-&gt;frag_off = htons(offset&gt;&gt;3);</div><div class='del'>-				if (frag-&gt;next)</div><div class='del'>-					iph-&gt;frag_off |= htons(IP_MF);</div><div class='del'>-				/* Ready, complete checksum */</div><div class='del'>-				ip_send_check(iph);</div><div class='add'>+			if (iter.frag) {</div><div class='add'>+				bool first_frag = (iter.offset == 0);</div><div class='add'>+</div><div class='add'>+				IPCB(iter.frag)-&gt;flags = IPCB(skb)-&gt;flags;</div><div class='add'>+				ip_fraglist_prepare(skb, &amp;iter);</div><div class='add'>+				if (first_frag &amp;&amp; IPCB(skb)-&gt;opt.optlen) {</div><div class='add'>+					/* ipcb-&gt;opt is not populated for frags</div><div class='add'>+					 * coming from __ip_make_skb(),</div><div class='add'>+					 * ip_options_fragment() needs optlen</div><div class='add'>+					 */</div><div class='add'>+					IPCB(iter.frag)-&gt;opt.optlen =</div><div class='add'>+						IPCB(skb)-&gt;opt.optlen;</div><div class='add'>+					ip_options_fragment(iter.frag);</div><div class='add'>+					ip_send_check(iter.iph);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			skb_set_delivery_time(skb, tstamp, tstamp_type);</div><div class='ctx'> 			err = output(net, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				IP_INC_STATS(net, IPSTATS_MIB_FRAGCREATES);</div><div class='del'>-			if (err || !frag)</div><div class='add'>+			if (err || !iter.frag)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			skb = frag;</div><div class='del'>-			frag = skb-&gt;next;</div><div class='del'>-			skb-&gt;next = NULL;</div><div class='add'>+			skb = ip_fraglist_next(&amp;iter);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (err == 0) {</div><div class='hunk'>@@ -692,11 +871,8 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		while (frag) {</div><div class='del'>-			skb = frag-&gt;next;</div><div class='del'>-			kfree_skb(frag);</div><div class='del'>-			frag = skb;</div><div class='del'>-		}</div><div class='add'>+		kfree_skb_list(iter.frag);</div><div class='add'>+</div><div class='ctx'> 		IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -711,105 +887,31 @@ slow_path_clean:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> slow_path:</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	left = skb-&gt;len - hlen;		/* Space per frame */</div><div class='del'>-	ptr = hlen;		/* Where to start from */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Fragment the datagram.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	offset = (ntohs(iph-&gt;frag_off) &amp; IP_OFFSET) &lt;&lt; 3;</div><div class='del'>-	not_last_frag = iph-&gt;frag_off &amp; htons(IP_MF);</div><div class='add'>+	ip_frag_init(skb, hlen, ll_rs, mtu, IPCB(skb)-&gt;flags &amp; IPSKB_FRAG_PMTU,</div><div class='add'>+		     &amp;state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Keep copying data until we run out.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		len = left;</div><div class='del'>-		/* IF: it doesn't fit, use 'mtu' - the data space left */</div><div class='del'>-		if (len &gt; mtu)</div><div class='del'>-			len = mtu;</div><div class='del'>-		/* IF: we are not sending up to and including the packet end</div><div class='del'>-		   then align the next start on an eight byte boundary */</div><div class='del'>-		if (len &lt; left)	{</div><div class='del'>-			len &amp;= ~7;</div><div class='del'>-		}</div><div class='add'>+	while (state.left &gt; 0) {</div><div class='add'>+		bool first_frag = (state.offset == 0);</div><div class='ctx'> </div><div class='del'>-		/* Allocate buffer */</div><div class='del'>-		skb2 = alloc_skb(len + hlen + ll_rs, GFP_ATOMIC);</div><div class='del'>-		if (!skb2) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		skb2 = ip_frag_next(skb, &amp;state);</div><div class='add'>+		if (IS_ERR(skb2)) {</div><div class='add'>+			err = PTR_ERR(skb2);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Set up data on packet</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		ip_copy_metadata(skb2, skb);</div><div class='del'>-		skb_reserve(skb2, ll_rs);</div><div class='del'>-		skb_put(skb2, len + hlen);</div><div class='del'>-		skb_reset_network_header(skb2);</div><div class='del'>-		skb2-&gt;transport_header = skb2-&gt;network_header + hlen;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Charge the memory for the fragment to any owner</div><div class='del'>-		 *	it might possess</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk)</div><div class='del'>-			skb_set_owner_w(skb2, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Copy the packet header into the new buffer.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		skb_copy_from_linear_data(skb, skb_network_header(skb2), hlen);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Copy a block of the IP datagram.</div><div class='del'>-		 */</div><div class='del'>-		if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len))</div><div class='del'>-			BUG();</div><div class='del'>-		left -= len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Fill in the new header fields.</div><div class='del'>-		 */</div><div class='del'>-		iph = ip_hdr(skb2);</div><div class='del'>-		iph-&gt;frag_off = htons((offset &gt;&gt; 3));</div><div class='del'>-</div><div class='del'>-		if (IPCB(skb)-&gt;flags &amp; IPSKB_FRAG_PMTU)</div><div class='del'>-			iph-&gt;frag_off |= htons(IP_DF);</div><div class='del'>-</div><div class='del'>-		/* ANK: dirty, but effective trick. Upgrade options only if</div><div class='del'>-		 * the segment to be fragmented was THE FIRST (otherwise,</div><div class='del'>-		 * options are already fixed) and make it ONCE</div><div class='del'>-		 * on the initial skb, so that all the following fragments</div><div class='del'>-		 * will inherit fixed options.</div><div class='del'>-		 */</div><div class='del'>-		if (offset == 0)</div><div class='del'>-			ip_options_fragment(skb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Added AC : If we are fragmenting a fragment that's not the</div><div class='del'>-		 *		   last fragment then keep MF on each bit</div><div class='del'>-		 */</div><div class='del'>-		if (left &gt; 0 || not_last_frag)</div><div class='del'>-			iph-&gt;frag_off |= htons(IP_MF);</div><div class='del'>-		ptr += len;</div><div class='del'>-		offset += len;</div><div class='add'>+		ip_frag_ipcb(skb, skb2, first_frag);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	Put this fragment into the sending queue.</div><div class='ctx'> 		 */</div><div class='del'>-		iph-&gt;tot_len = htons(len + hlen);</div><div class='del'>-</div><div class='del'>-		ip_send_check(iph);</div><div class='del'>-</div><div class='add'>+		skb_set_delivery_time(skb2, tstamp, tstamp_type);</div><div class='ctx'> 		err = output(net, sk, skb2);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -845,17 +947,6 @@ ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_generic_getfrag);</div><div class='ctx'> </div><div class='del'>-static inline __wsum</div><div class='del'>-csum_page(struct page *page, int offset, int copy)</div><div class='del'>-{</div><div class='del'>-	char *kaddr;</div><div class='del'>-	__wsum csum;</div><div class='del'>-	kaddr = kmap(page);</div><div class='del'>-	csum = csum_partial(kaddr + offset, copy, 0);</div><div class='del'>-	kunmap(page);</div><div class='del'>-	return csum;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 			    struct flowi4 *fl4,</div><div class='ctx'> 			    struct sk_buff_head *queue,</div><div class='hunk'>@@ -867,8 +958,8 @@ static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 			    unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct ubuf_info *uarg = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-</div><div class='ctx'> 	struct ip_options *opt = cork-&gt;opt;</div><div class='ctx'> 	int hh_len;</div><div class='ctx'> 	int exthdrlen;</div><div class='hunk'>@@ -876,12 +967,13 @@ static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 	int copy;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int offset = 0;</div><div class='add'>+	bool zc = false;</div><div class='ctx'> 	unsigned int maxfraglen, fragheaderlen, maxnonfragsize;</div><div class='ctx'> 	int csummode = CHECKSUM_NONE;</div><div class='del'>-	struct rtable *rt = (struct rtable *)cork-&gt;dst;</div><div class='add'>+	struct rtable *rt = dst_rtable(cork-&gt;dst);</div><div class='add'>+	bool paged, hold_tskey = false, extra_uref = false;</div><div class='ctx'> 	unsigned int wmem_alloc_delta = 0;</div><div class='ctx'> 	u32 tskey = 0;</div><div class='del'>-	bool paged;</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_peek_tail(queue);</div><div class='ctx'> </div><div class='hunk'>@@ -889,15 +981,11 @@ static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 	mtu = cork-&gt;gso_size ? IP_MAX_MTU : cork-&gt;fragsize;</div><div class='ctx'> 	paged = !!cork-&gt;gso_size;</div><div class='ctx'> </div><div class='del'>-	if (cork-&gt;tx_flags &amp; SKBTX_ANY_SW_TSTAMP &amp;&amp;</div><div class='del'>-	    sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_ID)</div><div class='del'>-		tskey = sk-&gt;sk_tskey++;</div><div class='del'>-</div><div class='ctx'> 	hh_len = LL_RESERVED_SPACE(rt-&gt;dst.dev);</div><div class='ctx'> </div><div class='ctx'> 	fragheaderlen = sizeof(struct iphdr) + (opt ? opt-&gt;optlen : 0);</div><div class='ctx'> 	maxfraglen = ((mtu - fragheaderlen) &amp; ~7) + fragheaderlen;</div><div class='del'>-	maxnonfragsize = ip_sk_ignore_df(sk) ? 0xFFFF : mtu;</div><div class='add'>+	maxnonfragsize = ip_sk_ignore_df(sk) ? IP_MAX_MTU : mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (cork-&gt;length + length &gt; maxnonfragsize - fragheaderlen) {</div><div class='ctx'> 		ip_local_error(sk, EMSGSIZE, fl4-&gt;daddr, inet-&gt;inet_dport,</div><div class='hunk'>@@ -916,8 +1004,60 @@ static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 	    (!exthdrlen || (rt-&gt;dst.dev-&gt;features &amp; NETIF_F_HW_ESP_TX_CSUM)))</div><div class='ctx'> 		csummode = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='add'>+	if ((flags &amp; MSG_ZEROCOPY) &amp;&amp; length) {</div><div class='add'>+		struct msghdr *msg = from;</div><div class='add'>+</div><div class='add'>+		if (getfrag == ip_generic_getfrag &amp;&amp; msg-&gt;msg_ubuf) {</div><div class='add'>+			if (skb_zcopy(skb) &amp;&amp; msg-&gt;msg_ubuf != skb_zcopy(skb))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Leave uarg NULL if can't zerocopy, callers should</div><div class='add'>+			 * be able to handle it.</div><div class='add'>+			 */</div><div class='add'>+			if ((rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG) &amp;&amp;</div><div class='add'>+			    csummode == CHECKSUM_PARTIAL) {</div><div class='add'>+				paged = true;</div><div class='add'>+				zc = true;</div><div class='add'>+				uarg = msg-&gt;msg_ubuf;</div><div class='add'>+			}</div><div class='add'>+		} else if (sock_flag(sk, SOCK_ZEROCOPY)) {</div><div class='add'>+			uarg = msg_zerocopy_realloc(sk, length, skb_zcopy(skb),</div><div class='add'>+						    false);</div><div class='add'>+			if (!uarg)</div><div class='add'>+				return -ENOBUFS;</div><div class='add'>+			extra_uref = !skb_zcopy(skb);	/* only ref on new uarg */</div><div class='add'>+			if (rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG &amp;&amp;</div><div class='add'>+			    csummode == CHECKSUM_PARTIAL) {</div><div class='add'>+				paged = true;</div><div class='add'>+				zc = true;</div><div class='add'>+			} else {</div><div class='add'>+				uarg_to_msgzc(uarg)-&gt;zerocopy = 0;</div><div class='add'>+				skb_zcopy_set(skb, uarg, &amp;extra_uref);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if ((flags &amp; MSG_SPLICE_PAGES) &amp;&amp; length) {</div><div class='add'>+		if (inet_test_bit(HDRINCL, sk))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		if (rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG &amp;&amp;</div><div class='add'>+		    getfrag == ip_generic_getfrag)</div><div class='add'>+			/* We need an empty buffer to attach stuff to */</div><div class='add'>+			paged = true;</div><div class='add'>+		else</div><div class='add'>+			flags &amp;= ~MSG_SPLICE_PAGES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cork-&gt;length += length;</div><div class='ctx'> </div><div class='add'>+	if (cork-&gt;tx_flags &amp; SKBTX_ANY_TSTAMP &amp;&amp;</div><div class='add'>+	    READ_ONCE(sk-&gt;sk_tsflags) &amp; SOF_TIMESTAMPING_OPT_ID) {</div><div class='add'>+		if (cork-&gt;flags &amp; IPCORK_TS_OPT_ID) {</div><div class='add'>+			tskey = cork-&gt;ts_opt_id;</div><div class='add'>+		} else {</div><div class='add'>+			tskey = atomic_inc_return(&amp;sk-&gt;sk_tskey) - 1;</div><div class='add'>+			hold_tskey = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* So, what's going on in the loop below?</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We use calculated fragment length to generate chained skb,</div><div class='hunk'>@@ -938,8 +1078,8 @@ static int __ip_append_data(struct sock *sk,</div><div class='ctx'> 			unsigned int datalen;</div><div class='ctx'> 			unsigned int fraglen;</div><div class='ctx'> 			unsigned int fraggap;</div><div class='del'>-			unsigned int alloclen;</div><div class='del'>-			unsigned int pagedlen = 0;</div><div class='add'>+			unsigned int alloclen, alloc_extra;</div><div class='add'>+			unsigned int pagedlen;</div><div class='ctx'> 			struct sk_buff *skb_prev;</div><div class='ctx'> alloc_new_skb:</div><div class='ctx'> 			skb_prev = skb;</div><div class='hunk'>@@ -956,18 +1096,10 @@ alloc_new_skb:</div><div class='ctx'> 			if (datalen &gt; mtu - fragheaderlen)</div><div class='ctx'> 				datalen = maxfraglen - fragheaderlen;</div><div class='ctx'> 			fraglen = datalen + fragheaderlen;</div><div class='add'>+			pagedlen = 0;</div><div class='ctx'> </div><div class='del'>-			if ((flags &amp; MSG_MORE) &amp;&amp;</div><div class='del'>-			    !(rt-&gt;dst.dev-&gt;features&amp;NETIF_F_SG))</div><div class='del'>-				alloclen = mtu;</div><div class='del'>-			else if (!paged)</div><div class='del'>-				alloclen = fraglen;</div><div class='del'>-			else {</div><div class='del'>-				alloclen = min_t(int, fraglen, MAX_HEADER);</div><div class='del'>-				pagedlen = fraglen - alloclen;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			alloclen += exthdrlen;</div><div class='add'>+			alloc_extra = hh_len + 15;</div><div class='add'>+			alloc_extra += exthdrlen;</div><div class='ctx'> </div><div class='ctx'> 			/* The last fragment gets additional space at tail.</div><div class='ctx'> 			 * Note, with MSG_MORE we overallocate on fragments,</div><div class='hunk'>@@ -975,17 +1107,30 @@ alloc_new_skb:</div><div class='ctx'> 			 * the last.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (datalen == length + fraggap)</div><div class='del'>-				alloclen += rt-&gt;dst.trailer_len;</div><div class='add'>+				alloc_extra += rt-&gt;dst.trailer_len;</div><div class='add'>+</div><div class='add'>+			if ((flags &amp; MSG_MORE) &amp;&amp;</div><div class='add'>+			    !(rt-&gt;dst.dev-&gt;features&amp;NETIF_F_SG))</div><div class='add'>+				alloclen = mtu;</div><div class='add'>+			else if (!paged &amp;&amp;</div><div class='add'>+				 (fraglen + alloc_extra &lt; SKB_MAX_ALLOC ||</div><div class='add'>+				  !(rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG)))</div><div class='add'>+				alloclen = fraglen;</div><div class='add'>+			else {</div><div class='add'>+				alloclen = fragheaderlen + transhdrlen;</div><div class='add'>+				pagedlen = datalen - transhdrlen;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			alloclen += alloc_extra;</div><div class='ctx'> </div><div class='ctx'> 			if (transhdrlen) {</div><div class='del'>-				skb = sock_alloc_send_skb(sk,</div><div class='del'>-						alloclen + hh_len + 15,</div><div class='add'>+				skb = sock_alloc_send_skb(sk, alloclen,</div><div class='ctx'> 						(flags &amp; MSG_DONTWAIT), &amp;err);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				skb = NULL;</div><div class='ctx'> 				if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) + wmem_alloc_delta &lt;=</div><div class='ctx'> 				    2 * sk-&gt;sk_sndbuf)</div><div class='del'>-					skb = alloc_skb(alloclen + hh_len + 15,</div><div class='add'>+					skb = alloc_skb(alloclen,</div><div class='ctx'> 							sk-&gt;sk_allocation);</div><div class='ctx'> 				if (unlikely(!skb))</div><div class='ctx'> 					err = -ENOBUFS;</div><div class='hunk'>@@ -1000,12 +1145,6 @@ alloc_new_skb:</div><div class='ctx'> 			skb-&gt;csum = 0;</div><div class='ctx'> 			skb_reserve(skb, hh_len);</div><div class='ctx'> </div><div class='del'>-			/* only the initial fragment is time stamped */</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags = cork-&gt;tx_flags;</div><div class='del'>-			cork-&gt;tx_flags = 0;</div><div class='del'>-			skb_shinfo(skb)-&gt;tskey = tskey;</div><div class='del'>-			tskey = 0;</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 *	Find where to start putting bytes.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1018,7 +1157,7 @@ alloc_new_skb:</div><div class='ctx'> 			if (fraggap) {</div><div class='ctx'> 				skb-&gt;csum = skb_copy_and_csum_bits(</div><div class='ctx'> 					skb_prev, maxfraglen,</div><div class='del'>-					data + transhdrlen, fraggap, 0);</div><div class='add'>+					data + transhdrlen, fraggap);</div><div class='ctx'> 				skb_prev-&gt;csum = csum_sub(skb_prev-&gt;csum,</div><div class='ctx'> 							  skb-&gt;csum);</div><div class='ctx'> 				data += fraggap;</div><div class='hunk'>@@ -1026,10 +1165,18 @@ alloc_new_skb:</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			copy = datalen - transhdrlen - fraggap - pagedlen;</div><div class='del'>-			if (copy &gt; 0 &amp;&amp; getfrag(from, data + transhdrlen, offset, copy, fraggap, skb) &lt; 0) {</div><div class='add'>+			/* [!] NOTE: copy will be negative if pagedlen&gt;0</div><div class='add'>+			 * because then the equation reduces to -fraggap.</div><div class='add'>+			 */</div><div class='add'>+			if (copy &gt; 0 &amp;&amp;</div><div class='add'>+			    INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+					    from, data + transhdrlen, offset,</div><div class='add'>+					    copy, fraggap, skb) &lt; 0) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				kfree_skb(skb);</div><div class='ctx'> 				goto error;</div><div class='add'>+			} else if (flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+				copy = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			offset += copy;</div><div class='hunk'>@@ -1038,6 +1185,13 @@ alloc_new_skb:</div><div class='ctx'> 			exthdrlen = 0;</div><div class='ctx'> 			csummode = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='add'>+			/* only the initial fragment is time stamped */</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags = cork-&gt;tx_flags;</div><div class='add'>+			cork-&gt;tx_flags = 0;</div><div class='add'>+			skb_shinfo(skb)-&gt;tskey = tskey;</div><div class='add'>+			tskey = 0;</div><div class='add'>+			skb_zcopy_set(skb, uarg, &amp;extra_uref);</div><div class='add'>+</div><div class='ctx'> 			if ((flags &amp; MSG_CONFIRM) &amp;&amp; !skb_prev)</div><div class='ctx'> 				skb_set_dst_pending_confirm(skb, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1061,19 +1215,33 @@ alloc_new_skb:</div><div class='ctx'> 			unsigned int off;</div><div class='ctx'> </div><div class='ctx'> 			off = skb-&gt;len;</div><div class='del'>-			if (getfrag(from, skb_put(skb, copy),</div><div class='del'>-					offset, copy, off, skb) &lt; 0) {</div><div class='add'>+			if (INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+					    from, skb_put(skb, copy),</div><div class='add'>+					    offset, copy, off, skb) &lt; 0) {</div><div class='ctx'> 				__skb_trim(skb, off);</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='add'>+		} else if (flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+			struct msghdr *msg = from;</div><div class='add'>+</div><div class='add'>+			err = -EIO;</div><div class='add'>+			if (WARN_ON_ONCE(copy &gt; msg-&gt;msg_iter.count))</div><div class='add'>+				goto error;</div><div class='add'>+</div><div class='add'>+			err = skb_splice_from_iter(skb, &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto error;</div><div class='add'>+			copy = err;</div><div class='add'>+			wmem_alloc_delta += copy;</div><div class='add'>+		} else if (!zc) {</div><div class='ctx'> 			int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			if (!sk_page_frag_refill(sk, pfrag))</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='add'>+			skb_zcopy_downgrade_managed(skb);</div><div class='ctx'> 			if (!skb_can_coalesce(skb, i, pfrag-&gt;page,</div><div class='ctx'> 					      pfrag-&gt;offset)) {</div><div class='ctx'> 				err = -EMSGSIZE;</div><div class='hunk'>@@ -1086,17 +1254,20 @@ alloc_new_skb:</div><div class='ctx'> 				get_page(pfrag-&gt;page);</div><div class='ctx'> 			}</div><div class='ctx'> 			copy = min_t(int, copy, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='del'>-			if (getfrag(from,</div><div class='add'>+			if (INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+				    from,</div><div class='ctx'> 				    page_address(pfrag-&gt;page) + pfrag-&gt;offset,</div><div class='ctx'> 				    offset, copy, skb-&gt;len, skb) &lt; 0)</div><div class='ctx'> 				goto error_efault;</div><div class='ctx'> </div><div class='ctx'> 			pfrag-&gt;offset += copy;</div><div class='ctx'> 			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[i - 1], copy);</div><div class='del'>-			skb-&gt;len += copy;</div><div class='del'>-			skb-&gt;data_len += copy;</div><div class='del'>-			skb-&gt;truesize += copy;</div><div class='add'>+			skb_len_add(skb, copy);</div><div class='ctx'> 			wmem_alloc_delta += copy;</div><div class='add'>+		} else {</div><div class='add'>+			err = skb_zerocopy_iter_dgram(skb, from, copy);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += copy;</div><div class='ctx'> 		length -= copy;</div><div class='hunk'>@@ -1109,9 +1280,12 @@ alloc_new_skb:</div><div class='ctx'> error_efault:</div><div class='ctx'> 	err = -EFAULT;</div><div class='ctx'> error:</div><div class='add'>+	net_zcopy_put_abort(uarg, extra_uref);</div><div class='ctx'> 	cork-&gt;length -= length;</div><div class='ctx'> 	IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 	refcount_add(wmem_alloc_delta, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+	if (hold_tskey)</div><div class='add'>+		atomic_dec(&amp;sk-&gt;sk_tskey);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1125,6 +1299,12 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,</div><div class='ctx'> 	if (unlikely(!rt))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	cork-&gt;fragsize = ip_sk_use_pmtu(sk) ?</div><div class='add'>+			 dst_mtu(&amp;rt-&gt;dst) : READ_ONCE(rt-&gt;dst.dev-&gt;mtu);</div><div class='add'>+</div><div class='add'>+	if (!inetdev_valid_mtu(cork-&gt;fragsize))</div><div class='add'>+		return -ENETUNREACH;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * setup for corking.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1141,31 +1321,33 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,</div><div class='ctx'> 		cork-&gt;addr = ipc-&gt;addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We steal reference to this route, caller should not release it</div><div class='del'>-	 */</div><div class='del'>-	*rtp = NULL;</div><div class='del'>-	cork-&gt;fragsize = ip_sk_use_pmtu(sk) ?</div><div class='del'>-			 dst_mtu(&amp;rt-&gt;dst) : rt-&gt;dst.dev-&gt;mtu;</div><div class='del'>-</div><div class='ctx'> 	cork-&gt;gso_size = ipc-&gt;gso_size;</div><div class='add'>+</div><div class='ctx'> 	cork-&gt;dst = &amp;rt-&gt;dst;</div><div class='add'>+	/* We stole this route, caller should not release it. */</div><div class='add'>+	*rtp = NULL;</div><div class='add'>+</div><div class='ctx'> 	cork-&gt;length = 0;</div><div class='ctx'> 	cork-&gt;ttl = ipc-&gt;ttl;</div><div class='ctx'> 	cork-&gt;tos = ipc-&gt;tos;</div><div class='del'>-	cork-&gt;priority = ipc-&gt;priority;</div><div class='add'>+	cork-&gt;mark = ipc-&gt;sockc.mark;</div><div class='add'>+	cork-&gt;priority = ipc-&gt;sockc.priority;</div><div class='ctx'> 	cork-&gt;transmit_time = ipc-&gt;sockc.transmit_time;</div><div class='ctx'> 	cork-&gt;tx_flags = 0;</div><div class='del'>-	sock_tx_timestamp(sk, ipc-&gt;sockc.tsflags, &amp;cork-&gt;tx_flags);</div><div class='add'>+	sock_tx_timestamp(sk, &amp;ipc-&gt;sockc, &amp;cork-&gt;tx_flags);</div><div class='add'>+	if (ipc-&gt;sockc.tsflags &amp; SOCKCM_FLAG_TS_OPT_ID) {</div><div class='add'>+		cork-&gt;flags |= IPCORK_TS_OPT_ID;</div><div class='add'>+		cork-&gt;ts_opt_id = ipc-&gt;sockc.ts_opt_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	ip_append_data() and ip_append_page() can make one large IP datagram</div><div class='del'>- *	from many pieces of data. Each pieces will be holded on the socket</div><div class='del'>- *	until ip_push_pending_frames() is called. Each piece can be a page</div><div class='del'>- *	or non-page data.</div><div class='add'>+ *	ip_append_data() can make one large IP datagram from many pieces of</div><div class='add'>+ *	data.  Each piece will be held on the socket until</div><div class='add'>+ *	ip_push_pending_frames() is called. Each piece can be a page or</div><div class='add'>+ *	non-page data.</div><div class='ctx'>  *</div><div class='ctx'>  *	Not only UDP, other transport protocols - e.g. raw sockets - can use</div><div class='ctx'>  *	this interface potentially.</div><div class='hunk'>@@ -1198,136 +1380,6 @@ int ip_append_data(struct sock *sk, struct flowi4 *fl4,</div><div class='ctx'> 				from, length, transhdrlen, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t	ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,</div><div class='del'>-		       int offset, size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct rtable *rt;</div><div class='del'>-	struct ip_options *opt = NULL;</div><div class='del'>-	struct inet_cork *cork;</div><div class='del'>-	int hh_len;</div><div class='del'>-	int mtu;</div><div class='del'>-	int len;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int maxfraglen, fragheaderlen, fraggap, maxnonfragsize;</div><div class='del'>-</div><div class='del'>-	if (inet-&gt;hdrincl)</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (flags&amp;MSG_PROBE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb_queue_empty(&amp;sk-&gt;sk_write_queue))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cork = &amp;inet-&gt;cork.base;</div><div class='del'>-	rt = (struct rtable *)cork-&gt;dst;</div><div class='del'>-	if (cork-&gt;flags &amp; IPCORK_OPT)</div><div class='del'>-		opt = cork-&gt;opt;</div><div class='del'>-</div><div class='del'>-	if (!(rt-&gt;dst.dev-&gt;features&amp;NETIF_F_SG))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	hh_len = LL_RESERVED_SPACE(rt-&gt;dst.dev);</div><div class='del'>-	mtu = cork-&gt;gso_size ? IP_MAX_MTU : cork-&gt;fragsize;</div><div class='del'>-</div><div class='del'>-	fragheaderlen = sizeof(struct iphdr) + (opt ? opt-&gt;optlen : 0);</div><div class='del'>-	maxfraglen = ((mtu - fragheaderlen) &amp; ~7) + fragheaderlen;</div><div class='del'>-	maxnonfragsize = ip_sk_ignore_df(sk) ? 0xFFFF : mtu;</div><div class='del'>-</div><div class='del'>-	if (cork-&gt;length + size &gt; maxnonfragsize - fragheaderlen) {</div><div class='del'>-		ip_local_error(sk, EMSGSIZE, fl4-&gt;daddr, inet-&gt;inet_dport,</div><div class='del'>-			       mtu - (opt ? opt-&gt;optlen : 0));</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = skb_peek_tail(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cork-&gt;length += size;</div><div class='del'>-</div><div class='del'>-	while (size &gt; 0) {</div><div class='del'>-		/* Check if the remaining data fits into current packet. */</div><div class='del'>-		len = mtu - skb-&gt;len;</div><div class='del'>-		if (len &lt; size)</div><div class='del'>-			len = maxfraglen - skb-&gt;len;</div><div class='del'>-</div><div class='del'>-		if (len &lt;= 0) {</div><div class='del'>-			struct sk_buff *skb_prev;</div><div class='del'>-			int alloclen;</div><div class='del'>-</div><div class='del'>-			skb_prev = skb;</div><div class='del'>-			fraggap = skb_prev-&gt;len - maxfraglen;</div><div class='del'>-</div><div class='del'>-			alloclen = fragheaderlen + hh_len + fraggap + 15;</div><div class='del'>-			skb = sock_wmalloc(sk, alloclen, 1, sk-&gt;sk_allocation);</div><div class='del'>-			if (unlikely(!skb)) {</div><div class='del'>-				err = -ENOBUFS;</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 *	Fill in the control structures</div><div class='del'>-			 */</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-			skb-&gt;csum = 0;</div><div class='del'>-			skb_reserve(skb, hh_len);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 *	Find where to start putting bytes.</div><div class='del'>-			 */</div><div class='del'>-			skb_put(skb, fragheaderlen + fraggap);</div><div class='del'>-			skb_reset_network_header(skb);</div><div class='del'>-			skb-&gt;transport_header = (skb-&gt;network_header +</div><div class='del'>-						 fragheaderlen);</div><div class='del'>-			if (fraggap) {</div><div class='del'>-				skb-&gt;csum = skb_copy_and_csum_bits(skb_prev,</div><div class='del'>-								   maxfraglen,</div><div class='del'>-						    skb_transport_header(skb),</div><div class='del'>-								   fraggap, 0);</div><div class='del'>-				skb_prev-&gt;csum = csum_sub(skb_prev-&gt;csum,</div><div class='del'>-							  skb-&gt;csum);</div><div class='del'>-				pskb_trim_unique(skb_prev, maxfraglen);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Put the packet on the pending queue.</div><div class='del'>-			 */</div><div class='del'>-			__skb_queue_tail(&amp;sk-&gt;sk_write_queue, skb);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (len &gt; size)</div><div class='del'>-			len = size;</div><div class='del'>-</div><div class='del'>-		if (skb_append_pagefrags(skb, page, offset, len)) {</div><div class='del'>-			err = -EMSGSIZE;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;ip_summed == CHECKSUM_NONE) {</div><div class='del'>-			__wsum csum;</div><div class='del'>-			csum = csum_page(page, offset, len);</div><div class='del'>-			skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, skb-&gt;len);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb-&gt;len += len;</div><div class='del'>-		skb-&gt;data_len += len;</div><div class='del'>-		skb-&gt;truesize += len;</div><div class='del'>-		refcount_add(len, &amp;sk-&gt;sk_wmem_alloc);</div><div class='del'>-		offset += len;</div><div class='del'>-		size -= len;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	cork-&gt;length -= size;</div><div class='del'>-	IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ip_cork_release(struct inet_cork *cork)</div><div class='ctx'> {</div><div class='ctx'> 	cork-&gt;flags &amp;= ~IPCORK_OPT;</div><div class='hunk'>@@ -1351,10 +1403,10 @@ struct sk_buff *__ip_make_skb(struct sock *sk,</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ip_options *opt = NULL;</div><div class='del'>-	struct rtable *rt = (struct rtable *)cork-&gt;dst;</div><div class='add'>+	struct rtable *rt = dst_rtable(cork-&gt;dst);</div><div class='ctx'> 	struct iphdr *iph;</div><div class='add'>+	u8 pmtudisc, ttl;</div><div class='ctx'> 	__be16 df = 0;</div><div class='del'>-	__u8 ttl;</div><div class='ctx'> </div><div class='ctx'> 	skb = __skb_dequeue(queue);</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -1384,8 +1436,9 @@ struct sk_buff *__ip_make_skb(struct sock *sk,</div><div class='ctx'> 	/* DF bit is set when we want to see DF on outgoing frames.</div><div class='ctx'> 	 * If ignore_df is set too, we still allow to fragment this frame</div><div class='ctx'> 	 * locally. */</div><div class='del'>-	if (inet-&gt;pmtudisc == IP_PMTUDISC_DO ||</div><div class='del'>-	    inet-&gt;pmtudisc == IP_PMTUDISC_PROBE ||</div><div class='add'>+	pmtudisc = READ_ONCE(inet-&gt;pmtudisc);</div><div class='add'>+	if (pmtudisc == IP_PMTUDISC_DO ||</div><div class='add'>+	    pmtudisc == IP_PMTUDISC_PROBE ||</div><div class='ctx'> 	    (skb-&gt;len &lt;= dst_mtu(&amp;rt-&gt;dst) &amp;&amp;</div><div class='ctx'> 	     ip_dont_fragment(sk, &amp;rt-&gt;dst)))</div><div class='ctx'> 		df = htons(IP_DF);</div><div class='hunk'>@@ -1396,14 +1449,14 @@ struct sk_buff *__ip_make_skb(struct sock *sk,</div><div class='ctx'> 	if (cork-&gt;ttl != 0)</div><div class='ctx'> 		ttl = cork-&gt;ttl;</div><div class='ctx'> 	else if (rt-&gt;rt_type == RTN_MULTICAST)</div><div class='del'>-		ttl = inet-&gt;mc_ttl;</div><div class='add'>+		ttl = READ_ONCE(inet-&gt;mc_ttl);</div><div class='ctx'> 	else</div><div class='ctx'> 		ttl = ip_select_ttl(inet, &amp;rt-&gt;dst);</div><div class='ctx'> </div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> 	iph-&gt;version = 4;</div><div class='ctx'> 	iph-&gt;ihl = 5;</div><div class='del'>-	iph-&gt;tos = (cork-&gt;tos != -1) ? cork-&gt;tos : inet-&gt;tos;</div><div class='add'>+	iph-&gt;tos = (cork-&gt;tos != -1) ? cork-&gt;tos : READ_ONCE(inet-&gt;tos);</div><div class='ctx'> 	iph-&gt;frag_off = df;</div><div class='ctx'> 	iph-&gt;ttl = ttl;</div><div class='ctx'> 	iph-&gt;protocol = sk-&gt;sk_protocol;</div><div class='hunk'>@@ -1411,13 +1464,16 @@ struct sk_buff *__ip_make_skb(struct sock *sk,</div><div class='ctx'> 	ip_select_ident(net, skb, sk);</div><div class='ctx'> </div><div class='ctx'> 	if (opt) {</div><div class='del'>-		iph-&gt;ihl += opt-&gt;optlen&gt;&gt;2;</div><div class='del'>-		ip_options_build(skb, opt, cork-&gt;addr, rt, 0);</div><div class='add'>+		iph-&gt;ihl += opt-&gt;optlen &gt;&gt; 2;</div><div class='add'>+		ip_options_build(skb, opt, cork-&gt;addr, rt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;priority = (cork-&gt;tos != -1) ? cork-&gt;priority: sk-&gt;sk_priority;</div><div class='del'>-	skb-&gt;mark = sk-&gt;sk_mark;</div><div class='del'>-	skb-&gt;tstamp = cork-&gt;transmit_time;</div><div class='add'>+	skb-&gt;priority = cork-&gt;priority;</div><div class='add'>+	skb-&gt;mark = cork-&gt;mark;</div><div class='add'>+	if (sk_is_tcp(sk))</div><div class='add'>+		skb_set_delivery_time(skb, cork-&gt;transmit_time, SKB_CLOCK_MONOTONIC);</div><div class='add'>+	else</div><div class='add'>+		skb_set_delivery_type_by_clockid(skb, cork-&gt;transmit_time, sk-&gt;sk_clockid);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec</div><div class='ctx'> 	 * on dst refcount</div><div class='hunk'>@@ -1425,9 +1481,20 @@ struct sk_buff *__ip_make_skb(struct sock *sk,</div><div class='ctx'> 	cork-&gt;dst = NULL;</div><div class='ctx'> 	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='ctx'> </div><div class='del'>-	if (iph-&gt;protocol == IPPROTO_ICMP)</div><div class='del'>-		icmp_out_count(net, ((struct icmphdr *)</div><div class='del'>-			skb_transport_header(skb))-&gt;type);</div><div class='add'>+	if (iph-&gt;protocol == IPPROTO_ICMP) {</div><div class='add'>+		u8 icmp_type;</div><div class='add'>+</div><div class='add'>+		/* For such sockets, transhdrlen is zero when do ip_append_data(),</div><div class='add'>+		 * so icmphdr does not in skb linear region and can not get icmp_type</div><div class='add'>+		 * by icmp_hdr(skb)-&gt;type.</div><div class='add'>+		 */</div><div class='add'>+		if (sk-&gt;sk_type == SOCK_RAW &amp;&amp;</div><div class='add'>+		    !(fl4-&gt;flowi4_flags &amp; FLOWI_FLAG_KNOWN_NH))</div><div class='add'>+			icmp_type = fl4-&gt;fl4_icmp_type;</div><div class='add'>+		else</div><div class='add'>+			icmp_type = icmp_hdr(skb)-&gt;type;</div><div class='add'>+		icmp_out_count(net, icmp_type);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ip_cork_release(cork);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1523,7 +1590,7 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,</div><div class='ctx'> {</div><div class='ctx'> 	__wsum csum;</div><div class='ctx'> </div><div class='del'>-	csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);</div><div class='add'>+	csum = csum_partial_copy_nocheck(dptr+offset, to, len);</div><div class='ctx'> 	skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, odd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1532,11 +1599,12 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,</div><div class='ctx'>  *	Generic function to send a packet as reply to another packet.</div><div class='ctx'>  *	Used to send some TCP resets/acks so far.</div><div class='ctx'>  */</div><div class='del'>-void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+void ip_send_unicast_reply(struct sock *sk, const struct sock *orig_sk,</div><div class='add'>+			   struct sk_buff *skb,</div><div class='ctx'> 			   const struct ip_options *sopt,</div><div class='ctx'> 			   __be32 daddr, __be32 saddr,</div><div class='ctx'> 			   const struct ip_reply_arg *arg,</div><div class='del'>-			   unsigned int len)</div><div class='add'>+			   unsigned int len, u64 transmit_time, u32 txhash)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_options_data replyopts;</div><div class='ctx'> 	struct ipcm_cookie ipc;</div><div class='hunk'>@@ -1552,6 +1620,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	ipcm_init(&amp;ipc);</div><div class='ctx'> 	ipc.addr = daddr;</div><div class='add'>+	ipc.sockc.transmit_time = transmit_time;</div><div class='ctx'> </div><div class='ctx'> 	if (replyopts.opt.opt.optlen) {</div><div class='ctx'> 		ipc.opt = &amp;replyopts.opt;</div><div class='hunk'>@@ -1566,24 +1635,23 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	flowi4_init_output(&amp;fl4, oif,</div><div class='ctx'> 			   IP4_REPLY_MARK(net, skb-&gt;mark) ?: sk-&gt;sk_mark,</div><div class='del'>-			   RT_TOS(arg-&gt;tos),</div><div class='add'>+			   arg-&gt;tos &amp; INET_DSCP_MASK,</div><div class='ctx'> 			   RT_SCOPE_UNIVERSE, ip_hdr(skb)-&gt;protocol,</div><div class='ctx'> 			   ip_reply_arg_flowi_flags(arg),</div><div class='ctx'> 			   daddr, saddr,</div><div class='ctx'> 			   tcp_hdr(skb)-&gt;source, tcp_hdr(skb)-&gt;dest,</div><div class='ctx'> 			   arg-&gt;uid);</div><div class='del'>-	security_skb_classify_flow(skb, flowi4_to_flowi(&amp;fl4));</div><div class='del'>-	rt = ip_route_output_key(net, &amp;fl4);</div><div class='add'>+	security_skb_classify_flow(skb, flowi4_to_flowi_common(&amp;fl4));</div><div class='add'>+	rt = ip_route_output_flow(net, &amp;fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	inet_sk(sk)-&gt;tos = arg-&gt;tos;</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_priority = skb-&gt;priority;</div><div class='ctx'> 	sk-&gt;sk_protocol = ip_hdr(skb)-&gt;protocol;</div><div class='ctx'> 	sk-&gt;sk_bound_dev_if = arg-&gt;bound_dev_if;</div><div class='del'>-	sk-&gt;sk_sndbuf = sysctl_wmem_default;</div><div class='del'>-	sk-&gt;sk_mark = fl4.flowi4_mark;</div><div class='add'>+	sk-&gt;sk_sndbuf = READ_ONCE(sysctl_wmem_default);</div><div class='add'>+	ipc.sockc.mark = fl4.flowi4_mark;</div><div class='ctx'> 	err = ip_append_data(sk, &amp;fl4, ip_reply_glue_bits, arg-&gt;iov-&gt;iov_base,</div><div class='ctx'> 			     len, 0, &amp;ipc, &amp;rt, MSG_DONTWAIT);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='hunk'>@@ -1598,6 +1666,14 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			  arg-&gt;csumoffset) = csum_fold(csum_add(nskb-&gt;csum,</div><div class='ctx'> 								arg-&gt;csum));</div><div class='ctx'> 		nskb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+		if (orig_sk) {</div><div class='add'>+			skb_set_owner_edemux(nskb, (struct sock *)orig_sk);</div><div class='add'>+			psp_reply_set_decrypted(orig_sk, nskb);</div><div class='add'>+		}</div><div class='add'>+		if (transmit_time)</div><div class='add'>+			nskb-&gt;tstamp_type = SKB_CLOCK_MONOTONIC;</div><div class='add'>+		if (txhash)</div><div class='add'>+			skb_set_hash(nskb, txhash, PKT_HASH_TYPE_L4);</div><div class='ctx'> 		ip_push_pending_frames(sk, &amp;fl4);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='head'>diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c<br/>index 26c36cccabdc..6d9c5c20b1c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_sockglue.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_sockglue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_sockglue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_sockglue.c</a></div><div class='hunk'>@@ -47,8 +47,6 @@</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bpfilter.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	SOL_IP control messages.</div><div class='ctx'>  */</div><div class='hunk'>@@ -130,37 +128,35 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	char *secdata;</div><div class='del'>-	u32 seclen, secid;</div><div class='add'>+	struct lsm_context ctx;</div><div class='add'>+	u32 secid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = security_socket_getpeersec_dgram(NULL, skb, &amp;secid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	err = security_secid_to_secctx(secid, &amp;secdata, &amp;seclen);</div><div class='del'>-	if (err)</div><div class='add'>+	err = security_secid_to_secctx(secid, &amp;ctx);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	put_cmsg(msg, SOL_IP, SCM_SECURITY, seclen, secdata);</div><div class='del'>-	security_release_secctx(secdata, seclen);</div><div class='add'>+	put_cmsg(msg, SOL_IP, SCM_SECURITY, ctx.len, ctx.context);</div><div class='add'>+	security_release_secctx(&amp;ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	__be16 _ports[2], *ports;</div><div class='ctx'> 	struct sockaddr_in sin;</div><div class='del'>-	__be16 *ports;</div><div class='del'>-	int end;</div><div class='del'>-</div><div class='del'>-	end = skb_transport_offset(skb) + 4;</div><div class='del'>-	if (end &gt; 0 &amp;&amp; !pskb_may_pull(skb, end))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	/* All current transport protocols have the port numbers in the</div><div class='ctx'> 	 * first four bytes of the transport header and this function is</div><div class='ctx'> 	 * written with this assumption in mind.</div><div class='ctx'> 	 */</div><div class='del'>-	ports = (__be16 *)skb_transport_header(skb);</div><div class='add'>+	ports = skb_header_pointer(skb, skb_transport_offset(skb),</div><div class='add'>+				   sizeof(_ports), &amp;_ports);</div><div class='add'>+	if (!ports)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	sin.sin_family = AF_INET;</div><div class='ctx'> 	sin.sin_addr.s_addr = ip_hdr(skb)-&gt;daddr;</div><div class='hunk'>@@ -173,8 +169,10 @@ static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb)</div><div class='ctx'> void ip_cmsg_recv_offset(struct msghdr *msg, struct sock *sk,</div><div class='ctx'> 			 struct sk_buff *skb, int tlen, int offset)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	unsigned int flags = inet-&gt;cmsg_flags;</div><div class='add'>+	unsigned long flags = inet_cmsg_flags(inet_sk(sk));</div><div class='add'>+</div><div class='add'>+	if (!flags)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Ordered by supposed usage frequency */</div><div class='ctx'> 	if (flags &amp; IP_CMSG_PKTINFO) {</div><div class='hunk'>@@ -269,7 +267,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		if (cmsg-&gt;cmsg_level == SOL_SOCKET) {</div><div class='del'>-			err = __sock_cmsg_send(sk, msg, cmsg, &amp;ipc-&gt;sockc);</div><div class='add'>+			err = __sock_cmsg_send(sk, cmsg, &amp;ipc-&gt;sockc);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -282,7 +280,8 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,</div><div class='ctx'> 			err = cmsg-&gt;cmsg_len - sizeof(struct cmsghdr);</div><div class='ctx'> </div><div class='ctx'> 			/* Our caller is responsible for freeing ipc-&gt;opt */</div><div class='del'>-			err = ip_options_get(net, &amp;ipc-&gt;opt, CMSG_DATA(cmsg),</div><div class='add'>+			err = ip_options_get(net, &amp;ipc-&gt;opt,</div><div class='add'>+					     KERNEL_SOCKPTR(CMSG_DATA(cmsg)),</div><div class='ctx'> 					     err &lt; 40 ? err : 40);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -316,9 +315,16 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,</div><div class='ctx'> 			if (val &lt; 0 || val &gt; 255)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			ipc-&gt;tos = val;</div><div class='del'>-			ipc-&gt;priority = rt_tos2priority(ipc-&gt;tos);</div><div class='add'>+			ipc-&gt;sockc.priority = rt_tos2priority(ipc-&gt;tos);</div><div class='add'>+			break;</div><div class='add'>+		case IP_PROTOCOL:</div><div class='add'>+			if (cmsg-&gt;cmsg_len != CMSG_LEN(sizeof(int)))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			val = *(int *)CMSG_DATA(cmsg);</div><div class='add'>+			if (val &lt; 1 || val &gt; 255)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			ipc-&gt;protocol = val;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -345,6 +351,8 @@ int ip_ra_control(struct sock *sk, unsigned char on,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;</div><div class='add'>+	if (on &amp;&amp; !new_ra)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;net-&gt;ipv4.ra_mutex);</div><div class='ctx'> 	for (rap = &amp;net-&gt;ipv4.ra_chain;</div><div class='hunk'>@@ -389,6 +397,18 @@ int ip_ra_control(struct sock *sk, unsigned char on,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ipv4_icmp_error_rfc4884(const struct sk_buff *skb,</div><div class='add'>+				    struct sock_ee_data_rfc4884 *out)</div><div class='add'>+{</div><div class='add'>+	switch (icmp_hdr(skb)-&gt;type) {</div><div class='add'>+	case ICMP_DEST_UNREACH:</div><div class='add'>+	case ICMP_TIME_EXCEEDED:</div><div class='add'>+	case ICMP_PARAMETERPROB:</div><div class='add'>+		ip_icmp_error_rfc4884(skb, out, sizeof(struct icmphdr),</div><div class='add'>+				      icmp_hdr(skb)-&gt;un.reserved[1] * 4);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err,</div><div class='ctx'> 		   __be16 port, u32 info, u8 *payload)</div><div class='ctx'> {</div><div class='hunk'>@@ -411,21 +431,24 @@ void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err,</div><div class='ctx'> 	serr-&gt;port = port;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_pull(skb, payload - skb-&gt;data)) {</div><div class='add'>+		if (inet_test_bit(RECVERR_RFC4884, sk))</div><div class='add'>+			ipv4_icmp_error_rfc4884(skb, &amp;serr-&gt;ee.ee_rfc4884);</div><div class='add'>+</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='ctx'> 		if (sock_queue_err_skb(sk, skb) == 0)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_icmp_error);</div><div class='ctx'> </div><div class='ctx'> void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 port, u32 info)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct sock_exterr_skb *serr;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (!inet-&gt;recverr)</div><div class='add'>+	if (!inet_test_bit(RECVERR, sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(sizeof(struct iphdr), GFP_ATOMIC);</div><div class='hunk'>@@ -486,7 +509,7 @@ static bool ipv4_datagram_support_cmsg(const struct sock *sk,</div><div class='ctx'> 	 * or without payload (SOF_TIMESTAMPING_OPT_TSONLY).</div><div class='ctx'> 	 */</div><div class='ctx'> 	info = PKTINFO_SKB_CB(skb);</div><div class='del'>-	if (!(sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_CMSG) ||</div><div class='add'>+	if (!(READ_ONCE(sk-&gt;sk_tsflags) &amp; SOF_TIMESTAMPING_OPT_CMSG) ||</div><div class='ctx'> 	    !info-&gt;ipi_ifindex)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -544,7 +567,7 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)</div><div class='ctx'> 	if (ipv4_datagram_support_cmsg(sk, skb, serr-&gt;ee.ee_origin)) {</div><div class='ctx'> 		sin-&gt;sin_family = AF_INET;</div><div class='ctx'> 		sin-&gt;sin_addr.s_addr = ip_hdr(skb)-&gt;saddr;</div><div class='del'>-		if (inet_sk(sk)-&gt;cmsg_flags)</div><div class='add'>+		if (inet_cmsg_flags(inet_sk(sk)))</div><div class='ctx'> 			ip_cmsg_recv(msg, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -560,6 +583,55 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __ip_sock_set_tos(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	u8 old_tos = inet_sk(sk)-&gt;tos;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_type == SOCK_STREAM) {</div><div class='add'>+		val &amp;= ~INET_ECN_MASK;</div><div class='add'>+		val |= old_tos &amp; INET_ECN_MASK;</div><div class='add'>+	}</div><div class='add'>+	if (old_tos != val) {</div><div class='add'>+		WRITE_ONCE(inet_sk(sk)-&gt;tos, val);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_priority, rt_tos2priority(val));</div><div class='add'>+		sk_dst_reset(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ip_sock_set_tos(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+	__ip_sock_set_tos(sk, val);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_sock_set_tos);</div><div class='add'>+</div><div class='add'>+void ip_sock_set_freebind(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	inet_set_bit(FREEBIND, sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_sock_set_freebind);</div><div class='add'>+</div><div class='add'>+void ip_sock_set_recverr(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	inet_set_bit(RECVERR, sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_sock_set_recverr);</div><div class='add'>+</div><div class='add'>+int ip_sock_set_mtu_discover(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; IP_PMTUDISC_DONT || val &gt; IP_PMTUDISC_OMIT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	WRITE_ONCE(inet_sk(sk)-&gt;pmtudisc, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_sock_set_mtu_discover);</div><div class='add'>+</div><div class='add'>+void ip_sock_set_pktinfo(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	inet_set_bit(PKTINFO, sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_sock_set_pktinfo);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Socket option code for IP. This is the end of the line after any</div><div class='hunk'>@@ -587,12 +659,242 @@ static bool setsockopt_needs_rtnl(int optname)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='del'>-			    int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+static int set_mcast_msfilter(struct sock *sk, int ifindex,</div><div class='add'>+			      int numsrc, int fmode,</div><div class='add'>+			      struct sockaddr_storage *group,</div><div class='add'>+			      struct sockaddr_storage *list)</div><div class='add'>+{</div><div class='add'>+	struct ip_msfilter *msf;</div><div class='add'>+	struct sockaddr_in *psin;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	msf = kmalloc(IP_MSFILTER_SIZE(numsrc), GFP_KERNEL);</div><div class='add'>+	if (!msf)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	psin = (struct sockaddr_in *)group;</div><div class='add'>+	if (psin-&gt;sin_family != AF_INET)</div><div class='add'>+		goto Eaddrnotavail;</div><div class='add'>+	msf-&gt;imsf_multiaddr = psin-&gt;sin_addr.s_addr;</div><div class='add'>+	msf-&gt;imsf_interface = 0;</div><div class='add'>+	msf-&gt;imsf_fmode = fmode;</div><div class='add'>+	msf-&gt;imsf_numsrc = numsrc;</div><div class='add'>+	for (i = 0; i &lt; numsrc; ++i) {</div><div class='add'>+		psin = (struct sockaddr_in *)&amp;list[i];</div><div class='add'>+</div><div class='add'>+		if (psin-&gt;sin_family != AF_INET)</div><div class='add'>+			goto Eaddrnotavail;</div><div class='add'>+		msf-&gt;imsf_slist_flex[i] = psin-&gt;sin_addr.s_addr;</div><div class='add'>+	}</div><div class='add'>+	err = ip_mc_msfilter(sk, msf, ifindex);</div><div class='add'>+	kfree(msf);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+Eaddrnotavail:</div><div class='add'>+	kfree(msf);</div><div class='add'>+	return -EADDRNOTAVAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int copy_group_source_from_sockptr(struct group_source_req *greqs,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct compat_group_source_req gr32;</div><div class='add'>+</div><div class='add'>+		if (optlen != sizeof(gr32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;gr32, optval, sizeof(gr32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		greqs-&gt;gsr_interface = gr32.gsr_interface;</div><div class='add'>+		greqs-&gt;gsr_group = gr32.gsr_group;</div><div class='add'>+		greqs-&gt;gsr_source = gr32.gsr_source;</div><div class='add'>+	} else {</div><div class='add'>+		if (optlen != sizeof(*greqs))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(greqs, optval, sizeof(*greqs)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_mcast_group_source(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct group_source_req greqs;</div><div class='add'>+	struct ip_mreq_source mreqs;</div><div class='add'>+	struct sockaddr_in *psin;</div><div class='add'>+	int omode, add, err;</div><div class='add'>+</div><div class='add'>+	err = copy_group_source_from_sockptr(&amp;greqs, optval, optlen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (greqs.gsr_group.ss_family != AF_INET ||</div><div class='add'>+	    greqs.gsr_source.ss_family != AF_INET)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	psin = (struct sockaddr_in *)&amp;greqs.gsr_group;</div><div class='add'>+	mreqs.imr_multiaddr = psin-&gt;sin_addr.s_addr;</div><div class='add'>+	psin = (struct sockaddr_in *)&amp;greqs.gsr_source;</div><div class='add'>+	mreqs.imr_sourceaddr = psin-&gt;sin_addr.s_addr;</div><div class='add'>+	mreqs.imr_interface = 0; /* use index for mc_source */</div><div class='add'>+</div><div class='add'>+	if (optname == MCAST_BLOCK_SOURCE) {</div><div class='add'>+		omode = MCAST_EXCLUDE;</div><div class='add'>+		add = 1;</div><div class='add'>+	} else if (optname == MCAST_UNBLOCK_SOURCE) {</div><div class='add'>+		omode = MCAST_EXCLUDE;</div><div class='add'>+		add = 0;</div><div class='add'>+	} else if (optname == MCAST_JOIN_SOURCE_GROUP) {</div><div class='add'>+		struct ip_mreqn mreq;</div><div class='add'>+</div><div class='add'>+		psin = (struct sockaddr_in *)&amp;greqs.gsr_group;</div><div class='add'>+		mreq.imr_multiaddr = psin-&gt;sin_addr;</div><div class='add'>+		mreq.imr_address.s_addr = 0;</div><div class='add'>+		mreq.imr_ifindex = greqs.gsr_interface;</div><div class='add'>+		err = ip_mc_join_group_ssm(sk, &amp;mreq, MCAST_INCLUDE);</div><div class='add'>+		if (err &amp;&amp; err != -EADDRINUSE)</div><div class='add'>+			return err;</div><div class='add'>+		greqs.gsr_interface = mreq.imr_ifindex;</div><div class='add'>+		omode = MCAST_INCLUDE;</div><div class='add'>+		add = 1;</div><div class='add'>+	} else /* MCAST_LEAVE_SOURCE_GROUP */ {</div><div class='add'>+		omode = MCAST_INCLUDE;</div><div class='add'>+		add = 0;</div><div class='add'>+	}</div><div class='add'>+	return ip_mc_source(add, omode, sk, &amp;mreqs, greqs.gsr_interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_set_mcast_msfilter(struct sock *sk, sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct group_filter *gsf = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; GROUP_FILTER_SIZE(0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (optlen &gt; READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max))</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	gsf = memdup_sockptr(optval, optlen);</div><div class='add'>+	if (IS_ERR(gsf))</div><div class='add'>+		return PTR_ERR(gsf);</div><div class='add'>+</div><div class='add'>+	/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='add'>+	err = -ENOBUFS;</div><div class='add'>+	if (gsf-&gt;gf_numsrc &gt;= 0x1ffffff ||</div><div class='add'>+	    gsf-&gt;gf_numsrc &gt; READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_igmp_max_msf))</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (GROUP_FILTER_SIZE(gsf-&gt;gf_numsrc) &gt; optlen)</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	err = set_mcast_msfilter(sk, gsf-&gt;gf_interface, gsf-&gt;gf_numsrc,</div><div class='add'>+				 gsf-&gt;gf_fmode, &amp;gsf-&gt;gf_group,</div><div class='add'>+				 gsf-&gt;gf_slist_flex);</div><div class='add'>+out_free_gsf:</div><div class='add'>+	kfree(gsf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ip_set_mcast_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+		int optlen)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct compat_group_filter, gf_slist_flex);</div><div class='add'>+	struct compat_group_filter *gf32;</div><div class='add'>+	unsigned int n;</div><div class='add'>+	void *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (optlen &gt; READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max) - 4)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	p = kmalloc(optlen + 4, GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	gf32 = p + 4; /* we want -&gt;gf_group and -&gt;gf_slist_flex aligned */</div><div class='add'>+</div><div class='add'>+	err = -EFAULT;</div><div class='add'>+	if (copy_from_sockptr(gf32, optval, optlen))</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='add'>+	n = gf32-&gt;gf_numsrc;</div><div class='add'>+	err = -ENOBUFS;</div><div class='add'>+	if (n &gt;= 0x1ffffff)</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (offsetof(struct compat_group_filter, gf_slist_flex[n]) &gt; optlen)</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='add'>+	err = -ENOBUFS;</div><div class='add'>+	if (n &gt; READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_igmp_max_msf))</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+	err = set_mcast_msfilter(sk, gf32-&gt;gf_interface, n, gf32-&gt;gf_fmode,</div><div class='add'>+				 &amp;gf32-&gt;gf_group, gf32-&gt;gf_slist_flex);</div><div class='add'>+out_free_gsf:</div><div class='add'>+	kfree(p);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_mcast_join_leave(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct ip_mreqn mreq = { };</div><div class='add'>+	struct sockaddr_in *psin;</div><div class='add'>+	struct group_req greq;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(struct group_req))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;greq, optval, sizeof(greq)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	psin = (struct sockaddr_in *)&amp;greq.gr_group;</div><div class='add'>+	if (psin-&gt;sin_family != AF_INET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	mreq.imr_multiaddr = psin-&gt;sin_addr;</div><div class='add'>+	mreq.imr_ifindex = greq.gr_interface;</div><div class='add'>+	if (optname == MCAST_JOIN_GROUP)</div><div class='add'>+		return ip_mc_join_group(sk, &amp;mreq);</div><div class='add'>+	return ip_mc_leave_group(sk, &amp;mreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ip_mcast_join_leave(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct compat_group_req greq;</div><div class='add'>+	struct ip_mreqn mreq = { };</div><div class='add'>+	struct sockaddr_in *psin;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(struct compat_group_req))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;greq, optval, sizeof(greq)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	psin = (struct sockaddr_in *)&amp;greq.gr_group;</div><div class='add'>+	if (psin-&gt;sin_family != AF_INET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	mreq.imr_multiaddr = psin-&gt;sin_addr;</div><div class='add'>+	mreq.imr_ifindex = greq.gr_interface;</div><div class='add'>+</div><div class='add'>+	if (optname == MCAST_JOIN_GROUP)</div><div class='add'>+		return ip_mc_join_group(sk, &amp;mreq);</div><div class='add'>+	return ip_mc_leave_group(sk, &amp;mreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(ip4_min_ttl);</div><div class='add'>+</div><div class='add'>+int do_ip_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		     sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	int val = 0, err;</div><div class='add'>+	int val = 0, err, retv;</div><div class='ctx'> 	bool needs_rtnl = setsockopt_needs_rtnl(optname);</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='hunk'>@@ -620,13 +922,15 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 	case IP_RECVORIGDSTADDR:</div><div class='ctx'> 	case IP_CHECKSUM:</div><div class='ctx'> 	case IP_RECVFRAGSIZE:</div><div class='add'>+	case IP_RECVERR_RFC4884:</div><div class='add'>+	case IP_LOCAL_PORT_RANGE:</div><div class='ctx'> 		if (optlen &gt;= sizeof(int)) {</div><div class='del'>-			if (get_user(val, (int __user *) optval))</div><div class='add'>+			if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		} else if (optlen &gt;= sizeof(char)) {</div><div class='ctx'> 			unsigned char ucval;</div><div class='ctx'> </div><div class='del'>-			if (get_user(ucval, (unsigned char __user *) optval))</div><div class='add'>+			if (copy_from_sockptr(&amp;ucval, optval, sizeof(ucval)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			val = (int) ucval;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -634,15 +938,144 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 	/* If optlen==0, it is equivalent to val == 0 */</div><div class='ctx'> </div><div class='del'>-	if (optname == IP_ROUTER_ALERT)</div><div class='del'>-		return ip_ra_control(sk, val ? 1 : 0, NULL);</div><div class='add'>+	if (optname == IP_ROUTER_ALERT) {</div><div class='add'>+		retv = ip_ra_control(sk, val ? 1 : 0, NULL);</div><div class='add'>+		if (retv == 0)</div><div class='add'>+			inet_assign_bit(RTALERT, sk, val);</div><div class='add'>+		return retv;</div><div class='add'>+	}</div><div class='ctx'> 	if (ip_mroute_opt(optname))</div><div class='ctx'> 		return ip_mroute_setsockopt(sk, optname, optval, optlen);</div><div class='ctx'> </div><div class='add'>+	/* Handle options that can be set without locking the socket. */</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case IP_PKTINFO:</div><div class='add'>+		inet_assign_bit(PKTINFO, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVTTL:</div><div class='add'>+		inet_assign_bit(TTL, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVTOS:</div><div class='add'>+		inet_assign_bit(TOS, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVOPTS:</div><div class='add'>+		inet_assign_bit(RECVOPTS, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RETOPTS:</div><div class='add'>+		inet_assign_bit(RETOPTS, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_PASSSEC:</div><div class='add'>+		inet_assign_bit(PASSSEC, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVORIGDSTADDR:</div><div class='add'>+		inet_assign_bit(ORIGDSTADDR, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVFRAGSIZE:</div><div class='add'>+		if (sk-&gt;sk_type != SOCK_RAW &amp;&amp; sk-&gt;sk_type != SOCK_DGRAM)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(RECVFRAGSIZE, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVERR:</div><div class='add'>+		inet_assign_bit(RECVERR, sk, val);</div><div class='add'>+		if (!val)</div><div class='add'>+			skb_errqueue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_RECVERR_RFC4884:</div><div class='add'>+		if (val &lt; 0 || val &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(RECVERR_RFC4884, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_FREEBIND:</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(FREEBIND, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_HDRINCL:</div><div class='add'>+		if (sk-&gt;sk_type != SOCK_RAW)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+		inet_assign_bit(HDRINCL, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_MULTICAST_LOOP:</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(MC_LOOP, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_MULTICAST_ALL:</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val != 0 &amp;&amp; val != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(MC_ALL, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_TRANSPARENT:</div><div class='add'>+		if (!!val &amp;&amp; !sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_RAW) &amp;&amp;</div><div class='add'>+		    !sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet_assign_bit(TRANSPARENT, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_NODEFRAG:</div><div class='add'>+		if (sk-&gt;sk_type != SOCK_RAW)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+		inet_assign_bit(NODEFRAG, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_BIND_ADDRESS_NO_PORT:</div><div class='add'>+		inet_assign_bit(BIND_ADDRESS_NO_PORT, sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_TTL:</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val != -1 &amp;&amp; (val &lt; 1 || val &gt; 255))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(inet-&gt;uc_ttl, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_MINTTL:</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &lt; 0 || val &gt; 255)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (val)</div><div class='add'>+			static_branch_enable(&amp;ip4_min_ttl);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(inet-&gt;min_ttl, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_MULTICAST_TTL:</div><div class='add'>+		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (optlen &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val == -1)</div><div class='add'>+			val = 1;</div><div class='add'>+		if (val &lt; 0 || val &gt; 255)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(inet-&gt;mc_ttl, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_MTU_DISCOVER:</div><div class='add'>+		return ip_sock_set_mtu_discover(sk, val);</div><div class='add'>+	case IP_TOS:	/* This sets both TOS and Precedence */</div><div class='add'>+		ip_sock_set_tos(sk, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IP_LOCAL_PORT_RANGE:</div><div class='add'>+	{</div><div class='add'>+		u16 lo = val;</div><div class='add'>+		u16 hi = val &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+		if (optlen != sizeof(u32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (lo != 0 &amp;&amp; hi != 0 &amp;&amp; lo &gt; hi)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(inet-&gt;local_port_range, val);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	if (needs_rtnl)</div><div class='ctx'> 		rtnl_lock();</div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case IP_OPTIONS:</div><div class='hunk'>@@ -651,13 +1084,12 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 		if (optlen &gt; 40)</div><div class='ctx'> 			goto e_inval;</div><div class='del'>-		err = ip_options_get_from_user(sock_net(sk), &amp;opt,</div><div class='del'>-					       optval, optlen);</div><div class='add'>+		err = ip_options_get(sock_net(sk), &amp;opt, optval, optlen);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> 		old = rcu_dereference_protected(inet-&gt;inet_opt,</div><div class='ctx'> 						lockdep_sock_is_held(sk));</div><div class='del'>-		if (inet-&gt;is_icsk) {</div><div class='add'>+		if (inet_test_bit(IS_ICSK, sk)) {</div><div class='ctx'> 			struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 			if (sk-&gt;sk_family == PF_INET ||</div><div class='hunk'>@@ -679,130 +1111,19 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 			kfree_rcu(old, rcu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	case IP_PKTINFO:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |= IP_CMSG_PKTINFO;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_PKTINFO;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVTTL:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |=  IP_CMSG_TTL;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_TTL;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVTOS:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |=  IP_CMSG_TOS;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_TOS;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVOPTS:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |=  IP_CMSG_RECVOPTS;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_RECVOPTS;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RETOPTS:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |= IP_CMSG_RETOPTS;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_RETOPTS;</div><div class='del'>-		break;</div><div class='del'>-	case IP_PASSSEC:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |= IP_CMSG_PASSSEC;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_PASSSEC;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVORIGDSTADDR:</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |= IP_CMSG_ORIGDSTADDR;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_ORIGDSTADDR;</div><div class='del'>-		break;</div><div class='ctx'> 	case IP_CHECKSUM:</div><div class='ctx'> 		if (val) {</div><div class='del'>-			if (!(inet-&gt;cmsg_flags &amp; IP_CMSG_CHECKSUM)) {</div><div class='add'>+			if (!(inet_test_bit(CHECKSUM, sk))) {</div><div class='ctx'> 				inet_inc_convert_csum(sk);</div><div class='del'>-				inet-&gt;cmsg_flags |= IP_CMSG_CHECKSUM;</div><div class='add'>+				inet_set_bit(CHECKSUM, sk);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (inet-&gt;cmsg_flags &amp; IP_CMSG_CHECKSUM) {</div><div class='add'>+			if (inet_test_bit(CHECKSUM, sk)) {</div><div class='ctx'> 				inet_dec_convert_csum(sk);</div><div class='del'>-				inet-&gt;cmsg_flags &amp;= ~IP_CMSG_CHECKSUM;</div><div class='add'>+				inet_clear_bit(CHECKSUM, sk);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case IP_RECVFRAGSIZE:</div><div class='del'>-		if (sk-&gt;sk_type != SOCK_RAW &amp;&amp; sk-&gt;sk_type != SOCK_DGRAM)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val)</div><div class='del'>-			inet-&gt;cmsg_flags |= IP_CMSG_RECVFRAGSIZE;</div><div class='del'>-		else</div><div class='del'>-			inet-&gt;cmsg_flags &amp;= ~IP_CMSG_RECVFRAGSIZE;</div><div class='del'>-		break;</div><div class='del'>-	case IP_TOS:	/* This sets both TOS and Precedence */</div><div class='del'>-		if (sk-&gt;sk_type == SOCK_STREAM) {</div><div class='del'>-			val &amp;= ~INET_ECN_MASK;</div><div class='del'>-			val |= inet-&gt;tos &amp; INET_ECN_MASK;</div><div class='del'>-		}</div><div class='del'>-		if (inet-&gt;tos != val) {</div><div class='del'>-			inet-&gt;tos = val;</div><div class='del'>-			sk-&gt;sk_priority = rt_tos2priority(val);</div><div class='del'>-			sk_dst_reset(sk);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IP_TTL:</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val != -1 &amp;&amp; (val &lt; 1 || val &gt; 255))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;uc_ttl = val;</div><div class='del'>-		break;</div><div class='del'>-	case IP_HDRINCL:</div><div class='del'>-		if (sk-&gt;sk_type != SOCK_RAW) {</div><div class='del'>-			err = -ENOPROTOOPT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		inet-&gt;hdrincl = val ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_NODEFRAG:</div><div class='del'>-		if (sk-&gt;sk_type != SOCK_RAW) {</div><div class='del'>-			err = -ENOPROTOOPT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		inet-&gt;nodefrag = val ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_BIND_ADDRESS_NO_PORT:</div><div class='del'>-		inet-&gt;bind_address_no_port = val ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MTU_DISCOVER:</div><div class='del'>-		if (val &lt; IP_PMTUDISC_DONT || val &gt; IP_PMTUDISC_OMIT)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;pmtudisc = val;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVERR:</div><div class='del'>-		inet-&gt;recverr = !!val;</div><div class='del'>-		if (!val)</div><div class='del'>-			skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='del'>-		break;</div><div class='del'>-	case IP_MULTICAST_TTL:</div><div class='del'>-		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val == -1)</div><div class='del'>-			val = 1;</div><div class='del'>-		if (val &lt; 0 || val &gt; 255)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;mc_ttl = val;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MULTICAST_LOOP:</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;mc_loop = !!val;</div><div class='del'>-		break;</div><div class='ctx'> 	case IP_UNICAST_IF:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct net_device *dev = NULL;</div><div class='hunk'>@@ -814,7 +1135,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 		ifindex = (__force int)ntohl((__force __be32)val);</div><div class='ctx'> 		if (ifindex == 0) {</div><div class='del'>-			inet-&gt;uc_index = 0;</div><div class='add'>+			WRITE_ONCE(inet-&gt;uc_index, 0);</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -828,11 +1149,10 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		dev_put(dev);</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-		    (!midx || midx != sk-&gt;sk_bound_dev_if))</div><div class='add'>+		if (sk-&gt;sk_bound_dev_if &amp;&amp; midx != sk-&gt;sk_bound_dev_if)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		inet-&gt;uc_index = ifindex;</div><div class='add'>+		WRITE_ONCE(inet-&gt;uc_index, ifindex);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -853,25 +1173,25 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		if (optlen &gt;= sizeof(struct ip_mreqn)) {</div><div class='del'>-			if (copy_from_user(&amp;mreq, optval, sizeof(mreq)))</div><div class='add'>+			if (copy_from_sockptr(&amp;mreq, optval, sizeof(mreq)))</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memset(&amp;mreq, 0, sizeof(mreq));</div><div class='ctx'> 			if (optlen &gt;= sizeof(struct ip_mreq)) {</div><div class='del'>-				if (copy_from_user(&amp;mreq, optval,</div><div class='del'>-						   sizeof(struct ip_mreq)))</div><div class='add'>+				if (copy_from_sockptr(&amp;mreq, optval,</div><div class='add'>+						      sizeof(struct ip_mreq)))</div><div class='ctx'> 					break;</div><div class='ctx'> 			} else if (optlen &gt;= sizeof(struct in_addr)) {</div><div class='del'>-				if (copy_from_user(&amp;mreq.imr_address, optval,</div><div class='del'>-						   sizeof(struct in_addr)))</div><div class='add'>+				if (copy_from_sockptr(&amp;mreq.imr_address, optval,</div><div class='add'>+						      sizeof(struct in_addr)))</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!mreq.imr_ifindex) {</div><div class='ctx'> 			if (mreq.imr_address.s_addr == htonl(INADDR_ANY)) {</div><div class='del'>-				inet-&gt;mc_index = 0;</div><div class='del'>-				inet-&gt;mc_addr  = 0;</div><div class='add'>+				WRITE_ONCE(inet-&gt;mc_index, 0);</div><div class='add'>+				WRITE_ONCE(inet-&gt;mc_addr, 0);</div><div class='ctx'> 				err = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -893,11 +1213,11 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='ctx'> 		    mreq.imr_ifindex != sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-		    (!midx || midx != sk-&gt;sk_bound_dev_if))</div><div class='add'>+		    midx != sk-&gt;sk_bound_dev_if)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		inet-&gt;mc_index = mreq.imr_ifindex;</div><div class='del'>-		inet-&gt;mc_addr  = mreq.imr_address.s_addr;</div><div class='add'>+		WRITE_ONCE(inet-&gt;mc_index, mreq.imr_ifindex);</div><div class='add'>+		WRITE_ONCE(inet-&gt;mc_addr, mreq.imr_address.s_addr);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -908,18 +1228,19 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		struct ip_mreqn mreq;</div><div class='ctx'> </div><div class='ctx'> 		err = -EPROTO;</div><div class='del'>-		if (inet_sk(sk)-&gt;is_icsk)</div><div class='add'>+		if (inet_test_bit(IS_ICSK, sk))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (optlen &lt; sizeof(struct ip_mreq))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		if (optlen &gt;= sizeof(struct ip_mreqn)) {</div><div class='del'>-			if (copy_from_user(&amp;mreq, optval, sizeof(mreq)))</div><div class='add'>+			if (copy_from_sockptr(&amp;mreq, optval, sizeof(mreq)))</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memset(&amp;mreq, 0, sizeof(mreq));</div><div class='del'>-			if (copy_from_user(&amp;mreq, optval, sizeof(struct ip_mreq)))</div><div class='add'>+			if (copy_from_sockptr(&amp;mreq, optval,</div><div class='add'>+					      sizeof(struct ip_mreq)))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -935,18 +1256,18 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 		if (optlen &lt; IP_MSFILTER_SIZE(0))</div><div class='ctx'> 			goto e_inval;</div><div class='del'>-		if (optlen &gt; sysctl_optmem_max) {</div><div class='add'>+		if (optlen &gt; READ_ONCE(net-&gt;core.sysctl_optmem_max)) {</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		msf = memdup_user(optval, optlen);</div><div class='add'>+		msf = memdup_sockptr(optval, optlen);</div><div class='ctx'> 		if (IS_ERR(msf)) {</div><div class='ctx'> 			err = PTR_ERR(msf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* numsrc &gt;= (1G-4) overflow in 32 bits */</div><div class='ctx'> 		if (msf-&gt;imsf_numsrc &gt;= 0x3ffffffcU ||</div><div class='del'>-		    msf-&gt;imsf_numsrc &gt; net-&gt;ipv4.sysctl_igmp_max_msf) {</div><div class='add'>+		    msf-&gt;imsf_numsrc &gt; READ_ONCE(net-&gt;ipv4.sysctl_igmp_max_msf)) {</div><div class='ctx'> 			kfree(msf);</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -970,7 +1291,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> </div><div class='ctx'> 		if (optlen != sizeof(struct ip_mreq_source))</div><div class='ctx'> 			goto e_inval;</div><div class='del'>-		if (copy_from_user(&amp;mreqs, optval, sizeof(mreqs))) {</div><div class='add'>+		if (copy_from_sockptr(&amp;mreqs, optval, sizeof(mreqs))) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1000,197 +1321,43 @@ static int do_ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 	}</div><div class='ctx'> 	case MCAST_JOIN_GROUP:</div><div class='ctx'> 	case MCAST_LEAVE_GROUP:</div><div class='del'>-	{</div><div class='del'>-		struct group_req greq;</div><div class='del'>-		struct sockaddr_in *psin;</div><div class='del'>-		struct ip_mreqn mreq;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; sizeof(struct group_req))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;greq, optval, sizeof(greq)))</div><div class='del'>-			break;</div><div class='del'>-		psin = (struct sockaddr_in *)&amp;greq.gr_group;</div><div class='del'>-		if (psin-&gt;sin_family != AF_INET)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		memset(&amp;mreq, 0, sizeof(mreq));</div><div class='del'>-		mreq.imr_multiaddr = psin-&gt;sin_addr;</div><div class='del'>-		mreq.imr_ifindex = greq.gr_interface;</div><div class='del'>-</div><div class='del'>-		if (optname == MCAST_JOIN_GROUP)</div><div class='del'>-			err = ip_mc_join_group(sk, &amp;mreq);</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			err = compat_ip_mcast_join_leave(sk, optname, optval,</div><div class='add'>+							 optlen);</div><div class='ctx'> 		else</div><div class='del'>-			err = ip_mc_leave_group(sk, &amp;mreq);</div><div class='add'>+			err = ip_mcast_join_leave(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case MCAST_JOIN_SOURCE_GROUP:</div><div class='ctx'> 	case MCAST_LEAVE_SOURCE_GROUP:</div><div class='ctx'> 	case MCAST_BLOCK_SOURCE:</div><div class='ctx'> 	case MCAST_UNBLOCK_SOURCE:</div><div class='del'>-	{</div><div class='del'>-		struct group_source_req greqs;</div><div class='del'>-		struct ip_mreq_source mreqs;</div><div class='del'>-		struct sockaddr_in *psin;</div><div class='del'>-		int omode, add;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(struct group_source_req))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (copy_from_user(&amp;greqs, optval, sizeof(greqs))) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (greqs.gsr_group.ss_family != AF_INET ||</div><div class='del'>-		    greqs.gsr_source.ss_family != AF_INET) {</div><div class='del'>-			err = -EADDRNOTAVAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		psin = (struct sockaddr_in *)&amp;greqs.gsr_group;</div><div class='del'>-		mreqs.imr_multiaddr = psin-&gt;sin_addr.s_addr;</div><div class='del'>-		psin = (struct sockaddr_in *)&amp;greqs.gsr_source;</div><div class='del'>-		mreqs.imr_sourceaddr = psin-&gt;sin_addr.s_addr;</div><div class='del'>-		mreqs.imr_interface = 0; /* use index for mc_source */</div><div class='del'>-</div><div class='del'>-		if (optname == MCAST_BLOCK_SOURCE) {</div><div class='del'>-			omode = MCAST_EXCLUDE;</div><div class='del'>-			add = 1;</div><div class='del'>-		} else if (optname == MCAST_UNBLOCK_SOURCE) {</div><div class='del'>-			omode = MCAST_EXCLUDE;</div><div class='del'>-			add = 0;</div><div class='del'>-		} else if (optname == MCAST_JOIN_SOURCE_GROUP) {</div><div class='del'>-			struct ip_mreqn mreq;</div><div class='del'>-</div><div class='del'>-			psin = (struct sockaddr_in *)&amp;greqs.gsr_group;</div><div class='del'>-			mreq.imr_multiaddr = psin-&gt;sin_addr;</div><div class='del'>-			mreq.imr_address.s_addr = 0;</div><div class='del'>-			mreq.imr_ifindex = greqs.gsr_interface;</div><div class='del'>-			err = ip_mc_join_group_ssm(sk, &amp;mreq, MCAST_INCLUDE);</div><div class='del'>-			if (err &amp;&amp; err != -EADDRINUSE)</div><div class='del'>-				break;</div><div class='del'>-			greqs.gsr_interface = mreq.imr_ifindex;</div><div class='del'>-			omode = MCAST_INCLUDE;</div><div class='del'>-			add = 1;</div><div class='del'>-		} else /* MCAST_LEAVE_SOURCE_GROUP */ {</div><div class='del'>-			omode = MCAST_INCLUDE;</div><div class='del'>-			add = 0;</div><div class='del'>-		}</div><div class='del'>-		err = ip_mc_source(add, omode, sk, &amp;mreqs,</div><div class='del'>-				   greqs.gsr_interface);</div><div class='add'>+		err = do_mcast_group_source(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case MCAST_MSFILTER:</div><div class='del'>-	{</div><div class='del'>-		struct sockaddr_in *psin;</div><div class='del'>-		struct ip_msfilter *msf = NULL;</div><div class='del'>-		struct group_filter *gsf = NULL;</div><div class='del'>-		int msize, i, ifindex;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; GROUP_FILTER_SIZE(0))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (optlen &gt; sysctl_optmem_max) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		gsf = memdup_user(optval, optlen);</div><div class='del'>-		if (IS_ERR(gsf)) {</div><div class='del'>-			err = PTR_ERR(gsf);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='del'>-		if (gsf-&gt;gf_numsrc &gt;= 0x1ffffff ||</div><div class='del'>-		    gsf-&gt;gf_numsrc &gt; net-&gt;ipv4.sysctl_igmp_max_msf) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			goto mc_msf_out;</div><div class='del'>-		}</div><div class='del'>-		if (GROUP_FILTER_SIZE(gsf-&gt;gf_numsrc) &gt; optlen) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto mc_msf_out;</div><div class='del'>-		}</div><div class='del'>-		msize = IP_MSFILTER_SIZE(gsf-&gt;gf_numsrc);</div><div class='del'>-		msf = kmalloc(msize, GFP_KERNEL);</div><div class='del'>-		if (!msf) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			goto mc_msf_out;</div><div class='del'>-		}</div><div class='del'>-		ifindex = gsf-&gt;gf_interface;</div><div class='del'>-		psin = (struct sockaddr_in *)&amp;gsf-&gt;gf_group;</div><div class='del'>-		if (psin-&gt;sin_family != AF_INET) {</div><div class='del'>-			err = -EADDRNOTAVAIL;</div><div class='del'>-			goto mc_msf_out;</div><div class='del'>-		}</div><div class='del'>-		msf-&gt;imsf_multiaddr = psin-&gt;sin_addr.s_addr;</div><div class='del'>-		msf-&gt;imsf_interface = 0;</div><div class='del'>-		msf-&gt;imsf_fmode = gsf-&gt;gf_fmode;</div><div class='del'>-		msf-&gt;imsf_numsrc = gsf-&gt;gf_numsrc;</div><div class='del'>-		err = -EADDRNOTAVAIL;</div><div class='del'>-		for (i = 0; i &lt; gsf-&gt;gf_numsrc; ++i) {</div><div class='del'>-			psin = (struct sockaddr_in *)&amp;gsf-&gt;gf_slist[i];</div><div class='del'>-</div><div class='del'>-			if (psin-&gt;sin_family != AF_INET)</div><div class='del'>-				goto mc_msf_out;</div><div class='del'>-			msf-&gt;imsf_slist[i] = psin-&gt;sin_addr.s_addr;</div><div class='del'>-		}</div><div class='del'>-		kfree(gsf);</div><div class='del'>-		gsf = NULL;</div><div class='del'>-</div><div class='del'>-		err = ip_mc_msfilter(sk, msf, ifindex);</div><div class='del'>-mc_msf_out:</div><div class='del'>-		kfree(msf);</div><div class='del'>-		kfree(gsf);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case IP_MULTICAST_ALL:</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val != 0 &amp;&amp; val != 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;mc_all = val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IP_FREEBIND:</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;freebind = !!val;</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			err = compat_ip_set_mcast_msfilter(sk, optval, optlen);</div><div class='add'>+		else</div><div class='add'>+			err = ip_set_mcast_msfilter(sk, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case IP_IPSEC_POLICY:</div><div class='ctx'> 	case IP_XFRM_POLICY:</div><div class='ctx'> 		err = -EPERM;</div><div class='del'>-		if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		if (!sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = xfrm_user_policy(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IP_TRANSPARENT:</div><div class='del'>-		if (!!val &amp;&amp; !ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_RAW) &amp;&amp;</div><div class='del'>-		    !ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;transparent = !!val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IP_MINTTL:</div><div class='del'>-		if (optlen &lt; 1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &lt; 0 || val &gt; 255)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		inet-&gt;min_ttl = val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOPROTOOPT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	if (needs_rtnl)</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> e_inval:</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	if (needs_rtnl)</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -1200,15 +1367,16 @@ e_inval:</div><div class='ctx'>  * ipv4_pktinfo_prepare - transfer some info from rtable to skb</div><div class='ctx'>  * @sk: socket</div><div class='ctx'>  * @skb: buffer</div><div class='add'>+ * @drop_dst: if true, drops skb dst</div><div class='ctx'>  *</div><div class='ctx'>  * To support IP_CMSG_PKTINFO option, we store rt_iif and specific</div><div class='ctx'>  * destination in skb-&gt;cb[] before dst drop.</div><div class='ctx'>  * This way, receiver doesn't make cache line misses to read rtable.</div><div class='ctx'>  */</div><div class='del'>-void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb)</div><div class='add'>+void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb, bool drop_dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_pktinfo *pktinfo = PKTINFO_SKB_CB(skb);</div><div class='del'>-	bool prepare = (inet_sk(sk)-&gt;cmsg_flags &amp; IP_CMSG_PKTINFO) ||</div><div class='add'>+	bool prepare = inet_test_bit(PKTINFO, sk) ||</div><div class='ctx'> 		       ipv6_sk_rxinfo(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (prepare &amp;&amp; skb_rtable(skb)) {</div><div class='hunk'>@@ -1234,11 +1402,12 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		pktinfo-&gt;ipi_ifindex = 0;</div><div class='ctx'> 		pktinfo-&gt;ipi_spec_dst.s_addr = 0;</div><div class='ctx'> 	}</div><div class='del'>-	skb_dst_drop(skb);</div><div class='add'>+	if (drop_dst)</div><div class='add'>+		skb_dst_drop(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip_setsockopt(struct sock *sk, int level,</div><div class='del'>-		int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+int ip_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1246,11 +1415,6 @@ int ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> </div><div class='ctx'> 	err = do_ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-#ifdef CONFIG_BPFILTER</div><div class='del'>-	if (optname &gt;= BPFILTER_IPT_SO_SET_REPLACE &amp;&amp;</div><div class='del'>-	    optname &lt; BPFILTER_IPT_SET_MAX)</div><div class='del'>-		err = bpfilter_ip_set_sockopt(sk, optname, optval, optlen);</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_NETFILTER</div><div class='ctx'> 	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='ctx'> 	if (err == -ENOPROTOOPT &amp;&amp; optname != IP_HDRINCL &amp;&amp;</div><div class='hunk'>@@ -1263,34 +1427,6 @@ int ip_setsockopt(struct sock *sk, int level,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_setsockopt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_ip_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			 char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (level != SOL_IP)</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-</div><div class='del'>-	if (optname &gt;= MCAST_JOIN_GROUP &amp;&amp; optname &lt;= MCAST_MSFILTER)</div><div class='del'>-		return compat_mc_setsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-			ip_setsockopt);</div><div class='del'>-</div><div class='del'>-	err = do_ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != IP_HDRINCL &amp;&amp;</div><div class='del'>-			optname != IP_IPSEC_POLICY &amp;&amp;</div><div class='del'>-			optname != IP_XFRM_POLICY &amp;&amp;</div><div class='del'>-			!ip_mroute_opt(optname))</div><div class='del'>-		err = compat_nf_setsockopt(sk, PF_INET, optname, optval,</div><div class='del'>-					   optlen);</div><div class='del'>-#endif</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_ip_setsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Get the options. Note for future reference. The GET of IP options gets</div><div class='ctx'>  *	the _received_ ones. The set sets the _sent_ ones.</div><div class='hunk'>@@ -1306,8 +1442,70 @@ static bool getsockopt_needs_rtnl(int optname)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, int __user *optlen, unsigned int flags)</div><div class='add'>+static int ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+				 sockptr_t optlen, int len)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct group_filter, gf_slist_flex);</div><div class='add'>+	struct group_filter gsf;</div><div class='add'>+	int num, gsf_size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (len &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;gsf, optval, size0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	num = gsf.gf_numsrc;</div><div class='add'>+	err = ip_mc_gsfget(sk, &amp;gsf, optval,</div><div class='add'>+			   offsetof(struct group_filter, gf_slist_flex));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (gsf.gf_numsrc &lt; num)</div><div class='add'>+		num = gsf.gf_numsrc;</div><div class='add'>+	gsf_size = GROUP_FILTER_SIZE(num);</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;gsf_size, sizeof(int)) ||</div><div class='add'>+	    copy_to_sockptr(optval, &amp;gsf, size0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ip_get_mcast_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+					sockptr_t optlen, int len)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct compat_group_filter, gf_slist_flex);</div><div class='add'>+	struct compat_group_filter gf32;</div><div class='add'>+	struct group_filter gf;</div><div class='add'>+	int num;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (len &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;gf32, optval, size0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	gf.gf_interface = gf32.gf_interface;</div><div class='add'>+	gf.gf_fmode = gf32.gf_fmode;</div><div class='add'>+	num = gf.gf_numsrc = gf32.gf_numsrc;</div><div class='add'>+	gf.gf_group = gf32.gf_group;</div><div class='add'>+</div><div class='add'>+	err = ip_mc_gsfget(sk, &amp;gf, optval,</div><div class='add'>+			   offsetof(struct compat_group_filter, gf_slist_flex));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (gf.gf_numsrc &lt; num)</div><div class='add'>+		num = gf.gf_numsrc;</div><div class='add'>+	len = GROUP_FILTER_SIZE(num) - (sizeof(gf) - sizeof(gf32));</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)) ||</div><div class='add'>+	    copy_to_sockptr_offset(optval, offsetof(struct compat_group_filter, gf_fmode),</div><div class='add'>+				   &amp;gf.gf_fmode, sizeof(gf.gf_fmode)) ||</div><div class='add'>+	    copy_to_sockptr_offset(optval, offsetof(struct compat_group_filter, gf_numsrc),</div><div class='add'>+				   &amp;gf.gf_numsrc, sizeof(gf.gf_numsrc)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		     sockptr_t optval, sockptr_t optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	bool needs_rtnl = getsockopt_needs_rtnl(optname);</div><div class='hunk'>@@ -1320,93 +1518,116 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	if (ip_mroute_opt(optname))</div><div class='ctx'> 		return ip_mroute_getsockopt(sk, optname, optval, optlen);</div><div class='ctx'> </div><div class='del'>-	if (get_user(len, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (needs_rtnl)</div><div class='del'>-		rtnl_lock();</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='add'>+	/* Handle options that can be read without locking the socket. */</div><div class='ctx'> 	switch (optname) {</div><div class='add'>+	case IP_PKTINFO:</div><div class='add'>+		val = inet_test_bit(PKTINFO, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVTTL:</div><div class='add'>+		val = inet_test_bit(TTL, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVTOS:</div><div class='add'>+		val = inet_test_bit(TOS, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVOPTS:</div><div class='add'>+		val = inet_test_bit(RECVOPTS, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RETOPTS:</div><div class='add'>+		val = inet_test_bit(RETOPTS, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_PASSSEC:</div><div class='add'>+		val = inet_test_bit(PASSSEC, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVORIGDSTADDR:</div><div class='add'>+		val = inet_test_bit(ORIGDSTADDR, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_CHECKSUM:</div><div class='add'>+		val = inet_test_bit(CHECKSUM, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVFRAGSIZE:</div><div class='add'>+		val = inet_test_bit(RECVFRAGSIZE, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVERR:</div><div class='add'>+		val = inet_test_bit(RECVERR, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_RECVERR_RFC4884:</div><div class='add'>+		val = inet_test_bit(RECVERR_RFC4884, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_FREEBIND:</div><div class='add'>+		val = inet_test_bit(FREEBIND, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_HDRINCL:</div><div class='add'>+		val = inet_test_bit(HDRINCL, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_MULTICAST_LOOP:</div><div class='add'>+		val = inet_test_bit(MC_LOOP, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_MULTICAST_ALL:</div><div class='add'>+		val = inet_test_bit(MC_ALL, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_TRANSPARENT:</div><div class='add'>+		val = inet_test_bit(TRANSPARENT, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_NODEFRAG:</div><div class='add'>+		val = inet_test_bit(NODEFRAG, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_BIND_ADDRESS_NO_PORT:</div><div class='add'>+		val = inet_test_bit(BIND_ADDRESS_NO_PORT, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_ROUTER_ALERT:</div><div class='add'>+		val = inet_test_bit(RTALERT, sk);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_TTL:</div><div class='add'>+		val = READ_ONCE(inet-&gt;uc_ttl);</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			val = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_ip_default_ttl);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_MINTTL:</div><div class='add'>+		val = READ_ONCE(inet-&gt;min_ttl);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_MULTICAST_TTL:</div><div class='add'>+		val = READ_ONCE(inet-&gt;mc_ttl);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_MTU_DISCOVER:</div><div class='add'>+		val = READ_ONCE(inet-&gt;pmtudisc);</div><div class='add'>+		goto copyval;</div><div class='add'>+	case IP_TOS:</div><div class='add'>+		val = READ_ONCE(inet-&gt;tos);</div><div class='add'>+		goto copyval;</div><div class='ctx'> 	case IP_OPTIONS:</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned char optbuf[sizeof(struct ip_options)+40];</div><div class='ctx'> 		struct ip_options *opt = (struct ip_options *)optbuf;</div><div class='ctx'> 		struct ip_options_rcu *inet_opt;</div><div class='ctx'> </div><div class='del'>-		inet_opt = rcu_dereference_protected(inet-&gt;inet_opt,</div><div class='del'>-						     lockdep_sock_is_held(sk));</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='ctx'> 		opt-&gt;optlen = 0;</div><div class='ctx'> 		if (inet_opt)</div><div class='ctx'> 			memcpy(optbuf, &amp;inet_opt-&gt;opt,</div><div class='ctx'> 			       sizeof(struct ip_options) +</div><div class='ctx'> 			       inet_opt-&gt;opt.optlen);</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		if (opt-&gt;optlen == 0)</div><div class='del'>-			return put_user(0, optlen);</div><div class='add'>+		if (opt-&gt;optlen == 0) {</div><div class='add'>+			len = 0;</div><div class='add'>+			return copy_to_sockptr(optlen, &amp;len, sizeof(int));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ip_options_undo(opt);</div><div class='ctx'> </div><div class='ctx'> 		len = min_t(unsigned int, len, opt-&gt;optlen);</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, opt-&gt;__data, len))</div><div class='add'>+		if (copy_to_sockptr(optval, opt-&gt;__data, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	case IP_PKTINFO:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_PKTINFO) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVTTL:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_TTL) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVTOS:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_TOS) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVOPTS:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_RECVOPTS) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RETOPTS:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_RETOPTS) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_PASSSEC:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_PASSSEC) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVORIGDSTADDR:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_ORIGDSTADDR) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_CHECKSUM:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_CHECKSUM) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_RECVFRAGSIZE:</div><div class='del'>-		val = (inet-&gt;cmsg_flags &amp; IP_CMSG_RECVFRAGSIZE) != 0;</div><div class='del'>-		break;</div><div class='del'>-	case IP_TOS:</div><div class='del'>-		val = inet-&gt;tos;</div><div class='del'>-		break;</div><div class='del'>-	case IP_TTL:</div><div class='del'>-	{</div><div class='del'>-		struct net *net = sock_net(sk);</div><div class='del'>-		val = (inet-&gt;uc_ttl == -1 ?</div><div class='del'>-		       net-&gt;ipv4.sysctl_ip_default_ttl :</div><div class='del'>-		       inet-&gt;uc_ttl);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case IP_HDRINCL:</div><div class='del'>-		val = inet-&gt;hdrincl;</div><div class='del'>-		break;</div><div class='del'>-	case IP_NODEFRAG:</div><div class='del'>-		val = inet-&gt;nodefrag;</div><div class='del'>-		break;</div><div class='del'>-	case IP_BIND_ADDRESS_NO_PORT:</div><div class='del'>-		val = inet-&gt;bind_address_no_port;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MTU_DISCOVER:</div><div class='del'>-		val = inet-&gt;pmtudisc;</div><div class='del'>-		break;</div><div class='ctx'> 	case IP_MTU:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct dst_entry *dst;</div><div class='hunk'>@@ -1416,37 +1637,72 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			val = dst_mtu(dst);</div><div class='ctx'> 			dst_release(dst);</div><div class='ctx'> 		}</div><div class='del'>-		if (!val) {</div><div class='del'>-			release_sock(sk);</div><div class='add'>+		if (!val)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='add'>+		goto copyval;</div><div class='add'>+	}</div><div class='add'>+	case IP_PKTOPTIONS:</div><div class='add'>+	{</div><div class='add'>+		struct msghdr msg;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+</div><div class='add'>+		if (optval.is_kernel) {</div><div class='add'>+			msg.msg_control_is_user = false;</div><div class='add'>+			msg.msg_control = optval.kernel;</div><div class='add'>+		} else {</div><div class='add'>+			msg.msg_control_is_user = true;</div><div class='add'>+			msg.msg_control_user = optval.user;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+		msg.msg_controllen = len;</div><div class='add'>+		msg.msg_flags = in_compat_syscall() ? MSG_CMSG_COMPAT : 0;</div><div class='add'>+</div><div class='add'>+		if (inet_test_bit(PKTINFO, sk)) {</div><div class='add'>+			struct in_pktinfo info;</div><div class='add'>+</div><div class='add'>+			info.ipi_addr.s_addr = READ_ONCE(inet-&gt;inet_rcv_saddr);</div><div class='add'>+			info.ipi_spec_dst.s_addr = READ_ONCE(inet-&gt;inet_rcv_saddr);</div><div class='add'>+			info.ipi_ifindex = READ_ONCE(inet-&gt;mc_index);</div><div class='add'>+			put_cmsg(&amp;msg, SOL_IP, IP_PKTINFO, sizeof(info), &amp;info);</div><div class='add'>+		}</div><div class='add'>+		if (inet_test_bit(TTL, sk)) {</div><div class='add'>+			int hlim = READ_ONCE(inet-&gt;mc_ttl);</div><div class='add'>+</div><div class='add'>+			put_cmsg(&amp;msg, SOL_IP, IP_TTL, sizeof(hlim), &amp;hlim);</div><div class='add'>+		}</div><div class='add'>+		if (inet_test_bit(TOS, sk)) {</div><div class='add'>+			int tos = READ_ONCE(inet-&gt;rcv_tos);</div><div class='add'>+			put_cmsg(&amp;msg, SOL_IP, IP_TOS, sizeof(tos), &amp;tos);</div><div class='add'>+		}</div><div class='add'>+		len -= msg.msg_controllen;</div><div class='add'>+		return copy_to_sockptr(optlen, &amp;len, sizeof(int));</div><div class='ctx'> 	}</div><div class='del'>-	case IP_RECVERR:</div><div class='del'>-		val = inet-&gt;recverr;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MULTICAST_TTL:</div><div class='del'>-		val = inet-&gt;mc_ttl;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MULTICAST_LOOP:</div><div class='del'>-		val = inet-&gt;mc_loop;</div><div class='del'>-		break;</div><div class='ctx'> 	case IP_UNICAST_IF:</div><div class='del'>-		val = (__force int)htonl((__u32) inet-&gt;uc_index);</div><div class='del'>-		break;</div><div class='add'>+		val = (__force int)htonl((__u32) READ_ONCE(inet-&gt;uc_index));</div><div class='add'>+		goto copyval;</div><div class='ctx'> 	case IP_MULTICAST_IF:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct in_addr addr;</div><div class='ctx'> 		len = min_t(unsigned int, len, sizeof(struct in_addr));</div><div class='del'>-		addr.s_addr = inet-&gt;mc_addr;</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		addr.s_addr = READ_ONCE(inet-&gt;mc_addr);</div><div class='ctx'> </div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;addr, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;addr, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	case IP_LOCAL_PORT_RANGE:</div><div class='add'>+		val = READ_ONCE(inet-&gt;local_port_range);</div><div class='add'>+		goto copyval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (needs_rtnl)</div><div class='add'>+		rtnl_lock();</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='ctx'> 	case IP_MSFILTER:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ip_msfilter msf;</div><div class='hunk'>@@ -1455,99 +1711,47 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;msf, optval, IP_MSFILTER_SIZE(0))) {</div><div class='add'>+		if (copy_from_sockptr(&amp;msf, optval, IP_MSFILTER_SIZE(0))) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		err = ip_mc_msfget(sk, &amp;msf,</div><div class='del'>-				   (struct ip_msfilter __user *)optval, optlen);</div><div class='add'>+		err = ip_mc_msfget(sk, &amp;msf, optval, optlen);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	case MCAST_MSFILTER:</div><div class='del'>-	{</div><div class='del'>-		struct group_filter gsf;</div><div class='del'>-</div><div class='del'>-		if (len &lt; GROUP_FILTER_SIZE(0)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(&amp;gsf, optval, GROUP_FILTER_SIZE(0))) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		err = ip_mc_gsfget(sk, &amp;gsf,</div><div class='del'>-				   (struct group_filter __user *)optval,</div><div class='del'>-				   optlen);</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			err = compat_ip_get_mcast_msfilter(sk, optval, optlen,</div><div class='add'>+							   len);</div><div class='add'>+		else</div><div class='add'>+			err = ip_get_mcast_msfilter(sk, optval, optlen, len);</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-	case IP_MULTICAST_ALL:</div><div class='del'>-		val = inet-&gt;mc_all;</div><div class='del'>-		break;</div><div class='del'>-	case IP_PKTOPTIONS:</div><div class='del'>-	{</div><div class='del'>-		struct msghdr msg;</div><div class='del'>-</div><div class='del'>-		release_sock(sk);</div><div class='del'>-</div><div class='del'>-		if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='del'>-			return -ENOPROTOOPT;</div><div class='del'>-</div><div class='del'>-		msg.msg_control = (__force void *) optval;</div><div class='del'>-		msg.msg_controllen = len;</div><div class='del'>-		msg.msg_flags = flags;</div><div class='del'>-</div><div class='del'>-		if (inet-&gt;cmsg_flags &amp; IP_CMSG_PKTINFO) {</div><div class='del'>-			struct in_pktinfo info;</div><div class='del'>-</div><div class='del'>-			info.ipi_addr.s_addr = inet-&gt;inet_rcv_saddr;</div><div class='del'>-			info.ipi_spec_dst.s_addr = inet-&gt;inet_rcv_saddr;</div><div class='del'>-			info.ipi_ifindex = inet-&gt;mc_index;</div><div class='del'>-			put_cmsg(&amp;msg, SOL_IP, IP_PKTINFO, sizeof(info), &amp;info);</div><div class='del'>-		}</div><div class='del'>-		if (inet-&gt;cmsg_flags &amp; IP_CMSG_TTL) {</div><div class='del'>-			int hlim = inet-&gt;mc_ttl;</div><div class='del'>-			put_cmsg(&amp;msg, SOL_IP, IP_TTL, sizeof(hlim), &amp;hlim);</div><div class='del'>-		}</div><div class='del'>-		if (inet-&gt;cmsg_flags &amp; IP_CMSG_TOS) {</div><div class='del'>-			int tos = inet-&gt;rcv_tos;</div><div class='del'>-			put_cmsg(&amp;msg, SOL_IP, IP_TOS, sizeof(tos), &amp;tos);</div><div class='del'>-		}</div><div class='del'>-		len -= msg.msg_controllen;</div><div class='del'>-		return put_user(len, optlen);</div><div class='del'>-	}</div><div class='del'>-	case IP_FREEBIND:</div><div class='del'>-		val = inet-&gt;freebind;</div><div class='del'>-		break;</div><div class='del'>-	case IP_TRANSPARENT:</div><div class='del'>-		val = inet-&gt;transparent;</div><div class='del'>-		break;</div><div class='del'>-	case IP_MINTTL:</div><div class='del'>-		val = inet-&gt;min_ttl;</div><div class='add'>+	case IP_PROTOCOL:</div><div class='add'>+		val = inet_sk(sk)-&gt;inet_num;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	}</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='add'>+copyval:</div><div class='ctx'> 	if (len &lt; sizeof(int) &amp;&amp; len &gt; 0 &amp;&amp; val &gt;= 0 &amp;&amp; val &lt;= 255) {</div><div class='ctx'> 		unsigned char ucval = (unsigned char)val;</div><div class='ctx'> 		len = 1;</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;ucval, 1))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;ucval, 1))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		len = min_t(unsigned int, sizeof(int), len);</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;val, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;val, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	if (needs_rtnl)</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1558,12 +1762,9 @@ int ip_getsockopt(struct sock *sk, int level,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = do_ip_getsockopt(sk, level, optname, optval, optlen, 0);</div><div class='del'>-#ifdef CONFIG_BPFILTER</div><div class='del'>-	if (optname &gt;= BPFILTER_IPT_SO_GET_INFO &amp;&amp;</div><div class='del'>-	    optname &lt; BPFILTER_IPT_GET_MAX)</div><div class='del'>-		err = bpfilter_ip_get_sockopt(sk, optname, optval, optlen);</div><div class='del'>-#endif</div><div class='add'>+	err = do_ip_getsockopt(sk, level, optname,</div><div class='add'>+			       USER_SOCKPTR(optval), USER_SOCKPTR(optlen));</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NETFILTER</div><div class='ctx'> 	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='ctx'> 	if (err == -ENOPROTOOPT &amp;&amp; optname != IP_PKTOPTIONS &amp;&amp;</div><div class='hunk'>@@ -1582,41 +1783,3 @@ int ip_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_getsockopt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_ip_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			 char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (optname == MCAST_MSFILTER)</div><div class='del'>-		return compat_mc_getsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-			ip_getsockopt);</div><div class='del'>-</div><div class='del'>-	err = do_ip_getsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-		MSG_CMSG_COMPAT);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BPFILTER</div><div class='del'>-	if (optname &gt;= BPFILTER_IPT_SO_GET_INFO &amp;&amp;</div><div class='del'>-	    optname &lt; BPFILTER_IPT_GET_MAX)</div><div class='del'>-		err = bpfilter_ip_get_sockopt(sk, optname, optval, optlen);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != IP_PKTOPTIONS &amp;&amp;</div><div class='del'>-			!ip_mroute_opt(optname)) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		if (get_user(len, optlen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		err = compat_nf_getsockopt(sk, PF_INET, optname, optval, &amp;len);</div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			err = put_user(len, optlen);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_ip_getsockopt);</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c<br/>index 284a22154b4e..158a30ae7c5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_tunnel.c</a></div><div class='hunk'>@@ -1,19 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2013 Nicira, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301, USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -53,9 +40,11 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='hunk'>@@ -69,17 +58,13 @@ static unsigned int ip_tunnel_hash(__be32 key, __be32 remote)</div><div class='ctx'> 			 IP_TNL_HASH_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ip_tunnel_key_match(const struct ip_tunnel_parm *p,</div><div class='del'>-				__be16 flags, __be32 key)</div><div class='add'>+static bool ip_tunnel_key_match(const struct ip_tunnel_parm_kern *p,</div><div class='add'>+				const unsigned long *flags, __be32 key)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;i_flags &amp; TUNNEL_KEY) {</div><div class='del'>-		if (flags &amp; TUNNEL_KEY)</div><div class='del'>-			return key == p-&gt;i_key;</div><div class='del'>-		else</div><div class='del'>-			/* key expected, none present */</div><div class='del'>-			return false;</div><div class='del'>-	} else</div><div class='del'>-		return !(flags &amp; TUNNEL_KEY);</div><div class='add'>+	if (!test_bit(IP_TUNNEL_KEY_BIT, flags))</div><div class='add'>+		return !test_bit(IP_TUNNEL_KEY_BIT, p-&gt;i_flags);</div><div class='add'>+</div><div class='add'>+	return test_bit(IP_TUNNEL_KEY_BIT, p-&gt;i_flags) &amp;&amp; p-&gt;i_key == key;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Fallback tunnel: no source, no destination, no key, no options</div><div class='hunk'>@@ -94,13 +79,14 @@ static bool ip_tunnel_key_match(const struct ip_tunnel_parm *p,</div><div class='ctx'>    Given src, dst and key, find appropriate for input tunnel.</div><div class='ctx'> */</div><div class='ctx'> struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,</div><div class='del'>-				   int link, __be16 flags,</div><div class='add'>+				   int link, const unsigned long *flags,</div><div class='ctx'> 				   __be32 remote, __be32 local,</div><div class='ctx'> 				   __be32 key)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hash;</div><div class='ctx'> 	struct ip_tunnel *t, *cand = NULL;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	unsigned int hash;</div><div class='ctx'> </div><div class='ctx'> 	hash = ip_tunnel_hash(key, remote);</div><div class='ctx'> 	head = &amp;itn-&gt;tunnels[hash];</div><div class='hunk'>@@ -114,10 +100,9 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,</div><div class='ctx'> 		if (!ip_tunnel_key_match(&amp;t-&gt;parms, flags, key))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.link == link)</div><div class='add'>+		if (READ_ONCE(t-&gt;parms.link) == link)</div><div class='ctx'> 			return t;</div><div class='del'>-		else</div><div class='del'>-			cand = t;</div><div class='add'>+		cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(t, head, hash_node) {</div><div class='hunk'>@@ -129,9 +114,9 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,</div><div class='ctx'> 		if (!ip_tunnel_key_match(&amp;t-&gt;parms, flags, key))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.link == link)</div><div class='add'>+		if (READ_ONCE(t-&gt;parms.link) == link)</div><div class='ctx'> 			return t;</div><div class='del'>-		else if (!cand)</div><div class='add'>+		if (!cand)</div><div class='ctx'> 			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -149,29 +134,26 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,</div><div class='ctx'> 		if (!ip_tunnel_key_match(&amp;t-&gt;parms, flags, key))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.link == link)</div><div class='add'>+		if (READ_ONCE(t-&gt;parms.link) == link)</div><div class='ctx'> 			return t;</div><div class='del'>-		else if (!cand)</div><div class='add'>+		if (!cand)</div><div class='ctx'> 			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; TUNNEL_NO_KEY)</div><div class='del'>-		goto skip_key_lookup;</div><div class='del'>-</div><div class='ctx'> 	hlist_for_each_entry_rcu(t, head, hash_node) {</div><div class='del'>-		if (t-&gt;parms.i_key != key ||</div><div class='add'>+		if ((!test_bit(IP_TUNNEL_NO_KEY_BIT, flags) &amp;&amp;</div><div class='add'>+		     t-&gt;parms.i_key != key) ||</div><div class='ctx'> 		    t-&gt;parms.iph.saddr != 0 ||</div><div class='ctx'> 		    t-&gt;parms.iph.daddr != 0 ||</div><div class='ctx'> 		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.link == link)</div><div class='add'>+		if (READ_ONCE(t-&gt;parms.link) == link)</div><div class='ctx'> 			return t;</div><div class='del'>-		else if (!cand)</div><div class='add'>+		if (!cand)</div><div class='ctx'> 			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-skip_key_lookup:</div><div class='ctx'> 	if (cand)</div><div class='ctx'> 		return cand;</div><div class='ctx'> </div><div class='hunk'>@@ -179,15 +161,16 @@ skip_key_lookup:</div><div class='ctx'> 	if (t &amp;&amp; t-&gt;dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return t;</div><div class='ctx'> </div><div class='del'>-	if (itn-&gt;fb_tunnel_dev &amp;&amp; itn-&gt;fb_tunnel_dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-		return netdev_priv(itn-&gt;fb_tunnel_dev);</div><div class='add'>+	ndev = READ_ONCE(itn-&gt;fb_tunnel_dev);</div><div class='add'>+	if (ndev &amp;&amp; ndev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		return netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_lookup);</div><div class='ctx'> </div><div class='ctx'> static struct hlist_head *ip_bucket(struct ip_tunnel_net *itn,</div><div class='del'>-				    struct ip_tunnel_parm *parms)</div><div class='add'>+				    struct ip_tunnel_parm_kern *parms)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int h;</div><div class='ctx'> 	__be32 remote;</div><div class='hunk'>@@ -198,7 +181,8 @@ static struct hlist_head *ip_bucket(struct ip_tunnel_net *itn,</div><div class='ctx'> 	else</div><div class='ctx'> 		remote = 0;</div><div class='ctx'> </div><div class='del'>-	if (!(parms-&gt;i_flags &amp; TUNNEL_KEY) &amp;&amp; (parms-&gt;i_flags &amp; VTI_ISVTI))</div><div class='add'>+	if (!test_bit(IP_TUNNEL_KEY_BIT, parms-&gt;i_flags) &amp;&amp;</div><div class='add'>+	    test_bit(IP_TUNNEL_VTI_BIT, parms-&gt;i_flags))</div><div class='ctx'> 		i_key = 0;</div><div class='ctx'> </div><div class='ctx'> 	h = ip_tunnel_hash(i_key, remote);</div><div class='hunk'>@@ -222,21 +206,23 @@ static void ip_tunnel_del(struct ip_tunnel_net *itn, struct ip_tunnel *t)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ip_tunnel *ip_tunnel_find(struct ip_tunnel_net *itn,</div><div class='del'>-					struct ip_tunnel_parm *parms,</div><div class='add'>+					struct ip_tunnel_parm_kern *parms,</div><div class='ctx'> 					int type)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 remote = parms-&gt;iph.daddr;</div><div class='ctx'> 	__be32 local = parms-&gt;iph.saddr;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> 	__be32 key = parms-&gt;i_key;</div><div class='del'>-	__be16 flags = parms-&gt;i_flags;</div><div class='ctx'> 	int link = parms-&gt;link;</div><div class='ctx'> 	struct ip_tunnel *t = NULL;</div><div class='ctx'> 	struct hlist_head *head = ip_bucket(itn, parms);</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(t, head, hash_node) {</div><div class='add'>+	ip_tunnel_flags_copy(flags, parms-&gt;i_flags);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(t, head, hash_node, lockdep_rtnl_is_held()) {</div><div class='ctx'> 		if (local == t-&gt;parms.iph.saddr &amp;&amp;</div><div class='ctx'> 		    remote == t-&gt;parms.iph.daddr &amp;&amp;</div><div class='del'>-		    link == t-&gt;parms.link &amp;&amp;</div><div class='add'>+		    link == READ_ONCE(t-&gt;parms.link) &amp;&amp;</div><div class='ctx'> 		    type == t-&gt;dev-&gt;type &amp;&amp;</div><div class='ctx'> 		    ip_tunnel_key_match(&amp;t-&gt;parms, flags, key))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -246,7 +232,7 @@ static struct ip_tunnel *ip_tunnel_find(struct ip_tunnel_net *itn,</div><div class='ctx'> </div><div class='ctx'> static struct net_device *__ip_tunnel_create(struct net *net,</div><div class='ctx'> 					     const struct rtnl_link_ops *ops,</div><div class='del'>-					     struct ip_tunnel_parm *parms)</div><div class='add'>+					     struct ip_tunnel_parm_kern *parms)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ip_tunnel *tunnel;</div><div class='hunk'>@@ -257,11 +243,11 @@ static struct net_device *__ip_tunnel_create(struct net *net,</div><div class='ctx'> 	if (parms-&gt;name[0]) {</div><div class='ctx'> 		if (!dev_valid_name(parms-&gt;name))</div><div class='ctx'> 			goto failed;</div><div class='del'>-		strlcpy(name, parms-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, parms-&gt;name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (strlen(ops-&gt;kind) &gt; (IFNAMSIZ - 3))</div><div class='ctx'> 			goto failed;</div><div class='del'>-		strcpy(name, ops-&gt;kind);</div><div class='add'>+		strscpy(name, ops-&gt;kind);</div><div class='ctx'> 		strcat(name, "%d");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -309,8 +295,8 @@ static int ip_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		ip_tunnel_init_flow(&amp;fl4, iph-&gt;protocol, iph-&gt;daddr,</div><div class='ctx'> 				    iph-&gt;saddr, tunnel-&gt;parms.o_key,</div><div class='del'>-				    RT_TOS(iph-&gt;tos), tunnel-&gt;parms.link,</div><div class='del'>-				    tunnel-&gt;fwmark);</div><div class='add'>+				    iph-&gt;tos &amp; INET_DSCP_MASK, tunnel-&gt;net,</div><div class='add'>+				    tunnel-&gt;parms.link, tunnel-&gt;fwmark, 0, 0);</div><div class='ctx'> 		rt = ip_route_output_key(tunnel-&gt;net, &amp;fl4);</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR(rt)) {</div><div class='hunk'>@@ -332,7 +318,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;needed_headroom = t_hlen + hlen;</div><div class='del'>-	mtu -= (dev-&gt;hard_header_len + t_hlen);</div><div class='add'>+	mtu -= t_hlen + (dev-&gt;type == ARPHRD_ETHER ? dev-&gt;hard_header_len : 0);</div><div class='ctx'> </div><div class='ctx'> 	if (mtu &lt; IPV4_MIN_MTU)</div><div class='ctx'> 		mtu = IPV4_MIN_MTU;</div><div class='hunk'>@@ -342,7 +328,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct ip_tunnel *ip_tunnel_create(struct net *net,</div><div class='ctx'> 					  struct ip_tunnel_net *itn,</div><div class='del'>-					  struct ip_tunnel_parm *parms)</div><div class='add'>+					  struct ip_tunnel_parm_kern *parms)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *nt;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -362,7 +348,10 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net,</div><div class='ctx'> 	nt = netdev_priv(dev);</div><div class='ctx'> 	t_hlen = nt-&gt;hlen + sizeof(struct iphdr);</div><div class='ctx'> 	dev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='del'>-	dev-&gt;max_mtu = IP_MAX_MTU - dev-&gt;hard_header_len - t_hlen;</div><div class='add'>+	dev-&gt;max_mtu = IP_MAX_MTU - t_hlen;</div><div class='add'>+	if (dev-&gt;type == ARPHRD_ETHER)</div><div class='add'>+		dev-&gt;max_mtu -= dev-&gt;hard_header_len;</div><div class='add'>+</div><div class='ctx'> 	ip_tunnel_add(itn, nt);</div><div class='ctx'> 	return nt;</div><div class='ctx'> </div><div class='hunk'>@@ -371,39 +360,65 @@ err_dev_set_mtu:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ip_tunnel_md_udp_encap(struct sk_buff *skb, struct ip_tunnel_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	const struct udphdr *udph;</div><div class='add'>+</div><div class='add'>+	if (iph-&gt;protocol != IPPROTO_UDP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	udph = (struct udphdr *)((__u8 *)iph + (iph-&gt;ihl &lt;&lt; 2));</div><div class='add'>+	info-&gt;encap.sport = udph-&gt;source;</div><div class='add'>+	info-&gt;encap.dport = udph-&gt;dest;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_tunnel_md_udp_encap);</div><div class='add'>+</div><div class='ctx'> int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,</div><div class='ctx'> 		  const struct tnl_ptk_info *tpi, struct metadata_dst *tun_dst,</div><div class='ctx'> 		  bool log_ecn_error)</div><div class='ctx'> {</div><div class='del'>-	struct pcpu_sw_netstats *tstats;</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	int err;</div><div class='add'>+	int nh, err;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_IPGRE_BROADCAST</div><div class='ctx'> 	if (ipv4_is_multicast(iph-&gt;daddr)) {</div><div class='del'>-		tunnel-&gt;dev-&gt;stats.multicast++;</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, multicast);</div><div class='ctx'> 		skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((!(tpi-&gt;flags&amp;TUNNEL_CSUM) &amp;&amp;  (tunnel-&gt;parms.i_flags&amp;TUNNEL_CSUM)) ||</div><div class='del'>-	     ((tpi-&gt;flags&amp;TUNNEL_CSUM) &amp;&amp; !(tunnel-&gt;parms.i_flags&amp;TUNNEL_CSUM))) {</div><div class='del'>-		tunnel-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-		tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, tunnel-&gt;parms.i_flags) !=</div><div class='add'>+	    test_bit(IP_TUNNEL_CSUM_BIT, tpi-&gt;flags)) {</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_crc_errors);</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tunnel-&gt;parms.i_flags&amp;TUNNEL_SEQ) {</div><div class='del'>-		if (!(tpi-&gt;flags&amp;TUNNEL_SEQ) ||</div><div class='add'>+	if (test_bit(IP_TUNNEL_SEQ_BIT, tunnel-&gt;parms.i_flags)) {</div><div class='add'>+		if (!test_bit(IP_TUNNEL_SEQ_BIT, tpi-&gt;flags) ||</div><div class='ctx'> 		    (tunnel-&gt;i_seqno &amp;&amp; (s32)(ntohl(tpi-&gt;seq) - tunnel-&gt;i_seqno) &lt; 0)) {</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_fifo_errors++;</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_fifo_errors);</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 		tunnel-&gt;i_seqno = ntohl(tpi-&gt;seq) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_reset_network_header(skb);</div><div class='add'>+	/* Save offset of outer header relative to skb-&gt;head,</div><div class='add'>+	 * because we are going to reset the network header to the inner header</div><div class='add'>+	 * and might change skb-&gt;head.</div><div class='add'>+	 */</div><div class='add'>+	nh = skb_network_header(skb) - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	skb_set_network_header(skb, (tunnel-&gt;dev-&gt;type == ARPHRD_ETHER) ? ETH_HLEN : 0);</div><div class='add'>+</div><div class='add'>+	if (!pskb_inet_may_pull(skb)) {</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_length_errors);</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+	iph = (struct iphdr *)(skb-&gt;head + nh);</div><div class='ctx'> </div><div class='ctx'> 	err = IP_ECN_decapsulate(iph, skb);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='hunk'>@@ -411,18 +426,13 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,</div><div class='ctx'> 			net_info_ratelimited("non-ECT from %pI4 with TOS=%#x\n",</div><div class='ctx'> 					&amp;iph-&gt;saddr, iph-&gt;tos);</div><div class='ctx'> 		if (err &gt; 1) {</div><div class='del'>-			++tunnel-&gt;dev-&gt;stats.rx_frame_errors;</div><div class='del'>-			++tunnel-&gt;dev-&gt;stats.rx_errors;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_frame_errors);</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tstats = this_cpu_ptr(tunnel-&gt;dev-&gt;tstats);</div><div class='del'>-	u64_stats_update_begin(&amp;tstats-&gt;syncp);</div><div class='del'>-	tstats-&gt;rx_packets++;</div><div class='del'>-	tstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;tstats-&gt;syncp);</div><div class='del'>-</div><div class='add'>+	dev_sw_netstats_rx_add(tunnel-&gt;dev, skb-&gt;len);</div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(tunnel-&gt;net, dev_net(tunnel-&gt;dev)));</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;dev-&gt;type == ARPHRD_ETHER) {</div><div class='hunk'>@@ -501,37 +511,47 @@ EXPORT_SYMBOL_GPL(ip_tunnel_encap_setup);</div><div class='ctx'> </div><div class='ctx'> static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 			    struct rtable *rt, __be16 df,</div><div class='del'>-			    const struct iphdr *inner_iph)</div><div class='add'>+			    const struct iphdr *inner_iph,</div><div class='add'>+			    int tunnel_hlen, __be32 dst, bool md)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='del'>-	int pkt_size = skb-&gt;len - tunnel-&gt;hlen - dev-&gt;hard_header_len;</div><div class='add'>+	int pkt_size;</div><div class='ctx'> 	int mtu;</div><div class='ctx'> </div><div class='del'>-	if (df)</div><div class='del'>-		mtu = dst_mtu(&amp;rt-&gt;dst) - dev-&gt;hard_header_len</div><div class='del'>-					- sizeof(struct iphdr) - tunnel-&gt;hlen;</div><div class='del'>-	else</div><div class='del'>-		mtu = skb_dst(skb) ? dst_mtu(skb_dst(skb)) : dev-&gt;mtu;</div><div class='add'>+	tunnel_hlen = md ? tunnel_hlen : tunnel-&gt;hlen;</div><div class='add'>+	pkt_size = skb-&gt;len - tunnel_hlen;</div><div class='add'>+	pkt_size -= dev-&gt;type == ARPHRD_ETHER ? dev-&gt;hard_header_len : 0;</div><div class='ctx'> </div><div class='del'>-	skb_dst_update_pmtu(skb, mtu);</div><div class='add'>+	if (df) {</div><div class='add'>+		mtu = dst_mtu(&amp;rt-&gt;dst) - (sizeof(struct iphdr) + tunnel_hlen);</div><div class='add'>+		mtu -= dev-&gt;type == ARPHRD_ETHER ? dev-&gt;hard_header_len : 0;</div><div class='add'>+	} else {</div><div class='add'>+		mtu = skb_valid_dst(skb) ? dst_mtu(skb_dst(skb)) : dev-&gt;mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_valid_dst(skb))</div><div class='add'>+		skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='ctx'> 		if (!skb_is_gso(skb) &amp;&amp;</div><div class='ctx'> 		    (inner_iph-&gt;frag_off &amp; htons(IP_DF)) &amp;&amp;</div><div class='ctx'> 		    mtu &lt; pkt_size) {</div><div class='del'>-			memset(IPCB(skb), 0, sizeof(*IPCB(skb)));</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='add'>+			icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='ctx'> 			return -E2BIG;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='del'>-		struct rt6_info *rt6 = (struct rt6_info *)skb_dst(skb);</div><div class='add'>+		struct rt6_info *rt6;</div><div class='add'>+		__be32 daddr;</div><div class='add'>+</div><div class='add'>+		rt6 = skb_valid_dst(skb) ? dst_rt6_info(skb_dst(skb)) :</div><div class='add'>+					   NULL;</div><div class='add'>+		daddr = md ? dst : tunnel-&gt;parms.iph.daddr;</div><div class='ctx'> </div><div class='ctx'> 		if (rt6 &amp;&amp; mtu &lt; dst_mtu(skb_dst(skb)) &amp;&amp;</div><div class='ctx'> 			   mtu &gt;= IPV6_MIN_MTU) {</div><div class='del'>-			if ((tunnel-&gt;parms.iph.daddr &amp;&amp;</div><div class='del'>-			    !ipv4_is_multicast(tunnel-&gt;parms.iph.daddr)) ||</div><div class='add'>+			if ((daddr &amp;&amp; !ipv4_is_multicast(daddr)) ||</div><div class='ctx'> 			    rt6-&gt;rt6i_dst.plen == 128) {</div><div class='ctx'> 				rt6-&gt;rt6i_flags |= RTF_MODIFIED;</div><div class='ctx'> 				dst_metric_set(skb_dst(skb), RTAX_MTU, mtu);</div><div class='hunk'>@@ -540,7 +560,7 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		if (!skb_is_gso(skb) &amp;&amp; mtu &gt;= IPV6_MIN_MTU &amp;&amp;</div><div class='ctx'> 					mtu &lt; pkt_size) {</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 			return -E2BIG;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -548,17 +568,19 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)</div><div class='add'>+void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		       u8 proto, int tunnel_hlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	u32 headroom = sizeof(struct iphdr);</div><div class='ctx'> 	struct ip_tunnel_info *tun_info;</div><div class='ctx'> 	const struct ip_tunnel_key *key;</div><div class='ctx'> 	const struct iphdr *inner_iph;</div><div class='del'>-	struct rtable *rt;</div><div class='add'>+	struct rtable *rt = NULL;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	__be16 df = 0;</div><div class='ctx'> 	u8 tos, ttl;</div><div class='add'>+	bool use_cache;</div><div class='ctx'> </div><div class='ctx'> 	tun_info = skb_tunnel_info(skb);</div><div class='ctx'> 	if (unlikely(!tun_info || !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='hunk'>@@ -574,20 +596,44 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)</div><div class='ctx'> 		else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='ctx'> 			tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);</div><div class='ctx'> 	}</div><div class='del'>-	ip_tunnel_init_flow(&amp;fl4, proto, key-&gt;u.ipv4.dst, key-&gt;u.ipv4.src, 0,</div><div class='del'>-			    RT_TOS(tos), tunnel-&gt;parms.link, tunnel-&gt;fwmark);</div><div class='del'>-	if (tunnel-&gt;encap.type != TUNNEL_ENCAP_NONE)</div><div class='del'>-		goto tx_error;</div><div class='del'>-	rt = ip_route_output_key(tunnel-&gt;net, &amp;fl4);</div><div class='del'>-	if (IS_ERR(rt)) {</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+	ip_tunnel_init_flow(&amp;fl4, proto, key-&gt;u.ipv4.dst, key-&gt;u.ipv4.src,</div><div class='add'>+			    tunnel_id_to_key32(key-&gt;tun_id),</div><div class='add'>+			    tos &amp; INET_DSCP_MASK, tunnel-&gt;net, 0, skb-&gt;mark,</div><div class='add'>+			    skb_get_hash(skb), key-&gt;flow_flags);</div><div class='add'>+</div><div class='add'>+	if (!tunnel_hlen)</div><div class='add'>+		tunnel_hlen = ip_encap_hlen(&amp;tun_info-&gt;encap);</div><div class='add'>+</div><div class='add'>+	if (ip_tunnel_encap(skb, &amp;tun_info-&gt;encap, &amp;proto, &amp;fl4) &lt; 0)</div><div class='ctx'> 		goto tx_error;</div><div class='add'>+</div><div class='add'>+	use_cache = ip_tunnel_dst_cache_usable(skb, tun_info);</div><div class='add'>+	if (use_cache)</div><div class='add'>+		rt = dst_cache_get_ip4(&amp;tun_info-&gt;dst_cache, &amp;fl4.saddr);</div><div class='add'>+	if (!rt) {</div><div class='add'>+		rt = ip_route_output_key(tunnel-&gt;net, &amp;fl4);</div><div class='add'>+		if (IS_ERR(rt)) {</div><div class='add'>+			DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+			goto tx_error;</div><div class='add'>+		}</div><div class='add'>+		if (use_cache)</div><div class='add'>+			dst_cache_set_ip4(&amp;tun_info-&gt;dst_cache, &amp;rt-&gt;dst,</div><div class='add'>+					  fl4.saddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rt-&gt;dst.dev == dev) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		dev-&gt;stats.collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='add'>+		goto tx_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(IP_TUNNEL_DONT_FRAGMENT_BIT, key-&gt;tun_flags))</div><div class='add'>+		df = htons(IP_DF);</div><div class='add'>+	if (tnl_update_pmtu(dev, skb, rt, df, inner_iph, tunnel_hlen,</div><div class='add'>+			    key-&gt;u.ipv4.dst, true)) {</div><div class='add'>+		ip_rt_put(rt);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	tos = ip_tunnel_ecn_encap(tos, inner_iph, skb);</div><div class='ctx'> 	ttl = key-&gt;ttl;</div><div class='ctx'> 	if (ttl == 0) {</div><div class='hunk'>@@ -598,26 +644,23 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)</div><div class='ctx'> 		else</div><div class='ctx'> 			ttl = ip4_dst_hoplimit(&amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='del'>-	if (key-&gt;tun_flags &amp; TUNNEL_DONT_FRAGMENT)</div><div class='del'>-		df = htons(IP_DF);</div><div class='del'>-	else if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='del'>-		df = inner_iph-&gt;frag_off &amp; htons(IP_DF);</div><div class='del'>-	headroom += LL_RESERVED_SPACE(rt-&gt;dst.dev) + rt-&gt;dst.header_len;</div><div class='del'>-	if (headroom &gt; dev-&gt;needed_headroom)</div><div class='del'>-		dev-&gt;needed_headroom = headroom;</div><div class='ctx'> </div><div class='del'>-	if (skb_cow_head(skb, dev-&gt;needed_headroom)) {</div><div class='add'>+	headroom += LL_RESERVED_SPACE(rt-&gt;dst.dev) + rt-&gt;dst.header_len;</div><div class='add'>+	if (skb_cow_head(skb, headroom)) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='ctx'> 		goto tx_dropped;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ip_tunnel_adj_headroom(dev, headroom);</div><div class='add'>+</div><div class='ctx'> 	iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, tos, ttl,</div><div class='del'>-		      df, !net_eq(tunnel-&gt;net, dev_net(dev)));</div><div class='add'>+		      df, !net_eq(tunnel-&gt;net, dev_net(dev)), 0);</div><div class='ctx'> 	return;</div><div class='ctx'> tx_error:</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	goto kfree;</div><div class='ctx'> tx_dropped:</div><div class='del'>-	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> kfree:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -627,26 +670,22 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		    const struct iphdr *tnl_params, u8 protocol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='del'>-	unsigned int inner_nhdr_len = 0;</div><div class='add'>+	struct ip_tunnel_info *tun_info = NULL;</div><div class='ctx'> 	const struct iphdr *inner_iph;</div><div class='del'>-	struct flowi4 fl4;</div><div class='del'>-	u8     tos, ttl;</div><div class='del'>-	__be16 df;</div><div class='del'>-	struct rtable *rt;		/* Route to the other host */</div><div class='ctx'> 	unsigned int max_headroom;	/* The extra header space needed */</div><div class='del'>-	__be32 dst;</div><div class='add'>+	struct rtable *rt = NULL;		/* Route to the other host */</div><div class='add'>+	__be16 payload_protocol;</div><div class='add'>+	bool use_cache = false;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	bool md = false;</div><div class='ctx'> 	bool connected;</div><div class='del'>-</div><div class='del'>-	/* ensure we can access the inner net header, for several users below */</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='del'>-		inner_nhdr_len = sizeof(struct iphdr);</div><div class='del'>-	else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='del'>-		inner_nhdr_len = sizeof(struct ipv6hdr);</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, inner_nhdr_len)))</div><div class='del'>-		goto tx_error;</div><div class='add'>+	u8 tos, ttl;</div><div class='add'>+	__be32 dst;</div><div class='add'>+	__be16 df;</div><div class='ctx'> </div><div class='ctx'> 	inner_iph = (const struct iphdr *)skb_inner_network_header(skb);</div><div class='ctx'> 	connected = (tunnel-&gt;parms.iph.daddr != 0);</div><div class='add'>+	payload_protocol = skb_protocol(skb, true);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;(IPCB(skb)-&gt;opt), 0, sizeof(IPCB(skb)-&gt;opt));</div><div class='ctx'> </div><div class='hunk'>@@ -655,16 +694,23 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		/* NBMA tunnel */</div><div class='ctx'> </div><div class='ctx'> 		if (!skb_dst(skb)) {</div><div class='del'>-			dev-&gt;stats.tx_fifo_errors++;</div><div class='add'>+			DEV_STATS_INC(dev, tx_fifo_errors);</div><div class='ctx'> 			goto tx_error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		tun_info = skb_tunnel_info(skb);</div><div class='add'>+		if (tun_info &amp;&amp; (tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) &amp;&amp;</div><div class='add'>+		    ip_tunnel_info_af(tun_info) == AF_INET &amp;&amp;</div><div class='add'>+		    tun_info-&gt;key.u.ipv4.dst) {</div><div class='add'>+			dst = tun_info-&gt;key.u.ipv4.dst;</div><div class='add'>+			md = true;</div><div class='add'>+			connected = true;</div><div class='add'>+		} else if (payload_protocol == htons(ETH_P_IP)) {</div><div class='ctx'> 			rt = skb_rtable(skb);</div><div class='ctx'> 			dst = rt_nexthop(rt, inner_iph-&gt;daddr);</div><div class='ctx'> 		}</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		else if (payload_protocol == htons(ETH_P_IPV6)) {</div><div class='ctx'> 			const struct in6_addr *addr6;</div><div class='ctx'> 			struct neighbour *neigh;</div><div class='ctx'> 			bool do_tx_error_icmp;</div><div class='hunk'>@@ -697,50 +743,66 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		else</div><div class='ctx'> 			goto tx_error;</div><div class='ctx'> </div><div class='del'>-		connected = false;</div><div class='add'>+		if (!md)</div><div class='add'>+			connected = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tos = tnl_params-&gt;tos;</div><div class='ctx'> 	if (tos &amp; 0x1) {</div><div class='ctx'> 		tos &amp;= ~0x1;</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		if (payload_protocol == htons(ETH_P_IP)) {</div><div class='ctx'> 			tos = inner_iph-&gt;tos;</div><div class='ctx'> 			connected = false;</div><div class='del'>-		} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		} else if (payload_protocol == htons(ETH_P_IPV6)) {</div><div class='ctx'> 			tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);</div><div class='ctx'> 			connected = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ip_tunnel_init_flow(&amp;fl4, protocol, dst, tnl_params-&gt;saddr,</div><div class='del'>-			    tunnel-&gt;parms.o_key, RT_TOS(tos), tunnel-&gt;parms.link,</div><div class='del'>-			    tunnel-&gt;fwmark);</div><div class='add'>+			    tunnel-&gt;parms.o_key, tos &amp; INET_DSCP_MASK,</div><div class='add'>+			    tunnel-&gt;net, READ_ONCE(tunnel-&gt;parms.link),</div><div class='add'>+			    tunnel-&gt;fwmark, skb_get_hash(skb), 0);</div><div class='ctx'> </div><div class='del'>-	if (ip_tunnel_encap(skb, tunnel, &amp;protocol, &amp;fl4) &lt; 0)</div><div class='add'>+	if (ip_tunnel_encap(skb, &amp;tunnel-&gt;encap, &amp;protocol, &amp;fl4) &lt; 0)</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> </div><div class='del'>-	rt = connected ? dst_cache_get_ip4(&amp;tunnel-&gt;dst_cache, &amp;fl4.saddr) :</div><div class='del'>-			 NULL;</div><div class='add'>+	if (connected &amp;&amp; md) {</div><div class='add'>+		use_cache = ip_tunnel_dst_cache_usable(skb, tun_info);</div><div class='add'>+		if (use_cache)</div><div class='add'>+			rt = dst_cache_get_ip4(&amp;tun_info-&gt;dst_cache,</div><div class='add'>+					       &amp;fl4.saddr);</div><div class='add'>+	} else {</div><div class='add'>+		rt = connected ? dst_cache_get_ip4(&amp;tunnel-&gt;dst_cache,</div><div class='add'>+						&amp;fl4.saddr) : NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rt) {</div><div class='ctx'> 		rt = ip_route_output_key(tunnel-&gt;net, &amp;fl4);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(rt)) {</div><div class='del'>-			dev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+			DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 			goto tx_error;</div><div class='ctx'> 		}</div><div class='del'>-		if (connected)</div><div class='add'>+		if (use_cache)</div><div class='add'>+			dst_cache_set_ip4(&amp;tun_info-&gt;dst_cache, &amp;rt-&gt;dst,</div><div class='add'>+					  fl4.saddr);</div><div class='add'>+		else if (!md &amp;&amp; connected)</div><div class='ctx'> 			dst_cache_set_ip4(&amp;tunnel-&gt;dst_cache, &amp;rt-&gt;dst,</div><div class='ctx'> 					  fl4.saddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;dst.dev == dev) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		dev-&gt;stats.collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tnl_update_pmtu(dev, skb, rt, tnl_params-&gt;frag_off, inner_iph)) {</div><div class='add'>+	df = tnl_params-&gt;frag_off;</div><div class='add'>+	if (payload_protocol == htons(ETH_P_IP) &amp;&amp; !tunnel-&gt;ignore_df)</div><div class='add'>+		df |= (inner_iph-&gt;frag_off &amp; htons(IP_DF));</div><div class='add'>+</div><div class='add'>+	if (tnl_update_pmtu(dev, skb, rt, df, inner_iph, 0, 0, false)) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -758,34 +820,30 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	tos = ip_tunnel_ecn_encap(tos, inner_iph, skb);</div><div class='ctx'> 	ttl = tnl_params-&gt;ttl;</div><div class='ctx'> 	if (ttl == 0) {</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		if (payload_protocol == htons(ETH_P_IP))</div><div class='ctx'> 			ttl = inner_iph-&gt;ttl;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		else if (payload_protocol == htons(ETH_P_IPV6))</div><div class='ctx'> 			ttl = ((const struct ipv6hdr *)inner_iph)-&gt;hop_limit;</div><div class='ctx'> #endif</div><div class='ctx'> 		else</div><div class='ctx'> 			ttl = ip4_dst_hoplimit(&amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	df = tnl_params-&gt;frag_off;</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp; !tunnel-&gt;ignore_df)</div><div class='del'>-		df |= (inner_iph-&gt;frag_off&amp;htons(IP_DF));</div><div class='del'>-</div><div class='ctx'> 	max_headroom = LL_RESERVED_SPACE(rt-&gt;dst.dev) + sizeof(struct iphdr)</div><div class='ctx'> 			+ rt-&gt;dst.header_len + ip_encap_hlen(&amp;tunnel-&gt;encap);</div><div class='del'>-	if (max_headroom &gt; dev-&gt;needed_headroom)</div><div class='del'>-		dev-&gt;needed_headroom = max_headroom;</div><div class='ctx'> </div><div class='del'>-	if (skb_cow_head(skb, dev-&gt;needed_headroom)) {</div><div class='add'>+	if (skb_cow_head(skb, max_headroom)) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='add'>+		DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ip_tunnel_adj_headroom(dev, max_headroom);</div><div class='add'>+</div><div class='ctx'> 	iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, protocol, tos, ttl,</div><div class='del'>-		      df, !net_eq(tunnel-&gt;net, dev_net(dev)));</div><div class='add'>+		      df, !net_eq(tunnel-&gt;net, dev_net(dev)), 0);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='hunk'>@@ -793,7 +851,7 @@ tx_error_icmp:</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='ctx'> #endif</div><div class='ctx'> tx_error:</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_xmit);</div><div class='hunk'>@@ -801,7 +859,7 @@ EXPORT_SYMBOL_GPL(ip_tunnel_xmit);</div><div class='ctx'> static void ip_tunnel_update(struct ip_tunnel_net *itn,</div><div class='ctx'> 			     struct ip_tunnel *t,</div><div class='ctx'> 			     struct net_device *dev,</div><div class='del'>-			     struct ip_tunnel_parm *p,</div><div class='add'>+			     struct ip_tunnel_parm_kern *p,</div><div class='ctx'> 			     bool set_mtu,</div><div class='ctx'> 			     __u32 fwmark)</div><div class='ctx'> {</div><div class='hunk'>@@ -811,7 +869,7 @@ static void ip_tunnel_update(struct ip_tunnel_net *itn,</div><div class='ctx'> 	t-&gt;parms.i_key = p-&gt;i_key;</div><div class='ctx'> 	t-&gt;parms.o_key = p-&gt;o_key;</div><div class='ctx'> 	if (dev-&gt;type != ARPHRD_ETHER) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, &amp;p-&gt;iph.saddr, 4);</div><div class='add'>+		__dev_addr_set(dev, &amp;p-&gt;iph.saddr, 4);</div><div class='ctx'> 		memcpy(dev-&gt;broadcast, &amp;p-&gt;iph.daddr, 4);</div><div class='ctx'> 	}</div><div class='ctx'> 	ip_tunnel_add(itn, t);</div><div class='hunk'>@@ -823,17 +881,18 @@ static void ip_tunnel_update(struct ip_tunnel_net *itn,</div><div class='ctx'> 	if (t-&gt;parms.link != p-&gt;link || t-&gt;fwmark != fwmark) {</div><div class='ctx'> 		int mtu;</div><div class='ctx'> </div><div class='del'>-		t-&gt;parms.link = p-&gt;link;</div><div class='add'>+		WRITE_ONCE(t-&gt;parms.link, p-&gt;link);</div><div class='ctx'> 		t-&gt;fwmark = fwmark;</div><div class='ctx'> 		mtu = ip_tunnel_bind_dev(dev);</div><div class='ctx'> 		if (set_mtu)</div><div class='del'>-			dev-&gt;mtu = mtu;</div><div class='add'>+			WRITE_ONCE(dev-&gt;mtu, mtu);</div><div class='ctx'> 	}</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='ctx'> 	netdev_state_change(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)</div><div class='add'>+int ip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm_kern *p,</div><div class='add'>+		  int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='hunk'>@@ -857,10 +916,10 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		if (p-&gt;iph.ttl)</div><div class='ctx'> 			p-&gt;iph.frag_off |= htons(IP_DF);</div><div class='del'>-		if (!(p-&gt;i_flags &amp; VTI_ISVTI)) {</div><div class='del'>-			if (!(p-&gt;i_flags &amp; TUNNEL_KEY))</div><div class='add'>+		if (!test_bit(IP_TUNNEL_VTI_BIT, p-&gt;i_flags)) {</div><div class='add'>+			if (!test_bit(IP_TUNNEL_KEY_BIT, p-&gt;i_flags))</div><div class='ctx'> 				p-&gt;i_key = 0;</div><div class='del'>-			if (!(p-&gt;o_flags &amp; TUNNEL_KEY))</div><div class='add'>+			if (!test_bit(IP_TUNNEL_KEY_BIT, p-&gt;o_flags))</div><div class='ctx'> 				p-&gt;o_key = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -933,13 +992,73 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)</div><div class='ctx'> done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ip_tunnel_ioctl);</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_ctl);</div><div class='add'>+</div><div class='add'>+bool ip_tunnel_parm_from_user(struct ip_tunnel_parm_kern *kp,</div><div class='add'>+			      const void __user *data)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_parm p;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	strscpy(kp-&gt;name, p.name);</div><div class='add'>+	kp-&gt;link = p.link;</div><div class='add'>+	ip_tunnel_flags_from_be16(kp-&gt;i_flags, p.i_flags);</div><div class='add'>+	ip_tunnel_flags_from_be16(kp-&gt;o_flags, p.o_flags);</div><div class='add'>+	kp-&gt;i_key = p.i_key;</div><div class='add'>+	kp-&gt;o_key = p.o_key;</div><div class='add'>+	memcpy(&amp;kp-&gt;iph, &amp;p.iph, min(sizeof(kp-&gt;iph), sizeof(p.iph)));</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_parm_from_user);</div><div class='add'>+</div><div class='add'>+bool ip_tunnel_parm_to_user(void __user *data, struct ip_tunnel_parm_kern *kp)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_parm p;</div><div class='add'>+</div><div class='add'>+	if (!ip_tunnel_flags_is_be16_compat(kp-&gt;i_flags) ||</div><div class='add'>+	    !ip_tunnel_flags_is_be16_compat(kp-&gt;o_flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memset(&amp;p, 0, sizeof(p));</div><div class='add'>+</div><div class='add'>+	strscpy(p.name, kp-&gt;name);</div><div class='add'>+	p.link = kp-&gt;link;</div><div class='add'>+	p.i_flags = ip_tunnel_flags_to_be16(kp-&gt;i_flags);</div><div class='add'>+	p.o_flags = ip_tunnel_flags_to_be16(kp-&gt;o_flags);</div><div class='add'>+	p.i_key = kp-&gt;i_key;</div><div class='add'>+	p.o_key = kp-&gt;o_key;</div><div class='add'>+	memcpy(&amp;p.iph, &amp;kp-&gt;iph, min(sizeof(p.iph), sizeof(kp-&gt;iph)));</div><div class='add'>+</div><div class='add'>+	return !copy_to_user(data, &amp;p, sizeof(p));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_parm_to_user);</div><div class='add'>+</div><div class='add'>+int ip_tunnel_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+			     void __user *data, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ip_tunnel_parm_from_user(&amp;p, data))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	err = dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl(dev, &amp;p, cmd);</div><div class='add'>+	if (!err &amp;&amp; !ip_tunnel_parm_to_user(data, &amp;p))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_siocdevprivate);</div><div class='ctx'> </div><div class='ctx'> int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	int t_hlen = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='del'>-	int max_mtu = IP_MAX_MTU - dev-&gt;hard_header_len - t_hlen;</div><div class='add'>+	int max_mtu = IP_MAX_MTU - t_hlen;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type == ARPHRD_ETHER)</div><div class='add'>+		max_mtu -= dev-&gt;hard_header_len;</div><div class='ctx'> </div><div class='ctx'> 	if (new_mtu &lt; ETH_MIN_MTU)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -951,7 +1070,7 @@ int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict)</div><div class='ctx'> 		new_mtu = max_mtu;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__ip_tunnel_change_mtu);</div><div class='hunk'>@@ -968,7 +1087,6 @@ static void ip_tunnel_dev_free(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	gro_cells_destroy(&amp;tunnel-&gt;gro_cells);</div><div class='ctx'> 	dst_cache_destroy(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ip_tunnel_dellink(struct net_device *dev, struct list_head *head)</div><div class='hunk'>@@ -989,15 +1107,15 @@ struct net *ip_tunnel_get_link_net(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return tunnel-&gt;net;</div><div class='add'>+	return READ_ONCE(tunnel-&gt;net);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_tunnel_get_link_net);</div><div class='ctx'> </div><div class='ctx'> int ip_tunnel_get_iflink(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='add'>+	const struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return tunnel-&gt;parms.link;</div><div class='add'>+	return READ_ONCE(tunnel-&gt;parms.link);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_tunnel_get_iflink);</div><div class='ctx'> </div><div class='hunk'>@@ -1005,7 +1123,7 @@ int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,</div><div class='ctx'> 				  struct rtnl_link_ops *ops, char *devname)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel_net *itn = net_generic(net, ip_tnl_net_id);</div><div class='del'>-	struct ip_tunnel_parm parms;</div><div class='add'>+	struct ip_tunnel_parm_kern parms;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	itn-&gt;rtnl_link_ops = ops;</div><div class='hunk'>@@ -1023,7 +1141,7 @@ int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;parms, 0, sizeof(parms));</div><div class='ctx'> 	if (devname)</div><div class='del'>-		strlcpy(parms.name, devname, IFNAMSIZ);</div><div class='add'>+		strscpy(parms.name, devname, IFNAMSIZ);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	itn-&gt;fb_tunnel_dev = __ip_tunnel_create(net, ops, &amp;parms);</div><div class='hunk'>@@ -1031,7 +1149,7 @@ int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,</div><div class='ctx'> 	 * Allowing to move it to another netns is clearly unsafe.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!IS_ERR(itn-&gt;fb_tunnel_dev)) {</div><div class='del'>-		itn-&gt;fb_tunnel_dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+		itn-&gt;fb_tunnel_dev-&gt;netns_immutable = true;</div><div class='ctx'> 		itn-&gt;fb_tunnel_dev-&gt;mtu = ip_tunnel_bind_dev(itn-&gt;fb_tunnel_dev);</div><div class='ctx'> 		ip_tunnel_add(itn, netdev_priv(itn-&gt;fb_tunnel_dev));</div><div class='ctx'> 		itn-&gt;type = itn-&gt;fb_tunnel_dev-&gt;type;</div><div class='hunk'>@@ -1042,13 +1160,16 @@ int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_init_net);</div><div class='ctx'> </div><div class='del'>-static void ip_tunnel_destroy(struct net *net, struct ip_tunnel_net *itn,</div><div class='del'>-			      struct list_head *head,</div><div class='del'>-			      struct rtnl_link_ops *ops)</div><div class='add'>+void ip_tunnel_delete_net(struct net *net, unsigned int id,</div><div class='add'>+			  struct rtnl_link_ops *ops,</div><div class='add'>+			  struct list_head *head)</div><div class='ctx'> {</div><div class='add'>+	struct ip_tunnel_net *itn = net_generic(net, id);</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='ctx'> 	int h;</div><div class='ctx'> </div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='add'>+</div><div class='ctx'> 	for_each_netdev_safe(net, dev, aux)</div><div class='ctx'> 		if (dev-&gt;rtnl_link_ops == ops)</div><div class='ctx'> 			unregister_netdevice_queue(dev, head);</div><div class='hunk'>@@ -1066,29 +1187,13 @@ static void ip_tunnel_destroy(struct net *net, struct ip_tunnel_net *itn,</div><div class='ctx'> 				unregister_netdevice_queue(t-&gt;dev, head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_delete_net);</div><div class='ctx'> </div><div class='del'>-void ip_tunnel_delete_nets(struct list_head *net_list, unsigned int id,</div><div class='del'>-			   struct rtnl_link_ops *ops)</div><div class='del'>-{</div><div class='del'>-	struct ip_tunnel_net *itn;</div><div class='del'>-	struct net *net;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry(net, net_list, exit_list) {</div><div class='del'>-		itn = net_generic(net, id);</div><div class='del'>-		ip_tunnel_destroy(net, itn, &amp;list, ops);</div><div class='del'>-	}</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(ip_tunnel_delete_nets);</div><div class='del'>-</div><div class='del'>-int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],</div><div class='del'>-		      struct ip_tunnel_parm *p, __u32 fwmark)</div><div class='add'>+int ip_tunnel_newlink(struct net *net, struct net_device *dev,</div><div class='add'>+		      struct nlattr *tb[], struct ip_tunnel_parm_kern *p,</div><div class='add'>+		      __u32 fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *nt;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct ip_tunnel_net *itn;</div><div class='ctx'> 	int mtu;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1116,10 +1221,12 @@ int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> </div><div class='ctx'> 	mtu = ip_tunnel_bind_dev(dev);</div><div class='ctx'> 	if (tb[IFLA_MTU]) {</div><div class='del'>-		unsigned int max = IP_MAX_MTU - dev-&gt;hard_header_len - nt-&gt;hlen;</div><div class='add'>+		unsigned int max = IP_MAX_MTU - (nt-&gt;hlen + sizeof(struct iphdr));</div><div class='ctx'> </div><div class='del'>-		mtu = clamp(dev-&gt;mtu, (unsigned int)ETH_MIN_MTU,</div><div class='del'>-			    (unsigned int)(max - sizeof(struct iphdr)));</div><div class='add'>+		if (dev-&gt;type == ARPHRD_ETHER)</div><div class='add'>+			max -= dev-&gt;hard_header_len;</div><div class='add'>+</div><div class='add'>+		mtu = clamp(dev-&gt;mtu, (unsigned int)ETH_MIN_MTU, max);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = dev_set_mtu(dev, mtu);</div><div class='hunk'>@@ -1137,7 +1244,7 @@ err_register_netdevice:</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_newlink);</div><div class='ctx'> </div><div class='ctx'> int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='del'>-			 struct ip_tunnel_parm *p, __u32 fwmark)</div><div class='add'>+			 struct ip_tunnel_parm_kern *p, __u32 fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t;</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='hunk'>@@ -1182,33 +1289,26 @@ int ip_tunnel_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='ctx'> 	dev-&gt;priv_destructor = ip_tunnel_dev_free;</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> </div><div class='ctx'> 	err = dst_cache_init(&amp;tunnel-&gt;dst_cache, GFP_KERNEL);</div><div class='del'>-	if (err) {</div><div class='del'>-		free_percpu(dev-&gt;tstats);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = gro_cells_init(&amp;tunnel-&gt;gro_cells, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dst_cache_destroy(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-		free_percpu(dev-&gt;tstats);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;dev = dev;</div><div class='del'>-	tunnel-&gt;net = dev_net(dev);</div><div class='del'>-	strcpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='add'>+	strscpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> 	iph-&gt;version		= 4;</div><div class='ctx'> 	iph-&gt;ihl		= 5;</div><div class='ctx'> </div><div class='del'>-	if (tunnel-&gt;collect_md) {</div><div class='del'>-		dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	if (tunnel-&gt;collect_md)</div><div class='ctx'> 		netif_keep_dst(dev);</div><div class='del'>-	}</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_init);</div><div class='hunk'>@@ -1220,9 +1320,9 @@ void ip_tunnel_uninit(struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel_net *itn;</div><div class='ctx'> </div><div class='ctx'> 	itn = net_generic(net, tunnel-&gt;ip_tnl_net_id);</div><div class='del'>-	/* fb_tunnel_dev will be unregisted in net-exit call. */</div><div class='del'>-	if (itn-&gt;fb_tunnel_dev != dev)</div><div class='del'>-		ip_tunnel_del(itn, netdev_priv(dev));</div><div class='add'>+	ip_tunnel_del(itn, netdev_priv(dev));</div><div class='add'>+	if (itn-&gt;fb_tunnel_dev == dev)</div><div class='add'>+		WRITE_ONCE(itn-&gt;fb_tunnel_dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	dst_cache_reset(&amp;tunnel-&gt;dst_cache);</div><div class='ctx'> }</div><div class='hunk'>@@ -1236,4 +1336,5 @@ void ip_tunnel_setup(struct net_device *dev, unsigned int net_id)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_setup);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IPv4 tunnel implementation library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c<br/>index dde671e97829..2e61ac137128 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_tunnel_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_tunnel_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_tunnel_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_tunnel_core.c</a></div><div class='hunk'>@@ -1,19 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2013 Nicira, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301, USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -38,6 +25,7 @@</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> #include &lt;net/ip6_tunnel.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #include &lt;net/dsfield.h&gt;</div><div class='hunk'>@@ -47,6 +35,9 @@</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/geneve.h&gt;</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='add'>+#include &lt;net/erspan.h&gt;</div><div class='ctx'> </div><div class='ctx'> const struct ip_tunnel_encap_ops __rcu *</div><div class='ctx'> 		iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;</div><div class='hunk'>@@ -58,7 +49,8 @@ EXPORT_SYMBOL(ip6tun_encaps);</div><div class='ctx'> </div><div class='ctx'> void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,</div><div class='ctx'> 		   __be32 src, __be32 dst, __u8 proto,</div><div class='del'>-		   __u8 tos, __u8 ttl, __be16 df, bool xnet)</div><div class='add'>+		   __u8 tos, __u8 ttl, __be16 df, bool xnet,</div><div class='add'>+		   u16 ipcb_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int pkt_len = skb-&gt;len - skb_inner_network_offset(skb);</div><div class='ctx'> 	struct net *net = dev_net(rt-&gt;dst.dev);</div><div class='hunk'>@@ -71,6 +63,7 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,</div><div class='ctx'> 	skb_clear_hash_if_not_l4(skb);</div><div class='ctx'> 	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='ctx'> 	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));</div><div class='add'>+	IPCB(skb)-&gt;flags = ipcb_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Push down and install the IP header. */</div><div class='ctx'> 	skb_push(skb, sizeof(struct iphdr));</div><div class='hunk'>@@ -80,7 +73,7 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	iph-&gt;version	=	4;</div><div class='ctx'> 	iph-&gt;ihl	=	sizeof(struct iphdr) &gt;&gt; 2;</div><div class='del'>-	iph-&gt;frag_off	=	df;</div><div class='add'>+	iph-&gt;frag_off	=	ip_mtu_locked(&amp;rt-&gt;dst) ? 0 : df;</div><div class='ctx'> 	iph-&gt;protocol	=	proto;</div><div class='ctx'> 	iph-&gt;tos	=	tos;</div><div class='ctx'> 	iph-&gt;daddr	=	dst;</div><div class='hunk'>@@ -89,9 +82,12 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,</div><div class='ctx'> 	__ip_select_ident(net, iph, skb_shinfo(skb)-&gt;gso_segs ?: 1);</div><div class='ctx'> </div><div class='ctx'> 	err = ip_local_out(net, sk, skb);</div><div class='del'>-	if (unlikely(net_xmit_eval(err)))</div><div class='del'>-		pkt_len = 0;</div><div class='del'>-	iptunnel_xmit_stats(dev, pkt_len);</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		if (unlikely(net_xmit_eval(err)))</div><div class='add'>+			pkt_len = 0;</div><div class='add'>+		iptunnel_xmit_stats(dev, pkt_len);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iptunnel_xmit);</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +116,7 @@ int __iptunnel_pull_header(struct sk_buff *skb, int hdr_len,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_clear_hash_if_not_l4(skb);</div><div class='del'>-	skb-&gt;vlan_tci = 0;</div><div class='add'>+	__vlan_hwaccel_clear_tag(skb);</div><div class='ctx'> 	skb_set_queue_mapping(skb, 0);</div><div class='ctx'> 	skb_scrub_packet(skb, xnet);</div><div class='ctx'> </div><div class='hunk'>@@ -131,27 +127,30 @@ EXPORT_SYMBOL_GPL(__iptunnel_pull_header);</div><div class='ctx'> struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,</div><div class='ctx'> 					     gfp_t flags)</div><div class='ctx'> {</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(tun_flags) = { };</div><div class='ctx'> 	struct metadata_dst *res;</div><div class='ctx'> 	struct ip_tunnel_info *dst, *src;</div><div class='ctx'> </div><div class='ctx'> 	if (!md || md-&gt;type != METADATA_IP_TUNNEL ||</div><div class='ctx'> 	    md-&gt;u.tun_info.mode &amp; IP_TUNNEL_INFO_TX)</div><div class='del'>-</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	res = metadata_dst_alloc(0, METADATA_IP_TUNNEL, flags);</div><div class='add'>+	src = &amp;md-&gt;u.tun_info;</div><div class='add'>+	res = metadata_dst_alloc(src-&gt;options_len, METADATA_IP_TUNNEL, flags);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	dst = &amp;res-&gt;u.tun_info;</div><div class='del'>-	src = &amp;md-&gt;u.tun_info;</div><div class='ctx'> 	dst-&gt;key.tun_id = src-&gt;key.tun_id;</div><div class='ctx'> 	if (src-&gt;mode &amp; IP_TUNNEL_INFO_IPV6)</div><div class='ctx'> 		memcpy(&amp;dst-&gt;key.u.ipv6.dst, &amp;src-&gt;key.u.ipv6.src,</div><div class='ctx'> 		       sizeof(struct in6_addr));</div><div class='ctx'> 	else</div><div class='ctx'> 		dst-&gt;key.u.ipv4.dst = src-&gt;key.u.ipv4.src;</div><div class='add'>+	ip_tunnel_flags_copy(dst-&gt;key.tun_flags, src-&gt;key.tun_flags);</div><div class='ctx'> 	dst-&gt;mode = src-&gt;mode | IP_TUNNEL_INFO_TX;</div><div class='add'>+	ip_tunnel_info_opts_set(dst, ip_tunnel_info_opts(src),</div><div class='add'>+				src-&gt;options_len, tun_flags);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -189,61 +188,496 @@ int iptunnel_handle_offloads(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iptunnel_handle_offloads);</div><div class='ctx'> </div><div class='del'>-/* Often modified stats are per cpu, other are shared (netdev-&gt;stats) */</div><div class='del'>-void ip_tunnel_get_stats64(struct net_device *dev,</div><div class='del'>-			   struct rtnl_link_stats64 *tot)</div><div class='add'>+/**</div><div class='add'>+ * iptunnel_pmtud_build_icmp() - Build ICMP error message for PMTUD</div><div class='add'>+ * @skb:	Original packet with L2 header</div><div class='add'>+ * @mtu:	MTU value for ICMP error</div><div class='add'>+ *</div><div class='add'>+ * Return: length on success, negative error code if message couldn't be built.</div><div class='add'>+ */</div><div class='add'>+static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	struct icmphdr *icmph;</div><div class='add'>+	struct iphdr *niph;</div><div class='add'>+	struct ethhdr eh;</div><div class='add'>+	int len, err;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, ETH_HLEN + sizeof(struct iphdr)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='add'>+		skb_gso_reset(skb);</div><div class='add'>+</div><div class='add'>+	skb_copy_bits(skb, skb_mac_offset(skb), &amp;eh, ETH_HLEN);</div><div class='add'>+	pskb_pull(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	err = pskb_trim(skb, 576 - sizeof(*niph) - sizeof(*icmph));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + sizeof(*icmph);</div><div class='add'>+	err = skb_cow(skb, sizeof(*niph) + sizeof(*icmph) + ETH_HLEN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	icmph = skb_push(skb, sizeof(*icmph));</div><div class='add'>+	*icmph = (struct icmphdr) {</div><div class='add'>+		.type			= ICMP_DEST_UNREACH,</div><div class='add'>+		.code			= ICMP_FRAG_NEEDED,</div><div class='add'>+		.checksum		= 0,</div><div class='add'>+		.un.frag.__unused	= 0,</div><div class='add'>+		.un.frag.mtu		= htons(mtu),</div><div class='add'>+	};</div><div class='add'>+	icmph-&gt;checksum = csum_fold(skb_checksum(skb, 0, len, 0));</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	niph = skb_push(skb, sizeof(*niph));</div><div class='add'>+	*niph = (struct iphdr) {</div><div class='add'>+		.ihl			= sizeof(*niph) / 4u,</div><div class='add'>+		.version 		= 4,</div><div class='add'>+		.tos 			= 0,</div><div class='add'>+		.tot_len		= htons(len + sizeof(*niph)),</div><div class='add'>+		.id			= 0,</div><div class='add'>+		.frag_off		= htons(IP_DF),</div><div class='add'>+		.ttl			= iph-&gt;ttl,</div><div class='add'>+		.protocol		= IPPROTO_ICMP,</div><div class='add'>+		.saddr			= iph-&gt;daddr,</div><div class='add'>+		.daddr			= iph-&gt;saddr,</div><div class='add'>+	};</div><div class='add'>+	ip_send_check(niph);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	eth_header(skb, skb-&gt;dev, ntohs(eh.h_proto), eh.h_source, eh.h_dest, 0);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iptunnel_pmtud_check_icmp() - Trigger ICMP reply if needed and allowed</div><div class='add'>+ * @skb:	Buffer being sent by encapsulation, L2 headers expected</div><div class='add'>+ * @mtu:	Network MTU for path</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for no ICMP reply, length if built, negative value on error.</div><div class='add'>+ */</div><div class='add'>+static int iptunnel_pmtud_check_icmp(struct sk_buff *skb, int mtu)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	const struct icmphdr *icmph = icmp_hdr(skb);</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	netdev_stats_to_stats64(tot, &amp;dev-&gt;stats);</div><div class='add'>+	if (mtu &lt; 576 || iph-&gt;frag_off != htons(IP_DF))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ipv4_is_lbcast(iph-&gt;daddr)  || ipv4_is_multicast(iph-&gt;daddr) ||</div><div class='add'>+	    ipv4_is_zeronet(iph-&gt;saddr) || ipv4_is_loopback(iph-&gt;saddr)  ||</div><div class='add'>+	    ipv4_is_lbcast(iph-&gt;saddr)  || ipv4_is_multicast(iph-&gt;saddr))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		const struct pcpu_sw_netstats *tstats =</div><div class='del'>-						   per_cpu_ptr(dev-&gt;tstats, i);</div><div class='del'>-		u64 rx_packets, rx_bytes, tx_packets, tx_bytes;</div><div class='del'>-		unsigned int start;</div><div class='add'>+	if (iph-&gt;protocol == IPPROTO_ICMP &amp;&amp; icmp_is_err(icmph-&gt;type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iptunnel_pmtud_build_icmp(skb, mtu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+/**</div><div class='add'>+ * iptunnel_pmtud_build_icmpv6() - Build ICMPv6 error message for PMTUD</div><div class='add'>+ * @skb:	Original packet with L2 header</div><div class='add'>+ * @mtu:	MTU value for ICMPv6 error</div><div class='add'>+ *</div><div class='add'>+ * Return: length on success, negative error code if message couldn't be built.</div><div class='add'>+ */</div><div class='add'>+static int iptunnel_pmtud_build_icmpv6(struct sk_buff *skb, int mtu)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	struct icmp6hdr *icmp6h;</div><div class='add'>+	struct ipv6hdr *nip6h;</div><div class='add'>+	struct ethhdr eh;</div><div class='add'>+	int len, err;</div><div class='add'>+	__wsum csum;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, ETH_HLEN + sizeof(struct ipv6hdr)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='add'>+		skb_gso_reset(skb);</div><div class='add'>+</div><div class='add'>+	skb_copy_bits(skb, skb_mac_offset(skb), &amp;eh, ETH_HLEN);</div><div class='add'>+	pskb_pull(skb, ETH_HLEN);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	err = pskb_trim(skb, IPV6_MIN_MTU - sizeof(*nip6h) - sizeof(*icmp6h));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + sizeof(*icmp6h);</div><div class='add'>+	err = skb_cow(skb, sizeof(*nip6h) + sizeof(*icmp6h) + ETH_HLEN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	icmp6h = skb_push(skb, sizeof(*icmp6h));</div><div class='add'>+	*icmp6h = (struct icmp6hdr) {</div><div class='add'>+		.icmp6_type		= ICMPV6_PKT_TOOBIG,</div><div class='add'>+		.icmp6_code		= 0,</div><div class='add'>+		.icmp6_cksum		= 0,</div><div class='add'>+		.icmp6_mtu		= htonl(mtu),</div><div class='add'>+	};</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	nip6h = skb_push(skb, sizeof(*nip6h));</div><div class='add'>+	*nip6h = (struct ipv6hdr) {</div><div class='add'>+		.priority		= 0,</div><div class='add'>+		.version		= 6,</div><div class='add'>+		.flow_lbl		= { 0 },</div><div class='add'>+		.payload_len		= htons(len),</div><div class='add'>+		.nexthdr		= IPPROTO_ICMPV6,</div><div class='add'>+		.hop_limit		= ip6h-&gt;hop_limit,</div><div class='add'>+		.saddr			= ip6h-&gt;daddr,</div><div class='add'>+		.daddr			= ip6h-&gt;saddr,</div><div class='add'>+	};</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	csum = skb_checksum(skb, skb_transport_offset(skb), len, 0);</div><div class='add'>+	icmp6h-&gt;icmp6_cksum = csum_ipv6_magic(&amp;nip6h-&gt;saddr, &amp;nip6h-&gt;daddr, len,</div><div class='add'>+					      IPPROTO_ICMPV6, csum);</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	eth_header(skb, skb-&gt;dev, ntohs(eh.h_proto), eh.h_source, eh.h_dest, 0);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iptunnel_pmtud_check_icmpv6() - Trigger ICMPv6 reply if needed and allowed</div><div class='add'>+ * @skb:	Buffer being sent by encapsulation, L2 headers expected</div><div class='add'>+ * @mtu:	Network MTU for path</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for no ICMPv6 reply, length if built, negative value on error.</div><div class='add'>+ */</div><div class='add'>+static int iptunnel_pmtud_check_icmpv6(struct sk_buff *skb, int mtu)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	int stype = ipv6_addr_type(&amp;ip6h-&gt;saddr);</div><div class='add'>+	u8 proto = ip6h-&gt;nexthdr;</div><div class='add'>+	__be16 frag_off;</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='add'>+	if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (stype == IPV6_ADDR_ANY || stype == IPV6_ADDR_MULTICAST ||</div><div class='add'>+	    stype == IPV6_ADDR_LOOPBACK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	offset = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &amp;proto,</div><div class='add'>+				  &amp;frag_off);</div><div class='add'>+	if (offset &lt; 0 || (frag_off &amp; htons(~0x7)))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;tstats-&gt;syncp);</div><div class='del'>-			rx_packets = tstats-&gt;rx_packets;</div><div class='del'>-			tx_packets = tstats-&gt;tx_packets;</div><div class='del'>-			rx_bytes = tstats-&gt;rx_bytes;</div><div class='del'>-			tx_bytes = tstats-&gt;tx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;tstats-&gt;syncp, start));</div><div class='add'>+	if (proto == IPPROTO_ICMPV6) {</div><div class='add'>+		struct icmp6hdr *icmp6h;</div><div class='ctx'> </div><div class='del'>-		tot-&gt;rx_packets += rx_packets;</div><div class='del'>-		tot-&gt;tx_packets += tx_packets;</div><div class='del'>-		tot-&gt;rx_bytes   += rx_bytes;</div><div class='del'>-		tot-&gt;tx_bytes   += tx_bytes;</div><div class='add'>+		if (!pskb_may_pull(skb, skb_network_header(skb) +</div><div class='add'>+					offset + 1 - skb-&gt;data))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		icmp6h = (struct icmp6hdr *)(skb_network_header(skb) + offset);</div><div class='add'>+		if (icmpv6_is_err(icmp6h-&gt;icmp6_type) ||</div><div class='add'>+		    icmp6h-&gt;icmp6_type == NDISC_REDIRECT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return iptunnel_pmtud_build_icmpv6(skb, mtu);</div><div class='add'>+}</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_tunnel_check_pmtu() - Check, update PMTU and trigger ICMP reply as needed</div><div class='add'>+ * @skb:	Buffer being sent by encapsulation, L2 headers expected</div><div class='add'>+ * @encap_dst:	Destination for tunnel encapsulation (outer IP)</div><div class='add'>+ * @headroom:	Encapsulation header size, bytes</div><div class='add'>+ * @reply:	Build matching ICMP or ICMPv6 message as a result</div><div class='add'>+ *</div><div class='add'>+ * L2 tunnel implementations that can carry IP and can be directly bridged</div><div class='add'>+ * (currently UDP tunnels) can't always rely on IP forwarding paths to handle</div><div class='add'>+ * PMTU discovery. In the bridged case, ICMP or ICMPv6 messages need to be built</div><div class='add'>+ * based on payload and sent back by the encapsulation itself.</div><div class='add'>+ *</div><div class='add'>+ * For routable interfaces, we just need to update the PMTU for the destination.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if ICMP error not needed, length if built, negative value on error</div><div class='add'>+ */</div><div class='add'>+int skb_tunnel_check_pmtu(struct sk_buff *skb, struct dst_entry *encap_dst,</div><div class='add'>+			  int headroom, bool reply)</div><div class='add'>+{</div><div class='add'>+	u32 mtu = dst_mtu(encap_dst) - headroom;</div><div class='add'>+</div><div class='add'>+	if ((skb_is_gso(skb) &amp;&amp; skb_gso_validate_network_len(skb, mtu)) ||</div><div class='add'>+	    (!skb_is_gso(skb) &amp;&amp; (skb-&gt;len - skb_network_offset(skb)) &lt;= mtu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='add'>+</div><div class='add'>+	if (!reply)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		return iptunnel_pmtud_check_icmp(skb, mtu);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		return iptunnel_pmtud_check_icmpv6(skb, mtu);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ip_tunnel_get_stats64);</div><div class='add'>+EXPORT_SYMBOL(skb_tunnel_check_pmtu);</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ip_tun_policy[LWTUNNEL_IP_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP_UNSPEC]	= { .strict_start_type = LWTUNNEL_IP_OPTS },</div><div class='ctx'> 	[LWTUNNEL_IP_ID]	= { .type = NLA_U64 },</div><div class='ctx'> 	[LWTUNNEL_IP_DST]	= { .type = NLA_U32 },</div><div class='ctx'> 	[LWTUNNEL_IP_SRC]	= { .type = NLA_U32 },</div><div class='ctx'> 	[LWTUNNEL_IP_TTL]	= { .type = NLA_U8 },</div><div class='ctx'> 	[LWTUNNEL_IP_TOS]	= { .type = NLA_U8 },</div><div class='ctx'> 	[LWTUNNEL_IP_FLAGS]	= { .type = NLA_U16 },</div><div class='add'>+	[LWTUNNEL_IP_OPTS]	= { .type = NLA_NESTED },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ip_tun_build_state(struct nlattr *attr,</div><div class='add'>+static const struct nla_policy ip_opts_policy[LWTUNNEL_IP_OPTS_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP_OPTS_GENEVE]	= { .type = NLA_NESTED },</div><div class='add'>+	[LWTUNNEL_IP_OPTS_VXLAN]	= { .type = NLA_NESTED },</div><div class='add'>+	[LWTUNNEL_IP_OPTS_ERSPAN]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+geneve_opt_policy[LWTUNNEL_IP_OPT_GENEVE_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP_OPT_GENEVE_CLASS]	= { .type = NLA_U16 },</div><div class='add'>+	[LWTUNNEL_IP_OPT_GENEVE_TYPE]	= { .type = NLA_U8 },</div><div class='add'>+	[LWTUNNEL_IP_OPT_GENEVE_DATA]	= { .type = NLA_BINARY, .len = 127 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+vxlan_opt_policy[LWTUNNEL_IP_OPT_VXLAN_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP_OPT_VXLAN_GBP]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+erspan_opt_policy[LWTUNNEL_IP_OPT_ERSPAN_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP_OPT_ERSPAN_VER]	= { .type = NLA_U8 },</div><div class='add'>+	[LWTUNNEL_IP_OPT_ERSPAN_INDEX]	= { .type = NLA_U32 },</div><div class='add'>+	[LWTUNNEL_IP_OPT_ERSPAN_DIR]	= { .type = NLA_U8 },</div><div class='add'>+	[LWTUNNEL_IP_OPT_ERSPAN_HWID]	= { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ip_tun_parse_opts_geneve(struct nlattr *attr,</div><div class='add'>+				    struct ip_tunnel_info *info, int opts_len,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[LWTUNNEL_IP_OPT_GENEVE_MAX + 1];</div><div class='add'>+	int data_len, err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_GENEVE_MAX, attr,</div><div class='add'>+			       geneve_opt_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[LWTUNNEL_IP_OPT_GENEVE_CLASS] ||</div><div class='add'>+	    !tb[LWTUNNEL_IP_OPT_GENEVE_TYPE] ||</div><div class='add'>+	    !tb[LWTUNNEL_IP_OPT_GENEVE_DATA])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	attr = tb[LWTUNNEL_IP_OPT_GENEVE_DATA];</div><div class='add'>+	data_len = nla_len(attr);</div><div class='add'>+	if (data_len % 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		struct geneve_opt *opt = ip_tunnel_info_opts(info) + opts_len;</div><div class='add'>+</div><div class='add'>+		memcpy(opt-&gt;opt_data, nla_data(attr), data_len);</div><div class='add'>+		opt-&gt;length = data_len / 4;</div><div class='add'>+		attr = tb[LWTUNNEL_IP_OPT_GENEVE_CLASS];</div><div class='add'>+		opt-&gt;opt_class = nla_get_be16(attr);</div><div class='add'>+		attr = tb[LWTUNNEL_IP_OPT_GENEVE_TYPE];</div><div class='add'>+		opt-&gt;type = nla_get_u8(attr);</div><div class='add'>+		__set_bit(IP_TUNNEL_GENEVE_OPT_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(struct geneve_opt) + data_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_parse_opts_vxlan(struct nlattr *attr,</div><div class='add'>+				   struct ip_tunnel_info *info, int opts_len,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[LWTUNNEL_IP_OPT_VXLAN_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_VXLAN_MAX, attr,</div><div class='add'>+			       vxlan_opt_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[LWTUNNEL_IP_OPT_VXLAN_GBP])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		struct vxlan_metadata *md =</div><div class='add'>+			ip_tunnel_info_opts(info) + opts_len;</div><div class='add'>+</div><div class='add'>+		attr = tb[LWTUNNEL_IP_OPT_VXLAN_GBP];</div><div class='add'>+		md-&gt;gbp = nla_get_u32(attr);</div><div class='add'>+		md-&gt;gbp &amp;= VXLAN_GBP_MASK;</div><div class='add'>+		__set_bit(IP_TUNNEL_VXLAN_OPT_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(struct vxlan_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_parse_opts_erspan(struct nlattr *attr,</div><div class='add'>+				    struct ip_tunnel_info *info, int opts_len,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[LWTUNNEL_IP_OPT_ERSPAN_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+	u8 ver;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, attr,</div><div class='add'>+			       erspan_opt_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[LWTUNNEL_IP_OPT_ERSPAN_VER])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ver = nla_get_u8(tb[LWTUNNEL_IP_OPT_ERSPAN_VER]);</div><div class='add'>+	if (ver == 1) {</div><div class='add'>+		if (!tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX])</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (ver == 2) {</div><div class='add'>+		if (!tb[LWTUNNEL_IP_OPT_ERSPAN_DIR] ||</div><div class='add'>+		    !tb[LWTUNNEL_IP_OPT_ERSPAN_HWID])</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		struct erspan_metadata *md =</div><div class='add'>+			ip_tunnel_info_opts(info) + opts_len;</div><div class='add'>+</div><div class='add'>+		md-&gt;version = ver;</div><div class='add'>+		if (ver == 1) {</div><div class='add'>+			attr = tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX];</div><div class='add'>+			md-&gt;u.index = nla_get_be32(attr);</div><div class='add'>+		} else {</div><div class='add'>+			attr = tb[LWTUNNEL_IP_OPT_ERSPAN_DIR];</div><div class='add'>+			md-&gt;u.md2.dir = nla_get_u8(attr);</div><div class='add'>+			attr = tb[LWTUNNEL_IP_OPT_ERSPAN_HWID];</div><div class='add'>+			set_hwid(&amp;md-&gt;u.md2, nla_get_u8(attr));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(struct erspan_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_parse_opts(struct nlattr *attr, struct ip_tunnel_info *info,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err, rem, opt_len, opts_len = 0;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	u32 type = 0;</div><div class='add'>+</div><div class='add'>+	if (!attr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = nla_validate(nla_data(attr), nla_len(attr), LWTUNNEL_IP_OPTS_MAX,</div><div class='add'>+			   ip_opts_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nla_for_each_attr(nla, nla_data(attr), nla_len(attr), rem) {</div><div class='add'>+		switch (nla_type(nla)) {</div><div class='add'>+		case LWTUNNEL_IP_OPTS_GENEVE:</div><div class='add'>+			if (type &amp;&amp; type != IP_TUNNEL_GENEVE_OPT_BIT)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			opt_len = ip_tun_parse_opts_geneve(nla, info, opts_len,</div><div class='add'>+							   extack);</div><div class='add'>+			if (opt_len &lt; 0)</div><div class='add'>+				return opt_len;</div><div class='add'>+			opts_len += opt_len;</div><div class='add'>+			if (opts_len &gt; IP_TUNNEL_OPTS_MAX)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			type = IP_TUNNEL_GENEVE_OPT_BIT;</div><div class='add'>+			break;</div><div class='add'>+		case LWTUNNEL_IP_OPTS_VXLAN:</div><div class='add'>+			if (type)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			opt_len = ip_tun_parse_opts_vxlan(nla, info, opts_len,</div><div class='add'>+							  extack);</div><div class='add'>+			if (opt_len &lt; 0)</div><div class='add'>+				return opt_len;</div><div class='add'>+			opts_len += opt_len;</div><div class='add'>+			type = IP_TUNNEL_VXLAN_OPT_BIT;</div><div class='add'>+			break;</div><div class='add'>+		case LWTUNNEL_IP_OPTS_ERSPAN:</div><div class='add'>+			if (type)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			opt_len = ip_tun_parse_opts_erspan(nla, info, opts_len,</div><div class='add'>+							   extack);</div><div class='add'>+			if (opt_len &lt; 0)</div><div class='add'>+				return opt_len;</div><div class='add'>+			opts_len += opt_len;</div><div class='add'>+			type = IP_TUNNEL_ERSPAN_OPT_BIT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return opts_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_get_optlen(struct nlattr *attr,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return ip_tun_parse_opts(attr, NULL, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_set_opts(struct nlattr *attr, struct ip_tunnel_info *info,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return ip_tun_parse_opts(attr, info, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_build_state(struct net *net, struct nlattr *attr,</div><div class='ctx'> 			      unsigned int family, const void *cfg,</div><div class='ctx'> 			      struct lwtunnel_state **ts,</div><div class='ctx'> 			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_info *tun_info;</div><div class='del'>-	struct lwtunnel_state *new_state;</div><div class='ctx'> 	struct nlattr *tb[LWTUNNEL_IP_MAX + 1];</div><div class='del'>-	int err;</div><div class='add'>+	struct lwtunnel_state *new_state;</div><div class='add'>+	struct ip_tunnel_info *tun_info;</div><div class='add'>+	int err, opt_len;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, LWTUNNEL_IP_MAX, attr, ip_tun_policy,</div><div class='del'>-			       extack);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_MAX, attr,</div><div class='add'>+					  ip_tun_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	new_state = lwtunnel_state_alloc(sizeof(*tun_info));</div><div class='add'>+	opt_len = ip_tun_get_optlen(tb[LWTUNNEL_IP_OPTS], extack);</div><div class='add'>+	if (opt_len &lt; 0)</div><div class='add'>+		return opt_len;</div><div class='add'>+</div><div class='add'>+	new_state = lwtunnel_state_alloc(sizeof(*tun_info) + opt_len);</div><div class='ctx'> 	if (!new_state)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -251,6 +685,20 @@ static int ip_tun_build_state(struct nlattr *attr,</div><div class='ctx'> </div><div class='ctx'> 	tun_info = lwt_tun_info(new_state);</div><div class='ctx'> </div><div class='add'>+	err = ip_tun_set_opts(tb[LWTUNNEL_IP_OPTS], tun_info, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		lwtstate_free(new_state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	err = dst_cache_init(&amp;tun_info-&gt;dst_cache, GFP_KERNEL);</div><div class='add'>+	if (err) {</div><div class='add'>+		lwtstate_free(new_state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (tb[LWTUNNEL_IP_ID])</div><div class='ctx'> 		tun_info-&gt;key.tun_id = nla_get_be64(tb[LWTUNNEL_IP_ID]);</div><div class='ctx'> </div><div class='hunk'>@@ -266,17 +714,142 @@ static int ip_tun_build_state(struct nlattr *attr,</div><div class='ctx'> 	if (tb[LWTUNNEL_IP_TOS])</div><div class='ctx'> 		tun_info-&gt;key.tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);</div><div class='ctx'> </div><div class='del'>-	if (tb[LWTUNNEL_IP_FLAGS])</div><div class='del'>-		tun_info-&gt;key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP_FLAGS]);</div><div class='add'>+	if (tb[LWTUNNEL_IP_FLAGS]) {</div><div class='add'>+		IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='add'>+</div><div class='add'>+		ip_tunnel_flags_from_be16(flags,</div><div class='add'>+					  nla_get_be16(tb[LWTUNNEL_IP_FLAGS]));</div><div class='add'>+		ip_tunnel_clear_options_present(flags);</div><div class='add'>+</div><div class='add'>+		ip_tunnel_flags_or(tun_info-&gt;key.tun_flags,</div><div class='add'>+				   tun_info-&gt;key.tun_flags, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tun_info-&gt;mode = IP_TUNNEL_INFO_TX;</div><div class='del'>-	tun_info-&gt;options_len = 0;</div><div class='add'>+	tun_info-&gt;options_len = opt_len;</div><div class='ctx'> </div><div class='ctx'> 	*ts = new_state;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ip_tun_destroy_state(struct lwtunnel_state *lwtstate)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);</div><div class='add'>+</div><div class='add'>+	dst_cache_destroy(&amp;tun_info-&gt;dst_cache);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_fill_encap_opts_geneve(struct sk_buff *skb,</div><div class='add'>+					 struct ip_tunnel_info *tun_info)</div><div class='add'>+{</div><div class='add'>+	struct geneve_opt *opt;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int offset = 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(skb, LWTUNNEL_IP_OPTS_GENEVE);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	while (tun_info-&gt;options_len &gt; offset) {</div><div class='add'>+		opt = ip_tunnel_info_opts(tun_info) + offset;</div><div class='add'>+		if (nla_put_be16(skb, LWTUNNEL_IP_OPT_GENEVE_CLASS,</div><div class='add'>+				 opt-&gt;opt_class) ||</div><div class='add'>+		    nla_put_u8(skb, LWTUNNEL_IP_OPT_GENEVE_TYPE, opt-&gt;type) ||</div><div class='add'>+		    nla_put(skb, LWTUNNEL_IP_OPT_GENEVE_DATA, opt-&gt;length * 4,</div><div class='add'>+			    opt-&gt;opt_data)) {</div><div class='add'>+			nla_nest_cancel(skb, nest);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		offset += sizeof(*opt) + opt-&gt;length * 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_fill_encap_opts_vxlan(struct sk_buff *skb,</div><div class='add'>+					struct ip_tunnel_info *tun_info)</div><div class='add'>+{</div><div class='add'>+	struct vxlan_metadata *md;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(skb, LWTUNNEL_IP_OPTS_VXLAN);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	md = ip_tunnel_info_opts(tun_info);</div><div class='add'>+	if (nla_put_u32(skb, LWTUNNEL_IP_OPT_VXLAN_GBP, md-&gt;gbp)) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_fill_encap_opts_erspan(struct sk_buff *skb,</div><div class='add'>+					 struct ip_tunnel_info *tun_info)</div><div class='add'>+{</div><div class='add'>+	struct erspan_metadata *md;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(skb, LWTUNNEL_IP_OPTS_ERSPAN);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	md = ip_tunnel_info_opts(tun_info);</div><div class='add'>+	if (nla_put_u8(skb, LWTUNNEL_IP_OPT_ERSPAN_VER, md-&gt;version))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (md-&gt;version == 1 &amp;&amp;</div><div class='add'>+	    nla_put_be32(skb, LWTUNNEL_IP_OPT_ERSPAN_INDEX, md-&gt;u.index))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (md-&gt;version == 2 &amp;&amp;</div><div class='add'>+	    (nla_put_u8(skb, LWTUNNEL_IP_OPT_ERSPAN_DIR, md-&gt;u.md2.dir) ||</div><div class='add'>+	     nla_put_u8(skb, LWTUNNEL_IP_OPT_ERSPAN_HWID,</div><div class='add'>+			get_hwid(&amp;md-&gt;u.md2))))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip_tun_fill_encap_opts(struct sk_buff *skb, int type,</div><div class='add'>+				  struct ip_tunnel_info *tun_info)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ip_tunnel_is_options_present(tun_info-&gt;key.tun_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(skb, type);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (test_bit(IP_TUNNEL_GENEVE_OPT_BIT, tun_info-&gt;key.tun_flags))</div><div class='add'>+		err = ip_tun_fill_encap_opts_geneve(skb, tun_info);</div><div class='add'>+	else if (test_bit(IP_TUNNEL_VXLAN_OPT_BIT, tun_info-&gt;key.tun_flags))</div><div class='add'>+		err = ip_tun_fill_encap_opts_vxlan(skb, tun_info);</div><div class='add'>+	else if (test_bit(IP_TUNNEL_ERSPAN_OPT_BIT, tun_info-&gt;key.tun_flags))</div><div class='add'>+		err = ip_tun_fill_encap_opts_erspan(skb, tun_info);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip_tun_fill_encap_info(struct sk_buff *skb,</div><div class='ctx'> 				  struct lwtunnel_state *lwtstate)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,12 +861,53 @@ static int ip_tun_fill_encap_info(struct sk_buff *skb,</div><div class='ctx'> 	    nla_put_in_addr(skb, LWTUNNEL_IP_SRC, tun_info-&gt;key.u.ipv4.src) ||</div><div class='ctx'> 	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info-&gt;key.tos) ||</div><div class='ctx'> 	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info-&gt;key.ttl) ||</div><div class='del'>-	    nla_put_be16(skb, LWTUNNEL_IP_FLAGS, tun_info-&gt;key.tun_flags))</div><div class='add'>+	    nla_put_be16(skb, LWTUNNEL_IP_FLAGS,</div><div class='add'>+			 ip_tunnel_flags_to_be16(tun_info-&gt;key.tun_flags)) ||</div><div class='add'>+	    ip_tun_fill_encap_opts(skb, LWTUNNEL_IP_OPTS, tun_info))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ip_tun_opts_nlsize(struct ip_tunnel_info *info)</div><div class='add'>+{</div><div class='add'>+	int opt_len;</div><div class='add'>+</div><div class='add'>+	if (!ip_tunnel_is_options_present(info-&gt;key.tun_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	opt_len = nla_total_size(0);		/* LWTUNNEL_IP_OPTS */</div><div class='add'>+	if (test_bit(IP_TUNNEL_GENEVE_OPT_BIT, info-&gt;key.tun_flags)) {</div><div class='add'>+		struct geneve_opt *opt;</div><div class='add'>+		int offset = 0;</div><div class='add'>+</div><div class='add'>+		opt_len += nla_total_size(0);	/* LWTUNNEL_IP_OPTS_GENEVE */</div><div class='add'>+		while (info-&gt;options_len &gt; offset) {</div><div class='add'>+			opt = ip_tunnel_info_opts(info) + offset;</div><div class='add'>+			opt_len += nla_total_size(2)	/* OPT_GENEVE_CLASS */</div><div class='add'>+				   + nla_total_size(1)	/* OPT_GENEVE_TYPE */</div><div class='add'>+				   + nla_total_size(opt-&gt;length * 4);</div><div class='add'>+							/* OPT_GENEVE_DATA */</div><div class='add'>+			offset += sizeof(*opt) + opt-&gt;length * 4;</div><div class='add'>+		}</div><div class='add'>+	} else if (test_bit(IP_TUNNEL_VXLAN_OPT_BIT, info-&gt;key.tun_flags)) {</div><div class='add'>+		opt_len += nla_total_size(0)	/* LWTUNNEL_IP_OPTS_VXLAN */</div><div class='add'>+			   + nla_total_size(4);	/* OPT_VXLAN_GBP */</div><div class='add'>+	} else if (test_bit(IP_TUNNEL_ERSPAN_OPT_BIT, info-&gt;key.tun_flags)) {</div><div class='add'>+		struct erspan_metadata *md = ip_tunnel_info_opts(info);</div><div class='add'>+</div><div class='add'>+		opt_len += nla_total_size(0)	/* LWTUNNEL_IP_OPTS_ERSPAN */</div><div class='add'>+			   + nla_total_size(1)	/* OPT_ERSPAN_VER */</div><div class='add'>+			   + (md-&gt;version == 1 ? nla_total_size(4)</div><div class='add'>+						/* OPT_ERSPAN_INDEX (v1) */</div><div class='add'>+					       : nla_total_size(1) +</div><div class='add'>+						 nla_total_size(1));</div><div class='add'>+						/* OPT_ERSPAN_DIR + HWID (v2) */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return opt_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip_tun_encap_nlsize(struct lwtunnel_state *lwtstate)</div><div class='ctx'> {</div><div class='ctx'> 	return nla_total_size_64bit(8)	/* LWTUNNEL_IP_ID */</div><div class='hunk'>@@ -301,17 +915,26 @@ static int ip_tun_encap_nlsize(struct lwtunnel_state *lwtstate)</div><div class='ctx'> 		+ nla_total_size(4)	/* LWTUNNEL_IP_SRC */</div><div class='ctx'> 		+ nla_total_size(1)	/* LWTUNNEL_IP_TOS */</div><div class='ctx'> 		+ nla_total_size(1)	/* LWTUNNEL_IP_TTL */</div><div class='del'>-		+ nla_total_size(2);	/* LWTUNNEL_IP_FLAGS */</div><div class='add'>+		+ nla_total_size(2)	/* LWTUNNEL_IP_FLAGS */</div><div class='add'>+		+ ip_tun_opts_nlsize(lwt_tun_info(lwtstate));</div><div class='add'>+					/* LWTUNNEL_IP_OPTS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip_tun_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b)</div><div class='ctx'> {</div><div class='del'>-	return memcmp(lwt_tun_info(a), lwt_tun_info(b),</div><div class='del'>-		      sizeof(struct ip_tunnel_info));</div><div class='add'>+	struct ip_tunnel_info *info_a = lwt_tun_info(a);</div><div class='add'>+	struct ip_tunnel_info *info_b = lwt_tun_info(b);</div><div class='add'>+</div><div class='add'>+	return memcmp(info_a, info_b, sizeof(info_a-&gt;key)) ||</div><div class='add'>+	       info_a-&gt;mode != info_b-&gt;mode ||</div><div class='add'>+	       info_a-&gt;options_len != info_b-&gt;options_len ||</div><div class='add'>+	       memcmp(ip_tunnel_info_opts(info_a),</div><div class='add'>+		      ip_tunnel_info_opts(info_b), info_a-&gt;options_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct lwtunnel_encap_ops ip_tun_lwt_ops = {</div><div class='ctx'> 	.build_state = ip_tun_build_state,</div><div class='add'>+	.destroy_state = ip_tun_destroy_state,</div><div class='ctx'> 	.fill_encap = ip_tun_fill_encap_info,</div><div class='ctx'> 	.get_encap_size = ip_tun_encap_nlsize,</div><div class='ctx'> 	.cmp_encap = ip_tun_cmp_encap,</div><div class='hunk'>@@ -319,30 +942,36 @@ static const struct lwtunnel_encap_ops ip_tun_lwt_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy ip6_tun_policy[LWTUNNEL_IP6_MAX + 1] = {</div><div class='add'>+	[LWTUNNEL_IP6_UNSPEC]	= { .strict_start_type = LWTUNNEL_IP6_OPTS },</div><div class='ctx'> 	[LWTUNNEL_IP6_ID]		= { .type = NLA_U64 },</div><div class='ctx'> 	[LWTUNNEL_IP6_DST]		= { .len = sizeof(struct in6_addr) },</div><div class='ctx'> 	[LWTUNNEL_IP6_SRC]		= { .len = sizeof(struct in6_addr) },</div><div class='ctx'> 	[LWTUNNEL_IP6_HOPLIMIT]		= { .type = NLA_U8 },</div><div class='ctx'> 	[LWTUNNEL_IP6_TC]		= { .type = NLA_U8 },</div><div class='ctx'> 	[LWTUNNEL_IP6_FLAGS]		= { .type = NLA_U16 },</div><div class='add'>+	[LWTUNNEL_IP6_OPTS]		= { .type = NLA_NESTED },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ip6_tun_build_state(struct nlattr *attr,</div><div class='add'>+static int ip6_tun_build_state(struct net *net, struct nlattr *attr,</div><div class='ctx'> 			       unsigned int family, const void *cfg,</div><div class='ctx'> 			       struct lwtunnel_state **ts,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_info *tun_info;</div><div class='del'>-	struct lwtunnel_state *new_state;</div><div class='ctx'> 	struct nlattr *tb[LWTUNNEL_IP6_MAX + 1];</div><div class='del'>-	int err;</div><div class='add'>+	struct lwtunnel_state *new_state;</div><div class='add'>+	struct ip_tunnel_info *tun_info;</div><div class='add'>+	int err, opt_len;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, LWTUNNEL_IP6_MAX, attr, ip6_tun_policy,</div><div class='del'>-			       extack);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP6_MAX, attr,</div><div class='add'>+					  ip6_tun_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	new_state = lwtunnel_state_alloc(sizeof(*tun_info));</div><div class='add'>+	opt_len = ip_tun_get_optlen(tb[LWTUNNEL_IP6_OPTS], extack);</div><div class='add'>+	if (opt_len &lt; 0)</div><div class='add'>+		return opt_len;</div><div class='add'>+</div><div class='add'>+	new_state = lwtunnel_state_alloc(sizeof(*tun_info) + opt_len);</div><div class='ctx'> 	if (!new_state)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +979,12 @@ static int ip6_tun_build_state(struct nlattr *attr,</div><div class='ctx'> </div><div class='ctx'> 	tun_info = lwt_tun_info(new_state);</div><div class='ctx'> </div><div class='add'>+	err = ip_tun_set_opts(tb[LWTUNNEL_IP6_OPTS], tun_info, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		lwtstate_free(new_state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (tb[LWTUNNEL_IP6_ID])</div><div class='ctx'> 		tun_info-&gt;key.tun_id = nla_get_be64(tb[LWTUNNEL_IP6_ID]);</div><div class='ctx'> </div><div class='hunk'>@@ -365,11 +1000,20 @@ static int ip6_tun_build_state(struct nlattr *attr,</div><div class='ctx'> 	if (tb[LWTUNNEL_IP6_TC])</div><div class='ctx'> 		tun_info-&gt;key.tos = nla_get_u8(tb[LWTUNNEL_IP6_TC]);</div><div class='ctx'> </div><div class='del'>-	if (tb[LWTUNNEL_IP6_FLAGS])</div><div class='del'>-		tun_info-&gt;key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP6_FLAGS]);</div><div class='add'>+	if (tb[LWTUNNEL_IP6_FLAGS]) {</div><div class='add'>+		IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='add'>+		__be16 data;</div><div class='add'>+</div><div class='add'>+		data = nla_get_be16(tb[LWTUNNEL_IP6_FLAGS]);</div><div class='add'>+		ip_tunnel_flags_from_be16(flags, data);</div><div class='add'>+		ip_tunnel_clear_options_present(flags);</div><div class='add'>+</div><div class='add'>+		ip_tunnel_flags_or(tun_info-&gt;key.tun_flags,</div><div class='add'>+				   tun_info-&gt;key.tun_flags, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tun_info-&gt;mode = IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_IPV6;</div><div class='del'>-	tun_info-&gt;options_len = 0;</div><div class='add'>+	tun_info-&gt;options_len = opt_len;</div><div class='ctx'> </div><div class='ctx'> 	*ts = new_state;</div><div class='ctx'> </div><div class='hunk'>@@ -387,7 +1031,9 @@ static int ip6_tun_fill_encap_info(struct sk_buff *skb,</div><div class='ctx'> 	    nla_put_in6_addr(skb, LWTUNNEL_IP6_SRC, &amp;tun_info-&gt;key.u.ipv6.src) ||</div><div class='ctx'> 	    nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info-&gt;key.tos) ||</div><div class='ctx'> 	    nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info-&gt;key.ttl) ||</div><div class='del'>-	    nla_put_be16(skb, LWTUNNEL_IP6_FLAGS, tun_info-&gt;key.tun_flags))</div><div class='add'>+	    nla_put_be16(skb, LWTUNNEL_IP6_FLAGS,</div><div class='add'>+			 ip_tunnel_flags_to_be16(tun_info-&gt;key.tun_flags)) ||</div><div class='add'>+	    ip_tun_fill_encap_opts(skb, LWTUNNEL_IP6_OPTS, tun_info))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -400,7 +1046,9 @@ static int ip6_tun_encap_nlsize(struct lwtunnel_state *lwtstate)</div><div class='ctx'> 		+ nla_total_size(16)	/* LWTUNNEL_IP6_SRC */</div><div class='ctx'> 		+ nla_total_size(1)	/* LWTUNNEL_IP6_HOPLIMIT */</div><div class='ctx'> 		+ nla_total_size(1)	/* LWTUNNEL_IP6_TC */</div><div class='del'>-		+ nla_total_size(2);	/* LWTUNNEL_IP6_FLAGS */</div><div class='add'>+		+ nla_total_size(2)	/* LWTUNNEL_IP6_FLAGS */</div><div class='add'>+		+ ip_tun_opts_nlsize(lwt_tun_info(lwtstate));</div><div class='add'>+					/* LWTUNNEL_IP6_OPTS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct lwtunnel_encap_ops ip6_tun_lwt_ops = {</div><div class='hunk'>@@ -437,3 +1085,92 @@ void ip_tunnel_unneed_metadata(void)</div><div class='ctx'> 	static_branch_dec(&amp;ip_tunnel_metadata_cnt);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip_tunnel_unneed_metadata);</div><div class='add'>+</div><div class='add'>+/* Returns either the correct skb-&gt;protocol value, or 0 if invalid. */</div><div class='add'>+__be16 ip_tunnel_parse_protocol(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (skb_network_header(skb) &gt;= skb-&gt;head &amp;&amp;</div><div class='add'>+	    (skb_network_header(skb) + sizeof(struct iphdr)) &lt;= skb_tail_pointer(skb) &amp;&amp;</div><div class='add'>+	    ip_hdr(skb)-&gt;version == 4)</div><div class='add'>+		return htons(ETH_P_IP);</div><div class='add'>+	if (skb_network_header(skb) &gt;= skb-&gt;head &amp;&amp;</div><div class='add'>+	    (skb_network_header(skb) + sizeof(struct ipv6hdr)) &lt;= skb_tail_pointer(skb) &amp;&amp;</div><div class='add'>+	    ipv6_hdr(skb)-&gt;version == 6)</div><div class='add'>+		return htons(ETH_P_IPV6);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip_tunnel_parse_protocol);</div><div class='add'>+</div><div class='add'>+const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tunnel_parse_protocol };</div><div class='add'>+EXPORT_SYMBOL(ip_tunnel_header_ops);</div><div class='add'>+</div><div class='add'>+/* This function returns true when ENCAP attributes are present in the nl msg */</div><div class='add'>+bool ip_tunnel_netlink_encap_parms(struct nlattr *data[],</div><div class='add'>+				   struct ip_tunnel_encap *encap)</div><div class='add'>+{</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	memset(encap, 0, sizeof(*encap));</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_ENCAP_TYPE]) {</div><div class='add'>+		ret = true;</div><div class='add'>+		encap-&gt;type = nla_get_u16(data[IFLA_IPTUN_ENCAP_TYPE]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_ENCAP_FLAGS]) {</div><div class='add'>+		ret = true;</div><div class='add'>+		encap-&gt;flags = nla_get_u16(data[IFLA_IPTUN_ENCAP_FLAGS]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_ENCAP_SPORT]) {</div><div class='add'>+		ret = true;</div><div class='add'>+		encap-&gt;sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_ENCAP_DPORT]) {</div><div class='add'>+		ret = true;</div><div class='add'>+		encap-&gt;dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_netlink_encap_parms);</div><div class='add'>+</div><div class='add'>+void ip_tunnel_netlink_parms(struct nlattr *data[],</div><div class='add'>+			     struct ip_tunnel_parm_kern *parms)</div><div class='add'>+{</div><div class='add'>+	if (data[IFLA_IPTUN_LINK])</div><div class='add'>+		parms-&gt;link = nla_get_u32(data[IFLA_IPTUN_LINK]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_LOCAL])</div><div class='add'>+		parms-&gt;iph.saddr = nla_get_be32(data[IFLA_IPTUN_LOCAL]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_REMOTE])</div><div class='add'>+		parms-&gt;iph.daddr = nla_get_be32(data[IFLA_IPTUN_REMOTE]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_TTL]) {</div><div class='add'>+		parms-&gt;iph.ttl = nla_get_u8(data[IFLA_IPTUN_TTL]);</div><div class='add'>+		if (parms-&gt;iph.ttl)</div><div class='add'>+			parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_TOS])</div><div class='add'>+		parms-&gt;iph.tos = nla_get_u8(data[IFLA_IPTUN_TOS]);</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_IPTUN_PMTUDISC] || nla_get_u8(data[IFLA_IPTUN_PMTUDISC]))</div><div class='add'>+		parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_FLAGS]) {</div><div class='add'>+		__be16 flags;</div><div class='add'>+</div><div class='add'>+		flags = nla_get_be16(data[IFLA_IPTUN_FLAGS]);</div><div class='add'>+		ip_tunnel_flags_from_be16(parms-&gt;i_flags, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_IPTUN_PROTO])</div><div class='add'>+		parms-&gt;iph.protocol = nla_get_u8(data[IFLA_IPTUN_PROTO]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_tunnel_netlink_parms);</div><div class='head'>diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c<br/>index f38cb21d773d..95b6bb78fcd2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_vti.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ip_vti.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ip_vti.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ip_vti.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux NET3: IP/IP protocol decoder modified to support</div><div class='ctx'>  *		    virtual tunnel interface</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *		Saurabh Mohan (saurabh.mohan@vyatta.com) 05/07/2012</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -50,14 +45,17 @@ static unsigned int vti_net_id __read_mostly;</div><div class='ctx'> static int vti_tunnel_init(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='del'>-		     int encap_type)</div><div class='add'>+		     int encap_type, bool update_skb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel;</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct ip_tunnel_net *itn = net_generic(net, vti_net_id);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='add'>+</div><div class='add'>+	__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);</div><div class='ctx'> </div><div class='del'>-	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, TUNNEL_NO_KEY,</div><div class='add'>+	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags,</div><div class='ctx'> 				  iph-&gt;saddr, iph-&gt;daddr, 0);</div><div class='ctx'> 	if (tunnel) {</div><div class='ctx'> 		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='hunk'>@@ -65,6 +63,9 @@ static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='ctx'> </div><div class='ctx'> 		XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip4 = tunnel;</div><div class='ctx'> </div><div class='add'>+		if (update_skb_dev)</div><div class='add'>+			skb-&gt;dev = tunnel-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 		return xfrm_input(skb, nexthdr, spi, encap_type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -74,21 +75,31 @@ drop:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vti_rcv(struct sk_buff *skb)</div><div class='add'>+static int vti_input_proto(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='add'>+			   int encap_type)</div><div class='add'>+{</div><div class='add'>+	return vti_input(skb, nexthdr, spi, encap_type, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vti_rcv(struct sk_buff *skb, __be32 spi, bool update_skb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	XFRM_SPI_SKB_CB(skb)-&gt;family = AF_INET;</div><div class='ctx'> 	XFRM_SPI_SKB_CB(skb)-&gt;daddroff = offsetof(struct iphdr, daddr);</div><div class='ctx'> </div><div class='del'>-	return vti_input(skb, ip_hdr(skb)-&gt;protocol, 0, 0);</div><div class='add'>+	return vti_input(skb, ip_hdr(skb)-&gt;protocol, spi, 0, update_skb_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vti_rcv_proto(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return vti_rcv(skb, 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vti_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short family;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct pcpu_sw_netstats *tstats;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='del'>-	struct xfrm_mode *inner_mode;</div><div class='add'>+	const struct xfrm_mode *inner_mode;</div><div class='ctx'> 	struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip4;</div><div class='ctx'> 	u32 orig_mark = skb-&gt;mark;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -99,15 +110,15 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> 	dev = tunnel-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev-&gt;stats.rx_errors++;</div><div class='del'>-		dev-&gt;stats.rx_dropped++;</div><div class='add'>+		DEV_STATS_INC(dev, rx_errors);</div><div class='add'>+		DEV_STATS_INC(dev, rx_dropped);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	x = xfrm_input_state(skb);</div><div class='ctx'> </div><div class='del'>-	inner_mode = x-&gt;inner_mode;</div><div class='add'>+	inner_mode = &amp;x-&gt;inner_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;sel.family == AF_UNSPEC) {</div><div class='ctx'> 		inner_mode = xfrm_ip2inner_mode(x, XFRM_MODE_SKB_CB(skb)-&gt;protocol);</div><div class='hunk'>@@ -118,7 +129,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	family = inner_mode-&gt;afinfo-&gt;family;</div><div class='add'>+	family = inner_mode-&gt;family;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;mark = be32_to_cpu(tunnel-&gt;parms.i_key);</div><div class='ctx'> 	ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);</div><div class='hunk'>@@ -129,13 +140,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> </div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(tunnel-&gt;net, dev_net(skb-&gt;dev)));</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	tstats = this_cpu_ptr(dev-&gt;tstats);</div><div class='del'>-</div><div class='del'>-	u64_stats_update_begin(&amp;tstats-&gt;syncp);</div><div class='del'>-	tstats-&gt;rx_packets++;</div><div class='del'>-	tstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;tstats-&gt;syncp);</div><div class='add'>+	dev_sw_netstats_rx_add(dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -165,7 +170,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 			    struct flowi *fl)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm *parms = &amp;tunnel-&gt;parms;</div><div class='add'>+	struct ip_tunnel_parm_kern *parms = &amp;tunnel-&gt;parms;</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	struct net_device *tdev;	/* Device to other host */</div><div class='ctx'> 	int pkt_len = skb-&gt;len;</div><div class='hunk'>@@ -173,51 +178,88 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	int mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (!dst) {</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='del'>-		goto tx_error_icmp;</div><div class='add'>+		switch (skb-&gt;protocol) {</div><div class='add'>+		case htons(ETH_P_IP): {</div><div class='add'>+			struct rtable *rt;</div><div class='add'>+</div><div class='add'>+			fl-&gt;u.ip4.flowi4_oif = dev-&gt;ifindex;</div><div class='add'>+			fl-&gt;u.ip4.flowi4_flags |= FLOWI_FLAG_ANYSRC;</div><div class='add'>+			rt = __ip_route_output_key(dev_net(dev), &amp;fl-&gt;u.ip4);</div><div class='add'>+			if (IS_ERR(rt)) {</div><div class='add'>+				DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+				goto tx_error_icmp;</div><div class='add'>+			}</div><div class='add'>+			dst = &amp;rt-&gt;dst;</div><div class='add'>+			skb_dst_set(skb, dst);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			fl-&gt;u.ip6.flowi6_oif = dev-&gt;ifindex;</div><div class='add'>+			fl-&gt;u.ip6.flowi6_flags |= FLOWI_FLAG_ANYSRC;</div><div class='add'>+			dst = ip6_route_output(dev_net(dev), NULL, &amp;fl-&gt;u.ip6);</div><div class='add'>+			if (dst-&gt;error) {</div><div class='add'>+				dst_release(dst);</div><div class='add'>+				dst = NULL;</div><div class='add'>+				DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+				goto tx_error_icmp;</div><div class='add'>+			}</div><div class='add'>+			skb_dst_set(skb, dst);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		default:</div><div class='add'>+			DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+			goto tx_error_icmp;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dst_hold(dst);</div><div class='del'>-	dst = xfrm_lookup(tunnel-&gt;net, dst, fl, NULL, 0);</div><div class='add'>+	dst = xfrm_lookup_route(tunnel-&gt;net, dst, fl, NULL, 0);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+		DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 		goto tx_error_icmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dst-&gt;flags &amp; DST_XFRM_QUEUE)</div><div class='add'>+		goto xmit;</div><div class='add'>+</div><div class='ctx'> 	if (!vti_state_check(dst-&gt;xfrm, parms-&gt;iph.daddr, parms-&gt;iph.saddr)) {</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+		DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		goto tx_error_icmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tdev = dst-&gt;dev;</div><div class='add'>+	tdev = dst_dev(dst);</div><div class='ctx'> </div><div class='ctx'> 	if (tdev == dev) {</div><div class='ctx'> 		dst_release(dst);</div><div class='del'>-		dev-&gt;stats.collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mtu = dst_mtu(dst);</div><div class='ctx'> 	if (skb-&gt;len &gt; mtu) {</div><div class='del'>-		skb_dst_update_pmtu(skb, mtu);</div><div class='add'>+		skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='del'>-				  htonl(mtu));</div><div class='add'>+			if (!(ip_hdr(skb)-&gt;frag_off &amp; htons(IP_DF)))</div><div class='add'>+				goto xmit;</div><div class='add'>+			icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='add'>+				      htonl(mtu));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (mtu &lt; IPV6_MIN_MTU)</div><div class='ctx'> 				mtu = IPV6_MIN_MTU;</div><div class='ctx'> </div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+xmit:</div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(tunnel-&gt;net, dev_net(dev)));</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='del'>-	skb-&gt;dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	skb-&gt;dev = skb_dst_dev(skb);</div><div class='ctx'> </div><div class='ctx'> 	err = dst_output(tunnel-&gt;net, skb-&gt;sk, skb);</div><div class='ctx'> 	if (net_xmit_eval(err) == 0)</div><div class='hunk'>@@ -228,7 +270,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> tx_error_icmp:</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='ctx'> tx_error:</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -241,27 +283,33 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	struct flowi fl;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;fl, 0, sizeof(fl));</div><div class='ctx'> </div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		xfrm_decode_session(skb, &amp;fl, AF_INET);</div><div class='ctx'> 		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));</div><div class='add'>+		xfrm_decode_session(dev_net(dev), skb, &amp;fl, AF_INET);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case htons(ETH_P_IPV6):</div><div class='del'>-		xfrm_decode_session(skb, &amp;fl, AF_INET6);</div><div class='ctx'> 		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));</div><div class='add'>+		xfrm_decode_session(dev_net(dev), skb, &amp;fl, AF_INET6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev-&gt;stats.tx_errors++;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='add'>+		goto tx_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* override mark with tunnel output key */</div><div class='ctx'> 	fl.flowi_mark = be32_to_cpu(tunnel-&gt;parms.o_key);</div><div class='ctx'> </div><div class='ctx'> 	return vti_xmit(skb, dev, &amp;fl);</div><div class='add'>+</div><div class='add'>+tx_err:</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vti4_err(struct sk_buff *skb, u32 info)</div><div class='hunk'>@@ -277,8 +325,11 @@ static int vti4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	int protocol = iph-&gt;protocol;</div><div class='ctx'> 	struct ip_tunnel_net *itn = net_generic(net, vti_net_id);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='add'>+</div><div class='add'>+	__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);</div><div class='ctx'> </div><div class='del'>-	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, TUNNEL_NO_KEY,</div><div class='add'>+	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags,</div><div class='ctx'> 				  iph-&gt;daddr, iph-&gt;saddr, 0);</div><div class='ctx'> 	if (!tunnel)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -306,6 +357,7 @@ static int vti4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		if (icmp_hdr(skb)-&gt;code != ICMP_FRAG_NEEDED)</div><div class='ctx'> 			return 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -318,47 +370,47 @@ static int vti4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (icmp_hdr(skb)-&gt;type == ICMP_DEST_UNREACH)</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, 0, 0, protocol, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, 0, protocol);</div><div class='ctx'> 	else</div><div class='del'>-		ipv4_redirect(skb, net, 0, 0, protocol, 0);</div><div class='add'>+		ipv4_redirect(skb, net, 0, protocol);</div><div class='ctx'> 	xfrm_state_put(x);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+vti_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm_kern *p, int cmd)</div><div class='ctx'> {</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SIOCADDTUNNEL || cmd == SIOCCHGTUNNEL) {</div><div class='del'>-		if (p.iph.version != 4 || p.iph.protocol != IPPROTO_IPIP ||</div><div class='del'>-		    p.iph.ihl != 5)</div><div class='add'>+		if (p-&gt;iph.version != 4 || p-&gt;iph.protocol != IPPROTO_IPIP ||</div><div class='add'>+		    p-&gt;iph.ihl != 5)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(p.i_flags &amp; GRE_KEY))</div><div class='del'>-		p.i_key = 0;</div><div class='del'>-	if (!(p.o_flags &amp; GRE_KEY))</div><div class='del'>-		p.o_key = 0;</div><div class='add'>+	if (!ip_tunnel_flags_is_be16_compat(p-&gt;i_flags) ||</div><div class='add'>+	    !ip_tunnel_flags_is_be16_compat(p-&gt;o_flags))</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (!(ip_tunnel_flags_to_be16(p-&gt;i_flags) &amp; GRE_KEY))</div><div class='add'>+		p-&gt;i_key = 0;</div><div class='add'>+	if (!(ip_tunnel_flags_to_be16(p-&gt;o_flags) &amp; GRE_KEY))</div><div class='add'>+		p-&gt;o_key = 0;</div><div class='ctx'> </div><div class='del'>-	p.i_flags = VTI_ISVTI;</div><div class='add'>+	__set_bit(IP_TUNNEL_VTI_BIT, flags);</div><div class='add'>+	ip_tunnel_flags_copy(p-&gt;i_flags, flags);</div><div class='ctx'> </div><div class='del'>-	err = ip_tunnel_ioctl(dev, &amp;p, cmd);</div><div class='add'>+	err = ip_tunnel_ctl(dev, p, cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd != SIOCDELTUNNEL) {</div><div class='del'>-		p.i_flags |= GRE_KEY;</div><div class='del'>-		p.o_flags |= GRE_KEY;</div><div class='add'>+		ip_tunnel_flags_from_be16(flags, GRE_KEY);</div><div class='add'>+		ip_tunnel_flags_or(p-&gt;i_flags, p-&gt;i_flags, flags);</div><div class='add'>+		ip_tunnel_flags_or(p-&gt;o_flags, p-&gt;o_flags, flags);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,15 +418,17 @@ static const struct net_device_ops vti_netdev_ops = {</div><div class='ctx'> 	.ndo_init	= vti_tunnel_init,</div><div class='ctx'> 	.ndo_uninit	= ip_tunnel_uninit,</div><div class='ctx'> 	.ndo_start_xmit	= vti_tunnel_xmit,</div><div class='del'>-	.ndo_do_ioctl	= vti_tunnel_ioctl,</div><div class='add'>+	.ndo_siocdevprivate = ip_tunnel_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu	= ip_tunnel_change_mtu,</div><div class='del'>-	.ndo_get_stats64 = ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_get_stats64 = dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink = ip_tunnel_get_iflink,</div><div class='add'>+	.ndo_tunnel_ctl	= vti_tunnel_ctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void vti_tunnel_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;vti_netdev_ops;</div><div class='add'>+	dev-&gt;header_ops		= &amp;ip_tunnel_header_ops;</div><div class='ctx'> 	dev-&gt;type		= ARPHRD_TUNNEL;</div><div class='ctx'> 	ip_tunnel_setup(dev, vti_net_id);</div><div class='ctx'> }</div><div class='hunk'>@@ -384,12 +438,12 @@ static int vti_tunnel_init(struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> 	struct iphdr *iph = &amp;tunnel-&gt;parms.iph;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;iph-&gt;saddr, 4);</div><div class='add'>+	__dev_addr_set(dev, &amp;iph-&gt;saddr, 4);</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;iph-&gt;daddr, 4);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;addr_len		= 4;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;lltx		= true;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ip_tunnel_init(dev);</div><div class='hunk'>@@ -406,29 +460,55 @@ static void __net_init vti_fb_tunnel_init(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct xfrm4_protocol vti_esp4_protocol __read_mostly = {</div><div class='del'>-	.handler	=	vti_rcv,</div><div class='del'>-	.input_handler	=	vti_input,</div><div class='add'>+	.handler	=	vti_rcv_proto,</div><div class='add'>+	.input_handler	=	vti_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti4_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm4_protocol vti_ah4_protocol __read_mostly = {</div><div class='del'>-	.handler	=	vti_rcv,</div><div class='del'>-	.input_handler	=	vti_input,</div><div class='add'>+	.handler	=	vti_rcv_proto,</div><div class='add'>+	.input_handler	=	vti_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti4_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm4_protocol vti_ipcomp4_protocol __read_mostly = {</div><div class='del'>-	.handler	=	vti_rcv,</div><div class='del'>-	.input_handler	=	vti_input,</div><div class='add'>+	.handler	=	vti_rcv_proto,</div><div class='add'>+	.input_handler	=	vti_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti4_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+static int vti_rcv_tunnel(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	XFRM_SPI_SKB_CB(skb)-&gt;family = AF_INET;</div><div class='add'>+	XFRM_SPI_SKB_CB(skb)-&gt;daddroff = offsetof(struct iphdr, daddr);</div><div class='add'>+</div><div class='add'>+	return vti_input(skb, IPPROTO_IPIP, ip_hdr(skb)-&gt;saddr, 0, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct xfrm_tunnel vti_ipip_handler __read_mostly = {</div><div class='add'>+	.handler	=	vti_rcv_tunnel,</div><div class='add'>+	.cb_handler	=	vti_rcv_cb,</div><div class='add'>+	.err_handler	=	vti4_err,</div><div class='add'>+	.priority	=	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static struct xfrm_tunnel vti_ipip6_handler __read_mostly = {</div><div class='add'>+	.handler	=	vti_rcv_tunnel,</div><div class='add'>+	.cb_handler	=	vti_rcv_cb,</div><div class='add'>+	.err_handler	=	vti4_err,</div><div class='add'>+	.priority	=	0,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __net_init vti_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -443,14 +523,15 @@ static int __net_init vti_init_net(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit vti_exit_batch_net(struct list_head *list_net)</div><div class='add'>+static void __net_exit vti_exit_rtnl(struct net *net,</div><div class='add'>+				     struct list_head *dev_to_kill)</div><div class='ctx'> {</div><div class='del'>-	ip_tunnel_delete_nets(list_net, vti_net_id, &amp;vti_link_ops);</div><div class='add'>+	ip_tunnel_delete_net(net, vti_net_id, &amp;vti_link_ops, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations vti_net_ops = {</div><div class='ctx'> 	.init = vti_init_net,</div><div class='del'>-	.exit_batch = vti_exit_batch_net,</div><div class='add'>+	.exit_rtnl = vti_exit_rtnl,</div><div class='ctx'> 	.id   = &amp;vti_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip_tunnel_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -462,7 +543,7 @@ static int vti_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vti_netlink_parms(struct nlattr *data[],</div><div class='del'>-			      struct ip_tunnel_parm *parms,</div><div class='add'>+			      struct ip_tunnel_parm_kern *parms,</div><div class='ctx'> 			      __u32 *fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	memset(parms, 0, sizeof(*parms));</div><div class='hunk'>@@ -472,7 +553,7 @@ static void vti_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	parms-&gt;i_flags = VTI_ISVTI;</div><div class='add'>+	__set_bit(IP_TUNNEL_VTI_BIT, parms-&gt;i_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_VTI_LINK])</div><div class='ctx'> 		parms-&gt;link = nla_get_u32(data[IFLA_VTI_LINK]);</div><div class='hunk'>@@ -493,15 +574,18 @@ static void vti_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 		*fwmark = nla_get_u32(data[IFLA_VTI_FWMARK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vti_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-		       struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int vti_newlink(struct net_device *dev,</div><div class='add'>+		       struct rtnl_newlink_params *params,</div><div class='ctx'> 		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ip_tunnel_parm parms;</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct ip_tunnel_parm_kern parms;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	__u32 fwmark = 0;</div><div class='ctx'> </div><div class='ctx'> 	vti_netlink_parms(data, &amp;parms, &amp;fwmark);</div><div class='del'>-	return ip_tunnel_newlink(dev, tb, &amp;parms, fwmark);</div><div class='add'>+	return ip_tunnel_newlink(params-&gt;link_net ? : dev_net(dev), dev, tb,</div><div class='add'>+				 &amp;parms, fwmark);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vti_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='hunk'>@@ -509,8 +593,8 @@ static int vti_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='ctx'> 	__u32 fwmark = t-&gt;fwmark;</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='ctx'> </div><div class='ctx'> 	vti_netlink_parms(data, &amp;p, &amp;fwmark);</div><div class='ctx'> 	return ip_tunnel_changelink(dev, tb, &amp;p, fwmark);</div><div class='hunk'>@@ -537,7 +621,7 @@ static size_t vti_get_size(const struct net_device *dev)</div><div class='ctx'> static int vti_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm *p = &amp;t-&gt;parms;</div><div class='add'>+	struct ip_tunnel_parm_kern *p = &amp;t-&gt;parms;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_VTI_LINK, p-&gt;link) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_VTI_IKEY, p-&gt;i_key) ||</div><div class='hunk'>@@ -554,8 +638,8 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {</div><div class='ctx'> 	[IFLA_VTI_LINK]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_VTI_IKEY]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_VTI_OKEY]		= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_VTI_LOCAL]	= { .len = FIELD_SIZEOF(struct iphdr, saddr) },</div><div class='del'>-	[IFLA_VTI_REMOTE]	= { .len = FIELD_SIZEOF(struct iphdr, daddr) },</div><div class='add'>+	[IFLA_VTI_LOCAL]	= { .len = sizeof_field(struct iphdr, saddr) },</div><div class='add'>+	[IFLA_VTI_REMOTE]	= { .len = sizeof_field(struct iphdr, daddr) },</div><div class='ctx'> 	[IFLA_VTI_FWMARK]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -597,6 +681,18 @@ static int __init vti_init(void)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto xfrm_proto_comp_failed;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+	msg = "ipip tunnel";</div><div class='add'>+	err = xfrm4_tunnel_register(&amp;vti_ipip_handler, AF_INET);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto xfrm_tunnel_ipip_failed;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	err = xfrm4_tunnel_register(&amp;vti_ipip6_handler, AF_INET6);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto xfrm_tunnel_ipip6_failed;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	msg = "netlink interface";</div><div class='ctx'> 	err = rtnl_link_register(&amp;vti_link_ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -605,6 +701,14 @@ static int __init vti_init(void)</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> rtnl_link_failed:</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	xfrm4_tunnel_deregister(&amp;vti_ipip6_handler, AF_INET6);</div><div class='add'>+xfrm_tunnel_ipip6_failed:</div><div class='add'>+#endif</div><div class='add'>+	xfrm4_tunnel_deregister(&amp;vti_ipip_handler, AF_INET);</div><div class='add'>+xfrm_tunnel_ipip_failed:</div><div class='add'>+#endif</div><div class='ctx'> 	xfrm4_protocol_deregister(&amp;vti_ipcomp4_protocol, IPPROTO_COMP);</div><div class='ctx'> xfrm_proto_comp_failed:</div><div class='ctx'> 	xfrm4_protocol_deregister(&amp;vti_ah4_protocol, IPPROTO_AH);</div><div class='hunk'>@@ -620,6 +724,12 @@ pernet_dev_failed:</div><div class='ctx'> static void __exit vti_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_link_unregister(&amp;vti_link_ops);</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	xfrm4_tunnel_deregister(&amp;vti_ipip6_handler, AF_INET6);</div><div class='add'>+#endif</div><div class='add'>+	xfrm4_tunnel_deregister(&amp;vti_ipip_handler, AF_INET);</div><div class='add'>+#endif</div><div class='ctx'> 	xfrm4_protocol_deregister(&amp;vti_ipcomp4_protocol, IPPROTO_COMP);</div><div class='ctx'> 	xfrm4_protocol_deregister(&amp;vti_ah4_protocol, IPPROTO_AH);</div><div class='ctx'> 	xfrm4_protocol_deregister(&amp;vti_esp4_protocol, IPPROTO_ESP);</div><div class='hunk'>@@ -628,6 +738,7 @@ static void __exit vti_fini(void)</div><div class='ctx'> </div><div class='ctx'> module_init(vti_init);</div><div class='ctx'> module_exit(vti_fini);</div><div class='add'>+MODULE_DESCRIPTION("Virtual (secure) IP tunneling library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("vti");</div><div class='ctx'> MODULE_ALIAS_NETDEV("ip_vti0");</div><div class='head'>diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c<br/>index d97f4f2787f5..9a45aed508d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipcomp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipcomp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipcomp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ipcomp.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * IP Payload Compression Protocol (IPComp) - RFC3173.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 James Morris &lt;jmorris@intercode.com.au&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='ctx'>  * Todo:</div><div class='ctx'>  *   - Tunable compression parameters.</div><div class='ctx'>  *   - Compression stats.</div><div class='hunk'>@@ -35,6 +31,7 @@ static int ipcomp4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		if (icmp_hdr(skb)-&gt;code != ICMP_FRAG_NEEDED)</div><div class='ctx'> 			return 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -48,15 +45,16 @@ static int ipcomp4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (icmp_hdr(skb)-&gt;type == ICMP_DEST_UNREACH)</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, 0, IPPROTO_COMP);</div><div class='ctx'> 	else</div><div class='del'>-		ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);</div><div class='add'>+		ipv4_redirect(skb, net, 0, IPPROTO_COMP);</div><div class='ctx'> 	xfrm_state_put(x);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We always hold one tunnel user reference to indicate a tunnel */</div><div class='add'>+static struct lock_class_key xfrm_state_lock_key;</div><div class='ctx'> static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = xs_net(x);</div><div class='hunk'>@@ -65,6 +63,7 @@ static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> 	t = xfrm_state_alloc(net);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		goto out;</div><div class='add'>+	lockdep_set_class(&amp;t-&gt;lock, &amp;xfrm_state_lock_key);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;id.proto = IPPROTO_IPIP;</div><div class='ctx'> 	t-&gt;id.spi = x-&gt;props.saddr.a4;</div><div class='hunk'>@@ -76,6 +75,7 @@ static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> 	t-&gt;props.flags = x-&gt;props.flags;</div><div class='ctx'> 	t-&gt;props.extra_flags = x-&gt;props.extra_flags;</div><div class='ctx'> 	memcpy(&amp;t-&gt;mark, &amp;x-&gt;mark, sizeof(t-&gt;mark));</div><div class='add'>+	t-&gt;if_id = x-&gt;if_id;</div><div class='ctx'> </div><div class='ctx'> 	if (xfrm_init_state(t))</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -119,7 +119,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipcomp4_init_state(struct xfrm_state *x)</div><div class='add'>+static int ipcomp4_init_state(struct xfrm_state *x,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -131,17 +132,20 @@ static int ipcomp4_init_state(struct xfrm_state *x)</div><div class='ctx'> 		x-&gt;props.header_len += sizeof(struct iphdr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported XFRM mode for IPcomp");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ipcomp_init_state(x);</div><div class='add'>+	err = ipcomp_init_state(x, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.mode == XFRM_MODE_TUNNEL) {</div><div class='ctx'> 		err = ipcomp_tunnel_attach(x);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel error: failed to initialize the associated state");</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -155,7 +159,6 @@ static int ipcomp4_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type ipcomp_type = {</div><div class='del'>-	.description	= "IPCOMP4",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_COMP,</div><div class='ctx'> 	.init_state	= ipcomp4_init_state,</div><div class='hunk'>@@ -190,8 +193,7 @@ static void __exit ipcomp4_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfrm4_protocol_deregister(&amp;ipcomp4_protocol, IPPROTO_COMP) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;ipcomp_type, AF_INET) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;ipcomp_type, AF_INET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ipcomp4_init);</div><div class='head'>diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c<br/>index 88212615bf4c..019408d3ca2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipconfig.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipconfig.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipconfig.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ipconfig.c</a></div><div class='hunk'>@@ -61,7 +61,6 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipconfig.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -85,7 +84,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Define the friendly delay before and after opening net devices */</div><div class='ctx'> #define CONF_POST_OPEN		10	/* After opening: 10 msecs */</div><div class='del'>-#define CONF_CARRIER_TIMEOUT	120000	/* Wait for carrier timeout */</div><div class='ctx'> </div><div class='ctx'> /* Define the timeout for waiting for a DHCP/BOOTP/RARP reply */</div><div class='ctx'> #define CONF_OPEN_RETRIES 	2	/* (Re)open devices twice */</div><div class='hunk'>@@ -101,6 +99,9 @@</div><div class='ctx'> #define NONE cpu_to_be32(INADDR_NONE)</div><div class='ctx'> #define ANY cpu_to_be32(INADDR_ANY)</div><div class='ctx'> </div><div class='add'>+/* Wait for carrier timeout default in seconds */</div><div class='add'>+static unsigned int carrier_timeout = 120;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Public IP configuration</div><div class='ctx'>  */</div><div class='hunk'>@@ -216,11 +217,11 @@ static int __init ic_open_devs(void)</div><div class='ctx'> 	last = &amp;ic_first_dev;</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	/* bring loopback and DSA master network devices up first */</div><div class='add'>+	/* bring loopback device up first */</div><div class='ctx'> 	for_each_netdev(&amp;init_net, dev) {</div><div class='del'>-		if (!(dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp; !netdev_uses_dsa(dev))</div><div class='add'>+		if (!(dev-&gt;flags &amp; IFF_LOOPBACK))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (dev_change_flags(dev, dev-&gt;flags | IFF_UP) &lt; 0)</div><div class='add'>+		if (dev_change_flags(dev, dev-&gt;flags | IFF_UP, NULL) &lt; 0)</div><div class='ctx'> 			pr_err("IP-Config: Failed to open %s\n", dev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +239,7 @@ static int __init ic_open_devs(void)</div><div class='ctx'> 			if (ic_proto_enabled &amp;&amp; !able)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			oflags = dev-&gt;flags;</div><div class='del'>-			if (dev_change_flags(dev, oflags | IFF_UP) &lt; 0) {</div><div class='add'>+			if (dev_change_flags(dev, oflags | IFF_UP, NULL) &lt; 0) {</div><div class='ctx'> 				pr_err("IP-Config: Failed to open %s\n",</div><div class='ctx'> 				       dev-&gt;name);</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -261,6 +262,11 @@ static int __init ic_open_devs(void)</div><div class='ctx'> 				 dev-&gt;name, able, d-&gt;xid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* Devices with a complex topology like SFP ethernet interfaces needs</div><div class='add'>+	 * the rtnl_lock at init. The carrier wait-loop must therefore run</div><div class='add'>+	 * without holding it.</div><div class='add'>+	 */</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/* no point in waiting if we could not bring up at least one device */</div><div class='ctx'> 	if (!ic_first_dev)</div><div class='hunk'>@@ -268,14 +274,18 @@ static int __init ic_open_devs(void)</div><div class='ctx'> </div><div class='ctx'> 	/* wait for a carrier on at least one device */</div><div class='ctx'> 	start = jiffies;</div><div class='del'>-	next_msg = start + msecs_to_jiffies(CONF_CARRIER_TIMEOUT/12);</div><div class='add'>+	next_msg = start + secs_to_jiffies(20);</div><div class='ctx'> 	while (time_before(jiffies, start +</div><div class='del'>-			   msecs_to_jiffies(CONF_CARRIER_TIMEOUT))) {</div><div class='add'>+			   secs_to_jiffies(carrier_timeout))) {</div><div class='ctx'> 		int wait, elapsed;</div><div class='ctx'> </div><div class='add'>+		rtnl_lock();</div><div class='ctx'> 		for_each_netdev(&amp;init_net, dev)</div><div class='del'>-			if (ic_is_init_dev(dev) &amp;&amp; netif_carrier_ok(dev))</div><div class='add'>+			if (ic_is_init_dev(dev) &amp;&amp; netif_carrier_ok(dev)) {</div><div class='add'>+				rtnl_unlock();</div><div class='ctx'> 				goto have_carrier;</div><div class='add'>+			}</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 		msleep(1);</div><div class='ctx'> </div><div class='hunk'>@@ -283,12 +293,11 @@ static int __init ic_open_devs(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		elapsed = jiffies_to_msecs(jiffies - start);</div><div class='del'>-		wait = (CONF_CARRIER_TIMEOUT - elapsed + 500)/1000;</div><div class='add'>+		wait = (carrier_timeout * 1000 - elapsed + 500) / 1000;</div><div class='ctx'> 		pr_info("Waiting up to %d more seconds for network.\n", wait);</div><div class='del'>-		next_msg = jiffies + msecs_to_jiffies(CONF_CARRIER_TIMEOUT/12);</div><div class='add'>+		next_msg = jiffies + secs_to_jiffies(20);</div><div class='ctx'> 	}</div><div class='ctx'> have_carrier:</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	*last = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -303,19 +312,36 @@ have_carrier:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Close all network interfaces except the one we've autoconfigured, and its</div><div class='add'>+ * lowers, in case it's a stacked virtual interface.</div><div class='add'>+ */</div><div class='ctx'> static void __init ic_close_devs(void)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *selected_dev = ic_dev ? ic_dev-&gt;dev : NULL;</div><div class='ctx'> 	struct ic_device *d, *next;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	next = ic_first_dev;</div><div class='ctx'> 	while ((d = next)) {</div><div class='add'>+		bool bring_down = (d != ic_dev);</div><div class='add'>+		struct net_device *lower;</div><div class='add'>+		struct list_head *iter;</div><div class='add'>+</div><div class='ctx'> 		next = d-&gt;next;</div><div class='ctx'> 		dev = d-&gt;dev;</div><div class='del'>-		if (d != ic_dev &amp;&amp; !netdev_uses_dsa(dev)) {</div><div class='add'>+</div><div class='add'>+		if (selected_dev) {</div><div class='add'>+			netdev_for_each_lower_dev(selected_dev, lower, iter) {</div><div class='add'>+				if (dev == lower) {</div><div class='add'>+					bring_down = false;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (bring_down) {</div><div class='ctx'> 			pr_debug("IP-Config: Downing %s\n", dev-&gt;name);</div><div class='del'>-			dev_change_flags(dev, d-&gt;flags);</div><div class='add'>+			dev_change_flags(dev, d-&gt;flags, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(d);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -429,6 +455,8 @@ static int __init ic_defaults(void)</div><div class='ctx'> 			ic_netmask = htonl(IN_CLASSB_NET);</div><div class='ctx'> 		else if (IN_CLASSC(ntohl(ic_myaddr)))</div><div class='ctx'> 			ic_netmask = htonl(IN_CLASSC_NET);</div><div class='add'>+		else if (IN_CLASSE(ntohl(ic_myaddr)))</div><div class='add'>+			ic_netmask = htonl(IN_CLASSE_NET);</div><div class='ctx'> 		else {</div><div class='ctx'> 			pr_err("IP-Config: Unable to guess netmask for address %pI4\n",</div><div class='ctx'> 			       &amp;ic_myaddr);</div><div class='hunk'>@@ -637,6 +665,9 @@ static struct packet_type bootp_packet_type __initdata = {</div><div class='ctx'> 	.func =	ic_bootp_recv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* DHCPACK can overwrite DNS if fallback was set upon first BOOTP reply */</div><div class='add'>+static int ic_nameservers_fallback __initdata;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  Initialize DHCP/BOOTP extension fields in the request.</div><div class='ctx'>  */</div><div class='hunk'>@@ -866,7 +897,7 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  Copy BOOTP-supplied string if not already set.</div><div class='add'>+ *  Copy BOOTP-supplied string</div><div class='ctx'>  */</div><div class='ctx'> static int __init ic_bootp_string(char *dest, char *src, int len, int max)</div><div class='ctx'> {</div><div class='hunk'>@@ -910,17 +941,21 @@ static void __init ic_do_bootp_ext(u8 *ext)</div><div class='ctx'> 		if (servers &gt; CONF_NAMESERVERS_MAX)</div><div class='ctx'> 			servers = CONF_NAMESERVERS_MAX;</div><div class='ctx'> 		for (i = 0; i &lt; servers; i++) {</div><div class='del'>-			if (ic_nameservers[i] == NONE)</div><div class='add'>+			if (ic_nameservers[i] == NONE ||</div><div class='add'>+			    ic_nameservers_fallback)</div><div class='ctx'> 				memcpy(&amp;ic_nameservers[i], ext+1+4*i, 4);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 12:	/* Host name */</div><div class='del'>-		ic_bootp_string(utsname()-&gt;nodename, ext+1, *ext,</div><div class='del'>-				__NEW_UTS_LEN);</div><div class='del'>-		ic_host_name_set = 1;</div><div class='add'>+		if (!ic_host_name_set) {</div><div class='add'>+			ic_bootp_string(utsname()-&gt;nodename, ext+1, *ext,</div><div class='add'>+					__NEW_UTS_LEN);</div><div class='add'>+			ic_host_name_set = 1;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 15:	/* Domain name (DNS) */</div><div class='del'>-		ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain));</div><div class='add'>+		if (!ic_domain[0])</div><div class='add'>+			ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 17:	/* Root path */</div><div class='ctx'> 		if (!root_server_path[0])</div><div class='hunk'>@@ -1127,8 +1162,10 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str</div><div class='ctx'> 	ic_addrservaddr = b-&gt;iph.saddr;</div><div class='ctx'> 	if (ic_gateway == NONE &amp;&amp; b-&gt;relay_ip)</div><div class='ctx'> 		ic_gateway = b-&gt;relay_ip;</div><div class='del'>-	if (ic_nameservers[0] == NONE)</div><div class='add'>+	if (ic_nameservers[0] == NONE) {</div><div class='ctx'> 		ic_nameservers[0] = ic_servaddr;</div><div class='add'>+		ic_nameservers_fallback = 1;</div><div class='add'>+	}</div><div class='ctx'> 	ic_got_reply = IC_BOOTP;</div><div class='ctx'> </div><div class='ctx'> drop_unlock:</div><div class='hunk'>@@ -1330,7 +1367,7 @@ static int __init ipconfig_proc_net_init(void)</div><div class='ctx'> </div><div class='ctx'> /* Create a new file under /proc/net/ipconfig */</div><div class='ctx'> static int ipconfig_proc_net_create(const char *name,</div><div class='del'>-				    const struct file_operations *fops)</div><div class='add'>+				    const struct proc_ops *proc_ops)</div><div class='ctx'> {</div><div class='ctx'> 	char *pname;</div><div class='ctx'> 	struct proc_dir_entry *p;</div><div class='hunk'>@@ -1342,7 +1379,7 @@ static int ipconfig_proc_net_create(const char *name,</div><div class='ctx'> 	if (!pname)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	p = proc_create(pname, 0444, init_net.proc_net, fops);</div><div class='add'>+	p = proc_create(pname, 0444, init_net.proc_net, proc_ops);</div><div class='ctx'> 	kfree(pname);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1351,7 +1388,7 @@ static int ipconfig_proc_net_create(const char *name,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write NTP server IP addresses to /proc/net/ipconfig/ntp_servers */</div><div class='del'>-static int ntp_servers_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+static int ntp_servers_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1361,18 +1398,7 @@ static int ntp_servers_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int ntp_servers_seq_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, ntp_servers_seq_show, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations ntp_servers_seq_fops = {</div><div class='del'>-	.open		= ntp_servers_seq_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_PROC_SHOW_ATTRIBUTE(ntp_servers);</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1414,11 +1440,15 @@ __be32 __init root_nfs_parse_addr(char *name)</div><div class='ctx'> static int __init wait_for_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	bool try_init_devs = true;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DEVICE_WAIT_MAX; i++) {</div><div class='ctx'> 		struct net_device *dev;</div><div class='ctx'> 		int found = 0;</div><div class='ctx'> </div><div class='add'>+		/* make sure deferred device probes are finished */</div><div class='add'>+		wait_for_device_probe();</div><div class='add'>+</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 		for_each_netdev(&amp;init_net, dev) {</div><div class='ctx'> 			if (ic_is_init_dev(dev)) {</div><div class='hunk'>@@ -1429,6 +1459,11 @@ static int __init wait_for_devices(void)</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		if (found)</div><div class='ctx'> 			return 0;</div><div class='add'>+		if (try_init_devs &amp;&amp;</div><div class='add'>+		    (ROOT_DEV == Root_NFS || ROOT_DEV == Root_CIFS)) {</div><div class='add'>+			try_init_devs = false;</div><div class='add'>+			wait_for_init_devices_probe();</div><div class='add'>+		}</div><div class='ctx'> 		ssleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -1445,7 +1480,7 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 	int retries = CONF_OPEN_RETRIES;</div><div class='ctx'> #endif</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, count;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise all name servers and NTP servers to NONE (but only if the</div><div class='ctx'> 	 * "ip=" or "nfsaddrs=" kernel command line parameters weren't decoded,</div><div class='hunk'>@@ -1460,7 +1495,7 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 	proc_create_single("pnp", 0444, init_net.proc_net, pnp_seq_show);</div><div class='ctx'> </div><div class='ctx'> 	if (ipconfig_proc_net_init() == 0)</div><div class='del'>-		ipconfig_proc_net_create("ntp_servers", &amp;ntp_servers_seq_fops);</div><div class='add'>+		ipconfig_proc_net_create("ntp_servers", &amp;ntp_servers_proc_ops);</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> 	if (!ic_enable)</div><div class='hunk'>@@ -1490,10 +1525,10 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 	 * missing values.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ic_myaddr == NONE ||</div><div class='del'>-#ifdef CONFIG_ROOT_NFS</div><div class='add'>+#if defined(CONFIG_ROOT_NFS) || defined(CONFIG_CIFS_ROOT)</div><div class='ctx'> 	    (root_server_addr == NONE &amp;&amp;</div><div class='ctx'> 	     ic_servaddr == NONE &amp;&amp;</div><div class='del'>-	     ROOT_DEV == Root_NFS) ||</div><div class='add'>+	     (ROOT_DEV == Root_NFS || ROOT_DEV == Root_CIFS)) ||</div><div class='ctx'> #endif</div><div class='ctx'> 	    ic_first_dev-&gt;next) {</div><div class='ctx'> #ifdef IPCONFIG_DYNAMIC</div><div class='hunk'>@@ -1520,6 +1555,12 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 				goto try_try_again;</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_CIFS_ROOT</div><div class='add'>+			if (ROOT_DEV == Root_CIFS) {</div><div class='add'>+				pr_err("IP-Config: Retrying forever (CIFS root)...\n");</div><div class='add'>+				goto try_try_again;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 			if (--retries) {</div><div class='ctx'> 				pr_err("IP-Config: Reopening network devices...\n");</div><div class='hunk'>@@ -1573,7 +1614,7 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 	if (ic_dev_mtu)</div><div class='ctx'> 		pr_cont(", mtu=%d", ic_dev_mtu);</div><div class='ctx'> 	/* Name servers (if any): */</div><div class='del'>-	for (i = 0; i &lt; CONF_NAMESERVERS_MAX; i++) {</div><div class='add'>+	for (i = 0, count = 0; i &lt; CONF_NAMESERVERS_MAX; i++) {</div><div class='ctx'> 		if (ic_nameservers[i] != NONE) {</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				pr_info("     nameserver%u=%pI4",</div><div class='hunk'>@@ -1581,12 +1622,14 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 			else</div><div class='ctx'> 				pr_cont(", nameserver%u=%pI4",</div><div class='ctx'> 					i, &amp;ic_nameservers[i]);</div><div class='add'>+</div><div class='add'>+			count++;</div><div class='ctx'> 		}</div><div class='del'>-		if (i + 1 == CONF_NAMESERVERS_MAX)</div><div class='add'>+		if ((i + 1 == CONF_NAMESERVERS_MAX) &amp;&amp; count &gt; 0)</div><div class='ctx'> 			pr_cont("\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	/* NTP servers (if any): */</div><div class='del'>-	for (i = 0; i &lt; CONF_NTP_SERVERS_MAX; i++) {</div><div class='add'>+	for (i = 0, count = 0; i &lt; CONF_NTP_SERVERS_MAX; i++) {</div><div class='ctx'> 		if (ic_ntp_servers[i] != NONE) {</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				pr_info("     ntpserver%u=%pI4",</div><div class='hunk'>@@ -1594,8 +1637,10 @@ static int __init ip_auto_config(void)</div><div class='ctx'> 			else</div><div class='ctx'> 				pr_cont(", ntpserver%u=%pI4",</div><div class='ctx'> 					i, &amp;ic_ntp_servers[i]);</div><div class='add'>+</div><div class='add'>+			count++;</div><div class='ctx'> 		}</div><div class='del'>-		if (i + 1 == CONF_NTP_SERVERS_MAX)</div><div class='add'>+		if ((i + 1 == CONF_NTP_SERVERS_MAX) &amp;&amp; count &gt; 0)</div><div class='ctx'> 			pr_cont("\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* !SILENT */</div><div class='hunk'>@@ -1619,7 +1664,7 @@ late_initcall(ip_auto_config);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel</div><div class='del'>- *  command line parameter.  See Documentation/filesystems/nfs/nfsroot.txt.</div><div class='add'>+ *  command line parameter.  See Documentation/admin-guide/nfs/nfsroot.rst.</div><div class='ctx'>  */</div><div class='ctx'> static int __init ic_proto_name(char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -1645,7 +1690,8 @@ static int __init ic_proto_name(char *name)</div><div class='ctx'> 			*v = 0;</div><div class='ctx'> 			if (kstrtou8(client_id, 0, dhcp_client_identifier))</div><div class='ctx'> 				pr_debug("DHCP: Invalid client identifier type\n");</div><div class='del'>-			strncpy(dhcp_client_identifier + 1, v + 1, 251);</div><div class='add'>+			strscpy(dhcp_client_identifier + 1, v + 1,</div><div class='add'>+				sizeof(dhcp_client_identifier) - 1);</div><div class='ctx'> 			*v = ',';</div><div class='ctx'> 		}</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1726,15 +1772,15 @@ static int __init ip_auto_config_setup(char *addrs)</div><div class='ctx'> 			case 4:</div><div class='ctx'> 				if ((dp = strchr(ip, '.'))) {</div><div class='ctx'> 					*dp++ = '\0';</div><div class='del'>-					strlcpy(utsname()-&gt;domainname, dp,</div><div class='add'>+					strscpy(utsname()-&gt;domainname, dp,</div><div class='ctx'> 						sizeof(utsname()-&gt;domainname));</div><div class='ctx'> 				}</div><div class='del'>-				strlcpy(utsname()-&gt;nodename, ip,</div><div class='add'>+				strscpy(utsname()-&gt;nodename, ip,</div><div class='ctx'> 					sizeof(utsname()-&gt;nodename));</div><div class='ctx'> 				ic_host_name_set = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 5:</div><div class='del'>-				strlcpy(user_dev_name, ip, sizeof(user_dev_name));</div><div class='add'>+				strscpy(user_dev_name, ip, sizeof(user_dev_name));</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 6:</div><div class='ctx'> 				if (ic_proto_name(ip) == 0 &amp;&amp;</div><div class='hunk'>@@ -1781,7 +1827,7 @@ __setup("nfsaddrs=", nfsaddrs_config_setup);</div><div class='ctx'> </div><div class='ctx'> static int __init vendor_class_identifier_setup(char *addrs)</div><div class='ctx'> {</div><div class='del'>-	if (strlcpy(vendor_class_identifier, addrs,</div><div class='add'>+	if (strscpy(vendor_class_identifier, addrs,</div><div class='ctx'> 		    sizeof(vendor_class_identifier))</div><div class='ctx'> 	    &gt;= sizeof(vendor_class_identifier))</div><div class='ctx'> 		pr_warn("DHCP: vendorclass too long, truncated to \"%s\"\n",</div><div class='hunk'>@@ -1789,3 +1835,18 @@ static int __init vendor_class_identifier_setup(char *addrs)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> __setup("dhcpclass=", vendor_class_identifier_setup);</div><div class='add'>+</div><div class='add'>+static int __init set_carrier_timeout(char *str)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (!str)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(str, 0, &amp;carrier_timeout);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("carrier_timeout=", set_carrier_timeout);</div><div class='head'>diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c<br/>index c891235b4966..ff95b1b9908e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipip.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ipip.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux NET3:	IP/IP protocol decoder.</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,12 +17,6 @@</div><div class='ctx'>  *              Carlos Picoto   :       GRE over IP support</div><div class='ctx'>  *		Alexey Kuznetsov:	Reworked. Really, now it is truncated version of ipv4/ip_gre.c.</div><div class='ctx'>  *					I do not want to merge them together.</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* tunnel.c: an IP tunnel driver</div><div class='hunk'>@@ -135,11 +130,21 @@ static int ipip_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct ip_tunnel_net *itn = net_generic(net, ipip_net_id);</div><div class='ctx'> 	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	const int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	const int code = icmp_hdr(skb)-&gt;code;</div><div class='ctx'> 	struct ip_tunnel *t;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);</div><div class='add'>+</div><div class='add'>+	t = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags, iph-&gt;daddr,</div><div class='add'>+			     iph-&gt;saddr, 0);</div><div class='add'>+	if (!t) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		switch (code) {</div><div class='hunk'>@@ -167,21 +172,13 @@ static int ipip_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	t = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, TUNNEL_NO_KEY,</div><div class='del'>-			     iph-&gt;daddr, iph-&gt;saddr, 0);</div><div class='del'>-	if (!t) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (type == ICMP_DEST_UNREACH &amp;&amp; code == ICMP_FRAG_NEEDED) {</div><div class='del'>-		ipv4_update_pmtu(skb, net, info, t-&gt;parms.link, 0,</div><div class='del'>-				 iph-&gt;protocol, 0);</div><div class='add'>+		ipv4_update_pmtu(skb, net, info, t-&gt;parms.link, iph-&gt;protocol);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMP_REDIRECT) {</div><div class='del'>-		ipv4_redirect(skb, net, t-&gt;parms.link, 0, iph-&gt;protocol, 0);</div><div class='add'>+		ipv4_redirect(skb, net, t-&gt;parms.link, iph-&gt;protocol);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -219,13 +216,16 @@ static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct ip_tunnel_net *itn = net_generic(net, ipip_net_id);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	struct metadata_dst *tun_dst = NULL;</div><div class='ctx'> 	struct ip_tunnel *tunnel;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> </div><div class='add'>+	__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);</div><div class='add'>+</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='del'>-	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, TUNNEL_NO_KEY,</div><div class='del'>-			iph-&gt;saddr, iph-&gt;daddr, 0);</div><div class='add'>+	tunnel = ip_tunnel_lookup(itn, skb-&gt;dev-&gt;ifindex, flags, iph-&gt;saddr,</div><div class='add'>+				  iph-&gt;daddr, 0);</div><div class='ctx'> 	if (tunnel) {</div><div class='ctx'> 		const struct tnl_ptk_info *tpi;</div><div class='ctx'> </div><div class='hunk'>@@ -244,10 +244,15 @@ static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto)</div><div class='ctx'> 		if (iptunnel_pull_header(skb, 0, tpi-&gt;proto, false))</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		if (tunnel-&gt;collect_md) {</div><div class='del'>-			tun_dst = ip_tun_rx_dst(skb, 0, 0, 0);</div><div class='add'>+			ip_tunnel_flags_zero(flags);</div><div class='add'>+</div><div class='add'>+			tun_dst = ip_tun_rx_dst(skb, flags, 0, 0);</div><div class='ctx'> 			if (!tun_dst)</div><div class='ctx'> 				return 0;</div><div class='add'>+			ip_tunnel_md_udp_encap(skb, &amp;tun_dst-&gt;u.tun_info);</div><div class='ctx'> 		}</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='ctx'> 		return ip_tunnel_rcv(tunnel, skb, tpi, tun_dst, log_ecn_error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -281,6 +286,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	const struct iphdr  *tiph = &amp;tunnel-&gt;parms.iph;</div><div class='ctx'> 	u8 ipproto;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_error;</div><div class='add'>+</div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='ctx'> 		ipproto = IPPROTO_IPIP;</div><div class='hunk'>@@ -303,7 +311,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	skb_set_inner_ipproto(skb, ipproto);</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;collect_md)</div><div class='del'>-		ip_md_tunnel_xmit(skb, dev, ipproto);</div><div class='add'>+		ip_md_tunnel_xmit(skb, dev, ipproto, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		ip_tunnel_xmit(skb, dev, tiph, ipproto);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -311,7 +319,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> tx_error:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,29 +338,41 @@ static bool ipip_tunnel_ioctl_verify_protocol(u8 ipproto)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ipip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+ipip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm_kern *p, int cmd)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	if (cmd == SIOCADDTUNNEL || cmd == SIOCCHGTUNNEL) {</div><div class='del'>-		if (p.iph.version != 4 ||</div><div class='del'>-		    !ipip_tunnel_ioctl_verify_protocol(p.iph.protocol) ||</div><div class='del'>-		    p.iph.ihl != 5 || (p.iph.frag_off&amp;htons(~IP_DF)))</div><div class='add'>+		if (p-&gt;iph.version != 4 ||</div><div class='add'>+		    !ipip_tunnel_ioctl_verify_protocol(p-&gt;iph.protocol) ||</div><div class='add'>+		    p-&gt;iph.ihl != 5 || (p-&gt;iph.frag_off &amp; htons(~IP_DF)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p.i_key = p.o_key = 0;</div><div class='del'>-	p.i_flags = p.o_flags = 0;</div><div class='del'>-	err = ip_tunnel_ioctl(dev, &amp;p, cmd);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	p-&gt;i_key = p-&gt;o_key = 0;</div><div class='add'>+	ip_tunnel_flags_zero(p-&gt;i_flags);</div><div class='add'>+	ip_tunnel_flags_zero(p-&gt;o_flags);</div><div class='add'>+	return ip_tunnel_ctl(dev, p, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipip_fill_forward_path(struct net_device_path_ctx *ctx,</div><div class='add'>+				  struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *tunnel = netdev_priv(ctx-&gt;dev);</div><div class='add'>+	const struct iphdr *tiph = &amp;tunnel-&gt;parms.iph;</div><div class='add'>+	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	rt = ip_route_output(dev_net(ctx-&gt;dev), tiph-&gt;daddr, 0, 0, 0,</div><div class='add'>+			     RT_SCOPE_UNIVERSE);</div><div class='add'>+	if (IS_ERR(rt))</div><div class='add'>+		return PTR_ERR(rt);</div><div class='add'>+</div><div class='add'>+	path-&gt;type = DEV_PATH_TUN;</div><div class='add'>+	path-&gt;tun.src_v4.s_addr = tiph-&gt;saddr;</div><div class='add'>+	path-&gt;tun.dst_v4.s_addr = tiph-&gt;daddr;</div><div class='add'>+	path-&gt;tun.l3_proto = IPPROTO_IPIP;</div><div class='add'>+	path-&gt;dev = ctx-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;dev = rt-&gt;dst.dev;</div><div class='add'>+	ip_rt_put(rt);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -361,10 +381,12 @@ static const struct net_device_ops ipip_netdev_ops = {</div><div class='ctx'> 	.ndo_init       = ipip_tunnel_init,</div><div class='ctx'> 	.ndo_uninit     = ip_tunnel_uninit,</div><div class='ctx'> 	.ndo_start_xmit	= ipip_tunnel_xmit,</div><div class='del'>-	.ndo_do_ioctl	= ipip_tunnel_ioctl,</div><div class='add'>+	.ndo_siocdevprivate = ip_tunnel_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu = ip_tunnel_change_mtu,</div><div class='del'>-	.ndo_get_stats64 = ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_get_stats64 = dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink = ip_tunnel_get_iflink,</div><div class='add'>+	.ndo_tunnel_ctl	= ipip_tunnel_ctl,</div><div class='add'>+	.ndo_fill_forward_path = ipip_fill_forward_path,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IPIP_FEATURES (NETIF_F_SG |		\</div><div class='hunk'>@@ -376,11 +398,12 @@ static const struct net_device_ops ipip_netdev_ops = {</div><div class='ctx'> static void ipip_tunnel_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;ipip_netdev_ops;</div><div class='add'>+	dev-&gt;header_ops		= &amp;ip_tunnel_header_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;type		= ARPHRD_TUNNEL;</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;addr_len		= 4;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;lltx		= true;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features		|= IPIP_FEATURES;</div><div class='hunk'>@@ -392,7 +415,7 @@ static int ipip_tunnel_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;tunnel-&gt;parms.iph.saddr, 4);</div><div class='add'>+	__dev_addr_set(dev, &amp;tunnel-&gt;parms.iph.saddr, 4);</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;tunnel-&gt;parms.iph.daddr, 4);</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;tun_hlen = 0;</div><div class='hunk'>@@ -416,8 +439,8 @@ static int ipip_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipip_netlink_parms(struct nlattr *data[],</div><div class='del'>-			       struct ip_tunnel_parm *parms, bool *collect_md,</div><div class='del'>-			       __u32 *fwmark)</div><div class='add'>+			       struct ip_tunnel_parm_kern *parms,</div><div class='add'>+			       bool *collect_md, __u32 *fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	memset(parms, 0, sizeof(*parms));</div><div class='ctx'> </div><div class='hunk'>@@ -429,29 +452,7 @@ static void ipip_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data[IFLA_IPTUN_LINK])</div><div class='del'>-		parms-&gt;link = nla_get_u32(data[IFLA_IPTUN_LINK]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_LOCAL])</div><div class='del'>-		parms-&gt;iph.saddr = nla_get_in_addr(data[IFLA_IPTUN_LOCAL]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_REMOTE])</div><div class='del'>-		parms-&gt;iph.daddr = nla_get_in_addr(data[IFLA_IPTUN_REMOTE]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_TTL]) {</div><div class='del'>-		parms-&gt;iph.ttl = nla_get_u8(data[IFLA_IPTUN_TTL]);</div><div class='del'>-		if (parms-&gt;iph.ttl)</div><div class='del'>-			parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_TOS])</div><div class='del'>-		parms-&gt;iph.tos = nla_get_u8(data[IFLA_IPTUN_TOS]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_PROTO])</div><div class='del'>-		parms-&gt;iph.protocol = nla_get_u8(data[IFLA_IPTUN_PROTO]);</div><div class='del'>-</div><div class='del'>-	if (!data[IFLA_IPTUN_PMTUDISC] || nla_get_u8(data[IFLA_IPTUN_PMTUDISC]))</div><div class='del'>-		parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='add'>+	ip_tunnel_netlink_parms(data, parms);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_IPTUN_COLLECT_METADATA])</div><div class='ctx'> 		*collect_md = true;</div><div class='hunk'>@@ -460,50 +461,18 @@ static void ipip_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 		*fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function returns true when ENCAP attributes are present in the nl msg */</div><div class='del'>-static bool ipip_netlink_encap_parms(struct nlattr *data[],</div><div class='del'>-				     struct ip_tunnel_encap *ipencap)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	memset(ipencap, 0, sizeof(*ipencap));</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_TYPE]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;type = nla_get_u16(data[IFLA_IPTUN_ENCAP_TYPE]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_FLAGS]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;flags = nla_get_u16(data[IFLA_IPTUN_ENCAP_FLAGS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_SPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_DPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ipip_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ipip_newlink(struct net_device *dev,</div><div class='add'>+			struct rtnl_newlink_params *params,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='ctx'> 	__u32 fwmark = 0;</div><div class='ctx'> </div><div class='del'>-	if (ipip_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		int err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -511,7 +480,8 @@ static int ipip_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipip_netlink_parms(data, &amp;p, &amp;t-&gt;collect_md, &amp;fwmark);</div><div class='del'>-	return ip_tunnel_newlink(dev, tb, &amp;p, fwmark);</div><div class='add'>+	return ip_tunnel_newlink(params-&gt;link_net ? : dev_net(dev), dev, tb, &amp;p,</div><div class='add'>+				 fwmark);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='hunk'>@@ -519,12 +489,12 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='ctx'> 	bool collect_md;</div><div class='ctx'> 	__u32 fwmark = t-&gt;fwmark;</div><div class='ctx'> </div><div class='del'>-	if (ipip_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		int err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -577,7 +547,7 @@ static size_t ipip_get_size(const struct net_device *dev)</div><div class='ctx'> static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm *parm = &amp;tunnel-&gt;parms;</div><div class='add'>+	struct ip_tunnel_parm_kern *parm = &amp;tunnel-&gt;parms;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm-&gt;link) ||</div><div class='ctx'> 	    nla_put_in_addr(skb, IFLA_IPTUN_LOCAL, parm-&gt;iph.saddr) ||</div><div class='hunk'>@@ -659,14 +629,15 @@ static int __net_init ipip_init_net(struct net *net)</div><div class='ctx'> 	return ip_tunnel_init_net(net, ipip_net_id, &amp;ipip_link_ops, "tunl0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ipip_exit_batch_net(struct list_head *list_net)</div><div class='add'>+static void __net_exit ipip_exit_rtnl(struct net *net,</div><div class='add'>+				      struct list_head *dev_to_kill)</div><div class='ctx'> {</div><div class='del'>-	ip_tunnel_delete_nets(list_net, ipip_net_id, &amp;ipip_link_ops);</div><div class='add'>+	ip_tunnel_delete_net(net, ipip_net_id, &amp;ipip_link_ops, dev_to_kill);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ipip_net_ops = {</div><div class='ctx'> 	.init = ipip_init_net,</div><div class='del'>-	.exit_batch = ipip_exit_batch_net,</div><div class='add'>+	.exit_rtnl = ipip_exit_rtnl,</div><div class='ctx'> 	.id   = &amp;ipip_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip_tunnel_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -701,7 +672,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> rtnl_link_failed:</div><div class='ctx'> #if IS_ENABLED(CONFIG_MPLS)</div><div class='del'>-	xfrm4_tunnel_deregister(&amp;mplsip_handler, AF_INET);</div><div class='add'>+	xfrm4_tunnel_deregister(&amp;mplsip_handler, AF_MPLS);</div><div class='ctx'> xfrm_tunnel_mplsip_failed:</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -725,6 +696,7 @@ static void __exit ipip_fini(void)</div><div class='ctx'> </div><div class='ctx'> module_init(ipip_init);</div><div class='ctx'> module_exit(ipip_fini);</div><div class='add'>+MODULE_DESCRIPTION("IP/IP protocol decoder library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("ipip");</div><div class='ctx'> MODULE_ALIAS_NETDEV("tunl0");</div><div class='head'>diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c<br/>index 5660adcf7a04..ca9eaee4c2ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipmr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipmr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipmr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ipmr.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IP multicast routing support for mrouted 3.6/3.8</div><div class='ctx'>  *</div><div class='ctx'>  *		(c) 1995 Alan Cox, &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'>  *	  Linux Consultancy and Custom Driver Development</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Fixes:</div><div class='ctx'>  *	Michael Chastain	:	Incorrect size of copying.</div><div class='ctx'>  *	Alan Cox		:	Added the cache manager code</div><div class='hunk'>@@ -23,7 +19,6 @@</div><div class='ctx'>  *      Carlos Picoto           :       PIMv1 Support</div><div class='ctx'>  *	Pavlin Ivanov Radoslavov:	PIMv2 Registers must checksum only PIM header</div><div class='ctx'>  *					Relax this requirement to work with older peers.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -47,6 +42,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -66,8 +62,10 @@</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='ctx'> #include &lt;linux/netconf.h&gt;</div><div class='del'>-#include &lt;net/nexthop.h&gt;</div><div class='del'>-#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;net/rtnh.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ipmr_rule {</div><div class='ctx'> 	struct fib_rule		common;</div><div class='hunk'>@@ -81,7 +79,12 @@ struct ipmr_result {</div><div class='ctx'>  * Note that the changes are semaphored via rtnl_lock.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static DEFINE_RWLOCK(mrt_lock);</div><div class='add'>+static DEFINE_SPINLOCK(mrt_lock);</div><div class='add'>+</div><div class='add'>+static struct net_device *vif_dev_read(const struct vif_device *vif)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference(vif-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Multicast router control variables */</div><div class='ctx'> </div><div class='hunk'>@@ -104,17 +107,19 @@ static void ipmr_free_table(struct mr_table *mrt);</div><div class='ctx'> static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			  struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 			  struct mfc_cache *cache, int local);</div><div class='del'>-static int ipmr_cache_report(struct mr_table *mrt,</div><div class='add'>+static int ipmr_cache_report(const struct mr_table *mrt,</div><div class='ctx'> 			     struct sk_buff *pkt, vifi_t vifi, int assert);</div><div class='ctx'> static void mroute_netlink_event(struct mr_table *mrt, struct mfc_cache *mfc,</div><div class='ctx'> 				 int cmd);</div><div class='del'>-static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt);</div><div class='del'>-static void mroute_clean_tables(struct mr_table *mrt, bool all);</div><div class='add'>+static void igmpmsg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt);</div><div class='add'>+static void mroute_clean_tables(struct mr_table *mrt, int flags);</div><div class='ctx'> static void ipmr_expire_process(struct timer_list *t);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES</div><div class='del'>-#define ipmr_for_each_table(mrt, net) \</div><div class='del'>-	list_for_each_entry_rcu(mrt, &amp;net-&gt;ipv4.mr_tables, list)</div><div class='add'>+#define ipmr_for_each_table(mrt, net)					\</div><div class='add'>+	list_for_each_entry_rcu(mrt, &amp;net-&gt;ipv4.mr_tables, list,	\</div><div class='add'>+				lockdep_rtnl_is_held() ||		\</div><div class='add'>+				list_empty(&amp;net-&gt;ipv4.mr_tables))</div><div class='ctx'> </div><div class='ctx'> static struct mr_table *ipmr_mr_table_iter(struct net *net,</div><div class='ctx'> 					   struct mr_table *mrt)</div><div class='hunk'>@@ -133,7 +138,7 @@ static struct mr_table *ipmr_mr_table_iter(struct net *net,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mr_table *ipmr_get_table(struct net *net, u32 id)</div><div class='add'>+static struct mr_table *__ipmr_get_table(struct net *net, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='hunk'>@@ -144,6 +149,16 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct mr_table *ipmr_get_table(struct net *net, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct mr_table *mrt;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ipmr_get_table(net, id);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return mrt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4,</div><div class='ctx'> 			   struct mr_table **mrt)</div><div class='ctx'> {</div><div class='hunk'>@@ -185,7 +200,7 @@ static int ipmr_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;table = fib_rule_get_table(rule, arg);</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(rule-&gt;fr_net, arg-&gt;table);</div><div class='add'>+	mrt = __ipmr_get_table(rule-&gt;fr_net, arg-&gt;table);</div><div class='ctx'> 	if (!mrt)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	res-&gt;mrt = mrt;</div><div class='hunk'>@@ -197,10 +212,6 @@ static int ipmr_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy ipmr_rule_policy[FRA_MAX + 1] = {</div><div class='del'>-	FRA_GENERIC_POLICY,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int ipmr_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 			       struct fib_rule_hdr *frh, struct nlattr **tb,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -233,7 +244,6 @@ static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = {</div><div class='ctx'> 	.compare	= ipmr_rule_compare,</div><div class='ctx'> 	.fill		= ipmr_rule_fill,</div><div class='ctx'> 	.nlgroup	= RTNLGRP_IPV4_RULE,</div><div class='del'>-	.policy		= ipmr_rule_policy,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +265,7 @@ static int __net_init ipmr_rules_init(struct net *net)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -263,7 +273,9 @@ static int __net_init ipmr_rules_init(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err2:</div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	ipmr_free_table(mrt);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> err1:</div><div class='ctx'> 	fib_rules_unregister(ops);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -273,21 +285,21 @@ static void __net_exit ipmr_rules_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt, *next;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	list_for_each_entry_safe(mrt, next, &amp;net-&gt;ipv4.mr_tables, list) {</div><div class='ctx'> 		list_del(&amp;mrt-&gt;list);</div><div class='ctx'> 		ipmr_free_table(mrt);</div><div class='ctx'> 	}</div><div class='ctx'> 	fib_rules_unregister(net-&gt;ipv4.mr_rules_ops);</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipmr_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ipmr_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return fib_rules_dump(net, nb, RTNL_FAMILY_IPMR);</div><div class='add'>+	return fib_rules_dump(net, nb, RTNL_FAMILY_IPMR, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ipmr_rules_seq_read(struct net *net)</div><div class='add'>+static unsigned int ipmr_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return fib_rules_seq_read(net, RTNL_FAMILY_IPMR);</div><div class='ctx'> }</div><div class='hunk'>@@ -314,6 +326,8 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id)</div><div class='ctx'> 	return net-&gt;ipv4.mrt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __ipmr_get_table ipmr_get_table</div><div class='add'>+</div><div class='ctx'> static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4,</div><div class='ctx'> 			   struct mr_table **mrt)</div><div class='ctx'> {</div><div class='hunk'>@@ -334,18 +348,18 @@ static int __net_init ipmr_rules_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> static void __net_exit ipmr_rules_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	ipmr_free_table(net-&gt;ipv4.mrt);</div><div class='ctx'> 	net-&gt;ipv4.mrt = NULL;</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipmr_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ipmr_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ipmr_rules_seq_read(struct net *net)</div><div class='add'>+static unsigned int ipmr_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -361,7 +375,7 @@ static inline int ipmr_hash_cmp(struct rhashtable_compare_arg *arg,</div><div class='ctx'> 				const void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mfc_cache_cmp_arg *cmparg = arg-&gt;key;</div><div class='del'>-	struct mfc_cache *c = (struct mfc_cache *)ptr;</div><div class='add'>+	const struct mfc_cache *c = ptr;</div><div class='ctx'> </div><div class='ctx'> 	return cmparg-&gt;mfc_mcastgrp != c-&gt;mfc_mcastgrp ||</div><div class='ctx'> 	       cmparg-&gt;mfc_origin != c-&gt;mfc_origin;</div><div class='hunk'>@@ -372,7 +386,6 @@ static const struct rhashtable_params ipmr_rht_params = {</div><div class='ctx'> 	.key_offset = offsetof(struct mfc_cache, cmparg),</div><div class='ctx'> 	.key_len = sizeof(struct mfc_cache_cmp_arg),</div><div class='ctx'> 	.nelem_hint = 3,</div><div class='del'>-	.locks_mul = 1,</div><div class='ctx'> 	.obj_cmpfn = ipmr_hash_cmp,</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='ctx'> };</div><div class='hunk'>@@ -403,7 +416,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)</div><div class='ctx'> 	if (id != RT_TABLE_DEFAULT &amp;&amp; id &gt;= 1000000000)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(net, id);</div><div class='add'>+	mrt = __ipmr_get_table(net, id);</div><div class='ctx'> 	if (mrt)</div><div class='ctx'> 		return mrt;</div><div class='ctx'> </div><div class='hunk'>@@ -413,45 +426,19 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)</div><div class='ctx'> </div><div class='ctx'> static void ipmr_free_table(struct mr_table *mrt)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='del'>-	mroute_clean_tables(mrt, true);</div><div class='add'>+	struct net *net = read_pnet(&amp;mrt-&gt;net);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!mr_can_free_table(net));</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='add'>+	mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC |</div><div class='add'>+				 MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC);</div><div class='ctx'> 	rhltable_destroy(&amp;mrt-&gt;mfc_hash);</div><div class='ctx'> 	kfree(mrt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */</div><div class='ctx'> </div><div class='del'>-static void ipmr_del_tunnel(struct net_device *dev, struct vifctl *v)</div><div class='del'>-{</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	dev_close(dev);</div><div class='del'>-</div><div class='del'>-	dev = __dev_get_by_name(net, "tunl0");</div><div class='del'>-	if (dev) {</div><div class='del'>-		const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='del'>-		struct ifreq ifr;</div><div class='del'>-		struct ip_tunnel_parm p;</div><div class='del'>-</div><div class='del'>-		memset(&amp;p, 0, sizeof(p));</div><div class='del'>-		p.iph.daddr = v-&gt;vifc_rmt_addr.s_addr;</div><div class='del'>-		p.iph.saddr = v-&gt;vifc_lcl_addr.s_addr;</div><div class='del'>-		p.iph.version = 4;</div><div class='del'>-		p.iph.ihl = 5;</div><div class='del'>-		p.iph.protocol = IPPROTO_IPIP;</div><div class='del'>-		sprintf(p.name, "dvmrp%d", v-&gt;vifc_vifi);</div><div class='del'>-		ifr.ifr_ifru.ifru_data = (__force void __user *)&amp;p;</div><div class='del'>-</div><div class='del'>-		if (ops-&gt;ndo_do_ioctl) {</div><div class='del'>-			mm_segment_t oldfs = get_fs();</div><div class='del'>-</div><div class='del'>-			set_fs(KERNEL_DS);</div><div class='del'>-			ops-&gt;ndo_do_ioctl(dev, &amp;ifr, SIOCDELTUNNEL);</div><div class='del'>-			set_fs(oldfs);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Initialize ipmr pimreg/tunnel in_device */</div><div class='ctx'> static bool ipmr_init_vif_indev(const struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -471,51 +458,52 @@ static bool ipmr_init_vif_indev(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)</div><div class='ctx'> {</div><div class='del'>-	struct net_device  *dev;</div><div class='del'>-</div><div class='del'>-	dev = __dev_get_by_name(net, "tunl0");</div><div class='del'>-</div><div class='del'>-	if (dev) {</div><div class='del'>-		const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='del'>-		int err;</div><div class='del'>-		struct ifreq ifr;</div><div class='del'>-		struct ip_tunnel_parm p;</div><div class='add'>+	struct net_device *tunnel_dev, *new_dev;</div><div class='add'>+	struct ip_tunnel_parm_kern p = { };</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		memset(&amp;p, 0, sizeof(p));</div><div class='del'>-		p.iph.daddr = v-&gt;vifc_rmt_addr.s_addr;</div><div class='del'>-		p.iph.saddr = v-&gt;vifc_lcl_addr.s_addr;</div><div class='del'>-		p.iph.version = 4;</div><div class='del'>-		p.iph.ihl = 5;</div><div class='del'>-		p.iph.protocol = IPPROTO_IPIP;</div><div class='del'>-		sprintf(p.name, "dvmrp%d", v-&gt;vifc_vifi);</div><div class='del'>-		ifr.ifr_ifru.ifru_data = (__force void __user *)&amp;p;</div><div class='add'>+	tunnel_dev = __dev_get_by_name(net, "tunl0");</div><div class='add'>+	if (!tunnel_dev)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		if (ops-&gt;ndo_do_ioctl) {</div><div class='del'>-			mm_segment_t oldfs = get_fs();</div><div class='add'>+	p.iph.daddr = v-&gt;vifc_rmt_addr.s_addr;</div><div class='add'>+	p.iph.saddr = v-&gt;vifc_lcl_addr.s_addr;</div><div class='add'>+	p.iph.version = 4;</div><div class='add'>+	p.iph.ihl = 5;</div><div class='add'>+	p.iph.protocol = IPPROTO_IPIP;</div><div class='add'>+	sprintf(p.name, "dvmrp%d", v-&gt;vifc_vifi);</div><div class='ctx'> </div><div class='del'>-			set_fs(KERNEL_DS);</div><div class='del'>-			err = ops-&gt;ndo_do_ioctl(dev, &amp;ifr, SIOCADDTUNNEL);</div><div class='del'>-			set_fs(oldfs);</div><div class='del'>-		} else {</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-		dev = NULL;</div><div class='add'>+	if (!tunnel_dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl)</div><div class='add'>+		goto out;</div><div class='add'>+	err = tunnel_dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl(tunnel_dev, &amp;p,</div><div class='add'>+			SIOCADDTUNNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		if (err == 0 &amp;&amp;</div><div class='del'>-		    (dev = __dev_get_by_name(net, p.name)) != NULL) {</div><div class='del'>-			dev-&gt;flags |= IFF_MULTICAST;</div><div class='del'>-			if (!ipmr_init_vif_indev(dev))</div><div class='del'>-				goto failure;</div><div class='del'>-			if (dev_open(dev))</div><div class='del'>-				goto failure;</div><div class='del'>-			dev_hold(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return dev;</div><div class='add'>+	new_dev = __dev_get_by_name(net, p.name);</div><div class='add'>+	if (!new_dev)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-failure:</div><div class='del'>-	unregister_netdevice(dev);</div><div class='del'>-	return NULL;</div><div class='add'>+	new_dev-&gt;flags |= IFF_MULTICAST;</div><div class='add'>+	if (!ipmr_init_vif_indev(new_dev))</div><div class='add'>+		goto out_unregister;</div><div class='add'>+	if (dev_open(new_dev, NULL))</div><div class='add'>+		goto out_unregister;</div><div class='add'>+	dev_hold(new_dev);</div><div class='add'>+	err = dev_set_allmulti(new_dev, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_close(new_dev);</div><div class='add'>+		tunnel_dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl(tunnel_dev, &amp;p,</div><div class='add'>+				SIOCDELTUNNEL);</div><div class='add'>+		dev_put(new_dev);</div><div class='add'>+		new_dev = ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+	return new_dev;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	unregister_netdevice(new_dev);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(-ENOBUFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)</div><div class='hunk'>@@ -536,11 +524,15 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	ipmr_cache_report(mrt, skb, mrt-&gt;mroute_reg_vif_num, IGMPMSG_WHOLEPKT);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	DEV_STATS_ADD(dev, tx_bytes, skb-&gt;len);</div><div class='add'>+	DEV_STATS_INC(dev, tx_packets);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* Pairs with WRITE_ONCE() in vif_add() and vif_delete() */</div><div class='add'>+	ipmr_cache_report(mrt, skb, READ_ONCE(mrt-&gt;mroute_reg_vif_num),</div><div class='add'>+			  IGMPMSG_WHOLEPKT);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -562,7 +554,7 @@ static void reg_vif_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;reg_vif_netdev_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	dev-&gt;netns_immutable	= true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt)</div><div class='hunk'>@@ -589,7 +581,7 @@ static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt)</div><div class='ctx'> </div><div class='ctx'> 	if (!ipmr_init_vif_indev(dev))</div><div class='ctx'> 		goto failure;</div><div class='del'>-	if (dev_open(dev))</div><div class='add'>+	if (dev_open(dev, NULL))</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='ctx'> 	dev_hold(dev);</div><div class='hunk'>@@ -607,6 +599,7 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *reg_dev = NULL;</div><div class='ctx'> 	struct iphdr *encap;</div><div class='add'>+	int vif_num;</div><div class='ctx'> </div><div class='ctx'> 	encap = (struct iphdr *)(skb_transport_header(skb) + pimlen);</div><div class='ctx'> 	/* Check that:</div><div class='hunk'>@@ -619,11 +612,10 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb,</div><div class='ctx'> 	    ntohs(encap-&gt;tot_len) + pimlen &gt; skb-&gt;len)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='del'>-	if (mrt-&gt;mroute_reg_vif_num &gt;= 0)</div><div class='del'>-		reg_dev = mrt-&gt;vif_table[mrt-&gt;mroute_reg_vif_num].dev;</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='del'>-</div><div class='add'>+	/* Pairs with WRITE_ONCE() in vif_add()/vid_delete() */</div><div class='add'>+	vif_num = READ_ONCE(mrt-&gt;mroute_reg_vif_num);</div><div class='add'>+	if (vif_num &gt;= 0)</div><div class='add'>+		reg_dev = vif_dev_read(&amp;mrt-&gt;vif_table[vif_num]);</div><div class='ctx'> 	if (!reg_dev)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -649,10 +641,11 @@ static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt)</div><div class='ctx'> static int call_ipmr_vif_entry_notifiers(struct net *net,</div><div class='ctx'> 					 enum fib_event_type event_type,</div><div class='ctx'> 					 struct vif_device *vif,</div><div class='add'>+					 struct net_device *vif_dev,</div><div class='ctx'> 					 vifi_t vif_index, u32 tb_id)</div><div class='ctx'> {</div><div class='ctx'> 	return mr_call_vif_notifiers(net, RTNL_FAMILY_IPMR, event_type,</div><div class='del'>-				     vif, vif_index, tb_id,</div><div class='add'>+				     vif, vif_dev, vif_index, tb_id,</div><div class='ctx'> 				     &amp;net-&gt;ipv4.ipmr_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -666,7 +659,10 @@ static int call_ipmr_mfc_entry_notifiers(struct net *net,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	vif_delete - Delete a VIF entry</div><div class='add'>+ *	@mrt: Table to delete from</div><div class='add'>+ *	@vifi: VIF identifier to delete</div><div class='ctx'>  *	@notify: Set to 1, if the caller is a notifier_call</div><div class='add'>+ *	@head: if unregistering the VIF, place it on this queue</div><div class='ctx'>  */</div><div class='ctx'> static int vif_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> 		      struct list_head *head)</div><div class='hunk'>@@ -681,22 +677,19 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> </div><div class='ctx'> 	v = &amp;mrt-&gt;vif_table[vifi];</div><div class='ctx'> </div><div class='del'>-	if (VIF_EXISTS(mrt, vifi))</div><div class='del'>-		call_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_DEL, v, vifi,</div><div class='del'>-					      mrt-&gt;id);</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;mrt_lock);</div><div class='del'>-	dev = v-&gt;dev;</div><div class='del'>-	v-&gt;dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+	dev = rtnl_dereference(v-&gt;dev);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (vifi == mrt-&gt;mroute_reg_vif_num)</div><div class='del'>-		mrt-&gt;mroute_reg_vif_num = -1;</div><div class='add'>+	spin_lock(&amp;mrt_lock);</div><div class='add'>+	call_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_DEL, v, dev,</div><div class='add'>+				      vifi, mrt-&gt;id);</div><div class='add'>+	RCU_INIT_POINTER(v-&gt;dev, NULL);</div><div class='ctx'> </div><div class='add'>+	if (vifi == mrt-&gt;mroute_reg_vif_num) {</div><div class='add'>+		/* Pairs with READ_ONCE() in ipmr_cache_report() and reg_vif_xmit() */</div><div class='add'>+		WRITE_ONCE(mrt-&gt;mroute_reg_vif_num, -1);</div><div class='add'>+	}</div><div class='ctx'> 	if (vifi + 1 == mrt-&gt;maxvif) {</div><div class='ctx'> 		int tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -704,10 +697,10 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> 			if (VIF_EXISTS(mrt, tmp))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		mrt-&gt;maxvif = tmp+1;</div><div class='add'>+		WRITE_ONCE(mrt-&gt;maxvif, tmp + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+	spin_unlock(&amp;mrt_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev_set_allmulti(dev, -1);</div><div class='ctx'> </div><div class='hunk'>@@ -723,7 +716,7 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> 	if (v-&gt;flags &amp; (VIFF_TUNNEL | VIFF_REGISTER) &amp;&amp; !notify)</div><div class='ctx'> 		unregister_netdevice_queue(dev, head);</div><div class='ctx'> </div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;v-&gt;dev_tracker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -773,7 +766,7 @@ static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c)</div><div class='ctx'> /* Timer process for the unresolved queue. */</div><div class='ctx'> static void ipmr_expire_process(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mr_table *mrt = from_timer(mrt, t, ipmr_expire_timer);</div><div class='add'>+	struct mr_table *mrt = timer_container_of(mrt, t, ipmr_expire_timer);</div><div class='ctx'> 	struct mr_mfc *c, *next;</div><div class='ctx'> 	unsigned long expires;</div><div class='ctx'> 	unsigned long now;</div><div class='hunk'>@@ -809,7 +802,7 @@ out:</div><div class='ctx'> 	spin_unlock(&amp;mfc_unres_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Fill oifs list. It is called under write locked mrt_lock. */</div><div class='add'>+/* Fill oifs list. It is called under locked mrt_lock. */</div><div class='ctx'> static void ipmr_update_thresholds(struct mr_table *mrt, struct mr_mfc *cache,</div><div class='ctx'> 				   unsigned char *ttls)</div><div class='ctx'> {</div><div class='hunk'>@@ -829,16 +822,14 @@ static void ipmr_update_thresholds(struct mr_table *mrt, struct mr_mfc *cache,</div><div class='ctx'> 				cache-&gt;mfc_un.res.maxvif = vifi + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	cache-&gt;mfc_un.res.lastuse = jiffies;</div><div class='add'>+	WRITE_ONCE(cache-&gt;mfc_un.res.lastuse, jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vif_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		   struct vifctl *vifc, int mrtsock)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_phys_item_id ppid = { };</div><div class='ctx'> 	int vifi = vifc-&gt;vifc_vifi;</div><div class='del'>-	struct switchdev_attr attr = {</div><div class='del'>-		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,</div><div class='del'>-	};</div><div class='ctx'> 	struct vif_device *v = &amp;mrt-&gt;vif_table[vifi];</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='hunk'>@@ -869,14 +860,8 @@ static int vif_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIFF_TUNNEL:</div><div class='ctx'> 		dev = ipmr_new_tunnel(net, vifc);</div><div class='del'>-		if (!dev)</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		err = dev_set_allmulti(dev, 1);</div><div class='del'>-		if (err) {</div><div class='del'>-			ipmr_del_tunnel(dev, vifc);</div><div class='del'>-			dev_put(dev);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(dev))</div><div class='add'>+			return PTR_ERR(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIFF_USE_IFINDEX:</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -917,10 +902,10 @@ static int vif_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			vifc-&gt;vifc_flags | (!mrtsock ? VIFF_STATIC : 0),</div><div class='ctx'> 			(VIFF_TUNNEL | VIFF_REGISTER));</div><div class='ctx'> </div><div class='del'>-	attr.orig_dev = dev;</div><div class='del'>-	if (!switchdev_port_attr_get(dev, &amp;attr)) {</div><div class='del'>-		memcpy(v-&gt;dev_parent_id.id, attr.u.ppid.id, attr.u.ppid.id_len);</div><div class='del'>-		v-&gt;dev_parent_id.id_len = attr.u.ppid.id_len;</div><div class='add'>+	err = netif_get_port_parent_id(dev, &amp;ppid, true);</div><div class='add'>+	if (err == 0) {</div><div class='add'>+		memcpy(v-&gt;dev_parent_id.id, ppid.id, ppid.id_len);</div><div class='add'>+		v-&gt;dev_parent_id.id_len = ppid.id_len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		v-&gt;dev_parent_id.id_len = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -929,14 +914,18 @@ static int vif_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	v-&gt;remote = vifc-&gt;vifc_rmt_addr.s_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* And finish update writing critical data */</div><div class='del'>-	write_lock_bh(&amp;mrt_lock);</div><div class='del'>-	v-&gt;dev = dev;</div><div class='del'>-	if (v-&gt;flags &amp; VIFF_REGISTER)</div><div class='del'>-		mrt-&gt;mroute_reg_vif_num = vifi;</div><div class='add'>+	spin_lock(&amp;mrt_lock);</div><div class='add'>+	rcu_assign_pointer(v-&gt;dev, dev);</div><div class='add'>+	netdev_tracker_alloc(dev, &amp;v-&gt;dev_tracker, GFP_ATOMIC);</div><div class='add'>+	if (v-&gt;flags &amp; VIFF_REGISTER) {</div><div class='add'>+		/* Pairs with READ_ONCE() in ipmr_cache_report() and reg_vif_xmit() */</div><div class='add'>+		WRITE_ONCE(mrt-&gt;mroute_reg_vif_num, vifi);</div><div class='add'>+	}</div><div class='ctx'> 	if (vifi+1 &gt; mrt-&gt;maxvif)</div><div class='del'>-		mrt-&gt;maxvif = vifi+1;</div><div class='del'>-	write_unlock_bh(&amp;mrt_lock);</div><div class='del'>-	call_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_ADD, v, vifi, mrt-&gt;id);</div><div class='add'>+		WRITE_ONCE(mrt-&gt;maxvif, vifi + 1);</div><div class='add'>+	spin_unlock(&amp;mrt_lock);</div><div class='add'>+	call_ipmr_vif_entry_notifiers(net, FIB_EVENT_VIF_ADD, v, dev,</div><div class='add'>+				      vifi, mrt-&gt;id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1033,16 +1022,18 @@ static void ipmr_cache_resolve(struct net *net, struct mr_table *mrt,</div><div class='ctx'> </div><div class='ctx'> 			rtnl_unicast(skb, net, NETLINK_CB(skb).portid);</div><div class='ctx'> 		} else {</div><div class='add'>+			rcu_read_lock();</div><div class='ctx'> 			ip_mr_forward(net, mrt, skb-&gt;dev, skb, c, 0);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Bounce a cache query up to mrouted and netlink.</div><div class='ctx'>  *</div><div class='del'>- * Called under mrt_lock.</div><div class='add'>+ * Called under rcu_read_lock().</div><div class='ctx'>  */</div><div class='del'>-static int ipmr_cache_report(struct mr_table *mrt,</div><div class='add'>+static int ipmr_cache_report(const struct mr_table *mrt,</div><div class='ctx'> 			     struct sk_buff *pkt, vifi_t vifi, int assert)</div><div class='ctx'> {</div><div class='ctx'> 	const int ihl = ip_hdrlen(pkt);</div><div class='hunk'>@@ -1052,6 +1043,10 @@ static int ipmr_cache_report(struct mr_table *mrt,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mroute_sk = rcu_dereference(mrt-&gt;mroute_sk);</div><div class='add'>+	if (!mroute_sk)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (assert == IGMPMSG_WHOLEPKT || assert == IGMPMSG_WRVIFWHOLE)</div><div class='ctx'> 		skb = skb_realloc_headroom(pkt, sizeof(struct iphdr));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1073,10 +1068,16 @@ static int ipmr_cache_report(struct mr_table *mrt,</div><div class='ctx'> 		memcpy(msg, skb_network_header(pkt), sizeof(struct iphdr));</div><div class='ctx'> 		msg-&gt;im_msgtype = assert;</div><div class='ctx'> 		msg-&gt;im_mbz = 0;</div><div class='del'>-		if (assert == IGMPMSG_WRVIFWHOLE)</div><div class='add'>+		if (assert == IGMPMSG_WRVIFWHOLE) {</div><div class='ctx'> 			msg-&gt;im_vif = vifi;</div><div class='del'>-		else</div><div class='del'>-			msg-&gt;im_vif = mrt-&gt;mroute_reg_vif_num;</div><div class='add'>+			msg-&gt;im_vif_hi = vifi &gt;&gt; 8;</div><div class='add'>+		} else {</div><div class='add'>+			/* Pairs with WRITE_ONCE() in vif_add() and vif_delete() */</div><div class='add'>+			int vif_num = READ_ONCE(mrt-&gt;mroute_reg_vif_num);</div><div class='add'>+</div><div class='add'>+			msg-&gt;im_vif = vif_num;</div><div class='add'>+			msg-&gt;im_vif_hi = vif_num &gt;&gt; 8;</div><div class='add'>+		}</div><div class='ctx'> 		ip_hdr(skb)-&gt;ihl = sizeof(struct iphdr) &gt;&gt; 2;</div><div class='ctx'> 		ip_hdr(skb)-&gt;tot_len = htons(ntohs(ip_hdr(pkt)-&gt;tot_len) +</div><div class='ctx'> 					     sizeof(struct iphdr));</div><div class='hunk'>@@ -1089,7 +1090,9 @@ static int ipmr_cache_report(struct mr_table *mrt,</div><div class='ctx'> 		ip_hdr(skb)-&gt;protocol = 0;</div><div class='ctx'> 		msg = (struct igmpmsg *)skb_network_header(skb);</div><div class='ctx'> 		msg-&gt;im_vif = vifi;</div><div class='del'>-		skb_dst_set(skb, dst_clone(skb_dst(pkt)));</div><div class='add'>+		msg-&gt;im_vif_hi = vifi &gt;&gt; 8;</div><div class='add'>+		ipv4_pktinfo_prepare(mroute_sk, pkt, false);</div><div class='add'>+		memcpy(skb-&gt;cb, pkt-&gt;cb, sizeof(skb-&gt;cb));</div><div class='ctx'> 		/* Add our header */</div><div class='ctx'> 		igmp = skb_put(skb, sizeof(struct igmphdr));</div><div class='ctx'> 		igmp-&gt;type = assert;</div><div class='hunk'>@@ -1099,19 +1102,11 @@ static int ipmr_cache_report(struct mr_table *mrt,</div><div class='ctx'> 		skb-&gt;transport_header = skb-&gt;network_header;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	mroute_sk = rcu_dereference(mrt-&gt;mroute_sk);</div><div class='del'>-	if (!mroute_sk) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	igmpmsg_netlink_event(mrt, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Deliver to mrouted */</div><div class='ctx'> 	ret = sock_queue_rcv_skb(mroute_sk, skb);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		net_warn_ratelimited("mroute: pending queue full, dropping entries\n");</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -1121,6 +1116,7 @@ static int ipmr_cache_report(struct mr_table *mrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Queue a packet for resolution. It gets locked cache entry! */</div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='ctx'> static int ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi,</div><div class='ctx'> 				 struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1140,8 +1136,8 @@ static int ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi,</div><div class='ctx'> </div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		/* Create a new entry if allowable */</div><div class='del'>-		if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) &gt;= 10 ||</div><div class='del'>-		    (c = ipmr_cache_alloc_unres()) == NULL) {</div><div class='add'>+		c = ipmr_cache_alloc_unres();</div><div class='add'>+		if (!c) {</div><div class='ctx'> 			spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> </div><div class='ctx'> 			kfree_skb(skb);</div><div class='hunk'>@@ -1233,12 +1229,12 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 				   mfc-&gt;mfcc_mcastgrp.s_addr, parent);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (c) {</div><div class='del'>-		write_lock_bh(&amp;mrt_lock);</div><div class='add'>+		spin_lock(&amp;mrt_lock);</div><div class='ctx'> 		c-&gt;_c.mfc_parent = mfc-&gt;mfcc_parent;</div><div class='ctx'> 		ipmr_update_thresholds(mrt, &amp;c-&gt;_c, mfc-&gt;mfcc_ttls);</div><div class='ctx'> 		if (!mrtsock)</div><div class='ctx'> 			c-&gt;_c.mfc_flags |= MFC_STATIC;</div><div class='del'>-		write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+		spin_unlock(&amp;mrt_lock);</div><div class='ctx'> 		call_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, c,</div><div class='ctx'> 					      mrt-&gt;id);</div><div class='ctx'> 		mroute_netlink_event(mrt, c, RTM_NEWROUTE);</div><div class='hunk'>@@ -1284,7 +1280,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (list_empty(&amp;mrt-&gt;mfc_unres_queue))</div><div class='del'>-		del_timer(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='add'>+		timer_delete(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='ctx'> 	spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (found) {</div><div class='hunk'>@@ -1297,7 +1293,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Close the multicast socket, and clear the vif tables etc */</div><div class='del'>-static void mroute_clean_tables(struct mr_table *mrt, bool all)</div><div class='add'>+static void mroute_clean_tables(struct mr_table *mrt, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = read_pnet(&amp;mrt-&gt;net);</div><div class='ctx'> 	struct mr_mfc *c, *tmp;</div><div class='hunk'>@@ -1306,40 +1302,49 @@ static void mroute_clean_tables(struct mr_table *mrt, bool all)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Shut down all active vif entries */</div><div class='del'>-	for (i = 0; i &lt; mrt-&gt;maxvif; i++) {</div><div class='del'>-		if (!all &amp;&amp; (mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC))</div><div class='del'>-			continue;</div><div class='del'>-		vif_delete(mrt, i, 0, &amp;list);</div><div class='add'>+	if (flags &amp; (MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC)) {</div><div class='add'>+		for (i = 0; i &lt; mrt-&gt;maxvif; i++) {</div><div class='add'>+			if (((mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC) &amp;&amp;</div><div class='add'>+			     !(flags &amp; MRT_FLUSH_VIFS_STATIC)) ||</div><div class='add'>+			    (!(mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC) &amp;&amp; !(flags &amp; MRT_FLUSH_VIFS)))</div><div class='add'>+				continue;</div><div class='add'>+			vif_delete(mrt, i, 0, &amp;list);</div><div class='add'>+		}</div><div class='add'>+		unregister_netdevice_many(&amp;list);</div><div class='ctx'> 	}</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='ctx'> </div><div class='ctx'> 	/* Wipe the cache */</div><div class='del'>-	list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='del'>-		if (!all &amp;&amp; (c-&gt;mfc_flags &amp; MFC_STATIC))</div><div class='del'>-			continue;</div><div class='del'>-		rhltable_remove(&amp;mrt-&gt;mfc_hash, &amp;c-&gt;mnode, ipmr_rht_params);</div><div class='del'>-		list_del_rcu(&amp;c-&gt;list);</div><div class='del'>-		cache = (struct mfc_cache *)c;</div><div class='del'>-		call_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, cache,</div><div class='del'>-					      mrt-&gt;id);</div><div class='del'>-		mroute_netlink_event(mrt, cache, RTM_DELROUTE);</div><div class='del'>-		mr_cache_put(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) != 0) {</div><div class='del'>-		spin_lock_bh(&amp;mfc_unres_lock);</div><div class='del'>-		list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='del'>-			list_del(&amp;c-&gt;list);</div><div class='add'>+	if (flags &amp; (MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC)) {</div><div class='add'>+		list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='add'>+			if (((c-&gt;mfc_flags &amp; MFC_STATIC) &amp;&amp; !(flags &amp; MRT_FLUSH_MFC_STATIC)) ||</div><div class='add'>+			    (!(c-&gt;mfc_flags &amp; MFC_STATIC) &amp;&amp; !(flags &amp; MRT_FLUSH_MFC)))</div><div class='add'>+				continue;</div><div class='add'>+			rhltable_remove(&amp;mrt-&gt;mfc_hash, &amp;c-&gt;mnode, ipmr_rht_params);</div><div class='add'>+			list_del_rcu(&amp;c-&gt;list);</div><div class='ctx'> 			cache = (struct mfc_cache *)c;</div><div class='add'>+			call_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, cache,</div><div class='add'>+						      mrt-&gt;id);</div><div class='ctx'> 			mroute_netlink_event(mrt, cache, RTM_DELROUTE);</div><div class='del'>-			ipmr_destroy_unres(mrt, cache);</div><div class='add'>+			mr_cache_put(c);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MRT_FLUSH_MFC) {</div><div class='add'>+		if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) != 0) {</div><div class='add'>+			spin_lock_bh(&amp;mfc_unres_lock);</div><div class='add'>+			list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='add'>+				list_del(&amp;c-&gt;list);</div><div class='add'>+				cache = (struct mfc_cache *)c;</div><div class='add'>+				mroute_netlink_event(mrt, cache, RTM_DELROUTE);</div><div class='add'>+				ipmr_destroy_unres(mrt, cache);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called from ip_ra_control(), before an RCU grace period,</div><div class='del'>- * we dont need to call synchronize_rcu() here</div><div class='add'>+ * we don't need to call synchronize_rcu() here</div><div class='ctx'>  */</div><div class='ctx'> static void mrtsock_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -1355,7 +1360,7 @@ static void mrtsock_destruct(struct sock *sk)</div><div class='ctx'> 						    NETCONFA_IFINDEX_ALL,</div><div class='ctx'> 						    net-&gt;ipv4.devconf_all);</div><div class='ctx'> 			RCU_INIT_POINTER(mrt-&gt;mroute_sk, NULL);</div><div class='del'>-			mroute_clean_tables(mrt, false);</div><div class='add'>+			mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_MFC);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -1367,7 +1372,7 @@ static void mrtsock_destruct(struct sock *sk)</div><div class='ctx'>  * MOSPF/PIM router set up we can clean this up.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='add'>+int ip_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval,</div><div class='ctx'> 			 unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='hunk'>@@ -1386,7 +1391,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(net, raw_sk(sk)-&gt;ipmr_table ? : RT_TABLE_DEFAULT);</div><div class='add'>+	mrt = __ipmr_get_table(net, raw_sk(sk)-&gt;ipmr_table ? : RT_TABLE_DEFAULT);</div><div class='ctx'> 	if (!mrt) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -1439,7 +1444,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;vif, optval, sizeof(vif))) {</div><div class='add'>+		if (copy_from_sockptr(&amp;vif, optval, sizeof(vif))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1460,14 +1465,14 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 	case MRT_ADD_MFC:</div><div class='ctx'> 	case MRT_DEL_MFC:</div><div class='ctx'> 		parent = -1;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case MRT_ADD_MFC_PROXY:</div><div class='ctx'> 	case MRT_DEL_MFC_PROXY:</div><div class='ctx'> 		if (optlen != sizeof(mfc)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;mfc, optval, sizeof(mfc))) {</div><div class='add'>+		if (copy_from_sockptr(&amp;mfc, optval, sizeof(mfc))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1480,13 +1485,24 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 					   sk == rtnl_dereference(mrt-&gt;mroute_sk),</div><div class='ctx'> 					   parent);</div><div class='ctx'> 		break;</div><div class='add'>+	case MRT_FLUSH:</div><div class='add'>+		if (optlen != sizeof(val)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (copy_from_sockptr(&amp;val, optval, sizeof(val))) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		mroute_clean_tables(mrt, val);</div><div class='add'>+		break;</div><div class='ctx'> 	/* Control PIM assert. */</div><div class='ctx'> 	case MRT_ASSERT:</div><div class='ctx'> 		if (optlen != sizeof(val)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (get_user(val, (int __user *)optval)) {</div><div class='add'>+		if (copy_from_sockptr(&amp;val, optval, sizeof(val))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1501,7 +1517,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (get_user(val, (int __user *)optval)) {</div><div class='add'>+		if (copy_from_sockptr(&amp;val, optval, sizeof(val))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1523,7 +1539,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (get_user(uval, (u32 __user *)optval)) {</div><div class='add'>+		if (copy_from_sockptr(&amp;uval, optval, sizeof(uval))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1548,8 +1564,31 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Execute if this ioctl is a special mroute ioctl */</div><div class='add'>+int ipmr_sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	/* These userspace buffers will be consumed by ipmr_ioctl() */</div><div class='add'>+	case SIOCGETVIFCNT: {</div><div class='add'>+		struct sioc_vif_req buffer;</div><div class='add'>+</div><div class='add'>+		return sock_ioctl_inout(sk, cmd, arg, &amp;buffer,</div><div class='add'>+				      sizeof(buffer));</div><div class='add'>+		}</div><div class='add'>+	case SIOCGETSGCNT: {</div><div class='add'>+		struct sioc_sg_req buffer;</div><div class='add'>+</div><div class='add'>+		return sock_ioctl_inout(sk, cmd, arg, &amp;buffer,</div><div class='add'>+				      sizeof(buffer));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* return code &gt; 0 means that the ioctl was not executed */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Getsock opt support for the multicast routing system. */</div><div class='del'>-int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int __user *optlen)</div><div class='add'>+int ip_mroute_getsockopt(struct sock *sk, int optname, sockptr_t optval,</div><div class='add'>+			 sockptr_t optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int olr;</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -1580,26 +1619,28 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (get_user(olr, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;olr, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	olr = min_t(unsigned int, olr, sizeof(int));</div><div class='ctx'> 	if (olr &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (put_user(olr, optlen))</div><div class='add'>+</div><div class='add'>+	olr = min_t(unsigned int, olr, sizeof(int));</div><div class='add'>+</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;olr, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (copy_to_user(optval, &amp;val, olr))</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;val, olr))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The IP multicast ioctl support routines. */</div><div class='del'>-int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)</div><div class='add'>+int ipmr_ioctl(struct sock *sk, int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct sioc_sg_req sr;</div><div class='del'>-	struct sioc_vif_req vr;</div><div class='ctx'> 	struct vif_device *vif;</div><div class='ctx'> 	struct mfc_cache *c;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct sioc_vif_req *vr;</div><div class='add'>+	struct sioc_sg_req *sr;</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='ctx'> 	mrt = ipmr_get_table(net, raw_sk(sk)-&gt;ipmr_table ? : RT_TABLE_DEFAULT);</div><div class='hunk'>@@ -1608,39 +1649,33 @@ int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGETVIFCNT:</div><div class='del'>-		if (copy_from_user(&amp;vr, arg, sizeof(vr)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (vr.vifi &gt;= mrt-&gt;maxvif)</div><div class='add'>+		vr = (struct sioc_vif_req *)arg;</div><div class='add'>+		if (vr-&gt;vifi &gt;= mrt-&gt;maxvif)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='del'>-		vif = &amp;mrt-&gt;vif_table[vr.vifi];</div><div class='del'>-		if (VIF_EXISTS(mrt, vr.vifi)) {</div><div class='del'>-			vr.icount = vif-&gt;pkt_in;</div><div class='del'>-			vr.ocount = vif-&gt;pkt_out;</div><div class='del'>-			vr.ibytes = vif-&gt;bytes_in;</div><div class='del'>-			vr.obytes = vif-&gt;bytes_out;</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+		vr-&gt;vifi = array_index_nospec(vr-&gt;vifi, mrt-&gt;maxvif);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		vif = &amp;mrt-&gt;vif_table[vr-&gt;vifi];</div><div class='add'>+		if (VIF_EXISTS(mrt, vr-&gt;vifi)) {</div><div class='add'>+			vr-&gt;icount = READ_ONCE(vif-&gt;pkt_in);</div><div class='add'>+			vr-&gt;ocount = READ_ONCE(vif-&gt;pkt_out);</div><div class='add'>+			vr-&gt;ibytes = READ_ONCE(vif-&gt;bytes_in);</div><div class='add'>+			vr-&gt;obytes = READ_ONCE(vif-&gt;bytes_out);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-			if (copy_to_user(arg, &amp;vr, sizeof(vr)))</div><div class='del'>-				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	case SIOCGETSGCNT:</div><div class='del'>-		if (copy_from_user(&amp;sr, arg, sizeof(sr)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		sr = (struct sioc_sg_req *)arg;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		c = ipmr_cache_find(mrt, sr.src.s_addr, sr.grp.s_addr);</div><div class='add'>+		c = ipmr_cache_find(mrt, sr-&gt;src.s_addr, sr-&gt;grp.s_addr);</div><div class='ctx'> 		if (c) {</div><div class='del'>-			sr.pktcnt = c-&gt;_c.mfc_un.res.pkt;</div><div class='del'>-			sr.bytecnt = c-&gt;_c.mfc_un.res.bytes;</div><div class='del'>-			sr.wrong_if = c-&gt;_c.mfc_un.res.wrong_if;</div><div class='add'>+			sr-&gt;pktcnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+			sr-&gt;bytecnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+			sr-&gt;wrong_if = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			if (copy_to_user(arg, &amp;sr, sizeof(sr)))</div><div class='del'>-				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -1686,20 +1721,21 @@ int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (vr.vifi &gt;= mrt-&gt;maxvif)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='add'>+		vr.vifi = array_index_nospec(vr.vifi, mrt-&gt;maxvif);</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		vif = &amp;mrt-&gt;vif_table[vr.vifi];</div><div class='ctx'> 		if (VIF_EXISTS(mrt, vr.vifi)) {</div><div class='del'>-			vr.icount = vif-&gt;pkt_in;</div><div class='del'>-			vr.ocount = vif-&gt;pkt_out;</div><div class='del'>-			vr.ibytes = vif-&gt;bytes_in;</div><div class='del'>-			vr.obytes = vif-&gt;bytes_out;</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+			vr.icount = READ_ONCE(vif-&gt;pkt_in);</div><div class='add'>+			vr.ocount = READ_ONCE(vif-&gt;pkt_out);</div><div class='add'>+			vr.ibytes = READ_ONCE(vif-&gt;bytes_in);</div><div class='add'>+			vr.obytes = READ_ONCE(vif-&gt;bytes_out);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(arg, &amp;vr, sizeof(vr)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	case SIOCGETSGCNT:</div><div class='ctx'> 		if (copy_from_user(&amp;sr, arg, sizeof(sr)))</div><div class='hunk'>@@ -1708,9 +1744,9 @@ int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		c = ipmr_cache_find(mrt, sr.src.s_addr, sr.grp.s_addr);</div><div class='ctx'> 		if (c) {</div><div class='del'>-			sr.pktcnt = c-&gt;_c.mfc_un.res.pkt;</div><div class='del'>-			sr.bytecnt = c-&gt;_c.mfc_un.res.bytes;</div><div class='del'>-			sr.wrong_if = c-&gt;_c.mfc_un.res.wrong_if;</div><div class='add'>+			sr.pktcnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+			sr.bytecnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+			sr.wrong_if = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(arg, &amp;sr, sizeof(sr)))</div><div class='hunk'>@@ -1739,7 +1775,7 @@ static int ipmr_device_event(struct notifier_block *this, unsigned long event, v</div><div class='ctx'> 	ipmr_for_each_table(mrt, net) {</div><div class='ctx'> 		v = &amp;mrt-&gt;vif_table[0];</div><div class='ctx'> 		for (ct = 0; ct &lt; mrt-&gt;maxvif; ct++, v++) {</div><div class='del'>-			if (v-&gt;dev == dev)</div><div class='add'>+			if (rcu_access_pointer(v-&gt;dev) == dev)</div><div class='ctx'> 				vif_delete(mrt, ct, 1, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1778,7 +1814,7 @@ static void ip_encap(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;(IPCB(skb)-&gt;opt), 0, sizeof(IPCB(skb)-&gt;opt));</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ipmr_forward_finish(struct net *net, struct sock *sk,</div><div class='hunk'>@@ -1787,7 +1823,6 @@ static inline int ipmr_forward_finish(struct net *net, struct sock *sk,</div><div class='ctx'> 	struct ip_options *opt = &amp;(IPCB(skb)-&gt;opt);</div><div class='ctx'> </div><div class='ctx'> 	IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='del'>-	IP_ADD_STATS(net, IPSTATS_MIB_OUTOCTETS, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(opt-&gt;optlen))</div><div class='ctx'> 		ip_forward_options(skb);</div><div class='hunk'>@@ -1802,7 +1837,7 @@ static bool ipmr_forward_offloaded(struct sk_buff *skb, struct mr_table *mrt,</div><div class='ctx'> 	struct vif_device *out_vif = &amp;mrt-&gt;vif_table[out_vifi];</div><div class='ctx'> 	struct vif_device *in_vif = &amp;mrt-&gt;vif_table[in_vifi];</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;offload_mr_fwd_mark)</div><div class='add'>+	if (!skb-&gt;offload_l3_fwd_mark)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!out_vif-&gt;dev_parent_id.id_len || !in_vif-&gt;dev_parent_id.id_len)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1817,54 +1852,49 @@ static bool ipmr_forward_offloaded(struct sk_buff *skb, struct mr_table *mrt,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Processing handlers for ipmr_forward */</div><div class='add'>+/* Processing handlers for ipmr_forward, under rcu_read_lock() */</div><div class='ctx'> </div><div class='del'>-static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,</div><div class='del'>-			    int in_vifi, struct sk_buff *skb,</div><div class='del'>-			    struct mfc_cache *c, int vifi)</div><div class='add'>+static int ipmr_prepare_xmit(struct net *net, struct mr_table *mrt,</div><div class='add'>+			     struct sk_buff *skb, int vifi)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct vif_device *vif = &amp;mrt-&gt;vif_table[vifi];</div><div class='del'>-	struct net_device *dev;</div><div class='add'>+	struct net_device *vif_dev;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	int    encap = 0;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;dev)</div><div class='del'>-		goto out_free;</div><div class='add'>+	vif_dev = vif_dev_read(vif);</div><div class='add'>+	if (!vif_dev)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;flags &amp; VIFF_REGISTER) {</div><div class='del'>-		vif-&gt;pkt_out++;</div><div class='del'>-		vif-&gt;bytes_out += skb-&gt;len;</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_packets++;</div><div class='add'>+		WRITE_ONCE(vif-&gt;pkt_out, vif-&gt;pkt_out + 1);</div><div class='add'>+		WRITE_ONCE(vif-&gt;bytes_out, vif-&gt;bytes_out + skb-&gt;len);</div><div class='add'>+		DEV_STATS_ADD(vif_dev, tx_bytes, skb-&gt;len);</div><div class='add'>+		DEV_STATS_INC(vif_dev, tx_packets);</div><div class='ctx'> 		ipmr_cache_report(mrt, skb, vifi, IGMPMSG_WHOLEPKT);</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ipmr_forward_offloaded(skb, mrt, in_vifi, vifi))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='ctx'> 	if (vif-&gt;flags &amp; VIFF_TUNNEL) {</div><div class='ctx'> 		rt = ip_route_output_ports(net, &amp;fl4, NULL,</div><div class='ctx'> 					   vif-&gt;remote, vif-&gt;local,</div><div class='ctx'> 					   0, 0,</div><div class='ctx'> 					   IPPROTO_IPIP,</div><div class='del'>-					   RT_TOS(iph-&gt;tos), vif-&gt;link);</div><div class='add'>+					   iph-&gt;tos &amp; INET_DSCP_MASK, vif-&gt;link);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='del'>-			goto out_free;</div><div class='add'>+			return -1;</div><div class='ctx'> 		encap = sizeof(struct iphdr);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rt = ip_route_output_ports(net, &amp;fl4, NULL, iph-&gt;daddr, 0,</div><div class='ctx'> 					   0, 0,</div><div class='ctx'> 					   IPPROTO_IPIP,</div><div class='del'>-					   RT_TOS(iph-&gt;tos), vif-&gt;link);</div><div class='add'>+					   iph-&gt;tos &amp; INET_DSCP_MASK, vif-&gt;link);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='del'>-			goto out_free;</div><div class='add'>+			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = rt-&gt;dst.dev;</div><div class='del'>-</div><div class='ctx'> 	if (skb-&gt;len+encap &gt; dst_mtu(&amp;rt-&gt;dst) &amp;&amp; (ntohs(iph-&gt;frag_off) &amp; IP_DF)) {</div><div class='ctx'> 		/* Do not fragment multicasts. Alas, IPv4 does not</div><div class='ctx'> 		 * allow to send ICMP, so that packets will disappear</div><div class='hunk'>@@ -1872,18 +1902,18 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		 */</div><div class='ctx'> 		IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	encap += LL_RESERVED_SPACE(dev) + rt-&gt;dst.header_len;</div><div class='add'>+	encap += LL_RESERVED_SPACE(dst_dev_rcu(&amp;rt-&gt;dst)) + rt-&gt;dst.header_len;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cow(skb, encap)) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vif-&gt;pkt_out++;</div><div class='del'>-	vif-&gt;bytes_out += skb-&gt;len;</div><div class='add'>+	WRITE_ONCE(vif-&gt;pkt_out, vif-&gt;pkt_out + 1);</div><div class='add'>+	WRITE_ONCE(vif-&gt;bytes_out, vif-&gt;bytes_out + skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> 	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='hunk'>@@ -1895,10 +1925,26 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	if (vif-&gt;flags &amp; VIFF_TUNNEL) {</div><div class='ctx'> 		ip_encap(net, skb, vif-&gt;local, vif-&gt;remote);</div><div class='ctx'> 		/* FIXME: extra output firewall step used to be here. --RR */</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_packets++;</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+		DEV_STATS_INC(vif_dev, tx_packets);</div><div class='add'>+		DEV_STATS_ADD(vif_dev, tx_bytes, skb-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipmr_queue_fwd_xmit(struct net *net, struct mr_table *mrt,</div><div class='add'>+				int in_vifi, struct sk_buff *skb, int vifi)</div><div class='add'>+{</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+</div><div class='add'>+	if (ipmr_forward_offloaded(skb, mrt, in_vifi, vifi))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (ipmr_prepare_xmit(net, mrt, skb, vifi))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	rt = skb_rtable(skb);</div><div class='add'>+</div><div class='ctx'> 	IPCB(skb)-&gt;flags |= IPSKB_FORWARDED;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC1584 teaches, that DVMRP/PIM router must deliver packets locally</div><div class='hunk'>@@ -1912,7 +1958,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	 * result in receiving multiple packets.</div><div class='ctx'> 	 */</div><div class='ctx'> 	NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD,</div><div class='del'>-		net, NULL, skb, skb-&gt;dev, dev,</div><div class='add'>+		net, NULL, skb, skb-&gt;dev, dst_dev_rcu(&amp;rt-&gt;dst),</div><div class='ctx'> 		ipmr_forward_finish);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -1920,18 +1966,33 @@ out_free:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev)</div><div class='add'>+static void ipmr_queue_output_xmit(struct net *net, struct mr_table *mrt,</div><div class='add'>+				   struct sk_buff *skb, int vifi)</div><div class='ctx'> {</div><div class='del'>-	int ct;</div><div class='add'>+	if (ipmr_prepare_xmit(net, mrt, skb, vifi))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	ip_mc_output(net, NULL, skb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (ct = mrt-&gt;maxvif-1; ct &gt;= 0; ct--) {</div><div class='del'>-		if (mrt-&gt;vif_table[ct].dev == dev)</div><div class='add'>+/* Called with mrt_lock or rcu_read_lock() */</div><div class='add'>+static int ipmr_find_vif(const struct mr_table *mrt, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ct;</div><div class='add'>+	/* Pairs with WRITE_ONCE() in vif_delete()/vif_add() */</div><div class='add'>+	for (ct = READ_ONCE(mrt-&gt;maxvif) - 1; ct &gt;= 0; ct--) {</div><div class='add'>+		if (rcu_access_pointer(mrt-&gt;vif_table[ct].dev) == dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ct;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* "local" means that we should preserve one skb (for local delivery) */</div><div class='add'>+/* Called uner rcu_read_lock() */</div><div class='ctx'> static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			  struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 			  struct mfc_cache *c, int local)</div><div class='hunk'>@@ -1941,14 +2002,14 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	int vif, ct;</div><div class='ctx'> </div><div class='ctx'> 	vif = c-&gt;_c.mfc_parent;</div><div class='del'>-	c-&gt;_c.mfc_un.res.pkt++;</div><div class='del'>-	c-&gt;_c.mfc_un.res.bytes += skb-&gt;len;</div><div class='del'>-	c-&gt;_c.mfc_un.res.lastuse = jiffies;</div><div class='add'>+	atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+	atomic_long_add(skb-&gt;len, &amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+	WRITE_ONCE(c-&gt;_c.mfc_un.res.lastuse, jiffies);</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;mfc_origin == htonl(INADDR_ANY) &amp;&amp; true_vifi &gt;= 0) {</div><div class='ctx'> 		struct mfc_cache *cache_proxy;</div><div class='ctx'> </div><div class='del'>-		/* For an (*,G) entry, we only check that the incomming</div><div class='add'>+		/* For an (*,G) entry, we only check that the incoming</div><div class='ctx'> 		 * interface is part of the static tree.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cache_proxy = mr_mfc_find_any_parent(mrt, vif);</div><div class='hunk'>@@ -1958,7 +2019,7 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wrong interface: drop packet and (maybe) send PIM assert. */</div><div class='del'>-	if (mrt-&gt;vif_table[vif].dev != dev) {</div><div class='add'>+	if (rcu_access_pointer(mrt-&gt;vif_table[vif].dev) != dev) {</div><div class='ctx'> 		if (rt_is_output_route(skb_rtable(skb))) {</div><div class='ctx'> 			/* It is our own packet, looped back.</div><div class='ctx'> 			 * Very complicated situation...</div><div class='hunk'>@@ -1974,7 +2035,7 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			goto dont_forward;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		c-&gt;_c.mfc_un.res.wrong_if++;</div><div class='add'>+		atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> </div><div class='ctx'> 		if (true_vifi &gt;= 0 &amp;&amp; mrt-&gt;mroute_do_assert &amp;&amp;</div><div class='ctx'> 		    /* pimsm uses asserts, when switching from RPT to SPT,</div><div class='hunk'>@@ -1997,8 +2058,10 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> forward:</div><div class='del'>-	mrt-&gt;vif_table[vif].pkt_in++;</div><div class='del'>-	mrt-&gt;vif_table[vif].bytes_in += skb-&gt;len;</div><div class='add'>+	WRITE_ONCE(mrt-&gt;vif_table[vif].pkt_in,</div><div class='add'>+		   mrt-&gt;vif_table[vif].pkt_in + 1);</div><div class='add'>+	WRITE_ONCE(mrt-&gt;vif_table[vif].bytes_in,</div><div class='add'>+		   mrt-&gt;vif_table[vif].bytes_in + skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Forward the frame */</div><div class='ctx'> 	if (c-&gt;mfc_origin == htonl(INADDR_ANY) &amp;&amp;</div><div class='hunk'>@@ -2026,8 +2089,8 @@ forward:</div><div class='ctx'> 				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 				if (skb2)</div><div class='del'>-					ipmr_queue_xmit(net, mrt, true_vifi,</div><div class='del'>-							skb2, c, psend);</div><div class='add'>+					ipmr_queue_fwd_xmit(net, mrt, true_vifi,</div><div class='add'>+							    skb2, psend);</div><div class='ctx'> 			}</div><div class='ctx'> 			psend = ct;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2038,10 +2101,10 @@ last_forward:</div><div class='ctx'> 			struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 			if (skb2)</div><div class='del'>-				ipmr_queue_xmit(net, mrt, true_vifi, skb2,</div><div class='del'>-						c, psend);</div><div class='add'>+				ipmr_queue_fwd_xmit(net, mrt, true_vifi, skb2,</div><div class='add'>+						    psend);</div><div class='ctx'> 		} else {</div><div class='del'>-			ipmr_queue_xmit(net, mrt, true_vifi, skb, c, psend);</div><div class='add'>+			ipmr_queue_fwd_xmit(net, mrt, true_vifi, skb, psend);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2058,7 +2121,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)</div><div class='ctx'> 	struct flowi4 fl4 = {</div><div class='ctx'> 		.daddr = iph-&gt;daddr,</div><div class='ctx'> 		.saddr = iph-&gt;saddr,</div><div class='del'>-		.flowi4_tos = RT_TOS(iph-&gt;tos),</div><div class='add'>+		.flowi4_dscp = ip4h_dscp(iph),</div><div class='ctx'> 		.flowi4_oif = (rt_is_output_route(rt) ?</div><div class='ctx'> 			       skb-&gt;dev-&gt;ifindex : 0),</div><div class='ctx'> 		.flowi4_iif = (rt_is_output_route(rt) ?</div><div class='hunk'>@@ -2125,11 +2188,11 @@ int ip_mr_input(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 			mroute_sk = rcu_dereference(mrt-&gt;mroute_sk);</div><div class='ctx'> 			if (mroute_sk) {</div><div class='del'>-				nf_reset(skb);</div><div class='add'>+				nf_reset_ct(skb);</div><div class='ctx'> 				raw_rcv(mroute_sk, skb);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='del'>-		    }</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* already under rcu_read_lock() */</div><div class='hunk'>@@ -2154,22 +2217,14 @@ int ip_mr_input(struct sk_buff *skb)</div><div class='ctx'> 			skb = skb2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='ctx'> 		vif = ipmr_find_vif(mrt, dev);</div><div class='del'>-		if (vif &gt;= 0) {</div><div class='del'>-			int err2 = ipmr_cache_unresolved(mrt, vif, skb, dev);</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='del'>-</div><div class='del'>-			return err2;</div><div class='del'>-		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		if (vif &gt;= 0)</div><div class='add'>+			return ipmr_cache_unresolved(mrt, vif, skb, dev);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	ip_mr_forward(net, mrt, dev, skb, cache, local);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (local)</div><div class='ctx'> 		return ip_local_deliver(skb);</div><div class='hunk'>@@ -2183,6 +2238,110 @@ dont_forward:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ip_mr_output_finish(struct net *net, struct mr_table *mrt,</div><div class='add'>+				struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+				struct mfc_cache *c)</div><div class='add'>+{</div><div class='add'>+	int psend = -1;</div><div class='add'>+	int ct;</div><div class='add'>+</div><div class='add'>+	atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+	atomic_long_add(skb-&gt;len, &amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+	WRITE_ONCE(c-&gt;_c.mfc_un.res.lastuse, jiffies);</div><div class='add'>+</div><div class='add'>+	/* Forward the frame */</div><div class='add'>+	if (c-&gt;mfc_origin == htonl(INADDR_ANY) &amp;&amp;</div><div class='add'>+	    c-&gt;mfc_mcastgrp == htonl(INADDR_ANY)) {</div><div class='add'>+		if (ip_hdr(skb)-&gt;ttl &gt;</div><div class='add'>+		    c-&gt;_c.mfc_un.res.ttls[c-&gt;_c.mfc_parent]) {</div><div class='add'>+			/* It's an (*,*) entry and the packet is not coming from</div><div class='add'>+			 * the upstream: forward the packet to the upstream</div><div class='add'>+			 * only.</div><div class='add'>+			 */</div><div class='add'>+			psend = c-&gt;_c.mfc_parent;</div><div class='add'>+			goto last_xmit;</div><div class='add'>+		}</div><div class='add'>+		goto dont_xmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ct = c-&gt;_c.mfc_un.res.maxvif - 1;</div><div class='add'>+	     ct &gt;= c-&gt;_c.mfc_un.res.minvif; ct--) {</div><div class='add'>+		if (ip_hdr(skb)-&gt;ttl &gt; c-&gt;_c.mfc_un.res.ttls[ct]) {</div><div class='add'>+			if (psend != -1) {</div><div class='add'>+				struct sk_buff *skb2;</div><div class='add'>+</div><div class='add'>+				skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+				if (skb2)</div><div class='add'>+					ipmr_queue_output_xmit(net, mrt,</div><div class='add'>+							       skb2, psend);</div><div class='add'>+			}</div><div class='add'>+			psend = ct;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+last_xmit:</div><div class='add'>+	if (psend != -1) {</div><div class='add'>+		ipmr_queue_output_xmit(net, mrt, skb, psend);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+dont_xmit:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Multicast packets for forwarding arrive here</div><div class='add'>+ * Called with rcu_read_lock();</div><div class='add'>+ */</div><div class='add'>+int ip_mr_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtable *rt = skb_rtable(skb);</div><div class='add'>+	struct mfc_cache *cache;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct mr_table *mrt;</div><div class='add'>+	int vif;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	dev = dst_dev_rcu(&amp;rt-&gt;dst);</div><div class='add'>+</div><div class='add'>+	if (IPCB(skb)-&gt;flags &amp; IPSKB_FORWARDED)</div><div class='add'>+		goto mc_output;</div><div class='add'>+	if (!(IPCB(skb)-&gt;flags &amp; IPSKB_MCROUTE))</div><div class='add'>+		goto mc_output;</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	mrt = ipmr_rt_fib_lookup(net, skb);</div><div class='add'>+	if (IS_ERR(mrt))</div><div class='add'>+		goto mc_output;</div><div class='add'>+</div><div class='add'>+	cache = ipmr_cache_find(mrt, ip_hdr(skb)-&gt;saddr, ip_hdr(skb)-&gt;daddr);</div><div class='add'>+	if (!cache) {</div><div class='add'>+		vif = ipmr_find_vif(mrt, dev);</div><div class='add'>+		if (vif &gt;= 0)</div><div class='add'>+			cache = ipmr_cache_find_any(mrt, ip_hdr(skb)-&gt;daddr,</div><div class='add'>+						    vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No usable cache entry */</div><div class='add'>+	if (!cache) {</div><div class='add'>+		vif = ipmr_find_vif(mrt, dev);</div><div class='add'>+		if (vif &gt;= 0)</div><div class='add'>+			return ipmr_cache_unresolved(mrt, vif, skb, dev);</div><div class='add'>+		goto mc_output;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = cache-&gt;_c.mfc_parent;</div><div class='add'>+	if (rcu_access_pointer(mrt-&gt;vif_table[vif].dev) != dev)</div><div class='add'>+		goto mc_output;</div><div class='add'>+</div><div class='add'>+	ip_mr_output_finish(net, mrt, dev, skb, cache);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+mc_output:</div><div class='add'>+	return ip_mc_output(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_PIMSM_V1</div><div class='ctx'> /* Handle IGMP messages of PIMv1 */</div><div class='ctx'> int pim_rcv_v1(struct sk_buff *skb)</div><div class='hunk'>@@ -2247,11 +2406,13 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(net, RT_TABLE_DEFAULT);</div><div class='del'>-	if (!mrt)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ipmr_get_table(net, RT_TABLE_DEFAULT);</div><div class='add'>+	if (!mrt) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	cache = ipmr_cache_find(mrt, saddr, daddr);</div><div class='ctx'> 	if (!cache &amp;&amp; skb-&gt;dev) {</div><div class='ctx'> 		int vif = ipmr_find_vif(mrt, skb-&gt;dev);</div><div class='hunk'>@@ -2266,17 +2427,15 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 		int vif = -1;</div><div class='ctx'> </div><div class='ctx'> 		dev = skb-&gt;dev;</div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='ctx'> 		if (dev)</div><div class='ctx'> 			vif = ipmr_find_vif(mrt, dev);</div><div class='ctx'> 		if (vif &lt; 0) {</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		skb2 = skb_realloc_headroom(skb, sizeof(struct iphdr));</div><div class='ctx'> 		if (!skb2) {</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2290,14 +2449,11 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 		iph-&gt;daddr = daddr;</div><div class='ctx'> 		iph-&gt;version = 0;</div><div class='ctx'> 		err = ipmr_cache_unresolved(mrt, vif, skb2, dev);</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	err = mr_fill_mroute(mrt, skb, &amp;cache-&gt;_c, rtm);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2397,8 +2553,7 @@ static void mroute_netlink_event(struct mr_table *mrt, struct mfc_cache *mfc,</div><div class='ctx'> </div><div class='ctx'> errout:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV4_MROUTE, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV4_MROUTE, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t igmpmsg_netlink_msgsize(size_t payloadlen)</div><div class='hunk'>@@ -2409,6 +2564,7 @@ static size_t igmpmsg_netlink_msgsize(size_t payloadlen)</div><div class='ctx'> 		+ nla_total_size(4)	/* IPMRA_CREPORT_VIF_ID */</div><div class='ctx'> 		+ nla_total_size(4)	/* IPMRA_CREPORT_SRC_ADDR */</div><div class='ctx'> 		+ nla_total_size(4)	/* IPMRA_CREPORT_DST_ADDR */</div><div class='add'>+		+ nla_total_size(4)	/* IPMRA_CREPORT_TABLE */</div><div class='ctx'> 					/* IPMRA_CREPORT_PKT */</div><div class='ctx'> 		+ nla_total_size(payloadlen)</div><div class='ctx'> 		;</div><div class='hunk'>@@ -2416,7 +2572,7 @@ static size_t igmpmsg_netlink_msgsize(size_t payloadlen)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt)</div><div class='add'>+static void igmpmsg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = read_pnet(&amp;mrt-&gt;net);</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='hunk'>@@ -2440,11 +2596,12 @@ static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt)</div><div class='ctx'> 	rtgenm = nlmsg_data(nlh);</div><div class='ctx'> 	rtgenm-&gt;rtgen_family = RTNL_FAMILY_IPMR;</div><div class='ctx'> 	if (nla_put_u8(skb, IPMRA_CREPORT_MSGTYPE, msg-&gt;im_msgtype) ||</div><div class='del'>-	    nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg-&gt;im_vif) ||</div><div class='add'>+	    nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg-&gt;im_vif | (msg-&gt;im_vif_hi &lt;&lt; 8)) ||</div><div class='ctx'> 	    nla_put_in_addr(skb, IPMRA_CREPORT_SRC_ADDR,</div><div class='ctx'> 			    msg-&gt;im_src.s_addr) ||</div><div class='ctx'> 	    nla_put_in_addr(skb, IPMRA_CREPORT_DST_ADDR,</div><div class='del'>-			    msg-&gt;im_dst.s_addr))</div><div class='add'>+			    msg-&gt;im_dst.s_addr) ||</div><div class='add'>+	    nla_put_u32(skb, IPMRA_CREPORT_TABLE, mrt-&gt;id))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	nla = nla_reserve(skb, IPMRA_CREPORT_PKT, payloadlen);</div><div class='hunk'>@@ -2464,6 +2621,61 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_IPV4_MROUTE_R, -ENOBUFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ipmr_rtm_valid_getroute_req(struct sk_buff *skb,</div><div class='add'>+				       const struct nlmsghdr *nlh,</div><div class='add'>+				       struct nlattr **tb,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rtmsg *rtm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	rtm = nlmsg_payload(nlh, sizeof(*rtm));</div><div class='add'>+	if (!rtm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid header for multicast route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					      rtm_ipv4_policy, extack);</div><div class='add'>+</div><div class='add'>+	if ((rtm-&gt;rtm_src_len &amp;&amp; rtm-&gt;rtm_src_len != 32) ||</div><div class='add'>+	    (rtm-&gt;rtm_dst_len &amp;&amp; rtm-&gt;rtm_dst_len != 32) ||</div><div class='add'>+	    rtm-&gt;rtm_tos || rtm-&gt;rtm_table || rtm-&gt;rtm_protocol ||</div><div class='add'>+	    rtm-&gt;rtm_scope || rtm-&gt;rtm_type || rtm-&gt;rtm_flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid values in header for multicast route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					    rtm_ipv4_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((tb[RTA_SRC] &amp;&amp; !rtm-&gt;rtm_src_len) ||</div><div class='add'>+	    (tb[RTA_DST] &amp;&amp; !rtm-&gt;rtm_dst_len)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: rtm_src_len and rtm_dst_len must be 32 for IPv4");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= RTA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case RTA_SRC:</div><div class='add'>+		case RTA_DST:</div><div class='add'>+		case RTA_TABLE:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Unsupported attribute in multicast route get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ipmr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -2472,23 +2684,19 @@ static int ipmr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct mfc_cache *cache;</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='del'>-	struct rtmsg *rtm;</div><div class='ctx'> 	__be32 src, grp;</div><div class='ctx'> 	u32 tableid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='del'>-			  rtm_ipv4_policy, extack);</div><div class='add'>+	err = ipmr_rtm_valid_getroute_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	rtm = nlmsg_data(nlh);</div><div class='del'>-</div><div class='del'>-	src = tb[RTA_SRC] ? nla_get_in_addr(tb[RTA_SRC]) : 0;</div><div class='del'>-	grp = tb[RTA_DST] ? nla_get_in_addr(tb[RTA_DST]) : 0;</div><div class='del'>-	tableid = tb[RTA_TABLE] ? nla_get_u32(tb[RTA_TABLE]) : 0;</div><div class='add'>+	src = nla_get_in_addr_default(tb[RTA_SRC], 0);</div><div class='add'>+	grp = nla_get_in_addr_default(tb[RTA_DST], 0);</div><div class='add'>+	tableid = nla_get_u32_default(tb[RTA_TABLE], 0);</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(net, tableid ? tableid : RT_TABLE_DEFAULT);</div><div class='add'>+	mrt = __ipmr_get_table(net, tableid ? tableid : RT_TABLE_DEFAULT);</div><div class='ctx'> 	if (!mrt) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto errout_free;</div><div class='hunk'>@@ -2527,8 +2735,36 @@ errout_free:</div><div class='ctx'> </div><div class='ctx'> static int ipmr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	struct fib_dump_filter filter = {</div><div class='add'>+		.rtnl_held = true,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = ip_valid_fib_dump_req(sock_net(skb-&gt;sk), cb-&gt;nlh,</div><div class='add'>+					    &amp;filter, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter.table_id) {</div><div class='add'>+		struct mr_table *mrt;</div><div class='add'>+</div><div class='add'>+		mrt = __ipmr_get_table(sock_net(skb-&gt;sk), filter.table_id);</div><div class='add'>+		if (!mrt) {</div><div class='add'>+			if (rtnl_msg_family(cb-&gt;nlh) != RTNL_FAMILY_IPMR)</div><div class='add'>+				return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+			NL_SET_ERR_MSG(cb-&gt;extack, "ipv4: MR table does not exist");</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		err = mr_table_dump(mrt, skb, cb, _ipmr_fill_mroute,</div><div class='add'>+				    &amp;mfc_unres_lock, &amp;filter);</div><div class='add'>+		return skb-&gt;len ? : err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mr_rtm_dumproute(skb, cb, ipmr_mr_table_iter,</div><div class='del'>-				_ipmr_fill_mroute, &amp;mfc_unres_lock);</div><div class='add'>+				_ipmr_fill_mroute, &amp;mfc_unres_lock, &amp;filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy rtm_ipmr_policy[RTA_MAX + 1] = {</div><div class='hunk'>@@ -2577,8 +2813,8 @@ static int rtm_to_ipmr_mfcc(struct net *net, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='ctx'> 	int ret, rem;</div><div class='ctx'> </div><div class='del'>-	ret = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipmr_policy,</div><div class='del'>-			     extack);</div><div class='add'>+	ret = nlmsg_validate_deprecated(nlh, sizeof(*rtm), RTA_MAX,</div><div class='add'>+					rtm_ipmr_policy, extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='hunk'>@@ -2622,7 +2858,7 @@ static int rtm_to_ipmr_mfcc(struct net *net, struct nlmsghdr *nlh,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mrt = ipmr_get_table(net, tblid);</div><div class='add'>+	mrt = __ipmr_get_table(net, tblid);</div><div class='ctx'> 	if (!mrt) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2678,18 +2914,21 @@ static bool ipmr_fill_table(struct mr_table *mrt, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static bool ipmr_fill_vif(struct mr_table *mrt, u32 vifid, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *vif_dev;</div><div class='ctx'> 	struct nlattr *vif_nest;</div><div class='ctx'> 	struct vif_device *vif;</div><div class='ctx'> </div><div class='add'>+	vif = &amp;mrt-&gt;vif_table[vifid];</div><div class='add'>+	vif_dev = rtnl_dereference(vif-&gt;dev);</div><div class='ctx'> 	/* if the VIF doesn't exist just continue */</div><div class='del'>-	if (!VIF_EXISTS(mrt, vifid))</div><div class='add'>+	if (!vif_dev)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	vif = &amp;mrt-&gt;vif_table[vifid];</div><div class='del'>-	vif_nest = nla_nest_start(skb, IPMRA_VIF);</div><div class='add'>+	vif_nest = nla_nest_start_noflag(skb, IPMRA_VIF);</div><div class='ctx'> 	if (!vif_nest)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (nla_put_u32(skb, IPMRA_VIFA_IFINDEX, vif-&gt;dev-&gt;ifindex) ||</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IPMRA_VIFA_IFINDEX, vif_dev-&gt;ifindex) ||</div><div class='ctx'> 	    nla_put_u32(skb, IPMRA_VIFA_VIF_ID, vifid) ||</div><div class='ctx'> 	    nla_put_u16(skb, IPMRA_VIFA_FLAGS, vif-&gt;flags) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, IPMRA_VIFA_BYTES_IN, vif-&gt;bytes_in,</div><div class='hunk'>@@ -2710,6 +2949,31 @@ static bool ipmr_fill_vif(struct mr_table *mrt, u32 vifid, struct sk_buff *skb)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ipmr_valid_dumplink(const struct nlmsghdr *nlh,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifinfomsg *ifm;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid header for ipmr link dump");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*ifm))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid data after header in ipmr link dump");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;__ifi_pad || ifm-&gt;ifi_type || ifm-&gt;ifi_flags ||</div><div class='add'>+	    ifm-&gt;ifi_change || ifm-&gt;ifi_index) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for ipmr link dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='hunk'>@@ -2718,6 +2982,13 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	unsigned int e = 0, s_e;</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		int err = ipmr_valid_dumplink(cb-&gt;nlh, cb-&gt;extack);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	s_t = cb-&gt;args[0];</div><div class='ctx'> 	s_e = cb-&gt;args[1];</div><div class='ctx'> </div><div class='hunk'>@@ -2738,7 +3009,7 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 		memset(hdr, 0, sizeof(*hdr));</div><div class='ctx'> 		hdr-&gt;ifi_family = RTNL_FAMILY_IPMR;</div><div class='ctx'> </div><div class='del'>-		af = nla_nest_start(skb, IFLA_AF_SPEC);</div><div class='add'>+		af = nla_nest_start_noflag(skb, IFLA_AF_SPEC);</div><div class='ctx'> 		if (!af) {</div><div class='ctx'> 			nlmsg_cancel(skb, nlh);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2749,7 +3020,7 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		vifs = nla_nest_start(skb, IPMRA_TABLE_VIFS);</div><div class='add'>+		vifs = nla_nest_start_noflag(skb, IPMRA_TABLE_VIFS);</div><div class='ctx'> 		if (!vifs) {</div><div class='ctx'> 			nla_nest_end(skb, af);</div><div class='ctx'> 			nlmsg_end(skb, nlh);</div><div class='hunk'>@@ -2789,26 +3060,28 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void *ipmr_vif_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-	__acquires(mrt_lock)</div><div class='add'>+	__acquires(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_vif_iter *iter = seq-&gt;private;</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='del'>-	mrt = ipmr_get_table(net, RT_TABLE_DEFAULT);</div><div class='del'>-	if (!mrt)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ipmr_get_table(net, RT_TABLE_DEFAULT);</div><div class='add'>+	if (!mrt) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iter-&gt;mrt = mrt;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	return mr_vif_seq_start(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipmr_vif_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-	__releases(mrt_lock)</div><div class='add'>+	__releases(RCU)</div><div class='ctx'> {</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipmr_vif_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -2821,9 +3094,11 @@ static int ipmr_vif_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			 "Interface      BytesIn  PktsIn  BytesOut PktsOut Flags Local    Remote\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		const struct vif_device *vif = v;</div><div class='del'>-		const char *name =  vif-&gt;dev ?</div><div class='del'>-				    vif-&gt;dev-&gt;name : "none";</div><div class='add'>+		const struct net_device *vif_dev;</div><div class='add'>+		const char *name;</div><div class='ctx'> </div><div class='add'>+		vif_dev = vif_dev_read(vif);</div><div class='add'>+		name = vif_dev ? vif_dev-&gt;name : "none";</div><div class='ctx'> 		seq_printf(seq,</div><div class='ctx'> 			   "%2td %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",</div><div class='ctx'> 			   vif - mrt-&gt;vif_table,</div><div class='hunk'>@@ -2872,9 +3147,9 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 		if (it-&gt;cache != &amp;mrt-&gt;mfc_unres_queue) {</div><div class='ctx'> 			seq_printf(seq, " %8lu %8lu %8lu",</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.pkt,</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.bytes,</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.wrong_if);</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.pkt),</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.bytes),</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.wrong_if));</div><div class='ctx'> 			for (n = mfc-&gt;_c.mfc_un.res.minvif;</div><div class='ctx'> 			     n &lt; mfc-&gt;_c.mfc_un.res.maxvif; n++) {</div><div class='ctx'> 				if (VIF_EXISTS(mrt, n) &amp;&amp;</div><div class='hunk'>@@ -2905,21 +3180,19 @@ static const struct seq_operations ipmr_mfc_seq_ops = {</div><div class='ctx'> #ifdef CONFIG_IP_PIMSM_V2</div><div class='ctx'> static const struct net_protocol pim_protocol = {</div><div class='ctx'> 	.handler	=	pim_rcv,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned int ipmr_seq_read(struct net *net)</div><div class='add'>+static unsigned int ipmr_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	return net-&gt;ipv4.ipmr_seq + ipmr_rules_seq_read(net);</div><div class='add'>+	return READ_ONCE(net-&gt;ipv4.ipmr_seq) + ipmr_rules_seq_read(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipmr_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ipmr_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return mr_dump(net, nb, RTNL_FAMILY_IPMR, ipmr_rules_dump,</div><div class='del'>-		       ipmr_mr_table_iter, &amp;mrt_lock);</div><div class='add'>+		       ipmr_mr_table_iter, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fib_notifier_ops ipmr_notifier_ops_template = {</div><div class='hunk'>@@ -2977,7 +3250,9 @@ static int __net_init ipmr_net_init(struct net *net)</div><div class='ctx'> proc_cache_fail:</div><div class='ctx'> 	remove_proc_entry("ip_mr_vif", net-&gt;proc_net);</div><div class='ctx'> proc_vif_fail:</div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	ipmr_rules_exit(net);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> #endif</div><div class='ctx'> ipmr_rules_fail:</div><div class='ctx'> 	ipmr_notifier_exit(net);</div><div class='hunk'>@@ -2992,22 +3267,40 @@ static void __net_exit ipmr_net_exit(struct net *net)</div><div class='ctx'> 	remove_proc_entry("ip_mr_vif", net-&gt;proc_net);</div><div class='ctx'> #endif</div><div class='ctx'> 	ipmr_notifier_exit(net);</div><div class='del'>-	ipmr_rules_exit(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit ipmr_net_exit_batch(struct list_head *net_list)</div><div class='add'>+{</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list)</div><div class='add'>+		ipmr_rules_exit(net);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ipmr_net_ops = {</div><div class='ctx'> 	.init = ipmr_net_init,</div><div class='ctx'> 	.exit = ipmr_net_exit,</div><div class='add'>+	.exit_batch = ipmr_net_exit_batch,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler ipmr_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.protocol = RTNL_FAMILY_IPMR, .msgtype = RTM_GETLINK,</div><div class='add'>+	 .dumpit = ipmr_rtm_dumplink},</div><div class='add'>+	{.protocol = RTNL_FAMILY_IPMR, .msgtype = RTM_NEWROUTE,</div><div class='add'>+	 .doit = ipmr_rtm_route},</div><div class='add'>+	{.protocol = RTNL_FAMILY_IPMR, .msgtype = RTM_DELROUTE,</div><div class='add'>+	 .doit = ipmr_rtm_route},</div><div class='add'>+	{.protocol = RTNL_FAMILY_IPMR, .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .doit = ipmr_rtm_getroute, .dumpit = ipmr_rtm_dumproute},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init ip_mr_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mrt_cachep = kmem_cache_create("ip_mrt_cache",</div><div class='del'>-				       sizeof(struct mfc_cache),</div><div class='del'>-				       0, SLAB_HWCACHE_ALIGN | SLAB_PANIC,</div><div class='del'>-				       NULL);</div><div class='add'>+	mrt_cachep = KMEM_CACHE(mfc_cache, SLAB_HWCACHE_ALIGN | SLAB_PANIC);</div><div class='ctx'> </div><div class='ctx'> 	err = register_pernet_subsys(&amp;ipmr_net_ops);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3023,15 +3316,8 @@ int __init ip_mr_init(void)</div><div class='ctx'> 		goto add_proto_fail;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	rtnl_register(RTNL_FAMILY_IPMR, RTM_GETROUTE,</div><div class='del'>-		      ipmr_rtm_getroute, ipmr_rtm_dumproute, 0);</div><div class='del'>-	rtnl_register(RTNL_FAMILY_IPMR, RTM_NEWROUTE,</div><div class='del'>-		      ipmr_rtm_route, NULL, 0);</div><div class='del'>-	rtnl_register(RTNL_FAMILY_IPMR, RTM_DELROUTE,</div><div class='del'>-		      ipmr_rtm_route, NULL, 0);</div><div class='del'>-</div><div class='del'>-	rtnl_register(RTNL_FAMILY_IPMR, RTM_GETLINK,</div><div class='del'>-		      NULL, ipmr_rtm_dumplink, 0);</div><div class='add'>+	rtnl_register_many(ipmr_rtnl_msg_handlers);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_PIMSM_V2</div><div class='head'>diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c<br/>index 1ad9aa62a97b..28d77d454d44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipmr_base.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ipmr_base.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ipmr_base.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ipmr_base.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@ void vif_device_init(struct vif_device *v,</div><div class='ctx'> 		     unsigned short flags,</div><div class='ctx'> 		     unsigned short get_iflink_mask)</div><div class='ctx'> {</div><div class='del'>-	v-&gt;dev = NULL;</div><div class='add'>+	RCU_INIT_POINTER(v-&gt;dev, NULL);</div><div class='ctx'> 	v-&gt;bytes_in = 0;</div><div class='ctx'> 	v-&gt;bytes_out = 0;</div><div class='ctx'> 	v-&gt;pkt_in = 0;</div><div class='hunk'>@@ -208,6 +208,7 @@ EXPORT_SYMBOL(mr_mfc_seq_next);</div><div class='ctx'> int mr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,</div><div class='ctx'> 		   struct mr_mfc *c, struct rtmsg *rtm)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *vif_dev;</div><div class='ctx'> 	struct rta_mfc_stats mfcs;</div><div class='ctx'> 	struct nlattr *mp_attr;</div><div class='ctx'> 	struct rtnexthop *nhp;</div><div class='hunk'>@@ -220,44 +221,51 @@ int mr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (VIF_EXISTS(mrt, c-&gt;mfc_parent) &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_IIF,</div><div class='del'>-			mrt-&gt;vif_table[c-&gt;mfc_parent].dev-&gt;ifindex) &lt; 0)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	vif_dev = rcu_dereference(mrt-&gt;vif_table[c-&gt;mfc_parent].dev);</div><div class='add'>+	if (vif_dev &amp;&amp; nla_put_u32(skb, RTA_IIF, vif_dev-&gt;ifindex) &lt; 0) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;mfc_flags &amp; MFC_OFFLOAD)</div><div class='ctx'> 		rtm-&gt;rtm_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> </div><div class='del'>-	mp_attr = nla_nest_start(skb, RTA_MULTIPATH);</div><div class='add'>+	mp_attr = nla_nest_start_noflag(skb, RTA_MULTIPATH);</div><div class='ctx'> 	if (!mp_attr)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (ct = c-&gt;mfc_un.res.minvif; ct &lt; c-&gt;mfc_un.res.maxvif; ct++) {</div><div class='del'>-		if (VIF_EXISTS(mrt, ct) &amp;&amp; c-&gt;mfc_un.res.ttls[ct] &lt; 255) {</div><div class='del'>-			struct vif_device *vif;</div><div class='add'>+		struct vif_device *vif = &amp;mrt-&gt;vif_table[ct];</div><div class='add'>+</div><div class='add'>+		vif_dev = rcu_dereference(vif-&gt;dev);</div><div class='add'>+		if (vif_dev &amp;&amp; c-&gt;mfc_un.res.ttls[ct] &lt; 255) {</div><div class='ctx'> </div><div class='ctx'> 			nhp = nla_reserve_nohdr(skb, sizeof(*nhp));</div><div class='ctx'> 			if (!nhp) {</div><div class='add'>+				rcu_read_unlock();</div><div class='ctx'> 				nla_nest_cancel(skb, mp_attr);</div><div class='ctx'> 				return -EMSGSIZE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			nhp-&gt;rtnh_flags = 0;</div><div class='ctx'> 			nhp-&gt;rtnh_hops = c-&gt;mfc_un.res.ttls[ct];</div><div class='del'>-			vif = &amp;mrt-&gt;vif_table[ct];</div><div class='del'>-			nhp-&gt;rtnh_ifindex = vif-&gt;dev-&gt;ifindex;</div><div class='add'>+			nhp-&gt;rtnh_ifindex = vif_dev-&gt;ifindex;</div><div class='ctx'> 			nhp-&gt;rtnh_len = sizeof(*nhp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	nla_nest_end(skb, mp_attr);</div><div class='ctx'> </div><div class='ctx'> 	lastuse = READ_ONCE(c-&gt;mfc_un.res.lastuse);</div><div class='ctx'> 	lastuse = time_after_eq(jiffies, lastuse) ? jiffies - lastuse : 0;</div><div class='ctx'> </div><div class='del'>-	mfcs.mfcs_packets = c-&gt;mfc_un.res.pkt;</div><div class='del'>-	mfcs.mfcs_bytes = c-&gt;mfc_un.res.bytes;</div><div class='del'>-	mfcs.mfcs_wrong_if = c-&gt;mfc_un.res.wrong_if;</div><div class='add'>+	mfcs.mfcs_packets = atomic_long_read(&amp;c-&gt;mfc_un.res.pkt);</div><div class='add'>+	mfcs.mfcs_bytes = atomic_long_read(&amp;c-&gt;mfc_un.res.bytes);</div><div class='add'>+	mfcs.mfcs_wrong_if = atomic_long_read(&amp;c-&gt;mfc_un.res.wrong_if);</div><div class='ctx'> 	if (nla_put_64bit(skb, RTA_MFC_STATS, sizeof(mfcs), &amp;mfcs, RTA_PAD) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, RTA_EXPIRES, jiffies_to_clock_t(lastuse),</div><div class='ctx'> 			      RTA_PAD))</div><div class='hunk'>@@ -268,6 +276,78 @@ int mr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mr_fill_mroute);</div><div class='ctx'> </div><div class='add'>+static bool mr_mfc_uses_dev(const struct mr_table *mrt,</div><div class='add'>+			    const struct mr_mfc *c,</div><div class='add'>+			    const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ct;</div><div class='add'>+</div><div class='add'>+	for (ct = c-&gt;mfc_un.res.minvif; ct &lt; c-&gt;mfc_un.res.maxvif; ct++) {</div><div class='add'>+		const struct net_device *vif_dev;</div><div class='add'>+		const struct vif_device *vif;</div><div class='add'>+</div><div class='add'>+		vif = &amp;mrt-&gt;vif_table[ct];</div><div class='add'>+		vif_dev = rcu_access_pointer(vif-&gt;dev);</div><div class='add'>+		if (vif_dev &amp;&amp; c-&gt;mfc_un.res.ttls[ct] &lt; 255 &amp;&amp;</div><div class='add'>+		    vif_dev == dev)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mr_table_dump(struct mr_table *mrt, struct sk_buff *skb,</div><div class='add'>+		  struct netlink_callback *cb,</div><div class='add'>+		  int (*fill)(struct mr_table *mrt, struct sk_buff *skb,</div><div class='add'>+			      u32 portid, u32 seq, struct mr_mfc *c,</div><div class='add'>+			      int cmd, int flags),</div><div class='add'>+		  spinlock_t *lock, struct fib_dump_filter *filter)</div><div class='add'>+{</div><div class='add'>+	unsigned int e = 0, s_e = cb-&gt;args[1];</div><div class='add'>+	unsigned int flags = NLM_F_MULTI;</div><div class='add'>+	struct mr_mfc *mfc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;filter_set)</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(mfc, &amp;mrt-&gt;mfc_cache_list, list,</div><div class='add'>+				lockdep_rtnl_is_held()) {</div><div class='add'>+		if (e &lt; s_e)</div><div class='add'>+			goto next_entry;</div><div class='add'>+		if (filter-&gt;dev &amp;&amp;</div><div class='add'>+		    !mr_mfc_uses_dev(mrt, mfc, filter-&gt;dev))</div><div class='add'>+			goto next_entry;</div><div class='add'>+</div><div class='add'>+		err = fill(mrt, skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			   cb-&gt;nlh-&gt;nlmsg_seq, mfc, RTM_NEWROUTE, flags);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+next_entry:</div><div class='add'>+		e++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(lock);</div><div class='add'>+	list_for_each_entry(mfc, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='add'>+		if (e &lt; s_e)</div><div class='add'>+			goto next_entry2;</div><div class='add'>+</div><div class='add'>+		err = fill(mrt, skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			   cb-&gt;nlh-&gt;nlmsg_seq, mfc, RTM_NEWROUTE, flags);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			spin_unlock_bh(lock);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+next_entry2:</div><div class='add'>+		e++;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(lock);</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	cb-&gt;args[1] = e;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mr_table_dump);</div><div class='add'>+</div><div class='ctx'> int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 		     struct mr_table *(*iter)(struct net *net,</div><div class='ctx'> 					      struct mr_table *mrt),</div><div class='hunk'>@@ -275,53 +355,36 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 				 struct sk_buff *skb,</div><div class='ctx'> 				 u32 portid, u32 seq, struct mr_mfc *c,</div><div class='ctx'> 				 int cmd, int flags),</div><div class='del'>-		     spinlock_t *lock)</div><div class='add'>+		     spinlock_t *lock, struct fib_dump_filter *filter)</div><div class='ctx'> {</div><div class='del'>-	unsigned int t = 0, e = 0, s_t = cb-&gt;args[0], s_e = cb-&gt;args[1];</div><div class='add'>+	unsigned int t = 0, s_t = cb-&gt;args[0];</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='del'>-	struct mr_mfc *mfc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* multicast does not track protocol or have route type other</div><div class='add'>+	 * than RTN_MULTICAST</div><div class='add'>+	 */</div><div class='add'>+	if (filter-&gt;filter_set) {</div><div class='add'>+		if (filter-&gt;protocol || filter-&gt;flags ||</div><div class='add'>+		    (filter-&gt;rt_type &amp;&amp; filter-&gt;rt_type != RTN_MULTICAST))</div><div class='add'>+			return skb-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for (mrt = iter(net, NULL); mrt; mrt = iter(net, mrt)) {</div><div class='ctx'> 		if (t &lt; s_t)</div><div class='ctx'> 			goto next_table;</div><div class='del'>-		list_for_each_entry_rcu(mfc, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='del'>-			if (e &lt; s_e)</div><div class='del'>-				goto next_entry;</div><div class='del'>-			if (fill(mrt, skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				 cb-&gt;nlh-&gt;nlmsg_seq, mfc,</div><div class='del'>-				 RTM_NEWROUTE, NLM_F_MULTI) &lt; 0)</div><div class='del'>-				goto done;</div><div class='del'>-next_entry:</div><div class='del'>-			e++;</div><div class='del'>-		}</div><div class='del'>-		e = 0;</div><div class='del'>-		s_e = 0;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(lock);</div><div class='del'>-		list_for_each_entry(mfc, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='del'>-			if (e &lt; s_e)</div><div class='del'>-				goto next_entry2;</div><div class='del'>-			if (fill(mrt, skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				 cb-&gt;nlh-&gt;nlmsg_seq, mfc,</div><div class='del'>-				 RTM_NEWROUTE, NLM_F_MULTI) &lt; 0) {</div><div class='del'>-				spin_unlock_bh(lock);</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-next_entry2:</div><div class='del'>-			e++;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(lock);</div><div class='del'>-		e = 0;</div><div class='del'>-		s_e = 0;</div><div class='add'>+</div><div class='add'>+		err = mr_table_dump(mrt, skb, cb, fill, lock, filter);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		cb-&gt;args[1] = 0;</div><div class='ctx'> next_table:</div><div class='ctx'> 		t++;</div><div class='ctx'> 	}</div><div class='del'>-done:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	cb-&gt;args[1] = e;</div><div class='ctx'> 	cb-&gt;args[0] = t;</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;len;</div><div class='hunk'>@@ -330,40 +393,52 @@ EXPORT_SYMBOL(mr_rtm_dumproute);</div><div class='ctx'> </div><div class='ctx'> int mr_dump(struct net *net, struct notifier_block *nb, unsigned short family,</div><div class='ctx'> 	    int (*rules_dump)(struct net *net,</div><div class='del'>-			      struct notifier_block *nb),</div><div class='add'>+			      struct notifier_block *nb,</div><div class='add'>+			      struct netlink_ext_ack *extack),</div><div class='ctx'> 	    struct mr_table *(*mr_iter)(struct net *net,</div><div class='ctx'> 					struct mr_table *mrt),</div><div class='del'>-	    rwlock_t *mrt_lock)</div><div class='add'>+	    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = rules_dump(net, nb);</div><div class='add'>+	err = rules_dump(net, nb, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	for (mrt = mr_iter(net, NULL); mrt; mrt = mr_iter(net, mrt)) {</div><div class='ctx'> 		struct vif_device *v = &amp;mrt-&gt;vif_table[0];</div><div class='add'>+		struct net_device *vif_dev;</div><div class='ctx'> 		struct mr_mfc *mfc;</div><div class='ctx'> 		int vifi;</div><div class='ctx'> </div><div class='ctx'> 		/* Notifiy on table VIF entries */</div><div class='del'>-		read_lock(mrt_lock);</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		for (vifi = 0; vifi &lt; mrt-&gt;maxvif; vifi++, v++) {</div><div class='del'>-			if (!v-&gt;dev)</div><div class='add'>+			vif_dev = rcu_dereference(v-&gt;dev);</div><div class='add'>+			if (!vif_dev)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			mr_call_vif_notifier(nb, net, family,</div><div class='del'>-					     FIB_EVENT_VIF_ADD,</div><div class='del'>-					     v, vifi, mrt-&gt;id);</div><div class='add'>+			err = mr_call_vif_notifier(nb, family,</div><div class='add'>+						   FIB_EVENT_VIF_ADD, v,</div><div class='add'>+						   vif_dev, vifi,</div><div class='add'>+						   mrt-&gt;id, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(mrt_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		/* Notify on table MFC entries */</div><div class='del'>-		list_for_each_entry_rcu(mfc, &amp;mrt-&gt;mfc_cache_list, list)</div><div class='del'>-			mr_call_mfc_notifier(nb, net, family,</div><div class='del'>-					     FIB_EVENT_ENTRY_ADD,</div><div class='del'>-					     mfc, mrt-&gt;id);</div><div class='add'>+		list_for_each_entry_rcu(mfc, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='add'>+			err = mr_call_mfc_notifier(nb, family,</div><div class='add'>+						   FIB_EVENT_ENTRY_ADD,</div><div class='add'>+						   mfc, mrt-&gt;id, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/ipv4/metrics.c b/net/ipv4/metrics.c<br/>index 04311f7067e2..8ddac1f595ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/metrics.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/metrics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/metrics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/metrics.c</a></div><div class='hunk'>@@ -1,39 +1,47 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='del'>-int ip_metrics_convert(struct net *net, struct nlattr *fc_mx, int fc_mx_len,</div><div class='del'>-		       u32 *metrics)</div><div class='add'>+static int ip_metrics_convert(struct nlattr *fc_mx,</div><div class='add'>+			      int fc_mx_len, u32 *metrics,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	bool ecn_ca = false;</div><div class='ctx'> 	struct nlattr *nla;</div><div class='ctx'> 	int remaining;</div><div class='ctx'> </div><div class='del'>-	if (!fc_mx)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	nla_for_each_attr(nla, fc_mx, fc_mx_len, remaining) {</div><div class='ctx'> 		int type = nla_type(nla);</div><div class='ctx'> 		u32 val;</div><div class='ctx'> </div><div class='ctx'> 		if (!type)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (type &gt; RTAX_MAX)</div><div class='add'>+		if (type &gt; RTAX_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid metric type");</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		type = array_index_nospec(type, RTAX_MAX + 1);</div><div class='ctx'> 		if (type == RTAX_CC_ALGO) {</div><div class='ctx'> 			char tmp[TCP_CA_NAME_MAX];</div><div class='ctx'> </div><div class='del'>-			nla_strlcpy(tmp, nla, sizeof(tmp));</div><div class='del'>-			val = tcp_ca_get_key_by_name(net, tmp, &amp;ecn_ca);</div><div class='del'>-			if (val == TCP_CA_UNSPEC)</div><div class='add'>+			nla_strscpy(tmp, nla, sizeof(tmp));</div><div class='add'>+			val = tcp_ca_get_key_by_name(tmp, &amp;ecn_ca);</div><div class='add'>+			if (val == TCP_CA_UNSPEC) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Unknown tcp congestion algorithm");</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (nla_len(nla) != sizeof(u32))</div><div class='add'>+			if (nla_len(nla) != sizeof(u32)) {</div><div class='add'>+				NL_SET_ERR_MSG_ATTR(extack, nla,</div><div class='add'>+						    "Invalid attribute in metrics");</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			val = nla_get_u32(nla);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (type == RTAX_ADVMSS &amp;&amp; val &gt; 65535 - 40)</div><div class='hunk'>@@ -42,8 +50,10 @@ int ip_metrics_convert(struct net *net, struct nlattr *fc_mx, int fc_mx_len,</div><div class='ctx'> 			val = 65535 - 15;</div><div class='ctx'> 		if (type == RTAX_HOPLIMIT &amp;&amp; val &gt; 255)</div><div class='ctx'> 			val = 255;</div><div class='del'>-		if (type == RTAX_FEATURES &amp;&amp; (val &amp; ~RTAX_FEATURE_MASK))</div><div class='add'>+		if (type == RTAX_FEATURES &amp;&amp; (val &amp; ~RTAX_FEATURE_MASK)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unknown flag set in feature mask in metrics attribute");</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		metrics[type - 1] = val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -52,4 +62,30 @@ int ip_metrics_convert(struct net *net, struct nlattr *fc_mx, int fc_mx_len,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ip_metrics_convert);</div><div class='add'>+</div><div class='add'>+struct dst_metrics *ip_fib_metrics_init(struct nlattr *fc_mx,</div><div class='add'>+					int fc_mx_len,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dst_metrics *fib_metrics;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!fc_mx)</div><div class='add'>+		return (struct dst_metrics *)&amp;dst_default_metrics;</div><div class='add'>+</div><div class='add'>+	fib_metrics = kzalloc(sizeof(*fib_metrics), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!fib_metrics))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	err = ip_metrics_convert(fc_mx, fc_mx_len, fib_metrics-&gt;metrics,</div><div class='add'>+				 extack);</div><div class='add'>+	if (!err) {</div><div class='add'>+		refcount_set(&amp;fib_metrics-&gt;refcnt, 1);</div><div class='add'>+	} else {</div><div class='add'>+		kfree(fib_metrics);</div><div class='add'>+		fib_metrics = ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fib_metrics;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ip_fib_metrics_init);</div><div class='head'>diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c<br/>index 8d2e5dc9a827..ce310eb779e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter.c</a></div><div class='hunk'>@@ -11,23 +11,27 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/nf_queue.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* route_me_harder function, used by iptable_nat, iptable_mangle + ip_queue */</div><div class='del'>-int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_type)</div><div class='add'>+int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned int addr_type)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = skb_dst_dev(skb);</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct flowi4 fl4 = {};</div><div class='ctx'> 	__be32 saddr = iph-&gt;saddr;</div><div class='del'>-	const struct sock *sk = skb_to_full_sk(skb);</div><div class='del'>-	__u8 flags = sk ? inet_sk_flowi_flags(sk) : 0;</div><div class='del'>-	struct net_device *dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	__u8 flags;</div><div class='add'>+	struct flow_keys flkeys;</div><div class='ctx'> 	unsigned int hh_len;</div><div class='ctx'> </div><div class='add'>+	sk = sk_to_full_sk(sk);</div><div class='add'>+	flags = sk ? inet_sk_flowi_flags(sk) : 0;</div><div class='add'>+</div><div class='ctx'> 	if (addr_type == RTN_UNSPEC)</div><div class='ctx'> 		addr_type = inet_addr_type_dev_table(net, dev, saddr);</div><div class='ctx'> 	if (addr_type == RTN_LOCAL || addr_type == RTN_UNICAST)</div><div class='hunk'>@@ -40,12 +44,12 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t</div><div class='ctx'> 	 */</div><div class='ctx'> 	fl4.daddr = iph-&gt;daddr;</div><div class='ctx'> 	fl4.saddr = saddr;</div><div class='del'>-	fl4.flowi4_tos = RT_TOS(iph-&gt;tos);</div><div class='add'>+	fl4.flowi4_dscp = ip4h_dscp(iph);</div><div class='ctx'> 	fl4.flowi4_oif = sk ? sk-&gt;sk_bound_dev_if : 0;</div><div class='del'>-	if (!fl4.flowi4_oif)</div><div class='del'>-		fl4.flowi4_oif = l3mdev_master_ifindex(dev);</div><div class='add'>+	fl4.flowi4_l3mdev = l3mdev_master_ifindex(dev);</div><div class='ctx'> 	fl4.flowi4_mark = skb-&gt;mark;</div><div class='ctx'> 	fl4.flowi4_flags = flags;</div><div class='add'>+	fib4_rules_early_flow_dissect(net, skb, &amp;fl4, &amp;flkeys);</div><div class='ctx'> 	rt = ip_route_output_key(net, &amp;fl4);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return PTR_ERR(rt);</div><div class='hunk'>@@ -59,9 +63,12 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> 	if (!(IPCB(skb)-&gt;flags &amp; IPSKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-	    xfrm_decode_session(skb, flowi4_to_flowi(&amp;fl4), AF_INET) == 0) {</div><div class='add'>+	    xfrm_decode_session(net, skb, flowi4_to_flowi(&amp;fl4), AF_INET) == 0) {</div><div class='ctx'> 		struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-		skb_dst_set(skb, NULL);</div><div class='add'>+		/* ignore return value from skb_dstref_steal, xfrm_lookup takes</div><div class='add'>+		 * care of dropping the refcnt if needed.</div><div class='add'>+		 */</div><div class='add'>+		skb_dstref_steal(skb);</div><div class='ctx'> 		dst = xfrm_lookup(net, dst, flowi4_to_flowi(&amp;fl4), sk, 0);</div><div class='ctx'> 		if (IS_ERR(dst))</div><div class='ctx'> 			return PTR_ERR(dst);</div><div class='hunk'>@@ -70,7 +77,7 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Change in oif may mean change in hh_len. */</div><div class='del'>-	hh_len = skb_dst(skb)-&gt;dev-&gt;hard_header_len;</div><div class='add'>+	hh_len = skb_dst_dev(skb)-&gt;hard_header_len;</div><div class='ctx'> 	if (skb_headroom(skb) &lt; hh_len &amp;&amp;</div><div class='ctx'> 	    pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)),</div><div class='ctx'> 				0, GFP_ATOMIC))</div><div class='hunk'>@@ -80,24 +87,6 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip_route_me_harder);</div><div class='ctx'> </div><div class='del'>-int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry)</div><div class='del'>-{</div><div class='del'>-	const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;state.hook == NF_INET_LOCAL_OUT) {</div><div class='del'>-		const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-		if (!(iph-&gt;tos == rt_info-&gt;tos &amp;&amp;</div><div class='del'>-		      skb-&gt;mark == rt_info-&gt;mark &amp;&amp;</div><div class='del'>-		      iph-&gt;daddr == rt_info-&gt;daddr &amp;&amp;</div><div class='del'>-		      iph-&gt;saddr == rt_info-&gt;saddr))</div><div class='del'>-			return ip_route_me_harder(entry-&gt;state.net, skb,</div><div class='del'>-						  RTN_UNSPEC);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_ip_reroute);</div><div class='del'>-</div><div class='ctx'> int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,</div><div class='ctx'> 		bool strict __always_unused)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig<br/>index 184bf2e0a1ed..7dc9772fe2d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IP netfilter configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -9,6 +10,17 @@ config NF_DEFRAG_IPV4</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+# old sockopt interface and eval loop</div><div class='add'>+config IP_NF_IPTABLES_LEGACY</div><div class='add'>+	tristate "Legacy IP tables support"</div><div class='add'>+	depends on NETFILTER_XTABLES_LEGACY</div><div class='add'>+	depends on NETFILTER_XTABLES</div><div class='add'>+	default	m if NETFILTER_XTABLES_LEGACY</div><div class='add'>+	help</div><div class='add'>+	  iptables is a legacy packet classifier.</div><div class='add'>+	  This is not needed if you are using iptables over nftables</div><div class='add'>+	  (iptables-nft).</div><div class='add'>+</div><div class='ctx'> config NF_SOCKET_IPV4</div><div class='ctx'> 	tristate "IPv4 socket lookup support"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -27,14 +39,6 @@ config NF_TABLES_IPV4</div><div class='ctx'> </div><div class='ctx'> if NF_TABLES_IPV4</div><div class='ctx'> </div><div class='del'>-config NFT_CHAIN_ROUTE_IPV4</div><div class='del'>-	tristate "IPv4 nf_tables route chain support"</div><div class='del'>-	help</div><div class='del'>-	  This option enables the "route" chain for IPv4 in nf_tables. This</div><div class='del'>-	  chain type is used to force packet re-routing after mangling header</div><div class='del'>-	  fields such as the source, destination, type of service and</div><div class='del'>-	  the packet mark.</div><div class='del'>-</div><div class='ctx'> config NFT_REJECT_IPV4</div><div class='ctx'> 	select NF_REJECT_IPV4</div><div class='ctx'> 	default NFT_REJECT</div><div class='hunk'>@@ -65,14 +69,6 @@ config NF_TABLES_ARP</div><div class='ctx'> </div><div class='ctx'> endif # NF_TABLES</div><div class='ctx'> </div><div class='del'>-config NF_FLOW_TABLE_IPV4</div><div class='del'>-	tristate "Netfilter flow table IPv4 module"</div><div class='del'>-	depends on NF_FLOW_TABLE</div><div class='del'>-	help</div><div class='del'>-	  This option adds the flow table IPv4 support.</div><div class='del'>-</div><div class='del'>-	  To compile it as a module, choose M here.</div><div class='del'>-</div><div class='ctx'> config NF_DUP_IPV4</div><div class='ctx'> 	tristate "Netfilter IPv4 packet duplication to alternate destination"</div><div class='ctx'> 	depends on !NF_CONNTRACK || NF_CONNTRACK</div><div class='hunk'>@@ -83,68 +79,31 @@ config NF_DUP_IPV4</div><div class='ctx'> config NF_LOG_ARP</div><div class='ctx'> 	tristate "ARP packet logging"</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='del'>-	select NF_LOG_COMMON</div><div class='add'>+	select NF_LOG_SYSLOG</div><div class='add'>+	help</div><div class='add'>+	This is a backwards-compat option for the user's convenience</div><div class='add'>+	(e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG.</div><div class='ctx'> </div><div class='ctx'> config NF_LOG_IPV4</div><div class='ctx'> 	tristate "IPv4 packet logging"</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='del'>-	select NF_LOG_COMMON</div><div class='add'>+	select NF_LOG_SYSLOG</div><div class='add'>+	help</div><div class='add'>+	This is a backwards-compat option for the user's convenience</div><div class='add'>+	(e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG.</div><div class='ctx'> </div><div class='ctx'> config NF_REJECT_IPV4</div><div class='ctx'> 	tristate "IPv4 packet rejection"</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='ctx'> </div><div class='del'>-config NF_NAT_IPV4</div><div class='del'>-	tristate "IPv4 NAT"</div><div class='del'>-	depends on NF_CONNTRACK</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='del'>-	select NF_NAT</div><div class='del'>-	help</div><div class='del'>-	  The IPv4 NAT option allows masquerading, port forwarding and other</div><div class='del'>-	  forms of full Network Address Port Translation. This can be</div><div class='del'>-	  controlled by iptables or nft.</div><div class='del'>-</div><div class='del'>-if NF_NAT_IPV4</div><div class='del'>-</div><div class='del'>-config NF_NAT_MASQUERADE_IPV4</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-if NF_TABLES</div><div class='del'>-config NFT_CHAIN_NAT_IPV4</div><div class='del'>-	depends on NF_TABLES_IPV4</div><div class='del'>-	tristate "IPv4 nf_tables nat chain support"</div><div class='del'>-	help</div><div class='del'>-	  This option enables the "nat" chain for IPv4 in nf_tables. This</div><div class='del'>-	  chain type is used to perform Network Address Translation (NAT)</div><div class='del'>-	  packet transformations such as the source, destination address and</div><div class='del'>-	  source and destination ports.</div><div class='del'>-</div><div class='del'>-config NFT_MASQ_IPV4</div><div class='del'>-	tristate "IPv4 masquerading support for nf_tables"</div><div class='del'>-	depends on NF_TABLES_IPV4</div><div class='del'>-	depends on NFT_MASQ</div><div class='del'>-	select NF_NAT_MASQUERADE_IPV4</div><div class='del'>-	help</div><div class='del'>-	  This is the expression that provides IPv4 masquerading support for</div><div class='del'>-	  nf_tables.</div><div class='del'>-</div><div class='del'>-config NFT_REDIR_IPV4</div><div class='del'>-	tristate "IPv4 redirect support for nf_tables"</div><div class='del'>-	depends on NF_TABLES_IPV4</div><div class='del'>-	depends on NFT_REDIR</div><div class='del'>-	select NF_NAT_REDIRECT</div><div class='del'>-	help</div><div class='del'>-	  This is the expression that provides IPv4 redirect support for</div><div class='del'>-	  nf_tables.</div><div class='del'>-endif # NF_TABLES</div><div class='del'>-</div><div class='add'>+if NF_NAT</div><div class='ctx'> config NF_NAT_SNMP_BASIC</div><div class='ctx'> 	tristate "Basic SNMP-ALG support"</div><div class='ctx'> 	depends on NF_CONNTRACK_SNMP</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	default NF_NAT &amp;&amp; NF_CONNTRACK_SNMP</div><div class='ctx'> 	select ASN1</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> </div><div class='ctx'> 	  This module implements an Application Layer Gateway (ALG) for</div><div class='ctx'> 	  SNMP payloads.  In conjunction with NAT, it allows a network</div><div class='hunk'>@@ -156,22 +115,17 @@ config NF_NAT_SNMP_BASIC</div><div class='ctx'> </div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-config NF_NAT_PROTO_GRE</div><div class='del'>-	tristate</div><div class='del'>-	depends on NF_CT_PROTO_GRE</div><div class='del'>-</div><div class='ctx'> config NF_NAT_PPTP</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on NF_CONNTRACK</div><div class='ctx'> 	default NF_CONNTRACK_PPTP</div><div class='del'>-	select NF_NAT_PROTO_GRE</div><div class='ctx'> </div><div class='ctx'> config NF_NAT_H323</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on NF_CONNTRACK</div><div class='ctx'> 	default NF_CONNTRACK_H323</div><div class='ctx'> </div><div class='del'>-endif # NF_NAT_IPV4</div><div class='add'>+endif # NF_NAT</div><div class='ctx'> </div><div class='ctx'> config IP_NF_IPTABLES</div><div class='ctx'> 	tristate "IP tables support (required for filtering/masq/NAT)"</div><div class='hunk'>@@ -201,7 +155,7 @@ config IP_NF_MATCH_ECN</div><div class='ctx'> 	tristate '"ecn" match support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_XT_MATCH_ECN</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This is a backwards-compat option for the user's convenience</div><div class='ctx'> 	(e.g. when running oldconfig). It selects</div><div class='ctx'> 	CONFIG_NETFILTER_XT_MATCH_ECN.</div><div class='hunk'>@@ -209,8 +163,8 @@ config IP_NF_MATCH_ECN</div><div class='ctx'> config IP_NF_MATCH_RPFILTER</div><div class='ctx'> 	tristate '"rpfilter" reverse path filter match support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='del'>-	depends on IP_NF_MANGLE || IP_NF_RAW</div><div class='del'>-	---help---</div><div class='add'>+	depends on IP_NF_MANGLE || IP_NF_RAW || NFT_COMPAT</div><div class='add'>+	help</div><div class='ctx'> 	  This option allows you to match packets whose replies would</div><div class='ctx'> 	  go out via the interface the packet came in.</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +175,7 @@ config IP_NF_MATCH_TTL</div><div class='ctx'> 	tristate '"ttl" match support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_XT_MATCH_HL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This is a backwards-compat option for the user's convenience</div><div class='ctx'> 	(e.g. when running oldconfig). It selects</div><div class='ctx'> 	CONFIG_NETFILTER_XT_MATCH_HL.</div><div class='hunk'>@@ -229,7 +183,8 @@ config IP_NF_MATCH_TTL</div><div class='ctx'> # `filter', generic and specific targets</div><div class='ctx'> config IP_NF_FILTER</div><div class='ctx'> 	tristate "Packet filtering"</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='add'>+	default m if NETFILTER_ADVANCED=n || IP_NF_IPTABLES_LEGACY</div><div class='add'>+	depends on IP_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  Packet filtering defines a table `filter', which has a series of</div><div class='ctx'> 	  rules for simple packet filtering at local input, forwarding and</div><div class='hunk'>@@ -239,7 +194,7 @@ config IP_NF_FILTER</div><div class='ctx'> </div><div class='ctx'> config IP_NF_TARGET_REJECT</div><div class='ctx'> 	tristate "REJECT target support"</div><div class='del'>-	depends on IP_NF_FILTER</div><div class='add'>+	depends on IP_NF_FILTER || NFT_COMPAT</div><div class='ctx'> 	select NF_REJECT_IPV4</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='ctx'> 	help</div><div class='hunk'>@@ -266,9 +221,9 @@ config IP_NF_TARGET_SYNPROXY</div><div class='ctx'> config IP_NF_NAT</div><div class='ctx'> 	tristate "iptables NAT support"</div><div class='ctx'> 	depends on NF_CONNTRACK</div><div class='add'>+	depends on IP_NF_IPTABLES_LEGACY</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='ctx'> 	select NF_NAT</div><div class='del'>-	select NF_NAT_IPV4</div><div class='ctx'> 	select NETFILTER_XT_NAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables the `nat' table in iptables. This allows masquerading,</div><div class='hunk'>@@ -281,22 +236,16 @@ if IP_NF_NAT</div><div class='ctx'> </div><div class='ctx'> config IP_NF_TARGET_MASQUERADE</div><div class='ctx'> 	tristate "MASQUERADE target support"</div><div class='del'>-	select NF_NAT_MASQUERADE_IPV4</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='add'>+	select NETFILTER_XT_TARGET_MASQUERADE</div><div class='ctx'> 	help</div><div class='del'>-	  Masquerading is a special case of NAT: all outgoing connections are</div><div class='del'>-	  changed to seem to come from a particular interface's address, and</div><div class='del'>-	  if the interface goes down, those connections are lost.  This is</div><div class='del'>-	  only useful for dialup accounts with dynamic IP address (ie. your IP</div><div class='del'>-	  address will be different on next dialup).</div><div class='del'>-</div><div class='del'>-	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='add'>+	  This is a backwards-compat option for the user's convenience</div><div class='add'>+	  (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE.</div><div class='ctx'> </div><div class='ctx'> config IP_NF_TARGET_NETMAP</div><div class='ctx'> 	tristate "NETMAP target support"</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_XT_TARGET_NETMAP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This is a backwards-compat option for the user's convenience</div><div class='ctx'> 	(e.g. when running oldconfig). It selects</div><div class='ctx'> 	CONFIG_NETFILTER_XT_TARGET_NETMAP.</div><div class='hunk'>@@ -305,7 +254,7 @@ config IP_NF_TARGET_REDIRECT</div><div class='ctx'> 	tristate "REDIRECT target support"</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_XT_TARGET_REDIRECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This is a backwards-compat option for the user's convenience</div><div class='ctx'> 	(e.g. when running oldconfig). It selects</div><div class='ctx'> 	CONFIG_NETFILTER_XT_TARGET_REDIRECT.</div><div class='hunk'>@@ -315,7 +264,8 @@ endif # IP_NF_NAT</div><div class='ctx'> # mangle + specific targets</div><div class='ctx'> config IP_NF_MANGLE</div><div class='ctx'> 	tristate "Packet mangling"</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='add'>+	default m if NETFILTER_ADVANCED=n || IP_NF_IPTABLES_LEGACY</div><div class='add'>+	depends on IP_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds a `mangle' table to iptables: see the man page for</div><div class='ctx'> 	  iptables(8).  This table is used for various packet alterations</div><div class='hunk'>@@ -323,27 +273,13 @@ config IP_NF_MANGLE</div><div class='ctx'> </div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-config IP_NF_TARGET_CLUSTERIP</div><div class='del'>-	tristate "CLUSTERIP target support"</div><div class='del'>-	depends on IP_NF_MANGLE</div><div class='del'>-	depends on NF_CONNTRACK</div><div class='del'>-	depends on NETFILTER_ADVANCED</div><div class='del'>-	select NF_CONNTRACK_MARK</div><div class='del'>-	select NETFILTER_FAMILY_ARP</div><div class='del'>-	help</div><div class='del'>-	  The CLUSTERIP target allows you to build load-balancing clusters of</div><div class='del'>-	  network servers without having a dedicated load-balancing</div><div class='del'>-	  router/server/switch.</div><div class='del'>-	</div><div class='del'>-	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='del'>-</div><div class='ctx'> config IP_NF_TARGET_ECN</div><div class='ctx'> 	tristate "ECN target support"</div><div class='del'>-	depends on IP_NF_MANGLE</div><div class='add'>+	depends on IP_NF_MANGLE || NFT_COMPAT</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option adds a `ECN' target, which can be used in the iptables mangle</div><div class='del'>-	  table.  </div><div class='add'>+	  table.</div><div class='ctx'> </div><div class='ctx'> 	  You can use this target to remove the ECN bits from the IPv4 header of</div><div class='ctx'> 	  an IP packet.  This is particularly useful, if you need to work around</div><div class='hunk'>@@ -356,7 +292,7 @@ config IP_NF_TARGET_TTL</div><div class='ctx'> 	tristate '"TTL" target support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED &amp;&amp; IP_NF_MANGLE</div><div class='ctx'> 	select NETFILTER_XT_TARGET_HL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This is a backwards-compatible option for the user's convenience</div><div class='ctx'> 	(e.g. when running oldconfig). It selects</div><div class='ctx'> 	CONFIG_NETFILTER_XT_TARGET_HL.</div><div class='hunk'>@@ -364,59 +300,69 @@ config IP_NF_TARGET_TTL</div><div class='ctx'> # raw + specific targets</div><div class='ctx'> config IP_NF_RAW</div><div class='ctx'> 	tristate  'raw table support (required for NOTRACK/TRACE)'</div><div class='add'>+	depends on IP_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds a `raw' table to iptables. This table is the very</div><div class='ctx'> 	  first in the netfilter framework and hooks in at the PREROUTING</div><div class='ctx'> 	  and OUTPUT chains.</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	  If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.  If unsure, say `N'.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.  If unsure, say `N'.</div><div class='ctx'> </div><div class='ctx'> # security table for MAC policy</div><div class='ctx'> config IP_NF_SECURITY</div><div class='ctx'> 	tristate "Security table"</div><div class='ctx'> 	depends on SECURITY</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='add'>+	depends on IP_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds a `security' table to iptables, for use</div><div class='ctx'> 	  with Mandatory Access Control (MAC) policy.</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> endif # IP_NF_IPTABLES</div><div class='ctx'> </div><div class='ctx'> # ARP tables</div><div class='ctx'> config IP_NF_ARPTABLES</div><div class='del'>-	tristate "ARP tables support"</div><div class='del'>-	select NETFILTER_XTABLES</div><div class='del'>-	select NETFILTER_FAMILY_ARP</div><div class='del'>-	depends on NETFILTER_ADVANCED</div><div class='add'>+	tristate "Legacy ARPTABLES support"</div><div class='add'>+	depends on NETFILTER_XTABLES_LEGACY</div><div class='add'>+	depends on NETFILTER_XTABLES</div><div class='add'>+	default	n</div><div class='ctx'> 	help</div><div class='del'>-	  arptables is a general, extensible packet identification framework.</div><div class='del'>-	  The ARP packet filtering and mangling (manipulation)subsystems</div><div class='del'>-	  use this: say Y or M here if you want to use either of those.</div><div class='del'>-</div><div class='del'>-	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='add'>+	  arptables is a legacy packet classifier.</div><div class='add'>+	  This is not needed if you are using arptables over nftables</div><div class='add'>+	  (iptables-nft).</div><div class='ctx'> </div><div class='del'>-if IP_NF_ARPTABLES</div><div class='add'>+config NFT_COMPAT_ARP</div><div class='add'>+	tristate</div><div class='add'>+	depends on NF_TABLES_ARP &amp;&amp; NFT_COMPAT</div><div class='add'>+	default m if NFT_COMPAT=m</div><div class='add'>+	default y if NFT_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> config IP_NF_ARPFILTER</div><div class='del'>-	tristate "ARP packet filtering"</div><div class='add'>+	tristate "arptables-legacy packet filtering support"</div><div class='add'>+	select IP_NF_ARPTABLES</div><div class='add'>+	select NETFILTER_FAMILY_ARP</div><div class='add'>+	depends on NETFILTER_XTABLES_LEGACY</div><div class='add'>+	depends on NETFILTER_XTABLES</div><div class='ctx'> 	help</div><div class='ctx'> 	  ARP packet filtering defines a table `filter', which has a series of</div><div class='ctx'> 	  rules for simple ARP packet filtering at local input and</div><div class='del'>-	  local output.  On a bridge, you can also specify filtering rules</div><div class='del'>-	  for forwarded ARP packets. See the man page for arptables(8).</div><div class='add'>+	  local output.  This is only needed for arptables-legacy(8).</div><div class='add'>+	  Neither arptables-nft nor nftables need this to work.</div><div class='ctx'> </div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config IP_NF_ARP_MANGLE</div><div class='ctx'> 	tristate "ARP payload mangling"</div><div class='add'>+	depends on IP_NF_ARPTABLES || NFT_COMPAT_ARP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Allows altering the ARP packet payload: source and destination</div><div class='ctx'> 	  hardware and network addresses.</div><div class='ctx'> </div><div class='del'>-endif # IP_NF_ARPTABLES</div><div class='add'>+	  This option is needed by both arptables-legacy and arptables-nft.</div><div class='add'>+	  It is not used by nftables.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile<br/>index 367993adf4d3..85502d4dfbb4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/Makefile</a></div><div class='hunk'>@@ -3,20 +3,12 @@</div><div class='ctx'> # Makefile for the netfilter modules on top of IPv4.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-nf_nat_ipv4-y		:= nf_nat_l3proto_ipv4.o nf_nat_proto_icmp.o</div><div class='del'>-nf_nat_ipv4-$(CONFIG_NF_NAT_MASQUERADE_IPV4) += nf_nat_masquerade_ipv4.o</div><div class='del'>-obj-$(CONFIG_NF_NAT_IPV4) += nf_nat_ipv4.o</div><div class='del'>-</div><div class='ctx'> # defrag</div><div class='ctx'> obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NF_SOCKET_IPV4) += nf_socket_ipv4.o</div><div class='ctx'> obj-$(CONFIG_NF_TPROXY_IPV4) += nf_tproxy_ipv4.o</div><div class='ctx'> </div><div class='del'>-# logging</div><div class='del'>-obj-$(CONFIG_NF_LOG_ARP) += nf_log_arp.o</div><div class='del'>-obj-$(CONFIG_NF_LOG_IPV4) += nf_log_ipv4.o</div><div class='del'>-</div><div class='ctx'> # reject</div><div class='ctx'> obj-$(CONFIG_NF_REJECT_IPV4) += nf_reject_ipv4.o</div><div class='ctx'> </div><div class='hunk'>@@ -28,22 +20,12 @@ nf_nat_snmp_basic-y := nf_nat_snmp_basic.asn1.o nf_nat_snmp_basic_main.o</div><div class='ctx'> $(obj)/nf_nat_snmp_basic_main.o: $(obj)/nf_nat_snmp_basic.asn1.h</div><div class='ctx'> obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o</div><div class='ctx'> </div><div class='del'>-# NAT protocols (nf_nat)</div><div class='del'>-obj-$(CONFIG_NF_NAT_PROTO_GRE) += nf_nat_proto_gre.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV4) += nft_chain_route_ipv4.o</div><div class='del'>-obj-$(CONFIG_NFT_CHAIN_NAT_IPV4) += nft_chain_nat_ipv4.o</div><div class='ctx'> obj-$(CONFIG_NFT_REJECT_IPV4) += nft_reject_ipv4.o</div><div class='ctx'> obj-$(CONFIG_NFT_FIB_IPV4) += nft_fib_ipv4.o</div><div class='del'>-obj-$(CONFIG_NFT_MASQ_IPV4) += nft_masq_ipv4.o</div><div class='del'>-obj-$(CONFIG_NFT_REDIR_IPV4) += nft_redir_ipv4.o</div><div class='ctx'> obj-$(CONFIG_NFT_DUP_IPV4) += nft_dup_ipv4.o</div><div class='ctx'> </div><div class='del'>-# flow table support</div><div class='del'>-obj-$(CONFIG_NF_FLOW_TABLE_IPV4) += nf_flow_table_ipv4.o</div><div class='del'>-</div><div class='del'>-# generic IP tables </div><div class='del'>-obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o</div><div class='add'>+# generic IP tables</div><div class='add'>+obj-$(CONFIG_IP_NF_IPTABLES_LEGACY) += ip_tables.o</div><div class='ctx'> </div><div class='ctx'> # the three instances of ip_tables</div><div class='ctx'> obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o</div><div class='hunk'>@@ -57,9 +39,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o</div><div class='ctx'> obj-$(CONFIG_IP_NF_MATCH_RPFILTER) += ipt_rpfilter.o</div><div class='ctx'> </div><div class='ctx'> # targets</div><div class='del'>-obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o</div><div class='ctx'> obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o</div><div class='del'>-obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o</div><div class='ctx'> obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o</div><div class='ctx'> obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c<br/>index 2dc83de53f94..1cdd9c28ab2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arp_tables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arp_tables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arp_tables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/arp_tables.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Packet matching code for ARP packets.</div><div class='ctx'>  *</div><div class='hunk'>@@ -178,10 +179,11 @@ struct arpt_entry *arpt_next_entry(const struct arpt_entry *entry)</div><div class='ctx'> 	return (void *)entry + entry-&gt;next_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int arpt_do_table(struct sk_buff *skb,</div><div class='del'>-			   const struct nf_hook_state *state,</div><div class='del'>-			   struct xt_table *table)</div><div class='add'>+unsigned int arpt_do_table(void *priv,</div><div class='add'>+			   struct sk_buff *skb,</div><div class='add'>+			   const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='add'>+	const struct xt_table *table = priv;</div><div class='ctx'> 	unsigned int hook = state-&gt;hook;</div><div class='ctx'> 	static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));</div><div class='ctx'> 	unsigned int verdict = NF_DROP;</div><div class='hunk'>@@ -383,10 +385,11 @@ next:		;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int check_target(struct arpt_entry *e, const char *name)</div><div class='add'>+static int check_target(struct arpt_entry *e, struct net *net, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct xt_entry_target *t = arpt_get_target(e);</div><div class='ctx'> 	struct xt_tgchk_param par = {</div><div class='add'>+		.net       = net,</div><div class='ctx'> 		.table     = name,</div><div class='ctx'> 		.entryinfo = e,</div><div class='ctx'> 		.target    = t-&gt;u.kernel.target,</div><div class='hunk'>@@ -398,8 +401,9 @@ static inline int check_target(struct arpt_entry *e, const char *name)</div><div class='ctx'> 	return xt_check_target(&amp;par, t-&gt;u.target_size - sizeof(*t), 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,</div><div class='add'>+static int</div><div class='add'>+find_check_entry(struct arpt_entry *e, struct net *net, const char *name,</div><div class='add'>+		 unsigned int size,</div><div class='ctx'> 		 struct xt_percpu_counter_alloc_state *alloc_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct xt_entry_target *t;</div><div class='hunk'>@@ -418,7 +422,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,</div><div class='ctx'> 	}</div><div class='ctx'> 	t-&gt;u.kernel.target = target;</div><div class='ctx'> </div><div class='del'>-	ret = check_target(e, name);</div><div class='add'>+	ret = check_target(e, net, name);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -493,12 +497,13 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cleanup_entry(struct arpt_entry *e)</div><div class='add'>+static void cleanup_entry(struct arpt_entry *e, struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct xt_tgdtor_param par;</div><div class='ctx'> 	struct xt_entry_target *t;</div><div class='ctx'> </div><div class='ctx'> 	t = arpt_get_target(e);</div><div class='add'>+	par.net      = net;</div><div class='ctx'> 	par.target   = t-&gt;u.kernel.target;</div><div class='ctx'> 	par.targinfo = t-&gt;data;</div><div class='ctx'> 	par.family   = NFPROTO_ARP;</div><div class='hunk'>@@ -511,7 +516,9 @@ static inline void cleanup_entry(struct arpt_entry *e)</div><div class='ctx'> /* Checks and translates the user-supplied table segment (held in</div><div class='ctx'>  * newinfo).</div><div class='ctx'>  */</div><div class='del'>-static int translate_table(struct xt_table_info *newinfo, void *entry0,</div><div class='add'>+static int translate_table(struct net *net,</div><div class='add'>+			   struct xt_table_info *newinfo,</div><div class='add'>+			   void *entry0,</div><div class='ctx'> 			   const struct arpt_replace *repl)</div><div class='ctx'> {</div><div class='ctx'> 	struct xt_percpu_counter_alloc_state alloc_state = { 0 };</div><div class='hunk'>@@ -568,7 +575,7 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0,</div><div class='ctx'> 	/* Finally, each sanity check must pass */</div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	xt_entry_foreach(iter, entry0, newinfo-&gt;size) {</div><div class='del'>-		ret = find_check_entry(iter, repl-&gt;name, repl-&gt;size,</div><div class='add'>+		ret = find_check_entry(iter, net, repl-&gt;name, repl-&gt;size,</div><div class='ctx'> 				       &amp;alloc_state);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -579,7 +586,7 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0,</div><div class='ctx'> 		xt_entry_foreach(iter, entry0, newinfo-&gt;size) {</div><div class='ctx'> 			if (i-- == 0)</div><div class='ctx'> 				break;</div><div class='del'>-			cleanup_entry(iter);</div><div class='add'>+			cleanup_entry(iter, net);</div><div class='ctx'> 		}</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -707,7 +714,7 @@ static int copy_entries_to_user(unsigned int total_size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> static void compat_standard_from_user(void *dst, const void *src)</div><div class='ctx'> {</div><div class='ctx'> 	int v = *(compat_int_t *)src;</div><div class='hunk'>@@ -781,8 +788,7 @@ static int compat_table_info(const struct xt_table_info *info,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int get_info(struct net *net, void __user *user,</div><div class='del'>-		    const int *len, int compat)</div><div class='add'>+static int get_info(struct net *net, void __user *user, const int *len)</div><div class='ctx'> {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	struct xt_table *t;</div><div class='hunk'>@@ -795,18 +801,18 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	name[XT_TABLE_MAXNAMELEN-1] = '\0';</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_lock(NFPROTO_ARP);</div><div class='ctx'> #endif</div><div class='ctx'> 	t = xt_request_find_table_lock(net, NFPROTO_ARP, name);</div><div class='ctx'> 	if (!IS_ERR(t)) {</div><div class='ctx'> 		struct arpt_getinfo info;</div><div class='ctx'> 		const struct xt_table_info *private = t-&gt;private;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		struct xt_table_info tmp;</div><div class='ctx'> </div><div class='del'>-		if (compat) {</div><div class='add'>+		if (in_compat_syscall()) {</div><div class='ctx'> 			ret = compat_table_info(private, &amp;tmp);</div><div class='ctx'> 			xt_compat_flush_offsets(NFPROTO_ARP);</div><div class='ctx'> 			private = &amp;tmp;</div><div class='hunk'>@@ -820,7 +826,7 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		       sizeof(info.underflow));</div><div class='ctx'> 		info.num_entries = private-&gt;number;</div><div class='ctx'> 		info.size = private-&gt;size;</div><div class='del'>-		strcpy(info.name, name);</div><div class='add'>+		strscpy(info.name, name);</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user(user, &amp;info, *len) != 0)</div><div class='ctx'> 			ret = -EFAULT;</div><div class='hunk'>@@ -830,8 +836,8 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		module_put(t-&gt;me);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = PTR_ERR(t);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_unlock(NFPROTO_ARP);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -922,7 +928,7 @@ static int __do_replace(struct net *net, const char *name,</div><div class='ctx'> 	/* Decrease module usage counts and free resource */</div><div class='ctx'> 	loc_cpu_old_entry = oldinfo-&gt;entries;</div><div class='ctx'> 	xt_entry_foreach(iter, loc_cpu_old_entry, oldinfo-&gt;size)</div><div class='del'>-		cleanup_entry(iter);</div><div class='add'>+		cleanup_entry(iter, net);</div><div class='ctx'> </div><div class='ctx'> 	xt_free_table_info(oldinfo);</div><div class='ctx'> 	if (copy_to_user(counters_ptr, counters,</div><div class='hunk'>@@ -942,8 +948,7 @@ static int __do_replace(struct net *net, const char *name,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_replace(struct net *net, const void __user *user,</div><div class='del'>-		      unsigned int len)</div><div class='add'>+static int do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct arpt_replace tmp;</div><div class='hunk'>@@ -951,7 +956,9 @@ static int do_replace(struct net *net, const void __user *user,</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct arpt_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -959,6 +966,8 @@ static int do_replace(struct net *net, const void __user *user,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -967,13 +976,13 @@ static int do_replace(struct net *net, const void __user *user,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),</div><div class='del'>-			   tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = translate_table(newinfo, loc_cpu_entry, &amp;tmp);</div><div class='add'>+	ret = translate_table(net, newinfo, loc_cpu_entry, &amp;tmp);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -985,14 +994,13 @@ static int do_replace(struct net *net, const void __user *user,</div><div class='ctx'> </div><div class='ctx'>  free_newinfo_untrans:</div><div class='ctx'> 	xt_entry_foreach(iter, loc_cpu_entry, newinfo-&gt;size)</div><div class='del'>-		cleanup_entry(iter);</div><div class='add'>+		cleanup_entry(iter, net);</div><div class='ctx'>  free_newinfo:</div><div class='ctx'> 	xt_free_table_info(newinfo);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_add_counters(struct net *net, const void __user *user,</div><div class='del'>-			   unsigned int len, int compat)</div><div class='add'>+static int do_add_counters(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct xt_counters_info tmp;</div><div class='hunk'>@@ -1003,7 +1011,7 @@ static int do_add_counters(struct net *net, const void __user *user,</div><div class='ctx'> 	struct arpt_entry *iter;</div><div class='ctx'> 	unsigned int addend;</div><div class='ctx'> </div><div class='del'>-	paddc = xt_copy_counters_from_user(user, len, &amp;tmp, compat);</div><div class='add'>+	paddc = xt_copy_counters(arg, len, &amp;tmp);</div><div class='ctx'> 	if (IS_ERR(paddc))</div><div class='ctx'> 		return PTR_ERR(paddc);</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +1049,7 @@ static int do_add_counters(struct net *net, const void __user *user,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> struct compat_arpt_replace {</div><div class='ctx'> 	char				name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	u32				valid_hooks;</div><div class='hunk'>@@ -1051,7 +1059,7 @@ struct compat_arpt_replace {</div><div class='ctx'> 	u32				underflow[NF_ARP_NUMHOOKS];</div><div class='ctx'> 	u32				num_counters;</div><div class='ctx'> 	compat_uptr_t			counters;</div><div class='del'>-	struct compat_arpt_entry	entries[0];</div><div class='add'>+	struct compat_arpt_entry	entries[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void compat_release_entry(struct compat_arpt_entry *e)</div><div class='hunk'>@@ -1148,7 +1156,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int translate_compat_table(struct xt_table_info **pinfo,</div><div class='add'>+static int translate_compat_table(struct net *net,</div><div class='add'>+				  struct xt_table_info **pinfo,</div><div class='ctx'> 				  void **pentry0,</div><div class='ctx'> 				  const struct compat_arpt_replace *compatr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1189,6 +1198,8 @@ static int translate_compat_table(struct xt_table_info **pinfo,</div><div class='ctx'> 	if (!newinfo)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	memset(newinfo-&gt;entries, 0, size);</div><div class='add'>+</div><div class='ctx'> 	newinfo-&gt;number = compatr-&gt;num_entries;</div><div class='ctx'> 	for (i = 0; i &lt; NF_ARP_NUMHOOKS; i++) {</div><div class='ctx'> 		newinfo-&gt;hook_entry[i] = compatr-&gt;hook_entry[i];</div><div class='hunk'>@@ -1216,7 +1227,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,</div><div class='ctx'> 	repl.num_counters = 0;</div><div class='ctx'> 	repl.counters = NULL;</div><div class='ctx'> 	repl.size = newinfo-&gt;size;</div><div class='del'>-	ret = translate_table(newinfo, entry1, &amp;repl);</div><div class='add'>+	ret = translate_table(net, newinfo, entry1, &amp;repl);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,8 +1250,7 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compat_do_replace(struct net *net, void __user *user,</div><div class='del'>-			     unsigned int len)</div><div class='add'>+static int compat_do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct compat_arpt_replace tmp;</div><div class='hunk'>@@ -1248,7 +1258,9 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct arpt_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -1256,6 +1268,8 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1264,12 +1278,13 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp), tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = translate_compat_table(&amp;newinfo, &amp;loc_cpu_entry, &amp;tmp);</div><div class='add'>+	ret = translate_compat_table(net, &amp;newinfo, &amp;loc_cpu_entry, &amp;tmp);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -1281,36 +1296,12 @@ static int compat_do_replace(struct net *net, void __user *user,</div><div class='ctx'> </div><div class='ctx'>  free_newinfo_untrans:</div><div class='ctx'> 	xt_entry_foreach(iter, loc_cpu_entry, newinfo-&gt;size)</div><div class='del'>-		cleanup_entry(iter);</div><div class='add'>+		cleanup_entry(iter, net);</div><div class='ctx'>  free_newinfo:</div><div class='ctx'> 	xt_free_table_info(newinfo);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compat_do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user,</div><div class='del'>-				  unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case ARPT_SO_SET_REPLACE:</div><div class='del'>-		ret = compat_do_replace(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARPT_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr,</div><div class='ctx'> 				     compat_uint_t *size,</div><div class='ctx'> 				     struct xt_counters *counters,</div><div class='hunk'>@@ -1376,7 +1367,7 @@ static int compat_copy_entries_to_user(unsigned int total_size,</div><div class='ctx'> struct compat_arpt_get_entries {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	compat_uint_t size;</div><div class='del'>-	struct compat_arpt_entry entrytable[0];</div><div class='add'>+	struct compat_arpt_entry entrytable[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int compat_get_entries(struct net *net,</div><div class='hunk'>@@ -1418,32 +1409,10 @@ static int compat_get_entries(struct net *net,</div><div class='ctx'> 	xt_compat_unlock(NFPROTO_ARP);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int do_arpt_get_ctl(struct sock *, int, void __user *, int *);</div><div class='del'>-</div><div class='del'>-static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,</div><div class='del'>-				  int *len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case ARPT_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-	case ARPT_SO_GET_ENTRIES:</div><div class='del'>-		ret = compat_get_entries(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = do_arpt_get_ctl(sk, cmd, user, len);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)</div><div class='add'>+static int do_arpt_set_ctl(struct sock *sk, int cmd, sockptr_t arg,</div><div class='add'>+		unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1452,11 +1421,16 @@ static int do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case ARPT_SO_SET_REPLACE:</div><div class='del'>-		ret = do_replace(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_do_replace(sock_net(sk), arg, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = do_replace(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ARPT_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = do_add_counters(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1475,11 +1449,16 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case ARPT_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = get_info(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ARPT_SO_GET_ENTRIES:</div><div class='del'>-		ret = get_entries(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_get_entries(sock_net(sk), user, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = get_entries(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ARPT_SO_GET_REVISION_TARGET: {</div><div class='hunk'>@@ -1508,7 +1487,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __arpt_unregister_table(struct xt_table *table)</div><div class='add'>+static void __arpt_unregister_table(struct net *net, struct xt_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	struct xt_table_info *private;</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='hunk'>@@ -1520,7 +1499,7 @@ static void __arpt_unregister_table(struct xt_table *table)</div><div class='ctx'> 	/* Decrease module usage counts and free resources */</div><div class='ctx'> 	loc_cpu_entry = private-&gt;entries;</div><div class='ctx'> 	xt_entry_foreach(iter, loc_cpu_entry, private-&gt;size)</div><div class='del'>-		cleanup_entry(iter);</div><div class='add'>+		cleanup_entry(iter, net);</div><div class='ctx'> 	if (private-&gt;number &gt; private-&gt;initial_entries)</div><div class='ctx'> 		module_put(table_owner);</div><div class='ctx'> 	xt_free_table_info(private);</div><div class='hunk'>@@ -1529,10 +1508,11 @@ static void __arpt_unregister_table(struct xt_table *table)</div><div class='ctx'> int arpt_register_table(struct net *net,</div><div class='ctx'> 			const struct xt_table *table,</div><div class='ctx'> 			const struct arpt_replace *repl,</div><div class='del'>-			const struct nf_hook_ops *ops,</div><div class='del'>-			struct xt_table **res)</div><div class='add'>+			const struct nf_hook_ops *template_ops)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	unsigned int num_ops;</div><div class='add'>+	int ret, i;</div><div class='ctx'> 	struct xt_table_info *newinfo;</div><div class='ctx'> 	struct xt_table_info bootstrap = {0};</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='hunk'>@@ -1545,37 +1525,65 @@ int arpt_register_table(struct net *net,</div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='ctx'> 	memcpy(loc_cpu_entry, repl-&gt;entries, repl-&gt;size);</div><div class='ctx'> </div><div class='del'>-	ret = translate_table(newinfo, loc_cpu_entry, repl);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+	ret = translate_table(net, newinfo, loc_cpu_entry, repl);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	new_table = xt_register_table(net, table, &amp;bootstrap, newinfo);</div><div class='ctx'> 	if (IS_ERR(new_table)) {</div><div class='del'>-		ret = PTR_ERR(new_table);</div><div class='del'>-		goto out_free;</div><div class='add'>+		struct arpt_entry *iter;</div><div class='add'>+</div><div class='add'>+		xt_entry_foreach(iter, loc_cpu_entry, newinfo-&gt;size)</div><div class='add'>+			cleanup_entry(iter, net);</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return PTR_ERR(new_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set res now, will see skbs right after nf_register_net_hooks */</div><div class='del'>-	WRITE_ONCE(*res, new_table);</div><div class='add'>+	num_ops = hweight32(table-&gt;valid_hooks);</div><div class='add'>+	if (num_ops == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = nf_register_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		__arpt_unregister_table(new_table);</div><div class='del'>-		*res = NULL;</div><div class='add'>+	ops = kmemdup_array(template_ops, num_ops, sizeof(*ops), GFP_KERNEL);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; num_ops; i++)</div><div class='add'>+		ops[i].priv = new_table;</div><div class='add'>+</div><div class='add'>+	new_table-&gt;ops = ops;</div><div class='add'>+</div><div class='add'>+	ret = nf_register_net_hooks(net, ops, num_ops);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	xt_free_table_info(newinfo);</div><div class='add'>+	__arpt_unregister_table(net, new_table);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arpt_unregister_table(struct net *net, struct xt_table *table,</div><div class='del'>-			   const struct nf_hook_ops *ops)</div><div class='add'>+void arpt_unregister_table_pre_exit(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	nf_unregister_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	__arpt_unregister_table(table);</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_ARP, name);</div><div class='add'>+</div><div class='add'>+	if (table)</div><div class='add'>+		nf_unregister_net_hooks(net, table-&gt;ops, hweight32(table-&gt;valid_hooks));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(arpt_unregister_table_pre_exit);</div><div class='add'>+</div><div class='add'>+void arpt_unregister_table(struct net *net, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_ARP, name);</div><div class='add'>+</div><div class='add'>+	if (table)</div><div class='add'>+		__arpt_unregister_table(net, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The built-in targets: standard (NULL) and error. */</div><div class='hunk'>@@ -1584,7 +1592,7 @@ static struct xt_target arpt_builtin_tg[] __read_mostly = {</div><div class='ctx'> 		.name             = XT_STANDARD_TARGET,</div><div class='ctx'> 		.targetsize       = sizeof(int),</div><div class='ctx'> 		.family           = NFPROTO_ARP,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		.compatsize       = sizeof(compat_int_t),</div><div class='ctx'> 		.compat_from_user = compat_standard_from_user,</div><div class='ctx'> 		.compat_to_user   = compat_standard_to_user,</div><div class='hunk'>@@ -1603,15 +1611,9 @@ static struct nf_sockopt_ops arpt_sockopts = {</div><div class='ctx'> 	.set_optmin	= ARPT_BASE_CTL,</div><div class='ctx'> 	.set_optmax	= ARPT_SO_SET_MAX+1,</div><div class='ctx'> 	.set		= do_arpt_set_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_set	= compat_do_arpt_set_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.get_optmin	= ARPT_BASE_CTL,</div><div class='ctx'> 	.get_optmax	= ARPT_SO_GET_MAX+1,</div><div class='ctx'> 	.get		= do_arpt_get_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_get	= compat_do_arpt_get_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c<br/>index a5e52a9f0a12..a4e07e5e9c11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arpt_mangle.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arpt_mangle.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arpt_mangle.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/arpt_mangle.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* module that allows mangling of the arp payload */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='hunk'>@@ -16,7 +17,7 @@ target(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 	unsigned char *arpptr;</div><div class='ctx'> 	int pln, hln;</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, skb-&gt;len))</div><div class='add'>+	if (skb_ensure_writable(skb, skb-&gt;len))</div><div class='ctx'> 		return NF_DROP;</div><div class='ctx'> </div><div class='ctx'> 	arp = arp_hdr(skb);</div><div class='head'>diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c<br/>index 8f8713b4388f..78cd5ee24448 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arptable_filter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/arptable_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/arptable_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/arptable_filter.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Filtering ARP tables module.</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,82 +18,72 @@ MODULE_DESCRIPTION("arptables filter table");</div><div class='ctx'> #define FILTER_VALID_HOOKS ((1 &lt;&lt; NF_ARP_IN) | (1 &lt;&lt; NF_ARP_OUT) | \</div><div class='ctx'> 			   (1 &lt;&lt; NF_ARP_FORWARD))</div><div class='ctx'> </div><div class='del'>-static int __net_init arptable_filter_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table packet_filter = {</div><div class='ctx'> 	.name		= "filter",</div><div class='ctx'> 	.valid_hooks	= FILTER_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_ARP,</div><div class='ctx'> 	.priority	= NF_IP_PRI_FILTER,</div><div class='del'>-	.table_init	= arptable_filter_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The work comes in here from netfilter.c */</div><div class='del'>-static unsigned int</div><div class='del'>-arptable_filter_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return arpt_do_table(skb, state, state-&gt;net-&gt;ipv4.arptable_filter);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *arpfilter_ops __read_mostly;</div><div class='ctx'> </div><div class='del'>-static int __net_init arptable_filter_table_init(struct net *net)</div><div class='add'>+static int arptable_filter_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct arpt_replace *repl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.arptable_filter)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = arpt_alloc_initial_table(&amp;packet_filter);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	err = arpt_register_table(net, &amp;packet_filter, repl, arpfilter_ops,</div><div class='del'>-				  &amp;net-&gt;ipv4.arptable_filter);</div><div class='add'>+	err = arpt_register_table(net, &amp;packet_filter, repl, arpfilter_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit arptable_filter_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	arpt_unregister_table_pre_exit(net, "filter");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit arptable_filter_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.arptable_filter)</div><div class='del'>-		return;</div><div class='del'>-	arpt_unregister_table(net, net-&gt;ipv4.arptable_filter, arpfilter_ops);</div><div class='del'>-	net-&gt;ipv4.arptable_filter = NULL;</div><div class='add'>+	arpt_unregister_table(net, "filter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations arptable_filter_net_ops = {</div><div class='ctx'> 	.exit = arptable_filter_net_exit,</div><div class='add'>+	.pre_exit = arptable_filter_net_pre_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init arptable_filter_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;packet_filter,</div><div class='add'>+				       arptable_filter_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	arpfilter_ops = xt_hook_ops_alloc(&amp;packet_filter, arptable_filter_hook);</div><div class='del'>-	if (IS_ERR(arpfilter_ops))</div><div class='add'>+	arpfilter_ops = xt_hook_ops_alloc(&amp;packet_filter, arpt_do_table);</div><div class='add'>+	if (IS_ERR(arpfilter_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		return PTR_ERR(arpfilter_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;arptable_filter_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		kfree(arpfilter_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = arptable_filter_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;arptable_filter_net_ops);</div><div class='del'>-		kfree(arpfilter_ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit arptable_filter_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;arptable_filter_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 	kfree(arpfilter_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c<br/>index e77872c93c20..23c8deff8095 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ip_tables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ip_tables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ip_tables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ip_tables.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Packet matching code.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2005 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='ctx'>  * Copyright (C) 2006-2010 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='hunk'>@@ -17,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/icmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/compat.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -34,7 +30,6 @@</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Netfilter Core Team &lt;coreteam@netfilter.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IPv4 packet filter");</div><div class='del'>-MODULE_ALIAS("ipt_icmp");</div><div class='ctx'> </div><div class='ctx'> void *ipt_alloc_initial_table(const struct xt_table *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -225,10 +220,11 @@ struct ipt_entry *ipt_next_entry(const struct ipt_entry *entry)</div><div class='ctx'> </div><div class='ctx'> /* Returns one of the generic firewall policies, like NF_ACCEPT. */</div><div class='ctx'> unsigned int</div><div class='del'>-ipt_do_table(struct sk_buff *skb,</div><div class='del'>-	     const struct nf_hook_state *state,</div><div class='del'>-	     struct xt_table *table)</div><div class='add'>+ipt_do_table(void *priv,</div><div class='add'>+	     struct sk_buff *skb,</div><div class='add'>+	     const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='add'>+	const struct xt_table *table = priv;</div><div class='ctx'> 	unsigned int hook = state-&gt;hook;</div><div class='ctx'> 	static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));</div><div class='ctx'> 	const struct iphdr *ip;</div><div class='hunk'>@@ -274,7 +270,7 @@ ipt_do_table(struct sk_buff *skb,</div><div class='ctx'> 	 * but it is no problem since absolute verdict is issued by these.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (static_key_false(&amp;xt_tee_enabled))</div><div class='del'>-		jumpstack += private-&gt;stacksize * __this_cpu_read(nf_skb_duplicated);</div><div class='add'>+		jumpstack += private-&gt;stacksize * current-&gt;in_nf_duplicate;</div><div class='ctx'> </div><div class='ctx'> 	e = get_entry(table_base, private-&gt;hook_entry[hook]);</div><div class='ctx'> </div><div class='hunk'>@@ -871,7 +867,7 @@ copy_entries_to_user(unsigned int total_size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> static void compat_standard_from_user(void *dst, const void *src)</div><div class='ctx'> {</div><div class='ctx'> 	int v = *(compat_int_t *)src;</div><div class='hunk'>@@ -947,8 +943,7 @@ static int compat_table_info(const struct xt_table_info *info,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int get_info(struct net *net, void __user *user,</div><div class='del'>-		    const int *len, int compat)</div><div class='add'>+static int get_info(struct net *net, void __user *user, const int *len)</div><div class='ctx'> {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	struct xt_table *t;</div><div class='hunk'>@@ -961,18 +956,18 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	name[XT_TABLE_MAXNAMELEN-1] = '\0';</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_lock(AF_INET);</div><div class='ctx'> #endif</div><div class='ctx'> 	t = xt_request_find_table_lock(net, AF_INET, name);</div><div class='ctx'> 	if (!IS_ERR(t)) {</div><div class='ctx'> 		struct ipt_getinfo info;</div><div class='ctx'> 		const struct xt_table_info *private = t-&gt;private;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		struct xt_table_info tmp;</div><div class='ctx'> </div><div class='del'>-		if (compat) {</div><div class='add'>+		if (in_compat_syscall()) {</div><div class='ctx'> 			ret = compat_table_info(private, &amp;tmp);</div><div class='ctx'> 			xt_compat_flush_offsets(AF_INET);</div><div class='ctx'> 			private = &amp;tmp;</div><div class='hunk'>@@ -986,7 +981,7 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		       sizeof(info.underflow));</div><div class='ctx'> 		info.num_entries = private-&gt;number;</div><div class='ctx'> 		info.size = private-&gt;size;</div><div class='del'>-		strcpy(info.name, name);</div><div class='add'>+		strscpy(info.name, name);</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user(user, &amp;info, *len) != 0)</div><div class='ctx'> 			ret = -EFAULT;</div><div class='hunk'>@@ -997,8 +992,8 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		module_put(t-&gt;me);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = PTR_ERR(t);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_unlock(AF_INET);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1048,7 +1043,6 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> 	struct xt_counters *counters;</div><div class='ctx'> 	struct ipt_entry *iter;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	counters = xt_counters_alloc(num_counters);</div><div class='ctx'> 	if (!counters) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1094,7 +1088,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> 		net_warn_ratelimited("iptables: counters copy to user failed while replacing table\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	vfree(counters);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>  put_module:</div><div class='ctx'> 	module_put(t-&gt;me);</div><div class='hunk'>@@ -1106,7 +1100,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='add'>+do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ipt_replace tmp;</div><div class='hunk'>@@ -1114,7 +1108,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct ipt_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -1122,6 +1118,8 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1130,8 +1128,8 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),</div><div class='del'>-			   tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1155,8 +1153,7 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_add_counters(struct net *net, const void __user *user,</div><div class='del'>-		unsigned int len, int compat)</div><div class='add'>+do_add_counters(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct xt_counters_info tmp;</div><div class='hunk'>@@ -1167,7 +1164,7 @@ do_add_counters(struct net *net, const void __user *user,</div><div class='ctx'> 	struct ipt_entry *iter;</div><div class='ctx'> 	unsigned int addend;</div><div class='ctx'> </div><div class='del'>-	paddc = xt_copy_counters_from_user(user, len, &amp;tmp, compat);</div><div class='add'>+	paddc = xt_copy_counters(arg, len, &amp;tmp);</div><div class='ctx'> 	if (IS_ERR(paddc))</div><div class='ctx'> 		return PTR_ERR(paddc);</div><div class='ctx'> </div><div class='hunk'>@@ -1204,7 +1201,7 @@ do_add_counters(struct net *net, const void __user *user,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> struct compat_ipt_replace {</div><div class='ctx'> 	char			name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	u32			valid_hooks;</div><div class='hunk'>@@ -1214,7 +1211,7 @@ struct compat_ipt_replace {</div><div class='ctx'> 	u32			underflow[NF_INET_NUMHOOKS];</div><div class='ctx'> 	u32			num_counters;</div><div class='ctx'> 	compat_uptr_t		counters;	/* struct xt_counters * */</div><div class='del'>-	struct compat_ipt_entry	entries[0];</div><div class='add'>+	struct compat_ipt_entry	entries[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1433,6 +1430,8 @@ translate_compat_table(struct net *net,</div><div class='ctx'> 	if (!newinfo)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	memset(newinfo-&gt;entries, 0, size);</div><div class='add'>+</div><div class='ctx'> 	newinfo-&gt;number = compatr-&gt;num_entries;</div><div class='ctx'> 	for (i = 0; i &lt; NF_INET_NUMHOOKS; i++) {</div><div class='ctx'> 		newinfo-&gt;hook_entry[i] = compatr-&gt;hook_entry[i];</div><div class='hunk'>@@ -1489,7 +1488,7 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='add'>+compat_do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct compat_ipt_replace tmp;</div><div class='hunk'>@@ -1497,7 +1496,9 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct ipt_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -1505,6 +1506,8 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1513,8 +1516,8 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),</div><div class='del'>-			   tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1537,35 +1540,10 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-compat_do_ipt_set_ctl(struct sock *sk,	int cmd, void __user *user,</div><div class='del'>-		      unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case IPT_SO_SET_REPLACE:</div><div class='del'>-		ret = compat_do_replace(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IPT_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct compat_ipt_get_entries {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	compat_uint_t size;</div><div class='del'>-	struct compat_ipt_entry entrytable[0];</div><div class='add'>+	struct compat_ipt_entry entrytable[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1637,33 +1615,10 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr,</div><div class='ctx'> 	xt_compat_unlock(AF_INET);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int do_ipt_get_ctl(struct sock *, int, void __user *, int *);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case IPT_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-	case IPT_SO_GET_ENTRIES:</div><div class='del'>-		ret = compat_get_entries(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = do_ipt_get_ctl(sk, cmd, user, len);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)</div><div class='add'>+do_ipt_set_ctl(struct sock *sk, int cmd, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1672,11 +1627,16 @@ do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case IPT_SO_SET_REPLACE:</div><div class='del'>-		ret = do_replace(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_do_replace(sock_net(sk), arg, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = do_replace(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPT_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = do_add_counters(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1696,11 +1656,16 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case IPT_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = get_info(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPT_SO_GET_ENTRIES:</div><div class='del'>-		ret = get_entries(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_get_entries(sock_net(sk), user, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = get_entries(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPT_SO_GET_REVISION_MATCH:</div><div class='hunk'>@@ -1757,9 +1722,11 @@ static void __ipt_unregister_table(struct net *net, struct xt_table *table)</div><div class='ctx'> </div><div class='ctx'> int ipt_register_table(struct net *net, const struct xt_table *table,</div><div class='ctx'> 		       const struct ipt_replace *repl,</div><div class='del'>-		       const struct nf_hook_ops *ops, struct xt_table **res)</div><div class='add'>+		       const struct nf_hook_ops *template_ops)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	unsigned int num_ops;</div><div class='add'>+	int ret, i;</div><div class='ctx'> 	struct xt_table_info *newinfo;</div><div class='ctx'> 	struct xt_table_info bootstrap = {0};</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='hunk'>@@ -1773,85 +1740,69 @@ int ipt_register_table(struct net *net, const struct xt_table *table,</div><div class='ctx'> 	memcpy(loc_cpu_entry, repl-&gt;entries, repl-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	ret = translate_table(net, newinfo, loc_cpu_entry, repl);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	new_table = xt_register_table(net, table, &amp;bootstrap, newinfo);</div><div class='ctx'> 	if (IS_ERR(new_table)) {</div><div class='del'>-		ret = PTR_ERR(new_table);</div><div class='del'>-		goto out_free;</div><div class='add'>+		struct ipt_entry *iter;</div><div class='add'>+</div><div class='add'>+		xt_entry_foreach(iter, loc_cpu_entry, newinfo-&gt;size)</div><div class='add'>+			cleanup_entry(iter, net);</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return PTR_ERR(new_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set res now, will see skbs right after nf_register_net_hooks */</div><div class='del'>-	WRITE_ONCE(*res, new_table);</div><div class='del'>-	if (!ops)</div><div class='add'>+	/* No template? No need to do anything. This is used by 'nat' table, it registers</div><div class='add'>+	 * with the nat core instead of the netfilter core.</div><div class='add'>+	 */</div><div class='add'>+	if (!template_ops)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = nf_register_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		__ipt_unregister_table(net, new_table);</div><div class='del'>-		*res = NULL;</div><div class='add'>+	num_ops = hweight32(table-&gt;valid_hooks);</div><div class='add'>+	if (num_ops == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = kmemdup_array(template_ops, num_ops, sizeof(*ops), GFP_KERNEL);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; num_ops; i++)</div><div class='add'>+		ops[i].priv = new_table;</div><div class='add'>+</div><div class='add'>+	new_table-&gt;ops = ops;</div><div class='add'>+</div><div class='add'>+	ret = nf_register_net_hooks(net, ops, num_ops);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	xt_free_table_info(newinfo);</div><div class='add'>+	__ipt_unregister_table(net, new_table);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipt_unregister_table(struct net *net, struct xt_table *table,</div><div class='del'>-			  const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	if (ops)</div><div class='del'>-		nf_unregister_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	__ipt_unregister_table(net, table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns 1 if the type and code is matched by the range, 0 otherwise */</div><div class='del'>-static inline bool</div><div class='del'>-icmp_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,</div><div class='del'>-		     u_int8_t type, u_int8_t code,</div><div class='del'>-		     bool invert)</div><div class='del'>-{</div><div class='del'>-	return ((test_type == 0xFF) ||</div><div class='del'>-		(type == test_type &amp;&amp; code &gt;= min_code &amp;&amp; code &lt;= max_code))</div><div class='del'>-		^ invert;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-icmp_match(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='add'>+void ipt_unregister_table_pre_exit(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	const struct icmphdr *ic;</div><div class='del'>-	struct icmphdr _icmph;</div><div class='del'>-	const struct ipt_icmp *icmpinfo = par-&gt;matchinfo;</div><div class='del'>-</div><div class='del'>-	/* Must not be a fragment. */</div><div class='del'>-	if (par-&gt;fragoff != 0)</div><div class='del'>-		return false;</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_IPV4, name);</div><div class='ctx'> </div><div class='del'>-	ic = skb_header_pointer(skb, par-&gt;thoff, sizeof(_icmph), &amp;_icmph);</div><div class='del'>-	if (ic == NULL) {</div><div class='del'>-		/* We've been asked to examine this packet, and we</div><div class='del'>-		 * can't.  Hence, no choice but to drop.</div><div class='del'>-		 */</div><div class='del'>-		par-&gt;hotdrop = true;</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return icmp_type_code_match(icmpinfo-&gt;type,</div><div class='del'>-				    icmpinfo-&gt;code[0],</div><div class='del'>-				    icmpinfo-&gt;code[1],</div><div class='del'>-				    ic-&gt;type, ic-&gt;code,</div><div class='del'>-				    !!(icmpinfo-&gt;invflags&amp;IPT_ICMP_INV));</div><div class='add'>+	if (table)</div><div class='add'>+		nf_unregister_net_hooks(net, table-&gt;ops, hweight32(table-&gt;valid_hooks));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int icmp_checkentry(const struct xt_mtchk_param *par)</div><div class='add'>+void ipt_unregister_table_exit(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	const struct ipt_icmp *icmpinfo = par-&gt;matchinfo;</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_IPV4, name);</div><div class='ctx'> </div><div class='del'>-	/* Must specify no unknown invflags */</div><div class='del'>-	return (icmpinfo-&gt;invflags &amp; ~IPT_ICMP_INV) ? -EINVAL : 0;</div><div class='add'>+	if (table)</div><div class='add'>+		__ipt_unregister_table(net, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct xt_target ipt_builtin_tg[] __read_mostly = {</div><div class='hunk'>@@ -1859,7 +1810,7 @@ static struct xt_target ipt_builtin_tg[] __read_mostly = {</div><div class='ctx'> 		.name             = XT_STANDARD_TARGET,</div><div class='ctx'> 		.targetsize       = sizeof(int),</div><div class='ctx'> 		.family           = NFPROTO_IPV4,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		.compatsize       = sizeof(compat_int_t),</div><div class='ctx'> 		.compat_from_user = compat_standard_from_user,</div><div class='ctx'> 		.compat_to_user   = compat_standard_to_user,</div><div class='hunk'>@@ -1878,30 +1829,12 @@ static struct nf_sockopt_ops ipt_sockopts = {</div><div class='ctx'> 	.set_optmin	= IPT_BASE_CTL,</div><div class='ctx'> 	.set_optmax	= IPT_SO_SET_MAX+1,</div><div class='ctx'> 	.set		= do_ipt_set_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_set	= compat_do_ipt_set_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.get_optmin	= IPT_BASE_CTL,</div><div class='ctx'> 	.get_optmax	= IPT_SO_GET_MAX+1,</div><div class='ctx'> 	.get		= do_ipt_get_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_get	= compat_do_ipt_get_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct xt_match ipt_builtin_mt[] __read_mostly = {</div><div class='del'>-	{</div><div class='del'>-		.name       = "icmp",</div><div class='del'>-		.match      = icmp_match,</div><div class='del'>-		.matchsize  = sizeof(struct ipt_icmp),</div><div class='del'>-		.checkentry = icmp_checkentry,</div><div class='del'>-		.proto      = IPPROTO_ICMP,</div><div class='del'>-		.family     = NFPROTO_IPV4,</div><div class='del'>-		.me	    = THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __net_init ip_tables_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return xt_proto_init(net, NFPROTO_IPV4);</div><div class='hunk'>@@ -1929,19 +1862,14 @@ static int __init ip_tables_init(void)</div><div class='ctx'> 	ret = xt_register_targets(ipt_builtin_tg, ARRAY_SIZE(ipt_builtin_tg));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='del'>-	ret = xt_register_matches(ipt_builtin_mt, ARRAY_SIZE(ipt_builtin_mt));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err4;</div><div class='ctx'> </div><div class='ctx'> 	/* Register setsockopt */</div><div class='ctx'> 	ret = nf_register_sockopt(&amp;ipt_sockopts);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto err5;</div><div class='add'>+		goto err4;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err5:</div><div class='del'>-	xt_unregister_matches(ipt_builtin_mt, ARRAY_SIZE(ipt_builtin_mt));</div><div class='ctx'> err4:</div><div class='ctx'> 	xt_unregister_targets(ipt_builtin_tg, ARRAY_SIZE(ipt_builtin_tg));</div><div class='ctx'> err2:</div><div class='hunk'>@@ -1954,13 +1882,13 @@ static void __exit ip_tables_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	nf_unregister_sockopt(&amp;ipt_sockopts);</div><div class='ctx'> </div><div class='del'>-	xt_unregister_matches(ipt_builtin_mt, ARRAY_SIZE(ipt_builtin_mt));</div><div class='ctx'> 	xt_unregister_targets(ipt_builtin_tg, ARRAY_SIZE(ipt_builtin_tg));</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip_tables_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ipt_register_table);</div><div class='del'>-EXPORT_SYMBOL(ipt_unregister_table);</div><div class='add'>+EXPORT_SYMBOL(ipt_unregister_table_pre_exit);</div><div class='add'>+EXPORT_SYMBOL(ipt_unregister_table_exit);</div><div class='ctx'> EXPORT_SYMBOL(ipt_do_table);</div><div class='ctx'> module_init(ip_tables_init);</div><div class='ctx'> module_exit(ip_tables_fini);</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c<br/>deleted file mode 100644<br/>index 2c8d313ae216..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_CLUSTERIP.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,884 +0,0 @@</div><div class='del'>-/* Cluster IP hashmark target</div><div class='del'>- * (C) 2003-2004 by Harald Welte &lt;laforge@netfilter.org&gt;</div><div class='del'>- * based on ideas of Fabio Olive Leite &lt;olive@unixforge.org&gt;</div><div class='del'>- *</div><div class='del'>- * Development of this code funded by SuSE Linux AG, http://www.suse.com/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/jhash.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;linux/icmp.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_arp.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/x_tables.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4/ip_tables.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4/ipt_CLUSTERIP.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/netns/generic.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-</div><div class='del'>-#define CLUSTERIP_VERSION "0.8"</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Harald Welte &lt;laforge@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Xtables: CLUSTERIP target");</div><div class='del'>-</div><div class='del'>-struct clusterip_config {</div><div class='del'>-	struct list_head list;			/* list of all configs */</div><div class='del'>-	refcount_t refcount;			/* reference count */</div><div class='del'>-	refcount_t entries;			/* number of entries/rules</div><div class='del'>-						 * referencing us */</div><div class='del'>-</div><div class='del'>-	__be32 clusterip;			/* the IP address */</div><div class='del'>-	u_int8_t clustermac[ETH_ALEN];		/* the MAC address */</div><div class='del'>-	int ifindex;				/* device ifindex */</div><div class='del'>-	u_int16_t num_total_nodes;		/* total number of nodes */</div><div class='del'>-	unsigned long local_nodes;		/* node number array */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	struct proc_dir_entry *pde;		/* proc dir entry */</div><div class='del'>-#endif</div><div class='del'>-	enum clusterip_hashmode hash_mode;	/* which hashing mode */</div><div class='del'>-	u_int32_t hash_initval;			/* hash initialization */</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-</div><div class='del'>-	char ifname[IFNAMSIZ];			/* device ifname */</div><div class='del'>-	struct notifier_block notifier;		/* refresh c-&gt;ifindex in it */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static const struct file_operations clusterip_proc_fops;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static unsigned int clusterip_net_id __read_mostly;</div><div class='del'>-</div><div class='del'>-struct clusterip_net {</div><div class='del'>-	struct list_head configs;</div><div class='del'>-	/* lock protects the configs list */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	struct proc_dir_entry *procdir;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-clusterip_config_get(struct clusterip_config *c)</div><div class='del'>-{</div><div class='del'>-	refcount_inc(&amp;c-&gt;refcount);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void clusterip_config_rcu_free(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	kfree(container_of(head, struct clusterip_config, rcu));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-clusterip_config_put(struct clusterip_config *c)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;c-&gt;refcount))</div><div class='del'>-		call_rcu_bh(&amp;c-&gt;rcu, clusterip_config_rcu_free);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decrease the count of entries using/referencing this config.  If last</div><div class='del'>- * entry(rule) is removed, remove the config from lists, but don't free it</div><div class='del'>- * yet, since proc-files could still be holding references */</div><div class='del'>-static inline void</div><div class='del'>-clusterip_config_entry_put(struct net *net, struct clusterip_config *c)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_net *cn = net_generic(net, clusterip_net_id);</div><div class='del'>-</div><div class='del'>-	local_bh_disable();</div><div class='del'>-	if (refcount_dec_and_lock(&amp;c-&gt;entries, &amp;cn-&gt;lock)) {</div><div class='del'>-		/* In case anyone still accesses the file, the open/close</div><div class='del'>-		 * functions are also incrementing the refcount on their own,</div><div class='del'>-		 * so it's safe to remove the entry even if it's in use. */</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-		if (cn-&gt;procdir)</div><div class='del'>-			proc_remove(c-&gt;pde);</div><div class='del'>-#endif</div><div class='del'>-		list_del_rcu(&amp;c-&gt;list);</div><div class='del'>-		spin_unlock(&amp;cn-&gt;lock);</div><div class='del'>-		local_bh_enable();</div><div class='del'>-</div><div class='del'>-		unregister_netdevice_notifier(&amp;c-&gt;notifier);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	local_bh_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clusterip_config *</div><div class='del'>-__clusterip_config_find(struct net *net, __be32 clusterip)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_config *c;</div><div class='del'>-	struct clusterip_net *cn = net_generic(net, clusterip_net_id);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(c, &amp;cn-&gt;configs, list) {</div><div class='del'>-		if (c-&gt;clusterip == clusterip)</div><div class='del'>-			return c;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct clusterip_config *</div><div class='del'>-clusterip_config_find_get(struct net *net, __be32 clusterip, int entry)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_config *c;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	c = __clusterip_config_find(net, clusterip);</div><div class='del'>-	if (c) {</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-		if (!c-&gt;pde)</div><div class='del'>-			c = NULL;</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-		if (unlikely(!refcount_inc_not_zero(&amp;c-&gt;refcount)))</div><div class='del'>-			c = NULL;</div><div class='del'>-		else if (entry) {</div><div class='del'>-			if (unlikely(!refcount_inc_not_zero(&amp;c-&gt;entries))) {</div><div class='del'>-				clusterip_config_put(c);</div><div class='del'>-				c = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clusterip_config_init_nodelist(struct clusterip_config *c,</div><div class='del'>-			       const struct ipt_clusterip_tgt_info *i)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; i-&gt;num_local_nodes; n++)</div><div class='del'>-		set_bit(i-&gt;local_nodes[n] - 1, &amp;c-&gt;local_nodes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-clusterip_netdev_event(struct notifier_block *this, unsigned long event,</div><div class='del'>-		       void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct clusterip_config *c;</div><div class='del'>-</div><div class='del'>-	c = container_of(this, struct clusterip_config, notifier);</div><div class='del'>-	switch (event) {</div><div class='del'>-	case NETDEV_REGISTER:</div><div class='del'>-		if (!strcmp(dev-&gt;name, c-&gt;ifname)) {</div><div class='del'>-			c-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-			dev_mc_add(dev, c-&gt;clustermac);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NETDEV_UNREGISTER:</div><div class='del'>-		if (dev-&gt;ifindex == c-&gt;ifindex) {</div><div class='del'>-			dev_mc_del(dev, c-&gt;clustermac);</div><div class='del'>-			c-&gt;ifindex = -1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NETDEV_CHANGENAME:</div><div class='del'>-		if (!strcmp(dev-&gt;name, c-&gt;ifname)) {</div><div class='del'>-			c-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-			dev_mc_add(dev, c-&gt;clustermac);</div><div class='del'>-		} else if (dev-&gt;ifindex == c-&gt;ifindex) {</div><div class='del'>-			dev_mc_del(dev, c-&gt;clustermac);</div><div class='del'>-			c-&gt;ifindex = -1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clusterip_config *</div><div class='del'>-clusterip_config_init(struct net *net, const struct ipt_clusterip_tgt_info *i,</div><div class='del'>-		      __be32 ip, const char *iniface)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_net *cn = net_generic(net, clusterip_net_id);</div><div class='del'>-	struct clusterip_config *c;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	c = kzalloc(sizeof(*c), GFP_ATOMIC);</div><div class='del'>-	if (!c)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	strcpy(c-&gt;ifname, iniface);</div><div class='del'>-	c-&gt;ifindex = -1;</div><div class='del'>-	c-&gt;clusterip = ip;</div><div class='del'>-	memcpy(&amp;c-&gt;clustermac, &amp;i-&gt;clustermac, ETH_ALEN);</div><div class='del'>-	c-&gt;num_total_nodes = i-&gt;num_total_nodes;</div><div class='del'>-	clusterip_config_init_nodelist(c, i);</div><div class='del'>-	c-&gt;hash_mode = i-&gt;hash_mode;</div><div class='del'>-	c-&gt;hash_initval = i-&gt;hash_initval;</div><div class='del'>-	refcount_set(&amp;c-&gt;refcount, 1);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;cn-&gt;lock);</div><div class='del'>-	if (__clusterip_config_find(net, ip)) {</div><div class='del'>-		spin_unlock_bh(&amp;cn-&gt;lock);</div><div class='del'>-		kfree(c);</div><div class='del'>-</div><div class='del'>-		return ERR_PTR(-EBUSY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_add_rcu(&amp;c-&gt;list, &amp;cn-&gt;configs);</div><div class='del'>-	spin_unlock_bh(&amp;cn-&gt;lock);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	{</div><div class='del'>-		char buffer[16];</div><div class='del'>-</div><div class='del'>-		/* create proc dir entry */</div><div class='del'>-		sprintf(buffer, "%pI4", &amp;ip);</div><div class='del'>-		c-&gt;pde = proc_create_data(buffer, 0600,</div><div class='del'>-					  cn-&gt;procdir,</div><div class='del'>-					  &amp;clusterip_proc_fops, c);</div><div class='del'>-		if (!c-&gt;pde) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	c-&gt;notifier.notifier_call = clusterip_netdev_event;</div><div class='del'>-	err = register_netdevice_notifier(&amp;c-&gt;notifier);</div><div class='del'>-	if (!err) {</div><div class='del'>-		refcount_set(&amp;c-&gt;entries, 1);</div><div class='del'>-		return c;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	proc_remove(c-&gt;pde);</div><div class='del'>-err:</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_bh(&amp;cn-&gt;lock);</div><div class='del'>-	list_del_rcu(&amp;c-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;cn-&gt;lock);</div><div class='del'>-	clusterip_config_put(c);</div><div class='del'>-</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int</div><div class='del'>-clusterip_add_node(struct clusterip_config *c, u_int16_t nodenum)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (nodenum == 0 ||</div><div class='del'>-	    nodenum &gt; c-&gt;num_total_nodes)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* check if we already have this number in our bitfield */</div><div class='del'>-	if (test_and_set_bit(nodenum - 1, &amp;c-&gt;local_nodes))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-clusterip_del_node(struct clusterip_config *c, u_int16_t nodenum)</div><div class='del'>-{</div><div class='del'>-	if (nodenum == 0 ||</div><div class='del'>-	    nodenum &gt; c-&gt;num_total_nodes)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(nodenum - 1, &amp;c-&gt;local_nodes))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u_int32_t</div><div class='del'>-clusterip_hashfn(const struct sk_buff *skb,</div><div class='del'>-		 const struct clusterip_config *config)</div><div class='del'>-{</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	unsigned long hashval;</div><div class='del'>-	u_int16_t sport = 0, dport = 0;</div><div class='del'>-	int poff;</div><div class='del'>-</div><div class='del'>-	poff = proto_ports_offset(iph-&gt;protocol);</div><div class='del'>-	if (poff &gt;= 0) {</div><div class='del'>-		const u_int16_t *ports;</div><div class='del'>-		u16 _ports[2];</div><div class='del'>-</div><div class='del'>-		ports = skb_header_pointer(skb, iph-&gt;ihl * 4 + poff, 4, _ports);</div><div class='del'>-		if (ports) {</div><div class='del'>-			sport = ports[0];</div><div class='del'>-			dport = ports[1];</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		net_info_ratelimited("unknown protocol %u\n", iph-&gt;protocol);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (config-&gt;hash_mode) {</div><div class='del'>-	case CLUSTERIP_HASHMODE_SIP:</div><div class='del'>-		hashval = jhash_1word(ntohl(iph-&gt;saddr),</div><div class='del'>-				      config-&gt;hash_initval);</div><div class='del'>-		break;</div><div class='del'>-	case CLUSTERIP_HASHMODE_SIP_SPT:</div><div class='del'>-		hashval = jhash_2words(ntohl(iph-&gt;saddr), sport,</div><div class='del'>-				       config-&gt;hash_initval);</div><div class='del'>-		break;</div><div class='del'>-	case CLUSTERIP_HASHMODE_SIP_SPT_DPT:</div><div class='del'>-		hashval = jhash_3words(ntohl(iph-&gt;saddr), sport, dport,</div><div class='del'>-				       config-&gt;hash_initval);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* to make gcc happy */</div><div class='del'>-		hashval = 0;</div><div class='del'>-		/* This cannot happen, unless the check function wasn't called</div><div class='del'>-		 * at rule load time */</div><div class='del'>-		pr_info("unknown mode %u\n", config-&gt;hash_mode);</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* node numbers are 1..n, not 0..n */</div><div class='del'>-	return reciprocal_scale(hashval, config-&gt;num_total_nodes) + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-clusterip_responsible(const struct clusterip_config *config, u_int32_t hash)</div><div class='del'>-{</div><div class='del'>-	return test_bit(hash - 1, &amp;config-&gt;local_nodes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- * IPTABLES TARGET</div><div class='del'>- ***********************************************************************/</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='del'>-{</div><div class='del'>-	const struct ipt_clusterip_tgt_info *cipinfo = par-&gt;targinfo;</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	u_int32_t hash;</div><div class='del'>-</div><div class='del'>-	/* don't need to clusterip_config_get() here, since refcount</div><div class='del'>-	 * is only decremented by destroy() - and ip_tables guarantees</div><div class='del'>-	 * that the -&gt;target() function isn't called after -&gt;destroy() */</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	if (ct == NULL)</div><div class='del'>-		return NF_DROP;</div><div class='del'>-</div><div class='del'>-	/* special case: ICMP error handling. conntrack distinguishes between</div><div class='del'>-	 * error messages (RELATED) and information requests (see below) */</div><div class='del'>-	if (ip_hdr(skb)-&gt;protocol == IPPROTO_ICMP &amp;&amp;</div><div class='del'>-	    (ctinfo == IP_CT_RELATED ||</div><div class='del'>-	     ctinfo == IP_CT_RELATED_REPLY))</div><div class='del'>-		return XT_CONTINUE;</div><div class='del'>-</div><div class='del'>-	/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,</div><div class='del'>-	 * TIMESTAMP, INFO_REQUEST or ADDRESS type icmp packets from here</div><div class='del'>-	 * on, which all have an ID field [relevant for hashing]. */</div><div class='del'>-</div><div class='del'>-	hash = clusterip_hashfn(skb, cipinfo-&gt;config);</div><div class='del'>-</div><div class='del'>-	switch (ctinfo) {</div><div class='del'>-	case IP_CT_NEW:</div><div class='del'>-		ct-&gt;mark = hash;</div><div class='del'>-		break;</div><div class='del'>-	case IP_CT_RELATED:</div><div class='del'>-	case IP_CT_RELATED_REPLY:</div><div class='del'>-		/* FIXME: we don't handle expectations at the moment.</div><div class='del'>-		 * They can arrive on a different node than</div><div class='del'>-		 * the master connection (e.g. FTP passive mode) */</div><div class='del'>-	case IP_CT_ESTABLISHED:</div><div class='del'>-	case IP_CT_ESTABLISHED_REPLY:</div><div class='del'>-		break;</div><div class='del'>-	default:			/* Prevent gcc warnings */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	nf_ct_dump_tuple_ip(&amp;ct-&gt;tuplehash[IP_CT_DIR_ORIGINAL].tuple);</div><div class='del'>-#endif</div><div class='del'>-	pr_debug("hash=%u ct_hash=%u ", hash, ct-&gt;mark);</div><div class='del'>-	if (!clusterip_responsible(cipinfo-&gt;config, hash)) {</div><div class='del'>-		pr_debug("not responsible\n");</div><div class='del'>-		return NF_DROP;</div><div class='del'>-	}</div><div class='del'>-	pr_debug("responsible\n");</div><div class='del'>-</div><div class='del'>-	/* despite being received via linklayer multicast, this is</div><div class='del'>-	 * actually a unicast IP packet. TCP doesn't like PACKET_MULTICAST */</div><div class='del'>-	skb-&gt;pkt_type = PACKET_HOST;</div><div class='del'>-</div><div class='del'>-	return XT_CONTINUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int clusterip_tg_check(const struct xt_tgchk_param *par)</div><div class='del'>-{</div><div class='del'>-	struct ipt_clusterip_tgt_info *cipinfo = par-&gt;targinfo;</div><div class='del'>-	const struct ipt_entry *e = par-&gt;entryinfo;</div><div class='del'>-	struct clusterip_config *config;</div><div class='del'>-	int ret, i;</div><div class='del'>-</div><div class='del'>-	if (par-&gt;nft_compat) {</div><div class='del'>-		pr_err("cannot use CLUSTERIP target from nftables compat\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cipinfo-&gt;hash_mode != CLUSTERIP_HASHMODE_SIP &amp;&amp;</div><div class='del'>-	    cipinfo-&gt;hash_mode != CLUSTERIP_HASHMODE_SIP_SPT &amp;&amp;</div><div class='del'>-	    cipinfo-&gt;hash_mode != CLUSTERIP_HASHMODE_SIP_SPT_DPT) {</div><div class='del'>-		pr_info("unknown mode %u\n", cipinfo-&gt;hash_mode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	if (e-&gt;ip.dmsk.s_addr != htonl(0xffffffff) ||</div><div class='del'>-	    e-&gt;ip.dst.s_addr == 0) {</div><div class='del'>-		pr_info("Please specify destination IP\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (cipinfo-&gt;num_local_nodes &gt; ARRAY_SIZE(cipinfo-&gt;local_nodes)) {</div><div class='del'>-		pr_info("bad num_local_nodes %u\n", cipinfo-&gt;num_local_nodes);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cipinfo-&gt;num_local_nodes; i++) {</div><div class='del'>-		if (cipinfo-&gt;local_nodes[i] - 1 &gt;=</div><div class='del'>-		    sizeof(config-&gt;local_nodes) * 8) {</div><div class='del'>-			pr_info("bad local_nodes[%d] %u\n",</div><div class='del'>-				i, cipinfo-&gt;local_nodes[i]);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	config = clusterip_config_find_get(par-&gt;net, e-&gt;ip.dst.s_addr, 1);</div><div class='del'>-	if (!config) {</div><div class='del'>-		if (!(cipinfo-&gt;flags &amp; CLUSTERIP_FLAG_NEW)) {</div><div class='del'>-			pr_info("no config found for %pI4, need 'new'\n",</div><div class='del'>-				&amp;e-&gt;ip.dst.s_addr);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			struct net_device *dev;</div><div class='del'>-</div><div class='del'>-			if (e-&gt;ip.iniface[0] == '\0') {</div><div class='del'>-				pr_info("Please specify an interface name\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			dev = dev_get_by_name(par-&gt;net, e-&gt;ip.iniface);</div><div class='del'>-			if (!dev) {</div><div class='del'>-				pr_info("no such interface %s\n",</div><div class='del'>-					e-&gt;ip.iniface);</div><div class='del'>-				return -ENOENT;</div><div class='del'>-			}</div><div class='del'>-			dev_put(dev);</div><div class='del'>-</div><div class='del'>-			config = clusterip_config_init(par-&gt;net, cipinfo,</div><div class='del'>-						       e-&gt;ip.dst.s_addr,</div><div class='del'>-						       e-&gt;ip.iniface);</div><div class='del'>-			if (IS_ERR(config))</div><div class='del'>-				return PTR_ERR(config);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = nf_ct_netns_get(par-&gt;net, par-&gt;family);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_info("cannot load conntrack support for proto=%u\n",</div><div class='del'>-			par-&gt;family);</div><div class='del'>-		clusterip_config_entry_put(par-&gt;net, config);</div><div class='del'>-		clusterip_config_put(config);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!par-&gt;net-&gt;xt.clusterip_deprecated_warning) {</div><div class='del'>-		pr_info("ipt_CLUSTERIP is deprecated and it will removed soon, "</div><div class='del'>-			"use xt_cluster instead\n");</div><div class='del'>-		par-&gt;net-&gt;xt.clusterip_deprecated_warning = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cipinfo-&gt;config = config;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* drop reference count of cluster config when rule is deleted */</div><div class='del'>-static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)</div><div class='del'>-{</div><div class='del'>-	const struct ipt_clusterip_tgt_info *cipinfo = par-&gt;targinfo;</div><div class='del'>-</div><div class='del'>-	/* if no more entries are referencing the config, remove it</div><div class='del'>-	 * from the list and destroy the proc entry */</div><div class='del'>-	clusterip_config_entry_put(par-&gt;net, cipinfo-&gt;config);</div><div class='del'>-</div><div class='del'>-	clusterip_config_put(cipinfo-&gt;config);</div><div class='del'>-</div><div class='del'>-	nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-struct compat_ipt_clusterip_tgt_info</div><div class='del'>-{</div><div class='del'>-	u_int32_t	flags;</div><div class='del'>-	u_int8_t	clustermac[6];</div><div class='del'>-	u_int16_t	num_total_nodes;</div><div class='del'>-	u_int16_t	num_local_nodes;</div><div class='del'>-	u_int16_t	local_nodes[CLUSTERIP_MAX_NODES];</div><div class='del'>-	u_int32_t	hash_mode;</div><div class='del'>-	u_int32_t	hash_initval;</div><div class='del'>-	compat_uptr_t	config;</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_COMPAT */</div><div class='del'>-</div><div class='del'>-static struct xt_target clusterip_tg_reg __read_mostly = {</div><div class='del'>-	.name		= "CLUSTERIP",</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.target		= clusterip_tg,</div><div class='del'>-	.checkentry	= clusterip_tg_check,</div><div class='del'>-	.destroy	= clusterip_tg_destroy,</div><div class='del'>-	.targetsize	= sizeof(struct ipt_clusterip_tgt_info),</div><div class='del'>-	.usersize	= offsetof(struct ipt_clusterip_tgt_info, config),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compatsize	= sizeof(struct compat_ipt_clusterip_tgt_info),</div><div class='del'>-#endif /* CONFIG_COMPAT */</div><div class='del'>-	.me		= THIS_MODULE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- * ARP MANGLING CODE</div><div class='del'>- ***********************************************************************/</div><div class='del'>-</div><div class='del'>-/* hardcoded for 48bit ethernet and 32bit ipv4 addresses */</div><div class='del'>-struct arp_payload {</div><div class='del'>-	u_int8_t src_hw[ETH_ALEN];</div><div class='del'>-	__be32 src_ip;</div><div class='del'>-	u_int8_t dst_hw[ETH_ALEN];</div><div class='del'>-	__be32 dst_ip;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-static void arp_print(struct arp_payload *payload)</div><div class='del'>-{</div><div class='del'>-#define HBUFFERLEN 30</div><div class='del'>-	char hbuffer[HBUFFERLEN];</div><div class='del'>-	int j, k;</div><div class='del'>-</div><div class='del'>-	for (k = 0, j = 0; k &lt; HBUFFERLEN - 3 &amp;&amp; j &lt; ETH_ALEN; j++) {</div><div class='del'>-		hbuffer[k++] = hex_asc_hi(payload-&gt;src_hw[j]);</div><div class='del'>-		hbuffer[k++] = hex_asc_lo(payload-&gt;src_hw[j]);</div><div class='del'>-		hbuffer[k++] = ':';</div><div class='del'>-	}</div><div class='del'>-	hbuffer[--k] = '\0';</div><div class='del'>-</div><div class='del'>-	pr_debug("src %pI4@%s, dst %pI4\n",</div><div class='del'>-		 &amp;payload-&gt;src_ip, hbuffer, &amp;payload-&gt;dst_ip);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-arp_mangle(void *priv,</div><div class='del'>-	   struct sk_buff *skb,</div><div class='del'>-	   const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	struct arphdr *arp = arp_hdr(skb);</div><div class='del'>-	struct arp_payload *payload;</div><div class='del'>-	struct clusterip_config *c;</div><div class='del'>-	struct net *net = state-&gt;net;</div><div class='del'>-</div><div class='del'>-	/* we don't care about non-ethernet and non-ipv4 ARP */</div><div class='del'>-	if (arp-&gt;ar_hrd != htons(ARPHRD_ETHER) ||</div><div class='del'>-	    arp-&gt;ar_pro != htons(ETH_P_IP) ||</div><div class='del'>-	    arp-&gt;ar_pln != 4 || arp-&gt;ar_hln != ETH_ALEN)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	/* we only want to mangle arp requests and replies */</div><div class='del'>-	if (arp-&gt;ar_op != htons(ARPOP_REPLY) &amp;&amp;</div><div class='del'>-	    arp-&gt;ar_op != htons(ARPOP_REQUEST))</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	payload = (void *)(arp+1);</div><div class='del'>-</div><div class='del'>-	/* if there is no clusterip configuration for the arp reply's</div><div class='del'>-	 * source ip, we don't want to mangle it */</div><div class='del'>-	c = clusterip_config_find_get(net, payload-&gt;src_ip, 0);</div><div class='del'>-	if (!c)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	/* normally the linux kernel always replies to arp queries of</div><div class='del'>-	 * addresses on different interfacs.  However, in the CLUSTERIP case</div><div class='del'>-	 * this wouldn't work, since we didn't subscribe the mcast group on</div><div class='del'>-	 * other interfaces */</div><div class='del'>-	if (c-&gt;ifindex != state-&gt;out-&gt;ifindex) {</div><div class='del'>-		pr_debug("not mangling arp reply on different interface: cip'%d'-skb'%d'\n",</div><div class='del'>-			 c-&gt;ifindex, state-&gt;out-&gt;ifindex);</div><div class='del'>-		clusterip_config_put(c);</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mangle reply hardware address */</div><div class='del'>-	memcpy(payload-&gt;src_hw, c-&gt;clustermac, arp-&gt;ar_hln);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	pr_debug("mangled arp reply: ");</div><div class='del'>-	arp_print(payload);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	clusterip_config_put(c);</div><div class='del'>-</div><div class='del'>-	return NF_ACCEPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops cip_arp_ops = {</div><div class='del'>-	.hook = arp_mangle,</div><div class='del'>-	.pf = NFPROTO_ARP,</div><div class='del'>-	.hooknum = NF_ARP_OUT,</div><div class='del'>-	.priority = -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- * PROC DIR HANDLING</div><div class='del'>- ***********************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='del'>-struct clusterip_seq_position {</div><div class='del'>-	unsigned int pos;	/* position */</div><div class='del'>-	unsigned int weight;	/* number of bits set == size */</div><div class='del'>-	unsigned int bit;	/* current bit */</div><div class='del'>-	unsigned long val;	/* current value */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void *clusterip_seq_start(struct seq_file *s, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_config *c = s-&gt;private;</div><div class='del'>-	unsigned int weight;</div><div class='del'>-	u_int32_t local_nodes;</div><div class='del'>-	struct clusterip_seq_position *idx;</div><div class='del'>-</div><div class='del'>-	/* FIXME: possible race */</div><div class='del'>-	local_nodes = c-&gt;local_nodes;</div><div class='del'>-	weight = hweight32(local_nodes);</div><div class='del'>-	if (*pos &gt;= weight)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	idx = kmalloc(sizeof(struct clusterip_seq_position), GFP_KERNEL);</div><div class='del'>-	if (!idx)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	idx-&gt;pos = *pos;</div><div class='del'>-	idx-&gt;weight = weight;</div><div class='del'>-	idx-&gt;bit = ffs(local_nodes);</div><div class='del'>-	idx-&gt;val = local_nodes;</div><div class='del'>-	clear_bit(idx-&gt;bit - 1, &amp;idx-&gt;val);</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *clusterip_seq_next(struct seq_file *s, void *v, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_seq_position *idx = v;</div><div class='del'>-</div><div class='del'>-	*pos = ++idx-&gt;pos;</div><div class='del'>-	if (*pos &gt;= idx-&gt;weight) {</div><div class='del'>-		kfree(v);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	idx-&gt;bit = ffs(idx-&gt;val);</div><div class='del'>-	clear_bit(idx-&gt;bit - 1, &amp;idx-&gt;val);</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clusterip_seq_stop(struct seq_file *s, void *v)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR(v))</div><div class='del'>-		kfree(v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int clusterip_seq_show(struct seq_file *s, void *v)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_seq_position *idx = v;</div><div class='del'>-</div><div class='del'>-	if (idx-&gt;pos != 0)</div><div class='del'>-		seq_putc(s, ',');</div><div class='del'>-</div><div class='del'>-	seq_printf(s, "%u", idx-&gt;bit);</div><div class='del'>-</div><div class='del'>-	if (idx-&gt;pos == idx-&gt;weight - 1)</div><div class='del'>-		seq_putc(s, '\n');</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations clusterip_seq_ops = {</div><div class='del'>-	.start	= clusterip_seq_start,</div><div class='del'>-	.next	= clusterip_seq_next,</div><div class='del'>-	.stop	= clusterip_seq_stop,</div><div class='del'>-	.show	= clusterip_seq_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int clusterip_proc_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret = seq_open(file, &amp;clusterip_seq_ops);</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		struct seq_file *sf = file-&gt;private_data;</div><div class='del'>-		struct clusterip_config *c = PDE_DATA(inode);</div><div class='del'>-</div><div class='del'>-		sf-&gt;private = c;</div><div class='del'>-</div><div class='del'>-		clusterip_config_get(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int clusterip_proc_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_config *c = PDE_DATA(inode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = seq_release(inode, file);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		clusterip_config_put(c);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t clusterip_proc_write(struct file *file, const char __user *input,</div><div class='del'>-				size_t size, loff_t *ofs)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_config *c = PDE_DATA(file_inode(file));</div><div class='del'>-#define PROC_WRITELEN	10</div><div class='del'>-	char buffer[PROC_WRITELEN+1];</div><div class='del'>-	unsigned long nodenum;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (size &gt; PROC_WRITELEN)</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (copy_from_user(buffer, input, size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	buffer[size] = 0;</div><div class='del'>-</div><div class='del'>-	if (*buffer == '+') {</div><div class='del'>-		rc = kstrtoul(buffer+1, 10, &amp;nodenum);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-		if (clusterip_add_node(c, nodenum))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	} else if (*buffer == '-') {</div><div class='del'>-		rc = kstrtoul(buffer+1, 10, &amp;nodenum);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-		if (clusterip_del_node(c, nodenum))</div><div class='del'>-			return -ENOENT;</div><div class='del'>-	} else</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations clusterip_proc_fops = {</div><div class='del'>-	.open	 = clusterip_proc_open,</div><div class='del'>-	.read	 = seq_read,</div><div class='del'>-	.write	 = clusterip_proc_write,</div><div class='del'>-	.llseek	 = seq_lseek,</div><div class='del'>-	.release = clusterip_proc_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-static int clusterip_net_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_net *cn = net_generic(net, clusterip_net_id);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;cn-&gt;configs);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;cn-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ret = nf_register_net_hook(net, &amp;cip_arp_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	cn-&gt;procdir = proc_mkdir("ipt_CLUSTERIP", net-&gt;proc_net);</div><div class='del'>-	if (!cn-&gt;procdir) {</div><div class='del'>-		nf_unregister_net_hook(net, &amp;cip_arp_ops);</div><div class='del'>-		pr_err("Unable to proc dir entry\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clusterip_net_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	struct clusterip_net *cn = net_generic(net, clusterip_net_id);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	proc_remove(cn-&gt;procdir);</div><div class='del'>-	cn-&gt;procdir = NULL;</div><div class='del'>-#endif</div><div class='del'>-	nf_unregister_net_hook(net, &amp;cip_arp_ops);</div><div class='del'>-	WARN_ON_ONCE(!list_empty(&amp;cn-&gt;configs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations clusterip_net_ops = {</div><div class='del'>-	.init = clusterip_net_init,</div><div class='del'>-	.exit = clusterip_net_exit,</div><div class='del'>-	.id   = &amp;clusterip_net_id,</div><div class='del'>-	.size = sizeof(struct clusterip_net),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init clusterip_tg_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_pernet_subsys(&amp;clusterip_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = xt_register_target(&amp;clusterip_tg_reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto cleanup_subsys;</div><div class='del'>-</div><div class='del'>-	pr_info("ClusterIP Version %s loaded successfully\n",</div><div class='del'>-		CLUSTERIP_VERSION);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-cleanup_subsys:</div><div class='del'>-	unregister_pernet_subsys(&amp;clusterip_net_ops);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit clusterip_tg_exit(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION);</div><div class='del'>-</div><div class='del'>-	xt_unregister_target(&amp;clusterip_tg_reg);</div><div class='del'>-	unregister_pernet_subsys(&amp;clusterip_net_ops);</div><div class='del'>-</div><div class='del'>-	/* Wait for completion of call_rcu_bh()'s (clusterip_config_rcu_free) */</div><div class='del'>-	rcu_barrier_bh();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(clusterip_tg_init);</div><div class='del'>-module_exit(clusterip_tg_exit);</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c<br/>index aaaf9a81fbc9..5930d3b02555 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_ECN.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_ECN.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_ECN.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ipt_ECN.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* iptables module for the IPv4 and TCP ECN bits, Version 1.5</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2002 by Harald Welte &lt;laforge@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='hunk'>@@ -32,7 +29,7 @@ set_ect_ip(struct sk_buff *skb, const struct ipt_ECN_info *einfo)</div><div class='ctx'> </div><div class='ctx'> 	if ((iph-&gt;tos &amp; IPT_ECN_IP_MASK) != (einfo-&gt;ip_ect &amp; IPT_ECN_IP_MASK)) {</div><div class='ctx'> 		__u8 oldtos;</div><div class='del'>-		if (!skb_make_writable(skb, sizeof(struct iphdr)))</div><div class='add'>+		if (skb_ensure_writable(skb, sizeof(struct iphdr)))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		iph = ip_hdr(skb);</div><div class='ctx'> 		oldtos = iph-&gt;tos;</div><div class='hunk'>@@ -61,7 +58,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo)</div><div class='ctx'> 	     tcph-&gt;cwr == einfo-&gt;proto.tcp.cwr))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, ip_hdrlen(skb) + sizeof(*tcph)))</div><div class='add'>+	if (skb_ensure_writable(skb, ip_hdrlen(skb) + sizeof(*tcph)))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	tcph = (void *)ip_hdr(skb) + ip_hdrlen(skb);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c<br/>deleted file mode 100644<br/>index ce1512b02cb2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_MASQUERADE.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_MASQUERADE.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* Masquerade.  Simple mapping which alters range to a local IP address</div><div class='del'>-   (depending on route). */</div><div class='del'>-</div><div class='del'>-/* (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2006 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/x_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv4/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Netfilter Core Team &lt;coreteam@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Xtables: automatic-address SNAT");</div><div class='del'>-</div><div class='del'>-/* FIXME: Multiple targets. --RR */</div><div class='del'>-static int masquerade_tg_check(const struct xt_tgchk_param *par)</div><div class='del'>-{</div><div class='del'>-	const struct nf_nat_ipv4_multi_range_compat *mr = par-&gt;targinfo;</div><div class='del'>-</div><div class='del'>-	if (mr-&gt;range[0].flags &amp; NF_NAT_RANGE_MAP_IPS) {</div><div class='del'>-		pr_debug("bad MAP_IPS.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (mr-&gt;rangesize != 1) {</div><div class='del'>-		pr_debug("bad rangesize %u\n", mr-&gt;rangesize);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return nf_ct_netns_get(par-&gt;net, par-&gt;family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-masquerade_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='del'>-{</div><div class='del'>-	struct nf_nat_range2 range;</div><div class='del'>-	const struct nf_nat_ipv4_multi_range_compat *mr;</div><div class='del'>-</div><div class='del'>-	mr = par-&gt;targinfo;</div><div class='del'>-	range.flags = mr-&gt;range[0].flags;</div><div class='del'>-	range.min_proto = mr-&gt;range[0].min;</div><div class='del'>-	range.max_proto = mr-&gt;range[0].max;</div><div class='del'>-</div><div class='del'>-	return nf_nat_masquerade_ipv4(skb, xt_hooknum(par), &amp;range,</div><div class='del'>-				      xt_out(par));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void masquerade_tg_destroy(const struct xt_tgdtor_param *par)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xt_target masquerade_tg_reg __read_mostly = {</div><div class='del'>-	.name		= "MASQUERADE",</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.target		= masquerade_tg,</div><div class='del'>-	.targetsize	= sizeof(struct nf_nat_ipv4_multi_range_compat),</div><div class='del'>-	.table		= "nat",</div><div class='del'>-	.hooks		= 1 &lt;&lt; NF_INET_POST_ROUTING,</div><div class='del'>-	.checkentry	= masquerade_tg_check,</div><div class='del'>-	.destroy	= masquerade_tg_destroy,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init masquerade_tg_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = xt_register_target(&amp;masquerade_tg_reg);</div><div class='del'>-</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		nf_nat_masquerade_ipv4_register_notifier();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit masquerade_tg_exit(void)</div><div class='del'>-{</div><div class='del'>-	xt_unregister_target(&amp;masquerade_tg_reg);</div><div class='del'>-	nf_nat_masquerade_ipv4_unregister_notifier();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(masquerade_tg_init);</div><div class='del'>-module_exit(masquerade_tg_exit);</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c<br/>index e8bed3390e58..4b8840734762 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_REJECT.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_REJECT.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_REJECT.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ipt_REJECT.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * This is a module which is used for rejecting packets.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -59,7 +56,8 @@ reject_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 		nf_send_unreach(skb, ICMP_PKT_FILTERED, hook);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPT_TCP_RESET:</div><div class='del'>-		nf_send_reset(xt_net(par), skb, hook);</div><div class='add'>+		nf_send_reset(xt_net(par), par-&gt;state-&gt;sk, skb, hook);</div><div class='add'>+		break;</div><div class='ctx'> 	case IPT_ICMP_ECHOREPLY:</div><div class='ctx'> 		/* Doesn't happen. */</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_SYNPROXY.c b/net/ipv4/netfilter/ipt_SYNPROXY.c<br/>index 690b17ef6a44..f2984c7eef40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_SYNPROXY.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_SYNPROXY.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_SYNPROXY.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ipt_SYNPROXY.c</a></div><div class='hunk'>@@ -1,263 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2013 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/netfilter_ipv4/ip_tables.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter/x_tables.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter/xt_SYNPROXY.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_seqadj.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_synproxy.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_ecache.h&gt;</div><div class='del'>-</div><div class='del'>-static struct iphdr *</div><div class='del'>-synproxy_build_ip(struct net *net, struct sk_buff *skb, __be32 saddr,</div><div class='del'>-		  __be32 daddr)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph;</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	iph = skb_put(skb, sizeof(*iph));</div><div class='del'>-	iph-&gt;version	= 4;</div><div class='del'>-	iph-&gt;ihl	= sizeof(*iph) / 4;</div><div class='del'>-	iph-&gt;tos	= 0;</div><div class='del'>-	iph-&gt;id		= 0;</div><div class='del'>-	iph-&gt;frag_off	= htons(IP_DF);</div><div class='del'>-	iph-&gt;ttl	= net-&gt;ipv4.sysctl_ip_default_ttl;</div><div class='del'>-	iph-&gt;protocol	= IPPROTO_TCP;</div><div class='del'>-	iph-&gt;check	= 0;</div><div class='del'>-	iph-&gt;saddr	= saddr;</div><div class='del'>-	iph-&gt;daddr	= daddr;</div><div class='del'>-</div><div class='del'>-	return iph;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_tcp(struct net *net,</div><div class='del'>-		  const struct sk_buff *skb, struct sk_buff *nskb,</div><div class='del'>-		  struct nf_conntrack *nfct, enum ip_conntrack_info ctinfo,</div><div class='del'>-		  struct iphdr *niph, struct tcphdr *nth,</div><div class='del'>-		  unsigned int tcp_hdr_size)</div><div class='del'>-{</div><div class='del'>-	nth-&gt;check = ~tcp_v4_check(tcp_hdr_size, niph-&gt;saddr, niph-&gt;daddr, 0);</div><div class='del'>-	nskb-&gt;ip_summed   = CHECKSUM_PARTIAL;</div><div class='del'>-	nskb-&gt;csum_start  = (unsigned char *)nth - nskb-&gt;head;</div><div class='del'>-	nskb-&gt;csum_offset = offsetof(struct tcphdr, check);</div><div class='del'>-</div><div class='del'>-	skb_dst_set_noref(nskb, skb_dst(skb));</div><div class='del'>-	nskb-&gt;protocol = htons(ETH_P_IP);</div><div class='del'>-	if (ip_route_me_harder(net, nskb, RTN_UNSPEC))</div><div class='del'>-		goto free_nskb;</div><div class='del'>-</div><div class='del'>-	if (nfct) {</div><div class='del'>-		nf_ct_set(nskb, (struct nf_conn *)nfct, ctinfo);</div><div class='del'>-		nf_conntrack_get(nfct);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ip_local_out(net, nskb-&gt;sk, nskb);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-free_nskb:</div><div class='del'>-	kfree_skb(nskb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_client_synack(struct net *net,</div><div class='del'>-			    const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			    const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-	u16 mss = opts-&gt;mss;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, iph-&gt;daddr, iph-&gt;saddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;dest;</div><div class='del'>-	nth-&gt;dest	= th-&gt;source;</div><div class='del'>-	nth-&gt;seq	= htonl(__cookie_v4_init_sequence(iph, th, &amp;mss));</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_SYN | TCP_FLAG_ACK;</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_ECN)</div><div class='del'>-		tcp_flag_word(nth) |= TCP_FLAG_ECE;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= 0;</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),</div><div class='del'>-			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_server_syn(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts, u32 recv_seq)</div><div class='del'>-{</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, iph-&gt;saddr, iph-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;source;</div><div class='del'>-	nth-&gt;dest	= th-&gt;dest;</div><div class='del'>-	nth-&gt;seq	= htonl(recv_seq - 1);</div><div class='del'>-	/* ack_seq is used to relay our ISN to the synproxy hook to initialize</div><div class='del'>-	 * sequence number translation once a connection tracking entry exists.</div><div class='del'>-	 */</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;ack_seq) - 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_SYN;</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_ECN)</div><div class='del'>-		tcp_flag_word(nth) |= TCP_FLAG_ECE | TCP_FLAG_CWR;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= th-&gt;window;</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, &amp;snet-&gt;tmpl-&gt;ct_general, IP_CT_NEW,</div><div class='del'>-			  niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_server_ack(struct net *net,</div><div class='del'>-			 const struct ip_ct_tcp *state,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, iph-&gt;daddr, iph-&gt;saddr);</div><div class='ctx'> </div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;dest;</div><div class='del'>-	nth-&gt;dest	= th-&gt;source;</div><div class='del'>-	nth-&gt;seq	= htonl(ntohl(th-&gt;ack_seq));</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_ACK;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= htons(state-&gt;seen[IP_CT_DIR_ORIGINAL].td_maxwin);</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_client_ack(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, iph-&gt;saddr, iph-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;source;</div><div class='del'>-	nth-&gt;dest	= th-&gt;dest;</div><div class='del'>-	nth-&gt;seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	nth-&gt;ack_seq	= th-&gt;ack_seq;</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_ACK;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= htons(ntohs(th-&gt;window) &gt;&gt; opts-&gt;wscale);</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),</div><div class='del'>-			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-synproxy_recv_client_ack(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 struct synproxy_options *opts, u32 recv_seq)</div><div class='del'>-{</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	int mss;</div><div class='del'>-</div><div class='del'>-	mss = __cookie_v4_check(ip_hdr(skb), th, ntohl(th-&gt;ack_seq) - 1);</div><div class='del'>-	if (mss == 0) {</div><div class='del'>-		this_cpu_inc(snet-&gt;stats-&gt;cookie_invalid);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	this_cpu_inc(snet-&gt;stats-&gt;cookie_valid);</div><div class='del'>-	opts-&gt;mss = mss;</div><div class='del'>-	opts-&gt;options |= XT_SYNPROXY_OPT_MSS;</div><div class='del'>-</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='del'>-		synproxy_check_timestamp_cookie(opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_server_syn(net, skb, th, opts, recv_seq);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='add'>+#include &lt;net/netfilter/nf_synproxy.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='ctx'> synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='hunk'>@@ -286,6 +36,8 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 			opts.options |= XT_SYNPROXY_OPT_ECN;</div><div class='ctx'> </div><div class='ctx'> 		opts.options &amp;= info-&gt;options;</div><div class='add'>+		opts.mss_encode = opts.mss_option;</div><div class='add'>+		opts.mss_option = info-&gt;mss;</div><div class='ctx'> 		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='ctx'> 			synproxy_init_timestamp_cookie(info, &amp;opts);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -309,135 +61,6 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 	return XT_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ipv4_synproxy_hook(void *priv,</div><div class='del'>-				       struct sk_buff *skb,</div><div class='del'>-				       const struct nf_hook_state *nhs)</div><div class='del'>-{</div><div class='del'>-	struct net *net = nhs-&gt;net;</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	struct nf_conn_synproxy *synproxy;</div><div class='del'>-	struct synproxy_options opts = {};</div><div class='del'>-	const struct ip_ct_tcp *state;</div><div class='del'>-	struct tcphdr *th, _th;</div><div class='del'>-	unsigned int thoff;</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	if (ct == NULL)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	synproxy = nfct_synproxy(ct);</div><div class='del'>-	if (synproxy == NULL)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	if (nf_is_loopback_packet(skb) ||</div><div class='del'>-	    ip_hdr(skb)-&gt;protocol != IPPROTO_TCP)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	thoff = ip_hdrlen(skb);</div><div class='del'>-	th = skb_header_pointer(skb, thoff, sizeof(_th), &amp;_th);</div><div class='del'>-	if (th == NULL)</div><div class='del'>-		return NF_DROP;</div><div class='del'>-</div><div class='del'>-	state = &amp;ct-&gt;proto.tcp;</div><div class='del'>-	switch (state-&gt;state) {</div><div class='del'>-	case TCP_CONNTRACK_CLOSE:</div><div class='del'>-		if (th-&gt;rst &amp;&amp; !test_bit(IPS_SEEN_REPLY_BIT, &amp;ct-&gt;status)) {</div><div class='del'>-			nf_ct_seqadj_init(ct, ctinfo, synproxy-&gt;isn -</div><div class='del'>-						      ntohl(th-&gt;seq) + 1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!th-&gt;syn || th-&gt;ack ||</div><div class='del'>-		    CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Reopened connection - reset the sequence number and timestamp</div><div class='del'>-		 * adjustments, they will get initialized once the connection is</div><div class='del'>-		 * reestablished.</div><div class='del'>-		 */</div><div class='del'>-		nf_ct_seqadj_init(ct, ctinfo, 0);</div><div class='del'>-		synproxy-&gt;tsoff = 0;</div><div class='del'>-		this_cpu_inc(snet-&gt;stats-&gt;conn_reopened);</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='del'>-	case TCP_CONNTRACK_SYN_SENT:</div><div class='del'>-		if (!synproxy_parse_options(skb, thoff, th, &amp;opts))</div><div class='del'>-			return NF_DROP;</div><div class='del'>-</div><div class='del'>-		if (!th-&gt;syn &amp;&amp; th-&gt;ack &amp;&amp;</div><div class='del'>-		    CTINFO2DIR(ctinfo) == IP_CT_DIR_ORIGINAL) {</div><div class='del'>-			/* Keep-Alives are sent with SEG.SEQ = SND.NXT-1,</div><div class='del'>-			 * therefore we need to add 1 to make the SYN sequence</div><div class='del'>-			 * number match the one of first SYN.</div><div class='del'>-			 */</div><div class='del'>-			if (synproxy_recv_client_ack(net, skb, th, &amp;opts,</div><div class='del'>-						     ntohl(th-&gt;seq) + 1)) {</div><div class='del'>-				this_cpu_inc(snet-&gt;stats-&gt;cookie_retrans);</div><div class='del'>-				consume_skb(skb);</div><div class='del'>-				return NF_STOLEN;</div><div class='del'>-			} else {</div><div class='del'>-				return NF_DROP;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		synproxy-&gt;isn = ntohl(th-&gt;ack_seq);</div><div class='del'>-		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='del'>-			synproxy-&gt;its = opts.tsecr;</div><div class='del'>-</div><div class='del'>-		nf_conntrack_event_cache(IPCT_SYNPROXY, ct);</div><div class='del'>-		break;</div><div class='del'>-	case TCP_CONNTRACK_SYN_RECV:</div><div class='del'>-		if (!th-&gt;syn || !th-&gt;ack)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!synproxy_parse_options(skb, thoff, th, &amp;opts))</div><div class='del'>-			return NF_DROP;</div><div class='del'>-</div><div class='del'>-		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP) {</div><div class='del'>-			synproxy-&gt;tsoff = opts.tsval - synproxy-&gt;its;</div><div class='del'>-			nf_conntrack_event_cache(IPCT_SYNPROXY, ct);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		opts.options &amp;= ~(XT_SYNPROXY_OPT_MSS |</div><div class='del'>-				  XT_SYNPROXY_OPT_WSCALE |</div><div class='del'>-				  XT_SYNPROXY_OPT_SACK_PERM);</div><div class='del'>-</div><div class='del'>-		swap(opts.tsval, opts.tsecr);</div><div class='del'>-		synproxy_send_server_ack(net, state, skb, th, &amp;opts);</div><div class='del'>-</div><div class='del'>-		nf_ct_seqadj_init(ct, ctinfo, synproxy-&gt;isn - ntohl(th-&gt;seq));</div><div class='del'>-		nf_conntrack_event_cache(IPCT_SEQADJ, ct);</div><div class='del'>-</div><div class='del'>-		swap(opts.tsval, opts.tsecr);</div><div class='del'>-		synproxy_send_client_ack(net, skb, th, &amp;opts);</div><div class='del'>-</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		return NF_STOLEN;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	synproxy_tstamp_adjust(skb, thoff, th, ct, ctinfo, synproxy);</div><div class='del'>-	return NF_ACCEPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops ipv4_synproxy_ops[] = {</div><div class='del'>-	{</div><div class='del'>-		.hook		= ipv4_synproxy_hook,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_IN,</div><div class='del'>-		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.hook		= ipv4_synproxy_hook,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_POST_ROUTING,</div><div class='del'>-		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int synproxy_tg4_check(const struct xt_tgchk_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	struct synproxy_net *snet = synproxy_pernet(par-&gt;net);</div><div class='hunk'>@@ -452,16 +75,12 @@ static int synproxy_tg4_check(const struct xt_tgchk_param *par)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (snet-&gt;hook_ref4 == 0) {</div><div class='del'>-		err = nf_register_net_hooks(par-&gt;net, ipv4_synproxy_ops,</div><div class='del'>-					    ARRAY_SIZE(ipv4_synproxy_ops));</div><div class='del'>-		if (err) {</div><div class='del'>-			nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+	err = nf_synproxy_ipv4_init(snet, par-&gt;net);</div><div class='add'>+	if (err) {</div><div class='add'>+		nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snet-&gt;hook_ref4++;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -469,10 +88,7 @@ static void synproxy_tg4_destroy(const struct xt_tgdtor_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	struct synproxy_net *snet = synproxy_pernet(par-&gt;net);</div><div class='ctx'> </div><div class='del'>-	snet-&gt;hook_ref4--;</div><div class='del'>-	if (snet-&gt;hook_ref4 == 0)</div><div class='del'>-		nf_unregister_net_hooks(par-&gt;net, ipv4_synproxy_ops,</div><div class='del'>-					ARRAY_SIZE(ipv4_synproxy_ops));</div><div class='add'>+	nf_synproxy_ipv4_fini(snet, par-&gt;net);</div><div class='ctx'> 	nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -502,3 +118,4 @@ module_exit(synproxy_tg4_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Intercept TCP connections and establish them using syncookies");</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c<br/>index 7c6c20eaf4db..161ba412cb08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_ah.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_ah.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_ah.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ipt_ah.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match AH parameters. */</div><div class='ctx'> /* (C) 1999-2000 Yon Uriarte &lt;yon@astaro.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='head'>diff --git a/net/ipv4/netfilter/ipt_rpfilter.c b/net/ipv4/netfilter/ipt_rpfilter.c<br/>index 12843c9ef142..6d9bf5106868 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_rpfilter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/ipt_rpfilter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/ipt_rpfilter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/ipt_rpfilter.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011 Florian Westphal &lt;fw@strlen.de&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * based on fib_frontend.c; Author: Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -12,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -36,8 +34,6 @@ static bool rpfilter_lookup_reverse(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 				const struct net_device *dev, u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_result res;</div><div class='del'>-	bool dev_match;</div><div class='del'>-	int ret __maybe_unused;</div><div class='ctx'> </div><div class='ctx'> 	if (fib_lookup(net, fl4, &amp;res, FIB_LOOKUP_IGNORE_LINKSTATE))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -46,21 +42,7 @@ static bool rpfilter_lookup_reverse(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 		if (res.type != RTN_LOCAL || !(flags &amp; XT_RPFILTER_ACCEPT_LOCAL))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='del'>-	dev_match = false;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	for (ret = 0; ret &lt; res.fi-&gt;fib_nhs; ret++) {</div><div class='del'>-		struct fib_nh *nh = &amp;res.fi-&gt;fib_nh[ret];</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_dev == dev) {</div><div class='del'>-			dev_match = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	if (FIB_RES_DEV(res) == dev)</div><div class='del'>-		dev_match = true;</div><div class='del'>-#endif</div><div class='del'>-	return dev_match || flags &amp; XT_RPFILTER_LOOSE;</div><div class='add'>+	return fib_info_nh_uses_dev(res.fi, dev) || flags &amp; XT_RPFILTER_LOOSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -94,8 +76,10 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 	flow.daddr = iph-&gt;saddr;</div><div class='ctx'> 	flow.saddr = rpfilter_get_saddr(iph-&gt;daddr);</div><div class='ctx'> 	flow.flowi4_mark = info-&gt;flags &amp; XT_RPFILTER_VALID_MARK ? skb-&gt;mark : 0;</div><div class='del'>-	flow.flowi4_tos = RT_TOS(iph-&gt;tos);</div><div class='add'>+	flow.flowi4_dscp = ip4h_dscp(iph);</div><div class='ctx'> 	flow.flowi4_scope = RT_SCOPE_UNIVERSE;</div><div class='add'>+	flow.flowi4_l3mdev = l3mdev_master_ifindex_rcu(xt_in(par));</div><div class='add'>+	flow.flowi4_uid = sock_net_uid(xt_net(par), NULL);</div><div class='ctx'> </div><div class='ctx'> 	return rpfilter_lookup_reverse(xt_net(par), &amp;flow, xt_in(par), info-&gt;flags) ^ invert;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c<br/>index 9ac92ea7b93c..3ab908b74795 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_filter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/iptable_filter.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -23,7 +19,6 @@ MODULE_DESCRIPTION("iptables filter table");</div><div class='ctx'> #define FILTER_VALID_HOOKS ((1 &lt;&lt; NF_INET_LOCAL_IN) | \</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_FORWARD) | \</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_LOCAL_OUT))</div><div class='del'>-static int __net_init iptable_filter_table_init(struct net *net);</div><div class='ctx'> </div><div class='ctx'> static const struct xt_table packet_filter = {</div><div class='ctx'> 	.name		= "filter",</div><div class='hunk'>@@ -31,82 +26,83 @@ static const struct xt_table packet_filter = {</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV4,</div><div class='ctx'> 	.priority	= NF_IP_PRI_FILTER,</div><div class='del'>-	.table_init	= iptable_filter_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='del'>-iptable_filter_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		    const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.iptable_filter);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *filter_ops __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* Default to forward because I got too much mail already. */</div><div class='ctx'> static bool forward __read_mostly = true;</div><div class='ctx'> module_param(forward, bool, 0000);</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_filter_table_init(struct net *net)</div><div class='add'>+static int iptable_filter_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipt_replace *repl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.iptable_filter)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ipt_alloc_initial_table(&amp;packet_filter);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	/* Entry 1 is the FORWARD hook */</div><div class='ctx'> 	((struct ipt_standard *)repl-&gt;entries)[1].target.verdict =</div><div class='del'>-		forward ? -NF_ACCEPT - 1 : -NF_DROP - 1;</div><div class='add'>+		forward ? -NF_ACCEPT - 1 : NF_DROP - 1;</div><div class='ctx'> </div><div class='del'>-	err = ipt_register_table(net, &amp;packet_filter, repl, filter_ops,</div><div class='del'>-				 &amp;net-&gt;ipv4.iptable_filter);</div><div class='add'>+	err = ipt_register_table(net, &amp;packet_filter, repl, filter_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __net_init iptable_filter_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (net == &amp;init_net || !forward)</div><div class='add'>+	if (!forward)</div><div class='ctx'> 		return iptable_filter_table_init(net);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit iptable_filter_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ipt_unregister_table_pre_exit(net, "filter");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit iptable_filter_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.iptable_filter)</div><div class='del'>-		return;</div><div class='del'>-	ipt_unregister_table(net, net-&gt;ipv4.iptable_filter, filter_ops);</div><div class='del'>-	net-&gt;ipv4.iptable_filter = NULL;</div><div class='add'>+	ipt_unregister_table_exit(net, "filter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations iptable_filter_net_ops = {</div><div class='ctx'> 	.init = iptable_filter_net_init,</div><div class='add'>+	.pre_exit = iptable_filter_net_pre_exit,</div><div class='ctx'> 	.exit = iptable_filter_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init iptable_filter_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;packet_filter,</div><div class='add'>+				       iptable_filter_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	filter_ops = xt_hook_ops_alloc(&amp;packet_filter, iptable_filter_hook);</div><div class='del'>-	if (IS_ERR(filter_ops))</div><div class='add'>+	filter_ops = xt_hook_ops_alloc(&amp;packet_filter, ipt_do_table);</div><div class='add'>+	if (IS_ERR(filter_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		return PTR_ERR(filter_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;iptable_filter_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		kfree(filter_ops);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit iptable_filter_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;iptable_filter_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 	kfree(filter_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c<br/>index dea138ca8925..385d945d8ebe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_mangle.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_mangle.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_mangle.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/iptable_mangle.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv4/ip_tables.h&gt;</div><div class='hunk'>@@ -28,26 +25,23 @@ MODULE_DESCRIPTION("iptables mangle table");</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_LOCAL_OUT) | \</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_POST_ROUTING))</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_mangle_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table packet_mangler = {</div><div class='ctx'> 	.name		= "mangle",</div><div class='ctx'> 	.valid_hooks	= MANGLE_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV4,</div><div class='ctx'> 	.priority	= NF_IP_PRI_MANGLE,</div><div class='del'>-	.table_init	= iptable_mangle_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='del'>-ipt_mangle_out(struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='add'>+ipt_mangle_out(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ret;</div><div class='add'>+	unsigned int ret, verdict;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='del'>-	u_int8_t tos;</div><div class='ctx'> 	__be32 saddr, daddr;</div><div class='del'>-	u_int32_t mark;</div><div class='add'>+	u32 mark;</div><div class='ctx'> 	int err;</div><div class='add'>+	u8 tos;</div><div class='ctx'> </div><div class='ctx'> 	/* Save things which could affect route */</div><div class='ctx'> 	mark = skb-&gt;mark;</div><div class='hunk'>@@ -56,16 +50,17 @@ ipt_mangle_out(struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='ctx'> 	daddr = iph-&gt;daddr;</div><div class='ctx'> 	tos = iph-&gt;tos;</div><div class='ctx'> </div><div class='del'>-	ret = ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.iptable_mangle);</div><div class='add'>+	ret = ipt_do_table(priv, skb, state);</div><div class='add'>+	verdict = ret &amp; NF_VERDICT_MASK;</div><div class='ctx'> 	/* Reroute for ANY change. */</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN) {</div><div class='add'>+	if (verdict != NF_DROP &amp;&amp; verdict != NF_STOLEN) {</div><div class='ctx'> 		iph = ip_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (iph-&gt;saddr != saddr ||</div><div class='ctx'> 		    iph-&gt;daddr != daddr ||</div><div class='ctx'> 		    skb-&gt;mark != mark ||</div><div class='ctx'> 		    iph-&gt;tos != tos) {</div><div class='del'>-			err = ip_route_me_harder(state-&gt;net, skb, RTN_UNSPEC);</div><div class='add'>+			err = ip_route_me_harder(state-&gt;net, state-&gt;sk, skb, RTN_UNSPEC);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				ret = NF_DROP_ERR(err);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -81,68 +76,67 @@ iptable_mangle_hook(void *priv,</div><div class='ctx'> 		     const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	if (state-&gt;hook == NF_INET_LOCAL_OUT)</div><div class='del'>-		return ipt_mangle_out(skb, state);</div><div class='del'>-	return ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.iptable_mangle);</div><div class='add'>+		return ipt_mangle_out(priv, skb, state);</div><div class='add'>+	return ipt_do_table(priv, skb, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nf_hook_ops *mangle_ops __read_mostly;</div><div class='del'>-static int __net_init iptable_mangle_table_init(struct net *net)</div><div class='add'>+static int iptable_mangle_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipt_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.iptable_mangle)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ipt_alloc_initial_table(&amp;packet_mangler);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ipt_register_table(net, &amp;packet_mangler, repl, mangle_ops,</div><div class='del'>-				 &amp;net-&gt;ipv4.iptable_mangle);</div><div class='add'>+	ret = ipt_register_table(net, &amp;packet_mangler, repl, mangle_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit iptable_mangle_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ipt_unregister_table_pre_exit(net, "mangle");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit iptable_mangle_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.iptable_mangle)</div><div class='del'>-		return;</div><div class='del'>-	ipt_unregister_table(net, net-&gt;ipv4.iptable_mangle, mangle_ops);</div><div class='del'>-	net-&gt;ipv4.iptable_mangle = NULL;</div><div class='add'>+	ipt_unregister_table_exit(net, "mangle");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations iptable_mangle_net_ops = {</div><div class='add'>+	.pre_exit = iptable_mangle_net_pre_exit,</div><div class='ctx'> 	.exit = iptable_mangle_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init iptable_mangle_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;packet_mangler,</div><div class='add'>+				       iptable_mangle_table_init);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mangle_ops = xt_hook_ops_alloc(&amp;packet_mangler, iptable_mangle_hook);</div><div class='ctx'> 	if (IS_ERR(mangle_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 		ret = PTR_ERR(mangle_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;iptable_mangle_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 		kfree(mangle_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iptable_mangle_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;iptable_mangle_net_ops);</div><div class='del'>-		kfree(mangle_ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit iptable_mangle_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;iptable_mangle_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 	kfree(mangle_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/iptable_nat.c b/net/ipv4/netfilter/iptable_nat.c<br/>index a317445448bf..a5db7c67d61b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_nat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_nat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_nat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/iptable_nat.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2006 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='ctx'>  * (C) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -15,10 +12,12 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_nat_table_init(struct net *net);</div><div class='add'>+struct iptable_nat_pernet {</div><div class='add'>+	struct nf_hook_ops *nf_nat_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int iptable_nat_net_id __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static const struct xt_table nf_nat_ipv4_table = {</div><div class='ctx'> 	.name		= "nat",</div><div class='hunk'>@@ -28,37 +27,29 @@ static const struct xt_table nf_nat_ipv4_table = {</div><div class='ctx'> 			  (1 &lt;&lt; NF_INET_LOCAL_IN),</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV4,</div><div class='del'>-	.table_init	= iptable_nat_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int iptable_nat_do_chain(void *priv,</div><div class='del'>-					 struct sk_buff *skb,</div><div class='del'>-					 const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.nat_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct nf_hook_ops nf_nat_ipv4_ops[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= iptable_nat_do_chain,</div><div class='add'>+		.hook		= ipt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV4,</div><div class='ctx'> 		.hooknum	= NF_INET_PRE_ROUTING,</div><div class='ctx'> 		.priority	= NF_IP_PRI_NAT_DST,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= iptable_nat_do_chain,</div><div class='add'>+		.hook		= ipt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV4,</div><div class='ctx'> 		.hooknum	= NF_INET_POST_ROUTING,</div><div class='ctx'> 		.priority	= NF_IP_PRI_NAT_SRC,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= iptable_nat_do_chain,</div><div class='add'>+		.hook		= ipt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV4,</div><div class='ctx'> 		.hooknum	= NF_INET_LOCAL_OUT,</div><div class='ctx'> 		.priority	= NF_IP_PRI_NAT_DST,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= iptable_nat_do_chain,</div><div class='add'>+		.hook		= ipt_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV4,</div><div class='ctx'> 		.hooknum	= NF_INET_LOCAL_IN,</div><div class='ctx'> 		.priority	= NF_IP_PRI_NAT_SRC,</div><div class='hunk'>@@ -67,85 +58,113 @@ static const struct nf_hook_ops nf_nat_ipv4_ops[] = {</div><div class='ctx'> </div><div class='ctx'> static int ipt_nat_register_lookups(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct iptable_nat_pernet *xt_nat_net;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	struct xt_table *table;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='add'>+	xt_nat_net = net_generic(net, iptable_nat_net_id);</div><div class='add'>+	table = xt_find_table(net, NFPROTO_IPV4, "nat");</div><div class='add'>+	if (WARN_ON_ONCE(!table))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ops = kmemdup(nf_nat_ipv4_ops, sizeof(nf_nat_ipv4_ops), GFP_KERNEL);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(nf_nat_ipv4_ops); i++) {</div><div class='del'>-		ret = nf_nat_l3proto_ipv4_register_fn(net, &amp;nf_nat_ipv4_ops[i]);</div><div class='add'>+		ops[i].priv = table;</div><div class='add'>+		ret = nf_nat_ipv4_register_fn(net, &amp;ops[i]);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			while (i)</div><div class='del'>-				nf_nat_l3proto_ipv4_unregister_fn(net, &amp;nf_nat_ipv4_ops[--i]);</div><div class='add'>+				nf_nat_ipv4_unregister_fn(net, &amp;ops[--i]);</div><div class='ctx'> </div><div class='add'>+			kfree(ops);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	xt_nat_net-&gt;nf_nat_ops = ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipt_nat_unregister_lookups(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct iptable_nat_pernet *xt_nat_net = net_generic(net, iptable_nat_net_id);</div><div class='add'>+	struct nf_hook_ops *ops = xt_nat_net-&gt;nf_nat_ops;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(nf_nat_ipv4_ops); i++)</div><div class='del'>-		nf_nat_l3proto_ipv4_unregister_fn(net, &amp;nf_nat_ipv4_ops[i]);</div><div class='add'>+		nf_nat_ipv4_unregister_fn(net, &amp;ops[i]);</div><div class='add'>+</div><div class='add'>+	kfree(ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_nat_table_init(struct net *net)</div><div class='add'>+static int iptable_nat_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipt_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.nat_table)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ipt_alloc_initial_table(&amp;nf_nat_ipv4_table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ipt_register_table(net, &amp;nf_nat_ipv4_table, repl,</div><div class='del'>-				 NULL, &amp;net-&gt;ipv4.nat_table);</div><div class='add'>+</div><div class='add'>+	ret = ipt_register_table(net, &amp;nf_nat_ipv4_table, repl, NULL);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(repl);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ipt_nat_register_lookups(net);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		ipt_unregister_table(net, net-&gt;ipv4.nat_table, NULL);</div><div class='del'>-		net-&gt;ipv4.nat_table = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ipt_unregister_table_exit(net, "nat");</div><div class='ctx'> </div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit iptable_nat_net_exit(struct net *net)</div><div class='add'>+static void __net_exit iptable_nat_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.nat_table)</div><div class='del'>-		return;</div><div class='ctx'> 	ipt_nat_unregister_lookups(net);</div><div class='del'>-	ipt_unregister_table(net, net-&gt;ipv4.nat_table, NULL);</div><div class='del'>-	net-&gt;ipv4.nat_table = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit iptable_nat_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ipt_unregister_table_exit(net, "nat");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations iptable_nat_net_ops = {</div><div class='add'>+	.pre_exit = iptable_nat_net_pre_exit,</div><div class='ctx'> 	.exit	= iptable_nat_net_exit,</div><div class='add'>+	.id	= &amp;iptable_nat_net_id,</div><div class='add'>+	.size	= sizeof(struct iptable_nat_pernet),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init iptable_nat_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret = register_pernet_subsys(&amp;iptable_nat_net_ops);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	/* net-&gt;gen-&gt;ptr[iptable_nat_net_id] must be allocated</div><div class='add'>+	 * before calling iptable_nat_table_init().</div><div class='add'>+	 */</div><div class='add'>+	ret = register_pernet_subsys(&amp;iptable_nat_net_ops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iptable_nat_table_init(&amp;init_net);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret = xt_register_template(&amp;nf_nat_ipv4_table,</div><div class='add'>+				   iptable_nat_table_init);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		unregister_pernet_subsys(&amp;iptable_nat_net_ops);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit iptable_nat_exit(void)</div><div class='ctx'> {</div><div class='add'>+	xt_unregister_template(&amp;nf_nat_ipv4_table);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;iptable_nat_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,3 +172,4 @@ module_init(iptable_nat_init);</div><div class='ctx'> module_exit(iptable_nat_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("iptables legacy nat table");</div><div class='head'>diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c<br/>index 960625aabf04..0e7f53964d0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/iptable_raw.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * 'raw' table, which is the very first hooked in at PRE_ROUTING and LOCAL_OUT .</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 Jozsef Kadlecsik &lt;kadlec@blackhole.kfki.hu&gt;</div><div class='add'>+ * Copyright (C) 2003 Jozsef Kadlecsik &lt;kadlec@netfilter.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -11,8 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #define RAW_VALID_HOOKS ((1 &lt;&lt; NF_INET_PRE_ROUTING) | (1 &lt;&lt; NF_INET_LOCAL_OUT))</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_raw_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static bool raw_before_defrag __read_mostly;</div><div class='ctx'> MODULE_PARM_DESC(raw_before_defrag, "Enable raw table before defrag");</div><div class='ctx'> module_param(raw_before_defrag, bool, 0000);</div><div class='hunk'>@@ -23,7 +22,6 @@ static const struct xt_table packet_raw = {</div><div class='ctx'> 	.me = THIS_MODULE,</div><div class='ctx'> 	.af = NFPROTO_IPV4,</div><div class='ctx'> 	.priority = NF_IP_PRI_RAW,</div><div class='del'>-	.table_init = iptable_raw_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xt_table packet_raw_before_defrag = {</div><div class='hunk'>@@ -32,20 +30,11 @@ static const struct xt_table packet_raw_before_defrag = {</div><div class='ctx'> 	.me = THIS_MODULE,</div><div class='ctx'> 	.af = NFPROTO_IPV4,</div><div class='ctx'> 	.priority = NF_IP_PRI_RAW_BEFORE_DEFRAG,</div><div class='del'>-	.table_init = iptable_raw_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The work comes in here from netfilter.c. */</div><div class='del'>-static unsigned int</div><div class='del'>-iptable_raw_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		 const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.iptable_raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *rawtable_ops __read_mostly;</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_raw_table_init(struct net *net)</div><div class='add'>+static int iptable_raw_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipt_replace *repl;</div><div class='ctx'> 	const struct xt_table *table = &amp;packet_raw;</div><div class='hunk'>@@ -54,27 +43,26 @@ static int __net_init iptable_raw_table_init(struct net *net)</div><div class='ctx'> 	if (raw_before_defrag)</div><div class='ctx'> 		table = &amp;packet_raw_before_defrag;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.iptable_raw)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ipt_alloc_initial_table(table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ipt_register_table(net, table, repl, rawtable_ops,</div><div class='del'>-				 &amp;net-&gt;ipv4.iptable_raw);</div><div class='add'>+	ret = ipt_register_table(net, table, repl, rawtable_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit iptable_raw_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ipt_unregister_table_pre_exit(net, "raw");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit iptable_raw_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.iptable_raw)</div><div class='del'>-		return;</div><div class='del'>-	ipt_unregister_table(net, net-&gt;ipv4.iptable_raw, rawtable_ops);</div><div class='del'>-	net-&gt;ipv4.iptable_raw = NULL;</div><div class='add'>+	ipt_unregister_table_exit(net, "raw");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations iptable_raw_net_ops = {</div><div class='add'>+	.pre_exit = iptable_raw_net_pre_exit,</div><div class='ctx'> 	.exit = iptable_raw_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -89,22 +77,24 @@ static int __init iptable_raw_init(void)</div><div class='ctx'> 		pr_info("Enabling raw table before defrag\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rawtable_ops = xt_hook_ops_alloc(table, iptable_raw_hook);</div><div class='del'>-	if (IS_ERR(rawtable_ops))</div><div class='add'>+	ret = xt_register_template(table,</div><div class='add'>+				   iptable_raw_table_init);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rawtable_ops = xt_hook_ops_alloc(table, ipt_do_table);</div><div class='add'>+	if (IS_ERR(rawtable_ops)) {</div><div class='add'>+		xt_unregister_template(table);</div><div class='ctx'> 		return PTR_ERR(rawtable_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;iptable_raw_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(table);</div><div class='ctx'> 		kfree(rawtable_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iptable_raw_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;iptable_raw_net_ops);</div><div class='del'>-		kfree(rawtable_ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -112,8 +102,10 @@ static void __exit iptable_raw_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;iptable_raw_net_ops);</div><div class='ctx'> 	kfree(rawtable_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_raw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(iptable_raw_init);</div><div class='ctx'> module_exit(iptable_raw_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("iptables legacy raw table");</div><div class='head'>diff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c<br/>index e5379fe57b64..d885443cb267 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_security.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/iptable_security.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/iptable_security.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/iptable_security.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * "security" table</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,10 +11,6 @@</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam &lt;at&gt; netfilter.org&gt;</div><div class='ctx'>  * Copyright (C) 2008 Red Hat, Inc., James Morris &lt;jmorris &lt;at&gt; redhat.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv4/ip_tables.h&gt;</div><div class='hunk'>@@ -28,76 +25,65 @@ MODULE_DESCRIPTION("iptables security table, for MAC rules");</div><div class='ctx'> 				(1 &lt;&lt; NF_INET_FORWARD) | \</div><div class='ctx'> 				(1 &lt;&lt; NF_INET_LOCAL_OUT)</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_security_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table security_table = {</div><div class='ctx'> 	.name		= "security",</div><div class='ctx'> 	.valid_hooks	= SECURITY_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV4,</div><div class='ctx'> 	.priority	= NF_IP_PRI_SECURITY,</div><div class='del'>-	.table_init	= iptable_security_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='del'>-iptable_security_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		      const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ipt_do_table(skb, state, state-&gt;net-&gt;ipv4.iptable_security);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *sectbl_ops __read_mostly;</div><div class='ctx'> </div><div class='del'>-static int __net_init iptable_security_table_init(struct net *net)</div><div class='add'>+static int iptable_security_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipt_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.iptable_security)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ipt_alloc_initial_table(&amp;security_table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ipt_register_table(net, &amp;security_table, repl, sectbl_ops,</div><div class='del'>-				 &amp;net-&gt;ipv4.iptable_security);</div><div class='add'>+	ret = ipt_register_table(net, &amp;security_table, repl, sectbl_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit iptable_security_net_exit(struct net *net)</div><div class='add'>+static void __net_exit iptable_security_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv4.iptable_security)</div><div class='del'>-		return;</div><div class='add'>+	ipt_unregister_table_pre_exit(net, "security");</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ipt_unregister_table(net, net-&gt;ipv4.iptable_security, sectbl_ops);</div><div class='del'>-	net-&gt;ipv4.iptable_security = NULL;</div><div class='add'>+static void __net_exit iptable_security_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ipt_unregister_table_exit(net, "security");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations iptable_security_net_ops = {</div><div class='add'>+	.pre_exit = iptable_security_net_pre_exit,</div><div class='ctx'> 	.exit = iptable_security_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init iptable_security_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;security_table,</div><div class='add'>+				       iptable_security_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	sectbl_ops = xt_hook_ops_alloc(&amp;security_table, iptable_security_hook);</div><div class='del'>-	if (IS_ERR(sectbl_ops))</div><div class='add'>+	sectbl_ops = xt_hook_ops_alloc(&amp;security_table, ipt_do_table);</div><div class='add'>+	if (IS_ERR(sectbl_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;security_table);</div><div class='ctx'> 		return PTR_ERR(sectbl_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;iptable_security_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;security_table);</div><div class='ctx'> 		kfree(sectbl_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iptable_security_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;iptable_security_net_ops);</div><div class='del'>-		kfree(sectbl_ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,6 +91,7 @@ static void __exit iptable_security_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;iptable_security_net_ops);</div><div class='ctx'> 	kfree(sectbl_ops);</div><div class='add'>+	xt_unregister_template(&amp;security_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(iptable_security_init);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c<br/>index a0d3ad60a411..482e733c3375 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_defrag_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_defrag_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_defrag_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_defrag_ipv4.c</a></div><div class='hunk'>@@ -1,15 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -68,7 +66,7 @@ static unsigned int ipv4_conntrack_defrag(void *priv,</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	if (sk &amp;&amp; sk_fullsock(sk) &amp;&amp; (sk-&gt;sk_family == PF_INET) &amp;&amp;</div><div class='del'>-	    inet_sk(sk)-&gt;nodefrag)</div><div class='add'>+	    inet_test_bit(NODEFRAG, sk))</div><div class='ctx'> 		return NF_ACCEPT;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='hunk'>@@ -109,24 +107,38 @@ static const struct nf_hook_ops ipv4_defrag_ops[] = {</div><div class='ctx'> </div><div class='ctx'> static void __net_exit defrag4_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (net-&gt;nf.defrag_ipv4) {</div><div class='add'>+	if (net-&gt;nf.defrag_ipv4_users) {</div><div class='ctx'> 		nf_unregister_net_hooks(net, ipv4_defrag_ops,</div><div class='ctx'> 					ARRAY_SIZE(ipv4_defrag_ops));</div><div class='del'>-		net-&gt;nf.defrag_ipv4 = false;</div><div class='add'>+		net-&gt;nf.defrag_ipv4_users = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nf_defrag_hook defrag_hook = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.enable = nf_defrag_ipv4_enable,</div><div class='add'>+	.disable = nf_defrag_ipv4_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct pernet_operations defrag4_net_ops = {</div><div class='ctx'> 	.exit = defrag4_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init nf_defrag_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_pernet_subsys(&amp;defrag4_net_ops);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_pernet_subsys(&amp;defrag4_net_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(nf_defrag_v4_hook, &amp;defrag_hook);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit nf_defrag_fini(void)</div><div class='ctx'> {</div><div class='add'>+	rcu_assign_pointer(nf_defrag_v4_hook, NULL);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;defrag4_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,19 +146,21 @@ int nf_defrag_ipv4_enable(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (net-&gt;nf.defrag_ipv4)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;defrag4_mutex);</div><div class='del'>-	if (net-&gt;nf.defrag_ipv4)</div><div class='add'>+	if (net-&gt;nf.defrag_ipv4_users == UINT_MAX) {</div><div class='add'>+		err = -EOVERFLOW;</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (net-&gt;nf.defrag_ipv4_users) {</div><div class='add'>+		net-&gt;nf.defrag_ipv4_users++;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = nf_register_net_hooks(net, ipv4_defrag_ops,</div><div class='ctx'> 				    ARRAY_SIZE(ipv4_defrag_ops));</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		net-&gt;nf.defrag_ipv4 = true;</div><div class='add'>+		net-&gt;nf.defrag_ipv4_users = 1;</div><div class='ctx'> </div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;defrag4_mutex);</div><div class='hunk'>@@ -154,7 +168,22 @@ int nf_defrag_ipv4_enable(struct net *net)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_defrag_ipv4_enable);</div><div class='ctx'> </div><div class='add'>+void nf_defrag_ipv4_disable(struct net *net)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;defrag4_mutex);</div><div class='add'>+	if (net-&gt;nf.defrag_ipv4_users) {</div><div class='add'>+		net-&gt;nf.defrag_ipv4_users--;</div><div class='add'>+		if (net-&gt;nf.defrag_ipv4_users == 0)</div><div class='add'>+			nf_unregister_net_hooks(net, ipv4_defrag_ops,</div><div class='add'>+						ARRAY_SIZE(ipv4_defrag_ops));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;defrag4_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_defrag_ipv4_disable);</div><div class='add'>+</div><div class='ctx'> module_init(nf_defrag_init);</div><div class='ctx'> module_exit(nf_defrag_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IPv4 defragmentation support");</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c<br/>index 39895b9ddeb9..9a773502f10a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_dup_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_dup_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_dup_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_dup_ipv4.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * (C) 2007 by Sebastian Claßen &lt;sebastian.classen@freenet.ag&gt;</div><div class='ctx'>  * (C) 2007-2010 by Jan Engelhardt &lt;jengelh@medozas.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Extracted from xt_TEE.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 or later, as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -15,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -35,7 +33,7 @@ static bool nf_dup_ipv4_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 		fl4.flowi4_oif = oif;</div><div class='ctx'> </div><div class='ctx'> 	fl4.daddr = gw-&gt;s_addr;</div><div class='del'>-	fl4.flowi4_tos = RT_TOS(iph-&gt;tos);</div><div class='add'>+	fl4.flowi4_dscp = ip4h_dscp(iph);</div><div class='ctx'> 	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	fl4.flowi4_flags = FLOWI_FLAG_KNOWN_NH;</div><div class='ctx'> 	rt = ip_route_output_key(net, &amp;fl4);</div><div class='hunk'>@@ -55,8 +53,9 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> </div><div class='del'>-	if (this_cpu_read(nf_skb_duplicated))</div><div class='del'>-		return;</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	if (current-&gt;in_nf_duplicate)</div><div class='add'>+		goto out;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy the skb, and route the copy. Will later return %XT_CONTINUE for</div><div class='ctx'> 	 * the original skb, which should continue on its way as if nothing has</div><div class='hunk'>@@ -64,11 +63,11 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb = pskb_copy(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='ctx'> 	/* Avoid counting cloned packets towards the original connection. */</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> 	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);</div><div class='ctx'> #endif</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -87,12 +86,14 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,</div><div class='ctx'> 		--iph-&gt;ttl;</div><div class='ctx'> </div><div class='ctx'> 	if (nf_dup_ipv4_route(net, skb, gw, oif)) {</div><div class='del'>-		__this_cpu_write(nf_skb_duplicated, true);</div><div class='add'>+		current-&gt;in_nf_duplicate = true;</div><div class='ctx'> 		ip_local_out(net, skb-&gt;sk, skb);</div><div class='del'>-		__this_cpu_write(nf_skb_duplicated, false);</div><div class='add'>+		current-&gt;in_nf_duplicate = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_dup_ipv4);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/nf_flow_table_ipv4.c b/net/ipv4/netfilter/nf_flow_table_ipv4.c<br/>deleted file mode 100644<br/>index e1e56d7123d2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_flow_table_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_flow_table_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_flow_table.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-</div><div class='del'>-static struct nf_flowtable_type flowtable_ipv4 = {</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.init		= nf_flow_table_init,</div><div class='del'>-	.free		= nf_flow_table_free,</div><div class='del'>-	.hook		= nf_flow_offload_ip_hook,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_flow_ipv4_module_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_flowtable_type(&amp;flowtable_ipv4);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_flow_ipv4_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_flowtable_type(&amp;flowtable_ipv4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_flow_ipv4_module_init);</div><div class='del'>-module_exit(nf_flow_ipv4_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='del'>-MODULE_ALIAS_NF_FLOWTABLE(AF_INET);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_log_arp.c b/net/ipv4/netfilter/nf_log_arp.c<br/>deleted file mode 100644<br/>index df5c2a2061a4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_log_arp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_log_arp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * (C) 2014 by Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * Based on code from ebt_log from:</div><div class='del'>- *</div><div class='del'>- * Bart De Schuymer &lt;bdschuym@pandora.be&gt;</div><div class='del'>- * Harald Welte &lt;laforge@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/xt_LOG.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_log.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct nf_loginfo default_loginfo = {</div><div class='del'>-	.type	= NF_LOG_TYPE_LOG,</div><div class='del'>-	.u = {</div><div class='del'>-		.log = {</div><div class='del'>-			.level	  = LOGLEVEL_NOTICE,</div><div class='del'>-			.logflags = NF_LOG_DEFAULT_MASK,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct arppayload {</div><div class='del'>-	unsigned char mac_src[ETH_ALEN];</div><div class='del'>-	unsigned char ip_src[4];</div><div class='del'>-	unsigned char mac_dst[ETH_ALEN];</div><div class='del'>-	unsigned char ip_dst[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dump_arp_packet(struct nf_log_buf *m,</div><div class='del'>-			    const struct nf_loginfo *info,</div><div class='del'>-			    const struct sk_buff *skb, unsigned int nhoff)</div><div class='del'>-{</div><div class='del'>-	const struct arphdr *ah;</div><div class='del'>-	struct arphdr _arph;</div><div class='del'>-	const struct arppayload *ap;</div><div class='del'>-	struct arppayload _arpp;</div><div class='del'>-</div><div class='del'>-	ah = skb_header_pointer(skb, 0, sizeof(_arph), &amp;_arph);</div><div class='del'>-	if (ah == NULL) {</div><div class='del'>-		nf_log_buf_add(m, "TRUNCATED");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	nf_log_buf_add(m, "ARP HTYPE=%d PTYPE=0x%04x OPCODE=%d",</div><div class='del'>-		       ntohs(ah-&gt;ar_hrd), ntohs(ah-&gt;ar_pro), ntohs(ah-&gt;ar_op));</div><div class='del'>-</div><div class='del'>-	/* If it's for Ethernet and the lengths are OK, then log the ARP</div><div class='del'>-	 * payload.</div><div class='del'>-	 */</div><div class='del'>-	if (ah-&gt;ar_hrd != htons(ARPHRD_ETHER) ||</div><div class='del'>-	    ah-&gt;ar_hln != ETH_ALEN ||</div><div class='del'>-	    ah-&gt;ar_pln != sizeof(__be32))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ap = skb_header_pointer(skb, sizeof(_arph), sizeof(_arpp), &amp;_arpp);</div><div class='del'>-	if (ap == NULL) {</div><div class='del'>-		nf_log_buf_add(m, " INCOMPLETE [%zu bytes]",</div><div class='del'>-			       skb-&gt;len - sizeof(_arph));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	nf_log_buf_add(m, " MACSRC=%pM IPSRC=%pI4 MACDST=%pM IPDST=%pI4",</div><div class='del'>-		       ap-&gt;mac_src, ap-&gt;ip_src, ap-&gt;mac_dst, ap-&gt;ip_dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_log_arp_packet(struct net *net, u_int8_t pf,</div><div class='del'>-			      unsigned int hooknum, const struct sk_buff *skb,</div><div class='del'>-			      const struct net_device *in,</div><div class='del'>-			      const struct net_device *out,</div><div class='del'>-			      const struct nf_loginfo *loginfo,</div><div class='del'>-			      const char *prefix)</div><div class='del'>-{</div><div class='del'>-	struct nf_log_buf *m;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Disabled from containers until syslog ns is supported */</div><div class='del'>-	if (!net_eq(net, &amp;init_net) &amp;&amp; !sysctl_nf_log_all_netns)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	m = nf_log_buf_open();</div><div class='del'>-</div><div class='del'>-	if (!loginfo)</div><div class='del'>-		loginfo = &amp;default_loginfo;</div><div class='del'>-</div><div class='del'>-	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,</div><div class='del'>-				  prefix);</div><div class='del'>-	dump_arp_packet(m, loginfo, skb, 0);</div><div class='del'>-</div><div class='del'>-	nf_log_buf_close(m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nf_logger nf_arp_logger __read_mostly = {</div><div class='del'>-	.name		= "nf_log_arp",</div><div class='del'>-	.type		= NF_LOG_TYPE_LOG,</div><div class='del'>-	.logfn		= nf_log_arp_packet,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init nf_log_arp_net_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return nf_log_set(net, NFPROTO_ARP, &amp;nf_arp_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit nf_log_arp_net_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	nf_log_unset(net, &amp;nf_arp_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nf_log_arp_net_ops = {</div><div class='del'>-	.init = nf_log_arp_net_init,</div><div class='del'>-	.exit = nf_log_arp_net_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_log_arp_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_pernet_subsys(&amp;nf_log_arp_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = nf_log_register(NFPROTO_ARP, &amp;nf_arp_logger);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("failed to register logger\n");</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err1:</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_arp_net_ops);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_log_arp_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_arp_net_ops);</div><div class='del'>-	nf_log_unregister(&amp;nf_arp_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_log_arp_init);</div><div class='del'>-module_exit(nf_log_arp_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter ARP packet logging");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NF_LOGGER(3, 0);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_log_ipv4.c b/net/ipv4/netfilter/nf_log_ipv4.c<br/>deleted file mode 100644<br/>index 1e6f28c97d3a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_log_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_log_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,396 +0,0 @@</div><div class='del'>-/* (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/icmp.h&gt;</div><div class='del'>-#include &lt;net/udp.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/xt_LOG.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_log.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct nf_loginfo default_loginfo = {</div><div class='del'>-	.type	= NF_LOG_TYPE_LOG,</div><div class='del'>-	.u = {</div><div class='del'>-		.log = {</div><div class='del'>-			.level	  = LOGLEVEL_NOTICE,</div><div class='del'>-			.logflags = NF_LOG_DEFAULT_MASK,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* One level of recursion won't kill us */</div><div class='del'>-static void dump_ipv4_packet(struct net *net, struct nf_log_buf *m,</div><div class='del'>-			     const struct nf_loginfo *info,</div><div class='del'>-			     const struct sk_buff *skb, unsigned int iphoff)</div><div class='del'>-{</div><div class='del'>-	struct iphdr _iph;</div><div class='del'>-	const struct iphdr *ih;</div><div class='del'>-	unsigned int logflags;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;type == NF_LOG_TYPE_LOG)</div><div class='del'>-		logflags = info-&gt;u.log.logflags;</div><div class='del'>-	else</div><div class='del'>-		logflags = NF_LOG_DEFAULT_MASK;</div><div class='del'>-</div><div class='del'>-	ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &amp;_iph);</div><div class='del'>-	if (ih == NULL) {</div><div class='del'>-		nf_log_buf_add(m, "TRUNCATED");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Important fields:</div><div class='del'>-	 * TOS, len, DF/MF, fragment offset, TTL, src, dst, options. */</div><div class='del'>-	/* Max length: 40 "SRC=255.255.255.255 DST=255.255.255.255 " */</div><div class='del'>-	nf_log_buf_add(m, "SRC=%pI4 DST=%pI4 ", &amp;ih-&gt;saddr, &amp;ih-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	/* Max length: 46 "LEN=65535 TOS=0xFF PREC=0xFF TTL=255 ID=65535 " */</div><div class='del'>-	nf_log_buf_add(m, "LEN=%u TOS=0x%02X PREC=0x%02X TTL=%u ID=%u ",</div><div class='del'>-		       ntohs(ih-&gt;tot_len), ih-&gt;tos &amp; IPTOS_TOS_MASK,</div><div class='del'>-		       ih-&gt;tos &amp; IPTOS_PREC_MASK, ih-&gt;ttl, ntohs(ih-&gt;id));</div><div class='del'>-</div><div class='del'>-	/* Max length: 6 "CE DF MF " */</div><div class='del'>-	if (ntohs(ih-&gt;frag_off) &amp; IP_CE)</div><div class='del'>-		nf_log_buf_add(m, "CE ");</div><div class='del'>-	if (ntohs(ih-&gt;frag_off) &amp; IP_DF)</div><div class='del'>-		nf_log_buf_add(m, "DF ");</div><div class='del'>-	if (ntohs(ih-&gt;frag_off) &amp; IP_MF)</div><div class='del'>-		nf_log_buf_add(m, "MF ");</div><div class='del'>-</div><div class='del'>-	/* Max length: 11 "FRAG:65535 " */</div><div class='del'>-	if (ntohs(ih-&gt;frag_off) &amp; IP_OFFSET)</div><div class='del'>-		nf_log_buf_add(m, "FRAG:%u ", ntohs(ih-&gt;frag_off) &amp; IP_OFFSET);</div><div class='del'>-</div><div class='del'>-	if ((logflags &amp; NF_LOG_IPOPT) &amp;&amp;</div><div class='del'>-	    ih-&gt;ihl * 4 &gt; sizeof(struct iphdr)) {</div><div class='del'>-		const unsigned char *op;</div><div class='del'>-		unsigned char _opt[4 * 15 - sizeof(struct iphdr)];</div><div class='del'>-		unsigned int i, optsize;</div><div class='del'>-</div><div class='del'>-		optsize = ih-&gt;ihl * 4 - sizeof(struct iphdr);</div><div class='del'>-		op = skb_header_pointer(skb, iphoff+sizeof(_iph),</div><div class='del'>-					optsize, _opt);</div><div class='del'>-		if (op == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "TRUNCATED");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Max length: 127 "OPT (" 15*4*2chars ") " */</div><div class='del'>-		nf_log_buf_add(m, "OPT (");</div><div class='del'>-		for (i = 0; i &lt; optsize; i++)</div><div class='del'>-			nf_log_buf_add(m, "%02X", op[i]);</div><div class='del'>-		nf_log_buf_add(m, ") ");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (ih-&gt;protocol) {</div><div class='del'>-	case IPPROTO_TCP:</div><div class='del'>-		if (nf_log_dump_tcp_header(m, skb, ih-&gt;protocol,</div><div class='del'>-					   ntohs(ih-&gt;frag_off) &amp; IP_OFFSET,</div><div class='del'>-					   iphoff+ih-&gt;ihl*4, logflags))</div><div class='del'>-			return;</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_UDP:</div><div class='del'>-	case IPPROTO_UDPLITE:</div><div class='del'>-		if (nf_log_dump_udp_header(m, skb, ih-&gt;protocol,</div><div class='del'>-					   ntohs(ih-&gt;frag_off) &amp; IP_OFFSET,</div><div class='del'>-					   iphoff+ih-&gt;ihl*4))</div><div class='del'>-			return;</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_ICMP: {</div><div class='del'>-		struct icmphdr _icmph;</div><div class='del'>-		const struct icmphdr *ich;</div><div class='del'>-		static const size_t required_len[NR_ICMP_TYPES+1]</div><div class='del'>-			= { [ICMP_ECHOREPLY] = 4,</div><div class='del'>-			    [ICMP_DEST_UNREACH]</div><div class='del'>-			    = 8 + sizeof(struct iphdr),</div><div class='del'>-			    [ICMP_SOURCE_QUENCH]</div><div class='del'>-			    = 8 + sizeof(struct iphdr),</div><div class='del'>-			    [ICMP_REDIRECT]</div><div class='del'>-			    = 8 + sizeof(struct iphdr),</div><div class='del'>-			    [ICMP_ECHO] = 4,</div><div class='del'>-			    [ICMP_TIME_EXCEEDED]</div><div class='del'>-			    = 8 + sizeof(struct iphdr),</div><div class='del'>-			    [ICMP_PARAMETERPROB]</div><div class='del'>-			    = 8 + sizeof(struct iphdr),</div><div class='del'>-			    [ICMP_TIMESTAMP] = 20,</div><div class='del'>-			    [ICMP_TIMESTAMPREPLY] = 20,</div><div class='del'>-			    [ICMP_ADDRESS] = 12,</div><div class='del'>-			    [ICMP_ADDRESSREPLY] = 12 };</div><div class='del'>-</div><div class='del'>-		/* Max length: 11 "PROTO=ICMP " */</div><div class='del'>-		nf_log_buf_add(m, "PROTO=ICMP ");</div><div class='del'>-</div><div class='del'>-		if (ntohs(ih-&gt;frag_off) &amp; IP_OFFSET)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Max length: 25 "INCOMPLETE [65535 bytes] " */</div><div class='del'>-		ich = skb_header_pointer(skb, iphoff + ih-&gt;ihl * 4,</div><div class='del'>-					 sizeof(_icmph), &amp;_icmph);</div><div class='del'>-		if (ich == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "INCOMPLETE [%u bytes] ",</div><div class='del'>-				       skb-&gt;len - iphoff - ih-&gt;ihl*4);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Max length: 18 "TYPE=255 CODE=255 " */</div><div class='del'>-		nf_log_buf_add(m, "TYPE=%u CODE=%u ", ich-&gt;type, ich-&gt;code);</div><div class='del'>-</div><div class='del'>-		/* Max length: 25 "INCOMPLETE [65535 bytes] " */</div><div class='del'>-		if (ich-&gt;type &lt;= NR_ICMP_TYPES &amp;&amp;</div><div class='del'>-		    required_len[ich-&gt;type] &amp;&amp;</div><div class='del'>-		    skb-&gt;len-iphoff-ih-&gt;ihl*4 &lt; required_len[ich-&gt;type]) {</div><div class='del'>-			nf_log_buf_add(m, "INCOMPLETE [%u bytes] ",</div><div class='del'>-				       skb-&gt;len - iphoff - ih-&gt;ihl*4);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		switch (ich-&gt;type) {</div><div class='del'>-		case ICMP_ECHOREPLY:</div><div class='del'>-		case ICMP_ECHO:</div><div class='del'>-			/* Max length: 19 "ID=65535 SEQ=65535 " */</div><div class='del'>-			nf_log_buf_add(m, "ID=%u SEQ=%u ",</div><div class='del'>-				       ntohs(ich-&gt;un.echo.id),</div><div class='del'>-				       ntohs(ich-&gt;un.echo.sequence));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICMP_PARAMETERPROB:</div><div class='del'>-			/* Max length: 14 "PARAMETER=255 " */</div><div class='del'>-			nf_log_buf_add(m, "PARAMETER=%u ",</div><div class='del'>-				       ntohl(ich-&gt;un.gateway) &gt;&gt; 24);</div><div class='del'>-			break;</div><div class='del'>-		case ICMP_REDIRECT:</div><div class='del'>-			/* Max length: 24 "GATEWAY=255.255.255.255 " */</div><div class='del'>-			nf_log_buf_add(m, "GATEWAY=%pI4 ", &amp;ich-&gt;un.gateway);</div><div class='del'>-			/* Fall through */</div><div class='del'>-		case ICMP_DEST_UNREACH:</div><div class='del'>-		case ICMP_SOURCE_QUENCH:</div><div class='del'>-		case ICMP_TIME_EXCEEDED:</div><div class='del'>-			/* Max length: 3+maxlen */</div><div class='del'>-			if (!iphoff) { /* Only recurse once. */</div><div class='del'>-				nf_log_buf_add(m, "[");</div><div class='del'>-				dump_ipv4_packet(net, m, info, skb,</div><div class='del'>-					    iphoff + ih-&gt;ihl*4+sizeof(_icmph));</div><div class='del'>-				nf_log_buf_add(m, "] ");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Max length: 10 "MTU=65535 " */</div><div class='del'>-			if (ich-&gt;type == ICMP_DEST_UNREACH &amp;&amp;</div><div class='del'>-			    ich-&gt;code == ICMP_FRAG_NEEDED) {</div><div class='del'>-				nf_log_buf_add(m, "MTU=%u ",</div><div class='del'>-					       ntohs(ich-&gt;un.frag.mtu));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Max Length */</div><div class='del'>-	case IPPROTO_AH: {</div><div class='del'>-		struct ip_auth_hdr _ahdr;</div><div class='del'>-		const struct ip_auth_hdr *ah;</div><div class='del'>-</div><div class='del'>-		if (ntohs(ih-&gt;frag_off) &amp; IP_OFFSET)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Max length: 9 "PROTO=AH " */</div><div class='del'>-		nf_log_buf_add(m, "PROTO=AH ");</div><div class='del'>-</div><div class='del'>-		/* Max length: 25 "INCOMPLETE [65535 bytes] " */</div><div class='del'>-		ah = skb_header_pointer(skb, iphoff+ih-&gt;ihl*4,</div><div class='del'>-					sizeof(_ahdr), &amp;_ahdr);</div><div class='del'>-		if (ah == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "INCOMPLETE [%u bytes] ",</div><div class='del'>-				       skb-&gt;len - iphoff - ih-&gt;ihl*4);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Length: 15 "SPI=0xF1234567 " */</div><div class='del'>-		nf_log_buf_add(m, "SPI=0x%x ", ntohl(ah-&gt;spi));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case IPPROTO_ESP: {</div><div class='del'>-		struct ip_esp_hdr _esph;</div><div class='del'>-		const struct ip_esp_hdr *eh;</div><div class='del'>-</div><div class='del'>-		/* Max length: 10 "PROTO=ESP " */</div><div class='del'>-		nf_log_buf_add(m, "PROTO=ESP ");</div><div class='del'>-</div><div class='del'>-		if (ntohs(ih-&gt;frag_off) &amp; IP_OFFSET)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Max length: 25 "INCOMPLETE [65535 bytes] " */</div><div class='del'>-		eh = skb_header_pointer(skb, iphoff+ih-&gt;ihl*4,</div><div class='del'>-					sizeof(_esph), &amp;_esph);</div><div class='del'>-		if (eh == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "INCOMPLETE [%u bytes] ",</div><div class='del'>-				       skb-&gt;len - iphoff - ih-&gt;ihl*4);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Length: 15 "SPI=0xF1234567 " */</div><div class='del'>-		nf_log_buf_add(m, "SPI=0x%x ", ntohl(eh-&gt;spi));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Max length: 10 "PROTO 255 " */</div><div class='del'>-	default:</div><div class='del'>-		nf_log_buf_add(m, "PROTO=%u ", ih-&gt;protocol);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Max length: 15 "UID=4294967295 " */</div><div class='del'>-	if ((logflags &amp; NF_LOG_UID) &amp;&amp; !iphoff)</div><div class='del'>-		nf_log_dump_sk_uid_gid(net, m, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-	/* Max length: 16 "MARK=0xFFFFFFFF " */</div><div class='del'>-	if (!iphoff &amp;&amp; skb-&gt;mark)</div><div class='del'>-		nf_log_buf_add(m, "MARK=0x%x ", skb-&gt;mark);</div><div class='del'>-</div><div class='del'>-	/* Proto    Max log string length */</div><div class='del'>-	/* IP:	    40+46+6+11+127 = 230 */</div><div class='del'>-	/* TCP:     10+max(25,20+30+13+9+32+11+127) = 252 */</div><div class='del'>-	/* UDP:     10+max(25,20) = 35 */</div><div class='del'>-	/* UDPLITE: 14+max(25,20) = 39 */</div><div class='del'>-	/* ICMP:    11+max(25, 18+25+max(19,14,24+3+n+10,3+n+10)) = 91+n */</div><div class='del'>-	/* ESP:     10+max(25)+15 = 50 */</div><div class='del'>-	/* AH:	    9+max(25)+15 = 49 */</div><div class='del'>-	/* unknown: 10 */</div><div class='del'>-</div><div class='del'>-	/* (ICMP allows recursion one level deep) */</div><div class='del'>-	/* maxlen =  IP + ICMP +  IP + max(TCP,UDP,ICMP,unknown) */</div><div class='del'>-	/* maxlen = 230+   91  + 230 + 252 = 803 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dump_ipv4_mac_header(struct nf_log_buf *m,</div><div class='del'>-			    const struct nf_loginfo *info,</div><div class='del'>-			    const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	unsigned int logflags = 0;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;type == NF_LOG_TYPE_LOG)</div><div class='del'>-		logflags = info-&gt;u.log.logflags;</div><div class='del'>-</div><div class='del'>-	if (!(logflags &amp; NF_LOG_MACDECODE))</div><div class='del'>-		goto fallback;</div><div class='del'>-</div><div class='del'>-	switch (dev-&gt;type) {</div><div class='del'>-	case ARPHRD_ETHER:</div><div class='del'>-		nf_log_buf_add(m, "MACSRC=%pM MACDST=%pM MACPROTO=%04x ",</div><div class='del'>-			       eth_hdr(skb)-&gt;h_source, eth_hdr(skb)-&gt;h_dest,</div><div class='del'>-			       ntohs(eth_hdr(skb)-&gt;h_proto));</div><div class='del'>-		return;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fallback:</div><div class='del'>-	nf_log_buf_add(m, "MAC=");</div><div class='del'>-	if (dev-&gt;hard_header_len &amp;&amp;</div><div class='del'>-	    skb-&gt;mac_header != skb-&gt;network_header) {</div><div class='del'>-		const unsigned char *p = skb_mac_header(skb);</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		nf_log_buf_add(m, "%02x", *p++);</div><div class='del'>-		for (i = 1; i &lt; dev-&gt;hard_header_len; i++, p++)</div><div class='del'>-			nf_log_buf_add(m, ":%02x", *p);</div><div class='del'>-	}</div><div class='del'>-	nf_log_buf_add(m, " ");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_log_ip_packet(struct net *net, u_int8_t pf,</div><div class='del'>-			     unsigned int hooknum, const struct sk_buff *skb,</div><div class='del'>-			     const struct net_device *in,</div><div class='del'>-			     const struct net_device *out,</div><div class='del'>-			     const struct nf_loginfo *loginfo,</div><div class='del'>-			     const char *prefix)</div><div class='del'>-{</div><div class='del'>-	struct nf_log_buf *m;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Disabled from containers until syslog ns is supported */</div><div class='del'>-	if (!net_eq(net, &amp;init_net) &amp;&amp; !sysctl_nf_log_all_netns)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	m = nf_log_buf_open();</div><div class='del'>-</div><div class='del'>-	if (!loginfo)</div><div class='del'>-		loginfo = &amp;default_loginfo;</div><div class='del'>-</div><div class='del'>-	nf_log_dump_packet_common(m, pf, hooknum, skb, in,</div><div class='del'>-				  out, loginfo, prefix);</div><div class='del'>-</div><div class='del'>-	if (in != NULL)</div><div class='del'>-		dump_ipv4_mac_header(m, loginfo, skb);</div><div class='del'>-</div><div class='del'>-	dump_ipv4_packet(net, m, loginfo, skb, 0);</div><div class='del'>-</div><div class='del'>-	nf_log_buf_close(m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nf_logger nf_ip_logger __read_mostly = {</div><div class='del'>-	.name		= "nf_log_ipv4",</div><div class='del'>-	.type		= NF_LOG_TYPE_LOG,</div><div class='del'>-	.logfn		= nf_log_ip_packet,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init nf_log_ipv4_net_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return nf_log_set(net, NFPROTO_IPV4, &amp;nf_ip_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit nf_log_ipv4_net_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	nf_log_unset(net, &amp;nf_ip_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nf_log_ipv4_net_ops = {</div><div class='del'>-	.init = nf_log_ipv4_net_init,</div><div class='del'>-	.exit = nf_log_ipv4_net_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_log_ipv4_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_pernet_subsys(&amp;nf_log_ipv4_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = nf_log_register(NFPROTO_IPV4, &amp;nf_ip_logger);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("failed to register logger\n");</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err1:</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_ipv4_net_ops);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_log_ipv4_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_ipv4_net_ops);</div><div class='del'>-	nf_log_unregister(&amp;nf_ip_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_log_ipv4_init);</div><div class='del'>-module_exit(nf_log_ipv4_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Netfilter Core Team &lt;coreteam@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter IPv4 packet logging");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NF_LOGGER(AF_INET, 0);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c<br/>index 4e6b53ab6c33..faee20af4856 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_h323.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_h323.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_h323.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_nat_h323.c</a></div><div class='hunk'>@@ -1,13 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * H.323 extension for NAT alteration.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006 Jing Min Zhao &lt;zhaojingmin@users.sourceforge.net&gt;</div><div class='ctx'>  * Copyright (c) 2006-2012 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * This source code is licensed under General Public License version 2.</div><div class='del'>- *</div><div class='ctx'>  * Based on the 'brute force' H.323 NAT module by</div><div class='del'>- * Jozsef Kadlecsik &lt;kadlec@blackhole.kfki.hu&gt;</div><div class='add'>+ * Jozsef Kadlecsik &lt;kadlec@netfilter.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -59,7 +58,7 @@ static int set_addr(struct sk_buff *skb, unsigned int protoff,</div><div class='ctx'> 			net_notice_ratelimited("nf_nat_h323: nf_nat_mangle_udp_packet error\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		/* nf_nat_mangle_udp_packet uses skb_make_writable() to copy</div><div class='add'>+		/* nf_nat_mangle_udp_packet uses skb_ensure_writable() to copy</div><div class='ctx'> 		 * or pull everything in a linear buffer, so we can safely</div><div class='ctx'> 		 * use the skb pointers now */</div><div class='ctx'> 		*data = skb-&gt;data + ip_hdrlen(skb) + sizeof(struct udphdr);</div><div class='hunk'>@@ -222,11 +221,11 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		rtp_exp-&gt;tuple.dst.u.udp.port = htons(nated_port);</div><div class='del'>-		ret = nf_ct_expect_related(rtp_exp);</div><div class='add'>+		ret = nf_ct_expect_related(rtp_exp, 0);</div><div class='ctx'> 		if (ret == 0) {</div><div class='ctx'> 			rtcp_exp-&gt;tuple.dst.u.udp.port =</div><div class='ctx'> 			    htons(nated_port + 1);</div><div class='del'>-			ret = nf_ct_expect_related(rtcp_exp);</div><div class='add'>+			ret = nf_ct_expect_related(rtcp_exp, 0);</div><div class='ctx'> 			if (ret == 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			else if (ret == -EBUSY) {</div><div class='hunk'>@@ -292,20 +291,7 @@ static int nat_t120(struct sk_buff *skb, struct nf_conn *ct,</div><div class='ctx'> 	exp-&gt;expectfn = nf_nat_follow_master;</div><div class='ctx'> 	exp-&gt;dir = !dir;</div><div class='ctx'> </div><div class='del'>-	/* Try to get same port: if not, try to change it. */</div><div class='del'>-	for (; nated_port != 0; nated_port++) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		exp-&gt;tuple.dst.u.tcp.port = htons(nated_port);</div><div class='del'>-		ret = nf_ct_expect_related(exp);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (ret != -EBUSY) {</div><div class='del'>-			nated_port = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	nated_port = nf_nat_exp_find_port(exp, nated_port);</div><div class='ctx'> 	if (nated_port == 0) {	/* No port available */</div><div class='ctx'> 		net_notice_ratelimited("nf_nat_h323: out of TCP ports\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -348,20 +334,7 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,</div><div class='ctx'> 	if (info-&gt;sig_port[dir] == port)</div><div class='ctx'> 		nated_port = ntohs(info-&gt;sig_port[!dir]);</div><div class='ctx'> </div><div class='del'>-	/* Try to get same port: if not, try to change it. */</div><div class='del'>-	for (; nated_port != 0; nated_port++) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		exp-&gt;tuple.dst.u.tcp.port = htons(nated_port);</div><div class='del'>-		ret = nf_ct_expect_related(exp);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (ret != -EBUSY) {</div><div class='del'>-			nated_port = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	nated_port = nf_nat_exp_find_port(exp, nated_port);</div><div class='ctx'> 	if (nated_port == 0) {	/* No port available */</div><div class='ctx'> 		net_notice_ratelimited("nf_nat_q931: out of TCP ports\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -440,20 +413,7 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,</div><div class='ctx'> 	if (info-&gt;sig_port[dir] == port)</div><div class='ctx'> 		nated_port = ntohs(info-&gt;sig_port[!dir]);</div><div class='ctx'> </div><div class='del'>-	/* Try to get same port: if not, try to change it. */</div><div class='del'>-	for (; nated_port != 0; nated_port++) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		exp-&gt;tuple.dst.u.tcp.port = htons(nated_port);</div><div class='del'>-		ret = nf_ct_expect_related(exp);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (ret != -EBUSY) {</div><div class='del'>-			nated_port = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	nated_port = nf_nat_exp_find_port(exp, nated_port);</div><div class='ctx'> 	if (nated_port == 0) {	/* No port available */</div><div class='ctx'> 		net_notice_ratelimited("nf_nat_ras: out of TCP ports\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -533,20 +493,7 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct,</div><div class='ctx'> 	exp-&gt;expectfn = ip_nat_callforwarding_expect;</div><div class='ctx'> 	exp-&gt;dir = !dir;</div><div class='ctx'> </div><div class='del'>-	/* Try to get same port: if not, try to change it. */</div><div class='del'>-	for (nated_port = ntohs(port); nated_port != 0; nated_port++) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		exp-&gt;tuple.dst.u.tcp.port = htons(nated_port);</div><div class='del'>-		ret = nf_ct_expect_related(exp);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (ret != -EBUSY) {</div><div class='del'>-			nated_port = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	nated_port = nf_nat_exp_find_port(exp, ntohs(port));</div><div class='ctx'> 	if (nated_port == 0) {	/* No port available */</div><div class='ctx'> 		net_notice_ratelimited("nf_nat_q931: out of TCP ports\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -580,55 +527,41 @@ static struct nf_ct_helper_expectfn callforwarding_nat = {</div><div class='ctx'> 	.expectfn	= ip_nat_callforwarding_expect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct nfct_h323_nat_hooks nathooks = {</div><div class='add'>+	.set_h245_addr = set_h245_addr,</div><div class='add'>+	.set_h225_addr = set_h225_addr,</div><div class='add'>+	.set_sig_addr = set_sig_addr,</div><div class='add'>+	.set_ras_addr = set_ras_addr,</div><div class='add'>+	.nat_rtp_rtcp = nat_rtp_rtcp,</div><div class='add'>+	.nat_t120 = nat_t120,</div><div class='add'>+	.nat_h245 = nat_h245,</div><div class='add'>+	.nat_callforwarding = nat_callforwarding,</div><div class='add'>+	.nat_q931 = nat_q931,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='del'>-static int __init init(void)</div><div class='add'>+static int __init nf_nat_h323_init(void)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(set_h245_addr_hook != NULL);</div><div class='del'>-	BUG_ON(set_h225_addr_hook != NULL);</div><div class='del'>-	BUG_ON(set_sig_addr_hook != NULL);</div><div class='del'>-	BUG_ON(set_ras_addr_hook != NULL);</div><div class='del'>-	BUG_ON(nat_rtp_rtcp_hook != NULL);</div><div class='del'>-	BUG_ON(nat_t120_hook != NULL);</div><div class='del'>-	BUG_ON(nat_h245_hook != NULL);</div><div class='del'>-	BUG_ON(nat_callforwarding_hook != NULL);</div><div class='del'>-	BUG_ON(nat_q931_hook != NULL);</div><div class='del'>-</div><div class='del'>-	RCU_INIT_POINTER(set_h245_addr_hook, set_h245_addr);</div><div class='del'>-	RCU_INIT_POINTER(set_h225_addr_hook, set_h225_addr);</div><div class='del'>-	RCU_INIT_POINTER(set_sig_addr_hook, set_sig_addr);</div><div class='del'>-	RCU_INIT_POINTER(set_ras_addr_hook, set_ras_addr);</div><div class='del'>-	RCU_INIT_POINTER(nat_rtp_rtcp_hook, nat_rtp_rtcp);</div><div class='del'>-	RCU_INIT_POINTER(nat_t120_hook, nat_t120);</div><div class='del'>-	RCU_INIT_POINTER(nat_h245_hook, nat_h245);</div><div class='del'>-	RCU_INIT_POINTER(nat_callforwarding_hook, nat_callforwarding);</div><div class='del'>-	RCU_INIT_POINTER(nat_q931_hook, nat_q931);</div><div class='add'>+	RCU_INIT_POINTER(nfct_h323_nat_hook, &amp;nathooks);</div><div class='ctx'> 	nf_ct_helper_expectfn_register(&amp;q931_nat);</div><div class='ctx'> 	nf_ct_helper_expectfn_register(&amp;callforwarding_nat);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='del'>-static void __exit fini(void)</div><div class='add'>+static void __exit nf_nat_h323_fini(void)</div><div class='ctx'> {</div><div class='del'>-	RCU_INIT_POINTER(set_h245_addr_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(set_h225_addr_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(set_sig_addr_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(set_ras_addr_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nat_rtp_rtcp_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nat_t120_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nat_h245_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nat_callforwarding_hook, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nat_q931_hook, NULL);</div><div class='add'>+	RCU_INIT_POINTER(nfct_h323_nat_hook, NULL);</div><div class='ctx'> 	nf_ct_helper_expectfn_unregister(&amp;q931_nat);</div><div class='ctx'> 	nf_ct_helper_expectfn_unregister(&amp;callforwarding_nat);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='del'>-module_init(init);</div><div class='del'>-module_exit(fini);</div><div class='add'>+module_init(nf_nat_h323_init);</div><div class='add'>+module_exit(nf_nat_h323_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jing Min Zhao &lt;zhaojingmin@users.sourceforge.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("H.323 NAT helper");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("ip_nat_h323");</div><div class='add'>+MODULE_ALIAS_NF_NAT_HELPER("h323");</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c<br/>deleted file mode 100644<br/>index 6115bf1ff6f0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_l3proto_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,421 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2006 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- * (C) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/icmp.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;net/secure_seq.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l4proto.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct nf_nat_l3proto nf_nat_l3proto_ipv4;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-static void nf_nat_ipv4_decode_session(struct sk_buff *skb,</div><div class='del'>-				       const struct nf_conn *ct,</div><div class='del'>-				       enum ip_conntrack_dir dir,</div><div class='del'>-				       unsigned long statusbit,</div><div class='del'>-				       struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conntrack_tuple *t = &amp;ct-&gt;tuplehash[dir].tuple;</div><div class='del'>-	struct flowi4 *fl4 = &amp;fl-&gt;u.ip4;</div><div class='del'>-</div><div class='del'>-	if (ct-&gt;status &amp; statusbit) {</div><div class='del'>-		fl4-&gt;daddr = t-&gt;dst.u3.ip;</div><div class='del'>-		if (t-&gt;dst.protonum == IPPROTO_TCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDPLITE ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_DCCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_SCTP)</div><div class='del'>-			fl4-&gt;fl4_dport = t-&gt;dst.u.all;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	statusbit ^= IPS_NAT_MASK;</div><div class='del'>-</div><div class='del'>-	if (ct-&gt;status &amp; statusbit) {</div><div class='del'>-		fl4-&gt;saddr = t-&gt;src.u3.ip;</div><div class='del'>-		if (t-&gt;dst.protonum == IPPROTO_TCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDPLITE ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_DCCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_SCTP)</div><div class='del'>-			fl4-&gt;fl4_sport = t-&gt;src.u.all;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_XFRM */</div><div class='del'>-</div><div class='del'>-static bool nf_nat_ipv4_in_range(const struct nf_conntrack_tuple *t,</div><div class='del'>-				 const struct nf_nat_range2 *range)</div><div class='del'>-{</div><div class='del'>-	return ntohl(t-&gt;src.u3.ip) &gt;= ntohl(range-&gt;min_addr.ip) &amp;&amp;</div><div class='del'>-	       ntohl(t-&gt;src.u3.ip) &lt;= ntohl(range-&gt;max_addr.ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 nf_nat_ipv4_secure_port(const struct nf_conntrack_tuple *t,</div><div class='del'>-				   __be16 dport)</div><div class='del'>-{</div><div class='del'>-	return secure_ipv4_port_ephemeral(t-&gt;src.u3.ip, t-&gt;dst.u3.ip, dport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool nf_nat_ipv4_manip_pkt(struct sk_buff *skb,</div><div class='del'>-				  unsigned int iphdroff,</div><div class='del'>-				  const struct nf_nat_l4proto *l4proto,</div><div class='del'>-				  const struct nf_conntrack_tuple *target,</div><div class='del'>-				  enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph;</div><div class='del'>-	unsigned int hdroff;</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, iphdroff + sizeof(*iph)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	iph = (void *)skb-&gt;data + iphdroff;</div><div class='del'>-	hdroff = iphdroff + iph-&gt;ihl * 4;</div><div class='del'>-</div><div class='del'>-	if (!l4proto-&gt;manip_pkt(skb, &amp;nf_nat_l3proto_ipv4, iphdroff, hdroff,</div><div class='del'>-				target, maniptype))</div><div class='del'>-		return false;</div><div class='del'>-	iph = (void *)skb-&gt;data + iphdroff;</div><div class='del'>-</div><div class='del'>-	if (maniptype == NF_NAT_MANIP_SRC) {</div><div class='del'>-		csum_replace4(&amp;iph-&gt;check, iph-&gt;saddr, target-&gt;src.u3.ip);</div><div class='del'>-		iph-&gt;saddr = target-&gt;src.u3.ip;</div><div class='del'>-	} else {</div><div class='del'>-		csum_replace4(&amp;iph-&gt;check, iph-&gt;daddr, target-&gt;dst.u3.ip);</div><div class='del'>-		iph-&gt;daddr = target-&gt;dst.u3.ip;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_nat_ipv4_csum_update(struct sk_buff *skb,</div><div class='del'>-				    unsigned int iphdroff, __sum16 *check,</div><div class='del'>-				    const struct nf_conntrack_tuple *t,</div><div class='del'>-				    enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph = (struct iphdr *)(skb-&gt;data + iphdroff);</div><div class='del'>-	__be32 oldip, newip;</div><div class='del'>-</div><div class='del'>-	if (maniptype == NF_NAT_MANIP_SRC) {</div><div class='del'>-		oldip = iph-&gt;saddr;</div><div class='del'>-		newip = t-&gt;src.u3.ip;</div><div class='del'>-	} else {</div><div class='del'>-		oldip = iph-&gt;daddr;</div><div class='del'>-		newip = t-&gt;dst.u3.ip;</div><div class='del'>-	}</div><div class='del'>-	inet_proto_csum_replace4(check, skb, oldip, newip, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb,</div><div class='del'>-				    u8 proto, void *data, __sum16 *check,</div><div class='del'>-				    int datalen, int oldlen)</div><div class='del'>-{</div><div class='del'>-	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='del'>-		const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-		skb-&gt;csum_start = skb_headroom(skb) + skb_network_offset(skb) +</div><div class='del'>-			ip_hdrlen(skb);</div><div class='del'>-		skb-&gt;csum_offset = (void *)check - data;</div><div class='del'>-		*check = ~csum_tcpudp_magic(iph-&gt;saddr, iph-&gt;daddr, datalen,</div><div class='del'>-					    proto, 0);</div><div class='del'>-	} else</div><div class='del'>-		inet_proto_csum_replace2(check, skb,</div><div class='del'>-					 htons(oldlen), htons(datalen), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[],</div><div class='del'>-				       struct nf_nat_range2 *range)</div><div class='del'>-{</div><div class='del'>-	if (tb[CTA_NAT_V4_MINIP]) {</div><div class='del'>-		range-&gt;min_addr.ip = nla_get_be32(tb[CTA_NAT_V4_MINIP]);</div><div class='del'>-		range-&gt;flags |= NF_NAT_RANGE_MAP_IPS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tb[CTA_NAT_V4_MAXIP])</div><div class='del'>-		range-&gt;max_addr.ip = nla_get_be32(tb[CTA_NAT_V4_MAXIP]);</div><div class='del'>-	else</div><div class='del'>-		range-&gt;max_addr.ip = range-&gt;min_addr.ip;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct nf_nat_l3proto nf_nat_l3proto_ipv4 = {</div><div class='del'>-	.l3proto		= NFPROTO_IPV4,</div><div class='del'>-	.in_range		= nf_nat_ipv4_in_range,</div><div class='del'>-	.secure_port		= nf_nat_ipv4_secure_port,</div><div class='del'>-	.manip_pkt		= nf_nat_ipv4_manip_pkt,</div><div class='del'>-	.csum_update		= nf_nat_ipv4_csum_update,</div><div class='del'>-	.csum_recalc		= nf_nat_ipv4_csum_recalc,</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-	.nlattr_to_range	= nf_nat_ipv4_nlattr_to_range,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	.decode_session		= nf_nat_ipv4_decode_session,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int nf_nat_icmp_reply_translation(struct sk_buff *skb,</div><div class='del'>-				  struct nf_conn *ct,</div><div class='del'>-				  enum ip_conntrack_info ctinfo,</div><div class='del'>-				  unsigned int hooknum)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		struct icmphdr	icmp;</div><div class='del'>-		struct iphdr	ip;</div><div class='del'>-	} *inside;</div><div class='del'>-	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-	enum nf_nat_manip_type manip = HOOK2MANIP(hooknum);</div><div class='del'>-	unsigned int hdrlen = ip_hdrlen(skb);</div><div class='del'>-	const struct nf_nat_l4proto *l4proto;</div><div class='del'>-	struct nf_conntrack_tuple target;</div><div class='del'>-	unsigned long statusbit;</div><div class='del'>-</div><div class='del'>-	WARN_ON(ctinfo != IP_CT_RELATED &amp;&amp; ctinfo != IP_CT_RELATED_REPLY);</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, hdrlen + sizeof(*inside)))</div><div class='del'>-		return 0;</div><div class='del'>-	if (nf_ip_checksum(skb, hooknum, hdrlen, 0))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	inside = (void *)skb-&gt;data + hdrlen;</div><div class='del'>-	if (inside-&gt;icmp.type == ICMP_REDIRECT) {</div><div class='del'>-		if ((ct-&gt;status &amp; IPS_NAT_DONE_MASK) != IPS_NAT_DONE_MASK)</div><div class='del'>-			return 0;</div><div class='del'>-		if (ct-&gt;status &amp; IPS_NAT_MASK)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (manip == NF_NAT_MANIP_SRC)</div><div class='del'>-		statusbit = IPS_SRC_NAT;</div><div class='del'>-	else</div><div class='del'>-		statusbit = IPS_DST_NAT;</div><div class='del'>-</div><div class='del'>-	/* Invert if this is reply direction */</div><div class='del'>-	if (dir == IP_CT_DIR_REPLY)</div><div class='del'>-		statusbit ^= IPS_NAT_MASK;</div><div class='del'>-</div><div class='del'>-	if (!(ct-&gt;status &amp; statusbit))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	l4proto = __nf_nat_l4proto_find(NFPROTO_IPV4, inside-&gt;ip.protocol);</div><div class='del'>-	if (!nf_nat_ipv4_manip_pkt(skb, hdrlen + sizeof(inside-&gt;icmp),</div><div class='del'>-				   l4proto, &amp;ct-&gt;tuplehash[!dir].tuple, !manip))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='del'>-		/* Reloading "inside" here since manip_pkt may reallocate */</div><div class='del'>-		inside = (void *)skb-&gt;data + hdrlen;</div><div class='del'>-		inside-&gt;icmp.checksum = 0;</div><div class='del'>-		inside-&gt;icmp.checksum =</div><div class='del'>-			csum_fold(skb_checksum(skb, hdrlen,</div><div class='del'>-					       skb-&gt;len - hdrlen, 0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Change outer to look like the reply to an incoming packet */</div><div class='del'>-	nf_ct_invert_tuplepr(&amp;target, &amp;ct-&gt;tuplehash[!dir].tuple);</div><div class='del'>-	l4proto = __nf_nat_l4proto_find(NFPROTO_IPV4, 0);</div><div class='del'>-	if (!nf_nat_ipv4_manip_pkt(skb, 0, l4proto, &amp;target, manip))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_icmp_reply_translation);</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv4_fn(void *priv, struct sk_buff *skb,</div><div class='del'>-	       const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	if (!ct)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	if (ctinfo == IP_CT_RELATED || ctinfo == IP_CT_RELATED_REPLY) {</div><div class='del'>-		if (ip_hdr(skb)-&gt;protocol == IPPROTO_ICMP) {</div><div class='del'>-			if (!nf_nat_icmp_reply_translation(skb, ct, ctinfo,</div><div class='del'>-							   state-&gt;hook))</div><div class='del'>-				return NF_DROP;</div><div class='del'>-			else</div><div class='del'>-				return NF_ACCEPT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nf_nat_inet_fn(priv, skb, state);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_ipv4_fn);</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv4_in(void *priv, struct sk_buff *skb,</div><div class='del'>-	       const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	__be32 daddr = ip_hdr(skb)-&gt;daddr;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv4_fn(priv, skb, state);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    daddr != ip_hdr(skb)-&gt;daddr)</div><div class='del'>-		skb_dst_drop(skb);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv4_out(void *priv, struct sk_buff *skb,</div><div class='del'>-		const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	const struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	int err;</div><div class='del'>-#endif</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv4_fn(priv, skb, state);</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    !(IPCB(skb)-&gt;flags &amp; IPSKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-	    (ct = nf_ct_get(skb, &amp;ctinfo)) != NULL) {</div><div class='del'>-		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-</div><div class='del'>-		if ((ct-&gt;tuplehash[dir].tuple.src.u3.ip !=</div><div class='del'>-		     ct-&gt;tuplehash[!dir].tuple.dst.u3.ip) ||</div><div class='del'>-		    (ct-&gt;tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMP &amp;&amp;</div><div class='del'>-		     ct-&gt;tuplehash[dir].tuple.src.u.all !=</div><div class='del'>-		     ct-&gt;tuplehash[!dir].tuple.dst.u.all)) {</div><div class='del'>-			err = nf_xfrm_me_harder(state-&gt;net, skb, AF_INET);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv4_local_fn(void *priv, struct sk_buff *skb,</div><div class='del'>-		     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv4_fn(priv, skb, state);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    (ct = nf_ct_get(skb, &amp;ctinfo)) != NULL) {</div><div class='del'>-		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-</div><div class='del'>-		if (ct-&gt;tuplehash[dir].tuple.dst.u3.ip !=</div><div class='del'>-		    ct-&gt;tuplehash[!dir].tuple.src.u3.ip) {</div><div class='del'>-			err = ip_route_me_harder(state-&gt;net, skb, RTN_UNSPEC);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-		else if (!(IPCB(skb)-&gt;flags &amp; IPSKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-			 ct-&gt;tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMP &amp;&amp;</div><div class='del'>-			 ct-&gt;tuplehash[dir].tuple.dst.u.all !=</div><div class='del'>-			 ct-&gt;tuplehash[!dir].tuple.src.u.all) {</div><div class='del'>-			err = nf_xfrm_me_harder(state-&gt;net, skb, AF_INET);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops nf_nat_ipv4_ops[] = {</div><div class='del'>-	/* Before packet filtering, change destination */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv4_in,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_PRE_ROUTING,</div><div class='del'>-		.priority	= NF_IP_PRI_NAT_DST,</div><div class='del'>-	},</div><div class='del'>-	/* After packet filtering, change source */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv4_out,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_POST_ROUTING,</div><div class='del'>-		.priority	= NF_IP_PRI_NAT_SRC,</div><div class='del'>-	},</div><div class='del'>-	/* Before packet filtering, change destination */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv4_local_fn,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_OUT,</div><div class='del'>-		.priority	= NF_IP_PRI_NAT_DST,</div><div class='del'>-	},</div><div class='del'>-	/* After packet filtering, change source */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv4_fn,</div><div class='del'>-		.pf		= NFPROTO_IPV4,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_IN,</div><div class='del'>-		.priority	= NF_IP_PRI_NAT_SRC,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int nf_nat_l3proto_ipv4_register_fn(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_register_fn(net, ops, nf_nat_ipv4_ops, ARRAY_SIZE(nf_nat_ipv4_ops));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv4_register_fn);</div><div class='del'>-</div><div class='del'>-void nf_nat_l3proto_ipv4_unregister_fn(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv4_ops));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv4_unregister_fn);</div><div class='del'>-</div><div class='del'>-static int __init nf_nat_l3proto_ipv4_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nf_nat_l4proto_register(NFPROTO_IPV4, &amp;nf_nat_l4proto_icmp);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err1;</div><div class='del'>-	err = nf_nat_l3proto_register(&amp;nf_nat_l3proto_ipv4);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err2;</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-err2:</div><div class='del'>-	nf_nat_l4proto_unregister(NFPROTO_IPV4, &amp;nf_nat_l4proto_icmp);</div><div class='del'>-err1:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_nat_l3proto_ipv4_exit(void)</div><div class='del'>-{</div><div class='del'>-	nf_nat_l3proto_unregister(&amp;nf_nat_l3proto_ipv4);</div><div class='del'>-	nf_nat_l4proto_unregister(NFPROTO_IPV4, &amp;nf_nat_l4proto_icmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("nf-nat-" __stringify(AF_INET));</div><div class='del'>-</div><div class='del'>-module_init(nf_nat_l3proto_ipv4_init);</div><div class='del'>-module_exit(nf_nat_l3proto_ipv4_exit);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c b/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c<br/>deleted file mode 100644<br/>index ad3aeff152ed..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_masquerade_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-/* (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2006 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/x_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv4/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-unsigned int</div><div class='del'>-nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,</div><div class='del'>-		       const struct nf_nat_range2 *range,</div><div class='del'>-		       const struct net_device *out)</div><div class='del'>-{</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	struct nf_conn_nat *nat;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	struct nf_nat_range2 newrange;</div><div class='del'>-	const struct rtable *rt;</div><div class='del'>-	__be32 newsrc, nh;</div><div class='del'>-</div><div class='del'>-	WARN_ON(hooknum != NF_INET_POST_ROUTING);</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-</div><div class='del'>-	WARN_ON(!(ct &amp;&amp; (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||</div><div class='del'>-			 ctinfo == IP_CT_RELATED_REPLY)));</div><div class='del'>-</div><div class='del'>-	/* Source address is 0.0.0.0 - locally generated packet that is</div><div class='del'>-	 * probably not supposed to be masqueraded.</div><div class='del'>-	 */</div><div class='del'>-	if (ct-&gt;tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip == 0)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	rt = skb_rtable(skb);</div><div class='del'>-	nh = rt_nexthop(rt, ip_hdr(skb)-&gt;daddr);</div><div class='del'>-	newsrc = inet_select_addr(out, nh, RT_SCOPE_UNIVERSE);</div><div class='del'>-	if (!newsrc) {</div><div class='del'>-		pr_info("%s ate my IP address\n", out-&gt;name);</div><div class='del'>-		return NF_DROP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nat = nf_ct_nat_ext_add(ct);</div><div class='del'>-	if (nat)</div><div class='del'>-		nat-&gt;masq_index = out-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	/* Transfer from original range. */</div><div class='del'>-	memset(&amp;newrange.min_addr, 0, sizeof(newrange.min_addr));</div><div class='del'>-	memset(&amp;newrange.max_addr, 0, sizeof(newrange.max_addr));</div><div class='del'>-	newrange.flags       = range-&gt;flags | NF_NAT_RANGE_MAP_IPS;</div><div class='del'>-	newrange.min_addr.ip = newsrc;</div><div class='del'>-	newrange.max_addr.ip = newsrc;</div><div class='del'>-	newrange.min_proto   = range-&gt;min_proto;</div><div class='del'>-	newrange.max_proto   = range-&gt;max_proto;</div><div class='del'>-</div><div class='del'>-	/* Hand modified range to generic setup. */</div><div class='del'>-	return nf_nat_setup_info(ct, &amp;newrange, NF_NAT_MANIP_SRC);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv4);</div><div class='del'>-</div><div class='del'>-static int device_cmp(struct nf_conn *i, void *ifindex)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conn_nat *nat = nfct_nat(i);</div><div class='del'>-</div><div class='del'>-	if (!nat)</div><div class='del'>-		return 0;</div><div class='del'>-	if (nf_ct_l3num(i) != NFPROTO_IPV4)</div><div class='del'>-		return 0;</div><div class='del'>-	return nat-&gt;masq_index == (int)(long)ifindex;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int masq_device_event(struct notifier_block *this,</div><div class='del'>-			     unsigned long event,</div><div class='del'>-			     void *ptr)</div><div class='del'>-{</div><div class='del'>-	const struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	if (event == NETDEV_DOWN) {</div><div class='del'>-		/* Device was downed.  Search entire table for</div><div class='del'>-		 * conntracks which were associated with that device,</div><div class='del'>-		 * and forget them.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(dev-&gt;ifindex == 0);</div><div class='del'>-</div><div class='del'>-		nf_ct_iterate_cleanup_net(net, device_cmp,</div><div class='del'>-					  (void *)(long)dev-&gt;ifindex, 0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int masq_inet_event(struct notifier_block *this,</div><div class='del'>-			   unsigned long event,</div><div class='del'>-			   void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct in_device *idev = ((struct in_ifaddr *)ptr)-&gt;ifa_dev;</div><div class='del'>-	struct netdev_notifier_info info;</div><div class='del'>-</div><div class='del'>-	/* The masq_dev_notifier will catch the case of the device going</div><div class='del'>-	 * down.  So if the inetdev is dead and being destroyed we have</div><div class='del'>-	 * no work to do.  Otherwise this is an individual address removal</div><div class='del'>-	 * and we have to perform the flush.</div><div class='del'>-	 */</div><div class='del'>-	if (idev-&gt;dead)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	netdev_notifier_info_init(&amp;info, idev-&gt;dev);</div><div class='del'>-	return masq_device_event(this, event, &amp;info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block masq_dev_notifier = {</div><div class='del'>-	.notifier_call	= masq_device_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct notifier_block masq_inet_notifier = {</div><div class='del'>-	.notifier_call	= masq_inet_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static atomic_t masquerade_notifier_refcount = ATOMIC_INIT(0);</div><div class='del'>-</div><div class='del'>-void nf_nat_masquerade_ipv4_register_notifier(void)</div><div class='del'>-{</div><div class='del'>-	/* check if the notifier was already set */</div><div class='del'>-	if (atomic_inc_return(&amp;masquerade_notifier_refcount) &gt; 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Register for device down reports */</div><div class='del'>-	register_netdevice_notifier(&amp;masq_dev_notifier);</div><div class='del'>-	/* Register IP address change reports */</div><div class='del'>-	register_inetaddr_notifier(&amp;masq_inet_notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv4_register_notifier);</div><div class='del'>-</div><div class='del'>-void nf_nat_masquerade_ipv4_unregister_notifier(void)</div><div class='del'>-{</div><div class='del'>-	/* check if the notifier still has clients */</div><div class='del'>-	if (atomic_dec_return(&amp;masquerade_notifier_refcount) &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	unregister_netdevice_notifier(&amp;masq_dev_notifier);</div><div class='del'>-	unregister_inetaddr_notifier(&amp;masq_inet_notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv4_unregister_notifier);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c<br/>index 5d259a12e25f..fab357cc8559 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_pptp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_pptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_pptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_nat_pptp.c</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * nf_nat_pptp.c</div><div class='ctx'>  *</div><div class='ctx'>  * NAT support for PPTP (Point to Point Tunneling Protocol).</div><div class='del'>- * PPTP is a a protocol for creating virtual private networks.</div><div class='add'>+ * PPTP is a protocol for creating virtual private networks.</div><div class='ctx'>  * It is a specification defined by Microsoft and some vendors</div><div class='ctx'>  * working with Microsoft.  PPTP is built on top of a modified</div><div class='ctx'>  * version of the Internet Generic Routing Encapsulation Protocol.</div><div class='hunk'>@@ -37,7 +38,7 @@</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Harald Welte &lt;laforge@gnumonks.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Netfilter NAT helper module for PPTP");</div><div class='del'>-MODULE_ALIAS("ip_nat_pptp");</div><div class='add'>+MODULE_ALIAS_NF_NAT_HELPER("pptp");</div><div class='ctx'> </div><div class='ctx'> static void pptp_nat_expected(struct nf_conn *ct,</div><div class='ctx'> 			      struct nf_conntrack_expect *exp)</div><div class='hunk'>@@ -165,9 +166,8 @@ pptp_outbound_pkt(struct sk_buff *skb,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_debug("unknown outbound packet 0x%04x:%s\n", msg,</div><div class='del'>-			 msg &lt;= PPTP_MSG_MAX ? pptp_msg_name[msg] :</div><div class='del'>-					       pptp_msg_name[0]);</div><div class='del'>-		/* fall through */</div><div class='add'>+			 pptp_msg_name(msg));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PPTP_SET_LINK_INFO:</div><div class='ctx'> 		/* only need to NAT in case PAC is behind NAT box */</div><div class='ctx'> 	case PPTP_START_SESSION_REQUEST:</div><div class='hunk'>@@ -267,10 +267,8 @@ pptp_inbound_pkt(struct sk_buff *skb,</div><div class='ctx'> 		pcid_off = offsetof(union pptp_ctrl_union, setlink.peersCallID);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		pr_debug("unknown inbound packet %s\n",</div><div class='del'>-			 msg &lt;= PPTP_MSG_MAX ? pptp_msg_name[msg] :</div><div class='del'>-					       pptp_msg_name[0]);</div><div class='del'>-		/* fall through */</div><div class='add'>+		pr_debug("unknown inbound packet %s\n", pptp_msg_name(msg));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PPTP_START_SESSION_REQUEST:</div><div class='ctx'> 	case PPTP_START_SESSION_REPLY:</div><div class='ctx'> 	case PPTP_STOP_SESSION_REQUEST:</div><div class='hunk'>@@ -297,30 +295,24 @@ pptp_inbound_pkt(struct sk_buff *skb,</div><div class='ctx'> 	return NF_ACCEPT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nf_nat_pptp_hook pptp_hooks = {</div><div class='add'>+	.outbound = pptp_outbound_pkt,</div><div class='add'>+	.inbound = pptp_inbound_pkt,</div><div class='add'>+	.exp_gre = pptp_exp_gre,</div><div class='add'>+	.expectfn = pptp_nat_expected,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init nf_nat_helper_pptp_init(void)</div><div class='ctx'> {</div><div class='del'>-	nf_nat_need_gre();</div><div class='del'>-</div><div class='del'>-	BUG_ON(nf_nat_pptp_hook_outbound != NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, pptp_outbound_pkt);</div><div class='del'>-</div><div class='del'>-	BUG_ON(nf_nat_pptp_hook_inbound != NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_inbound, pptp_inbound_pkt);</div><div class='del'>-</div><div class='del'>-	BUG_ON(nf_nat_pptp_hook_exp_gre != NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_exp_gre, pptp_exp_gre);</div><div class='add'>+	WARN_ON(nf_nat_pptp_hook != NULL);</div><div class='add'>+	RCU_INIT_POINTER(nf_nat_pptp_hook, &amp;pptp_hooks);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(nf_nat_pptp_hook_expectfn != NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_expectfn, pptp_nat_expected);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit nf_nat_helper_pptp_fini(void)</div><div class='ctx'> {</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_expectfn, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_exp_gre, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_inbound, NULL);</div><div class='del'>-	RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, NULL);</div><div class='add'>+	RCU_INIT_POINTER(nf_nat_pptp_hook, NULL);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c<br/>deleted file mode 100644<br/>index 00fda6331ce5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_proto_gre.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_proto_gre.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,150 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * nf_nat_proto_gre.c</div><div class='del'>- *</div><div class='del'>- * NAT protocol helper module for GRE.</div><div class='del'>- *</div><div class='del'>- * GRE is a generic encapsulation protocol, which is generally not very</div><div class='del'>- * suited for NAT, as it has no protocol-specific part as port numbers.</div><div class='del'>- *</div><div class='del'>- * It has an optional key field, which may help us distinguishing two</div><div class='del'>- * connections between the same two hosts.</div><div class='del'>- *</div><div class='del'>- * GRE is defined in RFC 1701 and RFC 1702, as well as RFC 2784</div><div class='del'>- *</div><div class='del'>- * PPTP is built on top of a modified version of GRE, and has a mandatory</div><div class='del'>- * field called "CallID", which serves us for the same purpose as the key</div><div class='del'>- * field in plain GRE.</div><div class='del'>- *</div><div class='del'>- * Documentation about PPTP can be found in RFC 2637</div><div class='del'>- *</div><div class='del'>- * (C) 2000-2005 by Harald Welte &lt;laforge@gnumonks.org&gt;</div><div class='del'>- *</div><div class='del'>- * Development of this code funded by Astaro AG (http://www.astaro.com/)</div><div class='del'>- *</div><div class='del'>- * (C) 2006-2012 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l4proto.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_conntrack_proto_gre.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Harald Welte &lt;laforge@gnumonks.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");</div><div class='del'>-</div><div class='del'>-/* generate unique tuple ... */</div><div class='del'>-static void</div><div class='del'>-gre_unique_tuple(const struct nf_nat_l3proto *l3proto,</div><div class='del'>-		 struct nf_conntrack_tuple *tuple,</div><div class='del'>-		 const struct nf_nat_range2 *range,</div><div class='del'>-		 enum nf_nat_manip_type maniptype,</div><div class='del'>-		 const struct nf_conn *ct)</div><div class='del'>-{</div><div class='del'>-	static u_int16_t key;</div><div class='del'>-	__be16 *keyptr;</div><div class='del'>-	unsigned int min, i, range_size;</div><div class='del'>-</div><div class='del'>-	/* If there is no master conntrack we are not PPTP,</div><div class='del'>-	   do not change tuples */</div><div class='del'>-	if (!ct-&gt;master)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (maniptype == NF_NAT_MANIP_SRC)</div><div class='del'>-		keyptr = &amp;tuple-&gt;src.u.gre.key;</div><div class='del'>-	else</div><div class='del'>-		keyptr = &amp;tuple-&gt;dst.u.gre.key;</div><div class='del'>-</div><div class='del'>-	if (!(range-&gt;flags &amp; NF_NAT_RANGE_PROTO_SPECIFIED)) {</div><div class='del'>-		pr_debug("%p: NATing GRE PPTP\n", ct);</div><div class='del'>-		min = 1;</div><div class='del'>-		range_size = 0xffff;</div><div class='del'>-	} else {</div><div class='del'>-		min = ntohs(range-&gt;min_proto.gre.key);</div><div class='del'>-		range_size = ntohs(range-&gt;max_proto.gre.key) - min + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("min = %u, range_size = %u\n", min, range_size);</div><div class='del'>-</div><div class='del'>-	for (i = 0; ; ++key) {</div><div class='del'>-		*keyptr = htons(min + key % range_size);</div><div class='del'>-		if (++i == range_size || !nf_nat_used_tuple(tuple, ct))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("%p: no NAT mapping\n", ct);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* manipulate a GRE packet according to maniptype */</div><div class='del'>-static bool</div><div class='del'>-gre_manip_pkt(struct sk_buff *skb,</div><div class='del'>-	      const struct nf_nat_l3proto *l3proto,</div><div class='del'>-	      unsigned int iphdroff, unsigned int hdroff,</div><div class='del'>-	      const struct nf_conntrack_tuple *tuple,</div><div class='del'>-	      enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	const struct gre_base_hdr *greh;</div><div class='del'>-	struct pptp_gre_header *pgreh;</div><div class='del'>-</div><div class='del'>-	/* pgreh includes two optional 32bit fields which are not required</div><div class='del'>-	 * to be there.  That's where the magic '8' comes from */</div><div class='del'>-	if (!skb_make_writable(skb, hdroff + sizeof(*pgreh) - 8))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	greh = (void *)skb-&gt;data + hdroff;</div><div class='del'>-	pgreh = (struct pptp_gre_header *)greh;</div><div class='del'>-</div><div class='del'>-	/* we only have destination manip of a packet, since 'source key'</div><div class='del'>-	 * is not present in the packet itself */</div><div class='del'>-	if (maniptype != NF_NAT_MANIP_DST)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	switch (greh-&gt;flags &amp; GRE_VERSION) {</div><div class='del'>-	case GRE_VERSION_0:</div><div class='del'>-		/* We do not currently NAT any GREv0 packets.</div><div class='del'>-		 * Try to behave like "nf_nat_proto_unknown" */</div><div class='del'>-		break;</div><div class='del'>-	case GRE_VERSION_1:</div><div class='del'>-		pr_debug("call_id -&gt; 0x%04x\n", ntohs(tuple-&gt;dst.u.gre.key));</div><div class='del'>-		pgreh-&gt;call_id = tuple-&gt;dst.u.gre.key;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_debug("can't nat unknown GRE version\n");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_nat_l4proto gre = {</div><div class='del'>-	.l4proto		= IPPROTO_GRE,</div><div class='del'>-	.manip_pkt		= gre_manip_pkt,</div><div class='del'>-	.in_range		= nf_nat_l4proto_in_range,</div><div class='del'>-	.unique_tuple		= gre_unique_tuple,</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_nat_proto_gre_init(void)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_l4proto_register(NFPROTO_IPV4, &amp;gre);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_nat_proto_gre_fini(void)</div><div class='del'>-{</div><div class='del'>-	nf_nat_l4proto_unregister(NFPROTO_IPV4, &amp;gre);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_nat_proto_gre_init);</div><div class='del'>-module_exit(nf_nat_proto_gre_fini);</div><div class='del'>-</div><div class='del'>-void nf_nat_need_gre(void)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_need_gre);</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_proto_icmp.c b/net/ipv4/netfilter/nf_nat_proto_icmp.c<br/>deleted file mode 100644<br/>index 6d7cf1d79baf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_proto_icmp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_proto_icmp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2006 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/icmp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l4proto.h&gt;</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-icmp_in_range(const struct nf_conntrack_tuple *tuple,</div><div class='del'>-	      enum nf_nat_manip_type maniptype,</div><div class='del'>-	      const union nf_conntrack_man_proto *min,</div><div class='del'>-	      const union nf_conntrack_man_proto *max)</div><div class='del'>-{</div><div class='del'>-	return ntohs(tuple-&gt;src.u.icmp.id) &gt;= ntohs(min-&gt;icmp.id) &amp;&amp;</div><div class='del'>-	       ntohs(tuple-&gt;src.u.icmp.id) &lt;= ntohs(max-&gt;icmp.id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icmp_unique_tuple(const struct nf_nat_l3proto *l3proto,</div><div class='del'>-		  struct nf_conntrack_tuple *tuple,</div><div class='del'>-		  const struct nf_nat_range2 *range,</div><div class='del'>-		  enum nf_nat_manip_type maniptype,</div><div class='del'>-		  const struct nf_conn *ct)</div><div class='del'>-{</div><div class='del'>-	static u_int16_t id;</div><div class='del'>-	unsigned int range_size;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	range_size = ntohs(range-&gt;max_proto.icmp.id) -</div><div class='del'>-		     ntohs(range-&gt;min_proto.icmp.id) + 1;</div><div class='del'>-	/* If no range specified... */</div><div class='del'>-	if (!(range-&gt;flags &amp; NF_NAT_RANGE_PROTO_SPECIFIED))</div><div class='del'>-		range_size = 0xFFFF;</div><div class='del'>-</div><div class='del'>-	for (i = 0; ; ++id) {</div><div class='del'>-		tuple-&gt;src.u.icmp.id = htons(ntohs(range-&gt;min_proto.icmp.id) +</div><div class='del'>-					     (id % range_size));</div><div class='del'>-		if (++i == range_size || !nf_nat_used_tuple(tuple, ct))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-icmp_manip_pkt(struct sk_buff *skb,</div><div class='del'>-	       const struct nf_nat_l3proto *l3proto,</div><div class='del'>-	       unsigned int iphdroff, unsigned int hdroff,</div><div class='del'>-	       const struct nf_conntrack_tuple *tuple,</div><div class='del'>-	       enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	struct icmphdr *hdr;</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, hdroff + sizeof(*hdr)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	hdr = (struct icmphdr *)(skb-&gt;data + hdroff);</div><div class='del'>-	inet_proto_csum_replace2(&amp;hdr-&gt;checksum, skb,</div><div class='del'>-				 hdr-&gt;un.echo.id, tuple-&gt;src.u.icmp.id, false);</div><div class='del'>-	hdr-&gt;un.echo.id = tuple-&gt;src.u.icmp.id;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct nf_nat_l4proto nf_nat_l4proto_icmp = {</div><div class='del'>-	.l4proto		= IPPROTO_ICMP,</div><div class='del'>-	.manip_pkt		= icmp_manip_pkt,</div><div class='del'>-	.in_range		= icmp_in_range,</div><div class='del'>-	.unique_tuple		= icmp_unique_tuple,</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.asn1 b/net/ipv4/netfilter/nf_nat_snmp_basic.asn1<br/>index 24b73268f362..dc2cc5794160 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_snmp_basic.asn1?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_snmp_basic.asn1</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_snmp_basic.asn1?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_nat_snmp_basic.asn1</a></div><div class='hunk'>@@ -1,3 +1,11 @@</div><div class='add'>+-- SPDX-License-Identifier: BSD-3-Clause</div><div class='add'>+--</div><div class='add'>+-- Copyright (C) 1990, 2002 IETF Trust and the persons identified as authors</div><div class='add'>+-- of the code</div><div class='add'>+--</div><div class='add'>+-- https://www.rfc-editor.org/rfc/rfc1157#section-4</div><div class='add'>+-- https://www.rfc-editor.org/rfc/rfc3416#section-3</div><div class='add'>+</div><div class='ctx'> Message ::=</div><div class='ctx'> 	SEQUENCE {</div><div class='ctx'> 		version</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic_main.c b/net/ipv4/netfilter/nf_nat_snmp_basic_main.c<br/>index ac110c1d55b5..717b726504fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_snmp_basic_main.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_nat_snmp_basic_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_nat_snmp_basic_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_nat_snmp_basic_main.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * nf_nat_snmp_basic.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,17 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 RP Internet (www.rpi.net.au).</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Author: James Morris &lt;jmorris@intercode.com.au&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006-2010 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='hunk'>@@ -60,6 +50,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("James Morris &lt;jmorris@intercode.com.au&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Basic SNMP Application Layer Gateway");</div><div class='ctx'> MODULE_ALIAS("ip_nat_snmp_basic");</div><div class='add'>+MODULE_ALIAS_NFCT_HELPER("snmp_trap");</div><div class='ctx'> </div><div class='ctx'> #define SNMP_PORT 161</div><div class='ctx'> #define SNMP_TRAP_PORT 162</div><div class='hunk'>@@ -104,6 +95,8 @@ static void fast_csum(struct snmp_ctx *ctx, unsigned char offset)</div><div class='ctx'> int snmp_version(void *context, size_t hdrlen, unsigned char tag,</div><div class='ctx'> 		 const void *data, size_t datalen)</div><div class='ctx'> {</div><div class='add'>+	if (datalen != 1)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (*(unsigned char *)data &gt; 1)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -113,8 +106,11 @@ int snmp_helper(void *context, size_t hdrlen, unsigned char tag,</div><div class='ctx'> 		const void *data, size_t datalen)</div><div class='ctx'> {</div><div class='ctx'> 	struct snmp_ctx *ctx = (struct snmp_ctx *)context;</div><div class='del'>-	__be32 *pdata = (__be32 *)data;</div><div class='add'>+	__be32 *pdata;</div><div class='ctx'> </div><div class='add'>+	if (datalen != 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pdata = (__be32 *)data;</div><div class='ctx'> 	if (*pdata == ctx-&gt;from) {</div><div class='ctx'> 		pr_debug("%s: %pI4 to %pI4\n", __func__,</div><div class='ctx'> 			 (void *)&amp;ctx-&gt;from, (void *)&amp;ctx-&gt;to);</div><div class='hunk'>@@ -190,7 +186,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,</div><div class='ctx'> 		return NF_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!skb_make_writable(skb, skb-&gt;len)) {</div><div class='add'>+	if (skb_ensure_writable(skb, skb-&gt;len)) {</div><div class='ctx'> 		nf_ct_helper_log(skb, ct, "cannot mangle packet");</div><div class='ctx'> 		return NF_DROP;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c<br/>index 5cd06ba3535d..fae4aa4a5f09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_reject_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_reject_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_reject_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_reject_ipv4.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -15,8 +12,167 @@</div><div class='ctx'> #include &lt;linux/netfilter_ipv4.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_bridge.h&gt;</div><div class='ctx'> </div><div class='del'>-const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,</div><div class='del'>-					     struct tcphdr *_oth, int hook)</div><div class='add'>+static struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,</div><div class='add'>+					 const struct sk_buff *oldskb,</div><div class='add'>+					 __u8 protocol, int ttl);</div><div class='add'>+static void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,</div><div class='add'>+				    const struct tcphdr *oth);</div><div class='add'>+static const struct tcphdr *</div><div class='add'>+nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,</div><div class='add'>+			struct tcphdr *_oth, int hook);</div><div class='add'>+</div><div class='add'>+static int nf_reject_iphdr_validate(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	if (iph-&gt;ihl &lt; 5 || iph-&gt;version != 4)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	len = ntohs(iph-&gt;tot_len);</div><div class='add'>+	if (skb-&gt;len &lt; len)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (len &lt; (iph-&gt;ihl*4))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, iph-&gt;ihl*4))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *nf_reject_skb_v4_tcp_reset(struct net *net,</div><div class='add'>+					   struct sk_buff *oldskb,</div><div class='add'>+					   const struct net_device *dev,</div><div class='add'>+					   int hook)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *oth;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct iphdr *niph;</div><div class='add'>+	struct tcphdr _oth;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_iphdr_validate(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	oth = nf_reject_ip_tcphdr_get(oldskb, &amp;_oth, hook);</div><div class='add'>+	if (!oth)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(sizeof(struct iphdr) + sizeof(struct tcphdr) +</div><div class='add'>+			 LL_MAX_HEADER, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb-&gt;dev = (struct net_device *)dev;</div><div class='add'>+</div><div class='add'>+	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='add'>+	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='add'>+				   READ_ONCE(net-&gt;ipv4.sysctl_ip_default_ttl));</div><div class='add'>+	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);</div><div class='add'>+	niph-&gt;tot_len = htons(nskb-&gt;len);</div><div class='add'>+	ip_send_check(niph);</div><div class='add'>+</div><div class='add'>+	return nskb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_reject_skb_v4_tcp_reset);</div><div class='add'>+</div><div class='add'>+static bool nf_skb_is_icmp_unreach(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	u8 *tp, _type;</div><div class='add'>+	int thoff;</div><div class='add'>+</div><div class='add'>+	if (iph-&gt;protocol != IPPROTO_ICMP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	thoff = skb_network_offset(skb) + sizeof(*iph);</div><div class='add'>+</div><div class='add'>+	tp = skb_header_pointer(skb,</div><div class='add'>+				thoff + offsetof(struct icmphdr, type),</div><div class='add'>+				sizeof(_type), &amp;_type);</div><div class='add'>+</div><div class='add'>+	if (!tp)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return *tp == ICMP_DEST_UNREACH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *nf_reject_skb_v4_unreach(struct net *net,</div><div class='add'>+					 struct sk_buff *oldskb,</div><div class='add'>+					 const struct net_device *dev,</div><div class='add'>+					 int hook, u8 code)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct iphdr *niph;</div><div class='add'>+	struct icmphdr *icmph;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int dataoff;</div><div class='add'>+	__wsum csum;</div><div class='add'>+	u8 proto;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_iphdr_validate(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* IP header checks: fragment. */</div><div class='add'>+	if (ip_hdr(oldskb)-&gt;frag_off &amp; htons(IP_OFFSET))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* don't reply to ICMP_DEST_UNREACH with ICMP_DEST_UNREACH. */</div><div class='add'>+	if (nf_skb_is_icmp_unreach(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* RFC says return as much as we can without exceeding 576 bytes. */</div><div class='add'>+	len = min_t(unsigned int, 536, oldskb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(oldskb, len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim_rcsum(oldskb, ntohs(ip_hdr(oldskb)-&gt;tot_len)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dataoff = ip_hdrlen(oldskb);</div><div class='add'>+	proto = ip_hdr(oldskb)-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (!skb_csum_unnecessary(oldskb) &amp;&amp;</div><div class='add'>+	    nf_reject_verify_csum(oldskb, dataoff, proto) &amp;&amp;</div><div class='add'>+	    nf_ip_checksum(oldskb, hook, ip_hdrlen(oldskb), proto))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(sizeof(struct iphdr) + sizeof(struct icmphdr) +</div><div class='add'>+			 LL_MAX_HEADER + len, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb-&gt;dev = (struct net_device *)dev;</div><div class='add'>+</div><div class='add'>+	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='add'>+	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_ICMP,</div><div class='add'>+				   READ_ONCE(net-&gt;ipv4.sysctl_ip_default_ttl));</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(nskb);</div><div class='add'>+	icmph = skb_put_zero(nskb, sizeof(struct icmphdr));</div><div class='add'>+	icmph-&gt;type     = ICMP_DEST_UNREACH;</div><div class='add'>+	icmph-&gt;code	= code;</div><div class='add'>+</div><div class='add'>+	skb_put_data(nskb, skb_network_header(oldskb), len);</div><div class='add'>+</div><div class='add'>+	csum = csum_partial((void *)icmph, len + sizeof(struct icmphdr), 0);</div><div class='add'>+	icmph-&gt;checksum = csum_fold(csum);</div><div class='add'>+</div><div class='add'>+	niph-&gt;tot_len	= htons(nskb-&gt;len);</div><div class='add'>+	ip_send_check(niph);</div><div class='add'>+</div><div class='add'>+	return nskb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_reject_skb_v4_unreach);</div><div class='add'>+</div><div class='add'>+static const struct tcphdr *</div><div class='add'>+nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,</div><div class='add'>+			struct tcphdr *_oth, int hook)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcphdr *oth;</div><div class='ctx'> </div><div class='hunk'>@@ -42,11 +198,10 @@ const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,</div><div class='ctx'> </div><div class='ctx'> 	return oth;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_ip_tcphdr_get);</div><div class='ctx'> </div><div class='del'>-struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,</div><div class='del'>-				  const struct sk_buff *oldskb,</div><div class='del'>-				  __u8 protocol, int ttl)</div><div class='add'>+static struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,</div><div class='add'>+					 const struct sk_buff *oldskb,</div><div class='add'>+					 __u8 protocol, int ttl)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *niph, *oiph = ip_hdr(oldskb);</div><div class='ctx'> </div><div class='hunk'>@@ -67,10 +222,9 @@ struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,</div><div class='ctx'> </div><div class='ctx'> 	return niph;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_iphdr_put);</div><div class='ctx'> </div><div class='del'>-void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,</div><div class='del'>-			  const struct tcphdr *oth)</div><div class='add'>+static void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,</div><div class='add'>+				    const struct tcphdr *oth)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *niph = ip_hdr(nskb);</div><div class='ctx'> 	struct tcphdr *tcph;</div><div class='hunk'>@@ -97,20 +251,37 @@ void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,</div><div class='ctx'> 	nskb-&gt;csum_start = (unsigned char *)tcph - nskb-&gt;head;</div><div class='ctx'> 	nskb-&gt;csum_offset = offsetof(struct tcphdr, check);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_ip_tcphdr_put);</div><div class='add'>+</div><div class='add'>+static int nf_reject_fill_skb_dst(struct sk_buff *skb_in)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct flowi fl;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fl, 0, sizeof(struct flowi));</div><div class='add'>+	fl.u.ip4.daddr = ip_hdr(skb_in)-&gt;saddr;</div><div class='add'>+	nf_ip_route(dev_net(skb_in-&gt;dev), &amp;dst, &amp;fl, false);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	skb_dst_set(skb_in, dst);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Send RST reply */</div><div class='del'>-void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='add'>+void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,</div><div class='add'>+		   int hook)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct iphdr *niph;</div><div class='ctx'> 	const struct tcphdr *oth;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='ctx'> 	struct tcphdr _oth;</div><div class='ctx'> </div><div class='ctx'> 	oth = nf_reject_ip_tcphdr_get(oldskb, &amp;_oth, hook);</div><div class='ctx'> 	if (!oth)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!skb_dst(oldskb) &amp;&amp; nf_reject_fill_skb_dst(oldskb) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (skb_rtable(oldskb)-&gt;rt_flags &amp; (RTCF_BROADCAST | RTCF_MULTICAST))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -125,20 +296,18 @@ void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> 	nskb-&gt;mark = IP4_REPLY_MARK(net, oldskb-&gt;mark);</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='del'>-	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='del'>-				   ip4_dst_hoplimit(skb_dst(nskb)));</div><div class='add'>+	nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='add'>+			    ip4_dst_hoplimit(skb_dst(nskb)));</div><div class='ctx'> 	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);</div><div class='del'>-</div><div class='del'>-	if (ip_route_me_harder(net, nskb, RTN_UNSPEC))</div><div class='add'>+	if (ip_route_me_harder(net, sk, nskb, RTN_UNSPEC))</div><div class='ctx'> 		goto free_nskb;</div><div class='ctx'> </div><div class='del'>-	niph = ip_hdr(nskb);</div><div class='del'>-</div><div class='ctx'> 	/* "Never happens" */</div><div class='ctx'> 	if (nskb-&gt;len &gt; dst_mtu(skb_dst(nskb)))</div><div class='ctx'> 		goto free_nskb;</div><div class='ctx'> </div><div class='ctx'> 	nf_ct_attach(nskb, oldskb);</div><div class='add'>+	nf_ct_set_closing(skb_nfct(oldskb));</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	/* If we use ip_local_out for bridged traffic, the MAC source on</div><div class='hunk'>@@ -147,10 +316,16 @@ void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> 	 * build the eth header using the original destination's MAC as the</div><div class='ctx'> 	 * source, and send the RST packet directly.</div><div class='ctx'> 	 */</div><div class='del'>-	if (oldskb-&gt;nf_bridge) {</div><div class='add'>+	if (nf_bridge_info_exists(oldskb)) {</div><div class='ctx'> 		struct ethhdr *oeth = eth_hdr(oldskb);</div><div class='add'>+		struct iphdr *niph = ip_hdr(nskb);</div><div class='add'>+		struct net_device *br_indev;</div><div class='ctx'> </div><div class='del'>-		nskb-&gt;dev = nf_bridge_get_physindev(oldskb);</div><div class='add'>+		br_indev = nf_bridge_get_physindev(oldskb, net);</div><div class='add'>+		if (!br_indev)</div><div class='add'>+			goto free_nskb;</div><div class='add'>+</div><div class='add'>+		nskb-&gt;dev = br_indev;</div><div class='ctx'> 		niph-&gt;tot_len = htons(nskb-&gt;len);</div><div class='ctx'> 		ip_send_check(niph);</div><div class='ctx'> 		if (dev_hard_header(nskb, nskb-&gt;dev, ntohs(nskb-&gt;protocol),</div><div class='hunk'>@@ -171,24 +346,25 @@ EXPORT_SYMBOL_GPL(nf_send_reset);</div><div class='ctx'> void nf_send_unreach(struct sk_buff *skb_in, int code, int hook)</div><div class='ctx'> {</div><div class='ctx'> 	struct iphdr *iph = ip_hdr(skb_in);</div><div class='del'>-	u8 proto;</div><div class='add'>+	int dataoff = ip_hdrlen(skb_in);</div><div class='add'>+	u8 proto = iph-&gt;protocol;</div><div class='ctx'> </div><div class='ctx'> 	if (iph-&gt;frag_off &amp; htons(IP_OFFSET))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (skb_csum_unnecessary(skb_in)) {</div><div class='add'>+	if (!skb_dst(skb_in) &amp;&amp; nf_reject_fill_skb_dst(skb_in) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb_csum_unnecessary(skb_in) ||</div><div class='add'>+	    !nf_reject_verify_csum(skb_in, dataoff, proto)) {</div><div class='ctx'> 		icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iph-&gt;protocol == IPPROTO_TCP || iph-&gt;protocol == IPPROTO_UDP)</div><div class='del'>-		proto = iph-&gt;protocol;</div><div class='del'>-	else</div><div class='del'>-		proto = 0;</div><div class='del'>-</div><div class='del'>-	if (nf_ip_checksum(skb_in, hook, ip_hdrlen(skb_in), proto) == 0)</div><div class='add'>+	if (nf_ip_checksum(skb_in, hook, dataoff, proto) == 0)</div><div class='ctx'> 		icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_send_unreach);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IPv4 packet rejection core");</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_socket_ipv4.c b/net/ipv4/netfilter/nf_socket_ipv4.c<br/>index 4824b1e183a1..5080fa5fbf6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_socket_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_socket_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_socket_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_socket_ipv4.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007-2008 BalaBit IT Ltd.</div><div class='ctx'>  * Author: Krisztian Kovacs</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -35,16 +31,8 @@ extract_icmp4_fields(const struct sk_buff *skb, u8 *protocol,</div><div class='ctx'> 	if (icmph == NULL)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	switch (icmph-&gt;type) {</div><div class='del'>-	case ICMP_DEST_UNREACH:</div><div class='del'>-	case ICMP_SOURCE_QUENCH:</div><div class='del'>-	case ICMP_REDIRECT:</div><div class='del'>-	case ICMP_TIME_EXCEEDED:</div><div class='del'>-	case ICMP_PARAMETERPROB:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	if (!icmp_is_err(icmph-&gt;type))</div><div class='ctx'> 		return 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	inside_iph = skb_header_pointer(skb, outside_hdrlen +</div><div class='ctx'> 					sizeof(struct icmphdr),</div><div class='hunk'>@@ -83,8 +71,7 @@ nf_socket_get_sock_v4(struct net *net, struct sk_buff *skb, const int doff,</div><div class='ctx'> {</div><div class='ctx'> 	switch (protocol) {</div><div class='ctx'> 	case IPPROTO_TCP:</div><div class='del'>-		return inet_lookup(net, &amp;tcp_hashinfo, skb, doff,</div><div class='del'>-				   saddr, sport, daddr, dport,</div><div class='add'>+		return inet_lookup(net, skb, doff, saddr, sport, daddr, dport,</div><div class='ctx'> 				   in-&gt;ifindex);</div><div class='ctx'> 	case IPPROTO_UDP:</div><div class='ctx'> 		return udp4_lib_lookup(net, saddr, sport, daddr, dport,</div><div class='hunk'>@@ -96,11 +83,11 @@ nf_socket_get_sock_v4(struct net *net, struct sk_buff *skb, const int doff,</div><div class='ctx'> struct sock *nf_sk_lookup_slow_v4(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 				  const struct net_device *indev)</div><div class='ctx'> {</div><div class='del'>-	__be32 uninitialized_var(daddr), uninitialized_var(saddr);</div><div class='del'>-	__be16 uninitialized_var(dport), uninitialized_var(sport);</div><div class='add'>+	__be32 daddr, saddr;</div><div class='add'>+	__be16 dport, sport;</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct sk_buff *data_skb = NULL;</div><div class='del'>-	u8 uninitialized_var(protocol);</div><div class='add'>+	u8 protocol;</div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='ctx'> 	enum ip_conntrack_info ctinfo;</div><div class='ctx'> 	struct nf_conn const *ct;</div><div class='head'>diff --git a/net/ipv4/netfilter/nf_tproxy_ipv4.c b/net/ipv4/netfilter/nf_tproxy_ipv4.c<br/>index 164714104965..041c3f37f237 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_tproxy_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nf_tproxy_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nf_tproxy_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nf_tproxy_ipv4.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007-2008 BalaBit IT Ltd.</div><div class='ctx'>  * Author: Krisztian Kovacs</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/netfilter/nf_tproxy.h&gt;</div><div class='hunk'>@@ -42,7 +38,7 @@ nf_tproxy_handle_time_wait4(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 					    hp-&gt;source, lport ? lport : hp-&gt;dest,</div><div class='ctx'> 					    skb-&gt;dev, NF_TPROXY_LOOKUP_LISTENER);</div><div class='ctx'> 		if (sk2) {</div><div class='del'>-			inet_twsk_deschedule_put(inet_twsk(sk));</div><div class='add'>+			nf_tproxy_twsk_deschedule_put(inet_twsk(sk));</div><div class='ctx'> 			sk = sk2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -53,6 +49,7 @@ EXPORT_SYMBOL_GPL(nf_tproxy_handle_time_wait4);</div><div class='ctx'> </div><div class='ctx'> __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)</div><div class='ctx'> {</div><div class='add'>+	const struct in_ifaddr *ifa;</div><div class='ctx'> 	struct in_device *indev;</div><div class='ctx'> 	__be32 laddr;</div><div class='ctx'> </div><div class='hunk'>@@ -61,10 +58,16 @@ __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)</div><div class='ctx'> </div><div class='ctx'> 	laddr = 0;</div><div class='ctx'> 	indev = __in_dev_get_rcu(skb-&gt;dev);</div><div class='del'>-	for_primary_ifa(indev) {</div><div class='add'>+	if (!indev)</div><div class='add'>+		return daddr;</div><div class='add'>+</div><div class='add'>+	in_dev_for_each_ifa_rcu(ifa, indev) {</div><div class='add'>+		if (ifa-&gt;ifa_flags &amp; IFA_F_SECONDARY)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		laddr = ifa-&gt;ifa_local;</div><div class='ctx'> 		break;</div><div class='del'>-	} endfor_ifa(indev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return laddr ? laddr : daddr;</div><div class='ctx'> }</div><div class='hunk'>@@ -91,12 +94,10 @@ nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		switch (lookup_type) {</div><div class='ctx'> 		case NF_TPROXY_LOOKUP_LISTENER:</div><div class='del'>-			sk = inet_lookup_listener(net, &amp;tcp_hashinfo, skb,</div><div class='del'>-						    ip_hdrlen(skb) +</div><div class='del'>-						      __tcp_hdrlen(hp),</div><div class='del'>-						    saddr, sport,</div><div class='del'>-						    daddr, dport,</div><div class='del'>-						    in-&gt;ifindex, 0);</div><div class='add'>+			sk = inet_lookup_listener(net, skb,</div><div class='add'>+						  ip_hdrlen(skb) + __tcp_hdrlen(hp),</div><div class='add'>+						  saddr, sport, daddr, dport,</div><div class='add'>+						  in-&gt;ifindex, 0);</div><div class='ctx'> </div><div class='ctx'> 			if (sk &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='ctx'> 				sk = NULL;</div><div class='hunk'>@@ -107,9 +108,8 @@ nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			 */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NF_TPROXY_LOOKUP_ESTABLISHED:</div><div class='del'>-			sk = inet_lookup_established(net, &amp;tcp_hashinfo,</div><div class='del'>-						    saddr, sport, daddr, dport,</div><div class='del'>-						    in-&gt;ifindex);</div><div class='add'>+			sk = inet_lookup_established(net, saddr, sport,</div><div class='add'>+						     daddr, dport, in-&gt;ifindex);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_chain_nat_ipv4.c b/net/ipv4/netfilter/nft_chain_nat_ipv4.c<br/>deleted file mode 100644<br/>index a3c4ea303e3e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_chain_nat_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_chain_nat_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2008-2009 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- * Copyright (c) 2012 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- * Copyright (c) 2012 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Development of this code funded by Astaro AG (http://www.astaro.com/)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables_ipv4.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int nft_nat_do_chain(void *priv,</div><div class='del'>-				     struct sk_buff *skb,</div><div class='del'>-				     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	struct nft_pktinfo pkt;</div><div class='del'>-</div><div class='del'>-	nft_set_pktinfo(&amp;pkt, skb, state);</div><div class='del'>-	nft_set_pktinfo_ipv4(&amp;pkt, skb);</div><div class='del'>-</div><div class='del'>-	return nft_do_chain(&amp;pkt, priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nft_nat_ipv4_reg(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_l3proto_ipv4_register_fn(net, ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nft_nat_ipv4_unreg(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	nf_nat_l3proto_ipv4_unregister_fn(net, ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nft_chain_type nft_chain_nat_ipv4 = {</div><div class='del'>-	.name		= "nat",</div><div class='del'>-	.type		= NFT_CHAIN_T_NAT,</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.hook_mask	= (1 &lt;&lt; NF_INET_PRE_ROUTING) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_POST_ROUTING) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_LOCAL_OUT) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_LOCAL_IN),</div><div class='del'>-	.hooks		= {</div><div class='del'>-		[NF_INET_PRE_ROUTING]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_POST_ROUTING]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_LOCAL_OUT]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_LOCAL_IN]	= nft_nat_do_chain,</div><div class='del'>-	},</div><div class='del'>-	.ops_register = nft_nat_ipv4_reg,</div><div class='del'>-	.ops_unregister = nft_nat_ipv4_unreg,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_chain_nat_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_chain_type(&amp;nft_chain_nat_ipv4);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_chain_nat_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_chain_type(&amp;nft_chain_nat_ipv4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_chain_nat_init);</div><div class='del'>-module_exit(nft_chain_nat_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_CHAIN(AF_INET, "nat");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_chain_route_ipv4.c b/net/ipv4/netfilter/nft_chain_route_ipv4.c<br/>deleted file mode 100644<br/>index 7d82934c46f4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_chain_route_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_chain_route_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- * Copyright (c) 2012 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nfnetlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables_ipv4.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int nf_route_table_hook(void *priv,</div><div class='del'>-					struct sk_buff *skb,</div><div class='del'>-					const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	struct nft_pktinfo pkt;</div><div class='del'>-	u32 mark;</div><div class='del'>-	__be32 saddr, daddr;</div><div class='del'>-	u_int8_t tos;</div><div class='del'>-	const struct iphdr *iph;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	nft_set_pktinfo(&amp;pkt, skb, state);</div><div class='del'>-	nft_set_pktinfo_ipv4(&amp;pkt, skb);</div><div class='del'>-</div><div class='del'>-	mark = skb-&gt;mark;</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-	saddr = iph-&gt;saddr;</div><div class='del'>-	daddr = iph-&gt;daddr;</div><div class='del'>-	tos = iph-&gt;tos;</div><div class='del'>-</div><div class='del'>-	ret = nft_do_chain(&amp;pkt, priv);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN) {</div><div class='del'>-		iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-		if (iph-&gt;saddr != saddr ||</div><div class='del'>-		    iph-&gt;daddr != daddr ||</div><div class='del'>-		    skb-&gt;mark != mark ||</div><div class='del'>-		    iph-&gt;tos != tos) {</div><div class='del'>-			err = ip_route_me_harder(state-&gt;net, skb, RTN_UNSPEC);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nft_chain_type nft_chain_route_ipv4 = {</div><div class='del'>-	.name		= "route",</div><div class='del'>-	.type		= NFT_CHAIN_T_ROUTE,</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.hook_mask	= (1 &lt;&lt; NF_INET_LOCAL_OUT),</div><div class='del'>-	.hooks		= {</div><div class='del'>-		[NF_INET_LOCAL_OUT]	= nf_route_table_hook,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_chain_route_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_chain_type(&amp;nft_chain_route_ipv4);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_chain_route_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_chain_type(&amp;nft_chain_route_ipv4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_chain_route_init);</div><div class='del'>-module_exit(nft_chain_route_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_CHAIN(AF_INET, "route");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_dup_ipv4.c b/net/ipv4/netfilter/nft_dup_ipv4.c<br/>index 0af3d8df70dd..ef5dd88107dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_dup_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_dup_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_dup_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nft_dup_ipv4.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -16,8 +13,8 @@</div><div class='ctx'> #include &lt;net/netfilter/ipv4/nf_dup_ipv4.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct nft_dup_ipv4 {</div><div class='del'>-	enum nft_registers	sreg_addr:8;</div><div class='del'>-	enum nft_registers	sreg_dev:8;</div><div class='add'>+	u8	sreg_addr;</div><div class='add'>+	u8	sreg_dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nft_dup_ipv4_eval(const struct nft_expr *expr,</div><div class='hunk'>@@ -43,19 +40,20 @@ static int nft_dup_ipv4_init(const struct nft_ctx *ctx,</div><div class='ctx'> 	if (tb[NFTA_DUP_SREG_ADDR] == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;sreg_addr = nft_parse_register(tb[NFTA_DUP_SREG_ADDR]);</div><div class='del'>-	err = nft_validate_register_load(priv-&gt;sreg_addr, sizeof(struct in_addr));</div><div class='add'>+	err = nft_parse_register_load(ctx, tb[NFTA_DUP_SREG_ADDR], &amp;priv-&gt;sreg_addr,</div><div class='add'>+				      sizeof(struct in_addr));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (tb[NFTA_DUP_SREG_DEV] != NULL) {</div><div class='del'>-		priv-&gt;sreg_dev = nft_parse_register(tb[NFTA_DUP_SREG_DEV]);</div><div class='del'>-		return nft_validate_register_load(priv-&gt;sreg_dev, sizeof(int));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (tb[NFTA_DUP_SREG_DEV])</div><div class='add'>+		err = nft_parse_register_load(ctx, tb[NFTA_DUP_SREG_DEV],</div><div class='add'>+					      &amp;priv-&gt;sreg_dev, sizeof(int));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nft_dup_ipv4_dump(struct sk_buff *skb, const struct nft_expr *expr)</div><div class='add'>+static int nft_dup_ipv4_dump(struct sk_buff *skb,</div><div class='add'>+			     const struct nft_expr *expr, bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct nft_dup_ipv4 *priv = nft_expr_priv(expr);</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +76,7 @@ static const struct nft_expr_ops nft_dup_ipv4_ops = {</div><div class='ctx'> 	.eval		= nft_dup_ipv4_eval,</div><div class='ctx'> 	.init		= nft_dup_ipv4_init,</div><div class='ctx'> 	.dump		= nft_dup_ipv4_dump,</div><div class='add'>+	.reduce		= NFT_REDUCE_READONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy nft_dup_ipv4_policy[NFTA_DUP_MAX + 1] = {</div><div class='hunk'>@@ -110,3 +109,4 @@ module_exit(nft_dup_ipv4_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "dup");</div><div class='add'>+MODULE_DESCRIPTION("IPv4 nftables packet duplication support");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c<br/>index e50976e3c213..82af6cd76d13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_fib_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_fib_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_fib_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nft_fib_ipv4.c</a></div><div class='hunk'>@@ -1,8 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -14,6 +10,8 @@</div><div class='ctx'> #include &lt;net/netfilter/nf_tables.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/nft_fib.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +24,6 @@ static __be32 get_saddr(__be32 addr)</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DSCP_BITS     0xfc</div><div class='del'>-</div><div class='ctx'> void nft_fib4_eval_type(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 			const struct nft_pktinfo *pkt)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,14 +50,14 @@ void nft_fib4_eval_type(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	else</div><div class='ctx'> 		addr = iph-&gt;saddr;</div><div class='ctx'> </div><div class='del'>-	*dst = inet_dev_addr_type(nft_net(pkt), dev, addr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nft_fib4_eval_type);</div><div class='add'>+	if (priv-&gt;flags &amp; (NFTA_FIB_F_IIF | NFTA_FIB_F_OIF)) {</div><div class='add'>+		*dst = inet_dev_addr_type(nft_net(pkt), dev, addr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int get_ifindex(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev ? dev-&gt;ifindex : 0;</div><div class='add'>+	*dst = inet_addr_type_dev_table(nft_net(pkt), pkt-&gt;skb-&gt;dev, addr);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(nft_fib4_eval_type);</div><div class='ctx'> </div><div class='ctx'> void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 		   const struct nft_pktinfo *pkt)</div><div class='hunk'>@@ -74,12 +70,16 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	struct flowi4 fl4 = {</div><div class='ctx'> 		.flowi4_scope = RT_SCOPE_UNIVERSE,</div><div class='ctx'> 		.flowi4_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		.flowi4_proto = pkt-&gt;tprot,</div><div class='add'>+		.flowi4_uid = sock_net_uid(nft_net(pkt), NULL),</div><div class='ctx'> 	};</div><div class='ctx'> 	const struct net_device *oif;</div><div class='del'>-	struct net_device *found;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	int i;</div><div class='del'>-#endif</div><div class='add'>+	const struct net_device *found;</div><div class='add'>+</div><div class='add'>+	if (nft_fib_can_skip(pkt)) {</div><div class='add'>+		nft_fib_store_result(dest, priv, nft_in(pkt));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do not set flowi4_oif, it restricts results (for example, asking</div><div class='hunk'>@@ -95,12 +95,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	else</div><div class='ctx'> 		oif = NULL;</div><div class='ctx'> </div><div class='del'>-	if (nft_hook(pkt) == NF_INET_PRE_ROUTING &amp;&amp;</div><div class='del'>-	    nft_fib_is_loopback(pkt-&gt;skb, nft_in(pkt))) {</div><div class='del'>-		nft_fib_store_result(dest, priv, pkt,</div><div class='del'>-				     nft_in(pkt)-&gt;ifindex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	fl4.flowi4_l3mdev = nft_fib_l3mdev_master_ifindex_rcu(pkt, oif);</div><div class='ctx'> </div><div class='ctx'> 	iph = skb_header_pointer(pkt-&gt;skb, noff, sizeof(_iph), &amp;_iph);</div><div class='ctx'> 	if (!iph) {</div><div class='hunk'>@@ -111,8 +106,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	if (ipv4_is_zeronet(iph-&gt;saddr)) {</div><div class='ctx'> 		if (ipv4_is_lbcast(iph-&gt;daddr) ||</div><div class='ctx'> 		    ipv4_is_local_multicast(iph-&gt;daddr)) {</div><div class='del'>-			nft_fib_store_result(dest, priv, pkt,</div><div class='del'>-					     get_ifindex(pkt-&gt;skb-&gt;dev));</div><div class='add'>+			nft_fib_store_result(dest, priv, pkt-&gt;skb-&gt;dev);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,12 +114,16 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	if (priv-&gt;flags &amp; NFTA_FIB_F_MARK)</div><div class='ctx'> 		fl4.flowi4_mark = pkt-&gt;skb-&gt;mark;</div><div class='ctx'> </div><div class='del'>-	fl4.flowi4_tos = iph-&gt;tos &amp; DSCP_BITS;</div><div class='add'>+	fl4.flowi4_dscp = ip4h_dscp(iph);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;flags &amp; NFTA_FIB_F_DADDR) {</div><div class='ctx'> 		fl4.daddr = iph-&gt;daddr;</div><div class='ctx'> 		fl4.saddr = get_saddr(iph-&gt;saddr);</div><div class='ctx'> 	} else {</div><div class='add'>+		if (nft_hook(pkt) == NF_INET_FORWARD &amp;&amp;</div><div class='add'>+		    priv-&gt;flags &amp; NFTA_FIB_F_IIF)</div><div class='add'>+			fl4.flowi4_iif = nft_out(pkt)-&gt;ifindex;</div><div class='add'>+</div><div class='ctx'> 		fl4.daddr = iph-&gt;saddr;</div><div class='ctx'> 		fl4.saddr = get_saddr(iph-&gt;daddr);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -144,38 +142,15 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-       if (!oif) {</div><div class='del'>-               found = FIB_RES_DEV(res);</div><div class='del'>-               goto ok;</div><div class='del'>-       }</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	for (i = 0; i &lt; res.fi-&gt;fib_nhs; i++) {</div><div class='del'>-		struct fib_nh *nh = &amp;res.fi-&gt;fib_nh[i];</div><div class='del'>-</div><div class='del'>-		if (nh-&gt;nh_dev == oif) {</div><div class='del'>-			found = nh-&gt;nh_dev;</div><div class='del'>-			goto ok;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-#else</div><div class='del'>-	found = FIB_RES_DEV(res);</div><div class='del'>-	if (found != oif)</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-ok:</div><div class='del'>-	switch (priv-&gt;result) {</div><div class='del'>-	case NFT_FIB_RESULT_OIF:</div><div class='del'>-		*dest = found-&gt;ifindex;</div><div class='del'>-		break;</div><div class='del'>-	case NFT_FIB_RESULT_OIFNAME:</div><div class='del'>-		strncpy((char *)dest, found-&gt;name, IFNAMSIZ);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='add'>+	if (!oif) {</div><div class='add'>+		found = FIB_RES_DEV(res);</div><div class='add'>+	} else {</div><div class='add'>+		if (!fib_info_nh_uses_dev(res.fi, oif))</div><div class='add'>+			return;</div><div class='add'>+		found = oif;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	nft_fib_store_result(dest, priv, found);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nft_fib4_eval);</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +163,7 @@ static const struct nft_expr_ops nft_fib4_type_ops = {</div><div class='ctx'> 	.init		= nft_fib_init,</div><div class='ctx'> 	.dump		= nft_fib_dump,</div><div class='ctx'> 	.validate	= nft_fib_validate,</div><div class='add'>+	.reduce		= nft_fib_reduce,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nft_expr_ops nft_fib4_ops = {</div><div class='hunk'>@@ -197,6 +173,7 @@ static const struct nft_expr_ops nft_fib4_ops = {</div><div class='ctx'> 	.init		= nft_fib_init,</div><div class='ctx'> 	.dump		= nft_fib_dump,</div><div class='ctx'> 	.validate	= nft_fib_validate,</div><div class='add'>+	.reduce		= nft_fib_reduce,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nft_expr_ops *</div><div class='hunk'>@@ -246,3 +223,4 @@ module_exit(nft_fib4_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Florian Westphal &lt;fw@strlen.de&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(2, "fib");</div><div class='add'>+MODULE_DESCRIPTION("nftables fib / ip route lookup support");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_masq_ipv4.c b/net/ipv4/netfilter/nft_masq_ipv4.c<br/>deleted file mode 100644<br/>index f1193e1e928a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_masq_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_masq_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nft_masq.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv4/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-static void nft_masq_ipv4_eval(const struct nft_expr *expr,</div><div class='del'>-			       struct nft_regs *regs,</div><div class='del'>-			       const struct nft_pktinfo *pkt)</div><div class='del'>-{</div><div class='del'>-	struct nft_masq *priv = nft_expr_priv(expr);</div><div class='del'>-	struct nf_nat_range2 range;</div><div class='del'>-</div><div class='del'>-	memset(&amp;range, 0, sizeof(range));</div><div class='del'>-	range.flags = priv-&gt;flags;</div><div class='del'>-	if (priv-&gt;sreg_proto_min) {</div><div class='del'>-		range.min_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_min]);</div><div class='del'>-		range.max_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_max]);</div><div class='del'>-	}</div><div class='del'>-	regs-&gt;verdict.code = nf_nat_masquerade_ipv4(pkt-&gt;skb, nft_hook(pkt),</div><div class='del'>-						    &amp;range, nft_out(pkt));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nft_masq_ipv4_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(ctx-&gt;net, NFPROTO_IPV4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_masq_ipv4_type;</div><div class='del'>-static const struct nft_expr_ops nft_masq_ipv4_ops = {</div><div class='del'>-	.type		= &amp;nft_masq_ipv4_type,</div><div class='del'>-	.size		= NFT_EXPR_SIZE(sizeof(struct nft_masq)),</div><div class='del'>-	.eval		= nft_masq_ipv4_eval,</div><div class='del'>-	.init		= nft_masq_init,</div><div class='del'>-	.destroy	= nft_masq_ipv4_destroy,</div><div class='del'>-	.dump		= nft_masq_dump,</div><div class='del'>-	.validate	= nft_masq_validate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_masq_ipv4_type __read_mostly = {</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.name		= "masq",</div><div class='del'>-	.ops		= &amp;nft_masq_ipv4_ops,</div><div class='del'>-	.policy		= nft_masq_policy,</div><div class='del'>-	.maxattr	= NFTA_MASQ_MAX,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_masq_ipv4_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = nft_register_expr(&amp;nft_masq_ipv4_type);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	nf_nat_masquerade_ipv4_register_notifier();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_masq_ipv4_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_expr(&amp;nft_masq_ipv4_type);</div><div class='del'>-	nf_nat_masquerade_ipv4_unregister_notifier();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_masq_ipv4_module_init);</div><div class='del'>-module_exit(nft_masq_ipv4_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arturo Borrero Gonzalez &lt;arturo@debian.org");</div><div class='del'>-MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "masq");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_redir_ipv4.c b/net/ipv4/netfilter/nft_redir_ipv4.c<br/>deleted file mode 100644<br/>index 5120be1d3118..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_redir_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_redir_ipv4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_redirect.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nft_redir.h&gt;</div><div class='del'>-</div><div class='del'>-static void nft_redir_ipv4_eval(const struct nft_expr *expr,</div><div class='del'>-				struct nft_regs *regs,</div><div class='del'>-				const struct nft_pktinfo *pkt)</div><div class='del'>-{</div><div class='del'>-	struct nft_redir *priv = nft_expr_priv(expr);</div><div class='del'>-	struct nf_nat_ipv4_multi_range_compat mr;</div><div class='del'>-</div><div class='del'>-	memset(&amp;mr, 0, sizeof(mr));</div><div class='del'>-	if (priv-&gt;sreg_proto_min) {</div><div class='del'>-		mr.range[0].min.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_min]);</div><div class='del'>-		mr.range[0].max.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_max]);</div><div class='del'>-		mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mr.range[0].flags |= priv-&gt;flags;</div><div class='del'>-</div><div class='del'>-	regs-&gt;verdict.code = nf_nat_redirect_ipv4(pkt-&gt;skb, &amp;mr, nft_hook(pkt));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nft_redir_ipv4_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(ctx-&gt;net, NFPROTO_IPV4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_redir_ipv4_type;</div><div class='del'>-static const struct nft_expr_ops nft_redir_ipv4_ops = {</div><div class='del'>-	.type		= &amp;nft_redir_ipv4_type,</div><div class='del'>-	.size		= NFT_EXPR_SIZE(sizeof(struct nft_redir)),</div><div class='del'>-	.eval		= nft_redir_ipv4_eval,</div><div class='del'>-	.init		= nft_redir_init,</div><div class='del'>-	.destroy	= nft_redir_ipv4_destroy,</div><div class='del'>-	.dump		= nft_redir_dump,</div><div class='del'>-	.validate	= nft_redir_validate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_redir_ipv4_type __read_mostly = {</div><div class='del'>-	.family		= NFPROTO_IPV4,</div><div class='del'>-	.name		= "redir",</div><div class='del'>-	.ops		= &amp;nft_redir_ipv4_ops,</div><div class='del'>-	.policy		= nft_redir_policy,</div><div class='del'>-	.maxattr	= NFTA_REDIR_MAX,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_redir_ipv4_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return nft_register_expr(&amp;nft_redir_ipv4_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_redir_ipv4_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_expr(&amp;nft_redir_ipv4_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_redir_ipv4_module_init);</div><div class='del'>-module_exit(nft_redir_ipv4_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "redir");</div><div class='head'>diff --git a/net/ipv4/netfilter/nft_reject_ipv4.c b/net/ipv4/netfilter/nft_reject_ipv4.c<br/>index 517ce93699de..6cb213bb7256 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_reject_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netfilter/nft_reject_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netfilter/nft_reject_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netfilter/nft_reject_ipv4.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2008-2009 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  * Copyright (c) 2013 Eric Leblond &lt;eric@regit.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Development of this code funded by Astaro AG (http://www.astaro.com/)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +27,8 @@ static void nft_reject_ipv4_eval(const struct nft_expr *expr,</div><div class='ctx'> 		nf_send_unreach(pkt-&gt;skb, priv-&gt;icmp_code, nft_hook(pkt));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFT_REJECT_TCP_RST:</div><div class='del'>-		nf_send_reset(nft_net(pkt), pkt-&gt;skb, nft_hook(pkt));</div><div class='add'>+		nf_send_reset(nft_net(pkt), nft_sk(pkt), pkt-&gt;skb,</div><div class='add'>+			      nft_hook(pkt));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -47,6 +45,7 @@ static const struct nft_expr_ops nft_reject_ipv4_ops = {</div><div class='ctx'> 	.init		= nft_reject_init,</div><div class='ctx'> 	.dump		= nft_reject_dump,</div><div class='ctx'> 	.validate	= nft_reject_validate,</div><div class='add'>+	.reduce		= NFT_REDUCE_READONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nft_expr_type nft_reject_ipv4_type __read_mostly = {</div><div class='hunk'>@@ -74,3 +73,4 @@ module_exit(nft_reject_ipv4_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "reject");</div><div class='add'>+MODULE_DESCRIPTION("IPv4 packet rejection for nftables");</div><div class='head'>diff --git a/net/ipv4/netlink.c b/net/ipv4/netlink.c<br/>index f86bb4f06609..b920e1bdcf58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/netlink.c</a></div><div class='hunk'>@@ -1,11 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> </div><div class='del'>-int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto,</div><div class='add'>+int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto, u8 family,</div><div class='ctx'> 				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	*ip_proto = nla_get_u8(attr);</div><div class='hunk'>@@ -13,11 +15,19 @@ int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto,</div><div class='ctx'> 	switch (*ip_proto) {</div><div class='ctx'> 	case IPPROTO_TCP:</div><div class='ctx'> 	case IPPROTO_UDP:</div><div class='add'>+		return 0;</div><div class='ctx'> 	case IPPROTO_ICMP:</div><div class='add'>+		if (family != AF_INET)</div><div class='add'>+			break;</div><div class='add'>+		return 0;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case IPPROTO_ICMPV6:</div><div class='add'>+		if (family != AF_INET6)</div><div class='add'>+			break;</div><div class='ctx'> 		return 0;</div><div class='del'>-	default:</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Unsupported ip proto");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='add'>+	NL_SET_ERR_MSG(extack, "Unsupported ip proto");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtm_getroute_parse_ip_proto);</div><div class='head'>diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c<br/>new file mode 100644<br/>index 000000000000..7b9d70f9b31c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/nexthop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/nexthop.c</a></div><div class='hunk'>@@ -0,0 +1,4157 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Generic nexthop implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017-19 Cumulus Networks</div><div class='add'>+ * Copyright (c) 2017-19 David Ahern &lt;dsa@cumulusnetworks.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/nexthop.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='add'>+#include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/ndisc.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='add'>+#include &lt;net/route.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#define NH_RES_DEFAULT_IDLE_TIMER	(120 * HZ)</div><div class='add'>+#define NH_RES_DEFAULT_UNBALANCED_TIMER	0	/* No forced rebalancing. */</div><div class='add'>+</div><div class='add'>+static void remove_nexthop(struct net *net, struct nexthop *nh,</div><div class='add'>+			   struct nl_info *nlinfo);</div><div class='add'>+</div><div class='add'>+#define NH_DEV_HASHBITS  8</div><div class='add'>+#define NH_DEV_HASHSIZE (1U &lt;&lt; NH_DEV_HASHBITS)</div><div class='add'>+</div><div class='add'>+#define NHA_OP_FLAGS_DUMP_ALL (NHA_OP_FLAG_DUMP_STATS |		\</div><div class='add'>+			       NHA_OP_FLAG_DUMP_HW_STATS)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_new[] = {</div><div class='add'>+	[NHA_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_GROUP]		= { .type = NLA_BINARY },</div><div class='add'>+	[NHA_GROUP_TYPE]	= { .type = NLA_U16 },</div><div class='add'>+	[NHA_BLACKHOLE]		= { .type = NLA_FLAG },</div><div class='add'>+	[NHA_OIF]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_GATEWAY]		= { .type = NLA_BINARY },</div><div class='add'>+	[NHA_ENCAP_TYPE]	= { .type = NLA_U16 },</div><div class='add'>+	[NHA_ENCAP]		= { .type = NLA_NESTED },</div><div class='add'>+	[NHA_FDB]		= { .type = NLA_FLAG },</div><div class='add'>+	[NHA_RES_GROUP]		= { .type = NLA_NESTED },</div><div class='add'>+	[NHA_HW_STATS_ENABLE]	= NLA_POLICY_MAX(NLA_U32, true),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_get[] = {</div><div class='add'>+	[NHA_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_OP_FLAGS]		= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+						  NHA_OP_FLAGS_DUMP_ALL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_del[] = {</div><div class='add'>+	[NHA_ID]		= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_dump[] = {</div><div class='add'>+	[NHA_OIF]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_GROUPS]		= { .type = NLA_FLAG },</div><div class='add'>+	[NHA_MASTER]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_FDB]		= { .type = NLA_FLAG },</div><div class='add'>+	[NHA_OP_FLAGS]		= NLA_POLICY_MASK(NLA_U32,</div><div class='add'>+						  NHA_OP_FLAGS_DUMP_ALL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_res_policy_new[] = {</div><div class='add'>+	[NHA_RES_GROUP_BUCKETS]			= { .type = NLA_U16 },</div><div class='add'>+	[NHA_RES_GROUP_IDLE_TIMER]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_RES_GROUP_UNBALANCED_TIMER]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_dump_bucket[] = {</div><div class='add'>+	[NHA_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_OIF]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_MASTER]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_RES_BUCKET]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_res_bucket_policy_dump[] = {</div><div class='add'>+	[NHA_RES_BUCKET_NH_ID]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_policy_get_bucket[] = {</div><div class='add'>+	[NHA_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[NHA_RES_BUCKET]	= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rtm_nh_res_bucket_policy_get[] = {</div><div class='add'>+	[NHA_RES_BUCKET_INDEX]	= { .type = NLA_U16 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool nexthop_notifiers_is_empty(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return !net-&gt;nexthop.notifier_chain.head;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__nh_notifier_single_info_init(struct nh_notifier_single_info *nh_info,</div><div class='add'>+			       const struct nh_info *nhi)</div><div class='add'>+{</div><div class='add'>+	nh_info-&gt;dev = nhi-&gt;fib_nhc.nhc_dev;</div><div class='add'>+	nh_info-&gt;gw_family = nhi-&gt;fib_nhc.nhc_gw_family;</div><div class='add'>+	if (nh_info-&gt;gw_family == AF_INET)</div><div class='add'>+		nh_info-&gt;ipv4 = nhi-&gt;fib_nhc.nhc_gw.ipv4;</div><div class='add'>+	else if (nh_info-&gt;gw_family == AF_INET6)</div><div class='add'>+		nh_info-&gt;ipv6 = nhi-&gt;fib_nhc.nhc_gw.ipv6;</div><div class='add'>+</div><div class='add'>+	nh_info-&gt;id = nhi-&gt;nh_parent-&gt;id;</div><div class='add'>+	nh_info-&gt;is_reject = nhi-&gt;reject_nh;</div><div class='add'>+	nh_info-&gt;is_fdb = nhi-&gt;fdb_nh;</div><div class='add'>+	nh_info-&gt;has_encap = !!nhi-&gt;fib_nhc.nhc_lwtstate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_single_info_init(struct nh_notifier_info *info,</div><div class='add'>+					const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+	info-&gt;type = NH_NOTIFIER_INFO_TYPE_SINGLE;</div><div class='add'>+	info-&gt;nh = kzalloc(sizeof(*info-&gt;nh), GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;nh)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	__nh_notifier_single_info_init(info-&gt;nh, nhi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_notifier_single_info_fini(struct nh_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	kfree(info-&gt;nh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_mpath_info_init(struct nh_notifier_info *info,</div><div class='add'>+				       struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	u16 num_nh = nhg-&gt;num_nh;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	info-&gt;type = NH_NOTIFIER_INFO_TYPE_GRP;</div><div class='add'>+	info-&gt;nh_grp = kzalloc(struct_size(info-&gt;nh_grp, nh_entries, num_nh),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;nh_grp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;nh_grp-&gt;num_nh = num_nh;</div><div class='add'>+	info-&gt;nh_grp-&gt;is_fdb = nhg-&gt;fdb_nh;</div><div class='add'>+	info-&gt;nh_grp-&gt;hw_stats = nhg-&gt;hw_stats;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_nh; i++) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		nhi = rtnl_dereference(nhge-&gt;nh-&gt;nh_info);</div><div class='add'>+		info-&gt;nh_grp-&gt;nh_entries[i].weight = nhge-&gt;weight;</div><div class='add'>+		__nh_notifier_single_info_init(&amp;info-&gt;nh_grp-&gt;nh_entries[i].nh,</div><div class='add'>+					       nhi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_res_table_info_init(struct nh_notifier_info *info,</div><div class='add'>+					   struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+	u16 num_nh_buckets = res_table-&gt;num_nh_buckets;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	info-&gt;type = NH_NOTIFIER_INFO_TYPE_RES_TABLE;</div><div class='add'>+	size = struct_size(info-&gt;nh_res_table, nhs, num_nh_buckets);</div><div class='add'>+	info-&gt;nh_res_table = __vmalloc(size, GFP_KERNEL | __GFP_ZERO |</div><div class='add'>+				       __GFP_NOWARN);</div><div class='add'>+	if (!info-&gt;nh_res_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;nh_res_table-&gt;num_nh_buckets = num_nh_buckets;</div><div class='add'>+	info-&gt;nh_res_table-&gt;hw_stats = nhg-&gt;hw_stats;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_nh_buckets; i++) {</div><div class='add'>+		struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[i];</div><div class='add'>+		struct nh_grp_entry *nhge;</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		nhge = rtnl_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		nhi = rtnl_dereference(nhge-&gt;nh-&gt;nh_info);</div><div class='add'>+		__nh_notifier_single_info_init(&amp;info-&gt;nh_res_table-&gt;nhs[i],</div><div class='add'>+					       nhi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_grp_info_init(struct nh_notifier_info *info,</div><div class='add'>+				     const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;hash_threshold)</div><div class='add'>+		return nh_notifier_mpath_info_init(info, nhg);</div><div class='add'>+	else if (nhg-&gt;resilient)</div><div class='add'>+		return nh_notifier_res_table_info_init(info, nhg);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_notifier_grp_info_fini(struct nh_notifier_info *info,</div><div class='add'>+				      const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;hash_threshold)</div><div class='add'>+		kfree(info-&gt;nh_grp);</div><div class='add'>+	else if (nhg-&gt;resilient)</div><div class='add'>+		vfree(info-&gt;nh_res_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_info_init(struct nh_notifier_info *info,</div><div class='add'>+				 const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	info-&gt;id = nh-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group)</div><div class='add'>+		return nh_notifier_grp_info_init(info, nh);</div><div class='add'>+	else</div><div class='add'>+		return nh_notifier_single_info_init(info, nh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_notifier_info_fini(struct nh_notifier_info *info,</div><div class='add'>+				  const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	if (nh-&gt;is_group)</div><div class='add'>+		nh_notifier_grp_info_fini(info, nh);</div><div class='add'>+	else</div><div class='add'>+		nh_notifier_single_info_fini(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_nexthop_notifiers(struct net *net,</div><div class='add'>+				  enum nexthop_event_type event_type,</div><div class='add'>+				  struct nexthop *nh,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_notifier_info info = {</div><div class='add'>+		.net = net,</div><div class='add'>+		.extack = extack,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (nexthop_notifiers_is_empty(net))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = nh_notifier_info_init(&amp;info, nh);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Failed to initialize nexthop notifier info");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = blocking_notifier_call_chain(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+					   event_type, &amp;info);</div><div class='add'>+	nh_notifier_info_fini(&amp;info, nh);</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nh_notifier_res_bucket_idle_timer_get(const struct nh_notifier_info *info,</div><div class='add'>+				      bool force, unsigned int *p_idle_timer_ms)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* When 'force' is false, nexthop bucket replacement is performed</div><div class='add'>+	 * because the bucket was deemed to be idle. In this case, capable</div><div class='add'>+	 * listeners can choose to perform an atomic replacement: The bucket is</div><div class='add'>+	 * only replaced if it is inactive. However, if the idle timer interval</div><div class='add'>+	 * is smaller than the interval in which a listener is querying</div><div class='add'>+	 * buckets' activity from the device, then atomic replacement should</div><div class='add'>+	 * not be tried. Pass the idle timer value to listeners, so that they</div><div class='add'>+	 * could determine which type of replacement to perform.</div><div class='add'>+	 */</div><div class='add'>+	if (force) {</div><div class='add'>+		*p_idle_timer_ms = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	nh = nexthop_find_by_id(info-&gt;net, info-&gt;id);</div><div class='add'>+	if (!nh) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhg = rcu_dereference(nh-&gt;nh_grp);</div><div class='add'>+	res_table = rcu_dereference(nhg-&gt;res_table);</div><div class='add'>+	*p_idle_timer_ms = jiffies_to_msecs(res_table-&gt;idle_timer);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_res_bucket_info_init(struct nh_notifier_info *info,</div><div class='add'>+					    u16 bucket_index, bool force,</div><div class='add'>+					    struct nh_info *oldi,</div><div class='add'>+					    struct nh_info *newi)</div><div class='add'>+{</div><div class='add'>+	unsigned int idle_timer_ms;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nh_notifier_res_bucket_idle_timer_get(info, force,</div><div class='add'>+						    &amp;idle_timer_ms);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	info-&gt;type = NH_NOTIFIER_INFO_TYPE_RES_BUCKET;</div><div class='add'>+	info-&gt;nh_res_bucket = kzalloc(sizeof(*info-&gt;nh_res_bucket),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;nh_res_bucket)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;nh_res_bucket-&gt;bucket_index = bucket_index;</div><div class='add'>+	info-&gt;nh_res_bucket-&gt;idle_timer_ms = idle_timer_ms;</div><div class='add'>+	info-&gt;nh_res_bucket-&gt;force = force;</div><div class='add'>+	__nh_notifier_single_info_init(&amp;info-&gt;nh_res_bucket-&gt;old_nh, oldi);</div><div class='add'>+	__nh_notifier_single_info_init(&amp;info-&gt;nh_res_bucket-&gt;new_nh, newi);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_notifier_res_bucket_info_fini(struct nh_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	kfree(info-&gt;nh_res_bucket);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __call_nexthop_res_bucket_notifiers(struct net *net, u32 nhg_id,</div><div class='add'>+					       u16 bucket_index, bool force,</div><div class='add'>+					       struct nh_info *oldi,</div><div class='add'>+					       struct nh_info *newi,</div><div class='add'>+					       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_notifier_info info = {</div><div class='add'>+		.net = net,</div><div class='add'>+		.extack = extack,</div><div class='add'>+		.id = nhg_id,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (nexthop_notifiers_is_empty(net))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = nh_notifier_res_bucket_info_init(&amp;info, bucket_index, force,</div><div class='add'>+					       oldi, newi);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = blocking_notifier_call_chain(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+					   NEXTHOP_EVENT_BUCKET_REPLACE, &amp;info);</div><div class='add'>+	nh_notifier_res_bucket_info_fini(&amp;info);</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There are three users of RES_TABLE, and NHs etc. referenced from there:</div><div class='add'>+ *</div><div class='add'>+ * 1) a collection of callbacks for NH maintenance. This operates under</div><div class='add'>+ *    RTNL,</div><div class='add'>+ * 2) the delayed work that gradually balances the resilient table,</div><div class='add'>+ * 3) and nexthop_select_path(), operating under RCU.</div><div class='add'>+ *</div><div class='add'>+ * Both the delayed work and the RTNL block are writers, and need to</div><div class='add'>+ * maintain mutual exclusion. Since there are only two and well-known</div><div class='add'>+ * writers for each table, the RTNL code can make sure it has exclusive</div><div class='add'>+ * access thus:</div><div class='add'>+ *</div><div class='add'>+ * - Have the DW operate without locking;</div><div class='add'>+ * - synchronously cancel the DW;</div><div class='add'>+ * - do the writing;</div><div class='add'>+ * - if the write was not actually a delete, call upkeep, which schedules</div><div class='add'>+ *   DW again if necessary.</div><div class='add'>+ *</div><div class='add'>+ * The functions that are always called from the RTNL context use</div><div class='add'>+ * rtnl_dereference(). The functions that can also be called from the DW do</div><div class='add'>+ * a raw dereference and rely on the above mutual exclusion scheme.</div><div class='add'>+ */</div><div class='add'>+#define nh_res_dereference(p) (rcu_dereference_raw(p))</div><div class='add'>+</div><div class='add'>+static int call_nexthop_res_bucket_notifiers(struct net *net, u32 nhg_id,</div><div class='add'>+					     u16 bucket_index, bool force,</div><div class='add'>+					     struct nexthop *old_nh,</div><div class='add'>+					     struct nexthop *new_nh,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *oldi = nh_res_dereference(old_nh-&gt;nh_info);</div><div class='add'>+	struct nh_info *newi = nh_res_dereference(new_nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+	return __call_nexthop_res_bucket_notifiers(net, nhg_id, bucket_index,</div><div class='add'>+						   force, oldi, newi, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_nexthop_res_table_notifiers(struct net *net, struct nexthop *nh,</div><div class='add'>+					    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_notifier_info info = {</div><div class='add'>+		.net = net,</div><div class='add'>+		.extack = extack,</div><div class='add'>+		.id = nh-&gt;id,</div><div class='add'>+	};</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (nexthop_notifiers_is_empty(net))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* At this point, the nexthop buckets are still not populated. Only</div><div class='add'>+	 * emit a notification with the logical nexthops, so that a listener</div><div class='add'>+	 * could potentially veto it in case of unsupported configuration.</div><div class='add'>+	 */</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	err = nh_notifier_mpath_info_init(&amp;info, nhg);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Failed to initialize nexthop notifier info");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = blocking_notifier_call_chain(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+					   NEXTHOP_EVENT_RES_TABLE_PRE_REPLACE,</div><div class='add'>+					   &amp;info);</div><div class='add'>+	kfree(info.nh_grp);</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_nexthop_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+				 enum nexthop_event_type event_type,</div><div class='add'>+				 struct nexthop *nh,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_notifier_info info = {</div><div class='add'>+		.net = net,</div><div class='add'>+		.extack = extack,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nh_notifier_info_init(&amp;info, nh);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nb-&gt;notifier_call(nb, event_type, &amp;info);</div><div class='add'>+	nh_notifier_info_fini(&amp;info, nh);</div><div class='add'>+</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int nh_dev_hashfn(unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int mask = NH_DEV_HASHSIZE - 1;</div><div class='add'>+</div><div class='add'>+	return (val ^</div><div class='add'>+		(val &gt;&gt; NH_DEV_HASHBITS) ^</div><div class='add'>+		(val &gt;&gt; (NH_DEV_HASHBITS * 2))) &amp; mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_devhash_add(struct net *net, struct nh_info *nhi)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = nhi-&gt;fib_nhc.nhc_dev;</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+	unsigned int hash;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!dev);</div><div class='add'>+</div><div class='add'>+	hash = nh_dev_hashfn(dev-&gt;ifindex);</div><div class='add'>+	head = &amp;net-&gt;nexthop.devhash[hash];</div><div class='add'>+	hlist_add_head(&amp;nhi-&gt;dev_hash, head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_free_group(struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	nhg = rcu_dereference_raw(nh-&gt;nh_grp);</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		WARN_ON(!list_empty(&amp;nhge-&gt;nh_list));</div><div class='add'>+		free_percpu(nhge-&gt;stats);</div><div class='add'>+		nexthop_put(nhge-&gt;nh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(nhg-&gt;spare == nhg);</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;resilient)</div><div class='add'>+		vfree(rcu_dereference_raw(nhg-&gt;res_table));</div><div class='add'>+</div><div class='add'>+	kfree(nhg-&gt;spare);</div><div class='add'>+	kfree(nhg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_free_single(struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+	nhi = rcu_dereference_raw(nh-&gt;nh_info);</div><div class='add'>+	switch (nhi-&gt;family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		fib_nh_release(nh-&gt;net, &amp;nhi-&gt;fib_nh);</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		ipv6_stub-&gt;fib6_nh_release(&amp;nhi-&gt;fib6_nh);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	kfree(nhi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nexthop_free_rcu(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct nexthop *nh = container_of(head, struct nexthop, rcu);</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group)</div><div class='add'>+		nexthop_free_group(nh);</div><div class='add'>+	else</div><div class='add'>+		nexthop_free_single(nh);</div><div class='add'>+</div><div class='add'>+	kfree(nh);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nexthop_free_rcu);</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_alloc(void)</div><div class='add'>+{</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+	nh = kzalloc(sizeof(struct nexthop), GFP_KERNEL);</div><div class='add'>+	if (nh) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;nh-&gt;fi_list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;nh-&gt;f6i_list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;nh-&gt;grp_list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;nh-&gt;fdb_list);</div><div class='add'>+		spin_lock_init(&amp;nh-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	return nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nh_group *nexthop_grp_alloc(u16 num_nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+	nhg = kzalloc(struct_size(nhg, nh_entries, num_nh), GFP_KERNEL);</div><div class='add'>+	if (nhg)</div><div class='add'>+		nhg-&gt;num_nh = num_nh;</div><div class='add'>+</div><div class='add'>+	return nhg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_table_upkeep_dw(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static struct nh_res_table *</div><div class='add'>+nexthop_res_table_alloc(struct net *net, u32 nhg_id, struct nh_config *cfg)</div><div class='add'>+{</div><div class='add'>+	const u16 num_nh_buckets = cfg-&gt;nh_grp_res_num_buckets;</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='add'>+	size = struct_size(res_table, nh_buckets, num_nh_buckets);</div><div class='add'>+	res_table = __vmalloc(size, GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN);</div><div class='add'>+	if (!res_table)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	res_table-&gt;net = net;</div><div class='add'>+	res_table-&gt;nhg_id = nhg_id;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;res_table-&gt;upkeep_dw, &amp;nh_res_table_upkeep_dw);</div><div class='add'>+	INIT_LIST_HEAD(&amp;res_table-&gt;uw_nh_entries);</div><div class='add'>+	res_table-&gt;idle_timer = cfg-&gt;nh_grp_res_idle_timer;</div><div class='add'>+	res_table-&gt;unbalanced_timer = cfg-&gt;nh_grp_res_unbalanced_timer;</div><div class='add'>+	res_table-&gt;num_nh_buckets = num_nh_buckets;</div><div class='add'>+	return res_table;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_base_seq_inc(struct net *net)</div><div class='add'>+{</div><div class='add'>+	while (++net-&gt;nexthop.seq == 0)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* no reference taken; rcu lock or rtnl must be held */</div><div class='add'>+struct nexthop *nexthop_find_by_id(struct net *net, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **pp, *parent = NULL, *next;</div><div class='add'>+</div><div class='add'>+	pp = &amp;net-&gt;nexthop.rb_root.rb_node;</div><div class='add'>+	while (1) {</div><div class='add'>+		struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+		next = rcu_dereference_raw(*pp);</div><div class='add'>+		if (!next)</div><div class='add'>+			break;</div><div class='add'>+		parent = next;</div><div class='add'>+</div><div class='add'>+		nh = rb_entry(parent, struct nexthop, rb_node);</div><div class='add'>+		if (id &lt; nh-&gt;id)</div><div class='add'>+			pp = &amp;next-&gt;rb_left;</div><div class='add'>+		else if (id &gt; nh-&gt;id)</div><div class='add'>+			pp = &amp;next-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return nh;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nexthop_find_by_id);</div><div class='add'>+</div><div class='add'>+/* used for auto id allocation; called with rtnl held */</div><div class='add'>+static u32 nh_find_unused_id(struct net *net)</div><div class='add'>+{</div><div class='add'>+	u32 id_start = net-&gt;nexthop.last_id_allocated;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		net-&gt;nexthop.last_id_allocated++;</div><div class='add'>+		if (net-&gt;nexthop.last_id_allocated == id_start)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!nexthop_find_by_id(net, net-&gt;nexthop.last_id_allocated))</div><div class='add'>+			return net-&gt;nexthop.last_id_allocated;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_time_set_deadline(unsigned long next_time,</div><div class='add'>+				     unsigned long *deadline)</div><div class='add'>+{</div><div class='add'>+	if (time_before(next_time, *deadline))</div><div class='add'>+		*deadline = next_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static clock_t nh_res_table_unbalanced_time(struct nh_res_table *res_table)</div><div class='add'>+{</div><div class='add'>+	if (list_empty(&amp;res_table-&gt;uw_nh_entries))</div><div class='add'>+		return 0;</div><div class='add'>+	return jiffies_delta_to_clock_t(jiffies - res_table-&gt;unbalanced_since);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_nh_group_res(struct sk_buff *skb, struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, NHA_RES_GROUP);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, NHA_RES_GROUP_BUCKETS,</div><div class='add'>+			res_table-&gt;num_nh_buckets) ||</div><div class='add'>+	    nla_put_u32(skb, NHA_RES_GROUP_IDLE_TIMER,</div><div class='add'>+			jiffies_to_clock_t(res_table-&gt;idle_timer)) ||</div><div class='add'>+	    nla_put_u32(skb, NHA_RES_GROUP_UNBALANCED_TIMER,</div><div class='add'>+			jiffies_to_clock_t(res_table-&gt;unbalanced_timer)) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, NHA_RES_GROUP_UNBALANCED_TIME,</div><div class='add'>+			      nh_res_table_unbalanced_time(res_table),</div><div class='add'>+			      NHA_RES_GROUP_PAD))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_grp_entry_stats_inc(struct nh_grp_entry *nhge)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry_stats *cpu_stats;</div><div class='add'>+</div><div class='add'>+	cpu_stats = get_cpu_ptr(nhge-&gt;stats);</div><div class='add'>+	u64_stats_update_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;cpu_stats-&gt;packets);</div><div class='add'>+	u64_stats_update_end(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+	put_cpu_ptr(cpu_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_grp_entry_stats_read(struct nh_grp_entry *nhge,</div><div class='add'>+				    u64 *ret_packets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*ret_packets = 0;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		struct nh_grp_entry_stats *cpu_stats;</div><div class='add'>+		unsigned int start;</div><div class='add'>+		u64 packets;</div><div class='add'>+</div><div class='add'>+		cpu_stats = per_cpu_ptr(nhge-&gt;stats, i);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;cpu_stats-&gt;syncp);</div><div class='add'>+			packets = u64_stats_read(&amp;cpu_stats-&gt;packets);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;cpu_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		*ret_packets += packets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_notifier_grp_hw_stats_init(struct nh_notifier_info *info,</div><div class='add'>+					 const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+	info-&gt;id = nh-&gt;id;</div><div class='add'>+	info-&gt;type = NH_NOTIFIER_INFO_TYPE_GRP_HW_STATS;</div><div class='add'>+	info-&gt;nh_grp_hw_stats = kzalloc(struct_size(info-&gt;nh_grp_hw_stats,</div><div class='add'>+						    stats, nhg-&gt;num_nh),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;nh_grp_hw_stats)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	info-&gt;nh_grp_hw_stats-&gt;num_nh = nhg-&gt;num_nh;</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		info-&gt;nh_grp_hw_stats-&gt;stats[i].id = nhge-&gt;nh-&gt;id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_notifier_grp_hw_stats_fini(struct nh_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	kfree(info-&gt;nh_grp_hw_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nh_grp_hw_stats_report_delta(struct nh_notifier_grp_hw_stats_info *info,</div><div class='add'>+				  unsigned int nh_idx,</div><div class='add'>+				  u64 delta_packets)</div><div class='add'>+{</div><div class='add'>+	info-&gt;hw_stats_used = true;</div><div class='add'>+	info-&gt;stats[nh_idx].packets += delta_packets;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(nh_grp_hw_stats_report_delta);</div><div class='add'>+</div><div class='add'>+static void nh_grp_hw_stats_apply_update(struct nexthop *nh,</div><div class='add'>+					 struct nh_notifier_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		nhge-&gt;packets_hw += info-&gt;nh_grp_hw_stats-&gt;stats[i].packets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_grp_hw_stats_update(struct nexthop *nh, bool *hw_stats_used)</div><div class='add'>+{</div><div class='add'>+	struct nh_notifier_info info = {</div><div class='add'>+		.net = nh-&gt;net,</div><div class='add'>+	};</div><div class='add'>+	struct net *net = nh-&gt;net;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (nexthop_notifiers_is_empty(net)) {</div><div class='add'>+		*hw_stats_used = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nh_notifier_grp_hw_stats_init(&amp;info, nh);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = blocking_notifier_call_chain(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+					   NEXTHOP_EVENT_HW_STATS_REPORT_DELTA,</div><div class='add'>+					   &amp;info);</div><div class='add'>+</div><div class='add'>+	/* Cache whatever we got, even if there was an error, otherwise the</div><div class='add'>+	 * successful stats retrievals would get lost.</div><div class='add'>+	 */</div><div class='add'>+	nh_grp_hw_stats_apply_update(nh, &amp;info);</div><div class='add'>+	*hw_stats_used = info.nh_grp_hw_stats-&gt;hw_stats_used;</div><div class='add'>+</div><div class='add'>+	nh_notifier_grp_hw_stats_fini(&amp;info);</div><div class='add'>+	return notifier_to_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_nh_group_stats_entry(struct sk_buff *skb,</div><div class='add'>+					struct nh_grp_entry *nhge,</div><div class='add'>+					u32 op_flags)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	u64 packets;</div><div class='add'>+</div><div class='add'>+	nh_grp_entry_stats_read(nhge, &amp;packets);</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, NHA_GROUP_STATS_ENTRY);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, NHA_GROUP_STATS_ENTRY_ID, nhge-&gt;nh-&gt;id) ||</div><div class='add'>+	    nla_put_uint(skb, NHA_GROUP_STATS_ENTRY_PACKETS,</div><div class='add'>+			 packets + nhge-&gt;packets_hw))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (op_flags &amp; NHA_OP_FLAG_DUMP_HW_STATS &amp;&amp;</div><div class='add'>+	    nla_put_uint(skb, NHA_GROUP_STATS_ENTRY_PACKETS_HW,</div><div class='add'>+			 nhge-&gt;packets_hw))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_nh_group_stats(struct sk_buff *skb, struct nexthop *nh,</div><div class='add'>+				  u32 op_flags)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	bool hw_stats_used;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, NHA_HW_STATS_ENABLE, nhg-&gt;hw_stats))</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	if (op_flags &amp; NHA_OP_FLAG_DUMP_HW_STATS &amp;&amp;</div><div class='add'>+	    nhg-&gt;hw_stats) {</div><div class='add'>+		err = nh_grp_hw_stats_update(nh, &amp;hw_stats_used);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (nla_put_u32(skb, NHA_HW_STATS_USED, hw_stats_used))</div><div class='add'>+			goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, NHA_GROUP_STATS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++)</div><div class='add'>+		if (nla_put_nh_group_stats_entry(skb, &amp;nhg-&gt;nh_entries[i],</div><div class='add'>+						 op_flags))</div><div class='add'>+			goto cancel_out;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cancel_out:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+err_out:</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_nh_group(struct sk_buff *skb, struct nexthop *nh,</div><div class='add'>+			    u32 op_flags, u32 *resp_op_flags)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	struct nexthop_grp *p;</div><div class='add'>+	size_t len = nhg-&gt;num_nh * sizeof(*p);</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	u16 group_type = 0;</div><div class='add'>+	u16 weight;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*resp_op_flags |= NHA_OP_FLAG_RESP_GRP_RESVD_0;</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;hash_threshold)</div><div class='add'>+		group_type = NEXTHOP_GRP_TYPE_MPATH;</div><div class='add'>+	else if (nhg-&gt;resilient)</div><div class='add'>+		group_type = NEXTHOP_GRP_TYPE_RES;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, NHA_GROUP_TYPE, group_type))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nla = nla_reserve(skb, NHA_GROUP, len);</div><div class='add'>+	if (!nla)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	p = nla_data(nla);</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		weight = nhg-&gt;nh_entries[i].weight - 1;</div><div class='add'>+</div><div class='add'>+		*p++ = (struct nexthop_grp) {</div><div class='add'>+			.id = nhg-&gt;nh_entries[i].nh-&gt;id,</div><div class='add'>+			.weight = weight,</div><div class='add'>+			.weight_high = weight &gt;&gt; 8,</div><div class='add'>+		};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;resilient &amp;&amp; nla_put_nh_group_res(skb, nhg))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (op_flags &amp; NHA_OP_FLAG_DUMP_STATS &amp;&amp;</div><div class='add'>+	    (nla_put_u32(skb, NHA_HW_STATS_ENABLE, nhg-&gt;hw_stats) ||</div><div class='add'>+	     nla_put_nh_group_stats(skb, nh, op_flags)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_fill_node(struct sk_buff *skb, struct nexthop *nh,</div><div class='add'>+			int event, u32 portid, u32 seq, unsigned int nlflags,</div><div class='add'>+			u32 op_flags)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh *fib6_nh;</div><div class='add'>+	struct fib_nh *fib_nh;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+	struct nhmsg *nhm;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*nhm), nlflags);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nhm = nlmsg_data(nlh);</div><div class='add'>+	nhm-&gt;nh_family = AF_UNSPEC;</div><div class='add'>+	nhm-&gt;nh_flags = nh-&gt;nh_flags;</div><div class='add'>+	nhm-&gt;nh_protocol = nh-&gt;protocol;</div><div class='add'>+	nhm-&gt;nh_scope = 0;</div><div class='add'>+	nhm-&gt;resvd = 0;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, NHA_ID, nh-&gt;id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+		u32 resp_op_flags = 0;</div><div class='add'>+</div><div class='add'>+		if (nhg-&gt;fdb_nh &amp;&amp; nla_put_flag(skb, NHA_FDB))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		if (nla_put_nh_group(skb, nh, op_flags, &amp;resp_op_flags) ||</div><div class='add'>+		    nla_put_u32(skb, NHA_OP_FLAGS, resp_op_flags))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+	nhm-&gt;nh_family = nhi-&gt;family;</div><div class='add'>+	if (nhi-&gt;reject_nh) {</div><div class='add'>+		if (nla_put_flag(skb, NHA_BLACKHOLE))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (nhi-&gt;fdb_nh) {</div><div class='add'>+		if (nla_put_flag(skb, NHA_FDB))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else {</div><div class='add'>+		const struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = nhi-&gt;fib_nhc.nhc_dev;</div><div class='add'>+		if (dev &amp;&amp; nla_put_u32(skb, NHA_OIF, dev-&gt;ifindex))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhm-&gt;nh_scope = nhi-&gt;fib_nhc.nhc_scope;</div><div class='add'>+	switch (nhi-&gt;family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		fib_nh = &amp;nhi-&gt;fib_nh;</div><div class='add'>+		if (fib_nh-&gt;fib_nh_gw_family &amp;&amp;</div><div class='add'>+		    nla_put_be32(skb, NHA_GATEWAY, fib_nh-&gt;fib_nh_gw4))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		fib6_nh = &amp;nhi-&gt;fib6_nh;</div><div class='add'>+		if (fib6_nh-&gt;fib_nh_gw_family &amp;&amp;</div><div class='add'>+		    nla_put_in6_addr(skb, NHA_GATEWAY, &amp;fib6_nh-&gt;fib_nh_gw6))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lwtunnel_fill_encap(skb, nhi-&gt;fib_nhc.nhc_lwtstate,</div><div class='add'>+				NHA_ENCAP, NHA_ENCAP_TYPE) &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_cancel(skb, nlh);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t nh_nlmsg_size_grp_res(struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(0) +	/* NHA_RES_GROUP */</div><div class='add'>+		nla_total_size(2) +	/* NHA_RES_GROUP_BUCKETS */</div><div class='add'>+		nla_total_size(4) +	/* NHA_RES_GROUP_IDLE_TIMER */</div><div class='add'>+		nla_total_size(4) +	/* NHA_RES_GROUP_UNBALANCED_TIMER */</div><div class='add'>+		nla_total_size_64bit(8);/* NHA_RES_GROUP_UNBALANCED_TIME */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t nh_nlmsg_size_grp(struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	size_t sz = sizeof(struct nexthop_grp) * nhg-&gt;num_nh;</div><div class='add'>+	size_t tot = nla_total_size(sz) +</div><div class='add'>+		nla_total_size(2); /* NHA_GROUP_TYPE */</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;resilient)</div><div class='add'>+		tot += nh_nlmsg_size_grp_res(nhg);</div><div class='add'>+</div><div class='add'>+	return tot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t nh_nlmsg_size_single(struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+	size_t sz;</div><div class='add'>+</div><div class='add'>+	/* covers NHA_BLACKHOLE since NHA_OIF and BLACKHOLE</div><div class='add'>+	 * are mutually exclusive</div><div class='add'>+	 */</div><div class='add'>+	sz = nla_total_size(4);  /* NHA_OIF */</div><div class='add'>+</div><div class='add'>+	switch (nhi-&gt;family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		if (nhi-&gt;fib_nh.fib_nh_gw_family)</div><div class='add'>+			sz += nla_total_size(4);  /* NHA_GATEWAY */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		/* NHA_GATEWAY */</div><div class='add'>+		if (nhi-&gt;fib6_nh.fib_nh_gw_family)</div><div class='add'>+			sz += nla_total_size(sizeof(const struct in6_addr));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nhi-&gt;fib_nhc.nhc_lwtstate) {</div><div class='add'>+		sz += lwtunnel_get_encap_size(nhi-&gt;fib_nhc.nhc_lwtstate);</div><div class='add'>+		sz += nla_total_size(2);  /* NHA_ENCAP_TYPE */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t nh_nlmsg_size(struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	size_t sz = NLMSG_ALIGN(sizeof(struct nhmsg));</div><div class='add'>+</div><div class='add'>+	sz += nla_total_size(4); /* NHA_ID */</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group)</div><div class='add'>+		sz += nh_nlmsg_size_grp(nh) +</div><div class='add'>+		      nla_total_size(4) +	/* NHA_OP_FLAGS */</div><div class='add'>+		      0;</div><div class='add'>+	else</div><div class='add'>+		sz += nh_nlmsg_size_single(nh);</div><div class='add'>+</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_notify(int event, struct nexthop *nh, struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned int nlflags = info-&gt;nlh ? info-&gt;nlh-&gt;nlmsg_flags : 0;</div><div class='add'>+	u32 seq = info-&gt;nlh ? info-&gt;nlh-&gt;nlmsg_seq : 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(nh_nlmsg_size(nh), gfp_any());</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	err = nh_fill_node(skb, nh, event, info-&gt;portid, seq, nlflags, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* -EMSGSIZE implies BUG in nh_nlmsg_size() */</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, info-&gt;nl_net, info-&gt;portid, RTNLGRP_NEXTHOP,</div><div class='add'>+		    info-&gt;nlh, gfp_any());</div><div class='add'>+	return;</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(info-&gt;nl_net, RTNLGRP_NEXTHOP, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long nh_res_bucket_used_time(const struct nh_res_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)atomic_long_read(&amp;bucket-&gt;used_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+nh_res_bucket_idle_point(const struct nh_res_table *res_table,</div><div class='add'>+			 const struct nh_res_bucket *bucket,</div><div class='add'>+			 unsigned long now)</div><div class='add'>+{</div><div class='add'>+	unsigned long time = nh_res_bucket_used_time(bucket);</div><div class='add'>+</div><div class='add'>+	/* Bucket was not used since it was migrated. The idle time is now. */</div><div class='add'>+	if (time == bucket-&gt;migrated_time)</div><div class='add'>+		return now;</div><div class='add'>+</div><div class='add'>+	return time + res_table-&gt;idle_timer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+nh_res_table_unb_point(const struct nh_res_table *res_table)</div><div class='add'>+{</div><div class='add'>+	return res_table-&gt;unbalanced_since + res_table-&gt;unbalanced_timer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_bucket_set_idle(const struct nh_res_table *res_table,</div><div class='add'>+				   struct nh_res_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+</div><div class='add'>+	atomic_long_set(&amp;bucket-&gt;used_time, (long)now);</div><div class='add'>+	bucket-&gt;migrated_time = now;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_bucket_set_busy(struct nh_res_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	atomic_long_set(&amp;bucket-&gt;used_time, (long)jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static clock_t nh_res_bucket_idle_time(const struct nh_res_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	unsigned long used_time = nh_res_bucket_used_time(bucket);</div><div class='add'>+</div><div class='add'>+	return jiffies_delta_to_clock_t(jiffies - used_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_fill_res_bucket(struct sk_buff *skb, struct nexthop *nh,</div><div class='add'>+			      struct nh_res_bucket *bucket, u16 bucket_index,</div><div class='add'>+			      int event, u32 portid, u32 seq,</div><div class='add'>+			      unsigned int nlflags,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhge = nh_res_dereference(bucket-&gt;nh_entry);</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	struct nhmsg *nhm;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*nhm), nlflags);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	nhm = nlmsg_data(nlh);</div><div class='add'>+	nhm-&gt;nh_family = AF_UNSPEC;</div><div class='add'>+	nhm-&gt;nh_flags = bucket-&gt;nh_flags;</div><div class='add'>+	nhm-&gt;nh_protocol = nh-&gt;protocol;</div><div class='add'>+	nhm-&gt;nh_scope = 0;</div><div class='add'>+	nhm-&gt;resvd = 0;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, NHA_ID, nh-&gt;id))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, NHA_RES_BUCKET);</div><div class='add'>+	if (!nest)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, NHA_RES_BUCKET_INDEX, bucket_index) ||</div><div class='add'>+	    nla_put_u32(skb, NHA_RES_BUCKET_NH_ID, nhge-&gt;nh-&gt;id) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, NHA_RES_BUCKET_IDLE_TIME,</div><div class='add'>+			      nh_res_bucket_idle_time(bucket),</div><div class='add'>+			      NHA_RES_BUCKET_PAD))</div><div class='add'>+		goto nla_put_failure_nest;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure_nest:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_cancel(skb, nlh);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_bucket_notify(struct nh_res_table *res_table,</div><div class='add'>+				  u16 bucket_index)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[bucket_index];</div><div class='add'>+	struct nh_grp_entry *nhge = nh_res_dereference(bucket-&gt;nh_entry);</div><div class='add'>+	struct nexthop *nh = nhge-&gt;nh_parent;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	err = nh_fill_res_bucket(skb, nh, bucket, bucket_index,</div><div class='add'>+				 RTM_NEWNEXTHOPBUCKET, 0, 0, NLM_F_REPLACE,</div><div class='add'>+				 NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, nh-&gt;net, 0, RTNLGRP_NEXTHOP, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(nh-&gt;net, RTNLGRP_NEXTHOP, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool valid_group_nh(struct nexthop *nh, unsigned int npaths,</div><div class='add'>+			   bool *is_fdb, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+		/* Nesting groups within groups is not supported. */</div><div class='add'>+		if (nhg-&gt;hash_threshold) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Hash-threshold group can not be a nexthop within a group");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (nhg-&gt;resilient) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Resilient group can not be a nexthop within a group");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		*is_fdb = nhg-&gt;fdb_nh;</div><div class='add'>+	} else {</div><div class='add'>+		struct nh_info *nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+		if (nhi-&gt;reject_nh &amp;&amp; npaths &gt; 1) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Blackhole nexthop can not be used in a group with more than 1 path");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		*is_fdb = nhi-&gt;fdb_nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_check_attr_fdb_group(struct nexthop *nh, u8 *nh_family,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+	nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+	if (!nhi-&gt;fdb_nh) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "FDB nexthop group can only have fdb nexthops");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*nh_family == AF_UNSPEC) {</div><div class='add'>+		*nh_family = nhi-&gt;family;</div><div class='add'>+	} else if (*nh_family != nhi-&gt;family) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "FDB nexthop group cannot have mixed family nexthops");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_check_attr_group(struct net *net,</div><div class='add'>+			       struct nlattr *tb[], size_t tb_size,</div><div class='add'>+			       u16 nh_grp_type, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = nla_len(tb[NHA_GROUP]);</div><div class='add'>+	struct nexthop_grp *nhg;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	if (!len || len &amp; (sizeof(struct nexthop_grp) - 1)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid length for nexthop group attribute");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* convert len to number of nexthop ids */</div><div class='add'>+	len /= sizeof(*nhg);</div><div class='add'>+</div><div class='add'>+	nhg = nla_data(tb[NHA_GROUP]);</div><div class='add'>+	for (i = 0; i &lt; len; ++i) {</div><div class='add'>+		if (nhg[i].resvd2) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Reserved field in nexthop_grp must be 0");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (nexthop_grp_weight(&amp;nhg[i]) == 0) {</div><div class='add'>+			/* 0xffff got passed in, representing weight of 0x10000,</div><div class='add'>+			 * which is too heavy.</div><div class='add'>+			 */</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid value for weight");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		for (j = i + 1; j &lt; len; ++j) {</div><div class='add'>+			if (nhg[i].id == nhg[j].id) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Nexthop id can not be used twice in a group");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhg = nla_data(tb[NHA_GROUP]);</div><div class='add'>+	for (i = NHA_GROUP_TYPE + 1; i &lt; tb_size; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NHA_HW_STATS_ENABLE:</div><div class='add'>+		case NHA_FDB:</div><div class='add'>+			continue;</div><div class='add'>+		case NHA_RES_GROUP:</div><div class='add'>+			if (nh_grp_type == NEXTHOP_GRP_TYPE_RES)</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "No other attributes can be set in nexthop groups");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_check_attr_group_rtnl(struct net *net, struct nlattr *tb[],</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u8 nh_family = AF_UNSPEC;</div><div class='add'>+	struct nexthop_grp *nhg;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u8 nhg_fdb;</div><div class='add'>+</div><div class='add'>+	len = nla_len(tb[NHA_GROUP]) / sizeof(*nhg);</div><div class='add'>+	nhg = nla_data(tb[NHA_GROUP]);</div><div class='add'>+	nhg_fdb = !!tb[NHA_FDB];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		struct nexthop *nh;</div><div class='add'>+		bool is_fdb_nh;</div><div class='add'>+</div><div class='add'>+		nh = nexthop_find_by_id(net, nhg[i].id);</div><div class='add'>+		if (!nh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid nexthop id");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!valid_group_nh(nh, len, &amp;is_fdb_nh, extack))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (nhg_fdb &amp;&amp; nh_check_attr_fdb_group(nh, &amp;nh_family, extack))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!nhg_fdb &amp;&amp; is_fdb_nh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Non FDB nexthop group cannot have fdb nexthops");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ipv6_good_nh(const struct fib6_nh *nh)</div><div class='add'>+{</div><div class='add'>+	int state = NUD_REACHABLE;</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	n = __ipv6_neigh_lookup_noref_stub(nh-&gt;fib_nh_dev, &amp;nh-&gt;fib_nh_gw6);</div><div class='add'>+	if (n)</div><div class='add'>+		state = READ_ONCE(n-&gt;nud_state);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return !!(state &amp; NUD_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ipv4_good_nh(const struct fib_nh *nh)</div><div class='add'>+{</div><div class='add'>+	int state = NUD_REACHABLE;</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	n = __ipv4_neigh_lookup_noref(nh-&gt;fib_nh_dev,</div><div class='add'>+				      (__force u32)nh-&gt;fib_nh_gw4);</div><div class='add'>+	if (n)</div><div class='add'>+		state = READ_ONCE(n-&gt;nud_state);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return !!(state &amp; NUD_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nexthop_is_good_nh(const struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi = rcu_dereference(nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+	switch (nhi-&gt;family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		return ipv4_good_nh(&amp;nhi-&gt;fib_nh);</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		return ipv6_good_nh(&amp;nhi-&gt;fib6_nh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_select_path_fdb(struct nh_group *nhg, int hash)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		if (hash &gt; atomic_read(&amp;nhge-&gt;hthr.upper_bound))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nh_grp_entry_stats_inc(nhge);</div><div class='add'>+		return nhge-&gt;nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_select_path_hthr(struct nh_group *nhg, int hash)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhge0 = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;fdb_nh)</div><div class='add'>+		return nexthop_select_path_fdb(nhg, hash);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		/* nexthops always check if it is good and does</div><div class='add'>+		 * not rely on a sysctl for this behavior</div><div class='add'>+		 */</div><div class='add'>+		if (!nexthop_is_good_nh(nhge-&gt;nh))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!nhge0)</div><div class='add'>+			nhge0 = nhge;</div><div class='add'>+</div><div class='add'>+		if (hash &gt; atomic_read(&amp;nhge-&gt;hthr.upper_bound))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nh_grp_entry_stats_inc(nhge);</div><div class='add'>+		return nhge-&gt;nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nhge0)</div><div class='add'>+		nhge0 = &amp;nhg-&gt;nh_entries[0];</div><div class='add'>+	nh_grp_entry_stats_inc(nhge0);</div><div class='add'>+	return nhge0-&gt;nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_select_path_res(struct nh_group *nhg, int hash)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table = rcu_dereference(nhg-&gt;res_table);</div><div class='add'>+	u16 bucket_index = hash % res_table-&gt;num_nh_buckets;</div><div class='add'>+	struct nh_res_bucket *bucket;</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+	/* nexthop_select_path() is expected to return a non-NULL value, so</div><div class='add'>+	 * skip protocol validation and just hand out whatever there is.</div><div class='add'>+	 */</div><div class='add'>+	bucket = &amp;res_table-&gt;nh_buckets[bucket_index];</div><div class='add'>+	nh_res_bucket_set_busy(bucket);</div><div class='add'>+	nhge = rcu_dereference(bucket-&gt;nh_entry);</div><div class='add'>+	nh_grp_entry_stats_inc(nhge);</div><div class='add'>+	return nhge-&gt;nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct nexthop *nexthop_select_path(struct nexthop *nh, int hash)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+	if (!nh-&gt;is_group)</div><div class='add'>+		return nh;</div><div class='add'>+</div><div class='add'>+	nhg = rcu_dereference(nh-&gt;nh_grp);</div><div class='add'>+	if (nhg-&gt;hash_threshold)</div><div class='add'>+		return nexthop_select_path_hthr(nhg, hash);</div><div class='add'>+	else if (nhg-&gt;resilient)</div><div class='add'>+		return nexthop_select_path_res(nhg, hash);</div><div class='add'>+</div><div class='add'>+	/* Unreachable. */</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nexthop_select_path);</div><div class='add'>+</div><div class='add'>+int nexthop_for_each_fib6_nh(struct nexthop *nh,</div><div class='add'>+			     int (*cb)(struct fib6_nh *nh, void *arg),</div><div class='add'>+			     void *arg)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		nhg = rcu_dereference_rtnl(nh-&gt;nh_grp);</div><div class='add'>+		for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+			struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+			nhi = rcu_dereference_rtnl(nhge-&gt;nh-&gt;nh_info);</div><div class='add'>+			err = cb(&amp;nhi-&gt;fib6_nh, arg);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		nhi = rcu_dereference_rtnl(nh-&gt;nh_info);</div><div class='add'>+		err = cb(&amp;nhi-&gt;fib6_nh, arg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nexthop_for_each_fib6_nh);</div><div class='add'>+</div><div class='add'>+static int check_src_addr(const struct in6_addr *saddr,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!ipv6_addr_any(saddr)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 routes using source address can not use nexthop objects");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fib6_check_nexthop(struct nexthop *nh, struct fib6_config *cfg,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+	bool is_fdb_nh;</div><div class='add'>+</div><div class='add'>+	/* fib6_src is unique to a fib6_info and limits the ability to cache</div><div class='add'>+	 * routes in fib6_nh within a nexthop that is potentially shared</div><div class='add'>+	 * across multiple fib entries. If the config wants to use source</div><div class='add'>+	 * routing it can not use nexthop objects. mlxsw also does not allow</div><div class='add'>+	 * fib6_src on routes.</div><div class='add'>+	 */</div><div class='add'>+	if (cfg &amp;&amp; check_src_addr(&amp;cfg-&gt;fc_src, extack) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+		nhg = rcu_dereference_rtnl(nh-&gt;nh_grp);</div><div class='add'>+		if (nhg-&gt;has_v4)</div><div class='add'>+			goto no_v4_nh;</div><div class='add'>+		is_fdb_nh = nhg-&gt;fdb_nh;</div><div class='add'>+	} else {</div><div class='add'>+		nhi = rcu_dereference_rtnl(nh-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;family == AF_INET)</div><div class='add'>+			goto no_v4_nh;</div><div class='add'>+		is_fdb_nh = nhi-&gt;fdb_nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_fdb_nh) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Route cannot point to a fdb nexthop");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+no_v4_nh:</div><div class='add'>+	NL_SET_ERR_MSG(extack, "IPv6 routes can not use an IPv4 nexthop");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fib6_check_nexthop);</div><div class='add'>+</div><div class='add'>+/* if existing nexthop has ipv6 routes linked to it, need</div><div class='add'>+ * to verify this new spec works with ipv6</div><div class='add'>+ */</div><div class='add'>+static int fib6_check_nh_list(struct nexthop *old, struct nexthop *new,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;old-&gt;f6i_list))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(f6i, &amp;old-&gt;f6i_list, nh_list) {</div><div class='add'>+		if (check_src_addr(&amp;f6i-&gt;fib6_src.addr, extack) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fib6_check_nexthop(new, NULL, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nexthop_check_scope(struct nh_info *nhi, u8 scope,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (scope == RT_SCOPE_HOST &amp;&amp; nhi-&gt;fib_nhc.nhc_gw_family) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Route with host scope can not have a gateway");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nhi-&gt;fib_nhc.nhc_flags &amp; RTNH_F_ONLINK &amp;&amp; scope &gt;= RT_SCOPE_LINK) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Scope mismatch with nexthop");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Invoked by fib add code to verify nexthop by id is ok with</div><div class='add'>+ * config for prefix; parts of fib_check_nh not done when nexthop</div><div class='add'>+ * object is used.</div><div class='add'>+ */</div><div class='add'>+int fib_check_nexthop(struct nexthop *nh, u8 scope,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+		nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+		if (nhg-&gt;fdb_nh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Route cannot point to a fdb nexthop");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (scope == RT_SCOPE_HOST) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Route with host scope can not have multiple nexthops");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* all nexthops in a group have the same scope */</div><div class='add'>+		nhi = rtnl_dereference(nhg-&gt;nh_entries[0].nh-&gt;nh_info);</div><div class='add'>+		err = nexthop_check_scope(nhi, scope, extack);</div><div class='add'>+	} else {</div><div class='add'>+		nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;fdb_nh) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Route cannot point to a fdb nexthop");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		err = nexthop_check_scope(nhi, scope, extack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib_check_nh_list(struct nexthop *old, struct nexthop *new,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fi, &amp;old-&gt;fi_list, nh_list) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = fib_check_nexthop(new, fi-&gt;fib_scope, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_nhge_is_balanced(const struct nh_grp_entry *nhge)</div><div class='add'>+{</div><div class='add'>+	return nhge-&gt;res.count_buckets == nhge-&gt;res.wants_buckets;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_nhge_is_ow(const struct nh_grp_entry *nhge)</div><div class='add'>+{</div><div class='add'>+	return nhge-&gt;res.count_buckets &gt; nhge-&gt;res.wants_buckets;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_nhge_is_uw(const struct nh_grp_entry *nhge)</div><div class='add'>+{</div><div class='add'>+	return nhge-&gt;res.count_buckets &lt; nhge-&gt;res.wants_buckets;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_table_is_balanced(const struct nh_res_table *res_table)</div><div class='add'>+{</div><div class='add'>+	return list_empty(&amp;res_table-&gt;uw_nh_entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_bucket_unset_nh(struct nh_res_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+	if (bucket-&gt;occupied) {</div><div class='add'>+		nhge = nh_res_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		nhge-&gt;res.count_buckets--;</div><div class='add'>+		bucket-&gt;occupied = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_bucket_set_nh(struct nh_res_bucket *bucket,</div><div class='add'>+				 struct nh_grp_entry *nhge)</div><div class='add'>+{</div><div class='add'>+	nh_res_bucket_unset_nh(bucket);</div><div class='add'>+</div><div class='add'>+	bucket-&gt;occupied = true;</div><div class='add'>+	rcu_assign_pointer(bucket-&gt;nh_entry, nhge);</div><div class='add'>+	nhge-&gt;res.count_buckets++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_bucket_should_migrate(struct nh_res_table *res_table,</div><div class='add'>+					 struct nh_res_bucket *bucket,</div><div class='add'>+					 unsigned long *deadline, bool *force)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+	unsigned long idle_point;</div><div class='add'>+</div><div class='add'>+	if (!bucket-&gt;occupied) {</div><div class='add'>+		/* The bucket is not occupied, its NHGE pointer is either</div><div class='add'>+		 * NULL or obsolete. We _have to_ migrate: set force.</div><div class='add'>+		 */</div><div class='add'>+		*force = true;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhge = nh_res_dereference(bucket-&gt;nh_entry);</div><div class='add'>+</div><div class='add'>+	/* If the bucket is populated by an underweight or balanced</div><div class='add'>+	 * nexthop, do not migrate.</div><div class='add'>+	 */</div><div class='add'>+	if (!nh_res_nhge_is_ow(nhge))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* At this point we know that the bucket is populated with an</div><div class='add'>+	 * overweight nexthop. It needs to be migrated to a new nexthop if</div><div class='add'>+	 * the idle timer of unbalanced timer expired.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	idle_point = nh_res_bucket_idle_point(res_table, bucket, now);</div><div class='add'>+	if (time_after_eq(now, idle_point)) {</div><div class='add'>+		/* The bucket is idle. We _can_ migrate: unset force. */</div><div class='add'>+		*force = false;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unbalanced timer of 0 means "never force". */</div><div class='add'>+	if (res_table-&gt;unbalanced_timer) {</div><div class='add'>+		unsigned long unb_point;</div><div class='add'>+</div><div class='add'>+		unb_point = nh_res_table_unb_point(res_table);</div><div class='add'>+		if (time_after(now, unb_point)) {</div><div class='add'>+			/* The bucket is not idle, but the unbalanced timer</div><div class='add'>+			 * expired. We _can_ migrate, but set force anyway,</div><div class='add'>+			 * so that drivers know to ignore activity reports</div><div class='add'>+			 * from the HW.</div><div class='add'>+			 */</div><div class='add'>+			*force = true;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nh_res_time_set_deadline(unb_point, deadline);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nh_res_time_set_deadline(idle_point, deadline);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nh_res_bucket_migrate(struct nh_res_table *res_table,</div><div class='add'>+				  u16 bucket_index, bool notify,</div><div class='add'>+				  bool notify_nl, bool force)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[bucket_index];</div><div class='add'>+	struct nh_grp_entry *new_nhge;</div><div class='add'>+	struct netlink_ext_ack extack;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	new_nhge = list_first_entry_or_null(&amp;res_table-&gt;uw_nh_entries,</div><div class='add'>+					    struct nh_grp_entry,</div><div class='add'>+					    res.uw_nh_entry);</div><div class='add'>+	if (WARN_ON_ONCE(!new_nhge))</div><div class='add'>+		/* If this function is called, "bucket" is either not</div><div class='add'>+		 * occupied, or it belongs to a next hop that is</div><div class='add'>+		 * overweight. In either case, there ought to be a</div><div class='add'>+		 * corresponding underweight next hop.</div><div class='add'>+		 */</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (notify) {</div><div class='add'>+		struct nh_grp_entry *old_nhge;</div><div class='add'>+</div><div class='add'>+		old_nhge = nh_res_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		err = call_nexthop_res_bucket_notifiers(res_table-&gt;net,</div><div class='add'>+							res_table-&gt;nhg_id,</div><div class='add'>+							bucket_index, force,</div><div class='add'>+							old_nhge-&gt;nh,</div><div class='add'>+							new_nhge-&gt;nh, &amp;extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_err_ratelimited("%s\n", extack._msg);</div><div class='add'>+			if (!force)</div><div class='add'>+				return false;</div><div class='add'>+			/* It is not possible to veto a forced replacement, so</div><div class='add'>+			 * just clear the hardware flags from the nexthop</div><div class='add'>+			 * bucket to indicate to user space that this bucket is</div><div class='add'>+			 * not correctly populated in hardware.</div><div class='add'>+			 */</div><div class='add'>+			bucket-&gt;nh_flags &amp;= ~(RTNH_F_OFFLOAD | RTNH_F_TRAP);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nh_res_bucket_set_nh(bucket, new_nhge);</div><div class='add'>+	nh_res_bucket_set_idle(res_table, bucket);</div><div class='add'>+</div><div class='add'>+	if (notify_nl)</div><div class='add'>+		nexthop_bucket_notify(res_table, bucket_index);</div><div class='add'>+</div><div class='add'>+	if (nh_res_nhge_is_balanced(new_nhge))</div><div class='add'>+		list_del(&amp;new_nhge-&gt;res.uw_nh_entry);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NH_RES_UPKEEP_DW_MINIMUM_INTERVAL (HZ / 2)</div><div class='add'>+</div><div class='add'>+static void nh_res_table_upkeep(struct nh_res_table *res_table,</div><div class='add'>+				bool notify, bool notify_nl)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	/* Deadline is the next time that upkeep should be run. It is the</div><div class='add'>+	 * earliest time at which one of the buckets might be migrated.</div><div class='add'>+	 * Start at the most pessimistic estimate: either unbalanced_timer</div><div class='add'>+	 * from now, or if there is none, idle_timer from now. For each</div><div class='add'>+	 * encountered time point, call nh_res_time_set_deadline() to</div><div class='add'>+	 * refine the estimate.</div><div class='add'>+	 */</div><div class='add'>+	if (res_table-&gt;unbalanced_timer)</div><div class='add'>+		deadline = now + res_table-&gt;unbalanced_timer;</div><div class='add'>+	else</div><div class='add'>+		deadline = now + res_table-&gt;idle_timer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; res_table-&gt;num_nh_buckets; i++) {</div><div class='add'>+		struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[i];</div><div class='add'>+		bool force;</div><div class='add'>+</div><div class='add'>+		if (nh_res_bucket_should_migrate(res_table, bucket,</div><div class='add'>+						 &amp;deadline, &amp;force)) {</div><div class='add'>+			if (!nh_res_bucket_migrate(res_table, i, notify,</div><div class='add'>+						   notify_nl, force)) {</div><div class='add'>+				unsigned long idle_point;</div><div class='add'>+</div><div class='add'>+				/* A driver can override the migration</div><div class='add'>+				 * decision if the HW reports that the</div><div class='add'>+				 * bucket is actually not idle. Therefore</div><div class='add'>+				 * remark the bucket as busy again and</div><div class='add'>+				 * update the deadline.</div><div class='add'>+				 */</div><div class='add'>+				nh_res_bucket_set_busy(bucket);</div><div class='add'>+				idle_point = nh_res_bucket_idle_point(res_table,</div><div class='add'>+								      bucket,</div><div class='add'>+								      now);</div><div class='add'>+				nh_res_time_set_deadline(idle_point, &amp;deadline);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the group is still unbalanced, schedule the next upkeep to</div><div class='add'>+	 * either the deadline computed above, or the minimum deadline,</div><div class='add'>+	 * whichever comes later.</div><div class='add'>+	 */</div><div class='add'>+	if (!nh_res_table_is_balanced(res_table)) {</div><div class='add'>+		unsigned long now = jiffies;</div><div class='add'>+		unsigned long min_deadline;</div><div class='add'>+</div><div class='add'>+		min_deadline = now + NH_RES_UPKEEP_DW_MINIMUM_INTERVAL;</div><div class='add'>+		if (time_before(deadline, min_deadline))</div><div class='add'>+			deadline = min_deadline;</div><div class='add'>+</div><div class='add'>+		queue_delayed_work(system_power_efficient_wq,</div><div class='add'>+				   &amp;res_table-&gt;upkeep_dw, deadline - now);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_table_upkeep_dw(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dw = to_delayed_work(work);</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+</div><div class='add'>+	res_table = container_of(dw, struct nh_res_table, upkeep_dw);</div><div class='add'>+	nh_res_table_upkeep(res_table, true, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_table_cancel_upkeep(struct nh_res_table *res_table)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;res_table-&gt;upkeep_dw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_res_group_rebalance(struct nh_group *nhg,</div><div class='add'>+				   struct nh_res_table *res_table)</div><div class='add'>+{</div><div class='add'>+	u16 prev_upper_bound = 0;</div><div class='add'>+	u32 total = 0;</div><div class='add'>+	u32 w = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;res_table-&gt;uw_nh_entries);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i)</div><div class='add'>+		total += nhg-&gt;nh_entries[i].weight;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+		u16 upper_bound;</div><div class='add'>+		u64 btw;</div><div class='add'>+</div><div class='add'>+		w += nhge-&gt;weight;</div><div class='add'>+		btw = ((u64)res_table-&gt;num_nh_buckets) * w;</div><div class='add'>+		upper_bound = DIV_ROUND_CLOSEST_ULL(btw, total);</div><div class='add'>+		nhge-&gt;res.wants_buckets = upper_bound - prev_upper_bound;</div><div class='add'>+		prev_upper_bound = upper_bound;</div><div class='add'>+</div><div class='add'>+		if (nh_res_nhge_is_uw(nhge)) {</div><div class='add'>+			if (list_empty(&amp;res_table-&gt;uw_nh_entries))</div><div class='add'>+				res_table-&gt;unbalanced_since = jiffies;</div><div class='add'>+			list_add(&amp;nhge-&gt;res.uw_nh_entry,</div><div class='add'>+				 &amp;res_table-&gt;uw_nh_entries);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Migrate buckets in res_table so that they reference NHGE's from NHG with</div><div class='add'>+ * the right NH ID. Set those buckets that do not have a corresponding NHGE</div><div class='add'>+ * entry in NHG as not occupied.</div><div class='add'>+ */</div><div class='add'>+static void nh_res_table_migrate_buckets(struct nh_res_table *res_table,</div><div class='add'>+					 struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; res_table-&gt;num_nh_buckets; i++) {</div><div class='add'>+		struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[i];</div><div class='add'>+		u32 id = rtnl_dereference(bucket-&gt;nh_entry)-&gt;nh-&gt;id;</div><div class='add'>+		bool found = false;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; nhg-&gt;num_nh; j++) {</div><div class='add'>+			struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[j];</div><div class='add'>+</div><div class='add'>+			if (nhge-&gt;nh-&gt;id == id) {</div><div class='add'>+				nh_res_bucket_set_nh(bucket, nhge);</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!found)</div><div class='add'>+			nh_res_bucket_unset_nh(bucket);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void replace_nexthop_grp_res(struct nh_group *oldg,</div><div class='add'>+				    struct nh_group *newg)</div><div class='add'>+{</div><div class='add'>+	/* For NH group replacement, the new NHG might only have a stub</div><div class='add'>+	 * hash table with 0 buckets, because the number of buckets was not</div><div class='add'>+	 * specified. For NH removal, oldg and newg both reference the same</div><div class='add'>+	 * res_table. So in any case, in the following, we want to work</div><div class='add'>+	 * with oldg-&gt;res_table.</div><div class='add'>+	 */</div><div class='add'>+	struct nh_res_table *old_res_table = rtnl_dereference(oldg-&gt;res_table);</div><div class='add'>+	unsigned long prev_unbalanced_since = old_res_table-&gt;unbalanced_since;</div><div class='add'>+	bool prev_has_uw = !list_empty(&amp;old_res_table-&gt;uw_nh_entries);</div><div class='add'>+</div><div class='add'>+	nh_res_table_cancel_upkeep(old_res_table);</div><div class='add'>+	nh_res_table_migrate_buckets(old_res_table, newg);</div><div class='add'>+	nh_res_group_rebalance(newg, old_res_table);</div><div class='add'>+	if (prev_has_uw &amp;&amp; !list_empty(&amp;old_res_table-&gt;uw_nh_entries))</div><div class='add'>+		old_res_table-&gt;unbalanced_since = prev_unbalanced_since;</div><div class='add'>+	nh_res_table_upkeep(old_res_table, true, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_hthr_group_rebalance(struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	u32 total = 0;</div><div class='add'>+	u32 w = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i)</div><div class='add'>+		total += nhg-&gt;nh_entries[i].weight;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+		u32 upper_bound;</div><div class='add'>+</div><div class='add'>+		w += nhge-&gt;weight;</div><div class='add'>+		upper_bound = DIV_ROUND_CLOSEST_ULL((u64)w &lt;&lt; 31, total) - 1;</div><div class='add'>+		atomic_set(&amp;nhge-&gt;hthr.upper_bound, upper_bound);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_nh_grp_entry(struct net *net, struct nh_grp_entry *nhge,</div><div class='add'>+				struct nl_info *nlinfo)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhges, *new_nhges;</div><div class='add'>+	struct nexthop *nhp = nhge-&gt;nh_parent;</div><div class='add'>+	struct netlink_ext_ack extack;</div><div class='add'>+	struct nexthop *nh = nhge-&gt;nh;</div><div class='add'>+	struct nh_group *nhg, *newg;</div><div class='add'>+	int i, j, err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!nh);</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(nhp-&gt;nh_grp);</div><div class='add'>+	newg = nhg-&gt;spare;</div><div class='add'>+</div><div class='add'>+	/* last entry, keep it visible and remove the parent */</div><div class='add'>+	if (nhg-&gt;num_nh == 1) {</div><div class='add'>+		remove_nexthop(net, nhp, nlinfo);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	newg-&gt;has_v4 = false;</div><div class='add'>+	newg-&gt;is_multipath = nhg-&gt;is_multipath;</div><div class='add'>+	newg-&gt;hash_threshold = nhg-&gt;hash_threshold;</div><div class='add'>+	newg-&gt;resilient = nhg-&gt;resilient;</div><div class='add'>+	newg-&gt;fdb_nh = nhg-&gt;fdb_nh;</div><div class='add'>+	newg-&gt;num_nh = nhg-&gt;num_nh;</div><div class='add'>+</div><div class='add'>+	/* copy old entries to new except the one getting removed */</div><div class='add'>+	nhges = nhg-&gt;nh_entries;</div><div class='add'>+	new_nhges = newg-&gt;nh_entries;</div><div class='add'>+	for (i = 0, j = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		/* current nexthop getting removed */</div><div class='add'>+		if (nhg-&gt;nh_entries[i].nh == nh) {</div><div class='add'>+			newg-&gt;num_nh--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nhi = rtnl_dereference(nhges[i].nh-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;family == AF_INET)</div><div class='add'>+			newg-&gt;has_v4 = true;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;nhges[i].nh_list);</div><div class='add'>+		new_nhges[j].stats = nhges[i].stats;</div><div class='add'>+		new_nhges[j].nh_parent = nhges[i].nh_parent;</div><div class='add'>+		new_nhges[j].nh = nhges[i].nh;</div><div class='add'>+		new_nhges[j].weight = nhges[i].weight;</div><div class='add'>+		list_add(&amp;new_nhges[j].nh_list, &amp;new_nhges[j].nh-&gt;grp_list);</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (newg-&gt;hash_threshold)</div><div class='add'>+		nh_hthr_group_rebalance(newg);</div><div class='add'>+	else if (newg-&gt;resilient)</div><div class='add'>+		replace_nexthop_grp_res(nhg, newg);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(nhp-&gt;nh_grp, newg);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;nhge-&gt;nh_list);</div><div class='add'>+	free_percpu(nhge-&gt;stats);</div><div class='add'>+	nexthop_put(nhge-&gt;nh);</div><div class='add'>+</div><div class='add'>+	/* Removal of a NH from a resilient group is notified through</div><div class='add'>+	 * bucket notifications.</div><div class='add'>+	 */</div><div class='add'>+	if (newg-&gt;hash_threshold) {</div><div class='add'>+		err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, nhp,</div><div class='add'>+					     &amp;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			pr_err("%s\n", extack._msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlinfo)</div><div class='add'>+		nexthop_notify(RTM_NEWNEXTHOP, nhp, nlinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_nexthop_from_groups(struct net *net, struct nexthop *nh,</div><div class='add'>+				       struct nl_info *nlinfo)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhge, *tmp;</div><div class='add'>+</div><div class='add'>+	/* If there is nothing to do, let's avoid the costly call to</div><div class='add'>+	 * synchronize_net()</div><div class='add'>+	 */</div><div class='add'>+	if (list_empty(&amp;nh-&gt;grp_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(nhge, tmp, &amp;nh-&gt;grp_list, nh_list)</div><div class='add'>+		remove_nh_grp_entry(net, nhge, nlinfo);</div><div class='add'>+</div><div class='add'>+	/* make sure all see the newly published array before releasing rtnl */</div><div class='add'>+	synchronize_net();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_nexthop_group(struct nexthop *nh, struct nl_info *nlinfo)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rcu_dereference_rtnl(nh-&gt;nh_grp);</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	int i, num_nh = nhg-&gt;num_nh;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_nh; ++i) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!nhge-&gt;nh))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;nhge-&gt;nh_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;resilient) {</div><div class='add'>+		res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+		nh_res_table_cancel_upkeep(res_table);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* not called for nexthop replace */</div><div class='add'>+static void __remove_nexthop_fib(struct net *net, struct nexthop *nh)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i;</div><div class='add'>+	bool do_flush = false;</div><div class='add'>+	struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fi, &amp;nh-&gt;fi_list, nh_list) {</div><div class='add'>+		fi-&gt;fib_flags |= RTNH_F_DEAD;</div><div class='add'>+		do_flush = true;</div><div class='add'>+	}</div><div class='add'>+	if (do_flush)</div><div class='add'>+		fib_flush(net);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;nh-&gt;lock);</div><div class='add'>+</div><div class='add'>+	nh-&gt;dead = true;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;nh-&gt;f6i_list)) {</div><div class='add'>+		f6i = list_first_entry(&amp;nh-&gt;f6i_list, typeof(*f6i), nh_list);</div><div class='add'>+</div><div class='add'>+		/* __ip6_del_rt does a release, so do a hold here */</div><div class='add'>+		fib6_info_hold(f6i);</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;nh-&gt;lock);</div><div class='add'>+		ipv6_stub-&gt;ip6_del_rt(net, f6i,</div><div class='add'>+				      !READ_ONCE(net-&gt;ipv4.sysctl_nexthop_compat_mode));</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;nh-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;nh-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __remove_nexthop(struct net *net, struct nexthop *nh,</div><div class='add'>+			     struct nl_info *nlinfo)</div><div class='add'>+{</div><div class='add'>+	__remove_nexthop_fib(net, nh);</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group) {</div><div class='add'>+		remove_nexthop_group(nh, nlinfo);</div><div class='add'>+	} else {</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;fib_nhc.nhc_dev)</div><div class='add'>+			hlist_del(&amp;nhi-&gt;dev_hash);</div><div class='add'>+</div><div class='add'>+		remove_nexthop_from_groups(net, nh, nlinfo);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_nexthop(struct net *net, struct nexthop *nh,</div><div class='add'>+			   struct nl_info *nlinfo)</div><div class='add'>+{</div><div class='add'>+	call_nexthop_notifiers(net, NEXTHOP_EVENT_DEL, nh, NULL);</div><div class='add'>+</div><div class='add'>+	/* remove from the tree */</div><div class='add'>+	rb_erase(&amp;nh-&gt;rb_node, &amp;net-&gt;nexthop.rb_root);</div><div class='add'>+</div><div class='add'>+	if (nlinfo)</div><div class='add'>+		nexthop_notify(RTM_DELNEXTHOP, nh, nlinfo);</div><div class='add'>+</div><div class='add'>+	__remove_nexthop(net, nh, nlinfo);</div><div class='add'>+	nh_base_seq_inc(net);</div><div class='add'>+</div><div class='add'>+	nexthop_put(nh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* if any FIB entries reference this nexthop, any dst entries</div><div class='add'>+ * need to be regenerated</div><div class='add'>+ */</div><div class='add'>+static void nh_rt_cache_flush(struct net *net, struct nexthop *nh,</div><div class='add'>+			      struct nexthop *replaced_nh)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;nh-&gt;fi_list))</div><div class='add'>+		rt_cache_flush(net);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(f6i, &amp;nh-&gt;f6i_list, nh_list)</div><div class='add'>+		ipv6_stub-&gt;fib6_update_sernum(net, f6i);</div><div class='add'>+</div><div class='add'>+	/* if an IPv6 group was replaced, we have to release all old</div><div class='add'>+	 * dsts to make sure all refcounts are released</div><div class='add'>+	 */</div><div class='add'>+	if (!replaced_nh-&gt;is_group)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(replaced_nh-&gt;nh_grp);</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+		struct nh_grp_entry *nhge = &amp;nhg-&gt;nh_entries[i];</div><div class='add'>+		struct nh_info *nhi = rtnl_dereference(nhge-&gt;nh-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+		if (nhi-&gt;family == AF_INET6)</div><div class='add'>+			ipv6_stub-&gt;fib6_nh_release_dsts(&amp;nhi-&gt;fib6_nh);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int replace_nexthop_grp(struct net *net, struct nexthop *old,</div><div class='add'>+			       struct nexthop *new, const struct nh_config *cfg,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *tmp_table = NULL;</div><div class='add'>+	struct nh_res_table *new_res_table;</div><div class='add'>+	struct nh_res_table *old_res_table;</div><div class='add'>+	struct nh_group *oldg, *newg;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!new-&gt;is_group) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can not replace a nexthop group with a nexthop.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	oldg = rtnl_dereference(old-&gt;nh_grp);</div><div class='add'>+	newg = rtnl_dereference(new-&gt;nh_grp);</div><div class='add'>+</div><div class='add'>+	if (newg-&gt;hash_threshold != oldg-&gt;hash_threshold) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can not replace a nexthop group with one of a different type.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (newg-&gt;hash_threshold) {</div><div class='add'>+		err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new,</div><div class='add'>+					     extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else if (newg-&gt;resilient) {</div><div class='add'>+		new_res_table = rtnl_dereference(newg-&gt;res_table);</div><div class='add'>+		old_res_table = rtnl_dereference(oldg-&gt;res_table);</div><div class='add'>+</div><div class='add'>+		/* Accept if num_nh_buckets was not given, but if it was</div><div class='add'>+		 * given, demand that the value be correct.</div><div class='add'>+		 */</div><div class='add'>+		if (cfg-&gt;nh_grp_res_has_num_buckets &amp;&amp;</div><div class='add'>+		    cfg-&gt;nh_grp_res_num_buckets !=</div><div class='add'>+		    old_res_table-&gt;num_nh_buckets) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Can not change number of buckets of a resilient nexthop group.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Emit a pre-replace notification so that listeners could veto</div><div class='add'>+		 * a potentially unsupported configuration. Otherwise,</div><div class='add'>+		 * individual bucket replacement notifications would need to be</div><div class='add'>+		 * vetoed, which is something that should only happen if the</div><div class='add'>+		 * bucket is currently active.</div><div class='add'>+		 */</div><div class='add'>+		err = call_nexthop_res_table_notifiers(net, new, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;nh_grp_res_has_idle_timer)</div><div class='add'>+			old_res_table-&gt;idle_timer = cfg-&gt;nh_grp_res_idle_timer;</div><div class='add'>+		if (cfg-&gt;nh_grp_res_has_unbalanced_timer)</div><div class='add'>+			old_res_table-&gt;unbalanced_timer =</div><div class='add'>+				cfg-&gt;nh_grp_res_unbalanced_timer;</div><div class='add'>+</div><div class='add'>+		replace_nexthop_grp_res(oldg, newg);</div><div class='add'>+</div><div class='add'>+		tmp_table = new_res_table;</div><div class='add'>+		rcu_assign_pointer(newg-&gt;res_table, old_res_table);</div><div class='add'>+		rcu_assign_pointer(newg-&gt;spare-&gt;res_table, old_res_table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update parents - used by nexthop code for cleanup */</div><div class='add'>+	for (i = 0; i &lt; newg-&gt;num_nh; i++)</div><div class='add'>+		newg-&gt;nh_entries[i].nh_parent = old;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(old-&gt;nh_grp, newg);</div><div class='add'>+</div><div class='add'>+	/* Make sure concurrent readers are not using 'oldg' anymore. */</div><div class='add'>+	synchronize_net();</div><div class='add'>+</div><div class='add'>+	if (newg-&gt;resilient) {</div><div class='add'>+		rcu_assign_pointer(oldg-&gt;res_table, tmp_table);</div><div class='add'>+		rcu_assign_pointer(oldg-&gt;spare-&gt;res_table, tmp_table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; oldg-&gt;num_nh; i++)</div><div class='add'>+		oldg-&gt;nh_entries[i].nh_parent = new;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(new-&gt;nh_grp, oldg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nh_group_v4_update(struct nh_group *nhg)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhges;</div><div class='add'>+	bool has_v4 = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	nhges = nhg-&gt;nh_entries;</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; i++) {</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		nhi = rtnl_dereference(nhges[i].nh-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;family == AF_INET)</div><div class='add'>+			has_v4 = true;</div><div class='add'>+	}</div><div class='add'>+	nhg-&gt;has_v4 = has_v4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int replace_nexthop_single_notify_res(struct net *net,</div><div class='add'>+					     struct nh_res_table *res_table,</div><div class='add'>+					     struct nexthop *old,</div><div class='add'>+					     struct nh_info *oldi,</div><div class='add'>+					     struct nh_info *newi,</div><div class='add'>+					     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 nhg_id = res_table-&gt;nhg_id;</div><div class='add'>+	int err;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; res_table-&gt;num_nh_buckets; i++) {</div><div class='add'>+		struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[i];</div><div class='add'>+		struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+		nhge = rtnl_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		if (nhge-&gt;nh == old) {</div><div class='add'>+			err = __call_nexthop_res_bucket_notifiers(net, nhg_id,</div><div class='add'>+								  i, true,</div><div class='add'>+								  oldi, newi,</div><div class='add'>+								  extack);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_notify;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_notify:</div><div class='add'>+	while (i-- &gt; 0) {</div><div class='add'>+		struct nh_res_bucket *bucket = &amp;res_table-&gt;nh_buckets[i];</div><div class='add'>+		struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+		nhge = rtnl_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		if (nhge-&gt;nh == old)</div><div class='add'>+			__call_nexthop_res_bucket_notifiers(net, nhg_id, i,</div><div class='add'>+							    true, newi, oldi,</div><div class='add'>+							    extack);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int replace_nexthop_single_notify(struct net *net,</div><div class='add'>+					 struct nexthop *group_nh,</div><div class='add'>+					 struct nexthop *old,</div><div class='add'>+					 struct nh_info *oldi,</div><div class='add'>+					 struct nh_info *newi,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg = rtnl_dereference(group_nh-&gt;nh_grp);</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;hash_threshold) {</div><div class='add'>+		return call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE,</div><div class='add'>+					      group_nh, extack);</div><div class='add'>+	} else if (nhg-&gt;resilient) {</div><div class='add'>+		res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+		return replace_nexthop_single_notify_res(net, res_table,</div><div class='add'>+							 old, oldi, newi,</div><div class='add'>+							 extack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int replace_nexthop_single(struct net *net, struct nexthop *old,</div><div class='add'>+				  struct nexthop *new,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u8 old_protocol, old_nh_flags;</div><div class='add'>+	struct nh_info *oldi, *newi;</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (new-&gt;is_group) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Can not replace a nexthop with a nexthop group.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;old-&gt;grp_list) &amp;&amp;</div><div class='add'>+	    rtnl_dereference(new-&gt;nh_info)-&gt;fdb_nh !=</div><div class='add'>+	    rtnl_dereference(old-&gt;nh_info)-&gt;fdb_nh) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot change nexthop FDB status while in a group");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Hardware flags were set on 'old' as 'new' is not in the red-black</div><div class='add'>+	 * tree. Therefore, inherit the flags from 'old' to 'new'.</div><div class='add'>+	 */</div><div class='add'>+	new-&gt;nh_flags |= old-&gt;nh_flags &amp; (RTNH_F_OFFLOAD | RTNH_F_TRAP);</div><div class='add'>+</div><div class='add'>+	oldi = rtnl_dereference(old-&gt;nh_info);</div><div class='add'>+	newi = rtnl_dereference(new-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+	newi-&gt;nh_parent = old;</div><div class='add'>+	oldi-&gt;nh_parent = new;</div><div class='add'>+</div><div class='add'>+	old_protocol = old-&gt;protocol;</div><div class='add'>+	old_nh_flags = old-&gt;nh_flags;</div><div class='add'>+</div><div class='add'>+	old-&gt;protocol = new-&gt;protocol;</div><div class='add'>+	old-&gt;nh_flags = new-&gt;nh_flags;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(old-&gt;nh_info, newi);</div><div class='add'>+	rcu_assign_pointer(new-&gt;nh_info, oldi);</div><div class='add'>+</div><div class='add'>+	/* Send a replace notification for all the groups using the nexthop. */</div><div class='add'>+	list_for_each_entry(nhge, &amp;old-&gt;grp_list, nh_list) {</div><div class='add'>+		struct nexthop *nhp = nhge-&gt;nh_parent;</div><div class='add'>+</div><div class='add'>+		err = replace_nexthop_single_notify(net, nhp, old, oldi, newi,</div><div class='add'>+						    extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_notify;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When replacing an IPv4 nexthop with an IPv6 nexthop, potentially</div><div class='add'>+	 * update IPv4 indication in all the groups using the nexthop.</div><div class='add'>+	 */</div><div class='add'>+	if (oldi-&gt;family == AF_INET &amp;&amp; newi-&gt;family == AF_INET6) {</div><div class='add'>+		list_for_each_entry(nhge, &amp;old-&gt;grp_list, nh_list) {</div><div class='add'>+			struct nexthop *nhp = nhge-&gt;nh_parent;</div><div class='add'>+			struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+			nhg = rtnl_dereference(nhp-&gt;nh_grp);</div><div class='add'>+			nh_group_v4_update(nhg);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_notify:</div><div class='add'>+	rcu_assign_pointer(new-&gt;nh_info, newi);</div><div class='add'>+	rcu_assign_pointer(old-&gt;nh_info, oldi);</div><div class='add'>+	old-&gt;nh_flags = old_nh_flags;</div><div class='add'>+	old-&gt;protocol = old_protocol;</div><div class='add'>+	oldi-&gt;nh_parent = old;</div><div class='add'>+	newi-&gt;nh_parent = new;</div><div class='add'>+	list_for_each_entry_continue_reverse(nhge, &amp;old-&gt;grp_list, nh_list) {</div><div class='add'>+		struct nexthop *nhp = nhge-&gt;nh_parent;</div><div class='add'>+</div><div class='add'>+		replace_nexthop_single_notify(net, nhp, old, newi, oldi, NULL);</div><div class='add'>+	}</div><div class='add'>+	call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, old, extack);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __nexthop_replace_notify(struct net *net, struct nexthop *nh,</div><div class='add'>+				     struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;nh-&gt;fi_list)) {</div><div class='add'>+		struct fib_info *fi;</div><div class='add'>+</div><div class='add'>+		/* expectation is a few fib_info per nexthop and then</div><div class='add'>+		 * a lot of routes per fib_info. So mark the fib_info</div><div class='add'>+		 * and then walk the fib tables once</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(fi, &amp;nh-&gt;fi_list, nh_list)</div><div class='add'>+			fi-&gt;nh_updated = true;</div><div class='add'>+</div><div class='add'>+		fib_info_notify_update(net, info);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(fi, &amp;nh-&gt;fi_list, nh_list)</div><div class='add'>+			fi-&gt;nh_updated = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(f6i, &amp;nh-&gt;f6i_list, nh_list)</div><div class='add'>+		ipv6_stub-&gt;fib6_rt_update(net, f6i, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* send RTM_NEWROUTE with REPLACE flag set for all FIB entries</div><div class='add'>+ * linked to this nexthop and for all groups that the nexthop</div><div class='add'>+ * is a member of</div><div class='add'>+ */</div><div class='add'>+static void nexthop_replace_notify(struct net *net, struct nexthop *nh,</div><div class='add'>+				   struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+	__nexthop_replace_notify(net, nh, info);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nhge, &amp;nh-&gt;grp_list, nh_list)</div><div class='add'>+		__nexthop_replace_notify(net, nhge-&gt;nh_parent, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int replace_nexthop(struct net *net, struct nexthop *old,</div><div class='add'>+			   struct nexthop *new, const struct nh_config *cfg,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool new_is_reject = false;</div><div class='add'>+	struct nh_grp_entry *nhge;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* check that existing FIB entries are ok with the</div><div class='add'>+	 * new nexthop definition</div><div class='add'>+	 */</div><div class='add'>+	err = fib_check_nh_list(old, new, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = fib6_check_nh_list(old, new, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!new-&gt;is_group) {</div><div class='add'>+		struct nh_info *nhi = rtnl_dereference(new-&gt;nh_info);</div><div class='add'>+</div><div class='add'>+		new_is_reject = nhi-&gt;reject_nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nhge, &amp;old-&gt;grp_list, nh_list) {</div><div class='add'>+		/* if new nexthop is a blackhole, any groups using this</div><div class='add'>+		 * nexthop cannot have more than 1 path</div><div class='add'>+		 */</div><div class='add'>+		if (new_is_reject &amp;&amp;</div><div class='add'>+		    nexthop_num_path(nhge-&gt;nh_parent) &gt; 1) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Blackhole nexthop can not be a member of a group with more than one path");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = fib_check_nh_list(nhge-&gt;nh_parent, new, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = fib6_check_nh_list(nhge-&gt;nh_parent, new, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old-&gt;is_group)</div><div class='add'>+		err = replace_nexthop_grp(net, old, new, cfg, extack);</div><div class='add'>+	else</div><div class='add'>+		err = replace_nexthop_single(net, old, new, extack);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		nh_rt_cache_flush(net, old, new);</div><div class='add'>+</div><div class='add'>+		__remove_nexthop(net, new, NULL);</div><div class='add'>+		nexthop_put(new);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called with rtnl_lock held */</div><div class='add'>+static int insert_nexthop(struct net *net, struct nexthop *new_nh,</div><div class='add'>+			  struct nh_config *cfg, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **pp, *parent = NULL, *next;</div><div class='add'>+	struct rb_root *root = &amp;net-&gt;nexthop.rb_root;</div><div class='add'>+	bool replace = !!(cfg-&gt;nlflags &amp; NLM_F_REPLACE);</div><div class='add'>+	bool create = !!(cfg-&gt;nlflags &amp; NLM_F_CREATE);</div><div class='add'>+	u32 new_id = new_nh-&gt;id;</div><div class='add'>+	int replace_notify = 0;</div><div class='add'>+	int rc = -EEXIST;</div><div class='add'>+</div><div class='add'>+	pp = &amp;root-&gt;rb_node;</div><div class='add'>+	while (1) {</div><div class='add'>+		struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+		next = *pp;</div><div class='add'>+		if (!next)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		parent = next;</div><div class='add'>+</div><div class='add'>+		nh = rb_entry(parent, struct nexthop, rb_node);</div><div class='add'>+		if (new_id &lt; nh-&gt;id) {</div><div class='add'>+			pp = &amp;next-&gt;rb_left;</div><div class='add'>+		} else if (new_id &gt; nh-&gt;id) {</div><div class='add'>+			pp = &amp;next-&gt;rb_right;</div><div class='add'>+		} else if (replace) {</div><div class='add'>+			rc = replace_nexthop(net, nh, new_nh, cfg, extack);</div><div class='add'>+			if (!rc) {</div><div class='add'>+				new_nh = nh; /* send notification with old nh */</div><div class='add'>+				replace_notify = 1;</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		} else {</div><div class='add'>+			/* id already exists and not a replace */</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (replace &amp;&amp; !create) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Replace specified without create and no entry exists");</div><div class='add'>+		rc = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_nh-&gt;is_group) {</div><div class='add'>+		struct nh_group *nhg = rtnl_dereference(new_nh-&gt;nh_grp);</div><div class='add'>+		struct nh_res_table *res_table;</div><div class='add'>+</div><div class='add'>+		if (nhg-&gt;resilient) {</div><div class='add'>+			res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+</div><div class='add'>+			/* Not passing the number of buckets is OK when</div><div class='add'>+			 * replacing, but not when creating a new group.</div><div class='add'>+			 */</div><div class='add'>+			if (!cfg-&gt;nh_grp_res_has_num_buckets) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Number of buckets not specified for nexthop group insertion");</div><div class='add'>+				rc = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			nh_res_group_rebalance(nhg, res_table);</div><div class='add'>+</div><div class='add'>+			/* Do not send bucket notifications, we do full</div><div class='add'>+			 * notification below.</div><div class='add'>+			 */</div><div class='add'>+			nh_res_table_upkeep(res_table, false, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_link_node_rcu(&amp;new_nh-&gt;rb_node, parent, pp);</div><div class='add'>+	rb_insert_color(&amp;new_nh-&gt;rb_node, root);</div><div class='add'>+</div><div class='add'>+	/* The initial insertion is a full notification for hash-threshold as</div><div class='add'>+	 * well as resilient groups.</div><div class='add'>+	 */</div><div class='add'>+	rc = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new_nh, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		rb_erase(&amp;new_nh-&gt;rb_node, &amp;net-&gt;nexthop.rb_root);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!rc) {</div><div class='add'>+		nh_base_seq_inc(net);</div><div class='add'>+		nexthop_notify(RTM_NEWNEXTHOP, new_nh, &amp;cfg-&gt;nlinfo);</div><div class='add'>+		if (replace_notify &amp;&amp;</div><div class='add'>+		    READ_ONCE(net-&gt;ipv4.sysctl_nexthop_compat_mode))</div><div class='add'>+			nexthop_replace_notify(net, new_nh, &amp;cfg-&gt;nlinfo);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+/* remove all nexthops tied to a device being deleted */</div><div class='add'>+static void nexthop_flush_dev(struct net_device *dev, unsigned long event)</div><div class='add'>+{</div><div class='add'>+	unsigned int hash = nh_dev_hashfn(dev-&gt;ifindex);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct hlist_head *head = &amp;net-&gt;nexthop.devhash[hash];</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(nhi, n, head, dev_hash) {</div><div class='add'>+		if (nhi-&gt;fib_nhc.nhc_dev != dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (nhi-&gt;reject_nh &amp;&amp;</div><div class='add'>+		    (event == NETDEV_DOWN || event == NETDEV_CHANGE))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		remove_nexthop(net, nhi-&gt;nh_parent, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl; called when net namespace is deleted */</div><div class='add'>+static void flush_all_nexthops(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct rb_root *root = &amp;net-&gt;nexthop.rb_root;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+	while ((node = rb_first(root))) {</div><div class='add'>+		nh = rb_entry(node, struct nexthop, rb_node);</div><div class='add'>+		remove_nexthop(net, nh, NULL);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_create_group(struct net *net,</div><div class='add'>+					    struct nh_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *grps_attr = cfg-&gt;nh_grp;</div><div class='add'>+	struct nexthop_grp *entry = nla_data(grps_attr);</div><div class='add'>+	u16 num_nh = nla_len(grps_attr) / sizeof(*entry);</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	nh = nexthop_alloc();</div><div class='add'>+	if (!nh)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	nh-&gt;is_group = 1;</div><div class='add'>+</div><div class='add'>+	nhg = nexthop_grp_alloc(num_nh);</div><div class='add'>+	if (!nhg) {</div><div class='add'>+		kfree(nh);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* spare group used for removals */</div><div class='add'>+	nhg-&gt;spare = nexthop_grp_alloc(num_nh);</div><div class='add'>+	if (!nhg-&gt;spare) {</div><div class='add'>+		kfree(nhg);</div><div class='add'>+		kfree(nh);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	nhg-&gt;spare-&gt;spare = nhg;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhg-&gt;num_nh; ++i) {</div><div class='add'>+		struct nexthop *nhe;</div><div class='add'>+		struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+		nhe = nexthop_find_by_id(net, entry[i].id);</div><div class='add'>+		if (!nexthop_get(nhe)) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out_no_nh;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nhi = rtnl_dereference(nhe-&gt;nh_info);</div><div class='add'>+		if (nhi-&gt;family == AF_INET)</div><div class='add'>+			nhg-&gt;has_v4 = true;</div><div class='add'>+</div><div class='add'>+		nhg-&gt;nh_entries[i].stats =</div><div class='add'>+			netdev_alloc_pcpu_stats(struct nh_grp_entry_stats);</div><div class='add'>+		if (!nhg-&gt;nh_entries[i].stats) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			nexthop_put(nhe);</div><div class='add'>+			goto out_no_nh;</div><div class='add'>+		}</div><div class='add'>+		nhg-&gt;nh_entries[i].nh = nhe;</div><div class='add'>+		nhg-&gt;nh_entries[i].weight = nexthop_grp_weight(&amp;entry[i]);</div><div class='add'>+</div><div class='add'>+		list_add(&amp;nhg-&gt;nh_entries[i].nh_list, &amp;nhe-&gt;grp_list);</div><div class='add'>+		nhg-&gt;nh_entries[i].nh_parent = nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_grp_type == NEXTHOP_GRP_TYPE_MPATH) {</div><div class='add'>+		nhg-&gt;hash_threshold = 1;</div><div class='add'>+		nhg-&gt;is_multipath = true;</div><div class='add'>+	} else if (cfg-&gt;nh_grp_type == NEXTHOP_GRP_TYPE_RES) {</div><div class='add'>+		struct nh_res_table *res_table;</div><div class='add'>+</div><div class='add'>+		res_table = nexthop_res_table_alloc(net, cfg-&gt;nh_id, cfg);</div><div class='add'>+		if (!res_table) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out_no_nh;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(nhg-&gt;spare-&gt;res_table, res_table);</div><div class='add'>+		rcu_assign_pointer(nhg-&gt;res_table, res_table);</div><div class='add'>+		nhg-&gt;resilient = true;</div><div class='add'>+		nhg-&gt;is_multipath = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(nhg-&gt;hash_threshold + nhg-&gt;resilient != 1);</div><div class='add'>+</div><div class='add'>+	if (nhg-&gt;hash_threshold)</div><div class='add'>+		nh_hthr_group_rebalance(nhg);</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_fdb)</div><div class='add'>+		nhg-&gt;fdb_nh = 1;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_hw_stats)</div><div class='add'>+		nhg-&gt;hw_stats = true;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(nh-&gt;nh_grp, nhg);</div><div class='add'>+</div><div class='add'>+	return nh;</div><div class='add'>+</div><div class='add'>+out_no_nh:</div><div class='add'>+	for (i--; i &gt;= 0; --i) {</div><div class='add'>+		list_del(&amp;nhg-&gt;nh_entries[i].nh_list);</div><div class='add'>+		free_percpu(nhg-&gt;nh_entries[i].stats);</div><div class='add'>+		nexthop_put(nhg-&gt;nh_entries[i].nh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(nhg-&gt;spare);</div><div class='add'>+	kfree(nhg);</div><div class='add'>+	kfree(nh);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_create_ipv4(struct net *net, struct nexthop *nh,</div><div class='add'>+			  struct nh_info *nhi, struct nh_config *cfg,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib_nh *fib_nh = &amp;nhi-&gt;fib_nh;</div><div class='add'>+	struct fib_config fib_cfg = {</div><div class='add'>+		.fc_oif   = cfg-&gt;nh_ifindex,</div><div class='add'>+		.fc_gw4   = cfg-&gt;gw.ipv4,</div><div class='add'>+		.fc_gw_family = cfg-&gt;gw.ipv4 ? AF_INET : 0,</div><div class='add'>+		.fc_flags = cfg-&gt;nh_flags,</div><div class='add'>+		.fc_nlinfo = cfg-&gt;nlinfo,</div><div class='add'>+		.fc_encap = cfg-&gt;nh_encap,</div><div class='add'>+		.fc_encap_type = cfg-&gt;nh_encap_type,</div><div class='add'>+	};</div><div class='add'>+	u32 tb_id = (cfg-&gt;dev ? l3mdev_fib_table(cfg-&gt;dev) : RT_TABLE_MAIN);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fib_nh_init(net, fib_nh, &amp;fib_cfg, 1, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		fib_nh_release(net, fib_nh);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nhi-&gt;fdb_nh)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* sets nh_dev if successful */</div><div class='add'>+	err = fib_check_nh(net, fib_nh, tb_id, 0, extack);</div><div class='add'>+	if (!err) {</div><div class='add'>+		nh-&gt;nh_flags = fib_nh-&gt;fib_nh_flags;</div><div class='add'>+		fib_info_update_nhc_saddr(net, &amp;fib_nh-&gt;nh_common,</div><div class='add'>+					  !fib_nh-&gt;fib_nh_scope ? 0 : fib_nh-&gt;fib_nh_scope - 1);</div><div class='add'>+	} else {</div><div class='add'>+		fib_nh_release(net, fib_nh);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_create_ipv6(struct net *net,  struct nexthop *nh,</div><div class='add'>+			  struct nh_info *nhi, struct nh_config *cfg,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh *fib6_nh = &amp;nhi-&gt;fib6_nh;</div><div class='add'>+	struct fib6_config fib6_cfg = {</div><div class='add'>+		.fc_table = l3mdev_fib_table(cfg-&gt;dev),</div><div class='add'>+		.fc_ifindex = cfg-&gt;nh_ifindex,</div><div class='add'>+		.fc_gateway = cfg-&gt;gw.ipv6,</div><div class='add'>+		.fc_flags = cfg-&gt;nh_flags,</div><div class='add'>+		.fc_nlinfo = cfg-&gt;nlinfo,</div><div class='add'>+		.fc_encap = cfg-&gt;nh_encap,</div><div class='add'>+		.fc_encap_type = cfg-&gt;nh_encap_type,</div><div class='add'>+		.fc_is_fdb = cfg-&gt;nh_fdb,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ipv6_addr_any(&amp;cfg-&gt;gw.ipv6))</div><div class='add'>+		fib6_cfg.fc_flags |= RTF_GATEWAY;</div><div class='add'>+</div><div class='add'>+	/* sets nh_dev if successful */</div><div class='add'>+	err = ipv6_stub-&gt;fib6_nh_init(net, fib6_nh, &amp;fib6_cfg, GFP_KERNEL,</div><div class='add'>+				      extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* IPv6 is not enabled, don't call fib6_nh_release */</div><div class='add'>+		if (err == -EAFNOSUPPORT)</div><div class='add'>+			goto out;</div><div class='add'>+		ipv6_stub-&gt;fib6_nh_release(fib6_nh);</div><div class='add'>+	} else {</div><div class='add'>+		nh-&gt;nh_flags = fib6_nh-&gt;fib_nh_flags;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *nexthop_create(struct net *net, struct nh_config *cfg,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	nh = nexthop_alloc();</div><div class='add'>+	if (!nh)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	nhi = kzalloc(sizeof(*nhi), GFP_KERNEL);</div><div class='add'>+	if (!nhi) {</div><div class='add'>+		kfree(nh);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nh-&gt;nh_flags = cfg-&gt;nh_flags;</div><div class='add'>+	nh-&gt;net = net;</div><div class='add'>+</div><div class='add'>+	nhi-&gt;nh_parent = nh;</div><div class='add'>+	nhi-&gt;family = cfg-&gt;nh_family;</div><div class='add'>+	nhi-&gt;fib_nhc.nhc_scope = RT_SCOPE_LINK;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_fdb)</div><div class='add'>+		nhi-&gt;fdb_nh = 1;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_blackhole) {</div><div class='add'>+		nhi-&gt;reject_nh = 1;</div><div class='add'>+		cfg-&gt;nh_ifindex = net-&gt;loopback_dev-&gt;ifindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cfg-&gt;nh_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		err = nh_create_ipv4(net, nh, nhi, cfg, extack);</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		err = nh_create_ipv6(net, nh, nhi, cfg, extack);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(nhi);</div><div class='add'>+		kfree(nh);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add the entry to the device based hash */</div><div class='add'>+	if (!nhi-&gt;fdb_nh)</div><div class='add'>+		nexthop_devhash_add(net, nhi);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(nh-&gt;nh_info, nhi);</div><div class='add'>+</div><div class='add'>+	return nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called with rtnl lock held */</div><div class='add'>+static struct nexthop *nexthop_add(struct net *net, struct nh_config *cfg,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;nh_id) {</div><div class='add'>+		cfg-&gt;nh_id = nh_find_unused_id(net);</div><div class='add'>+		if (!cfg-&gt;nh_id) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "No unused id");</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;nh_grp)</div><div class='add'>+		nh = nexthop_create_group(net, cfg);</div><div class='add'>+	else</div><div class='add'>+		nh = nexthop_create(net, cfg, extack);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(nh))</div><div class='add'>+		return nh;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;nh-&gt;refcnt, 1);</div><div class='add'>+	nh-&gt;id = cfg-&gt;nh_id;</div><div class='add'>+	nh-&gt;protocol = cfg-&gt;nh_protocol;</div><div class='add'>+	nh-&gt;net = net;</div><div class='add'>+</div><div class='add'>+	err = insert_nexthop(net, nh, cfg, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		__remove_nexthop(net, nh, NULL);</div><div class='add'>+		nexthop_put(nh);</div><div class='add'>+		nh = ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_nh_get_timer(struct nlattr *attr, unsigned long fallback,</div><div class='add'>+			    unsigned long *timer_p, bool *has_p,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned long timer;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!attr) {</div><div class='add'>+		*timer_p = fallback;</div><div class='add'>+		*has_p = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = nla_get_u32(attr);</div><div class='add'>+	timer = clock_t_to_jiffies(value);</div><div class='add'>+	if (timer == ~0UL) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Timer value too large");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*timer_p = timer;</div><div class='add'>+	*has_p = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_to_nh_config_grp_res(struct nlattr *res, struct nh_config *cfg,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_res_policy_new)] = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (res) {</div><div class='add'>+		err = nla_parse_nested(tb,</div><div class='add'>+				       ARRAY_SIZE(rtm_nh_res_policy_new) - 1,</div><div class='add'>+				       res, rtm_nh_res_policy_new, extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_RES_GROUP_BUCKETS]) {</div><div class='add'>+		cfg-&gt;nh_grp_res_num_buckets =</div><div class='add'>+			nla_get_u16(tb[NHA_RES_GROUP_BUCKETS]);</div><div class='add'>+		cfg-&gt;nh_grp_res_has_num_buckets = true;</div><div class='add'>+		if (!cfg-&gt;nh_grp_res_num_buckets) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Number of buckets needs to be non-0");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = rtm_nh_get_timer(tb[NHA_RES_GROUP_IDLE_TIMER],</div><div class='add'>+			       NH_RES_DEFAULT_IDLE_TIMER,</div><div class='add'>+			       &amp;cfg-&gt;nh_grp_res_idle_timer,</div><div class='add'>+			       &amp;cfg-&gt;nh_grp_res_has_idle_timer,</div><div class='add'>+			       extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return rtm_nh_get_timer(tb[NHA_RES_GROUP_UNBALANCED_TIMER],</div><div class='add'>+				NH_RES_DEFAULT_UNBALANCED_TIMER,</div><div class='add'>+				&amp;cfg-&gt;nh_grp_res_unbalanced_timer,</div><div class='add'>+				&amp;cfg-&gt;nh_grp_res_has_unbalanced_timer,</div><div class='add'>+				extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,</div><div class='add'>+			    struct nlmsghdr *nlh, struct nlattr **tb,</div><div class='add'>+			    struct nh_config *cfg,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nhmsg *nhm = nlmsg_data(nlh);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (nhm-&gt;resvd || nhm-&gt;nh_scope) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in ancillary header");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (nhm-&gt;nh_flags &amp; ~NEXTHOP_VALID_USER_FLAGS) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid nexthop flags in ancillary header");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (nhm-&gt;nh_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		break;</div><div class='add'>+	case AF_UNSPEC:</div><div class='add'>+		if (tb[NHA_GROUP])</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid address family");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(cfg, 0, sizeof(*cfg));</div><div class='add'>+	cfg-&gt;nlflags = nlh-&gt;nlmsg_flags;</div><div class='add'>+	cfg-&gt;nlinfo.portid = NETLINK_CB(skb).portid;</div><div class='add'>+	cfg-&gt;nlinfo.nlh = nlh;</div><div class='add'>+	cfg-&gt;nlinfo.nl_net = net;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;nh_family = nhm-&gt;nh_family;</div><div class='add'>+	cfg-&gt;nh_protocol = nhm-&gt;nh_protocol;</div><div class='add'>+	cfg-&gt;nh_flags = nhm-&gt;nh_flags;</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_ID])</div><div class='add'>+		cfg-&gt;nh_id = nla_get_u32(tb[NHA_ID]);</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_FDB]) {</div><div class='add'>+		if (tb[NHA_OIF] || tb[NHA_BLACKHOLE] ||</div><div class='add'>+		    tb[NHA_ENCAP]   || tb[NHA_ENCAP_TYPE]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Fdb attribute can not be used with encap, oif or blackhole");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (nhm-&gt;nh_flags) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported nexthop flags in ancillary header");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;nh_fdb = nla_get_flag(tb[NHA_FDB]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_GROUP]) {</div><div class='add'>+		if (nhm-&gt;nh_family != AF_UNSPEC) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid family for group");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;nh_grp = tb[NHA_GROUP];</div><div class='add'>+</div><div class='add'>+		cfg-&gt;nh_grp_type = NEXTHOP_GRP_TYPE_MPATH;</div><div class='add'>+		if (tb[NHA_GROUP_TYPE])</div><div class='add'>+			cfg-&gt;nh_grp_type = nla_get_u16(tb[NHA_GROUP_TYPE]);</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;nh_grp_type &gt; NEXTHOP_GRP_TYPE_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid group type");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = nh_check_attr_group(net, tb, ARRAY_SIZE(rtm_nh_policy_new),</div><div class='add'>+					  cfg-&gt;nh_grp_type, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;nh_grp_type == NEXTHOP_GRP_TYPE_RES)</div><div class='add'>+			err = rtm_to_nh_config_grp_res(tb[NHA_RES_GROUP],</div><div class='add'>+						       cfg, extack);</div><div class='add'>+</div><div class='add'>+		if (tb[NHA_HW_STATS_ENABLE])</div><div class='add'>+			cfg-&gt;nh_hw_stats = nla_get_u32(tb[NHA_HW_STATS_ENABLE]);</div><div class='add'>+</div><div class='add'>+		/* no other attributes should be set */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_BLACKHOLE]) {</div><div class='add'>+		if (tb[NHA_GATEWAY] || tb[NHA_OIF] ||</div><div class='add'>+		    tb[NHA_ENCAP]   || tb[NHA_ENCAP_TYPE] || tb[NHA_FDB]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Blackhole attribute can not be used with gateway, oif, encap or fdb");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfg-&gt;nh_blackhole = 1;</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;nh_fdb &amp;&amp; !tb[NHA_OIF]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device attribute required for non-blackhole and non-fdb nexthops");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (tb[NHA_GATEWAY]) {</div><div class='add'>+		struct nlattr *gwa = tb[NHA_GATEWAY];</div><div class='add'>+</div><div class='add'>+		switch (cfg-&gt;nh_family) {</div><div class='add'>+		case AF_INET:</div><div class='add'>+			if (nla_len(gwa) != sizeof(u32)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid gateway");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			cfg-&gt;gw.ipv4 = nla_get_be32(gwa);</div><div class='add'>+			break;</div><div class='add'>+		case AF_INET6:</div><div class='add'>+			if (nla_len(gwa) != sizeof(struct in6_addr)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid gateway");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			cfg-&gt;gw.ipv6 = nla_get_in6_addr(gwa);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Unknown address family for gateway");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* device only nexthop (no gateway) */</div><div class='add'>+		if (cfg-&gt;nh_flags &amp; RTNH_F_ONLINK) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "ONLINK flag can not be set for nexthop without a gateway");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_ENCAP]) {</div><div class='add'>+		cfg-&gt;nh_encap = tb[NHA_ENCAP];</div><div class='add'>+</div><div class='add'>+		if (!tb[NHA_ENCAP_TYPE]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "LWT encapsulation type is missing");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfg-&gt;nh_encap_type = nla_get_u16(tb[NHA_ENCAP_TYPE]);</div><div class='add'>+		err = lwtunnel_valid_encap_type(cfg-&gt;nh_encap_type, extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+	} else if (tb[NHA_ENCAP_TYPE]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "LWT encapsulation attribute is missing");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_HW_STATS_ENABLE]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot enable nexthop hardware statistics for non-group nexthops");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_to_nh_config_rtnl(struct net *net, struct nlattr **tb,</div><div class='add'>+				 struct nh_config *cfg,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (tb[NHA_GROUP])</div><div class='add'>+		return nh_check_attr_group_rtnl(net, tb, extack);</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_OIF]) {</div><div class='add'>+		cfg-&gt;nh_ifindex = nla_get_u32(tb[NHA_OIF]);</div><div class='add'>+		if (cfg-&gt;nh_ifindex)</div><div class='add'>+			cfg-&gt;dev = __dev_get_by_index(net, cfg-&gt;nh_ifindex);</div><div class='add'>+</div><div class='add'>+		if (!cfg-&gt;dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid device index");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(cfg-&gt;dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='add'>+			return -ENETDOWN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!netif_carrier_ok(cfg-&gt;dev)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Carrier for nexthop device is down");</div><div class='add'>+			return -ENETDOWN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_new_nexthop(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_new)];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct nh_config cfg;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_new) - 1,</div><div class='add'>+			  rtm_nh_policy_new, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = rtm_to_nh_config(net, skb, nlh, tb, &amp;cfg, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (cfg.nlflags &amp; NLM_F_REPLACE &amp;&amp; !cfg.nh_id) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Replace requires nexthop id");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	err = rtm_to_nh_config_rtnl(net, tb, &amp;cfg, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	nh = nexthop_add(net, &amp;cfg, extack);</div><div class='add'>+	if (IS_ERR(nh))</div><div class='add'>+		err = PTR_ERR(nh);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_get_del_req(const struct nlmsghdr *nlh,</div><div class='add'>+				struct nlattr **tb, u32 *id, u32 *op_flags,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nhmsg *nhm = nlmsg_data(nlh);</div><div class='add'>+</div><div class='add'>+	if (nhm-&gt;nh_protocol || nhm-&gt;resvd || nhm-&gt;nh_scope || nhm-&gt;nh_flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[NHA_ID]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop id is missing");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*id = nla_get_u32(tb[NHA_ID]);</div><div class='add'>+	if (!(*id)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid nexthop id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op_flags)</div><div class='add'>+		*op_flags = nla_get_u32_default(tb[NHA_OP_FLAGS], 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_del_nexthop(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_del)];</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct nl_info nlinfo = {</div><div class='add'>+		.nlh = nlh,</div><div class='add'>+		.nl_net = net,</div><div class='add'>+		.portid = NETLINK_CB(skb).portid,</div><div class='add'>+	};</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_del) - 1, rtm_nh_policy_del,</div><div class='add'>+			  extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_get_del_req(nlh, tb, &amp;id, NULL, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	nh = nexthop_find_by_id(net, id);</div><div class='add'>+	if (nh)</div><div class='add'>+		remove_nexthop(net, nh, &amp;nlinfo);</div><div class='add'>+	else</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_get_nexthop(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_get)];</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	u32 op_flags;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_get) - 1, rtm_nh_policy_get,</div><div class='add'>+			  extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_get_del_req(nlh, tb, &amp;id, &amp;op_flags, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = -ENOBUFS;</div><div class='add'>+	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	nh = nexthop_find_by_id(net, id);</div><div class='add'>+	if (!nh)</div><div class='add'>+		goto errout_free;</div><div class='add'>+</div><div class='add'>+	err = nh_fill_node(skb, nh, RTM_NEWNEXTHOP, NETLINK_CB(in_skb).portid,</div><div class='add'>+			   nlh-&gt;nlmsg_seq, 0, op_flags);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		goto errout_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+errout_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct nh_dump_filter {</div><div class='add'>+	u32 nh_id;</div><div class='add'>+	int dev_idx;</div><div class='add'>+	int master_idx;</div><div class='add'>+	bool group_filter;</div><div class='add'>+	bool fdb_filter;</div><div class='add'>+	u32 res_bucket_nh_id;</div><div class='add'>+	u32 op_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool nh_dump_filtered(struct nexthop *nh,</div><div class='add'>+			     struct nh_dump_filter *filter, u8 family)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *dev;</div><div class='add'>+	const struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;group_filter &amp;&amp; !nh-&gt;is_group)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!filter-&gt;dev_idx &amp;&amp; !filter-&gt;master_idx &amp;&amp; !family)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;is_group)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	nhi = rtnl_dereference(nh-&gt;nh_info);</div><div class='add'>+	if (family &amp;&amp; nhi-&gt;family != family)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	dev = nhi-&gt;fib_nhc.nhc_dev;</div><div class='add'>+	if (filter-&gt;dev_idx &amp;&amp; (!dev || dev-&gt;ifindex != filter-&gt;dev_idx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;master_idx) {</div><div class='add'>+		struct net_device *master;</div><div class='add'>+</div><div class='add'>+		if (!dev)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		master = netdev_master_upper_dev_get((struct net_device *)dev);</div><div class='add'>+		if (!master || master-&gt;ifindex != filter-&gt;master_idx)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __nh_valid_dump_req(const struct nlmsghdr *nlh, struct nlattr **tb,</div><div class='add'>+			       struct nh_dump_filter *filter,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nhmsg *nhm;</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_OIF]) {</div><div class='add'>+		idx = nla_get_u32(tb[NHA_OIF]);</div><div class='add'>+		if (idx &gt; INT_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid device index");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		filter-&gt;dev_idx = idx;</div><div class='add'>+	}</div><div class='add'>+	if (tb[NHA_MASTER]) {</div><div class='add'>+		idx = nla_get_u32(tb[NHA_MASTER]);</div><div class='add'>+		if (idx &gt; INT_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid master device index");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		filter-&gt;master_idx = idx;</div><div class='add'>+	}</div><div class='add'>+	filter-&gt;group_filter = nla_get_flag(tb[NHA_GROUPS]);</div><div class='add'>+	filter-&gt;fdb_filter = nla_get_flag(tb[NHA_FDB]);</div><div class='add'>+</div><div class='add'>+	nhm = nlmsg_data(nlh);</div><div class='add'>+	if (nhm-&gt;nh_protocol || nhm-&gt;resvd || nhm-&gt;nh_scope || nhm-&gt;nh_flags) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid values in header for nexthop dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_dump_req(const struct nlmsghdr *nlh,</div><div class='add'>+			     struct nh_dump_filter *filter,</div><div class='add'>+			     struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_dump)];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_dump) - 1,</div><div class='add'>+			  rtm_nh_policy_dump, cb-&gt;extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	filter-&gt;op_flags = nla_get_u32_default(tb[NHA_OP_FLAGS], 0);</div><div class='add'>+</div><div class='add'>+	return __nh_valid_dump_req(nlh, tb, filter, cb-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtm_dump_nh_ctx {</div><div class='add'>+	u32 idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtm_dump_nh_ctx *</div><div class='add'>+rtm_dump_nh_ctx(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rtm_dump_nh_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_dump_walk_nexthops(struct sk_buff *skb,</div><div class='add'>+				  struct netlink_callback *cb,</div><div class='add'>+				  struct rb_root *root,</div><div class='add'>+				  struct rtm_dump_nh_ctx *ctx,</div><div class='add'>+				  int (*nh_cb)(struct sk_buff *skb,</div><div class='add'>+					       struct netlink_callback *cb,</div><div class='add'>+					       struct nexthop *nh, void *data),</div><div class='add'>+				  void *data)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	int s_idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	s_idx = ctx-&gt;idx;</div><div class='add'>+</div><div class='add'>+	/* If this is not the first invocation, ctx-&gt;idx will contain the id of</div><div class='add'>+	 * the last nexthop we processed. Instead of starting from the very</div><div class='add'>+	 * first element of the red/black tree again and linearly skipping the</div><div class='add'>+	 * (potentially large) set of nodes with an id smaller than s_idx, walk</div><div class='add'>+	 * the tree and find the left-most node whose id is &gt;= s_idx.  This</div><div class='add'>+	 * provides an efficient O(log n) starting point for the dump</div><div class='add'>+	 * continuation.</div><div class='add'>+	 */</div><div class='add'>+	if (s_idx != 0) {</div><div class='add'>+		struct rb_node *tmp = root-&gt;rb_node;</div><div class='add'>+</div><div class='add'>+		node = NULL;</div><div class='add'>+		while (tmp) {</div><div class='add'>+			struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+			nh = rb_entry(tmp, struct nexthop, rb_node);</div><div class='add'>+			if (nh-&gt;id &lt; s_idx) {</div><div class='add'>+				tmp = tmp-&gt;rb_right;</div><div class='add'>+			} else {</div><div class='add'>+				/* Track current candidate and keep looking on</div><div class='add'>+				 * the left side to find the left-most</div><div class='add'>+				 * (smallest id) that is still &gt;= s_idx.</div><div class='add'>+				 */</div><div class='add'>+				node = tmp;</div><div class='add'>+				tmp = tmp-&gt;rb_left;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		node = rb_first(root);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; node; node = rb_next(node)) {</div><div class='add'>+		struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+		nh = rb_entry(node, struct nexthop, rb_node);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;idx = nh-&gt;id;</div><div class='add'>+		err = nh_cb(skb, cb, nh, data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_dump_nexthop_cb(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+			       struct nexthop *nh, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nhmsg *nhm = nlmsg_data(cb-&gt;nlh);</div><div class='add'>+	struct nh_dump_filter *filter = data;</div><div class='add'>+</div><div class='add'>+	if (nh_dump_filtered(nh, filter, nhm-&gt;nh_family))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return nh_fill_node(skb, nh, RTM_NEWNEXTHOP,</div><div class='add'>+			    NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			    cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI, filter-&gt;op_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_dump_nexthop(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rtm_dump_nh_ctx *ctx = rtm_dump_nh_ctx(cb);</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct rb_root *root = &amp;net-&gt;nexthop.rb_root;</div><div class='add'>+	struct nh_dump_filter filter = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_dump_req(cb-&gt;nlh, &amp;filter, cb);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = rtm_dump_walk_nexthops(skb, cb, root, ctx,</div><div class='add'>+				     &amp;rtm_dump_nexthop_cb, &amp;filter);</div><div class='add'>+</div><div class='add'>+	cb-&gt;seq = net-&gt;nexthop.seq;</div><div class='add'>+	nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nexthop *</div><div class='add'>+nexthop_find_group_resilient(struct net *net, u32 id,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+	nh = nexthop_find_by_id(net, id);</div><div class='add'>+	if (!nh)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	if (!nh-&gt;is_group) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Not a nexthop group");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	if (!nhg-&gt;resilient) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop group not of type resilient");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_dump_nhid(struct nlattr *attr, u32 *nh_id_p,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	if (attr) {</div><div class='add'>+		idx = nla_get_u32(attr);</div><div class='add'>+		if (!idx) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Invalid nexthop id");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		*nh_id_p = idx;</div><div class='add'>+	} else {</div><div class='add'>+		*nh_id_p = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_dump_bucket_req(const struct nlmsghdr *nlh,</div><div class='add'>+				    struct nh_dump_filter *filter,</div><div class='add'>+				    struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *res_tb[ARRAY_SIZE(rtm_nh_res_bucket_policy_dump)];</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_dump_bucket)];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_dump_bucket) - 1,</div><div class='add'>+			  rtm_nh_policy_dump_bucket, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_dump_nhid(tb[NHA_ID], &amp;filter-&gt;nh_id, cb-&gt;extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[NHA_RES_BUCKET]) {</div><div class='add'>+		size_t max = ARRAY_SIZE(rtm_nh_res_bucket_policy_dump) - 1;</div><div class='add'>+</div><div class='add'>+		err = nla_parse_nested(res_tb, max,</div><div class='add'>+				       tb[NHA_RES_BUCKET],</div><div class='add'>+				       rtm_nh_res_bucket_policy_dump,</div><div class='add'>+				       cb-&gt;extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = nh_valid_dump_nhid(res_tb[NHA_RES_BUCKET_NH_ID],</div><div class='add'>+					 &amp;filter-&gt;res_bucket_nh_id,</div><div class='add'>+					 cb-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __nh_valid_dump_req(nlh, tb, filter, cb-&gt;extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtm_dump_res_bucket_ctx {</div><div class='add'>+	struct rtm_dump_nh_ctx nh;</div><div class='add'>+	u16 bucket_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtm_dump_res_bucket_ctx *</div><div class='add'>+rtm_dump_res_bucket_ctx(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rtm_dump_res_bucket_ctx *ctx = (void *)cb-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*ctx) &gt; sizeof(cb-&gt;ctx));</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtm_dump_nexthop_bucket_data {</div><div class='add'>+	struct rtm_dump_res_bucket_ctx *ctx;</div><div class='add'>+	struct nh_dump_filter filter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtm_dump_nexthop_bucket_nh(struct sk_buff *skb,</div><div class='add'>+				      struct netlink_callback *cb,</div><div class='add'>+				      struct nexthop *nh,</div><div class='add'>+				      struct rtm_dump_nexthop_bucket_data *dd)</div><div class='add'>+{</div><div class='add'>+	u32 portid = NETLINK_CB(cb-&gt;skb).portid;</div><div class='add'>+	struct nhmsg *nhm = nlmsg_data(cb-&gt;nlh);</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	u16 bucket_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+	for (bucket_index = dd-&gt;ctx-&gt;bucket_index;</div><div class='add'>+	     bucket_index &lt; res_table-&gt;num_nh_buckets;</div><div class='add'>+	     bucket_index++) {</div><div class='add'>+		struct nh_res_bucket *bucket;</div><div class='add'>+		struct nh_grp_entry *nhge;</div><div class='add'>+</div><div class='add'>+		bucket = &amp;res_table-&gt;nh_buckets[bucket_index];</div><div class='add'>+		nhge = rtnl_dereference(bucket-&gt;nh_entry);</div><div class='add'>+		if (nh_dump_filtered(nhge-&gt;nh, &amp;dd-&gt;filter, nhm-&gt;nh_family))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (dd-&gt;filter.res_bucket_nh_id &amp;&amp;</div><div class='add'>+		    dd-&gt;filter.res_bucket_nh_id != nhge-&gt;nh-&gt;id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dd-&gt;ctx-&gt;bucket_index = bucket_index;</div><div class='add'>+		err = nh_fill_res_bucket(skb, nh, bucket, bucket_index,</div><div class='add'>+					 RTM_NEWNEXTHOPBUCKET, portid,</div><div class='add'>+					 cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='add'>+					 cb-&gt;extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd-&gt;ctx-&gt;bucket_index = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtm_dump_nexthop_bucket_cb(struct sk_buff *skb,</div><div class='add'>+				      struct netlink_callback *cb,</div><div class='add'>+				      struct nexthop *nh, void *data)</div><div class='add'>+{</div><div class='add'>+	struct rtm_dump_nexthop_bucket_data *dd = data;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+	if (!nh-&gt;is_group)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	if (!nhg-&gt;resilient)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return rtm_dump_nexthop_bucket_nh(skb, cb, nh, dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_dump_nexthop_bucket(struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rtm_dump_res_bucket_ctx *ctx = rtm_dump_res_bucket_ctx(cb);</div><div class='add'>+	struct rtm_dump_nexthop_bucket_data dd = { .ctx = ctx };</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_dump_bucket_req(cb-&gt;nlh, &amp;dd.filter, cb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (dd.filter.nh_id) {</div><div class='add'>+		nh = nexthop_find_group_resilient(net, dd.filter.nh_id,</div><div class='add'>+						  cb-&gt;extack);</div><div class='add'>+		if (IS_ERR(nh))</div><div class='add'>+			return PTR_ERR(nh);</div><div class='add'>+		err = rtm_dump_nexthop_bucket_nh(skb, cb, nh, &amp;dd);</div><div class='add'>+	} else {</div><div class='add'>+		struct rb_root *root = &amp;net-&gt;nexthop.rb_root;</div><div class='add'>+</div><div class='add'>+		err = rtm_dump_walk_nexthops(skb, cb, root, &amp;ctx-&gt;nh,</div><div class='add'>+					     &amp;rtm_dump_nexthop_bucket_cb, &amp;dd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cb-&gt;seq = net-&gt;nexthop.seq;</div><div class='add'>+	nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_get_bucket_req_res_bucket(struct nlattr *res,</div><div class='add'>+					      u16 *bucket_index,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_res_bucket_policy_get)];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, ARRAY_SIZE(rtm_nh_res_bucket_policy_get) - 1,</div><div class='add'>+			       res, rtm_nh_res_bucket_policy_get, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[NHA_RES_BUCKET_INDEX]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Bucket index is missing");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*bucket_index = nla_get_u16(tb[NHA_RES_BUCKET_INDEX]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nh_valid_get_bucket_req(const struct nlmsghdr *nlh,</div><div class='add'>+				   u32 *id, u16 *bucket_index,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_get_bucket)];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(struct nhmsg), tb,</div><div class='add'>+			  ARRAY_SIZE(rtm_nh_policy_get_bucket) - 1,</div><div class='add'>+			  rtm_nh_policy_get_bucket, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_get_del_req(nlh, tb, id, NULL, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[NHA_RES_BUCKET]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Bucket information is missing");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nh_valid_get_bucket_req_res_bucket(tb[NHA_RES_BUCKET],</div><div class='add'>+						 bucket_index, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int rtm_get_nexthop_bucket(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	struct nexthop *nh;</div><div class='add'>+	u16 bucket_index;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	err = nh_valid_get_bucket_req(nlh, &amp;id, &amp;bucket_index, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nh = nexthop_find_group_resilient(net, id, extack);</div><div class='add'>+	if (IS_ERR(nh))</div><div class='add'>+		return PTR_ERR(nh);</div><div class='add'>+</div><div class='add'>+	nhg = rtnl_dereference(nh-&gt;nh_grp);</div><div class='add'>+	res_table = rtnl_dereference(nhg-&gt;res_table);</div><div class='add'>+	if (bucket_index &gt;= res_table-&gt;num_nh_buckets) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Bucket index out of bounds");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	err = nh_fill_res_bucket(skb, nh, &amp;res_table-&gt;nh_buckets[bucket_index],</div><div class='add'>+				 bucket_index, RTM_NEWNEXTHOPBUCKET,</div><div class='add'>+				 NETLINK_CB(in_skb).portid, nlh-&gt;nlmsg_seq,</div><div class='add'>+				 0, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		goto errout_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='add'>+</div><div class='add'>+errout_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nexthop_sync_mtu(struct net_device *dev, u32 orig_mtu)</div><div class='add'>+{</div><div class='add'>+	unsigned int hash = nh_dev_hashfn(dev-&gt;ifindex);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct hlist_head *head = &amp;net-&gt;nexthop.devhash[hash];</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+	struct nh_info *nhi;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(nhi, n, head, dev_hash) {</div><div class='add'>+		if (nhi-&gt;fib_nhc.nhc_dev == dev) {</div><div class='add'>+			if (nhi-&gt;family == AF_INET)</div><div class='add'>+				fib_nhc_update_mtu(&amp;nhi-&gt;fib_nhc, dev-&gt;mtu,</div><div class='add'>+						   orig_mtu);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl */</div><div class='add'>+static int nh_netdev_event(struct notifier_block *this,</div><div class='add'>+			   unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct netdev_notifier_info_ext *info_ext;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		nexthop_flush_dev(dev, event);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+		if (!(netif_get_flags(dev) &amp; (IFF_RUNNING | IFF_LOWER_UP)))</div><div class='add'>+			nexthop_flush_dev(dev, event);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGEMTU:</div><div class='add'>+		info_ext = ptr;</div><div class='add'>+		nexthop_sync_mtu(dev, info_ext-&gt;ext.mtu);</div><div class='add'>+		rt_cache_flush(dev_net(dev));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block nh_netdev_notifier = {</div><div class='add'>+	.notifier_call = nh_netdev_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nexthops_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			 enum nexthop_event_type event_type,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rb_root *root = &amp;net-&gt;nexthop.rb_root;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	for (node = rb_first(root); node; node = rb_next(node)) {</div><div class='add'>+		struct nexthop *nh;</div><div class='add'>+</div><div class='add'>+		nh = rb_entry(node, struct nexthop, rb_node);</div><div class='add'>+		err = call_nexthop_notifier(nb, net, event_type, nh, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int register_nexthop_notifier(struct net *net, struct notifier_block *nb,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = nexthops_dump(net, nb, NEXTHOP_EVENT_REPLACE, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+	err = blocking_notifier_chain_register(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+					       nb);</div><div class='add'>+unlock:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(register_nexthop_notifier);</div><div class='add'>+</div><div class='add'>+int __unregister_nexthop_notifier(struct net *net, struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = blocking_notifier_chain_unregister(&amp;net-&gt;nexthop.notifier_chain,</div><div class='add'>+						 nb);</div><div class='add'>+	if (!err)</div><div class='add'>+		nexthops_dump(net, nb, NEXTHOP_EVENT_DEL, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__unregister_nexthop_notifier);</div><div class='add'>+</div><div class='add'>+int unregister_nexthop_notifier(struct net *net, struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = __unregister_nexthop_notifier(net, nb);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(unregister_nexthop_notifier);</div><div class='add'>+</div><div class='add'>+void nexthop_set_hw_flags(struct net *net, u32 id, bool offload, bool trap)</div><div class='add'>+{</div><div class='add'>+	struct nexthop *nexthop;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	nexthop = nexthop_find_by_id(net, id);</div><div class='add'>+	if (!nexthop)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	nexthop-&gt;nh_flags &amp;= ~(RTNH_F_OFFLOAD | RTNH_F_TRAP);</div><div class='add'>+	if (offload)</div><div class='add'>+		nexthop-&gt;nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+	if (trap)</div><div class='add'>+		nexthop-&gt;nh_flags |= RTNH_F_TRAP;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(nexthop_set_hw_flags);</div><div class='add'>+</div><div class='add'>+void nexthop_bucket_set_hw_flags(struct net *net, u32 id, u16 bucket_index,</div><div class='add'>+				 bool offload, bool trap)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	struct nh_res_bucket *bucket;</div><div class='add'>+	struct nexthop *nexthop;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	nexthop = nexthop_find_by_id(net, id);</div><div class='add'>+	if (!nexthop || !nexthop-&gt;is_group)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	nhg = rcu_dereference(nexthop-&gt;nh_grp);</div><div class='add'>+	if (!nhg-&gt;resilient)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (bucket_index &gt;= nhg-&gt;res_table-&gt;num_nh_buckets)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	res_table = rcu_dereference(nhg-&gt;res_table);</div><div class='add'>+	bucket = &amp;res_table-&gt;nh_buckets[bucket_index];</div><div class='add'>+	bucket-&gt;nh_flags &amp;= ~(RTNH_F_OFFLOAD | RTNH_F_TRAP);</div><div class='add'>+	if (offload)</div><div class='add'>+		bucket-&gt;nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+	if (trap)</div><div class='add'>+		bucket-&gt;nh_flags |= RTNH_F_TRAP;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(nexthop_bucket_set_hw_flags);</div><div class='add'>+</div><div class='add'>+void nexthop_res_grp_activity_update(struct net *net, u32 id, u16 num_buckets,</div><div class='add'>+				     unsigned long *activity)</div><div class='add'>+{</div><div class='add'>+	struct nh_res_table *res_table;</div><div class='add'>+	struct nexthop *nexthop;</div><div class='add'>+	struct nh_group *nhg;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	nexthop = nexthop_find_by_id(net, id);</div><div class='add'>+	if (!nexthop || !nexthop-&gt;is_group)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	nhg = rcu_dereference(nexthop-&gt;nh_grp);</div><div class='add'>+	if (!nhg-&gt;resilient)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Instead of silently ignoring some buckets, demand that the sizes</div><div class='add'>+	 * be the same.</div><div class='add'>+	 */</div><div class='add'>+	res_table = rcu_dereference(nhg-&gt;res_table);</div><div class='add'>+	if (num_buckets != res_table-&gt;num_nh_buckets)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_buckets; i++) {</div><div class='add'>+		if (test_bit(i, activity))</div><div class='add'>+			nh_res_bucket_set_busy(&amp;res_table-&gt;nh_buckets[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(nexthop_res_grp_activity_update);</div><div class='add'>+</div><div class='add'>+static void __net_exit nexthop_net_exit_rtnl(struct net *net,</div><div class='add'>+					     struct list_head *dev_to_kill)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='add'>+	flush_all_nexthops(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit nexthop_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	kfree(net-&gt;nexthop.devhash);</div><div class='add'>+	net-&gt;nexthop.devhash = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init nexthop_net_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	size_t sz = sizeof(struct hlist_head) * NH_DEV_HASHSIZE;</div><div class='add'>+</div><div class='add'>+	net-&gt;nexthop.rb_root = RB_ROOT;</div><div class='add'>+	net-&gt;nexthop.devhash = kzalloc(sz, GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;nexthop.devhash)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	BLOCKING_INIT_NOTIFIER_HEAD(&amp;net-&gt;nexthop.notifier_chain);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations nexthop_net_ops = {</div><div class='add'>+	.init = nexthop_net_init,</div><div class='add'>+	.exit = nexthop_net_exit,</div><div class='add'>+	.exit_rtnl = nexthop_net_exit_rtnl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler nexthop_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.msgtype = RTM_NEWNEXTHOP, .doit = rtm_new_nexthop,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.msgtype = RTM_DELNEXTHOP, .doit = rtm_del_nexthop,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.msgtype = RTM_GETNEXTHOP, .doit = rtm_get_nexthop,</div><div class='add'>+	 .dumpit = rtm_dump_nexthop},</div><div class='add'>+	{.msgtype = RTM_GETNEXTHOPBUCKET, .doit = rtm_get_nexthop_bucket,</div><div class='add'>+	 .dumpit = rtm_dump_nexthop_bucket},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_NEWNEXTHOP,</div><div class='add'>+	 .doit = rtm_new_nexthop, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_GETNEXTHOP,</div><div class='add'>+	 .dumpit = rtm_dump_nexthop},</div><div class='add'>+	{.protocol = PF_INET6, .msgtype = RTM_NEWNEXTHOP,</div><div class='add'>+	 .doit = rtm_new_nexthop, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.protocol = PF_INET6, .msgtype = RTM_GETNEXTHOP,</div><div class='add'>+	 .dumpit = rtm_dump_nexthop},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init nexthop_init(void)</div><div class='add'>+{</div><div class='add'>+	register_pernet_subsys(&amp;nexthop_net_ops);</div><div class='add'>+</div><div class='add'>+	register_netdevice_notifier(&amp;nh_netdev_notifier);</div><div class='add'>+</div><div class='add'>+	rtnl_register_many(nexthop_rtnl_msg_handlers);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(nexthop_init);</div><div class='head'>diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c<br/>index 8d7aaf118a30..ad56588107cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/ping.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/ping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/ping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/ping.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *		"Ping" sockets</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Based on ipv4/udp.c code.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Vasiliy Kulikov / Openwall (for Linux 2.6),</div><div class='hunk'>@@ -17,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Pavel gave all rights to bugs to Vasiliy,</div><div class='ctx'>  * none of the bugs are Pavel's now.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -38,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/ping.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='hunk'>@@ -54,15 +50,13 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct ping_table {</div><div class='del'>-	struct hlist_nulls_head	hash[PING_HTABLE_SIZE];</div><div class='del'>-	rwlock_t		lock;</div><div class='add'>+	struct hlist_head	hash[PING_HTABLE_SIZE];</div><div class='add'>+	spinlock_t		lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ping_table ping_table;</div><div class='ctx'> struct pingv6_ops pingv6_ops;</div><div class='del'>-EXPORT_SYMBOL_GPL(pingv6_ops);</div><div class='del'>-</div><div class='del'>-static u16 ping_port_rover;</div><div class='add'>+EXPORT_IPV6_MOD_GPL(pingv6_ops);</div><div class='ctx'> </div><div class='ctx'> static inline u32 ping_hashfn(const struct net *net, u32 num, u32 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -71,33 +65,33 @@ static inline u32 ping_hashfn(const struct net *net, u32 num, u32 mask)</div><div class='ctx'> 	pr_debug("hash(%u) = %u\n", num, res);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_hash);</div><div class='ctx'> </div><div class='del'>-static inline struct hlist_nulls_head *ping_hashslot(struct ping_table *table,</div><div class='del'>-					     struct net *net, unsigned int num)</div><div class='add'>+static inline struct hlist_head *ping_hashslot(struct ping_table *table,</div><div class='add'>+					       struct net *net, unsigned int num)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;table-&gt;hash[ping_hashfn(net, num, PING_HTABLE_MASK)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ping_get_port(struct sock *sk, unsigned short ident)</div><div class='ctx'> {</div><div class='del'>-	struct hlist_nulls_node *node;</div><div class='del'>-	struct hlist_nulls_head *hlist;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct inet_sock *isk, *isk2;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> 	struct sock *sk2 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	isk = inet_sk(sk);</div><div class='del'>-	write_lock_bh(&amp;ping_table.lock);</div><div class='add'>+	spin_lock(&amp;ping_table.lock);</div><div class='ctx'> 	if (ident == 0) {</div><div class='add'>+		u16 result = net-&gt;ipv4.ping_port_rover + 1;</div><div class='ctx'> 		u32 i;</div><div class='del'>-		u16 result = ping_port_rover + 1;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; (1L &lt;&lt; 16); i++, result++) {</div><div class='ctx'> 			if (!result)</div><div class='del'>-				result++; /* avoid zero */</div><div class='del'>-			hlist = ping_hashslot(&amp;ping_table, sock_net(sk),</div><div class='del'>-					    result);</div><div class='del'>-			ping_portaddr_for_each_entry(sk2, node, hlist) {</div><div class='add'>+				continue; /* avoid zero */</div><div class='add'>+			hlist = ping_hashslot(&amp;ping_table, net, result);</div><div class='add'>+			sk_for_each(sk2, hlist) {</div><div class='add'>+				if (!net_eq(sock_net(sk2), net))</div><div class='add'>+					continue;</div><div class='ctx'> 				isk2 = inet_sk(sk2);</div><div class='ctx'> </div><div class='ctx'> 				if (isk2-&gt;inet_num == result)</div><div class='hunk'>@@ -105,7 +99,7 @@ int ping_get_port(struct sock *sk, unsigned short ident)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* found */</div><div class='del'>-			ping_port_rover = ident = result;</div><div class='add'>+			net-&gt;ipv4.ping_port_rover = ident = result;</div><div class='ctx'> 			break;</div><div class='ctx'> next_port:</div><div class='ctx'> 			;</div><div class='hunk'>@@ -113,8 +107,10 @@ next_port:</div><div class='ctx'> 		if (i &gt;= (1L &lt;&lt; 16))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	} else {</div><div class='del'>-		hlist = ping_hashslot(&amp;ping_table, sock_net(sk), ident);</div><div class='del'>-		ping_portaddr_for_each_entry(sk2, node, hlist) {</div><div class='add'>+		hlist = ping_hashslot(&amp;ping_table, net, ident);</div><div class='add'>+		sk_for_each(sk2, hlist) {</div><div class='add'>+			if (!net_eq(sock_net(sk2), net))</div><div class='add'>+				continue;</div><div class='ctx'> 			isk2 = inet_sk(sk2);</div><div class='ctx'> </div><div class='ctx'> 			/* BUG? Why is this reuse and not reuseaddr? ping.c</div><div class='hunk'>@@ -132,66 +128,61 @@ next_port:</div><div class='ctx'> 	isk-&gt;inet_num = ident;</div><div class='ctx'> 	if (sk_unhashed(sk)) {</div><div class='ctx'> 		pr_debug("was not hashed\n");</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-		hlist_nulls_add_head(&amp;sk-&gt;sk_nulls_node, hlist);</div><div class='del'>-		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='add'>+		sk_add_node_rcu(sk, hlist);</div><div class='add'>+		sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+		sock_prot_inuse_add(net, sk-&gt;sk_prot, 1);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;ping_table.lock);</div><div class='add'>+	spin_unlock(&amp;ping_table.lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	write_unlock_bh(&amp;ping_table.lock);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_get_port);</div><div class='del'>-</div><div class='del'>-int ping_hash(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	pr_debug("ping_hash(sk-&gt;port=%u)\n", inet_sk(sk)-&gt;inet_num);</div><div class='del'>-	BUG(); /* "Please do not press this button again." */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	spin_unlock(&amp;ping_table.lock);</div><div class='add'>+	return -EADDRINUSE;</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_get_port);</div><div class='ctx'> </div><div class='ctx'> void ping_unhash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *isk = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("ping_unhash(isk=%p,isk-&gt;num=%u)\n", isk, isk-&gt;inet_num);</div><div class='del'>-	write_lock_bh(&amp;ping_table.lock);</div><div class='del'>-	if (sk_hashed(sk)) {</div><div class='del'>-		hlist_nulls_del(&amp;sk-&gt;sk_nulls_node);</div><div class='del'>-		sk_nulls_node_init(&amp;sk-&gt;sk_nulls_node);</div><div class='del'>-		sock_put(sk);</div><div class='add'>+	spin_lock(&amp;ping_table.lock);</div><div class='add'>+	if (sk_del_node_init_rcu(sk)) {</div><div class='ctx'> 		isk-&gt;inet_num = 0;</div><div class='ctx'> 		isk-&gt;inet_sport = 0;</div><div class='ctx'> 		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;ping_table.lock);</div><div class='add'>+	spin_unlock(&amp;ping_table.lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_unhash);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_unhash);</div><div class='ctx'> </div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='ctx'> static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)</div><div class='ctx'> {</div><div class='del'>-	struct hlist_nulls_head *hslot = ping_hashslot(&amp;ping_table, net, ident);</div><div class='add'>+	struct hlist_head *hslot = ping_hashslot(&amp;ping_table, net, ident);</div><div class='ctx'> 	struct sock *sk = NULL;</div><div class='ctx'> 	struct inet_sock *isk;</div><div class='del'>-	struct hlist_nulls_node *hnode;</div><div class='del'>-	int dif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	int dif, sdif;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		dif = inet_iif(skb);</div><div class='add'>+		sdif = inet_sdif(skb);</div><div class='ctx'> 		pr_debug("try to find: num = %d, daddr = %pI4, dif = %d\n",</div><div class='ctx'> 			 (int)ident, &amp;ip_hdr(skb)-&gt;daddr, dif);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		dif = inet6_iif(skb);</div><div class='add'>+		sdif = inet6_sdif(skb);</div><div class='ctx'> 		pr_debug("try to find: num = %d, daddr = %pI6c, dif = %d\n",</div><div class='ctx'> 			 (int)ident, &amp;ipv6_hdr(skb)-&gt;daddr, dif);</div><div class='ctx'> #endif</div><div class='add'>+	} else {</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;ping_table.lock);</div><div class='del'>-</div><div class='del'>-	ping_portaddr_for_each_entry(sk, hnode, hslot) {</div><div class='add'>+	sk_for_each_rcu(sk, hslot) {</div><div class='add'>+		if (!net_eq(sock_net(sk), net))</div><div class='add'>+			continue;</div><div class='ctx'> 		isk = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("iterate\n");</div><div class='hunk'>@@ -225,16 +216,15 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sk-&gt;sk_bound_dev_if &amp;&amp; sk-&gt;sk_bound_dev_if != dif)</div><div class='add'>+		if (sk-&gt;sk_bound_dev_if &amp;&amp; sk-&gt;sk_bound_dev_if != dif &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_bound_dev_if != sdif)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sock_hold(sk);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk = NULL;</div><div class='ctx'> exit:</div><div class='del'>-	read_unlock_bh(&amp;ping_table.lock);</div><div class='ctx'> </div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='hunk'>@@ -284,7 +274,7 @@ out_release_group:</div><div class='ctx'> 	put_group_info(group_info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_init_sock);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_init_sock);</div><div class='ctx'> </div><div class='ctx'> void ping_close(struct sock *sk, long timeout)</div><div class='ctx'> {</div><div class='hunk'>@@ -294,14 +284,29 @@ void ping_close(struct sock *sk, long timeout)</div><div class='ctx'> </div><div class='ctx'> 	sk_common_release(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_close);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_close);</div><div class='add'>+</div><div class='add'>+static int ping_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			    int addr_len)</div><div class='add'>+{</div><div class='add'>+	/* This check is replicated from __ip4_datagram_connect() and</div><div class='add'>+	 * intended to prevent BPF program called below from accessing bytes</div><div class='add'>+	 * that are out of the bound specified by user in addr_len.</div><div class='add'>+	 */</div><div class='add'>+	if (addr_len &lt; sizeof(struct sockaddr_in))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK(sk, uaddr, &amp;addr_len);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Checks the bind address and possibly modifies sk-&gt;sk_bound_dev_if. */</div><div class='ctx'> static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,</div><div class='del'>-				struct sockaddr *uaddr, int addr_len) {</div><div class='add'>+				struct sockaddr_unsized *uaddr, int addr_len)</div><div class='add'>+{</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	if (sk-&gt;sk_family == AF_INET) {</div><div class='ctx'> 		struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;</div><div class='add'>+		u32 tb_id = RT_TABLE_LOCAL;</div><div class='ctx'> 		int chk_addr_ret;</div><div class='ctx'> </div><div class='ctx'> 		if (addr_len &lt; sizeof(*addr))</div><div class='hunk'>@@ -315,15 +320,16 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,</div><div class='ctx'> 		pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n",</div><div class='ctx'> 			 sk, &amp;addr-&gt;sin_addr.s_addr, ntohs(addr-&gt;sin_port));</div><div class='ctx'> </div><div class='del'>-		chk_addr_ret = inet_addr_type(net, addr-&gt;sin_addr.s_addr);</div><div class='del'>-</div><div class='ctx'> 		if (addr-&gt;sin_addr.s_addr == htonl(INADDR_ANY))</div><div class='del'>-			chk_addr_ret = RTN_LOCAL;</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-		if ((!inet_can_nonlocal_bind(net, isk) &amp;&amp;</div><div class='del'>-		     chk_addr_ret != RTN_LOCAL) ||</div><div class='del'>-		    chk_addr_ret == RTN_MULTICAST ||</div><div class='del'>-		    chk_addr_ret == RTN_BROADCAST)</div><div class='add'>+		tb_id = l3mdev_fib_table_by_index(net, sk-&gt;sk_bound_dev_if) ? : tb_id;</div><div class='add'>+		chk_addr_ret = inet_addr_type_table(net, addr-&gt;sin_addr.s_addr, tb_id);</div><div class='add'>+</div><div class='add'>+		if (chk_addr_ret == RTN_MULTICAST ||</div><div class='add'>+		    chk_addr_ret == RTN_BROADCAST ||</div><div class='add'>+		    (chk_addr_ret != RTN_LOCAL &amp;&amp;</div><div class='add'>+		     !inet_can_nonlocal_bind(net, isk)))</div><div class='ctx'> 			return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='hunk'>@@ -356,6 +362,14 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,</div><div class='ctx'> 				return -ENODEV;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!dev &amp;&amp; sk-&gt;sk_bound_dev_if) {</div><div class='add'>+			dev = dev_get_by_index_rcu(net, sk-&gt;sk_bound_dev_if);</div><div class='add'>+			if (!dev) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		has_addr = pingv6_ops.ipv6_chk_addr(net, &amp;addr-&gt;sin6_addr, dev,</div><div class='ctx'> 						    scoped);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -373,7 +387,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)</div><div class='add'>+static void ping_set_saddr(struct sock *sk, struct sockaddr_unsized *saddr)</div><div class='ctx'> {</div><div class='ctx'> 	if (saddr-&gt;sa_family == AF_INET) {</div><div class='ctx'> 		struct inet_sock *isk = inet_sk(sk);</div><div class='hunk'>@@ -388,26 +402,12 @@ static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ping_clear_saddr(struct sock *sk, int dif)</div><div class='del'>-{</div><div class='del'>-	sk-&gt;sk_bound_dev_if = dif;</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET) {</div><div class='del'>-		struct inet_sock *isk = inet_sk(sk);</div><div class='del'>-		isk-&gt;inet_rcv_saddr = isk-&gt;inet_saddr = 0;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	} else if (sk-&gt;sk_family == AF_INET6) {</div><div class='del'>-		struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-		memset(&amp;sk-&gt;sk_v6_rcv_saddr, 0, sizeof(sk-&gt;sk_v6_rcv_saddr));</div><div class='del'>-		memset(&amp;np-&gt;saddr, 0, sizeof(np-&gt;saddr));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> /*</div><div class='ctx'>  * We need our own bind because there are no privileged id's == local ports.</div><div class='ctx'>  * Moreover, we don't allow binding to multi- and broadcast addresses.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int ping_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *isk = inet_sk(sk);</div><div class='ctx'> 	unsigned short snum;</div><div class='hunk'>@@ -425,12 +425,13 @@ int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -EADDRINUSE;</div><div class='del'>-	ping_set_saddr(sk, uaddr);</div><div class='ctx'> 	snum = ntohs(((struct sockaddr_in *)uaddr)-&gt;sin_port);</div><div class='ctx'> 	if (ping_get_port(sk, snum) != 0) {</div><div class='del'>-		ping_clear_saddr(sk, dif);</div><div class='add'>+		/* Restore possibly modified sk-&gt;sk_bound_dev_if by ping_check_bind_addr(). */</div><div class='add'>+		sk-&gt;sk_bound_dev_if = dif;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	ping_set_saddr(sk, uaddr);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("after bind(): num = %hu, dif = %d\n",</div><div class='ctx'> 		 isk-&gt;inet_num,</div><div class='hunk'>@@ -461,7 +462,7 @@ out:</div><div class='ctx'> 	pr_debug("ping_v4_bind -&gt; %d\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_bind);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_bind);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Is this a supported type of ICMP message?</div><div class='hunk'>@@ -470,7 +471,9 @@ EXPORT_SYMBOL_GPL(ping_bind);</div><div class='ctx'> static inline int ping_supported(int family, int type, int code)</div><div class='ctx'> {</div><div class='ctx'> 	return (family == AF_INET &amp;&amp; type == ICMP_ECHO &amp;&amp; code == 0) ||</div><div class='del'>-	       (family == AF_INET6 &amp;&amp; type == ICMPV6_ECHO_REQUEST &amp;&amp; code == 0);</div><div class='add'>+	       (family == AF_INET &amp;&amp; type == ICMP_EXT_ECHO &amp;&amp; code == 0) ||</div><div class='add'>+	       (family == AF_INET6 &amp;&amp; type == ICMPV6_ECHO_REQUEST &amp;&amp; code == 0) ||</div><div class='add'>+	       (family == AF_INET6 &amp;&amp; type == ICMPV6_EXT_ECHO_REQUEST &amp;&amp; code == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -543,7 +546,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)</div><div class='ctx'> 		case ICMP_DEST_UNREACH:</div><div class='ctx'> 			if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */</div><div class='ctx'> 				ipv4_sk_update_pmtu(skb, sk, info);</div><div class='del'>-				if (inet_sock-&gt;pmtudisc != IP_PMTUDISC_DONT) {</div><div class='add'>+				if (READ_ONCE(inet_sock-&gt;pmtudisc) != IP_PMTUDISC_DONT) {</div><div class='ctx'> 					err = EMSGSIZE;</div><div class='ctx'> 					harderr = 1;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -572,8 +575,8 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)</div><div class='ctx'> 	 *      RFC1122: OK.  Passes ICMP errors back to application, as per</div><div class='ctx'> 	 *	4.1.3.3.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((family == AF_INET &amp;&amp; !inet_sock-&gt;recverr) ||</div><div class='del'>-	    (family == AF_INET6 &amp;&amp; !inet6_sk(sk)-&gt;recverr)) {</div><div class='add'>+	if ((family == AF_INET &amp;&amp; !inet_test_bit(RECVERR, sk)) ||</div><div class='add'>+	    (family == AF_INET6 &amp;&amp; !inet6_test_bit(RECVERR6, sk))) {</div><div class='ctx'> 		if (!harderr || sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -588,11 +591,11 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	sk-&gt;sk_err = err;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> out:</div><div class='del'>-	sock_put(sk);</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_err);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_err);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Copy and checksum an ICMP Echo packet from user space into a buffer</div><div class='hunk'>@@ -602,23 +605,11 @@ EXPORT_SYMBOL_GPL(ping_err);</div><div class='ctx'> int ping_getfrag(void *from, char *to,</div><div class='ctx'> 		 int offset, int fraglen, int odd, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct pingfakehdr *pfh = (struct pingfakehdr *)from;</div><div class='del'>-</div><div class='del'>-	if (offset == 0) {</div><div class='del'>-		fraglen -= sizeof(struct icmphdr);</div><div class='del'>-		if (fraglen &lt; 0)</div><div class='del'>-			BUG();</div><div class='del'>-		if (!csum_and_copy_from_iter_full(to + sizeof(struct icmphdr),</div><div class='del'>-			    fraglen, &amp;pfh-&gt;wcheck,</div><div class='del'>-			    &amp;pfh-&gt;msg-&gt;msg_iter))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	} else if (offset &lt; sizeof(struct icmphdr)) {</div><div class='del'>-			BUG();</div><div class='del'>-	} else {</div><div class='del'>-		if (!csum_and_copy_from_iter_full(to, fraglen, &amp;pfh-&gt;wcheck,</div><div class='del'>-					    &amp;pfh-&gt;msg-&gt;msg_iter))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	struct pingfakehdr *pfh = from;</div><div class='add'>+</div><div class='add'>+	if (!csum_and_copy_from_iter_full(to, fraglen, &amp;pfh-&gt;wcheck,</div><div class='add'>+					  &amp;pfh-&gt;msg-&gt;msg_iter))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	/* For IPv6, checksum each skb as we go along, as expected by</div><div class='hunk'>@@ -626,7 +617,7 @@ int ping_getfrag(void *from, char *to,</div><div class='ctx'> 	 * wcheck, it will be finalized in ping_v4_push_pending_frames.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pfh-&gt;family == AF_INET6) {</div><div class='del'>-		skb-&gt;csum = pfh-&gt;wcheck;</div><div class='add'>+		skb-&gt;csum = csum_block_add(skb-&gt;csum, pfh-&gt;wcheck, odd);</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 		pfh-&gt;wcheck = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -634,7 +625,7 @@ int ping_getfrag(void *from, char *to,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_getfrag);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_getfrag);</div><div class='ctx'> </div><div class='ctx'> static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,</div><div class='ctx'> 				       struct flowi4 *fl4)</div><div class='hunk'>@@ -652,7 +643,8 @@ static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,</div><div class='del'>-			void *user_icmph, size_t icmph_len) {</div><div class='add'>+			void *user_icmph, size_t icmph_len)</div><div class='add'>+{</div><div class='ctx'> 	u8 type, code;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; 0xFFFF)</div><div class='hunk'>@@ -694,7 +686,7 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_common_sendmsg);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_common_sendmsg);</div><div class='ctx'> </div><div class='ctx'> static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -708,7 +700,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct ip_options_data opt_copy;</div><div class='ctx'> 	int free = 0;</div><div class='ctx'> 	__be32 saddr, daddr, faddr;</div><div class='del'>-	u8  tos;</div><div class='add'>+	u8 scope;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("ping_v4_sendmsg(sk=%p,sk-&gt;num=%u)\n", inet, inet-&gt;inet_num);</div><div class='hunk'>@@ -771,27 +763,25 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		}</div><div class='ctx'> 		faddr = ipc.opt-&gt;opt.faddr;</div><div class='ctx'> 	}</div><div class='del'>-	tos = get_rttos(&amp;ipc, inet);</div><div class='del'>-	if (sock_flag(sk, SOCK_LOCALROUTE) ||</div><div class='del'>-	    (msg-&gt;msg_flags &amp; MSG_DONTROUTE) ||</div><div class='del'>-	    (ipc.opt &amp;&amp; ipc.opt-&gt;opt.is_strictroute)) {</div><div class='del'>-		tos |= RTO_ONLINK;</div><div class='del'>-	}</div><div class='add'>+	scope = ip_sendmsg_scope(inet, &amp;ipc, msg);</div><div class='ctx'> </div><div class='ctx'> 	if (ipv4_is_multicast(daddr)) {</div><div class='del'>-		if (!ipc.oif)</div><div class='del'>-			ipc.oif = inet-&gt;mc_index;</div><div class='add'>+		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))</div><div class='add'>+			ipc.oif = READ_ONCE(inet-&gt;mc_index);</div><div class='ctx'> 		if (!saddr)</div><div class='del'>-			saddr = inet-&gt;mc_addr;</div><div class='add'>+			saddr = READ_ONCE(inet-&gt;mc_addr);</div><div class='ctx'> 	} else if (!ipc.oif)</div><div class='del'>-		ipc.oif = inet-&gt;uc_index;</div><div class='add'>+		ipc.oif = READ_ONCE(inet-&gt;uc_index);</div><div class='ctx'> </div><div class='del'>-	flowi4_init_output(&amp;fl4, ipc.oif, sk-&gt;sk_mark, tos,</div><div class='del'>-			   RT_SCOPE_UNIVERSE, sk-&gt;sk_protocol,</div><div class='del'>-			   inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,</div><div class='del'>-			   sk-&gt;sk_uid);</div><div class='add'>+	flowi4_init_output(&amp;fl4, ipc.oif, ipc.sockc.mark,</div><div class='add'>+			   ipc.tos &amp; INET_DSCP_MASK, scope,</div><div class='add'>+			   sk-&gt;sk_protocol, inet_sk_flowi_flags(sk), faddr,</div><div class='add'>+			   saddr, 0, 0, sk_uid(sk));</div><div class='ctx'> </div><div class='del'>-	security_sk_classify_flow(sk, flowi4_to_flowi(&amp;fl4));</div><div class='add'>+	fl4.fl4_icmp_type = user_icmph.type;</div><div class='add'>+	fl4.fl4_icmp_code = user_icmph.code;</div><div class='add'>+</div><div class='add'>+	security_sk_classify_flow(sk, flowi4_to_flowi_common(&amp;fl4));</div><div class='ctx'> 	rt = ip_route_output_flow(net, &amp;fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='ctx'> 		err = PTR_ERR(rt);</div><div class='hunk'>@@ -825,7 +815,8 @@ back_from_confirm:</div><div class='ctx'> 	pfh.family = AF_INET;</div><div class='ctx'> </div><div class='ctx'> 	err = ip_append_data(sk, &amp;fl4, ping_getfrag, &amp;pfh, len,</div><div class='del'>-			0, &amp;ipc, &amp;rt, msg-&gt;msg_flags);</div><div class='add'>+			     sizeof(struct icmphdr), &amp;ipc, &amp;rt,</div><div class='add'>+			     msg-&gt;msg_flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ip_flush_pending_frames(sk);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -852,8 +843,8 @@ do_confirm:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='del'>-		 int flags, int *addr_len)</div><div class='add'>+int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,</div><div class='add'>+		 int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *isk = inet_sk(sk);</div><div class='ctx'> 	int family = sk-&gt;sk_family;</div><div class='hunk'>@@ -869,7 +860,7 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='ctx'> 	if (flags &amp; MSG_ERRQUEUE)</div><div class='ctx'> 		return inet_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -898,12 +889,11 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='ctx'> 			*addr_len = sizeof(*sin);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (isk-&gt;cmsg_flags)</div><div class='add'>+		if (inet_cmsg_flags(isk))</div><div class='ctx'> 			ip_cmsg_recv(msg, skb);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	} else if (family == AF_INET6) {</div><div class='del'>-		struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 		struct ipv6hdr *ip6 = ipv6_hdr(skb);</div><div class='ctx'> 		DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg-&gt;msg_name);</div><div class='ctx'> </div><div class='hunk'>@@ -912,7 +902,7 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='ctx'> 			sin6-&gt;sin6_port = 0;</div><div class='ctx'> 			sin6-&gt;sin6_addr = ip6-&gt;saddr;</div><div class='ctx'> 			sin6-&gt;sin6_flowinfo = 0;</div><div class='del'>-			if (np-&gt;sndflow)</div><div class='add'>+			if (inet6_test_bit(SNDFLOW, sk))</div><div class='ctx'> 				sin6-&gt;sin6_flowinfo = ip6_flowinfo(ip6);</div><div class='ctx'> 			sin6-&gt;sin6_scope_id =</div><div class='ctx'> 				ipv6_iface_scope_id(&amp;sin6-&gt;sin6_addr,</div><div class='hunk'>@@ -925,7 +915,8 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='ctx'> 		    inet6_sk(sk)-&gt;rxopt.all)</div><div class='ctx'> 			pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);</div><div class='del'>-		else if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp; isk-&gt;cmsg_flags)</div><div class='add'>+		else if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+			 inet_cmsg_flags(isk))</div><div class='ctx'> 			ip_cmsg_recv(msg, skb);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -940,31 +931,39 @@ out:</div><div class='ctx'> 	pr_debug("ping_recvmsg -&gt; %d\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_recvmsg);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_recvmsg);</div><div class='ctx'> </div><div class='del'>-int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason __ping_queue_rcv_skb(struct sock *sk,</div><div class='add'>+						 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+</div><div class='ctx'> 	pr_debug("ping_queue_rcv_skb(sk=%p,sk-&gt;num=%d,skb=%p)\n",</div><div class='ctx'> 		 inet_sk(sk), inet_sk(sk)-&gt;inet_num, skb);</div><div class='del'>-	if (sock_queue_rcv_skb(sk, skb) &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	if (sock_queue_rcv_skb_reason(sk, skb, &amp;reason) &lt; 0) {</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 		pr_debug("ping_queue_rcv_skb -&gt; failed\n");</div><div class='del'>-		return -1;</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return __ping_queue_rcv_skb(sk, skb) ? -1 : 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_queue_rcv_skb);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_queue_rcv_skb);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	All we need to do is get the socket.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-bool ping_rcv(struct sk_buff *skb)</div><div class='add'>+enum skb_drop_reason ping_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct icmphdr *icmph = icmp_hdr(skb);</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	/* We assume the packet has already been checked by icmp_rcv */</div><div class='ctx'> </div><div class='hunk'>@@ -975,26 +974,20 @@ bool ping_rcv(struct sk_buff *skb)</div><div class='ctx'> 	skb_push(skb, skb-&gt;data - (u8 *)icmph);</div><div class='ctx'> </div><div class='ctx'> 	sk = ping_lookup(net, skb, ntohs(icmph-&gt;un.echo.id));</div><div class='del'>-	if (sk) {</div><div class='del'>-		struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		pr_debug("rcv on socket %p\n", sk);</div><div class='del'>-		if (skb2)</div><div class='del'>-			ping_queue_rcv_skb(sk, skb2);</div><div class='del'>-		sock_put(sk);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	pr_debug("no socket, dropping\n");</div><div class='add'>+	if (sk)</div><div class='add'>+		return __ping_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_NO_SOCKET);</div><div class='add'>+	return SKB_DROP_REASON_NO_SOCKET;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_rcv);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_rcv);</div><div class='ctx'> </div><div class='ctx'> struct proto ping_prot = {</div><div class='ctx'> 	.name =		"PING",</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.init =		ping_init_sock,</div><div class='ctx'> 	.close =	ping_close,</div><div class='add'>+	.pre_connect =	ping_pre_connect,</div><div class='ctx'> 	.connect =	ip4_datagram_connect,</div><div class='ctx'> 	.disconnect =	__udp_disconnect,</div><div class='ctx'> 	.setsockopt =	ip_setsockopt,</div><div class='hunk'>@@ -1004,12 +997,12 @@ struct proto ping_prot = {</div><div class='ctx'> 	.bind =		ping_bind,</div><div class='ctx'> 	.backlog_rcv =	ping_queue_rcv_skb,</div><div class='ctx'> 	.release_cb =	ip4_datagram_release_cb,</div><div class='del'>-	.hash =		ping_hash,</div><div class='ctx'> 	.unhash =	ping_unhash,</div><div class='ctx'> 	.get_port =	ping_get_port,</div><div class='add'>+	.put_port =	ping_unhash,</div><div class='ctx'> 	.obj_size =	sizeof(struct inet_sock),</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(ping_prot);</div><div class='add'>+EXPORT_IPV6_MOD(ping_prot);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='hunk'>@@ -1021,15 +1014,14 @@ static struct sock *ping_get_first(struct seq_file *seq, int start)</div><div class='ctx'> </div><div class='ctx'> 	for (state-&gt;bucket = start; state-&gt;bucket &lt; PING_HTABLE_SIZE;</div><div class='ctx'> 	     ++state-&gt;bucket) {</div><div class='del'>-		struct hlist_nulls_node *node;</div><div class='del'>-		struct hlist_nulls_head *hslot;</div><div class='add'>+		struct hlist_head *hslot;</div><div class='ctx'> </div><div class='ctx'> 		hslot = &amp;ping_table.hash[state-&gt;bucket];</div><div class='ctx'> </div><div class='del'>-		if (hlist_nulls_empty(hslot))</div><div class='add'>+		if (hlist_empty(hslot))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sk_nulls_for_each(sk, node, hslot) {</div><div class='add'>+		sk_for_each(sk, hslot) {</div><div class='ctx'> 			if (net_eq(sock_net(sk), net) &amp;&amp;</div><div class='ctx'> 			    sk-&gt;sk_family == state-&gt;family)</div><div class='ctx'> 				goto found;</div><div class='hunk'>@@ -1046,7 +1038,7 @@ static struct sock *ping_get_next(struct seq_file *seq, struct sock *sk)</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		sk = sk_nulls_next(sk);</div><div class='add'>+		sk = sk_next(sk);</div><div class='ctx'> 	} while (sk &amp;&amp; (!net_eq(sock_net(sk), net)));</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='hunk'>@@ -1071,11 +1063,11 @@ void *ping_seq_start(struct seq_file *seq, loff_t *pos, sa_family_t family)</div><div class='ctx'> 	state-&gt;bucket = 0;</div><div class='ctx'> 	state-&gt;family = family;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;ping_table.lock);</div><div class='add'>+	spin_lock(&amp;ping_table.lock);</div><div class='ctx'> </div><div class='ctx'> 	return *pos ? ping_get_idx(seq, *pos-1) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_seq_start);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_seq_start);</div><div class='ctx'> </div><div class='ctx'> static void *ping_v4_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='hunk'>@@ -1094,14 +1086,14 @@ void *ping_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	++*pos;</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_seq_next);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_seq_next);</div><div class='ctx'> </div><div class='ctx'> void ping_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	__releases(ping_table.lock)</div><div class='ctx'> {</div><div class='del'>-	read_unlock_bh(&amp;ping_table.lock);</div><div class='add'>+	spin_unlock(&amp;ping_table.lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ping_seq_stop);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(ping_seq_stop);</div><div class='ctx'> </div><div class='ctx'> static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,</div><div class='ctx'> 		int bucket)</div><div class='hunk'>@@ -1113,15 +1105,15 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,</div><div class='ctx'> 	__u16 srcp = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%5d: %08X:%04X %08X:%04X"</div><div class='del'>-		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",</div><div class='add'>+		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u",</div><div class='ctx'> 		bucket, src, srcp, dest, destp, sp-&gt;sk_state,</div><div class='ctx'> 		sk_wmem_alloc_get(sp),</div><div class='ctx'> 		sk_rmem_alloc_get(sp),</div><div class='ctx'> 		0, 0L, 0,</div><div class='del'>-		from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),</div><div class='add'>+		from_kuid_munged(seq_user_ns(f), sk_uid(sp)),</div><div class='ctx'> 		0, sock_i_ino(sp),</div><div class='ctx'> 		refcount_read(&amp;sp-&gt;sk_refcnt), sp,</div><div class='del'>-		atomic_read(&amp;sp-&gt;sk_drops));</div><div class='add'>+		sk_drops_read(sp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ping_v4_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -1152,6 +1144,8 @@ static int __net_init ping_v4_proc_init_net(struct net *net)</div><div class='ctx'> 	if (!proc_create_net("icmp", 0444, net-&gt;proc_net, &amp;ping_v4_seq_ops,</div><div class='ctx'> 			sizeof(struct ping_iter_state)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	net-&gt;ipv4.ping_port_rover = get_random_u16();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1182,6 +1176,6 @@ void __init ping_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PING_HTABLE_SIZE; i++)</div><div class='del'>-		INIT_HLIST_NULLS_HEAD(&amp;ping_table.hash[i], i);</div><div class='del'>-	rwlock_init(&amp;ping_table.lock);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;ping_table.hash[i]);</div><div class='add'>+	spin_lock_init(&amp;ping_table.lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c<br/>index 70289682a670..974afc4ecbe2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/proc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -25,17 +26,14 @@</div><div class='ctx'>  *					split functions for more readibility.</div><div class='ctx'>  *	Andi Kleen		:	Add support for /proc/net/netstat</div><div class='ctx'>  *	Arnaldo C. Melo		:	Convert to seq_file</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udplite.h&gt;</div><div class='ctx'> #include &lt;linux/bottom_half.h&gt;</div><div class='hunk'>@@ -46,7 +44,7 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/raw.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TCPUDP_MIB_MAX max_t(u32, UDP_MIB_MAX, TCP_MIB_MAX)</div><div class='add'>+#define TCPUDP_MIB_MAX MAX_T(u32, UDP_MIB_MAX, TCP_MIB_MAX)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Report socket allocation statistics [mea@utu.fi]</div><div class='hunk'>@@ -56,14 +54,14 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	struct net *net = seq-&gt;private;</div><div class='ctx'> 	int orphans, sockets;</div><div class='ctx'> </div><div class='del'>-	orphans = percpu_counter_sum_positive(&amp;tcp_orphan_count);</div><div class='add'>+	orphans = tcp_orphan_count_sum();</div><div class='ctx'> 	sockets = proto_sockets_allocated_sum_positive(&amp;tcp_prot);</div><div class='ctx'> </div><div class='ctx'> 	socket_seq_show(seq);</div><div class='ctx'> 	seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %ld\n",</div><div class='ctx'> 		   sock_prot_inuse_get(net, &amp;tcp_prot), orphans,</div><div class='del'>-		   atomic_read(&amp;net-&gt;ipv4.tcp_death_row.tw_count), sockets,</div><div class='del'>-		   proto_memory_allocated(&amp;tcp_prot));</div><div class='add'>+		   refcount_read(&amp;net-&gt;ipv4.tcp_death_row.tw_refcount) - 1,</div><div class='add'>+		   sockets, proto_memory_allocated(&amp;tcp_prot));</div><div class='ctx'> 	seq_printf(seq, "UDP: inuse %d mem %ld\n",</div><div class='ctx'> 		   sock_prot_inuse_get(net, &amp;udp_prot),</div><div class='ctx'> 		   proto_memory_allocated(&amp;udp_prot));</div><div class='hunk'>@@ -72,8 +70,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "RAW: inuse %d\n",</div><div class='ctx'> 		   sock_prot_inuse_get(net, &amp;raw_prot));</div><div class='ctx'> 	seq_printf(seq,  "FRAG: inuse %u memory %lu\n",</div><div class='del'>-		   atomic_read(&amp;net-&gt;ipv4.frags.rhashtable.nelems),</div><div class='del'>-		   frag_mem_limit(&amp;net-&gt;ipv4.frags));</div><div class='add'>+		   atomic_read(&amp;net-&gt;ipv4.fqdir-&gt;rhashtable.nelems),</div><div class='add'>+		   frag_mem_limit(net-&gt;ipv4.fqdir));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +84,7 @@ static const struct snmp_mib snmp4_ipstats_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("InUnknownProtos", IPSTATS_MIB_INUNKNOWNPROTOS),</div><div class='ctx'> 	SNMP_MIB_ITEM("InDiscards", IPSTATS_MIB_INDISCARDS),</div><div class='ctx'> 	SNMP_MIB_ITEM("InDelivers", IPSTATS_MIB_INDELIVERS),</div><div class='del'>-	SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTPKTS),</div><div class='add'>+	SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTREQUESTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("OutDiscards", IPSTATS_MIB_OUTDISCARDS),</div><div class='ctx'> 	SNMP_MIB_ITEM("OutNoRoutes", IPSTATS_MIB_OUTNOROUTES),</div><div class='ctx'> 	SNMP_MIB_ITEM("ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT),</div><div class='hunk'>@@ -96,7 +94,7 @@ static const struct snmp_mib snmp4_ipstats_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("FragOKs", IPSTATS_MIB_FRAGOKS),</div><div class='ctx'> 	SNMP_MIB_ITEM("FragFails", IPSTATS_MIB_FRAGFAILS),</div><div class='ctx'> 	SNMP_MIB_ITEM("FragCreates", IPSTATS_MIB_FRAGCREATES),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("OutTransmits", IPSTATS_MIB_OUTPKTS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Following items are displayed in /proc/net/netstat */</div><div class='hunk'>@@ -120,7 +118,6 @@ static const struct snmp_mib snmp4_ipextstats_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("InECT0Pkts", IPSTATS_MIB_ECT0PKTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("InCEPkts", IPSTATS_MIB_CEPKTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("ReasmOverlaps", IPSTATS_MIB_REASM_OVERLAPS),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -158,7 +155,6 @@ static const struct snmp_mib snmp4_tcp_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("InErrs", TCP_MIB_INERRS),</div><div class='ctx'> 	SNMP_MIB_ITEM("OutRsts", TCP_MIB_OUTRSTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("InCsumErrors", TCP_MIB_CSUMERRORS),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct snmp_mib snmp4_udp_list[] = {</div><div class='hunk'>@@ -170,7 +166,7 @@ static const struct snmp_mib snmp4_udp_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("SndbufErrors", UDP_MIB_SNDBUFERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("InCsumErrors", UDP_MIB_CSUMERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("IgnoredMulti", UDP_MIB_IGNOREDMULTI),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("MemErrors", UDP_MIB_MEMERRORS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct snmp_mib snmp4_net_list[] = {</div><div class='hunk'>@@ -189,6 +185,10 @@ static const struct snmp_mib snmp4_net_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("TWKilled", LINUX_MIB_TIMEWAITKILLED),</div><div class='ctx'> 	SNMP_MIB_ITEM("PAWSActive", LINUX_MIB_PAWSACTIVEREJECTED),</div><div class='ctx'> 	SNMP_MIB_ITEM("PAWSEstab", LINUX_MIB_PAWSESTABREJECTED),</div><div class='add'>+	SNMP_MIB_ITEM("BeyondWindow", LINUX_MIB_BEYOND_WINDOW),</div><div class='add'>+	SNMP_MIB_ITEM("TSEcrRejected", LINUX_MIB_TSECRREJECTED),</div><div class='add'>+	SNMP_MIB_ITEM("PAWSOldAck", LINUX_MIB_PAWS_OLD_ACK),</div><div class='add'>+	SNMP_MIB_ITEM("PAWSTimewait", LINUX_MIB_PAWS_TW_REJECTED),</div><div class='ctx'> 	SNMP_MIB_ITEM("DelayedACKs", LINUX_MIB_DELAYEDACKS),</div><div class='ctx'> 	SNMP_MIB_ITEM("DelayedACKLocked", LINUX_MIB_DELAYEDACKLOCKED),</div><div class='ctx'> 	SNMP_MIB_ITEM("DelayedACKLost", LINUX_MIB_DELAYEDACKLOST),</div><div class='hunk'>@@ -219,6 +219,7 @@ static const struct snmp_mib snmp4_net_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPRenoRecoveryFail", LINUX_MIB_TCPRENORECOVERYFAIL),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPSackRecoveryFail", LINUX_MIB_TCPSACKRECOVERYFAIL),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPRcvCollapsed", LINUX_MIB_TCPRCVCOLLAPSED),</div><div class='add'>+	SNMP_MIB_ITEM("TCPBacklogCoalesce", LINUX_MIB_TCPBACKLOGCOALESCE),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPDSACKOldSent", LINUX_MIB_TCPDSACKOLDSENT),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPDSACKOfoSent", LINUX_MIB_TCPDSACKOFOSENT),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPDSACKRecv", LINUX_MIB_TCPDSACKRECV),</div><div class='hunk'>@@ -290,7 +291,20 @@ static const struct snmp_mib snmp4_net_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPAckCompressed", LINUX_MIB_TCPACKCOMPRESSED),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPZeroWindowDrop", LINUX_MIB_TCPZEROWINDOWDROP),</div><div class='ctx'> 	SNMP_MIB_ITEM("TCPRcvQDrop", LINUX_MIB_TCPRCVQDROP),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG),</div><div class='add'>+	SNMP_MIB_ITEM("TCPFastOpenPassiveAltKey", LINUX_MIB_TCPFASTOPENPASSIVEALTKEY),</div><div class='add'>+	SNMP_MIB_ITEM("TcpTimeoutRehash", LINUX_MIB_TCPTIMEOUTREHASH),</div><div class='add'>+	SNMP_MIB_ITEM("TcpDuplicateDataRehash", LINUX_MIB_TCPDUPLICATEDATAREHASH),</div><div class='add'>+	SNMP_MIB_ITEM("TCPDSACKRecvSegs", LINUX_MIB_TCPDSACKRECVSEGS),</div><div class='add'>+	SNMP_MIB_ITEM("TCPDSACKIgnoredDubious", LINUX_MIB_TCPDSACKIGNOREDDUBIOUS),</div><div class='add'>+	SNMP_MIB_ITEM("TCPMigrateReqSuccess", LINUX_MIB_TCPMIGRATEREQSUCCESS),</div><div class='add'>+	SNMP_MIB_ITEM("TCPMigrateReqFailure", LINUX_MIB_TCPMIGRATEREQFAILURE),</div><div class='add'>+	SNMP_MIB_ITEM("TCPPLBRehash", LINUX_MIB_TCPPLBREHASH),</div><div class='add'>+	SNMP_MIB_ITEM("TCPAORequired", LINUX_MIB_TCPAOREQUIRED),</div><div class='add'>+	SNMP_MIB_ITEM("TCPAOBad", LINUX_MIB_TCPAOBAD),</div><div class='add'>+	SNMP_MIB_ITEM("TCPAOKeyNotFound", LINUX_MIB_TCPAOKEYNOTFOUND),</div><div class='add'>+	SNMP_MIB_ITEM("TCPAOGood", LINUX_MIB_TCPAOGOOD),</div><div class='add'>+	SNMP_MIB_ITEM("TCPAODroppedIcmps", LINUX_MIB_TCPAODROPPEDICMPS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void icmpmsg_put_line(struct seq_file *seq, unsigned long *vals,</div><div class='hunk'>@@ -345,7 +359,7 @@ static void icmp_put(struct seq_file *seq)</div><div class='ctx'> 	seq_puts(seq, "\nIcmp: InMsgs InErrors InCsumErrors");</div><div class='ctx'> 	for (i = 0; icmpmibmap[i].name; i++)</div><div class='ctx'> 		seq_printf(seq, " In%s", icmpmibmap[i].name);</div><div class='del'>-	seq_puts(seq, " OutMsgs OutErrors");</div><div class='add'>+	seq_puts(seq, " OutMsgs OutErrors OutRateLimitGlobal OutRateLimitHost");</div><div class='ctx'> 	for (i = 0; icmpmibmap[i].name; i++)</div><div class='ctx'> 		seq_printf(seq, " Out%s", icmpmibmap[i].name);</div><div class='ctx'> 	seq_printf(seq, "\nIcmp: %lu %lu %lu",</div><div class='hunk'>@@ -355,9 +369,11 @@ static void icmp_put(struct seq_file *seq)</div><div class='ctx'> 	for (i = 0; icmpmibmap[i].name; i++)</div><div class='ctx'> 		seq_printf(seq, " %lu",</div><div class='ctx'> 			   atomic_long_read(ptr + icmpmibmap[i].index));</div><div class='del'>-	seq_printf(seq, " %lu %lu",</div><div class='add'>+	seq_printf(seq, " %lu %lu %lu %lu",</div><div class='ctx'> 		snmp_fold_field(net-&gt;mib.icmp_statistics, ICMP_MIB_OUTMSGS),</div><div class='del'>-		snmp_fold_field(net-&gt;mib.icmp_statistics, ICMP_MIB_OUTERRORS));</div><div class='add'>+		snmp_fold_field(net-&gt;mib.icmp_statistics, ICMP_MIB_OUTERRORS),</div><div class='add'>+		snmp_fold_field(net-&gt;mib.icmp_statistics, ICMP_MIB_RATELIMITGLOBAL),</div><div class='add'>+		snmp_fold_field(net-&gt;mib.icmp_statistics, ICMP_MIB_RATELIMITHOST));</div><div class='ctx'> 	for (i = 0; icmpmibmap[i].name; i++)</div><div class='ctx'> 		seq_printf(seq, " %lu",</div><div class='ctx'> 			   atomic_long_read(ptr + (icmpmibmap[i].index | 0x100)));</div><div class='hunk'>@@ -368,25 +384,26 @@ static void icmp_put(struct seq_file *seq)</div><div class='ctx'>  */</div><div class='ctx'> static int snmp_seq_show_ipstats(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+	const int cnt = ARRAY_SIZE(snmp4_ipstats_list);</div><div class='add'>+	u64 buff64[ARRAY_SIZE(snmp4_ipstats_list)];</div><div class='ctx'> 	struct net *net = seq-&gt;private;</div><div class='del'>-	u64 buff64[IPSTATS_MIB_MAX];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	memset(buff64, 0, IPSTATS_MIB_MAX * sizeof(u64));</div><div class='add'>+	memset(buff64, 0, sizeof(buff64));</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "Ip: Forwarding DefaultTTL");</div><div class='del'>-	for (i = 0; snmp4_ipstats_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_ipstats_list[i].name);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "\nIp: %d %d",</div><div class='del'>-		   IPV4_DEVCONF_ALL(net, FORWARDING) ? 1 : 2,</div><div class='del'>-		   net-&gt;ipv4.sysctl_ip_default_ttl);</div><div class='add'>+		   IPV4_DEVCONF_ALL_RO(net, FORWARDING) ? 1 : 2,</div><div class='add'>+		   READ_ONCE(net-&gt;ipv4.sysctl_ip_default_ttl));</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct ipstats_mib, mibs) != 0);</div><div class='del'>-	snmp_get_cpu_field64_batch(buff64, snmp4_ipstats_list,</div><div class='del'>-				   net-&gt;mib.ip_statistics,</div><div class='del'>-				   offsetof(struct ipstats_mib, syncp));</div><div class='del'>-	for (i = 0; snmp4_ipstats_list[i].name; i++)</div><div class='add'>+	snmp_get_cpu_field64_batch_cnt(buff64, snmp4_ipstats_list, cnt,</div><div class='add'>+				       net-&gt;mib.ip_statistics,</div><div class='add'>+				       offsetof(struct ipstats_mib, syncp));</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %llu", buff64[i]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -394,20 +411,23 @@ static int snmp_seq_show_ipstats(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> static int snmp_seq_show_tcp_udp(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+	const int udp_cnt = ARRAY_SIZE(snmp4_udp_list);</div><div class='add'>+	const int tcp_cnt = ARRAY_SIZE(snmp4_tcp_list);</div><div class='ctx'> 	unsigned long buff[TCPUDP_MIB_MAX];</div><div class='ctx'> 	struct net *net = seq-&gt;private;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));</div><div class='add'>+	memset(buff, 0, tcp_cnt * sizeof(unsigned long));</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "\nTcp:");</div><div class='del'>-	for (i = 0; snmp4_tcp_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; tcp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_tcp_list[i].name);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "\nTcp:");</div><div class='del'>-	snmp_get_cpu_field_batch(buff, snmp4_tcp_list,</div><div class='del'>-				 net-&gt;mib.tcp_statistics);</div><div class='del'>-	for (i = 0; snmp4_tcp_list[i].name; i++) {</div><div class='add'>+	snmp_get_cpu_field_batch_cnt(buff, snmp4_tcp_list,</div><div class='add'>+				     tcp_cnt,</div><div class='add'>+				     net-&gt;mib.tcp_statistics);</div><div class='add'>+	for (i = 0; i &lt; tcp_cnt; i++) {</div><div class='ctx'> 		/* MaxConn field is signed, RFC 2012 */</div><div class='ctx'> 		if (snmp4_tcp_list[i].entry == TCP_MIB_MAXCONN)</div><div class='ctx'> 			seq_printf(seq, " %ld", buff[i]);</div><div class='hunk'>@@ -415,27 +435,29 @@ static int snmp_seq_show_tcp_udp(struct seq_file *seq, void *v)</div><div class='ctx'> 			seq_printf(seq, " %lu", buff[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));</div><div class='add'>+	memset(buff, 0, udp_cnt * sizeof(unsigned long));</div><div class='ctx'> </div><div class='del'>-	snmp_get_cpu_field_batch(buff, snmp4_udp_list,</div><div class='del'>-				 net-&gt;mib.udp_statistics);</div><div class='add'>+	snmp_get_cpu_field_batch_cnt(buff, snmp4_udp_list,</div><div class='add'>+				     udp_cnt,</div><div class='add'>+				     net-&gt;mib.udp_statistics);</div><div class='ctx'> 	seq_puts(seq, "\nUdp:");</div><div class='del'>-	for (i = 0; snmp4_udp_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; udp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_udp_list[i].name);</div><div class='ctx'> 	seq_puts(seq, "\nUdp:");</div><div class='del'>-	for (i = 0; snmp4_udp_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; udp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %lu", buff[i]);</div><div class='ctx'> </div><div class='del'>-	memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));</div><div class='add'>+	memset(buff, 0, udp_cnt * sizeof(unsigned long));</div><div class='ctx'> </div><div class='ctx'> 	/* the UDP and UDP-Lite MIBs are the same */</div><div class='ctx'> 	seq_puts(seq, "\nUdpLite:");</div><div class='del'>-	snmp_get_cpu_field_batch(buff, snmp4_udp_list,</div><div class='del'>-				 net-&gt;mib.udplite_statistics);</div><div class='del'>-	for (i = 0; snmp4_udp_list[i].name; i++)</div><div class='add'>+	snmp_get_cpu_field_batch_cnt(buff, snmp4_udp_list,</div><div class='add'>+				     udp_cnt,</div><div class='add'>+				     net-&gt;mib.udplite_statistics);</div><div class='add'>+	for (i = 0; i &lt; udp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_udp_list[i].name);</div><div class='ctx'> 	seq_puts(seq, "\nUdpLite:");</div><div class='del'>-	for (i = 0; snmp4_udp_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; udp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %lu", buff[i]);</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(seq, '\n');</div><div class='hunk'>@@ -459,31 +481,54 @@ static int snmp_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'>  */</div><div class='ctx'> static int netstat_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	const int ip_cnt = ARRAY_SIZE(snmp4_ipextstats_list);</div><div class='add'>+	const int tcp_cnt = ARRAY_SIZE(snmp4_net_list);</div><div class='ctx'> 	struct net *net = seq-&gt;private;</div><div class='add'>+	unsigned long *buff;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "TcpExt:");</div><div class='del'>-	for (i = 0; snmp4_net_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; tcp_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_net_list[i].name);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "\nTcpExt:");</div><div class='del'>-	for (i = 0; snmp4_net_list[i].name; i++)</div><div class='del'>-		seq_printf(seq, " %lu",</div><div class='del'>-			   snmp_fold_field(net-&gt;mib.net_statistics,</div><div class='del'>-					   snmp4_net_list[i].entry));</div><div class='del'>-</div><div class='add'>+	buff = kzalloc(max(tcp_cnt * sizeof(long), ip_cnt * sizeof(u64)),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (buff) {</div><div class='add'>+		snmp_get_cpu_field_batch_cnt(buff, snmp4_net_list, tcp_cnt,</div><div class='add'>+					     net-&gt;mib.net_statistics);</div><div class='add'>+		for (i = 0; i &lt; tcp_cnt; i++)</div><div class='add'>+			seq_printf(seq, " %lu", buff[i]);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; tcp_cnt; i++)</div><div class='add'>+			seq_printf(seq, " %lu",</div><div class='add'>+				   snmp_fold_field(net-&gt;mib.net_statistics,</div><div class='add'>+						   snmp4_net_list[i].entry));</div><div class='add'>+	}</div><div class='ctx'> 	seq_puts(seq, "\nIpExt:");</div><div class='del'>-	for (i = 0; snmp4_ipextstats_list[i].name; i++)</div><div class='add'>+	for (i = 0; i &lt; ip_cnt; i++)</div><div class='ctx'> 		seq_printf(seq, " %s", snmp4_ipextstats_list[i].name);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "\nIpExt:");</div><div class='del'>-	for (i = 0; snmp4_ipextstats_list[i].name; i++)</div><div class='del'>-		seq_printf(seq, " %llu",</div><div class='del'>-			   snmp_fold_field64(net-&gt;mib.ip_statistics,</div><div class='del'>-					     snmp4_ipextstats_list[i].entry,</div><div class='del'>-					     offsetof(struct ipstats_mib, syncp)));</div><div class='del'>-</div><div class='add'>+	if (buff) {</div><div class='add'>+		u64 *buff64 = (u64 *)buff;</div><div class='add'>+</div><div class='add'>+		memset(buff64, 0, ip_cnt * sizeof(u64));</div><div class='add'>+		snmp_get_cpu_field64_batch_cnt(buff64, snmp4_ipextstats_list, ip_cnt,</div><div class='add'>+					   net-&gt;mib.ip_statistics,</div><div class='add'>+					   offsetof(struct ipstats_mib, syncp));</div><div class='add'>+		for (i = 0; i &lt; ip_cnt; i++)</div><div class='add'>+			seq_printf(seq, " %llu", buff64[i]);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ip_cnt; i++)</div><div class='add'>+			seq_printf(seq, " %llu",</div><div class='add'>+				   snmp_fold_field64(net-&gt;mib.ip_statistics,</div><div class='add'>+						     snmp4_ipextstats_list[i].entry,</div><div class='add'>+						     offsetof(struct ipstats_mib, syncp)));</div><div class='add'>+	}</div><div class='add'>+	kfree(buff);</div><div class='ctx'> 	seq_putc(seq, '\n');</div><div class='add'>+	mptcp_seq_show(seq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c<br/>index 32a691b7ce2c..6913979948d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/protocol.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/protocol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/protocol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/protocol.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -16,11 +17,6 @@</div><div class='ctx'>  *		Richard Colella	: Hang on hash collision</div><div class='ctx'>  *		Vince Laviano	: Modified inet_del_protocol() to correctly</div><div class='ctx'>  *				  maintain copy bit.</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -29,17 +25,12 @@</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct net_protocol __rcu *inet_protos[MAX_INET_PROTOS] __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(inet_protos);</div><div class='ctx'> const struct net_offload __rcu *inet_offloads[MAX_INET_PROTOS] __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(inet_offloads);</div><div class='ctx'> </div><div class='ctx'> int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol)</div><div class='ctx'> {</div><div class='del'>-	if (!prot-&gt;netns_ok) {</div><div class='del'>-		pr_err("Protocol %u is not namespace aware, cannot register.\n",</div><div class='del'>-			protocol);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return !cmpxchg((const struct net_protocol **)&amp;inet_protos[protocol],</div><div class='ctx'> 			NULL, prot) ? 0 : -1;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c<br/>index 33df4d76db2d..5998c4cc6f47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/raw.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -30,11 +31,6 @@</div><div class='ctx'>  *		Alan Cox	:	Added IP_HDRINCL option.</div><div class='ctx'>  *		Alan Cox	:	Skip broadcast check if BSDism set.</div><div class='ctx'>  *		David S. Miller	:	New socket lookup architecture.</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -89,22 +85,21 @@ struct raw_frag_vec {</div><div class='ctx'> 	int hlen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct raw_hashinfo raw_v4_hashinfo = {</div><div class='del'>-	.lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),</div><div class='del'>-};</div><div class='add'>+struct raw_hashinfo raw_v4_hashinfo;</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_v4_hashinfo);</div><div class='ctx'> </div><div class='ctx'> int raw_hash_sk(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw_hashinfo *h = sk-&gt;sk_prot-&gt;h.raw_hash;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> </div><div class='del'>-	head = &amp;h-&gt;ht[inet_sk(sk)-&gt;inet_num &amp; (RAW_HTABLE_SIZE - 1)];</div><div class='add'>+	hlist = &amp;h-&gt;ht[raw_hashfunc(sock_net(sk), inet_sk(sk)-&gt;inet_num)];</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;h-&gt;lock);</div><div class='del'>-	sk_add_node(sk, head);</div><div class='add'>+	spin_lock(&amp;h-&gt;lock);</div><div class='add'>+	sk_add_node_rcu(sk, hlist);</div><div class='add'>+	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+	spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> 	sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='del'>-	write_unlock_bh(&amp;h-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -114,32 +109,26 @@ void raw_unhash_sk(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw_hashinfo *h = sk-&gt;sk_prot-&gt;h.raw_hash;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;h-&gt;lock);</div><div class='del'>-	if (sk_del_node_init(sk))</div><div class='add'>+	spin_lock(&amp;h-&gt;lock);</div><div class='add'>+	if (sk_del_node_init_rcu(sk))</div><div class='ctx'> 		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, -1);</div><div class='del'>-	write_unlock_bh(&amp;h-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_unhash_sk);</div><div class='ctx'> </div><div class='del'>-struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,</div><div class='del'>-			     unsigned short num, __be32 raddr, __be32 laddr,</div><div class='del'>-			     int dif, int sdif)</div><div class='add'>+bool raw_v4_match(struct net *net, const struct sock *sk, unsigned short num,</div><div class='add'>+		  __be32 raddr, __be32 laddr, int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	sk_for_each_from(sk) {</div><div class='del'>-		struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-</div><div class='del'>-		if (net_eq(sock_net(sk), net) &amp;&amp; inet-&gt;inet_num == num	&amp;&amp;</div><div class='del'>-		    !(inet-&gt;inet_daddr &amp;&amp; inet-&gt;inet_daddr != raddr) 	&amp;&amp;</div><div class='del'>-		    !(inet-&gt;inet_rcv_saddr &amp;&amp; inet-&gt;inet_rcv_saddr != laddr) &amp;&amp;</div><div class='del'>-		    !(sk-&gt;sk_bound_dev_if &amp;&amp; sk-&gt;sk_bound_dev_if != dif &amp;&amp;</div><div class='del'>-		      sk-&gt;sk_bound_dev_if != sdif))</div><div class='del'>-			goto found; /* gotcha */</div><div class='del'>-	}</div><div class='del'>-	sk = NULL;</div><div class='del'>-found:</div><div class='del'>-	return sk;</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (net_eq(sock_net(sk), net) &amp;&amp; inet-&gt;inet_num == num	&amp;&amp;</div><div class='add'>+	    !(inet-&gt;inet_daddr &amp;&amp; inet-&gt;inet_daddr != raddr) 	&amp;&amp;</div><div class='add'>+	    !(inet-&gt;inet_rcv_saddr &amp;&amp; inet-&gt;inet_rcv_saddr != laddr) &amp;&amp;</div><div class='add'>+	    raw_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if, dif, sdif))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__raw_v4_lookup);</div><div class='add'>+EXPORT_SYMBOL_GPL(raw_v4_match);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	0 - deliver</div><div class='hunk'>@@ -171,25 +160,28 @@ static int icmp_filter(const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'>  * RFC 1122: SHOULD pass TOS value up to the transport layer.</div><div class='ctx'>  * -&gt; It does. And not only TOS, but all IP header.</div><div class='ctx'>  */</div><div class='del'>-static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)</div><div class='add'>+static int raw_v4_input(struct net *net, struct sk_buff *skb,</div><div class='add'>+			const struct iphdr *iph, int hash)</div><div class='ctx'> {</div><div class='ctx'> 	int sdif = inet_sdif(skb);</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='add'>+	int dif = inet_iif(skb);</div><div class='ctx'> 	int delivered = 0;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;raw_v4_hashinfo.lock);</div><div class='del'>-	head = &amp;raw_v4_hashinfo.ht[hash];</div><div class='del'>-	if (hlist_empty(head))</div><div class='del'>-		goto out;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(skb-&gt;dev);</div><div class='del'>-	sk = __raw_v4_lookup(net, __sk_head(head), iph-&gt;protocol,</div><div class='del'>-			     iph-&gt;saddr, iph-&gt;daddr,</div><div class='del'>-			     skb-&gt;dev-&gt;ifindex, sdif);</div><div class='add'>+	hlist = &amp;raw_v4_hashinfo.ht[hash];</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_for_each_rcu(sk, hlist) {</div><div class='add'>+		if (!raw_v4_match(net, sk, iph-&gt;protocol,</div><div class='add'>+				  iph-&gt;saddr, iph-&gt;daddr, dif, sdif))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt;=</div><div class='add'>+		    READ_ONCE(sk-&gt;sk_rcvbuf)) {</div><div class='add'>+			sk_drops_inc(sk);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	while (sk) {</div><div class='ctx'> 		delivered = 1;</div><div class='ctx'> 		if ((iph-&gt;protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) &amp;&amp;</div><div class='ctx'> 		    ip_mc_sf_allow(sk, iph-&gt;daddr, iph-&gt;saddr,</div><div class='hunk'>@@ -200,31 +192,17 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)</div><div class='ctx'> 			if (clone)</div><div class='ctx'> 				raw_rcv(sk, clone);</div><div class='ctx'> 		}</div><div class='del'>-		sk = __raw_v4_lookup(net, sk_next(sk), iph-&gt;protocol,</div><div class='del'>-				     iph-&gt;saddr, iph-&gt;daddr,</div><div class='del'>-				     skb-&gt;dev-&gt;ifindex, sdif);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	read_unlock(&amp;raw_v4_hashinfo.lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return delivered;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int raw_local_deliver(struct sk_buff *skb, int protocol)</div><div class='ctx'> {</div><div class='del'>-	int hash;</div><div class='del'>-	struct sock *raw_sk;</div><div class='del'>-</div><div class='del'>-	hash = protocol &amp; (RAW_HTABLE_SIZE - 1);</div><div class='del'>-	raw_sk = sk_head(&amp;raw_v4_hashinfo.ht[hash]);</div><div class='del'>-</div><div class='del'>-	/* If there maybe a raw socket we must check - if not we</div><div class='del'>-	 * don't care less</div><div class='del'>-	 */</div><div class='del'>-	if (raw_sk &amp;&amp; !raw_v4_input(skb, ip_hdr(skb), hash))</div><div class='del'>-		raw_sk = NULL;</div><div class='del'>-</div><div class='del'>-	return raw_sk != NULL;</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	return raw_v4_input(net, skb, ip_hdr(skb),</div><div class='add'>+			    raw_hashfunc(net, protocol));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)</div><div class='hunk'>@@ -232,8 +210,9 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	const int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	const int code = icmp_hdr(skb)-&gt;code;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	int harderr = 0;</div><div class='add'>+	bool recverr;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMP_DEST_UNREACH &amp;&amp; code == ICMP_FRAG_NEEDED)</div><div class='ctx'> 		ipv4_sk_update_pmtu(skb, sk, info);</div><div class='hunk'>@@ -247,7 +226,8 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)</div><div class='ctx'> 	   2. Socket is connected (otherwise the error indication</div><div class='ctx'> 	      is useless without ip_recverr and error is hard.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!inet-&gt;recverr &amp;&amp; sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='add'>+	recverr = inet_test_bit(RECVERR, sk);</div><div class='add'>+	if (!recverr &amp;&amp; sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -265,65 +245,63 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)</div><div class='ctx'> 		err = EHOSTUNREACH;</div><div class='ctx'> 		if (code &gt; NR_ICMP_UNREACH)</div><div class='ctx'> 			break;</div><div class='del'>-		err = icmp_err_convert[code].errno;</div><div class='del'>-		harderr = icmp_err_convert[code].fatal;</div><div class='ctx'> 		if (code == ICMP_FRAG_NEEDED) {</div><div class='del'>-			harderr = inet-&gt;pmtudisc != IP_PMTUDISC_DONT;</div><div class='add'>+			harderr = READ_ONCE(inet-&gt;pmtudisc) != IP_PMTUDISC_DONT;</div><div class='ctx'> 			err = EMSGSIZE;</div><div class='add'>+		} else {</div><div class='add'>+			err = icmp_err_convert[code].errno;</div><div class='add'>+			harderr = icmp_err_convert[code].fatal;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;recverr) {</div><div class='add'>+	if (recverr) {</div><div class='ctx'> 		const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 		u8 *payload = skb-&gt;data + (iph-&gt;ihl &lt;&lt; 2);</div><div class='ctx'> </div><div class='del'>-		if (inet-&gt;hdrincl)</div><div class='add'>+		if (inet_test_bit(HDRINCL, sk))</div><div class='ctx'> 			payload = skb-&gt;data;</div><div class='ctx'> 		ip_icmp_error(sk, skb, err, 0, info, payload);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;recverr || harderr) {</div><div class='add'>+	if (recverr || harderr) {</div><div class='ctx'> 		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info)</div><div class='ctx'> {</div><div class='del'>-	int hash;</div><div class='del'>-	struct sock *raw_sk;</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	int dif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	int sdif = inet_sdif(skb);</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	hash = protocol &amp; (RAW_HTABLE_SIZE - 1);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int hash;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;raw_v4_hashinfo.lock);</div><div class='del'>-	raw_sk = sk_head(&amp;raw_v4_hashinfo.ht[hash]);</div><div class='del'>-	if (raw_sk) {</div><div class='del'>-		int dif = skb-&gt;dev-&gt;ifindex;</div><div class='del'>-		int sdif = inet_sdif(skb);</div><div class='add'>+	hash = raw_hashfunc(net, protocol);</div><div class='add'>+	hlist = &amp;raw_v4_hashinfo.ht[hash];</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_for_each_rcu(sk, hlist) {</div><div class='ctx'> 		iph = (const struct iphdr *)skb-&gt;data;</div><div class='del'>-		net = dev_net(skb-&gt;dev);</div><div class='del'>-</div><div class='del'>-		while ((raw_sk = __raw_v4_lookup(net, raw_sk, protocol,</div><div class='del'>-						iph-&gt;daddr, iph-&gt;saddr,</div><div class='del'>-						dif, sdif)) != NULL) {</div><div class='del'>-			raw_err(raw_sk, skb, info);</div><div class='del'>-			raw_sk = sk_next(raw_sk);</div><div class='del'>-			iph = (const struct iphdr *)skb-&gt;data;</div><div class='del'>-		}</div><div class='add'>+		if (!raw_v4_match(net, sk, iph-&gt;protocol,</div><div class='add'>+				  iph-&gt;daddr, iph-&gt;saddr, dif, sdif))</div><div class='add'>+			continue;</div><div class='add'>+		raw_err(sk, skb, info);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;raw_v4_hashinfo.lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+</div><div class='ctx'> 	/* Charge it to the socket. */</div><div class='ctx'> </div><div class='del'>-	ipv4_pktinfo_prepare(sk, skb);</div><div class='del'>-	if (sock_queue_rcv_skb(sk, skb) &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	ipv4_pktinfo_prepare(sk, skb, true);</div><div class='add'>+	if (sock_queue_rcv_skb_reason(sk, skb, &amp;reason) &lt; 0) {</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -333,13 +311,13 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> int raw_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		sk_drops_inc(sk);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_XFRM_POLICY);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='del'>-	skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='add'>+	skb_push(skb, -skb_network_offset(skb));</div><div class='ctx'> </div><div class='ctx'> 	raw_rcv_skb(sk, skb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -379,9 +357,10 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	skb_reserve(skb, hlen);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='del'>-	skb-&gt;mark = sk-&gt;sk_mark;</div><div class='del'>-	skb-&gt;tstamp = sockc-&gt;transmit_time;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	skb-&gt;priority = sockc-&gt;priority;</div><div class='add'>+	skb-&gt;mark = sockc-&gt;mark;</div><div class='add'>+	skb_set_delivery_type_by_clockid(skb, sockc-&gt;transmit_time, sk-&gt;sk_clockid);</div><div class='ctx'> 	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='ctx'> 	*rtp = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -391,7 +370,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='del'>-	sock_tx_timestamp(sk, sockc-&gt;tsflags, &amp;skb_shinfo(skb)-&gt;tx_flags);</div><div class='add'>+	skb_setup_tx_timestamp(skb, sockc);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_CONFIRM)</div><div class='ctx'> 		skb_set_dst_pending_confirm(skb, 1);</div><div class='hunk'>@@ -444,7 +423,7 @@ error_free:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> error:</div><div class='ctx'> 	IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);</div><div class='del'>-	if (err == -ENOBUFS &amp;&amp; !inet-&gt;recverr)</div><div class='add'>+	if (err == -ENOBUFS &amp;&amp; !inet_test_bit(RECVERR, sk))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -483,7 +462,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd,</div><div class='ctx'> 			skb-&gt;csum = csum_block_add(</div><div class='ctx'> 				skb-&gt;csum,</div><div class='ctx'> 				csum_partial_copy_nocheck(rfv-&gt;hdr.c + offset,</div><div class='del'>-							  to, copy, 0),</div><div class='add'>+							  to, copy),</div><div class='ctx'> 				odd);</div><div class='ctx'> </div><div class='ctx'> 		odd = 0;</div><div class='hunk'>@@ -507,11 +486,11 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct ipcm_cookie ipc;</div><div class='ctx'> 	struct rtable *rt = NULL;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='add'>+	u8 scope;</div><div class='ctx'> 	int free = 0;</div><div class='ctx'> 	__be32 daddr;</div><div class='ctx'> 	__be32 saddr;</div><div class='del'>-	u8  tos;</div><div class='del'>-	int err;</div><div class='add'>+	int uc_index, err;</div><div class='ctx'> 	struct ip_options_data opt_copy;</div><div class='ctx'> 	struct raw_frag_vec rfv;</div><div class='ctx'> 	int hdrincl;</div><div class='hunk'>@@ -520,12 +499,8 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	if (len &gt; 0xFFFF)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* hdrincl should be READ_ONCE(inet-&gt;hdrincl)</div><div class='del'>-	 * but READ_ONCE() doesn't work with bit fields.</div><div class='del'>-	 * Doing this indirectly yields the same result.</div><div class='del'>-	 */</div><div class='del'>-	hdrincl = inet-&gt;hdrincl;</div><div class='del'>-	hdrincl = READ_ONCE(hdrincl);</div><div class='add'>+	hdrincl = inet_test_bit(HDRINCL, sk);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Check the flags.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -563,6 +538,9 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipcm_init_sk(&amp;ipc, inet);</div><div class='add'>+	/* Keep backward compat */</div><div class='add'>+	if (hdrincl)</div><div class='add'>+		ipc.protocol = IPPROTO_RAW;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_controllen) {</div><div class='ctx'> 		err = ip_cmsg_send(sk, msg, &amp;ipc, false);</div><div class='hunk'>@@ -603,37 +581,39 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 			daddr = ipc.opt-&gt;opt.faddr;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	tos = get_rtconn_flags(&amp;ipc, sk);</div><div class='del'>-	if (msg-&gt;msg_flags &amp; MSG_DONTROUTE)</div><div class='del'>-		tos |= RTO_ONLINK;</div><div class='add'>+	scope = ip_sendmsg_scope(inet, &amp;ipc, msg);</div><div class='ctx'> </div><div class='add'>+	uc_index = READ_ONCE(inet-&gt;uc_index);</div><div class='ctx'> 	if (ipv4_is_multicast(daddr)) {</div><div class='del'>-		if (!ipc.oif)</div><div class='del'>-			ipc.oif = inet-&gt;mc_index;</div><div class='add'>+		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))</div><div class='add'>+			ipc.oif = READ_ONCE(inet-&gt;mc_index);</div><div class='ctx'> 		if (!saddr)</div><div class='del'>-			saddr = inet-&gt;mc_addr;</div><div class='add'>+			saddr = READ_ONCE(inet-&gt;mc_addr);</div><div class='ctx'> 	} else if (!ipc.oif) {</div><div class='del'>-		ipc.oif = inet-&gt;uc_index;</div><div class='del'>-	} else if (ipv4_is_lbcast(daddr) &amp;&amp; inet-&gt;uc_index) {</div><div class='del'>-		/* oif is set, packet is to local broadcast and</div><div class='add'>+		ipc.oif = uc_index;</div><div class='add'>+	} else if (ipv4_is_lbcast(daddr) &amp;&amp; uc_index) {</div><div class='add'>+		/* oif is set, packet is to local broadcast</div><div class='ctx'> 		 * and uc_index is set. oif is most likely set</div><div class='ctx'> 		 * by sk_bound_dev_if. If uc_index != oif check if the</div><div class='ctx'> 		 * oif is an L3 master and uc_index is an L3 slave.</div><div class='ctx'> 		 * If so, we want to allow the send using the uc_index.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ipc.oif != inet-&gt;uc_index &amp;&amp;</div><div class='add'>+		if (ipc.oif != uc_index &amp;&amp;</div><div class='ctx'> 		    ipc.oif == l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='del'>-							      inet-&gt;uc_index)) {</div><div class='del'>-			ipc.oif = inet-&gt;uc_index;</div><div class='add'>+							      uc_index)) {</div><div class='add'>+			ipc.oif = uc_index;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	flowi4_init_output(&amp;fl4, ipc.oif, sk-&gt;sk_mark, tos,</div><div class='del'>-			   RT_SCOPE_UNIVERSE,</div><div class='del'>-			   hdrincl ? IPPROTO_RAW : sk-&gt;sk_protocol,</div><div class='add'>+	flowi4_init_output(&amp;fl4, ipc.oif, ipc.sockc.mark,</div><div class='add'>+			   ipc.tos &amp; INET_DSCP_MASK, scope,</div><div class='add'>+			   hdrincl ? ipc.protocol : sk-&gt;sk_protocol,</div><div class='ctx'> 			   inet_sk_flowi_flags(sk) |</div><div class='ctx'> 			    (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),</div><div class='del'>-			   daddr, saddr, 0, 0, sk-&gt;sk_uid);</div><div class='add'>+			   daddr, saddr, 0, 0, sk_uid(sk));</div><div class='add'>+</div><div class='add'>+	fl4.fl4_icmp_type = 0;</div><div class='add'>+	fl4.fl4_icmp_code = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!hdrincl) {</div><div class='ctx'> 		rfv.msg = msg;</div><div class='hunk'>@@ -644,7 +624,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 			goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	security_sk_classify_flow(sk, flowi4_to_flowi(&amp;fl4));</div><div class='add'>+	security_sk_classify_flow(sk, flowi4_to_flowi_common(&amp;fl4));</div><div class='ctx'> 	rt = ip_route_output_flow(net, &amp;fl4, sk);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='ctx'> 		err = PTR_ERR(rt);</div><div class='hunk'>@@ -675,7 +655,7 @@ back_from_confirm:</div><div class='ctx'> 			ip_flush_pending_frames(sk);</div><div class='ctx'> 		else if (!(msg-&gt;msg_flags &amp; MSG_MORE)) {</div><div class='ctx'> 			err = ip_push_pending_frames(sk, &amp;fl4);</div><div class='del'>-			if (err == -ENOBUFS &amp;&amp; !inet-&gt;recverr)</div><div class='add'>+			if (err == -ENOBUFS &amp;&amp; !inet_test_bit(RECVERR, sk))</div><div class='ctx'> 				err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		release_sock(sk);</div><div class='hunk'>@@ -717,34 +697,39 @@ static void raw_destroy(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This gets rid of all the nasties in af_inet. -DaveM */</div><div class='del'>-static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int raw_bind(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+		    int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	u32 tb_id = RT_TABLE_LOCAL;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	int chk_addr_ret;</div><div class='ctx'> </div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_CLOSE || addr_len &lt; sizeof(struct sockaddr_in))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-		tb_id = l3mdev_fib_table_by_index(sock_net(sk),</div><div class='del'>-						 sk-&gt;sk_bound_dev_if) ? : tb_id;</div><div class='add'>+		tb_id = l3mdev_fib_table_by_index(net,</div><div class='add'>+						  sk-&gt;sk_bound_dev_if) ? : tb_id;</div><div class='ctx'> </div><div class='del'>-	chk_addr_ret = inet_addr_type_table(sock_net(sk), addr-&gt;sin_addr.s_addr,</div><div class='del'>-					    tb_id);</div><div class='add'>+	chk_addr_ret = inet_addr_type_table(net, addr-&gt;sin_addr.s_addr, tb_id);</div><div class='ctx'> </div><div class='ctx'> 	ret = -EADDRNOTAVAIL;</div><div class='del'>-	if (addr-&gt;sin_addr.s_addr &amp;&amp; chk_addr_ret != RTN_LOCAL &amp;&amp;</div><div class='del'>-	    chk_addr_ret != RTN_MULTICAST &amp;&amp; chk_addr_ret != RTN_BROADCAST)</div><div class='add'>+	if (!inet_addr_valid_or_nonlocal(net, inet, addr-&gt;sin_addr.s_addr,</div><div class='add'>+					 chk_addr_ret))</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='ctx'> 	inet-&gt;inet_rcv_saddr = inet-&gt;inet_saddr = addr-&gt;sin_addr.s_addr;</div><div class='ctx'> 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)</div><div class='ctx'> 		inet-&gt;inet_saddr = 0;  /* Use device */</div><div class='ctx'> 	sk_dst_reset(sk);</div><div class='ctx'> 	ret = 0;</div><div class='del'>-out:	return ret;</div><div class='add'>+out:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -753,7 +738,7 @@ out:	return ret;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-		       int noblock, int flags, int *addr_len)</div><div class='add'>+		       int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	size_t copied = 0;</div><div class='hunk'>@@ -769,7 +754,7 @@ static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -783,7 +768,7 @@ static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the address. */</div><div class='ctx'> 	if (sin) {</div><div class='hunk'>@@ -793,7 +778,7 @@ static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 		memset(&amp;sin-&gt;sin_zero, 0, sizeof(sin-&gt;sin_zero));</div><div class='ctx'> 		*addr_len = sizeof(*sin);</div><div class='ctx'> 	}</div><div class='del'>-	if (inet-&gt;cmsg_flags)</div><div class='add'>+	if (inet_cmsg_flags(inet))</div><div class='ctx'> 		ip_cmsg_recv(msg, skb);</div><div class='ctx'> 	if (flags &amp; MSG_TRUNC)</div><div class='ctx'> 		copied = skb-&gt;len;</div><div class='hunk'>@@ -805,20 +790,21 @@ out:</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_init(struct sock *sk)</div><div class='add'>+static int raw_sk_init(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw_sock *rp = raw_sk(sk);</div><div class='ctx'> </div><div class='add'>+	sk-&gt;sk_drop_counters = &amp;rp-&gt;drop_counters;</div><div class='ctx'> 	if (inet_sk(sk)-&gt;inet_num == IPPROTO_ICMP)</div><div class='ctx'> 		memset(&amp;rp-&gt;filter, 0, sizeof(rp-&gt;filter));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)</div><div class='add'>+static int raw_seticmpfilter(struct sock *sk, sockptr_t optval, int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (optlen &gt; sizeof(struct icmp_filter))</div><div class='ctx'> 		optlen = sizeof(struct icmp_filter);</div><div class='del'>-	if (copy_from_user(&amp;raw_sk(sk)-&gt;filter, optval, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;raw_sk(sk)-&gt;filter, optval, optlen))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -842,8 +828,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o</div><div class='ctx'> out:	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_raw_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+static int do_raw_setsockopt(struct sock *sk, int optname,</div><div class='add'>+			     sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (optname == ICMP_FILTER) {</div><div class='ctx'> 		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMP)</div><div class='hunk'>@@ -855,25 +841,15 @@ static int do_raw_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (level != SOL_RAW)</div><div class='ctx'> 		return ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return do_raw_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-static int compat_raw_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-				 char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_RAW)</div><div class='del'>-		return compat_ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return do_raw_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+	return do_raw_setsockopt(sk, optname, optval, optlen);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int do_raw_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, int __user *optlen)</div><div class='add'>+static int do_raw_getsockopt(struct sock *sk, int optname,</div><div class='add'>+			     char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (optname == ICMP_FILTER) {</div><div class='ctx'> 		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMP)</div><div class='hunk'>@@ -889,42 +865,32 @@ static int raw_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> {</div><div class='ctx'> 	if (level != SOL_RAW)</div><div class='ctx'> 		return ip_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return do_raw_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-static int compat_raw_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-				 char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_RAW)</div><div class='del'>-		return compat_ip_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return do_raw_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+	return do_raw_getsockopt(sk, optname, optval, optlen);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+static int raw_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCOUTQ: {</div><div class='del'>-		int amount = sk_wmem_alloc_get(sk);</div><div class='del'>-</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		*karg = sk_wmem_alloc_get(sk);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SIOCINQ: {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		int amount = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		if (skb)</div><div class='del'>-			amount = skb-&gt;len;</div><div class='add'>+			*karg = skb-&gt;len;</div><div class='add'>+		else</div><div class='add'>+			*karg = 0;</div><div class='ctx'> 		spin_unlock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> #ifdef CONFIG_IP_MROUTE</div><div class='del'>-		return ipmr_ioctl(sk, cmd, (void __user *)arg);</div><div class='add'>+		return ipmr_ioctl(sk, cmd, karg);</div><div class='ctx'> #else</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -953,7 +919,7 @@ int raw_abort(struct sock *sk, int err)</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_err = err;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> 	__udp_disconnect(sk, 0);</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -970,7 +936,7 @@ struct proto raw_prot = {</div><div class='ctx'> 	.connect	   = ip4_datagram_connect,</div><div class='ctx'> 	.disconnect	   = __udp_disconnect,</div><div class='ctx'> 	.ioctl		   = raw_ioctl,</div><div class='del'>-	.init		   = raw_init,</div><div class='add'>+	.init		   = raw_sk_init,</div><div class='ctx'> 	.setsockopt	   = raw_setsockopt,</div><div class='ctx'> 	.getsockopt	   = raw_getsockopt,</div><div class='ctx'> 	.sendmsg	   = raw_sendmsg,</div><div class='hunk'>@@ -985,52 +951,46 @@ struct proto raw_prot = {</div><div class='ctx'> 	.usersize	   = sizeof_field(struct raw_sock, filter),</div><div class='ctx'> 	.h.raw_hash	   = &amp;raw_v4_hashinfo,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_raw_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_raw_getsockopt,</div><div class='ctx'> 	.compat_ioctl	   = compat_raw_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.diag_destroy	   = raw_abort,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-static struct sock *raw_get_first(struct seq_file *seq)</div><div class='add'>+static struct sock *raw_get_first(struct seq_file *seq, int bucket)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct raw_hashinfo *h = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct raw_hashinfo *h = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct raw_iter_state *state = raw_seq_private(seq);</div><div class='add'>+	struct hlist_head *hlist;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	for (state-&gt;bucket = 0; state-&gt;bucket &lt; RAW_HTABLE_SIZE;</div><div class='add'>+	for (state-&gt;bucket = bucket; state-&gt;bucket &lt; RAW_HTABLE_SIZE;</div><div class='ctx'> 			++state-&gt;bucket) {</div><div class='del'>-		sk_for_each(sk, &amp;h-&gt;ht[state-&gt;bucket])</div><div class='add'>+		hlist = &amp;h-&gt;ht[state-&gt;bucket];</div><div class='add'>+		sk_for_each(sk, hlist) {</div><div class='ctx'> 			if (sock_net(sk) == seq_file_net(seq))</div><div class='del'>-				goto found;</div><div class='add'>+				return sk;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	sk = NULL;</div><div class='del'>-found:</div><div class='del'>-	return sk;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct raw_hashinfo *h = PDE_DATA(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct raw_iter_state *state = raw_seq_private(seq);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		sk = sk_next(sk);</div><div class='del'>-try_again:</div><div class='del'>-		;</div><div class='ctx'> 	} while (sk &amp;&amp; sock_net(sk) != seq_file_net(seq));</div><div class='ctx'> </div><div class='del'>-	if (!sk &amp;&amp; ++state-&gt;bucket &lt; RAW_HTABLE_SIZE) {</div><div class='del'>-		sk = sk_head(&amp;h-&gt;ht[state-&gt;bucket]);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='add'>+	if (!sk)</div><div class='add'>+		return raw_get_first(seq, state-&gt;bucket + 1);</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = raw_get_first(seq);</div><div class='add'>+	struct sock *sk = raw_get_first(seq, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (sk)</div><div class='ctx'> 		while (pos &amp;&amp; (sk = raw_get_next(seq, sk)) != NULL)</div><div class='hunk'>@@ -1039,10 +999,12 @@ static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *raw_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+	__acquires(&amp;h-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	struct raw_hashinfo *h = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct raw_hashinfo *h = pde_data(file_inode(seq-&gt;file));</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;h-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;h-&gt;lock);</div><div class='ctx'> 	return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_seq_start);</div><div class='hunk'>@@ -1052,7 +1014,7 @@ void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN)</div><div class='del'>-		sk = raw_get_first(seq);</div><div class='add'>+		sk = raw_get_first(seq, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		sk = raw_get_next(seq, v);</div><div class='ctx'> 	++*pos;</div><div class='hunk'>@@ -1061,10 +1023,11 @@ void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_seq_next);</div><div class='ctx'> </div><div class='ctx'> void raw_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+	__releases(&amp;h-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	struct raw_hashinfo *h = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct raw_hashinfo *h = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='del'>-	read_unlock(&amp;h-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_seq_stop);</div><div class='ctx'> </div><div class='hunk'>@@ -1077,14 +1040,14 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)</div><div class='ctx'> 	      srcp  = inet-&gt;inet_num;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "%4d: %08X:%04X %08X:%04X"</div><div class='del'>-		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n",</div><div class='add'>+		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u\n",</div><div class='ctx'> 		i, src, srcp, dest, destp, sp-&gt;sk_state,</div><div class='ctx'> 		sk_wmem_alloc_get(sp),</div><div class='ctx'> 		sk_rmem_alloc_get(sp),</div><div class='ctx'> 		0, 0L, 0,</div><div class='del'>-		from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),</div><div class='add'>+		from_kuid_munged(seq_user_ns(seq), sk_uid(sp)),</div><div class='ctx'> 		0, sock_i_ino(sp),</div><div class='del'>-		refcount_read(&amp;sp-&gt;sk_refcnt), sp, atomic_read(&amp;sp-&gt;sk_drops));</div><div class='add'>+		refcount_read(&amp;sp-&gt;sk_refcnt), sp, sk_drops_read(sp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raw_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -1126,6 +1089,7 @@ static __net_initdata struct pernet_operations raw_net_ops = {</div><div class='ctx'> </div><div class='ctx'> int __init raw_proc_init(void)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	return register_pernet_subsys(&amp;raw_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1134,3 +1098,27 @@ void __init raw_proc_exit(void)</div><div class='ctx'> 	unregister_pernet_subsys(&amp;raw_net_ops);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='add'>+</div><div class='add'>+static void raw_sysctl_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+	net-&gt;ipv4.sysctl_raw_l3mdev_accept = 1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init raw_sysctl_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	raw_sysctl_init_net(net);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations __net_initdata raw_sysctl_ops = {</div><div class='add'>+	.init	= raw_sysctl_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init raw_init(void)</div><div class='add'>+{</div><div class='add'>+	raw_sysctl_init_net(&amp;init_net);</div><div class='add'>+	if (register_pernet_subsys(&amp;raw_sysctl_ops))</div><div class='add'>+		panic("RAW: failed to init sysctl parameters.\n");</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c<br/>index c200065ef9a5..943e5998e0ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/raw_diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/raw_diag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/raw_diag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/raw_diag.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/inet_diag.h&gt;</div><div class='hunk'>@@ -23,9 +24,6 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)</div><div class='ctx'> 		return &amp;raw_v6_hashinfo;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_warn_once("Unexpected inet family %d\n",</div><div class='del'>-			     r-&gt;sdiag_family);</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -36,84 +34,82 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)</div><div class='ctx'>  * use helper to figure it out.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct sock *raw_lookup(struct net *net, struct sock *from,</div><div class='del'>-			       const struct inet_diag_req_v2 *req)</div><div class='add'>+static bool raw_lookup(struct net *net, const struct sock *sk,</div><div class='add'>+		       const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_diag_req_raw *r = (void *)req;</div><div class='del'>-	struct sock *sk = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (r-&gt;sdiag_family == AF_INET)</div><div class='del'>-		sk = __raw_v4_lookup(net, from, r-&gt;sdiag_raw_protocol,</div><div class='del'>-				     r-&gt;id.idiag_dst[0],</div><div class='del'>-				     r-&gt;id.idiag_src[0],</div><div class='del'>-				     r-&gt;id.idiag_if, 0);</div><div class='add'>+		return raw_v4_match(net, sk, r-&gt;sdiag_raw_protocol,</div><div class='add'>+				    r-&gt;id.idiag_dst[0],</div><div class='add'>+				    r-&gt;id.idiag_src[0],</div><div class='add'>+				    r-&gt;id.idiag_if, 0);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	else</div><div class='del'>-		sk = __raw_v6_lookup(net, from, r-&gt;sdiag_raw_protocol,</div><div class='del'>-				     (const struct in6_addr *)r-&gt;id.idiag_src,</div><div class='del'>-				     (const struct in6_addr *)r-&gt;id.idiag_dst,</div><div class='del'>-				     r-&gt;id.idiag_if, 0);</div><div class='add'>+		return raw_v6_match(net, sk, r-&gt;sdiag_raw_protocol,</div><div class='add'>+				    (const struct in6_addr *)r-&gt;id.idiag_src,</div><div class='add'>+				    (const struct in6_addr *)r-&gt;id.idiag_dst,</div><div class='add'>+				    r-&gt;id.idiag_if, 0);</div><div class='ctx'> #endif</div><div class='del'>-	return sk;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock *raw_sock_get(struct net *net, const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw_hashinfo *hashinfo = raw_get_hashinfo(r);</div><div class='del'>-	struct sock *sk = NULL, *s;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(hashinfo))</div><div class='ctx'> 		return ERR_CAST(hashinfo);</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;hashinfo-&gt;lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (slot = 0; slot &lt; RAW_HTABLE_SIZE; slot++) {</div><div class='del'>-		sk_for_each(s, &amp;hashinfo-&gt;ht[slot]) {</div><div class='del'>-			sk = raw_lookup(net, s, r);</div><div class='del'>-			if (sk) {</div><div class='add'>+		hlist = &amp;hashinfo-&gt;ht[slot];</div><div class='add'>+		sk_for_each_rcu(sk, hlist) {</div><div class='add'>+			if (raw_lookup(net, sk, r)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Grab it and keep until we fill</div><div class='del'>-				 * diag meaage to be reported, so</div><div class='add'>+				 * diag message to be reported, so</div><div class='ctx'> 				 * caller should call sock_put then.</div><div class='del'>-				 * We can do that because we're keeping</div><div class='del'>-				 * hashinfo-&gt;lock here.</div><div class='ctx'> 				 */</div><div class='del'>-				sock_hold(sk);</div><div class='del'>-				goto out_unlock;</div><div class='add'>+				if (refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='add'>+					goto out_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	sk = ERR_PTR(-ENOENT);</div><div class='ctx'> out_unlock:</div><div class='del'>-	read_unlock(&amp;hashinfo-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return sk ? sk : ERR_PTR(-ENOENT);</div><div class='add'>+	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raw_diag_dump_one(struct sk_buff *in_skb,</div><div class='del'>-			     const struct nlmsghdr *nlh,</div><div class='add'>+static int raw_diag_dump_one(struct netlink_callback *cb,</div><div class='ctx'> 			     const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct sk_buff *in_skb = cb-&gt;skb;</div><div class='ctx'> 	struct sk_buff *rep;</div><div class='ctx'> 	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	net = sock_net(in_skb-&gt;sk);</div><div class='ctx'> 	sk = raw_sock_get(net, r);</div><div class='ctx'> 	if (IS_ERR(sk))</div><div class='ctx'> 		return PTR_ERR(sk);</div><div class='ctx'> </div><div class='del'>-	rep = nlmsg_new(sizeof(struct inet_diag_msg) +</div><div class='del'>-			sizeof(struct inet_diag_meminfo) + 64,</div><div class='add'>+	rep = nlmsg_new(nla_total_size(sizeof(struct inet_diag_msg)) +</div><div class='add'>+			inet_diag_msg_attrs_size() +</div><div class='add'>+			nla_total_size(sizeof(struct inet_diag_meminfo)) + 64,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!rep) {</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = inet_sk_diag_fill(sk, NULL, rep, r,</div><div class='del'>-				sk_user_ns(NETLINK_CB(in_skb).sk),</div><div class='del'>-				NETLINK_CB(in_skb).portid,</div><div class='del'>-				nlh-&gt;nlmsg_seq, 0, nlh,</div><div class='add'>+	err = inet_sk_diag_fill(sk, NULL, rep, cb, r, 0,</div><div class='ctx'> 				netlink_net_capable(in_skb, CAP_NET_ADMIN));</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -122,36 +118,30 @@ static int raw_diag_dump_one(struct sk_buff *in_skb,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = netlink_unicast(net-&gt;diag_nlsk, rep,</div><div class='del'>-			      NETLINK_CB(in_skb).portid,</div><div class='del'>-			      MSG_DONTWAIT);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = 0;</div><div class='add'>+	err = nlmsg_unicast(net-&gt;diag_nlsk, rep, NETLINK_CB(in_skb).portid);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			struct netlink_callback *cb,</div><div class='ctx'> 			const struct inet_diag_req_v2 *r,</div><div class='del'>-			struct nlattr *bc, bool net_admin)</div><div class='add'>+			bool net_admin)</div><div class='ctx'> {</div><div class='del'>-	if (!inet_diag_bc_sk(bc, sk))</div><div class='add'>+	if (!inet_diag_bc_sk(cb-&gt;data, sk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return inet_sk_diag_fill(sk, NULL, skb, r,</div><div class='del'>-				 sk_user_ns(NETLINK_CB(cb-&gt;skb).sk),</div><div class='del'>-				 NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-				 cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='del'>-				 cb-&gt;nlh, net_admin);</div><div class='add'>+	return inet_sk_diag_fill(sk, NULL, skb, cb, r, NLM_F_MULTI, net_admin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void raw_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			  const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='add'>+			  const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='ctx'> 	bool net_admin = netlink_net_capable(cb-&gt;skb, CAP_NET_ADMIN);</div><div class='ctx'> 	struct raw_hashinfo *hashinfo = raw_get_hashinfo(r);</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	int num, s_num, slot, s_slot;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> 	struct sock *sk = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(hashinfo))</div><div class='hunk'>@@ -160,11 +150,12 @@ static void raw_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 	s_slot = cb-&gt;args[0];</div><div class='ctx'> 	num = s_num = cb-&gt;args[1];</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;hashinfo-&gt;lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (slot = s_slot; slot &lt; RAW_HTABLE_SIZE; s_num = 0, slot++) {</div><div class='ctx'> 		num = 0;</div><div class='ctx'> </div><div class='del'>-		sk_for_each(sk, &amp;hashinfo-&gt;ht[slot]) {</div><div class='add'>+		hlist = &amp;hashinfo-&gt;ht[slot];</div><div class='add'>+		sk_for_each_rcu(sk, hlist) {</div><div class='ctx'> 			struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 			if (!net_eq(sock_net(sk), net))</div><div class='hunk'>@@ -179,7 +170,7 @@ static void raw_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 			if (r-&gt;id.idiag_dport != inet-&gt;inet_dport &amp;&amp;</div><div class='ctx'> 			    r-&gt;id.idiag_dport)</div><div class='ctx'> 				goto next;</div><div class='del'>-			if (sk_diag_dump(sk, skb, cb, r, bc, net_admin) &lt; 0)</div><div class='add'>+			if (sk_diag_dump(sk, skb, cb, r, net_admin) &lt; 0)</div><div class='ctx'> 				goto out_unlock;</div><div class='ctx'> next:</div><div class='ctx'> 			num++;</div><div class='hunk'>@@ -187,7 +178,7 @@ next:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	read_unlock(&amp;hashinfo-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;args[0] = slot;</div><div class='ctx'> 	cb-&gt;args[1] = num;</div><div class='hunk'>@@ -218,6 +209,7 @@ static int raw_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct inet_diag_handler raw_diag_handler = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='ctx'> 	.dump			= raw_diag_dump,</div><div class='ctx'> 	.dump_one		= raw_diag_dump_one,</div><div class='ctx'> 	.idiag_get_info		= raw_diag_get_info,</div><div class='hunk'>@@ -262,5 +254,6 @@ static void __exit raw_diag_exit(void)</div><div class='ctx'> module_init(raw_diag_init);</div><div class='ctx'> module_exit(raw_diag_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("RAW socket monitoring via SOCK_DIAG");</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-255 /* AF_INET - IPPROTO_RAW */);</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10-255 /* AF_INET6 - IPPROTO_RAW */);</div><div class='head'>diff --git a/net/ipv4/route.c b/net/ipv4/route.c<br/>index b678466da451..b549d6a57307 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/route.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/route.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/route.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/route.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'>  *		Alan Cox	:	Added BSD route gw semantics</div><div class='ctx'>  *		Alan Cox	:	Super /proc &gt;4K</div><div class='ctx'>  *		Alan Cox	:	MTU in route table</div><div class='del'>- *		Alan Cox	: 	MSS actually. Also added the window</div><div class='add'>+ *		Alan Cox	:	MSS actually. Also added the window</div><div class='ctx'>  *					clamper.</div><div class='ctx'>  *		Sam Lantinga	:	Fixed route matching in rt_del()</div><div class='ctx'>  *		Alan Cox	:	Routing cache support.</div><div class='hunk'>@@ -40,7 +41,7 @@</div><div class='ctx'>  *		Olaf Erb	:	irtt wasn't being copied right.</div><div class='ctx'>  *		Bjorn Ekwall	:	Kerneld route support.</div><div class='ctx'>  *		Alan Cox	:	Multicast fixed (I hope)</div><div class='del'>- * 		Pavel Krauz	:	Limited broadcast fixed</div><div class='add'>+ *		Pavel Krauz	:	Limited broadcast fixed</div><div class='ctx'>  *		Mike McLagan	:	Routing by source</div><div class='ctx'>  *	Alexey Kuznetsov	:	End of old history. Split to fib.c and</div><div class='ctx'>  *					route.c and rewritten from scratch.</div><div class='hunk'>@@ -53,26 +54,18 @@</div><div class='ctx'>  *	Robert Olsson		:	Added rt_cache statistics</div><div class='ctx'>  *	Arnaldo C. Melo		:	Convert proc stuff to seq_file</div><div class='ctx'>  *	Eric Dumazet		:	hashed spinlocks and rt_check_expire() fixes.</div><div class='del'>- * 	Ilia Sotnikov		:	Ignore TOS on PMTUD and Redirect</div><div class='del'>- * 	Ilia Sotnikov		:	Removed TOS from hash calculations</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='add'>+ *	Ilia Sotnikov		:	Ignore TOS on PMTUD and Redirect</div><div class='add'>+ *	Ilia Sotnikov		:	Removed TOS from hash calculations</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv4: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='hunk'>@@ -87,19 +80,19 @@</div><div class='ctx'> #include &lt;linux/netfilter_ipv4.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/inetpeer.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='del'>-#include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/nexthop.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='hunk'>@@ -111,24 +104,20 @@</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/ip_tunnels.h&gt;</div><div class='del'>-#include &lt;net/l3mdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fib_lookup.h"</div><div class='ctx'> </div><div class='del'>-#define RT_FL_TOS(oldflp4) \</div><div class='del'>-	((oldflp4)-&gt;flowi4_tos &amp; (IPTOS_RT_MASK | RTO_ONLINK))</div><div class='del'>-</div><div class='ctx'> #define RT_GC_TIMEOUT (300*HZ)</div><div class='ctx'> </div><div class='add'>+#define DEFAULT_MIN_PMTU (512 + 20 + 20)</div><div class='add'>+#define DEFAULT_MTU_EXPIRES (10 * 60 * HZ)</div><div class='add'>+#define DEFAULT_MIN_ADVMSS 256</div><div class='ctx'> static int ip_rt_max_size;</div><div class='ctx'> static int ip_rt_redirect_number __read_mostly	= 9;</div><div class='ctx'> static int ip_rt_redirect_load __read_mostly	= HZ / 50;</div><div class='ctx'> static int ip_rt_redirect_silence __read_mostly	= ((HZ / 50) &lt;&lt; (9 + 1));</div><div class='ctx'> static int ip_rt_error_cost __read_mostly	= HZ;</div><div class='ctx'> static int ip_rt_error_burst __read_mostly	= 5 * HZ;</div><div class='del'>-static int ip_rt_mtu_expires __read_mostly	= 10 * 60 * HZ;</div><div class='del'>-static u32 ip_rt_min_pmtu __read_mostly		= 512 + 20 + 20;</div><div class='del'>-static int ip_rt_min_advmss __read_mostly	= 256;</div><div class='ctx'> </div><div class='ctx'> static int ip_rt_gc_timeout __read_mostly	= RT_GC_TIMEOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -136,13 +125,17 @@ static int ip_rt_gc_timeout __read_mostly	= RT_GC_TIMEOUT;</div><div class='ctx'>  *	Interface to generic destination cache.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie);</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct dst_entry	*ipv4_dst_check(struct dst_entry *dst, u32 cookie);</div><div class='ctx'> static unsigned int	 ipv4_default_advmss(const struct dst_entry *dst);</div><div class='del'>-static unsigned int	 ipv4_mtu(const struct dst_entry *dst);</div><div class='del'>-static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst);</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+unsigned int		ipv4_mtu(const struct dst_entry *dst);</div><div class='add'>+static void		ipv4_negative_advice(struct sock *sk,</div><div class='add'>+					     struct dst_entry *dst);</div><div class='ctx'> static void		 ipv4_link_failure(struct sk_buff *skb);</div><div class='ctx'> static void		 ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-					   struct sk_buff *skb, u32 mtu);</div><div class='add'>+					   struct sk_buff *skb, u32 mtu,</div><div class='add'>+					   bool confirm_neigh);</div><div class='ctx'> static void		 ip_do_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='ctx'> 					struct sk_buff *skb);</div><div class='ctx'> static void		ipv4_dst_destroy(struct dst_entry *dst);</div><div class='hunk'>@@ -197,7 +190,11 @@ const __u8 ip_tos2prio[16] = {</div><div class='ctx'> EXPORT_SYMBOL(ip_tos2prio);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='ctx'> #define RT_CACHE_STAT_INC(field) raw_cpu_inc(rt_cache_stat.field)</div><div class='add'>+#else</div><div class='add'>+#define RT_CACHE_STAT_INC(field) this_cpu_inc(rt_cache_stat.field)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> static void *rt_cache_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='hunk'>@@ -234,19 +231,6 @@ static const struct seq_operations rt_cache_seq_ops = {</div><div class='ctx'> 	.show   = rt_cache_seq_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int rt_cache_seq_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return seq_open(file, &amp;rt_cache_seq_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rt_cache_seq_fops = {</div><div class='del'>-	.open	 = rt_cache_seq_open,</div><div class='del'>-	.read	 = seq_read,</div><div class='del'>-	.llseek	 = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static void *rt_cpu_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -273,6 +257,7 @@ static void *rt_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 		*pos = cpu+1;</div><div class='ctx'> 		return &amp;per_cpu(rt_cache_stat, cpu);</div><div class='ctx'> 	}</div><div class='add'>+	(*pos)++;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -287,12 +272,13 @@ static int rt_cpu_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	struct rt_cache_stat *st = v;</div><div class='ctx'> </div><div class='ctx'> 	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_printf(seq, "entries  in_hit in_slow_tot in_slow_mc in_no_route in_brd in_martian_dst in_martian_src  out_hit out_slow_tot out_slow_mc  gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");</div><div class='add'>+		seq_puts(seq, "entries  in_hit   in_slow_tot in_slow_mc in_no_route in_brd   in_martian_dst in_martian_src out_hit  out_slow_tot out_slow_mc gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq,"%08x  %08x %08x %08x %08x %08x %08x %08x "</div><div class='del'>-		   " %08x %08x %08x %08x %08x %08x %08x %08x %08x \n",</div><div class='add'>+	seq_printf(seq, "%08x %08x %08x    %08x   %08x    %08x %08x       "</div><div class='add'>+			"%08x       %08x %08x     %08x    %08x %08x   "</div><div class='add'>+			"%08x     %08x        %08x        %08x\n",</div><div class='ctx'> 		   dst_entries_get_slow(&amp;ipv4_dst_ops),</div><div class='ctx'> 		   0, /* st-&gt;in_hit */</div><div class='ctx'> 		   st-&gt;in_slow_tot,</div><div class='hunk'>@@ -323,19 +309,6 @@ static const struct seq_operations rt_cpu_seq_ops = {</div><div class='ctx'> 	.show   = rt_cpu_seq_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int rt_cpu_seq_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return seq_open(file, &amp;rt_cpu_seq_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rt_cpu_seq_fops = {</div><div class='del'>-	.open	 = rt_cpu_seq_open,</div><div class='del'>-	.read	 = seq_read,</div><div class='del'>-	.llseek	 = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> static int rt_acct_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='hunk'>@@ -366,13 +339,13 @@ static int __net_init ip_rt_do_proc_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *pde;</div><div class='ctx'> </div><div class='del'>-	pde = proc_create("rt_cache", 0444, net-&gt;proc_net,</div><div class='del'>-			  &amp;rt_cache_seq_fops);</div><div class='add'>+	pde = proc_create_seq("rt_cache", 0444, net-&gt;proc_net,</div><div class='add'>+			      &amp;rt_cache_seq_ops);</div><div class='ctx'> 	if (!pde)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> </div><div class='del'>-	pde = proc_create("rt_cache", 0444,</div><div class='del'>-			  net-&gt;proc_net_stat, &amp;rt_cpu_seq_fops);</div><div class='add'>+	pde = proc_create_seq("rt_cache", 0444, net-&gt;proc_net_stat,</div><div class='add'>+			      &amp;rt_cpu_seq_ops);</div><div class='ctx'> 	if (!pde)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +395,13 @@ static inline int ip_rt_proc_init(void)</div><div class='ctx'> </div><div class='ctx'> static inline bool rt_is_expired(const struct rtable *rth)</div><div class='ctx'> {</div><div class='del'>-	return rth-&gt;rt_genid != rt_genid_ipv4(dev_net(rth-&gt;dst.dev));</div><div class='add'>+	bool res;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	res = rth-&gt;rt_genid != rt_genid_ipv4(dev_net_rcu(rth-&gt;dst.dev));</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt_cache_flush(struct net *net)</div><div class='hunk'>@@ -434,42 +413,53 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,</div><div class='ctx'> 					   struct sk_buff *skb,</div><div class='ctx'> 					   const void *daddr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='del'>-	const __be32 *pkey = daddr;</div><div class='del'>-	const struct rtable *rt;</div><div class='add'>+	const struct rtable *rt = container_of(dst, struct rtable, dst);</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct neighbour *n;</div><div class='ctx'> </div><div class='del'>-	rt = (const struct rtable *) dst;</div><div class='del'>-	if (rt-&gt;rt_gateway)</div><div class='del'>-		pkey = (const __be32 *) &amp;rt-&gt;rt_gateway;</div><div class='del'>-	else if (skb)</div><div class='del'>-		pkey = &amp;ip_hdr(skb)-&gt;daddr;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	if (likely(rt-&gt;rt_gw_family == AF_INET)) {</div><div class='add'>+		n = ip_neigh_gw4(dev, rt-&gt;rt_gw4);</div><div class='add'>+	} else if (rt-&gt;rt_gw_family == AF_INET6) {</div><div class='add'>+		n = ip_neigh_gw6(dev, &amp;rt-&gt;rt_gw6);</div><div class='add'>+        } else {</div><div class='add'>+		__be32 pkey;</div><div class='add'>+</div><div class='add'>+		pkey = skb ? ip_hdr(skb)-&gt;daddr : *((__be32 *) daddr);</div><div class='add'>+		n = ip_neigh_gw4(dev, pkey);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(n) &amp;&amp; !refcount_inc_not_zero(&amp;n-&gt;refcnt))</div><div class='add'>+		n = NULL;</div><div class='ctx'> </div><div class='del'>-	n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);</div><div class='del'>-	if (n)</div><div class='del'>-		return n;</div><div class='del'>-	return neigh_create(&amp;arp_tbl, pkey, dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipv4_confirm_neigh(const struct dst_entry *dst, const void *daddr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='add'>+	const struct rtable *rt = container_of(dst, struct rtable, dst);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='ctx'> 	const __be32 *pkey = daddr;</div><div class='del'>-	const struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	rt = (const struct rtable *)dst;</div><div class='del'>-	if (rt-&gt;rt_gateway)</div><div class='del'>-		pkey = (const __be32 *)&amp;rt-&gt;rt_gateway;</div><div class='del'>-	else if (!daddr ||</div><div class='add'>+	if (rt-&gt;rt_gw_family == AF_INET) {</div><div class='add'>+		pkey = (const __be32 *)&amp;rt-&gt;rt_gw4;</div><div class='add'>+	} else if (rt-&gt;rt_gw_family == AF_INET6) {</div><div class='add'>+		return __ipv6_confirm_neigh_stub(dev, &amp;rt-&gt;rt_gw6);</div><div class='add'>+	} else if (!daddr ||</div><div class='ctx'> 		 (rt-&gt;rt_flags &amp;</div><div class='del'>-		  (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL)))</div><div class='add'>+		  (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL))) {</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	__ipv4_confirm_neigh(dev, *(__force u32 *)pkey);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IP_IDENTS_SZ 2048u</div><div class='del'>-</div><div class='add'>+/* Hash tables of size 2048..262144 depending on RAM size.</div><div class='add'>+ * Each bucket uses 8 bytes.</div><div class='add'>+ */</div><div class='add'>+static u32 ip_idents_mask __read_mostly;</div><div class='ctx'> static atomic_t *ip_idents __read_mostly;</div><div class='ctx'> static u32 *ip_tstamps __read_mostly;</div><div class='ctx'> </div><div class='hunk'>@@ -477,61 +467,64 @@ static u32 *ip_tstamps __read_mostly;</div><div class='ctx'>  * if one generator is seldom used. This makes hard for an attacker</div><div class='ctx'>  * to infer how many packets were sent between two points in time.</div><div class='ctx'>  */</div><div class='del'>-u32 ip_idents_reserve(u32 hash, int segs)</div><div class='add'>+static u32 ip_idents_reserve(u32 hash, int segs)</div><div class='ctx'> {</div><div class='del'>-	u32 *p_tstamp = ip_tstamps + hash % IP_IDENTS_SZ;</div><div class='del'>-	atomic_t *p_id = ip_idents + hash % IP_IDENTS_SZ;</div><div class='del'>-	u32 old = READ_ONCE(*p_tstamp);</div><div class='del'>-	u32 now = (u32)jiffies;</div><div class='del'>-	u32 new, delta = 0;</div><div class='add'>+	u32 bucket, old, now = (u32)jiffies;</div><div class='add'>+	atomic_t *p_id;</div><div class='add'>+	u32 *p_tstamp;</div><div class='add'>+	u32 delta = 0;</div><div class='ctx'> </div><div class='del'>-	if (old != now &amp;&amp; cmpxchg(p_tstamp, old, now) == old)</div><div class='del'>-		delta = prandom_u32_max(now - old);</div><div class='add'>+	bucket = hash &amp; ip_idents_mask;</div><div class='add'>+	p_tstamp = ip_tstamps + bucket;</div><div class='add'>+	p_id = ip_idents + bucket;</div><div class='add'>+	old = READ_ONCE(*p_tstamp);</div><div class='ctx'> </div><div class='del'>-	/* Do not use atomic_add_return() as it makes UBSAN unhappy */</div><div class='del'>-	do {</div><div class='del'>-		old = (u32)atomic_read(p_id);</div><div class='del'>-		new = old + delta + segs;</div><div class='del'>-	} while (atomic_cmpxchg(p_id, old, new) != old);</div><div class='add'>+	if (old != now &amp;&amp; cmpxchg(p_tstamp, old, now) == old)</div><div class='add'>+		delta = get_random_u32_below(now - old);</div><div class='ctx'> </div><div class='del'>-	return new - segs;</div><div class='add'>+	/* If UBSAN reports an error there, please make sure your compiler</div><div class='add'>+	 * supports -fno-strict-overflow before reporting it that was a bug</div><div class='add'>+	 * in UBSAN, and it has been fixed in GCC-8.</div><div class='add'>+	 */</div><div class='add'>+	return atomic_add_return(segs + delta, p_id) - segs;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ip_idents_reserve);</div><div class='ctx'> </div><div class='ctx'> void __ip_select_ident(struct net *net, struct iphdr *iph, int segs)</div><div class='ctx'> {</div><div class='del'>-	static u32 ip_idents_hashrnd __read_mostly;</div><div class='ctx'> 	u32 hash, id;</div><div class='ctx'> </div><div class='del'>-	net_get_random_once(&amp;ip_idents_hashrnd, sizeof(ip_idents_hashrnd));</div><div class='add'>+	/* Note the following code is not safe, but this is okay. */</div><div class='add'>+	if (unlikely(siphash_key_is_zero(&amp;net-&gt;ipv4.ip_id_key)))</div><div class='add'>+		get_random_bytes(&amp;net-&gt;ipv4.ip_id_key,</div><div class='add'>+				 sizeof(net-&gt;ipv4.ip_id_key));</div><div class='ctx'> </div><div class='del'>-	hash = jhash_3words((__force u32)iph-&gt;daddr,</div><div class='add'>+	hash = siphash_3u32((__force u32)iph-&gt;daddr,</div><div class='ctx'> 			    (__force u32)iph-&gt;saddr,</div><div class='del'>-			    iph-&gt;protocol ^ net_hash_mix(net),</div><div class='del'>-			    ip_idents_hashrnd);</div><div class='add'>+			    iph-&gt;protocol,</div><div class='add'>+			    &amp;net-&gt;ipv4.ip_id_key);</div><div class='ctx'> 	id = ip_idents_reserve(hash, segs);</div><div class='ctx'> 	iph-&gt;id = htons(id);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ip_select_ident);</div><div class='ctx'> </div><div class='ctx'> static void __build_flow_key(const struct net *net, struct flowi4 *fl4,</div><div class='del'>-			     const struct sock *sk,</div><div class='del'>-			     const struct iphdr *iph,</div><div class='del'>-			     int oif, u8 tos,</div><div class='del'>-			     u8 prot, u32 mark, int flow_flags)</div><div class='add'>+			     const struct sock *sk, const struct iphdr *iph,</div><div class='add'>+			     int oif, __u8 tos, u8 prot, u32 mark,</div><div class='add'>+			     int flow_flags)</div><div class='ctx'> {</div><div class='del'>-	if (sk) {</div><div class='del'>-		const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	__u8 scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> </div><div class='add'>+	if (sk) {</div><div class='ctx'> 		oif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-		mark = sk-&gt;sk_mark;</div><div class='del'>-		tos = RT_CONN_FLAGS(sk);</div><div class='del'>-		prot = inet-&gt;hdrincl ? IPPROTO_RAW : sk-&gt;sk_protocol;</div><div class='del'>-	}</div><div class='del'>-	flowi4_init_output(fl4, oif, mark, tos,</div><div class='del'>-			   RT_SCOPE_UNIVERSE, prot,</div><div class='del'>-			   flow_flags,</div><div class='del'>-			   iph-&gt;daddr, iph-&gt;saddr, 0, 0,</div><div class='add'>+		mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+		tos = ip_sock_rt_tos(sk);</div><div class='add'>+		scope = ip_sock_rt_scope(sk);</div><div class='add'>+		prot = inet_test_bit(HDRINCL, sk) ? IPPROTO_RAW :</div><div class='add'>+						    sk-&gt;sk_protocol;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flowi4_init_output(fl4, oif, mark, tos &amp; INET_DSCP_MASK, scope,</div><div class='add'>+			   prot, flow_flags, iph-&gt;daddr, iph-&gt;saddr, 0, 0,</div><div class='ctx'> 			   sock_net_uid(net, sk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -541,9 +534,9 @@ static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,</div><div class='ctx'> 	const struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	int oif = skb-&gt;dev-&gt;ifindex;</div><div class='del'>-	u8 tos = RT_TOS(iph-&gt;tos);</div><div class='ctx'> 	u8 prot = iph-&gt;protocol;</div><div class='ctx'> 	u32 mark = skb-&gt;mark;</div><div class='add'>+	__u8 tos = iph-&gt;tos;</div><div class='ctx'> </div><div class='ctx'> 	__build_flow_key(net, fl4, sk, iph, oif, tos, prot, mark, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -558,11 +551,14 @@ static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)</div><div class='ctx'> 	inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='ctx'> 	if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='ctx'> 		daddr = inet_opt-&gt;opt.faddr;</div><div class='del'>-	flowi4_init_output(fl4, sk-&gt;sk_bound_dev_if, sk-&gt;sk_mark,</div><div class='del'>-			   RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,</div><div class='del'>-			   inet-&gt;hdrincl ? IPPROTO_RAW : sk-&gt;sk_protocol,</div><div class='add'>+	flowi4_init_output(fl4, sk-&gt;sk_bound_dev_if, READ_ONCE(sk-&gt;sk_mark),</div><div class='add'>+			   ip_sock_rt_tos(sk),</div><div class='add'>+			   ip_sock_rt_scope(sk),</div><div class='add'>+			   inet_test_bit(HDRINCL, sk) ?</div><div class='add'>+				IPPROTO_RAW : sk-&gt;sk_protocol,</div><div class='ctx'> 			   inet_sk_flowi_flags(sk),</div><div class='del'>-			   daddr, inet-&gt;inet_saddr, 0, 0, sk-&gt;sk_uid);</div><div class='add'>+			   daddr, inet-&gt;inet_saddr, 0, 0,</div><div class='add'>+			   sk_uid(sk));</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -595,28 +591,40 @@ static void fnhe_flush_routes(struct fib_nh_exception *fnhe)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash)</div><div class='add'>+static void fnhe_remove_oldest(struct fnhe_hash_bucket *hash)</div><div class='ctx'> {</div><div class='del'>-	struct fib_nh_exception *fnhe, *oldest;</div><div class='add'>+	struct fib_nh_exception __rcu **fnhe_p, **oldest_p;</div><div class='add'>+	struct fib_nh_exception *fnhe, *oldest = NULL;</div><div class='ctx'> </div><div class='del'>-	oldest = rcu_dereference(hash-&gt;chain);</div><div class='del'>-	for (fnhe = rcu_dereference(oldest-&gt;fnhe_next); fnhe;</div><div class='del'>-	     fnhe = rcu_dereference(fnhe-&gt;fnhe_next)) {</div><div class='del'>-		if (time_before(fnhe-&gt;fnhe_stamp, oldest-&gt;fnhe_stamp))</div><div class='add'>+	for (fnhe_p = &amp;hash-&gt;chain; ; fnhe_p = &amp;fnhe-&gt;fnhe_next) {</div><div class='add'>+		fnhe = rcu_dereference_protected(*fnhe_p,</div><div class='add'>+						 lockdep_is_held(&amp;fnhe_lock));</div><div class='add'>+		if (!fnhe)</div><div class='add'>+			break;</div><div class='add'>+		if (!oldest ||</div><div class='add'>+		    time_before(fnhe-&gt;fnhe_stamp, oldest-&gt;fnhe_stamp)) {</div><div class='ctx'> 			oldest = fnhe;</div><div class='add'>+			oldest_p = fnhe_p;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Clear oldest-&gt;fnhe_daddr to prevent this fnhe from being</div><div class='add'>+	 * rebound with new dsts in rt_bind_exception().</div><div class='add'>+	 */</div><div class='add'>+	oldest-&gt;fnhe_daddr = 0;</div><div class='ctx'> 	fnhe_flush_routes(oldest);</div><div class='del'>-	return oldest;</div><div class='add'>+	*oldest_p = oldest-&gt;fnhe_next;</div><div class='add'>+	kfree_rcu(oldest, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 fnhe_hashfun(__be32 daddr)</div><div class='add'>+static u32 fnhe_hashfun(__be32 daddr)</div><div class='ctx'> {</div><div class='del'>-	static u32 fnhe_hashrnd __read_mostly;</div><div class='del'>-	u32 hval;</div><div class='add'>+	static siphash_aligned_key_t fnhe_hash_key;</div><div class='add'>+	u64 hval;</div><div class='ctx'> </div><div class='del'>-	net_get_random_once(&amp;fnhe_hashrnd, sizeof(fnhe_hashrnd));</div><div class='del'>-	hval = jhash_1word((__force u32) daddr, fnhe_hashrnd);</div><div class='del'>-	return hash_32(hval, FNHE_HASH_SHIFT);</div><div class='add'>+	net_get_random_once(&amp;fnhe_hash_key, sizeof(fnhe_hash_key));</div><div class='add'>+	hval = siphash_1u32((__force u32)daddr, &amp;fnhe_hash_key);</div><div class='add'>+	return hash_64(hval, FNHE_HASH_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fill_route_from_fnhe(struct rtable *rt, struct fib_nh_exception *fnhe)</div><div class='hunk'>@@ -627,13 +635,15 @@ static void fill_route_from_fnhe(struct rtable *rt, struct fib_nh_exception *fnh</div><div class='ctx'> </div><div class='ctx'> 	if (fnhe-&gt;fnhe_gw) {</div><div class='ctx'> 		rt-&gt;rt_flags |= RTCF_REDIRECTED;</div><div class='del'>-		rt-&gt;rt_gateway = fnhe-&gt;fnhe_gw;</div><div class='ctx'> 		rt-&gt;rt_uses_gateway = 1;</div><div class='add'>+		rt-&gt;rt_gw_family = AF_INET;</div><div class='add'>+		rt-&gt;rt_gw4 = fnhe-&gt;fnhe_gw;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,</div><div class='del'>-				  u32 pmtu, bool lock, unsigned long expires)</div><div class='add'>+static void update_or_create_fnhe(struct fib_nh_common *nhc, __be32 daddr,</div><div class='add'>+				  __be32 gw, u32 pmtu, bool lock,</div><div class='add'>+				  unsigned long expires)</div><div class='ctx'> {</div><div class='ctx'> 	struct fnhe_hash_bucket *hash;</div><div class='ctx'> 	struct fib_nh_exception *fnhe;</div><div class='hunk'>@@ -642,17 +652,17 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int depth;</div><div class='ctx'> </div><div class='del'>-	genid = fnhe_genid(dev_net(nh-&gt;nh_dev));</div><div class='add'>+	genid = fnhe_genid(dev_net(nhc-&gt;nhc_dev));</div><div class='ctx'> 	hval = fnhe_hashfun(daddr);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;fnhe_lock);</div><div class='ctx'> </div><div class='del'>-	hash = rcu_dereference(nh-&gt;nh_exceptions);</div><div class='add'>+	hash = rcu_dereference(nhc-&gt;nhc_exceptions);</div><div class='ctx'> 	if (!hash) {</div><div class='ctx'> 		hash = kcalloc(FNHE_HASH_SIZE, sizeof(*hash), GFP_ATOMIC);</div><div class='ctx'> 		if (!hash)</div><div class='ctx'> 			goto out_unlock;</div><div class='del'>-		rcu_assign_pointer(nh-&gt;nh_exceptions, hash);</div><div class='add'>+		rcu_assign_pointer(nhc-&gt;nhc_exceptions, hash);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hash += hval;</div><div class='hunk'>@@ -683,16 +693,21 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,</div><div class='ctx'> 		if (rt)</div><div class='ctx'> 			fill_route_from_fnhe(rt, fnhe);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (depth &gt; FNHE_RECLAIM_DEPTH)</div><div class='del'>-			fnhe = fnhe_oldest(hash);</div><div class='del'>-		else {</div><div class='del'>-			fnhe = kzalloc(sizeof(*fnhe), GFP_ATOMIC);</div><div class='del'>-			if (!fnhe)</div><div class='del'>-				goto out_unlock;</div><div class='del'>-</div><div class='del'>-			fnhe-&gt;fnhe_next = hash-&gt;chain;</div><div class='del'>-			rcu_assign_pointer(hash-&gt;chain, fnhe);</div><div class='add'>+		/* Randomize max depth to avoid some side channels attacks. */</div><div class='add'>+		int max_depth = FNHE_RECLAIM_DEPTH +</div><div class='add'>+				get_random_u32_below(FNHE_RECLAIM_DEPTH);</div><div class='add'>+</div><div class='add'>+		while (depth &gt; max_depth) {</div><div class='add'>+			fnhe_remove_oldest(hash);</div><div class='add'>+			depth--;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		fnhe = kzalloc(sizeof(*fnhe), GFP_ATOMIC);</div><div class='add'>+		if (!fnhe)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		fnhe-&gt;fnhe_next = hash-&gt;chain;</div><div class='add'>+</div><div class='ctx'> 		fnhe-&gt;fnhe_genid = genid;</div><div class='ctx'> 		fnhe-&gt;fnhe_daddr = daddr;</div><div class='ctx'> 		fnhe-&gt;fnhe_gw = gw;</div><div class='hunk'>@@ -700,20 +715,23 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,</div><div class='ctx'> 		fnhe-&gt;fnhe_mtu_locked = lock;</div><div class='ctx'> 		fnhe-&gt;fnhe_expires = max(1UL, expires);</div><div class='ctx'> </div><div class='add'>+		rcu_assign_pointer(hash-&gt;chain, fnhe);</div><div class='add'>+</div><div class='ctx'> 		/* Exception created; mark the cached routes for the nexthop</div><div class='ctx'> 		 * stale, so anyone caching it rechecks if this exception</div><div class='ctx'> 		 * applies to them.</div><div class='ctx'> 		 */</div><div class='del'>-		rt = rcu_dereference(nh-&gt;nh_rth_input);</div><div class='add'>+		rt = rcu_dereference(nhc-&gt;nhc_rth_input);</div><div class='ctx'> 		if (rt)</div><div class='del'>-			rt-&gt;dst.obsolete = DST_OBSOLETE_KILL;</div><div class='add'>+			WRITE_ONCE(rt-&gt;dst.obsolete, DST_OBSOLETE_KILL);</div><div class='ctx'> </div><div class='ctx'> 		for_each_possible_cpu(i) {</div><div class='ctx'> 			struct rtable __rcu **prt;</div><div class='del'>-			prt = per_cpu_ptr(nh-&gt;nh_pcpu_rth_output, i);</div><div class='add'>+</div><div class='add'>+			prt = per_cpu_ptr(nhc-&gt;nhc_pcpu_rth_output, i);</div><div class='ctx'> 			rt = rcu_dereference(*prt);</div><div class='ctx'> 			if (rt)</div><div class='del'>-				rt-&gt;dst.obsolete = DST_OBSOLETE_KILL;</div><div class='add'>+				WRITE_ONCE(rt-&gt;dst.obsolete, DST_OBSOLETE_KILL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -745,7 +763,7 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;rt_gateway != old_gw)</div><div class='add'>+	if (rt-&gt;rt_gw_family != AF_INET || rt-&gt;rt_gw4 != old_gw)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	in_dev = __in_dev_get_rcu(dev);</div><div class='hunk'>@@ -768,22 +786,24 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow</div><div class='ctx'> 			goto reject_redirect;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	n = __ipv4_neigh_lookup(rt-&gt;dst.dev, new_gw);</div><div class='add'>+	n = __ipv4_neigh_lookup(rt-&gt;dst.dev, (__force u32)new_gw);</div><div class='ctx'> 	if (!n)</div><div class='ctx'> 		n = neigh_create(&amp;arp_tbl, &amp;new_gw, rt-&gt;dst.dev);</div><div class='ctx'> 	if (!IS_ERR(n)) {</div><div class='del'>-		if (!(n-&gt;nud_state &amp; NUD_VALID)) {</div><div class='add'>+		if (!(READ_ONCE(n-&gt;nud_state) &amp; NUD_VALID)) {</div><div class='ctx'> 			neigh_event_send(n, NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (fib_lookup(net, fl4, &amp;res, 0) == 0) {</div><div class='del'>-				struct fib_nh *nh = &amp;FIB_RES_NH(res);</div><div class='add'>+				struct fib_nh_common *nhc;</div><div class='ctx'> </div><div class='del'>-				update_or_create_fnhe(nh, fl4-&gt;daddr, new_gw,</div><div class='add'>+				fib_select_path(net, &amp;res, fl4, skb);</div><div class='add'>+				nhc = FIB_RES_NHC(res);</div><div class='add'>+				update_or_create_fnhe(nhc, fl4-&gt;daddr, new_gw,</div><div class='ctx'> 						0, false,</div><div class='ctx'> 						jiffies + ip_rt_gc_timeout);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (kill_route)</div><div class='del'>-				rt-&gt;dst.obsolete = DST_OBSOLETE_KILL;</div><div class='add'>+				WRITE_ONCE(rt-&gt;dst.obsolete, DST_OBSOLETE_KILL);</div><div class='ctx'> 			call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, n);</div><div class='ctx'> 		}</div><div class='ctx'> 		neigh_release(n);</div><div class='hunk'>@@ -813,32 +833,25 @@ static void ip_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_buf</div><div class='ctx'> 	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	int oif = skb-&gt;dev-&gt;ifindex;</div><div class='del'>-	u8 tos = RT_TOS(iph-&gt;tos);</div><div class='ctx'> 	u8 prot = iph-&gt;protocol;</div><div class='ctx'> 	u32 mark = skb-&gt;mark;</div><div class='add'>+	__u8 tos = iph-&gt;tos;</div><div class='ctx'> </div><div class='del'>-	rt = (struct rtable *) dst;</div><div class='add'>+	rt = dst_rtable(dst);</div><div class='ctx'> </div><div class='ctx'> 	__build_flow_key(net, &amp;fl4, sk, iph, oif, tos, prot, mark, 0);</div><div class='ctx'> 	__ip_do_redirect(rt, skb, &amp;fl4, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)</div><div class='add'>+static void ipv4_negative_advice(struct sock *sk,</div><div class='add'>+				 struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct rtable *rt = (struct rtable *)dst;</div><div class='del'>-	struct dst_entry *ret = dst;</div><div class='add'>+	struct rtable *rt = dst_rtable(dst);</div><div class='ctx'> </div><div class='del'>-	if (rt) {</div><div class='del'>-		if (dst-&gt;obsolete &gt; 0) {</div><div class='del'>-			ip_rt_put(rt);</div><div class='del'>-			ret = NULL;</div><div class='del'>-		} else if ((rt-&gt;rt_flags &amp; RTCF_REDIRECTED) ||</div><div class='del'>-			   rt-&gt;dst.expires) {</div><div class='del'>-			ip_rt_put(rt);</div><div class='del'>-			ret = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='add'>+	if ((READ_ONCE(dst-&gt;obsolete) &gt; 0) ||</div><div class='add'>+	    (rt-&gt;rt_flags &amp; RTCF_REDIRECTED) ||</div><div class='add'>+	    READ_ONCE(rt-&gt;dst.expires))</div><div class='add'>+		sk_dst_reset(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -874,11 +887,11 @@ void ip_rt_send_redirect(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> 	log_martians = IN_DEV_LOG_MARTIANS(in_dev);</div><div class='ctx'> 	vif = l3mdev_master_ifindex_rcu(rt-&gt;dst.dev);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	net = dev_net(rt-&gt;dst.dev);</div><div class='del'>-	peer = inet_getpeer_v4(net-&gt;ipv4.peers, ip_hdr(skb)-&gt;saddr, vif, 1);</div><div class='add'>+	peer = inet_getpeer_v4(net-&gt;ipv4.peers, ip_hdr(skb)-&gt;saddr, vif);</div><div class='ctx'> 	if (!peer) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST,</div><div class='ctx'> 			  rt_nexthop(rt, ip_hdr(skb)-&gt;daddr));</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -887,39 +900,39 @@ void ip_rt_send_redirect(struct sk_buff *skb)</div><div class='ctx'> 	/* No redirected packets during ip_rt_redirect_silence;</div><div class='ctx'> 	 * reset the algorithm.</div><div class='ctx'> 	 */</div><div class='del'>-	if (time_after(jiffies, peer-&gt;rate_last + ip_rt_redirect_silence))</div><div class='add'>+	if (time_after(jiffies, peer-&gt;rate_last + ip_rt_redirect_silence)) {</div><div class='ctx'> 		peer-&gt;rate_tokens = 0;</div><div class='add'>+		peer-&gt;n_redirects = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Too many ignored redirects; do not send anything</div><div class='ctx'> 	 * set dst.rate_last to the last seen redirected packet.</div><div class='ctx'> 	 */</div><div class='del'>-	if (peer-&gt;rate_tokens &gt;= ip_rt_redirect_number) {</div><div class='add'>+	if (peer-&gt;n_redirects &gt;= ip_rt_redirect_number) {</div><div class='ctx'> 		peer-&gt;rate_last = jiffies;</div><div class='del'>-		goto out_put_peer;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for load limit; set rate_last to the latest sent</div><div class='ctx'> 	 * redirect.</div><div class='ctx'> 	 */</div><div class='del'>-	if (peer-&gt;rate_tokens == 0 ||</div><div class='add'>+	if (peer-&gt;n_redirects == 0 ||</div><div class='ctx'> 	    time_after(jiffies,</div><div class='ctx'> 		       (peer-&gt;rate_last +</div><div class='del'>-			(ip_rt_redirect_load &lt;&lt; peer-&gt;rate_tokens)))) {</div><div class='add'>+			(ip_rt_redirect_load &lt;&lt; peer-&gt;n_redirects)))) {</div><div class='ctx'> 		__be32 gw = rt_nexthop(rt, ip_hdr(skb)-&gt;daddr);</div><div class='ctx'> </div><div class='ctx'> 		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, gw);</div><div class='ctx'> 		peer-&gt;rate_last = jiffies;</div><div class='del'>-		++peer-&gt;rate_tokens;</div><div class='del'>-#ifdef CONFIG_IP_ROUTE_VERBOSE</div><div class='del'>-		if (log_martians &amp;&amp;</div><div class='del'>-		    peer-&gt;rate_tokens == ip_rt_redirect_number)</div><div class='add'>+		++peer-&gt;n_redirects;</div><div class='add'>+		if (IS_ENABLED(CONFIG_IP_ROUTE_VERBOSE) &amp;&amp; log_martians &amp;&amp;</div><div class='add'>+		    peer-&gt;n_redirects == ip_rt_redirect_number)</div><div class='ctx'> 			net_warn_ratelimited("host %pI4/if%d ignores redirects for %pI4 to %pI4\n",</div><div class='ctx'> 					     &amp;ip_hdr(skb)-&gt;saddr, inet_iif(skb),</div><div class='ctx'> 					     &amp;ip_hdr(skb)-&gt;daddr, &amp;gw);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-out_put_peer:</div><div class='del'>-	inet_putpeer(peer);</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip_error(struct sk_buff *skb)</div><div class='hunk'>@@ -930,6 +943,7 @@ static int ip_error(struct sk_buff *skb)</div><div class='ctx'> 	struct inet_peer *peer;</div><div class='ctx'> 	unsigned long now;</div><div class='ctx'> 	struct net *net;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	bool send;</div><div class='ctx'> 	int code;</div><div class='ctx'> </div><div class='hunk'>@@ -949,10 +963,12 @@ static int ip_error(struct sk_buff *skb)</div><div class='ctx'> 	if (!IN_DEV_FORWARD(in_dev)) {</div><div class='ctx'> 		switch (rt-&gt;dst.error) {</div><div class='ctx'> 		case EHOSTUNREACH:</div><div class='add'>+			SKB_DR_SET(reason, IP_INADDRERRORS);</div><div class='ctx'> 			__IP_INC_STATS(net, IPSTATS_MIB_INADDRERRORS);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ENETUNREACH:</div><div class='add'>+			SKB_DR_SET(reason, IP_INNOROUTES);</div><div class='ctx'> 			__IP_INC_STATS(net, IPSTATS_MIB_INNOROUTES);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -968,6 +984,7 @@ static int ip_error(struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ENETUNREACH:</div><div class='ctx'> 		code = ICMP_NET_UNREACH;</div><div class='add'>+		SKB_DR_SET(reason, IP_INNOROUTES);</div><div class='ctx'> 		__IP_INC_STATS(net, IPSTATS_MIB_INNOROUTES);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EACCES:</div><div class='hunk'>@@ -975,9 +992,9 @@ static int ip_error(struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	peer = inet_getpeer_v4(net-&gt;ipv4.peers, ip_hdr(skb)-&gt;saddr,</div><div class='del'>-			       l3mdev_master_ifindex(skb-&gt;dev), 1);</div><div class='del'>-</div><div class='add'>+			       l3mdev_master_ifindex_rcu(skb-&gt;dev));</div><div class='ctx'> 	send = true;</div><div class='ctx'> 	if (peer) {</div><div class='ctx'> 		now = jiffies;</div><div class='hunk'>@@ -989,12 +1006,13 @@ static int ip_error(struct sk_buff *skb)</div><div class='ctx'> 			peer-&gt;rate_tokens -= ip_rt_error_cost;</div><div class='ctx'> 		else</div><div class='ctx'> 			send = false;</div><div class='del'>-		inet_putpeer(peer);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (send)</div><div class='ctx'> 		icmp_send(skb, ICMP_DEST_UNREACH, code, 0);</div><div class='ctx'> </div><div class='del'>-out:	kfree_skb(skb);</div><div class='add'>+out:	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1003,54 +1021,78 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)</div><div class='ctx'> 	struct dst_entry *dst = &amp;rt-&gt;dst;</div><div class='ctx'> 	struct fib_result res;</div><div class='ctx'> 	bool lock = false;</div><div class='add'>+	struct net *net;</div><div class='add'>+	u32 old_mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (ip_mtu_locked(dst))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ipv4_mtu(dst) &lt; mtu)</div><div class='add'>+	old_mtu = ipv4_mtu(dst);</div><div class='add'>+	if (old_mtu &lt; mtu)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (mtu &lt; ip_rt_min_pmtu) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='add'>+	if (mtu &lt; net-&gt;ipv4.ip_rt_min_pmtu) {</div><div class='ctx'> 		lock = true;</div><div class='del'>-		mtu = ip_rt_min_pmtu;</div><div class='add'>+		mtu = min(old_mtu, net-&gt;ipv4.ip_rt_min_pmtu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;rt_pmtu == mtu &amp;&amp;</div><div class='del'>-	    time_before(jiffies, dst-&gt;expires - ip_rt_mtu_expires / 2))</div><div class='del'>-		return;</div><div class='add'>+	if (rt-&gt;rt_pmtu == mtu &amp;&amp; !lock &amp;&amp;</div><div class='add'>+	    time_before(jiffies, READ_ONCE(dst-&gt;expires) -</div><div class='add'>+				 net-&gt;ipv4.ip_rt_mtu_expires / 2))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (fib_lookup(dev_net(dst-&gt;dev), fl4, &amp;res, 0) == 0) {</div><div class='del'>-		struct fib_nh *nh = &amp;FIB_RES_NH(res);</div><div class='add'>+	if (fib_lookup(net, fl4, &amp;res, 0) == 0) {</div><div class='add'>+		struct fib_nh_common *nhc;</div><div class='add'>+</div><div class='add'>+		fib_select_path(net, &amp;res, fl4, NULL);</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+		if (fib_info_num_path(res.fi) &gt; 1) {</div><div class='add'>+			int nhsel;</div><div class='ctx'> </div><div class='del'>-		update_or_create_fnhe(nh, fl4-&gt;daddr, 0, mtu, lock,</div><div class='del'>-				      jiffies + ip_rt_mtu_expires);</div><div class='add'>+			for (nhsel = 0; nhsel &lt; fib_info_num_path(res.fi); nhsel++) {</div><div class='add'>+				nhc = fib_info_nhc(res.fi, nhsel);</div><div class='add'>+				update_or_create_fnhe(nhc, fl4-&gt;daddr, 0, mtu, lock,</div><div class='add'>+						      jiffies + net-&gt;ipv4.ip_rt_mtu_expires);</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+#endif /* CONFIG_IP_ROUTE_MULTIPATH */</div><div class='add'>+		nhc = FIB_RES_NHC(res);</div><div class='add'>+		update_or_create_fnhe(nhc, fl4-&gt;daddr, 0, mtu, lock,</div><div class='add'>+				      jiffies + net-&gt;ipv4.ip_rt_mtu_expires);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb, u32 mtu)</div><div class='add'>+			      struct sk_buff *skb, u32 mtu,</div><div class='add'>+			      bool confirm_neigh)</div><div class='ctx'> {</div><div class='del'>-	struct rtable *rt = (struct rtable *) dst;</div><div class='add'>+	struct rtable *rt = dst_rtable(dst);</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> </div><div class='ctx'> 	ip_rt_build_flow_key(&amp;fl4, sk, skb);</div><div class='add'>+</div><div class='add'>+	/* Don't make lookup fail for bridged encapsulations */</div><div class='add'>+	if (skb &amp;&amp; netif_is_any_bridge_port(skb-&gt;dev))</div><div class='add'>+		fl4.flowi4_oif = 0;</div><div class='add'>+</div><div class='ctx'> 	__ip_rt_update_pmtu(rt, &amp;fl4, mtu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,</div><div class='del'>-		      int oif, u32 mark, u8 protocol, int flow_flags)</div><div class='add'>+		      int oif, u8 protocol)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='add'>+	u32 mark = IP4_REPLY_MARK(net, skb-&gt;mark);</div><div class='ctx'> </div><div class='del'>-	if (!mark)</div><div class='del'>-		mark = IP4_REPLY_MARK(net, skb-&gt;mark);</div><div class='del'>-</div><div class='del'>-	__build_flow_key(net, &amp;fl4, NULL, iph, oif,</div><div class='del'>-			 RT_TOS(iph-&gt;tos), protocol, mark, flow_flags);</div><div class='add'>+	__build_flow_key(net, &amp;fl4, NULL, iph, oif, iph-&gt;tos, protocol, mark,</div><div class='add'>+			 0);</div><div class='ctx'> 	rt = __ip_route_output_key(net, &amp;fl4);</div><div class='ctx'> 	if (!IS_ERR(rt)) {</div><div class='ctx'> 		__ip_rt_update_pmtu(rt, &amp;fl4, mtu);</div><div class='hunk'>@@ -1061,7 +1103,7 @@ EXPORT_SYMBOL_GPL(ipv4_update_pmtu);</div><div class='ctx'> </div><div class='ctx'> static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='hunk'>@@ -1079,7 +1121,7 @@ static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)</div><div class='ctx'> </div><div class='ctx'> void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct dst_entry *odst = NULL;</div><div class='hunk'>@@ -1100,8 +1142,8 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)</div><div class='ctx'> </div><div class='ctx'> 	__build_flow_key(net, &amp;fl4, sk, iph, 0, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	rt = (struct rtable *)odst;</div><div class='del'>-	if (odst-&gt;obsolete &amp;&amp; !odst-&gt;ops-&gt;check(odst, 0)) {</div><div class='add'>+	rt = dst_rtable(odst);</div><div class='add'>+	if (READ_ONCE(odst-&gt;obsolete) &amp;&amp; !odst-&gt;ops-&gt;check(odst, 0)) {</div><div class='ctx'> 		rt = ip_route_output_flow(sock_net(sk), &amp;fl4, sk);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1109,7 +1151,7 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)</div><div class='ctx'> 		new = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__ip_rt_update_pmtu((struct rtable *) xfrm_dst_path(&amp;rt-&gt;dst), &amp;fl4, mtu);</div><div class='add'>+	__ip_rt_update_pmtu(dst_rtable(xfrm_dst_path(&amp;rt-&gt;dst)), &amp;fl4, mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (!dst_check(&amp;rt-&gt;dst, 0)) {</div><div class='ctx'> 		if (new)</div><div class='hunk'>@@ -1132,14 +1174,13 @@ out:</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu);</div><div class='ctx'> </div><div class='ctx'> void ipv4_redirect(struct sk_buff *skb, struct net *net,</div><div class='del'>-		   int oif, u32 mark, u8 protocol, int flow_flags)</div><div class='add'>+		   int oif, u8 protocol)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	__build_flow_key(net, &amp;fl4, NULL, iph, oif,</div><div class='del'>-			 RT_TOS(iph-&gt;tos), protocol, mark, flow_flags);</div><div class='add'>+	__build_flow_key(net, &amp;fl4, NULL, iph, oif, iph-&gt;tos, protocol, 0, 0);</div><div class='ctx'> 	rt = __ip_route_output_key(net, &amp;fl4);</div><div class='ctx'> 	if (!IS_ERR(rt)) {</div><div class='ctx'> 		__ip_do_redirect(rt, skb, &amp;fl4, false);</div><div class='hunk'>@@ -1150,7 +1191,7 @@ EXPORT_SYMBOL_GPL(ipv4_redirect);</div><div class='ctx'> </div><div class='ctx'> void ipv4_sk_redirect(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *) skb-&gt;data;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='hunk'>@@ -1164,9 +1205,10 @@ void ipv4_sk_redirect(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipv4_sk_redirect);</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct dst_entry *ipv4_dst_check(struct dst_entry *dst,</div><div class='add'>+							 u32 cookie)</div><div class='ctx'> {</div><div class='del'>-	struct rtable *rt = (struct rtable *) dst;</div><div class='add'>+	struct rtable *rt = dst_rtable(dst);</div><div class='ctx'> </div><div class='ctx'> 	/* All IPV4 dsts are created with -&gt;obsolete set to the value</div><div class='ctx'> 	 * DST_OBSOLETE_FORCE_CHK which forces validation calls down</div><div class='hunk'>@@ -1174,18 +1216,50 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * When a PMTU/redirect information update invalidates a route,</div><div class='ctx'> 	 * this is indicated by setting obsolete to DST_OBSOLETE_KILL or</div><div class='del'>-	 * DST_OBSOLETE_DEAD by dst_free().</div><div class='add'>+	 * DST_OBSOLETE_DEAD.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dst-&gt;obsolete != DST_OBSOLETE_FORCE_CHK || rt_is_expired(rt))</div><div class='add'>+	if (READ_ONCE(dst-&gt;obsolete) != DST_OBSOLETE_FORCE_CHK ||</div><div class='add'>+	    rt_is_expired(rt))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='add'>+EXPORT_INDIRECT_CALLABLE(ipv4_dst_check);</div><div class='add'>+</div><div class='add'>+static void ipv4_send_dest_unreach(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct inet_skb_parm parm;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Recompile ip options since IPCB may not be valid anymore.</div><div class='add'>+	 * Also check we have a reasonable ipv4 header.</div><div class='add'>+	 */</div><div class='add'>+	if (!pskb_network_may_pull(skb, sizeof(struct iphdr)) ||</div><div class='add'>+	    ip_hdr(skb)-&gt;version != 4 || ip_hdr(skb)-&gt;ihl &lt; 5)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;parm, 0, sizeof(parm));</div><div class='add'>+	if (ip_hdr(skb)-&gt;ihl &gt; 5) {</div><div class='add'>+		if (!pskb_network_may_pull(skb, ip_hdr(skb)-&gt;ihl * 4))</div><div class='add'>+			return;</div><div class='add'>+		parm.opt.optlen = ip_hdr(skb)-&gt;ihl * 4 - sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = skb-&gt;dev ? skb-&gt;dev : skb_rtable(skb)-&gt;dst.dev;</div><div class='add'>+		res = __ip_options_compile(dev_net(dev), &amp;parm.opt, skb, NULL);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (res)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	__icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0, &amp;parm);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void ipv4_link_failure(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0);</div><div class='add'>+	ipv4_send_dest_unreach(skb);</div><div class='ctx'> </div><div class='ctx'> 	rt = skb_rtable(skb);</div><div class='ctx'> 	if (rt)</div><div class='hunk'>@@ -1203,12 +1277,12 @@ static int ip_rt_bug(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-   We do not cache source address of outgoing interface,</div><div class='del'>-   because it is used only by IP RR, TS and SRR options,</div><div class='del'>-   so that it out of fast path.</div><div class='del'>-</div><div class='del'>-   BTW remember: "addr" is allowed to be not aligned</div><div class='del'>-   in IP options!</div><div class='add'>+ * We do not cache source address of outgoing interface,</div><div class='add'>+ * because it is used only by IP RR, TS and SRR options,</div><div class='add'>+ * so that it out of fast path.</div><div class='add'>+ *</div><div class='add'>+ * BTW remember: "addr" is allowed to be not aligned</div><div class='add'>+ * in IP options!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt)</div><div class='hunk'>@@ -1219,22 +1293,19 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt)</div><div class='ctx'> 		src = ip_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	else {</div><div class='ctx'> 		struct fib_result res;</div><div class='del'>-		struct flowi4 fl4;</div><div class='del'>-		struct iphdr *iph;</div><div class='del'>-</div><div class='del'>-		iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-		memset(&amp;fl4, 0, sizeof(fl4));</div><div class='del'>-		fl4.daddr = iph-&gt;daddr;</div><div class='del'>-		fl4.saddr = iph-&gt;saddr;</div><div class='del'>-		fl4.flowi4_tos = RT_TOS(iph-&gt;tos);</div><div class='del'>-		fl4.flowi4_oif = rt-&gt;dst.dev-&gt;ifindex;</div><div class='del'>-		fl4.flowi4_iif = skb-&gt;dev-&gt;ifindex;</div><div class='del'>-		fl4.flowi4_mark = skb-&gt;mark;</div><div class='add'>+		struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+		struct flowi4 fl4 = {</div><div class='add'>+			.daddr = iph-&gt;daddr,</div><div class='add'>+			.saddr = iph-&gt;saddr,</div><div class='add'>+			.flowi4_dscp = ip4h_dscp(iph),</div><div class='add'>+			.flowi4_oif = rt-&gt;dst.dev-&gt;ifindex,</div><div class='add'>+			.flowi4_iif = skb-&gt;dev-&gt;ifindex,</div><div class='add'>+			.flowi4_mark = skb-&gt;mark,</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		if (fib_lookup(dev_net(rt-&gt;dst.dev), &amp;fl4, &amp;res, 0) == 0)</div><div class='del'>-			src = FIB_RES_PREFSRC(dev_net(rt-&gt;dst.dev), res);</div><div class='add'>+			src = fib_result_prefsrc(dev_net(rt-&gt;dst.dev), &amp;res);</div><div class='ctx'> 		else</div><div class='ctx'> 			src = inet_select_addr(rt-&gt;dst.dev,</div><div class='ctx'> 					       rt_nexthop(rt, iph-&gt;daddr),</div><div class='hunk'>@@ -1257,36 +1328,25 @@ static void set_class_tag(struct rtable *rt, u32 tag)</div><div class='ctx'> static unsigned int ipv4_default_advmss(const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int header_size = sizeof(struct tcphdr) + sizeof(struct iphdr);</div><div class='del'>-	unsigned int advmss = max_t(unsigned int, ipv4_mtu(dst) - header_size,</div><div class='del'>-				    ip_rt_min_advmss);</div><div class='add'>+	unsigned int advmss;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='add'>+	advmss = max_t(unsigned int, ipv4_mtu(dst) - header_size,</div><div class='add'>+				   net-&gt;ipv4.ip_rt_min_advmss);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return min(advmss, IPV4_MAX_PMTU - header_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ipv4_mtu(const struct dst_entry *dst)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE unsigned int ipv4_mtu(const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	const struct rtable *rt = (const struct rtable *) dst;</div><div class='del'>-	unsigned int mtu = rt-&gt;rt_pmtu;</div><div class='del'>-</div><div class='del'>-	if (!mtu || time_after_eq(jiffies, rt-&gt;dst.expires))</div><div class='del'>-		mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='del'>-</div><div class='del'>-	if (mtu)</div><div class='del'>-		return mtu;</div><div class='del'>-</div><div class='del'>-	mtu = READ_ONCE(dst-&gt;dev-&gt;mtu);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ip_mtu_locked(dst))) {</div><div class='del'>-		if (rt-&gt;rt_uses_gateway &amp;&amp; mtu &gt; 576)</div><div class='del'>-			mtu = 576;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mtu = min_t(unsigned int, mtu, IP_MAX_MTU);</div><div class='del'>-</div><div class='del'>-	return mtu - lwtunnel_headroom(dst-&gt;lwtstate, mtu);</div><div class='add'>+	return ip_dst_mtu_maybe_forward(dst, false);</div><div class='ctx'> }</div><div class='add'>+EXPORT_INDIRECT_CALLABLE(ipv4_mtu);</div><div class='ctx'> </div><div class='del'>-static void ip_del_fnhe(struct fib_nh *nh, __be32 daddr)</div><div class='add'>+static void ip_del_fnhe(struct fib_nh_common *nhc, __be32 daddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fnhe_hash_bucket *hash;</div><div class='ctx'> 	struct fib_nh_exception *fnhe, __rcu **fnhe_p;</div><div class='hunk'>@@ -1294,7 +1354,7 @@ static void ip_del_fnhe(struct fib_nh *nh, __be32 daddr)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;fnhe_lock);</div><div class='ctx'> </div><div class='del'>-	hash = rcu_dereference_protected(nh-&gt;nh_exceptions,</div><div class='add'>+	hash = rcu_dereference_protected(nhc-&gt;nhc_exceptions,</div><div class='ctx'> 					 lockdep_is_held(&amp;fnhe_lock));</div><div class='ctx'> 	hash += hval;</div><div class='ctx'> </div><div class='hunk'>@@ -1304,6 +1364,10 @@ static void ip_del_fnhe(struct fib_nh *nh, __be32 daddr)</div><div class='ctx'> 		if (fnhe-&gt;fnhe_daddr == daddr) {</div><div class='ctx'> 			rcu_assign_pointer(*fnhe_p, rcu_dereference_protected(</div><div class='ctx'> 				fnhe-&gt;fnhe_next, lockdep_is_held(&amp;fnhe_lock)));</div><div class='add'>+			/* set fnhe_daddr to 0 to ensure it won't bind with</div><div class='add'>+			 * new dsts in rt_bind_exception().</div><div class='add'>+			 */</div><div class='add'>+			fnhe-&gt;fnhe_daddr = 0;</div><div class='ctx'> 			fnhe_flush_routes(fnhe);</div><div class='ctx'> 			kfree_rcu(fnhe, rcu);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1316,9 +1380,10 @@ static void ip_del_fnhe(struct fib_nh *nh, __be32 daddr)</div><div class='ctx'> 	spin_unlock_bh(&amp;fnhe_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib_nh_exception *find_exception(struct fib_nh *nh, __be32 daddr)</div><div class='add'>+static struct fib_nh_exception *find_exception(struct fib_nh_common *nhc,</div><div class='add'>+					       __be32 daddr)</div><div class='ctx'> {</div><div class='del'>-	struct fnhe_hash_bucket *hash = rcu_dereference(nh-&gt;nh_exceptions);</div><div class='add'>+	struct fnhe_hash_bucket *hash = rcu_dereference(nhc-&gt;nhc_exceptions);</div><div class='ctx'> 	struct fib_nh_exception *fnhe;</div><div class='ctx'> 	u32 hval;</div><div class='ctx'> </div><div class='hunk'>@@ -1332,7 +1397,7 @@ static struct fib_nh_exception *find_exception(struct fib_nh *nh, __be32 daddr)</div><div class='ctx'> 		if (fnhe-&gt;fnhe_daddr == daddr) {</div><div class='ctx'> 			if (fnhe-&gt;fnhe_expires &amp;&amp;</div><div class='ctx'> 			    time_after(jiffies, fnhe-&gt;fnhe_expires)) {</div><div class='del'>-				ip_del_fnhe(nh, daddr);</div><div class='add'>+				ip_del_fnhe(nhc, daddr);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			return fnhe;</div><div class='hunk'>@@ -1349,19 +1414,19 @@ static struct fib_nh_exception *find_exception(struct fib_nh *nh, __be32 daddr)</div><div class='ctx'> </div><div class='ctx'> u32 ip_mtu_from_fib_result(struct fib_result *res, __be32 daddr)</div><div class='ctx'> {</div><div class='add'>+	struct fib_nh_common *nhc = res-&gt;nhc;</div><div class='add'>+	struct net_device *dev = nhc-&gt;nhc_dev;</div><div class='ctx'> 	struct fib_info *fi = res-&gt;fi;</div><div class='del'>-	struct fib_nh *nh = &amp;fi-&gt;fib_nh[res-&gt;nh_sel];</div><div class='del'>-	struct net_device *dev = nh-&gt;nh_dev;</div><div class='ctx'> 	u32 mtu = 0;</div><div class='ctx'> </div><div class='del'>-	if (dev_net(dev)-&gt;ipv4.sysctl_ip_fwd_use_pmtu ||</div><div class='add'>+	if (READ_ONCE(dev_net(dev)-&gt;ipv4.sysctl_ip_fwd_use_pmtu) ||</div><div class='ctx'> 	    fi-&gt;fib_metrics-&gt;metrics[RTAX_LOCK - 1] &amp; (1 &lt;&lt; RTAX_MTU))</div><div class='ctx'> 		mtu = fi-&gt;fib_mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!mtu)) {</div><div class='ctx'> 		struct fib_nh_exception *fnhe;</div><div class='ctx'> </div><div class='del'>-		fnhe = find_exception(nh, daddr);</div><div class='add'>+		fnhe = find_exception(nhc, daddr);</div><div class='ctx'> 		if (fnhe &amp;&amp; !time_after_eq(jiffies, fnhe-&gt;fnhe_expires))</div><div class='ctx'> 			mtu = fnhe-&gt;fnhe_pmtu;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1369,7 +1434,7 @@ u32 ip_mtu_from_fib_result(struct fib_result *res, __be32 daddr)</div><div class='ctx'> 	if (likely(!mtu))</div><div class='ctx'> 		mtu = min(READ_ONCE(dev-&gt;mtu), IP_MAX_MTU);</div><div class='ctx'> </div><div class='del'>-	return mtu - lwtunnel_headroom(nh-&gt;nh_lwtstate, mtu);</div><div class='add'>+	return mtu - lwtunnel_headroom(nhc-&gt;nhc_lwtstate, mtu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,</div><div class='hunk'>@@ -1400,8 +1465,10 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,</div><div class='ctx'> 			orig = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		fill_route_from_fnhe(rt, fnhe);</div><div class='del'>-		if (!rt-&gt;rt_gateway)</div><div class='del'>-			rt-&gt;rt_gateway = daddr;</div><div class='add'>+		if (!rt-&gt;rt_gw4) {</div><div class='add'>+			rt-&gt;rt_gw4 = daddr;</div><div class='add'>+			rt-&gt;rt_gw_family = AF_INET;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (do_cache) {</div><div class='ctx'> 			dst_hold(&amp;rt-&gt;dst);</div><div class='hunk'>@@ -1420,15 +1487,15 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt)</div><div class='add'>+static bool rt_cache_route(struct fib_nh_common *nhc, struct rtable *rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *orig, *prev, **p;</div><div class='ctx'> 	bool ret = true;</div><div class='ctx'> </div><div class='ctx'> 	if (rt_is_input_route(rt)) {</div><div class='del'>-		p = (struct rtable **)&amp;nh-&gt;nh_rth_input;</div><div class='add'>+		p = (struct rtable **)&amp;nhc-&gt;nhc_rth_input;</div><div class='ctx'> 	} else {</div><div class='del'>-		p = (struct rtable **)raw_cpu_ptr(nh-&gt;nh_pcpu_rth_output);</div><div class='add'>+		p = (struct rtable **)raw_cpu_ptr(nhc-&gt;nhc_pcpu_rth_output);</div><div class='ctx'> 	}</div><div class='ctx'> 	orig = *p;</div><div class='ctx'> </div><div class='hunk'>@@ -1439,7 +1506,7 @@ static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt)</div><div class='ctx'> 	prev = cmpxchg(p, orig, rt);</div><div class='ctx'> 	if (prev == orig) {</div><div class='ctx'> 		if (orig) {</div><div class='del'>-			dst_dev_put(&amp;orig-&gt;dst);</div><div class='add'>+			rt_add_uncached_list(orig);</div><div class='ctx'> 			dst_release(&amp;orig-&gt;dst);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1461,51 +1528,49 @@ void rt_add_uncached_list(struct rtable *rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct uncached_list *ul = raw_cpu_ptr(&amp;rt_uncached_list);</div><div class='ctx'> </div><div class='del'>-	rt-&gt;rt_uncached_list = ul;</div><div class='add'>+	rt-&gt;dst.rt_uncached_list = ul;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-	list_add_tail(&amp;rt-&gt;rt_uncached, &amp;ul-&gt;head);</div><div class='add'>+	list_add_tail(&amp;rt-&gt;dst.rt_uncached, &amp;ul-&gt;head);</div><div class='ctx'> 	spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt_del_uncached_list(struct rtable *rt)</div><div class='ctx'> {</div><div class='del'>-	if (!list_empty(&amp;rt-&gt;rt_uncached)) {</div><div class='del'>-		struct uncached_list *ul = rt-&gt;rt_uncached_list;</div><div class='add'>+	if (!list_empty(&amp;rt-&gt;dst.rt_uncached)) {</div><div class='add'>+		struct uncached_list *ul = rt-&gt;dst.rt_uncached_list;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-		list_del(&amp;rt-&gt;rt_uncached);</div><div class='add'>+		list_del_init(&amp;rt-&gt;dst.rt_uncached);</div><div class='ctx'> 		spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipv4_dst_destroy(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);</div><div class='del'>-	struct rtable *rt = (struct rtable *)dst;</div><div class='del'>-</div><div class='del'>-	if (p != &amp;dst_default_metrics &amp;&amp; refcount_dec_and_test(&amp;p-&gt;refcnt))</div><div class='del'>-		kfree(p);</div><div class='del'>-</div><div class='del'>-	rt_del_uncached_list(rt);</div><div class='add'>+	ip_dst_metrics_put(dst);</div><div class='add'>+	rt_del_uncached_list(dst_rtable(dst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt_flush_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct rtable *rt;</div><div class='add'>+	struct rtable *rt, *safe;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct uncached_list *ul = &amp;per_cpu(rt_uncached_list, cpu);</div><div class='ctx'> </div><div class='add'>+		if (list_empty(&amp;ul-&gt;head))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-		list_for_each_entry(rt, &amp;ul-&gt;head, rt_uncached) {</div><div class='add'>+		list_for_each_entry_safe(rt, safe, &amp;ul-&gt;head, dst.rt_uncached) {</div><div class='ctx'> 			if (rt-&gt;dst.dev != dev)</div><div class='ctx'> 				continue;</div><div class='del'>-			rt-&gt;dst.dev = net-&gt;loopback_dev;</div><div class='del'>-			dev_hold(rt-&gt;dst.dev);</div><div class='del'>-			dev_put(dev);</div><div class='add'>+			rt-&gt;dst.dev = blackhole_netdev;</div><div class='add'>+			netdev_ref_replace(dev, blackhole_netdev,</div><div class='add'>+					   &amp;rt-&gt;dst.dev_tracker, GFP_ATOMIC);</div><div class='add'>+			list_del_init(&amp;rt-&gt;dst.rt_uncached);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1514,7 +1579,7 @@ void rt_flush_dev(struct net_device *dev)</div><div class='ctx'> static bool rt_cache_valid(const struct rtable *rt)</div><div class='ctx'> {</div><div class='ctx'> 	return	rt &amp;&amp;</div><div class='del'>-		rt-&gt;dst.obsolete == DST_OBSOLETE_FORCE_CHK &amp;&amp;</div><div class='add'>+		READ_ONCE(rt-&gt;dst.obsolete) == DST_OBSOLETE_FORCE_CHK &amp;&amp;</div><div class='ctx'> 		!rt_is_expired(rt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1527,33 +1592,43 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,</div><div class='ctx'> 	bool cached = false;</div><div class='ctx'> </div><div class='ctx'> 	if (fi) {</div><div class='del'>-		struct fib_nh *nh = &amp;FIB_RES_NH(*res);</div><div class='add'>+		struct fib_nh_common *nhc = FIB_RES_NHC(*res);</div><div class='ctx'> </div><div class='del'>-		if (nh-&gt;nh_gw &amp;&amp; nh-&gt;nh_scope == RT_SCOPE_LINK) {</div><div class='del'>-			rt-&gt;rt_gateway = nh-&gt;nh_gw;</div><div class='add'>+		if (nhc-&gt;nhc_gw_family &amp;&amp; nhc-&gt;nhc_scope == RT_SCOPE_LINK) {</div><div class='ctx'> 			rt-&gt;rt_uses_gateway = 1;</div><div class='add'>+			rt-&gt;rt_gw_family = nhc-&gt;nhc_gw_family;</div><div class='add'>+			/* only INET and INET6 are supported */</div><div class='add'>+			if (likely(nhc-&gt;nhc_gw_family == AF_INET))</div><div class='add'>+				rt-&gt;rt_gw4 = nhc-&gt;nhc_gw.ipv4;</div><div class='add'>+			else</div><div class='add'>+				rt-&gt;rt_gw6 = nhc-&gt;nhc_gw.ipv6;</div><div class='ctx'> 		}</div><div class='del'>-		dst_init_metrics(&amp;rt-&gt;dst, fi-&gt;fib_metrics-&gt;metrics, true);</div><div class='del'>-		if (fi-&gt;fib_metrics != &amp;dst_default_metrics) {</div><div class='del'>-			rt-&gt;dst._metrics |= DST_METRICS_REFCOUNTED;</div><div class='del'>-			refcount_inc(&amp;fi-&gt;fib_metrics-&gt;refcnt);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		ip_dst_init_metrics(&amp;rt-&gt;dst, fi-&gt;fib_metrics);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='del'>-		rt-&gt;dst.tclassid = nh-&gt;nh_tclassid;</div><div class='add'>+		if (nhc-&gt;nhc_family == AF_INET) {</div><div class='add'>+			struct fib_nh *nh;</div><div class='add'>+</div><div class='add'>+			nh = container_of(nhc, struct fib_nh, nh_common);</div><div class='add'>+			rt-&gt;dst.tclassid = nh-&gt;nh_tclassid;</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-		rt-&gt;dst.lwtstate = lwtstate_get(nh-&gt;nh_lwtstate);</div><div class='add'>+		rt-&gt;dst.lwtstate = lwtstate_get(nhc-&gt;nhc_lwtstate);</div><div class='ctx'> 		if (unlikely(fnhe))</div><div class='ctx'> 			cached = rt_bind_exception(rt, fnhe, daddr, do_cache);</div><div class='ctx'> 		else if (do_cache)</div><div class='del'>-			cached = rt_cache_route(nh, rt);</div><div class='add'>+			cached = rt_cache_route(nhc, rt);</div><div class='ctx'> 		if (unlikely(!cached)) {</div><div class='ctx'> 			/* Routes we intend to cache in nexthop exception or</div><div class='ctx'> 			 * FIB nexthop have the DST_NOCACHE bit clear.</div><div class='ctx'> 			 * However, if we are unsuccessful at storing this</div><div class='ctx'> 			 * route into the cache we really need to set it.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!rt-&gt;rt_gateway)</div><div class='del'>-				rt-&gt;rt_gateway = daddr;</div><div class='add'>+			if (!rt-&gt;rt_gw4) {</div><div class='add'>+				rt-&gt;rt_gw_family = AF_INET;</div><div class='add'>+				rt-&gt;rt_gw4 = daddr;</div><div class='add'>+			}</div><div class='ctx'> 			rt_add_uncached_list(rt);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1569,13 +1644,11 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,</div><div class='ctx'> </div><div class='ctx'> struct rtable *rt_dst_alloc(struct net_device *dev,</div><div class='ctx'> 			    unsigned int flags, u16 type,</div><div class='del'>-			    bool nopolicy, bool noxfrm, bool will_cache)</div><div class='add'>+			    bool noxfrm)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	rt = dst_alloc(&amp;ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK,</div><div class='del'>-		       (will_cache ? 0 : DST_HOST) |</div><div class='del'>-		       (nopolicy ? DST_NOPOLICY : 0) |</div><div class='add'>+	rt = dst_alloc(&amp;ipv4_dst_ops, dev, DST_OBSOLETE_FORCE_CHK,</div><div class='ctx'> 		       (noxfrm ? DST_NOXFRM : 0));</div><div class='ctx'> </div><div class='ctx'> 	if (rt) {</div><div class='hunk'>@@ -1586,9 +1659,9 @@ struct rtable *rt_dst_alloc(struct net_device *dev,</div><div class='ctx'> 		rt-&gt;rt_iif = 0;</div><div class='ctx'> 		rt-&gt;rt_pmtu = 0;</div><div class='ctx'> 		rt-&gt;rt_mtu_locked = 0;</div><div class='del'>-		rt-&gt;rt_gateway = 0;</div><div class='ctx'> 		rt-&gt;rt_uses_gateway = 0;</div><div class='del'>-		INIT_LIST_HEAD(&amp;rt-&gt;rt_uncached);</div><div class='add'>+		rt-&gt;rt_gw_family = 0;</div><div class='add'>+		rt-&gt;rt_gw4 = 0;</div><div class='ctx'> </div><div class='ctx'> 		rt-&gt;dst.output = ip_output;</div><div class='ctx'> 		if (flags &amp; RTCF_LOCAL)</div><div class='hunk'>@@ -1599,57 +1672,97 @@ struct rtable *rt_dst_alloc(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rt_dst_alloc);</div><div class='ctx'> </div><div class='add'>+struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt)</div><div class='add'>+{</div><div class='add'>+	struct rtable *new_rt;</div><div class='add'>+</div><div class='add'>+	new_rt = dst_alloc(&amp;ipv4_dst_ops, dev, DST_OBSOLETE_FORCE_CHK,</div><div class='add'>+			   rt-&gt;dst.flags);</div><div class='add'>+</div><div class='add'>+	if (new_rt) {</div><div class='add'>+		new_rt-&gt;rt_genid = rt_genid_ipv4(dev_net(dev));</div><div class='add'>+		new_rt-&gt;rt_flags = rt-&gt;rt_flags;</div><div class='add'>+		new_rt-&gt;rt_type = rt-&gt;rt_type;</div><div class='add'>+		new_rt-&gt;rt_is_input = rt-&gt;rt_is_input;</div><div class='add'>+		new_rt-&gt;rt_iif = rt-&gt;rt_iif;</div><div class='add'>+		new_rt-&gt;rt_pmtu = rt-&gt;rt_pmtu;</div><div class='add'>+		new_rt-&gt;rt_mtu_locked = rt-&gt;rt_mtu_locked;</div><div class='add'>+		new_rt-&gt;rt_gw_family = rt-&gt;rt_gw_family;</div><div class='add'>+		if (rt-&gt;rt_gw_family == AF_INET)</div><div class='add'>+			new_rt-&gt;rt_gw4 = rt-&gt;rt_gw4;</div><div class='add'>+		else if (rt-&gt;rt_gw_family == AF_INET6)</div><div class='add'>+			new_rt-&gt;rt_gw6 = rt-&gt;rt_gw6;</div><div class='add'>+</div><div class='add'>+		new_rt-&gt;dst.input = READ_ONCE(rt-&gt;dst.input);</div><div class='add'>+		new_rt-&gt;dst.output = READ_ONCE(rt-&gt;dst.output);</div><div class='add'>+		new_rt-&gt;dst.error = rt-&gt;dst.error;</div><div class='add'>+		new_rt-&gt;dst.lastuse = jiffies;</div><div class='add'>+		new_rt-&gt;dst.lwtstate = lwtstate_get(rt-&gt;dst.lwtstate);</div><div class='add'>+	}</div><div class='add'>+	return new_rt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rt_dst_clone);</div><div class='add'>+</div><div class='ctx'> /* called in rcu_read_lock() section */</div><div class='del'>-int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='del'>-			  u8 tos, struct net_device *dev,</div><div class='del'>-			  struct in_device *in_dev, u32 *itag)</div><div class='add'>+enum skb_drop_reason</div><div class='add'>+ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='add'>+		      dscp_t dscp, struct net_device *dev,</div><div class='add'>+		      struct in_device *in_dev, u32 *itag)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> </div><div class='ctx'> 	/* Primary sanity checks. */</div><div class='ctx'> 	if (!in_dev)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) ||</div><div class='del'>-	    skb-&gt;protocol != htons(ETH_P_IP))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr))</div><div class='add'>+		return SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IP))</div><div class='add'>+		return SKB_DROP_REASON_INVALID_PROTO;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv4_is_loopback(saddr) &amp;&amp; !IN_DEV_ROUTE_LOCALNET(in_dev))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return SKB_DROP_REASON_IP_LOCALNET;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv4_is_zeronet(saddr)) {</div><div class='del'>-		if (!ipv4_is_local_multicast(daddr))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (!ipv4_is_local_multicast(daddr) &amp;&amp;</div><div class='add'>+		    ip_hdr(skb)-&gt;protocol != IPPROTO_IGMP)</div><div class='add'>+			return SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='ctx'> 	} else {</div><div class='del'>-		err = fib_validate_source(skb, saddr, 0, tos, 0, dev,</div><div class='del'>-					  in_dev, itag);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		reason = fib_validate_source_reason(skb, saddr, 0, dscp, 0,</div><div class='add'>+						    dev, in_dev, itag);</div><div class='add'>+		if (reason)</div><div class='add'>+			return reason;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called in rcu_read_lock() section */</div><div class='del'>-static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='del'>-			     u8 tos, struct net_device *dev, int our)</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='add'>+		  dscp_t dscp, struct net_device *dev, int our)</div><div class='ctx'> {</div><div class='ctx'> 	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 	unsigned int flags = RTCF_MULTICAST;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct rtable *rth;</div><div class='ctx'> 	u32 itag = 0;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = ip_mc_validate_source(skb, daddr, saddr, tos, dev, in_dev, &amp;itag);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	reason = ip_mc_validate_source(skb, daddr, saddr, dscp, dev, in_dev,</div><div class='add'>+				       &amp;itag);</div><div class='add'>+	if (reason)</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='ctx'> 	if (our)</div><div class='ctx'> 		flags |= RTCF_LOCAL;</div><div class='ctx'> </div><div class='add'>+	if (IN_DEV_ORCONF(in_dev, NOPOLICY))</div><div class='add'>+		IPCB(skb)-&gt;flags |= IPSKB_NOPOLICY;</div><div class='add'>+</div><div class='ctx'> 	rth = rt_dst_alloc(dev_net(dev)-&gt;loopback_dev, flags, RTN_MULTICAST,</div><div class='del'>-			   IN_DEV_CONF_GET(in_dev, NOPOLICY), false, false);</div><div class='add'>+			   false);</div><div class='ctx'> 	if (!rth)</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+		return SKB_DROP_REASON_NOMEM;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 	rth-&gt;dst.tclassid = itag;</div><div class='hunk'>@@ -1663,8 +1776,9 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> #endif</div><div class='ctx'> 	RT_CACHE_STAT_INC(in_slow_mc);</div><div class='ctx'> </div><div class='add'>+	skb_dst_drop(skb);</div><div class='ctx'> 	skb_dst_set(skb, &amp;rth-&gt;dst);</div><div class='del'>-	return 0;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1687,18 +1801,21 @@ static void ip_handle_martian_source(struct net_device *dev,</div><div class='ctx'> 			print_hex_dump(KERN_WARNING, "ll header: ",</div><div class='ctx'> 				       DUMP_PREFIX_OFFSET, 16, 1,</div><div class='ctx'> 				       skb_mac_header(skb),</div><div class='del'>-				       dev-&gt;hard_header_len, true);</div><div class='add'>+				       dev-&gt;hard_header_len, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called in rcu_read_lock() section */</div><div class='del'>-static int __mkroute_input(struct sk_buff *skb,</div><div class='del'>-			   const struct fib_result *res,</div><div class='del'>-			   struct in_device *in_dev,</div><div class='del'>-			   __be32 daddr, __be32 saddr, u32 tos)</div><div class='del'>-{</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+__mkroute_input(struct sk_buff *skb, const struct fib_result *res,</div><div class='add'>+		struct in_device *in_dev, __be32 daddr,</div><div class='add'>+		__be32 saddr, dscp_t dscp)</div><div class='add'>+{</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+	struct fib_nh_common *nhc = FIB_RES_NHC(*res);</div><div class='add'>+	struct net_device *dev = nhc-&gt;nhc_dev;</div><div class='ctx'> 	struct fib_nh_exception *fnhe;</div><div class='ctx'> 	struct rtable *rth;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1707,15 +1824,16 @@ static int __mkroute_input(struct sk_buff *skb,</div><div class='ctx'> 	u32 itag = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* get a working reference to the output device */</div><div class='del'>-	out_dev = __in_dev_get_rcu(FIB_RES_DEV(*res));</div><div class='add'>+	out_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 	if (!out_dev) {</div><div class='ctx'> 		net_crit_ratelimited("Bug in ip_route_input_slow(). Please report.\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fib_validate_source(skb, saddr, daddr, tos, FIB_RES_OIF(*res),</div><div class='add'>+	err = fib_validate_source(skb, saddr, daddr, dscp, FIB_RES_OIF(*res),</div><div class='ctx'> 				  in_dev-&gt;dev, in_dev, &amp;itag);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='add'>+		reason = -err;</div><div class='ctx'> 		ip_handle_martian_source(in_dev-&gt;dev, in_dev, skb, daddr,</div><div class='ctx'> 					 saddr);</div><div class='ctx'> </div><div class='hunk'>@@ -1724,10 +1842,14 @@ static int __mkroute_input(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	do_cache = res-&gt;fi &amp;&amp; !itag;</div><div class='ctx'> 	if (out_dev == in_dev &amp;&amp; err &amp;&amp; IN_DEV_TX_REDIRECTS(out_dev) &amp;&amp;</div><div class='del'>-	    skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='del'>-	    (IN_DEV_SHARED_MEDIA(out_dev) ||</div><div class='del'>-	     inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))</div><div class='del'>-		IPCB(skb)-&gt;flags |= IPSKB_DOREDIRECT;</div><div class='add'>+	    skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		__be32 gw;</div><div class='add'>+</div><div class='add'>+		gw = nhc-&gt;nhc_gw_family == AF_INET ? nhc-&gt;nhc_gw.ipv4 : 0;</div><div class='add'>+		if (IN_DEV_SHARED_MEDIA(out_dev) ||</div><div class='add'>+		    inet_addr_onlink(out_dev, saddr, gw))</div><div class='add'>+			IPCB(skb)-&gt;flags |= IPSKB_DOREDIRECT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;protocol != htons(ETH_P_IP)) {</div><div class='ctx'> 		/* Not IP (i.e. ARP). Do not create route, if it is</div><div class='hunk'>@@ -1739,17 +1861,20 @@ static int __mkroute_input(struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (out_dev == in_dev &amp;&amp;</div><div class='ctx'> 		    IN_DEV_PROXY_ARP_PVLAN(in_dev) == 0) {</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+			reason = SKB_DROP_REASON_ARP_PVLAN_DISABLE;</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fnhe = find_exception(&amp;FIB_RES_NH(*res), daddr);</div><div class='add'>+	if (IN_DEV_ORCONF(in_dev, NOPOLICY))</div><div class='add'>+		IPCB(skb)-&gt;flags |= IPSKB_NOPOLICY;</div><div class='add'>+</div><div class='add'>+	fnhe = find_exception(nhc, daddr);</div><div class='ctx'> 	if (do_cache) {</div><div class='ctx'> 		if (fnhe)</div><div class='ctx'> 			rth = rcu_dereference(fnhe-&gt;fnhe_rth_input);</div><div class='ctx'> 		else</div><div class='del'>-			rth = rcu_dereference(FIB_RES_NH(*res).nh_rth_input);</div><div class='add'>+			rth = rcu_dereference(nhc-&gt;nhc_rth_input);</div><div class='ctx'> 		if (rt_cache_valid(rth)) {</div><div class='ctx'> 			skb_dst_set_noref(skb, &amp;rth-&gt;dst);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1757,10 +1882,9 @@ static int __mkroute_input(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rth = rt_dst_alloc(out_dev-&gt;dev, 0, res-&gt;type,</div><div class='del'>-			   IN_DEV_CONF_GET(in_dev, NOPOLICY),</div><div class='del'>-			   IN_DEV_CONF_GET(out_dev, NOXFRM), do_cache);</div><div class='add'>+			   IN_DEV_ORCONF(out_dev, NOXFRM));</div><div class='ctx'> 	if (!rth) {</div><div class='del'>-		err = -ENOBUFS;</div><div class='add'>+		reason = SKB_DROP_REASON_NOMEM;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1774,9 +1898,9 @@ static int __mkroute_input(struct sk_buff *skb,</div><div class='ctx'> 	lwtunnel_set_redirect(&amp;rth-&gt;dst);</div><div class='ctx'> 	skb_dst_set(skb, &amp;rth-&gt;dst);</div><div class='ctx'> out:</div><div class='del'>-	err = 0;</div><div class='del'>- cleanup:</div><div class='del'>-	return err;</div><div class='add'>+	reason = SKB_NOT_DROPPED_YET;</div><div class='add'>+cleanup:</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='hunk'>@@ -1804,10 +1928,7 @@ static void ip_multipath_l3_keys(const struct sk_buff *skb,</div><div class='ctx'> 	if (!icmph)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (icmph-&gt;type != ICMP_DEST_UNREACH &amp;&amp;</div><div class='del'>-	    icmph-&gt;type != ICMP_REDIRECT &amp;&amp;</div><div class='del'>-	    icmph-&gt;type != ICMP_TIME_EXCEEDED &amp;&amp;</div><div class='del'>-	    icmph-&gt;type != ICMP_PARAMETERPROB)</div><div class='add'>+	if (!icmp_is_err(icmph-&gt;type))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	inner_iph = skb_header_pointer(skb,</div><div class='hunk'>@@ -1822,14 +1943,134 @@ out:</div><div class='ctx'> 	hash_keys-&gt;addrs.v4addrs.dst = key_iph-&gt;daddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 fib_multipath_custom_hash_outer(const struct net *net,</div><div class='add'>+					   const struct sk_buff *skb,</div><div class='add'>+					   bool *p_has_inner)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = READ_ONCE(net-&gt;ipv4.sysctl_fib_multipath_hash_fields);</div><div class='add'>+	struct flow_keys keys, hash_keys;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_OUTER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	skb_flow_dissect_flow_keys(skb, &amp;keys, FLOW_DISSECTOR_F_STOP_AT_ENCAP);</div><div class='add'>+</div><div class='add'>+	hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_IP)</div><div class='add'>+		hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_IP)</div><div class='add'>+		hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = keys.basic.ip_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_PORT)</div><div class='add'>+		hash_keys.ports.src = keys.ports.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = keys.ports.dst;</div><div class='add'>+</div><div class='add'>+	*p_has_inner = !!(keys.control.flags &amp; FLOW_DIS_ENCAPSULATION);</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 fib_multipath_custom_hash_inner(const struct net *net,</div><div class='add'>+					   const struct sk_buff *skb,</div><div class='add'>+					   bool has_inner)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = READ_ONCE(net-&gt;ipv4.sysctl_fib_multipath_hash_fields);</div><div class='add'>+	struct flow_keys keys, hash_keys;</div><div class='add'>+</div><div class='add'>+	/* We assume the packet carries an encapsulation, but if none was</div><div class='add'>+	 * encountered during dissection of the outer flow, then there is no</div><div class='add'>+	 * point in calling the flow dissector again.</div><div class='add'>+	 */</div><div class='add'>+	if (!has_inner)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	skb_flow_dissect_flow_keys(skb, &amp;keys, 0);</div><div class='add'>+</div><div class='add'>+	if (!(keys.control.flags &amp; FLOW_DIS_ENCAPSULATION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_IP)</div><div class='add'>+			hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_IP)</div><div class='add'>+			hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;</div><div class='add'>+	} else if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {</div><div class='add'>+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_IP)</div><div class='add'>+			hash_keys.addrs.v6addrs.src = keys.addrs.v6addrs.src;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_IP)</div><div class='add'>+			hash_keys.addrs.v6addrs.dst = keys.addrs.v6addrs.dst;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_FLOWLABEL)</div><div class='add'>+			hash_keys.tags.flow_label = keys.tags.flow_label;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = keys.basic.ip_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_PORT)</div><div class='add'>+		hash_keys.ports.src = keys.ports.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = keys.ports.dst;</div><div class='add'>+</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 fib_multipath_custom_hash_skb(const struct net *net,</div><div class='add'>+					 const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 mhash, mhash_inner;</div><div class='add'>+	bool has_inner = true;</div><div class='add'>+</div><div class='add'>+	mhash = fib_multipath_custom_hash_outer(net, skb, &amp;has_inner);</div><div class='add'>+	mhash_inner = fib_multipath_custom_hash_inner(net, skb, has_inner);</div><div class='add'>+</div><div class='add'>+	return jhash_2words(mhash, mhash_inner, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 fib_multipath_custom_hash_fl4(const struct net *net,</div><div class='add'>+					 const struct flowi4 *fl4)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = READ_ONCE(net-&gt;ipv4.sysctl_fib_multipath_hash_fields);</div><div class='add'>+	struct flow_keys hash_keys;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_OUTER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_IP)</div><div class='add'>+		hash_keys.addrs.v4addrs.src = fl4-&gt;saddr;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_IP)</div><div class='add'>+		hash_keys.addrs.v4addrs.dst = fl4-&gt;daddr;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = fl4-&gt;flowi4_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_PORT) {</div><div class='add'>+		if (fl4-&gt;flowi4_flags &amp; FLOWI_FLAG_ANY_SPORT)</div><div class='add'>+			hash_keys.ports.src = (__force __be16)get_random_u16();</div><div class='add'>+		else</div><div class='add'>+			hash_keys.ports.src = fl4-&gt;fl4_sport;</div><div class='add'>+	}</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = fl4-&gt;fl4_dport;</div><div class='add'>+</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* if skb is set it will be used and fl4 can be NULL */</div><div class='ctx'> int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,</div><div class='ctx'> 		       const struct sk_buff *skb, struct flow_keys *flkeys)</div><div class='ctx'> {</div><div class='add'>+	u32 multipath_hash = fl4 ? fl4-&gt;flowi4_multipath_hash : 0;</div><div class='ctx'> 	struct flow_keys hash_keys;</div><div class='del'>-	u32 mhash;</div><div class='add'>+	u32 mhash = 0;</div><div class='ctx'> </div><div class='del'>-	switch (net-&gt;ipv4.sysctl_fib_multipath_hash_policy) {</div><div class='add'>+	switch (READ_ONCE(net-&gt;ipv4.sysctl_fib_multipath_hash_policy)) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='ctx'> 		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='hunk'>@@ -1839,6 +2080,7 @@ int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,</div><div class='ctx'> 			hash_keys.addrs.v4addrs.src = fl4-&gt;saddr;</div><div class='ctx'> 			hash_keys.addrs.v4addrs.dst = fl4-&gt;daddr;</div><div class='ctx'> 		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* skb is currently provided only when forwarding */</div><div class='hunk'>@@ -1868,40 +2110,148 @@ int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,</div><div class='ctx'> 			hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='ctx'> 			hash_keys.addrs.v4addrs.src = fl4-&gt;saddr;</div><div class='ctx'> 			hash_keys.addrs.v4addrs.dst = fl4-&gt;daddr;</div><div class='del'>-			hash_keys.ports.src = fl4-&gt;fl4_sport;</div><div class='add'>+			if (fl4-&gt;flowi4_flags &amp; FLOWI_FLAG_ANY_SPORT)</div><div class='add'>+				hash_keys.ports.src = (__force __be16)get_random_u16();</div><div class='add'>+			else</div><div class='add'>+				hash_keys.ports.src = fl4-&gt;fl4_sport;</div><div class='ctx'> 			hash_keys.ports.dst = fl4-&gt;fl4_dport;</div><div class='ctx'> 			hash_keys.basic.ip_proto = fl4-&gt;flowi4_proto;</div><div class='ctx'> 		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+		/* skb is currently provided only when forwarding */</div><div class='add'>+		if (skb) {</div><div class='add'>+			struct flow_keys keys;</div><div class='add'>+</div><div class='add'>+			skb_flow_dissect_flow_keys(skb, &amp;keys, 0);</div><div class='add'>+			/* Inner can be v4 or v6 */</div><div class='add'>+			if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+				hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;</div><div class='add'>+				hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;</div><div class='add'>+			} else if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+				hash_keys.addrs.v6addrs.src = keys.addrs.v6addrs.src;</div><div class='add'>+				hash_keys.addrs.v6addrs.dst = keys.addrs.v6addrs.dst;</div><div class='add'>+				hash_keys.tags.flow_label = keys.tags.flow_label;</div><div class='add'>+				hash_keys.basic.ip_proto = keys.basic.ip_proto;</div><div class='add'>+			} else {</div><div class='add'>+				/* Same as case 0 */</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+				ip_multipath_l3_keys(skb, &amp;hash_keys);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Same as case 0 */</div><div class='add'>+			hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+			hash_keys.addrs.v4addrs.src = fl4-&gt;saddr;</div><div class='add'>+			hash_keys.addrs.v4addrs.dst = fl4-&gt;daddr;</div><div class='add'>+		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (skb)</div><div class='add'>+			mhash = fib_multipath_custom_hash_skb(net, skb);</div><div class='add'>+		else</div><div class='add'>+			mhash = fib_multipath_custom_hash_fl4(net, fl4);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mhash = flow_hash_from_keys(&amp;hash_keys);</div><div class='add'>+</div><div class='add'>+	if (multipath_hash)</div><div class='add'>+		mhash = jhash_2words(mhash, multipath_hash, 0);</div><div class='ctx'> </div><div class='ctx'> 	return mhash &gt;&gt; 1;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IP_ROUTE_MULTIPATH */</div><div class='ctx'> </div><div class='del'>-static int ip_mkroute_input(struct sk_buff *skb,</div><div class='del'>-			    struct fib_result *res,</div><div class='del'>-			    struct in_device *in_dev,</div><div class='del'>-			    __be32 daddr, __be32 saddr, u32 tos,</div><div class='del'>-			    struct flow_keys *hkeys)</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+ip_mkroute_input(struct sk_buff *skb, struct fib_result *res,</div><div class='add'>+		 struct in_device *in_dev, __be32 daddr,</div><div class='add'>+		 __be32 saddr, dscp_t dscp, struct flow_keys *hkeys)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	if (res-&gt;fi &amp;&amp; res-&gt;fi-&gt;fib_nhs &gt; 1) {</div><div class='add'>+	if (res-&gt;fi &amp;&amp; fib_info_num_path(res-&gt;fi) &gt; 1) {</div><div class='ctx'> 		int h = fib_multipath_hash(res-&gt;fi-&gt;fib_net, NULL, skb, hkeys);</div><div class='ctx'> </div><div class='del'>-		fib_select_multipath(res, h);</div><div class='add'>+		fib_select_multipath(res, h, NULL);</div><div class='add'>+		IPCB(skb)-&gt;flags |= IPSKB_MULTIPATH;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* create a routing cache entry */</div><div class='del'>-	return __mkroute_input(skb, res, in_dev, daddr, saddr, tos);</div><div class='add'>+	return __mkroute_input(skb, res, in_dev, daddr, saddr, dscp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Implements all the saddr-related checks as ip_route_input_slow(),</div><div class='add'>+ * assuming daddr is valid and the destination is not a local broadcast one.</div><div class='add'>+ * Uses the provided hint instead of performing a route lookup.</div><div class='add'>+ */</div><div class='add'>+enum skb_drop_reason</div><div class='add'>+ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='add'>+		  dscp_t dscp, struct net_device *dev,</div><div class='add'>+		  const struct sk_buff *hint)</div><div class='add'>+{</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='add'>+	struct rtable *rt = skb_rtable(hint);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	u32 tag = 0;</div><div class='add'>+</div><div class='add'>+	if (!in_dev)</div><div class='add'>+		return reason;</div><div class='add'>+</div><div class='add'>+	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='add'>+		goto martian_source;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ipv4_is_zeronet(saddr)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='add'>+		goto martian_source;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ipv4_is_loopback(saddr) &amp;&amp; !IN_DEV_NET_ROUTE_LOCALNET(in_dev, net)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_LOCALNET;</div><div class='add'>+		goto martian_source;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(rt-&gt;rt_flags &amp; RTCF_LOCAL))</div><div class='add'>+		goto skip_validate_source;</div><div class='add'>+</div><div class='add'>+	reason = fib_validate_source_reason(skb, saddr, daddr, dscp, 0, dev,</div><div class='add'>+					    in_dev, &amp;tag);</div><div class='add'>+	if (reason)</div><div class='add'>+		goto martian_source;</div><div class='add'>+</div><div class='add'>+skip_validate_source:</div><div class='add'>+	skb_dst_copy(skb, hint);</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='add'>+</div><div class='add'>+martian_source:</div><div class='add'>+	ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);</div><div class='add'>+	return reason;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get device for dst_alloc with local routes */</div><div class='add'>+static struct net_device *ip_rt_get_dev(struct net *net,</div><div class='add'>+					const struct fib_result *res)</div><div class='add'>+{</div><div class='add'>+	struct fib_nh_common *nhc = res-&gt;fi ? res-&gt;nhc : NULL;</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (nhc)</div><div class='add'>+		dev = l3mdev_master_dev_rcu(nhc-&gt;nhc_dev);</div><div class='add'>+</div><div class='add'>+	return dev ? : net-&gt;loopback_dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	NOTE. We drop all the packets that has local source</div><div class='ctx'>  *	addresses, because every properly looped back packet</div><div class='ctx'>  *	must have correct destination already attached by output routine.</div><div class='add'>+ *	Changes in the enforced policies must be applied also to</div><div class='add'>+ *	ip_route_use_hint().</div><div class='ctx'>  *</div><div class='ctx'>  *	Such approach solves two big problems:</div><div class='ctx'>  *	1. Not simplex devices are handled properly.</div><div class='hunk'>@@ -1909,10 +2259,12 @@ static int ip_mkroute_input(struct sk_buff *skb,</div><div class='ctx'>  *	called with rcu_read_lock()</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='del'>-			       u8 tos, struct net_device *dev,</div><div class='del'>-			       struct fib_result *res)</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='add'>+		    dscp_t dscp, struct net_device *dev,</div><div class='add'>+		    struct fib_result *res)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 	struct flow_keys *flkeys = NULL, _flkeys;</div><div class='ctx'> 	struct net    *net = dev_net(dev);</div><div class='hunk'>@@ -1922,7 +2274,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 	u32		itag = 0;</div><div class='ctx'> 	struct rtable	*rth;</div><div class='ctx'> 	struct flowi4	fl4;</div><div class='del'>-	bool do_cache;</div><div class='add'>+	bool do_cache = true;</div><div class='ctx'> </div><div class='ctx'> 	/* IP on this device is disabled. */</div><div class='ctx'> </div><div class='hunk'>@@ -1930,7 +2282,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for the most weird martians, which can be not detected</div><div class='del'>-	   by fib_lookup.</div><div class='add'>+	 * by fib_lookup.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	tun_info = skb_tunnel_info(skb);</div><div class='hunk'>@@ -1940,8 +2292,10 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 		fl4.flowi4_tun_key.tun_id = 0;</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr))</div><div class='add'>+	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='ctx'> 		goto martian_source;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	res-&gt;fi = NULL;</div><div class='ctx'> 	res-&gt;table = NULL;</div><div class='hunk'>@@ -1951,35 +2305,45 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 	/* Accept zero addresses only to limited broadcast;</div><div class='ctx'> 	 * I even do not know to fix it or not. Waiting for complains :-)</div><div class='ctx'> 	 */</div><div class='del'>-	if (ipv4_is_zeronet(saddr))</div><div class='add'>+	if (ipv4_is_zeronet(saddr)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_SOURCE;</div><div class='ctx'> 		goto martian_source;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_zeronet(daddr))</div><div class='add'>+	if (ipv4_is_zeronet(daddr)) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_DEST;</div><div class='ctx'> 		goto martian_destination;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Following code try to avoid calling IN_DEV_NET_ROUTE_LOCALNET(),</div><div class='ctx'> 	 * and call it once if daddr or/and saddr are loopback addresses</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ipv4_is_loopback(daddr)) {</div><div class='del'>-		if (!IN_DEV_NET_ROUTE_LOCALNET(in_dev, net))</div><div class='add'>+		if (!IN_DEV_NET_ROUTE_LOCALNET(in_dev, net)) {</div><div class='add'>+			reason = SKB_DROP_REASON_IP_LOCALNET;</div><div class='ctx'> 			goto martian_destination;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (ipv4_is_loopback(saddr)) {</div><div class='del'>-		if (!IN_DEV_NET_ROUTE_LOCALNET(in_dev, net))</div><div class='add'>+		if (!IN_DEV_NET_ROUTE_LOCALNET(in_dev, net)) {</div><div class='add'>+			reason = SKB_DROP_REASON_IP_LOCALNET;</div><div class='ctx'> 			goto martian_source;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Now we are ready to route packet.</div><div class='ctx'> 	 */</div><div class='add'>+	fl4.flowi4_l3mdev = 0;</div><div class='ctx'> 	fl4.flowi4_oif = 0;</div><div class='ctx'> 	fl4.flowi4_iif = dev-&gt;ifindex;</div><div class='ctx'> 	fl4.flowi4_mark = skb-&gt;mark;</div><div class='del'>-	fl4.flowi4_tos = tos;</div><div class='add'>+	fl4.flowi4_dscp = dscp;</div><div class='ctx'> 	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	fl4.flowi4_flags = 0;</div><div class='ctx'> 	fl4.daddr = daddr;</div><div class='ctx'> 	fl4.saddr = saddr;</div><div class='ctx'> 	fl4.flowi4_uid = sock_net_uid(net, NULL);</div><div class='add'>+	fl4.flowi4_multipath_hash = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fib4_rules_early_flow_dissect(net, skb, &amp;fl4, &amp;_flkeys)) {</div><div class='ctx'> 		flkeys = &amp;_flkeys;</div><div class='hunk'>@@ -1999,13 +2363,17 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 	if (res-&gt;type == RTN_BROADCAST) {</div><div class='ctx'> 		if (IN_DEV_BFORWARD(in_dev))</div><div class='ctx'> 			goto make_route;</div><div class='add'>+		/* not do cache if bc_forwarding is enabled */</div><div class='add'>+		if (IPV4_DEVCONF_ALL_RO(net, BC_FORWARDING))</div><div class='add'>+			do_cache = false;</div><div class='ctx'> 		goto brd_input;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	if (res-&gt;type == RTN_LOCAL) {</div><div class='del'>-		err = fib_validate_source(skb, saddr, daddr, tos,</div><div class='del'>-					  0, dev, in_dev, &amp;itag);</div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		reason = fib_validate_source_reason(skb, saddr, daddr, dscp,</div><div class='add'>+						    0, dev, in_dev, &amp;itag);</div><div class='add'>+		if (reason)</div><div class='ctx'> 			goto martian_source;</div><div class='ctx'> 		goto local_input;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2014,21 +2382,28 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 		err = -EHOSTUNREACH;</div><div class='ctx'> 		goto no_route;</div><div class='ctx'> 	}</div><div class='del'>-	if (res-&gt;type != RTN_UNICAST)</div><div class='add'>+	if (res-&gt;type != RTN_UNICAST) {</div><div class='add'>+		reason = SKB_DROP_REASON_IP_INVALID_DEST;</div><div class='ctx'> 		goto martian_destination;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> make_route:</div><div class='del'>-	err = ip_mkroute_input(skb, res, in_dev, daddr, saddr, tos, flkeys);</div><div class='del'>-out:	return err;</div><div class='add'>+	reason = ip_mkroute_input(skb, res, in_dev, daddr, saddr, dscp,</div><div class='add'>+				  flkeys);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return reason;</div><div class='ctx'> </div><div class='ctx'> brd_input:</div><div class='del'>-	if (skb-&gt;protocol != htons(ETH_P_IP))</div><div class='del'>-		goto e_inval;</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IP)) {</div><div class='add'>+		reason = SKB_DROP_REASON_INVALID_PROTO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv4_is_zeronet(saddr)) {</div><div class='del'>-		err = fib_validate_source(skb, saddr, 0, tos, 0, dev,</div><div class='del'>-					  in_dev, &amp;itag);</div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		reason = fib_validate_source_reason(skb, saddr, 0, dscp, 0,</div><div class='add'>+						    dev, in_dev, &amp;itag);</div><div class='add'>+		if (reason)</div><div class='ctx'> 			goto martian_source;</div><div class='ctx'> 	}</div><div class='ctx'> 	flags |= RTCF_BROADCAST;</div><div class='hunk'>@@ -2036,22 +2411,23 @@ brd_input:</div><div class='ctx'> 	RT_CACHE_STAT_INC(in_brd);</div><div class='ctx'> </div><div class='ctx'> local_input:</div><div class='del'>-	do_cache = false;</div><div class='del'>-	if (res-&gt;fi) {</div><div class='del'>-		if (!itag) {</div><div class='del'>-			rth = rcu_dereference(FIB_RES_NH(*res).nh_rth_input);</div><div class='del'>-			if (rt_cache_valid(rth)) {</div><div class='del'>-				skb_dst_set_noref(skb, &amp;rth-&gt;dst);</div><div class='del'>-				err = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			do_cache = true;</div><div class='add'>+	if (IN_DEV_ORCONF(in_dev, NOPOLICY))</div><div class='add'>+		IPCB(skb)-&gt;flags |= IPSKB_NOPOLICY;</div><div class='add'>+</div><div class='add'>+	do_cache &amp;= res-&gt;fi &amp;&amp; !itag;</div><div class='add'>+	if (do_cache) {</div><div class='add'>+		struct fib_nh_common *nhc = FIB_RES_NHC(*res);</div><div class='add'>+</div><div class='add'>+		rth = rcu_dereference(nhc-&gt;nhc_rth_input);</div><div class='add'>+		if (rt_cache_valid(rth)) {</div><div class='add'>+			skb_dst_set_noref(skb, &amp;rth-&gt;dst);</div><div class='add'>+			reason = SKB_NOT_DROPPED_YET;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rth = rt_dst_alloc(l3mdev_master_dev_rcu(dev) ? : net-&gt;loopback_dev,</div><div class='del'>-			   flags | RTCF_LOCAL, res-&gt;type,</div><div class='del'>-			   IN_DEV_CONF_GET(in_dev, NOPOLICY), false, do_cache);</div><div class='add'>+	rth = rt_dst_alloc(ip_rt_get_dev(net, res),</div><div class='add'>+			   flags | RTCF_LOCAL, res-&gt;type, false);</div><div class='ctx'> 	if (!rth)</div><div class='ctx'> 		goto e_nobufs;</div><div class='ctx'> </div><div class='hunk'>@@ -2065,24 +2441,24 @@ local_input:</div><div class='ctx'> 	if (res-&gt;type == RTN_UNREACHABLE) {</div><div class='ctx'> 		rth-&gt;dst.input= ip_error;</div><div class='ctx'> 		rth-&gt;dst.error= -err;</div><div class='del'>-		rth-&gt;rt_flags 	&amp;= ~RTCF_LOCAL;</div><div class='add'>+		rth-&gt;rt_flags	&amp;= ~RTCF_LOCAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (do_cache) {</div><div class='del'>-		struct fib_nh *nh = &amp;FIB_RES_NH(*res);</div><div class='add'>+		struct fib_nh_common *nhc = FIB_RES_NHC(*res);</div><div class='ctx'> </div><div class='del'>-		rth-&gt;dst.lwtstate = lwtstate_get(nh-&gt;nh_lwtstate);</div><div class='add'>+		rth-&gt;dst.lwtstate = lwtstate_get(nhc-&gt;nhc_lwtstate);</div><div class='ctx'> 		if (lwtunnel_input_redirect(rth-&gt;dst.lwtstate)) {</div><div class='ctx'> 			WARN_ON(rth-&gt;dst.input == lwtunnel_input);</div><div class='ctx'> 			rth-&gt;dst.lwtstate-&gt;orig_input = rth-&gt;dst.input;</div><div class='ctx'> 			rth-&gt;dst.input = lwtunnel_input;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(!rt_cache_route(nh, rth)))</div><div class='add'>+		if (unlikely(!rt_cache_route(nhc, rth)))</div><div class='ctx'> 			rt_add_uncached_list(rth);</div><div class='ctx'> 	}</div><div class='ctx'> 	skb_dst_set(skb, &amp;rth-&gt;dst);</div><div class='del'>-	err = 0;</div><div class='add'>+	reason = SKB_NOT_DROPPED_YET;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> no_route:</div><div class='hunk'>@@ -2102,13 +2478,10 @@ martian_destination:</div><div class='ctx'> 		net_warn_ratelimited("martian destination %pI4 from %pI4, dev %s\n",</div><div class='ctx'> 				     &amp;daddr, &amp;saddr, dev-&gt;name);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-e_inval:</div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> e_nobufs:</div><div class='del'>-	err = -ENOBUFS;</div><div class='add'>+	reason = SKB_DROP_REASON_NOMEM;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> martian_source:</div><div class='hunk'>@@ -2116,47 +2489,36 @@ martian_source:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='del'>-			 u8 tos, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct fib_result res;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	tos &amp;= IPTOS_RT_MASK;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &amp;res);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ip_route_input_noref);</div><div class='del'>-</div><div class='ctx'> /* called with rcu_read_lock held */</div><div class='del'>-int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='del'>-		       u8 tos, struct net_device *dev, struct fib_result *res)</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='add'>+		   dscp_t dscp, struct net_device *dev,</div><div class='add'>+		   struct fib_result *res)</div><div class='ctx'> {</div><div class='ctx'> 	/* Multicast recognition logic is moved from route cache to here.</div><div class='del'>-	   The problem was that too many Ethernet cards have broken/missing</div><div class='del'>-	   hardware multicast filters :-( As result the host on multicasting</div><div class='del'>-	   network acquires a lot of useless route cache entries, sort of</div><div class='del'>-	   SDR messages from all the world. Now we try to get rid of them.</div><div class='del'>-	   Really, provided software IP multicast filter is organized</div><div class='del'>-	   reasonably (at least, hashed), it does not result in a slowdown</div><div class='del'>-	   comparing with route cache reject entries.</div><div class='del'>-	   Note, that multicast routers are not affected, because</div><div class='del'>-	   route cache entry is created eventually.</div><div class='add'>+	 * The problem was that too many Ethernet cards have broken/missing</div><div class='add'>+	 * hardware multicast filters :-( As result the host on multicasting</div><div class='add'>+	 * network acquires a lot of useless route cache entries, sort of</div><div class='add'>+	 * SDR messages from all the world. Now we try to get rid of them.</div><div class='add'>+	 * Really, provided software IP multicast filter is organized</div><div class='add'>+	 * reasonably (at least, hashed), it does not result in a slowdown</div><div class='add'>+	 * comparing with route cache reject entries.</div><div class='add'>+	 * Note, that multicast routers are not affected, because</div><div class='add'>+	 * route cache entry is created eventually.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ipv4_is_multicast(daddr)) {</div><div class='add'>+		enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 		struct in_device *in_dev = __in_dev_get_rcu(dev);</div><div class='ctx'> 		int our = 0;</div><div class='del'>-		int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (in_dev)</div><div class='del'>-			our = ip_check_mc_rcu(in_dev, daddr, saddr,</div><div class='del'>-					      ip_hdr(skb)-&gt;protocol);</div><div class='add'>+		if (!in_dev)</div><div class='add'>+			return reason;</div><div class='add'>+</div><div class='add'>+		our = ip_check_mc_rcu(in_dev, daddr, saddr,</div><div class='add'>+				      ip_hdr(skb)-&gt;protocol);</div><div class='ctx'> </div><div class='ctx'> 		/* check l3 master if no match yet */</div><div class='del'>-		if ((!in_dev || !our) &amp;&amp; netif_is_l3_slave(dev)) {</div><div class='add'>+		if (!our &amp;&amp; netif_is_l3_slave(dev)) {</div><div class='ctx'> 			struct in_device *l3_in_dev;</div><div class='ctx'> </div><div class='ctx'> 			l3_in_dev = __in_dev_get_rcu(skb-&gt;dev);</div><div class='hunk'>@@ -2172,14 +2534,29 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,</div><div class='ctx'> 		     IN_DEV_MFORWARD(in_dev))</div><div class='ctx'> #endif</div><div class='ctx'> 		   ) {</div><div class='del'>-			err = ip_route_input_mc(skb, daddr, saddr,</div><div class='del'>-						tos, dev, our);</div><div class='add'>+			reason = ip_route_input_mc(skb, daddr, saddr, dscp,</div><div class='add'>+						   dev, our);</div><div class='ctx'> 		}</div><div class='del'>-		return err;</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ip_route_input_slow(skb, daddr, saddr, tos, dev, res);</div><div class='add'>+	return ip_route_input_slow(skb, daddr, saddr, dscp, dev, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum skb_drop_reason ip_route_input_noref(struct sk_buff *skb, __be32 daddr,</div><div class='add'>+					  __be32 saddr, dscp_t dscp,</div><div class='add'>+					  struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	struct fib_result res;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	reason = ip_route_input_rcu(skb, daddr, saddr, dscp, dev, &amp;res);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ip_route_input_noref);</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='ctx'> static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='hunk'>@@ -2204,12 +2581,16 @@ static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='ctx'> 		    !netif_is_l3_master(dev_out))</div><div class='ctx'> 			return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (ipv4_is_lbcast(fl4-&gt;daddr))</div><div class='add'>+	if (ipv4_is_lbcast(fl4-&gt;daddr)) {</div><div class='ctx'> 		type = RTN_BROADCAST;</div><div class='del'>-	else if (ipv4_is_multicast(fl4-&gt;daddr))</div><div class='add'>+</div><div class='add'>+		/* reset fi to prevent gateway resolution */</div><div class='add'>+		fi = NULL;</div><div class='add'>+	} else if (ipv4_is_multicast(fl4-&gt;daddr)) {</div><div class='ctx'> 		type = RTN_MULTICAST;</div><div class='del'>-	else if (ipv4_is_zeronet(fl4-&gt;daddr))</div><div class='add'>+	} else if (ipv4_is_zeronet(fl4-&gt;daddr)) {</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev_out-&gt;flags &amp; IFF_LOOPBACK)</div><div class='ctx'> 		flags |= RTCF_LOCAL;</div><div class='hunk'>@@ -2217,7 +2598,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='ctx'> 	do_cache = true;</div><div class='ctx'> 	if (type == RTN_BROADCAST) {</div><div class='ctx'> 		flags |= RTCF_BROADCAST | RTCF_LOCAL;</div><div class='del'>-		fi = NULL;</div><div class='ctx'> 	} else if (type == RTN_MULTICAST) {</div><div class='ctx'> 		flags |= RTCF_MULTICAST | RTCF_LOCAL;</div><div class='ctx'> 		if (!ip_check_mc_rcu(in_dev, fl4-&gt;daddr, fl4-&gt;saddr,</div><div class='hunk'>@@ -2248,10 +2628,10 @@ static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='ctx'> 	fnhe = NULL;</div><div class='ctx'> 	do_cache &amp;= fi != NULL;</div><div class='ctx'> 	if (fi) {</div><div class='add'>+		struct fib_nh_common *nhc = FIB_RES_NHC(*res);</div><div class='ctx'> 		struct rtable __rcu **prth;</div><div class='del'>-		struct fib_nh *nh = &amp;FIB_RES_NH(*res);</div><div class='ctx'> </div><div class='del'>-		fnhe = find_exception(nh, fl4-&gt;daddr);</div><div class='add'>+		fnhe = find_exception(nhc, fl4-&gt;daddr);</div><div class='ctx'> 		if (!do_cache)</div><div class='ctx'> 			goto add;</div><div class='ctx'> 		if (fnhe) {</div><div class='hunk'>@@ -2259,12 +2639,12 @@ static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (unlikely(fl4-&gt;flowi4_flags &amp;</div><div class='ctx'> 				     FLOWI_FLAG_KNOWN_NH &amp;&amp;</div><div class='del'>-				     !(nh-&gt;nh_gw &amp;&amp;</div><div class='del'>-				       nh-&gt;nh_scope == RT_SCOPE_LINK))) {</div><div class='add'>+				     !(nhc-&gt;nhc_gw_family &amp;&amp;</div><div class='add'>+				       nhc-&gt;nhc_scope == RT_SCOPE_LINK))) {</div><div class='ctx'> 				do_cache = false;</div><div class='ctx'> 				goto add;</div><div class='ctx'> 			}</div><div class='del'>-			prth = raw_cpu_ptr(nh-&gt;nh_pcpu_rth_output);</div><div class='add'>+			prth = raw_cpu_ptr(nhc-&gt;nhc_pcpu_rth_output);</div><div class='ctx'> 		}</div><div class='ctx'> 		rth = rcu_dereference(*prth);</div><div class='ctx'> 		if (rt_cache_valid(rth) &amp;&amp; dst_hold_safe(&amp;rth-&gt;dst))</div><div class='hunk'>@@ -2273,9 +2653,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res,</div><div class='ctx'> </div><div class='ctx'> add:</div><div class='ctx'> 	rth = rt_dst_alloc(dev_out, flags, type,</div><div class='del'>-			   IN_DEV_CONF_GET(in_dev, NOPOLICY),</div><div class='del'>-			   IN_DEV_CONF_GET(in_dev, NOXFRM),</div><div class='del'>-			   do_cache);</div><div class='add'>+			   IN_DEV_ORCONF(in_dev, NOXFRM));</div><div class='ctx'> 	if (!rth)</div><div class='ctx'> 		return ERR_PTR(-ENOBUFS);</div><div class='ctx'> </div><div class='hunk'>@@ -2294,7 +2672,7 @@ add:</div><div class='ctx'> 			if (IN_DEV_MFORWARD(in_dev) &amp;&amp;</div><div class='ctx'> 			    !ipv4_is_local_multicast(fl4-&gt;daddr)) {</div><div class='ctx'> 				rth-&gt;dst.input = ip_mr_input;</div><div class='del'>-				rth-&gt;dst.output = ip_mc_output;</div><div class='add'>+				rth-&gt;dst.output = ip_mr_output;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2313,7 +2691,6 @@ add:</div><div class='ctx'> struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 					const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 tos = RT_FL_TOS(fl4);</div><div class='ctx'> 	struct fib_result res = {</div><div class='ctx'> 		.type		= RTN_UNSPEC,</div><div class='ctx'> 		.fi		= NULL,</div><div class='hunk'>@@ -2323,9 +2700,6 @@ struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 	struct rtable *rth;</div><div class='ctx'> </div><div class='ctx'> 	fl4-&gt;flowi4_iif = LOOPBACK_IFINDEX;</div><div class='del'>-	fl4-&gt;flowi4_tos = tos &amp; IPTOS_RT_MASK;</div><div class='del'>-	fl4-&gt;flowi4_scope = ((tos &amp; RTO_ONLINK) ?</div><div class='del'>-			 RT_SCOPE_LINK : RT_SCOPE_UNIVERSE);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	rth = ip_route_output_key_hash_rcu(net, fl4, &amp;res, skb);</div><div class='hunk'>@@ -2343,21 +2717,23 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 	int orig_oif = fl4-&gt;flowi4_oif;</div><div class='ctx'> 	unsigned int flags = 0;</div><div class='ctx'> 	struct rtable *rth;</div><div class='del'>-	int err = -ENETUNREACH;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (fl4-&gt;saddr) {</div><div class='del'>-		rth = ERR_PTR(-EINVAL);</div><div class='ctx'> 		if (ipv4_is_multicast(fl4-&gt;saddr) ||</div><div class='del'>-		    ipv4_is_lbcast(fl4-&gt;saddr) ||</div><div class='del'>-		    ipv4_is_zeronet(fl4-&gt;saddr))</div><div class='add'>+		    ipv4_is_lbcast(fl4-&gt;saddr)) {</div><div class='add'>+			rth = ERR_PTR(-EINVAL);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rth = ERR_PTR(-ENETUNREACH);</div><div class='ctx'> </div><div class='ctx'> 		/* I removed check for oif == dev_out-&gt;oif here.</div><div class='del'>-		   It was wrong for two reasons:</div><div class='del'>-		   1. ip_dev_find(net, saddr) can return wrong iface, if saddr</div><div class='del'>-		      is assigned to multiple interfaces.</div><div class='del'>-		   2. Moreover, we are allowed to send packets with saddr</div><div class='del'>-		      of another iface. --ANK</div><div class='add'>+		 * It was wrong for two reasons:</div><div class='add'>+		 * 1. ip_dev_find(net, saddr) can return wrong iface, if saddr</div><div class='add'>+		 *    is assigned to multiple interfaces.</div><div class='add'>+		 * 2. Moreover, we are allowed to send packets with saddr</div><div class='add'>+		 *    of another iface. --ANK</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (fl4-&gt;flowi4_oif == 0 &amp;&amp;</div><div class='hunk'>@@ -2369,18 +2745,18 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			/* Special hack: user can direct multicasts</div><div class='del'>-			   and limited broadcast via necessary interface</div><div class='del'>-			   without fiddling with IP_MULTICAST_IF or IP_PKTINFO.</div><div class='del'>-			   This hack is not just for fun, it allows</div><div class='del'>-			   vic,vat and friends to work.</div><div class='del'>-			   They bind socket to loopback, set ttl to zero</div><div class='del'>-			   and expect that it will work.</div><div class='del'>-			   From the viewpoint of routing cache they are broken,</div><div class='del'>-			   because we are not allowed to build multicast path</div><div class='del'>-			   with loopback source addr (look, routing cache</div><div class='del'>-			   cannot know, that ttl is zero, so that packet</div><div class='del'>-			   will not leave this host and route is valid).</div><div class='del'>-			   Luckily, this hack is good workaround.</div><div class='add'>+			 * and limited broadcast via necessary interface</div><div class='add'>+			 * without fiddling with IP_MULTICAST_IF or IP_PKTINFO.</div><div class='add'>+			 * This hack is not just for fun, it allows</div><div class='add'>+			 * vic,vat and friends to work.</div><div class='add'>+			 * They bind socket to loopback, set ttl to zero</div><div class='add'>+			 * and expect that it will work.</div><div class='add'>+			 * From the viewpoint of routing cache they are broken,</div><div class='add'>+			 * because we are not allowed to build multicast path</div><div class='add'>+			 * with loopback source addr (look, routing cache</div><div class='add'>+			 * cannot know, that ttl is zero, so that packet</div><div class='add'>+			 * will not leave this host and route is valid).</div><div class='add'>+			 * Luckily, this hack is good workaround.</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='ctx'> 			fl4-&gt;flowi4_oif = dev_out-&gt;ifindex;</div><div class='hunk'>@@ -2440,24 +2816,23 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 		res-&gt;fi = NULL;</div><div class='ctx'> 		res-&gt;table = NULL;</div><div class='ctx'> 		if (fl4-&gt;flowi4_oif &amp;&amp;</div><div class='del'>-		    (ipv4_is_multicast(fl4-&gt;daddr) ||</div><div class='del'>-		    !netif_index_is_l3_master(net, fl4-&gt;flowi4_oif))) {</div><div class='add'>+		    (ipv4_is_multicast(fl4-&gt;daddr) || !fl4-&gt;flowi4_l3mdev)) {</div><div class='ctx'> 			/* Apparently, routing tables are wrong. Assume,</div><div class='del'>-			   that the destination is on link.</div><div class='del'>-</div><div class='del'>-			   WHY? DW.</div><div class='del'>-			   Because we are allowed to send to iface</div><div class='del'>-			   even if it has NO routes and NO assigned</div><div class='del'>-			   addresses. When oif is specified, routing</div><div class='del'>-			   tables are looked up with only one purpose:</div><div class='del'>-			   to catch if destination is gatewayed, rather than</div><div class='del'>-			   direct. Moreover, if MSG_DONTROUTE is set,</div><div class='del'>-			   we send packet, ignoring both routing tables</div><div class='del'>-			   and ifaddr state. --ANK</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			   We could make it even if oif is unknown,</div><div class='del'>-			   likely IPv6, but we do not.</div><div class='add'>+			 * that the destination is on link.</div><div class='add'>+			 *</div><div class='add'>+			 * WHY? DW.</div><div class='add'>+			 * Because we are allowed to send to iface</div><div class='add'>+			 * even if it has NO routes and NO assigned</div><div class='add'>+			 * addresses. When oif is specified, routing</div><div class='add'>+			 * tables are looked up with only one purpose:</div><div class='add'>+			 * to catch if destination is gatewayed, rather than</div><div class='add'>+			 * direct. Moreover, if MSG_DONTROUTE is set,</div><div class='add'>+			 * we send packet, ignoring both routing tables</div><div class='add'>+			 * and ifaddr state. --ANK</div><div class='add'>+			 *</div><div class='add'>+			 *</div><div class='add'>+			 * We could make it even if oif is unknown,</div><div class='add'>+			 * likely IPv6, but we do not.</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='ctx'> 			if (fl4-&gt;saddr == 0)</div><div class='hunk'>@@ -2495,8 +2870,6 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,</div><div class='ctx'> 	fib_select_path(net, res, fl4, skb);</div><div class='ctx'> </div><div class='ctx'> 	dev_out = FIB_RES_DEV(*res);</div><div class='del'>-	fl4-&gt;flowi4_oif = dev_out-&gt;ifindex;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> make_route:</div><div class='ctx'> 	rth = __mkroute_output(res, fl4, orig_oif, dev_out, flags);</div><div class='hunk'>@@ -2505,51 +2878,23 @@ out:</div><div class='ctx'> 	return rth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int ipv4_blackhole_mtu(const struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='del'>-</div><div class='del'>-	return mtu ? : dst-&gt;dev-&gt;mtu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-					  struct sk_buff *skb, u32 mtu)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ipv4_rt_blackhole_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 *ipv4_rt_blackhole_cow_metrics(struct dst_entry *dst,</div><div class='del'>-					  unsigned long old)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct dst_ops ipv4_dst_blackhole_ops = {</div><div class='del'>-	.family			=	AF_INET,</div><div class='del'>-	.check			=	ipv4_blackhole_dst_check,</div><div class='del'>-	.mtu			=	ipv4_blackhole_mtu,</div><div class='del'>-	.default_advmss		=	ipv4_default_advmss,</div><div class='del'>-	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,</div><div class='del'>-	.redirect		=	ipv4_rt_blackhole_redirect,</div><div class='del'>-	.cow_metrics		=	ipv4_rt_blackhole_cow_metrics,</div><div class='del'>-	.neigh_lookup		=	ipv4_neigh_lookup,</div><div class='add'>+	.family			= AF_INET,</div><div class='add'>+	.default_advmss		= ipv4_default_advmss,</div><div class='add'>+	.neigh_lookup		= ipv4_neigh_lookup,</div><div class='add'>+	.check			= dst_blackhole_check,</div><div class='add'>+	.cow_metrics		= dst_blackhole_cow_metrics,</div><div class='add'>+	.update_pmtu		= dst_blackhole_update_pmtu,</div><div class='add'>+	.redirect		= dst_blackhole_redirect,</div><div class='add'>+	.mtu			= dst_blackhole_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig)</div><div class='ctx'> {</div><div class='del'>-	struct rtable *ort = (struct rtable *) dst_orig;</div><div class='add'>+	struct rtable *ort = dst_rtable(dst_orig);</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	rt = dst_alloc(&amp;ipv4_dst_blackhole_ops, NULL, 1, DST_OBSOLETE_DEAD, 0);</div><div class='add'>+	rt = dst_alloc(&amp;ipv4_dst_blackhole_ops, NULL, DST_OBSOLETE_DEAD, 0);</div><div class='ctx'> 	if (rt) {</div><div class='ctx'> 		struct dst_entry *new = &amp;rt-&gt;dst;</div><div class='ctx'> </div><div class='hunk'>@@ -2558,8 +2903,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or</div><div class='ctx'> 		new-&gt;output = dst_discard_out;</div><div class='ctx'> </div><div class='ctx'> 		new-&gt;dev = net-&gt;loopback_dev;</div><div class='del'>-		if (new-&gt;dev)</div><div class='del'>-			dev_hold(new-&gt;dev);</div><div class='add'>+		netdev_hold(new-&gt;dev, &amp;new-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 		rt-&gt;rt_is_input = ort-&gt;rt_is_input;</div><div class='ctx'> 		rt-&gt;rt_iif = ort-&gt;rt_iif;</div><div class='hunk'>@@ -2569,10 +2913,12 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or</div><div class='ctx'> 		rt-&gt;rt_genid = rt_genid_ipv4(net);</div><div class='ctx'> 		rt-&gt;rt_flags = ort-&gt;rt_flags;</div><div class='ctx'> 		rt-&gt;rt_type = ort-&gt;rt_type;</div><div class='del'>-		rt-&gt;rt_gateway = ort-&gt;rt_gateway;</div><div class='ctx'> 		rt-&gt;rt_uses_gateway = ort-&gt;rt_uses_gateway;</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;rt-&gt;rt_uncached);</div><div class='add'>+		rt-&gt;rt_gw_family = ort-&gt;rt_gw_family;</div><div class='add'>+		if (rt-&gt;rt_gw_family == AF_INET)</div><div class='add'>+			rt-&gt;rt_gw4 = ort-&gt;rt_gw4;</div><div class='add'>+		else if (rt-&gt;rt_gw_family == AF_INET6)</div><div class='add'>+			rt-&gt;rt_gw6 = ort-&gt;rt_gw6;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dst_release(dst_orig);</div><div class='hunk'>@@ -2588,10 +2934,12 @@ struct rtable *ip_route_output_flow(struct net *net, struct flowi4 *flp4,</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return rt;</div><div class='ctx'> </div><div class='del'>-	if (flp4-&gt;flowi4_proto)</div><div class='del'>-		rt = (struct rtable *)xfrm_lookup_route(net, &amp;rt-&gt;dst,</div><div class='del'>-							flowi4_to_flowi(flp4),</div><div class='del'>-							sk, 0);</div><div class='add'>+	if (flp4-&gt;flowi4_proto) {</div><div class='add'>+		flp4-&gt;flowi4_oif = rt-&gt;dst.dev-&gt;ifindex;</div><div class='add'>+		rt = dst_rtable(xfrm_lookup_route(net, &amp;rt-&gt;dst,</div><div class='add'>+						  flowi4_to_flowi(flp4),</div><div class='add'>+						  sk, 0));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rt;</div><div class='ctx'> }</div><div class='hunk'>@@ -2599,8 +2947,9 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock held */</div><div class='ctx'> static int rt_fill_info(struct net *net, __be32 dst, __be32 src,</div><div class='del'>-			struct rtable *rt, u32 table_id, struct flowi4 *fl4,</div><div class='del'>-			struct sk_buff *skb, u32 portid, u32 seq)</div><div class='add'>+			struct rtable *rt, u32 table_id, dscp_t dscp,</div><div class='add'>+			struct flowi4 *fl4, struct sk_buff *skb, u32 portid,</div><div class='add'>+			u32 seq, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtmsg *r;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='hunk'>@@ -2608,7 +2957,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,</div><div class='ctx'> 	u32 error;</div><div class='ctx'> 	u32 metrics[RTAX_MAX];</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*r), 0);</div><div class='add'>+	nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*r), flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -2616,7 +2965,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,</div><div class='ctx'> 	r-&gt;rtm_family	 = AF_INET;</div><div class='ctx'> 	r-&gt;rtm_dst_len	= 32;</div><div class='ctx'> 	r-&gt;rtm_src_len	= 0;</div><div class='del'>-	r-&gt;rtm_tos	= fl4-&gt;flowi4_tos;</div><div class='add'>+	r-&gt;rtm_tos	= inet_dscp_to_dsfield(dscp);</div><div class='ctx'> 	r-&gt;rtm_table	= table_id &lt; 256 ? table_id : RT_TABLE_COMPAT;</div><div class='ctx'> 	if (nla_put_u32(skb, RTA_TABLE, table_id))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -2639,21 +2988,38 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,</div><div class='ctx'> 	if (rt-&gt;dst.dev &amp;&amp;</div><div class='ctx'> 	    nla_put_u32(skb, RTA_OIF, rt-&gt;dst.dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='add'>+	if (lwtunnel_fill_encap(skb, rt-&gt;dst.lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) &lt; 0)</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_CLASSID</div><div class='ctx'> 	if (rt-&gt;dst.tclassid &amp;&amp;</div><div class='ctx'> 	    nla_put_u32(skb, RTA_FLOW, rt-&gt;dst.tclassid))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> #endif</div><div class='del'>-	if (!rt_is_input_route(rt) &amp;&amp;</div><div class='add'>+	if (fl4 &amp;&amp; !rt_is_input_route(rt) &amp;&amp;</div><div class='ctx'> 	    fl4-&gt;saddr != src) {</div><div class='ctx'> 		if (nla_put_in_addr(skb, RTA_PREFSRC, fl4-&gt;saddr))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='del'>-	if (rt-&gt;rt_uses_gateway &amp;&amp;</div><div class='del'>-	    nla_put_in_addr(skb, RTA_GATEWAY, rt-&gt;rt_gateway))</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	if (rt-&gt;rt_uses_gateway) {</div><div class='add'>+		if (rt-&gt;rt_gw_family == AF_INET &amp;&amp;</div><div class='add'>+		    nla_put_in_addr(skb, RTA_GATEWAY, rt-&gt;rt_gw4)) {</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		} else if (rt-&gt;rt_gw_family == AF_INET6) {</div><div class='add'>+			int alen = sizeof(struct in6_addr);</div><div class='add'>+			struct nlattr *nla;</div><div class='add'>+			struct rtvia *via;</div><div class='ctx'> </div><div class='del'>-	expires = rt-&gt;dst.expires;</div><div class='add'>+			nla = nla_reserve(skb, RTA_VIA, alen + 2);</div><div class='add'>+			if (!nla)</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+			via = nla_data(nla);</div><div class='add'>+			via-&gt;rtvia_family = AF_INET6;</div><div class='add'>+			memcpy(via-&gt;rtvia_addr, &amp;rt-&gt;rt_gw6, alen);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expires = READ_ONCE(rt-&gt;dst.expires);</div><div class='ctx'> 	if (expires) {</div><div class='ctx'> 		unsigned long now = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -2671,36 +3037,40 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,</div><div class='ctx'> 	if (rtnetlink_put_metrics(skb, metrics) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (fl4-&gt;flowi4_mark &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_MARK, fl4-&gt;flowi4_mark))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (!uid_eq(fl4-&gt;flowi4_uid, INVALID_UID) &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_UID,</div><div class='del'>-			from_kuid_munged(current_user_ns(), fl4-&gt;flowi4_uid)))</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+	if (fl4) {</div><div class='add'>+		if (fl4-&gt;flowi4_mark &amp;&amp;</div><div class='add'>+		    nla_put_u32(skb, RTA_MARK, fl4-&gt;flowi4_mark))</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	error = rt-&gt;dst.error;</div><div class='add'>+		if (!uid_eq(fl4-&gt;flowi4_uid, INVALID_UID) &amp;&amp;</div><div class='add'>+		    nla_put_u32(skb, RTA_UID,</div><div class='add'>+				from_kuid_munged(current_user_ns(),</div><div class='add'>+						 fl4-&gt;flowi4_uid)))</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (rt_is_input_route(rt)) {</div><div class='add'>+		if (rt_is_input_route(rt)) {</div><div class='ctx'> #ifdef CONFIG_IP_MROUTE</div><div class='del'>-		if (ipv4_is_multicast(dst) &amp;&amp; !ipv4_is_local_multicast(dst) &amp;&amp;</div><div class='del'>-		    IPV4_DEVCONF_ALL(net, MC_FORWARDING)) {</div><div class='del'>-			int err = ipmr_get_route(net, skb,</div><div class='del'>-						 fl4-&gt;saddr, fl4-&gt;daddr,</div><div class='del'>-						 r, portid);</div><div class='del'>-</div><div class='del'>-			if (err &lt;= 0) {</div><div class='del'>-				if (err == 0)</div><div class='del'>-					return 0;</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='add'>+			if (ipv4_is_multicast(dst) &amp;&amp;</div><div class='add'>+			    !ipv4_is_local_multicast(dst) &amp;&amp;</div><div class='add'>+			    IPV4_DEVCONF_ALL_RO(net, MC_FORWARDING)) {</div><div class='add'>+				int err = ipmr_get_route(net, skb,</div><div class='add'>+							 fl4-&gt;saddr, fl4-&gt;daddr,</div><div class='add'>+							 r, portid);</div><div class='add'>+</div><div class='add'>+				if (err &lt;= 0) {</div><div class='add'>+					if (err == 0)</div><div class='add'>+						return 0;</div><div class='add'>+					goto nla_put_failure;</div><div class='add'>+				}</div><div class='add'>+			} else</div><div class='ctx'> #endif</div><div class='del'>-			if (nla_put_u32(skb, RTA_IIF, fl4-&gt;flowi4_iif))</div><div class='del'>-				goto nla_put_failure;</div><div class='add'>+				if (nla_put_u32(skb, RTA_IIF, fl4-&gt;flowi4_iif))</div><div class='add'>+					goto nla_put_failure;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	error = rt-&gt;dst.error;</div><div class='add'>+</div><div class='ctx'> 	if (rtnl_put_cacheinfo(skb, &amp;rt-&gt;dst, 0, expires, error) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2712,6 +3082,81 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fnhe_dump_bucket(struct net *net, struct sk_buff *skb,</div><div class='add'>+			    struct netlink_callback *cb, u32 table_id,</div><div class='add'>+			    struct fnhe_hash_bucket *bucket, int genid,</div><div class='add'>+			    int *fa_index, int fa_start, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FNHE_HASH_SIZE; i++) {</div><div class='add'>+		struct fib_nh_exception *fnhe;</div><div class='add'>+</div><div class='add'>+		for (fnhe = rcu_dereference(bucket[i].chain); fnhe;</div><div class='add'>+		     fnhe = rcu_dereference(fnhe-&gt;fnhe_next)) {</div><div class='add'>+			struct rtable *rt;</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			if (*fa_index &lt; fa_start)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			if (fnhe-&gt;fnhe_genid != genid)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			if (fnhe-&gt;fnhe_expires &amp;&amp;</div><div class='add'>+			    time_after(jiffies, fnhe-&gt;fnhe_expires))</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			rt = rcu_dereference(fnhe-&gt;fnhe_rth_input);</div><div class='add'>+			if (!rt)</div><div class='add'>+				rt = rcu_dereference(fnhe-&gt;fnhe_rth_output);</div><div class='add'>+			if (!rt)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			err = rt_fill_info(net, fnhe-&gt;fnhe_daddr, 0, rt,</div><div class='add'>+					   table_id, 0, NULL, skb,</div><div class='add'>+					   NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					   cb-&gt;nlh-&gt;nlmsg_seq, flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+next:</div><div class='add'>+			(*fa_index)++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fib_dump_info_fnhe(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+		       u32 table_id, struct fib_info *fi,</div><div class='add'>+		       int *fa_index, int fa_start, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='add'>+	int nhsel, genid = fnhe_genid(net);</div><div class='add'>+</div><div class='add'>+	for (nhsel = 0; nhsel &lt; fib_info_num_path(fi); nhsel++) {</div><div class='add'>+		struct fib_nh_common *nhc = fib_info_nhc(fi, nhsel);</div><div class='add'>+		struct fnhe_hash_bucket *bucket;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (nhc-&gt;nhc_flags &amp; RTNH_F_DEAD)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		bucket = rcu_dereference(nhc-&gt;nhc_exceptions);</div><div class='add'>+		err = 0;</div><div class='add'>+		if (bucket)</div><div class='add'>+			err = fnhe_dump_bucket(net, skb, cb, table_id, bucket,</div><div class='add'>+					       genid, fa_index, fa_start,</div><div class='add'>+					       flags);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *inet_rtm_getroute_build_skb(__be32 src, __be32 dst,</div><div class='ctx'> 						   u8 ip_proto, __be16 sport,</div><div class='ctx'> 						   __be16 dport)</div><div class='hunk'>@@ -2745,7 +3190,7 @@ static struct sk_buff *inet_rtm_getroute_build_skb(__be32 src, __be32 dst,</div><div class='ctx'> 		udph = skb_put_zero(skb, sizeof(struct udphdr));</div><div class='ctx'> 		udph-&gt;source = sport;</div><div class='ctx'> 		udph-&gt;dest = dport;</div><div class='del'>-		udph-&gt;len = sizeof(struct udphdr);</div><div class='add'>+		udph-&gt;len = htons(sizeof(struct udphdr));</div><div class='ctx'> 		udph-&gt;check = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2773,6 +3218,75 @@ static struct sk_buff *inet_rtm_getroute_build_skb(__be32 src, __be32 dst,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inet_rtm_valid_getroute_req(struct sk_buff *skb,</div><div class='add'>+				       const struct nlmsghdr *nlh,</div><div class='add'>+				       struct nlattr **tb,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rtmsg *rtm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	rtm = nlmsg_payload(nlh, sizeof(*rtm));</div><div class='add'>+	if (!rtm) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "ipv4: Invalid header for route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					      rtm_ipv4_policy, extack);</div><div class='add'>+</div><div class='add'>+	if ((rtm-&gt;rtm_src_len &amp;&amp; rtm-&gt;rtm_src_len != 32) ||</div><div class='add'>+	    (rtm-&gt;rtm_dst_len &amp;&amp; rtm-&gt;rtm_dst_len != 32) ||</div><div class='add'>+	    rtm-&gt;rtm_table || rtm-&gt;rtm_protocol ||</div><div class='add'>+	    rtm-&gt;rtm_scope || rtm-&gt;rtm_type) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Invalid values in header for route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rtm-&gt;rtm_flags &amp; ~(RTM_F_NOTIFY |</div><div class='add'>+			       RTM_F_LOOKUP_TABLE |</div><div class='add'>+			       RTM_F_FIB_MATCH)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: Unsupported rtm_flags for route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					    rtm_ipv4_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((tb[RTA_SRC] &amp;&amp; !rtm-&gt;rtm_src_len) ||</div><div class='add'>+	    (tb[RTA_DST] &amp;&amp; !rtm-&gt;rtm_dst_len)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ipv4: rtm_src_len and rtm_dst_len must be 32 for IPv4");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= RTA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case RTA_IIF:</div><div class='add'>+		case RTA_OIF:</div><div class='add'>+		case RTA_SRC:</div><div class='add'>+		case RTA_DST:</div><div class='add'>+		case RTA_IP_PROTO:</div><div class='add'>+		case RTA_SPORT:</div><div class='add'>+		case RTA_DPORT:</div><div class='add'>+		case RTA_MARK:</div><div class='add'>+		case RTA_UID:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "ipv4: Unsupported attribute in route get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -2785,24 +3299,25 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct rtable *rt = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='del'>-	struct flowi4 fl4;</div><div class='add'>+	struct flowi4 fl4 = {};</div><div class='ctx'> 	__be32 dst = 0;</div><div class='ctx'> 	__be32 src = 0;</div><div class='add'>+	dscp_t dscp;</div><div class='ctx'> 	kuid_t uid;</div><div class='ctx'> 	u32 iif;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int mark;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv4_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = inet_rtm_valid_getroute_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='del'>-	src = tb[RTA_SRC] ? nla_get_in_addr(tb[RTA_SRC]) : 0;</div><div class='del'>-	dst = tb[RTA_DST] ? nla_get_in_addr(tb[RTA_DST]) : 0;</div><div class='del'>-	iif = tb[RTA_IIF] ? nla_get_u32(tb[RTA_IIF]) : 0;</div><div class='del'>-	mark = tb[RTA_MARK] ? nla_get_u32(tb[RTA_MARK]) : 0;</div><div class='add'>+	src = nla_get_in_addr_default(tb[RTA_SRC], 0);</div><div class='add'>+	dst = nla_get_in_addr_default(tb[RTA_DST], 0);</div><div class='add'>+	iif = nla_get_u32_default(tb[RTA_IIF], 0);</div><div class='add'>+	mark = nla_get_u32_default(tb[RTA_MARK], 0);</div><div class='add'>+	dscp = inet_dsfield_to_dscp(rtm-&gt;rtm_tos);</div><div class='ctx'> 	if (tb[RTA_UID])</div><div class='ctx'> 		uid = make_kuid(current_user_ns(), nla_get_u32(tb[RTA_UID]));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2810,7 +3325,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	if (tb[RTA_IP_PROTO]) {</div><div class='ctx'> 		err = rtm_getroute_parse_ip_proto(tb[RTA_IP_PROTO],</div><div class='del'>-						  &amp;ip_proto, extack);</div><div class='add'>+						  &amp;ip_proto, AF_INET, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2825,11 +3340,10 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;fl4, 0, sizeof(fl4));</div><div class='ctx'> 	fl4.daddr = dst;</div><div class='ctx'> 	fl4.saddr = src;</div><div class='del'>-	fl4.flowi4_tos = rtm-&gt;rtm_tos;</div><div class='del'>-	fl4.flowi4_oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0;</div><div class='add'>+	fl4.flowi4_dscp = dscp;</div><div class='add'>+	fl4.flowi4_oif = nla_get_u32_default(tb[RTA_OIF], 0);</div><div class='ctx'> 	fl4.flowi4_mark = mark;</div><div class='ctx'> 	fl4.flowi4_uid = uid;</div><div class='ctx'> 	if (sport)</div><div class='hunk'>@@ -2852,14 +3366,15 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		fl4.flowi4_iif = iif; /* for rt_fill_info */</div><div class='ctx'> 		skb-&gt;dev	= dev;</div><div class='ctx'> 		skb-&gt;mark	= mark;</div><div class='del'>-		err = ip_route_input_rcu(skb, dst, src, rtm-&gt;rtm_tos,</div><div class='del'>-					 dev, &amp;res);</div><div class='add'>+		err = ip_route_input_rcu(skb, dst, src, dscp, dev,</div><div class='add'>+					 &amp;res) ? -EINVAL : 0;</div><div class='ctx'> </div><div class='ctx'> 		rt = skb_rtable(skb);</div><div class='ctx'> 		if (err == 0 &amp;&amp; rt-&gt;dst.error)</div><div class='ctx'> 			err = -rt-&gt;dst.error;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fl4.flowi4_iif = LOOPBACK_IFINDEX;</div><div class='add'>+		skb-&gt;dev = net-&gt;loopback_dev;</div><div class='ctx'> 		rt = ip_route_output_key_hash_rcu(net, &amp;fl4, &amp;res, skb);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='hunk'>@@ -2884,19 +3399,48 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (rtm-&gt;rtm_flags &amp; RTM_F_FIB_MATCH) {</div><div class='add'>+		struct fib_rt_info fri;</div><div class='add'>+</div><div class='ctx'> 		if (!res.fi) {</div><div class='ctx'> 			err = fib_props[res.type].error;</div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				err = -EHOSTUNREACH;</div><div class='ctx'> 			goto errout_rcu;</div><div class='ctx'> 		}</div><div class='add'>+		fri.fi = res.fi;</div><div class='add'>+		fri.tb_id = table_id;</div><div class='add'>+		fri.dst = res.prefix;</div><div class='add'>+		fri.dst_len = res.prefixlen;</div><div class='add'>+		fri.dscp = res.dscp;</div><div class='add'>+		fri.type = rt-&gt;rt_type;</div><div class='add'>+		fri.offload = 0;</div><div class='add'>+		fri.trap = 0;</div><div class='add'>+		fri.offload_failed = 0;</div><div class='add'>+		if (res.fa_head) {</div><div class='add'>+			struct fib_alias *fa;</div><div class='add'>+</div><div class='add'>+			hlist_for_each_entry_rcu(fa, res.fa_head, fa_list) {</div><div class='add'>+				u8 slen = 32 - fri.dst_len;</div><div class='add'>+</div><div class='add'>+				if (fa-&gt;fa_slen == slen &amp;&amp;</div><div class='add'>+				    fa-&gt;tb_id == fri.tb_id &amp;&amp;</div><div class='add'>+				    fa-&gt;fa_dscp == fri.dscp &amp;&amp;</div><div class='add'>+				    fa-&gt;fa_info == res.fi &amp;&amp;</div><div class='add'>+				    fa-&gt;fa_type == fri.type) {</div><div class='add'>+					fri.offload = READ_ONCE(fa-&gt;offload);</div><div class='add'>+					fri.trap = READ_ONCE(fa-&gt;trap);</div><div class='add'>+					fri.offload_failed =</div><div class='add'>+						READ_ONCE(fa-&gt;offload_failed);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		err = fib_dump_info(skb, NETLINK_CB(in_skb).portid,</div><div class='del'>-				    nlh-&gt;nlmsg_seq, RTM_NEWROUTE, table_id,</div><div class='del'>-				    rt-&gt;rt_type, res.prefix, res.prefixlen,</div><div class='del'>-				    fl4.flowi4_tos, res.fi, 0);</div><div class='add'>+				    nlh-&gt;nlmsg_seq, RTM_NEWROUTE, &amp;fri, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = rt_fill_info(net, dst, src, rt, table_id, &amp;fl4, skb,</div><div class='del'>-				   NETLINK_CB(in_skb).portid, nlh-&gt;nlmsg_seq);</div><div class='add'>+		err = rt_fill_info(net, dst, src, rt, table_id, res.dscp, &amp;fl4,</div><div class='add'>+				   skb, NETLINK_CB(in_skb).portid,</div><div class='add'>+				   nlh-&gt;nlmsg_seq, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout_rcu;</div><div class='hunk'>@@ -2924,9 +3468,8 @@ static int ip_rt_gc_min_interval __read_mostly	= HZ / 2;</div><div class='ctx'> static int ip_rt_gc_elasticity __read_mostly	= 8;</div><div class='ctx'> static int ip_min_valid_pmtu __read_mostly	= IPV4_MIN_MTU;</div><div class='ctx'> </div><div class='del'>-static int ipv4_sysctl_rtcache_flush(struct ctl_table *__ctl, int write,</div><div class='del'>-					void __user *buffer,</div><div class='del'>-					size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_sysctl_rtcache_flush(const struct ctl_table *__ctl, int write,</div><div class='add'>+		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = (struct net *)__ctl-&gt;extra1;</div><div class='ctx'> </div><div class='hunk'>@@ -3026,64 +3569,76 @@ static struct ctl_table ipv4_route_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char ipv4_route_flush_procname[] = "flush";</div><div class='add'>+</div><div class='add'>+static struct ctl_table ipv4_route_netns_table[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "mtu_expires",</div><div class='del'>-		.data		= &amp;ip_rt_mtu_expires,</div><div class='add'>+		.procname	= ipv4_route_flush_procname,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_jiffies,</div><div class='add'>+		.mode		= 0200,</div><div class='add'>+		.proc_handler	= ipv4_sysctl_rtcache_flush,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "min_pmtu",</div><div class='del'>-		.data		= &amp;ip_rt_min_pmtu,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;ip_min_valid_pmtu,</div><div class='add'>+		.procname       = "min_pmtu",</div><div class='add'>+		.data           = &amp;init_net.ipv4.ip_rt_min_pmtu,</div><div class='add'>+		.maxlen         = sizeof(int),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec_minmax,</div><div class='add'>+		.extra1         = &amp;ip_min_valid_pmtu,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "min_adv_mss",</div><div class='del'>-		.data		= &amp;ip_rt_min_advmss,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.procname       = "mtu_expires",</div><div class='add'>+		.data           = &amp;init_net.ipv4.ip_rt_mtu_expires,</div><div class='add'>+		.maxlen         = sizeof(int),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ctl_table ipv4_route_flush_table[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "flush",</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0200,</div><div class='del'>-		.proc_handler	= ipv4_sysctl_rtcache_flush,</div><div class='add'>+		.procname   = "min_adv_mss",</div><div class='add'>+		.data       = &amp;init_net.ipv4.ip_rt_min_advmss,</div><div class='add'>+		.maxlen     = sizeof(int),</div><div class='add'>+		.mode       = 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec,</div><div class='ctx'> 	},</div><div class='del'>-	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __net_init int sysctl_route_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table *tbl;</div><div class='add'>+	size_t table_size = ARRAY_SIZE(ipv4_route_netns_table);</div><div class='ctx'> </div><div class='del'>-	tbl = ipv4_route_flush_table;</div><div class='add'>+	tbl = ipv4_route_netns_table;</div><div class='ctx'> 	if (!net_eq(net, &amp;init_net)) {</div><div class='del'>-		tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		tbl = kmemdup(tbl, sizeof(ipv4_route_netns_table), GFP_KERNEL);</div><div class='ctx'> 		if (!tbl)</div><div class='ctx'> 			goto err_dup;</div><div class='ctx'> </div><div class='del'>-		/* Don't export sysctls to unprivileged users */</div><div class='del'>-		if (net-&gt;user_ns != &amp;init_user_ns)</div><div class='del'>-			tbl[0].procname = NULL;</div><div class='add'>+		/* Don't export non-whitelisted sysctls to unprivileged users */</div><div class='add'>+		if (net-&gt;user_ns != &amp;init_user_ns) {</div><div class='add'>+			if (tbl[0].procname != ipv4_route_flush_procname)</div><div class='add'>+				table_size = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the variables to point into the current struct net</div><div class='add'>+		 * except for the first element flush</div><div class='add'>+		 */</div><div class='add'>+		for (i = 1; i &lt; table_size; i++)</div><div class='add'>+			tbl[i].data += (void *)net - (void *)&amp;init_net;</div><div class='ctx'> 	}</div><div class='ctx'> 	tbl[0].extra1 = net;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);</div><div class='add'>+	net-&gt;ipv4.route_hdr = register_net_sysctl_sz(net, "net/ipv4/route",</div><div class='add'>+						     tbl, table_size);</div><div class='ctx'> 	if (!net-&gt;ipv4.route_hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reg:</div><div class='del'>-	if (tbl != ipv4_route_flush_table)</div><div class='add'>+	if (tbl != ipv4_route_netns_table)</div><div class='ctx'> 		kfree(tbl);</div><div class='ctx'> err_dup:</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -3091,11 +3646,11 @@ err_dup:</div><div class='ctx'> </div><div class='ctx'> static __net_exit void sysctl_route_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *tbl;</div><div class='add'>+	const struct ctl_table *tbl;</div><div class='ctx'> </div><div class='ctx'> 	tbl = net-&gt;ipv4.route_hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	unregister_net_sysctl_table(net-&gt;ipv4.route_hdr);</div><div class='del'>-	BUG_ON(tbl == ipv4_route_flush_table);</div><div class='add'>+	BUG_ON(tbl == ipv4_route_netns_table);</div><div class='ctx'> 	kfree(tbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3105,11 +3660,24 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static __net_init int netns_ip_rt_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	/* Set default value for namespaceified sysctls */</div><div class='add'>+	net-&gt;ipv4.ip_rt_min_pmtu = DEFAULT_MIN_PMTU;</div><div class='add'>+	net-&gt;ipv4.ip_rt_mtu_expires = DEFAULT_MTU_EXPIRES;</div><div class='add'>+	net-&gt;ipv4.ip_rt_min_advmss = DEFAULT_MIN_ADVMSS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations __net_initdata ip_rt_ops = {</div><div class='add'>+	.init = netns_ip_rt_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __net_init int rt_genid_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_set(&amp;net-&gt;ipv4.rt_genid, 0);</div><div class='ctx'> 	atomic_set(&amp;net-&gt;fnhe_genid, 0);</div><div class='del'>-	atomic_set(&amp;net-&gt;ipv4.dev_addr_genid, get_random_int());</div><div class='add'>+	atomic_set(&amp;net-&gt;ipv4.dev_addr_genid, get_random_u32());</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3146,20 +3714,32 @@ static __net_initdata struct pernet_operations ipv4_inetpeer_ops = {</div><div class='ctx'> struct ip_rt_acct __percpu *ip_rt_acct __read_mostly;</div><div class='ctx'> #endif /* CONFIG_IP_ROUTE_CLASSID */</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler ip_rt_rtnl_msg_handlers[] __initconst = {</div><div class='add'>+	{.protocol = PF_INET, .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .doit = inet_rtm_getroute, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init ip_rt_init(void)</div><div class='ctx'> {</div><div class='add'>+	void *idents_hash;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	ip_idents = kmalloc_array(IP_IDENTS_SZ, sizeof(*ip_idents),</div><div class='del'>-				  GFP_KERNEL);</div><div class='del'>-	if (!ip_idents)</div><div class='del'>-		panic("IP: failed to allocate ip_idents\n");</div><div class='add'>+	/* For modern hosts, this will use 2 MB of memory */</div><div class='add'>+	idents_hash = alloc_large_system_hash("IP idents",</div><div class='add'>+					      sizeof(*ip_idents) + sizeof(*ip_tstamps),</div><div class='add'>+					      0,</div><div class='add'>+					      16, /* one bucket per 64 KB */</div><div class='add'>+					      HASH_ZERO,</div><div class='add'>+					      NULL,</div><div class='add'>+					      &amp;ip_idents_mask,</div><div class='add'>+					      2048,</div><div class='add'>+					      256*1024);</div><div class='add'>+</div><div class='add'>+	ip_idents = idents_hash;</div><div class='ctx'> </div><div class='del'>-	prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));</div><div class='add'>+	get_random_bytes(ip_idents, (ip_idents_mask + 1) * sizeof(*ip_idents));</div><div class='ctx'> </div><div class='del'>-	ip_tstamps = kcalloc(IP_IDENTS_SZ, sizeof(*ip_tstamps), GFP_KERNEL);</div><div class='del'>-	if (!ip_tstamps)</div><div class='del'>-		panic("IP: failed to allocate ip_tstamps\n");</div><div class='add'>+	ip_tstamps = idents_hash + (ip_idents_mask + 1) * sizeof(*ip_idents);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct uncached_list *ul = &amp;per_cpu(rt_uncached_list, cpu);</div><div class='hunk'>@@ -3173,9 +3753,8 @@ int __init ip_rt_init(void)</div><div class='ctx'> 		panic("IP: failed to allocate ip_rt_acct\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ipv4_dst_ops.kmem_cachep =</div><div class='del'>-		kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);</div><div class='add'>+	ipv4_dst_ops.kmem_cachep = KMEM_CACHE(rtable,</div><div class='add'>+					      SLAB_HWCACHE_ALIGN | SLAB_PANIC);</div><div class='ctx'> </div><div class='ctx'> 	ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -3197,12 +3776,12 @@ int __init ip_rt_init(void)</div><div class='ctx'> 	xfrm_init();</div><div class='ctx'> 	xfrm4_init();</div><div class='ctx'> #endif</div><div class='del'>-	rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL,</div><div class='del'>-		      RTNL_FLAG_DOIT_UNLOCKED);</div><div class='add'>+	rtnl_register_many(ip_rt_rtnl_msg_handlers);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> 	register_pernet_subsys(&amp;sysctl_route_ops);</div><div class='ctx'> #endif</div><div class='add'>+	register_pernet_subsys(&amp;ip_rt_ops);</div><div class='ctx'> 	register_pernet_subsys(&amp;rt_genid_ops);</div><div class='ctx'> 	register_pernet_subsys(&amp;ipv4_inetpeer_ops);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c<br/>index c3387dfd725b..569befcf021b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/syncookies.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/syncookies.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/syncookies.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/syncookies.c</a></div><div class='hunk'>@@ -1,26 +1,21 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Syncookies implementation for the Linux kernel</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997 Andi Kleen</div><div class='ctx'>  *  Based on ideas by D.J.Bernstein and Eric Schenk.</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/siphash.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> </div><div class='del'>-static siphash_key_t syncookie_secret[2] __read_mostly;</div><div class='add'>+static siphash_aligned_key_t syncookie_secret[2];</div><div class='ctx'> </div><div class='ctx'> #define COOKIEBITS 24	/* Upper bits store count */</div><div class='ctx'> #define COOKIEMASK (((__u32)1 &lt;&lt; COOKIEBITS) - 1)</div><div class='hunk'>@@ -47,7 +42,6 @@ static siphash_key_t syncookie_secret[2] __read_mostly;</div><div class='ctx'>  * requested/supported by the syn/synack exchange.</div><div class='ctx'>  */</div><div class='ctx'> #define TSBITS	6</div><div class='del'>-#define TSMASK	(((__u32)1 &lt;&lt; TSBITS) - 1)</div><div class='ctx'> </div><div class='ctx'> static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport,</div><div class='ctx'> 		       u32 count, int c)</div><div class='hunk'>@@ -58,7 +52,6 @@ static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport,</div><div class='ctx'> 			    count, &amp;syncookie_secret[c]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * when syncookies are in effect and tcp timestamps are enabled we encode</div><div class='ctx'>  * tcp options in the lower bits of the timestamp value that will be</div><div class='hunk'>@@ -66,29 +59,26 @@ static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport,</div><div class='ctx'>  * Since subsequent timestamps use the normal tcp_time_stamp value, we</div><div class='ctx'>  * must make sure that the resulting initial timestamp is &lt;= tcp_time_stamp.</div><div class='ctx'>  */</div><div class='del'>-u64 cookie_init_timestamp(struct request_sock *req)</div><div class='add'>+u64 cookie_init_timestamp(struct request_sock *req, u64 now)</div><div class='ctx'> {</div><div class='del'>-	struct inet_request_sock *ireq;</div><div class='del'>-	u32 ts, ts_now = tcp_time_stamp_raw();</div><div class='add'>+	const struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+	u64 ts, ts_now = tcp_ns_to_ts(false, now);</div><div class='ctx'> 	u32 options = 0;</div><div class='ctx'> </div><div class='del'>-	ireq = inet_rsk(req);</div><div class='del'>-</div><div class='ctx'> 	options = ireq-&gt;wscale_ok ? ireq-&gt;snd_wscale : TS_OPT_WSCALE_MASK;</div><div class='ctx'> 	if (ireq-&gt;sack_ok)</div><div class='ctx'> 		options |= TS_OPT_SACK;</div><div class='ctx'> 	if (ireq-&gt;ecn_ok)</div><div class='ctx'> 		options |= TS_OPT_ECN;</div><div class='ctx'> </div><div class='del'>-	ts = ts_now &amp; ~TSMASK;</div><div class='add'>+	ts = (ts_now &gt;&gt; TSBITS) &lt;&lt; TSBITS;</div><div class='ctx'> 	ts |= options;</div><div class='del'>-	if (ts &gt; ts_now) {</div><div class='del'>-		ts &gt;&gt;= TSBITS;</div><div class='del'>-		ts--;</div><div class='del'>-		ts &lt;&lt;= TSBITS;</div><div class='del'>-		ts |= options;</div><div class='del'>-	}</div><div class='del'>-	return (u64)ts * (USEC_PER_SEC / TCP_TS_HZ);</div><div class='add'>+	if (ts &gt; ts_now)</div><div class='add'>+		ts -= (1UL &lt;&lt; TSBITS);</div><div class='add'>+</div><div class='add'>+	if (tcp_rsk(req)-&gt;req_usec_ts)</div><div class='add'>+		return ts * NSEC_PER_USEC;</div><div class='add'>+	return ts * NSEC_PER_MSEC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -191,12 +181,14 @@ __u32 cookie_v4_init_sequence(const struct sk_buff *skb, __u16 *mssp)</div><div class='ctx'>  * Check if a ack sequence number is a valid syncookie.</div><div class='ctx'>  * Return the decoded mss if it is, or 0 if not.</div><div class='ctx'>  */</div><div class='del'>-int __cookie_v4_check(const struct iphdr *iph, const struct tcphdr *th,</div><div class='del'>-		      u32 cookie)</div><div class='add'>+int __cookie_v4_check(const struct iphdr *iph, const struct tcphdr *th)</div><div class='ctx'> {</div><div class='add'>+	__u32 cookie = ntohl(th-&gt;ack_seq) - 1;</div><div class='ctx'> 	__u32 seq = ntohl(th-&gt;seq) - 1;</div><div class='del'>-	__u32 mssind = check_tcp_syn_cookie(cookie, iph-&gt;saddr, iph-&gt;daddr,</div><div class='del'>-					    th-&gt;source, th-&gt;dest, seq);</div><div class='add'>+	__u32 mssind;</div><div class='add'>+</div><div class='add'>+	mssind = check_tcp_syn_cookie(cookie, iph-&gt;saddr, iph-&gt;daddr,</div><div class='add'>+				      th-&gt;source, th-&gt;dest, seq);</div><div class='ctx'> </div><div class='ctx'> 	return mssind &lt; ARRAY_SIZE(msstab) ? msstab[mssind] : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -204,7 +196,7 @@ EXPORT_SYMBOL_GPL(__cookie_v4_check);</div><div class='ctx'> </div><div class='ctx'> struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				 struct request_sock *req,</div><div class='del'>-				 struct dst_entry *dst, u32 tsoff)</div><div class='add'>+				 struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct sock *child;</div><div class='hunk'>@@ -214,15 +206,24 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 						 NULL, &amp;own_req);</div><div class='ctx'> 	if (child) {</div><div class='ctx'> 		refcount_set(&amp;req-&gt;rsk_refcnt, 1);</div><div class='del'>-		tcp_sk(child)-&gt;tsoffset = tsoff;</div><div class='ctx'> 		sock_rps_save_rxhash(child, skb);</div><div class='del'>-		inet_csk_reqsk_queue_add(sk, req, child);</div><div class='del'>-	} else {</div><div class='del'>-		reqsk_free(req);</div><div class='add'>+</div><div class='add'>+		if (rsk_drop_req(req)) {</div><div class='add'>+			reqsk_put(req);</div><div class='add'>+			return child;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (inet_csk_reqsk_queue_add(sk, req, child))</div><div class='add'>+			return child;</div><div class='add'>+</div><div class='add'>+		bh_unlock_sock(child);</div><div class='add'>+		sock_put(child);</div><div class='ctx'> 	}</div><div class='del'>-	return child;</div><div class='add'>+	__reqsk_free(req);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_get_cookie_sock);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_get_cookie_sock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * when syncookies are in effect and tcp timestamps are enabled we stored</div><div class='hunk'>@@ -243,12 +244,12 @@ bool cookie_timestamp_decode(const struct net *net,</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!net-&gt;ipv4.sysctl_tcp_timestamps)</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_timestamps))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	tcp_opt-&gt;sack_ok = (options &amp; TS_OPT_SACK) ? TCP_SACK_SEEN : 0;</div><div class='ctx'> </div><div class='del'>-	if (tcp_opt-&gt;sack_ok &amp;&amp; !net-&gt;ipv4.sysctl_tcp_sack)</div><div class='add'>+	if (tcp_opt-&gt;sack_ok &amp;&amp; !READ_ONCE(net-&gt;ipv4.sysctl_tcp_sack))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if ((options &amp; TS_OPT_WSCALE_MASK) == TS_OPT_WSCALE_MASK)</div><div class='hunk'>@@ -257,114 +258,194 @@ bool cookie_timestamp_decode(const struct net *net,</div><div class='ctx'> 	tcp_opt-&gt;wscale_ok = 1;</div><div class='ctx'> 	tcp_opt-&gt;snd_wscale = options &amp; TS_OPT_WSCALE_MASK;</div><div class='ctx'> </div><div class='del'>-	return net-&gt;ipv4.sysctl_tcp_window_scaling != 0;</div><div class='add'>+	return READ_ONCE(net-&gt;ipv4.sysctl_tcp_window_scaling) != 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cookie_timestamp_decode);</div><div class='add'>+EXPORT_IPV6_MOD(cookie_timestamp_decode);</div><div class='ctx'> </div><div class='del'>-bool cookie_ecn_ok(const struct tcp_options_received *tcp_opt,</div><div class='del'>-		   const struct net *net, const struct dst_entry *dst)</div><div class='add'>+static int cookie_tcp_reqsk_init(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				 struct request_sock *req)</div><div class='ctx'> {</div><div class='del'>-	bool ecn_ok = tcp_opt-&gt;rcv_tsecr &amp; TS_OPT_ECN;</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+	struct tcp_request_sock *treq = tcp_rsk(req);</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	if (!ecn_ok)</div><div class='del'>-		return false;</div><div class='add'>+	req-&gt;num_retrans = 0;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_tcp_ecn)</div><div class='del'>-		return true;</div><div class='add'>+	ireq-&gt;ir_num = ntohs(th-&gt;dest);</div><div class='add'>+	ireq-&gt;ir_rmt_port = th-&gt;source;</div><div class='add'>+	ireq-&gt;ir_iif = inet_request_bound_dev_if(sk, skb);</div><div class='add'>+	ireq-&gt;ir_mark = inet_request_mark(sk, skb);</div><div class='ctx'> </div><div class='del'>-	return dst_feature(dst, RTAX_FEATURE_ECN);</div><div class='add'>+	if (IS_ENABLED(CONFIG_SMC))</div><div class='add'>+		ireq-&gt;smc_ok = 0;</div><div class='add'>+</div><div class='add'>+	treq-&gt;snt_synack = 0;</div><div class='add'>+	treq-&gt;snt_tsval_first = 0;</div><div class='add'>+	treq-&gt;tfo_listener = false;</div><div class='add'>+	treq-&gt;txhash = net_tx_rndhash();</div><div class='add'>+	treq-&gt;rcv_isn = ntohl(th-&gt;seq) - 1;</div><div class='add'>+	treq-&gt;snt_isn = ntohl(th-&gt;ack_seq) - 1;</div><div class='add'>+	treq-&gt;syn_tos = TCP_SKB_CB(skb)-&gt;ip_dsfield;</div><div class='add'>+	treq-&gt;req_usec_ts = false;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MPTCP)</div><div class='add'>+	treq-&gt;is_mptcp = sk_is_mptcp(sk);</div><div class='add'>+	if (treq-&gt;is_mptcp)</div><div class='add'>+		return mptcp_subflow_init_cookie_req(req, sk, skb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cookie_ecn_ok);</div><div class='ctx'> </div><div class='del'>-/* On input, sk is a listener.</div><div class='del'>- * Output is listener if incoming packet would not create a child</div><div class='del'>- *           NULL if memory could not be allocated.</div><div class='del'>- */</div><div class='del'>-struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF)</div><div class='add'>+struct request_sock *cookie_bpf_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct request_sock *req = inet_reqsk(skb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	skb-&gt;sk = NULL;</div><div class='add'>+	skb-&gt;destructor = NULL;</div><div class='add'>+</div><div class='add'>+	if (cookie_tcp_reqsk_init(sk, skb, req)) {</div><div class='add'>+		reqsk_free(req);</div><div class='add'>+		req = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(cookie_bpf_check);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops,</div><div class='add'>+					    struct sock *sk, struct sk_buff *skb,</div><div class='add'>+					    struct tcp_options_received *tcp_opt,</div><div class='add'>+					    int mss, u32 tsoff)</div><div class='ctx'> {</div><div class='del'>-	struct ip_options *opt = &amp;TCP_SKB_CB(skb)-&gt;header.h4.opt;</div><div class='del'>-	struct tcp_options_received tcp_opt;</div><div class='ctx'> 	struct inet_request_sock *ireq;</div><div class='ctx'> 	struct tcp_request_sock *treq;</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	__u32 cookie = ntohl(th-&gt;ack_seq) - 1;</div><div class='del'>-	struct sock *ret = sk;</div><div class='ctx'> 	struct request_sock *req;</div><div class='del'>-	int mss;</div><div class='del'>-	struct rtable *rt;</div><div class='del'>-	__u8 rcv_wscale;</div><div class='del'>-	struct flowi4 fl4;</div><div class='del'>-	u32 tsoff = 0;</div><div class='ctx'> </div><div class='del'>-	if (!sock_net(sk)-&gt;ipv4.sysctl_tcp_syncookies || !th-&gt;ack || th-&gt;rst)</div><div class='del'>-		goto out;</div><div class='add'>+	if (sk_is_mptcp(sk))</div><div class='add'>+		req = mptcp_subflow_reqsk_alloc(ops, sk, false);</div><div class='add'>+	else</div><div class='add'>+		req = inet_reqsk_alloc(ops, sk, false);</div><div class='add'>+</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (cookie_tcp_reqsk_init(sk, skb, req)) {</div><div class='add'>+		reqsk_free(req);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ireq = inet_rsk(req);</div><div class='add'>+	treq = tcp_rsk(req);</div><div class='add'>+</div><div class='add'>+	req-&gt;mss = mss;</div><div class='add'>+	req-&gt;ts_recent = tcp_opt-&gt;saw_tstamp ? tcp_opt-&gt;rcv_tsval : 0;</div><div class='add'>+</div><div class='add'>+	ireq-&gt;snd_wscale = tcp_opt-&gt;snd_wscale;</div><div class='add'>+	ireq-&gt;tstamp_ok = tcp_opt-&gt;saw_tstamp;</div><div class='add'>+	ireq-&gt;sack_ok = tcp_opt-&gt;sack_ok;</div><div class='add'>+	ireq-&gt;wscale_ok = tcp_opt-&gt;wscale_ok;</div><div class='add'>+	ireq-&gt;ecn_ok = !!(tcp_opt-&gt;rcv_tsecr &amp; TS_OPT_ECN);</div><div class='add'>+</div><div class='add'>+	treq-&gt;ts_off = tsoff;</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(cookie_tcp_reqsk_alloc);</div><div class='add'>+</div><div class='add'>+static struct request_sock *cookie_tcp_check(struct net *net, struct sock *sk,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tcp_options_received tcp_opt;</div><div class='add'>+	u32 tsoff = 0;</div><div class='add'>+	int mss;</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_synq_no_recent_overflow(sk))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mss = __cookie_v4_check(ip_hdr(skb), th, cookie);</div><div class='del'>-	if (mss == 0) {</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_SYNCOOKIESFAILED);</div><div class='add'>+	mss = __cookie_v4_check(ip_hdr(skb), tcp_hdr(skb));</div><div class='add'>+	if (!mss) {</div><div class='add'>+		__NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESFAILED);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);</div><div class='add'>+	__NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESRECV);</div><div class='ctx'> </div><div class='ctx'> 	/* check for timestamp cookie support */</div><div class='ctx'> 	memset(&amp;tcp_opt, 0, sizeof(tcp_opt));</div><div class='del'>-	tcp_parse_options(sock_net(sk), skb, &amp;tcp_opt, 0, NULL);</div><div class='add'>+	tcp_parse_options(net, skb, &amp;tcp_opt, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_opt.saw_tstamp &amp;&amp; tcp_opt.rcv_tsecr) {</div><div class='del'>-		tsoff = secure_tcp_ts_off(sock_net(sk),</div><div class='add'>+		tsoff = secure_tcp_ts_off(net,</div><div class='ctx'> 					  ip_hdr(skb)-&gt;daddr,</div><div class='ctx'> 					  ip_hdr(skb)-&gt;saddr);</div><div class='ctx'> 		tcp_opt.rcv_tsecr -= tsoff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cookie_timestamp_decode(sock_net(sk), &amp;tcp_opt))</div><div class='add'>+	if (!cookie_timestamp_decode(net, &amp;tcp_opt))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = NULL;</div><div class='del'>-	req = inet_reqsk_alloc(&amp;tcp_request_sock_ops, sk, false); /* for safety */</div><div class='del'>-	if (!req)</div><div class='add'>+	return cookie_tcp_reqsk_alloc(&amp;tcp_request_sock_ops, sk, skb,</div><div class='add'>+				      &amp;tcp_opt, mss, tsoff);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On input, sk is a listener.</div><div class='add'>+ * Output is listener if incoming packet would not create a child</div><div class='add'>+ *           NULL if memory could not be allocated.</div><div class='add'>+ */</div><div class='add'>+struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ip_options *opt = &amp;TCP_SKB_CB(skb)-&gt;header.h4.opt;</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct inet_request_sock *ireq;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct tcp_request_sock *treq;</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	struct sock *ret = sk;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	__u8 rcv_wscale;</div><div class='add'>+	int full_space;</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_syncookies) ||</div><div class='add'>+	    !th-&gt;ack || th-&gt;rst)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (cookie_bpf_ok(skb)) {</div><div class='add'>+		req = cookie_bpf_check(sk, skb);</div><div class='add'>+	} else {</div><div class='add'>+		req = cookie_tcp_check(net, sk, skb);</div><div class='add'>+		if (IS_ERR(req))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!req) {</div><div class='add'>+		SKB_DR_SET(reason, NO_SOCKET);</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ireq = inet_rsk(req);</div><div class='ctx'> 	treq = tcp_rsk(req);</div><div class='del'>-	treq-&gt;rcv_isn		= ntohl(th-&gt;seq) - 1;</div><div class='del'>-	treq-&gt;snt_isn		= cookie;</div><div class='del'>-	treq-&gt;ts_off		= 0;</div><div class='del'>-	treq-&gt;txhash		= net_tx_rndhash();</div><div class='del'>-	req-&gt;mss		= mss;</div><div class='del'>-	ireq-&gt;ir_num		= ntohs(th-&gt;dest);</div><div class='del'>-	ireq-&gt;ir_rmt_port	= th-&gt;source;</div><div class='add'>+</div><div class='ctx'> 	sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)-&gt;daddr);</div><div class='ctx'> 	sk_daddr_set(req_to_sk(req), ip_hdr(skb)-&gt;saddr);</div><div class='del'>-	ireq-&gt;ir_mark		= inet_request_mark(sk, skb);</div><div class='del'>-	ireq-&gt;snd_wscale	= tcp_opt.snd_wscale;</div><div class='del'>-	ireq-&gt;sack_ok		= tcp_opt.sack_ok;</div><div class='del'>-	ireq-&gt;wscale_ok		= tcp_opt.wscale_ok;</div><div class='del'>-	ireq-&gt;tstamp_ok		= tcp_opt.saw_tstamp;</div><div class='del'>-	req-&gt;ts_recent		= tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;</div><div class='del'>-	treq-&gt;snt_synack	= 0;</div><div class='del'>-	treq-&gt;tfo_listener	= false;</div><div class='del'>-	if (IS_ENABLED(CONFIG_SMC))</div><div class='del'>-		ireq-&gt;smc_ok = 0;</div><div class='del'>-</div><div class='del'>-	ireq-&gt;ir_iif = inet_request_bound_dev_if(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* We throwed the options of the initial SYN away, so we hope</div><div class='ctx'> 	 * the ACK carries the same options again (see RFC1122 4.2.3.8)</div><div class='ctx'> 	 */</div><div class='del'>-	RCU_INIT_POINTER(ireq-&gt;ireq_opt, tcp_v4_save_options(sock_net(sk), skb));</div><div class='add'>+	RCU_INIT_POINTER(ireq-&gt;ireq_opt, tcp_v4_save_options(net, skb));</div><div class='ctx'> </div><div class='ctx'> 	if (security_inet_conn_request(sk, skb, req)) {</div><div class='del'>-		reqsk_free(req);</div><div class='del'>-		goto out;</div><div class='add'>+		SKB_DR_SET(reason, SECURITY_HOOK);</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;num_retrans = 0;</div><div class='add'>+	tcp_ao_syncookie(sk, skb, req, AF_INET);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to lookup the route here to get at the correct</div><div class='hunk'>@@ -373,33 +454,54 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 * no easy way to do this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	flowi4_init_output(&amp;fl4, ireq-&gt;ir_iif, ireq-&gt;ir_mark,</div><div class='del'>-			   RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, IPPROTO_TCP,</div><div class='del'>-			   inet_sk_flowi_flags(sk),</div><div class='add'>+			   ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),</div><div class='add'>+			   IPPROTO_TCP, inet_sk_flowi_flags(sk),</div><div class='ctx'> 			   opt-&gt;srr ? opt-&gt;faddr : ireq-&gt;ir_rmt_addr,</div><div class='del'>-			   ireq-&gt;ir_loc_addr, th-&gt;source, th-&gt;dest, sk-&gt;sk_uid);</div><div class='del'>-	security_req_classify_flow(req, flowi4_to_flowi(&amp;fl4));</div><div class='del'>-	rt = ip_route_output_key(sock_net(sk), &amp;fl4);</div><div class='add'>+			   ireq-&gt;ir_loc_addr, th-&gt;source, th-&gt;dest,</div><div class='add'>+			   sk_uid(sk));</div><div class='add'>+	security_req_classify_flow(req, flowi4_to_flowi_common(&amp;fl4));</div><div class='add'>+	rt = ip_route_output_key(net, &amp;fl4);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='del'>-		reqsk_free(req);</div><div class='del'>-		goto out;</div><div class='add'>+		SKB_DR_SET(reason, IP_OUTNOROUTES);</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try to redo what tcp_v4_send_synack did. */</div><div class='del'>-	req-&gt;rsk_window_clamp = tp-&gt;window_clamp ? :dst_metric(&amp;rt-&gt;dst, RTAX_WINDOW);</div><div class='del'>-</div><div class='del'>-	tcp_select_initial_window(sk, tcp_full_space(sk), req-&gt;mss,</div><div class='add'>+	req-&gt;rsk_window_clamp = READ_ONCE(tp-&gt;window_clamp) ? :</div><div class='add'>+				dst_metric(&amp;rt-&gt;dst, RTAX_WINDOW);</div><div class='add'>+	/* limit the window selection if the user enforce a smaller rx buffer */</div><div class='add'>+	full_space = tcp_full_space(sk);</div><div class='add'>+	if (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK &amp;&amp;</div><div class='add'>+	    (req-&gt;rsk_window_clamp &gt; full_space || req-&gt;rsk_window_clamp == 0))</div><div class='add'>+		req-&gt;rsk_window_clamp = full_space;</div><div class='add'>+</div><div class='add'>+	tcp_select_initial_window(sk, full_space, req-&gt;mss,</div><div class='ctx'> 				  &amp;req-&gt;rsk_rcv_wnd, &amp;req-&gt;rsk_window_clamp,</div><div class='ctx'> 				  ireq-&gt;wscale_ok, &amp;rcv_wscale,</div><div class='ctx'> 				  dst_metric(&amp;rt-&gt;dst, RTAX_INITRWND));</div><div class='ctx'> </div><div class='del'>-	ireq-&gt;rcv_wscale  = rcv_wscale;</div><div class='del'>-	ireq-&gt;ecn_ok = cookie_ecn_ok(&amp;tcp_opt, sock_net(sk), &amp;rt-&gt;dst);</div><div class='add'>+	/* req-&gt;syncookie is set true only if ACK is validated</div><div class='add'>+	 * by BPF kfunc, then, rcv_wscale is already configured.</div><div class='add'>+	 */</div><div class='add'>+	if (!req-&gt;syncookie)</div><div class='add'>+		ireq-&gt;rcv_wscale = rcv_wscale;</div><div class='add'>+	ireq-&gt;ecn_ok &amp;= cookie_ecn_ok(net, &amp;rt-&gt;dst);</div><div class='add'>+	treq-&gt;accecn_ok = ireq-&gt;ecn_ok &amp;&amp; cookie_accecn_ok(th);</div><div class='ctx'> </div><div class='del'>-	ret = tcp_get_cookie_sock(sk, skb, req, &amp;rt-&gt;dst, tsoff);</div><div class='add'>+	ret = tcp_get_cookie_sock(sk, skb, req, &amp;rt-&gt;dst);</div><div class='ctx'> 	/* ip_queue_xmit() depends on our flow being setup</div><div class='ctx'> 	 * Normal sockets get it right from inet_csk_route_child_sock()</div><div class='ctx'> 	 */</div><div class='del'>-	if (ret)</div><div class='del'>-		inet_sk(ret)-&gt;cork.fl.u.ip4 = fl4;</div><div class='del'>-out:	return ret;</div><div class='add'>+	if (!ret) {</div><div class='add'>+		SKB_DR_SET(reason, NO_SOCKET);</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='add'>+	inet_sk(ret)-&gt;cork.fl.u.ip4 = fl4;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+out_free:</div><div class='add'>+	reqsk_free(req);</div><div class='add'>+out_drop:</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c<br/>index 891ed2f91467..a1a50a5c80dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/sysctl_net_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/sysctl_net_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/sysctl_net_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/sysctl_net_ipv4.c</a></div><div class='hunk'>@@ -6,75 +6,71 @@</div><div class='ctx'>  * Added /proc/sys/net/ipv4 directory entry (empty =) ). [MS]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/igmp.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/seqlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/nsproxy.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='add'>+#include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/cipso_ipv4.h&gt;</div><div class='del'>-#include &lt;net/inet_frag.h&gt;</div><div class='ctx'> #include &lt;net/ping.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='ctx'> </div><div class='del'>-static int zero;</div><div class='del'>-static int one = 1;</div><div class='del'>-static int two = 2;</div><div class='del'>-static int four = 4;</div><div class='del'>-static int thousand = 1000;</div><div class='del'>-static int gso_max_segs = GSO_MAX_SEGS;</div><div class='ctx'> static int tcp_retr1_max = 255;</div><div class='ctx'> static int ip_local_port_range_min[] = { 1, 1 };</div><div class='ctx'> static int ip_local_port_range_max[] = { 65535, 65535 };</div><div class='ctx'> static int tcp_adv_win_scale_min = -31;</div><div class='ctx'> static int tcp_adv_win_scale_max = 31;</div><div class='add'>+static int tcp_app_win_max = 31;</div><div class='add'>+static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS;</div><div class='add'>+static int tcp_min_snd_mss_max = 65535;</div><div class='add'>+static int tcp_rto_max_max = TCP_RTO_MAX_SEC * MSEC_PER_SEC;</div><div class='ctx'> static int ip_privileged_port_min;</div><div class='ctx'> static int ip_privileged_port_max = 65535;</div><div class='ctx'> static int ip_ttl_min = 1;</div><div class='ctx'> static int ip_ttl_max = 255;</div><div class='ctx'> static int tcp_syn_retries_min = 1;</div><div class='ctx'> static int tcp_syn_retries_max = MAX_TCP_SYNCNT;</div><div class='del'>-static int ip_ping_group_range_min[] = { 0, 0 };</div><div class='del'>-static int ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };</div><div class='del'>-static int comp_sack_nr_max = 255;</div><div class='add'>+static int tcp_syn_linear_timeouts_max = MAX_TCP_SYNCNT;</div><div class='add'>+static unsigned long ip_ping_group_range_min[] = { 0, 0 };</div><div class='add'>+static unsigned long ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };</div><div class='ctx'> static u32 u32_max_div_HZ = UINT_MAX / HZ;</div><div class='add'>+static int one_day_secs = 24 * 3600;</div><div class='add'>+static u32 fib_multipath_hash_fields_all_mask __maybe_unused =</div><div class='add'>+	FIB_MULTIPATH_HASH_FIELD_ALL_MASK;</div><div class='add'>+static unsigned int tcp_child_ehash_entries_max = 16 * 1024 * 1024;</div><div class='add'>+static unsigned int udp_child_hash_entries_max = UDP_HTABLE_SIZE_MAX;</div><div class='add'>+static int tcp_plb_max_rounds = 31;</div><div class='add'>+static int tcp_plb_max_cong_thresh = 256;</div><div class='add'>+static unsigned int tcp_tw_reuse_delay_max = TCP_PAWS_MSL * MSEC_PER_SEC;</div><div class='add'>+static int tcp_ecn_mode_max = 2;</div><div class='add'>+static u32 icmp_errors_extension_mask_all =</div><div class='add'>+	GENMASK_U8(ICMP_ERR_EXT_COUNT - 1, 0);</div><div class='ctx'> </div><div class='ctx'> /* obsolete */</div><div class='ctx'> static int sysctl_tcp_low_latency __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* Update system visible IP port range */</div><div class='del'>-static void set_local_port_range(struct net *net, int range[2])</div><div class='add'>+static void set_local_port_range(struct net *net, unsigned int low, unsigned int high)</div><div class='ctx'> {</div><div class='del'>-	bool same_parity = !((range[0] ^ range[1]) &amp; 1);</div><div class='add'>+	bool same_parity = !((low ^ high) &amp; 1);</div><div class='ctx'> </div><div class='del'>-	write_seqlock_bh(&amp;net-&gt;ipv4.ip_local_ports.lock);</div><div class='ctx'> 	if (same_parity &amp;&amp; !net-&gt;ipv4.ip_local_ports.warned) {</div><div class='ctx'> 		net-&gt;ipv4.ip_local_ports.warned = true;</div><div class='ctx'> 		pr_err_ratelimited("ip_local_port_range: prefer different parity for start/end values.\n");</div><div class='ctx'> 	}</div><div class='del'>-	net-&gt;ipv4.ip_local_ports.range[0] = range[0];</div><div class='del'>-	net-&gt;ipv4.ip_local_ports.range[1] = range[1];</div><div class='del'>-	write_sequnlock_bh(&amp;net-&gt;ipv4.ip_local_ports.lock);</div><div class='add'>+	WRITE_ONCE(net-&gt;ipv4.ip_local_ports.range, high &lt;&lt; 16 | low);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate changes from /proc interface. */</div><div class='del'>-static int ipv4_local_port_range(struct ctl_table *table, int write,</div><div class='del'>-				 void __user *buffer,</div><div class='del'>-				 size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_local_port_range(const struct ctl_table *table, int write,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct net *net =</div><div class='del'>-		container_of(table-&gt;data, struct net, ipv4.ip_local_ports.range);</div><div class='add'>+	struct net *net = table-&gt;data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int range[2];</div><div class='ctx'> 	struct ctl_table tmp = {</div><div class='hunk'>@@ -95,18 +91,18 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,</div><div class='ctx'> 		 * port limit.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((range[1] &lt; range[0]) ||</div><div class='del'>-		    (range[0] &lt; net-&gt;ipv4.sysctl_ip_prot_sock))</div><div class='add'>+		    (range[0] &lt; READ_ONCE(net-&gt;ipv4.sysctl_ip_prot_sock)))</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		else</div><div class='del'>-			set_local_port_range(net, range);</div><div class='add'>+			set_local_port_range(net, range[0], range[1]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate changes from /proc interface. */</div><div class='del'>-static int ipv4_privileged_ports(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_privileged_ports(const struct ctl_table *table, int write,</div><div class='add'>+				void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = container_of(table-&gt;data, struct net,</div><div class='ctx'> 	    ipv4.sysctl_ip_prot_sock);</div><div class='hunk'>@@ -121,7 +117,7 @@ static int ipv4_privileged_ports(struct ctl_table *table, int write,</div><div class='ctx'> 		.extra2 = &amp;ip_privileged_port_max,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pports = net-&gt;ipv4.sysctl_ip_prot_sock;</div><div class='add'>+	pports = READ_ONCE(net-&gt;ipv4.sysctl_ip_prot_sock);</div><div class='ctx'> </div><div class='ctx'> 	ret = proc_dointvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='hunk'>@@ -133,13 +129,14 @@ static int ipv4_privileged_ports(struct ctl_table *table, int write,</div><div class='ctx'> 		if (range[0] &lt; pports)</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		else</div><div class='del'>-			net-&gt;ipv4.sysctl_ip_prot_sock = pports;</div><div class='add'>+			WRITE_ONCE(net-&gt;ipv4.sysctl_ip_prot_sock, pports);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inet_get_ping_group_range_table(struct ctl_table *table, kgid_t *low, kgid_t *high)</div><div class='add'>+static void inet_get_ping_group_range_table(const struct ctl_table *table,</div><div class='add'>+					    kgid_t *low, kgid_t *high)</div><div class='ctx'> {</div><div class='ctx'> 	kgid_t *data = table-&gt;data;</div><div class='ctx'> 	struct net *net =</div><div class='hunk'>@@ -154,7 +151,8 @@ static void inet_get_ping_group_range_table(struct ctl_table *table, kgid_t *low</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Update system visible IP port range */</div><div class='del'>-static void set_ping_group_range(struct ctl_table *table, kgid_t low, kgid_t high)</div><div class='add'>+static void set_ping_group_range(const struct ctl_table *table,</div><div class='add'>+				 kgid_t low, kgid_t high)</div><div class='ctx'> {</div><div class='ctx'> 	kgid_t *data = table-&gt;data;</div><div class='ctx'> 	struct net *net =</div><div class='hunk'>@@ -166,13 +164,12 @@ static void set_ping_group_range(struct ctl_table *table, kgid_t low, kgid_t hig</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate changes from /proc interface. */</div><div class='del'>-static int ipv4_ping_group_range(struct ctl_table *table, int write,</div><div class='del'>-				 void __user *buffer,</div><div class='del'>-				 size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_ping_group_range(const struct ctl_table *table, int write,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_namespace *user_ns = current_user_ns();</div><div class='ctx'> 	int ret;</div><div class='del'>-	gid_t urange[2];</div><div class='add'>+	unsigned long urange[2];</div><div class='ctx'> 	kgid_t low, high;</div><div class='ctx'> 	struct ctl_table tmp = {</div><div class='ctx'> 		.data = &amp;urange,</div><div class='hunk'>@@ -185,7 +182,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,</div><div class='ctx'> 	inet_get_ping_group_range_table(table, &amp;low, &amp;high);</div><div class='ctx'> 	urange[0] = from_kgid_munged(user_ns, low);</div><div class='ctx'> 	urange[1] = from_kgid_munged(user_ns, high);</div><div class='del'>-	ret = proc_dointvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='add'>+	ret = proc_doulongvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='ctx'> 	if (write &amp;&amp; ret == 0) {</div><div class='ctx'> 		low = make_kgid(user_ns, urange[0]);</div><div class='hunk'>@@ -202,16 +199,15 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipv4_fwd_update_priority(struct ctl_table *table, int write,</div><div class='del'>-				    void __user *buffer,</div><div class='del'>-				    size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv4_fwd_update_priority(const struct ctl_table *table, int write,</div><div class='add'>+				    void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	net = container_of(table-&gt;data, struct net,</div><div class='ctx'> 			   ipv4.sysctl_ip_fwd_update_priority);</div><div class='del'>-	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	ret = proc_dou8vec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> 	if (write &amp;&amp; ret == 0)</div><div class='ctx'> 		call_netevent_notifiers(NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE,</div><div class='ctx'> 					net);</div><div class='hunk'>@@ -219,8 +215,8 @@ static int ipv4_fwd_update_priority(struct ctl_table *table, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,</div><div class='del'>-				       void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_tcp_congestion_control(const struct ctl_table *ctl, int write,</div><div class='add'>+				       void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = container_of(ctl-&gt;data, struct net,</div><div class='ctx'> 				       ipv4.tcp_congestion_control);</div><div class='hunk'>@@ -239,10 +235,9 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tcp_available_congestion_control(struct ctl_table *ctl,</div><div class='del'>-						 int write,</div><div class='del'>-						 void __user *buffer, size_t *lenp,</div><div class='del'>-						 loff_t *ppos)</div><div class='add'>+static int proc_tcp_available_congestion_control(const struct ctl_table *ctl,</div><div class='add'>+						 int write, void *buffer,</div><div class='add'>+						 size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -256,10 +251,9 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_allowed_congestion_control(struct ctl_table *ctl,</div><div class='del'>-					   int write,</div><div class='del'>-					   void __user *buffer, size_t *lenp,</div><div class='del'>-					   loff_t *ppos)</div><div class='add'>+static int proc_allowed_congestion_control(const struct ctl_table *ctl,</div><div class='add'>+					   int write, void *buffer,</div><div class='add'>+					   size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -276,163 +270,260 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tcp_fastopen_key(struct ctl_table *table, int write,</div><div class='del'>-				 void __user *buffer, size_t *lenp,</div><div class='del'>-				 loff_t *ppos)</div><div class='add'>+static int sscanf_key(char *buf, __le32 *key)</div><div class='add'>+{</div><div class='add'>+	u32 user_key[4];</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%x-%x-%x-%x", user_key, user_key + 1,</div><div class='add'>+		   user_key + 2, user_key + 3) != 4) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(user_key); i++)</div><div class='add'>+			key[i] = cpu_to_le32(user_key[i]);</div><div class='add'>+	}</div><div class='add'>+	pr_debug("proc TFO key set 0x%x-%x-%x-%x &lt;- 0x%s: %u\n",</div><div class='add'>+		 user_key[0], user_key[1], user_key[2], user_key[3], buf, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_tcp_fastopen_key(const struct ctl_table *table, int write,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = container_of(table-&gt;data, struct net,</div><div class='ctx'> 	    ipv4.sysctl_tcp_fastopen);</div><div class='del'>-	struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };</div><div class='del'>-	struct tcp_fastopen_context *ctxt;</div><div class='del'>-	u32  user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */</div><div class='del'>-	__le32 key[4];</div><div class='del'>-	int ret, i;</div><div class='add'>+	/* maxlen to print the list of keys in hex (*2), with dashes</div><div class='add'>+	 * separating doublewords and a comma in between keys.</div><div class='add'>+	 */</div><div class='add'>+	struct ctl_table tbl = { .maxlen = ((TCP_FASTOPEN_KEY_LENGTH *</div><div class='add'>+					    2 * TCP_FASTOPEN_KEY_MAX) +</div><div class='add'>+					    (TCP_FASTOPEN_KEY_MAX * 5)) };</div><div class='add'>+	u32 user_key[TCP_FASTOPEN_KEY_BUF_LENGTH / sizeof(u32)];</div><div class='add'>+	__le32 key[TCP_FASTOPEN_KEY_BUF_LENGTH / sizeof(__le32)];</div><div class='add'>+	char *backup_data;</div><div class='add'>+	int ret, i = 0, off = 0, n_keys;</div><div class='ctx'> </div><div class='ctx'> 	tbl.data = kmalloc(tbl.maxlen, GFP_KERNEL);</div><div class='ctx'> 	if (!tbl.data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ctxt = rcu_dereference(net-&gt;ipv4.tcp_fastopen_ctx);</div><div class='del'>-	if (ctxt)</div><div class='del'>-		memcpy(key, ctxt-&gt;key, TCP_FASTOPEN_KEY_LENGTH);</div><div class='del'>-	else</div><div class='del'>-		memset(key, 0, sizeof(key));</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	n_keys = tcp_fastopen_get_cipher(net, NULL, (u64 *)key);</div><div class='add'>+	if (!n_keys) {</div><div class='add'>+		memset(&amp;key[0], 0, TCP_FASTOPEN_KEY_LENGTH);</div><div class='add'>+		n_keys = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(key); i++)</div><div class='add'>+	for (i = 0; i &lt; n_keys * 4; i++)</div><div class='ctx'> 		user_key[i] = le32_to_cpu(key[i]);</div><div class='ctx'> </div><div class='del'>-	snprintf(tbl.data, tbl.maxlen, "%08x-%08x-%08x-%08x",</div><div class='del'>-		user_key[0], user_key[1], user_key[2], user_key[3]);</div><div class='add'>+	for (i = 0; i &lt; n_keys; i++) {</div><div class='add'>+		off += snprintf(tbl.data + off, tbl.maxlen - off,</div><div class='add'>+				"%08x-%08x-%08x-%08x",</div><div class='add'>+				user_key[i * 4],</div><div class='add'>+				user_key[i * 4 + 1],</div><div class='add'>+				user_key[i * 4 + 2],</div><div class='add'>+				user_key[i * 4 + 3]);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(off &gt;= tbl.maxlen - 1))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (i + 1 &lt; n_keys)</div><div class='add'>+			off += snprintf(tbl.data + off, tbl.maxlen - off, ",");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = proc_dostring(&amp;tbl, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='ctx'> 	if (write &amp;&amp; ret == 0) {</div><div class='del'>-		if (sscanf(tbl.data, "%x-%x-%x-%x", user_key, user_key + 1,</div><div class='del'>-			   user_key + 2, user_key + 3) != 4) {</div><div class='add'>+		backup_data = strchr(tbl.data, ',');</div><div class='add'>+		if (backup_data) {</div><div class='add'>+			*backup_data = '\0';</div><div class='add'>+			backup_data++;</div><div class='add'>+		}</div><div class='add'>+		if (sscanf_key(tbl.data, key)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto bad_key;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(user_key); i++)</div><div class='del'>-			key[i] = cpu_to_le32(user_key[i]);</div><div class='del'>-</div><div class='add'>+		if (backup_data) {</div><div class='add'>+			if (sscanf_key(backup_data, key + 4)) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto bad_key;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		tcp_fastopen_reset_cipher(net, NULL, key,</div><div class='del'>-					  TCP_FASTOPEN_KEY_LENGTH);</div><div class='add'>+					  backup_data ? key + 4 : NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> bad_key:</div><div class='del'>-	pr_debug("proc FO key set 0x%x-%x-%x-%x &lt;- 0x%s: %u\n",</div><div class='del'>-		user_key[0], user_key[1], user_key[2], user_key[3],</div><div class='del'>-	       (char *)tbl.data, ret);</div><div class='ctx'> 	kfree(tbl.data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void proc_configure_early_demux(int enabled, int protocol)</div><div class='add'>+static int proc_tfo_blackhole_detect_timeout(const struct ctl_table *table,</div><div class='add'>+					     int write, void *buffer,</div><div class='add'>+					     size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct net_protocol *ipprot;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	struct inet6_protocol *ip6prot;</div><div class='del'>-#endif</div><div class='add'>+	struct net *net = container_of(table-&gt;data, struct net,</div><div class='add'>+	    ipv4.sysctl_tcp_fastopen_blackhole_timeout);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	if (write &amp;&amp; ret == 0)</div><div class='add'>+		atomic_set(&amp;net-&gt;ipv4.tfo_active_disable_times, 0);</div><div class='ctx'> </div><div class='del'>-	ipprot = rcu_dereference(inet_protos[protocol]);</div><div class='del'>-	if (ipprot)</div><div class='del'>-		ipprot-&gt;early_demux = enabled ? ipprot-&gt;early_demux_handler :</div><div class='del'>-						NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	ip6prot = rcu_dereference(inet6_protos[protocol]);</div><div class='del'>-	if (ip6prot)</div><div class='del'>-		ip6prot-&gt;early_demux = enabled ? ip6prot-&gt;early_demux_handler :</div><div class='del'>-						 NULL;</div><div class='del'>-#endif</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+static int proc_tcp_available_ulp(const struct ctl_table *ctl,</div><div class='add'>+				  int write, void *buffer, size_t *lenp,</div><div class='add'>+				  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ctl_table tbl = { .maxlen = TCP_ULP_BUF_MAX, };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tbl.data = kmalloc(tbl.maxlen, GFP_USER);</div><div class='add'>+	if (!tbl.data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	tcp_get_available_ulp(tbl.data, TCP_ULP_BUF_MAX);</div><div class='add'>+	ret = proc_dostring(&amp;tbl, write, buffer, lenp, ppos);</div><div class='add'>+	kfree(tbl.data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tcp_early_demux(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_tcp_ehash_entries(const struct ctl_table *table, int write,</div><div class='add'>+				  void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct net *net = container_of(table-&gt;data, struct net,</div><div class='add'>+				       ipv4.sysctl_tcp_child_ehash_entries);</div><div class='add'>+	struct inet_hashinfo *hinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	int tcp_ehash_entries;</div><div class='add'>+	struct ctl_table tbl;</div><div class='ctx'> </div><div class='del'>-	ret = proc_dointvec(table, write, buffer, lenp, ppos);</div><div class='add'>+	tcp_ehash_entries = hinfo-&gt;ehash_mask + 1;</div><div class='ctx'> </div><div class='del'>-	if (write &amp;&amp; !ret) {</div><div class='del'>-		int enabled = init_net.ipv4.sysctl_tcp_early_demux;</div><div class='add'>+	/* A negative number indicates that the child netns</div><div class='add'>+	 * shares the global ehash.</div><div class='add'>+	 */</div><div class='add'>+	if (!net_eq(net, &amp;init_net) &amp;&amp; !hinfo-&gt;pernet)</div><div class='add'>+		tcp_ehash_entries *= -1;</div><div class='ctx'> </div><div class='del'>-		proc_configure_early_demux(enabled, IPPROTO_TCP);</div><div class='del'>-	}</div><div class='add'>+	memset(&amp;tbl, 0, sizeof(tbl));</div><div class='add'>+	tbl.data = &amp;tcp_ehash_entries;</div><div class='add'>+	tbl.maxlen = sizeof(int);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return proc_dointvec(&amp;tbl, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_udp_early_demux(struct ctl_table *table, int write,</div><div class='del'>-				void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int proc_udp_hash_entries(const struct ctl_table *table, int write,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct net *net = container_of(table-&gt;data, struct net,</div><div class='add'>+				       ipv4.sysctl_udp_child_hash_entries);</div><div class='add'>+	int udp_hash_entries;</div><div class='add'>+	struct ctl_table tbl;</div><div class='ctx'> </div><div class='del'>-	ret = proc_dointvec(table, write, buffer, lenp, ppos);</div><div class='add'>+	udp_hash_entries = net-&gt;ipv4.udp_table-&gt;mask + 1;</div><div class='ctx'> </div><div class='del'>-	if (write &amp;&amp; !ret) {</div><div class='del'>-		int enabled = init_net.ipv4.sysctl_udp_early_demux;</div><div class='add'>+	/* A negative number indicates that the child netns</div><div class='add'>+	 * shares the global udp_table.</div><div class='add'>+	 */</div><div class='add'>+	if (!net_eq(net, &amp;init_net) &amp;&amp; net-&gt;ipv4.udp_table == &amp;udp_table)</div><div class='add'>+		udp_hash_entries *= -1;</div><div class='ctx'> </div><div class='del'>-		proc_configure_early_demux(enabled, IPPROTO_UDP);</div><div class='del'>-	}</div><div class='add'>+	memset(&amp;tbl, 0, sizeof(tbl));</div><div class='add'>+	tbl.data = &amp;udp_hash_entries;</div><div class='add'>+	tbl.maxlen = sizeof(int);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return proc_dointvec(&amp;tbl, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tfo_blackhole_detect_timeout(struct ctl_table *table,</div><div class='del'>-					     int write,</div><div class='del'>-					     void __user *buffer,</div><div class='del'>-					     size_t *lenp, loff_t *ppos)</div><div class='add'>+#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='add'>+static int proc_fib_multipath_hash_policy(const struct ctl_table *table, int write,</div><div class='add'>+					  void *buffer, size_t *lenp,</div><div class='add'>+					  loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = container_of(table-&gt;data, struct net,</div><div class='del'>-	    ipv4.sysctl_tcp_fastopen_blackhole_timeout);</div><div class='add'>+	    ipv4.sysctl_fib_multipath_hash_policy);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	ret = proc_dou8vec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> 	if (write &amp;&amp; ret == 0)</div><div class='del'>-		atomic_set(&amp;net-&gt;ipv4.tfo_active_disable_times, 0);</div><div class='add'>+		call_netevent_notifiers(NETEVENT_IPV4_MPATH_HASH_UPDATE, net);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_tcp_available_ulp(struct ctl_table *ctl,</div><div class='del'>-				  int write,</div><div class='del'>-				  void __user *buffer, size_t *lenp,</div><div class='del'>-				  loff_t *ppos)</div><div class='add'>+static int proc_fib_multipath_hash_fields(const struct ctl_table *table, int write,</div><div class='add'>+					  void *buffer, size_t *lenp,</div><div class='add'>+					  loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table tbl = { .maxlen = TCP_ULP_BUF_MAX, };</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tbl.data = kmalloc(tbl.maxlen, GFP_USER);</div><div class='del'>-	if (!tbl.data)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	tcp_get_available_ulp(tbl.data, TCP_ULP_BUF_MAX);</div><div class='del'>-	ret = proc_dostring(&amp;tbl, write, buffer, lenp, ppos);</div><div class='del'>-	kfree(tbl.data);</div><div class='add'>+	net = container_of(table-&gt;data, struct net,</div><div class='add'>+			   ipv4.sysctl_fib_multipath_hash_fields);</div><div class='add'>+	ret = proc_douintvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	if (write &amp;&amp; ret == 0)</div><div class='add'>+		call_netevent_notifiers(NETEVENT_IPV4_MPATH_HASH_UPDATE, net);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-static int proc_fib_multipath_hash_policy(struct ctl_table *table, int write,</div><div class='del'>-					  void __user *buffer, size_t *lenp,</div><div class='del'>-					  loff_t *ppos)</div><div class='add'>+static u32 proc_fib_multipath_hash_rand_seed __ro_after_init;</div><div class='add'>+</div><div class='add'>+static void proc_fib_multipath_hash_init_rand_seed(void)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = container_of(table-&gt;data, struct net,</div><div class='del'>-	    ipv4.sysctl_fib_multipath_hash_policy);</div><div class='add'>+	get_random_bytes(&amp;proc_fib_multipath_hash_rand_seed,</div><div class='add'>+			 sizeof(proc_fib_multipath_hash_rand_seed));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void proc_fib_multipath_hash_set_seed(struct net *net, u32 user_seed)</div><div class='add'>+{</div><div class='add'>+	struct sysctl_fib_multipath_hash_seed new = {</div><div class='add'>+		.user_seed = user_seed,</div><div class='add'>+		.mp_seed = (user_seed ? user_seed :</div><div class='add'>+			    proc_fib_multipath_hash_rand_seed),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(net-&gt;ipv4.sysctl_fib_multipath_hash_seed, new);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_fib_multipath_hash_seed(const struct ctl_table *table, int write,</div><div class='add'>+					void *buffer, size_t *lenp,</div><div class='add'>+					loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct sysctl_fib_multipath_hash_seed *mphs;</div><div class='add'>+	struct net *net = table-&gt;data;</div><div class='add'>+	struct ctl_table tmp;</div><div class='add'>+	u32 user_seed;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='del'>-	if (write &amp;&amp; ret == 0)</div><div class='add'>+	mphs = &amp;net-&gt;ipv4.sysctl_fib_multipath_hash_seed;</div><div class='add'>+	user_seed = mphs-&gt;user_seed;</div><div class='add'>+</div><div class='add'>+	tmp = *table;</div><div class='add'>+	tmp.data = &amp;user_seed;</div><div class='add'>+</div><div class='add'>+	ret = proc_douintvec_minmax(&amp;tmp, write, buffer, lenp, ppos);</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; ret == 0) {</div><div class='add'>+		proc_fib_multipath_hash_set_seed(net, user_seed);</div><div class='ctx'> 		call_netevent_notifiers(NETEVENT_IPV4_MPATH_HASH_UPDATE, net);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static void proc_fib_multipath_hash_init_rand_seed(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void proc_fib_multipath_hash_set_seed(struct net *net, u32 user_seed)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table ipv4_table[] = {</div><div class='hunk'>@@ -509,77 +600,90 @@ static struct ctl_table ipv4_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> #endif /* CONFIG_NETLABEL */</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "tcp_available_congestion_control",</div><div class='del'>-		.maxlen		= TCP_CA_BUF_MAX,</div><div class='del'>-		.mode		= 0444,</div><div class='del'>-		.proc_handler   = proc_tcp_available_congestion_control,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "tcp_allowed_congestion_control",</div><div class='del'>-		.maxlen		= TCP_CA_BUF_MAX,</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler   = proc_allowed_congestion_control,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='ctx'> 		.procname	= "tcp_available_ulp",</div><div class='ctx'> 		.maxlen		= TCP_ULP_BUF_MAX,</div><div class='ctx'> 		.mode		= 0444,</div><div class='ctx'> 		.proc_handler   = proc_tcp_available_ulp,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "icmp_msgs_per_sec",</div><div class='del'>-		.data		= &amp;sysctl_icmp_msgs_per_sec,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.procname	= "icmp_msgs_burst",</div><div class='del'>-		.data		= &amp;sysctl_icmp_msgs_burst,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='ctx'> 		.procname	= "udp_mem",</div><div class='ctx'> 		.data		= &amp;sysctl_udp_mem,</div><div class='ctx'> 		.maxlen		= sizeof(sysctl_udp_mem),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_sync_mem",</div><div class='add'>+		.data		= &amp;sysctl_fib_sync_mem,</div><div class='add'>+		.maxlen		= sizeof(sysctl_fib_sync_mem),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= &amp;sysctl_fib_sync_mem_min,</div><div class='add'>+		.extra2		= &amp;sysctl_fib_sync_mem_max,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "icmp_echo_ignore_all",</div><div class='del'>-		.data		= &amp;init_net.ipv4.sysctl_icmp_echo_ignore_all,</div><div class='add'>+		.procname	= "tcp_max_tw_buckets",</div><div class='add'>+		.data		= &amp;init_net.ipv4.tcp_death_row.sysctl_max_tw_buckets,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "icmp_echo_ignore_all",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_icmp_echo_ignore_all,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "icmp_echo_enable_probe",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_icmp_echo_enable_probe,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "icmp_echo_ignore_broadcasts",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "icmp_ignore_bogus_error_responses",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "icmp_errors_use_inbound_ifaddr",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "icmp_errors_extension_mask",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_icmp_errors_extension_mask,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;icmp_errors_extension_mask_all,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "icmp_ratelimit",</div><div class='hunk'>@@ -596,67 +700,125 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "icmp_msgs_per_sec",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_icmp_msgs_per_sec,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "icmp_msgs_burst",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_icmp_msgs_burst,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "ping_group_range",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.ping_group_range.range,</div><div class='ctx'> 		.maxlen		= sizeof(gid_t)*2,</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= ipv4_ping_group_range,</div><div class='ctx'> 	},</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+	{</div><div class='add'>+		.procname	= "raw_l3mdev_accept",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_raw_l3mdev_accept,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_ecn",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_ecn,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;tcp_ecn_mode_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_ecn_option",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_ecn_option,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_ecn_option_beacon",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_ecn_option_beacon,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_THREE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_ecn_fallback",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_ecn_fallback,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_dynaddr",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_dynaddr,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_early_demux",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_early_demux,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname       = "udp_early_demux",</div><div class='ctx'> 		.data           = &amp;init_net.ipv4.sysctl_udp_early_demux,</div><div class='del'>-		.maxlen         = sizeof(int),</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='ctx'> 		.mode           = 0644,</div><div class='del'>-		.proc_handler   = proc_udp_early_demux</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname       = "tcp_early_demux",</div><div class='ctx'> 		.data           = &amp;init_net.ipv4.sysctl_tcp_early_demux,</div><div class='del'>-		.maxlen         = sizeof(int),</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "nexthop_compat_mode",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_nexthop_compat_mode,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='ctx'> 		.mode           = 0644,</div><div class='del'>-		.proc_handler   = proc_tcp_early_demux</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_default_ttl",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_default_ttl,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 		.extra1		= &amp;ip_ttl_min,</div><div class='ctx'> 		.extra2		= &amp;ip_ttl_max,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_local_port_range",</div><div class='del'>-		.maxlen		= sizeof(init_net.ipv4.ip_local_ports.range),</div><div class='del'>-		.data		= &amp;init_net.ipv4.ip_local_ports.range,</div><div class='add'>+		.maxlen		= 0,</div><div class='add'>+		.data		= &amp;init_net,</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= ipv4_local_port_range,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -670,64 +832,73 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_no_pmtu_disc",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_no_pmtu_disc,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_forward_use_pmtu",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_fwd_use_pmtu,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_forward_update_priority",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_fwd_update_priority,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler   = ipv4_fwd_update_priority,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_nonlocal_bind",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_ip_nonlocal_bind,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ip_autobind_reuse",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_ip_autobind_reuse,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fwmark_reflect",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_fwmark_reflect,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_fwmark_accept",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_fwmark_accept,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_l3mdev_accept",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_l3mdev_accept,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_mtu_probing",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_mtu_probing,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_base_mss",</div><div class='hunk'>@@ -737,6 +908,24 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "tcp_min_snd_mss",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_min_snd_mss,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;tcp_min_snd_mss_min,</div><div class='add'>+		.extra2		= &amp;tcp_min_snd_mss_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_mtu_probe_floor",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_mtu_probe_floor,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= &amp;tcp_min_snd_mss_min,</div><div class='add'>+		.extra2		= &amp;tcp_min_snd_mss_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "tcp_probe_threshold",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_probe_threshold,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -754,9 +943,9 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "igmp_link_local_mcast_reports",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_igmp_llm_reports,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "igmp_max_memberships",</div><div class='hunk'>@@ -779,7 +968,7 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one</div><div class='add'>+		.extra1		= SYSCTL_ONE</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='hunk'>@@ -790,6 +979,18 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.proc_handler	= proc_tcp_congestion_control,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "tcp_available_congestion_control",</div><div class='add'>+		.maxlen		= TCP_CA_BUF_MAX,</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.proc_handler   = proc_tcp_available_congestion_control,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_allowed_congestion_control",</div><div class='add'>+		.maxlen		= TCP_CA_BUF_MAX,</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler   = proc_allowed_congestion_control,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "tcp_keepalive_time",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_keepalive_time,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -799,9 +1000,9 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_keepalive_probes",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_keepalive_probes,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_keepalive_intvl",</div><div class='hunk'>@@ -813,29 +1014,38 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_syn_retries",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_syn_retries,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 		.extra1		= &amp;tcp_syn_retries_min,</div><div class='ctx'> 		.extra2		= &amp;tcp_syn_retries_max</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_synack_retries",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_synack_retries,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_SYN_COOKIES</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_syncookies",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_syncookies,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "tcp_migrate_req",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_migrate_req,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "tcp_reordering",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_reordering,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -845,24 +1055,24 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_retries1",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_retries1,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 		.extra2		= &amp;tcp_retr1_max</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_retries2",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_retries2,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_orphan_retries",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_orphan_retries,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_fin_timeout",</div><div class='hunk'>@@ -881,18 +1091,20 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_tw_reuse",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_tw_reuse,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;two,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "tcp_max_tw_buckets",</div><div class='del'>-		.data		= &amp;init_net.ipv4.tcp_death_row.sysctl_max_tw_buckets,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.procname	= "tcp_tw_reuse_delay",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_tw_reuse_delay,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= &amp;tcp_tw_reuse_delay_max,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_max_syn_backlog",</div><div class='hunk'>@@ -912,7 +1124,12 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.procname	= "tcp_fastopen_key",</div><div class='ctx'> 		.mode		= 0600,</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_fastopen,</div><div class='del'>-		.maxlen		= ((TCP_FASTOPEN_KEY_LENGTH * 2) + 10),</div><div class='add'>+		/* maxlen to print the list of keys in hex (*2), with dashes</div><div class='add'>+		 * separating doublewords and a comma in between keys.</div><div class='add'>+		 */</div><div class='add'>+		.maxlen		= ((TCP_FASTOPEN_KEY_LENGTH *</div><div class='add'>+				   2 * TCP_FASTOPEN_KEY_MAX) +</div><div class='add'>+				   (TCP_FASTOPEN_KEY_MAX * 5)),</div><div class='ctx'> 		.proc_handler	= proc_tcp_fastopen_key,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -921,26 +1138,42 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_tfo_blackhole_detect_timeout,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fib_multipath_use_neigh",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_fib_multipath_use_neigh,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fib_multipath_hash_policy",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_fib_multipath_hash_policy,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_fib_multipath_hash_policy,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_THREE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_multipath_hash_fields",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_fib_multipath_hash_fields,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_fib_multipath_hash_fields,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= &amp;fib_multipath_hash_fields_all_mask,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_multipath_hash_seed",</div><div class='add'>+		.data		= &amp;init_net,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_fib_multipath_hash_seed,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='hunk'>@@ -954,98 +1187,98 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "udp_l3mdev_accept",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_udp_l3mdev_accept,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_sack",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_sack,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_window_scaling",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_window_scaling,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_timestamps",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_timestamps,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_early_retrans",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_early_retrans,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;four,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_FOUR,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_recovery",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_recovery,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname       = "tcp_thin_linear_timeouts",</div><div class='ctx'> 		.data           = &amp;init_net.ipv4.sysctl_tcp_thin_linear_timeouts,</div><div class='del'>-		.maxlen         = sizeof(int),</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='ctx'> 		.mode           = 0644,</div><div class='del'>-		.proc_handler   = proc_dointvec</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_slow_start_after_idle",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_slow_start_after_idle,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_retrans_collapse",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_retrans_collapse,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_stdurg",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_stdurg,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_rfc1337",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_rfc1337,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_abort_on_overflow",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_abort_on_overflow,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_fack",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_fack,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_max_reordering",</div><div class='hunk'>@@ -1057,16 +1290,18 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_dsack",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_dsack,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_app_win",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_app_win,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;tcp_app_win_max,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_adv_win_scale",</div><div class='hunk'>@@ -1080,37 +1315,55 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_frto",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_frto,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_no_metrics_save",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_nometrics_save,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_no_ssthresh_metrics_save",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_no_ssthresh_metrics_save,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_moderate_rcvbuf",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_moderate_rcvbuf,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_rcvbuf_low_rtt",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_rcvbuf_low_rtt,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_INT_MAX,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_tso_win_divisor",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_tso_win_divisor,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_workaround_signed_windows",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_workaround_signed_windows,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_limit_output_bytes",</div><div class='hunk'>@@ -1129,27 +1382,35 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_min_tso_segs",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_min_tso_segs,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one,</div><div class='del'>-		.extra2		= &amp;gso_max_segs,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_tso_rtt_log",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_tso_rtt_log,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_min_rtt_wlen",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_min_rtt_wlen,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;one_day_secs</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_autocorking",</div><div class='ctx'> 		.data		= &amp;init_net.ipv4.sysctl_tcp_autocorking,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_invalid_ratelimit",</div><div class='hunk'>@@ -1164,8 +1425,8 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;thousand,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE_THOUSAND,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_pacing_ca_ratio",</div><div class='hunk'>@@ -1173,8 +1434,8 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;thousand,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE_THOUSAND,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_wmem",</div><div class='hunk'>@@ -1182,7 +1443,7 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(init_net.ipv4.sysctl_tcp_wmem),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_rmem",</div><div class='hunk'>@@ -1190,7 +1451,7 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(init_net.ipv4.sysctl_tcp_rmem),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "tcp_comp_sack_delay_ns",</div><div class='hunk'>@@ -1200,13 +1461,76 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	= "tcp_comp_sack_nr",</div><div class='del'>-		.data		= &amp;init_net.ipv4.sysctl_tcp_comp_sack_nr,</div><div class='add'>+		.procname	= "tcp_comp_sack_rtt_percent",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_comp_sack_rtt_percent,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;comp_sack_nr_max,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= SYSCTL_ONE_THOUSAND,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_comp_sack_slack_ns",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_comp_sack_slack_ns,</div><div class='add'>+		.maxlen		= sizeof(unsigned long),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_doulongvec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_comp_sack_nr",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_comp_sack_nr,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_backlog_ack_defer",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_backlog_ack_defer,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_reflect_tos",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_reflect_tos,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_ehash_entries",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_child_ehash_entries,</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.proc_handler	= proc_tcp_ehash_entries,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_child_ehash_entries",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_child_ehash_entries,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;tcp_child_ehash_entries_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "udp_hash_entries",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_udp_child_hash_entries,</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.proc_handler	= proc_udp_hash_entries,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "udp_child_hash_entries",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_udp_child_hash_entries,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;udp_child_hash_entries_max,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "udp_rmem_min",</div><div class='hunk'>@@ -1214,7 +1538,7 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(init_net.ipv4.sysctl_udp_rmem_min),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one</div><div class='add'>+		.extra1		= SYSCTL_ONE</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "udp_wmem_min",</div><div class='hunk'>@@ -1222,13 +1546,106 @@ static struct ctl_table ipv4_net_table[] = {</div><div class='ctx'> 		.maxlen		= sizeof(init_net.ipv4.sysctl_udp_wmem_min),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one</div><div class='add'>+		.extra1		= SYSCTL_ONE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_notify_on_flag_change",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_fib_notify_on_flag_change,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_plb_enabled",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_plb_enabled,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_plb_idle_rehash_rounds",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_plb_idle_rehash_rounds,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+		.extra2		= &amp;tcp_plb_max_rounds,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_plb_rehash_rounds",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_plb_rehash_rounds,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+		.extra2         = &amp;tcp_plb_max_rounds,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_plb_suspend_rto_sec",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_plb_suspend_rto_sec,</div><div class='add'>+		.maxlen         = sizeof(u8),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "tcp_plb_cong_thresh",</div><div class='add'>+		.data           = &amp;init_net.ipv4.sysctl_tcp_plb_cong_thresh,</div><div class='add'>+		.maxlen         = sizeof(int),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = &amp;tcp_plb_max_cong_thresh,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_syn_linear_timeouts",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_syn_linear_timeouts,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;tcp_syn_linear_timeouts_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_shrink_window",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_shrink_window,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_pingpong_thresh",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_pingpong_thresh,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_rto_min_us",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_rto_min_us,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "tcp_rto_max_ms",</div><div class='add'>+		.data		= &amp;init_net.ipv4.sysctl_tcp_rto_max_ms,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE_THOUSAND,</div><div class='add'>+		.extra2		= &amp;tcp_rto_max_max,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __net_init int ipv4_sysctl_init_net(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	size_t table_size = ARRAY_SIZE(ipv4_net_table);</div><div class='ctx'> 	struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	table = ipv4_net_table;</div><div class='hunk'>@@ -1239,12 +1656,23 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)</div><div class='ctx'> 		if (!table)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='del'>-		/* Update the variables to point into the current struct net */</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(ipv4_net_table) - 1; i++)</div><div class='del'>-			table[i].data += (void *)net - (void *)&amp;init_net;</div><div class='add'>+		for (i = 0; i &lt; table_size; i++) {</div><div class='add'>+			if (table[i].data) {</div><div class='add'>+				/* Update the variables to point into</div><div class='add'>+				 * the current struct net</div><div class='add'>+				 */</div><div class='add'>+				table[i].data += (void *)net - (void *)&amp;init_net;</div><div class='add'>+			} else {</div><div class='add'>+				/* Entries without data pointer are global;</div><div class='add'>+				 * Make them read-only in non-init_net ns</div><div class='add'>+				 */</div><div class='add'>+				table[i].mode &amp;= ~0222;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);</div><div class='add'>+	net-&gt;ipv4.ipv4_hdr = register_net_sysctl_sz(net, "net/ipv4", table,</div><div class='add'>+						    table_size);</div><div class='ctx'> 	if (!net-&gt;ipv4.ipv4_hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -1252,6 +1680,8 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)</div><div class='ctx'> 	if (!net-&gt;ipv4.sysctl_local_reserved_ports)</div><div class='ctx'> 		goto err_ports;</div><div class='ctx'> </div><div class='add'>+	proc_fib_multipath_hash_set_seed(net, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_ports:</div><div class='hunk'>@@ -1265,7 +1695,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static __net_exit void ipv4_sysctl_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	kfree(net-&gt;ipv4.sysctl_local_reserved_ports);</div><div class='ctx'> 	table = net-&gt;ipv4.ipv4_hdr-&gt;ctl_table_arg;</div><div class='hunk'>@@ -1286,6 +1716,8 @@ static __init int sysctl_ipv4_init(void)</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	proc_fib_multipath_hash_init_rand_seed();</div><div class='add'>+</div><div class='ctx'> 	if (register_pernet_subsys(&amp;ipv4_sysctl_ops)) {</div><div class='ctx'> 		unregister_net_sysctl_table(hdr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c<br/>index 10c6246396cc..f035440c475a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -205,11 +206,6 @@</div><div class='ctx'>  *	Hirokazu Takahashi	:	Use copy_from_user() instead of</div><div class='ctx'>  *					csum_and_copy_from_user() if possible.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or(at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Description of States:</div><div class='ctx'>  *</div><div class='ctx'>  *	TCP_SYN_SENT		sent a connection request, waiting for ack</div><div class='hunk'>@@ -247,7 +243,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "TCP: " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -257,40 +253,59 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/splice.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/inet_ecn.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/rstreason.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ioctls.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='add'>+#include &lt;trace/events/tcp.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../core/devmem.h"</div><div class='add'>+</div><div class='add'>+/* Track pending CMSGs. */</div><div class='add'>+enum {</div><div class='add'>+	TCP_CMSG_INQ = 1,</div><div class='add'>+	TCP_CMSG_TS = 2</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct percpu_counter tcp_orphan_count;</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_orphan_count);</div><div class='add'>+DEFINE_PER_CPU(unsigned int, tcp_orphan_count);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(tcp_orphan_count);</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU(u32, tcp_tw_isn);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(tcp_tw_isn);</div><div class='ctx'> </div><div class='ctx'> long sysctl_tcp_mem[3] __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(sysctl_tcp_mem);</div><div class='add'>+EXPORT_IPV6_MOD(sysctl_tcp_mem);</div><div class='ctx'> </div><div class='del'>-atomic_long_t tcp_memory_allocated;	/* Current allocated memory. */</div><div class='del'>-EXPORT_SYMBOL(tcp_memory_allocated);</div><div class='add'>+DEFINE_PER_CPU(int, tcp_memory_per_cpu_fw_alloc);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(tcp_memory_per_cpu_fw_alloc);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_SMC)</div><div class='ctx'> DEFINE_STATIC_KEY_FALSE(tcp_have_smc);</div><div class='hunk'>@@ -300,8 +315,8 @@ EXPORT_SYMBOL(tcp_have_smc);</div><div class='ctx'> /*</div><div class='ctx'>  * Current number of TCP sockets.</div><div class='ctx'>  */</div><div class='del'>-struct percpu_counter tcp_sockets_allocated;</div><div class='del'>-EXPORT_SYMBOL(tcp_sockets_allocated);</div><div class='add'>+struct percpu_counter tcp_sockets_allocated ____cacheline_aligned_in_smp;</div><div class='add'>+EXPORT_IPV6_MOD(tcp_sockets_allocated);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TCP splice context</div><div class='hunk'>@@ -325,7 +340,7 @@ void tcp_enter_memory_pressure(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (tcp_memory_pressure)</div><div class='add'>+	if (READ_ONCE(tcp_memory_pressure))</div><div class='ctx'> 		return;</div><div class='ctx'> 	val = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -334,20 +349,20 @@ void tcp_enter_memory_pressure(struct sock *sk)</div><div class='ctx'> 	if (!cmpxchg(&amp;tcp_memory_pressure, 0, val))</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMEMORYPRESSURES);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_enter_memory_pressure);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_enter_memory_pressure);</div><div class='ctx'> </div><div class='ctx'> void tcp_leave_memory_pressure(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (!tcp_memory_pressure)</div><div class='add'>+	if (!READ_ONCE(tcp_memory_pressure))</div><div class='ctx'> 		return;</div><div class='ctx'> 	val = xchg(&amp;tcp_memory_pressure, 0);</div><div class='ctx'> 	if (val)</div><div class='ctx'> 		NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPMEMORYPRESSURESCHRONO,</div><div class='ctx'> 			      jiffies_to_msecs(jiffies - val));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_leave_memory_pressure);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_leave_memory_pressure);</div><div class='ctx'> </div><div class='ctx'> /* Convert seconds to retransmits based on initial and max timeout */</div><div class='ctx'> static u8 secs_to_retrans(int seconds, int timeout, int rto_max)</div><div class='hunk'>@@ -399,6 +414,21 @@ static u64 tcp_compute_delivery_rate(const struct tcp_sock *tp)</div><div class='ctx'> 	return rate64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+void tcp_md5_destruct_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;md5sig_info) {</div><div class='add'>+</div><div class='add'>+		tcp_clear_md5_list(sk);</div><div class='add'>+		kfree(rcu_replace_pointer(tp-&gt;md5sig_info, NULL, 1));</div><div class='add'>+		static_branch_slow_dec_deferred(&amp;tcp_md5_needed);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_md5_destruct_sock);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Address-family independent initialization for a tcp_sock.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: A lot of things set to zero explicitly by call to</div><div class='hunk'>@@ -408,6 +438,7 @@ void tcp_init_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int rto_min_us, rto_max_ms;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;out_of_order_queue = RB_ROOT;</div><div class='ctx'> 	sk-&gt;tcp_rtx_queue = RB_ROOT;</div><div class='hunk'>@@ -416,6 +447,13 @@ void tcp_init_sock(struct sock *sk)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tp-&gt;tsorted_sent_queue);</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_rto = TCP_TIMEOUT_INIT;</div><div class='add'>+</div><div class='add'>+	rto_max_ms = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rto_max_ms);</div><div class='add'>+	icsk-&gt;icsk_rto_max = msecs_to_jiffies(rto_max_ms);</div><div class='add'>+</div><div class='add'>+	rto_min_us = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rto_min_us);</div><div class='add'>+	icsk-&gt;icsk_rto_min = usecs_to_jiffies(rto_min_us);</div><div class='add'>+	icsk-&gt;icsk_delack_max = TCP_DELACK_MAX;</div><div class='ctx'> 	tp-&gt;mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);</div><div class='ctx'> 	minmax_reset(&amp;tp-&gt;rtt_min, tcp_jiffies32, ~0U);</div><div class='ctx'> </div><div class='hunk'>@@ -424,10 +462,11 @@ void tcp_init_sock(struct sock *sk)</div><div class='ctx'> 	 * algorithms that we must have the following bandaid to talk</div><div class='ctx'> 	 * efficiently to them.  -DaveM</div><div class='ctx'> 	 */</div><div class='del'>-	tp-&gt;snd_cwnd = TCP_INIT_CWND;</div><div class='add'>+	tcp_snd_cwnd_set(tp, TCP_INIT_CWND);</div><div class='ctx'> </div><div class='ctx'> 	/* There's a bubble in the pipe until at least the first ACK. */</div><div class='ctx'> 	tp-&gt;app_limited = ~0U;</div><div class='add'>+	tp-&gt;rate_app_limited = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* See draft-stevens-tcpca-spec-01 for discussion of the</div><div class='ctx'> 	 * initialization of these values.</div><div class='hunk'>@@ -436,61 +475,53 @@ void tcp_init_sock(struct sock *sk)</div><div class='ctx'> 	tp-&gt;snd_cwnd_clamp = ~0;</div><div class='ctx'> 	tp-&gt;mss_cache = TCP_MSS_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;reordering = sock_net(sk)-&gt;ipv4.sysctl_tcp_reordering;</div><div class='add'>+	tp-&gt;reordering = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reordering);</div><div class='ctx'> 	tcp_assign_congestion_control(sk);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tsoffset = 0;</div><div class='ctx'> 	tp-&gt;rack.reo_wnd_steps = 1;</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_state = TCP_CLOSE;</div><div class='del'>-</div><div class='ctx'> 	sk-&gt;sk_write_space = sk_stream_write_space;</div><div class='ctx'> 	sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_sync_mss = tcp_sync_mss;</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_sndbuf = sock_net(sk)-&gt;ipv4.sysctl_tcp_wmem[1];</div><div class='del'>-	sk-&gt;sk_rcvbuf = sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[1];</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_sndbuf, READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_wmem[1]));</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_rcvbuf, READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[1]));</div><div class='add'>+	tcp_scaling_ratio_init(sk);</div><div class='ctx'> </div><div class='add'>+	set_bit(SOCK_SUPPORT_ZC, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='ctx'> 	sk_sockets_allocated_inc(sk);</div><div class='del'>-	sk-&gt;sk_route_forced_caps = NETIF_F_GSO;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tcp_init_sock);</div><div class='del'>-</div><div class='del'>-void tcp_init_transfer(struct sock *sk, int bpf_op)</div><div class='del'>-{</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-</div><div class='del'>-	tcp_mtup_init(sk);</div><div class='del'>-	icsk-&gt;icsk_af_ops-&gt;rebuild_header(sk);</div><div class='del'>-	tcp_init_metrics(sk);</div><div class='del'>-	tcp_call_bpf(sk, bpf_op, 0, NULL);</div><div class='del'>-	tcp_init_congestion_control(sk);</div><div class='del'>-	tcp_init_buffer_space(sk);</div><div class='add'>+	xa_init_flags(&amp;sk-&gt;sk_user_frags, XA_FLAGS_ALLOC1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD(tcp_init_sock);</div><div class='ctx'> </div><div class='del'>-static void tcp_tx_timestamp(struct sock *sk, u16 tsflags)</div><div class='add'>+static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = tcp_write_queue_tail(sk);</div><div class='add'>+	u32 tsflags = sockc-&gt;tsflags;</div><div class='ctx'> </div><div class='ctx'> 	if (tsflags &amp;&amp; skb) {</div><div class='ctx'> 		struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='ctx'> 		struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='ctx'> </div><div class='del'>-		sock_tx_timestamp(sk, tsflags, &amp;shinfo-&gt;tx_flags);</div><div class='add'>+		sock_tx_timestamp(sk, sockc, &amp;shinfo-&gt;tx_flags);</div><div class='ctx'> 		if (tsflags &amp; SOF_TIMESTAMPING_TX_ACK)</div><div class='del'>-			tcb-&gt;txstamp_ack = 1;</div><div class='add'>+			tcb-&gt;txstamp_ack |= TSTAMP_ACK_SK;</div><div class='ctx'> 		if (tsflags &amp; SOF_TIMESTAMPING_TX_RECORD_MASK)</div><div class='ctx'> 			shinfo-&gt;tskey = TCP_SKB_CB(skb)-&gt;seq + skb-&gt;len - 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (cgroup_bpf_enabled(CGROUP_SOCK_OPS) &amp;&amp;</div><div class='add'>+	    SK_BPF_CB_FLAG_TEST(sk, SK_BPF_CB_TX_TIMESTAMPING) &amp;&amp; skb)</div><div class='add'>+		bpf_skops_tx_timestamping(sk, skb, BPF_SOCK_OPS_TSTAMP_SENDMSG_CB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,</div><div class='del'>-					  int target, struct sock *sk)</div><div class='add'>+static bool tcp_stream_is_readable(struct sock *sk, int target)</div><div class='ctx'> {</div><div class='del'>-	return (tp-&gt;rcv_nxt - tp-&gt;copied_seq &gt;= target) ||</div><div class='del'>-		(sk-&gt;sk_prot-&gt;stream_memory_read ?</div><div class='del'>-		sk-&gt;sk_prot-&gt;stream_memory_read(sk) : false);</div><div class='add'>+	if (tcp_epollin_ready(sk, target))</div><div class='add'>+		return true;</div><div class='add'>+	return sk_is_readable(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -505,9 +536,10 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 	__poll_t mask;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u8 shutdown;</div><div class='ctx'> 	int state;</div><div class='ctx'> </div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='add'>+	sock_poll_wait(file, sock, wait);</div><div class='ctx'> </div><div class='ctx'> 	state = inet_sk_state_load(sk);</div><div class='ctx'> 	if (state == TCP_LISTEN)</div><div class='hunk'>@@ -547,26 +579,28 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 	 * NOTE. Check for TCP_CLOSE is added. The goal is to prevent</div><div class='ctx'> 	 * blocking on fresh not-connected or disconnected socket. --ANK</div><div class='ctx'> 	 */</div><div class='del'>-	if (sk-&gt;sk_shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)</div><div class='add'>+	shutdown = READ_ONCE(sk-&gt;sk_shutdown);</div><div class='add'>+	if (shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)</div><div class='ctx'> 		mask |= EPOLLHUP;</div><div class='del'>-	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+	if (shutdown &amp; RCV_SHUTDOWN)</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;</div><div class='ctx'> </div><div class='ctx'> 	/* Connected or passive Fast Open socket? */</div><div class='ctx'> 	if (state != TCP_SYN_SENT &amp;&amp;</div><div class='del'>-	    (state != TCP_SYN_RECV || tp-&gt;fastopen_rsk)) {</div><div class='add'>+	    (state != TCP_SYN_RECV || rcu_access_pointer(tp-&gt;fastopen_rsk))) {</div><div class='ctx'> 		int target = sock_rcvlowat(sk, 0, INT_MAX);</div><div class='add'>+		u16 urg_data = READ_ONCE(tp-&gt;urg_data);</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;urg_seq == tp-&gt;copied_seq &amp;&amp;</div><div class='del'>-		    !sock_flag(sk, SOCK_URGINLINE) &amp;&amp;</div><div class='del'>-		    tp-&gt;urg_data)</div><div class='add'>+		if (unlikely(urg_data) &amp;&amp;</div><div class='add'>+		    READ_ONCE(tp-&gt;urg_seq) == READ_ONCE(tp-&gt;copied_seq) &amp;&amp;</div><div class='add'>+		    !sock_flag(sk, SOCK_URGINLINE))</div><div class='ctx'> 			target++;</div><div class='ctx'> </div><div class='del'>-		if (tcp_stream_is_readable(tp, target, sk))</div><div class='add'>+		if (tcp_stream_is_readable(sk, target))</div><div class='ctx'> 			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='del'>-		if (!(sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)) {</div><div class='del'>-			if (sk_stream_is_writeable(sk)) {</div><div class='add'>+		if (!(shutdown &amp; SEND_SHUTDOWN)) {</div><div class='add'>+			if (__sk_stream_is_writeable(sk, 1)) {</div><div class='ctx'> 				mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 			} else {  /* send SIGIO later */</div><div class='ctx'> 				sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='hunk'>@@ -578,31 +612,33 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 				 * pairs with the input side.</div><div class='ctx'> 				 */</div><div class='ctx'> 				smp_mb__after_atomic();</div><div class='del'>-				if (sk_stream_is_writeable(sk))</div><div class='add'>+				if (__sk_stream_is_writeable(sk, 1))</div><div class='ctx'> 					mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;urg_data &amp; TCP_URG_VALID)</div><div class='add'>+		if (urg_data &amp; TCP_URG_VALID)</div><div class='ctx'> 			mask |= EPOLLPRI;</div><div class='del'>-	} else if (state == TCP_SYN_SENT &amp;&amp; inet_sk(sk)-&gt;defer_connect) {</div><div class='add'>+	} else if (state == TCP_SYN_SENT &amp;&amp;</div><div class='add'>+		   inet_test_bit(DEFER_CONNECT, sk)) {</div><div class='ctx'> 		/* Active TCP fastopen socket with defer_connect</div><div class='ctx'> 		 * Return EPOLLOUT so application can call write()</div><div class='ctx'> 		 * in order for kernel to generate SYN+data</div><div class='ctx'> 		 */</div><div class='ctx'> 		mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 	}</div><div class='del'>-	/* This barrier is coupled with smp_wmb() in tcp_reset() */</div><div class='add'>+	/* This barrier is coupled with smp_wmb() in tcp_done_with_error() */</div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	if (sk-&gt;sk_err || !skb_queue_empty(&amp;sk-&gt;sk_error_queue))</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_err) ||</div><div class='add'>+	    !skb_queue_empty_lockless(&amp;sk-&gt;sk_error_queue))</div><div class='ctx'> 		mask |= EPOLLERR;</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_poll);</div><div class='ctx'> </div><div class='del'>-int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+int tcp_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int answ;</div><div class='hunk'>@@ -618,7 +654,8 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> 		unlock_sock_fast(sk, slow);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCATMARK:</div><div class='del'>-		answ = tp-&gt;urg_data &amp;&amp; tp-&gt;urg_seq == tp-&gt;copied_seq;</div><div class='add'>+		answ = READ_ONCE(tp-&gt;urg_data) &amp;&amp;</div><div class='add'>+		       READ_ONCE(tp-&gt;urg_seq) == READ_ONCE(tp-&gt;copied_seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCOUTQ:</div><div class='ctx'> 		if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='hunk'>@@ -627,7 +664,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> 		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV))</div><div class='ctx'> 			answ = 0;</div><div class='ctx'> 		else</div><div class='del'>-			answ = tp-&gt;write_seq - tp-&gt;snd_una;</div><div class='add'>+			answ = READ_ONCE(tp-&gt;write_seq) - tp-&gt;snd_una;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCOUTQNSD:</div><div class='ctx'> 		if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='hunk'>@@ -636,17 +673,19 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> 		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV))</div><div class='ctx'> 			answ = 0;</div><div class='ctx'> 		else</div><div class='del'>-			answ = tp-&gt;write_seq - tp-&gt;snd_nxt;</div><div class='add'>+			answ = READ_ONCE(tp-&gt;write_seq) -</div><div class='add'>+			       READ_ONCE(tp-&gt;snd_nxt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return put_user(answ, (int __user *)arg);</div><div class='add'>+	*karg = answ;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_ioctl);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_ioctl);</div><div class='ctx'> </div><div class='del'>-static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='add'>+void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tcp_flags |= TCPHDR_PSH;</div><div class='ctx'> 	tp-&gt;pushed_seq = tp-&gt;write_seq;</div><div class='hunk'>@@ -657,18 +696,17 @@ static inline bool forced_push(const struct tcp_sock *tp)</div><div class='ctx'> 	return after(tp-&gt;write_seq, tp-&gt;pushed_seq + (tp-&gt;max_window &gt;&gt; 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void skb_entail(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+void tcp_skb_entail(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;csum    = 0;</div><div class='ctx'> 	tcb-&gt;seq     = tcb-&gt;end_seq = tp-&gt;write_seq;</div><div class='ctx'> 	tcb-&gt;tcp_flags = TCPHDR_ACK;</div><div class='del'>-	tcb-&gt;sacked  = 0;</div><div class='ctx'> 	__skb_header_release(skb);</div><div class='add'>+	psp_enqueue_set_decrypted(sk, skb);</div><div class='ctx'> 	tcp_add_write_queue_tail(sk, skb);</div><div class='del'>-	sk-&gt;sk_wmem_queued += skb-&gt;truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, skb-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, skb-&gt;truesize);</div><div class='ctx'> 	if (tp-&gt;nonagle &amp; TCP_NAGLE_PUSH)</div><div class='ctx'> 		tp-&gt;nonagle &amp;= ~TCP_NAGLE_PUSH;</div><div class='hunk'>@@ -696,13 +734,14 @@ static bool tcp_should_autocork(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				int size_goal)</div><div class='ctx'> {</div><div class='ctx'> 	return skb-&gt;len &lt; size_goal &amp;&amp;</div><div class='del'>-	       sock_net(sk)-&gt;ipv4.sysctl_tcp_autocorking &amp;&amp;</div><div class='add'>+	       READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_autocorking) &amp;&amp;</div><div class='ctx'> 	       !tcp_rtx_queue_empty(sk) &amp;&amp;</div><div class='del'>-	       refcount_read(&amp;sk-&gt;sk_wmem_alloc) &gt; skb-&gt;truesize;</div><div class='add'>+	       refcount_read(&amp;sk-&gt;sk_wmem_alloc) &gt; skb-&gt;truesize &amp;&amp;</div><div class='add'>+	       tcp_skb_can_collapse_to(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_push(struct sock *sk, int flags, int mss_now,</div><div class='del'>-		     int nonagle, int size_goal)</div><div class='add'>+void tcp_push(struct sock *sk, int flags, int mss_now,</div><div class='add'>+	      int nonagle, int size_goal)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -721,6 +760,7 @@ static void tcp_push(struct sock *sk, int flags, int mss_now,</div><div class='ctx'> 		if (!test_bit(TSQ_THROTTLED, &amp;sk-&gt;sk_tsq_flags)) {</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAUTOCORKING);</div><div class='ctx'> 			set_bit(TSQ_THROTTLED, &amp;sk-&gt;sk_tsq_flags);</div><div class='add'>+			smp_mb__after_atomic();</div><div class='ctx'> 		}</div><div class='ctx'> 		/* It is possible TX completion already happened</div><div class='ctx'> 		 * before we set TSQ_THROTTLED.</div><div class='hunk'>@@ -830,7 +870,9 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))</div><div class='ctx'> 				break;</div><div class='del'>-			sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+			ret = sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				break;</div><div class='ctx'> 			if (signal_pending(current)) {</div><div class='ctx'> 				ret = sock_intr_errno(timeo);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -840,7 +882,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,</div><div class='ctx'> 		tss.len -= ret;</div><div class='ctx'> 		spliced += ret;</div><div class='ctx'> </div><div class='del'>-		if (!timeo)</div><div class='add'>+		if (!tss.len || !timeo)</div><div class='ctx'> 			break;</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> 		lock_sock(sk);</div><div class='hunk'>@@ -858,23 +900,18 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_splice_read);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_splice_read);</div><div class='ctx'> </div><div class='del'>-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,</div><div class='del'>-				    bool force_schedule)</div><div class='add'>+struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, gfp_t gfp,</div><div class='add'>+				     bool force_schedule)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	/* The TCP header must be at least 32-bit aligned.  */</div><div class='del'>-	size = ALIGN(size, 4);</div><div class='del'>-</div><div class='del'>-	if (unlikely(tcp_under_memory_pressure(sk)))</div><div class='del'>-		sk_mem_reclaim_partial(sk);</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb_fclone(size + sk-&gt;sk_prot-&gt;max_header, gfp);</div><div class='add'>+	skb = alloc_skb_fclone(MAX_TCP_HEADER, gfp);</div><div class='ctx'> 	if (likely(skb)) {</div><div class='ctx'> 		bool mem_scheduled;</div><div class='ctx'> </div><div class='add'>+		skb-&gt;truesize = SKB_TRUESIZE(skb_end_offset(skb));</div><div class='ctx'> 		if (force_schedule) {</div><div class='ctx'> 			mem_scheduled = true;</div><div class='ctx'> 			sk_forced_mem_schedule(sk, skb-&gt;truesize);</div><div class='hunk'>@@ -882,18 +919,15 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,</div><div class='ctx'> 			mem_scheduled = sk_wmem_schedule(sk, skb-&gt;truesize);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (likely(mem_scheduled)) {</div><div class='del'>-			skb_reserve(skb, sk-&gt;sk_prot-&gt;max_header);</div><div class='del'>-			/*</div><div class='del'>-			 * Make sure that we have exactly size bytes</div><div class='del'>-			 * available to the caller, no more, no less.</div><div class='del'>-			 */</div><div class='del'>-			skb-&gt;reserved_tailroom = skb-&gt;end - skb-&gt;tail - size;</div><div class='add'>+			skb_reserve(skb, MAX_TCP_HEADER);</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> 			INIT_LIST_HEAD(&amp;skb-&gt;tcp_tsorted_anchor);</div><div class='ctx'> 			return skb;</div><div class='ctx'> 		}</div><div class='ctx'> 		__kfree_skb(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		sk-&gt;sk_prot-&gt;enter_memory_pressure(sk);</div><div class='add'>+		if (!sk-&gt;sk_bypass_prot_mem)</div><div class='add'>+			tcp_enter_memory_pressure(sk);</div><div class='ctx'> 		sk_stream_moderate_sndbuf(sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -909,8 +943,7 @@ static unsigned int tcp_xmit_size_goal(struct sock *sk, u32 mss_now,</div><div class='ctx'> 		return mss_now;</div><div class='ctx'> </div><div class='ctx'> 	/* Note : tcp_tso_autosize() will eventually split this later */</div><div class='del'>-	new_size_goal = sk-&gt;sk_gso_max_size - 1 - MAX_TCP_HEADER;</div><div class='del'>-	new_size_goal = tcp_bound_to_half_wnd(tp, new_size_goal);</div><div class='add'>+	new_size_goal = tcp_bound_to_half_wnd(tp, sk-&gt;sk_gso_max_size);</div><div class='ctx'> </div><div class='ctx'> 	/* We try hard to avoid divides here */</div><div class='ctx'> 	size_goal = tp-&gt;gso_segs * mss_now;</div><div class='hunk'>@@ -924,7 +957,7 @@ static unsigned int tcp_xmit_size_goal(struct sock *sk, u32 mss_now,</div><div class='ctx'> 	return max(size_goal, mss_now);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)</div><div class='add'>+int tcp_send_mss(struct sock *sk, int *size_goal, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int mss_now;</div><div class='ctx'> </div><div class='hunk'>@@ -934,188 +967,56 @@ static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)</div><div class='ctx'> 	return mss_now;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,</div><div class='del'>-			 size_t size, int flags)</div><div class='add'>+/* In some cases, sendmsg() could have added an skb to the write queue,</div><div class='add'>+ * but failed adding payload on it. We need to remove it to consume less</div><div class='add'>+ * memory, but more importantly be able to generate EPOLLOUT for Edge Trigger</div><div class='add'>+ * epoll() users. Another reason is that tcp_write_xmit() does not like</div><div class='add'>+ * finding an empty skb in the write queue.</div><div class='add'>+ */</div><div class='add'>+void tcp_remove_empty_skb(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	int mss_now, size_goal;</div><div class='del'>-	int err;</div><div class='del'>-	ssize_t copied;</div><div class='del'>-	long timeo = sock_sndtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-</div><div class='del'>-	/* Wait for a connection to finish. One exception is TCP Fast Open</div><div class='del'>-	 * (passive side) where data is allowed to be sent before a connection</div><div class='del'>-	 * is fully established.</div><div class='del'>-	 */</div><div class='del'>-	if (((1 &lt;&lt; sk-&gt;sk_state) &amp; ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) &amp;&amp;</div><div class='del'>-	    !tcp_passive_fastopen(sk)) {</div><div class='del'>-		err = sk_stream_wait_connect(sk, &amp;timeo);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='del'>-</div><div class='del'>-	mss_now = tcp_send_mss(sk, &amp;size_goal, flags);</div><div class='del'>-	copied = 0;</div><div class='del'>-</div><div class='del'>-	err = -EPIPE;</div><div class='del'>-	if (sk-&gt;sk_err || (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN))</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	while (size &gt; 0) {</div><div class='del'>-		struct sk_buff *skb = tcp_write_queue_tail(sk);</div><div class='del'>-		int copy, i;</div><div class='del'>-		bool can_coalesce;</div><div class='del'>-</div><div class='del'>-		if (!skb || (copy = size_goal - skb-&gt;len) &lt;= 0 ||</div><div class='del'>-		    !tcp_skb_can_collapse_to(skb)) {</div><div class='del'>-new_segment:</div><div class='del'>-			if (!sk_stream_memory_free(sk))</div><div class='del'>-				goto wait_for_sndbuf;</div><div class='del'>-</div><div class='del'>-			skb = sk_stream_alloc_skb(sk, 0, sk-&gt;sk_allocation,</div><div class='del'>-					tcp_rtx_and_write_queues_empty(sk));</div><div class='del'>-			if (!skb)</div><div class='del'>-				goto wait_for_memory;</div><div class='del'>-</div><div class='del'>-			skb_entail(sk, skb);</div><div class='del'>-			copy = size_goal;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (copy &gt; size)</div><div class='del'>-			copy = size;</div><div class='del'>-</div><div class='del'>-		i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-		can_coalesce = skb_can_coalesce(skb, i, page, offset);</div><div class='del'>-		if (!can_coalesce &amp;&amp; i &gt;= sysctl_max_skb_frags) {</div><div class='del'>-			tcp_mark_push(tp, skb);</div><div class='del'>-			goto new_segment;</div><div class='del'>-		}</div><div class='del'>-		if (!sk_wmem_schedule(sk, copy))</div><div class='del'>-			goto wait_for_memory;</div><div class='del'>-</div><div class='del'>-		if (can_coalesce) {</div><div class='del'>-			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[i - 1], copy);</div><div class='del'>-		} else {</div><div class='del'>-			get_page(page);</div><div class='del'>-			skb_fill_page_desc(skb, i, page, offset, copy);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(flags &amp; MSG_NO_SHARED_FRAGS))</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_SHARED_FRAG;</div><div class='del'>-</div><div class='del'>-		skb-&gt;len += copy;</div><div class='del'>-		skb-&gt;data_len += copy;</div><div class='del'>-		skb-&gt;truesize += copy;</div><div class='del'>-		sk-&gt;sk_wmem_queued += copy;</div><div class='del'>-		sk_mem_charge(sk, copy);</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-		tp-&gt;write_seq += copy;</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;end_seq += copy;</div><div class='del'>-		tcp_skb_pcount_set(skb, 0);</div><div class='del'>-</div><div class='del'>-		if (!copied)</div><div class='del'>-			TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_PSH;</div><div class='del'>-</div><div class='del'>-		copied += copy;</div><div class='del'>-		offset += copy;</div><div class='del'>-		size -= copy;</div><div class='del'>-		if (!size)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;len &lt; size_goal || (flags &amp; MSG_OOB))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (forced_push(tp)) {</div><div class='del'>-			tcp_mark_push(tp, skb);</div><div class='del'>-			__tcp_push_pending_frames(sk, mss_now, TCP_NAGLE_PUSH);</div><div class='del'>-		} else if (skb == tcp_send_head(sk))</div><div class='del'>-			tcp_push_one(sk, mss_now);</div><div class='del'>-		continue;</div><div class='del'>-</div><div class='del'>-wait_for_sndbuf:</div><div class='del'>-		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='del'>-wait_for_memory:</div><div class='del'>-		tcp_push(sk, flags &amp; ~MSG_MORE, mss_now,</div><div class='del'>-			 TCP_NAGLE_PUSH, size_goal);</div><div class='del'>-</div><div class='del'>-		err = sk_stream_wait_memory(sk, &amp;timeo);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto do_error;</div><div class='del'>-</div><div class='del'>-		mss_now = tcp_send_mss(sk, &amp;size_goal, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (copied) {</div><div class='del'>-		tcp_tx_timestamp(sk, sk-&gt;sk_tsflags);</div><div class='del'>-		if (!(flags &amp; MSG_SENDPAGE_NOTLAST))</div><div class='del'>-			tcp_push(sk, flags, mss_now, tp-&gt;nonagle, size_goal);</div><div class='del'>-	}</div><div class='del'>-	return copied;</div><div class='add'>+	struct sk_buff *skb = tcp_write_queue_tail(sk);</div><div class='ctx'> </div><div class='del'>-do_error:</div><div class='del'>-	if (copied)</div><div class='del'>-		goto out;</div><div class='del'>-out_err:</div><div class='del'>-	/* make sure we wake any epoll edge trigger waiter */</div><div class='del'>-	if (unlikely(skb_queue_len(&amp;sk-&gt;sk_write_queue) == 0 &amp;&amp;</div><div class='del'>-		     err == -EAGAIN)) {</div><div class='del'>-		sk-&gt;sk_write_space(sk);</div><div class='del'>-		tcp_chrono_stop(sk, TCP_CHRONO_SNDBUF_LIMITED);</div><div class='add'>+	if (skb &amp;&amp; TCP_SKB_CB(skb)-&gt;seq == TCP_SKB_CB(skb)-&gt;end_seq) {</div><div class='add'>+		tcp_unlink_write_queue(skb, sk);</div><div class='add'>+		if (tcp_write_queue_empty(sk))</div><div class='add'>+			tcp_chrono_stop(sk, TCP_CHRONO_BUSY);</div><div class='add'>+		tcp_wmem_free_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='del'>-	return sk_stream_error(sk, flags, err);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(do_tcp_sendpages);</div><div class='ctx'> </div><div class='del'>-int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset,</div><div class='del'>-			size_t size, int flags)</div><div class='add'>+/* skb changing from pure zc to mixed, must charge zc */</div><div class='add'>+static int tcp_downgrade_zcopy_pure(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (!(sk-&gt;sk_route_caps &amp; NETIF_F_SG))</div><div class='del'>-		return sock_no_sendpage_locked(sk, page, offset, size, flags);</div><div class='add'>+	if (unlikely(skb_zcopy_pure(skb))) {</div><div class='add'>+		u32 extra = skb-&gt;truesize -</div><div class='add'>+			    SKB_TRUESIZE(skb_end_offset(skb));</div><div class='ctx'> </div><div class='del'>-	tcp_rate_check_app_limited(sk);  /* is sending application-limited? */</div><div class='add'>+		if (!sk_wmem_schedule(sk, extra))</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return do_tcp_sendpages(sk, page, offset, size, flags);</div><div class='add'>+		sk_mem_charge(sk, extra);</div><div class='add'>+		skb_shinfo(skb)-&gt;flags &amp;= ~SKBFL_PURE_ZEROCOPY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_sendpage_locked);</div><div class='ctx'> </div><div class='del'>-int tcp_sendpage(struct sock *sk, struct page *page, int offset,</div><div class='del'>-		 size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	ret = tcp_sendpage_locked(sk, page, offset, size, flags);</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tcp_sendpage);</div><div class='del'>-</div><div class='del'>-/* Do not bother using a page frag for very small frames.</div><div class='del'>- * But use this heuristic only for the first skb in write queue.</div><div class='del'>- *</div><div class='del'>- * Having no payload in skb-&gt;head allows better SACK shifting</div><div class='del'>- * in tcp_shift_skb_data(), reducing sack/rack overhead, because</div><div class='del'>- * write queue has less skbs.</div><div class='del'>- * Each skb can hold up to MAX_SKB_FRAGS * 32Kbytes, or ~0.5 MB.</div><div class='del'>- * This also speeds up tso_fragment(), since it wont fallback</div><div class='del'>- * to tcp_fragment().</div><div class='del'>- */</div><div class='del'>-static int linear_payload_sz(bool first_skb)</div><div class='add'>+int tcp_wmem_schedule(struct sock *sk, int copy)</div><div class='ctx'> {</div><div class='del'>-	if (first_skb)</div><div class='del'>-		return SKB_WITH_OVERHEAD(2048 - MAX_TCP_HEADER);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	int left;</div><div class='ctx'> </div><div class='del'>-static int select_size(bool first_skb, bool zc)</div><div class='del'>-{</div><div class='del'>-	if (zc)</div><div class='del'>-		return 0;</div><div class='del'>-	return linear_payload_sz(first_skb);</div><div class='add'>+	if (likely(sk_wmem_schedule(sk, copy)))</div><div class='add'>+		return copy;</div><div class='add'>+</div><div class='add'>+	/* We could be in trouble if we have nothing queued.</div><div class='add'>+	 * Use whatever is left in sk-&gt;sk_forward_alloc and tcp_wmem[0]</div><div class='add'>+	 * to guarantee some progress.</div><div class='add'>+	 */</div><div class='add'>+	left = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_wmem[0]) - sk-&gt;sk_wmem_queued;</div><div class='add'>+	if (left &gt; 0)</div><div class='add'>+		sk_forced_mem_schedule(sk, min(left, copy));</div><div class='add'>+	return min(copy, sk-&gt;sk_forward_alloc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tcp_free_fastopen_req(struct tcp_sock *tp)</div><div class='hunk'>@@ -1126,15 +1027,16 @@ void tcp_free_fastopen_req(struct tcp_sock *tp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,</div><div class='del'>-				int *copied, size_t size)</div><div class='add'>+int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *copied,</div><div class='add'>+			 size_t size, struct ubuf_info *uarg)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct sockaddr *uaddr = msg-&gt;msg_name;</div><div class='ctx'> 	int err, flags;</div><div class='ctx'> </div><div class='del'>-	if (!(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen &amp; TFO_CLIENT_ENABLE) ||</div><div class='add'>+	if (!(READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen) &amp;</div><div class='add'>+	      TFO_CLIENT_ENABLE) ||</div><div class='ctx'> 	    (uaddr &amp;&amp; msg-&gt;msg_namelen &gt;= sizeof(uaddr-&gt;sa_family) &amp;&amp;</div><div class='ctx'> 	     uaddr-&gt;sa_family == AF_UNSPEC))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1147,8 +1049,9 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	tp-&gt;fastopen_req-&gt;data = msg;</div><div class='ctx'> 	tp-&gt;fastopen_req-&gt;size = size;</div><div class='add'>+	tp-&gt;fastopen_req-&gt;uarg = uarg;</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;defer_connect) {</div><div class='add'>+	if (inet_test_bit(DEFER_CONNECT, sk)) {</div><div class='ctx'> 		err = tcp_connect(sk);</div><div class='ctx'> 		/* Same failure procedure as in tcp_v4/6_connect */</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -1158,7 +1061,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	flags = (msg-&gt;msg_flags &amp; MSG_DONTWAIT) ? O_NONBLOCK : 0;</div><div class='del'>-	err = __inet_stream_connect(sk-&gt;sk_socket, uaddr,</div><div class='add'>+	err = __inet_stream_connect(sk-&gt;sk_socket, (struct sockaddr_unsized *)uaddr,</div><div class='ctx'> 				    msg-&gt;msg_namelen, flags, 1);</div><div class='ctx'> 	/* fastopen_req could already be freed in __inet_stream_connect</div><div class='ctx'> 	 * if the connection times out or gets rst</div><div class='hunk'>@@ -1166,46 +1069,77 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 	if (tp-&gt;fastopen_req) {</div><div class='ctx'> 		*copied = tp-&gt;fastopen_req-&gt;copied;</div><div class='ctx'> 		tcp_free_fastopen_req(tp);</div><div class='del'>-		inet-&gt;defer_connect = 0;</div><div class='add'>+		inet_clear_bit(DEFER_CONNECT, sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> {</div><div class='add'>+	struct net_devmem_dmabuf_binding *binding = NULL;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct ubuf_info *uarg = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct sockcm_cookie sockc;</div><div class='ctx'> 	int flags, err, copied = 0;</div><div class='ctx'> 	int mss_now = 0, size_goal, copied_syn = 0;</div><div class='del'>-	bool process_backlog = false;</div><div class='del'>-	bool zc = false;</div><div class='add'>+	int process_backlog = 0;</div><div class='add'>+	int sockc_err = 0;</div><div class='add'>+	int zc = 0;</div><div class='ctx'> 	long timeo;</div><div class='ctx'> </div><div class='ctx'> 	flags = msg-&gt;msg_flags;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MSG_ZEROCOPY &amp;&amp; size &amp;&amp; sock_flag(sk, SOCK_ZEROCOPY)) {</div><div class='del'>-		if (sk-&gt;sk_state != TCP_ESTABLISHED) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='add'>+	sockc = (struct sockcm_cookie){ .tsflags = READ_ONCE(sk-&gt;sk_tsflags) };</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		sockc_err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='add'>+		/* Don't return error until MSG_FASTOPEN has been processed;</div><div class='add'>+		 * that may succeed even if the cmsg is invalid.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		skb = tcp_write_queue_tail(sk);</div><div class='del'>-		uarg = sock_zerocopy_realloc(sk, size, skb_zcopy(skb));</div><div class='del'>-		if (!uarg) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			goto out_err;</div><div class='add'>+	if ((flags &amp; MSG_ZEROCOPY) &amp;&amp; size) {</div><div class='add'>+		if (msg-&gt;msg_ubuf) {</div><div class='add'>+			uarg = msg-&gt;msg_ubuf;</div><div class='add'>+			if (sk-&gt;sk_route_caps &amp; NETIF_F_SG)</div><div class='add'>+				zc = MSG_ZEROCOPY;</div><div class='add'>+		} else if (sock_flag(sk, SOCK_ZEROCOPY)) {</div><div class='add'>+			skb = tcp_write_queue_tail(sk);</div><div class='add'>+			uarg = msg_zerocopy_realloc(sk, size, skb_zcopy(skb),</div><div class='add'>+						    !sockc_err &amp;&amp; sockc.dmabuf_id);</div><div class='add'>+			if (!uarg) {</div><div class='add'>+				err = -ENOBUFS;</div><div class='add'>+				goto out_err;</div><div class='add'>+			}</div><div class='add'>+			if (sk-&gt;sk_route_caps &amp; NETIF_F_SG)</div><div class='add'>+				zc = MSG_ZEROCOPY;</div><div class='add'>+			else</div><div class='add'>+				uarg_to_msgzc(uarg)-&gt;zerocopy = 0;</div><div class='add'>+</div><div class='add'>+			if (!sockc_err &amp;&amp; sockc.dmabuf_id) {</div><div class='add'>+				binding = net_devmem_get_binding(sk, sockc.dmabuf_id);</div><div class='add'>+				if (IS_ERR(binding)) {</div><div class='add'>+					err = PTR_ERR(binding);</div><div class='add'>+					binding = NULL;</div><div class='add'>+					goto out_err;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+	} else if (unlikely(msg-&gt;msg_flags &amp; MSG_SPLICE_PAGES) &amp;&amp; size) {</div><div class='add'>+		if (sk-&gt;sk_route_caps &amp; NETIF_F_SG)</div><div class='add'>+			zc = MSG_SPLICE_PAGES;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		zc = sk-&gt;sk_route_caps &amp; NETIF_F_SG;</div><div class='del'>-		if (!zc)</div><div class='del'>-			uarg-&gt;zerocopy = 0;</div><div class='add'>+	if (!sockc_err &amp;&amp; sockc.dmabuf_id &amp;&amp;</div><div class='add'>+	    (!(flags &amp; MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(flags &amp; MSG_FASTOPEN || inet_sk(sk)-&gt;defer_connect) &amp;&amp;</div><div class='add'>+	if (unlikely(flags &amp; MSG_FASTOPEN ||</div><div class='add'>+		     inet_test_bit(DEFER_CONNECT, sk)) &amp;&amp;</div><div class='ctx'> 	    !tp-&gt;repair) {</div><div class='del'>-		err = tcp_sendmsg_fastopen(sk, msg, &amp;copied_syn, size);</div><div class='add'>+		err = tcp_sendmsg_fastopen(sk, msg, &amp;copied_syn, size, uarg);</div><div class='ctx'> 		if (err == -EINPROGRESS &amp;&amp; copied_syn &gt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		else if (err)</div><div class='hunk'>@@ -1240,13 +1174,9 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 		/* 'common' sending to sendq */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sockcm_init(&amp;sockc, sk);</div><div class='del'>-	if (msg-&gt;msg_controllen) {</div><div class='del'>-		err = sock_cmsg_send(sk, msg, &amp;sockc);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='add'>+	if (sockc_err) {</div><div class='add'>+		err = sockc_err;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This should be in poll */</div><div class='hunk'>@@ -1269,33 +1199,36 @@ restart:</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			copy = size_goal - skb-&gt;len;</div><div class='ctx'> </div><div class='add'>+		trace_tcp_sendmsg_locked(sk, msg, skb, size_goal);</div><div class='add'>+</div><div class='ctx'> 		if (copy &lt;= 0 || !tcp_skb_can_collapse_to(skb)) {</div><div class='ctx'> 			bool first_skb;</div><div class='del'>-			int linear;</div><div class='ctx'> </div><div class='ctx'> new_segment:</div><div class='ctx'> 			if (!sk_stream_memory_free(sk))</div><div class='del'>-				goto wait_for_sndbuf;</div><div class='add'>+				goto wait_for_space;</div><div class='ctx'> </div><div class='del'>-			if (process_backlog &amp;&amp; sk_flush_backlog(sk)) {</div><div class='del'>-				process_backlog = false;</div><div class='del'>-				goto restart;</div><div class='add'>+			if (unlikely(process_backlog &gt;= 16)) {</div><div class='add'>+				process_backlog = 0;</div><div class='add'>+				if (sk_flush_backlog(sk))</div><div class='add'>+					goto restart;</div><div class='ctx'> 			}</div><div class='ctx'> 			first_skb = tcp_rtx_and_write_queues_empty(sk);</div><div class='del'>-			linear = select_size(first_skb, zc);</div><div class='del'>-			skb = sk_stream_alloc_skb(sk, linear, sk-&gt;sk_allocation,</div><div class='del'>-						  first_skb);</div><div class='add'>+			skb = tcp_stream_alloc_skb(sk, sk-&gt;sk_allocation,</div><div class='add'>+						   first_skb);</div><div class='ctx'> 			if (!skb)</div><div class='del'>-				goto wait_for_memory;</div><div class='add'>+				goto wait_for_space;</div><div class='ctx'> </div><div class='del'>-			process_backlog = true;</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='add'>+			process_backlog++;</div><div class='ctx'> </div><div class='del'>-			skb_entail(sk, skb);</div><div class='add'>+#ifdef CONFIG_SKB_DECRYPTED</div><div class='add'>+			skb-&gt;decrypted = !!(flags &amp; MSG_SENDPAGE_DECRYPTED);</div><div class='add'>+#endif</div><div class='add'>+			tcp_skb_entail(sk, skb);</div><div class='ctx'> 			copy = size_goal;</div><div class='ctx'> </div><div class='ctx'> 			/* All packets are restored as if they have</div><div class='del'>-			 * already been sent. skb_mstamp isn't set to</div><div class='add'>+			 * already been sent. skb_mstamp_ns isn't set to</div><div class='ctx'> 			 * avoid wrong rtt estimation.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (tp-&gt;repair)</div><div class='hunk'>@@ -1306,24 +1239,17 @@ new_segment:</div><div class='ctx'> 		if (copy &gt; msg_data_left(msg))</div><div class='ctx'> 			copy = msg_data_left(msg);</div><div class='ctx'> </div><div class='del'>-		/* Where to copy to? */</div><div class='del'>-		if (skb_availroom(skb) &gt; 0 &amp;&amp; !zc) {</div><div class='del'>-			/* We have some space in skb head. Superb! */</div><div class='del'>-			copy = min_t(int, copy, skb_availroom(skb));</div><div class='del'>-			err = skb_add_data_nocache(sk, skb, &amp;msg-&gt;msg_iter, copy);</div><div class='del'>-			if (err)</div><div class='del'>-				goto do_fault;</div><div class='del'>-		} else if (!zc) {</div><div class='add'>+		if (zc == 0) {</div><div class='ctx'> 			bool merge = true;</div><div class='ctx'> 			int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 			struct page_frag *pfrag = sk_page_frag(sk);</div><div class='ctx'> </div><div class='ctx'> 			if (!sk_page_frag_refill(sk, pfrag))</div><div class='del'>-				goto wait_for_memory;</div><div class='add'>+				goto wait_for_space;</div><div class='ctx'> </div><div class='ctx'> 			if (!skb_can_coalesce(skb, i, pfrag-&gt;page,</div><div class='ctx'> 					      pfrag-&gt;offset)) {</div><div class='del'>-				if (i &gt;= sysctl_max_skb_frags) {</div><div class='add'>+				if (i &gt;= READ_ONCE(net_hotdata.sysctl_max_skb_frags)) {</div><div class='ctx'> 					tcp_mark_push(tp, skb);</div><div class='ctx'> 					goto new_segment;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1332,8 +1258,15 @@ new_segment:</div><div class='ctx'> </div><div class='ctx'> 			copy = min_t(int, copy, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='ctx'> </div><div class='del'>-			if (!sk_wmem_schedule(sk, copy))</div><div class='del'>-				goto wait_for_memory;</div><div class='add'>+			if (unlikely(skb_zcopy_pure(skb) || skb_zcopy_managed(skb))) {</div><div class='add'>+				if (tcp_downgrade_zcopy_pure(sk, skb))</div><div class='add'>+					goto wait_for_space;</div><div class='add'>+				skb_zcopy_downgrade_managed(skb);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			copy = tcp_wmem_schedule(sk, copy);</div><div class='add'>+			if (!copy)</div><div class='add'>+				goto wait_for_space;</div><div class='ctx'> </div><div class='ctx'> 			err = skb_copy_to_page_nocache(sk, &amp;msg-&gt;msg_iter, skb,</div><div class='ctx'> 						       pfrag-&gt;page,</div><div class='hunk'>@@ -1351,8 +1284,21 @@ new_segment:</div><div class='ctx'> 				page_ref_inc(pfrag-&gt;page);</div><div class='ctx'> 			}</div><div class='ctx'> 			pfrag-&gt;offset += copy;</div><div class='del'>-		} else {</div><div class='del'>-			err = skb_zerocopy_iter_stream(sk, skb, msg, copy, uarg);</div><div class='add'>+		} else if (zc == MSG_ZEROCOPY)  {</div><div class='add'>+			/* First append to a fragless skb builds initial</div><div class='add'>+			 * pure zerocopy skb</div><div class='add'>+			 */</div><div class='add'>+			if (!skb-&gt;len)</div><div class='add'>+				skb_shinfo(skb)-&gt;flags |= SKBFL_PURE_ZEROCOPY;</div><div class='add'>+</div><div class='add'>+			if (!skb_zcopy_pure(skb)) {</div><div class='add'>+				copy = tcp_wmem_schedule(sk, copy);</div><div class='add'>+				if (!copy)</div><div class='add'>+					goto wait_for_space;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = skb_zerocopy_iter_stream(sk, skb, msg, copy, uarg,</div><div class='add'>+						       binding);</div><div class='ctx'> 			if (err == -EMSGSIZE || err == -EEXIST) {</div><div class='ctx'> 				tcp_mark_push(tp, skb);</div><div class='ctx'> 				goto new_segment;</div><div class='hunk'>@@ -1360,12 +1306,35 @@ new_segment:</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto do_error;</div><div class='ctx'> 			copy = err;</div><div class='add'>+		} else if (zc == MSG_SPLICE_PAGES) {</div><div class='add'>+			/* Splice in data if we can; copy if we can't. */</div><div class='add'>+			if (tcp_downgrade_zcopy_pure(sk, skb))</div><div class='add'>+				goto wait_for_space;</div><div class='add'>+			copy = tcp_wmem_schedule(sk, copy);</div><div class='add'>+			if (!copy)</div><div class='add'>+				goto wait_for_space;</div><div class='add'>+</div><div class='add'>+			err = skb_splice_from_iter(skb, &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				if (err == -EMSGSIZE) {</div><div class='add'>+					tcp_mark_push(tp, skb);</div><div class='add'>+					goto new_segment;</div><div class='add'>+				}</div><div class='add'>+				goto do_error;</div><div class='add'>+			}</div><div class='add'>+			copy = err;</div><div class='add'>+</div><div class='add'>+			if (!(flags &amp; MSG_NO_SHARED_FRAGS))</div><div class='add'>+				skb_shinfo(skb)-&gt;flags |= SKBFL_SHARED_FRAG;</div><div class='add'>+</div><div class='add'>+			sk_wmem_queued_add(sk, copy);</div><div class='add'>+			sk_mem_charge(sk, copy);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!copied)</div><div class='ctx'> 			TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_PSH;</div><div class='ctx'> </div><div class='del'>-		tp-&gt;write_seq += copy;</div><div class='add'>+		WRITE_ONCE(tp-&gt;write_seq, tp-&gt;write_seq + copy);</div><div class='ctx'> 		TCP_SKB_CB(skb)-&gt;end_seq += copy;</div><div class='ctx'> 		tcp_skb_pcount_set(skb, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1386,9 +1355,9 @@ new_segment:</div><div class='ctx'> 			tcp_push_one(sk, mss_now);</div><div class='ctx'> 		continue;</div><div class='ctx'> </div><div class='del'>-wait_for_sndbuf:</div><div class='add'>+wait_for_space:</div><div class='ctx'> 		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='del'>-wait_for_memory:</div><div class='add'>+		tcp_remove_empty_skb(sk);</div><div class='ctx'> 		if (copied)</div><div class='ctx'> 			tcp_push(sk, flags &amp; ~MSG_MORE, mss_now,</div><div class='ctx'> 				 TCP_NAGLE_PUSH, size_goal);</div><div class='hunk'>@@ -1402,35 +1371,35 @@ wait_for_memory:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (copied) {</div><div class='del'>-		tcp_tx_timestamp(sk, sockc.tsflags);</div><div class='add'>+		tcp_tx_timestamp(sk, &amp;sockc);</div><div class='ctx'> 		tcp_push(sk, flags, mss_now, tp-&gt;nonagle, size_goal);</div><div class='ctx'> 	}</div><div class='ctx'> out_nopush:</div><div class='del'>-	sock_zerocopy_put(uarg);</div><div class='add'>+	/* msg-&gt;msg_ubuf is pinned by the caller so we don't take extra refs */</div><div class='add'>+	if (uarg &amp;&amp; !msg-&gt;msg_ubuf)</div><div class='add'>+		net_zcopy_put(uarg);</div><div class='add'>+	if (binding)</div><div class='add'>+		net_devmem_dmabuf_binding_put(binding);</div><div class='ctx'> 	return copied + copied_syn;</div><div class='ctx'> </div><div class='del'>-do_fault:</div><div class='del'>-	if (!skb-&gt;len) {</div><div class='del'>-		tcp_unlink_write_queue(skb, sk);</div><div class='del'>-		/* It is the one place in all of TCP, except connection</div><div class='del'>-		 * reset, where we can be unlinking the send_head.</div><div class='del'>-		 */</div><div class='del'>-		tcp_check_send_head(sk, skb);</div><div class='del'>-		sk_wmem_free_skb(sk, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> do_error:</div><div class='add'>+	tcp_remove_empty_skb(sk);</div><div class='add'>+</div><div class='ctx'> 	if (copied + copied_syn)</div><div class='ctx'> 		goto out;</div><div class='ctx'> out_err:</div><div class='del'>-	sock_zerocopy_put_abort(uarg);</div><div class='add'>+	/* msg-&gt;msg_ubuf is pinned by the caller so we don't take extra refs */</div><div class='add'>+	if (uarg &amp;&amp; !msg-&gt;msg_ubuf)</div><div class='add'>+		net_zcopy_put_abort(uarg, true);</div><div class='ctx'> 	err = sk_stream_error(sk, flags, err);</div><div class='ctx'> 	/* make sure we wake any epoll edge trigger waiter */</div><div class='del'>-	if (unlikely(skb_queue_len(&amp;sk-&gt;sk_write_queue) == 0 &amp;&amp;</div><div class='del'>-		     err == -EAGAIN)) {</div><div class='add'>+	if (unlikely(tcp_rtx_and_write_queues_empty(sk) &amp;&amp; err == -EAGAIN)) {</div><div class='ctx'> 		sk-&gt;sk_write_space(sk);</div><div class='ctx'> 		tcp_chrono_stop(sk, TCP_CHRONO_SNDBUF_LIMITED);</div><div class='ctx'> 	}</div><div class='add'>+	if (binding)</div><div class='add'>+		net_devmem_dmabuf_binding_put(binding);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_sendmsg_locked);</div><div class='hunk'>@@ -1447,6 +1416,22 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_sendmsg);</div><div class='ctx'> </div><div class='add'>+void tcp_splice_eof(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int mss_now, size_goal;</div><div class='add'>+</div><div class='add'>+	if (!tcp_write_queue_tail(sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	mss_now = tcp_send_mss(sk, &amp;size_goal, 0);</div><div class='add'>+	tcp_push(sk, 0, mss_now, tp-&gt;nonagle, size_goal);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_splice_eof);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Handle reading urgent data. BSD has very simple semantics for</div><div class='ctx'>  *	this, no blocking and very strange errors 8)</div><div class='hunk'>@@ -1469,7 +1454,7 @@ static int tcp_recv_urg(struct sock *sk, struct msghdr *msg, int len, int flags)</div><div class='ctx'> 		char c = tp-&gt;urg_data;</div><div class='ctx'> </div><div class='ctx'> 		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			tp-&gt;urg_data = TCP_URG_READ;</div><div class='add'>+			WRITE_ONCE(tp-&gt;urg_data, TCP_URG_READ);</div><div class='ctx'> </div><div class='ctx'> 		/* Read urgent data. */</div><div class='ctx'> 		msg-&gt;msg_flags |= MSG_OOB;</div><div class='hunk'>@@ -1501,8 +1486,6 @@ static int tcp_peek_sndq(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int copied = 0, err = 0;</div><div class='ctx'> </div><div class='del'>-	/* XXX -- need to support SO_PEEK_OFF */</div><div class='del'>-</div><div class='ctx'> 	skb_rbtree_walk(skb, &amp;sk-&gt;tcp_rtx_queue) {</div><div class='ctx'> 		err = skb_copy_datagram_msg(skb, 0, msg, skb-&gt;len);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1527,23 +1510,15 @@ static int tcp_peek_sndq(struct sock *sk, struct msghdr *msg, int len)</div><div class='ctx'>  * calculation of whether or not we must ACK for the sake of</div><div class='ctx'>  * a window update.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_cleanup_rbuf(struct sock *sk, int copied)</div><div class='add'>+void __tcp_cleanup_rbuf(struct sock *sk, int copied)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	bool time_to_ack = false;</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-</div><div class='del'>-	WARN(skb &amp;&amp; !before(tp-&gt;copied_seq, TCP_SKB_CB(skb)-&gt;end_seq),</div><div class='del'>-	     "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",</div><div class='del'>-	     tp-&gt;copied_seq, TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;rcv_nxt);</div><div class='del'>-</div><div class='ctx'> 	if (inet_csk_ack_scheduled(sk)) {</div><div class='ctx'> 		const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-		   /* Delayed ACKs frequently hit locked sockets during bulk</div><div class='del'>-		    * receive. */</div><div class='del'>-		if (icsk-&gt;icsk_ack.blocked ||</div><div class='del'>-		    /* Once-per-two-segments ACK was not sent by tcp_input.c */</div><div class='add'>+</div><div class='add'>+		if (/* Once-per-two-segments ACK was not sent by tcp_input.c */</div><div class='ctx'> 		    tp-&gt;rcv_nxt - tp-&gt;rcv_wup &gt; icsk-&gt;icsk_ack.rcv_mss ||</div><div class='ctx'> 		    /*</div><div class='ctx'> 		     * If this read emptied read buffer, we send ACK, if</div><div class='hunk'>@@ -1554,7 +1529,7 @@ static void tcp_cleanup_rbuf(struct sock *sk, int copied)</div><div class='ctx'> 		    (copied &gt; 0 &amp;&amp;</div><div class='ctx'> 		     ((icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_PUSHED2) ||</div><div class='ctx'> 		      ((icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_PUSHED) &amp;&amp;</div><div class='del'>-		       !icsk-&gt;icsk_ack.pingpong)) &amp;&amp;</div><div class='add'>+		       !inet_csk_in_pingpong_mode(sk))) &amp;&amp;</div><div class='ctx'> 		      !atomic_read(&amp;sk-&gt;sk_rmem_alloc)))</div><div class='ctx'> 			time_to_ack = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1581,11 +1556,36 @@ static void tcp_cleanup_rbuf(struct sock *sk, int copied)</div><div class='ctx'> 				time_to_ack = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (time_to_ack)</div><div class='add'>+	if (time_to_ack) {</div><div class='add'>+		tcp_mstamp_refresh(tp);</div><div class='ctx'> 		tcp_send_ack(sk);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)</div><div class='add'>+void tcp_cleanup_rbuf(struct sock *sk, int copied)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	WARN(skb &amp;&amp; !before(tp-&gt;copied_seq, TCP_SKB_CB(skb)-&gt;end_seq),</div><div class='add'>+	     "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",</div><div class='add'>+	     tp-&gt;copied_seq, TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;rcv_nxt);</div><div class='add'>+	__tcp_cleanup_rbuf(sk, copied);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_eat_recv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	if (likely(skb-&gt;destructor == sock_rfree)) {</div><div class='add'>+		sock_rfree(skb);</div><div class='add'>+		skb-&gt;destructor = NULL;</div><div class='add'>+		skb-&gt;sk = NULL;</div><div class='add'>+		return skb_attempt_defer_free(skb);</div><div class='add'>+	}</div><div class='add'>+	__kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u32 offset;</div><div class='hunk'>@@ -1604,10 +1604,11 @@ static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)</div><div class='ctx'> 		 * splitted a fat GRO packet, while we released socket lock</div><div class='ctx'> 		 * in skb_splice_bits()</div><div class='ctx'> 		 */</div><div class='del'>-		sk_eat_skb(sk, skb);</div><div class='add'>+		tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(tcp_recv_skb);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This routine provides an alternative to tcp_recvmsg() for routines</div><div class='hunk'>@@ -1620,12 +1621,13 @@ static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)</div><div class='ctx'>  *	  or for 'peeking' the socket using this routine</div><div class='ctx'>  *	  (although both would be easy to implement).</div><div class='ctx'>  */</div><div class='del'>-int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='del'>-		  sk_read_actor_t recv_actor)</div><div class='add'>+static int __tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='add'>+			   sk_read_actor_t recv_actor, bool noack,</div><div class='add'>+			   u32 *copied_seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	u32 seq = tp-&gt;copied_seq;</div><div class='add'>+	u32 seq = *copied_seq;</div><div class='ctx'> 	u32 offset;</div><div class='ctx'> 	int copied = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1638,7 +1640,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='ctx'> </div><div class='ctx'> 			len = skb-&gt;len - offset;</div><div class='ctx'> 			/* Stop reading if we hit a patch of urgent data */</div><div class='del'>-			if (tp-&gt;urg_data) {</div><div class='add'>+			if (unlikely(tp-&gt;urg_data)) {</div><div class='ctx'> 				u32 urg_offset = tp-&gt;urg_seq - seq;</div><div class='ctx'> 				if (urg_offset &lt; len)</div><div class='ctx'> 					len = urg_offset;</div><div class='hunk'>@@ -1650,11 +1652,13 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='ctx'> 				if (!copied)</div><div class='ctx'> 					copied = used;</div><div class='ctx'> 				break;</div><div class='del'>-			} else if (used &lt;= len) {</div><div class='del'>-				seq += used;</div><div class='del'>-				copied += used;</div><div class='del'>-				offset += used;</div><div class='ctx'> 			}</div><div class='add'>+			if (WARN_ON_ONCE(used &gt; len))</div><div class='add'>+				used = len;</div><div class='add'>+			seq += used;</div><div class='add'>+			copied += used;</div><div class='add'>+			offset += used;</div><div class='add'>+</div><div class='ctx'> 			/* If recv_actor drops the lock (e.g. TCP splice</div><div class='ctx'> 			 * receive) the skb pointer might be invalid when</div><div class='ctx'> 			 * getting here: tcp_collapse might have deleted it</div><div class='hunk'>@@ -1670,16 +1674,19 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN) {</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='add'>+			tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 			++seq;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		sk_eat_skb(sk, skb);</div><div class='add'>+		tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 		if (!desc-&gt;count)</div><div class='ctx'> 			break;</div><div class='del'>-		tp-&gt;copied_seq = seq;</div><div class='add'>+		WRITE_ONCE(*copied_seq, seq);</div><div class='ctx'> 	}</div><div class='del'>-	tp-&gt;copied_seq = seq;</div><div class='add'>+	WRITE_ONCE(*copied_seq, seq);</div><div class='add'>+</div><div class='add'>+	if (noack)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	tcp_rcv_space_adjust(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -1688,27 +1695,112 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='ctx'> 		tcp_recv_skb(sk, seq, &amp;offset);</div><div class='ctx'> 		tcp_cleanup_rbuf(sk, copied);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,</div><div class='add'>+		  sk_read_actor_t recv_actor)</div><div class='add'>+{</div><div class='add'>+	return __tcp_read_sock(sk, desc, recv_actor, false,</div><div class='add'>+			       &amp;tcp_sk(sk)-&gt;copied_seq);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(tcp_read_sock);</div><div class='ctx'> </div><div class='add'>+int tcp_read_sock_noack(struct sock *sk, read_descriptor_t *desc,</div><div class='add'>+			sk_read_actor_t recv_actor, bool noack,</div><div class='add'>+			u32 *copied_seq)</div><div class='add'>+{</div><div class='add'>+	return __tcp_read_sock(sk, desc, recv_actor, noack, copied_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_read_skb(struct sock *sk, skb_read_actor_t recv_actor)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int copied = 0;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_peek(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='add'>+		u8 tcp_flags;</div><div class='add'>+		int used;</div><div class='add'>+</div><div class='add'>+		__skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+		WARN_ON_ONCE(!skb_set_owner_sk_safe(skb, sk));</div><div class='add'>+		tcp_flags = TCP_SKB_CB(skb)-&gt;tcp_flags;</div><div class='add'>+		used = recv_actor(sk, skb);</div><div class='add'>+		if (used &lt; 0) {</div><div class='add'>+			if (!copied)</div><div class='add'>+				copied = used;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		copied += used;</div><div class='add'>+</div><div class='add'>+		if (tcp_flags &amp; TCPHDR_FIN)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_read_skb);</div><div class='add'>+</div><div class='add'>+void tcp_read_done(struct sock *sk, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 seq = tp-&gt;copied_seq;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t left;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	left = len;</div><div class='add'>+	while (left &amp;&amp; (skb = tcp_recv_skb(sk, seq, &amp;offset)) != NULL) {</div><div class='add'>+		int used;</div><div class='add'>+</div><div class='add'>+		used = min_t(size_t, skb-&gt;len - offset, left);</div><div class='add'>+		seq += used;</div><div class='add'>+		left -= used;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;len &gt; offset + used)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN) {</div><div class='add'>+			tcp_eat_recv_skb(sk, skb);</div><div class='add'>+			++seq;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tcp_eat_recv_skb(sk, skb);</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(tp-&gt;copied_seq, seq);</div><div class='add'>+</div><div class='add'>+	tcp_rcv_space_adjust(sk);</div><div class='add'>+</div><div class='add'>+	/* Clean up data we have read: This will do ACK frames. */</div><div class='add'>+	if (left != len)</div><div class='add'>+		tcp_cleanup_rbuf(sk, len - left);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_read_done);</div><div class='add'>+</div><div class='ctx'> int tcp_peek_len(struct socket *sock)</div><div class='ctx'> {</div><div class='ctx'> 	return tcp_inq(sock-&gt;sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_peek_len);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_peek_len);</div><div class='ctx'> </div><div class='ctx'> /* Make sure sk_rcvbuf is big enough to satisfy SO_RCVLOWAT hint */</div><div class='ctx'> int tcp_set_rcvlowat(struct sock *sk, int val)</div><div class='ctx'> {</div><div class='del'>-	int cap;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int space, cap;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK)</div><div class='ctx'> 		cap = sk-&gt;sk_rcvbuf &gt;&gt; 1;</div><div class='ctx'> 	else</div><div class='del'>-		cap = sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2] &gt;&gt; 1;</div><div class='add'>+		cap = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]) &gt;&gt; 1;</div><div class='ctx'> 	val = min(val, cap);</div><div class='del'>-	sk-&gt;sk_rcvlowat = val ? : 1;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_rcvlowat, val ? : 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we need to signal EPOLLIN right now */</div><div class='ctx'> 	tcp_data_ready(sk);</div><div class='hunk'>@@ -1716,14 +1808,30 @@ int tcp_set_rcvlowat(struct sock *sk, int val)</div><div class='ctx'> 	if (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	val &lt;&lt;= 1;</div><div class='del'>-	if (val &gt; sk-&gt;sk_rcvbuf) {</div><div class='del'>-		sk-&gt;sk_rcvbuf = val;</div><div class='del'>-		tcp_sk(sk)-&gt;window_clamp = tcp_win_from_space(sk, val);</div><div class='add'>+	space = tcp_space_from_win(sk, val);</div><div class='add'>+	if (space &gt; sk-&gt;sk_rcvbuf) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_rcvbuf, space);</div><div class='add'>+</div><div class='add'>+		if (tp-&gt;window_clamp &amp;&amp; tp-&gt;window_clamp &lt; val)</div><div class='add'>+			WRITE_ONCE(tp-&gt;window_clamp, val);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_set_rcvlowat);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_set_rcvlowat);</div><div class='add'>+</div><div class='add'>+void tcp_update_recv_tstamps(struct sk_buff *skb,</div><div class='add'>+			     struct scm_timestamping_internal *tss)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;tstamp)</div><div class='add'>+		tss-&gt;ts[0] = ktime_to_timespec64(skb-&gt;tstamp);</div><div class='add'>+	else</div><div class='add'>+		tss-&gt;ts[0] = (struct timespec64) {0};</div><div class='add'>+</div><div class='add'>+	if (skb_hwtstamps(skb)-&gt;hwtstamp)</div><div class='add'>+		tss-&gt;ts[2] = ktime_to_timespec64(skb_hwtstamps(skb)-&gt;hwtstamp);</div><div class='add'>+	else</div><div class='add'>+		tss-&gt;ts[2] = (struct timespec64) {0};</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> static const struct vm_operations_struct tcp_vm_ops = {</div><div class='hunk'>@@ -1734,27 +1842,353 @@ int tcp_mmap(struct file *file, struct socket *sock,</div><div class='ctx'> {</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; (VM_WRITE | VM_EXEC))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	vma-&gt;vm_flags &amp;= ~(VM_MAYWRITE | VM_MAYEXEC);</div><div class='add'>+	vm_flags_clear(vma, VM_MAYWRITE | VM_MAYEXEC);</div><div class='ctx'> </div><div class='del'>-	/* Instruct vm_insert_page() to not down_read(mmap_sem) */</div><div class='del'>-	vma-&gt;vm_flags |= VM_MIXEDMAP;</div><div class='add'>+	/* Instruct vm_insert_page() to not mmap_read_lock(mm) */</div><div class='add'>+	vm_flags_set(vma, VM_MIXEDMAP);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_ops = &amp;tcp_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_mmap);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_mmap);</div><div class='add'>+</div><div class='add'>+static skb_frag_t *skb_advance_to_frag(struct sk_buff *skb, u32 offset_skb,</div><div class='add'>+				       u32 *offset_frag)</div><div class='add'>+{</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset_skb &gt;= skb-&gt;len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	offset_skb -= skb_headlen(skb);</div><div class='add'>+	if ((int)offset_skb &lt; 0 || skb_has_frag_list(skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	frag = skb_shinfo(skb)-&gt;frags;</div><div class='add'>+	while (offset_skb) {</div><div class='add'>+		if (skb_frag_size(frag) &gt; offset_skb) {</div><div class='add'>+			*offset_frag = offset_skb;</div><div class='add'>+			return frag;</div><div class='add'>+		}</div><div class='add'>+		offset_skb -= skb_frag_size(frag);</div><div class='add'>+		++frag;</div><div class='add'>+	}</div><div class='add'>+	*offset_frag = 0;</div><div class='add'>+	return frag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool can_map_frag(const skb_frag_t *frag)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (skb_frag_size(frag) != PAGE_SIZE || skb_frag_off(frag))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	page = skb_frag_page(frag);</div><div class='add'>+</div><div class='add'>+	if (PageCompound(page) || page-&gt;mapping)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int find_next_mappable_frag(const skb_frag_t *frag,</div><div class='add'>+				   int remaining_in_skb)</div><div class='add'>+{</div><div class='add'>+	int offset = 0;</div><div class='add'>+</div><div class='add'>+	if (likely(can_map_frag(frag)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (offset &lt; remaining_in_skb &amp;&amp; !can_map_frag(frag)) {</div><div class='add'>+		offset += skb_frag_size(frag);</div><div class='add'>+		++frag;</div><div class='add'>+	}</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_zerocopy_set_hint_for_skb(struct sock *sk,</div><div class='add'>+					  struct tcp_zerocopy_receive *zc,</div><div class='add'>+					  struct sk_buff *skb, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 frag_offset, partial_frag_remainder = 0;</div><div class='add'>+	int mappable_offset;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	/* worst case: skip to next skb. try to improve on this case below */</div><div class='add'>+	zc-&gt;recv_skip_hint = skb-&gt;len - offset;</div><div class='add'>+</div><div class='add'>+	/* Find the frag containing this offset (and how far into that frag) */</div><div class='add'>+	frag = skb_advance_to_frag(skb, offset, &amp;frag_offset);</div><div class='add'>+	if (!frag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (frag_offset) {</div><div class='add'>+		struct skb_shared_info *info = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+		/* We read part of the last frag, must recvmsg() rest of skb. */</div><div class='add'>+		if (frag == &amp;info-&gt;frags[info-&gt;nr_frags - 1])</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Else, we must at least read the remainder in this frag. */</div><div class='add'>+		partial_frag_remainder = skb_frag_size(frag) - frag_offset;</div><div class='add'>+		zc-&gt;recv_skip_hint -= partial_frag_remainder;</div><div class='add'>+		++frag;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* partial_frag_remainder: If part way through a frag, must read rest.</div><div class='add'>+	 * mappable_offset: Bytes till next mappable frag, *not* counting bytes</div><div class='add'>+	 * in partial_frag_remainder.</div><div class='add'>+	 */</div><div class='add'>+	mappable_offset = find_next_mappable_frag(frag, zc-&gt;recv_skip_hint);</div><div class='add'>+	zc-&gt;recv_skip_hint = mappable_offset + partial_frag_remainder;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			      int flags, struct scm_timestamping_internal *tss,</div><div class='add'>+			      int *cmsg_flags);</div><div class='add'>+static int receive_fallback_to_copy(struct sock *sk,</div><div class='add'>+				    struct tcp_zerocopy_receive *zc, int inq,</div><div class='add'>+				    struct scm_timestamping_internal *tss)</div><div class='add'>+{</div><div class='add'>+	unsigned long copy_address = (unsigned long)zc-&gt;copybuf_address;</div><div class='add'>+	struct msghdr msg = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	zc-&gt;length = 0;</div><div class='add'>+	zc-&gt;recv_skip_hint = 0;</div><div class='add'>+</div><div class='add'>+	if (copy_address != zc-&gt;copybuf_address)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = import_ubuf(ITER_DEST, (void __user *)copy_address, inq,</div><div class='add'>+			  &amp;msg.msg_iter);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = tcp_recvmsg_locked(sk, &amp;msg, inq, MSG_DONTWAIT,</div><div class='add'>+				 tss, &amp;zc-&gt;msg_flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	zc-&gt;copybuf_len = err;</div><div class='add'>+	if (likely(zc-&gt;copybuf_len)) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 offset;</div><div class='add'>+</div><div class='add'>+		skb = tcp_recv_skb(sk, tcp_sk(sk)-&gt;copied_seq, &amp;offset);</div><div class='add'>+		if (skb)</div><div class='add'>+			tcp_zerocopy_set_hint_for_skb(sk, zc, skb, offset);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_copy_straggler_data(struct tcp_zerocopy_receive *zc,</div><div class='add'>+				   struct sk_buff *skb, u32 copylen,</div><div class='add'>+				   u32 *offset, u32 *seq)</div><div class='add'>+{</div><div class='add'>+	unsigned long copy_address = (unsigned long)zc-&gt;copybuf_address;</div><div class='add'>+	struct msghdr msg = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (copy_address != zc-&gt;copybuf_address)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = import_ubuf(ITER_DEST, (void __user *)copy_address, copylen,</div><div class='add'>+			  &amp;msg.msg_iter);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = skb_copy_datagram_msg(skb, *offset, &amp;msg, copylen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	zc-&gt;recv_skip_hint -= copylen;</div><div class='add'>+	*offset += copylen;</div><div class='add'>+	*seq += copylen;</div><div class='add'>+	return (__s32)copylen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_zc_handle_leftover(struct tcp_zerocopy_receive *zc,</div><div class='add'>+				  struct sock *sk,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  u32 *seq,</div><div class='add'>+				  s32 copybuf_len,</div><div class='add'>+				  struct scm_timestamping_internal *tss)</div><div class='add'>+{</div><div class='add'>+	u32 offset, copylen = min_t(u32, copybuf_len, zc-&gt;recv_skip_hint);</div><div class='add'>+</div><div class='add'>+	if (!copylen)</div><div class='add'>+		return 0;</div><div class='add'>+	/* skb is null if inq &lt; PAGE_SIZE. */</div><div class='add'>+	if (skb) {</div><div class='add'>+		offset = *seq - TCP_SKB_CB(skb)-&gt;seq;</div><div class='add'>+	} else {</div><div class='add'>+		skb = tcp_recv_skb(sk, *seq, &amp;offset);</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;has_rxtstamp) {</div><div class='add'>+			tcp_update_recv_tstamps(skb, tss);</div><div class='add'>+			zc-&gt;msg_flags |= TCP_CMSG_TS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	zc-&gt;copybuf_len = tcp_copy_straggler_data(zc, skb, copylen, &amp;offset,</div><div class='add'>+						  seq);</div><div class='add'>+	return zc-&gt;copybuf_len &lt; 0 ? 0 : copylen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_zerocopy_vm_insert_batch_error(struct vm_area_struct *vma,</div><div class='add'>+					      struct page **pending_pages,</div><div class='add'>+					      unsigned long pages_remaining,</div><div class='add'>+					      unsigned long *address,</div><div class='add'>+					      u32 *length,</div><div class='add'>+					      u32 *seq,</div><div class='add'>+					      struct tcp_zerocopy_receive *zc,</div><div class='add'>+					      u32 total_bytes_to_map,</div><div class='add'>+					      int err)</div><div class='add'>+{</div><div class='add'>+	/* At least one page did not map. Try zapping if we skipped earlier. */</div><div class='add'>+	if (err == -EBUSY &amp;&amp;</div><div class='add'>+	    zc-&gt;flags &amp; TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT) {</div><div class='add'>+		u32 maybe_zap_len;</div><div class='add'>+</div><div class='add'>+		maybe_zap_len = total_bytes_to_map -  /* All bytes to map */</div><div class='add'>+				*length + /* Mapped or pending */</div><div class='add'>+				(pages_remaining * PAGE_SIZE); /* Failed map. */</div><div class='add'>+		zap_page_range_single(vma, *address, maybe_zap_len, NULL);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		unsigned long leftover_pages = pages_remaining;</div><div class='add'>+		int bytes_mapped;</div><div class='add'>+</div><div class='add'>+		/* We called zap_page_range_single, try to reinsert. */</div><div class='add'>+		err = vm_insert_pages(vma, *address,</div><div class='add'>+				      pending_pages,</div><div class='add'>+				      &amp;pages_remaining);</div><div class='add'>+		bytes_mapped = PAGE_SIZE * (leftover_pages - pages_remaining);</div><div class='add'>+		*seq += bytes_mapped;</div><div class='add'>+		*address += bytes_mapped;</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Either we were unable to zap, OR we zapped, retried an</div><div class='add'>+		 * insert, and still had an issue. Either ways, pages_remaining</div><div class='add'>+		 * is the number of pages we were unable to map, and we unroll</div><div class='add'>+		 * some state we speculatively touched before.</div><div class='add'>+		 */</div><div class='add'>+		const int bytes_not_mapped = PAGE_SIZE * pages_remaining;</div><div class='add'>+</div><div class='add'>+		*length -= bytes_not_mapped;</div><div class='add'>+		zc-&gt;recv_skip_hint += bytes_not_mapped;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_zerocopy_vm_insert_batch(struct vm_area_struct *vma,</div><div class='add'>+					struct page **pages,</div><div class='add'>+					unsigned int pages_to_map,</div><div class='add'>+					unsigned long *address,</div><div class='add'>+					u32 *length,</div><div class='add'>+					u32 *seq,</div><div class='add'>+					struct tcp_zerocopy_receive *zc,</div><div class='add'>+					u32 total_bytes_to_map)</div><div class='add'>+{</div><div class='add'>+	unsigned long pages_remaining = pages_to_map;</div><div class='add'>+	unsigned int pages_mapped;</div><div class='add'>+	unsigned int bytes_mapped;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vm_insert_pages(vma, *address, pages, &amp;pages_remaining);</div><div class='add'>+	pages_mapped = pages_to_map - (unsigned int)pages_remaining;</div><div class='add'>+	bytes_mapped = PAGE_SIZE * pages_mapped;</div><div class='add'>+	/* Even if vm_insert_pages fails, it may have partially succeeded in</div><div class='add'>+	 * mapping (some but not all of the pages).</div><div class='add'>+	 */</div><div class='add'>+	*seq += bytes_mapped;</div><div class='add'>+	*address += bytes_mapped;</div><div class='add'>+</div><div class='add'>+	if (likely(!err))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Error: maybe zap and retry + rollback state for failed inserts. */</div><div class='add'>+	return tcp_zerocopy_vm_insert_batch_error(vma, pages + pages_mapped,</div><div class='add'>+		pages_remaining, address, length, seq, zc, total_bytes_to_map,</div><div class='add'>+		err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TCP_VALID_ZC_MSG_FLAGS   (TCP_CMSG_TS)</div><div class='add'>+static void tcp_zc_finalize_rx_tstamp(struct sock *sk,</div><div class='add'>+				      struct tcp_zerocopy_receive *zc,</div><div class='add'>+				      struct scm_timestamping_internal *tss)</div><div class='add'>+{</div><div class='add'>+	unsigned long msg_control_addr;</div><div class='add'>+	struct msghdr cmsg_dummy;</div><div class='add'>+</div><div class='add'>+	msg_control_addr = (unsigned long)zc-&gt;msg_control;</div><div class='add'>+	cmsg_dummy.msg_control_user = (void __user *)msg_control_addr;</div><div class='add'>+	cmsg_dummy.msg_controllen =</div><div class='add'>+		(__kernel_size_t)zc-&gt;msg_controllen;</div><div class='add'>+	cmsg_dummy.msg_flags = in_compat_syscall()</div><div class='add'>+		? MSG_CMSG_COMPAT : 0;</div><div class='add'>+	cmsg_dummy.msg_control_is_user = true;</div><div class='add'>+	zc-&gt;msg_flags = 0;</div><div class='add'>+	if (zc-&gt;msg_control == msg_control_addr &amp;&amp;</div><div class='add'>+	    zc-&gt;msg_controllen == cmsg_dummy.msg_controllen) {</div><div class='add'>+		tcp_recv_timestamp(&amp;cmsg_dummy, sk, tss);</div><div class='add'>+		zc-&gt;msg_control = (__u64)</div><div class='add'>+			((uintptr_t)cmsg_dummy.msg_control_user);</div><div class='add'>+		zc-&gt;msg_controllen =</div><div class='add'>+			(__u64)cmsg_dummy.msg_controllen;</div><div class='add'>+		zc-&gt;msg_flags = (__u32)cmsg_dummy.msg_flags;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static struct vm_area_struct *find_tcp_vma(struct mm_struct *mm,</div><div class='add'>+					   unsigned long address,</div><div class='add'>+					   bool *mmap_locked)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma = lock_vma_under_rcu(mm, address);</div><div class='add'>+</div><div class='add'>+	if (vma) {</div><div class='add'>+		if (vma-&gt;vm_ops != &amp;tcp_vm_ops) {</div><div class='add'>+			vma_end_read(vma);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		*mmap_locked = false;</div><div class='add'>+		return vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmap_read_lock(mm);</div><div class='add'>+	vma = vma_lookup(mm, address);</div><div class='add'>+	if (!vma || vma-&gt;vm_ops != &amp;tcp_vm_ops) {</div><div class='add'>+		mmap_read_unlock(mm);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	*mmap_locked = true;</div><div class='add'>+	return vma;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TCP_ZEROCOPY_PAGE_BATCH_SIZE 32</div><div class='ctx'> static int tcp_zerocopy_receive(struct sock *sk,</div><div class='del'>-				struct tcp_zerocopy_receive *zc)</div><div class='add'>+				struct tcp_zerocopy_receive *zc,</div><div class='add'>+				struct scm_timestamping_internal *tss)</div><div class='ctx'> {</div><div class='add'>+	u32 length = 0, offset, vma_len, avail_len, copylen = 0;</div><div class='ctx'> 	unsigned long address = (unsigned long)zc-&gt;address;</div><div class='add'>+	struct page *pages[TCP_ZEROCOPY_PAGE_BATCH_SIZE];</div><div class='add'>+	s32 copybuf_len = zc-&gt;copybuf_len;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	const skb_frag_t *frags = NULL;</div><div class='del'>-	u32 length = 0, seq, offset;</div><div class='add'>+	unsigned int pages_to_map = 0;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	struct tcp_sock *tp;</div><div class='add'>+	u32 seq = tp-&gt;copied_seq;</div><div class='add'>+	u32 total_bytes_to_map;</div><div class='add'>+	int inq = tcp_inq(sk);</div><div class='add'>+	bool mmap_locked;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	zc-&gt;copybuf_len = 0;</div><div class='add'>+	zc-&gt;msg_flags = 0;</div><div class='add'>+</div><div class='ctx'> 	if (address &amp; (PAGE_SIZE - 1) || address != zc-&gt;address)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1763,64 +2197,115 @@ static int tcp_zerocopy_receive(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	sock_rps_record_flow(sk);</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+	if (inq &amp;&amp; inq &lt;= copybuf_len)</div><div class='add'>+		return receive_fallback_to_copy(sk, zc, inq, tss);</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	vma = find_vma(current-&gt;mm, address);</div><div class='del'>-	if (!vma || vma-&gt;vm_start &gt; address || vma-&gt;vm_ops != &amp;tcp_vm_ops)</div><div class='del'>-		goto out;</div><div class='del'>-	zc-&gt;length = min_t(unsigned long, zc-&gt;length, vma-&gt;vm_end - address);</div><div class='del'>-</div><div class='del'>-	tp = tcp_sk(sk);</div><div class='del'>-	seq = tp-&gt;copied_seq;</div><div class='del'>-	zc-&gt;length = min_t(u32, zc-&gt;length, tcp_inq(sk));</div><div class='del'>-	zc-&gt;length &amp;= ~(PAGE_SIZE - 1);</div><div class='add'>+	if (inq &lt; PAGE_SIZE) {</div><div class='add'>+		zc-&gt;length = 0;</div><div class='add'>+		zc-&gt;recv_skip_hint = inq;</div><div class='add'>+		if (!inq &amp;&amp; sock_flag(sk, SOCK_DONE))</div><div class='add'>+			return -EIO;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	zap_page_range(vma, address, zc-&gt;length);</div><div class='add'>+	vma = find_tcp_vma(current-&gt;mm, address, &amp;mmap_locked);</div><div class='add'>+	if (!vma)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	zc-&gt;recv_skip_hint = 0;</div><div class='add'>+	vma_len = min_t(unsigned long, zc-&gt;length, vma-&gt;vm_end - address);</div><div class='add'>+	avail_len = min_t(u32, vma_len, inq);</div><div class='add'>+	total_bytes_to_map = avail_len &amp; ~(PAGE_SIZE - 1);</div><div class='add'>+	if (total_bytes_to_map) {</div><div class='add'>+		if (!(zc-&gt;flags &amp; TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT))</div><div class='add'>+			zap_page_range_single(vma, address, total_bytes_to_map,</div><div class='add'>+					      NULL);</div><div class='add'>+		zc-&gt;length = total_bytes_to_map;</div><div class='add'>+		zc-&gt;recv_skip_hint = 0;</div><div class='add'>+	} else {</div><div class='add'>+		zc-&gt;length = avail_len;</div><div class='add'>+		zc-&gt;recv_skip_hint = avail_len;</div><div class='add'>+	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	while (length + PAGE_SIZE &lt;= zc-&gt;length) {</div><div class='add'>+		int mappable_offset;</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='ctx'> 		if (zc-&gt;recv_skip_hint &lt; PAGE_SIZE) {</div><div class='add'>+			u32 offset_frag;</div><div class='add'>+</div><div class='ctx'> 			if (skb) {</div><div class='add'>+				if (zc-&gt;recv_skip_hint &gt; 0)</div><div class='add'>+					break;</div><div class='ctx'> 				skb = skb-&gt;next;</div><div class='ctx'> 				offset = seq - TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				skb = tcp_recv_skb(sk, seq, &amp;offset);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			zc-&gt;recv_skip_hint = skb-&gt;len - offset;</div><div class='del'>-			offset -= skb_headlen(skb);</div><div class='del'>-			if ((int)offset &lt; 0 || skb_has_frag_list(skb))</div><div class='add'>+			if (!skb_frags_readable(skb))</div><div class='ctx'> 				break;</div><div class='del'>-			frags = skb_shinfo(skb)-&gt;frags;</div><div class='del'>-			while (offset) {</div><div class='del'>-				if (frags-&gt;size &gt; offset)</div><div class='del'>-					goto out;</div><div class='del'>-				offset -= frags-&gt;size;</div><div class='del'>-				frags++;</div><div class='add'>+</div><div class='add'>+			if (TCP_SKB_CB(skb)-&gt;has_rxtstamp) {</div><div class='add'>+				tcp_update_recv_tstamps(skb, tss);</div><div class='add'>+				zc-&gt;msg_flags |= TCP_CMSG_TS;</div><div class='ctx'> 			}</div><div class='add'>+			zc-&gt;recv_skip_hint = skb-&gt;len - offset;</div><div class='add'>+			frags = skb_advance_to_frag(skb, offset, &amp;offset_frag);</div><div class='add'>+			if (!frags || offset_frag)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (frags-&gt;size != PAGE_SIZE || frags-&gt;page_offset)</div><div class='add'>+</div><div class='add'>+		mappable_offset = find_next_mappable_frag(frags,</div><div class='add'>+							  zc-&gt;recv_skip_hint);</div><div class='add'>+		if (mappable_offset) {</div><div class='add'>+			zc-&gt;recv_skip_hint = mappable_offset;</div><div class='ctx'> 			break;</div><div class='del'>-		ret = vm_insert_page(vma, address + length,</div><div class='del'>-				     skb_frag_page(frags));</div><div class='del'>-		if (ret)</div><div class='add'>+		}</div><div class='add'>+		page = skb_frag_page(frags);</div><div class='add'>+		if (WARN_ON_ONCE(!page))</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='add'>+		prefetchw(page);</div><div class='add'>+		pages[pages_to_map++] = page;</div><div class='ctx'> 		length += PAGE_SIZE;</div><div class='del'>-		seq += PAGE_SIZE;</div><div class='ctx'> 		zc-&gt;recv_skip_hint -= PAGE_SIZE;</div><div class='ctx'> 		frags++;</div><div class='add'>+		if (pages_to_map == TCP_ZEROCOPY_PAGE_BATCH_SIZE ||</div><div class='add'>+		    zc-&gt;recv_skip_hint &lt; PAGE_SIZE) {</div><div class='add'>+			/* Either full batch, or we're about to go to next skb</div><div class='add'>+			 * (and we cannot unroll failed ops across skbs).</div><div class='add'>+			 */</div><div class='add'>+			ret = tcp_zerocopy_vm_insert_batch(vma, pages,</div><div class='add'>+							   pages_to_map,</div><div class='add'>+							   &amp;address, &amp;length,</div><div class='add'>+							   &amp;seq, zc,</div><div class='add'>+							   total_bytes_to_map);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+			pages_to_map = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (pages_to_map) {</div><div class='add'>+		ret = tcp_zerocopy_vm_insert_batch(vma, pages, pages_to_map,</div><div class='add'>+						   &amp;address, &amp;length, &amp;seq,</div><div class='add'>+						   zc, total_bytes_to_map);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	if (length) {</div><div class='del'>-		tp-&gt;copied_seq = seq;</div><div class='add'>+	if (mmap_locked)</div><div class='add'>+		mmap_read_unlock(current-&gt;mm);</div><div class='add'>+	else</div><div class='add'>+		vma_end_read(vma);</div><div class='add'>+	/* Try to copy straggler data. */</div><div class='add'>+	if (!ret)</div><div class='add'>+		copylen = tcp_zc_handle_leftover(zc, sk, skb, &amp;seq, copybuf_len, tss);</div><div class='add'>+</div><div class='add'>+	if (length + copylen) {</div><div class='add'>+		WRITE_ONCE(tp-&gt;copied_seq, seq);</div><div class='ctx'> 		tcp_rcv_space_adjust(sk);</div><div class='ctx'> </div><div class='ctx'> 		/* Clean up data we have read: This will do ACK frames. */</div><div class='ctx'> 		tcp_recv_skb(sk, seq, &amp;offset);</div><div class='del'>-		tcp_cleanup_rbuf(sk, length);</div><div class='add'>+		tcp_cleanup_rbuf(sk, length + copylen);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (length == zc-&gt;length)</div><div class='ctx'> 			zc-&gt;recv_skip_hint = 0;</div><div class='hunk'>@@ -1833,58 +2318,74 @@ out:</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void tcp_update_recv_tstamps(struct sk_buff *skb,</div><div class='del'>-				    struct scm_timestamping *tss)</div><div class='del'>-{</div><div class='del'>-	if (skb-&gt;tstamp)</div><div class='del'>-		tss-&gt;ts[0] = ktime_to_timespec(skb-&gt;tstamp);</div><div class='del'>-	else</div><div class='del'>-		tss-&gt;ts[0] = (struct timespec) {0};</div><div class='del'>-</div><div class='del'>-	if (skb_hwtstamps(skb)-&gt;hwtstamp)</div><div class='del'>-		tss-&gt;ts[2] = ktime_to_timespec(skb_hwtstamps(skb)-&gt;hwtstamp);</div><div class='del'>-	else</div><div class='del'>-		tss-&gt;ts[2] = (struct timespec) {0};</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Similar to __sock_recv_timestamp, but does not require an skb */</div><div class='del'>-static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,</div><div class='del'>-			       struct scm_timestamping *tss)</div><div class='add'>+void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,</div><div class='add'>+			struct scm_timestamping_internal *tss)</div><div class='ctx'> {</div><div class='del'>-	struct timeval tv;</div><div class='add'>+	int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);</div><div class='add'>+	u32 tsflags = READ_ONCE(sk-&gt;sk_tsflags);</div><div class='ctx'> 	bool has_timestamping = false;</div><div class='ctx'> </div><div class='ctx'> 	if (tss-&gt;ts[0].tv_sec || tss-&gt;ts[0].tv_nsec) {</div><div class='ctx'> 		if (sock_flag(sk, SOCK_RCVTSTAMP)) {</div><div class='ctx'> 			if (sock_flag(sk, SOCK_RCVTSTAMPNS)) {</div><div class='del'>-				put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPNS,</div><div class='del'>-					 sizeof(tss-&gt;ts[0]), &amp;tss-&gt;ts[0]);</div><div class='add'>+				if (new_tstamp) {</div><div class='add'>+					struct __kernel_timespec kts = {</div><div class='add'>+						.tv_sec = tss-&gt;ts[0].tv_sec,</div><div class='add'>+						.tv_nsec = tss-&gt;ts[0].tv_nsec,</div><div class='add'>+					};</div><div class='add'>+					put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_NEW,</div><div class='add'>+						 sizeof(kts), &amp;kts);</div><div class='add'>+				} else {</div><div class='add'>+					struct __kernel_old_timespec ts_old = {</div><div class='add'>+						.tv_sec = tss-&gt;ts[0].tv_sec,</div><div class='add'>+						.tv_nsec = tss-&gt;ts[0].tv_nsec,</div><div class='add'>+					};</div><div class='add'>+					put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD,</div><div class='add'>+						 sizeof(ts_old), &amp;ts_old);</div><div class='add'>+				}</div><div class='ctx'> 			} else {</div><div class='del'>-				tv.tv_sec = tss-&gt;ts[0].tv_sec;</div><div class='del'>-				tv.tv_usec = tss-&gt;ts[0].tv_nsec / 1000;</div><div class='del'>-</div><div class='del'>-				put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,</div><div class='del'>-					 sizeof(tv), &amp;tv);</div><div class='add'>+				if (new_tstamp) {</div><div class='add'>+					struct __kernel_sock_timeval stv = {</div><div class='add'>+						.tv_sec = tss-&gt;ts[0].tv_sec,</div><div class='add'>+						.tv_usec = tss-&gt;ts[0].tv_nsec / 1000,</div><div class='add'>+					};</div><div class='add'>+					put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_NEW,</div><div class='add'>+						 sizeof(stv), &amp;stv);</div><div class='add'>+				} else {</div><div class='add'>+					struct __kernel_old_timeval tv = {</div><div class='add'>+						.tv_sec = tss-&gt;ts[0].tv_sec,</div><div class='add'>+						.tv_usec = tss-&gt;ts[0].tv_nsec / 1000,</div><div class='add'>+					};</div><div class='add'>+					put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,</div><div class='add'>+						 sizeof(tv), &amp;tv);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_SOFTWARE)</div><div class='add'>+		if (tsflags &amp; SOF_TIMESTAMPING_SOFTWARE &amp;&amp;</div><div class='add'>+		    (tsflags &amp; SOF_TIMESTAMPING_RX_SOFTWARE ||</div><div class='add'>+		     !(tsflags &amp; SOF_TIMESTAMPING_OPT_RX_FILTER)))</div><div class='ctx'> 			has_timestamping = true;</div><div class='ctx'> 		else</div><div class='del'>-			tss-&gt;ts[0] = (struct timespec) {0};</div><div class='add'>+			tss-&gt;ts[0] = (struct timespec64) {0};</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tss-&gt;ts[2].tv_sec || tss-&gt;ts[2].tv_nsec) {</div><div class='del'>-		if (sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_RAW_HARDWARE)</div><div class='add'>+		if (tsflags &amp; SOF_TIMESTAMPING_RAW_HARDWARE &amp;&amp;</div><div class='add'>+		    (tsflags &amp; SOF_TIMESTAMPING_RX_HARDWARE ||</div><div class='add'>+		     !(tsflags &amp; SOF_TIMESTAMPING_OPT_RX_FILTER)))</div><div class='ctx'> 			has_timestamping = true;</div><div class='ctx'> 		else</div><div class='del'>-			tss-&gt;ts[2] = (struct timespec) {0};</div><div class='add'>+			tss-&gt;ts[2] = (struct timespec64) {0};</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (has_timestamping) {</div><div class='del'>-		tss-&gt;ts[1] = (struct timespec) {0};</div><div class='del'>-		put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING,</div><div class='del'>-			 sizeof(*tss), tss);</div><div class='add'>+		tss-&gt;ts[1] = (struct timespec64) {0};</div><div class='add'>+		if (sock_flag(sk, SOCK_TSTAMP_NEW))</div><div class='add'>+			put_cmsg_scm_timestamping64(msg, tss);</div><div class='add'>+		else</div><div class='add'>+			put_cmsg_scm_timestamping(msg, tss);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1901,9 +2402,227 @@ static int tcp_inq_hint(struct sock *sk)</div><div class='ctx'> 		inq = tp-&gt;rcv_nxt - tp-&gt;copied_seq;</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> 	}</div><div class='add'>+	/* After receiving a FIN, tell the user-space to continue reading</div><div class='add'>+	 * by returning a non-zero inq.</div><div class='add'>+	 */</div><div class='add'>+	if (inq == 0 &amp;&amp; sock_flag(sk, SOCK_DONE))</div><div class='add'>+		inq = 1;</div><div class='ctx'> 	return inq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* batch __xa_alloc() calls and reduce xa_lock()/xa_unlock() overhead. */</div><div class='add'>+struct tcp_xa_pool {</div><div class='add'>+	u8		max; /* max &lt;= MAX_SKB_FRAGS */</div><div class='add'>+	u8		idx; /* idx &lt;= max */</div><div class='add'>+	__u32		tokens[MAX_SKB_FRAGS];</div><div class='add'>+	netmem_ref	netmems[MAX_SKB_FRAGS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void tcp_xa_pool_commit_locked(struct sock *sk, struct tcp_xa_pool *p)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Commit part that has been copied to user space. */</div><div class='add'>+	for (i = 0; i &lt; p-&gt;idx; i++)</div><div class='add'>+		__xa_cmpxchg(&amp;sk-&gt;sk_user_frags, p-&gt;tokens[i], XA_ZERO_ENTRY,</div><div class='add'>+			     (__force void *)p-&gt;netmems[i], GFP_KERNEL);</div><div class='add'>+	/* Rollback what has been pre-allocated and is no longer needed. */</div><div class='add'>+	for (; i &lt; p-&gt;max; i++)</div><div class='add'>+		__xa_erase(&amp;sk-&gt;sk_user_frags, p-&gt;tokens[i]);</div><div class='add'>+</div><div class='add'>+	p-&gt;max = 0;</div><div class='add'>+	p-&gt;idx = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_xa_pool_commit(struct sock *sk, struct tcp_xa_pool *p)</div><div class='add'>+{</div><div class='add'>+	if (!p-&gt;max)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xa_lock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+</div><div class='add'>+	tcp_xa_pool_commit_locked(sk, p);</div><div class='add'>+</div><div class='add'>+	xa_unlock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_xa_pool_refill(struct sock *sk, struct tcp_xa_pool *p,</div><div class='add'>+			      unsigned int max_frags)</div><div class='add'>+{</div><div class='add'>+	int err, k;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;idx &lt; p-&gt;max)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	xa_lock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+</div><div class='add'>+	tcp_xa_pool_commit_locked(sk, p);</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; max_frags; k++) {</div><div class='add'>+		err = __xa_alloc(&amp;sk-&gt;sk_user_frags, &amp;p-&gt;tokens[k],</div><div class='add'>+				 XA_ZERO_ENTRY, xa_limit_31b, GFP_KERNEL);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xa_unlock_bh(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+</div><div class='add'>+	p-&gt;max = k;</div><div class='add'>+	p-&gt;idx = 0;</div><div class='add'>+	return k ? 0 : err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On error, returns the -errno. On success, returns number of bytes sent to the</div><div class='add'>+ * user. May not consume all of @remaining_len.</div><div class='add'>+ */</div><div class='add'>+static int tcp_recvmsg_dmabuf(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+			      unsigned int offset, struct msghdr *msg,</div><div class='add'>+			      int remaining_len)</div><div class='add'>+{</div><div class='add'>+	struct dmabuf_cmsg dmabuf_cmsg = { 0 };</div><div class='add'>+	struct tcp_xa_pool tcp_xa_pool;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	int i, copy, n;</div><div class='add'>+	int sent = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	tcp_xa_pool.max = 0;</div><div class='add'>+	tcp_xa_pool.idx = 0;</div><div class='add'>+	do {</div><div class='add'>+		start = skb_headlen(skb);</div><div class='add'>+</div><div class='add'>+		if (skb_frags_readable(skb)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Copy header. */</div><div class='add'>+		copy = start - offset;</div><div class='add'>+		if (copy &gt; 0) {</div><div class='add'>+			copy = min(copy, remaining_len);</div><div class='add'>+</div><div class='add'>+			n = copy_to_iter(skb-&gt;data + offset, copy,</div><div class='add'>+					 &amp;msg-&gt;msg_iter);</div><div class='add'>+			if (n != copy) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			offset += copy;</div><div class='add'>+			remaining_len -= copy;</div><div class='add'>+</div><div class='add'>+			/* First a dmabuf_cmsg for # bytes copied to user</div><div class='add'>+			 * buffer.</div><div class='add'>+			 */</div><div class='add'>+			memset(&amp;dmabuf_cmsg, 0, sizeof(dmabuf_cmsg));</div><div class='add'>+			dmabuf_cmsg.frag_size = copy;</div><div class='add'>+			err = put_cmsg_notrunc(msg, SOL_SOCKET,</div><div class='add'>+					       SO_DEVMEM_LINEAR,</div><div class='add'>+					       sizeof(dmabuf_cmsg),</div><div class='add'>+					       &amp;dmabuf_cmsg);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			sent += copy;</div><div class='add'>+</div><div class='add'>+			if (remaining_len == 0)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* after that, send information of dmabuf pages through a</div><div class='add'>+		 * sequence of cmsg</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+			struct net_iov *niov;</div><div class='add'>+			u64 frag_offset;</div><div class='add'>+			int end;</div><div class='add'>+</div><div class='add'>+			/* !skb_frags_readable() should indicate that ALL the</div><div class='add'>+			 * frags in this skb are dmabuf net_iovs. We're checking</div><div class='add'>+			 * for that flag above, but also check individual frags</div><div class='add'>+			 * here. If the tcp stack is not setting</div><div class='add'>+			 * skb_frags_readable() correctly, we still don't want</div><div class='add'>+			 * to crash here.</div><div class='add'>+			 */</div><div class='add'>+			if (!skb_frag_net_iov(frag)) {</div><div class='add'>+				net_err_ratelimited("Found non-dmabuf skb with net_iov");</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			niov = skb_frag_net_iov(frag);</div><div class='add'>+			if (!net_is_devmem_iov(niov)) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			end = start + skb_frag_size(frag);</div><div class='add'>+			copy = end - offset;</div><div class='add'>+</div><div class='add'>+			if (copy &gt; 0) {</div><div class='add'>+				copy = min(copy, remaining_len);</div><div class='add'>+</div><div class='add'>+				frag_offset = net_iov_virtual_addr(niov) +</div><div class='add'>+					      skb_frag_off(frag) + offset -</div><div class='add'>+					      start;</div><div class='add'>+				dmabuf_cmsg.frag_offset = frag_offset;</div><div class='add'>+				dmabuf_cmsg.frag_size = copy;</div><div class='add'>+				err = tcp_xa_pool_refill(sk, &amp;tcp_xa_pool,</div><div class='add'>+							 skb_shinfo(skb)-&gt;nr_frags - i);</div><div class='add'>+				if (err)</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				/* Will perform the exchange later */</div><div class='add'>+				dmabuf_cmsg.frag_token = tcp_xa_pool.tokens[tcp_xa_pool.idx];</div><div class='add'>+				dmabuf_cmsg.dmabuf_id = net_devmem_iov_binding_id(niov);</div><div class='add'>+</div><div class='add'>+				offset += copy;</div><div class='add'>+				remaining_len -= copy;</div><div class='add'>+</div><div class='add'>+				err = put_cmsg_notrunc(msg, SOL_SOCKET,</div><div class='add'>+						       SO_DEVMEM_DMABUF,</div><div class='add'>+						       sizeof(dmabuf_cmsg),</div><div class='add'>+						       &amp;dmabuf_cmsg);</div><div class='add'>+				if (err)</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+				atomic_long_inc(&amp;niov-&gt;desc.pp_ref_count);</div><div class='add'>+				tcp_xa_pool.netmems[tcp_xa_pool.idx++] = skb_frag_netmem(frag);</div><div class='add'>+</div><div class='add'>+				sent += copy;</div><div class='add'>+</div><div class='add'>+				if (remaining_len == 0)</div><div class='add'>+					goto out;</div><div class='add'>+			}</div><div class='add'>+			start = end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tcp_xa_pool_commit(sk, &amp;tcp_xa_pool);</div><div class='add'>+		if (!remaining_len)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* if remaining_len is not satisfied yet, we need to go to the</div><div class='add'>+		 * next frag in the frag_list to satisfy remaining_len.</div><div class='add'>+		 */</div><div class='add'>+		skb = skb_shinfo(skb)-&gt;frag_list ?: skb-&gt;next;</div><div class='add'>+</div><div class='add'>+		offset = offset - start;</div><div class='add'>+	} while (skb);</div><div class='add'>+</div><div class='add'>+	if (remaining_len) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	tcp_xa_pool_commit(sk, &amp;tcp_xa_pool);</div><div class='add'>+	if (!sent)</div><div class='add'>+		sent = err;</div><div class='add'>+</div><div class='add'>+	return sent;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	This routine copies from a sock struct into the user buffer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1912,38 +2631,32 @@ static int tcp_inq_hint(struct sock *sk)</div><div class='ctx'>  *	Probably, code can be easily improved even more.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='del'>-		int flags, int *addr_len)</div><div class='add'>+static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			      int flags, struct scm_timestamping_internal *tss,</div><div class='add'>+			      int *cmsg_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int last_copied_dmabuf = -1; /* uninitialized */</div><div class='ctx'> 	int copied = 0;</div><div class='ctx'> 	u32 peek_seq;</div><div class='ctx'> 	u32 *seq;</div><div class='ctx'> 	unsigned long used;</div><div class='del'>-	int err, inq;</div><div class='add'>+	int err;</div><div class='ctx'> 	int target;		/* Read at least this many bytes */</div><div class='ctx'> 	long timeo;</div><div class='ctx'> 	struct sk_buff *skb, *last;</div><div class='add'>+	u32 peek_offset = 0;</div><div class='ctx'> 	u32 urg_hole = 0;</div><div class='del'>-	struct scm_timestamping tss;</div><div class='del'>-	bool has_tss = false;</div><div class='del'>-	bool has_cmsg;</div><div class='del'>-</div><div class='del'>-	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='del'>-		return inet_recv_error(sk, msg, len, addr_len);</div><div class='del'>-</div><div class='del'>-	if (sk_can_busy_loop(sk) &amp;&amp; skb_queue_empty(&amp;sk-&gt;sk_receive_queue) &amp;&amp;</div><div class='del'>-	    (sk-&gt;sk_state == TCP_ESTABLISHED))</div><div class='del'>-		sk_busy_loop(sk, nonblock);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOTCONN;</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	has_cmsg = tp-&gt;recvmsg_inq;</div><div class='del'>-	timeo = sock_rcvtimeo(sk, nonblock);</div><div class='add'>+	if (tp-&gt;recvmsg_inq) {</div><div class='add'>+		*cmsg_flags = TCP_CMSG_INQ;</div><div class='add'>+		msg-&gt;msg_get_inq = 1;</div><div class='add'>+	}</div><div class='add'>+	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='ctx'> </div><div class='ctx'> 	/* Urgent data needs to be handled specially. */</div><div class='ctx'> 	if (flags &amp; MSG_OOB)</div><div class='hunk'>@@ -1966,7 +2679,8 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='ctx'> </div><div class='ctx'> 	seq = &amp;tp-&gt;copied_seq;</div><div class='ctx'> 	if (flags &amp; MSG_PEEK) {</div><div class='del'>-		peek_seq = tp-&gt;copied_seq;</div><div class='add'>+		peek_offset = max(sk_peek_offset(sk, flags), 0);</div><div class='add'>+		peek_seq = tp-&gt;copied_seq + peek_offset;</div><div class='ctx'> 		seq = &amp;peek_seq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1976,7 +2690,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='ctx'> 		u32 offset;</div><div class='ctx'> </div><div class='ctx'> 		/* Are we at urgent data? Stop if we have read anything or have SIGURG pending. */</div><div class='del'>-		if (tp-&gt;urg_data &amp;&amp; tp-&gt;urg_seq == *seq) {</div><div class='add'>+		if (unlikely(tp-&gt;urg_data) &amp;&amp; tp-&gt;urg_seq == *seq) {</div><div class='ctx'> 			if (copied)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (signal_pending(current)) {</div><div class='hunk'>@@ -2015,14 +2729,14 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='ctx'> </div><div class='ctx'> 		/* Well, if we have backlog, try to process it now yet. */</div><div class='ctx'> </div><div class='del'>-		if (copied &gt;= target &amp;&amp; !sk-&gt;sk_backlog.tail)</div><div class='add'>+		if (copied &gt;= target &amp;&amp; !READ_ONCE(sk-&gt;sk_backlog.tail))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (copied) {</div><div class='del'>-			if (sk-&gt;sk_err ||</div><div class='add'>+			if (!timeo ||</div><div class='add'>+			    sk-&gt;sk_err ||</div><div class='ctx'> 			    sk-&gt;sk_state == TCP_CLOSE ||</div><div class='ctx'> 			    (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) ||</div><div class='del'>-			    !timeo ||</div><div class='ctx'> 			    signal_pending(current))</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2056,38 +2770,40 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tcp_cleanup_rbuf(sk, copied);</div><div class='del'>-</div><div class='ctx'> 		if (copied &gt;= target) {</div><div class='ctx'> 			/* Do not sleep, just process backlog. */</div><div class='del'>-			release_sock(sk);</div><div class='del'>-			lock_sock(sk);</div><div class='add'>+			__sk_flush_backlog(sk);</div><div class='ctx'> 		} else {</div><div class='del'>-			sk_wait_data(sk, &amp;timeo, last);</div><div class='add'>+			tcp_cleanup_rbuf(sk, copied);</div><div class='add'>+			err = sk_wait_data(sk, &amp;timeo, last);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				err = copied ? : err;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((flags &amp; MSG_PEEK) &amp;&amp;</div><div class='del'>-		    (peek_seq - copied - urg_hole != tp-&gt;copied_seq)) {</div><div class='add'>+		    (peek_seq - peek_offset - copied - urg_hole != tp-&gt;copied_seq)) {</div><div class='ctx'> 			net_dbg_ratelimited("TCP(%s:%d): Application bug, race in MSG_PEEK\n",</div><div class='ctx'> 					    current-&gt;comm,</div><div class='ctx'> 					    task_pid_nr(current));</div><div class='del'>-			peek_seq = tp-&gt;copied_seq;</div><div class='add'>+			peek_seq = tp-&gt;copied_seq + peek_offset;</div><div class='ctx'> 		}</div><div class='ctx'> 		continue;</div><div class='ctx'> </div><div class='del'>-	found_ok_skb:</div><div class='add'>+found_ok_skb:</div><div class='ctx'> 		/* Ok so how much can we use? */</div><div class='ctx'> 		used = skb-&gt;len - offset;</div><div class='ctx'> 		if (len &lt; used)</div><div class='ctx'> 			used = len;</div><div class='ctx'> </div><div class='ctx'> 		/* Do we have urgent data here? */</div><div class='del'>-		if (tp-&gt;urg_data) {</div><div class='add'>+		if (unlikely(tp-&gt;urg_data)) {</div><div class='ctx'> 			u32 urg_offset = tp-&gt;urg_seq - *seq;</div><div class='ctx'> 			if (urg_offset &lt; used) {</div><div class='ctx'> 				if (!urg_offset) {</div><div class='ctx'> 					if (!sock_flag(sk, SOCK_URGINLINE)) {</div><div class='del'>-						++*seq;</div><div class='add'>+						WRITE_ONCE(*seq, *seq + 1);</div><div class='ctx'> 						urg_hole++;</div><div class='ctx'> 						offset++;</div><div class='ctx'> 						used--;</div><div class='hunk'>@@ -2100,45 +2816,78 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(flags &amp; MSG_TRUNC)) {</div><div class='del'>-			err = skb_copy_datagram_msg(skb, offset, msg, used);</div><div class='del'>-			if (err) {</div><div class='del'>-				/* Exception. Bailout! */</div><div class='del'>-				if (!copied)</div><div class='del'>-					copied = -EFAULT;</div><div class='add'>+			if (last_copied_dmabuf != -1 &amp;&amp;</div><div class='add'>+			    last_copied_dmabuf != !skb_frags_readable(skb))</div><div class='ctx'> 				break;</div><div class='add'>+</div><div class='add'>+			if (skb_frags_readable(skb)) {</div><div class='add'>+				err = skb_copy_datagram_msg(skb, offset, msg,</div><div class='add'>+							    used);</div><div class='add'>+				if (err) {</div><div class='add'>+					/* Exception. Bailout! */</div><div class='add'>+					if (!copied)</div><div class='add'>+						copied = -EFAULT;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				if (!(flags &amp; MSG_SOCK_DEVMEM)) {</div><div class='add'>+					/* dmabuf skbs can only be received</div><div class='add'>+					 * with the MSG_SOCK_DEVMEM flag.</div><div class='add'>+					 */</div><div class='add'>+					if (!copied)</div><div class='add'>+						copied = -EFAULT;</div><div class='add'>+</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				err = tcp_recvmsg_dmabuf(sk, skb, offset, msg,</div><div class='add'>+							 used);</div><div class='add'>+				if (err &lt; 0) {</div><div class='add'>+					if (!copied)</div><div class='add'>+						copied = err;</div><div class='add'>+</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				used = err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*seq += used;</div><div class='add'>+		last_copied_dmabuf = !skb_frags_readable(skb);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(*seq, *seq + used);</div><div class='ctx'> 		copied += used;</div><div class='ctx'> 		len -= used;</div><div class='del'>-</div><div class='add'>+		if (flags &amp; MSG_PEEK)</div><div class='add'>+			sk_peek_offset_fwd(sk, used);</div><div class='add'>+		else</div><div class='add'>+			sk_peek_offset_bwd(sk, used);</div><div class='ctx'> 		tcp_rcv_space_adjust(sk);</div><div class='ctx'> </div><div class='ctx'> skip_copy:</div><div class='del'>-		if (tp-&gt;urg_data &amp;&amp; after(tp-&gt;copied_seq, tp-&gt;urg_seq)) {</div><div class='del'>-			tp-&gt;urg_data = 0;</div><div class='add'>+		if (unlikely(tp-&gt;urg_data) &amp;&amp; after(tp-&gt;copied_seq, tp-&gt;urg_seq)) {</div><div class='add'>+			WRITE_ONCE(tp-&gt;urg_data, 0);</div><div class='ctx'> 			tcp_fast_path_check(sk);</div><div class='ctx'> 		}</div><div class='del'>-		if (used + offset &lt; skb-&gt;len)</div><div class='del'>-			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;has_rxtstamp) {</div><div class='del'>-			tcp_update_recv_tstamps(skb, &amp;tss);</div><div class='del'>-			has_tss = true;</div><div class='del'>-			has_cmsg = true;</div><div class='add'>+			tcp_update_recv_tstamps(skb, tss);</div><div class='add'>+			*cmsg_flags |= TCP_CMSG_TS;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (used + offset &lt; skb-&gt;len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN)</div><div class='ctx'> 			goto found_fin_ok;</div><div class='ctx'> 		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='add'>+			tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 		continue;</div><div class='ctx'> </div><div class='del'>-	found_fin_ok:</div><div class='add'>+found_fin_ok:</div><div class='ctx'> 		/* Process the FIN. */</div><div class='del'>-		++*seq;</div><div class='add'>+		WRITE_ONCE(*seq, *seq + 1);</div><div class='ctx'> 		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='add'>+			tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	} while (len &gt; 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2148,22 +2897,9 @@ skip_copy:</div><div class='ctx'> </div><div class='ctx'> 	/* Clean up data we have read: This will do ACK frames. */</div><div class='ctx'> 	tcp_cleanup_rbuf(sk, copied);</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	if (has_cmsg) {</div><div class='del'>-		if (has_tss)</div><div class='del'>-			tcp_recv_timestamp(msg, sk, &amp;tss);</div><div class='del'>-		if (tp-&gt;recvmsg_inq) {</div><div class='del'>-			inq = tcp_inq_hint(sk);</div><div class='del'>-			put_cmsg(msg, SOL_TCP, TCP_CM_INQ, sizeof(inq), &amp;inq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return copied;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	release_sock(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> recv_urg:</div><div class='hunk'>@@ -2174,7 +2910,38 @@ recv_sndq:</div><div class='ctx'> 	err = tcp_peek_sndq(sk, msg, len);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_recvmsg);</div><div class='add'>+</div><div class='add'>+int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,</div><div class='add'>+		int *addr_len)</div><div class='add'>+{</div><div class='add'>+	int cmsg_flags = 0, ret;</div><div class='add'>+	struct scm_timestamping_internal tss;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return inet_recv_error(sk, msg, len, addr_len);</div><div class='add'>+</div><div class='add'>+	if (sk_can_busy_loop(sk) &amp;&amp;</div><div class='add'>+	    skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue) &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_state == TCP_ESTABLISHED)</div><div class='add'>+		sk_busy_loop(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	ret = tcp_recvmsg_locked(sk, msg, len, flags, &amp;tss, &amp;cmsg_flags);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	if ((cmsg_flags || msg-&gt;msg_get_inq) &amp;&amp; ret &gt;= 0) {</div><div class='add'>+		if (cmsg_flags &amp; TCP_CMSG_TS)</div><div class='add'>+			tcp_recv_timestamp(msg, sk, &amp;tss);</div><div class='add'>+		if (msg-&gt;msg_get_inq) {</div><div class='add'>+			msg-&gt;msg_inq = tcp_inq_hint(sk);</div><div class='add'>+			if (cmsg_flags &amp; TCP_CMSG_INQ)</div><div class='add'>+				put_cmsg(msg, SOL_TCP, TCP_CM_INQ,</div><div class='add'>+					 sizeof(msg-&gt;msg_inq), &amp;msg-&gt;msg_inq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_recvmsg);</div><div class='ctx'> </div><div class='ctx'> void tcp_set_state(struct sock *sk, int state)</div><div class='ctx'> {</div><div class='hunk'>@@ -2199,8 +2966,20 @@ void tcp_set_state(struct sock *sk, int state)</div><div class='ctx'> 	BUILD_BUG_ON((int)BPF_TCP_LISTEN != (int)TCP_LISTEN);</div><div class='ctx'> 	BUILD_BUG_ON((int)BPF_TCP_CLOSING != (int)TCP_CLOSING);</div><div class='ctx'> 	BUILD_BUG_ON((int)BPF_TCP_NEW_SYN_RECV != (int)TCP_NEW_SYN_RECV);</div><div class='add'>+	BUILD_BUG_ON((int)BPF_TCP_BOUND_INACTIVE != (int)TCP_BOUND_INACTIVE);</div><div class='ctx'> 	BUILD_BUG_ON((int)BPF_TCP_MAX_STATES != (int)TCP_MAX_STATES);</div><div class='ctx'> </div><div class='add'>+	/* bpf uapi header bpf.h defines an anonymous enum with values</div><div class='add'>+	 * BPF_TCP_* used by bpf programs. Currently gcc built vmlinux</div><div class='add'>+	 * is able to emit this enum in DWARF due to the above BUILD_BUG_ON.</div><div class='add'>+	 * But clang built vmlinux does not have this enum in DWARF</div><div class='add'>+	 * since clang removes the above code before generating IR/debuginfo.</div><div class='add'>+	 * Let us explicitly emit the type debuginfo to ensure the</div><div class='add'>+	 * above-mentioned anonymous enum in the vmlinux DWARF and hence BTF</div><div class='add'>+	 * regardless of which compiler is used.</div><div class='add'>+	 */</div><div class='add'>+	BTF_TYPE_EMIT_ENUM(BPF_TCP_ESTABLISHED);</div><div class='add'>+</div><div class='ctx'> 	if (BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk), BPF_SOCK_OPS_STATE_CB_FLAG))</div><div class='ctx'> 		tcp_call_bpf_2arg(sk, BPF_SOCK_OPS_STATE_CB, oldstate, state);</div><div class='ctx'> </div><div class='hunk'>@@ -2209,6 +2988,10 @@ void tcp_set_state(struct sock *sk, int state)</div><div class='ctx'> 		if (oldstate != TCP_ESTABLISHED)</div><div class='ctx'> 			TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);</div><div class='ctx'> 		break;</div><div class='add'>+	case TCP_CLOSE_WAIT:</div><div class='add'>+		if (oldstate == TCP_SYN_RECV)</div><div class='add'>+			TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_CLOSE:</div><div class='ctx'> 		if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED)</div><div class='hunk'>@@ -2218,9 +3001,9 @@ void tcp_set_state(struct sock *sk, int state)</div><div class='ctx'> 		if (inet_csk(sk)-&gt;icsk_bind_hash &amp;&amp;</div><div class='ctx'> 		    !(sk-&gt;sk_userlocks &amp; SOCK_BINDPORT_LOCK))</div><div class='ctx'> 			inet_put_port(sk);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		if (oldstate == TCP_ESTABLISHED)</div><div class='add'>+		if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT)</div><div class='ctx'> 			TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2228,10 +3011,6 @@ void tcp_set_state(struct sock *sk, int state)</div><div class='ctx'> 	 * socket sitting in hash tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inet_sk_state_store(sk, state);</div><div class='del'>-</div><div class='del'>-#ifdef STATE_TRACE</div><div class='del'>-	SOCK_DEBUG(sk, "TCP sk=%p, State %s -&gt; %s\n", sk, statename[oldstate], statename[state]);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_set_state);</div><div class='ctx'> </div><div class='hunk'>@@ -2286,19 +3065,53 @@ void tcp_shutdown(struct sock *sk, int how)</div><div class='ctx'> 	/* If we've already sent a FIN, or it's a closed state, skip this. */</div><div class='ctx'> 	if ((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='ctx'> 	    (TCPF_ESTABLISHED | TCPF_SYN_SENT |</div><div class='del'>-	     TCPF_SYN_RECV | TCPF_CLOSE_WAIT)) {</div><div class='add'>+	     TCPF_CLOSE_WAIT)) {</div><div class='ctx'> 		/* Clear out any half completed packets.  FIN if needed. */</div><div class='ctx'> 		if (tcp_close_state(sk))</div><div class='ctx'> 			tcp_send_fin(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_shutdown);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_shutdown);</div><div class='add'>+</div><div class='add'>+int tcp_orphan_count_sum(void)</div><div class='add'>+{</div><div class='add'>+	int i, total = 0;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		total += per_cpu(tcp_orphan_count, i);</div><div class='add'>+</div><div class='add'>+	return max(total, 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-bool tcp_check_oom(struct sock *sk, int shift)</div><div class='add'>+static int tcp_orphan_cache;</div><div class='add'>+static struct timer_list tcp_orphan_timer;</div><div class='add'>+#define TCP_ORPHAN_TIMER_PERIOD msecs_to_jiffies(100)</div><div class='add'>+</div><div class='add'>+static void tcp_orphan_update(struct timer_list *unused)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(tcp_orphan_cache, tcp_orphan_count_sum());</div><div class='add'>+	mod_timer(&amp;tcp_orphan_timer, jiffies + TCP_ORPHAN_TIMER_PERIOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tcp_too_many_orphans(int shift)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(tcp_orphan_cache) &lt;&lt; shift &gt;</div><div class='add'>+		READ_ONCE(sysctl_tcp_max_orphans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tcp_out_of_memory(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_wmem_queued &gt; SOCK_MIN_SNDBUF &amp;&amp;</div><div class='add'>+	    sk_memory_allocated(sk) &gt; sk_prot_mem_limits(sk, 2))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool tcp_check_oom(const struct sock *sk, int shift)</div><div class='ctx'> {</div><div class='ctx'> 	bool too_many_orphans, out_of_socket_memory;</div><div class='ctx'> </div><div class='del'>-	too_many_orphans = tcp_too_many_orphans(sk, shift);</div><div class='add'>+	too_many_orphans = tcp_too_many_orphans(shift);</div><div class='ctx'> 	out_of_socket_memory = tcp_out_of_memory(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (too_many_orphans)</div><div class='hunk'>@@ -2308,14 +3121,13 @@ bool tcp_check_oom(struct sock *sk, int shift)</div><div class='ctx'> 	return too_many_orphans || out_of_socket_memory;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tcp_close(struct sock *sk, long timeout)</div><div class='add'>+void __tcp_close(struct sock *sk, long timeout)</div><div class='ctx'> {</div><div class='add'>+	bool data_was_unread = false;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int data_was_unread = 0;</div><div class='ctx'> 	int state;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_shutdown, SHUTDOWN_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_LISTEN) {</div><div class='ctx'> 		tcp_set_state(sk, TCP_CLOSE);</div><div class='hunk'>@@ -2330,17 +3142,16 @@ void tcp_close(struct sock *sk, long timeout)</div><div class='ctx'> 	 *  descriptor close, not protocol-sourced closes, because the</div><div class='ctx'> 	 *  reader process may not have drained the data yet!</div><div class='ctx'> 	 */</div><div class='del'>-	while ((skb = __skb_dequeue(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='del'>-		u32 len = TCP_SKB_CB(skb)-&gt;end_seq - TCP_SKB_CB(skb)-&gt;seq;</div><div class='add'>+	while ((skb = skb_peek(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='add'>+		u32 end_seq = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='ctx'> </div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN)</div><div class='del'>-			len--;</div><div class='del'>-		data_was_unread += len;</div><div class='del'>-		__kfree_skb(skb);</div><div class='add'>+			end_seq--;</div><div class='add'>+		if (after(end_seq, tcp_sk(sk)-&gt;copied_seq))</div><div class='add'>+			data_was_unread = true;</div><div class='add'>+		tcp_eat_recv_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='del'>-</div><div class='ctx'> 	/* If socket has been already reset (e.g. in tcp_reset()) - kill it. */</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='ctx'> 		goto adjudge_to_death;</div><div class='hunk'>@@ -2358,7 +3169,8 @@ void tcp_close(struct sock *sk, long timeout)</div><div class='ctx'> 		/* Unread data was tossed, zap the connection. */</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE);</div><div class='ctx'> 		tcp_set_state(sk, TCP_CLOSE);</div><div class='del'>-		tcp_send_active_reset(sk, sk-&gt;sk_allocation);</div><div class='add'>+		tcp_send_active_reset(sk, sk-&gt;sk_allocation,</div><div class='add'>+				      SK_RST_REASON_TCP_ABORT_ON_CLOSE);</div><div class='ctx'> 	} else if (sock_flag(sk, SOCK_LINGER) &amp;&amp; !sk-&gt;sk_lingertime) {</div><div class='ctx'> 		/* Check zero linger _after_ checking for unread data. */</div><div class='ctx'> 		sk-&gt;sk_prot-&gt;disconnect(sk, 0);</div><div class='hunk'>@@ -2372,7 +3184,7 @@ void tcp_close(struct sock *sk, long timeout)</div><div class='ctx'> 		 * machine. State transitions:</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * TCP_ESTABLISHED -&gt; TCP_FIN_WAIT1</div><div class='del'>-		 * TCP_SYN_RECV	-&gt; TCP_FIN_WAIT1 (forget it, it's impossible)</div><div class='add'>+		 * TCP_SYN_RECV	-&gt; TCP_FIN_WAIT1 (it is difficult)</div><div class='ctx'> 		 * TCP_CLOSE_WAIT -&gt; TCP_LAST_ACK</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * are legal only when FIN has been sent (i.e. in window),</div><div class='hunk'>@@ -2403,18 +3215,12 @@ adjudge_to_death:</div><div class='ctx'> 	sock_hold(sk);</div><div class='ctx'> 	sock_orphan(sk);</div><div class='ctx'> </div><div class='del'>-	/* It is the last release_sock in its life. It will remove backlog. */</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Now socket is owned by kernel and we acquire BH lock</div><div class='del'>-	 *  to finish close. No need to check for user refs.</div><div class='del'>-	 */</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='del'>-	WARN_ON(sock_owned_by_user(sk));</div><div class='add'>+	/* remove backlog if any, without releasing ownership. */</div><div class='add'>+	__release_sock(sk);</div><div class='ctx'> </div><div class='del'>-	percpu_counter_inc(sk-&gt;sk_prot-&gt;orphan_count);</div><div class='add'>+	tcp_orphan_count_inc();</div><div class='ctx'> </div><div class='ctx'> 	/* Have we already been destroyed by a softirq or backlog? */</div><div class='ctx'> 	if (state != TCP_CLOSE &amp;&amp; sk-&gt;sk_state == TCP_CLOSE)</div><div class='hunk'>@@ -2436,16 +3242,17 @@ adjudge_to_death:</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_FIN_WAIT2) {</div><div class='ctx'> 		struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-		if (tp-&gt;linger2 &lt; 0) {</div><div class='add'>+		if (READ_ONCE(tp-&gt;linger2) &lt; 0) {</div><div class='ctx'> 			tcp_set_state(sk, TCP_CLOSE);</div><div class='del'>-			tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='add'>+			tcp_send_active_reset(sk, GFP_ATOMIC,</div><div class='add'>+					      SK_RST_REASON_TCP_ABORT_ON_LINGER);</div><div class='ctx'> 			__NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					LINUX_MIB_TCPABORTONLINGER);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			const int tmo = tcp_fin_time(sk);</div><div class='ctx'> </div><div class='ctx'> 			if (tmo &gt; TCP_TIMEWAIT_LEN) {</div><div class='del'>-				inet_csk_reset_keepalive_timer(sk,</div><div class='add'>+				tcp_reset_keepalive_timer(sk,</div><div class='ctx'> 						tmo - TCP_TIMEWAIT_LEN);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);</div><div class='hunk'>@@ -2454,10 +3261,10 @@ adjudge_to_death:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='del'>-		sk_mem_reclaim(sk);</div><div class='ctx'> 		if (tcp_check_oom(sk, 0)) {</div><div class='ctx'> 			tcp_set_state(sk, TCP_CLOSE);</div><div class='del'>-			tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='add'>+			tcp_send_active_reset(sk, GFP_ATOMIC,</div><div class='add'>+					      SK_RST_REASON_TCP_ABORT_ON_MEMORY);</div><div class='ctx'> 			__NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					LINUX_MIB_TCPABORTONMEMORY);</div><div class='ctx'> 		} else if (!check_net(sock_net(sk))) {</div><div class='hunk'>@@ -2467,7 +3274,10 @@ adjudge_to_death:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='del'>-		struct request_sock *req = tcp_sk(sk)-&gt;fastopen_rsk;</div><div class='add'>+		struct request_sock *req;</div><div class='add'>+</div><div class='add'>+		req = rcu_dereference_protected(tcp_sk(sk)-&gt;fastopen_rsk,</div><div class='add'>+						lockdep_sock_is_held(sk));</div><div class='ctx'> 		/* We could get here with a non-NULL req if the socket is</div><div class='ctx'> 		 * aborted (e.g., closed with unread data) before 3WHS</div><div class='ctx'> 		 * finishes.</div><div class='hunk'>@@ -2481,6 +3291,15 @@ adjudge_to_death:</div><div class='ctx'> out:</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> 	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_close(struct sock *sk, long timeout)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__tcp_close(sk, timeout);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	if (!sk-&gt;sk_net_refcnt)</div><div class='add'>+		inet_csk_clear_xmit_timers_sync(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_close);</div><div class='hunk'>@@ -2498,6 +3317,7 @@ static void tcp_rtx_queue_purge(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *p = rb_first(&amp;sk-&gt;tcp_rtx_queue);</div><div class='ctx'> </div><div class='add'>+	tcp_sk(sk)-&gt;highest_sack = NULL;</div><div class='ctx'> 	while (p) {</div><div class='ctx'> 		struct sk_buff *skb = rb_to_skb(p);</div><div class='ctx'> </div><div class='hunk'>@@ -2506,7 +3326,7 @@ static void tcp_rtx_queue_purge(struct sock *sk)</div><div class='ctx'> 		 * list_del(&amp;skb-&gt;tcp_tsorted_anchor)</div><div class='ctx'> 		 */</div><div class='ctx'> 		tcp_rtx_queue_unlink(skb, sk);</div><div class='del'>-		sk_wmem_free_skb(sk, skb);</div><div class='add'>+		tcp_wmem_free_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2517,13 +3337,13 @@ void tcp_write_queue_purge(struct sock *sk)</div><div class='ctx'> 	tcp_chrono_stop(sk, TCP_CHRONO_BUSY);</div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;sk-&gt;sk_write_queue)) != NULL) {</div><div class='ctx'> 		tcp_skb_tsorted_anchor_cleanup(skb);</div><div class='del'>-		sk_wmem_free_skb(sk, skb);</div><div class='add'>+		tcp_wmem_free_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	tcp_rtx_queue_purge(sk);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tcp_sk(sk)-&gt;tsorted_sent_queue);</div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='ctx'> 	tcp_clear_all_retrans_hints(tcp_sk(sk));</div><div class='ctx'> 	tcp_sk(sk)-&gt;packets_out = 0;</div><div class='add'>+	inet_csk(sk)-&gt;icsk_backoff = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tcp_disconnect(struct sock *sk, int flags)</div><div class='hunk'>@@ -2532,6 +3352,8 @@ int tcp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int old_state = sk-&gt;sk_state;</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	u32 seq;</div><div class='ctx'> </div><div class='ctx'> 	if (old_state != TCP_CLOSE)</div><div class='ctx'> 		tcp_set_state(sk, TCP_CLOSE);</div><div class='hunk'>@@ -2540,48 +3362,72 @@ int tcp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 	if (old_state == TCP_LISTEN) {</div><div class='ctx'> 		inet_csk_listen_stop(sk);</div><div class='ctx'> 	} else if (unlikely(tp-&gt;repair)) {</div><div class='del'>-		sk-&gt;sk_err = ECONNABORTED;</div><div class='del'>-	} else if (tcp_need_reset(old_state) ||</div><div class='del'>-		   (tp-&gt;snd_nxt != tp-&gt;write_seq &amp;&amp;</div><div class='del'>-		    (1 &lt;&lt; old_state) &amp; (TCPF_CLOSING | TCPF_LAST_ACK))) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, ECONNABORTED);</div><div class='add'>+	} else if (tcp_need_reset(old_state)) {</div><div class='add'>+		tcp_send_active_reset(sk, gfp_any(), SK_RST_REASON_TCP_STATE);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, ECONNRESET);</div><div class='add'>+	} else if (tp-&gt;snd_nxt != tp-&gt;write_seq &amp;&amp;</div><div class='add'>+		   (1 &lt;&lt; old_state) &amp; (TCPF_CLOSING | TCPF_LAST_ACK)) {</div><div class='ctx'> 		/* The last check adjusts for discrepancy of Linux wrt. RFC</div><div class='ctx'> 		 * states</div><div class='ctx'> 		 */</div><div class='del'>-		tcp_send_active_reset(sk, gfp_any());</div><div class='del'>-		sk-&gt;sk_err = ECONNRESET;</div><div class='add'>+		tcp_send_active_reset(sk, gfp_any(),</div><div class='add'>+				      SK_RST_REASON_TCP_DISCONNECT_WITH_DATA);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, ECONNRESET);</div><div class='ctx'> 	} else if (old_state == TCP_SYN_SENT)</div><div class='del'>-		sk-&gt;sk_err = ECONNRESET;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, ECONNRESET);</div><div class='ctx'> </div><div class='ctx'> 	tcp_clear_xmit_timers(sk);</div><div class='ctx'> 	__skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-	tp-&gt;copied_seq = tp-&gt;rcv_nxt;</div><div class='del'>-	tp-&gt;urg_data = 0;</div><div class='add'>+	WRITE_ONCE(tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='add'>+	WRITE_ONCE(tp-&gt;urg_data, 0);</div><div class='add'>+	sk_set_peek_off(sk, -1);</div><div class='ctx'> 	tcp_write_queue_purge(sk);</div><div class='ctx'> 	tcp_fastopen_active_disable_ofo_check(sk);</div><div class='ctx'> 	skb_rbtree_purge(&amp;tp-&gt;out_of_order_queue);</div><div class='ctx'> </div><div class='ctx'> 	inet-&gt;inet_dport = 0;</div><div class='ctx'> </div><div class='del'>-	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK))</div><div class='del'>-		inet_reset_saddr(sk);</div><div class='add'>+	inet_bhash2_reset_saddr(sk);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_shutdown = 0;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_shutdown, 0);</div><div class='ctx'> 	sock_reset_flag(sk, SOCK_DONE);</div><div class='ctx'> 	tp-&gt;srtt_us = 0;</div><div class='add'>+	tp-&gt;mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);</div><div class='ctx'> 	tp-&gt;rcv_rtt_last_tsecr = 0;</div><div class='del'>-	tp-&gt;write_seq += tp-&gt;max_window + 2;</div><div class='del'>-	if (tp-&gt;write_seq == 0)</div><div class='del'>-		tp-&gt;write_seq = 1;</div><div class='add'>+</div><div class='add'>+	seq = tp-&gt;write_seq + tp-&gt;max_window + 2;</div><div class='add'>+	if (!seq)</div><div class='add'>+		seq = 1;</div><div class='add'>+	WRITE_ONCE(tp-&gt;write_seq, seq);</div><div class='add'>+</div><div class='ctx'> 	icsk-&gt;icsk_backoff = 0;</div><div class='del'>-	tp-&gt;snd_cwnd = 2;</div><div class='del'>-	icsk-&gt;icsk_probes_out = 0;</div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_probes_out, 0);</div><div class='add'>+	icsk-&gt;icsk_probes_tstamp = 0;</div><div class='add'>+	icsk-&gt;icsk_rto = TCP_TIMEOUT_INIT;</div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_rto_min, TCP_RTO_MIN);</div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_delack_max, TCP_DELACK_MAX);</div><div class='ctx'> 	tp-&gt;snd_ssthresh = TCP_INFINITE_SSTHRESH;</div><div class='add'>+	tcp_snd_cwnd_set(tp, TCP_INIT_CWND);</div><div class='ctx'> 	tp-&gt;snd_cwnd_cnt = 0;</div><div class='add'>+	tp-&gt;is_cwnd_limited = 0;</div><div class='add'>+	tp-&gt;max_packets_out = 0;</div><div class='ctx'> 	tp-&gt;window_clamp = 0;</div><div class='add'>+	tp-&gt;delivered = 0;</div><div class='ctx'> 	tp-&gt;delivered_ce = 0;</div><div class='add'>+	tp-&gt;accecn_fail_mode = 0;</div><div class='add'>+	tp-&gt;saw_accecn_opt = TCP_ACCECN_OPT_NOT_SEEN;</div><div class='add'>+	tcp_accecn_init_counters(tp);</div><div class='add'>+	tp-&gt;prev_ecnfield = 0;</div><div class='add'>+	tp-&gt;accecn_opt_tstamp = 0;</div><div class='add'>+	if (icsk-&gt;icsk_ca_initialized &amp;&amp; icsk-&gt;icsk_ca_ops-&gt;release)</div><div class='add'>+		icsk-&gt;icsk_ca_ops-&gt;release(sk);</div><div class='add'>+	memset(icsk-&gt;icsk_ca_priv, 0, sizeof(icsk-&gt;icsk_ca_priv));</div><div class='add'>+	icsk-&gt;icsk_ca_initialized = 0;</div><div class='ctx'> 	tcp_set_ca_state(sk, TCP_CA_Open);</div><div class='ctx'> 	tp-&gt;is_sack_reneg = 0;</div><div class='ctx'> 	tcp_clear_retrans(tp);</div><div class='add'>+	tp-&gt;total_retrans = 0;</div><div class='ctx'> 	inet_csk_delack_init(sk);</div><div class='ctx'> 	/* Initialize rcv_mss to TCP_MIN_MSS to avoid division by 0</div><div class='ctx'> 	 * issue in __tcp_select_window()</div><div class='hunk'>@@ -2589,18 +3435,51 @@ int tcp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 	icsk-&gt;icsk_ack.rcv_mss = TCP_MIN_MSS;</div><div class='ctx'> 	memset(&amp;tp-&gt;rx_opt, 0, sizeof(tp-&gt;rx_opt));</div><div class='ctx'> 	__sk_dst_reset(sk);</div><div class='del'>-	dst_release(sk-&gt;sk_rx_dst);</div><div class='del'>-	sk-&gt;sk_rx_dst = NULL;</div><div class='add'>+	dst_release(unrcu_pointer(xchg(&amp;sk-&gt;sk_rx_dst, NULL)));</div><div class='ctx'> 	tcp_saved_syn_free(tp);</div><div class='ctx'> 	tp-&gt;compressed_ack = 0;</div><div class='add'>+	tp-&gt;segs_in = 0;</div><div class='add'>+	tp-&gt;segs_out = 0;</div><div class='ctx'> 	tp-&gt;bytes_sent = 0;</div><div class='add'>+	tp-&gt;bytes_acked = 0;</div><div class='add'>+	tp-&gt;bytes_received = 0;</div><div class='ctx'> 	tp-&gt;bytes_retrans = 0;</div><div class='add'>+	tp-&gt;data_segs_in = 0;</div><div class='add'>+	tp-&gt;data_segs_out = 0;</div><div class='add'>+	tp-&gt;duplicate_sack[0].start_seq = 0;</div><div class='add'>+	tp-&gt;duplicate_sack[0].end_seq = 0;</div><div class='ctx'> 	tp-&gt;dsack_dups = 0;</div><div class='ctx'> 	tp-&gt;reord_seen = 0;</div><div class='add'>+	tp-&gt;retrans_out = 0;</div><div class='add'>+	tp-&gt;sacked_out = 0;</div><div class='add'>+	tp-&gt;tlp_high_seq = 0;</div><div class='add'>+	tp-&gt;last_oow_ack_time = 0;</div><div class='add'>+	tp-&gt;plb_rehash = 0;</div><div class='add'>+	/* There's a bubble in the pipe until at least the first ACK. */</div><div class='add'>+	tp-&gt;app_limited = ~0U;</div><div class='add'>+	tp-&gt;rate_app_limited = 1;</div><div class='add'>+	tp-&gt;rack.mstamp = 0;</div><div class='add'>+	tp-&gt;rack.advanced = 0;</div><div class='add'>+	tp-&gt;rack.reo_wnd_steps = 1;</div><div class='add'>+	tp-&gt;rack.last_delivered = 0;</div><div class='add'>+	tp-&gt;rack.reo_wnd_persist = 0;</div><div class='add'>+	tp-&gt;rack.dsack_seen = 0;</div><div class='add'>+	tp-&gt;syn_data_acked = 0;</div><div class='add'>+	tp-&gt;syn_fastopen_child = 0;</div><div class='add'>+	tp-&gt;rx_opt.saw_tstamp = 0;</div><div class='add'>+	tp-&gt;rx_opt.dsack = 0;</div><div class='add'>+	tp-&gt;rx_opt.num_sacks = 0;</div><div class='add'>+	tp-&gt;rcv_ooopack = 0;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* Clean up fastopen related fields */</div><div class='add'>+	req = rcu_dereference_protected(tp-&gt;fastopen_rsk,</div><div class='add'>+					lockdep_sock_is_held(sk));</div><div class='add'>+	if (req)</div><div class='add'>+		reqsk_fastopen_remove(sk, req, false);</div><div class='ctx'> 	tcp_free_fastopen_req(tp);</div><div class='del'>-	inet-&gt;defer_connect = 0;</div><div class='add'>+	inet_clear_bit(DEFER_CONNECT, sk);</div><div class='add'>+	tp-&gt;fastopen_client_fail = 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(inet-&gt;inet_num &amp;&amp; !icsk-&gt;icsk_bind_hash);</div><div class='ctx'> </div><div class='hunk'>@@ -2609,19 +3488,18 @@ int tcp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 		sk-&gt;sk_frag.page = NULL;</div><div class='ctx'> 		sk-&gt;sk_frag.offset = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_disconnect);</div><div class='ctx'> </div><div class='ctx'> static inline bool tcp_can_repair_sock(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN) &amp;&amp;</div><div class='add'>+	return sockopt_ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN) &amp;&amp;</div><div class='ctx'> 		(sk-&gt;sk_state != TCP_LISTEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_repair_set_window(struct tcp_sock *tp, char __user *optbuf, int len)</div><div class='add'>+static int tcp_repair_set_window(struct tcp_sock *tp, sockptr_t optbuf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_repair_window opt;</div><div class='ctx'> </div><div class='hunk'>@@ -2631,7 +3509,7 @@ static int tcp_repair_set_window(struct tcp_sock *tp, char __user *optbuf, int l</div><div class='ctx'> 	if (len != sizeof(opt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;opt, optbuf, sizeof(opt)))</div><div class='add'>+	if (copy_from_sockptr(&amp;opt, optbuf, sizeof(opt)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (opt.max_window &lt; opt.snd_wnd)</div><div class='hunk'>@@ -2653,17 +3531,18 @@ static int tcp_repair_set_window(struct tcp_sock *tp, char __user *optbuf, int l</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_repair_options_est(struct sock *sk,</div><div class='del'>-		struct tcp_repair_opt __user *optbuf, unsigned int len)</div><div class='add'>+static int tcp_repair_options_est(struct sock *sk, sockptr_t optbuf,</div><div class='add'>+		unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_repair_opt opt;</div><div class='add'>+	size_t offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= sizeof(opt)) {</div><div class='del'>-		if (copy_from_user(&amp;opt, optbuf, sizeof(opt)))</div><div class='add'>+		if (copy_from_sockptr_offset(&amp;opt, optbuf, offset, sizeof(opt)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		optbuf++;</div><div class='add'>+		offset += sizeof(opt);</div><div class='ctx'> 		len -= sizeof(opt);</div><div class='ctx'> </div><div class='ctx'> 		switch (opt.opt_code) {</div><div class='hunk'>@@ -2702,11 +3581,248 @@ static int tcp_repair_options_est(struct sock *sk,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(tcp_tx_delay_enabled);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_tx_delay_enabled);</div><div class='add'>+</div><div class='add'>+static void tcp_enable_tx_delay(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	s32 delta = (val - tp-&gt;tcp_tx_delay) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	if (val &amp;&amp; !static_branch_unlikely(&amp;tcp_tx_delay_enabled)) {</div><div class='add'>+		static int __tcp_tx_delay_enabled = 0;</div><div class='add'>+</div><div class='add'>+		if (cmpxchg(&amp;__tcp_tx_delay_enabled, 0, 1) == 0) {</div><div class='add'>+			static_branch_enable(&amp;tcp_tx_delay_enabled);</div><div class='add'>+			pr_info("TCP_TX_DELAY enabled\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* If we change tcp_tx_delay on a live flow, adjust tp-&gt;srtt_us,</div><div class='add'>+	 * tp-&gt;rtt_min, icsk_rto and sk-&gt;sk_pacing_rate.</div><div class='add'>+	 * This is best effort.</div><div class='add'>+	 */</div><div class='add'>+	if (delta &amp;&amp; sk-&gt;sk_state == TCP_ESTABLISHED) {</div><div class='add'>+		s64 srtt = (s64)tp-&gt;srtt_us + delta;</div><div class='add'>+</div><div class='add'>+		tp-&gt;srtt_us = clamp_t(s64, srtt, 1, ~0U);</div><div class='add'>+</div><div class='add'>+		/* Note: does not deal with non zero icsk_backoff */</div><div class='add'>+		tcp_set_rto(sk);</div><div class='add'>+</div><div class='add'>+		minmax_reset(&amp;tp-&gt;rtt_min, tcp_jiffies32, ~0U);</div><div class='add'>+</div><div class='add'>+		tcp_update_pacing_rate(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* When set indicates to always queue non-full frames.  Later the user clears</div><div class='add'>+ * this option and we transmit any pending partial frames in the queue.  This is</div><div class='add'>+ * meant to be used alongside sendfile() to get properly filled frames when the</div><div class='add'>+ * user (for example) must write out headers with a write() call first and then</div><div class='add'>+ * use sendfile to send out the data parts.</div><div class='add'>+ *</div><div class='add'>+ * TCP_CORK can be set together with TCP_NODELAY and it is stronger than</div><div class='add'>+ * TCP_NODELAY.</div><div class='add'>+ */</div><div class='add'>+void __tcp_sock_set_cork(struct sock *sk, bool on)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		tp-&gt;nonagle |= TCP_NAGLE_CORK;</div><div class='add'>+	} else {</div><div class='add'>+		tp-&gt;nonagle &amp;= ~TCP_NAGLE_CORK;</div><div class='add'>+		if (tp-&gt;nonagle &amp; TCP_NAGLE_OFF)</div><div class='add'>+			tp-&gt;nonagle |= TCP_NAGLE_PUSH;</div><div class='add'>+		tcp_push_pending_frames(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_sock_set_cork(struct sock *sk, bool on)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__tcp_sock_set_cork(sk, on);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_cork);</div><div class='add'>+</div><div class='add'>+/* TCP_NODELAY is weaker than TCP_CORK, so that this option on corked socket is</div><div class='add'>+ * remembered, but it is not activated until cork is cleared.</div><div class='add'>+ *</div><div class='add'>+ * However, when TCP_NODELAY is set we make an explicit push, which overrides</div><div class='add'>+ * even TCP_CORK for currently queued segments.</div><div class='add'>+ */</div><div class='add'>+void __tcp_sock_set_nodelay(struct sock *sk, bool on)</div><div class='add'>+{</div><div class='add'>+	if (on) {</div><div class='add'>+		tcp_sk(sk)-&gt;nonagle |= TCP_NAGLE_OFF|TCP_NAGLE_PUSH;</div><div class='add'>+		tcp_push_pending_frames(sk);</div><div class='add'>+	} else {</div><div class='add'>+		tcp_sk(sk)-&gt;nonagle &amp;= ~TCP_NAGLE_OFF;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_sock_set_nodelay(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__tcp_sock_set_nodelay(sk, true);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_nodelay);</div><div class='add'>+</div><div class='add'>+static void __tcp_sock_set_quickack(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	if (!val) {</div><div class='add'>+		inet_csk_enter_pingpong_mode(sk);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inet_csk_exit_pingpong_mode(sk);</div><div class='add'>+	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &amp;&amp;</div><div class='add'>+	    inet_csk_ack_scheduled(sk)) {</div><div class='add'>+		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_PUSHED;</div><div class='add'>+		tcp_cleanup_rbuf(sk, 1);</div><div class='add'>+		if (!(val &amp; 1))</div><div class='add'>+			inet_csk_enter_pingpong_mode(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_sock_set_quickack(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	__tcp_sock_set_quickack(sk, val);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_quickack);</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_syncnt(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; 1 || val &gt; MAX_TCP_SYNCNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(inet_csk(sk)-&gt;icsk_syn_retries, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_syncnt);</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_user_timeout(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	/* Cap the max time in ms TCP will retry or probe the window</div><div class='add'>+	 * before giving up and aborting (ETIMEDOUT) a connection.</div><div class='add'>+	 */</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(inet_csk(sk)-&gt;icsk_user_timeout, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_user_timeout);</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_keepidle_locked(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (val &lt; 1 || val &gt; MAX_TCP_KEEPIDLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Paired with WRITE_ONCE() in keepalive_time_when() */</div><div class='add'>+	WRITE_ONCE(tp-&gt;keepalive_time, val * HZ);</div><div class='add'>+	if (sock_flag(sk, SOCK_KEEPOPEN) &amp;&amp;</div><div class='add'>+	    !((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN))) {</div><div class='add'>+		u32 elapsed = keepalive_time_elapsed(tp);</div><div class='add'>+</div><div class='add'>+		if (tp-&gt;keepalive_time &gt; elapsed)</div><div class='add'>+			elapsed = tp-&gt;keepalive_time - elapsed;</div><div class='add'>+		else</div><div class='add'>+			elapsed = 0;</div><div class='add'>+		tcp_reset_keepalive_timer(sk, elapsed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_keepidle(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	err = tcp_sock_set_keepidle_locked(sk, val);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_keepidle);</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_keepintvl(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; 1 || val &gt; MAX_TCP_KEEPINTVL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(tcp_sk(sk)-&gt;keepalive_intvl, val * HZ);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_keepintvl);</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_keepcnt(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; 1 || val &gt; MAX_TCP_KEEPCNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Paired with READ_ONCE() in keepalive_probes() */</div><div class='add'>+	WRITE_ONCE(tcp_sk(sk)-&gt;keepalive_probes, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sock_set_keepcnt);</div><div class='add'>+</div><div class='add'>+int tcp_set_window_clamp(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	u32 old_window_clamp, new_window_clamp, new_rcv_ssthresh;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!val) {</div><div class='add'>+		if (sk-&gt;sk_state != TCP_CLOSE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_window_clamp = tp-&gt;window_clamp;</div><div class='add'>+	new_window_clamp = max_t(int, SOCK_MIN_RCVBUF / 2, val);</div><div class='add'>+</div><div class='add'>+	if (new_window_clamp == old_window_clamp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(tp-&gt;window_clamp, new_window_clamp);</div><div class='add'>+</div><div class='add'>+	/* Need to apply the reserved mem provisioning only</div><div class='add'>+	 * when shrinking the window clamp.</div><div class='add'>+	 */</div><div class='add'>+	if (new_window_clamp &lt; old_window_clamp) {</div><div class='add'>+		__tcp_adjust_rcv_ssthresh(sk, new_window_clamp);</div><div class='add'>+	} else {</div><div class='add'>+		new_rcv_ssthresh = min(tp-&gt;rcv_wnd, new_window_clamp);</div><div class='add'>+		tp-&gt;rcv_ssthresh = max(new_rcv_ssthresh, tp-&gt;rcv_ssthresh);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_sock_set_maxseg(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	/* Values greater than interface MTU won't take effect. However</div><div class='add'>+	 * at the point when this call is done we typically don't yet</div><div class='add'>+	 * know which interface is going to be used</div><div class='add'>+	 */</div><div class='add'>+	if (val &amp;&amp; (val &lt; TCP_MIN_MSS || val &gt; MAX_TCP_WINDOW))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(tcp_sk(sk)-&gt;rx_opt.user_mss, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Socket option code for TCP.</div><div class='ctx'>  */</div><div class='del'>-static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='del'>-		int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+int do_tcp_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		      sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='hunk'>@@ -2722,15 +3838,17 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		if (optlen &lt; 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		val = strncpy_from_user(name, optval,</div><div class='add'>+		val = strncpy_from_sockptr(name, optval,</div><div class='ctx'> 					min_t(long, TCP_CA_NAME_MAX-1, optlen));</div><div class='ctx'> 		if (val &lt; 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		name[val] = 0;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		err = tcp_set_congestion_control(sk, name, true, true);</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='add'>+		err = tcp_set_congestion_control(sk, name, !has_current_bpf_ctx(),</div><div class='add'>+						 sockopt_ns_capable(sock_net(sk)-&gt;user_ns,</div><div class='add'>+								    CAP_NET_ADMIN));</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	case TCP_ULP: {</div><div class='hunk'>@@ -2739,28 +3857,36 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		if (optlen &lt; 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		val = strncpy_from_user(name, optval,</div><div class='add'>+		val = strncpy_from_sockptr(name, optval,</div><div class='ctx'> 					min_t(long, TCP_ULP_NAME_MAX - 1,</div><div class='ctx'> 					      optlen));</div><div class='ctx'> 		if (val &lt; 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		name[val] = 0;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='ctx'> 		err = tcp_set_ulp(sk, name);</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	case TCP_FASTOPEN_KEY: {</div><div class='del'>-		__u8 key[TCP_FASTOPEN_KEY_LENGTH];</div><div class='add'>+		__u8 key[TCP_FASTOPEN_KEY_BUF_LENGTH];</div><div class='add'>+		__u8 *backup_key = NULL;</div><div class='ctx'> </div><div class='del'>-		if (optlen != sizeof(key))</div><div class='add'>+		/* Allow a backup key as well to facilitate key rotation</div><div class='add'>+		 * First key is the active one.</div><div class='add'>+		 */</div><div class='add'>+		if (optlen != TCP_FASTOPEN_KEY_LENGTH &amp;&amp;</div><div class='add'>+		    optlen != TCP_FASTOPEN_KEY_BUF_LENGTH)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(key, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(key, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		return tcp_fastopen_reset_cipher(net, sk, key, sizeof(key));</div><div class='add'>+		if (optlen == TCP_FASTOPEN_KEY_BUF_LENGTH)</div><div class='add'>+			backup_key = key + TCP_FASTOPEN_KEY_LENGTH;</div><div class='add'>+</div><div class='add'>+		return tcp_fastopen_reset_cipher(net, sk, key, backup_key);</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* fallthru */</div><div class='hunk'>@@ -2770,39 +3896,63 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='add'>+	/* Handle options that can be set without locking the socket. */</div><div class='ctx'> 	switch (optname) {</div><div class='add'>+	case TCP_SYNCNT:</div><div class='add'>+		return tcp_sock_set_syncnt(sk, val);</div><div class='add'>+	case TCP_USER_TIMEOUT:</div><div class='add'>+		return tcp_sock_set_user_timeout(sk, val);</div><div class='add'>+	case TCP_KEEPINTVL:</div><div class='add'>+		return tcp_sock_set_keepintvl(sk, val);</div><div class='add'>+	case TCP_KEEPCNT:</div><div class='add'>+		return tcp_sock_set_keepcnt(sk, val);</div><div class='add'>+	case TCP_LINGER2:</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			WRITE_ONCE(tp-&gt;linger2, -1);</div><div class='add'>+		else if (val &gt; TCP_FIN_TIMEOUT_MAX / HZ)</div><div class='add'>+			WRITE_ONCE(tp-&gt;linger2, TCP_FIN_TIMEOUT_MAX);</div><div class='add'>+		else</div><div class='add'>+			WRITE_ONCE(tp-&gt;linger2, val * HZ);</div><div class='add'>+		return 0;</div><div class='add'>+	case TCP_DEFER_ACCEPT:</div><div class='add'>+		/* Translate value in seconds to number of retransmits */</div><div class='add'>+		WRITE_ONCE(icsk-&gt;icsk_accept_queue.rskq_defer_accept,</div><div class='add'>+			   secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ,</div><div class='add'>+					   TCP_RTO_MAX / HZ));</div><div class='add'>+		return 0;</div><div class='add'>+	case TCP_RTO_MAX_MS:</div><div class='add'>+		if (val &lt; MSEC_PER_SEC || val &gt; TCP_RTO_MAX_SEC * MSEC_PER_SEC)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(inet_csk(sk)-&gt;icsk_rto_max, msecs_to_jiffies(val));</div><div class='add'>+		return 0;</div><div class='add'>+	case TCP_RTO_MIN_US: {</div><div class='add'>+		int rto_min = usecs_to_jiffies(val);</div><div class='add'>+</div><div class='add'>+		if (rto_min &gt; TCP_RTO_MIN || rto_min &lt; TCP_TIMEOUT_MIN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(inet_csk(sk)-&gt;icsk_rto_min, rto_min);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case TCP_DELACK_MAX_US: {</div><div class='add'>+		int delack_max = usecs_to_jiffies(val);</div><div class='add'>+</div><div class='add'>+		if (delack_max &gt; TCP_DELACK_MAX || delack_max &lt; TCP_TIMEOUT_MIN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(inet_csk(sk)-&gt;icsk_delack_max, delack_max);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	case TCP_MAXSEG:</div><div class='del'>-		/* Values greater than interface MTU won't take effect. However</div><div class='del'>-		 * at the point when this call is done we typically don't yet</div><div class='del'>-		 * know which interface is going to be used</div><div class='del'>-		 */</div><div class='del'>-		if (val &amp;&amp; (val &lt; TCP_MIN_MSS || val &gt; MAX_TCP_WINDOW)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		tp-&gt;rx_opt.user_mss = val;</div><div class='del'>-		break;</div><div class='add'>+		return tcp_sock_set_maxseg(sk, val);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	switch (optname) {</div><div class='ctx'> 	case TCP_NODELAY:</div><div class='del'>-		if (val) {</div><div class='del'>-			/* TCP_NODELAY is weaker than TCP_CORK, so that</div><div class='del'>-			 * this option on corked socket is remembered, but</div><div class='del'>-			 * it is not activated until cork is cleared.</div><div class='del'>-			 *</div><div class='del'>-			 * However, when TCP_NODELAY is set we make</div><div class='del'>-			 * an explicit push, which overrides even TCP_CORK</div><div class='del'>-			 * for currently queued segments.</div><div class='del'>-			 */</div><div class='del'>-			tp-&gt;nonagle |= TCP_NAGLE_OFF|TCP_NAGLE_PUSH;</div><div class='del'>-			tcp_push_pending_frames(sk);</div><div class='del'>-		} else {</div><div class='del'>-			tp-&gt;nonagle &amp;= ~TCP_NAGLE_OFF;</div><div class='del'>-		}</div><div class='add'>+		__tcp_sock_set_nodelay(sk, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_THIN_LINEAR_TIMEOUTS:</div><div class='hunk'>@@ -2846,155 +3996,92 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_QUEUE_SEQ:</div><div class='del'>-		if (sk-&gt;sk_state != TCP_CLOSE)</div><div class='add'>+		if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='ctx'> 			err = -EPERM;</div><div class='del'>-		else if (tp-&gt;repair_queue == TCP_SEND_QUEUE)</div><div class='del'>-			tp-&gt;write_seq = val;</div><div class='del'>-		else if (tp-&gt;repair_queue == TCP_RECV_QUEUE)</div><div class='del'>-			tp-&gt;rcv_nxt = val;</div><div class='del'>-		else</div><div class='add'>+		} else if (tp-&gt;repair_queue == TCP_SEND_QUEUE) {</div><div class='add'>+			if (!tcp_rtx_queue_empty(sk))</div><div class='add'>+				err = -EPERM;</div><div class='add'>+			else</div><div class='add'>+				WRITE_ONCE(tp-&gt;write_seq, val);</div><div class='add'>+		} else if (tp-&gt;repair_queue == TCP_RECV_QUEUE) {</div><div class='add'>+			if (tp-&gt;rcv_nxt != tp-&gt;copied_seq) {</div><div class='add'>+				err = -EPERM;</div><div class='add'>+			} else {</div><div class='add'>+				WRITE_ONCE(tp-&gt;rcv_nxt, val);</div><div class='add'>+				WRITE_ONCE(tp-&gt;copied_seq, val);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			err = -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_REPAIR_OPTIONS:</div><div class='ctx'> 		if (!tp-&gt;repair)</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-		else if (sk-&gt;sk_state == TCP_ESTABLISHED)</div><div class='del'>-			err = tcp_repair_options_est(sk,</div><div class='del'>-					(struct tcp_repair_opt __user *)optval,</div><div class='del'>-					optlen);</div><div class='add'>+		else if (sk-&gt;sk_state == TCP_ESTABLISHED &amp;&amp; !tp-&gt;bytes_sent)</div><div class='add'>+			err = tcp_repair_options_est(sk, optval, optlen);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EPERM;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_CORK:</div><div class='del'>-		/* When set indicates to always queue non-full frames.</div><div class='del'>-		 * Later the user clears this option and we transmit</div><div class='del'>-		 * any pending partial frames in the queue.  This is</div><div class='del'>-		 * meant to be used alongside sendfile() to get properly</div><div class='del'>-		 * filled frames when the user (for example) must write</div><div class='del'>-		 * out headers with a write() call first and then use</div><div class='del'>-		 * sendfile to send out the data parts.</div><div class='del'>-		 *</div><div class='del'>-		 * TCP_CORK can be set together with TCP_NODELAY and it is</div><div class='del'>-		 * stronger than TCP_NODELAY.</div><div class='del'>-		 */</div><div class='del'>-		if (val) {</div><div class='del'>-			tp-&gt;nonagle |= TCP_NAGLE_CORK;</div><div class='del'>-		} else {</div><div class='del'>-			tp-&gt;nonagle &amp;= ~TCP_NAGLE_CORK;</div><div class='del'>-			if (tp-&gt;nonagle&amp;TCP_NAGLE_OFF)</div><div class='del'>-				tp-&gt;nonagle |= TCP_NAGLE_PUSH;</div><div class='del'>-			tcp_push_pending_frames(sk);</div><div class='del'>-		}</div><div class='add'>+		__tcp_sock_set_cork(sk, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_KEEPIDLE:</div><div class='del'>-		if (val &lt; 1 || val &gt; MAX_TCP_KEEPIDLE)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else {</div><div class='del'>-			tp-&gt;keepalive_time = val * HZ;</div><div class='del'>-			if (sock_flag(sk, SOCK_KEEPOPEN) &amp;&amp;</div><div class='del'>-			    !((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='del'>-			      (TCPF_CLOSE | TCPF_LISTEN))) {</div><div class='del'>-				u32 elapsed = keepalive_time_elapsed(tp);</div><div class='del'>-				if (tp-&gt;keepalive_time &gt; elapsed)</div><div class='del'>-					elapsed = tp-&gt;keepalive_time - elapsed;</div><div class='del'>-				else</div><div class='del'>-					elapsed = 0;</div><div class='del'>-				inet_csk_reset_keepalive_timer(sk, elapsed);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		err = tcp_sock_set_keepidle_locked(sk, val);</div><div class='ctx'> 		break;</div><div class='del'>-	case TCP_KEEPINTVL:</div><div class='del'>-		if (val &lt; 1 || val &gt; MAX_TCP_KEEPINTVL)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			tp-&gt;keepalive_intvl = val * HZ;</div><div class='del'>-		break;</div><div class='del'>-	case TCP_KEEPCNT:</div><div class='del'>-		if (val &lt; 1 || val &gt; MAX_TCP_KEEPCNT)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			tp-&gt;keepalive_probes = val;</div><div class='del'>-		break;</div><div class='del'>-	case TCP_SYNCNT:</div><div class='del'>-		if (val &lt; 1 || val &gt; MAX_TCP_SYNCNT)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			icsk-&gt;icsk_syn_retries = val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case TCP_SAVE_SYN:</div><div class='del'>-		if (val &lt; 0 || val &gt; 1)</div><div class='add'>+		/* 0: disable, 1: enable, 2: start from ether_header */</div><div class='add'>+		if (val &lt; 0 || val &gt; 2)</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 		else</div><div class='ctx'> 			tp-&gt;save_syn = val;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case TCP_LINGER2:</div><div class='del'>-		if (val &lt; 0)</div><div class='del'>-			tp-&gt;linger2 = -1;</div><div class='del'>-		else if (val &gt; net-&gt;ipv4.sysctl_tcp_fin_timeout / HZ)</div><div class='del'>-			tp-&gt;linger2 = 0;</div><div class='del'>-		else</div><div class='del'>-			tp-&gt;linger2 = val * HZ;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TCP_DEFER_ACCEPT:</div><div class='del'>-		/* Translate value in seconds to number of retransmits */</div><div class='del'>-		icsk-&gt;icsk_accept_queue.rskq_defer_accept =</div><div class='del'>-			secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ,</div><div class='del'>-					TCP_RTO_MAX / HZ);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case TCP_WINDOW_CLAMP:</div><div class='del'>-		if (!val) {</div><div class='del'>-			if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			tp-&gt;window_clamp = 0;</div><div class='del'>-		} else</div><div class='del'>-			tp-&gt;window_clamp = val &lt; SOCK_MIN_RCVBUF / 2 ?</div><div class='del'>-						SOCK_MIN_RCVBUF / 2 : val;</div><div class='add'>+		err = tcp_set_window_clamp(sk, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_QUICKACK:</div><div class='del'>-		if (!val) {</div><div class='del'>-			icsk-&gt;icsk_ack.pingpong = 1;</div><div class='del'>-		} else {</div><div class='del'>-			icsk-&gt;icsk_ack.pingpong = 0;</div><div class='del'>-			if ((1 &lt;&lt; sk-&gt;sk_state) &amp;</div><div class='del'>-			    (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &amp;&amp;</div><div class='del'>-			    inet_csk_ack_scheduled(sk)) {</div><div class='del'>-				icsk-&gt;icsk_ack.pending |= ICSK_ACK_PUSHED;</div><div class='del'>-				tcp_cleanup_rbuf(sk, 1);</div><div class='del'>-				if (!(val &amp; 1))</div><div class='del'>-					icsk-&gt;icsk_ack.pingpong = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		__tcp_sock_set_quickack(sk, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case TCP_AO_REPAIR:</div><div class='add'>+		if (!tcp_can_repair_sock(sk)) {</div><div class='add'>+			err = -EPERM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		err = tcp_ao_set_repair(sk, optval, optlen);</div><div class='add'>+		break;</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	case TCP_AO_ADD_KEY:</div><div class='add'>+	case TCP_AO_DEL_KEY:</div><div class='add'>+	case TCP_AO_INFO: {</div><div class='add'>+		/* If this is the first TCP-AO setsockopt() on the socket,</div><div class='add'>+		 * sk_state has to be LISTEN or CLOSE. Allow TCP_REPAIR</div><div class='add'>+		 * in any state.</div><div class='add'>+		 */</div><div class='add'>+		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE))</div><div class='add'>+			goto ao_parse;</div><div class='add'>+		if (rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+					      lockdep_sock_is_held(sk)))</div><div class='add'>+			goto ao_parse;</div><div class='add'>+		if (tp-&gt;repair)</div><div class='add'>+			goto ao_parse;</div><div class='add'>+		err = -EISCONN;</div><div class='add'>+		break;</div><div class='add'>+ao_parse:</div><div class='add'>+		err = tp-&gt;af_specific-&gt;ao_parse(sk, optname, optval, optlen);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	case TCP_MD5SIG:</div><div class='ctx'> 	case TCP_MD5SIG_EXT:</div><div class='del'>-		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN))</div><div class='del'>-			err = tp-&gt;af_specific-&gt;md5_parse(sk, optname, optval, optlen);</div><div class='del'>-		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+		err = tp-&gt;af_specific-&gt;md5_parse(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='del'>-	case TCP_USER_TIMEOUT:</div><div class='del'>-		/* Cap the max time in ms TCP will retry or probe the window</div><div class='del'>-		 * before giving up and aborting (ETIMEDOUT) a connection.</div><div class='del'>-		 */</div><div class='del'>-		if (val &lt; 0)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			icsk-&gt;icsk_user_timeout = val;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case TCP_FASTOPEN:</div><div class='ctx'> 		if (val &gt;= 0 &amp;&amp; ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE |</div><div class='ctx'> 		    TCPF_LISTEN))) {</div><div class='hunk'>@@ -3008,7 +4095,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 	case TCP_FASTOPEN_CONNECT:</div><div class='ctx'> 		if (val &gt; 1 || val &lt; 0) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-		} else if (net-&gt;ipv4.sysctl_tcp_fastopen &amp; TFO_CLIENT_ENABLE) {</div><div class='add'>+		} else if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_fastopen) &amp;</div><div class='add'>+			   TFO_CLIENT_ENABLE) {</div><div class='ctx'> 			if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='ctx'> 				tp-&gt;fastopen_connect = val;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -3026,16 +4114,22 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 			tp-&gt;fastopen_no_cookie = val;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_TIMESTAMP:</div><div class='del'>-		if (!tp-&gt;repair)</div><div class='add'>+		if (!tp-&gt;repair) {</div><div class='ctx'> 			err = -EPERM;</div><div class='del'>-		else</div><div class='del'>-			tp-&gt;tsoffset = val - tcp_time_stamp_raw();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* val is an opaque field,</div><div class='add'>+		 * and low order bit contains usec_ts enable bit.</div><div class='add'>+		 * Its a best effort, and we do not care if user makes an error.</div><div class='add'>+		 */</div><div class='add'>+		tp-&gt;tcp_usec_ts = val &amp; 1;</div><div class='add'>+		WRITE_ONCE(tp-&gt;tsoffset, val - tcp_clock_ts(tp-&gt;tcp_usec_ts));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_REPAIR_WINDOW:</div><div class='ctx'> 		err = tcp_repair_set_window(tp, optval, optlen);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_NOTSENT_LOWAT:</div><div class='del'>-		tp-&gt;notsent_lowat = val;</div><div class='add'>+		WRITE_ONCE(tp-&gt;notsent_lowat, val);</div><div class='ctx'> 		sk-&gt;sk_write_space(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_INQ:</div><div class='hunk'>@@ -3044,38 +4138,36 @@ static int do_tcp_setsockopt(struct sock *sk, int level,</div><div class='ctx'> 		else</div><div class='ctx'> 			tp-&gt;recvmsg_inq = val;</div><div class='ctx'> 		break;</div><div class='add'>+	case TCP_TX_DELAY:</div><div class='add'>+		/* tp-&gt;srtt_us is u32, and is shifted by 3 */</div><div class='add'>+		if (val &lt; 0 || val &gt;= (1U &lt;&lt; (31 - 3))) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tcp_enable_tx_delay(sk, val);</div><div class='add'>+		WRITE_ONCE(tp-&gt;tcp_tx_delay, val);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOPROTOOPT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	release_sock(sk);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tcp_setsockopt(struct sock *sk, int level, int optname, char __user *optval,</div><div class='add'>+int tcp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='ctx'> 		   unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_TCP)</div><div class='del'>-		return icsk-&gt;icsk_af_ops-&gt;setsockopt(sk, level, optname,</div><div class='del'>-						     optval, optlen);</div><div class='del'>-	return do_tcp_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tcp_setsockopt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_tcp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level != SOL_TCP)</div><div class='del'>-		return inet_csk_compat_setsockopt(sk, level, optname,</div><div class='del'>-						  optval, optlen);</div><div class='add'>+		/* Paired with WRITE_ONCE() in do_ipv6_setsockopt() and tcp_v6_connect() */</div><div class='add'>+		return READ_ONCE(icsk-&gt;icsk_af_ops)-&gt;setsockopt(sk, level, optname,</div><div class='add'>+								optval, optlen);</div><div class='ctx'> 	return do_tcp_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(compat_tcp_setsockopt);</div><div class='del'>-#endif</div><div class='add'>+EXPORT_IPV6_MOD(tcp_setsockopt);</div><div class='ctx'> </div><div class='ctx'> static void tcp_get_info_chrono_stats(const struct tcp_sock *tp,</div><div class='ctx'> 				      struct tcp_info *info)</div><div class='hunk'>@@ -3101,10 +4193,13 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk); /* iff sk_type == SOCK_STREAM */</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	const u8 ect1_idx = INET_ECN_ECT_1 - 1;</div><div class='add'>+	const u8 ect0_idx = INET_ECN_ECT_0 - 1;</div><div class='add'>+	const u8 ce_idx = INET_ECN_CE - 1;</div><div class='add'>+	unsigned long rate;</div><div class='ctx'> 	u32 now;</div><div class='ctx'> 	u64 rate64;</div><div class='ctx'> 	bool slow;</div><div class='del'>-	u32 rate;</div><div class='ctx'> </div><div class='ctx'> 	memset(info, 0, sizeof(*info));</div><div class='ctx'> 	if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='hunk'>@@ -3114,23 +4209,23 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='ctx'> </div><div class='ctx'> 	/* Report meaningful fields for all TCP states, including listeners */</div><div class='ctx'> 	rate = READ_ONCE(sk-&gt;sk_pacing_rate);</div><div class='del'>-	rate64 = rate != ~0U ? rate : ~0ULL;</div><div class='add'>+	rate64 = (rate != ~0UL) ? rate : ~0ULL;</div><div class='ctx'> 	info-&gt;tcpi_pacing_rate = rate64;</div><div class='ctx'> </div><div class='ctx'> 	rate = READ_ONCE(sk-&gt;sk_max_pacing_rate);</div><div class='del'>-	rate64 = rate != ~0U ? rate : ~0ULL;</div><div class='add'>+	rate64 = (rate != ~0UL) ? rate : ~0ULL;</div><div class='ctx'> 	info-&gt;tcpi_max_pacing_rate = rate64;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tcpi_reordering = tp-&gt;reordering;</div><div class='del'>-	info-&gt;tcpi_snd_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	info-&gt;tcpi_snd_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;tcpi_state == TCP_LISTEN) {</div><div class='ctx'> 		/* listeners aliased fields :</div><div class='ctx'> 		 * tcpi_unacked -&gt; Number of children ready for accept()</div><div class='ctx'> 		 * tcpi_sacked  -&gt; max backlog</div><div class='ctx'> 		 */</div><div class='del'>-		info-&gt;tcpi_unacked = sk-&gt;sk_ack_backlog;</div><div class='del'>-		info-&gt;tcpi_sacked = sk-&gt;sk_max_ack_backlog;</div><div class='add'>+		info-&gt;tcpi_unacked = READ_ONCE(sk-&gt;sk_ack_backlog);</div><div class='add'>+		info-&gt;tcpi_sacked = READ_ONCE(sk-&gt;sk_max_ack_backlog);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3151,15 +4246,20 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='ctx'> 		info-&gt;tcpi_rcv_wscale = tp-&gt;rx_opt.rcv_wscale;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;ecn_flags &amp; TCP_ECN_OK)</div><div class='add'>+	if (tcp_ecn_mode_any(tp))</div><div class='ctx'> 		info-&gt;tcpi_options |= TCPI_OPT_ECN;</div><div class='ctx'> 	if (tp-&gt;ecn_flags &amp; TCP_ECN_SEEN)</div><div class='ctx'> 		info-&gt;tcpi_options |= TCPI_OPT_ECN_SEEN;</div><div class='ctx'> 	if (tp-&gt;syn_data_acked)</div><div class='ctx'> 		info-&gt;tcpi_options |= TCPI_OPT_SYN_DATA;</div><div class='add'>+	if (tp-&gt;tcp_usec_ts)</div><div class='add'>+		info-&gt;tcpi_options |= TCPI_OPT_USEC_TS;</div><div class='add'>+	if (tp-&gt;syn_fastopen_child)</div><div class='add'>+		info-&gt;tcpi_options |= TCPI_OPT_TFO_CHILD;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tcpi_rto = jiffies_to_usecs(icsk-&gt;icsk_rto);</div><div class='del'>-	info-&gt;tcpi_ato = jiffies_to_usecs(icsk-&gt;icsk_ack.ato);</div><div class='add'>+	info-&gt;tcpi_ato = jiffies_to_usecs(min_t(u32, icsk-&gt;icsk_ack.ato,</div><div class='add'>+						tcp_delack_max(sk)));</div><div class='ctx'> 	info-&gt;tcpi_snd_mss = tp-&gt;mss_cache;</div><div class='ctx'> 	info-&gt;tcpi_rcv_mss = icsk-&gt;icsk_ack.rcv_mss;</div><div class='ctx'> </div><div class='hunk'>@@ -3192,10 +4292,12 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='ctx'> 	tcp_get_info_chrono_stats(tp, info);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tcpi_segs_out = tp-&gt;segs_out;</div><div class='del'>-	info-&gt;tcpi_segs_in = tp-&gt;segs_in;</div><div class='add'>+</div><div class='add'>+	/* segs_in and data_segs_in can be updated from tcp_segs_in() from BH */</div><div class='add'>+	info-&gt;tcpi_segs_in = READ_ONCE(tp-&gt;segs_in);</div><div class='add'>+	info-&gt;tcpi_data_segs_in = READ_ONCE(tp-&gt;data_segs_in);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tcpi_min_rtt = tcp_min_rtt(tp);</div><div class='del'>-	info-&gt;tcpi_data_segs_in = tp-&gt;data_segs_in;</div><div class='ctx'> 	info-&gt;tcpi_data_segs_out = tp-&gt;data_segs_out;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tcpi_delivery_rate_app_limited = tp-&gt;rate_app_limited ? 1 : 0;</div><div class='hunk'>@@ -3208,6 +4310,28 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)</div><div class='ctx'> 	info-&gt;tcpi_bytes_retrans = tp-&gt;bytes_retrans;</div><div class='ctx'> 	info-&gt;tcpi_dsack_dups = tp-&gt;dsack_dups;</div><div class='ctx'> 	info-&gt;tcpi_reord_seen = tp-&gt;reord_seen;</div><div class='add'>+	info-&gt;tcpi_rcv_ooopack = tp-&gt;rcv_ooopack;</div><div class='add'>+	info-&gt;tcpi_snd_wnd = tp-&gt;snd_wnd;</div><div class='add'>+	info-&gt;tcpi_rcv_wnd = tp-&gt;rcv_wnd;</div><div class='add'>+	info-&gt;tcpi_rehash = tp-&gt;plb_rehash + tp-&gt;timeout_rehash;</div><div class='add'>+	info-&gt;tcpi_fastopen_client_fail = tp-&gt;fastopen_client_fail;</div><div class='add'>+</div><div class='add'>+	info-&gt;tcpi_total_rto = tp-&gt;total_rto;</div><div class='add'>+	info-&gt;tcpi_total_rto_recoveries = tp-&gt;total_rto_recoveries;</div><div class='add'>+	info-&gt;tcpi_total_rto_time = tp-&gt;total_rto_time;</div><div class='add'>+	if (tp-&gt;rto_stamp)</div><div class='add'>+		info-&gt;tcpi_total_rto_time += tcp_clock_ms() - tp-&gt;rto_stamp;</div><div class='add'>+</div><div class='add'>+	info-&gt;tcpi_accecn_fail_mode = tp-&gt;accecn_fail_mode;</div><div class='add'>+	info-&gt;tcpi_accecn_opt_seen = tp-&gt;saw_accecn_opt;</div><div class='add'>+	info-&gt;tcpi_received_ce = tp-&gt;received_ce;</div><div class='add'>+	info-&gt;tcpi_delivered_e1_bytes = tp-&gt;delivered_ecn_bytes[ect1_idx];</div><div class='add'>+	info-&gt;tcpi_delivered_e0_bytes = tp-&gt;delivered_ecn_bytes[ect0_idx];</div><div class='add'>+	info-&gt;tcpi_delivered_ce_bytes = tp-&gt;delivered_ecn_bytes[ce_idx];</div><div class='add'>+	info-&gt;tcpi_received_e1_bytes = tp-&gt;received_ecn_bytes[ect1_idx];</div><div class='add'>+	info-&gt;tcpi_received_e0_bytes = tp-&gt;received_ecn_bytes[ect0_idx];</div><div class='add'>+	info-&gt;tcpi_received_ce_bytes = tp-&gt;received_ecn_bytes[ce_idx];</div><div class='add'>+</div><div class='ctx'> 	unlock_sock_fast(sk, slow);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_get_info);</div><div class='hunk'>@@ -3236,16 +4360,35 @@ static size_t tcp_opt_stats_get_size(void)</div><div class='ctx'> 		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_RETRANS */</div><div class='ctx'> 		nla_total_size(sizeof(u32)) + /* TCP_NLA_DSACK_DUPS */</div><div class='ctx'> 		nla_total_size(sizeof(u32)) + /* TCP_NLA_REORD_SEEN */</div><div class='add'>+		nla_total_size(sizeof(u32)) + /* TCP_NLA_SRTT */</div><div class='add'>+		nla_total_size(sizeof(u16)) + /* TCP_NLA_TIMEOUT_REHASH */</div><div class='add'>+		nla_total_size(sizeof(u32)) + /* TCP_NLA_BYTES_NOTSENT */</div><div class='add'>+		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_EDT */</div><div class='add'>+		nla_total_size(sizeof(u8)) + /* TCP_NLA_TTL */</div><div class='add'>+		nla_total_size(sizeof(u32)) + /* TCP_NLA_REHASH */</div><div class='ctx'> 		0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)</div><div class='add'>+/* Returns TTL or hop limit of an incoming packet from skb. */</div><div class='add'>+static u8 tcp_skb_ttl_or_hop_limit(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		return ip_hdr(skb)-&gt;ttl;</div><div class='add'>+	else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		return ipv6_hdr(skb)-&gt;hop_limit;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk,</div><div class='add'>+					       const struct sk_buff *orig_skb,</div><div class='add'>+					       const struct sk_buff *ack_skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *stats;</div><div class='ctx'> 	struct tcp_info info;</div><div class='add'>+	unsigned long rate;</div><div class='ctx'> 	u64 rate64;</div><div class='del'>-	u32 rate;</div><div class='ctx'> </div><div class='ctx'> 	stats = alloc_skb(tcp_opt_stats_get_size(), GFP_ATOMIC);</div><div class='ctx'> 	if (!stats)</div><div class='hunk'>@@ -3264,17 +4407,18 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)</div><div class='ctx'> 			  tp-&gt;total_retrans, TCP_NLA_PAD);</div><div class='ctx'> </div><div class='ctx'> 	rate = READ_ONCE(sk-&gt;sk_pacing_rate);</div><div class='del'>-	rate64 = rate != ~0U ? rate : ~0ULL;</div><div class='add'>+	rate64 = (rate != ~0UL) ? rate : ~0ULL;</div><div class='ctx'> 	nla_put_u64_64bit(stats, TCP_NLA_PACING_RATE, rate64, TCP_NLA_PAD);</div><div class='ctx'> </div><div class='ctx'> 	rate64 = tcp_compute_delivery_rate(tp);</div><div class='ctx'> 	nla_put_u64_64bit(stats, TCP_NLA_DELIVERY_RATE, rate64, TCP_NLA_PAD);</div><div class='ctx'> </div><div class='del'>-	nla_put_u32(stats, TCP_NLA_SND_CWND, tp-&gt;snd_cwnd);</div><div class='add'>+	nla_put_u32(stats, TCP_NLA_SND_CWND, tcp_snd_cwnd(tp));</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_REORDERING, tp-&gt;reordering);</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_MIN_RTT, tcp_min_rtt(tp));</div><div class='ctx'> </div><div class='del'>-	nla_put_u8(stats, TCP_NLA_RECUR_RETRANS, inet_csk(sk)-&gt;icsk_retransmits);</div><div class='add'>+	nla_put_u8(stats, TCP_NLA_RECUR_RETRANS,</div><div class='add'>+		   READ_ONCE(inet_csk(sk)-&gt;icsk_retransmits));</div><div class='ctx'> 	nla_put_u8(stats, TCP_NLA_DELIVERY_RATE_APP_LMT, !!tp-&gt;rate_app_limited);</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_SND_SSTHRESH, tp-&gt;snd_ssthresh);</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_DELIVERED, tp-&gt;delivered);</div><div class='hunk'>@@ -3289,31 +4433,44 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)</div><div class='ctx'> 			  TCP_NLA_PAD);</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp-&gt;dsack_dups);</div><div class='ctx'> 	nla_put_u32(stats, TCP_NLA_REORD_SEEN, tp-&gt;reord_seen);</div><div class='add'>+	nla_put_u32(stats, TCP_NLA_SRTT, tp-&gt;srtt_us &gt;&gt; 3);</div><div class='add'>+	nla_put_u16(stats, TCP_NLA_TIMEOUT_REHASH, tp-&gt;timeout_rehash);</div><div class='add'>+	nla_put_u32(stats, TCP_NLA_BYTES_NOTSENT,</div><div class='add'>+		    max_t(int, 0, tp-&gt;write_seq - tp-&gt;snd_nxt));</div><div class='add'>+	nla_put_u64_64bit(stats, TCP_NLA_EDT, orig_skb-&gt;skb_mstamp_ns,</div><div class='add'>+			  TCP_NLA_PAD);</div><div class='add'>+	if (ack_skb)</div><div class='add'>+		nla_put_u8(stats, TCP_NLA_TTL,</div><div class='add'>+			   tcp_skb_ttl_or_hop_limit(ack_skb));</div><div class='ctx'> </div><div class='add'>+	nla_put_u32(stats, TCP_NLA_REHASH, tp-&gt;plb_rehash + tp-&gt;timeout_rehash);</div><div class='ctx'> 	return stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='del'>-		int optname, char __user *optval, int __user *optlen)</div><div class='add'>+int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='add'>+		      int optname, sockptr_t optval, sockptr_t optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	int user_mss;</div><div class='ctx'> 	int val, len;</div><div class='ctx'> </div><div class='del'>-	if (get_user(len, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	len = min_t(unsigned int, len, sizeof(int));</div><div class='del'>-</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	len = min_t(unsigned int, len, sizeof(int));</div><div class='add'>+</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case TCP_MAXSEG:</div><div class='ctx'> 		val = tp-&gt;mss_cache;</div><div class='del'>-		if (!val &amp;&amp; ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)))</div><div class='del'>-			val = tp-&gt;rx_opt.user_mss;</div><div class='add'>+		user_mss = READ_ONCE(tp-&gt;rx_opt.user_mss);</div><div class='add'>+		if (user_mss &amp;&amp;</div><div class='add'>+		    ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)))</div><div class='add'>+			val = user_mss;</div><div class='ctx'> 		if (tp-&gt;repair)</div><div class='ctx'> 			val = tp-&gt;rx_opt.mss_clamp;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3333,32 +4490,34 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		val = keepalive_probes(tp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_SYNCNT:</div><div class='del'>-		val = icsk-&gt;icsk_syn_retries ? : net-&gt;ipv4.sysctl_tcp_syn_retries;</div><div class='add'>+		val = READ_ONCE(icsk-&gt;icsk_syn_retries) ? :</div><div class='add'>+			READ_ONCE(net-&gt;ipv4.sysctl_tcp_syn_retries);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_LINGER2:</div><div class='del'>-		val = tp-&gt;linger2;</div><div class='add'>+		val = READ_ONCE(tp-&gt;linger2);</div><div class='ctx'> 		if (val &gt;= 0)</div><div class='del'>-			val = (val ? : net-&gt;ipv4.sysctl_tcp_fin_timeout) / HZ;</div><div class='add'>+			val = (val ? : READ_ONCE(net-&gt;ipv4.sysctl_tcp_fin_timeout)) / HZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_DEFER_ACCEPT:</div><div class='del'>-		val = retrans_to_secs(icsk-&gt;icsk_accept_queue.rskq_defer_accept,</div><div class='del'>-				      TCP_TIMEOUT_INIT / HZ, TCP_RTO_MAX / HZ);</div><div class='add'>+		val = READ_ONCE(icsk-&gt;icsk_accept_queue.rskq_defer_accept);</div><div class='add'>+		val = retrans_to_secs(val, TCP_TIMEOUT_INIT / HZ,</div><div class='add'>+				      TCP_RTO_MAX / HZ);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_WINDOW_CLAMP:</div><div class='del'>-		val = tp-&gt;window_clamp;</div><div class='add'>+		val = READ_ONCE(tp-&gt;window_clamp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_INFO: {</div><div class='ctx'> 		struct tcp_info info;</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		tcp_get_info(sk, &amp;info);</div><div class='ctx'> </div><div class='ctx'> 		len = min_t(unsigned int, len, sizeof(info));</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;info, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;info, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3368,7 +4527,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		size_t sz = 0;</div><div class='ctx'> 		int attr;</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		ca_ops = icsk-&gt;icsk_ca_ops;</div><div class='hunk'>@@ -3376,60 +4535,55 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 			sz = ca_ops-&gt;get_info(sk, ~0U, &amp;attr, &amp;info);</div><div class='ctx'> </div><div class='ctx'> 		len = min_t(unsigned int, len, sz);</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;info, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;info, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case TCP_QUICKACK:</div><div class='del'>-		val = !icsk-&gt;icsk_ack.pingpong;</div><div class='add'>+		val = !inet_csk_in_pingpong_mode(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_CONGESTION:</div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		len = min_t(unsigned int, len, TCP_CA_NAME_MAX);</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, icsk-&gt;icsk_ca_ops-&gt;name, len))</div><div class='add'>+		if (copy_to_sockptr(optval, icsk-&gt;icsk_ca_ops-&gt;name, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_ULP:</div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		len = min_t(unsigned int, len, TCP_ULP_NAME_MAX);</div><div class='ctx'> 		if (!icsk-&gt;icsk_ulp_ops) {</div><div class='del'>-			if (put_user(0, optlen))</div><div class='add'>+			len = 0;</div><div class='add'>+			if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, icsk-&gt;icsk_ulp_ops-&gt;name, len))</div><div class='add'>+		if (copy_to_sockptr(optval, icsk-&gt;icsk_ulp_ops-&gt;name, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_FASTOPEN_KEY: {</div><div class='del'>-		__u8 key[TCP_FASTOPEN_KEY_LENGTH];</div><div class='del'>-		struct tcp_fastopen_context *ctx;</div><div class='add'>+		u64 key[TCP_FASTOPEN_KEY_BUF_LENGTH / sizeof(u64)];</div><div class='add'>+		unsigned int key_len;</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ctx = rcu_dereference(icsk-&gt;icsk_accept_queue.fastopenq.ctx);</div><div class='del'>-		if (ctx)</div><div class='del'>-			memcpy(key, ctx-&gt;key, sizeof(key));</div><div class='del'>-		else</div><div class='del'>-			len = 0;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		len = min_t(unsigned int, len, sizeof(key));</div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		key_len = tcp_fastopen_get_cipher(net, icsk, key) *</div><div class='add'>+				TCP_FASTOPEN_KEY_LENGTH;</div><div class='add'>+		len = min_t(unsigned int, len, key_len);</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, key, len))</div><div class='add'>+		if (copy_to_sockptr(optval, key, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3455,7 +4609,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 	case TCP_REPAIR_WINDOW: {</div><div class='ctx'> 		struct tcp_repair_window opt;</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		if (len != sizeof(opt))</div><div class='hunk'>@@ -3470,7 +4624,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		opt.rcv_wnd	= tp-&gt;rcv_wnd;</div><div class='ctx'> 		opt.rcv_wup	= tp-&gt;rcv_wup;</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(optval, &amp;opt, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;opt, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3484,11 +4638,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_USER_TIMEOUT:</div><div class='del'>-		val = icsk-&gt;icsk_user_timeout;</div><div class='add'>+		val = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_FASTOPEN:</div><div class='del'>-		val = icsk-&gt;icsk_accept_queue.fastopenq.max_qlen;</div><div class='add'>+		val = READ_ONCE(icsk-&gt;icsk_accept_queue.fastopenq.max_qlen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_FASTOPEN_CONNECT:</div><div class='hunk'>@@ -3499,11 +4653,19 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		val = tp-&gt;fastopen_no_cookie;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case TCP_TX_DELAY:</div><div class='add'>+		val = READ_ONCE(tp-&gt;tcp_tx_delay);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case TCP_TIMESTAMP:</div><div class='del'>-		val = tcp_time_stamp_raw() + tp-&gt;tsoffset;</div><div class='add'>+		val = tcp_clock_ts(tp-&gt;tcp_usec_ts) + READ_ONCE(tp-&gt;tsoffset);</div><div class='add'>+		if (tp-&gt;tcp_usec_ts)</div><div class='add'>+			val |= 1;</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_NOTSENT_LOWAT:</div><div class='del'>-		val = tp-&gt;notsent_lowat;</div><div class='add'>+		val = READ_ONCE(tp-&gt;notsent_lowat);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_INQ:</div><div class='ctx'> 		val = tp-&gt;recvmsg_inq;</div><div class='hunk'>@@ -3512,227 +4674,338 @@ static int do_tcp_getsockopt(struct sock *sk, int level,</div><div class='ctx'> 		val = tp-&gt;save_syn;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_SAVED_SYN: {</div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='ctx'> 		if (tp-&gt;saved_syn) {</div><div class='del'>-			if (len &lt; tp-&gt;saved_syn[0]) {</div><div class='del'>-				if (put_user(tp-&gt;saved_syn[0], optlen)) {</div><div class='del'>-					release_sock(sk);</div><div class='add'>+			if (len &lt; tcp_saved_syn_len(tp-&gt;saved_syn)) {</div><div class='add'>+				len = tcp_saved_syn_len(tp-&gt;saved_syn);</div><div class='add'>+				if (copy_to_sockptr(optlen, &amp;len, sizeof(int))) {</div><div class='add'>+					sockopt_release_sock(sk);</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> 				}</div><div class='del'>-				release_sock(sk);</div><div class='add'>+				sockopt_release_sock(sk);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			len = tp-&gt;saved_syn[0];</div><div class='del'>-			if (put_user(len, optlen)) {</div><div class='del'>-				release_sock(sk);</div><div class='add'>+			len = tcp_saved_syn_len(tp-&gt;saved_syn);</div><div class='add'>+			if (copy_to_sockptr(optlen, &amp;len, sizeof(int))) {</div><div class='add'>+				sockopt_release_sock(sk);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='del'>-			if (copy_to_user(optval, tp-&gt;saved_syn + 1, len)) {</div><div class='del'>-				release_sock(sk);</div><div class='add'>+			if (copy_to_sockptr(optval, tp-&gt;saved_syn-&gt;data, len)) {</div><div class='add'>+				sockopt_release_sock(sk);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			tcp_saved_syn_free(tp);</div><div class='del'>-			release_sock(sk);</div><div class='add'>+			sockopt_release_sock(sk);</div><div class='ctx'> 		} else {</div><div class='del'>-			release_sock(sk);</div><div class='add'>+			sockopt_release_sock(sk);</div><div class='ctx'> 			len = 0;</div><div class='del'>-			if (put_user(len, optlen))</div><div class='add'>+			if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	case TCP_ZEROCOPY_RECEIVE: {</div><div class='del'>-		struct tcp_zerocopy_receive zc;</div><div class='add'>+		struct scm_timestamping_internal tss;</div><div class='add'>+		struct tcp_zerocopy_receive zc = {};</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		if (get_user(len, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (len != sizeof(zc))</div><div class='add'>+		if (len &lt; 0 ||</div><div class='add'>+		    len &lt; offsetofend(struct tcp_zerocopy_receive, length))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;zc, optval, len))</div><div class='add'>+		if (unlikely(len &gt; sizeof(zc))) {</div><div class='add'>+			err = check_zeroed_sockptr(optval, sizeof(zc),</div><div class='add'>+						   len - sizeof(zc));</div><div class='add'>+			if (err &lt; 1)</div><div class='add'>+				return err == 0 ? -EINVAL : err;</div><div class='add'>+			len = sizeof(zc);</div><div class='add'>+			if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		if (copy_from_sockptr(&amp;zc, optval, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		err = tcp_zerocopy_receive(sk, &amp;zc);</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		if (!err &amp;&amp; copy_to_user(optval, &amp;zc, len))</div><div class='add'>+		if (zc.reserved)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (zc.msg_flags &amp;  ~(TCP_VALID_ZC_MSG_FLAGS))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='add'>+		err = tcp_zerocopy_receive(sk, &amp;zc, &amp;tss);</div><div class='add'>+		err = BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN(sk, level, optname,</div><div class='add'>+							  &amp;zc, &amp;len, err);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='add'>+		if (len &gt;= offsetofend(struct tcp_zerocopy_receive, msg_flags))</div><div class='add'>+			goto zerocopy_rcv_cmsg;</div><div class='add'>+		switch (len) {</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, msg_flags):</div><div class='add'>+			goto zerocopy_rcv_cmsg;</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, msg_controllen):</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, msg_control):</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, flags):</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, copybuf_len):</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, copybuf_address):</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, err):</div><div class='add'>+			goto zerocopy_rcv_sk_err;</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, inq):</div><div class='add'>+			goto zerocopy_rcv_inq;</div><div class='add'>+		case offsetofend(struct tcp_zerocopy_receive, length):</div><div class='add'>+		default:</div><div class='add'>+			goto zerocopy_rcv_out;</div><div class='add'>+		}</div><div class='add'>+zerocopy_rcv_cmsg:</div><div class='add'>+		if (zc.msg_flags &amp; TCP_CMSG_TS)</div><div class='add'>+			tcp_zc_finalize_rx_tstamp(sk, &amp;zc, &amp;tss);</div><div class='add'>+		else</div><div class='add'>+			zc.msg_flags = 0;</div><div class='add'>+zerocopy_rcv_sk_err:</div><div class='add'>+		if (!err)</div><div class='add'>+			zc.err = sock_error(sk);</div><div class='add'>+zerocopy_rcv_inq:</div><div class='add'>+		zc.inq = tcp_inq_hint(sk);</div><div class='add'>+zerocopy_rcv_out:</div><div class='add'>+		if (!err &amp;&amp; copy_to_sockptr(optval, &amp;zc, len))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	case TCP_AO_REPAIR:</div><div class='add'>+		if (!tcp_can_repair_sock(sk))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		return tcp_ao_get_repair(sk, optval, optlen);</div><div class='add'>+	case TCP_AO_GET_KEYS:</div><div class='add'>+	case TCP_AO_INFO: {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='add'>+		if (optname == TCP_AO_GET_KEYS)</div><div class='add'>+			err = tcp_ao_get_mkts(sk, optval, optlen);</div><div class='add'>+		else</div><div class='add'>+			err = tcp_ao_get_sock_info(sk, optval, optlen);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	case TCP_IS_MPTCP:</div><div class='add'>+		val = 0;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_RTO_MAX_MS:</div><div class='add'>+		val = jiffies_to_msecs(tcp_rto_max(sk));</div><div class='add'>+		break;</div><div class='add'>+	case TCP_RTO_MIN_US:</div><div class='add'>+		val = jiffies_to_usecs(READ_ONCE(inet_csk(sk)-&gt;icsk_rto_min));</div><div class='add'>+		break;</div><div class='add'>+	case TCP_DELACK_MAX_US:</div><div class='add'>+		val = jiffies_to_usecs(READ_ONCE(inet_csk(sk)-&gt;icsk_delack_max));</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (put_user(len, optlen))</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (copy_to_user(optval, &amp;val, len))</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;val, len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval,</div><div class='del'>-		   int __user *optlen)</div><div class='add'>+bool tcp_bpf_bypass_getsockopt(int level, int optname)</div><div class='ctx'> {</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	/* TCP do_tcp_getsockopt has optimized getsockopt implementation</div><div class='add'>+	 * to avoid extra socket lock for TCP_ZEROCOPY_RECEIVE.</div><div class='add'>+	 */</div><div class='add'>+	if (level == SOL_TCP &amp;&amp; optname == TCP_ZEROCOPY_RECEIVE)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	if (level != SOL_TCP)</div><div class='del'>-		return icsk-&gt;icsk_af_ops-&gt;getsockopt(sk, level, optname,</div><div class='del'>-						     optval, optlen);</div><div class='del'>-	return do_tcp_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_getsockopt);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_bpf_bypass_getsockopt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_tcp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, int __user *optlen)</div><div class='add'>+int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval,</div><div class='add'>+		   int __user *optlen)</div><div class='ctx'> {</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='ctx'> 	if (level != SOL_TCP)</div><div class='del'>-		return inet_csk_compat_getsockopt(sk, level, optname,</div><div class='del'>-						  optval, optlen);</div><div class='del'>-	return do_tcp_getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+		/* Paired with WRITE_ONCE() in do_ipv6_setsockopt() and tcp_v6_connect() */</div><div class='add'>+		return READ_ONCE(icsk-&gt;icsk_af_ops)-&gt;getsockopt(sk, level, optname,</div><div class='add'>+								optval, optlen);</div><div class='add'>+	return do_tcp_getsockopt(sk, level, optname, USER_SOCKPTR(optval),</div><div class='add'>+				 USER_SOCKPTR(optlen));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(compat_tcp_getsockopt);</div><div class='del'>-#endif</div><div class='add'>+EXPORT_IPV6_MOD(tcp_getsockopt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-static DEFINE_PER_CPU(struct tcp_md5sig_pool, tcp_md5sig_pool);</div><div class='del'>-static DEFINE_MUTEX(tcp_md5sig_mutex);</div><div class='del'>-static bool tcp_md5sig_pool_populated = false;</div><div class='del'>-</div><div class='del'>-static void __tcp_alloc_md5sig_pool(void)</div><div class='add'>+void tcp_md5_hash_skb_data(struct md5_ctx *ctx, const struct sk_buff *skb,</div><div class='add'>+			   unsigned int header_len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_ahash *hash;</div><div class='del'>-	int cpu;</div><div class='add'>+	const unsigned int head_data_len = skb_headlen(skb) &gt; header_len ?</div><div class='add'>+					   skb_headlen(skb) - header_len : 0;</div><div class='add'>+	const struct skb_shared_info *shi = skb_shinfo(skb);</div><div class='add'>+	struct sk_buff *frag_iter;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	hash = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (IS_ERR(hash))</div><div class='del'>-		return;</div><div class='add'>+	md5_update(ctx, (const u8 *)tcp_hdr(skb) + header_len, head_data_len);</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		void *scratch = per_cpu(tcp_md5sig_pool, cpu).scratch;</div><div class='del'>-		struct ahash_request *req;</div><div class='del'>-</div><div class='del'>-		if (!scratch) {</div><div class='del'>-			scratch = kmalloc_node(sizeof(union tcp_md5sum_block) +</div><div class='del'>-					       sizeof(struct tcphdr),</div><div class='del'>-					       GFP_KERNEL,</div><div class='del'>-					       cpu_to_node(cpu));</div><div class='del'>-			if (!scratch)</div><div class='del'>-				return;</div><div class='del'>-			per_cpu(tcp_md5sig_pool, cpu).scratch = scratch;</div><div class='add'>+	for (i = 0; i &lt; shi-&gt;nr_frags; ++i) {</div><div class='add'>+		const skb_frag_t *f = &amp;shi-&gt;frags[i];</div><div class='add'>+		u32 p_off, p_len, copied;</div><div class='add'>+		const void *vaddr;</div><div class='add'>+		struct page *p;</div><div class='add'>+</div><div class='add'>+		skb_frag_foreach_page(f, skb_frag_off(f), skb_frag_size(f),</div><div class='add'>+				      p, p_off, p_len, copied) {</div><div class='add'>+			vaddr = kmap_local_page(p);</div><div class='add'>+			md5_update(ctx, vaddr + p_off, p_len);</div><div class='add'>+			kunmap_local(vaddr);</div><div class='ctx'> 		}</div><div class='del'>-		if (per_cpu(tcp_md5sig_pool, cpu).md5_req)</div><div class='del'>-			continue;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		req = ahash_request_alloc(hash, GFP_KERNEL);</div><div class='del'>-		if (!req)</div><div class='del'>-			return;</div><div class='add'>+	skb_walk_frags(skb, frag_iter)</div><div class='add'>+		tcp_md5_hash_skb_data(ctx, frag_iter, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_hash_skb_data);</div><div class='ctx'> </div><div class='del'>-		ahash_request_set_callback(req, 0, NULL, NULL);</div><div class='add'>+void tcp_md5_hash_key(struct md5_ctx *ctx,</div><div class='add'>+		      const struct tcp_md5sig_key *key)</div><div class='add'>+{</div><div class='add'>+	u8 keylen = READ_ONCE(key-&gt;keylen); /* paired with WRITE_ONCE() in tcp_md5_do_add */</div><div class='ctx'> </div><div class='del'>-		per_cpu(tcp_md5sig_pool, cpu).md5_req = req;</div><div class='del'>-	}</div><div class='del'>-	/* before setting tcp_md5sig_pool_populated, we must commit all writes</div><div class='del'>-	 * to memory. See smp_rmb() in tcp_get_md5sig_pool()</div><div class='add'>+	/* We use data_race() because tcp_md5_do_add() might change</div><div class='add'>+	 * key-&gt;key under us</div><div class='ctx'> 	 */</div><div class='del'>-	smp_wmb();</div><div class='del'>-	tcp_md5sig_pool_populated = true;</div><div class='add'>+	data_race(({ md5_update(ctx, key-&gt;key, keylen), 0; }));</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_hash_key);</div><div class='ctx'> </div><div class='del'>-bool tcp_alloc_md5sig_pool(void)</div><div class='add'>+/* Called with rcu_read_lock() */</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+tcp_inbound_md5_hash(const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		     const void *saddr, const void *daddr,</div><div class='add'>+		     int family, int l3index, const __u8 *hash_location)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!tcp_md5sig_pool_populated)) {</div><div class='del'>-		mutex_lock(&amp;tcp_md5sig_mutex);</div><div class='del'>-</div><div class='del'>-		if (!tcp_md5sig_pool_populated)</div><div class='del'>-			__tcp_alloc_md5sig_pool();</div><div class='add'>+	/* This gets called for each TCP segment that has TCP-MD5 option.</div><div class='add'>+	 * We have 2 drop cases:</div><div class='add'>+	 * o An MD5 signature is present, but we're not expecting one.</div><div class='add'>+	 * o The MD5 signature is wrong.</div><div class='add'>+	 */</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_md5sig_key *key;</div><div class='add'>+	u8 newhash[16];</div><div class='add'>+</div><div class='add'>+	key = tcp_md5_do_lookup(sk, l3index, saddr, family);</div><div class='add'>+	if (!key) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED);</div><div class='add'>+		trace_tcp_hash_md5_unexpected(sk, skb);</div><div class='add'>+		return SKB_DROP_REASON_TCP_MD5UNEXPECTED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		mutex_unlock(&amp;tcp_md5sig_mutex);</div><div class='add'>+	/* Check the signature.</div><div class='add'>+	 * To support dual stack listeners, we need to handle</div><div class='add'>+	 * IPv4-mapped case.</div><div class='add'>+	 */</div><div class='add'>+	if (family == AF_INET)</div><div class='add'>+		tcp_v4_md5_hash_skb(newhash, key, NULL, skb);</div><div class='add'>+	else</div><div class='add'>+		tp-&gt;af_specific-&gt;calc_md5_hash(newhash, key, NULL, skb);</div><div class='add'>+	if (memcmp(hash_location, newhash, 16) != 0) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5FAILURE);</div><div class='add'>+		trace_tcp_hash_md5_mismatch(sk, skb);</div><div class='add'>+		return SKB_DROP_REASON_TCP_MD5FAILURE;</div><div class='ctx'> 	}</div><div class='del'>-	return tcp_md5sig_pool_populated;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_alloc_md5sig_pool);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	tcp_get_md5sig_pool - get md5sig_pool for this user</div><div class='del'>- *</div><div class='del'>- *	We use percpu structure, so if we succeed, we exit with preemption</div><div class='del'>- *	and BH disabled, to make sure another thread or softirq handling</div><div class='del'>- *	wont try to get same context.</div><div class='del'>- */</div><div class='del'>-struct tcp_md5sig_pool *tcp_get_md5sig_pool(void)</div><div class='add'>+#else</div><div class='add'>+static inline enum skb_drop_reason</div><div class='add'>+tcp_inbound_md5_hash(const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		     const void *saddr, const void *daddr,</div><div class='add'>+		     int family, int l3index, const __u8 *hash_location)</div><div class='ctx'> {</div><div class='del'>-	local_bh_disable();</div><div class='del'>-</div><div class='del'>-	if (tcp_md5sig_pool_populated) {</div><div class='del'>-		/* coupled with smp_wmb() in __tcp_alloc_md5sig_pool() */</div><div class='del'>-		smp_rmb();</div><div class='del'>-		return this_cpu_ptr(&amp;tcp_md5sig_pool);</div><div class='del'>-	}</div><div class='del'>-	local_bh_enable();</div><div class='del'>-	return NULL;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_get_md5sig_pool);</div><div class='ctx'> </div><div class='del'>-int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,</div><div class='del'>-			  const struct sk_buff *skb, unsigned int header_len)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-	const struct tcphdr *tp = tcp_hdr(skb);</div><div class='del'>-	struct ahash_request *req = hp-&gt;md5_req;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	const unsigned int head_data_len = skb_headlen(skb) &gt; header_len ?</div><div class='del'>-					   skb_headlen(skb) - header_len : 0;</div><div class='del'>-	const struct skb_shared_info *shi = skb_shinfo(skb);</div><div class='del'>-	struct sk_buff *frag_iter;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	sg_init_table(&amp;sg, 1);</div><div class='add'>+/* Called with rcu_read_lock() */</div><div class='add'>+enum skb_drop_reason</div><div class='add'>+tcp_inbound_hash(struct sock *sk, const struct request_sock *req,</div><div class='add'>+		 const struct sk_buff *skb,</div><div class='add'>+		 const void *saddr, const void *daddr,</div><div class='add'>+		 int family, int dif, int sdif)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	const struct tcp_ao_hdr *aoh;</div><div class='add'>+	const __u8 *md5_location;</div><div class='add'>+	int l3index;</div><div class='add'>+</div><div class='add'>+	/* Invalid option or two times meet any of auth options */</div><div class='add'>+	if (tcp_parse_auth_options(th, &amp;md5_location, &amp;aoh)) {</div><div class='add'>+		trace_tcp_hash_bad_header(sk, skb);</div><div class='add'>+		return SKB_DROP_REASON_TCP_AUTH_HDR;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sg_set_buf(&amp;sg, ((u8 *) tp) + header_len, head_data_len);</div><div class='del'>-	ahash_request_set_crypt(req, &amp;sg, NULL, head_data_len);</div><div class='del'>-	if (crypto_ahash_update(req))</div><div class='del'>-		return 1;</div><div class='add'>+	if (req) {</div><div class='add'>+		if (tcp_rsk_used_ao(req) != !!aoh) {</div><div class='add'>+			u8 keyid, rnext, maclen;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; shi-&gt;nr_frags; ++i) {</div><div class='del'>-		const struct skb_frag_struct *f = &amp;shi-&gt;frags[i];</div><div class='del'>-		unsigned int offset = f-&gt;page_offset;</div><div class='del'>-		struct page *page = skb_frag_page(f) + (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+			if (aoh) {</div><div class='add'>+				keyid = aoh-&gt;keyid;</div><div class='add'>+				rnext = aoh-&gt;rnext_keyid;</div><div class='add'>+				maclen = tcp_ao_hdr_maclen(aoh);</div><div class='add'>+			} else {</div><div class='add'>+				keyid = rnext = maclen = 0;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		sg_set_page(&amp;sg, page, skb_frag_size(f),</div><div class='del'>-			    offset_in_page(offset));</div><div class='del'>-		ahash_request_set_crypt(req, &amp;sg, NULL, skb_frag_size(f));</div><div class='del'>-		if (crypto_ahash_update(req))</div><div class='del'>-			return 1;</div><div class='add'>+			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD);</div><div class='add'>+			trace_tcp_ao_handshake_failure(sk, skb, keyid, rnext, maclen);</div><div class='add'>+			return SKB_DROP_REASON_TCP_AOFAILURE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_walk_frags(skb, frag_iter)</div><div class='del'>-		if (tcp_md5_hash_skb_data(hp, frag_iter, 0))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tcp_md5_hash_skb_data);</div><div class='add'>+	/* sdif set, means packet ingressed via a device</div><div class='add'>+	 * in an L3 domain and dif is set to the l3mdev</div><div class='add'>+	 */</div><div class='add'>+	l3index = sdif ? dif : 0;</div><div class='add'>+</div><div class='add'>+	/* Fast path: unsigned segments */</div><div class='add'>+	if (likely(!md5_location &amp;&amp; !aoh)) {</div><div class='add'>+		/* Drop if there's TCP-MD5 or TCP-AO key with any rcvid/sndid</div><div class='add'>+		 * for the remote peer. On TCP-AO established connection</div><div class='add'>+		 * the last key is impossible to remove, so there's</div><div class='add'>+		 * always at least one current_key.</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_ao_required(sk, saddr, family, l3index, true)) {</div><div class='add'>+			trace_tcp_hash_ao_required(sk, skb);</div><div class='add'>+			return SKB_DROP_REASON_TCP_AONOTFOUND;</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(tcp_md5_do_lookup(sk, l3index, saddr, family))) {</div><div class='add'>+			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND);</div><div class='add'>+			trace_tcp_hash_md5_required(sk, skb);</div><div class='add'>+			return SKB_DROP_REASON_TCP_MD5NOTFOUND;</div><div class='add'>+		}</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, const struct tcp_md5sig_key *key)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist sg;</div><div class='add'>+	if (aoh)</div><div class='add'>+		return tcp_inbound_ao_hash(sk, skb, family, req, l3index, aoh);</div><div class='ctx'> </div><div class='del'>-	sg_init_one(&amp;sg, key-&gt;key, key-&gt;keylen);</div><div class='del'>-	ahash_request_set_crypt(hp-&gt;md5_req, &amp;sg, NULL, key-&gt;keylen);</div><div class='del'>-	return crypto_ahash_update(hp-&gt;md5_req);</div><div class='add'>+	return tcp_inbound_md5_hash(sk, skb, saddr, daddr, family,</div><div class='add'>+				    l3index, md5_location);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_md5_hash_key);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_inbound_hash);</div><div class='ctx'> </div><div class='ctx'> void tcp_done(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct request_sock *req = tcp_sk(sk)-&gt;fastopen_rsk;</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+</div><div class='add'>+	/* We might be called with a new socket, after</div><div class='add'>+	 * inet_csk_prepare_forced_close() has been called</div><div class='add'>+	 * so we can not use lockdep_sock_is_held(sk)</div><div class='add'>+	 */</div><div class='add'>+	req = rcu_dereference_protected(tcp_sk(sk)-&gt;fastopen_rsk, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_SYN_SENT || sk-&gt;sk_state == TCP_SYN_RECV)</div><div class='ctx'> 		TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);</div><div class='hunk'>@@ -3742,7 +5015,7 @@ void tcp_done(struct sock *sk)</div><div class='ctx'> 	if (req)</div><div class='ctx'> 		reqsk_fastopen_remove(sk, req, false);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_shutdown = SHUTDOWN_MASK;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_shutdown, SHUTDOWN_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (!sock_flag(sk, SOCK_DEAD))</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='hunk'>@@ -3753,20 +5026,37 @@ EXPORT_SYMBOL_GPL(tcp_done);</div><div class='ctx'> </div><div class='ctx'> int tcp_abort(struct sock *sk, int err)</div><div class='ctx'> {</div><div class='del'>-	if (!sk_fullsock(sk)) {</div><div class='del'>-		if (sk-&gt;sk_state == TCP_NEW_SYN_RECV) {</div><div class='del'>-			struct request_sock *req = inet_reqsk(sk);</div><div class='add'>+	int state = inet_sk_state_load(sk);</div><div class='ctx'> </div><div class='del'>-			local_bh_disable();</div><div class='del'>-			inet_csk_reqsk_queue_drop(req-&gt;rsk_listener, req);</div><div class='del'>-			local_bh_enable();</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	if (state == TCP_NEW_SYN_RECV) {</div><div class='add'>+		struct request_sock *req = inet_reqsk(sk);</div><div class='add'>+</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		inet_csk_reqsk_queue_drop(req-&gt;rsk_listener, req);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (state == TCP_TIME_WAIT) {</div><div class='add'>+		struct inet_timewait_sock *tw = inet_twsk(sk);</div><div class='ctx'> </div><div class='del'>-	/* Don't race with userspace socket closes such as tcp_close. */</div><div class='del'>-	lock_sock(sk);</div><div class='add'>+		refcount_inc(&amp;tw-&gt;tw_refcnt);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		inet_twsk_deschedule_put(tw);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BPF context ensures sock locking. */</div><div class='add'>+	if (!has_current_bpf_ctx())</div><div class='add'>+		/* Don't race with userspace socket closes such as tcp_close. */</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* Avoid closing the same socket twice. */</div><div class='add'>+	if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+		if (!has_current_bpf_ctx())</div><div class='add'>+			release_sock(sk);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_LISTEN) {</div><div class='ctx'> 		tcp_set_state(sk, TCP_CLOSE);</div><div class='hunk'>@@ -3777,20 +5067,15 @@ int tcp_abort(struct sock *sk, int err)</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-		sk-&gt;sk_err = err;</div><div class='del'>-		/* This barrier is coupled with smp_rmb() in tcp_poll() */</div><div class='del'>-		smp_wmb();</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='del'>-		if (tcp_need_reset(sk-&gt;sk_state))</div><div class='del'>-			tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='del'>-		tcp_done(sk);</div><div class='del'>-	}</div><div class='add'>+	if (tcp_need_reset(sk-&gt;sk_state))</div><div class='add'>+		tcp_send_active_reset(sk, GFP_ATOMIC,</div><div class='add'>+				      SK_RST_REASON_TCP_STATE);</div><div class='add'>+	tcp_done_with_error(sk, err);</div><div class='ctx'> </div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> 	local_bh_enable();</div><div class='del'>-	tcp_write_queue_purge(sk);</div><div class='del'>-	release_sock(sk);</div><div class='add'>+	if (!has_current_bpf_ctx())</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_abort);</div><div class='hunk'>@@ -3823,25 +5108,130 @@ static void __init tcp_init_mem(void)</div><div class='ctx'> 	sysctl_tcp_mem[2] = sysctl_tcp_mem[0] * 2;	/* 9.37 % */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init tcp_struct_check(void)</div><div class='add'>+{</div><div class='add'>+	/* TX read-mostly hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, max_window);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, rcv_ssthresh);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, reordering);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, notsent_lowat);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, gso_segs);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, retransmit_skb_hint);</div><div class='add'>+#if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, tcp_clean_acked);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* TXRX read-mostly hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, tsoffset);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, snd_wnd);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, mss_cache);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, snd_cwnd);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, prr_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, lost_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, sacked_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, scaling_ratio);</div><div class='add'>+</div><div class='add'>+	/* RX read-mostly hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, copied_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, snd_wl1);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, tlp_high_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, rttvar_us);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, retrans_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, advmss);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, urg_data);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, lost);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, rtt_min);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, out_of_order_queue);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, snd_ssthresh);</div><div class='add'>+</div><div class='add'>+	/* TX read-write hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, segs_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, data_segs_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, bytes_sent);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, snd_sml);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, chrono_start);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, chrono_stat);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, write_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, pushed_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, lsndtime);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, mdev_us);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, tcp_wstamp_ns);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, accecn_opt_tstamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, rtt_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, tsorted_sent_queue);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, highest_sack);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, ecn_flags);</div><div class='add'>+</div><div class='add'>+	/* TXRX read-write hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, pred_flags);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, tcp_clock_cache);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, tcp_mstamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, rcv_nxt);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, snd_nxt);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, snd_una);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, window_clamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, srtt_us);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, packets_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, snd_up);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, delivered);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, delivered_ce);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, received_ce);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, received_ecn_bytes);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, app_limited);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, rcv_wnd);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, rcv_tstamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_txrx, rx_opt);</div><div class='add'>+</div><div class='add'>+	/* RX read-write hotpath cache lines */</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, bytes_received);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, segs_in);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, data_segs_in);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rcv_wup);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, max_packets_out);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, cwnd_usage_seq);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rate_delivered);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rate_interval_us);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rcv_rtt_last_tsecr);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, delivered_ecn_bytes);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, first_tx_mstamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, delivered_mstamp);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, bytes_acked);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rcv_rtt_est);</div><div class='add'>+	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_rx, rcvq_space);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init tcp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int max_rshare, max_wshare, cnt;</div><div class='ctx'> 	unsigned long limit;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(TCP_MIN_SND_MSS &lt;= MAX_TCP_OPTION_SPACE);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct tcp_skb_cb) &gt;</div><div class='del'>-		     FIELD_SIZEOF(struct sk_buff, cb));</div><div class='add'>+		     sizeof_field(struct sk_buff, cb));</div><div class='add'>+</div><div class='add'>+	tcp_struct_check();</div><div class='ctx'> </div><div class='ctx'> 	percpu_counter_init(&amp;tcp_sockets_allocated, 0, GFP_KERNEL);</div><div class='del'>-	percpu_counter_init(&amp;tcp_orphan_count, 0, GFP_KERNEL);</div><div class='del'>-	inet_hashinfo_init(&amp;tcp_hashinfo);</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;tcp_orphan_timer, tcp_orphan_update, TIMER_DEFERRABLE);</div><div class='add'>+	mod_timer(&amp;tcp_orphan_timer, jiffies + TCP_ORPHAN_TIMER_PERIOD);</div><div class='add'>+</div><div class='ctx'> 	inet_hashinfo2_init(&amp;tcp_hashinfo, "tcp_listen_portaddr_hash",</div><div class='ctx'> 			    thash_entries, 21,  /* one slot per 2 MB*/</div><div class='ctx'> 			    0, 64 * 1024);</div><div class='ctx'> 	tcp_hashinfo.bind_bucket_cachep =</div><div class='ctx'> 		kmem_cache_create("tcp_bind_bucket",</div><div class='ctx'> 				  sizeof(struct inet_bind_bucket), 0,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);</div><div class='add'>+				  SLAB_HWCACHE_ALIGN | SLAB_PANIC |</div><div class='add'>+				  SLAB_ACCOUNT,</div><div class='add'>+				  NULL);</div><div class='add'>+	tcp_hashinfo.bind2_bucket_cachep =</div><div class='add'>+		kmem_cache_create("tcp_bind2_bucket",</div><div class='add'>+				  sizeof(struct inet_bind2_bucket), 0,</div><div class='add'>+				  SLAB_HWCACHE_ALIGN | SLAB_PANIC |</div><div class='add'>+				  SLAB_ACCOUNT,</div><div class='add'>+				  NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Size and allocate the main established and bind bucket</div><div class='ctx'> 	 * hash tables.</div><div class='hunk'>@@ -3865,7 +5255,7 @@ void __init tcp_init(void)</div><div class='ctx'> 		panic("TCP: failed to alloc ehash_locks");</div><div class='ctx'> 	tcp_hashinfo.bhash =</div><div class='ctx'> 		alloc_large_system_hash("TCP bind",</div><div class='del'>-					sizeof(struct inet_bind_hashbucket),</div><div class='add'>+					2 * sizeof(struct inet_bind_hashbucket),</div><div class='ctx'> 					tcp_hashinfo.ehash_mask + 1,</div><div class='ctx'> 					17, /* one slot per 128 KB of memory */</div><div class='ctx'> 					0,</div><div class='hunk'>@@ -3874,11 +5264,15 @@ void __init tcp_init(void)</div><div class='ctx'> 					0,</div><div class='ctx'> 					64 * 1024);</div><div class='ctx'> 	tcp_hashinfo.bhash_size = 1U &lt;&lt; tcp_hashinfo.bhash_size;</div><div class='add'>+	tcp_hashinfo.bhash2 = tcp_hashinfo.bhash + tcp_hashinfo.bhash_size;</div><div class='ctx'> 	for (i = 0; i &lt; tcp_hashinfo.bhash_size; i++) {</div><div class='ctx'> 		spin_lock_init(&amp;tcp_hashinfo.bhash[i].lock);</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;tcp_hashinfo.bhash[i].chain);</div><div class='add'>+		spin_lock_init(&amp;tcp_hashinfo.bhash2[i].lock);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;tcp_hashinfo.bhash2[i].chain);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tcp_hashinfo.pernet = false;</div><div class='ctx'> </div><div class='ctx'> 	cnt = tcp_hashinfo.ehash_mask + 1;</div><div class='ctx'> 	sysctl_tcp_max_orphans = cnt / 2;</div><div class='hunk'>@@ -3887,15 +5281,15 @@ void __init tcp_init(void)</div><div class='ctx'> 	/* Set per-socket limits to no more than 1/128 the pressure threshold */</div><div class='ctx'> 	limit = nr_free_buffer_pages() &lt;&lt; (PAGE_SHIFT - 7);</div><div class='ctx'> 	max_wshare = min(4UL*1024*1024, limit);</div><div class='del'>-	max_rshare = min(6UL*1024*1024, limit);</div><div class='add'>+	max_rshare = min(32UL*1024*1024, limit);</div><div class='ctx'> </div><div class='del'>-	init_net.ipv4.sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;</div><div class='add'>+	init_net.ipv4.sysctl_tcp_wmem[0] = PAGE_SIZE;</div><div class='ctx'> 	init_net.ipv4.sysctl_tcp_wmem[1] = 16*1024;</div><div class='ctx'> 	init_net.ipv4.sysctl_tcp_wmem[2] = max(64*1024, max_wshare);</div><div class='ctx'> </div><div class='del'>-	init_net.ipv4.sysctl_tcp_rmem[0] = SK_MEM_QUANTUM;</div><div class='del'>-	init_net.ipv4.sysctl_tcp_rmem[1] = 87380;</div><div class='del'>-	init_net.ipv4.sysctl_tcp_rmem[2] = max(87380, max_rshare);</div><div class='add'>+	init_net.ipv4.sysctl_tcp_rmem[0] = PAGE_SIZE;</div><div class='add'>+	init_net.ipv4.sysctl_tcp_rmem[1] = 131072;</div><div class='add'>+	init_net.ipv4.sysctl_tcp_rmem[2] = max(131072, max_rshare);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Hash tables configured (established %u bind %u)\n",</div><div class='ctx'> 		tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size);</div><div class='hunk'>@@ -3903,5 +5297,6 @@ void __init tcp_init(void)</div><div class='ctx'> 	tcp_v4_init();</div><div class='ctx'> 	tcp_metrics_init();</div><div class='ctx'> 	BUG_ON(tcp_register_congestion_control(&amp;tcp_reno) != 0);</div><div class='del'>-	tcp_tasklet_init();</div><div class='add'>+	tcp_tsq_work_init();</div><div class='add'>+	mptcp_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c<br/>new file mode 100644<br/>index 000000000000..34b8450829d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_ao.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_ao.c</a></div><div class='hunk'>@@ -0,0 +1,2442 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * INET		An implementation of the TCP Authentication Option (TCP-AO).</div><div class='add'>+ *		See RFC5925.</div><div class='add'>+ *</div><div class='add'>+ * Authors:	Dmitry Safonov &lt;dima@arista.com&gt;</div><div class='add'>+ *		Francesco Ruggeri &lt;fruggeri@arista.com&gt;</div><div class='add'>+ *		Salam Noureddine &lt;noureddine@arista.com&gt;</div><div class='add'>+ */</div><div class='add'>+#define pr_fmt(fmt) "TCP: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/icmp.h&gt;</div><div class='add'>+#include &lt;trace/events/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_DEFERRED_FALSE(tcp_ao_needed, HZ);</div><div class='add'>+</div><div class='add'>+int tcp_ao_calc_traffic_key(struct tcp_ao_key *mkt, u8 *key, void *ctx,</div><div class='add'>+			    unsigned int len, struct tcp_sigpool *hp)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (crypto_ahash_setkey(crypto_ahash_reqtfm(hp-&gt;req),</div><div class='add'>+				mkt-&gt;key, mkt-&gt;keylen))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	ret = crypto_ahash_init(hp-&gt;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, ctx, len);</div><div class='add'>+	ahash_request_set_crypt(hp-&gt;req, &amp;sg, key, len);</div><div class='add'>+	crypto_ahash_update(hp-&gt;req);</div><div class='add'>+</div><div class='add'>+	ret = crypto_ahash_final(hp-&gt;req);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+clear_hash:</div><div class='add'>+	memset(key, 0, tcp_ao_digest_size(mkt));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool tcp_ao_ignore_icmp(const struct sock *sk, int family, int type, int code)</div><div class='add'>+{</div><div class='add'>+	bool ignore_icmp = false;</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_ao_needed.key))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* RFC5925, 7.8:</div><div class='add'>+	 * &gt;&gt; A TCP-AO implementation MUST default to ignore incoming ICMPv4</div><div class='add'>+	 * messages of Type 3 (destination unreachable), Codes 2-4 (protocol</div><div class='add'>+	 * unreachable, port unreachable, and fragmentation needed -- ’hard</div><div class='add'>+	 * errors’), and ICMPv6 Type 1 (destination unreachable), Code 1</div><div class='add'>+	 * (administratively prohibited) and Code 4 (port unreachable) intended</div><div class='add'>+	 * for connections in synchronized states (ESTABLISHED, FIN-WAIT-1, FIN-</div><div class='add'>+	 * WAIT-2, CLOSE-WAIT, CLOSING, LAST-ACK, TIME-WAIT) that match MKTs.</div><div class='add'>+	 */</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		if (type != ICMP_DEST_UNREACH)</div><div class='add'>+			return false;</div><div class='add'>+		if (code &lt; ICMP_PROT_UNREACH || code &gt; ICMP_FRAG_NEEDED)</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		if (type != ICMPV6_DEST_UNREACH)</div><div class='add'>+			return false;</div><div class='add'>+		if (code != ICMPV6_ADM_PROHIBITED &amp;&amp; code != ICMPV6_PORT_UNREACH)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	switch (sk-&gt;sk_state) {</div><div class='add'>+	case TCP_TIME_WAIT:</div><div class='add'>+		ao = rcu_dereference(tcp_twsk(sk)-&gt;ao_info);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_SYN_SENT:</div><div class='add'>+	case TCP_SYN_RECV:</div><div class='add'>+	case TCP_LISTEN:</div><div class='add'>+	case TCP_NEW_SYN_RECV:</div><div class='add'>+		/* RFC5925 specifies to ignore ICMPs *only* on connections</div><div class='add'>+		 * in synchronized states.</div><div class='add'>+		 */</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		ao = rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ao &amp;&amp; !ao-&gt;accept_icmps) {</div><div class='add'>+		ignore_icmp = true;</div><div class='add'>+		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAODROPPEDICMPS);</div><div class='add'>+		atomic64_inc(&amp;ao-&gt;counters.dropped_icmp);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ignore_icmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Optimized version of tcp_ao_do_lookup(): only for sockets for which</div><div class='add'>+ * it's known that the keys in ao_info are matching peer's</div><div class='add'>+ * family/address/VRF/etc.</div><div class='add'>+ */</div><div class='add'>+struct tcp_ao_key *tcp_ao_established_key(const struct sock *sk,</div><div class='add'>+					  struct tcp_ao_info *ao,</div><div class='add'>+					  int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node, lockdep_sock_is_held(sk)) {</div><div class='add'>+		if ((sndid &gt;= 0 &amp;&amp; key-&gt;sndid != sndid) ||</div><div class='add'>+		    (rcvid &gt;= 0 &amp;&amp; key-&gt;rcvid != rcvid))</div><div class='add'>+			continue;</div><div class='add'>+		return key;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv4_prefix_cmp(const struct in_addr *addr1,</div><div class='add'>+			   const struct in_addr *addr2,</div><div class='add'>+			   unsigned int prefixlen)</div><div class='add'>+{</div><div class='add'>+	__be32 mask = inet_make_mask(prefixlen);</div><div class='add'>+	__be32 a1 = addr1-&gt;s_addr &amp; mask;</div><div class='add'>+	__be32 a2 = addr2-&gt;s_addr &amp; mask;</div><div class='add'>+</div><div class='add'>+	if (a1 == a2)</div><div class='add'>+		return 0;</div><div class='add'>+	return memcmp(&amp;a1, &amp;a2, sizeof(a1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __tcp_ao_key_cmp(const struct tcp_ao_key *key, int l3index,</div><div class='add'>+			    const union tcp_ao_addr *addr, u8 prefixlen,</div><div class='add'>+			    int family, int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	if (sndid &gt;= 0 &amp;&amp; key-&gt;sndid != sndid)</div><div class='add'>+		return (key-&gt;sndid &gt; sndid) ? 1 : -1;</div><div class='add'>+	if (rcvid &gt;= 0 &amp;&amp; key-&gt;rcvid != rcvid)</div><div class='add'>+		return (key-&gt;rcvid &gt; rcvid) ? 1 : -1;</div><div class='add'>+	if (l3index &gt;= 0 &amp;&amp; (key-&gt;keyflags &amp; TCP_AO_KEYF_IFINDEX)) {</div><div class='add'>+		if (key-&gt;l3index != l3index)</div><div class='add'>+			return (key-&gt;l3index &gt; l3index) ? 1 : -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (family == AF_UNSPEC)</div><div class='add'>+		return 0;</div><div class='add'>+	if (key-&gt;family != family)</div><div class='add'>+		return (key-&gt;family &gt; family) ? 1 : -1;</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		if (ntohl(key-&gt;addr.a4.s_addr) == INADDR_ANY)</div><div class='add'>+			return 0;</div><div class='add'>+		if (ntohl(addr-&gt;a4.s_addr) == INADDR_ANY)</div><div class='add'>+			return 0;</div><div class='add'>+		return ipv4_prefix_cmp(&amp;key-&gt;addr.a4, &amp;addr-&gt;a4, prefixlen);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (ipv6_addr_any(&amp;key-&gt;addr.a6) || ipv6_addr_any(&amp;addr-&gt;a6))</div><div class='add'>+			return 0;</div><div class='add'>+		if (ipv6_prefix_equal(&amp;key-&gt;addr.a6, &amp;addr-&gt;a6, prefixlen))</div><div class='add'>+			return 0;</div><div class='add'>+		return memcmp(&amp;key-&gt;addr.a6, &amp;addr-&gt;a6, sizeof(addr-&gt;a6));</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_key_cmp(const struct tcp_ao_key *key, int l3index,</div><div class='add'>+			  const union tcp_ao_addr *addr, u8 prefixlen,</div><div class='add'>+			  int family, int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (family == AF_INET6 &amp;&amp; ipv6_addr_v4mapped(&amp;addr-&gt;a6)) {</div><div class='add'>+		__be32 addr4 = addr-&gt;a6.s6_addr32[3];</div><div class='add'>+</div><div class='add'>+		return __tcp_ao_key_cmp(key, l3index,</div><div class='add'>+					(union tcp_ao_addr *)&amp;addr4,</div><div class='add'>+					prefixlen, AF_INET, sndid, rcvid);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return __tcp_ao_key_cmp(key, l3index, addr,</div><div class='add'>+				prefixlen, family, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_key *__tcp_ao_do_lookup(const struct sock *sk, int l3index,</div><div class='add'>+		const union tcp_ao_addr *addr, int family, u8 prefix,</div><div class='add'>+		int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_ao_needed.key))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_check(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+				   lockdep_sock_is_held(sk));</div><div class='add'>+	if (!ao)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node, lockdep_sock_is_held(sk)) {</div><div class='add'>+		u8 prefixlen = min(prefix, key-&gt;prefixlen);</div><div class='add'>+</div><div class='add'>+		if (!tcp_ao_key_cmp(key, l3index, addr, prefixlen,</div><div class='add'>+				    family, sndid, rcvid))</div><div class='add'>+			return key;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tcp_ao_key *tcp_ao_do_lookup(const struct sock *sk, int l3index,</div><div class='add'>+				    const union tcp_ao_addr *addr,</div><div class='add'>+				    int family, int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	return __tcp_ao_do_lookup(sk, l3index, addr, family, U8_MAX, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_info *tcp_ao_alloc_info(gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	ao = kzalloc(sizeof(*ao), flags);</div><div class='add'>+	if (!ao)</div><div class='add'>+		return NULL;</div><div class='add'>+	INIT_HLIST_HEAD(&amp;ao-&gt;head);</div><div class='add'>+	refcount_set(&amp;ao-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+	return ao;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_ao_link_mkt(struct tcp_ao_info *ao, struct tcp_ao_key *mkt)</div><div class='add'>+{</div><div class='add'>+	hlist_add_head_rcu(&amp;mkt-&gt;node, &amp;ao-&gt;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_key *tcp_ao_copy_key(struct sock *sk,</div><div class='add'>+					  struct tcp_ao_key *key)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *new_key;</div><div class='add'>+</div><div class='add'>+	new_key = sock_kmalloc(sk, tcp_ao_sizeof_key(key),</div><div class='add'>+			       GFP_ATOMIC);</div><div class='add'>+	if (!new_key)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*new_key = *key;</div><div class='add'>+	INIT_HLIST_NODE(&amp;new_key-&gt;node);</div><div class='add'>+	tcp_sigpool_get(new_key-&gt;tcp_sigpool_id);</div><div class='add'>+	atomic64_set(&amp;new_key-&gt;pkt_good, 0);</div><div class='add'>+	atomic64_set(&amp;new_key-&gt;pkt_bad, 0);</div><div class='add'>+</div><div class='add'>+	return new_key;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_ao_key_free_rcu(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key = container_of(head, struct tcp_ao_key, rcu);</div><div class='add'>+</div><div class='add'>+	tcp_sigpool_release(key-&gt;tcp_sigpool_id);</div><div class='add'>+	kfree_sensitive(key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_ao_info_free(struct tcp_ao_info *ao)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(key, n, &amp;ao-&gt;head, node) {</div><div class='add'>+		hlist_del(&amp;key-&gt;node);</div><div class='add'>+		tcp_sigpool_release(key-&gt;tcp_sigpool_id);</div><div class='add'>+		kfree_sensitive(key);</div><div class='add'>+	}</div><div class='add'>+	kfree(ao);</div><div class='add'>+	static_branch_slow_dec_deferred(&amp;tcp_ao_needed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_ao_sk_omem_free(struct sock *sk, struct tcp_ao_info *ao)</div><div class='add'>+{</div><div class='add'>+	size_t total_ao_sk_mem = 0;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(key,  &amp;ao-&gt;head, node)</div><div class='add'>+		total_ao_sk_mem += tcp_ao_sizeof_key(key);</div><div class='add'>+	atomic_sub(total_ao_sk_mem, &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_destroy_sock(struct sock *sk, bool twsk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	if (twsk) {</div><div class='add'>+		ao = rcu_dereference_protected(tcp_twsk(sk)-&gt;ao_info, 1);</div><div class='add'>+		rcu_assign_pointer(tcp_twsk(sk)-&gt;ao_info, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		ao = rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info, 1);</div><div class='add'>+		rcu_assign_pointer(tcp_sk(sk)-&gt;ao_info, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ao || !refcount_dec_and_test(&amp;ao-&gt;refcnt))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!twsk)</div><div class='add'>+		tcp_ao_sk_omem_free(sk, ao);</div><div class='add'>+	tcp_ao_info_free(ao);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_time_wait(struct tcp_timewait_sock *tcptw, struct tcp_sock *tp)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao_info = rcu_dereference_protected(tp-&gt;ao_info, 1);</div><div class='add'>+</div><div class='add'>+	if (ao_info) {</div><div class='add'>+		struct tcp_ao_key *key;</div><div class='add'>+		struct hlist_node *n;</div><div class='add'>+		int omem = 0;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_safe(key, n, &amp;ao_info-&gt;head, node) {</div><div class='add'>+			omem += tcp_ao_sizeof_key(key);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		refcount_inc(&amp;ao_info-&gt;refcnt);</div><div class='add'>+		atomic_sub(omem, &amp;(((struct sock *)tp)-&gt;sk_omem_alloc));</div><div class='add'>+		rcu_assign_pointer(tcptw-&gt;ao_info, ao_info);</div><div class='add'>+	} else {</div><div class='add'>+		tcptw-&gt;ao_info = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* 4 tuple and ISNs are expected in NBO */</div><div class='add'>+static int tcp_v4_ao_calc_key(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			      __be32 saddr, __be32 daddr,</div><div class='add'>+			      __be16 sport, __be16 dport,</div><div class='add'>+			      __be32 sisn,  __be32 disn)</div><div class='add'>+{</div><div class='add'>+	/* See RFC5926 3.1.1 */</div><div class='add'>+	struct kdf_input_block {</div><div class='add'>+		u8                      counter;</div><div class='add'>+		u8                      label[6];</div><div class='add'>+		struct tcp4_ao_context	ctx;</div><div class='add'>+		__be16                  outlen;</div><div class='add'>+	} __packed * tmp;</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = tcp_sigpool_start(mkt-&gt;tcp_sigpool_id, &amp;hp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tmp = hp.scratch;</div><div class='add'>+	tmp-&gt;counter	= 1;</div><div class='add'>+	memcpy(tmp-&gt;label, "TCP-AO", 6);</div><div class='add'>+	tmp-&gt;ctx.saddr	= saddr;</div><div class='add'>+	tmp-&gt;ctx.daddr	= daddr;</div><div class='add'>+	tmp-&gt;ctx.sport	= sport;</div><div class='add'>+	tmp-&gt;ctx.dport	= dport;</div><div class='add'>+	tmp-&gt;ctx.sisn	= sisn;</div><div class='add'>+	tmp-&gt;ctx.disn	= disn;</div><div class='add'>+	tmp-&gt;outlen	= htons(tcp_ao_digest_size(mkt) * 8); /* in bits */</div><div class='add'>+</div><div class='add'>+	err = tcp_ao_calc_traffic_key(mkt, key, tmp, sizeof(*tmp), &amp;hp);</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v4_ao_calc_key_sk(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			  const struct sock *sk,</div><div class='add'>+			  __be32 sisn, __be32 disn, bool send)</div><div class='add'>+{</div><div class='add'>+	if (send)</div><div class='add'>+		return tcp_v4_ao_calc_key(mkt, key, sk-&gt;sk_rcv_saddr,</div><div class='add'>+					  sk-&gt;sk_daddr, htons(sk-&gt;sk_num),</div><div class='add'>+					  sk-&gt;sk_dport, sisn, disn);</div><div class='add'>+	else</div><div class='add'>+		return tcp_v4_ao_calc_key(mkt, key, sk-&gt;sk_daddr,</div><div class='add'>+					  sk-&gt;sk_rcv_saddr, sk-&gt;sk_dport,</div><div class='add'>+					  htons(sk-&gt;sk_num), disn, sisn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_calc_key_sk(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			      const struct sock *sk,</div><div class='add'>+			      __be32 sisn, __be32 disn, bool send)</div><div class='add'>+{</div><div class='add'>+	if (mkt-&gt;family == AF_INET)</div><div class='add'>+		return tcp_v4_ao_calc_key_sk(mkt, key, sk, sisn, disn, send);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else if (mkt-&gt;family == AF_INET6)</div><div class='add'>+		return tcp_v6_ao_calc_key_sk(mkt, key, sk, sisn, disn, send);</div><div class='add'>+#endif</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v4_ao_calc_key_rsk(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			   struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+</div><div class='add'>+	return tcp_v4_ao_calc_key(mkt, key,</div><div class='add'>+				  ireq-&gt;ir_loc_addr, ireq-&gt;ir_rmt_addr,</div><div class='add'>+				  htons(ireq-&gt;ir_num), ireq-&gt;ir_rmt_port,</div><div class='add'>+				  htonl(tcp_rsk(req)-&gt;snt_isn),</div><div class='add'>+				  htonl(tcp_rsk(req)-&gt;rcv_isn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_v4_ao_calc_key_skb(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+				  const struct sk_buff *skb,</div><div class='add'>+				  __be32 sisn, __be32 disn)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	return tcp_v4_ao_calc_key(mkt, key, iph-&gt;saddr, iph-&gt;daddr,</div><div class='add'>+				  th-&gt;source, th-&gt;dest, sisn, disn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_calc_key_skb(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			       const struct sk_buff *skb,</div><div class='add'>+			       __be32 sisn, __be32 disn, int family)</div><div class='add'>+{</div><div class='add'>+	if (family == AF_INET)</div><div class='add'>+		return tcp_v4_ao_calc_key_skb(mkt, key, skb, sisn, disn);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else if (family == AF_INET6)</div><div class='add'>+		return tcp_v6_ao_calc_key_skb(mkt, key, skb, sisn, disn);</div><div class='add'>+#endif</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_v4_ao_hash_pseudoheader(struct tcp_sigpool *hp,</div><div class='add'>+				       __be32 daddr, __be32 saddr,</div><div class='add'>+				       int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct tcp4_pseudohdr *bp;</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+</div><div class='add'>+	bp = hp-&gt;scratch;</div><div class='add'>+	bp-&gt;saddr = saddr;</div><div class='add'>+	bp-&gt;daddr = daddr;</div><div class='add'>+	bp-&gt;pad = 0;</div><div class='add'>+	bp-&gt;protocol = IPPROTO_TCP;</div><div class='add'>+	bp-&gt;len = cpu_to_be16(nbytes);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, bp, sizeof(*bp));</div><div class='add'>+	ahash_request_set_crypt(hp-&gt;req, &amp;sg, NULL, sizeof(*bp));</div><div class='add'>+	return crypto_ahash_update(hp-&gt;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_hash_pseudoheader(unsigned short int family,</div><div class='add'>+				    const struct sock *sk,</div><div class='add'>+				    const struct sk_buff *skb,</div><div class='add'>+				    struct tcp_sigpool *hp, int nbytes)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* TODO: Can we rely on checksum being zero to mean outbound pkt? */</div><div class='add'>+	if (!th-&gt;check) {</div><div class='add'>+		if (family == AF_INET)</div><div class='add'>+			return tcp_v4_ao_hash_pseudoheader(hp, sk-&gt;sk_daddr,</div><div class='add'>+					sk-&gt;sk_rcv_saddr, skb-&gt;len);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		else if (family == AF_INET6)</div><div class='add'>+			return tcp_v6_ao_hash_pseudoheader(hp, &amp;sk-&gt;sk_v6_daddr,</div><div class='add'>+					&amp;sk-&gt;sk_v6_rcv_saddr, skb-&gt;len);</div><div class='add'>+#endif</div><div class='add'>+		else</div><div class='add'>+			return -EAFNOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		return tcp_v4_ao_hash_pseudoheader(hp, iph-&gt;daddr,</div><div class='add'>+				iph-&gt;saddr, skb-&gt;len);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (family == AF_INET6) {</div><div class='add'>+		const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+		return tcp_v6_ao_hash_pseudoheader(hp, &amp;iph-&gt;daddr,</div><div class='add'>+				&amp;iph-&gt;saddr, skb-&gt;len);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 tcp_ao_compute_sne(u32 next_sne, u32 next_seq, u32 seq)</div><div class='add'>+{</div><div class='add'>+	u32 sne = next_sne;</div><div class='add'>+</div><div class='add'>+	if (before(seq, next_seq)) {</div><div class='add'>+		if (seq &gt; next_seq)</div><div class='add'>+			sne--;</div><div class='add'>+	} else {</div><div class='add'>+		if (seq &lt; next_seq)</div><div class='add'>+			sne++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sne;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* tcp_ao_hash_sne(struct tcp_sigpool *hp)</div><div class='add'>+ * @hp	- used for hashing</div><div class='add'>+ * @sne - sne value</div><div class='add'>+ */</div><div class='add'>+static int tcp_ao_hash_sne(struct tcp_sigpool *hp, u32 sne)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	__be32 *bp;</div><div class='add'>+</div><div class='add'>+	bp = (__be32 *)hp-&gt;scratch;</div><div class='add'>+	*bp = htonl(sne);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, bp, sizeof(*bp));</div><div class='add'>+	ahash_request_set_crypt(hp-&gt;req, &amp;sg, NULL, sizeof(*bp));</div><div class='add'>+	return crypto_ahash_update(hp-&gt;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_hash_header(struct tcp_sigpool *hp,</div><div class='add'>+			      const struct tcphdr *th,</div><div class='add'>+			      bool exclude_options, u8 *hash,</div><div class='add'>+			      int hash_offset, int hash_len)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	u8 *hdr = hp-&gt;scratch;</div><div class='add'>+	int err, len;</div><div class='add'>+</div><div class='add'>+	/* We are not allowed to change tcphdr, make a local copy */</div><div class='add'>+	if (exclude_options) {</div><div class='add'>+		len = sizeof(*th) + sizeof(struct tcp_ao_hdr) + hash_len;</div><div class='add'>+		memcpy(hdr, th, sizeof(*th));</div><div class='add'>+		memcpy(hdr + sizeof(*th),</div><div class='add'>+		       (u8 *)th + hash_offset - sizeof(struct tcp_ao_hdr),</div><div class='add'>+		       sizeof(struct tcp_ao_hdr));</div><div class='add'>+		memset(hdr + sizeof(*th) + sizeof(struct tcp_ao_hdr),</div><div class='add'>+		       0, hash_len);</div><div class='add'>+		((struct tcphdr *)hdr)-&gt;check = 0;</div><div class='add'>+	} else {</div><div class='add'>+		len = th-&gt;doff &lt;&lt; 2;</div><div class='add'>+		memcpy(hdr, th, len);</div><div class='add'>+		/* zero out tcp-ao hash */</div><div class='add'>+		((struct tcphdr *)hdr)-&gt;check = 0;</div><div class='add'>+		memset(hdr + hash_offset, 0, hash_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, hdr, len);</div><div class='add'>+	ahash_request_set_crypt(hp-&gt;req, &amp;sg, NULL, len);</div><div class='add'>+	err = crypto_ahash_update(hp-&gt;req);</div><div class='add'>+	WARN_ON_ONCE(err != 0);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_hash_hdr(unsigned short int family, char *ao_hash,</div><div class='add'>+		    struct tcp_ao_key *key, const u8 *tkey,</div><div class='add'>+		    const union tcp_ao_addr *daddr,</div><div class='add'>+		    const union tcp_ao_addr *saddr,</div><div class='add'>+		    const struct tcphdr *th, u32 sne)</div><div class='add'>+{</div><div class='add'>+	int tkey_len = tcp_ao_digest_size(key);</div><div class='add'>+	int hash_offset = ao_hash - (char *)th;</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	void *hash_buf = NULL;</div><div class='add'>+</div><div class='add'>+	hash_buf = kmalloc(tkey_len, GFP_ATOMIC);</div><div class='add'>+	if (!hash_buf)</div><div class='add'>+		goto clear_hash_noput;</div><div class='add'>+</div><div class='add'>+	if (tcp_sigpool_start(key-&gt;tcp_sigpool_id, &amp;hp))</div><div class='add'>+		goto clear_hash_noput;</div><div class='add'>+</div><div class='add'>+	if (crypto_ahash_setkey(crypto_ahash_reqtfm(hp.req), tkey, tkey_len))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	if (crypto_ahash_init(hp.req))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_hash_sne(&amp;hp, sne))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		if (tcp_v4_ao_hash_pseudoheader(&amp;hp, daddr-&gt;a4.s_addr,</div><div class='add'>+						saddr-&gt;a4.s_addr, th-&gt;doff * 4))</div><div class='add'>+			goto clear_hash;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (family == AF_INET6) {</div><div class='add'>+		if (tcp_v6_ao_hash_pseudoheader(&amp;hp, &amp;daddr-&gt;a6,</div><div class='add'>+						&amp;saddr-&gt;a6, th-&gt;doff * 4))</div><div class='add'>+			goto clear_hash;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	}</div><div class='add'>+	if (tcp_ao_hash_header(&amp;hp, th,</div><div class='add'>+			       !!(key-&gt;keyflags &amp; TCP_AO_KEYF_EXCLUDE_OPT),</div><div class='add'>+			       ao_hash, hash_offset, tcp_ao_maclen(key)))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	ahash_request_set_crypt(hp.req, NULL, hash_buf, 0);</div><div class='add'>+	if (crypto_ahash_final(hp.req))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	memcpy(ao_hash, hash_buf, tcp_ao_maclen(key));</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clear_hash:</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+clear_hash_noput:</div><div class='add'>+	memset(ao_hash, 0, tcp_ao_maclen(key));</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_hash_skb(unsigned short int family,</div><div class='add'>+		    char *ao_hash, struct tcp_ao_key *key,</div><div class='add'>+		    const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		    const u8 *tkey, int hash_offset, u32 sne)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	int tkey_len = tcp_ao_digest_size(key);</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	void *hash_buf = NULL;</div><div class='add'>+</div><div class='add'>+	hash_buf = kmalloc(tkey_len, GFP_ATOMIC);</div><div class='add'>+	if (!hash_buf)</div><div class='add'>+		goto clear_hash_noput;</div><div class='add'>+</div><div class='add'>+	if (tcp_sigpool_start(key-&gt;tcp_sigpool_id, &amp;hp))</div><div class='add'>+		goto clear_hash_noput;</div><div class='add'>+</div><div class='add'>+	if (crypto_ahash_setkey(crypto_ahash_reqtfm(hp.req), tkey, tkey_len))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	/* For now use sha1 by default. Depends on alg in tcp_ao_key */</div><div class='add'>+	if (crypto_ahash_init(hp.req))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_hash_sne(&amp;hp, sne))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	if (tcp_ao_hash_pseudoheader(family, sk, skb, &amp;hp, skb-&gt;len))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	if (tcp_ao_hash_header(&amp;hp, th,</div><div class='add'>+			       !!(key-&gt;keyflags &amp; TCP_AO_KEYF_EXCLUDE_OPT),</div><div class='add'>+			       ao_hash, hash_offset, tcp_ao_maclen(key)))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	if (tcp_sigpool_hash_skb_data(&amp;hp, skb, th-&gt;doff &lt;&lt; 2))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+	ahash_request_set_crypt(hp.req, NULL, hash_buf, 0);</div><div class='add'>+	if (crypto_ahash_final(hp.req))</div><div class='add'>+		goto clear_hash;</div><div class='add'>+</div><div class='add'>+	memcpy(ao_hash, hash_buf, tcp_ao_maclen(key));</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clear_hash:</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+clear_hash_noput:</div><div class='add'>+	memset(ao_hash, 0, tcp_ao_maclen(key));</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v4_ao_hash_skb(char *ao_hash, struct tcp_ao_key *key,</div><div class='add'>+		       const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		       const u8 *tkey, int hash_offset, u32 sne)</div><div class='add'>+{</div><div class='add'>+	return tcp_ao_hash_skb(AF_INET, ao_hash, key, sk, skb,</div><div class='add'>+			       tkey, hash_offset, sne);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v4_ao_synack_hash(char *ao_hash, struct tcp_ao_key *ao_key,</div><div class='add'>+			  struct request_sock *req, const struct sk_buff *skb,</div><div class='add'>+			  int hash_offset, u32 sne)</div><div class='add'>+{</div><div class='add'>+	void *hash_buf = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hash_buf = kmalloc(tcp_ao_digest_size(ao_key), GFP_ATOMIC);</div><div class='add'>+	if (!hash_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = tcp_v4_ao_calc_key_rsk(ao_key, hash_buf, req);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = tcp_ao_hash_skb(AF_INET, ao_hash, ao_key, req_to_sk(req), skb,</div><div class='add'>+			      hash_buf, hash_offset, sne);</div><div class='add'>+out:</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tcp_ao_key *tcp_v4_ao_lookup_rsk(const struct sock *sk,</div><div class='add'>+					struct request_sock *req,</div><div class='add'>+					int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+	union tcp_ao_addr *addr = (union tcp_ao_addr *)&amp;ireq-&gt;ir_rmt_addr;</div><div class='add'>+	int l3index;</div><div class='add'>+</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk), ireq-&gt;ir_iif);</div><div class='add'>+	return tcp_ao_do_lookup(sk, l3index, addr, AF_INET, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tcp_ao_key *tcp_v4_ao_lookup(const struct sock *sk, struct sock *addr_sk,</div><div class='add'>+				    int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	int l3index = l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='add'>+						     addr_sk-&gt;sk_bound_dev_if);</div><div class='add'>+	union tcp_ao_addr *addr = (union tcp_ao_addr *)&amp;addr_sk-&gt;sk_daddr;</div><div class='add'>+</div><div class='add'>+	return tcp_ao_do_lookup(sk, l3index, addr, AF_INET, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_prepare_reset(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			 const struct tcp_ao_hdr *aoh, int l3index, u32 seq,</div><div class='add'>+			 struct tcp_ao_key **key, char **traffic_key,</div><div class='add'>+			 bool *allocated_traffic_key, u8 *keyid, u32 *sne)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+	*allocated_traffic_key = false;</div><div class='add'>+	/* If there's no socket - than initial sisn/disn are unknown.</div><div class='add'>+	 * Drop the segment. RFC5925 (7.7) advises to require graceful</div><div class='add'>+	 * restart [RFC4724]. Alternatively, the RFC5925 advises to</div><div class='add'>+	 * save/restore traffic keys before/after reboot.</div><div class='add'>+	 * Linux TCP-AO support provides TCP_AO_ADD_KEY and TCP_AO_REPAIR</div><div class='add'>+	 * options to restore a socket post-reboot.</div><div class='add'>+	 */</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_NEW_SYN_RECV)) {</div><div class='add'>+		unsigned int family = READ_ONCE(sk-&gt;sk_family);</div><div class='add'>+		union tcp_ao_addr *addr;</div><div class='add'>+		__be32 disn, sisn;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state == TCP_NEW_SYN_RECV) {</div><div class='add'>+			struct request_sock *req = inet_reqsk(sk);</div><div class='add'>+</div><div class='add'>+			sisn = htonl(tcp_rsk(req)-&gt;rcv_isn);</div><div class='add'>+			disn = htonl(tcp_rsk(req)-&gt;snt_isn);</div><div class='add'>+			*sne = tcp_ao_compute_sne(0, tcp_rsk(req)-&gt;snt_isn, seq);</div><div class='add'>+		} else {</div><div class='add'>+			sisn = th-&gt;seq;</div><div class='add'>+			disn = 0;</div><div class='add'>+		}</div><div class='add'>+		if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; family == AF_INET6)</div><div class='add'>+			addr = (union tcp_md5_addr *)&amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+		else</div><div class='add'>+			addr = (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		if (family == AF_INET6 &amp;&amp; ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_daddr))</div><div class='add'>+			family = AF_INET;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		sk = sk_const_to_full_sk(sk);</div><div class='add'>+		ao_info = rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+		if (!ao_info)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		*key = tcp_ao_do_lookup(sk, l3index, addr, family,</div><div class='add'>+					-1, aoh-&gt;rnext_keyid);</div><div class='add'>+		if (!*key)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		*traffic_key = kmalloc(tcp_ao_digest_size(*key), GFP_ATOMIC);</div><div class='add'>+		if (!*traffic_key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		*allocated_traffic_key = true;</div><div class='add'>+		if (tcp_ao_calc_key_skb(*key, *traffic_key, skb,</div><div class='add'>+					sisn, disn, family))</div><div class='add'>+			return -1;</div><div class='add'>+		*keyid = (*key)-&gt;rcvid;</div><div class='add'>+	} else {</div><div class='add'>+		struct tcp_ao_key *rnext_key;</div><div class='add'>+		u32 snd_basis;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+			ao_info = rcu_dereference(tcp_twsk(sk)-&gt;ao_info);</div><div class='add'>+			snd_basis = tcp_twsk(sk)-&gt;tw_snd_nxt;</div><div class='add'>+		} else {</div><div class='add'>+			ao_info = rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+			snd_basis = tcp_sk(sk)-&gt;snd_una;</div><div class='add'>+		}</div><div class='add'>+		if (!ao_info)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		*key = tcp_ao_established_key(sk, ao_info, aoh-&gt;rnext_keyid, -1);</div><div class='add'>+		if (!*key)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		*traffic_key = snd_other_key(*key);</div><div class='add'>+		rnext_key = READ_ONCE(ao_info-&gt;rnext_key);</div><div class='add'>+		*keyid = rnext_key-&gt;rcvid;</div><div class='add'>+		*sne = tcp_ao_compute_sne(READ_ONCE(ao_info-&gt;snd_sne),</div><div class='add'>+					  snd_basis, seq);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			struct tcp_ao_key *key, struct tcphdr *th,</div><div class='add'>+			__u8 *hash_location)</div><div class='add'>+{</div><div class='add'>+	struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	void *tkey_buf = NULL;</div><div class='add'>+	u8 *traffic_key;</div><div class='add'>+	u32 sne;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+				       lockdep_sock_is_held(sk));</div><div class='add'>+	traffic_key = snd_other_key(key);</div><div class='add'>+	if (unlikely(tcb-&gt;tcp_flags &amp; TCPHDR_SYN)) {</div><div class='add'>+		__be32 disn;</div><div class='add'>+</div><div class='add'>+		if (!(tcb-&gt;tcp_flags &amp; TCPHDR_ACK)) {</div><div class='add'>+			disn = 0;</div><div class='add'>+			tkey_buf = kmalloc(tcp_ao_digest_size(key), GFP_ATOMIC);</div><div class='add'>+			if (!tkey_buf)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			traffic_key = tkey_buf;</div><div class='add'>+		} else {</div><div class='add'>+			disn = ao-&gt;risn;</div><div class='add'>+		}</div><div class='add'>+		tp-&gt;af_specific-&gt;ao_calc_key_sk(key, traffic_key,</div><div class='add'>+						sk, ao-&gt;lisn, disn, true);</div><div class='add'>+	}</div><div class='add'>+	sne = tcp_ao_compute_sne(READ_ONCE(ao-&gt;snd_sne), READ_ONCE(tp-&gt;snd_una),</div><div class='add'>+				 ntohl(th-&gt;seq));</div><div class='add'>+	tp-&gt;af_specific-&gt;calc_ao_hash(hash_location, key, sk, skb, traffic_key,</div><div class='add'>+				      hash_location - (u8 *)th, sne);</div><div class='add'>+	kfree(tkey_buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_key *tcp_ao_inbound_lookup(unsigned short int family,</div><div class='add'>+		const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		int sndid, int rcvid, int l3index)</div><div class='add'>+{</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		return tcp_ao_do_lookup(sk, l3index,</div><div class='add'>+					(union tcp_ao_addr *)&amp;iph-&gt;saddr,</div><div class='add'>+					AF_INET, sndid, rcvid);</div><div class='add'>+	} else {</div><div class='add'>+		const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+		return tcp_ao_do_lookup(sk, l3index,</div><div class='add'>+					(union tcp_ao_addr *)&amp;iph-&gt;saddr,</div><div class='add'>+					AF_INET6, sndid, rcvid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_syncookie(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		      struct request_sock *req, unsigned short int family)</div><div class='add'>+{</div><div class='add'>+	struct tcp_request_sock *treq = tcp_rsk(req);</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	const struct tcp_ao_hdr *aoh;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	int l3index;</div><div class='add'>+</div><div class='add'>+	/* treq-&gt;af_specific is used to perform TCP_AO lookup</div><div class='add'>+	 * in tcp_create_openreq_child().</div><div class='add'>+	 */</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (family == AF_INET6)</div><div class='add'>+		treq-&gt;af_specific = &amp;tcp_request_sock_ipv6_ops;</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		treq-&gt;af_specific = &amp;tcp_request_sock_ipv4_ops;</div><div class='add'>+</div><div class='add'>+	treq-&gt;used_tcp_ao = false;</div><div class='add'>+</div><div class='add'>+	if (tcp_parse_auth_options(th, NULL, &amp;aoh) || !aoh)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk), inet_rsk(req)-&gt;ir_iif);</div><div class='add'>+	key = tcp_ao_inbound_lookup(family, sk, skb, -1, aoh-&gt;keyid, l3index);</div><div class='add'>+	if (!key)</div><div class='add'>+		/* Key not found, continue without TCP-AO */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	treq-&gt;ao_rcv_next = aoh-&gt;keyid;</div><div class='add'>+	treq-&gt;ao_keyid = aoh-&gt;rnext_keyid;</div><div class='add'>+	treq-&gt;used_tcp_ao = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum skb_drop_reason</div><div class='add'>+tcp_ao_verify_hash(const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		   unsigned short int family, struct tcp_ao_info *info,</div><div class='add'>+		   const struct tcp_ao_hdr *aoh, struct tcp_ao_key *key,</div><div class='add'>+		   u8 *traffic_key, u8 *phash, u32 sne, int l3index)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	u8 maclen = tcp_ao_hdr_maclen(aoh);</div><div class='add'>+	void *hash_buf = NULL;</div><div class='add'>+</div><div class='add'>+	if (maclen != tcp_ao_maclen(key)) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD);</div><div class='add'>+		atomic64_inc(&amp;info-&gt;counters.pkt_bad);</div><div class='add'>+		atomic64_inc(&amp;key-&gt;pkt_bad);</div><div class='add'>+		trace_tcp_ao_wrong_maclen(sk, skb, aoh-&gt;keyid,</div><div class='add'>+					  aoh-&gt;rnext_keyid, maclen);</div><div class='add'>+		return SKB_DROP_REASON_TCP_AOFAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hash_buf = kmalloc(tcp_ao_digest_size(key), GFP_ATOMIC);</div><div class='add'>+	if (!hash_buf)</div><div class='add'>+		return SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+</div><div class='add'>+	/* XXX: make it per-AF callback? */</div><div class='add'>+	tcp_ao_hash_skb(family, hash_buf, key, sk, skb, traffic_key,</div><div class='add'>+			(phash - (u8 *)th), sne);</div><div class='add'>+	if (memcmp(phash, hash_buf, maclen)) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD);</div><div class='add'>+		atomic64_inc(&amp;info-&gt;counters.pkt_bad);</div><div class='add'>+		atomic64_inc(&amp;key-&gt;pkt_bad);</div><div class='add'>+		trace_tcp_ao_mismatch(sk, skb, aoh-&gt;keyid,</div><div class='add'>+				      aoh-&gt;rnext_keyid, maclen);</div><div class='add'>+		kfree(hash_buf);</div><div class='add'>+		return SKB_DROP_REASON_TCP_AOFAILURE;</div><div class='add'>+	}</div><div class='add'>+	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOGOOD);</div><div class='add'>+	atomic64_inc(&amp;info-&gt;counters.pkt_good);</div><div class='add'>+	atomic64_inc(&amp;key-&gt;pkt_good);</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum skb_drop_reason</div><div class='add'>+tcp_inbound_ao_hash(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		    unsigned short int family, const struct request_sock *req,</div><div class='add'>+		    int l3index, const struct tcp_ao_hdr *aoh)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	u8 maclen = tcp_ao_hdr_maclen(aoh);</div><div class='add'>+	u8 *phash = (u8 *)(aoh + 1); /* hash goes just after the header */</div><div class='add'>+	struct tcp_ao_info *info;</div><div class='add'>+	enum skb_drop_reason ret;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	__be32 sisn, disn;</div><div class='add'>+	u8 *traffic_key;</div><div class='add'>+	int state;</div><div class='add'>+	u32 sne = 0;</div><div class='add'>+</div><div class='add'>+	info = rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+	if (!info) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOKEYNOTFOUND);</div><div class='add'>+		trace_tcp_ao_key_not_found(sk, skb, aoh-&gt;keyid,</div><div class='add'>+					   aoh-&gt;rnext_keyid, maclen);</div><div class='add'>+		return SKB_DROP_REASON_TCP_AOUNEXPECTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(th-&gt;syn)) {</div><div class='add'>+		sisn = th-&gt;seq;</div><div class='add'>+		disn = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state = READ_ONCE(sk-&gt;sk_state);</div><div class='add'>+	/* Fast-path */</div><div class='add'>+	if (likely((1 &lt;&lt; state) &amp; TCP_AO_ESTABLISHED)) {</div><div class='add'>+		enum skb_drop_reason err;</div><div class='add'>+		struct tcp_ao_key *current_key;</div><div class='add'>+</div><div class='add'>+		/* Check if this socket's rnext_key matches the keyid in the</div><div class='add'>+		 * packet. If not we lookup the key based on the keyid</div><div class='add'>+		 * matching the rcvid in the mkt.</div><div class='add'>+		 */</div><div class='add'>+		key = READ_ONCE(info-&gt;rnext_key);</div><div class='add'>+		if (key-&gt;rcvid != aoh-&gt;keyid) {</div><div class='add'>+			key = tcp_ao_established_key(sk, info, -1, aoh-&gt;keyid);</div><div class='add'>+			if (!key)</div><div class='add'>+				goto key_not_found;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Delayed retransmitted SYN */</div><div class='add'>+		if (unlikely(th-&gt;syn &amp;&amp; !th-&gt;ack))</div><div class='add'>+			goto verify_hash;</div><div class='add'>+</div><div class='add'>+		sne = tcp_ao_compute_sne(info-&gt;rcv_sne, tcp_sk(sk)-&gt;rcv_nxt,</div><div class='add'>+					 ntohl(th-&gt;seq));</div><div class='add'>+		/* Established socket, traffic key are cached */</div><div class='add'>+		traffic_key = rcv_other_key(key);</div><div class='add'>+		err = tcp_ao_verify_hash(sk, skb, family, info, aoh, key,</div><div class='add'>+					 traffic_key, phash, sne, l3index);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		current_key = READ_ONCE(info-&gt;current_key);</div><div class='add'>+		/* Key rotation: the peer asks us to use new key (RNext) */</div><div class='add'>+		if (unlikely(aoh-&gt;rnext_keyid != current_key-&gt;sndid)) {</div><div class='add'>+			trace_tcp_ao_rnext_request(sk, skb, current_key-&gt;sndid,</div><div class='add'>+						   aoh-&gt;rnext_keyid,</div><div class='add'>+						   tcp_ao_hdr_maclen(aoh));</div><div class='add'>+			/* If the key is not found we do nothing. */</div><div class='add'>+			key = tcp_ao_established_key(sk, info, aoh-&gt;rnext_keyid, -1);</div><div class='add'>+			if (key)</div><div class='add'>+				/* pairs with tcp_ao_del_cmd */</div><div class='add'>+				WRITE_ONCE(info-&gt;current_key, key);</div><div class='add'>+		}</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(state == TCP_CLOSE))</div><div class='add'>+		return SKB_DROP_REASON_TCP_CLOSE;</div><div class='add'>+</div><div class='add'>+	/* Lookup key based on peer address and keyid.</div><div class='add'>+	 * current_key and rnext_key must not be used on tcp listen</div><div class='add'>+	 * sockets as otherwise:</div><div class='add'>+	 * - request sockets would race on those key pointers</div><div class='add'>+	 * - tcp_ao_del_cmd() allows async key removal</div><div class='add'>+	 */</div><div class='add'>+	key = tcp_ao_inbound_lookup(family, sk, skb, -1, aoh-&gt;keyid, l3index);</div><div class='add'>+	if (!key)</div><div class='add'>+		goto key_not_found;</div><div class='add'>+</div><div class='add'>+	if (th-&gt;syn &amp;&amp; !th-&gt;ack)</div><div class='add'>+		goto verify_hash;</div><div class='add'>+</div><div class='add'>+	if ((1 &lt;&lt; state) &amp; (TCPF_LISTEN | TCPF_NEW_SYN_RECV)) {</div><div class='add'>+		/* Make the initial syn the likely case here */</div><div class='add'>+		if (unlikely(req)) {</div><div class='add'>+			sne = tcp_ao_compute_sne(0, tcp_rsk(req)-&gt;rcv_isn,</div><div class='add'>+						 ntohl(th-&gt;seq));</div><div class='add'>+			sisn = htonl(tcp_rsk(req)-&gt;rcv_isn);</div><div class='add'>+			disn = htonl(tcp_rsk(req)-&gt;snt_isn);</div><div class='add'>+		} else if (unlikely(th-&gt;ack &amp;&amp; !th-&gt;syn)) {</div><div class='add'>+			/* Possible syncookie packet */</div><div class='add'>+			sisn = htonl(ntohl(th-&gt;seq) - 1);</div><div class='add'>+			disn = htonl(ntohl(th-&gt;ack_seq) - 1);</div><div class='add'>+			sne = tcp_ao_compute_sne(0, ntohl(sisn),</div><div class='add'>+						 ntohl(th-&gt;seq));</div><div class='add'>+		} else if (unlikely(!th-&gt;syn)) {</div><div class='add'>+			/* no way to figure out initial sisn/disn - drop */</div><div class='add'>+			return SKB_DROP_REASON_TCP_FLAGS;</div><div class='add'>+		}</div><div class='add'>+	} else if ((1 &lt;&lt; state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV)) {</div><div class='add'>+		disn = info-&gt;lisn;</div><div class='add'>+		if (th-&gt;syn || th-&gt;rst)</div><div class='add'>+			sisn = th-&gt;seq;</div><div class='add'>+		else</div><div class='add'>+			sisn = info-&gt;risn;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ONCE(1, "TCP-AO: Unexpected sk_state %d", state);</div><div class='add'>+		return SKB_DROP_REASON_TCP_AOFAILURE;</div><div class='add'>+	}</div><div class='add'>+verify_hash:</div><div class='add'>+	traffic_key = kmalloc(tcp_ao_digest_size(key), GFP_ATOMIC);</div><div class='add'>+	if (!traffic_key)</div><div class='add'>+		return SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+	tcp_ao_calc_key_skb(key, traffic_key, skb, sisn, disn, family);</div><div class='add'>+	ret = tcp_ao_verify_hash(sk, skb, family, info, aoh, key,</div><div class='add'>+				 traffic_key, phash, sne, l3index);</div><div class='add'>+	kfree(traffic_key);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+key_not_found:</div><div class='add'>+	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOKEYNOTFOUND);</div><div class='add'>+	atomic64_inc(&amp;info-&gt;counters.key_not_found);</div><div class='add'>+	trace_tcp_ao_key_not_found(sk, skb, aoh-&gt;keyid,</div><div class='add'>+				   aoh-&gt;rnext_keyid, maclen);</div><div class='add'>+	return SKB_DROP_REASON_TCP_AOKEYNOTFOUND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_cache_traffic_keys(const struct sock *sk,</div><div class='add'>+				     struct tcp_ao_info *ao,</div><div class='add'>+				     struct tcp_ao_key *ao_key)</div><div class='add'>+{</div><div class='add'>+	u8 *traffic_key = snd_other_key(ao_key);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tcp_ao_calc_key_sk(ao_key, traffic_key, sk,</div><div class='add'>+				 ao-&gt;lisn, ao-&gt;risn, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	traffic_key = rcv_other_key(ao_key);</div><div class='add'>+	ret = tcp_ao_calc_key_sk(ao_key, traffic_key, sk,</div><div class='add'>+				 ao-&gt;lisn, ao-&gt;risn, false);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_connect_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+	struct hlist_node *next;</div><div class='add'>+	union tcp_ao_addr *addr;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	int family, l3index;</div><div class='add'>+</div><div class='add'>+	ao_info = rcu_dereference_protected(tp-&gt;ao_info,</div><div class='add'>+					    lockdep_sock_is_held(sk));</div><div class='add'>+	if (!ao_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Remove all keys that don't match the peer */</div><div class='add'>+	family = sk-&gt;sk_family;</div><div class='add'>+	if (family == AF_INET)</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;sk-&gt;sk_daddr;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else if (family == AF_INET6)</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;sk-&gt;sk_v6_daddr;</div><div class='add'>+#endif</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='add'>+						 sk-&gt;sk_bound_dev_if);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(key, next, &amp;ao_info-&gt;head, node) {</div><div class='add'>+		if (!tcp_ao_key_cmp(key, l3index, addr, key-&gt;prefixlen, family, -1, -1))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (key == ao_info-&gt;current_key)</div><div class='add'>+			ao_info-&gt;current_key = NULL;</div><div class='add'>+		if (key == ao_info-&gt;rnext_key)</div><div class='add'>+			ao_info-&gt;rnext_key = NULL;</div><div class='add'>+		hlist_del_rcu(&amp;key-&gt;node);</div><div class='add'>+		atomic_sub(tcp_ao_sizeof_key(key), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+		call_rcu(&amp;key-&gt;rcu, tcp_ao_key_free_rcu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key = tp-&gt;af_specific-&gt;ao_lookup(sk, sk, -1, -1);</div><div class='add'>+	if (key) {</div><div class='add'>+		/* if current_key or rnext_key were not provided,</div><div class='add'>+		 * use the first key matching the peer</div><div class='add'>+		 */</div><div class='add'>+		if (!ao_info-&gt;current_key)</div><div class='add'>+			ao_info-&gt;current_key = key;</div><div class='add'>+		if (!ao_info-&gt;rnext_key)</div><div class='add'>+			ao_info-&gt;rnext_key = key;</div><div class='add'>+		tp-&gt;tcp_header_len += tcp_ao_len_aligned(key);</div><div class='add'>+</div><div class='add'>+		ao_info-&gt;lisn = htonl(tp-&gt;write_seq);</div><div class='add'>+		ao_info-&gt;snd_sne = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* Can't happen: tcp_connect() verifies that there's</div><div class='add'>+		 * at least one tcp-ao key that matches the remote peer.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		rcu_assign_pointer(tp-&gt;ao_info, NULL);</div><div class='add'>+		kfree(ao_info);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_established(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+				       lockdep_sock_is_held(sk));</div><div class='add'>+	if (!ao)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node, lockdep_sock_is_held(sk))</div><div class='add'>+		tcp_ao_cache_traffic_keys(sk, ao, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_ao_finish_connect(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+				       lockdep_sock_is_held(sk));</div><div class='add'>+	if (!ao)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* sk with TCP_REPAIR_ON does not have skb in tcp_finish_connect */</div><div class='add'>+	if (skb)</div><div class='add'>+		WRITE_ONCE(ao-&gt;risn, tcp_hdr(skb)-&gt;seq);</div><div class='add'>+	ao-&gt;rcv_sne = 0;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node, lockdep_sock_is_held(sk))</div><div class='add'>+		tcp_ao_cache_traffic_keys(sk, ao, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_copy_all_matching(const struct sock *sk, struct sock *newsk,</div><div class='add'>+			     struct request_sock *req, struct sk_buff *skb,</div><div class='add'>+			     int family)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key, *new_key, *first_key;</div><div class='add'>+	struct tcp_ao_info *new_ao, *ao;</div><div class='add'>+	struct hlist_node *key_head;</div><div class='add'>+	int l3index, ret = -ENOMEM;</div><div class='add'>+	union tcp_ao_addr *addr;</div><div class='add'>+	bool match = false;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+	if (!ao)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* New socket without TCP-AO on it */</div><div class='add'>+	if (!tcp_rsk_used_ao(req))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	new_ao = tcp_ao_alloc_info(GFP_ATOMIC);</div><div class='add'>+	if (!new_ao)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	new_ao-&gt;lisn = htonl(tcp_rsk(req)-&gt;snt_isn);</div><div class='add'>+	new_ao-&gt;risn = htonl(tcp_rsk(req)-&gt;rcv_isn);</div><div class='add'>+	new_ao-&gt;ao_required = ao-&gt;ao_required;</div><div class='add'>+	new_ao-&gt;accept_icmps = ao-&gt;accept_icmps;</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;newsk-&gt;sk_daddr;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (family == AF_INET6) {</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;newsk-&gt;sk_v6_daddr;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EAFNOSUPPORT;</div><div class='add'>+		goto free_ao;</div><div class='add'>+	}</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(newsk),</div><div class='add'>+						 newsk-&gt;sk_bound_dev_if);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node) {</div><div class='add'>+		if (tcp_ao_key_cmp(key, l3index, addr, key-&gt;prefixlen, family, -1, -1))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		new_key = tcp_ao_copy_key(newsk, key);</div><div class='add'>+		if (!new_key)</div><div class='add'>+			goto free_and_exit;</div><div class='add'>+</div><div class='add'>+		tcp_ao_cache_traffic_keys(newsk, new_ao, new_key);</div><div class='add'>+		tcp_ao_link_mkt(new_ao, new_key);</div><div class='add'>+		match = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!match) {</div><div class='add'>+		/* RFC5925 (7.4.1) specifies that the TCP-AO status</div><div class='add'>+		 * of a connection is determined on the initial SYN.</div><div class='add'>+		 * At this point the connection was TCP-AO enabled, so</div><div class='add'>+		 * it can't switch to being unsigned if peer's key</div><div class='add'>+		 * disappears on the listening socket.</div><div class='add'>+		 */</div><div class='add'>+		ret = -EKEYREJECTED;</div><div class='add'>+		goto free_and_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!static_key_fast_inc_not_disabled(&amp;tcp_ao_needed.key.key)) {</div><div class='add'>+		ret = -EUSERS;</div><div class='add'>+		goto free_and_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key_head = rcu_dereference(hlist_first_rcu(&amp;new_ao-&gt;head));</div><div class='add'>+	first_key = hlist_entry_safe(key_head, struct tcp_ao_key, node);</div><div class='add'>+</div><div class='add'>+	key = tcp_ao_established_key(req_to_sk(req), new_ao, tcp_rsk(req)-&gt;ao_keyid, -1);</div><div class='add'>+	if (key)</div><div class='add'>+		new_ao-&gt;current_key = key;</div><div class='add'>+	else</div><div class='add'>+		new_ao-&gt;current_key = first_key;</div><div class='add'>+</div><div class='add'>+	/* set rnext_key */</div><div class='add'>+	key = tcp_ao_established_key(req_to_sk(req), new_ao, -1, tcp_rsk(req)-&gt;ao_rcv_next);</div><div class='add'>+	if (key)</div><div class='add'>+		new_ao-&gt;rnext_key = key;</div><div class='add'>+	else</div><div class='add'>+		new_ao-&gt;rnext_key = first_key;</div><div class='add'>+</div><div class='add'>+	sk_gso_disable(newsk);</div><div class='add'>+	rcu_assign_pointer(tcp_sk(newsk)-&gt;ao_info, new_ao);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_and_exit:</div><div class='add'>+	hlist_for_each_entry_safe(key, key_head, &amp;new_ao-&gt;head, node) {</div><div class='add'>+		hlist_del(&amp;key-&gt;node);</div><div class='add'>+		tcp_sigpool_release(key-&gt;tcp_sigpool_id);</div><div class='add'>+		atomic_sub(tcp_ao_sizeof_key(key), &amp;newsk-&gt;sk_omem_alloc);</div><div class='add'>+		kfree_sensitive(key);</div><div class='add'>+	}</div><div class='add'>+free_ao:</div><div class='add'>+	kfree(new_ao);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tcp_ao_can_set_current_rnext(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	/* There aren't current/rnext keys on TCP_LISTEN sockets */</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_verify_ipv4(struct sock *sk, struct tcp_ao_add *cmd,</div><div class='add'>+			      union tcp_ao_addr **addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *sin = (struct sockaddr_in *)&amp;cmd-&gt;addr;</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (sin-&gt;sin_family != AF_INET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Currently matching is not performed on port (or port ranges) */</div><div class='add'>+	if (sin-&gt;sin_port != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check prefix and trailing 0's in addr */</div><div class='add'>+	if (cmd-&gt;prefix != 0) {</div><div class='add'>+		__be32 mask;</div><div class='add'>+</div><div class='add'>+		if (ntohl(sin-&gt;sin_addr.s_addr) == INADDR_ANY)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (cmd-&gt;prefix &gt; 32)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mask = inet_make_mask(cmd-&gt;prefix);</div><div class='add'>+		if (sin-&gt;sin_addr.s_addr &amp; ~mask)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Check that MKT address is consistent with socket */</div><div class='add'>+		if (ntohl(inet-&gt;inet_daddr) != INADDR_ANY &amp;&amp;</div><div class='add'>+		    (inet-&gt;inet_daddr &amp; mask) != sin-&gt;sin_addr.s_addr)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (ntohl(sin-&gt;sin_addr.s_addr) != INADDR_ANY)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*addr = (union tcp_ao_addr *)&amp;sin-&gt;sin_addr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_parse_crypto(struct tcp_ao_add *cmd, struct tcp_ao_key *key)</div><div class='add'>+{</div><div class='add'>+	unsigned int syn_tcp_option_space;</div><div class='add'>+	bool is_kdf_aes_128_cmac = false;</div><div class='add'>+	struct crypto_ahash *tfm;</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	void *tmp_key = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* RFC5926, 3.1.1.2. KDF_AES_128_CMAC */</div><div class='add'>+	if (!strcmp("cmac(aes128)", cmd-&gt;alg_name)) {</div><div class='add'>+		strscpy(cmd-&gt;alg_name, "cmac(aes)", sizeof(cmd-&gt;alg_name));</div><div class='add'>+		is_kdf_aes_128_cmac = (cmd-&gt;keylen != 16);</div><div class='add'>+		tmp_key = kmalloc(cmd-&gt;keylen, GFP_KERNEL);</div><div class='add'>+		if (!tmp_key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key-&gt;maclen = cmd-&gt;maclen ?: 12; /* 12 is the default in RFC5925 */</div><div class='add'>+</div><div class='add'>+	/* Check: maclen + tcp-ao header &lt;= (MAX_TCP_OPTION_SPACE - mss</div><div class='add'>+	 *					- tstamp (including sackperm)</div><div class='add'>+	 *					- wscale),</div><div class='add'>+	 * see tcp_syn_options(), tcp_synack_options(), commit 33ad798c924b.</div><div class='add'>+	 *</div><div class='add'>+	 * In order to allow D-SACK with TCP-AO, the header size should be:</div><div class='add'>+	 * (MAX_TCP_OPTION_SPACE - TCPOLEN_TSTAMP_ALIGNED</div><div class='add'>+	 *			- TCPOLEN_SACK_BASE_ALIGNED</div><div class='add'>+	 *			- 2 * TCPOLEN_SACK_PERBLOCK) = 8 (maclen = 4),</div><div class='add'>+	 * see tcp_established_options().</div><div class='add'>+	 *</div><div class='add'>+	 * RFC5925, 2.2:</div><div class='add'>+	 * Typical MACs are 96-128 bits (12-16 bytes), but any length</div><div class='add'>+	 * that fits in the header of the segment being authenticated</div><div class='add'>+	 * is allowed.</div><div class='add'>+	 *</div><div class='add'>+	 * RFC5925, 7.6:</div><div class='add'>+	 * TCP-AO continues to consume 16 bytes in non-SYN segments,</div><div class='add'>+	 * leaving a total of 24 bytes for other options, of which</div><div class='add'>+	 * the timestamp consumes 10.  This leaves 14 bytes, of which 10</div><div class='add'>+	 * are used for a single SACK block. When two SACK blocks are used,</div><div class='add'>+	 * such as to handle D-SACK, a smaller TCP-AO MAC would be required</div><div class='add'>+	 * to make room for the additional SACK block (i.e., to leave 18</div><div class='add'>+	 * bytes for the D-SACK variant of the SACK option) [RFC2883].</div><div class='add'>+	 * Note that D-SACK is not supportable in TCP MD5 in the presence</div><div class='add'>+	 * of timestamps, because TCP MD5’s MAC length is fixed and too</div><div class='add'>+	 * large to leave sufficient option space.</div><div class='add'>+	 */</div><div class='add'>+	syn_tcp_option_space = MAX_TCP_OPTION_SPACE;</div><div class='add'>+	syn_tcp_option_space -= TCPOLEN_MSS_ALIGNED;</div><div class='add'>+	syn_tcp_option_space -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='add'>+	syn_tcp_option_space -= TCPOLEN_WSCALE_ALIGNED;</div><div class='add'>+	if (tcp_ao_len_aligned(key) &gt; syn_tcp_option_space) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key-&gt;keylen = cmd-&gt;keylen;</div><div class='add'>+	memcpy(key-&gt;key, cmd-&gt;key, cmd-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	err = tcp_sigpool_start(key-&gt;tcp_sigpool_id, &amp;hp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_kfree;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_ahash_reqtfm(hp.req);</div><div class='add'>+	if (is_kdf_aes_128_cmac) {</div><div class='add'>+		void *scratch = hp.scratch;</div><div class='add'>+		struct scatterlist sg;</div><div class='add'>+</div><div class='add'>+		memcpy(tmp_key, cmd-&gt;key, cmd-&gt;keylen);</div><div class='add'>+		sg_init_one(&amp;sg, tmp_key, cmd-&gt;keylen);</div><div class='add'>+</div><div class='add'>+		/* Using zero-key of 16 bytes as described in RFC5926 */</div><div class='add'>+		memset(scratch, 0, 16);</div><div class='add'>+		err = crypto_ahash_setkey(tfm, scratch, 16);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_pool_end;</div><div class='add'>+</div><div class='add'>+		err = crypto_ahash_init(hp.req);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_pool_end;</div><div class='add'>+</div><div class='add'>+		ahash_request_set_crypt(hp.req, &amp;sg, key-&gt;key, cmd-&gt;keylen);</div><div class='add'>+		err = crypto_ahash_update(hp.req);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_pool_end;</div><div class='add'>+</div><div class='add'>+		err |= crypto_ahash_final(hp.req);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_pool_end;</div><div class='add'>+		key-&gt;keylen = 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = crypto_ahash_setkey(tfm, key-&gt;key, key-&gt;keylen);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_pool_end;</div><div class='add'>+</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+	kfree_sensitive(tmp_key);</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_maclen(key) &gt; key-&gt;digest_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pool_end:</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+err_kfree:</div><div class='add'>+	kfree_sensitive(tmp_key);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static int tcp_ao_verify_ipv6(struct sock *sk, struct tcp_ao_add *cmd,</div><div class='add'>+			      union tcp_ao_addr **paddr,</div><div class='add'>+			      unsigned short int *family)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&amp;cmd-&gt;addr;</div><div class='add'>+	struct in6_addr *addr = &amp;sin6-&gt;sin6_addr;</div><div class='add'>+	u8 prefix = cmd-&gt;prefix;</div><div class='add'>+</div><div class='add'>+	if (sin6-&gt;sin6_family != AF_INET6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Currently matching is not performed on port (or port ranges) */</div><div class='add'>+	if (sin6-&gt;sin6_port != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check prefix and trailing 0's in addr */</div><div class='add'>+	if (cmd-&gt;prefix != 0 &amp;&amp; ipv6_addr_v4mapped(addr)) {</div><div class='add'>+		__be32 addr4 = addr-&gt;s6_addr32[3];</div><div class='add'>+		__be32 mask;</div><div class='add'>+</div><div class='add'>+		if (prefix &gt; 32 || ntohl(addr4) == INADDR_ANY)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mask = inet_make_mask(prefix);</div><div class='add'>+		if (addr4 &amp; ~mask)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Check that MKT address is consistent with socket */</div><div class='add'>+		if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr)) {</div><div class='add'>+			__be32 daddr4 = sk-&gt;sk_v6_daddr.s6_addr32[3];</div><div class='add'>+</div><div class='add'>+			if (!ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_daddr))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if ((daddr4 &amp; mask) != addr4)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*paddr = (union tcp_ao_addr *)&amp;addr-&gt;s6_addr32[3];</div><div class='add'>+		*family = AF_INET;</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (cmd-&gt;prefix != 0) {</div><div class='add'>+		struct in6_addr pfx;</div><div class='add'>+</div><div class='add'>+		if (ipv6_addr_any(addr) || prefix &gt; 128)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ipv6_addr_prefix(&amp;pfx, addr, prefix);</div><div class='add'>+		if (ipv6_addr_cmp(&amp;pfx, addr))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Check that MKT address is consistent with socket */</div><div class='add'>+		if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr) &amp;&amp;</div><div class='add'>+		    !ipv6_prefix_equal(&amp;sk-&gt;sk_v6_daddr, addr, prefix))</div><div class='add'>+</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (!ipv6_addr_any(addr))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*paddr = (union tcp_ao_addr *)addr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int tcp_ao_verify_ipv6(struct sock *sk, struct tcp_ao_add *cmd,</div><div class='add'>+			      union tcp_ao_addr **paddr,</div><div class='add'>+			      unsigned short int *family)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_info *setsockopt_ao_info(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk_fullsock(sk)) {</div><div class='add'>+		return rcu_dereference_protected(tcp_sk(sk)-&gt;ao_info,</div><div class='add'>+						 lockdep_sock_is_held(sk));</div><div class='add'>+	} else if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+		return rcu_dereference_protected(tcp_twsk(sk)-&gt;ao_info,</div><div class='add'>+						 lockdep_sock_is_held(sk));</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-ESOCKTNOSUPPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_info *getsockopt_ao_info(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk_fullsock(sk))</div><div class='add'>+		return rcu_dereference(tcp_sk(sk)-&gt;ao_info);</div><div class='add'>+	else if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+		return rcu_dereference(tcp_twsk(sk)-&gt;ao_info);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ESOCKTNOSUPPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TCP_AO_KEYF_ALL (TCP_AO_KEYF_IFINDEX | TCP_AO_KEYF_EXCLUDE_OPT)</div><div class='add'>+#define TCP_AO_GET_KEYF_VALID	(TCP_AO_KEYF_IFINDEX)</div><div class='add'>+</div><div class='add'>+static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk,</div><div class='add'>+					   struct tcp_ao_add *cmd)</div><div class='add'>+{</div><div class='add'>+	const char *algo = cmd-&gt;alg_name;</div><div class='add'>+	unsigned int digest_size;</div><div class='add'>+	struct crypto_ahash *tfm;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	int err, pool_id;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	/* Force null-termination of alg_name */</div><div class='add'>+	cmd-&gt;alg_name[ARRAY_SIZE(cmd-&gt;alg_name) - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	/* RFC5926, 3.1.1.2. KDF_AES_128_CMAC */</div><div class='add'>+	if (!strcmp("cmac(aes128)", algo))</div><div class='add'>+		algo = "cmac(aes)";</div><div class='add'>+</div><div class='add'>+	/* Full TCP header (th-&gt;doff &lt;&lt; 2) should fit into scratch area,</div><div class='add'>+	 * see tcp_ao_hash_header().</div><div class='add'>+	 */</div><div class='add'>+	pool_id = tcp_sigpool_alloc_ahash(algo, 60);</div><div class='add'>+	if (pool_id &lt; 0)</div><div class='add'>+		return ERR_PTR(pool_id);</div><div class='add'>+</div><div class='add'>+	err = tcp_sigpool_start(pool_id, &amp;hp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_pool;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_ahash_reqtfm(hp.req);</div><div class='add'>+	digest_size = crypto_ahash_digestsize(tfm);</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+</div><div class='add'>+	size = sizeof(struct tcp_ao_key) + (digest_size &lt;&lt; 1);</div><div class='add'>+	key = sock_kmalloc(sk, size, GFP_KERNEL);</div><div class='add'>+	if (!key) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_pool;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key-&gt;tcp_sigpool_id = pool_id;</div><div class='add'>+	key-&gt;digest_size = digest_size;</div><div class='add'>+	return key;</div><div class='add'>+</div><div class='add'>+err_free_pool:</div><div class='add'>+	tcp_sigpool_release(pool_id);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_add_cmd(struct sock *sk, unsigned short int family,</div><div class='add'>+			  sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+	union tcp_ao_addr *addr;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	struct tcp_ao_add cmd;</div><div class='add'>+	int ret, l3index = 0;</div><div class='add'>+	bool first = false;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = copy_struct_from_sockptr(&amp;cmd, sizeof(cmd), optval, optlen);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (cmd.keylen &gt; TCP_AO_MAXKEYLEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd.reserved != 0 || cmd.reserved2 != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET)</div><div class='add'>+		ret = tcp_ao_verify_ipv4(sk, &amp;cmd, &amp;addr);</div><div class='add'>+	else</div><div class='add'>+		ret = tcp_ao_verify_ipv6(sk, &amp;cmd, &amp;addr, &amp;family);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (cmd.keyflags &amp; ~TCP_AO_KEYF_ALL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd.set_current || cmd.set_rnext) {</div><div class='add'>+		if (!tcp_ao_can_set_current_rnext(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.ifindex &amp;&amp; !(cmd.keyflags &amp; TCP_AO_KEYF_IFINDEX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* For cmd.tcp_ifindex = 0 the key will apply to the default VRF */</div><div class='add'>+	if (cmd.keyflags &amp; TCP_AO_KEYF_IFINDEX &amp;&amp; cmd.ifindex) {</div><div class='add'>+		int bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = dev_get_by_index_rcu(sock_net(sk), cmd.ifindex);</div><div class='add'>+		if (dev &amp;&amp; netif_is_l3_master(dev))</div><div class='add'>+			l3index = dev-&gt;ifindex;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (!dev || !l3index)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!bound_dev_if || bound_dev_if != cmd.ifindex) {</div><div class='add'>+			/* tcp_ao_established_key() doesn't expect having</div><div class='add'>+			 * non peer-matching key on an established TCP-AO</div><div class='add'>+			 * connection.</div><div class='add'>+			 */</div><div class='add'>+			if (!((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE)))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* It's still possible to bind after adding keys or even</div><div class='add'>+		 * re-bind to a different dev (with CAP_NET_RAW).</div><div class='add'>+		 * So, no reason to return error here, rather try to be</div><div class='add'>+		 * nice and warn the user.</div><div class='add'>+		 */</div><div class='add'>+		if (bound_dev_if &amp;&amp; bound_dev_if != cmd.ifindex)</div><div class='add'>+			net_warn_ratelimited("AO key ifindex %d != sk bound ifindex %d\n",</div><div class='add'>+					     cmd.ifindex, bound_dev_if);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't allow keys for peers that have a matching TCP-MD5 key */</div><div class='add'>+	if (cmd.keyflags &amp; TCP_AO_KEYF_IFINDEX) {</div><div class='add'>+		/* Non-_exact version of tcp_md5_do_lookup() will</div><div class='add'>+		 * as well match keys that aren't bound to a specific VRF</div><div class='add'>+		 * (that will make them match AO key with</div><div class='add'>+		 * sysctl_tcp_l3dev_accept = 1</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_md5_do_lookup(sk, l3index, addr, family))</div><div class='add'>+			return -EKEYREJECTED;</div><div class='add'>+	} else {</div><div class='add'>+		if (tcp_md5_do_lookup_any_l3index(sk, addr, family))</div><div class='add'>+			return -EKEYREJECTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_info = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao_info))</div><div class='add'>+		return PTR_ERR(ao_info);</div><div class='add'>+</div><div class='add'>+	if (!ao_info) {</div><div class='add'>+		ao_info = tcp_ao_alloc_info(GFP_KERNEL);</div><div class='add'>+		if (!ao_info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		first = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* Check that neither RecvID nor SendID match any</div><div class='add'>+		 * existing key for the peer, RFC5925 3.1:</div><div class='add'>+		 * &gt; The IDs of MKTs MUST NOT overlap where their</div><div class='add'>+		 * &gt; TCP connection identifiers overlap.</div><div class='add'>+		 */</div><div class='add'>+		if (__tcp_ao_do_lookup(sk, l3index, addr, family, cmd.prefix, -1, cmd.rcvid))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		if (__tcp_ao_do_lookup(sk, l3index, addr, family,</div><div class='add'>+				       cmd.prefix, cmd.sndid, -1))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key = tcp_ao_key_alloc(sk, &amp;cmd);</div><div class='add'>+	if (IS_ERR(key)) {</div><div class='add'>+		ret = PTR_ERR(key);</div><div class='add'>+		goto err_free_ao;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_NODE(&amp;key-&gt;node);</div><div class='add'>+	memcpy(&amp;key-&gt;addr, addr, (family == AF_INET) ? sizeof(struct in_addr) :</div><div class='add'>+						       sizeof(struct in6_addr));</div><div class='add'>+	key-&gt;prefixlen	= cmd.prefix;</div><div class='add'>+	key-&gt;family	= family;</div><div class='add'>+	key-&gt;keyflags	= cmd.keyflags;</div><div class='add'>+	key-&gt;sndid	= cmd.sndid;</div><div class='add'>+	key-&gt;rcvid	= cmd.rcvid;</div><div class='add'>+	key-&gt;l3index	= l3index;</div><div class='add'>+	atomic64_set(&amp;key-&gt;pkt_good, 0);</div><div class='add'>+	atomic64_set(&amp;key-&gt;pkt_bad, 0);</div><div class='add'>+</div><div class='add'>+	ret = tcp_ao_parse_crypto(&amp;cmd, key);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_sock;</div><div class='add'>+</div><div class='add'>+	if (!((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE))) {</div><div class='add'>+		tcp_ao_cache_traffic_keys(sk, ao_info, key);</div><div class='add'>+		if (first) {</div><div class='add'>+			ao_info-&gt;current_key = key;</div><div class='add'>+			ao_info-&gt;rnext_key = key;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcp_ao_link_mkt(ao_info, key);</div><div class='add'>+	if (first) {</div><div class='add'>+		if (!static_branch_inc(&amp;tcp_ao_needed.key)) {</div><div class='add'>+			ret = -EUSERS;</div><div class='add'>+			goto err_free_sock;</div><div class='add'>+		}</div><div class='add'>+		sk_gso_disable(sk);</div><div class='add'>+		rcu_assign_pointer(tcp_sk(sk)-&gt;ao_info, ao_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.set_current)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;current_key, key);</div><div class='add'>+	if (cmd.set_rnext)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;rnext_key, key);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_sock:</div><div class='add'>+	atomic_sub(tcp_ao_sizeof_key(key), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	tcp_sigpool_release(key-&gt;tcp_sigpool_id);</div><div class='add'>+	kfree_sensitive(key);</div><div class='add'>+err_free_ao:</div><div class='add'>+	if (first)</div><div class='add'>+		kfree(ao_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_delete_key(struct sock *sk, struct tcp_ao_info *ao_info,</div><div class='add'>+			     bool del_async, struct tcp_ao_key *key,</div><div class='add'>+			     struct tcp_ao_key *new_current,</div><div class='add'>+			     struct tcp_ao_key *new_rnext)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hlist_del_rcu(&amp;key-&gt;node);</div><div class='add'>+</div><div class='add'>+	/* Support for async delete on listening sockets: as they don't</div><div class='add'>+	 * need current_key/rnext_key maintaining, we don't need to check</div><div class='add'>+	 * them and we can just free all resources in RCU fashion.</div><div class='add'>+	 */</div><div class='add'>+	if (del_async) {</div><div class='add'>+		atomic_sub(tcp_ao_sizeof_key(key), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+		call_rcu(&amp;key-&gt;rcu, tcp_ao_key_free_rcu);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* At this moment another CPU could have looked this key up</div><div class='add'>+	 * while it was unlinked from the list. Wait for RCU grace period,</div><div class='add'>+	 * after which the key is off-list and can't be looked up again;</div><div class='add'>+	 * the rx path [just before RCU came] might have used it and set it</div><div class='add'>+	 * as current_key (very unlikely).</div><div class='add'>+	 * Free the key with next RCU grace period (in case it was</div><div class='add'>+	 * current_key before tcp_ao_current_rnext() might have</div><div class='add'>+	 * changed it in forced-delete).</div><div class='add'>+	 */</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	if (new_current)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;current_key, new_current);</div><div class='add'>+	if (new_rnext)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;rnext_key, new_rnext);</div><div class='add'>+</div><div class='add'>+	if (unlikely(READ_ONCE(ao_info-&gt;current_key) == key ||</div><div class='add'>+		     READ_ONCE(ao_info-&gt;rnext_key) == key)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto add_key;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_sub(tcp_ao_sizeof_key(key), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	call_rcu(&amp;key-&gt;rcu, tcp_ao_key_free_rcu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+add_key:</div><div class='add'>+	hlist_add_head_rcu(&amp;key-&gt;node, &amp;ao_info-&gt;head);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TCP_AO_DEL_KEYF_ALL (TCP_AO_KEYF_IFINDEX)</div><div class='add'>+static int tcp_ao_del_cmd(struct sock *sk, unsigned short int family,</div><div class='add'>+			  sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *key, *new_current = NULL, *new_rnext = NULL;</div><div class='add'>+	int err, addr_len, l3index = 0;</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+	union tcp_ao_addr *addr;</div><div class='add'>+	struct tcp_ao_del cmd;</div><div class='add'>+	__u8 prefix;</div><div class='add'>+	u16 port;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = copy_struct_from_sockptr(&amp;cmd, sizeof(cmd), optval, optlen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cmd.reserved != 0 || cmd.reserved2 != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd.set_current || cmd.set_rnext) {</div><div class='add'>+		if (!tcp_ao_can_set_current_rnext(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.keyflags &amp; ~TCP_AO_DEL_KEYF_ALL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* No sanity check for TCP_AO_KEYF_IFINDEX as if a VRF</div><div class='add'>+	 * was destroyed, there still should be a way to delete keys,</div><div class='add'>+	 * that were bound to that l3intf. So, fail late at lookup stage</div><div class='add'>+	 * if there is no key for that ifindex.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd.ifindex &amp;&amp; !(cmd.keyflags &amp; TCP_AO_KEYF_IFINDEX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ao_info = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao_info))</div><div class='add'>+		return PTR_ERR(ao_info);</div><div class='add'>+	if (!ao_info)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* For sockets in TCP_CLOSED it's possible set keys that aren't</div><div class='add'>+	 * matching the future peer (address/VRF/etc),</div><div class='add'>+	 * tcp_ao_connect_init() will choose a correct matching MKT</div><div class='add'>+	 * if there's any.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd.set_current) {</div><div class='add'>+		new_current = tcp_ao_established_key(sk, ao_info, cmd.current_key, -1);</div><div class='add'>+		if (!new_current)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	if (cmd.set_rnext) {</div><div class='add'>+		new_rnext = tcp_ao_established_key(sk, ao_info, -1, cmd.rnext);</div><div class='add'>+		if (!new_rnext)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	if (cmd.del_async &amp;&amp; sk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (family == AF_INET) {</div><div class='add'>+		struct sockaddr_in *sin = (struct sockaddr_in *)&amp;cmd.addr;</div><div class='add'>+</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;sin-&gt;sin_addr;</div><div class='add'>+		addr_len = sizeof(struct in_addr);</div><div class='add'>+		port = ntohs(sin-&gt;sin_port);</div><div class='add'>+	} else {</div><div class='add'>+		struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&amp;cmd.addr;</div><div class='add'>+		struct in6_addr *addr6 = &amp;sin6-&gt;sin6_addr;</div><div class='add'>+</div><div class='add'>+		if (ipv6_addr_v4mapped(addr6)) {</div><div class='add'>+			addr = (union tcp_ao_addr *)&amp;addr6-&gt;s6_addr32[3];</div><div class='add'>+			addr_len = sizeof(struct in_addr);</div><div class='add'>+			family = AF_INET;</div><div class='add'>+		} else {</div><div class='add'>+			addr = (union tcp_ao_addr *)addr6;</div><div class='add'>+			addr_len = sizeof(struct in6_addr);</div><div class='add'>+		}</div><div class='add'>+		port = ntohs(sin6-&gt;sin6_port);</div><div class='add'>+	}</div><div class='add'>+	prefix = cmd.prefix;</div><div class='add'>+</div><div class='add'>+	/* Currently matching is not performed on port (or port ranges) */</div><div class='add'>+	if (port != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We could choose random present key here for current/rnext</div><div class='add'>+	 * but that's less predictable. Let's be strict and don't</div><div class='add'>+	 * allow removing a key that's in use. RFC5925 doesn't</div><div class='add'>+	 * specify how-to coordinate key removal, but says:</div><div class='add'>+	 * "It is presumed that an MKT affecting a particular</div><div class='add'>+	 * connection cannot be destroyed during an active connection"</div><div class='add'>+	 */</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao_info-&gt;head, node,</div><div class='add'>+				 lockdep_sock_is_held(sk)) {</div><div class='add'>+		if (cmd.sndid != key-&gt;sndid ||</div><div class='add'>+		    cmd.rcvid != key-&gt;rcvid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (family != key-&gt;family ||</div><div class='add'>+		    prefix != key-&gt;prefixlen ||</div><div class='add'>+		    memcmp(addr, &amp;key-&gt;addr, addr_len))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((cmd.keyflags &amp; TCP_AO_KEYF_IFINDEX) !=</div><div class='add'>+		    (key-&gt;keyflags &amp; TCP_AO_KEYF_IFINDEX))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (key-&gt;l3index != l3index)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (key == new_current || key == new_rnext)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return tcp_ao_delete_key(sk, ao_info, cmd.del_async, key,</div><div class='add'>+					 new_current, new_rnext);</div><div class='add'>+	}</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cmd.ao_required makes a socket TCP-AO only.</div><div class='add'>+ * Don't allow any md5 keys for any l3intf on the socket together with it.</div><div class='add'>+ * Restricting it early in setsockopt() removes a check for</div><div class='add'>+ * ao_info-&gt;ao_required on inbound tcp segment fast-path.</div><div class='add'>+ */</div><div class='add'>+static int tcp_ao_required_verify(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	const struct tcp_md5sig_info *md5sig;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_md5_needed.key))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	md5sig = rcu_dereference_check(tcp_sk(sk)-&gt;md5sig_info,</div><div class='add'>+				       lockdep_sock_is_held(sk));</div><div class='add'>+	if (!md5sig)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rcu_dereference_check(hlist_first_rcu(&amp;md5sig-&gt;head),</div><div class='add'>+				  lockdep_sock_is_held(sk)))</div><div class='add'>+		return 1;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_ao_info_cmd(struct sock *sk, unsigned short int family,</div><div class='add'>+			   sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_key *new_current = NULL, *new_rnext = NULL;</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+	struct tcp_ao_info_opt cmd;</div><div class='add'>+	bool first = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = copy_struct_from_sockptr(&amp;cmd, sizeof(cmd), optval, optlen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cmd.set_current || cmd.set_rnext) {</div><div class='add'>+		if (!tcp_ao_can_set_current_rnext(sk))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.reserved != 0 || cmd.reserved2 != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ao_info = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao_info))</div><div class='add'>+		return PTR_ERR(ao_info);</div><div class='add'>+	if (!ao_info) {</div><div class='add'>+		if (!((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ao_info = tcp_ao_alloc_info(GFP_KERNEL);</div><div class='add'>+		if (!ao_info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		first = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd.ao_required &amp;&amp; tcp_ao_required_verify(sk)) {</div><div class='add'>+		err = -EKEYREJECTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For sockets in TCP_CLOSED it's possible set keys that aren't</div><div class='add'>+	 * matching the future peer (address/port/VRF/etc),</div><div class='add'>+	 * tcp_ao_connect_init() will choose a correct matching MKT</div><div class='add'>+	 * if there's any.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd.set_current) {</div><div class='add'>+		new_current = tcp_ao_established_key(sk, ao_info, cmd.current_key, -1);</div><div class='add'>+		if (!new_current) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (cmd.set_rnext) {</div><div class='add'>+		new_rnext = tcp_ao_established_key(sk, ao_info, -1, cmd.rnext);</div><div class='add'>+		if (!new_rnext) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (cmd.set_counters) {</div><div class='add'>+		atomic64_set(&amp;ao_info-&gt;counters.pkt_good, cmd.pkt_good);</div><div class='add'>+		atomic64_set(&amp;ao_info-&gt;counters.pkt_bad, cmd.pkt_bad);</div><div class='add'>+		atomic64_set(&amp;ao_info-&gt;counters.key_not_found, cmd.pkt_key_not_found);</div><div class='add'>+		atomic64_set(&amp;ao_info-&gt;counters.ao_required, cmd.pkt_ao_required);</div><div class='add'>+		atomic64_set(&amp;ao_info-&gt;counters.dropped_icmp, cmd.pkt_dropped_icmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_info-&gt;ao_required = cmd.ao_required;</div><div class='add'>+	ao_info-&gt;accept_icmps = cmd.accept_icmps;</div><div class='add'>+	if (new_current)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;current_key, new_current);</div><div class='add'>+	if (new_rnext)</div><div class='add'>+		WRITE_ONCE(ao_info-&gt;rnext_key, new_rnext);</div><div class='add'>+	if (first) {</div><div class='add'>+		if (!static_branch_inc(&amp;tcp_ao_needed.key)) {</div><div class='add'>+			err = -EUSERS;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		sk_gso_disable(sk);</div><div class='add'>+		rcu_assign_pointer(tcp_sk(sk)-&gt;ao_info, ao_info);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	if (first)</div><div class='add'>+		kfree(ao_info);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_parse_ao(struct sock *sk, int cmd, unsigned short int family,</div><div class='add'>+		 sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(family != AF_INET &amp;&amp; family != AF_INET6))</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case TCP_AO_ADD_KEY:</div><div class='add'>+		return tcp_ao_add_cmd(sk, family, optval, optlen);</div><div class='add'>+	case TCP_AO_DEL_KEY:</div><div class='add'>+		return tcp_ao_del_cmd(sk, family, optval, optlen);</div><div class='add'>+	case TCP_AO_INFO:</div><div class='add'>+		return tcp_ao_info_cmd(sk, family, optval, optlen);</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v4_parse_ao(struct sock *sk, int cmd, sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	return tcp_parse_ao(sk, cmd, AF_INET, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* tcp_ao_copy_mkts_to_user(ao_info, optval, optlen)</div><div class='add'>+ *</div><div class='add'>+ * @ao_info:	struct tcp_ao_info on the socket that</div><div class='add'>+ *		socket getsockopt(TCP_AO_GET_KEYS) is executed on</div><div class='add'>+ * @optval:	pointer to array of tcp_ao_getsockopt structures in user space.</div><div class='add'>+ *		Must be != NULL.</div><div class='add'>+ * @optlen:	pointer to size of tcp_ao_getsockopt structure.</div><div class='add'>+ *		Must be != NULL.</div><div class='add'>+ *</div><div class='add'>+ * Return value: 0 on success, a negative error number otherwise.</div><div class='add'>+ *</div><div class='add'>+ * optval points to an array of tcp_ao_getsockopt structures in user space.</div><div class='add'>+ * optval[0] is used as both input and output to getsockopt. It determines</div><div class='add'>+ * which keys are returned by the kernel.</div><div class='add'>+ * optval[0].nkeys is the size of the array in user space. On return it contains</div><div class='add'>+ * the number of keys matching the search criteria.</div><div class='add'>+ * If tcp_ao_getsockopt::get_all is set, then all keys in the socket are</div><div class='add'>+ * returned, otherwise only keys matching &lt;addr, prefix, sndid, rcvid&gt;</div><div class='add'>+ * in optval[0] are returned.</div><div class='add'>+ * optlen is also used as both input and output. The user provides the size</div><div class='add'>+ * of struct tcp_ao_getsockopt in user space, and the kernel returns the size</div><div class='add'>+ * of the structure in kernel space.</div><div class='add'>+ * The size of struct tcp_ao_getsockopt may differ between user and kernel.</div><div class='add'>+ * There are three cases to consider:</div><div class='add'>+ *  * If usize == ksize, then keys are copied verbatim.</div><div class='add'>+ *  * If usize &lt; ksize, then the userspace has passed an old struct to a</div><div class='add'>+ *    newer kernel. The rest of the trailing bytes in optval[0]</div><div class='add'>+ *    (ksize - usize) are interpreted as 0 by the kernel.</div><div class='add'>+ *  * If usize &gt; ksize, then the userspace has passed a new struct to an</div><div class='add'>+ *    older kernel. The trailing bytes unknown to the kernel (usize - ksize)</div><div class='add'>+ *    are checked to ensure they are zeroed, otherwise -E2BIG is returned.</div><div class='add'>+ * On return the kernel fills in min(usize, ksize) in each entry of the array.</div><div class='add'>+ * The layout of the fields in the user and kernel structures is expected to</div><div class='add'>+ * be the same (including in the 32bit vs 64bit case).</div><div class='add'>+ */</div><div class='add'>+static int tcp_ao_copy_mkts_to_user(const struct sock *sk,</div><div class='add'>+				    struct tcp_ao_info *ao_info,</div><div class='add'>+				    sockptr_t optval, sockptr_t optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_getsockopt opt_in, opt_out;</div><div class='add'>+	struct tcp_ao_key *key, *current_key;</div><div class='add'>+	bool do_address_matching = true;</div><div class='add'>+	union tcp_ao_addr *addr = NULL;</div><div class='add'>+	int err, l3index, user_len;</div><div class='add'>+	unsigned int max_keys;	/* maximum number of keys to copy to user */</div><div class='add'>+	size_t out_offset = 0;</div><div class='add'>+	size_t bytes_to_write;	/* number of bytes to write to user level */</div><div class='add'>+	u32 matched_keys;	/* keys from ao_info matched so far */</div><div class='add'>+	int optlen_out;</div><div class='add'>+	__be16 port = 0;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(&amp;user_len, optlen, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (user_len &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(&amp;opt_in, 0, sizeof(struct tcp_ao_getsockopt));</div><div class='add'>+	err = copy_struct_from_sockptr(&amp;opt_in, sizeof(opt_in),</div><div class='add'>+				       optval, user_len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (opt_in.pkt_good || opt_in.pkt_bad)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (opt_in.keyflags &amp; ~TCP_AO_GET_KEYF_VALID)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (opt_in.ifindex &amp;&amp; !(opt_in.keyflags &amp; TCP_AO_KEYF_IFINDEX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (opt_in.reserved != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	max_keys = opt_in.nkeys;</div><div class='add'>+	l3index = (opt_in.keyflags &amp; TCP_AO_KEYF_IFINDEX) ? opt_in.ifindex : -1;</div><div class='add'>+</div><div class='add'>+	if (opt_in.get_all || opt_in.is_current || opt_in.is_rnext) {</div><div class='add'>+		if (opt_in.get_all &amp;&amp; (opt_in.is_current || opt_in.is_rnext))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		do_address_matching = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (opt_in.addr.ss_family) {</div><div class='add'>+	case AF_INET: {</div><div class='add'>+		struct sockaddr_in *sin;</div><div class='add'>+		__be32 mask;</div><div class='add'>+</div><div class='add'>+		sin = (struct sockaddr_in *)&amp;opt_in.addr;</div><div class='add'>+		port = sin-&gt;sin_port;</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;sin-&gt;sin_addr;</div><div class='add'>+</div><div class='add'>+		if (opt_in.prefix &gt; 32)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ntohl(sin-&gt;sin_addr.s_addr) == INADDR_ANY &amp;&amp;</div><div class='add'>+		    opt_in.prefix != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mask = inet_make_mask(opt_in.prefix);</div><div class='add'>+		if (sin-&gt;sin_addr.s_addr &amp; ~mask)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case AF_INET6: {</div><div class='add'>+		struct sockaddr_in6 *sin6;</div><div class='add'>+		struct in6_addr *addr6;</div><div class='add'>+</div><div class='add'>+		sin6 = (struct sockaddr_in6 *)&amp;opt_in.addr;</div><div class='add'>+		addr = (union tcp_ao_addr *)&amp;sin6-&gt;sin6_addr;</div><div class='add'>+		addr6 = &amp;sin6-&gt;sin6_addr;</div><div class='add'>+		port = sin6-&gt;sin6_port;</div><div class='add'>+</div><div class='add'>+		/* We don't have to change family and @addr here if</div><div class='add'>+		 * ipv6_addr_v4mapped() like in key adding:</div><div class='add'>+		 * tcp_ao_key_cmp() does it. Do the sanity checks though.</div><div class='add'>+		 */</div><div class='add'>+		if (opt_in.prefix != 0) {</div><div class='add'>+			if (ipv6_addr_v4mapped(addr6)) {</div><div class='add'>+				__be32 mask, addr4 = addr6-&gt;s6_addr32[3];</div><div class='add'>+</div><div class='add'>+				if (opt_in.prefix &gt; 32 ||</div><div class='add'>+				    ntohl(addr4) == INADDR_ANY)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				mask = inet_make_mask(opt_in.prefix);</div><div class='add'>+				if (addr4 &amp; ~mask)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			} else {</div><div class='add'>+				struct in6_addr pfx;</div><div class='add'>+</div><div class='add'>+				if (ipv6_addr_any(addr6) ||</div><div class='add'>+				    opt_in.prefix &gt; 128)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+</div><div class='add'>+				ipv6_addr_prefix(&amp;pfx, addr6, opt_in.prefix);</div><div class='add'>+				if (ipv6_addr_cmp(&amp;pfx, addr6))</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else if (!ipv6_addr_any(addr6)) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 0:</div><div class='add'>+		if (!do_address_matching)</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!do_address_matching) {</div><div class='add'>+		/* We could just ignore those, but let's do stricter checks */</div><div class='add'>+		if (addr || port)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (opt_in.prefix || opt_in.sndid || opt_in.rcvid)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bytes_to_write = min_t(int, user_len, sizeof(struct tcp_ao_getsockopt));</div><div class='add'>+	matched_keys = 0;</div><div class='add'>+	/* May change in RX, while we're dumping, pre-fetch it */</div><div class='add'>+	current_key = READ_ONCE(ao_info-&gt;current_key);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao_info-&gt;head, node,</div><div class='add'>+				 lockdep_sock_is_held(sk)) {</div><div class='add'>+		if (opt_in.get_all)</div><div class='add'>+			goto match;</div><div class='add'>+</div><div class='add'>+		if (opt_in.is_current || opt_in.is_rnext) {</div><div class='add'>+			if (opt_in.is_current &amp;&amp; key == current_key)</div><div class='add'>+				goto match;</div><div class='add'>+			if (opt_in.is_rnext &amp;&amp; key == ao_info-&gt;rnext_key)</div><div class='add'>+				goto match;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tcp_ao_key_cmp(key, l3index, addr, opt_in.prefix,</div><div class='add'>+				   opt_in.addr.ss_family,</div><div class='add'>+				   opt_in.sndid, opt_in.rcvid) != 0)</div><div class='add'>+			continue;</div><div class='add'>+match:</div><div class='add'>+		matched_keys++;</div><div class='add'>+		if (matched_keys &gt; max_keys)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memset(&amp;opt_out, 0, sizeof(struct tcp_ao_getsockopt));</div><div class='add'>+</div><div class='add'>+		if (key-&gt;family == AF_INET) {</div><div class='add'>+			struct sockaddr_in *sin_out = (struct sockaddr_in *)&amp;opt_out.addr;</div><div class='add'>+</div><div class='add'>+			sin_out-&gt;sin_family = key-&gt;family;</div><div class='add'>+			sin_out-&gt;sin_port = 0;</div><div class='add'>+			memcpy(&amp;sin_out-&gt;sin_addr, &amp;key-&gt;addr, sizeof(struct in_addr));</div><div class='add'>+		} else {</div><div class='add'>+			struct sockaddr_in6 *sin6_out = (struct sockaddr_in6 *)&amp;opt_out.addr;</div><div class='add'>+</div><div class='add'>+			sin6_out-&gt;sin6_family = key-&gt;family;</div><div class='add'>+			sin6_out-&gt;sin6_port = 0;</div><div class='add'>+			memcpy(&amp;sin6_out-&gt;sin6_addr, &amp;key-&gt;addr, sizeof(struct in6_addr));</div><div class='add'>+		}</div><div class='add'>+		opt_out.sndid = key-&gt;sndid;</div><div class='add'>+		opt_out.rcvid = key-&gt;rcvid;</div><div class='add'>+		opt_out.prefix = key-&gt;prefixlen;</div><div class='add'>+		opt_out.keyflags = key-&gt;keyflags;</div><div class='add'>+		opt_out.is_current = (key == current_key);</div><div class='add'>+		opt_out.is_rnext = (key == ao_info-&gt;rnext_key);</div><div class='add'>+		opt_out.nkeys = 0;</div><div class='add'>+		opt_out.maclen = key-&gt;maclen;</div><div class='add'>+		opt_out.keylen = key-&gt;keylen;</div><div class='add'>+		opt_out.ifindex = key-&gt;l3index;</div><div class='add'>+		opt_out.pkt_good = atomic64_read(&amp;key-&gt;pkt_good);</div><div class='add'>+		opt_out.pkt_bad = atomic64_read(&amp;key-&gt;pkt_bad);</div><div class='add'>+		memcpy(&amp;opt_out.key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+		tcp_sigpool_algo(key-&gt;tcp_sigpool_id, opt_out.alg_name, 64);</div><div class='add'>+</div><div class='add'>+		/* Copy key to user */</div><div class='add'>+		if (copy_to_sockptr_offset(optval, out_offset,</div><div class='add'>+					   &amp;opt_out, bytes_to_write))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		out_offset += user_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	optlen_out = (int)sizeof(struct tcp_ao_getsockopt);</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;optlen_out, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	out_offset = offsetof(struct tcp_ao_getsockopt, nkeys);</div><div class='add'>+	if (copy_to_sockptr_offset(optval, out_offset,</div><div class='add'>+				   &amp;matched_keys, sizeof(u32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_get_mkts(struct sock *sk, sockptr_t optval, sockptr_t optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+	ao_info = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao_info))</div><div class='add'>+		return PTR_ERR(ao_info);</div><div class='add'>+	if (!ao_info)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return tcp_ao_copy_mkts_to_user(sk, ao_info, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_get_sock_info(struct sock *sk, sockptr_t optval, sockptr_t optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_ao_info_opt out, in = {};</div><div class='add'>+	struct tcp_ao_key *current_key;</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	int err, len;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Copying this "in" only to check ::reserved, ::reserved2,</div><div class='add'>+	 * that may be needed to extend (struct tcp_ao_info_opt) and</div><div class='add'>+	 * what getsockopt() provides in future.</div><div class='add'>+	 */</div><div class='add'>+	err = copy_struct_from_sockptr(&amp;in, sizeof(in), optval, len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (in.reserved != 0 || in.reserved2 != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ao = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao))</div><div class='add'>+		return PTR_ERR(ao);</div><div class='add'>+	if (!ao)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;out, 0, sizeof(out));</div><div class='add'>+	out.ao_required		= ao-&gt;ao_required;</div><div class='add'>+	out.accept_icmps	= ao-&gt;accept_icmps;</div><div class='add'>+	out.pkt_good		= atomic64_read(&amp;ao-&gt;counters.pkt_good);</div><div class='add'>+	out.pkt_bad		= atomic64_read(&amp;ao-&gt;counters.pkt_bad);</div><div class='add'>+	out.pkt_key_not_found	= atomic64_read(&amp;ao-&gt;counters.key_not_found);</div><div class='add'>+	out.pkt_ao_required	= atomic64_read(&amp;ao-&gt;counters.ao_required);</div><div class='add'>+	out.pkt_dropped_icmp	= atomic64_read(&amp;ao-&gt;counters.dropped_icmp);</div><div class='add'>+</div><div class='add'>+	current_key = READ_ONCE(ao-&gt;current_key);</div><div class='add'>+	if (current_key) {</div><div class='add'>+		out.set_current = 1;</div><div class='add'>+		out.current_key = current_key-&gt;sndid;</div><div class='add'>+	}</div><div class='add'>+	if (ao-&gt;rnext_key) {</div><div class='add'>+		out.set_rnext = 1;</div><div class='add'>+		out.rnext = ao-&gt;rnext_key-&gt;rcvid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;out, min_t(int, len, sizeof(out))))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_set_repair(struct sock *sk, sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_ao_repair cmd;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = copy_struct_from_sockptr(&amp;cmd, sizeof(cmd), optval, optlen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tp-&gt;repair)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ao = setsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR(ao))</div><div class='add'>+		return PTR_ERR(ao);</div><div class='add'>+	if (!ao)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ao-&gt;lisn, cmd.snt_isn);</div><div class='add'>+	WRITE_ONCE(ao-&gt;risn, cmd.rcv_isn);</div><div class='add'>+	WRITE_ONCE(ao-&gt;snd_sne, cmd.snd_sne);</div><div class='add'>+	WRITE_ONCE(ao-&gt;rcv_sne, cmd.rcv_sne);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;ao-&gt;head, node, lockdep_sock_is_held(sk))</div><div class='add'>+		tcp_ao_cache_traffic_keys(sk, ao, key);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_ao_get_repair(struct sock *sk, sockptr_t optval, sockptr_t optlen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_ao_repair opt;</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!tp-&gt;repair)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ao = getsockopt_ao_info(sk);</div><div class='add'>+	if (IS_ERR_OR_NULL(ao)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return ao ? PTR_ERR(ao) : -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opt.snt_isn	= ao-&gt;lisn;</div><div class='add'>+	opt.rcv_isn	= ao-&gt;risn;</div><div class='add'>+	opt.snd_sne	= READ_ONCE(ao-&gt;snd_sne);</div><div class='add'>+	opt.rcv_sne	= READ_ONCE(ao-&gt;rcv_sne);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;opt, min_t(int, len, sizeof(opt))))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c<br/>index 02ff2dde9609..760941e55153 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_bbr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_bbr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_bbr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_bbr.c</a></div><div class='hunk'>@@ -56,6 +56,8 @@</div><div class='ctx'>  * otherwise TCP stack falls back to an internal pacing using one high</div><div class='ctx'>  * resolution timer per TCP socket and may use more resources.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/inet_diag.h&gt;</div><div class='hunk'>@@ -115,6 +117,14 @@ struct bbr {</div><div class='ctx'> 		unused_b:5;</div><div class='ctx'> 	u32	prior_cwnd;	/* prior cwnd upon entering loss recovery */</div><div class='ctx'> 	u32	full_bw;	/* recent bw, to estimate if pipe is full */</div><div class='add'>+</div><div class='add'>+	/* For tracking ACK aggregation: */</div><div class='add'>+	u64	ack_epoch_mstamp;	/* start of ACK sampling epoch */</div><div class='add'>+	u16	extra_acked[2];		/* max excess data ACKed in epoch */</div><div class='add'>+	u32	ack_epoch_acked:20,	/* packets (S)ACKed in sampling epoch */</div><div class='add'>+		extra_acked_win_rtts:5,	/* age of extra_acked, in round trips */</div><div class='add'>+		extra_acked_win_idx:1,	/* current index in extra_acked array */</div><div class='add'>+		unused_c:6;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CYCLE_LEN	8	/* number of phases in a pacing gain cycle */</div><div class='hunk'>@@ -128,6 +138,14 @@ static const u32 bbr_probe_rtt_mode_ms = 200;</div><div class='ctx'> /* Skip TSO below the following bandwidth (bits/sec): */</div><div class='ctx'> static const int bbr_min_tso_rate = 1200000;</div><div class='ctx'> </div><div class='add'>+/* Pace at ~1% below estimated bw, on average, to reduce queue at bottleneck.</div><div class='add'>+ * In order to help drive the network toward lower queues and low latency while</div><div class='add'>+ * maintaining high utilization, the average pacing rate aims to be slightly</div><div class='add'>+ * lower than the estimated bandwidth. This is an important aspect of the</div><div class='add'>+ * design.</div><div class='add'>+ */</div><div class='add'>+static const int bbr_pacing_margin_percent = 1;</div><div class='add'>+</div><div class='ctx'> /* We use a high_gain value of 2/ln(2) because it's the smallest pacing gain</div><div class='ctx'>  * that will allow a smoothly increasing pacing rate that will double each RTT</div><div class='ctx'>  * and send the same number of packets per RTT that an un-paced, slow-starting</div><div class='hunk'>@@ -174,6 +192,15 @@ static const u32 bbr_lt_bw_diff = 4000 / 8;</div><div class='ctx'> /* If we estimate we're policed, use lt_bw for this many round trips: */</div><div class='ctx'> static const u32 bbr_lt_bw_max_rtts = 48;</div><div class='ctx'> </div><div class='add'>+/* Gain factor for adding extra_acked to target cwnd: */</div><div class='add'>+static const int bbr_extra_acked_gain = BBR_UNIT;</div><div class='add'>+/* Window length of extra_acked window. */</div><div class='add'>+static const u32 bbr_extra_acked_win_rtts = 5;</div><div class='add'>+/* Max allowed val for ack_epoch_acked, after which sampling epoch is reset */</div><div class='add'>+static const u32 bbr_ack_epoch_acked_reset_thresh = 1U &lt;&lt; 20;</div><div class='add'>+/* Time period for clamping cwnd increment due to ack aggregation */</div><div class='add'>+static const u32 bbr_extra_acked_max_us = 100 * 1000;</div><div class='add'>+</div><div class='ctx'> static void bbr_check_probe_rtt_done(struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> /* Do we estimate that STARTUP filled the pipe? */</div><div class='hunk'>@@ -200,6 +227,16 @@ static u32 bbr_bw(const struct sock *sk)</div><div class='ctx'> 	return bbr-&gt;lt_use_bw ? bbr-&gt;lt_bw : bbr_max_bw(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return maximum extra acked in past k-2k round trips,</div><div class='add'>+ * where k = bbr_extra_acked_win_rtts.</div><div class='add'>+ */</div><div class='add'>+static u16 bbr_extra_acked(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bbr *bbr = inet_csk_ca(sk);</div><div class='add'>+</div><div class='add'>+	return max(bbr-&gt;extra_acked[0], bbr-&gt;extra_acked[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Return rate in bytes per second, optionally with a gain.</div><div class='ctx'>  * The order here is chosen carefully to avoid overflow of u64. This should</div><div class='ctx'>  * work for input rates of up to 2.9Tbit/sec and gain of 2.89x.</div><div class='hunk'>@@ -208,22 +245,20 @@ static u64 bbr_rate_bytes_per_sec(struct sock *sk, u64 rate, int gain)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mss = tcp_sk(sk)-&gt;mss_cache;</div><div class='ctx'> </div><div class='del'>-	if (!tcp_needs_internal_pacing(sk))</div><div class='del'>-		mss = tcp_mss_to_mtu(sk, mss);</div><div class='ctx'> 	rate *= mss;</div><div class='ctx'> 	rate *= gain;</div><div class='ctx'> 	rate &gt;&gt;= BBR_SCALE;</div><div class='del'>-	rate *= USEC_PER_SEC;</div><div class='add'>+	rate *= USEC_PER_SEC / 100 * (100 - bbr_pacing_margin_percent);</div><div class='ctx'> 	return rate &gt;&gt; BW_SCALE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Convert a BBR bw and gain factor to a pacing rate in bytes per second. */</div><div class='del'>-static u32 bbr_bw_to_pacing_rate(struct sock *sk, u32 bw, int gain)</div><div class='add'>+static unsigned long bbr_bw_to_pacing_rate(struct sock *sk, u32 bw, int gain)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rate = bw;</div><div class='ctx'> </div><div class='ctx'> 	rate = bbr_rate_bytes_per_sec(sk, rate, gain);</div><div class='del'>-	rate = min_t(u64, rate, sk-&gt;sk_max_pacing_rate);</div><div class='add'>+	rate = min_t(u64, rate, READ_ONCE(sk-&gt;sk_max_pacing_rate));</div><div class='ctx'> 	return rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,34 +276,29 @@ static void bbr_init_pacing_rate_from_rtt(struct sock *sk)</div><div class='ctx'> 	} else {			 /* no RTT sample yet */</div><div class='ctx'> 		rtt_us = USEC_PER_MSEC;	 /* use nominal default RTT */</div><div class='ctx'> 	}</div><div class='del'>-	bw = (u64)tp-&gt;snd_cwnd * BW_UNIT;</div><div class='add'>+	bw = (u64)tcp_snd_cwnd(tp) * BW_UNIT;</div><div class='ctx'> 	do_div(bw, rtt_us);</div><div class='del'>-	sk-&gt;sk_pacing_rate = bbr_bw_to_pacing_rate(sk, bw, bbr_high_gain);</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_pacing_rate,</div><div class='add'>+		   bbr_bw_to_pacing_rate(sk, bw, bbr_high_gain));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Pace using current bw estimate and a gain factor. In order to help drive the</div><div class='del'>- * network toward lower queues while maintaining high utilization and low</div><div class='del'>- * latency, the average pacing rate aims to be slightly (~1%) lower than the</div><div class='del'>- * estimated bandwidth. This is an important aspect of the design. In this</div><div class='del'>- * implementation this slightly lower pacing rate is achieved implicitly by not</div><div class='del'>- * including link-layer headers in the packet size used for the pacing rate.</div><div class='del'>- */</div><div class='add'>+/* Pace using current bw estimate and a gain factor. */</div><div class='ctx'> static void bbr_set_pacing_rate(struct sock *sk, u32 bw, int gain)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='del'>-	u32 rate = bbr_bw_to_pacing_rate(sk, bw, gain);</div><div class='add'>+	unsigned long rate = bbr_bw_to_pacing_rate(sk, bw, gain);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!bbr-&gt;has_seen_rtt &amp;&amp; tp-&gt;srtt_us))</div><div class='ctx'> 		bbr_init_pacing_rate_from_rtt(sk);</div><div class='del'>-	if (bbr_full_bw_reached(sk) || rate &gt; sk-&gt;sk_pacing_rate)</div><div class='del'>-		sk-&gt;sk_pacing_rate = rate;</div><div class='add'>+	if (bbr_full_bw_reached(sk) || rate &gt; READ_ONCE(sk-&gt;sk_pacing_rate))</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_pacing_rate, rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* override sysctl_tcp_min_tso_segs */</div><div class='del'>-static u32 bbr_min_tso_segs(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 bbr_min_tso_segs(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return sk-&gt;sk_pacing_rate &lt; (bbr_min_tso_rate &gt;&gt; 3) ? 1 : 2;</div><div class='add'>+	return READ_ONCE(sk-&gt;sk_pacing_rate) &lt; (bbr_min_tso_rate &gt;&gt; 3) ? 1 : 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bbr_tso_segs_goal(struct sock *sk)</div><div class='hunk'>@@ -279,8 +309,9 @@ static u32 bbr_tso_segs_goal(struct sock *sk)</div><div class='ctx'> 	/* Sort of tcp_tso_autosize() but ignoring</div><div class='ctx'> 	 * driver provided sk_gso_max_size.</div><div class='ctx'> 	 */</div><div class='del'>-	bytes = min_t(u32, sk-&gt;sk_pacing_rate &gt;&gt; sk-&gt;sk_pacing_shift,</div><div class='del'>-		      GSO_MAX_SIZE - 1 - MAX_TCP_HEADER);</div><div class='add'>+	bytes = min_t(unsigned long,</div><div class='add'>+		      READ_ONCE(sk-&gt;sk_pacing_rate) &gt;&gt; READ_ONCE(sk-&gt;sk_pacing_shift),</div><div class='add'>+		      GSO_LEGACY_MAX_SIZE - 1 - MAX_TCP_HEADER);</div><div class='ctx'> 	segs = max_t(u32, bytes / tp-&gt;mss_cache, bbr_min_tso_segs(sk));</div><div class='ctx'> </div><div class='ctx'> 	return min(segs, 0x7FU);</div><div class='hunk'>@@ -293,18 +324,20 @@ static void bbr_save_cwnd(struct sock *sk)</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (bbr-&gt;prev_ca_state &lt; TCP_CA_Recovery &amp;&amp; bbr-&gt;mode != BBR_PROBE_RTT)</div><div class='del'>-		bbr-&gt;prior_cwnd = tp-&gt;snd_cwnd;  /* this cwnd is good enough */</div><div class='add'>+		bbr-&gt;prior_cwnd = tcp_snd_cwnd(tp);  /* this cwnd is good enough */</div><div class='ctx'> 	else  /* loss recovery or BBR_PROBE_RTT have temporarily cut cwnd */</div><div class='del'>-		bbr-&gt;prior_cwnd = max(bbr-&gt;prior_cwnd, tp-&gt;snd_cwnd);</div><div class='add'>+		bbr-&gt;prior_cwnd = max(bbr-&gt;prior_cwnd, tcp_snd_cwnd(tp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bbr_cwnd_event(struct sock *sk, enum tcp_ca_event event)</div><div class='add'>+__bpf_kfunc static void bbr_cwnd_event(struct sock *sk, enum tcp_ca_event event)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (event == CA_EVENT_TX_START &amp;&amp; tp-&gt;app_limited) {</div><div class='ctx'> 		bbr-&gt;idle_restart = 1;</div><div class='add'>+		bbr-&gt;ack_epoch_mstamp = tp-&gt;tcp_mstamp;</div><div class='add'>+		bbr-&gt;ack_epoch_acked = 0;</div><div class='ctx'> 		/* Avoid pointless buffer overflows: pace at est. bw if we don't</div><div class='ctx'> 		 * need more speed (we're restarting from idle and app-limited).</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -315,30 +348,19 @@ static void bbr_cwnd_event(struct sock *sk, enum tcp_ca_event event)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Find target cwnd. Right-size the cwnd based on min RTT and the</div><div class='del'>- * estimated bottleneck bandwidth:</div><div class='add'>+/* Calculate bdp based on min RTT and the estimated bottleneck bandwidth:</div><div class='ctx'>  *</div><div class='del'>- * cwnd = bw * min_rtt * gain = BDP * gain</div><div class='add'>+ * bdp = ceil(bw * min_rtt * gain)</div><div class='ctx'>  *</div><div class='ctx'>  * The key factor, gain, controls the amount of queue. While a small gain</div><div class='ctx'>  * builds a smaller queue, it becomes more vulnerable to noise in RTT</div><div class='ctx'>  * measurements (e.g., delayed ACKs or other ACK compression effects). This</div><div class='ctx'>  * noise may cause BBR to under-estimate the rate.</div><div class='del'>- *</div><div class='del'>- * To achieve full performance in high-speed paths, we budget enough cwnd to</div><div class='del'>- * fit full-sized skbs in-flight on both end hosts to fully utilize the path:</div><div class='del'>- *   - one skb in sending host Qdisc,</div><div class='del'>- *   - one skb in sending host TSO/GSO engine</div><div class='del'>- *   - one skb being received by receiver host LRO/GRO/delayed-ACK engine</div><div class='del'>- * Don't worry, at low rates (bbr_min_tso_rate) this won't bloat cwnd because</div><div class='del'>- * in such cases tso_segs_goal is 1. The minimum cwnd is 4 packets,</div><div class='del'>- * which allows 2 outstanding 2-packet sequences, to try to keep pipe</div><div class='del'>- * full even with ACK-every-other-packet delayed ACKs.</div><div class='ctx'>  */</div><div class='del'>-static u32 bbr_target_cwnd(struct sock *sk, u32 bw, int gain)</div><div class='add'>+static u32 bbr_bdp(struct sock *sk, u32 bw, int gain)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='del'>-	u32 cwnd;</div><div class='add'>+	u32 bdp;</div><div class='ctx'> 	u64 w;</div><div class='ctx'> </div><div class='ctx'> 	/* If we've never had a valid RTT sample, cap cwnd at the initial</div><div class='hunk'>@@ -352,8 +374,27 @@ static u32 bbr_target_cwnd(struct sock *sk, u32 bw, int gain)</div><div class='ctx'> </div><div class='ctx'> 	w = (u64)bw * bbr-&gt;min_rtt_us;</div><div class='ctx'> </div><div class='del'>-	/* Apply a gain to the given value, then remove the BW_SCALE shift. */</div><div class='del'>-	cwnd = (((w * gain) &gt;&gt; BBR_SCALE) + BW_UNIT - 1) / BW_UNIT;</div><div class='add'>+	/* Apply a gain to the given value, remove the BW_SCALE shift, and</div><div class='add'>+	 * round the value up to avoid a negative feedback loop.</div><div class='add'>+	 */</div><div class='add'>+	bdp = (((w * gain) &gt;&gt; BBR_SCALE) + BW_UNIT - 1) / BW_UNIT;</div><div class='add'>+</div><div class='add'>+	return bdp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* To achieve full performance in high-speed paths, we budget enough cwnd to</div><div class='add'>+ * fit full-sized skbs in-flight on both end hosts to fully utilize the path:</div><div class='add'>+ *   - one skb in sending host Qdisc,</div><div class='add'>+ *   - one skb in sending host TSO/GSO engine</div><div class='add'>+ *   - one skb being received by receiver host LRO/GRO/delayed-ACK engine</div><div class='add'>+ * Don't worry, at low rates (bbr_min_tso_rate) this won't bloat cwnd because</div><div class='add'>+ * in such cases tso_segs_goal is 1. The minimum cwnd is 4 packets,</div><div class='add'>+ * which allows 2 outstanding 2-packet sequences, to try to keep pipe</div><div class='add'>+ * full even with ACK-every-other-packet delayed ACKs.</div><div class='add'>+ */</div><div class='add'>+static u32 bbr_quantization_budget(struct sock *sk, u32 cwnd)</div><div class='add'>+{</div><div class='add'>+	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow enough full-sized skbs in flight to utilize end systems. */</div><div class='ctx'> 	cwnd += 3 * bbr_tso_segs_goal(sk);</div><div class='hunk'>@@ -362,12 +403,72 @@ static u32 bbr_target_cwnd(struct sock *sk, u32 bw, int gain)</div><div class='ctx'> 	cwnd = (cwnd + 1) &amp; ~1U;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure gain cycling gets inflight above BDP even for small BDPs. */</div><div class='del'>-	if (bbr-&gt;mode == BBR_PROBE_BW &amp;&amp; gain &gt; BBR_UNIT)</div><div class='add'>+	if (bbr-&gt;mode == BBR_PROBE_BW &amp;&amp; bbr-&gt;cycle_idx == 0)</div><div class='ctx'> 		cwnd += 2;</div><div class='ctx'> </div><div class='ctx'> 	return cwnd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Find inflight based on min RTT and the estimated bottleneck bandwidth. */</div><div class='add'>+static u32 bbr_inflight(struct sock *sk, u32 bw, int gain)</div><div class='add'>+{</div><div class='add'>+	u32 inflight;</div><div class='add'>+</div><div class='add'>+	inflight = bbr_bdp(sk, bw, gain);</div><div class='add'>+	inflight = bbr_quantization_budget(sk, inflight);</div><div class='add'>+</div><div class='add'>+	return inflight;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* With pacing at lower layers, there's often less data "in the network" than</div><div class='add'>+ * "in flight". With TSQ and departure time pacing at lower layers (e.g. fq),</div><div class='add'>+ * we often have several skbs queued in the pacing layer with a pre-scheduled</div><div class='add'>+ * earliest departure time (EDT). BBR adapts its pacing rate based on the</div><div class='add'>+ * inflight level that it estimates has already been "baked in" by previous</div><div class='add'>+ * departure time decisions. We calculate a rough estimate of the number of our</div><div class='add'>+ * packets that might be in the network at the earliest departure time for the</div><div class='add'>+ * next skb scheduled:</div><div class='add'>+ *   in_network_at_edt = inflight_at_edt - (EDT - now) * bw</div><div class='add'>+ * If we're increasing inflight, then we want to know if the transmit of the</div><div class='add'>+ * EDT skb will push inflight above the target, so inflight_at_edt includes</div><div class='add'>+ * bbr_tso_segs_goal() from the skb departing at EDT. If decreasing inflight,</div><div class='add'>+ * then estimate if inflight will sink too low just before the EDT transmit.</div><div class='add'>+ */</div><div class='add'>+static u32 bbr_packets_in_net_at_edt(struct sock *sk, u32 inflight_now)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct bbr *bbr = inet_csk_ca(sk);</div><div class='add'>+	u64 now_ns, edt_ns, interval_us;</div><div class='add'>+	u32 interval_delivered, inflight_at_edt;</div><div class='add'>+</div><div class='add'>+	now_ns = tp-&gt;tcp_clock_cache;</div><div class='add'>+	edt_ns = max(tp-&gt;tcp_wstamp_ns, now_ns);</div><div class='add'>+	interval_us = div_u64(edt_ns - now_ns, NSEC_PER_USEC);</div><div class='add'>+	interval_delivered = (u64)bbr_bw(sk) * interval_us &gt;&gt; BW_SCALE;</div><div class='add'>+	inflight_at_edt = inflight_now;</div><div class='add'>+	if (bbr-&gt;pacing_gain &gt; BBR_UNIT)              /* increasing inflight */</div><div class='add'>+		inflight_at_edt += bbr_tso_segs_goal(sk);  /* include EDT skb */</div><div class='add'>+	if (interval_delivered &gt;= inflight_at_edt)</div><div class='add'>+		return 0;</div><div class='add'>+	return inflight_at_edt - interval_delivered;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find the cwnd increment based on estimate of ack aggregation */</div><div class='add'>+static u32 bbr_ack_aggregation_cwnd(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	u32 max_aggr_cwnd, aggr_cwnd = 0;</div><div class='add'>+</div><div class='add'>+	if (bbr_extra_acked_gain &amp;&amp; bbr_full_bw_reached(sk)) {</div><div class='add'>+		max_aggr_cwnd = ((u64)bbr_bw(sk) * bbr_extra_acked_max_us)</div><div class='add'>+				/ BW_UNIT;</div><div class='add'>+		aggr_cwnd = (bbr_extra_acked_gain * bbr_extra_acked(sk))</div><div class='add'>+			     &gt;&gt; BBR_SCALE;</div><div class='add'>+		aggr_cwnd = min(aggr_cwnd, max_aggr_cwnd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aggr_cwnd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* An optimization in BBR to reduce losses: On the first round of recovery, we</div><div class='ctx'>  * follow the packet conservation principle: send P packets per P packets acked.</div><div class='ctx'>  * After that, we slow-start and send at most 2*P packets per P packets acked.</div><div class='hunk'>@@ -382,7 +483,7 @@ static bool bbr_set_cwnd_to_recover_or_restore(</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> 	u8 prev_state = bbr-&gt;prev_ca_state, state = inet_csk(sk)-&gt;icsk_ca_state;</div><div class='del'>-	u32 cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	u32 cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='ctx'> 	/* An ACK for P pkts should release at most 2*P packets. We do this</div><div class='ctx'> 	 * in two steps. First, here we deduct the number of lost packets.</div><div class='hunk'>@@ -420,7 +521,7 @@ static void bbr_set_cwnd(struct sock *sk, const struct rate_sample *rs,</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='del'>-	u32 cwnd = tp-&gt;snd_cwnd, target_cwnd = 0;</div><div class='add'>+	u32 cwnd = tcp_snd_cwnd(tp), target_cwnd = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!acked)</div><div class='ctx'> 		goto done;  /* no packet fully ACKed; just apply caps */</div><div class='hunk'>@@ -428,8 +529,15 @@ static void bbr_set_cwnd(struct sock *sk, const struct rate_sample *rs,</div><div class='ctx'> 	if (bbr_set_cwnd_to_recover_or_restore(sk, rs, acked, &amp;cwnd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	target_cwnd = bbr_bdp(sk, bw, gain);</div><div class='add'>+</div><div class='add'>+	/* Increment the cwnd to account for excess ACKed data that seems</div><div class='add'>+	 * due to aggregation (of data and/or ACKs) visible in the ACK stream.</div><div class='add'>+	 */</div><div class='add'>+	target_cwnd += bbr_ack_aggregation_cwnd(sk);</div><div class='add'>+	target_cwnd = bbr_quantization_budget(sk, target_cwnd);</div><div class='add'>+</div><div class='ctx'> 	/* If we're below target cwnd, slow start cwnd toward target cwnd. */</div><div class='del'>-	target_cwnd = bbr_target_cwnd(sk, bw, gain);</div><div class='ctx'> 	if (bbr_full_bw_reached(sk))  /* only cut cwnd if we filled the pipe */</div><div class='ctx'> 		cwnd = min(cwnd + acked, target_cwnd);</div><div class='ctx'> 	else if (cwnd &lt; target_cwnd || tp-&gt;delivered &lt; TCP_INIT_CWND)</div><div class='hunk'>@@ -437,9 +545,9 @@ static void bbr_set_cwnd(struct sock *sk, const struct rate_sample *rs,</div><div class='ctx'> 	cwnd = max(cwnd, bbr_cwnd_min_target);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	tp-&gt;snd_cwnd = min(cwnd, tp-&gt;snd_cwnd_clamp);	/* apply global cap */</div><div class='add'>+	tcp_snd_cwnd_set(tp, min(cwnd, tp-&gt;snd_cwnd_clamp));	/* apply global cap */</div><div class='ctx'> 	if (bbr-&gt;mode == BBR_PROBE_RTT)  /* drain queue, refresh min_rtt */</div><div class='del'>-		tp-&gt;snd_cwnd = min(tp-&gt;snd_cwnd, bbr_cwnd_min_target);</div><div class='add'>+		tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp), bbr_cwnd_min_target));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* End cycle phase if it's time and/or we hit the phase's in-flight target. */</div><div class='hunk'>@@ -459,7 +567,7 @@ static bool bbr_is_next_cycle_phase(struct sock *sk,</div><div class='ctx'> 	if (bbr-&gt;pacing_gain == BBR_UNIT)</div><div class='ctx'> 		return is_full_length;		/* just use wall clock time */</div><div class='ctx'> </div><div class='del'>-	inflight = rs-&gt;prior_in_flight;  /* what was in-flight before ACK? */</div><div class='add'>+	inflight = bbr_packets_in_net_at_edt(sk, rs-&gt;prior_in_flight);</div><div class='ctx'> 	bw = bbr_max_bw(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* A pacing_gain &gt; 1.0 probes for bw by trying to raise inflight to at</div><div class='hunk'>@@ -470,14 +578,14 @@ static bool bbr_is_next_cycle_phase(struct sock *sk,</div><div class='ctx'> 	if (bbr-&gt;pacing_gain &gt; BBR_UNIT)</div><div class='ctx'> 		return is_full_length &amp;&amp;</div><div class='ctx'> 			(rs-&gt;losses ||  /* perhaps pacing_gain*BDP won't fit */</div><div class='del'>-			 inflight &gt;= bbr_target_cwnd(sk, bw, bbr-&gt;pacing_gain));</div><div class='add'>+			 inflight &gt;= bbr_inflight(sk, bw, bbr-&gt;pacing_gain));</div><div class='ctx'> </div><div class='ctx'> 	/* A pacing_gain &lt; 1.0 tries to drain extra queue we added if bw</div><div class='ctx'> 	 * probing didn't find more bw. If inflight falls to match BDP then we</div><div class='ctx'> 	 * estimate queue is drained; persisting would underutilize the pipe.</div><div class='ctx'> 	 */</div><div class='ctx'> 	return is_full_length ||</div><div class='del'>-		inflight &lt;= bbr_target_cwnd(sk, bw, BBR_UNIT);</div><div class='add'>+		inflight &lt;= bbr_inflight(sk, bw, BBR_UNIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bbr_advance_cycle_phase(struct sock *sk)</div><div class='hunk'>@@ -487,8 +595,6 @@ static void bbr_advance_cycle_phase(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	bbr-&gt;cycle_idx = (bbr-&gt;cycle_idx + 1) &amp; (CYCLE_LEN - 1);</div><div class='ctx'> 	bbr-&gt;cycle_mstamp = tp-&gt;delivered_mstamp;</div><div class='del'>-	bbr-&gt;pacing_gain = bbr-&gt;lt_use_bw ? BBR_UNIT :</div><div class='del'>-					    bbr_pacing_gain[bbr-&gt;cycle_idx];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Gain cycling: cycle pacing gain to converge to fair share of available bw. */</div><div class='hunk'>@@ -506,8 +612,6 @@ static void bbr_reset_startup_mode(struct sock *sk)</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	bbr-&gt;mode = BBR_STARTUP;</div><div class='del'>-	bbr-&gt;pacing_gain = bbr_high_gain;</div><div class='del'>-	bbr-&gt;cwnd_gain	 = bbr_high_gain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bbr_reset_probe_bw_mode(struct sock *sk)</div><div class='hunk'>@@ -515,9 +619,7 @@ static void bbr_reset_probe_bw_mode(struct sock *sk)</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	bbr-&gt;mode = BBR_PROBE_BW;</div><div class='del'>-	bbr-&gt;pacing_gain = BBR_UNIT;</div><div class='del'>-	bbr-&gt;cwnd_gain = bbr_cwnd_gain;</div><div class='del'>-	bbr-&gt;cycle_idx = CYCLE_LEN - 1 - prandom_u32_max(bbr_cycle_rand);</div><div class='add'>+	bbr-&gt;cycle_idx = CYCLE_LEN - 1 - get_random_u32_below(bbr_cycle_rand);</div><div class='ctx'> 	bbr_advance_cycle_phase(sk);	/* flip to next phase of gain cycle */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -680,8 +782,7 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 	 * bandwidth sample. Delivered is in packets and interval_us in uS and</div><div class='ctx'> 	 * ratio will be &lt;&lt;1 for most connections. So delivered is first scaled.</div><div class='ctx'> 	 */</div><div class='del'>-	bw = (u64)rs-&gt;delivered * BW_UNIT;</div><div class='del'>-	do_div(bw, rs-&gt;interval_us);</div><div class='add'>+	bw = div64_long((u64)rs-&gt;delivered * BW_UNIT, rs-&gt;interval_us);</div><div class='ctx'> </div><div class='ctx'> 	/* If this sample is application-limited, it is likely to have a very</div><div class='ctx'> 	 * low delivered count that represents application behavior rather than</div><div class='hunk'>@@ -700,6 +801,67 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Estimates the windowed max degree of ack aggregation.</div><div class='add'>+ * This is used to provision extra in-flight data to keep sending during</div><div class='add'>+ * inter-ACK silences.</div><div class='add'>+ *</div><div class='add'>+ * Degree of ack aggregation is estimated as extra data acked beyond expected.</div><div class='add'>+ *</div><div class='add'>+ * max_extra_acked = "maximum recent excess data ACKed beyond max_bw * interval"</div><div class='add'>+ * cwnd += max_extra_acked</div><div class='add'>+ *</div><div class='add'>+ * Max extra_acked is clamped by cwnd and bw * bbr_extra_acked_max_us (100 ms).</div><div class='add'>+ * Max filter is an approximate sliding window of 5-10 (packet timed) round</div><div class='add'>+ * trips.</div><div class='add'>+ */</div><div class='add'>+static void bbr_update_ack_aggregation(struct sock *sk,</div><div class='add'>+				       const struct rate_sample *rs)</div><div class='add'>+{</div><div class='add'>+	u32 epoch_us, expected_acked, extra_acked;</div><div class='add'>+	struct bbr *bbr = inet_csk_ca(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!bbr_extra_acked_gain || rs-&gt;acked_sacked &lt;= 0 ||</div><div class='add'>+	    rs-&gt;delivered &lt; 0 || rs-&gt;interval_us &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bbr-&gt;round_start) {</div><div class='add'>+		bbr-&gt;extra_acked_win_rtts = min(0x1F,</div><div class='add'>+						bbr-&gt;extra_acked_win_rtts + 1);</div><div class='add'>+		if (bbr-&gt;extra_acked_win_rtts &gt;= bbr_extra_acked_win_rtts) {</div><div class='add'>+			bbr-&gt;extra_acked_win_rtts = 0;</div><div class='add'>+			bbr-&gt;extra_acked_win_idx = bbr-&gt;extra_acked_win_idx ?</div><div class='add'>+						   0 : 1;</div><div class='add'>+			bbr-&gt;extra_acked[bbr-&gt;extra_acked_win_idx] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compute how many packets we expected to be delivered over epoch. */</div><div class='add'>+	epoch_us = tcp_stamp_us_delta(tp-&gt;delivered_mstamp,</div><div class='add'>+				      bbr-&gt;ack_epoch_mstamp);</div><div class='add'>+	expected_acked = ((u64)bbr_bw(sk) * epoch_us) / BW_UNIT;</div><div class='add'>+</div><div class='add'>+	/* Reset the aggregation epoch if ACK rate is below expected rate or</div><div class='add'>+	 * significantly large no. of ack received since epoch (potentially</div><div class='add'>+	 * quite old epoch).</div><div class='add'>+	 */</div><div class='add'>+	if (bbr-&gt;ack_epoch_acked &lt;= expected_acked ||</div><div class='add'>+	    (bbr-&gt;ack_epoch_acked + rs-&gt;acked_sacked &gt;=</div><div class='add'>+	     bbr_ack_epoch_acked_reset_thresh)) {</div><div class='add'>+		bbr-&gt;ack_epoch_acked = 0;</div><div class='add'>+		bbr-&gt;ack_epoch_mstamp = tp-&gt;delivered_mstamp;</div><div class='add'>+		expected_acked = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compute excess data delivered, beyond what was expected. */</div><div class='add'>+	bbr-&gt;ack_epoch_acked = min_t(u32, 0xFFFFF,</div><div class='add'>+				     bbr-&gt;ack_epoch_acked + rs-&gt;acked_sacked);</div><div class='add'>+	extra_acked = bbr-&gt;ack_epoch_acked - expected_acked;</div><div class='add'>+	extra_acked = min(extra_acked, tcp_snd_cwnd(tp));</div><div class='add'>+	if (extra_acked &gt; bbr-&gt;extra_acked[bbr-&gt;extra_acked_win_idx])</div><div class='add'>+		bbr-&gt;extra_acked[bbr-&gt;extra_acked_win_idx] = extra_acked;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Estimate when the pipe is full, using the change in delivery rate: BBR</div><div class='ctx'>  * estimates that STARTUP filled the pipe if the estimated bw hasn't changed by</div><div class='ctx'>  * at least bbr_full_bw_thresh (25%) after bbr_full_bw_cnt (3) non-app-limited</div><div class='hunk'>@@ -734,14 +896,12 @@ static void bbr_check_drain(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> </div><div class='ctx'> 	if (bbr-&gt;mode == BBR_STARTUP &amp;&amp; bbr_full_bw_reached(sk)) {</div><div class='ctx'> 		bbr-&gt;mode = BBR_DRAIN;	/* drain queue we created */</div><div class='del'>-		bbr-&gt;pacing_gain = bbr_drain_gain;	/* pace slow to drain */</div><div class='del'>-		bbr-&gt;cwnd_gain = bbr_high_gain;	/* maintain cwnd */</div><div class='ctx'> 		tcp_sk(sk)-&gt;snd_ssthresh =</div><div class='del'>-				bbr_target_cwnd(sk, bbr_max_bw(sk), BBR_UNIT);</div><div class='add'>+				bbr_inflight(sk, bbr_max_bw(sk), BBR_UNIT);</div><div class='ctx'> 	}	/* fall through to check if in-flight is already small: */</div><div class='ctx'> 	if (bbr-&gt;mode == BBR_DRAIN &amp;&amp;</div><div class='del'>-	    tcp_packets_in_flight(tcp_sk(sk)) &lt;=</div><div class='del'>-	    bbr_target_cwnd(sk, bbr_max_bw(sk), BBR_UNIT))</div><div class='add'>+	    bbr_packets_in_net_at_edt(sk, tcp_packets_in_flight(tcp_sk(sk))) &lt;=</div><div class='add'>+	    bbr_inflight(sk, bbr_max_bw(sk), BBR_UNIT))</div><div class='ctx'> 		bbr_reset_probe_bw_mode(sk);  /* we estimate queue is drained */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -755,7 +915,7 @@ static void bbr_check_probe_rtt_done(struct sock *sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	bbr-&gt;min_rtt_stamp = tcp_jiffies32;  /* wait a while until PROBE_RTT */</div><div class='del'>-	tp-&gt;snd_cwnd = max(tp-&gt;snd_cwnd, bbr-&gt;prior_cwnd);</div><div class='add'>+	tcp_snd_cwnd_set(tp, max(tcp_snd_cwnd(tp), bbr-&gt;prior_cwnd));</div><div class='ctx'> 	bbr_reset_mode(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -788,7 +948,7 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 	filter_expired = after(tcp_jiffies32,</div><div class='ctx'> 			       bbr-&gt;min_rtt_stamp + bbr_min_rtt_win_sec * HZ);</div><div class='ctx'> 	if (rs-&gt;rtt_us &gt;= 0 &amp;&amp;</div><div class='del'>-	    (rs-&gt;rtt_us &lt;= bbr-&gt;min_rtt_us ||</div><div class='add'>+	    (rs-&gt;rtt_us &lt; bbr-&gt;min_rtt_us ||</div><div class='ctx'> 	     (filter_expired &amp;&amp; !rs-&gt;is_ack_delayed))) {</div><div class='ctx'> 		bbr-&gt;min_rtt_us = rs-&gt;rtt_us;</div><div class='ctx'> 		bbr-&gt;min_rtt_stamp = tcp_jiffies32;</div><div class='hunk'>@@ -797,8 +957,6 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 	if (bbr_probe_rtt_mode_ms &gt; 0 &amp;&amp; filter_expired &amp;&amp;</div><div class='ctx'> 	    !bbr-&gt;idle_restart &amp;&amp; bbr-&gt;mode != BBR_PROBE_RTT) {</div><div class='ctx'> 		bbr-&gt;mode = BBR_PROBE_RTT;  /* dip, drain queue */</div><div class='del'>-		bbr-&gt;pacing_gain = BBR_UNIT;</div><div class='del'>-		bbr-&gt;cwnd_gain = BBR_UNIT;</div><div class='ctx'> 		bbr_save_cwnd(sk);  /* note cwnd so we can restore it */</div><div class='ctx'> 		bbr-&gt;probe_rtt_done_stamp = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -826,16 +984,47 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 		bbr-&gt;idle_restart = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bbr_update_gains(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bbr *bbr = inet_csk_ca(sk);</div><div class='add'>+</div><div class='add'>+	switch (bbr-&gt;mode) {</div><div class='add'>+	case BBR_STARTUP:</div><div class='add'>+		bbr-&gt;pacing_gain = bbr_high_gain;</div><div class='add'>+		bbr-&gt;cwnd_gain	 = bbr_high_gain;</div><div class='add'>+		break;</div><div class='add'>+	case BBR_DRAIN:</div><div class='add'>+		bbr-&gt;pacing_gain = bbr_drain_gain;	/* slow, to drain */</div><div class='add'>+		bbr-&gt;cwnd_gain	 = bbr_high_gain;	/* keep cwnd */</div><div class='add'>+		break;</div><div class='add'>+	case BBR_PROBE_BW:</div><div class='add'>+		bbr-&gt;pacing_gain = (bbr-&gt;lt_use_bw ?</div><div class='add'>+				    BBR_UNIT :</div><div class='add'>+				    bbr_pacing_gain[bbr-&gt;cycle_idx]);</div><div class='add'>+		bbr-&gt;cwnd_gain	 = bbr_cwnd_gain;</div><div class='add'>+		break;</div><div class='add'>+	case BBR_PROBE_RTT:</div><div class='add'>+		bbr-&gt;pacing_gain = BBR_UNIT;</div><div class='add'>+		bbr-&gt;cwnd_gain	 = BBR_UNIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "BBR bad mode: %u\n", bbr-&gt;mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bbr_update_model(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> {</div><div class='ctx'> 	bbr_update_bw(sk, rs);</div><div class='add'>+	bbr_update_ack_aggregation(sk, rs);</div><div class='ctx'> 	bbr_update_cycle_phase(sk, rs);</div><div class='ctx'> 	bbr_check_full_bw_reached(sk, rs);</div><div class='ctx'> 	bbr_check_drain(sk, rs);</div><div class='ctx'> 	bbr_update_min_rtt(sk, rs);</div><div class='add'>+	bbr_update_gains(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bbr_main(struct sock *sk, const struct rate_sample *rs)</div><div class='add'>+__bpf_kfunc static void bbr_main(struct sock *sk, u32 ack, int flag, const struct rate_sample *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> 	u32 bw;</div><div class='hunk'>@@ -847,7 +1036,7 @@ static void bbr_main(struct sock *sk, const struct rate_sample *rs)</div><div class='ctx'> 	bbr_set_cwnd(sk, rs, rs-&gt;acked_sacked, bw, bbr-&gt;cwnd_gain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bbr_init(struct sock *sk)</div><div class='add'>+__bpf_kfunc static void bbr_init(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='hunk'>@@ -855,7 +1044,7 @@ static void bbr_init(struct sock *sk)</div><div class='ctx'> 	bbr-&gt;prior_cwnd = 0;</div><div class='ctx'> 	tp-&gt;snd_ssthresh = TCP_INFINITE_SSTHRESH;</div><div class='ctx'> 	bbr-&gt;rtt_cnt = 0;</div><div class='del'>-	bbr-&gt;next_rtt_delivered = 0;</div><div class='add'>+	bbr-&gt;next_rtt_delivered = tp-&gt;delivered;</div><div class='ctx'> 	bbr-&gt;prev_ca_state = TCP_CA_Open;</div><div class='ctx'> 	bbr-&gt;packet_conservation = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -879,10 +1068,17 @@ static void bbr_init(struct sock *sk)</div><div class='ctx'> 	bbr_reset_lt_bw_sampling(sk);</div><div class='ctx'> 	bbr_reset_startup_mode(sk);</div><div class='ctx'> </div><div class='add'>+	bbr-&gt;ack_epoch_mstamp = tp-&gt;tcp_mstamp;</div><div class='add'>+	bbr-&gt;ack_epoch_acked = 0;</div><div class='add'>+	bbr-&gt;extra_acked_win_rtts = 0;</div><div class='add'>+	bbr-&gt;extra_acked_win_idx = 0;</div><div class='add'>+	bbr-&gt;extra_acked[0] = 0;</div><div class='add'>+	bbr-&gt;extra_acked[1] = 0;</div><div class='add'>+</div><div class='ctx'> 	cmpxchg(&amp;sk-&gt;sk_pacing_status, SK_PACING_NONE, SK_PACING_NEEDED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bbr_sndbuf_expand(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 bbr_sndbuf_expand(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	/* Provision 3 * cwnd since BBR may slow-start even during recovery. */</div><div class='ctx'> 	return 3;</div><div class='hunk'>@@ -891,18 +1087,18 @@ static u32 bbr_sndbuf_expand(struct sock *sk)</div><div class='ctx'> /* In theory BBR does not need to undo the cwnd since it does not</div><div class='ctx'>  * always reduce cwnd on losses (see bbr_main()). Keep it for now.</div><div class='ctx'>  */</div><div class='del'>-static u32 bbr_undo_cwnd(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 bbr_undo_cwnd(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	bbr-&gt;full_bw = 0;   /* spurious slow-down; reset full pipe detection */</div><div class='ctx'> 	bbr-&gt;full_bw_cnt = 0;</div><div class='ctx'> 	bbr_reset_lt_bw_sampling(sk);</div><div class='del'>-	return tcp_sk(sk)-&gt;snd_cwnd;</div><div class='add'>+	return tcp_snd_cwnd(tcp_sk(sk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Entering loss recovery, so save cwnd for when we exit or undo recovery. */</div><div class='del'>-static u32 bbr_ssthresh(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 bbr_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	bbr_save_cwnd(sk);</div><div class='ctx'> 	return tcp_sk(sk)-&gt;snd_ssthresh;</div><div class='hunk'>@@ -930,7 +1126,7 @@ static size_t bbr_get_info(struct sock *sk, u32 ext, int *attr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bbr_set_state(struct sock *sk, u8 new_state)</div><div class='add'>+__bpf_kfunc static void bbr_set_state(struct sock *sk, u8 new_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct bbr *bbr = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -959,9 +1155,31 @@ static struct tcp_congestion_ops tcp_bbr_cong_ops __read_mostly = {</div><div class='ctx'> 	.set_state	= bbr_set_state,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BTF_KFUNCS_START(tcp_bbr_check_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_init)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_main)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_sndbuf_expand)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_undo_cwnd)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_cwnd_event)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_ssthresh)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_min_tso_segs)</div><div class='add'>+BTF_ID_FLAGS(func, bbr_set_state)</div><div class='add'>+BTF_KFUNCS_END(tcp_bbr_check_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set tcp_bbr_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;tcp_bbr_check_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init bbr_register(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct bbr) &gt; ICSK_CA_PRIV_SIZE);</div><div class='add'>+</div><div class='add'>+	ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &amp;tcp_bbr_kfunc_set);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return tcp_register_congestion_control(&amp;tcp_bbr_cong_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c<br/>index fc3614377413..58358bf92e1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_bic.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_bic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_bic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_bic.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Binary Increase Congestion control for TCP</div><div class='ctx'>  * Home page:</div><div class='hunk'>@@ -144,12 +145,13 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	if (!tcp_is_cwnd_limited(sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (tcp_in_slow_start(tp))</div><div class='del'>-		tcp_slow_start(tp, acked);</div><div class='del'>-	else {</div><div class='del'>-		bictcp_update(ca, tp-&gt;snd_cwnd);</div><div class='del'>-		tcp_cong_avoid_ai(tp, ca-&gt;cnt, 1);</div><div class='add'>+	if (tcp_in_slow_start(tp)) {</div><div class='add'>+		acked = tcp_slow_start(tp, acked);</div><div class='add'>+		if (!acked)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='add'>+	bictcp_update(ca, tcp_snd_cwnd(tp));</div><div class='add'>+	tcp_cong_avoid_ai(tp, ca-&gt;cnt, acked);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -164,16 +166,16 @@ static u32 bictcp_recalc_ssthresh(struct sock *sk)</div><div class='ctx'> 	ca-&gt;epoch_start = 0;	/* end of epoch */</div><div class='ctx'> </div><div class='ctx'> 	/* Wmax and fast convergence */</div><div class='del'>-	if (tp-&gt;snd_cwnd &lt; ca-&gt;last_max_cwnd &amp;&amp; fast_convergence)</div><div class='del'>-		ca-&gt;last_max_cwnd = (tp-&gt;snd_cwnd * (BICTCP_BETA_SCALE + beta))</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt; ca-&gt;last_max_cwnd &amp;&amp; fast_convergence)</div><div class='add'>+		ca-&gt;last_max_cwnd = (tcp_snd_cwnd(tp) * (BICTCP_BETA_SCALE + beta))</div><div class='ctx'> 			/ (2 * BICTCP_BETA_SCALE);</div><div class='ctx'> 	else</div><div class='del'>-		ca-&gt;last_max_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+		ca-&gt;last_max_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;snd_cwnd &lt;= low_window)</div><div class='del'>-		return max(tp-&gt;snd_cwnd &gt;&gt; 1U, 2U);</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt;= low_window)</div><div class='add'>+		return max(tcp_snd_cwnd(tp) &gt;&gt; 1U, 2U);</div><div class='ctx'> 	else</div><div class='del'>-		return max((tp-&gt;snd_cwnd * beta) / BICTCP_BETA_SCALE, 2U);</div><div class='add'>+		return max((tcp_snd_cwnd(tp) * beta) / BICTCP_BETA_SCALE, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bictcp_state(struct sock *sk, u8 new_state)</div><div class='head'>diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c<br/>new file mode 100644<br/>index 000000000000..a268e1595b22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_bpf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_bpf.c</a></div><div class='hunk'>@@ -0,0 +1,739 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2017 - 2018 Covalent IO, Inc. http://covalent.io */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skmsg.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+</div><div class='add'>+void tcp_eat_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tcp;</div><div class='add'>+	int copied;</div><div class='add'>+</div><div class='add'>+	if (!skb || !skb-&gt;len || !sk_is_tcp(sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb_bpf_strparser(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tcp = tcp_sk(sk);</div><div class='add'>+	copied = tcp-&gt;copied_seq + skb-&gt;len;</div><div class='add'>+	WRITE_ONCE(tcp-&gt;copied_seq, copied);</div><div class='add'>+	tcp_rcv_space_adjust(sk);</div><div class='add'>+	__tcp_cleanup_rbuf(sk, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock,</div><div class='add'>+			   struct sk_msg *msg, u32 apply_bytes)</div><div class='add'>+{</div><div class='add'>+	bool apply = apply_bytes;</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	u32 size, copied = 0;</div><div class='add'>+	struct sk_msg *tmp;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	tmp = kzalloc(sizeof(*tmp), __GFP_NOWARN | GFP_KERNEL);</div><div class='add'>+	if (unlikely(!tmp))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	tmp-&gt;sg.start = msg-&gt;sg.start;</div><div class='add'>+	i = msg-&gt;sg.start;</div><div class='add'>+	do {</div><div class='add'>+		sge = sk_msg_elem(msg, i);</div><div class='add'>+		size = (apply &amp;&amp; apply_bytes &lt; sge-&gt;length) ?</div><div class='add'>+			apply_bytes : sge-&gt;length;</div><div class='add'>+		if (!__sk_rmem_schedule(sk, size, false)) {</div><div class='add'>+			if (!copied)</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk_mem_charge(sk, size);</div><div class='add'>+		atomic_add(size, &amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+		sk_msg_xfer(tmp, msg, i, size);</div><div class='add'>+		copied += size;</div><div class='add'>+		if (sge-&gt;length)</div><div class='add'>+			get_page(sk_msg_page(tmp, i));</div><div class='add'>+		sk_msg_iter_var_next(i);</div><div class='add'>+		tmp-&gt;sg.end = i;</div><div class='add'>+		if (apply) {</div><div class='add'>+			apply_bytes -= size;</div><div class='add'>+			if (!apply_bytes) {</div><div class='add'>+				if (sge-&gt;length)</div><div class='add'>+					sk_msg_iter_var_prev(i);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (i != msg-&gt;sg.end);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		msg-&gt;sg.start = i;</div><div class='add'>+		if (!sk_psock_queue_msg(psock, tmp))</div><div class='add'>+			atomic_sub(copied, &amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+		sk_psock_data_ready(sk, psock);</div><div class='add'>+	} else {</div><div class='add'>+		sk_msg_free(sk, tmp);</div><div class='add'>+		kfree(tmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes,</div><div class='add'>+			int flags, bool uncharge)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msghdr = {};</div><div class='add'>+	bool apply = apply_bytes;</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int size, ret = 0;</div><div class='add'>+	u32 off;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		struct bio_vec bvec;</div><div class='add'>+		bool has_tx_ulp;</div><div class='add'>+</div><div class='add'>+		sge = sk_msg_elem(msg, msg-&gt;sg.start);</div><div class='add'>+		size = (apply &amp;&amp; apply_bytes &lt; sge-&gt;length) ?</div><div class='add'>+			apply_bytes : sge-&gt;length;</div><div class='add'>+		off  = sge-&gt;offset;</div><div class='add'>+		page = sg_page(sge);</div><div class='add'>+</div><div class='add'>+		tcp_rate_check_app_limited(sk);</div><div class='add'>+retry:</div><div class='add'>+		msghdr.msg_flags = flags | MSG_SPLICE_PAGES;</div><div class='add'>+		has_tx_ulp = tls_sw_has_ctx_tx(sk);</div><div class='add'>+		if (has_tx_ulp)</div><div class='add'>+			msghdr.msg_flags |= MSG_SENDPAGE_NOPOLICY;</div><div class='add'>+</div><div class='add'>+		if (size &lt; sge-&gt;length &amp;&amp; msg-&gt;sg.start != msg-&gt;sg.end)</div><div class='add'>+			msghdr.msg_flags |= MSG_MORE;</div><div class='add'>+</div><div class='add'>+		bvec_set_page(&amp;bvec, page, size, off);</div><div class='add'>+		iov_iter_bvec(&amp;msghdr.msg_iter, ITER_SOURCE, &amp;bvec, 1, size);</div><div class='add'>+		ret = tcp_sendmsg_locked(sk, &amp;msghdr, size);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (apply)</div><div class='add'>+			apply_bytes -= ret;</div><div class='add'>+		msg-&gt;sg.size -= ret;</div><div class='add'>+		sge-&gt;offset += ret;</div><div class='add'>+		sge-&gt;length -= ret;</div><div class='add'>+		if (uncharge)</div><div class='add'>+			sk_mem_uncharge(sk, ret);</div><div class='add'>+		if (ret != size) {</div><div class='add'>+			size -= ret;</div><div class='add'>+			off  += ret;</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		if (!sge-&gt;length) {</div><div class='add'>+			put_page(page);</div><div class='add'>+			sk_msg_iter_next(msg, start);</div><div class='add'>+			sg_init_table(sge, 1);</div><div class='add'>+			if (msg-&gt;sg.start == msg-&gt;sg.end)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (apply &amp;&amp; !apply_bytes)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_push_locked(struct sock *sk, struct sk_msg *msg,</div><div class='add'>+			       u32 apply_bytes, int flags, bool uncharge)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	ret = tcp_bpf_push(sk, msg, apply_bytes, flags, uncharge);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_bpf_sendmsg_redir(struct sock *sk, bool ingress,</div><div class='add'>+			  struct sk_msg *msg, u32 bytes, int flags)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock = sk_psock_get(sk);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!psock))</div><div class='add'>+		return -EPIPE;</div><div class='add'>+</div><div class='add'>+	ret = ingress ? bpf_tcp_ingress(sk, psock, msg, bytes) :</div><div class='add'>+			tcp_bpf_push_locked(sk, msg, bytes, flags, false);</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_bpf_sendmsg_redir);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+static int tcp_msg_wait_data(struct sock *sk, struct sk_psock *psock,</div><div class='add'>+			     long timeo)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!timeo)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='add'>+	ret = sk_wait_event(sk, &amp;timeo,</div><div class='add'>+			    !list_empty(&amp;psock-&gt;ingress_msg) ||</div><div class='add'>+			    !skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue), &amp;wait);</div><div class='add'>+	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_next_msg_fin(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sge;</div><div class='add'>+	struct sk_msg *msg_rx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	msg_rx = sk_psock_peek_msg(psock);</div><div class='add'>+	i = msg_rx-&gt;sg.start;</div><div class='add'>+	sge = sk_msg_elem(msg_rx, i);</div><div class='add'>+	if (!sge-&gt;length) {</div><div class='add'>+		struct sk_buff *skb = msg_rx-&gt;skb;</div><div class='add'>+</div><div class='add'>+		if (skb &amp;&amp; TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_recvmsg_parser(struct sock *sk,</div><div class='add'>+				  struct msghdr *msg,</div><div class='add'>+				  size_t len,</div><div class='add'>+				  int flags,</div><div class='add'>+				  int *addr_len)</div><div class='add'>+{</div><div class='add'>+	int peek = flags &amp; MSG_PEEK;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct tcp_sock *tcp;</div><div class='add'>+	int copied = 0;</div><div class='add'>+	u32 seq;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return inet_recv_error(sk, msg, len, addr_len);</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock_get(sk);</div><div class='add'>+	if (unlikely(!psock))</div><div class='add'>+		return tcp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	tcp = tcp_sk(sk);</div><div class='add'>+	seq = tcp-&gt;copied_seq;</div><div class='add'>+	/* We may have received data on the sk_receive_queue pre-accept and</div><div class='add'>+	 * then we can not use read_skb in this context because we haven't</div><div class='add'>+	 * assigned a sk_socket yet so have no link to the ops. The work-around</div><div class='add'>+	 * is to check the sk_receive_queue and in these cases read skbs off</div><div class='add'>+	 * queue again. The read_skb hook is not running at this point because</div><div class='add'>+	 * of lock_sock so we avoid having multiple runners in read_skb.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))) {</div><div class='add'>+		tcp_data_ready(sk);</div><div class='add'>+		/* This handles the ENOMEM errors if we both receive data</div><div class='add'>+		 * pre accept and are already under memory pressure. At least</div><div class='add'>+		 * let user know to retry.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(!skb_queue_empty(&amp;sk-&gt;sk_receive_queue))) {</div><div class='add'>+			copied = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+msg_bytes_ready:</div><div class='add'>+	copied = sk_msg_recvmsg(sk, psock, msg, len, flags);</div><div class='add'>+	/* The typical case for EFAULT is the socket was gracefully</div><div class='add'>+	 * shutdown with a FIN pkt. So check here the other case is</div><div class='add'>+	 * some error on copy_page_to_iter which would be unexpected.</div><div class='add'>+	 * On fin return correct return code to zero.</div><div class='add'>+	 */</div><div class='add'>+	if (copied == -EFAULT) {</div><div class='add'>+		bool is_fin = is_next_msg_fin(psock);</div><div class='add'>+</div><div class='add'>+		if (is_fin) {</div><div class='add'>+			copied = 0;</div><div class='add'>+			seq++;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	seq += copied;</div><div class='add'>+	if (!copied) {</div><div class='add'>+		long timeo;</div><div class='add'>+		int data;</div><div class='add'>+</div><div class='add'>+		if (sock_flag(sk, SOCK_DONE))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_err) {</div><div class='add'>+			copied = sock_error(sk);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+			copied = -ENOTCONN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+		if (!timeo) {</div><div class='add'>+			copied = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			copied = sock_intr_errno(timeo);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data = tcp_msg_wait_data(sk, psock, timeo);</div><div class='add'>+		if (data &lt; 0) {</div><div class='add'>+			copied = data;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		if (data &amp;&amp; !sk_psock_queue_empty(psock))</div><div class='add'>+			goto msg_bytes_ready;</div><div class='add'>+		copied = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (!peek)</div><div class='add'>+		WRITE_ONCE(tcp-&gt;copied_seq, seq);</div><div class='add'>+	tcp_rcv_space_adjust(sk);</div><div class='add'>+	if (copied &gt; 0)</div><div class='add'>+		__tcp_cleanup_rbuf(sk, copied);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			   int flags, int *addr_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	int copied, ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return inet_recv_error(sk, msg, len, addr_len);</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock_get(sk);</div><div class='add'>+	if (unlikely(!psock))</div><div class='add'>+		return tcp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+	if (!skb_queue_empty(&amp;sk-&gt;sk_receive_queue) &amp;&amp;</div><div class='add'>+	    sk_psock_queue_empty(psock)) {</div><div class='add'>+		sk_psock_put(sk, psock);</div><div class='add'>+		return tcp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+	}</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+msg_bytes_ready:</div><div class='add'>+	copied = sk_msg_recvmsg(sk, psock, msg, len, flags);</div><div class='add'>+	if (!copied) {</div><div class='add'>+		long timeo;</div><div class='add'>+		int data;</div><div class='add'>+</div><div class='add'>+		timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+		data = tcp_msg_wait_data(sk, psock, timeo);</div><div class='add'>+		if (data &lt; 0) {</div><div class='add'>+			ret = data;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		if (data) {</div><div class='add'>+			if (!sk_psock_queue_empty(psock))</div><div class='add'>+				goto msg_bytes_ready;</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			sk_psock_put(sk, psock);</div><div class='add'>+			return tcp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+		}</div><div class='add'>+		copied = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	ret = copied;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,</div><div class='add'>+				struct sk_msg *msg, int *copied, int flags)</div><div class='add'>+{</div><div class='add'>+	bool cork = false, enospc = sk_msg_full(msg), redir_ingress;</div><div class='add'>+	struct sock *sk_redir;</div><div class='add'>+	u32 tosend, origsize, sent, delta = 0;</div><div class='add'>+	u32 eval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+more_data:</div><div class='add'>+	if (psock-&gt;eval == __SK_NONE) {</div><div class='add'>+		/* Track delta in msg size to add/subtract it on SK_DROP from</div><div class='add'>+		 * returned to user copied size. This ensures user doesn't</div><div class='add'>+		 * get a positive return code with msg_cut_data and SK_DROP</div><div class='add'>+		 * verdict.</div><div class='add'>+		 */</div><div class='add'>+		delta = msg-&gt;sg.size;</div><div class='add'>+		psock-&gt;eval = sk_psock_msg_verdict(sk, psock, msg);</div><div class='add'>+		delta -= msg-&gt;sg.size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;cork_bytes &amp;&amp;</div><div class='add'>+	    msg-&gt;cork_bytes &gt; msg-&gt;sg.size &amp;&amp; !enospc) {</div><div class='add'>+		psock-&gt;cork_bytes = msg-&gt;cork_bytes - msg-&gt;sg.size;</div><div class='add'>+		if (!psock-&gt;cork) {</div><div class='add'>+			psock-&gt;cork = kzalloc(sizeof(*psock-&gt;cork),</div><div class='add'>+					      GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+			if (!psock-&gt;cork) {</div><div class='add'>+				sk_msg_free(sk, msg);</div><div class='add'>+				*copied = 0;</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		memcpy(psock-&gt;cork, msg, sizeof(*msg));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tosend = msg-&gt;sg.size;</div><div class='add'>+	if (psock-&gt;apply_bytes &amp;&amp; psock-&gt;apply_bytes &lt; tosend)</div><div class='add'>+		tosend = psock-&gt;apply_bytes;</div><div class='add'>+	eval = __SK_NONE;</div><div class='add'>+</div><div class='add'>+	switch (psock-&gt;eval) {</div><div class='add'>+	case __SK_PASS:</div><div class='add'>+		ret = tcp_bpf_push(sk, msg, tosend, flags, true);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			*copied -= sk_msg_free(sk, msg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		sk_msg_apply_bytes(psock, tosend);</div><div class='add'>+		break;</div><div class='add'>+	case __SK_REDIRECT:</div><div class='add'>+		redir_ingress = psock-&gt;redir_ingress;</div><div class='add'>+		sk_redir = psock-&gt;sk_redir;</div><div class='add'>+		sk_msg_apply_bytes(psock, tosend);</div><div class='add'>+		if (!psock-&gt;apply_bytes) {</div><div class='add'>+			/* Clean up before releasing the sock lock. */</div><div class='add'>+			eval = psock-&gt;eval;</div><div class='add'>+			psock-&gt;eval = __SK_NONE;</div><div class='add'>+			psock-&gt;sk_redir = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (psock-&gt;cork) {</div><div class='add'>+			cork = true;</div><div class='add'>+			psock-&gt;cork = NULL;</div><div class='add'>+		}</div><div class='add'>+		release_sock(sk);</div><div class='add'>+</div><div class='add'>+		origsize = msg-&gt;sg.size;</div><div class='add'>+		ret = tcp_bpf_sendmsg_redir(sk_redir, redir_ingress,</div><div class='add'>+					    msg, tosend, flags);</div><div class='add'>+		sent = origsize - msg-&gt;sg.size;</div><div class='add'>+</div><div class='add'>+		if (eval == __SK_REDIRECT)</div><div class='add'>+			sock_put(sk_redir);</div><div class='add'>+</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+		sk_mem_uncharge(sk, sent);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			int free = sk_msg_free(sk, msg);</div><div class='add'>+</div><div class='add'>+			if (!cork)</div><div class='add'>+				*copied -= free;</div><div class='add'>+		}</div><div class='add'>+		if (cork) {</div><div class='add'>+			sk_msg_free(sk, msg);</div><div class='add'>+			kfree(msg);</div><div class='add'>+			msg = NULL;</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case __SK_DROP:</div><div class='add'>+	default:</div><div class='add'>+		sk_msg_free(sk, msg);</div><div class='add'>+		sk_msg_apply_bytes(psock, tosend);</div><div class='add'>+		*copied -= (tosend + delta);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!ret)) {</div><div class='add'>+		if (!psock-&gt;apply_bytes) {</div><div class='add'>+			psock-&gt;eval =  __SK_NONE;</div><div class='add'>+			if (psock-&gt;sk_redir) {</div><div class='add'>+				sock_put(psock-&gt;sk_redir);</div><div class='add'>+				psock-&gt;sk_redir = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (msg &amp;&amp;</div><div class='add'>+		    msg-&gt;sg.data[msg-&gt;sg.start].page_link &amp;&amp;</div><div class='add'>+		    msg-&gt;sg.data[msg-&gt;sg.start].length)</div><div class='add'>+			goto more_data;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct sk_msg tmp, *msg_tx = NULL;</div><div class='add'>+	int copied = 0, err = 0, ret = 0;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	long timeo;</div><div class='add'>+	int flags;</div><div class='add'>+</div><div class='add'>+	/* Don't let internal flags through */</div><div class='add'>+	flags = (msg-&gt;msg_flags &amp; ~MSG_SENDPAGE_DECRYPTED);</div><div class='add'>+	flags |= MSG_NO_SHARED_FRAGS;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock_get(sk);</div><div class='add'>+	if (unlikely(!psock))</div><div class='add'>+		return tcp_sendmsg(sk, msg, size);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	timeo = sock_sndtimeo(sk, msg-&gt;msg_flags &amp; MSG_DONTWAIT);</div><div class='add'>+	while (msg_data_left(msg)) {</div><div class='add'>+		bool enospc = false;</div><div class='add'>+		u32 copy, osize;</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_err) {</div><div class='add'>+			err = -sk-&gt;sk_err;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copy = msg_data_left(msg);</div><div class='add'>+		if (!sk_stream_memory_free(sk))</div><div class='add'>+			goto wait_for_sndbuf;</div><div class='add'>+		if (psock-&gt;cork) {</div><div class='add'>+			msg_tx = psock-&gt;cork;</div><div class='add'>+		} else {</div><div class='add'>+			msg_tx = &amp;tmp;</div><div class='add'>+			sk_msg_init(msg_tx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		osize = msg_tx-&gt;sg.size;</div><div class='add'>+		err = sk_msg_alloc(sk, msg_tx, msg_tx-&gt;sg.size + copy, msg_tx-&gt;sg.end - 1);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err != -ENOSPC)</div><div class='add'>+				goto wait_for_memory;</div><div class='add'>+			enospc = true;</div><div class='add'>+			copy = msg_tx-&gt;sg.size - osize;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = sk_msg_memcopy_from_iter(sk, &amp;msg-&gt;msg_iter, msg_tx,</div><div class='add'>+					       copy);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			sk_msg_trim(sk, msg_tx, osize);</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copied += ret;</div><div class='add'>+		if (psock-&gt;cork_bytes) {</div><div class='add'>+			if (size &gt; psock-&gt;cork_bytes)</div><div class='add'>+				psock-&gt;cork_bytes = 0;</div><div class='add'>+			else</div><div class='add'>+				psock-&gt;cork_bytes -= size;</div><div class='add'>+			if (psock-&gt;cork_bytes &amp;&amp; !enospc)</div><div class='add'>+				goto out_err;</div><div class='add'>+			/* All cork bytes are accounted, rerun the prog. */</div><div class='add'>+			psock-&gt;eval = __SK_NONE;</div><div class='add'>+			psock-&gt;cork_bytes = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = tcp_bpf_send_verdict(sk, psock, msg_tx, &amp;copied, flags);</div><div class='add'>+		if (unlikely(err &lt; 0))</div><div class='add'>+			goto out_err;</div><div class='add'>+		continue;</div><div class='add'>+wait_for_sndbuf:</div><div class='add'>+		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+wait_for_memory:</div><div class='add'>+		err = sk_stream_wait_memory(sk, &amp;timeo);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (msg_tx &amp;&amp; msg_tx != psock-&gt;cork)</div><div class='add'>+				sk_msg_free(sk, msg_tx);</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out_err:</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		err = sk_stream_error(sk, msg-&gt;msg_flags, err);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+	return copied &gt; 0 ? copied : err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TCP_BPF_IPV4,</div><div class='add'>+	TCP_BPF_IPV6,</div><div class='add'>+	TCP_BPF_NUM_PROTS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TCP_BPF_BASE,</div><div class='add'>+	TCP_BPF_TX,</div><div class='add'>+	TCP_BPF_RX,</div><div class='add'>+	TCP_BPF_TXRX,</div><div class='add'>+	TCP_BPF_NUM_CFGS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct proto *tcpv6_prot_saved __read_mostly;</div><div class='add'>+static DEFINE_SPINLOCK(tcpv6_prot_lock);</div><div class='add'>+static struct proto tcp_bpf_prots[TCP_BPF_NUM_PROTS][TCP_BPF_NUM_CFGS];</div><div class='add'>+</div><div class='add'>+static void tcp_bpf_rebuild_protos(struct proto prot[TCP_BPF_NUM_CFGS],</div><div class='add'>+				   struct proto *base)</div><div class='add'>+{</div><div class='add'>+	prot[TCP_BPF_BASE]			= *base;</div><div class='add'>+	prot[TCP_BPF_BASE].destroy		= sock_map_destroy;</div><div class='add'>+	prot[TCP_BPF_BASE].close		= sock_map_close;</div><div class='add'>+	prot[TCP_BPF_BASE].recvmsg		= tcp_bpf_recvmsg;</div><div class='add'>+	prot[TCP_BPF_BASE].sock_is_readable	= sk_msg_is_readable;</div><div class='add'>+</div><div class='add'>+	prot[TCP_BPF_TX]			= prot[TCP_BPF_BASE];</div><div class='add'>+	prot[TCP_BPF_TX].sendmsg		= tcp_bpf_sendmsg;</div><div class='add'>+</div><div class='add'>+	prot[TCP_BPF_RX]			= prot[TCP_BPF_BASE];</div><div class='add'>+	prot[TCP_BPF_RX].recvmsg		= tcp_bpf_recvmsg_parser;</div><div class='add'>+</div><div class='add'>+	prot[TCP_BPF_TXRX]			= prot[TCP_BPF_TX];</div><div class='add'>+	prot[TCP_BPF_TXRX].recvmsg		= tcp_bpf_recvmsg_parser;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_bpf_check_v6_needs_rebuild(struct proto *ops)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(ops != smp_load_acquire(&amp;tcpv6_prot_saved))) {</div><div class='add'>+		spin_lock_bh(&amp;tcpv6_prot_lock);</div><div class='add'>+		if (likely(ops != tcpv6_prot_saved)) {</div><div class='add'>+			tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV6], ops);</div><div class='add'>+			smp_store_release(&amp;tcpv6_prot_saved, ops);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;tcpv6_prot_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init tcp_bpf_v4_build_proto(void)</div><div class='add'>+{</div><div class='add'>+	tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV4], &amp;tcp_prot);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(tcp_bpf_v4_build_proto);</div><div class='add'>+</div><div class='add'>+static int tcp_bpf_assert_proto_ops(struct proto *ops)</div><div class='add'>+{</div><div class='add'>+	/* In order to avoid retpoline, we make assumptions when we call</div><div class='add'>+	 * into ops if e.g. a psock is not present. Make sure they are</div><div class='add'>+	 * indeed valid assumptions.</div><div class='add'>+	 */</div><div class='add'>+	return ops-&gt;recvmsg  == tcp_recvmsg &amp;&amp;</div><div class='add'>+	       ops-&gt;sendmsg  == tcp_sendmsg ? 0 : -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)</div><div class='add'>+int tcp_bpf_strp_read_sock(struct strparser *strp, read_descriptor_t *desc,</div><div class='add'>+			   sk_read_actor_t recv_actor)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = strp-&gt;sk;</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	int copied = 0;</div><div class='add'>+</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	psock = sk_psock(sk);</div><div class='add'>+	if (WARN_ON_ONCE(!psock)) {</div><div class='add'>+		desc-&gt;error = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psock-&gt;ingress_bytes = 0;</div><div class='add'>+	copied = tcp_read_sock_noack(sk, desc, recv_actor, true,</div><div class='add'>+				     &amp;psock-&gt;copied_seq);</div><div class='add'>+	if (copied &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* recv_actor may redirect skb to another socket (SK_REDIRECT) or</div><div class='add'>+	 * just put skb into ingress queue of current socket (SK_PASS).</div><div class='add'>+	 * For SK_REDIRECT, we need to ack the frame immediately but for</div><div class='add'>+	 * SK_PASS, we want to delay the ack until tcp_bpf_recvmsg_parser().</div><div class='add'>+	 */</div><div class='add'>+	tp-&gt;copied_seq = psock-&gt;copied_seq - psock-&gt;ingress_bytes;</div><div class='add'>+	tcp_rcv_space_adjust(sk);</div><div class='add'>+	__tcp_cleanup_rbuf(sk, copied - psock-&gt;ingress_bytes);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BPF_STREAM_PARSER */</div><div class='add'>+</div><div class='add'>+int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)</div><div class='add'>+{</div><div class='add'>+	int family = sk-&gt;sk_family == AF_INET6 ? TCP_BPF_IPV6 : TCP_BPF_IPV4;</div><div class='add'>+	int config = psock-&gt;progs.msg_parser   ? TCP_BPF_TX   : TCP_BPF_BASE;</div><div class='add'>+</div><div class='add'>+	if (psock-&gt;progs.stream_verdict || psock-&gt;progs.skb_verdict) {</div><div class='add'>+		config = (config == TCP_BPF_TX) ? TCP_BPF_TXRX : TCP_BPF_RX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (restore) {</div><div class='add'>+		if (inet_csk_has_ulp(sk)) {</div><div class='add'>+			/* TLS does not have an unhash proto in SW cases,</div><div class='add'>+			 * but we need to ensure we stop using the sock_map</div><div class='add'>+			 * unhash routine because the associated psock is being</div><div class='add'>+			 * removed. So use the original unhash handler.</div><div class='add'>+			 */</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_prot-&gt;unhash, psock-&gt;saved_unhash);</div><div class='add'>+			tcp_update_ulp(sk, psock-&gt;sk_proto, psock-&gt;saved_write_space);</div><div class='add'>+		} else {</div><div class='add'>+			sk-&gt;sk_write_space = psock-&gt;saved_write_space;</div><div class='add'>+			/* Pairs with lockless read in sk_clone_lock() */</div><div class='add'>+			sock_replace_proto(sk, psock-&gt;sk_proto);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+		if (tcp_bpf_assert_proto_ops(psock-&gt;sk_proto))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tcp_bpf_check_v6_needs_rebuild(psock-&gt;sk_proto);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pairs with lockless read in sk_clone_lock() */</div><div class='add'>+	sock_replace_proto(sk, &amp;tcp_bpf_prots[family][config]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_bpf_update_proto);</div><div class='add'>+</div><div class='add'>+/* If a child got cloned from a listening socket that had tcp_bpf</div><div class='add'>+ * protocol callbacks installed, we need to restore the callbacks to</div><div class='add'>+ * the default ones because the child does not inherit the psock state</div><div class='add'>+ * that tcp_bpf callbacks expect.</div><div class='add'>+ */</div><div class='add'>+void tcp_bpf_clone(const struct sock *sk, struct sock *newsk)</div><div class='add'>+{</div><div class='add'>+	struct proto *prot = newsk-&gt;sk_prot;</div><div class='add'>+</div><div class='add'>+	if (is_insidevar(prot, tcp_bpf_prots))</div><div class='add'>+		newsk-&gt;sk_prot = sk-&gt;sk_prot_creator;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BPF_SYSCALL */</div><div class='head'>diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c<br/>index 06fbe102a425..fbad6c35dee9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cdg.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cdg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cdg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_cdg.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAIA Delay-Gradient (CDG) congestion control</div><div class='ctx'>  *</div><div class='hunk'>@@ -146,7 +147,7 @@ static void tcp_cdg_hystart_update(struct sock *sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hystart_detect &amp; HYSTART_ACK_TRAIN) {</div><div class='del'>-		u32 now_us = div_u64(local_clock(), NSEC_PER_USEC);</div><div class='add'>+		u32 now_us = tp-&gt;tcp_mstamp;</div><div class='ctx'> </div><div class='ctx'> 		if (ca-&gt;last_ack == 0 || !tcp_is_cwnd_limited(sk)) {</div><div class='ctx'> 			ca-&gt;last_ack = now_us;</div><div class='hunk'>@@ -160,8 +161,8 @@ static void tcp_cdg_hystart_update(struct sock *sk)</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTTRAINDETECT);</div><div class='ctx'> 				NET_ADD_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTTRAINCWND,</div><div class='del'>-					      tp-&gt;snd_cwnd);</div><div class='del'>-				tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd;</div><div class='add'>+					      tcp_snd_cwnd(tp));</div><div class='add'>+				tp-&gt;snd_ssthresh = tcp_snd_cwnd(tp);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -179,8 +180,8 @@ static void tcp_cdg_hystart_update(struct sock *sk)</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTDELAYDETECT);</div><div class='ctx'> 				NET_ADD_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTDELAYCWND,</div><div class='del'>-					      tp-&gt;snd_cwnd);</div><div class='del'>-				tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd;</div><div class='add'>+					      tcp_snd_cwnd(tp));</div><div class='add'>+				tp-&gt;snd_ssthresh = tcp_snd_cwnd(tp);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -242,7 +243,7 @@ static bool tcp_cdg_backoff(struct sock *sk, u32 grad)</div><div class='ctx'> 	struct cdg *ca = inet_csk_ca(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (prandom_u32() &lt;= nexp_u32(grad * backoff_factor))</div><div class='add'>+	if (get_random_u32() &lt;= nexp_u32(grad * backoff_factor))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (use_ineff) {</div><div class='hunk'>@@ -251,7 +252,7 @@ static bool tcp_cdg_backoff(struct sock *sk, u32 grad)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ca-&gt;shadow_wnd = max(ca-&gt;shadow_wnd, tp-&gt;snd_cwnd);</div><div class='add'>+	ca-&gt;shadow_wnd = max(ca-&gt;shadow_wnd, tcp_snd_cwnd(tp));</div><div class='ctx'> 	ca-&gt;state = CDG_BACKOFF;</div><div class='ctx'> 	tcp_enter_cwr(sk);</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -284,14 +285,14 @@ static void tcp_cdg_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tcp_is_cwnd_limited(sk)) {</div><div class='del'>-		ca-&gt;shadow_wnd = min(ca-&gt;shadow_wnd, tp-&gt;snd_cwnd);</div><div class='add'>+		ca-&gt;shadow_wnd = min(ca-&gt;shadow_wnd, tcp_snd_cwnd(tp));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prior_snd_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	prior_snd_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> 	tcp_reno_cong_avoid(sk, ack, acked);</div><div class='ctx'> </div><div class='del'>-	incr = tp-&gt;snd_cwnd - prior_snd_cwnd;</div><div class='add'>+	incr = tcp_snd_cwnd(tp) - prior_snd_cwnd;</div><div class='ctx'> 	ca-&gt;shadow_wnd = max(ca-&gt;shadow_wnd, ca-&gt;shadow_wnd + incr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,15 +331,15 @@ static u32 tcp_cdg_ssthresh(struct sock *sk)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (ca-&gt;state == CDG_BACKOFF)</div><div class='del'>-		return max(2U, (tp-&gt;snd_cwnd * min(1024U, backoff_beta)) &gt;&gt; 10);</div><div class='add'>+		return max(2U, (tcp_snd_cwnd(tp) * min(1024U, backoff_beta)) &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	if (ca-&gt;state == CDG_NONFULL &amp;&amp; use_tolerance)</div><div class='del'>-		return tp-&gt;snd_cwnd;</div><div class='add'>+		return tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='del'>-	ca-&gt;shadow_wnd = min(ca-&gt;shadow_wnd &gt;&gt; 1, tp-&gt;snd_cwnd);</div><div class='add'>+	ca-&gt;shadow_wnd = min(ca-&gt;shadow_wnd &gt;&gt; 1, tcp_snd_cwnd(tp));</div><div class='ctx'> 	if (use_shadow)</div><div class='del'>-		return max3(2U, ca-&gt;shadow_wnd, tp-&gt;snd_cwnd &gt;&gt; 1);</div><div class='del'>-	return max(2U, tp-&gt;snd_cwnd &gt;&gt; 1);</div><div class='add'>+		return max3(2U, ca-&gt;shadow_wnd, tcp_snd_cwnd(tp) &gt;&gt; 1);</div><div class='add'>+	return max(2U, tcp_snd_cwnd(tp) &gt;&gt; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_cdg_cwnd_event(struct sock *sk, const enum tcp_ca_event ev)</div><div class='hunk'>@@ -356,7 +357,7 @@ static void tcp_cdg_cwnd_event(struct sock *sk, const enum tcp_ca_event ev)</div><div class='ctx'> </div><div class='ctx'> 		ca-&gt;gradients = gradients;</div><div class='ctx'> 		ca-&gt;rtt_seq = tp-&gt;snd_nxt;</div><div class='del'>-		ca-&gt;shadow_wnd = tp-&gt;snd_cwnd;</div><div class='add'>+		ca-&gt;shadow_wnd = tcp_snd_cwnd(tp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CA_EVENT_COMPLETE_CWR:</div><div class='ctx'> 		ca-&gt;state = CDG_UNKNOWN;</div><div class='hunk'>@@ -374,12 +375,13 @@ static void tcp_cdg_init(struct sock *sk)</div><div class='ctx'> 	struct cdg *ca = inet_csk_ca(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='add'>+	ca-&gt;gradients = NULL;</div><div class='ctx'> 	/* We silently fall back to window = 1 if allocation fails. */</div><div class='ctx'> 	if (window &gt; 1)</div><div class='ctx'> 		ca-&gt;gradients = kcalloc(window, sizeof(ca-&gt;gradients[0]),</div><div class='del'>-					GFP_NOWAIT | __GFP_NOWARN);</div><div class='add'>+					GFP_NOWAIT);</div><div class='ctx'> 	ca-&gt;rtt_seq = tp-&gt;snd_nxt;</div><div class='del'>-	ca-&gt;shadow_wnd = tp-&gt;snd_cwnd;</div><div class='add'>+	ca-&gt;shadow_wnd = tcp_snd_cwnd(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_cdg_release(struct sock *sk)</div><div class='hunk'>@@ -387,6 +389,7 @@ static void tcp_cdg_release(struct sock *sk)</div><div class='ctx'> 	struct cdg *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ca-&gt;gradients);</div><div class='add'>+	ca-&gt;gradients = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_cdg __read_mostly = {</div><div class='head'>diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c<br/>index bc6c02f16243..df758adbb445 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cong.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cong.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cong.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_cong.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Pluggable TCP congestion control support and newReno</div><div class='ctx'>  * congestion control.</div><div class='hunk'>@@ -15,12 +16,13 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;trace/events/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(tcp_cong_list_lock);</div><div class='ctx'> static LIST_HEAD(tcp_cong_list);</div><div class='ctx'> </div><div class='ctx'> /* Simple linear search, don't expect many entries! */</div><div class='del'>-static struct tcp_congestion_ops *tcp_ca_find(const char *name)</div><div class='add'>+struct tcp_congestion_ops *tcp_ca_find(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_congestion_ops *e;</div><div class='ctx'> </div><div class='hunk'>@@ -32,9 +34,19 @@ static struct tcp_congestion_ops *tcp_ca_find(const char *name)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tcp_set_ca_state(struct sock *sk, const u8 ca_state)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+	trace_tcp_cong_state_set(sk, ca_state);</div><div class='add'>+</div><div class='add'>+	if (icsk-&gt;icsk_ca_ops-&gt;set_state)</div><div class='add'>+		icsk-&gt;icsk_ca_ops-&gt;set_state(sk, ca_state);</div><div class='add'>+	icsk-&gt;icsk_ca_state = ca_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Must be called with rcu lock held */</div><div class='del'>-static struct tcp_congestion_ops *tcp_ca_find_autoload(struct net *net,</div><div class='del'>-						       const char *name)</div><div class='add'>+static struct tcp_congestion_ops *tcp_ca_find_autoload(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_congestion_ops *ca = tcp_ca_find(name);</div><div class='ctx'> </div><div class='hunk'>@@ -62,14 +74,8 @@ struct tcp_congestion_ops *tcp_ca_find_key(u32 key)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Attach new congestion control algorithm to the list</div><div class='del'>- * of available options.</div><div class='del'>- */</div><div class='del'>-int tcp_register_congestion_control(struct tcp_congestion_ops *ca)</div><div class='add'>+int tcp_validate_congestion_control(struct tcp_congestion_ops *ca)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	/* all algorithms must implement these */</div><div class='ctx'> 	if (!ca-&gt;ssthresh || !ca-&gt;undo_cwnd ||</div><div class='ctx'> 	    !(ca-&gt;cong_avoid || ca-&gt;cong_control)) {</div><div class='hunk'>@@ -77,6 +83,20 @@ int tcp_register_congestion_control(struct tcp_congestion_ops *ca)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Attach new congestion control algorithm to the list</div><div class='add'>+ * of available options.</div><div class='add'>+ */</div><div class='add'>+int tcp_register_congestion_control(struct tcp_congestion_ops *ca)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tcp_validate_congestion_control(ca);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ca-&gt;key = jhash(ca-&gt;name, sizeof(ca-&gt;name), strlen(ca-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tcp_cong_list_lock);</div><div class='hunk'>@@ -117,7 +137,47 @@ void tcp_unregister_congestion_control(struct tcp_congestion_ops *ca)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_unregister_congestion_control);</div><div class='ctx'> </div><div class='del'>-u32 tcp_ca_get_key_by_name(struct net *net, const char *name, bool *ecn_ca)</div><div class='add'>+/* Replace a registered old ca with a new one.</div><div class='add'>+ *</div><div class='add'>+ * The new ca must have the same name as the old one, that has been</div><div class='add'>+ * registered.</div><div class='add'>+ */</div><div class='add'>+int tcp_update_congestion_control(struct tcp_congestion_ops *ca, struct tcp_congestion_ops *old_ca)</div><div class='add'>+{</div><div class='add'>+	struct tcp_congestion_ops *existing;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ca-&gt;key = jhash(ca-&gt;name, sizeof(ca-&gt;name), strlen(ca-&gt;name));</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tcp_cong_list_lock);</div><div class='add'>+	existing = tcp_ca_find_key(old_ca-&gt;key);</div><div class='add'>+	if (ca-&gt;key == TCP_CA_UNSPEC || !existing || strcmp(existing-&gt;name, ca-&gt;name)) {</div><div class='add'>+		pr_notice("%s not registered or non-unique key\n",</div><div class='add'>+			  ca-&gt;name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else if (existing != old_ca) {</div><div class='add'>+		pr_notice("invalid old congestion control algorithm to replace\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		/* Add the new one before removing the old one to keep</div><div class='add'>+		 * one implementation available all the time.</div><div class='add'>+		 */</div><div class='add'>+		list_add_tail_rcu(&amp;ca-&gt;list, &amp;tcp_cong_list);</div><div class='add'>+		list_del_rcu(&amp;existing-&gt;list);</div><div class='add'>+		pr_debug("%s updated\n", ca-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;tcp_cong_list_lock);</div><div class='add'>+</div><div class='add'>+	/* Wait for outstanding readers to complete before the</div><div class='add'>+	 * module or struct_ops gets removed entirely.</div><div class='add'>+	 */</div><div class='add'>+	if (!ret)</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 tcp_ca_get_key_by_name(const char *name, bool *ecn_ca)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_congestion_ops *ca;</div><div class='ctx'> 	u32 key = TCP_CA_UNSPEC;</div><div class='hunk'>@@ -125,7 +185,7 @@ u32 tcp_ca_get_key_by_name(struct net *net, const char *name, bool *ecn_ca)</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	ca = tcp_ca_find_autoload(net, name);</div><div class='add'>+	ca = tcp_ca_find_autoload(name);</div><div class='ctx'> 	if (ca) {</div><div class='ctx'> 		key = ca-&gt;key;</div><div class='ctx'> 		*ecn_ca = ca-&gt;flags &amp; TCP_CONG_NEEDS_ECN;</div><div class='hunk'>@@ -134,7 +194,6 @@ u32 tcp_ca_get_key_by_name(struct net *net, const char *name, bool *ecn_ca)</div><div class='ctx'> </div><div class='ctx'> 	return key;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_ca_get_key_by_name);</div><div class='ctx'> </div><div class='ctx'> char *tcp_ca_get_name_by_key(u32 key, char *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -143,14 +202,14 @@ char *tcp_ca_get_name_by_key(u32 key, char *buffer)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ca = tcp_ca_find_key(key);</div><div class='del'>-	if (ca)</div><div class='del'>-		ret = strncpy(buffer, ca-&gt;name,</div><div class='del'>-			      TCP_CA_NAME_MAX);</div><div class='add'>+	if (ca) {</div><div class='add'>+		strscpy(buffer, ca-&gt;name, TCP_CA_NAME_MAX);</div><div class='add'>+		ret = buffer;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_ca_get_name_by_key);</div><div class='ctx'> </div><div class='ctx'> /* Assign choice of congestion control. */</div><div class='ctx'> void tcp_assign_congestion_control(struct sock *sk)</div><div class='hunk'>@@ -161,7 +220,7 @@ void tcp_assign_congestion_control(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ca = rcu_dereference(net-&gt;ipv4.tcp_congestion_control);</div><div class='del'>-	if (unlikely(!try_module_get(ca-&gt;owner)))</div><div class='add'>+	if (unlikely(!bpf_try_module_get(ca, ca-&gt;owner)))</div><div class='ctx'> 		ca = &amp;tcp_reno;</div><div class='ctx'> 	icsk-&gt;icsk_ca_ops = ca;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -175,7 +234,7 @@ void tcp_assign_congestion_control(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> void tcp_init_congestion_control(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='ctx'> 	tcp_sk(sk)-&gt;prior_ssthresh = 0;</div><div class='ctx'> 	if (icsk-&gt;icsk_ca_ops-&gt;init)</div><div class='hunk'>@@ -184,6 +243,7 @@ void tcp_init_congestion_control(struct sock *sk)</div><div class='ctx'> 		INET_ECN_xmit(sk);</div><div class='ctx'> 	else</div><div class='ctx'> 		INET_ECN_dontxmit(sk);</div><div class='add'>+	icsk-&gt;icsk_ca_initialized = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_reinit_congestion_control(struct sock *sk,</div><div class='hunk'>@@ -196,7 +256,12 @@ static void tcp_reinit_congestion_control(struct sock *sk,</div><div class='ctx'> 	icsk-&gt;icsk_ca_setsockopt = 1;</div><div class='ctx'> 	memset(icsk-&gt;icsk_ca_priv, 0, sizeof(icsk-&gt;icsk_ca_priv));</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_state != TCP_CLOSE)</div><div class='add'>+	if (ca-&gt;flags &amp; TCP_CONG_NEEDS_ECN)</div><div class='add'>+		INET_ECN_xmit(sk);</div><div class='add'>+	else</div><div class='add'>+		INET_ECN_dontxmit(sk);</div><div class='add'>+</div><div class='add'>+	if (!((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)))</div><div class='ctx'> 		tcp_init_congestion_control(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -205,9 +270,10 @@ void tcp_cleanup_congestion_control(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_ca_ops-&gt;release)</div><div class='add'>+	if (icsk-&gt;icsk_ca_initialized &amp;&amp; icsk-&gt;icsk_ca_ops-&gt;release)</div><div class='ctx'> 		icsk-&gt;icsk_ca_ops-&gt;release(sk);</div><div class='del'>-	module_put(icsk-&gt;icsk_ca_ops-&gt;owner);</div><div class='add'>+	icsk-&gt;icsk_ca_initialized = 0;</div><div class='add'>+	bpf_module_put(icsk-&gt;icsk_ca_ops, icsk-&gt;icsk_ca_ops-&gt;owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Used by sysctl to change default congestion control */</div><div class='hunk'>@@ -218,15 +284,19 @@ int tcp_set_default_congestion_control(struct net *net, const char *name)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	ca = tcp_ca_find_autoload(net, name);</div><div class='add'>+	ca = tcp_ca_find_autoload(name);</div><div class='ctx'> 	if (!ca) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-	} else if (!try_module_get(ca-&gt;owner)) {</div><div class='add'>+	} else if (!bpf_try_module_get(ca, ca-&gt;owner)) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='add'>+	} else if (!net_eq(net, &amp;init_net) &amp;&amp;</div><div class='add'>+			!(ca-&gt;flags &amp; TCP_CONG_NON_RESTRICTED)) {</div><div class='add'>+		/* Only init netns can set default to a restricted algorithm */</div><div class='add'>+		ret = -EPERM;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		prev = xchg(&amp;net-&gt;ipv4.tcp_congestion_control, ca);</div><div class='ctx'> 		if (prev)</div><div class='del'>-			module_put(prev-&gt;owner);</div><div class='add'>+			bpf_module_put(prev, prev-&gt;owner);</div><div class='ctx'> </div><div class='ctx'> 		ca-&gt;flags |= TCP_CONG_NON_RESTRICTED;</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -255,6 +325,9 @@ void tcp_get_available_congestion_control(char *buf, size_t maxlen)</div><div class='ctx'> 		offs += snprintf(buf + offs, maxlen - offs,</div><div class='ctx'> 				 "%s%s",</div><div class='ctx'> 				 offs == 0 ? "" : " ", ca-&gt;name);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(offs &gt;= maxlen))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -266,7 +339,7 @@ void tcp_get_default_congestion_control(struct net *net, char *name)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ca = rcu_dereference(net-&gt;ipv4.tcp_congestion_control);</div><div class='del'>-	strncpy(name, ca-&gt;name, TCP_CA_NAME_MAX);</div><div class='add'>+	strscpy(name, ca-&gt;name, TCP_CA_NAME_MAX);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,6 +357,9 @@ void tcp_get_allowed_congestion_control(char *buf, size_t maxlen)</div><div class='ctx'> 		offs += snprintf(buf + offs, maxlen - offs,</div><div class='ctx'> 				 "%s%s",</div><div class='ctx'> 				 offs == 0 ? "" : " ", ca-&gt;name);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(offs &gt;= maxlen))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -332,7 +408,8 @@ out:</div><div class='ctx'>  * tcp_reinit_congestion_control (if the current congestion control was</div><div class='ctx'>  * already initialized.</div><div class='ctx'>  */</div><div class='del'>-int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, bool reinit)</div><div class='add'>+int tcp_set_congestion_control(struct sock *sk, const char *name, bool load,</div><div class='add'>+			       bool cap_net_admin)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	const struct tcp_congestion_ops *ca;</div><div class='hunk'>@@ -345,7 +422,7 @@ int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, boo</div><div class='ctx'> 	if (!load)</div><div class='ctx'> 		ca = tcp_ca_find(name);</div><div class='ctx'> 	else</div><div class='del'>-		ca = tcp_ca_find_autoload(sock_net(sk), name);</div><div class='add'>+		ca = tcp_ca_find_autoload(name);</div><div class='ctx'> </div><div class='ctx'> 	/* No change asking for existing value */</div><div class='ctx'> 	if (ca == icsk-&gt;icsk_ca_ops) {</div><div class='hunk'>@@ -353,29 +430,14 @@ int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, boo</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ca) {</div><div class='add'>+	if (!ca)</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-	} else if (!load) {</div><div class='del'>-		const struct tcp_congestion_ops *old_ca = icsk-&gt;icsk_ca_ops;</div><div class='del'>-</div><div class='del'>-		if (try_module_get(ca-&gt;owner)) {</div><div class='del'>-			if (reinit) {</div><div class='del'>-				tcp_reinit_congestion_control(sk, ca);</div><div class='del'>-			} else {</div><div class='del'>-				icsk-&gt;icsk_ca_ops = ca;</div><div class='del'>-				module_put(old_ca-&gt;owner);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	} else if (!((ca-&gt;flags &amp; TCP_CONG_NON_RESTRICTED) ||</div><div class='del'>-		     ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))) {</div><div class='add'>+	else if (!((ca-&gt;flags &amp; TCP_CONG_NON_RESTRICTED) || cap_net_admin))</div><div class='ctx'> 		err = -EPERM;</div><div class='del'>-	} else if (!try_module_get(ca-&gt;owner)) {</div><div class='add'>+	else if (!bpf_try_module_get(ca, ca-&gt;owner))</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		tcp_reinit_congestion_control(sk, ca);</div><div class='del'>-	}</div><div class='ctx'>  out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -390,12 +452,12 @@ int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, boo</div><div class='ctx'>  * ABC caps N to 2. Slow start exits when cwnd grows over ssthresh and</div><div class='ctx'>  * returns the leftover acks to adjust cwnd in congestion avoidance mode.</div><div class='ctx'>  */</div><div class='del'>-u32 tcp_slow_start(struct tcp_sock *tp, u32 acked)</div><div class='add'>+__bpf_kfunc u32 tcp_slow_start(struct tcp_sock *tp, u32 acked)</div><div class='ctx'> {</div><div class='del'>-	u32 cwnd = min(tp-&gt;snd_cwnd + acked, tp-&gt;snd_ssthresh);</div><div class='add'>+	u32 cwnd = min(tcp_snd_cwnd(tp) + acked, tp-&gt;snd_ssthresh);</div><div class='ctx'> </div><div class='del'>-	acked -= cwnd - tp-&gt;snd_cwnd;</div><div class='del'>-	tp-&gt;snd_cwnd = min(cwnd, tp-&gt;snd_cwnd_clamp);</div><div class='add'>+	acked -= cwnd - tcp_snd_cwnd(tp);</div><div class='add'>+	tcp_snd_cwnd_set(tp, min(cwnd, tp-&gt;snd_cwnd_clamp));</div><div class='ctx'> </div><div class='ctx'> 	return acked;</div><div class='ctx'> }</div><div class='hunk'>@@ -404,12 +466,12 @@ EXPORT_SYMBOL_GPL(tcp_slow_start);</div><div class='ctx'> /* In theory this is tp-&gt;snd_cwnd += 1 / tp-&gt;snd_cwnd (or alternative w),</div><div class='ctx'>  * for every packet that was ACKed.</div><div class='ctx'>  */</div><div class='del'>-void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked)</div><div class='add'>+__bpf_kfunc void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked)</div><div class='ctx'> {</div><div class='ctx'> 	/* If credits accumulated at a higher w, apply them gently now. */</div><div class='ctx'> 	if (tp-&gt;snd_cwnd_cnt &gt;= w) {</div><div class='ctx'> 		tp-&gt;snd_cwnd_cnt = 0;</div><div class='del'>-		tp-&gt;snd_cwnd++;</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;snd_cwnd_cnt += acked;</div><div class='hunk'>@@ -417,9 +479,9 @@ void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked)</div><div class='ctx'> 		u32 delta = tp-&gt;snd_cwnd_cnt / w;</div><div class='ctx'> </div><div class='ctx'> 		tp-&gt;snd_cwnd_cnt -= delta * w;</div><div class='del'>-		tp-&gt;snd_cwnd += delta;</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + delta);</div><div class='ctx'> 	}</div><div class='del'>-	tp-&gt;snd_cwnd = min(tp-&gt;snd_cwnd, tp-&gt;snd_cwnd_clamp);</div><div class='add'>+	tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp), tp-&gt;snd_cwnd_clamp));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_cong_avoid_ai);</div><div class='ctx'> </div><div class='hunk'>@@ -430,7 +492,7 @@ EXPORT_SYMBOL_GPL(tcp_cong_avoid_ai);</div><div class='ctx'> /* This is Jacobson's slow start and congestion avoidance.</div><div class='ctx'>  * SIGCOMM '88, p. 328.</div><div class='ctx'>  */</div><div class='del'>-void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='add'>+__bpf_kfunc void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -444,24 +506,24 @@ void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* In dangerous area, increase slowly. */</div><div class='del'>-	tcp_cong_avoid_ai(tp, tp-&gt;snd_cwnd, acked);</div><div class='add'>+	tcp_cong_avoid_ai(tp, tcp_snd_cwnd(tp), acked);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_reno_cong_avoid);</div><div class='ctx'> </div><div class='ctx'> /* Slow start threshold is half the congestion window (min 2) */</div><div class='del'>-u32 tcp_reno_ssthresh(struct sock *sk)</div><div class='add'>+__bpf_kfunc u32 tcp_reno_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return max(tp-&gt;snd_cwnd &gt;&gt; 1U, 2U);</div><div class='add'>+	return max(tcp_snd_cwnd(tp) &gt;&gt; 1U, 2U);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_reno_ssthresh);</div><div class='ctx'> </div><div class='del'>-u32 tcp_reno_undo_cwnd(struct sock *sk)</div><div class='add'>+__bpf_kfunc u32 tcp_reno_undo_cwnd(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return max(tp-&gt;snd_cwnd, tp-&gt;prior_cwnd);</div><div class='add'>+	return max(tcp_snd_cwnd(tp), tp-&gt;prior_cwnd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tcp_reno_undo_cwnd);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c<br/>index 78bfadfcf342..76c23675ae50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cubic.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_cubic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_cubic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_cubic.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP CUBIC: Binary Increase Congestion control for TCP v2.3</div><div class='ctx'>  * Home page:</div><div class='hunk'>@@ -24,6 +25,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='hunk'>@@ -39,8 +42,8 @@</div><div class='ctx'> </div><div class='ctx'> /* Number of delay samples for detecting the increase of delay */</div><div class='ctx'> #define HYSTART_MIN_SAMPLES	8</div><div class='del'>-#define HYSTART_DELAY_MIN	(4U&lt;&lt;3)</div><div class='del'>-#define HYSTART_DELAY_MAX	(16U&lt;&lt;3)</div><div class='add'>+#define HYSTART_DELAY_MIN	(4000U)	/* 4 ms */</div><div class='add'>+#define HYSTART_DELAY_MAX	(16000U)	/* 16 ms */</div><div class='ctx'> #define HYSTART_DELAY_THRESH(x)	clamp(x, HYSTART_DELAY_MIN, HYSTART_DELAY_MAX)</div><div class='ctx'> </div><div class='ctx'> static int fast_convergence __read_mostly = 1;</div><div class='hunk'>@@ -52,7 +55,7 @@ static int tcp_friendliness __read_mostly = 1;</div><div class='ctx'> static int hystart __read_mostly = 1;</div><div class='ctx'> static int hystart_detect __read_mostly = HYSTART_ACK_TRAIN | HYSTART_DELAY;</div><div class='ctx'> static int hystart_low_window __read_mostly = 16;</div><div class='del'>-static int hystart_ack_delta __read_mostly = 2;</div><div class='add'>+static int hystart_ack_delta_us __read_mostly = 2000;</div><div class='ctx'> </div><div class='ctx'> static u32 cube_rtt_scale __read_mostly;</div><div class='ctx'> static u32 beta_scale __read_mostly;</div><div class='hunk'>@@ -76,8 +79,8 @@ MODULE_PARM_DESC(hystart_detect, "hybrid slow start detection mechanisms"</div><div class='ctx'> 		 " 1: packet-train 2: delay 3: both packet-train and delay");</div><div class='ctx'> module_param(hystart_low_window, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(hystart_low_window, "lower bound cwnd for hybrid slow start");</div><div class='del'>-module_param(hystart_ack_delta, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(hystart_ack_delta, "spacing between ack's indicating train (msecs)");</div><div class='add'>+module_param(hystart_ack_delta_us, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(hystart_ack_delta_us, "spacing between ack's indicating train (usecs)");</div><div class='ctx'> </div><div class='ctx'> /* BIC TCP Parameters */</div><div class='ctx'> struct bictcp {</div><div class='hunk'>@@ -88,7 +91,7 @@ struct bictcp {</div><div class='ctx'> 	u32	bic_origin_point;/* origin point of bic function */</div><div class='ctx'> 	u32	bic_K;		/* time to origin point</div><div class='ctx'> 				   from the beginning of the current epoch */</div><div class='del'>-	u32	delay_min;	/* min delay (msec &lt;&lt; 3) */</div><div class='add'>+	u32	delay_min;	/* min delay (usec) */</div><div class='ctx'> 	u32	epoch_start;	/* beginning of an epoch */</div><div class='ctx'> 	u32	ack_cnt;	/* number of acks */</div><div class='ctx'> 	u32	tcp_cwnd;	/* estimated tcp cwnd */</div><div class='hunk'>@@ -103,26 +106,13 @@ struct bictcp {</div><div class='ctx'> </div><div class='ctx'> static inline void bictcp_reset(struct bictcp *ca)</div><div class='ctx'> {</div><div class='del'>-	ca-&gt;cnt = 0;</div><div class='del'>-	ca-&gt;last_max_cwnd = 0;</div><div class='del'>-	ca-&gt;last_cwnd = 0;</div><div class='del'>-	ca-&gt;last_time = 0;</div><div class='del'>-	ca-&gt;bic_origin_point = 0;</div><div class='del'>-	ca-&gt;bic_K = 0;</div><div class='del'>-	ca-&gt;delay_min = 0;</div><div class='del'>-	ca-&gt;epoch_start = 0;</div><div class='del'>-	ca-&gt;ack_cnt = 0;</div><div class='del'>-	ca-&gt;tcp_cwnd = 0;</div><div class='add'>+	memset(ca, 0, offsetof(struct bictcp, unused));</div><div class='ctx'> 	ca-&gt;found = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 bictcp_clock(void)</div><div class='add'>+static inline u32 bictcp_clock_us(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-#if HZ &lt; 1000</div><div class='del'>-	return ktime_to_ms(ktime_get_real());</div><div class='del'>-#else</div><div class='del'>-	return jiffies_to_msecs(jiffies);</div><div class='del'>-#endif</div><div class='add'>+	return tcp_sk(sk)-&gt;tcp_mstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void bictcp_hystart_reset(struct sock *sk)</div><div class='hunk'>@@ -130,13 +120,13 @@ static inline void bictcp_hystart_reset(struct sock *sk)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='del'>-	ca-&gt;round_start = ca-&gt;last_ack = bictcp_clock();</div><div class='add'>+	ca-&gt;round_start = ca-&gt;last_ack = bictcp_clock_us(sk);</div><div class='ctx'> 	ca-&gt;end_seq = tp-&gt;snd_nxt;</div><div class='del'>-	ca-&gt;curr_rtt = 0;</div><div class='add'>+	ca-&gt;curr_rtt = ~0U;</div><div class='ctx'> 	ca-&gt;sample_cnt = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bictcp_init(struct sock *sk)</div><div class='add'>+__bpf_kfunc static void cubictcp_init(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +139,7 @@ static void bictcp_init(struct sock *sk)</div><div class='ctx'> 		tcp_sk(sk)-&gt;snd_ssthresh = initial_ssthresh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event)</div><div class='add'>+__bpf_kfunc static void cubictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event)</div><div class='ctx'> {</div><div class='ctx'> 	if (event == CA_EVENT_TX_START) {</div><div class='ctx'> 		struct bictcp *ca = inet_csk_ca(sk);</div><div class='hunk'>@@ -275,7 +265,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd, u32 acked)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	t = (s32)(tcp_jiffies32 - ca-&gt;epoch_start);</div><div class='del'>-	t += msecs_to_jiffies(ca-&gt;delay_min &gt;&gt; 3);</div><div class='add'>+	t += usecs_to_jiffies(ca-&gt;delay_min);</div><div class='ctx'> 	/* change the unit from HZ to bictcp_HZ */</div><div class='ctx'> 	t &lt;&lt;= BICTCP_HZ;</div><div class='ctx'> 	do_div(t, HZ);</div><div class='hunk'>@@ -331,7 +321,7 @@ tcp_friendliness:</div><div class='ctx'> 	ca-&gt;cnt = max(ca-&gt;cnt, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='add'>+__bpf_kfunc static void cubictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='hunk'>@@ -340,17 +330,15 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_in_slow_start(tp)) {</div><div class='del'>-		if (hystart &amp;&amp; after(ack, ca-&gt;end_seq))</div><div class='del'>-			bictcp_hystart_reset(sk);</div><div class='ctx'> 		acked = tcp_slow_start(tp, acked);</div><div class='ctx'> 		if (!acked)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='del'>-	bictcp_update(ca, tp-&gt;snd_cwnd, acked);</div><div class='add'>+	bictcp_update(ca, tcp_snd_cwnd(tp), acked);</div><div class='ctx'> 	tcp_cong_avoid_ai(tp, ca-&gt;cnt, acked);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bictcp_recalc_ssthresh(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 cubictcp_recalc_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='hunk'>@@ -358,16 +346,16 @@ static u32 bictcp_recalc_ssthresh(struct sock *sk)</div><div class='ctx'> 	ca-&gt;epoch_start = 0;	/* end of epoch */</div><div class='ctx'> </div><div class='ctx'> 	/* Wmax and fast convergence */</div><div class='del'>-	if (tp-&gt;snd_cwnd &lt; ca-&gt;last_max_cwnd &amp;&amp; fast_convergence)</div><div class='del'>-		ca-&gt;last_max_cwnd = (tp-&gt;snd_cwnd * (BICTCP_BETA_SCALE + beta))</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt; ca-&gt;last_max_cwnd &amp;&amp; fast_convergence)</div><div class='add'>+		ca-&gt;last_max_cwnd = (tcp_snd_cwnd(tp) * (BICTCP_BETA_SCALE + beta))</div><div class='ctx'> 			/ (2 * BICTCP_BETA_SCALE);</div><div class='ctx'> 	else</div><div class='del'>-		ca-&gt;last_max_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+		ca-&gt;last_max_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='del'>-	return max((tp-&gt;snd_cwnd * beta) / BICTCP_BETA_SCALE, 2U);</div><div class='add'>+	return max((tcp_snd_cwnd(tp) * beta) / BICTCP_BETA_SCALE, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bictcp_state(struct sock *sk, u8 new_state)</div><div class='add'>+__bpf_kfunc static void cubictcp_state(struct sock *sk, u8 new_state)</div><div class='ctx'> {</div><div class='ctx'> 	if (new_state == TCP_CA_Loss) {</div><div class='ctx'> 		bictcp_reset(inet_csk_ca(sk));</div><div class='hunk'>@@ -375,58 +363,93 @@ static void bictcp_state(struct sock *sk, u8 new_state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Account for TSO/GRO delays.</div><div class='add'>+ * Otherwise short RTT flows could get too small ssthresh, since during</div><div class='add'>+ * slow start we begin with small TSO packets and ca-&gt;delay_min would</div><div class='add'>+ * not account for long aggregation delay when TSO packets get bigger.</div><div class='add'>+ * Ideally even with a very small RTT we would like to have at least one</div><div class='add'>+ * TSO packet being sent and received by GRO, and another one in qdisc layer.</div><div class='add'>+ * We apply another 100% factor because @rate is doubled at this point.</div><div class='add'>+ * We cap the cushion to 1ms.</div><div class='add'>+ */</div><div class='add'>+static u32 hystart_ack_delay(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	unsigned long rate;</div><div class='add'>+</div><div class='add'>+	rate = READ_ONCE(sk-&gt;sk_pacing_rate);</div><div class='add'>+	if (!rate)</div><div class='add'>+		return 0;</div><div class='add'>+	return min_t(u64, USEC_PER_MSEC,</div><div class='add'>+		     div64_ul((u64)sk-&gt;sk_gso_max_size * 4 * USEC_PER_SEC, rate));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hystart_update(struct sock *sk, u32 delay)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='add'>+	u32 threshold;</div><div class='ctx'> </div><div class='del'>-	if (ca-&gt;found &amp; hystart_detect)</div><div class='add'>+	if (after(tp-&gt;snd_una, ca-&gt;end_seq))</div><div class='add'>+		bictcp_hystart_reset(sk);</div><div class='add'>+</div><div class='add'>+	/* hystart triggers when cwnd is larger than some threshold */</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt; hystart_low_window)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hystart_detect &amp; HYSTART_ACK_TRAIN) {</div><div class='del'>-		u32 now = bictcp_clock();</div><div class='add'>+		u32 now = bictcp_clock_us(sk);</div><div class='ctx'> </div><div class='ctx'> 		/* first detection parameter - ack-train detection */</div><div class='del'>-		if ((s32)(now - ca-&gt;last_ack) &lt;= hystart_ack_delta) {</div><div class='add'>+		if ((s32)(now - ca-&gt;last_ack) &lt;= hystart_ack_delta_us) {</div><div class='ctx'> 			ca-&gt;last_ack = now;</div><div class='del'>-			if ((s32)(now - ca-&gt;round_start) &gt; ca-&gt;delay_min &gt;&gt; 4) {</div><div class='del'>-				ca-&gt;found |= HYSTART_ACK_TRAIN;</div><div class='add'>+</div><div class='add'>+			threshold = ca-&gt;delay_min + hystart_ack_delay(sk);</div><div class='add'>+</div><div class='add'>+			/* Hystart ack train triggers if we get ack past</div><div class='add'>+			 * ca-&gt;delay_min/2.</div><div class='add'>+			 * Pacing might have delayed packets up to RTT/2</div><div class='add'>+			 * during slow start.</div><div class='add'>+			 */</div><div class='add'>+			if (sk-&gt;sk_pacing_status == SK_PACING_NONE)</div><div class='add'>+				threshold &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+			if ((s32)(now - ca-&gt;round_start) &gt; threshold) {</div><div class='add'>+				ca-&gt;found = 1;</div><div class='add'>+				pr_debug("hystart_ack_train (%u &gt; %u) delay_min %u (+ ack_delay %u) cwnd %u\n",</div><div class='add'>+					 now - ca-&gt;round_start, threshold,</div><div class='add'>+					 ca-&gt;delay_min, hystart_ack_delay(sk), tcp_snd_cwnd(tp));</div><div class='ctx'> 				NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTTRAINDETECT);</div><div class='ctx'> 				NET_ADD_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTTRAINCWND,</div><div class='del'>-					      tp-&gt;snd_cwnd);</div><div class='del'>-				tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd;</div><div class='add'>+					      tcp_snd_cwnd(tp));</div><div class='add'>+				tp-&gt;snd_ssthresh = tcp_snd_cwnd(tp);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hystart_detect &amp; HYSTART_DELAY) {</div><div class='ctx'> 		/* obtain the minimum delay of more than sampling packets */</div><div class='add'>+		if (ca-&gt;curr_rtt &gt; delay)</div><div class='add'>+			ca-&gt;curr_rtt = delay;</div><div class='ctx'> 		if (ca-&gt;sample_cnt &lt; HYSTART_MIN_SAMPLES) {</div><div class='del'>-			if (ca-&gt;curr_rtt == 0 || ca-&gt;curr_rtt &gt; delay)</div><div class='del'>-				ca-&gt;curr_rtt = delay;</div><div class='del'>-</div><div class='ctx'> 			ca-&gt;sample_cnt++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (ca-&gt;curr_rtt &gt; ca-&gt;delay_min +</div><div class='ctx'> 			    HYSTART_DELAY_THRESH(ca-&gt;delay_min &gt;&gt; 3)) {</div><div class='del'>-				ca-&gt;found |= HYSTART_DELAY;</div><div class='add'>+				ca-&gt;found = 1;</div><div class='ctx'> 				NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTDELAYDETECT);</div><div class='ctx'> 				NET_ADD_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPHYSTARTDELAYCWND,</div><div class='del'>-					      tp-&gt;snd_cwnd);</div><div class='del'>-				tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd;</div><div class='add'>+					      tcp_snd_cwnd(tp));</div><div class='add'>+				tp-&gt;snd_ssthresh = tcp_snd_cwnd(tp);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Track delayed acknowledgment ratio using sliding window</div><div class='del'>- * ratio = (15*ratio + sample) / 16</div><div class='del'>- */</div><div class='del'>-static void bictcp_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='add'>+__bpf_kfunc static void cubictcp_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct bictcp *ca = inet_csk_ca(sk);</div><div class='hunk'>@@ -440,7 +463,7 @@ static void bictcp_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 	if (ca-&gt;epoch_start &amp;&amp; (s32)(tcp_jiffies32 - ca-&gt;epoch_start) &lt; HZ)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	delay = (sample-&gt;rtt_us &lt;&lt; 3) / USEC_PER_MSEC;</div><div class='add'>+	delay = sample-&gt;rtt_us;</div><div class='ctx'> 	if (delay == 0)</div><div class='ctx'> 		delay = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -448,26 +471,40 @@ static void bictcp_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 	if (ca-&gt;delay_min == 0 || ca-&gt;delay_min &gt; delay)</div><div class='ctx'> 		ca-&gt;delay_min = delay;</div><div class='ctx'> </div><div class='del'>-	/* hystart triggers when cwnd is larger than some threshold */</div><div class='del'>-	if (hystart &amp;&amp; tcp_in_slow_start(tp) &amp;&amp;</div><div class='del'>-	    tp-&gt;snd_cwnd &gt;= hystart_low_window)</div><div class='add'>+	if (!ca-&gt;found &amp;&amp; tcp_in_slow_start(tp) &amp;&amp; hystart)</div><div class='ctx'> 		hystart_update(sk, delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops cubictcp __read_mostly = {</div><div class='del'>-	.init		= bictcp_init,</div><div class='del'>-	.ssthresh	= bictcp_recalc_ssthresh,</div><div class='del'>-	.cong_avoid	= bictcp_cong_avoid,</div><div class='del'>-	.set_state	= bictcp_state,</div><div class='add'>+	.init		= cubictcp_init,</div><div class='add'>+	.ssthresh	= cubictcp_recalc_ssthresh,</div><div class='add'>+	.cong_avoid	= cubictcp_cong_avoid,</div><div class='add'>+	.set_state	= cubictcp_state,</div><div class='ctx'> 	.undo_cwnd	= tcp_reno_undo_cwnd,</div><div class='del'>-	.cwnd_event	= bictcp_cwnd_event,</div><div class='del'>-	.pkts_acked     = bictcp_acked,</div><div class='add'>+	.cwnd_event	= cubictcp_cwnd_event,</div><div class='add'>+	.pkts_acked     = cubictcp_acked,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "cubic",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BTF_KFUNCS_START(tcp_cubic_check_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_init)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_recalc_ssthresh)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_cong_avoid)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_state)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_cwnd_event)</div><div class='add'>+BTF_ID_FLAGS(func, cubictcp_acked)</div><div class='add'>+BTF_KFUNCS_END(tcp_cubic_check_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set tcp_cubic_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;tcp_cubic_check_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init cubictcp_register(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct bictcp) &gt; ICSK_CA_PRIV_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Precompute a bunch of the scaling factors that are used per-packet</div><div class='hunk'>@@ -498,6 +535,9 @@ static int __init cubictcp_register(void)</div><div class='ctx'> 	/* divide by bic_scale and by constant Srtt (100ms) */</div><div class='ctx'> 	do_div(cube_factor, bic_scale * 10);</div><div class='ctx'> </div><div class='add'>+	ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &amp;tcp_cubic_kfunc_set);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return tcp_register_congestion_control(&amp;cubictcp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c<br/>index ca61e2a659e7..03abe0848420 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_dctcp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_dctcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_dctcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_dctcp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* DataCenter TCP (DCTCP) congestion control.</div><div class='ctx'>  *</div><div class='ctx'>  * http://simula.stanford.edu/~alizade/Site/DCTCP.html</div><div class='hunk'>@@ -33,64 +34,67 @@</div><div class='ctx'>  *	Daniel Borkmann &lt;dborkman@redhat.com&gt;</div><div class='ctx'>  *	Florian Westphal &lt;fw@strlen.de&gt;</div><div class='ctx'>  *	Glenn Judd &lt;glenn.judd@morganstanley.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/inet_diag.h&gt;</div><div class='add'>+#include "tcp_dctcp.h"</div><div class='ctx'> </div><div class='ctx'> #define DCTCP_MAX_ALPHA	1024U</div><div class='ctx'> </div><div class='ctx'> struct dctcp {</div><div class='del'>-	u32 acked_bytes_ecn;</div><div class='del'>-	u32 acked_bytes_total;</div><div class='del'>-	u32 prior_snd_una;</div><div class='add'>+	u32 old_delivered;</div><div class='add'>+	u32 old_delivered_ce;</div><div class='ctx'> 	u32 prior_rcv_nxt;</div><div class='ctx'> 	u32 dctcp_alpha;</div><div class='ctx'> 	u32 next_seq;</div><div class='ctx'> 	u32 ce_state;</div><div class='ctx'> 	u32 loss_cwnd;</div><div class='add'>+	struct tcp_plb_state plb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int dctcp_shift_g __read_mostly = 4; /* g = 1/2^4 */</div><div class='del'>-module_param(dctcp_shift_g, uint, 0644);</div><div class='add'>+</div><div class='add'>+static int dctcp_shift_g_set(const char *val, const struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	return param_set_uint_minmax(val, kp, 0, 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct kernel_param_ops dctcp_shift_g_ops = {</div><div class='add'>+	.set = dctcp_shift_g_set,</div><div class='add'>+	.get = param_get_uint,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_param_cb(dctcp_shift_g, &amp;dctcp_shift_g_ops, &amp;dctcp_shift_g, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dctcp_shift_g, "parameter g for updating dctcp_alpha");</div><div class='ctx'> </div><div class='ctx'> static unsigned int dctcp_alpha_on_init __read_mostly = DCTCP_MAX_ALPHA;</div><div class='ctx'> module_param(dctcp_alpha_on_init, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dctcp_alpha_on_init, "parameter for initial alpha value");</div><div class='ctx'> </div><div class='del'>-static unsigned int dctcp_clamp_alpha_on_loss __read_mostly;</div><div class='del'>-module_param(dctcp_clamp_alpha_on_loss, uint, 0644);</div><div class='del'>-MODULE_PARM_DESC(dctcp_clamp_alpha_on_loss,</div><div class='del'>-		 "parameter for clamping alpha on loss");</div><div class='del'>-</div><div class='ctx'> static struct tcp_congestion_ops dctcp_reno;</div><div class='ctx'> </div><div class='ctx'> static void dctcp_reset(const struct tcp_sock *tp, struct dctcp *ca)</div><div class='ctx'> {</div><div class='ctx'> 	ca-&gt;next_seq = tp-&gt;snd_nxt;</div><div class='ctx'> </div><div class='del'>-	ca-&gt;acked_bytes_ecn = 0;</div><div class='del'>-	ca-&gt;acked_bytes_total = 0;</div><div class='add'>+	ca-&gt;old_delivered = tp-&gt;delivered;</div><div class='add'>+	ca-&gt;old_delivered_ce = tp-&gt;delivered_ce;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dctcp_init(struct sock *sk)</div><div class='add'>+__bpf_kfunc static void dctcp_init(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if ((tp-&gt;ecn_flags &amp; TCP_ECN_OK) ||</div><div class='add'>+	if (tcp_ecn_mode_any(tp) ||</div><div class='ctx'> 	    (sk-&gt;sk_state == TCP_LISTEN ||</div><div class='ctx'> 	     sk-&gt;sk_state == TCP_CLOSE)) {</div><div class='ctx'> 		struct dctcp *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='del'>-		ca-&gt;prior_snd_una = tp-&gt;snd_una;</div><div class='ctx'> 		ca-&gt;prior_rcv_nxt = tp-&gt;rcv_nxt;</div><div class='ctx'> </div><div class='ctx'> 		ca-&gt;dctcp_alpha = min(dctcp_alpha_on_init, DCTCP_MAX_ALPHA);</div><div class='hunk'>@@ -99,6 +103,8 @@ static void dctcp_init(struct sock *sk)</div><div class='ctx'> 		ca-&gt;ce_state = 0;</div><div class='ctx'> </div><div class='ctx'> 		dctcp_reset(tp, ca);</div><div class='add'>+		tcp_plb_init(sk, &amp;ca-&gt;plb);</div><div class='add'>+</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -109,98 +115,52 @@ static void dctcp_init(struct sock *sk)</div><div class='ctx'> 	INET_ECN_dontxmit(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 dctcp_ssthresh(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 dctcp_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct dctcp *ca = inet_csk_ca(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	ca-&gt;loss_cwnd = tp-&gt;snd_cwnd;</div><div class='del'>-	return max(tp-&gt;snd_cwnd - ((tp-&gt;snd_cwnd * ca-&gt;dctcp_alpha) &gt;&gt; 11U), 2U);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Minimal DCTP CE state machine:</div><div class='del'>- *</div><div class='del'>- * S:	0 &lt;- last pkt was non-CE</div><div class='del'>- *	1 &lt;- last pkt was CE</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void dctcp_ce_state_0_to_1(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dctcp *ca = inet_csk_ca(sk);</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (!ca-&gt;ce_state) {</div><div class='del'>-		/* State has changed from CE=0 to CE=1, force an immediate</div><div class='del'>-		 * ACK to reflect the new CE state. If an ACK was delayed,</div><div class='del'>-		 * send that first to reflect the prior CE state.</div><div class='del'>-		 */</div><div class='del'>-		if (inet_csk(sk)-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER)</div><div class='del'>-			__tcp_send_ack(sk, ca-&gt;prior_rcv_nxt);</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_NOW;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca-&gt;prior_rcv_nxt = tp-&gt;rcv_nxt;</div><div class='del'>-	ca-&gt;ce_state = 1;</div><div class='del'>-</div><div class='del'>-	tp-&gt;ecn_flags |= TCP_ECN_DEMAND_CWR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dctcp_ce_state_1_to_0(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct dctcp *ca = inet_csk_ca(sk);</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;ce_state) {</div><div class='del'>-		/* State has changed from CE=1 to CE=0, force an immediate</div><div class='del'>-		 * ACK to reflect the new CE state. If an ACK was delayed,</div><div class='del'>-		 * send that first to reflect the prior CE state.</div><div class='del'>-		 */</div><div class='del'>-		if (inet_csk(sk)-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER)</div><div class='del'>-			__tcp_send_ack(sk, ca-&gt;prior_rcv_nxt);</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_NOW;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca-&gt;prior_rcv_nxt = tp-&gt;rcv_nxt;</div><div class='del'>-	ca-&gt;ce_state = 0;</div><div class='del'>-</div><div class='del'>-	tp-&gt;ecn_flags &amp;= ~TCP_ECN_DEMAND_CWR;</div><div class='add'>+	ca-&gt;loss_cwnd = tcp_snd_cwnd(tp);</div><div class='add'>+	return max(tcp_snd_cwnd(tp) - ((tcp_snd_cwnd(tp) * ca-&gt;dctcp_alpha) &gt;&gt; 11U), 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dctcp_update_alpha(struct sock *sk, u32 flags)</div><div class='add'>+__bpf_kfunc static void dctcp_update_alpha(struct sock *sk, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct dctcp *ca = inet_csk_ca(sk);</div><div class='del'>-	u32 acked_bytes = tp-&gt;snd_una - ca-&gt;prior_snd_una;</div><div class='del'>-</div><div class='del'>-	/* If ack did not advance snd_una, count dupack as MSS size.</div><div class='del'>-	 * If ack did update window, do not count it at all.</div><div class='del'>-	 */</div><div class='del'>-	if (acked_bytes == 0 &amp;&amp; !(flags &amp; CA_ACK_WIN_UPDATE))</div><div class='del'>-		acked_bytes = inet_csk(sk)-&gt;icsk_ack.rcv_mss;</div><div class='del'>-	if (acked_bytes) {</div><div class='del'>-		ca-&gt;acked_bytes_total += acked_bytes;</div><div class='del'>-		ca-&gt;prior_snd_una = tp-&gt;snd_una;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; CA_ACK_ECE)</div><div class='del'>-			ca-&gt;acked_bytes_ecn += acked_bytes;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Expired RTT */</div><div class='ctx'> 	if (!before(tp-&gt;snd_una, ca-&gt;next_seq)) {</div><div class='del'>-		u64 bytes_ecn = ca-&gt;acked_bytes_ecn;</div><div class='add'>+		u32 delivered = tp-&gt;delivered - ca-&gt;old_delivered;</div><div class='add'>+		u32 delivered_ce = tp-&gt;delivered_ce - ca-&gt;old_delivered_ce;</div><div class='ctx'> 		u32 alpha = ca-&gt;dctcp_alpha;</div><div class='add'>+		u32 ce_ratio = 0;</div><div class='add'>+</div><div class='add'>+		if (delivered &gt; 0) {</div><div class='add'>+			/* dctcp_alpha keeps EWMA of fraction of ECN marked</div><div class='add'>+			 * packets. Because of EWMA smoothing, PLB reaction can</div><div class='add'>+			 * be slow so we use ce_ratio which is an instantaneous</div><div class='add'>+			 * measure of congestion. ce_ratio is the fraction of</div><div class='add'>+			 * ECN marked packets in the previous RTT.</div><div class='add'>+			 */</div><div class='add'>+			if (delivered_ce &gt; 0)</div><div class='add'>+				ce_ratio = (delivered_ce &lt;&lt; TCP_PLB_SCALE) / delivered;</div><div class='add'>+			tcp_plb_update_state(sk, &amp;ca-&gt;plb, (int)ce_ratio);</div><div class='add'>+			tcp_plb_check_rehash(sk, &amp;ca-&gt;plb);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* alpha = (1 - g) * alpha + g * F */</div><div class='ctx'> </div><div class='ctx'> 		alpha -= min_not_zero(alpha, alpha &gt;&gt; dctcp_shift_g);</div><div class='del'>-		if (bytes_ecn) {</div><div class='add'>+		if (delivered_ce) {</div><div class='add'>+</div><div class='ctx'> 			/* If dctcp_shift_g == 1, a 32bit value would overflow</div><div class='del'>-			 * after 8 Mbytes.</div><div class='add'>+			 * after 8 M packets.</div><div class='ctx'> 			 */</div><div class='del'>-			bytes_ecn &lt;&lt;= (10 - dctcp_shift_g);</div><div class='del'>-			do_div(bytes_ecn, max(1U, ca-&gt;acked_bytes_total));</div><div class='add'>+			delivered_ce &lt;&lt;= (10 - dctcp_shift_g);</div><div class='add'>+			delivered_ce /= max(1U, delivered);</div><div class='ctx'> </div><div class='del'>-			alpha = min(alpha + (u32)bytes_ecn, DCTCP_MAX_ALPHA);</div><div class='add'>+			alpha = min(alpha + delivered_ce, DCTCP_MAX_ALPHA);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* dctcp_alpha can be read from dctcp_get_info() without</div><div class='ctx'> 		 * synchro, so we ask compiler to not use dctcp_alpha</div><div class='hunk'>@@ -211,31 +171,40 @@ static void dctcp_update_alpha(struct sock *sk, u32 flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dctcp_state(struct sock *sk, u8 new_state)</div><div class='add'>+static void dctcp_react_to_loss(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	if (dctcp_clamp_alpha_on_loss &amp;&amp; new_state == TCP_CA_Loss) {</div><div class='del'>-		struct dctcp *ca = inet_csk_ca(sk);</div><div class='add'>+	struct dctcp *ca = inet_csk_ca(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-		/* If this extension is enabled, we clamp dctcp_alpha to</div><div class='del'>-		 * max on packet loss; the motivation is that dctcp_alpha</div><div class='del'>-		 * is an indicator to the extend of congestion and packet</div><div class='del'>-		 * loss is an indicator of extreme congestion; setting</div><div class='del'>-		 * this in practice turned out to be beneficial, and</div><div class='del'>-		 * effectively assumes total congestion which reduces the</div><div class='del'>-		 * window by half.</div><div class='del'>-		 */</div><div class='del'>-		ca-&gt;dctcp_alpha = DCTCP_MAX_ALPHA;</div><div class='del'>-	}</div><div class='add'>+	ca-&gt;loss_cwnd = tcp_snd_cwnd(tp);</div><div class='add'>+	tp-&gt;snd_ssthresh = max(tcp_snd_cwnd(tp) &gt;&gt; 1U, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dctcp_cwnd_event(struct sock *sk, enum tcp_ca_event ev)</div><div class='add'>+__bpf_kfunc static void dctcp_state(struct sock *sk, u8 new_state)</div><div class='ctx'> {</div><div class='add'>+	if (new_state == TCP_CA_Recovery &amp;&amp;</div><div class='add'>+	    new_state != inet_csk(sk)-&gt;icsk_ca_state)</div><div class='add'>+		dctcp_react_to_loss(sk);</div><div class='add'>+	/* We handle RTO in dctcp_cwnd_event to ensure that we perform only</div><div class='add'>+	 * one loss-adjustment per RTT.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc static void dctcp_cwnd_event(struct sock *sk, enum tcp_ca_event ev)</div><div class='add'>+{</div><div class='add'>+	struct dctcp *ca = inet_csk_ca(sk);</div><div class='add'>+</div><div class='ctx'> 	switch (ev) {</div><div class='ctx'> 	case CA_EVENT_ECN_IS_CE:</div><div class='del'>-		dctcp_ce_state_0_to_1(sk);</div><div class='del'>-		break;</div><div class='ctx'> 	case CA_EVENT_ECN_NO_CE:</div><div class='del'>-		dctcp_ce_state_1_to_0(sk);</div><div class='add'>+		dctcp_ece_ack_update(sk, ev, &amp;ca-&gt;prior_rcv_nxt, &amp;ca-&gt;ce_state);</div><div class='add'>+		break;</div><div class='add'>+	case CA_EVENT_LOSS:</div><div class='add'>+		tcp_plb_update_state_upon_rto(sk, &amp;ca-&gt;plb);</div><div class='add'>+		dctcp_react_to_loss(sk);</div><div class='add'>+		break;</div><div class='add'>+	case CA_EVENT_TX_START:</div><div class='add'>+		tcp_plb_check_rehash(sk, &amp;ca-&gt;plb); /* Maybe rehash when inflight is 0 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Don't care for the rest. */</div><div class='hunk'>@@ -247,6 +216,7 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,</div><div class='ctx'> 			     union tcp_cc_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dctcp *ca = inet_csk_ca(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill it also in case of VEGASINFO due to req struct limits.</div><div class='ctx'> 	 * We can still correctly retrieve it later.</div><div class='hunk'>@@ -258,8 +228,10 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,</div><div class='ctx'> 			info-&gt;dctcp.dctcp_enabled = 1;</div><div class='ctx'> 			info-&gt;dctcp.dctcp_ce_state = (u16) ca-&gt;ce_state;</div><div class='ctx'> 			info-&gt;dctcp.dctcp_alpha = ca-&gt;dctcp_alpha;</div><div class='del'>-			info-&gt;dctcp.dctcp_ab_ecn = ca-&gt;acked_bytes_ecn;</div><div class='del'>-			info-&gt;dctcp.dctcp_ab_tot = ca-&gt;acked_bytes_total;</div><div class='add'>+			info-&gt;dctcp.dctcp_ab_ecn = tp-&gt;mss_cache *</div><div class='add'>+						   (tp-&gt;delivered_ce - ca-&gt;old_delivered_ce);</div><div class='add'>+			info-&gt;dctcp.dctcp_ab_tot = tp-&gt;mss_cache *</div><div class='add'>+						   (tp-&gt;delivered - ca-&gt;old_delivered);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		*attr = INET_DIAG_DCTCPINFO;</div><div class='hunk'>@@ -268,11 +240,12 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 dctcp_cwnd_undo(struct sock *sk)</div><div class='add'>+__bpf_kfunc static u32 dctcp_cwnd_undo(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dctcp *ca = inet_csk_ca(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return max(tcp_sk(sk)-&gt;snd_cwnd, ca-&gt;loss_cwnd);</div><div class='add'>+	return max(tcp_snd_cwnd(tp), ca-&gt;loss_cwnd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops dctcp __read_mostly = {</div><div class='hunk'>@@ -298,9 +271,29 @@ static struct tcp_congestion_ops dctcp_reno __read_mostly = {</div><div class='ctx'> 	.name		= "dctcp-reno",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+BTF_KFUNCS_START(tcp_dctcp_check_kfunc_ids)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_init)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_update_alpha)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_cwnd_event)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_ssthresh)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_cwnd_undo)</div><div class='add'>+BTF_ID_FLAGS(func, dctcp_state)</div><div class='add'>+BTF_KFUNCS_END(tcp_dctcp_check_kfunc_ids)</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set tcp_dctcp_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set   = &amp;tcp_dctcp_check_kfunc_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init dctcp_register(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct dctcp) &gt; ICSK_CA_PRIV_SIZE);</div><div class='add'>+</div><div class='add'>+	ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &amp;tcp_dctcp_kfunc_set);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return tcp_register_congestion_control(&amp;dctcp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_dctcp.h b/net/ipv4/tcp_dctcp.h<br/>new file mode 100644<br/>index 000000000000..4b0259111d81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_dctcp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_dctcp.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+#ifndef _TCP_DCTCP_H</div><div class='add'>+#define _TCP_DCTCP_H</div><div class='add'>+</div><div class='add'>+static inline void dctcp_ece_ack_cwr(struct sock *sk, u32 ce_state)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (ce_state == 1)</div><div class='add'>+		tp-&gt;ecn_flags |= TCP_ECN_DEMAND_CWR;</div><div class='add'>+	else</div><div class='add'>+		tp-&gt;ecn_flags &amp;= ~TCP_ECN_DEMAND_CWR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Minimal DCTP CE state machine:</div><div class='add'>+ *</div><div class='add'>+ * S:	0 &lt;- last pkt was non-CE</div><div class='add'>+ *	1 &lt;- last pkt was CE</div><div class='add'>+ */</div><div class='add'>+static inline void dctcp_ece_ack_update(struct sock *sk, enum tcp_ca_event evt,</div><div class='add'>+					u32 *prior_rcv_nxt, u32 *ce_state)</div><div class='add'>+{</div><div class='add'>+	u32 new_ce_state = (evt == CA_EVENT_ECN_IS_CE) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	if (*ce_state != new_ce_state) {</div><div class='add'>+		/* CE state has changed, force an immediate ACK to</div><div class='add'>+		 * reflect the new CE state. If an ACK was delayed,</div><div class='add'>+		 * send that first to reflect the prior CE state.</div><div class='add'>+		 */</div><div class='add'>+		if (inet_csk(sk)-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER) {</div><div class='add'>+			dctcp_ece_ack_cwr(sk, *ce_state);</div><div class='add'>+			__tcp_send_ack(sk, *prior_rcv_nxt, 0);</div><div class='add'>+		}</div><div class='add'>+		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_NOW;</div><div class='add'>+	}</div><div class='add'>+	*prior_rcv_nxt = tcp_sk(sk)-&gt;rcv_nxt;</div><div class='add'>+	*ce_state = new_ce_state;</div><div class='add'>+	dctcp_ece_ack_cwr(sk, new_ce_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c<br/>index 81148f7a2323..d83efd91f461 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_diag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_diag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_diag.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * tcp_diag.c	Module for monitoring TCP transport protocols sockets.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -16,6 +12,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/inet_hashtables.h&gt;</div><div class='add'>+#include &lt;net/inet6_hashtables.h&gt;</div><div class='add'>+#include &lt;net/inet_timewait_sock.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,13 +24,14 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,</div><div class='ctx'> 	struct tcp_info *info = _info;</div><div class='ctx'> </div><div class='ctx'> 	if (inet_sk_state_load(sk) == TCP_LISTEN) {</div><div class='del'>-		r-&gt;idiag_rqueue = sk-&gt;sk_ack_backlog;</div><div class='del'>-		r-&gt;idiag_wqueue = sk-&gt;sk_max_ack_backlog;</div><div class='add'>+		r-&gt;idiag_rqueue = READ_ONCE(sk-&gt;sk_ack_backlog);</div><div class='add'>+		r-&gt;idiag_wqueue = READ_ONCE(sk-&gt;sk_max_ack_backlog);</div><div class='ctx'> 	} else if (sk-&gt;sk_type == SOCK_STREAM) {</div><div class='ctx'> 		const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-		r-&gt;idiag_rqueue = max_t(int, tp-&gt;rcv_nxt - tp-&gt;copied_seq, 0);</div><div class='del'>-		r-&gt;idiag_wqueue = tp-&gt;write_seq - tp-&gt;snd_una;</div><div class='add'>+		r-&gt;idiag_rqueue = max_t(int, READ_ONCE(tp-&gt;rcv_nxt) -</div><div class='add'>+					     READ_ONCE(tp-&gt;copied_seq), 0);</div><div class='add'>+		r-&gt;idiag_wqueue = READ_ONCE(tp-&gt;write_seq) - tp-&gt;snd_una;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info)</div><div class='ctx'> 		tcp_get_info(sk, info);</div><div class='hunk'>@@ -85,13 +85,43 @@ static int tcp_diag_put_md5sig(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int tcp_diag_put_ulp(struct sk_buff *skb, struct sock *sk,</div><div class='add'>+			    const struct tcp_ulp_ops *ulp_ops, bool net_admin)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start_noflag(skb, INET_DIAG_ULP_INFO);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(skb, INET_ULP_INFO_NAME, ulp_ops-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_failure;</div><div class='add'>+</div><div class='add'>+	if (ulp_ops-&gt;get_info)</div><div class='add'>+		err = ulp_ops-&gt;get_info(sk, skb, net_admin);</div><div class='add'>+	if (err)</div><div class='add'>+		goto nla_failure;</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_failure:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tcp_diag_get_aux(struct sock *sk, bool net_admin,</div><div class='ctx'> 			    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	const struct tcp_ulp_ops *ulp_ops;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	if (net_admin) {</div><div class='ctx'> 		struct tcp_md5sig_info *md5sig;</div><div class='del'>-		int err = 0;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		md5sig = rcu_dereference(tcp_sk(sk)-&gt;md5sig_info);</div><div class='hunk'>@@ -103,11 +133,19 @@ static int tcp_diag_get_aux(struct sock *sk, bool net_admin,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	ulp_ops = icsk-&gt;icsk_ulp_ops;</div><div class='add'>+	if (ulp_ops) {</div><div class='add'>+		err = tcp_diag_put_ulp(skb, sk, ulp_ops, net_admin);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)</div><div class='ctx'> {</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	size_t size = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='hunk'>@@ -128,19 +166,476 @@ static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+	if (sk_fullsock(sk)) {</div><div class='add'>+		const struct tcp_ulp_ops *ulp_ops;</div><div class='add'>+</div><div class='add'>+		ulp_ops = icsk-&gt;icsk_ulp_ops;</div><div class='add'>+		if (ulp_ops) {</div><div class='add'>+			size += nla_total_size(0) +</div><div class='add'>+				nla_total_size(TCP_ULP_NAME_MAX);</div><div class='add'>+			if (ulp_ops-&gt;get_info_size)</div><div class='add'>+				size += ulp_ops-&gt;get_info_size(sk, net_admin);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size</div><div class='add'>+		+ nla_total_size(sizeof(struct tcp_info))</div><div class='add'>+		+ nla_total_size(sizeof(struct inet_diag_msg))</div><div class='add'>+		+ inet_diag_msg_attrs_size()</div><div class='add'>+		+ nla_total_size(sizeof(struct inet_diag_meminfo))</div><div class='add'>+		+ nla_total_size(SK_MEMINFO_VARS * sizeof(u32))</div><div class='add'>+		+ nla_total_size(TCP_CA_NAME_MAX)</div><div class='add'>+		+ nla_total_size(sizeof(struct tcpvegas_info))</div><div class='add'>+		+ 64;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_twsk_diag_fill(struct sock *sk,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      struct netlink_callback *cb,</div><div class='add'>+			      u16 nlmsg_flags, bool net_admin)</div><div class='add'>+{</div><div class='add'>+	struct inet_timewait_sock *tw = inet_twsk(sk);</div><div class='add'>+	struct inet_diag_msg *r;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	long tmo;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+			cb-&gt;nlh-&gt;nlmsg_seq, cb-&gt;nlh-&gt;nlmsg_type,</div><div class='add'>+			sizeof(*r), nlmsg_flags);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	r = nlmsg_data(nlh);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(tw-&gt;tw_state != TCP_TIME_WAIT);</div><div class='add'>+</div><div class='add'>+	inet_diag_msg_common_fill(r, sk);</div><div class='add'>+	r-&gt;idiag_retrans      = 0;</div><div class='add'>+</div><div class='add'>+	r-&gt;idiag_state	      = READ_ONCE(tw-&gt;tw_substate);</div><div class='add'>+	r-&gt;idiag_timer	      = 3;</div><div class='add'>+	tmo = tw-&gt;tw_timer.expires - jiffies;</div><div class='add'>+	r-&gt;idiag_expires      = jiffies_delta_to_msecs(tmo);</div><div class='add'>+	r-&gt;idiag_rqueue	      = 0;</div><div class='add'>+	r-&gt;idiag_wqueue	      = 0;</div><div class='add'>+	r-&gt;idiag_uid	      = 0;</div><div class='add'>+	r-&gt;idiag_inode	      = 0;</div><div class='add'>+</div><div class='add'>+	if (net_admin &amp;&amp; nla_put_u32(skb, INET_DIAG_MARK,</div><div class='add'>+				     tw-&gt;tw_mark)) {</div><div class='add'>+		nlmsg_cancel(skb, nlh);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_req_diag_fill(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			     struct netlink_callback *cb,</div><div class='add'>+			     u16 nlmsg_flags, bool net_admin)</div><div class='add'>+{</div><div class='add'>+	struct request_sock *reqsk = inet_reqsk(sk);</div><div class='add'>+	struct inet_diag_msg *r;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	long tmo;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(skb, NETLINK_CB(cb-&gt;skb).portid, cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+			cb-&gt;nlh-&gt;nlmsg_type, sizeof(*r), nlmsg_flags);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	r = nlmsg_data(nlh);</div><div class='add'>+	inet_diag_msg_common_fill(r, sk);</div><div class='add'>+	r-&gt;idiag_state = TCP_SYN_RECV;</div><div class='add'>+	r-&gt;idiag_timer = 1;</div><div class='add'>+	r-&gt;idiag_retrans = READ_ONCE(reqsk-&gt;num_retrans);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) !=</div><div class='add'>+		     offsetof(struct sock, sk_cookie));</div><div class='add'>+</div><div class='add'>+	tmo = READ_ONCE(inet_reqsk(sk)-&gt;rsk_timer.expires) - jiffies;</div><div class='add'>+	r-&gt;idiag_expires = jiffies_delta_to_msecs(tmo);</div><div class='add'>+	r-&gt;idiag_rqueue	= 0;</div><div class='add'>+	r-&gt;idiag_wqueue	= 0;</div><div class='add'>+	r-&gt;idiag_uid	= 0;</div><div class='add'>+	r-&gt;idiag_inode	= 0;</div><div class='add'>+</div><div class='add'>+	if (net_admin &amp;&amp; nla_put_u32(skb, INET_DIAG_MARK,</div><div class='add'>+				     inet_rsk(reqsk)-&gt;ir_mark)) {</div><div class='add'>+		nlmsg_cancel(skb, nlh);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlmsg_end(skb, nlh);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			struct netlink_callback *cb,</div><div class='add'>+			const struct inet_diag_req_v2 *r,</div><div class='add'>+			u16 nlmsg_flags, bool net_admin)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+		return tcp_twsk_diag_fill(sk, skb, cb, nlmsg_flags, net_admin);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='add'>+		return tcp_req_diag_fill(sk, skb, cb, nlmsg_flags, net_admin);</div><div class='add'>+</div><div class='add'>+	return inet_sk_diag_fill(sk, inet_csk(sk), skb, cb, r, nlmsg_flags,</div><div class='add'>+				 net_admin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void twsk_build_assert(void)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_family) !=</div><div class='add'>+		     offsetof(struct sock, sk_family));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_num) !=</div><div class='add'>+		     offsetof(struct inet_sock, inet_num));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_dport) !=</div><div class='add'>+		     offsetof(struct inet_sock, inet_dport));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_rcv_saddr) !=</div><div class='add'>+		     offsetof(struct inet_sock, inet_rcv_saddr));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_daddr) !=</div><div class='add'>+		     offsetof(struct inet_sock, inet_daddr));</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_v6_rcv_saddr) !=</div><div class='add'>+		     offsetof(struct sock, sk_v6_rcv_saddr));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct inet_timewait_sock, tw_v6_daddr) !=</div><div class='add'>+		     offsetof(struct sock, sk_v6_daddr));</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			  const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='add'>+			  const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='del'>-	inet_diag_dump_icsk(&amp;tcp_hashinfo, skb, cb, r, bc);</div><div class='add'>+	bool net_admin = netlink_net_capable(cb-&gt;skb, CAP_NET_ADMIN);</div><div class='add'>+	struct inet_diag_dump_data *cb_data = cb-&gt;data;</div><div class='add'>+	struct net *net = sock_net(skb-&gt;sk);</div><div class='add'>+	u32 idiag_states = r-&gt;idiag_states;</div><div class='add'>+	struct inet_hashinfo *hashinfo;</div><div class='add'>+	int i, num, s_i, s_num;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	hashinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	if (idiag_states &amp; TCPF_SYN_RECV)</div><div class='add'>+		idiag_states |= TCPF_NEW_SYN_RECV;</div><div class='add'>+	s_i = cb-&gt;args[1];</div><div class='add'>+	s_num = num = cb-&gt;args[2];</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;args[0] == 0) {</div><div class='add'>+		if (!(idiag_states &amp; TCPF_LISTEN) || r-&gt;id.idiag_dport)</div><div class='add'>+			goto skip_listen_ht;</div><div class='add'>+</div><div class='add'>+		for (i = s_i; i &lt;= hashinfo-&gt;lhash2_mask; i++) {</div><div class='add'>+			struct inet_listen_hashbucket *ilb;</div><div class='add'>+			struct hlist_nulls_node *node;</div><div class='add'>+</div><div class='add'>+			num = 0;</div><div class='add'>+			ilb = &amp;hashinfo-&gt;lhash2[i];</div><div class='add'>+</div><div class='add'>+			if (hlist_nulls_empty(&amp;ilb-&gt;nulls_head)) {</div><div class='add'>+				s_num = 0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			spin_lock(&amp;ilb-&gt;lock);</div><div class='add'>+			sk_nulls_for_each(sk, node, &amp;ilb-&gt;nulls_head) {</div><div class='add'>+				struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='add'>+				if (!net_eq(sock_net(sk), net))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				if (num &lt; s_num) {</div><div class='add'>+					num++;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (r-&gt;sdiag_family != AF_UNSPEC &amp;&amp;</div><div class='add'>+				    sk-&gt;sk_family != r-&gt;sdiag_family)</div><div class='add'>+					goto next_listen;</div><div class='add'>+</div><div class='add'>+				if (r-&gt;id.idiag_sport != inet-&gt;inet_sport &amp;&amp;</div><div class='add'>+				    r-&gt;id.idiag_sport)</div><div class='add'>+					goto next_listen;</div><div class='add'>+</div><div class='add'>+				if (!inet_diag_bc_sk(cb_data, sk))</div><div class='add'>+					goto next_listen;</div><div class='add'>+</div><div class='add'>+				if (inet_sk_diag_fill(sk, inet_csk(sk), skb,</div><div class='add'>+						      cb, r, NLM_F_MULTI,</div><div class='add'>+						      net_admin) &lt; 0) {</div><div class='add'>+					spin_unlock(&amp;ilb-&gt;lock);</div><div class='add'>+					goto done;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+next_listen:</div><div class='add'>+				++num;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;ilb-&gt;lock);</div><div class='add'>+</div><div class='add'>+			s_num = 0;</div><div class='add'>+		}</div><div class='add'>+skip_listen_ht:</div><div class='add'>+		cb-&gt;args[0] = 1;</div><div class='add'>+		s_i = num = s_num = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/* Process a maximum of SKARR_SZ sockets at a time when walking hash buckets</div><div class='add'>+ * with bh disabled.</div><div class='add'>+ */</div><div class='add'>+#define SKARR_SZ 16</div><div class='add'>+</div><div class='add'>+	/* Dump bound but inactive (not listening, connecting, etc.) sockets */</div><div class='add'>+	if (cb-&gt;args[0] == 1) {</div><div class='add'>+		if (!(idiag_states &amp; TCPF_BOUND_INACTIVE))</div><div class='add'>+			goto skip_bind_ht;</div><div class='add'>+</div><div class='add'>+		for (i = s_i; i &lt; hashinfo-&gt;bhash_size; i++) {</div><div class='add'>+			struct inet_bind_hashbucket *ibb;</div><div class='add'>+			struct inet_bind2_bucket *tb2;</div><div class='add'>+			struct sock *sk_arr[SKARR_SZ];</div><div class='add'>+			int num_arr[SKARR_SZ];</div><div class='add'>+			int idx, accum, res;</div><div class='add'>+</div><div class='add'>+resume_bind_walk:</div><div class='add'>+			num = 0;</div><div class='add'>+			accum = 0;</div><div class='add'>+			ibb = &amp;hashinfo-&gt;bhash2[i];</div><div class='add'>+</div><div class='add'>+			if (hlist_empty(&amp;ibb-&gt;chain)) {</div><div class='add'>+				s_num = 0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			spin_lock_bh(&amp;ibb-&gt;lock);</div><div class='add'>+			inet_bind_bucket_for_each(tb2, &amp;ibb-&gt;chain) {</div><div class='add'>+				if (!net_eq(ib2_net(tb2), net))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				sk_for_each_bound(sk, &amp;tb2-&gt;owners) {</div><div class='add'>+					struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='add'>+					if (num &lt; s_num)</div><div class='add'>+						goto next_bind;</div><div class='add'>+</div><div class='add'>+					if (sk-&gt;sk_state != TCP_CLOSE ||</div><div class='add'>+					    !inet-&gt;inet_num)</div><div class='add'>+						goto next_bind;</div><div class='add'>+</div><div class='add'>+					if (r-&gt;sdiag_family != AF_UNSPEC &amp;&amp;</div><div class='add'>+					    r-&gt;sdiag_family != sk-&gt;sk_family)</div><div class='add'>+						goto next_bind;</div><div class='add'>+</div><div class='add'>+					if (!inet_diag_bc_sk(cb_data, sk))</div><div class='add'>+						goto next_bind;</div><div class='add'>+</div><div class='add'>+					sock_hold(sk);</div><div class='add'>+					num_arr[accum] = num;</div><div class='add'>+					sk_arr[accum] = sk;</div><div class='add'>+					if (++accum == SKARR_SZ)</div><div class='add'>+						goto pause_bind_walk;</div><div class='add'>+next_bind:</div><div class='add'>+					num++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+pause_bind_walk:</div><div class='add'>+			spin_unlock_bh(&amp;ibb-&gt;lock);</div><div class='add'>+</div><div class='add'>+			res = 0;</div><div class='add'>+			for (idx = 0; idx &lt; accum; idx++) {</div><div class='add'>+				if (res &gt;= 0) {</div><div class='add'>+					res = inet_sk_diag_fill(sk_arr[idx],</div><div class='add'>+								NULL, skb, cb,</div><div class='add'>+								r, NLM_F_MULTI,</div><div class='add'>+								net_admin);</div><div class='add'>+					if (res &lt; 0)</div><div class='add'>+						num = num_arr[idx];</div><div class='add'>+				}</div><div class='add'>+				sock_put(sk_arr[idx]);</div><div class='add'>+			}</div><div class='add'>+			if (res &lt; 0)</div><div class='add'>+				goto done;</div><div class='add'>+</div><div class='add'>+			cond_resched();</div><div class='add'>+</div><div class='add'>+			if (accum == SKARR_SZ) {</div><div class='add'>+				s_num = num + 1;</div><div class='add'>+				goto resume_bind_walk;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			s_num = 0;</div><div class='add'>+		}</div><div class='add'>+skip_bind_ht:</div><div class='add'>+		cb-&gt;args[0] = 2;</div><div class='add'>+		s_i = num = s_num = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(idiag_states &amp; ~TCPF_LISTEN))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = s_i; i &lt;= hashinfo-&gt;ehash_mask; i++) {</div><div class='add'>+		struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[i];</div><div class='add'>+		spinlock_t *lock = inet_ehash_lockp(hashinfo, i);</div><div class='add'>+		struct hlist_nulls_node *node;</div><div class='add'>+		struct sock *sk_arr[SKARR_SZ];</div><div class='add'>+		int num_arr[SKARR_SZ];</div><div class='add'>+		int idx, accum, res;</div><div class='add'>+</div><div class='add'>+		if (hlist_nulls_empty(&amp;head-&gt;chain))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i &gt; s_i)</div><div class='add'>+			s_num = 0;</div><div class='add'>+</div><div class='add'>+next_chunk:</div><div class='add'>+		num = 0;</div><div class='add'>+		accum = 0;</div><div class='add'>+		spin_lock_bh(lock);</div><div class='add'>+		sk_nulls_for_each(sk, node, &amp;head-&gt;chain) {</div><div class='add'>+			int state;</div><div class='add'>+</div><div class='add'>+			if (!net_eq(sock_net(sk), net))</div><div class='add'>+				continue;</div><div class='add'>+			if (num &lt; s_num)</div><div class='add'>+				goto next_normal;</div><div class='add'>+			state = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='add'>+				READ_ONCE(inet_twsk(sk)-&gt;tw_substate) : sk-&gt;sk_state;</div><div class='add'>+			if (!(idiag_states &amp; (1 &lt;&lt; state)))</div><div class='add'>+				goto next_normal;</div><div class='add'>+			if (r-&gt;sdiag_family != AF_UNSPEC &amp;&amp;</div><div class='add'>+			    sk-&gt;sk_family != r-&gt;sdiag_family)</div><div class='add'>+				goto next_normal;</div><div class='add'>+			if (r-&gt;id.idiag_sport != htons(sk-&gt;sk_num) &amp;&amp;</div><div class='add'>+			    r-&gt;id.idiag_sport)</div><div class='add'>+				goto next_normal;</div><div class='add'>+			if (r-&gt;id.idiag_dport != sk-&gt;sk_dport &amp;&amp;</div><div class='add'>+			    r-&gt;id.idiag_dport)</div><div class='add'>+				goto next_normal;</div><div class='add'>+			twsk_build_assert();</div><div class='add'>+</div><div class='add'>+			if (!inet_diag_bc_sk(cb_data, sk))</div><div class='add'>+				goto next_normal;</div><div class='add'>+</div><div class='add'>+			if (!refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='add'>+				goto next_normal;</div><div class='add'>+</div><div class='add'>+			num_arr[accum] = num;</div><div class='add'>+			sk_arr[accum] = sk;</div><div class='add'>+			if (++accum == SKARR_SZ)</div><div class='add'>+				break;</div><div class='add'>+next_normal:</div><div class='add'>+			++num;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(lock);</div><div class='add'>+</div><div class='add'>+		res = 0;</div><div class='add'>+		for (idx = 0; idx &lt; accum; idx++) {</div><div class='add'>+			if (res &gt;= 0) {</div><div class='add'>+				res = sk_diag_fill(sk_arr[idx], skb, cb, r,</div><div class='add'>+						   NLM_F_MULTI, net_admin);</div><div class='add'>+				if (res &lt; 0)</div><div class='add'>+					num = num_arr[idx];</div><div class='add'>+			}</div><div class='add'>+			sock_gen_put(sk_arr[idx]);</div><div class='add'>+		}</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='add'>+		if (accum == SKARR_SZ) {</div><div class='add'>+			s_num = num + 1;</div><div class='add'>+			goto next_chunk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	cb-&gt;args[1] = i;</div><div class='add'>+	cb-&gt;args[2] = num;</div><div class='add'>+out:</div><div class='add'>+	;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh,</div><div class='add'>+static struct sock *tcp_diag_find_one_icsk(struct net *net,</div><div class='add'>+					   const struct inet_diag_req_v2 *req)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (req-&gt;sdiag_family == AF_INET) {</div><div class='add'>+		sk = inet_lookup(net, NULL, 0, req-&gt;id.idiag_dst[0],</div><div class='add'>+				 req-&gt;id.idiag_dport, req-&gt;id.idiag_src[0],</div><div class='add'>+				 req-&gt;id.idiag_sport, req-&gt;id.idiag_if);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (req-&gt;sdiag_family == AF_INET6) {</div><div class='add'>+		if (ipv6_addr_v4mapped((struct in6_addr *)req-&gt;id.idiag_dst) &amp;&amp;</div><div class='add'>+		    ipv6_addr_v4mapped((struct in6_addr *)req-&gt;id.idiag_src))</div><div class='add'>+			sk = inet_lookup(net, NULL, 0, req-&gt;id.idiag_dst[3],</div><div class='add'>+					 req-&gt;id.idiag_dport, req-&gt;id.idiag_src[3],</div><div class='add'>+					 req-&gt;id.idiag_sport, req-&gt;id.idiag_if);</div><div class='add'>+		else</div><div class='add'>+			sk = inet6_lookup(net, NULL, 0,</div><div class='add'>+					  (struct in6_addr *)req-&gt;id.idiag_dst,</div><div class='add'>+					  req-&gt;id.idiag_dport,</div><div class='add'>+					  (struct in6_addr *)req-&gt;id.idiag_src,</div><div class='add'>+					  req-&gt;id.idiag_sport,</div><div class='add'>+					  req-&gt;id.idiag_if);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!sk)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	if (sock_diag_check_cookie(sk, req-&gt;id.idiag_cookie)) {</div><div class='add'>+		sock_gen_put(sk);</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_diag_dump_one(struct netlink_callback *cb,</div><div class='ctx'> 			     const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='del'>-	return inet_diag_dump_one_icsk(&amp;tcp_hashinfo, in_skb, nlh, req);</div><div class='add'>+	struct sk_buff *in_skb = cb-&gt;skb;</div><div class='add'>+	struct sk_buff *rep;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	bool net_admin;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	sk = tcp_diag_find_one_icsk(net, req);</div><div class='add'>+	if (IS_ERR(sk))</div><div class='add'>+		return PTR_ERR(sk);</div><div class='add'>+</div><div class='add'>+	net_admin = netlink_net_capable(in_skb, CAP_NET_ADMIN);</div><div class='add'>+	rep = nlmsg_new(tcp_diag_get_aux_size(sk, net_admin), GFP_KERNEL);</div><div class='add'>+	if (!rep) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = sk_diag_fill(sk, rep, cb, req, 0, net_admin);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		nlmsg_free(rep);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	err = nlmsg_unicast(net-&gt;diag_nlsk, rep, NETLINK_CB(in_skb).portid);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (sk)</div><div class='add'>+		sock_gen_put(sk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INET_DIAG_DESTROY</div><div class='hunk'>@@ -148,9 +643,10 @@ static int tcp_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> 			    const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='del'>-	struct sock *sk = inet_diag_find_one_icsk(net, &amp;tcp_hashinfo, req);</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	sk = tcp_diag_find_one_icsk(net, req);</div><div class='ctx'> 	if (IS_ERR(sk))</div><div class='ctx'> 		return PTR_ERR(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -163,11 +659,11 @@ static int tcp_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct inet_diag_handler tcp_diag_handler = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='ctx'> 	.dump			= tcp_diag_dump,</div><div class='ctx'> 	.dump_one		= tcp_diag_dump_one,</div><div class='ctx'> 	.idiag_get_info		= tcp_diag_get_info,</div><div class='ctx'> 	.idiag_get_aux		= tcp_diag_get_aux,</div><div class='del'>-	.idiag_get_aux_size	= tcp_diag_get_aux_size,</div><div class='ctx'> 	.idiag_type		= IPPROTO_TCP,</div><div class='ctx'> 	.idiag_info_size	= sizeof(struct tcp_info),</div><div class='ctx'> #ifdef CONFIG_INET_DIAG_DESTROY</div><div class='hunk'>@@ -188,4 +684,5 @@ static void __exit tcp_diag_exit(void)</div><div class='ctx'> module_init(tcp_diag_init);</div><div class='ctx'> module_exit(tcp_diag_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("TCP socket monitoring via SOCK_DIAG");</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-6 /* AF_INET - IPPROTO_TCP */);</div><div class='head'>diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c<br/>index 018a48477355..7d945a527daf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_fastopen.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_fastopen.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_fastopen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_fastopen.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;net/inetpeer.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='ctx'> </div><div class='ctx'> void tcp_fastopen_init_key_once(struct net *net)</div><div class='ctx'> {</div><div class='hunk'>@@ -30,15 +25,15 @@ void tcp_fastopen_init_key_once(struct net *net)</div><div class='ctx'> 	 * for a valid cookie, so this is an acceptable risk.</div><div class='ctx'> 	 */</div><div class='ctx'> 	get_random_bytes(key, sizeof(key));</div><div class='del'>-	tcp_fastopen_reset_cipher(net, NULL, key, sizeof(key));</div><div class='add'>+	tcp_fastopen_reset_cipher(net, NULL, key, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_fastopen_ctx_free(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_fastopen_context *ctx =</div><div class='ctx'> 	    container_of(head, struct tcp_fastopen_context, rcu);</div><div class='del'>-	crypto_free_cipher(ctx-&gt;tfm);</div><div class='del'>-	kfree(ctx);</div><div class='add'>+</div><div class='add'>+	kfree_sensitive(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tcp_fastopen_destroy_cipher(struct sock *sk)</div><div class='hunk'>@@ -55,119 +50,120 @@ void tcp_fastopen_ctx_destroy(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_fastopen_context *ctxt;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock);</div><div class='del'>-</div><div class='del'>-	ctxt = rcu_dereference_protected(net-&gt;ipv4.tcp_fastopen_ctx,</div><div class='del'>-				lockdep_is_held(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock));</div><div class='del'>-	rcu_assign_pointer(net-&gt;ipv4.tcp_fastopen_ctx, NULL);</div><div class='del'>-	spin_unlock(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock);</div><div class='add'>+	ctxt = unrcu_pointer(xchg(&amp;net-&gt;ipv4.tcp_fastopen_ctx, NULL));</div><div class='ctx'> </div><div class='ctx'> 	if (ctxt)</div><div class='ctx'> 		call_rcu(&amp;ctxt-&gt;rcu, tcp_fastopen_ctx_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tcp_fastopen_reset_cipher(struct net *net, struct sock *sk,</div><div class='del'>-			      void *key, unsigned int len)</div><div class='add'>+			      void *primary_key, void *backup_key)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_fastopen_context *ctx, *octx;</div><div class='ctx'> 	struct fastopen_queue *q;</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ctx-&gt;tfm = crypto_alloc_cipher("aes", 0, 0);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(ctx-&gt;tfm)) {</div><div class='del'>-		err = PTR_ERR(ctx-&gt;tfm);</div><div class='del'>-error:		kfree(ctx);</div><div class='del'>-		pr_err("TCP: TFO aes cipher alloc error: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	err = crypto_cipher_setkey(ctx-&gt;tfm, key, len);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("TCP: TFO cipher key error: %d\n", err);</div><div class='del'>-		crypto_free_cipher(ctx-&gt;tfm);</div><div class='del'>-		goto error;</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(ctx-&gt;key, key, len);</div><div class='ctx'> </div><div class='add'>+	ctx-&gt;key[0].key[0] = get_unaligned_le64(primary_key);</div><div class='add'>+	ctx-&gt;key[0].key[1] = get_unaligned_le64(primary_key + 8);</div><div class='add'>+	if (backup_key) {</div><div class='add'>+		ctx-&gt;key[1].key[0] = get_unaligned_le64(backup_key);</div><div class='add'>+		ctx-&gt;key[1].key[1] = get_unaligned_le64(backup_key + 8);</div><div class='add'>+		ctx-&gt;num = 2;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;num = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock);</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		q = &amp;inet_csk(sk)-&gt;icsk_accept_queue.fastopenq;</div><div class='del'>-		octx = rcu_dereference_protected(q-&gt;ctx,</div><div class='del'>-			lockdep_is_held(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock));</div><div class='del'>-		rcu_assign_pointer(q-&gt;ctx, ctx);</div><div class='add'>+		octx = unrcu_pointer(xchg(&amp;q-&gt;ctx, RCU_INITIALIZER(ctx)));</div><div class='ctx'> 	} else {</div><div class='del'>-		octx = rcu_dereference_protected(net-&gt;ipv4.tcp_fastopen_ctx,</div><div class='del'>-			lockdep_is_held(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock));</div><div class='del'>-		rcu_assign_pointer(net-&gt;ipv4.tcp_fastopen_ctx, ctx);</div><div class='add'>+		octx = unrcu_pointer(xchg(&amp;net-&gt;ipv4.tcp_fastopen_ctx,</div><div class='add'>+					  RCU_INITIALIZER(ctx)));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (octx)</div><div class='ctx'> 		call_rcu(&amp;octx-&gt;rcu, tcp_fastopen_ctx_free);</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __tcp_fastopen_cookie_gen(struct sock *sk, const void *path,</div><div class='del'>-				      struct tcp_fastopen_cookie *foc)</div><div class='add'>+int tcp_fastopen_get_cipher(struct net *net, struct inet_connection_sock *icsk,</div><div class='add'>+			    u64 *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_fastopen_context *ctx;</div><div class='del'>-	bool ok = false;</div><div class='add'>+	int n_keys = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	ctx = rcu_dereference(inet_csk(sk)-&gt;icsk_accept_queue.fastopenq.ctx);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		ctx = rcu_dereference(sock_net(sk)-&gt;ipv4.tcp_fastopen_ctx);</div><div class='del'>-</div><div class='add'>+	if (icsk)</div><div class='add'>+		ctx = rcu_dereference(icsk-&gt;icsk_accept_queue.fastopenq.ctx);</div><div class='add'>+	else</div><div class='add'>+		ctx = rcu_dereference(net-&gt;ipv4.tcp_fastopen_ctx);</div><div class='ctx'> 	if (ctx) {</div><div class='del'>-		crypto_cipher_encrypt_one(ctx-&gt;tfm, foc-&gt;val, path);</div><div class='del'>-		foc-&gt;len = TCP_FASTOPEN_COOKIE_SIZE;</div><div class='del'>-		ok = true;</div><div class='add'>+		n_keys = tcp_fastopen_context_len(ctx);</div><div class='add'>+		for (i = 0; i &lt; n_keys; i++) {</div><div class='add'>+			put_unaligned_le64(ctx-&gt;key[i].key[0], key + (i * 2));</div><div class='add'>+			put_unaligned_le64(ctx-&gt;key[i].key[1], key + (i * 2) + 1);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	return ok;</div><div class='add'>+</div><div class='add'>+	return n_keys;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Generate the fastopen cookie by doing aes128 encryption on both</div><div class='del'>- * the source and destination addresses. Pad 0s for IPv4 or IPv4-mapped-IPv6</div><div class='del'>- * addresses. For the longer IPv6 addresses use CBC-MAC.</div><div class='del'>- *</div><div class='del'>- * XXX (TFO) - refactor when TCP_FASTOPEN_COOKIE_SIZE != AES_BLOCK_SIZE.</div><div class='del'>- */</div><div class='del'>-static bool tcp_fastopen_cookie_gen(struct sock *sk,</div><div class='del'>-				    struct request_sock *req,</div><div class='del'>-				    struct sk_buff *syn,</div><div class='del'>-				    struct tcp_fastopen_cookie *foc)</div><div class='add'>+static bool __tcp_fastopen_cookie_gen_cipher(struct request_sock *req,</div><div class='add'>+					     struct sk_buff *syn,</div><div class='add'>+					     const siphash_key_t *key,</div><div class='add'>+					     struct tcp_fastopen_cookie *foc)</div><div class='ctx'> {</div><div class='add'>+	BUILD_BUG_ON(TCP_FASTOPEN_COOKIE_SIZE != sizeof(u64));</div><div class='add'>+</div><div class='ctx'> 	if (req-&gt;rsk_ops-&gt;family == AF_INET) {</div><div class='ctx'> 		const struct iphdr *iph = ip_hdr(syn);</div><div class='ctx'> </div><div class='del'>-		__be32 path[4] = { iph-&gt;saddr, iph-&gt;daddr, 0, 0 };</div><div class='del'>-		return __tcp_fastopen_cookie_gen(sk, path, foc);</div><div class='add'>+		foc-&gt;val[0] = cpu_to_le64(siphash(&amp;iph-&gt;saddr,</div><div class='add'>+					  sizeof(iph-&gt;saddr) +</div><div class='add'>+					  sizeof(iph-&gt;daddr),</div><div class='add'>+					  key));</div><div class='add'>+		foc-&gt;len = TCP_FASTOPEN_COOKIE_SIZE;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	if (req-&gt;rsk_ops-&gt;family == AF_INET6) {</div><div class='ctx'> 		const struct ipv6hdr *ip6h = ipv6_hdr(syn);</div><div class='del'>-		struct tcp_fastopen_cookie tmp;</div><div class='ctx'> </div><div class='del'>-		if (__tcp_fastopen_cookie_gen(sk, &amp;ip6h-&gt;saddr, &amp;tmp)) {</div><div class='del'>-			struct in6_addr *buf = &amp;tmp.addr;</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; 4; i++)</div><div class='del'>-				buf-&gt;s6_addr32[i] ^= ip6h-&gt;daddr.s6_addr32[i];</div><div class='del'>-			return __tcp_fastopen_cookie_gen(sk, buf, foc);</div><div class='del'>-		}</div><div class='add'>+		foc-&gt;val[0] = cpu_to_le64(siphash(&amp;ip6h-&gt;saddr,</div><div class='add'>+					  sizeof(ip6h-&gt;saddr) +</div><div class='add'>+					  sizeof(ip6h-&gt;daddr),</div><div class='add'>+					  key));</div><div class='add'>+		foc-&gt;len = TCP_FASTOPEN_COOKIE_SIZE;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Generate the fastopen cookie by applying SipHash to both the source and</div><div class='add'>+ * destination addresses.</div><div class='add'>+ */</div><div class='add'>+static void tcp_fastopen_cookie_gen(struct sock *sk,</div><div class='add'>+				    struct request_sock *req,</div><div class='add'>+				    struct sk_buff *syn,</div><div class='add'>+				    struct tcp_fastopen_cookie *foc)</div><div class='add'>+{</div><div class='add'>+	struct tcp_fastopen_context *ctx;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ctx = tcp_fastopen_get_ctx(sk);</div><div class='add'>+	if (ctx)</div><div class='add'>+		__tcp_fastopen_cookie_gen_cipher(req, syn, &amp;ctx-&gt;key[0], foc);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* If an incoming SYN or SYNACK frame contains a payload and/or FIN,</div><div class='ctx'>  * queue this additional data / FIN.</div><div class='hunk'>@@ -183,7 +179,7 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_dst_drop(skb);</div><div class='add'>+	tcp_cleanup_skb(skb);</div><div class='ctx'> 	/* segs_in has been initialized to 1 in tcp_create_openreq_child().</div><div class='ctx'> 	 * Hence, reset segs_in to 0 before calling tcp_segs_in()</div><div class='ctx'> 	 * to avoid double counting.  Also, tcp_segs_in() expects</div><div class='hunk'>@@ -200,7 +196,7 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_SYN;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rcv_nxt = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='del'>-	__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+	tcp_add_receive_queue(sk, skb);</div><div class='ctx'> 	tp-&gt;syn_data_acked = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* u64_stats_update_begin(&amp;tp-&gt;syncp) not needed here,</div><div class='hunk'>@@ -212,6 +208,35 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		tcp_fin(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* returns 0 - no key match, 1 for primary, 2 for backup */</div><div class='add'>+static int tcp_fastopen_cookie_gen_check(struct sock *sk,</div><div class='add'>+					 struct request_sock *req,</div><div class='add'>+					 struct sk_buff *syn,</div><div class='add'>+					 struct tcp_fastopen_cookie *orig,</div><div class='add'>+					 struct tcp_fastopen_cookie *valid_foc)</div><div class='add'>+{</div><div class='add'>+	struct tcp_fastopen_cookie search_foc = { .len = -1 };</div><div class='add'>+	struct tcp_fastopen_cookie *foc = valid_foc;</div><div class='add'>+	struct tcp_fastopen_context *ctx;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ctx = tcp_fastopen_get_ctx(sk);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		goto out;</div><div class='add'>+	for (i = 0; i &lt; tcp_fastopen_context_len(ctx); i++) {</div><div class='add'>+		__tcp_fastopen_cookie_gen_cipher(req, syn, &amp;ctx-&gt;key[i], foc);</div><div class='add'>+		if (tcp_fastopen_cookie_match(foc, orig)) {</div><div class='add'>+			ret = i + 1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		foc = &amp;search_foc;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sock *tcp_fastopen_create_child(struct sock *sk,</div><div class='ctx'> 					      struct sk_buff *skb,</div><div class='ctx'> 					      struct request_sock *req)</div><div class='hunk'>@@ -221,10 +246,6 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk,</div><div class='ctx'> 	struct sock *child;</div><div class='ctx'> 	bool own_req;</div><div class='ctx'> </div><div class='del'>-	req-&gt;num_retrans = 0;</div><div class='del'>-	req-&gt;num_timeout = 0;</div><div class='del'>-	req-&gt;sk = NULL;</div><div class='del'>-</div><div class='ctx'> 	child = inet_csk(sk)-&gt;icsk_af_ops-&gt;syn_recv_sock(sk, skb, req, NULL,</div><div class='ctx'> 							 NULL, &amp;own_req);</div><div class='ctx'> 	if (!child)</div><div class='hunk'>@@ -240,7 +261,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk,</div><div class='ctx'> 	 */</div><div class='ctx'> 	tp = tcp_sk(child);</div><div class='ctx'> </div><div class='del'>-	tp-&gt;fastopen_rsk = req;</div><div class='add'>+	rcu_assign_pointer(tp-&gt;fastopen_rsk, req);</div><div class='ctx'> 	tcp_rsk(req)-&gt;tfo_listener = true;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC1323: The window in SYN &amp; SYN/ACK segments is never</div><div class='hunk'>@@ -253,13 +274,16 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk,</div><div class='ctx'> 	 * The request socket is not added to the ehash</div><div class='ctx'> 	 * because it's been added to the accept queue directly.</div><div class='ctx'> 	 */</div><div class='del'>-	inet_csk_reset_xmit_timer(child, ICSK_TIME_RETRANS,</div><div class='del'>-				  TCP_TIMEOUT_INIT, TCP_RTO_MAX);</div><div class='add'>+	req-&gt;timeout = tcp_timeout_init(child);</div><div class='add'>+	tcp_reset_xmit_timer(child, ICSK_TIME_RETRANS,</div><div class='add'>+			     req-&gt;timeout, false);</div><div class='ctx'> </div><div class='ctx'> 	refcount_set(&amp;req-&gt;rsk_refcnt, 2);</div><div class='ctx'> </div><div class='add'>+	sk_mark_napi_id_set(child, skb);</div><div class='add'>+</div><div class='ctx'> 	/* Now finish processing the fastopen child socket. */</div><div class='del'>-	tcp_init_transfer(child, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB);</div><div class='add'>+	tcp_init_transfer(child, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB, skb);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rcv_nxt = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='ctx'> </div><div class='hunk'>@@ -276,6 +300,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk,</div><div class='ctx'> static bool tcp_fastopen_queue_check(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastopen_queue *fastopenq;</div><div class='add'>+	int max_qlen;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the listener has enabled fastopen, and we don't</div><div class='ctx'> 	 * exceed the max # of pending TFO requests allowed before trying</div><div class='hunk'>@@ -288,10 +313,11 @@ static bool tcp_fastopen_queue_check(struct sock *sk)</div><div class='ctx'> 	 * temporarily vs a server not supporting Fast Open at all.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fastopenq = &amp;inet_csk(sk)-&gt;icsk_accept_queue.fastopenq;</div><div class='del'>-	if (fastopenq-&gt;max_qlen == 0)</div><div class='add'>+	max_qlen = READ_ONCE(fastopenq-&gt;max_qlen);</div><div class='add'>+	if (max_qlen == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (fastopenq-&gt;qlen &gt;= fastopenq-&gt;max_qlen) {</div><div class='add'>+	if (fastopenq-&gt;qlen &gt;= max_qlen) {</div><div class='ctx'> 		struct request_sock *req1;</div><div class='ctx'> 		spin_lock(&amp;fastopenq-&gt;lock);</div><div class='ctx'> 		req1 = fastopenq-&gt;rskq_rst_head;</div><div class='hunk'>@@ -313,7 +339,7 @@ static bool tcp_fastopen_no_cookie(const struct sock *sk,</div><div class='ctx'> 				   const struct dst_entry *dst,</div><div class='ctx'> 				   int flag)</div><div class='ctx'> {</div><div class='del'>-	return (sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen &amp; flag) ||</div><div class='add'>+	return (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen) &amp; flag) ||</div><div class='ctx'> 	       tcp_sk(sk)-&gt;fastopen_no_cookie ||</div><div class='ctx'> 	       (dst &amp;&amp; dst_metric(dst, RTAX_FASTOPEN_NO_COOKIE));</div><div class='ctx'> }</div><div class='hunk'>@@ -328,9 +354,10 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			      const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	bool syn_data = TCP_SKB_CB(skb)-&gt;end_seq != TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='del'>-	int tcp_fastopen = sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen;</div><div class='add'>+	int tcp_fastopen = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen);</div><div class='ctx'> 	struct tcp_fastopen_cookie valid_foc = { .len = -1 };</div><div class='ctx'> 	struct sock *child;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (foc-&gt;len == 0) /* Client requests a cookie */</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFASTOPENCOOKIEREQD);</div><div class='hunk'>@@ -342,35 +369,48 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (syn_data &amp;&amp;</div><div class='del'>-	    tcp_fastopen_no_cookie(sk, dst, TFO_SERVER_COOKIE_NOT_REQD))</div><div class='add'>+	if (tcp_fastopen_no_cookie(sk, dst, TFO_SERVER_COOKIE_NOT_REQD))</div><div class='ctx'> 		goto fastopen;</div><div class='ctx'> </div><div class='del'>-	if (foc-&gt;len &gt;= 0 &amp;&amp;  /* Client presents or requests a cookie */</div><div class='del'>-	    tcp_fastopen_cookie_gen(sk, req, skb, &amp;valid_foc) &amp;&amp;</div><div class='del'>-	    foc-&gt;len == TCP_FASTOPEN_COOKIE_SIZE &amp;&amp;</div><div class='del'>-	    foc-&gt;len == valid_foc.len &amp;&amp;</div><div class='del'>-	    !memcmp(foc-&gt;val, valid_foc.val, foc-&gt;len)) {</div><div class='del'>-		/* Cookie is valid. Create a (full) child socket to accept</div><div class='del'>-		 * the data in SYN before returning a SYN-ACK to ack the</div><div class='del'>-		 * data. If we fail to create the socket, fall back and</div><div class='del'>-		 * ack the ISN only but includes the same cookie.</div><div class='del'>-		 *</div><div class='del'>-		 * Note: Data-less SYN with valid cookie is allowed to send</div><div class='del'>-		 * data in SYN_RECV state.</div><div class='del'>-		 */</div><div class='add'>+	if (foc-&gt;len == 0) {</div><div class='add'>+		/* Client requests a cookie. */</div><div class='add'>+		tcp_fastopen_cookie_gen(sk, req, skb, &amp;valid_foc);</div><div class='add'>+	} else if (foc-&gt;len &gt; 0) {</div><div class='add'>+		ret = tcp_fastopen_cookie_gen_check(sk, req, skb, foc,</div><div class='add'>+						    &amp;valid_foc);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			NET_INC_STATS(sock_net(sk),</div><div class='add'>+				      LINUX_MIB_TCPFASTOPENPASSIVEFAIL);</div><div class='add'>+		} else {</div><div class='add'>+			/* Cookie is valid. Create a (full) child socket to</div><div class='add'>+			 * accept the data in SYN before returning a SYN-ACK to</div><div class='add'>+			 * ack the data. If we fail to create the socket, fall</div><div class='add'>+			 * back and ack the ISN only but includes the same</div><div class='add'>+			 * cookie.</div><div class='add'>+			 *</div><div class='add'>+			 * Note: Data-less SYN with valid cookie is allowed to</div><div class='add'>+			 * send data in SYN_RECV state.</div><div class='add'>+			 */</div><div class='ctx'> fastopen:</div><div class='del'>-		child = tcp_fastopen_create_child(sk, skb, req);</div><div class='del'>-		if (child) {</div><div class='del'>-			foc-&gt;len = -1;</div><div class='add'>+			child = tcp_fastopen_create_child(sk, skb, req);</div><div class='add'>+			if (child) {</div><div class='add'>+				if (ret == 2) {</div><div class='add'>+					valid_foc.exp = foc-&gt;exp;</div><div class='add'>+					*foc = valid_foc;</div><div class='add'>+					NET_INC_STATS(sock_net(sk),</div><div class='add'>+						      LINUX_MIB_TCPFASTOPENPASSIVEALTKEY);</div><div class='add'>+				} else {</div><div class='add'>+					foc-&gt;len = -1;</div><div class='add'>+				}</div><div class='add'>+				NET_INC_STATS(sock_net(sk),</div><div class='add'>+					      LINUX_MIB_TCPFASTOPENPASSIVE);</div><div class='add'>+				tcp_sk(child)-&gt;syn_fastopen_child = 1;</div><div class='add'>+				return child;</div><div class='add'>+			}</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk),</div><div class='del'>-				      LINUX_MIB_TCPFASTOPENPASSIVE);</div><div class='del'>-			return child;</div><div class='add'>+				      LINUX_MIB_TCPFASTOPENPASSIVEFAIL);</div><div class='ctx'> 		}</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFASTOPENPASSIVEFAIL);</div><div class='del'>-	} else if (foc-&gt;len &gt; 0) /* Client presents an invalid cookie */</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFASTOPENPASSIVEFAIL);</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	valid_foc.exp = foc-&gt;exp;</div><div class='ctx'> 	*foc = valid_foc;</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -395,7 +435,10 @@ bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss,</div><div class='ctx'> 		cookie-&gt;len = -1;</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='del'>-	return cookie-&gt;len &gt; 0;</div><div class='add'>+	if (cookie-&gt;len &gt; 0)</div><div class='add'>+		return true;</div><div class='add'>+	tcp_sk(sk)-&gt;fastopen_client_fail = TFO_COOKIE_UNAVAILABLE;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function checks if we want to defer sending SYN until the first</div><div class='hunk'>@@ -413,7 +456,7 @@ bool tcp_fastopen_defer_connect(struct sock *sk, int *err)</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;fastopen_connect &amp;&amp; !tp-&gt;fastopen_req) {</div><div class='ctx'> 		if (tcp_fastopen_cookie_check(sk, &amp;mss, &amp;cookie)) {</div><div class='del'>-			inet_sk(sk)-&gt;defer_connect = 1;</div><div class='add'>+			inet_set_bit(DEFER_CONNECT, sk);</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +472,7 @@ bool tcp_fastopen_defer_connect(struct sock *sk, int *err)</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_fastopen_defer_connect);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_fastopen_defer_connect);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following code block is to deal with middle box issues with TFO:</div><div class='hunk'>@@ -454,8 +497,18 @@ void tcp_fastopen_active_disable(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> </div><div class='add'>+	if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen_blackhole_timeout))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Paired with READ_ONCE() in tcp_fastopen_active_should_disable() */</div><div class='add'>+	WRITE_ONCE(net-&gt;ipv4.tfo_active_disable_stamp, jiffies);</div><div class='add'>+</div><div class='add'>+	/* Paired with smp_rmb() in tcp_fastopen_active_should_disable().</div><div class='add'>+	 * We want net-&gt;ipv4.tfo_active_disable_stamp to be updated first.</div><div class='add'>+	 */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='ctx'> 	atomic_inc(&amp;net-&gt;ipv4.tfo_active_disable_times);</div><div class='del'>-	net-&gt;ipv4.tfo_active_disable_stamp = jiffies;</div><div class='add'>+</div><div class='ctx'> 	NET_INC_STATS(net, LINUX_MIB_TCPFASTOPENBLACKHOLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -465,18 +518,29 @@ void tcp_fastopen_active_disable(struct sock *sk)</div><div class='ctx'>  */</div><div class='ctx'> bool tcp_fastopen_active_should_disable(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tfo_bh_timeout = sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen_blackhole_timeout;</div><div class='del'>-	int tfo_da_times = atomic_read(&amp;sock_net(sk)-&gt;ipv4.tfo_active_disable_times);</div><div class='add'>+	unsigned int tfo_bh_timeout =</div><div class='add'>+		READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_fastopen_blackhole_timeout);</div><div class='ctx'> 	unsigned long timeout;</div><div class='add'>+	int tfo_da_times;</div><div class='ctx'> 	int multiplier;</div><div class='ctx'> </div><div class='add'>+	if (!tfo_bh_timeout)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	tfo_da_times = atomic_read(&amp;sock_net(sk)-&gt;ipv4.tfo_active_disable_times);</div><div class='ctx'> 	if (!tfo_da_times)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* Limit timout to max: 2^6 * initial timeout */</div><div class='add'>+	/* Paired with smp_mb__before_atomic() in tcp_fastopen_active_disable() */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	/* Limit timeout to max: 2^6 * initial timeout */</div><div class='ctx'> 	multiplier = 1 &lt;&lt; min(tfo_da_times - 1, 6);</div><div class='del'>-	timeout = multiplier * tfo_bh_timeout * HZ;</div><div class='del'>-	if (time_before(jiffies, sock_net(sk)-&gt;ipv4.tfo_active_disable_stamp + timeout))</div><div class='add'>+</div><div class='add'>+	/* Paired with the WRITE_ONCE() in tcp_fastopen_active_disable(). */</div><div class='add'>+	timeout = READ_ONCE(sock_net(sk)-&gt;ipv4.tfo_active_disable_stamp) +</div><div class='add'>+		  multiplier * tfo_bh_timeout * HZ;</div><div class='add'>+	if (time_before(jiffies, timeout))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark check bit so we can check for successful active TFO</div><div class='hunk'>@@ -495,6 +559,7 @@ bool tcp_fastopen_active_should_disable(struct sock *sk)</div><div class='ctx'> void tcp_fastopen_active_disable_ofo_check(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -511,10 +576,12 @@ void tcp_fastopen_active_disable_ofo_check(struct sock *sk)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (tp-&gt;syn_fastopen_ch &amp;&amp;</div><div class='ctx'> 		   atomic_read(&amp;sock_net(sk)-&gt;ipv4.tfo_active_disable_times)) {</div><div class='del'>-		dst = sk_dst_get(sk);</div><div class='del'>-		if (!(dst &amp;&amp; dst-&gt;dev &amp;&amp; (dst-&gt;dev-&gt;flags &amp; IFF_LOOPBACK)))</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dst = __sk_dst_get(sk);</div><div class='add'>+		dev = dst ? dst_dev_rcu(dst) : NULL;</div><div class='add'>+		if (!(dev &amp;&amp; (dev-&gt;flags &amp; IFF_LOOPBACK)))</div><div class='ctx'> 			atomic_set(&amp;sock_net(sk)-&gt;ipv4.tfo_active_disable_times, 0);</div><div class='del'>-		dst_release(dst);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c<br/>index d1c33c91eadc..c6de5ce79ad3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_highspeed.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_highspeed.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_highspeed.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_highspeed.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Sally Floyd's High Speed TCP (RFC 3649) congestion control</div><div class='ctx'>  *</div><div class='del'>- * See http://www.icir.org/floyd/hstcp.html</div><div class='add'>+ * See https://www.icir.org/floyd/hstcp.html</div><div class='ctx'>  *</div><div class='ctx'>  * John Heffner &lt;jheffner@psc.edu&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -126,22 +127,22 @@ static void hstcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		 *     snd_cwnd &lt;=</div><div class='ctx'> 		 *     hstcp_aimd_vals[ca-&gt;ai].cwnd</div><div class='ctx'> 		 */</div><div class='del'>-		if (tp-&gt;snd_cwnd &gt; hstcp_aimd_vals[ca-&gt;ai].cwnd) {</div><div class='del'>-			while (tp-&gt;snd_cwnd &gt; hstcp_aimd_vals[ca-&gt;ai].cwnd &amp;&amp;</div><div class='add'>+		if (tcp_snd_cwnd(tp) &gt; hstcp_aimd_vals[ca-&gt;ai].cwnd) {</div><div class='add'>+			while (tcp_snd_cwnd(tp) &gt; hstcp_aimd_vals[ca-&gt;ai].cwnd &amp;&amp;</div><div class='ctx'> 			       ca-&gt;ai &lt; HSTCP_AIMD_MAX - 1)</div><div class='ctx'> 				ca-&gt;ai++;</div><div class='del'>-		} else if (ca-&gt;ai &amp;&amp; tp-&gt;snd_cwnd &lt;= hstcp_aimd_vals[ca-&gt;ai-1].cwnd) {</div><div class='del'>-			while (ca-&gt;ai &amp;&amp; tp-&gt;snd_cwnd &lt;= hstcp_aimd_vals[ca-&gt;ai-1].cwnd)</div><div class='add'>+		} else if (ca-&gt;ai &amp;&amp; tcp_snd_cwnd(tp) &lt;= hstcp_aimd_vals[ca-&gt;ai-1].cwnd) {</div><div class='add'>+			while (ca-&gt;ai &amp;&amp; tcp_snd_cwnd(tp) &lt;= hstcp_aimd_vals[ca-&gt;ai-1].cwnd)</div><div class='ctx'> 				ca-&gt;ai--;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Do additive increase */</div><div class='del'>-		if (tp-&gt;snd_cwnd &lt; tp-&gt;snd_cwnd_clamp) {</div><div class='add'>+		if (tcp_snd_cwnd(tp) &lt; tp-&gt;snd_cwnd_clamp) {</div><div class='ctx'> 			/* cwnd = cwnd + a(w) / cwnd */</div><div class='ctx'> 			tp-&gt;snd_cwnd_cnt += ca-&gt;ai + 1;</div><div class='del'>-			if (tp-&gt;snd_cwnd_cnt &gt;= tp-&gt;snd_cwnd) {</div><div class='del'>-				tp-&gt;snd_cwnd_cnt -= tp-&gt;snd_cwnd;</div><div class='del'>-				tp-&gt;snd_cwnd++;</div><div class='add'>+			if (tp-&gt;snd_cwnd_cnt &gt;= tcp_snd_cwnd(tp)) {</div><div class='add'>+				tp-&gt;snd_cwnd_cnt -= tcp_snd_cwnd(tp);</div><div class='add'>+				tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -153,7 +154,7 @@ static u32 hstcp_ssthresh(struct sock *sk)</div><div class='ctx'> 	struct hstcp *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Do multiplicative decrease */</div><div class='del'>-	return max(tp-&gt;snd_cwnd - ((tp-&gt;snd_cwnd * hstcp_aimd_vals[ca-&gt;ai].md) &gt;&gt; 8), 2U);</div><div class='add'>+	return max(tcp_snd_cwnd(tp) - ((tcp_snd_cwnd(tp) * hstcp_aimd_vals[ca-&gt;ai].md) &gt;&gt; 8), 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_highspeed __read_mostly = {</div><div class='head'>diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c<br/>index 082d479462fa..81b96331b2bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_htcp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_htcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_htcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_htcp.c</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * H-TCP congestion control. The algorithm is detailed in:</div><div class='ctx'>  * R.N.Shorten, D.J.Leith:</div><div class='ctx'>  *   "H-TCP: TCP for high-speed and long-distance networks"</div><div class='ctx'>  *   Proc. PFLDnet, Argonne, 2004.</div><div class='del'>- * http://www.hamilton.ie/net/htcp3.pdf</div><div class='add'>+ * https://www.hamilton.ie/net/htcp3.pdf</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -123,7 +124,7 @@ static void measure_achieved_throughput(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	ca-&gt;packetcount += sample-&gt;pkts_acked;</div><div class='ctx'> </div><div class='del'>-	if (ca-&gt;packetcount &gt;= tp-&gt;snd_cwnd - (ca-&gt;alpha &gt;&gt; 7 ? : 1) &amp;&amp;</div><div class='add'>+	if (ca-&gt;packetcount &gt;= tcp_snd_cwnd(tp) - (ca-&gt;alpha &gt;&gt; 7 ? : 1) &amp;&amp;</div><div class='ctx'> 	    now - ca-&gt;lasttime &gt;= ca-&gt;minRTT &amp;&amp;</div><div class='ctx'> 	    ca-&gt;minRTT &gt; 0) {</div><div class='ctx'> 		__u32 cur_Bi = ca-&gt;packetcount * HZ / (now - ca-&gt;lasttime);</div><div class='hunk'>@@ -184,7 +185,7 @@ static inline void htcp_alpha_update(struct htcp *ca)</div><div class='ctx'> 		u32 scale = (HZ &lt;&lt; 3) / (10 * minRTT);</div><div class='ctx'> </div><div class='ctx'> 		/* clamping ratio to interval [0.5,10]&lt;&lt;3 */</div><div class='del'>-		scale = min(max(scale, 1U &lt;&lt; 2), 10U &lt;&lt; 3);</div><div class='add'>+		scale = clamp(scale, 1U &lt;&lt; 2, 10U &lt;&lt; 3);</div><div class='ctx'> 		factor = (factor &lt;&lt; 3) / scale;</div><div class='ctx'> 		if (!factor)</div><div class='ctx'> 			factor = 1;</div><div class='hunk'>@@ -224,7 +225,7 @@ static u32 htcp_recalc_ssthresh(struct sock *sk)</div><div class='ctx'> 	const struct htcp *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	htcp_param_update(sk);</div><div class='del'>-	return max((tp-&gt;snd_cwnd * ca-&gt;beta) &gt;&gt; 7, 2U);</div><div class='add'>+	return max((tcp_snd_cwnd(tp) * ca-&gt;beta) &gt;&gt; 7, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='hunk'>@@ -241,9 +242,9 @@ static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		/* In dangerous area, increase slowly.</div><div class='ctx'> 		 * In theory this is tp-&gt;snd_cwnd += alpha / tp-&gt;snd_cwnd</div><div class='ctx'> 		 */</div><div class='del'>-		if ((tp-&gt;snd_cwnd_cnt * ca-&gt;alpha)&gt;&gt;7 &gt;= tp-&gt;snd_cwnd) {</div><div class='del'>-			if (tp-&gt;snd_cwnd &lt; tp-&gt;snd_cwnd_clamp)</div><div class='del'>-				tp-&gt;snd_cwnd++;</div><div class='add'>+		if ((tp-&gt;snd_cwnd_cnt * ca-&gt;alpha)&gt;&gt;7 &gt;= tcp_snd_cwnd(tp)) {</div><div class='add'>+			if (tcp_snd_cwnd(tp) &lt; tp-&gt;snd_cwnd_clamp)</div><div class='add'>+				tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 			tp-&gt;snd_cwnd_cnt = 0;</div><div class='ctx'> 			htcp_alpha_update(ca);</div><div class='ctx'> 		} else</div><div class='head'>diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c<br/>index 0f7175c3338e..abd7d91807e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_hybla.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_hybla.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_hybla.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_hybla.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP HYBLA</div><div class='ctx'>  *</div><div class='hunk'>@@ -53,7 +54,7 @@ static void hybla_init(struct sock *sk)</div><div class='ctx'> 	ca-&gt;rho2_7ls = 0;</div><div class='ctx'> 	ca-&gt;snd_cwnd_cents = 0;</div><div class='ctx'> 	ca-&gt;hybla_en = true;</div><div class='del'>-	tp-&gt;snd_cwnd = 2;</div><div class='add'>+	tcp_snd_cwnd_set(tp, 2);</div><div class='ctx'> 	tp-&gt;snd_cwnd_clamp = 65535;</div><div class='ctx'> </div><div class='ctx'> 	/* 1st Rho measurement based on initial srtt */</div><div class='hunk'>@@ -61,7 +62,7 @@ static void hybla_init(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	/* set minimum rtt as this is the 1st ever seen */</div><div class='ctx'> 	ca-&gt;minrtt_us = tp-&gt;srtt_us;</div><div class='del'>-	tp-&gt;snd_cwnd = ca-&gt;rho;</div><div class='add'>+	tcp_snd_cwnd_set(tp, ca-&gt;rho);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hybla_state(struct sock *sk, u8 ca_state)</div><div class='hunk'>@@ -136,31 +137,31 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		 * as long as increment is estimated as (rho&lt;&lt;7)/window</div><div class='ctx'> 		 * it already is &lt;&lt;7 and we can easily count its fractions.</div><div class='ctx'> 		 */</div><div class='del'>-		increment = ca-&gt;rho2_7ls / tp-&gt;snd_cwnd;</div><div class='add'>+		increment = ca-&gt;rho2_7ls / tcp_snd_cwnd(tp);</div><div class='ctx'> 		if (increment &lt; 128)</div><div class='ctx'> 			tp-&gt;snd_cwnd_cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	odd = increment % 128;</div><div class='del'>-	tp-&gt;snd_cwnd += increment &gt;&gt; 7;</div><div class='add'>+	tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + (increment &gt;&gt; 7));</div><div class='ctx'> 	ca-&gt;snd_cwnd_cents += odd;</div><div class='ctx'> </div><div class='ctx'> 	/* check when fractions goes &gt;=128 and increase cwnd by 1. */</div><div class='ctx'> 	while (ca-&gt;snd_cwnd_cents &gt;= 128) {</div><div class='del'>-		tp-&gt;snd_cwnd++;</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 		ca-&gt;snd_cwnd_cents -= 128;</div><div class='ctx'> 		tp-&gt;snd_cwnd_cnt = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* check when cwnd has not been incremented for a while */</div><div class='del'>-	if (increment == 0 &amp;&amp; odd == 0 &amp;&amp; tp-&gt;snd_cwnd_cnt &gt;= tp-&gt;snd_cwnd) {</div><div class='del'>-		tp-&gt;snd_cwnd++;</div><div class='add'>+	if (increment == 0 &amp;&amp; odd == 0 &amp;&amp; tp-&gt;snd_cwnd_cnt &gt;= tcp_snd_cwnd(tp)) {</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 		tp-&gt;snd_cwnd_cnt = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clamp down slowstart cwnd to ssthresh value. */</div><div class='ctx'> 	if (is_slowstart)</div><div class='del'>-		tp-&gt;snd_cwnd = min(tp-&gt;snd_cwnd, tp-&gt;snd_ssthresh);</div><div class='add'>+		tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp), tp-&gt;snd_ssthresh));</div><div class='ctx'> </div><div class='del'>-	tp-&gt;snd_cwnd = min_t(u32, tp-&gt;snd_cwnd, tp-&gt;snd_cwnd_clamp);</div><div class='add'>+	tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp), tp-&gt;snd_cwnd_clamp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_hybla __read_mostly = {</div><div class='head'>diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c<br/>index faddf4f9a707..c0c81a2c77fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_illinois.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_illinois.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_illinois.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_illinois.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP Illinois congestion control.</div><div class='ctx'>  * Home page:</div><div class='hunk'>@@ -223,7 +224,7 @@ static void update_params(struct sock *sk)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct illinois *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;snd_cwnd &lt; win_thresh) {</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt; win_thresh) {</div><div class='ctx'> 		ca-&gt;alpha = ALPHA_BASE;</div><div class='ctx'> 		ca-&gt;beta = BETA_BASE;</div><div class='ctx'> 	} else if (ca-&gt;cnt_rtt &gt; 0) {</div><div class='hunk'>@@ -283,9 +284,9 @@ static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		 * tp-&gt;snd_cwnd += alpha/tp-&gt;snd_cwnd</div><div class='ctx'> 		*/</div><div class='ctx'> 		delta = (tp-&gt;snd_cwnd_cnt * ca-&gt;alpha) &gt;&gt; ALPHA_SHIFT;</div><div class='del'>-		if (delta &gt;= tp-&gt;snd_cwnd) {</div><div class='del'>-			tp-&gt;snd_cwnd = min(tp-&gt;snd_cwnd + delta / tp-&gt;snd_cwnd,</div><div class='del'>-					   (u32)tp-&gt;snd_cwnd_clamp);</div><div class='add'>+		if (delta &gt;= tcp_snd_cwnd(tp)) {</div><div class='add'>+			tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp) + delta / tcp_snd_cwnd(tp),</div><div class='add'>+						 (u32)tp-&gt;snd_cwnd_clamp));</div><div class='ctx'> 			tp-&gt;snd_cwnd_cnt = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -295,9 +296,11 @@ static u32 tcp_illinois_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct illinois *ca = inet_csk_ca(sk);</div><div class='add'>+	u32 decr;</div><div class='ctx'> </div><div class='ctx'> 	/* Multiplicative decrease */</div><div class='del'>-	return max(tp-&gt;snd_cwnd - ((tp-&gt;snd_cwnd * ca-&gt;beta) &gt;&gt; BETA_SHIFT), 2U);</div><div class='add'>+	decr = (tcp_snd_cwnd(tp) * ca-&gt;beta) &gt;&gt; BETA_SHIFT;</div><div class='add'>+	return max(tcp_snd_cwnd(tp) - decr, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Extract info for Tcp socket info provided via netlink. */</div><div class='head'>diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c<br/>index 47e08c1b5bc3..198f8a0d37be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_input.c</a></div><div class='hunk'>@@ -70,15 +70,19 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='ctx'> #include &lt;linux/ipsec.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;trace/events/tcp.h&gt;</div><div class='del'>-#include &lt;linux/static_key.h&gt;</div><div class='add'>+#include &lt;linux/jump_label_ratelimit.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int sysctl_tcp_max_orphans __read_mostly = NR_FILE;</div><div class='ctx'> </div><div class='hunk'>@@ -99,6 +103,8 @@ int sysctl_tcp_max_orphans __read_mostly = NR_FILE;</div><div class='ctx'> #define FLAG_UPDATE_TS_RECENT	0x4000 /* tcp_replace_ts_recent() */</div><div class='ctx'> #define FLAG_NO_CHALLENGE_ACK	0x8000 /* do not call tcp_send_challenge_ack()	*/</div><div class='ctx'> #define FLAG_ACK_MAYBE_DELAYED	0x10000 /* Likely a delayed ACK */</div><div class='add'>+#define FLAG_DSACK_TLP		0x20000 /* DSACK for tail loss probe */</div><div class='add'>+#define FLAG_TS_PROGRESS	0x40000 /* Positive timestamp delta */</div><div class='ctx'> </div><div class='ctx'> #define FLAG_ACKED		(FLAG_DATA_ACKED|FLAG_SYN_ACKED)</div><div class='ctx'> #define FLAG_NOT_DUP		(FLAG_DATA|FLAG_WIN_UPDATE|FLAG_ACKED)</div><div class='hunk'>@@ -113,41 +119,106 @@ int sysctl_tcp_max_orphans __read_mostly = NR_FILE;</div><div class='ctx'> #define REXMIT_NEW	2 /* FRTO-style transmit of unsent/new packets */</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='del'>-static DEFINE_STATIC_KEY_FALSE(clean_acked_data_enabled);</div><div class='add'>+static DEFINE_STATIC_KEY_DEFERRED_FALSE(clean_acked_data_enabled, HZ);</div><div class='ctx'> </div><div class='del'>-void clean_acked_data_enable(struct inet_connection_sock *icsk,</div><div class='add'>+void clean_acked_data_enable(struct tcp_sock *tp,</div><div class='ctx'> 			     void (*cad)(struct sock *sk, u32 ack_seq))</div><div class='ctx'> {</div><div class='del'>-	icsk-&gt;icsk_clean_acked = cad;</div><div class='del'>-	static_branch_inc(&amp;clean_acked_data_enabled);</div><div class='add'>+	tp-&gt;tcp_clean_acked = cad;</div><div class='add'>+	static_branch_deferred_inc(&amp;clean_acked_data_enabled);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clean_acked_data_enable);</div><div class='ctx'> </div><div class='del'>-void clean_acked_data_disable(struct inet_connection_sock *icsk)</div><div class='add'>+void clean_acked_data_disable(struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='del'>-	static_branch_dec(&amp;clean_acked_data_enabled);</div><div class='del'>-	icsk-&gt;icsk_clean_acked = NULL;</div><div class='add'>+	static_branch_slow_dec_deferred(&amp;clean_acked_data_enabled);</div><div class='add'>+	tp-&gt;tcp_clean_acked = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clean_acked_data_disable);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb,</div><div class='del'>-			     unsigned int len)</div><div class='add'>+void clean_acked_data_flush(void)</div><div class='ctx'> {</div><div class='del'>-	static bool __once __read_mostly;</div><div class='add'>+	static_key_deferred_flush(&amp;clean_acked_data_enabled);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(clean_acked_data_flush);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (!__once) {</div><div class='del'>-		struct net_device *dev;</div><div class='add'>+#ifdef CONFIG_CGROUP_BPF</div><div class='add'>+static void bpf_skops_parse_hdr(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bool unknown_opt = tcp_sk(sk)-&gt;rx_opt.saw_unknown &amp;&amp;</div><div class='add'>+		BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk),</div><div class='add'>+				       BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG);</div><div class='add'>+	bool parse_all_opt = BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk),</div><div class='add'>+						    BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG);</div><div class='add'>+	struct bpf_sock_ops_kern sock_ops;</div><div class='ctx'> </div><div class='del'>-		__once = true;</div><div class='add'>+	if (likely(!unknown_opt &amp;&amp; !parse_all_opt))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		dev = dev_get_by_index_rcu(sock_net(sk), skb-&gt;skb_iif);</div><div class='del'>-		if (!dev || len &gt;= dev-&gt;mtu)</div><div class='del'>-			pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n",</div><div class='del'>-				dev ? dev-&gt;name : "Unknown driver");</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	/* The skb will be handled in the</div><div class='add'>+	 * bpf_skops_established() or</div><div class='add'>+	 * bpf_skops_write_hdr_opt().</div><div class='add'>+	 */</div><div class='add'>+	switch (sk-&gt;sk_state) {</div><div class='add'>+	case TCP_SYN_RECV:</div><div class='add'>+	case TCP_SYN_SENT:</div><div class='add'>+	case TCP_LISTEN:</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	sock_owned_by_me(sk);</div><div class='add'>+</div><div class='add'>+	memset(&amp;sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));</div><div class='add'>+	sock_ops.op = BPF_SOCK_OPS_PARSE_HDR_OPT_CB;</div><div class='add'>+	sock_ops.is_fullsock = 1;</div><div class='add'>+	sock_ops.is_locked_tcp_sock = 1;</div><div class='add'>+	sock_ops.sk = sk;</div><div class='add'>+	bpf_skops_init_skb(&amp;sock_ops, skb, tcp_hdrlen(skb));</div><div class='add'>+</div><div class='add'>+	BPF_CGROUP_RUN_PROG_SOCK_OPS(&amp;sock_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_skops_established(struct sock *sk, int bpf_op,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock_ops_kern sock_ops;</div><div class='add'>+</div><div class='add'>+	sock_owned_by_me(sk);</div><div class='add'>+</div><div class='add'>+	memset(&amp;sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));</div><div class='add'>+	sock_ops.op = bpf_op;</div><div class='add'>+	sock_ops.is_fullsock = 1;</div><div class='add'>+	sock_ops.is_locked_tcp_sock = 1;</div><div class='add'>+	sock_ops.sk = sk;</div><div class='add'>+	/* sk with TCP_REPAIR_ON does not have skb in tcp_finish_connect */</div><div class='add'>+	if (skb)</div><div class='add'>+		bpf_skops_init_skb(&amp;sock_ops, skb, tcp_hdrlen(skb));</div><div class='add'>+</div><div class='add'>+	BPF_CGROUP_RUN_PROG_SOCK_OPS(&amp;sock_ops);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void bpf_skops_parse_hdr(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_skops_established(struct sock *sk, int bpf_op,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __cold void tcp_gro_dev_warn(const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+				    unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dev_get_by_index_rcu(sock_net(sk), skb-&gt;skb_iif);</div><div class='add'>+	if (!dev || len &gt;= READ_ONCE(dev-&gt;mtu))</div><div class='add'>+		pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n",</div><div class='add'>+			dev ? dev-&gt;name : "Unknown driver");</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Adapt the MSS value used to make delayed ack decision to the</div><div class='hunk'>@@ -166,12 +237,45 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	len = skb_shinfo(skb)-&gt;gso_size ? : skb-&gt;len;</div><div class='ctx'> 	if (len &gt;= icsk-&gt;icsk_ack.rcv_mss) {</div><div class='add'>+		/* Note: divides are still a bit expensive.</div><div class='add'>+		 * For the moment, only adjust scaling_ratio</div><div class='add'>+		 * when we update icsk_ack.rcv_mss.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(len != icsk-&gt;icsk_ack.rcv_mss)) {</div><div class='add'>+			u64 val = (u64)skb-&gt;len &lt;&lt; TCP_RMEM_TO_WIN_SCALE;</div><div class='add'>+			u8 old_ratio = tcp_sk(sk)-&gt;scaling_ratio;</div><div class='add'>+</div><div class='add'>+			do_div(val, skb-&gt;truesize);</div><div class='add'>+			tcp_sk(sk)-&gt;scaling_ratio = val ? val : 1;</div><div class='add'>+</div><div class='add'>+			if (old_ratio != tcp_sk(sk)-&gt;scaling_ratio) {</div><div class='add'>+				struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+				val = tcp_win_from_space(sk, sk-&gt;sk_rcvbuf);</div><div class='add'>+				tcp_set_window_clamp(sk, val);</div><div class='add'>+</div><div class='add'>+				if (tp-&gt;window_clamp &lt; tp-&gt;rcvq_space.space)</div><div class='add'>+					tp-&gt;rcvq_space.space = tp-&gt;window_clamp;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		icsk-&gt;icsk_ack.rcv_mss = min_t(unsigned int, len,</div><div class='ctx'> 					       tcp_sk(sk)-&gt;advmss);</div><div class='ctx'> 		/* Account for possibly-removed options */</div><div class='del'>-		if (unlikely(len &gt; icsk-&gt;icsk_ack.rcv_mss +</div><div class='del'>-				   MAX_TCP_OPTION_SPACE))</div><div class='del'>-			tcp_gro_dev_warn(sk, skb, len);</div><div class='add'>+		DO_ONCE_LITE_IF(len &gt; icsk-&gt;icsk_ack.rcv_mss + MAX_TCP_OPTION_SPACE,</div><div class='add'>+				tcp_gro_dev_warn, sk, skb, len);</div><div class='add'>+		/* If the skb has a len of exactly 1*MSS and has the PSH bit</div><div class='add'>+		 * set then it is likely the end of an application write. So</div><div class='add'>+		 * more data may not be arriving soon, and yet the data sender</div><div class='add'>+		 * may be waiting for an ACK if cwnd-bound or using TX zero</div><div class='add'>+		 * copy. So we set ICSK_ACK_PUSHED here so that</div><div class='add'>+		 * tcp_cleanup_rbuf() will send an ACK immediately if the app</div><div class='add'>+		 * reads all of the data and is not ping-pong. If len &gt; MSS</div><div class='add'>+		 * then this logic does not matter (and does not hurt) because</div><div class='add'>+		 * tcp_cleanup_rbuf() will always ACK immediately if the app</div><div class='add'>+		 * reads data and there is more than an MSS of unACKed data.</div><div class='add'>+		 */</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_PSH)</div><div class='add'>+			icsk-&gt;icsk_ack.pending |= ICSK_ACK_PUSHED;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Otherwise, we make more careful check taking into account,</div><div class='ctx'> 		 * that SACKs block is variable.</div><div class='hunk'>@@ -216,15 +320,14 @@ static void tcp_incr_quickack(struct sock *sk, unsigned int max_quickacks)</div><div class='ctx'> 		icsk-&gt;icsk_ack.quick = quickacks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks)</div><div class='add'>+static void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='ctx'> 	tcp_incr_quickack(sk, max_quickacks);</div><div class='del'>-	icsk-&gt;icsk_ack.pingpong = 0;</div><div class='add'>+	inet_csk_exit_pingpong_mode(sk);</div><div class='ctx'> 	icsk-&gt;icsk_ack.ato = TCP_ATO_MIN;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_enter_quickack_mode);</div><div class='ctx'> </div><div class='ctx'> /* Send ACKs quickly, if "quick" count is not exhausted</div><div class='ctx'>  * and the session is not interactive.</div><div class='hunk'>@@ -233,40 +336,18 @@ EXPORT_SYMBOL(tcp_enter_quickack_mode);</div><div class='ctx'> static bool tcp_in_quickack_mode(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	const struct dst_entry *dst = __sk_dst_get(sk);</div><div class='ctx'> </div><div class='del'>-	return (dst &amp;&amp; dst_metric(dst, RTAX_QUICKACK)) ||</div><div class='del'>-		(icsk-&gt;icsk_ack.quick &amp;&amp; !icsk-&gt;icsk_ack.pingpong);</div><div class='add'>+	return icsk-&gt;icsk_ack.dst_quick_ack ||</div><div class='add'>+		(icsk-&gt;icsk_ack.quick &amp;&amp; !inet_csk_in_pingpong_mode(sk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_ecn_queue_cwr(struct tcp_sock *tp)</div><div class='del'>-{</div><div class='del'>-	if (tp-&gt;ecn_flags &amp; TCP_ECN_OK)</div><div class='del'>-		tp-&gt;ecn_flags |= TCP_ECN_QUEUE_CWR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcp_ecn_accept_cwr(struct sock *sk, const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (tcp_hdr(skb)-&gt;cwr) {</div><div class='del'>-		tcp_sk(sk)-&gt;ecn_flags &amp;= ~TCP_ECN_DEMAND_CWR;</div><div class='del'>-</div><div class='del'>-		/* If the sender is telling us it has entered CWR, then its</div><div class='del'>-		 * cwnd may be very low (even just 1 packet), so we should ACK</div><div class='del'>-		 * immediately.</div><div class='del'>-		 */</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_NOW;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcp_ecn_withdraw_cwr(struct tcp_sock *tp)</div><div class='del'>-{</div><div class='del'>-	tp-&gt;ecn_flags &amp;= ~TCP_ECN_DEMAND_CWR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='add'>+	if (tcp_ecn_disabled(tp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	switch (TCP_SKB_CB(skb)-&gt;ip_dsfield &amp; INET_ECN_MASK) {</div><div class='ctx'> 	case INET_ECN_NOT_ECT:</div><div class='ctx'> 		/* Funny extension: if ECT is not set on a segment,</div><div class='hunk'>@@ -280,44 +361,222 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 		if (tcp_ca_needs_ecn(sk))</div><div class='ctx'> 			tcp_ca_event(sk, CA_EVENT_ECN_IS_CE);</div><div class='ctx'> </div><div class='del'>-		if (!(tp-&gt;ecn_flags &amp; TCP_ECN_DEMAND_CWR)) {</div><div class='add'>+		if (!(tp-&gt;ecn_flags &amp; TCP_ECN_DEMAND_CWR) &amp;&amp;</div><div class='add'>+		    tcp_ecn_mode_rfc3168(tp)) {</div><div class='ctx'> 			/* Better not delay acks, sender can have a very low cwnd */</div><div class='ctx'> 			tcp_enter_quickack_mode(sk, 2);</div><div class='ctx'> 			tp-&gt;ecn_flags |= TCP_ECN_DEMAND_CWR;</div><div class='ctx'> 		}</div><div class='add'>+		/* As for RFC3168 ECN, the TCP_ECN_SEEN flag is set by</div><div class='add'>+		 * tcp_data_ecn_check() when the ECN codepoint of</div><div class='add'>+		 * received TCP data contains ECT(0), ECT(1), or CE.</div><div class='add'>+		 */</div><div class='add'>+		if (!tcp_ecn_mode_rfc3168(tp))</div><div class='add'>+			break;</div><div class='ctx'> 		tp-&gt;ecn_flags |= TCP_ECN_SEEN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (tcp_ca_needs_ecn(sk))</div><div class='ctx'> 			tcp_ca_event(sk, CA_EVENT_ECN_NO_CE);</div><div class='add'>+		if (!tcp_ecn_mode_rfc3168(tp))</div><div class='add'>+			break;</div><div class='ctx'> 		tp-&gt;ecn_flags |= TCP_ECN_SEEN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+/* Returns true if the byte counters can be used */</div><div class='add'>+static bool tcp_accecn_process_option(struct tcp_sock *tp,</div><div class='add'>+				      const struct sk_buff *skb,</div><div class='add'>+				      u32 delivered_bytes, int flag)</div><div class='ctx'> {</div><div class='del'>-	if (tcp_sk(sk)-&gt;ecn_flags &amp; TCP_ECN_OK)</div><div class='del'>-		__tcp_ecn_check_ce(sk, skb);</div><div class='add'>+	u8 estimate_ecnfield = tp-&gt;est_ecnfield;</div><div class='add'>+	bool ambiguous_ecn_bytes_incr = false;</div><div class='add'>+	bool first_changed = false;</div><div class='add'>+	unsigned int optlen;</div><div class='add'>+	bool order1, res;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+</div><div class='add'>+	if (tcp_accecn_opt_fail_recv(tp))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!(flag &amp; FLAG_SLOWPATH) || !tp-&gt;rx_opt.accecn) {</div><div class='add'>+		if (!tp-&gt;saw_accecn_opt) {</div><div class='add'>+			/* Too late to enable after this point due to</div><div class='add'>+			 * potential counter wraps</div><div class='add'>+			 */</div><div class='add'>+			if (tp-&gt;bytes_sent &gt;= (1 &lt;&lt; 23) - 1) {</div><div class='add'>+				u8 saw_opt = TCP_ACCECN_OPT_FAIL_SEEN;</div><div class='add'>+</div><div class='add'>+				tcp_accecn_saw_opt_fail_recv(tp, saw_opt);</div><div class='add'>+			}</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (estimate_ecnfield) {</div><div class='add'>+			u8 ecnfield = estimate_ecnfield - 1;</div><div class='add'>+</div><div class='add'>+			tp-&gt;delivered_ecn_bytes[ecnfield] += delivered_bytes;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = skb_transport_header(skb) + tp-&gt;rx_opt.accecn;</div><div class='add'>+	optlen = ptr[1] - 2;</div><div class='add'>+	if (WARN_ON_ONCE(ptr[0] != TCPOPT_ACCECN0 &amp;&amp; ptr[0] != TCPOPT_ACCECN1))</div><div class='add'>+		return false;</div><div class='add'>+	order1 = (ptr[0] == TCPOPT_ACCECN1);</div><div class='add'>+	ptr += 2;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;saw_accecn_opt &lt; TCP_ACCECN_OPT_COUNTER_SEEN) {</div><div class='add'>+		tp-&gt;saw_accecn_opt = tcp_accecn_option_init(skb,</div><div class='add'>+							    tp-&gt;rx_opt.accecn);</div><div class='add'>+		if (tp-&gt;saw_accecn_opt == TCP_ACCECN_OPT_FAIL_SEEN)</div><div class='add'>+			tcp_accecn_fail_mode_set(tp, TCP_ACCECN_OPT_FAIL_RECV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = !!estimate_ecnfield;</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		u32 init_offset;</div><div class='add'>+		u8 ecnfield;</div><div class='add'>+		s32 delta;</div><div class='add'>+		u32 *cnt;</div><div class='add'>+</div><div class='add'>+		if (optlen &lt; TCPOLEN_ACCECN_PERFIELD)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ecnfield = tcp_accecn_optfield_to_ecnfield(i, order1);</div><div class='add'>+		init_offset = tcp_accecn_field_init_offset(ecnfield);</div><div class='add'>+		cnt = &amp;tp-&gt;delivered_ecn_bytes[ecnfield - 1];</div><div class='add'>+		delta = tcp_update_ecn_bytes(cnt, ptr, init_offset);</div><div class='add'>+		if (delta &amp;&amp; delta &lt; 0) {</div><div class='add'>+			res = false;</div><div class='add'>+			ambiguous_ecn_bytes_incr = true;</div><div class='add'>+		}</div><div class='add'>+		if (delta &amp;&amp; ecnfield != estimate_ecnfield) {</div><div class='add'>+			if (!first_changed) {</div><div class='add'>+				tp-&gt;est_ecnfield = ecnfield;</div><div class='add'>+				first_changed = true;</div><div class='add'>+			} else {</div><div class='add'>+				res = false;</div><div class='add'>+				ambiguous_ecn_bytes_incr = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		optlen -= TCPOLEN_ACCECN_PERFIELD;</div><div class='add'>+		ptr += TCPOLEN_ACCECN_PERFIELD;</div><div class='add'>+	}</div><div class='add'>+	if (ambiguous_ecn_bytes_incr)</div><div class='add'>+		tp-&gt;est_ecnfield = 0;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_ecn_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th)</div><div class='add'>+static void tcp_count_delivered_ce(struct tcp_sock *tp, u32 ecn_count)</div><div class='ctx'> {</div><div class='del'>-	if ((tp-&gt;ecn_flags &amp; TCP_ECN_OK) &amp;&amp; (!th-&gt;ece || th-&gt;cwr))</div><div class='del'>-		tp-&gt;ecn_flags &amp;= ~TCP_ECN_OK;</div><div class='add'>+	tp-&gt;delivered_ce += ecn_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th)</div><div class='add'>+/* Updates the delivered and delivered_ce counts */</div><div class='add'>+static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered,</div><div class='add'>+				bool ece_ack)</div><div class='ctx'> {</div><div class='del'>-	if ((tp-&gt;ecn_flags &amp; TCP_ECN_OK) &amp;&amp; (!th-&gt;ece || !th-&gt;cwr))</div><div class='del'>-		tp-&gt;ecn_flags &amp;= ~TCP_ECN_OK;</div><div class='add'>+	tp-&gt;delivered += delivered;</div><div class='add'>+	if (tcp_ecn_mode_rfc3168(tp) &amp;&amp; ece_ack)</div><div class='add'>+		tcp_count_delivered_ce(tp, delivered);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool tcp_ecn_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr *th)</div><div class='add'>+/* Returns the ECN CE delta */</div><div class='add'>+static u32 __tcp_accecn_process(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+				u32 delivered_pkts, u32 delivered_bytes,</div><div class='add'>+				int flag)</div><div class='ctx'> {</div><div class='del'>-	if (th-&gt;ece &amp;&amp; !th-&gt;syn &amp;&amp; (tp-&gt;ecn_flags &amp; TCP_ECN_OK))</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='add'>+	u32 old_ceb = tcp_sk(sk)-&gt;delivered_ecn_bytes[INET_ECN_CE - 1];</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 delta, safe_delta, d_ceb;</div><div class='add'>+	bool opt_deltas_valid;</div><div class='add'>+	u32 corrected_ace;</div><div class='add'>+</div><div class='add'>+	/* Reordered ACK or uncertain due to lack of data to send and ts */</div><div class='add'>+	if (!(flag &amp; (FLAG_FORWARD_PROGRESS | FLAG_TS_PROGRESS)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	opt_deltas_valid = tcp_accecn_process_option(tp, skb,</div><div class='add'>+						     delivered_bytes, flag);</div><div class='add'>+</div><div class='add'>+	if (!(flag &amp; FLAG_SLOWPATH)) {</div><div class='add'>+		/* AccECN counter might overflow on large ACKs */</div><div class='add'>+		if (delivered_pkts &lt;= TCP_ACCECN_CEP_ACE_MASK)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ACE field is not available during handshake */</div><div class='add'>+	if (flag &amp; FLAG_SYN_ACKED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;received_ce_pending &gt;= TCP_ACCECN_ACE_MAX_DELTA)</div><div class='add'>+		inet_csk(sk)-&gt;icsk_ack.pending |= ICSK_ACK_NOW;</div><div class='add'>+</div><div class='add'>+	corrected_ace = tcp_accecn_ace(th) - TCP_ACCECN_CEP_INIT_OFFSET;</div><div class='add'>+	delta = (corrected_ace - tp-&gt;delivered_ce) &amp; TCP_ACCECN_CEP_ACE_MASK;</div><div class='add'>+	if (delivered_pkts &lt;= TCP_ACCECN_CEP_ACE_MASK)</div><div class='add'>+		return delta;</div><div class='add'>+</div><div class='add'>+	safe_delta = delivered_pkts -</div><div class='add'>+		     ((delivered_pkts - delta) &amp; TCP_ACCECN_CEP_ACE_MASK);</div><div class='add'>+</div><div class='add'>+	if (opt_deltas_valid) {</div><div class='add'>+		d_ceb = tp-&gt;delivered_ecn_bytes[INET_ECN_CE - 1] - old_ceb;</div><div class='add'>+		if (!d_ceb)</div><div class='add'>+			return delta;</div><div class='add'>+</div><div class='add'>+		if ((delivered_pkts &gt;= (TCP_ACCECN_CEP_ACE_MASK + 1) * 2) &amp;&amp;</div><div class='add'>+		    (tcp_is_sack(tp) ||</div><div class='add'>+		     ((1 &lt;&lt; inet_csk(sk)-&gt;icsk_ca_state) &amp;</div><div class='add'>+		      (TCPF_CA_Open | TCPF_CA_CWR)))) {</div><div class='add'>+			u32 est_d_cep;</div><div class='add'>+</div><div class='add'>+			if (delivered_bytes &lt;= d_ceb)</div><div class='add'>+				return safe_delta;</div><div class='add'>+</div><div class='add'>+			est_d_cep = DIV_ROUND_UP_ULL((u64)d_ceb *</div><div class='add'>+						     delivered_pkts,</div><div class='add'>+						     delivered_bytes);</div><div class='add'>+			return min(safe_delta,</div><div class='add'>+				   delta +</div><div class='add'>+				   (est_d_cep &amp; ~TCP_ACCECN_CEP_ACE_MASK));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (d_ceb &gt; delta * tp-&gt;mss_cache)</div><div class='add'>+			return safe_delta;</div><div class='add'>+		if (d_ceb &lt;</div><div class='add'>+		    safe_delta * tp-&gt;mss_cache &gt;&gt; TCP_ACCECN_SAFETY_SHIFT)</div><div class='add'>+			return delta;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return safe_delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 tcp_accecn_process(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+			      u32 delivered_pkts, u32 delivered_bytes,</div><div class='add'>+			      int *flag)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 delta;</div><div class='add'>+</div><div class='add'>+	delta = __tcp_accecn_process(sk, skb, delivered_pkts,</div><div class='add'>+				     delivered_bytes, *flag);</div><div class='add'>+	if (delta &gt; 0) {</div><div class='add'>+		tcp_count_delivered_ce(tp, delta);</div><div class='add'>+		*flag |= FLAG_ECE;</div><div class='add'>+		/* Recalculate header predictor */</div><div class='add'>+		if (tp-&gt;pred_flags)</div><div class='add'>+			tcp_fast_path_on(tp);</div><div class='add'>+	}</div><div class='add'>+	return delta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Buffer size and advertised window tuning.</div><div class='hunk'>@@ -342,7 +601,7 @@ static void tcp_sndbuf_expand(struct sock *sk)</div><div class='ctx'> 	per_mss = roundup_pow_of_two(per_mss) +</div><div class='ctx'> 		  SKB_DATA_ALIGN(sizeof(struct sk_buff));</div><div class='ctx'> </div><div class='del'>-	nr_segs = max_t(u32, TCP_INIT_CWND, tp-&gt;snd_cwnd);</div><div class='add'>+	nr_segs = max_t(u32, TCP_INIT_CWND, tcp_snd_cwnd(tp));</div><div class='ctx'> 	nr_segs = max_t(u32, nr_segs, tp-&gt;reordering + 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Fast Recovery (RFC 5681 3.2) :</div><div class='hunk'>@@ -353,7 +612,8 @@ static void tcp_sndbuf_expand(struct sock *sk)</div><div class='ctx'> 	sndmem *= nr_segs * per_mss;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_sndbuf &lt; sndmem)</div><div class='del'>-		sk-&gt;sk_sndbuf = min(sndmem, sock_net(sk)-&gt;ipv4.sysctl_tcp_wmem[2]);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_sndbuf,</div><div class='add'>+			   min(sndmem, READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_wmem[2])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 2. Tuning advertised window (window_clamp, rcv_ssthresh)</div><div class='hunk'>@@ -382,12 +642,13 @@ static void tcp_sndbuf_expand(struct sock *sk)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Slow part of check#2. */</div><div class='del'>-static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+			     unsigned int skbtruesize)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	/* Optimize this! */</div><div class='del'>-	int truesize = tcp_win_from_space(sk, skb-&gt;truesize) &gt;&gt; 1;</div><div class='del'>-	int window = tcp_win_from_space(sk, sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]) &gt;&gt; 1;</div><div class='add'>+	int truesize = tcp_win_from_space(sk, skbtruesize) &gt;&gt; 1;</div><div class='add'>+	int window = tcp_win_from_space(sk, READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2])) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	while (tp-&gt;rcv_ssthresh &lt;= window) {</div><div class='ctx'> 		if (truesize &lt;= skb-&gt;len)</div><div class='hunk'>@@ -399,67 +660,74 @@ static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_grow_window(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+/* Even if skb appears to have a bad len/truesize ratio, TCP coalescing</div><div class='add'>+ * can play nice with us, as sk_buff and skb-&gt;head might be either</div><div class='add'>+ * freed or shared with up to MAX_SKB_FRAGS segments.</div><div class='add'>+ * Only give a boost to drivers using page frag(s) to hold the frame(s),</div><div class='add'>+ * and if no payload was pulled in skb-&gt;head before reaching us.</div><div class='add'>+ */</div><div class='add'>+static u32 truesize_adjust(bool adjust, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 truesize = skb-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	if (adjust &amp;&amp; !skb_headlen(skb)) {</div><div class='add'>+		truesize -= SKB_TRUESIZE(skb_end_offset(skb));</div><div class='add'>+		/* paranoid check, some drivers might be buggy */</div><div class='add'>+		if (unlikely((int)truesize &lt; (int)skb-&gt;len))</div><div class='add'>+			truesize = skb-&gt;truesize;</div><div class='add'>+	}</div><div class='add'>+	return truesize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_grow_window(struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+			    bool adjust)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int room;</div><div class='add'>+</div><div class='add'>+	room = min_t(int, tp-&gt;window_clamp, tcp_space(sk)) - tp-&gt;rcv_ssthresh;</div><div class='add'>+</div><div class='add'>+	if (room &lt;= 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Check #1 */</div><div class='del'>-	if (tp-&gt;rcv_ssthresh &lt; tp-&gt;window_clamp &amp;&amp;</div><div class='del'>-	    (int)tp-&gt;rcv_ssthresh &lt; tcp_space(sk) &amp;&amp;</div><div class='del'>-	    !tcp_under_memory_pressure(sk)) {</div><div class='add'>+	if (!tcp_under_memory_pressure(sk)) {</div><div class='add'>+		unsigned int truesize = truesize_adjust(adjust, skb);</div><div class='ctx'> 		int incr;</div><div class='ctx'> </div><div class='ctx'> 		/* Check #2. Increase window, if skb with such overhead</div><div class='ctx'> 		 * will fit to rcvbuf in future.</div><div class='ctx'> 		 */</div><div class='del'>-		if (tcp_win_from_space(sk, skb-&gt;truesize) &lt;= skb-&gt;len)</div><div class='add'>+		if (tcp_win_from_space(sk, truesize) &lt;= skb-&gt;len)</div><div class='ctx'> 			incr = 2 * tp-&gt;advmss;</div><div class='ctx'> 		else</div><div class='del'>-			incr = __tcp_grow_window(sk, skb);</div><div class='add'>+			incr = __tcp_grow_window(sk, skb, truesize);</div><div class='ctx'> </div><div class='ctx'> 		if (incr) {</div><div class='ctx'> 			incr = max_t(int, incr, 2 * skb-&gt;len);</div><div class='del'>-			tp-&gt;rcv_ssthresh = min(tp-&gt;rcv_ssthresh + incr,</div><div class='del'>-					       tp-&gt;window_clamp);</div><div class='add'>+			tp-&gt;rcv_ssthresh += min(room, incr);</div><div class='ctx'> 			inet_csk(sk)-&gt;icsk_ack.quick |= 1;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Under pressure:</div><div class='add'>+		 * Adjust rcv_ssthresh according to reserved mem</div><div class='add'>+		 */</div><div class='add'>+		tcp_adjust_rcv_ssthresh(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* 3. Tuning rcvbuf, when connection enters established state. */</div><div class='del'>-static void tcp_fixup_rcvbuf(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	u32 mss = tcp_sk(sk)-&gt;advmss;</div><div class='del'>-	int rcvmem;</div><div class='del'>-</div><div class='del'>-	rcvmem = 2 * SKB_TRUESIZE(mss + MAX_TCP_HEADER) *</div><div class='del'>-		 tcp_default_init_rwnd(mss);</div><div class='del'>-</div><div class='del'>-	/* Dynamic Right Sizing (DRS) has 2 to 3 RTT latency</div><div class='del'>-	 * Allow enough cushion so that sender is not limited by our window</div><div class='del'>-	 */</div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_moderate_rcvbuf)</div><div class='del'>-		rcvmem &lt;&lt;= 2;</div><div class='del'>-</div><div class='del'>-	if (sk-&gt;sk_rcvbuf &lt; rcvmem)</div><div class='del'>-		sk-&gt;sk_rcvbuf = min(rcvmem, sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 4. Try to fixup all. It is made immediately after connection enters</div><div class='add'>+/* 3. Try to fixup all. It is made immediately after connection enters</div><div class='ctx'>  *    established state.</div><div class='ctx'>  */</div><div class='del'>-void tcp_init_buffer_space(struct sock *sk)</div><div class='add'>+static void tcp_init_buffer_space(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	int tcp_app_win = sock_net(sk)-&gt;ipv4.sysctl_tcp_app_win;</div><div class='add'>+	int tcp_app_win = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_app_win);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int maxwin;</div><div class='ctx'> </div><div class='del'>-	if (!(sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK))</div><div class='del'>-		tcp_fixup_rcvbuf(sk);</div><div class='ctx'> 	if (!(sk-&gt;sk_userlocks &amp; SOCK_SNDBUF_LOCK))</div><div class='ctx'> 		tcp_sndbuf_expand(sk);</div><div class='ctx'> </div><div class='del'>-	tp-&gt;rcvq_space.space = tp-&gt;rcv_wnd;</div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='ctx'> 	tp-&gt;rcvq_space.time = tp-&gt;tcp_mstamp;</div><div class='ctx'> 	tp-&gt;rcvq_space.seq = tp-&gt;copied_seq;</div><div class='hunk'>@@ -467,39 +735,44 @@ void tcp_init_buffer_space(struct sock *sk)</div><div class='ctx'> 	maxwin = tcp_full_space(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;window_clamp &gt;= maxwin) {</div><div class='del'>-		tp-&gt;window_clamp = maxwin;</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp, maxwin);</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_app_win &amp;&amp; maxwin &gt; 4 * tp-&gt;advmss)</div><div class='del'>-			tp-&gt;window_clamp = max(maxwin -</div><div class='del'>-					       (maxwin &gt;&gt; tcp_app_win),</div><div class='del'>-					       4 * tp-&gt;advmss);</div><div class='add'>+			WRITE_ONCE(tp-&gt;window_clamp,</div><div class='add'>+				   max(maxwin - (maxwin &gt;&gt; tcp_app_win),</div><div class='add'>+				       4 * tp-&gt;advmss));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Force reservation of one segment. */</div><div class='ctx'> 	if (tcp_app_win &amp;&amp;</div><div class='ctx'> 	    tp-&gt;window_clamp &gt; 2 * tp-&gt;advmss &amp;&amp;</div><div class='ctx'> 	    tp-&gt;window_clamp + tp-&gt;advmss &gt; maxwin)</div><div class='del'>-		tp-&gt;window_clamp = max(2 * tp-&gt;advmss, maxwin - tp-&gt;advmss);</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp,</div><div class='add'>+			   max(2 * tp-&gt;advmss, maxwin - tp-&gt;advmss));</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rcv_ssthresh = min(tp-&gt;rcv_ssthresh, tp-&gt;window_clamp);</div><div class='ctx'> 	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='add'>+	tp-&gt;rcvq_space.space = min3(tp-&gt;rcv_ssthresh, tp-&gt;rcv_wnd,</div><div class='add'>+				    (u32)TCP_INIT_CWND * tp-&gt;advmss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* 5. Recalculate window clamp after socket hit its memory bounds. */</div><div class='add'>+/* 4. Recalculate window clamp after socket hit its memory bounds. */</div><div class='ctx'> static void tcp_clamp_window(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	int rmem2;</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_ack.quick = 0;</div><div class='add'>+	rmem2 = READ_ONCE(net-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_rcvbuf &lt; net-&gt;ipv4.sysctl_tcp_rmem[2] &amp;&amp;</div><div class='add'>+	if (sk-&gt;sk_rcvbuf &lt; rmem2 &amp;&amp;</div><div class='ctx'> 	    !(sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK) &amp;&amp;</div><div class='ctx'> 	    !tcp_under_memory_pressure(sk) &amp;&amp;</div><div class='ctx'> 	    sk_memory_allocated(sk) &lt; sk_prot_mem_limits(sk, 0)) {</div><div class='del'>-		sk-&gt;sk_rcvbuf = min(atomic_read(&amp;sk-&gt;sk_rmem_alloc),</div><div class='del'>-				    net-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_rcvbuf,</div><div class='add'>+			   min(atomic_read(&amp;sk-&gt;sk_rmem_alloc), rmem2));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt; sk-&gt;sk_rcvbuf)</div><div class='ctx'> 		tp-&gt;rcv_ssthresh = min(tp-&gt;window_clamp, 2U * tp-&gt;advmss);</div><div class='hunk'>@@ -523,13 +796,13 @@ void tcp_initialize_rcv_mss(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	inet_csk(sk)-&gt;icsk_ack.rcv_mss = hint;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_initialize_rcv_mss);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_initialize_rcv_mss);</div><div class='ctx'> </div><div class='ctx'> /* Receiver "autotuning" code.</div><div class='ctx'>  *</div><div class='ctx'>  * The algorithm for RTT estimation w/o timestamps is based on</div><div class='ctx'>  * Dynamic Right-Sizing (DRS) by Wu Feng and Mike Fisk of LANL.</div><div class='del'>- * &lt;http://public.lanl.gov/radiant/pubs.html#DRS&gt;</div><div class='add'>+ * &lt;https://public.lanl.gov/radiant/pubs.html#DRS&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * More detail on this code can be found at</div><div class='ctx'>  * &lt;http://staff.psc.edu/jheffner/&gt;,</div><div class='hunk'>@@ -538,10 +811,12 @@ EXPORT_SYMBOL(tcp_initialize_rcv_mss);</div><div class='ctx'>  */</div><div class='ctx'> static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)</div><div class='ctx'> {</div><div class='del'>-	u32 new_sample = tp-&gt;rcv_rtt_est.rtt_us;</div><div class='del'>-	long m = sample;</div><div class='add'>+	u32 new_sample, old_sample = tp-&gt;rcv_rtt_est.rtt_us;</div><div class='add'>+	long m = sample &lt;&lt; 3;</div><div class='ctx'> </div><div class='del'>-	if (new_sample != 0) {</div><div class='add'>+	if (old_sample == 0 || m &lt; old_sample) {</div><div class='add'>+		new_sample = m;</div><div class='add'>+	} else {</div><div class='ctx'> 		/* If we sample in larger samples in the non-timestamp</div><div class='ctx'> 		 * case, we could grossly overestimate the RTT especially</div><div class='ctx'> 		 * with chatty applications or bulk transfer apps which</div><div class='hunk'>@@ -552,17 +827,12 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)</div><div class='ctx'> 		 * else with timestamps disabled convergence takes too</div><div class='ctx'> 		 * long.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!win_dep) {</div><div class='del'>-			m -= (new_sample &gt;&gt; 3);</div><div class='del'>-			new_sample += m;</div><div class='del'>-		} else {</div><div class='del'>-			m &lt;&lt;= 3;</div><div class='del'>-			if (m &lt; new_sample)</div><div class='del'>-				new_sample = m;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* No previous measure. */</div><div class='del'>-		new_sample = m &lt;&lt; 3;</div><div class='add'>+		if (win_dep)</div><div class='add'>+			return;</div><div class='add'>+		/* Do not use this sample if receive queue is not empty. */</div><div class='add'>+		if (tp-&gt;rcv_nxt != tp-&gt;copied_seq)</div><div class='add'>+			return;</div><div class='add'>+		new_sample = old_sample - (old_sample &gt;&gt; 3) + sample;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rcv_rtt_est.rtt_us = new_sample;</div><div class='hunk'>@@ -586,6 +856,23 @@ new_measure:</div><div class='ctx'> 	tp-&gt;rcv_rtt_est.time = tp-&gt;tcp_mstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static s32 tcp_rtt_tsopt_us(const struct tcp_sock *tp, u32 min_delta)</div><div class='add'>+{</div><div class='add'>+	u32 delta, delta_us;</div><div class='add'>+</div><div class='add'>+	delta = tcp_time_stamp_ts(tp) - tp-&gt;rx_opt.rcv_tsecr;</div><div class='add'>+	if (tp-&gt;tcp_usec_ts)</div><div class='add'>+		return delta;</div><div class='add'>+</div><div class='add'>+	if (likely(delta &lt; INT_MAX / (USEC_PER_SEC / TCP_TS_HZ))) {</div><div class='add'>+		if (!delta)</div><div class='add'>+			delta = min_delta;</div><div class='add'>+		delta_us = delta * (USEC_PER_SEC / TCP_TS_HZ);</div><div class='add'>+		return delta_us;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,</div><div class='ctx'> 					  const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -597,16 +884,58 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;end_seq -</div><div class='ctx'> 	    TCP_SKB_CB(skb)-&gt;seq &gt;= inet_csk(sk)-&gt;icsk_ack.rcv_mss) {</div><div class='del'>-		u32 delta = tcp_time_stamp(tp) - tp-&gt;rx_opt.rcv_tsecr;</div><div class='del'>-		u32 delta_us;</div><div class='add'>+		s32 delta = tcp_rtt_tsopt_us(tp, 0);</div><div class='ctx'> </div><div class='del'>-		if (!delta)</div><div class='del'>-			delta = 1;</div><div class='del'>-		delta_us = delta * (USEC_PER_SEC / TCP_TS_HZ);</div><div class='del'>-		tcp_rcv_rtt_update(tp, delta_us, 0);</div><div class='add'>+		if (delta &gt; 0)</div><div class='add'>+			tcp_rcv_rtt_update(tp, delta, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tcp_rcvbuf_grow(struct sock *sk, u32 newval)</div><div class='add'>+{</div><div class='add'>+	const struct net *net = sock_net(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 rcvwin, rcvbuf, cap, oldval;</div><div class='add'>+	u32 rtt_threshold, rtt_us;</div><div class='add'>+	u64 grow;</div><div class='add'>+</div><div class='add'>+	oldval = tp-&gt;rcvq_space.space;</div><div class='add'>+	tp-&gt;rcvq_space.space = newval;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_moderate_rcvbuf) ||</div><div class='add'>+	    (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* DRS is always one RTT late. */</div><div class='add'>+	rcvwin = newval &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	rtt_us = tp-&gt;rcv_rtt_est.rtt_us &gt;&gt; 3;</div><div class='add'>+	rtt_threshold = READ_ONCE(net-&gt;ipv4.sysctl_tcp_rcvbuf_low_rtt);</div><div class='add'>+	if (rtt_us &lt; rtt_threshold) {</div><div class='add'>+		/* For small RTT, we set @grow to rcvwin * rtt_us/rtt_threshold.</div><div class='add'>+		 * It might take few additional ms to reach 'line rate',</div><div class='add'>+		 * but will avoid sk_rcvbuf inflation and poor cache use.</div><div class='add'>+		 */</div><div class='add'>+		grow = div_u64((u64)rcvwin * rtt_us, rtt_threshold);</div><div class='add'>+	} else {</div><div class='add'>+		/* slow start: allow the sender to double its rate. */</div><div class='add'>+		grow = div_u64(((u64)rcvwin &lt;&lt; 1) * (newval - oldval), oldval);</div><div class='add'>+	}</div><div class='add'>+	rcvwin += grow;</div><div class='add'>+</div><div class='add'>+	if (!RB_EMPTY_ROOT(&amp;tp-&gt;out_of_order_queue))</div><div class='add'>+		rcvwin += TCP_SKB_CB(tp-&gt;ooo_last_skb)-&gt;end_seq - tp-&gt;rcv_nxt;</div><div class='add'>+</div><div class='add'>+	cap = READ_ONCE(net-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='add'>+</div><div class='add'>+	rcvbuf = min_t(u32, tcp_space_from_win(sk, rcvwin), cap);</div><div class='add'>+	if (rcvbuf &gt; sk-&gt;sk_rcvbuf) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_rcvbuf, rcvbuf);</div><div class='add'>+		/* Make the window clamp follow along.  */</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp,</div><div class='add'>+			   tcp_win_from_space(sk, rcvbuf));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * This function should be called every time data is copied to user space.</div><div class='ctx'>  * It calculates the appropriate TCP receive buffer space.</div><div class='hunk'>@@ -614,66 +943,48 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,</div><div class='ctx'> void tcp_rcv_space_adjust(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	u32 copied;</div><div class='del'>-	int time;</div><div class='add'>+	int time, inq, copied;</div><div class='ctx'> </div><div class='ctx'> 	trace_tcp_rcv_space_adjust(sk);</div><div class='ctx'> </div><div class='del'>-	tcp_mstamp_refresh(tp);</div><div class='add'>+	if (unlikely(!tp-&gt;rcv_rtt_est.rtt_us))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We do not refresh tp-&gt;tcp_mstamp here.</div><div class='add'>+	 * Some platforms have expensive ktime_get() implementations.</div><div class='add'>+	 * Using the last cached value is enough for DRS.</div><div class='add'>+	 */</div><div class='ctx'> 	time = tcp_stamp_us_delta(tp-&gt;tcp_mstamp, tp-&gt;rcvq_space.time);</div><div class='del'>-	if (time &lt; (tp-&gt;rcv_rtt_est.rtt_us &gt;&gt; 3) || tp-&gt;rcv_rtt_est.rtt_us == 0)</div><div class='add'>+	if (time &lt; (tp-&gt;rcv_rtt_est.rtt_us &gt;&gt; 3))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Number of bytes copied to user in last RTT */</div><div class='ctx'> 	copied = tp-&gt;copied_seq - tp-&gt;rcvq_space.seq;</div><div class='add'>+	/* Number of bytes in receive queue. */</div><div class='add'>+	inq = tp-&gt;rcv_nxt - tp-&gt;copied_seq;</div><div class='add'>+	copied -= inq;</div><div class='ctx'> 	if (copied &lt;= tp-&gt;rcvq_space.space)</div><div class='ctx'> 		goto new_measure;</div><div class='ctx'> </div><div class='del'>-	/* A bit of theory :</div><div class='del'>-	 * copied = bytes received in previous RTT, our base window</div><div class='del'>-	 * To cope with packet losses, we need a 2x factor</div><div class='del'>-	 * To cope with slow start, and sender growing its cwin by 100 %</div><div class='del'>-	 * every RTT, we need a 4x factor, because the ACK we are sending</div><div class='del'>-	 * now is for the next RTT, not the current one :</div><div class='del'>-	 * &lt;prev RTT . &gt;&lt;current RTT .. &gt;&lt;next RTT .... &gt;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_moderate_rcvbuf &amp;&amp;</div><div class='del'>-	    !(sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK)) {</div><div class='del'>-		int rcvmem, rcvbuf;</div><div class='del'>-		u64 rcvwin, grow;</div><div class='del'>-</div><div class='del'>-		/* minimal window to cope with packet losses, assuming</div><div class='del'>-		 * steady state. Add some cushion because of small variations.</div><div class='del'>-		 */</div><div class='del'>-		rcvwin = ((u64)copied &lt;&lt; 1) + 16 * tp-&gt;advmss;</div><div class='add'>+	trace_tcp_rcvbuf_grow(sk, time);</div><div class='ctx'> </div><div class='del'>-		/* Accommodate for sender rate increase (eg. slow start) */</div><div class='del'>-		grow = rcvwin * (copied - tp-&gt;rcvq_space.space);</div><div class='del'>-		do_div(grow, tp-&gt;rcvq_space.space);</div><div class='del'>-		rcvwin += (grow &lt;&lt; 1);</div><div class='del'>-</div><div class='del'>-		rcvmem = SKB_TRUESIZE(tp-&gt;advmss + MAX_TCP_HEADER);</div><div class='del'>-		while (tcp_win_from_space(sk, rcvmem) &lt; tp-&gt;advmss)</div><div class='del'>-			rcvmem += 128;</div><div class='del'>-</div><div class='del'>-		do_div(rcvwin, tp-&gt;advmss);</div><div class='del'>-		rcvbuf = min_t(u64, rcvwin * rcvmem,</div><div class='del'>-			       sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='del'>-		if (rcvbuf &gt; sk-&gt;sk_rcvbuf) {</div><div class='del'>-			sk-&gt;sk_rcvbuf = rcvbuf;</div><div class='del'>-</div><div class='del'>-			/* Make the window clamp follow along.  */</div><div class='del'>-			tp-&gt;window_clamp = tcp_win_from_space(sk, rcvbuf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	tp-&gt;rcvq_space.space = copied;</div><div class='add'>+	tcp_rcvbuf_grow(sk, copied);</div><div class='ctx'> </div><div class='ctx'> new_measure:</div><div class='ctx'> 	tp-&gt;rcvq_space.seq = tp-&gt;copied_seq;</div><div class='ctx'> 	tp-&gt;rcvq_space.time = tp-&gt;tcp_mstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_save_lrcv_flowlabel(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		icsk-&gt;icsk_ack.lrcv_flowlabel = ntohl(ip6_flowlabel(ipv6_hdr(skb)));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* There is something which you must keep in mind when you analyze the</div><div class='ctx'>  * behavior of the tp-&gt;ato delayed ack timeout interval.  When a</div><div class='ctx'>  * connection starts up, we want to ack as quickly as possible.  The</div><div class='hunk'>@@ -719,15 +1030,15 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			 * restart window, so that we send ACKs quickly.</div><div class='ctx'> 			 */</div><div class='ctx'> 			tcp_incr_quickack(sk, TCP_MAX_QUICKACKS);</div><div class='del'>-			sk_mem_reclaim(sk);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	icsk-&gt;icsk_ack.lrcvtime = now;</div><div class='add'>+	tcp_save_lrcv_flowlabel(sk, skb);</div><div class='ctx'> </div><div class='del'>-	tcp_ecn_check_ce(sk, skb);</div><div class='add'>+	tcp_data_ecn_check(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &gt;= 128)</div><div class='del'>-		tcp_grow_window(sk, skb);</div><div class='add'>+		tcp_grow_window(sk, skb, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called to compute a smoothed rtt estimate. The data fed to this</div><div class='hunk'>@@ -791,6 +1102,8 @@ static void tcp_rtt_estimator(struct sock *sk, long mrtt_us)</div><div class='ctx'> 				tp-&gt;rttvar_us -= (tp-&gt;rttvar_us - tp-&gt;mdev_max_us) &gt;&gt; 2;</div><div class='ctx'> 			tp-&gt;rtt_seq = tp-&gt;snd_nxt;</div><div class='ctx'> 			tp-&gt;mdev_max_us = tcp_rto_min_us(sk);</div><div class='add'>+</div><div class='add'>+			tcp_bpf_rtt(sk, mrtt_us, srtt);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* no previous measure. */</div><div class='hunk'>@@ -799,11 +1112,13 @@ static void tcp_rtt_estimator(struct sock *sk, long mrtt_us)</div><div class='ctx'> 		tp-&gt;rttvar_us = max(tp-&gt;mdev_us, tcp_rto_min_us(sk));</div><div class='ctx'> 		tp-&gt;mdev_max_us = tp-&gt;rttvar_us;</div><div class='ctx'> 		tp-&gt;rtt_seq = tp-&gt;snd_nxt;</div><div class='add'>+</div><div class='add'>+		tcp_bpf_rtt(sk, mrtt_us, srtt);</div><div class='ctx'> 	}</div><div class='ctx'> 	tp-&gt;srtt_us = max(1U, srtt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_update_pacing_rate(struct sock *sk)</div><div class='add'>+void tcp_update_pacing_rate(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u64 rate;</div><div class='hunk'>@@ -819,12 +1134,12 @@ static void tcp_update_pacing_rate(struct sock *sk)</div><div class='ctx'> 	 *	 If snd_cwnd &gt;= (tp-&gt;snd_ssthresh / 2), we are approaching</div><div class='ctx'> 	 *	 end of slow start and should slow down.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tp-&gt;snd_cwnd &lt; tp-&gt;snd_ssthresh / 2)</div><div class='del'>-		rate *= sock_net(sk)-&gt;ipv4.sysctl_tcp_pacing_ss_ratio;</div><div class='add'>+	if (tcp_snd_cwnd(tp) &lt; tp-&gt;snd_ssthresh / 2)</div><div class='add'>+		rate *= READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_pacing_ss_ratio);</div><div class='ctx'> 	else</div><div class='del'>-		rate *= sock_net(sk)-&gt;ipv4.sysctl_tcp_pacing_ca_ratio;</div><div class='add'>+		rate *= READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_pacing_ca_ratio);</div><div class='ctx'> </div><div class='del'>-	rate *= max(tp-&gt;snd_cwnd, tp-&gt;packets_out);</div><div class='add'>+	rate *= max(tcp_snd_cwnd(tp), tp-&gt;packets_out);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(tp-&gt;srtt_us))</div><div class='ctx'> 		do_div(rate, tp-&gt;srtt_us);</div><div class='hunk'>@@ -833,14 +1148,14 @@ static void tcp_update_pacing_rate(struct sock *sk)</div><div class='ctx'> 	 * without any lock. We want to make sure compiler wont store</div><div class='ctx'> 	 * intermediate values in this location.</div><div class='ctx'> 	 */</div><div class='del'>-	WRITE_ONCE(sk-&gt;sk_pacing_rate, min_t(u64, rate,</div><div class='del'>-					     sk-&gt;sk_max_pacing_rate));</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_pacing_rate,</div><div class='add'>+		   min_t(u64, rate, READ_ONCE(sk-&gt;sk_max_pacing_rate)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Calculate rto without backoff.  This is the second half of Van Jacobson's</div><div class='ctx'>  * routine referred to above.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_set_rto(struct sock *sk)</div><div class='add'>+void tcp_set_rto(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	/* Old crap is replaced with new one. 8)</div><div class='hunk'>@@ -876,12 +1191,64 @@ __u32 tcp_init_cwnd(const struct tcp_sock *tp, const struct dst_entry *dst)</div><div class='ctx'> 	return min_t(__u32, cwnd, tp-&gt;snd_cwnd_clamp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Take a notice that peer is sending D-SACKs */</div><div class='del'>-static void tcp_dsack_seen(struct tcp_sock *tp)</div><div class='add'>+struct tcp_sacktag_state {</div><div class='add'>+	/* Timestamps for earliest and latest never-retransmitted segment</div><div class='add'>+	 * that was SACKed. RTO needs the earliest RTT to stay conservative,</div><div class='add'>+	 * but congestion control should still get an accurate delay signal.</div><div class='add'>+	 */</div><div class='add'>+	u64	first_sackt;</div><div class='add'>+	u64	last_sackt;</div><div class='add'>+	u32	reord;</div><div class='add'>+	u32	sack_delivered;</div><div class='add'>+	u32	delivered_bytes;</div><div class='add'>+	int	flag;</div><div class='add'>+	unsigned int mss_now;</div><div class='add'>+	struct rate_sample *rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Take a notice that peer is sending D-SACKs. Skip update of data delivery</div><div class='add'>+ * and spurious retransmission information if this DSACK is unlikely caused by</div><div class='add'>+ * sender's action:</div><div class='add'>+ * - DSACKed sequence range is larger than maximum receiver's window.</div><div class='add'>+ * - Total no. of DSACKed segments exceed the total no. of retransmitted segs.</div><div class='add'>+ */</div><div class='add'>+static u32 tcp_dsack_seen(struct tcp_sock *tp, u32 start_seq,</div><div class='add'>+			  u32 end_seq, struct tcp_sacktag_state *state)</div><div class='ctx'> {</div><div class='add'>+	u32 seq_len, dup_segs = 1;</div><div class='add'>+</div><div class='add'>+	if (!before(start_seq, end_seq))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	seq_len = end_seq - start_seq;</div><div class='add'>+	/* Dubious DSACK: DSACKed range greater than maximum advertised rwnd */</div><div class='add'>+	if (seq_len &gt; tp-&gt;max_window)</div><div class='add'>+		return 0;</div><div class='add'>+	if (seq_len &gt; tp-&gt;mss_cache)</div><div class='add'>+		dup_segs = DIV_ROUND_UP(seq_len, tp-&gt;mss_cache);</div><div class='add'>+	else if (tp-&gt;tlp_high_seq &amp;&amp; tp-&gt;tlp_high_seq == end_seq)</div><div class='add'>+		state-&gt;flag |= FLAG_DSACK_TLP;</div><div class='add'>+</div><div class='add'>+	tp-&gt;dsack_dups += dup_segs;</div><div class='add'>+	/* Skip the DSACK if dup segs weren't retransmitted by sender */</div><div class='add'>+	if (tp-&gt;dsack_dups &gt; tp-&gt;total_retrans)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;rx_opt.sack_ok |= TCP_DSACK_SEEN;</div><div class='del'>-	tp-&gt;rack.dsack_seen = 1;</div><div class='del'>-	tp-&gt;dsack_dups++;</div><div class='add'>+	/* We increase the RACK ordering window in rounds where we receive</div><div class='add'>+	 * DSACKs that may have been due to reordering causing RACK to trigger</div><div class='add'>+	 * a spurious fast recovery. Thus RACK ignores DSACKs that happen</div><div class='add'>+	 * without having seen reordering, or that match TLP probes (TLP</div><div class='add'>+	 * is timer-driven, not triggered by RACK).</div><div class='add'>+	 */</div><div class='add'>+	if (tp-&gt;reord_seen &amp;&amp; !(state-&gt;flag &amp; FLAG_DSACK_TLP))</div><div class='add'>+		tp-&gt;rack.dsack_seen = 1;</div><div class='add'>+</div><div class='add'>+	state-&gt;flag |= FLAG_DSACKING_ACK;</div><div class='add'>+	/* A spurious retransmission is delivered */</div><div class='add'>+	state-&gt;sack_delivered += dup_segs;</div><div class='add'>+</div><div class='add'>+	return dup_segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* It's reordering when higher sequence was delivered (i.e. sacked) before</div><div class='hunk'>@@ -910,7 +1277,7 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq,</div><div class='ctx'> 			 tp-&gt;undo_marker ? tp-&gt;undo_retrans : 0);</div><div class='ctx'> #endif</div><div class='ctx'> 		tp-&gt;reordering = min_t(u32, (metric + mss - 1) / mss,</div><div class='del'>-				       sock_net(sk)-&gt;ipv4.sysctl_tcp_max_reordering);</div><div class='add'>+				       READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_max_reordering));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This exciting event is worth to be remembered. 8) */</div><div class='hunk'>@@ -919,50 +1286,50 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq,</div><div class='ctx'> 		      ts ? LINUX_MIB_TCPTSREORDER : LINUX_MIB_TCPSACKREORDER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This must be called before lost_out is incremented */</div><div class='add'>+ /* This must be called before lost_out or retrans_out are updated</div><div class='add'>+  * on a new loss, because we want to know if all skbs previously</div><div class='add'>+  * known to be lost have already been retransmitted, indicating</div><div class='add'>+  * that this newly lost skb is our next skb to retransmit.</div><div class='add'>+  */</div><div class='ctx'> static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (!tp-&gt;retransmit_skb_hint ||</div><div class='del'>-	    before(TCP_SKB_CB(skb)-&gt;seq,</div><div class='del'>-		   TCP_SKB_CB(tp-&gt;retransmit_skb_hint)-&gt;seq))</div><div class='add'>+	if ((!tp-&gt;retransmit_skb_hint &amp;&amp; tp-&gt;retrans_out &gt;= tp-&gt;lost_out) ||</div><div class='add'>+	    (tp-&gt;retransmit_skb_hint &amp;&amp;</div><div class='add'>+	     before(TCP_SKB_CB(skb)-&gt;seq,</div><div class='add'>+		    TCP_SKB_CB(tp-&gt;retransmit_skb_hint)-&gt;seq)))</div><div class='ctx'> 		tp-&gt;retransmit_skb_hint = skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Sum the number of packets on the wire we have marked as lost.</div><div class='del'>- * There are two cases we care about here:</div><div class='del'>- * a) Packet hasn't been marked lost (nor retransmitted),</div><div class='del'>- *    and this is the first loss.</div><div class='del'>- * b) Packet has been marked both lost and retransmitted,</div><div class='del'>- *    and this means we think it was lost again.</div><div class='add'>+/* Sum the number of packets on the wire we have marked as lost, and</div><div class='add'>+ * notify the congestion control module that the given skb was marked lost.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_sum_lost(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='add'>+static void tcp_notify_skb_loss_event(struct tcp_sock *tp, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__u8 sacked = TCP_SKB_CB(skb)-&gt;sacked;</div><div class='del'>-</div><div class='del'>-	if (!(sacked &amp; TCPCB_LOST) ||</div><div class='del'>-	    ((sacked &amp; TCPCB_LOST) &amp;&amp; (sacked &amp; TCPCB_SACKED_RETRANS)))</div><div class='del'>-		tp-&gt;lost += tcp_skb_pcount(skb);</div><div class='add'>+	tp-&gt;lost += tcp_skb_pcount(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_skb_mark_lost(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='add'>+void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (!(TCP_SKB_CB(skb)-&gt;sacked &amp; (TCPCB_LOST|TCPCB_SACKED_ACKED))) {</div><div class='del'>-		tcp_verify_retransmit_hint(tp, skb);</div><div class='add'>+	__u8 sacked = TCP_SKB_CB(skb)-&gt;sacked;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-		tp-&gt;lost_out += tcp_skb_pcount(skb);</div><div class='del'>-		tcp_sum_lost(tp, skb);</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;sacked |= TCPCB_LOST;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	if (sacked &amp; TCPCB_SACKED_ACKED)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='del'>-{</div><div class='ctx'> 	tcp_verify_retransmit_hint(tp, skb);</div><div class='del'>-</div><div class='del'>-	tcp_sum_lost(tp, skb);</div><div class='del'>-	if (!(TCP_SKB_CB(skb)-&gt;sacked &amp; (TCPCB_LOST|TCPCB_SACKED_ACKED))) {</div><div class='add'>+	if (sacked &amp; TCPCB_LOST) {</div><div class='add'>+		if (sacked &amp; TCPCB_SACKED_RETRANS) {</div><div class='add'>+			/* Account for retransmits that are lost again */</div><div class='add'>+			TCP_SKB_CB(skb)-&gt;sacked &amp;= ~TCPCB_SACKED_RETRANS;</div><div class='add'>+			tp-&gt;retrans_out -= tcp_skb_pcount(skb);</div><div class='add'>+			NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT,</div><div class='add'>+				      tcp_skb_pcount(skb));</div><div class='add'>+			tcp_notify_skb_loss_event(tp, skb);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		tp-&gt;lost_out += tcp_skb_pcount(skb);</div><div class='ctx'> 		TCP_SKB_CB(skb)-&gt;sacked |= TCPCB_LOST;</div><div class='add'>+		tcp_notify_skb_loss_event(tp, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -981,7 +1348,7 @@ void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='ctx'>  * L|R	1		- orig is lost, retransmit is in flight.</div><div class='ctx'>  * S|R  1		- orig reached receiver, retrans is still in flight.</div><div class='ctx'>  * (L|S|R is logically valid, it could occur when L|R is sacked,</div><div class='del'>- *  but it is equivalent to plain S and code short-curcuits it to S.</div><div class='add'>+ *  but it is equivalent to plain S and code short-circuits it to S.</div><div class='ctx'>  *  L|S is logically invalid, it would mean -1 packet in flight 8))</div><div class='ctx'>  *</div><div class='ctx'>  * These 6 states form finite state machine, controlled by the following events:</div><div class='hunk'>@@ -1098,52 +1465,43 @@ static bool tcp_is_sackblock_valid(struct tcp_sock *tp, bool is_dsack,</div><div class='ctx'> </div><div class='ctx'> static bool tcp_check_dsack(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> 			    struct tcp_sack_block_wire *sp, int num_sacks,</div><div class='del'>-			    u32 prior_snd_una)</div><div class='add'>+			    u32 prior_snd_una, struct tcp_sacktag_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 start_seq_0 = get_unaligned_be32(&amp;sp[0].start_seq);</div><div class='ctx'> 	u32 end_seq_0 = get_unaligned_be32(&amp;sp[0].end_seq);</div><div class='del'>-	bool dup_sack = false;</div><div class='add'>+	u32 dup_segs;</div><div class='ctx'> </div><div class='ctx'> 	if (before(start_seq_0, TCP_SKB_CB(ack_skb)-&gt;ack_seq)) {</div><div class='del'>-		dup_sack = true;</div><div class='del'>-		tcp_dsack_seen(tp);</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDSACKRECV);</div><div class='ctx'> 	} else if (num_sacks &gt; 1) {</div><div class='ctx'> 		u32 end_seq_1 = get_unaligned_be32(&amp;sp[1].end_seq);</div><div class='ctx'> 		u32 start_seq_1 = get_unaligned_be32(&amp;sp[1].start_seq);</div><div class='ctx'> </div><div class='del'>-		if (!after(end_seq_0, end_seq_1) &amp;&amp;</div><div class='del'>-		    !before(start_seq_0, start_seq_1)) {</div><div class='del'>-			dup_sack = true;</div><div class='del'>-			tcp_dsack_seen(tp);</div><div class='del'>-			NET_INC_STATS(sock_net(sk),</div><div class='del'>-					LINUX_MIB_TCPDSACKOFORECV);</div><div class='del'>-		}</div><div class='add'>+		if (after(end_seq_0, end_seq_1) || before(start_seq_0, start_seq_1))</div><div class='add'>+			return false;</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDSACKOFORECV);</div><div class='add'>+	} else {</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dup_segs = tcp_dsack_seen(tp, start_seq_0, end_seq_0, state);</div><div class='add'>+	if (!dup_segs) {	/* Skip dubious DSACK */</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDSACKIGNOREDDUBIOUS);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPDSACKRECVSEGS, dup_segs);</div><div class='add'>+</div><div class='ctx'> 	/* D-SACK for already forgotten data... Do dumb counting. */</div><div class='del'>-	if (dup_sack &amp;&amp; tp-&gt;undo_marker &amp;&amp; tp-&gt;undo_retrans &gt; 0 &amp;&amp;</div><div class='add'>+	if (tp-&gt;undo_marker &amp;&amp; tp-&gt;undo_retrans &gt; 0 &amp;&amp;</div><div class='ctx'> 	    !after(end_seq_0, prior_snd_una) &amp;&amp;</div><div class='ctx'> 	    after(end_seq_0, tp-&gt;undo_marker))</div><div class='del'>-		tp-&gt;undo_retrans--;</div><div class='add'>+		tp-&gt;undo_retrans = max_t(int, 0, tp-&gt;undo_retrans - dup_segs);</div><div class='ctx'> </div><div class='del'>-	return dup_sack;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct tcp_sacktag_state {</div><div class='del'>-	u32	reord;</div><div class='del'>-	/* Timestamps for earliest and latest never-retransmitted segment</div><div class='del'>-	 * that was SACKed. RTO needs the earliest RTT to stay conservative,</div><div class='del'>-	 * but congestion control should still get an accurate delay signal.</div><div class='del'>-	 */</div><div class='del'>-	u64	first_sackt;</div><div class='del'>-	u64	last_sackt;</div><div class='del'>-	struct rate_sample *rate;</div><div class='del'>-	int	flag;</div><div class='del'>-	unsigned int mss_now;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Check if skb is fully within the SACK block. In presence of GSO skbs,</div><div class='ctx'>  * the incoming SACK may not exactly match but we can find smaller MSS</div><div class='ctx'>  * aligned portion of it that matches. Therefore we might need to fragment</div><div class='hunk'>@@ -1204,7 +1562,7 @@ static int tcp_match_skb_to_sack(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> static u8 tcp_sacktag_one(struct sock *sk,</div><div class='ctx'> 			  struct tcp_sacktag_state *state, u8 sacked,</div><div class='ctx'> 			  u32 start_seq, u32 end_seq,</div><div class='del'>-			  int dup_sack, int pcount,</div><div class='add'>+			  int dup_sack, int pcount, u32 plen,</div><div class='ctx'> 			  u64 xmit_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -1213,7 +1571,7 @@ static u8 tcp_sacktag_one(struct sock *sk,</div><div class='ctx'> 	if (dup_sack &amp;&amp; (sacked &amp; TCPCB_RETRANS)) {</div><div class='ctx'> 		if (tp-&gt;undo_marker &amp;&amp; tp-&gt;undo_retrans &gt; 0 &amp;&amp;</div><div class='ctx'> 		    after(end_seq, tp-&gt;undo_marker))</div><div class='del'>-			tp-&gt;undo_retrans--;</div><div class='add'>+			tp-&gt;undo_retrans = max_t(int, 0, tp-&gt;undo_retrans - pcount);</div><div class='ctx'> 		if ((sacked &amp; TCPCB_SACKED_ACKED) &amp;&amp;</div><div class='ctx'> 		    before(start_seq, state-&gt;reord))</div><div class='ctx'> 				state-&gt;reord = start_seq;</div><div class='hunk'>@@ -1262,12 +1620,9 @@ static u8 tcp_sacktag_one(struct sock *sk,</div><div class='ctx'> 		sacked |= TCPCB_SACKED_ACKED;</div><div class='ctx'> 		state-&gt;flag |= FLAG_DATA_SACKED;</div><div class='ctx'> 		tp-&gt;sacked_out += pcount;</div><div class='del'>-		tp-&gt;delivered += pcount;  /* Out-of-order packets delivered */</div><div class='del'>-</div><div class='del'>-		/* Lost marker hint past SACKed? Tweak RFC3517 cnt */</div><div class='del'>-		if (tp-&gt;lost_skb_hint &amp;&amp;</div><div class='del'>-		    before(start_seq, TCP_SKB_CB(tp-&gt;lost_skb_hint)-&gt;seq))</div><div class='del'>-			tp-&gt;lost_cnt_hint += pcount;</div><div class='add'>+		/* Out-of-order packets delivered */</div><div class='add'>+		state-&gt;sack_delivered += pcount;</div><div class='add'>+		state-&gt;delivered_bytes += plen;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* D-SACK. We can detect redundant retransmission in S|R and plain R</div><div class='hunk'>@@ -1304,18 +1659,15 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *prev,</div><div class='ctx'> 	 * tcp_highest_sack_seq() when skb is highest_sack.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tcp_sacktag_one(sk, state, TCP_SKB_CB(skb)-&gt;sacked,</div><div class='del'>-			start_seq, end_seq, dup_sack, pcount,</div><div class='del'>-			skb-&gt;skb_mstamp);</div><div class='add'>+			start_seq, end_seq, dup_sack, pcount, skb-&gt;len,</div><div class='add'>+			tcp_skb_timestamp_us(skb));</div><div class='ctx'> 	tcp_rate_skb_delivered(sk, skb, state-&gt;rate);</div><div class='ctx'> </div><div class='del'>-	if (skb == tp-&gt;lost_skb_hint)</div><div class='del'>-		tp-&gt;lost_cnt_hint += pcount;</div><div class='del'>-</div><div class='ctx'> 	TCP_SKB_CB(prev)-&gt;end_seq += shifted;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;seq += shifted;</div><div class='ctx'> </div><div class='ctx'> 	tcp_skb_pcount_add(prev, pcount);</div><div class='del'>-	BUG_ON(tcp_skb_pcount(skb) &lt; pcount);</div><div class='add'>+	WARN_ON_ONCE(tcp_skb_pcount(skb) &lt; pcount);</div><div class='ctx'> 	tcp_skb_pcount_add(skb, -pcount);</div><div class='ctx'> </div><div class='ctx'> 	/* When we're adding to gso_segs == 1, gso_size will be zero,</div><div class='hunk'>@@ -1343,10 +1695,6 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *prev,</div><div class='ctx'> </div><div class='ctx'> 	if (skb == tp-&gt;retransmit_skb_hint)</div><div class='ctx'> 		tp-&gt;retransmit_skb_hint = prev;</div><div class='del'>-	if (skb == tp-&gt;lost_skb_hint) {</div><div class='del'>-		tp-&gt;lost_skb_hint = prev;</div><div class='del'>-		tp-&gt;lost_cnt_hint -= tcp_skb_pcount(prev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(prev)-&gt;tcp_flags |= TCP_SKB_CB(skb)-&gt;tcp_flags;</div><div class='ctx'> 	TCP_SKB_CB(prev)-&gt;eor = TCP_SKB_CB(skb)-&gt;eor;</div><div class='hunk'>@@ -1381,6 +1729,21 @@ static int skb_can_shift(const struct sk_buff *skb)</div><div class='ctx'> 	return !skb_headlen(skb) &amp;&amp; skb_is_nonlinear(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from,</div><div class='add'>+		  int pcount, int shiftlen)</div><div class='add'>+{</div><div class='add'>+	/* TCP min gso_size is 8 bytes (TCP_MIN_GSO_SIZE)</div><div class='add'>+	 * Since TCP_SKB_CB(skb)-&gt;tcp_gso_segs is 16 bits, we need</div><div class='add'>+	 * to make sure not storing more than 65535 * 8 bytes per skb,</div><div class='add'>+	 * even if current MSS is bigger.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(to-&gt;len + shiftlen &gt;= 65535 * TCP_MIN_GSO_SIZE))</div><div class='add'>+		return 0;</div><div class='add'>+	if (unlikely(tcp_skb_pcount(to) + pcount &gt; 65535))</div><div class='add'>+		return 0;</div><div class='add'>+	return skb_shift(to, from, shiftlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Try collapsing SACK blocks spanning across multiple skbs to a single</div><div class='ctx'>  * skb.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1414,7 +1777,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	if ((TCP_SKB_CB(prev)-&gt;sacked &amp; TCPCB_TAGBITS) != TCPCB_SACKED_ACKED)</div><div class='ctx'> 		goto fallback;</div><div class='ctx'> </div><div class='del'>-	if (!tcp_skb_can_collapse_to(prev))</div><div class='add'>+	if (!tcp_skb_can_collapse(prev, skb))</div><div class='ctx'> 		goto fallback;</div><div class='ctx'> </div><div class='ctx'> 	in_sack = !after(start_seq, TCP_SKB_CB(skb)-&gt;seq) &amp;&amp;</div><div class='hunk'>@@ -1486,7 +1849,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	if (!after(TCP_SKB_CB(skb)-&gt;seq + len, tp-&gt;snd_una))</div><div class='ctx'> 		goto fallback;</div><div class='ctx'> </div><div class='del'>-	if (!skb_shift(prev, skb, len))</div><div class='add'>+	if (!tcp_skb_shift(prev, skb, pcount, len))</div><div class='ctx'> 		goto fallback;</div><div class='ctx'> 	if (!tcp_shifted_skb(sk, prev, skb, state, pcount, len, mss, dup_sack))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1503,12 +1866,13 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	    (mss != tcp_skb_seglen(skb)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (!tcp_skb_can_collapse(prev, skb))</div><div class='add'>+		goto out;</div><div class='ctx'> 	len = skb-&gt;len;</div><div class='del'>-	if (skb_shift(prev, skb, len)) {</div><div class='del'>-		pcount += tcp_skb_pcount(skb);</div><div class='del'>-		tcp_shifted_skb(sk, prev, skb, state, tcp_skb_pcount(skb),</div><div class='add'>+	pcount = tcp_skb_pcount(skb);</div><div class='add'>+	if (tcp_skb_shift(prev, skb, pcount, len))</div><div class='add'>+		tcp_shifted_skb(sk, prev, skb, state, pcount,</div><div class='ctx'> 				len, mss, 0);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return prev;</div><div class='hunk'>@@ -1580,7 +1944,8 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,</div><div class='ctx'> 						TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='ctx'> 						dup_sack,</div><div class='ctx'> 						tcp_skb_pcount(skb),</div><div class='del'>-						skb-&gt;skb_mstamp);</div><div class='add'>+						skb-&gt;len,</div><div class='add'>+						tcp_skb_timestamp_us(skb));</div><div class='ctx'> 			tcp_rate_skb_delivered(sk, skb, state-&gt;rate);</div><div class='ctx'> 			if (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED)</div><div class='ctx'> 				list_del_init(&amp;skb-&gt;tcp_tsorted_anchor);</div><div class='hunk'>@@ -1593,9 +1958,7 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk,</div><div class='del'>-					   struct tcp_sacktag_state *state,</div><div class='del'>-					   u32 seq)</div><div class='add'>+static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, u32 seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *parent, **p = &amp;sk-&gt;tcp_rtx_queue.rb_node;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1617,13 +1980,12 @@ static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk,</div><div class='del'>-					struct tcp_sacktag_state *state,</div><div class='ctx'> 					u32 skip_to_seq)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb &amp;&amp; after(TCP_SKB_CB(skb)-&gt;seq, skip_to_seq))</div><div class='ctx'> 		return skb;</div><div class='ctx'> </div><div class='del'>-	return tcp_sacktag_bsearch(sk, state, skip_to_seq);</div><div class='add'>+	return tcp_sacktag_bsearch(sk, skip_to_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb,</div><div class='hunk'>@@ -1636,7 +1998,7 @@ static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb,</div><div class='ctx'> 		return skb;</div><div class='ctx'> </div><div class='ctx'> 	if (before(next_dup-&gt;start_seq, skip_to_seq)) {</div><div class='del'>-		skb = tcp_sacktag_skip(skb, sk, state, next_dup-&gt;start_seq);</div><div class='add'>+		skb = tcp_sacktag_skip(skb, sk, next_dup-&gt;start_seq);</div><div class='ctx'> 		skb = tcp_sacktag_walk(skb, sk, NULL, state,</div><div class='ctx'> 				       next_dup-&gt;start_seq, next_dup-&gt;end_seq,</div><div class='ctx'> 				       1);</div><div class='hunk'>@@ -1674,11 +2036,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> 		tcp_highest_sack_reset(sk);</div><div class='ctx'> </div><div class='ctx'> 	found_dup_sack = tcp_check_dsack(sk, ack_skb, sp_wire,</div><div class='del'>-					 num_sacks, prior_snd_una);</div><div class='del'>-	if (found_dup_sack) {</div><div class='del'>-		state-&gt;flag |= FLAG_DSACKING_ACK;</div><div class='del'>-		tp-&gt;delivered++; /* A spurious retransmission is delivered */</div><div class='del'>-	}</div><div class='add'>+					 num_sacks, prior_snd_una, state);</div><div class='ctx'> </div><div class='ctx'> 	/* Eliminate too old ACKs, but take into</div><div class='ctx'> 	 * account more or less fresh ones, they can</div><div class='hunk'>@@ -1723,8 +2081,11 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Ignore very old stuff early */</div><div class='del'>-		if (!after(sp[used_sacks].end_seq, prior_snd_una))</div><div class='add'>+		if (!after(sp[used_sacks].end_seq, prior_snd_una)) {</div><div class='add'>+			if (i == 0)</div><div class='add'>+				first_sack_index = -1;</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		used_sacks++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1777,8 +2138,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> </div><div class='ctx'> 			/* Head todo? */</div><div class='ctx'> 			if (before(start_seq, cache-&gt;start_seq)) {</div><div class='del'>-				skb = tcp_sacktag_skip(skb, sk, state,</div><div class='del'>-						       start_seq);</div><div class='add'>+				skb = tcp_sacktag_skip(skb, sk, start_seq);</div><div class='ctx'> 				skb = tcp_sacktag_walk(skb, sk, next_dup,</div><div class='ctx'> 						       state,</div><div class='ctx'> 						       start_seq,</div><div class='hunk'>@@ -1804,7 +2164,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> 				goto walk;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			skb = tcp_sacktag_skip(skb, sk, state, cache-&gt;end_seq);</div><div class='add'>+			skb = tcp_sacktag_skip(skb, sk, cache-&gt;end_seq);</div><div class='ctx'> 			/* Check overlap against next cached too (past this one already) */</div><div class='ctx'> 			cache++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1815,7 +2175,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='ctx'> 			if (!skb)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		skb = tcp_sacktag_skip(skb, sk, state, start_seq);</div><div class='add'>+		skb = tcp_sacktag_skip(skb, sk, start_seq);</div><div class='ctx'> </div><div class='ctx'> walk:</div><div class='ctx'> 		skb = tcp_sacktag_walk(skb, sk, next_dup, state,</div><div class='hunk'>@@ -1877,34 +2237,39 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;reordering = min_t(u32, tp-&gt;packets_out + addend,</div><div class='del'>-			       sock_net(sk)-&gt;ipv4.sysctl_tcp_max_reordering);</div><div class='add'>+			       READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_max_reordering));</div><div class='ctx'> 	tp-&gt;reord_seen++;</div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRENOREORDER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Emulate SACKs for SACKless connection: account for a new dupack. */</div><div class='ctx'> </div><div class='del'>-static void tcp_add_reno_sack(struct sock *sk)</div><div class='add'>+static void tcp_add_reno_sack(struct sock *sk, int num_dupack, bool ece_ack)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	u32 prior_sacked = tp-&gt;sacked_out;</div><div class='add'>+	if (num_dupack) {</div><div class='add'>+		struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+		u32 prior_sacked = tp-&gt;sacked_out;</div><div class='add'>+		s32 delivered;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;sacked_out++;</div><div class='del'>-	tcp_check_reno_reordering(sk, 0);</div><div class='del'>-	if (tp-&gt;sacked_out &gt; prior_sacked)</div><div class='del'>-		tp-&gt;delivered++; /* Some out-of-order packet is delivered */</div><div class='del'>-	tcp_verify_left_out(tp);</div><div class='add'>+		tp-&gt;sacked_out += num_dupack;</div><div class='add'>+		tcp_check_reno_reordering(sk, 0);</div><div class='add'>+		delivered = tp-&gt;sacked_out - prior_sacked;</div><div class='add'>+		if (delivered &gt; 0)</div><div class='add'>+			tcp_count_delivered(tp, delivered, ece_ack);</div><div class='add'>+		tcp_verify_left_out(tp);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Account for ACK, ACKing some data in Reno Recovery phase. */</div><div class='ctx'> </div><div class='del'>-static void tcp_remove_reno_sacks(struct sock *sk, int acked)</div><div class='add'>+static void tcp_remove_reno_sacks(struct sock *sk, int acked, bool ece_ack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (acked &gt; 0) {</div><div class='ctx'> 		/* One ACK acked hole. The rest eat duplicate ACKs. */</div><div class='del'>-		tp-&gt;delivered += max_t(int, acked - tp-&gt;sacked_out, 1);</div><div class='add'>+		tcp_count_delivered(tp, max_t(int, acked - tp-&gt;sacked_out, 1),</div><div class='add'>+				    ece_ack);</div><div class='ctx'> 		if (acked - 1 &gt;= tp-&gt;sacked_out)</div><div class='ctx'> 			tp-&gt;sacked_out = 0;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1926,18 +2291,25 @@ void tcp_clear_retrans(struct tcp_sock *tp)</div><div class='ctx'> 	tp-&gt;undo_marker = 0;</div><div class='ctx'> 	tp-&gt;undo_retrans = -1;</div><div class='ctx'> 	tp-&gt;sacked_out = 0;</div><div class='add'>+	tp-&gt;rto_stamp = 0;</div><div class='add'>+	tp-&gt;total_rto = 0;</div><div class='add'>+	tp-&gt;total_rto_recoveries = 0;</div><div class='add'>+	tp-&gt;total_rto_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tcp_init_undo(struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='ctx'> 	tp-&gt;undo_marker = tp-&gt;snd_una;</div><div class='del'>-	/* Retransmission still in flight may cause DSACKs later. */</div><div class='del'>-	tp-&gt;undo_retrans = tp-&gt;retrans_out ? : -1;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static bool tcp_is_rack(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	return sock_net(sk)-&gt;ipv4.sysctl_tcp_recovery &amp; TCP_RACK_LOSS_DETECTION;</div><div class='add'>+	/* Retransmission still in flight may cause DSACKs later. */</div><div class='add'>+	/* First, account for regular retransmits in flight: */</div><div class='add'>+	tp-&gt;undo_retrans = tp-&gt;retrans_out;</div><div class='add'>+	/* Next, account for TLP retransmits in flight: */</div><div class='add'>+	if (tp-&gt;tlp_high_seq &amp;&amp; tp-&gt;tlp_retrans)</div><div class='add'>+		tp-&gt;undo_retrans++;</div><div class='add'>+	/* Finally, avoid 0, because undo_retrans==0 means "can undo now": */</div><div class='add'>+	if (!tp-&gt;undo_retrans)</div><div class='add'>+		tp-&gt;undo_retrans = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If we detect SACK reneging, forget all SACK information</div><div class='hunk'>@@ -1965,8 +2337,7 @@ static void tcp_timeout_mark_lost(struct sock *sk)</div><div class='ctx'> 	skb_rbtree_walk_from(skb) {</div><div class='ctx'> 		if (is_reneg)</div><div class='ctx'> 			TCP_SKB_CB(skb)-&gt;sacked &amp;= ~TCPCB_SACKED_ACKED;</div><div class='del'>-		else if (tcp_is_rack(sk) &amp;&amp; skb != head &amp;&amp;</div><div class='del'>-			 tcp_rack_skb_timeout(tp, skb, 0) &gt; 0)</div><div class='add'>+		else if (skb != head &amp;&amp; tcp_rack_skb_timeout(tp, skb, 0) &gt; 0)</div><div class='ctx'> 			continue; /* Don't mark recently sent ones lost yet */</div><div class='ctx'> 		tcp_mark_skb_lost(sk, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1981,6 +2352,7 @@ void tcp_enter_loss(struct sock *sk)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	bool new_recovery = icsk-&gt;icsk_ca_state &lt; TCP_CA_Recovery;</div><div class='add'>+	u8 reordering;</div><div class='ctx'> </div><div class='ctx'> 	tcp_timeout_mark_lost(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -1989,31 +2361,34 @@ void tcp_enter_loss(struct sock *sk)</div><div class='ctx'> 	    !after(tp-&gt;high_seq, tp-&gt;snd_una) ||</div><div class='ctx'> 	    (icsk-&gt;icsk_ca_state == TCP_CA_Loss &amp;&amp; !icsk-&gt;icsk_retransmits)) {</div><div class='ctx'> 		tp-&gt;prior_ssthresh = tcp_current_ssthresh(sk);</div><div class='del'>-		tp-&gt;prior_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+		tp-&gt;prior_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> 		tp-&gt;snd_ssthresh = icsk-&gt;icsk_ca_ops-&gt;ssthresh(sk);</div><div class='ctx'> 		tcp_ca_event(sk, CA_EVENT_LOSS);</div><div class='ctx'> 		tcp_init_undo(tp);</div><div class='ctx'> 	}</div><div class='del'>-	tp-&gt;snd_cwnd	   = tcp_packets_in_flight(tp) + 1;</div><div class='add'>+	tcp_snd_cwnd_set(tp, tcp_packets_in_flight(tp) + 1);</div><div class='ctx'> 	tp-&gt;snd_cwnd_cnt   = 0;</div><div class='ctx'> 	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> </div><div class='ctx'> 	/* Timeout in disordered state after receiving substantial DUPACKs</div><div class='ctx'> 	 * suggests that the degree of reordering is over-estimated.</div><div class='ctx'> 	 */</div><div class='add'>+	reordering = READ_ONCE(net-&gt;ipv4.sysctl_tcp_reordering);</div><div class='ctx'> 	if (icsk-&gt;icsk_ca_state &lt;= TCP_CA_Disorder &amp;&amp;</div><div class='del'>-	    tp-&gt;sacked_out &gt;= net-&gt;ipv4.sysctl_tcp_reordering)</div><div class='add'>+	    tp-&gt;sacked_out &gt;= reordering)</div><div class='ctx'> 		tp-&gt;reordering = min_t(unsigned int, tp-&gt;reordering,</div><div class='del'>-				       net-&gt;ipv4.sysctl_tcp_reordering);</div><div class='add'>+				       reordering);</div><div class='add'>+</div><div class='ctx'> 	tcp_set_ca_state(sk, TCP_CA_Loss);</div><div class='ctx'> 	tp-&gt;high_seq = tp-&gt;snd_nxt;</div><div class='add'>+	tp-&gt;tlp_high_seq = 0;</div><div class='ctx'> 	tcp_ecn_queue_cwr(tp);</div><div class='ctx'> </div><div class='ctx'> 	/* F-RTO RFC5682 sec 3.1 step 1: retransmit SND.UNA if no previous</div><div class='ctx'> 	 * loss recovery is underway except recurring timeout(s) on</div><div class='ctx'> 	 * the same SND.UNA (sec 3.2). Disable F-RTO on path MTU probing</div><div class='ctx'> 	 */</div><div class='del'>-	tp-&gt;frto = net-&gt;ipv4.sysctl_tcp_frto &amp;&amp;</div><div class='add'>+	tp-&gt;frto = READ_ONCE(net-&gt;ipv4.sysctl_tcp_frto) &amp;&amp;</div><div class='ctx'> 		   (new_recovery || icsk-&gt;icsk_retransmits) &amp;&amp;</div><div class='ctx'> 		   !inet_csk(sk)-&gt;icsk_mtup.probe_size;</div><div class='ctx'> }</div><div class='hunk'>@@ -2028,36 +2403,21 @@ void tcp_enter_loss(struct sock *sk)</div><div class='ctx'>  * restore sanity to the SACK scoreboard. If the apparent reneging</div><div class='ctx'>  * persists until this RTO then we'll clear the SACK scoreboard.</div><div class='ctx'>  */</div><div class='del'>-static bool tcp_check_sack_reneging(struct sock *sk, int flag)</div><div class='add'>+static bool tcp_check_sack_reneging(struct sock *sk, int *ack_flag)</div><div class='ctx'> {</div><div class='del'>-	if (flag &amp; FLAG_SACK_RENEGING) {</div><div class='add'>+	if (*ack_flag &amp; FLAG_SACK_RENEGING &amp;&amp;</div><div class='add'>+	    *ack_flag &amp; FLAG_SND_UNA_ADVANCED) {</div><div class='ctx'> 		struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 		unsigned long delay = max(usecs_to_jiffies(tp-&gt;srtt_us &gt;&gt; 4),</div><div class='ctx'> 					  msecs_to_jiffies(10));</div><div class='ctx'> </div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-					  delay, TCP_RTO_MAX);</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, delay, false);</div><div class='add'>+		*ack_flag &amp;= ~FLAG_SET_XMIT_TIMER;</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Heurestics to calculate number of duplicate ACKs. There's no dupACKs</div><div class='del'>- * counter when SACK is enabled (without SACK, sacked_out is used for</div><div class='del'>- * that purpose).</div><div class='del'>- *</div><div class='del'>- * With reordering, holes may still be in flight, so RFC3517 recovery</div><div class='del'>- * uses pure sacked_out (total number of SACKed segments) even though</div><div class='del'>- * it violates the RFC that uses duplicate ACKs, often these are equal</div><div class='del'>- * but when e.g. out-of-window ACKs or packet duplication occurs,</div><div class='del'>- * they differ. Since neither occurs due to loss, TCP should really</div><div class='del'>- * ignore them.</div><div class='del'>- */</div><div class='del'>-static inline int tcp_dupack_heuristics(const struct tcp_sock *tp)</div><div class='del'>-{</div><div class='del'>-	return tp-&gt;sacked_out + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Linux NewReno/SACK/ECN state machine.</div><div class='ctx'>  * --------------------------------------</div><div class='ctx'>  *</div><div class='hunk'>@@ -2110,13 +2470,7 @@ static inline int tcp_dupack_heuristics(const struct tcp_sock *tp)</div><div class='ctx'>  *</div><div class='ctx'>  *		If the receiver supports SACK:</div><div class='ctx'>  *</div><div class='del'>- *		RFC6675/3517: It is the conventional algorithm. A packet is</div><div class='del'>- *		considered lost if the number of higher sequence packets</div><div class='del'>- *		SACKed is greater than or equal the DUPACK thoreshold</div><div class='del'>- *		(reordering). This is implemented in tcp_mark_head_lost and</div><div class='del'>- *		tcp_update_scoreboard.</div><div class='del'>- *</div><div class='del'>- *		RACK (draft-ietf-tcpm-rack-01): it is a newer algorithm</div><div class='add'>+ *		RACK (RFC8985): RACK is a newer loss detection algorithm</div><div class='ctx'>  *		(2017-) that checks timing instead of counting DUPACKs.</div><div class='ctx'>  *		Essentially a packet is considered lost if it's not S/ACKed</div><div class='ctx'>  *		after RTT + reordering_window, where both metrics are</div><div class='hunk'>@@ -2131,8 +2485,8 @@ static inline int tcp_dupack_heuristics(const struct tcp_sock *tp)</div><div class='ctx'>  *		is lost (NewReno). This heuristics are the same in NewReno</div><div class='ctx'>  *		and SACK.</div><div class='ctx'>  *</div><div class='del'>- * Really tricky (and requiring careful tuning) part of algorithm</div><div class='del'>- * is hidden in functions tcp_time_to_recover() and tcp_xmit_retransmit_queue().</div><div class='add'>+ * The really tricky (and requiring careful tuning) part of the algorithm</div><div class='add'>+ * is hidden in the RACK code in tcp_recovery.c and tcp_xmit_retransmit_queue().</div><div class='ctx'>  * The first determines the moment _when_ we should reduce CWND and,</div><div class='ctx'>  * hence, slow down forward transmission. In fact, it determines the moment</div><div class='ctx'>  * when we decide that hole is caused by loss, rather than by a reorder.</div><div class='hunk'>@@ -2155,99 +2509,10 @@ static inline int tcp_dupack_heuristics(const struct tcp_sock *tp)</div><div class='ctx'>  * Main question: may we further continue forward transmission</div><div class='ctx'>  * with the same cwnd?</div><div class='ctx'>  */</div><div class='del'>-static bool tcp_time_to_recover(struct sock *sk, int flag)</div><div class='add'>+static bool tcp_time_to_recover(const struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	/* Trick#1: The loss is proven. */</div><div class='del'>-	if (tp-&gt;lost_out)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* Not-A-Trick#2 : Classic rule... */</div><div class='del'>-	if (!tcp_is_rack(sk) &amp;&amp; tcp_dupack_heuristics(tp) &gt; tp-&gt;reordering)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Detect loss in event "A" above by marking head of queue up as lost.</div><div class='del'>- * For non-SACK(Reno) senders, the first "packets" number of segments</div><div class='del'>- * are considered lost. For RFC3517 SACK, a segment is considered lost if it</div><div class='del'>- * has at least tp-&gt;reordering SACKed seqments above it; "packets" refers to</div><div class='del'>- * the maximum SACKed segments to pass before reaching this limit.</div><div class='del'>- */</div><div class='del'>-static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head)</div><div class='del'>-{</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int cnt, oldcnt, lost;</div><div class='del'>-	unsigned int mss;</div><div class='del'>-	/* Use SACK to deduce losses of new sequences sent during recovery */</div><div class='del'>-	const u32 loss_high = tcp_is_sack(tp) ?  tp-&gt;snd_nxt : tp-&gt;high_seq;</div><div class='del'>-</div><div class='del'>-	WARN_ON(packets &gt; tp-&gt;packets_out);</div><div class='del'>-	skb = tp-&gt;lost_skb_hint;</div><div class='del'>-	if (skb) {</div><div class='del'>-		/* Head already handled? */</div><div class='del'>-		if (mark_head &amp;&amp; after(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;snd_una))</div><div class='del'>-			return;</div><div class='del'>-		cnt = tp-&gt;lost_cnt_hint;</div><div class='del'>-	} else {</div><div class='del'>-		skb = tcp_rtx_queue_head(sk);</div><div class='del'>-		cnt = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_rbtree_walk_from(skb) {</div><div class='del'>-		/* TODO: do this better */</div><div class='del'>-		/* this is not the most efficient way to do this... */</div><div class='del'>-		tp-&gt;lost_skb_hint = skb;</div><div class='del'>-		tp-&gt;lost_cnt_hint = cnt;</div><div class='del'>-</div><div class='del'>-		if (after(TCP_SKB_CB(skb)-&gt;end_seq, loss_high))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		oldcnt = cnt;</div><div class='del'>-		if (tcp_is_reno(tp) ||</div><div class='del'>-		    (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED))</div><div class='del'>-			cnt += tcp_skb_pcount(skb);</div><div class='del'>-</div><div class='del'>-		if (cnt &gt; packets) {</div><div class='del'>-			if (tcp_is_sack(tp) ||</div><div class='del'>-			    (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED) ||</div><div class='del'>-			    (oldcnt &gt;= packets))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			mss = tcp_skb_mss(skb);</div><div class='del'>-			/* If needed, chop off the prefix to mark as lost. */</div><div class='del'>-			lost = (packets - oldcnt) * mss;</div><div class='del'>-			if (lost &lt; skb-&gt;len &amp;&amp;</div><div class='del'>-			    tcp_fragment(sk, TCP_FRAG_IN_RTX_QUEUE, skb,</div><div class='del'>-					 lost, mss, GFP_ATOMIC) &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-			cnt = packets;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tcp_skb_mark_lost(tp, skb);</div><div class='del'>-</div><div class='del'>-		if (mark_head)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	tcp_verify_left_out(tp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Account newly detected lost packet(s) */</div><div class='del'>-</div><div class='del'>-static void tcp_update_scoreboard(struct sock *sk, int fast_rexmit)</div><div class='del'>-{</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	if (tcp_is_sack(tp)) {</div><div class='del'>-		int sacked_upto = tp-&gt;sacked_out - tp-&gt;reordering;</div><div class='del'>-		if (sacked_upto &gt;= 0)</div><div class='del'>-			tcp_mark_head_lost(sk, sacked_upto, 0);</div><div class='del'>-		else if (fast_rexmit)</div><div class='del'>-			tcp_mark_head_lost(sk, 1, 1);</div><div class='del'>-	}</div><div class='add'>+	/* Has loss detection marked at least one packet lost? */</div><div class='add'>+	return tp-&gt;lost_out != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool tcp_tsopt_ecr_before(const struct tcp_sock *tp, u32 when)</div><div class='hunk'>@@ -2263,7 +2528,7 @@ static bool tcp_skb_spurious_retrans(const struct tcp_sock *tp,</div><div class='ctx'> 				     const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_RETRANS) &amp;&amp;</div><div class='del'>-	       tcp_tsopt_ecr_before(tp, tcp_skb_timestamp(skb));</div><div class='add'>+	       tcp_tsopt_ecr_before(tp, tcp_skb_timestamp_ts(tp-&gt;tcp_usec_ts, skb));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Nothing was retransmitted or returned timestamp is less</div><div class='hunk'>@@ -2271,8 +2536,35 @@ static bool tcp_skb_spurious_retrans(const struct tcp_sock *tp,</div><div class='ctx'>  */</div><div class='ctx'> static inline bool tcp_packet_delayed(const struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='del'>-	return !tp-&gt;retrans_stamp ||</div><div class='del'>-	       tcp_tsopt_ecr_before(tp, tp-&gt;retrans_stamp);</div><div class='add'>+	const struct sock *sk = (const struct sock *)tp;</div><div class='add'>+</div><div class='add'>+	/* Received an echoed timestamp before the first retransmission? */</div><div class='add'>+	if (tp-&gt;retrans_stamp)</div><div class='add'>+		return tcp_tsopt_ecr_before(tp, tp-&gt;retrans_stamp);</div><div class='add'>+</div><div class='add'>+	/* We set tp-&gt;retrans_stamp upon the first retransmission of a loss</div><div class='add'>+	 * recovery episode, so normally if tp-&gt;retrans_stamp is 0 then no</div><div class='add'>+	 * retransmission has happened yet (likely due to TSQ, which can cause</div><div class='add'>+	 * fast retransmits to be delayed). So if snd_una advanced while</div><div class='add'>+	 * (tp-&gt;retrans_stamp is 0 then apparently a packet was merely delayed,</div><div class='add'>+	 * not lost. But there are exceptions where we retransmit but then</div><div class='add'>+	 * clear tp-&gt;retrans_stamp, so we check for those exceptions.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* (1) For non-SACK connections, tcp_is_non_sack_preventing_reopen()</div><div class='add'>+	 * clears tp-&gt;retrans_stamp when snd_una == high_seq.</div><div class='add'>+	 */</div><div class='add'>+	if (!tcp_is_sack(tp) &amp;&amp; !before(tp-&gt;snd_una, tp-&gt;high_seq))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* (2) In TCP_SYN_SENT tcp_clean_rtx_queue() clears tp-&gt;retrans_stamp</div><div class='add'>+	 * when setting FLAG_SYN_ACKED is set, even if the SYN was</div><div class='add'>+	 * retransmitted.</div><div class='add'>+	 */</div><div class='add'>+	if (sk-&gt;sk_state == TCP_SYN_SENT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;	/* tp-&gt;retrans_stamp is zero; no retransmit yet */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Undo procedures. */</div><div class='hunk'>@@ -2306,6 +2598,16 @@ static bool tcp_any_retrans_done(const struct sock *sk)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* If loss recovery is finished and there are no retransmits out in the</div><div class='add'>+ * network, then we clear retrans_stamp so that upon the next loss recovery</div><div class='add'>+ * retransmits_timed_out() and timestamp-undo are using the correct value.</div><div class='add'>+ */</div><div class='add'>+static void tcp_retrans_stamp_cleanup(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (!tcp_any_retrans_done(sk))</div><div class='add'>+		tcp_sk(sk)-&gt;retrans_stamp = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void DBGUNDO(struct sock *sk, const char *msg)</div><div class='ctx'> {</div><div class='ctx'> #if FASTRETRANS_DEBUG &gt; 1</div><div class='hunk'>@@ -2316,7 +2618,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)</div><div class='ctx'> 		pr_debug("Undo %s %pI4/%u c%u l%u ss%u/%u p%u\n",</div><div class='ctx'> 			 msg,</div><div class='ctx'> 			 &amp;inet-&gt;inet_daddr, ntohs(inet-&gt;inet_dport),</div><div class='del'>-			 tp-&gt;snd_cwnd, tcp_left_out(tp),</div><div class='add'>+			 tcp_snd_cwnd(tp), tcp_left_out(tp),</div><div class='ctx'> 			 tp-&gt;snd_ssthresh, tp-&gt;prior_ssthresh,</div><div class='ctx'> 			 tp-&gt;packets_out);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2325,7 +2627,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)</div><div class='ctx'> 		pr_debug("Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",</div><div class='ctx'> 			 msg,</div><div class='ctx'> 			 &amp;sk-&gt;sk_v6_daddr, ntohs(inet-&gt;inet_dport),</div><div class='del'>-			 tp-&gt;snd_cwnd, tcp_left_out(tp),</div><div class='add'>+			 tcp_snd_cwnd(tp), tcp_left_out(tp),</div><div class='ctx'> 			 tp-&gt;snd_ssthresh, tp-&gt;prior_ssthresh,</div><div class='ctx'> 			 tp-&gt;packets_out);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2350,7 +2652,7 @@ static void tcp_undo_cwnd_reduction(struct sock *sk, bool unmark_loss)</div><div class='ctx'> 	if (tp-&gt;prior_ssthresh) {</div><div class='ctx'> 		const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-		tp-&gt;snd_cwnd = icsk-&gt;icsk_ca_ops-&gt;undo_cwnd(sk);</div><div class='add'>+		tcp_snd_cwnd_set(tp, icsk-&gt;icsk_ca_ops-&gt;undo_cwnd(sk));</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;prior_ssthresh &gt; tp-&gt;snd_ssthresh) {</div><div class='ctx'> 			tp-&gt;snd_ssthresh = tp-&gt;prior_ssthresh;</div><div class='hunk'>@@ -2367,6 +2669,21 @@ static inline bool tcp_may_undo(const struct tcp_sock *tp)</div><div class='ctx'> 	return tp-&gt;undo_marker &amp;&amp; (!tp-&gt;undo_retrans || tcp_packet_delayed(tp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool tcp_is_non_sack_preventing_reopen(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;snd_una == tp-&gt;high_seq &amp;&amp; tcp_is_reno(tp)) {</div><div class='add'>+		/* Hold old state until something *above* high_seq</div><div class='add'>+		 * is ACKed. For Reno it is MUST to prevent false</div><div class='add'>+		 * fast retransmits (RFC2582). SACK TCP is safe. */</div><div class='add'>+		if (!tcp_any_retrans_done(sk))</div><div class='add'>+			tp-&gt;retrans_stamp = 0;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* People celebrate: "We love our President!" */</div><div class='ctx'> static bool tcp_try_undo_recovery(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -2389,14 +2706,8 @@ static bool tcp_try_undo_recovery(struct sock *sk)</div><div class='ctx'> 	} else if (tp-&gt;rack.reo_wnd_persist) {</div><div class='ctx'> 		tp-&gt;rack.reo_wnd_persist--;</div><div class='ctx'> 	}</div><div class='del'>-	if (tp-&gt;snd_una == tp-&gt;high_seq &amp;&amp; tcp_is_reno(tp)) {</div><div class='del'>-		/* Hold old state until something *above* high_seq</div><div class='del'>-		 * is ACKed. For Reno it is MUST to prevent false</div><div class='del'>-		 * fast retransmits (RFC2582). SACK TCP is safe. */</div><div class='del'>-		if (!tcp_any_retrans_done(sk))</div><div class='del'>-			tp-&gt;retrans_stamp = 0;</div><div class='add'>+	if (tcp_is_non_sack_preventing_reopen(sk))</div><div class='ctx'> 		return true;</div><div class='del'>-	}</div><div class='ctx'> 	tcp_set_ca_state(sk, TCP_CA_Open);</div><div class='ctx'> 	tp-&gt;is_sack_reneg = 0;</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -2431,7 +2742,9 @@ static bool tcp_try_undo_loss(struct sock *sk, bool frto_undo)</div><div class='ctx'> 		if (frto_undo)</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					LINUX_MIB_TCPSPURIOUSRTOS);</div><div class='del'>-		inet_csk(sk)-&gt;icsk_retransmits = 0;</div><div class='add'>+		WRITE_ONCE(inet_csk(sk)-&gt;icsk_retransmits, 0);</div><div class='add'>+		if (tcp_is_non_sack_preventing_reopen(sk))</div><div class='add'>+			return true;</div><div class='ctx'> 		if (frto_undo || tcp_is_sack(tp)) {</div><div class='ctx'> 			tcp_set_ca_state(sk, TCP_CA_Open);</div><div class='ctx'> 			tp-&gt;is_sack_reneg = 0;</div><div class='hunk'>@@ -2447,7 +2760,7 @@ static bool tcp_try_undo_loss(struct sock *sk, bool frto_undo)</div><div class='ctx'>  *   1) If the packets in flight is larger than ssthresh, PRR spreads the</div><div class='ctx'>  *	cwnd reductions across a full RTT.</div><div class='ctx'>  *   2) Otherwise PRR uses packet conservation to send as much as delivered.</div><div class='del'>- *      But when the retransmits are acked without further losses, PRR</div><div class='add'>+ *      But when SND_UNA is acked without further losses,</div><div class='ctx'>  *      slow starts cwnd up to ssthresh to speed up the recovery.</div><div class='ctx'>  */</div><div class='ctx'> static void tcp_init_cwnd_reduction(struct sock *sk)</div><div class='hunk'>@@ -2457,14 +2770,14 @@ static void tcp_init_cwnd_reduction(struct sock *sk)</div><div class='ctx'> 	tp-&gt;high_seq = tp-&gt;snd_nxt;</div><div class='ctx'> 	tp-&gt;tlp_high_seq = 0;</div><div class='ctx'> 	tp-&gt;snd_cwnd_cnt = 0;</div><div class='del'>-	tp-&gt;prior_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	tp-&gt;prior_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> 	tp-&gt;prr_delivered = 0;</div><div class='ctx'> 	tp-&gt;prr_out = 0;</div><div class='ctx'> 	tp-&gt;snd_ssthresh = inet_csk(sk)-&gt;icsk_ca_ops-&gt;ssthresh(sk);</div><div class='ctx'> 	tcp_ecn_queue_cwr(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tcp_cwnd_reduction(struct sock *sk, int newly_acked_sacked, int flag)</div><div class='add'>+void tcp_cwnd_reduction(struct sock *sk, int newly_acked_sacked, int newly_lost, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int sndcnt = 0;</div><div class='hunk'>@@ -2473,22 +2786,23 @@ void tcp_cwnd_reduction(struct sock *sk, int newly_acked_sacked, int flag)</div><div class='ctx'> 	if (newly_acked_sacked &lt;= 0 || WARN_ON_ONCE(!tp-&gt;prior_cwnd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	trace_tcp_cwnd_reduction_tp(sk, newly_acked_sacked, newly_lost, flag);</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;prr_delivered += newly_acked_sacked;</div><div class='ctx'> 	if (delta &lt; 0) {</div><div class='ctx'> 		u64 dividend = (u64)tp-&gt;snd_ssthresh * tp-&gt;prr_delivered +</div><div class='ctx'> 			       tp-&gt;prior_cwnd - 1;</div><div class='ctx'> 		sndcnt = div_u64(dividend, tp-&gt;prior_cwnd) - tp-&gt;prr_out;</div><div class='del'>-	} else if ((flag &amp; FLAG_RETRANS_DATA_ACKED) &amp;&amp;</div><div class='del'>-		   !(flag &amp; FLAG_LOST_RETRANS)) {</div><div class='del'>-		sndcnt = min_t(int, delta,</div><div class='del'>-			       max_t(int, tp-&gt;prr_delivered - tp-&gt;prr_out,</div><div class='del'>-				     newly_acked_sacked) + 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		sndcnt = min(delta, newly_acked_sacked);</div><div class='add'>+		sndcnt = max_t(int, tp-&gt;prr_delivered - tp-&gt;prr_out,</div><div class='add'>+			       newly_acked_sacked);</div><div class='add'>+		if (flag &amp; FLAG_SND_UNA_ADVANCED &amp;&amp; !newly_lost)</div><div class='add'>+			sndcnt++;</div><div class='add'>+		sndcnt = min(delta, sndcnt);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Force a fast retransmit upon entering fast recovery */</div><div class='ctx'> 	sndcnt = max(sndcnt, (tp-&gt;prr_out ? 0 : 1));</div><div class='del'>-	tp-&gt;snd_cwnd = tcp_packets_in_flight(tp) + sndcnt;</div><div class='add'>+	tcp_snd_cwnd_set(tp, tcp_packets_in_flight(tp) + sndcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tcp_end_cwnd_reduction(struct sock *sk)</div><div class='hunk'>@@ -2501,7 +2815,7 @@ static inline void tcp_end_cwnd_reduction(struct sock *sk)</div><div class='ctx'> 	/* Reset cwnd to ssthresh in CWR or Recovery (unless it's undone) */</div><div class='ctx'> 	if (tp-&gt;snd_ssthresh &lt; TCP_INFINITE_SSTHRESH &amp;&amp;</div><div class='ctx'> 	    (inet_csk(sk)-&gt;icsk_ca_state == TCP_CA_CWR || tp-&gt;undo_marker)) {</div><div class='del'>-		tp-&gt;snd_cwnd = tp-&gt;snd_ssthresh;</div><div class='add'>+		tcp_snd_cwnd_set(tp, tp-&gt;snd_ssthresh);</div><div class='ctx'> 		tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> 	}</div><div class='ctx'> 	tcp_ca_event(sk, CA_EVENT_COMPLETE_CWR);</div><div class='hunk'>@@ -2565,12 +2879,15 @@ static void tcp_mtup_probe_success(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	u64 val;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: breaks with very large cwnd */</div><div class='ctx'> 	tp-&gt;prior_ssthresh = tcp_current_ssthresh(sk);</div><div class='del'>-	tp-&gt;snd_cwnd = tp-&gt;snd_cwnd *</div><div class='del'>-		       tcp_mss_to_mtu(sk, tp-&gt;mss_cache) /</div><div class='del'>-		       icsk-&gt;icsk_mtup.probe_size;</div><div class='add'>+</div><div class='add'>+	val = (u64)tcp_snd_cwnd(tp) * tcp_mss_to_mtu(sk, tp-&gt;mss_cache);</div><div class='add'>+	do_div(val, icsk-&gt;icsk_mtup.probe_size);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE((u32)val != val);</div><div class='add'>+	tcp_snd_cwnd_set(tp, max_t(u32, 1U, val));</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;snd_cwnd_cnt = 0;</div><div class='ctx'> 	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> 	tp-&gt;snd_ssthresh = tcp_current_ssthresh(sk);</div><div class='hunk'>@@ -2581,30 +2898,61 @@ static void tcp_mtup_probe_success(struct sock *sk)</div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMTUPSUCCESS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Sometimes we deduce that packets have been dropped due to reasons other than</div><div class='add'>+ * congestion, like path MTU reductions or failed client TFO attempts. In these</div><div class='add'>+ * cases we call this function to retransmit as many packets as cwnd allows,</div><div class='add'>+ * without reducing cwnd. Given that retransmits will set retrans_stamp to a</div><div class='add'>+ * non-zero value (and may do so in a later calling context due to TSQ), we</div><div class='add'>+ * also enter CA_Loss so that we track when all retransmitted packets are ACKed</div><div class='add'>+ * and clear retrans_stamp when that happens (to ensure later recurring RTOs</div><div class='add'>+ * are using the correct retrans_stamp and don't declare ETIMEDOUT</div><div class='add'>+ * prematurely).</div><div class='add'>+ */</div><div class='add'>+static void tcp_non_congestion_loss_retransmit(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (icsk-&gt;icsk_ca_state != TCP_CA_Loss) {</div><div class='add'>+		tp-&gt;high_seq = tp-&gt;snd_nxt;</div><div class='add'>+		tp-&gt;snd_ssthresh = tcp_current_ssthresh(sk);</div><div class='add'>+		tp-&gt;prior_ssthresh = 0;</div><div class='add'>+		tp-&gt;undo_marker = 0;</div><div class='add'>+		tcp_set_ca_state(sk, TCP_CA_Loss);</div><div class='add'>+	}</div><div class='add'>+	tcp_xmit_retransmit_queue(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Do a simple retransmit without using the backoff mechanisms in</div><div class='ctx'>  * tcp_timer. This is used for path mtu discovery.</div><div class='ctx'>  * The socket is already locked here.</div><div class='ctx'>  */</div><div class='ctx'> void tcp_simple_retransmit(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	unsigned int mss = tcp_current_mss(sk);</div><div class='add'>+	int mss;</div><div class='add'>+</div><div class='add'>+	/* A fastopen SYN request is stored as two separate packets within</div><div class='add'>+	 * the retransmit queue, this is done by tcp_send_syn_data().</div><div class='add'>+	 * As a result simply checking the MSS of the frames in the queue</div><div class='add'>+	 * will not work for the SYN packet.</div><div class='add'>+	 *</div><div class='add'>+	 * Us being here is an indication of a path MTU issue so we can</div><div class='add'>+	 * assume that the fastopen SYN was lost and just mark all the</div><div class='add'>+	 * frames in the retransmit queue as lost. We will use an MSS of</div><div class='add'>+	 * -1 to mark all frames as lost, otherwise compute the current MSS.</div><div class='add'>+	 */</div><div class='add'>+	if (tp-&gt;syn_data &amp;&amp; sk-&gt;sk_state == TCP_SYN_SENT)</div><div class='add'>+		mss = -1;</div><div class='add'>+	else</div><div class='add'>+		mss = tcp_current_mss(sk);</div><div class='ctx'> </div><div class='ctx'> 	skb_rbtree_walk(skb, &amp;sk-&gt;tcp_rtx_queue) {</div><div class='del'>-		if (tcp_skb_seglen(skb) &gt; mss &amp;&amp;</div><div class='del'>-		    !(TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED)) {</div><div class='del'>-			if (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_RETRANS) {</div><div class='del'>-				TCP_SKB_CB(skb)-&gt;sacked &amp;= ~TCPCB_SACKED_RETRANS;</div><div class='del'>-				tp-&gt;retrans_out -= tcp_skb_pcount(skb);</div><div class='del'>-			}</div><div class='del'>-			tcp_skb_mark_lost_uncond_verify(tp, skb);</div><div class='del'>-		}</div><div class='add'>+		if (tcp_skb_seglen(skb) &gt; mss)</div><div class='add'>+			tcp_mark_skb_lost(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tcp_clear_retrans_hints_partial(tp);</div><div class='del'>-</div><div class='ctx'> 	if (!tp-&gt;lost_out)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2618,22 +2966,18 @@ void tcp_simple_retransmit(struct sock *sk)</div><div class='ctx'> 	 * in network, but units changed and effective</div><div class='ctx'> 	 * cwnd/ssthresh really reduced now.</div><div class='ctx'> 	 */</div><div class='del'>-	if (icsk-&gt;icsk_ca_state != TCP_CA_Loss) {</div><div class='del'>-		tp-&gt;high_seq = tp-&gt;snd_nxt;</div><div class='del'>-		tp-&gt;snd_ssthresh = tcp_current_ssthresh(sk);</div><div class='del'>-		tp-&gt;prior_ssthresh = 0;</div><div class='del'>-		tp-&gt;undo_marker = 0;</div><div class='del'>-		tcp_set_ca_state(sk, TCP_CA_Loss);</div><div class='del'>-	}</div><div class='del'>-	tcp_xmit_retransmit_queue(sk);</div><div class='add'>+	tcp_non_congestion_loss_retransmit(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_simple_retransmit);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_simple_retransmit);</div><div class='ctx'> </div><div class='ctx'> void tcp_enter_recovery(struct sock *sk, bool ece_ack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int mib_idx;</div><div class='ctx'> </div><div class='add'>+	/* Start the clock with our fast retransmit, for undo and ETIMEDOUT. */</div><div class='add'>+	tcp_retrans_stamp_cleanup(sk);</div><div class='add'>+</div><div class='ctx'> 	if (tcp_is_reno(tp))</div><div class='ctx'> 		mib_idx = LINUX_MIB_TCPRENORECOVERY;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2652,16 +2996,24 @@ void tcp_enter_recovery(struct sock *sk, bool ece_ack)</div><div class='ctx'> 	tcp_set_ca_state(sk, TCP_CA_Recovery);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_update_rto_time(struct tcp_sock *tp)</div><div class='add'>+{</div><div class='add'>+	if (tp-&gt;rto_stamp) {</div><div class='add'>+		tp-&gt;total_rto_time += tcp_time_stamp_ms(tp) - tp-&gt;rto_stamp;</div><div class='add'>+		tp-&gt;rto_stamp = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Process an ACK in CA_Loss state. Move to CA_Open if lost data are</div><div class='ctx'>  * recovered or spurious. Otherwise retransmits more on partial ACKs.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_process_loss(struct sock *sk, int flag, bool is_dupack,</div><div class='add'>+static void tcp_process_loss(struct sock *sk, int flag, int num_dupack,</div><div class='ctx'> 			     int *rexmit)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	bool recovered = !before(tp-&gt;snd_una, tp-&gt;high_seq);</div><div class='ctx'> </div><div class='del'>-	if ((flag &amp; FLAG_SND_UNA_ADVANCED) &amp;&amp;</div><div class='add'>+	if ((flag &amp; FLAG_SND_UNA_ADVANCED || rcu_access_pointer(tp-&gt;fastopen_rsk)) &amp;&amp;</div><div class='ctx'> 	    tcp_try_undo_loss(sk, false))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2674,7 +3026,7 @@ static void tcp_process_loss(struct sock *sk, int flag, bool is_dupack,</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (after(tp-&gt;snd_nxt, tp-&gt;high_seq)) {</div><div class='del'>-			if (flag &amp; FLAG_DATA_SACKED || is_dupack)</div><div class='add'>+			if (flag &amp; FLAG_DATA_SACKED || num_dupack)</div><div class='ctx'> 				tp-&gt;frto = 0; /* Step 3.a. loss was real */</div><div class='ctx'> 		} else if (flag &amp; FLAG_SND_UNA_ADVANCED &amp;&amp; !recovered) {</div><div class='ctx'> 			tp-&gt;high_seq = tp-&gt;snd_nxt;</div><div class='hunk'>@@ -2698,10 +3050,10 @@ static void tcp_process_loss(struct sock *sk, int flag, bool is_dupack,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tcp_is_reno(tp)) {</div><div class='ctx'> 		/* A Reno DUPACK means new data in F-RTO step 2.b above are</div><div class='del'>-		 * delivered. Lower inflight to clock out (re)tranmissions.</div><div class='add'>+		 * delivered. Lower inflight to clock out (re)transmissions.</div><div class='ctx'> 		 */</div><div class='del'>-		if (after(tp-&gt;snd_nxt, tp-&gt;high_seq) &amp;&amp; is_dupack)</div><div class='del'>-			tcp_add_reno_sack(sk);</div><div class='add'>+		if (after(tp-&gt;snd_nxt, tp-&gt;high_seq) &amp;&amp; num_dupack)</div><div class='add'>+			tcp_add_reno_sack(sk, num_dupack, flag &amp; FLAG_ECE);</div><div class='ctx'> 		else if (flag &amp; FLAG_SND_UNA_ADVANCED)</div><div class='ctx'> 			tcp_reset_reno_sack(tp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2734,7 +3086,6 @@ static bool tcp_try_undo_partial(struct sock *sk, u32 prior_snd_una)</div><div class='ctx'> 		tcp_undo_cwnd_reduction(sk, true);</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPPARTIALUNDO);</div><div class='ctx'> 		tcp_try_keep_open(sk);</div><div class='del'>-		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -2748,23 +3099,16 @@ static void tcp_identify_packet_loss(struct sock *sk, int *ack_flag)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(tcp_is_reno(tp))) {</div><div class='ctx'> 		tcp_newreno_mark_lost(sk, *ack_flag &amp; FLAG_SND_UNA_ADVANCED);</div><div class='del'>-	} else if (tcp_is_rack(sk)) {</div><div class='add'>+	} else {</div><div class='ctx'> 		u32 prior_retrans = tp-&gt;retrans_out;</div><div class='ctx'> </div><div class='del'>-		tcp_rack_mark_lost(sk);</div><div class='add'>+		if (tcp_rack_mark_lost(sk))</div><div class='add'>+			*ack_flag &amp;= ~FLAG_SET_XMIT_TIMER;</div><div class='ctx'> 		if (prior_retrans &gt; tp-&gt;retrans_out)</div><div class='ctx'> 			*ack_flag |= FLAG_LOST_RETRANS;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool tcp_force_fast_retransmit(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	return after(tcp_highest_sack_seq(tp),</div><div class='del'>-		     tp-&gt;snd_una + tp-&gt;reordering * tp-&gt;mss_cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Process an event, which can update packets-in-flight not trivially.</div><div class='ctx'>  * Main goal of this function is to calculate new estimate for left_out,</div><div class='ctx'>  * taking into account both packets sitting in receiver's buffer and</div><div class='hunk'>@@ -2778,24 +3122,23 @@ static bool tcp_force_fast_retransmit(struct sock *sk)</div><div class='ctx'>  * tcp_xmit_retransmit_queue().</div><div class='ctx'>  */</div><div class='ctx'> static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,</div><div class='del'>-				  bool is_dupack, int *ack_flag, int *rexmit)</div><div class='add'>+				  int num_dupack, int *ack_flag, int *rexmit)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	int fast_rexmit = 0, flag = *ack_flag;</div><div class='del'>-	bool do_lost = is_dupack || ((flag &amp; FLAG_DATA_SACKED) &amp;&amp;</div><div class='del'>-				     tcp_force_fast_retransmit(sk));</div><div class='add'>+	int flag = *ack_flag;</div><div class='add'>+	bool ece_ack = flag &amp; FLAG_ECE;</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;packets_out &amp;&amp; tp-&gt;sacked_out)</div><div class='ctx'> 		tp-&gt;sacked_out = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Now state machine starts.</div><div class='ctx'> 	 * A. ECE, hence prohibit cwnd undoing, the reduction is required. */</div><div class='del'>-	if (flag &amp; FLAG_ECE)</div><div class='add'>+	if (ece_ack)</div><div class='ctx'> 		tp-&gt;prior_ssthresh = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* B. In all the states check for reneging SACKs. */</div><div class='del'>-	if (tcp_check_sack_reneging(sk, flag))</div><div class='add'>+	if (tcp_check_sack_reneging(sk, ack_flag))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* C. Check consistency of the current state. */</div><div class='hunk'>@@ -2804,7 +3147,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,</div><div class='ctx'> 	/* D. Check state exit conditions. State can be terminated</div><div class='ctx'> 	 *    when high_seq is ACKed. */</div><div class='ctx'> 	if (icsk-&gt;icsk_ca_state == TCP_CA_Open) {</div><div class='del'>-		WARN_ON(tp-&gt;retrans_out != 0);</div><div class='add'>+		WARN_ON(tp-&gt;retrans_out != 0 &amp;&amp; !tp-&gt;syn_data);</div><div class='ctx'> 		tp-&gt;retrans_stamp = 0;</div><div class='ctx'> 	} else if (!before(tp-&gt;snd_una, tp-&gt;high_seq)) {</div><div class='ctx'> 		switch (icsk-&gt;icsk_ca_state) {</div><div class='hunk'>@@ -2831,42 +3174,46 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,</div><div class='ctx'> 	switch (icsk-&gt;icsk_ca_state) {</div><div class='ctx'> 	case TCP_CA_Recovery:</div><div class='ctx'> 		if (!(flag &amp; FLAG_SND_UNA_ADVANCED)) {</div><div class='del'>-			if (tcp_is_reno(tp) &amp;&amp; is_dupack)</div><div class='del'>-				tcp_add_reno_sack(sk);</div><div class='del'>-		} else {</div><div class='del'>-			if (tcp_try_undo_partial(sk, prior_snd_una))</div><div class='del'>-				return;</div><div class='del'>-			/* Partial ACK arrived. Force fast retransmit. */</div><div class='del'>-			do_lost = tcp_is_reno(tp) ||</div><div class='del'>-				  tcp_force_fast_retransmit(sk);</div><div class='del'>-		}</div><div class='del'>-		if (tcp_try_undo_dsack(sk)) {</div><div class='del'>-			tcp_try_keep_open(sk);</div><div class='add'>+			if (tcp_is_reno(tp))</div><div class='add'>+				tcp_add_reno_sack(sk, num_dupack, ece_ack);</div><div class='add'>+		} else if (tcp_try_undo_partial(sk, prior_snd_una))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if (tcp_try_undo_dsack(sk))</div><div class='add'>+			tcp_try_to_open(sk, flag);</div><div class='add'>+</div><div class='ctx'> 		tcp_identify_packet_loss(sk, ack_flag);</div><div class='add'>+		if (icsk-&gt;icsk_ca_state != TCP_CA_Recovery) {</div><div class='add'>+			if (!tcp_time_to_recover(tp))</div><div class='add'>+				return;</div><div class='add'>+			/* Undo reverts the recovery state. If loss is evident,</div><div class='add'>+			 * starts a new recovery (e.g. reordering then loss);</div><div class='add'>+			 */</div><div class='add'>+			tcp_enter_recovery(sk, ece_ack);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_CA_Loss:</div><div class='del'>-		tcp_process_loss(sk, flag, is_dupack, rexmit);</div><div class='add'>+		tcp_process_loss(sk, flag, num_dupack, rexmit);</div><div class='add'>+		if (icsk-&gt;icsk_ca_state != TCP_CA_Loss)</div><div class='add'>+			tcp_update_rto_time(tp);</div><div class='ctx'> 		tcp_identify_packet_loss(sk, ack_flag);</div><div class='ctx'> 		if (!(icsk-&gt;icsk_ca_state == TCP_CA_Open ||</div><div class='ctx'> 		      (*ack_flag &amp; FLAG_LOST_RETRANS)))</div><div class='ctx'> 			return;</div><div class='ctx'> 		/* Change state if cwnd is undone or retransmits are lost */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (tcp_is_reno(tp)) {</div><div class='ctx'> 			if (flag &amp; FLAG_SND_UNA_ADVANCED)</div><div class='ctx'> 				tcp_reset_reno_sack(tp);</div><div class='del'>-			if (is_dupack)</div><div class='del'>-				tcp_add_reno_sack(sk);</div><div class='add'>+			tcp_add_reno_sack(sk, num_dupack, ece_ack);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (icsk-&gt;icsk_ca_state &lt;= TCP_CA_Disorder)</div><div class='ctx'> 			tcp_try_undo_dsack(sk);</div><div class='ctx'> </div><div class='ctx'> 		tcp_identify_packet_loss(sk, ack_flag);</div><div class='del'>-		if (!tcp_time_to_recover(sk, flag)) {</div><div class='add'>+		if (!tcp_time_to_recover(tp)) {</div><div class='ctx'> 			tcp_try_to_open(sk, flag);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2877,24 +3224,21 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,</div><div class='ctx'> 		    tp-&gt;snd_una == tp-&gt;mtu_probe.probe_seq_start) {</div><div class='ctx'> 			tcp_mtup_probe_failed(sk);</div><div class='ctx'> 			/* Restores the reduction we did in tcp_mtup_probe() */</div><div class='del'>-			tp-&gt;snd_cwnd++;</div><div class='add'>+			tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 			tcp_simple_retransmit(sk);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Otherwise enter Recovery state */</div><div class='del'>-		tcp_enter_recovery(sk, (flag &amp; FLAG_ECE));</div><div class='del'>-		fast_rexmit = 1;</div><div class='add'>+		tcp_enter_recovery(sk, ece_ack);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!tcp_is_rack(sk) &amp;&amp; do_lost)</div><div class='del'>-		tcp_update_scoreboard(sk, fast_rexmit);</div><div class='ctx'> 	*rexmit = REXMIT_LOST;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_update_rtt_min(struct sock *sk, u32 rtt_us, const int flag)</div><div class='ctx'> {</div><div class='del'>-	u32 wlen = sock_net(sk)-&gt;ipv4.sysctl_tcp_min_rtt_wlen * HZ;</div><div class='add'>+	u32 wlen = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_min_rtt_wlen) * HZ;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if ((flag &amp; FLAG_ACK_MAYBE_DELAYED) &amp;&amp; rtt_us &gt; tcp_min_rtt(tp)) {</div><div class='hunk'>@@ -2928,13 +3272,10 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag,</div><div class='ctx'> 	 * left edge of the send window.</div><div class='ctx'> 	 * See draft-ietf-tcplw-high-performance-00, section 3.3.</div><div class='ctx'> 	 */</div><div class='del'>-	if (seq_rtt_us &lt; 0 &amp;&amp; tp-&gt;rx_opt.saw_tstamp &amp;&amp; tp-&gt;rx_opt.rcv_tsecr &amp;&amp;</div><div class='del'>-	    flag &amp; FLAG_ACKED) {</div><div class='del'>-		u32 delta = tcp_time_stamp(tp) - tp-&gt;rx_opt.rcv_tsecr;</div><div class='del'>-		u32 delta_us = delta * (USEC_PER_SEC / TCP_TS_HZ);</div><div class='add'>+	if (seq_rtt_us &lt; 0 &amp;&amp; tp-&gt;rx_opt.saw_tstamp &amp;&amp;</div><div class='add'>+	    tp-&gt;rx_opt.rcv_tsecr &amp;&amp; flag &amp; FLAG_ACKED)</div><div class='add'>+		seq_rtt_us = ca_rtt_us = tcp_rtt_tsopt_us(tp, 1);</div><div class='ctx'> </div><div class='del'>-		seq_rtt_us = ca_rtt_us = delta_us;</div><div class='del'>-	}</div><div class='ctx'> 	rs-&gt;rtt_us = ca_rtt_us; /* RTT of last (S)ACKed packet (or -1) */</div><div class='ctx'> 	if (seq_rtt_us &lt; 0)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2984,7 +3325,7 @@ void tcp_rearm_rto(struct sock *sk)</div><div class='ctx'> 	/* If the retrans timer is currently being used by Fast Open</div><div class='ctx'> 	 * for SYN-ACK retrans purpose, stay put.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tp-&gt;fastopen_rsk)</div><div class='add'>+	if (rcu_access_pointer(tp-&gt;fastopen_rsk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;packets_out) {</div><div class='hunk'>@@ -3000,8 +3341,7 @@ void tcp_rearm_rto(struct sock *sk)</div><div class='ctx'> 			 */</div><div class='ctx'> 			rto = usecs_to_jiffies(max_t(int, delta_us, 1));</div><div class='ctx'> 		}</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,</div><div class='del'>-					  TCP_RTO_MAX);</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3034,7 +3374,7 @@ static u32 tcp_tso_acked(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-			   u32 prior_snd_una)</div><div class='add'>+			   const struct sk_buff *ack_skb, u32 prior_snd_una)</div><div class='ctx'> {</div><div class='ctx'> 	const struct skb_shared_info *shinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -3046,7 +3386,7 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	if (!before(shinfo-&gt;tskey, prior_snd_una) &amp;&amp;</div><div class='ctx'> 	    before(shinfo-&gt;tskey, tcp_sk(sk)-&gt;snd_una)) {</div><div class='ctx'> 		tcp_skb_tsorted_save(skb) {</div><div class='del'>-			__skb_tstamp_tx(skb, NULL, sk, SCM_TSTAMP_ACK);</div><div class='add'>+			__skb_tstamp_tx(skb, ack_skb, NULL, sk, SCM_TSTAMP_ACK);</div><div class='ctx'> 		} tcp_skb_tsorted_restore(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3055,9 +3395,9 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'>  * is before the ack sequence we can discard it as it's confirmed to have</div><div class='ctx'>  * arrived at the other end.</div><div class='ctx'>  */</div><div class='del'>-static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='del'>-			       u32 prior_snd_una,</div><div class='del'>-			       struct tcp_sacktag_state *sack)</div><div class='add'>+static int tcp_clean_rtx_queue(struct sock *sk, const struct sk_buff *ack_skb,</div><div class='add'>+			       u32 prior_fack, u32 prior_snd_una,</div><div class='add'>+			       struct tcp_sacktag_state *sack, bool ece_ack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	u64 first_ackt, last_ackt;</div><div class='hunk'>@@ -3070,7 +3410,6 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 	long seq_rtt_us = -1L;</div><div class='ctx'> 	long ca_rtt_us = -1L;</div><div class='ctx'> 	u32 pkts_acked = 0;</div><div class='del'>-	u32 last_in_flight = 0;</div><div class='ctx'> 	bool rtt_update;</div><div class='ctx'> 	int flag = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3082,8 +3421,6 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 		u8 sacked = scb-&gt;sacked;</div><div class='ctx'> 		u32 acked_pcount;</div><div class='ctx'> </div><div class='del'>-		tcp_ack_tstamp(sk, skb, prior_snd_una);</div><div class='del'>-</div><div class='ctx'> 		/* Determine how many packets and what bytes were acked, tso and else */</div><div class='ctx'> 		if (after(scb-&gt;end_seq, tp-&gt;snd_una)) {</div><div class='ctx'> 			if (tcp_skb_pcount(skb) == 1 ||</div><div class='hunk'>@@ -3103,12 +3440,11 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 				tp-&gt;retrans_out -= acked_pcount;</div><div class='ctx'> 			flag |= FLAG_RETRANS_DATA_ACKED;</div><div class='ctx'> 		} else if (!(sacked &amp; TCPCB_SACKED_ACKED)) {</div><div class='del'>-			last_ackt = skb-&gt;skb_mstamp;</div><div class='add'>+			last_ackt = tcp_skb_timestamp_us(skb);</div><div class='ctx'> 			WARN_ON_ONCE(last_ackt == 0);</div><div class='ctx'> 			if (!first_ackt)</div><div class='ctx'> 				first_ackt = last_ackt;</div><div class='ctx'> </div><div class='del'>-			last_in_flight = TCP_SKB_CB(skb)-&gt;tx.in_flight;</div><div class='ctx'> 			if (before(start_seq, reord))</div><div class='ctx'> 				reord = start_seq;</div><div class='ctx'> 			if (!after(scb-&gt;end_seq, tp-&gt;high_seq))</div><div class='hunk'>@@ -3117,11 +3453,13 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> </div><div class='ctx'> 		if (sacked &amp; TCPCB_SACKED_ACKED) {</div><div class='ctx'> 			tp-&gt;sacked_out -= acked_pcount;</div><div class='add'>+			/* snd_una delta covers these skbs */</div><div class='add'>+			sack-&gt;delivered_bytes -= skb-&gt;len;</div><div class='ctx'> 		} else if (tcp_is_sack(tp)) {</div><div class='del'>-			tp-&gt;delivered += acked_pcount;</div><div class='add'>+			tcp_count_delivered(tp, acked_pcount, ece_ack);</div><div class='ctx'> 			if (!tcp_skb_spurious_retrans(tp, skb))</div><div class='ctx'> 				tcp_rack_advance(tp, sacked, scb-&gt;end_seq,</div><div class='del'>-						 skb-&gt;skb_mstamp);</div><div class='add'>+						 tcp_skb_timestamp_us(skb));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sacked &amp; TCPCB_LOST)</div><div class='ctx'> 			tp-&gt;lost_out -= acked_pcount;</div><div class='hunk'>@@ -3147,11 +3485,12 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 		if (!fully_acked)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		tcp_ack_tstamp(sk, skb, ack_skb, prior_snd_una);</div><div class='add'>+</div><div class='ctx'> 		next = skb_rb_next(skb);</div><div class='ctx'> 		if (unlikely(skb == tp-&gt;retransmit_skb_hint))</div><div class='ctx'> 			tp-&gt;retransmit_skb_hint = NULL;</div><div class='del'>-		if (unlikely(skb == tp-&gt;lost_skb_hint))</div><div class='del'>-			tp-&gt;lost_skb_hint = NULL;</div><div class='add'>+		tcp_highest_sack_replace(sk, skb, next);</div><div class='ctx'> 		tcp_rtx_queue_unlink_and_free(skb, sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3161,15 +3500,18 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 	if (likely(between(tp-&gt;snd_up, prior_snd_una, tp-&gt;snd_una)))</div><div class='ctx'> 		tp-&gt;snd_up = tp-&gt;snd_una;</div><div class='ctx'> </div><div class='del'>-	if (skb &amp;&amp; (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED))</div><div class='del'>-		flag |= FLAG_SACK_RENEGING;</div><div class='add'>+	if (skb) {</div><div class='add'>+		tcp_ack_tstamp(sk, skb, ack_skb, prior_snd_una);</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED)</div><div class='add'>+			flag |= FLAG_SACK_RENEGING;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(first_ackt) &amp;&amp; !(flag &amp; FLAG_RETRANS_DATA_ACKED)) {</div><div class='ctx'> 		seq_rtt_us = tcp_stamp_us_delta(tp-&gt;tcp_mstamp, first_ackt);</div><div class='ctx'> 		ca_rtt_us = tcp_stamp_us_delta(tp-&gt;tcp_mstamp, last_ackt);</div><div class='ctx'> </div><div class='del'>-		if (pkts_acked == 1 &amp;&amp; last_in_flight &lt; tp-&gt;mss_cache &amp;&amp;</div><div class='del'>-		    last_in_flight &amp;&amp; !prior_sacked &amp;&amp; fully_acked &amp;&amp;</div><div class='add'>+		if (pkts_acked == 1 &amp;&amp; fully_acked &amp;&amp; !prior_sacked &amp;&amp;</div><div class='add'>+		    (tp-&gt;snd_una - prior_snd_una) &lt; tp-&gt;mss_cache &amp;&amp;</div><div class='ctx'> 		    sack-&gt;rate-&gt;prior_delivered + 1 == tp-&gt;delivered &amp;&amp;</div><div class='ctx'> 		    !(flag &amp; (FLAG_CA_ALERT | FLAG_SYN_ACKED))) {</div><div class='ctx'> 			/* Conservatively mark a delayed ACK. It's typically</div><div class='hunk'>@@ -3194,7 +3536,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_is_reno(tp)) {</div><div class='del'>-			tcp_remove_reno_sacks(sk, pkts_acked);</div><div class='add'>+			tcp_remove_reno_sacks(sk, pkts_acked, ece_ack);</div><div class='ctx'> </div><div class='ctx'> 			/* If any of the cumulatively ACKed segments was</div><div class='ctx'> 			 * retransmitted, non-SACK case cannot confirm that</div><div class='hunk'>@@ -3205,17 +3547,17 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> 			if (flag &amp; FLAG_RETRANS_DATA_ACKED)</div><div class='ctx'> 				flag &amp;= ~FLAG_ORIG_SACK_ACKED;</div><div class='ctx'> 		} else {</div><div class='del'>-			int delta;</div><div class='del'>-</div><div class='ctx'> 			/* Non-retransmitted hole got filled? That's reordering */</div><div class='ctx'> 			if (before(reord, prior_fack))</div><div class='ctx'> 				tcp_check_sack_reordering(sk, reord, 0);</div><div class='del'>-</div><div class='del'>-			delta = prior_sacked - tp-&gt;sacked_out;</div><div class='del'>-			tp-&gt;lost_cnt_hint -= min(tp-&gt;lost_cnt_hint, delta);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		sack-&gt;delivered_bytes = (skb ?</div><div class='add'>+					 TCP_SKB_CB(skb)-&gt;seq : tp-&gt;snd_una) -</div><div class='add'>+					 prior_snd_una;</div><div class='ctx'> 	} else if (skb &amp;&amp; rtt_update &amp;&amp; sack_rtt_us &gt;= 0 &amp;&amp;</div><div class='del'>-		   sack_rtt_us &gt; tcp_stamp_us_delta(tp-&gt;tcp_mstamp, skb-&gt;skb_mstamp)) {</div><div class='add'>+		   sack_rtt_us &gt; tcp_stamp_us_delta(tp-&gt;tcp_mstamp,</div><div class='add'>+						    tcp_skb_timestamp_us(skb))) {</div><div class='ctx'> 		/* Do not re-arm RTO if the sack RTT is measured from data sent</div><div class='ctx'> 		 * after when the head was last (re)transmitted. Otherwise the</div><div class='ctx'> 		 * timeout may continue to extend in loss recovery.</div><div class='hunk'>@@ -3225,9 +3567,10 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,</div><div class='ctx'> </div><div class='ctx'> 	if (icsk-&gt;icsk_ca_ops-&gt;pkts_acked) {</div><div class='ctx'> 		struct ack_sample sample = { .pkts_acked = pkts_acked,</div><div class='del'>-					     .rtt_us = sack-&gt;rate-&gt;rtt_us,</div><div class='del'>-					     .in_flight = last_in_flight };</div><div class='add'>+					     .rtt_us = sack-&gt;rate-&gt;rtt_us };</div><div class='ctx'> </div><div class='add'>+		sample.in_flight = tp-&gt;mss_cache *</div><div class='add'>+			(tp-&gt;delivered - sack-&gt;rate-&gt;prior_delivered);</div><div class='ctx'> 		icsk-&gt;icsk_ca_ops-&gt;pkts_acked(sk, &amp;sample);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3268,15 +3611,16 @@ static void tcp_ack_probe(struct sock *sk)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!after(TCP_SKB_CB(head)-&gt;end_seq, tcp_wnd_end(tp))) {</div><div class='ctx'> 		icsk-&gt;icsk_backoff = 0;</div><div class='add'>+		icsk-&gt;icsk_probes_tstamp = 0;</div><div class='ctx'> 		inet_csk_clear_xmit_timer(sk, ICSK_TIME_PROBE0);</div><div class='ctx'> 		/* Socket must be waked up by subsequent tcp_data_snd_check().</div><div class='ctx'> 		 * This function is not for random using!</div><div class='ctx'> 		 */</div><div class='ctx'> 	} else {</div><div class='del'>-		unsigned long when = tcp_probe0_when(sk, TCP_RTO_MAX);</div><div class='add'>+		unsigned long when = tcp_probe0_when(sk, tcp_rto_max(sk));</div><div class='ctx'> </div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,</div><div class='del'>-					  when, TCP_RTO_MAX);</div><div class='add'>+		when = tcp_clamp_probe0_to_user_timeout(sk, when);</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3295,7 +3639,8 @@ static inline bool tcp_may_raise_cwnd(const struct sock *sk, const int flag)</div><div class='ctx'> 	 * new SACK or ECE mark may first advance cwnd here and later reduce</div><div class='ctx'> 	 * cwnd in tcp_fastretrans_alert() based on more states.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tcp_sk(sk)-&gt;reordering &gt; sock_net(sk)-&gt;ipv4.sysctl_tcp_reordering)</div><div class='add'>+	if (tcp_sk(sk)-&gt;reordering &gt;</div><div class='add'>+	    READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reordering))</div><div class='ctx'> 		return flag &amp; FLAG_FORWARD_PROGRESS;</div><div class='ctx'> </div><div class='ctx'> 	return flag &amp; FLAG_DATA_ACKED;</div><div class='hunk'>@@ -3312,13 +3657,13 @@ static void tcp_cong_control(struct sock *sk, u32 ack, u32 acked_sacked,</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (icsk-&gt;icsk_ca_ops-&gt;cong_control) {</div><div class='del'>-		icsk-&gt;icsk_ca_ops-&gt;cong_control(sk, rs);</div><div class='add'>+		icsk-&gt;icsk_ca_ops-&gt;cong_control(sk, ack, flag, rs);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_in_cwnd_reduction(sk)) {</div><div class='ctx'> 		/* Reduce cwnd if state mandates */</div><div class='del'>-		tcp_cwnd_reduction(sk, acked_sacked, flag);</div><div class='add'>+		tcp_cwnd_reduction(sk, acked_sacked, rs-&gt;losses, flag);</div><div class='ctx'> 	} else if (tcp_may_raise_cwnd(sk, flag)) {</div><div class='ctx'> 		/* Advance cwnd if state allows */</div><div class='ctx'> 		tcp_cong_avoid(sk, ack, acked_sacked);</div><div class='hunk'>@@ -3335,7 +3680,24 @@ static inline bool tcp_may_update_window(const struct tcp_sock *tp,</div><div class='ctx'> {</div><div class='ctx'> 	return	after(ack, tp-&gt;snd_una) ||</div><div class='ctx'> 		after(ack_seq, tp-&gt;snd_wl1) ||</div><div class='del'>-		(ack_seq == tp-&gt;snd_wl1 &amp;&amp; nwin &gt; tp-&gt;snd_wnd);</div><div class='add'>+		(ack_seq == tp-&gt;snd_wl1 &amp;&amp; (nwin &gt; tp-&gt;snd_wnd || !nwin));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_snd_sne_update(struct tcp_sock *tp, u32 ack)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_ao_needed.key))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_protected(tp-&gt;ao_info,</div><div class='add'>+				       lockdep_sock_is_held((struct sock *)tp));</div><div class='add'>+	if (ao &amp;&amp; ack &lt; tp-&gt;snd_una) {</div><div class='add'>+		ao-&gt;snd_sne++;</div><div class='add'>+		trace_tcp_ao_snd_sne_update((struct sock *)tp, ao-&gt;snd_sne);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If we update tp-&gt;snd_una, also update tp-&gt;bytes_acked */</div><div class='hunk'>@@ -3345,9 +3707,27 @@ static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack)</div><div class='ctx'> </div><div class='ctx'> 	sock_owned_by_me((struct sock *)tp);</div><div class='ctx'> 	tp-&gt;bytes_acked += delta;</div><div class='add'>+	tcp_snd_sne_update(tp, ack);</div><div class='ctx'> 	tp-&gt;snd_una = ack;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_rcv_sne_update(struct tcp_sock *tp, u32 seq)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_ao_needed.key))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference_protected(tp-&gt;ao_info,</div><div class='add'>+				       lockdep_sock_is_held((struct sock *)tp));</div><div class='add'>+	if (ao &amp;&amp; seq &lt; tp-&gt;rcv_nxt) {</div><div class='add'>+		ao-&gt;rcv_sne++;</div><div class='add'>+		trace_tcp_ao_rcv_sne_update((struct sock *)tp, ao-&gt;rcv_sne);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* If we update tp-&gt;rcv_nxt, also update tp-&gt;bytes_received */</div><div class='ctx'> static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq)</div><div class='ctx'> {</div><div class='hunk'>@@ -3355,7 +3735,8 @@ static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq)</div><div class='ctx'> </div><div class='ctx'> 	sock_owned_by_me((struct sock *)tp);</div><div class='ctx'> 	tp-&gt;bytes_received += delta;</div><div class='del'>-	tp-&gt;rcv_nxt = seq;</div><div class='add'>+	tcp_rcv_sne_update(tp, seq);</div><div class='add'>+	WRITE_ONCE(tp-&gt;rcv_nxt, seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Update our send window.</div><div class='hunk'>@@ -3404,16 +3785,23 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32</div><div class='ctx'> static bool __tcp_oow_rate_limited(struct net *net, int mib_idx,</div><div class='ctx'> 				   u32 *last_oow_ack_time)</div><div class='ctx'> {</div><div class='del'>-	if (*last_oow_ack_time) {</div><div class='del'>-		s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time);</div><div class='add'>+	/* Paired with the WRITE_ONCE() in this function. */</div><div class='add'>+	u32 val = READ_ONCE(*last_oow_ack_time);</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		s32 elapsed = (s32)(tcp_jiffies32 - val);</div><div class='ctx'> </div><div class='del'>-		if (0 &lt;= elapsed &amp;&amp; elapsed &lt; net-&gt;ipv4.sysctl_tcp_invalid_ratelimit) {</div><div class='add'>+		if (0 &lt;= elapsed &amp;&amp;</div><div class='add'>+		    elapsed &lt; READ_ONCE(net-&gt;ipv4.sysctl_tcp_invalid_ratelimit)) {</div><div class='ctx'> 			NET_INC_STATS(net, mib_idx);</div><div class='ctx'> 			return true;	/* rate-limited: don't send yet! */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*last_oow_ack_time = tcp_jiffies32;</div><div class='add'>+	/* Paired with the prior READ_ONCE() and with itself,</div><div class='add'>+	 * as we might be lockless.</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(*last_oow_ack_time, tcp_jiffies32);</div><div class='ctx'> </div><div class='ctx'> 	return false;	/* not rate-limited: go ahead, send dupack now! */</div><div class='ctx'> }</div><div class='hunk'>@@ -3436,15 +3824,22 @@ bool tcp_oow_rate_limited(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 	return __tcp_oow_rate_limited(net, mib_idx, last_oow_ack_time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_send_ack_reflect_ect(struct sock *sk, bool accecn_reflector)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (accecn_reflector)</div><div class='add'>+		flags = tcp_accecn_reflector_flags(tp-&gt;syn_ect_rcv);</div><div class='add'>+	__tcp_send_ack(sk, tp-&gt;rcv_nxt, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* RFC 5961 7 [ACK Throttling] */</div><div class='del'>-static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+static void tcp_send_challenge_ack(struct sock *sk, bool accecn_reflector)</div><div class='ctx'> {</div><div class='del'>-	/* unprotected vars, we dont care of overwrites */</div><div class='del'>-	static u32 challenge_timestamp;</div><div class='del'>-	static unsigned int challenge_count;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	u32 count, now;</div><div class='add'>+	u32 count, now, ack_limit;</div><div class='ctx'> </div><div class='ctx'> 	/* First check our per-socket dupack rate limit. */</div><div class='ctx'> 	if (__tcp_oow_rate_limited(net,</div><div class='hunk'>@@ -3452,20 +3847,25 @@ static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 				   &amp;tp-&gt;last_oow_ack_time))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	ack_limit = READ_ONCE(net-&gt;ipv4.sysctl_tcp_challenge_ack_limit);</div><div class='add'>+	if (ack_limit == INT_MAX)</div><div class='add'>+		goto send_ack;</div><div class='add'>+</div><div class='ctx'> 	/* Then check host-wide RFC 5961 rate limit. */</div><div class='ctx'> 	now = jiffies / HZ;</div><div class='del'>-	if (now != challenge_timestamp) {</div><div class='del'>-		u32 ack_limit = net-&gt;ipv4.sysctl_tcp_challenge_ack_limit;</div><div class='add'>+	if (now != READ_ONCE(net-&gt;ipv4.tcp_challenge_timestamp)) {</div><div class='ctx'> 		u32 half = (ack_limit + 1) &gt;&gt; 1;</div><div class='ctx'> </div><div class='del'>-		challenge_timestamp = now;</div><div class='del'>-		WRITE_ONCE(challenge_count, half + prandom_u32_max(ack_limit));</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv4.tcp_challenge_timestamp, now);</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv4.tcp_challenge_count,</div><div class='add'>+			   get_random_u32_inclusive(half, ack_limit + half - 1));</div><div class='ctx'> 	}</div><div class='del'>-	count = READ_ONCE(challenge_count);</div><div class='add'>+	count = READ_ONCE(net-&gt;ipv4.tcp_challenge_count);</div><div class='ctx'> 	if (count &gt; 0) {</div><div class='del'>-		WRITE_ONCE(challenge_count, count - 1);</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv4.tcp_challenge_count, count - 1);</div><div class='add'>+send_ack:</div><div class='ctx'> 		NET_INC_STATS(net, LINUX_MIB_TCPCHALLENGEACK);</div><div class='del'>-		tcp_send_ack(sk);</div><div class='add'>+		tcp_send_ack_reflect_ect(sk, accecn_reflector);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3475,8 +3875,16 @@ static void tcp_store_ts_recent(struct tcp_sock *tp)</div><div class='ctx'> 	tp-&gt;rx_opt.ts_recent_stamp = ktime_get_seconds();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)</div><div class='add'>+static int __tcp_replace_ts_recent(struct tcp_sock *tp, s32 tstamp_delta)</div><div class='ctx'> {</div><div class='add'>+	tcp_store_ts_recent(tp);</div><div class='add'>+	return tstamp_delta &gt; 0 ? FLAG_TS_PROGRESS : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)</div><div class='add'>+{</div><div class='add'>+	s32 delta;</div><div class='add'>+</div><div class='ctx'> 	if (tp-&gt;rx_opt.saw_tstamp &amp;&amp; !after(seq, tp-&gt;rcv_wup)) {</div><div class='ctx'> 		/* PAWS bug workaround wrt. ACK frames, the PAWS discard</div><div class='ctx'> 		 * extra check below makes sure this can only happen</div><div class='hunk'>@@ -3485,15 +3893,17 @@ static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)</div><div class='ctx'> 		 * Not only, also it occurs for expired timestamps.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (tcp_paws_check(&amp;tp-&gt;rx_opt, 0))</div><div class='del'>-			tcp_store_ts_recent(tp);</div><div class='add'>+		if (tcp_paws_check(&amp;tp-&gt;rx_opt, 0)) {</div><div class='add'>+			delta = tp-&gt;rx_opt.rcv_tsval - tp-&gt;rx_opt.ts_recent;</div><div class='add'>+			return __tcp_replace_ts_recent(tp, delta);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This routine deals with acks during a TLP episode.</div><div class='del'>- * We mark the end of a TLP episode on receiving TLP dupack or when</div><div class='del'>- * ack is after tlp_high_seq.</div><div class='del'>- * Ref: loss detection algorithm in draft-dukkipati-tcpm-tcp-loss-probe.</div><div class='add'>+/* This routine deals with acks during a TLP episode and ends an episode by</div><div class='add'>+ * resetting tlp_high_seq. Ref: TLP algorithm in RFC8985</div><div class='ctx'>  */</div><div class='ctx'> static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)</div><div class='ctx'> {</div><div class='hunk'>@@ -3502,7 +3912,10 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)</div><div class='ctx'> 	if (before(ack, tp-&gt;tlp_high_seq))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (flag &amp; FLAG_DSACKING_ACK) {</div><div class='add'>+	if (!tp-&gt;tlp_retrans) {</div><div class='add'>+		/* TLP of new data has been acknowledged */</div><div class='add'>+		tp-&gt;tlp_high_seq = 0;</div><div class='add'>+	} else if (flag &amp; FLAG_DSACK_TLP) {</div><div class='ctx'> 		/* This DSACK means original and TLP probe arrived; no loss */</div><div class='ctx'> 		tp-&gt;tlp_high_seq = 0;</div><div class='ctx'> 	} else if (after(ack, tp-&gt;tlp_high_seq)) {</div><div class='hunk'>@@ -3522,12 +3935,23 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void tcp_in_ack_event(struct sock *sk, u32 flags)</div><div class='add'>+static void tcp_in_ack_event(struct sock *sk, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_ca_ops-&gt;in_ack_event)</div><div class='del'>-		icsk-&gt;icsk_ca_ops-&gt;in_ack_event(sk, flags);</div><div class='add'>+	if (icsk-&gt;icsk_ca_ops-&gt;in_ack_event) {</div><div class='add'>+		u32 ack_ev_flags = 0;</div><div class='add'>+</div><div class='add'>+		if (flag &amp; FLAG_WIN_UPDATE)</div><div class='add'>+			ack_ev_flags |= CA_ACK_WIN_UPDATE;</div><div class='add'>+		if (flag &amp; FLAG_SLOWPATH) {</div><div class='add'>+			ack_ev_flags |= CA_ACK_SLOWPATH;</div><div class='add'>+			if (flag &amp; FLAG_ECE)</div><div class='add'>+				ack_ev_flags |= CA_ACK_ECE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		icsk-&gt;icsk_ca_ops-&gt;in_ack_event(sk, ack_ev_flags);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Congestion control has updated the cwnd already. So if we're in</div><div class='hunk'>@@ -3538,10 +3962,10 @@ static void tcp_xmit_recovery(struct sock *sk, int rexmit)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (rexmit == REXMIT_NONE)</div><div class='add'>+	if (rexmit == REXMIT_NONE || sk-&gt;sk_state == TCP_SYN_SENT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(rexmit == 2)) {</div><div class='add'>+	if (unlikely(rexmit == REXMIT_NEW)) {</div><div class='ctx'> 		__tcp_push_pending_frames(sk, tcp_current_mss(sk),</div><div class='ctx'> 					  TCP_NAGLE_OFF);</div><div class='ctx'> 		if (after(tp-&gt;snd_nxt, tp-&gt;high_seq))</div><div class='hunk'>@@ -3552,7 +3976,8 @@ static void tcp_xmit_recovery(struct sock *sk, int rexmit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns the number of packets newly acked or sacked by the current ACK */</div><div class='del'>-static u32 tcp_newly_delivered(struct sock *sk, u32 prior_delivered, int flag)</div><div class='add'>+static u32 tcp_newly_delivered(struct sock *sk, u32 prior_delivered,</div><div class='add'>+			       u32 ecn_count, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net *net = sock_net(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -3560,10 +3985,13 @@ static u32 tcp_newly_delivered(struct sock *sk, u32 prior_delivered, int flag)</div><div class='ctx'> </div><div class='ctx'> 	delivered = tp-&gt;delivered - prior_delivered;</div><div class='ctx'> 	NET_ADD_STATS(net, LINUX_MIB_TCPDELIVERED, delivered);</div><div class='add'>+</div><div class='ctx'> 	if (flag &amp; FLAG_ECE) {</div><div class='del'>-		tp-&gt;delivered_ce += delivered;</div><div class='del'>-		NET_ADD_STATS(net, LINUX_MIB_TCPDELIVEREDCE, delivered);</div><div class='add'>+		if (tcp_ecn_mode_rfc3168(tp))</div><div class='add'>+			ecn_count = delivered;</div><div class='add'>+		NET_ADD_STATS(net, LINUX_MIB_TCPDELIVEREDCE, ecn_count);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return delivered;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3578,15 +4006,18 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 	bool is_sack_reneg = tp-&gt;is_sack_reneg;</div><div class='ctx'> 	u32 ack_seq = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 	u32 ack = TCP_SKB_CB(skb)-&gt;ack_seq;</div><div class='del'>-	bool is_dupack = false;</div><div class='add'>+	int num_dupack = 0;</div><div class='ctx'> 	int prior_packets = tp-&gt;packets_out;</div><div class='ctx'> 	u32 delivered = tp-&gt;delivered;</div><div class='ctx'> 	u32 lost = tp-&gt;lost;</div><div class='ctx'> 	int rexmit = REXMIT_NONE; /* Flag to (re)transmit to recover losses */</div><div class='add'>+	u32 ecn_count = 0;	  /* Did we receive ECE/an AccECN ACE update? */</div><div class='ctx'> 	u32 prior_fack;</div><div class='ctx'> </div><div class='ctx'> 	sack_state.first_sackt = 0;</div><div class='ctx'> 	sack_state.rate = &amp;rs;</div><div class='add'>+	sack_state.sack_delivered = 0;</div><div class='add'>+	sack_state.delivered_bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We very likely will need to access rtx queue. */</div><div class='ctx'> 	prefetch(sk-&gt;tcp_rtx_queue.rb_node);</div><div class='hunk'>@@ -3595,11 +4026,15 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 	 * then we can probably ignore it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (before(ack, prior_snd_una)) {</div><div class='add'>+		u32 max_window;</div><div class='add'>+</div><div class='add'>+		/* do not accept ACK for bytes we never sent. */</div><div class='add'>+		max_window = min_t(u64, tp-&gt;max_window, tp-&gt;bytes_acked);</div><div class='ctx'> 		/* RFC 5961 5.2 [Blind Data Injection Attack].[Mitigation] */</div><div class='del'>-		if (before(ack, prior_snd_una - tp-&gt;max_window)) {</div><div class='add'>+		if (before(ack, prior_snd_una - max_window)) {</div><div class='ctx'> 			if (!(flag &amp; FLAG_NO_CHALLENGE_ACK))</div><div class='del'>-				tcp_send_challenge_ack(sk, skb);</div><div class='del'>-			return -1;</div><div class='add'>+				tcp_send_challenge_ack(sk, false);</div><div class='add'>+			return -SKB_DROP_REASON_TCP_TOO_OLD_ACK;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto old_ack;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3608,16 +4043,16 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 	 * this segment (RFC793 Section 3.9).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (after(ack, tp-&gt;snd_nxt))</div><div class='del'>-		goto invalid_ack;</div><div class='add'>+		return -SKB_DROP_REASON_TCP_ACK_UNSENT_DATA;</div><div class='ctx'> </div><div class='ctx'> 	if (after(ack, prior_snd_una)) {</div><div class='ctx'> 		flag |= FLAG_SND_UNA_ADVANCED;</div><div class='del'>-		icsk-&gt;icsk_retransmits = 0;</div><div class='add'>+		WRITE_ONCE(icsk-&gt;icsk_retransmits, 0);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='del'>-		if (static_branch_unlikely(&amp;clean_acked_data_enabled))</div><div class='del'>-			if (icsk-&gt;icsk_clean_acked)</div><div class='del'>-				icsk-&gt;icsk_clean_acked(sk, ack);</div><div class='add'>+		if (static_branch_unlikely(&amp;clean_acked_data_enabled.key))</div><div class='add'>+			if (tp-&gt;tcp_clean_acked)</div><div class='add'>+				tp-&gt;tcp_clean_acked(sk, ack);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3628,9 +4063,10 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 	 * is in window.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flag &amp; FLAG_UPDATE_TS_RECENT)</div><div class='del'>-		tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)-&gt;seq);</div><div class='add'>+		flag |= tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)-&gt;seq);</div><div class='ctx'> </div><div class='del'>-	if (!(flag &amp; FLAG_SLOWPATH) &amp;&amp; after(ack, prior_snd_una)) {</div><div class='add'>+	if ((flag &amp; (FLAG_SLOWPATH | FLAG_SND_UNA_ADVANCED)) ==</div><div class='add'>+	    FLAG_SND_UNA_ADVANCED) {</div><div class='ctx'> 		/* Window is constant, pure forward advance.</div><div class='ctx'> 		 * No more checks are required.</div><div class='ctx'> 		 * Note, we use the fact that SND.UNA&gt;=SND.WL2.</div><div class='hunk'>@@ -3639,12 +4075,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 		tcp_snd_una_update(tp, ack);</div><div class='ctx'> 		flag |= FLAG_WIN_UPDATE;</div><div class='ctx'> </div><div class='del'>-		tcp_in_ack_event(sk, CA_ACK_WIN_UPDATE);</div><div class='del'>-</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPHPACKS);</div><div class='ctx'> 	} else {</div><div class='del'>-		u32 ack_ev_flags = CA_ACK_SLOWPATH;</div><div class='del'>-</div><div class='ctx'> 		if (ack_seq != TCP_SKB_CB(skb)-&gt;end_seq)</div><div class='ctx'> 			flag |= FLAG_DATA;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3656,47 +4088,71 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 			flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,</div><div class='ctx'> 							&amp;sack_state);</div><div class='ctx'> </div><div class='del'>-		if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) {</div><div class='add'>+		if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb)))</div><div class='ctx'> 			flag |= FLAG_ECE;</div><div class='del'>-			ack_ev_flags |= CA_ACK_ECE;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (flag &amp; FLAG_WIN_UPDATE)</div><div class='del'>-			ack_ev_flags |= CA_ACK_WIN_UPDATE;</div><div class='del'>-</div><div class='del'>-		tcp_in_ack_event(sk, ack_ev_flags);</div><div class='add'>+		if (sack_state.sack_delivered)</div><div class='add'>+			tcp_count_delivered(tp, sack_state.sack_delivered,</div><div class='add'>+					    flag &amp; FLAG_ECE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* This is a deviation from RFC3168 since it states that:</div><div class='add'>+	 * "When the TCP data sender is ready to set the CWR bit after reducing</div><div class='add'>+	 * the congestion window, it SHOULD set the CWR bit only on the first</div><div class='add'>+	 * new data packet that it transmits."</div><div class='add'>+	 * We accept CWR on pure ACKs to be more robust</div><div class='add'>+	 * with widely-deployed TCP implementations that do this.</div><div class='add'>+	 */</div><div class='add'>+	tcp_ecn_accept_cwr(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	/* We passed data and got it acked, remove any soft error</div><div class='ctx'> 	 * log. Something worked...</div><div class='ctx'> 	 */</div><div class='del'>-	sk-&gt;sk_err_soft = 0;</div><div class='del'>-	icsk-&gt;icsk_probes_out = 0;</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_err_soft))</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, 0);</div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_probes_out, 0);</div><div class='ctx'> 	tp-&gt;rcv_tstamp = tcp_jiffies32;</div><div class='ctx'> 	if (!prior_packets)</div><div class='ctx'> 		goto no_queue;</div><div class='ctx'> </div><div class='ctx'> 	/* See if we can take anything off of the retransmit queue. */</div><div class='del'>-	flag |= tcp_clean_rtx_queue(sk, prior_fack, prior_snd_una, &amp;sack_state);</div><div class='add'>+	flag |= tcp_clean_rtx_queue(sk, skb, prior_fack, prior_snd_una,</div><div class='add'>+				    &amp;sack_state, flag &amp; FLAG_ECE);</div><div class='ctx'> </div><div class='ctx'> 	tcp_rack_update_reo_wnd(sk, &amp;rs);</div><div class='ctx'> </div><div class='add'>+	if (tcp_ecn_mode_accecn(tp))</div><div class='add'>+		ecn_count = tcp_accecn_process(sk, skb,</div><div class='add'>+					       tp-&gt;delivered - delivered,</div><div class='add'>+					       sack_state.delivered_bytes,</div><div class='add'>+					       &amp;flag);</div><div class='add'>+</div><div class='add'>+	tcp_in_ack_event(sk, flag);</div><div class='add'>+</div><div class='ctx'> 	if (tp-&gt;tlp_high_seq)</div><div class='ctx'> 		tcp_process_tlp_ack(sk, ack, flag);</div><div class='del'>-	/* If needed, reset TLP/RTO timer; RACK may later override this. */</div><div class='del'>-	if (flag &amp; FLAG_SET_XMIT_TIMER)</div><div class='del'>-		tcp_set_xmit_timer(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_ack_is_dubious(sk, flag)) {</div><div class='del'>-		is_dupack = !(flag &amp; (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP));</div><div class='del'>-		tcp_fastretrans_alert(sk, prior_snd_una, is_dupack, &amp;flag,</div><div class='add'>+		if (!(flag &amp; (FLAG_SND_UNA_ADVANCED |</div><div class='add'>+			      FLAG_NOT_DUP | FLAG_DSACKING_ACK))) {</div><div class='add'>+			num_dupack = 1;</div><div class='add'>+			/* Consider if pure acks were aggregated in tcp_add_backlog() */</div><div class='add'>+			if (!(flag &amp; FLAG_DATA))</div><div class='add'>+				num_dupack = max_t(u16, 1, skb_shinfo(skb)-&gt;gso_segs);</div><div class='add'>+		}</div><div class='add'>+		tcp_fastretrans_alert(sk, prior_snd_una, num_dupack, &amp;flag,</div><div class='ctx'> 				      &amp;rexmit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If needed, reset TLP/RTO timer when RACK doesn't set. */</div><div class='add'>+	if (flag &amp; FLAG_SET_XMIT_TIMER)</div><div class='add'>+		tcp_set_xmit_timer(sk);</div><div class='add'>+</div><div class='ctx'> 	if ((flag &amp; FLAG_FORWARD_PROGRESS) || !(flag &amp; FLAG_NOT_DUP))</div><div class='ctx'> 		sk_dst_confirm(sk);</div><div class='ctx'> </div><div class='del'>-	delivered = tcp_newly_delivered(sk, delivered, flag);</div><div class='add'>+	delivered = tcp_newly_delivered(sk, delivered, ecn_count, flag);</div><div class='add'>+</div><div class='ctx'> 	lost = tp-&gt;lost - lost;			/* freshly marked lost */</div><div class='ctx'> 	rs.is_ack_delayed = !!(flag &amp; FLAG_ACK_MAYBE_DELAYED);</div><div class='ctx'> 	tcp_rate_gen(sk, delivered, lost, is_sack_reneg, sack_state.rate);</div><div class='hunk'>@@ -3705,11 +4161,17 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> no_queue:</div><div class='add'>+	if (tcp_ecn_mode_accecn(tp))</div><div class='add'>+		ecn_count = tcp_accecn_process(sk, skb,</div><div class='add'>+					       tp-&gt;delivered - delivered,</div><div class='add'>+					       sack_state.delivered_bytes,</div><div class='add'>+					       &amp;flag);</div><div class='add'>+	tcp_in_ack_event(sk, flag);</div><div class='ctx'> 	/* If data was DSACKed, see if we can undo a cwnd reduction. */</div><div class='ctx'> 	if (flag &amp; FLAG_DSACKING_ACK) {</div><div class='del'>-		tcp_fastretrans_alert(sk, prior_snd_una, is_dupack, &amp;flag,</div><div class='add'>+		tcp_fastretrans_alert(sk, prior_snd_una, num_dupack, &amp;flag,</div><div class='ctx'> 				      &amp;rexmit);</div><div class='del'>-		tcp_newly_delivered(sk, delivered, flag);</div><div class='add'>+		tcp_newly_delivered(sk, delivered, ecn_count, flag);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* If this ack opens up a zero window, clear backoff.  It was</div><div class='ctx'> 	 * being used to time the probes, and is probably far higher than</div><div class='hunk'>@@ -3721,10 +4183,6 @@ no_queue:</div><div class='ctx'> 		tcp_process_tlp_ack(sk, ack, flag);</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='del'>-invalid_ack:</div><div class='del'>-	SOCK_DEBUG(sk, "Ack %u after %u:%u\n", ack, tp-&gt;snd_una, tp-&gt;snd_nxt);</div><div class='del'>-	return -1;</div><div class='del'>-</div><div class='ctx'> old_ack:</div><div class='ctx'> 	/* If data was SACKed, tag it and see if we should send more data.</div><div class='ctx'> 	 * If data was DSACKed, see if we can undo a cwnd reduction.</div><div class='hunk'>@@ -3732,13 +4190,12 @@ old_ack:</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;sacked) {</div><div class='ctx'> 		flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,</div><div class='ctx'> 						&amp;sack_state);</div><div class='del'>-		tcp_fastretrans_alert(sk, prior_snd_una, is_dupack, &amp;flag,</div><div class='add'>+		tcp_fastretrans_alert(sk, prior_snd_una, num_dupack, &amp;flag,</div><div class='ctx'> 				      &amp;rexmit);</div><div class='del'>-		tcp_newly_delivered(sk, delivered, flag);</div><div class='add'>+		tcp_newly_delivered(sk, delivered, ecn_count, flag);</div><div class='ctx'> 		tcp_xmit_recovery(sk, rexmit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SOCK_DEBUG(sk, "Ack %u before %u:%u\n", ack, tp-&gt;snd_una, tp-&gt;snd_nxt);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3759,7 +4216,7 @@ static void tcp_parse_fastopen_option(int len, const unsigned char *cookie,</div><div class='ctx'> 	foc-&gt;exp = exp_opt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void smc_parse_options(const struct tcphdr *th,</div><div class='add'>+static bool smc_parse_options(const struct tcphdr *th,</div><div class='ctx'> 			      struct tcp_options_received *opt_rx,</div><div class='ctx'> 			      const unsigned char *ptr,</div><div class='ctx'> 			      int opsize)</div><div class='hunk'>@@ -3768,10 +4225,56 @@ static void smc_parse_options(const struct tcphdr *th,</div><div class='ctx'> 	if (static_branch_unlikely(&amp;tcp_have_smc)) {</div><div class='ctx'> 		if (th-&gt;syn &amp;&amp; !(opsize &amp; 1) &amp;&amp;</div><div class='ctx'> 		    opsize &gt;= TCPOLEN_EXP_SMC_BASE &amp;&amp;</div><div class='del'>-		    get_unaligned_be32(ptr) == TCPOPT_SMC_MAGIC)</div><div class='add'>+		    get_unaligned_be32(ptr) == TCPOPT_SMC_MAGIC) {</div><div class='ctx'> 			opt_rx-&gt;smc_ok = 1;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to parse the MSS option from the TCP header. Return 0 on failure, clamped</div><div class='add'>+ * value on success.</div><div class='add'>+ */</div><div class='add'>+u16 tcp_parse_mss_option(const struct tcphdr *th, u16 user_mss)</div><div class='add'>+{</div><div class='add'>+	const unsigned char *ptr = (const unsigned char *)(th + 1);</div><div class='add'>+	int length = (th-&gt;doff * 4) - sizeof(struct tcphdr);</div><div class='add'>+	u16 mss = 0;</div><div class='add'>+</div><div class='add'>+	while (length &gt; 0) {</div><div class='add'>+		int opcode = *ptr++;</div><div class='add'>+		int opsize;</div><div class='add'>+</div><div class='add'>+		switch (opcode) {</div><div class='add'>+		case TCPOPT_EOL:</div><div class='add'>+			return mss;</div><div class='add'>+		case TCPOPT_NOP:	/* Ref: RFC 793 section 3.1 */</div><div class='add'>+			length--;</div><div class='add'>+			continue;</div><div class='add'>+		default:</div><div class='add'>+			if (length &lt; 2)</div><div class='add'>+				return mss;</div><div class='add'>+			opsize = *ptr++;</div><div class='add'>+			if (opsize &lt; 2) /* "silly options" */</div><div class='add'>+				return mss;</div><div class='add'>+			if (opsize &gt; length)</div><div class='add'>+				return mss;	/* fail on partial options */</div><div class='add'>+			if (opcode == TCPOPT_MSS &amp;&amp; opsize == TCPOLEN_MSS) {</div><div class='add'>+				u16 in_mss = get_unaligned_be16(ptr);</div><div class='add'>+</div><div class='add'>+				if (in_mss) {</div><div class='add'>+					if (user_mss &amp;&amp; user_mss &lt; in_mss)</div><div class='add'>+						in_mss = user_mss;</div><div class='add'>+					mss = in_mss;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			ptr += opsize - 2;</div><div class='add'>+			length -= opsize;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return mss;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Look for tcp options. Normally only called on SYN and SYNACK packets.</div><div class='hunk'>@@ -3789,6 +4292,8 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	ptr = (const unsigned char *)(th + 1);</div><div class='ctx'> 	opt_rx-&gt;saw_tstamp = 0;</div><div class='add'>+	opt_rx-&gt;accecn = 0;</div><div class='add'>+	opt_rx-&gt;saw_unknown = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (length &gt; 0) {</div><div class='ctx'> 		int opcode = *ptr++;</div><div class='hunk'>@@ -3801,6 +4306,8 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 			length--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		default:</div><div class='add'>+			if (length &lt; 2)</div><div class='add'>+				return;</div><div class='ctx'> 			opsize = *ptr++;</div><div class='ctx'> 			if (opsize &lt; 2) /* "silly options" */</div><div class='ctx'> 				return;</div><div class='hunk'>@@ -3820,7 +4327,7 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 				break;</div><div class='ctx'> 			case TCPOPT_WINDOW:</div><div class='ctx'> 				if (opsize == TCPOLEN_WINDOW &amp;&amp; th-&gt;syn &amp;&amp;</div><div class='del'>-				    !estab &amp;&amp; net-&gt;ipv4.sysctl_tcp_window_scaling) {</div><div class='add'>+				    !estab &amp;&amp; READ_ONCE(net-&gt;ipv4.sysctl_tcp_window_scaling)) {</div><div class='ctx'> 					__u8 snd_wscale = *(__u8 *)ptr;</div><div class='ctx'> 					opt_rx-&gt;wscale_ok = 1;</div><div class='ctx'> 					if (snd_wscale &gt; TCP_MAX_WSCALE) {</div><div class='hunk'>@@ -3836,7 +4343,7 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 			case TCPOPT_TIMESTAMP:</div><div class='ctx'> 				if ((opsize == TCPOLEN_TIMESTAMP) &amp;&amp;</div><div class='ctx'> 				    ((estab &amp;&amp; opt_rx-&gt;tstamp_ok) ||</div><div class='del'>-				     (!estab &amp;&amp; net-&gt;ipv4.sysctl_tcp_timestamps))) {</div><div class='add'>+				     (!estab &amp;&amp; READ_ONCE(net-&gt;ipv4.sysctl_tcp_timestamps)))) {</div><div class='ctx'> 					opt_rx-&gt;saw_tstamp = 1;</div><div class='ctx'> 					opt_rx-&gt;rcv_tsval = get_unaligned_be32(ptr);</div><div class='ctx'> 					opt_rx-&gt;rcv_tsecr = get_unaligned_be32(ptr + 4);</div><div class='hunk'>@@ -3844,7 +4351,7 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 				break;</div><div class='ctx'> 			case TCPOPT_SACK_PERM:</div><div class='ctx'> 				if (opsize == TCPOLEN_SACK_PERM &amp;&amp; th-&gt;syn &amp;&amp;</div><div class='del'>-				    !estab &amp;&amp; net-&gt;ipv4.sysctl_tcp_sack) {</div><div class='add'>+				    !estab &amp;&amp; READ_ONCE(net-&gt;ipv4.sysctl_tcp_sack)) {</div><div class='ctx'> 					opt_rx-&gt;sack_ok = TCP_SACK_SEEN;</div><div class='ctx'> 					tcp_sack_reset(opt_rx);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3859,9 +4366,15 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 				break;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 			case TCPOPT_MD5SIG:</div><div class='del'>-				/*</div><div class='del'>-				 * The MD5 Hash has already been</div><div class='del'>-				 * checked (see tcp_v{4,6}_do_rcv()).</div><div class='add'>+				/* The MD5 Hash has already been</div><div class='add'>+				 * checked (see tcp_v{4,6}_rcv()).</div><div class='add'>+				 */</div><div class='add'>+				break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+			case TCPOPT_AO:</div><div class='add'>+				/* TCP AO has already been checked</div><div class='add'>+				 * (see tcp_inbound_ao_hash()).</div><div class='ctx'> 				 */</div><div class='ctx'> 				break;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3871,21 +4384,33 @@ void tcp_parse_options(const struct net *net,</div><div class='ctx'> 					ptr, th-&gt;syn, foc, false);</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			case TCPOPT_ACCECN0:</div><div class='add'>+			case TCPOPT_ACCECN1:</div><div class='add'>+				/* Save offset of AccECN option in TCP header */</div><div class='add'>+				opt_rx-&gt;accecn = (ptr - 2) - (__u8 *)th;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			case TCPOPT_EXP:</div><div class='ctx'> 				/* Fast Open option shares code 254 using a</div><div class='ctx'> 				 * 16 bits magic number.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (opsize &gt;= TCPOLEN_EXP_FASTOPEN_BASE &amp;&amp;</div><div class='ctx'> 				    get_unaligned_be16(ptr) ==</div><div class='del'>-				    TCPOPT_FASTOPEN_MAGIC)</div><div class='add'>+				    TCPOPT_FASTOPEN_MAGIC) {</div><div class='ctx'> 					tcp_parse_fastopen_option(opsize -</div><div class='ctx'> 						TCPOLEN_EXP_FASTOPEN_BASE,</div><div class='ctx'> 						ptr + 2, th-&gt;syn, foc, true);</div><div class='del'>-				else</div><div class='del'>-					smc_parse_options(th, opt_rx, ptr,</div><div class='del'>-							  opsize);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (smc_parse_options(th, opt_rx, ptr, opsize))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				opt_rx-&gt;saw_unknown = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			default:</div><div class='add'>+				opt_rx-&gt;saw_unknown = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 			ptr += opsize-2;</div><div class='ctx'> 			length -= opsize;</div><div class='hunk'>@@ -3925,11 +4450,14 @@ static bool tcp_fast_parse_options(const struct net *net,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (th-&gt;doff == (sizeof(*th) / 4)) {</div><div class='ctx'> 		tp-&gt;rx_opt.saw_tstamp = 0;</div><div class='add'>+		tp-&gt;rx_opt.accecn = 0;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	} else if (tp-&gt;rx_opt.tstamp_ok &amp;&amp;</div><div class='ctx'> 		   th-&gt;doff == ((sizeof(*th) + TCPOLEN_TSTAMP_ALIGNED) / 4)) {</div><div class='del'>-		if (tcp_parse_aligned_timestamp(tp, th))</div><div class='add'>+		if (tcp_parse_aligned_timestamp(tp, th)) {</div><div class='add'>+			tp-&gt;rx_opt.accecn = 0;</div><div class='ctx'> 			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tcp_parse_options(net, skb, &amp;tp-&gt;rx_opt, 1, NULL);</div><div class='hunk'>@@ -3939,39 +4467,58 @@ static bool tcp_fast_parse_options(const struct net *net,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> /*</div><div class='del'>- * Parse MD5 Signature option</div><div class='add'>+ * Parse Signature options</div><div class='ctx'>  */</div><div class='del'>-const u8 *tcp_parse_md5sig_option(const struct tcphdr *th)</div><div class='add'>+int tcp_do_parse_auth_options(const struct tcphdr *th,</div><div class='add'>+			      const u8 **md5_hash, const u8 **ao_hash)</div><div class='ctx'> {</div><div class='ctx'> 	int length = (th-&gt;doff &lt;&lt; 2) - sizeof(*th);</div><div class='ctx'> 	const u8 *ptr = (const u8 *)(th + 1);</div><div class='add'>+	unsigned int minlen = TCPOLEN_MD5SIG;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_TCP_AO))</div><div class='add'>+		minlen = sizeof(struct tcp_ao_hdr) + 1;</div><div class='add'>+</div><div class='add'>+	*md5_hash = NULL;</div><div class='add'>+	*ao_hash = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* If not enough data remaining, we can short cut */</div><div class='del'>-	while (length &gt;= TCPOLEN_MD5SIG) {</div><div class='add'>+	while (length &gt;= minlen) {</div><div class='ctx'> 		int opcode = *ptr++;</div><div class='ctx'> 		int opsize;</div><div class='ctx'> </div><div class='ctx'> 		switch (opcode) {</div><div class='ctx'> 		case TCPOPT_EOL:</div><div class='del'>-			return NULL;</div><div class='add'>+			return 0;</div><div class='ctx'> 		case TCPOPT_NOP:</div><div class='ctx'> 			length--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		default:</div><div class='ctx'> 			opsize = *ptr++;</div><div class='ctx'> 			if (opsize &lt; 2 || opsize &gt; length)</div><div class='del'>-				return NULL;</div><div class='del'>-			if (opcode == TCPOPT_MD5SIG)</div><div class='del'>-				return opsize == TCPOLEN_MD5SIG ? ptr : NULL;</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (opcode == TCPOPT_MD5SIG) {</div><div class='add'>+				if (opsize != TCPOLEN_MD5SIG)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				if (unlikely(*md5_hash || *ao_hash))</div><div class='add'>+					return -EEXIST;</div><div class='add'>+				*md5_hash = ptr;</div><div class='add'>+			} else if (opcode == TCPOPT_AO) {</div><div class='add'>+				if (opsize &lt;= sizeof(struct tcp_ao_hdr))</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				if (unlikely(*md5_hash || *ao_hash))</div><div class='add'>+					return -EEXIST;</div><div class='add'>+				*ao_hash = ptr;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ptr += opsize - 2;</div><div class='ctx'> 		length -= opsize;</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_parse_md5sig_option);</div><div class='add'>+EXPORT_SYMBOL(tcp_do_parse_auth_options);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Sorry, PAWS as specified is broken wrt. pure-ACKs -DaveM</div><div class='hunk'>@@ -3997,33 +4544,57 @@ EXPORT_SYMBOL(tcp_parse_md5sig_option);</div><div class='ctx'>  * up to bandwidth of 18Gigabit/sec. 8) ]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int tcp_disordered_ack(const struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+/* Estimates max number of increments of remote peer TSval in</div><div class='add'>+ * a replay window (based on our current RTO estimation).</div><div class='add'>+ */</div><div class='add'>+static u32 tcp_tsval_replay(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	/* If we use usec TS resolution,</div><div class='add'>+	 * then expect the remote peer to use the same resolution.</div><div class='add'>+	 */</div><div class='add'>+	if (tcp_sk(sk)-&gt;tcp_usec_ts)</div><div class='add'>+		return inet_csk(sk)-&gt;icsk_rto * (USEC_PER_SEC / HZ);</div><div class='add'>+</div><div class='add'>+	/* RFC 7323 recommends a TSval clock between 1ms and 1sec.</div><div class='add'>+	 * We know that some OS (including old linux) can use 1200 Hz.</div><div class='add'>+	 */</div><div class='add'>+	return inet_csk(sk)-&gt;icsk_rto * 1200 / HZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum skb_drop_reason tcp_disordered_ack_check(const struct sock *sk,</div><div class='add'>+						     const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	u32 seq = TCP_SKB_CB(skb)-&gt;seq;</div><div class='add'>+	SKB_DR_INIT(reason, TCP_RFC7323_PAWS);</div><div class='ctx'> 	u32 ack = TCP_SKB_CB(skb)-&gt;ack_seq;</div><div class='add'>+	u32 seq = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> </div><div class='del'>-	return (/* 1. Pure ACK with correct sequence number. */</div><div class='del'>-		(th-&gt;ack &amp;&amp; seq == TCP_SKB_CB(skb)-&gt;end_seq &amp;&amp; seq == tp-&gt;rcv_nxt) &amp;&amp;</div><div class='add'>+	/* 1. Is this not a pure ACK ? */</div><div class='add'>+	if (!th-&gt;ack || seq != TCP_SKB_CB(skb)-&gt;end_seq)</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='del'>-		/* 2. ... and duplicate ACK. */</div><div class='del'>-		ack == tp-&gt;snd_una &amp;&amp;</div><div class='add'>+	/* 2. Is its sequence not the expected one ? */</div><div class='add'>+	if (seq != tp-&gt;rcv_nxt)</div><div class='add'>+		return before(seq, tp-&gt;rcv_nxt) ?</div><div class='add'>+			SKB_DROP_REASON_TCP_RFC7323_PAWS_ACK :</div><div class='add'>+			reason;</div><div class='ctx'> </div><div class='del'>-		/* 3. ... and does not update window. */</div><div class='del'>-		!tcp_may_update_window(tp, ack, seq, ntohs(th-&gt;window) &lt;&lt; tp-&gt;rx_opt.snd_wscale) &amp;&amp;</div><div class='add'>+	/* 3. Is this not a duplicate ACK ? */</div><div class='add'>+	if (ack != tp-&gt;snd_una)</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='del'>-		/* 4. ... and sits in replay window. */</div><div class='del'>-		(s32)(tp-&gt;rx_opt.ts_recent - tp-&gt;rx_opt.rcv_tsval) &lt;= (inet_csk(sk)-&gt;icsk_rto * 1024) / HZ);</div><div class='del'>-}</div><div class='add'>+	/* 4. Is this updating the window ? */</div><div class='add'>+	if (tcp_may_update_window(tp, ack, seq, ntohs(th-&gt;window) &lt;&lt;</div><div class='add'>+						tp-&gt;rx_opt.snd_wscale))</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='del'>-static inline bool tcp_paws_discard(const struct sock *sk,</div><div class='del'>-				   const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	/* 5. Is this not in the replay window ? */</div><div class='add'>+	if ((s32)(tp-&gt;rx_opt.ts_recent - tp-&gt;rx_opt.rcv_tsval) &gt;</div><div class='add'>+	    tcp_tsval_replay(sk))</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='del'>-	return !tcp_paws_check(&amp;tp-&gt;rx_opt, TCP_PAWS_WINDOW) &amp;&amp;</div><div class='del'>-	       !tcp_disordered_ack(sk, skb);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Check segment sequence number for validity.</div><div class='hunk'>@@ -4039,38 +4610,68 @@ static inline bool tcp_paws_discard(const struct sock *sk,</div><div class='ctx'>  * (borrowed from freebsd)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline bool tcp_sequence(const struct tcp_sock *tp, u32 seq, u32 end_seq)</div><div class='add'>+static enum skb_drop_reason tcp_sequence(const struct sock *sk,</div><div class='add'>+					 u32 seq, u32 end_seq)</div><div class='ctx'> {</div><div class='del'>-	return	!before(end_seq, tp-&gt;rcv_wup) &amp;&amp;</div><div class='del'>-		!after(seq, tp-&gt;rcv_nxt + tcp_receive_window(tp));</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (before(end_seq, tp-&gt;rcv_wup))</div><div class='add'>+		return SKB_DROP_REASON_TCP_OLD_SEQUENCE;</div><div class='add'>+</div><div class='add'>+	if (after(end_seq, tp-&gt;rcv_nxt + tcp_receive_window(tp))) {</div><div class='add'>+		if (after(seq, tp-&gt;rcv_nxt + tcp_receive_window(tp)))</div><div class='add'>+			return SKB_DROP_REASON_TCP_INVALID_SEQUENCE;</div><div class='add'>+</div><div class='add'>+		/* Only accept this packet if receive queue is empty. */</div><div class='add'>+		if (skb_queue_len(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+			return SKB_DROP_REASON_TCP_INVALID_END_SEQUENCE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void tcp_done_with_error(struct sock *sk, int err)</div><div class='add'>+{</div><div class='add'>+	/* This barrier is coupled with smp_rmb() in tcp_poll() */</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_err, err);</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	tcp_write_queue_purge(sk);</div><div class='add'>+	tcp_done(sk);</div><div class='add'>+</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD(tcp_done_with_error);</div><div class='ctx'> </div><div class='ctx'> /* When we get a reset we do this. */</div><div class='del'>-void tcp_reset(struct sock *sk)</div><div class='add'>+void tcp_reset(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	trace_tcp_receive_reset(sk);</div><div class='ctx'> </div><div class='add'>+	/* mptcp can't tell us to ignore reset pkts,</div><div class='add'>+	 * so just ignore the return value of mptcp_incoming_options().</div><div class='add'>+	 */</div><div class='add'>+	if (sk_is_mptcp(sk))</div><div class='add'>+		mptcp_incoming_options(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	/* We want the right error as BSD sees it (and indeed as we do). */</div><div class='ctx'> 	switch (sk-&gt;sk_state) {</div><div class='ctx'> 	case TCP_SYN_SENT:</div><div class='del'>-		sk-&gt;sk_err = ECONNREFUSED;</div><div class='add'>+		err = ECONNREFUSED;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_CLOSE_WAIT:</div><div class='del'>-		sk-&gt;sk_err = EPIPE;</div><div class='add'>+		err = EPIPE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_CLOSE:</div><div class='ctx'> 		return;</div><div class='ctx'> 	default:</div><div class='del'>-		sk-&gt;sk_err = ECONNRESET;</div><div class='add'>+		err = ECONNRESET;</div><div class='ctx'> 	}</div><div class='del'>-	/* This barrier is coupled with smp_rmb() in tcp_poll() */</div><div class='del'>-	smp_wmb();</div><div class='del'>-</div><div class='del'>-	tcp_write_queue_purge(sk);</div><div class='del'>-	tcp_done(sk);</div><div class='del'>-</div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+	tcp_done_with_error(sk, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4093,7 +4694,7 @@ void tcp_fin(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	inet_csk_schedule_ack(sk);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_shutdown |= RCV_SHUTDOWN;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_shutdown, sk-&gt;sk_shutdown | RCV_SHUTDOWN);</div><div class='ctx'> 	sock_set_flag(sk, SOCK_DONE);</div><div class='ctx'> </div><div class='ctx'> 	switch (sk-&gt;sk_state) {</div><div class='hunk'>@@ -4101,7 +4702,7 @@ void tcp_fin(struct sock *sk)</div><div class='ctx'> 	case TCP_ESTABLISHED:</div><div class='ctx'> 		/* Move to CLOSE_WAIT */</div><div class='ctx'> 		tcp_set_state(sk, TCP_CLOSE_WAIT);</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ack.pingpong = 1;</div><div class='add'>+		inet_csk_enter_pingpong_mode(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_CLOSE_WAIT:</div><div class='hunk'>@@ -4142,7 +4743,6 @@ void tcp_fin(struct sock *sk)</div><div class='ctx'> 	skb_rbtree_purge(&amp;tp-&gt;out_of_order_queue);</div><div class='ctx'> 	if (tcp_is_sack(tp))</div><div class='ctx'> 		tcp_sack_reset(&amp;tp-&gt;rx_opt);</div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='hunk'>@@ -4173,7 +4773,7 @@ static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (tcp_is_sack(tp) &amp;&amp; sock_net(sk)-&gt;ipv4.sysctl_tcp_dsack) {</div><div class='add'>+	if (tcp_is_sack(tp) &amp;&amp; READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_dsack)) {</div><div class='ctx'> 		int mib_idx;</div><div class='ctx'> </div><div class='ctx'> 		if (before(seq, tp-&gt;rcv_nxt))</div><div class='hunk'>@@ -4199,6 +4799,29 @@ static void tcp_dsack_extend(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> 		tcp_sack_extend(tp-&gt;duplicate_sack, seq, end_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_rcv_spurious_retrans(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* When the ACK path fails or drops most ACKs, the sender would</div><div class='add'>+	 * timeout and spuriously retransmit the same segment repeatedly.</div><div class='add'>+	 * If it seems our ACKs are not reaching the other side,</div><div class='add'>+	 * based on receiving a duplicate data segment with new flowlabel</div><div class='add'>+	 * (suggesting the sender suffered an RTO), and we are not already</div><div class='add'>+	 * repathing due to our own RTO, then rehash the socket to repath our</div><div class='add'>+	 * packets.</div><div class='add'>+	 */</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (inet_csk(sk)-&gt;icsk_ca_state != TCP_CA_Loss &amp;&amp;</div><div class='add'>+	    skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+	    (tcp_sk(sk)-&gt;inet_conn.icsk_ack.lrcv_flowlabel !=</div><div class='add'>+	     ntohl(ip6_flowlabel(ipv6_hdr(skb)))) &amp;&amp;</div><div class='add'>+	    sk_rethink_txhash(sk))</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDUPLICATEDATAREHASH);</div><div class='add'>+</div><div class='add'>+	/* Save last flowlabel after a spurious retrans. */</div><div class='add'>+	tcp_save_lrcv_flowlabel(sk, skb);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void tcp_send_dupack(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -4208,9 +4831,10 @@ static void tcp_send_dupack(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);</div><div class='ctx'> 		tcp_enter_quickack_mode(sk, TCP_MAX_QUICKACKS);</div><div class='ctx'> </div><div class='del'>-		if (tcp_is_sack(tp) &amp;&amp; sock_net(sk)-&gt;ipv4.sysctl_tcp_dsack) {</div><div class='add'>+		if (tcp_is_sack(tp) &amp;&amp; READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_dsack)) {</div><div class='ctx'> 			u32 end_seq = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='ctx'> </div><div class='add'>+			tcp_rcv_spurious_retrans(sk, skb);</div><div class='ctx'> 			if (after(TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;rcv_nxt))</div><div class='ctx'> 				end_seq = tp-&gt;rcv_nxt;</div><div class='ctx'> 			tcp_dsack_set(sk, TCP_SKB_CB(skb)-&gt;seq, end_seq);</div><div class='hunk'>@@ -4244,10 +4868,38 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp)</div><div class='ctx'> 				sp[i] = sp[i + 1];</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		this_sack++, swalk++;</div><div class='add'>+		this_sack++;</div><div class='add'>+		swalk++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tcp_sack_compress_send_ack(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!tp-&gt;compressed_ack)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hrtimer_try_to_cancel(&amp;tp-&gt;compressed_ack_timer) == 1)</div><div class='add'>+		__sock_put(sk);</div><div class='add'>+</div><div class='add'>+	/* Since we have to send one ack finally,</div><div class='add'>+	 * substract one from tp-&gt;compressed_ack to keep</div><div class='add'>+	 * LINUX_MIB_TCPACKCOMPRESSED accurate.</div><div class='add'>+	 */</div><div class='add'>+	NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPACKCOMPRESSED,</div><div class='add'>+		      tp-&gt;compressed_ack - 1);</div><div class='add'>+</div><div class='add'>+	tp-&gt;compressed_ack = 0;</div><div class='add'>+	tcp_send_ack(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reasonable amount of sack blocks included in TCP SACK option</div><div class='add'>+ * The max is 4, but this becomes 3 if TCP timestamps are there.</div><div class='add'>+ * Given that SACK packets might be lost, be conservative and use 2.</div><div class='add'>+ */</div><div class='add'>+#define TCP_SACK_BLOCKS_EXPECTED 2</div><div class='add'>+</div><div class='ctx'> static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -4260,6 +4912,8 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> </div><div class='ctx'> 	for (this_sack = 0; this_sack &lt; cur_sacks; this_sack++, sp++) {</div><div class='ctx'> 		if (tcp_sack_extend(sp, seq, end_seq)) {</div><div class='add'>+			if (this_sack &gt;= TCP_SACK_BLOCKS_EXPECTED)</div><div class='add'>+				tcp_sack_compress_send_ack(sk);</div><div class='ctx'> 			/* Rotate this_sack to the first one. */</div><div class='ctx'> 			for (; this_sack &gt; 0; this_sack--, sp--)</div><div class='ctx'> 				swap(*sp, *(sp - 1));</div><div class='hunk'>@@ -4269,6 +4923,9 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (this_sack &gt;= TCP_SACK_BLOCKS_EXPECTED)</div><div class='add'>+		tcp_sack_compress_send_ack(sk);</div><div class='add'>+</div><div class='ctx'> 	/* Could not find an adjacent existing SACK, build a new one,</div><div class='ctx'> 	 * put it at the front, and shift everyone else down.  We</div><div class='ctx'> 	 * always know there is at least one SACK present already here.</div><div class='hunk'>@@ -4276,8 +4933,6 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)</div><div class='ctx'> 	 * If the sack array is full, forget about the last one.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (this_sack &gt;= TCP_NUM_SACKS) {</div><div class='del'>-		if (tp-&gt;compressed_ack)</div><div class='del'>-			tcp_send_ack(sk);</div><div class='ctx'> 		this_sack--;</div><div class='ctx'> 		tp-&gt;rx_opt.num_sacks--;</div><div class='ctx'> 		sp--;</div><div class='hunk'>@@ -4329,7 +4984,6 @@ static void tcp_sack_remove(struct tcp_sock *tp)</div><div class='ctx'> /**</div><div class='ctx'>  * tcp_try_coalesce - try to merge skb to prior one</div><div class='ctx'>  * @sk: socket</div><div class='del'>- * @dest: destination queue</div><div class='ctx'>  * @to: prior buffer</div><div class='ctx'>  * @from: buffer to add in queue</div><div class='ctx'>  * @fragstolen: pointer to boolean</div><div class='hunk'>@@ -4353,10 +5007,8 @@ static bool tcp_try_coalesce(struct sock *sk,</div><div class='ctx'> 	if (TCP_SKB_CB(from)-&gt;seq != TCP_SKB_CB(to)-&gt;end_seq)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='del'>-	if (from-&gt;decrypted != to-&gt;decrypted)</div><div class='add'>+	if (!tcp_skb_can_collapse_rx(to, from))</div><div class='ctx'> 		return false;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_try_coalesce(to, from, fragstolen, &amp;delta))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -4371,6 +5023,7 @@ static bool tcp_try_coalesce(struct sock *sk,</div><div class='ctx'> 	if (TCP_SKB_CB(from)-&gt;has_rxtstamp) {</div><div class='ctx'> 		TCP_SKB_CB(to)-&gt;has_rxtstamp = true;</div><div class='ctx'> 		to-&gt;tstamp = from-&gt;tstamp;</div><div class='add'>+		skb_hwtstamps(to)-&gt;hwtstamp = skb_hwtstamps(from)-&gt;hwtstamp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -4383,7 +5036,7 @@ static bool tcp_ooo_try_coalesce(struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	bool res = tcp_try_coalesce(sk, to, from, fragstolen);</div><div class='ctx'> </div><div class='del'>-	/* In case tcp_drop() is called later, update to-&gt;gso_segs */</div><div class='add'>+	/* In case tcp_drop_reason() is called later, update to-&gt;gso_segs */</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		u32 gso_segs = max_t(u16, 1, skb_shinfo(to)-&gt;gso_segs) +</div><div class='ctx'> 			       max_t(u16, 1, skb_shinfo(from)-&gt;gso_segs);</div><div class='hunk'>@@ -4393,10 +5046,11 @@ static bool tcp_ooo_try_coalesce(struct sock *sk,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_drop(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+noinline_for_tracing static void</div><div class='add'>+tcp_drop_reason(struct sock *sk, struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	sk_drops_add(sk, skb);</div><div class='del'>-	__kfree_skb(skb);</div><div class='add'>+	sk_drops_skbadd(sk, skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This one checks to see if we can put data from the</div><div class='hunk'>@@ -4418,28 +5072,25 @@ static void tcp_ofo_queue(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 		if (before(TCP_SKB_CB(skb)-&gt;seq, dsack_high)) {</div><div class='ctx'> 			__u32 dsack = dsack_high;</div><div class='add'>+</div><div class='ctx'> 			if (before(TCP_SKB_CB(skb)-&gt;end_seq, dsack_high))</div><div class='del'>-				dsack_high = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='add'>+				dsack = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='ctx'> 			tcp_dsack_extend(sk, TCP_SKB_CB(skb)-&gt;seq, dsack);</div><div class='ctx'> 		}</div><div class='ctx'> 		p = rb_next(p);</div><div class='ctx'> 		rb_erase(&amp;skb-&gt;rbnode, &amp;tp-&gt;out_of_order_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!after(TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;rcv_nxt))) {</div><div class='del'>-			SOCK_DEBUG(sk, "ofo packet was already received\n");</div><div class='del'>-			tcp_drop(sk, skb);</div><div class='add'>+			tcp_drop_reason(sk, skb, SKB_DROP_REASON_TCP_OFO_DROP);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		SOCK_DEBUG(sk, "ofo requeuing : rcv_next %X seq %X - %X\n",</div><div class='del'>-			   tp-&gt;rcv_nxt, TCP_SKB_CB(skb)-&gt;seq,</div><div class='del'>-			   TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> </div><div class='ctx'> 		tail = skb_peek_tail(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		eaten = tail &amp;&amp; tcp_try_coalesce(sk, tail, skb, &amp;fragstolen);</div><div class='ctx'> 		tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> 		fin = TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN;</div><div class='ctx'> 		if (!eaten)</div><div class='del'>-			__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+			tcp_add_receive_queue(sk, skb);</div><div class='ctx'> 		else</div><div class='ctx'> 			kfree_skb_partial(skb, fragstolen);</div><div class='ctx'> </div><div class='hunk'>@@ -4453,20 +5104,41 @@ static void tcp_ofo_queue(struct sock *sk)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool tcp_prune_ofo_queue(struct sock *sk);</div><div class='del'>-static int tcp_prune_queue(struct sock *sk);</div><div class='add'>+static bool tcp_prune_ofo_queue(struct sock *sk, const struct sk_buff *in_skb);</div><div class='add'>+static int tcp_prune_queue(struct sock *sk, const struct sk_buff *in_skb);</div><div class='ctx'> </div><div class='del'>-static int tcp_try_rmem_schedule(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+/* Check if this incoming skb can be added to socket receive queues</div><div class='add'>+ * while satisfying sk-&gt;sk_rcvbuf limit.</div><div class='add'>+ *</div><div class='add'>+ * In theory we should use skb-&gt;truesize, but this can cause problems</div><div class='add'>+ * when applications use too small SO_RCVBUF values.</div><div class='add'>+ * When LRO / hw gro is used, the socket might have a high tp-&gt;scaling_ratio,</div><div class='add'>+ * allowing RWIN to be close to available space.</div><div class='add'>+ * Whenever the receive queue gets full, we can receive a small packet</div><div class='add'>+ * filling RWIN, but with a high skb-&gt;truesize, because most NIC use 4K page</div><div class='add'>+ * plus sk_buff metadata even when receiving less than 1500 bytes of payload.</div><div class='add'>+ *</div><div class='add'>+ * Note that we use skb-&gt;len to decide to accept or drop this packet,</div><div class='add'>+ * but sk-&gt;sk_rmem_alloc is the sum of all skb-&gt;truesize.</div><div class='add'>+ */</div><div class='add'>+static bool tcp_can_ingest(const struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int rmem = atomic_read(&amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+</div><div class='add'>+	return rmem + skb-&gt;len &lt;= sk-&gt;sk_rcvbuf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcp_try_rmem_schedule(struct sock *sk, const struct sk_buff *skb,</div><div class='ctx'> 				 unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt; sk-&gt;sk_rcvbuf ||</div><div class='add'>+	if (!tcp_can_ingest(sk, skb) ||</div><div class='ctx'> 	    !sk_rmem_schedule(sk, skb, size)) {</div><div class='ctx'> </div><div class='del'>-		if (tcp_prune_queue(sk) &lt; 0)</div><div class='add'>+		if (tcp_prune_queue(sk, skb) &lt; 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		while (!sk_rmem_schedule(sk, skb, size)) {</div><div class='del'>-			if (!tcp_prune_ofo_queue(sk))</div><div class='add'>+			if (!tcp_prune_ofo_queue(sk, skb))</div><div class='ctx'> 				return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4481,23 +5153,25 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	u32 seq, end_seq;</div><div class='ctx'> 	bool fragstolen;</div><div class='ctx'> </div><div class='del'>-	tcp_ecn_check_ce(sk, skb);</div><div class='add'>+	tcp_save_lrcv_flowlabel(sk, skb);</div><div class='add'>+	tcp_data_ecn_check(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(tcp_try_rmem_schedule(sk, skb, skb-&gt;truesize))) {</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP);</div><div class='del'>-		tcp_drop(sk, skb);</div><div class='add'>+		sk-&gt;sk_data_ready(sk);</div><div class='add'>+		tcp_drop_reason(sk, skb, SKB_DROP_REASON_PROTO_MEM);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tcp_measure_rcv_mss(sk, skb);</div><div class='ctx'> 	/* Disable header prediction. */</div><div class='ctx'> 	tp-&gt;pred_flags = 0;</div><div class='ctx'> 	inet_csk_schedule_ack(sk);</div><div class='ctx'> </div><div class='add'>+	tp-&gt;rcv_ooopack += max_t(u16, 1, skb_shinfo(skb)-&gt;gso_segs);</div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOQUEUE);</div><div class='ctx'> 	seq = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 	end_seq = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='del'>-	SOCK_DEBUG(sk, "out of order segment: rcv_next %X seq %X - %X\n",</div><div class='del'>-		   tp-&gt;rcv_nxt, seq, end_seq);</div><div class='ctx'> </div><div class='ctx'> 	p = &amp;tp-&gt;out_of_order_queue.rb_node;</div><div class='ctx'> 	if (RB_EMPTY_ROOT(&amp;tp-&gt;out_of_order_queue)) {</div><div class='hunk'>@@ -4519,7 +5193,11 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (tcp_ooo_try_coalesce(sk, tp-&gt;ooo_last_skb,</div><div class='ctx'> 				 skb, &amp;fragstolen)) {</div><div class='ctx'> coalesce_done:</div><div class='del'>-		tcp_grow_window(sk, skb);</div><div class='add'>+		/* For non sack flows, do not grow window to force DUPACK</div><div class='add'>+		 * and trigger fast retransmit.</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_is_sack(tp))</div><div class='add'>+			tcp_grow_window(sk, skb, true);</div><div class='ctx'> 		kfree_skb_partial(skb, fragstolen);</div><div class='ctx'> 		skb = NULL;</div><div class='ctx'> 		goto add_sack;</div><div class='hunk'>@@ -4545,7 +5223,8 @@ coalesce_done:</div><div class='ctx'> 				/* All the bits are present. Drop. */</div><div class='ctx'> 				NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPOFOMERGE);</div><div class='del'>-				tcp_drop(sk, skb);</div><div class='add'>+				tcp_drop_reason(sk, skb,</div><div class='add'>+						SKB_DROP_REASON_TCP_OFOMERGE);</div><div class='ctx'> 				skb = NULL;</div><div class='ctx'> 				tcp_dsack_set(sk, seq, end_seq);</div><div class='ctx'> 				goto add_sack;</div><div class='hunk'>@@ -4564,7 +5243,8 @@ coalesce_done:</div><div class='ctx'> 						 TCP_SKB_CB(skb1)-&gt;end_seq);</div><div class='ctx'> 				NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					      LINUX_MIB_TCPOFOMERGE);</div><div class='del'>-				tcp_drop(sk, skb1);</div><div class='add'>+				tcp_drop_reason(sk, skb1,</div><div class='add'>+						SKB_DROP_REASON_TCP_OFOMERGE);</div><div class='ctx'> 				goto merge_right;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (tcp_ooo_try_coalesce(sk, skb1,</div><div class='hunk'>@@ -4592,7 +5272,7 @@ merge_right:</div><div class='ctx'> 		tcp_dsack_extend(sk, TCP_SKB_CB(skb1)-&gt;seq,</div><div class='ctx'> 				 TCP_SKB_CB(skb1)-&gt;end_seq);</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE);</div><div class='del'>-		tcp_drop(sk, skb1);</div><div class='add'>+		tcp_drop_reason(sk, skb1, SKB_DROP_REASON_TCP_OFOMERGE);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* If there is no skb after us, we are the last_skb ! */</div><div class='ctx'> 	if (!skb1)</div><div class='hunk'>@@ -4603,25 +5283,31 @@ add_sack:</div><div class='ctx'> 		tcp_sack_new_ofo_skb(sk, seq, end_seq);</div><div class='ctx'> end:</div><div class='ctx'> 	if (skb) {</div><div class='del'>-		tcp_grow_window(sk, skb);</div><div class='add'>+		/* For non sack flows, do not grow window to force DUPACK</div><div class='add'>+		 * and trigger fast retransmit.</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_is_sack(tp))</div><div class='add'>+			tcp_grow_window(sk, skb, false);</div><div class='ctx'> 		skb_condense(skb);</div><div class='ctx'> 		skb_set_owner_r(skb, sk);</div><div class='ctx'> 	}</div><div class='add'>+	/* do not grow rcvbuf for not-yet-accepted or orphaned sockets. */</div><div class='add'>+	if (sk-&gt;sk_socket)</div><div class='add'>+		tcp_rcvbuf_grow(sk, tp-&gt;rcvq_space.space);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, int hdrlen,</div><div class='del'>-		  bool *fragstolen)</div><div class='add'>+static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				      bool *fragstolen)</div><div class='ctx'> {</div><div class='ctx'> 	int eaten;</div><div class='ctx'> 	struct sk_buff *tail = skb_peek_tail(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> </div><div class='del'>-	__skb_pull(skb, hdrlen);</div><div class='ctx'> 	eaten = (tail &amp;&amp;</div><div class='ctx'> 		 tcp_try_coalesce(sk, tail,</div><div class='ctx'> 				  skb, fragstolen)) ? 1 : 0;</div><div class='ctx'> 	tcp_rcv_nxt_update(tcp_sk(sk), TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> 	if (!eaten) {</div><div class='del'>-		__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+		tcp_add_receive_queue(sk, skb);</div><div class='ctx'> 		skb_set_owner_r(skb, sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	return eaten;</div><div class='hunk'>@@ -4666,7 +5352,7 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;end_seq = TCP_SKB_CB(skb)-&gt;seq + size;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;ack_seq = tcp_sk(sk)-&gt;snd_una - 1;</div><div class='ctx'> </div><div class='del'>-	if (tcp_queue_rcv(sk, skb, 0, &amp;fragstolen)) {</div><div class='add'>+	if (tcp_queue_rcv(sk, skb, &amp;fragstolen)) {</div><div class='ctx'> 		WARN_ON_ONCE(fragstolen); /* should not happen */</div><div class='ctx'> 		__kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4681,30 +5367,33 @@ err:</div><div class='ctx'> </div><div class='ctx'> void tcp_data_ready(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	int avail = tp-&gt;rcv_nxt - tp-&gt;copied_seq;</div><div class='del'>-</div><div class='del'>-	if (avail &lt; sk-&gt;sk_rcvlowat &amp;&amp; !sock_flag(sk, SOCK_DONE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_data_ready(sk);</div><div class='add'>+	if (tcp_epollin_ready(sk, sk-&gt;sk_rcvlowat) || sock_flag(sk, SOCK_DONE))</div><div class='add'>+		sk-&gt;sk_data_ready(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	bool fragstolen;</div><div class='ctx'> 	int eaten;</div><div class='ctx'> </div><div class='add'>+	/* If a subflow has been reset, the packet should not continue</div><div class='add'>+	 * to be processed, drop the packet.</div><div class='add'>+	 */</div><div class='add'>+	if (sk_is_mptcp(sk) &amp;&amp; !mptcp_incoming_options(sk, skb)) {</div><div class='add'>+		__kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;seq == TCP_SKB_CB(skb)-&gt;end_seq) {</div><div class='ctx'> 		__kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	skb_dst_drop(skb);</div><div class='add'>+	tcp_cleanup_skb(skb);</div><div class='ctx'> 	__skb_pull(skb, tcp_hdr(skb)-&gt;doff * 4);</div><div class='ctx'> </div><div class='del'>-	tcp_ecn_accept_cwr(sk, skb);</div><div class='del'>-</div><div class='add'>+	reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	tp-&gt;rx_opt.dsack = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*  Queue data for delivery to the user.</div><div class='hunk'>@@ -4713,20 +5402,39 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;seq == tp-&gt;rcv_nxt) {</div><div class='ctx'> 		if (tcp_receive_window(tp) == 0) {</div><div class='add'>+			/* Some stacks are known to send bare FIN packets</div><div class='add'>+			 * in a loop even if we send RWIN 0 in our ACK.</div><div class='add'>+			 * Accepting this FIN does not hurt memory pressure</div><div class='add'>+			 * because the FIN flag will simply be merged to the</div><div class='add'>+			 * receive queue tail skb in most cases.</div><div class='add'>+			 */</div><div class='add'>+			if (!skb-&gt;len &amp;&amp;</div><div class='add'>+			    (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN))</div><div class='add'>+				goto queue_and_out;</div><div class='add'>+</div><div class='add'>+			reason = SKB_DROP_REASON_TCP_ZEROWINDOW;</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP);</div><div class='ctx'> 			goto out_of_window;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Ok. In sequence. In window. */</div><div class='ctx'> queue_and_out:</div><div class='del'>-		if (skb_queue_len(&amp;sk-&gt;sk_receive_queue) == 0)</div><div class='add'>+		if (tcp_try_rmem_schedule(sk, skb, skb-&gt;truesize)) {</div><div class='add'>+			/* TODO: maybe ratelimit these WIN 0 ACK ? */</div><div class='add'>+			inet_csk(sk)-&gt;icsk_ack.pending |=</div><div class='add'>+					(ICSK_ACK_NOMEM | ICSK_ACK_NOW);</div><div class='add'>+			inet_csk_schedule_ack(sk);</div><div class='add'>+			sk-&gt;sk_data_ready(sk);</div><div class='add'>+</div><div class='add'>+			if (skb_queue_len(&amp;sk-&gt;sk_receive_queue) &amp;&amp; skb-&gt;len) {</div><div class='add'>+				reason = SKB_DROP_REASON_PROTO_MEM;</div><div class='add'>+				NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='ctx'> 			sk_forced_mem_schedule(sk, skb-&gt;truesize);</div><div class='del'>-		else if (tcp_try_rmem_schedule(sk, skb, skb-&gt;truesize)) {</div><div class='del'>-			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);</div><div class='del'>-			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		eaten = tcp_queue_rcv(sk, skb, 0, &amp;fragstolen);</div><div class='add'>+		eaten = tcp_queue_rcv(sk, skb, &amp;fragstolen);</div><div class='ctx'> 		if (skb-&gt;len)</div><div class='ctx'> 			tcp_event_data_recv(sk, skb);</div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN)</div><div class='hunk'>@@ -4755,7 +5463,9 @@ queue_and_out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!after(TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;rcv_nxt)) {</div><div class='add'>+		tcp_rcv_spurious_retrans(sk, skb);</div><div class='ctx'> 		/* A retransmit, 2nd most common case.  Force an immediate ack. */</div><div class='add'>+		reason = SKB_DROP_REASON_TCP_OLD_DATA;</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);</div><div class='ctx'> 		tcp_dsack_set(sk, TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> </div><div class='hunk'>@@ -4763,26 +5473,26 @@ out_of_window:</div><div class='ctx'> 		tcp_enter_quickack_mode(sk, TCP_MAX_QUICKACKS);</div><div class='ctx'> 		inet_csk_schedule_ack(sk);</div><div class='ctx'> drop:</div><div class='del'>-		tcp_drop(sk, skb);</div><div class='add'>+		tcp_drop_reason(sk, skb, reason);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Out of window. F.e. zero window probe. */</div><div class='del'>-	if (!before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;rcv_nxt + tcp_receive_window(tp)))</div><div class='add'>+	if (!before(TCP_SKB_CB(skb)-&gt;seq,</div><div class='add'>+		    tp-&gt;rcv_nxt + tcp_receive_window(tp))) {</div><div class='add'>+		reason = SKB_DROP_REASON_TCP_OVERWINDOW;</div><div class='ctx'> 		goto out_of_window;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;rcv_nxt)) {</div><div class='ctx'> 		/* Partial packet, seq &lt; rcv_next &lt; end_seq */</div><div class='del'>-		SOCK_DEBUG(sk, "partial packet: rcv_next %X seq %X - %X\n",</div><div class='del'>-			   tp-&gt;rcv_nxt, TCP_SKB_CB(skb)-&gt;seq,</div><div class='del'>-			   TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='del'>-</div><div class='ctx'> 		tcp_dsack_set(sk, TCP_SKB_CB(skb)-&gt;seq, tp-&gt;rcv_nxt);</div><div class='ctx'> </div><div class='ctx'> 		/* If window is closed, drop tail of packet. But after</div><div class='ctx'> 		 * remembering D-SACK for its head made in previous line.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!tcp_receive_window(tp)) {</div><div class='add'>+			reason = SKB_DROP_REASON_TCP_ZEROWINDOW;</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP);</div><div class='ctx'> 			goto out_of_window;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4859,6 +5569,9 @@ restart:</div><div class='ctx'> 	for (end_of_skbs = true; skb != NULL &amp;&amp; skb != tail; skb = n) {</div><div class='ctx'> 		n = tcp_skb_next(skb, list);</div><div class='ctx'> </div><div class='add'>+		if (!skb_frags_readable(skb))</div><div class='add'>+			goto skip_this;</div><div class='add'>+</div><div class='ctx'> 		/* No new bits? It is possible on ofo queue. */</div><div class='ctx'> 		if (!before(start, TCP_SKB_CB(skb)-&gt;end_seq)) {</div><div class='ctx'> 			skb = tcp_collapse_one(sk, skb, list, root);</div><div class='hunk'>@@ -4870,7 +5583,7 @@ restart:</div><div class='ctx'> 		/* The first skb to collapse is:</div><div class='ctx'> 		 * - not SYN/FIN and</div><div class='ctx'> 		 * - bloated or contains data before "start" or</div><div class='del'>-		 *   overlaps to the next one.</div><div class='add'>+		 *   overlaps to the next one and mptcp allow collapsing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(TCP_SKB_CB(skb)-&gt;tcp_flags &amp; (TCPHDR_SYN | TCPHDR_FIN)) &amp;&amp;</div><div class='ctx'> 		    (tcp_win_from_space(sk, skb-&gt;truesize) &gt; skb-&gt;len ||</div><div class='hunk'>@@ -4879,17 +5592,20 @@ restart:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (n &amp;&amp; n != tail &amp;&amp;</div><div class='add'>+		if (n &amp;&amp; n != tail &amp;&amp; skb_frags_readable(n) &amp;&amp;</div><div class='add'>+		    tcp_skb_can_collapse_rx(skb, n) &amp;&amp;</div><div class='ctx'> 		    TCP_SKB_CB(skb)-&gt;end_seq != TCP_SKB_CB(n)-&gt;seq) {</div><div class='ctx'> 			end_of_skbs = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+skip_this:</div><div class='ctx'> 		/* Decided to skip this, advance start seq. */</div><div class='ctx'> 		start = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (end_of_skbs ||</div><div class='del'>-	    (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; (TCPHDR_SYN | TCPHDR_FIN)))</div><div class='add'>+	    (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; (TCPHDR_SYN | TCPHDR_FIN)) ||</div><div class='add'>+	    !skb_frags_readable(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_head_init(&amp;tmp);</div><div class='hunk'>@@ -4903,15 +5619,14 @@ restart:</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(nskb-&gt;cb, skb-&gt;cb, sizeof(skb-&gt;cb));</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='del'>-		nskb-&gt;decrypted = skb-&gt;decrypted;</div><div class='del'>-#endif</div><div class='add'>+		skb_copy_decrypted(nskb, skb);</div><div class='ctx'> 		TCP_SKB_CB(nskb)-&gt;seq = TCP_SKB_CB(nskb)-&gt;end_seq = start;</div><div class='ctx'> 		if (list)</div><div class='ctx'> 			__skb_queue_before(list, skb, nskb);</div><div class='ctx'> 		else</div><div class='ctx'> 			__skb_queue_tail(&amp;tmp, nskb); /* defer rbtree insertion */</div><div class='ctx'> 		skb_set_owner_r(nskb, sk);</div><div class='add'>+		mptcp_skb_ext_move(nskb, skb);</div><div class='ctx'> </div><div class='ctx'> 		/* Copy data, releasing collapsed skbs. */</div><div class='ctx'> 		while (copy &gt; 0) {</div><div class='hunk'>@@ -4931,12 +5646,10 @@ restart:</div><div class='ctx'> 				skb = tcp_collapse_one(sk, skb, list, root);</div><div class='ctx'> 				if (!skb ||</div><div class='ctx'> 				    skb == tail ||</div><div class='del'>-				    (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; (TCPHDR_SYN | TCPHDR_FIN)))</div><div class='del'>-					goto end;</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='del'>-				if (skb-&gt;decrypted != nskb-&gt;decrypted)</div><div class='add'>+				    !tcp_skb_can_collapse_rx(nskb, skb) ||</div><div class='add'>+				    (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; (TCPHDR_SYN | TCPHDR_FIN)) ||</div><div class='add'>+				    !skb_frags_readable(skb))</div><div class='ctx'> 					goto end;</div><div class='del'>-#endif</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4976,7 +5689,7 @@ new_range:</div><div class='ctx'> 		    before(TCP_SKB_CB(skb)-&gt;end_seq, start)) {</div><div class='ctx'> 			/* Do not attempt collapsing tiny skbs */</div><div class='ctx'> 			if (range_truesize != head-&gt;truesize ||</div><div class='del'>-			    end - start &gt;= SKB_WITH_OVERHEAD(SK_MEM_QUANTUM)) {</div><div class='add'>+			    end - start &gt;= SKB_WITH_OVERHEAD(PAGE_SIZE)) {</div><div class='ctx'> 				tcp_collapse(sk, NULL, &amp;tp-&gt;out_of_order_queue,</div><div class='ctx'> 					     head, skb, start, end);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -4999,6 +5712,8 @@ new_range:</div><div class='ctx'>  * Clean the out-of-order queue to make room.</div><div class='ctx'>  * We drop high sequences packets to :</div><div class='ctx'>  * 1) Let a chance for holes to be filled.</div><div class='add'>+ *    This means we do not drop packets from ooo queue if their sequence</div><div class='add'>+ *    is before incoming packet sequence.</div><div class='ctx'>  * 2) not add too big latencies if thousands of packets sit there.</div><div class='ctx'>  *    (But if application shrinks SO_RCVBUF, we could still end up</div><div class='ctx'>  *     freeing whole queue here)</div><div class='hunk'>@@ -5006,42 +5721,51 @@ new_range:</div><div class='ctx'>  *</div><div class='ctx'>  * Return true if queue has shrunk.</div><div class='ctx'>  */</div><div class='del'>-static bool tcp_prune_ofo_queue(struct sock *sk)</div><div class='add'>+static bool tcp_prune_ofo_queue(struct sock *sk, const struct sk_buff *in_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct rb_node *node, *prev;</div><div class='add'>+	bool pruned = false;</div><div class='ctx'> 	int goal;</div><div class='ctx'> </div><div class='ctx'> 	if (RB_EMPTY_ROOT(&amp;tp-&gt;out_of_order_queue))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	NET_INC_STATS(sock_net(sk), LINUX_MIB_OFOPRUNED);</div><div class='ctx'> 	goal = sk-&gt;sk_rcvbuf &gt;&gt; 3;</div><div class='ctx'> 	node = &amp;tp-&gt;ooo_last_skb-&gt;rbnode;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='add'>+		struct sk_buff *skb = rb_to_skb(node);</div><div class='add'>+</div><div class='add'>+		/* If incoming skb would land last in ofo queue, stop pruning. */</div><div class='add'>+		if (after(TCP_SKB_CB(in_skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;seq))</div><div class='add'>+			break;</div><div class='add'>+		pruned = true;</div><div class='ctx'> 		prev = rb_prev(node);</div><div class='ctx'> 		rb_erase(node, &amp;tp-&gt;out_of_order_queue);</div><div class='del'>-		goal -= rb_to_skb(node)-&gt;truesize;</div><div class='del'>-		tcp_drop(sk, rb_to_skb(node));</div><div class='add'>+		goal -= skb-&gt;truesize;</div><div class='add'>+		tcp_drop_reason(sk, skb, SKB_DROP_REASON_TCP_OFO_QUEUE_PRUNE);</div><div class='add'>+		tp-&gt;ooo_last_skb = rb_to_skb(prev);</div><div class='ctx'> 		if (!prev || goal &lt;= 0) {</div><div class='del'>-			sk_mem_reclaim(sk);</div><div class='del'>-			if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf &amp;&amp;</div><div class='add'>+			if (tcp_can_ingest(sk, in_skb) &amp;&amp;</div><div class='ctx'> 			    !tcp_under_memory_pressure(sk))</div><div class='ctx'> 				break;</div><div class='ctx'> 			goal = sk-&gt;sk_rcvbuf &gt;&gt; 3;</div><div class='ctx'> 		}</div><div class='ctx'> 		node = prev;</div><div class='ctx'> 	} while (node);</div><div class='del'>-	tp-&gt;ooo_last_skb = rb_to_skb(prev);</div><div class='ctx'> </div><div class='del'>-	/* Reset SACK state.  A conforming SACK implementation will</div><div class='del'>-	 * do the same at a timeout based retransmit.  When a connection</div><div class='del'>-	 * is in a sad state like this, we care only about integrity</div><div class='del'>-	 * of the connection not performance.</div><div class='del'>-	 */</div><div class='del'>-	if (tp-&gt;rx_opt.sack_ok)</div><div class='del'>-		tcp_sack_reset(&amp;tp-&gt;rx_opt);</div><div class='del'>-	return true;</div><div class='add'>+	if (pruned) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_OFOPRUNED);</div><div class='add'>+		/* Reset SACK state.  A conforming SACK implementation will</div><div class='add'>+		 * do the same at a timeout based retransmit.  When a connection</div><div class='add'>+		 * is in a sad state like this, we care only about integrity</div><div class='add'>+		 * of the connection not performance.</div><div class='add'>+		 */</div><div class='add'>+		if (tp-&gt;rx_opt.sack_ok)</div><div class='add'>+			tcp_sack_reset(&amp;tp-&gt;rx_opt);</div><div class='add'>+	}</div><div class='add'>+	return pruned;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reduce allocated memory if we can, trying to get</div><div class='hunk'>@@ -5051,20 +5775,22 @@ static bool tcp_prune_ofo_queue(struct sock *sk)</div><div class='ctx'>  * until the socket owning process reads some of the data</div><div class='ctx'>  * to stabilize the situation.</div><div class='ctx'>  */</div><div class='del'>-static int tcp_prune_queue(struct sock *sk)</div><div class='add'>+static int tcp_prune_queue(struct sock *sk, const struct sk_buff *in_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	SOCK_DEBUG(sk, "prune_queue: c=%x\n", tp-&gt;copied_seq);</div><div class='add'>+	/* Do nothing if our queues are empty. */</div><div class='add'>+	if (!atomic_read(&amp;sk-&gt;sk_rmem_alloc))</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt;= sk-&gt;sk_rcvbuf)</div><div class='add'>+	if (!tcp_can_ingest(sk, in_skb))</div><div class='ctx'> 		tcp_clamp_window(sk);</div><div class='ctx'> 	else if (tcp_under_memory_pressure(sk))</div><div class='del'>-		tp-&gt;rcv_ssthresh = min(tp-&gt;rcv_ssthresh, 4U * tp-&gt;advmss);</div><div class='add'>+		tcp_adjust_rcv_ssthresh(sk);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf)</div><div class='add'>+	if (tcp_can_ingest(sk, in_skb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	tcp_collapse_ofo_queue(sk);</div><div class='hunk'>@@ -5073,17 +5799,16 @@ static int tcp_prune_queue(struct sock *sk)</div><div class='ctx'> 			     skb_peek(&amp;sk-&gt;sk_receive_queue),</div><div class='ctx'> 			     NULL,</div><div class='ctx'> 			     tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf)</div><div class='add'>+	if (tcp_can_ingest(sk, in_skb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Collapsing did not help, destructive actions follow.</div><div class='ctx'> 	 * This must not ever occur. */</div><div class='ctx'> </div><div class='del'>-	tcp_prune_ofo_queue(sk);</div><div class='add'>+	tcp_prune_ofo_queue(sk, in_skb);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf)</div><div class='add'>+	if (tcp_can_ingest(sk, in_skb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are really being abused, tell the caller to silently</div><div class='hunk'>@@ -5097,7 +5822,7 @@ static int tcp_prune_queue(struct sock *sk)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool tcp_should_expand_sndbuf(const struct sock *sk)</div><div class='add'>+static bool tcp_should_expand_sndbuf(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -5108,26 +5833,30 @@ static bool tcp_should_expand_sndbuf(const struct sock *sk)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are under global TCP memory pressure, do not expand.  */</div><div class='del'>-	if (tcp_under_memory_pressure(sk))</div><div class='add'>+	if (tcp_under_memory_pressure(sk)) {</div><div class='add'>+		int unused_mem = sk_unused_reserved_mem(sk);</div><div class='add'>+</div><div class='add'>+		/* Adjust sndbuf according to reserved mem. But make sure</div><div class='add'>+		 * it never goes below SOCK_MIN_SNDBUF.</div><div class='add'>+		 * See sk_stream_moderate_sndbuf() for more details.</div><div class='add'>+		 */</div><div class='add'>+		if (unused_mem &gt; SOCK_MIN_SNDBUF)</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_sndbuf, unused_mem);</div><div class='add'>+</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If we are under soft global TCP memory pressure, do not expand.  */</div><div class='ctx'> 	if (sk_memory_allocated(sk) &gt;= sk_prot_mem_limits(sk, 0))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* If we filled the congestion window, do not expand.  */</div><div class='del'>-	if (tcp_packets_in_flight(tp) &gt;= tp-&gt;snd_cwnd)</div><div class='add'>+	if (tcp_packets_in_flight(tp) &gt;= tcp_snd_cwnd(tp))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* When incoming ACK allowed to free some skb from write_queue,</div><div class='del'>- * we remember this event in flag SOCK_QUEUE_SHRUNK and wake up socket</div><div class='del'>- * on the exit from tcp input handler.</div><div class='del'>- *</div><div class='del'>- * PROBLEM: sndbuf expansion does not work well with largesend.</div><div class='del'>- */</div><div class='ctx'> static void tcp_new_space(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -5137,21 +5866,28 @@ static void tcp_new_space(struct sock *sk)</div><div class='ctx'> 		tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_write_space(sk);</div><div class='add'>+	INDIRECT_CALL_1(sk-&gt;sk_write_space, sk_stream_write_space, sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_check_space(struct sock *sk)</div><div class='add'>+/* Caller made space either from:</div><div class='add'>+ * 1) Freeing skbs in rtx queues (after tp-&gt;snd_una has advanced)</div><div class='add'>+ * 2) Sent skbs from output queue (and thus advancing tp-&gt;snd_nxt)</div><div class='add'>+ *</div><div class='add'>+ * We might be able to generate EPOLLOUT to the application if:</div><div class='add'>+ * 1) Space consumed in output/rtx queues is below sk-&gt;sk_sndbuf/2</div><div class='add'>+ * 2) notsent amount (tp-&gt;write_seq - tp-&gt;snd_nxt) became</div><div class='add'>+ *    small enough that tcp_stream_memory_free() decides it</div><div class='add'>+ *    is time to generate EPOLLOUT.</div><div class='add'>+ */</div><div class='add'>+void tcp_check_space(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {</div><div class='del'>-		sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);</div><div class='del'>-		/* pairs with tcp_poll() */</div><div class='del'>-		smp_mb();</div><div class='del'>-		if (sk-&gt;sk_socket &amp;&amp;</div><div class='del'>-		    test_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags)) {</div><div class='del'>-			tcp_new_space(sk);</div><div class='del'>-			if (!test_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags))</div><div class='del'>-				tcp_chrono_stop(sk, TCP_CHRONO_SNDBUF_LIMITED);</div><div class='del'>-		}</div><div class='add'>+	/* pairs with tcp_poll() */</div><div class='add'>+	smp_mb();</div><div class='add'>+	if (sk-&gt;sk_socket &amp;&amp;</div><div class='add'>+	    test_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags)) {</div><div class='add'>+		tcp_new_space(sk);</div><div class='add'>+		if (!test_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags))</div><div class='add'>+			tcp_chrono_stop(sk, TCP_CHRONO_SNDBUF_LIMITED);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5167,7 +5903,9 @@ static inline void tcp_data_snd_check(struct sock *sk)</div><div class='ctx'> static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	unsigned long rtt, delay;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	unsigned long rtt;</div><div class='add'>+	u64 delay;</div><div class='ctx'> </div><div class='ctx'> 	    /* More than one full frame received... */</div><div class='ctx'> 	if (((tp-&gt;rcv_nxt - tp-&gt;rcv_wup) &gt; inet_csk(sk)-&gt;icsk_ack.rcv_mss &amp;&amp;</div><div class='hunk'>@@ -5182,6 +5920,14 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)</div><div class='ctx'> 	    tcp_in_quickack_mode(sk) ||</div><div class='ctx'> 	    /* Protocol state mandates a one-time immediate ACK */</div><div class='ctx'> 	    inet_csk(sk)-&gt;icsk_ack.pending &amp; ICSK_ACK_NOW) {</div><div class='add'>+		/* If we are running from __release_sock() in user context,</div><div class='add'>+		 * Defer the ack until tcp_release_cb().</div><div class='add'>+		 */</div><div class='add'>+		if (sock_owned_by_user_nocheck(sk) &amp;&amp;</div><div class='add'>+		    READ_ONCE(net-&gt;ipv4.sysctl_tcp_backlog_ack_defer)) {</div><div class='add'>+			set_bit(TCP_ACK_DEFERRED, &amp;sk-&gt;sk_tsq_flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> send_now:</div><div class='ctx'> 		tcp_send_ack(sk);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -5193,24 +5939,42 @@ send_now:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tcp_is_sack(tp) ||</div><div class='del'>-	    tp-&gt;compressed_ack &gt;= sock_net(sk)-&gt;ipv4.sysctl_tcp_comp_sack_nr)</div><div class='add'>+	    tp-&gt;compressed_ack &gt;= READ_ONCE(net-&gt;ipv4.sysctl_tcp_comp_sack_nr))</div><div class='ctx'> 		goto send_now;</div><div class='del'>-	tp-&gt;compressed_ack++;</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;compressed_ack_rcv_nxt != tp-&gt;rcv_nxt) {</div><div class='add'>+		tp-&gt;compressed_ack_rcv_nxt = tp-&gt;rcv_nxt;</div><div class='add'>+		tp-&gt;dup_ack_counter = 0;</div><div class='add'>+	}</div><div class='add'>+	if (tp-&gt;dup_ack_counter &lt; TCP_FASTRETRANS_THRESH) {</div><div class='add'>+		tp-&gt;dup_ack_counter++;</div><div class='add'>+		goto send_now;</div><div class='add'>+	}</div><div class='add'>+	tp-&gt;compressed_ack++;</div><div class='ctx'> 	if (hrtimer_is_queued(&amp;tp-&gt;compressed_ack_timer))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* compress ack timer : 5 % of rtt, but no more than tcp_comp_sack_delay_ns */</div><div class='add'>+	/* compress ack timer : comp_sack_rtt_percent of rtt,</div><div class='add'>+	 * but no more than tcp_comp_sack_delay_ns.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	rtt = tp-&gt;rcv_rtt_est.rtt_us;</div><div class='ctx'> 	if (tp-&gt;srtt_us &amp;&amp; tp-&gt;srtt_us &lt; rtt)</div><div class='ctx'> 		rtt = tp-&gt;srtt_us;</div><div class='ctx'> </div><div class='del'>-	delay = min_t(unsigned long, sock_net(sk)-&gt;ipv4.sysctl_tcp_comp_sack_delay_ns,</div><div class='del'>-		      rtt * (NSEC_PER_USEC &gt;&gt; 3)/20);</div><div class='add'>+	/* delay = (rtt &gt;&gt; 3) * NSEC_PER_USEC * comp_sack_rtt_percent / 100</div><div class='add'>+	 * -&gt;</div><div class='add'>+	 * delay = rtt * 1.25 * comp_sack_rtt_percent</div><div class='add'>+	 */</div><div class='add'>+	delay = (u64)(rtt + (rtt &gt;&gt; 2)) *</div><div class='add'>+		READ_ONCE(net-&gt;ipv4.sysctl_tcp_comp_sack_rtt_percent);</div><div class='add'>+</div><div class='add'>+	delay = min(delay, READ_ONCE(net-&gt;ipv4.sysctl_tcp_comp_sack_delay_ns));</div><div class='add'>+</div><div class='ctx'> 	sock_hold(sk);</div><div class='del'>-	hrtimer_start(&amp;tp-&gt;compressed_ack_timer, ns_to_ktime(delay),</div><div class='del'>-		      HRTIMER_MODE_REL_PINNED_SOFT);</div><div class='add'>+	hrtimer_start_range_ns(&amp;tp-&gt;compressed_ack_timer, ns_to_ktime(delay),</div><div class='add'>+			       READ_ONCE(net-&gt;ipv4.sysctl_tcp_comp_sack_slack_ns),</div><div class='add'>+			       HRTIMER_MODE_REL_PINNED_SOFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tcp_ack_snd_check(struct sock *sk)</div><div class='hunk'>@@ -5237,7 +6001,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 ptr = ntohs(th-&gt;urg_ptr);</div><div class='ctx'> </div><div class='del'>-	if (ptr &amp;&amp; !sock_net(sk)-&gt;ipv4.sysctl_tcp_stdurg)</div><div class='add'>+	if (ptr &amp;&amp; !READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_stdurg))</div><div class='ctx'> 		ptr--;</div><div class='ctx'> 	ptr += ntohl(th-&gt;seq);</div><div class='ctx'> </div><div class='hunk'>@@ -5290,8 +6054,8 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tp-&gt;urg_data = TCP_URG_NOTYET;</div><div class='del'>-	tp-&gt;urg_seq = ptr;</div><div class='add'>+	WRITE_ONCE(tp-&gt;urg_data, TCP_URG_NOTYET);</div><div class='add'>+	WRITE_ONCE(tp-&gt;urg_seq, ptr);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable header prediction. */</div><div class='ctx'> 	tp-&gt;pred_flags = 0;</div><div class='hunk'>@@ -5303,11 +6067,11 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we get a new urgent pointer - normally not. */</div><div class='del'>-	if (th-&gt;urg)</div><div class='add'>+	if (unlikely(th-&gt;urg))</div><div class='ctx'> 		tcp_check_urg(sk, th);</div><div class='ctx'> </div><div class='ctx'> 	/* Do we wait for any urgent data? - normally not... */</div><div class='del'>-	if (tp-&gt;urg_data == TCP_URG_NOTYET) {</div><div class='add'>+	if (unlikely(tp-&gt;urg_data == TCP_URG_NOTYET)) {</div><div class='ctx'> 		u32 ptr = tp-&gt;urg_seq - ntohl(th-&gt;seq) + (th-&gt;doff * 4) -</div><div class='ctx'> 			  th-&gt;syn;</div><div class='ctx'> </div><div class='hunk'>@@ -5316,7 +6080,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t</div><div class='ctx'> 			u8 tmp;</div><div class='ctx'> 			if (skb_copy_bits(skb, ptr, &amp;tmp, 1))</div><div class='ctx'> 				BUG();</div><div class='del'>-			tp-&gt;urg_data = TCP_URG_VALID | tmp;</div><div class='add'>+			WRITE_ONCE(tp-&gt;urg_data, TCP_URG_VALID | tmp);</div><div class='ctx'> 			if (!sock_flag(sk, SOCK_DEAD))</div><div class='ctx'> 				sk-&gt;sk_data_ready(sk);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5333,7 +6097,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t</div><div class='ctx'>  */</div><div class='ctx'> static bool tcp_reset_check(const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	return unlikely(TCP_SKB_CB(skb)-&gt;seq == (tp-&gt;rcv_nxt - 1) &amp;&amp;</div><div class='ctx'> 			(1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE_WAIT | TCPF_LAST_ACK |</div><div class='hunk'>@@ -5347,25 +6111,42 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				  const struct tcphdr *th, int syn_inerr)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	bool rst_seq_match = false;</div><div class='add'>+	bool accecn_reflector = false;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	/* RFC1323: H1. Apply PAWS check first. */</div><div class='del'>-	if (tcp_fast_parse_options(sock_net(sk), skb, th, tp) &amp;&amp;</div><div class='del'>-	    tp-&gt;rx_opt.saw_tstamp &amp;&amp;</div><div class='del'>-	    tcp_paws_discard(sk, skb)) {</div><div class='del'>-		if (!th-&gt;rst) {</div><div class='del'>-			NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);</div><div class='del'>-			if (!tcp_oow_rate_limited(sock_net(sk), skb,</div><div class='del'>-						  LINUX_MIB_TCPACKSKIPPEDPAWS,</div><div class='del'>-						  &amp;tp-&gt;last_oow_ack_time))</div><div class='del'>-				tcp_send_dupack(sk, skb);</div><div class='del'>-			goto discard;</div><div class='del'>-		}</div><div class='del'>-		/* Reset is accepted even if it did not pass PAWS. */</div><div class='add'>+	if (!tcp_fast_parse_options(sock_net(sk), skb, th, tp) ||</div><div class='add'>+	    !tp-&gt;rx_opt.saw_tstamp ||</div><div class='add'>+	    tcp_paws_check(&amp;tp-&gt;rx_opt, TCP_PAWS_WINDOW))</div><div class='add'>+		goto step1;</div><div class='add'>+</div><div class='add'>+	reason = tcp_disordered_ack_check(sk, skb);</div><div class='add'>+	if (!reason)</div><div class='add'>+		goto step1;</div><div class='add'>+	/* Reset is accepted even if it did not pass PAWS. */</div><div class='add'>+	if (th-&gt;rst)</div><div class='add'>+		goto step1;</div><div class='add'>+	if (unlikely(th-&gt;syn))</div><div class='add'>+		goto syn_challenge;</div><div class='add'>+</div><div class='add'>+	/* Old ACK are common, increment PAWS_OLD_ACK</div><div class='add'>+	 * and do not send a dupack.</div><div class='add'>+	 */</div><div class='add'>+	if (reason == SKB_DROP_REASON_TCP_RFC7323_PAWS_ACK) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWS_OLD_ACK);</div><div class='add'>+		goto discard;</div><div class='ctx'> 	}</div><div class='add'>+	NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);</div><div class='add'>+	if (!tcp_oow_rate_limited(sock_net(sk), skb,</div><div class='add'>+				  LINUX_MIB_TCPACKSKIPPEDPAWS,</div><div class='add'>+				  &amp;tp-&gt;last_oow_ack_time))</div><div class='add'>+		tcp_send_dupack(sk, skb);</div><div class='add'>+	goto discard;</div><div class='ctx'> </div><div class='add'>+step1:</div><div class='ctx'> 	/* Step 1: check sequence number */</div><div class='del'>-	if (!tcp_sequence(tp, TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;end_seq)) {</div><div class='add'>+	reason = tcp_sequence(sk, TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='add'>+	if (reason) {</div><div class='ctx'> 		/* RFC793, page 37: "In all states except SYN-SENT, all reset</div><div class='ctx'> 		 * (RST) segments are validated by checking their SEQ-fields."</div><div class='ctx'> 		 * And page 69: "If an incoming segment is not acceptable,</div><div class='hunk'>@@ -5375,12 +6156,17 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		if (!th-&gt;rst) {</div><div class='ctx'> 			if (th-&gt;syn)</div><div class='ctx'> 				goto syn_challenge;</div><div class='add'>+</div><div class='add'>+			if (reason == SKB_DROP_REASON_TCP_INVALID_SEQUENCE ||</div><div class='add'>+			    reason == SKB_DROP_REASON_TCP_INVALID_END_SEQUENCE)</div><div class='add'>+				NET_INC_STATS(sock_net(sk),</div><div class='add'>+					      LINUX_MIB_BEYOND_WINDOW);</div><div class='ctx'> 			if (!tcp_oow_rate_limited(sock_net(sk), skb,</div><div class='ctx'> 						  LINUX_MIB_TCPACKSKIPPEDSEQ,</div><div class='ctx'> 						  &amp;tp-&gt;last_oow_ack_time))</div><div class='ctx'> 				tcp_send_dupack(sk, skb);</div><div class='ctx'> 		} else if (tcp_reset_check(sk, skb)) {</div><div class='del'>-			tcp_reset(sk);</div><div class='add'>+			goto reset;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5397,9 +6183,10 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 *     Send a challenge ACK</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;seq == tp-&gt;rcv_nxt ||</div><div class='del'>-		    tcp_reset_check(sk, skb)) {</div><div class='del'>-			rst_seq_match = true;</div><div class='del'>-		} else if (tcp_is_sack(tp) &amp;&amp; tp-&gt;rx_opt.num_sacks &gt; 0) {</div><div class='add'>+		    tcp_reset_check(sk, skb))</div><div class='add'>+			goto reset;</div><div class='add'>+</div><div class='add'>+		if (tcp_is_sack(tp) &amp;&amp; tp-&gt;rx_opt.num_sacks &gt; 0) {</div><div class='ctx'> 			struct tcp_sack_block *sp = &amp;tp-&gt;selective_acks[0];</div><div class='ctx'> 			int max_sack = sp[0].end_seq;</div><div class='ctx'> 			int this_sack;</div><div class='hunk'>@@ -5412,21 +6199,18 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (TCP_SKB_CB(skb)-&gt;seq == max_sack)</div><div class='del'>-				rst_seq_match = true;</div><div class='add'>+				goto reset;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (rst_seq_match)</div><div class='del'>-			tcp_reset(sk);</div><div class='del'>-		else {</div><div class='del'>-			/* Disable TFO if RST is out-of-order</div><div class='del'>-			 * and no data has been received</div><div class='del'>-			 * for current active TFO socket</div><div class='del'>-			 */</div><div class='del'>-			if (tp-&gt;syn_fastopen &amp;&amp; !tp-&gt;data_segs_in &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_state == TCP_ESTABLISHED)</div><div class='del'>-				tcp_fastopen_active_disable(sk);</div><div class='del'>-			tcp_send_challenge_ack(sk, skb);</div><div class='del'>-		}</div><div class='add'>+		/* Disable TFO if RST is out-of-order</div><div class='add'>+		 * and no data has been received</div><div class='add'>+		 * for current active TFO socket</div><div class='add'>+		 */</div><div class='add'>+		if (tp-&gt;syn_fastopen &amp;&amp; !tp-&gt;data_segs_in &amp;&amp;</div><div class='add'>+		    sk-&gt;sk_state == TCP_ESTABLISHED)</div><div class='add'>+			tcp_fastopen_active_disable(sk);</div><div class='add'>+		tcp_send_challenge_ack(sk, false);</div><div class='add'>+		SKB_DR_SET(reason, TCP_RESET);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5436,18 +6220,42 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	 * RFC 5961 4.2 : Send a challenge ack</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (th-&gt;syn) {</div><div class='add'>+		if (tcp_ecn_mode_accecn(tp)) {</div><div class='add'>+			accecn_reflector = true;</div><div class='add'>+			if (tp-&gt;rx_opt.accecn &amp;&amp;</div><div class='add'>+			    tp-&gt;saw_accecn_opt &lt; TCP_ACCECN_OPT_COUNTER_SEEN) {</div><div class='add'>+				u8 saw_opt = tcp_accecn_option_init(skb, tp-&gt;rx_opt.accecn);</div><div class='add'>+</div><div class='add'>+				tcp_accecn_saw_opt_fail_recv(tp, saw_opt);</div><div class='add'>+				tcp_accecn_opt_demand_min(sk, 1);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (sk-&gt;sk_state == TCP_SYN_RECV &amp;&amp; sk-&gt;sk_socket &amp;&amp; th-&gt;ack &amp;&amp;</div><div class='add'>+		    TCP_SKB_CB(skb)-&gt;seq + 1 == TCP_SKB_CB(skb)-&gt;end_seq &amp;&amp;</div><div class='add'>+		    TCP_SKB_CB(skb)-&gt;seq + 1 == tp-&gt;rcv_nxt &amp;&amp;</div><div class='add'>+		    TCP_SKB_CB(skb)-&gt;ack_seq == tp-&gt;snd_nxt)</div><div class='add'>+			goto pass;</div><div class='ctx'> syn_challenge:</div><div class='ctx'> 		if (syn_inerr)</div><div class='ctx'> 			TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNCHALLENGE);</div><div class='del'>-		tcp_send_challenge_ack(sk, skb);</div><div class='add'>+		tcp_send_challenge_ack(sk, accecn_reflector);</div><div class='add'>+		SKB_DR_SET(reason, TCP_INVALID_SYN);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+pass:</div><div class='add'>+	bpf_skops_parse_hdr(sk, skb);</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> discard:</div><div class='del'>-	tcp_drop(sk, skb);</div><div class='add'>+	tcp_drop_reason(sk, skb, reason);</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+reset:</div><div class='add'>+	tcp_reset(sk, skb);</div><div class='add'>+	__kfree_skb(skb);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5476,6 +6284,7 @@ discard:</div><div class='ctx'>  */</div><div class='ctx'> void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	const struct tcphdr *th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned int len = skb-&gt;len;</div><div class='hunk'>@@ -5484,7 +6293,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	trace_tcp_probe(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='del'>-	if (unlikely(!sk-&gt;sk_rx_dst))</div><div class='add'>+	if (unlikely(!rcu_access_pointer(sk-&gt;sk_rx_dst)))</div><div class='ctx'> 		inet_csk(sk)-&gt;icsk_af_ops-&gt;sk_rx_dst_set(sk, skb);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Header prediction.</div><div class='hunk'>@@ -5502,6 +6311,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_opt.saw_tstamp = 0;</div><div class='add'>+	tp-&gt;rx_opt.accecn = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*	pred_flags is 0xS?10 &lt;&lt; 16 + snd_wnd</div><div class='ctx'> 	 *	if header_prediction is to be made</div><div class='hunk'>@@ -5516,6 +6326,8 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	    TCP_SKB_CB(skb)-&gt;seq == tp-&gt;rcv_nxt &amp;&amp;</div><div class='ctx'> 	    !after(TCP_SKB_CB(skb)-&gt;ack_seq, tp-&gt;snd_nxt)) {</div><div class='ctx'> 		int tcp_header_len = tp-&gt;tcp_header_len;</div><div class='add'>+		s32 delta = 0;</div><div class='add'>+		int flag = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Timestamp header prediction: tcp_header_len</div><div class='ctx'> 		 * is automatically equal to th-&gt;doff*4 due to pred_flags</div><div class='hunk'>@@ -5528,8 +6340,10 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			if (!tcp_parse_aligned_timestamp(tp, th))</div><div class='ctx'> 				goto slow_path;</div><div class='ctx'> </div><div class='add'>+			delta = tp-&gt;rx_opt.rcv_tsval -</div><div class='add'>+				tp-&gt;rx_opt.ts_recent;</div><div class='ctx'> 			/* If PAWS failed, check it more carefully in slow path */</div><div class='del'>-			if ((s32)(tp-&gt;rx_opt.rcv_tsval - tp-&gt;rx_opt.ts_recent) &lt; 0)</div><div class='add'>+			if (delta &lt; 0)</div><div class='ctx'> 				goto slow_path;</div><div class='ctx'> </div><div class='ctx'> 			/* DO NOT update ts_recent here, if checksum fails</div><div class='hunk'>@@ -5549,12 +6363,15 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 				if (tcp_header_len ==</div><div class='ctx'> 				    (sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED) &amp;&amp;</div><div class='ctx'> 				    tp-&gt;rcv_nxt == tp-&gt;rcv_wup)</div><div class='del'>-					tcp_store_ts_recent(tp);</div><div class='add'>+					flag |= __tcp_replace_ts_recent(tp,</div><div class='add'>+									delta);</div><div class='add'>+</div><div class='add'>+				tcp_ecn_received_counters(sk, skb, 0);</div><div class='ctx'> </div><div class='ctx'> 				/* We know that such packets are checksummed</div><div class='ctx'> 				 * on entry.</div><div class='ctx'> 				 */</div><div class='del'>-				tcp_ack(sk, skb, 0);</div><div class='add'>+				tcp_ack(sk, skb, flag);</div><div class='ctx'> 				__kfree_skb(skb);</div><div class='ctx'> 				tcp_data_snd_check(sk);</div><div class='ctx'> 				/* When receiving pure ack in fast path, update</div><div class='hunk'>@@ -5564,6 +6381,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 				tp-&gt;rcv_rtt_last_tsecr = tp-&gt;rx_opt.rcv_tsecr;</div><div class='ctx'> 				return;</div><div class='ctx'> 			} else { /* Header too small */</div><div class='add'>+				reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 				TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='ctx'> 				goto discard;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -5574,6 +6392,10 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			if (tcp_checksum_complete(skb))</div><div class='ctx'> 				goto csum_error;</div><div class='ctx'> </div><div class='add'>+			if (after(TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='add'>+				  tp-&gt;rcv_nxt + tcp_receive_window(tp)))</div><div class='add'>+				goto validate;</div><div class='add'>+</div><div class='ctx'> 			if ((int)skb-&gt;truesize &gt; sk-&gt;sk_forward_alloc)</div><div class='ctx'> 				goto step5;</div><div class='ctx'> </div><div class='hunk'>@@ -5584,24 +6406,30 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			if (tcp_header_len ==</div><div class='ctx'> 			    (sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED) &amp;&amp;</div><div class='ctx'> 			    tp-&gt;rcv_nxt == tp-&gt;rcv_wup)</div><div class='del'>-				tcp_store_ts_recent(tp);</div><div class='add'>+				flag |= __tcp_replace_ts_recent(tp,</div><div class='add'>+								delta);</div><div class='ctx'> </div><div class='ctx'> 			tcp_rcv_rtt_measure_ts(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPHPHITS);</div><div class='ctx'> </div><div class='ctx'> 			/* Bulk data transfer: receiver */</div><div class='del'>-			eaten = tcp_queue_rcv(sk, skb, tcp_header_len,</div><div class='del'>-					      &amp;fragstolen);</div><div class='add'>+			tcp_cleanup_skb(skb);</div><div class='add'>+			__skb_pull(skb, tcp_header_len);</div><div class='add'>+			tcp_ecn_received_counters(sk, skb,</div><div class='add'>+						  len - tcp_header_len);</div><div class='add'>+			eaten = tcp_queue_rcv(sk, skb, &amp;fragstolen);</div><div class='ctx'> </div><div class='ctx'> 			tcp_event_data_recv(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 			if (TCP_SKB_CB(skb)-&gt;ack_seq != tp-&gt;snd_una) {</div><div class='ctx'> 				/* Well, only one small jumplet in fast path... */</div><div class='del'>-				tcp_ack(sk, skb, FLAG_DATA);</div><div class='add'>+				tcp_ack(sk, skb, flag | FLAG_DATA);</div><div class='ctx'> 				tcp_data_snd_check(sk);</div><div class='ctx'> 				if (!inet_csk_ack_scheduled(sk))</div><div class='ctx'> 					goto no_ack;</div><div class='add'>+			} else {</div><div class='add'>+				tcp_update_wl(tp, TCP_SKB_CB(skb)-&gt;seq);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			__tcp_ack_snd_check(sk, 0);</div><div class='hunk'>@@ -5617,20 +6445,26 @@ slow_path:</div><div class='ctx'> 	if (len &lt; (th-&gt;doff &lt;&lt; 2) || tcp_checksum_complete(skb))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='del'>-	if (!th-&gt;ack &amp;&amp; !th-&gt;rst &amp;&amp; !th-&gt;syn)</div><div class='add'>+	if (!th-&gt;ack &amp;&amp; !th-&gt;rst &amp;&amp; !th-&gt;syn) {</div><div class='add'>+		reason = SKB_DROP_REASON_TCP_FLAGS;</div><div class='ctx'> 		goto discard;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Standard slow path.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='add'>+validate:</div><div class='ctx'> 	if (!tcp_validate_incoming(sk, skb, th, 1))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> step5:</div><div class='del'>-	if (tcp_ack(sk, skb, FLAG_SLOWPATH | FLAG_UPDATE_TS_RECENT) &lt; 0)</div><div class='del'>-		goto discard;</div><div class='add'>+	tcp_ecn_received_counters_payload(sk, skb);</div><div class='ctx'> </div><div class='add'>+	reason = tcp_ack(sk, skb, FLAG_SLOWPATH | FLAG_UPDATE_TS_RECENT);</div><div class='add'>+	if ((int)reason &lt; 0) {</div><div class='add'>+		reason = -reason;</div><div class='add'>+		goto discard;</div><div class='add'>+	}</div><div class='ctx'> 	tcp_rcv_rtt_measure_ts(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Process urgent data. */</div><div class='hunk'>@@ -5644,19 +6478,50 @@ step5:</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> csum_error:</div><div class='add'>+	reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+	trace_tcp_bad_csum(skb);</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='ctx'> </div><div class='ctx'> discard:</div><div class='del'>-	tcp_drop(sk, skb);</div><div class='add'>+	tcp_drop_reason(sk, skb, reason);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_rcv_established);</div><div class='add'>+</div><div class='add'>+void tcp_init_transfer(struct sock *sk, int bpf_op, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	tcp_mtup_init(sk);</div><div class='add'>+	icsk-&gt;icsk_af_ops-&gt;rebuild_header(sk);</div><div class='add'>+	tcp_init_metrics(sk);</div><div class='add'>+</div><div class='add'>+	/* Initialize the congestion window to start the transfer.</div><div class='add'>+	 * Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been</div><div class='add'>+	 * retransmitted. In light of RFC6298 more aggressive 1sec</div><div class='add'>+	 * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK</div><div class='add'>+	 * retransmission has occurred.</div><div class='add'>+	 */</div><div class='add'>+	if (tp-&gt;total_retrans &gt; 1 &amp;&amp; tp-&gt;undo_marker)</div><div class='add'>+		tcp_snd_cwnd_set(tp, 1);</div><div class='add'>+	else</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_init_cwnd(tp, __sk_dst_get(sk)));</div><div class='add'>+	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='add'>+</div><div class='add'>+	bpf_skops_established(sk, bpf_op, skb);</div><div class='add'>+	/* Initialize congestion control unless BPF initialized it already: */</div><div class='add'>+	if (!icsk-&gt;icsk_ca_initialized)</div><div class='add'>+		tcp_init_congestion_control(sk);</div><div class='add'>+	tcp_init_buffer_space(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_rcv_established);</div><div class='ctx'> </div><div class='ctx'> void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='add'>+	tcp_ao_finish_connect(sk, skb);</div><div class='ctx'> 	tcp_set_state(sk, TCP_ESTABLISHED);</div><div class='ctx'> 	icsk-&gt;icsk_ack.lrcvtime = tcp_jiffies32;</div><div class='ctx'> </div><div class='hunk'>@@ -5666,7 +6531,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		sk_mark_napi_id(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tcp_init_transfer(sk, BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB);</div><div class='add'>+	tcp_init_transfer(sk, BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent spurious tcp_cwnd_restart() on first data</div><div class='ctx'> 	 * packet.</div><div class='hunk'>@@ -5674,7 +6539,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	tp-&gt;lsndtime = tcp_jiffies32;</div><div class='ctx'> </div><div class='ctx'> 	if (sock_flag(sk, SOCK_KEEPOPEN))</div><div class='del'>-		inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tp));</div><div class='add'>+		tcp_reset_keepalive_timer(sk, keepalive_time_when(tp));</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;rx_opt.snd_wscale)</div><div class='ctx'> 		__tcp_fast_path_on(tp, tp-&gt;snd_wnd);</div><div class='hunk'>@@ -5690,7 +6555,7 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack,</div><div class='ctx'> 	u16 mss = tp-&gt;rx_opt.mss_clamp, try_exp = 0;</div><div class='ctx'> 	bool syn_drop = false;</div><div class='ctx'> </div><div class='del'>-	if (mss == tp-&gt;rx_opt.user_mss) {</div><div class='add'>+	if (mss == READ_ONCE(tp-&gt;rx_opt.user_mss)) {</div><div class='ctx'> 		struct tcp_options_received opt;</div><div class='ctx'> </div><div class='ctx'> 		/* Get original SYNACK MSS value if user MSS sets mss_clamp */</div><div class='hunk'>@@ -5721,11 +6586,13 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack,</div><div class='ctx'> 	tcp_fastopen_cache_set(sk, mss, cookie, syn_drop, try_exp);</div><div class='ctx'> </div><div class='ctx'> 	if (data) { /* Retransmit unacked data in SYN */</div><div class='del'>-		skb_rbtree_walk_from(data) {</div><div class='del'>-			if (__tcp_retransmit_skb(sk, data, 1))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		tcp_rearm_rto(sk);</div><div class='add'>+		if (tp-&gt;total_retrans)</div><div class='add'>+			tp-&gt;fastopen_client_fail = TFO_SYN_RETRANSMITTED;</div><div class='add'>+		else</div><div class='add'>+			tp-&gt;fastopen_client_fail = TFO_DATA_NOT_ACKED;</div><div class='add'>+		skb_rbtree_walk_from(data)</div><div class='add'>+			 tcp_mark_skb_lost(sk, data);</div><div class='add'>+		tcp_non_congestion_loss_retransmit(sk);</div><div class='ctx'> 		NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 				LINUX_MIB_TCPFASTOPENACTIVEFAIL);</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -5753,6 +6620,21 @@ static void smc_check_reset_syn(struct tcp_sock *tp)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_try_undo_spurious_syn(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 syn_stamp;</div><div class='add'>+</div><div class='add'>+	/* undo_marker is set when SYN or SYNACK times out. The timeout is</div><div class='add'>+	 * spurious if the ACK's timestamp option echo value matches the</div><div class='add'>+	 * original SYN timestamp.</div><div class='add'>+	 */</div><div class='add'>+	syn_stamp = tp-&gt;retrans_stamp;</div><div class='add'>+	if (tp-&gt;undo_marker &amp;&amp; syn_stamp &amp;&amp; tp-&gt;rx_opt.saw_tstamp &amp;&amp;</div><div class='add'>+	    syn_stamp == tp-&gt;rx_opt.rcv_tsecr)</div><div class='add'>+		tp-&gt;undo_marker = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 					 const struct tcphdr *th)</div><div class='ctx'> {</div><div class='hunk'>@@ -5761,6 +6643,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	struct tcp_fastopen_cookie foc = { .len = -1 };</div><div class='ctx'> 	int saved_clamp = tp-&gt;rx_opt.mss_clamp;</div><div class='ctx'> 	bool fastopen_fail;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	tcp_parse_options(sock_net(sk), skb, &amp;tp-&gt;rx_opt, 0, &amp;foc);</div><div class='ctx'> 	if (tp-&gt;rx_opt.saw_tstamp &amp;&amp; tp-&gt;rx_opt.rcv_tsecr)</div><div class='hunk'>@@ -5776,14 +6659,21 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 *        the segment and return)"</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!after(TCP_SKB_CB(skb)-&gt;ack_seq, tp-&gt;snd_una) ||</div><div class='del'>-		    after(TCP_SKB_CB(skb)-&gt;ack_seq, tp-&gt;snd_nxt))</div><div class='add'>+		    after(TCP_SKB_CB(skb)-&gt;ack_seq, tp-&gt;snd_nxt)) {</div><div class='add'>+			/* Previous FIN/ACK or RST/ACK might be ignored. */</div><div class='add'>+			if (icsk-&gt;icsk_retransmits == 0)</div><div class='add'>+				tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+						     TCP_TIMEOUT_MIN, false);</div><div class='add'>+			SKB_DR_SET(reason, TCP_INVALID_ACK_SEQUENCE);</div><div class='ctx'> 			goto reset_and_undo;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;rx_opt.saw_tstamp &amp;&amp; tp-&gt;rx_opt.rcv_tsecr &amp;&amp;</div><div class='ctx'> 		    !between(tp-&gt;rx_opt.rcv_tsecr, tp-&gt;retrans_stamp,</div><div class='del'>-			     tcp_time_stamp(tp))) {</div><div class='add'>+			     tcp_time_stamp_ts(tp))) {</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk),</div><div class='ctx'> 					LINUX_MIB_PAWSACTIVEREJECTED);</div><div class='add'>+			SKB_DR_SET(reason, TCP_RFC7323_PAWS);</div><div class='ctx'> 			goto reset_and_undo;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5796,8 +6686,10 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (th-&gt;rst) {</div><div class='del'>-			tcp_reset(sk);</div><div class='del'>-			goto discard;</div><div class='add'>+			tcp_reset(sk, skb);</div><div class='add'>+consume:</div><div class='add'>+			__kfree_skb(skb);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* rfc793:</div><div class='hunk'>@@ -5807,9 +6699,10 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 *    See note below!</div><div class='ctx'> 		 *                                        --ANK(990513)</div><div class='ctx'> 		 */</div><div class='del'>-		if (!th-&gt;syn)</div><div class='add'>+		if (!th-&gt;syn) {</div><div class='add'>+			SKB_DR_SET(reason, TCP_FLAGS);</div><div class='ctx'> 			goto discard_and_undo;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		/* rfc793:</div><div class='ctx'> 		 *   "If the SYN bit is on ...</div><div class='ctx'> 		 *    are acceptable then ...</div><div class='hunk'>@@ -5817,15 +6710,18 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 *    state to ESTABLISHED..."</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		tcp_ecn_rcv_synack(tp, th);</div><div class='add'>+		if (tcp_ecn_mode_any(tp))</div><div class='add'>+			tcp_ecn_rcv_synack(sk, skb, th,</div><div class='add'>+					   TCP_SKB_CB(skb)-&gt;ip_dsfield);</div><div class='ctx'> </div><div class='ctx'> 		tcp_init_wl(tp, TCP_SKB_CB(skb)-&gt;seq);</div><div class='add'>+		tcp_try_undo_spurious_syn(sk);</div><div class='ctx'> 		tcp_ack(sk, skb, FLAG_SLOWPATH);</div><div class='ctx'> </div><div class='ctx'> 		/* Ok.. it's good. Set up sequence numbers and</div><div class='ctx'> 		 * move to established.</div><div class='ctx'> 		 */</div><div class='del'>-		tp-&gt;rcv_nxt = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='add'>+		WRITE_ONCE(tp-&gt;rcv_nxt, TCP_SKB_CB(skb)-&gt;seq + 1);</div><div class='ctx'> 		tp-&gt;rcv_wup = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='ctx'> </div><div class='ctx'> 		/* RFC1323: The window in SYN &amp; SYN/ACK segments is</div><div class='hunk'>@@ -5835,7 +6731,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		if (!tp-&gt;rx_opt.wscale_ok) {</div><div class='ctx'> 			tp-&gt;rx_opt.snd_wscale = tp-&gt;rx_opt.rcv_wscale = 0;</div><div class='del'>-			tp-&gt;window_clamp = min(tp-&gt;window_clamp, 65535U);</div><div class='add'>+			WRITE_ONCE(tp-&gt;window_clamp,</div><div class='add'>+				   min(tp-&gt;window_clamp, 65535U));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;rx_opt.saw_tstamp) {</div><div class='hunk'>@@ -5854,7 +6751,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		/* Remember, tcp_poll() does not lock socket!</div><div class='ctx'> 		 * Change state from SYN-SENT only after copied_seq</div><div class='ctx'> 		 * is initialized. */</div><div class='del'>-		tp-&gt;copied_seq = tp-&gt;rcv_nxt;</div><div class='add'>+		WRITE_ONCE(tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='ctx'> </div><div class='ctx'> 		smc_check_reset_syn(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5872,8 +6769,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		if (fastopen_fail)</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (sk-&gt;sk_write_pending ||</div><div class='del'>-		    icsk-&gt;icsk_accept_queue.rskq_defer_accept ||</div><div class='del'>-		    icsk-&gt;icsk_ack.pingpong) {</div><div class='add'>+		    READ_ONCE(icsk-&gt;icsk_accept_queue.rskq_defer_accept) ||</div><div class='add'>+		    inet_csk_in_pingpong_mode(sk)) {</div><div class='ctx'> 			/* Save one ACK. Data will be ready after</div><div class='ctx'> 			 * several ticks, if write_pending is set.</div><div class='ctx'> 			 *</div><div class='hunk'>@@ -5883,15 +6780,11 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			 */</div><div class='ctx'> 			inet_csk_schedule_ack(sk);</div><div class='ctx'> 			tcp_enter_quickack_mode(sk, TCP_MAX_QUICKACKS);</div><div class='del'>-			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,</div><div class='del'>-						  TCP_DELACK_MAX, TCP_RTO_MAX);</div><div class='del'>-</div><div class='del'>-discard:</div><div class='del'>-			tcp_drop(sk, skb);</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			tcp_send_ack(sk);</div><div class='add'>+			tcp_reset_xmit_timer(sk, ICSK_TIME_DACK,</div><div class='add'>+					     TCP_DELACK_MAX, false);</div><div class='add'>+			goto consume;</div><div class='ctx'> 		}</div><div class='add'>+		tcp_send_ack_reflect_ect(sk, tcp_ecn_mode_accecn(tp));</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5903,20 +6796,31 @@ discard:</div><div class='ctx'> 		 *</div><div class='ctx'> 		 *      Otherwise (no ACK) drop the segment and return."</div><div class='ctx'> 		 */</div><div class='del'>-</div><div class='add'>+		SKB_DR_SET(reason, TCP_RESET);</div><div class='ctx'> 		goto discard_and_undo;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* PAWS check. */</div><div class='ctx'> 	if (tp-&gt;rx_opt.ts_recent_stamp &amp;&amp; tp-&gt;rx_opt.saw_tstamp &amp;&amp;</div><div class='del'>-	    tcp_paws_reject(&amp;tp-&gt;rx_opt, 0))</div><div class='add'>+	    tcp_paws_reject(&amp;tp-&gt;rx_opt, 0)) {</div><div class='add'>+		SKB_DR_SET(reason, TCP_RFC7323_PAWS);</div><div class='ctx'> 		goto discard_and_undo;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	if (th-&gt;syn) {</div><div class='ctx'> 		/* We see SYN without ACK. It is attempt of</div><div class='ctx'> 		 * simultaneous connect with crossed SYNs.</div><div class='ctx'> 		 * Particularly, it can be connect to self.</div><div class='ctx'> 		 */</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+		struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+		ao = rcu_dereference_protected(tp-&gt;ao_info,</div><div class='add'>+					       lockdep_sock_is_held(sk));</div><div class='add'>+		if (ao) {</div><div class='add'>+			WRITE_ONCE(ao-&gt;risn, th-&gt;seq);</div><div class='add'>+			ao-&gt;rcv_sne = 0;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 		tcp_set_state(sk, TCP_SYN_RECV);</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;rx_opt.saw_tstamp) {</div><div class='hunk'>@@ -5928,8 +6832,8 @@ discard:</div><div class='ctx'> 			tp-&gt;tcp_header_len = sizeof(struct tcphdr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tp-&gt;rcv_nxt = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='del'>-		tp-&gt;copied_seq = tp-&gt;rcv_nxt;</div><div class='add'>+		WRITE_ONCE(tp-&gt;rcv_nxt, TCP_SKB_CB(skb)-&gt;seq + 1);</div><div class='add'>+		WRITE_ONCE(tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='ctx'> 		tp-&gt;rcv_wup = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='ctx'> </div><div class='ctx'> 		/* RFC1323: The window in SYN &amp; SYN/ACK segments is</div><div class='hunk'>@@ -5939,7 +6843,7 @@ discard:</div><div class='ctx'> 		tp-&gt;snd_wl1    = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 		tp-&gt;max_window = tp-&gt;snd_wnd;</div><div class='ctx'> </div><div class='del'>-		tcp_ecn_rcv_syn(tp, th);</div><div class='add'>+		tcp_ecn_rcv_syn(tp, th, skb);</div><div class='ctx'> </div><div class='ctx'> 		tcp_mtup_init(sk);</div><div class='ctx'> 		tcp_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='hunk'>@@ -5960,7 +6864,7 @@ discard:</div><div class='ctx'> 		 */</div><div class='ctx'> 		return -1;</div><div class='ctx'> #else</div><div class='del'>-		goto discard;</div><div class='add'>+		goto consume;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	/* "fifth, if neither of the SYN or RST bits is set then</div><div class='hunk'>@@ -5970,12 +6874,55 @@ discard:</div><div class='ctx'> discard_and_undo:</div><div class='ctx'> 	tcp_clear_options(&amp;tp-&gt;rx_opt);</div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = saved_clamp;</div><div class='del'>-	goto discard;</div><div class='add'>+	tcp_drop_reason(sk, skb, reason);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> reset_and_undo:</div><div class='ctx'> 	tcp_clear_options(&amp;tp-&gt;rx_opt);</div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = saved_clamp;</div><div class='del'>-	return 1;</div><div class='add'>+	/* we can reuse/return @reason to its caller to handle the exception */</div><div class='add'>+	return reason;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_rcv_synrecv_state_fastopen(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+</div><div class='add'>+	/* If we are still handling the SYNACK RTO, see if timestamp ECR allows</div><div class='add'>+	 * undo. If peer SACKs triggered fast recovery, we can't undo here.</div><div class='add'>+	 */</div><div class='add'>+	if (inet_csk(sk)-&gt;icsk_ca_state == TCP_CA_Loss &amp;&amp; !tp-&gt;packets_out)</div><div class='add'>+		tcp_try_undo_recovery(sk);</div><div class='add'>+</div><div class='add'>+	tcp_update_rto_time(tp);</div><div class='add'>+	WRITE_ONCE(inet_csk(sk)-&gt;icsk_retransmits, 0);</div><div class='add'>+	/* In tcp_fastopen_synack_timer() on the first SYNACK RTO we set</div><div class='add'>+	 * retrans_stamp but don't enter CA_Loss, so in case that happened we</div><div class='add'>+	 * need to zero retrans_stamp here to prevent spurious</div><div class='add'>+	 * retransmits_timed_out(). However, if the ACK of our SYNACK caused us</div><div class='add'>+	 * to enter CA_Recovery then we need to leave retrans_stamp as it was</div><div class='add'>+	 * set entering CA_Recovery, for correct retransmits_timed_out() and</div><div class='add'>+	 * undo behavior.</div><div class='add'>+	 */</div><div class='add'>+	tcp_retrans_stamp_cleanup(sk);</div><div class='add'>+</div><div class='add'>+	/* Once we leave TCP_SYN_RECV or TCP_FIN_WAIT_1,</div><div class='add'>+	 * we no longer need req so release it.</div><div class='add'>+	 */</div><div class='add'>+	req = rcu_dereference_protected(tp-&gt;fastopen_rsk,</div><div class='add'>+					lockdep_sock_is_held(sk));</div><div class='add'>+	reqsk_fastopen_remove(sk, req, false);</div><div class='add'>+</div><div class='add'>+	/* Re-arm the timer because data may have been sent out.</div><div class='add'>+	 * This is similar to the regular data transmission case</div><div class='add'>+	 * when new data has just been ack'ed.</div><div class='add'>+	 *</div><div class='add'>+	 * (TFO) - we could try to be more aggressive and</div><div class='add'>+	 * retransmitting any data sooner based on when they</div><div class='add'>+	 * are sent out.</div><div class='add'>+	 */</div><div class='add'>+	tcp_rearm_rto(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5985,43 +6932,47 @@ reset_and_undo:</div><div class='ctx'>  *	address independent.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+enum skb_drop_reason</div><div class='add'>+tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> 	struct request_sock *req;</div><div class='ctx'> 	int queued = 0;</div><div class='del'>-	bool acceptable;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	switch (sk-&gt;sk_state) {</div><div class='ctx'> 	case TCP_CLOSE:</div><div class='add'>+		SKB_DR_SET(reason, TCP_CLOSE);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_LISTEN:</div><div class='ctx'> 		if (th-&gt;ack)</div><div class='del'>-			return 1;</div><div class='add'>+			return SKB_DROP_REASON_TCP_FLAGS;</div><div class='ctx'> </div><div class='del'>-		if (th-&gt;rst)</div><div class='add'>+		if (th-&gt;rst) {</div><div class='add'>+			SKB_DR_SET(reason, TCP_RESET);</div><div class='ctx'> 			goto discard;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		if (th-&gt;syn) {</div><div class='del'>-			if (th-&gt;fin)</div><div class='add'>+			if (th-&gt;fin) {</div><div class='add'>+				SKB_DR_SET(reason, TCP_FLAGS);</div><div class='ctx'> 				goto discard;</div><div class='add'>+			}</div><div class='ctx'> 			/* It is possible that we process SYN packets from backlog,</div><div class='ctx'> 			 * so we need to make sure to disable BH and RCU right there.</div><div class='ctx'> 			 */</div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			local_bh_disable();</div><div class='del'>-			acceptable = icsk-&gt;icsk_af_ops-&gt;conn_request(sk, skb) &gt;= 0;</div><div class='add'>+			icsk-&gt;icsk_af_ops-&gt;conn_request(sk, skb);</div><div class='ctx'> 			local_bh_enable();</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-			if (!acceptable)</div><div class='del'>-				return 1;</div><div class='ctx'> 			consume_skb(skb);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		SKB_DR_SET(reason, TCP_FLAGS);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_SYN_SENT:</div><div class='hunk'>@@ -6040,59 +6991,65 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='ctx'> 	tp-&gt;rx_opt.saw_tstamp = 0;</div><div class='del'>-	req = tp-&gt;fastopen_rsk;</div><div class='add'>+	req = rcu_dereference_protected(tp-&gt;fastopen_rsk,</div><div class='add'>+					lockdep_sock_is_held(sk));</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		bool req_stolen;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON_ONCE(sk-&gt;sk_state != TCP_SYN_RECV &amp;&amp;</div><div class='ctx'> 		    sk-&gt;sk_state != TCP_FIN_WAIT1);</div><div class='ctx'> </div><div class='del'>-		if (!tcp_check_req(sk, skb, req, true, &amp;req_stolen))</div><div class='add'>+		SKB_DR_SET(reason, TCP_FASTOPEN);</div><div class='add'>+		if (!tcp_check_req(sk, skb, req, true, &amp;req_stolen, &amp;reason))</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!th-&gt;ack &amp;&amp; !th-&gt;rst &amp;&amp; !th-&gt;syn)</div><div class='add'>+	if (!th-&gt;ack &amp;&amp; !th-&gt;rst &amp;&amp; !th-&gt;syn) {</div><div class='add'>+		SKB_DR_SET(reason, TCP_FLAGS);</div><div class='ctx'> 		goto discard;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	if (!tcp_validate_incoming(sk, skb, th, 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* step 5: check the ACK field */</div><div class='del'>-	acceptable = tcp_ack(sk, skb, FLAG_SLOWPATH |</div><div class='del'>-				      FLAG_UPDATE_TS_RECENT |</div><div class='del'>-				      FLAG_NO_CHALLENGE_ACK) &gt; 0;</div><div class='del'>-</div><div class='del'>-	if (!acceptable) {</div><div class='del'>-		if (sk-&gt;sk_state == TCP_SYN_RECV)</div><div class='del'>-			return 1;	/* send one RST */</div><div class='del'>-		tcp_send_challenge_ack(sk, skb);</div><div class='del'>-		goto discard;</div><div class='add'>+	reason = tcp_ack(sk, skb, FLAG_SLOWPATH |</div><div class='add'>+				  FLAG_UPDATE_TS_RECENT |</div><div class='add'>+				  FLAG_NO_CHALLENGE_ACK);</div><div class='add'>+</div><div class='add'>+	if ((int)reason &lt;= 0) {</div><div class='add'>+		if (sk-&gt;sk_state == TCP_SYN_RECV) {</div><div class='add'>+			/* send one RST */</div><div class='add'>+			if (!reason)</div><div class='add'>+				return SKB_DROP_REASON_TCP_OLD_ACK;</div><div class='add'>+			return -reason;</div><div class='add'>+		}</div><div class='add'>+		/* accept old ack during closing */</div><div class='add'>+		if ((int)reason &lt; 0) {</div><div class='add'>+			tcp_send_challenge_ack(sk, false);</div><div class='add'>+			reason = -reason;</div><div class='add'>+			goto discard;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	SKB_DR_SET(reason, NOT_SPECIFIED);</div><div class='ctx'> 	switch (sk-&gt;sk_state) {</div><div class='ctx'> 	case TCP_SYN_RECV:</div><div class='ctx'> 		tp-&gt;delivered++; /* SYN-ACK delivery isn't tracked in tcp_ack */</div><div class='ctx'> 		if (!tp-&gt;srtt_us)</div><div class='ctx'> 			tcp_synack_rtt_meas(sk, req);</div><div class='ctx'> </div><div class='del'>-		/* Once we leave TCP_SYN_RECV, we no longer need req</div><div class='del'>-		 * so release it.</div><div class='del'>-		 */</div><div class='add'>+		if (tp-&gt;rx_opt.tstamp_ok)</div><div class='add'>+			tp-&gt;advmss -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='add'>+</div><div class='ctx'> 		if (req) {</div><div class='del'>-			inet_csk(sk)-&gt;icsk_retransmits = 0;</div><div class='del'>-			reqsk_fastopen_remove(sk, req, false);</div><div class='del'>-			/* Re-arm the timer because data may have been sent out.</div><div class='del'>-			 * This is similar to the regular data transmission case</div><div class='del'>-			 * when new data has just been ack'ed.</div><div class='del'>-			 *</div><div class='del'>-			 * (TFO) - we could try to be more aggressive and</div><div class='del'>-			 * retransmitting any data sooner based on when they</div><div class='del'>-			 * are sent out.</div><div class='del'>-			 */</div><div class='del'>-			tcp_rearm_rto(sk);</div><div class='add'>+			tcp_rcv_synrecv_state_fastopen(sk);</div><div class='ctx'> 		} else {</div><div class='del'>-			tcp_init_transfer(sk, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB);</div><div class='del'>-			tp-&gt;copied_seq = tp-&gt;rcv_nxt;</div><div class='add'>+			tcp_try_undo_spurious_syn(sk);</div><div class='add'>+			tp-&gt;retrans_stamp = 0;</div><div class='add'>+			tcp_init_transfer(sk, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB,</div><div class='add'>+					  skb);</div><div class='add'>+			WRITE_ONCE(tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='ctx'> 		}</div><div class='add'>+		tcp_ao_established(sk);</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> 		tcp_set_state(sk, TCP_ESTABLISHED);</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='hunk'>@@ -6108,9 +7065,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		tp-&gt;snd_wnd = ntohs(th-&gt;window) &lt;&lt; tp-&gt;rx_opt.snd_wscale;</div><div class='ctx'> 		tcp_init_wl(tp, TCP_SKB_CB(skb)-&gt;seq);</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;rx_opt.tstamp_ok)</div><div class='del'>-			tp-&gt;advmss -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='del'>-</div><div class='ctx'> 		if (!inet_csk(sk)-&gt;icsk_ca_ops-&gt;cong_control)</div><div class='ctx'> 			tcp_update_pacing_rate(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -6118,27 +7072,25 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		tp-&gt;lsndtime = tcp_jiffies32;</div><div class='ctx'> </div><div class='ctx'> 		tcp_initialize_rcv_mss(sk);</div><div class='add'>+		if (tcp_ecn_mode_accecn(tp))</div><div class='add'>+			tcp_accecn_third_ack(sk, skb, tp-&gt;syn_ect_snt);</div><div class='ctx'> 		tcp_fast_path_on(tp);</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN)</div><div class='add'>+			tcp_shutdown(sk, SEND_SHUTDOWN);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TCP_FIN_WAIT1: {</div><div class='ctx'> 		int tmo;</div><div class='ctx'> </div><div class='del'>-		/* If we enter the TCP_FIN_WAIT1 state and we are a</div><div class='del'>-		 * Fast Open socket and this is the first acceptable</div><div class='del'>-		 * ACK we have received, this would have acknowledged</div><div class='del'>-		 * our SYNACK so stop the SYNACK timer.</div><div class='del'>-		 */</div><div class='del'>-		if (req) {</div><div class='del'>-			/* We no longer need the request sock. */</div><div class='del'>-			reqsk_fastopen_remove(sk, req, false);</div><div class='del'>-			tcp_rearm_rto(sk);</div><div class='del'>-		}</div><div class='add'>+		if (req)</div><div class='add'>+			tcp_rcv_synrecv_state_fastopen(sk);</div><div class='add'>+</div><div class='ctx'> 		if (tp-&gt;snd_una != tp-&gt;write_seq)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		tcp_set_state(sk, TCP_FIN_WAIT2);</div><div class='del'>-		sk-&gt;sk_shutdown |= SEND_SHUTDOWN;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_shutdown, sk-&gt;sk_shutdown | SEND_SHUTDOWN);</div><div class='ctx'> </div><div class='ctx'> 		sk_dst_confirm(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -6148,10 +7100,10 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;linger2 &lt; 0) {</div><div class='add'>+		if (READ_ONCE(tp-&gt;linger2) &lt; 0) {</div><div class='ctx'> 			tcp_done(sk);</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA);</div><div class='del'>-			return 1;</div><div class='add'>+			return SKB_DROP_REASON_TCP_ABORT_ON_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (TCP_SKB_CB(skb)-&gt;end_seq != TCP_SKB_CB(skb)-&gt;seq &amp;&amp;</div><div class='ctx'> 		    after(TCP_SKB_CB(skb)-&gt;end_seq - th-&gt;fin, tp-&gt;rcv_nxt)) {</div><div class='hunk'>@@ -6160,12 +7112,12 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 				tcp_fastopen_active_disable(sk);</div><div class='ctx'> 			tcp_done(sk);</div><div class='ctx'> 			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA);</div><div class='del'>-			return 1;</div><div class='add'>+			return SKB_DROP_REASON_TCP_ABORT_ON_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tmo = tcp_fin_time(sk);</div><div class='ctx'> 		if (tmo &gt; TCP_TIMEWAIT_LEN) {</div><div class='del'>-			inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN);</div><div class='add'>+			tcp_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN);</div><div class='ctx'> 		} else if (th-&gt;fin || sock_owned_by_user(sk)) {</div><div class='ctx'> 			/* Bad case. We could lose such FIN otherwise.</div><div class='ctx'> 			 * It is not a big problem, but it looks confusing</div><div class='hunk'>@@ -6173,10 +7125,10 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			 * if it spins in bh_lock_sock(), but it is really</div><div class='ctx'> 			 * marginal case.</div><div class='ctx'> 			 */</div><div class='del'>-			inet_csk_reset_keepalive_timer(sk, tmo);</div><div class='add'>+			tcp_reset_keepalive_timer(sk, tmo);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);</div><div class='del'>-			goto discard;</div><div class='add'>+			goto consume;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6184,7 +7136,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	case TCP_CLOSING:</div><div class='ctx'> 		if (tp-&gt;snd_una == tp-&gt;write_seq) {</div><div class='ctx'> 			tcp_time_wait(sk, TCP_TIME_WAIT, 0);</div><div class='del'>-			goto discard;</div><div class='add'>+			goto consume;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -6192,7 +7144,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		if (tp-&gt;snd_una == tp-&gt;write_seq) {</div><div class='ctx'> 			tcp_update_metrics(sk);</div><div class='ctx'> 			tcp_done(sk);</div><div class='del'>-			goto discard;</div><div class='add'>+			goto consume;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6205,9 +7157,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	case TCP_CLOSE_WAIT:</div><div class='ctx'> 	case TCP_CLOSING:</div><div class='ctx'> 	case TCP_LAST_ACK:</div><div class='del'>-		if (!before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;rcv_nxt))</div><div class='add'>+		if (!before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;rcv_nxt)) {</div><div class='add'>+			/* If a subflow has been reset, the packet should not</div><div class='add'>+			 * continue to be processed, drop the packet.</div><div class='add'>+			 */</div><div class='add'>+			if (sk_is_mptcp(sk) &amp;&amp; !mptcp_incoming_options(sk, skb))</div><div class='add'>+				goto discard;</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_FIN_WAIT1:</div><div class='ctx'> 	case TCP_FIN_WAIT2:</div><div class='ctx'> 		/* RFC 793 says to queue data in these states,</div><div class='hunk'>@@ -6218,11 +7176,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			if (TCP_SKB_CB(skb)-&gt;end_seq != TCP_SKB_CB(skb)-&gt;seq &amp;&amp;</div><div class='ctx'> 			    after(TCP_SKB_CB(skb)-&gt;end_seq - th-&gt;fin, tp-&gt;rcv_nxt)) {</div><div class='ctx'> 				NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA);</div><div class='del'>-				tcp_reset(sk);</div><div class='del'>-				return 1;</div><div class='add'>+				tcp_reset(sk, skb);</div><div class='add'>+				return SKB_DROP_REASON_TCP_ABORT_ON_DATA;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_ESTABLISHED:</div><div class='ctx'> 		tcp_data_queue(sk, skb);</div><div class='ctx'> 		queued = 1;</div><div class='hunk'>@@ -6237,11 +7195,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!queued) {</div><div class='ctx'> discard:</div><div class='del'>-		tcp_drop(sk, skb);</div><div class='add'>+		tcp_drop_reason(sk, skb, reason);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+consume:</div><div class='add'>+	__kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_rcv_state_process);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_rcv_state_process);</div><div class='ctx'> </div><div class='ctx'> static inline void pr_drop_req(struct request_sock *req, __u16 port, int family)</div><div class='ctx'> {</div><div class='hunk'>@@ -6268,6 +7230,11 @@ static inline void pr_drop_req(struct request_sock *req, __u16 port, int family)</div><div class='ctx'>  * congestion control: Linux DCTCP asserts ECT on all packets,</div><div class='ctx'>  * including SYN, which is most optimal solution; however,</div><div class='ctx'>  * others, such as FreeBSD do not.</div><div class='add'>+ *</div><div class='add'>+ * Exception: At least one of the reserved bits of the TCP header (th-&gt;res1) is</div><div class='add'>+ * set, indicating the use of a future TCP extension (such as AccECN). See</div><div class='add'>+ * RFC8311 §4.3 which updates RFC3168 to allow the development of such</div><div class='add'>+ * extensions.</div><div class='ctx'>  */</div><div class='ctx'> static void tcp_ecn_create_request(struct request_sock *req,</div><div class='ctx'> 				   const struct sk_buff *skb,</div><div class='hunk'>@@ -6280,14 +7247,24 @@ static void tcp_ecn_create_request(struct request_sock *req,</div><div class='ctx'> 	bool ect, ecn_ok;</div><div class='ctx'> 	u32 ecn_ok_dst;</div><div class='ctx'> </div><div class='add'>+	if (tcp_accecn_syn_requested(th) &amp;&amp;</div><div class='add'>+	    READ_ONCE(net-&gt;ipv4.sysctl_tcp_ecn) &gt;= 3) {</div><div class='add'>+		inet_rsk(req)-&gt;ecn_ok = 1;</div><div class='add'>+		tcp_rsk(req)-&gt;accecn_ok = 1;</div><div class='add'>+		tcp_rsk(req)-&gt;syn_ect_rcv = TCP_SKB_CB(skb)-&gt;ip_dsfield &amp;</div><div class='add'>+					    INET_ECN_MASK;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!th_ecn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ect = !INET_ECN_is_not_ect(TCP_SKB_CB(skb)-&gt;ip_dsfield);</div><div class='ctx'> 	ecn_ok_dst = dst_feature(dst, DST_FEATURE_ECN_MASK);</div><div class='del'>-	ecn_ok = net-&gt;ipv4.sysctl_tcp_ecn || ecn_ok_dst;</div><div class='add'>+	ecn_ok = READ_ONCE(net-&gt;ipv4.sysctl_tcp_ecn) || ecn_ok_dst;</div><div class='ctx'> </div><div class='del'>-	if ((!ect &amp;&amp; ecn_ok) || tcp_ca_needs_ecn(listen_sk) ||</div><div class='add'>+	if (((!ect || th-&gt;res1 || th-&gt;ae) &amp;&amp; ecn_ok) ||</div><div class='add'>+	    tcp_ca_needs_ecn(listen_sk) ||</div><div class='ctx'> 	    (ecn_ok_dst &amp; DST_FEATURE_ECN_CA) ||</div><div class='ctx'> 	    tcp_bpf_ca_needs_ecn((struct sock *)req))</div><div class='ctx'> 		inet_rsk(req)-&gt;ecn_ok = 1;</div><div class='hunk'>@@ -6300,11 +7277,16 @@ static void tcp_openreq_init(struct request_sock *req,</div><div class='ctx'> 	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;rsk_rcv_wnd = 0;		/* So that tcp_send_synack() knows! */</div><div class='del'>-	req-&gt;cookie_ts = 0;</div><div class='ctx'> 	tcp_rsk(req)-&gt;rcv_isn = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 	tcp_rsk(req)-&gt;rcv_nxt = TCP_SKB_CB(skb)-&gt;seq + 1;</div><div class='del'>-	tcp_rsk(req)-&gt;snt_synack = tcp_clock_us();</div><div class='add'>+	tcp_rsk(req)-&gt;snt_synack = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;snt_tsval_first = 0;</div><div class='ctx'> 	tcp_rsk(req)-&gt;last_oow_ack_time = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;accecn_ok = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;saw_accecn_opt = TCP_ACCECN_OPT_NOT_SEEN;</div><div class='add'>+	tcp_rsk(req)-&gt;accecn_fail_mode = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;syn_ect_rcv = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;syn_ect_snt = 0;</div><div class='ctx'> 	req-&gt;mss = rx_opt-&gt;mss_clamp;</div><div class='ctx'> 	req-&gt;ts_recent = rx_opt-&gt;saw_tstamp ? rx_opt-&gt;rcv_tsval : 0;</div><div class='ctx'> 	ireq-&gt;tstamp_ok = rx_opt-&gt;tstamp_ok;</div><div class='hunk'>@@ -6317,48 +7299,26 @@ static void tcp_openreq_init(struct request_sock *req,</div><div class='ctx'> 	ireq-&gt;ir_num = ntohs(tcp_hdr(skb)-&gt;dest);</div><div class='ctx'> 	ireq-&gt;ir_mark = inet_request_mark(sk, skb);</div><div class='ctx'> #if IS_ENABLED(CONFIG_SMC)</div><div class='del'>-	ireq-&gt;smc_ok = rx_opt-&gt;smc_ok;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,</div><div class='del'>-				      struct sock *sk_listener,</div><div class='del'>-				      bool attach_listener)</div><div class='del'>-{</div><div class='del'>-	struct request_sock *req = reqsk_alloc(ops, sk_listener,</div><div class='del'>-					       attach_listener);</div><div class='del'>-</div><div class='del'>-	if (req) {</div><div class='del'>-		struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-</div><div class='del'>-		ireq-&gt;ireq_opt = NULL;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		ireq-&gt;pktopts = NULL;</div><div class='add'>+	ireq-&gt;smc_ok = rx_opt-&gt;smc_ok &amp;&amp; !(tcp_sk(sk)-&gt;smc_hs_congested &amp;&amp;</div><div class='add'>+			tcp_sk(sk)-&gt;smc_hs_congested(sk));</div><div class='ctx'> #endif</div><div class='del'>-		atomic64_set(&amp;ireq-&gt;ir_cookie, 0);</div><div class='del'>-		ireq-&gt;ireq_state = TCP_NEW_SYN_RECV;</div><div class='del'>-		write_pnet(&amp;ireq-&gt;ireq_net, sock_net(sk_listener));</div><div class='del'>-		ireq-&gt;ireq_family = sk_listener-&gt;sk_family;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return req;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_reqsk_alloc);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return true if a syncookie should be sent</div><div class='ctx'>  */</div><div class='del'>-static bool tcp_syn_flood_action(const struct sock *sk,</div><div class='del'>-				 const struct sk_buff *skb,</div><div class='del'>-				 const char *proto)</div><div class='add'>+static bool tcp_syn_flood_action(struct sock *sk, const char *proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_sock_queue *queue = &amp;inet_csk(sk)-&gt;icsk_accept_queue;</div><div class='ctx'> 	const char *msg = "Dropping request";</div><div class='del'>-	bool want_cookie = false;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	bool want_cookie = false;</div><div class='add'>+	u8 syncookies;</div><div class='add'>+</div><div class='add'>+	syncookies = READ_ONCE(net-&gt;ipv4.sysctl_tcp_syncookies);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYN_COOKIES</div><div class='del'>-	if (net-&gt;ipv4.sysctl_tcp_syncookies) {</div><div class='add'>+	if (syncookies) {</div><div class='ctx'> 		msg = "Sending cookies";</div><div class='ctx'> 		want_cookie = true;</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPREQQFULLDOCOOKIES);</div><div class='hunk'>@@ -6366,11 +7326,18 @@ static bool tcp_syn_flood_action(const struct sock *sk,</div><div class='ctx'> #endif</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPREQQFULLDROP);</div><div class='ctx'> </div><div class='del'>-	if (!queue-&gt;synflood_warned &amp;&amp;</div><div class='del'>-	    net-&gt;ipv4.sysctl_tcp_syncookies != 2 &amp;&amp;</div><div class='del'>-	    xchg(&amp;queue-&gt;synflood_warned, 1) == 0)</div><div class='del'>-		net_info_ratelimited("%s: Possible SYN flooding on port %d. %s.  Check SNMP counters.\n",</div><div class='del'>-				     proto, ntohs(tcp_hdr(skb)-&gt;dest), msg);</div><div class='add'>+	if (syncookies != 2 &amp;&amp; !READ_ONCE(queue-&gt;synflood_warned)) {</div><div class='add'>+		WRITE_ONCE(queue-&gt;synflood_warned, 1);</div><div class='add'>+		if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; sk-&gt;sk_family == AF_INET6) {</div><div class='add'>+			net_info_ratelimited("%s: Possible SYN flooding on port [%pI6c]:%u. %s.\n",</div><div class='add'>+					proto, inet6_rcv_saddr(sk),</div><div class='add'>+					sk-&gt;sk_num, msg);</div><div class='add'>+		} else {</div><div class='add'>+			net_info_ratelimited("%s: Possible SYN flooding on port %pI4:%u. %s.\n",</div><div class='add'>+					proto, &amp;sk-&gt;sk_rcv_saddr,</div><div class='add'>+					sk-&gt;sk_num, msg);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return want_cookie;</div><div class='ctx'> }</div><div class='hunk'>@@ -6381,41 +7348,97 @@ static void tcp_reqsk_record_syn(const struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	if (tcp_sk(sk)-&gt;save_syn) {</div><div class='ctx'> 		u32 len = skb_network_header_len(skb) + tcp_hdrlen(skb);</div><div class='del'>-		u32 *copy;</div><div class='add'>+		struct saved_syn *saved_syn;</div><div class='add'>+		u32 mac_hdrlen;</div><div class='add'>+		void *base;</div><div class='add'>+</div><div class='add'>+		if (tcp_sk(sk)-&gt;save_syn == 2) {  /* Save full header. */</div><div class='add'>+			base = skb_mac_header(skb);</div><div class='add'>+			mac_hdrlen = skb_mac_header_len(skb);</div><div class='add'>+			len += mac_hdrlen;</div><div class='add'>+		} else {</div><div class='add'>+			base = skb_network_header(skb);</div><div class='add'>+			mac_hdrlen = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		copy = kmalloc(len + sizeof(u32), GFP_ATOMIC);</div><div class='del'>-		if (copy) {</div><div class='del'>-			copy[0] = len;</div><div class='del'>-			memcpy(&amp;copy[1], skb_network_header(skb), len);</div><div class='del'>-			req-&gt;saved_syn = copy;</div><div class='add'>+		saved_syn = kmalloc(struct_size(saved_syn, data, len),</div><div class='add'>+				    GFP_ATOMIC);</div><div class='add'>+		if (saved_syn) {</div><div class='add'>+			saved_syn-&gt;mac_hdrlen = mac_hdrlen;</div><div class='add'>+			saved_syn-&gt;network_hdrlen = skb_network_header_len(skb);</div><div class='add'>+			saved_syn-&gt;tcp_hdrlen = tcp_hdrlen(skb);</div><div class='add'>+			memcpy(saved_syn-&gt;data, base, len);</div><div class='add'>+			req-&gt;saved_syn = saved_syn;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* If a SYN cookie is required and supported, returns a clamped MSS value to be</div><div class='add'>+ * used for SYN cookie generation.</div><div class='add'>+ */</div><div class='add'>+u16 tcp_get_syncookie_mss(struct request_sock_ops *rsk_ops,</div><div class='add'>+			  const struct tcp_request_sock_ops *af_ops,</div><div class='add'>+			  struct sock *sk, struct tcphdr *th)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u16 mss;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_syncookies) != 2 &amp;&amp;</div><div class='add'>+	    !inet_csk_reqsk_queue_is_full(sk))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!tcp_syn_flood_action(sk, rsk_ops-&gt;slab_name))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sk_acceptq_is_full(sk)) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mss = tcp_parse_mss_option(th, READ_ONCE(tp-&gt;rx_opt.user_mss));</div><div class='add'>+	if (!mss)</div><div class='add'>+		mss = af_ops-&gt;mss_clamp;</div><div class='add'>+</div><div class='add'>+	return mss;</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_get_syncookie_mss);</div><div class='add'>+</div><div class='ctx'> int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> 		     const struct tcp_request_sock_ops *af_ops,</div><div class='ctx'> 		     struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_fastopen_cookie foc = { .len = -1 };</div><div class='del'>-	__u32 isn = TCP_SKB_CB(skb)-&gt;tcp_tw_isn;</div><div class='ctx'> 	struct tcp_options_received tmp_opt;</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct sock *fastopen_sk = NULL;</div><div class='ctx'> 	struct request_sock *req;</div><div class='ctx'> 	bool want_cookie = false;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct flowi fl;</div><div class='add'>+	u8 syncookies;</div><div class='add'>+	u32 isn;</div><div class='ctx'> </div><div class='del'>-	/* TW buckets are converted to open requests without</div><div class='del'>-	 * limitations, they conserve resources and peer is</div><div class='del'>-	 * evidently real one.</div><div class='del'>-	 */</div><div class='del'>-	if ((net-&gt;ipv4.sysctl_tcp_syncookies == 2 ||</div><div class='del'>-	     inet_csk_reqsk_queue_is_full(sk)) &amp;&amp; !isn) {</div><div class='del'>-		want_cookie = tcp_syn_flood_action(sk, skb, rsk_ops-&gt;slab_name);</div><div class='del'>-		if (!want_cookie)</div><div class='del'>-			goto drop;</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	const struct tcp_ao_hdr *aoh;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	isn = __this_cpu_read(tcp_tw_isn);</div><div class='add'>+	if (isn) {</div><div class='add'>+		/* TW buckets are converted to open requests without</div><div class='add'>+		 * limitations, they conserve resources and peer is</div><div class='add'>+		 * evidently real one.</div><div class='add'>+		 */</div><div class='add'>+		__this_cpu_write(tcp_tw_isn, 0);</div><div class='add'>+	} else {</div><div class='add'>+		syncookies = READ_ONCE(net-&gt;ipv4.sysctl_tcp_syncookies);</div><div class='add'>+</div><div class='add'>+		if (syncookies == 2 || inet_csk_reqsk_queue_is_full(sk)) {</div><div class='add'>+			want_cookie = tcp_syn_flood_action(sk,</div><div class='add'>+							   rsk_ops-&gt;slab_name);</div><div class='add'>+			if (!want_cookie)</div><div class='add'>+				goto drop;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk_acceptq_is_full(sk)) {</div><div class='hunk'>@@ -6427,12 +7450,17 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='add'>+	req-&gt;syncookie = want_cookie;</div><div class='ctx'> 	tcp_rsk(req)-&gt;af_specific = af_ops;</div><div class='ctx'> 	tcp_rsk(req)-&gt;ts_off = 0;</div><div class='add'>+	tcp_rsk(req)-&gt;req_usec_ts = false;</div><div class='add'>+#if IS_ENABLED(CONFIG_MPTCP)</div><div class='add'>+	tcp_rsk(req)-&gt;is_mptcp = 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	tcp_clear_options(&amp;tmp_opt);</div><div class='ctx'> 	tmp_opt.mss_clamp = af_ops-&gt;mss_clamp;</div><div class='del'>-	tmp_opt.user_mss  = tp-&gt;rx_opt.user_mss;</div><div class='add'>+	tmp_opt.user_mss  = READ_ONCE(tp-&gt;rx_opt.user_mss);</div><div class='ctx'> 	tcp_parse_options(sock_net(sk), skb, &amp;tmp_opt, 0,</div><div class='ctx'> 			  want_cookie ? NULL : &amp;foc);</div><div class='ctx'> </div><div class='hunk'>@@ -6444,28 +7472,26 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> </div><div class='ctx'> 	tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;</div><div class='ctx'> 	tcp_openreq_init(req, &amp;tmp_opt, skb, sk);</div><div class='del'>-	inet_rsk(req)-&gt;no_srccheck = inet_sk(sk)-&gt;transparent;</div><div class='add'>+	inet_rsk(req)-&gt;no_srccheck = inet_test_bit(TRANSPARENT, sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Note: tcp_v6_init_req() might override ir_iif for link locals */</div><div class='ctx'> 	inet_rsk(req)-&gt;ir_iif = inet_request_bound_dev_if(sk, skb);</div><div class='ctx'> </div><div class='del'>-	af_ops-&gt;init_req(req, sk, skb);</div><div class='del'>-</div><div class='del'>-	if (security_inet_conn_request(sk, skb, req))</div><div class='del'>-		goto drop_and_free;</div><div class='del'>-</div><div class='del'>-	if (tmp_opt.tstamp_ok)</div><div class='del'>-		tcp_rsk(req)-&gt;ts_off = af_ops-&gt;init_ts_off(net, skb);</div><div class='del'>-</div><div class='del'>-	dst = af_ops-&gt;route_req(sk, &amp;fl, req);</div><div class='add'>+	dst = af_ops-&gt;route_req(sk, skb, &amp;fl, req, isn);</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		goto drop_and_free;</div><div class='ctx'> </div><div class='add'>+	if (tmp_opt.tstamp_ok) {</div><div class='add'>+		tcp_rsk(req)-&gt;req_usec_ts = dst_tcp_usec_ts(dst);</div><div class='add'>+		tcp_rsk(req)-&gt;ts_off = af_ops-&gt;init_ts_off(net, skb);</div><div class='add'>+	}</div><div class='ctx'> 	if (!want_cookie &amp;&amp; !isn) {</div><div class='add'>+		int max_syn_backlog = READ_ONCE(net-&gt;ipv4.sysctl_max_syn_backlog);</div><div class='add'>+</div><div class='ctx'> 		/* Kill the following clause, if you dislike this way. */</div><div class='del'>-		if (!net-&gt;ipv4.sysctl_tcp_syncookies &amp;&amp;</div><div class='del'>-		    (net-&gt;ipv4.sysctl_max_syn_backlog - inet_csk_reqsk_queue_len(sk) &lt;</div><div class='del'>-		     (net-&gt;ipv4.sysctl_max_syn_backlog &gt;&gt; 2)) &amp;&amp;</div><div class='add'>+		if (!syncookies &amp;&amp;</div><div class='add'>+		    (max_syn_backlog - inet_csk_reqsk_queue_len(sk) &lt;</div><div class='add'>+		     (max_syn_backlog &gt;&gt; 2)) &amp;&amp;</div><div class='ctx'> 		    !tcp_peer_is_proven(req, dst)) {</div><div class='ctx'> 			/* Without syncookies last quarter of</div><div class='ctx'> 			 * backlog is filled with destinations,</div><div class='hunk'>@@ -6486,13 +7512,25 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> </div><div class='ctx'> 	if (want_cookie) {</div><div class='ctx'> 		isn = cookie_init_sequence(af_ops, sk, skb, &amp;req-&gt;mss);</div><div class='del'>-		req-&gt;cookie_ts = tmp_opt.tstamp_ok;</div><div class='ctx'> 		if (!tmp_opt.tstamp_ok)</div><div class='ctx'> 			inet_rsk(req)-&gt;ecn_ok = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &amp;aoh))</div><div class='add'>+		goto drop_and_release; /* Invalid TCP options */</div><div class='add'>+	if (aoh) {</div><div class='add'>+		tcp_rsk(req)-&gt;used_tcp_ao = true;</div><div class='add'>+		tcp_rsk(req)-&gt;ao_rcv_next = aoh-&gt;keyid;</div><div class='add'>+		tcp_rsk(req)-&gt;ao_keyid = aoh-&gt;rnext_keyid;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		tcp_rsk(req)-&gt;used_tcp_ao = false;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	tcp_rsk(req)-&gt;snt_isn = isn;</div><div class='ctx'> 	tcp_rsk(req)-&gt;txhash = net_tx_rndhash();</div><div class='add'>+	tcp_rsk(req)-&gt;syn_tos = TCP_SKB_CB(skb)-&gt;ip_dsfield;</div><div class='ctx'> 	tcp_openreq_init_rwin(req, sk, dst);</div><div class='ctx'> 	sk_rx_queue_set(req_to_sk(req), skb);</div><div class='ctx'> 	if (!want_cookie) {</div><div class='hunk'>@@ -6501,20 +7539,28 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fastopen_sk) {</div><div class='ctx'> 		af_ops-&gt;send_synack(fastopen_sk, dst, &amp;fl, req,</div><div class='del'>-				    &amp;foc, TCP_SYNACK_FASTOPEN);</div><div class='add'>+				    &amp;foc, TCP_SYNACK_FASTOPEN, skb);</div><div class='ctx'> 		/* Add the child socket directly into the accept queue */</div><div class='del'>-		inet_csk_reqsk_queue_add(sk, req, fastopen_sk);</div><div class='add'>+		if (!inet_csk_reqsk_queue_add(sk, req, fastopen_sk)) {</div><div class='add'>+			bh_unlock_sock(fastopen_sk);</div><div class='add'>+			sock_put(fastopen_sk);</div><div class='add'>+			goto drop_and_free;</div><div class='add'>+		}</div><div class='ctx'> 		sk-&gt;sk_data_ready(sk);</div><div class='ctx'> 		bh_unlock_sock(fastopen_sk);</div><div class='ctx'> 		sock_put(fastopen_sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tcp_rsk(req)-&gt;tfo_listener = false;</div><div class='del'>-		if (!want_cookie)</div><div class='del'>-			inet_csk_reqsk_queue_hash_add(sk, req,</div><div class='del'>-				tcp_timeout_init((struct sock *)req));</div><div class='add'>+		if (!want_cookie &amp;&amp;</div><div class='add'>+		    unlikely(!inet_csk_reqsk_queue_hash_add(sk, req))) {</div><div class='add'>+			reqsk_free(req);</div><div class='add'>+			dst_release(dst);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 		af_ops-&gt;send_synack(sk, dst, &amp;fl, req, &amp;foc,</div><div class='ctx'> 				    !want_cookie ? TCP_SYNACK_NORMAL :</div><div class='del'>-						   TCP_SYNACK_COOKIE);</div><div class='add'>+						   TCP_SYNACK_COOKIE,</div><div class='add'>+				    skb);</div><div class='ctx'> 		if (want_cookie) {</div><div class='ctx'> 			reqsk_free(req);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -6526,9 +7572,9 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,</div><div class='ctx'> drop_and_release:</div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> drop_and_free:</div><div class='del'>-	reqsk_free(req);</div><div class='add'>+	__reqsk_free(req);</div><div class='ctx'> drop:</div><div class='ctx'> 	tcp_listendrop(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_conn_request);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_conn_request);</div><div class='head'>diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c<br/>index cd426313a298..f8a9596e8f4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_ipv4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_ipv4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_ipv4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_ipv4.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -7,18 +8,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  *		IPv4 specific functions</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  *		code split from:</div><div class='ctx'>  *		linux/ipv4/tcp.c</div><div class='ctx'>  *		linux/ipv4/tcp_input.c</div><div class='ctx'>  *		linux/ipv4/tcp_output.c</div><div class='ctx'>  *</div><div class='ctx'>  *		See tcp.c for author information</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -58,22 +53,30 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sock_diag.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/inet_ecn.h&gt;</div><div class='ctx'> #include &lt;net/timewait_sock.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/rstreason.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='hunk'>@@ -81,19 +84,25 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='del'>-			       __be32 daddr, __be32 saddr, const struct tcphdr *th);</div><div class='add'>+static void tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='add'>+				__be32 daddr, __be32 saddr, const struct tcphdr *th);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct inet_hashinfo tcp_hashinfo;</div><div class='del'>-EXPORT_SYMBOL(tcp_hashinfo);</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct sock_bh_locked, ipv4_tcp_sk) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(tcp_exit_batch_mutex);</div><div class='ctx'> </div><div class='ctx'> static u32 tcp_v4_init_seq(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -110,10 +119,15 @@ static u32 tcp_v4_init_ts_off(const struct net *net, const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)</div><div class='ctx'> {</div><div class='add'>+	int reuse = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_tw_reuse);</div><div class='ctx'> 	const struct inet_timewait_sock *tw = inet_twsk(sktw);</div><div class='ctx'> 	const struct tcp_timewait_sock *tcptw = tcp_twsk(sktw);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	int reuse = sock_net(sk)-&gt;ipv4.sysctl_tcp_tw_reuse;</div><div class='add'>+	int ts_recent_stamp;</div><div class='add'>+	u32 reuse_thresh;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(tw-&gt;tw_substate) == TCP_FIN_WAIT2)</div><div class='add'>+		reuse = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (reuse == 2) {</div><div class='ctx'> 		/* Still does not detect *everything* that goes through</div><div class='hunk'>@@ -126,11 +140,9 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 		if (tw-&gt;tw_family == AF_INET6) {</div><div class='ctx'> 			if (ipv6_addr_loopback(&amp;tw-&gt;tw_v6_daddr) ||</div><div class='del'>-			    (ipv6_addr_v4mapped(&amp;tw-&gt;tw_v6_daddr) &amp;&amp;</div><div class='del'>-			     (tw-&gt;tw_v6_daddr.s6_addr[12] == 127)) ||</div><div class='add'>+			    ipv6_addr_v4mapped_loopback(&amp;tw-&gt;tw_v6_daddr) ||</div><div class='ctx'> 			    ipv6_addr_loopback(&amp;tw-&gt;tw_v6_rcv_saddr) ||</div><div class='del'>-			    (ipv6_addr_v4mapped(&amp;tw-&gt;tw_v6_rcv_saddr) &amp;&amp;</div><div class='del'>-			     (tw-&gt;tw_v6_rcv_saddr.s6_addr[12] == 127)))</div><div class='add'>+			    ipv6_addr_v4mapped_loopback(&amp;tw-&gt;tw_v6_rcv_saddr))</div><div class='ctx'> 				loopback = true;</div><div class='ctx'> 		} else</div><div class='ctx'> #endif</div><div class='hunk'>@@ -154,9 +166,17 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)</div><div class='ctx'> 	   If TW bucket has been already destroyed we fall back to VJ's scheme</div><div class='ctx'> 	   and use initial timestamp retrieved from peer table.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tcptw-&gt;tw_ts_recent_stamp &amp;&amp;</div><div class='del'>-	    (!twp || (reuse &amp;&amp; time_after32(ktime_get_seconds(),</div><div class='del'>-					    tcptw-&gt;tw_ts_recent_stamp)))) {</div><div class='add'>+	ts_recent_stamp = READ_ONCE(tcptw-&gt;tw_ts_recent_stamp);</div><div class='add'>+	reuse_thresh = READ_ONCE(tw-&gt;tw_entry_stamp) +</div><div class='add'>+		       READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_tw_reuse_delay);</div><div class='add'>+	if (ts_recent_stamp &amp;&amp;</div><div class='add'>+	    (!twp || (reuse &amp;&amp; time_after32(tcp_clock_ms(), reuse_thresh)))) {</div><div class='add'>+		/* inet_twsk_hashdance_schedule() sets sk_refcnt after putting twsk</div><div class='add'>+		 * and releasing the bucket lock.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(!refcount_inc_not_zero(&amp;sktw-&gt;sk_refcnt)))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='ctx'> 		/* In case of repair and re-using TIME-WAIT sockets we still</div><div class='ctx'> 		 * want to be sure that it is safe as above but honor the</div><div class='ctx'> 		 * sequence numbers and time stamps set as part of the repair</div><div class='hunk'>@@ -169,21 +189,23 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)</div><div class='ctx'> 		 * without appearing to create any others.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (likely(!tp-&gt;repair)) {</div><div class='del'>-			tp-&gt;write_seq = tcptw-&gt;tw_snd_nxt + 65535 + 2;</div><div class='del'>-			if (tp-&gt;write_seq == 0)</div><div class='del'>-				tp-&gt;write_seq = 1;</div><div class='del'>-			tp-&gt;rx_opt.ts_recent	   = tcptw-&gt;tw_ts_recent;</div><div class='del'>-			tp-&gt;rx_opt.ts_recent_stamp = tcptw-&gt;tw_ts_recent_stamp;</div><div class='add'>+			u32 seq = tcptw-&gt;tw_snd_nxt + 65535 + 2;</div><div class='add'>+</div><div class='add'>+			if (!seq)</div><div class='add'>+				seq = 1;</div><div class='add'>+			WRITE_ONCE(tp-&gt;write_seq, seq);</div><div class='add'>+			tp-&gt;rx_opt.ts_recent	   = READ_ONCE(tcptw-&gt;tw_ts_recent);</div><div class='add'>+			tp-&gt;rx_opt.ts_recent_stamp = ts_recent_stamp;</div><div class='ctx'> 		}</div><div class='del'>-		sock_hold(sktw);</div><div class='add'>+</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_twsk_unique);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_twsk_unique);</div><div class='ctx'> </div><div class='del'>-static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			      int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	/* This check is replicated from tcp_v4_connect() and intended to</div><div class='hunk'>@@ -195,22 +217,23 @@ static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	sock_owned_by_me(sk);</div><div class='ctx'> </div><div class='del'>-	return BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr);</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr, &amp;addr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This will initiate an outgoing connection. */</div><div class='del'>-int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int tcp_v4_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;</div><div class='add'>+	struct inet_timewait_death_row *tcp_death_row;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct ip_options_rcu *inet_opt;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	__be16 orig_sport, orig_dport;</div><div class='ctx'> 	__be32 daddr, nexthop;</div><div class='ctx'> 	struct flowi4 *fl4;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct ip_options_rcu *inet_opt;</div><div class='del'>-	struct inet_timewait_death_row *tcp_death_row = &amp;sock_net(sk)-&gt;ipv4.tcp_death_row;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; sizeof(struct sockaddr_in))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -231,13 +254,12 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	orig_dport = usin-&gt;sin_port;</div><div class='ctx'> 	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='ctx'> 	rt = ip_route_connect(fl4, nexthop, inet-&gt;inet_saddr,</div><div class='del'>-			      RT_CONN_FLAGS(sk), sk-&gt;sk_bound_dev_if,</div><div class='del'>-			      IPPROTO_TCP,</div><div class='del'>-			      orig_sport, orig_dport, sk);</div><div class='add'>+			      sk-&gt;sk_bound_dev_if, IPPROTO_TCP, orig_sport,</div><div class='add'>+			      orig_dport, sk);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='ctx'> 		err = PTR_ERR(rt);</div><div class='ctx'> 		if (err == -ENETUNREACH)</div><div class='del'>-			IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);</div><div class='add'>+			IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -249,24 +271,32 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	if (!inet_opt || !inet_opt-&gt;opt.srr)</div><div class='ctx'> 		daddr = fl4-&gt;daddr;</div><div class='ctx'> </div><div class='del'>-	if (!inet-&gt;inet_saddr)</div><div class='del'>-		inet-&gt;inet_saddr = fl4-&gt;saddr;</div><div class='del'>-	sk_rcv_saddr_set(sk, inet-&gt;inet_saddr);</div><div class='add'>+	tcp_death_row = &amp;sock_net(sk)-&gt;ipv4.tcp_death_row;</div><div class='add'>+</div><div class='add'>+	if (!inet-&gt;inet_saddr) {</div><div class='add'>+		err = inet_bhash2_update_saddr(sk,  &amp;fl4-&gt;saddr, AF_INET);</div><div class='add'>+		if (err) {</div><div class='add'>+			ip_rt_put(rt);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sk_rcv_saddr_set(sk, inet-&gt;inet_saddr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;rx_opt.ts_recent_stamp &amp;&amp; inet-&gt;inet_daddr != daddr) {</div><div class='ctx'> 		/* Reset inherited state */</div><div class='ctx'> 		tp-&gt;rx_opt.ts_recent	   = 0;</div><div class='ctx'> 		tp-&gt;rx_opt.ts_recent_stamp = 0;</div><div class='ctx'> 		if (likely(!tp-&gt;repair))</div><div class='del'>-			tp-&gt;write_seq	   = 0;</div><div class='add'>+			WRITE_ONCE(tp-&gt;write_seq, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inet-&gt;inet_dport = usin-&gt;sin_port;</div><div class='ctx'> 	sk_daddr_set(sk, daddr);</div><div class='ctx'> </div><div class='del'>-	inet_csk(sk)-&gt;icsk_ext_hdr_len = 0;</div><div class='add'>+	inet_csk(sk)-&gt;icsk_ext_hdr_len = psp_sk_overhead(sk);</div><div class='ctx'> 	if (inet_opt)</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ext_hdr_len = inet_opt-&gt;opt.optlen;</div><div class='add'>+		inet_csk(sk)-&gt;icsk_ext_hdr_len += inet_opt-&gt;opt.optlen;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = TCP_MSS_DEFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -289,6 +319,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 		rt = NULL;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='add'>+	tp-&gt;tcp_usec_ts = dst_tcp_usec_ts(&amp;rt-&gt;dst);</div><div class='ctx'> 	/* OK, now commit destination to socket.  */</div><div class='ctx'> 	sk-&gt;sk_gso_type = SKB_GSO_TCPV4;</div><div class='ctx'> 	sk_setup_caps(sk, &amp;rt-&gt;dst);</div><div class='hunk'>@@ -296,16 +327,17 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!tp-&gt;repair)) {</div><div class='ctx'> 		if (!tp-&gt;write_seq)</div><div class='del'>-			tp-&gt;write_seq = secure_tcp_seq(inet-&gt;inet_saddr,</div><div class='del'>-						       inet-&gt;inet_daddr,</div><div class='del'>-						       inet-&gt;inet_sport,</div><div class='del'>-						       usin-&gt;sin_port);</div><div class='del'>-		tp-&gt;tsoffset = secure_tcp_ts_off(sock_net(sk),</div><div class='del'>-						 inet-&gt;inet_saddr,</div><div class='del'>-						 inet-&gt;inet_daddr);</div><div class='add'>+			WRITE_ONCE(tp-&gt;write_seq,</div><div class='add'>+				   secure_tcp_seq(inet-&gt;inet_saddr,</div><div class='add'>+						  inet-&gt;inet_daddr,</div><div class='add'>+						  inet-&gt;inet_sport,</div><div class='add'>+						  usin-&gt;sin_port));</div><div class='add'>+		WRITE_ONCE(tp-&gt;tsoffset,</div><div class='add'>+			   secure_tcp_ts_off(net, inet-&gt;inet_saddr,</div><div class='add'>+					     inet-&gt;inet_daddr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inet-&gt;inet_id = tp-&gt;write_seq ^ jiffies;</div><div class='add'>+	atomic_set(&amp;inet-&gt;inet_id, get_random_u16());</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_fastopen_defer_connect(sk, &amp;err))</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -325,12 +357,13 @@ failure:</div><div class='ctx'> 	 * if necessary.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tcp_set_state(sk, TCP_CLOSE);</div><div class='add'>+	inet_bhash2_reset_saddr(sk);</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='ctx'> 	sk-&gt;sk_route_caps = 0;</div><div class='ctx'> 	inet-&gt;inet_dport = 0;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_connect);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_connect);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This routine reacts to ICMP_FRAG_NEEDED mtu indications as defined in RFC1191.</div><div class='hunk'>@@ -345,7 +378,7 @@ void tcp_v4_mtu_reduced(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE))</div><div class='ctx'> 		return;</div><div class='del'>-	mtu = tcp_sk(sk)-&gt;mtu_info;</div><div class='add'>+	mtu = READ_ONCE(tcp_sk(sk)-&gt;mtu_info);</div><div class='ctx'> 	dst = inet_csk_update_pmtu(sk, mtu);</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -354,7 +387,7 @@ void tcp_v4_mtu_reduced(struct sock *sk)</div><div class='ctx'> 	 * for the case, if this connection will not able to recover.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mtu &lt; dst_mtu(dst) &amp;&amp; ip_dont_fragment(sk, dst))</div><div class='del'>-		sk-&gt;sk_err_soft = EMSGSIZE;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, EMSGSIZE);</div><div class='ctx'> </div><div class='ctx'> 	mtu = dst_mtu(dst);</div><div class='ctx'> </div><div class='hunk'>@@ -371,7 +404,7 @@ void tcp_v4_mtu_reduced(struct sock *sk)</div><div class='ctx'> 		tcp_simple_retransmit(sk);</div><div class='ctx'> 	} /* else let the usual retransmit timer handle it */</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_mtu_reduced);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_mtu_reduced);</div><div class='ctx'> </div><div class='ctx'> static void do_redirect(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -405,7 +438,46 @@ void tcp_req_err(struct sock *sk, u32 seq, bool abort)</div><div class='ctx'> 	}</div><div class='ctx'> 	reqsk_put(req);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_req_err);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_req_err);</div><div class='add'>+</div><div class='add'>+/* TCP-LD (RFC 6069) logic */</div><div class='add'>+void tcp_ld_RTO_revert(struct sock *sk, u32 seq)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	s32 remaining;</div><div class='add'>+	u32 delta_us;</div><div class='add'>+</div><div class='add'>+	if (sock_owned_by_user(sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (seq != tp-&gt;snd_una  || !icsk-&gt;icsk_retransmits ||</div><div class='add'>+	    !icsk-&gt;icsk_backoff)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = tcp_rtx_queue_head(sk);</div><div class='add'>+	if (WARN_ON_ONCE(!skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	icsk-&gt;icsk_backoff--;</div><div class='add'>+	icsk-&gt;icsk_rto = tp-&gt;srtt_us ? __tcp_set_rto(tp) : TCP_TIMEOUT_INIT;</div><div class='add'>+	icsk-&gt;icsk_rto = inet_csk_rto_backoff(icsk, tcp_rto_max(sk));</div><div class='add'>+</div><div class='add'>+	tcp_mstamp_refresh(tp);</div><div class='add'>+	delta_us = (u32)(tp-&gt;tcp_mstamp - tcp_skb_timestamp_us(skb));</div><div class='add'>+	remaining = icsk-&gt;icsk_rto - usecs_to_jiffies(delta_us);</div><div class='add'>+</div><div class='add'>+	if (remaining &gt; 0) {</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, remaining, false);</div><div class='add'>+	} else {</div><div class='add'>+		/* RTO revert clocked out retransmission.</div><div class='add'>+		 * Will retransmit now.</div><div class='add'>+		 */</div><div class='add'>+		tcp_retransmit_timer(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_ld_RTO_revert);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This routine is called by the ICMP module when it gets some</div><div class='hunk'>@@ -423,43 +495,45 @@ EXPORT_SYMBOL(tcp_req_err);</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='add'>+int tcp_v4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = (const struct iphdr *)icmp_skb-&gt;data;</div><div class='del'>-	struct tcphdr *th = (struct tcphdr *)(icmp_skb-&gt;data + (iph-&gt;ihl &lt;&lt; 2));</div><div class='del'>-	struct inet_connection_sock *icsk;</div><div class='del'>-	struct tcp_sock *tp;</div><div class='del'>-	struct inet_sock *inet;</div><div class='del'>-	const int type = icmp_hdr(icmp_skb)-&gt;type;</div><div class='del'>-	const int code = icmp_hdr(icmp_skb)-&gt;code;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='add'>+	struct tcphdr *th = (struct tcphdr *)(skb-&gt;data + (iph-&gt;ihl &lt;&lt; 2));</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	const int type = icmp_hdr(skb)-&gt;type;</div><div class='add'>+	const int code = icmp_hdr(skb)-&gt;code;</div><div class='ctx'> 	struct request_sock *fastopen;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='ctx'> 	u32 seq, snd_una;</div><div class='del'>-	s32 remaining;</div><div class='del'>-	u32 delta_us;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct net *net = dev_net(icmp_skb-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	sk = __inet_lookup_established(net, &amp;tcp_hashinfo, iph-&gt;daddr,</div><div class='del'>-				       th-&gt;dest, iph-&gt;saddr, ntohs(th-&gt;source),</div><div class='del'>-				       inet_iif(icmp_skb), 0);</div><div class='add'>+	sk = __inet_lookup_established(net, iph-&gt;daddr, th-&gt;dest, iph-&gt;saddr,</div><div class='add'>+				       ntohs(th-&gt;source), inet_iif(skb), 0);</div><div class='ctx'> 	if (!sk) {</div><div class='ctx'> 		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+		/* To increase the counter of ignored icmps for TCP-AO */</div><div class='add'>+		tcp_ao_ignore_icmp(sk, AF_INET, type, code);</div><div class='ctx'> 		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	seq = ntohl(th-&gt;seq);</div><div class='del'>-	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='del'>-		return tcp_req_err(sk, seq,</div><div class='del'>-				  type == ICMP_PARAMETERPROB ||</div><div class='del'>-				  type == ICMP_TIME_EXCEEDED ||</div><div class='del'>-				  (type == ICMP_DEST_UNREACH &amp;&amp;</div><div class='del'>-				   (code == ICMP_NET_UNREACH ||</div><div class='del'>-				    code == ICMP_HOST_UNREACH)));</div><div class='add'>+	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV) {</div><div class='add'>+		tcp_req_err(sk, seq, type == ICMP_PARAMETERPROB ||</div><div class='add'>+				     type == ICMP_TIME_EXCEEDED ||</div><div class='add'>+				     (type == ICMP_DEST_UNREACH &amp;&amp;</div><div class='add'>+				      (code == ICMP_NET_UNREACH ||</div><div class='add'>+				       code == ICMP_HOST_UNREACH)));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_ignore_icmp(sk, AF_INET, type, code)) {</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	/* If too many ICMPs get dropped on busy</div><div class='hunk'>@@ -474,15 +548,17 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(iph-&gt;ttl &lt; inet_sk(sk)-&gt;min_ttl)) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='del'>-		goto out;</div><div class='add'>+	if (static_branch_unlikely(&amp;ip4_min_ttl)) {</div><div class='add'>+		/* min_ttl can be changed concurrently from do_ip_setsockopt() */</div><div class='add'>+		if (unlikely(iph-&gt;ttl &lt; READ_ONCE(inet_sk(sk)-&gt;min_ttl))) {</div><div class='add'>+			__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	icsk = inet_csk(sk);</div><div class='ctx'> 	tp = tcp_sk(sk);</div><div class='ctx'> 	/* XXX (TFO) - tp-&gt;snd_una should be ISN (tcp_create_openreq_child() */</div><div class='del'>-	fastopen = tp-&gt;fastopen_rsk;</div><div class='add'>+	fastopen = rcu_dereference(tp-&gt;fastopen_rsk);</div><div class='ctx'> 	snd_una = fastopen ? tcp_rsk(fastopen)-&gt;snt_isn : tp-&gt;snd_una;</div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_LISTEN &amp;&amp;</div><div class='ctx'> 	    !between(seq, snd_una, tp-&gt;snd_nxt)) {</div><div class='hunk'>@@ -493,7 +569,7 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ICMP_REDIRECT:</div><div class='ctx'> 		if (!sock_owned_by_user(sk))</div><div class='del'>-			do_redirect(icmp_skb, sk);</div><div class='add'>+			do_redirect(skb, sk);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	case ICMP_SOURCE_QUENCH:</div><div class='ctx'> 		/* Just silently ignore these. */</div><div class='hunk'>@@ -513,7 +589,7 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 			if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='del'>-			tp-&gt;mtu_info = info;</div><div class='add'>+			WRITE_ONCE(tp-&gt;mtu_info, info);</div><div class='ctx'> 			if (!sock_owned_by_user(sk)) {</div><div class='ctx'> 				tcp_v4_mtu_reduced(sk);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -524,39 +600,12 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = icmp_err_convert[code].errno;</div><div class='del'>-		/* check if icmp_skb allows revert of backoff</div><div class='del'>-		 * (see draft-zimmermann-tcp-lcd) */</div><div class='del'>-		if (code != ICMP_NET_UNREACH &amp;&amp; code != ICMP_HOST_UNREACH)</div><div class='del'>-			break;</div><div class='del'>-		if (seq != tp-&gt;snd_una  || !icsk-&gt;icsk_retransmits ||</div><div class='del'>-		    !icsk-&gt;icsk_backoff || fastopen)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (sock_owned_by_user(sk))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		icsk-&gt;icsk_backoff--;</div><div class='del'>-		icsk-&gt;icsk_rto = tp-&gt;srtt_us ? __tcp_set_rto(tp) :</div><div class='del'>-					       TCP_TIMEOUT_INIT;</div><div class='del'>-		icsk-&gt;icsk_rto = inet_csk_rto_backoff(icsk, TCP_RTO_MAX);</div><div class='del'>-</div><div class='del'>-		skb = tcp_rtx_queue_head(sk);</div><div class='del'>-		BUG_ON(!skb);</div><div class='del'>-</div><div class='del'>-		tcp_mstamp_refresh(tp);</div><div class='del'>-		delta_us = (u32)(tp-&gt;tcp_mstamp - skb-&gt;skb_mstamp);</div><div class='del'>-		remaining = icsk-&gt;icsk_rto -</div><div class='del'>-			    usecs_to_jiffies(delta_us);</div><div class='del'>-</div><div class='del'>-		if (remaining &gt; 0) {</div><div class='del'>-			inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-						  remaining, TCP_RTO_MAX);</div><div class='del'>-		} else {</div><div class='del'>-			/* RTO revert clocked out retransmission.</div><div class='del'>-			 * Will retransmit now */</div><div class='del'>-			tcp_retransmit_timer(sk);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		/* check if this ICMP message allows revert of backoff.</div><div class='add'>+		 * (see RFC 6069)</div><div class='add'>+		 */</div><div class='add'>+		if (!fastopen &amp;&amp;</div><div class='add'>+		    (code == ICMP_NET_UNREACH || code == ICMP_HOST_UNREACH))</div><div class='add'>+			tcp_ld_RTO_revert(sk, seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICMP_TIME_EXCEEDED:</div><div class='ctx'> 		err = EHOSTUNREACH;</div><div class='hunk'>@@ -569,20 +618,17 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 	case TCP_SYN_SENT:</div><div class='ctx'> 	case TCP_SYN_RECV:</div><div class='ctx'> 		/* Only in fast or simultaneous open. If a fast open socket is</div><div class='del'>-		 * is already accepted it is treated as a connected one below.</div><div class='add'>+		 * already accepted it is treated as a connected one below.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (fastopen &amp;&amp; !fastopen-&gt;sk)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!sock_owned_by_user(sk)) {</div><div class='del'>-			sk-&gt;sk_err = err;</div><div class='del'>-</div><div class='del'>-			sk-&gt;sk_error_report(sk);</div><div class='add'>+		ip_icmp_error(sk, skb, err, th-&gt;dest, info, (u8 *)th);</div><div class='ctx'> </div><div class='del'>-			tcp_done(sk);</div><div class='del'>-		} else {</div><div class='del'>-			sk-&gt;sk_err_soft = err;</div><div class='del'>-		}</div><div class='add'>+		if (!sock_owned_by_user(sk))</div><div class='add'>+			tcp_done_with_error(sk, err);</div><div class='add'>+		else</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_err_soft, err);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -602,17 +648,18 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)</div><div class='ctx'> 	 *							--ANK (980905)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	inet = inet_sk(sk);</div><div class='del'>-	if (!sock_owned_by_user(sk) &amp;&amp; inet-&gt;recverr) {</div><div class='del'>-		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+	if (!sock_owned_by_user(sk) &amp;&amp;</div><div class='add'>+	    inet_test_bit(RECVERR, sk)) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, err);</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> 	} else	{ /* Only an error on timeout */</div><div class='del'>-		sk-&gt;sk_err_soft = err;</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __tcp_v4_send_check(struct sk_buff *skb, __be32 saddr, __be32 daddr)</div><div class='hunk'>@@ -631,7 +678,53 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	__tcp_v4_send_check(skb, inet-&gt;inet_saddr, inet-&gt;inet_daddr);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_send_check);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_send_check);</div><div class='add'>+</div><div class='add'>+#define REPLY_OPTIONS_LEN      (MAX_TCP_OPTION_SPACE / sizeof(__be32))</div><div class='add'>+</div><div class='add'>+static bool tcp_v4_ao_sign_reset(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				 const struct tcp_ao_hdr *aoh,</div><div class='add'>+				 struct ip_reply_arg *arg, struct tcphdr *reply,</div><div class='add'>+				 __be32 reply_options[REPLY_OPTIONS_LEN])</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	int sdif = tcp_v4_sdif(skb);</div><div class='add'>+	int dif = inet_iif(skb);</div><div class='add'>+	int l3index = sdif ? dif : 0;</div><div class='add'>+	bool allocated_traffic_key;</div><div class='add'>+	struct tcp_ao_key *key;</div><div class='add'>+	char *traffic_key;</div><div class='add'>+	bool drop = true;</div><div class='add'>+	u32 ao_sne = 0;</div><div class='add'>+	u8 keyid;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (tcp_ao_prepare_reset(sk, skb, aoh, l3index, ntohl(reply-&gt;seq),</div><div class='add'>+				 &amp;key, &amp;traffic_key, &amp;allocated_traffic_key,</div><div class='add'>+				 &amp;keyid, &amp;ao_sne))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reply_options[0] = htonl((TCPOPT_AO &lt;&lt; 24) | (tcp_ao_len(key) &lt;&lt; 16) |</div><div class='add'>+				 (aoh-&gt;rnext_keyid &lt;&lt; 8) | keyid);</div><div class='add'>+	arg-&gt;iov[0].iov_len += tcp_ao_len_aligned(key);</div><div class='add'>+	reply-&gt;doff = arg-&gt;iov[0].iov_len / 4;</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_hash_hdr(AF_INET, (char *)&amp;reply_options[1],</div><div class='add'>+			    key, traffic_key,</div><div class='add'>+			    (union tcp_ao_addr *)&amp;ip_hdr(skb)-&gt;saddr,</div><div class='add'>+			    (union tcp_ao_addr *)&amp;ip_hdr(skb)-&gt;daddr,</div><div class='add'>+			    reply, ao_sne))</div><div class='add'>+		goto out;</div><div class='add'>+	drop = false;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (allocated_traffic_key)</div><div class='add'>+		kfree(traffic_key);</div><div class='add'>+	return drop;</div><div class='add'>+#else</div><div class='add'>+	return true;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	This routine will send an RST to the other tcp.</div><div class='hunk'>@@ -646,25 +739,26 @@ EXPORT_SYMBOL(tcp_v4_send_check);</div><div class='ctx'>  *	Exception: precedence violation. We do not implement it in any case.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			      enum sk_rst_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct tcphdr th;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-		__be32 opt[(TCPOLEN_MD5SIG_ALIGNED &gt;&gt; 2)];</div><div class='del'>-#endif</div><div class='add'>+		__be32 opt[REPLY_OPTIONS_LEN];</div><div class='ctx'> 	} rep;</div><div class='add'>+	const __u8 *md5_hash_location = NULL;</div><div class='add'>+	const struct tcp_ao_hdr *aoh;</div><div class='ctx'> 	struct ip_reply_arg arg;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	struct tcp_md5sig_key *key = NULL;</div><div class='del'>-	const __u8 *hash_location = NULL;</div><div class='ctx'> 	unsigned char newhash[16];</div><div class='del'>-	int genhash;</div><div class='ctx'> 	struct sock *sk1 = NULL;</div><div class='ctx'> #endif</div><div class='del'>-	struct net *net;</div><div class='add'>+	u64 transmit_time = 0;</div><div class='ctx'> 	struct sock *ctl_sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	u32 txhash = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Never send a reset in response to a reset. */</div><div class='ctx'> 	if (th-&gt;rst)</div><div class='hunk'>@@ -695,14 +789,33 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	arg.iov[0].iov_base = (unsigned char *)&amp;rep;</div><div class='ctx'> 	arg.iov[0].iov_len  = sizeof(rep.th);</div><div class='ctx'> </div><div class='del'>-	net = sk ? sock_net(sk) : dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+	net = sk ? sock_net(sk) : skb_dst_dev_net_rcu(skb);</div><div class='add'>+</div><div class='add'>+	/* Invalid TCP option size or twice included auth */</div><div class='add'>+	if (tcp_parse_auth_options(tcp_hdr(skb), &amp;md5_hash_location, &amp;aoh))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (aoh &amp;&amp; tcp_v4_ao_sign_reset(sk, skb, aoh, &amp;arg, &amp;rep.th, rep.opt))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hash_location = tcp_parse_md5sig_option(th);</div><div class='ctx'> 	if (sk &amp;&amp; sk_fullsock(sk)) {</div><div class='del'>-		key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)</div><div class='del'>-					&amp;ip_hdr(skb)-&gt;saddr, AF_INET);</div><div class='del'>-	} else if (hash_location) {</div><div class='add'>+		const union tcp_md5_addr *addr;</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		/* sdif set, means packet ingressed via a device</div><div class='add'>+		 * in an L3 domain and inet_iif is set to it.</div><div class='add'>+		 */</div><div class='add'>+		l3index = tcp_v4_sdif(skb) ? inet_iif(skb) : 0;</div><div class='add'>+		addr = (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		key = tcp_md5_do_lookup(sk, l3index, addr, AF_INET);</div><div class='add'>+	} else if (md5_hash_location) {</div><div class='add'>+		const union tcp_md5_addr *addr;</div><div class='add'>+		int sdif = tcp_v4_sdif(skb);</div><div class='add'>+		int dif = inet_iif(skb);</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * active side is lost. Try to find listening socket through</div><div class='ctx'> 		 * source port, and then find md5 key through listening socket.</div><div class='hunk'>@@ -710,25 +823,25 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * Incoming packet is checked with md5 hash with finding key,</div><div class='ctx'> 		 * no RST generated if md5 hash doesn't match.</div><div class='ctx'> 		 */</div><div class='del'>-		sk1 = __inet_lookup_listener(net, &amp;tcp_hashinfo, NULL, 0,</div><div class='del'>-					     ip_hdr(skb)-&gt;saddr,</div><div class='add'>+		sk1 = __inet_lookup_listener(net, NULL, 0, ip_hdr(skb)-&gt;saddr,</div><div class='ctx'> 					     th-&gt;source, ip_hdr(skb)-&gt;daddr,</div><div class='del'>-					     ntohs(th-&gt;source), inet_iif(skb),</div><div class='del'>-					     tcp_v4_sdif(skb));</div><div class='add'>+					     ntohs(th-&gt;source), dif, sdif);</div><div class='ctx'> 		/* don't send rst if it can't find key */</div><div class='ctx'> 		if (!sk1)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		key = tcp_md5_do_lookup(sk1, (union tcp_md5_addr *)</div><div class='del'>-					&amp;ip_hdr(skb)-&gt;saddr, AF_INET);</div><div class='add'>+		/* sdif set, means packet ingressed via a device</div><div class='add'>+		 * in an L3 domain and dif is set to it.</div><div class='add'>+		 */</div><div class='add'>+		l3index = sdif ? dif : 0;</div><div class='add'>+		addr = (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		key = tcp_md5_do_lookup(sk1, l3index, addr, AF_INET);</div><div class='ctx'> 		if (!key)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		genhash = tcp_v4_md5_hash_skb(newhash, key, NULL, skb);</div><div class='del'>-		if (genhash || memcmp(hash_location, newhash, 16) != 0)</div><div class='add'>+		tcp_v4_md5_hash_skb(newhash, key, NULL, skb);</div><div class='add'>+		if (memcmp(md5_hash_location, newhash, 16) != 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (key) {</div><div class='hunk'>@@ -745,6 +858,17 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 				     ip_hdr(skb)-&gt;daddr, &amp;rep.th);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	/* Can't co-exist with TCPMD5, hence check rep.opt[0] */</div><div class='add'>+	if (rep.opt[0] == 0) {</div><div class='add'>+		__be32 mrst = mptcp_reset_option(skb);</div><div class='add'>+</div><div class='add'>+		if (mrst) {</div><div class='add'>+			rep.opt[0] = mrst;</div><div class='add'>+			arg.iov[0].iov_len += sizeof(mrst);</div><div class='add'>+			rep.th.doff = arg.iov[0].iov_len / 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	arg.csum = csum_tcpudp_nofold(ip_hdr(skb)-&gt;daddr,</div><div class='ctx'> 				      ip_hdr(skb)-&gt;saddr, /* XXX */</div><div class='ctx'> 				      arg.iov[0].iov_len, IPPROTO_TCP, 0);</div><div class='hunk'>@@ -755,30 +879,46 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 * routing might fail in this case. No choice here, if we choose to force</div><div class='ctx'> 	 * input interface, we will misroute in case of asymmetric route.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sk) {</div><div class='add'>+	if (sk)</div><div class='ctx'> 		arg.bound_dev_if = sk-&gt;sk_bound_dev_if;</div><div class='del'>-		if (sk_fullsock(sk))</div><div class='del'>-			trace_tcp_send_reset(sk, skb);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	trace_tcp_send_reset(sk, skb, reason);</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) !=</div><div class='ctx'> 		     offsetof(struct inet_timewait_sock, tw_bound_dev_if));</div><div class='ctx'> </div><div class='del'>-	arg.tos = ip_hdr(skb)-&gt;tos;</div><div class='add'>+	/* ECN bits of TW reset are cleared */</div><div class='add'>+	arg.tos = ip_hdr(skb)-&gt;tos &amp; ~INET_ECN_MASK;</div><div class='ctx'> 	arg.uid = sock_net_uid(net, sk &amp;&amp; sk_fullsock(sk) ? sk : NULL);</div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	ctl_sk = *this_cpu_ptr(net-&gt;ipv4.tcp_sk);</div><div class='del'>-	if (sk)</div><div class='add'>+	local_lock_nested_bh(&amp;ipv4_tcp_sk.bh_lock);</div><div class='add'>+	ctl_sk = this_cpu_read(ipv4_tcp_sk.sock);</div><div class='add'>+</div><div class='add'>+	sock_net_set(ctl_sk, net);</div><div class='add'>+	if (sk) {</div><div class='ctx'> 		ctl_sk-&gt;sk_mark = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='del'>-				   inet_twsk(sk)-&gt;tw_mark : sk-&gt;sk_mark;</div><div class='del'>-	ip_send_unicast_reply(ctl_sk,</div><div class='add'>+				   inet_twsk(sk)-&gt;tw_mark : READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+		ctl_sk-&gt;sk_priority = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='add'>+				   inet_twsk(sk)-&gt;tw_priority : READ_ONCE(sk-&gt;sk_priority);</div><div class='add'>+		transmit_time = tcp_transmit_time(sk);</div><div class='add'>+		xfrm_sk_clone_policy(ctl_sk, sk);</div><div class='add'>+		txhash = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='add'>+			 inet_twsk(sk)-&gt;tw_txhash : sk-&gt;sk_txhash;</div><div class='add'>+	} else {</div><div class='add'>+		ctl_sk-&gt;sk_mark = 0;</div><div class='add'>+		ctl_sk-&gt;sk_priority = 0;</div><div class='add'>+	}</div><div class='add'>+	ip_send_unicast_reply(ctl_sk, sk,</div><div class='ctx'> 			      skb, &amp;TCP_SKB_CB(skb)-&gt;header.h4.opt,</div><div class='ctx'> 			      ip_hdr(skb)-&gt;saddr, ip_hdr(skb)-&gt;daddr,</div><div class='del'>-			      &amp;arg, arg.iov[0].iov_len);</div><div class='add'>+			      &amp;arg, arg.iov[0].iov_len,</div><div class='add'>+			      transmit_time, txhash);</div><div class='ctx'> </div><div class='del'>-	ctl_sk-&gt;sk_mark = 0;</div><div class='add'>+	xfrm_sk_free_policy(ctl_sk);</div><div class='add'>+	sock_net_set(ctl_sk, &amp;init_net);</div><div class='ctx'> 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);</div><div class='ctx'> 	__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);</div><div class='add'>+	local_unlock_nested_bh(&amp;ipv4_tcp_sk.bh_lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='hunk'>@@ -794,21 +934,18 @@ out:</div><div class='ctx'> static void tcp_v4_send_ack(const struct sock *sk,</div><div class='ctx'> 			    struct sk_buff *skb, u32 seq, u32 ack,</div><div class='ctx'> 			    u32 win, u32 tsval, u32 tsecr, int oif,</div><div class='del'>-			    struct tcp_md5sig_key *key,</div><div class='del'>-			    int reply_flags, u8 tos)</div><div class='add'>+			    struct tcp_key *key,</div><div class='add'>+			    int reply_flags, u8 tos, u32 txhash)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct tcphdr th;</div><div class='del'>-		__be32 opt[(TCPOLEN_TSTAMP_ALIGNED &gt;&gt; 2)</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-			   + (TCPOLEN_MD5SIG_ALIGNED &gt;&gt; 2)</div><div class='del'>-#endif</div><div class='del'>-			];</div><div class='add'>+		__be32 opt[(MAX_TCP_OPTION_SPACE  &gt;&gt; 2)];</div><div class='ctx'> 	} rep;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ip_reply_arg arg;</div><div class='ctx'> 	struct sock *ctl_sk;</div><div class='add'>+	u64 transmit_time;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;rep.th, 0, sizeof(struct tcphdr));</div><div class='ctx'> 	memset(&amp;arg, 0, sizeof(arg));</div><div class='hunk'>@@ -834,7 +971,7 @@ static void tcp_v4_send_ack(const struct sock *sk,</div><div class='ctx'> 	rep.th.window  = htons(win);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (key) {</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='ctx'> 		int offset = (tsecr) ? 3 : 0;</div><div class='ctx'> </div><div class='ctx'> 		rep.opt[offset++] = htonl((TCPOPT_NOP &lt;&lt; 24) |</div><div class='hunk'>@@ -845,10 +982,28 @@ static void tcp_v4_send_ack(const struct sock *sk,</div><div class='ctx'> 		rep.th.doff = arg.iov[0].iov_len/4;</div><div class='ctx'> </div><div class='ctx'> 		tcp_v4_md5_hash_hdr((__u8 *) &amp;rep.opt[offset],</div><div class='del'>-				    key, ip_hdr(skb)-&gt;saddr,</div><div class='add'>+				    key-&gt;md5_key, ip_hdr(skb)-&gt;saddr,</div><div class='ctx'> 				    ip_hdr(skb)-&gt;daddr, &amp;rep.th);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (tcp_key_is_ao(key)) {</div><div class='add'>+		int offset = (tsecr) ? 3 : 0;</div><div class='add'>+</div><div class='add'>+		rep.opt[offset++] = htonl((TCPOPT_AO &lt;&lt; 24) |</div><div class='add'>+					  (tcp_ao_len(key-&gt;ao_key) &lt;&lt; 16) |</div><div class='add'>+					  (key-&gt;ao_key-&gt;sndid &lt;&lt; 8) |</div><div class='add'>+					  key-&gt;rcv_next);</div><div class='add'>+		arg.iov[0].iov_len += tcp_ao_len_aligned(key-&gt;ao_key);</div><div class='add'>+		rep.th.doff = arg.iov[0].iov_len / 4;</div><div class='add'>+</div><div class='add'>+		tcp_ao_hash_hdr(AF_INET, (char *)&amp;rep.opt[offset],</div><div class='add'>+				key-&gt;ao_key, key-&gt;traffic_key,</div><div class='add'>+				(union tcp_ao_addr *)&amp;ip_hdr(skb)-&gt;saddr,</div><div class='add'>+				(union tcp_ao_addr *)&amp;ip_hdr(skb)-&gt;daddr,</div><div class='add'>+				&amp;rep.th, key-&gt;sne);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	arg.flags = reply_flags;</div><div class='ctx'> 	arg.csum = csum_tcpudp_nofold(ip_hdr(skb)-&gt;daddr,</div><div class='ctx'> 				      ip_hdr(skb)-&gt;saddr, /* XXX */</div><div class='hunk'>@@ -859,35 +1014,86 @@ static void tcp_v4_send_ack(const struct sock *sk,</div><div class='ctx'> 	arg.tos = tos;</div><div class='ctx'> 	arg.uid = sock_net_uid(net, sk_fullsock(sk) ? sk : NULL);</div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	ctl_sk = *this_cpu_ptr(net-&gt;ipv4.tcp_sk);</div><div class='del'>-	if (sk)</div><div class='del'>-		ctl_sk-&gt;sk_mark = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='del'>-				   inet_twsk(sk)-&gt;tw_mark : sk-&gt;sk_mark;</div><div class='del'>-	ip_send_unicast_reply(ctl_sk,</div><div class='add'>+	local_lock_nested_bh(&amp;ipv4_tcp_sk.bh_lock);</div><div class='add'>+	ctl_sk = this_cpu_read(ipv4_tcp_sk.sock);</div><div class='add'>+	sock_net_set(ctl_sk, net);</div><div class='add'>+	ctl_sk-&gt;sk_mark = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='add'>+			   inet_twsk(sk)-&gt;tw_mark : READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+	ctl_sk-&gt;sk_priority = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='add'>+			   inet_twsk(sk)-&gt;tw_priority : READ_ONCE(sk-&gt;sk_priority);</div><div class='add'>+	transmit_time = tcp_transmit_time(sk);</div><div class='add'>+	ip_send_unicast_reply(ctl_sk, sk,</div><div class='ctx'> 			      skb, &amp;TCP_SKB_CB(skb)-&gt;header.h4.opt,</div><div class='ctx'> 			      ip_hdr(skb)-&gt;saddr, ip_hdr(skb)-&gt;daddr,</div><div class='del'>-			      &amp;arg, arg.iov[0].iov_len);</div><div class='add'>+			      &amp;arg, arg.iov[0].iov_len,</div><div class='add'>+			      transmit_time, txhash);</div><div class='ctx'> </div><div class='del'>-	ctl_sk-&gt;sk_mark = 0;</div><div class='add'>+	sock_net_set(ctl_sk, &amp;init_net);</div><div class='ctx'> 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);</div><div class='add'>+	local_unlock_nested_bh(&amp;ipv4_tcp_sk.bh_lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				enum tcp_tw_status tw_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_timewait_sock *tw = inet_twsk(sk);</div><div class='ctx'> 	struct tcp_timewait_sock *tcptw = tcp_twsk(sk);</div><div class='add'>+	struct tcp_key key = {};</div><div class='add'>+	u8 tos = tw-&gt;tw_tos;</div><div class='add'>+</div><div class='add'>+	/* Cleaning only ECN bits of TW ACKs of oow data or is paws_reject,</div><div class='add'>+	 * while not cleaning ECN bits of other TW ACKs to avoid these ACKs</div><div class='add'>+	 * being placed in a different service queues (Classic rather than L4S)</div><div class='add'>+	 */</div><div class='add'>+	if (tw_status == TCP_TW_ACK_OOW)</div><div class='add'>+		tos &amp;= ~INET_ECN_MASK;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_ao_needed.key)) {</div><div class='add'>+		/* FIXME: the segment to-be-acked is not verified yet */</div><div class='add'>+		ao_info = rcu_dereference(tcptw-&gt;ao_info);</div><div class='add'>+		if (ao_info) {</div><div class='add'>+			const struct tcp_ao_hdr *aoh;</div><div class='add'>+</div><div class='add'>+			if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &amp;aoh)) {</div><div class='add'>+				inet_twsk_put(tw);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (aoh)</div><div class='add'>+				key.ao_key = tcp_ao_established_key(sk, ao_info,</div><div class='add'>+								    aoh-&gt;rnext_keyid, -1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (key.ao_key) {</div><div class='add'>+		struct tcp_ao_key *rnext_key;</div><div class='add'>+</div><div class='add'>+		key.traffic_key = snd_other_key(key.ao_key);</div><div class='add'>+		key.sne = READ_ONCE(ao_info-&gt;snd_sne);</div><div class='add'>+		rnext_key = READ_ONCE(ao_info-&gt;rnext_key);</div><div class='add'>+		key.rcv_next = rnext_key-&gt;rcvid;</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+#else</div><div class='add'>+	if (0) {</div><div class='add'>+#endif</div><div class='add'>+	} else if (static_branch_tcp_md5()) {</div><div class='add'>+		key.md5_key = tcp_twsk_md5_key(tcptw);</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tcp_v4_send_ack(sk, skb,</div><div class='del'>-			tcptw-&gt;tw_snd_nxt, tcptw-&gt;tw_rcv_nxt,</div><div class='add'>+			tcptw-&gt;tw_snd_nxt, READ_ONCE(tcptw-&gt;tw_rcv_nxt),</div><div class='ctx'> 			tcptw-&gt;tw_rcv_wnd &gt;&gt; tw-&gt;tw_rcv_wscale,</div><div class='del'>-			tcp_time_stamp_raw() + tcptw-&gt;tw_ts_offset,</div><div class='del'>-			tcptw-&gt;tw_ts_recent,</div><div class='del'>-			tw-&gt;tw_bound_dev_if,</div><div class='del'>-			tcp_twsk_md5_key(tcptw),</div><div class='add'>+			tcp_tw_tsval(tcptw),</div><div class='add'>+			READ_ONCE(tcptw-&gt;tw_ts_recent),</div><div class='add'>+			tw-&gt;tw_bound_dev_if, &amp;key,</div><div class='ctx'> 			tw-&gt;tw_transparent ? IP_REPLY_ARG_NOSRCCHECK : 0,</div><div class='del'>-			tw-&gt;tw_tos</div><div class='del'>-			);</div><div class='add'>+			tos,</div><div class='add'>+			tw-&gt;tw_txhash);</div><div class='ctx'> </div><div class='ctx'> 	inet_twsk_put(tw);</div><div class='ctx'> }</div><div class='hunk'>@@ -895,27 +1101,79 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				  struct request_sock *req)</div><div class='ctx'> {</div><div class='add'>+	struct tcp_key key = {};</div><div class='add'>+</div><div class='ctx'> 	/* sk-&gt;sk_state == TCP_LISTEN -&gt; for regular TCP_SYN_RECV</div><div class='ctx'> 	 * sk-&gt;sk_state == TCP_SYN_RECV -&gt; for Fast Open.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 seq = (sk-&gt;sk_state == TCP_LISTEN) ? tcp_rsk(req)-&gt;snt_isn + 1 :</div><div class='ctx'> 					     tcp_sk(sk)-&gt;snd_nxt;</div><div class='ctx'> </div><div class='del'>-	/* RFC 7323 2.3</div><div class='del'>-	 * The window field (SEG.WND) of every outgoing segment, with the</div><div class='del'>-	 * exception of &lt;SYN&gt; segments, MUST be right-shifted by</div><div class='del'>-	 * Rcv.Wind.Shift bits:</div><div class='del'>-	 */</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_ao_needed.key) &amp;&amp;</div><div class='add'>+	    tcp_rsk_used_ao(req)) {</div><div class='add'>+		const union tcp_md5_addr *addr;</div><div class='add'>+		const struct tcp_ao_hdr *aoh;</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		/* Invalid TCP option size or twice included auth */</div><div class='add'>+		if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &amp;aoh))</div><div class='add'>+			return;</div><div class='add'>+		if (!aoh)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		addr = (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		l3index = tcp_v4_sdif(skb) ? inet_iif(skb) : 0;</div><div class='add'>+		key.ao_key = tcp_ao_do_lookup(sk, l3index, addr, AF_INET,</div><div class='add'>+					      aoh-&gt;rnext_keyid, -1);</div><div class='add'>+		if (unlikely(!key.ao_key)) {</div><div class='add'>+			/* Send ACK with any matching MKT for the peer */</div><div class='add'>+			key.ao_key = tcp_ao_do_lookup(sk, l3index, addr, AF_INET, -1, -1);</div><div class='add'>+			/* Matching key disappeared (user removed the key?)</div><div class='add'>+			 * let the handshake timeout.</div><div class='add'>+			 */</div><div class='add'>+			if (!key.ao_key) {</div><div class='add'>+				net_info_ratelimited("TCP-AO key for (%pI4, %d)-&gt;(%pI4, %d) suddenly disappeared, won't ACK new connection\n",</div><div class='add'>+						     addr,</div><div class='add'>+						     ntohs(tcp_hdr(skb)-&gt;source),</div><div class='add'>+						     &amp;ip_hdr(skb)-&gt;daddr,</div><div class='add'>+						     ntohs(tcp_hdr(skb)-&gt;dest));</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		key.traffic_key = kmalloc(tcp_ao_digest_size(key.ao_key), GFP_ATOMIC);</div><div class='add'>+		if (!key.traffic_key)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+		key.rcv_next = aoh-&gt;keyid;</div><div class='add'>+		tcp_v4_ao_calc_key_rsk(key.ao_key, key.traffic_key, req);</div><div class='add'>+#else</div><div class='add'>+	if (0) {</div><div class='add'>+#endif</div><div class='add'>+	} else if (static_branch_tcp_md5()) {</div><div class='add'>+		const union tcp_md5_addr *addr;</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		addr = (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr;</div><div class='add'>+		l3index = tcp_v4_sdif(skb) ? inet_iif(skb) : 0;</div><div class='add'>+		key.md5_key = tcp_md5_do_lookup(sk, l3index, addr, AF_INET);</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleaning ECN bits of TW ACKs of oow data or is paws_reject */</div><div class='ctx'> 	tcp_v4_send_ack(sk, skb, seq,</div><div class='ctx'> 			tcp_rsk(req)-&gt;rcv_nxt,</div><div class='del'>-			req-&gt;rsk_rcv_wnd &gt;&gt; inet_rsk(req)-&gt;rcv_wscale,</div><div class='del'>-			tcp_time_stamp_raw() + tcp_rsk(req)-&gt;ts_off,</div><div class='add'>+			tcp_synack_window(req) &gt;&gt; inet_rsk(req)-&gt;rcv_wscale,</div><div class='add'>+			tcp_rsk_tsval(tcp_rsk(req)),</div><div class='ctx'> 			req-&gt;ts_recent,</div><div class='del'>-			0,</div><div class='del'>-			tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&amp;ip_hdr(skb)-&gt;saddr,</div><div class='del'>-					  AF_INET),</div><div class='add'>+			0, &amp;key,</div><div class='ctx'> 			inet_rsk(req)-&gt;no_srccheck ? IP_REPLY_ARG_NOSRCCHECK : 0,</div><div class='del'>-			ip_hdr(skb)-&gt;tos);</div><div class='add'>+			ip_hdr(skb)-&gt;tos &amp; ~INET_ECN_MASK,</div><div class='add'>+			READ_ONCE(tcp_rsk(req)-&gt;txhash));</div><div class='add'>+	if (tcp_key_is_ao(&amp;key))</div><div class='add'>+		kfree(key.traffic_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -927,26 +1185,40 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> 			      struct flowi *fl,</div><div class='ctx'> 			      struct request_sock *req,</div><div class='ctx'> 			      struct tcp_fastopen_cookie *foc,</div><div class='del'>-			      enum tcp_synack_type synack_type)</div><div class='add'>+			      enum tcp_synack_type synack_type,</div><div class='add'>+			      struct sk_buff *syn_skb)</div><div class='ctx'> {</div><div class='del'>-	const struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	int err = -1;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u8 tos;</div><div class='ctx'> </div><div class='ctx'> 	/* First, grab a route. */</div><div class='ctx'> 	if (!dst &amp;&amp; (dst = inet_csk_route_req(sk, &amp;fl4, req)) == NULL)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	skb = tcp_make_synack(sk, dst, req, foc, synack_type);</div><div class='add'>+	skb = tcp_make_synack(sk, dst, req, foc, synack_type, syn_skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb) {</div><div class='add'>+		tcp_rsk(req)-&gt;syn_ect_snt = inet_sk(sk)-&gt;tos &amp; INET_ECN_MASK;</div><div class='ctx'> 		__tcp_v4_send_check(skb, ireq-&gt;ir_loc_addr, ireq-&gt;ir_rmt_addr);</div><div class='ctx'> </div><div class='add'>+		tos = READ_ONCE(inet_sk(sk)-&gt;tos);</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reflect_tos))</div><div class='add'>+			tos = (tcp_rsk(req)-&gt;syn_tos &amp; ~INET_ECN_MASK) |</div><div class='add'>+			      (tos &amp; INET_ECN_MASK);</div><div class='add'>+</div><div class='add'>+		if (!INET_ECN_is_capable(tos) &amp;&amp;</div><div class='add'>+		    tcp_bpf_ca_needs_ecn((struct sock *)req))</div><div class='add'>+			tos |= INET_ECN_ECT_0;</div><div class='add'>+</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		err = ip_build_and_send_pkt(skb, sk, ireq-&gt;ir_loc_addr,</div><div class='ctx'> 					    ireq-&gt;ir_rmt_addr,</div><div class='del'>-					    rcu_dereference(ireq-&gt;ireq_opt));</div><div class='add'>+					    rcu_dereference(ireq-&gt;ireq_opt),</div><div class='add'>+					    tos);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		err = net_xmit_eval(err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -969,10 +1241,27 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)</div><div class='ctx'>  * We need to maintain these in the sk structure.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_DEFERRED_FALSE(tcp_md5_needed, HZ);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_needed);</div><div class='add'>+</div><div class='add'>+static bool better_md5_match(struct tcp_md5sig_key *old, struct tcp_md5sig_key *new)</div><div class='add'>+{</div><div class='add'>+	if (!old)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* l3index always overrides non-l3index */</div><div class='add'>+	if (old-&gt;l3index &amp;&amp; new-&gt;l3index == 0)</div><div class='add'>+		return false;</div><div class='add'>+	if (old-&gt;l3index == 0 &amp;&amp; new-&gt;l3index)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return old-&gt;prefixlen &lt; new-&gt;prefixlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find the Key structure for an address.  */</div><div class='del'>-struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk,</div><div class='del'>-					 const union tcp_md5_addr *addr,</div><div class='del'>-					 int family)</div><div class='add'>+struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index,</div><div class='add'>+					   const union tcp_md5_addr *addr,</div><div class='add'>+					   int family, bool any_l3index)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='hunk'>@@ -987,10 +1276,13 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk,</div><div class='ctx'> 	if (!md5sig)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(key, &amp;md5sig-&gt;head, node) {</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;md5sig-&gt;head, node,</div><div class='add'>+				 lockdep_sock_is_held(sk)) {</div><div class='ctx'> 		if (key-&gt;family != family)</div><div class='ctx'> 			continue;</div><div class='del'>-</div><div class='add'>+		if (!any_l3index &amp;&amp; key-&gt;flags &amp; TCP_MD5SIG_FLAG_IFINDEX &amp;&amp;</div><div class='add'>+		    key-&gt;l3index != l3index)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (family == AF_INET) {</div><div class='ctx'> 			mask = inet_make_mask(key-&gt;prefixlen);</div><div class='ctx'> 			match = (key-&gt;addr.a4.s_addr &amp; mask) ==</div><div class='hunk'>@@ -1004,17 +1296,17 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk,</div><div class='ctx'> 			match = false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (match &amp;&amp; (!best_match ||</div><div class='del'>-			      key-&gt;prefixlen &gt; best_match-&gt;prefixlen))</div><div class='add'>+		if (match &amp;&amp; better_md5_match(best_match, key))</div><div class='ctx'> 			best_match = key;</div><div class='ctx'> 	}</div><div class='ctx'> 	return best_match;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_md5_do_lookup);</div><div class='add'>+EXPORT_IPV6_MOD(__tcp_md5_do_lookup);</div><div class='ctx'> </div><div class='ctx'> static struct tcp_md5sig_key *tcp_md5_do_lookup_exact(const struct sock *sk,</div><div class='ctx'> 						      const union tcp_md5_addr *addr,</div><div class='del'>-						      int family, u8 prefixlen)</div><div class='add'>+						      int family, u8 prefixlen,</div><div class='add'>+						      int l3index, u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='hunk'>@@ -1030,9 +1322,14 @@ static struct tcp_md5sig_key *tcp_md5_do_lookup_exact(const struct sock *sk,</div><div class='ctx'> 	if (family == AF_INET6)</div><div class='ctx'> 		size = sizeof(struct in6_addr);</div><div class='ctx'> #endif</div><div class='del'>-	hlist_for_each_entry_rcu(key, &amp;md5sig-&gt;head, node) {</div><div class='add'>+	hlist_for_each_entry_rcu(key, &amp;md5sig-&gt;head, node,</div><div class='add'>+				 lockdep_sock_is_held(sk)) {</div><div class='ctx'> 		if (key-&gt;family != family)</div><div class='ctx'> 			continue;</div><div class='add'>+		if ((key-&gt;flags &amp; TCP_MD5SIG_FLAG_IFINDEX) != (flags &amp; TCP_MD5SIG_FLAG_IFINDEX))</div><div class='add'>+			continue;</div><div class='add'>+		if (key-&gt;l3index != l3index)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (!memcmp(&amp;key-&gt;addr, addr, size) &amp;&amp;</div><div class='ctx'> 		    key-&gt;prefixlen == prefixlen)</div><div class='ctx'> 			return key;</div><div class='hunk'>@@ -1044,68 +1341,144 @@ struct tcp_md5sig_key *tcp_v4_md5_lookup(const struct sock *sk,</div><div class='ctx'> 					 const struct sock *addr_sk)</div><div class='ctx'> {</div><div class='ctx'> 	const union tcp_md5_addr *addr;</div><div class='add'>+	int l3index;</div><div class='ctx'> </div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='add'>+						 addr_sk-&gt;sk_bound_dev_if);</div><div class='ctx'> 	addr = (const union tcp_md5_addr *)&amp;addr_sk-&gt;sk_daddr;</div><div class='del'>-	return tcp_md5_do_lookup(sk, addr, AF_INET);</div><div class='add'>+	return tcp_md5_do_lookup(sk, l3index, addr, AF_INET);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_md5_lookup);</div><div class='add'>+</div><div class='add'>+static int tcp_md5sig_info_add(struct sock *sk, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_md5sig_info *md5sig;</div><div class='add'>+</div><div class='add'>+	md5sig = kmalloc(sizeof(*md5sig), gfp);</div><div class='add'>+	if (!md5sig)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sk_gso_disable(sk);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;md5sig-&gt;head);</div><div class='add'>+	rcu_assign_pointer(tp-&gt;md5sig_info, md5sig);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_md5_lookup);</div><div class='ctx'> </div><div class='ctx'> /* This can be called on a newly created socket, from other files */</div><div class='del'>-int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,</div><div class='del'>-		   int family, u8 prefixlen, const u8 *newkey, u8 newkeylen,</div><div class='del'>-		   gfp_t gfp)</div><div class='add'>+static int __tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,</div><div class='add'>+			    int family, u8 prefixlen, int l3index, u8 flags,</div><div class='add'>+			    const u8 *newkey, u8 newkeylen, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Add Key to the list */</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_md5sig_info *md5sig;</div><div class='ctx'> </div><div class='del'>-	key = tcp_md5_do_lookup_exact(sk, addr, family, prefixlen);</div><div class='add'>+	key = tcp_md5_do_lookup_exact(sk, addr, family, prefixlen, l3index, flags);</div><div class='ctx'> 	if (key) {</div><div class='del'>-		/* Pre-existing entry - just update that one. */</div><div class='del'>-		memcpy(key-&gt;key, newkey, newkeylen);</div><div class='del'>-		key-&gt;keylen = newkeylen;</div><div class='add'>+		/* Pre-existing entry - just update that one.</div><div class='add'>+		 * Note that the key might be used concurrently.</div><div class='add'>+		 * data_race() is telling kcsan that we do not care of</div><div class='add'>+		 * key mismatches, since changing MD5 key on live flows</div><div class='add'>+		 * can lead to packet drops.</div><div class='add'>+		 */</div><div class='add'>+		data_race(memcpy(key-&gt;key, newkey, newkeylen));</div><div class='add'>+</div><div class='add'>+		/* Pairs with READ_ONCE() in tcp_md5_hash_key().</div><div class='add'>+		 * Also note that a reader could catch new key-&gt;keylen value</div><div class='add'>+		 * but old key-&gt;key[], this is the reason we use __GFP_ZERO</div><div class='add'>+		 * at sock_kmalloc() time below these lines.</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(key-&gt;keylen, newkeylen);</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	md5sig = rcu_dereference_protected(tp-&gt;md5sig_info,</div><div class='ctx'> 					   lockdep_sock_is_held(sk));</div><div class='del'>-	if (!md5sig) {</div><div class='del'>-		md5sig = kmalloc(sizeof(*md5sig), gfp);</div><div class='del'>-		if (!md5sig)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		sk_nocaps_add(sk, NETIF_F_GSO_MASK);</div><div class='del'>-		INIT_HLIST_HEAD(&amp;md5sig-&gt;head);</div><div class='del'>-		rcu_assign_pointer(tp-&gt;md5sig_info, md5sig);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	key = sock_kmalloc(sk, sizeof(*key), gfp);</div><div class='add'>+	key = sock_kmalloc(sk, sizeof(*key), gfp | __GFP_ZERO);</div><div class='ctx'> 	if (!key)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!tcp_alloc_md5sig_pool()) {</div><div class='del'>-		sock_kfree_s(sk, key, sizeof(*key));</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(key-&gt;key, newkey, newkeylen);</div><div class='ctx'> 	key-&gt;keylen = newkeylen;</div><div class='ctx'> 	key-&gt;family = family;</div><div class='ctx'> 	key-&gt;prefixlen = prefixlen;</div><div class='add'>+	key-&gt;l3index = l3index;</div><div class='add'>+	key-&gt;flags = flags;</div><div class='ctx'> 	memcpy(&amp;key-&gt;addr, addr,</div><div class='del'>-	       (family == AF_INET6) ? sizeof(struct in6_addr) :</div><div class='del'>-				      sizeof(struct in_addr));</div><div class='add'>+	       (IS_ENABLED(CONFIG_IPV6) &amp;&amp; family == AF_INET6) ? sizeof(struct in6_addr) :</div><div class='add'>+								 sizeof(struct in_addr));</div><div class='ctx'> 	hlist_add_head_rcu(&amp;key-&gt;node, &amp;md5sig-&gt;head);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_md5_do_add);</div><div class='add'>+</div><div class='add'>+int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,</div><div class='add'>+		   int family, u8 prefixlen, int l3index, u8 flags,</div><div class='add'>+		   const u8 *newkey, u8 newkeylen)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!rcu_dereference_protected(tp-&gt;md5sig_info, lockdep_sock_is_held(sk))) {</div><div class='add'>+		if (fips_enabled) {</div><div class='add'>+			pr_warn_once("TCP-MD5 support is disabled due to FIPS\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tcp_md5sig_info_add(sk, GFP_KERNEL))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (!static_branch_inc(&amp;tcp_md5_needed.key)) {</div><div class='add'>+			struct tcp_md5sig_info *md5sig;</div><div class='add'>+</div><div class='add'>+			md5sig = rcu_dereference_protected(tp-&gt;md5sig_info, lockdep_sock_is_held(sk));</div><div class='add'>+			rcu_assign_pointer(tp-&gt;md5sig_info, NULL);</div><div class='add'>+			kfree_rcu(md5sig, rcu);</div><div class='add'>+			return -EUSERS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __tcp_md5_do_add(sk, addr, family, prefixlen, l3index, flags,</div><div class='add'>+				newkey, newkeylen, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_do_add);</div><div class='add'>+</div><div class='add'>+int tcp_md5_key_copy(struct sock *sk, const union tcp_md5_addr *addr,</div><div class='add'>+		     int family, u8 prefixlen, int l3index,</div><div class='add'>+		     struct tcp_md5sig_key *key)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!rcu_dereference_protected(tp-&gt;md5sig_info, lockdep_sock_is_held(sk))) {</div><div class='add'>+</div><div class='add'>+		if (tcp_md5sig_info_add(sk, sk_gfp_mask(sk, GFP_ATOMIC)))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (!static_key_fast_inc_not_disabled(&amp;tcp_md5_needed.key.key)) {</div><div class='add'>+			struct tcp_md5sig_info *md5sig;</div><div class='add'>+</div><div class='add'>+			md5sig = rcu_dereference_protected(tp-&gt;md5sig_info, lockdep_sock_is_held(sk));</div><div class='add'>+			net_warn_ratelimited("Too many TCP-MD5 keys in the system\n");</div><div class='add'>+			rcu_assign_pointer(tp-&gt;md5sig_info, NULL);</div><div class='add'>+			kfree_rcu(md5sig, rcu);</div><div class='add'>+			return -EUSERS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __tcp_md5_do_add(sk, addr, family, prefixlen, l3index,</div><div class='add'>+				key-&gt;flags, key-&gt;key, key-&gt;keylen,</div><div class='add'>+				sk_gfp_mask(sk, GFP_ATOMIC));</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_key_copy);</div><div class='ctx'> </div><div class='ctx'> int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr, int family,</div><div class='del'>-		   u8 prefixlen)</div><div class='add'>+		   u8 prefixlen, int l3index, u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='ctx'> </div><div class='del'>-	key = tcp_md5_do_lookup_exact(sk, addr, family, prefixlen);</div><div class='add'>+	key = tcp_md5_do_lookup_exact(sk, addr, family, prefixlen, l3index, flags);</div><div class='ctx'> 	if (!key)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	hlist_del_rcu(&amp;key-&gt;node);</div><div class='hunk'>@@ -1113,9 +1486,9 @@ int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr, int family,</div><div class='ctx'> 	kfree_rcu(key, rcu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_md5_do_del);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_md5_do_del);</div><div class='ctx'> </div><div class='del'>-static void tcp_clear_md5_list(struct sock *sk)</div><div class='add'>+void tcp_clear_md5_list(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='hunk'>@@ -1125,28 +1498,35 @@ static void tcp_clear_md5_list(struct sock *sk)</div><div class='ctx'> 	md5sig = rcu_dereference_protected(tp-&gt;md5sig_info, 1);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(key, n, &amp;md5sig-&gt;head, node) {</div><div class='del'>-		hlist_del_rcu(&amp;key-&gt;node);</div><div class='add'>+		hlist_del(&amp;key-&gt;node);</div><div class='ctx'> 		atomic_sub(sizeof(*key), &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-		kfree_rcu(key, rcu);</div><div class='add'>+		kfree(key);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tcp_v4_parse_md5_keys(struct sock *sk, int optname,</div><div class='del'>-				 char __user *optval, int optlen)</div><div class='add'>+				 sockptr_t optval, int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_md5sig cmd;</div><div class='ctx'> 	struct sockaddr_in *sin = (struct sockaddr_in *)&amp;cmd.tcpm_addr;</div><div class='add'>+	const union tcp_md5_addr *addr;</div><div class='ctx'> 	u8 prefixlen = 32;</div><div class='add'>+	int l3index = 0;</div><div class='add'>+	bool l3flag;</div><div class='add'>+	u8 flags;</div><div class='ctx'> </div><div class='ctx'> 	if (optlen &lt; sizeof(cmd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;cmd, optval, sizeof(cmd)))</div><div class='add'>+	if (copy_from_sockptr(&amp;cmd, optval, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (sin-&gt;sin_family != AF_INET)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	flags = cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX;</div><div class='add'>+	l3flag = cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX;</div><div class='add'>+</div><div class='ctx'> 	if (optname == TCP_MD5SIG_EXT &amp;&amp;</div><div class='ctx'> 	    cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_PREFIX) {</div><div class='ctx'> 		prefixlen = cmd.tcpm_prefixlen;</div><div class='hunk'>@@ -1154,82 +1534,80 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, int optname,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (optname == TCP_MD5SIG_EXT &amp;&amp; cmd.tcpm_ifindex &amp;&amp;</div><div class='add'>+	    cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = dev_get_by_index_rcu(sock_net(sk), cmd.tcpm_ifindex);</div><div class='add'>+		if (dev &amp;&amp; netif_is_l3_master(dev))</div><div class='add'>+			l3index = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		/* ok to reference set/not set outside of rcu;</div><div class='add'>+		 * right now device MUST be an L3 master</div><div class='add'>+		 */</div><div class='add'>+		if (!dev || !l3index)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = (union tcp_md5_addr *)&amp;sin-&gt;sin_addr.s_addr;</div><div class='add'>+</div><div class='ctx'> 	if (!cmd.tcpm_keylen)</div><div class='del'>-		return tcp_md5_do_del(sk, (union tcp_md5_addr *)&amp;sin-&gt;sin_addr.s_addr,</div><div class='del'>-				      AF_INET, prefixlen);</div><div class='add'>+		return tcp_md5_do_del(sk, addr, AF_INET, prefixlen, l3index, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd.tcpm_keylen &gt; TCP_MD5SIG_MAXKEYLEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return tcp_md5_do_add(sk, (union tcp_md5_addr *)&amp;sin-&gt;sin_addr.s_addr,</div><div class='del'>-			      AF_INET, prefixlen, cmd.tcpm_key, cmd.tcpm_keylen,</div><div class='del'>-			      GFP_KERNEL);</div><div class='add'>+	/* Don't allow keys for peers that have a matching TCP-AO key.</div><div class='add'>+	 * See the comment in tcp_ao_add_cmd()</div><div class='add'>+	 */</div><div class='add'>+	if (tcp_ao_required(sk, addr, AF_INET, l3flag ? l3index : -1, false))</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	return tcp_md5_do_add(sk, addr, AF_INET, prefixlen, l3index, flags,</div><div class='add'>+			      cmd.tcpm_key, cmd.tcpm_keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v4_md5_hash_headers(struct tcp_md5sig_pool *hp,</div><div class='del'>-				   __be32 daddr, __be32 saddr,</div><div class='del'>-				   const struct tcphdr *th, int nbytes)</div><div class='add'>+static void tcp_v4_md5_hash_headers(struct md5_ctx *ctx,</div><div class='add'>+				    __be32 daddr, __be32 saddr,</div><div class='add'>+				    const struct tcphdr *th, int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct tcp4_pseudohdr *bp;</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-	struct tcphdr *_th;</div><div class='del'>-</div><div class='del'>-	bp = hp-&gt;scratch;</div><div class='del'>-	bp-&gt;saddr = saddr;</div><div class='del'>-	bp-&gt;daddr = daddr;</div><div class='del'>-	bp-&gt;pad = 0;</div><div class='del'>-	bp-&gt;protocol = IPPROTO_TCP;</div><div class='del'>-	bp-&gt;len = cpu_to_be16(nbytes);</div><div class='del'>-</div><div class='del'>-	_th = (struct tcphdr *)(bp + 1);</div><div class='del'>-	memcpy(_th, th, sizeof(*th));</div><div class='del'>-	_th-&gt;check = 0;</div><div class='add'>+	struct {</div><div class='add'>+		struct tcp4_pseudohdr ip;</div><div class='add'>+		struct tcphdr tcp;</div><div class='add'>+	} h;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(&amp;sg, bp, sizeof(*bp) + sizeof(*th));</div><div class='del'>-	ahash_request_set_crypt(hp-&gt;md5_req, &amp;sg, NULL,</div><div class='del'>-				sizeof(*bp) + sizeof(*th));</div><div class='del'>-	return crypto_ahash_update(hp-&gt;md5_req);</div><div class='add'>+	h.ip.saddr = saddr;</div><div class='add'>+	h.ip.daddr = daddr;</div><div class='add'>+	h.ip.pad = 0;</div><div class='add'>+	h.ip.protocol = IPPROTO_TCP;</div><div class='add'>+	h.ip.len = cpu_to_be16(nbytes);</div><div class='add'>+	h.tcp = *th;</div><div class='add'>+	h.tcp.check = 0;</div><div class='add'>+	md5_update(ctx, (const u8 *)&amp;h, sizeof(h.ip) + sizeof(h.tcp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='del'>-			       __be32 daddr, __be32 saddr, const struct tcphdr *th)</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='add'>+		    __be32 daddr, __be32 saddr, const struct tcphdr *th)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_md5sig_pool *hp;</div><div class='del'>-	struct ahash_request *req;</div><div class='del'>-</div><div class='del'>-	hp = tcp_get_md5sig_pool();</div><div class='del'>-	if (!hp)</div><div class='del'>-		goto clear_hash_noput;</div><div class='del'>-	req = hp-&gt;md5_req;</div><div class='del'>-</div><div class='del'>-	if (crypto_ahash_init(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_v4_md5_hash_headers(hp, daddr, saddr, th, th-&gt;doff &lt;&lt; 2))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_key(hp, key))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	ahash_request_set_crypt(req, NULL, md5_hash, 0);</div><div class='del'>-	if (crypto_ahash_final(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-	return 0;</div><div class='add'>+	struct md5_ctx ctx;</div><div class='ctx'> </div><div class='del'>-clear_hash:</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-clear_hash_noput:</div><div class='del'>-	memset(md5_hash, 0, 16);</div><div class='del'>-	return 1;</div><div class='add'>+	md5_init(&amp;ctx);</div><div class='add'>+	tcp_v4_md5_hash_headers(&amp;ctx, daddr, saddr, th, th-&gt;doff &lt;&lt; 2);</div><div class='add'>+	tcp_md5_hash_key(&amp;ctx, key);</div><div class='add'>+	md5_final(&amp;ctx, md5_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tcp_v4_md5_hash_skb(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='del'>-			const struct sock *sk,</div><div class='del'>-			const struct sk_buff *skb)</div><div class='add'>+noinline_for_stack void</div><div class='add'>+tcp_v4_md5_hash_skb(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='add'>+		    const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_md5sig_pool *hp;</div><div class='del'>-	struct ahash_request *req;</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> 	__be32 saddr, daddr;</div><div class='add'>+	struct md5_ctx ctx;</div><div class='ctx'> </div><div class='ctx'> 	if (sk) { /* valid for establish/request sockets */</div><div class='ctx'> 		saddr = sk-&gt;sk_rcv_saddr;</div><div class='hunk'>@@ -1240,96 +1618,16 @@ int tcp_v4_md5_hash_skb(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='ctx'> 		daddr = iph-&gt;daddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp = tcp_get_md5sig_pool();</div><div class='del'>-	if (!hp)</div><div class='del'>-		goto clear_hash_noput;</div><div class='del'>-	req = hp-&gt;md5_req;</div><div class='del'>-</div><div class='del'>-	if (crypto_ahash_init(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	if (tcp_v4_md5_hash_headers(hp, daddr, saddr, th, skb-&gt;len))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_skb_data(hp, skb, th-&gt;doff &lt;&lt; 2))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_key(hp, key))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	ahash_request_set_crypt(req, NULL, md5_hash, 0);</div><div class='del'>-	if (crypto_ahash_final(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-clear_hash:</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-clear_hash_noput:</div><div class='del'>-	memset(md5_hash, 0, 16);</div><div class='del'>-	return 1;</div><div class='add'>+	md5_init(&amp;ctx);</div><div class='add'>+	tcp_v4_md5_hash_headers(&amp;ctx, daddr, saddr, th, skb-&gt;len);</div><div class='add'>+	tcp_md5_hash_skb_data(&amp;ctx, skb, th-&gt;doff &lt;&lt; 2);</div><div class='add'>+	tcp_md5_hash_key(&amp;ctx, key);</div><div class='add'>+	md5_final(&amp;ctx, md5_hash);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_md5_hash_skb);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_md5_hash_skb);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Called with rcu_read_lock() */</div><div class='del'>-static bool tcp_v4_inbound_md5_hash(const struct sock *sk,</div><div class='del'>-				    const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	/*</div><div class='del'>-	 * This gets called for each TCP segment that arrives</div><div class='del'>-	 * so we want to be efficient.</div><div class='del'>-	 * We have 3 drop cases:</div><div class='del'>-	 * o No MD5 hash and one expected.</div><div class='del'>-	 * o MD5 hash and we're not expecting one.</div><div class='del'>-	 * o MD5 hash and its wrong.</div><div class='del'>-	 */</div><div class='del'>-	const __u8 *hash_location = NULL;</div><div class='del'>-	struct tcp_md5sig_key *hash_expected;</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	int genhash;</div><div class='del'>-	unsigned char newhash[16];</div><div class='del'>-</div><div class='del'>-	hash_expected = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&amp;iph-&gt;saddr,</div><div class='del'>-					  AF_INET);</div><div class='del'>-	hash_location = tcp_parse_md5sig_option(th);</div><div class='del'>-</div><div class='del'>-	/* We've parsed the options - do we have a hash? */</div><div class='del'>-	if (!hash_expected &amp;&amp; !hash_location)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (hash_expected &amp;&amp; !hash_location) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hash_expected &amp;&amp; hash_location) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Okay, so this is hash_expected and hash_location -</div><div class='del'>-	 * so we need to calculate the checksum.</div><div class='del'>-	 */</div><div class='del'>-	genhash = tcp_v4_md5_hash_skb(newhash,</div><div class='del'>-				      hash_expected,</div><div class='del'>-				      NULL, skb);</div><div class='del'>-</div><div class='del'>-	if (genhash || memcmp(hash_location, newhash, 16) != 0) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5FAILURE);</div><div class='del'>-		net_info_ratelimited("MD5 Hash failed for (%pI4, %d)-&gt;(%pI4, %d)%s\n",</div><div class='del'>-				     &amp;iph-&gt;saddr, ntohs(th-&gt;source),</div><div class='del'>-				     &amp;iph-&gt;daddr, ntohs(th-&gt;dest),</div><div class='del'>-				     genhash ? " tcp_v4_calc_md5_hash failed"</div><div class='del'>-				     : "");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='del'>-#endif</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void tcp_v4_init_req(struct request_sock *req,</div><div class='ctx'> 			    const struct sock *sk_listener,</div><div class='ctx'> 			    struct sk_buff *skb)</div><div class='hunk'>@@ -1343,29 +1641,38 @@ static void tcp_v4_init_req(struct request_sock *req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dst_entry *tcp_v4_route_req(const struct sock *sk,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='ctx'> 					  struct flowi *fl,</div><div class='del'>-					  const struct request_sock *req)</div><div class='add'>+					  struct request_sock *req,</div><div class='add'>+					  u32 tw_isn)</div><div class='ctx'> {</div><div class='add'>+	tcp_v4_init_req(req, sk, skb);</div><div class='add'>+</div><div class='add'>+	if (security_inet_conn_request(sk, skb, req))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	return inet_csk_route_req(sk, &amp;fl-&gt;u.ip4, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct request_sock_ops tcp_request_sock_ops __read_mostly = {</div><div class='ctx'> 	.family		=	PF_INET,</div><div class='ctx'> 	.obj_size	=	sizeof(struct tcp_request_sock),</div><div class='del'>-	.rtx_syn_ack	=	tcp_rtx_synack,</div><div class='ctx'> 	.send_ack	=	tcp_v4_reqsk_send_ack,</div><div class='ctx'> 	.destructor	=	tcp_v4_reqsk_destructor,</div><div class='ctx'> 	.send_reset	=	tcp_v4_send_reset,</div><div class='del'>-	.syn_ack_timeout =	tcp_syn_ack_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {</div><div class='add'>+const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {</div><div class='ctx'> 	.mss_clamp	=	TCP_MSS_DEFAULT,</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	.req_md5_lookup	=	tcp_v4_md5_lookup,</div><div class='ctx'> 	.calc_md5_hash	=	tcp_v4_md5_hash_skb,</div><div class='ctx'> #endif</div><div class='del'>-	.init_req	=	tcp_v4_init_req,</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	.ao_lookup	=	tcp_v4_ao_lookup_rsk,</div><div class='add'>+	.ao_calc_key	=	tcp_v4_ao_calc_key_rsk,</div><div class='add'>+	.ao_synack_hash	=	tcp_v4_ao_synack_hash,</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SYN_COOKIES</div><div class='ctx'> 	.cookie_init_seq =	cookie_v4_init_sequence,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1388,7 +1695,7 @@ drop:</div><div class='ctx'> 	tcp_listendrop(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_conn_request);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_conn_request);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1402,11 +1709,14 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				  bool *own_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_request_sock *ireq;</div><div class='add'>+	bool found_dup_sk = false;</div><div class='ctx'> 	struct inet_sock *newinet;</div><div class='ctx'> 	struct tcp_sock *newtp;</div><div class='ctx'> 	struct sock *newsk;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	const union tcp_md5_addr *addr;</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='add'>+	int l3index;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct ip_options_rcu *inet_opt;</div><div class='ctx'> </div><div class='hunk'>@@ -1423,10 +1733,6 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	newtp		      = tcp_sk(newsk);</div><div class='ctx'> 	newinet		      = inet_sk(newsk);</div><div class='ctx'> 	ireq		      = inet_rsk(req);</div><div class='del'>-	sk_daddr_set(newsk, ireq-&gt;ir_rmt_addr);</div><div class='del'>-	sk_rcv_saddr_set(newsk, ireq-&gt;ir_loc_addr);</div><div class='del'>-	newsk-&gt;sk_bound_dev_if = ireq-&gt;ir_iif;</div><div class='del'>-	newinet-&gt;inet_saddr   = ireq-&gt;ir_loc_addr;</div><div class='ctx'> 	inet_opt	      = rcu_dereference(ireq-&gt;ireq_opt);</div><div class='ctx'> 	RCU_INIT_POINTER(newinet-&gt;inet_opt, inet_opt);</div><div class='ctx'> 	newinet-&gt;mc_index     = inet_iif(skb);</div><div class='hunk'>@@ -1435,7 +1741,13 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	inet_csk(newsk)-&gt;icsk_ext_hdr_len = 0;</div><div class='ctx'> 	if (inet_opt)</div><div class='ctx'> 		inet_csk(newsk)-&gt;icsk_ext_hdr_len = inet_opt-&gt;opt.optlen;</div><div class='del'>-	newinet-&gt;inet_id = newtp-&gt;write_seq ^ jiffies;</div><div class='add'>+	atomic_set(&amp;newinet-&gt;inet_id, get_random_u16());</div><div class='add'>+</div><div class='add'>+	/* Set ToS of the new socket based upon the value of incoming SYN.</div><div class='add'>+	 * ECT bits are set later in tcp_init_transfer().</div><div class='add'>+	 */</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reflect_tos))</div><div class='add'>+		newinet-&gt;tos = tcp_rsk(req)-&gt;syn_tos &amp; ~INET_ECN_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (!dst) {</div><div class='ctx'> 		dst = inet_csk_route_child_sock(sk, newsk, req);</div><div class='hunk'>@@ -1454,30 +1766,39 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	tcp_initialize_rcv_mss(newsk);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk), ireq-&gt;ir_iif);</div><div class='ctx'> 	/* Copy over the MD5 key from the original socket */</div><div class='del'>-	key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&amp;newinet-&gt;inet_daddr,</div><div class='del'>-				AF_INET);</div><div class='del'>-	if (key) {</div><div class='del'>-		/*</div><div class='del'>-		 * We're using one, so create a matching key</div><div class='del'>-		 * on the newsk structure. If we fail to get</div><div class='del'>-		 * memory, then we end up not copying the key</div><div class='del'>-		 * across. Shucks.</div><div class='del'>-		 */</div><div class='del'>-		tcp_md5_do_add(newsk, (union tcp_md5_addr *)&amp;newinet-&gt;inet_daddr,</div><div class='del'>-			       AF_INET, 32, key-&gt;key, key-&gt;keylen, GFP_ATOMIC);</div><div class='del'>-		sk_nocaps_add(newsk, NETIF_F_GSO_MASK);</div><div class='add'>+	addr = (union tcp_md5_addr *)&amp;newinet-&gt;inet_daddr;</div><div class='add'>+	key = tcp_md5_do_lookup(sk, l3index, addr, AF_INET);</div><div class='add'>+	if (key &amp;&amp; !tcp_rsk_used_ao(req)) {</div><div class='add'>+		if (tcp_md5_key_copy(newsk, addr, AF_INET, 32, l3index, key))</div><div class='add'>+			goto put_and_exit;</div><div class='add'>+		sk_gso_disable(newsk);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (tcp_ao_copy_all_matching(sk, newsk, req, skb, AF_INET))</div><div class='add'>+		goto put_and_exit; /* OOM, release back memory */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (__inet_inherit_port(sk, newsk) &lt; 0)</div><div class='ctx'> 		goto put_and_exit;</div><div class='del'>-	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));</div><div class='add'>+	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash),</div><div class='add'>+				       &amp;found_dup_sk);</div><div class='ctx'> 	if (likely(*own_req)) {</div><div class='ctx'> 		tcp_move_syn(newtp, req);</div><div class='ctx'> 		ireq-&gt;ireq_opt = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		newinet-&gt;inet_opt = NULL;</div><div class='add'>+</div><div class='add'>+		if (!req_unhash &amp;&amp; found_dup_sk) {</div><div class='add'>+			/* This code path should only be executed in the</div><div class='add'>+			 * syncookie case only</div><div class='add'>+			 */</div><div class='add'>+			bh_unlock_sock(newsk);</div><div class='add'>+			sock_put(newsk);</div><div class='add'>+			newsk = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return newsk;</div><div class='ctx'> </div><div class='hunk'>@@ -1494,7 +1815,7 @@ put_and_exit:</div><div class='ctx'> 	tcp_done(newsk);</div><div class='ctx'> 	goto exit;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_syn_recv_sock);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_syn_recv_sock);</div><div class='ctx'> </div><div class='ctx'> static struct sock *tcp_v4_cookie_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1507,6 +1828,23 @@ static struct sock *tcp_v4_cookie_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u16 tcp_v4_get_syncookie(struct sock *sk, struct iphdr *iph,</div><div class='add'>+			 struct tcphdr *th, u32 *cookie)</div><div class='add'>+{</div><div class='add'>+	u16 mss = 0;</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	mss = tcp_get_syncookie_mss(&amp;tcp_request_sock_ops,</div><div class='add'>+				    &amp;tcp_request_sock_ipv4_ops, sk, th);</div><div class='add'>+	if (mss) {</div><div class='add'>+		*cookie = __cookie_v4_init_sequence(iph, th, &amp;mss);</div><div class='add'>+		tcp_synq_overflow(sk);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return mss;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,</div><div class='add'>+							   u32));</div><div class='ctx'> /* The socket must have it's spinlock held when we get</div><div class='ctx'>  * here, unless it is a TCP_LISTEN socket.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1517,18 +1855,27 @@ static struct sock *tcp_v4_cookie_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	struct sock *rsk;</div><div class='ctx'> </div><div class='add'>+	reason = psp_sk_rx_policy_check(sk, skb);</div><div class='add'>+	if (reason)</div><div class='add'>+		goto err_discard;</div><div class='add'>+</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_ESTABLISHED) { /* Fast path */</div><div class='del'>-		struct dst_entry *dst = sk-&gt;sk_rx_dst;</div><div class='add'>+		struct dst_entry *dst;</div><div class='add'>+</div><div class='add'>+		dst = rcu_dereference_protected(sk-&gt;sk_rx_dst,</div><div class='add'>+						lockdep_sock_is_held(sk));</div><div class='ctx'> </div><div class='ctx'> 		sock_rps_save_rxhash(sk, skb);</div><div class='ctx'> 		sk_mark_napi_id(sk, skb);</div><div class='ctx'> 		if (dst) {</div><div class='del'>-			if (inet_sk(sk)-&gt;rx_dst_ifindex != skb-&gt;skb_iif ||</div><div class='del'>-			    !dst-&gt;ops-&gt;check(dst, 0)) {</div><div class='add'>+			if (sk-&gt;sk_rx_dst_ifindex != skb-&gt;skb_iif ||</div><div class='add'>+			    !INDIRECT_CALL_1(dst-&gt;ops-&gt;check, ipv4_dst_check,</div><div class='add'>+					     dst, 0)) {</div><div class='add'>+				RCU_INIT_POINTER(sk-&gt;sk_rx_dst, NULL);</div><div class='ctx'> 				dst_release(dst);</div><div class='del'>-				sk-&gt;sk_rx_dst = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		tcp_rcv_established(sk, skb);</div><div class='hunk'>@@ -1542,9 +1889,10 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		struct sock *nsk = tcp_v4_cookie_check(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!nsk)</div><div class='del'>-			goto discard;</div><div class='add'>+			return 0;</div><div class='ctx'> 		if (nsk != sk) {</div><div class='del'>-			if (tcp_child_process(sk, nsk, skb)) {</div><div class='add'>+			reason = tcp_child_process(sk, nsk, skb);</div><div class='add'>+			if (reason) {</div><div class='ctx'> 				rsk = nsk;</div><div class='ctx'> 				goto reset;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1553,16 +1901,17 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	} else</div><div class='ctx'> 		sock_rps_save_rxhash(sk, skb);</div><div class='ctx'> </div><div class='del'>-	if (tcp_rcv_state_process(sk, skb)) {</div><div class='add'>+	reason = tcp_rcv_state_process(sk, skb);</div><div class='add'>+	if (reason) {</div><div class='ctx'> 		rsk = sk;</div><div class='ctx'> 		goto reset;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> reset:</div><div class='del'>-	tcp_v4_send_reset(rsk, skb);</div><div class='add'>+	tcp_v4_send_reset(rsk, skb, sk_rst_convert_drop_reason(reason));</div><div class='ctx'> discard:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	/* Be careful here. If this function gets more complicated and</div><div class='ctx'> 	 * gcc suffers from register pressure on the x86, sk (in %ebx)</div><div class='ctx'> 	 * might be destroyed here. This current version compiles correctly,</div><div class='hunk'>@@ -1571,7 +1920,10 @@ discard:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> csum_err:</div><div class='add'>+	reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+	trace_tcp_bad_csum(skb);</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);</div><div class='add'>+err_discard:</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='ctx'> 	goto discard;</div><div class='ctx'> }</div><div class='hunk'>@@ -1579,6 +1931,7 @@ EXPORT_SYMBOL(tcp_v4_do_rcv);</div><div class='ctx'> </div><div class='ctx'> int tcp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	const struct tcphdr *th;</div><div class='ctx'> 	struct sock *sk;</div><div class='hunk'>@@ -1595,35 +1948,40 @@ int tcp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> 	if (th-&gt;doff &lt; sizeof(struct tcphdr) / 4)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sk = __inet_lookup_established(dev_net(skb-&gt;dev), &amp;tcp_hashinfo,</div><div class='del'>-				       iph-&gt;saddr, th-&gt;source,</div><div class='add'>+	sk = __inet_lookup_established(net, iph-&gt;saddr, th-&gt;source,</div><div class='ctx'> 				       iph-&gt;daddr, ntohs(th-&gt;dest),</div><div class='ctx'> 				       skb-&gt;skb_iif, inet_sdif(skb));</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		skb-&gt;sk = sk;</div><div class='ctx'> 		skb-&gt;destructor = sock_edemux;</div><div class='ctx'> 		if (sk_fullsock(sk)) {</div><div class='del'>-			struct dst_entry *dst = READ_ONCE(sk-&gt;sk_rx_dst);</div><div class='add'>+			struct dst_entry *dst = rcu_dereference(sk-&gt;sk_rx_dst);</div><div class='ctx'> </div><div class='ctx'> 			if (dst)</div><div class='ctx'> 				dst = dst_check(dst, 0);</div><div class='ctx'> 			if (dst &amp;&amp;</div><div class='del'>-			    inet_sk(sk)-&gt;rx_dst_ifindex == skb-&gt;skb_iif)</div><div class='add'>+			    sk-&gt;sk_rx_dst_ifindex == skb-&gt;skb_iif)</div><div class='ctx'> 				skb_dst_set_noref(skb, dst);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+		     enum skb_drop_reason *reason)</div><div class='ctx'> {</div><div class='del'>-	u32 limit = sk-&gt;sk_rcvbuf + sk-&gt;sk_sndbuf;</div><div class='del'>-</div><div class='del'>-	/* Only socket owner can try to collapse/prune rx queues</div><div class='del'>-	 * to reduce memory overhead, so add a little headroom here.</div><div class='del'>-	 * Few sockets backlog are possibly concurrently non empty.</div><div class='del'>-	 */</div><div class='del'>-	limit += 64*1024;</div><div class='add'>+	u32 tail_gso_size, tail_gso_segs;</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	const struct tcphdr *th;</div><div class='add'>+	struct tcphdr *thtail;</div><div class='add'>+	struct sk_buff *tail;</div><div class='add'>+	unsigned int hdrlen;</div><div class='add'>+	bool fragstolen;</div><div class='add'>+	u32 gso_segs;</div><div class='add'>+	u32 gso_size;</div><div class='add'>+	u64 limit;</div><div class='add'>+	int delta;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* In case all data was pulled from skb frags (in __pskb_pull_tail()),</div><div class='ctx'> 	 * we can fix skb-&gt;truesize to its real value to avoid future drops.</div><div class='hunk'>@@ -1633,29 +1991,132 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_condense(skb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(sk_add_backlog(sk, skb, limit))) {</div><div class='add'>+	tcp_cleanup_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(tcp_checksum_complete(skb))) {</div><div class='add'>+		bh_unlock_sock(sk);</div><div class='add'>+		trace_tcp_bad_csum(skb);</div><div class='add'>+		*reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+		__TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);</div><div class='add'>+		__TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attempt coalescing to last skb in backlog, even if we are</div><div class='add'>+	 * above the limits.</div><div class='add'>+	 * This is okay because skb capacity is limited to MAX_SKB_FRAGS.</div><div class='add'>+	 */</div><div class='add'>+	th = (const struct tcphdr *)skb-&gt;data;</div><div class='add'>+	hdrlen = th-&gt;doff * 4;</div><div class='add'>+</div><div class='add'>+	tail = sk-&gt;sk_backlog.tail;</div><div class='add'>+	if (!tail)</div><div class='add'>+		goto no_coalesce;</div><div class='add'>+	thtail = (struct tcphdr *)tail-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (TCP_SKB_CB(tail)-&gt;end_seq != TCP_SKB_CB(skb)-&gt;seq ||</div><div class='add'>+	    TCP_SKB_CB(tail)-&gt;ip_dsfield != TCP_SKB_CB(skb)-&gt;ip_dsfield ||</div><div class='add'>+	    ((TCP_SKB_CB(tail)-&gt;tcp_flags |</div><div class='add'>+	      TCP_SKB_CB(skb)-&gt;tcp_flags) &amp; (TCPHDR_SYN | TCPHDR_RST | TCPHDR_URG)) ||</div><div class='add'>+	    !((TCP_SKB_CB(tail)-&gt;tcp_flags &amp;</div><div class='add'>+	      TCP_SKB_CB(skb)-&gt;tcp_flags) &amp; TCPHDR_ACK) ||</div><div class='add'>+	    ((TCP_SKB_CB(tail)-&gt;tcp_flags ^</div><div class='add'>+	      TCP_SKB_CB(skb)-&gt;tcp_flags) &amp;</div><div class='add'>+	     (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE)) ||</div><div class='add'>+	    !tcp_skb_can_collapse_rx(tail, skb) ||</div><div class='add'>+	    thtail-&gt;doff != th-&gt;doff ||</div><div class='add'>+	    memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th)) ||</div><div class='add'>+	    /* prior to PSP Rx policy check, retain exact PSP metadata */</div><div class='add'>+	    psp_skb_coalesce_diff(tail, skb))</div><div class='add'>+		goto no_coalesce;</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, hdrlen);</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+	gso_size = shinfo-&gt;gso_size ?: skb-&gt;len;</div><div class='add'>+	gso_segs = shinfo-&gt;gso_segs ?: 1;</div><div class='add'>+</div><div class='add'>+	shinfo = skb_shinfo(tail);</div><div class='add'>+	tail_gso_size = shinfo-&gt;gso_size ?: (tail-&gt;len - hdrlen);</div><div class='add'>+	tail_gso_segs = shinfo-&gt;gso_segs ?: 1;</div><div class='add'>+</div><div class='add'>+	if (skb_try_coalesce(tail, skb, &amp;fragstolen, &amp;delta)) {</div><div class='add'>+		TCP_SKB_CB(tail)-&gt;end_seq = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='add'>+</div><div class='add'>+		if (likely(!before(TCP_SKB_CB(skb)-&gt;ack_seq, TCP_SKB_CB(tail)-&gt;ack_seq))) {</div><div class='add'>+			TCP_SKB_CB(tail)-&gt;ack_seq = TCP_SKB_CB(skb)-&gt;ack_seq;</div><div class='add'>+			thtail-&gt;window = th-&gt;window;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We have to update both TCP_SKB_CB(tail)-&gt;tcp_flags and</div><div class='add'>+		 * thtail-&gt;fin, so that the fast path in tcp_rcv_established()</div><div class='add'>+		 * is not entered if we append a packet with a FIN.</div><div class='add'>+		 * SYN, RST, URG are not present.</div><div class='add'>+		 * ACK is set on both packets.</div><div class='add'>+		 * PSH : we do not really care in TCP stack,</div><div class='add'>+		 *       at least for 'GRO' packets.</div><div class='add'>+		 */</div><div class='add'>+		thtail-&gt;fin |= th-&gt;fin;</div><div class='add'>+		TCP_SKB_CB(tail)-&gt;tcp_flags |= TCP_SKB_CB(skb)-&gt;tcp_flags;</div><div class='add'>+</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;has_rxtstamp) {</div><div class='add'>+			TCP_SKB_CB(tail)-&gt;has_rxtstamp = true;</div><div class='add'>+			tail-&gt;tstamp = skb-&gt;tstamp;</div><div class='add'>+			skb_hwtstamps(tail)-&gt;hwtstamp = skb_hwtstamps(skb)-&gt;hwtstamp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Not as strict as GRO. We only need to carry mss max value */</div><div class='add'>+		shinfo-&gt;gso_size = max(gso_size, tail_gso_size);</div><div class='add'>+		shinfo-&gt;gso_segs = min_t(u32, gso_segs + tail_gso_segs, 0xFFFF);</div><div class='add'>+</div><div class='add'>+		sk-&gt;sk_backlog.len += delta;</div><div class='add'>+		__NET_INC_STATS(sock_net(sk),</div><div class='add'>+				LINUX_MIB_TCPBACKLOGCOALESCE);</div><div class='add'>+		kfree_skb_partial(skb, fragstolen);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	__skb_push(skb, hdrlen);</div><div class='add'>+</div><div class='add'>+no_coalesce:</div><div class='add'>+	/* sk-&gt;sk_backlog.len is reset only at the end of __release_sock().</div><div class='add'>+	 * Both sk-&gt;sk_backlog.len and sk-&gt;sk_rmem_alloc could reach</div><div class='add'>+	 * sk_rcvbuf in normal conditions.</div><div class='add'>+	 */</div><div class='add'>+	limit = ((u64)READ_ONCE(sk-&gt;sk_rcvbuf)) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	limit += ((u32)READ_ONCE(sk-&gt;sk_sndbuf)) &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	/* Only socket owner can try to collapse/prune rx queues</div><div class='add'>+	 * to reduce memory overhead, so add a little headroom here.</div><div class='add'>+	 * Few sockets backlog are possibly concurrently non empty.</div><div class='add'>+	 */</div><div class='add'>+	limit += 64 * 1024;</div><div class='add'>+</div><div class='add'>+	limit = min_t(u64, limit, UINT_MAX);</div><div class='add'>+</div><div class='add'>+	err = sk_add_backlog(sk, skb, limit);</div><div class='add'>+	if (unlikely(err)) {</div><div class='ctx'> 		bh_unlock_sock(sk);</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPBACKLOGDROP);</div><div class='add'>+		if (err == -ENOMEM) {</div><div class='add'>+			*reason = SKB_DROP_REASON_PFMEMALLOC;</div><div class='add'>+			__NET_INC_STATS(sock_net(sk), LINUX_MIB_PFMEMALLOCDROP);</div><div class='add'>+		} else {</div><div class='add'>+			*reason = SKB_DROP_REASON_SOCKET_BACKLOG;</div><div class='add'>+			__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPBACKLOGDROP);</div><div class='add'>+		}</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_add_backlog);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_add_backlog);</div><div class='ctx'> </div><div class='del'>-int tcp_filter(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+int tcp_filter(struct sock *sk, struct sk_buff *skb, enum skb_drop_reason *reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcphdr *th = (struct tcphdr *)skb-&gt;data;</div><div class='del'>-	unsigned int eaten = skb-&gt;len;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = sk_filter_trim_cap(sk, skb, th-&gt;doff * 4);</div><div class='del'>-	if (!err) {</div><div class='del'>-		eaten -= skb-&gt;len;</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;end_seq -= eaten;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return sk_filter_trim_cap(sk, skb, th-&gt;doff * 4, reason);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_filter);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_filter);</div><div class='ctx'> </div><div class='ctx'> static void tcp_v4_restore_cb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1677,8 +2138,7 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph,</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;end_seq = (TCP_SKB_CB(skb)-&gt;seq + th-&gt;syn + th-&gt;fin +</div><div class='ctx'> 				    skb-&gt;len - th-&gt;doff * 4);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;ack_seq = ntohl(th-&gt;ack_seq);</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;tcp_flags = tcp_flag_byte(th);</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;tcp_tw_isn = 0;</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;tcp_flags = tcp_flags_ntohs(th);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;ip_dsfield = ipv4_get_dsfield(iph);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;sacked	 = 0;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;has_rxtstamp =</div><div class='hunk'>@@ -1691,14 +2151,19 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph,</div><div class='ctx'> </div><div class='ctx'> int tcp_v4_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	enum skb_drop_reason drop_reason;</div><div class='add'>+	enum tcp_tw_status tw_status;</div><div class='ctx'> 	int sdif = inet_sdif(skb);</div><div class='add'>+	int dif = inet_iif(skb);</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	const struct tcphdr *th;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='ctx'> 	bool refcounted;</div><div class='del'>-	struct sock *sk;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 isn;</div><div class='ctx'> </div><div class='add'>+	drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1710,8 +2175,10 @@ int tcp_v4_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(th-&gt;doff &lt; sizeof(struct tcphdr) / 4))</div><div class='add'>+	if (unlikely(th-&gt;doff &lt; sizeof(struct tcphdr) / 4)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 		goto bad_packet;</div><div class='add'>+	}</div><div class='ctx'> 	if (!pskb_may_pull(skb, th-&gt;doff * 4))</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1726,12 +2193,11 @@ int tcp_v4_rcv(struct sk_buff *skb)</div><div class='ctx'> 	th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> lookup:</div><div class='del'>-	sk = __inet_lookup_skb(&amp;tcp_hashinfo, skb, __tcp_hdrlen(th), th-&gt;source,</div><div class='add'>+	sk = __inet_lookup_skb(skb, __tcp_hdrlen(th), th-&gt;source,</div><div class='ctx'> 			       th-&gt;dest, sdif, &amp;refcounted);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto no_tcp_socket;</div><div class='ctx'> </div><div class='del'>-process:</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='ctx'> 		goto do_time_wait;</div><div class='ctx'> </div><div class='hunk'>@@ -1741,8 +2207,14 @@ process:</div><div class='ctx'> 		struct sock *nsk;</div><div class='ctx'> </div><div class='ctx'> 		sk = req-&gt;rsk_listener;</div><div class='del'>-		if (unlikely(tcp_v4_inbound_md5_hash(sk, skb))) {</div><div class='del'>-			sk_drops_add(sk, skb);</div><div class='add'>+		if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+			drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='add'>+		else</div><div class='add'>+			drop_reason = tcp_inbound_hash(sk, req, skb,</div><div class='add'>+						       &amp;iph-&gt;saddr, &amp;iph-&gt;daddr,</div><div class='add'>+						       AF_INET, dif, sdif);</div><div class='add'>+		if (unlikely(drop_reason)) {</div><div class='add'>+			sk_drops_skbadd(sk, skb);</div><div class='ctx'> 			reqsk_put(req);</div><div class='ctx'> 			goto discard_it;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1751,20 +2223,29 @@ process:</div><div class='ctx'> 			goto csum_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (unlikely(sk-&gt;sk_state != TCP_LISTEN)) {</div><div class='del'>-			inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='del'>-			goto lookup;</div><div class='add'>+			nsk = reuseport_migrate_sock(sk, req_to_sk(req), skb);</div><div class='add'>+			if (!nsk) {</div><div class='add'>+				inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='add'>+				goto lookup;</div><div class='add'>+			}</div><div class='add'>+			sk = nsk;</div><div class='add'>+			/* reuseport_migrate_sock() has already held one sk_refcnt</div><div class='add'>+			 * before returning.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			/* We own a reference on the listener, increase it again</div><div class='add'>+			 * as we might lose it too soon.</div><div class='add'>+			 */</div><div class='add'>+			sock_hold(sk);</div><div class='ctx'> 		}</div><div class='del'>-		/* We own a reference on the listener, increase it again</div><div class='del'>-		 * as we might lose it too soon.</div><div class='del'>-		 */</div><div class='del'>-		sock_hold(sk);</div><div class='ctx'> 		refcounted = true;</div><div class='ctx'> 		nsk = NULL;</div><div class='del'>-		if (!tcp_filter(sk, skb)) {</div><div class='add'>+		if (!tcp_filter(sk, skb, &amp;drop_reason)) {</div><div class='ctx'> 			th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 			iph = ip_hdr(skb);</div><div class='ctx'> 			tcp_v4_fill_cb(skb, iph, th);</div><div class='del'>-			nsk = tcp_check_req(sk, skb, req, false, &amp;req_stolen);</div><div class='add'>+			nsk = tcp_check_req(sk, skb, req, false, &amp;req_stolen,</div><div class='add'>+					    &amp;drop_reason);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!nsk) {</div><div class='ctx'> 			reqsk_put(req);</div><div class='hunk'>@@ -1780,32 +2261,49 @@ process:</div><div class='ctx'> 			}</div><div class='ctx'> 			goto discard_and_relse;</div><div class='ctx'> 		}</div><div class='add'>+		nf_reset_ct(skb);</div><div class='ctx'> 		if (nsk == sk) {</div><div class='ctx'> 			reqsk_put(req);</div><div class='ctx'> 			tcp_v4_restore_cb(skb);</div><div class='del'>-		} else if (tcp_child_process(sk, nsk, skb)) {</div><div class='del'>-			tcp_v4_send_reset(nsk, skb);</div><div class='del'>-			goto discard_and_relse;</div><div class='ctx'> 		} else {</div><div class='add'>+			drop_reason = tcp_child_process(sk, nsk, skb);</div><div class='add'>+			if (drop_reason) {</div><div class='add'>+				enum sk_rst_reason rst_reason;</div><div class='add'>+</div><div class='add'>+				rst_reason = sk_rst_convert_drop_reason(drop_reason);</div><div class='add'>+				tcp_v4_send_reset(nsk, skb, rst_reason);</div><div class='add'>+				goto discard_and_relse;</div><div class='add'>+			}</div><div class='ctx'> 			sock_put(sk);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(iph-&gt;ttl &lt; inet_sk(sk)-&gt;min_ttl)) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='del'>-		goto discard_and_relse;</div><div class='add'>+</div><div class='add'>+process:</div><div class='add'>+	if (static_branch_unlikely(&amp;ip4_min_ttl)) {</div><div class='add'>+		/* min_ttl can be changed concurrently from do_ip_setsockopt() */</div><div class='add'>+		if (unlikely(iph-&gt;ttl &lt; READ_ONCE(inet_sk(sk)-&gt;min_ttl))) {</div><div class='add'>+			__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_TCP_MINTTL;</div><div class='add'>+			goto discard_and_relse;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		goto discard_and_relse;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (tcp_v4_inbound_md5_hash(sk, skb))</div><div class='add'>+	drop_reason = tcp_inbound_hash(sk, NULL, skb, &amp;iph-&gt;saddr, &amp;iph-&gt;daddr,</div><div class='add'>+				       AF_INET, dif, sdif);</div><div class='add'>+	if (drop_reason)</div><div class='ctx'> 		goto discard_and_relse;</div><div class='ctx'> </div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='del'>-	if (tcp_filter(sk, skb))</div><div class='add'>+	if (tcp_filter(sk, skb, &amp;drop_reason))</div><div class='ctx'> 		goto discard_and_relse;</div><div class='add'>+</div><div class='ctx'> 	th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> 	tcp_v4_fill_cb(skb, iph, th);</div><div class='hunk'>@@ -1824,8 +2322,9 @@ process:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (!sock_owned_by_user(sk)) {</div><div class='ctx'> 		ret = tcp_v4_do_rcv(sk, skb);</div><div class='del'>-	} else if (tcp_add_backlog(sk, skb)) {</div><div class='del'>-		goto discard_and_relse;</div><div class='add'>+	} else {</div><div class='add'>+		if (tcp_add_backlog(sk, skb, &amp;drop_reason))</div><div class='add'>+			goto discard_and_relse;</div><div class='ctx'> 	}</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -1836,6 +2335,7 @@ put_and_return:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> no_tcp_socket:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_NO_SOCKET;</div><div class='ctx'> 	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1843,26 +2343,30 @@ no_tcp_socket:</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_checksum_complete(skb)) {</div><div class='ctx'> csum_error:</div><div class='add'>+		drop_reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+		trace_tcp_bad_csum(skb);</div><div class='ctx'> 		__TCP_INC_STATS(net, TCP_MIB_CSUMERRORS);</div><div class='ctx'> bad_packet:</div><div class='ctx'> 		__TCP_INC_STATS(net, TCP_MIB_INERRS);</div><div class='ctx'> 	} else {</div><div class='del'>-		tcp_v4_send_reset(NULL, skb);</div><div class='add'>+		tcp_v4_send_reset(NULL, skb, sk_rst_convert_drop_reason(drop_reason));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> discard_it:</div><div class='add'>+	SKB_DR_OR(drop_reason, NOT_SPECIFIED);</div><div class='ctx'> 	/* Discard frame. */</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> discard_and_relse:</div><div class='del'>-	sk_drops_add(sk, skb);</div><div class='add'>+	sk_drops_skbadd(sk, skb);</div><div class='ctx'> 	if (refcounted)</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 	goto discard_it;</div><div class='ctx'> </div><div class='ctx'> do_time_wait:</div><div class='ctx'> 	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		inet_twsk_put(inet_twsk(sk));</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1873,11 +2377,12 @@ do_time_wait:</div><div class='ctx'> 		inet_twsk_put(inet_twsk(sk));</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> 	}</div><div class='del'>-	switch (tcp_timewait_state_process(inet_twsk(sk), skb, th)) {</div><div class='add'>+</div><div class='add'>+	tw_status = tcp_timewait_state_process(inet_twsk(sk), skb, th, &amp;isn,</div><div class='add'>+					       &amp;drop_reason);</div><div class='add'>+	switch (tw_status) {</div><div class='ctx'> 	case TCP_TW_SYN: {</div><div class='del'>-		struct sock *sk2 = inet_lookup_listener(dev_net(skb-&gt;dev),</div><div class='del'>-							&amp;tcp_hashinfo, skb,</div><div class='del'>-							__tcp_hdrlen(th),</div><div class='add'>+		struct sock *sk2 = inet_lookup_listener(net, skb, __tcp_hdrlen(th),</div><div class='ctx'> 							iph-&gt;saddr, th-&gt;source,</div><div class='ctx'> 							iph-&gt;daddr, th-&gt;dest,</div><div class='ctx'> 							inet_iif(skb),</div><div class='hunk'>@@ -1887,16 +2392,22 @@ do_time_wait:</div><div class='ctx'> 			sk = sk2;</div><div class='ctx'> 			tcp_v4_restore_cb(skb);</div><div class='ctx'> 			refcounted = false;</div><div class='add'>+			__this_cpu_write(tcp_tw_isn, isn);</div><div class='ctx'> 			goto process;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		drop_reason = psp_twsk_rx_policy_check(inet_twsk(sk), skb);</div><div class='add'>+		if (drop_reason)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 		/* to ACK */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_TW_ACK:</div><div class='del'>-		tcp_v4_timewait_ack(sk, skb);</div><div class='add'>+	case TCP_TW_ACK_OOW:</div><div class='add'>+		tcp_v4_timewait_ack(sk, skb, tw_status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_TW_RST:</div><div class='del'>-		tcp_v4_send_reset(sk, skb);</div><div class='add'>+		tcp_v4_send_reset(sk, skb, SK_RST_REASON_TCP_TIMEWAIT_SOCKET);</div><div class='ctx'> 		inet_twsk_deschedule_put(inet_twsk(sk));</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> 	case TCP_TW_SUCCESS:;</div><div class='hunk'>@@ -1906,8 +2417,6 @@ do_time_wait:</div><div class='ctx'> </div><div class='ctx'> static struct timewait_sock_ops tcp_timewait_sock_ops = {</div><div class='ctx'> 	.twsk_obj_size	= sizeof(struct tcp_timewait_sock),</div><div class='del'>-	.twsk_unique	= tcp_twsk_unique,</div><div class='del'>-	.twsk_destructor= tcp_twsk_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)</div><div class='hunk'>@@ -1915,11 +2424,11 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (dst &amp;&amp; dst_hold_safe(dst)) {</div><div class='del'>-		sk-&gt;sk_rx_dst = dst;</div><div class='del'>-		inet_sk(sk)-&gt;rx_dst_ifindex = skb-&gt;skb_iif;</div><div class='add'>+		rcu_assign_pointer(sk-&gt;sk_rx_dst, dst);</div><div class='add'>+		sk-&gt;sk_rx_dst_ifindex = skb-&gt;skb_iif;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet_sk_rx_dst_set);</div><div class='add'>+EXPORT_IPV6_MOD(inet_sk_rx_dst_set);</div><div class='ctx'> </div><div class='ctx'> const struct inet_connection_sock_af_ops ipv4_specific = {</div><div class='ctx'> 	.queue_xmit	   = ip_queue_xmit,</div><div class='hunk'>@@ -1931,22 +2440,31 @@ const struct inet_connection_sock_af_ops ipv4_specific = {</div><div class='ctx'> 	.net_header_len	   = sizeof(struct iphdr),</div><div class='ctx'> 	.setsockopt	   = ip_setsockopt,</div><div class='ctx'> 	.getsockopt	   = ip_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ip_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ip_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> 	.mtu_reduced	   = tcp_v4_mtu_reduced,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(ipv4_specific);</div><div class='add'>+EXPORT_IPV6_MOD(ipv4_specific);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> static const struct tcp_sock_af_ops tcp_sock_ipv4_specific = {</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	.md5_lookup		= tcp_v4_md5_lookup,</div><div class='ctx'> 	.calc_md5_hash		= tcp_v4_md5_hash_skb,</div><div class='ctx'> 	.md5_parse		= tcp_v4_parse_md5_keys,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	.ao_lookup		= tcp_v4_ao_lookup,</div><div class='add'>+	.calc_ao_hash		= tcp_v4_ao_hash_skb,</div><div class='add'>+	.ao_parse		= tcp_v4_parse_ao,</div><div class='add'>+	.ao_calc_key_sk		= tcp_v4_ao_calc_key_sk,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static void tcp4_destruct_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	tcp_md5_destruct_sock(sk);</div><div class='add'>+	tcp_ao_destroy_sock(sk, false);</div><div class='add'>+	inet_sock_destruct(sk);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* NOTE: A lot of things set to zero explicitly by call to</div><div class='hunk'>@@ -1960,17 +2478,33 @@ static int tcp_v4_init_sock(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_af_ops = &amp;ipv4_specific;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 	tcp_sk(sk)-&gt;af_specific = &amp;tcp_sock_ipv4_specific;</div><div class='add'>+	sk-&gt;sk_destruct = tcp4_destruct_sock;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_release_user_frags(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+	unsigned long index;</div><div class='add'>+	void *netmem;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;sk-&gt;sk_user_frags, index, netmem)</div><div class='add'>+		WARN_ON_ONCE(!napi_pp_put_page((__force netmem_ref)netmem));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void tcp_v4_destroy_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='add'>+	tcp_release_user_frags(sk);</div><div class='add'>+</div><div class='add'>+	xa_destroy(&amp;sk-&gt;sk_user_frags);</div><div class='add'>+</div><div class='ctx'> 	trace_tcp_destroy_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	tcp_clear_xmit_timers(sk);</div><div class='hunk'>@@ -1988,20 +2522,11 @@ void tcp_v4_destroy_sock(struct sock *sk)</div><div class='ctx'> 	/* Cleans up our, hopefully empty, out_of_order_queue. */</div><div class='ctx'> 	skb_rbtree_purge(&amp;tp-&gt;out_of_order_queue);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	/* Clean up the MD5 key list, if any */</div><div class='del'>-	if (tp-&gt;md5sig_info) {</div><div class='del'>-		tcp_clear_md5_list(sk);</div><div class='del'>-		kfree_rcu(rcu_dereference_protected(tp-&gt;md5sig_info, 1), rcu);</div><div class='del'>-		tp-&gt;md5sig_info = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Clean up a referenced TCP bind bucket. */</div><div class='ctx'> 	if (inet_csk(sk)-&gt;icsk_bind_hash)</div><div class='ctx'> 		inet_put_port(sk);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(tp-&gt;fastopen_rsk);</div><div class='add'>+	BUG_ON(rcu_access_pointer(tp-&gt;fastopen_rsk));</div><div class='ctx'> </div><div class='ctx'> 	/* If socket is aborted during connect operation */</div><div class='ctx'> 	tcp_free_fastopen_req(tp);</div><div class='hunk'>@@ -2010,49 +2535,78 @@ void tcp_v4_destroy_sock(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	sk_sockets_allocated_dec(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_v4_destroy_sock);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_v4_destroy_sock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> /* Proc filesystem TCP sock list dumping. */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get next listener socket follow cur.  If cur is NULL, get first socket</div><div class='del'>- * starting from bucket given in st-&gt;bucket; when st-&gt;bucket is zero the</div><div class='del'>- * very first socket in the hash table is returned.</div><div class='add'>+static unsigned short seq_file_family(const struct seq_file *seq);</div><div class='add'>+</div><div class='add'>+static bool seq_sk_match(struct seq_file *seq, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	unsigned short family = seq_file_family(seq);</div><div class='add'>+</div><div class='add'>+	/* AF_UNSPEC is used as a match all */</div><div class='add'>+	return ((family == AF_UNSPEC || family == sk-&gt;sk_family) &amp;&amp;</div><div class='add'>+		net_eq(sock_net(sk), seq_file_net(seq)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find a non empty bucket (starting from st-&gt;bucket)</div><div class='add'>+ * and return the first sk from it.</div><div class='add'>+ */</div><div class='add'>+static void *listening_get_first(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	struct tcp_iter_state *st = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	st-&gt;offset = 0;</div><div class='add'>+	for (; st-&gt;bucket &lt;= hinfo-&gt;lhash2_mask; st-&gt;bucket++) {</div><div class='add'>+		struct inet_listen_hashbucket *ilb2;</div><div class='add'>+		struct hlist_nulls_node *node;</div><div class='add'>+		struct sock *sk;</div><div class='add'>+</div><div class='add'>+		ilb2 = &amp;hinfo-&gt;lhash2[st-&gt;bucket];</div><div class='add'>+		if (hlist_nulls_empty(&amp;ilb2-&gt;nulls_head))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;ilb2-&gt;lock);</div><div class='add'>+		sk_nulls_for_each(sk, node, &amp;ilb2-&gt;nulls_head) {</div><div class='add'>+			if (seq_sk_match(seq, sk))</div><div class='add'>+				return sk;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;ilb2-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find the next sk of "cur" within the same bucket (i.e. st-&gt;bucket).</div><div class='add'>+ * If "cur" is the last one in the st-&gt;bucket,</div><div class='add'>+ * call listening_get_first() to return the first sk of the next</div><div class='add'>+ * non empty bucket.</div><div class='ctx'>  */</div><div class='ctx'> static void *listening_get_next(struct seq_file *seq, void *cur)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct tcp_iter_state *st = seq-&gt;private;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='del'>-	struct inet_listen_hashbucket *ilb;</div><div class='add'>+	struct inet_listen_hashbucket *ilb2;</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='add'>+	struct inet_hashinfo *hinfo;</div><div class='ctx'> 	struct sock *sk = cur;</div><div class='ctx'> </div><div class='del'>-	if (!sk) {</div><div class='del'>-get_head:</div><div class='del'>-		ilb = &amp;tcp_hashinfo.listening_hash[st-&gt;bucket];</div><div class='del'>-		spin_lock(&amp;ilb-&gt;lock);</div><div class='del'>-		sk = sk_head(&amp;ilb-&gt;head);</div><div class='del'>-		st-&gt;offset = 0;</div><div class='del'>-		goto get_sk;</div><div class='del'>-	}</div><div class='del'>-	ilb = &amp;tcp_hashinfo.listening_hash[st-&gt;bucket];</div><div class='ctx'> 	++st-&gt;num;</div><div class='ctx'> 	++st-&gt;offset;</div><div class='ctx'> </div><div class='del'>-	sk = sk_next(sk);</div><div class='del'>-get_sk:</div><div class='del'>-	sk_for_each_from(sk) {</div><div class='del'>-		if (!net_eq(sock_net(sk), net))</div><div class='del'>-			continue;</div><div class='del'>-		if (sk-&gt;sk_family == afinfo-&gt;family)</div><div class='add'>+	sk = sk_nulls_next(sk);</div><div class='add'>+	sk_nulls_for_each_from(sk, node) {</div><div class='add'>+		if (seq_sk_match(seq, sk))</div><div class='ctx'> 			return sk;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ilb-&gt;lock);</div><div class='del'>-	st-&gt;offset = 0;</div><div class='del'>-	if (++st-&gt;bucket &lt; INET_LHTABLE_SIZE)</div><div class='del'>-		goto get_head;</div><div class='del'>-	return NULL;</div><div class='add'>+</div><div class='add'>+	hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	ilb2 = &amp;hinfo-&gt;lhash2[st-&gt;bucket];</div><div class='add'>+	spin_unlock(&amp;ilb2-&gt;lock);</div><div class='add'>+	++st-&gt;bucket;</div><div class='add'>+	return listening_get_first(seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *listening_get_idx(struct seq_file *seq, loff_t *pos)</div><div class='hunk'>@@ -2062,7 +2616,7 @@ static void *listening_get_idx(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;bucket = 0;</div><div class='ctx'> 	st-&gt;offset = 0;</div><div class='del'>-	rc = listening_get_next(seq, NULL);</div><div class='add'>+	rc = listening_get_first(seq);</div><div class='ctx'> </div><div class='ctx'> 	while (rc &amp;&amp; *pos) {</div><div class='ctx'> 		rc = listening_get_next(seq, rc);</div><div class='hunk'>@@ -2071,9 +2625,10 @@ static void *listening_get_idx(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool empty_bucket(const struct tcp_iter_state *st)</div><div class='add'>+static inline bool empty_bucket(struct inet_hashinfo *hinfo,</div><div class='add'>+				const struct tcp_iter_state *st)</div><div class='ctx'> {</div><div class='del'>-	return hlist_nulls_empty(&amp;tcp_hashinfo.ehash[st-&gt;bucket].chain);</div><div class='add'>+	return hlist_nulls_empty(&amp;hinfo-&gt;ehash[st-&gt;bucket].chain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2082,43 +2637,38 @@ static inline bool empty_bucket(const struct tcp_iter_state *st)</div><div class='ctx'>  */</div><div class='ctx'> static void *established_get_first(struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	struct tcp_iter_state *st = seq-&gt;private;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='del'>-	void *rc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;offset = 0;</div><div class='del'>-	for (; st-&gt;bucket &lt;= tcp_hashinfo.ehash_mask; ++st-&gt;bucket) {</div><div class='add'>+	for (; st-&gt;bucket &lt;= hinfo-&gt;ehash_mask; ++st-&gt;bucket) {</div><div class='ctx'> 		struct sock *sk;</div><div class='ctx'> 		struct hlist_nulls_node *node;</div><div class='del'>-		spinlock_t *lock = inet_ehash_lockp(&amp;tcp_hashinfo, st-&gt;bucket);</div><div class='add'>+		spinlock_t *lock = inet_ehash_lockp(hinfo, st-&gt;bucket);</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='ctx'> </div><div class='ctx'> 		/* Lockless fast path for the common case of empty buckets */</div><div class='del'>-		if (empty_bucket(st))</div><div class='add'>+		if (empty_bucket(hinfo, st))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(lock);</div><div class='del'>-		sk_nulls_for_each(sk, node, &amp;tcp_hashinfo.ehash[st-&gt;bucket].chain) {</div><div class='del'>-			if (sk-&gt;sk_family != afinfo-&gt;family ||</div><div class='del'>-			    !net_eq(sock_net(sk), net)) {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			rc = sk;</div><div class='del'>-			goto out;</div><div class='add'>+		sk_nulls_for_each(sk, node, &amp;hinfo-&gt;ehash[st-&gt;bucket].chain) {</div><div class='add'>+			if (seq_sk_match(seq, sk))</div><div class='add'>+				return sk;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(lock);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *established_get_next(struct seq_file *seq, void *cur)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='del'>-	struct sock *sk = cur;</div><div class='del'>-	struct hlist_nulls_node *node;</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	struct tcp_iter_state *st = seq-&gt;private;</div><div class='del'>-	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='add'>+	struct sock *sk = cur;</div><div class='ctx'> </div><div class='ctx'> 	++st-&gt;num;</div><div class='ctx'> 	++st-&gt;offset;</div><div class='hunk'>@@ -2126,12 +2676,11 @@ static void *established_get_next(struct seq_file *seq, void *cur)</div><div class='ctx'> 	sk = sk_nulls_next(sk);</div><div class='ctx'> </div><div class='ctx'> 	sk_nulls_for_each_from(sk, node) {</div><div class='del'>-		if (sk-&gt;sk_family == afinfo-&gt;family &amp;&amp;</div><div class='del'>-		    net_eq(sock_net(sk), net))</div><div class='add'>+		if (seq_sk_match(seq, sk))</div><div class='ctx'> 			return sk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(inet_ehash_lockp(&amp;tcp_hashinfo, st-&gt;bucket));</div><div class='add'>+	spin_unlock_bh(inet_ehash_lockp(hinfo, st-&gt;bucket));</div><div class='ctx'> 	++st-&gt;bucket;</div><div class='ctx'> 	return established_get_first(seq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2169,29 +2718,30 @@ static void *tcp_get_idx(struct seq_file *seq, loff_t pos)</div><div class='ctx'> </div><div class='ctx'> static void *tcp_seek_last_pos(struct seq_file *seq)</div><div class='ctx'> {</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	struct tcp_iter_state *st = seq-&gt;private;</div><div class='add'>+	int bucket = st-&gt;bucket;</div><div class='ctx'> 	int offset = st-&gt;offset;</div><div class='ctx'> 	int orig_num = st-&gt;num;</div><div class='ctx'> 	void *rc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (st-&gt;state) {</div><div class='ctx'> 	case TCP_SEQ_STATE_LISTENING:</div><div class='del'>-		if (st-&gt;bucket &gt;= INET_LHTABLE_SIZE)</div><div class='add'>+		if (st-&gt;bucket &gt; hinfo-&gt;lhash2_mask)</div><div class='ctx'> 			break;</div><div class='del'>-		st-&gt;state = TCP_SEQ_STATE_LISTENING;</div><div class='del'>-		rc = listening_get_next(seq, NULL);</div><div class='del'>-		while (offset-- &amp;&amp; rc)</div><div class='add'>+		rc = listening_get_first(seq);</div><div class='add'>+		while (offset-- &amp;&amp; rc &amp;&amp; bucket == st-&gt;bucket)</div><div class='ctx'> 			rc = listening_get_next(seq, rc);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		st-&gt;bucket = 0;</div><div class='ctx'> 		st-&gt;state = TCP_SEQ_STATE_ESTABLISHED;</div><div class='del'>-		/* Fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_SEQ_STATE_ESTABLISHED:</div><div class='del'>-		if (st-&gt;bucket &gt; tcp_hashinfo.ehash_mask)</div><div class='add'>+		if (st-&gt;bucket &gt; hinfo-&gt;ehash_mask)</div><div class='ctx'> 			break;</div><div class='ctx'> 		rc = established_get_first(seq);</div><div class='del'>-		while (offset-- &amp;&amp; rc)</div><div class='add'>+		while (offset-- &amp;&amp; rc &amp;&amp; bucket == st-&gt;bucket)</div><div class='ctx'> 			rc = established_get_next(seq, rc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2221,7 +2771,7 @@ out:</div><div class='ctx'> 	st-&gt;last_pos = *pos;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_seq_start);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_seq_start);</div><div class='ctx'> </div><div class='ctx'> void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='hunk'>@@ -2252,24 +2802,25 @@ out:</div><div class='ctx'> 	st-&gt;last_pos = *pos;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_seq_next);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_seq_next);</div><div class='ctx'> </div><div class='ctx'> void tcp_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	struct tcp_iter_state *st = seq-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	switch (st-&gt;state) {</div><div class='ctx'> 	case TCP_SEQ_STATE_LISTENING:</div><div class='ctx'> 		if (v != SEQ_START_TOKEN)</div><div class='del'>-			spin_unlock(&amp;tcp_hashinfo.listening_hash[st-&gt;bucket].lock);</div><div class='add'>+			spin_unlock(&amp;hinfo-&gt;lhash2[st-&gt;bucket].lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_SEQ_STATE_ESTABLISHED:</div><div class='ctx'> 		if (v)</div><div class='del'>-			spin_unlock_bh(inet_ehash_lockp(&amp;tcp_hashinfo, st-&gt;bucket));</div><div class='add'>+			spin_unlock_bh(inet_ehash_lockp(hinfo, st-&gt;bucket));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_seq_stop);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_seq_stop);</div><div class='ctx'> </div><div class='ctx'> static void get_openreq4(const struct request_sock *req,</div><div class='ctx'> 			 struct seq_file *f, int i)</div><div class='hunk'>@@ -2290,7 +2841,7 @@ static void get_openreq4(const struct request_sock *req,</div><div class='ctx'> 		jiffies_delta_to_clock_t(delta),</div><div class='ctx'> 		req-&gt;num_timeout,</div><div class='ctx'> 		from_kuid_munged(seq_user_ns(f),</div><div class='del'>-				 sock_i_uid(req-&gt;rsk_listener)),</div><div class='add'>+				 sk_uid(req-&gt;rsk_listener)),</div><div class='ctx'> 		0,  /* non standard timer */</div><div class='ctx'> 		0, /* open_requests have no inode */</div><div class='ctx'> 		0,</div><div class='hunk'>@@ -2309,20 +2860,22 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)</div><div class='ctx'> 	__be32 src = inet-&gt;inet_rcv_saddr;</div><div class='ctx'> 	__u16 destp = ntohs(inet-&gt;inet_dport);</div><div class='ctx'> 	__u16 srcp = ntohs(inet-&gt;inet_sport);</div><div class='add'>+	u8 icsk_pending;</div><div class='ctx'> 	int rx_queue;</div><div class='ctx'> 	int state;</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_pending == ICSK_TIME_RETRANS ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='add'>+	icsk_pending = smp_load_acquire(&amp;icsk-&gt;icsk_pending);</div><div class='add'>+	if (icsk_pending == ICSK_TIME_RETRANS ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='ctx'> 		timer_active	= 1;</div><div class='del'>-		timer_expires	= icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (icsk-&gt;icsk_pending == ICSK_TIME_PROBE0) {</div><div class='add'>+		timer_expires	= tcp_timeout_expires(sk);</div><div class='add'>+	} else if (icsk_pending == ICSK_TIME_PROBE0) {</div><div class='ctx'> 		timer_active	= 4;</div><div class='del'>-		timer_expires	= icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (timer_pending(&amp;sk-&gt;sk_timer)) {</div><div class='add'>+		timer_expires	= tcp_timeout_expires(sk);</div><div class='add'>+	} else if (timer_pending(&amp;icsk-&gt;icsk_keepalive_timer)) {</div><div class='ctx'> 		timer_active	= 2;</div><div class='del'>-		timer_expires	= sk-&gt;sk_timer.expires;</div><div class='add'>+		timer_expires	= icsk-&gt;icsk_keepalive_timer.expires;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		timer_active	= 0;</div><div class='ctx'> 		timer_expires = jiffies;</div><div class='hunk'>@@ -2330,29 +2883,30 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)</div><div class='ctx'> </div><div class='ctx'> 	state = inet_sk_state_load(sk);</div><div class='ctx'> 	if (state == TCP_LISTEN)</div><div class='del'>-		rx_queue = sk-&gt;sk_ack_backlog;</div><div class='add'>+		rx_queue = READ_ONCE(sk-&gt;sk_ack_backlog);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* Because we don't lock the socket,</div><div class='ctx'> 		 * we might find a transient negative value.</div><div class='ctx'> 		 */</div><div class='del'>-		rx_queue = max_t(int, tp-&gt;rcv_nxt - tp-&gt;copied_seq, 0);</div><div class='add'>+		rx_queue = max_t(int, READ_ONCE(tp-&gt;rcv_nxt) -</div><div class='add'>+				      READ_ONCE(tp-&gt;copied_seq), 0);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "</div><div class='ctx'> 			"%08X %5u %8d %lu %d %pK %lu %lu %u %u %d",</div><div class='ctx'> 		i, src, srcp, dest, destp, state,</div><div class='del'>-		tp-&gt;write_seq - tp-&gt;snd_una,</div><div class='add'>+		READ_ONCE(tp-&gt;write_seq) - tp-&gt;snd_una,</div><div class='ctx'> 		rx_queue,</div><div class='ctx'> 		timer_active,</div><div class='ctx'> 		jiffies_delta_to_clock_t(timer_expires - jiffies),</div><div class='del'>-		icsk-&gt;icsk_retransmits,</div><div class='del'>-		from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)),</div><div class='del'>-		icsk-&gt;icsk_probes_out,</div><div class='add'>+		READ_ONCE(icsk-&gt;icsk_retransmits),</div><div class='add'>+		from_kuid_munged(seq_user_ns(f), sk_uid(sk)),</div><div class='add'>+		READ_ONCE(icsk-&gt;icsk_probes_out),</div><div class='ctx'> 		sock_i_ino(sk),</div><div class='ctx'> 		refcount_read(&amp;sk-&gt;sk_refcnt), sk,</div><div class='ctx'> 		jiffies_to_clock_t(icsk-&gt;icsk_rto),</div><div class='ctx'> 		jiffies_to_clock_t(icsk-&gt;icsk_ack.ato),</div><div class='del'>-		(icsk-&gt;icsk_ack.quick &lt;&lt; 1) | icsk-&gt;icsk_ack.pingpong,</div><div class='del'>-		tp-&gt;snd_cwnd,</div><div class='add'>+		(icsk-&gt;icsk_ack.quick &lt;&lt; 1) | inet_csk_in_pingpong_mode(sk),</div><div class='add'>+		tcp_snd_cwnd(tp),</div><div class='ctx'> 		state == TCP_LISTEN ?</div><div class='ctx'> 		    fastopenq-&gt;max_qlen :</div><div class='ctx'> 		    (tcp_in_initial_slowstart(tp) ? -1 : tp-&gt;snd_ssthresh));</div><div class='hunk'>@@ -2372,7 +2926,7 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%4d: %08X:%04X %08X:%04X"</div><div class='ctx'> 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK",</div><div class='del'>-		i, src, srcp, dest, destp, tw-&gt;tw_substate, 0, 0,</div><div class='add'>+		i, src, srcp, dest, destp, READ_ONCE(tw-&gt;tw_substate), 0, 0,</div><div class='ctx'> 		3, jiffies_delta_to_clock_t(delta), 0, 0, 0, 0,</div><div class='ctx'> 		refcount_read(&amp;tw-&gt;tw_refcnt), tw);</div><div class='ctx'> }</div><div class='hunk'>@@ -2404,6 +2958,426 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+union bpf_tcp_iter_batch_item {</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	__u64 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_tcp_iter_state {</div><div class='add'>+	struct tcp_iter_state state;</div><div class='add'>+	unsigned int cur_sk;</div><div class='add'>+	unsigned int end_sk;</div><div class='add'>+	unsigned int max_sk;</div><div class='add'>+	union bpf_tcp_iter_batch_item *batch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_iter__tcp {</div><div class='add'>+	__bpf_md_ptr(struct bpf_iter_meta *, meta);</div><div class='add'>+	__bpf_md_ptr(struct sock_common *, sk_common);</div><div class='add'>+	uid_t uid __aligned(8);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tcp_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta *meta,</div><div class='add'>+			     struct sock_common *sk_common, uid_t uid)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter__tcp ctx;</div><div class='add'>+</div><div class='add'>+	meta-&gt;seq_num--;  /* skip SEQ_START_TOKEN */</div><div class='add'>+	ctx.meta = meta;</div><div class='add'>+	ctx.sk_common = sk_common;</div><div class='add'>+	ctx.uid = uid;</div><div class='add'>+	return bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_tcp_put_batch(struct bpf_tcp_iter_state *iter)</div><div class='add'>+{</div><div class='add'>+	union bpf_tcp_iter_batch_item *item;</div><div class='add'>+	unsigned int cur_sk = iter-&gt;cur_sk;</div><div class='add'>+	__u64 cookie;</div><div class='add'>+</div><div class='add'>+	/* Remember the cookies of the sockets we haven't seen yet, so we can</div><div class='add'>+	 * pick up where we left off next time around.</div><div class='add'>+	 */</div><div class='add'>+	while (cur_sk &lt; iter-&gt;end_sk) {</div><div class='add'>+		item = &amp;iter-&gt;batch[cur_sk++];</div><div class='add'>+		cookie = sock_gen_cookie(item-&gt;sk);</div><div class='add'>+		sock_gen_put(item-&gt;sk);</div><div class='add'>+		item-&gt;cookie = cookie;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_iter_tcp_realloc_batch(struct bpf_tcp_iter_state *iter,</div><div class='add'>+				      unsigned int new_batch_sz, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	union bpf_tcp_iter_batch_item *new_batch;</div><div class='add'>+</div><div class='add'>+	new_batch = kvmalloc(sizeof(*new_batch) * new_batch_sz,</div><div class='add'>+			     flags | __GFP_NOWARN);</div><div class='add'>+	if (!new_batch)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(new_batch, iter-&gt;batch, sizeof(*iter-&gt;batch) * iter-&gt;end_sk);</div><div class='add'>+	kvfree(iter-&gt;batch);</div><div class='add'>+	iter-&gt;batch = new_batch;</div><div class='add'>+	iter-&gt;max_sk = new_batch_sz;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_tcp_resume_bucket(struct sock *first_sk,</div><div class='add'>+					       union bpf_tcp_iter_batch_item *cookies,</div><div class='add'>+					       int n_cookies)</div><div class='add'>+{</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_cookies; i++) {</div><div class='add'>+		sk = first_sk;</div><div class='add'>+		sk_nulls_for_each_from(sk, node)</div><div class='add'>+			if (cookies[i].cookie == atomic64_read(&amp;sk-&gt;sk_cookie))</div><div class='add'>+				return sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_tcp_resume_listening(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+	unsigned int find_cookie = iter-&gt;cur_sk;</div><div class='add'>+	unsigned int end_cookie = iter-&gt;end_sk;</div><div class='add'>+	int resume_bucket = st-&gt;bucket;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (end_cookie &amp;&amp; find_cookie == end_cookie)</div><div class='add'>+		++st-&gt;bucket;</div><div class='add'>+</div><div class='add'>+	sk = listening_get_first(seq);</div><div class='add'>+	iter-&gt;cur_sk = 0;</div><div class='add'>+	iter-&gt;end_sk = 0;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; st-&gt;bucket == resume_bucket &amp;&amp; end_cookie) {</div><div class='add'>+		sk = bpf_iter_tcp_resume_bucket(sk, &amp;iter-&gt;batch[find_cookie],</div><div class='add'>+						end_cookie - find_cookie);</div><div class='add'>+		if (!sk) {</div><div class='add'>+			spin_unlock(&amp;hinfo-&gt;lhash2[st-&gt;bucket].lock);</div><div class='add'>+			++st-&gt;bucket;</div><div class='add'>+			sk = listening_get_first(seq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_tcp_resume_established(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+	unsigned int find_cookie = iter-&gt;cur_sk;</div><div class='add'>+	unsigned int end_cookie = iter-&gt;end_sk;</div><div class='add'>+	int resume_bucket = st-&gt;bucket;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (end_cookie &amp;&amp; find_cookie == end_cookie)</div><div class='add'>+		++st-&gt;bucket;</div><div class='add'>+</div><div class='add'>+	sk = established_get_first(seq);</div><div class='add'>+	iter-&gt;cur_sk = 0;</div><div class='add'>+	iter-&gt;end_sk = 0;</div><div class='add'>+</div><div class='add'>+	if (sk &amp;&amp; st-&gt;bucket == resume_bucket &amp;&amp; end_cookie) {</div><div class='add'>+		sk = bpf_iter_tcp_resume_bucket(sk, &amp;iter-&gt;batch[find_cookie],</div><div class='add'>+						end_cookie - find_cookie);</div><div class='add'>+		if (!sk) {</div><div class='add'>+			spin_unlock_bh(inet_ehash_lockp(hinfo, st-&gt;bucket));</div><div class='add'>+			++st-&gt;bucket;</div><div class='add'>+			sk = established_get_first(seq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_tcp_resume(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+</div><div class='add'>+	switch (st-&gt;state) {</div><div class='add'>+	case TCP_SEQ_STATE_LISTENING:</div><div class='add'>+		sk = bpf_iter_tcp_resume_listening(seq);</div><div class='add'>+		if (sk)</div><div class='add'>+			break;</div><div class='add'>+		st-&gt;bucket = 0;</div><div class='add'>+		st-&gt;state = TCP_SEQ_STATE_ESTABLISHED;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case TCP_SEQ_STATE_ESTABLISHED:</div><div class='add'>+		sk = bpf_iter_tcp_resume_established(seq);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bpf_iter_tcp_listening_batch(struct seq_file *seq,</div><div class='add'>+						 struct sock **start_sk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='add'>+	unsigned int expected = 1;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sock_hold(*start_sk);</div><div class='add'>+	iter-&gt;batch[iter-&gt;end_sk++].sk = *start_sk;</div><div class='add'>+</div><div class='add'>+	sk = sk_nulls_next(*start_sk);</div><div class='add'>+	*start_sk = NULL;</div><div class='add'>+	sk_nulls_for_each_from(sk, node) {</div><div class='add'>+		if (seq_sk_match(seq, sk)) {</div><div class='add'>+			if (iter-&gt;end_sk &lt; iter-&gt;max_sk) {</div><div class='add'>+				sock_hold(sk);</div><div class='add'>+				iter-&gt;batch[iter-&gt;end_sk++].sk = sk;</div><div class='add'>+			} else if (!*start_sk) {</div><div class='add'>+				/* Remember where we left off. */</div><div class='add'>+				*start_sk = sk;</div><div class='add'>+			}</div><div class='add'>+			expected++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return expected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bpf_iter_tcp_established_batch(struct seq_file *seq,</div><div class='add'>+						   struct sock **start_sk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='add'>+	unsigned int expected = 1;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sock_hold(*start_sk);</div><div class='add'>+	iter-&gt;batch[iter-&gt;end_sk++].sk = *start_sk;</div><div class='add'>+</div><div class='add'>+	sk = sk_nulls_next(*start_sk);</div><div class='add'>+	*start_sk = NULL;</div><div class='add'>+	sk_nulls_for_each_from(sk, node) {</div><div class='add'>+		if (seq_sk_match(seq, sk)) {</div><div class='add'>+			if (iter-&gt;end_sk &lt; iter-&gt;max_sk) {</div><div class='add'>+				sock_hold(sk);</div><div class='add'>+				iter-&gt;batch[iter-&gt;end_sk++].sk = sk;</div><div class='add'>+			} else if (!*start_sk) {</div><div class='add'>+				/* Remember where we left off. */</div><div class='add'>+				*start_sk = sk;</div><div class='add'>+			}</div><div class='add'>+			expected++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return expected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bpf_iter_fill_batch(struct seq_file *seq,</div><div class='add'>+					struct sock **start_sk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;state == TCP_SEQ_STATE_LISTENING)</div><div class='add'>+		return bpf_iter_tcp_listening_batch(seq, start_sk);</div><div class='add'>+	else</div><div class='add'>+		return bpf_iter_tcp_established_batch(seq, start_sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_tcp_unlock_bucket(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct inet_hashinfo *hinfo = seq_file_net(seq)-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+</div><div class='add'>+	if (st-&gt;state == TCP_SEQ_STATE_LISTENING)</div><div class='add'>+		spin_unlock(&amp;hinfo-&gt;lhash2[st-&gt;bucket].lock);</div><div class='add'>+	else</div><div class='add'>+		spin_unlock_bh(inet_ehash_lockp(hinfo, st-&gt;bucket));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_tcp_batch(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	unsigned int expected;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sk = bpf_iter_tcp_resume(seq);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL; /* Done */</div><div class='add'>+</div><div class='add'>+	expected = bpf_iter_fill_batch(seq, &amp;sk);</div><div class='add'>+	if (likely(iter-&gt;end_sk == expected))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Batch size was too small. */</div><div class='add'>+	bpf_iter_tcp_unlock_bucket(seq);</div><div class='add'>+	bpf_iter_tcp_put_batch(iter);</div><div class='add'>+	err = bpf_iter_tcp_realloc_batch(iter, expected * 3 / 2,</div><div class='add'>+					 GFP_USER);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	sk = bpf_iter_tcp_resume(seq);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return NULL; /* Done */</div><div class='add'>+</div><div class='add'>+	expected = bpf_iter_fill_batch(seq, &amp;sk);</div><div class='add'>+	if (likely(iter-&gt;end_sk == expected))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Batch size was still too small. Hold onto the lock while we try</div><div class='add'>+	 * again with a larger batch to make sure the current bucket's size</div><div class='add'>+	 * does not change in the meantime.</div><div class='add'>+	 */</div><div class='add'>+	err = bpf_iter_tcp_realloc_batch(iter, expected, GFP_NOWAIT);</div><div class='add'>+	if (err) {</div><div class='add'>+		bpf_iter_tcp_unlock_bucket(seq);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expected = bpf_iter_fill_batch(seq, &amp;sk);</div><div class='add'>+	WARN_ON_ONCE(iter-&gt;end_sk != expected);</div><div class='add'>+done:</div><div class='add'>+	bpf_iter_tcp_unlock_bucket(seq);</div><div class='add'>+	return iter-&gt;batch[0].sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_iter_tcp_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	/* bpf iter does not support lseek, so it always</div><div class='add'>+	 * continue from where it was stop()-ped.</div><div class='add'>+	 */</div><div class='add'>+	if (*pos)</div><div class='add'>+		return bpf_iter_tcp_batch(seq);</div><div class='add'>+</div><div class='add'>+	return SEQ_START_TOKEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_iter_tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct tcp_iter_state *st = &amp;iter-&gt;state;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	/* Whenever seq_next() is called, the iter-&gt;cur_sk is</div><div class='add'>+	 * done with seq_show(), so advance to the next sk in</div><div class='add'>+	 * the batch.</div><div class='add'>+	 */</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk) {</div><div class='add'>+		/* Keeping st-&gt;num consistent in tcp_iter_state.</div><div class='add'>+		 * bpf_iter_tcp does not use st-&gt;num.</div><div class='add'>+		 * meta.seq_num is used instead.</div><div class='add'>+		 */</div><div class='add'>+		st-&gt;num++;</div><div class='add'>+		sock_gen_put(iter-&gt;batch[iter-&gt;cur_sk++].sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk)</div><div class='add'>+		sk = iter-&gt;batch[iter-&gt;cur_sk].sk;</div><div class='add'>+	else</div><div class='add'>+		sk = bpf_iter_tcp_batch(seq);</div><div class='add'>+</div><div class='add'>+	++*pos;</div><div class='add'>+	/* Keeping st-&gt;last_pos consistent in tcp_iter_state.</div><div class='add'>+	 * bpf iter does not do lseek, so st-&gt;last_pos always equals to *pos.</div><div class='add'>+	 */</div><div class='add'>+	st-&gt;last_pos = *pos;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_iter_tcp_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct sock *sk = v;</div><div class='add'>+	uid_t uid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (v == SEQ_START_TOKEN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sk_fullsock(sk))</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk_unhashed(sk))) {</div><div class='add'>+		ret = SEQ_SKIP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+		uid = 0;</div><div class='add'>+	} else if (sk-&gt;sk_state == TCP_NEW_SYN_RECV) {</div><div class='add'>+		const struct request_sock *req = v;</div><div class='add'>+</div><div class='add'>+		uid = from_kuid_munged(seq_user_ns(seq),</div><div class='add'>+				       sk_uid(req-&gt;rsk_listener));</div><div class='add'>+	} else {</div><div class='add'>+		uid = from_kuid_munged(seq_user_ns(seq), sk_uid(sk));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, false);</div><div class='add'>+	ret = tcp_prog_seq_show(prog, &amp;meta, v, uid);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	if (sk_fullsock(sk))</div><div class='add'>+		release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_tcp_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	if (!v) {</div><div class='add'>+		meta.seq = seq;</div><div class='add'>+		prog = bpf_iter_get_info(&amp;meta, true);</div><div class='add'>+		if (prog)</div><div class='add'>+			(void)tcp_prog_seq_show(prog, &amp;meta, v, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk)</div><div class='add'>+		bpf_iter_tcp_put_batch(iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations bpf_iter_tcp_seq_ops = {</div><div class='add'>+	.show		= bpf_iter_tcp_seq_show,</div><div class='add'>+	.start		= bpf_iter_tcp_seq_start,</div><div class='add'>+	.next		= bpf_iter_tcp_seq_next,</div><div class='add'>+	.stop		= bpf_iter_tcp_seq_stop,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+static unsigned short seq_file_family(const struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	const struct tcp_seq_afinfo *afinfo;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	/* Iterated from bpf_iter.  Let the bpf prog to filter instead. */</div><div class='add'>+	if (seq-&gt;op == &amp;bpf_iter_tcp_seq_ops)</div><div class='add'>+		return AF_UNSPEC;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Iterated from proc fs */</div><div class='add'>+	afinfo = pde_data(file_inode(seq-&gt;file));</div><div class='add'>+	return afinfo-&gt;family;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct seq_operations tcp4_seq_ops = {</div><div class='ctx'> 	.show		= tcp4_seq_show,</div><div class='ctx'> 	.start		= tcp_seq_start,</div><div class='hunk'>@@ -2444,6 +3418,20 @@ void tcp4_proc_exit(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='add'>+/* @wake is one when sk_stream_write_space() calls us.</div><div class='add'>+ * This sends EPOLLOUT only if notsent_bytes is half the limit.</div><div class='add'>+ * This mimics the strategy used in sock_def_write_space().</div><div class='add'>+ */</div><div class='add'>+bool tcp_stream_memory_free(const struct sock *sk, int wake)</div><div class='add'>+{</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 notsent_bytes = READ_ONCE(tp-&gt;write_seq) -</div><div class='add'>+			    READ_ONCE(tp-&gt;snd_nxt);</div><div class='add'>+</div><div class='add'>+	return (notsent_bytes &lt;&lt; wake) &lt; tcp_notsent_lowat(tp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_stream_memory_free);</div><div class='add'>+</div><div class='ctx'> struct proto tcp_prot = {</div><div class='ctx'> 	.name			= "TCP",</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='hunk'>@@ -2458,21 +3446,28 @@ struct proto tcp_prot = {</div><div class='ctx'> 	.shutdown		= tcp_shutdown,</div><div class='ctx'> 	.setsockopt		= tcp_setsockopt,</div><div class='ctx'> 	.getsockopt		= tcp_getsockopt,</div><div class='add'>+	.bpf_bypass_getsockopt	= tcp_bpf_bypass_getsockopt,</div><div class='ctx'> 	.keepalive		= tcp_set_keepalive,</div><div class='ctx'> 	.recvmsg		= tcp_recvmsg,</div><div class='ctx'> 	.sendmsg		= tcp_sendmsg,</div><div class='del'>-	.sendpage		= tcp_sendpage,</div><div class='add'>+	.splice_eof		= tcp_splice_eof,</div><div class='ctx'> 	.backlog_rcv		= tcp_v4_do_rcv,</div><div class='ctx'> 	.release_cb		= tcp_release_cb,</div><div class='ctx'> 	.hash			= inet_hash,</div><div class='ctx'> 	.unhash			= inet_unhash,</div><div class='ctx'> 	.get_port		= inet_csk_get_port,</div><div class='add'>+	.put_port		= inet_put_port,</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	.psock_update_sk_prot	= tcp_bpf_update_proto,</div><div class='add'>+#endif</div><div class='ctx'> 	.enter_memory_pressure	= tcp_enter_memory_pressure,</div><div class='ctx'> 	.leave_memory_pressure	= tcp_leave_memory_pressure,</div><div class='ctx'> 	.stream_memory_free	= tcp_stream_memory_free,</div><div class='ctx'> 	.sockets_allocated	= &amp;tcp_sockets_allocated,</div><div class='del'>-	.orphan_count		= &amp;tcp_orphan_count,</div><div class='del'>-	.memory_allocated	= &amp;tcp_memory_allocated,</div><div class='add'>+</div><div class='add'>+	.memory_allocated	= &amp;net_aligned_data.tcp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc	= &amp;tcp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.memory_pressure	= &amp;tcp_memory_pressure,</div><div class='ctx'> 	.sysctl_mem		= sysctl_tcp_mem,</div><div class='ctx'> 	.sysctl_wmem_offset	= offsetof(struct net, ipv4.sysctl_tcp_wmem),</div><div class='hunk'>@@ -2482,58 +3477,61 @@ struct proto tcp_prot = {</div><div class='ctx'> 	.slab_flags		= SLAB_TYPESAFE_BY_RCU,</div><div class='ctx'> 	.twsk_prot		= &amp;tcp_timewait_sock_ops,</div><div class='ctx'> 	.rsk_prot		= &amp;tcp_request_sock_ops,</div><div class='del'>-	.h.hashinfo		= &amp;tcp_hashinfo,</div><div class='add'>+	.h.hashinfo		= NULL,</div><div class='ctx'> 	.no_autobind		= true,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt	= compat_tcp_setsockopt,</div><div class='del'>-	.compat_getsockopt	= compat_tcp_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> 	.diag_destroy		= tcp_abort,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(tcp_prot);</div><div class='ctx'> </div><div class='ctx'> static void __net_exit tcp_sk_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	module_put(net-&gt;ipv4.tcp_congestion_control-&gt;owner);</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		inet_ctl_sock_destroy(*per_cpu_ptr(net-&gt;ipv4.tcp_sk, cpu));</div><div class='del'>-	free_percpu(net-&gt;ipv4.tcp_sk);</div><div class='add'>+	if (net-&gt;ipv4.tcp_congestion_control)</div><div class='add'>+		bpf_module_put(net-&gt;ipv4.tcp_congestion_control,</div><div class='add'>+			       net-&gt;ipv4.tcp_congestion_control-&gt;owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init tcp_sk_init(struct net *net)</div><div class='add'>+static void __net_init tcp_set_hashinfo(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int res, cpu, cnt;</div><div class='add'>+	struct inet_hashinfo *hinfo;</div><div class='add'>+	unsigned int ehash_entries;</div><div class='add'>+	struct net *old_net;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.tcp_sk = alloc_percpu(struct sock *);</div><div class='del'>-	if (!net-&gt;ipv4.tcp_sk)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (net_eq(net, &amp;init_net))</div><div class='add'>+		goto fallback;</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct sock *sk;</div><div class='add'>+	old_net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	ehash_entries = READ_ONCE(old_net-&gt;ipv4.sysctl_tcp_child_ehash_entries);</div><div class='add'>+	if (!ehash_entries)</div><div class='add'>+		goto fallback;</div><div class='ctx'> </div><div class='del'>-		res = inet_ctl_sock_create(&amp;sk, PF_INET, SOCK_RAW,</div><div class='del'>-					   IPPROTO_TCP, net);</div><div class='del'>-		if (res)</div><div class='del'>-			goto fail;</div><div class='del'>-		sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);</div><div class='del'>-</div><div class='del'>-		/* Please enforce IP_DF and IPID==0 for RST and</div><div class='del'>-		 * ACK sent in SYN-RECV and TIME-WAIT state.</div><div class='del'>-		 */</div><div class='del'>-		inet_sk(sk)-&gt;pmtudisc = IP_PMTUDISC_DO;</div><div class='del'>-</div><div class='del'>-		*per_cpu_ptr(net-&gt;ipv4.tcp_sk, cpu) = sk;</div><div class='add'>+	ehash_entries = roundup_pow_of_two(ehash_entries);</div><div class='add'>+	hinfo = inet_pernet_hashinfo_alloc(&amp;tcp_hashinfo, ehash_entries);</div><div class='add'>+	if (!hinfo) {</div><div class='add'>+		pr_warn("Failed to allocate TCP ehash (entries: %u) "</div><div class='add'>+			"for a netns, fallback to the global one\n",</div><div class='add'>+			ehash_entries);</div><div class='add'>+fallback:</div><div class='add'>+		hinfo = &amp;tcp_hashinfo;</div><div class='add'>+		ehash_entries = tcp_hashinfo.ehash_mask + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.sysctl_tcp_ecn = 2;</div><div class='add'>+	net-&gt;ipv4.tcp_death_row.hashinfo = hinfo;</div><div class='add'>+	net-&gt;ipv4.tcp_death_row.sysctl_max_tw_buckets = ehash_entries / 2;</div><div class='add'>+	net-&gt;ipv4.sysctl_max_syn_backlog = max(128U, ehash_entries / 128);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init tcp_sk_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_ecn = TCP_ECN_IN_ECN_OUT_NOECN;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_ecn_option = TCP_ACCECN_OPTION_FULL;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_ecn_option_beacon = TCP_ACCECN_OPTION_BEACON;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_ecn_fallback = 1;</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_base_mss = TCP_BASE_MSS;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_min_snd_mss = TCP_MIN_SND_MSS;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_probe_threshold = TCP_PROBE_THRESHOLD;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_probe_interval = TCP_PROBE_INTERVAL;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_mtu_probe_floor = TCP_MIN_SND_MSS;</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_keepalive_time = TCP_KEEPALIVE_TIME;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_keepalive_probes = TCP_KEEPALIVE_PROBES;</div><div class='hunk'>@@ -2549,12 +3547,12 @@ static int __net_init tcp_sk_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_tw_reuse = 2;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_tw_reuse_delay = 1 * MSEC_PER_SEC;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_no_ssthresh_metrics_save = 1;</div><div class='ctx'> </div><div class='del'>-	cnt = tcp_hashinfo.ehash_mask + 1;</div><div class='del'>-	net-&gt;ipv4.tcp_death_row.sysctl_max_tw_buckets = (cnt + 1) / 2;</div><div class='del'>-	net-&gt;ipv4.tcp_death_row.hashinfo = &amp;tcp_hashinfo;</div><div class='add'>+	refcount_set(&amp;net-&gt;ipv4.tcp_death_row.tw_refcount, 1);</div><div class='add'>+	tcp_set_hashinfo(net);</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv4.sysctl_max_syn_backlog = max(128, cnt / 256);</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_sack = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_window_scaling = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_timestamps = 1;</div><div class='hunk'>@@ -2568,16 +3566,20 @@ static int __net_init tcp_sk_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_adv_win_scale = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_frto = 2;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_moderate_rcvbuf = 1;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_rcvbuf_low_rtt = USEC_PER_MSEC;</div><div class='ctx'> 	/* This limits the percentage of the congestion window which we</div><div class='ctx'> 	 * will allow a single TSO frame to consume.  Building TSO frames</div><div class='ctx'> 	 * which are too large can cause TCP streams to be bursty.</div><div class='ctx'> 	 */</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_tso_win_divisor = 3;</div><div class='del'>-	/* Default TSQ limit of four TSO segments */</div><div class='del'>-	net-&gt;ipv4.sysctl_tcp_limit_output_bytes = 262144;</div><div class='del'>-	/* rfc5961 challenge ack rate limiting */</div><div class='del'>-	net-&gt;ipv4.sysctl_tcp_challenge_ack_limit = 1000;</div><div class='add'>+	/* Default TSQ limit of 4 MB */</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_limit_output_bytes = 4 &lt;&lt; 20;</div><div class='add'>+</div><div class='add'>+	/* rfc5961 challenge ack rate limiting, per net-ns, disabled by default. */</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_challenge_ack_limit = INT_MAX;</div><div class='add'>+</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_min_tso_segs = 2;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_tso_rtt_log = 9;  /* 2^9 = 512 usec */</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_min_rtt_wlen = 300;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_autocorking = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_invalid_ratelimit = HZ/2;</div><div class='hunk'>@@ -2592,34 +3594,63 @@ static int __net_init tcp_sk_init(struct net *net)</div><div class='ctx'> 		       sizeof(init_net.ipv4.sysctl_tcp_wmem));</div><div class='ctx'> 	}</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_comp_sack_delay_ns = NSEC_PER_MSEC;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_comp_sack_slack_ns = 10 * NSEC_PER_USEC;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_comp_sack_nr = 44;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_comp_sack_rtt_percent = 33;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_backlog_ack_defer = 1;</div><div class='ctx'> 	net-&gt;ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;</div><div class='del'>-	spin_lock_init(&amp;net-&gt;ipv4.tcp_fastopen_ctx_lock);</div><div class='del'>-	net-&gt;ipv4.sysctl_tcp_fastopen_blackhole_timeout = 60 * 60;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_fastopen_blackhole_timeout = 0;</div><div class='ctx'> 	atomic_set(&amp;net-&gt;ipv4.tfo_active_disable_times, 0);</div><div class='ctx'> </div><div class='add'>+	/* Set default values for PLB */</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_plb_enabled = 0; /* Disabled by default */</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_plb_idle_rehash_rounds = 3;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_plb_rehash_rounds = 12;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_plb_suspend_rto_sec = 60;</div><div class='add'>+	/* Default congestion threshold for PLB to mark a round is 50% */</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_plb_cong_thresh = (1 &lt;&lt; TCP_PLB_SCALE) / 2;</div><div class='add'>+</div><div class='ctx'> 	/* Reno is always built in */</div><div class='ctx'> 	if (!net_eq(net, &amp;init_net) &amp;&amp;</div><div class='del'>-	    try_module_get(init_net.ipv4.tcp_congestion_control-&gt;owner))</div><div class='add'>+	    bpf_try_module_get(init_net.ipv4.tcp_congestion_control,</div><div class='add'>+			       init_net.ipv4.tcp_congestion_control-&gt;owner))</div><div class='ctx'> 		net-&gt;ipv4.tcp_congestion_control = init_net.ipv4.tcp_congestion_control;</div><div class='ctx'> 	else</div><div class='ctx'> 		net-&gt;ipv4.tcp_congestion_control = &amp;tcp_reno;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-fail:</div><div class='del'>-	tcp_sk_exit(net);</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_syn_linear_timeouts = 4;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_shrink_window = 0;</div><div class='ctx'> </div><div class='del'>-	return res;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_pingpong_thresh = 1;</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_rto_min_us = jiffies_to_usecs(TCP_RTO_MIN);</div><div class='add'>+	net-&gt;ipv4.sysctl_tcp_rto_max_ms = TCP_RTO_MAX_SEC * MSEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit tcp_sk_exit_batch(struct list_head *net_exit_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> </div><div class='del'>-	inet_twsk_purge(&amp;tcp_hashinfo, AF_INET);</div><div class='add'>+	/* make sure concurrent calls to tcp_sk_exit_batch from net_cleanup_work</div><div class='add'>+	 * and failed setup_net error unwinding path are serialized.</div><div class='add'>+	 *</div><div class='add'>+	 * tcp_twsk_purge() handles twsk in any dead netns, not just those in</div><div class='add'>+	 * net_exit_list, the thread that dismantles a particular twsk must</div><div class='add'>+	 * do so without other thread progressing to refcount_dec_and_test() of</div><div class='add'>+	 * tcp_death_row.tw_refcount.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;tcp_exit_batch_mutex);</div><div class='add'>+</div><div class='add'>+	tcp_twsk_purge(net_exit_list);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(net, net_exit_list, exit_list)</div><div class='add'>+	list_for_each_entry(net, net_exit_list, exit_list) {</div><div class='add'>+		inet_pernet_hashinfo_free(net-&gt;ipv4.tcp_death_row.hashinfo);</div><div class='add'>+		WARN_ON_ONCE(!refcount_dec_and_test(&amp;net-&gt;ipv4.tcp_death_row.tw_refcount));</div><div class='ctx'> 		tcp_fastopen_ctx_destroy(net);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;tcp_exit_batch_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations __net_initdata tcp_sk_ops = {</div><div class='hunk'>@@ -2628,8 +3659,105 @@ static struct pernet_operations __net_initdata tcp_sk_ops = {</div><div class='ctx'>        .exit_batch = tcp_sk_exit_batch,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+DEFINE_BPF_ITER_FUNC(tcp, struct bpf_iter_meta *meta,</div><div class='add'>+		     struct sock_common *sk_common, uid_t uid)</div><div class='add'>+</div><div class='add'>+#define INIT_BATCH_SZ 16</div><div class='add'>+</div><div class='add'>+static int bpf_iter_init_tcp(void *priv_data, struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = priv_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_iter_init_seq_net(priv_data, aux);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bpf_iter_tcp_realloc_batch(iter, INIT_BATCH_SZ, GFP_USER);</div><div class='add'>+	if (err) {</div><div class='add'>+		bpf_iter_fini_seq_net(priv_data);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_fini_tcp(void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct bpf_tcp_iter_state *iter = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_iter_fini_seq_net(priv_data);</div><div class='add'>+	kvfree(iter-&gt;batch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info tcp_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;bpf_iter_tcp_seq_ops,</div><div class='add'>+	.init_seq_private	= bpf_iter_init_tcp,</div><div class='add'>+	.fini_seq_private	= bpf_iter_fini_tcp,</div><div class='add'>+	.seq_priv_size		= sizeof(struct bpf_tcp_iter_state),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bpf_func_proto *</div><div class='add'>+bpf_iter_tcp_get_func_proto(enum bpf_func_id func_id,</div><div class='add'>+			    const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	switch (func_id) {</div><div class='add'>+	case BPF_FUNC_setsockopt:</div><div class='add'>+		return &amp;bpf_sk_setsockopt_proto;</div><div class='add'>+	case BPF_FUNC_getsockopt:</div><div class='add'>+		return &amp;bpf_sk_getsockopt_proto;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_iter_reg tcp_reg_info = {</div><div class='add'>+	.target			= "tcp",</div><div class='add'>+	.ctx_arg_info_size	= 1,</div><div class='add'>+	.ctx_arg_info		= {</div><div class='add'>+		{ offsetof(struct bpf_iter__tcp, sk_common),</div><div class='add'>+		  PTR_TO_BTF_ID_OR_NULL | PTR_TRUSTED },</div><div class='add'>+	},</div><div class='add'>+	.get_func_proto		= bpf_iter_tcp_get_func_proto,</div><div class='add'>+	.seq_info		= &amp;tcp_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init bpf_iter_register(void)</div><div class='add'>+{</div><div class='add'>+	tcp_reg_info.ctx_arg_info[0].btf_id = btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON];</div><div class='add'>+	if (bpf_iter_reg_target(&amp;tcp_reg_info))</div><div class='add'>+		pr_warn("Warning: could not register bpf iterator tcp\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init tcp_v4_init(void)</div><div class='ctx'> {</div><div class='add'>+	int cpu, res;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct sock *sk;</div><div class='add'>+</div><div class='add'>+		res = inet_ctl_sock_create(&amp;sk, PF_INET, SOCK_RAW,</div><div class='add'>+					   IPPROTO_TCP, &amp;init_net);</div><div class='add'>+		if (res)</div><div class='add'>+			panic("Failed to create the TCP control socket.\n");</div><div class='add'>+		sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);</div><div class='add'>+</div><div class='add'>+		/* Please enforce IP_DF and IPID==0 for RST and</div><div class='add'>+		 * ACK sent in SYN-RECV and TIME-WAIT state.</div><div class='add'>+		 */</div><div class='add'>+		inet_sk(sk)-&gt;pmtudisc = IP_PMTUDISC_DO;</div><div class='add'>+</div><div class='add'>+		sk-&gt;sk_clockid = CLOCK_MONOTONIC;</div><div class='add'>+</div><div class='add'>+		per_cpu(ipv4_tcp_sk.sock, cpu) = sk;</div><div class='add'>+	}</div><div class='ctx'> 	if (register_pernet_subsys(&amp;tcp_sk_ops))</div><div class='ctx'> 		panic("Failed to create the TCP control socket.\n");</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+	bpf_iter_register();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c<br/>index ae10ed64fe13..976b56644a8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_lp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_lp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_lp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_lp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP Low Priority (TCP-LP)</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,9 +23,9 @@</div><div class='ctx'>  * Original Author:</div><div class='ctx'>  *   Aleksandar Kuzmanovic &lt;akuzma@northwestern.edu&gt;</div><div class='ctx'>  * Available from:</div><div class='del'>- *   http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf</div><div class='add'>+ *   https://users.cs.northwestern.edu/~akuzma/doc/TCP-LP-ToN.pdf</div><div class='ctx'>  * Original implementation for 2.4.19:</div><div class='del'>- *   http://www-ece.rice.edu/networks/TCP-LP/</div><div class='add'>+ *   https://users.cs.northwestern.edu/~akuzma/rice/TCP-LP/linux/tcp-lp-linux.htm</div><div class='ctx'>  *</div><div class='ctx'>  * 2.6.x module Authors:</div><div class='ctx'>  *   Wong Hoi Sing, Edison &lt;hswong3i@gmail.com&gt;</div><div class='hunk'>@@ -62,7 +63,7 @@ enum tcp_lp_state {</div><div class='ctx'>  * @sowd: smoothed OWD &lt;&lt; 3</div><div class='ctx'>  * @owd_min: min OWD</div><div class='ctx'>  * @owd_max: max OWD</div><div class='del'>- * @owd_max_rsv: resrved max owd</div><div class='add'>+ * @owd_max_rsv: reserved max owd</div><div class='ctx'>  * @remote_hz: estimated remote HZ</div><div class='ctx'>  * @remote_ref_time: remote reference time</div><div class='ctx'>  * @local_ref_time: local reference time</div><div class='hunk'>@@ -88,6 +89,7 @@ struct lp {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_init</div><div class='add'>+ * @sk: socket to initialize congestion control algorithm for</div><div class='ctx'>  *</div><div class='ctx'>  * Init all required variables.</div><div class='ctx'>  * Clone the handling from Vegas module implementation.</div><div class='hunk'>@@ -110,6 +112,9 @@ static void tcp_lp_init(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_cong_avoid</div><div class='add'>+ * @sk: socket to avoid congesting</div><div class='add'>+ * @ack: current ack sequence number</div><div class='add'>+ * @acked: number of ACKed packets</div><div class='ctx'>  *</div><div class='ctx'>  * Implementation of cong_avoid.</div><div class='ctx'>  * Will only call newReno CA when away from inference.</div><div class='hunk'>@@ -125,6 +130,7 @@ static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_remote_hz_estimator</div><div class='add'>+ * @sk: socket which needs an estimate for the remote HZs</div><div class='ctx'>  *</div><div class='ctx'>  * Estimate remote HZ.</div><div class='ctx'>  * We keep on updating the estimated value, where original TCP-LP</div><div class='hunk'>@@ -175,6 +181,7 @@ static u32 tcp_lp_remote_hz_estimator(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_owd_calculator</div><div class='add'>+ * @sk: socket to calculate one way delay for</div><div class='ctx'>  *</div><div class='ctx'>  * Calculate one way delay (in relative format).</div><div class='ctx'>  * Original implement OWD as minus of remote time difference to local time</div><div class='hunk'>@@ -209,6 +216,8 @@ static u32 tcp_lp_owd_calculator(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_rtt_sample</div><div class='add'>+ * @sk: socket to add a rtt sample to</div><div class='add'>+ * @rtt: round trip time, which is ignored!</div><div class='ctx'>  *</div><div class='ctx'>  * Implementation or rtt_sample.</div><div class='ctx'>  * Will take the following action,</div><div class='hunk'>@@ -253,6 +262,8 @@ static void tcp_lp_rtt_sample(struct sock *sk, u32 rtt)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tcp_lp_pkts_acked</div><div class='add'>+ * @sk: socket requiring congestion avoidance calculations</div><div class='add'>+ * @sample: ACK sample containing timing and rate information</div><div class='ctx'>  *</div><div class='ctx'>  * Implementation of pkts_acked.</div><div class='ctx'>  * Deal with active drop under Early Congestion Indication.</div><div class='hunk'>@@ -264,7 +275,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct lp *lp = inet_csk_ca(sk);</div><div class='del'>-	u32 now = tcp_time_stamp(tp);</div><div class='add'>+	u32 now = tcp_time_stamp_ts(tp);</div><div class='ctx'> 	u32 delta;</div><div class='ctx'> </div><div class='ctx'> 	if (sample-&gt;rtt_us &gt; 0)</div><div class='hunk'>@@ -289,7 +300,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 		lp-&gt;flag &amp;= ~LP_WITHIN_THR;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("TCP-LP: %05o|%5u|%5u|%15u|%15u|%15u\n", lp-&gt;flag,</div><div class='del'>-		 tp-&gt;snd_cwnd, lp-&gt;remote_hz, lp-&gt;owd_min, lp-&gt;owd_max,</div><div class='add'>+		 tcp_snd_cwnd(tp), lp-&gt;remote_hz, lp-&gt;owd_min, lp-&gt;owd_max,</div><div class='ctx'> 		 lp-&gt;sowd &gt;&gt; 3);</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;flag &amp; LP_WITHIN_THR)</div><div class='hunk'>@@ -297,7 +308,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: try to reset owd_min and owd_max here</div><div class='ctx'> 	 * so decrease the chance the min/max is no longer suitable</div><div class='del'>-	 * and will usually within threshold when whithin inference */</div><div class='add'>+	 * and will usually within threshold when within inference */</div><div class='ctx'> 	lp-&gt;owd_min = lp-&gt;sowd &gt;&gt; 3;</div><div class='ctx'> 	lp-&gt;owd_max = lp-&gt;sowd &gt;&gt; 2;</div><div class='ctx'> 	lp-&gt;owd_max_rsv = lp-&gt;sowd &gt;&gt; 2;</div><div class='hunk'>@@ -305,12 +316,12 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 	/* happened within inference</div><div class='ctx'> 	 * drop snd_cwnd into 1 */</div><div class='ctx'> 	if (lp-&gt;flag &amp; LP_WITHIN_INF)</div><div class='del'>-		tp-&gt;snd_cwnd = 1U;</div><div class='add'>+		tcp_snd_cwnd_set(tp, 1U);</div><div class='ctx'> </div><div class='ctx'> 	/* happened after inference</div><div class='ctx'> 	 * cut snd_cwnd into half */</div><div class='ctx'> 	else</div><div class='del'>-		tp-&gt;snd_cwnd = max(tp-&gt;snd_cwnd &gt;&gt; 1U, 1U);</div><div class='add'>+		tcp_snd_cwnd_set(tp, max(tcp_snd_cwnd(tp) &gt;&gt; 1U, 1U));</div><div class='ctx'> </div><div class='ctx'> 	/* record this drop time */</div><div class='ctx'> 	lp-&gt;last_drop = now;</div><div class='head'>diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c<br/>index 03b51cdcc731..45b6ecd16412 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_metrics.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_metrics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_metrics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_metrics.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct tcp_fastopen_metrics {</div><div class='ctx'> </div><div class='ctx'> struct tcp_metrics_block {</div><div class='ctx'> 	struct tcp_metrics_block __rcu	*tcpm_next;</div><div class='del'>-	possible_net_t			tcpm_net;</div><div class='add'>+	struct net			*tcpm_net;</div><div class='ctx'> 	struct inetpeer_addr		tcpm_saddr;</div><div class='ctx'> 	struct inetpeer_addr		tcpm_daddr;</div><div class='ctx'> 	unsigned long			tcpm_stamp;</div><div class='hunk'>@@ -51,34 +51,38 @@ struct tcp_metrics_block {</div><div class='ctx'> 	struct rcu_head			rcu_head;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct net *tm_net(struct tcp_metrics_block *tm)</div><div class='add'>+static inline struct net *tm_net(const struct tcp_metrics_block *tm)</div><div class='ctx'> {</div><div class='del'>-	return read_pnet(&amp;tm-&gt;tcpm_net);</div><div class='add'>+	/* Paired with the WRITE_ONCE() in tcpm_new() */</div><div class='add'>+	return READ_ONCE(tm-&gt;tcpm_net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool tcp_metric_locked(struct tcp_metrics_block *tm,</div><div class='ctx'> 			      enum tcp_metric_index idx)</div><div class='ctx'> {</div><div class='del'>-	return tm-&gt;tcpm_lock &amp; (1 &lt;&lt; idx);</div><div class='add'>+	/* Paired with WRITE_ONCE() in tcpm_suck_dst() */</div><div class='add'>+	return READ_ONCE(tm-&gt;tcpm_lock) &amp; (1 &lt;&lt; idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 tcp_metric_get(struct tcp_metrics_block *tm,</div><div class='add'>+static u32 tcp_metric_get(const struct tcp_metrics_block *tm,</div><div class='ctx'> 			  enum tcp_metric_index idx)</div><div class='ctx'> {</div><div class='del'>-	return tm-&gt;tcpm_vals[idx];</div><div class='add'>+	/* Paired with WRITE_ONCE() in tcp_metric_set() */</div><div class='add'>+	return READ_ONCE(tm-&gt;tcpm_vals[idx]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_metric_set(struct tcp_metrics_block *tm,</div><div class='ctx'> 			   enum tcp_metric_index idx,</div><div class='ctx'> 			   u32 val)</div><div class='ctx'> {</div><div class='del'>-	tm-&gt;tcpm_vals[idx] = val;</div><div class='add'>+	/* Paired with READ_ONCE() in tcp_metric_get() */</div><div class='add'>+	WRITE_ONCE(tm-&gt;tcpm_vals[idx], val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool addr_same(const struct inetpeer_addr *a,</div><div class='ctx'> 		      const struct inetpeer_addr *b)</div><div class='ctx'> {</div><div class='del'>-	return inetpeer_addr_cmp(a, b) == 0;</div><div class='add'>+	return (a-&gt;family == b-&gt;family) &amp;&amp; !inetpeer_addr_cmp(a, b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct tcpm_hash_bucket {</div><div class='hunk'>@@ -89,6 +93,7 @@ static struct tcpm_hash_bucket	*tcp_metrics_hash __read_mostly;</div><div class='ctx'> static unsigned int		tcp_metrics_hash_log __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(tcp_metrics_lock);</div><div class='add'>+static DEFINE_SEQLOCK(fastopen_seqlock);</div><div class='ctx'> </div><div class='ctx'> static void tcpm_suck_dst(struct tcp_metrics_block *tm,</div><div class='ctx'> 			  const struct dst_entry *dst,</div><div class='hunk'>@@ -97,7 +102,7 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm,</div><div class='ctx'> 	u32 msval;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	tm-&gt;tcpm_stamp = jiffies;</div><div class='add'>+	WRITE_ONCE(tm-&gt;tcpm_stamp, jiffies);</div><div class='ctx'> </div><div class='ctx'> 	val = 0;</div><div class='ctx'> 	if (dst_metric_locked(dst, RTAX_RTT))</div><div class='hunk'>@@ -110,30 +115,42 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm,</div><div class='ctx'> 		val |= 1 &lt;&lt; TCP_METRIC_CWND;</div><div class='ctx'> 	if (dst_metric_locked(dst, RTAX_REORDERING))</div><div class='ctx'> 		val |= 1 &lt;&lt; TCP_METRIC_REORDERING;</div><div class='del'>-	tm-&gt;tcpm_lock = val;</div><div class='add'>+	/* Paired with READ_ONCE() in tcp_metric_locked() */</div><div class='add'>+	WRITE_ONCE(tm-&gt;tcpm_lock, val);</div><div class='ctx'> </div><div class='ctx'> 	msval = dst_metric_raw(dst, RTAX_RTT);</div><div class='del'>-	tm-&gt;tcpm_vals[TCP_METRIC_RTT] = msval * USEC_PER_MSEC;</div><div class='add'>+	tcp_metric_set(tm, TCP_METRIC_RTT, msval * USEC_PER_MSEC);</div><div class='ctx'> </div><div class='ctx'> 	msval = dst_metric_raw(dst, RTAX_RTTVAR);</div><div class='del'>-	tm-&gt;tcpm_vals[TCP_METRIC_RTTVAR] = msval * USEC_PER_MSEC;</div><div class='del'>-	tm-&gt;tcpm_vals[TCP_METRIC_SSTHRESH] = dst_metric_raw(dst, RTAX_SSTHRESH);</div><div class='del'>-	tm-&gt;tcpm_vals[TCP_METRIC_CWND] = dst_metric_raw(dst, RTAX_CWND);</div><div class='del'>-	tm-&gt;tcpm_vals[TCP_METRIC_REORDERING] = dst_metric_raw(dst, RTAX_REORDERING);</div><div class='add'>+	tcp_metric_set(tm, TCP_METRIC_RTTVAR, msval * USEC_PER_MSEC);</div><div class='add'>+	tcp_metric_set(tm, TCP_METRIC_SSTHRESH,</div><div class='add'>+		       dst_metric_raw(dst, RTAX_SSTHRESH));</div><div class='add'>+	tcp_metric_set(tm, TCP_METRIC_CWND,</div><div class='add'>+		       dst_metric_raw(dst, RTAX_CWND));</div><div class='add'>+	tcp_metric_set(tm, TCP_METRIC_REORDERING,</div><div class='add'>+		       dst_metric_raw(dst, RTAX_REORDERING));</div><div class='ctx'> 	if (fastopen_clear) {</div><div class='add'>+		write_seqlock(&amp;fastopen_seqlock);</div><div class='ctx'> 		tm-&gt;tcpm_fastopen.mss = 0;</div><div class='ctx'> 		tm-&gt;tcpm_fastopen.syn_loss = 0;</div><div class='ctx'> 		tm-&gt;tcpm_fastopen.try_exp = 0;</div><div class='ctx'> 		tm-&gt;tcpm_fastopen.cookie.exp = false;</div><div class='ctx'> 		tm-&gt;tcpm_fastopen.cookie.len = 0;</div><div class='add'>+		write_sequnlock(&amp;fastopen_seqlock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define TCP_METRICS_TIMEOUT		(60 * 60 * HZ)</div><div class='ctx'> </div><div class='del'>-static void tcpm_check_stamp(struct tcp_metrics_block *tm, struct dst_entry *dst)</div><div class='add'>+static void tcpm_check_stamp(struct tcp_metrics_block *tm,</div><div class='add'>+			     const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	if (tm &amp;&amp; unlikely(time_after(jiffies, tm-&gt;tcpm_stamp + TCP_METRICS_TIMEOUT)))</div><div class='add'>+	unsigned long limit;</div><div class='add'>+</div><div class='add'>+	if (!tm)</div><div class='add'>+		return;</div><div class='add'>+	limit = READ_ONCE(tm-&gt;tcpm_stamp) + TCP_METRICS_TIMEOUT;</div><div class='add'>+	if (unlikely(time_after(jiffies, limit)))</div><div class='ctx'> 		tcpm_suck_dst(tm, dst, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,11 +166,11 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,</div><div class='ctx'> 					  unsigned int hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_metrics_block *tm;</div><div class='del'>-	struct net *net;</div><div class='ctx'> 	bool reclaim = false;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;tcp_metrics_lock);</div><div class='del'>-	net = dev_net(dst-&gt;dev);</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='ctx'> </div><div class='ctx'> 	/* While waiting for the spin-lock the cache might have been populated</div><div class='ctx'> 	 * with this entry and so we have to check again.</div><div class='hunk'>@@ -174,20 +191,23 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,</div><div class='ctx'> 		oldest = deref_locked(tcp_metrics_hash[hash].chain);</div><div class='ctx'> 		for (tm = deref_locked(oldest-&gt;tcpm_next); tm;</div><div class='ctx'> 		     tm = deref_locked(tm-&gt;tcpm_next)) {</div><div class='del'>-			if (time_before(tm-&gt;tcpm_stamp, oldest-&gt;tcpm_stamp))</div><div class='add'>+			if (time_before(READ_ONCE(tm-&gt;tcpm_stamp),</div><div class='add'>+					READ_ONCE(oldest-&gt;tcpm_stamp)))</div><div class='ctx'> 				oldest = tm;</div><div class='ctx'> 		}</div><div class='ctx'> 		tm = oldest;</div><div class='ctx'> 	} else {</div><div class='del'>-		tm = kmalloc(sizeof(*tm), GFP_ATOMIC);</div><div class='add'>+		tm = kzalloc(sizeof(*tm), GFP_ATOMIC);</div><div class='ctx'> 		if (!tm)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	write_pnet(&amp;tm-&gt;tcpm_net, net);</div><div class='add'>+	/* Paired with the READ_ONCE() in tm_net() */</div><div class='add'>+	WRITE_ONCE(tm-&gt;tcpm_net, net);</div><div class='add'>+</div><div class='ctx'> 	tm-&gt;tcpm_saddr = *saddr;</div><div class='ctx'> 	tm-&gt;tcpm_daddr = *daddr;</div><div class='ctx'> </div><div class='del'>-	tcpm_suck_dst(tm, dst, true);</div><div class='add'>+	tcpm_suck_dst(tm, dst, reclaim);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!reclaim)) {</div><div class='ctx'> 		tm-&gt;tcpm_next = tcp_metrics_hash[hash].chain;</div><div class='hunk'>@@ -253,7 +273,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	net = dev_net(dst-&gt;dev);</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='ctx'> 	hash ^= net_hash_mix(net);</div><div class='ctx'> 	hash = hash_32(hash, tcp_metrics_hash_log);</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +318,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,</div><div class='ctx'> 	else</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(dst-&gt;dev);</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='ctx'> 	hash ^= net_hash_mix(net);</div><div class='ctx'> 	hash = hash_32(hash, tcp_metrics_hash_log);</div><div class='ctx'> </div><div class='hunk'>@@ -329,7 +349,7 @@ void tcp_update_metrics(struct sock *sk)</div><div class='ctx'> 	int m;</div><div class='ctx'> </div><div class='ctx'> 	sk_dst_confirm(sk);</div><div class='del'>-	if (net-&gt;ipv4.sysctl_tcp_nometrics_save || !dst)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_nometrics_save) || !dst)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -385,27 +405,29 @@ void tcp_update_metrics(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_in_initial_slowstart(tp)) {</div><div class='ctx'> 		/* Slow start still did not finish. */</div><div class='del'>-		if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_no_ssthresh_metrics_save) &amp;&amp;</div><div class='add'>+		    !tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {</div><div class='ctx'> 			val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);</div><div class='del'>-			if (val &amp;&amp; (tp-&gt;snd_cwnd &gt;&gt; 1) &gt; val)</div><div class='add'>+			if (val &amp;&amp; (tcp_snd_cwnd(tp) &gt;&gt; 1) &gt; val)</div><div class='ctx'> 				tcp_metric_set(tm, TCP_METRIC_SSTHRESH,</div><div class='del'>-					       tp-&gt;snd_cwnd &gt;&gt; 1);</div><div class='add'>+					       tcp_snd_cwnd(tp) &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {</div><div class='ctx'> 			val = tcp_metric_get(tm, TCP_METRIC_CWND);</div><div class='del'>-			if (tp-&gt;snd_cwnd &gt; val)</div><div class='add'>+			if (tcp_snd_cwnd(tp) &gt; val)</div><div class='ctx'> 				tcp_metric_set(tm, TCP_METRIC_CWND,</div><div class='del'>-					       tp-&gt;snd_cwnd);</div><div class='add'>+					       tcp_snd_cwnd(tp));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (!tcp_in_slow_start(tp) &amp;&amp;</div><div class='ctx'> 		   icsk-&gt;icsk_ca_state == TCP_CA_Open) {</div><div class='ctx'> 		/* Cong. avoidance phase, cwnd is reliable. */</div><div class='del'>-		if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH))</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_no_ssthresh_metrics_save) &amp;&amp;</div><div class='add'>+		    !tcp_metric_locked(tm, TCP_METRIC_SSTHRESH))</div><div class='ctx'> 			tcp_metric_set(tm, TCP_METRIC_SSTHRESH,</div><div class='del'>-				       max(tp-&gt;snd_cwnd &gt;&gt; 1, tp-&gt;snd_ssthresh));</div><div class='add'>+				       max(tcp_snd_cwnd(tp) &gt;&gt; 1, tp-&gt;snd_ssthresh));</div><div class='ctx'> 		if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {</div><div class='ctx'> 			val = tcp_metric_get(tm, TCP_METRIC_CWND);</div><div class='del'>-			tcp_metric_set(tm, TCP_METRIC_CWND, (val + tp-&gt;snd_cwnd) &gt;&gt; 1);</div><div class='add'>+			tcp_metric_set(tm, TCP_METRIC_CWND, (val + tcp_snd_cwnd(tp)) &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Else slow start did not finish, cwnd is non-sense,</div><div class='hunk'>@@ -416,7 +438,8 @@ void tcp_update_metrics(struct sock *sk)</div><div class='ctx'> 			tcp_metric_set(tm, TCP_METRIC_CWND,</div><div class='ctx'> 				       (val + tp-&gt;snd_ssthresh) &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='del'>-		if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_no_ssthresh_metrics_save) &amp;&amp;</div><div class='add'>+		    !tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {</div><div class='ctx'> 			val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);</div><div class='ctx'> 			if (val &amp;&amp; tp-&gt;snd_ssthresh &gt; val)</div><div class='ctx'> 				tcp_metric_set(tm, TCP_METRIC_SSTHRESH,</div><div class='hunk'>@@ -425,12 +448,13 @@ void tcp_update_metrics(struct sock *sk)</div><div class='ctx'> 		if (!tcp_metric_locked(tm, TCP_METRIC_REORDERING)) {</div><div class='ctx'> 			val = tcp_metric_get(tm, TCP_METRIC_REORDERING);</div><div class='ctx'> 			if (val &lt; tp-&gt;reordering &amp;&amp;</div><div class='del'>-			    tp-&gt;reordering != net-&gt;ipv4.sysctl_tcp_reordering)</div><div class='add'>+			    tp-&gt;reordering !=</div><div class='add'>+			    READ_ONCE(net-&gt;ipv4.sysctl_tcp_reordering))</div><div class='ctx'> 				tcp_metric_set(tm, TCP_METRIC_REORDERING,</div><div class='ctx'> 					       tp-&gt;reordering);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	tm-&gt;tcpm_stamp = jiffies;</div><div class='add'>+	WRITE_ONCE(tm-&gt;tcpm_stamp, jiffies);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -441,15 +465,20 @@ void tcp_init_metrics(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = __sk_dst_get(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct tcp_metrics_block *tm;</div><div class='ctx'> 	u32 val, crtt = 0; /* cached RTT scaled by 8 */</div><div class='ctx'> </div><div class='ctx'> 	sk_dst_confirm(sk);</div><div class='add'>+	/* ssthresh may have been reduced unnecessarily during.</div><div class='add'>+	 * 3WHS. Restore it back to its initial default.</div><div class='add'>+	 */</div><div class='add'>+	tp-&gt;snd_ssthresh = TCP_INFINITE_SSTHRESH;</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		goto reset;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	tm = tcp_get_metrics(sk, dst, true);</div><div class='add'>+	tm = tcp_get_metrics(sk, dst, false);</div><div class='ctx'> 	if (!tm) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		goto reset;</div><div class='hunk'>@@ -458,16 +487,12 @@ void tcp_init_metrics(struct sock *sk)</div><div class='ctx'> 	if (tcp_metric_locked(tm, TCP_METRIC_CWND))</div><div class='ctx'> 		tp-&gt;snd_cwnd_clamp = tcp_metric_get(tm, TCP_METRIC_CWND);</div><div class='ctx'> </div><div class='del'>-	val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);</div><div class='add'>+	val = READ_ONCE(net-&gt;ipv4.sysctl_tcp_no_ssthresh_metrics_save) ?</div><div class='add'>+	      0 : tcp_metric_get(tm, TCP_METRIC_SSTHRESH);</div><div class='ctx'> 	if (val) {</div><div class='ctx'> 		tp-&gt;snd_ssthresh = val;</div><div class='ctx'> 		if (tp-&gt;snd_ssthresh &gt; tp-&gt;snd_cwnd_clamp)</div><div class='ctx'> 			tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd_clamp;</div><div class='del'>-	} else {</div><div class='del'>-		/* ssthresh may have been reduced unnecessarily during.</div><div class='del'>-		 * 3WHS. Restore it back to its initial default.</div><div class='del'>-		 */</div><div class='del'>-		tp-&gt;snd_ssthresh = TCP_INFINITE_SSTHRESH;</div><div class='ctx'> 	}</div><div class='ctx'> 	val = tcp_metric_get(tm, TCP_METRIC_REORDERING);</div><div class='ctx'> 	if (val &amp;&amp; tp-&gt;reordering != val)</div><div class='hunk'>@@ -512,16 +537,6 @@ reset:</div><div class='ctx'> </div><div class='ctx'> 		inet_csk(sk)-&gt;icsk_rto = TCP_TIMEOUT_FALLBACK;</div><div class='ctx'> 	}</div><div class='del'>-	/* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been</div><div class='del'>-	 * retransmitted. In light of RFC6298 more aggressive 1sec</div><div class='del'>-	 * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK</div><div class='del'>-	 * retransmission has occurred.</div><div class='del'>-	 */</div><div class='del'>-	if (tp-&gt;total_retrans &gt; 1)</div><div class='del'>-		tp-&gt;snd_cwnd = 1;</div><div class='del'>-	else</div><div class='del'>-		tp-&gt;snd_cwnd = tcp_init_cwnd(tp, dst);</div><div class='del'>-	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst)</div><div class='hunk'>@@ -543,8 +558,6 @@ bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_SEQLOCK(fastopen_seqlock);</div><div class='del'>-</div><div class='ctx'> void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,</div><div class='ctx'> 			    struct tcp_fastopen_cookie *cookie)</div><div class='ctx'> {</div><div class='hunk'>@@ -604,8 +617,13 @@ static struct genl_family tcp_metrics_nl_family;</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy tcp_metrics_nl_policy[TCP_METRICS_ATTR_MAX + 1] = {</div><div class='ctx'> 	[TCP_METRICS_ATTR_ADDR_IPV4]	= { .type = NLA_U32, },</div><div class='del'>-	[TCP_METRICS_ATTR_ADDR_IPV6]	= { .type = NLA_BINARY,</div><div class='del'>-					    .len = sizeof(struct in6_addr), },</div><div class='add'>+	[TCP_METRICS_ATTR_ADDR_IPV6]	=</div><div class='add'>+		NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+</div><div class='add'>+	[TCP_METRICS_ATTR_SADDR_IPV4]	= { .type = NLA_U32, },</div><div class='add'>+	[TCP_METRICS_ATTR_SADDR_IPV6]	=</div><div class='add'>+		NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+</div><div class='ctx'> 	/* Following attributes are not received for GET/DEL,</div><div class='ctx'> 	 * we keep them for reference</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -651,18 +669,18 @@ static int tcp_metrics_fill_info(struct sk_buff *msg,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_msecs(msg, TCP_METRICS_ATTR_AGE,</div><div class='del'>-			  jiffies - tm-&gt;tcpm_stamp,</div><div class='add'>+			  jiffies - READ_ONCE(tm-&gt;tcpm_stamp),</div><div class='ctx'> 			  TCP_METRICS_ATTR_PAD) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		int n = 0;</div><div class='ctx'> </div><div class='del'>-		nest = nla_nest_start(msg, TCP_METRICS_ATTR_VALS);</div><div class='add'>+		nest = nla_nest_start_noflag(msg, TCP_METRICS_ATTR_VALS);</div><div class='ctx'> 		if (!nest)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		for (i = 0; i &lt; TCP_METRIC_MAX_KERNEL + 1; i++) {</div><div class='del'>-			u32 val = tm-&gt;tcpm_vals[i];</div><div class='add'>+			u32 val = tcp_metric_get(tm, i);</div><div class='ctx'> </div><div class='ctx'> 			if (!val)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -753,6 +771,7 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb,</div><div class='ctx'> 	unsigned int max_rows = 1U &lt;&lt; tcp_metrics_hash_log;</div><div class='ctx'> 	unsigned int row, s_row = cb-&gt;args[0];</div><div class='ctx'> 	int s_col = cb-&gt;args[1], col = s_col;</div><div class='add'>+	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (row = s_row; row &lt; max_rows; row++, s_col = 0) {</div><div class='ctx'> 		struct tcp_metrics_block *tm;</div><div class='hunk'>@@ -765,7 +784,8 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (col &lt; s_col)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (tcp_metrics_dump_info(skb, cb, tm) &lt; 0) {</div><div class='add'>+			res = tcp_metrics_dump_info(skb, cb, tm);</div><div class='add'>+			if (res &lt; 0) {</div><div class='ctx'> 				rcu_read_unlock();</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -776,7 +796,7 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb,</div><div class='ctx'> done:</div><div class='ctx'> 	cb-&gt;args[0] = row;</div><div class='ctx'> 	cb-&gt;args[1] = col;</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,</div><div class='hunk'>@@ -795,8 +815,6 @@ static int __parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,</div><div class='ctx'> 	if (a) {</div><div class='ctx'> 		struct in6_addr in6;</div><div class='ctx'> </div><div class='del'>-		if (nla_len(a) != sizeof(struct in6_addr))</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		in6 = nla_get_in6_addr(a);</div><div class='ctx'> 		inetpeer_set_addr_v6(addr, &amp;in6);</div><div class='ctx'> 		if (hash)</div><div class='hunk'>@@ -885,22 +903,25 @@ static void tcp_metrics_flush_all(struct net *net)</div><div class='ctx'> 	unsigned int row;</div><div class='ctx'> </div><div class='ctx'> 	for (row = 0; row &lt; max_rows; row++, hb++) {</div><div class='del'>-		struct tcp_metrics_block __rcu **pp;</div><div class='add'>+		struct tcp_metrics_block __rcu **pp = &amp;hb-&gt;chain;</div><div class='ctx'> 		bool match;</div><div class='ctx'> </div><div class='add'>+		if (!rcu_access_pointer(*pp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_bh(&amp;tcp_metrics_lock);</div><div class='del'>-		pp = &amp;hb-&gt;chain;</div><div class='ctx'> 		for (tm = deref_locked(*pp); tm; tm = deref_locked(*pp)) {</div><div class='ctx'> 			match = net ? net_eq(tm_net(tm), net) :</div><div class='del'>-				!refcount_read(&amp;tm_net(tm)-&gt;count);</div><div class='add'>+				!check_net(tm_net(tm));</div><div class='ctx'> 			if (match) {</div><div class='del'>-				*pp = tm-&gt;tcpm_next;</div><div class='add'>+				rcu_assign_pointer(*pp, tm-&gt;tcpm_next);</div><div class='ctx'> 				kfree_rcu(tm, rcu_head);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				pp = &amp;tm-&gt;tcpm_next;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;tcp_metrics_lock);</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +956,7 @@ static int tcp_metrics_nl_cmd_del(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 		if (addr_same(&amp;tm-&gt;tcpm_daddr, &amp;daddr) &amp;&amp;</div><div class='ctx'> 		    (!src || addr_same(&amp;tm-&gt;tcpm_saddr, &amp;saddr)) &amp;&amp;</div><div class='ctx'> 		    net_eq(tm_net(tm), net)) {</div><div class='del'>-			*pp = tm-&gt;tcpm_next;</div><div class='add'>+			rcu_assign_pointer(*pp, tm-&gt;tcpm_next);</div><div class='ctx'> 			kfree_rcu(tm, rcu_head);</div><div class='ctx'> 			found = true;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -948,17 +969,17 @@ static int tcp_metrics_nl_cmd_del(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops tcp_metrics_nl_ops[] = {</div><div class='add'>+static const struct genl_small_ops tcp_metrics_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TCP_METRICS_CMD_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = tcp_metrics_nl_cmd_get,</div><div class='ctx'> 		.dumpit = tcp_metrics_nl_dump,</div><div class='del'>-		.policy = tcp_metrics_nl_policy,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TCP_METRICS_CMD_DEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = tcp_metrics_nl_cmd_del,</div><div class='del'>-		.policy = tcp_metrics_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -968,13 +989,16 @@ static struct genl_family tcp_metrics_nl_family __ro_after_init = {</div><div class='ctx'> 	.name		= TCP_METRICS_GENL_NAME,</div><div class='ctx'> 	.version	= TCP_METRICS_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= TCP_METRICS_ATTR_MAX,</div><div class='add'>+	.policy = tcp_metrics_nl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= tcp_metrics_nl_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(tcp_metrics_nl_ops),</div><div class='add'>+	.small_ops	= tcp_metrics_nl_ops,</div><div class='add'>+	.n_small_ops	= ARRAY_SIZE(tcp_metrics_nl_ops),</div><div class='add'>+	.resv_start_op	= TCP_METRICS_CMD_DEL + 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int tcpmhash_entries;</div><div class='add'>+static unsigned int tcpmhash_entries __initdata;</div><div class='ctx'> static int __init set_tcpmhash_entries(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='hunk'>@@ -990,17 +1014,13 @@ static int __init set_tcpmhash_entries(char *str)</div><div class='ctx'> }</div><div class='ctx'> __setup("tcpmhash_entries=", set_tcpmhash_entries);</div><div class='ctx'> </div><div class='del'>-static int __net_init tcp_net_metrics_init(struct net *net)</div><div class='add'>+static void __init tcp_metrics_hash_alloc(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int slots = tcpmhash_entries;</div><div class='ctx'> 	size_t size;</div><div class='del'>-	unsigned int slots;</div><div class='del'>-</div><div class='del'>-	if (!net_eq(net, &amp;init_net))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	slots = tcpmhash_entries;</div><div class='ctx'> 	if (!slots) {</div><div class='del'>-		if (totalram_pages &gt;= 128 * 1024)</div><div class='add'>+		if (totalram_pages() &gt;= 128 * 1024)</div><div class='ctx'> 			slots = 16 * 1024;</div><div class='ctx'> 		else</div><div class='ctx'> 			slots = 8 * 1024;</div><div class='hunk'>@@ -1011,9 +1031,7 @@ static int __net_init tcp_net_metrics_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> 	tcp_metrics_hash = kvzalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!tcp_metrics_hash)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+		panic("Could not allocate the tcp_metrics hash table\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit tcp_net_metrics_exit_batch(struct list_head *net_exit_list)</div><div class='hunk'>@@ -1022,7 +1040,6 @@ static void __net_exit tcp_net_metrics_exit_batch(struct list_head *net_exit_lis</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __net_initdata struct pernet_operations tcp_net_metrics_ops = {</div><div class='del'>-	.init		=	tcp_net_metrics_init,</div><div class='ctx'> 	.exit_batch	=	tcp_net_metrics_exit_batch,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1030,9 +1047,11 @@ void __init tcp_metrics_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	tcp_metrics_hash_alloc();</div><div class='add'>+</div><div class='ctx'> 	ret = register_pernet_subsys(&amp;tcp_net_metrics_ops);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		panic("Could not allocate the tcp_metrics hash table\n");</div><div class='add'>+		panic("Could not register tcp_net_metrics_ops\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = genl_register_family(&amp;tcp_metrics_nl_family);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c<br/>index 12affb7864d9..bd5462154f97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_minisocks.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_minisocks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_minisocks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_minisocks.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -18,16 +19,12 @@</div><div class='ctx'>  *		Jorge Cwik, &lt;jorge@laser.satlink.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/static_key.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='del'>-#include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/rstreason.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> static bool tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)</div><div class='ctx'> {</div><div class='hunk'>@@ -49,7 +46,7 @@ tcp_timewait_check_oow_rate_limit(struct inet_timewait_sock *tw,</div><div class='ctx'> 		/* Send ACK. Note, we do not put the bucket,</div><div class='ctx'> 		 * it will be released by caller.</div><div class='ctx'> 		 */</div><div class='del'>-		return TCP_TW_ACK;</div><div class='add'>+		return TCP_TW_ACK_OOW;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We are rate-limiting, so just release the tw sock and drop skb. */</div><div class='hunk'>@@ -57,6 +54,19 @@ tcp_timewait_check_oow_rate_limit(struct inet_timewait_sock *tw,</div><div class='ctx'> 	return TCP_TW_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void twsk_rcv_nxt_update(struct tcp_timewait_sock *tcptw, u32 seq,</div><div class='add'>+				u32 rcv_nxt)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	struct tcp_ao_info *ao;</div><div class='add'>+</div><div class='add'>+	ao = rcu_dereference(tcptw-&gt;ao_info);</div><div class='add'>+	if (unlikely(ao &amp;&amp; seq &lt; rcv_nxt))</div><div class='add'>+		WRITE_ONCE(ao-&gt;rcv_sne, ao-&gt;rcv_sne + 1);</div><div class='add'>+#endif</div><div class='add'>+	WRITE_ONCE(tcptw-&gt;tw_rcv_nxt, seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * * Main purpose of TIME-WAIT state is to close connection gracefully,</div><div class='ctx'>  *   when one of ends sits in LAST-ACK or CLOSING retransmitting FIN</div><div class='hunk'>@@ -89,45 +99,59 @@ tcp_timewait_check_oow_rate_limit(struct inet_timewait_sock *tw,</div><div class='ctx'>  */</div><div class='ctx'> enum tcp_tw_status</div><div class='ctx'> tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,</div><div class='del'>-			   const struct tcphdr *th)</div><div class='add'>+			   const struct tcphdr *th, u32 *tw_isn,</div><div class='add'>+			   enum skb_drop_reason *drop_reason)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_options_received tmp_opt;</div><div class='ctx'> 	struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);</div><div class='add'>+	u32 rcv_nxt = READ_ONCE(tcptw-&gt;tw_rcv_nxt);</div><div class='add'>+	struct tcp_options_received tmp_opt;</div><div class='add'>+	enum skb_drop_reason psp_drop;</div><div class='ctx'> 	bool paws_reject = false;</div><div class='add'>+	int ts_recent_stamp;</div><div class='add'>+</div><div class='add'>+	/* Instead of dropping immediately, wait to see what value is</div><div class='add'>+	 * returned. We will accept a non psp-encapsulated syn in the</div><div class='add'>+	 * case where TCP_TW_SYN is returned.</div><div class='add'>+	 */</div><div class='add'>+	psp_drop = psp_twsk_rx_policy_check(tw, skb);</div><div class='ctx'> </div><div class='ctx'> 	tmp_opt.saw_tstamp = 0;</div><div class='del'>-	if (th-&gt;doff &gt; (sizeof(*th) &gt;&gt; 2) &amp;&amp; tcptw-&gt;tw_ts_recent_stamp) {</div><div class='add'>+	ts_recent_stamp = READ_ONCE(tcptw-&gt;tw_ts_recent_stamp);</div><div class='add'>+	if (th-&gt;doff &gt; (sizeof(*th) &gt;&gt; 2) &amp;&amp; ts_recent_stamp) {</div><div class='ctx'> 		tcp_parse_options(twsk_net(tw), skb, &amp;tmp_opt, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_opt.saw_tstamp) {</div><div class='ctx'> 			if (tmp_opt.rcv_tsecr)</div><div class='ctx'> 				tmp_opt.rcv_tsecr -= tcptw-&gt;tw_ts_offset;</div><div class='del'>-			tmp_opt.ts_recent	= tcptw-&gt;tw_ts_recent;</div><div class='del'>-			tmp_opt.ts_recent_stamp	= tcptw-&gt;tw_ts_recent_stamp;</div><div class='add'>+			tmp_opt.ts_recent	= READ_ONCE(tcptw-&gt;tw_ts_recent);</div><div class='add'>+			tmp_opt.ts_recent_stamp	= ts_recent_stamp;</div><div class='ctx'> 			paws_reject = tcp_paws_reject(&amp;tmp_opt, th-&gt;rst);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tw-&gt;tw_substate == TCP_FIN_WAIT2) {</div><div class='add'>+	if (READ_ONCE(tw-&gt;tw_substate) == TCP_FIN_WAIT2) {</div><div class='ctx'> 		/* Just repeat all the checks of tcp_rcv_state_process() */</div><div class='ctx'> </div><div class='add'>+		if (psp_drop)</div><div class='add'>+			goto out_put;</div><div class='add'>+</div><div class='ctx'> 		/* Out of window, send ACK */</div><div class='ctx'> 		if (paws_reject ||</div><div class='ctx'> 		    !tcp_in_window(TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='del'>-				   tcptw-&gt;tw_rcv_nxt,</div><div class='del'>-				   tcptw-&gt;tw_rcv_nxt + tcptw-&gt;tw_rcv_wnd))</div><div class='add'>+				   rcv_nxt,</div><div class='add'>+				   rcv_nxt + tcptw-&gt;tw_rcv_wnd))</div><div class='ctx'> 			return tcp_timewait_check_oow_rate_limit(</div><div class='ctx'> 				tw, skb, LINUX_MIB_TCPACKSKIPPEDFINWAIT2);</div><div class='ctx'> </div><div class='ctx'> 		if (th-&gt;rst)</div><div class='ctx'> 			goto kill;</div><div class='ctx'> </div><div class='del'>-		if (th-&gt;syn &amp;&amp; !before(TCP_SKB_CB(skb)-&gt;seq, tcptw-&gt;tw_rcv_nxt))</div><div class='add'>+		if (th-&gt;syn &amp;&amp; !before(TCP_SKB_CB(skb)-&gt;seq, rcv_nxt))</div><div class='ctx'> 			return TCP_TW_RST;</div><div class='ctx'> </div><div class='ctx'> 		/* Dup ACK? */</div><div class='ctx'> 		if (!th-&gt;ack ||</div><div class='del'>-		    !after(TCP_SKB_CB(skb)-&gt;end_seq, tcptw-&gt;tw_rcv_nxt) ||</div><div class='add'>+		    !after(TCP_SKB_CB(skb)-&gt;end_seq, rcv_nxt) ||</div><div class='ctx'> 		    TCP_SKB_CB(skb)-&gt;end_seq == TCP_SKB_CB(skb)-&gt;seq) {</div><div class='ctx'> 			inet_twsk_put(tw);</div><div class='ctx'> 			return TCP_TW_SUCCESS;</div><div class='hunk'>@@ -137,15 +161,22 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,</div><div class='ctx'> 		 * reset.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!th-&gt;fin ||</div><div class='del'>-		    TCP_SKB_CB(skb)-&gt;end_seq != tcptw-&gt;tw_rcv_nxt + 1)</div><div class='add'>+		    TCP_SKB_CB(skb)-&gt;end_seq != rcv_nxt + 1)</div><div class='ctx'> 			return TCP_TW_RST;</div><div class='ctx'> </div><div class='ctx'> 		/* FIN arrived, enter true time-wait state. */</div><div class='del'>-		tw-&gt;tw_substate	  = TCP_TIME_WAIT;</div><div class='del'>-		tcptw-&gt;tw_rcv_nxt = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='add'>+		WRITE_ONCE(tw-&gt;tw_substate, TCP_TIME_WAIT);</div><div class='add'>+		twsk_rcv_nxt_update(tcptw, TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='add'>+				    rcv_nxt);</div><div class='add'>+</div><div class='ctx'> 		if (tmp_opt.saw_tstamp) {</div><div class='del'>-			tcptw-&gt;tw_ts_recent_stamp = ktime_get_seconds();</div><div class='del'>-			tcptw-&gt;tw_ts_recent	  = tmp_opt.rcv_tsval;</div><div class='add'>+			u64 ts = tcp_clock_ms();</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(tw-&gt;tw_entry_stamp, ts);</div><div class='add'>+			WRITE_ONCE(tcptw-&gt;tw_ts_recent_stamp,</div><div class='add'>+				   div_u64(ts, MSEC_PER_SEC));</div><div class='add'>+			WRITE_ONCE(tcptw-&gt;tw_ts_recent,</div><div class='add'>+				   tmp_opt.rcv_tsval);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN);</div><div class='hunk'>@@ -170,16 +201,19 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (!paws_reject &amp;&amp;</div><div class='del'>-	    (TCP_SKB_CB(skb)-&gt;seq == tcptw-&gt;tw_rcv_nxt &amp;&amp;</div><div class='add'>+	    (TCP_SKB_CB(skb)-&gt;seq == rcv_nxt &amp;&amp;</div><div class='ctx'> 	     (TCP_SKB_CB(skb)-&gt;seq == TCP_SKB_CB(skb)-&gt;end_seq || th-&gt;rst))) {</div><div class='ctx'> 		/* In window segment, it may be only reset or bare ack. */</div><div class='ctx'> </div><div class='add'>+		if (psp_drop)</div><div class='add'>+			goto out_put;</div><div class='add'>+</div><div class='ctx'> 		if (th-&gt;rst) {</div><div class='ctx'> 			/* This is TIME_WAIT assassination, in two flavors.</div><div class='ctx'> 			 * Oh well... nobody has a sufficient solution to this</div><div class='ctx'> 			 * protocol bug yet.</div><div class='ctx'> 			 */</div><div class='del'>-			if (twsk_net(tw)-&gt;ipv4.sysctl_tcp_rfc1337 == 0) {</div><div class='add'>+			if (!READ_ONCE(twsk_net(tw)-&gt;ipv4.sysctl_tcp_rfc1337)) {</div><div class='ctx'> kill:</div><div class='ctx'> 				inet_twsk_deschedule_put(tw);</div><div class='ctx'> 				return TCP_TW_SUCCESS;</div><div class='hunk'>@@ -189,8 +223,10 @@ kill:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_opt.saw_tstamp) {</div><div class='del'>-			tcptw-&gt;tw_ts_recent	  = tmp_opt.rcv_tsval;</div><div class='del'>-			tcptw-&gt;tw_ts_recent_stamp = ktime_get_seconds();</div><div class='add'>+			WRITE_ONCE(tcptw-&gt;tw_ts_recent,</div><div class='add'>+				   tmp_opt.rcv_tsval);</div><div class='add'>+			WRITE_ONCE(tcptw-&gt;tw_ts_recent_stamp,</div><div class='add'>+				   ktime_get_seconds());</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		inet_twsk_put(tw);</div><div class='hunk'>@@ -215,18 +251,23 @@ kill:</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (th-&gt;syn &amp;&amp; !th-&gt;rst &amp;&amp; !th-&gt;ack &amp;&amp; !paws_reject &amp;&amp;</div><div class='del'>-	    (after(TCP_SKB_CB(skb)-&gt;seq, tcptw-&gt;tw_rcv_nxt) ||</div><div class='add'>+	    (after(TCP_SKB_CB(skb)-&gt;seq, rcv_nxt) ||</div><div class='ctx'> 	     (tmp_opt.saw_tstamp &amp;&amp;</div><div class='del'>-	      (s32)(tcptw-&gt;tw_ts_recent - tmp_opt.rcv_tsval) &lt; 0))) {</div><div class='add'>+	      (s32)(READ_ONCE(tcptw-&gt;tw_ts_recent) - tmp_opt.rcv_tsval) &lt; 0))) {</div><div class='ctx'> 		u32 isn = tcptw-&gt;tw_snd_nxt + 65535 + 2;</div><div class='ctx'> 		if (isn == 0)</div><div class='ctx'> 			isn++;</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tcp_tw_isn = isn;</div><div class='add'>+		*tw_isn = isn;</div><div class='ctx'> 		return TCP_TW_SYN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (paws_reject)</div><div class='del'>-		__NET_INC_STATS(twsk_net(tw), LINUX_MIB_PAWSESTABREJECTED);</div><div class='add'>+	if (psp_drop)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	if (paws_reject) {</div><div class='add'>+		*drop_reason = SKB_DROP_REASON_TCP_RFC7323_TW_PAWS;</div><div class='add'>+		__NET_INC_STATS(twsk_net(tw), LINUX_MIB_PAWS_TW_REJECTED);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!th-&gt;rst) {</div><div class='ctx'> 		/* In this case we must reset the TIMEWAIT timer.</div><div class='hunk'>@@ -241,10 +282,44 @@ kill:</div><div class='ctx'> 		return tcp_timewait_check_oow_rate_limit(</div><div class='ctx'> 			tw, skb, LINUX_MIB_TCPACKSKIPPEDTIMEWAIT);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+out_put:</div><div class='ctx'> 	inet_twsk_put(tw);</div><div class='ctx'> 	return TCP_TW_SUCCESS;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_timewait_state_process);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_timewait_state_process);</div><div class='add'>+</div><div class='add'>+static void tcp_time_wait_init(struct sock *sk, struct tcp_timewait_sock *tcptw)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_md5sig_key *key;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The timewait bucket does not have the key DB from the</div><div class='add'>+	 * sock structure. We just make a quick copy of the</div><div class='add'>+	 * md5 key being used (if indeed we are using one)</div><div class='add'>+	 * so the timewait ack generating code has the key.</div><div class='add'>+	 */</div><div class='add'>+	tcptw-&gt;tw_md5_key = NULL;</div><div class='add'>+	if (!static_branch_unlikely(&amp;tcp_md5_needed.key))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key = tp-&gt;af_specific-&gt;md5_lookup(sk, sk);</div><div class='add'>+	if (key) {</div><div class='add'>+		tcptw-&gt;tw_md5_key = kmemdup(key, sizeof(*key), GFP_ATOMIC);</div><div class='add'>+		if (!tcptw-&gt;tw_md5_key)</div><div class='add'>+			return;</div><div class='add'>+		if (!static_key_fast_inc_not_disabled(&amp;tcp_md5_needed.key.key))</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+out_free:</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	kfree(tcptw-&gt;tw_md5_key);</div><div class='add'>+	tcptw-&gt;tw_md5_key = NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Move a socket to time-wait or dead fin-wait-2 state.</div><div class='hunk'>@@ -252,28 +327,35 @@ EXPORT_SYMBOL(tcp_timewait_state_process);</div><div class='ctx'> void tcp_time_wait(struct sock *sk, int state, int timeo)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct inet_timewait_sock *tw;</div><div class='del'>-	struct inet_timewait_death_row *tcp_death_row = &amp;sock_net(sk)-&gt;ipv4.tcp_death_row;</div><div class='ctx'> </div><div class='del'>-	tw = inet_twsk_alloc(sk, tcp_death_row, state);</div><div class='add'>+	tw = inet_twsk_alloc(sk, &amp;net-&gt;ipv4.tcp_death_row, state);</div><div class='ctx'> </div><div class='ctx'> 	if (tw) {</div><div class='ctx'> 		struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);</div><div class='ctx'> 		const int rto = (icsk-&gt;icsk_rto &lt;&lt; 2) - (icsk-&gt;icsk_rto &gt;&gt; 1);</div><div class='del'>-		struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='del'>-		tw-&gt;tw_transparent	= inet-&gt;transparent;</div><div class='ctx'> 		tw-&gt;tw_mark		= sk-&gt;sk_mark;</div><div class='add'>+		tw-&gt;tw_priority		= READ_ONCE(sk-&gt;sk_priority);</div><div class='ctx'> 		tw-&gt;tw_rcv_wscale	= tp-&gt;rx_opt.rcv_wscale;</div><div class='add'>+		/* refreshed when we enter true TIME-WAIT state */</div><div class='add'>+		tw-&gt;tw_entry_stamp	= tcp_time_stamp_ms(tp);</div><div class='ctx'> 		tcptw-&gt;tw_rcv_nxt	= tp-&gt;rcv_nxt;</div><div class='ctx'> 		tcptw-&gt;tw_snd_nxt	= tp-&gt;snd_nxt;</div><div class='ctx'> 		tcptw-&gt;tw_rcv_wnd	= tcp_receive_window(tp);</div><div class='ctx'> 		tcptw-&gt;tw_ts_recent	= tp-&gt;rx_opt.ts_recent;</div><div class='ctx'> 		tcptw-&gt;tw_ts_recent_stamp = tp-&gt;rx_opt.ts_recent_stamp;</div><div class='ctx'> 		tcptw-&gt;tw_ts_offset	= tp-&gt;tsoffset;</div><div class='add'>+		tw-&gt;tw_usec_ts		= tp-&gt;tcp_usec_ts;</div><div class='ctx'> 		tcptw-&gt;tw_last_oow_ack_time = 0;</div><div class='del'>-</div><div class='add'>+		tcptw-&gt;tw_tx_delay	= tp-&gt;tcp_tx_delay;</div><div class='add'>+		tw-&gt;tw_txhash		= sk-&gt;sk_txhash;</div><div class='add'>+		tw-&gt;tw_tx_queue_mapping = sk-&gt;sk_tx_queue_mapping;</div><div class='add'>+#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING</div><div class='add'>+		tw-&gt;tw_rx_queue_mapping = sk-&gt;sk_rx_queue_mapping;</div><div class='add'>+#endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 		if (tw-&gt;tw_family == PF_INET6) {</div><div class='ctx'> 			struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='hunk'>@@ -286,23 +368,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-		/*</div><div class='del'>-		 * The timewait bucket does not have the key DB from the</div><div class='del'>-		 * sock structure. We just make a quick copy of the</div><div class='del'>-		 * md5 key being used (if indeed we are using one)</div><div class='del'>-		 * so the timewait ack generating code has the key.</div><div class='del'>-		 */</div><div class='del'>-		do {</div><div class='del'>-			struct tcp_md5sig_key *key;</div><div class='del'>-			tcptw-&gt;tw_md5_key = NULL;</div><div class='del'>-			key = tp-&gt;af_specific-&gt;md5_lookup(sk, sk);</div><div class='del'>-			if (key) {</div><div class='del'>-				tcptw-&gt;tw_md5_key = kmemdup(key, sizeof(*key), GFP_ATOMIC);</div><div class='del'>-				BUG_ON(tcptw-&gt;tw_md5_key &amp;&amp; !tcp_alloc_md5sig_pool());</div><div class='del'>-			}</div><div class='del'>-		} while (0);</div><div class='del'>-#endif</div><div class='add'>+		tcp_time_wait_init(sk, tcptw);</div><div class='add'>+		tcp_ao_time_wait(tcptw, tp);</div><div class='ctx'> </div><div class='ctx'> 		/* Get the TIME_WAIT timeout firing. */</div><div class='ctx'> 		if (timeo &lt; rto)</div><div class='hunk'>@@ -311,23 +378,16 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)</div><div class='ctx'> 		if (state == TCP_TIME_WAIT)</div><div class='ctx'> 			timeo = TCP_TIMEWAIT_LEN;</div><div class='ctx'> </div><div class='del'>-		/* tw_timer is pinned, so we need to make sure BH are disabled</div><div class='del'>-		 * in following section, otherwise timer handler could run before</div><div class='del'>-		 * we complete the initialization.</div><div class='del'>-		 */</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		inet_twsk_schedule(tw, timeo);</div><div class='ctx'> 		/* Linkage updates.</div><div class='ctx'> 		 * Note that access to tw after this point is illegal.</div><div class='ctx'> 		 */</div><div class='del'>-		inet_twsk_hashdance(tw, sk, &amp;tcp_hashinfo);</div><div class='del'>-		local_bh_enable();</div><div class='add'>+		inet_twsk_hashdance_schedule(tw, sk, net-&gt;ipv4.tcp_death_row.hashinfo, timeo);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Sorry, if we're out of memory, just CLOSE this</div><div class='ctx'> 		 * socket up.  We've got bigger problems than</div><div class='ctx'> 		 * non-graceful socket closings.</div><div class='ctx'> 		 */</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPTIMEWAITOVERFLOW);</div><div class='add'>+		NET_INC_STATS(net, LINUX_MIB_TCPTIMEWAITOVERFLOW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tcp_update_metrics(sk);</div><div class='hunk'>@@ -338,13 +398,34 @@ EXPORT_SYMBOL(tcp_time_wait);</div><div class='ctx'> void tcp_twsk_destructor(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	struct tcp_timewait_sock *twsk = tcp_twsk(sk);</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_md5_needed.key)) {</div><div class='add'>+		struct tcp_timewait_sock *twsk = tcp_twsk(sk);</div><div class='ctx'> </div><div class='del'>-	if (twsk-&gt;tw_md5_key)</div><div class='del'>-		kfree_rcu(twsk-&gt;tw_md5_key, rcu);</div><div class='add'>+		if (twsk-&gt;tw_md5_key) {</div><div class='add'>+			kfree(twsk-&gt;tw_md5_key);</div><div class='add'>+			static_branch_slow_dec_deferred(&amp;tcp_md5_needed);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='add'>+	tcp_ao_destroy_sock(sk, true);</div><div class='add'>+	psp_twsk_assoc_free(inet_twsk(sk));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tcp_twsk_purge(struct list_head *net_exit_list)</div><div class='add'>+{</div><div class='add'>+	bool purged_once = false;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(net, net_exit_list, exit_list) {</div><div class='add'>+		if (net-&gt;ipv4.tcp_death_row.hashinfo-&gt;pernet) {</div><div class='add'>+			/* Even if tw_refcount == 1, we must clean up kernel reqsk */</div><div class='add'>+			inet_twsk_purge(net-&gt;ipv4.tcp_death_row.hashinfo);</div><div class='add'>+		} else if (!purged_once) {</div><div class='add'>+			inet_twsk_purge(&amp;tcp_hashinfo);</div><div class='add'>+			purged_once = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_twsk_destructor);</div><div class='ctx'> </div><div class='ctx'> /* Warning : This function is called without sk_listener being locked.</div><div class='ctx'>  * Be sure to read socket fields once, as their value could change under us.</div><div class='hunk'>@@ -387,12 +468,27 @@ void tcp_openreq_init_rwin(struct request_sock *req,</div><div class='ctx'> 		rcv_wnd);</div><div class='ctx'> 	ireq-&gt;rcv_wscale = rcv_wscale;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_openreq_init_rwin);</div><div class='ctx'> </div><div class='del'>-static void tcp_ecn_openreq_child(struct tcp_sock *tp,</div><div class='del'>-				  const struct request_sock *req)</div><div class='add'>+static void tcp_ecn_openreq_child(struct sock *sk,</div><div class='add'>+				  const struct request_sock *req,</div><div class='add'>+				  const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	tp-&gt;ecn_flags = inet_rsk(req)-&gt;ecn_ok ? TCP_ECN_OK : 0;</div><div class='add'>+	const struct tcp_request_sock *treq = tcp_rsk(req);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (treq-&gt;accecn_ok) {</div><div class='add'>+		tcp_ecn_mode_set(tp, TCP_ECN_MODE_ACCECN);</div><div class='add'>+		tp-&gt;syn_ect_snt = treq-&gt;syn_ect_snt;</div><div class='add'>+		tcp_accecn_third_ack(sk, skb, treq-&gt;syn_ect_snt);</div><div class='add'>+		tp-&gt;saw_accecn_opt = treq-&gt;saw_accecn_opt;</div><div class='add'>+		tp-&gt;prev_ecnfield = treq-&gt;syn_ect_rcv;</div><div class='add'>+		tp-&gt;accecn_opt_demand = 1;</div><div class='add'>+		tcp_ecn_received_counters_payload(sk, skb);</div><div class='add'>+	} else {</div><div class='add'>+		tcp_ecn_mode_set(tp, inet_rsk(req)-&gt;ecn_ok ?</div><div class='add'>+				     TCP_ECN_MODE_RFC3168 :</div><div class='add'>+				     TCP_ECN_DISABLED);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)</div><div class='hunk'>@@ -406,7 +502,7 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		ca = tcp_ca_find_key(ca_key);</div><div class='del'>-		if (likely(ca &amp;&amp; try_module_get(ca-&gt;owner))) {</div><div class='add'>+		if (likely(ca &amp;&amp; bpf_try_module_get(ca, ca-&gt;owner))) {</div><div class='ctx'> 			icsk-&gt;icsk_ca_dst_locked = tcp_ca_dst_locked(dst);</div><div class='ctx'> 			icsk-&gt;icsk_ca_ops = ca;</div><div class='ctx'> 			ca_got_dst = true;</div><div class='hunk'>@@ -417,14 +513,14 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)</div><div class='ctx'> 	/* If no valid choice made yet, assign current system default ca. */</div><div class='ctx'> 	if (!ca_got_dst &amp;&amp;</div><div class='ctx'> 	    (!icsk-&gt;icsk_ca_setsockopt ||</div><div class='del'>-	     !try_module_get(icsk-&gt;icsk_ca_ops-&gt;owner)))</div><div class='add'>+	     !bpf_try_module_get(icsk-&gt;icsk_ca_ops, icsk-&gt;icsk_ca_ops-&gt;owner)))</div><div class='ctx'> 		tcp_assign_congestion_control(sk);</div><div class='ctx'> </div><div class='ctx'> 	tcp_set_ca_state(sk, TCP_CA_Open);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_ca_openreq_child);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_ca_openreq_child);</div><div class='ctx'> </div><div class='del'>-static void smc_check_reset_syn_req(struct tcp_sock *oldtp,</div><div class='add'>+static void smc_check_reset_syn_req(const struct tcp_sock *oldtp,</div><div class='ctx'> 				    struct request_sock *req,</div><div class='ctx'> 				    struct tcp_sock *newtp)</div><div class='ctx'> {</div><div class='hunk'>@@ -453,7 +549,9 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,</div><div class='ctx'> 	const struct inet_request_sock *ireq = inet_rsk(req);</div><div class='ctx'> 	struct tcp_request_sock *treq = tcp_rsk(req);</div><div class='ctx'> 	struct inet_connection_sock *newicsk;</div><div class='del'>-	struct tcp_sock *oldtp, *newtp;</div><div class='add'>+	const struct tcp_sock *oldtp;</div><div class='add'>+	struct tcp_sock *newtp;</div><div class='add'>+	u32 seq;</div><div class='ctx'> </div><div class='ctx'> 	if (!newsk)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -467,58 +565,34 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,</div><div class='ctx'> 	/* Now setup tcp_sock */</div><div class='ctx'> 	newtp-&gt;pred_flags = 0;</div><div class='ctx'> </div><div class='del'>-	newtp-&gt;rcv_wup = newtp-&gt;copied_seq =</div><div class='del'>-	newtp-&gt;rcv_nxt = treq-&gt;rcv_isn + 1;</div><div class='add'>+	seq = treq-&gt;rcv_isn + 1;</div><div class='add'>+	newtp-&gt;rcv_wup = seq;</div><div class='add'>+	WRITE_ONCE(newtp-&gt;copied_seq, seq);</div><div class='add'>+	WRITE_ONCE(newtp-&gt;rcv_nxt, seq);</div><div class='ctx'> 	newtp-&gt;segs_in = 1;</div><div class='ctx'> </div><div class='del'>-	newtp-&gt;snd_sml = newtp-&gt;snd_una =</div><div class='del'>-	newtp-&gt;snd_nxt = newtp-&gt;snd_up = treq-&gt;snt_isn + 1;</div><div class='add'>+	seq = treq-&gt;snt_isn + 1;</div><div class='add'>+	newtp-&gt;snd_sml = newtp-&gt;snd_una = seq;</div><div class='add'>+	WRITE_ONCE(newtp-&gt;snd_nxt, seq);</div><div class='add'>+	newtp-&gt;snd_up = seq;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;newtp-&gt;tsq_node);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;newtp-&gt;tsorted_sent_queue);</div><div class='ctx'> </div><div class='ctx'> 	tcp_init_wl(newtp, treq-&gt;rcv_isn);</div><div class='ctx'> </div><div class='del'>-	newtp-&gt;srtt_us = 0;</div><div class='del'>-	newtp-&gt;mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);</div><div class='ctx'> 	minmax_reset(&amp;newtp-&gt;rtt_min, tcp_jiffies32, ~0U);</div><div class='del'>-	newicsk-&gt;icsk_rto = TCP_TIMEOUT_INIT;</div><div class='ctx'> 	newicsk-&gt;icsk_ack.lrcvtime = tcp_jiffies32;</div><div class='ctx'> </div><div class='del'>-	newtp-&gt;packets_out = 0;</div><div class='del'>-	newtp-&gt;retrans_out = 0;</div><div class='del'>-	newtp-&gt;sacked_out = 0;</div><div class='del'>-	newtp-&gt;snd_ssthresh = TCP_INFINITE_SSTHRESH;</div><div class='del'>-	newtp-&gt;tlp_high_seq = 0;</div><div class='ctx'> 	newtp-&gt;lsndtime = tcp_jiffies32;</div><div class='del'>-	newsk-&gt;sk_txhash = treq-&gt;txhash;</div><div class='del'>-	newtp-&gt;last_oow_ack_time = 0;</div><div class='add'>+	newsk-&gt;sk_txhash = READ_ONCE(treq-&gt;txhash);</div><div class='ctx'> 	newtp-&gt;total_retrans = req-&gt;num_retrans;</div><div class='ctx'> </div><div class='del'>-	/* So many TCP implementations out there (incorrectly) count the</div><div class='del'>-	 * initial SYN frame in their delayed-ACK and congestion control</div><div class='del'>-	 * algorithms that we must have the following bandaid to talk</div><div class='del'>-	 * efficiently to them.  -DaveM</div><div class='del'>-	 */</div><div class='del'>-	newtp-&gt;snd_cwnd = TCP_INIT_CWND;</div><div class='del'>-	newtp-&gt;snd_cwnd_cnt = 0;</div><div class='del'>-</div><div class='del'>-	/* There's a bubble in the pipe until at least the first ACK. */</div><div class='del'>-	newtp-&gt;app_limited = ~0U;</div><div class='del'>-</div><div class='ctx'> 	tcp_init_xmit_timers(newsk);</div><div class='del'>-	newtp-&gt;write_seq = newtp-&gt;pushed_seq = treq-&gt;snt_isn + 1;</div><div class='del'>-</div><div class='del'>-	newtp-&gt;rx_opt.saw_tstamp = 0;</div><div class='del'>-</div><div class='del'>-	newtp-&gt;rx_opt.dsack = 0;</div><div class='del'>-	newtp-&gt;rx_opt.num_sacks = 0;</div><div class='del'>-</div><div class='del'>-	newtp-&gt;urg_data = 0;</div><div class='add'>+	WRITE_ONCE(newtp-&gt;write_seq, newtp-&gt;pushed_seq = treq-&gt;snt_isn + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (sock_flag(newsk, SOCK_KEEPOPEN))</div><div class='del'>-		inet_csk_reset_keepalive_timer(newsk,</div><div class='del'>-					       keepalive_time_when(newtp));</div><div class='add'>+		tcp_reset_keepalive_timer(newsk, keepalive_time_when(newtp));</div><div class='ctx'> </div><div class='ctx'> 	newtp-&gt;rx_opt.tstamp_ok = ireq-&gt;tstamp_ok;</div><div class='ctx'> 	newtp-&gt;rx_opt.sack_ok = ireq-&gt;sack_ok;</div><div class='hunk'>@@ -537,35 +611,59 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,</div><div class='ctx'> 	newtp-&gt;max_window = newtp-&gt;snd_wnd;</div><div class='ctx'> </div><div class='ctx'> 	if (newtp-&gt;rx_opt.tstamp_ok) {</div><div class='add'>+		newtp-&gt;tcp_usec_ts = treq-&gt;req_usec_ts;</div><div class='ctx'> 		newtp-&gt;rx_opt.ts_recent = req-&gt;ts_recent;</div><div class='ctx'> 		newtp-&gt;rx_opt.ts_recent_stamp = ktime_get_seconds();</div><div class='ctx'> 		newtp-&gt;tcp_header_len = sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED;</div><div class='ctx'> 	} else {</div><div class='add'>+		newtp-&gt;tcp_usec_ts = 0;</div><div class='ctx'> 		newtp-&gt;rx_opt.ts_recent_stamp = 0;</div><div class='ctx'> 		newtp-&gt;tcp_header_len = sizeof(struct tcphdr);</div><div class='ctx'> 	}</div><div class='add'>+	if (req-&gt;num_timeout) {</div><div class='add'>+		newtp-&gt;total_rto = req-&gt;num_timeout;</div><div class='add'>+		newtp-&gt;undo_marker = treq-&gt;snt_isn;</div><div class='add'>+		if (newtp-&gt;tcp_usec_ts) {</div><div class='add'>+			newtp-&gt;retrans_stamp = treq-&gt;snt_synack;</div><div class='add'>+			newtp-&gt;total_rto_time = (u32)(tcp_clock_us() -</div><div class='add'>+						      newtp-&gt;retrans_stamp) / USEC_PER_MSEC;</div><div class='add'>+		} else {</div><div class='add'>+			newtp-&gt;retrans_stamp = div_u64(treq-&gt;snt_synack,</div><div class='add'>+						       USEC_PER_SEC / TCP_TS_HZ);</div><div class='add'>+			newtp-&gt;total_rto_time = tcp_clock_ms() -</div><div class='add'>+						newtp-&gt;retrans_stamp;</div><div class='add'>+		}</div><div class='add'>+		newtp-&gt;total_rto_recoveries = 1;</div><div class='add'>+	}</div><div class='ctx'> 	newtp-&gt;tsoffset = treq-&gt;ts_off;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	newtp-&gt;md5sig_info = NULL;	/*XXX*/</div><div class='del'>-	if (newtp-&gt;af_specific-&gt;md5_lookup(sk, newsk))</div><div class='del'>-		newtp-&gt;tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	newtp-&gt;ao_info = NULL;</div><div class='add'>+</div><div class='add'>+	if (tcp_rsk_used_ao(req)) {</div><div class='add'>+		struct tcp_ao_key *ao_key;</div><div class='add'>+</div><div class='add'>+		ao_key = treq-&gt;af_specific-&gt;ao_lookup(sk, req, tcp_rsk(req)-&gt;ao_keyid, -1);</div><div class='add'>+		if (ao_key)</div><div class='add'>+			newtp-&gt;tcp_header_len += tcp_ao_len_aligned(ao_key);</div><div class='add'>+	}</div><div class='add'>+ #endif</div><div class='ctx'> 	if (skb-&gt;len &gt;= TCP_MSS_DEFAULT + newtp-&gt;tcp_header_len)</div><div class='ctx'> 		newicsk-&gt;icsk_ack.last_seg_size = skb-&gt;len - newtp-&gt;tcp_header_len;</div><div class='ctx'> 	newtp-&gt;rx_opt.mss_clamp = req-&gt;mss;</div><div class='del'>-	tcp_ecn_openreq_child(newtp, req);</div><div class='add'>+	tcp_ecn_openreq_child(newsk, req, skb);</div><div class='ctx'> 	newtp-&gt;fastopen_req = NULL;</div><div class='del'>-	newtp-&gt;fastopen_rsk = NULL;</div><div class='del'>-	newtp-&gt;syn_data_acked = 0;</div><div class='del'>-	newtp-&gt;rack.mstamp = 0;</div><div class='del'>-	newtp-&gt;rack.advanced = 0;</div><div class='del'>-	newtp-&gt;rack.reo_wnd_steps = 1;</div><div class='del'>-	newtp-&gt;rack.last_delivered = 0;</div><div class='del'>-	newtp-&gt;rack.reo_wnd_persist = 0;</div><div class='del'>-	newtp-&gt;rack.dsack_seen = 0;</div><div class='add'>+	RCU_INIT_POINTER(newtp-&gt;fastopen_rsk, NULL);</div><div class='add'>+</div><div class='add'>+	newtp-&gt;bpf_chg_cc_inprogress = 0;</div><div class='add'>+	tcp_bpf_clone(sk, newsk);</div><div class='ctx'> </div><div class='ctx'> 	__TCP_INC_STATS(sock_net(sk), TCP_MIB_PASSIVEOPENS);</div><div class='ctx'> </div><div class='add'>+	xa_init_flags(&amp;newsk-&gt;sk_user_frags, XA_FLAGS_ALLOC1);</div><div class='add'>+</div><div class='ctx'> 	return newsk;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_create_openreq_child);</div><div class='hunk'>@@ -579,32 +677,44 @@ EXPORT_SYMBOL(tcp_create_openreq_child);</div><div class='ctx'>  * validation and inside tcp_v4_reqsk_send_ack(). Can we do better?</div><div class='ctx'>  *</div><div class='ctx'>  * We don't need to initialize tmp_opt.sack_ok as we don't use the results</div><div class='add'>+ *</div><div class='add'>+ * Note: If @fastopen is true, this can be called from process context.</div><div class='add'>+ *       Otherwise, this is from BH context.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			   struct request_sock *req,</div><div class='del'>-			   bool fastopen, bool *req_stolen)</div><div class='add'>+			   bool fastopen, bool *req_stolen,</div><div class='add'>+			   enum skb_drop_reason *drop_reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_options_received tmp_opt;</div><div class='ctx'> 	struct sock *child;</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> 	__be32 flg = tcp_flag_word(th) &amp; (TCP_FLAG_RST|TCP_FLAG_SYN|TCP_FLAG_ACK);</div><div class='add'>+	bool tsecr_reject = false;</div><div class='ctx'> 	bool paws_reject = false;</div><div class='ctx'> 	bool own_req;</div><div class='ctx'> </div><div class='ctx'> 	tmp_opt.saw_tstamp = 0;</div><div class='add'>+	tmp_opt.accecn = 0;</div><div class='ctx'> 	if (th-&gt;doff &gt; (sizeof(struct tcphdr)&gt;&gt;2)) {</div><div class='ctx'> 		tcp_parse_options(sock_net(sk), skb, &amp;tmp_opt, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_opt.saw_tstamp) {</div><div class='ctx'> 			tmp_opt.ts_recent = req-&gt;ts_recent;</div><div class='del'>-			if (tmp_opt.rcv_tsecr)</div><div class='add'>+			if (tmp_opt.rcv_tsecr) {</div><div class='add'>+				if (inet_rsk(req)-&gt;tstamp_ok &amp;&amp; !fastopen)</div><div class='add'>+					tsecr_reject = !between(tmp_opt.rcv_tsecr,</div><div class='add'>+							tcp_rsk(req)-&gt;snt_tsval_first,</div><div class='add'>+							READ_ONCE(tcp_rsk(req)-&gt;snt_tsval_last));</div><div class='ctx'> 				tmp_opt.rcv_tsecr -= tcp_rsk(req)-&gt;ts_off;</div><div class='add'>+			}</div><div class='ctx'> 			/* We do not store true stamp, but it is not required,</div><div class='ctx'> 			 * it can be estimated (approximately)</div><div class='ctx'> 			 * from another data.</div><div class='ctx'> 			 */</div><div class='del'>-			tmp_opt.ts_recent_stamp = ktime_get_seconds() - ((TCP_TIMEOUT_INIT/HZ)&lt;&lt;req-&gt;num_timeout);</div><div class='add'>+			tmp_opt.ts_recent_stamp = ktime_get_seconds() -</div><div class='add'>+				tcp_reqsk_timeout(req) / HZ;</div><div class='ctx'> 			paws_reject = tcp_paws_reject(&amp;tmp_opt, th-&gt;rst);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -640,11 +750,10 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 					  LINUX_MIB_TCPACKSKIPPEDSYNRECV,</div><div class='ctx'> 					  &amp;tcp_rsk(req)-&gt;last_oow_ack_time) &amp;&amp;</div><div class='ctx'> </div><div class='del'>-		    !inet_rtx_syn_ack(sk, req)) {</div><div class='add'>+		    !tcp_rtx_synack(sk, req)) {</div><div class='ctx'> 			unsigned long expires = jiffies;</div><div class='ctx'> </div><div class='del'>-			expires += min(TCP_TIMEOUT_INIT &lt;&lt; req-&gt;num_timeout,</div><div class='del'>-				       TCP_RTO_MAX);</div><div class='add'>+			expires += tcp_reqsk_timeout(req);</div><div class='ctx'> 			if (!fastopen)</div><div class='ctx'> 				mod_timer_pending(&amp;req-&gt;rsk_timer, expires);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -715,31 +824,34 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	     tcp_rsk(req)-&gt;snt_isn + 1))</div><div class='ctx'> 		return sk;</div><div class='ctx'> </div><div class='del'>-	/* Also, it would be not so bad idea to check rcv_tsecr, which</div><div class='del'>-	 * is essentially ACK extension and too early or too late values</div><div class='del'>-	 * should cause reset in unsynchronized states.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	/* RFC793: "first check sequence number". */</div><div class='ctx'> </div><div class='del'>-	if (paws_reject || !tcp_in_window(TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='del'>-					  tcp_rsk(req)-&gt;rcv_nxt, tcp_rsk(req)-&gt;rcv_nxt + req-&gt;rsk_rcv_wnd)) {</div><div class='add'>+	if (paws_reject || tsecr_reject ||</div><div class='add'>+	    !tcp_in_window(TCP_SKB_CB(skb)-&gt;seq,</div><div class='add'>+			   TCP_SKB_CB(skb)-&gt;end_seq,</div><div class='add'>+			   tcp_rsk(req)-&gt;rcv_nxt,</div><div class='add'>+			   tcp_rsk(req)-&gt;rcv_nxt +</div><div class='add'>+			   tcp_synack_window(req))) {</div><div class='ctx'> 		/* Out of window: send ACK and drop. */</div><div class='ctx'> 		if (!(flg &amp; TCP_FLAG_RST) &amp;&amp;</div><div class='ctx'> 		    !tcp_oow_rate_limited(sock_net(sk), skb,</div><div class='ctx'> 					  LINUX_MIB_TCPACKSKIPPEDSYNRECV,</div><div class='ctx'> 					  &amp;tcp_rsk(req)-&gt;last_oow_ack_time))</div><div class='ctx'> 			req-&gt;rsk_ops-&gt;send_ack(sk, skb, req);</div><div class='del'>-		if (paws_reject)</div><div class='del'>-			__NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);</div><div class='add'>+		if (paws_reject) {</div><div class='add'>+			SKB_DR_SET(*drop_reason, TCP_RFC7323_PAWS);</div><div class='add'>+			NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);</div><div class='add'>+		} else if (tsecr_reject) {</div><div class='add'>+			SKB_DR_SET(*drop_reason, TCP_RFC7323_TSECR);</div><div class='add'>+			NET_INC_STATS(sock_net(sk), LINUX_MIB_TSECRREJECTED);</div><div class='add'>+		} else {</div><div class='add'>+			SKB_DR_SET(*drop_reason, TCP_OVERWINDOW);</div><div class='add'>+		}</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* In sequence, PAWS is OK. */</div><div class='ctx'> </div><div class='del'>-	if (tmp_opt.saw_tstamp &amp;&amp; !after(TCP_SKB_CB(skb)-&gt;seq, tcp_rsk(req)-&gt;rcv_nxt))</div><div class='del'>-		req-&gt;ts_recent = tmp_opt.rcv_tsval;</div><div class='del'>-</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;seq == tcp_rsk(req)-&gt;rcv_isn) {</div><div class='ctx'> 		/* Truncate SYN, it is out of window starting</div><div class='ctx'> 		   at tcp_rsk(req)-&gt;rcv_isn + 1. */</div><div class='hunk'>@@ -750,7 +862,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	 *	   "fourth, check the SYN bit"</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flg &amp; (TCP_FLAG_RST|TCP_FLAG_SYN)) {</div><div class='del'>-		__TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);</div><div class='add'>+		TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);</div><div class='ctx'> 		goto embryonic_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -763,6 +875,18 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	if (!(flg &amp; TCP_FLAG_ACK))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (tcp_rsk(req)-&gt;accecn_ok &amp;&amp; tmp_opt.accecn &amp;&amp;</div><div class='add'>+	    tcp_rsk(req)-&gt;saw_accecn_opt &lt; TCP_ACCECN_OPT_COUNTER_SEEN) {</div><div class='add'>+		u8 saw_opt = tcp_accecn_option_init(skb, tmp_opt.accecn);</div><div class='add'>+</div><div class='add'>+		tcp_rsk(req)-&gt;saw_accecn_opt = saw_opt;</div><div class='add'>+		if (tcp_rsk(req)-&gt;saw_accecn_opt == TCP_ACCECN_OPT_FAIL_SEEN) {</div><div class='add'>+			u8 fail_mode = TCP_ACCECN_OPT_FAIL_RECV;</div><div class='add'>+</div><div class='add'>+			tcp_rsk(req)-&gt;accecn_fail_mode |= fail_mode;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* For Fast Open no more processing is needed (sk is the</div><div class='ctx'> 	 * child socket).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -770,7 +894,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		return sk;</div><div class='ctx'> </div><div class='ctx'> 	/* While TCP_DEFER_ACCEPT is active, drop bare ACK. */</div><div class='del'>-	if (req-&gt;num_timeout &lt; inet_csk(sk)-&gt;icsk_accept_queue.rskq_defer_accept &amp;&amp;</div><div class='add'>+	if (req-&gt;num_timeout &lt; READ_ONCE(inet_csk(sk)-&gt;icsk_accept_queue.rskq_defer_accept) &amp;&amp;</div><div class='ctx'> 	    TCP_SKB_CB(skb)-&gt;end_seq == tcp_rsk(req)-&gt;rcv_isn + 1) {</div><div class='ctx'> 		inet_rsk(req)-&gt;acked = 1;</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDEFERACCEPTDROP);</div><div class='hunk'>@@ -788,13 +912,27 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	if (!child)</div><div class='ctx'> 		goto listen_overflow;</div><div class='ctx'> </div><div class='add'>+	if (own_req &amp;&amp; tmp_opt.saw_tstamp &amp;&amp;</div><div class='add'>+	    !after(TCP_SKB_CB(skb)-&gt;seq, tcp_rsk(req)-&gt;rcv_nxt))</div><div class='add'>+		tcp_sk(child)-&gt;rx_opt.ts_recent = tmp_opt.rcv_tsval;</div><div class='add'>+</div><div class='add'>+	if (own_req &amp;&amp; rsk_drop_req(req)) {</div><div class='add'>+		reqsk_queue_removed(&amp;inet_csk(req-&gt;rsk_listener)-&gt;icsk_accept_queue, req);</div><div class='add'>+		inet_csk_reqsk_queue_drop_and_put(req-&gt;rsk_listener, req);</div><div class='add'>+		return child;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sock_rps_save_rxhash(child, skb);</div><div class='ctx'> 	tcp_synack_rtt_meas(child, req);</div><div class='ctx'> 	*req_stolen = !own_req;</div><div class='ctx'> 	return inet_csk_complete_hashdance(sk, child, req, own_req);</div><div class='ctx'> </div><div class='ctx'> listen_overflow:</div><div class='del'>-	if (!sock_net(sk)-&gt;ipv4.sysctl_tcp_abort_on_overflow) {</div><div class='add'>+	SKB_DR_SET(*drop_reason, TCP_LISTEN_OVERFLOW);</div><div class='add'>+	if (sk != req-&gt;rsk_listener)</div><div class='add'>+		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQFAILURE);</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_abort_on_overflow)) {</div><div class='ctx'> 		inet_rsk(req)-&gt;acked = 1;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,18 +944,21 @@ embryonic_reset:</div><div class='ctx'> 		 * avoid becoming vulnerable to outside attack aiming at</div><div class='ctx'> 		 * resetting legit local connections.</div><div class='ctx'> 		 */</div><div class='del'>-		req-&gt;rsk_ops-&gt;send_reset(sk, skb);</div><div class='add'>+		req-&gt;rsk_ops-&gt;send_reset(sk, skb, SK_RST_REASON_INVALID_SYN);</div><div class='ctx'> 	} else if (fastopen) { /* received a valid RST pkt */</div><div class='ctx'> 		reqsk_fastopen_remove(sk, req, true);</div><div class='del'>-		tcp_reset(sk);</div><div class='add'>+		tcp_reset(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!fastopen) {</div><div class='del'>-		inet_csk_reqsk_queue_drop(sk, req);</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);</div><div class='add'>+		bool unlinked = inet_csk_reqsk_queue_drop(sk, req);</div><div class='add'>+</div><div class='add'>+		if (unlinked)</div><div class='add'>+			__NET_INC_STATS(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);</div><div class='add'>+		*req_stolen = !unlinked;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_check_req);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_check_req);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Queue segment on the new socket if the new socket is active,</div><div class='hunk'>@@ -831,18 +972,19 @@ EXPORT_SYMBOL(tcp_check_req);</div><div class='ctx'>  * be created.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int tcp_child_process(struct sock *parent, struct sock *child,</div><div class='del'>-		      struct sk_buff *skb)</div><div class='add'>+enum skb_drop_reason tcp_child_process(struct sock *parent, struct sock *child,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+	__releases(&amp;((child)-&gt;sk_lock.slock))</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	enum skb_drop_reason reason = SKB_NOT_DROPPED_YET;</div><div class='ctx'> 	int state = child-&gt;sk_state;</div><div class='ctx'> </div><div class='del'>-	/* record NAPI ID of child */</div><div class='del'>-	sk_mark_napi_id(child, skb);</div><div class='add'>+	/* record sk_napi_id and sk_rx_queue_mapping of child. */</div><div class='add'>+	sk_mark_napi_id_set(child, skb);</div><div class='ctx'> </div><div class='ctx'> 	tcp_segs_in(tcp_sk(child), skb);</div><div class='ctx'> 	if (!sock_owned_by_user(child)) {</div><div class='del'>-		ret = tcp_rcv_state_process(child, skb);</div><div class='add'>+		reason = tcp_rcv_state_process(child, skb);</div><div class='ctx'> 		/* Wakeup parent, send SIGIO */</div><div class='ctx'> 		if (state == TCP_SYN_RECV &amp;&amp; child-&gt;sk_state != state)</div><div class='ctx'> 			parent-&gt;sk_data_ready(parent);</div><div class='hunk'>@@ -856,6 +998,6 @@ int tcp_child_process(struct sock *parent, struct sock *child,</div><div class='ctx'> </div><div class='ctx'> 	bh_unlock_sock(child);</div><div class='ctx'> 	sock_put(child);</div><div class='del'>-	return ret;</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_child_process);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_child_process);</div><div class='head'>diff --git a/net/ipv4/tcp_nv.c b/net/ipv4/tcp_nv.c<br/>index 764298e52577..a60662f4bdf9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_nv.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_nv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_nv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_nv.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP NV: TCP with Congestion Avoidance</div><div class='ctx'>  *</div><div class='hunk'>@@ -24,7 +25,6 @@</div><div class='ctx'>  * 1) Add mechanism to deal with reverse congestion.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='hunk'>@@ -197,10 +197,10 @@ static void tcpnv_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ca-&gt;cwnd_growth_factor &lt; 0) {</div><div class='del'>-		cnt = tp-&gt;snd_cwnd &lt;&lt; -ca-&gt;cwnd_growth_factor;</div><div class='add'>+		cnt = tcp_snd_cwnd(tp) &lt;&lt; -ca-&gt;cwnd_growth_factor;</div><div class='ctx'> 		tcp_cong_avoid_ai(tp, cnt, acked);</div><div class='ctx'> 	} else {</div><div class='del'>-		cnt = max(4U, tp-&gt;snd_cwnd &gt;&gt; ca-&gt;cwnd_growth_factor);</div><div class='add'>+		cnt = max(4U, tcp_snd_cwnd(tp) &gt;&gt; ca-&gt;cwnd_growth_factor);</div><div class='ctx'> 		tcp_cong_avoid_ai(tp, cnt, acked);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -209,7 +209,7 @@ static u32 tcpnv_recalc_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return max((tp-&gt;snd_cwnd * nv_loss_dec_factor) &gt;&gt; 10, 2U);</div><div class='add'>+	return max((tcp_snd_cwnd(tp) * nv_loss_dec_factor) &gt;&gt; 10, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcpnv_state(struct sock *sk, u8 new_state)</div><div class='hunk'>@@ -257,7 +257,7 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Stop cwnd growth if we were in catch up mode */</div><div class='del'>-	if (ca-&gt;nv_catchup &amp;&amp; tp-&gt;snd_cwnd &gt;= nv_min_cwnd) {</div><div class='add'>+	if (ca-&gt;nv_catchup &amp;&amp; tcp_snd_cwnd(tp) &gt;= nv_min_cwnd) {</div><div class='ctx'> 		ca-&gt;nv_catchup = 0;</div><div class='ctx'> 		ca-&gt;nv_allow_cwnd_growth = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -371,7 +371,7 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 		 * if cwnd &lt; max_win, grow cwnd</div><div class='ctx'> 		 * else leave the same</div><div class='ctx'> 		 */</div><div class='del'>-		if (tp-&gt;snd_cwnd &gt; max_win) {</div><div class='add'>+		if (tcp_snd_cwnd(tp) &gt; max_win) {</div><div class='ctx'> 			/* there is congestion, check that it is ok</div><div class='ctx'> 			 * to make a CA decision</div><div class='ctx'> 			 * 1. We should have at least nv_dec_eval_min_calls</div><div class='hunk'>@@ -398,20 +398,20 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 			ca-&gt;nv_allow_cwnd_growth = 0;</div><div class='ctx'> 			tp-&gt;snd_ssthresh =</div><div class='ctx'> 				(nv_ssthresh_factor * max_win) &gt;&gt; 3;</div><div class='del'>-			if (tp-&gt;snd_cwnd - max_win &gt; 2) {</div><div class='add'>+			if (tcp_snd_cwnd(tp) - max_win &gt; 2) {</div><div class='ctx'> 				/* gap &gt; 2, we do exponential cwnd decrease */</div><div class='ctx'> 				int dec;</div><div class='ctx'> </div><div class='del'>-				dec = max(2U, ((tp-&gt;snd_cwnd - max_win) *</div><div class='add'>+				dec = max(2U, ((tcp_snd_cwnd(tp) - max_win) *</div><div class='ctx'> 					       nv_cong_dec_mult) &gt;&gt; 7);</div><div class='del'>-				tp-&gt;snd_cwnd -= dec;</div><div class='add'>+				tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) - dec);</div><div class='ctx'> 			} else if (nv_cong_dec_mult &gt; 0) {</div><div class='del'>-				tp-&gt;snd_cwnd = max_win;</div><div class='add'>+				tcp_snd_cwnd_set(tp, max_win);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (ca-&gt;cwnd_growth_factor &gt; 0)</div><div class='ctx'> 				ca-&gt;cwnd_growth_factor = 0;</div><div class='ctx'> 			ca-&gt;nv_no_cong_cnt = 0;</div><div class='del'>-		} else if (tp-&gt;snd_cwnd &lt;= max_win - nv_pad_buffer) {</div><div class='add'>+		} else if (tcp_snd_cwnd(tp) &lt;= max_win - nv_pad_buffer) {</div><div class='ctx'> 			/* There is no congestion, grow cwnd if allowed*/</div><div class='ctx'> 			if (ca-&gt;nv_eval_call_cnt &lt; nv_inc_eval_min_calls)</div><div class='ctx'> 				return;</div><div class='hunk'>@@ -444,8 +444,8 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample)</div><div class='ctx'> 		 * (it wasn't before, if it is now is because nv</div><div class='ctx'> 		 *  decreased it).</div><div class='ctx'> 		 */</div><div class='del'>-		if (tp-&gt;snd_cwnd &lt; nv_min_cwnd)</div><div class='del'>-			tp-&gt;snd_cwnd = nv_min_cwnd;</div><div class='add'>+		if (tcp_snd_cwnd(tp) &lt; nv_min_cwnd)</div><div class='add'>+			tcp_snd_cwnd_set(tp, nv_min_cwnd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c<br/>index 870b0a335061..fdda18b1abda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_offload.c</a></div><div class='hunk'>@@ -1,25 +1,27 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV4 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	TCPv4 GSO/GRO support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> </div><div class='del'>-static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq,</div><div class='add'>+static void tcp_gso_tstamp(struct sk_buff *skb, struct sk_buff *gso_skb,</div><div class='ctx'> 			   unsigned int seq, unsigned int mss)</div><div class='ctx'> {</div><div class='add'>+	u32 flags = skb_shinfo(gso_skb)-&gt;tx_flags &amp; SKBTX_ANY_TSTAMP;</div><div class='add'>+	u32 ts_seq = skb_shinfo(gso_skb)-&gt;tskey;</div><div class='add'>+</div><div class='ctx'> 	while (skb) {</div><div class='ctx'> 		if (before(ts_seq, seq + mss)) {</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_SW_TSTAMP;</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags |= flags;</div><div class='ctx'> 			skb_shinfo(skb)-&gt;tskey = ts_seq;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -29,6 +31,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __tcpv4_gso_segment_csum(struct sk_buff *seg,</div><div class='add'>+				     __be32 *oldip, __be32 newip,</div><div class='add'>+				     __be16 *oldport, __be16 newport)</div><div class='add'>+{</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	if (*oldip == newip &amp;&amp; *oldport == newport)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	th = tcp_hdr(seg);</div><div class='add'>+	iph = ip_hdr(seg);</div><div class='add'>+</div><div class='add'>+	inet_proto_csum_replace4(&amp;th-&gt;check, seg, *oldip, newip, true);</div><div class='add'>+	inet_proto_csum_replace2(&amp;th-&gt;check, seg, *oldport, newport, false);</div><div class='add'>+	*oldport = newport;</div><div class='add'>+</div><div class='add'>+	csum_replace4(&amp;iph-&gt;check, *oldip, newip);</div><div class='add'>+	*oldip = newip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__tcpv4_gso_segment_list_csum(struct sk_buff *segs)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th;</div><div class='add'>+	const struct iphdr *iph;</div><div class='add'>+	struct sk_buff *seg;</div><div class='add'>+	struct tcphdr *th2;</div><div class='add'>+	struct iphdr *iph2;</div><div class='add'>+</div><div class='add'>+	seg = segs;</div><div class='add'>+	th = tcp_hdr(seg);</div><div class='add'>+	iph = ip_hdr(seg);</div><div class='add'>+	th2 = tcp_hdr(seg-&gt;next);</div><div class='add'>+	iph2 = ip_hdr(seg-&gt;next);</div><div class='add'>+</div><div class='add'>+	if (!(*(const u32 *)&amp;th-&gt;source ^ *(const u32 *)&amp;th2-&gt;source) &amp;&amp;</div><div class='add'>+	    iph-&gt;daddr == iph2-&gt;daddr &amp;&amp; iph-&gt;saddr == iph2-&gt;saddr)</div><div class='add'>+		return segs;</div><div class='add'>+</div><div class='add'>+	while ((seg = seg-&gt;next)) {</div><div class='add'>+		th2 = tcp_hdr(seg);</div><div class='add'>+		iph2 = ip_hdr(seg);</div><div class='add'>+</div><div class='add'>+		__tcpv4_gso_segment_csum(seg,</div><div class='add'>+					 &amp;iph2-&gt;saddr, iph-&gt;saddr,</div><div class='add'>+					 &amp;th2-&gt;source, th-&gt;source);</div><div class='add'>+		__tcpv4_gso_segment_csum(seg,</div><div class='add'>+					 &amp;iph2-&gt;daddr, iph-&gt;daddr,</div><div class='add'>+					 &amp;th2-&gt;dest, th-&gt;dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__tcp4_gso_segment_list(struct sk_buff *skb,</div><div class='add'>+					      netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	skb = skb_segment_list(skb, features, skb_mac_header_len(skb));</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	return __tcpv4_gso_segment_list_csum(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 					netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -38,6 +104,15 @@ static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct tcphdr)))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST) {</div><div class='add'>+		struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+</div><div class='add'>+		if (skb_pagelen(skb) - th-&gt;doff * 4 == skb_shinfo(skb)-&gt;gso_size)</div><div class='add'>+			return __tcp4_gso_segment_list(skb, features);</div><div class='add'>+</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(skb-&gt;ip_summed != CHECKSUM_PARTIAL)) {</div><div class='ctx'> 		const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 		struct tcphdr *th = tcp_hdr(skb);</div><div class='hunk'>@@ -62,22 +137,26 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	struct tcphdr *th;</div><div class='ctx'> 	unsigned int thlen;</div><div class='ctx'> 	unsigned int seq;</div><div class='del'>-	__be32 delta;</div><div class='ctx'> 	unsigned int oldlen;</div><div class='ctx'> 	unsigned int mss;</div><div class='ctx'> 	struct sk_buff *gso_skb = skb;</div><div class='ctx'> 	__sum16 newcheck;</div><div class='ctx'> 	bool ooo_okay, copy_destructor;</div><div class='add'>+	bool ecn_cwr_mask;</div><div class='add'>+	__wsum delta;</div><div class='ctx'> </div><div class='ctx'> 	th = tcp_hdr(skb);</div><div class='ctx'> 	thlen = th-&gt;doff * 4;</div><div class='ctx'> 	if (thlen &lt; sizeof(*th))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(skb_checksum_start(skb) != skb_transport_header(skb)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (!pskb_may_pull(skb, thlen))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	oldlen = (u16)~skb-&gt;len;</div><div class='add'>+	oldlen = ~skb-&gt;len;</div><div class='ctx'> 	__skb_pull(skb, thlen);</div><div class='ctx'> </div><div class='ctx'> 	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='hunk'>@@ -112,17 +191,18 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	if (skb_is_gso(segs))</div><div class='ctx'> 		mss *= skb_shinfo(segs)-&gt;gso_segs;</div><div class='ctx'> </div><div class='del'>-	delta = htonl(oldlen + (thlen + mss));</div><div class='add'>+	delta = (__force __wsum)htonl(oldlen + thlen + mss);</div><div class='ctx'> </div><div class='ctx'> 	skb = segs;</div><div class='ctx'> 	th = tcp_hdr(skb);</div><div class='ctx'> 	seq = ntohl(th-&gt;seq);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(skb_shinfo(gso_skb)-&gt;tx_flags &amp; SKBTX_SW_TSTAMP))</div><div class='del'>-		tcp_gso_tstamp(segs, skb_shinfo(gso_skb)-&gt;tskey, seq, mss);</div><div class='add'>+	if (unlikely(skb_shinfo(gso_skb)-&gt;tx_flags &amp; SKBTX_ANY_TSTAMP))</div><div class='add'>+		tcp_gso_tstamp(segs, gso_skb, seq, mss);</div><div class='add'>+</div><div class='add'>+	newcheck = ~csum_fold(csum_add(csum_unfold(th-&gt;check), delta));</div><div class='ctx'> </div><div class='del'>-	newcheck = ~csum_fold((__force __wsum)((__force u32)th-&gt;check +</div><div class='del'>-					       (__force u32)delta));</div><div class='add'>+	ecn_cwr_mask = !!(skb_shinfo(gso_skb)-&gt;gso_type &amp; SKB_GSO_TCP_ACCECN);</div><div class='ctx'> </div><div class='ctx'> 	while (skb-&gt;next) {</div><div class='ctx'> 		th-&gt;fin = th-&gt;psh = 0;</div><div class='hunk'>@@ -143,7 +223,8 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 		th = tcp_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		th-&gt;seq = htonl(seq);</div><div class='del'>-		th-&gt;cwr = 0;</div><div class='add'>+</div><div class='add'>+		th-&gt;cwr &amp;= ecn_cwr_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Following permits TCP Small Queues to work well with GSO :</div><div class='hunk'>@@ -167,11 +248,11 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 			WARN_ON_ONCE(refcount_sub_and_test(-delta, &amp;skb-&gt;sk-&gt;sk_wmem_alloc));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	delta = htonl(oldlen + (skb_tail_pointer(skb) -</div><div class='del'>-				skb_transport_header(skb)) +</div><div class='del'>-		      skb-&gt;data_len);</div><div class='del'>-	th-&gt;check = ~csum_fold((__force __wsum)((__force u32)th-&gt;check +</div><div class='del'>-				(__force u32)delta));</div><div class='add'>+	delta = (__force __wsum)htonl(oldlen +</div><div class='add'>+				      (skb_tail_pointer(skb) -</div><div class='add'>+				       skb_transport_header(skb)) +</div><div class='add'>+				      skb-&gt;data_len);</div><div class='add'>+	th-&gt;check = ~csum_fold(csum_add(csum_unfold(th-&gt;check), delta));</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 		gso_reset_checksum(skb, ~th-&gt;check);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -180,91 +261,84 @@ out:</div><div class='ctx'> 	return segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='add'>+struct sk_buff *tcp_gro_lookup(struct list_head *head, struct tcphdr *th)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *pp = NULL;</div><div class='del'>-	struct sk_buff *p;</div><div class='del'>-	struct tcphdr *th;</div><div class='ctx'> 	struct tcphdr *th2;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned int thlen;</div><div class='del'>-	__be32 flags;</div><div class='del'>-	unsigned int mss = 1;</div><div class='del'>-	unsigned int hlen;</div><div class='del'>-	unsigned int off;</div><div class='del'>-	int flush = 1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	off = skb_gro_offset(skb);</div><div class='del'>-	hlen = off + sizeof(*th);</div><div class='del'>-	th = skb_gro_header_fast(skb, off);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		th = skb_gro_header_slow(skb, hlen, off);</div><div class='del'>-		if (unlikely(!th))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thlen = th-&gt;doff * 4;</div><div class='del'>-	if (thlen &lt; sizeof(*th))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	hlen = off + thlen;</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		th = skb_gro_header_slow(skb, hlen, off);</div><div class='del'>-		if (unlikely(!th))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_gro_pull(skb, thlen);</div><div class='del'>-</div><div class='del'>-	len = skb_gro_len(skb);</div><div class='del'>-	flags = tcp_flag_word(th);</div><div class='add'>+	struct sk_buff *p;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, head, list) {</div><div class='ctx'> 		if (!NAPI_GRO_CB(p)-&gt;same_flow)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		th2 = tcp_hdr(p);</div><div class='del'>-</div><div class='ctx'> 		if (*(u32 *)&amp;th-&gt;source ^ *(u32 *)&amp;th2-&gt;source) {</div><div class='ctx'> 			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		goto found;</div><div class='add'>+		return p;</div><div class='ctx'> 	}</div><div class='del'>-	p = NULL;</div><div class='del'>-	goto out_check_final;</div><div class='ctx'> </div><div class='del'>-found:</div><div class='del'>-	/* Include the IP ID check below from the inner most IP hdr */</div><div class='del'>-	flush = NAPI_GRO_CB(p)-&gt;flush;</div><div class='del'>-	flush |= (__force int)(flags &amp; TCP_FLAG_CWR);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb,</div><div class='add'>+				struct tcphdr *th)</div><div class='add'>+{</div><div class='add'>+	unsigned int thlen = th-&gt;doff * 4;</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	struct tcphdr *th2;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	__be32 flags;</div><div class='add'>+	unsigned int mss = 1;</div><div class='add'>+	int flush = 1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len = skb_gro_len(skb);</div><div class='add'>+	flags = tcp_flag_word(th);</div><div class='add'>+</div><div class='add'>+	p = tcp_gro_lookup(head, th);</div><div class='add'>+	if (!p)</div><div class='add'>+		goto out_check_final;</div><div class='add'>+</div><div class='add'>+	th2 = tcp_hdr(p);</div><div class='add'>+	flush = (__force int)(flags &amp; TCP_FLAG_CWR);</div><div class='ctx'> 	flush |= (__force int)((flags ^ tcp_flag_word(th2)) &amp;</div><div class='del'>-		  ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));</div><div class='add'>+		  ~(TCP_FLAG_FIN | TCP_FLAG_PSH));</div><div class='ctx'> 	flush |= (__force int)(th-&gt;ack_seq ^ th2-&gt;ack_seq);</div><div class='ctx'> 	for (i = sizeof(*th); i &lt; thlen; i += 4)</div><div class='ctx'> 		flush |= *(u32 *)((u8 *)th + i) ^</div><div class='ctx'> 			 *(u32 *)((u8 *)th2 + i);</div><div class='ctx'> </div><div class='del'>-	/* When we receive our second frame we can made a decision on if we</div><div class='del'>-	 * continue this flow as an atomic flow with a fixed ID or if we use</div><div class='del'>-	 * an incrementing ID.</div><div class='del'>-	 */</div><div class='del'>-	if (NAPI_GRO_CB(p)-&gt;flush_id != 1 ||</div><div class='del'>-	    NAPI_GRO_CB(p)-&gt;count != 1 ||</div><div class='del'>-	    !NAPI_GRO_CB(p)-&gt;is_atomic)</div><div class='del'>-		flush |= NAPI_GRO_CB(p)-&gt;flush_id;</div><div class='del'>-	else</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;is_atomic = false;</div><div class='add'>+	flush |= gro_receive_network_flush(th, th2, p);</div><div class='ctx'> </div><div class='ctx'> 	mss = skb_shinfo(p)-&gt;gso_size;</div><div class='ctx'> </div><div class='del'>-	flush |= (len - 1) &gt;= mss;</div><div class='add'>+	/* If skb is a GRO packet, make sure its gso_size matches prior packet mss.</div><div class='add'>+	 * If it is a single frame, do not aggregate it if its length</div><div class='add'>+	 * is bigger than our mss.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb_is_gso(skb)))</div><div class='add'>+		flush |= (mss != skb_shinfo(skb)-&gt;gso_size);</div><div class='add'>+	else</div><div class='add'>+		flush |= (len - 1) &gt;= mss;</div><div class='add'>+</div><div class='ctx'> 	flush |= (ntohl(th2-&gt;seq) + skb_gro_len(p)) ^ ntohl(th-&gt;seq);</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='del'>-	flush |= p-&gt;decrypted ^ skb-&gt;decrypted;</div><div class='del'>-#endif</div><div class='add'>+	flush |= skb_cmp_decrypted(p, skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(NAPI_GRO_CB(p)-&gt;is_flist)) {</div><div class='add'>+		flush |= (__force int)(flags ^ tcp_flag_word(th2));</div><div class='add'>+		flush |= skb-&gt;ip_summed != p-&gt;ip_summed;</div><div class='add'>+		flush |= skb-&gt;csum_level != p-&gt;csum_level;</div><div class='add'>+		flush |= NAPI_GRO_CB(p)-&gt;count &gt;= 64;</div><div class='add'>+		skb_set_network_header(skb, skb_gro_receive_network_offset(skb));</div><div class='add'>+</div><div class='add'>+		if (flush || skb_gro_receive_list(p, skb))</div><div class='add'>+			mss = 1;</div><div class='add'>+</div><div class='add'>+		goto out_check_final;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (flush || skb_gro_receive(p, skb)) {</div><div class='ctx'> 		mss = 1;</div><div class='hunk'>@@ -274,7 +348,12 @@ found:</div><div class='ctx'> 	tcp_flag_word(th2) |= flags &amp; (TCP_FLAG_FIN | TCP_FLAG_PSH);</div><div class='ctx'> </div><div class='ctx'> out_check_final:</div><div class='del'>-	flush = len &lt; mss;</div><div class='add'>+	/* Force a flush if last segment is smaller than mss. */</div><div class='add'>+	if (unlikely(skb_is_gso(skb)))</div><div class='add'>+		flush = len != NAPI_GRO_CB(skb)-&gt;count * skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	else</div><div class='add'>+		flush = len &lt; mss;</div><div class='add'>+</div><div class='ctx'> 	flush |= (__force int)(flags &amp; (TCP_FLAG_URG | TCP_FLAG_PSH |</div><div class='ctx'> 					TCP_FLAG_RST | TCP_FLAG_SYN |</div><div class='ctx'> 					TCP_FLAG_FIN));</div><div class='hunk'>@@ -282,66 +361,118 @@ out_check_final:</div><div class='ctx'> 	if (p &amp;&amp; (!NAPI_GRO_CB(skb)-&gt;same_flow || flush))</div><div class='ctx'> 		pp = p;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;flush |= (flush != 0);</div><div class='ctx'> </div><div class='ctx'> 	return pp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tcp_gro_complete(struct sk_buff *skb)</div><div class='add'>+void tcp_gro_complete(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;encapsulation)</div><div class='add'>+		skb-&gt;inner_transport_header = skb-&gt;transport_header;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;csum_start = (unsigned char *)th - skb-&gt;head;</div><div class='ctx'> 	skb-&gt;csum_offset = offsetof(struct tcphdr, check);</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='del'>-	skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+	shinfo = skb_shinfo(skb);</div><div class='add'>+	shinfo-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 	if (th-&gt;cwr)</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCP_ECN;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+		shinfo-&gt;gso_type |= SKB_GSO_TCP_ACCECN;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_gro_complete);</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='add'>+static void tcp4_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,</div><div class='add'>+				    struct tcphdr *th)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int iif, sdif;</div><div class='add'>+</div><div class='add'>+	if (likely(!(skb-&gt;dev-&gt;features &amp; NETIF_F_GRO_FRAGLIST)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p = tcp_gro_lookup(head, th);</div><div class='add'>+	if (p) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;is_flist = NAPI_GRO_CB(p)-&gt;is_flist;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inet_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+	iph = skb_gro_network_header(skb);</div><div class='add'>+	net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	sk = __inet_lookup_established(net, iph-&gt;saddr, th-&gt;source,</div><div class='add'>+				       iph-&gt;daddr, ntohs(th-&gt;dest),</div><div class='add'>+				       iif, sdif);</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;is_flist = !sk;</div><div class='add'>+	if (sk)</div><div class='add'>+		sock_gen_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+</div><div class='ctx'> 	/* Don't bother verifying checksum if we're going to flush anyway. */</div><div class='ctx'> 	if (!NAPI_GRO_CB(skb)-&gt;flush &amp;&amp;</div><div class='ctx'> 	    skb_gro_checksum_validate(skb, IPPROTO_TCP,</div><div class='del'>-				      inet_gro_compute_pseudo)) {</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+				      inet_gro_compute_pseudo))</div><div class='add'>+		goto flush;</div><div class='add'>+</div><div class='add'>+	th = tcp_gro_pull_header(skb);</div><div class='add'>+	if (!th)</div><div class='add'>+		goto flush;</div><div class='add'>+</div><div class='add'>+	tcp4_check_fraglist_gro(head, skb, th);</div><div class='add'>+</div><div class='add'>+	return tcp_gro_receive(head, skb, th);</div><div class='ctx'> </div><div class='del'>-	return tcp_gro_receive(head, skb);</div><div class='add'>+flush:</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp4_gro_complete(struct sk_buff *skb, int thoff)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct iphdr *iph = (struct iphdr *)(skb-&gt;data + offset);</div><div class='ctx'> 	struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(NAPI_GRO_CB(skb)-&gt;is_flist)) {</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_FRAGLIST | SKB_GSO_TCPV4;</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	th-&gt;check = ~tcp_v4_check(skb-&gt;len - thoff, iph-&gt;saddr,</div><div class='ctx'> 				  iph-&gt;daddr, 0);</div><div class='del'>-	skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCPV4;</div><div class='ctx'> </div><div class='del'>-	if (NAPI_GRO_CB(skb)-&gt;is_atomic)</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCP_FIXEDID;</div><div class='add'>+	BUILD_BUG_ON(SKB_GSO_TCP_FIXEDID &lt;&lt; 1 != SKB_GSO_TCP_FIXEDID_INNER);</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCPV4 |</div><div class='add'>+			(NAPI_GRO_CB(skb)-&gt;ip_fixedid * SKB_GSO_TCP_FIXEDID);</div><div class='ctx'> </div><div class='del'>-	return tcp_gro_complete(skb);</div><div class='add'>+	tcp_gro_complete(skb);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct net_offload tcpv4_offload = {</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment	=	tcp4_gso_segment,</div><div class='del'>-		.gro_receive	=	tcp4_gro_receive,</div><div class='del'>-		.gro_complete	=	tcp4_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int __init tcpv4_offload_init(void)</div><div class='ctx'> {</div><div class='del'>-	return inet_add_offload(&amp;tcpv4_offload, IPPROTO_TCP);</div><div class='add'>+	net_hotdata.tcpv4_offload = (struct net_offload) {</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment	=	tcp4_gso_segment,</div><div class='add'>+			.gro_receive	=	tcp4_gro_receive,</div><div class='add'>+			.gro_complete	=	tcp4_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	return inet_add_offload(&amp;net_hotdata.tcpv4_offload, IPPROTO_TCP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c<br/>index 597dbd749f05..479afb714bdf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_output.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -37,14 +38,31 @@</div><div class='ctx'> #define pr_fmt(fmt) "TCP: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='add'>+#include &lt;net/mptcp.h&gt;</div><div class='add'>+#include &lt;net/smc.h&gt;</div><div class='add'>+#include &lt;net/proto_memory.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/tcp.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Refresh clocks of a TCP socket,</div><div class='add'>+ * ensuring monotically increasing values.</div><div class='add'>+ */</div><div class='add'>+void tcp_mstamp_refresh(struct tcp_sock *tp)</div><div class='add'>+{</div><div class='add'>+	u64 val = tcp_clock_ns();</div><div class='add'>+</div><div class='add'>+	tp-&gt;tcp_clock_cache = val;</div><div class='add'>+	tp-&gt;tcp_mstamp = div_u64(val, NSEC_PER_USEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,</div><div class='ctx'> 			   int push_one, gfp_t gfp);</div><div class='ctx'> </div><div class='hunk'>@@ -55,17 +73,21 @@ static void tcp_event_new_data_sent(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned int prior_packets = tp-&gt;packets_out;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;snd_nxt = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='add'>+	WRITE_ONCE(tp-&gt;snd_nxt, TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> </div><div class='ctx'> 	__skb_unlink(skb, &amp;sk-&gt;sk_write_queue);</div><div class='ctx'> 	tcp_rbtree_insert(&amp;sk-&gt;tcp_rtx_queue, skb);</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;highest_sack == NULL)</div><div class='add'>+		tp-&gt;highest_sack = skb;</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;packets_out += tcp_skb_pcount(skb);</div><div class='ctx'> 	if (!prior_packets || icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE)</div><div class='ctx'> 		tcp_rearm_rto(sk);</div><div class='ctx'> </div><div class='ctx'> 	NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPORIGDATASENT,</div><div class='ctx'> 		      tcp_skb_pcount(skb));</div><div class='add'>+	tcp_check_space(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SND.NXT, if window was not shrunk or the amount of shrunk was less than one</div><div class='hunk'>@@ -126,7 +148,7 @@ void tcp_cwnd_restart(struct sock *sk, s32 delta)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 restart_cwnd = tcp_init_cwnd(tp, __sk_dst_get(sk));</div><div class='del'>-	u32 cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	u32 cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='ctx'> 	tcp_ca_event(sk, CA_EVENT_CWND_RESTART);</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +157,7 @@ void tcp_cwnd_restart(struct sock *sk, s32 delta)</div><div class='ctx'> </div><div class='ctx'> 	while ((delta -= inet_csk(sk)-&gt;icsk_rto) &gt; 0 &amp;&amp; cwnd &gt; restart_cwnd)</div><div class='ctx'> 		cwnd &gt;&gt;= 1;</div><div class='del'>-	tp-&gt;snd_cwnd = max(cwnd, restart_cwnd);</div><div class='add'>+	tcp_snd_cwnd_set(tp, max(cwnd, restart_cwnd));</div><div class='ctx'> 	tp-&gt;snd_cwnd_stamp = tcp_jiffies32;</div><div class='ctx'> 	tp-&gt;snd_cwnd_used = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -153,15 +175,14 @@ static void tcp_event_data_sent(struct tcp_sock *tp,</div><div class='ctx'> 	tp-&gt;lsndtime = now;</div><div class='ctx'> </div><div class='ctx'> 	/* If it is a reply for ato after last received</div><div class='del'>-	 * packet, enter pingpong mode.</div><div class='add'>+	 * packet, increase pingpong count.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((u32)(now - icsk-&gt;icsk_ack.lrcvtime) &lt; icsk-&gt;icsk_ack.ato)</div><div class='del'>-		icsk-&gt;icsk_ack.pingpong = 1;</div><div class='add'>+		inet_csk_inc_pingpong_cnt(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Account for an ACK we sent. */</div><div class='del'>-static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts,</div><div class='del'>-				      u32 rcv_nxt)</div><div class='add'>+static inline void tcp_event_ack_sent(struct sock *sk, u32 rcv_nxt)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -175,25 +196,10 @@ static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rcv_nxt != tp-&gt;rcv_nxt))</div><div class='ctx'> 		return;  /* Special ACK sent by DCTCP to reflect ECN */</div><div class='del'>-	tcp_dec_quickack_mode(sk, pkts);</div><div class='add'>+	tcp_dec_quickack_mode(sk);</div><div class='ctx'> 	inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-u32 tcp_default_init_rwnd(u32 mss)</div><div class='del'>-{</div><div class='del'>-	/* Initial receive window should be twice of TCP_INIT_CWND to</div><div class='del'>-	 * enable proper sending of new unsent data during fast recovery</div><div class='del'>-	 * (RFC 3517, Section 4, NextSeg() rule (2)). Further place a</div><div class='del'>-	 * limit when mss is larger than 1460.</div><div class='del'>-	 */</div><div class='del'>-	u32 init_rwnd = TCP_INIT_CWND * 2;</div><div class='del'>-</div><div class='del'>-	if (mss &gt; 1460)</div><div class='del'>-		init_rwnd = max((1460 * init_rwnd) / mss, 2U);</div><div class='del'>-	return init_rwnd;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Determine a window scaling and initial window to offer.</div><div class='ctx'>  * Based on the assumption that the given amount of space</div><div class='ctx'>  * will be offered. Store the results in the tp structure.</div><div class='hunk'>@@ -202,16 +208,17 @@ u32 tcp_default_init_rwnd(u32 mss)</div><div class='ctx'>  * This MUST be enforced by all callers.</div><div class='ctx'>  */</div><div class='ctx'> void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,</div><div class='del'>-			       __u32 *rcv_wnd, __u32 *window_clamp,</div><div class='add'>+			       __u32 *rcv_wnd, __u32 *__window_clamp,</div><div class='ctx'> 			       int wscale_ok, __u8 *rcv_wscale,</div><div class='ctx'> 			       __u32 init_rcv_wnd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int space = (__space &lt; 0 ? 0 : __space);</div><div class='add'>+	u32 window_clamp = READ_ONCE(*__window_clamp);</div><div class='ctx'> </div><div class='ctx'> 	/* If no clamp set the clamp to the max possible scaled window */</div><div class='del'>-	if (*window_clamp == 0)</div><div class='del'>-		(*window_clamp) = (U16_MAX &lt;&lt; TCP_MAX_WSCALE);</div><div class='del'>-	space = min(*window_clamp, space);</div><div class='add'>+	if (window_clamp == 0)</div><div class='add'>+		window_clamp = (U16_MAX &lt;&lt; TCP_MAX_WSCALE);</div><div class='add'>+	space = min(window_clamp, space);</div><div class='ctx'> </div><div class='ctx'> 	/* Quantize space offering to a multiple of mss if possible. */</div><div class='ctx'> 	if (space &gt; mss)</div><div class='hunk'>@@ -225,31 +232,28 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,</div><div class='ctx'> 	 * which we interpret as a sign the remote TCP is not</div><div class='ctx'> 	 * misinterpreting the window field as a signed quantity.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_workaround_signed_windows)</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_workaround_signed_windows))</div><div class='ctx'> 		(*rcv_wnd) = min(space, MAX_TCP_WINDOW);</div><div class='ctx'> 	else</div><div class='ctx'> 		(*rcv_wnd) = space;</div><div class='ctx'> </div><div class='del'>-	(*rcv_wscale) = 0;</div><div class='add'>+	if (init_rcv_wnd)</div><div class='add'>+		*rcv_wnd = min(*rcv_wnd, init_rcv_wnd * mss);</div><div class='add'>+</div><div class='add'>+	*rcv_wscale = 0;</div><div class='ctx'> 	if (wscale_ok) {</div><div class='ctx'> 		/* Set window scaling on max possible window */</div><div class='del'>-		space = max_t(u32, space, sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]);</div><div class='del'>-		space = max_t(u32, space, sysctl_rmem_max);</div><div class='del'>-		space = min_t(u32, space, *window_clamp);</div><div class='del'>-		while (space &gt; U16_MAX &amp;&amp; (*rcv_wscale) &lt; TCP_MAX_WSCALE) {</div><div class='del'>-			space &gt;&gt;= 1;</div><div class='del'>-			(*rcv_wscale)++;</div><div class='del'>-		}</div><div class='add'>+		space = max_t(u32, space, READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_rmem[2]));</div><div class='add'>+		space = max_t(u32, space, READ_ONCE(sysctl_rmem_max));</div><div class='add'>+		space = min_t(u32, space, window_clamp);</div><div class='add'>+		*rcv_wscale = clamp_t(int, ilog2(space) - 15,</div><div class='add'>+				      0, TCP_MAX_WSCALE);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (!init_rcv_wnd) /* Use default unless specified otherwise */</div><div class='del'>-		init_rcv_wnd = tcp_default_init_rwnd(mss);</div><div class='del'>-	*rcv_wnd = min(*rcv_wnd, init_rcv_wnd * mss);</div><div class='del'>-</div><div class='ctx'> 	/* Set the clamp no higher than max representable value */</div><div class='del'>-	(*window_clamp) = min_t(__u32, U16_MAX &lt;&lt; (*rcv_wscale), *window_clamp);</div><div class='add'>+	WRITE_ONCE(*__window_clamp,</div><div class='add'>+		   min_t(__u32, U16_MAX &lt;&lt; (*rcv_wscale), window_clamp));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_select_initial_window);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_select_initial_window);</div><div class='ctx'> </div><div class='ctx'> /* Chose a new window to advertise, update state in tcp_sock for the</div><div class='ctx'>  * socket, and return result with RFC1323 scaling applied.  The return</div><div class='hunk'>@@ -259,11 +263,22 @@ EXPORT_SYMBOL(tcp_select_initial_window);</div><div class='ctx'> static u16 tcp_select_window(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	u32 old_win = tp-&gt;rcv_wnd;</div><div class='del'>-	u32 cur_win = tcp_receive_window(tp);</div><div class='del'>-	u32 new_win = __tcp_select_window(sk);</div><div class='add'>+	u32 cur_win, new_win;</div><div class='ctx'> </div><div class='del'>-	/* Never shrink the offered window */</div><div class='add'>+	/* Make the window 0 if we failed to queue the data because we</div><div class='add'>+	 * are out of memory.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(inet_csk(sk)-&gt;icsk_ack.pending &amp; ICSK_ACK_NOMEM)) {</div><div class='add'>+		tp-&gt;pred_flags = 0;</div><div class='add'>+		tp-&gt;rcv_wnd = 0;</div><div class='add'>+		tp-&gt;rcv_wup = tp-&gt;rcv_nxt;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cur_win = tcp_receive_window(tp);</div><div class='add'>+	new_win = __tcp_select_window(sk);</div><div class='ctx'> 	if (new_win &lt; cur_win) {</div><div class='ctx'> 		/* Danger Will Robinson!</div><div class='ctx'> 		 * Don't update rcv_wup/rcv_wnd here or else</div><div class='hunk'>@@ -272,11 +287,14 @@ static u16 tcp_select_window(struct sock *sk)</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Relax Will Robinson.</div><div class='ctx'> 		 */</div><div class='del'>-		if (new_win == 0)</div><div class='del'>-			NET_INC_STATS(sock_net(sk),</div><div class='del'>-				      LINUX_MIB_TCPWANTZEROWINDOWADV);</div><div class='del'>-		new_win = ALIGN(cur_win, 1 &lt;&lt; tp-&gt;rx_opt.rcv_wscale);</div><div class='add'>+		if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_shrink_window) || !tp-&gt;rx_opt.rcv_wscale) {</div><div class='add'>+			/* Never shrink the offered window */</div><div class='add'>+			if (new_win == 0)</div><div class='add'>+				NET_INC_STATS(net, LINUX_MIB_TCPWANTZEROWINDOWADV);</div><div class='add'>+			new_win = ALIGN(cur_win, 1 &lt;&lt; tp-&gt;rx_opt.rcv_wscale);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;rcv_wnd = new_win;</div><div class='ctx'> 	tp-&gt;rcv_wup = tp-&gt;rcv_nxt;</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +302,7 @@ static u16 tcp_select_window(struct sock *sk)</div><div class='ctx'> 	 * scaled window.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!tp-&gt;rx_opt.rcv_wscale &amp;&amp;</div><div class='del'>-	    sock_net(sk)-&gt;ipv4.sysctl_tcp_workaround_signed_windows)</div><div class='add'>+	    READ_ONCE(net-&gt;ipv4.sysctl_tcp_workaround_signed_windows))</div><div class='ctx'> 		new_win = min(new_win, MAX_TCP_WINDOW);</div><div class='ctx'> 	else</div><div class='ctx'> 		new_win = min(new_win, (65535U &lt;&lt; tp-&gt;rx_opt.rcv_wscale));</div><div class='hunk'>@@ -296,69 +314,14 @@ static u16 tcp_select_window(struct sock *sk)</div><div class='ctx'> 	if (new_win == 0) {</div><div class='ctx'> 		tp-&gt;pred_flags = 0;</div><div class='ctx'> 		if (old_win)</div><div class='del'>-			NET_INC_STATS(sock_net(sk),</div><div class='del'>-				      LINUX_MIB_TCPTOZEROWINDOWADV);</div><div class='add'>+			NET_INC_STATS(net, LINUX_MIB_TCPTOZEROWINDOWADV);</div><div class='ctx'> 	} else if (old_win == 0) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFROMZEROWINDOWADV);</div><div class='add'>+		NET_INC_STATS(net, LINUX_MIB_TCPFROMZEROWINDOWADV);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return new_win;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Packet ECN state for a SYN-ACK */</div><div class='del'>-static void tcp_ecn_send_synack(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_CWR;</div><div class='del'>-	if (!(tp-&gt;ecn_flags &amp; TCP_ECN_OK))</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_ECE;</div><div class='del'>-	else if (tcp_ca_needs_ecn(sk) ||</div><div class='del'>-		 tcp_bpf_ca_needs_ecn(sk))</div><div class='del'>-		INET_ECN_xmit(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Packet ECN state for a SYN.  */</div><div class='del'>-static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	bool bpf_needs_ecn = tcp_bpf_ca_needs_ecn(sk);</div><div class='del'>-	bool use_ecn = sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn == 1 ||</div><div class='del'>-		tcp_ca_needs_ecn(sk) || bpf_needs_ecn;</div><div class='del'>-</div><div class='del'>-	if (!use_ecn) {</div><div class='del'>-		const struct dst_entry *dst = __sk_dst_get(sk);</div><div class='del'>-</div><div class='del'>-		if (dst &amp;&amp; dst_feature(dst, RTAX_FEATURE_ECN))</div><div class='del'>-			use_ecn = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tp-&gt;ecn_flags = 0;</div><div class='del'>-</div><div class='del'>-	if (use_ecn) {</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tcp_flags |= TCPHDR_ECE | TCPHDR_CWR;</div><div class='del'>-		tp-&gt;ecn_flags = TCP_ECN_OK;</div><div class='del'>-		if (tcp_ca_needs_ecn(sk) || bpf_needs_ecn)</div><div class='del'>-			INET_ECN_xmit(sk);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcp_ecn_clear_syn(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn_fallback)</div><div class='del'>-		/* tp-&gt;ecn_flags are cleared at a later point in time when</div><div class='del'>-		 * SYN ACK is ultimatively being received.</div><div class='del'>-		 */</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~(TCPHDR_ECE | TCPHDR_CWR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tcp_ecn_make_synack(const struct request_sock *req, struct tcphdr *th)</div><div class='del'>-{</div><div class='del'>-	if (inet_rsk(req)-&gt;ecn_ok)</div><div class='del'>-		th-&gt;ece = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Set up ECN state for a packet on a ESTABLISHED socket that is about to</div><div class='ctx'>  * be sent.</div><div class='ctx'>  */</div><div class='hunk'>@@ -367,7 +330,15 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;ecn_flags &amp; TCP_ECN_OK) {</div><div class='add'>+	if (!tcp_ecn_mode_any(tp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (tcp_ecn_mode_accecn(tp)) {</div><div class='add'>+		if (!tcp_accecn_ace_fail_recv(tp))</div><div class='add'>+			INET_ECN_xmit(sk);</div><div class='add'>+		tcp_accecn_set_ace(tp, skb, th);</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCP_ACCECN;</div><div class='add'>+	} else {</div><div class='ctx'> 		/* Not-retransmitted data segment: set ECT and inject CWR. */</div><div class='ctx'> 		if (skb-&gt;len != tcp_header_len &amp;&amp;</div><div class='ctx'> 		    !before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;snd_nxt)) {</div><div class='hunk'>@@ -389,14 +360,15 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> /* Constructs common control bits of non-data skb. If SYN/FIN is present,</div><div class='ctx'>  * auto increment end seqno.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u8 flags)</div><div class='add'>+static void tcp_init_nondata_skb(struct sk_buff *skb, struct sock *sk,</div><div class='add'>+				 u32 seq, u16 flags)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tcp_flags = flags;</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;sacked = 0;</div><div class='ctx'> </div><div class='ctx'> 	tcp_skb_pcount_set(skb, 1);</div><div class='add'>+	psp_enqueue_set_decrypted(sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;seq = seq;</div><div class='ctx'> 	if (flags &amp; (TCPHDR_SYN | TCPHDR_FIN))</div><div class='hunk'>@@ -409,12 +381,15 @@ static inline bool tcp_urg_mode(const struct tcp_sock *tp)</div><div class='ctx'> 	return tp-&gt;snd_una != tp-&gt;snd_up;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define OPTION_SACK_ADVERTISE	(1 &lt;&lt; 0)</div><div class='del'>-#define OPTION_TS		(1 &lt;&lt; 1)</div><div class='del'>-#define OPTION_MD5		(1 &lt;&lt; 2)</div><div class='del'>-#define OPTION_WSCALE		(1 &lt;&lt; 3)</div><div class='del'>-#define OPTION_FAST_OPEN_COOKIE	(1 &lt;&lt; 8)</div><div class='del'>-#define OPTION_SMC		(1 &lt;&lt; 9)</div><div class='add'>+#define OPTION_SACK_ADVERTISE	BIT(0)</div><div class='add'>+#define OPTION_TS		BIT(1)</div><div class='add'>+#define OPTION_MD5		BIT(2)</div><div class='add'>+#define OPTION_WSCALE		BIT(3)</div><div class='add'>+#define OPTION_FAST_OPEN_COOKIE	BIT(8)</div><div class='add'>+#define OPTION_SMC		BIT(9)</div><div class='add'>+#define OPTION_MPTCP		BIT(10)</div><div class='add'>+#define OPTION_AO		BIT(11)</div><div class='add'>+#define OPTION_ACCECN		BIT(12)</div><div class='ctx'> </div><div class='ctx'> static void smc_options_write(__be32 *ptr, u16 *options)</div><div class='ctx'> {</div><div class='hunk'>@@ -436,12 +411,210 @@ struct tcp_out_options {</div><div class='ctx'> 	u16 mss;		/* 0 to disable */</div><div class='ctx'> 	u8 ws;			/* window scale, 0 to disable */</div><div class='ctx'> 	u8 num_sack_blocks;	/* number of SACK blocks to include */</div><div class='add'>+	u8 num_accecn_fields:7,	/* number of AccECN fields needed */</div><div class='add'>+	   use_synack_ecn_bytes:1; /* Use synack_ecn_bytes or not */</div><div class='ctx'> 	u8 hash_size;		/* bytes in hash_location */</div><div class='add'>+	u8 bpf_opt_len;		/* length of BPF hdr option */</div><div class='ctx'> 	__u8 *hash_location;	/* temporary pointer, overloaded */</div><div class='ctx'> 	__u32 tsval, tsecr;	/* need to include OPTION_TS */</div><div class='ctx'> 	struct tcp_fastopen_cookie *fastopen_cookie;	/* Fast open cookie */</div><div class='add'>+	struct mptcp_out_options mptcp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void mptcp_options_write(struct tcphdr *th, __be32 *ptr,</div><div class='add'>+				struct tcp_sock *tp,</div><div class='add'>+				struct tcp_out_options *opts)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_MPTCP)</div><div class='add'>+	if (unlikely(OPTION_MPTCP &amp; opts-&gt;options))</div><div class='add'>+		mptcp_write_options(th, ptr, tp, &amp;opts-&gt;mptcp);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUP_BPF</div><div class='add'>+static int bpf_skops_write_hdr_opt_arg0(struct sk_buff *skb,</div><div class='add'>+					enum tcp_synack_type synack_type)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return BPF_WRITE_HDR_TCP_CURRENT_MSS;</div><div class='add'>+</div><div class='add'>+	if (unlikely(synack_type == TCP_SYNACK_COOKIE))</div><div class='add'>+		return BPF_WRITE_HDR_TCP_SYNACK_COOKIE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* req, syn_skb and synack_type are used when writing synack */</div><div class='add'>+static void bpf_skops_hdr_opt_len(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				  struct request_sock *req,</div><div class='add'>+				  struct sk_buff *syn_skb,</div><div class='add'>+				  enum tcp_synack_type synack_type,</div><div class='add'>+				  struct tcp_out_options *opts,</div><div class='add'>+				  unsigned int *remaining)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock_ops_kern sock_ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (likely(!BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk),</div><div class='add'>+					   BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG)) ||</div><div class='add'>+	    !*remaining)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* *remaining has already been aligned to 4 bytes, so *remaining &gt;= 4 */</div><div class='add'>+</div><div class='add'>+	/* init sock_ops */</div><div class='add'>+	memset(&amp;sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));</div><div class='add'>+</div><div class='add'>+	sock_ops.op = BPF_SOCK_OPS_HDR_OPT_LEN_CB;</div><div class='add'>+</div><div class='add'>+	if (req) {</div><div class='add'>+		/* The listen "sk" cannot be passed here because</div><div class='add'>+		 * it is not locked.  It would not make too much</div><div class='add'>+		 * sense to do bpf_setsockopt(listen_sk) based</div><div class='add'>+		 * on individual connection request also.</div><div class='add'>+		 *</div><div class='add'>+		 * Thus, "req" is passed here and the cgroup-bpf-progs</div><div class='add'>+		 * of the listen "sk" will be run.</div><div class='add'>+		 *</div><div class='add'>+		 * "req" is also used here for fastopen even the "sk" here is</div><div class='add'>+		 * a fullsock "child" sk.  It is to keep the behavior</div><div class='add'>+		 * consistent between fastopen and non-fastopen on</div><div class='add'>+		 * the bpf programming side.</div><div class='add'>+		 */</div><div class='add'>+		sock_ops.sk = (struct sock *)req;</div><div class='add'>+		sock_ops.syn_skb = syn_skb;</div><div class='add'>+	} else {</div><div class='add'>+		sock_owned_by_me(sk);</div><div class='add'>+</div><div class='add'>+		sock_ops.is_fullsock = 1;</div><div class='add'>+		sock_ops.is_locked_tcp_sock = 1;</div><div class='add'>+		sock_ops.sk = sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_ops.args[0] = bpf_skops_write_hdr_opt_arg0(skb, synack_type);</div><div class='add'>+	sock_ops.remaining_opt_len = *remaining;</div><div class='add'>+	/* tcp_current_mss() does not pass a skb */</div><div class='add'>+	if (skb)</div><div class='add'>+		bpf_skops_init_skb(&amp;sock_ops, skb, 0);</div><div class='add'>+</div><div class='add'>+	err = BPF_CGROUP_RUN_PROG_SOCK_OPS_SK(&amp;sock_ops, sk);</div><div class='add'>+</div><div class='add'>+	if (err || sock_ops.remaining_opt_len == *remaining)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	opts-&gt;bpf_opt_len = *remaining - sock_ops.remaining_opt_len;</div><div class='add'>+	/* round up to 4 bytes */</div><div class='add'>+	opts-&gt;bpf_opt_len = (opts-&gt;bpf_opt_len + 3) &amp; ~3;</div><div class='add'>+</div><div class='add'>+	*remaining -= opts-&gt;bpf_opt_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_skops_write_hdr_opt(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				    struct request_sock *req,</div><div class='add'>+				    struct sk_buff *syn_skb,</div><div class='add'>+				    enum tcp_synack_type synack_type,</div><div class='add'>+				    struct tcp_out_options *opts)</div><div class='add'>+{</div><div class='add'>+	u8 first_opt_off, nr_written, max_opt_len = opts-&gt;bpf_opt_len;</div><div class='add'>+	struct bpf_sock_ops_kern sock_ops;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (likely(!max_opt_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));</div><div class='add'>+</div><div class='add'>+	sock_ops.op = BPF_SOCK_OPS_WRITE_HDR_OPT_CB;</div><div class='add'>+</div><div class='add'>+	if (req) {</div><div class='add'>+		sock_ops.sk = (struct sock *)req;</div><div class='add'>+		sock_ops.syn_skb = syn_skb;</div><div class='add'>+	} else {</div><div class='add'>+		sock_owned_by_me(sk);</div><div class='add'>+</div><div class='add'>+		sock_ops.is_fullsock = 1;</div><div class='add'>+		sock_ops.is_locked_tcp_sock = 1;</div><div class='add'>+		sock_ops.sk = sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sock_ops.args[0] = bpf_skops_write_hdr_opt_arg0(skb, synack_type);</div><div class='add'>+	sock_ops.remaining_opt_len = max_opt_len;</div><div class='add'>+	first_opt_off = tcp_hdrlen(skb) - max_opt_len;</div><div class='add'>+	bpf_skops_init_skb(&amp;sock_ops, skb, first_opt_off);</div><div class='add'>+</div><div class='add'>+	err = BPF_CGROUP_RUN_PROG_SOCK_OPS_SK(&amp;sock_ops, sk);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		nr_written = 0;</div><div class='add'>+	else</div><div class='add'>+		nr_written = max_opt_len - sock_ops.remaining_opt_len;</div><div class='add'>+</div><div class='add'>+	if (nr_written &lt; max_opt_len)</div><div class='add'>+		memset(skb-&gt;data + first_opt_off + nr_written, TCPOPT_NOP,</div><div class='add'>+		       max_opt_len - nr_written);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void bpf_skops_hdr_opt_len(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				  struct request_sock *req,</div><div class='add'>+				  struct sk_buff *syn_skb,</div><div class='add'>+				  enum tcp_synack_type synack_type,</div><div class='add'>+				  struct tcp_out_options *opts,</div><div class='add'>+				  unsigned int *remaining)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_skops_write_hdr_opt(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				    struct request_sock *req,</div><div class='add'>+				    struct sk_buff *syn_skb,</div><div class='add'>+				    enum tcp_synack_type synack_type,</div><div class='add'>+				    struct tcp_out_options *opts)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __be32 *process_tcp_ao_options(struct tcp_sock *tp,</div><div class='add'>+				      const struct tcp_request_sock *tcprsk,</div><div class='add'>+				      struct tcp_out_options *opts,</div><div class='add'>+				      struct tcp_key *key, __be32 *ptr)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	u8 maclen = tcp_ao_maclen(key-&gt;ao_key);</div><div class='add'>+</div><div class='add'>+	if (tcprsk) {</div><div class='add'>+		u8 aolen = maclen + sizeof(struct tcp_ao_hdr);</div><div class='add'>+</div><div class='add'>+		*ptr++ = htonl((TCPOPT_AO &lt;&lt; 24) | (aolen &lt;&lt; 16) |</div><div class='add'>+			       (tcprsk-&gt;ao_keyid &lt;&lt; 8) |</div><div class='add'>+			       (tcprsk-&gt;ao_rcv_next));</div><div class='add'>+	} else {</div><div class='add'>+		struct tcp_ao_key *rnext_key;</div><div class='add'>+		struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+		ao_info = rcu_dereference_check(tp-&gt;ao_info,</div><div class='add'>+			lockdep_sock_is_held(&amp;tp-&gt;inet_conn.icsk_inet.sk));</div><div class='add'>+		rnext_key = READ_ONCE(ao_info-&gt;rnext_key);</div><div class='add'>+		if (WARN_ON_ONCE(!rnext_key))</div><div class='add'>+			return ptr;</div><div class='add'>+		*ptr++ = htonl((TCPOPT_AO &lt;&lt; 24) |</div><div class='add'>+			       (tcp_ao_len(key-&gt;ao_key) &lt;&lt; 16) |</div><div class='add'>+			       (key-&gt;ao_key-&gt;sndid &lt;&lt; 8) |</div><div class='add'>+			       (rnext_key-&gt;rcvid));</div><div class='add'>+	}</div><div class='add'>+	opts-&gt;hash_location = (__u8 *)ptr;</div><div class='add'>+	ptr += maclen / sizeof(*ptr);</div><div class='add'>+	if (unlikely(maclen % sizeof(*ptr))) {</div><div class='add'>+		memset(ptr, TCPOPT_NOP, sizeof(*ptr));</div><div class='add'>+		ptr++;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initial values for AccECN option, ordered is based on ECN field bits</div><div class='add'>+ * similar to received_ecn_bytes. Used for SYN/ACK AccECN option.</div><div class='add'>+ */</div><div class='add'>+static const u32 synack_ecn_bytes[3] = { 0, 0, 0 };</div><div class='add'>+</div><div class='ctx'> /* Write previously computed TCP options to the packet.</div><div class='ctx'>  *</div><div class='ctx'>  * Beware: Something in the Internet is very sensitive to the ordering of</div><div class='hunk'>@@ -455,19 +628,25 @@ struct tcp_out_options {</div><div class='ctx'>  * At least SACK_PERM as the first option is known to lead to a disaster</div><div class='ctx'>  * (but it may well be that other scenarios fail similarly).</div><div class='ctx'>  */</div><div class='del'>-static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,</div><div class='del'>-			      struct tcp_out_options *opts)</div><div class='add'>+static void tcp_options_write(struct tcphdr *th, struct tcp_sock *tp,</div><div class='add'>+			      const struct tcp_request_sock *tcprsk,</div><div class='add'>+			      struct tcp_out_options *opts,</div><div class='add'>+			      struct tcp_key *key)</div><div class='ctx'> {</div><div class='add'>+	u8 leftover_highbyte = TCPOPT_NOP; /* replace 1st NOP if avail */</div><div class='add'>+	u8 leftover_lowbyte = TCPOPT_NOP;  /* replace 2nd NOP in succession */</div><div class='add'>+	__be32 *ptr = (__be32 *)(th + 1);</div><div class='ctx'> 	u16 options = opts-&gt;options;	/* mungable copy */</div><div class='ctx'> </div><div class='del'>-	if (unlikely(OPTION_MD5 &amp; options)) {</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='ctx'> 		*ptr++ = htonl((TCPOPT_NOP &lt;&lt; 24) | (TCPOPT_NOP &lt;&lt; 16) |</div><div class='ctx'> 			       (TCPOPT_MD5SIG &lt;&lt; 8) | TCPOLEN_MD5SIG);</div><div class='ctx'> 		/* overload cookie hash location */</div><div class='ctx'> 		opts-&gt;hash_location = (__u8 *)ptr;</div><div class='ctx'> 		ptr += 4;</div><div class='add'>+	} else if (tcp_key_is_ao(key)) {</div><div class='add'>+		ptr = process_tcp_ao_options(tp, tcprsk, opts, key, ptr);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(opts-&gt;mss)) {</div><div class='ctx'> 		*ptr++ = htonl((TCPOPT_MSS &lt;&lt; 24) |</div><div class='ctx'> 			       (TCPOLEN_MSS &lt;&lt; 16) |</div><div class='hunk'>@@ -491,15 +670,75 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,</div><div class='ctx'> 		*ptr++ = htonl(opts-&gt;tsecr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (OPTION_ACCECN &amp; options) {</div><div class='add'>+		const u32 *ecn_bytes = opts-&gt;use_synack_ecn_bytes ?</div><div class='add'>+				       synack_ecn_bytes :</div><div class='add'>+				       tp-&gt;received_ecn_bytes;</div><div class='add'>+		const u8 ect0_idx = INET_ECN_ECT_0 - 1;</div><div class='add'>+		const u8 ect1_idx = INET_ECN_ECT_1 - 1;</div><div class='add'>+		const u8 ce_idx = INET_ECN_CE - 1;</div><div class='add'>+		u32 e0b;</div><div class='add'>+		u32 e1b;</div><div class='add'>+		u32 ceb;</div><div class='add'>+		u8 len;</div><div class='add'>+</div><div class='add'>+		e0b = ecn_bytes[ect0_idx] + TCP_ACCECN_E0B_INIT_OFFSET;</div><div class='add'>+		e1b = ecn_bytes[ect1_idx] + TCP_ACCECN_E1B_INIT_OFFSET;</div><div class='add'>+		ceb = ecn_bytes[ce_idx] + TCP_ACCECN_CEB_INIT_OFFSET;</div><div class='add'>+		len = TCPOLEN_ACCECN_BASE +</div><div class='add'>+		      opts-&gt;num_accecn_fields * TCPOLEN_ACCECN_PERFIELD;</div><div class='add'>+</div><div class='add'>+		if (opts-&gt;num_accecn_fields == 2) {</div><div class='add'>+			*ptr++ = htonl((TCPOPT_ACCECN1 &lt;&lt; 24) | (len &lt;&lt; 16) |</div><div class='add'>+				       ((e1b &gt;&gt; 8) &amp; 0xffff));</div><div class='add'>+			*ptr++ = htonl(((e1b &amp; 0xff) &lt;&lt; 24) |</div><div class='add'>+				       (ceb &amp; 0xffffff));</div><div class='add'>+		} else if (opts-&gt;num_accecn_fields == 1) {</div><div class='add'>+			*ptr++ = htonl((TCPOPT_ACCECN1 &lt;&lt; 24) | (len &lt;&lt; 16) |</div><div class='add'>+				       ((e1b &gt;&gt; 8) &amp; 0xffff));</div><div class='add'>+			leftover_highbyte = e1b &amp; 0xff;</div><div class='add'>+			leftover_lowbyte = TCPOPT_NOP;</div><div class='add'>+		} else if (opts-&gt;num_accecn_fields == 0) {</div><div class='add'>+			leftover_highbyte = TCPOPT_ACCECN1;</div><div class='add'>+			leftover_lowbyte = len;</div><div class='add'>+		} else if (opts-&gt;num_accecn_fields == 3) {</div><div class='add'>+			*ptr++ = htonl((TCPOPT_ACCECN1 &lt;&lt; 24) | (len &lt;&lt; 16) |</div><div class='add'>+				       ((e1b &gt;&gt; 8) &amp; 0xffff));</div><div class='add'>+			*ptr++ = htonl(((e1b &amp; 0xff) &lt;&lt; 24) |</div><div class='add'>+				       (ceb &amp; 0xffffff));</div><div class='add'>+			*ptr++ = htonl(((e0b &amp; 0xffffff) &lt;&lt; 8) |</div><div class='add'>+				       TCPOPT_NOP);</div><div class='add'>+		}</div><div class='add'>+		if (tp) {</div><div class='add'>+			tp-&gt;accecn_minlen = 0;</div><div class='add'>+			tp-&gt;accecn_opt_tstamp = tp-&gt;tcp_mstamp;</div><div class='add'>+			if (tp-&gt;accecn_opt_demand)</div><div class='add'>+				tp-&gt;accecn_opt_demand--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(OPTION_SACK_ADVERTISE &amp; options)) {</div><div class='del'>-		*ptr++ = htonl((TCPOPT_NOP &lt;&lt; 24) |</div><div class='del'>-			       (TCPOPT_NOP &lt;&lt; 16) |</div><div class='add'>+		*ptr++ = htonl((leftover_highbyte &lt;&lt; 24) |</div><div class='add'>+			       (leftover_lowbyte &lt;&lt; 16) |</div><div class='ctx'> 			       (TCPOPT_SACK_PERM &lt;&lt; 8) |</div><div class='ctx'> 			       TCPOLEN_SACK_PERM);</div><div class='add'>+		leftover_highbyte = TCPOPT_NOP;</div><div class='add'>+		leftover_lowbyte = TCPOPT_NOP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(OPTION_WSCALE &amp; options)) {</div><div class='del'>-		*ptr++ = htonl((TCPOPT_NOP &lt;&lt; 24) |</div><div class='add'>+		u8 highbyte = TCPOPT_NOP;</div><div class='add'>+</div><div class='add'>+		/* Do not split the leftover 2-byte to fit into a single</div><div class='add'>+		 * NOP, i.e., replace this NOP only when 1 byte is leftover</div><div class='add'>+		 * within leftover_highbyte.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(leftover_highbyte != TCPOPT_NOP &amp;&amp;</div><div class='add'>+			     leftover_lowbyte == TCPOPT_NOP)) {</div><div class='add'>+			highbyte = leftover_highbyte;</div><div class='add'>+			leftover_highbyte = TCPOPT_NOP;</div><div class='add'>+		}</div><div class='add'>+		*ptr++ = htonl((highbyte &lt;&lt; 24) |</div><div class='ctx'> 			       (TCPOPT_WINDOW &lt;&lt; 16) |</div><div class='ctx'> 			       (TCPOLEN_WINDOW &lt;&lt; 8) |</div><div class='ctx'> 			       opts-&gt;ws);</div><div class='hunk'>@@ -510,11 +749,13 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,</div><div class='ctx'> 			tp-&gt;duplicate_sack : tp-&gt;selective_acks;</div><div class='ctx'> 		int this_sack;</div><div class='ctx'> </div><div class='del'>-		*ptr++ = htonl((TCPOPT_NOP  &lt;&lt; 24) |</div><div class='del'>-			       (TCPOPT_NOP  &lt;&lt; 16) |</div><div class='add'>+		*ptr++ = htonl((leftover_highbyte &lt;&lt; 24) |</div><div class='add'>+			       (leftover_lowbyte &lt;&lt; 16) |</div><div class='ctx'> 			       (TCPOPT_SACK &lt;&lt;  8) |</div><div class='ctx'> 			       (TCPOLEN_SACK_BASE + (opts-&gt;num_sack_blocks *</div><div class='ctx'> 						     TCPOLEN_SACK_PERBLOCK)));</div><div class='add'>+		leftover_highbyte = TCPOPT_NOP;</div><div class='add'>+		leftover_lowbyte = TCPOPT_NOP;</div><div class='ctx'> </div><div class='ctx'> 		for (this_sack = 0; this_sack &lt; opts-&gt;num_sack_blocks;</div><div class='ctx'> 		     ++this_sack) {</div><div class='hunk'>@@ -523,6 +764,14 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tp-&gt;rx_opt.dsack = 0;</div><div class='add'>+	} else if (unlikely(leftover_highbyte != TCPOPT_NOP ||</div><div class='add'>+			    leftover_lowbyte != TCPOPT_NOP)) {</div><div class='add'>+		*ptr++ = htonl((leftover_highbyte &lt;&lt; 24) |</div><div class='add'>+			       (leftover_lowbyte &lt;&lt; 16) |</div><div class='add'>+			       (TCPOPT_NOP &lt;&lt; 8) |</div><div class='add'>+			       TCPOPT_NOP);</div><div class='add'>+		leftover_highbyte = TCPOPT_NOP;</div><div class='add'>+		leftover_lowbyte = TCPOPT_NOP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(OPTION_FAST_OPEN_COOKIE &amp; options)) {</div><div class='hunk'>@@ -550,62 +799,159 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smc_options_write(ptr, &amp;options);</div><div class='add'>+</div><div class='add'>+	mptcp_options_write(th, ptr, tp, opts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void smc_set_option(const struct tcp_sock *tp,</div><div class='add'>+static void smc_set_option(struct tcp_sock *tp,</div><div class='ctx'> 			   struct tcp_out_options *opts,</div><div class='ctx'> 			   unsigned int *remaining)</div><div class='ctx'> {</div><div class='ctx'> #if IS_ENABLED(CONFIG_SMC)</div><div class='del'>-	if (static_branch_unlikely(&amp;tcp_have_smc)) {</div><div class='del'>-		if (tp-&gt;syn_smc) {</div><div class='del'>-			if (*remaining &gt;= TCPOLEN_EXP_SMC_BASE_ALIGNED) {</div><div class='del'>-				opts-&gt;options |= OPTION_SMC;</div><div class='del'>-				*remaining -= TCPOLEN_EXP_SMC_BASE_ALIGNED;</div><div class='del'>-			}</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_have_smc) &amp;&amp; tp-&gt;syn_smc) {</div><div class='add'>+		tp-&gt;syn_smc = !!smc_call_hsbpf(1, tp, syn_option);</div><div class='add'>+		/* re-check syn_smc */</div><div class='add'>+		if (tp-&gt;syn_smc &amp;&amp;</div><div class='add'>+		    *remaining &gt;= TCPOLEN_EXP_SMC_BASE_ALIGNED) {</div><div class='add'>+			opts-&gt;options |= OPTION_SMC;</div><div class='add'>+			*remaining -= TCPOLEN_EXP_SMC_BASE_ALIGNED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void smc_set_option_cond(const struct tcp_sock *tp,</div><div class='del'>-				const struct inet_request_sock *ireq,</div><div class='add'>+				struct inet_request_sock *ireq,</div><div class='ctx'> 				struct tcp_out_options *opts,</div><div class='ctx'> 				unsigned int *remaining)</div><div class='ctx'> {</div><div class='ctx'> #if IS_ENABLED(CONFIG_SMC)</div><div class='del'>-	if (static_branch_unlikely(&amp;tcp_have_smc)) {</div><div class='del'>-		if (tp-&gt;syn_smc &amp;&amp; ireq-&gt;smc_ok) {</div><div class='del'>-			if (*remaining &gt;= TCPOLEN_EXP_SMC_BASE_ALIGNED) {</div><div class='del'>-				opts-&gt;options |= OPTION_SMC;</div><div class='del'>-				*remaining -= TCPOLEN_EXP_SMC_BASE_ALIGNED;</div><div class='del'>-			}</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_have_smc) &amp;&amp; tp-&gt;syn_smc &amp;&amp; ireq-&gt;smc_ok) {</div><div class='add'>+		ireq-&gt;smc_ok = !!smc_call_hsbpf(1, tp, synack_option, ireq);</div><div class='add'>+		/* re-check smc_ok */</div><div class='add'>+		if (ireq-&gt;smc_ok &amp;&amp;</div><div class='add'>+		    *remaining &gt;= TCPOLEN_EXP_SMC_BASE_ALIGNED) {</div><div class='add'>+			opts-&gt;options |= OPTION_SMC;</div><div class='add'>+			*remaining -= TCPOLEN_EXP_SMC_BASE_ALIGNED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mptcp_set_option_cond(const struct request_sock *req,</div><div class='add'>+				  struct tcp_out_options *opts,</div><div class='add'>+				  unsigned int *remaining)</div><div class='add'>+{</div><div class='add'>+	if (rsk_is_mptcp(req)) {</div><div class='add'>+		unsigned int size;</div><div class='add'>+</div><div class='add'>+		if (mptcp_synack_options(req, &amp;size, &amp;opts-&gt;mptcp)) {</div><div class='add'>+			if (*remaining &gt;= size) {</div><div class='add'>+				opts-&gt;options |= OPTION_MPTCP;</div><div class='add'>+				*remaining -= size;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 tcp_synack_options_combine_saving(struct tcp_out_options *opts)</div><div class='add'>+{</div><div class='add'>+	/* How much there's room for combining with the alignment padding? */</div><div class='add'>+	if ((opts-&gt;options &amp; (OPTION_SACK_ADVERTISE | OPTION_TS)) ==</div><div class='add'>+	    OPTION_SACK_ADVERTISE)</div><div class='add'>+		return 2;</div><div class='add'>+	else if (opts-&gt;options &amp; OPTION_WSCALE)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculates how long AccECN option will fit to @remaining option space.</div><div class='add'>+ *</div><div class='add'>+ * AccECN option can sometimes replace NOPs used for alignment of other</div><div class='add'>+ * TCP options (up to @max_combine_saving available).</div><div class='add'>+ *</div><div class='add'>+ * Only solutions with at least @required AccECN fields are accepted.</div><div class='add'>+ *</div><div class='add'>+ * Returns: The size of the AccECN option excluding space repurposed from</div><div class='add'>+ * the alignment of the other options.</div><div class='add'>+ */</div><div class='add'>+static int tcp_options_fit_accecn(struct tcp_out_options *opts, int required,</div><div class='add'>+				  int remaining)</div><div class='add'>+{</div><div class='add'>+	int size = TCP_ACCECN_MAXSIZE;</div><div class='add'>+	int sack_blocks_reduce = 0;</div><div class='add'>+	int max_combine_saving;</div><div class='add'>+	int rem = remaining;</div><div class='add'>+	int align_size;</div><div class='add'>+</div><div class='add'>+	if (opts-&gt;use_synack_ecn_bytes)</div><div class='add'>+		max_combine_saving = tcp_synack_options_combine_saving(opts);</div><div class='add'>+	else</div><div class='add'>+		max_combine_saving = opts-&gt;num_sack_blocks &gt; 0 ? 2 : 0;</div><div class='add'>+	opts-&gt;num_accecn_fields = TCP_ACCECN_NUMFIELDS;</div><div class='add'>+	while (opts-&gt;num_accecn_fields &gt;= required) {</div><div class='add'>+		/* Pad to dword if cannot combine */</div><div class='add'>+		if ((size &amp; 0x3) &gt; max_combine_saving)</div><div class='add'>+			align_size = ALIGN(size, 4);</div><div class='add'>+		else</div><div class='add'>+			align_size = ALIGN_DOWN(size, 4);</div><div class='add'>+</div><div class='add'>+		if (rem &gt;= align_size) {</div><div class='add'>+			size = align_size;</div><div class='add'>+			break;</div><div class='add'>+		} else if (opts-&gt;num_accecn_fields == required &amp;&amp;</div><div class='add'>+			   opts-&gt;num_sack_blocks &gt; 2 &amp;&amp;</div><div class='add'>+			   required &gt; 0) {</div><div class='add'>+			/* Try to fit the option by removing one SACK block */</div><div class='add'>+			opts-&gt;num_sack_blocks--;</div><div class='add'>+			sack_blocks_reduce++;</div><div class='add'>+			rem = rem + TCPOLEN_SACK_PERBLOCK;</div><div class='add'>+</div><div class='add'>+			opts-&gt;num_accecn_fields = TCP_ACCECN_NUMFIELDS;</div><div class='add'>+			size = TCP_ACCECN_MAXSIZE;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		opts-&gt;num_accecn_fields--;</div><div class='add'>+		size -= TCPOLEN_ACCECN_PERFIELD;</div><div class='add'>+	}</div><div class='add'>+	if (sack_blocks_reduce &gt; 0) {</div><div class='add'>+		if (opts-&gt;num_accecn_fields &gt;= required)</div><div class='add'>+			size -= sack_blocks_reduce * TCPOLEN_SACK_PERBLOCK;</div><div class='add'>+		else</div><div class='add'>+			opts-&gt;num_sack_blocks += sack_blocks_reduce;</div><div class='add'>+	}</div><div class='add'>+	if (opts-&gt;num_accecn_fields &lt; required)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	opts-&gt;options |= OPTION_ACCECN;</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Compute TCP options for SYN packets. This is not the final</div><div class='ctx'>  * network wire format yet.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				struct tcp_out_options *opts,</div><div class='del'>-				struct tcp_md5sig_key **md5)</div><div class='add'>+				struct tcp_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned int remaining = MAX_TCP_OPTION_SPACE;</div><div class='ctx'> 	struct tcp_fastopen_request *fastopen = tp-&gt;fastopen_req;</div><div class='add'>+	bool timestamps;</div><div class='ctx'> </div><div class='del'>-	*md5 = NULL;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (unlikely(rcu_access_pointer(tp-&gt;md5sig_info))) {</div><div class='del'>-		*md5 = tp-&gt;af_specific-&gt;md5_lookup(sk, sk);</div><div class='del'>-		if (*md5) {</div><div class='del'>-			opts-&gt;options |= OPTION_MD5;</div><div class='del'>-			remaining -= TCPOLEN_MD5SIG_ALIGNED;</div><div class='add'>+	/* Better than switch (key.type) as it has static branches */</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='add'>+		timestamps = false;</div><div class='add'>+		opts-&gt;options |= OPTION_MD5;</div><div class='add'>+		remaining -= TCPOLEN_MD5SIG_ALIGNED;</div><div class='add'>+	} else {</div><div class='add'>+		timestamps = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_timestamps);</div><div class='add'>+		if (tcp_key_is_ao(key)) {</div><div class='add'>+			opts-&gt;options |= OPTION_AO;</div><div class='add'>+			remaining -= tcp_ao_len_aligned(key-&gt;ao_key);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* We always get an MSS option.  The option bytes which will be seen in</div><div class='ctx'> 	 * normal data packets should timestamps be used, must be in the MSS</div><div class='hunk'>@@ -619,18 +965,18 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	opts-&gt;mss = tcp_advertise_mss(sk);</div><div class='ctx'> 	remaining -= TCPOLEN_MSS_ALIGNED;</div><div class='ctx'> </div><div class='del'>-	if (likely(sock_net(sk)-&gt;ipv4.sysctl_tcp_timestamps &amp;&amp; !*md5)) {</div><div class='add'>+	if (likely(timestamps)) {</div><div class='ctx'> 		opts-&gt;options |= OPTION_TS;</div><div class='del'>-		opts-&gt;tsval = tcp_skb_timestamp(skb) + tp-&gt;tsoffset;</div><div class='add'>+		opts-&gt;tsval = tcp_skb_timestamp_ts(tp-&gt;tcp_usec_ts, skb) + tp-&gt;tsoffset;</div><div class='ctx'> 		opts-&gt;tsecr = tp-&gt;rx_opt.ts_recent;</div><div class='ctx'> 		remaining -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='ctx'> 	}</div><div class='del'>-	if (likely(sock_net(sk)-&gt;ipv4.sysctl_tcp_window_scaling)) {</div><div class='add'>+	if (likely(READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_window_scaling))) {</div><div class='ctx'> 		opts-&gt;ws = tp-&gt;rx_opt.rcv_wscale;</div><div class='ctx'> 		opts-&gt;options |= OPTION_WSCALE;</div><div class='ctx'> 		remaining -= TCPOLEN_WSCALE_ALIGNED;</div><div class='ctx'> 	}</div><div class='del'>-	if (likely(sock_net(sk)-&gt;ipv4.sysctl_tcp_sack)) {</div><div class='add'>+	if (likely(READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_sack))) {</div><div class='ctx'> 		opts-&gt;options |= OPTION_SACK_ADVERTISE;</div><div class='ctx'> 		if (unlikely(!(OPTION_TS &amp; opts-&gt;options)))</div><div class='ctx'> 			remaining -= TCPOLEN_SACKPERM_ALIGNED;</div><div class='hunk'>@@ -653,6 +999,33 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	smc_set_option(tp, opts, &amp;remaining);</div><div class='ctx'> </div><div class='add'>+	if (sk_is_mptcp(sk)) {</div><div class='add'>+		unsigned int size;</div><div class='add'>+</div><div class='add'>+		if (mptcp_syn_options(sk, skb, &amp;size, &amp;opts-&gt;mptcp)) {</div><div class='add'>+			if (remaining &gt;= size) {</div><div class='add'>+				opts-&gt;options |= OPTION_MPTCP;</div><div class='add'>+				remaining -= size;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Simultaneous open SYN/ACK needs AccECN option but not SYN.</div><div class='add'>+	 * It is attempted to negotiate the use of AccECN also on the first</div><div class='add'>+	 * retransmitted SYN, as mentioned in "3.1.4.1. Retransmitted SYNs"</div><div class='add'>+	 * of AccECN draft.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_ACK) &amp;&amp;</div><div class='add'>+		     tcp_ecn_mode_accecn(tp) &amp;&amp;</div><div class='add'>+		     inet_csk(sk)-&gt;icsk_retransmits &lt; 2 &amp;&amp;</div><div class='add'>+		     READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn_option) &amp;&amp;</div><div class='add'>+		     remaining &gt;= TCPOLEN_ACCECN_BASE)) {</div><div class='add'>+		opts-&gt;use_synack_ecn_bytes = 1;</div><div class='add'>+		remaining -= tcp_options_fit_accecn(opts, 0, remaining);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_skops_hdr_opt_len(sk, skb, NULL, NULL, 0, opts, &amp;remaining);</div><div class='add'>+</div><div class='ctx'> 	return MAX_TCP_OPTION_SPACE - remaining;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -661,14 +1034,16 @@ static unsigned int tcp_synack_options(const struct sock *sk,</div><div class='ctx'> 				       struct request_sock *req,</div><div class='ctx'> 				       unsigned int mss, struct sk_buff *skb,</div><div class='ctx'> 				       struct tcp_out_options *opts,</div><div class='del'>-				       const struct tcp_md5sig_key *md5,</div><div class='del'>-				       struct tcp_fastopen_cookie *foc)</div><div class='add'>+				       const struct tcp_key *key,</div><div class='add'>+				       struct tcp_fastopen_cookie *foc,</div><div class='add'>+				       enum tcp_synack_type synack_type,</div><div class='add'>+				       struct sk_buff *syn_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='ctx'> 	unsigned int remaining = MAX_TCP_OPTION_SPACE;</div><div class='add'>+	struct tcp_request_sock *treq = tcp_rsk(req);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (md5) {</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='ctx'> 		opts-&gt;options |= OPTION_MD5;</div><div class='ctx'> 		remaining -= TCPOLEN_MD5SIG_ALIGNED;</div><div class='ctx'> </div><div class='hunk'>@@ -677,9 +1052,13 @@ static unsigned int tcp_synack_options(const struct sock *sk,</div><div class='ctx'> 		 * rather than TS in order to fit in better with old,</div><div class='ctx'> 		 * buggy kernels, but that was deemed to be unnecessary.</div><div class='ctx'> 		 */</div><div class='add'>+		if (synack_type != TCP_SYNACK_COOKIE)</div><div class='add'>+			ireq-&gt;tstamp_ok &amp;= !ireq-&gt;sack_ok;</div><div class='add'>+	} else if (tcp_key_is_ao(key)) {</div><div class='add'>+		opts-&gt;options |= OPTION_AO;</div><div class='add'>+		remaining -= tcp_ao_len_aligned(key-&gt;ao_key);</div><div class='ctx'> 		ireq-&gt;tstamp_ok &amp;= !ireq-&gt;sack_ok;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* We always send an MSS option. */</div><div class='ctx'> 	opts-&gt;mss = mss;</div><div class='hunk'>@@ -692,7 +1071,14 @@ static unsigned int tcp_synack_options(const struct sock *sk,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (likely(ireq-&gt;tstamp_ok)) {</div><div class='ctx'> 		opts-&gt;options |= OPTION_TS;</div><div class='del'>-		opts-&gt;tsval = tcp_skb_timestamp(skb) + tcp_rsk(req)-&gt;ts_off;</div><div class='add'>+		opts-&gt;tsval = tcp_skb_timestamp_ts(tcp_rsk(req)-&gt;req_usec_ts, skb) +</div><div class='add'>+			      tcp_rsk(req)-&gt;ts_off;</div><div class='add'>+		if (!tcp_rsk(req)-&gt;snt_tsval_first) {</div><div class='add'>+			if (!opts-&gt;tsval)</div><div class='add'>+				opts-&gt;tsval = ~0U;</div><div class='add'>+			tcp_rsk(req)-&gt;snt_tsval_first = opts-&gt;tsval;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(tcp_rsk(req)-&gt;snt_tsval_last, opts-&gt;tsval);</div><div class='ctx'> 		opts-&gt;tsecr = req-&gt;ts_recent;</div><div class='ctx'> 		remaining -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -714,8 +1100,20 @@ static unsigned int tcp_synack_options(const struct sock *sk,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mptcp_set_option_cond(req, opts, &amp;remaining);</div><div class='add'>+</div><div class='ctx'> 	smc_set_option_cond(tcp_sk(sk), ireq, opts, &amp;remaining);</div><div class='ctx'> </div><div class='add'>+	if (treq-&gt;accecn_ok &amp;&amp;</div><div class='add'>+	    READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn_option) &amp;&amp;</div><div class='add'>+	    req-&gt;num_timeout &lt; 1 &amp;&amp; remaining &gt;= TCPOLEN_ACCECN_BASE) {</div><div class='add'>+		opts-&gt;use_synack_ecn_bytes = 1;</div><div class='add'>+		remaining -= tcp_options_fit_accecn(opts, 0, remaining);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_skops_hdr_opt_len((struct sock *)sk, skb, req, syn_skb,</div><div class='add'>+			      synack_type, opts, &amp;remaining);</div><div class='add'>+</div><div class='ctx'> 	return MAX_TCP_OPTION_SPACE - remaining;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -724,7 +1122,7 @@ static unsigned int tcp_synack_options(const struct sock *sk,</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 					struct tcp_out_options *opts,</div><div class='del'>-					struct tcp_md5sig_key **md5)</div><div class='add'>+					struct tcp_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned int size = 0;</div><div class='hunk'>@@ -732,33 +1130,78 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb</div><div class='ctx'> </div><div class='ctx'> 	opts-&gt;options = 0;</div><div class='ctx'> </div><div class='del'>-	*md5 = NULL;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (unlikely(rcu_access_pointer(tp-&gt;md5sig_info))) {</div><div class='del'>-		*md5 = tp-&gt;af_specific-&gt;md5_lookup(sk, sk);</div><div class='del'>-		if (*md5) {</div><div class='del'>-			opts-&gt;options |= OPTION_MD5;</div><div class='del'>-			size += TCPOLEN_MD5SIG_ALIGNED;</div><div class='del'>-		}</div><div class='add'>+	/* Better than switch (key.type) as it has static branches */</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='add'>+		opts-&gt;options |= OPTION_MD5;</div><div class='add'>+		size += TCPOLEN_MD5SIG_ALIGNED;</div><div class='add'>+	} else if (tcp_key_is_ao(key)) {</div><div class='add'>+		opts-&gt;options |= OPTION_AO;</div><div class='add'>+		size += tcp_ao_len_aligned(key-&gt;ao_key);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (likely(tp-&gt;rx_opt.tstamp_ok)) {</div><div class='ctx'> 		opts-&gt;options |= OPTION_TS;</div><div class='del'>-		opts-&gt;tsval = skb ? tcp_skb_timestamp(skb) + tp-&gt;tsoffset : 0;</div><div class='add'>+		opts-&gt;tsval = skb ? tcp_skb_timestamp_ts(tp-&gt;tcp_usec_ts, skb) +</div><div class='add'>+				tp-&gt;tsoffset : 0;</div><div class='ctx'> 		opts-&gt;tsecr = tp-&gt;rx_opt.ts_recent;</div><div class='ctx'> 		size += TCPOLEN_TSTAMP_ALIGNED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* MPTCP options have precedence over SACK for the limited TCP</div><div class='add'>+	 * option space because a MPTCP connection would be forced to</div><div class='add'>+	 * fall back to regular TCP if a required multipath option is</div><div class='add'>+	 * missing. SACK still gets a chance to use whatever space is</div><div class='add'>+	 * left.</div><div class='add'>+	 */</div><div class='add'>+	if (sk_is_mptcp(sk)) {</div><div class='add'>+		unsigned int remaining = MAX_TCP_OPTION_SPACE - size;</div><div class='add'>+		unsigned int opt_size = 0;</div><div class='add'>+</div><div class='add'>+		if (mptcp_established_options(sk, skb, &amp;opt_size, remaining,</div><div class='add'>+					      &amp;opts-&gt;mptcp)) {</div><div class='add'>+			opts-&gt;options |= OPTION_MPTCP;</div><div class='add'>+			size += opt_size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	eff_sacks = tp-&gt;rx_opt.num_sacks + tp-&gt;rx_opt.dsack;</div><div class='ctx'> 	if (unlikely(eff_sacks)) {</div><div class='ctx'> 		const unsigned int remaining = MAX_TCP_OPTION_SPACE - size;</div><div class='del'>-		opts-&gt;num_sack_blocks =</div><div class='del'>-			min_t(unsigned int, eff_sacks,</div><div class='del'>-			      (remaining - TCPOLEN_SACK_BASE_ALIGNED) /</div><div class='del'>-			      TCPOLEN_SACK_PERBLOCK);</div><div class='del'>-		size += TCPOLEN_SACK_BASE_ALIGNED +</div><div class='del'>-			opts-&gt;num_sack_blocks * TCPOLEN_SACK_PERBLOCK;</div><div class='add'>+		if (likely(remaining &gt;= TCPOLEN_SACK_BASE_ALIGNED +</div><div class='add'>+					TCPOLEN_SACK_PERBLOCK)) {</div><div class='add'>+			opts-&gt;num_sack_blocks =</div><div class='add'>+				min_t(unsigned int, eff_sacks,</div><div class='add'>+				      (remaining - TCPOLEN_SACK_BASE_ALIGNED) /</div><div class='add'>+				      TCPOLEN_SACK_PERBLOCK);</div><div class='add'>+</div><div class='add'>+			size += TCPOLEN_SACK_BASE_ALIGNED +</div><div class='add'>+				opts-&gt;num_sack_blocks * TCPOLEN_SACK_PERBLOCK;</div><div class='add'>+		} else {</div><div class='add'>+			opts-&gt;num_sack_blocks = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		opts-&gt;num_sack_blocks = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tcp_ecn_mode_accecn(tp)) {</div><div class='add'>+		int ecn_opt = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn_option);</div><div class='add'>+</div><div class='add'>+		if (ecn_opt &amp;&amp; tp-&gt;saw_accecn_opt &amp;&amp; !tcp_accecn_opt_fail_send(tp) &amp;&amp;</div><div class='add'>+		    (ecn_opt &gt;= TCP_ACCECN_OPTION_FULL || tp-&gt;accecn_opt_demand ||</div><div class='add'>+		     tcp_accecn_option_beacon_check(sk))) {</div><div class='add'>+			opts-&gt;use_synack_ecn_bytes = 0;</div><div class='add'>+			size += tcp_options_fit_accecn(opts, tp-&gt;accecn_minlen,</div><div class='add'>+						       MAX_TCP_OPTION_SPACE - size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(BPF_SOCK_OPS_TEST_FLAG(tp,</div><div class='add'>+					    BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG))) {</div><div class='add'>+		unsigned int remaining = MAX_TCP_OPTION_SPACE - size;</div><div class='add'>+</div><div class='add'>+		bpf_skops_hdr_opt_len(sk, skb, NULL, NULL, 0, opts, &amp;remaining);</div><div class='add'>+</div><div class='add'>+		size = MAX_TCP_OPTION_SPACE - remaining;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return size;</div><div class='hunk'>@@ -775,15 +1218,15 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb</div><div class='ctx'>  * needs to be reallocated in a driver.</div><div class='ctx'>  * The invariant being skb-&gt;truesize subtracted from sk-&gt;sk_wmem_alloc</div><div class='ctx'>  *</div><div class='del'>- * Since transmit from skb destructor is forbidden, we use a tasklet</div><div class='add'>+ * Since transmit from skb destructor is forbidden, we use a BH work item</div><div class='ctx'>  * to process all sockets that eventually need to send more skbs.</div><div class='del'>- * We use one tasklet per cpu, with its own queue of sockets.</div><div class='add'>+ * We use one work item per cpu, with its own queue of sockets.</div><div class='ctx'>  */</div><div class='del'>-struct tsq_tasklet {</div><div class='del'>-	struct tasklet_struct	tasklet;</div><div class='add'>+struct tsq_work {</div><div class='add'>+	struct work_struct	work;</div><div class='ctx'> 	struct list_head	head; /* queue of tcp sockets */</div><div class='ctx'> };</div><div class='del'>-static DEFINE_PER_CPU(struct tsq_tasklet, tsq_tasklet);</div><div class='add'>+static DEFINE_PER_CPU(struct tsq_work, tsq_work);</div><div class='ctx'> </div><div class='ctx'> static void tcp_tsq_write(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -793,7 +1236,7 @@ static void tcp_tsq_write(struct sock *sk)</div><div class='ctx'> 		struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;lost_out &gt; tp-&gt;retrans_out &amp;&amp;</div><div class='del'>-		    tp-&gt;snd_cwnd &gt; tcp_packets_in_flight(tp)) {</div><div class='add'>+		    tcp_snd_cwnd(tp) &gt; tcp_packets_in_flight(tp)) {</div><div class='ctx'> 			tcp_mstamp_refresh(tp);</div><div class='ctx'> 			tcp_xmit_retransmit_queue(sk);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -813,14 +1256,14 @@ static void tcp_tsq_handler(struct sock *sk)</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='del'>- * One tasklet per cpu tries to send more skbs.</div><div class='del'>- * We run in tasklet context but need to disable irqs when</div><div class='add'>+ * One work item per cpu tries to send more skbs.</div><div class='add'>+ * We run in BH context but need to disable irqs when</div><div class='ctx'>  * transferring tsq-&gt;head because tcp_wfree() might</div><div class='ctx'>  * interrupt us (non NAPI drivers)</div><div class='ctx'>  */</div><div class='del'>-static void tcp_tasklet_func(unsigned long data)</div><div class='add'>+static void tcp_tsq_workfn(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct tsq_tasklet *tsq = (struct tsq_tasklet *)data;</div><div class='add'>+	struct tsq_work *tsq = container_of(work, struct tsq_work, work);</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct list_head *q, *n;</div><div class='hunk'>@@ -847,7 +1290,8 @@ static void tcp_tasklet_func(unsigned long data)</div><div class='ctx'> #define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED |		\</div><div class='ctx'> 			  TCPF_WRITE_TIMER_DEFERRED |	\</div><div class='ctx'> 			  TCPF_DELACK_TIMER_DEFERRED |	\</div><div class='del'>-			  TCPF_MTU_REDUCED_DEFERRED)</div><div class='add'>+			  TCPF_MTU_REDUCED_DEFERRED |	\</div><div class='add'>+			  TCPF_ACK_DEFERRED)</div><div class='ctx'> /**</div><div class='ctx'>  * tcp_release_cb - tcp release_sock() callback</div><div class='ctx'>  * @sk: socket</div><div class='hunk'>@@ -857,30 +1301,20 @@ static void tcp_tasklet_func(unsigned long data)</div><div class='ctx'>  */</div><div class='ctx'> void tcp_release_cb(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags, nflags;</div><div class='add'>+	unsigned long flags = smp_load_acquire(&amp;sk-&gt;sk_tsq_flags);</div><div class='add'>+	unsigned long nflags;</div><div class='ctx'> </div><div class='ctx'> 	/* perform an atomic operation only if at least one flag is set */</div><div class='ctx'> 	do {</div><div class='del'>-		flags = sk-&gt;sk_tsq_flags;</div><div class='ctx'> 		if (!(flags &amp; TCP_DEFERRED_ALL))</div><div class='ctx'> 			return;</div><div class='ctx'> 		nflags = flags &amp; ~TCP_DEFERRED_ALL;</div><div class='del'>-	} while (cmpxchg(&amp;sk-&gt;sk_tsq_flags, flags, nflags) != flags);</div><div class='add'>+	} while (!try_cmpxchg(&amp;sk-&gt;sk_tsq_flags, &amp;flags, nflags));</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; TCPF_TSQ_DEFERRED) {</div><div class='ctx'> 		tcp_tsq_write(sk);</div><div class='ctx'> 		__sock_put(sk);</div><div class='ctx'> 	}</div><div class='del'>-	/* Here begins the tricky part :</div><div class='del'>-	 * We are called from release_sock() with :</div><div class='del'>-	 * 1) BH disabled</div><div class='del'>-	 * 2) sk_lock.slock spinlock held</div><div class='del'>-	 * 3) socket owned by us (sk-&gt;sk_lock.owned == 1)</div><div class='del'>-	 *</div><div class='del'>-	 * But following code is meant to be called from BH handlers,</div><div class='del'>-	 * so we should keep BH disabled, but early release socket ownership</div><div class='del'>-	 */</div><div class='del'>-	sock_release_ownership(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; TCPF_WRITE_TIMER_DEFERRED) {</div><div class='ctx'> 		tcp_write_timer_handler(sk);</div><div class='hunk'>@@ -894,20 +1328,20 @@ void tcp_release_cb(struct sock *sk)</div><div class='ctx'> 		inet_csk(sk)-&gt;icsk_af_ops-&gt;mtu_reduced(sk);</div><div class='ctx'> 		__sock_put(sk);</div><div class='ctx'> 	}</div><div class='add'>+	if ((flags &amp; TCPF_ACK_DEFERRED) &amp;&amp; inet_csk_ack_scheduled(sk))</div><div class='add'>+		tcp_send_ack(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_release_cb);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_release_cb);</div><div class='ctx'> </div><div class='del'>-void __init tcp_tasklet_init(void)</div><div class='add'>+void __init tcp_tsq_work_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='del'>-		struct tsq_tasklet *tsq = &amp;per_cpu(tsq_tasklet, i);</div><div class='add'>+		struct tsq_work *tsq = &amp;per_cpu(tsq_work, i);</div><div class='ctx'> </div><div class='ctx'> 		INIT_LIST_HEAD(&amp;tsq-&gt;head);</div><div class='del'>-		tasklet_init(&amp;tsq-&gt;tasklet,</div><div class='del'>-			     tcp_tasklet_func,</div><div class='del'>-			     (unsigned long)tsq);</div><div class='add'>+		INIT_WORK(&amp;tsq-&gt;work, tcp_tsq_workfn);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -921,9 +1355,11 @@ void tcp_wfree(struct sk_buff *skb)</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned long flags, nval, oval;</div><div class='add'>+	struct tsq_work *tsq;</div><div class='add'>+	bool empty;</div><div class='ctx'> </div><div class='ctx'> 	/* Keep one reference on sk_wmem_alloc.</div><div class='del'>-	 * Will be released by sk_free() from here or tcp_tasklet_func()</div><div class='add'>+	 * Will be released by sk_free() from here or tcp_tsq_workfn()</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(refcount_sub_and_test(skb-&gt;truesize - 1, &amp;sk-&gt;sk_wmem_alloc));</div><div class='ctx'> </div><div class='hunk'>@@ -937,28 +1373,23 @@ void tcp_wfree(struct sk_buff *skb)</div><div class='ctx'> 	if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) &gt;= SKB_TRUESIZE(1) &amp;&amp; this_cpu_ksoftirqd() == current)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (oval = READ_ONCE(sk-&gt;sk_tsq_flags);; oval = nval) {</div><div class='del'>-		struct tsq_tasklet *tsq;</div><div class='del'>-		bool empty;</div><div class='del'>-</div><div class='add'>+	oval = smp_load_acquire(&amp;sk-&gt;sk_tsq_flags);</div><div class='add'>+	do {</div><div class='ctx'> 		if (!(oval &amp; TSQF_THROTTLED) || (oval &amp; TSQF_QUEUED))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		nval = (oval &amp; ~TSQF_THROTTLED) | TSQF_QUEUED;</div><div class='del'>-		nval = cmpxchg(&amp;sk-&gt;sk_tsq_flags, oval, nval);</div><div class='del'>-		if (nval != oval)</div><div class='del'>-			continue;</div><div class='add'>+	} while (!try_cmpxchg(&amp;sk-&gt;sk_tsq_flags, &amp;oval, nval));</div><div class='ctx'> </div><div class='del'>-		/* queue this socket to tasklet queue */</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		tsq = this_cpu_ptr(&amp;tsq_tasklet);</div><div class='del'>-		empty = list_empty(&amp;tsq-&gt;head);</div><div class='del'>-		list_add(&amp;tp-&gt;tsq_node, &amp;tsq-&gt;head);</div><div class='del'>-		if (empty)</div><div class='del'>-			tasklet_schedule(&amp;tsq-&gt;tasklet);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	/* queue this socket to BH workqueue */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tsq = this_cpu_ptr(&amp;tsq_work);</div><div class='add'>+	empty = list_empty(&amp;tsq-&gt;head);</div><div class='add'>+	list_add(&amp;tp-&gt;tsq_node, &amp;tsq-&gt;head);</div><div class='add'>+	if (empty)</div><div class='add'>+		queue_work(system_bh_wq, &amp;tsq-&gt;work);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return;</div><div class='ctx'> out:</div><div class='ctx'> 	sk_free(sk);</div><div class='ctx'> }</div><div class='hunk'>@@ -977,31 +1408,34 @@ enum hrtimer_restart tcp_pace_kick(struct hrtimer *timer)</div><div class='ctx'> 	return HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_internal_pacing(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+static void tcp_update_skb_after_send(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				      u64 prior_wstamp)</div><div class='ctx'> {</div><div class='del'>-	u64 len_ns;</div><div class='del'>-	u32 rate;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (!tcp_needs_internal_pacing(sk))</div><div class='del'>-		return;</div><div class='del'>-	rate = sk-&gt;sk_pacing_rate;</div><div class='del'>-	if (!rate || rate == ~0U)</div><div class='del'>-		return;</div><div class='add'>+	if (sk-&gt;sk_pacing_status != SK_PACING_NONE) {</div><div class='add'>+		unsigned long rate = READ_ONCE(sk-&gt;sk_pacing_rate);</div><div class='ctx'> </div><div class='del'>-	len_ns = (u64)skb-&gt;len * NSEC_PER_SEC;</div><div class='del'>-	do_div(len_ns, rate);</div><div class='del'>-	hrtimer_start(&amp;tcp_sk(sk)-&gt;pacing_timer,</div><div class='del'>-		      ktime_add_ns(ktime_get(), len_ns),</div><div class='del'>-		      HRTIMER_MODE_ABS_PINNED_SOFT);</div><div class='del'>-	sock_hold(sk);</div><div class='del'>-}</div><div class='add'>+		/* Original sch_fq does not pace first 10 MSS</div><div class='add'>+		 * Note that tp-&gt;data_segs_out overflows after 2^32 packets,</div><div class='add'>+		 * this is a minor annoyance.</div><div class='add'>+		 */</div><div class='add'>+		if (rate != ~0UL &amp;&amp; rate &amp;&amp; tp-&gt;data_segs_out &gt;= 10) {</div><div class='add'>+			u64 len_ns = div64_ul((u64)skb-&gt;len * NSEC_PER_SEC, rate);</div><div class='add'>+			u64 credit = tp-&gt;tcp_wstamp_ns - prior_wstamp;</div><div class='ctx'> </div><div class='del'>-static void tcp_update_skb_after_send(struct tcp_sock *tp, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	skb-&gt;skb_mstamp = tp-&gt;tcp_mstamp;</div><div class='add'>+			/* take into account OS jitter */</div><div class='add'>+			len_ns -= min_t(u64, len_ns / 2, credit);</div><div class='add'>+			tp-&gt;tcp_wstamp_ns += len_ns;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	list_move_tail(&amp;skb-&gt;tcp_tsorted_anchor, &amp;tp-&gt;tsorted_sent_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl));</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int inet6_csk_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl));</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb));</div><div class='add'>+</div><div class='ctx'> /* This routine actually transmits TCP packets queued in by</div><div class='ctx'>  * tcp_do_sendmsg().  This is used by both the initial</div><div class='ctx'>  * transmission and possible later retransmissions.</div><div class='hunk'>@@ -1023,16 +1457,17 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	struct tcp_out_options opts;</div><div class='ctx'> 	unsigned int tcp_options_size, tcp_header_size;</div><div class='ctx'> 	struct sk_buff *oskb = NULL;</div><div class='del'>-	struct tcp_md5sig_key *md5;</div><div class='add'>+	struct tcp_key key;</div><div class='ctx'> 	struct tcphdr *th;</div><div class='add'>+	u64 prior_wstamp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!skb || !tcp_skb_pcount(skb));</div><div class='ctx'> 	tp = tcp_sk(sk);</div><div class='del'>-</div><div class='add'>+	prior_wstamp = tp-&gt;tcp_wstamp_ns;</div><div class='add'>+	tp-&gt;tcp_wstamp_ns = max(tp-&gt;tcp_wstamp_ns, tp-&gt;tcp_clock_cache);</div><div class='add'>+	skb_set_delivery_time(skb, tp-&gt;tcp_wstamp_ns, SKB_CLOCK_MONOTONIC);</div><div class='ctx'> 	if (clone_it) {</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tx.in_flight = TCP_SKB_CB(skb)-&gt;end_seq</div><div class='del'>-			- tp-&gt;snd_una;</div><div class='ctx'> 		oskb = skb;</div><div class='ctx'> </div><div class='ctx'> 		tcp_skb_tsorted_save(oskb) {</div><div class='hunk'>@@ -1044,28 +1479,49 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!skb))</div><div class='ctx'> 			return -ENOBUFS;</div><div class='add'>+		/* retransmit skbs might have a non zero value in skb-&gt;dev</div><div class='add'>+		 * because skb-&gt;dev is aliased with skb-&gt;rbnode.rb_left</div><div class='add'>+		 */</div><div class='add'>+		skb-&gt;dev = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	skb-&gt;skb_mstamp = tp-&gt;tcp_mstamp;</div><div class='ctx'> </div><div class='ctx'> 	inet = inet_sk(sk);</div><div class='ctx'> 	tcb = TCP_SKB_CB(skb);</div><div class='ctx'> 	memset(&amp;opts, 0, sizeof(opts));</div><div class='ctx'> </div><div class='del'>-	if (unlikely(tcb-&gt;tcp_flags &amp; TCPHDR_SYN))</div><div class='del'>-		tcp_options_size = tcp_syn_options(sk, skb, &amp;opts, &amp;md5);</div><div class='del'>-	else</div><div class='del'>-		tcp_options_size = tcp_established_options(sk, skb, &amp;opts,</div><div class='del'>-							   &amp;md5);</div><div class='add'>+	tcp_get_current_key(sk, &amp;key);</div><div class='add'>+	if (unlikely(tcb-&gt;tcp_flags &amp; TCPHDR_SYN)) {</div><div class='add'>+		tcp_options_size = tcp_syn_options(sk, skb, &amp;opts, &amp;key);</div><div class='add'>+	} else {</div><div class='add'>+		tcp_options_size = tcp_established_options(sk, skb, &amp;opts, &amp;key);</div><div class='add'>+		/* Force a PSH flag on all (GSO) packets to expedite GRO flush</div><div class='add'>+		 * at receiver : This slightly improve GRO performance.</div><div class='add'>+		 * Note that we do not force the PSH flag for non GSO packets,</div><div class='add'>+		 * because they might be sent under high congestion events,</div><div class='add'>+		 * and in this case it is better to delay the delivery of 1-MSS</div><div class='add'>+		 * packets and thus the corresponding ACK packet that would</div><div class='add'>+		 * release the following packet.</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_skb_pcount(skb) &gt; 1)</div><div class='add'>+			tcb-&gt;tcp_flags |= TCPHDR_PSH;</div><div class='add'>+	}</div><div class='ctx'> 	tcp_header_size = tcp_options_size + sizeof(struct tcphdr);</div><div class='ctx'> </div><div class='del'>-	/* if no packet is in qdisc/device queue, then allow XPS to select</div><div class='del'>-	 * another queue. We can be called from tcp_tsq_handler()</div><div class='del'>-	 * which holds one reference to sk.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: Ideally, in-flight pure ACK packets should not matter here.</div><div class='del'>-	 * One way to get this would be to set skb-&gt;truesize = 2 on them.</div><div class='add'>+	/* We set skb-&gt;ooo_okay to one if this packet can select</div><div class='add'>+	 * a different TX queue than prior packets of this flow,</div><div class='add'>+	 * to avoid self inflicted reorders.</div><div class='add'>+	 * The 'other' queue decision is based on current cpu number</div><div class='add'>+	 * if XPS is enabled, or sk-&gt;sk_txhash otherwise.</div><div class='add'>+	 * We can switch to another (and better) queue if:</div><div class='add'>+	 * 1) No packet with payload is in qdisc/device queues.</div><div class='add'>+	 *    Delays in TX completion can defeat the test</div><div class='add'>+	 *    even if packets were already sent.</div><div class='add'>+	 * 2) Or rtx queue is empty.</div><div class='add'>+	 *    This mitigates above case if ACK packets for</div><div class='add'>+	 *    all prior packets were already processed.</div><div class='ctx'> 	 */</div><div class='del'>-	skb-&gt;ooo_okay = sk_wmem_alloc_get(sk) &lt; SKB_TRUESIZE(1);</div><div class='add'>+	skb-&gt;ooo_okay = sk_wmem_alloc_get(sk) &lt; SKB_TRUESIZE(1) ||</div><div class='add'>+			tcp_rtx_queue_empty(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* If we had to use memory reserve to allocate this skb,</div><div class='ctx'> 	 * this might cause drops if packet is looped back :</div><div class='hunk'>@@ -1080,10 +1536,9 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	skb_orphan(skb);</div><div class='ctx'> 	skb-&gt;sk = sk;</div><div class='ctx'> 	skb-&gt;destructor = skb_is_tcp_pure_ack(skb) ? __sock_wfree : tcp_wfree;</div><div class='del'>-	skb_set_hash_from_sk(skb, sk);</div><div class='ctx'> 	refcount_add(skb-&gt;truesize, &amp;sk-&gt;sk_wmem_alloc);</div><div class='ctx'> </div><div class='del'>-	skb_set_dst_pending_confirm(skb, sk-&gt;sk_dst_pending_confirm);</div><div class='add'>+	skb_set_dst_pending_confirm(skb, READ_ONCE(sk-&gt;sk_dst_pending_confirm));</div><div class='ctx'> </div><div class='ctx'> 	/* Build TCP header and checksum it. */</div><div class='ctx'> 	th = (struct tcphdr *)skb-&gt;data;</div><div class='hunk'>@@ -1092,7 +1547,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	th-&gt;seq			= htonl(tcb-&gt;seq);</div><div class='ctx'> 	th-&gt;ack_seq		= htonl(rcv_nxt);</div><div class='ctx'> 	*(((__be16 *)th) + 6)	= htons(((tcp_header_size &gt;&gt; 2) &lt;&lt; 12) |</div><div class='del'>-					tcb-&gt;tcp_flags);</div><div class='add'>+					(tcb-&gt;tcp_flags &amp; TCPHDR_FLAGS_MASK));</div><div class='ctx'> </div><div class='ctx'> 	th-&gt;check		= 0;</div><div class='ctx'> 	th-&gt;urg_ptr		= 0;</div><div class='hunk'>@@ -1108,7 +1563,6 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tcp_options_write((__be32 *)(th + 1), tp, &amp;opts);</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_type = sk-&gt;sk_gso_type;</div><div class='ctx'> 	if (likely(!(tcb-&gt;tcp_flags &amp; TCPHDR_SYN))) {</div><div class='ctx'> 		th-&gt;window      = htons(tcp_select_window(sk));</div><div class='hunk'>@@ -1119,25 +1573,41 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		th-&gt;window	= htons(min(tp-&gt;rcv_wnd, 65535U));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	tcp_options_write(th, tp, NULL, &amp;opts, &amp;key);</div><div class='add'>+</div><div class='add'>+	if (tcp_key_is_md5(&amp;key)) {</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	/* Calculate the MD5 hash, as we have all we need now */</div><div class='del'>-	if (md5) {</div><div class='del'>-		sk_nocaps_add(sk, NETIF_F_GSO_MASK);</div><div class='add'>+		/* Calculate the MD5 hash, as we have all we need now */</div><div class='add'>+		sk_gso_disable(sk);</div><div class='ctx'> 		tp-&gt;af_specific-&gt;calc_md5_hash(opts.hash_location,</div><div class='del'>-					       md5, sk, skb);</div><div class='del'>-	}</div><div class='add'>+					       key.md5_key, sk, skb);</div><div class='ctx'> #endif</div><div class='add'>+	} else if (tcp_key_is_ao(&amp;key)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = tcp_ao_transmit_skb(sk, skb, key.ao_key, th,</div><div class='add'>+					  opts.hash_location);</div><div class='add'>+		if (err) {</div><div class='add'>+			sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_NOT_SPECIFIED);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BPF prog is the last one writing header option */</div><div class='add'>+	bpf_skops_write_hdr_opt(sk, skb, NULL, NULL, 0, &amp;opts);</div><div class='ctx'> </div><div class='del'>-	icsk-&gt;icsk_af_ops-&gt;send_check(sk, skb);</div><div class='add'>+	INDIRECT_CALL_INET(icsk-&gt;icsk_af_ops-&gt;send_check,</div><div class='add'>+			   tcp_v6_send_check, tcp_v4_send_check,</div><div class='add'>+			   sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(tcb-&gt;tcp_flags &amp; TCPHDR_ACK))</div><div class='del'>-		tcp_event_ack_sent(sk, tcp_skb_pcount(skb), rcv_nxt);</div><div class='add'>+		tcp_event_ack_sent(sk, rcv_nxt);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len != tcp_header_size) {</div><div class='ctx'> 		tcp_event_data_sent(tp, sk);</div><div class='ctx'> 		tp-&gt;data_segs_out += tcp_skb_pcount(skb);</div><div class='ctx'> 		tp-&gt;bytes_sent += skb-&gt;len - tcp_header_size;</div><div class='del'>-		tcp_internal_pacing(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (after(tcb-&gt;end_seq, tp-&gt;snd_nxt) || tcb-&gt;seq == tcb-&gt;end_seq)</div><div class='hunk'>@@ -1145,25 +1615,29 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			      tcp_skb_pcount(skb));</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;segs_out += tcp_skb_pcount(skb);</div><div class='add'>+	skb_set_hash_from_sk(skb, sk);</div><div class='ctx'> 	/* OK, its time to fill skb_shinfo(skb)-&gt;gso_{segs|size} */</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_segs = tcp_skb_pcount(skb);</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_size = tcp_skb_mss(skb);</div><div class='ctx'> </div><div class='del'>-	/* Our usage of tstamp should remain private */</div><div class='del'>-	skb-&gt;tstamp = 0;</div><div class='add'>+	/* Leave earliest departure time in skb-&gt;tstamp (skb-&gt;skb_mstamp_ns) */</div><div class='ctx'> </div><div class='ctx'> 	/* Cleanup our debris for IP stacks */</div><div class='ctx'> 	memset(skb-&gt;cb, 0, max(sizeof(struct inet_skb_parm),</div><div class='ctx'> 			       sizeof(struct inet6_skb_parm)));</div><div class='ctx'> </div><div class='del'>-	err = icsk-&gt;icsk_af_ops-&gt;queue_xmit(sk, skb, &amp;inet-&gt;cork.fl);</div><div class='add'>+	tcp_add_tx_delay(skb, tp);</div><div class='add'>+</div><div class='add'>+	err = INDIRECT_CALL_INET(icsk-&gt;icsk_af_ops-&gt;queue_xmit,</div><div class='add'>+				 inet6_csk_xmit, ip_queue_xmit,</div><div class='add'>+				 sk, skb, &amp;inet-&gt;cork.fl);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(err &gt; 0)) {</div><div class='ctx'> 		tcp_enter_cwr(sk);</div><div class='ctx'> 		err = net_xmit_eval(err);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!err &amp;&amp; oskb) {</div><div class='del'>-		tcp_update_skb_after_send(tp, oskb);</div><div class='add'>+		tcp_update_skb_after_send(sk, oskb, prior_wstamp);</div><div class='ctx'> 		tcp_rate_skb_sent(sk, oskb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1186,26 +1660,31 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Advance write_seq and place onto the write_queue. */</div><div class='del'>-	tp-&gt;write_seq = TCP_SKB_CB(skb)-&gt;end_seq;</div><div class='add'>+	WRITE_ONCE(tp-&gt;write_seq, TCP_SKB_CB(skb)-&gt;end_seq);</div><div class='ctx'> 	__skb_header_release(skb);</div><div class='add'>+	psp_enqueue_set_decrypted(sk, skb);</div><div class='ctx'> 	tcp_add_write_queue_tail(sk, skb);</div><div class='del'>-	sk-&gt;sk_wmem_queued += skb-&gt;truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, skb-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, skb-&gt;truesize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize TSO segments for a packet. */</div><div class='del'>-static void tcp_set_skb_tso_segs(struct sk_buff *skb, unsigned int mss_now)</div><div class='add'>+static int tcp_set_skb_tso_segs(struct sk_buff *skb, unsigned int mss_now)</div><div class='ctx'> {</div><div class='add'>+	int tso_segs;</div><div class='add'>+</div><div class='ctx'> 	if (skb-&gt;len &lt;= mss_now) {</div><div class='ctx'> 		/* Avoid the costly divide in the normal</div><div class='ctx'> 		 * non-TSO case.</div><div class='ctx'> 		 */</div><div class='del'>-		tcp_skb_pcount_set(skb, 1);</div><div class='ctx'> 		TCP_SKB_CB(skb)-&gt;tcp_gso_size = 0;</div><div class='del'>-	} else {</div><div class='del'>-		tcp_skb_pcount_set(skb, DIV_ROUND_UP(skb-&gt;len, mss_now));</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;tcp_gso_size = mss_now;</div><div class='add'>+		tcp_skb_pcount_set(skb, 1);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;tcp_gso_size = mss_now;</div><div class='add'>+	tso_segs = DIV_ROUND_UP(skb-&gt;len, mss_now);</div><div class='add'>+	tcp_skb_pcount_set(skb, tso_segs);</div><div class='add'>+	return tso_segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Pcount in the middle of the write queue got changed, we need to do various</div><div class='hunk'>@@ -1228,11 +1707,6 @@ static void tcp_adjust_pcount(struct sock *sk, const struct sk_buff *skb, int de</div><div class='ctx'> 	if (tcp_is_reno(tp) &amp;&amp; decr &gt; 0)</div><div class='ctx'> 		tp-&gt;sacked_out -= min_t(u32, tp-&gt;sacked_out, decr);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;lost_skb_hint &amp;&amp;</div><div class='del'>-	    before(TCP_SKB_CB(skb)-&gt;seq, TCP_SKB_CB(tp-&gt;lost_skb_hint)-&gt;seq) &amp;&amp;</div><div class='del'>-	    (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED))</div><div class='del'>-		tp-&gt;lost_cnt_hint -= decr;</div><div class='del'>-</div><div class='ctx'> 	tcp_verify_left_out(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1288,28 +1762,43 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *buff;</div><div class='del'>-	int nsize, old_factor;</div><div class='add'>+	int old_factor;</div><div class='add'>+	long limit;</div><div class='add'>+	u16 flags;</div><div class='ctx'> 	int nlen;</div><div class='del'>-	u8 flags;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(len &gt; skb-&gt;len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	nsize = skb_headlen(skb) - len;</div><div class='del'>-	if (nsize &lt; 0)</div><div class='del'>-		nsize = 0;</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb_headlen(skb));</div><div class='add'>+</div><div class='add'>+	/* tcp_sendmsg() can overshoot sk_wmem_queued by one full size skb.</div><div class='add'>+	 * We need some allowance to not penalize applications setting small</div><div class='add'>+	 * SO_SNDBUF values.</div><div class='add'>+	 * Also allow first and last skb in retransmit queue to be split.</div><div class='add'>+	 */</div><div class='add'>+	limit = sk-&gt;sk_sndbuf + 2 * SKB_TRUESIZE(GSO_LEGACY_MAX_SIZE);</div><div class='add'>+	if (unlikely((sk-&gt;sk_wmem_queued &gt;&gt; 1) &gt; limit &amp;&amp;</div><div class='add'>+		     tcp_queue != TCP_FRAG_IN_WRITE_QUEUE &amp;&amp;</div><div class='add'>+		     skb != tcp_rtx_queue_head(sk) &amp;&amp;</div><div class='add'>+		     skb != tcp_rtx_queue_tail(sk))) {</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (skb_unclone(skb, gfp))</div><div class='add'>+	if (skb_unclone_keeptruesize(skb, gfp))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Get a new skb... force flag on. */</div><div class='del'>-	buff = sk_stream_alloc_skb(sk, nsize, gfp, true);</div><div class='add'>+	buff = tcp_stream_alloc_skb(sk, gfp, true);</div><div class='ctx'> 	if (!buff)</div><div class='ctx'> 		return -ENOMEM; /* We'll just try again later. */</div><div class='add'>+	skb_copy_decrypted(buff, skb);</div><div class='add'>+	mptcp_skb_ext_copy(buff, skb);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_wmem_queued += buff-&gt;truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, buff-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, buff-&gt;truesize);</div><div class='del'>-	nlen = skb-&gt;len - len - nsize;</div><div class='add'>+	nlen = skb-&gt;len - len;</div><div class='ctx'> 	buff-&gt;truesize += nlen;</div><div class='ctx'> 	skb-&gt;truesize -= nlen;</div><div class='ctx'> </div><div class='hunk'>@@ -1327,9 +1816,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='ctx'> </div><div class='ctx'> 	skb_split(skb, buff, len);</div><div class='ctx'> </div><div class='del'>-	buff-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-</div><div class='del'>-	buff-&gt;tstamp = skb-&gt;tstamp;</div><div class='add'>+	skb_set_delivery_time(buff, skb-&gt;tstamp, SKB_CLOCK_MONOTONIC);</div><div class='ctx'> 	tcp_fragment_tstamp(skb, buff);</div><div class='ctx'> </div><div class='ctx'> 	old_factor = tcp_skb_pcount(skb);</div><div class='hunk'>@@ -1369,13 +1856,7 @@ static int __pskb_trim_head(struct sk_buff *skb, int len)</div><div class='ctx'> 	struct skb_shared_info *shinfo;</div><div class='ctx'> 	int i, k, eat;</div><div class='ctx'> </div><div class='del'>-	eat = min_t(int, len, skb_headlen(skb));</div><div class='del'>-	if (eat) {</div><div class='del'>-		__skb_pull(skb, eat);</div><div class='del'>-		len -= eat;</div><div class='del'>-		if (!len)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb_headlen(skb));</div><div class='ctx'> 	eat = len;</div><div class='ctx'> 	k = 0;</div><div class='ctx'> 	shinfo = skb_shinfo(skb);</div><div class='hunk'>@@ -1388,7 +1869,7 @@ static int __pskb_trim_head(struct sk_buff *skb, int len)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			shinfo-&gt;frags[k] = shinfo-&gt;frags[i];</div><div class='ctx'> 			if (eat) {</div><div class='del'>-				shinfo-&gt;frags[k].page_offset += eat;</div><div class='add'>+				skb_frag_off_add(&amp;shinfo-&gt;frags[k], eat);</div><div class='ctx'> 				skb_frag_size_sub(&amp;shinfo-&gt;frags[k], eat);</div><div class='ctx'> 				eat = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1407,20 +1888,17 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 delta_truesize;</div><div class='ctx'> </div><div class='del'>-	if (skb_unclone(skb, GFP_ATOMIC))</div><div class='add'>+	if (skb_unclone_keeptruesize(skb, GFP_ATOMIC))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	delta_truesize = __pskb_trim_head(skb, len);</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;seq += len;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='del'>-	if (delta_truesize) {</div><div class='del'>-		skb-&gt;truesize	   -= delta_truesize;</div><div class='del'>-		sk-&gt;sk_wmem_queued -= delta_truesize;</div><div class='add'>+	skb-&gt;truesize	   -= delta_truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, -delta_truesize);</div><div class='add'>+	if (!skb_zcopy_pure(skb))</div><div class='ctx'> 		sk_mem_uncharge(sk, delta_truesize);</div><div class='del'>-		sock_set_flag(sk, SOCK_QUEUE_SHRUNK);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Any change of skb-&gt;len requires recalculation of tso factor. */</div><div class='ctx'> 	if (tcp_skb_pcount(skb) &gt; 1)</div><div class='hunk'>@@ -1441,14 +1919,6 @@ static inline int __tcp_mtu_to_mss(struct sock *sk, int pmtu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mss_now = pmtu - icsk-&gt;icsk_af_ops-&gt;net_header_len - sizeof(struct tcphdr);</div><div class='ctx'> </div><div class='del'>-	/* IPv6 adds a frag_hdr in case RTAX_FEATURE_ALLFRAG is set */</div><div class='del'>-	if (icsk-&gt;icsk_af_ops-&gt;net_frag_header_len) {</div><div class='del'>-		const struct dst_entry *dst = __sk_dst_get(sk);</div><div class='del'>-</div><div class='del'>-		if (dst &amp;&amp; dst_allfrag(dst))</div><div class='del'>-			mss_now -= icsk-&gt;icsk_af_ops-&gt;net_frag_header_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Clamp it (mss_clamp does not include tcp options) */</div><div class='ctx'> 	if (mss_now &gt; tp-&gt;rx_opt.mss_clamp)</div><div class='ctx'> 		mss_now = tp-&gt;rx_opt.mss_clamp;</div><div class='hunk'>@@ -1457,8 +1927,8 @@ static inline int __tcp_mtu_to_mss(struct sock *sk, int pmtu)</div><div class='ctx'> 	mss_now -= icsk-&gt;icsk_ext_hdr_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Then reserve room for full set of TCP options and 8 bytes of data */</div><div class='del'>-	if (mss_now &lt; 48)</div><div class='del'>-		mss_now = 48;</div><div class='add'>+	mss_now = max(mss_now,</div><div class='add'>+		      READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_min_snd_mss));</div><div class='ctx'> 	return mss_now;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1469,27 +1939,18 @@ int tcp_mtu_to_mss(struct sock *sk, int pmtu)</div><div class='ctx'> 	return __tcp_mtu_to_mss(sk, pmtu) -</div><div class='ctx'> 	       (tcp_sk(sk)-&gt;tcp_header_len - sizeof(struct tcphdr));</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD(tcp_mtu_to_mss);</div><div class='ctx'> </div><div class='ctx'> /* Inverse of above */</div><div class='ctx'> int tcp_mss_to_mtu(struct sock *sk, int mss)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	int mtu;</div><div class='ctx'> </div><div class='del'>-	mtu = mss +</div><div class='add'>+	return mss +</div><div class='ctx'> 	      tp-&gt;tcp_header_len +</div><div class='ctx'> 	      icsk-&gt;icsk_ext_hdr_len +</div><div class='ctx'> 	      icsk-&gt;icsk_af_ops-&gt;net_header_len;</div><div class='del'>-</div><div class='del'>-	/* IPv6 adds a frag_hdr in case RTAX_FEATURE_ALLFRAG is set */</div><div class='del'>-	if (icsk-&gt;icsk_af_ops-&gt;net_frag_header_len) {</div><div class='del'>-		const struct dst_entry *dst = __sk_dst_get(sk);</div><div class='del'>-</div><div class='del'>-		if (dst &amp;&amp; dst_allfrag(dst))</div><div class='del'>-			mtu += icsk-&gt;icsk_af_ops-&gt;net_frag_header_len;</div><div class='del'>-	}</div><div class='del'>-	return mtu;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_mss_to_mtu);</div><div class='ctx'> </div><div class='hunk'>@@ -1500,15 +1961,14 @@ void tcp_mtup_init(struct sock *sk)</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> </div><div class='del'>-	icsk-&gt;icsk_mtup.enabled = net-&gt;ipv4.sysctl_tcp_mtu_probing &gt; 1;</div><div class='add'>+	icsk-&gt;icsk_mtup.enabled = READ_ONCE(net-&gt;ipv4.sysctl_tcp_mtu_probing) &gt; 1;</div><div class='ctx'> 	icsk-&gt;icsk_mtup.search_high = tp-&gt;rx_opt.mss_clamp + sizeof(struct tcphdr) +</div><div class='ctx'> 			       icsk-&gt;icsk_af_ops-&gt;net_header_len;</div><div class='del'>-	icsk-&gt;icsk_mtup.search_low = tcp_mss_to_mtu(sk, net-&gt;ipv4.sysctl_tcp_base_mss);</div><div class='add'>+	icsk-&gt;icsk_mtup.search_low = tcp_mss_to_mtu(sk, READ_ONCE(net-&gt;ipv4.sysctl_tcp_base_mss));</div><div class='ctx'> 	icsk-&gt;icsk_mtup.probe_size = 0;</div><div class='ctx'> 	if (icsk-&gt;icsk_mtup.enabled)</div><div class='ctx'> 		icsk-&gt;icsk_mtup.probe_timestamp = tcp_jiffies32;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_mtup_init);</div><div class='ctx'> </div><div class='ctx'> /* This function synchronize snd mss to current pmtu/exthdr set.</div><div class='ctx'> </div><div class='hunk'>@@ -1552,7 +2012,7 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu)</div><div class='ctx'> </div><div class='ctx'> 	return mss_now;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_sync_mss);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_sync_mss);</div><div class='ctx'> </div><div class='ctx'> /* Compute the current effective MSS, taking SACKs and IP options,</div><div class='ctx'>  * and even PMTU discovery events into account.</div><div class='hunk'>@@ -1564,7 +2024,7 @@ unsigned int tcp_current_mss(struct sock *sk)</div><div class='ctx'> 	u32 mss_now;</div><div class='ctx'> 	unsigned int header_len;</div><div class='ctx'> 	struct tcp_out_options opts;</div><div class='del'>-	struct tcp_md5sig_key *md5;</div><div class='add'>+	struct tcp_key key;</div><div class='ctx'> </div><div class='ctx'> 	mss_now = tp-&gt;mss_cache;</div><div class='ctx'> </div><div class='hunk'>@@ -1573,8 +2033,8 @@ unsigned int tcp_current_mss(struct sock *sk)</div><div class='ctx'> 		if (mtu != inet_csk(sk)-&gt;icsk_pmtu_cookie)</div><div class='ctx'> 			mss_now = tcp_sync_mss(sk, mtu);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	header_len = tcp_established_options(sk, NULL, &amp;opts, &amp;md5) +</div><div class='add'>+	tcp_get_current_key(sk, &amp;key);</div><div class='add'>+	header_len = tcp_established_options(sk, NULL, &amp;opts, &amp;key) +</div><div class='ctx'> 		     sizeof(struct tcphdr);</div><div class='ctx'> 	/* The mss_cache is sized based on tp-&gt;tcp_header_len, which assumes</div><div class='ctx'> 	 * some common options. If this is an odd packet (because we have SACK</div><div class='hunk'>@@ -1601,9 +2061,9 @@ static void tcp_cwnd_application_limited(struct sock *sk)</div><div class='ctx'> 		/* Limited by application or receiver window. */</div><div class='ctx'> 		u32 init_win = tcp_init_cwnd(tp, __sk_dst_get(sk));</div><div class='ctx'> 		u32 win_used = max(tp-&gt;snd_cwnd_used, init_win);</div><div class='del'>-		if (win_used &lt; tp-&gt;snd_cwnd) {</div><div class='add'>+		if (win_used &lt; tcp_snd_cwnd(tp)) {</div><div class='ctx'> 			tp-&gt;snd_ssthresh = tcp_current_ssthresh(sk);</div><div class='del'>-			tp-&gt;snd_cwnd = (tp-&gt;snd_cwnd + win_used) &gt;&gt; 1;</div><div class='add'>+			tcp_snd_cwnd_set(tp, (tcp_snd_cwnd(tp) + win_used) &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		tp-&gt;snd_cwnd_used = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1615,14 +2075,20 @@ static void tcp_cwnd_validate(struct sock *sk, bool is_cwnd_limited)</div><div class='ctx'> 	const struct tcp_congestion_ops *ca_ops = inet_csk(sk)-&gt;icsk_ca_ops;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	/* Track the maximum number of outstanding packets in each</div><div class='del'>-	 * window, and remember whether we were cwnd-limited then.</div><div class='add'>+	/* Track the strongest available signal of the degree to which the cwnd</div><div class='add'>+	 * is fully utilized. If cwnd-limited then remember that fact for the</div><div class='add'>+	 * current window. If not cwnd-limited then track the maximum number of</div><div class='add'>+	 * outstanding packets in the current window. (If cwnd-limited then we</div><div class='add'>+	 * chose to not update tp-&gt;max_packets_out to avoid an extra else</div><div class='add'>+	 * clause with no functional impact.)</div><div class='ctx'> 	 */</div><div class='del'>-	if (!before(tp-&gt;snd_una, tp-&gt;max_packets_seq) ||</div><div class='del'>-	    tp-&gt;packets_out &gt; tp-&gt;max_packets_out) {</div><div class='del'>-		tp-&gt;max_packets_out = tp-&gt;packets_out;</div><div class='del'>-		tp-&gt;max_packets_seq = tp-&gt;snd_nxt;</div><div class='add'>+	if (!before(tp-&gt;snd_una, tp-&gt;cwnd_usage_seq) ||</div><div class='add'>+	    is_cwnd_limited ||</div><div class='add'>+	    (!tp-&gt;is_cwnd_limited &amp;&amp;</div><div class='add'>+	     tp-&gt;packets_out &gt; tp-&gt;max_packets_out)) {</div><div class='ctx'> 		tp-&gt;is_cwnd_limited = is_cwnd_limited;</div><div class='add'>+		tp-&gt;max_packets_out = tp-&gt;packets_out;</div><div class='add'>+		tp-&gt;cwnd_usage_seq = tp-&gt;snd_nxt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_is_cwnd_limited(sk)) {</div><div class='hunk'>@@ -1634,7 +2100,7 @@ static void tcp_cwnd_validate(struct sock *sk, bool is_cwnd_limited)</div><div class='ctx'> 		if (tp-&gt;packets_out &gt; tp-&gt;snd_cwnd_used)</div><div class='ctx'> 			tp-&gt;snd_cwnd_used = tp-&gt;packets_out;</div><div class='ctx'> </div><div class='del'>-		if (sock_net(sk)-&gt;ipv4.sysctl_tcp_slow_start_after_idle &amp;&amp;</div><div class='add'>+		if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_slow_start_after_idle) &amp;&amp;</div><div class='ctx'> 		    (s32)(tcp_jiffies32 - tp-&gt;snd_cwnd_stamp) &gt;= inet_csk(sk)-&gt;icsk_rto &amp;&amp;</div><div class='ctx'> 		    !ca_ops-&gt;cong_control)</div><div class='ctx'> 			tcp_cwnd_application_limited(sk);</div><div class='hunk'>@@ -1691,24 +2157,34 @@ static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return how many segs we'd like on a TSO packet,</div><div class='del'>- * to send one TSO packet per ms</div><div class='add'>+ * depending on current pacing rate, and how close the peer is.</div><div class='add'>+ *</div><div class='add'>+ * Rationale is:</div><div class='add'>+ * - For close peers, we rather send bigger packets to reduce</div><div class='add'>+ *   cpu costs, because occasional losses will be repaired fast.</div><div class='add'>+ * - For long distance/rtt flows, we would like to get ACK clocking</div><div class='add'>+ *   with 1 ACK per ms.</div><div class='add'>+ *</div><div class='add'>+ * Use min_rtt to help adapt TSO burst size, with smaller min_rtt resulting</div><div class='add'>+ * in bigger TSO bursts. We we cut the RTT-based allowance in half</div><div class='add'>+ * for every 2^9 usec (aka 512 us) of RTT, so that the RTT-based allowance</div><div class='add'>+ * is below 1500 bytes after 6 * ~500 usec = 3ms.</div><div class='ctx'>  */</div><div class='ctx'> static u32 tcp_tso_autosize(const struct sock *sk, unsigned int mss_now,</div><div class='ctx'> 			    int min_tso_segs)</div><div class='ctx'> {</div><div class='del'>-	u32 bytes, segs;</div><div class='add'>+	unsigned long bytes;</div><div class='add'>+	u32 r;</div><div class='ctx'> </div><div class='del'>-	bytes = min(sk-&gt;sk_pacing_rate &gt;&gt; sk-&gt;sk_pacing_shift,</div><div class='del'>-		    sk-&gt;sk_gso_max_size - 1 - MAX_TCP_HEADER);</div><div class='add'>+	bytes = READ_ONCE(sk-&gt;sk_pacing_rate) &gt;&gt; READ_ONCE(sk-&gt;sk_pacing_shift);</div><div class='ctx'> </div><div class='del'>-	/* Goal is to send at least one packet per ms,</div><div class='del'>-	 * not one big TSO packet every 100 ms.</div><div class='del'>-	 * This preserves ACK clocking and is consistent</div><div class='del'>-	 * with tcp_tso_should_defer() heuristic.</div><div class='del'>-	 */</div><div class='del'>-	segs = max_t(u32, bytes / mss_now, min_tso_segs);</div><div class='add'>+	r = tcp_min_rtt(tcp_sk(sk)) &gt;&gt; READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_tso_rtt_log);</div><div class='add'>+	if (r &lt; BITS_PER_TYPE(sk-&gt;sk_gso_max_size))</div><div class='add'>+		bytes += sk-&gt;sk_gso_max_size &gt;&gt; r;</div><div class='ctx'> </div><div class='del'>-	return segs;</div><div class='add'>+	bytes = min_t(unsigned long, bytes, sk-&gt;sk_gso_max_size);</div><div class='add'>+</div><div class='add'>+	return max_t(u32, bytes / mss_now, min_tso_segs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return the number of segments we want in the skb we are transmitting.</div><div class='hunk'>@@ -1721,7 +2197,7 @@ static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now)</div><div class='ctx'> </div><div class='ctx'> 	min_tso = ca_ops-&gt;min_tso_segs ?</div><div class='ctx'> 			ca_ops-&gt;min_tso_segs(sk) :</div><div class='del'>-			sock_net(sk)-&gt;ipv4.sysctl_tcp_min_tso_segs;</div><div class='add'>+			READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_min_tso_segs);</div><div class='ctx'> </div><div class='ctx'> 	tso_segs = tcp_tso_autosize(sk, mss_now, min_tso);</div><div class='ctx'> 	return min_t(u32, tso_segs, sk-&gt;sk_gso_max_segs);</div><div class='hunk'>@@ -1762,18 +2238,12 @@ static unsigned int tcp_mss_split_point(const struct sock *sk,</div><div class='ctx'> /* Can at least one segment of SKB be sent right now, according to the</div><div class='ctx'>  * congestion window rules?  If so, return how many segments are allowed.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int tcp_cwnd_test(const struct tcp_sock *tp,</div><div class='del'>-					 const struct sk_buff *skb)</div><div class='add'>+static u32 tcp_cwnd_test(const struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in_flight, cwnd, halfcwnd;</div><div class='ctx'> </div><div class='del'>-	/* Don't be strict about the congestion window for the final FIN.  */</div><div class='del'>-	if ((TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN) &amp;&amp;</div><div class='del'>-	    tcp_skb_pcount(skb) == 1)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	in_flight = tcp_packets_in_flight(tp);</div><div class='del'>-	cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+	cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> 	if (in_flight &gt;= cwnd)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1792,10 +2262,9 @@ static int tcp_init_tso_segs(struct sk_buff *skb, unsigned int mss_now)</div><div class='ctx'> {</div><div class='ctx'> 	int tso_segs = tcp_skb_pcount(skb);</div><div class='ctx'> </div><div class='del'>-	if (!tso_segs || (tso_segs &gt; 1 &amp;&amp; tcp_skb_mss(skb) != mss_now)) {</div><div class='del'>-		tcp_set_skb_tso_segs(skb, mss_now);</div><div class='del'>-		tso_segs = tcp_skb_pcount(skb);</div><div class='del'>-	}</div><div class='add'>+	if (!tso_segs || (tso_segs &gt; 1 &amp;&amp; tcp_skb_mss(skb) != mss_now))</div><div class='add'>+		return tcp_set_skb_tso_segs(skb, mss_now);</div><div class='add'>+</div><div class='ctx'> 	return tso_segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1845,23 +2314,23 @@ static bool tcp_snd_wnd_test(const struct tcp_sock *tp,</div><div class='ctx'>  * know that all the data is in scatter-gather pages, and that the</div><div class='ctx'>  * packet has never been sent out before (and thus is not cloned).</div><div class='ctx'>  */</div><div class='del'>-static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='del'>-			struct sk_buff *skb, unsigned int len,</div><div class='add'>+static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,</div><div class='ctx'> 			unsigned int mss_now, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *buff;</div><div class='ctx'> 	int nlen = skb-&gt;len - len;</div><div class='del'>-	u8 flags;</div><div class='add'>+	struct sk_buff *buff;</div><div class='add'>+	u16 flags;</div><div class='ctx'> </div><div class='ctx'> 	/* All of a TSO frame must be composed of paged data.  */</div><div class='del'>-	if (skb-&gt;len != skb-&gt;data_len)</div><div class='del'>-		return tcp_fragment(sk, tcp_queue, skb, len, mss_now, gfp);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(skb-&gt;len != skb-&gt;data_len);</div><div class='ctx'> </div><div class='del'>-	buff = sk_stream_alloc_skb(sk, 0, gfp, true);</div><div class='add'>+	buff = tcp_stream_alloc_skb(sk, gfp, true);</div><div class='ctx'> 	if (unlikely(!buff))</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	skb_copy_decrypted(buff, skb);</div><div class='add'>+	mptcp_skb_ext_copy(buff, skb);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_wmem_queued += buff-&gt;truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, buff-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, buff-&gt;truesize);</div><div class='ctx'> 	buff-&gt;truesize += nlen;</div><div class='ctx'> 	skb-&gt;truesize -= nlen;</div><div class='hunk'>@@ -1876,12 +2345,8 @@ static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tcp_flags = flags &amp; ~(TCPHDR_FIN | TCPHDR_PSH);</div><div class='ctx'> 	TCP_SKB_CB(buff)-&gt;tcp_flags = flags;</div><div class='ctx'> </div><div class='del'>-	/* This packet was never sent out yet, so no SACK bits. */</div><div class='del'>-	TCP_SKB_CB(buff)-&gt;sacked = 0;</div><div class='del'>-</div><div class='ctx'> 	tcp_skb_fragment_eor(skb, buff);</div><div class='ctx'> </div><div class='del'>-	buff-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> 	skb_split(skb, buff, len);</div><div class='ctx'> 	tcp_fragment_tstamp(skb, buff);</div><div class='ctx'> </div><div class='hunk'>@@ -1891,7 +2356,7 @@ static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='ctx'> </div><div class='ctx'> 	/* Link BUFF into the send queue. */</div><div class='ctx'> 	__skb_header_release(buff);</div><div class='del'>-	tcp_insert_write_queue_after(skb, buff, sk, tcp_queue);</div><div class='add'>+	tcp_insert_write_queue_after(skb, buff, sk, TCP_FRAG_IN_WRITE_QUEUE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1902,35 +2367,39 @@ static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue,</div><div class='ctx'>  * This algorithm is from John Heffner.</div><div class='ctx'>  */</div><div class='ctx'> static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-				 bool *is_cwnd_limited, u32 max_segs)</div><div class='add'>+				 bool *is_cwnd_limited,</div><div class='add'>+				 bool *is_rwnd_limited,</div><div class='add'>+				 u32 max_segs)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	u32 age, send_win, cong_win, limit, in_flight;</div><div class='add'>+	u32 send_win, cong_win, limit, in_flight, threshold;</div><div class='add'>+	u64 srtt_in_ns, expected_ack, how_far_is_the_ack;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *head;</div><div class='ctx'> 	int win_divisor;</div><div class='del'>-</div><div class='del'>-	if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN)</div><div class='del'>-		goto send_now;</div><div class='add'>+	s64 delta;</div><div class='ctx'> </div><div class='ctx'> 	if (icsk-&gt;icsk_ca_state &gt;= TCP_CA_Recovery)</div><div class='ctx'> 		goto send_now;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid bursty behavior by allowing defer</div><div class='del'>-	 * only if the last write was recent.</div><div class='add'>+	 * only if the last write was recent (1 ms).</div><div class='add'>+	 * Note that tp-&gt;tcp_wstamp_ns can be in the future if we have</div><div class='add'>+	 * packets waiting in a qdisc or device for EDT delivery.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((s32)(tcp_jiffies32 - tp-&gt;lsndtime) &gt; 0)</div><div class='add'>+	delta = tp-&gt;tcp_clock_cache - tp-&gt;tcp_wstamp_ns - NSEC_PER_MSEC;</div><div class='add'>+	if (delta &gt; 0)</div><div class='ctx'> 		goto send_now;</div><div class='ctx'> </div><div class='ctx'> 	in_flight = tcp_packets_in_flight(tp);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(tcp_skb_pcount(skb) &lt;= 1);</div><div class='del'>-	BUG_ON(tp-&gt;snd_cwnd &lt;= in_flight);</div><div class='add'>+	BUG_ON(tcp_snd_cwnd(tp) &lt;= in_flight);</div><div class='ctx'> </div><div class='ctx'> 	send_win = tcp_wnd_end(tp) - TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> </div><div class='ctx'> 	/* From in_flight test above, we know that cwnd &gt; in_flight.  */</div><div class='del'>-	cong_win = (tp-&gt;snd_cwnd - in_flight) * tp-&gt;mss_cache;</div><div class='add'>+	cong_win = (tcp_snd_cwnd(tp) - in_flight) * tp-&gt;mss_cache;</div><div class='ctx'> </div><div class='ctx'> 	limit = min(send_win, cong_win);</div><div class='ctx'> </div><div class='hunk'>@@ -1944,7 +2413,7 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	win_divisor = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_tso_win_divisor);</div><div class='ctx'> 	if (win_divisor) {</div><div class='del'>-		u32 chunk = min(tp-&gt;snd_wnd, tp-&gt;snd_cwnd * tp-&gt;mss_cache);</div><div class='add'>+		u32 chunk = min(tp-&gt;snd_wnd, tcp_snd_cwnd(tp) * tp-&gt;mss_cache);</div><div class='ctx'> </div><div class='ctx'> 		/* If at least some fraction of a window is available,</div><div class='ctx'> 		 * just use it.</div><div class='hunk'>@@ -1966,15 +2435,43 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	head = tcp_rtx_queue_head(sk);</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		goto send_now;</div><div class='del'>-	age = tcp_stamp_us_delta(tp-&gt;tcp_mstamp, head-&gt;skb_mstamp);</div><div class='del'>-	/* If next ACK is likely to come too late (half srtt), do not defer */</div><div class='del'>-	if (age &lt; (tp-&gt;srtt_us &gt;&gt; 4))</div><div class='add'>+</div><div class='add'>+	srtt_in_ns = (u64)(NSEC_PER_USEC &gt;&gt; 3) * tp-&gt;srtt_us;</div><div class='add'>+	/* When is the ACK expected ? */</div><div class='add'>+	expected_ack = head-&gt;tstamp + srtt_in_ns;</div><div class='add'>+	/* How far from now is the ACK expected ? */</div><div class='add'>+	how_far_is_the_ack = expected_ack - tp-&gt;tcp_clock_cache;</div><div class='add'>+</div><div class='add'>+	/* If next ACK is likely to come too late,</div><div class='add'>+	 * ie in more than min(1ms, half srtt), do not defer.</div><div class='add'>+	 */</div><div class='add'>+	threshold = min(srtt_in_ns &gt;&gt; 1, NSEC_PER_MSEC);</div><div class='add'>+</div><div class='add'>+	if ((s64)(how_far_is_the_ack - threshold) &gt; 0)</div><div class='ctx'> 		goto send_now;</div><div class='ctx'> </div><div class='del'>-	/* Ok, it looks like it is advisable to defer. */</div><div class='add'>+	/* Ok, it looks like it is advisable to defer.</div><div class='add'>+	 * Three cases are tracked :</div><div class='add'>+	 * 1) We are cwnd-limited</div><div class='add'>+	 * 2) We are rwnd-limited</div><div class='add'>+	 * 3) We are application limited.</div><div class='add'>+	 */</div><div class='add'>+	if (cong_win &lt; send_win) {</div><div class='add'>+		if (cong_win &lt;= skb-&gt;len) {</div><div class='add'>+			*is_cwnd_limited = true;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (send_win &lt;= skb-&gt;len) {</div><div class='add'>+			*is_rwnd_limited = true;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (cong_win &lt; send_win &amp;&amp; cong_win &lt;= skb-&gt;len)</div><div class='del'>-		*is_cwnd_limited = true;</div><div class='add'>+	/* If this packet won't get more data, do not wait. */</div><div class='add'>+	if ((TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_FIN) ||</div><div class='add'>+	    TCP_SKB_CB(skb)-&gt;eor)</div><div class='add'>+		goto send_now;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='hunk'>@@ -1990,7 +2487,7 @@ static inline void tcp_mtu_check_reprobe(struct sock *sk)</div><div class='ctx'> 	u32 interval;</div><div class='ctx'> 	s32 delta;</div><div class='ctx'> </div><div class='del'>-	interval = net-&gt;ipv4.sysctl_tcp_probe_interval;</div><div class='add'>+	interval = READ_ONCE(net-&gt;ipv4.sysctl_tcp_probe_interval);</div><div class='ctx'> 	delta = tcp_jiffies32 - icsk-&gt;icsk_mtup.probe_timestamp;</div><div class='ctx'> 	if (unlikely(delta &gt;= interval * HZ)) {</div><div class='ctx'> 		int mss = tcp_current_mss(sk);</div><div class='hunk'>@@ -2016,7 +2513,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)</div><div class='ctx'> 		if (len &lt;= skb-&gt;len)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(TCP_SKB_CB(skb)-&gt;eor))</div><div class='add'>+		if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		len -= skb-&gt;len;</div><div class='hunk'>@@ -2025,6 +2522,72 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tcp_clone_payload(struct sock *sk, struct sk_buff *to,</div><div class='add'>+			     int probe_size)</div><div class='add'>+{</div><div class='add'>+	skb_frag_t *lastfrag = NULL, *fragto = skb_shinfo(to)-&gt;frags;</div><div class='add'>+	int i, todo, len = 0, nr_frags = 0;</div><div class='add'>+	const struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!sk_wmem_schedule(sk, to-&gt;truesize + probe_size))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(&amp;sk-&gt;sk_write_queue, skb) {</div><div class='add'>+		const skb_frag_t *fragfrom = skb_shinfo(skb)-&gt;frags;</div><div class='add'>+</div><div class='add'>+		if (skb_headlen(skb))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++, fragfrom++) {</div><div class='add'>+			if (len &gt;= probe_size)</div><div class='add'>+				goto commit;</div><div class='add'>+			todo = min_t(int, skb_frag_size(fragfrom),</div><div class='add'>+				     probe_size - len);</div><div class='add'>+			len += todo;</div><div class='add'>+			if (lastfrag &amp;&amp;</div><div class='add'>+			    skb_frag_page(fragfrom) == skb_frag_page(lastfrag) &amp;&amp;</div><div class='add'>+			    skb_frag_off(fragfrom) == skb_frag_off(lastfrag) +</div><div class='add'>+						      skb_frag_size(lastfrag)) {</div><div class='add'>+				skb_frag_size_add(lastfrag, todo);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (unlikely(nr_frags == MAX_SKB_FRAGS))</div><div class='add'>+				return -E2BIG;</div><div class='add'>+			skb_frag_page_copy(fragto, fragfrom);</div><div class='add'>+			skb_frag_off_copy(fragto, fragfrom);</div><div class='add'>+			skb_frag_size_set(fragto, todo);</div><div class='add'>+			nr_frags++;</div><div class='add'>+			lastfrag = fragto++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+commit:</div><div class='add'>+	WARN_ON_ONCE(len != probe_size);</div><div class='add'>+	for (i = 0; i &lt; nr_frags; i++)</div><div class='add'>+		skb_frag_ref(to, i);</div><div class='add'>+</div><div class='add'>+	skb_shinfo(to)-&gt;nr_frags = nr_frags;</div><div class='add'>+	to-&gt;truesize += probe_size;</div><div class='add'>+	to-&gt;len += probe_size;</div><div class='add'>+	to-&gt;data_len += probe_size;</div><div class='add'>+	__skb_header_release(to);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* tcp_mtu_probe() and tcp_grow_skb() can both eat an skb (src) if</div><div class='add'>+ * all its payload was moved to another one (dst).</div><div class='add'>+ * Make sure to transfer tcp_flags, eor, and tstamp.</div><div class='add'>+ */</div><div class='add'>+static void tcp_eat_one_skb(struct sock *sk,</div><div class='add'>+			    struct sk_buff *dst,</div><div class='add'>+			    struct sk_buff *src)</div><div class='add'>+{</div><div class='add'>+	TCP_SKB_CB(dst)-&gt;tcp_flags |= TCP_SKB_CB(src)-&gt;tcp_flags;</div><div class='add'>+	TCP_SKB_CB(dst)-&gt;eor = TCP_SKB_CB(src)-&gt;eor;</div><div class='add'>+	tcp_skb_collapse_tstamp(dst, src);</div><div class='add'>+	tcp_unlink_write_queue(src, sk);</div><div class='add'>+	tcp_wmem_free_skb(sk, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Create a new MTU probe if we are ready.</div><div class='ctx'>  * MTU probe is regularly attempting to increase the path MTU by</div><div class='ctx'>  * deliberately sending larger packets.  This discovers routing</div><div class='hunk'>@@ -2054,7 +2617,7 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 	if (likely(!icsk-&gt;icsk_mtup.enabled ||</div><div class='ctx'> 		   icsk-&gt;icsk_mtup.probe_size ||</div><div class='ctx'> 		   inet_csk(sk)-&gt;icsk_ca_state != TCP_CA_Open ||</div><div class='del'>-		   tp-&gt;snd_cwnd &lt; 11 ||</div><div class='add'>+		   tcp_snd_cwnd(tp) &lt; 11 ||</div><div class='ctx'> 		   tp-&gt;rx_opt.num_sacks || tp-&gt;rx_opt.dsack))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -2072,7 +2635,7 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 	 * probing process by not resetting search range to its orignal.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (probe_size &gt; tcp_mtu_to_mss(sk, icsk-&gt;icsk_mtup.search_high) ||</div><div class='del'>-		interval &lt; net-&gt;ipv4.sysctl_tcp_probe_threshold) {</div><div class='add'>+	    interval &lt; READ_ONCE(net-&gt;ipv4.sysctl_tcp_probe_threshold)) {</div><div class='ctx'> 		/* Check whether enough time has elaplased for</div><div class='ctx'> 		 * another round of probing.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2090,7 +2653,7 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Do we need to wait to drain cwnd? With none in flight, don't stall */</div><div class='del'>-	if (tcp_packets_in_flight(tp) + 2 &gt; tp-&gt;snd_cwnd) {</div><div class='add'>+	if (tcp_packets_in_flight(tp) + 2 &gt; tcp_snd_cwnd(tp)) {</div><div class='ctx'> 		if (!tcp_packets_in_flight(tp))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2101,20 +2664,26 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* We're allowed to probe.  Build it now. */</div><div class='del'>-	nskb = sk_stream_alloc_skb(sk, probe_size, GFP_ATOMIC, false);</div><div class='add'>+	nskb = tcp_stream_alloc_skb(sk, GFP_ATOMIC, false);</div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		return -1;</div><div class='del'>-	sk-&gt;sk_wmem_queued += nskb-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	/* build the payload, and be prepared to abort if this fails. */</div><div class='add'>+	if (tcp_clone_payload(sk, nskb, probe_size)) {</div><div class='add'>+		tcp_skb_tsorted_anchor_cleanup(nskb);</div><div class='add'>+		consume_skb(nskb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	sk_wmem_queued_add(sk, nskb-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, nskb-&gt;truesize);</div><div class='ctx'> </div><div class='ctx'> 	skb = tcp_send_head(sk);</div><div class='add'>+	skb_copy_decrypted(nskb, skb);</div><div class='add'>+	mptcp_skb_ext_copy(nskb, skb);</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(nskb)-&gt;seq = TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> 	TCP_SKB_CB(nskb)-&gt;end_seq = TCP_SKB_CB(skb)-&gt;seq + probe_size;</div><div class='ctx'> 	TCP_SKB_CB(nskb)-&gt;tcp_flags = TCPHDR_ACK;</div><div class='del'>-	TCP_SKB_CB(nskb)-&gt;sacked = 0;</div><div class='del'>-	nskb-&gt;csum = 0;</div><div class='del'>-	nskb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='ctx'> 	tcp_insert_write_queue_before(nskb, skb, sk);</div><div class='ctx'> 	tcp_highest_sack_replace(sk, skb, nskb);</div><div class='hunk'>@@ -2122,27 +2691,14 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 	len = 0;</div><div class='ctx'> 	tcp_for_write_queue_from_safe(skb, next, sk) {</div><div class='ctx'> 		copy = min_t(int, skb-&gt;len, probe_size - len);</div><div class='del'>-		skb_copy_bits(skb, 0, skb_put(nskb, copy), copy);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len &lt;= copy) {</div><div class='del'>-			/* We've eaten all the data from this skb.</div><div class='del'>-			 * Throw it away. */</div><div class='del'>-			TCP_SKB_CB(nskb)-&gt;tcp_flags |= TCP_SKB_CB(skb)-&gt;tcp_flags;</div><div class='del'>-			/* If this is the last SKB we copy and eor is set</div><div class='del'>-			 * we need to propagate it to the new skb.</div><div class='del'>-			 */</div><div class='del'>-			TCP_SKB_CB(nskb)-&gt;eor = TCP_SKB_CB(skb)-&gt;eor;</div><div class='del'>-			tcp_unlink_write_queue(skb, sk);</div><div class='del'>-			sk_wmem_free_skb(sk, skb);</div><div class='add'>+			tcp_eat_one_skb(sk, nskb, skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			TCP_SKB_CB(nskb)-&gt;tcp_flags |= TCP_SKB_CB(skb)-&gt;tcp_flags &amp;</div><div class='ctx'> 						   ~(TCPHDR_FIN|TCPHDR_PSH);</div><div class='del'>-			if (!skb_shinfo(skb)-&gt;nr_frags) {</div><div class='del'>-				skb_pull(skb, copy);</div><div class='del'>-			} else {</div><div class='del'>-				__pskb_trim_head(skb, copy);</div><div class='del'>-				tcp_set_skb_tso_segs(skb, mss_now);</div><div class='del'>-			}</div><div class='add'>+			__pskb_trim_head(skb, copy);</div><div class='add'>+			tcp_set_skb_tso_segs(skb, mss_now);</div><div class='ctx'> 			TCP_SKB_CB(skb)-&gt;seq += copy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2159,7 +2715,7 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 	if (!tcp_transmit_skb(sk, nskb, 1, GFP_ATOMIC)) {</div><div class='ctx'> 		/* Decrement cwnd here because we are sending</div><div class='ctx'> 		 * effectively two packets. */</div><div class='del'>-		tp-&gt;snd_cwnd--;</div><div class='add'>+		tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) - 1);</div><div class='ctx'> 		tcp_event_new_data_sent(sk, nskb);</div><div class='ctx'> </div><div class='ctx'> 		icsk-&gt;icsk_mtup.probe_size = tcp_mss_to_mtu(sk, nskb-&gt;len);</div><div class='hunk'>@@ -2172,10 +2728,35 @@ static int tcp_mtu_probe(struct sock *sk)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool tcp_pacing_check(const struct sock *sk)</div><div class='add'>+static bool tcp_pacing_check(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!tcp_needs_internal_pacing(sk))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;tcp_wstamp_ns &lt;= tp-&gt;tcp_clock_cache)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!hrtimer_is_queued(&amp;tp-&gt;pacing_timer)) {</div><div class='add'>+		hrtimer_start(&amp;tp-&gt;pacing_timer,</div><div class='add'>+			      ns_to_ktime(tp-&gt;tcp_wstamp_ns),</div><div class='add'>+			      HRTIMER_MODE_ABS_PINNED_SOFT);</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tcp_rtx_queue_empty_or_single_skb(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return tcp_needs_internal_pacing(sk) &amp;&amp;</div><div class='del'>-	       hrtimer_is_queued(&amp;tcp_sk(sk)-&gt;pacing_timer);</div><div class='add'>+	const struct rb_node *node = sk-&gt;tcp_rtx_queue.rb_node;</div><div class='add'>+</div><div class='add'>+	/* No skb in the rtx queue. */</div><div class='add'>+	if (!node)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Only one skb in rtx queue. */</div><div class='add'>+	return !node-&gt;rb_left &amp;&amp; !node-&gt;rb_right;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* TCP Small Queues :</div><div class='hunk'>@@ -2192,20 +2773,35 @@ static bool tcp_pacing_check(const struct sock *sk)</div><div class='ctx'> static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb,</div><div class='ctx'> 				  unsigned int factor)</div><div class='ctx'> {</div><div class='del'>-	unsigned int limit;</div><div class='add'>+	unsigned long limit;</div><div class='ctx'> </div><div class='del'>-	limit = max(2 * skb-&gt;truesize, sk-&gt;sk_pacing_rate &gt;&gt; sk-&gt;sk_pacing_shift);</div><div class='del'>-	limit = min_t(u32, limit,</div><div class='del'>-		      sock_net(sk)-&gt;ipv4.sysctl_tcp_limit_output_bytes);</div><div class='add'>+	limit = max_t(unsigned long,</div><div class='add'>+		      2 * skb-&gt;truesize,</div><div class='add'>+		      READ_ONCE(sk-&gt;sk_pacing_rate) &gt;&gt; READ_ONCE(sk-&gt;sk_pacing_shift));</div><div class='add'>+	limit = min_t(unsigned long, limit,</div><div class='add'>+		      READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_limit_output_bytes));</div><div class='ctx'> 	limit &lt;&lt;= factor;</div><div class='ctx'> </div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_tx_delay_enabled) &amp;&amp;</div><div class='add'>+	    tcp_sk(sk)-&gt;tcp_tx_delay) {</div><div class='add'>+		u64 extra_bytes = (u64)READ_ONCE(sk-&gt;sk_pacing_rate) *</div><div class='add'>+				  tcp_sk(sk)-&gt;tcp_tx_delay;</div><div class='add'>+</div><div class='add'>+		/* TSQ is based on skb truesize sum (sk_wmem_alloc), so we</div><div class='add'>+		 * approximate our needs assuming an ~100% skb-&gt;truesize overhead.</div><div class='add'>+		 * USEC_PER_SEC is approximated by 2^20.</div><div class='add'>+		 * do_div(extra_bytes, USEC_PER_SEC/2) is replaced by a right shift.</div><div class='add'>+		 */</div><div class='add'>+		extra_bytes &gt;&gt;= (20 - 1);</div><div class='add'>+		limit += extra_bytes;</div><div class='add'>+	}</div><div class='ctx'> 	if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) &gt; limit) {</div><div class='del'>-		/* Always send skb if rtx queue is empty.</div><div class='add'>+		/* Always send skb if rtx queue is empty or has one skb.</div><div class='ctx'> 		 * No need to wait for TX completion to call us back,</div><div class='del'>-		 * after softirq/tasklet schedule.</div><div class='add'>+		 * after softirq schedule.</div><div class='ctx'> 		 * This helps when TX completions are delayed too much.</div><div class='ctx'> 		 */</div><div class='del'>-		if (tcp_rtx_queue_empty(sk))</div><div class='add'>+		if (tcp_rtx_queue_empty_or_single_skb(sk))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		set_bit(TSQ_THROTTLED, &amp;sk-&gt;sk_tsq_flags);</div><div class='hunk'>@@ -2262,6 +2858,35 @@ void tcp_chrono_stop(struct sock *sk, const enum tcp_chrono type)</div><div class='ctx'> 		tcp_chrono_set(tp, TCP_CHRONO_BUSY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* First skb in the write queue is smaller than ideal packet size.</div><div class='add'>+ * Check if we can move payload from the second skb in the queue.</div><div class='add'>+ */</div><div class='add'>+static void tcp_grow_skb(struct sock *sk, struct sk_buff *skb, int amount)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *next_skb = skb-&gt;next;</div><div class='add'>+	unsigned int nlen;</div><div class='add'>+</div><div class='add'>+	if (tcp_skb_is_last(sk, skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!tcp_skb_can_collapse(skb, next_skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nlen = min_t(u32, amount, next_skb-&gt;len);</div><div class='add'>+	if (!nlen || !skb_shift(skb, next_skb, nlen))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;end_seq += nlen;</div><div class='add'>+	TCP_SKB_CB(next_skb)-&gt;seq += nlen;</div><div class='add'>+</div><div class='add'>+	if (!next_skb-&gt;len) {</div><div class='add'>+		/* In case FIN is set, we need to update end_seq */</div><div class='add'>+		TCP_SKB_CB(skb)-&gt;end_seq = TCP_SKB_CB(next_skb)-&gt;end_seq;</div><div class='add'>+</div><div class='add'>+		tcp_eat_one_skb(sk, skb, next_skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This routine writes packets to the network.  It advances the</div><div class='ctx'>  * send_head.  This happens as incoming acks open up the remote</div><div class='ctx'>  * window for us.</div><div class='hunk'>@@ -2282,14 +2907,18 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int tso_segs, sent_pkts;</div><div class='del'>-	int cwnd_quota;</div><div class='add'>+	u32 cwnd_quota, max_segs;</div><div class='ctx'> 	int result;</div><div class='ctx'> 	bool is_cwnd_limited = false, is_rwnd_limited = false;</div><div class='del'>-	u32 max_segs;</div><div class='ctx'> </div><div class='ctx'> 	sent_pkts = 0;</div><div class='ctx'> </div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='add'>+</div><div class='add'>+	/* AccECN option beacon depends on mstamp, it may change mss */</div><div class='add'>+	if (tcp_ecn_mode_accecn(tp) &amp;&amp; tcp_accecn_option_beacon_check(sk))</div><div class='add'>+		mss_now = tcp_current_mss(sk);</div><div class='add'>+</div><div class='ctx'> 	if (!push_one) {</div><div class='ctx'> 		/* Do MTU probing. */</div><div class='ctx'> 		result = tcp_mtu_probe(sk);</div><div class='hunk'>@@ -2303,20 +2932,21 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,</div><div class='ctx'> 	max_segs = tcp_tso_segs(sk, mss_now);</div><div class='ctx'> 	while ((skb = tcp_send_head(sk))) {</div><div class='ctx'> 		unsigned int limit;</div><div class='del'>-</div><div class='del'>-		if (tcp_pacing_check(sk))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		tso_segs = tcp_init_tso_segs(skb, mss_now);</div><div class='del'>-		BUG_ON(!tso_segs);</div><div class='add'>+		int missing_bytes;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(tp-&gt;repair) &amp;&amp; tp-&gt;repair_queue == TCP_SEND_QUEUE) {</div><div class='del'>-			/* "skb_mstamp" is used as a start point for the retransmit timer */</div><div class='del'>-			tcp_update_skb_after_send(tp, skb);</div><div class='add'>+			/* "skb_mstamp_ns" is used as a start point for the retransmit timer */</div><div class='add'>+			tp-&gt;tcp_wstamp_ns = tp-&gt;tcp_clock_cache;</div><div class='add'>+			skb_set_delivery_time(skb, tp-&gt;tcp_wstamp_ns, SKB_CLOCK_MONOTONIC);</div><div class='add'>+			list_move_tail(&amp;skb-&gt;tcp_tsorted_anchor, &amp;tp-&gt;tsorted_sent_queue);</div><div class='add'>+			tcp_init_tso_segs(skb, mss_now);</div><div class='ctx'> 			goto repair; /* Skip network transmission */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cwnd_quota = tcp_cwnd_test(tp, skb);</div><div class='add'>+		if (tcp_pacing_check(sk))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cwnd_quota = tcp_cwnd_test(tp);</div><div class='ctx'> 		if (!cwnd_quota) {</div><div class='ctx'> 			if (push_one == 2)</div><div class='ctx'> 				/* Force out a loss probe pkt. */</div><div class='hunk'>@@ -2324,6 +2954,12 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,</div><div class='ctx'> 			else</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+		cwnd_quota = min(cwnd_quota, max_segs);</div><div class='add'>+		missing_bytes = cwnd_quota * mss_now - skb-&gt;len;</div><div class='add'>+		if (missing_bytes &gt; 0)</div><div class='add'>+			tcp_grow_skb(sk, skb, missing_bytes);</div><div class='add'>+</div><div class='add'>+		tso_segs = tcp_set_skb_tso_segs(skb, mss_now);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!tcp_snd_wnd_test(tp, skb, mss_now))) {</div><div class='ctx'> 			is_rwnd_limited = true;</div><div class='hunk'>@@ -2338,26 +2974,31 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!push_one &amp;&amp;</div><div class='ctx'> 			    tcp_tso_should_defer(sk, skb, &amp;is_cwnd_limited,</div><div class='del'>-						 max_segs))</div><div class='add'>+						 &amp;is_rwnd_limited, max_segs))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		limit = mss_now;</div><div class='ctx'> 		if (tso_segs &gt; 1 &amp;&amp; !tcp_urg_mode(tp))</div><div class='ctx'> 			limit = tcp_mss_split_point(sk, skb, mss_now,</div><div class='del'>-						    min_t(unsigned int,</div><div class='del'>-							  cwnd_quota,</div><div class='del'>-							  max_segs),</div><div class='add'>+						    cwnd_quota,</div><div class='ctx'> 						    nonagle);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len &gt; limit &amp;&amp;</div><div class='del'>-		    unlikely(tso_fragment(sk, TCP_FRAG_IN_WRITE_QUEUE,</div><div class='del'>-					  skb, limit, mss_now, gfp)))</div><div class='add'>+		    unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_small_queue_check(sk, skb, 0))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* Argh, we hit an empty skb(), presumably a thread</div><div class='add'>+		 * is sleeping in sendmsg()/sk_stream_wait_memory().</div><div class='add'>+		 * We do not want to send a pure-ack packet and have</div><div class='add'>+		 * a strange looking rtx queue with empty packet(s).</div><div class='add'>+		 */</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;end_seq == TCP_SKB_CB(skb)-&gt;seq)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		if (unlikely(tcp_transmit_skb(sk, skb, 1, gfp)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -2379,6 +3020,10 @@ repair:</div><div class='ctx'> 	else</div><div class='ctx'> 		tcp_chrono_stop(sk, TCP_CHRONO_RWND_LIMITED);</div><div class='ctx'> </div><div class='add'>+	is_cwnd_limited |= (tcp_packets_in_flight(tp) &gt;= tcp_snd_cwnd(tp));</div><div class='add'>+	if (likely(sent_pkts || is_cwnd_limited))</div><div class='add'>+		tcp_cwnd_validate(sk, is_cwnd_limited);</div><div class='add'>+</div><div class='ctx'> 	if (likely(sent_pkts)) {</div><div class='ctx'> 		if (tcp_in_cwnd_reduction(sk))</div><div class='ctx'> 			tp-&gt;prr_out += sent_pkts;</div><div class='hunk'>@@ -2386,8 +3031,6 @@ repair:</div><div class='ctx'> 		/* Send one loss probe per tail loss episode. */</div><div class='ctx'> 		if (push_one != 2)</div><div class='ctx'> 			tcp_schedule_loss_probe(sk, false);</div><div class='del'>-		is_cwnd_limited |= (tcp_packets_in_flight(tp) &gt;= tp-&gt;snd_cwnd);</div><div class='del'>-		tcp_cwnd_validate(sk, is_cwnd_limited);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return !tp-&gt;packets_out &amp;&amp; !tcp_write_queue_empty(sk);</div><div class='hunk'>@@ -2397,16 +3040,16 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	u32 timeout, rto_delta_us;</div><div class='add'>+	u32 timeout, timeout_us, rto_delta_us;</div><div class='ctx'> 	int early_retrans;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't do any loss probe on a Fast Open connection before 3WHS</div><div class='ctx'> 	 * finishes.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tp-&gt;fastopen_rsk)</div><div class='add'>+	if (rcu_access_pointer(tp-&gt;fastopen_rsk))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	early_retrans = sock_net(sk)-&gt;ipv4.sysctl_tcp_early_retrans;</div><div class='add'>+	early_retrans = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_early_retrans);</div><div class='ctx'> 	/* Schedule a loss probe in 2*RTT for SACK capable connections</div><div class='ctx'> 	 * not in loss recovery, that are either limited by cwnd or application.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2421,11 +3064,12 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)</div><div class='ctx'> 	 * sample is available then probe after TCP_TIMEOUT_INIT.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tp-&gt;srtt_us) {</div><div class='del'>-		timeout = usecs_to_jiffies(tp-&gt;srtt_us &gt;&gt; 2);</div><div class='add'>+		timeout_us = tp-&gt;srtt_us &gt;&gt; 2;</div><div class='ctx'> 		if (tp-&gt;packets_out == 1)</div><div class='del'>-			timeout += TCP_RTO_MIN;</div><div class='add'>+			timeout_us += tcp_rto_min_us(sk);</div><div class='ctx'> 		else</div><div class='del'>-			timeout += TCP_TIMEOUT_MIN;</div><div class='add'>+			timeout_us += TCP_TIMEOUT_MIN_US;</div><div class='add'>+		timeout = usecs_to_jiffies(timeout_us);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		timeout = TCP_TIMEOUT_INIT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2437,8 +3081,7 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)</div><div class='ctx'> 	if (rto_delta_us &gt; 0)</div><div class='ctx'> 		timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));</div><div class='ctx'> </div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,</div><div class='del'>-				  TCP_RTO_MAX);</div><div class='add'>+	tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout, true);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2446,13 +3089,17 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)</div><div class='ctx'>  * a packet is still in a qdisc or driver queue.</div><div class='ctx'>  * In this case, there is very little point doing a retransmit !</div><div class='ctx'>  */</div><div class='del'>-static bool skb_still_in_host_queue(const struct sock *sk,</div><div class='add'>+static bool skb_still_in_host_queue(struct sock *sk,</div><div class='ctx'> 				    const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(skb_fclone_busy(sk, skb))) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk),</div><div class='del'>-			      LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES);</div><div class='del'>-		return true;</div><div class='add'>+		set_bit(TSQ_THROTTLED, &amp;sk-&gt;sk_tsq_flags);</div><div class='add'>+		smp_mb__after_atomic();</div><div class='add'>+		if (skb_fclone_busy(sk, skb)) {</div><div class='add'>+			NET_INC_STATS(sock_net(sk),</div><div class='add'>+				      LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -2467,6 +3114,11 @@ void tcp_send_loss_probe(struct sock *sk)</div><div class='ctx'> 	int pcount;</div><div class='ctx'> 	int mss = tcp_current_mss(sk);</div><div class='ctx'> </div><div class='add'>+	/* At most one outstanding TLP */</div><div class='add'>+	if (tp-&gt;tlp_high_seq)</div><div class='add'>+		goto rearm_timer;</div><div class='add'>+</div><div class='add'>+	tp-&gt;tlp_retrans = 0;</div><div class='ctx'> 	skb = tcp_send_head(sk);</div><div class='ctx'> 	if (skb &amp;&amp; tcp_snd_wnd_test(tp, skb, mss)) {</div><div class='ctx'> 		pcount = tp-&gt;packets_out;</div><div class='hunk'>@@ -2476,14 +3128,11 @@ void tcp_send_loss_probe(struct sock *sk)</div><div class='ctx'> 		goto rearm_timer;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb = skb_rb_last(&amp;sk-&gt;tcp_rtx_queue);</div><div class='del'>-</div><div class='del'>-	/* At most one outstanding TLP retransmission. */</div><div class='del'>-	if (tp-&gt;tlp_high_seq)</div><div class='del'>-		goto rearm_timer;</div><div class='del'>-</div><div class='del'>-	/* Retransmit last segment. */</div><div class='del'>-	if (WARN_ON(!skb))</div><div class='del'>-		goto rearm_timer;</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		tcp_warn_once(sk, tp-&gt;packets_out, "invalid inflight: ");</div><div class='add'>+		smp_store_release(&amp;inet_csk(sk)-&gt;icsk_pending, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_still_in_host_queue(sk, skb))</div><div class='ctx'> 		goto rearm_timer;</div><div class='hunk'>@@ -2506,13 +3155,15 @@ void tcp_send_loss_probe(struct sock *sk)</div><div class='ctx'> 	if (__tcp_retransmit_skb(sk, skb, 1))</div><div class='ctx'> 		goto rearm_timer;</div><div class='ctx'> </div><div class='add'>+	tp-&gt;tlp_retrans = 1;</div><div class='add'>+</div><div class='add'>+probe_sent:</div><div class='ctx'> 	/* Record snd_nxt for loss detection. */</div><div class='ctx'> 	tp-&gt;tlp_high_seq = tp-&gt;snd_nxt;</div><div class='ctx'> </div><div class='del'>-probe_sent:</div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPLOSSPROBES);</div><div class='ctx'> 	/* Reset s.t. tcp_rearm_rto will restart timer from now */</div><div class='del'>-	inet_csk(sk)-&gt;icsk_pending = 0;</div><div class='add'>+	smp_store_release(&amp;inet_csk(sk)-&gt;icsk_pending, 0);</div><div class='ctx'> rearm_timer:</div><div class='ctx'> 	tcp_rearm_rto(sk);</div><div class='ctx'> }</div><div class='hunk'>@@ -2604,6 +3255,7 @@ u32 __tcp_select_window(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	/* MSS for the peer's data.  Previous versions used mss_clamp</div><div class='ctx'> 	 * here.  I don't know if the value based on our guesses</div><div class='ctx'> 	 * of peer's MSS is better for the performance.  It's more correct</div><div class='hunk'>@@ -2613,20 +3265,32 @@ u32 __tcp_select_window(struct sock *sk)</div><div class='ctx'> 	int mss = icsk-&gt;icsk_ack.rcv_mss;</div><div class='ctx'> 	int free_space = tcp_space(sk);</div><div class='ctx'> 	int allowed_space = tcp_full_space(sk);</div><div class='del'>-	int full_space = min_t(int, tp-&gt;window_clamp, allowed_space);</div><div class='del'>-	int window;</div><div class='add'>+	int full_space, window;</div><div class='add'>+</div><div class='add'>+	if (sk_is_mptcp(sk))</div><div class='add'>+		mptcp_space(sk, &amp;free_space, &amp;allowed_space);</div><div class='add'>+</div><div class='add'>+	full_space = min_t(int, tp-&gt;window_clamp, allowed_space);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(mss &gt; full_space)) {</div><div class='ctx'> 		mss = full_space;</div><div class='ctx'> 		if (mss &lt;= 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Only allow window shrink if the sysctl is enabled and we have</div><div class='add'>+	 * a non-zero scaling factor in effect.</div><div class='add'>+	 */</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_shrink_window) &amp;&amp; tp-&gt;rx_opt.rcv_wscale)</div><div class='add'>+		goto shrink_window_allowed;</div><div class='add'>+</div><div class='add'>+	/* do not allow window to shrink */</div><div class='add'>+</div><div class='ctx'> 	if (free_space &lt; (full_space &gt;&gt; 1)) {</div><div class='ctx'> 		icsk-&gt;icsk_ack.quick = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_under_memory_pressure(sk))</div><div class='del'>-			tp-&gt;rcv_ssthresh = min(tp-&gt;rcv_ssthresh,</div><div class='del'>-					       4U * tp-&gt;advmss);</div><div class='add'>+			tcp_adjust_rcv_ssthresh(sk);</div><div class='ctx'> </div><div class='ctx'> 		/* free_space might become our new window, make sure we don't</div><div class='ctx'> 		 * increase it due to wscale.</div><div class='hunk'>@@ -2676,6 +3340,36 @@ u32 __tcp_select_window(struct sock *sk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return window;</div><div class='add'>+</div><div class='add'>+shrink_window_allowed:</div><div class='add'>+	/* new window should always be an exact multiple of scaling factor */</div><div class='add'>+	free_space = round_down(free_space, 1 &lt;&lt; tp-&gt;rx_opt.rcv_wscale);</div><div class='add'>+</div><div class='add'>+	if (free_space &lt; (full_space &gt;&gt; 1)) {</div><div class='add'>+		icsk-&gt;icsk_ack.quick = 0;</div><div class='add'>+</div><div class='add'>+		if (tcp_under_memory_pressure(sk))</div><div class='add'>+			tcp_adjust_rcv_ssthresh(sk);</div><div class='add'>+</div><div class='add'>+		/* if free space is too low, return a zero window */</div><div class='add'>+		if (free_space &lt; (allowed_space &gt;&gt; 4) || free_space &lt; mss ||</div><div class='add'>+			free_space &lt; (1 &lt;&lt; tp-&gt;rx_opt.rcv_wscale))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (free_space &gt; tp-&gt;rcv_ssthresh) {</div><div class='add'>+		free_space = tp-&gt;rcv_ssthresh;</div><div class='add'>+		/* new window should always be an exact multiple of scaling factor</div><div class='add'>+		 *</div><div class='add'>+		 * For this case, we ALIGN "up" (increase free_space) because</div><div class='add'>+		 * we know free_space is not zero here, it has been reduced from</div><div class='add'>+		 * the memory-based limit, and rcv_ssthresh is not a hard limit</div><div class='add'>+		 * (unlike sk_rcvbuf).</div><div class='add'>+		 */</div><div class='add'>+		free_space = ALIGN(free_space, (1 &lt;&lt; tp-&gt;rx_opt.rcv_wscale));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return free_space;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tcp_skb_collapse_tstamp(struct sk_buff *skb,</div><div class='hunk'>@@ -2704,13 +3398,9 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(tcp_skb_pcount(skb) != 1 || tcp_skb_pcount(next_skb) != 1);</div><div class='ctx'> </div><div class='del'>-	if (next_skb_size) {</div><div class='del'>-		if (next_skb_size &lt;= skb_availroom(skb))</div><div class='del'>-			skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size),</div><div class='del'>-				      next_skb_size);</div><div class='del'>-		else if (!skb_shift(skb, next_skb, next_skb_size))</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='add'>+	if (next_skb_size &amp;&amp; !tcp_skb_shift(skb, next_skb, 1, next_skb_size))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	tcp_highest_sack_replace(sk, next_skb, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Update sequence range on original skb. */</div><div class='hunk'>@@ -2726,7 +3416,6 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;eor = TCP_SKB_CB(next_skb)-&gt;eor;</div><div class='ctx'> </div><div class='ctx'> 	/* changed transmit queue under us so clear hints */</div><div class='del'>-	tcp_clear_retrans_hints_partial(tp);</div><div class='ctx'> 	if (next_skb == tp-&gt;retransmit_skb_hint)</div><div class='ctx'> 		tp-&gt;retransmit_skb_hint = skb;</div><div class='ctx'> </div><div class='hunk'>@@ -2745,6 +3434,8 @@ static bool tcp_can_collapse(const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (skb_cloned(skb))</div><div class='ctx'> 		return false;</div><div class='add'>+	if (!skb_frags_readable(skb))</div><div class='add'>+		return false;</div><div class='ctx'> 	/* Some heuristics for collapsing over SACK'd could be invented */</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_ACKED)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2762,7 +3453,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to,</div><div class='ctx'> 	struct sk_buff *skb = to, *tmp;</div><div class='ctx'> 	bool first = true;</div><div class='ctx'> </div><div class='del'>-	if (!sock_net(sk)-&gt;ipv4.sysctl_tcp_retrans_collapse)</div><div class='add'>+	if (!READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_retrans_collapse))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_SYN)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2771,7 +3462,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to,</div><div class='ctx'> 		if (!tcp_can_collapse(sk, skb))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!tcp_skb_can_collapse_to(to))</div><div class='add'>+		if (!tcp_skb_can_collapse(to, skb))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		space -= skb-&gt;len;</div><div class='hunk'>@@ -2802,65 +3493,88 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	unsigned int cur_mss;</div><div class='ctx'> 	int diff, len, err;</div><div class='del'>-</div><div class='add'>+	int avail_wnd;</div><div class='ctx'> </div><div class='ctx'> 	/* Inconclusive MTU probe */</div><div class='ctx'> 	if (icsk-&gt;icsk_mtup.probe_size)</div><div class='ctx'> 		icsk-&gt;icsk_mtup.probe_size = 0;</div><div class='ctx'> </div><div class='del'>-	/* Do not sent more than we queued. 1/4 is reserved for possible</div><div class='del'>-	 * copying overhead: fragmentation, tunneling, mangling etc.</div><div class='del'>-	 */</div><div class='del'>-	if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) &gt;</div><div class='del'>-	    min_t(u32, sk-&gt;sk_wmem_queued + (sk-&gt;sk_wmem_queued &gt;&gt; 2),</div><div class='del'>-		  sk-&gt;sk_sndbuf))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (skb_still_in_host_queue(sk, skb))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (skb_still_in_host_queue(sk, skb)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+start:</div><div class='ctx'> 	if (before(TCP_SKB_CB(skb)-&gt;seq, tp-&gt;snd_una)) {</div><div class='add'>+		if (unlikely(TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_SYN)) {</div><div class='add'>+			TCP_SKB_CB(skb)-&gt;tcp_flags &amp;= ~TCPHDR_SYN;</div><div class='add'>+			TCP_SKB_CB(skb)-&gt;seq++;</div><div class='add'>+			goto start;</div><div class='add'>+		}</div><div class='ctx'> 		if (unlikely(before(TCP_SKB_CB(skb)-&gt;end_seq, tp-&gt;snd_una))) {</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (tcp_trim_head(sk, skb, tp-&gt;snd_una - TCP_SKB_CB(skb)-&gt;seq)) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (tcp_trim_head(sk, skb, tp-&gt;snd_una - TCP_SKB_CB(skb)-&gt;seq))</div><div class='del'>-			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk))</div><div class='del'>-		return -EHOSTUNREACH; /* Routing failure or similar. */</div><div class='add'>+	if (inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk)) {</div><div class='add'>+		err = -EHOSTUNREACH; /* Routing failure or similar. */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cur_mss = tcp_current_mss(sk);</div><div class='add'>+	avail_wnd = tcp_wnd_end(tp) - TCP_SKB_CB(skb)-&gt;seq;</div><div class='ctx'> </div><div class='ctx'> 	/* If receiver has shrunk his window, and skb is out of</div><div class='ctx'> 	 * new window, do not retransmit it. The exception is the</div><div class='ctx'> 	 * case, when window is shrunk to zero. In this case</div><div class='del'>-	 * our retransmit serves as a zero window probe.</div><div class='add'>+	 * our retransmit of one segment serves as a zero window probe.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!before(TCP_SKB_CB(skb)-&gt;seq, tcp_wnd_end(tp)) &amp;&amp;</div><div class='del'>-	    TCP_SKB_CB(skb)-&gt;seq != tp-&gt;snd_una)</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+	if (avail_wnd &lt;= 0) {</div><div class='add'>+		if (TCP_SKB_CB(skb)-&gt;seq != tp-&gt;snd_una) {</div><div class='add'>+			err = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		avail_wnd = cur_mss;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	len = cur_mss * segs;</div><div class='add'>+	if (len &gt; avail_wnd) {</div><div class='add'>+		len = rounddown(avail_wnd, cur_mss);</div><div class='add'>+		if (!len)</div><div class='add'>+			len = avail_wnd;</div><div class='add'>+	}</div><div class='ctx'> 	if (skb-&gt;len &gt; len) {</div><div class='ctx'> 		if (tcp_fragment(sk, TCP_FRAG_IN_RTX_QUEUE, skb, len,</div><div class='del'>-				 cur_mss, GFP_ATOMIC))</div><div class='del'>-			return -ENOMEM; /* We'll try again later. */</div><div class='add'>+				 cur_mss, GFP_ATOMIC)) {</div><div class='add'>+			err = -ENOMEM;  /* We'll try again later. */</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (skb_unclone(skb, GFP_ATOMIC))</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (skb_unclone_keeptruesize(skb, GFP_ATOMIC)) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		diff = tcp_skb_pcount(skb);</div><div class='ctx'> 		tcp_set_skb_tso_segs(skb, cur_mss);</div><div class='ctx'> 		diff -= tcp_skb_pcount(skb);</div><div class='ctx'> 		if (diff)</div><div class='ctx'> 			tcp_adjust_pcount(sk, skb, diff);</div><div class='del'>-		if (skb-&gt;len &lt; cur_mss)</div><div class='del'>-			tcp_retrans_try_collapse(sk, skb, cur_mss);</div><div class='add'>+		avail_wnd = min_t(int, avail_wnd, cur_mss);</div><div class='add'>+		if (skb-&gt;len &lt; avail_wnd)</div><div class='add'>+			tcp_retrans_try_collapse(sk, skb, avail_wnd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* RFC3168, section 6.1.1.1. ECN fallback */</div><div class='add'>+	/* RFC3168, section 6.1.1.1. ECN fallback</div><div class='add'>+	 * As AccECN uses the same SYN flags (+ AE), this check covers both</div><div class='add'>+	 * cases.</div><div class='add'>+	 */</div><div class='ctx'> 	if ((TCP_SKB_CB(skb)-&gt;tcp_flags &amp; TCPHDR_SYN_ECN) == TCPHDR_SYN_ECN)</div><div class='ctx'> 		tcp_ecn_clear_syn(sk, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -2882,12 +3596,16 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)</div><div class='ctx'> </div><div class='ctx'> 		tcp_skb_tsorted_save(skb) {</div><div class='ctx'> 			nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);</div><div class='del'>-			err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :</div><div class='del'>-				     -ENOBUFS;</div><div class='add'>+			if (nskb) {</div><div class='add'>+				nskb-&gt;dev = NULL;</div><div class='add'>+				err = tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC);</div><div class='add'>+			} else {</div><div class='add'>+				err = -ENOBUFS;</div><div class='add'>+			}</div><div class='ctx'> 		} tcp_skb_tsorted_restore(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!err) {</div><div class='del'>-			tcp_update_skb_after_send(tp, skb);</div><div class='add'>+			tcp_update_skb_after_send(sk, skb, tp-&gt;tcp_wstamp_ns);</div><div class='ctx'> 			tcp_rate_skb_sent(sk, skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2898,12 +3616,16 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)</div><div class='ctx'> 		tcp_call_bpf_3arg(sk, BPF_SOCK_OPS_RETRANS_CB,</div><div class='ctx'> 				  TCP_SKB_CB(skb)-&gt;seq, segs, err);</div><div class='ctx'> </div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;sacked |= TCPCB_EVER_RETRANS;</div><div class='del'>-		trace_tcp_retransmit_skb(sk, skb);</div><div class='del'>-	} else if (err != -EBUSY) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(err) &amp;&amp; err != -EBUSY)</div><div class='add'>+		NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL, segs);</div><div class='add'>+</div><div class='add'>+	/* To avoid taking spuriously low RTT samples based on a timestamp</div><div class='add'>+	 * for a transmit that never happened, always mark EVER_RETRANS</div><div class='add'>+	 */</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;sacked |= TCPCB_EVER_RETRANS;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	trace_tcp_retransmit_skb(sk, skb, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2920,13 +3642,12 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)</div><div class='ctx'> #endif</div><div class='ctx'> 		TCP_SKB_CB(skb)-&gt;sacked |= TCPCB_RETRANS;</div><div class='ctx'> 		tp-&gt;retrans_out += tcp_skb_pcount(skb);</div><div class='del'>-</div><div class='del'>-		/* Save stamp of the first retransmit. */</div><div class='del'>-		if (!tp-&gt;retrans_stamp)</div><div class='del'>-			tp-&gt;retrans_stamp = tcp_skb_timestamp(skb);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Save stamp of the first (attempted) retransmit. */</div><div class='add'>+	if (!tp-&gt;retrans_stamp)</div><div class='add'>+		tp-&gt;retrans_stamp = tcp_skb_timestamp_ts(tp-&gt;tcp_usec_ts, skb);</div><div class='add'>+</div><div class='ctx'> 	if (tp-&gt;undo_retrans &lt; 0)</div><div class='ctx'> 		tp-&gt;undo_retrans = 0;</div><div class='ctx'> 	tp-&gt;undo_retrans += tcp_skb_pcount(skb);</div><div class='hunk'>@@ -2943,6 +3664,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct sk_buff *skb, *rtx_head, *hole = NULL;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	bool rearm_timer = false;</div><div class='ctx'> 	u32 max_segs;</div><div class='ctx'> 	int mib_idx;</div><div class='ctx'> </div><div class='hunk'>@@ -2963,9 +3685,9 @@ void tcp_xmit_retransmit_queue(struct sock *sk)</div><div class='ctx'> 		if (!hole)</div><div class='ctx'> 			tp-&gt;retransmit_skb_hint = skb;</div><div class='ctx'> </div><div class='del'>-		segs = tp-&gt;snd_cwnd - tcp_packets_in_flight(tp);</div><div class='add'>+		segs = tcp_snd_cwnd(tp) - tcp_packets_in_flight(tp);</div><div class='ctx'> 		if (segs &lt;= 0)</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> 		sacked = TCP_SKB_CB(skb)-&gt;sacked;</div><div class='ctx'> 		/* In case tcp_shift_skb_data() have aggregated large skbs,</div><div class='ctx'> 		 * we need to make sure not sending too bigs TSO packets</div><div class='hunk'>@@ -2990,10 +3712,10 @@ void tcp_xmit_retransmit_queue(struct sock *sk)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_small_queue_check(sk, skb, 1))</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_retransmit_skb(sk, skb, segs))</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		NET_ADD_STATS(sock_net(sk), mib_idx, tcp_skb_pcount(skb));</div><div class='ctx'> </div><div class='hunk'>@@ -3002,10 +3724,12 @@ void tcp_xmit_retransmit_queue(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 		if (skb == rtx_head &amp;&amp;</div><div class='ctx'> 		    icsk-&gt;icsk_pending != ICSK_TIME_REO_TIMEOUT)</div><div class='del'>-			inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-						  inet_csk(sk)-&gt;icsk_rto,</div><div class='del'>-						  TCP_RTO_MAX);</div><div class='add'>+			rearm_timer = true;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='add'>+	if (rearm_timer)</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+				     inet_csk(sk)-&gt;icsk_rto, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We allow to exceed memory limits for FIN packets to expedite</div><div class='hunk'>@@ -3017,16 +3741,22 @@ void tcp_xmit_retransmit_queue(struct sock *sk)</div><div class='ctx'>  */</div><div class='ctx'> void sk_forced_mem_schedule(struct sock *sk, int size)</div><div class='ctx'> {</div><div class='del'>-	int amt;</div><div class='add'>+	int delta, amt;</div><div class='ctx'> </div><div class='del'>-	if (size &lt;= sk-&gt;sk_forward_alloc)</div><div class='add'>+	delta = size - sk-&gt;sk_forward_alloc;</div><div class='add'>+	if (delta &lt;= 0)</div><div class='ctx'> 		return;</div><div class='del'>-	amt = sk_mem_pages(size);</div><div class='del'>-	sk-&gt;sk_forward_alloc += amt * SK_MEM_QUANTUM;</div><div class='del'>-	sk_memory_allocated_add(sk, amt);</div><div class='ctx'> </div><div class='del'>-	if (mem_cgroup_sockets_enabled &amp;&amp; sk-&gt;sk_memcg)</div><div class='del'>-		mem_cgroup_charge_skmem(sk-&gt;sk_memcg, amt);</div><div class='add'>+	amt = sk_mem_pages(delta);</div><div class='add'>+	sk_forward_alloc_add(sk, amt &lt;&lt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (mem_cgroup_sk_enabled(sk))</div><div class='add'>+		mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge() | __GFP_NOFAIL);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_bypass_prot_mem)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk_memory_allocated_add(sk, amt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send a FIN. The caller locks the socket for us.</div><div class='hunk'>@@ -3034,7 +3764,7 @@ void sk_forced_mem_schedule(struct sock *sk, int size)</div><div class='ctx'>  */</div><div class='ctx'> void tcp_send_fin(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb, *tskb = tcp_write_queue_tail(sk);</div><div class='add'>+	struct sk_buff *skb, *tskb, *tail = tcp_write_queue_tail(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Optimization, tack on the FIN if we have one skb in write queue and</div><div class='hunk'>@@ -3042,36 +3772,36 @@ void tcp_send_fin(struct sock *sk)</div><div class='ctx'> 	 * Note: in the latter case, FIN packet will be sent after a timeout,</div><div class='ctx'> 	 * as TCP stack thinks it has already been transmitted.</div><div class='ctx'> 	 */</div><div class='add'>+	tskb = tail;</div><div class='ctx'> 	if (!tskb &amp;&amp; tcp_under_memory_pressure(sk))</div><div class='ctx'> 		tskb = skb_rb_last(&amp;sk-&gt;tcp_rtx_queue);</div><div class='ctx'> </div><div class='ctx'> 	if (tskb) {</div><div class='del'>-coalesce:</div><div class='ctx'> 		TCP_SKB_CB(tskb)-&gt;tcp_flags |= TCPHDR_FIN;</div><div class='ctx'> 		TCP_SKB_CB(tskb)-&gt;end_seq++;</div><div class='ctx'> 		tp-&gt;write_seq++;</div><div class='del'>-		if (tcp_write_queue_empty(sk)) {</div><div class='add'>+		if (!tail) {</div><div class='ctx'> 			/* This means tskb was already sent.</div><div class='ctx'> 			 * Pretend we included the FIN on previous transmit.</div><div class='ctx'> 			 * We need to set tp-&gt;snd_nxt to the value it would have</div><div class='ctx'> 			 * if FIN had been sent. This is because retransmit path</div><div class='ctx'> 			 * does not change tp-&gt;snd_nxt.</div><div class='ctx'> 			 */</div><div class='del'>-			tp-&gt;snd_nxt++;</div><div class='add'>+			WRITE_ONCE(tp-&gt;snd_nxt, tp-&gt;snd_nxt + 1);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		skb = alloc_skb_fclone(MAX_TCP_HEADER, sk-&gt;sk_allocation);</div><div class='del'>-		if (unlikely(!skb)) {</div><div class='del'>-			if (tskb)</div><div class='del'>-				goto coalesce;</div><div class='add'>+		skb = alloc_skb_fclone(MAX_TCP_HEADER,</div><div class='add'>+				       sk_gfp_mask(sk, GFP_ATOMIC |</div><div class='add'>+						       __GFP_NOWARN));</div><div class='add'>+		if (unlikely(!skb))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;skb-&gt;tcp_tsorted_anchor);</div><div class='ctx'> 		skb_reserve(skb, MAX_TCP_HEADER);</div><div class='ctx'> 		sk_forced_mem_schedule(sk, skb-&gt;truesize);</div><div class='ctx'> 		/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */</div><div class='del'>-		tcp_init_nondata_skb(skb, tp-&gt;write_seq,</div><div class='add'>+		tcp_init_nondata_skb(skb, sk, tp-&gt;write_seq,</div><div class='ctx'> 				     TCPHDR_ACK | TCPHDR_FIN);</div><div class='ctx'> 		tcp_queue_skb(sk, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3083,7 +3813,8 @@ coalesce:</div><div class='ctx'>  * was unread data in the receive queue.  This behavior is recommended</div><div class='ctx'>  * by RFC 2525, section 2.17.  -DaveM</div><div class='ctx'>  */</div><div class='del'>-void tcp_send_active_reset(struct sock *sk, gfp_t priority)</div><div class='add'>+void tcp_send_active_reset(struct sock *sk, gfp_t priority,</div><div class='add'>+			   enum sk_rst_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -3098,7 +3829,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority)</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve space for headers and prepare control bits. */</div><div class='ctx'> 	skb_reserve(skb, MAX_TCP_HEADER);</div><div class='del'>-	tcp_init_nondata_skb(skb, tcp_acceptable_seq(sk),</div><div class='add'>+	tcp_init_nondata_skb(skb, sk, tcp_acceptable_seq(sk),</div><div class='ctx'> 			     TCPHDR_ACK | TCPHDR_RST);</div><div class='ctx'> 	tcp_mstamp_refresh(tcp_sk(sk));</div><div class='ctx'> 	/* Send it off. */</div><div class='hunk'>@@ -3108,7 +3839,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority)</div><div class='ctx'> 	/* skb of trace_tcp_send_reset() keeps the skb that caused RST,</div><div class='ctx'> 	 * skb here is different to the troublesome skb, so use NULL</div><div class='ctx'> 	 */</div><div class='del'>-	trace_tcp_send_reset(sk, NULL);</div><div class='add'>+	trace_tcp_send_reset(sk, NULL, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send a crossed SYN-ACK during socket establishment.</div><div class='hunk'>@@ -3136,10 +3867,11 @@ int tcp_send_synack(struct sock *sk)</div><div class='ctx'> 			if (!nskb)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			INIT_LIST_HEAD(&amp;nskb-&gt;tcp_tsorted_anchor);</div><div class='add'>+			tcp_highest_sack_replace(sk, skb, nskb);</div><div class='ctx'> 			tcp_rtx_queue_unlink_and_free(skb, sk);</div><div class='ctx'> 			__skb_header_release(nskb);</div><div class='ctx'> 			tcp_rbtree_insert(&amp;sk-&gt;tcp_rtx_queue, nskb);</div><div class='del'>-			sk-&gt;sk_wmem_queued += nskb-&gt;truesize;</div><div class='add'>+			sk_wmem_queued_add(sk, nskb-&gt;truesize);</div><div class='ctx'> 			sk_mem_charge(sk, nskb-&gt;truesize);</div><div class='ctx'> 			skb = nskb;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3151,27 +3883,30 @@ int tcp_send_synack(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tcp_make_synack - Prepare a SYN-ACK.</div><div class='del'>- * sk: listener socket</div><div class='del'>- * dst: dst entry attached to the SYNACK</div><div class='del'>- * req: request_sock pointer</div><div class='del'>- *</div><div class='del'>- * Allocate one skb and build a SYNACK packet.</div><div class='del'>- * @dst is consumed : Caller should not use it again.</div><div class='add'>+ * tcp_make_synack - Allocate one skb and build a SYNACK packet.</div><div class='add'>+ * @sk: listener socket</div><div class='add'>+ * @dst: dst entry attached to the SYNACK. It is consumed and caller</div><div class='add'>+ *       should not use it again.</div><div class='add'>+ * @req: request_sock pointer</div><div class='add'>+ * @foc: cookie for tcp fast open</div><div class='add'>+ * @synack_type: Type of synack to prepare</div><div class='add'>+ * @syn_skb: SYN packet just received.  It could be NULL for rtx case.</div><div class='ctx'>  */</div><div class='ctx'> struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> 				struct request_sock *req,</div><div class='ctx'> 				struct tcp_fastopen_cookie *foc,</div><div class='del'>-				enum tcp_synack_type synack_type)</div><div class='add'>+				enum tcp_synack_type synack_type,</div><div class='add'>+				struct sk_buff *syn_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	struct tcp_md5sig_key *md5 = NULL;</div><div class='ctx'> 	struct tcp_out_options opts;</div><div class='add'>+	struct tcp_key key = {};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int tcp_header_size;</div><div class='ctx'> 	struct tcphdr *th;</div><div class='ctx'> 	int mss;</div><div class='add'>+	u64 now;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(!skb)) {</div><div class='hunk'>@@ -3183,7 +3918,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> </div><div class='ctx'> 	switch (synack_type) {</div><div class='ctx'> 	case TCP_SYNACK_NORMAL:</div><div class='del'>-		skb_set_owner_w(skb, req_to_sk(req));</div><div class='add'>+		skb_set_owner_edemux(skb, req_to_sk(req));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_SYNACK_COOKIE:</div><div class='ctx'> 		/* Under synflood, we do not attach skb to a socket,</div><div class='hunk'>@@ -3203,20 +3938,60 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> 	mss = tcp_mss_clamp(tp, dst_metric_advmss(dst));</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;opts, 0, sizeof(opts));</div><div class='add'>+	now = tcp_clock_ns();</div><div class='ctx'> #ifdef CONFIG_SYN_COOKIES</div><div class='del'>-	if (unlikely(req-&gt;cookie_ts))</div><div class='del'>-		skb-&gt;skb_mstamp = cookie_init_timestamp(req);</div><div class='add'>+	if (unlikely(synack_type == TCP_SYNACK_COOKIE &amp;&amp; ireq-&gt;tstamp_ok))</div><div class='add'>+		skb_set_delivery_time(skb, cookie_init_timestamp(req, now),</div><div class='add'>+				      SKB_CLOCK_MONOTONIC);</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='del'>-		skb-&gt;skb_mstamp = tcp_clock_us();</div><div class='add'>+	{</div><div class='add'>+		skb_set_delivery_time(skb, now, SKB_CLOCK_MONOTONIC);</div><div class='add'>+		if (!tcp_rsk(req)-&gt;snt_synack) /* Timestamp first SYNACK */</div><div class='add'>+			tcp_rsk(req)-&gt;snt_synack = tcp_skb_timestamp_us(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	md5 = tcp_rsk(req)-&gt;af_specific-&gt;req_md5_lookup(sk, req_to_sk(req));</div><div class='ctx'> #endif</div><div class='del'>-	skb_set_hash(skb, tcp_rsk(req)-&gt;txhash, PKT_HASH_TYPE_L4);</div><div class='del'>-	tcp_header_size = tcp_synack_options(sk, req, mss, skb, &amp;opts, md5,</div><div class='del'>-					     foc) + sizeof(*th);</div><div class='add'>+	if (tcp_rsk_used_ao(req)) {</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+		struct tcp_ao_key *ao_key = NULL;</div><div class='add'>+		u8 keyid = tcp_rsk(req)-&gt;ao_keyid;</div><div class='add'>+		u8 rnext = tcp_rsk(req)-&gt;ao_rcv_next;</div><div class='add'>+</div><div class='add'>+		ao_key = tcp_sk(sk)-&gt;af_specific-&gt;ao_lookup(sk, req_to_sk(req),</div><div class='add'>+							    keyid, -1);</div><div class='add'>+		/* If there is no matching key - avoid sending anything,</div><div class='add'>+		 * especially usigned segments. It could try harder and lookup</div><div class='add'>+		 * for another peer-matching key, but the peer has requested</div><div class='add'>+		 * ao_keyid (RFC5925 RNextKeyID), so let's keep it simple here.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(!ao_key)) {</div><div class='add'>+			trace_tcp_ao_synack_no_key(sk, keyid, rnext);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			net_warn_ratelimited("TCP-AO: the keyid %u from SYN packet is not present - not sending SYNACK\n",</div><div class='add'>+					     keyid);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		key.ao_key = ao_key;</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+		key.md5_key = tcp_rsk(req)-&gt;af_specific-&gt;req_md5_lookup(sk,</div><div class='add'>+					req_to_sk(req));</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	skb_set_hash(skb, READ_ONCE(tcp_rsk(req)-&gt;txhash), PKT_HASH_TYPE_L4);</div><div class='add'>+	/* bpf program will be interested in the tcp_flags */</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;tcp_flags = TCPHDR_SYN | TCPHDR_ACK;</div><div class='add'>+	tcp_header_size = tcp_synack_options(sk, req, mss, skb, &amp;opts,</div><div class='add'>+					     &amp;key, foc, synack_type, syn_skb)</div><div class='add'>+					+ sizeof(*th);</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, tcp_header_size);</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='hunk'>@@ -3236,23 +4011,36 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> </div><div class='ctx'> 	/* RFC1323: The window in SYN &amp; SYN/ACK segments is never scaled. */</div><div class='ctx'> 	th-&gt;window = htons(min(req-&gt;rsk_rcv_wnd, 65535U));</div><div class='del'>-	tcp_options_write((__be32 *)(th + 1), NULL, &amp;opts);</div><div class='add'>+	tcp_options_write(th, NULL, tcp_rsk(req), &amp;opts, &amp;key);</div><div class='ctx'> 	th-&gt;doff = (tcp_header_size &gt;&gt; 2);</div><div class='del'>-	__TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);</div><div class='add'>+	TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	/* Okay, we have all we need - do the md5 hash if needed */</div><div class='del'>-	if (md5)</div><div class='add'>+	if (tcp_key_is_md5(&amp;key)) {</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 		tcp_rsk(req)-&gt;af_specific-&gt;calc_md5_hash(opts.hash_location,</div><div class='del'>-					       md5, req_to_sk(req), skb);</div><div class='add'>+					key.md5_key, req_to_sk(req), skb);</div><div class='add'>+#endif</div><div class='add'>+	} else if (tcp_key_is_ao(&amp;key)) {</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+		tcp_rsk(req)-&gt;af_specific-&gt;ao_synack_hash(opts.hash_location,</div><div class='add'>+					key.ao_key, req, skb,</div><div class='add'>+					opts.hash_location - (u8 *)th, 0);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Do not fool tcpdump (if any), clean our debris */</div><div class='del'>-	skb-&gt;tstamp = 0;</div><div class='add'>+	bpf_skops_write_hdr_opt((struct sock *)sk, skb, req, syn_skb,</div><div class='add'>+				synack_type, &amp;opts);</div><div class='add'>+</div><div class='add'>+	skb_set_delivery_time(skb, now, SKB_CLOCK_MONOTONIC);</div><div class='add'>+	tcp_add_tx_delay(skb, tp);</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_make_synack);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_make_synack);</div><div class='ctx'> </div><div class='ctx'> static void tcp_ca_dst_init(struct sock *sk, const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='hunk'>@@ -3265,8 +4053,8 @@ static void tcp_ca_dst_init(struct sock *sk, const struct dst_entry *dst)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ca = tcp_ca_find_key(ca_key);</div><div class='del'>-	if (likely(ca &amp;&amp; try_module_get(ca-&gt;owner))) {</div><div class='del'>-		module_put(icsk-&gt;icsk_ca_ops-&gt;owner);</div><div class='add'>+	if (likely(ca &amp;&amp; bpf_try_module_get(ca, ca-&gt;owner))) {</div><div class='add'>+		bpf_module_put(icsk-&gt;icsk_ca_ops, icsk-&gt;icsk_ca_ops-&gt;owner);</div><div class='ctx'> 		icsk-&gt;icsk_ca_dst_locked = tcp_ca_dst_locked(dst);</div><div class='ctx'> 		icsk-&gt;icsk_ca_ops = ca;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3279,23 +4067,22 @@ static void tcp_connect_init(struct sock *sk)</div><div class='ctx'> 	const struct dst_entry *dst = __sk_dst_get(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	__u8 rcv_wscale;</div><div class='add'>+	u16 user_mss;</div><div class='ctx'> 	u32 rcv_wnd;</div><div class='ctx'> </div><div class='ctx'> 	/* We'll fix this up when we get a response from the other end.</div><div class='ctx'> 	 * See tcp_input.c:tcp_rcv_state_process case TCP_SYN_SENT.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tp-&gt;tcp_header_len = sizeof(struct tcphdr);</div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_timestamps)</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_timestamps))</div><div class='ctx'> 		tp-&gt;tcp_header_len += TCPOLEN_TSTAMP_ALIGNED;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (tp-&gt;af_specific-&gt;md5_lookup(sk, sk))</div><div class='del'>-		tp-&gt;tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;</div><div class='del'>-#endif</div><div class='add'>+	tcp_ao_connect_init(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* If user gave his TCP_MAXSEG, record it to clamp */</div><div class='del'>-	if (tp-&gt;rx_opt.user_mss)</div><div class='del'>-		tp-&gt;rx_opt.mss_clamp = tp-&gt;rx_opt.user_mss;</div><div class='add'>+	user_mss = READ_ONCE(tp-&gt;rx_opt.user_mss);</div><div class='add'>+	if (user_mss)</div><div class='add'>+		tp-&gt;rx_opt.mss_clamp = user_mss;</div><div class='ctx'> 	tp-&gt;max_window = 0;</div><div class='ctx'> 	tcp_mtup_init(sk);</div><div class='ctx'> 	tcp_sync_mss(sk, dst_mtu(dst));</div><div class='hunk'>@@ -3303,7 +4090,7 @@ static void tcp_connect_init(struct sock *sk)</div><div class='ctx'> 	tcp_ca_dst_init(sk, dst);</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;window_clamp)</div><div class='del'>-		tp-&gt;window_clamp = dst_metric(dst, RTAX_WINDOW);</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp, dst_metric(dst, RTAX_WINDOW));</div><div class='ctx'> 	tp-&gt;advmss = tcp_mss_clamp(tp, dst_metric_advmss(dst));</div><div class='ctx'> </div><div class='ctx'> 	tcp_initialize_rcv_mss(sk);</div><div class='hunk'>@@ -3311,7 +4098,7 @@ static void tcp_connect_init(struct sock *sk)</div><div class='ctx'> 	/* limit the window selection if the user enforce a smaller rx buffer */</div><div class='ctx'> 	if (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK &amp;&amp;</div><div class='ctx'> 	    (tp-&gt;window_clamp &gt; tcp_full_space(sk) || tp-&gt;window_clamp == 0))</div><div class='del'>-		tp-&gt;window_clamp = tcp_full_space(sk);</div><div class='add'>+		WRITE_ONCE(tp-&gt;window_clamp, tcp_full_space(sk));</div><div class='ctx'> </div><div class='ctx'> 	rcv_wnd = tcp_rwnd_init_bpf(sk);</div><div class='ctx'> 	if (rcv_wnd == 0)</div><div class='hunk'>@@ -3321,14 +4108,14 @@ static void tcp_connect_init(struct sock *sk)</div><div class='ctx'> 				  tp-&gt;advmss - (tp-&gt;rx_opt.ts_recent_stamp ? tp-&gt;tcp_header_len - sizeof(struct tcphdr) : 0),</div><div class='ctx'> 				  &amp;tp-&gt;rcv_wnd,</div><div class='ctx'> 				  &amp;tp-&gt;window_clamp,</div><div class='del'>-				  sock_net(sk)-&gt;ipv4.sysctl_tcp_window_scaling,</div><div class='add'>+				  READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_window_scaling),</div><div class='ctx'> 				  &amp;rcv_wscale,</div><div class='ctx'> 				  rcv_wnd);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_opt.rcv_wscale = rcv_wscale;</div><div class='ctx'> 	tp-&gt;rcv_ssthresh = tp-&gt;rcv_wnd;</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_err = 0;</div><div class='add'>+	WRITE_ONCE(sk-&gt;sk_err, 0);</div><div class='ctx'> 	sock_reset_flag(sk, SOCK_DONE);</div><div class='ctx'> 	tp-&gt;snd_wnd = 0;</div><div class='ctx'> 	tcp_init_wl(tp, 0);</div><div class='hunk'>@@ -3336,17 +4123,17 @@ static void tcp_connect_init(struct sock *sk)</div><div class='ctx'> 	tp-&gt;snd_una = tp-&gt;write_seq;</div><div class='ctx'> 	tp-&gt;snd_sml = tp-&gt;write_seq;</div><div class='ctx'> 	tp-&gt;snd_up = tp-&gt;write_seq;</div><div class='del'>-	tp-&gt;snd_nxt = tp-&gt;write_seq;</div><div class='add'>+	WRITE_ONCE(tp-&gt;snd_nxt, tp-&gt;write_seq);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!tp-&gt;repair))</div><div class='ctx'> 		tp-&gt;rcv_nxt = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		tp-&gt;rcv_tstamp = tcp_jiffies32;</div><div class='ctx'> 	tp-&gt;rcv_wup = tp-&gt;rcv_nxt;</div><div class='del'>-	tp-&gt;copied_seq = tp-&gt;rcv_nxt;</div><div class='add'>+	WRITE_ONCE(tp-&gt;copied_seq, tp-&gt;rcv_nxt);</div><div class='ctx'> </div><div class='ctx'> 	inet_csk(sk)-&gt;icsk_rto = tcp_timeout_init(sk);</div><div class='del'>-	inet_csk(sk)-&gt;icsk_retransmits = 0;</div><div class='add'>+	WRITE_ONCE(inet_csk(sk)-&gt;icsk_retransmits, 0);</div><div class='ctx'> 	tcp_clear_retrans(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3357,9 +4144,9 @@ static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	tcb-&gt;end_seq += skb-&gt;len;</div><div class='ctx'> 	__skb_header_release(skb);</div><div class='del'>-	sk-&gt;sk_wmem_queued += skb-&gt;truesize;</div><div class='add'>+	sk_wmem_queued_add(sk, skb-&gt;truesize);</div><div class='ctx'> 	sk_mem_charge(sk, skb-&gt;truesize);</div><div class='del'>-	tp-&gt;write_seq = tcb-&gt;end_seq;</div><div class='add'>+	WRITE_ONCE(tp-&gt;write_seq, tcb-&gt;end_seq);</div><div class='ctx'> 	tp-&gt;packets_out += tcp_skb_pcount(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3372,10 +4159,12 @@ static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)</div><div class='ctx'> {</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_fastopen_request *fo = tp-&gt;fastopen_req;</div><div class='del'>-	int space, err = 0;</div><div class='add'>+	struct page_frag *pfrag = sk_page_frag(sk);</div><div class='ctx'> 	struct sk_buff *syn_data;</div><div class='add'>+	int space, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = tp-&gt;advmss;  /* If MSS is not cached */</div><div class='ctx'> 	if (!tcp_fastopen_cookie_check(sk, &amp;tp-&gt;rx_opt.mss_clamp, &amp;fo-&gt;cookie))</div><div class='hunk'>@@ -3386,32 +4175,40 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)</div><div class='ctx'> 	 * private TCP options. The cost is reduced data space in SYN :(</div><div class='ctx'> 	 */</div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = tcp_mss_clamp(tp, tp-&gt;rx_opt.mss_clamp);</div><div class='add'>+	/* Sync mss_cache after updating the mss_clamp */</div><div class='add'>+	tcp_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='ctx'> </div><div class='del'>-	space = __tcp_mtu_to_mss(sk, inet_csk(sk)-&gt;icsk_pmtu_cookie) -</div><div class='add'>+	space = __tcp_mtu_to_mss(sk, icsk-&gt;icsk_pmtu_cookie) -</div><div class='ctx'> 		MAX_TCP_OPTION_SPACE;</div><div class='ctx'> </div><div class='ctx'> 	space = min_t(size_t, space, fo-&gt;size);</div><div class='ctx'> </div><div class='del'>-	/* limit to order-0 allocations */</div><div class='del'>-	space = min_t(size_t, space, SKB_MAX_HEAD(MAX_TCP_HEADER));</div><div class='del'>-</div><div class='del'>-	syn_data = sk_stream_alloc_skb(sk, space, sk-&gt;sk_allocation, false);</div><div class='add'>+	if (space &amp;&amp;</div><div class='add'>+	    !skb_page_frag_refill(min_t(size_t, space, PAGE_SIZE),</div><div class='add'>+				  pfrag, sk-&gt;sk_allocation))</div><div class='add'>+		goto fallback;</div><div class='add'>+	syn_data = tcp_stream_alloc_skb(sk, sk-&gt;sk_allocation, false);</div><div class='ctx'> 	if (!syn_data)</div><div class='ctx'> 		goto fallback;</div><div class='del'>-	syn_data-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> 	memcpy(syn_data-&gt;cb, syn-&gt;cb, sizeof(syn-&gt;cb));</div><div class='ctx'> 	if (space) {</div><div class='del'>-		int copied = copy_from_iter(skb_put(syn_data, space), space,</div><div class='del'>-					    &amp;fo-&gt;data-&gt;msg_iter);</div><div class='del'>-		if (unlikely(!copied)) {</div><div class='add'>+		space = min_t(size_t, space, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='add'>+		space = tcp_wmem_schedule(sk, space);</div><div class='add'>+	}</div><div class='add'>+	if (space) {</div><div class='add'>+		space = copy_page_from_iter(pfrag-&gt;page, pfrag-&gt;offset,</div><div class='add'>+					    space, &amp;fo-&gt;data-&gt;msg_iter);</div><div class='add'>+		if (unlikely(!space)) {</div><div class='ctx'> 			tcp_skb_tsorted_anchor_cleanup(syn_data);</div><div class='ctx'> 			kfree_skb(syn_data);</div><div class='ctx'> 			goto fallback;</div><div class='ctx'> 		}</div><div class='del'>-		if (copied != space) {</div><div class='del'>-			skb_trim(syn_data, copied);</div><div class='del'>-			space = copied;</div><div class='del'>-		}</div><div class='add'>+		skb_fill_page_desc(syn_data, 0, pfrag-&gt;page,</div><div class='add'>+				   pfrag-&gt;offset, space);</div><div class='add'>+		page_ref_inc(pfrag-&gt;page);</div><div class='add'>+		pfrag-&gt;offset += space;</div><div class='add'>+		skb_len_add(syn_data, space);</div><div class='add'>+		skb_zcopy_set(syn_data, fo-&gt;uarg, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* No more data pending in inet_wait_for_connect() */</div><div class='ctx'> 	if (space == fo-&gt;size)</div><div class='hunk'>@@ -3424,7 +4221,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)</div><div class='ctx'> </div><div class='ctx'> 	err = tcp_transmit_skb(sk, syn_data, 1, sk-&gt;sk_allocation);</div><div class='ctx'> </div><div class='del'>-	syn-&gt;skb_mstamp = syn_data-&gt;skb_mstamp;</div><div class='add'>+	skb_set_delivery_time(syn, syn_data-&gt;skb_mstamp_ns, SKB_CLOCK_MONOTONIC);</div><div class='ctx'> </div><div class='ctx'> 	/* Now full SYN+DATA was cloned and sent (or not),</div><div class='ctx'> 	 * remove the SYN from the original skb (syn_data)</div><div class='hunk'>@@ -3465,6 +4262,53 @@ int tcp_connect(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_CONNECT_CB, 0, NULL);</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) &amp;&amp; defined(CONFIG_TCP_AO)</div><div class='add'>+	/* Has to be checked late, after setting daddr/saddr/ops.</div><div class='add'>+	 * Return error if the peer has both a md5 and a tcp-ao key</div><div class='add'>+	 * configured as this is ambiguous.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(rcu_dereference_protected(tp-&gt;md5sig_info,</div><div class='add'>+					       lockdep_sock_is_held(sk)))) {</div><div class='add'>+		bool needs_ao = !!tp-&gt;af_specific-&gt;ao_lookup(sk, sk, -1, -1);</div><div class='add'>+		bool needs_md5 = !!tp-&gt;af_specific-&gt;md5_lookup(sk, sk);</div><div class='add'>+		struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+		ao_info = rcu_dereference_check(tp-&gt;ao_info,</div><div class='add'>+						lockdep_sock_is_held(sk));</div><div class='add'>+		if (ao_info) {</div><div class='add'>+			/* This is an extra check: tcp_ao_required() in</div><div class='add'>+			 * tcp_v{4,6}_parse_md5_keys() should prevent adding</div><div class='add'>+			 * md5 keys on ao_required socket.</div><div class='add'>+			 */</div><div class='add'>+			needs_ao |= ao_info-&gt;ao_required;</div><div class='add'>+			WARN_ON_ONCE(ao_info-&gt;ao_required &amp;&amp; needs_md5);</div><div class='add'>+		}</div><div class='add'>+		if (needs_md5 &amp;&amp; needs_ao)</div><div class='add'>+			return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+		/* If we have a matching md5 key and no matching tcp-ao key</div><div class='add'>+		 * then free up ao_info if allocated.</div><div class='add'>+		 */</div><div class='add'>+		if (needs_md5) {</div><div class='add'>+			tcp_ao_destroy_sock(sk, false);</div><div class='add'>+		} else if (needs_ao) {</div><div class='add'>+			tcp_clear_md5_list(sk);</div><div class='add'>+			kfree(rcu_replace_pointer(tp-&gt;md5sig_info, NULL,</div><div class='add'>+						  lockdep_sock_is_held(sk)));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (unlikely(rcu_dereference_protected(tp-&gt;ao_info,</div><div class='add'>+					       lockdep_sock_is_held(sk)))) {</div><div class='add'>+		/* Don't allow connecting if ao is configured but no</div><div class='add'>+		 * matching key is found.</div><div class='add'>+		 */</div><div class='add'>+		if (!tp-&gt;af_specific-&gt;ao_lookup(sk, sk, -1, -1))</div><div class='add'>+			return -EKEYREJECTED;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (inet_csk(sk)-&gt;icsk_af_ops-&gt;rebuild_header(sk))</div><div class='ctx'> 		return -EHOSTUNREACH; /* Routing failure or similar. */</div><div class='ctx'> </div><div class='hunk'>@@ -3475,13 +4319,16 @@ int tcp_connect(struct sock *sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buff = sk_stream_alloc_skb(sk, 0, sk-&gt;sk_allocation, true);</div><div class='add'>+	buff = tcp_stream_alloc_skb(sk, sk-&gt;sk_allocation, true);</div><div class='ctx'> 	if (unlikely(!buff))</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	tcp_init_nondata_skb(buff, tp-&gt;write_seq++, TCPHDR_SYN);</div><div class='add'>+	/* SYN eats a sequence byte, write_seq updated by</div><div class='add'>+	 * tcp_connect_queue_skb().</div><div class='add'>+	 */</div><div class='add'>+	tcp_init_nondata_skb(buff, sk, tp-&gt;write_seq, TCPHDR_SYN);</div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='del'>-	tp-&gt;retrans_stamp = tcp_time_stamp(tp);</div><div class='add'>+	tp-&gt;retrans_stamp = tcp_time_stamp_ts(tp);</div><div class='ctx'> 	tcp_connect_queue_skb(sk, buff);</div><div class='ctx'> 	tcp_ecn_send_syn(sk, buff);</div><div class='ctx'> 	tcp_rbtree_insert(&amp;sk-&gt;tcp_rtx_queue, buff);</div><div class='hunk'>@@ -3495,22 +4342,29 @@ int tcp_connect(struct sock *sk)</div><div class='ctx'> 	/* We change tp-&gt;snd_nxt after the tcp_transmit_skb() call</div><div class='ctx'> 	 * in order to make this packet get counted in tcpOutSegs.</div><div class='ctx'> 	 */</div><div class='del'>-	tp-&gt;snd_nxt = tp-&gt;write_seq;</div><div class='add'>+	WRITE_ONCE(tp-&gt;snd_nxt, tp-&gt;write_seq);</div><div class='ctx'> 	tp-&gt;pushed_seq = tp-&gt;write_seq;</div><div class='ctx'> 	buff = tcp_send_head(sk);</div><div class='ctx'> 	if (unlikely(buff)) {</div><div class='del'>-		tp-&gt;snd_nxt	= TCP_SKB_CB(buff)-&gt;seq;</div><div class='add'>+		WRITE_ONCE(tp-&gt;snd_nxt, TCP_SKB_CB(buff)-&gt;seq);</div><div class='ctx'> 		tp-&gt;pushed_seq	= TCP_SKB_CB(buff)-&gt;seq;</div><div class='ctx'> 	}</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_ACTIVEOPENS);</div><div class='ctx'> </div><div class='ctx'> 	/* Timer for repeating the SYN until an answer. */</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-				  inet_csk(sk)-&gt;icsk_rto, TCP_RTO_MAX);</div><div class='add'>+	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+			     inet_csk(sk)-&gt;icsk_rto, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tcp_connect);</div><div class='ctx'> </div><div class='add'>+u32 tcp_delack_max(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	u32 delack_from_rto_min = max(tcp_rto_min(sk), 2) - 1;</div><div class='add'>+</div><div class='add'>+	return min(READ_ONCE(inet_csk(sk)-&gt;icsk_delack_max), delack_from_rto_min);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Send out a delayed ack, the caller does the policy checking</div><div class='ctx'>  * to see if we should even be here.  See tcp_input.c:tcp_ack_snd_check()</div><div class='ctx'>  * for details.</div><div class='hunk'>@@ -3525,7 +4379,7 @@ void tcp_send_delayed_ack(struct sock *sk)</div><div class='ctx'> 		const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 		int max_ato = HZ / 2;</div><div class='ctx'> </div><div class='del'>-		if (icsk-&gt;icsk_ack.pingpong ||</div><div class='add'>+		if (inet_csk_in_pingpong_mode(sk) ||</div><div class='ctx'> 		    (icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_PUSHED))</div><div class='ctx'> 			max_ato = TCP_DELACK_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -3546,30 +4400,29 @@ void tcp_send_delayed_ack(struct sock *sk)</div><div class='ctx'> 		ato = min(ato, max_ato);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ato = min_t(u32, ato, tcp_delack_max(sk));</div><div class='add'>+</div><div class='ctx'> 	/* Stay within the limit we were given */</div><div class='ctx'> 	timeout = jiffies + ato;</div><div class='ctx'> </div><div class='ctx'> 	/* Use new timeout only if there wasn't a older one earlier. */</div><div class='ctx'> 	if (icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER) {</div><div class='del'>-		/* If delack timer was blocked or is about to expire,</div><div class='del'>-		 * send ACK now.</div><div class='del'>-		 */</div><div class='del'>-		if (icsk-&gt;icsk_ack.blocked ||</div><div class='del'>-		    time_before_eq(icsk-&gt;icsk_ack.timeout, jiffies + (ato &gt;&gt; 2))) {</div><div class='add'>+		/* If delack timer is about to expire, send ACK now. */</div><div class='add'>+		if (time_before_eq(icsk_delack_timeout(icsk), jiffies + (ato &gt;&gt; 2))) {</div><div class='ctx'> 			tcp_send_ack(sk);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!time_before(timeout, icsk-&gt;icsk_ack.timeout))</div><div class='del'>-			timeout = icsk-&gt;icsk_ack.timeout;</div><div class='add'>+		if (!time_before(timeout, icsk_delack_timeout(icsk)))</div><div class='add'>+			timeout = icsk_delack_timeout(icsk);</div><div class='ctx'> 	}</div><div class='del'>-	icsk-&gt;icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;</div><div class='del'>-	icsk-&gt;icsk_ack.timeout = timeout;</div><div class='add'>+	smp_store_release(&amp;icsk-&gt;icsk_ack.pending,</div><div class='add'>+			  icsk-&gt;icsk_ack.pending | ICSK_ACK_SCHED | ICSK_ACK_TIMER);</div><div class='ctx'> 	sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This routine sends an ack and also updates the window. */</div><div class='del'>-void __tcp_send_ack(struct sock *sk, u32 rcv_nxt)</div><div class='add'>+void __tcp_send_ack(struct sock *sk, u32 rcv_nxt, u16 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *buff;</div><div class='ctx'> </div><div class='hunk'>@@ -3584,16 +4437,22 @@ void __tcp_send_ack(struct sock *sk, u32 rcv_nxt)</div><div class='ctx'> 	buff = alloc_skb(MAX_TCP_HEADER,</div><div class='ctx'> 			 sk_gfp_mask(sk, GFP_ATOMIC | __GFP_NOWARN));</div><div class='ctx'> 	if (unlikely(!buff)) {</div><div class='add'>+		struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+		unsigned long delay;</div><div class='add'>+</div><div class='add'>+		delay = TCP_DELACK_MAX &lt;&lt; icsk-&gt;icsk_ack.retry;</div><div class='add'>+		if (delay &lt; tcp_rto_max(sk))</div><div class='add'>+			icsk-&gt;icsk_ack.retry++;</div><div class='ctx'> 		inet_csk_schedule_ack(sk);</div><div class='del'>-		inet_csk(sk)-&gt;icsk_ack.ato = TCP_ATO_MIN;</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,</div><div class='del'>-					  TCP_DELACK_MAX, TCP_RTO_MAX);</div><div class='add'>+		icsk-&gt;icsk_ack.ato = TCP_ATO_MIN;</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_DACK, delay, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve space for headers and prepare control bits. */</div><div class='ctx'> 	skb_reserve(buff, MAX_TCP_HEADER);</div><div class='del'>-	tcp_init_nondata_skb(buff, tcp_acceptable_seq(sk), TCPHDR_ACK);</div><div class='add'>+	tcp_init_nondata_skb(buff, sk,</div><div class='add'>+			     tcp_acceptable_seq(sk), TCPHDR_ACK | flags);</div><div class='ctx'> </div><div class='ctx'> 	/* We do not want pure acks influencing TCP Small Queues or fq/pacing</div><div class='ctx'> 	 * too much.</div><div class='hunk'>@@ -3608,7 +4467,7 @@ EXPORT_SYMBOL_GPL(__tcp_send_ack);</div><div class='ctx'> </div><div class='ctx'> void tcp_send_ack(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	__tcp_send_ack(sk, tcp_sk(sk)-&gt;rcv_nxt);</div><div class='add'>+	__tcp_send_ack(sk, tcp_sk(sk)-&gt;rcv_nxt, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This routine sends a packet with an out of date sequence</div><div class='hunk'>@@ -3639,7 +4498,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent, int mib)</div><div class='ctx'> 	 * end to send an ack.  Don't queue or clone SKB, just</div><div class='ctx'> 	 * send it.</div><div class='ctx'> 	 */</div><div class='del'>-	tcp_init_nondata_skb(skb, tp-&gt;snd_una - !urgent, TCPHDR_ACK);</div><div class='add'>+	tcp_init_nondata_skb(skb, sk, tp-&gt;snd_una - !urgent, TCPHDR_ACK);</div><div class='ctx'> 	NET_INC_STATS(sock_net(sk), mib);</div><div class='ctx'> 	return tcp_transmit_skb(sk, skb, 0, (__force gfp_t)0);</div><div class='ctx'> }</div><div class='hunk'>@@ -3706,37 +4565,33 @@ void tcp_send_probe0(struct sock *sk)</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	unsigned long probe_max;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = tcp_write_wakeup(sk, LINUX_MIB_TCPWINPROBE);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;packets_out || tcp_write_queue_empty(sk)) {</div><div class='ctx'> 		/* Cancel probe timer, if it is not required. */</div><div class='del'>-		icsk-&gt;icsk_probes_out = 0;</div><div class='add'>+		WRITE_ONCE(icsk-&gt;icsk_probes_out, 0);</div><div class='ctx'> 		icsk-&gt;icsk_backoff = 0;</div><div class='add'>+		icsk-&gt;icsk_probes_tstamp = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_probes_out, icsk-&gt;icsk_probes_out + 1);</div><div class='ctx'> 	if (err &lt;= 0) {</div><div class='del'>-		if (icsk-&gt;icsk_backoff &lt; net-&gt;ipv4.sysctl_tcp_retries2)</div><div class='add'>+		if (icsk-&gt;icsk_backoff &lt; READ_ONCE(net-&gt;ipv4.sysctl_tcp_retries2))</div><div class='ctx'> 			icsk-&gt;icsk_backoff++;</div><div class='del'>-		icsk-&gt;icsk_probes_out++;</div><div class='del'>-		probe_max = TCP_RTO_MAX;</div><div class='add'>+		timeout = tcp_probe0_when(sk, tcp_rto_max(sk));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If packet was not sent due to local congestion,</div><div class='del'>-		 * do not backoff and do not remember icsk_probes_out.</div><div class='del'>-		 * Let local senders to fight for local resources.</div><div class='del'>-		 *</div><div class='del'>-		 * Use accumulated backoff yet.</div><div class='add'>+		 * Let senders fight for local resources conservatively.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!icsk-&gt;icsk_probes_out)</div><div class='del'>-			icsk-&gt;icsk_probes_out = 1;</div><div class='del'>-		probe_max = TCP_RESOURCE_PROBE_INTERVAL;</div><div class='add'>+		timeout = TCP_RESOURCE_PROBE_INTERVAL;</div><div class='ctx'> 	}</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,</div><div class='del'>-				  tcp_probe0_when(sk, probe_max),</div><div class='del'>-				  TCP_RTO_MAX);</div><div class='add'>+</div><div class='add'>+	timeout = tcp_clamp_probe0_to_user_timeout(sk, timeout);</div><div class='add'>+	tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tcp_rtx_synack(const struct sock *sk, struct request_sock *req)</div><div class='hunk'>@@ -3745,15 +4600,24 @@ int tcp_rtx_synack(const struct sock *sk, struct request_sock *req)</div><div class='ctx'> 	struct flowi fl;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	tcp_rsk(req)-&gt;txhash = net_tx_rndhash();</div><div class='del'>-	res = af_ops-&gt;send_synack(sk, NULL, &amp;fl, req, NULL, TCP_SYNACK_NORMAL);</div><div class='add'>+	/* Paired with WRITE_ONCE() in sock_setsockopt() */</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_txrehash) == SOCK_TXREHASH_ENABLED)</div><div class='add'>+		WRITE_ONCE(tcp_rsk(req)-&gt;txhash, net_tx_rndhash());</div><div class='add'>+	res = af_ops-&gt;send_synack(sk, NULL, &amp;fl, req, NULL, TCP_SYNACK_NORMAL,</div><div class='add'>+				  NULL);</div><div class='ctx'> 	if (!res) {</div><div class='del'>-		__TCP_INC_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS);</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);</div><div class='del'>-		if (unlikely(tcp_passive_fastopen(sk)))</div><div class='del'>-			tcp_sk(sk)-&gt;total_retrans++;</div><div class='add'>+		TCP_INC_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS);</div><div class='add'>+		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);</div><div class='add'>+		if (unlikely(tcp_passive_fastopen(sk))) {</div><div class='add'>+			/* sk has const attribute because listeners are lockless.</div><div class='add'>+			 * However in this case, we are dealing with a passive fastopen</div><div class='add'>+			 * socket thus we can change total_retrans value.</div><div class='add'>+			 */</div><div class='add'>+			tcp_sk_rw(sk)-&gt;total_retrans++;</div><div class='add'>+		}</div><div class='ctx'> 		trace_tcp_retransmit_synack(sk, req);</div><div class='add'>+		WRITE_ONCE(req-&gt;num_retrans, req-&gt;num_retrans + 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_rtx_synack);</div><div class='add'>+EXPORT_IPV6_MOD(tcp_rtx_synack);</div><div class='head'>diff --git a/net/ipv4/tcp_plb.c b/net/ipv4/tcp_plb.c<br/>new file mode 100644<br/>index 000000000000..4bcf7eff95e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_plb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_plb.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/* Protective Load Balancing (PLB)</div><div class='add'>+ *</div><div class='add'>+ * PLB was designed to reduce link load imbalance across datacenter</div><div class='add'>+ * switches. PLB is a host-based optimization; it leverages congestion</div><div class='add'>+ * signals from the transport layer to randomly change the path of the</div><div class='add'>+ * connection experiencing sustained congestion. PLB prefers to repath</div><div class='add'>+ * after idle periods to minimize packet reordering. It repaths by</div><div class='add'>+ * changing the IPv6 Flow Label on the packets of a connection, which</div><div class='add'>+ * datacenter switches include as part of ECMP/WCMP hashing.</div><div class='add'>+ *</div><div class='add'>+ * PLB is described in detail in:</div><div class='add'>+ *</div><div class='add'>+ *	Mubashir Adnan Qureshi, Yuchung Cheng, Qianwen Yin, Qiaobin Fu,</div><div class='add'>+ *	Gautam Kumar, Masoud Moshref, Junhua Yan, Van Jacobson,</div><div class='add'>+ *	David Wetherall,Abdul Kabbani:</div><div class='add'>+ *	"PLB: Congestion Signals are Simple and Effective for</div><div class='add'>+ *	 Network Load Balancing"</div><div class='add'>+ *	In ACM SIGCOMM 2022, Amsterdam Netherlands.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+/* Called once per round-trip to update PLB state for a connection. */</div><div class='add'>+void tcp_plb_update_state(const struct sock *sk, struct tcp_plb_state *plb,</div><div class='add'>+			  const int cong_ratio)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_enabled))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cong_ratio &gt;= 0) {</div><div class='add'>+		if (cong_ratio &lt; READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_cong_thresh))</div><div class='add'>+			plb-&gt;consec_cong_rounds = 0;</div><div class='add'>+		else if (plb-&gt;consec_cong_rounds &lt;</div><div class='add'>+			 READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_rehash_rounds))</div><div class='add'>+			plb-&gt;consec_cong_rounds++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_plb_update_state);</div><div class='add'>+</div><div class='add'>+/* Check whether recent congestion has been persistent enough to warrant</div><div class='add'>+ * a load balancing decision that switches the connection to another path.</div><div class='add'>+ */</div><div class='add'>+void tcp_plb_check_rehash(struct sock *sk, struct tcp_plb_state *plb)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	u32 max_suspend;</div><div class='add'>+	bool forced_rehash = false, idle_rehash = false;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_enabled))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	forced_rehash = plb-&gt;consec_cong_rounds &gt;=</div><div class='add'>+			READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_rehash_rounds);</div><div class='add'>+	/* If sender goes idle then we check whether to rehash. */</div><div class='add'>+	idle_rehash = READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_idle_rehash_rounds) &amp;&amp;</div><div class='add'>+		      !tcp_sk(sk)-&gt;packets_out &amp;&amp;</div><div class='add'>+		      plb-&gt;consec_cong_rounds &gt;=</div><div class='add'>+		      READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_idle_rehash_rounds);</div><div class='add'>+</div><div class='add'>+	if (!forced_rehash &amp;&amp; !idle_rehash)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Note that tcp_jiffies32 can wrap; we detect wraps by checking for</div><div class='add'>+	 * cases where the max suspension end is before the actual suspension</div><div class='add'>+	 * end. We clear pause_until to 0 to indicate there is no recent</div><div class='add'>+	 * RTO event that constrains PLB rehashing.</div><div class='add'>+	 */</div><div class='add'>+	max_suspend = 2 * READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ;</div><div class='add'>+	if (plb-&gt;pause_until &amp;&amp;</div><div class='add'>+	    (!before(tcp_jiffies32, plb-&gt;pause_until) ||</div><div class='add'>+	     before(tcp_jiffies32 + max_suspend, plb-&gt;pause_until)))</div><div class='add'>+		plb-&gt;pause_until = 0;</div><div class='add'>+</div><div class='add'>+	if (plb-&gt;pause_until)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk_rethink_txhash(sk);</div><div class='add'>+	plb-&gt;consec_cong_rounds = 0;</div><div class='add'>+	tcp_sk(sk)-&gt;plb_rehash++;</div><div class='add'>+	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPPLBREHASH);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_plb_check_rehash);</div><div class='add'>+</div><div class='add'>+/* Upon RTO, disallow load balancing for a while, to avoid having load</div><div class='add'>+ * balancing decisions switch traffic to a black-holed path that was</div><div class='add'>+ * previously avoided with a sk_rethink_txhash() call at RTO time.</div><div class='add'>+ */</div><div class='add'>+void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	u32 pause;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_enabled))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pause = READ_ONCE(net-&gt;ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ;</div><div class='add'>+	pause += get_random_u32_below(pause);</div><div class='add'>+	plb-&gt;pause_until = tcp_jiffies32 + pause;</div><div class='add'>+</div><div class='add'>+	/* Reset PLB state upon RTO, since an RTO causes a sk_rethink_txhash() call</div><div class='add'>+	 * that may switch this connection to a path with completely different</div><div class='add'>+	 * congestion characteristics.</div><div class='add'>+	 */</div><div class='add'>+	plb-&gt;consec_cong_rounds = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_plb_update_state_upon_rto);</div><div class='head'>diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c<br/>index 4dff40dad4dc..a8f6d9d06f2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_rate.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_rate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_rate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_rate.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The bandwidth estimator estimates the rate at which the network</div><div class='hunk'>@@ -55,13 +56,16 @@ void tcp_rate_skb_sent(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	  * bandwidth estimate.</div><div class='ctx'> 	  */</div><div class='ctx'> 	if (!tp-&gt;packets_out) {</div><div class='del'>-		tp-&gt;first_tx_mstamp  = skb-&gt;skb_mstamp;</div><div class='del'>-		tp-&gt;delivered_mstamp = skb-&gt;skb_mstamp;</div><div class='add'>+		u64 tstamp_us = tcp_skb_timestamp_us(skb);</div><div class='add'>+</div><div class='add'>+		tp-&gt;first_tx_mstamp  = tstamp_us;</div><div class='add'>+		tp-&gt;delivered_mstamp = tstamp_us;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tx.first_tx_mstamp	= tp-&gt;first_tx_mstamp;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tx.delivered_mstamp	= tp-&gt;delivered_mstamp;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tx.delivered		= tp-&gt;delivered;</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;tx.delivered_ce	= tp-&gt;delivered_ce;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;tx.is_app_limited	= tp-&gt;app_limited ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,31 +74,36 @@ void tcp_rate_skb_sent(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'>  *</div><div class='ctx'>  * If an ACK (s)acks multiple skbs (e.g., stretched-acks), this function is</div><div class='ctx'>  * called multiple times. We favor the information from the most recently</div><div class='del'>- * sent skb, i.e., the skb with the highest prior_delivered count.</div><div class='add'>+ * sent skb, i.e., the skb with the most recently sent time and the highest</div><div class='add'>+ * sequence.</div><div class='ctx'>  */</div><div class='ctx'> void tcp_rate_skb_delivered(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			    struct rate_sample *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct tcp_skb_cb *scb = TCP_SKB_CB(skb);</div><div class='add'>+	u64 tx_tstamp;</div><div class='ctx'> </div><div class='ctx'> 	if (!scb-&gt;tx.delivered_mstamp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	tx_tstamp = tcp_skb_timestamp_us(skb);</div><div class='ctx'> 	if (!rs-&gt;prior_delivered ||</div><div class='del'>-	    after(scb-&gt;tx.delivered, rs-&gt;prior_delivered)) {</div><div class='add'>+	    tcp_skb_sent_after(tx_tstamp, tp-&gt;first_tx_mstamp,</div><div class='add'>+			       scb-&gt;end_seq, rs-&gt;last_end_seq)) {</div><div class='add'>+		rs-&gt;prior_delivered_ce  = scb-&gt;tx.delivered_ce;</div><div class='ctx'> 		rs-&gt;prior_delivered  = scb-&gt;tx.delivered;</div><div class='ctx'> 		rs-&gt;prior_mstamp     = scb-&gt;tx.delivered_mstamp;</div><div class='ctx'> 		rs-&gt;is_app_limited   = scb-&gt;tx.is_app_limited;</div><div class='ctx'> 		rs-&gt;is_retrans	     = scb-&gt;sacked &amp; TCPCB_RETRANS;</div><div class='add'>+		rs-&gt;last_end_seq     = scb-&gt;end_seq;</div><div class='ctx'> </div><div class='add'>+		/* Record send time of most recently ACKed packet: */</div><div class='add'>+		tp-&gt;first_tx_mstamp  = tx_tstamp;</div><div class='ctx'> 		/* Find the duration of the "send phase" of this window: */</div><div class='del'>-		rs-&gt;interval_us      = tcp_stamp_us_delta(</div><div class='del'>-						skb-&gt;skb_mstamp,</div><div class='del'>-						scb-&gt;tx.first_tx_mstamp);</div><div class='add'>+		rs-&gt;interval_us = tcp_stamp_us_delta(tp-&gt;first_tx_mstamp,</div><div class='add'>+						     scb-&gt;tx.first_tx_mstamp);</div><div class='ctx'> </div><div class='del'>-		/* Record send time of most recently ACKed packet: */</div><div class='del'>-		tp-&gt;first_tx_mstamp  = skb-&gt;skb_mstamp;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Mark off the skb delivered once it's sacked to avoid being</div><div class='ctx'> 	 * used again when it's cumulatively acked. For acked packets</div><div class='hunk'>@@ -136,6 +145,10 @@ void tcp_rate_gen(struct sock *sk, u32 delivered, u32 lost,</div><div class='ctx'> 	}</div><div class='ctx'> 	rs-&gt;delivered   = tp-&gt;delivered - rs-&gt;prior_delivered;</div><div class='ctx'> </div><div class='add'>+	rs-&gt;delivered_ce = tp-&gt;delivered_ce - rs-&gt;prior_delivered_ce;</div><div class='add'>+	/* delivered_ce occupies less than 32 bits in the skb control block */</div><div class='add'>+	rs-&gt;delivered_ce &amp;= TCPCB_DELIVERED_CE_MASK;</div><div class='add'>+</div><div class='ctx'> 	/* Model sending data and receiving ACKs as separate pipeline phases</div><div class='ctx'> 	 * for a window. Usually the ACK phase is longer, but with ACK</div><div class='ctx'> 	 * compression the send phase can be longer. To be safe we use the</div><div class='hunk'>@@ -187,7 +200,7 @@ void tcp_rate_check_app_limited(struct sock *sk)</div><div class='ctx'> 	    /* Nothing in sending host's qdisc queues or NIC tx queue. */</div><div class='ctx'> 	    sk_wmem_alloc_get(sk) &lt; SKB_TRUESIZE(1) &amp;&amp;</div><div class='ctx'> 	    /* We are not limited by CWND. */</div><div class='del'>-	    tcp_packets_in_flight(tp) &lt; tp-&gt;snd_cwnd &amp;&amp;</div><div class='add'>+	    tcp_packets_in_flight(tp) &lt; tcp_snd_cwnd(tp) &amp;&amp;</div><div class='ctx'> 	    /* All lost packets have been retransmitted. */</div><div class='ctx'> 	    tp-&gt;lost_out &lt;= tp-&gt;retrans_out)</div><div class='ctx'> 		tp-&gt;app_limited =</div><div class='head'>diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c<br/>index c81aadff769b..c52fd3254b6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_recovery.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_recovery.c</a></div><div class='hunk'>@@ -2,28 +2,9 @@</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='del'>-void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-</div><div class='del'>-	tcp_skb_mark_lost_uncond_verify(tp, skb);</div><div class='del'>-	if (TCP_SKB_CB(skb)-&gt;sacked &amp; TCPCB_SACKED_RETRANS) {</div><div class='del'>-		/* Account for retransmits that are lost again */</div><div class='del'>-		TCP_SKB_CB(skb)-&gt;sacked &amp;= ~TCPCB_SACKED_RETRANS;</div><div class='del'>-		tp-&gt;retrans_out -= tcp_skb_pcount(skb);</div><div class='del'>-		NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT,</div><div class='del'>-			      tcp_skb_pcount(skb));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool tcp_rack_sent_after(u64 t1, u64 t2, u32 seq1, u32 seq2)</div><div class='del'>-{</div><div class='del'>-	return t1 &gt; t2 || (t1 == t2 &amp;&amp; after(seq1, seq2));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u32 tcp_rack_reo_wnd(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;reord_seen) {</div><div class='ctx'> 		/* If reordering has not been observed, be aggressive during</div><div class='hunk'>@@ -33,7 +14,8 @@ static u32 tcp_rack_reo_wnd(const struct sock *sk)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;sacked_out &gt;= tp-&gt;reordering &amp;&amp;</div><div class='del'>-		    !(sock_net(sk)-&gt;ipv4.sysctl_tcp_recovery &amp; TCP_RACK_NO_DUPTHRESH))</div><div class='add'>+		    !(READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_recovery) &amp;</div><div class='add'>+		      TCP_RACK_NO_DUPTHRESH))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -50,10 +32,10 @@ static u32 tcp_rack_reo_wnd(const struct sock *sk)</div><div class='ctx'> s32 tcp_rack_skb_timeout(struct tcp_sock *tp, struct sk_buff *skb, u32 reo_wnd)</div><div class='ctx'> {</div><div class='ctx'> 	return tp-&gt;rack.rtt_us + reo_wnd -</div><div class='del'>-	       tcp_stamp_us_delta(tp-&gt;tcp_mstamp, skb-&gt;skb_mstamp);</div><div class='add'>+	       tcp_stamp_us_delta(tp-&gt;tcp_mstamp, tcp_skb_timestamp_us(skb));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* RACK loss detection (IETF draft draft-ietf-tcpm-rack-01):</div><div class='add'>+/* RACK loss detection (IETF RFC8985):</div><div class='ctx'>  *</div><div class='ctx'>  * Marks a packet lost, if some packet sent later has been (s)acked.</div><div class='ctx'>  * The underlying idea is similar to the traditional dupthresh and FACK</div><div class='hunk'>@@ -91,8 +73,9 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout)</div><div class='ctx'> 		    !(scb-&gt;sacked &amp; TCPCB_SACKED_RETRANS))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!tcp_rack_sent_after(tp-&gt;rack.mstamp, skb-&gt;skb_mstamp,</div><div class='del'>-					 tp-&gt;rack.end_seq, scb-&gt;end_seq))</div><div class='add'>+		if (!tcp_skb_sent_after(tp-&gt;rack.mstamp,</div><div class='add'>+					tcp_skb_timestamp_us(skb),</div><div class='add'>+					tp-&gt;rack.end_seq, scb-&gt;end_seq))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* A packet is lost if it has not been s/acked beyond</div><div class='hunk'>@@ -109,22 +92,23 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tcp_rack_mark_lost(struct sock *sk)</div><div class='add'>+bool tcp_rack_mark_lost(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;rack.advanced)</div><div class='del'>-		return;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the advanced flag to avoid unnecessary queue scanning */</div><div class='ctx'> 	tp-&gt;rack.advanced = 0;</div><div class='ctx'> 	tcp_rack_detect_loss(sk, &amp;timeout);</div><div class='ctx'> 	if (timeout) {</div><div class='del'>-		timeout = usecs_to_jiffies(timeout) + TCP_TIMEOUT_MIN;</div><div class='add'>+		timeout = usecs_to_jiffies(timeout + TCP_TIMEOUT_MIN_US);</div><div class='ctx'> 		inet_csk_reset_xmit_timer(sk, ICSK_TIME_REO_TIMEOUT,</div><div class='ctx'> 					  timeout, inet_csk(sk)-&gt;icsk_rto);</div><div class='ctx'> 	}</div><div class='add'>+	return !!timeout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Record the most recently (re)sent time among the (s)acked packets</div><div class='hunk'>@@ -152,8 +136,8 @@ void tcp_rack_advance(struct tcp_sock *tp, u8 sacked, u32 end_seq,</div><div class='ctx'> 	}</div><div class='ctx'> 	tp-&gt;rack.advanced = 1;</div><div class='ctx'> 	tp-&gt;rack.rtt_us = rtt_us;</div><div class='del'>-	if (tcp_rack_sent_after(xmit_time, tp-&gt;rack.mstamp,</div><div class='del'>-				end_seq, tp-&gt;rack.end_seq)) {</div><div class='add'>+	if (tcp_skb_sent_after(xmit_time, tp-&gt;rack.mstamp,</div><div class='add'>+			       end_seq, tp-&gt;rack.end_seq)) {</div><div class='ctx'> 		tp-&gt;rack.mstamp = xmit_time;</div><div class='ctx'> 		tp-&gt;rack.end_seq = end_seq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -166,6 +150,7 @@ void tcp_rack_reo_timeout(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 timeout, prior_inflight;</div><div class='add'>+	u32 lost = tp-&gt;lost;</div><div class='ctx'> </div><div class='ctx'> 	prior_inflight = tcp_packets_in_flight(tp);</div><div class='ctx'> 	tcp_rack_detect_loss(sk, &amp;timeout);</div><div class='hunk'>@@ -173,7 +158,7 @@ void tcp_rack_reo_timeout(struct sock *sk)</div><div class='ctx'> 		if (inet_csk(sk)-&gt;icsk_ca_state != TCP_CA_Recovery) {</div><div class='ctx'> 			tcp_enter_recovery(sk, false);</div><div class='ctx'> 			if (!inet_csk(sk)-&gt;icsk_ca_ops-&gt;cong_control)</div><div class='del'>-				tcp_cwnd_reduction(sk, 1, 0);</div><div class='add'>+				tcp_cwnd_reduction(sk, 1, tp-&gt;lost - lost, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		tcp_xmit_retransmit_queue(sk);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -183,7 +168,8 @@ void tcp_rack_reo_timeout(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /* Updates the RACK's reo_wnd based on DSACK and no. of recoveries.</div><div class='ctx'>  *</div><div class='del'>- * If DSACK is received, increment reo_wnd by min_rtt/4 (upper bounded</div><div class='add'>+ * If a DSACK is received that seems like it may have been due to reordering</div><div class='add'>+ * triggering fast recovery, increment reo_wnd by min_rtt/4 (upper bounded</div><div class='ctx'>  * by srtt), since there is possibility that spurious retransmission was</div><div class='ctx'>  * due to reordering delay longer than reo_wnd.</div><div class='ctx'>  *</div><div class='hunk'>@@ -202,7 +188,8 @@ void tcp_rack_update_reo_wnd(struct sock *sk, struct rate_sample *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (sock_net(sk)-&gt;ipv4.sysctl_tcp_recovery &amp; TCP_RACK_STATIC_REO_WND ||</div><div class='add'>+	if ((READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_recovery) &amp;</div><div class='add'>+	     TCP_RACK_STATIC_REO_WND) ||</div><div class='ctx'> 	    !rs-&gt;prior_delivered)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +232,6 @@ void tcp_newreno_mark_lost(struct sock *sk, bool snd_una_advanced)</div><div class='ctx'> 			tcp_fragment(sk, TCP_FRAG_IN_RTX_QUEUE, skb,</div><div class='ctx'> 				     mss, mss, GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-		tcp_skb_mark_lost_uncond_verify(tp, skb);</div><div class='add'>+		tcp_mark_skb_lost(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c<br/>index addc122f8818..862b96248a92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_scalable.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_scalable.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_scalable.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_scalable.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Tom Kelly's Scalable TCP</div><div class='ctx'>  *</div><div class='ctx'>  * See http://www.deneholme.net/tom/scalable/</div><div class='hunk'>@@ -9,10 +10,9 @@</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* These factors derived from the recommended values in the aer:</div><div class='del'>- * .01 and and 7/8. We use 50 instead of 100 to account for</div><div class='del'>- * delayed ack.</div><div class='add'>+ * .01 and 7/8.</div><div class='ctx'>  */</div><div class='del'>-#define TCP_SCALABLE_AI_CNT	50U</div><div class='add'>+#define TCP_SCALABLE_AI_CNT	100U</div><div class='ctx'> #define TCP_SCALABLE_MD_SCALE	3</div><div class='ctx'> </div><div class='ctx'> static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='hunk'>@@ -22,18 +22,20 @@ static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	if (!tcp_is_cwnd_limited(sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (tcp_in_slow_start(tp))</div><div class='del'>-		tcp_slow_start(tp, acked);</div><div class='del'>-	else</div><div class='del'>-		tcp_cong_avoid_ai(tp, min(tp-&gt;snd_cwnd, TCP_SCALABLE_AI_CNT),</div><div class='del'>-				  1);</div><div class='add'>+	if (tcp_in_slow_start(tp)) {</div><div class='add'>+		acked = tcp_slow_start(tp, acked);</div><div class='add'>+		if (!acked)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	tcp_cong_avoid_ai(tp, min(tcp_snd_cwnd(tp), TCP_SCALABLE_AI_CNT),</div><div class='add'>+			  acked);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 tcp_scalable_ssthresh(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return max(tp-&gt;snd_cwnd - (tp-&gt;snd_cwnd&gt;&gt;TCP_SCALABLE_MD_SCALE), 2U);</div><div class='add'>+	return max(tcp_snd_cwnd(tp) - (tcp_snd_cwnd(tp)&gt;&gt;TCP_SCALABLE_MD_SCALE), 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_scalable __read_mostly = {</div><div class='head'>diff --git a/net/ipv4/tcp_sigpool.c b/net/ipv4/tcp_sigpool.c<br/>new file mode 100644<br/>index 000000000000..d8a4f192873a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_sigpool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_sigpool.c</a></div><div class='hunk'>@@ -0,0 +1,366 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+static size_t __scratch_size;</div><div class='add'>+struct sigpool_scratch {</div><div class='add'>+	local_lock_t bh_lock;</div><div class='add'>+	void __rcu *pad;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct sigpool_scratch, sigpool_scratch) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sigpool_entry {</div><div class='add'>+	struct crypto_ahash	*hash;</div><div class='add'>+	const char		*alg;</div><div class='add'>+	struct kref		kref;</div><div class='add'>+	uint16_t		needs_key:1,</div><div class='add'>+				reserved:15;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CPOOL_SIZE (PAGE_SIZE / sizeof(struct sigpool_entry))</div><div class='add'>+static struct sigpool_entry cpool[CPOOL_SIZE];</div><div class='add'>+static unsigned int cpool_populated;</div><div class='add'>+static DEFINE_MUTEX(cpool_mutex);</div><div class='add'>+</div><div class='add'>+/* Slow-path */</div><div class='add'>+struct scratches_to_free {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	void *scratches[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void free_old_scratches(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct scratches_to_free *stf;</div><div class='add'>+</div><div class='add'>+	stf = container_of(head, struct scratches_to_free, rcu);</div><div class='add'>+	while (stf-&gt;cnt--)</div><div class='add'>+		kfree(stf-&gt;scratches[stf-&gt;cnt]);</div><div class='add'>+	kfree(stf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sigpool_reserve_scratch - re-allocates scratch buffer, slow-path</div><div class='add'>+ * @size: request size for the scratch/temp buffer</div><div class='add'>+ */</div><div class='add'>+static int sigpool_reserve_scratch(size_t size)</div><div class='add'>+{</div><div class='add'>+	struct scratches_to_free *stf;</div><div class='add'>+	size_t stf_sz = struct_size(stf, scratches, num_possible_cpus());</div><div class='add'>+	int cpu, err = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;cpool_mutex);</div><div class='add'>+	if (__scratch_size &gt;= size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	stf = kmalloc(stf_sz, GFP_KERNEL);</div><div class='add'>+	if (!stf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	stf-&gt;cnt = 0;</div><div class='add'>+</div><div class='add'>+	size = max(size, __scratch_size);</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		void *scratch, *old_scratch;</div><div class='add'>+</div><div class='add'>+		scratch = kmalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));</div><div class='add'>+		if (!scratch) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		old_scratch = rcu_replace_pointer(per_cpu(sigpool_scratch.pad, cpu),</div><div class='add'>+					scratch, lockdep_is_held(&amp;cpool_mutex));</div><div class='add'>+		if (!cpu_online(cpu) || !old_scratch) {</div><div class='add'>+			kfree(old_scratch);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		stf-&gt;scratches[stf-&gt;cnt++] = old_scratch;</div><div class='add'>+	}</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+	if (!err)</div><div class='add'>+		__scratch_size = size;</div><div class='add'>+</div><div class='add'>+	call_rcu(&amp;stf-&gt;rcu, free_old_scratches);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sigpool_scratch_free(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu)</div><div class='add'>+		kfree(rcu_replace_pointer(per_cpu(sigpool_scratch.pad, cpu),</div><div class='add'>+					  NULL, lockdep_is_held(&amp;cpool_mutex)));</div><div class='add'>+	__scratch_size = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __cpool_try_clone(struct crypto_ahash *hash)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tmp;</div><div class='add'>+</div><div class='add'>+	tmp = crypto_clone_ahash(hash);</div><div class='add'>+	if (IS_ERR(tmp))</div><div class='add'>+		return PTR_ERR(tmp);</div><div class='add'>+</div><div class='add'>+	crypto_free_ahash(tmp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __cpool_alloc_ahash(struct sigpool_entry *e, const char *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *cpu0_hash;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	e-&gt;alg = kstrdup(alg, GFP_KERNEL);</div><div class='add'>+	if (!e-&gt;alg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cpu0_hash = crypto_alloc_ahash(alg, 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(cpu0_hash)) {</div><div class='add'>+		ret = PTR_ERR(cpu0_hash);</div><div class='add'>+		goto out_free_alg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	e-&gt;needs_key = crypto_ahash_get_flags(cpu0_hash) &amp; CRYPTO_TFM_NEED_KEY;</div><div class='add'>+</div><div class='add'>+	ret = __cpool_try_clone(cpu0_hash);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_cpu0_hash;</div><div class='add'>+	e-&gt;hash = cpu0_hash;</div><div class='add'>+	kref_init(&amp;e-&gt;kref);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_cpu0_hash:</div><div class='add'>+	crypto_free_ahash(cpu0_hash);</div><div class='add'>+out_free_alg:</div><div class='add'>+	kfree(e-&gt;alg);</div><div class='add'>+	e-&gt;alg = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tcp_sigpool_alloc_ahash - allocates pool for ahash requests</div><div class='add'>+ * @alg: name of async hash algorithm</div><div class='add'>+ * @scratch_size: reserve a tcp_sigpool::scratch buffer of this size</div><div class='add'>+ */</div><div class='add'>+int tcp_sigpool_alloc_ahash(const char *alg, size_t scratch_size)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* slow-path */</div><div class='add'>+	mutex_lock(&amp;cpool_mutex);</div><div class='add'>+	ret = sigpool_reserve_scratch(scratch_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	for (i = 0; i &lt; cpool_populated; i++) {</div><div class='add'>+		if (!cpool[i].alg)</div><div class='add'>+			continue;</div><div class='add'>+		if (strcmp(cpool[i].alg, alg))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* pairs with tcp_sigpool_release() */</div><div class='add'>+		if (!kref_get_unless_zero(&amp;cpool[i].kref))</div><div class='add'>+			kref_init(&amp;cpool[i].kref);</div><div class='add'>+		ret = i;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cpool_populated; i++) {</div><div class='add'>+		if (!cpool[i].alg)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt;= CPOOL_SIZE) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __cpool_alloc_ahash(&amp;cpool[i], alg);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = i;</div><div class='add'>+		if (i == cpool_populated)</div><div class='add'>+			cpool_populated++;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;cpool_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_alloc_ahash);</div><div class='add'>+</div><div class='add'>+static void __cpool_free_entry(struct sigpool_entry *e)</div><div class='add'>+{</div><div class='add'>+	crypto_free_ahash(e-&gt;hash);</div><div class='add'>+	kfree(e-&gt;alg);</div><div class='add'>+	memset(e, 0, sizeof(*e));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpool_cleanup_work_cb(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	bool free_scratch = true;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cpool_mutex);</div><div class='add'>+	for (i = 0; i &lt; cpool_populated; i++) {</div><div class='add'>+		if (kref_read(&amp;cpool[i].kref) &gt; 0) {</div><div class='add'>+			free_scratch = false;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (!cpool[i].alg)</div><div class='add'>+			continue;</div><div class='add'>+		__cpool_free_entry(&amp;cpool[i]);</div><div class='add'>+	}</div><div class='add'>+	if (free_scratch)</div><div class='add'>+		sigpool_scratch_free();</div><div class='add'>+	mutex_unlock(&amp;cpool_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(cpool_cleanup_work, cpool_cleanup_work_cb);</div><div class='add'>+static void cpool_schedule_cleanup(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;cpool_cleanup_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tcp_sigpool_release - decreases number of users for a pool. If it was</div><div class='add'>+ * the last user of the pool, releases any memory that was consumed.</div><div class='add'>+ * @id: tcp_sigpool that was previously allocated by tcp_sigpool_alloc_ahash()</div><div class='add'>+ */</div><div class='add'>+void tcp_sigpool_release(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(id &gt;= cpool_populated || !cpool[id].alg))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* slow-path */</div><div class='add'>+	kref_put(&amp;cpool[id].kref, cpool_schedule_cleanup);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_release);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tcp_sigpool_get - increases number of users (refcounter) for a pool</div><div class='add'>+ * @id: tcp_sigpool that was previously allocated by tcp_sigpool_alloc_ahash()</div><div class='add'>+ */</div><div class='add'>+void tcp_sigpool_get(unsigned int id)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(id &gt;= cpool_populated || !cpool[id].alg))</div><div class='add'>+		return;</div><div class='add'>+	kref_get(&amp;cpool[id].kref);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_get);</div><div class='add'>+</div><div class='add'>+int tcp_sigpool_start(unsigned int id, struct tcp_sigpool *c) __cond_acquires(RCU_BH)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *hash;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	if (WARN_ON_ONCE(id &gt;= cpool_populated || !cpool[id].alg)) {</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hash = crypto_clone_ahash(cpool[id].hash);</div><div class='add'>+	if (IS_ERR(hash)) {</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return PTR_ERR(hash);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c-&gt;req = ahash_request_alloc(hash, GFP_ATOMIC);</div><div class='add'>+	if (!c-&gt;req) {</div><div class='add'>+		crypto_free_ahash(hash);</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	ahash_request_set_callback(c-&gt;req, 0, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	/* Pairs with tcp_sigpool_reserve_scratch(), scratch area is</div><div class='add'>+	 * valid (allocated) until tcp_sigpool_end().</div><div class='add'>+	 */</div><div class='add'>+	local_lock_nested_bh(&amp;sigpool_scratch.bh_lock);</div><div class='add'>+	c-&gt;scratch = rcu_dereference_bh(*this_cpu_ptr(&amp;sigpool_scratch.pad));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_start);</div><div class='add'>+</div><div class='add'>+void tcp_sigpool_end(struct tcp_sigpool *c) __releases(RCU_BH)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *hash = crypto_ahash_reqtfm(c-&gt;req);</div><div class='add'>+</div><div class='add'>+	local_unlock_nested_bh(&amp;sigpool_scratch.bh_lock);</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+	ahash_request_free(c-&gt;req);</div><div class='add'>+	crypto_free_ahash(hash);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_end);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tcp_sigpool_algo - return algorithm of tcp_sigpool</div><div class='add'>+ * @id: tcp_sigpool that was previously allocated by tcp_sigpool_alloc_ahash()</div><div class='add'>+ * @buf: buffer to return name of algorithm</div><div class='add'>+ * @buf_len: size of @buf</div><div class='add'>+ */</div><div class='add'>+size_t tcp_sigpool_algo(unsigned int id, char *buf, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(id &gt;= cpool_populated || !cpool[id].alg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return strscpy(buf, cpool[id].alg, buf_len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tcp_sigpool_algo);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tcp_sigpool_hash_skb_data - hash data in skb with initialized tcp_sigpool</div><div class='add'>+ * @hp: tcp_sigpool pointer</div><div class='add'>+ * @skb: buffer to add sign for</div><div class='add'>+ * @header_len: TCP header length for this segment</div><div class='add'>+ */</div><div class='add'>+int tcp_sigpool_hash_skb_data(struct tcp_sigpool *hp,</div><div class='add'>+			      const struct sk_buff *skb,</div><div class='add'>+			      unsigned int header_len)</div><div class='add'>+{</div><div class='add'>+	const unsigned int head_data_len = skb_headlen(skb) &gt; header_len ?</div><div class='add'>+					   skb_headlen(skb) - header_len : 0;</div><div class='add'>+	const struct skb_shared_info *shi = skb_shinfo(skb);</div><div class='add'>+	const struct tcphdr *tp = tcp_hdr(skb);</div><div class='add'>+	struct ahash_request *req = hp-&gt;req;</div><div class='add'>+	struct sk_buff *frag_iter;</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	sg_init_table(&amp;sg, 1);</div><div class='add'>+</div><div class='add'>+	sg_set_buf(&amp;sg, ((u8 *)tp) + header_len, head_data_len);</div><div class='add'>+	ahash_request_set_crypt(req, &amp;sg, NULL, head_data_len);</div><div class='add'>+	if (crypto_ahash_update(req))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; shi-&gt;nr_frags; ++i) {</div><div class='add'>+		const skb_frag_t *f = &amp;shi-&gt;frags[i];</div><div class='add'>+		unsigned int offset = skb_frag_off(f);</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		page = skb_frag_page(f) + (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		sg_set_page(&amp;sg, page, skb_frag_size(f), offset_in_page(offset));</div><div class='add'>+		ahash_request_set_crypt(req, &amp;sg, NULL, skb_frag_size(f));</div><div class='add'>+		if (crypto_ahash_update(req))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_walk_frags(skb, frag_iter)</div><div class='add'>+		if (tcp_sigpool_hash_skb_data(hp, frag_iter, 0))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tcp_sigpool_hash_skb_data);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Per-CPU pool of crypto requests");</div><div class='head'>diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c<br/>index 7fdf222a0bdf..160080c9021d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_timer.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -21,34 +22,47 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/rstreason.h&gt;</div><div class='ctx'> </div><div class='del'>-static u32 tcp_retransmit_stamp(const struct sock *sk)</div><div class='add'>+static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	u32 start_ts = tcp_sk(sk)-&gt;retrans_stamp;</div><div class='add'>+	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 elapsed, user_timeout;</div><div class='add'>+	s32 remaining;</div><div class='add'>+</div><div class='add'>+	user_timeout = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='add'>+	if (!user_timeout)</div><div class='add'>+		return icsk-&gt;icsk_rto;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!start_ts)) {</div><div class='del'>-		struct sk_buff *head = tcp_rtx_queue_head(sk);</div><div class='add'>+	elapsed = tcp_time_stamp_ts(tp) - tp-&gt;retrans_stamp;</div><div class='add'>+	if (tp-&gt;tcp_usec_ts)</div><div class='add'>+		elapsed /= USEC_PER_MSEC;</div><div class='ctx'> </div><div class='del'>-		if (!head)</div><div class='del'>-			return 0;</div><div class='del'>-		start_ts = tcp_skb_timestamp(head);</div><div class='del'>-	}</div><div class='del'>-	return start_ts;</div><div class='add'>+	remaining = user_timeout - elapsed;</div><div class='add'>+	if (remaining &lt;= 0)</div><div class='add'>+		return 1; /* user timeout has passed; fire ASAP */</div><div class='add'>+</div><div class='add'>+	return min_t(u32, icsk-&gt;icsk_rto, msecs_to_jiffies(remaining));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk)</div><div class='add'>+u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when)</div><div class='ctx'> {</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	u32 elapsed, start_ts;</div><div class='add'>+	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	u32 remaining, user_timeout;</div><div class='add'>+	s32 elapsed;</div><div class='ctx'> </div><div class='del'>-	start_ts = tcp_retransmit_stamp(sk);</div><div class='del'>-	if (!icsk-&gt;icsk_user_timeout || !start_ts)</div><div class='del'>-		return icsk-&gt;icsk_rto;</div><div class='del'>-	elapsed = tcp_time_stamp(tcp_sk(sk)) - start_ts;</div><div class='del'>-	if (elapsed &gt;= icsk-&gt;icsk_user_timeout)</div><div class='del'>-		return 1; /* user timeout has passed; fire ASAP */</div><div class='del'>-	else</div><div class='del'>-		return min_t(u32, icsk-&gt;icsk_rto, msecs_to_jiffies(icsk-&gt;icsk_user_timeout - elapsed));</div><div class='add'>+	user_timeout = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='add'>+	if (!user_timeout || !icsk-&gt;icsk_probes_tstamp)</div><div class='add'>+		return when;</div><div class='add'>+</div><div class='add'>+	elapsed = tcp_jiffies32 - icsk-&gt;icsk_probes_tstamp;</div><div class='add'>+	if (unlikely(elapsed &lt; 0))</div><div class='add'>+		elapsed = 0;</div><div class='add'>+	remaining = msecs_to_jiffies(user_timeout) - elapsed;</div><div class='add'>+	remaining = max_t(u32, remaining, TCP_TIMEOUT_MIN);</div><div class='add'>+</div><div class='add'>+	return min_t(u32, remaining, when);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -60,11 +74,7 @@ static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> static void tcp_write_err(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	sk-&gt;sk_err = sk-&gt;sk_err_soft ? : ETIMEDOUT;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='del'>-</div><div class='del'>-	tcp_write_queue_purge(sk);</div><div class='del'>-	tcp_done(sk);</div><div class='add'>+	tcp_done_with_error(sk, READ_ONCE(sk-&gt;sk_err_soft) ? : ETIMEDOUT);</div><div class='ctx'> 	__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONTIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -99,11 +109,11 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)</div><div class='ctx'> </div><div class='ctx'> 	/* If peer does not open window for long time, or did not transmit</div><div class='ctx'> 	 * anything for long time, penalize it. */</div><div class='del'>-	if ((s32)(tcp_jiffies32 - tp-&gt;lsndtime) &gt; 2*TCP_RTO_MAX || !do_reset)</div><div class='add'>+	if ((s32)(tcp_jiffies32 - tp-&gt;lsndtime) &gt; 2*tcp_rto_max(sk) || !do_reset)</div><div class='ctx'> 		shift++;</div><div class='ctx'> </div><div class='ctx'> 	/* If some dubious ICMP arrived, penalize even more. */</div><div class='del'>-	if (sk-&gt;sk_err_soft)</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_err_soft))</div><div class='ctx'> 		shift++;</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_check_oom(sk, shift)) {</div><div class='hunk'>@@ -114,7 +124,8 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)</div><div class='ctx'> 		    (!tp-&gt;snd_wnd &amp;&amp; !tp-&gt;packets_out))</div><div class='ctx'> 			do_reset = true;</div><div class='ctx'> 		if (do_reset)</div><div class='del'>-			tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='add'>+			tcp_send_active_reset(sk, GFP_ATOMIC,</div><div class='add'>+					      SK_RST_REASON_TCP_ABORT_ON_MEMORY);</div><div class='ctx'> 		tcp_done(sk);</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONMEMORY);</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -136,10 +147,10 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)</div><div class='ctx'>  */</div><div class='ctx'> static int tcp_orphan_retries(struct sock *sk, bool alive)</div><div class='ctx'> {</div><div class='del'>-	int retries = sock_net(sk)-&gt;ipv4.sysctl_tcp_orphan_retries; /* May be zero. */</div><div class='add'>+	int retries = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_orphan_retries); /* May be zero. */</div><div class='ctx'> </div><div class='ctx'> 	/* We know from an ICMP that something is wrong. */</div><div class='del'>-	if (sk-&gt;sk_err_soft &amp;&amp; !alive)</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_err_soft) &amp;&amp; !alive)</div><div class='ctx'> 		retries = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* However, if socket sent something recently, select some safe</div><div class='hunk'>@@ -156,7 +167,7 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)</div><div class='ctx'> 	int mss;</div><div class='ctx'> </div><div class='ctx'> 	/* Black hole detection */</div><div class='del'>-	if (!net-&gt;ipv4.sysctl_tcp_mtu_probing)</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_mtu_probing))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!icsk-&gt;icsk_mtup.enabled) {</div><div class='hunk'>@@ -164,14 +175,28 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)</div><div class='ctx'> 		icsk-&gt;icsk_mtup.probe_timestamp = tcp_jiffies32;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mss = tcp_mtu_to_mss(sk, icsk-&gt;icsk_mtup.search_low) &gt;&gt; 1;</div><div class='del'>-		mss = min(net-&gt;ipv4.sysctl_tcp_base_mss, mss);</div><div class='del'>-		mss = max(mss, 68 - tcp_sk(sk)-&gt;tcp_header_len);</div><div class='add'>+		mss = min(READ_ONCE(net-&gt;ipv4.sysctl_tcp_base_mss), mss);</div><div class='add'>+		mss = max(mss, READ_ONCE(net-&gt;ipv4.sysctl_tcp_mtu_probe_floor));</div><div class='add'>+		mss = max(mss, READ_ONCE(net-&gt;ipv4.sysctl_tcp_min_snd_mss));</div><div class='ctx'> 		icsk-&gt;icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);</div><div class='ctx'> 	}</div><div class='ctx'> 	tcp_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int tcp_model_timeout(struct sock *sk,</div><div class='add'>+				      unsigned int boundary,</div><div class='add'>+				      unsigned int rto_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int linear_backoff_thresh, timeout;</div><div class='ctx'> </div><div class='add'>+	linear_backoff_thresh = ilog2(tcp_rto_max(sk) / rto_base);</div><div class='add'>+	if (boundary &lt;= linear_backoff_thresh)</div><div class='add'>+		timeout = ((2 &lt;&lt; boundary) - 1) * rto_base;</div><div class='add'>+	else</div><div class='add'>+		timeout = ((2 &lt;&lt; linear_backoff_thresh) - 1) * rto_base +</div><div class='add'>+			(boundary - linear_backoff_thresh) * tcp_rto_max(sk);</div><div class='add'>+	return jiffies_to_msecs(timeout);</div><div class='add'>+}</div><div class='ctx'> /**</div><div class='ctx'>  *  retransmits_timed_out() - returns true if this connection has timed out</div><div class='ctx'>  *  @sk:       The current socket</div><div class='hunk'>@@ -189,27 +214,27 @@ static bool retransmits_timed_out(struct sock *sk,</div><div class='ctx'> 				  unsigned int boundary,</div><div class='ctx'> 				  unsigned int timeout)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int rto_base = TCP_RTO_MIN;</div><div class='del'>-	unsigned int linear_backoff_thresh, start_ts;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	unsigned int start_ts, delta;</div><div class='ctx'> </div><div class='ctx'> 	if (!inet_csk(sk)-&gt;icsk_retransmits)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	start_ts = tcp_retransmit_stamp(sk);</div><div class='del'>-	if (!start_ts)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='add'>+	start_ts = tp-&gt;retrans_stamp;</div><div class='ctx'> 	if (likely(timeout == 0)) {</div><div class='del'>-		linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);</div><div class='add'>+		unsigned int rto_base = TCP_RTO_MIN;</div><div class='ctx'> </div><div class='del'>-		if (boundary &lt;= linear_backoff_thresh)</div><div class='del'>-			timeout = ((2 &lt;&lt; boundary) - 1) * rto_base;</div><div class='del'>-		else</div><div class='del'>-			timeout = ((2 &lt;&lt; linear_backoff_thresh) - 1) * rto_base +</div><div class='del'>-				(boundary - linear_backoff_thresh) * TCP_RTO_MAX;</div><div class='del'>-		timeout = jiffies_to_msecs(timeout);</div><div class='add'>+		if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV))</div><div class='add'>+			rto_base = tcp_timeout_init(sk);</div><div class='add'>+		timeout = tcp_model_timeout(sk, boundary, rto_base);</div><div class='ctx'> 	}</div><div class='del'>-	return (tcp_time_stamp(tcp_sk(sk)) - start_ts) &gt;= timeout;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;tcp_usec_ts) {</div><div class='add'>+		/* delta maybe off up to a jiffy due to timer granularity. */</div><div class='add'>+		delta = tp-&gt;tcp_mstamp - start_ts + jiffies_to_usecs(1);</div><div class='add'>+		return (s32)(delta - timeout * USEC_PER_MSEC) &gt;= 0;</div><div class='add'>+	}</div><div class='add'>+	return (s32)(tcp_time_stamp_ts(tp) - start_ts - timeout) &gt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* A write timeout has occurred. Process the after effects. */</div><div class='hunk'>@@ -218,30 +243,32 @@ static int tcp_write_timeout(struct sock *sk)</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	bool expired, do_reset;</div><div class='del'>-	int retry_until;</div><div class='add'>+	bool expired = false, do_reset;</div><div class='add'>+	int retry_until, max_retransmits;</div><div class='ctx'> </div><div class='ctx'> 	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV)) {</div><div class='del'>-		if (icsk-&gt;icsk_retransmits) {</div><div class='del'>-			dst_negative_advice(sk);</div><div class='del'>-		} else if (!tp-&gt;syn_data &amp;&amp; !tp-&gt;syn_fastopen) {</div><div class='del'>-			sk_rethink_txhash(sk);</div><div class='del'>-		}</div><div class='del'>-		retry_until = icsk-&gt;icsk_syn_retries ? : net-&gt;ipv4.sysctl_tcp_syn_retries;</div><div class='del'>-		expired = icsk-&gt;icsk_retransmits &gt;= retry_until;</div><div class='add'>+		if (icsk-&gt;icsk_retransmits)</div><div class='add'>+			__dst_negative_advice(sk);</div><div class='add'>+		/* Paired with WRITE_ONCE() in tcp_sock_set_syncnt() */</div><div class='add'>+		retry_until = READ_ONCE(icsk-&gt;icsk_syn_retries) ? :</div><div class='add'>+			READ_ONCE(net-&gt;ipv4.sysctl_tcp_syn_retries);</div><div class='add'>+</div><div class='add'>+		max_retransmits = retry_until;</div><div class='add'>+		if (sk-&gt;sk_state == TCP_SYN_SENT)</div><div class='add'>+			max_retransmits += READ_ONCE(net-&gt;ipv4.sysctl_tcp_syn_linear_timeouts);</div><div class='add'>+</div><div class='add'>+		expired = icsk-&gt;icsk_retransmits &gt;= max_retransmits;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (retransmits_timed_out(sk, net-&gt;ipv4.sysctl_tcp_retries1, 0)) {</div><div class='add'>+		if (retransmits_timed_out(sk, READ_ONCE(net-&gt;ipv4.sysctl_tcp_retries1), 0)) {</div><div class='ctx'> 			/* Black hole detection */</div><div class='ctx'> 			tcp_mtu_probing(icsk, sk);</div><div class='ctx'> </div><div class='del'>-			dst_negative_advice(sk);</div><div class='del'>-		} else {</div><div class='del'>-			sk_rethink_txhash(sk);</div><div class='add'>+			__dst_negative_advice(sk);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		retry_until = net-&gt;ipv4.sysctl_tcp_retries2;</div><div class='add'>+		retry_until = READ_ONCE(net-&gt;ipv4.sysctl_tcp_retries2);</div><div class='ctx'> 		if (sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-			const bool alive = icsk-&gt;icsk_rto &lt; TCP_RTO_MAX;</div><div class='add'>+			const bool alive = icsk-&gt;icsk_rto &lt; tcp_rto_max(sk);</div><div class='ctx'> </div><div class='ctx'> 			retry_until = tcp_orphan_retries(sk, alive);</div><div class='ctx'> 			do_reset = alive ||</div><div class='hunk'>@@ -250,10 +277,12 @@ static int tcp_write_timeout(struct sock *sk)</div><div class='ctx'> 			if (tcp_out_of_resources(sk, do_reset))</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		}</div><div class='del'>-		expired = retransmits_timed_out(sk, retry_until,</div><div class='del'>-						icsk-&gt;icsk_user_timeout);</div><div class='ctx'> 	}</div><div class='add'>+	if (!expired)</div><div class='add'>+		expired = retransmits_timed_out(sk, retry_until,</div><div class='add'>+						READ_ONCE(icsk-&gt;icsk_user_timeout));</div><div class='ctx'> 	tcp_fastopen_active_detect_blackhole(sk, expired);</div><div class='add'>+	mptcp_active_detect_blackhole(sk, expired);</div><div class='ctx'> </div><div class='ctx'> 	if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RTO_CB_FLAG))</div><div class='ctx'> 		tcp_call_bpf_3arg(sk, BPF_SOCK_OPS_RTO_CB,</div><div class='hunk'>@@ -266,6 +295,11 @@ static int tcp_write_timeout(struct sock *sk)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sk_rethink_txhash(sk)) {</div><div class='add'>+		tp-&gt;timeout_rehash++;</div><div class='add'>+		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPTIMEOUTREHASH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -273,44 +307,49 @@ static int tcp_write_timeout(struct sock *sk)</div><div class='ctx'> void tcp_delack_timer_handler(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> </div><div class='del'>-	sk_mem_reclaim_partial(sk);</div><div class='add'>+	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)) ||</div><div class='del'>-	    !(icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER))</div><div class='del'>-		goto out;</div><div class='add'>+	/* Handling the sack compression case */</div><div class='add'>+	if (tp-&gt;compressed_ack) {</div><div class='add'>+		tcp_mstamp_refresh(tp);</div><div class='add'>+		tcp_sack_compress_send_ack(sk);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (time_after(icsk-&gt;icsk_ack.timeout, jiffies)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer, icsk-&gt;icsk_ack.timeout);</div><div class='del'>-		goto out;</div><div class='add'>+	if (!(icsk-&gt;icsk_ack.pending &amp; ICSK_ACK_TIMER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (time_after(icsk_delack_timeout(icsk), jiffies)) {</div><div class='add'>+		sk_reset_timer(sk, &amp;icsk-&gt;icsk_delack_timer,</div><div class='add'>+			       icsk_delack_timeout(icsk));</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	icsk-&gt;icsk_ack.pending &amp;= ~ICSK_ACK_TIMER;</div><div class='ctx'> </div><div class='ctx'> 	if (inet_csk_ack_scheduled(sk)) {</div><div class='del'>-		if (!icsk-&gt;icsk_ack.pingpong) {</div><div class='add'>+		if (!inet_csk_in_pingpong_mode(sk)) {</div><div class='ctx'> 			/* Delayed ACK missed: inflate ATO. */</div><div class='del'>-			icsk-&gt;icsk_ack.ato = min(icsk-&gt;icsk_ack.ato &lt;&lt; 1, icsk-&gt;icsk_rto);</div><div class='add'>+			icsk-&gt;icsk_ack.ato = min_t(u32, icsk-&gt;icsk_ack.ato &lt;&lt; 1, icsk-&gt;icsk_rto);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Delayed ACK missed: leave pingpong mode and</div><div class='ctx'> 			 * deflate ATO.</div><div class='ctx'> 			 */</div><div class='del'>-			icsk-&gt;icsk_ack.pingpong = 0;</div><div class='add'>+			inet_csk_exit_pingpong_mode(sk);</div><div class='ctx'> 			icsk-&gt;icsk_ack.ato      = TCP_ATO_MIN;</div><div class='ctx'> 		}</div><div class='del'>-		tcp_mstamp_refresh(tcp_sk(sk));</div><div class='add'>+		tcp_mstamp_refresh(tp);</div><div class='ctx'> 		tcp_send_ack(sk);</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKS);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (tcp_under_memory_pressure(sk))</div><div class='del'>-		sk_mem_reclaim(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  tcp_delack_timer() - The TCP delayed ACK timeout handler</div><div class='del'>- *  @data:  Pointer to the current socket. (gets casted to struct sock *)</div><div class='add'>+ *  @t:  Pointer to the timer. (gets casted to struct sock *)</div><div class='ctx'>  *</div><div class='ctx'>  *  This function gets (indirectly) called when the kernel timer for a TCP packet</div><div class='ctx'>  *  of this socket expires. Calls tcp_delack_timer_handler() to do the actual work.</div><div class='hunk'>@@ -320,20 +359,28 @@ out:</div><div class='ctx'> static void tcp_delack_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk =</div><div class='del'>-			from_timer(icsk, t, icsk_delack_timer);</div><div class='add'>+			timer_container_of(icsk, t, icsk_delack_timer);</div><div class='ctx'> 	struct sock *sk = &amp;icsk-&gt;icsk_inet.sk;</div><div class='ctx'> </div><div class='add'>+	/* Avoid taking socket spinlock if there is no ACK to send.</div><div class='add'>+	 * The compressed_ack check is racy, but a separate hrtimer</div><div class='add'>+	 * will take care of it eventually.</div><div class='add'>+	 */</div><div class='add'>+	if (!(smp_load_acquire(&amp;icsk-&gt;icsk_ack.pending) &amp; ICSK_ACK_TIMER) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(tcp_sk(sk)-&gt;compressed_ack))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (!sock_owned_by_user(sk)) {</div><div class='ctx'> 		tcp_delack_timer_handler(sk);</div><div class='ctx'> 	} else {</div><div class='del'>-		icsk-&gt;icsk_ack.blocked = 1;</div><div class='ctx'> 		__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);</div><div class='ctx'> 		/* deleguate our work to tcp_release_cb() */</div><div class='ctx'> 		if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &amp;sk-&gt;sk_tsq_flags))</div><div class='ctx'> 			sock_hold(sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='add'>+out:</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,10 +390,10 @@ static void tcp_probe_timer(struct sock *sk)</div><div class='ctx'> 	struct sk_buff *skb = tcp_send_head(sk);</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	int max_probes;</div><div class='del'>-	u32 start_ts;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;packets_out || !skb) {</div><div class='del'>-		icsk-&gt;icsk_probes_out = 0;</div><div class='add'>+		WRITE_ONCE(icsk-&gt;icsk_probes_out, 0);</div><div class='add'>+		icsk-&gt;icsk_probes_tstamp = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -358,16 +405,20 @@ static void tcp_probe_timer(struct sock *sk)</div><div class='ctx'> 	 * corresponding system limit. We also implement similar policy when</div><div class='ctx'> 	 * we use RTO to probe window in tcp_retransmit_timer().</div><div class='ctx'> 	 */</div><div class='del'>-	start_ts = tcp_skb_timestamp(skb);</div><div class='del'>-	if (!start_ts)</div><div class='del'>-		skb-&gt;skb_mstamp = tp-&gt;tcp_mstamp;</div><div class='del'>-	else if (icsk-&gt;icsk_user_timeout &amp;&amp;</div><div class='del'>-		 (s32)(tcp_time_stamp(tp) - start_ts) &gt; icsk-&gt;icsk_user_timeout)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	max_probes = sock_net(sk)-&gt;ipv4.sysctl_tcp_retries2;</div><div class='add'>+	if (!icsk-&gt;icsk_probes_tstamp) {</div><div class='add'>+		icsk-&gt;icsk_probes_tstamp = tcp_jiffies32;</div><div class='add'>+	} else {</div><div class='add'>+		u32 user_timeout = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='add'>+</div><div class='add'>+		if (user_timeout &amp;&amp;</div><div class='add'>+		    (s32)(tcp_jiffies32 - icsk-&gt;icsk_probes_tstamp) &gt;=</div><div class='add'>+		     msecs_to_jiffies(user_timeout))</div><div class='add'>+			goto abort;</div><div class='add'>+	}</div><div class='add'>+	max_probes = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_retries2);</div><div class='ctx'> 	if (sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-		const bool alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) &lt; TCP_RTO_MAX;</div><div class='add'>+		unsigned int rto_max = tcp_rto_max(sk);</div><div class='add'>+		const bool alive = inet_csk_rto_backoff(icsk, rto_max) &lt; rto_max;</div><div class='ctx'> </div><div class='ctx'> 		max_probes = tcp_orphan_retries(sk, alive);</div><div class='ctx'> 		if (!alive &amp;&amp; icsk-&gt;icsk_backoff &gt;= max_probes)</div><div class='hunk'>@@ -376,7 +427,7 @@ static void tcp_probe_timer(struct sock *sk)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_probes_out &gt; max_probes) {</div><div class='add'>+	if (icsk-&gt;icsk_probes_out &gt;= max_probes) {</div><div class='ctx'> abort:		tcp_write_err(sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Only send another probe if we didn't close things up. */</div><div class='hunk'>@@ -384,36 +435,87 @@ abort:		tcp_write_err(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tcp_update_rto_stats(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!icsk-&gt;icsk_retransmits) {</div><div class='add'>+		tp-&gt;total_rto_recoveries++;</div><div class='add'>+		tp-&gt;rto_stamp = tcp_time_stamp_ms(tp);</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(icsk-&gt;icsk_retransmits, icsk-&gt;icsk_retransmits + 1);</div><div class='add'>+	tp-&gt;total_rto++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Timer for Fast Open socket to retransmit SYNACK. Note that the</div><div class='ctx'>  *	sk here is the child socket, not the parent (listener) socket.</div><div class='ctx'>  */</div><div class='del'>-static void tcp_fastopen_synack_timer(struct sock *sk)</div><div class='add'>+static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	int max_retries = icsk-&gt;icsk_syn_retries ? :</div><div class='del'>-	    sock_net(sk)-&gt;ipv4.sysctl_tcp_synack_retries + 1; /* add one more retry for fastopen */</div><div class='del'>-	struct request_sock *req;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int max_retries;</div><div class='add'>+</div><div class='add'>+	tcp_syn_ack_timeout(req);</div><div class='ctx'> </div><div class='del'>-	req = tcp_sk(sk)-&gt;fastopen_rsk;</div><div class='del'>-	req-&gt;rsk_ops-&gt;syn_ack_timeout(req);</div><div class='add'>+	/* Add one more retry for fastopen.</div><div class='add'>+	 * Paired with WRITE_ONCE() in tcp_sock_set_syncnt()</div><div class='add'>+	 */</div><div class='add'>+	max_retries = READ_ONCE(icsk-&gt;icsk_syn_retries) ? :</div><div class='add'>+		READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_synack_retries) + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;num_timeout &gt;= max_retries) {</div><div class='ctx'> 		tcp_write_err(sk);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	/* Lower cwnd after certain SYNACK timeout like tcp_init_transfer() */</div><div class='add'>+	if (icsk-&gt;icsk_retransmits == 1)</div><div class='add'>+		tcp_enter_loss(sk);</div><div class='ctx'> 	/* XXX (TFO) - Unlike regular SYN-ACK retransmit, we ignore error</div><div class='ctx'> 	 * returned from rtx_syn_ack() to make it more persistent like</div><div class='ctx'> 	 * regular retransmit because if the child socket has been accepted</div><div class='ctx'> 	 * it's not good to give up too easily.</div><div class='ctx'> 	 */</div><div class='del'>-	inet_rtx_syn_ack(sk, req);</div><div class='add'>+	tcp_rtx_synack(sk, req);</div><div class='ctx'> 	req-&gt;num_timeout++;</div><div class='del'>-	icsk-&gt;icsk_retransmits++;</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-			  TCP_TIMEOUT_INIT &lt;&lt; req-&gt;num_timeout, TCP_RTO_MAX);</div><div class='add'>+	tcp_update_rto_stats(sk);</div><div class='add'>+	if (!tp-&gt;retrans_stamp)</div><div class='add'>+		tp-&gt;retrans_stamp = tcp_time_stamp_ts(tp);</div><div class='add'>+	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+			  req-&gt;timeout &lt;&lt; req-&gt;num_timeout, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool tcp_rtx_probe0_timed_out(const struct sock *sk,</div><div class='add'>+				     const struct sk_buff *skb,</div><div class='add'>+				     u32 rtx_delta)</div><div class='add'>+{</div><div class='add'>+	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	u32 user_timeout = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='add'>+	const struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	int timeout = tcp_rto_max(sk) * 2;</div><div class='add'>+	s32 rcv_delta;</div><div class='add'>+</div><div class='add'>+	if (user_timeout) {</div><div class='add'>+		/* If user application specified a TCP_USER_TIMEOUT,</div><div class='add'>+		 * it does not want win 0 packets to 'reset the timer'</div><div class='add'>+		 * while retransmits are not making progress.</div><div class='add'>+		 */</div><div class='add'>+		if (rtx_delta &gt; user_timeout)</div><div class='add'>+			return true;</div><div class='add'>+		timeout = min_t(u32, timeout, msecs_to_jiffies(user_timeout));</div><div class='add'>+	}</div><div class='add'>+	/* Note: timer interrupt might have been delayed by at least one jiffy,</div><div class='add'>+	 * and tp-&gt;rcv_tstamp might very well have been written recently.</div><div class='add'>+	 * rcv_delta can thus be negative.</div><div class='add'>+	 */</div><div class='add'>+	rcv_delta = tcp_timeout_expires(sk) - tp-&gt;rcv_tstamp;</div><div class='add'>+	if (rcv_delta &lt;= timeout)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return msecs_to_jiffies(rtx_delta) &gt; timeout;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  tcp_retransmit_timer() - The TCP retransmit timeout handler</div><div class='hunk'>@@ -422,7 +524,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk)</div><div class='ctx'>  *  This function gets called when the kernel timer for a TCP packet</div><div class='ctx'>  *  of this socket expires.</div><div class='ctx'>  *</div><div class='del'>- *  It handles retransmission, timer adjustment and other necesarry measures.</div><div class='add'>+ *  It handles retransmission, timer adjustment and other necessary measures.</div><div class='ctx'>  *</div><div class='ctx'>  *  Returns: Nothing (void)</div><div class='ctx'>  */</div><div class='hunk'>@@ -431,22 +533,27 @@ void tcp_retransmit_timer(struct sock *sk)</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;fastopen_rsk) {</div><div class='add'>+	req = rcu_dereference_protected(tp-&gt;fastopen_rsk,</div><div class='add'>+					lockdep_sock_is_held(sk));</div><div class='add'>+	if (req) {</div><div class='ctx'> 		WARN_ON_ONCE(sk-&gt;sk_state != TCP_SYN_RECV &amp;&amp;</div><div class='ctx'> 			     sk-&gt;sk_state != TCP_FIN_WAIT1);</div><div class='del'>-		tcp_fastopen_synack_timer(sk);</div><div class='add'>+		tcp_fastopen_synack_timer(sk, req);</div><div class='ctx'> 		/* Before we receive ACK to our SYN-ACK don't retransmit</div><div class='ctx'> 		 * anything else (e.g., data or FIN segments).</div><div class='ctx'> 		 */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!tp-&gt;packets_out)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(tcp_rtx_queue_empty(sk));</div><div class='add'>+	if (!tp-&gt;packets_out)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;tlp_high_seq = 0;</div><div class='add'>+	skb = tcp_rtx_queue_head(sk);</div><div class='add'>+	if (WARN_ON_ONCE(!skb))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!tp-&gt;snd_wnd &amp;&amp; !sock_flag(sk, SOCK_DEAD) &amp;&amp;</div><div class='ctx'> 	    !((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_SYN_SENT | TCPF_SYN_RECV))) {</div><div class='hunk'>@@ -456,37 +563,45 @@ void tcp_retransmit_timer(struct sock *sk)</div><div class='ctx'> 		 * we cannot allow such beasts to hang infinitely.</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+		u32 rtx_delta;</div><div class='add'>+</div><div class='add'>+		rtx_delta = tcp_time_stamp_ts(tp) - (tp-&gt;retrans_stamp ?: </div><div class='add'>+				tcp_skb_timestamp_ts(tp-&gt;tcp_usec_ts, skb));</div><div class='add'>+		if (tp-&gt;tcp_usec_ts)</div><div class='add'>+			rtx_delta /= USEC_PER_MSEC;</div><div class='add'>+</div><div class='ctx'> 		if (sk-&gt;sk_family == AF_INET) {</div><div class='del'>-			net_dbg_ratelimited("Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n",</div><div class='del'>-					    &amp;inet-&gt;inet_daddr,</div><div class='del'>-					    ntohs(inet-&gt;inet_dport),</div><div class='del'>-					    inet-&gt;inet_num,</div><div class='del'>-					    tp-&gt;snd_una, tp-&gt;snd_nxt);</div><div class='add'>+			net_dbg_ratelimited("Probing zero-window on %pI4:%u/%u, seq=%u:%u, recv %ums ago, lasting %ums\n",</div><div class='add'>+				&amp;inet-&gt;inet_daddr, ntohs(inet-&gt;inet_dport),</div><div class='add'>+				inet-&gt;inet_num, tp-&gt;snd_una, tp-&gt;snd_nxt,</div><div class='add'>+				jiffies_to_msecs(jiffies - tp-&gt;rcv_tstamp),</div><div class='add'>+				rtx_delta);</div><div class='ctx'> 		}</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 		else if (sk-&gt;sk_family == AF_INET6) {</div><div class='del'>-			net_dbg_ratelimited("Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n",</div><div class='del'>-					    &amp;sk-&gt;sk_v6_daddr,</div><div class='del'>-					    ntohs(inet-&gt;inet_dport),</div><div class='del'>-					    inet-&gt;inet_num,</div><div class='del'>-					    tp-&gt;snd_una, tp-&gt;snd_nxt);</div><div class='add'>+			net_dbg_ratelimited("Probing zero-window on %pI6:%u/%u, seq=%u:%u, recv %ums ago, lasting %ums\n",</div><div class='add'>+				&amp;sk-&gt;sk_v6_daddr, ntohs(inet-&gt;inet_dport),</div><div class='add'>+				inet-&gt;inet_num, tp-&gt;snd_una, tp-&gt;snd_nxt,</div><div class='add'>+				jiffies_to_msecs(jiffies - tp-&gt;rcv_tstamp),</div><div class='add'>+				rtx_delta);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		if (tcp_jiffies32 - tp-&gt;rcv_tstamp &gt; TCP_RTO_MAX) {</div><div class='add'>+		if (tcp_rtx_probe0_timed_out(sk, skb, rtx_delta)) {</div><div class='ctx'> 			tcp_write_err(sk);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		tcp_enter_loss(sk);</div><div class='del'>-		tcp_retransmit_skb(sk, tcp_rtx_queue_head(sk), 1);</div><div class='add'>+		tcp_retransmit_skb(sk, skb, 1);</div><div class='ctx'> 		__sk_dst_reset(sk);</div><div class='ctx'> 		goto out_reset_timer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPTIMEOUTS);</div><div class='ctx'> 	if (tcp_write_timeout(sk))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (icsk-&gt;icsk_retransmits == 0) {</div><div class='del'>-		int mib_idx;</div><div class='add'>+		int mib_idx = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (icsk-&gt;icsk_ca_state == TCP_CA_Recovery) {</div><div class='ctx'> 			if (tcp_is_sack(tp))</div><div class='hunk'>@@ -501,23 +616,21 @@ void tcp_retransmit_timer(struct sock *sk)</div><div class='ctx'> 				mib_idx = LINUX_MIB_TCPSACKFAILURES;</div><div class='ctx'> 			else</div><div class='ctx'> 				mib_idx = LINUX_MIB_TCPRENOFAILURES;</div><div class='del'>-		} else {</div><div class='del'>-			mib_idx = LINUX_MIB_TCPTIMEOUTS;</div><div class='ctx'> 		}</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), mib_idx);</div><div class='add'>+		if (mib_idx)</div><div class='add'>+			__NET_INC_STATS(sock_net(sk), mib_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tcp_enter_loss(sk);</div><div class='ctx'> </div><div class='add'>+	tcp_update_rto_stats(sk);</div><div class='ctx'> 	if (tcp_retransmit_skb(sk, tcp_rtx_queue_head(sk), 1) &gt; 0) {</div><div class='ctx'> 		/* Retransmission failed because of local congestion,</div><div class='del'>-		 * do not backoff.</div><div class='add'>+		 * Let senders fight for local resources conservatively.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!icsk-&gt;icsk_retransmits)</div><div class='del'>-			icsk-&gt;icsk_retransmits = 1;</div><div class='del'>-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-					  min(icsk-&gt;icsk_rto, TCP_RESOURCE_PROBE_INTERVAL),</div><div class='del'>-					  TCP_RTO_MAX);</div><div class='add'>+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+				     TCP_RESOURCE_PROBE_INTERVAL,</div><div class='add'>+				     false);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -536,8 +649,6 @@ void tcp_retransmit_timer(struct sock *sk)</div><div class='ctx'> 	 * implemented ftp to mars will work nicely. We will have to fix</div><div class='ctx'> 	 * the 120 second clamps though!</div><div class='ctx'> 	 */</div><div class='del'>-	icsk-&gt;icsk_backoff++;</div><div class='del'>-	icsk-&gt;icsk_retransmits++;</div><div class='ctx'> </div><div class='ctx'> out_reset_timer:</div><div class='ctx'> 	/* If stream is thin, use linear timeouts. Since 'icsk_backoff' is</div><div class='hunk'>@@ -550,25 +661,33 @@ out_reset_timer:</div><div class='ctx'> 	 * linear-timeout retransmissions into a black hole</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_ESTABLISHED &amp;&amp;</div><div class='del'>-	    (tp-&gt;thin_lto || net-&gt;ipv4.sysctl_tcp_thin_linear_timeouts) &amp;&amp;</div><div class='add'>+	    (tp-&gt;thin_lto || READ_ONCE(net-&gt;ipv4.sysctl_tcp_thin_linear_timeouts)) &amp;&amp;</div><div class='ctx'> 	    tcp_stream_is_thin(tp) &amp;&amp;</div><div class='ctx'> 	    icsk-&gt;icsk_retransmits &lt;= TCP_THIN_LINEAR_RETRIES) {</div><div class='ctx'> 		icsk-&gt;icsk_backoff = 0;</div><div class='del'>-		icsk-&gt;icsk_rto = min(__tcp_set_rto(tp), TCP_RTO_MAX);</div><div class='del'>-	} else {</div><div class='del'>-		/* Use normal (exponential) backoff */</div><div class='del'>-		icsk-&gt;icsk_rto = min(icsk-&gt;icsk_rto &lt;&lt; 1, TCP_RTO_MAX);</div><div class='add'>+		icsk-&gt;icsk_rto = clamp(__tcp_set_rto(tp),</div><div class='add'>+				       tcp_rto_min(sk),</div><div class='add'>+				       tcp_rto_max(sk));</div><div class='add'>+	} else if (sk-&gt;sk_state != TCP_SYN_SENT ||</div><div class='add'>+		   tp-&gt;total_rto &gt;</div><div class='add'>+		   READ_ONCE(net-&gt;ipv4.sysctl_tcp_syn_linear_timeouts)) {</div><div class='add'>+		/* Use normal (exponential) backoff unless linear timeouts are</div><div class='add'>+		 * activated.</div><div class='add'>+		 */</div><div class='add'>+		icsk-&gt;icsk_backoff++;</div><div class='add'>+		icsk-&gt;icsk_rto = min(icsk-&gt;icsk_rto &lt;&lt; 1, tcp_rto_max(sk));</div><div class='ctx'> 	}</div><div class='del'>-	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='del'>-				  tcp_clamp_rto_to_user_timeout(sk), TCP_RTO_MAX);</div><div class='del'>-	if (retransmits_timed_out(sk, net-&gt;ipv4.sysctl_tcp_retries1 + 1, 0))</div><div class='add'>+	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,</div><div class='add'>+			     tcp_clamp_rto_to_user_timeout(sk), false);</div><div class='add'>+	if (retransmits_timed_out(sk, READ_ONCE(net-&gt;ipv4.sysctl_tcp_retries1) + 1, 0))</div><div class='ctx'> 		__sk_dst_reset(sk);</div><div class='ctx'> </div><div class='ctx'> out:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with bottom-half processing disabled.</div><div class='del'>-   Called by tcp_write_timer() */</div><div class='add'>+ * Called by tcp_write_timer() and tcp_release_cb().</div><div class='add'>+ */</div><div class='ctx'> void tcp_write_timer_handler(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='hunk'>@@ -576,13 +695,13 @@ void tcp_write_timer_handler(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN)) ||</div><div class='ctx'> 	    !icsk-&gt;icsk_pending)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (time_after(icsk-&gt;icsk_timeout, jiffies)) {</div><div class='del'>-		sk_reset_timer(sk, &amp;icsk-&gt;icsk_retransmit_timer, icsk-&gt;icsk_timeout);</div><div class='del'>-		goto out;</div><div class='add'>+	if (time_after(tcp_timeout_expires(sk), jiffies)) {</div><div class='add'>+		sk_reset_timer(sk, &amp;sk-&gt;tcp_retransmit_timer,</div><div class='add'>+			       tcp_timeout_expires(sk));</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	tcp_mstamp_refresh(tcp_sk(sk));</div><div class='ctx'> 	event = icsk-&gt;icsk_pending;</div><div class='ctx'> </div><div class='hunk'>@@ -594,24 +713,23 @@ void tcp_write_timer_handler(struct sock *sk)</div><div class='ctx'> 		tcp_send_loss_probe(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICSK_TIME_RETRANS:</div><div class='del'>-		icsk-&gt;icsk_pending = 0;</div><div class='add'>+		smp_store_release(&amp;icsk-&gt;icsk_pending, 0);</div><div class='ctx'> 		tcp_retransmit_timer(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICSK_TIME_PROBE0:</div><div class='del'>-		icsk-&gt;icsk_pending = 0;</div><div class='add'>+		smp_store_release(&amp;icsk-&gt;icsk_pending, 0);</div><div class='ctx'> 		tcp_probe_timer(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_write_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_connection_sock *icsk =</div><div class='del'>-			from_timer(icsk, t, icsk_retransmit_timer);</div><div class='del'>-	struct sock *sk = &amp;icsk-&gt;icsk_inet.sk;</div><div class='add'>+	struct sock *sk = timer_container_of(sk, t, tcp_retransmit_timer);</div><div class='add'>+</div><div class='add'>+	/* Avoid locking the socket when there is no pending event. */</div><div class='add'>+	if (!smp_load_acquire(&amp;inet_csk(sk)-&gt;icsk_pending))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (!sock_owned_by_user(sk)) {</div><div class='hunk'>@@ -622,6 +740,7 @@ static void tcp_write_timer(struct timer_list *t)</div><div class='ctx'> 			sock_hold(sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='add'>+out:</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +750,16 @@ void tcp_syn_ack_timeout(const struct request_sock *req)</div><div class='ctx'> </div><div class='ctx'> 	__NET_INC_STATS(net, LINUX_MIB_TCPTIMEOUTS);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tcp_syn_ack_timeout);</div><div class='add'>+</div><div class='add'>+void tcp_reset_keepalive_timer(struct sock *sk, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	sk_reset_timer(sk, &amp;inet_csk(sk)-&gt;icsk_keepalive_timer, jiffies + len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_delete_keepalive_timer(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	sk_stop_timer(sk, &amp;inet_csk(sk)-&gt;icsk_keepalive_timer);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void tcp_set_keepalive(struct sock *sk, int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -639,17 +767,17 @@ void tcp_set_keepalive(struct sock *sk, int val)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp;&amp; !sock_flag(sk, SOCK_KEEPOPEN))</div><div class='del'>-		inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tcp_sk(sk)));</div><div class='add'>+		tcp_reset_keepalive_timer(sk, keepalive_time_when(tcp_sk(sk)));</div><div class='ctx'> 	else if (!val)</div><div class='del'>-		inet_csk_delete_keepalive_timer(sk);</div><div class='add'>+		tcp_delete_keepalive_timer(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tcp_set_keepalive);</div><div class='del'>-</div><div class='add'>+EXPORT_IPV6_MOD_GPL(tcp_set_keepalive);</div><div class='ctx'> </div><div class='del'>-static void tcp_keepalive_timer (struct timer_list *t)</div><div class='add'>+static void tcp_keepalive_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = from_timer(sk, t, sk_timer);</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+	struct inet_connection_sock *icsk =</div><div class='add'>+		timer_container_of(icsk, t, icsk_keepalive_timer);</div><div class='add'>+	struct sock *sk = &amp;icsk-&gt;icsk_inet.sk;</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	u32 elapsed;</div><div class='ctx'> </div><div class='hunk'>@@ -657,7 +785,7 @@ static void tcp_keepalive_timer (struct timer_list *t)</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (sock_owned_by_user(sk)) {</div><div class='ctx'> 		/* Try again later. */</div><div class='del'>-		inet_csk_reset_keepalive_timer (sk, HZ/20);</div><div class='add'>+		tcp_reset_keepalive_timer(sk, HZ/20);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -668,7 +796,7 @@ static void tcp_keepalive_timer (struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	tcp_mstamp_refresh(tp);</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_FIN_WAIT2 &amp;&amp; sock_flag(sk, SOCK_DEAD)) {</div><div class='del'>-		if (tp-&gt;linger2 &gt;= 0) {</div><div class='add'>+		if (READ_ONCE(tp-&gt;linger2) &gt;= 0) {</div><div class='ctx'> 			const int tmo = tcp_fin_time(sk) - TCP_TIMEWAIT_LEN;</div><div class='ctx'> </div><div class='ctx'> 			if (tmo &gt; 0) {</div><div class='hunk'>@@ -676,7 +804,7 @@ static void tcp_keepalive_timer (struct timer_list *t)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='add'>+		tcp_send_active_reset(sk, GFP_ATOMIC, SK_RST_REASON_TCP_STATE);</div><div class='ctx'> 		goto death;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -693,20 +821,23 @@ static void tcp_keepalive_timer (struct timer_list *t)</div><div class='ctx'> 	elapsed = keepalive_time_elapsed(tp);</div><div class='ctx'> </div><div class='ctx'> 	if (elapsed &gt;= keepalive_time_when(tp)) {</div><div class='add'>+		u32 user_timeout = READ_ONCE(icsk-&gt;icsk_user_timeout);</div><div class='add'>+</div><div class='ctx'> 		/* If the TCP_USER_TIMEOUT option is enabled, use that</div><div class='ctx'> 		 * to determine when to timeout instead.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((icsk-&gt;icsk_user_timeout != 0 &amp;&amp;</div><div class='del'>-		    elapsed &gt;= msecs_to_jiffies(icsk-&gt;icsk_user_timeout) &amp;&amp;</div><div class='add'>+		if ((user_timeout != 0 &amp;&amp;</div><div class='add'>+		    elapsed &gt;= msecs_to_jiffies(user_timeout) &amp;&amp;</div><div class='ctx'> 		    icsk-&gt;icsk_probes_out &gt; 0) ||</div><div class='del'>-		    (icsk-&gt;icsk_user_timeout == 0 &amp;&amp;</div><div class='add'>+		    (user_timeout == 0 &amp;&amp;</div><div class='ctx'> 		    icsk-&gt;icsk_probes_out &gt;= keepalive_probes(tp))) {</div><div class='del'>-			tcp_send_active_reset(sk, GFP_ATOMIC);</div><div class='add'>+			tcp_send_active_reset(sk, GFP_ATOMIC,</div><div class='add'>+					      SK_RST_REASON_TCP_KEEPALIVE_TIMEOUT);</div><div class='ctx'> 			tcp_write_err(sk);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (tcp_write_wakeup(sk, LINUX_MIB_TCPKEEPALIVE) &lt;= 0) {</div><div class='del'>-			icsk-&gt;icsk_probes_out++;</div><div class='add'>+			WRITE_ONCE(icsk-&gt;icsk_probes_out, icsk-&gt;icsk_probes_out + 1);</div><div class='ctx'> 			elapsed = keepalive_intvl_when(tp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* If keepalive was lost due to local congestion,</div><div class='hunk'>@@ -719,10 +850,8 @@ static void tcp_keepalive_timer (struct timer_list *t)</div><div class='ctx'> 		elapsed = keepalive_time_when(tp) - elapsed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='del'>-</div><div class='ctx'> resched:</div><div class='del'>-	inet_csk_reset_keepalive_timer (sk, elapsed);</div><div class='add'>+	tcp_reset_keepalive_timer(sk, elapsed);</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> death:</div><div class='hunk'>@@ -740,8 +869,15 @@ static enum hrtimer_restart tcp_compressed_ack_kick(struct hrtimer *timer)</div><div class='ctx'> </div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (!sock_owned_by_user(sk)) {</div><div class='del'>-		if (tp-&gt;compressed_ack)</div><div class='add'>+		if (tp-&gt;compressed_ack) {</div><div class='add'>+			/* Since we have to send one ack finally,</div><div class='add'>+			 * subtract one from tp-&gt;compressed_ack to keep</div><div class='add'>+			 * LINUX_MIB_TCPACKCOMPRESSED accurate.</div><div class='add'>+			 */</div><div class='add'>+			tp-&gt;compressed_ack--;</div><div class='add'>+			tcp_mstamp_refresh(tp);</div><div class='ctx'> 			tcp_send_ack(sk);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED,</div><div class='ctx'> 				      &amp;sk-&gt;sk_tsq_flags))</div><div class='hunk'>@@ -758,11 +894,9 @@ void tcp_init_xmit_timers(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	inet_csk_init_xmit_timers(sk, &amp;tcp_write_timer, &amp;tcp_delack_timer,</div><div class='ctx'> 				  &amp;tcp_keepalive_timer);</div><div class='del'>-	hrtimer_init(&amp;tcp_sk(sk)-&gt;pacing_timer, CLOCK_MONOTONIC,</div><div class='del'>-		     HRTIMER_MODE_ABS_PINNED_SOFT);</div><div class='del'>-	tcp_sk(sk)-&gt;pacing_timer.function = tcp_pace_kick;</div><div class='add'>+	hrtimer_setup(&amp;tcp_sk(sk)-&gt;pacing_timer, tcp_pace_kick, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_ABS_PINNED_SOFT);</div><div class='ctx'> </div><div class='del'>-	hrtimer_init(&amp;tcp_sk(sk)-&gt;compressed_ack_timer, CLOCK_MONOTONIC,</div><div class='del'>-		     HRTIMER_MODE_REL_PINNED_SOFT);</div><div class='del'>-	tcp_sk(sk)-&gt;compressed_ack_timer.function = tcp_compressed_ack_kick;</div><div class='add'>+	hrtimer_setup(&amp;tcp_sk(sk)-&gt;compressed_ack_timer, tcp_compressed_ack_kick, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL_PINNED_SOFT);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_ulp.c b/net/ipv4/tcp_ulp.c<br/>index a5995bb2eaca..2aa442128630 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_ulp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_ulp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_ulp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_ulp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Pluggable TCP upper layer protocol support.</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,7 +7,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include&lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -21,7 +22,8 @@ static struct tcp_ulp_ops *tcp_ulp_find(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_ulp_ops *e;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(e, &amp;tcp_ulp_list, list) {</div><div class='add'>+	list_for_each_entry_rcu(e, &amp;tcp_ulp_list, list,</div><div class='add'>+				lockdep_is_held(&amp;tcp_ulp_list_lock)) {</div><div class='ctx'> 		if (strcmp(e-&gt;name, name) == 0)</div><div class='ctx'> 			return e;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -29,18 +31,6 @@ static struct tcp_ulp_ops *tcp_ulp_find(const char *name)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct tcp_ulp_ops *tcp_ulp_find_id(const int ulp)</div><div class='del'>-{</div><div class='del'>-	struct tcp_ulp_ops *e;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(e, &amp;tcp_ulp_list, list) {</div><div class='del'>-		if (e-&gt;uid == ulp)</div><div class='del'>-			return e;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct tcp_ulp_ops *__tcp_ulp_find_autoload(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcp_ulp_ops *ulp = NULL;</div><div class='hunk'>@@ -63,18 +53,6 @@ static const struct tcp_ulp_ops *__tcp_ulp_find_autoload(const char *name)</div><div class='ctx'> 	return ulp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct tcp_ulp_ops *__tcp_ulp_lookup(const int uid)</div><div class='del'>-{</div><div class='del'>-	const struct tcp_ulp_ops *ulp;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ulp = tcp_ulp_find_id(uid);</div><div class='del'>-	if (!ulp || !try_module_get(ulp-&gt;owner))</div><div class='del'>-		ulp = NULL;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return ulp;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Attach new upper layer protocol to the list</div><div class='ctx'>  * of available protocols.</div><div class='ctx'>  */</div><div class='hunk'>@@ -115,14 +93,30 @@ void tcp_get_available_ulp(char *buf, size_t maxlen)</div><div class='ctx'> 		offs += snprintf(buf + offs, maxlen - offs,</div><div class='ctx'> 				 "%s%s",</div><div class='ctx'> 				 offs == 0 ? "" : " ", ulp_ops-&gt;name);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(offs &gt;= maxlen))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tcp_update_ulp(struct sock *sk, struct proto *proto,</div><div class='add'>+		    void (*write_space)(struct sock *sk))</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+	if (icsk-&gt;icsk_ulp_ops-&gt;update)</div><div class='add'>+		icsk-&gt;icsk_ulp_ops-&gt;update(sk, proto, write_space);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void tcp_cleanup_ulp(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> </div><div class='add'>+	/* No sock_owned_by_me() check here as at the time the</div><div class='add'>+	 * stack calls this function, the socket is dead and</div><div class='add'>+	 * about to be destroyed.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!icsk-&gt;icsk_ulp_ops)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -133,54 +127,42 @@ void tcp_cleanup_ulp(struct sock *sk)</div><div class='ctx'> 	icsk-&gt;icsk_ulp_ops = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Change upper layer protocol for socket */</div><div class='del'>-int tcp_set_ulp(struct sock *sk, const char *name)</div><div class='add'>+static int __tcp_set_ulp(struct sock *sk, const struct tcp_ulp_ops *ulp_ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	const struct tcp_ulp_ops *ulp_ops;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='add'>+	err = -EEXIST;</div><div class='ctx'> 	if (icsk-&gt;icsk_ulp_ops)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+		goto out_err;</div><div class='ctx'> </div><div class='del'>-	ulp_ops = __tcp_ulp_find_autoload(name);</div><div class='del'>-	if (!ulp_ops)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (sk-&gt;sk_socket)</div><div class='add'>+		clear_bit(SOCK_SUPPORT_ZC, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (!ulp_ops-&gt;user_visible) {</div><div class='del'>-		module_put(ulp_ops-&gt;owner);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='add'>+	err = -ENOTCONN;</div><div class='add'>+	if (!ulp_ops-&gt;clone &amp;&amp; sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	err = ulp_ops-&gt;init(sk);</div><div class='del'>-	if (err) {</div><div class='del'>-		module_put(ulp_ops-&gt;owner);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_ulp_ops = ulp_ops;</div><div class='ctx'> 	return 0;</div><div class='add'>+out_err:</div><div class='add'>+	module_put(ulp_ops-&gt;owner);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tcp_set_ulp_id(struct sock *sk, int ulp)</div><div class='add'>+int tcp_set_ulp(struct sock *sk, const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='ctx'> 	const struct tcp_ulp_ops *ulp_ops;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_ulp_ops)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+	sock_owned_by_me(sk);</div><div class='ctx'> </div><div class='del'>-	ulp_ops = __tcp_ulp_lookup(ulp);</div><div class='add'>+	ulp_ops = __tcp_ulp_find_autoload(name);</div><div class='ctx'> 	if (!ulp_ops)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	err = ulp_ops-&gt;init(sk);</div><div class='del'>-	if (err) {</div><div class='del'>-		module_put(ulp_ops-&gt;owner);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icsk-&gt;icsk_ulp_ops = ulp_ops;</div><div class='del'>-	return 0;</div><div class='add'>+	return __tcp_set_ulp(sk, ulp_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c<br/>index ee113ff15fd0..786848ad37ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_vegas.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_vegas.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_vegas.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_vegas.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP Vegas congestion control</div><div class='ctx'>  *</div><div class='hunk'>@@ -158,7 +159,7 @@ EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event);</div><div class='ctx'> </div><div class='ctx'> static inline u32 tcp_vegas_ssthresh(struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='del'>-	return  min(tp-&gt;snd_ssthresh, tp-&gt;snd_cwnd);</div><div class='add'>+	return  min(tp-&gt;snd_ssthresh, tcp_snd_cwnd(tp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='hunk'>@@ -216,14 +217,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 			 * This is:</div><div class='ctx'> 			 *     (actual rate in segments) * baseRTT</div><div class='ctx'> 			 */</div><div class='del'>-			target_cwnd = (u64)tp-&gt;snd_cwnd * vegas-&gt;baseRTT;</div><div class='add'>+			target_cwnd = (u64)tcp_snd_cwnd(tp) * vegas-&gt;baseRTT;</div><div class='ctx'> 			do_div(target_cwnd, rtt);</div><div class='ctx'> </div><div class='ctx'> 			/* Calculate the difference between the window we had,</div><div class='ctx'> 			 * and the window we would like to have. This quantity</div><div class='ctx'> 			 * is the "Diff" from the Arizona Vegas papers.</div><div class='ctx'> 			 */</div><div class='del'>-			diff = tp-&gt;snd_cwnd * (rtt-vegas-&gt;baseRTT) / vegas-&gt;baseRTT;</div><div class='add'>+			diff = tcp_snd_cwnd(tp) * (rtt-vegas-&gt;baseRTT) / vegas-&gt;baseRTT;</div><div class='ctx'> </div><div class='ctx'> 			if (diff &gt; gamma &amp;&amp; tcp_in_slow_start(tp)) {</div><div class='ctx'> 				/* Going too fast. Time to slow down</div><div class='hunk'>@@ -237,7 +238,8 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 				 * truncation robs us of full link</div><div class='ctx'> 				 * utilization.</div><div class='ctx'> 				 */</div><div class='del'>-				tp-&gt;snd_cwnd = min(tp-&gt;snd_cwnd, (u32)target_cwnd+1);</div><div class='add'>+				tcp_snd_cwnd_set(tp, min(tcp_snd_cwnd(tp),</div><div class='add'>+							 (u32)target_cwnd + 1));</div><div class='ctx'> 				tp-&gt;snd_ssthresh = tcp_vegas_ssthresh(tp);</div><div class='ctx'> </div><div class='ctx'> 			} else if (tcp_in_slow_start(tp)) {</div><div class='hunk'>@@ -253,14 +255,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 					/* The old window was too fast, so</div><div class='ctx'> 					 * we slow down.</div><div class='ctx'> 					 */</div><div class='del'>-					tp-&gt;snd_cwnd--;</div><div class='add'>+					tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) - 1);</div><div class='ctx'> 					tp-&gt;snd_ssthresh</div><div class='ctx'> 						= tcp_vegas_ssthresh(tp);</div><div class='ctx'> 				} else if (diff &lt; alpha) {</div><div class='ctx'> 					/* We don't have enough extra packets</div><div class='ctx'> 					 * in the network, so speed up.</div><div class='ctx'> 					 */</div><div class='del'>-					tp-&gt;snd_cwnd++;</div><div class='add'>+					tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* Sending just as fast as we</div><div class='ctx'> 					 * should be.</div><div class='hunk'>@@ -268,10 +270,10 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (tp-&gt;snd_cwnd &lt; 2)</div><div class='del'>-				tp-&gt;snd_cwnd = 2;</div><div class='del'>-			else if (tp-&gt;snd_cwnd &gt; tp-&gt;snd_cwnd_clamp)</div><div class='del'>-				tp-&gt;snd_cwnd = tp-&gt;snd_cwnd_clamp;</div><div class='add'>+			if (tcp_snd_cwnd(tp) &lt; 2)</div><div class='add'>+				tcp_snd_cwnd_set(tp, 2);</div><div class='add'>+			else if (tcp_snd_cwnd(tp) &gt; tp-&gt;snd_cwnd_clamp)</div><div class='add'>+				tcp_snd_cwnd_set(tp, tp-&gt;snd_cwnd_clamp);</div><div class='ctx'> </div><div class='ctx'> 			tp-&gt;snd_ssthresh = tcp_current_ssthresh(sk);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -292,10 +294,10 @@ size_t tcp_vegas_get_info(struct sock *sk, u32 ext, int *attr,</div><div class='ctx'> 	const struct vegas *ca = inet_csk_ca(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (ext &amp; (1 &lt;&lt; (INET_DIAG_VEGASINFO - 1))) {</div><div class='del'>-		info-&gt;vegas.tcpv_enabled = ca-&gt;doing_vegas_now,</div><div class='del'>-		info-&gt;vegas.tcpv_rttcnt = ca-&gt;cntRTT,</div><div class='del'>-		info-&gt;vegas.tcpv_rtt = ca-&gt;baseRTT,</div><div class='del'>-		info-&gt;vegas.tcpv_minrtt = ca-&gt;minRTT,</div><div class='add'>+		info-&gt;vegas.tcpv_enabled = ca-&gt;doing_vegas_now;</div><div class='add'>+		info-&gt;vegas.tcpv_rttcnt = ca-&gt;cntRTT;</div><div class='add'>+		info-&gt;vegas.tcpv_rtt = ca-&gt;baseRTT;</div><div class='add'>+		info-&gt;vegas.tcpv_minrtt = ca-&gt;minRTT;</div><div class='ctx'> </div><div class='ctx'> 		*attr = INET_DIAG_VEGASINFO;</div><div class='ctx'> 		return sizeof(struct tcpvegas_info);</div><div class='head'>diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c<br/>index 6fcf482d611b..366ff6f214b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_veno.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_veno.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_veno.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_veno.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP Veno congestion control</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,7 +7,7 @@</div><div class='ctx'>  *    "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks."</div><div class='ctx'>  *    IEEE Journal on Selected Areas in Communication,</div><div class='ctx'>  *    Feb. 2003.</div><div class='del'>- * 	See http://www.ie.cuhk.edu.hk/fileadmin/staff_upload/soung/Journal/J3.pdf</div><div class='add'>+ * 	See https://www.ie.cuhk.edu.hk/fileadmin/staff_upload/soung/Journal/J3.pdf</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -145,42 +146,45 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> </div><div class='ctx'> 		rtt = veno-&gt;minrtt;</div><div class='ctx'> </div><div class='del'>-		target_cwnd = (u64)tp-&gt;snd_cwnd * veno-&gt;basertt;</div><div class='add'>+		target_cwnd = (u64)tcp_snd_cwnd(tp) * veno-&gt;basertt;</div><div class='ctx'> 		target_cwnd &lt;&lt;= V_PARAM_SHIFT;</div><div class='ctx'> 		do_div(target_cwnd, rtt);</div><div class='ctx'> </div><div class='del'>-		veno-&gt;diff = (tp-&gt;snd_cwnd &lt;&lt; V_PARAM_SHIFT) - target_cwnd;</div><div class='add'>+		veno-&gt;diff = (tcp_snd_cwnd(tp) &lt;&lt; V_PARAM_SHIFT) - target_cwnd;</div><div class='ctx'> </div><div class='ctx'> 		if (tcp_in_slow_start(tp)) {</div><div class='del'>-			/* Slow start.  */</div><div class='del'>-			tcp_slow_start(tp, acked);</div><div class='add'>+			/* Slow start. */</div><div class='add'>+			acked = tcp_slow_start(tp, acked);</div><div class='add'>+			if (!acked)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Congestion avoidance. */</div><div class='add'>+		if (veno-&gt;diff &lt; beta) {</div><div class='add'>+			/* In the "non-congestive state", increase cwnd</div><div class='add'>+			 * every rtt.</div><div class='add'>+			 */</div><div class='add'>+			tcp_cong_avoid_ai(tp, tcp_snd_cwnd(tp), acked);</div><div class='ctx'> 		} else {</div><div class='del'>-			/* Congestion avoidance. */</div><div class='del'>-			if (veno-&gt;diff &lt; beta) {</div><div class='del'>-				/* In the "non-congestive state", increase cwnd</div><div class='del'>-				 *  every rtt.</div><div class='del'>-				 */</div><div class='del'>-				tcp_cong_avoid_ai(tp, tp-&gt;snd_cwnd, 1);</div><div class='del'>-			} else {</div><div class='del'>-				/* In the "congestive state", increase cwnd</div><div class='del'>-				 * every other rtt.</div><div class='del'>-				 */</div><div class='del'>-				if (tp-&gt;snd_cwnd_cnt &gt;= tp-&gt;snd_cwnd) {</div><div class='del'>-					if (veno-&gt;inc &amp;&amp;</div><div class='del'>-					    tp-&gt;snd_cwnd &lt; tp-&gt;snd_cwnd_clamp) {</div><div class='del'>-						tp-&gt;snd_cwnd++;</div><div class='del'>-						veno-&gt;inc = 0;</div><div class='del'>-					} else</div><div class='del'>-						veno-&gt;inc = 1;</div><div class='del'>-					tp-&gt;snd_cwnd_cnt = 0;</div><div class='add'>+			/* In the "congestive state", increase cwnd</div><div class='add'>+			 * every other rtt.</div><div class='add'>+			 */</div><div class='add'>+			if (tp-&gt;snd_cwnd_cnt &gt;= tcp_snd_cwnd(tp)) {</div><div class='add'>+				if (veno-&gt;inc &amp;&amp;</div><div class='add'>+				    tcp_snd_cwnd(tp) &lt; tp-&gt;snd_cwnd_clamp) {</div><div class='add'>+					tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) + 1);</div><div class='add'>+					veno-&gt;inc = 0;</div><div class='ctx'> 				} else</div><div class='del'>-					tp-&gt;snd_cwnd_cnt++;</div><div class='del'>-			}</div><div class='add'>+					veno-&gt;inc = 1;</div><div class='add'>+				tp-&gt;snd_cwnd_cnt = 0;</div><div class='add'>+			} else</div><div class='add'>+				tp-&gt;snd_cwnd_cnt += acked;</div><div class='ctx'> 		}</div><div class='del'>-		if (tp-&gt;snd_cwnd &lt; 2)</div><div class='del'>-			tp-&gt;snd_cwnd = 2;</div><div class='del'>-		else if (tp-&gt;snd_cwnd &gt; tp-&gt;snd_cwnd_clamp)</div><div class='del'>-			tp-&gt;snd_cwnd = tp-&gt;snd_cwnd_clamp;</div><div class='add'>+done:</div><div class='add'>+		if (tcp_snd_cwnd(tp) &lt; 2)</div><div class='add'>+			tcp_snd_cwnd_set(tp, 2);</div><div class='add'>+		else if (tcp_snd_cwnd(tp) &gt; tp-&gt;snd_cwnd_clamp)</div><div class='add'>+			tcp_snd_cwnd_set(tp, tp-&gt;snd_cwnd_clamp);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Wipe the slate clean for the next rtt. */</div><div class='ctx'> 	/* veno-&gt;cntrtt = 0; */</div><div class='hunk'>@@ -195,10 +199,10 @@ static u32 tcp_veno_ssthresh(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (veno-&gt;diff &lt; beta)</div><div class='ctx'> 		/* in "non-congestive state", cut cwnd by 1/5 */</div><div class='del'>-		return max(tp-&gt;snd_cwnd * 4 / 5, 2U);</div><div class='add'>+		return max(tcp_snd_cwnd(tp) * 4 / 5, 2U);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* in "congestive state", cut cwnd by 1/2 */</div><div class='del'>-		return max(tp-&gt;snd_cwnd &gt;&gt; 1U, 2U);</div><div class='add'>+		return max(tcp_snd_cwnd(tp) &gt;&gt; 1U, 2U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_veno __read_mostly = {</div><div class='head'>diff --git a/net/ipv4/tcp_westwood.c b/net/ipv4/tcp_westwood.c<br/>index bec9cafbe3f9..c6e97141eef2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_westwood.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_westwood.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_westwood.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_westwood.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TCP Westwood+: end-to-end bandwidth estimation for TCP</div><div class='ctx'>  *</div><div class='hunk'>@@ -243,7 +244,8 @@ static void tcp_westwood_event(struct sock *sk, enum tcp_ca_event event)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case CA_EVENT_COMPLETE_CWR:</div><div class='del'>-		tp-&gt;snd_cwnd = tp-&gt;snd_ssthresh = tcp_westwood_bw_rttmin(sk);</div><div class='add'>+		tp-&gt;snd_ssthresh = tcp_westwood_bw_rttmin(sk);</div><div class='add'>+		tcp_snd_cwnd_set(tp, tp-&gt;snd_ssthresh);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CA_EVENT_LOSS:</div><div class='ctx'> 		tp-&gt;snd_ssthresh = tcp_westwood_bw_rttmin(sk);</div><div class='head'>diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c<br/>index 96e829b2e2fc..18b07ff5d20e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_yeah.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tcp_yeah.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tcp_yeah.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tcp_yeah.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  *   YeAH TCP</div><div class='hunk'>@@ -35,8 +36,6 @@ struct yeah {</div><div class='ctx'> </div><div class='ctx'> 	u32 reno_count;</div><div class='ctx'> 	u32 fast_count;</div><div class='del'>-</div><div class='del'>-	u32 pkts_acked;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void tcp_yeah_init(struct sock *sk)</div><div class='hunk'>@@ -56,18 +55,6 @@ static void tcp_yeah_init(struct sock *sk)</div><div class='ctx'> 	tp-&gt;snd_cwnd_clamp = min_t(u32, tp-&gt;snd_cwnd_clamp, 0xffffffff/128);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_yeah_pkts_acked(struct sock *sk,</div><div class='del'>-				const struct ack_sample *sample)</div><div class='del'>-{</div><div class='del'>-	const struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct yeah *yeah = inet_csk_ca(sk);</div><div class='del'>-</div><div class='del'>-	if (icsk-&gt;icsk_ca_state == TCP_CA_Open)</div><div class='del'>-		yeah-&gt;pkts_acked = sample-&gt;pkts_acked;</div><div class='del'>-</div><div class='del'>-	tcp_vegas_pkts_acked(sk, sample);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_sock *tp = tcp_sk(sk);</div><div class='hunk'>@@ -76,24 +63,19 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	if (!tcp_is_cwnd_limited(sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (tcp_in_slow_start(tp))</div><div class='del'>-		tcp_slow_start(tp, acked);</div><div class='add'>+	if (tcp_in_slow_start(tp)) {</div><div class='add'>+		acked = tcp_slow_start(tp, acked);</div><div class='add'>+		if (!acked)</div><div class='add'>+			goto do_vegas;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	else if (!yeah-&gt;doing_reno_now) {</div><div class='add'>+	if (!yeah-&gt;doing_reno_now) {</div><div class='ctx'> 		/* Scalable */</div><div class='del'>-</div><div class='del'>-		tp-&gt;snd_cwnd_cnt += yeah-&gt;pkts_acked;</div><div class='del'>-		if (tp-&gt;snd_cwnd_cnt &gt; min(tp-&gt;snd_cwnd, TCP_SCALABLE_AI_CNT)) {</div><div class='del'>-			if (tp-&gt;snd_cwnd &lt; tp-&gt;snd_cwnd_clamp)</div><div class='del'>-				tp-&gt;snd_cwnd++;</div><div class='del'>-			tp-&gt;snd_cwnd_cnt = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		yeah-&gt;pkts_acked = 1;</div><div class='del'>-</div><div class='add'>+		tcp_cong_avoid_ai(tp, min(tcp_snd_cwnd(tp), TCP_SCALABLE_AI_CNT),</div><div class='add'>+				  acked);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Reno */</div><div class='del'>-		tcp_cong_avoid_ai(tp, tp-&gt;snd_cwnd, 1);</div><div class='add'>+		tcp_cong_avoid_ai(tp, tcp_snd_cwnd(tp), acked);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The key players are v_vegas.beg_snd_una and v_beg_snd_nxt.</div><div class='hunk'>@@ -117,7 +99,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 	 * of bytes we send in an RTT is often less than our cwnd will allow.</div><div class='ctx'> 	 * So we keep track of our cwnd separately, in v_beg_snd_cwnd.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='add'>+do_vegas:</div><div class='ctx'> 	if (after(ack, yeah-&gt;vegas.beg_snd_nxt)) {</div><div class='ctx'> 		/* We do the Vegas calculations only if we got enough RTT</div><div class='ctx'> 		 * samples that we can be reasonably sure that we got</div><div class='hunk'>@@ -148,7 +130,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 			/* Compute excess number of packets above bandwidth</div><div class='ctx'> 			 * Avoid doing full 64 bit divide.</div><div class='ctx'> 			 */</div><div class='del'>-			bw = tp-&gt;snd_cwnd;</div><div class='add'>+			bw = tcp_snd_cwnd(tp);</div><div class='ctx'> 			bw *= rtt - yeah-&gt;vegas.baseRTT;</div><div class='ctx'> 			do_div(bw, rtt);</div><div class='ctx'> 			queue = bw;</div><div class='hunk'>@@ -156,20 +138,20 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 			if (queue &gt; TCP_YEAH_ALPHA ||</div><div class='ctx'> 			    rtt - yeah-&gt;vegas.baseRTT &gt; (yeah-&gt;vegas.baseRTT / TCP_YEAH_PHY)) {</div><div class='ctx'> 				if (queue &gt; TCP_YEAH_ALPHA &amp;&amp;</div><div class='del'>-				    tp-&gt;snd_cwnd &gt; yeah-&gt;reno_count) {</div><div class='add'>+				    tcp_snd_cwnd(tp) &gt; yeah-&gt;reno_count) {</div><div class='ctx'> 					u32 reduction = min(queue / TCP_YEAH_GAMMA ,</div><div class='del'>-							    tp-&gt;snd_cwnd &gt;&gt; TCP_YEAH_EPSILON);</div><div class='add'>+							    tcp_snd_cwnd(tp) &gt;&gt; TCP_YEAH_EPSILON);</div><div class='ctx'> </div><div class='del'>-					tp-&gt;snd_cwnd -= reduction;</div><div class='add'>+					tcp_snd_cwnd_set(tp, tcp_snd_cwnd(tp) - reduction);</div><div class='ctx'> </div><div class='del'>-					tp-&gt;snd_cwnd = max(tp-&gt;snd_cwnd,</div><div class='del'>-							   yeah-&gt;reno_count);</div><div class='add'>+					tcp_snd_cwnd_set(tp, max(tcp_snd_cwnd(tp),</div><div class='add'>+								 yeah-&gt;reno_count));</div><div class='ctx'> </div><div class='del'>-					tp-&gt;snd_ssthresh = tp-&gt;snd_cwnd;</div><div class='add'>+					tp-&gt;snd_ssthresh = tcp_snd_cwnd(tp);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (yeah-&gt;reno_count &lt;= 2)</div><div class='del'>-					yeah-&gt;reno_count = max(tp-&gt;snd_cwnd&gt;&gt;1, 2U);</div><div class='add'>+					yeah-&gt;reno_count = max(tcp_snd_cwnd(tp)&gt;&gt;1, 2U);</div><div class='ctx'> 				else</div><div class='ctx'> 					yeah-&gt;reno_count++;</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +176,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 acked)</div><div class='ctx'> 		 */</div><div class='ctx'> 		yeah-&gt;vegas.beg_snd_una  = yeah-&gt;vegas.beg_snd_nxt;</div><div class='ctx'> 		yeah-&gt;vegas.beg_snd_nxt  = tp-&gt;snd_nxt;</div><div class='del'>-		yeah-&gt;vegas.beg_snd_cwnd = tp-&gt;snd_cwnd;</div><div class='add'>+		yeah-&gt;vegas.beg_snd_cwnd = tcp_snd_cwnd(tp);</div><div class='ctx'> </div><div class='ctx'> 		/* Wipe the slate clean for the next RTT. */</div><div class='ctx'> 		yeah-&gt;vegas.cntRTT = 0;</div><div class='hunk'>@@ -211,16 +193,16 @@ static u32 tcp_yeah_ssthresh(struct sock *sk)</div><div class='ctx'> 	if (yeah-&gt;doing_reno_now &lt; TCP_YEAH_RHO) {</div><div class='ctx'> 		reduction = yeah-&gt;lastQ;</div><div class='ctx'> </div><div class='del'>-		reduction = min(reduction, max(tp-&gt;snd_cwnd&gt;&gt;1, 2U));</div><div class='add'>+		reduction = min(reduction, max(tcp_snd_cwnd(tp)&gt;&gt;1, 2U));</div><div class='ctx'> </div><div class='del'>-		reduction = max(reduction, tp-&gt;snd_cwnd &gt;&gt; TCP_YEAH_DELTA);</div><div class='add'>+		reduction = max(reduction, tcp_snd_cwnd(tp) &gt;&gt; TCP_YEAH_DELTA);</div><div class='ctx'> 	} else</div><div class='del'>-		reduction = max(tp-&gt;snd_cwnd&gt;&gt;1, 2U);</div><div class='add'>+		reduction = max(tcp_snd_cwnd(tp)&gt;&gt;1, 2U);</div><div class='ctx'> </div><div class='ctx'> 	yeah-&gt;fast_count = 0;</div><div class='ctx'> 	yeah-&gt;reno_count = max(yeah-&gt;reno_count&gt;&gt;1, 2U);</div><div class='ctx'> </div><div class='del'>-	return max_t(int, tp-&gt;snd_cwnd - reduction, 2);</div><div class='add'>+	return max_t(int, tcp_snd_cwnd(tp) - reduction, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_congestion_ops tcp_yeah __read_mostly = {</div><div class='hunk'>@@ -231,7 +213,7 @@ static struct tcp_congestion_ops tcp_yeah __read_mostly = {</div><div class='ctx'> 	.set_state	= tcp_vegas_state,</div><div class='ctx'> 	.cwnd_event	= tcp_vegas_cwnd_event,</div><div class='ctx'> 	.get_info	= tcp_vegas_get_info,</div><div class='del'>-	.pkts_acked	= tcp_yeah_pkts_acked,</div><div class='add'>+	.pkts_acked	= tcp_vegas_pkts_acked,</div><div class='ctx'> </div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "yeah",</div><div class='hunk'>@@ -239,7 +221,7 @@ static struct tcp_congestion_ops tcp_yeah __read_mostly = {</div><div class='ctx'> </div><div class='ctx'> static int __init tcp_yeah_register(void)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(sizeof(struct yeah) &gt; ICSK_CA_PRIV_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct yeah) &gt; ICSK_CA_PRIV_SIZE);</div><div class='ctx'> 	tcp_register_congestion_control(&amp;tcp_yeah);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c<br/>index c0630013c1ae..4c1f836aae38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/tunnel4.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/tunnel4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/tunnel4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/tunnel4.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* tunnel4.c: Generic IP tunnel transformer.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='hunk'>@@ -109,6 +110,33 @@ drop:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+static int tunnel4_rcv_cb(struct sk_buff *skb, u8 proto, int err)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_tunnel __rcu *head;</div><div class='add'>+	struct xfrm_tunnel *handler;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	head = (proto == IPPROTO_IPIP) ? tunnel4_handlers : tunnel64_handlers;</div><div class='add'>+</div><div class='add'>+	for_each_tunnel_rcu(head, handler) {</div><div class='add'>+		if (handler-&gt;cb_handler) {</div><div class='add'>+			ret = handler-&gt;cb_handler(skb, err);</div><div class='add'>+			if (ret &lt;= 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xfrm_input_afinfo tunnel4_input_afinfo = {</div><div class='add'>+	.family		=	AF_INET,</div><div class='add'>+	.is_ipip	=	true,</div><div class='add'>+	.callback	=	tunnel4_rcv_cb,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static int tunnel64_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -149,34 +177,40 @@ drop:</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void tunnel4_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int tunnel4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_tunnel *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_tunnel_rcu(tunnel4_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static void tunnel64_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int tunnel64_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_tunnel *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_tunnel_rcu(tunnel64_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_MPLS)</div><div class='del'>-static void tunnelmpls4_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int tunnelmpls4_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_tunnel *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_tunnel_rcu(tunnelmpls4_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +218,6 @@ static const struct net_protocol tunnel4_protocol = {</div><div class='ctx'> 	.handler	=	tunnel4_rcv,</div><div class='ctx'> 	.err_handler	=	tunnel4_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='hunk'>@@ -192,7 +225,6 @@ static const struct net_protocol tunnel64_protocol = {</div><div class='ctx'> 	.handler	=	tunnel64_rcv,</div><div class='ctx'> 	.err_handler	=	tunnel64_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +233,6 @@ static const struct net_protocol tunnelmpls4_protocol = {</div><div class='ctx'> 	.handler	=	tunnelmpls4_rcv,</div><div class='ctx'> 	.err_handler	=	tunnelmpls4_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -224,6 +255,18 @@ static int __init tunnel4_init(void)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+	if (xfrm_input_register_afinfo(&amp;tunnel4_input_afinfo)) {</div><div class='add'>+		inet_del_protocol(&amp;tunnel4_protocol, IPPROTO_IPIP);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		inet_del_protocol(&amp;tunnel64_protocol, IPPROTO_IPV6);</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_MPLS)</div><div class='add'>+		inet_del_protocol(&amp;tunnelmpls4_protocol, IPPROTO_MPLS);</div><div class='add'>+#endif</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -233,6 +276,10 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void __exit tunnel4_fini(void)</div><div class='ctx'> {</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)</div><div class='add'>+	if (xfrm_input_unregister_afinfo(&amp;tunnel4_input_afinfo))</div><div class='add'>+		pr_err("tunnel4 close: can't remove input afinfo\n");</div><div class='add'>+#endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_MPLS)</div><div class='ctx'> 	if (inet_del_protocol(&amp;tunnelmpls4_protocol, IPPROTO_MPLS))</div><div class='ctx'> 		pr_err("tunnelmpls4 close: can't remove protocol\n");</div><div class='hunk'>@@ -247,4 +294,5 @@ static void __exit tunnel4_fini(void)</div><div class='ctx'> </div><div class='ctx'> module_init(tunnel4_init);</div><div class='ctx'> module_exit(tunnel4_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv4 XFRM tunnel library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c<br/>index c32a4c16b7ff..ffe074cb5865 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -67,23 +68,17 @@</div><div class='ctx'>  *	YOSHIFUJI Hideaki @USAGI and:	Support IPV6_V6ONLY socket option, which</div><div class='ctx'>  *	Alexey Kuznetsov:		allow both IPv4 and IPv6 sockets to bind</div><div class='ctx'>  *					a single port at the same time.</div><div class='del'>- *	Derek Atkins &lt;derek@ihtfp.com&gt;: Add Encapulation Support</div><div class='add'>+ *	Derek Atkins &lt;derek@ihtfp.com&gt;: Add Encapsulation Support</div><div class='ctx'>  *	James Chapman		:	Add L2TP encapsulation type.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "UDP: " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ioctls.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -98,6 +93,7 @@</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sock_diag.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -105,38 +101,41 @@</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;trace/events/udp.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include "udp_impl.h"</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct udp_table udp_table __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(udp_table);</div><div class='ctx'> </div><div class='ctx'> long sysctl_udp_mem[3] __read_mostly;</div><div class='del'>-EXPORT_SYMBOL(sysctl_udp_mem);</div><div class='add'>+EXPORT_IPV6_MOD(sysctl_udp_mem);</div><div class='ctx'> </div><div class='del'>-atomic_long_t udp_memory_allocated;</div><div class='del'>-EXPORT_SYMBOL(udp_memory_allocated);</div><div class='add'>+DEFINE_PER_CPU(int, udp_memory_per_cpu_fw_alloc);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(udp_memory_per_cpu_fw_alloc);</div><div class='ctx'> </div><div class='ctx'> #define MAX_UDP_PORTS 65536</div><div class='del'>-#define PORTS_PER_CHAIN (MAX_UDP_PORTS / UDP_HTABLE_SIZE_MIN)</div><div class='add'>+#define PORTS_PER_CHAIN (MAX_UDP_PORTS / UDP_HTABLE_SIZE_MIN_PERNET)</div><div class='ctx'> </div><div class='del'>-/* IPCB reference means this can not be used from early demux */</div><div class='del'>-static bool udp_lib_exact_dif_match(struct net *net, struct sk_buff *skb)</div><div class='add'>+static struct udp_table *udp_get_table_prot(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)</div><div class='del'>-	if (!net-&gt;ipv4.sysctl_udp_l3mdev_accept &amp;&amp;</div><div class='del'>-	    skb &amp;&amp; ipv4_l3mdev_skb(IPCB(skb)-&gt;flags))</div><div class='del'>-		return true;</div><div class='del'>-#endif</div><div class='del'>-	return false;</div><div class='add'>+	return sk-&gt;sk_prot-&gt;h.udp_table ? : sock_net(sk)-&gt;ipv4.udp_table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int udp_lib_lport_inuse(struct net *net, __u16 num,</div><div class='hunk'>@@ -144,8 +143,8 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num,</div><div class='ctx'> 			       unsigned long *bitmap,</div><div class='ctx'> 			       struct sock *sk, unsigned int log)</div><div class='ctx'> {</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='ctx'> 	struct sock *sk2;</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='ctx'> </div><div class='ctx'> 	sk_for_each(sk2, &amp;hslot-&gt;head) {</div><div class='ctx'> 		if (net_eq(sock_net(sk2), net) &amp;&amp;</div><div class='hunk'>@@ -157,7 +156,7 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num,</div><div class='ctx'> 		    inet_rcv_saddr_equal(sk, sk2, true)) {</div><div class='ctx'> 			if (sk2-&gt;sk_reuseport &amp;&amp; sk-&gt;sk_reuseport &amp;&amp;</div><div class='ctx'> 			    !rcu_access_pointer(sk-&gt;sk_reuseport_cb) &amp;&amp;</div><div class='del'>-			    uid_eq(uid, sock_i_uid(sk2))) {</div><div class='add'>+			    uid_eq(uid, sk_uid(sk2))) {</div><div class='ctx'> 				if (!bitmap)</div><div class='ctx'> 					return 0;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -179,8 +178,8 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,</div><div class='ctx'> 				struct udp_hslot *hslot2,</div><div class='ctx'> 				struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='ctx'> 	struct sock *sk2;</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;hslot2-&gt;lock);</div><div class='hunk'>@@ -194,7 +193,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,</div><div class='ctx'> 		    inet_rcv_saddr_equal(sk, sk2, true)) {</div><div class='ctx'> 			if (sk2-&gt;sk_reuseport &amp;&amp; sk-&gt;sk_reuseport &amp;&amp;</div><div class='ctx'> 			    !rcu_access_pointer(sk-&gt;sk_reuseport_cb) &amp;&amp;</div><div class='del'>-			    uid_eq(uid, sock_i_uid(sk2))) {</div><div class='add'>+			    uid_eq(uid, sk_uid(sk2))) {</div><div class='ctx'> 				res = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				res = 1;</div><div class='hunk'>@@ -209,7 +208,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,</div><div class='ctx'> static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	kuid_t uid = sock_i_uid(sk);</div><div class='add'>+	kuid_t uid = sk_uid(sk);</div><div class='ctx'> 	struct sock *sk2;</div><div class='ctx'> </div><div class='ctx'> 	sk_for_each(sk2, &amp;hslot-&gt;head) {</div><div class='hunk'>@@ -219,7 +218,7 @@ static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot)</div><div class='ctx'> 		    ipv6_only_sock(sk2) == ipv6_only_sock(sk) &amp;&amp;</div><div class='ctx'> 		    (udp_sk(sk2)-&gt;udp_port_hash == udp_sk(sk)-&gt;udp_port_hash) &amp;&amp;</div><div class='ctx'> 		    (sk2-&gt;sk_bound_dev_if == sk-&gt;sk_bound_dev_if) &amp;&amp;</div><div class='del'>-		    sk2-&gt;sk_reuseport &amp;&amp; uid_eq(uid, sock_i_uid(sk2)) &amp;&amp;</div><div class='add'>+		    sk2-&gt;sk_reuseport &amp;&amp; uid_eq(uid, sk_uid(sk2)) &amp;&amp;</div><div class='ctx'> 		    inet_rcv_saddr_equal(sk, sk2, false)) {</div><div class='ctx'> 			return reuseport_add_sock(sk, sk2,</div><div class='ctx'> 						  inet_rcv_saddr_any(sk));</div><div class='hunk'>@@ -240,21 +239,21 @@ static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot)</div><div class='ctx'> int udp_lib_get_port(struct sock *sk, unsigned short snum,</div><div class='ctx'> 		     unsigned int hash2_nulladdr)</div><div class='ctx'> {</div><div class='add'>+	struct udp_table *udptable = udp_get_table_prot(sk);</div><div class='ctx'> 	struct udp_hslot *hslot, *hslot2;</div><div class='del'>-	struct udp_table *udptable = sk-&gt;sk_prot-&gt;h.udp_table;</div><div class='del'>-	int    error = 1;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	int error = -EADDRINUSE;</div><div class='ctx'> </div><div class='ctx'> 	if (!snum) {</div><div class='add'>+		DECLARE_BITMAP(bitmap, PORTS_PER_CHAIN);</div><div class='add'>+		unsigned short first, last;</div><div class='ctx'> 		int low, high, remaining;</div><div class='ctx'> 		unsigned int rand;</div><div class='del'>-		unsigned short first, last;</div><div class='del'>-		DECLARE_BITMAP(bitmap, PORTS_PER_CHAIN);</div><div class='ctx'> </div><div class='del'>-		inet_get_local_port_range(net, &amp;low, &amp;high);</div><div class='add'>+		inet_sk_get_local_port_range(sk, &amp;low, &amp;high);</div><div class='ctx'> 		remaining = (high - low) + 1;</div><div class='ctx'> </div><div class='del'>-		rand = prandom_u32();</div><div class='add'>+		rand = get_random_u32();</div><div class='ctx'> 		first = reciprocal_scale(rand, remaining) + low;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * force rand to be an odd multiple of UDP_HTABLE_SIZE</div><div class='hunk'>@@ -327,6 +326,8 @@ found:</div><div class='ctx'> 			goto fail_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+</div><div class='ctx'> 		sk_add_node_rcu(sk, &amp;hslot-&gt;head);</div><div class='ctx'> 		hslot-&gt;count++;</div><div class='ctx'> 		sock_prot_inuse_add(sock_net(sk), sk-&gt;sk_prot, 1);</div><div class='hunk'>@@ -343,14 +344,14 @@ found:</div><div class='ctx'> 		hslot2-&gt;count++;</div><div class='ctx'> 		spin_unlock(&amp;hslot2-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='add'>+</div><div class='ctx'> 	error = 0;</div><div class='ctx'> fail_unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> fail:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_lib_get_port);</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_get_port);</div><div class='ctx'> </div><div class='ctx'> int udp_v4_get_port(struct sock *sk, unsigned short snum)</div><div class='ctx'> {</div><div class='hunk'>@@ -364,28 +365,26 @@ int udp_v4_get_port(struct sock *sk, unsigned short snum)</div><div class='ctx'> 	return udp_lib_get_port(sk, snum, hash2_nulladdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compute_score(struct sock *sk, struct net *net,</div><div class='add'>+static int compute_score(struct sock *sk, const struct net *net,</div><div class='ctx'> 			 __be32 saddr, __be16 sport,</div><div class='ctx'> 			 __be32 daddr, unsigned short hnum,</div><div class='del'>-			 int dif, int sdif, bool exact_dif)</div><div class='add'>+			 int dif, int sdif)</div><div class='ctx'> {</div><div class='ctx'> 	int score;</div><div class='ctx'> 	struct inet_sock *inet;</div><div class='add'>+	bool dev_match;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(sock_net(sk), net) ||</div><div class='ctx'> 	    udp_sk(sk)-&gt;udp_port_hash != hnum ||</div><div class='ctx'> 	    ipv6_only_sock(sk))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	score = (sk-&gt;sk_family == PF_INET) ? 2 : 1;</div><div class='del'>-	inet = inet_sk(sk);</div><div class='add'>+	if (sk-&gt;sk_rcv_saddr != daddr)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;inet_rcv_saddr) {</div><div class='del'>-		if (inet-&gt;inet_rcv_saddr != daddr)</div><div class='del'>-			return -1;</div><div class='del'>-		score += 4;</div><div class='del'>-	}</div><div class='add'>+	score = (sk-&gt;sk_family == PF_INET) ? 2 : 1;</div><div class='ctx'> </div><div class='add'>+	inet = inet_sk(sk);</div><div class='ctx'> 	if (inet-&gt;inet_daddr) {</div><div class='ctx'> 		if (inet-&gt;inet_daddr != saddr)</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -398,132 +397,348 @@ static int compute_score(struct sock *sk, struct net *net,</div><div class='ctx'> 		score += 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_bound_dev_if || exact_dif) {</div><div class='del'>-		bool dev_match = (sk-&gt;sk_bound_dev_if == dif ||</div><div class='del'>-				  sk-&gt;sk_bound_dev_if == sdif);</div><div class='del'>-</div><div class='del'>-		if (!dev_match)</div><div class='del'>-			return -1;</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-			score += 4;</div><div class='del'>-	}</div><div class='add'>+	dev_match = udp_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if,</div><div class='add'>+					dif, sdif);</div><div class='add'>+	if (!dev_match)</div><div class='add'>+		return -1;</div><div class='add'>+	if (sk-&gt;sk_bound_dev_if)</div><div class='add'>+		score += 4;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_incoming_cpu == raw_smp_processor_id())</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_incoming_cpu) == raw_smp_processor_id())</div><div class='ctx'> 		score++;</div><div class='ctx'> 	return score;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 udp_ehashfn(const struct net *net, const __be32 laddr,</div><div class='del'>-		       const __u16 lport, const __be32 faddr,</div><div class='del'>-		       const __be16 fport)</div><div class='add'>+u32 udp_ehashfn(const struct net *net, const __be32 laddr, const __u16 lport,</div><div class='add'>+		const __be32 faddr, const __be16 fport)</div><div class='ctx'> {</div><div class='del'>-	static u32 udp_ehash_secret __read_mostly;</div><div class='del'>-</div><div class='ctx'> 	net_get_random_once(&amp;udp_ehash_secret, sizeof(udp_ehash_secret));</div><div class='ctx'> </div><div class='ctx'> 	return __inet_ehashfn(laddr, lport, faddr, fport,</div><div class='ctx'> 			      udp_ehash_secret + net_hash_mix(net));</div><div class='ctx'> }</div><div class='add'>+EXPORT_IPV6_MOD(udp_ehashfn);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * udp4_lib_lookup1() - Simplified lookup using primary hash (destination port)</div><div class='add'>+ * @net:	Network namespace</div><div class='add'>+ * @saddr:	Source address, network order</div><div class='add'>+ * @sport:	Source port, network order</div><div class='add'>+ * @daddr:	Destination address, network order</div><div class='add'>+ * @hnum:	Destination port, host order</div><div class='add'>+ * @dif:	Destination interface index</div><div class='add'>+ * @sdif:	Destination bridge port index, if relevant</div><div class='add'>+ * @udptable:	Set of UDP hash tables</div><div class='add'>+ *</div><div class='add'>+ * Simplified lookup to be used as fallback if no sockets are found due to a</div><div class='add'>+ * potential race between (receive) address change, and lookup happening before</div><div class='add'>+ * the rehash operation. This function ignores SO_REUSEPORT groups while scoring</div><div class='add'>+ * result sockets, because if we have one, we don't need the fallback at all.</div><div class='add'>+ *</div><div class='add'>+ * Called under rcu_read_lock().</div><div class='add'>+ *</div><div class='add'>+ * Return: socket with highest matching score if any, NULL if none</div><div class='add'>+ */</div><div class='add'>+static struct sock *udp4_lib_lookup1(const struct net *net,</div><div class='add'>+				     __be32 saddr, __be16 sport,</div><div class='add'>+				     __be32 daddr, unsigned int hnum,</div><div class='add'>+				     int dif, int sdif,</div><div class='add'>+				     const struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	unsigned int slot = udp_hashfn(net, hnum, udptable-&gt;mask);</div><div class='add'>+	struct udp_hslot *hslot = &amp;udptable-&gt;hash[slot];</div><div class='add'>+	struct sock *sk, *result = NULL;</div><div class='add'>+	int score, badness = 0;</div><div class='add'>+</div><div class='add'>+	sk_for_each_rcu(sk, &amp;hslot-&gt;head) {</div><div class='add'>+		score = compute_score(sk, net,</div><div class='add'>+				      saddr, sport, daddr, hnum, dif, sdif);</div><div class='add'>+		if (score &gt; badness) {</div><div class='add'>+			result = sk;</div><div class='add'>+			badness = score;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-static struct sock *udp4_lib_lookup2(struct net *net,</div><div class='add'>+static struct sock *udp4_lib_lookup2(const struct net *net,</div><div class='ctx'> 				     __be32 saddr, __be16 sport,</div><div class='ctx'> 				     __be32 daddr, unsigned int hnum,</div><div class='del'>-				     int dif, int sdif, bool exact_dif,</div><div class='add'>+				     int dif, int sdif,</div><div class='ctx'> 				     struct udp_hslot *hslot2,</div><div class='ctx'> 				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk, *result;</div><div class='ctx'> 	int score, badness;</div><div class='del'>-	u32 hash = 0;</div><div class='add'>+	bool need_rescore;</div><div class='ctx'> </div><div class='ctx'> 	result = NULL;</div><div class='ctx'> 	badness = 0;</div><div class='ctx'> 	udp_portaddr_for_each_entry_rcu(sk, &amp;hslot2-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, saddr, sport,</div><div class='del'>-				      daddr, hnum, dif, sdif, exact_dif);</div><div class='add'>+		need_rescore = false;</div><div class='add'>+rescore:</div><div class='add'>+		score = compute_score(need_rescore ? result : sk, net, saddr,</div><div class='add'>+				      sport, daddr, hnum, dif, sdif);</div><div class='ctx'> 		if (score &gt; badness) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				hash = udp_ehashfn(net, daddr, hnum,</div><div class='del'>-						   saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, hash, skb,</div><div class='del'>-							sizeof(struct udphdr));</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='ctx'> 			badness = score;</div><div class='del'>-			result = sk;</div><div class='add'>+</div><div class='add'>+			if (need_rescore)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (sk-&gt;sk_state == TCP_ESTABLISHED) {</div><div class='add'>+				result = sk;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			result = inet_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),</div><div class='add'>+						       saddr, sport, daddr, hnum, udp_ehashfn);</div><div class='add'>+			if (!result) {</div><div class='add'>+				result = sk;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Fall back to scoring if group has connections */</div><div class='add'>+			if (!reuseport_has_conns(sk))</div><div class='add'>+				return result;</div><div class='add'>+</div><div class='add'>+			/* Reuseport logic returned an error, keep original score. */</div><div class='add'>+			if (IS_ERR(result))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* compute_score is too long of a function to be</div><div class='add'>+			 * inlined, and calling it again here yields</div><div class='add'>+			 * measurable overhead for some</div><div class='add'>+			 * workloads. Work around it by jumping</div><div class='add'>+			 * backwards to rescore 'result'.</div><div class='add'>+			 */</div><div class='add'>+			need_rescore = true;</div><div class='add'>+			goto rescore;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_BASE_SMALL)</div><div class='add'>+static struct sock *udp4_lib_lookup4(const struct net *net,</div><div class='add'>+				     __be32 saddr, __be16 sport,</div><div class='add'>+				     __be32 daddr, unsigned int hnum,</div><div class='add'>+				     int dif, int sdif,</div><div class='add'>+				     struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_rehash4(struct udp_table *udptable, struct sock *sk,</div><div class='add'>+			u16 newhash4)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_unhash4(struct udp_table *udptable, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_BASE_SMALL */</div><div class='add'>+static struct sock *udp4_lib_lookup4(const struct net *net,</div><div class='add'>+				     __be32 saddr, __be16 sport,</div><div class='add'>+				     __be32 daddr, unsigned int hnum,</div><div class='add'>+				     int dif, int sdif,</div><div class='add'>+				     struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	const __portpair ports = INET_COMBINED_PORTS(sport, hnum);</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct udp_hslot *hslot4;</div><div class='add'>+	unsigned int hash4, slot;</div><div class='add'>+	struct udp_sock *up;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	hash4 = udp_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='add'>+	slot = hash4 &amp; udptable-&gt;mask;</div><div class='add'>+	hslot4 = &amp;udptable-&gt;hash4[slot];</div><div class='add'>+	INET_ADDR_COOKIE(acookie, saddr, daddr);</div><div class='add'>+</div><div class='add'>+begin:</div><div class='add'>+	/* SLAB_TYPESAFE_BY_RCU not used, so we don't need to touch sk_refcnt */</div><div class='add'>+	udp_lrpa_for_each_entry_rcu(up, node, &amp;hslot4-&gt;nulls_head) {</div><div class='add'>+		sk = (struct sock *)up;</div><div class='add'>+		if (inet_match(net, sk, acookie, ports, dif, sdif))</div><div class='add'>+			return sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if the nulls value we got at the end of this lookup is not the</div><div class='add'>+	 * expected one, we must restart lookup. We probably met an item that</div><div class='add'>+	 * was moved to another chain due to rehash.</div><div class='add'>+	 */</div><div class='add'>+	if (get_nulls_value(node) != slot)</div><div class='add'>+		goto begin;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* udp_rehash4() only checks hslot4, and hash4_cnt is not processed. */</div><div class='add'>+static void udp_rehash4(struct udp_table *udptable, struct sock *sk,</div><div class='add'>+			u16 newhash4)</div><div class='add'>+{</div><div class='add'>+	struct udp_hslot *hslot4, *nhslot4;</div><div class='add'>+</div><div class='add'>+	hslot4 = udp_hashslot4(udptable, udp_sk(sk)-&gt;udp_lrpa_hash);</div><div class='add'>+	nhslot4 = udp_hashslot4(udptable, newhash4);</div><div class='add'>+	udp_sk(sk)-&gt;udp_lrpa_hash = newhash4;</div><div class='add'>+</div><div class='add'>+	if (hslot4 != nhslot4) {</div><div class='add'>+		spin_lock_bh(&amp;hslot4-&gt;lock);</div><div class='add'>+		hlist_nulls_del_init_rcu(&amp;udp_sk(sk)-&gt;udp_lrpa_node);</div><div class='add'>+		hslot4-&gt;count--;</div><div class='add'>+		spin_unlock_bh(&amp;hslot4-&gt;lock);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;nhslot4-&gt;lock);</div><div class='add'>+		hlist_nulls_add_head_rcu(&amp;udp_sk(sk)-&gt;udp_lrpa_node,</div><div class='add'>+					 &amp;nhslot4-&gt;nulls_head);</div><div class='add'>+		nhslot4-&gt;count++;</div><div class='add'>+		spin_unlock_bh(&amp;nhslot4-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_unhash4(struct udp_table *udptable, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct udp_hslot *hslot2, *hslot4;</div><div class='add'>+</div><div class='add'>+	if (udp_hashed4(sk)) {</div><div class='add'>+		hslot2 = udp_hashslot2(udptable, udp_sk(sk)-&gt;udp_portaddr_hash);</div><div class='add'>+		hslot4 = udp_hashslot4(udptable, udp_sk(sk)-&gt;udp_lrpa_hash);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;hslot4-&gt;lock);</div><div class='add'>+		hlist_nulls_del_init_rcu(&amp;udp_sk(sk)-&gt;udp_lrpa_node);</div><div class='add'>+		hslot4-&gt;count--;</div><div class='add'>+		spin_unlock(&amp;hslot4-&gt;lock);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;hslot2-&gt;lock);</div><div class='add'>+		udp_hash4_dec(hslot2);</div><div class='add'>+		spin_unlock(&amp;hslot2-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void udp_lib_hash4(struct sock *sk, u16 hash)</div><div class='add'>+{</div><div class='add'>+	struct udp_hslot *hslot, *hslot2, *hslot4;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+</div><div class='add'>+	/* Connected udp socket can re-connect to another remote address, which</div><div class='add'>+	 * will be handled by rehash. Thus no need to redo hash4 here.</div><div class='add'>+	 */</div><div class='add'>+	if (udp_hashed4(sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	udptable = net-&gt;ipv4.udp_table;</div><div class='add'>+	hslot = udp_hashslot(udptable, net, udp_sk(sk)-&gt;udp_port_hash);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, udp_sk(sk)-&gt;udp_portaddr_hash);</div><div class='add'>+	hslot4 = udp_hashslot4(udptable, hash);</div><div class='add'>+	udp_sk(sk)-&gt;udp_lrpa_hash = hash;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;hslot-&gt;lock);</div><div class='add'>+	if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='add'>+		reuseport_detach_sock(sk);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hslot4-&gt;lock);</div><div class='add'>+	hlist_nulls_add_head_rcu(&amp;udp_sk(sk)-&gt;udp_lrpa_node,</div><div class='add'>+				 &amp;hslot4-&gt;nulls_head);</div><div class='add'>+	hslot4-&gt;count++;</div><div class='add'>+	spin_unlock(&amp;hslot4-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hslot2-&gt;lock);</div><div class='add'>+	udp_hash4_inc(hslot2);</div><div class='add'>+	spin_unlock(&amp;hslot2-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_hash4);</div><div class='add'>+</div><div class='add'>+/* call with sock lock */</div><div class='add'>+void udp4_hash4(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	unsigned int hash;</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk) || sk-&gt;sk_rcv_saddr == htonl(INADDR_ANY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hash = udp_ehashfn(net, sk-&gt;sk_rcv_saddr, sk-&gt;sk_num,</div><div class='add'>+			   sk-&gt;sk_daddr, sk-&gt;sk_dport);</div><div class='add'>+</div><div class='add'>+	udp_lib_hash4(sk, hash);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(udp4_hash4);</div><div class='add'>+#endif /* CONFIG_BASE_SMALL */</div><div class='add'>+</div><div class='ctx'> /* UDP is nearly always wildcards out the wazoo, it makes no sense to try</div><div class='ctx'>  * harder than this. -DaveM</div><div class='ctx'>  */</div><div class='del'>-struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,</div><div class='add'>+struct sock *__udp4_lib_lookup(const struct net *net, __be32 saddr,</div><div class='ctx'> 		__be16 sport, __be32 daddr, __be16 dport, int dif,</div><div class='ctx'> 		int sdif, struct udp_table *udptable, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk, *result;</div><div class='ctx'> 	unsigned short hnum = ntohs(dport);</div><div class='del'>-	unsigned int hash2, slot2, slot = udp_hashfn(net, hnum, udptable-&gt;mask);</div><div class='del'>-	struct udp_hslot *hslot2, *hslot = &amp;udptable-&gt;hash[slot];</div><div class='del'>-	bool exact_dif = udp_lib_exact_dif_match(net, skb);</div><div class='del'>-	int score, badness;</div><div class='del'>-	u32 hash = 0;</div><div class='del'>-</div><div class='del'>-	if (hslot-&gt;count &gt; 10) {</div><div class='del'>-		hash2 = ipv4_portaddr_hash(net, daddr, hnum);</div><div class='del'>-		slot2 = hash2 &amp; udptable-&gt;mask;</div><div class='del'>-		hslot2 = &amp;udptable-&gt;hash2[slot2];</div><div class='del'>-		if (hslot-&gt;count &lt; hslot2-&gt;count)</div><div class='del'>-			goto begin;</div><div class='del'>-</div><div class='del'>-		result = udp4_lib_lookup2(net, saddr, sport,</div><div class='del'>-					  daddr, hnum, dif, sdif,</div><div class='del'>-					  exact_dif, hslot2, skb);</div><div class='del'>-		if (!result) {</div><div class='del'>-			unsigned int old_slot2 = slot2;</div><div class='del'>-			hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum);</div><div class='del'>-			slot2 = hash2 &amp; udptable-&gt;mask;</div><div class='del'>-			/* avoid searching the same slot again. */</div><div class='del'>-			if (unlikely(slot2 == old_slot2))</div><div class='del'>-				return result;</div><div class='del'>-</div><div class='del'>-			hslot2 = &amp;udptable-&gt;hash2[slot2];</div><div class='del'>-			if (hslot-&gt;count &lt; hslot2-&gt;count)</div><div class='del'>-				goto begin;</div><div class='del'>-</div><div class='del'>-			result = udp4_lib_lookup2(net, saddr, sport,</div><div class='del'>-						  daddr, hnum, dif, sdif,</div><div class='del'>-						  exact_dif, hslot2, skb);</div><div class='del'>-		}</div><div class='del'>-		if (unlikely(IS_ERR(result)))</div><div class='del'>-			return NULL;</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-begin:</div><div class='del'>-	result = NULL;</div><div class='del'>-	badness = 0;</div><div class='del'>-	sk_for_each_rcu(sk, &amp;hslot-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, saddr, sport,</div><div class='del'>-				      daddr, hnum, dif, sdif, exact_dif);</div><div class='del'>-		if (score &gt; badness) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				hash = udp_ehashfn(net, daddr, hnum,</div><div class='del'>-						   saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, hash, skb,</div><div class='del'>-							sizeof(struct udphdr));</div><div class='del'>-				if (unlikely(IS_ERR(result)))</div><div class='del'>-					return NULL;</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='add'>+	struct udp_hslot *hslot2;</div><div class='add'>+	struct sock *result, *sk;</div><div class='add'>+	unsigned int hash2;</div><div class='add'>+</div><div class='add'>+	hash2 = ipv4_portaddr_hash(net, daddr, hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+</div><div class='add'>+	if (udp_has_hash4(hslot2)) {</div><div class='add'>+		result = udp4_lib_lookup4(net, saddr, sport, daddr, hnum,</div><div class='add'>+					  dif, sdif, udptable);</div><div class='add'>+		if (result) /* udp4_lib_lookup4 return sk or NULL */</div><div class='add'>+			return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lookup connected or non-wildcard socket */</div><div class='add'>+	result = udp4_lib_lookup2(net, saddr, sport,</div><div class='add'>+				  daddr, hnum, dif, sdif,</div><div class='add'>+				  hslot2, skb);</div><div class='add'>+	if (!IS_ERR_OR_NULL(result) &amp;&amp; result-&gt;sk_state == TCP_ESTABLISHED)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Lookup redirect from BPF */</div><div class='add'>+	if (static_branch_unlikely(&amp;bpf_sk_lookup_enabled) &amp;&amp;</div><div class='add'>+	    udptable == net-&gt;ipv4.udp_table) {</div><div class='add'>+		sk = inet_lookup_run_sk_lookup(net, IPPROTO_UDP, skb, sizeof(struct udphdr),</div><div class='add'>+					       saddr, sport, daddr, hnum, dif,</div><div class='add'>+					       udp_ehashfn);</div><div class='add'>+		if (sk) {</div><div class='ctx'> 			result = sk;</div><div class='del'>-			badness = score;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Got non-wildcard socket or error on first lookup */</div><div class='add'>+	if (result)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Lookup wildcard sockets */</div><div class='add'>+	hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+</div><div class='add'>+	result = udp4_lib_lookup2(net, saddr, sport,</div><div class='add'>+				  htonl(INADDR_ANY), hnum, dif, sdif,</div><div class='add'>+				  hslot2, skb);</div><div class='add'>+	if (!IS_ERR_OR_NULL(result))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Primary hash (destination port) lookup as fallback for this race:</div><div class='add'>+	 *   1. __ip4_datagram_connect() sets sk_rcv_saddr</div><div class='add'>+	 *   2. lookup (this function): new sk_rcv_saddr, hashes not updated yet</div><div class='add'>+	 *   3. rehash operation updating _secondary and four-tuple_ hashes</div><div class='add'>+	 * The primary hash doesn't need an update after 1., so, thanks to this</div><div class='add'>+	 * further step, 1. and 3. don't need to be atomic against the lookup.</div><div class='add'>+	 */</div><div class='add'>+	result = udp4_lib_lookup1(net, saddr, sport, daddr, hnum, dif, sdif,</div><div class='add'>+				  udptable);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (IS_ERR(result))</div><div class='add'>+		return NULL;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__udp4_lib_lookup);</div><div class='hunk'>@@ -539,24 +754,32 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,</div><div class='ctx'> 				 inet_sdif(skb), udptable, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sock *udp4_lib_lookup_skb(struct sk_buff *skb,</div><div class='add'>+struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb,</div><div class='ctx'> 				 __be16 sport, __be16 dport)</div><div class='ctx'> {</div><div class='del'>-	return __udp4_lib_lookup_skb(skb, sport, dport, &amp;udp_table);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct iphdr *iph = (struct iphdr *)(skb-&gt;data + offset);</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	int iif, sdif;</div><div class='add'>+</div><div class='add'>+	inet_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+</div><div class='add'>+	return __udp4_lib_lookup(net, iph-&gt;saddr, sport,</div><div class='add'>+				 iph-&gt;daddr, dport, iif,</div><div class='add'>+				 sdif, net-&gt;ipv4.udp_table, NULL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp4_lib_lookup_skb);</div><div class='ctx'> </div><div class='ctx'> /* Must be called under rcu_read_lock().</div><div class='ctx'>  * Does increment socket refcount.</div><div class='ctx'>  */</div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_TPROXY_IPV4) || IS_ENABLED(CONFIG_NF_SOCKET_IPV4)</div><div class='del'>-struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,</div><div class='add'>+struct sock *udp4_lib_lookup(const struct net *net, __be32 saddr, __be16 sport,</div><div class='ctx'> 			     __be32 daddr, __be16 dport, int dif)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	sk = __udp4_lib_lookup(net, saddr, sport, daddr, dport,</div><div class='del'>-			       dif, 0, &amp;udp_table, NULL);</div><div class='add'>+			       dif, 0, net-&gt;ipv4.udp_table, NULL);</div><div class='ctx'> 	if (sk &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='ctx'> 		sk = NULL;</div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -564,12 +787,12 @@ struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp4_lib_lookup);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,</div><div class='add'>+static inline bool __udp_is_mcast_sock(struct net *net, const struct sock *sk,</div><div class='ctx'> 				       __be16 loc_port, __be32 loc_addr,</div><div class='ctx'> 				       __be16 rmt_port, __be32 rmt_addr,</div><div class='ctx'> 				       int dif, int sdif, unsigned short hnum)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(sock_net(sk), net) ||</div><div class='ctx'> 	    udp_sk(sk)-&gt;udp_port_hash != hnum ||</div><div class='hunk'>@@ -577,14 +800,123 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,</div><div class='ctx'> 	    (inet-&gt;inet_dport != rmt_port &amp;&amp; inet-&gt;inet_dport) ||</div><div class='ctx'> 	    (inet-&gt;inet_rcv_saddr &amp;&amp; inet-&gt;inet_rcv_saddr != loc_addr) ||</div><div class='ctx'> 	    ipv6_only_sock(sk) ||</div><div class='del'>-	    (sk-&gt;sk_bound_dev_if &amp;&amp; sk-&gt;sk_bound_dev_if != dif &amp;&amp;</div><div class='del'>-	     sk-&gt;sk_bound_dev_if != sdif))</div><div class='add'>+	    !udp_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if, dif, sdif))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!ip_mc_sf_allow(sk, loc_addr, rmt_addr, dif, sdif))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key);</div><div class='add'>+EXPORT_IPV6_MOD(udp_encap_needed_key);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);</div><div class='add'>+EXPORT_IPV6_MOD(udpv6_encap_needed_key);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void udp_encap_enable(void)</div><div class='add'>+{</div><div class='add'>+	static_branch_inc(&amp;udp_encap_needed_key);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(udp_encap_enable);</div><div class='add'>+</div><div class='add'>+void udp_encap_disable(void)</div><div class='add'>+{</div><div class='add'>+	static_branch_dec(&amp;udp_encap_needed_key);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(udp_encap_disable);</div><div class='add'>+</div><div class='add'>+/* Handler for tunnels with arbitrary destination ports: no socket lookup, go</div><div class='add'>+ * through error handlers in encapsulations looking for a match.</div><div class='add'>+ */</div><div class='add'>+static int __udp4_lib_err_encap_no_sk(struct sk_buff *skb, u32 info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_IPTUN_ENCAP_OPS; i++) {</div><div class='add'>+		int (*handler)(struct sk_buff *skb, u32 info);</div><div class='add'>+		const struct ip_tunnel_encap_ops *encap;</div><div class='add'>+</div><div class='add'>+		encap = rcu_dereference(iptun_encaps[i]);</div><div class='add'>+		if (!encap)</div><div class='add'>+			continue;</div><div class='add'>+		handler = encap-&gt;err_handler;</div><div class='add'>+		if (handler &amp;&amp; !handler(skb, info))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to match ICMP errors to UDP tunnels by looking up a socket without</div><div class='add'>+ * reversing source and destination port: this will match tunnels that force the</div><div class='add'>+ * same destination port on both endpoints (e.g. VXLAN, GENEVE). Note that</div><div class='add'>+ * lwtunnels might actually break this assumption by being configured with</div><div class='add'>+ * different destination ports on endpoints, in this case we won't be able to</div><div class='add'>+ * trace ICMP messages back to them.</div><div class='add'>+ *</div><div class='add'>+ * If this doesn't match any socket, probe tunnels with arbitrary destination</div><div class='add'>+ * ports (e.g. FoU, GUE): there, the receiving socket is useless, as the port</div><div class='add'>+ * we've sent packets to won't necessarily match the local destination port.</div><div class='add'>+ *</div><div class='add'>+ * Then ask the tunnel implementation to match the error against a valid</div><div class='add'>+ * association.</div><div class='add'>+ *</div><div class='add'>+ * Return an error if we can't find a match, the socket if we need further</div><div class='add'>+ * processing, zero otherwise.</div><div class='add'>+ */</div><div class='add'>+static struct sock *__udp4_lib_err_encap(struct net *net,</div><div class='add'>+					 const struct iphdr *iph,</div><div class='add'>+					 struct udphdr *uh,</div><div class='add'>+					 struct udp_table *udptable,</div><div class='add'>+					 struct sock *sk,</div><div class='add'>+					 struct sk_buff *skb, u32 info)</div><div class='add'>+{</div><div class='add'>+	int (*lookup)(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+	int network_offset, transport_offset;</div><div class='add'>+	struct udp_sock *up;</div><div class='add'>+</div><div class='add'>+	network_offset = skb_network_offset(skb);</div><div class='add'>+	transport_offset = skb_transport_offset(skb);</div><div class='add'>+</div><div class='add'>+	/* Network header needs to point to the outer IPv4 header inside ICMP */</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Transport header needs to point to the UDP header */</div><div class='add'>+	skb_set_transport_header(skb, iph-&gt;ihl &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		up = udp_sk(sk);</div><div class='add'>+</div><div class='add'>+		lookup = READ_ONCE(up-&gt;encap_err_lookup);</div><div class='add'>+		if (lookup &amp;&amp; lookup(sk, skb))</div><div class='add'>+			sk = NULL;</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk = __udp4_lib_lookup(net, iph-&gt;daddr, uh-&gt;source,</div><div class='add'>+			       iph-&gt;saddr, uh-&gt;dest, skb-&gt;dev-&gt;ifindex, 0,</div><div class='add'>+			       udptable, NULL);</div><div class='add'>+	if (sk) {</div><div class='add'>+		up = udp_sk(sk);</div><div class='add'>+</div><div class='add'>+		lookup = READ_ONCE(up-&gt;encap_err_lookup);</div><div class='add'>+		if (!lookup || lookup(sk, skb))</div><div class='add'>+			sk = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!sk)</div><div class='add'>+		sk = ERR_PTR(__udp4_lib_err_encap_no_sk(skb, info));</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, transport_offset);</div><div class='add'>+	skb_set_network_header(skb, network_offset);</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This routine is called by the ICMP module when it gets some</div><div class='ctx'>  * sort of error condition.  If err &lt; 0 then the socket should</div><div class='hunk'>@@ -596,24 +928,39 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,</div><div class='ctx'>  * to find the appropriate port.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)</div><div class='add'>+int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet;</div><div class='ctx'> 	const struct iphdr *iph = (const struct iphdr *)skb-&gt;data;</div><div class='ctx'> 	struct udphdr *uh = (struct udphdr *)(skb-&gt;data+(iph-&gt;ihl&lt;&lt;2));</div><div class='ctx'> 	const int type = icmp_hdr(skb)-&gt;type;</div><div class='ctx'> 	const int code = icmp_hdr(skb)-&gt;code;</div><div class='add'>+	bool tunnel = false;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	int harderr;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	sk = __udp4_lib_lookup(net, iph-&gt;daddr, uh-&gt;dest,</div><div class='del'>-			       iph-&gt;saddr, uh-&gt;source, skb-&gt;dev-&gt;ifindex, 0,</div><div class='del'>-			       udptable, NULL);</div><div class='del'>-	if (!sk) {</div><div class='del'>-		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='del'>-		return;	/* No socket for error */</div><div class='add'>+			       iph-&gt;saddr, uh-&gt;source, skb-&gt;dev-&gt;ifindex,</div><div class='add'>+			       inet_sdif(skb), udptable, NULL);</div><div class='add'>+</div><div class='add'>+	if (!sk || READ_ONCE(udp_sk(sk)-&gt;encap_type)) {</div><div class='add'>+		/* No socket for error: try tunnels before discarding */</div><div class='add'>+		if (static_branch_unlikely(&amp;udp_encap_needed_key)) {</div><div class='add'>+			sk = __udp4_lib_err_encap(net, iph, uh, udptable, sk, skb,</div><div class='add'>+						  info);</div><div class='add'>+			if (!sk)</div><div class='add'>+				return 0;</div><div class='add'>+		} else</div><div class='add'>+			sk = ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(sk)) {</div><div class='add'>+			__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);</div><div class='add'>+			return PTR_ERR(sk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tunnel = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -634,7 +981,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)</div><div class='ctx'> 	case ICMP_DEST_UNREACH:</div><div class='ctx'> 		if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */</div><div class='ctx'> 			ipv4_sk_update_pmtu(skb, sk, info);</div><div class='del'>-			if (inet-&gt;pmtudisc != IP_PMTUDISC_DONT) {</div><div class='add'>+			if (READ_ONCE(inet-&gt;pmtudisc) != IP_PMTUDISC_DONT) {</div><div class='ctx'> 				err = EMSGSIZE;</div><div class='ctx'> 				harderr = 1;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -656,21 +1003,28 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)</div><div class='ctx'> 	 *      RFC1122: OK.  Passes ICMP errors back to application, as per</div><div class='ctx'> 	 *	4.1.3.3.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!inet-&gt;recverr) {</div><div class='add'>+	if (tunnel) {</div><div class='add'>+		/* ...not for tunnels though: we don't have a sending socket */</div><div class='add'>+		if (udp_sk(sk)-&gt;encap_err_rcv)</div><div class='add'>+			udp_sk(sk)-&gt;encap_err_rcv(sk, skb, err, uh-&gt;dest, info,</div><div class='add'>+						  (u8 *)(uh+1));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!inet_test_bit(RECVERR, sk)) {</div><div class='ctx'> 		if (!harderr || sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else</div><div class='ctx'> 		ip_icmp_error(sk, skb, err, uh-&gt;dest, info, (u8 *)(uh+1));</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_err = err;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> out:</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void udp_err(struct sk_buff *skb, u32 info)</div><div class='add'>+int udp_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='del'>-	__udp4_lib_err(skb, info, &amp;udp_table);</div><div class='add'>+	return __udp4_lib_err(skb, info, dev_net(skb-&gt;dev)-&gt;ipv4.udp_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -682,11 +1036,11 @@ void udp_flush_pending_frames(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (up-&gt;pending) {</div><div class='ctx'> 		up-&gt;len = 0;</div><div class='del'>-		up-&gt;pending = 0;</div><div class='add'>+		WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> 		ip_flush_pending_frames(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_flush_pending_frames);</div><div class='add'>+EXPORT_IPV6_MOD(udp_flush_pending_frames);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * 	udp4_hwcsum  -  handle outgoing HW checksumming</div><div class='hunk'>@@ -766,10 +1120,11 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct udphdr *uh;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> 	int offset = skb_transport_offset(skb);</div><div class='ctx'> 	int len = skb-&gt;len - offset;</div><div class='add'>+	int datalen = len - sizeof(*uh);</div><div class='ctx'> 	__wsum csum = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -785,21 +1140,32 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,</div><div class='ctx'> 		const int hlen = skb_network_header_len(skb) +</div><div class='ctx'> 				 sizeof(struct udphdr);</div><div class='ctx'> </div><div class='del'>-		if (hlen + cork-&gt;gso_size &gt; cork-&gt;fragsize)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (skb-&gt;len &gt; cork-&gt;gso_size * UDP_MAX_SEGMENTS)</div><div class='add'>+		if (hlen + min(datalen, cork-&gt;gso_size) &gt; cork-&gt;fragsize) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+		if (datalen &gt; cork-&gt;gso_size * UDP_MAX_SEGMENTS) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (sk-&gt;sk_no_check_tx)</div><div class='add'>+		}</div><div class='add'>+		if (sk-&gt;sk_no_check_tx) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (skb-&gt;ip_summed != CHECKSUM_PARTIAL || is_udplite ||</div><div class='del'>-		    dst_xfrm(skb_dst(skb)))</div><div class='add'>+		}</div><div class='add'>+		if (is_udplite || dst_xfrm(skb_dst(skb))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (datalen &gt; cork-&gt;gso_size) {</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_size = cork-&gt;gso_size;</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type = SKB_GSO_UDP_L4;</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_segs = DIV_ROUND_UP(datalen,</div><div class='add'>+								 cork-&gt;gso_size);</div><div class='ctx'> </div><div class='del'>-		skb_shinfo(skb)-&gt;gso_size = cork-&gt;gso_size;</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type = SKB_GSO_UDP_L4;</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_segs = DIV_ROUND_UP(len - sizeof(uh),</div><div class='del'>-							 cork-&gt;gso_size);</div><div class='del'>-		goto csum_partial;</div><div class='add'>+			/* Don't checksum the payload, skb will get segmented */</div><div class='add'>+			goto csum_partial;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_udplite)  				 /*     UDP-Lite      */</div><div class='hunk'>@@ -828,7 +1194,8 @@ csum_partial:</div><div class='ctx'> send:</div><div class='ctx'> 	err = ip_send_skb(sock_net(sk), skb);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == -ENOBUFS &amp;&amp; !inet-&gt;recverr) {</div><div class='add'>+		if (err == -ENOBUFS &amp;&amp;</div><div class='add'>+		    !inet_test_bit(RECVERR, sk)) {</div><div class='ctx'> 			UDP_INC_STATS(sock_net(sk),</div><div class='ctx'> 				      UDP_MIB_SNDBUFERRORS, is_udplite);</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -858,10 +1225,10 @@ int udp_push_pending_frames(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	up-&gt;len = 0;</div><div class='del'>-	up-&gt;pending = 0;</div><div class='add'>+	WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_push_pending_frames);</div><div class='add'>+EXPORT_IPV6_MOD(udp_push_pending_frames);</div><div class='ctx'> </div><div class='ctx'> static int __udp_cmsg_send(struct cmsghdr *cmsg, u16 *gso_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -898,7 +1265,7 @@ int udp_cmsg_send(struct sock *sk, struct msghdr *msg, u16 *gso_size)</div><div class='ctx'> </div><div class='ctx'> 	return need_ip;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp_cmsg_send);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(udp_cmsg_send);</div><div class='ctx'> </div><div class='ctx'> int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -913,13 +1280,14 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	int free = 0;</div><div class='ctx'> 	int connected = 0;</div><div class='ctx'> 	__be32 daddr, faddr, saddr;</div><div class='add'>+	u8 scope;</div><div class='ctx'> 	__be16 dport;</div><div class='del'>-	u8  tos;</div><div class='ctx'> 	int err, is_udplite = IS_UDPLITE(sk);</div><div class='del'>-	int corkreq = up-&gt;corkflag || msg-&gt;msg_flags&amp;MSG_MORE;</div><div class='add'>+	int corkreq = udp_test_bit(CORK, sk) || msg-&gt;msg_flags &amp; MSG_MORE;</div><div class='ctx'> 	int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ip_options_data opt_copy;</div><div class='add'>+	int uc_index;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; 0xFFFF)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='hunk'>@@ -934,7 +1302,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;</div><div class='ctx'> </div><div class='ctx'> 	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='del'>-	if (up-&gt;pending) {</div><div class='add'>+	if (READ_ONCE(up-&gt;pending)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * There are pending frames.</div><div class='ctx'> 		 * The socket lock must be held while it's corked.</div><div class='hunk'>@@ -978,20 +1346,21 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipcm_init_sk(&amp;ipc, inet);</div><div class='del'>-	ipc.gso_size = up-&gt;gso_size;</div><div class='add'>+	ipc.gso_size = READ_ONCE(up-&gt;gso_size);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_controllen) {</div><div class='ctx'> 		err = udp_cmsg_send(sk, msg, &amp;ipc.gso_size);</div><div class='del'>-		if (err &gt; 0)</div><div class='add'>+		if (err &gt; 0) {</div><div class='ctx'> 			err = ip_cmsg_send(sk, msg, &amp;ipc,</div><div class='ctx'> 					   sk-&gt;sk_family == AF_INET6);</div><div class='add'>+			connected = 0;</div><div class='add'>+		}</div><div class='ctx'> 		if (unlikely(err &lt; 0)) {</div><div class='ctx'> 			kfree(ipc.opt);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ipc.opt)</div><div class='ctx'> 			free = 1;</div><div class='del'>-		connected = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ipc.opt) {</div><div class='ctx'> 		struct ip_options_rcu *inet_opt;</div><div class='hunk'>@@ -1006,9 +1375,11 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cgroup_bpf_enabled &amp;&amp; !connected) {</div><div class='add'>+	if (cgroup_bpf_enabled(CGROUP_UDP4_SENDMSG) &amp;&amp; !connected) {</div><div class='ctx'> 		err = BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK(sk,</div><div class='del'>-					    (struct sockaddr *)usin, &amp;ipc.addr);</div><div class='add'>+					    (struct sockaddr *)usin,</div><div class='add'>+					    &amp;msg-&gt;msg_namelen,</div><div class='add'>+					    &amp;ipc.addr);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		if (usin) {</div><div class='hunk'>@@ -1033,38 +1404,35 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		faddr = ipc.opt-&gt;opt.faddr;</div><div class='ctx'> 		connected = 0;</div><div class='ctx'> 	}</div><div class='del'>-	tos = get_rttos(&amp;ipc, inet);</div><div class='del'>-	if (sock_flag(sk, SOCK_LOCALROUTE) ||</div><div class='del'>-	    (msg-&gt;msg_flags &amp; MSG_DONTROUTE) ||</div><div class='del'>-	    (ipc.opt &amp;&amp; ipc.opt-&gt;opt.is_strictroute)) {</div><div class='del'>-		tos |= RTO_ONLINK;</div><div class='add'>+	scope = ip_sendmsg_scope(inet, &amp;ipc, msg);</div><div class='add'>+	if (scope == RT_SCOPE_LINK)</div><div class='ctx'> 		connected = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	uc_index = READ_ONCE(inet-&gt;uc_index);</div><div class='ctx'> 	if (ipv4_is_multicast(daddr)) {</div><div class='del'>-		if (!ipc.oif)</div><div class='del'>-			ipc.oif = inet-&gt;mc_index;</div><div class='add'>+		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))</div><div class='add'>+			ipc.oif = READ_ONCE(inet-&gt;mc_index);</div><div class='ctx'> 		if (!saddr)</div><div class='del'>-			saddr = inet-&gt;mc_addr;</div><div class='add'>+			saddr = READ_ONCE(inet-&gt;mc_addr);</div><div class='ctx'> 		connected = 0;</div><div class='ctx'> 	} else if (!ipc.oif) {</div><div class='del'>-		ipc.oif = inet-&gt;uc_index;</div><div class='del'>-	} else if (ipv4_is_lbcast(daddr) &amp;&amp; inet-&gt;uc_index) {</div><div class='add'>+		ipc.oif = uc_index;</div><div class='add'>+	} else if (ipv4_is_lbcast(daddr) &amp;&amp; uc_index) {</div><div class='ctx'> 		/* oif is set, packet is to local broadcast and</div><div class='del'>-		 * and uc_index is set. oif is most likely set</div><div class='add'>+		 * uc_index is set. oif is most likely set</div><div class='ctx'> 		 * by sk_bound_dev_if. If uc_index != oif check if the</div><div class='ctx'> 		 * oif is an L3 master and uc_index is an L3 slave.</div><div class='ctx'> 		 * If so, we want to allow the send using the uc_index.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ipc.oif != inet-&gt;uc_index &amp;&amp;</div><div class='add'>+		if (ipc.oif != uc_index &amp;&amp;</div><div class='ctx'> 		    ipc.oif == l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='del'>-							      inet-&gt;uc_index)) {</div><div class='del'>-			ipc.oif = inet-&gt;uc_index;</div><div class='add'>+							      uc_index)) {</div><div class='add'>+			ipc.oif = uc_index;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (connected)</div><div class='del'>-		rt = (struct rtable *)sk_dst_check(sk, 0);</div><div class='add'>+		rt = dst_rtable(sk_dst_check(sk, 0));</div><div class='ctx'> </div><div class='ctx'> 	if (!rt) {</div><div class='ctx'> 		struct net *net = sock_net(sk);</div><div class='hunk'>@@ -1072,13 +1440,13 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> </div><div class='ctx'> 		fl4 = &amp;fl4_stack;</div><div class='ctx'> </div><div class='del'>-		flowi4_init_output(fl4, ipc.oif, sk-&gt;sk_mark, tos,</div><div class='del'>-				   RT_SCOPE_UNIVERSE, sk-&gt;sk_protocol,</div><div class='del'>-				   flow_flags,</div><div class='del'>-				   faddr, saddr, dport, inet-&gt;inet_sport,</div><div class='del'>-				   sk-&gt;sk_uid);</div><div class='add'>+		flowi4_init_output(fl4, ipc.oif, ipc.sockc.mark,</div><div class='add'>+				   ipc.tos &amp; INET_DSCP_MASK, scope,</div><div class='add'>+				   sk-&gt;sk_protocol, flow_flags, faddr, saddr,</div><div class='add'>+				   dport, inet-&gt;inet_sport,</div><div class='add'>+				   sk_uid(sk));</div><div class='ctx'> </div><div class='del'>-		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));</div><div class='add'>+		security_sk_classify_flow(sk, flowi4_to_flowi_common(fl4));</div><div class='ctx'> 		rt = ip_route_output_flow(net, fl4, sk);</div><div class='ctx'> 		if (IS_ERR(rt)) {</div><div class='ctx'> 			err = PTR_ERR(rt);</div><div class='hunk'>@@ -1135,7 +1503,7 @@ back_from_confirm:</div><div class='ctx'> 	fl4-&gt;saddr = saddr;</div><div class='ctx'> 	fl4-&gt;fl4_dport = dport;</div><div class='ctx'> 	fl4-&gt;fl4_sport = inet-&gt;inet_sport;</div><div class='del'>-	up-&gt;pending = AF_INET;</div><div class='add'>+	WRITE_ONCE(up-&gt;pending, AF_INET);</div><div class='ctx'> </div><div class='ctx'> do_append_data:</div><div class='ctx'> 	up-&gt;len += ulen;</div><div class='hunk'>@@ -1147,7 +1515,7 @@ do_append_data:</div><div class='ctx'> 	else if (!corkreq)</div><div class='ctx'> 		err = udp_push_pending_frames(sk);</div><div class='ctx'> 	else if (unlikely(skb_queue_empty(&amp;sk-&gt;sk_write_queue)))</div><div class='del'>-		up-&gt;pending = 0;</div><div class='add'>+		WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1180,61 +1548,44 @@ do_confirm:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp_sendmsg);</div><div class='ctx'> </div><div class='del'>-int udp_sendpage(struct sock *sk, struct page *page, int offset,</div><div class='del'>-		 size_t size, int flags)</div><div class='add'>+void udp_splice_eof(struct socket *sock)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MSG_SENDPAGE_NOTLAST)</div><div class='del'>-		flags |= MSG_MORE;</div><div class='del'>-</div><div class='del'>-	if (!up-&gt;pending) {</div><div class='del'>-		struct msghdr msg = {	.msg_flags = flags|MSG_MORE };</div><div class='del'>-</div><div class='del'>-		/* Call udp_sendmsg to specify destination address which</div><div class='del'>-		 * sendpage interface can't pass.</div><div class='del'>-		 * This will succeed only when the socket is connected.</div><div class='del'>-		 */</div><div class='del'>-		ret = udp_sendmsg(sk, &amp;msg, 0);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	if (!READ_ONCE(up-&gt;pending) || udp_test_bit(CORK, sk))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='add'>+	if (up-&gt;pending &amp;&amp; !udp_test_bit(CORK, sk))</div><div class='add'>+		udp_push_pending_frames(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(udp_splice_eof);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!up-&gt;pending)) {</div><div class='del'>-		release_sock(sk);</div><div class='add'>+#define UDP_SKB_IS_STATELESS 0x80000000</div><div class='ctx'> </div><div class='del'>-		net_dbg_ratelimited("cork failed\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+/* all head states (dst, sk, nf conntrack) except skb extensions are</div><div class='add'>+ * cleared by udp_rcv().</div><div class='add'>+ *</div><div class='add'>+ * We need to preserve secpath, if present, to eventually process</div><div class='add'>+ * IP_CMSG_PASSSEC at recvmsg() time.</div><div class='add'>+ *</div><div class='add'>+ * Other extensions can be cleared.</div><div class='add'>+ */</div><div class='add'>+static bool udp_try_make_stateless(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!skb_has_extensions(skb))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	ret = ip_append_page(sk, &amp;inet-&gt;cork.fl.u.ip4,</div><div class='del'>-			     page, offset, size, flags);</div><div class='del'>-	if (ret == -EOPNOTSUPP) {</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		return sock_no_sendpage(sk-&gt;sk_socket, page, offset,</div><div class='del'>-					size, flags);</div><div class='del'>-	}</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		udp_flush_pending_frames(sk);</div><div class='del'>-		goto out;</div><div class='add'>+	if (!secpath_exists(skb)) {</div><div class='add'>+		skb_ext_reset(skb);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up-&gt;len += size;</div><div class='del'>-	if (!(up-&gt;corkflag || (flags&amp;MSG_MORE)))</div><div class='del'>-		ret = udp_push_pending_frames(sk);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = size;</div><div class='del'>-out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return ret;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define UDP_SKB_IS_STATELESS 0x80000000</div><div class='del'>-</div><div class='ctx'> static void udp_set_dev_scratch(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_dev_scratch *scratch = udp_skb_scratch(skb);</div><div class='hunk'>@@ -1246,14 +1597,24 @@ static void udp_set_dev_scratch(struct sk_buff *skb)</div><div class='ctx'> 	scratch-&gt;csum_unnecessary = !!skb_csum_unnecessary(skb);</div><div class='ctx'> 	scratch-&gt;is_linear = !skb_is_nonlinear(skb);</div><div class='ctx'> #endif</div><div class='del'>-	/* all head states execept sp (dst, sk, nf) are always cleared by</div><div class='del'>-	 * udp_rcv() and we need to preserve secpath, if present, to eventually</div><div class='del'>-	 * process IP_CMSG_PASSSEC at recvmsg() time</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!skb_sec_path(skb)))</div><div class='add'>+	if (udp_try_make_stateless(skb))</div><div class='ctx'> 		scratch-&gt;_tsize_state |= UDP_SKB_IS_STATELESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void udp_skb_csum_unnecessary_set(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* We come here after udp_lib_checksum_complete() returned 0.</div><div class='add'>+	 * This means that __skb_checksum_complete() might have</div><div class='add'>+	 * set skb-&gt;csum_valid to 1.</div><div class='add'>+	 * On 64bit platforms, we can set csum_unnecessary</div><div class='add'>+	 * to true, but only if the skb is not shared.</div><div class='add'>+	 */</div><div class='add'>+#if BITS_PER_LONG == 64</div><div class='add'>+	if (!skb_shared(skb))</div><div class='add'>+		udp_skb_scratch(skb)-&gt;csum_unnecessary = true;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int udp_skb_truesize(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return udp_skb_scratch(skb)-&gt;_tsize_state &amp; ~UDP_SKB_IS_STATELESS;</div><div class='hunk'>@@ -1265,17 +1626,18 @@ static bool udp_skb_has_head_state(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* fully reclaim rmem/fwd memory allocated for skb */</div><div class='del'>-static void udp_rmem_release(struct sock *sk, int size, int partial,</div><div class='del'>-			     bool rx_queue_lock_held)</div><div class='add'>+static void udp_rmem_release(struct sock *sk, unsigned int size,</div><div class='add'>+			     int partial, bool rx_queue_lock_held)</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	struct sk_buff_head *sk_queue;</div><div class='del'>-	int amt;</div><div class='add'>+	unsigned int amt;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(partial)) {</div><div class='ctx'> 		up-&gt;forward_deficit += size;</div><div class='ctx'> 		size = up-&gt;forward_deficit;</div><div class='del'>-		if (size &lt; (sk-&gt;sk_rcvbuf &gt;&gt; 2))</div><div class='add'>+		if (size &lt; READ_ONCE(up-&gt;forward_threshold) &amp;&amp;</div><div class='add'>+		    !skb_queue_empty(&amp;up-&gt;reader_queue))</div><div class='ctx'> 			return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		size += up-&gt;forward_deficit;</div><div class='hunk'>@@ -1289,13 +1651,11 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,</div><div class='ctx'> 	if (!rx_queue_lock_held)</div><div class='ctx'> 		spin_lock(&amp;sk_queue-&gt;lock);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	sk-&gt;sk_forward_alloc += size;</div><div class='del'>-	amt = (sk-&gt;sk_forward_alloc - partial) &amp; ~(SK_MEM_QUANTUM - 1);</div><div class='del'>-	sk-&gt;sk_forward_alloc -= amt;</div><div class='add'>+	amt = (size + sk-&gt;sk_forward_alloc - partial) &amp; ~(PAGE_SIZE - 1);</div><div class='add'>+	sk_forward_alloc_add(sk, size - amt);</div><div class='ctx'> </div><div class='ctx'> 	if (amt)</div><div class='del'>-		__sk_mem_reduce_allocated(sk, amt &gt;&gt; SK_MEM_QUANTUM_SHIFT);</div><div class='add'>+		__sk_mem_reduce_allocated(sk, amt &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	atomic_sub(size, &amp;sk-&gt;sk_rmem_alloc);</div><div class='ctx'> </div><div class='hunk'>@@ -1316,7 +1676,7 @@ void udp_skb_destructor(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	prefetch(&amp;skb-&gt;data);</div><div class='ctx'> 	udp_rmem_release(sk, udp_skb_truesize(skb), 1, false);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_skb_destructor);</div><div class='add'>+EXPORT_IPV6_MOD(udp_skb_destructor);</div><div class='ctx'> </div><div class='ctx'> /* as above, but the caller held the rx queue lock, too */</div><div class='ctx'> static void udp_skb_dtor_locked(struct sock *sk, struct sk_buff *skb)</div><div class='hunk'>@@ -1325,44 +1685,49 @@ static void udp_skb_dtor_locked(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	udp_rmem_release(sk, udp_skb_truesize(skb), 1, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Idea of busylocks is to let producers grab an extra spinlock</div><div class='del'>- * to relieve pressure on the receive_queue spinlock shared by consumer.</div><div class='del'>- * Under flood, this means that only one producer can be in line</div><div class='del'>- * trying to acquire the receive_queue spinlock.</div><div class='del'>- * These busylock can be allocated on a per cpu manner, instead of a</div><div class='del'>- * per socket one (that would consume a cache line per socket)</div><div class='del'>- */</div><div class='del'>-static int udp_busylocks_log __read_mostly;</div><div class='del'>-static spinlock_t *udp_busylocks __read_mostly;</div><div class='del'>-</div><div class='del'>-static spinlock_t *busylock_acquire(void *ptr)</div><div class='add'>+static int udp_rmem_schedule(struct sock *sk, int size)</div><div class='ctx'> {</div><div class='del'>-	spinlock_t *busy;</div><div class='add'>+	int delta;</div><div class='ctx'> </div><div class='del'>-	busy = udp_busylocks + hash_ptr(ptr, udp_busylocks_log);</div><div class='del'>-	spin_lock(busy);</div><div class='del'>-	return busy;</div><div class='del'>-}</div><div class='add'>+	delta = size - sk-&gt;sk_forward_alloc;</div><div class='add'>+	if (delta &gt; 0 &amp;&amp; !__sk_mem_schedule(sk, delta, SK_MEM_RECV))</div><div class='add'>+		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-static void busylock_release(spinlock_t *busy)</div><div class='del'>-{</div><div class='del'>-	if (busy)</div><div class='del'>-		spin_unlock(busy);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff_head *list = &amp;sk-&gt;sk_receive_queue;</div><div class='del'>-	int rmem, delta, amt, err = -ENOMEM;</div><div class='del'>-	spinlock_t *busy = NULL;</div><div class='del'>-	int size;</div><div class='add'>+	struct udp_prod_queue *udp_prod_queue;</div><div class='add'>+	struct sk_buff *next, *to_drop = NULL;</div><div class='add'>+	struct llist_node *ll_list;</div><div class='add'>+	unsigned int rmem, rcvbuf;</div><div class='add'>+	int size, err = -ENOMEM;</div><div class='add'>+	int total_size = 0;</div><div class='add'>+	int q_size = 0;</div><div class='add'>+	int dropcount;</div><div class='add'>+	int nb = 0;</div><div class='ctx'> </div><div class='del'>-	/* try to avoid the costly atomic add/sub pair when the receive</div><div class='del'>-	 * queue is full; always allow at least a packet</div><div class='del'>-	 */</div><div class='ctx'> 	rmem = atomic_read(&amp;sk-&gt;sk_rmem_alloc);</div><div class='del'>-	if (rmem &gt; sk-&gt;sk_rcvbuf)</div><div class='del'>-		goto drop;</div><div class='add'>+	rcvbuf = READ_ONCE(sk-&gt;sk_rcvbuf);</div><div class='add'>+	size = skb-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	udp_prod_queue = &amp;udp_sk(sk)-&gt;udp_prod_queue[numa_node_id()];</div><div class='add'>+</div><div class='add'>+	rmem += atomic_read(&amp;udp_prod_queue-&gt;rmem_alloc);</div><div class='add'>+</div><div class='add'>+	/* Immediately drop when the receive queue is full.</div><div class='add'>+	 * Cast to unsigned int performs the boundary check for INT_MAX.</div><div class='add'>+	 */</div><div class='add'>+	if (rmem + size &gt; rcvbuf) {</div><div class='add'>+		if (rcvbuf &gt; INT_MAX &gt;&gt; 1)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* Accept the packet if queue is empty. */</div><div class='add'>+		if (rmem)</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Under mem pressure, it might be helpful to help udp_recvmsg()</div><div class='ctx'> 	 * having linear skbs :</div><div class='hunk'>@@ -1370,61 +1735,85 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 * - Less cache line misses at copyout() time</div><div class='ctx'> 	 * - Less work at consume_skb() (less alien page frag freeing)</div><div class='ctx'> 	 */</div><div class='del'>-	if (rmem &gt; (sk-&gt;sk_rcvbuf &gt;&gt; 1)) {</div><div class='add'>+	if (rmem &gt; (rcvbuf &gt;&gt; 1)) {</div><div class='ctx'> 		skb_condense(skb);</div><div class='del'>-</div><div class='del'>-		busy = busylock_acquire(sk);</div><div class='add'>+		size = skb-&gt;truesize;</div><div class='ctx'> 	}</div><div class='del'>-	size = skb-&gt;truesize;</div><div class='add'>+</div><div class='ctx'> 	udp_set_dev_scratch(skb);</div><div class='ctx'> </div><div class='del'>-	/* we drop only if the receive buf is full and the receive</div><div class='del'>-	 * queue contains some other skb</div><div class='del'>-	 */</div><div class='del'>-	rmem = atomic_add_return(size, &amp;sk-&gt;sk_rmem_alloc);</div><div class='del'>-	if (rmem &gt; (size + sk-&gt;sk_rcvbuf))</div><div class='del'>-		goto uncharge_drop;</div><div class='add'>+	atomic_add(size, &amp;udp_prod_queue-&gt;rmem_alloc);</div><div class='add'>+</div><div class='add'>+	if (!llist_add(&amp;skb-&gt;ll_node, &amp;udp_prod_queue-&gt;ll_root))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dropcount = sock_flag(sk, SOCK_RXQ_OVFL) ? sk_drops_read(sk) : 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;list-&gt;lock);</div><div class='del'>-	if (size &gt;= sk-&gt;sk_forward_alloc) {</div><div class='del'>-		amt = sk_mem_pages(size);</div><div class='del'>-		delta = amt &lt;&lt; SK_MEM_QUANTUM_SHIFT;</div><div class='del'>-		if (!__sk_mem_raise_allocated(sk, delta, amt, SK_MEM_RECV)) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			spin_unlock(&amp;list-&gt;lock);</div><div class='del'>-			goto uncharge_drop;</div><div class='add'>+</div><div class='add'>+	ll_list = llist_del_all(&amp;udp_prod_queue-&gt;ll_root);</div><div class='add'>+</div><div class='add'>+	ll_list = llist_reverse_order(ll_list);</div><div class='add'>+</div><div class='add'>+	llist_for_each_entry_safe(skb, next, ll_list, ll_node) {</div><div class='add'>+		size = udp_skb_truesize(skb);</div><div class='add'>+		total_size += size;</div><div class='add'>+		err = udp_rmem_schedule(sk, size);</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			/*  Free the skbs outside of locked section. */</div><div class='add'>+			skb-&gt;next = to_drop;</div><div class='add'>+			to_drop = skb;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sk-&gt;sk_forward_alloc += delta;</div><div class='del'>-	}</div><div class='add'>+		q_size += size;</div><div class='add'>+		sk_forward_alloc_add(sk, -size);</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_forward_alloc -= size;</div><div class='add'>+		/* no need to setup a destructor, we will explicitly release the</div><div class='add'>+		 * forward allocated memory on dequeue</div><div class='add'>+		 */</div><div class='add'>+		SOCK_SKB_CB(skb)-&gt;dropcount = dropcount;</div><div class='add'>+		nb++;</div><div class='add'>+		__skb_queue_tail(list, skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* no need to setup a destructor, we will explicitly release the</div><div class='del'>-	 * forward allocated memory on dequeue</div><div class='del'>-	 */</div><div class='del'>-	sock_skb_set_dropcount(sk, skb);</div><div class='add'>+	atomic_add(q_size, &amp;sk-&gt;sk_rmem_alloc);</div><div class='ctx'> </div><div class='del'>-	__skb_queue_tail(list, skb);</div><div class='ctx'> 	spin_unlock(&amp;list-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (!sock_flag(sk, SOCK_DEAD))</div><div class='del'>-		sk-&gt;sk_data_ready(sk);</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='add'>+		/* Multiple threads might be blocked in recvmsg(),</div><div class='add'>+		 * using prepare_to_wait_exclusive().</div><div class='add'>+		 */</div><div class='add'>+		while (nb) {</div><div class='add'>+			INDIRECT_CALL_1(sk-&gt;sk_data_ready,</div><div class='add'>+					sock_def_readable, sk);</div><div class='add'>+			nb--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	busylock_release(busy);</div><div class='del'>-	return 0;</div><div class='add'>+	if (unlikely(to_drop)) {</div><div class='add'>+		for (nb = 0; to_drop != NULL; nb++) {</div><div class='add'>+			skb = to_drop;</div><div class='add'>+			to_drop = skb-&gt;next;</div><div class='add'>+			skb_mark_not_on_list(skb);</div><div class='add'>+			/* TODO: update SNMP values. */</div><div class='add'>+			sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_PROTO_MEM);</div><div class='add'>+		}</div><div class='add'>+		numa_drop_add(&amp;udp_sk(sk)-&gt;drop_counters, nb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_sub(total_size, &amp;udp_prod_queue-&gt;rmem_alloc);</div><div class='ctx'> </div><div class='del'>-uncharge_drop:</div><div class='del'>-	atomic_sub(skb-&gt;truesize, &amp;sk-&gt;sk_rmem_alloc);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-	busylock_release(busy);</div><div class='add'>+	udp_drops_inc(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__udp_enqueue_schedule_skb);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(__udp_enqueue_schedule_skb);</div><div class='ctx'> </div><div class='del'>-void udp_destruct_sock(struct sock *sk)</div><div class='add'>+void udp_destruct_common(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	/* reclaim completely the forward allocated memory */</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='hunk'>@@ -1437,26 +1826,33 @@ void udp_destruct_sock(struct sock *sk)</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	udp_rmem_release(sk, total, 0, true);</div><div class='add'>+	kfree(up-&gt;udp_prod_queue);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD_GPL(udp_destruct_common);</div><div class='ctx'> </div><div class='add'>+static void udp_destruct_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	udp_destruct_common(sk);</div><div class='ctx'> 	inet_sock_destruct(sk);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp_destruct_sock);</div><div class='ctx'> </div><div class='ctx'> int udp_init_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	skb_queue_head_init(&amp;udp_sk(sk)-&gt;reader_queue);</div><div class='add'>+	int res = udp_lib_init_sock(sk);</div><div class='add'>+</div><div class='ctx'> 	sk-&gt;sk_destruct = udp_destruct_sock;</div><div class='del'>-	return 0;</div><div class='add'>+	set_bit(SOCK_SUPPORT_ZC, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp_init_sock);</div><div class='ctx'> </div><div class='ctx'> void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(READ_ONCE(sk-&gt;sk_peek_off) &gt;= 0)) {</div><div class='del'>-		bool slow = lock_sock_fast(sk);</div><div class='del'>-</div><div class='add'>+	if (unlikely(READ_ONCE(udp_sk(sk)-&gt;peeking_with_offset)))</div><div class='ctx'> 		sk_peek_offset_bwd(sk, len);</div><div class='del'>-		unlock_sock_fast(sk, slow);</div><div class='add'>+</div><div class='add'>+	if (!skb_shared(skb)) {</div><div class='add'>+		skb_attempt_defer_free(skb);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_unref(skb))</div><div class='hunk'>@@ -1469,11 +1865,11 @@ void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len)</div><div class='ctx'> 		skb_release_head_state(skb);</div><div class='ctx'> 	__consume_stateless_skb(skb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(skb_consume_udp);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(skb_consume_udp);</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *__first_packet_length(struct sock *sk,</div><div class='ctx'> 					     struct sk_buff_head *rcvq,</div><div class='del'>-					     int *total)</div><div class='add'>+					     unsigned int *total)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -1483,15 +1879,12 @@ static struct sk_buff *__first_packet_length(struct sock *sk,</div><div class='ctx'> 					IS_UDPLITE(sk));</div><div class='ctx'> 			__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS,</div><div class='ctx'> 					IS_UDPLITE(sk));</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+			udp_drops_inc(sk);</div><div class='ctx'> 			__skb_unlink(skb, rcvq);</div><div class='ctx'> 			*total += skb-&gt;truesize;</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			kfree_skb_reason(skb, SKB_DROP_REASON_UDP_CSUM);</div><div class='ctx'> 		} else {</div><div class='del'>-			/* the csum related bits could be changed, refresh</div><div class='del'>-			 * the scratch area</div><div class='del'>-			 */</div><div class='del'>-			udp_set_dev_scratch(skb);</div><div class='add'>+			udp_skb_csum_unnecessary_set(skb);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1509,13 +1902,13 @@ static int first_packet_length(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff_head *rcvq = &amp;udp_sk(sk)-&gt;reader_queue;</div><div class='ctx'> 	struct sk_buff_head *sk_queue = &amp;sk-&gt;sk_receive_queue;</div><div class='add'>+	unsigned int total = 0;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int total = 0;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rcvq-&gt;lock);</div><div class='ctx'> 	skb = __first_packet_length(sk, rcvq, &amp;total);</div><div class='del'>-	if (!skb &amp;&amp; !skb_queue_empty(sk_queue)) {</div><div class='add'>+	if (!skb &amp;&amp; !skb_queue_empty_lockless(sk_queue)) {</div><div class='ctx'> 		spin_lock(&amp;sk_queue-&gt;lock);</div><div class='ctx'> 		skb_queue_splice_tail_init(sk_queue, rcvq);</div><div class='ctx'> 		spin_unlock(&amp;sk_queue-&gt;lock);</div><div class='hunk'>@@ -1533,21 +1926,19 @@ static int first_packet_length(struct sock *sk)</div><div class='ctx'>  *	IOCTL requests applicable to the UDP protocol</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+int udp_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCOUTQ:</div><div class='ctx'> 	{</div><div class='del'>-		int amount = sk_wmem_alloc_get(sk);</div><div class='del'>-</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		*karg = sk_wmem_alloc_get(sk);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case SIOCINQ:</div><div class='ctx'> 	{</div><div class='del'>-		int amount = max_t(int, 0, first_packet_length(sk));</div><div class='del'>-</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		*karg = max_t(int, 0, first_packet_length(sk));</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1556,10 +1947,10 @@ int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_ioctl);</div><div class='add'>+EXPORT_IPV6_MOD(udp_ioctl);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *__skb_recv_udp(struct sock *sk, unsigned int flags,</div><div class='del'>-			       int noblock, int *peeked, int *off, int *err)</div><div class='add'>+			       int *off, int *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff_head *sk_queue = &amp;sk-&gt;sk_receive_queue;</div><div class='ctx'> 	struct sk_buff_head *queue;</div><div class='hunk'>@@ -1568,7 +1959,6 @@ struct sk_buff *__skb_recv_udp(struct sock *sk, unsigned int flags,</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	queue = &amp;udp_sk(sk)-&gt;reader_queue;</div><div class='del'>-	flags |= noblock ? MSG_DONTWAIT : 0;</div><div class='ctx'> 	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='hunk'>@@ -1578,19 +1968,18 @@ struct sk_buff *__skb_recv_udp(struct sock *sk, unsigned int flags,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		error = -EAGAIN;</div><div class='del'>-		*peeked = 0;</div><div class='ctx'> 		do {</div><div class='ctx'> 			spin_lock_bh(&amp;queue-&gt;lock);</div><div class='del'>-			skb = __skb_try_recv_from_queue(sk, queue, flags,</div><div class='del'>-							udp_skb_destructor,</div><div class='del'>-							peeked, off, err,</div><div class='add'>+			skb = __skb_try_recv_from_queue(queue, flags, off, err,</div><div class='ctx'> 							&amp;last);</div><div class='ctx'> 			if (skb) {</div><div class='add'>+				if (!(flags &amp; MSG_PEEK))</div><div class='add'>+					udp_skb_destructor(sk, skb);</div><div class='ctx'> 				spin_unlock_bh(&amp;queue-&gt;lock);</div><div class='ctx'> 				return skb;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (skb_queue_empty(sk_queue)) {</div><div class='add'>+			if (skb_queue_empty_lockless(sk_queue)) {</div><div class='ctx'> 				spin_unlock_bh(&amp;queue-&gt;lock);</div><div class='ctx'> 				goto busy_check;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1603,10 +1992,10 @@ struct sk_buff *__skb_recv_udp(struct sock *sk, unsigned int flags,</div><div class='ctx'> 			spin_lock(&amp;sk_queue-&gt;lock);</div><div class='ctx'> 			skb_queue_splice_tail_init(sk_queue, queue);</div><div class='ctx'> </div><div class='del'>-			skb = __skb_try_recv_from_queue(sk, queue, flags,</div><div class='del'>-							udp_skb_dtor_locked,</div><div class='del'>-							peeked, off, err,</div><div class='add'>+			skb = __skb_try_recv_from_queue(queue, flags, off, err,</div><div class='ctx'> 							&amp;last);</div><div class='add'>+			if (skb &amp;&amp; !(flags &amp; MSG_PEEK))</div><div class='add'>+				udp_skb_dtor_locked(sk, skb);</div><div class='ctx'> 			spin_unlock(&amp;sk_queue-&gt;lock);</div><div class='ctx'> 			spin_unlock_bh(&amp;queue-&gt;lock);</div><div class='ctx'> 			if (skb)</div><div class='hunk'>@@ -1617,11 +2006,12 @@ busy_check:</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			sk_busy_loop(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-		} while (!skb_queue_empty(sk_queue));</div><div class='add'>+		} while (!skb_queue_empty_lockless(sk_queue));</div><div class='ctx'> </div><div class='ctx'> 		/* sk_queue is empty, reader_queue may contain peeked packets */</div><div class='ctx'> 	} while (timeo &amp;&amp;</div><div class='del'>-		 !__skb_wait_for_more_packets(sk, &amp;error, &amp;timeo,</div><div class='add'>+		 !__skb_wait_for_more_packets(sk, &amp;sk-&gt;sk_receive_queue,</div><div class='add'>+					      &amp;error, &amp;timeo,</div><div class='ctx'> 					      (struct sk_buff *)sk_queue));</div><div class='ctx'> </div><div class='ctx'> 	*err = error;</div><div class='hunk'>@@ -1629,20 +2019,45 @@ busy_check:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__skb_recv_udp);</div><div class='ctx'> </div><div class='add'>+int udp_read_skb(struct sock *sk, skb_read_actor_t recv_actor)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+try_again:</div><div class='add'>+	skb = skb_recv_udp(sk, MSG_DONTWAIT, &amp;err);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (udp_lib_checksum_complete(skb)) {</div><div class='add'>+		int is_udplite = IS_UDPLITE(sk);</div><div class='add'>+		struct net *net = sock_net(sk);</div><div class='add'>+</div><div class='add'>+		__UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, is_udplite);</div><div class='add'>+		__UDP_INC_STATS(net, UDP_MIB_INERRORS, is_udplite);</div><div class='add'>+		udp_drops_inc(sk);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_UDP_CSUM);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!skb_set_owner_sk_safe(skb, sk));</div><div class='add'>+	return recv_actor(sk, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(udp_read_skb);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * 	This should be easy, if there is something there we</div><div class='ctx'>  * 	return it, otherwise we block.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='del'>-		int flags, int *addr_len)</div><div class='add'>+int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,</div><div class='add'>+		int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg-&gt;msg_name);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int ulen, copied;</div><div class='del'>-	int peeked, peeking, off;</div><div class='del'>-	int err;</div><div class='add'>+	int off, err, peeking = flags &amp; MSG_PEEK;</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> 	bool checksum_valid = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1650,9 +2065,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='ctx'> 		return ip_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='ctx'> try_again:</div><div class='del'>-	peeking = flags &amp; MSG_PEEK;</div><div class='ctx'> 	off = sk_peek_offset(sk, flags);</div><div class='del'>-	skb = __skb_recv_udp(sk, flags, noblock, &amp;peeked, &amp;off, &amp;err);</div><div class='add'>+	skb = __skb_recv_udp(sk, flags, &amp;off, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1690,8 +2104,8 @@ try_again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		if (!peeked) {</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+		if (!peeking) {</div><div class='add'>+			udp_drops_inc(sk);</div><div class='ctx'> 			UDP_INC_STATS(sock_net(sk),</div><div class='ctx'> 				      UDP_MIB_INERRORS, is_udplite);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1699,11 +2113,11 @@ try_again:</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!peeked)</div><div class='add'>+	if (!peeking)</div><div class='ctx'> 		UDP_INC_STATS(sock_net(sk),</div><div class='ctx'> 			      UDP_MIB_INDATAGRAMS, is_udplite);</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the address. */</div><div class='ctx'> 	if (sin) {</div><div class='hunk'>@@ -1712,8 +2126,16 @@ try_again:</div><div class='ctx'> 		sin-&gt;sin_addr.s_addr = ip_hdr(skb)-&gt;saddr;</div><div class='ctx'> 		memset(sin-&gt;sin_zero, 0, sizeof(sin-&gt;sin_zero));</div><div class='ctx'> 		*addr_len = sizeof(*sin);</div><div class='add'>+</div><div class='add'>+		BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK(sk,</div><div class='add'>+						      (struct sockaddr *)sin,</div><div class='add'>+						      addr_len);</div><div class='ctx'> 	}</div><div class='del'>-	if (inet-&gt;cmsg_flags)</div><div class='add'>+</div><div class='add'>+	if (udp_test_bit(GRO_ENABLED, sk))</div><div class='add'>+		udp_cmsg_recv(msg, sk, skb);</div><div class='add'>+</div><div class='add'>+	if (inet_cmsg_flags(inet))</div><div class='ctx'> 		ip_cmsg_recv_offset(msg, sk, skb, sizeof(struct udphdr), off);</div><div class='ctx'> </div><div class='ctx'> 	err = copied;</div><div class='hunk'>@@ -1729,7 +2151,7 @@ csum_copy_err:</div><div class='ctx'> 		UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);</div><div class='ctx'> 		UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);</div><div class='ctx'> 	}</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_UDP_CSUM);</div><div class='ctx'> </div><div class='ctx'> 	/* starting over for a new packet, but check if we need to yield */</div><div class='ctx'> 	cond_resched();</div><div class='hunk'>@@ -1737,7 +2159,8 @@ csum_copy_err:</div><div class='ctx'> 	goto try_again;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int udp_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+		    int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	/* This check is replicated from __ip4_datagram_connect() and</div><div class='ctx'> 	 * intended to prevent BPF program called below from accessing bytes</div><div class='hunk'>@@ -1746,9 +2169,22 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	if (addr_len &lt; sizeof(struct sockaddr_in))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK(sk, uaddr);</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK(sk, uaddr, &amp;addr_len);</div><div class='add'>+}</div><div class='add'>+EXPORT_IPV6_MOD(udp_pre_connect);</div><div class='add'>+</div><div class='add'>+static int udp_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+		       int addr_len)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	res = __ip4_datagram_connect(sk, uaddr, addr_len);</div><div class='add'>+	if (!res)</div><div class='add'>+		udp4_hash4(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_pre_connect);</div><div class='ctx'> </div><div class='ctx'> int __udp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1762,8 +2198,12 @@ int __udp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 	inet-&gt;inet_dport = 0;</div><div class='ctx'> 	sock_rps_reset_rxhash(sk);</div><div class='ctx'> 	sk-&gt;sk_bound_dev_if = 0;</div><div class='del'>-	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK))</div><div class='add'>+	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDADDR_LOCK)) {</div><div class='ctx'> 		inet_reset_saddr(sk);</div><div class='add'>+		if (sk-&gt;sk_prot-&gt;rehash &amp;&amp;</div><div class='add'>+		    (sk-&gt;sk_userlocks &amp; SOCK_BINDPORT_LOCK))</div><div class='add'>+			sk-&gt;sk_prot-&gt;rehash(sk);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(sk-&gt;sk_userlocks &amp; SOCK_BINDPORT_LOCK)) {</div><div class='ctx'> 		sk-&gt;sk_prot-&gt;unhash(sk);</div><div class='hunk'>@@ -1781,14 +2221,15 @@ int udp_disconnect(struct sock *sk, int flags)</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_disconnect);</div><div class='add'>+EXPORT_IPV6_MOD(udp_disconnect);</div><div class='ctx'> </div><div class='ctx'> void udp_lib_unhash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	if (sk_hashed(sk)) {</div><div class='del'>-		struct udp_table *udptable = sk-&gt;sk_prot-&gt;h.udp_table;</div><div class='add'>+		struct udp_table *udptable = udp_get_table_prot(sk);</div><div class='ctx'> 		struct udp_hslot *hslot, *hslot2;</div><div class='ctx'> </div><div class='add'>+		sock_rps_delete_flow(sk);</div><div class='ctx'> 		hslot  = udp_hashslot(udptable, sock_net(sk),</div><div class='ctx'> 				      udp_sk(sk)-&gt;udp_port_hash);</div><div class='ctx'> 		hslot2 = udp_hashslot2(udptable, udp_sk(sk)-&gt;udp_portaddr_hash);</div><div class='hunk'>@@ -1805,29 +2246,31 @@ void udp_lib_unhash(struct sock *sk)</div><div class='ctx'> 			hlist_del_init_rcu(&amp;udp_sk(sk)-&gt;udp_portaddr_node);</div><div class='ctx'> 			hslot2-&gt;count--;</div><div class='ctx'> 			spin_unlock(&amp;hslot2-&gt;lock);</div><div class='add'>+</div><div class='add'>+			udp_unhash4(udptable, sk);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_lib_unhash);</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_unhash);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * inet_rcv_saddr was changed, we must rehash secondary hash</div><div class='ctx'>  */</div><div class='del'>-void udp_lib_rehash(struct sock *sk, u16 newhash)</div><div class='add'>+void udp_lib_rehash(struct sock *sk, u16 newhash, u16 newhash4)</div><div class='ctx'> {</div><div class='ctx'> 	if (sk_hashed(sk)) {</div><div class='del'>-		struct udp_table *udptable = sk-&gt;sk_prot-&gt;h.udp_table;</div><div class='add'>+		struct udp_table *udptable = udp_get_table_prot(sk);</div><div class='ctx'> 		struct udp_hslot *hslot, *hslot2, *nhslot2;</div><div class='ctx'> </div><div class='add'>+		hslot = udp_hashslot(udptable, sock_net(sk),</div><div class='add'>+				     udp_sk(sk)-&gt;udp_port_hash);</div><div class='ctx'> 		hslot2 = udp_hashslot2(udptable, udp_sk(sk)-&gt;udp_portaddr_hash);</div><div class='ctx'> 		nhslot2 = udp_hashslot2(udptable, newhash);</div><div class='ctx'> 		udp_sk(sk)-&gt;udp_portaddr_hash = newhash;</div><div class='ctx'> </div><div class='ctx'> 		if (hslot2 != nhslot2 ||</div><div class='ctx'> 		    rcu_access_pointer(sk-&gt;sk_reuseport_cb)) {</div><div class='del'>-			hslot = udp_hashslot(udptable, sock_net(sk),</div><div class='del'>-					     udp_sk(sk)-&gt;udp_port_hash);</div><div class='ctx'> 			/* we must lock primary chain too */</div><div class='ctx'> 			spin_lock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> 			if (rcu_access_pointer(sk-&gt;sk_reuseport_cb))</div><div class='hunk'>@@ -1848,16 +2291,43 @@ void udp_lib_rehash(struct sock *sk, u16 newhash)</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Now process hash4 if necessary:</div><div class='add'>+		 * (1) update hslot4;</div><div class='add'>+		 * (2) update hslot2-&gt;hash4_cnt.</div><div class='add'>+		 * Note that hslot2/hslot4 should be checked separately, as</div><div class='add'>+		 * either of them may change with the other unchanged.</div><div class='add'>+		 */</div><div class='add'>+		if (udp_hashed4(sk)) {</div><div class='add'>+			spin_lock_bh(&amp;hslot-&gt;lock);</div><div class='add'>+</div><div class='add'>+			udp_rehash4(udptable, sk, newhash4);</div><div class='add'>+			if (hslot2 != nhslot2) {</div><div class='add'>+				spin_lock(&amp;hslot2-&gt;lock);</div><div class='add'>+				udp_hash4_dec(hslot2);</div><div class='add'>+				spin_unlock(&amp;hslot2-&gt;lock);</div><div class='add'>+</div><div class='add'>+				spin_lock(&amp;nhslot2-&gt;lock);</div><div class='add'>+				udp_hash4_inc(nhslot2);</div><div class='add'>+				spin_unlock(&amp;nhslot2-&gt;lock);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_lib_rehash);</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_rehash);</div><div class='ctx'> </div><div class='del'>-static void udp_v4_rehash(struct sock *sk)</div><div class='add'>+void udp_v4_rehash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	u16 new_hash = ipv4_portaddr_hash(sock_net(sk),</div><div class='ctx'> 					  inet_sk(sk)-&gt;inet_rcv_saddr,</div><div class='ctx'> 					  inet_sk(sk)-&gt;inet_num);</div><div class='del'>-	udp_lib_rehash(sk, new_hash);</div><div class='add'>+	u16 new_hash4 = udp_ehashfn(sock_net(sk),</div><div class='add'>+				    sk-&gt;sk_rcv_saddr, sk-&gt;sk_num,</div><div class='add'>+				    sk-&gt;sk_daddr, sk-&gt;sk_dport);</div><div class='add'>+</div><div class='add'>+	udp_lib_rehash(sk, new_hash, new_hash4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='hunk'>@@ -1875,27 +2345,27 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	rc = __udp_enqueue_schedule_skb(sk, skb);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		int is_udplite = IS_UDPLITE(sk);</div><div class='add'>+		int drop_reason;</div><div class='ctx'> </div><div class='ctx'> 		/* Note that an ENOMEM error is charged twice */</div><div class='del'>-		if (rc == -ENOMEM)</div><div class='add'>+		if (rc == -ENOMEM) {</div><div class='ctx'> 			UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,</div><div class='ctx'> 					is_udplite);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_SOCKET_RCVBUFF;</div><div class='add'>+		} else {</div><div class='add'>+			UDP_INC_STATS(sock_net(sk), UDP_MIB_MEMERRORS,</div><div class='add'>+				      is_udplite);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_PROTO_MEM;</div><div class='add'>+		}</div><div class='ctx'> 		UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		trace_udp_fail_queue_rcv_skb(rc, sk);</div><div class='add'>+		trace_udp_fail_queue_rcv_skb(rc, sk, skb);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key);</div><div class='del'>-void udp_encap_enable(void)</div><div class='del'>-{</div><div class='del'>-	static_branch_enable(&amp;udp_encap_needed_key);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(udp_encap_enable);</div><div class='del'>-</div><div class='ctx'> /* returns:</div><div class='ctx'>  *  -1: error</div><div class='ctx'>  *   0: success</div><div class='hunk'>@@ -1904,19 +2374,23 @@ EXPORT_SYMBOL(udp_encap_enable);</div><div class='ctx'>  * Note that in the success and error cases, the skb is assumed to</div><div class='ctx'>  * have either been requeued or freed.</div><div class='ctx'>  */</div><div class='del'>-static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Charge it to the socket, dropping if the queue is full.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		goto drop;</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	}</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;udp_encap_needed_key) &amp;&amp; up-&gt;encap_type) {</div><div class='add'>+	if (static_branch_unlikely(&amp;udp_encap_needed_key) &amp;&amp;</div><div class='add'>+	    READ_ONCE(up-&gt;encap_type)) {</div><div class='ctx'> 		int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1954,7 +2428,8 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 	UDP-Lite specific tests, ignored on UDP sockets</div><div class='ctx'> 	 */</div><div class='del'>-	if ((is_udplite &amp; UDPLITE_RECV_CC)  &amp;&amp;  UDP_SKB_CB(skb)-&gt;partial_cov) {</div><div class='add'>+	if (udp_test_bit(UDPLITE_RECV_CC, sk) &amp;&amp; UDP_SKB_CB(skb)-&gt;partial_cov) {</div><div class='add'>+		u16 pcrlen = READ_ONCE(up-&gt;pcrlen);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * MIB statistics other than incrementing the error count are</div><div class='hunk'>@@ -1967,7 +2442,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * delivery of packets with coverage values less than a value</div><div class='ctx'> 		 * provided by the application."</div><div class='ctx'> 		 */</div><div class='del'>-		if (up-&gt;pcrlen == 0) {          /* full coverage was set  */</div><div class='add'>+		if (pcrlen == 0) {          /* full coverage was set  */</div><div class='ctx'> 			net_dbg_ratelimited("UDPLite: partial coverage %d while full coverage %d requested\n",</div><div class='ctx'> 					    UDP_SKB_CB(skb)-&gt;cscov, skb-&gt;len);</div><div class='ctx'> 			goto drop;</div><div class='hunk'>@@ -1978,9 +2453,9 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * that it wants x while sender emits packets of smaller size y.</div><div class='ctx'> 		 * Therefore the above ...()-&gt;partial_cov statement is essential.</div><div class='ctx'> 		 */</div><div class='del'>-		if (UDP_SKB_CB(skb)-&gt;cscov  &lt;  up-&gt;pcrlen) {</div><div class='add'>+		if (UDP_SKB_CB(skb)-&gt;cscov &lt; pcrlen) {</div><div class='ctx'> 			net_dbg_ratelimited("UDPLite: coverage %d too small, need min %d\n",</div><div class='del'>-					    UDP_SKB_CB(skb)-&gt;cscov, up-&gt;pcrlen);</div><div class='add'>+					    UDP_SKB_CB(skb)-&gt;cscov, pcrlen);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1990,23 +2465,46 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	    udp_lib_checksum_complete(skb))</div><div class='ctx'> 			goto csum_error;</div><div class='ctx'> </div><div class='del'>-	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr)))</div><div class='add'>+	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr), &amp;drop_reason))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	udp_csum_pull_header(skb);</div><div class='ctx'> </div><div class='del'>-	ipv4_pktinfo_prepare(sk, skb);</div><div class='add'>+	ipv4_pktinfo_prepare(sk, skb, true);</div><div class='ctx'> 	return __udp_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='ctx'> csum_error:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_UDP_CSUM;</div><div class='ctx'> 	__UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);</div><div class='ctx'> drop:</div><div class='ctx'> 	__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-	atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	udp_drops_inc(sk);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *next, *segs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (likely(!udp_unexpected_gso(sk, skb)))</div><div class='add'>+		return udp_queue_rcv_one_skb(sk, skb);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct udp_skb_cb) &gt; SKB_GSO_CB_OFFSET);</div><div class='add'>+	__skb_push(skb, -skb_mac_offset(skb));</div><div class='add'>+	segs = udp_rcv_segment(sk, skb, true);</div><div class='add'>+	skb_list_walk_safe(segs, skb, next) {</div><div class='add'>+		__skb_pull(skb, skb_transport_offset(skb));</div><div class='add'>+</div><div class='add'>+		udp_post_segment_fix_csum(skb);</div><div class='add'>+		ret = udp_queue_rcv_one_skb(sk, skb);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			ip_protocol_deliver_rcu(dev_net(skb-&gt;dev), skb, ret);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* For TCP sockets, sk_rx_dst is protected by socket lock</div><div class='ctx'>  * For UDP, we use xchg() to guard against concurrent changes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2015,13 +2513,13 @@ bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst)</div><div class='ctx'> 	struct dst_entry *old;</div><div class='ctx'> </div><div class='ctx'> 	if (dst_hold_safe(dst)) {</div><div class='del'>-		old = xchg(&amp;sk-&gt;sk_rx_dst, dst);</div><div class='add'>+		old = unrcu_pointer(xchg(&amp;sk-&gt;sk_rx_dst, RCU_INITIALIZER(dst)));</div><div class='ctx'> 		dst_release(old);</div><div class='ctx'> 		return old != dst;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_sk_rx_dst_set);</div><div class='add'>+EXPORT_IPV6_MOD(udp_sk_rx_dst_set);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Multicasts and broadcasts go to each listener.</div><div class='hunk'>@@ -2049,7 +2547,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			    udptable-&gt;mask;</div><div class='ctx'> 		hash2 = ipv4_portaddr_hash(net, daddr, hnum) &amp; udptable-&gt;mask;</div><div class='ctx'> start_lookup:</div><div class='del'>-		hslot = &amp;udptable-&gt;hash2[hash2];</div><div class='add'>+		hslot = &amp;udptable-&gt;hash2[hash2].hslot;</div><div class='ctx'> 		offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2065,7 +2563,7 @@ start_lookup:</div><div class='ctx'> 		nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!nskb)) {</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+			udp_drops_inc(sk);</div><div class='ctx'> 			__UDP_INC_STATS(net, UDP_MIB_RCVBUFERRORS,</div><div class='ctx'> 					IS_UDPLITE(sk));</div><div class='ctx'> 			__UDP_INC_STATS(net, UDP_MIB_INERRORS,</div><div class='hunk'>@@ -2095,7 +2593,7 @@ start_lookup:</div><div class='ctx'> </div><div class='ctx'> /* Initialize UDP checksum. If exited with zero value (success),</div><div class='ctx'>  * CHECKSUM_UNNECESSARY means, that no more checks are required.</div><div class='del'>- * Otherwise, csum completion requires chacksumming packet body,</div><div class='add'>+ * Otherwise, csum completion requires checksumming packet body,</div><div class='ctx'>  * including udp header and folding it to skb-&gt;csum.</div><div class='ctx'>  */</div><div class='ctx'> static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh,</div><div class='hunk'>@@ -2120,11 +2618,27 @@ static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh,</div><div class='ctx'> 	/* Note, we are only interested in != 0 or == 0, thus the</div><div class='ctx'> 	 * force to int.</div><div class='ctx'> 	 */</div><div class='del'>-	return (__force int)skb_checksum_init_zero_check(skb, proto, uh-&gt;check,</div><div class='del'>-							 inet_compute_pseudo);</div><div class='add'>+	err = (__force int)skb_checksum_init_zero_check(skb, proto, uh-&gt;check,</div><div class='add'>+							inet_compute_pseudo);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE &amp;&amp; !skb-&gt;csum_valid) {</div><div class='add'>+		/* If SW calculated the value, we know it's bad */</div><div class='add'>+		if (skb-&gt;csum_complete_sw)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* HW says the value is bad. Let's validate that.</div><div class='add'>+		 * skb-&gt;csum is no longer the full packet checksum,</div><div class='add'>+		 * so don't treat it as such.</div><div class='add'>+		 */</div><div class='add'>+		skb_checksum_complete_unset(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* wrapper for udp_queue_rcv_skb tacking care of csum conversion and</div><div class='add'>+/* wrapper for udp_queue_rcv_skb taking care of csum conversion and</div><div class='ctx'>  * return code conversion for ip layer consumption</div><div class='ctx'>  */</div><div class='ctx'> static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,</div><div class='hunk'>@@ -2133,8 +2647,7 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (inet_get_convert_csum(sk) &amp;&amp; uh-&gt;check &amp;&amp; !IS_UDPLITE(sk))</div><div class='del'>-		skb_checksum_try_convert(skb, IPPROTO_UDP, uh-&gt;check,</div><div class='del'>-					 inet_compute_pseudo);</div><div class='add'>+		skb_checksum_try_convert(skb, IPPROTO_UDP, inet_compute_pseudo);</div><div class='ctx'> </div><div class='ctx'> 	ret = udp_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -2153,12 +2666,16 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 		   int proto)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='ctx'> 	struct udphdr *uh;</div><div class='ctx'> 	unsigned short ulen;</div><div class='ctx'> 	struct rtable *rt = skb_rtable(skb);</div><div class='ctx'> 	__be32 saddr, daddr;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	bool refcounted;</div><div class='add'>+	int drop_reason;</div><div class='add'>+</div><div class='add'>+	drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Validate the packet.</div><div class='hunk'>@@ -2184,16 +2701,21 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 	if (udp4_csum_init(skb, uh, proto))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='del'>-	sk = skb_steal_sock(skb);</div><div class='add'>+	sk = inet_steal_sock(net, skb, sizeof(struct udphdr), saddr, uh-&gt;source, daddr, uh-&gt;dest,</div><div class='add'>+			     &amp;refcounted, udp_ehashfn);</div><div class='add'>+	if (IS_ERR(sk))</div><div class='add'>+		goto no_sk;</div><div class='add'>+</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(sk-&gt;sk_rx_dst != dst))</div><div class='add'>+		if (unlikely(rcu_dereference(sk-&gt;sk_rx_dst) != dst))</div><div class='ctx'> 			udp_sk_rx_dst_set(sk, dst);</div><div class='ctx'> </div><div class='ctx'> 		ret = udp_unicast_rcv_skb(sk, skb, uh);</div><div class='del'>-		sock_put(sk);</div><div class='add'>+		if (refcounted)</div><div class='add'>+			sock_put(sk);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2204,15 +2726,16 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 	sk = __udp4_lib_lookup_skb(skb, uh-&gt;source, uh-&gt;dest, udptable);</div><div class='ctx'> 	if (sk)</div><div class='ctx'> 		return udp_unicast_rcv_skb(sk, skb, uh);</div><div class='del'>-</div><div class='add'>+no_sk:</div><div class='ctx'> 	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto drop;</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* No socket. Drop packet silently, if checksum is wrong */</div><div class='ctx'> 	if (udp_lib_checksum_complete(skb))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='add'>+	drop_reason = SKB_DROP_REASON_NO_SOCKET;</div><div class='ctx'> 	__UDP_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);</div><div class='ctx'> 	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2220,10 +2743,11 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 	 * Hmm.  We got an UDP packet to a port to which we</div><div class='ctx'> 	 * don't wanna listen.  Ignore it.</div><div class='ctx'> 	 */</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> short_packet:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 	net_dbg_ratelimited("UDP%s: short packet: From %pI4:%u %d/%d to %pI4:%u\n",</div><div class='ctx'> 			    proto == IPPROTO_UDPLITE ? "Lite" : "",</div><div class='ctx'> 			    &amp;saddr, ntohs(uh-&gt;source),</div><div class='hunk'>@@ -2236,6 +2760,7 @@ csum_error:</div><div class='ctx'> 	 * RFC1122: OK.  Discards the bad packet silently (as far as</div><div class='ctx'> 	 * the network is concerned, anyway) as per 4.1.3.4 (MUST).</div><div class='ctx'> 	 */</div><div class='add'>+	drop_reason = SKB_DROP_REASON_UDP_CSUM;</div><div class='ctx'> 	net_dbg_ratelimited("UDP%s: bad checksum. From %pI4:%u to %pI4:%u ulen %d\n",</div><div class='ctx'> 			    proto == IPPROTO_UDPLITE ? "Lite" : "",</div><div class='ctx'> 			    &amp;saddr, ntohs(uh-&gt;source), &amp;daddr, ntohs(uh-&gt;dest),</div><div class='hunk'>@@ -2243,7 +2768,7 @@ csum_error:</div><div class='ctx'> 	__UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);</div><div class='ctx'> drop:</div><div class='ctx'> 	__UDP_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2255,10 +2780,14 @@ static struct sock *__udp4_lib_mcast_demux_lookup(struct net *net,</div><div class='ctx'> 						  __be16 rmt_port, __be32 rmt_addr,</div><div class='ctx'> 						  int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk, *result;</div><div class='add'>+	struct udp_table *udptable = net-&gt;ipv4.udp_table;</div><div class='ctx'> 	unsigned short hnum = ntohs(loc_port);</div><div class='del'>-	unsigned int slot = udp_hashfn(net, hnum, udp_table.mask);</div><div class='del'>-	struct udp_hslot *hslot = &amp;udp_table.hash[slot];</div><div class='add'>+	struct sock *sk, *result;</div><div class='add'>+	struct udp_hslot *hslot;</div><div class='add'>+	unsigned int slot;</div><div class='add'>+</div><div class='add'>+	slot = udp_hashfn(net, hnum, udptable-&gt;mask);</div><div class='add'>+	hslot = &amp;udptable-&gt;hash[slot];</div><div class='ctx'> </div><div class='ctx'> 	/* Do not bother scanning a too big list */</div><div class='ctx'> 	if (hslot-&gt;count &gt; 10)</div><div class='hunk'>@@ -2286,17 +2815,20 @@ static struct sock *__udp4_lib_demux_lookup(struct net *net,</div><div class='ctx'> 					    __be16 rmt_port, __be32 rmt_addr,</div><div class='ctx'> 					    int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	unsigned short hnum = ntohs(loc_port);</div><div class='del'>-	unsigned int hash2 = ipv4_portaddr_hash(net, loc_addr, hnum);</div><div class='del'>-	unsigned int slot2 = hash2 &amp; udp_table.mask;</div><div class='del'>-	struct udp_hslot *hslot2 = &amp;udp_table.hash2[slot2];</div><div class='add'>+	struct udp_table *udptable = net-&gt;ipv4.udp_table;</div><div class='ctx'> 	INET_ADDR_COOKIE(acookie, rmt_addr, loc_addr);</div><div class='del'>-	const __portpair ports = INET_COMBINED_PORTS(rmt_port, hnum);</div><div class='add'>+	unsigned short hnum = ntohs(loc_port);</div><div class='add'>+	struct udp_hslot *hslot2;</div><div class='add'>+	unsigned int hash2;</div><div class='add'>+	__portpair ports;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='add'>+	hash2 = ipv4_portaddr_hash(net, loc_addr, hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+	ports = INET_COMBINED_PORTS(rmt_port, hnum);</div><div class='add'>+</div><div class='ctx'> 	udp_portaddr_for_each_entry_rcu(sk, &amp;hslot2-&gt;head) {</div><div class='del'>-		if (INET_MATCH(sk, net, acookie, rmt_addr,</div><div class='del'>-			       loc_addr, ports, dif, sdif))</div><div class='add'>+		if (inet_match(net, sk, acookie, ports, dif, sdif))</div><div class='ctx'> 			return sk;</div><div class='ctx'> 		/* Only check first socket in chain */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2304,7 +2836,7 @@ static struct sock *__udp4_lib_demux_lookup(struct net *net,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int udp_v4_early_demux(struct sk_buff *skb)</div><div class='add'>+enum skb_drop_reason udp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct in_device *in_dev = NULL;</div><div class='hunk'>@@ -2318,7 +2850,7 @@ int udp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* validate the packet */</div><div class='ctx'> 	if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(struct udphdr)))</div><div class='del'>-		return 0;</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='ctx'> </div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='ctx'> 	uh = udp_hdr(skb);</div><div class='hunk'>@@ -2327,12 +2859,12 @@ int udp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> 		in_dev = __in_dev_get_rcu(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if (!in_dev)</div><div class='del'>-			return 0;</div><div class='add'>+			return SKB_NOT_DROPPED_YET;</div><div class='ctx'> </div><div class='ctx'> 		ours = ip_check_mc_rcu(in_dev, iph-&gt;daddr, iph-&gt;saddr,</div><div class='ctx'> 				       iph-&gt;protocol);</div><div class='ctx'> 		if (!ours)</div><div class='del'>-			return 0;</div><div class='add'>+			return SKB_NOT_DROPPED_YET;</div><div class='ctx'> </div><div class='ctx'> 		sk = __udp4_lib_mcast_demux_lookup(net, uh-&gt;dest, iph-&gt;daddr,</div><div class='ctx'> 						   uh-&gt;source, iph-&gt;saddr,</div><div class='hunk'>@@ -2342,12 +2874,13 @@ int udp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> 					     uh-&gt;source, iph-&gt;saddr, dif, sdif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sk || !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!sk)</div><div class='add'>+		return SKB_NOT_DROPPED_YET;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;sk = sk;</div><div class='del'>-	skb-&gt;destructor = sock_efree;</div><div class='del'>-	dst = READ_ONCE(sk-&gt;sk_rx_dst);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(sk_is_refcounted(sk));</div><div class='add'>+	skb-&gt;destructor = sock_pfree;</div><div class='add'>+	dst = rcu_dereference(sk-&gt;sk_rx_dst);</div><div class='ctx'> </div><div class='ctx'> 	if (dst)</div><div class='ctx'> 		dst = dst_check(dst, 0);</div><div class='hunk'>@@ -2365,36 +2898,77 @@ int udp_v4_early_demux(struct sk_buff *skb)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!inet_sk(sk)-&gt;inet_daddr &amp;&amp; in_dev)</div><div class='ctx'> 			return ip_mc_validate_source(skb, iph-&gt;daddr,</div><div class='del'>-						     iph-&gt;saddr, iph-&gt;tos,</div><div class='add'>+						     iph-&gt;saddr,</div><div class='add'>+						     ip4h_dscp(iph),</div><div class='ctx'> 						     skb-&gt;dev, in_dev, &amp;itag);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int udp_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return __udp4_lib_rcv(skb, &amp;udp_table, IPPROTO_UDP);</div><div class='add'>+	return __udp4_lib_rcv(skb, dev_net(skb-&gt;dev)-&gt;ipv4.udp_table, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void udp_destroy_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	bool slow = lock_sock_fast(sk);</div><div class='add'>+</div><div class='add'>+	/* protects from races with udp_abort() */</div><div class='add'>+	sock_set_flag(sk, SOCK_DEAD);</div><div class='ctx'> 	udp_flush_pending_frames(sk);</div><div class='ctx'> 	unlock_sock_fast(sk, slow);</div><div class='del'>-	if (static_branch_unlikely(&amp;udp_encap_needed_key) &amp;&amp; up-&gt;encap_type) {</div><div class='del'>-		void (*encap_destroy)(struct sock *sk);</div><div class='del'>-		encap_destroy = READ_ONCE(up-&gt;encap_destroy);</div><div class='del'>-		if (encap_destroy)</div><div class='del'>-			encap_destroy(sk);</div><div class='add'>+	if (static_branch_unlikely(&amp;udp_encap_needed_key)) {</div><div class='add'>+		if (up-&gt;encap_type) {</div><div class='add'>+			void (*encap_destroy)(struct sock *sk);</div><div class='add'>+			encap_destroy = READ_ONCE(up-&gt;encap_destroy);</div><div class='add'>+			if (encap_destroy)</div><div class='add'>+				encap_destroy(sk);</div><div class='add'>+		}</div><div class='add'>+		if (udp_test_bit(ENCAP_ENABLED, sk)) {</div><div class='add'>+			static_branch_dec(&amp;udp_encap_needed_key);</div><div class='add'>+			udp_tunnel_cleanup_gro(sk);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+typedef struct sk_buff *(*udp_gro_receive_t)(struct sock *sk,</div><div class='add'>+					     struct list_head *head,</div><div class='add'>+					     struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+static void set_xfrm_gro_udp_encap_rcv(__u16 encap_type, unsigned short family,</div><div class='add'>+				       struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='add'>+	udp_gro_receive_t new_gro_receive;</div><div class='add'>+</div><div class='add'>+	if (udp_test_bit(GRO_ENABLED, sk) &amp;&amp; encap_type == UDP_ENCAP_ESPINUDP) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_IPV6) &amp;&amp; family == AF_INET6)</div><div class='add'>+			new_gro_receive = ipv6_stub-&gt;xfrm6_gro_udp_encap_rcv;</div><div class='add'>+		else</div><div class='add'>+			new_gro_receive = xfrm4_gro_udp_encap_rcv;</div><div class='add'>+</div><div class='add'>+		if (udp_sk(sk)-&gt;gro_receive != new_gro_receive) {</div><div class='add'>+			/*</div><div class='add'>+			 * With IPV6_ADDRFORM the gro callback could change</div><div class='add'>+			 * after being set, unregister the old one, if valid.</div><div class='add'>+			 */</div><div class='add'>+			if (udp_sk(sk)-&gt;gro_receive)</div><div class='add'>+				udp_tunnel_update_gro_rcv(sk, false);</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(udp_sk(sk)-&gt;gro_receive, new_gro_receive);</div><div class='add'>+			udp_tunnel_update_gro_rcv(sk, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Socket option code for UDP</div><div class='ctx'>  */</div><div class='ctx'> int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		       char __user *optval, unsigned int optlen,</div><div class='add'>+		       sockptr_t optval, unsigned int optlen,</div><div class='ctx'> 		       int (*push_pending_frames)(struct sock *))</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='hunk'>@@ -2402,10 +2976,22 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> </div><div class='add'>+	if (level == SOL_SOCKET) {</div><div class='add'>+		err = sk_setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+</div><div class='add'>+		if (optname == SO_RCVBUF || optname == SO_RCVBUFFORCE) {</div><div class='add'>+			sockopt_lock_sock(sk);</div><div class='add'>+			/* paired with READ_ONCE in udp_rmem_release() */</div><div class='add'>+			WRITE_ONCE(up-&gt;forward_threshold, sk-&gt;sk_rcvbuf &gt;&gt; 2);</div><div class='add'>+			sockopt_release_sock(sk);</div><div class='add'>+		}</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	valbool = val ? 1 : 0;</div><div class='hunk'>@@ -2413,9 +2999,9 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case UDP_CORK:</div><div class='ctx'> 		if (val != 0) {</div><div class='del'>-			up-&gt;corkflag = 1;</div><div class='add'>+			udp_set_bit(CORK, sk);</div><div class='ctx'> 		} else {</div><div class='del'>-			up-&gt;corkflag = 0;</div><div class='add'>+			udp_clear_bit(CORK, sk);</div><div class='ctx'> 			lock_sock(sk);</div><div class='ctx'> 			push_pending_frames(sk);</div><div class='ctx'> 			release_sock(sk);</div><div class='hunk'>@@ -2423,34 +3009,56 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_ENCAP:</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='ctx'> 		switch (val) {</div><div class='ctx'> 		case 0:</div><div class='add'>+#ifdef CONFIG_XFRM</div><div class='ctx'> 		case UDP_ENCAP_ESPINUDP:</div><div class='del'>-		case UDP_ENCAP_ESPINUDP_NON_IKE:</div><div class='del'>-			up-&gt;encap_rcv = xfrm4_udp_encap_rcv;</div><div class='del'>-			/* FALLTHROUGH */</div><div class='add'>+			set_xfrm_gro_udp_encap_rcv(val, sk-&gt;sk_family, sk);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+				WRITE_ONCE(up-&gt;encap_rcv,</div><div class='add'>+					   ipv6_stub-&gt;xfrm6_udp_encap_rcv);</div><div class='add'>+			else</div><div class='add'>+#endif</div><div class='add'>+				WRITE_ONCE(up-&gt;encap_rcv,</div><div class='add'>+					   xfrm4_udp_encap_rcv);</div><div class='add'>+#endif</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case UDP_ENCAP_L2TPINUDP:</div><div class='del'>-			up-&gt;encap_type = val;</div><div class='del'>-			udp_encap_enable();</div><div class='add'>+			WRITE_ONCE(up-&gt;encap_type, val);</div><div class='add'>+			udp_tunnel_encap_enable(sk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err = -ENOPROTOOPT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_NO_CHECK6_TX:</div><div class='del'>-		up-&gt;no_check6_tx = valbool;</div><div class='add'>+		udp_set_no_check6_tx(sk, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_NO_CHECK6_RX:</div><div class='del'>-		up-&gt;no_check6_rx = valbool;</div><div class='add'>+		udp_set_no_check6_rx(sk, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_SEGMENT:</div><div class='ctx'> 		if (val &lt; 0 || val &gt; USHRT_MAX)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		up-&gt;gso_size = val;</div><div class='add'>+		WRITE_ONCE(up-&gt;gso_size, val);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UDP_GRO:</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='add'>+		/* when enabling GRO, accept the related GSO packet type */</div><div class='add'>+		if (valbool)</div><div class='add'>+			udp_tunnel_encap_enable(sk);</div><div class='add'>+		udp_assign_bit(GRO_ENABLED, sk, valbool);</div><div class='add'>+		udp_assign_bit(ACCEPT_L4, sk, valbool);</div><div class='add'>+		set_xfrm_gro_udp_encap_rcv(up-&gt;encap_type, sk-&gt;sk_family, sk);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2465,8 +3073,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			val = 8;</div><div class='ctx'> 		else if (val &gt; USHRT_MAX)</div><div class='ctx'> 			val = USHRT_MAX;</div><div class='del'>-		up-&gt;pcslen = val;</div><div class='del'>-		up-&gt;pcflag |= UDPLITE_SEND_CC;</div><div class='add'>+		WRITE_ONCE(up-&gt;pcslen, val);</div><div class='add'>+		udp_set_bit(UDPLITE_SEND_CC, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* The receiver specifies a minimum checksum coverage value. To make</div><div class='hunk'>@@ -2479,8 +3087,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			val = 8;</div><div class='ctx'> 		else if (val &gt; USHRT_MAX)</div><div class='ctx'> 			val = USHRT_MAX;</div><div class='del'>-		up-&gt;pcrlen = val;</div><div class='del'>-		up-&gt;pcflag |= UDPLITE_RECV_CC;</div><div class='add'>+		WRITE_ONCE(up-&gt;pcrlen, val);</div><div class='add'>+		udp_set_bit(UDPLITE_RECV_CC, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2490,28 +3098,18 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_lib_setsockopt);</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_setsockopt);</div><div class='ctx'> </div><div class='del'>-int udp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		   char __user *optval, unsigned int optlen)</div><div class='add'>+int udp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		   unsigned int optlen)</div><div class='ctx'> {</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_setsockopt(sk, level, optname, optval, optlen,</div><div class='add'>+	if (level == SOL_UDP  ||  level == SOL_UDPLITE || level == SOL_SOCKET)</div><div class='add'>+		return udp_lib_setsockopt(sk, level, optname,</div><div class='add'>+					  optval, optlen,</div><div class='ctx'> 					  udp_push_pending_frames);</div><div class='ctx'> 	return ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_setsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-					  udp_push_pending_frames);</div><div class='del'>-	return compat_ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> int udp_lib_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		       char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -2521,40 +3119,44 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	if (get_user(len, optlen))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	len = min_t(unsigned int, len, sizeof(int));</div><div class='del'>-</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	len = min_t(unsigned int, len, sizeof(int));</div><div class='add'>+</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case UDP_CORK:</div><div class='del'>-		val = up-&gt;corkflag;</div><div class='add'>+		val = udp_test_bit(CORK, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_ENCAP:</div><div class='del'>-		val = up-&gt;encap_type;</div><div class='add'>+		val = READ_ONCE(up-&gt;encap_type);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_NO_CHECK6_TX:</div><div class='del'>-		val = up-&gt;no_check6_tx;</div><div class='add'>+		val = udp_get_no_check6_tx(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_NO_CHECK6_RX:</div><div class='del'>-		val = up-&gt;no_check6_rx;</div><div class='add'>+		val = udp_get_no_check6_rx(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDP_SEGMENT:</div><div class='del'>-		val = up-&gt;gso_size;</div><div class='add'>+		val = READ_ONCE(up-&gt;gso_size);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case UDP_GRO:</div><div class='add'>+		val = udp_test_bit(GRO_ENABLED, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* The following two cannot be changed on UDP sockets, the return is</div><div class='ctx'> 	 * always 0 (which corresponds to the full checksum coverage of UDP). */</div><div class='ctx'> 	case UDPLITE_SEND_CSCOV:</div><div class='del'>-		val = up-&gt;pcslen;</div><div class='add'>+		val = READ_ONCE(up-&gt;pcslen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case UDPLITE_RECV_CSCOV:</div><div class='del'>-		val = up-&gt;pcrlen;</div><div class='add'>+		val = READ_ONCE(up-&gt;pcrlen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2567,7 +3169,7 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_lib_getsockopt);</div><div class='add'>+EXPORT_IPV6_MOD(udp_lib_getsockopt);</div><div class='ctx'> </div><div class='ctx'> int udp_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		   char __user *optval, int __user *optlen)</div><div class='hunk'>@@ -2577,20 +3179,11 @@ int udp_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return ip_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-				 char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return compat_ip_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> /**</div><div class='ctx'>  * 	udp_poll - wait for a UDP event.</div><div class='del'>- *	@file - file struct</div><div class='del'>- *	@sock - socket</div><div class='del'>- *	@wait - poll table</div><div class='add'>+ *	@file: - file struct</div><div class='add'>+ *	@sock: - socket</div><div class='add'>+ *	@wait: - poll table</div><div class='ctx'>  *</div><div class='ctx'>  *	This is same as datagram poll, except for the special case of</div><div class='ctx'>  *	blocking sockets. If application is using a blocking fd</div><div class='hunk'>@@ -2604,7 +3197,7 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 	__poll_t mask = datagram_poll(file, sock, wait);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='del'>-	if (!skb_queue_empty(&amp;udp_sk(sk)-&gt;reader_queue))</div><div class='add'>+	if (!skb_queue_empty_lockless(&amp;udp_sk(sk)-&gt;reader_queue))</div><div class='ctx'> 		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for false positives due to checksum errors */</div><div class='hunk'>@@ -2612,31 +3205,43 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)</div><div class='ctx'> 	    !(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) &amp;&amp; first_packet_length(sk) == -1)</div><div class='ctx'> 		mask &amp;= ~(EPOLLIN | EPOLLRDNORM);</div><div class='ctx'> </div><div class='add'>+	/* psock ingress_msg queue should not contain any bad checksum frames */</div><div class='add'>+	if (sk_is_readable(sk))</div><div class='add'>+		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	return mask;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_poll);</div><div class='add'>+EXPORT_IPV6_MOD(udp_poll);</div><div class='ctx'> </div><div class='ctx'> int udp_abort(struct sock *sk, int err)</div><div class='ctx'> {</div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	if (!has_current_bpf_ctx())</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* udp{v6}_destroy_sock() sets it under the sk lock, avoid racing</div><div class='add'>+	 * with close()</div><div class='add'>+	 */</div><div class='add'>+	if (sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_err = err;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> 	__udp_disconnect(sk, 0);</div><div class='ctx'> </div><div class='del'>-	release_sock(sk);</div><div class='add'>+out:</div><div class='add'>+	if (!has_current_bpf_ctx())</div><div class='add'>+		release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp_abort);</div><div class='add'>+EXPORT_IPV6_MOD_GPL(udp_abort);</div><div class='ctx'> </div><div class='ctx'> struct proto udp_prot = {</div><div class='ctx'> 	.name			= "UDP",</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.close			= udp_lib_close,</div><div class='ctx'> 	.pre_connect		= udp_pre_connect,</div><div class='del'>-	.connect		= ip4_datagram_connect,</div><div class='add'>+	.connect		= udp_connect,</div><div class='ctx'> 	.disconnect		= udp_disconnect,</div><div class='ctx'> 	.ioctl			= udp_ioctl,</div><div class='ctx'> 	.init			= udp_init_sock,</div><div class='hunk'>@@ -2645,22 +3250,24 @@ struct proto udp_prot = {</div><div class='ctx'> 	.getsockopt		= udp_getsockopt,</div><div class='ctx'> 	.sendmsg		= udp_sendmsg,</div><div class='ctx'> 	.recvmsg		= udp_recvmsg,</div><div class='del'>-	.sendpage		= udp_sendpage,</div><div class='add'>+	.splice_eof		= udp_splice_eof,</div><div class='ctx'> 	.release_cb		= ip4_datagram_release_cb,</div><div class='ctx'> 	.hash			= udp_lib_hash,</div><div class='ctx'> 	.unhash			= udp_lib_unhash,</div><div class='ctx'> 	.rehash			= udp_v4_rehash,</div><div class='ctx'> 	.get_port		= udp_v4_get_port,</div><div class='del'>-	.memory_allocated	= &amp;udp_memory_allocated,</div><div class='add'>+	.put_port		= udp_lib_unhash,</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	.psock_update_sk_prot	= udp_bpf_update_proto,</div><div class='add'>+#endif</div><div class='add'>+	.memory_allocated	= &amp;net_aligned_data.udp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc	= &amp;udp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.sysctl_mem		= sysctl_udp_mem,</div><div class='ctx'> 	.sysctl_wmem_offset	= offsetof(struct net, ipv4.sysctl_udp_wmem_min),</div><div class='ctx'> 	.sysctl_rmem_offset	= offsetof(struct net, ipv4.sysctl_udp_rmem_min),</div><div class='ctx'> 	.obj_size		= sizeof(struct udp_sock),</div><div class='del'>-	.h.udp_table		= &amp;udp_table,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt	= compat_udp_setsockopt,</div><div class='del'>-	.compat_getsockopt	= compat_udp_getsockopt,</div><div class='del'>-#endif</div><div class='add'>+	.h.udp_table		= NULL,</div><div class='ctx'> 	.diag_destroy		= udp_abort,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(udp_prot);</div><div class='hunk'>@@ -2668,25 +3275,52 @@ EXPORT_SYMBOL(udp_prot);</div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='add'>+static unsigned short seq_file_family(const struct seq_file *seq);</div><div class='add'>+static bool seq_sk_match(struct seq_file *seq, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	unsigned short family = seq_file_family(seq);</div><div class='add'>+</div><div class='add'>+	/* AF_UNSPEC is used as a match all */</div><div class='add'>+	return ((family == AF_UNSPEC || family == sk-&gt;sk_family) &amp;&amp;</div><div class='add'>+		net_eq(sock_net(sk), seq_file_net(seq)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+static const struct seq_operations bpf_iter_udp_seq_ops;</div><div class='add'>+#endif</div><div class='add'>+static struct udp_table *udp_get_table_seq(struct seq_file *seq,</div><div class='add'>+					   struct net *net)</div><div class='add'>+{</div><div class='add'>+	const struct udp_seq_afinfo *afinfo;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	if (seq-&gt;op == &amp;bpf_iter_udp_seq_ops)</div><div class='add'>+		return net-&gt;ipv4.udp_table;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	afinfo = pde_data(file_inode(seq-&gt;file));</div><div class='add'>+	return afinfo-&gt;udp_table ? : net-&gt;ipv4.udp_table;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sock *udp_get_first(struct seq_file *seq, int start)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct udp_iter_state *state = seq-&gt;private;</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	udptable = udp_get_table_seq(seq, net);</div><div class='ctx'> </div><div class='del'>-	for (state-&gt;bucket = start; state-&gt;bucket &lt;= afinfo-&gt;udp_table-&gt;mask;</div><div class='add'>+	for (state-&gt;bucket = start; state-&gt;bucket &lt;= udptable-&gt;mask;</div><div class='ctx'> 	     ++state-&gt;bucket) {</div><div class='del'>-		struct udp_hslot *hslot = &amp;afinfo-&gt;udp_table-&gt;hash[state-&gt;bucket];</div><div class='add'>+		struct udp_hslot *hslot = &amp;udptable-&gt;hash[state-&gt;bucket];</div><div class='ctx'> </div><div class='ctx'> 		if (hlist_empty(&amp;hslot-&gt;head))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> 		sk_for_each(sk, &amp;hslot-&gt;head) {</div><div class='del'>-			if (!net_eq(sock_net(sk), net))</div><div class='del'>-				continue;</div><div class='del'>-			if (sk-&gt;sk_family == afinfo-&gt;family)</div><div class='add'>+			if (seq_sk_match(seq, sk))</div><div class='ctx'> 				goto found;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='hunk'>@@ -2698,17 +3332,20 @@ found:</div><div class='ctx'> </div><div class='ctx'> static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct udp_iter_state *state = seq-&gt;private;</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct udp_table *udptable;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		sk = sk_next(sk);</div><div class='del'>-	} while (sk &amp;&amp; (!net_eq(sock_net(sk), net) || sk-&gt;sk_family != afinfo-&gt;family));</div><div class='add'>+	} while (sk &amp;&amp; !seq_sk_match(seq, sk));</div><div class='ctx'> </div><div class='ctx'> 	if (!sk) {</div><div class='del'>-		if (state-&gt;bucket &lt;= afinfo-&gt;udp_table-&gt;mask)</div><div class='del'>-			spin_unlock_bh(&amp;afinfo-&gt;udp_table-&gt;hash[state-&gt;bucket].lock);</div><div class='add'>+		udptable = udp_get_table_seq(seq, net);</div><div class='add'>+</div><div class='add'>+		if (state-&gt;bucket &lt;= udptable-&gt;mask)</div><div class='add'>+			spin_unlock_bh(&amp;udptable-&gt;hash[state-&gt;bucket].lock);</div><div class='add'>+</div><div class='ctx'> 		return udp_get_first(seq, state-&gt;bucket + 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -2731,7 +3368,7 @@ void *udp_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> 	return *pos ? udp_get_idx(seq, *pos-1) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_seq_start);</div><div class='add'>+EXPORT_IPV6_MOD(udp_seq_start);</div><div class='ctx'> </div><div class='ctx'> void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='hunk'>@@ -2745,17 +3382,19 @@ void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	++*pos;</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_seq_next);</div><div class='add'>+EXPORT_IPV6_MOD(udp_seq_next);</div><div class='ctx'> </div><div class='ctx'> void udp_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct udp_iter_state *state = seq-&gt;private;</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+</div><div class='add'>+	udptable = udp_get_table_seq(seq, seq_file_net(seq));</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;bucket &lt;= afinfo-&gt;udp_table-&gt;mask)</div><div class='del'>-		spin_unlock_bh(&amp;afinfo-&gt;udp_table-&gt;hash[state-&gt;bucket].lock);</div><div class='add'>+	if (state-&gt;bucket &lt;= udptable-&gt;mask)</div><div class='add'>+		spin_unlock_bh(&amp;udptable-&gt;hash[state-&gt;bucket].lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udp_seq_stop);</div><div class='add'>+EXPORT_IPV6_MOD(udp_seq_stop);</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> static void udp4_format_sock(struct sock *sp, struct seq_file *f,</div><div class='hunk'>@@ -2768,22 +3407,22 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,</div><div class='ctx'> 	__u16 srcp	  = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%5d: %08X:%04X %08X:%04X"</div><div class='del'>-		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",</div><div class='add'>+		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u",</div><div class='ctx'> 		bucket, src, srcp, dest, destp, sp-&gt;sk_state,</div><div class='ctx'> 		sk_wmem_alloc_get(sp),</div><div class='ctx'> 		udp_rqueue_get(sp),</div><div class='ctx'> 		0, 0L, 0,</div><div class='del'>-		from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),</div><div class='add'>+		from_kuid_munged(seq_user_ns(f), sk_uid(sp)),</div><div class='ctx'> 		0, sock_i_ino(sp),</div><div class='ctx'> 		refcount_read(&amp;sp-&gt;sk_refcnt), sp,</div><div class='del'>-		atomic_read(&amp;sp-&gt;sk_drops));</div><div class='add'>+		sk_drops_read(sp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int udp4_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	seq_setwidth(seq, 127);</div><div class='ctx'> 	if (v == SEQ_START_TOKEN)</div><div class='del'>-		seq_puts(seq, "  sl  local_address rem_address   st tx_queue "</div><div class='add'>+		seq_puts(seq, "   sl  local_address rem_address   st tx_queue "</div><div class='ctx'> 			   "rx_queue tr tm-&gt;when retrnsmt   uid  timeout "</div><div class='ctx'> 			   "inode ref pointer drops");</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -2795,17 +3434,305 @@ int udp4_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+struct bpf_iter__udp {</div><div class='add'>+	__bpf_md_ptr(struct bpf_iter_meta *, meta);</div><div class='add'>+	__bpf_md_ptr(struct udp_sock *, udp_sk);</div><div class='add'>+	uid_t uid __aligned(8);</div><div class='add'>+	int bucket __aligned(8);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union bpf_udp_iter_batch_item {</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	__u64 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_udp_iter_state {</div><div class='add'>+	struct udp_iter_state state;</div><div class='add'>+	unsigned int cur_sk;</div><div class='add'>+	unsigned int end_sk;</div><div class='add'>+	unsigned int max_sk;</div><div class='add'>+	union bpf_udp_iter_batch_item *batch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bpf_iter_udp_realloc_batch(struct bpf_udp_iter_state *iter,</div><div class='add'>+				      unsigned int new_batch_sz, gfp_t flags);</div><div class='add'>+static struct sock *bpf_iter_udp_resume(struct sock *first_sk,</div><div class='add'>+					union bpf_udp_iter_batch_item *cookies,</div><div class='add'>+					int n_cookies)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_cookies; i++) {</div><div class='add'>+		sk = first_sk;</div><div class='add'>+		udp_portaddr_for_each_entry_from(sk)</div><div class='add'>+			if (cookies[i].cookie == atomic64_read(&amp;sk-&gt;sk_cookie))</div><div class='add'>+				goto done;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *bpf_iter_udp_batch(struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct bpf_udp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct udp_iter_state *state = &amp;iter-&gt;state;</div><div class='add'>+	unsigned int find_cookie, end_cookie;</div><div class='add'>+	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+	unsigned int batch_sks = 0;</div><div class='add'>+	int resume_bucket;</div><div class='add'>+	int resizes = 0;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	resume_bucket = state-&gt;bucket;</div><div class='add'>+</div><div class='add'>+	/* The current batch is done, so advance the bucket. */</div><div class='add'>+	if (iter-&gt;cur_sk == iter-&gt;end_sk)</div><div class='add'>+		state-&gt;bucket++;</div><div class='add'>+</div><div class='add'>+	udptable = udp_get_table_seq(seq, net);</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	/* New batch for the next bucket.</div><div class='add'>+	 * Iterate over the hash table to find a bucket with sockets matching</div><div class='add'>+	 * the iterator attributes, and return the first matching socket from</div><div class='add'>+	 * the bucket. The remaining matched sockets from the bucket are batched</div><div class='add'>+	 * before releasing the bucket lock. This allows BPF programs that are</div><div class='add'>+	 * called in seq_show to acquire the bucket lock if needed.</div><div class='add'>+	 */</div><div class='add'>+	find_cookie = iter-&gt;cur_sk;</div><div class='add'>+	end_cookie = iter-&gt;end_sk;</div><div class='add'>+	iter-&gt;cur_sk = 0;</div><div class='add'>+	iter-&gt;end_sk = 0;</div><div class='add'>+	batch_sks = 0;</div><div class='add'>+</div><div class='add'>+	for (; state-&gt;bucket &lt;= udptable-&gt;mask; state-&gt;bucket++) {</div><div class='add'>+		struct udp_hslot *hslot2 = &amp;udptable-&gt;hash2[state-&gt;bucket].hslot;</div><div class='add'>+</div><div class='add'>+		if (hlist_empty(&amp;hslot2-&gt;head))</div><div class='add'>+			goto next_bucket;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;hslot2-&gt;lock);</div><div class='add'>+		sk = hlist_entry_safe(hslot2-&gt;head.first, struct sock,</div><div class='add'>+				      __sk_common.skc_portaddr_node);</div><div class='add'>+		/* Resume from the first (in iteration order) unseen socket from</div><div class='add'>+		 * the last batch that still exists in resume_bucket. Most of</div><div class='add'>+		 * the time this will just be where the last iteration left off</div><div class='add'>+		 * in resume_bucket unless that socket disappeared between</div><div class='add'>+		 * reads.</div><div class='add'>+		 */</div><div class='add'>+		if (state-&gt;bucket == resume_bucket)</div><div class='add'>+			sk = bpf_iter_udp_resume(sk, &amp;iter-&gt;batch[find_cookie],</div><div class='add'>+						 end_cookie - find_cookie);</div><div class='add'>+fill_batch:</div><div class='add'>+		udp_portaddr_for_each_entry_from(sk) {</div><div class='add'>+			if (seq_sk_match(seq, sk)) {</div><div class='add'>+				if (iter-&gt;end_sk &lt; iter-&gt;max_sk) {</div><div class='add'>+					sock_hold(sk);</div><div class='add'>+					iter-&gt;batch[iter-&gt;end_sk++].sk = sk;</div><div class='add'>+				}</div><div class='add'>+				batch_sks++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate a larger batch and try again. */</div><div class='add'>+		if (unlikely(resizes &lt;= 1 &amp;&amp; iter-&gt;end_sk &amp;&amp;</div><div class='add'>+			     iter-&gt;end_sk != batch_sks)) {</div><div class='add'>+			resizes++;</div><div class='add'>+</div><div class='add'>+			/* First, try with GFP_USER to maximize the chances of</div><div class='add'>+			 * grabbing more memory.</div><div class='add'>+			 */</div><div class='add'>+			if (resizes == 1) {</div><div class='add'>+				spin_unlock_bh(&amp;hslot2-&gt;lock);</div><div class='add'>+				err = bpf_iter_udp_realloc_batch(iter,</div><div class='add'>+								 batch_sks * 3 / 2,</div><div class='add'>+								 GFP_USER);</div><div class='add'>+				if (err)</div><div class='add'>+					return ERR_PTR(err);</div><div class='add'>+				/* Start over. */</div><div class='add'>+				goto again;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Next, hold onto the lock, so the bucket doesn't</div><div class='add'>+			 * change while we get the rest of the sockets.</div><div class='add'>+			 */</div><div class='add'>+			err = bpf_iter_udp_realloc_batch(iter, batch_sks,</div><div class='add'>+							 GFP_NOWAIT);</div><div class='add'>+			if (err) {</div><div class='add'>+				spin_unlock_bh(&amp;hslot2-&gt;lock);</div><div class='add'>+				return ERR_PTR(err);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Pick up where we left off. */</div><div class='add'>+			sk = iter-&gt;batch[iter-&gt;end_sk - 1].sk;</div><div class='add'>+			sk = hlist_entry_safe(sk-&gt;__sk_common.skc_portaddr_node.next,</div><div class='add'>+					      struct sock,</div><div class='add'>+					      __sk_common.skc_portaddr_node);</div><div class='add'>+			batch_sks = iter-&gt;end_sk;</div><div class='add'>+			goto fill_batch;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;hslot2-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (iter-&gt;end_sk)</div><div class='add'>+			break;</div><div class='add'>+next_bucket:</div><div class='add'>+		resizes = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(iter-&gt;end_sk != batch_sks);</div><div class='add'>+	return iter-&gt;end_sk ? iter-&gt;batch[0].sk : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_iter_udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bpf_udp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	/* Whenever seq_next() is called, the iter-&gt;cur_sk is</div><div class='add'>+	 * done with seq_show(), so unref the iter-&gt;cur_sk.</div><div class='add'>+	 */</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk)</div><div class='add'>+		sock_put(iter-&gt;batch[iter-&gt;cur_sk++].sk);</div><div class='add'>+</div><div class='add'>+	/* After updating iter-&gt;cur_sk, check if there are more sockets</div><div class='add'>+	 * available in the current bucket batch.</div><div class='add'>+	 */</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk)</div><div class='add'>+		sk = iter-&gt;batch[iter-&gt;cur_sk].sk;</div><div class='add'>+	else</div><div class='add'>+		/* Prepare a new batch. */</div><div class='add'>+		sk = bpf_iter_udp_batch(seq);</div><div class='add'>+</div><div class='add'>+	++*pos;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *bpf_iter_udp_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	/* bpf iter does not support lseek, so it always</div><div class='add'>+	 * continue from where it was stop()-ped.</div><div class='add'>+	 */</div><div class='add'>+	if (*pos)</div><div class='add'>+		return bpf_iter_udp_batch(seq);</div><div class='add'>+</div><div class='add'>+	return SEQ_START_TOKEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udp_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta *meta,</div><div class='add'>+			     struct udp_sock *udp_sk, uid_t uid, int bucket)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter__udp ctx;</div><div class='add'>+</div><div class='add'>+	meta-&gt;seq_num--;  /* skip SEQ_START_TOKEN */</div><div class='add'>+	ctx.meta = meta;</div><div class='add'>+	ctx.udp_sk = udp_sk;</div><div class='add'>+	ctx.uid = uid;</div><div class='add'>+	ctx.bucket = bucket;</div><div class='add'>+	return bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_iter_udp_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct udp_iter_state *state = seq-&gt;private;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct sock *sk = v;</div><div class='add'>+	uid_t uid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (v == SEQ_START_TOKEN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk_unhashed(sk))) {</div><div class='add'>+		ret = SEQ_SKIP;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uid = from_kuid_munged(seq_user_ns(seq), sk_uid(sk));</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, false);</div><div class='add'>+	ret = udp_prog_seq_show(prog, &amp;meta, v, uid, state-&gt;bucket);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_udp_put_batch(struct bpf_udp_iter_state *iter)</div><div class='add'>+{</div><div class='add'>+	union bpf_udp_iter_batch_item *item;</div><div class='add'>+	unsigned int cur_sk = iter-&gt;cur_sk;</div><div class='add'>+	__u64 cookie;</div><div class='add'>+</div><div class='add'>+	/* Remember the cookies of the sockets we haven't seen yet, so we can</div><div class='add'>+	 * pick up where we left off next time around.</div><div class='add'>+	 */</div><div class='add'>+	while (cur_sk &lt; iter-&gt;end_sk) {</div><div class='add'>+		item = &amp;iter-&gt;batch[cur_sk++];</div><div class='add'>+		cookie = sock_gen_cookie(item-&gt;sk);</div><div class='add'>+		sock_put(item-&gt;sk);</div><div class='add'>+		item-&gt;cookie = cookie;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_udp_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct bpf_udp_iter_state *iter = seq-&gt;private;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	if (!v) {</div><div class='add'>+		meta.seq = seq;</div><div class='add'>+		prog = bpf_iter_get_info(&amp;meta, true);</div><div class='add'>+		if (prog)</div><div class='add'>+			(void)udp_prog_seq_show(prog, &amp;meta, v, 0, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;cur_sk &lt; iter-&gt;end_sk)</div><div class='add'>+		bpf_iter_udp_put_batch(iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations bpf_iter_udp_seq_ops = {</div><div class='add'>+	.start		= bpf_iter_udp_seq_start,</div><div class='add'>+	.next		= bpf_iter_udp_seq_next,</div><div class='add'>+	.stop		= bpf_iter_udp_seq_stop,</div><div class='add'>+	.show		= bpf_iter_udp_seq_show,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static unsigned short seq_file_family(const struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	const struct udp_seq_afinfo *afinfo;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	/* BPF iterator: bpf programs to filter sockets. */</div><div class='add'>+	if (seq-&gt;op == &amp;bpf_iter_udp_seq_ops)</div><div class='add'>+		return AF_UNSPEC;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Proc fs iterator */</div><div class='add'>+	afinfo = pde_data(file_inode(seq-&gt;file));</div><div class='add'>+	return afinfo-&gt;family;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct seq_operations udp_seq_ops = {</div><div class='ctx'> 	.start		= udp_seq_start,</div><div class='ctx'> 	.next		= udp_seq_next,</div><div class='ctx'> 	.stop		= udp_seq_stop,</div><div class='ctx'> 	.show		= udp4_seq_show,</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(udp_seq_ops);</div><div class='add'>+EXPORT_IPV6_MOD(udp_seq_ops);</div><div class='ctx'> </div><div class='ctx'> static struct udp_seq_afinfo udp4_seq_afinfo = {</div><div class='ctx'> 	.family		= AF_INET,</div><div class='del'>-	.udp_table	= &amp;udp_table,</div><div class='add'>+	.udp_table	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init udp4_proc_init_net(struct net *net)</div><div class='hunk'>@@ -2857,29 +3784,32 @@ __setup("uhash_entries=", set_uhash_entries);</div><div class='ctx'> </div><div class='ctx'> void __init udp_table_init(struct udp_table *table, const char *name)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, slot_size;</div><div class='ctx'> </div><div class='add'>+	slot_size = sizeof(struct udp_hslot) + sizeof(struct udp_hslot_main) +</div><div class='add'>+		    udp_hash4_slot_size();</div><div class='ctx'> 	table-&gt;hash = alloc_large_system_hash(name,</div><div class='del'>-					      2 * sizeof(struct udp_hslot),</div><div class='add'>+					      slot_size,</div><div class='ctx'> 					      uhash_entries,</div><div class='ctx'> 					      21, /* one slot per 2 MB */</div><div class='ctx'> 					      0,</div><div class='ctx'> 					      &amp;table-&gt;log,</div><div class='ctx'> 					      &amp;table-&gt;mask,</div><div class='ctx'> 					      UDP_HTABLE_SIZE_MIN,</div><div class='del'>-					      64 * 1024);</div><div class='add'>+					      UDP_HTABLE_SIZE_MAX);</div><div class='ctx'> </div><div class='del'>-	table-&gt;hash2 = table-&gt;hash + (table-&gt;mask + 1);</div><div class='add'>+	table-&gt;hash2 = (void *)(table-&gt;hash + (table-&gt;mask + 1));</div><div class='ctx'> 	for (i = 0; i &lt;= table-&gt;mask; i++) {</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;table-&gt;hash[i].head);</div><div class='ctx'> 		table-&gt;hash[i].count = 0;</div><div class='ctx'> 		spin_lock_init(&amp;table-&gt;hash[i].lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt;= table-&gt;mask; i++) {</div><div class='del'>-		INIT_HLIST_HEAD(&amp;table-&gt;hash2[i].head);</div><div class='del'>-		table-&gt;hash2[i].count = 0;</div><div class='del'>-		spin_lock_init(&amp;table-&gt;hash2[i].lock);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;table-&gt;hash2[i].hslot.head);</div><div class='add'>+		table-&gt;hash2[i].hslot.count = 0;</div><div class='add'>+		spin_lock_init(&amp;table-&gt;hash2[i].hslot.lock);</div><div class='ctx'> 	}</div><div class='add'>+	udp_table_hash4_init(table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 udp_flow_hashrnd(void)</div><div class='hunk'>@@ -2892,30 +3822,207 @@ u32 udp_flow_hashrnd(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp_flow_hashrnd);</div><div class='ctx'> </div><div class='del'>-static void __udp_sysctl_init(struct net *net)</div><div class='add'>+static void __net_init udp_sysctl_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	net-&gt;ipv4.sysctl_udp_rmem_min = SK_MEM_QUANTUM;</div><div class='del'>-	net-&gt;ipv4.sysctl_udp_wmem_min = SK_MEM_QUANTUM;</div><div class='add'>+	net-&gt;ipv4.sysctl_udp_rmem_min = PAGE_SIZE;</div><div class='add'>+	net-&gt;ipv4.sysctl_udp_wmem_min = PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='ctx'> 	net-&gt;ipv4.sysctl_udp_l3mdev_accept = 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init udp_sysctl_init(struct net *net)</div><div class='add'>+static struct udp_table __net_init *udp_pernet_table_alloc(unsigned int hash_entries)</div><div class='ctx'> {</div><div class='del'>-	__udp_sysctl_init(net);</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+	unsigned int slot_size;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	udptable = kmalloc(sizeof(*udptable), GFP_KERNEL);</div><div class='add'>+	if (!udptable)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	slot_size = sizeof(struct udp_hslot) + sizeof(struct udp_hslot_main) +</div><div class='add'>+		    udp_hash4_slot_size();</div><div class='add'>+	udptable-&gt;hash = vmalloc_huge(hash_entries * slot_size,</div><div class='add'>+				      GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!udptable-&gt;hash)</div><div class='add'>+		goto free_table;</div><div class='add'>+</div><div class='add'>+	udptable-&gt;hash2 = (void *)(udptable-&gt;hash + hash_entries);</div><div class='add'>+	udptable-&gt;mask = hash_entries - 1;</div><div class='add'>+	udptable-&gt;log = ilog2(hash_entries);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hash_entries; i++) {</div><div class='add'>+		INIT_HLIST_HEAD(&amp;udptable-&gt;hash[i].head);</div><div class='add'>+		udptable-&gt;hash[i].count = 0;</div><div class='add'>+		spin_lock_init(&amp;udptable-&gt;hash[i].lock);</div><div class='add'>+</div><div class='add'>+		INIT_HLIST_HEAD(&amp;udptable-&gt;hash2[i].hslot.head);</div><div class='add'>+		udptable-&gt;hash2[i].hslot.count = 0;</div><div class='add'>+		spin_lock_init(&amp;udptable-&gt;hash2[i].hslot.lock);</div><div class='add'>+	}</div><div class='add'>+	udp_table_hash4_init(udptable);</div><div class='add'>+</div><div class='add'>+	return udptable;</div><div class='add'>+</div><div class='add'>+free_table:</div><div class='add'>+	kfree(udptable);</div><div class='add'>+out:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit udp_pernet_table_free(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct udp_table *udptable = net-&gt;ipv4.udp_table;</div><div class='add'>+</div><div class='add'>+	if (udptable == &amp;udp_table)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kvfree(udptable-&gt;hash);</div><div class='add'>+	kfree(udptable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_init udp_set_table(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct udp_table *udptable;</div><div class='add'>+	unsigned int hash_entries;</div><div class='add'>+	struct net *old_net;</div><div class='add'>+</div><div class='add'>+	if (net_eq(net, &amp;init_net))</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	old_net = current-&gt;nsproxy-&gt;net_ns;</div><div class='add'>+	hash_entries = READ_ONCE(old_net-&gt;ipv4.sysctl_udp_child_hash_entries);</div><div class='add'>+	if (!hash_entries)</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	/* Set min to keep the bitmap on stack in udp_lib_get_port() */</div><div class='add'>+	if (hash_entries &lt; UDP_HTABLE_SIZE_MIN_PERNET)</div><div class='add'>+		hash_entries = UDP_HTABLE_SIZE_MIN_PERNET;</div><div class='add'>+	else</div><div class='add'>+		hash_entries = roundup_pow_of_two(hash_entries);</div><div class='add'>+</div><div class='add'>+	udptable = udp_pernet_table_alloc(hash_entries);</div><div class='add'>+	if (udptable) {</div><div class='add'>+		net-&gt;ipv4.udp_table = udptable;</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("Failed to allocate UDP hash table (entries: %u) "</div><div class='add'>+			"for a netns, fallback to the global one\n",</div><div class='add'>+			hash_entries);</div><div class='add'>+fallback:</div><div class='add'>+		net-&gt;ipv4.udp_table = &amp;udp_table;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init udp_pernet_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL)</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* No tunnel is configured */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(net-&gt;ipv4.udp_tunnel_gro); ++i) {</div><div class='add'>+		INIT_HLIST_HEAD(&amp;net-&gt;ipv4.udp_tunnel_gro[i].list);</div><div class='add'>+		RCU_INIT_POINTER(net-&gt;ipv4.udp_tunnel_gro[i].sk, NULL);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	udp_sysctl_init(net);</div><div class='add'>+	udp_set_table(net);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit udp_pernet_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	udp_pernet_table_free(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pernet_operations __net_initdata udp_sysctl_ops = {</div><div class='del'>-	.init	= udp_sysctl_init,</div><div class='add'>+	.init	= udp_pernet_init,</div><div class='add'>+	.exit	= udp_pernet_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+DEFINE_BPF_ITER_FUNC(udp, struct bpf_iter_meta *meta,</div><div class='add'>+		     struct udp_sock *udp_sk, uid_t uid, int bucket)</div><div class='add'>+</div><div class='add'>+static int bpf_iter_udp_realloc_batch(struct bpf_udp_iter_state *iter,</div><div class='add'>+				      unsigned int new_batch_sz, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	union bpf_udp_iter_batch_item *new_batch;</div><div class='add'>+</div><div class='add'>+	new_batch = kvmalloc_array(new_batch_sz, sizeof(*new_batch),</div><div class='add'>+				   flags | __GFP_NOWARN);</div><div class='add'>+	if (!new_batch)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (flags != GFP_NOWAIT)</div><div class='add'>+		bpf_iter_udp_put_batch(iter);</div><div class='add'>+</div><div class='add'>+	memcpy(new_batch, iter-&gt;batch, sizeof(*iter-&gt;batch) * iter-&gt;end_sk);</div><div class='add'>+	kvfree(iter-&gt;batch);</div><div class='add'>+	iter-&gt;batch = new_batch;</div><div class='add'>+	iter-&gt;max_sk = new_batch_sz;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INIT_BATCH_SZ 16</div><div class='add'>+</div><div class='add'>+static int bpf_iter_init_udp(void *priv_data, struct bpf_iter_aux_info *aux)</div><div class='add'>+{</div><div class='add'>+	struct bpf_udp_iter_state *iter = priv_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_iter_init_seq_net(priv_data, aux);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_iter_udp_realloc_batch(iter, INIT_BATCH_SZ, GFP_USER);</div><div class='add'>+	if (ret)</div><div class='add'>+		bpf_iter_fini_seq_net(priv_data);</div><div class='add'>+</div><div class='add'>+	iter-&gt;state.bucket = -1;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_fini_udp(void *priv_data)</div><div class='add'>+{</div><div class='add'>+	struct bpf_udp_iter_state *iter = priv_data;</div><div class='add'>+</div><div class='add'>+	bpf_iter_fini_seq_net(priv_data);</div><div class='add'>+	kvfree(iter-&gt;batch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info udp_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;bpf_iter_udp_seq_ops,</div><div class='add'>+	.init_seq_private	= bpf_iter_init_udp,</div><div class='add'>+	.fini_seq_private	= bpf_iter_fini_udp,</div><div class='add'>+	.seq_priv_size		= sizeof(struct bpf_udp_iter_state),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct bpf_iter_reg udp_reg_info = {</div><div class='add'>+	.target			= "udp",</div><div class='add'>+	.ctx_arg_info_size	= 1,</div><div class='add'>+	.ctx_arg_info		= {</div><div class='add'>+		{ offsetof(struct bpf_iter__udp, udp_sk),</div><div class='add'>+		  PTR_TO_BTF_ID_OR_NULL | PTR_TRUSTED },</div><div class='add'>+	},</div><div class='add'>+	.seq_info		= &amp;udp_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init bpf_iter_register(void)</div><div class='add'>+{</div><div class='add'>+	udp_reg_info.ctx_arg_info[0].btf_id = btf_sock_ids[BTF_SOCK_TYPE_UDP];</div><div class='add'>+	if (bpf_iter_reg_target(&amp;udp_reg_info))</div><div class='add'>+		pr_warn("Warning: could not register bpf iterator udp\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init udp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long limit;</div><div class='del'>-	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	udp_table_init(&amp;udp_table, "UDP");</div><div class='ctx'> 	limit = nr_free_buffer_pages() / 8;</div><div class='hunk'>@@ -2924,17 +4031,10 @@ void __init udp_init(void)</div><div class='ctx'> 	sysctl_udp_mem[1] = limit;</div><div class='ctx'> 	sysctl_udp_mem[2] = sysctl_udp_mem[0] * 2;</div><div class='ctx'> </div><div class='del'>-	__udp_sysctl_init(&amp;init_net);</div><div class='del'>-</div><div class='del'>-	/* 16 spinlocks per cpu */</div><div class='del'>-	udp_busylocks_log = ilog2(nr_cpu_ids) + 4;</div><div class='del'>-	udp_busylocks = kmalloc(sizeof(spinlock_t) &lt;&lt; udp_busylocks_log,</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!udp_busylocks)</div><div class='del'>-		panic("UDP: failed to alloc udp_busylocks\n");</div><div class='del'>-	for (i = 0; i &lt; (1U &lt;&lt; udp_busylocks_log); i++)</div><div class='del'>-		spin_lock_init(udp_busylocks + i);</div><div class='del'>-</div><div class='ctx'> 	if (register_pernet_subsys(&amp;udp_sysctl_ops))</div><div class='ctx'> 		panic("UDP: failed to init sysctl parameters.\n");</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+	bpf_iter_register();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/udp_bpf.c b/net/ipv4/udp_bpf.c<br/>new file mode 100644<br/>index 000000000000..0735d820e413<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_bpf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_bpf.c</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2020 Cloudflare Ltd https://cloudflare.com */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skmsg.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/inet_common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "udp_impl.h"</div><div class='add'>+</div><div class='add'>+static struct proto *udpv6_prot_saved __read_mostly;</div><div class='add'>+</div><div class='add'>+static int sk_udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			  int flags, int *addr_len)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		return udpv6_prot_saved-&gt;recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+#endif</div><div class='add'>+	return udp_prot.recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool udp_sk_has_data(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return !skb_queue_empty(&amp;udp_sk(sk)-&gt;reader_queue) ||</div><div class='add'>+	       !skb_queue_empty(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psock_has_data(struct sk_psock *psock)</div><div class='add'>+{</div><div class='add'>+	return !skb_queue_empty(&amp;psock-&gt;ingress_skb) ||</div><div class='add'>+	       !sk_psock_queue_empty(psock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define udp_msg_has_data(__sk, __psock)	\</div><div class='add'>+		({ udp_sk_has_data(__sk) || psock_has_data(__psock); })</div><div class='add'>+</div><div class='add'>+static int udp_msg_wait_data(struct sock *sk, struct sk_psock *psock,</div><div class='add'>+			     long timeo)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!timeo)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='add'>+	ret = udp_msg_has_data(sk, psock);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		wait_woken(&amp;wait, TASK_INTERRUPTIBLE, timeo);</div><div class='add'>+		ret = udp_msg_has_data(sk, psock);</div><div class='add'>+	}</div><div class='add'>+	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			   int flags, int *addr_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_psock *psock;</div><div class='add'>+	int copied, ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_ERRQUEUE))</div><div class='add'>+		return inet_recv_error(sk, msg, len, addr_len);</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	psock = sk_psock_get(sk);</div><div class='add'>+	if (unlikely(!psock))</div><div class='add'>+		return sk_udp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+</div><div class='add'>+	if (!psock_has_data(psock)) {</div><div class='add'>+		ret = sk_udp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+msg_bytes_ready:</div><div class='add'>+	copied = sk_msg_recvmsg(sk, psock, msg, len, flags);</div><div class='add'>+	if (!copied) {</div><div class='add'>+		long timeo;</div><div class='add'>+		int data;</div><div class='add'>+</div><div class='add'>+		timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+		data = udp_msg_wait_data(sk, psock, timeo);</div><div class='add'>+		if (data) {</div><div class='add'>+			if (psock_has_data(psock))</div><div class='add'>+				goto msg_bytes_ready;</div><div class='add'>+			ret = sk_udp_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		copied = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	ret = copied;</div><div class='add'>+out:</div><div class='add'>+	sk_psock_put(sk, psock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UDP_BPF_IPV4,</div><div class='add'>+	UDP_BPF_IPV6,</div><div class='add'>+	UDP_BPF_NUM_PROTS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(udpv6_prot_lock);</div><div class='add'>+static struct proto udp_bpf_prots[UDP_BPF_NUM_PROTS];</div><div class='add'>+</div><div class='add'>+static void udp_bpf_rebuild_protos(struct proto *prot, const struct proto *base)</div><div class='add'>+{</div><div class='add'>+	*prot        = *base;</div><div class='add'>+	prot-&gt;close  = sock_map_close;</div><div class='add'>+	prot-&gt;recvmsg = udp_bpf_recvmsg;</div><div class='add'>+	prot-&gt;sock_is_readable = sk_msg_is_readable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_bpf_check_v6_needs_rebuild(struct proto *ops)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(ops != smp_load_acquire(&amp;udpv6_prot_saved))) {</div><div class='add'>+		spin_lock_bh(&amp;udpv6_prot_lock);</div><div class='add'>+		if (likely(ops != udpv6_prot_saved)) {</div><div class='add'>+			udp_bpf_rebuild_protos(&amp;udp_bpf_prots[UDP_BPF_IPV6], ops);</div><div class='add'>+			smp_store_release(&amp;udpv6_prot_saved, ops);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;udpv6_prot_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init udp_bpf_v4_build_proto(void)</div><div class='add'>+{</div><div class='add'>+	udp_bpf_rebuild_protos(&amp;udp_bpf_prots[UDP_BPF_IPV4], &amp;udp_prot);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(udp_bpf_v4_build_proto);</div><div class='add'>+</div><div class='add'>+int udp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)</div><div class='add'>+{</div><div class='add'>+	int family = sk-&gt;sk_family == AF_INET ? UDP_BPF_IPV4 : UDP_BPF_IPV6;</div><div class='add'>+</div><div class='add'>+	if (restore) {</div><div class='add'>+		sk-&gt;sk_write_space = psock-&gt;saved_write_space;</div><div class='add'>+		sock_replace_proto(sk, psock-&gt;sk_proto);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		udp_bpf_check_v6_needs_rebuild(psock-&gt;sk_proto);</div><div class='add'>+</div><div class='add'>+	sock_replace_proto(sk, &amp;udp_bpf_prots[family]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_bpf_update_proto);</div><div class='head'>diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c<br/>index d9ad986c7b2c..6e491c720c90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_diag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_diag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_diag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_diag.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * udp_diag.c	Module for monitoring UDP transport protocols sockets.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Pavel Emelyanov, &lt;xemul@parallels.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -20,28 +16,28 @@</div><div class='ctx'> static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			struct netlink_callback *cb,</div><div class='ctx'> 			const struct inet_diag_req_v2 *req,</div><div class='del'>-			struct nlattr *bc, bool net_admin)</div><div class='add'>+			bool net_admin)</div><div class='ctx'> {</div><div class='del'>-	if (!inet_diag_bc_sk(bc, sk))</div><div class='add'>+	if (!inet_diag_bc_sk(cb-&gt;data, sk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return inet_sk_diag_fill(sk, NULL, skb, req,</div><div class='del'>-			sk_user_ns(NETLINK_CB(cb-&gt;skb).sk),</div><div class='del'>-			NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-			cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI, cb-&gt;nlh, net_admin);</div><div class='add'>+	return inet_sk_diag_fill(sk, NULL, skb, cb, req, NLM_F_MULTI,</div><div class='add'>+				 net_admin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,</div><div class='del'>-			const struct nlmsghdr *nlh,</div><div class='add'>+static int udp_dump_one(struct udp_table *tbl,</div><div class='add'>+			struct netlink_callback *cb,</div><div class='ctx'> 			const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	struct sk_buff *in_skb = cb-&gt;skb;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct sock *sk = NULL;</div><div class='ctx'> 	struct sk_buff *rep;</div><div class='ctx'> 	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	if (req-&gt;sdiag_family == AF_INET)</div><div class='add'>+		/* src and dst are swapped for historical reasons */</div><div class='ctx'> 		sk = __udp4_lib_lookup(net,</div><div class='ctx'> 				req-&gt;id.idiag_src[0], req-&gt;id.idiag_sport,</div><div class='ctx'> 				req-&gt;id.idiag_dst[0], req-&gt;id.idiag_dport,</div><div class='hunk'>@@ -67,26 +63,22 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	rep = nlmsg_new(sizeof(struct inet_diag_msg) +</div><div class='del'>-			sizeof(struct inet_diag_meminfo) + 64,</div><div class='add'>+	rep = nlmsg_new(nla_total_size(sizeof(struct inet_diag_msg)) +</div><div class='add'>+			inet_diag_msg_attrs_size() +</div><div class='add'>+			nla_total_size(sizeof(struct inet_diag_meminfo)) + 64,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!rep)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = inet_sk_diag_fill(sk, NULL, rep, req,</div><div class='del'>-			   sk_user_ns(NETLINK_CB(in_skb).sk),</div><div class='del'>-			   NETLINK_CB(in_skb).portid,</div><div class='del'>-			   nlh-&gt;nlmsg_seq, 0, nlh,</div><div class='del'>-			   netlink_net_capable(in_skb, CAP_NET_ADMIN));</div><div class='add'>+	err = inet_sk_diag_fill(sk, NULL, rep, cb, req, 0,</div><div class='add'>+				netlink_net_capable(in_skb, CAP_NET_ADMIN));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='ctx'> 		kfree_skb(rep);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	err = netlink_unicast(net-&gt;diag_nlsk, rep, NETLINK_CB(in_skb).portid,</div><div class='del'>-			      MSG_DONTWAIT);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = 0;</div><div class='add'>+	err = nlmsg_unicast(net-&gt;diag_nlsk, rep, NETLINK_CB(in_skb).portid);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	if (sk)</div><div class='ctx'> 		sock_put(sk);</div><div class='hunk'>@@ -96,7 +88,7 @@ out_nosk:</div><div class='ctx'> </div><div class='ctx'> static void udp_dump(struct udp_table *table, struct sk_buff *skb,</div><div class='ctx'> 		     struct netlink_callback *cb,</div><div class='del'>-		     const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='add'>+		     const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='ctx'> 	bool net_admin = netlink_net_capable(cb-&gt;skb, CAP_NET_ADMIN);</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='hunk'>@@ -134,7 +126,7 @@ static void udp_dump(struct udp_table *table, struct sk_buff *skb,</div><div class='ctx'> 			    r-&gt;id.idiag_dport)</div><div class='ctx'> 				goto next;</div><div class='ctx'> </div><div class='del'>-			if (sk_diag_dump(sk, skb, cb, r, bc, net_admin) &lt; 0) {</div><div class='add'>+			if (sk_diag_dump(sk, skb, cb, r, net_admin) &lt; 0) {</div><div class='ctx'> 				spin_unlock_bh(&amp;hslot-&gt;lock);</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -149,15 +141,15 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			  const struct inet_diag_req_v2 *r, struct nlattr *bc)</div><div class='add'>+			  const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='del'>-	udp_dump(&amp;udp_table, skb, cb, r, bc);</div><div class='add'>+	udp_dump(sock_net(cb-&gt;skb-&gt;sk)-&gt;ipv4.udp_table, skb, cb, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int udp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh,</div><div class='add'>+static int udp_diag_dump_one(struct netlink_callback *cb,</div><div class='ctx'> 			     const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='del'>-	return udp_dump_one(&amp;udp_table, in_skb, nlh, req);</div><div class='add'>+	return udp_dump_one(sock_net(cb-&gt;skb-&gt;sk)-&gt;ipv4.udp_table, cb, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void udp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,</div><div class='hunk'>@@ -229,7 +221,7 @@ static int __udp_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> static int udp_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> 			    const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='del'>-	return __udp_diag_destroy(in_skb, req, &amp;udp_table);</div><div class='add'>+	return __udp_diag_destroy(in_skb, req, sock_net(in_skb-&gt;sk)-&gt;ipv4.udp_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int udplite_diag_destroy(struct sk_buff *in_skb,</div><div class='hunk'>@@ -241,6 +233,7 @@ static int udplite_diag_destroy(struct sk_buff *in_skb,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct inet_diag_handler udp_diag_handler = {</div><div class='add'>+	.owner		 = THIS_MODULE,</div><div class='ctx'> 	.dump		 = udp_diag_dump,</div><div class='ctx'> 	.dump_one	 = udp_diag_dump_one,</div><div class='ctx'> 	.idiag_get_info  = udp_diag_get_info,</div><div class='hunk'>@@ -252,19 +245,19 @@ static const struct inet_diag_handler udp_diag_handler = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void udplite_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='del'>-			      const struct inet_diag_req_v2 *r,</div><div class='del'>-			      struct nlattr *bc)</div><div class='add'>+			      const struct inet_diag_req_v2 *r)</div><div class='ctx'> {</div><div class='del'>-	udp_dump(&amp;udplite_table, skb, cb, r, bc);</div><div class='add'>+	udp_dump(&amp;udplite_table, skb, cb, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int udplite_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh,</div><div class='add'>+static int udplite_diag_dump_one(struct netlink_callback *cb,</div><div class='ctx'> 				 const struct inet_diag_req_v2 *req)</div><div class='ctx'> {</div><div class='del'>-	return udp_dump_one(&amp;udplite_table, in_skb, nlh, req);</div><div class='add'>+	return udp_dump_one(&amp;udplite_table, cb, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inet_diag_handler udplite_diag_handler = {</div><div class='add'>+	.owner		 = THIS_MODULE,</div><div class='ctx'> 	.dump		 = udplite_diag_dump,</div><div class='ctx'> 	.dump_one	 = udplite_diag_dump_one,</div><div class='ctx'> 	.idiag_get_info  = udp_diag_get_info,</div><div class='hunk'>@@ -301,5 +294,6 @@ static void __exit udp_diag_exit(void)</div><div class='ctx'> module_init(udp_diag_init);</div><div class='ctx'> module_exit(udp_diag_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("UDP socket monitoring via SOCK_DIAG");</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-17 /* AF_INET - IPPROTO_UDP */);</div><div class='ctx'> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-136 /* AF_INET - IPPROTO_UDPLITE */);</div><div class='head'>diff --git a/net/ipv4/udp_impl.h b/net/ipv4/udp_impl.h<br/>index e7d18b140287..c7142213fc21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_impl.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_impl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_impl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_impl.h</a></div><div class='hunk'>@@ -1,31 +1,25 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef _UDP4_IMPL_H</div><div class='ctx'> #define _UDP4_IMPL_H</div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udplite.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> int __udp4_lib_rcv(struct sk_buff *, struct udp_table *, int);</div><div class='del'>-void __udp4_lib_err(struct sk_buff *, u32, struct udp_table *);</div><div class='add'>+int __udp4_lib_err(struct sk_buff *, u32, struct udp_table *);</div><div class='ctx'> </div><div class='ctx'> int udp_v4_get_port(struct sock *sk, unsigned short snum);</div><div class='add'>+void udp_v4_rehash(struct sock *sk);</div><div class='ctx'> </div><div class='del'>-int udp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		   char __user *optval, unsigned int optlen);</div><div class='add'>+int udp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		   unsigned int optlen);</div><div class='ctx'> int udp_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		   char __user *optval, int __user *optlen);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udp_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen);</div><div class='del'>-int compat_udp_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, int __user *optlen);</div><div class='del'>-#endif</div><div class='del'>-int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='del'>-		int flags, int *addr_len);</div><div class='del'>-int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,</div><div class='del'>-		 int flags);</div><div class='add'>+int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,</div><div class='add'>+		int *addr_len);</div><div class='ctx'> void udp_destroy_sock(struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='head'>diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c<br/>index 0c0522b79b43..19d0b5b09ffa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_offload.c</a></div><div class='hunk'>@@ -1,18 +1,173 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV4 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	UDPv4 GSO support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='add'>+#include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dummy GRO tunnel callback, exists mainly to avoid dangling/NULL</div><div class='add'>+ * values for the udp tunnel static call.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *dummy_gro_rcv(struct sock *sk,</div><div class='add'>+				     struct list_head *head,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef struct sk_buff *(*udp_tunnel_gro_rcv_t)(struct sock *sk,</div><div class='add'>+						struct list_head *head,</div><div class='add'>+						struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+struct udp_tunnel_type_entry {</div><div class='add'>+	udp_tunnel_gro_rcv_t gro_receive;</div><div class='add'>+	refcount_t count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UDP_MAX_TUNNEL_TYPES (IS_ENABLED(CONFIG_GENEVE) + \</div><div class='add'>+			      IS_ENABLED(CONFIG_VXLAN) * 2 + \</div><div class='add'>+			      IS_ENABLED(CONFIG_NET_FOU) * 2 + \</div><div class='add'>+			      IS_ENABLED(CONFIG_XFRM) * 2)</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_CALL(udp_tunnel_gro_rcv, dummy_gro_rcv);</div><div class='add'>+static DEFINE_STATIC_KEY_FALSE(udp_tunnel_static_call);</div><div class='add'>+static DEFINE_MUTEX(udp_tunnel_gro_type_lock);</div><div class='add'>+static struct udp_tunnel_type_entry udp_tunnel_gro_types[UDP_MAX_TUNNEL_TYPES];</div><div class='add'>+static unsigned int udp_tunnel_gro_type_nr;</div><div class='add'>+static DEFINE_SPINLOCK(udp_tunnel_gro_lock);</div><div class='add'>+</div><div class='add'>+void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add)</div><div class='add'>+{</div><div class='add'>+	bool is_ipv6 = sk-&gt;sk_family == AF_INET6;</div><div class='add'>+	struct udp_sock *tup, *up = udp_sk(sk);</div><div class='add'>+	struct udp_tunnel_gro *udp_tunnel_gro;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;udp_tunnel_gro_lock);</div><div class='add'>+	udp_tunnel_gro = &amp;net-&gt;ipv4.udp_tunnel_gro[is_ipv6];</div><div class='add'>+	if (add)</div><div class='add'>+		hlist_add_head(&amp;up-&gt;tunnel_list, &amp;udp_tunnel_gro-&gt;list);</div><div class='add'>+	else if (up-&gt;tunnel_list.pprev)</div><div class='add'>+		hlist_del_init(&amp;up-&gt;tunnel_list);</div><div class='add'>+</div><div class='add'>+	if (udp_tunnel_gro-&gt;list.first &amp;&amp;</div><div class='add'>+	    !udp_tunnel_gro-&gt;list.first-&gt;next) {</div><div class='add'>+		tup = hlist_entry(udp_tunnel_gro-&gt;list.first, struct udp_sock,</div><div class='add'>+				  tunnel_list);</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(udp_tunnel_gro-&gt;sk, (struct sock *)tup);</div><div class='add'>+	} else {</div><div class='add'>+		RCU_INIT_POINTER(udp_tunnel_gro-&gt;sk, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;udp_tunnel_gro_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_tunnel_update_gro_lookup);</div><div class='add'>+</div><div class='add'>+void udp_tunnel_update_gro_rcv(struct sock *sk, bool add)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_type_entry *cur = NULL;</div><div class='add'>+	struct udp_sock *up = udp_sk(sk);</div><div class='add'>+	int i, old_gro_type_nr;</div><div class='add'>+</div><div class='add'>+	if (!UDP_MAX_TUNNEL_TYPES || !up-&gt;gro_receive)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;udp_tunnel_gro_type_lock);</div><div class='add'>+</div><div class='add'>+	/* Check if the static call is permanently disabled. */</div><div class='add'>+	if (udp_tunnel_gro_type_nr &gt; UDP_MAX_TUNNEL_TYPES)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; udp_tunnel_gro_type_nr; i++)</div><div class='add'>+		if (udp_tunnel_gro_types[i].gro_receive == up-&gt;gro_receive)</div><div class='add'>+			cur = &amp;udp_tunnel_gro_types[i];</div><div class='add'>+</div><div class='add'>+	old_gro_type_nr = udp_tunnel_gro_type_nr;</div><div class='add'>+	if (add) {</div><div class='add'>+		/*</div><div class='add'>+		 * Update the matching entry, if found, or add a new one</div><div class='add'>+		 * if needed</div><div class='add'>+		 */</div><div class='add'>+		if (cur) {</div><div class='add'>+			refcount_inc(&amp;cur-&gt;count);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely(udp_tunnel_gro_type_nr == UDP_MAX_TUNNEL_TYPES)) {</div><div class='add'>+			pr_err_once("Too many UDP tunnel types, please increase UDP_MAX_TUNNEL_TYPES\n");</div><div class='add'>+			/* Ensure static call will never be enabled */</div><div class='add'>+			udp_tunnel_gro_type_nr = UDP_MAX_TUNNEL_TYPES + 1;</div><div class='add'>+		} else {</div><div class='add'>+			cur = &amp;udp_tunnel_gro_types[udp_tunnel_gro_type_nr++];</div><div class='add'>+			refcount_set(&amp;cur-&gt;count, 1);</div><div class='add'>+			cur-&gt;gro_receive = up-&gt;gro_receive;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * The stack cleanups only successfully added tunnel, the</div><div class='add'>+		 * lookup on removal should never fail.</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON_ONCE(!cur))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (!refcount_dec_and_test(&amp;cur-&gt;count))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* Avoid gaps, so that the enable tunnel has always id 0 */</div><div class='add'>+		*cur = udp_tunnel_gro_types[--udp_tunnel_gro_type_nr];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (udp_tunnel_gro_type_nr == 1) {</div><div class='add'>+		static_call_update(udp_tunnel_gro_rcv,</div><div class='add'>+				   udp_tunnel_gro_types[0].gro_receive);</div><div class='add'>+		static_branch_enable(&amp;udp_tunnel_static_call);</div><div class='add'>+	} else if (old_gro_type_nr == 1) {</div><div class='add'>+		static_branch_disable(&amp;udp_tunnel_static_call);</div><div class='add'>+		static_call_update(udp_tunnel_gro_rcv, dummy_gro_rcv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;udp_tunnel_gro_type_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_tunnel_update_gro_rcv);</div><div class='add'>+</div><div class='add'>+static struct sk_buff *udp_tunnel_gro_rcv(struct sock *sk,</div><div class='add'>+					  struct list_head *head,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;udp_tunnel_static_call)) {</div><div class='add'>+		if (unlikely(gro_recursion_inc_test(skb))) {</div><div class='add'>+			NAPI_GRO_CB(skb)-&gt;flush |= 1;</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		return static_call(udp_tunnel_gro_rcv)(sk, head, skb);</div><div class='add'>+	}</div><div class='add'>+	return call_gro_receive_sk(udp_sk(sk)-&gt;gro_receive, sk, head, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static struct sk_buff *udp_tunnel_gro_rcv(struct sock *sk,</div><div class='add'>+					  struct list_head *head,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return call_gro_receive_sk(udp_sk(sk)-&gt;gro_receive, sk, head, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,</div><div class='ctx'> 	netdev_features_t features,</div><div class='hunk'>@@ -52,6 +207,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,</div><div class='ctx'> 	__skb_pull(skb, tnl_hlen);</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	skb_set_network_header(skb, skb_inner_network_offset(skb));</div><div class='add'>+	skb_set_transport_header(skb, skb_inner_transport_offset(skb));</div><div class='ctx'> 	skb-&gt;mac_len = skb_inner_network_offset(skb);</div><div class='ctx'> 	skb-&gt;protocol = new_protocol;</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +217,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,</div><div class='ctx'> 	remcsum = !!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TUNNEL_REMCSUM);</div><div class='ctx'> 	skb-&gt;remcsum_offload = remcsum;</div><div class='ctx'> </div><div class='del'>-	need_ipsec = skb_dst(skb) &amp;&amp; dst_xfrm(skb_dst(skb));</div><div class='add'>+	need_ipsec = (skb_dst(skb) &amp;&amp; dst_xfrm(skb_dst(skb))) || skb_sec_path(skb);</div><div class='ctx'> 	/* Try to offload checksum if possible */</div><div class='ctx'> 	offload_csum = !!(need_csum &amp;&amp;</div><div class='ctx'> 			  !need_ipsec &amp;&amp;</div><div class='hunk'>@@ -70,6 +226,8 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,</div><div class='ctx'> 				      (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM))));</div><div class='ctx'> </div><div class='ctx'> 	features &amp;= skb-&gt;dev-&gt;hw_enc_features;</div><div class='add'>+	if (need_csum)</div><div class='add'>+		features &amp;= ~NETIF_F_SCTP_CRC;</div><div class='ctx'> </div><div class='ctx'> 	/* The only checksum offload we care about from here on out is the</div><div class='ctx'> 	 * outer one so strip the existing checksum feature flags and</div><div class='hunk'>@@ -152,8 +310,8 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,</div><div class='ctx'> 				       netdev_features_t features,</div><div class='ctx'> 				       bool is_ipv6)</div><div class='ctx'> {</div><div class='add'>+	const struct net_offload __rcu **offloads;</div><div class='ctx'> 	__be16 protocol = skb-&gt;protocol;</div><div class='del'>-	const struct net_offload **offloads;</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='ctx'> 	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='ctx'> 	struct sk_buff *(*gso_inner_segment)(struct sk_buff *skb,</div><div class='hunk'>@@ -187,8 +345,140 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(skb_udp_tunnel_segment);</div><div class='ctx'> </div><div class='add'>+static void __udpv4_gso_segment_csum(struct sk_buff *seg,</div><div class='add'>+				     __be32 *oldip, __be32 *newip,</div><div class='add'>+				     __be16 *oldport, __be16 *newport)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	if (*oldip == *newip &amp;&amp; *oldport == *newport)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	uh = udp_hdr(seg);</div><div class='add'>+	iph = ip_hdr(seg);</div><div class='add'>+</div><div class='add'>+	if (uh-&gt;check) {</div><div class='add'>+		inet_proto_csum_replace4(&amp;uh-&gt;check, seg, *oldip, *newip,</div><div class='add'>+					 true);</div><div class='add'>+		inet_proto_csum_replace2(&amp;uh-&gt;check, seg, *oldport, *newport,</div><div class='add'>+					 false);</div><div class='add'>+		if (!uh-&gt;check)</div><div class='add'>+			uh-&gt;check = CSUM_MANGLED_0;</div><div class='add'>+	}</div><div class='add'>+	*oldport = *newport;</div><div class='add'>+</div><div class='add'>+	csum_replace4(&amp;iph-&gt;check, *oldip, *newip);</div><div class='add'>+	*oldip = *newip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__udpv4_gso_segment_list_csum(struct sk_buff *segs)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *seg;</div><div class='add'>+	struct udphdr *uh, *uh2;</div><div class='add'>+	struct iphdr *iph, *iph2;</div><div class='add'>+</div><div class='add'>+	seg = segs;</div><div class='add'>+	uh = udp_hdr(seg);</div><div class='add'>+	iph = ip_hdr(seg);</div><div class='add'>+</div><div class='add'>+	if ((udp_hdr(seg)-&gt;dest == udp_hdr(seg-&gt;next)-&gt;dest) &amp;&amp;</div><div class='add'>+	    (udp_hdr(seg)-&gt;source == udp_hdr(seg-&gt;next)-&gt;source) &amp;&amp;</div><div class='add'>+	    (ip_hdr(seg)-&gt;daddr == ip_hdr(seg-&gt;next)-&gt;daddr) &amp;&amp;</div><div class='add'>+	    (ip_hdr(seg)-&gt;saddr == ip_hdr(seg-&gt;next)-&gt;saddr))</div><div class='add'>+		return segs;</div><div class='add'>+</div><div class='add'>+	while ((seg = seg-&gt;next)) {</div><div class='add'>+		uh2 = udp_hdr(seg);</div><div class='add'>+		iph2 = ip_hdr(seg);</div><div class='add'>+</div><div class='add'>+		__udpv4_gso_segment_csum(seg,</div><div class='add'>+					 &amp;iph2-&gt;saddr, &amp;iph-&gt;saddr,</div><div class='add'>+					 &amp;uh2-&gt;source, &amp;uh-&gt;source);</div><div class='add'>+		__udpv4_gso_segment_csum(seg,</div><div class='add'>+					 &amp;iph2-&gt;daddr, &amp;iph-&gt;daddr,</div><div class='add'>+					 &amp;uh2-&gt;dest, &amp;uh-&gt;dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __udpv6_gso_segment_csum(struct sk_buff *seg,</div><div class='add'>+				     struct in6_addr *oldip,</div><div class='add'>+				     const struct in6_addr *newip,</div><div class='add'>+				     __be16 *oldport, __be16 newport)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh = udp_hdr(seg);</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_equal(oldip, newip) &amp;&amp; *oldport == newport)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (uh-&gt;check) {</div><div class='add'>+		inet_proto_csum_replace16(&amp;uh-&gt;check, seg, oldip-&gt;s6_addr32,</div><div class='add'>+					  newip-&gt;s6_addr32, true);</div><div class='add'>+</div><div class='add'>+		inet_proto_csum_replace2(&amp;uh-&gt;check, seg, *oldport, newport,</div><div class='add'>+					 false);</div><div class='add'>+		if (!uh-&gt;check)</div><div class='add'>+			uh-&gt;check = CSUM_MANGLED_0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*oldip = *newip;</div><div class='add'>+	*oldport = newport;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__udpv6_gso_segment_list_csum(struct sk_buff *segs)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *iph;</div><div class='add'>+	const struct udphdr *uh;</div><div class='add'>+	struct ipv6hdr *iph2;</div><div class='add'>+	struct sk_buff *seg;</div><div class='add'>+	struct udphdr *uh2;</div><div class='add'>+</div><div class='add'>+	seg = segs;</div><div class='add'>+	uh = udp_hdr(seg);</div><div class='add'>+	iph = ipv6_hdr(seg);</div><div class='add'>+	uh2 = udp_hdr(seg-&gt;next);</div><div class='add'>+	iph2 = ipv6_hdr(seg-&gt;next);</div><div class='add'>+</div><div class='add'>+	if (!(*(const u32 *)&amp;uh-&gt;source ^ *(const u32 *)&amp;uh2-&gt;source) &amp;&amp;</div><div class='add'>+	    ipv6_addr_equal(&amp;iph-&gt;saddr, &amp;iph2-&gt;saddr) &amp;&amp;</div><div class='add'>+	    ipv6_addr_equal(&amp;iph-&gt;daddr, &amp;iph2-&gt;daddr))</div><div class='add'>+		return segs;</div><div class='add'>+</div><div class='add'>+	while ((seg = seg-&gt;next)) {</div><div class='add'>+		uh2 = udp_hdr(seg);</div><div class='add'>+		iph2 = ipv6_hdr(seg);</div><div class='add'>+</div><div class='add'>+		__udpv6_gso_segment_csum(seg, &amp;iph2-&gt;saddr, &amp;iph-&gt;saddr,</div><div class='add'>+					 &amp;uh2-&gt;source, uh-&gt;source);</div><div class='add'>+		__udpv6_gso_segment_csum(seg, &amp;iph2-&gt;daddr, &amp;iph-&gt;daddr,</div><div class='add'>+					 &amp;uh2-&gt;dest, uh-&gt;dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__udp_gso_segment_list(struct sk_buff *skb,</div><div class='add'>+					      netdev_features_t features,</div><div class='add'>+					      bool is_ipv6)</div><div class='add'>+{</div><div class='add'>+	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+</div><div class='add'>+	skb = skb_segment_list(skb, features, skb_mac_header_len(skb));</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	udp_hdr(skb)-&gt;len = htons(sizeof(struct udphdr) + mss);</div><div class='add'>+</div><div class='add'>+	if (is_ipv6)</div><div class='add'>+		return __udpv6_gso_segment_list_csum(skb);</div><div class='add'>+	else</div><div class='add'>+		return __udpv4_gso_segment_list_csum(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,</div><div class='del'>-				  netdev_features_t features)</div><div class='add'>+				  netdev_features_t features, bool is_ipv6)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = gso_skb-&gt;sk;</div><div class='ctx'> 	unsigned int sum_truesize = 0;</div><div class='hunk'>@@ -198,22 +488,70 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,</div><div class='ctx'> 	bool copy_dtor;</div><div class='ctx'> 	__sum16 check;</div><div class='ctx'> 	__be16 newlen;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mss = skb_shinfo(gso_skb)-&gt;gso_size;</div><div class='ctx'> 	if (gso_skb-&gt;len &lt;= sizeof(*uh) + mss)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(skb_checksum_start(gso_skb) !=</div><div class='add'>+		     skb_transport_header(gso_skb) &amp;&amp;</div><div class='add'>+		     !(skb_shinfo(gso_skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	/* We don't know if egress device can segment and checksum the packet</div><div class='add'>+	 * when IPv6 extension headers are present. Fall back to software GSO.</div><div class='add'>+	 */</div><div class='add'>+	if (gso_skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='add'>+		features &amp;= ~(NETIF_F_GSO_UDP_L4 | NETIF_F_CSUM_MASK);</div><div class='add'>+</div><div class='add'>+	if (skb_gso_ok(gso_skb, features | NETIF_F_GSO_ROBUST)) {</div><div class='add'>+		/* Packet is from an untrusted source, reset gso_segs. */</div><div class='add'>+		skb_shinfo(gso_skb)-&gt;gso_segs = DIV_ROUND_UP(gso_skb-&gt;len - sizeof(*uh),</div><div class='add'>+							     mss);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_shinfo(gso_skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST) {</div><div class='add'>+		 /* Detect modified geometry and pass those to skb_segment. */</div><div class='add'>+		if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)-&gt;gso_size)</div><div class='add'>+			return __udp_gso_segment_list(gso_skb, features, is_ipv6);</div><div class='add'>+</div><div class='add'>+		ret = __skb_linearize(gso_skb);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+		 /* Setup csum, as fraglist skips this in udp4_gro_receive. */</div><div class='add'>+		gso_skb-&gt;csum_start = skb_transport_header(gso_skb) - gso_skb-&gt;head;</div><div class='add'>+		gso_skb-&gt;csum_offset = offsetof(struct udphdr, check);</div><div class='add'>+		gso_skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='add'>+</div><div class='add'>+		uh = udp_hdr(gso_skb);</div><div class='add'>+		if (is_ipv6)</div><div class='add'>+			uh-&gt;check = ~udp_v6_check(gso_skb-&gt;len,</div><div class='add'>+						  &amp;ipv6_hdr(gso_skb)-&gt;saddr,</div><div class='add'>+						  &amp;ipv6_hdr(gso_skb)-&gt;daddr, 0);</div><div class='add'>+		else</div><div class='add'>+			uh-&gt;check = ~udp_v4_check(gso_skb-&gt;len,</div><div class='add'>+						  ip_hdr(gso_skb)-&gt;saddr,</div><div class='add'>+						  ip_hdr(gso_skb)-&gt;daddr, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_pull(gso_skb, sizeof(*uh));</div><div class='ctx'> </div><div class='ctx'> 	/* clear destructor to avoid skb_segment assigning it to tail */</div><div class='ctx'> 	copy_dtor = gso_skb-&gt;destructor == sock_wfree;</div><div class='del'>-	if (copy_dtor)</div><div class='add'>+	if (copy_dtor) {</div><div class='ctx'> 		gso_skb-&gt;destructor = NULL;</div><div class='add'>+		gso_skb-&gt;sk = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	segs = skb_segment(gso_skb, features);</div><div class='del'>-	if (unlikely(IS_ERR_OR_NULL(segs))) {</div><div class='del'>-		if (copy_dtor)</div><div class='add'>+	if (IS_ERR_OR_NULL(segs)) {</div><div class='add'>+		if (copy_dtor) {</div><div class='ctx'> 			gso_skb-&gt;destructor = sock_wfree;</div><div class='add'>+			gso_skb-&gt;sk = sk;</div><div class='add'>+		}</div><div class='ctx'> 		return segs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +565,11 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,</div><div class='ctx'> 	seg = segs;</div><div class='ctx'> 	uh = udp_hdr(seg);</div><div class='ctx'> </div><div class='add'>+	/* preserve TX timestamp flags and TS key for first segment */</div><div class='add'>+	skb_shinfo(seg)-&gt;tskey = skb_shinfo(gso_skb)-&gt;tskey;</div><div class='add'>+	skb_shinfo(seg)-&gt;tx_flags |=</div><div class='add'>+			(skb_shinfo(gso_skb)-&gt;tx_flags &amp; SKBTX_ANY_TSTAMP);</div><div class='add'>+</div><div class='ctx'> 	/* compute checksum adjustment based on old length versus new */</div><div class='ctx'> 	newlen = htons(sizeof(*uh) + mss);</div><div class='ctx'> 	check = csum16_add(csum16_sub(uh-&gt;check, uh-&gt;len), newlen);</div><div class='hunk'>@@ -267,6 +610,14 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,</div><div class='ctx'> 	else</div><div class='ctx'> 		uh-&gt;check = gso_make_checksum(seg, ~check) ? : CSUM_MANGLED_0;</div><div class='ctx'> </div><div class='add'>+	/* On the TX path, CHECKSUM_NONE and CHECKSUM_UNNECESSARY have the same</div><div class='add'>+	 * meaning. However, check for bad offloads in the GSO stack expects the</div><div class='add'>+	 * latter, if the checksum was calculated in software. To vouch for the</div><div class='add'>+	 * segment skbs we actually need to set it on the gso_skb.</div><div class='add'>+	 */</div><div class='add'>+	if (gso_skb-&gt;ip_summed == CHECKSUM_NONE)</div><div class='add'>+		gso_skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='ctx'> 	/* update refcount for the packet */</div><div class='ctx'> 	if (copy_dtor) {</div><div class='ctx'> 		int delta = sum_truesize - gso_skb-&gt;truesize;</div><div class='hunk'>@@ -306,7 +657,7 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4)</div><div class='del'>-		return __udp_gso_segment(skb, features);</div><div class='add'>+		return __udp_gso_segment(skb, features, false);</div><div class='ctx'> </div><div class='ctx'> 	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	if (unlikely(skb-&gt;len &lt;= mss))</div><div class='hunk'>@@ -343,18 +694,128 @@ out:</div><div class='ctx'> 	return segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#define UDP_GRO_CNT_MAX 64</div><div class='add'>+static struct sk_buff *udp_gro_receive_segment(struct list_head *head,</div><div class='add'>+					       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh = udp_gro_udphdr(skb);</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	struct udphdr *uh2;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	unsigned int ulen;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int flush;</div><div class='add'>+</div><div class='add'>+	/* requires non zero csum, for symmetry with GSO */</div><div class='add'>+	if (!uh-&gt;check) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not deal with padded or malicious packets, sorry ! */</div><div class='add'>+	ulen = ntohs(uh-&gt;len);</div><div class='add'>+	if (ulen &lt;= sizeof(*uh) || ulen != skb_gro_len(skb)) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	/* pull encapsulating udp header */</div><div class='add'>+	skb_gro_pull(skb, sizeof(struct udphdr));</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, head, list) {</div><div class='add'>+		if (!NAPI_GRO_CB(p)-&gt;same_flow)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		uh2 = udp_hdr(p);</div><div class='add'>+</div><div class='add'>+		/* Match ports only, as csum is always non zero */</div><div class='add'>+		if ((*(u32 *)&amp;uh-&gt;source != *(u32 *)&amp;uh2-&gt;source)) {</div><div class='add'>+			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (NAPI_GRO_CB(skb)-&gt;is_flist != NAPI_GRO_CB(p)-&gt;is_flist) {</div><div class='add'>+			NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+			return p;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flush = gro_receive_network_flush(uh, uh2, p);</div><div class='add'>+</div><div class='add'>+		/* Terminate the flow on len mismatch or if it grow "too much".</div><div class='add'>+		 * Under small packet flood GRO count could elsewhere grow a lot</div><div class='add'>+		 * leading to excessive truesize values.</div><div class='add'>+		 * On len mismatch merge the first packet shorter than gso_size,</div><div class='add'>+		 * otherwise complete the GRO packet.</div><div class='add'>+		 */</div><div class='add'>+		if (ulen &gt; ntohs(uh2-&gt;len) || flush) {</div><div class='add'>+			pp = p;</div><div class='add'>+		} else {</div><div class='add'>+			if (NAPI_GRO_CB(skb)-&gt;is_flist) {</div><div class='add'>+				if (!pskb_may_pull(skb, skb_gro_offset(skb))) {</div><div class='add'>+					NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+					return NULL;</div><div class='add'>+				}</div><div class='add'>+				if ((skb-&gt;ip_summed != p-&gt;ip_summed) ||</div><div class='add'>+				    (skb-&gt;csum_level != p-&gt;csum_level)) {</div><div class='add'>+					NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+					return NULL;</div><div class='add'>+				}</div><div class='add'>+				skb_set_network_header(skb, skb_gro_receive_network_offset(skb));</div><div class='add'>+				ret = skb_gro_receive_list(p, skb);</div><div class='add'>+			} else {</div><div class='add'>+				skb_gro_postpull_rcsum(skb, uh,</div><div class='add'>+						       sizeof(struct udphdr));</div><div class='add'>+</div><div class='add'>+				ret = skb_gro_receive(p, skb);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret || ulen != ntohs(uh2-&gt;len) ||</div><div class='add'>+		    NAPI_GRO_CB(p)-&gt;count &gt;= UDP_GRO_CNT_MAX)</div><div class='add'>+			pp = p;</div><div class='add'>+</div><div class='add'>+		return pp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mismatch, but we never need to flush */</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,</div><div class='del'>-				struct udphdr *uh, udp_lookup_t lookup)</div><div class='add'>+				struct udphdr *uh, struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *pp = NULL;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> 	struct udphdr *uh2;</div><div class='ctx'> 	unsigned int off = skb_gro_offset(skb);</div><div class='ctx'> 	int flush = 1;</div><div class='del'>-	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	/* We can do L4 aggregation only if the packet can't land in a tunnel</div><div class='add'>+	 * otherwise we could corrupt the inner stream. Detecting such packets</div><div class='add'>+	 * cannot be foolproof and the aggregation might still happen in some</div><div class='add'>+	 * cases. Such packets should be caught in udp_unexpected_gso later.</div><div class='add'>+	 */</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;is_flist = 0;</div><div class='add'>+	if (!sk || !udp_sk(sk)-&gt;gro_receive) {</div><div class='add'>+		/* If the packet was locally encapsulated in a UDP tunnel that</div><div class='add'>+		 * wasn't detected above, do not GRO.</div><div class='add'>+		 */</div><div class='add'>+		if (skb-&gt;encapsulation)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;dev-&gt;features &amp; NETIF_F_GRO_FRAGLIST)</div><div class='add'>+			NAPI_GRO_CB(skb)-&gt;is_flist = sk ? !udp_test_bit(GRO_ENABLED, sk) : 1;</div><div class='add'>+</div><div class='add'>+		if ((!sk &amp;&amp; (skb-&gt;dev-&gt;features &amp; NETIF_F_GRO_UDP_FWD)) ||</div><div class='add'>+		    (sk &amp;&amp; udp_test_bit(GRO_ENABLED, sk)) || NAPI_GRO_CB(skb)-&gt;is_flist)</div><div class='add'>+			return call_gro_receive(udp_gro_receive_segment, head, skb);</div><div class='add'>+</div><div class='add'>+		/* no GRO, be sure flush the current packet */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (NAPI_GRO_CB(skb)-&gt;encap_mark ||</div><div class='del'>-	    (skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    (uh-&gt;check &amp;&amp; skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp;</div><div class='ctx'> 	     NAPI_GRO_CB(skb)-&gt;csum_cnt == 0 &amp;&amp;</div><div class='ctx'> 	     !NAPI_GRO_CB(skb)-&gt;csum_valid))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -362,14 +823,6 @@ struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,</div><div class='ctx'> 	/* mark that this skb passed once through the tunnel gro layer */</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;encap_mark = 1;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	sk = (*lookup)(skb, uh-&gt;source, uh-&gt;dest);</div><div class='del'>-</div><div class='del'>-	if (sk &amp;&amp; udp_sk(sk)-&gt;gro_receive)</div><div class='del'>-		goto unflush;</div><div class='del'>-	goto out_unlock;</div><div class='del'>-</div><div class='del'>-unflush:</div><div class='ctx'> 	flush = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, head, list) {</div><div class='hunk'>@@ -390,20 +843,39 @@ unflush:</div><div class='ctx'> </div><div class='ctx'> 	skb_gro_pull(skb, sizeof(struct udphdr)); /* pull encapsulating udp header */</div><div class='ctx'> 	skb_gro_postpull_rcsum(skb, uh, sizeof(struct udphdr));</div><div class='del'>-	pp = call_gro_receive_sk(udp_sk(sk)-&gt;gro_receive, sk, head, skb);</div><div class='add'>+	pp = udp_tunnel_gro_rcv(sk, head, skb);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final(skb, pp, flush);</div><div class='ctx'> 	return pp;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp_gro_receive);</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *udp4_gro_receive(struct list_head *head,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport,</div><div class='add'>+					__be16 dport)</div><div class='add'>+{</div><div class='add'>+	const struct iphdr *iph = skb_gro_network_header(skb);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int iif, sdif;</div><div class='add'>+</div><div class='add'>+	sk = udp_tunnel_sk(net, false);</div><div class='add'>+	if (sk &amp;&amp; dport == htons(sk-&gt;sk_num))</div><div class='add'>+		return sk;</div><div class='add'>+</div><div class='add'>+	inet_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+</div><div class='add'>+	return __udp4_lib_lookup(net, iph-&gt;saddr, sport,</div><div class='add'>+				 iph-&gt;daddr, dport, iif,</div><div class='add'>+				 sdif, net-&gt;ipv4.udp_table, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct sk_buff *udp4_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct udphdr *uh = udp_gro_udphdr(skb);</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+	struct sk_buff *pp;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!uh))</div><div class='ctx'> 		goto flush;</div><div class='hunk'>@@ -416,38 +888,67 @@ static struct sk_buff *udp4_gro_receive(struct list_head *head,</div><div class='ctx'> 						 inet_gro_compute_pseudo))</div><div class='ctx'> 		goto flush;</div><div class='ctx'> 	else if (uh-&gt;check)</div><div class='del'>-		skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh-&gt;check,</div><div class='add'>+		skb_gro_checksum_try_convert(skb, IPPROTO_UDP,</div><div class='ctx'> 					     inet_gro_compute_pseudo);</div><div class='ctx'> skip:</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;is_ipv6 = 0;</div><div class='del'>-	return udp_gro_receive(head, skb, uh, udp4_lib_lookup_skb);</div><div class='add'>+	if (static_branch_unlikely(&amp;udp_encap_needed_key))</div><div class='add'>+		sk = udp4_gro_lookup_skb(skb, uh-&gt;source, uh-&gt;dest);</div><div class='add'>+</div><div class='add'>+	pp = udp_gro_receive(head, skb, uh, sk);</div><div class='add'>+	return pp;</div><div class='ctx'> </div><div class='ctx'> flush:</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int udp_gro_complete_segment(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh = udp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;csum_start = (unsigned char *)uh - skb-&gt;head;</div><div class='add'>+	skb-&gt;csum_offset = offsetof(struct udphdr, check);</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_L4;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;encapsulation)</div><div class='add'>+		skb-&gt;inner_transport_header = skb-&gt;transport_header;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int udp_gro_complete(struct sk_buff *skb, int nhoff,</div><div class='ctx'> 		     udp_lookup_t lookup)</div><div class='ctx'> {</div><div class='ctx'> 	__be16 newlen = htons(skb-&gt;len - nhoff);</div><div class='ctx'> 	struct udphdr *uh = (struct udphdr *)(skb-&gt;data + nhoff);</div><div class='del'>-	int err = -ENOSYS;</div><div class='ctx'> 	struct sock *sk;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	uh-&gt;len = newlen;</div><div class='ctx'> </div><div class='del'>-	/* Set encapsulation before calling into inner gro_complete() functions</div><div class='del'>-	 * to make them set up the inner offsets.</div><div class='del'>-	 */</div><div class='del'>-	skb-&gt;encapsulation = 1;</div><div class='add'>+	sk = INDIRECT_CALL_INET(lookup, udp6_lib_lookup_skb,</div><div class='add'>+				udp4_lib_lookup_skb, skb, uh-&gt;source, uh-&gt;dest);</div><div class='add'>+	if (sk &amp;&amp; udp_sk(sk)-&gt;gro_complete) {</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type = uh-&gt;check ? SKB_GSO_UDP_TUNNEL_CSUM</div><div class='add'>+					: SKB_GSO_UDP_TUNNEL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	sk = (*lookup)(skb, uh-&gt;source, uh-&gt;dest);</div><div class='del'>-	if (sk &amp;&amp; udp_sk(sk)-&gt;gro_complete)</div><div class='add'>+		/* clear the encap mark, so that inner frag_list gro_complete</div><div class='add'>+		 * can take place</div><div class='add'>+		 */</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;encap_mark = 0;</div><div class='add'>+</div><div class='add'>+		/* Set encapsulation before calling into inner gro_complete()</div><div class='add'>+		 * functions to make them set up the inner offsets.</div><div class='add'>+		 */</div><div class='add'>+		skb-&gt;encapsulation = 1;</div><div class='ctx'> 		err = udp_sk(sk)-&gt;gro_complete(sk, skb,</div><div class='ctx'> 				nhoff + sizeof(struct udphdr));</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		err = udp_gro_complete_segment(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;remcsum_offload)</div><div class='ctx'> 		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TUNNEL_REMCSUM;</div><div class='hunk'>@@ -456,31 +957,40 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp_gro_complete);</div><div class='ctx'> </div><div class='del'>-static int udp4_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int udp4_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct iphdr *iph = (struct iphdr *)(skb-&gt;data + offset);</div><div class='ctx'> 	struct udphdr *uh = (struct udphdr *)(skb-&gt;data + nhoff);</div><div class='ctx'> </div><div class='del'>-	if (uh-&gt;check) {</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;</div><div class='add'>+	/* do fraglist only if there is no outer UDP encap (or we already processed it) */</div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;is_flist &amp;&amp; !NAPI_GRO_CB(skb)-&gt;encap_mark) {</div><div class='add'>+		uh-&gt;len = htons(skb-&gt;len - nhoff);</div><div class='add'>+</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= (SKB_GSO_FRAGLIST|SKB_GSO_UDP_L4);</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uh-&gt;check)</div><div class='ctx'> 		uh-&gt;check = ~udp_v4_check(skb-&gt;len - nhoff, iph-&gt;saddr,</div><div class='ctx'> 					  iph-&gt;daddr, 0);</div><div class='del'>-	} else {</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return udp_gro_complete(skb, nhoff, udp4_lib_lookup_skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct net_offload udpv4_offload = {</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment = udp4_ufo_fragment,</div><div class='del'>-		.gro_receive  =	udp4_gro_receive,</div><div class='del'>-		.gro_complete =	udp4_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int __init udpv4_offload_init(void)</div><div class='ctx'> {</div><div class='del'>-	return inet_add_offload(&amp;udpv4_offload, IPPROTO_UDP);</div><div class='add'>+	net_hotdata.udpv4_offload = (struct net_offload) {</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment = udp4_ufo_fragment,</div><div class='add'>+			.gro_receive  =	udp4_gro_receive,</div><div class='add'>+			.gro_complete =	udp4_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return inet_add_offload(&amp;net_hotdata.udpv4_offload, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel_core.c<br/>index 6539ff15e9a3..b1f667c52cb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udp_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_tunnel_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_tunnel_core.c</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> </div><div class='ctx'> int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 		     struct socket **sockp)</div><div class='hunk'>@@ -20,10 +20,16 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;bind_ifindex) {</div><div class='add'>+		err = sock_bindtoindex(sock-&gt;sk, cfg-&gt;bind_ifindex, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	udp_addr.sin_family = AF_INET;</div><div class='ctx'> 	udp_addr.sin_addr = cfg-&gt;local_ip;</div><div class='ctx'> 	udp_addr.sin_port = cfg-&gt;local_udp_port;</div><div class='del'>-	err = kernel_bind(sock, (struct sockaddr *)&amp;udp_addr,</div><div class='add'>+	err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;udp_addr,</div><div class='ctx'> 			  sizeof(udp_addr));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -32,7 +38,7 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 		udp_addr.sin_family = AF_INET;</div><div class='ctx'> 		udp_addr.sin_addr = cfg-&gt;peer_ip;</div><div class='ctx'> 		udp_addr.sin_port = cfg-&gt;peer_udp_port;</div><div class='del'>-		err = kernel_connect(sock, (struct sockaddr *)&amp;udp_addr,</div><div class='add'>+		err = kernel_connect(sock, (struct sockaddr_unsized *)&amp;udp_addr,</div><div class='ctx'> 				     sizeof(udp_addr), 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='hunk'>@@ -53,13 +59,22 @@ error:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp_sock_create4);</div><div class='ctx'> </div><div class='add'>+static bool sk_saddr_any(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	return ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+#else</div><div class='add'>+	return !sk-&gt;sk_rcv_saddr;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void setup_udp_tunnel_sock(struct net *net, struct socket *sock,</div><div class='ctx'> 			   struct udp_tunnel_sock_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable multicast loopback */</div><div class='del'>-	inet_sk(sk)-&gt;mc_loop = 0;</div><div class='add'>+	inet_clear_bit(MC_LOOP, sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable CHECKSUM_UNNECESSARY to CHECKSUM_COMPLETE conversion */</div><div class='ctx'> 	inet_inc_convert_csum(sk);</div><div class='hunk'>@@ -68,11 +83,19 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,</div><div class='ctx'> </div><div class='ctx'> 	udp_sk(sk)-&gt;encap_type = cfg-&gt;encap_type;</div><div class='ctx'> 	udp_sk(sk)-&gt;encap_rcv = cfg-&gt;encap_rcv;</div><div class='add'>+	udp_sk(sk)-&gt;encap_err_rcv = cfg-&gt;encap_err_rcv;</div><div class='add'>+	udp_sk(sk)-&gt;encap_err_lookup = cfg-&gt;encap_err_lookup;</div><div class='ctx'> 	udp_sk(sk)-&gt;encap_destroy = cfg-&gt;encap_destroy;</div><div class='ctx'> 	udp_sk(sk)-&gt;gro_receive = cfg-&gt;gro_receive;</div><div class='ctx'> 	udp_sk(sk)-&gt;gro_complete = cfg-&gt;gro_complete;</div><div class='ctx'> </div><div class='del'>-	udp_tunnel_encap_enable(sock);</div><div class='add'>+	udp_tunnel_encap_enable(sk);</div><div class='add'>+</div><div class='add'>+	udp_tunnel_update_gro_rcv(sk, true);</div><div class='add'>+</div><div class='add'>+	if (!sk-&gt;sk_dport &amp;&amp; !sk-&gt;sk_bound_dev_if &amp;&amp; sk_saddr_any(sk) &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_kern_sock)</div><div class='add'>+		udp_tunnel_update_gro_lookup(net, sk, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock);</div><div class='ctx'> </div><div class='hunk'>@@ -82,15 +105,11 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct socket *sock,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct udp_tunnel_info ti;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_add ||</div><div class='del'>-	    !(dev-&gt;features &amp; NETIF_F_RX_UDP_TUNNEL_PORT))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	ti.type = type;</div><div class='ctx'> 	ti.sa_family = sk-&gt;sk_family;</div><div class='ctx'> 	ti.port = inet_sk(sk)-&gt;inet_sport;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_add(dev, &amp;ti);</div><div class='add'>+	udp_tunnel_nic_add_port(dev, &amp;ti);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_push_rx_port);</div><div class='ctx'> </div><div class='hunk'>@@ -100,15 +119,11 @@ void udp_tunnel_drop_rx_port(struct net_device *dev, struct socket *sock,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct udp_tunnel_info ti;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_del ||</div><div class='del'>-	    !(dev-&gt;features &amp; NETIF_F_RX_UDP_TUNNEL_PORT))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	ti.type = type;</div><div class='ctx'> 	ti.sa_family = sk-&gt;sk_family;</div><div class='ctx'> 	ti.port = inet_sk(sk)-&gt;inet_sport;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_del(dev, &amp;ti);</div><div class='add'>+	udp_tunnel_nic_del_port(dev, &amp;ti);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_drop_rx_port);</div><div class='ctx'> </div><div class='hunk'>@@ -120,19 +135,17 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)</div><div class='ctx'> 	struct udp_tunnel_info ti;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='ctx'> 	ti.type = type;</div><div class='ctx'> 	ti.sa_family = sk-&gt;sk_family;</div><div class='ctx'> 	ti.port = inet_sk(sk)-&gt;inet_sport;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (!dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_add)</div><div class='del'>-			continue;</div><div class='del'>-		if (!(dev-&gt;features &amp; NETIF_F_RX_UDP_TUNNEL_PORT))</div><div class='del'>-			continue;</div><div class='del'>-		dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_add(dev, &amp;ti);</div><div class='add'>+	for_each_netdev(net, dev) {</div><div class='add'>+		udp_tunnel_nic_lock(dev);</div><div class='add'>+		udp_tunnel_nic_add_port(dev, &amp;ti);</div><div class='add'>+		udp_tunnel_nic_unlock(dev);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_notify_add_rx_port);</div><div class='ctx'> </div><div class='hunk'>@@ -144,26 +157,24 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)</div><div class='ctx'> 	struct udp_tunnel_info ti;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='ctx'> 	ti.type = type;</div><div class='ctx'> 	ti.sa_family = sk-&gt;sk_family;</div><div class='ctx'> 	ti.port = inet_sk(sk)-&gt;inet_sport;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_netdev_rcu(net, dev) {</div><div class='del'>-		if (!dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_del)</div><div class='del'>-			continue;</div><div class='del'>-		if (!(dev-&gt;features &amp; NETIF_F_RX_UDP_TUNNEL_PORT))</div><div class='del'>-			continue;</div><div class='del'>-		dev-&gt;netdev_ops-&gt;ndo_udp_tunnel_del(dev, &amp;ti);</div><div class='add'>+	for_each_netdev(net, dev) {</div><div class='add'>+		udp_tunnel_nic_lock(dev);</div><div class='add'>+		udp_tunnel_nic_del_port(dev, &amp;ti);</div><div class='add'>+		udp_tunnel_nic_unlock(dev);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_notify_del_rx_port);</div><div class='ctx'> </div><div class='ctx'> void udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			 __be32 src, __be32 dst, __u8 tos, __u8 ttl,</div><div class='ctx'> 			 __be16 df, __be16 src_port, __be16 dst_port,</div><div class='del'>-			 bool xnet, bool nocheck)</div><div class='add'>+			 bool xnet, bool nocheck, u16 ipcb_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct udphdr *uh;</div><div class='ctx'> </div><div class='hunk'>@@ -179,20 +190,23 @@ void udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb</div><div class='ctx'> </div><div class='ctx'> 	udp_set_csum(nocheck, skb, src, dst, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	iptunnel_xmit(sk, rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df, xnet);</div><div class='add'>+	iptunnel_xmit(sk, rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df, xnet,</div><div class='add'>+		      ipcb_flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb);</div><div class='ctx'> </div><div class='ctx'> void udp_tunnel_sock_release(struct socket *sock)</div><div class='ctx'> {</div><div class='ctx'> 	rcu_assign_sk_user_data(sock-&gt;sk, NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='ctx'> 	kernel_sock_shutdown(sock, SHUT_RDWR);</div><div class='ctx'> 	sock_release(sock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel_sock_release);</div><div class='ctx'> </div><div class='ctx'> struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb,  unsigned short family,</div><div class='del'>-				    __be16 flags, __be64 tunnel_id, int md_size)</div><div class='add'>+				    const unsigned long *flags,</div><div class='add'>+				    __be64 tunnel_id, int md_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct metadata_dst *tun_dst;</div><div class='ctx'> 	struct ip_tunnel_info *info;</div><div class='hunk'>@@ -208,9 +222,59 @@ struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb,  unsigned short family,</div><div class='ctx'> 	info-&gt;key.tp_src = udp_hdr(skb)-&gt;source;</div><div class='ctx'> 	info-&gt;key.tp_dst = udp_hdr(skb)-&gt;dest;</div><div class='ctx'> 	if (udp_hdr(skb)-&gt;check)</div><div class='del'>-		info-&gt;key.tun_flags |= TUNNEL_CSUM;</div><div class='add'>+		__set_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags);</div><div class='ctx'> 	return tun_dst;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tun_rx_dst);</div><div class='ctx'> </div><div class='add'>+struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev,</div><div class='add'>+				     struct net *net, int oif,</div><div class='add'>+				     __be32 *saddr,</div><div class='add'>+				     const struct ip_tunnel_key *key,</div><div class='add'>+				     __be16 sport, __be16 dport, u8 tos,</div><div class='add'>+				     struct dst_cache *dst_cache)</div><div class='add'>+{</div><div class='add'>+	struct rtable *rt = NULL;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	if (dst_cache) {</div><div class='add'>+		rt = dst_cache_get_ip4(dst_cache, saddr);</div><div class='add'>+		if (rt)</div><div class='add'>+			return rt;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	memset(&amp;fl4, 0, sizeof(fl4));</div><div class='add'>+	fl4.flowi4_mark = skb-&gt;mark;</div><div class='add'>+	fl4.flowi4_proto = IPPROTO_UDP;</div><div class='add'>+	fl4.flowi4_oif = oif;</div><div class='add'>+	fl4.daddr = key-&gt;u.ipv4.dst;</div><div class='add'>+	fl4.saddr = key-&gt;u.ipv4.src;</div><div class='add'>+	fl4.fl4_dport = dport;</div><div class='add'>+	fl4.fl4_sport = sport;</div><div class='add'>+	fl4.flowi4_dscp = inet_dsfield_to_dscp(tos);</div><div class='add'>+	fl4.flowi4_flags = key-&gt;flow_flags;</div><div class='add'>+</div><div class='add'>+	rt = ip_route_output_key(net, &amp;fl4);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		netdev_dbg(dev, "no route to %pI4\n", &amp;fl4.daddr);</div><div class='add'>+		return ERR_PTR(-ENETUNREACH);</div><div class='add'>+	}</div><div class='add'>+	if (rt-&gt;dst.dev == dev) { /* is this necessary? */</div><div class='add'>+		netdev_dbg(dev, "circular route to %pI4\n", &amp;fl4.daddr);</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		return ERR_PTR(-ELOOP);</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	if (dst_cache)</div><div class='add'>+		dst_cache_set_ip4(dst_cache, &amp;rt-&gt;dst, fl4.saddr);</div><div class='add'>+#endif</div><div class='add'>+	*saddr = fl4.saddr;</div><div class='add'>+	return rt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_tunnel_dst_lookup);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("IPv4 Foo over UDP tunnel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv4/udp_tunnel_nic.c b/net/ipv4/udp_tunnel_nic.c<br/>new file mode 100644<br/>index 000000000000..944b3cf25468<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_tunnel_nic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_tunnel_nic.c</a></div><div class='hunk'>@@ -0,0 +1,1010 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (c) 2020 Facebook Inc.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='add'>+</div><div class='add'>+enum udp_tunnel_nic_table_entry_flags {</div><div class='add'>+	UDP_TUNNEL_NIC_ENTRY_ADD	= BIT(0),</div><div class='add'>+	UDP_TUNNEL_NIC_ENTRY_DEL	= BIT(1),</div><div class='add'>+	UDP_TUNNEL_NIC_ENTRY_OP_FAIL	= BIT(2),</div><div class='add'>+	UDP_TUNNEL_NIC_ENTRY_FROZEN	= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct udp_tunnel_nic_table_entry {</div><div class='add'>+	__be16 port;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u16 use_cnt;</div><div class='add'>+#define UDP_TUNNEL_NIC_USE_CNT_MAX	U16_MAX</div><div class='add'>+	u8 hw_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct udp_tunnel_nic - UDP tunnel port offload state</div><div class='add'>+ * @work:	async work for talking to hardware from process context</div><div class='add'>+ * @dev:	netdev pointer</div><div class='add'>+ * @lock:	protects all fields</div><div class='add'>+ * @need_sync:	at least one port start changed</div><div class='add'>+ * @need_replay: space was freed, we need a replay of all ports</div><div class='add'>+ * @work_pending: @work is currently scheduled</div><div class='add'>+ * @n_tables:	number of tables under @entries</div><div class='add'>+ * @missed:	bitmap of tables which overflown</div><div class='add'>+ * @entries:	table of tables of ports currently offloaded</div><div class='add'>+ */</div><div class='add'>+struct udp_tunnel_nic {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	u8 need_sync:1;</div><div class='add'>+	u8 need_replay:1;</div><div class='add'>+	u8 work_pending:1;</div><div class='add'>+</div><div class='add'>+	unsigned int n_tables;</div><div class='add'>+	unsigned long missed;</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entries[] __counted_by(n_tables);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* We ensure all work structs are done using driver state, but not the code.</div><div class='add'>+ * We need a workqueue we can flush before module gets removed.</div><div class='add'>+ */</div><div class='add'>+static struct workqueue_struct *udp_tunnel_nic_workqueue;</div><div class='add'>+</div><div class='add'>+static const char *udp_tunnel_nic_tunnel_type_name(unsigned int type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='add'>+		return "vxlan";</div><div class='add'>+	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='add'>+		return "geneve";</div><div class='add'>+	case UDP_TUNNEL_TYPE_VXLAN_GPE:</div><div class='add'>+		return "vxlan-gpe";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_entry_is_free(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	return entry-&gt;use_cnt == 0 &amp;&amp; !entry-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_entry_is_present(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	return entry-&gt;use_cnt &amp;&amp; !(entry-&gt;flags &amp; ~UDP_TUNNEL_NIC_ENTRY_FROZEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_entry_is_frozen(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	return entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_FROZEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_entry_freeze_used(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	if (!udp_tunnel_nic_entry_is_free(entry))</div><div class='add'>+		entry-&gt;flags |= UDP_TUNNEL_NIC_ENTRY_FROZEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_entry_unfreeze(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	entry-&gt;flags &amp;= ~UDP_TUNNEL_NIC_ENTRY_FROZEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_entry_is_queued(struct udp_tunnel_nic_table_entry *entry)</div><div class='add'>+{</div><div class='add'>+	return entry-&gt;flags &amp; (UDP_TUNNEL_NIC_ENTRY_ADD |</div><div class='add'>+			       UDP_TUNNEL_NIC_ENTRY_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_entry_queue(struct udp_tunnel_nic *utn,</div><div class='add'>+			   struct udp_tunnel_nic_table_entry *entry,</div><div class='add'>+			   unsigned int flag)</div><div class='add'>+{</div><div class='add'>+	entry-&gt;flags |= flag;</div><div class='add'>+	utn-&gt;need_sync = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_ti_from_entry(struct udp_tunnel_nic_table_entry *entry,</div><div class='add'>+			     struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	memset(ti, 0, sizeof(*ti));</div><div class='add'>+	ti-&gt;port = entry-&gt;port;</div><div class='add'>+	ti-&gt;type = entry-&gt;type;</div><div class='add'>+	ti-&gt;hw_priv = entry-&gt;hw_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_is_empty(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++)</div><div class='add'>+			if (!udp_tunnel_nic_entry_is_free(&amp;utn-&gt;entries[i][j]))</div><div class='add'>+				return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_should_replay(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_table_info *table;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	if (!utn-&gt;missed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++) {</div><div class='add'>+		table = &amp;dev-&gt;udp_tunnel_nic_info-&gt;tables[i];</div><div class='add'>+		if (!test_bit(i, &amp;utn-&gt;missed))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; table-&gt;n_entries; j++)</div><div class='add'>+			if (udp_tunnel_nic_entry_is_free(&amp;utn-&gt;entries[i][j]))</div><div class='add'>+				return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__udp_tunnel_nic_get_port(struct net_device *dev, unsigned int table,</div><div class='add'>+			  unsigned int idx, struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	entry = &amp;utn-&gt;entries[table][idx];</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;use_cnt)</div><div class='add'>+		udp_tunnel_nic_ti_from_entry(entry, ti);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__udp_tunnel_nic_set_port_priv(struct net_device *dev, unsigned int table,</div><div class='add'>+			       unsigned int idx, u8 priv)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;udp_tunnel_nic-&gt;entries[table][idx].hw_priv = priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_entry_update_done(struct udp_tunnel_nic_table_entry *entry,</div><div class='add'>+				 int err)</div><div class='add'>+{</div><div class='add'>+	bool dodgy = entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_OP_FAIL;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_ADD &amp;&amp;</div><div class='add'>+		     entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_DEL);</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_ADD &amp;&amp;</div><div class='add'>+	    (!err || (err == -EEXIST &amp;&amp; dodgy)))</div><div class='add'>+		entry-&gt;flags &amp;= ~UDP_TUNNEL_NIC_ENTRY_ADD;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_DEL &amp;&amp;</div><div class='add'>+	    (!err || (err == -ENOENT &amp;&amp; dodgy)))</div><div class='add'>+		entry-&gt;flags &amp;= ~UDP_TUNNEL_NIC_ENTRY_DEL;</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		entry-&gt;flags &amp;= ~UDP_TUNNEL_NIC_ENTRY_OP_FAIL;</div><div class='add'>+	else</div><div class='add'>+		entry-&gt;flags |= UDP_TUNNEL_NIC_ENTRY_OP_FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_device_sync_one(struct net_device *dev,</div><div class='add'>+			       struct udp_tunnel_nic *utn,</div><div class='add'>+			       unsigned int table, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+	struct udp_tunnel_info ti;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	entry = &amp;utn-&gt;entries[table][idx];</div><div class='add'>+	if (!udp_tunnel_nic_entry_is_queued(entry))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_ti_from_entry(entry, &amp;ti);</div><div class='add'>+	if (entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_ADD)</div><div class='add'>+		err = dev-&gt;udp_tunnel_nic_info-&gt;set_port(dev, table, idx, &amp;ti);</div><div class='add'>+	else</div><div class='add'>+		err = dev-&gt;udp_tunnel_nic_info-&gt;unset_port(dev, table, idx,</div><div class='add'>+							   &amp;ti);</div><div class='add'>+	udp_tunnel_nic_entry_update_done(entry, err);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_warn(dev,</div><div class='add'>+			    "UDP tunnel port sync failed port %d type %s: %d\n",</div><div class='add'>+			    be16_to_cpu(entry-&gt;port),</div><div class='add'>+			    udp_tunnel_nic_tunnel_type_name(entry-&gt;type),</div><div class='add'>+			    err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_device_sync_by_port(struct net_device *dev,</div><div class='add'>+				   struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++)</div><div class='add'>+			udp_tunnel_nic_device_sync_one(dev, utn, i, j);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_device_sync_by_table(struct net_device *dev,</div><div class='add'>+				    struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++) {</div><div class='add'>+		/* Find something that needs sync in this table */</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++)</div><div class='add'>+			if (udp_tunnel_nic_entry_is_queued(&amp;utn-&gt;entries[i][j]))</div><div class='add'>+				break;</div><div class='add'>+		if (j == info-&gt;tables[i].n_entries)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = info-&gt;sync_table(dev, i);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_warn(dev, "UDP tunnel port sync failed for table %d: %d\n",</div><div class='add'>+				    i, err);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++) {</div><div class='add'>+			struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+</div><div class='add'>+			entry = &amp;utn-&gt;entries[i][j];</div><div class='add'>+			if (udp_tunnel_nic_entry_is_queued(entry))</div><div class='add'>+				udp_tunnel_nic_entry_update_done(entry, err);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__udp_tunnel_nic_device_sync(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	if (!utn-&gt;need_sync)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;udp_tunnel_nic_info-&gt;sync_table)</div><div class='add'>+		udp_tunnel_nic_device_sync_by_table(dev, utn);</div><div class='add'>+	else</div><div class='add'>+		udp_tunnel_nic_device_sync_by_port(dev, utn);</div><div class='add'>+</div><div class='add'>+	utn-&gt;need_sync = 0;</div><div class='add'>+	/* Can't replay directly here, in case we come from the tunnel driver's</div><div class='add'>+	 * notification - trying to replay may deadlock inside tunnel driver.</div><div class='add'>+	 */</div><div class='add'>+	utn-&gt;need_replay = udp_tunnel_nic_should_replay(dev, utn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_device_sync(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	if (!utn-&gt;need_sync)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	queue_work(udp_tunnel_nic_workqueue, &amp;utn-&gt;work);</div><div class='add'>+	utn-&gt;work_pending = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_table_is_capable(const struct udp_tunnel_nic_table_info *table,</div><div class='add'>+				struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return table-&gt;tunnel_types &amp; ti-&gt;type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_is_capable(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+			  struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Special case IPv4-only NICs */</div><div class='add'>+	if (info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_IPV4_ONLY &amp;&amp;</div><div class='add'>+	    ti-&gt;sa_family != AF_INET)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		if (udp_tunnel_nic_table_is_capable(&amp;info-&gt;tables[i], ti))</div><div class='add'>+			return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+udp_tunnel_nic_has_collision(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+			     struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++) {</div><div class='add'>+			entry =	&amp;utn-&gt;entries[i][j];</div><div class='add'>+</div><div class='add'>+			if (!udp_tunnel_nic_entry_is_free(entry) &amp;&amp;</div><div class='add'>+			    entry-&gt;port == ti-&gt;port &amp;&amp;</div><div class='add'>+			    entry-&gt;type != ti-&gt;type) {</div><div class='add'>+				__set_bit(i, &amp;utn-&gt;missed);</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_entry_adj(struct udp_tunnel_nic *utn,</div><div class='add'>+			 unsigned int table, unsigned int idx, int use_cnt_adj)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entry =  &amp;utn-&gt;entries[table][idx];</div><div class='add'>+	bool dodgy = entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_OP_FAIL;</div><div class='add'>+	unsigned int from, to;</div><div class='add'>+</div><div class='add'>+	WARN_ON(entry-&gt;use_cnt + (u32)use_cnt_adj &gt; U16_MAX);</div><div class='add'>+</div><div class='add'>+	/* If not going from used to unused or vice versa - all done.</div><div class='add'>+	 * For dodgy entries make sure we try to sync again (queue the entry).</div><div class='add'>+	 */</div><div class='add'>+	entry-&gt;use_cnt += use_cnt_adj;</div><div class='add'>+	if (!dodgy &amp;&amp; !entry-&gt;use_cnt == !(entry-&gt;use_cnt - use_cnt_adj))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Cancel the op before it was sent to the device, if possible,</div><div class='add'>+	 * otherwise we'd need to take special care to issue commands</div><div class='add'>+	 * in the same order the ports arrived.</div><div class='add'>+	 */</div><div class='add'>+	if (use_cnt_adj &lt; 0) {</div><div class='add'>+		from = UDP_TUNNEL_NIC_ENTRY_ADD;</div><div class='add'>+		to = UDP_TUNNEL_NIC_ENTRY_DEL;</div><div class='add'>+	} else {</div><div class='add'>+		from = UDP_TUNNEL_NIC_ENTRY_DEL;</div><div class='add'>+		to = UDP_TUNNEL_NIC_ENTRY_ADD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;flags &amp; from) {</div><div class='add'>+		entry-&gt;flags &amp;= ~from;</div><div class='add'>+		if (!dodgy)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_entry_queue(utn, entry, to);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_entry_try_adj(struct udp_tunnel_nic *utn,</div><div class='add'>+			     unsigned int table, unsigned int idx,</div><div class='add'>+			     struct udp_tunnel_info *ti, int use_cnt_adj)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic_table_entry *entry =  &amp;utn-&gt;entries[table][idx];</div><div class='add'>+</div><div class='add'>+	if (udp_tunnel_nic_entry_is_free(entry) ||</div><div class='add'>+	    entry-&gt;port != ti-&gt;port ||</div><div class='add'>+	    entry-&gt;type != ti-&gt;type)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (udp_tunnel_nic_entry_is_frozen(entry))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_entry_adj(utn, table, idx, use_cnt_adj);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to find existing matching entry and adjust its use count, instead of</div><div class='add'>+ * adding a new one. Returns true if entry was found. In case of delete the</div><div class='add'>+ * entry may have gotten removed in the process, in which case it will be</div><div class='add'>+ * queued for removal.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_try_existing(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+			    struct udp_tunnel_info *ti, int use_cnt_adj)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_table_info *table;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++) {</div><div class='add'>+		table = &amp;dev-&gt;udp_tunnel_nic_info-&gt;tables[i];</div><div class='add'>+		if (!udp_tunnel_nic_table_is_capable(table, ti))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; table-&gt;n_entries; j++)</div><div class='add'>+			if (udp_tunnel_nic_entry_try_adj(utn, i, j, ti,</div><div class='add'>+							 use_cnt_adj))</div><div class='add'>+				return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_add_existing(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+			    struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return udp_tunnel_nic_try_existing(dev, utn, ti, +1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_del_existing(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+			    struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return udp_tunnel_nic_try_existing(dev, utn, ti, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+udp_tunnel_nic_add_new(struct net_device *dev, struct udp_tunnel_nic *utn,</div><div class='add'>+		       struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_table_info *table;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++) {</div><div class='add'>+		table = &amp;dev-&gt;udp_tunnel_nic_info-&gt;tables[i];</div><div class='add'>+		if (!udp_tunnel_nic_table_is_capable(table, ti))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; table-&gt;n_entries; j++) {</div><div class='add'>+			struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+</div><div class='add'>+			entry = &amp;utn-&gt;entries[i][j];</div><div class='add'>+			if (!udp_tunnel_nic_entry_is_free(entry))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			entry-&gt;port = ti-&gt;port;</div><div class='add'>+			entry-&gt;type = ti-&gt;type;</div><div class='add'>+			entry-&gt;use_cnt = 1;</div><div class='add'>+			udp_tunnel_nic_entry_queue(utn, entry,</div><div class='add'>+						   UDP_TUNNEL_NIC_ENTRY_ADD);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The different table may still fit this port in, but there</div><div class='add'>+		 * are no devices currently which have multiple tables accepting</div><div class='add'>+		 * the same tunnel type, and false positives are okay.</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(i, &amp;utn-&gt;missed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__udp_tunnel_nic_add_port(struct net_device *dev, struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return;</div><div class='add'>+	if (!netif_running(dev) &amp;&amp; info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_OPEN_ONLY)</div><div class='add'>+		return;</div><div class='add'>+	if (info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN &amp;&amp;</div><div class='add'>+	    ti-&gt;port == htons(IANA_VXLAN_UDP_PORT)) {</div><div class='add'>+		if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='add'>+			netdev_warn(dev, "device assumes port 4789 will be used by vxlan tunnels\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!udp_tunnel_nic_is_capable(dev, utn, ti))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* It may happen that a tunnel of one type is removed and different</div><div class='add'>+	 * tunnel type tries to reuse its port before the device was informed.</div><div class='add'>+	 * Rely on utn-&gt;missed to re-add this port later.</div><div class='add'>+	 */</div><div class='add'>+	if (udp_tunnel_nic_has_collision(dev, utn, ti))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!udp_tunnel_nic_add_existing(dev, utn, ti))</div><div class='add'>+		udp_tunnel_nic_add_new(dev, utn, ti);</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_device_sync(dev, utn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__udp_tunnel_nic_del_port(struct net_device *dev, struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!udp_tunnel_nic_is_capable(dev, utn, ti))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_del_existing(dev, utn, ti);</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_device_sync(dev, utn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __udp_tunnel_nic_reset_ntf(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;utn-&gt;lock);</div><div class='add'>+</div><div class='add'>+	utn-&gt;need_sync = false;</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++) {</div><div class='add'>+			struct udp_tunnel_nic_table_entry *entry;</div><div class='add'>+</div><div class='add'>+			entry = &amp;utn-&gt;entries[i][j];</div><div class='add'>+</div><div class='add'>+			entry-&gt;flags &amp;= ~(UDP_TUNNEL_NIC_ENTRY_DEL |</div><div class='add'>+					  UDP_TUNNEL_NIC_ENTRY_OP_FAIL);</div><div class='add'>+			/* We don't release utn lock across ops */</div><div class='add'>+			WARN_ON(entry-&gt;flags &amp; UDP_TUNNEL_NIC_ENTRY_FROZEN);</div><div class='add'>+			if (!entry-&gt;use_cnt)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			udp_tunnel_nic_entry_queue(utn, entry,</div><div class='add'>+						   UDP_TUNNEL_NIC_ENTRY_ADD);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	__udp_tunnel_nic_device_sync(dev, utn);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;utn-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+__udp_tunnel_nic_dump_size(struct net_device *dev, unsigned int table)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+	unsigned int j;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	for (j = 0; j &lt; info-&gt;tables[table].n_entries; j++) {</div><div class='add'>+		if (!udp_tunnel_nic_entry_is_present(&amp;utn-&gt;entries[table][j]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		size += nla_total_size(0) +		 /* _TABLE_ENTRY */</div><div class='add'>+			nla_total_size(sizeof(__be16)) + /* _ENTRY_PORT */</div><div class='add'>+			nla_total_size(sizeof(u32));	 /* _ENTRY_TYPE */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__udp_tunnel_nic_dump_write(struct net_device *dev, unsigned int table,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	unsigned int j;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; info-&gt;tables[table].n_entries; j++) {</div><div class='add'>+		if (!udp_tunnel_nic_entry_is_present(&amp;utn-&gt;entries[table][j]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nest = nla_nest_start(skb, ETHTOOL_A_TUNNEL_UDP_TABLE_ENTRY);</div><div class='add'>+		if (!nest)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		if (nla_put_be16(skb, ETHTOOL_A_TUNNEL_UDP_ENTRY_PORT,</div><div class='add'>+				 utn-&gt;entries[table][j].port) ||</div><div class='add'>+		    nla_put_u32(skb, ETHTOOL_A_TUNNEL_UDP_ENTRY_TYPE,</div><div class='add'>+				ilog2(utn-&gt;entries[table][j].type)))</div><div class='add'>+			goto err_cancel;</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, nest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __udp_tunnel_nic_assert_locked(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (utn)</div><div class='add'>+		lockdep_assert_held(&amp;utn-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __udp_tunnel_nic_lock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (utn)</div><div class='add'>+		mutex_lock(&amp;utn-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __udp_tunnel_nic_unlock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (utn)</div><div class='add'>+		mutex_unlock(&amp;utn-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct udp_tunnel_nic_ops __udp_tunnel_nic_ops = {</div><div class='add'>+	.get_port	= __udp_tunnel_nic_get_port,</div><div class='add'>+	.set_port_priv	= __udp_tunnel_nic_set_port_priv,</div><div class='add'>+	.add_port	= __udp_tunnel_nic_add_port,</div><div class='add'>+	.del_port	= __udp_tunnel_nic_del_port,</div><div class='add'>+	.reset_ntf	= __udp_tunnel_nic_reset_ntf,</div><div class='add'>+	.dump_size	= __udp_tunnel_nic_dump_size,</div><div class='add'>+	.dump_write	= __udp_tunnel_nic_dump_write,</div><div class='add'>+	.assert_locked	= __udp_tunnel_nic_assert_locked,</div><div class='add'>+	.lock		= __udp_tunnel_nic_lock,</div><div class='add'>+	.unlock		= __udp_tunnel_nic_unlock,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_flush(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++) {</div><div class='add'>+			int adj_cnt = -utn-&gt;entries[i][j].use_cnt;</div><div class='add'>+</div><div class='add'>+			if (adj_cnt)</div><div class='add'>+				udp_tunnel_nic_entry_adj(utn, i, j, adj_cnt);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	__udp_tunnel_nic_device_sync(dev, utn);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		memset(utn-&gt;entries[i], 0, array_size(info-&gt;tables[i].n_entries,</div><div class='add'>+						      sizeof(**utn-&gt;entries)));</div><div class='add'>+	WARN_ON(utn-&gt;need_sync);</div><div class='add'>+	utn-&gt;need_replay = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_replay(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic_shared_node *node;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	/* Freeze all the ports we are already tracking so that the replay</div><div class='add'>+	 * does not double up the refcount.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++)</div><div class='add'>+			udp_tunnel_nic_entry_freeze_used(&amp;utn-&gt;entries[i][j]);</div><div class='add'>+	utn-&gt;missed = 0;</div><div class='add'>+	utn-&gt;need_replay = 0;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;shared) {</div><div class='add'>+		udp_tunnel_get_rx_info(dev);</div><div class='add'>+	} else {</div><div class='add'>+		list_for_each_entry(node, &amp;info-&gt;shared-&gt;devices, list)</div><div class='add'>+			udp_tunnel_get_rx_info(node-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		for (j = 0; j &lt; info-&gt;tables[i].n_entries; j++)</div><div class='add'>+			udp_tunnel_nic_entry_unfreeze(&amp;utn-&gt;entries[i][j]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_tunnel_nic_device_sync_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn =</div><div class='add'>+		container_of(work, struct udp_tunnel_nic, work);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;utn-&gt;lock);</div><div class='add'>+</div><div class='add'>+	utn-&gt;work_pending = 0;</div><div class='add'>+	__udp_tunnel_nic_device_sync(utn-&gt;dev, utn);</div><div class='add'>+</div><div class='add'>+	if (utn-&gt;need_replay)</div><div class='add'>+		udp_tunnel_nic_replay(utn-&gt;dev, utn);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;utn-&gt;lock);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct udp_tunnel_nic *</div><div class='add'>+udp_tunnel_nic_alloc(const struct udp_tunnel_nic_info *info,</div><div class='add'>+		     unsigned int n_tables)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	utn = kzalloc(struct_size(utn, entries, n_tables), GFP_KERNEL);</div><div class='add'>+	if (!utn)</div><div class='add'>+		return NULL;</div><div class='add'>+	utn-&gt;n_tables = n_tables;</div><div class='add'>+	INIT_WORK(&amp;utn-&gt;work, udp_tunnel_nic_device_sync_work);</div><div class='add'>+	mutex_init(&amp;utn-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_tables; i++) {</div><div class='add'>+		utn-&gt;entries[i] = kcalloc(info-&gt;tables[i].n_entries,</div><div class='add'>+					  sizeof(*utn-&gt;entries[i]), GFP_KERNEL);</div><div class='add'>+		if (!utn-&gt;entries[i])</div><div class='add'>+			goto err_free_prev_entries;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return utn;</div><div class='add'>+</div><div class='add'>+err_free_prev_entries:</div><div class='add'>+	while (i--)</div><div class='add'>+		kfree(utn-&gt;entries[i]);</div><div class='add'>+	kfree(utn);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_tunnel_nic_free(struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; utn-&gt;n_tables; i++)</div><div class='add'>+		kfree(utn-&gt;entries[i]);</div><div class='add'>+	kfree(utn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udp_tunnel_nic_register(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	struct udp_tunnel_nic_shared_node *node = NULL;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+	unsigned int n_tables, i;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(utn-&gt;missed) * BITS_PER_BYTE &lt;</div><div class='add'>+		     UDP_TUNNEL_NIC_MAX_TABLES);</div><div class='add'>+	/* Expect use count of at most 2 (IPv4, IPv6) per device */</div><div class='add'>+	BUILD_BUG_ON(UDP_TUNNEL_NIC_USE_CNT_MAX &lt;</div><div class='add'>+		     UDP_TUNNEL_NIC_MAX_SHARING_DEVICES * 2);</div><div class='add'>+</div><div class='add'>+	/* Check that the driver info is sane */</div><div class='add'>+	if (WARN_ON(!info-&gt;set_port != !info-&gt;unset_port) ||</div><div class='add'>+	    WARN_ON(!info-&gt;set_port == !info-&gt;sync_table) ||</div><div class='add'>+	    WARN_ON(!info-&gt;tables[0].n_entries))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(info-&gt;shared &amp;&amp;</div><div class='add'>+		    info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_OPEN_ONLY))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	n_tables = 1;</div><div class='add'>+	for (i = 1; i &lt; UDP_TUNNEL_NIC_MAX_TABLES; i++) {</div><div class='add'>+		if (!info-&gt;tables[i].n_entries)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		n_tables++;</div><div class='add'>+		if (WARN_ON(!info-&gt;tables[i - 1].n_entries))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create UDP tunnel state structures */</div><div class='add'>+	if (info-&gt;shared) {</div><div class='add'>+		node = kzalloc(sizeof(*node), GFP_KERNEL);</div><div class='add'>+		if (!node)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		node-&gt;dev = dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;shared &amp;&amp; info-&gt;shared-&gt;udp_tunnel_nic_info) {</div><div class='add'>+		utn = info-&gt;shared-&gt;udp_tunnel_nic_info;</div><div class='add'>+	} else {</div><div class='add'>+		utn = udp_tunnel_nic_alloc(info, n_tables);</div><div class='add'>+		if (!utn) {</div><div class='add'>+			kfree(node);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;shared) {</div><div class='add'>+		if (!info-&gt;shared-&gt;udp_tunnel_nic_info) {</div><div class='add'>+			INIT_LIST_HEAD(&amp;info-&gt;shared-&gt;devices);</div><div class='add'>+			info-&gt;shared-&gt;udp_tunnel_nic_info = utn;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;node-&gt;list, &amp;info-&gt;shared-&gt;devices);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	utn-&gt;dev = dev;</div><div class='add'>+	dev_hold(dev);</div><div class='add'>+	dev-&gt;udp_tunnel_nic = utn;</div><div class='add'>+</div><div class='add'>+	if (!(info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_OPEN_ONLY)) {</div><div class='add'>+		udp_tunnel_nic_lock(dev);</div><div class='add'>+		udp_tunnel_get_rx_info(dev);</div><div class='add'>+		udp_tunnel_nic_unlock(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+udp_tunnel_nic_unregister(struct net_device *dev, struct udp_tunnel_nic *utn)</div><div class='add'>+{</div><div class='add'>+	const struct udp_tunnel_nic_info *info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_lock(dev);</div><div class='add'>+</div><div class='add'>+	/* For a shared table remove this dev from the list of sharing devices</div><div class='add'>+	 * and if there are other devices just detach.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;shared) {</div><div class='add'>+		struct udp_tunnel_nic_shared_node *node, *first;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(node, &amp;info-&gt;shared-&gt;devices, list)</div><div class='add'>+			if (node-&gt;dev == dev)</div><div class='add'>+				break;</div><div class='add'>+		if (list_entry_is_head(node, &amp;info-&gt;shared-&gt;devices, list)) {</div><div class='add'>+			udp_tunnel_nic_unlock(dev);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;node-&gt;list);</div><div class='add'>+		kfree(node);</div><div class='add'>+</div><div class='add'>+		first = list_first_entry_or_null(&amp;info-&gt;shared-&gt;devices,</div><div class='add'>+						 typeof(*first), list);</div><div class='add'>+		if (first) {</div><div class='add'>+			udp_tunnel_drop_rx_info(dev);</div><div class='add'>+			utn-&gt;dev = first-&gt;dev;</div><div class='add'>+			udp_tunnel_nic_unlock(dev);</div><div class='add'>+			goto release_dev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;shared-&gt;udp_tunnel_nic_info = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush before we check work, so we don't waste time adding entries</div><div class='add'>+	 * from the work which we will boot immediately.</div><div class='add'>+	 */</div><div class='add'>+	udp_tunnel_nic_flush(dev, utn);</div><div class='add'>+	udp_tunnel_nic_unlock(dev);</div><div class='add'>+</div><div class='add'>+	/* Wait for the work to be done using the state, netdev core will</div><div class='add'>+	 * retry unregister until we give up our reference on this device.</div><div class='add'>+	 */</div><div class='add'>+	if (utn-&gt;work_pending)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_free(utn);</div><div class='add'>+release_dev:</div><div class='add'>+	dev-&gt;udp_tunnel_nic = NULL;</div><div class='add'>+	dev_put(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+udp_tunnel_nic_netdevice_event(struct notifier_block *unused,</div><div class='add'>+			       unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	const struct udp_tunnel_nic_info *info;</div><div class='add'>+	struct udp_tunnel_nic *utn;</div><div class='add'>+</div><div class='add'>+	info = dev-&gt;udp_tunnel_nic_info;</div><div class='add'>+	if (!info)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (event == NETDEV_REGISTER) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = udp_tunnel_nic_register(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_warn(dev, "failed to register for UDP tunnel offloads: %d", err);</div><div class='add'>+		return notifier_from_errno(err);</div><div class='add'>+	}</div><div class='add'>+	/* All other events will need the udp_tunnel_nic state */</div><div class='add'>+	utn = dev-&gt;udp_tunnel_nic;</div><div class='add'>+	if (!utn)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (event == NETDEV_UNREGISTER) {</div><div class='add'>+		udp_tunnel_nic_unregister(dev, utn);</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All other events only matter if NIC has to be programmed open */</div><div class='add'>+	if (!(info-&gt;flags &amp; UDP_TUNNEL_NIC_INFO_OPEN_ONLY))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (event == NETDEV_UP) {</div><div class='add'>+		udp_tunnel_nic_lock(dev);</div><div class='add'>+		WARN_ON(!udp_tunnel_nic_is_empty(dev, utn));</div><div class='add'>+		udp_tunnel_get_rx_info(dev);</div><div class='add'>+		udp_tunnel_nic_unlock(dev);</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+	if (event == NETDEV_GOING_DOWN) {</div><div class='add'>+		udp_tunnel_nic_lock(dev);</div><div class='add'>+		udp_tunnel_nic_flush(dev, utn);</div><div class='add'>+		udp_tunnel_nic_unlock(dev);</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block udp_tunnel_nic_notifier_block __read_mostly = {</div><div class='add'>+	.notifier_call = udp_tunnel_nic_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init udp_tunnel_nic_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_workqueue = alloc_ordered_workqueue("udp_tunnel_nic", 0);</div><div class='add'>+	if (!udp_tunnel_nic_workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	udp_tunnel_nic_ops = &amp;__udp_tunnel_nic_ops;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;udp_tunnel_nic_notifier_block);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unset_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unset_ops:</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	udp_tunnel_nic_ops = NULL;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	destroy_workqueue(udp_tunnel_nic_workqueue);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+late_initcall(udp_tunnel_nic_init_module);</div><div class='add'>+</div><div class='add'>+static void __exit udp_tunnel_nic_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	unregister_netdevice_notifier(&amp;udp_tunnel_nic_notifier_block);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	udp_tunnel_nic_ops = NULL;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	destroy_workqueue(udp_tunnel_nic_workqueue);</div><div class='add'>+}</div><div class='add'>+module_exit(udp_tunnel_nic_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv4/udp_tunnel_stub.c b/net/ipv4/udp_tunnel_stub.c<br/>new file mode 100644<br/>index 000000000000..c4b2888f5fef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udp_tunnel_stub.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udp_tunnel_stub.c</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (c) 2020 Facebook Inc.</div><div class='add'>+</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+</div><div class='add'>+const struct udp_tunnel_nic_ops *udp_tunnel_nic_ops;</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_tunnel_nic_ops);</div><div class='head'>diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c<br/>index 8545457752fb..d3e621a11a1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/udplite.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/udplite.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/udplite.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/udplite.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  UDPLITE     An implementation of the UDP-Lite protocol (RFC 3828).</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Changes:</div><div class='ctx'>  *  Fixes:</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "UDPLite: " fmt</div><div class='hunk'>@@ -20,21 +17,29 @@</div><div class='ctx'> struct udp_table 	udplite_table __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(udplite_table);</div><div class='ctx'> </div><div class='add'>+/* Designate sk as UDP-Lite socket */</div><div class='add'>+static int udplite_sk_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	udp_init_sock(sk);</div><div class='add'>+	pr_warn_once("UDP-Lite is deprecated and scheduled to be removed in 2025, "</div><div class='add'>+		     "please contact the netdev mailing list\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int udplite_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return __udp4_lib_rcv(skb, &amp;udplite_table, IPPROTO_UDPLITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void udplite_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int udplite_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='del'>-	__udp4_lib_err(skb, info, &amp;udplite_table);</div><div class='add'>+	return __udp4_lib_err(skb, info, &amp;udplite_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_protocol udplite_protocol = {</div><div class='ctx'> 	.handler	= udplite_rcv,</div><div class='ctx'> 	.err_handler	= udplite_err,</div><div class='ctx'> 	.no_policy	= 1,</div><div class='del'>-	.netns_ok	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct proto 	udplite_prot = {</div><div class='hunk'>@@ -50,18 +55,19 @@ struct proto 	udplite_prot = {</div><div class='ctx'> 	.getsockopt	   = udp_getsockopt,</div><div class='ctx'> 	.sendmsg	   = udp_sendmsg,</div><div class='ctx'> 	.recvmsg	   = udp_recvmsg,</div><div class='del'>-	.sendpage	   = udp_sendpage,</div><div class='ctx'> 	.hash		   = udp_lib_hash,</div><div class='ctx'> 	.unhash		   = udp_lib_unhash,</div><div class='add'>+	.rehash		   = udp_v4_rehash,</div><div class='ctx'> 	.get_port	   = udp_v4_get_port,</div><div class='del'>-	.memory_allocated  = &amp;udp_memory_allocated,</div><div class='add'>+</div><div class='add'>+	.memory_allocated  = &amp;net_aligned_data.udp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc  = &amp;udp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.sysctl_mem	   = sysctl_udp_mem,</div><div class='add'>+	.sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min),</div><div class='add'>+	.sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_udp_rmem_min),</div><div class='ctx'> 	.obj_size	   = sizeof(struct udp_sock),</div><div class='ctx'> 	.h.udp_table	   = &amp;udplite_table,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_udp_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_udp_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(udplite_prot);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c<br/>index f8de2482a529..f28cfd88eaf5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_input.c</a></div><div class='hunk'>@@ -17,11 +17,8 @@</div><div class='ctx'> #include &lt;linux/netfilter_ipv4.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return xfrm4_extract_header(skb);</div><div class='del'>-}</div><div class='add'>+#include &lt;net/protocol.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int xfrm4_rcv_encap_finish2(struct net *net, struct sock *sk,</div><div class='ctx'> 				   struct sk_buff *skb)</div><div class='hunk'>@@ -36,7 +33,7 @@ static inline int xfrm4_rcv_encap_finish(struct net *net, struct sock *sk,</div><div class='ctx'> 		const struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (ip_route_input_noref(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='del'>-					 iph-&gt;tos, skb-&gt;dev))</div><div class='add'>+					 ip4h_dscp(iph), skb-&gt;dev))</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -61,12 +58,16 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async)</div><div class='ctx'> 		return -iph-&gt;protocol;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	__skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='add'>+	__skb_push(skb, -skb_network_offset(skb));</div><div class='ctx'> 	iph-&gt;tot_len = htons(skb-&gt;len);</div><div class='ctx'> 	ip_send_check(iph);</div><div class='ctx'> </div><div class='ctx'> 	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_GRO)) {</div><div class='del'>-		skb_mac_header_rebuild(skb);</div><div class='add'>+		/* The full l2 header needs to be preserved so that re-injecting the packet at l2</div><div class='add'>+		 * works correctly in the presence of vlan tags.</div><div class='add'>+		 */</div><div class='add'>+		skb_mac_header_rebuild_full(skb, xo-&gt;orig_mac_len);</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -77,24 +78,17 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* If it's a keepalive packet, then just eat it.</div><div class='del'>- * If it's an encapsulated packet, then pass it to the</div><div class='del'>- * IPsec xfrm input.</div><div class='del'>- * Returns 0 if skb passed to xfrm or was dropped.</div><div class='del'>- * Returns &gt;0 if skb should be passed to UDP.</div><div class='del'>- * Returns &lt;0 if skb should be resubmitted (-ret is protocol)</div><div class='del'>- */</div><div class='del'>-int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int __xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb, bool pull)</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	struct udphdr *uh;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> 	int iphlen, len;</div><div class='del'>-</div><div class='ctx'> 	__u8 *udpdata;</div><div class='ctx'> 	__be32 *udpdata32;</div><div class='del'>-	__u16 encap_type = up-&gt;encap_type;</div><div class='add'>+	u16 encap_type;</div><div class='ctx'> </div><div class='add'>+	encap_type = READ_ONCE(up-&gt;encap_type);</div><div class='ctx'> 	/* if this is not encapsulated socket, then just return now */</div><div class='ctx'> 	if (!encap_type)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -115,7 +109,7 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	case UDP_ENCAP_ESPINUDP:</div><div class='ctx'> 		/* Check if this is a keepalive packet.  If so, eat it. */</div><div class='ctx'> 		if (len == 1 &amp;&amp; udpdata[0] == 0xff) {</div><div class='del'>-			goto drop;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		} else if (len &gt; sizeof(struct ip_esp_hdr) &amp;&amp; udpdata32[0] != 0) {</div><div class='ctx'> 			/* ESP Packet without Non-ESP header */</div><div class='ctx'> 			len = sizeof(struct udphdr);</div><div class='hunk'>@@ -123,19 +117,6 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			/* Must be an IKE packet.. pass it through */</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		break;</div><div class='del'>-	case UDP_ENCAP_ESPINUDP_NON_IKE:</div><div class='del'>-		/* Check if this is a keepalive packet.  If so, eat it. */</div><div class='del'>-		if (len == 1 &amp;&amp; udpdata[0] == 0xff) {</div><div class='del'>-			goto drop;</div><div class='del'>-		} else if (len &gt; 2 * sizeof(u32) + sizeof(struct ip_esp_hdr) &amp;&amp;</div><div class='del'>-			   udpdata32[0] == 0 &amp;&amp; udpdata32[1] == 0) {</div><div class='del'>-</div><div class='del'>-			/* ESP Packet with Non-IKE marker */</div><div class='del'>-			len = sizeof(struct udphdr) + 2 * sizeof(u32);</div><div class='del'>-		} else</div><div class='del'>-			/* Must be an IKE packet.. pass it through */</div><div class='del'>-			return 1;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* At this point we are sure that this is an ESPinUDP packet,</div><div class='hunk'>@@ -144,7 +125,7 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	 * protocol to ESP, and then call into the transform receiver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (skb_unclone(skb, GFP_ATOMIC))</div><div class='del'>-		goto drop;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can update and verify the packet length... */</div><div class='ctx'> 	iph = ip_hdr(skb);</div><div class='hunk'>@@ -152,24 +133,94 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	iph-&gt;tot_len = htons(ntohs(iph-&gt;tot_len) - len);</div><div class='ctx'> 	if (skb-&gt;len &lt; iphlen + len) {</div><div class='ctx'> 		/* packet is too small!?! */</div><div class='del'>-		goto drop;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* pull the data buffer up to the ESP header and set the</div><div class='ctx'> 	 * transport header to point to ESP.  Keep UDP on the stack</div><div class='ctx'> 	 * for later.</div><div class='ctx'> 	 */</div><div class='del'>-	__skb_pull(skb, len);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='add'>+	if (pull) {</div><div class='add'>+		__skb_pull(skb, len);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb_set_transport_header(skb, len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* process ESP */</div><div class='del'>-	return xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, encap_type);</div><div class='del'>-</div><div class='del'>-drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* If it's a keepalive packet, then just eat it.</div><div class='add'>+ * If it's an encapsulated packet, then pass it to the</div><div class='add'>+ * IPsec xfrm input.</div><div class='add'>+ * Returns 0 if skb passed to xfrm or was dropped.</div><div class='add'>+ * Returns &gt;0 if skb should be passed to UDP.</div><div class='add'>+ * Returns &lt;0 if skb should be resubmitted (-ret is protocol)</div><div class='add'>+ */</div><div class='add'>+int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __xfrm4_udp_encap_rcv(sk, skb, true);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return xfrm4_rcv_encap(skb, IPPROTO_ESP, 0,</div><div class='add'>+				       udp_sk(sk)-&gt;encap_type);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xfrm4_udp_encap_rcv);</div><div class='add'>+</div><div class='add'>+struct sk_buff *xfrm4_gro_udp_encap_rcv(struct sock *sk, struct list_head *head,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int offset = skb_gro_offset(skb);</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	int len, dlen;</div><div class='add'>+	__u8 *udpdata;</div><div class='add'>+	__be32 *udpdata32;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len - offset;</div><div class='add'>+	dlen = offset + min(len, 8);</div><div class='add'>+	udpdata = skb_gro_header(skb, dlen, offset);</div><div class='add'>+	udpdata32 = (__be32 *)udpdata;</div><div class='add'>+	if (unlikely(!udpdata))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ops = rcu_dereference(inet_offloads[IPPROTO_ESP]);</div><div class='add'>+	if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* check if it is a keepalive or IKE packet */</div><div class='add'>+	if (len &lt;= sizeof(struct ip_esp_hdr) || udpdata32[0] == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* set the transport header to ESP */</div><div class='add'>+	skb_set_transport_header(skb, offset);</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;proto = IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return pp;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;same_flow = 0;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xfrm4_gro_udp_encap_rcv);</div><div class='add'>+</div><div class='ctx'> int xfrm4_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return xfrm4_rcv_spi(skb, ip_hdr(skb)-&gt;protocol, 0);</div><div class='head'>diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c<br/>deleted file mode 100644<br/>index 856d2dfdb44b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_mode_beet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_beet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm4_mode_beet.c - BEET mode encapsulation for IPv4.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2006 Diego Beltrami &lt;diego.beltrami@gmail.com&gt;</div><div class='del'>- *                    Miika Komu     &lt;miika@iki.fi&gt;</div><div class='del'>- *                    Herbert Xu     &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- *                    Abhinav Pathak &lt;abhinav.pathak@hiit.fi&gt;</div><div class='del'>- *                    Jeff Ahrenholz &lt;ahrenholz@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-static void xfrm4_beet_make_header(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	iph-&gt;ihl = 5;</div><div class='del'>-	iph-&gt;version = 4;</div><div class='del'>-</div><div class='del'>-	iph-&gt;protocol = XFRM_MODE_SKB_CB(skb)-&gt;protocol;</div><div class='del'>-	iph-&gt;tos = XFRM_MODE_SKB_CB(skb)-&gt;tos;</div><div class='del'>-</div><div class='del'>-	iph-&gt;id = XFRM_MODE_SKB_CB(skb)-&gt;id;</div><div class='del'>-	iph-&gt;frag_off = XFRM_MODE_SKB_CB(skb)-&gt;frag_off;</div><div class='del'>-	iph-&gt;ttl = XFRM_MODE_SKB_CB(skb)-&gt;ttl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.</div><div class='del'>- */</div><div class='del'>-static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ip_beet_phdr *ph;</div><div class='del'>-	struct iphdr *top_iph;</div><div class='del'>-	int hdrlen, optlen;</div><div class='del'>-</div><div class='del'>-	hdrlen = 0;</div><div class='del'>-	optlen = XFRM_MODE_SKB_CB(skb)-&gt;optlen;</div><div class='del'>-	if (unlikely(optlen))</div><div class='del'>-		hdrlen += IPV4_BEET_PHMAXLEN - (optlen &amp; 4);</div><div class='del'>-</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len -</div><div class='del'>-				    hdrlen + (XFRM_MODE_SKB_CB(skb)-&gt;ihl - sizeof(*top_iph)));</div><div class='del'>-	if (x-&gt;sel.family != AF_INET6)</div><div class='del'>-		skb-&gt;network_header += IPV4_BEET_PHMAXLEN;</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;network_header +</div><div class='del'>-			  offsetof(struct iphdr, protocol);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + sizeof(*top_iph);</div><div class='del'>-</div><div class='del'>-	xfrm4_beet_make_header(skb);</div><div class='del'>-</div><div class='del'>-	ph = __skb_pull(skb, XFRM_MODE_SKB_CB(skb)-&gt;ihl - hdrlen);</div><div class='del'>-</div><div class='del'>-	top_iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (unlikely(optlen)) {</div><div class='del'>-		BUG_ON(optlen &lt; 0);</div><div class='del'>-</div><div class='del'>-		ph-&gt;padlen = 4 - (optlen &amp; 4);</div><div class='del'>-		ph-&gt;hdrlen = optlen / 8;</div><div class='del'>-		ph-&gt;nexthdr = top_iph-&gt;protocol;</div><div class='del'>-		if (ph-&gt;padlen)</div><div class='del'>-			memset(ph + 1, IPOPT_NOP, ph-&gt;padlen);</div><div class='del'>-</div><div class='del'>-		top_iph-&gt;protocol = IPPROTO_BEETPH;</div><div class='del'>-		top_iph-&gt;ihl = sizeof(struct iphdr) / 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;saddr = x-&gt;props.saddr.a4;</div><div class='del'>-	top_iph-&gt;daddr = x-&gt;id.daddr.a4;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph;</div><div class='del'>-	int optlen = 0;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(XFRM_MODE_SKB_CB(skb)-&gt;protocol == IPPROTO_BEETPH)) {</div><div class='del'>-		struct ip_beet_phdr *ph;</div><div class='del'>-		int phlen;</div><div class='del'>-</div><div class='del'>-		if (!pskb_may_pull(skb, sizeof(*ph)))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ph = (struct ip_beet_phdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-		phlen = sizeof(*ph) + ph-&gt;padlen;</div><div class='del'>-		optlen = ph-&gt;hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen);</div><div class='del'>-		if (optlen &lt; 0 || optlen &amp; 3 || optlen &gt; 250)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		XFRM_MODE_SKB_CB(skb)-&gt;protocol = ph-&gt;nexthdr;</div><div class='del'>-</div><div class='del'>-		if (!pskb_may_pull(skb, phlen))</div><div class='del'>-			goto out;</div><div class='del'>-		__skb_pull(skb, phlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_push(skb, sizeof(*iph));</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_mac_header_rebuild(skb);</div><div class='del'>-</div><div class='del'>-	xfrm4_beet_make_header(skb);</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	iph-&gt;ihl += optlen / 4;</div><div class='del'>-	iph-&gt;tot_len = htons(skb-&gt;len);</div><div class='del'>-	iph-&gt;daddr = x-&gt;sel.daddr.a4;</div><div class='del'>-	iph-&gt;saddr = x-&gt;sel.saddr.a4;</div><div class='del'>-	iph-&gt;check = 0;</div><div class='del'>-	iph-&gt;check = ip_fast_csum(skb_network_header(skb), iph-&gt;ihl);</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm4_beet_mode = {</div><div class='del'>-	.input2 = xfrm4_beet_input,</div><div class='del'>-	.input = xfrm_prepare_input,</div><div class='del'>-	.output2 = xfrm4_beet_output,</div><div class='del'>-	.output = xfrm4_prepare_output,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_BEET,</div><div class='del'>-	.flags = XFRM_MODE_FLAG_TUNNEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm4_beet_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm4_beet_mode, AF_INET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm4_beet_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm4_beet_mode, AF_INET);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm4_beet_init);</div><div class='del'>-module_exit(xfrm4_beet_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET, XFRM_MODE_BEET);</div><div class='head'>diff --git a/net/ipv4/xfrm4_mode_transport.c b/net/ipv4/xfrm4_mode_transport.c<br/>deleted file mode 100644<br/>index 1ad2c2c4e250..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_mode_transport.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm4_mode_transport.c - Transport mode encapsulation for IPv4.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The IP header will be moved forward to make space for the encapsulation</div><div class='del'>- * header.</div><div class='del'>- */</div><div class='del'>-static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	int ihl = iph-&gt;ihl * 4;</div><div class='del'>-</div><div class='del'>-	skb_set_inner_transport_header(skb, skb_transport_offset(skb));</div><div class='del'>-</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len);</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;network_header +</div><div class='del'>-			  offsetof(struct iphdr, protocol);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + ihl;</div><div class='del'>-	__skb_pull(skb, ihl);</div><div class='del'>-	memmove(skb_network_header(skb), iph, ihl);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Remove encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The IP header will be moved over the top of the encapsulation header.</div><div class='del'>- *</div><div class='del'>- * On entry, skb-&gt;h shall point to where the IP header should be and skb-&gt;nh</div><div class='del'>- * shall be set to where the IP header currently is.  skb-&gt;data shall point</div><div class='del'>- * to the start of the payload.</div><div class='del'>- */</div><div class='del'>-static int xfrm4_transport_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int ihl = skb-&gt;data - skb_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;transport_header != skb-&gt;network_header) {</div><div class='del'>-		memmove(skb_transport_header(skb),</div><div class='del'>-			skb_network_header(skb), ihl);</div><div class='del'>-		skb-&gt;network_header = skb-&gt;transport_header;</div><div class='del'>-	}</div><div class='del'>-	ip_hdr(skb)-&gt;tot_len = htons(skb-&gt;len + ihl);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,</div><div class='del'>-						   struct sk_buff *skb,</div><div class='del'>-						   netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	const struct net_offload *ops;</div><div class='del'>-	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='del'>-	ops = rcu_dereference(inet_offloads[xo-&gt;proto]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='del'>-		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='del'>-</div><div class='del'>-	return segs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xfrm4_transport_xmit(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_len(skb);</div><div class='del'>-	pskb_pull(skb, skb-&gt;mac_len + sizeof(struct iphdr) + x-&gt;props.header_len);</div><div class='del'>-</div><div class='del'>-	if (xo-&gt;flags &amp; XFRM_GSO_SEGMENT) {</div><div class='del'>-		 skb_reset_transport_header(skb);</div><div class='del'>-		 skb-&gt;transport_header -= x-&gt;props.header_len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm4_transport_mode = {</div><div class='del'>-	.input = xfrm4_transport_input,</div><div class='del'>-	.output = xfrm4_transport_output,</div><div class='del'>-	.gso_segment = xfrm4_transport_gso_segment,</div><div class='del'>-	.xmit = xfrm4_transport_xmit,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_TRANSPORT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm4_transport_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm4_transport_mode, AF_INET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm4_transport_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm4_transport_mode, AF_INET);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm4_transport_init);</div><div class='del'>-module_exit(xfrm4_transport_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET, XFRM_MODE_TRANSPORT);</div><div class='head'>diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c<br/>deleted file mode 100644<br/>index 2a9764bd1719..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_mode_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_mode_tunnel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,152 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm4_mode_tunnel.c - Tunnel mode encapsulation for IPv4.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/inet_ecn.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void ipip_ecn_decapsulate(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *inner_iph = ipip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (INET_ECN_is_ce(XFRM_MODE_SKB_CB(skb)-&gt;tos))</div><div class='del'>-		IP_ECN_set_ce(inner_iph);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The top IP header will be constructed per RFC 2401.</div><div class='del'>- */</div><div class='del'>-static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct iphdr *top_iph;</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	skb_set_inner_network_header(skb, skb_network_offset(skb));</div><div class='del'>-	skb_set_inner_transport_header(skb, skb_transport_offset(skb));</div><div class='del'>-</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len);</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;network_header +</div><div class='del'>-			  offsetof(struct iphdr, protocol);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + sizeof(*top_iph);</div><div class='del'>-	top_iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;ihl = 5;</div><div class='del'>-	top_iph-&gt;version = 4;</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;protocol = xfrm_af2proto(skb_dst(skb)-&gt;ops-&gt;family);</div><div class='del'>-</div><div class='del'>-	/* DS disclosing depends on XFRM_SA_XFLAG_DONT_ENCAP_DSCP */</div><div class='del'>-	if (x-&gt;props.extra_flags &amp; XFRM_SA_XFLAG_DONT_ENCAP_DSCP)</div><div class='del'>-		top_iph-&gt;tos = 0;</div><div class='del'>-	else</div><div class='del'>-		top_iph-&gt;tos = XFRM_MODE_SKB_CB(skb)-&gt;tos;</div><div class='del'>-	top_iph-&gt;tos = INET_ECN_encapsulate(top_iph-&gt;tos,</div><div class='del'>-					    XFRM_MODE_SKB_CB(skb)-&gt;tos);</div><div class='del'>-</div><div class='del'>-	flags = x-&gt;props.flags;</div><div class='del'>-	if (flags &amp; XFRM_STATE_NOECN)</div><div class='del'>-		IP_ECN_clear(top_iph);</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;frag_off = (flags &amp; XFRM_STATE_NOPMTUDISC) ?</div><div class='del'>-		0 : (XFRM_MODE_SKB_CB(skb)-&gt;frag_off &amp; htons(IP_DF));</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;ttl = ip4_dst_hoplimit(xfrm_dst_child(dst));</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;saddr = x-&gt;props.saddr.a4;</div><div class='del'>-	top_iph-&gt;daddr = x-&gt;id.daddr.a4;</div><div class='del'>-	ip_select_ident(dev_net(dst-&gt;dev), skb, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm4_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (XFRM_MODE_SKB_CB(skb)-&gt;protocol != IPPROTO_IPIP)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = skb_unclone(skb, GFP_ATOMIC);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (x-&gt;props.flags &amp; XFRM_STATE_DECAP_DSCP)</div><div class='del'>-		ipv4_copy_dscp(XFRM_MODE_SKB_CB(skb)-&gt;tos, ipip_hdr(skb));</div><div class='del'>-	if (!(x-&gt;props.flags &amp; XFRM_STATE_NOECN))</div><div class='del'>-		ipip_ecn_decapsulate(skb);</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_mac_header_rebuild(skb);</div><div class='del'>-	if (skb-&gt;mac_len)</div><div class='del'>-		eth_hdr(skb)-&gt;h_proto = skb-&gt;protocol;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *xfrm4_mode_tunnel_gso_segment(struct xfrm_state *x,</div><div class='del'>-						     struct sk_buff *skb,</div><div class='del'>-						     netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	__skb_push(skb, skb-&gt;mac_len);</div><div class='del'>-	return skb_mac_gso_segment(skb, features);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xfrm4_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	if (xo-&gt;flags &amp; XFRM_GSO_SEGMENT)</div><div class='del'>-		skb-&gt;transport_header = skb-&gt;network_header +</div><div class='del'>-					sizeof(struct iphdr);</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_len(skb);</div><div class='del'>-	pskb_pull(skb, skb-&gt;mac_len + x-&gt;props.header_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm4_tunnel_mode = {</div><div class='del'>-	.input2 = xfrm4_mode_tunnel_input,</div><div class='del'>-	.input = xfrm_prepare_input,</div><div class='del'>-	.output2 = xfrm4_mode_tunnel_output,</div><div class='del'>-	.output = xfrm4_prepare_output,</div><div class='del'>-	.gso_segment = xfrm4_mode_tunnel_gso_segment,</div><div class='del'>-	.xmit = xfrm4_mode_tunnel_xmit,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_TUNNEL,</div><div class='del'>-	.flags = XFRM_MODE_FLAG_TUNNEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm4_mode_tunnel_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm4_tunnel_mode, AF_INET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm4_mode_tunnel_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm4_tunnel_mode, AF_INET);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm4_mode_tunnel_init);</div><div class='del'>-module_exit(xfrm4_mode_tunnel_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET, XFRM_MODE_TUNNEL);</div><div class='head'>diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c<br/>index be980c195fc5..0ae67d537499 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_output.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * xfrm4_output.c - Common IPsec encapsulation code for IPv4.</div><div class='ctx'>  * Copyright (c) 2004 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='hunk'>@@ -18,90 +14,24 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> </div><div class='del'>-static int xfrm4_tunnel_check_size(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int mtu, ret = 0;</div><div class='del'>-</div><div class='del'>-	if (IPCB(skb)-&gt;flags &amp; IPSKB_XFRM_TUNNEL_SIZE)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!(ip_hdr(skb)-&gt;frag_off &amp; htons(IP_DF)) || skb-&gt;ignore_df)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mtu = dst_mtu(skb_dst(skb));</div><div class='del'>-	if ((!skb_is_gso(skb) &amp;&amp; skb-&gt;len &gt; mtu) ||</div><div class='del'>-	    (skb_is_gso(skb) &amp;&amp;</div><div class='del'>-	     !skb_gso_validate_network_len(skb, ip_skb_dst_mtu(skb-&gt;sk, skb)))) {</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk)</div><div class='del'>-			xfrm_local_error(skb, mtu);</div><div class='del'>-		else</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH,</div><div class='del'>-				  ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='del'>-		ret = -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm4_tunnel_check_size(skb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;protocol = ip_hdr(skb)-&gt;protocol;</div><div class='del'>-</div><div class='del'>-	return xfrm4_extract_header(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_inner_extract_output(x, skb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	IPCB(skb)-&gt;flags |= IPSKB_XFRM_TUNNEL_SIZE;</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='del'>-</div><div class='del'>-	return x-&gt;outer_mode-&gt;output2(x, skb);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(xfrm4_prepare_output);</div><div class='del'>-</div><div class='del'>-int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	IPCB(skb)-&gt;flags |= IPSKB_XFRM_TRANSFORMED;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return xfrm_output(sk, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_NETFILTER</div><div class='ctx'> 	struct xfrm_state *x = skb_dst(skb)-&gt;xfrm;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='ctx'> 	if (!x) {</div><div class='ctx'> 		IPCB(skb)-&gt;flags |= IPSKB_REROUTED;</div><div class='ctx'> 		return dst_output(net, sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return x-&gt;outer_mode-&gt;afinfo-&gt;output_finish(sk, skb);</div><div class='add'>+	return xfrm_output(sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,</div><div class='del'>-			    net, sk, skb, NULL, skb_dst(skb)-&gt;dev,</div><div class='add'>+			    net, sk, skb, skb-&gt;dev, skb_dst_dev(skb),</div><div class='ctx'> 			    __xfrm4_output,</div><div class='ctx'> 			    !(IPCB(skb)-&gt;flags &amp; IPSKB_REROUTED));</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c<br/>index d73a6d6652f6..58faf1ddd2b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_policy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_policy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_policy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_policy.c</a></div><div class='hunk'>@@ -12,55 +12,49 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_tunnel.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4,</div><div class='del'>-					    int tos, int oif,</div><div class='del'>-					    const xfrm_address_t *saddr,</div><div class='del'>-					    const xfrm_address_t *daddr,</div><div class='del'>-					    u32 mark)</div><div class='add'>+static struct dst_entry *__xfrm4_dst_lookup(struct flowi4 *fl4,</div><div class='add'>+					    const struct xfrm_dst_lookup_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='ctx'> 	memset(fl4, 0, sizeof(*fl4));</div><div class='del'>-	fl4-&gt;daddr = daddr-&gt;a4;</div><div class='del'>-	fl4-&gt;flowi4_tos = tos;</div><div class='del'>-	fl4-&gt;flowi4_oif = l3mdev_master_ifindex_by_index(net, oif);</div><div class='del'>-	fl4-&gt;flowi4_mark = mark;</div><div class='del'>-	if (saddr)</div><div class='del'>-		fl4-&gt;saddr = saddr-&gt;a4;</div><div class='del'>-</div><div class='del'>-	fl4-&gt;flowi4_flags = FLOWI_FLAG_SKIP_NH_OIF;</div><div class='del'>-</div><div class='del'>-	rt = __ip_route_output_key(net, fl4);</div><div class='add'>+	fl4-&gt;daddr = params-&gt;daddr-&gt;a4;</div><div class='add'>+	fl4-&gt;flowi4_dscp = params-&gt;dscp;</div><div class='add'>+	fl4-&gt;flowi4_l3mdev = l3mdev_master_ifindex_by_index(params-&gt;net,</div><div class='add'>+							    params-&gt;oif);</div><div class='add'>+	fl4-&gt;flowi4_mark = params-&gt;mark;</div><div class='add'>+	if (params-&gt;saddr)</div><div class='add'>+		fl4-&gt;saddr = params-&gt;saddr-&gt;a4;</div><div class='add'>+	fl4-&gt;flowi4_proto = params-&gt;ipproto;</div><div class='add'>+	fl4-&gt;uli = params-&gt;uli;</div><div class='add'>+</div><div class='add'>+	rt = __ip_route_output_key(params-&gt;net, fl4);</div><div class='ctx'> 	if (!IS_ERR(rt))</div><div class='ctx'> 		return &amp;rt-&gt;dst;</div><div class='ctx'> </div><div class='ctx'> 	return ERR_CAST(rt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, int oif,</div><div class='del'>-					  const xfrm_address_t *saddr,</div><div class='del'>-					  const xfrm_address_t *daddr,</div><div class='del'>-					  u32 mark)</div><div class='add'>+static struct dst_entry *xfrm4_dst_lookup(const struct xfrm_dst_lookup_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> </div><div class='del'>-	return __xfrm4_dst_lookup(net, &amp;fl4, tos, oif, saddr, daddr, mark);</div><div class='add'>+	return __xfrm4_dst_lookup(&amp;fl4, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xfrm4_get_saddr(struct net *net, int oif,</div><div class='del'>-			   xfrm_address_t *saddr, xfrm_address_t *daddr,</div><div class='del'>-			   u32 mark)</div><div class='add'>+static int xfrm4_get_saddr(xfrm_address_t *saddr,</div><div class='add'>+			   const struct xfrm_dst_lookup_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> </div><div class='del'>-	dst = __xfrm4_dst_lookup(net, &amp;fl4, 0, oif, NULL, daddr, mark);</div><div class='add'>+	dst = __xfrm4_dst_lookup(&amp;fl4, params);</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return -EHOSTUNREACH;</div><div class='ctx'> </div><div class='hunk'>@@ -69,27 +63,16 @@ static int xfrm4_get_saddr(struct net *net, int oif,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xfrm4_get_tos(const struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	return IPTOS_RT_MASK &amp; fl-&gt;u.ip4.flowi4_tos; /* Strip ECN bits */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,</div><div class='del'>-			   int nfheader_len)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,</div><div class='ctx'> 			  const struct flowi *fl)</div><div class='ctx'> {</div><div class='del'>-	struct rtable *rt = (struct rtable *)xdst-&gt;route;</div><div class='add'>+	struct rtable *rt = dst_rtable(xdst-&gt;route);</div><div class='ctx'> 	const struct flowi4 *fl4 = &amp;fl-&gt;u.ip4;</div><div class='ctx'> </div><div class='ctx'> 	xdst-&gt;u.rt.rt_iif = fl4-&gt;flowi4_iif;</div><div class='ctx'> </div><div class='ctx'> 	xdst-&gt;u.dst.dev = dev;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;xdst-&gt;u.dst.dev_tracker, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	/* Sheit... I remember I did this right. Apparently,</div><div class='ctx'> 	 * it was magically lost, so this code needs audit */</div><div class='hunk'>@@ -97,135 +80,27 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,</div><div class='ctx'> 	xdst-&gt;u.rt.rt_flags = rt-&gt;rt_flags &amp; (RTCF_BROADCAST | RTCF_MULTICAST |</div><div class='ctx'> 					      RTCF_LOCAL);</div><div class='ctx'> 	xdst-&gt;u.rt.rt_type = rt-&gt;rt_type;</div><div class='del'>-	xdst-&gt;u.rt.rt_gateway = rt-&gt;rt_gateway;</div><div class='ctx'> 	xdst-&gt;u.rt.rt_uses_gateway = rt-&gt;rt_uses_gateway;</div><div class='add'>+	xdst-&gt;u.rt.rt_gw_family = rt-&gt;rt_gw_family;</div><div class='add'>+	if (rt-&gt;rt_gw_family == AF_INET)</div><div class='add'>+		xdst-&gt;u.rt.rt_gw4 = rt-&gt;rt_gw4;</div><div class='add'>+	else if (rt-&gt;rt_gw_family == AF_INET6)</div><div class='add'>+		xdst-&gt;u.rt.rt_gw6 = rt-&gt;rt_gw6;</div><div class='ctx'> 	xdst-&gt;u.rt.rt_pmtu = rt-&gt;rt_pmtu;</div><div class='ctx'> 	xdst-&gt;u.rt.rt_mtu_locked = rt-&gt;rt_mtu_locked;</div><div class='del'>-	INIT_LIST_HEAD(&amp;xdst-&gt;u.rt.rt_uncached);</div><div class='ctx'> 	rt_add_uncached_list(&amp;xdst-&gt;u.rt);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-_decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)</div><div class='del'>-{</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	u8 *xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-	struct flowi4 *fl4 = &amp;fl-&gt;u.ip4;</div><div class='del'>-	int oif = 0;</div><div class='del'>-</div><div class='del'>-	if (skb_dst(skb))</div><div class='del'>-		oif = skb_dst(skb)-&gt;dev-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	memset(fl4, 0, sizeof(struct flowi4));</div><div class='del'>-	fl4-&gt;flowi4_mark = skb-&gt;mark;</div><div class='del'>-	fl4-&gt;flowi4_oif = reverse ? skb-&gt;skb_iif : oif;</div><div class='del'>-</div><div class='del'>-	if (!ip_is_fragment(iph)) {</div><div class='del'>-		switch (iph-&gt;protocol) {</div><div class='del'>-		case IPPROTO_UDP:</div><div class='del'>-		case IPPROTO_UDPLITE:</div><div class='del'>-		case IPPROTO_TCP:</div><div class='del'>-		case IPPROTO_SCTP:</div><div class='del'>-		case IPPROTO_DCCP:</div><div class='del'>-			if (xprth + 4 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 4 - skb-&gt;data)) {</div><div class='del'>-				__be16 *ports;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				ports = (__be16 *)xprth;</div><div class='del'>-</div><div class='del'>-				fl4-&gt;fl4_sport = ports[!!reverse];</div><div class='del'>-				fl4-&gt;fl4_dport = ports[!reverse];</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_ICMP:</div><div class='del'>-			if (xprth + 2 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 2 - skb-&gt;data)) {</div><div class='del'>-				u8 *icmp;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				icmp = xprth;</div><div class='del'>-</div><div class='del'>-				fl4-&gt;fl4_icmp_type = icmp[0];</div><div class='del'>-				fl4-&gt;fl4_icmp_code = icmp[1];</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_ESP:</div><div class='del'>-			if (xprth + 4 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 4 - skb-&gt;data)) {</div><div class='del'>-				__be32 *ehdr;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				ehdr = (__be32 *)xprth;</div><div class='del'>-</div><div class='del'>-				fl4-&gt;fl4_ipsec_spi = ehdr[0];</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_AH:</div><div class='del'>-			if (xprth + 8 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 8 - skb-&gt;data)) {</div><div class='del'>-				__be32 *ah_hdr;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				ah_hdr = (__be32 *)xprth;</div><div class='del'>-</div><div class='del'>-				fl4-&gt;fl4_ipsec_spi = ah_hdr[1];</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_COMP:</div><div class='del'>-			if (xprth + 4 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 4 - skb-&gt;data)) {</div><div class='del'>-				__be16 *ipcomp_hdr;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				ipcomp_hdr = (__be16 *)xprth;</div><div class='del'>-</div><div class='del'>-				fl4-&gt;fl4_ipsec_spi = htonl(ntohs(ipcomp_hdr[1]));</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_GRE:</div><div class='del'>-			if (xprth + 12 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, xprth + 12 - skb-&gt;data)) {</div><div class='del'>-				__be16 *greflags;</div><div class='del'>-				__be32 *gre_hdr;</div><div class='del'>-</div><div class='del'>-				xprth = skb_network_header(skb) + iph-&gt;ihl * 4;</div><div class='del'>-				greflags = (__be16 *)xprth;</div><div class='del'>-				gre_hdr = (__be32 *)xprth;</div><div class='del'>-</div><div class='del'>-				if (greflags[0] &amp; GRE_KEY) {</div><div class='del'>-					if (greflags[0] &amp; GRE_CSUM)</div><div class='del'>-						gre_hdr++;</div><div class='del'>-					fl4-&gt;fl4_gre_key = gre_hdr[1];</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			fl4-&gt;fl4_ipsec_spi = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	fl4-&gt;flowi4_proto = iph-&gt;protocol;</div><div class='del'>-	fl4-&gt;daddr = reverse ? iph-&gt;saddr : iph-&gt;daddr;</div><div class='del'>-	fl4-&gt;saddr = reverse ? iph-&gt;daddr : iph-&gt;saddr;</div><div class='del'>-	fl4-&gt;flowi4_tos = iph-&gt;tos;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void xfrm4_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb, u32 mtu)</div><div class='add'>+			      struct sk_buff *skb, u32 mtu,</div><div class='add'>+			      bool confirm_neigh)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_dst *xdst = (struct xfrm_dst *)dst;</div><div class='ctx'> 	struct dst_entry *path = xdst-&gt;route;</div><div class='ctx'> </div><div class='del'>-	path-&gt;ops-&gt;update_pmtu(path, sk, skb, mtu);</div><div class='add'>+	path-&gt;ops-&gt;update_pmtu(path, sk, skb, mtu, confirm_neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xfrm4_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='hunk'>@@ -242,27 +117,17 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)</div><div class='ctx'> 	struct xfrm_dst *xdst = (struct xfrm_dst *)dst;</div><div class='ctx'> </div><div class='ctx'> 	dst_destroy_metrics_generic(dst);</div><div class='del'>-	if (xdst-&gt;u.rt.rt_uncached_list)</div><div class='del'>-		rt_del_uncached_list(&amp;xdst-&gt;u.rt);</div><div class='add'>+	rt_del_uncached_list(&amp;xdst-&gt;u.rt);</div><div class='ctx'> 	xfrm_dst_destroy(xdst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,</div><div class='del'>-			     int unregister)</div><div class='del'>-{</div><div class='del'>-	if (!unregister)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	xfrm_dst_ifdown(dst, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct dst_ops xfrm4_dst_ops_template = {</div><div class='ctx'> 	.family =		AF_INET,</div><div class='ctx'> 	.update_pmtu =		xfrm4_update_pmtu,</div><div class='ctx'> 	.redirect =		xfrm4_redirect,</div><div class='ctx'> 	.cow_metrics =		dst_cow_metrics_generic,</div><div class='ctx'> 	.destroy =		xfrm4_dst_destroy,</div><div class='del'>-	.ifdown =		xfrm4_dst_ifdown,</div><div class='add'>+	.ifdown =		xfrm_dst_ifdown,</div><div class='ctx'> 	.local_out =		__ip_local_out,</div><div class='ctx'> 	.gc_thresh =		32768,</div><div class='ctx'> };</div><div class='hunk'>@@ -271,9 +136,6 @@ static const struct xfrm_policy_afinfo xfrm4_policy_afinfo = {</div><div class='ctx'> 	.dst_ops =		&amp;xfrm4_dst_ops_template,</div><div class='ctx'> 	.dst_lookup =		xfrm4_dst_lookup,</div><div class='ctx'> 	.get_saddr =		xfrm4_get_saddr,</div><div class='del'>-	.decode_session =	_decode_session4,</div><div class='del'>-	.get_tos =		xfrm4_get_tos,</div><div class='del'>-	.init_path =		xfrm4_init_path,</div><div class='ctx'> 	.fill_dst =		xfrm4_fill_dst,</div><div class='ctx'> 	.blackhole_route =	ipv4_blackhole_route,</div><div class='ctx'> };</div><div class='hunk'>@@ -287,7 +149,6 @@ static struct ctl_table xfrm4_policy_table[] = {</div><div class='ctx'> 		.mode           = 0644,</div><div class='ctx'> 		.proc_handler   = proc_dointvec,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __net_init int xfrm4_net_sysctl_init(struct net *net)</div><div class='hunk'>@@ -304,7 +165,8 @@ static __net_init int xfrm4_net_sysctl_init(struct net *net)</div><div class='ctx'> 		table[0].data = &amp;net-&gt;xfrm.xfrm4_dst_ops.gc_thresh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = register_net_sysctl(net, "net/ipv4", table);</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/ipv4", table,</div><div class='add'>+				     ARRAY_SIZE(xfrm4_policy_table));</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +182,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static __net_exit void xfrm4_net_sysctl_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	if (!net-&gt;ipv4.xfrm4_hdr)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/net/ipv4/xfrm4_protocol.c b/net/ipv4/xfrm4_protocol.c<br/>index 8dd0e6ab8606..4ee624d8e66f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_protocol.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_protocol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_protocol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_protocol.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* xfrm4_protocol.c - Generic xfrm protocol multiplexer.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2013 secunet Security Networks AG</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Based on:</div><div class='ctx'>  * net/ipv4/tunnel4.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -46,7 +42,7 @@ static inline struct xfrm4_protocol __rcu **proto_handlers(u8 protocol)</div><div class='ctx'> 	     handler != NULL;				\</div><div class='ctx'> 	     handler = rcu_dereference(handler-&gt;next))	\</div><div class='ctx'> </div><div class='del'>-int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='add'>+static int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct xfrm4_protocol *handler;</div><div class='hunk'>@@ -61,7 +57,6 @@ int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(xfrm4_rcv_cb);</div><div class='ctx'> </div><div class='ctx'> int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='ctx'> 		    int encap_type)</div><div class='hunk'>@@ -77,6 +72,14 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (!skb_dst(skb)) {</div><div class='add'>+		const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		if (ip_route_input_noref(skb, iph-&gt;daddr, iph-&gt;saddr,</div><div class='add'>+					 ip4h_dscp(iph), skb-&gt;dev))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for_each_protocol_rcu(*head, handler)</div><div class='ctx'> 		if ((ret = handler-&gt;input_handler(skb, nexthdr, spi, encap_type)) != -EINVAL)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -84,6 +87,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='ctx'> out:</div><div class='ctx'> 	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);</div><div class='ctx'> </div><div class='add'>+drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -106,13 +110,15 @@ static int xfrm4_esp_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm4_esp_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int xfrm4_esp_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm4_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(esp4_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xfrm4_ah_rcv(struct sk_buff *skb)</div><div class='hunk'>@@ -132,13 +138,15 @@ static int xfrm4_ah_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm4_ah_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int xfrm4_ah_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm4_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(ah4_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xfrm4_ipcomp_rcv(struct sk_buff *skb)</div><div class='hunk'>@@ -158,34 +166,33 @@ static int xfrm4_ipcomp_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm4_ipcomp_err(struct sk_buff *skb, u32 info)</div><div class='add'>+static int xfrm4_ipcomp_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm4_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(ipcomp4_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_protocol esp4_protocol = {</div><div class='ctx'> 	.handler	=	xfrm4_esp_rcv,</div><div class='ctx'> 	.err_handler	=	xfrm4_esp_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_protocol ah4_protocol = {</div><div class='ctx'> 	.handler	=	xfrm4_ah_rcv,</div><div class='ctx'> 	.err_handler	=	xfrm4_ah_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_protocol ipcomp4_protocol = {</div><div class='ctx'> 	.handler	=	xfrm4_ipcomp_rcv,</div><div class='ctx'> 	.err_handler	=	xfrm4_ipcomp_err,</div><div class='ctx'> 	.no_policy	=	1,</div><div class='del'>-	.netns_ok	=	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_input_afinfo xfrm4_input_afinfo = {</div><div class='hunk'>@@ -297,4 +304,3 @@ void __init xfrm4_protocol_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	xfrm_input_register_afinfo(&amp;xfrm4_input_afinfo);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(xfrm4_protocol_init);</div><div class='head'>diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c<br/>index 80c40b4981bb..87d4db591488 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_state.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_state.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_state.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_state.c</a></div><div class='hunk'>@@ -8,81 +8,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;linux/pfkeyv2.h&gt;</div><div class='del'>-#include &lt;linux/ipsec.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv4.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-static int xfrm4_init_flags(struct xfrm_state *x)</div><div class='del'>-{</div><div class='del'>-	if (xs_net(x)-&gt;ipv4.sysctl_ip_no_pmtu_disc)</div><div class='del'>-		x-&gt;props.flags |= XFRM_STATE_NOPMTUDISC;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	const struct flowi4 *fl4 = &amp;fl-&gt;u.ip4;</div><div class='del'>-</div><div class='del'>-	sel-&gt;daddr.a4 = fl4-&gt;daddr;</div><div class='del'>-	sel-&gt;saddr.a4 = fl4-&gt;saddr;</div><div class='del'>-	sel-&gt;dport = xfrm_flowi_dport(fl, &amp;fl4-&gt;uli);</div><div class='del'>-	sel-&gt;dport_mask = htons(0xffff);</div><div class='del'>-	sel-&gt;sport = xfrm_flowi_sport(fl, &amp;fl4-&gt;uli);</div><div class='del'>-	sel-&gt;sport_mask = htons(0xffff);</div><div class='del'>-	sel-&gt;family = AF_INET;</div><div class='del'>-	sel-&gt;prefixlen_d = 32;</div><div class='del'>-	sel-&gt;prefixlen_s = 32;</div><div class='del'>-	sel-&gt;proto = fl4-&gt;flowi4_proto;</div><div class='del'>-	sel-&gt;ifindex = fl4-&gt;flowi4_oif;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xfrm4_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,</div><div class='del'>-		   const xfrm_address_t *daddr, const xfrm_address_t *saddr)</div><div class='del'>-{</div><div class='del'>-	x-&gt;id = tmpl-&gt;id;</div><div class='del'>-	if (x-&gt;id.daddr.a4 == 0)</div><div class='del'>-		x-&gt;id.daddr.a4 = daddr-&gt;a4;</div><div class='del'>-	x-&gt;props.saddr = tmpl-&gt;saddr;</div><div class='del'>-	if (x-&gt;props.saddr.a4 == 0)</div><div class='del'>-		x-&gt;props.saddr.a4 = saddr-&gt;a4;</div><div class='del'>-	x-&gt;props.mode = tmpl-&gt;mode;</div><div class='del'>-	x-&gt;props.reqid = tmpl-&gt;reqid;</div><div class='del'>-	x-&gt;props.family = AF_INET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm4_extract_header(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;ihl = sizeof(*iph);</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;id = iph-&gt;id;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;frag_off = iph-&gt;frag_off;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;tos = iph-&gt;tos;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;ttl = iph-&gt;ttl;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;optlen = iph-&gt;ihl * 4 - sizeof(*iph);</div><div class='del'>-	memset(XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl, 0,</div><div class='del'>-	       sizeof(XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static struct xfrm_state_afinfo xfrm4_state_afinfo = {</div><div class='ctx'> 	.family			= AF_INET,</div><div class='ctx'> 	.proto			= IPPROTO_IPIP,</div><div class='del'>-	.eth_proto		= htons(ETH_P_IP),</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.init_flags		= xfrm4_init_flags,</div><div class='del'>-	.init_tempsel		= __xfrm4_init_tempsel,</div><div class='del'>-	.init_temprop		= xfrm4_init_temprop,</div><div class='ctx'> 	.output			= xfrm4_output,</div><div class='del'>-	.output_finish		= xfrm4_output_finish,</div><div class='del'>-	.extract_input		= xfrm4_extract_input,</div><div class='del'>-	.extract_output		= xfrm4_extract_output,</div><div class='ctx'> 	.transport_finish	= xfrm4_transport_finish,</div><div class='ctx'> 	.local_error		= xfrm4_local_error,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c<br/>index 06347dbd32c1..8cb266af1393 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv4/xfrm4_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv4/xfrm4_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv4/xfrm4_tunnel.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* xfrm4_tunnel.c: Generic IP tunnel transformer.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='hunk'>@@ -7,9 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int ipip_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -23,13 +22,17 @@ static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	return ip_hdr(skb)-&gt;protocol;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipip_init_state(struct xfrm_state *x)</div><div class='add'>+static int ipip_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	if (x-&gt;props.mode != XFRM_MODE_TUNNEL)</div><div class='add'>+	if (x-&gt;props.mode != XFRM_MODE_TUNNEL) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv4 tunnel can only be used with tunnel mode");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;encap)</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv4 tunnel is not compatible with encapsulation");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	x-&gt;props.header_len = sizeof(struct iphdr);</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +44,6 @@ static void ipip_destroy(struct xfrm_state *x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type ipip_type = {</div><div class='del'>-	.description	= "IPIP",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_IPIP,</div><div class='ctx'> 	.init_state	= ipip_init_state,</div><div class='hunk'>@@ -63,14 +65,14 @@ static int xfrm_tunnel_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> static struct xfrm_tunnel xfrm_tunnel_handler __read_mostly = {</div><div class='ctx'> 	.handler	=	xfrm_tunnel_rcv,</div><div class='ctx'> 	.err_handler	=	xfrm_tunnel_err,</div><div class='del'>-	.priority	=	3,</div><div class='add'>+	.priority	=	4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static struct xfrm_tunnel xfrm64_tunnel_handler __read_mostly = {</div><div class='ctx'> 	.handler	=	xfrm_tunnel_rcv,</div><div class='ctx'> 	.err_handler	=	xfrm_tunnel_err,</div><div class='del'>-	.priority	=	2,</div><div class='add'>+	.priority	=	3,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -107,11 +109,11 @@ static void __exit ipip_fini(void)</div><div class='ctx'> 	if (xfrm4_tunnel_deregister(&amp;xfrm_tunnel_handler, AF_INET))</div><div class='ctx'> 		pr_info("%s: can't remove xfrm handler for AF_INET\n",</div><div class='ctx'> 			__func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;ipip_type, AF_INET) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;ipip_type, AF_INET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ipip_init);</div><div class='ctx'> module_exit(ipip_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv4 XFRM tunnel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_IPIP);</div><div class='head'>diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig<br/>index 613282c65a10..b8f9a8c0302e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IPv6 configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -6,14 +7,15 @@</div><div class='ctx'> menuconfig IPV6</div><div class='ctx'> 	tristate "The IPv6 protocol"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	select CRYPTO_LIB_SHA1</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IP version 6 (IPv6).</div><div class='ctx'> </div><div class='ctx'> 	  For general information about IPv6, see</div><div class='ctx'> 	  &lt;https://en.wikipedia.org/wiki/IPv6&gt;.</div><div class='ctx'> 	  For specific information about IPv6 under Linux, see</div><div class='del'>-	  Documentation/networking/ipv6.txt and read the HOWTO at</div><div class='del'>-	  &lt;http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/&gt;</div><div class='add'>+	  Documentation/networking/ipv6.rst and read the HOWTO at</div><div class='add'>+	  &lt;https://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/&gt;</div><div class='ctx'> </div><div class='ctx'> 	  To compile this protocol support as a module, choose M here: the</div><div class='ctx'> 	  module will be called ipv6.</div><div class='hunk'>@@ -22,7 +24,7 @@ if IPV6</div><div class='ctx'> </div><div class='ctx'> config IPV6_ROUTER_PREF</div><div class='ctx'> 	bool "IPv6: Router Preference (RFC 4191) support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Router Preference is an optional extension to the Router</div><div class='ctx'> 	  Advertisement message which improves the ability of hosts</div><div class='ctx'> 	  to pick an appropriate router, especially when the hosts</div><div class='hunk'>@@ -33,14 +35,14 @@ config IPV6_ROUTER_PREF</div><div class='ctx'> config IPV6_ROUTE_INFO</div><div class='ctx'> 	bool "IPv6: Route Information (RFC 4191) support"</div><div class='ctx'> 	depends on IPV6_ROUTER_PREF</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support of Route Information.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config IPV6_OPTIMISTIC_DAD</div><div class='ctx'> 	bool "IPv6: Enable RFC 4429 Optimistic DAD"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for optimistic Duplicate Address Detection. It allows for</div><div class='ctx'> 	  autoconfigured addresses to be used more quickly.</div><div class='ctx'> </div><div class='hunk'>@@ -48,29 +50,31 @@ config IPV6_OPTIMISTIC_DAD</div><div class='ctx'> </div><div class='ctx'> config INET6_AH</div><div class='ctx'> 	tristate "IPv6: AH transformation"</div><div class='del'>-	select XFRM_ALGO</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_HMAC</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO_SHA1</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec AH.</div><div class='add'>+	select XFRM_AH</div><div class='add'>+	help</div><div class='add'>+	  Support for IPsec AH (Authentication Header).</div><div class='add'>+</div><div class='add'>+	  AH can be used with various authentication algorithms.  Besides</div><div class='add'>+	  enabling AH support itself, this option enables the generic</div><div class='add'>+	  implementations of the algorithms that RFC 8221 lists as MUST be</div><div class='add'>+	  implemented.  If you need any other algorithms, you'll need to enable</div><div class='add'>+	  them in the crypto API.  You should also enable accelerated</div><div class='add'>+	  implementations of any needed algorithms when available.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config INET6_ESP</div><div class='ctx'> 	tristate "IPv6: ESP transformation"</div><div class='del'>-	select XFRM_ALGO</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_AUTHENC</div><div class='del'>-	select CRYPTO_HMAC</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO_CBC</div><div class='del'>-	select CRYPTO_SHA1</div><div class='del'>-	select CRYPTO_DES</div><div class='del'>-	select CRYPTO_ECHAINIV</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec ESP.</div><div class='add'>+	select XFRM_ESP</div><div class='add'>+	help</div><div class='add'>+	  Support for IPsec ESP (Encapsulating Security Payload).</div><div class='add'>+</div><div class='add'>+	  ESP can be used with various encryption and authentication algorithms.</div><div class='add'>+	  Besides enabling ESP support itself, this option enables the generic</div><div class='add'>+	  implementations of the algorithms that RFC 8221 lists as MUST be</div><div class='add'>+	  implemented.  If you need any other algorithms, you'll need to enable</div><div class='add'>+	  them in the crypto API.  You should also enable accelerated</div><div class='add'>+	  implementations of any needed algorithms when available.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +83,7 @@ config INET6_ESP_OFFLOAD</div><div class='ctx'> 	depends on INET6_ESP</div><div class='ctx'> 	select XFRM_OFFLOAD</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for ESP transformation offload. This makes sense</div><div class='ctx'> 	  only if this system really does IPsec and want to do it</div><div class='ctx'> 	  with high throughput. A typical desktop system does not</div><div class='hunk'>@@ -87,11 +91,23 @@ config INET6_ESP_OFFLOAD</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config INET6_ESPINTCP</div><div class='add'>+	bool "IPv6: ESP in TCP encapsulation (RFC 8229)"</div><div class='add'>+	depends on XFRM &amp;&amp; INET6_ESP</div><div class='add'>+	select STREAM_PARSER</div><div class='add'>+	select NET_SOCK_MSG</div><div class='add'>+	select XFRM_ESPINTCP</div><div class='add'>+	help</div><div class='add'>+	  Support for RFC 8229 encapsulation of ESP and IKE over</div><div class='add'>+	  TCP/IPv6 sockets.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config INET6_IPCOMP</div><div class='ctx'> 	tristate "IPv6: IPComp transformation"</div><div class='ctx'> 	select INET6_XFRM_TUNNEL</div><div class='ctx'> 	select XFRM_IPCOMP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IP Payload Compression Protocol (IPComp) (RFC3173),</div><div class='ctx'> 	  typically needed for IPsec.</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +116,7 @@ config INET6_IPCOMP</div><div class='ctx'> config IPV6_MIP6</div><div class='ctx'> 	tristate "IPv6: Mobility"</div><div class='ctx'> 	select XFRM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IPv6 Mobility described in RFC 3775.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='hunk'>@@ -110,7 +126,7 @@ config IPV6_ILA</div><div class='ctx'> 	depends on NETFILTER</div><div class='ctx'> 	select DST_CACHE</div><div class='ctx'> 	select LWTUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IPv6 Identifier Locator Addressing (ILA).</div><div class='ctx'> </div><div class='ctx'> 	  ILA is a mechanism to do network virtualization without</div><div class='hunk'>@@ -135,45 +151,12 @@ config INET6_TUNNEL</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='del'>-config INET6_XFRM_MODE_TRANSPORT</div><div class='del'>-	tristate "IPv6: IPsec transport mode"</div><div class='del'>-	default IPV6</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec transport mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config INET6_XFRM_MODE_TUNNEL</div><div class='del'>-	tristate "IPv6: IPsec tunnel mode"</div><div class='del'>-	default IPV6</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec tunnel mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config INET6_XFRM_MODE_BEET</div><div class='del'>-	tristate "IPv6: IPsec BEET mode"</div><div class='del'>-	default IPV6</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for IPsec BEET mode.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config INET6_XFRM_MODE_ROUTEOPTIMIZATION</div><div class='del'>-	tristate "IPv6: MIPv6 route optimization mode"</div><div class='del'>-	select XFRM</div><div class='del'>-	---help---</div><div class='del'>-	  Support for MIPv6 route optimization mode.</div><div class='del'>-</div><div class='ctx'> config IPV6_VTI</div><div class='del'>-tristate "Virtual (secure) IPv6: tunneling"</div><div class='add'>+	tristate "Virtual (secure) IPv6: tunneling"</div><div class='ctx'> 	select IPV6_TUNNEL</div><div class='ctx'> 	select NET_IP_TUNNEL</div><div class='del'>-	depends on INET6_XFRM_MODE_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	select XFRM</div><div class='add'>+	help</div><div class='ctx'> 	Tunneling means encapsulating data of one protocol type within</div><div class='ctx'> 	another protocol and sending it over a channel that understands the</div><div class='ctx'> 	encapsulating protocol. This can be used with xfrm mode tunnel to give</div><div class='hunk'>@@ -186,7 +169,7 @@ config IPV6_SIT</div><div class='ctx'> 	select NET_IP_TUNNEL</div><div class='ctx'> 	select IPV6_NDISC_NODETYPE</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Tunneling means encapsulating data of one protocol type within</div><div class='ctx'> 	  another protocol and sending it over a channel that understands the</div><div class='ctx'> 	  encapsulating protocol. This driver implements encapsulation of IPv6</div><div class='hunk'>@@ -199,7 +182,7 @@ config IPV6_SIT_6RD</div><div class='ctx'> 	bool "IPv6: IPv6 Rapid Deployment (6RD)"</div><div class='ctx'> 	depends on IPV6_SIT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon</div><div class='ctx'> 	  mechanisms of 6to4 (RFC3056) to enable a service provider to rapidly</div><div class='ctx'> 	  deploy IPv6 unicast service to IPv4 sites to which it provides</div><div class='hunk'>@@ -222,7 +205,7 @@ config IPV6_TUNNEL</div><div class='ctx'> 	select INET6_TUNNEL</div><div class='ctx'> 	select DST_CACHE</div><div class='ctx'> 	select GRO_CELLS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in</div><div class='ctx'> 	  RFC 2473.</div><div class='ctx'> </div><div class='hunk'>@@ -233,7 +216,7 @@ config IPV6_GRE</div><div class='ctx'> 	select IPV6_TUNNEL</div><div class='ctx'> 	select NET_IP_TUNNEL</div><div class='ctx'> 	depends on NET_IPGRE_DEMUX</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Tunneling means encapsulating data of one protocol type within</div><div class='ctx'> 	  another protocol and sending it over a channel that understands the</div><div class='ctx'> 	  encapsulating protocol. This particular tunneling driver implements</div><div class='hunk'>@@ -258,13 +241,13 @@ config IPV6_FOU_TUNNEL</div><div class='ctx'> config IPV6_MULTIPLE_TABLES</div><div class='ctx'> 	bool "IPv6: Multiple Routing Tables"</div><div class='ctx'> 	select FIB_RULES</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support multiple routing tables.</div><div class='ctx'> </div><div class='ctx'> config IPV6_SUBTREES</div><div class='ctx'> 	bool "IPv6: source address based routing"</div><div class='ctx'> 	depends on IPV6_MULTIPLE_TABLES</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable routing by source address or prefix.</div><div class='ctx'> </div><div class='ctx'> 	  The destination address is still the primary routing key, so mixing</div><div class='hunk'>@@ -279,7 +262,7 @@ config IPV6_MROUTE</div><div class='ctx'> 	bool "IPv6: multicast routing"</div><div class='ctx'> 	depends on IPV6</div><div class='ctx'> 	select IP_MROUTE_COMMON</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IPv6 multicast forwarding.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +283,7 @@ config IPV6_MROUTE_MULTIPLE_TABLES</div><div class='ctx'> config IPV6_PIMSM_V2</div><div class='ctx'> 	bool "IPv6: PIM-SM version 2 support"</div><div class='ctx'> 	depends on IPV6_MROUTE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for IPv6 PIM multicast routing protocol PIM-SMv2.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -310,7 +293,7 @@ config IPV6_SEG6_LWTUNNEL</div><div class='ctx'> 	select LWTUNNEL</div><div class='ctx'> 	select DST_CACHE</div><div class='ctx'> 	select IPV6_MULTIPLE_TABLES</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for encapsulation of packets within an outer IPv6</div><div class='ctx'> 	  header and a Segment Routing Header using the lightweight</div><div class='ctx'> 	  tunnels mechanism. Also enable support for advanced local</div><div class='hunk'>@@ -321,10 +304,10 @@ config IPV6_SEG6_LWTUNNEL</div><div class='ctx'> config IPV6_SEG6_HMAC</div><div class='ctx'> 	bool "IPv6: Segment Routing HMAC support"</div><div class='ctx'> 	depends on IPV6</div><div class='del'>-	select CRYPTO_HMAC</div><div class='del'>-	select CRYPTO_SHA1</div><div class='del'>-	select CRYPTO_SHA256</div><div class='del'>-	---help---</div><div class='add'>+	select CRYPTO_LIB_SHA1</div><div class='add'>+	select CRYPTO_LIB_SHA256</div><div class='add'>+	select CRYPTO_LIB_UTILS</div><div class='add'>+	help</div><div class='ctx'> 	  Support for HMAC signature generation and verification</div><div class='ctx'> 	  of SR-enabled packets.</div><div class='ctx'> </div><div class='hunk'>@@ -335,4 +318,26 @@ config IPV6_SEG6_BPF</div><div class='ctx'> 	depends on IPV6_SEG6_LWTUNNEL</div><div class='ctx'> 	depends on IPV6 = y</div><div class='ctx'> </div><div class='add'>+config IPV6_RPL_LWTUNNEL</div><div class='add'>+	bool "IPv6: RPL Source Routing Header support"</div><div class='add'>+	depends on IPV6</div><div class='add'>+	select LWTUNNEL</div><div class='add'>+	select DST_CACHE</div><div class='add'>+	help</div><div class='add'>+	  Support for RFC6554 RPL Source Routing Header using the lightweight</div><div class='add'>+	  tunnels mechanism.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config IPV6_IOAM6_LWTUNNEL</div><div class='add'>+	bool "IPv6: IOAM Pre-allocated Trace insertion support"</div><div class='add'>+	depends on IPV6</div><div class='add'>+	select LWTUNNEL</div><div class='add'>+	select DST_CACHE</div><div class='add'>+	help</div><div class='add'>+	  Support for the insertion of IOAM Pre-allocated Trace</div><div class='add'>+	  Header using the lightweight tunnels mechanism.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> endif # IPV6</div><div class='head'>diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile<br/>index e0026fa1261b..d283c59df4c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/Makefile</a></div><div class='hunk'>@@ -5,16 +5,14 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IPV6) += ipv6.o</div><div class='ctx'> </div><div class='del'>-ipv6-objs :=	af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \</div><div class='add'>+ipv6-y :=	af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \</div><div class='ctx'> 		addrlabel.o \</div><div class='ctx'> 		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \</div><div class='ctx'> 		raw.o icmp.o mcast.o reassembly.o tcp_ipv6.o ping.o \</div><div class='ctx'> 		exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \</div><div class='del'>-		udp_offload.o seg6.o fib6_notifier.o</div><div class='add'>+		udp_offload.o seg6.o fib6_notifier.o rpl.o ioam6.o</div><div class='ctx'> </div><div class='del'>-ipv6-offload :=	ip6_offload.o tcpv6_offload.o exthdrs_offload.o</div><div class='del'>-</div><div class='del'>-ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o</div><div class='add'>+ipv6-$(CONFIG_SYSCTL) += sysctl_net_ipv6.o</div><div class='ctx'> ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o</div><div class='ctx'> </div><div class='ctx'> ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \</div><div class='hunk'>@@ -26,8 +24,8 @@ ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o</div><div class='ctx'> ipv6-$(CONFIG_NETLABEL) += calipso.o</div><div class='ctx'> ipv6-$(CONFIG_IPV6_SEG6_LWTUNNEL) += seg6_iptunnel.o seg6_local.o</div><div class='ctx'> ipv6-$(CONFIG_IPV6_SEG6_HMAC) += seg6_hmac.o</div><div class='del'>-</div><div class='del'>-ipv6-objs += $(ipv6-y)</div><div class='add'>+ipv6-$(CONFIG_IPV6_RPL_LWTUNNEL) += rpl_iptunnel.o</div><div class='add'>+ipv6-$(CONFIG_IPV6_IOAM6_LWTUNNEL) += ioam6_iptunnel.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_INET6_AH) += ah6.o</div><div class='ctx'> obj-$(CONFIG_INET6_ESP) += esp6.o</div><div class='hunk'>@@ -35,10 +33,6 @@ obj-$(CONFIG_INET6_ESP_OFFLOAD) += esp6_offload.o</div><div class='ctx'> obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o</div><div class='ctx'> obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o</div><div class='ctx'> obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o</div><div class='del'>-obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o</div><div class='del'>-obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o</div><div class='del'>-obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o</div><div class='del'>-obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o</div><div class='ctx'> obj-$(CONFIG_IPV6_MIP6) += mip6.o</div><div class='ctx'> obj-$(CONFIG_IPV6_ILA) += ila/</div><div class='ctx'> obj-$(CONFIG_NETFILTER)	+= netfilter/</div><div class='hunk'>@@ -50,11 +44,13 @@ obj-$(CONFIG_IPV6_GRE) += ip6_gre.o</div><div class='ctx'> obj-$(CONFIG_IPV6_FOU) += fou6.o</div><div class='ctx'> </div><div class='ctx'> obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o</div><div class='del'>-obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)</div><div class='add'>+obj-$(CONFIG_INET) += output_core.o protocol.o \</div><div class='add'>+			ip6_offload.o tcpv6_offload.o exthdrs_offload.o</div><div class='ctx'> </div><div class='ctx'> obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o</div><div class='ctx'> </div><div class='ctx'> ifneq ($(CONFIG_IPV6),)</div><div class='ctx'> obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o</div><div class='ctx'> obj-y += mcast_snoop.o</div><div class='add'>+obj-$(CONFIG_TCP_AO) += tcp_ao.o</div><div class='ctx'> endif</div><div class='head'>diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c<br/>index c63ccce6425f..b66217d1b2f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrconf.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrconf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrconf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/addrconf.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 Address [auto]configuration</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *	Alexey Kuznetsov	&lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -67,6 +63,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='hunk'>@@ -83,18 +80,18 @@</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;linux/if_tunnel.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/netconf.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#define	INFINITY_LIFE_TIME	0xFFFFFFFF</div><div class='add'>+#include &lt;linux/ioam6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IPV6_MAX_STRLEN \</div><div class='ctx'> 	sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")</div><div class='hunk'>@@ -107,7 +104,7 @@ static inline u32 cstamp_delta(unsigned long cstamp)</div><div class='ctx'> static inline s32 rfc3315_s14_backoff_init(s32 irt)</div><div class='ctx'> {</div><div class='ctx'> 	/* multiply 'initial retransmission time' by 0.9 .. 1.1 */</div><div class='del'>-	u64 tmp = (900000 + prandom_u32() % 200001) * (u64)irt;</div><div class='add'>+	u64 tmp = get_random_u32_inclusive(900000, 1100000) * (u64)irt;</div><div class='ctx'> 	do_div(tmp, 1000000);</div><div class='ctx'> 	return (s32)tmp;</div><div class='ctx'> }</div><div class='hunk'>@@ -115,11 +112,11 @@ static inline s32 rfc3315_s14_backoff_init(s32 irt)</div><div class='ctx'> static inline s32 rfc3315_s14_backoff_update(s32 rt, s32 mrt)</div><div class='ctx'> {</div><div class='ctx'> 	/* multiply 'retransmission timeout' by 1.9 .. 2.1 */</div><div class='del'>-	u64 tmp = (1900000 + prandom_u32() % 200001) * (u64)rt;</div><div class='add'>+	u64 tmp = get_random_u32_inclusive(1900000, 2100000) * (u64)rt;</div><div class='ctx'> 	do_div(tmp, 1000000);</div><div class='ctx'> 	if ((s32)tmp &gt; mrt) {</div><div class='ctx'> 		/* multiply 'maximum retransmission time' by 0.9 .. 1.1 */</div><div class='del'>-		tmp = (900000 + prandom_u32() % 200001) * (u64)mrt;</div><div class='add'>+		tmp = get_random_u32_inclusive(900000, 1100000) * (u64)mrt;</div><div class='ctx'> 		do_div(tmp, 1000000);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (s32)tmp;</div><div class='hunk'>@@ -139,8 +136,7 @@ static inline void addrconf_sysctl_unregister(struct inet6_dev *idev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void ipv6_regen_rndid(struct inet6_dev *idev);</div><div class='del'>-static void ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr);</div><div class='add'>+static void ipv6_gen_rnd_iid(struct in6_addr *addr);</div><div class='ctx'> </div><div class='ctx'> static int ipv6_generate_eui64(u8 *eui, struct net_device *dev);</div><div class='ctx'> static int ipv6_count_addresses(const struct inet6_dev *idev);</div><div class='hunk'>@@ -150,36 +146,30 @@ static int ipv6_generate_stable_address(struct in6_addr *addr,</div><div class='ctx'> </div><div class='ctx'> #define IN6_ADDR_HSIZE_SHIFT	8</div><div class='ctx'> #define IN6_ADDR_HSIZE		(1 &lt;&lt; IN6_ADDR_HSIZE_SHIFT)</div><div class='del'>-/*</div><div class='del'>- *	Configured unicast address hash table</div><div class='del'>- */</div><div class='del'>-static struct hlist_head inet6_addr_lst[IN6_ADDR_HSIZE];</div><div class='del'>-static DEFINE_SPINLOCK(addrconf_hash_lock);</div><div class='ctx'> </div><div class='del'>-static void addrconf_verify(void);</div><div class='del'>-static void addrconf_verify_rtnl(void);</div><div class='del'>-static void addrconf_verify_work(struct work_struct *);</div><div class='add'>+static void addrconf_verify(struct net *net);</div><div class='add'>+static void addrconf_verify_rtnl(struct net *net);</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *addrconf_wq;</div><div class='del'>-static DECLARE_DELAYED_WORK(addr_chk_work, addrconf_verify_work);</div><div class='ctx'> </div><div class='ctx'> static void addrconf_join_anycast(struct inet6_ifaddr *ifp);</div><div class='ctx'> static void addrconf_leave_anycast(struct inet6_ifaddr *ifp);</div><div class='ctx'> </div><div class='ctx'> static void addrconf_type_change(struct net_device *dev,</div><div class='ctx'> 				 unsigned long event);</div><div class='del'>-static int addrconf_ifdown(struct net_device *dev, int how);</div><div class='add'>+static int addrconf_ifdown(struct net_device *dev, bool unregister);</div><div class='ctx'> </div><div class='ctx'> static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,</div><div class='ctx'> 						  int plen,</div><div class='ctx'> 						  const struct net_device *dev,</div><div class='del'>-						  u32 flags, u32 noflags);</div><div class='add'>+						  u32 flags, u32 noflags,</div><div class='add'>+						  bool no_gw);</div><div class='ctx'> </div><div class='ctx'> static void addrconf_dad_start(struct inet6_ifaddr *ifp);</div><div class='ctx'> static void addrconf_dad_work(struct work_struct *w);</div><div class='ctx'> static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id,</div><div class='ctx'> 				   bool send_na);</div><div class='del'>-static void addrconf_dad_run(struct inet6_dev *idev);</div><div class='add'>+static void addrconf_dad_run(struct inet6_dev *idev, bool restart);</div><div class='ctx'> static void addrconf_rs_timer(struct timer_list *t);</div><div class='ctx'> static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);</div><div class='ctx'> static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);</div><div class='hunk'>@@ -205,12 +195,15 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {</div><div class='ctx'> 	.use_tempaddr		= 0,</div><div class='ctx'> 	.temp_valid_lft		= TEMP_VALID_LIFETIME,</div><div class='ctx'> 	.temp_prefered_lft	= TEMP_PREFERRED_LIFETIME,</div><div class='add'>+	.regen_min_advance	= REGEN_MIN_ADVANCE,</div><div class='ctx'> 	.regen_max_retry	= REGEN_MAX_RETRY,</div><div class='ctx'> 	.max_desync_factor	= MAX_DESYNC_FACTOR,</div><div class='ctx'> 	.max_addresses		= IPV6_MAX_ADDRESSES,</div><div class='ctx'> 	.accept_ra_defrtr	= 1,</div><div class='add'>+	.ra_defrtr_metric	= IP6_RT_PRIO_USER,</div><div class='ctx'> 	.accept_ra_from_local	= 0,</div><div class='ctx'> 	.accept_ra_min_hop_limit= 1,</div><div class='add'>+	.accept_ra_min_lft	= 0,</div><div class='ctx'> 	.accept_ra_pinfo	= 1,</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='ctx'> 	.accept_ra_rtr_pref	= 1,</div><div class='hunk'>@@ -239,6 +232,14 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {</div><div class='ctx'> 	.enhanced_dad           = 1,</div><div class='ctx'> 	.addr_gen_mode		= IN6_ADDR_GEN_MODE_EUI64,</div><div class='ctx'> 	.disable_policy		= 0,</div><div class='add'>+	.rpl_seg_enabled	= 0,</div><div class='add'>+	.ioam6_enabled		= 0,</div><div class='add'>+	.ioam6_id               = IOAM6_DEFAULT_IF_ID,</div><div class='add'>+	.ioam6_id_wide		= IOAM6_DEFAULT_IF_ID_WIDE,</div><div class='add'>+	.ndisc_evict_nocarrier	= 1,</div><div class='add'>+	.ra_honor_pio_life	= 0,</div><div class='add'>+	.ra_honor_pio_pflag	= 0,</div><div class='add'>+	.force_forwarding	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {</div><div class='hunk'>@@ -259,12 +260,15 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {</div><div class='ctx'> 	.use_tempaddr		= 0,</div><div class='ctx'> 	.temp_valid_lft		= TEMP_VALID_LIFETIME,</div><div class='ctx'> 	.temp_prefered_lft	= TEMP_PREFERRED_LIFETIME,</div><div class='add'>+	.regen_min_advance	= REGEN_MIN_ADVANCE,</div><div class='ctx'> 	.regen_max_retry	= REGEN_MAX_RETRY,</div><div class='ctx'> 	.max_desync_factor	= MAX_DESYNC_FACTOR,</div><div class='ctx'> 	.max_addresses		= IPV6_MAX_ADDRESSES,</div><div class='ctx'> 	.accept_ra_defrtr	= 1,</div><div class='add'>+	.ra_defrtr_metric	= IP6_RT_PRIO_USER,</div><div class='ctx'> 	.accept_ra_from_local	= 0,</div><div class='ctx'> 	.accept_ra_min_hop_limit= 1,</div><div class='add'>+	.accept_ra_min_lft	= 0,</div><div class='ctx'> 	.accept_ra_pinfo	= 1,</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='ctx'> 	.accept_ra_rtr_pref	= 1,</div><div class='hunk'>@@ -293,6 +297,14 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {</div><div class='ctx'> 	.enhanced_dad           = 1,</div><div class='ctx'> 	.addr_gen_mode		= IN6_ADDR_GEN_MODE_EUI64,</div><div class='ctx'> 	.disable_policy		= 0,</div><div class='add'>+	.rpl_seg_enabled	= 0,</div><div class='add'>+	.ioam6_enabled		= 0,</div><div class='add'>+	.ioam6_id               = IOAM6_DEFAULT_IF_ID,</div><div class='add'>+	.ioam6_id_wide		= IOAM6_DEFAULT_IF_ID_WIDE,</div><div class='add'>+	.ndisc_evict_nocarrier	= 1,</div><div class='add'>+	.ra_honor_pio_life	= 0,</div><div class='add'>+	.ra_honor_pio_pflag	= 0,</div><div class='add'>+	.force_forwarding	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Check if link is ready: is it up and is a valid qdisc available */</div><div class='hunk'>@@ -303,7 +315,7 @@ static inline bool addrconf_link_ready(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void addrconf_del_rs_timer(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer(&amp;idev-&gt;rs_timer))</div><div class='add'>+	if (timer_delete(&amp;idev-&gt;rs_timer))</div><div class='ctx'> 		__in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -316,9 +328,8 @@ static void addrconf_del_dad_work(struct inet6_ifaddr *ifp)</div><div class='ctx'> static void addrconf_mod_rs_timer(struct inet6_dev *idev,</div><div class='ctx'> 				  unsigned long when)</div><div class='ctx'> {</div><div class='del'>-	if (!timer_pending(&amp;idev-&gt;rs_timer))</div><div class='add'>+	if (!mod_timer(&amp;idev-&gt;rs_timer, jiffies + when))</div><div class='ctx'> 		in6_dev_hold(idev);</div><div class='del'>-	mod_timer(&amp;idev-&gt;rs_timer, jiffies + when);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void addrconf_mod_dad_work(struct inet6_ifaddr *ifp,</div><div class='hunk'>@@ -333,7 +344,7 @@ static int snmp6_alloc_dev(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	idev-&gt;stats.ipv6 = alloc_percpu(struct ipstats_mib);</div><div class='add'>+	idev-&gt;stats.ipv6 = alloc_percpu_gfp(struct ipstats_mib, GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!idev-&gt;stats.ipv6)</div><div class='ctx'> 		goto err_ip;</div><div class='ctx'> </div><div class='hunk'>@@ -349,7 +360,7 @@ static int snmp6_alloc_dev(struct inet6_dev *idev)</div><div class='ctx'> 	if (!idev-&gt;stats.icmpv6dev)</div><div class='ctx'> 		goto err_icmp;</div><div class='ctx'> 	idev-&gt;stats.icmpv6msgdev = kzalloc(sizeof(struct icmpv6msg_mib_device),</div><div class='del'>-					   GFP_KERNEL);</div><div class='add'>+					   GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!idev-&gt;stats.icmpv6msgdev)</div><div class='ctx'> 		goto err_icmpmsg;</div><div class='ctx'> </div><div class='hunk'>@@ -369,11 +380,12 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='add'>+	netdev_ops_assert_locked(dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+	if (dev-&gt;mtu &lt; IPV6_MIN_MTU &amp;&amp; dev != blackhole_netdev)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	ndev = kzalloc(sizeof(struct inet6_dev), GFP_KERNEL);</div><div class='add'>+	ndev = kzalloc(sizeof(*ndev), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!ndev)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='hunk'>@@ -387,31 +399,33 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)</div><div class='ctx'> 		ndev-&gt;cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;cnf.mtu6 = dev-&gt;mtu;</div><div class='add'>+	ndev-&gt;ra_mtu = 0;</div><div class='ctx'> 	ndev-&gt;nd_parms = neigh_parms_alloc(dev, &amp;nd_tbl);</div><div class='ctx'> 	if (!ndev-&gt;nd_parms) {</div><div class='ctx'> 		kfree(ndev);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ndev-&gt;cnf.forwarding)</div><div class='del'>-		dev_disable_lro(dev);</div><div class='add'>+		netif_disable_lro(dev);</div><div class='ctx'> 	/* We refer to the device */</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;ndev-&gt;dev_tracker, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (snmp6_alloc_dev(ndev) &lt; 0) {</div><div class='ctx'> 		netdev_dbg(dev, "%s: cannot allocate memory for statistics\n",</div><div class='ctx'> 			   __func__);</div><div class='ctx'> 		neigh_parms_release(&amp;nd_tbl, ndev-&gt;nd_parms);</div><div class='del'>-		dev_put(dev);</div><div class='add'>+		netdev_put(dev, &amp;ndev-&gt;dev_tracker);</div><div class='ctx'> 		kfree(ndev);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (snmp6_register_dev(ndev) &lt; 0) {</div><div class='del'>-		netdev_dbg(dev, "%s: cannot create /proc/net/dev_snmp6/%s\n",</div><div class='del'>-			   __func__, dev-&gt;name);</div><div class='del'>-		goto err_release;</div><div class='add'>+	if (dev != blackhole_netdev) {</div><div class='add'>+		if (snmp6_register_dev(ndev) &lt; 0) {</div><div class='add'>+			netdev_dbg(dev, "%s: cannot create /proc/net/dev_snmp6/%s\n",</div><div class='add'>+				   __func__, dev-&gt;name);</div><div class='add'>+			goto err_release;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	/* One reference from device. */</div><div class='ctx'> 	refcount_set(&amp;ndev-&gt;refcnt, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -433,8 +447,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)</div><div class='ctx'> 	    dev-&gt;type == ARPHRD_SIT ||</div><div class='ctx'> 	    dev-&gt;type == ARPHRD_NONE) {</div><div class='ctx'> 		ndev-&gt;cnf.use_tempaddr = -1;</div><div class='del'>-	} else</div><div class='del'>-		ipv6_regen_rndid(ndev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;token = in6addr_any;</div><div class='ctx'> </div><div class='hunk'>@@ -443,25 +456,28 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ipv6_mc_init_dev(ndev);</div><div class='ctx'> 	ndev-&gt;tstamp = jiffies;</div><div class='del'>-	err = addrconf_sysctl_register(ndev);</div><div class='del'>-	if (err) {</div><div class='del'>-		ipv6_mc_destroy_dev(ndev);</div><div class='del'>-		snmp6_unregister_dev(ndev);</div><div class='del'>-		goto err_release;</div><div class='add'>+	if (dev != blackhole_netdev) {</div><div class='add'>+		err = addrconf_sysctl_register(ndev);</div><div class='add'>+		if (err) {</div><div class='add'>+			ipv6_mc_destroy_dev(ndev);</div><div class='add'>+			snmp6_unregister_dev(ndev);</div><div class='add'>+			goto err_release;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* protected by rtnl_lock */</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;ip6_ptr, ndev);</div><div class='ctx'> </div><div class='del'>-	/* Join interface-local all-node multicast group */</div><div class='del'>-	ipv6_dev_mc_inc(dev, &amp;in6addr_interfacelocal_allnodes);</div><div class='del'>-</div><div class='del'>-	/* Join all-node multicast group */</div><div class='del'>-	ipv6_dev_mc_inc(dev, &amp;in6addr_linklocal_allnodes);</div><div class='add'>+	if (dev != blackhole_netdev) {</div><div class='add'>+		/* Join interface-local all-node multicast group */</div><div class='add'>+		ipv6_dev_mc_inc(dev, &amp;in6addr_interfacelocal_allnodes);</div><div class='ctx'> </div><div class='del'>-	/* Join all-router multicast group if forwarding is set */</div><div class='del'>-	if (ndev-&gt;cnf.forwarding &amp;&amp; (dev-&gt;flags &amp; IFF_MULTICAST))</div><div class='del'>-		ipv6_dev_mc_inc(dev, &amp;in6addr_linklocal_allrouters);</div><div class='add'>+		/* Join all-node multicast group */</div><div class='add'>+		ipv6_dev_mc_inc(dev, &amp;in6addr_linklocal_allnodes);</div><div class='ctx'> </div><div class='add'>+		/* Join all-router multicast group if forwarding is set */</div><div class='add'>+		if (ndev-&gt;cnf.forwarding &amp;&amp; (dev-&gt;flags &amp; IFF_MULTICAST))</div><div class='add'>+			ipv6_dev_mc_inc(dev, &amp;in6addr_linklocal_allrouters);</div><div class='add'>+	}</div><div class='ctx'> 	return ndev;</div><div class='ctx'> </div><div class='ctx'> err_release:</div><div class='hunk'>@@ -481,7 +497,7 @@ static struct inet6_dev *ipv6_find_idev(struct net_device *dev)</div><div class='ctx'> 	if (!idev) {</div><div class='ctx'> 		idev = ipv6_add_dev(dev);</div><div class='ctx'> 		if (IS_ERR(idev))</div><div class='del'>-			return NULL;</div><div class='add'>+			return idev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags&amp;IFF_UP)</div><div class='hunk'>@@ -540,21 +556,23 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if ((all || type == NETCONFA_FORWARDING) &amp;&amp;</div><div class='del'>-	    nla_put_s32(skb, NETCONFA_FORWARDING, devconf-&gt;forwarding) &lt; 0)</div><div class='add'>+	    nla_put_s32(skb, NETCONFA_FORWARDING,</div><div class='add'>+			READ_ONCE(devconf-&gt;forwarding)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> #ifdef CONFIG_IPV6_MROUTE</div><div class='ctx'> 	if ((all || type == NETCONFA_MC_FORWARDING) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_MC_FORWARDING,</div><div class='del'>-			devconf-&gt;mc_forwarding) &lt; 0)</div><div class='add'>+			atomic_read(&amp;devconf-&gt;mc_forwarding)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> #endif</div><div class='ctx'> 	if ((all || type == NETCONFA_PROXY_NEIGH) &amp;&amp;</div><div class='del'>-	    nla_put_s32(skb, NETCONFA_PROXY_NEIGH, devconf-&gt;proxy_ndp) &lt; 0)</div><div class='add'>+	    nla_put_s32(skb, NETCONFA_PROXY_NEIGH,</div><div class='add'>+			READ_ONCE(devconf-&gt;proxy_ndp)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if ((all || type == NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN) &amp;&amp;</div><div class='ctx'> 	    nla_put_s32(skb, NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,</div><div class='del'>-			devconf-&gt;ignore_routes_with_linkdown) &lt; 0)</div><div class='add'>+			READ_ONCE(devconf-&gt;ignore_routes_with_linkdown)) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -597,6 +615,45 @@ static const struct nla_policy devconf_ipv6_policy[NETCONFA_MAX+1] = {</div><div class='ctx'> 	[NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN]	= { .len = sizeof(int) },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int inet6_netconf_valid_get_req(struct sk_buff *skb,</div><div class='add'>+				       const struct nlmsghdr *nlh,</div><div class='add'>+				       struct nlattr **tb,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(struct netconfmsg))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for netconf get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),</div><div class='add'>+					      tb, NETCONFA_MAX,</div><div class='add'>+					      devconf_ipv6_policy, extack);</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),</div><div class='add'>+					    tb, NETCONFA_MAX,</div><div class='add'>+					    devconf_ipv6_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NETCONFA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NETCONFA_IFINDEX:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in netconf get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> 				     struct nlmsghdr *nlh,</div><div class='ctx'> 				     struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -605,14 +662,12 @@ static int inet6_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> 	struct nlattr *tb[NETCONFA_MAX+1];</div><div class='ctx'> 	struct inet6_dev *in6_dev = NULL;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='del'>-	struct netconfmsg *ncm;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ipv6_devconf *devconf;</div><div class='ctx'> 	int ifindex;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,</div><div class='del'>-			  devconf_ipv6_policy, extack);</div><div class='add'>+	err = inet6_netconf_valid_get_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -658,80 +713,93 @@ static int inet6_netconf_get_devconf(struct sk_buff *in_skb,</div><div class='ctx'> errout:</div><div class='ctx'> 	if (in6_dev)</div><div class='ctx'> 		in6_dev_put(in6_dev);</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_put(dev);</div><div class='add'>+	dev_put(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Combine dev_addr_genid and dev_base_seq to detect changes.</div><div class='add'>+ */</div><div class='add'>+static u32 inet6_base_seq(const struct net *net)</div><div class='add'>+{</div><div class='add'>+	u32 res = atomic_read(&amp;net-&gt;ipv6.dev_addr_genid) +</div><div class='add'>+		  READ_ONCE(net-&gt;dev_base_seq);</div><div class='add'>+</div><div class='add'>+	/* Must not return 0 (see nl_dump_check_consistent()).</div><div class='add'>+	 * Chose a value far away from 0.</div><div class='add'>+	 */</div><div class='add'>+	if (!res)</div><div class='add'>+		res = 0x80000000;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_netconf_dump_devconf(struct sk_buff *skb,</div><div class='ctx'> 				      struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx, s_idx;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+		unsigned int all_default;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = idx = cb-&gt;args[1];</div><div class='del'>-</div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		cb-&gt;seq = atomic_read(&amp;net-&gt;ipv6.dev_addr_genid) ^</div><div class='del'>-			  net-&gt;dev_base_seq;</div><div class='del'>-		hlist_for_each_entry_rcu(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			idev = __in6_dev_get(dev);</div><div class='del'>-			if (!idev)</div><div class='del'>-				goto cont;</div><div class='del'>-</div><div class='del'>-			if (inet6_netconf_fill_devconf(skb, dev-&gt;ifindex,</div><div class='del'>-						       &amp;idev-&gt;cnf,</div><div class='del'>-						       NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						       cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						       RTM_NEWNETCONF,</div><div class='del'>-						       NLM_F_MULTI,</div><div class='del'>-						       NETCONFA_ALL) &lt; 0) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+		struct netconfmsg *ncm;</div><div class='add'>+</div><div class='add'>+		if (nlh-&gt;nlmsg_len &lt; nlmsg_msg_size(sizeof(*ncm))) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Invalid header for netconf dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (nlmsg_attrlen(nlh, sizeof(*ncm))) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Invalid data after header in netconf dump request");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='del'>-	if (h == NETDEV_HASHENTRIES) {</div><div class='del'>-		if (inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,</div><div class='del'>-					       net-&gt;ipv6.devconf_all,</div><div class='del'>-					       NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					       cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					       RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='del'>-					       NETCONFA_ALL) &lt; 0)</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		idev = __in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			continue;</div><div class='add'>+		err = inet6_netconf_fill_devconf(skb, dev-&gt;ifindex,</div><div class='add'>+					         &amp;idev-&gt;cnf,</div><div class='add'>+						 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						 nlh-&gt;nlmsg_seq,</div><div class='add'>+						 RTM_NEWNETCONF,</div><div class='add'>+						 NLM_F_MULTI,</div><div class='add'>+						 NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='del'>-		else</div><div class='del'>-			h++;</div><div class='del'>-	}</div><div class='del'>-	if (h == NETDEV_HASHENTRIES + 1) {</div><div class='del'>-		if (inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,</div><div class='del'>-					       net-&gt;ipv6.devconf_dflt,</div><div class='del'>-					       NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					       cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					       RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='del'>-					       NETCONFA_ALL) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;all_default == 0) {</div><div class='add'>+		err = inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,</div><div class='add'>+						 net-&gt;ipv6.devconf_all,</div><div class='add'>+						 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						 nlh-&gt;nlmsg_seq,</div><div class='add'>+						 RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='add'>+						 NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='del'>-		else</div><div class='del'>-			h++;</div><div class='add'>+		ctx-&gt;all_default++;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;all_default == 1) {</div><div class='add'>+		err = inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,</div><div class='add'>+						 net-&gt;ipv6.devconf_dflt,</div><div class='add'>+						 NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						 nlh-&gt;nlmsg_seq,</div><div class='add'>+						 RTM_NEWNETCONF, NLM_F_MULTI,</div><div class='add'>+						 NETCONFA_ALL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+		ctx-&gt;all_default++;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -739,6 +807,7 @@ static void dev_forward_change(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_ifaddr *ifa;</div><div class='add'>+	LIST_HEAD(tmp_addr_list);</div><div class='ctx'> </div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -757,14 +826,24 @@ static void dev_forward_change(struct inet6_dev *idev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='ctx'> 		if (ifa-&gt;flags&amp;IFA_F_TENTATIVE)</div><div class='ctx'> 			continue;</div><div class='add'>+		list_add_tail(&amp;ifa-&gt;if_list_aux, &amp;tmp_addr_list);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;tmp_addr_list)) {</div><div class='add'>+		ifa = list_first_entry(&amp;tmp_addr_list,</div><div class='add'>+				       struct inet6_ifaddr, if_list_aux);</div><div class='add'>+		list_del(&amp;ifa-&gt;if_list_aux);</div><div class='ctx'> 		if (idev-&gt;cnf.forwarding)</div><div class='ctx'> 			addrconf_join_anycast(ifa);</div><div class='ctx'> 		else</div><div class='ctx'> 			addrconf_leave_anycast(ifa);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,</div><div class='ctx'> 				     NETCONFA_FORWARDING,</div><div class='ctx'> 				     dev-&gt;ifindex, &amp;idev-&gt;cnf);</div><div class='hunk'>@@ -777,27 +856,30 @@ static void addrconf_forward_change(struct net *net, __s32 newf)</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	for_each_netdev(net, dev) {</div><div class='del'>-		idev = __in6_dev_get(dev);</div><div class='add'>+		idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> 		if (idev) {</div><div class='ctx'> 			int changed = (!idev-&gt;cnf.forwarding) ^ (!newf);</div><div class='del'>-			idev-&gt;cnf.forwarding = newf;</div><div class='add'>+			/* Disabling all.forwarding sets 0 to force_forwarding for all interfaces */</div><div class='add'>+			if (newf == 0)</div><div class='add'>+				WRITE_ONCE(idev-&gt;cnf.force_forwarding, 0);</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(idev-&gt;cnf.forwarding, newf);</div><div class='ctx'> 			if (changed)</div><div class='ctx'> 				dev_forward_change(idev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)</div><div class='add'>+static int addrconf_fixup_forwarding(const struct ctl_table *table, int *p, int newf)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='add'>+	struct net *net = (struct net *)table-&gt;extra2;</div><div class='ctx'> 	int old;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='del'>-	net = (struct net *)table-&gt;extra2;</div><div class='ctx'> 	old = *p;</div><div class='del'>-	*p = newf;</div><div class='add'>+	WRITE_ONCE(*p, newf);</div><div class='ctx'> </div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_dflt-&gt;forwarding) {</div><div class='ctx'> 		if ((!newf) ^ (!old))</div><div class='hunk'>@@ -805,14 +887,14 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)</div><div class='ctx'> 						     NETCONFA_FORWARDING,</div><div class='ctx'> 						     NETCONFA_IFINDEX_DEFAULT,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_dflt);</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_all-&gt;forwarding) {</div><div class='ctx'> 		int old_dflt = net-&gt;ipv6.devconf_dflt-&gt;forwarding;</div><div class='ctx'> </div><div class='del'>-		net-&gt;ipv6.devconf_dflt-&gt;forwarding = newf;</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv6.devconf_dflt-&gt;forwarding, newf);</div><div class='ctx'> 		if ((!newf) ^ (!old_dflt))</div><div class='ctx'> 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='ctx'> 						     NETCONFA_FORWARDING,</div><div class='hunk'>@@ -827,7 +909,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)</div><div class='ctx'> 						     net-&gt;ipv6.devconf_all);</div><div class='ctx'> 	} else if ((!newf) ^ (!old))</div><div class='ctx'> 		dev_forward_change((struct inet6_dev *)table-&gt;extra1);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='ctx'> 	if (newf)</div><div class='ctx'> 		rt6_purge_dflt_routers(net);</div><div class='hunk'>@@ -840,11 +922,11 @@ static void addrconf_linkdown_change(struct net *net, __s32 newf)</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	for_each_netdev(net, dev) {</div><div class='del'>-		idev = __in6_dev_get(dev);</div><div class='add'>+		idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> 		if (idev) {</div><div class='ctx'> 			int changed = (!idev-&gt;cnf.ignore_routes_with_linkdown) ^ (!newf);</div><div class='ctx'> </div><div class='del'>-			idev-&gt;cnf.ignore_routes_with_linkdown = newf;</div><div class='add'>+			WRITE_ONCE(idev-&gt;cnf.ignore_routes_with_linkdown, newf);</div><div class='ctx'> 			if (changed)</div><div class='ctx'> 				inet6_netconf_notify_devconf(dev_net(dev),</div><div class='ctx'> 							     RTM_NEWNETCONF,</div><div class='hunk'>@@ -855,17 +937,16 @@ static void addrconf_linkdown_change(struct net *net, __s32 newf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_fixup_linkdown(struct ctl_table *table, int *p, int newf)</div><div class='add'>+static int addrconf_fixup_linkdown(const struct ctl_table *table, int *p, int newf)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='add'>+	struct net *net = (struct net *)table-&gt;extra2;</div><div class='ctx'> 	int old;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='del'>-	net = (struct net *)table-&gt;extra2;</div><div class='ctx'> 	old = *p;</div><div class='del'>-	*p = newf;</div><div class='add'>+	WRITE_ONCE(*p, newf);</div><div class='ctx'> </div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_dflt-&gt;ignore_routes_with_linkdown) {</div><div class='ctx'> 		if ((!newf) ^ (!old))</div><div class='hunk'>@@ -874,12 +955,12 @@ static int addrconf_fixup_linkdown(struct ctl_table *table, int *p, int newf)</div><div class='ctx'> 						     NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,</div><div class='ctx'> 						     NETCONFA_IFINDEX_DEFAULT,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_dflt);</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_all-&gt;ignore_routes_with_linkdown) {</div><div class='del'>-		net-&gt;ipv6.devconf_dflt-&gt;ignore_routes_with_linkdown = newf;</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv6.devconf_dflt-&gt;ignore_routes_with_linkdown, newf);</div><div class='ctx'> 		addrconf_linkdown_change(net, newf);</div><div class='ctx'> 		if ((!newf) ^ (!old))</div><div class='ctx'> 			inet6_netconf_notify_devconf(net,</div><div class='hunk'>@@ -888,7 +969,8 @@ static int addrconf_fixup_linkdown(struct ctl_table *table, int *p, int newf)</div><div class='ctx'> 						     NETCONFA_IFINDEX_ALL,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_all);</div><div class='ctx'> 	}</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -940,7 +1022,7 @@ ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> static u32 inet6_addr_hash(const struct net *net, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	u32 val = ipv6_addr_hash(addr) ^ net_hash_mix(net);</div><div class='add'>+	u32 val = __ipv6_addr_jhash(addr, net_hash_mix(net));</div><div class='ctx'> </div><div class='ctx'> 	return hash_32(val, IN6_ADDR_HSIZE_SHIFT);</div><div class='ctx'> }</div><div class='hunk'>@@ -950,9 +1032,7 @@ static bool ipv6_chk_same_addr(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry(ifp, &amp;inet6_addr_lst[hash], addr_lst) {</div><div class='del'>-		if (!net_eq(dev_net(ifp-&gt;idev-&gt;dev), net))</div><div class='del'>-			continue;</div><div class='add'>+	hlist_for_each_entry(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[hash], addr_lst) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ifp-&gt;addr, addr)) {</div><div class='ctx'> 			if (!dev || ifp-&gt;idev-&gt;dev == dev)</div><div class='ctx'> 				return true;</div><div class='hunk'>@@ -963,20 +1043,21 @@ static bool ipv6_chk_same_addr(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> </div><div class='ctx'> static int ipv6_add_addr_hash(struct net_device *dev, struct inet6_ifaddr *ifa)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hash = inet6_addr_hash(dev_net(dev), &amp;ifa-&gt;addr);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	unsigned int hash = inet6_addr_hash(net, &amp;ifa-&gt;addr);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;addrconf_hash_lock);</div><div class='add'>+	spin_lock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore adding duplicate addresses on an interface */</div><div class='del'>-	if (ipv6_chk_same_addr(dev_net(dev), &amp;ifa-&gt;addr, dev, hash)) {</div><div class='add'>+	if (ipv6_chk_same_addr(net, &amp;ifa-&gt;addr, dev, hash)) {</div><div class='ctx'> 		netdev_dbg(dev, "ipv6_add_addr: already assigned\n");</div><div class='ctx'> 		err = -EEXIST;</div><div class='ctx'> 	} else {</div><div class='del'>-		hlist_add_head_rcu(&amp;ifa-&gt;addr_lst, &amp;inet6_addr_lst[hash]);</div><div class='add'>+		hlist_add_head_rcu(&amp;ifa-&gt;addr_lst, &amp;net-&gt;ipv6.inet6_addr_lst[hash]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;addrconf_hash_lock);</div><div class='add'>+	spin_unlock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -994,18 +1075,28 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,</div><div class='ctx'> 	struct fib6_info *f6i = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (addr_type == IPV6_ADDR_ANY ||</div><div class='del'>-	    addr_type &amp; IPV6_ADDR_MULTICAST ||</div><div class='del'>-	    (!(idev-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='del'>-	     addr_type &amp; IPV6_ADDR_LOOPBACK))</div><div class='add'>+	if (addr_type == IPV6_ADDR_ANY) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid address");</div><div class='add'>+		return ERR_PTR(-EADDRNOTAVAIL);</div><div class='add'>+	} else if (addr_type &amp; IPV6_ADDR_MULTICAST &amp;&amp;</div><div class='add'>+		   !(cfg-&gt;ifa_flags &amp; IFA_F_MCAUTOJOIN)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot assign multicast address without \"IFA_F_MCAUTOJOIN\" flag");</div><div class='ctx'> 		return ERR_PTR(-EADDRNOTAVAIL);</div><div class='add'>+	} else if (!(idev-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='add'>+		   !netif_is_l3_master(idev-&gt;dev) &amp;&amp;</div><div class='add'>+		   addr_type &amp; IPV6_ADDR_LOOPBACK) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot assign loopback address on this device");</div><div class='add'>+		return ERR_PTR(-EADDRNOTAVAIL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (idev-&gt;dead) {</div><div class='del'>-		err = -ENODEV;			/*XXX*/</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "device is going away");</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (idev-&gt;cnf.disable_ipv6) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "IPv6 is disabled on this device");</div><div class='ctx'> 		err = -EACCES;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1026,23 +1117,19 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ifa = kzalloc(sizeof(*ifa), gfp_flags);</div><div class='add'>+	ifa = kzalloc(sizeof(*ifa), gfp_flags | __GFP_ACCOUNT);</div><div class='ctx'> 	if (!ifa) {</div><div class='ctx'> 		err = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f6i = addrconf_f6i_alloc(net, idev, cfg-&gt;pfx, false, gfp_flags);</div><div class='add'>+	f6i = addrconf_f6i_alloc(net, idev, cfg-&gt;pfx, false, gfp_flags, extack);</div><div class='ctx'> 	if (IS_ERR(f6i)) {</div><div class='ctx'> 		err = PTR_ERR(f6i);</div><div class='ctx'> 		f6i = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.devconf_all-&gt;disable_policy ||</div><div class='del'>-	    idev-&gt;cnf.disable_policy)</div><div class='del'>-		f6i-&gt;dst_nopolicy = true;</div><div class='del'>-</div><div class='ctx'> 	neigh_parms_data_state_setall(idev-&gt;nd_parms);</div><div class='ctx'> </div><div class='ctx'> 	ifa-&gt;addr = *cfg-&gt;pfx;</div><div class='hunk'>@@ -1056,6 +1143,7 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,</div><div class='ctx'> 	ifa-&gt;prefix_len = cfg-&gt;plen;</div><div class='ctx'> 	ifa-&gt;rt_priority = cfg-&gt;rt_priority;</div><div class='ctx'> 	ifa-&gt;flags = cfg-&gt;ifa_flags;</div><div class='add'>+	ifa-&gt;ifa_proto = cfg-&gt;ifa_proto;</div><div class='ctx'> 	/* No need to add the TENTATIVE flag for addresses with NODAD */</div><div class='ctx'> 	if (!(cfg-&gt;ifa_flags &amp; IFA_F_NODAD))</div><div class='ctx'> 		ifa-&gt;flags |= IFA_F_TENTATIVE;</div><div class='hunk'>@@ -1072,15 +1160,15 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,</div><div class='ctx'> 	/* For caller */</div><div class='ctx'> 	refcount_set(&amp;ifa-&gt;refcnt, 1);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	err = ipv6_add_addr_hash(idev-&gt;dev, ifa);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;idev-&gt;lock);</div><div class='add'>+	write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Add to inet6_dev unicast addr list. */</div><div class='ctx'> 	ipv6_link_dev_addr(idev, ifa);</div><div class='hunk'>@@ -1091,9 +1179,9 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	in6_ifa_hold(ifa);</div><div class='del'>-	write_unlock(&amp;idev-&gt;lock);</div><div class='add'>+	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	inet6addr_notifier_call_chain(NETDEV_UP, ifa);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1148,7 +1236,8 @@ check_cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long *expires)</div><div class='ctx'> 	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='ctx'> 		if (ifa == ifp)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!ipv6_prefix_equal(&amp;ifa-&gt;addr, &amp;ifp-&gt;addr,</div><div class='add'>+		if (ifa-&gt;prefix_len != ifp-&gt;prefix_len ||</div><div class='add'>+		    !ipv6_prefix_equal(&amp;ifa-&gt;addr, &amp;ifp-&gt;addr,</div><div class='ctx'> 				       ifp-&gt;prefix_len))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ifa-&gt;flags &amp; (IFA_F_PERMANENT | IFA_F_NOPREFIXROUTE))</div><div class='hunk'>@@ -1173,20 +1262,28 @@ check_cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long *expires)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, bool del_rt)</div><div class='add'>+cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires,</div><div class='add'>+		     bool del_rt, bool del_peer)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_table *table;</div><div class='ctx'> 	struct fib6_info *f6i;</div><div class='ctx'> </div><div class='del'>-	f6i = addrconf_get_prefix_route(&amp;ifp-&gt;addr,</div><div class='del'>-				       ifp-&gt;prefix_len,</div><div class='del'>-				       ifp-&gt;idev-&gt;dev,</div><div class='del'>-				       0, RTF_GATEWAY | RTF_DEFAULT);</div><div class='add'>+	f6i = addrconf_get_prefix_route(del_peer ? &amp;ifp-&gt;peer_addr : &amp;ifp-&gt;addr,</div><div class='add'>+					ifp-&gt;prefix_len,</div><div class='add'>+					ifp-&gt;idev-&gt;dev, 0, RTF_DEFAULT, true);</div><div class='ctx'> 	if (f6i) {</div><div class='ctx'> 		if (del_rt)</div><div class='del'>-			ip6_del_rt(dev_net(ifp-&gt;idev-&gt;dev), f6i);</div><div class='add'>+			ip6_del_rt(dev_net(ifp-&gt;idev-&gt;dev), f6i, false);</div><div class='ctx'> 		else {</div><div class='del'>-			if (!(f6i-&gt;fib6_flags &amp; RTF_EXPIRES))</div><div class='add'>+			if (!(f6i-&gt;fib6_flags &amp; RTF_EXPIRES)) {</div><div class='add'>+				table = f6i-&gt;fib6_table;</div><div class='add'>+				spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='ctx'> 				fib6_set_expires(f6i, expires);</div><div class='add'>+				fib6_add_gc_list(f6i);</div><div class='add'>+</div><div class='add'>+				spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+			}</div><div class='ctx'> 			fib6_info_release(f6i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1197,9 +1294,10 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, bool del_r</div><div class='ctx'> </div><div class='ctx'> static void ipv6_del_addr(struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='del'>-	int state;</div><div class='ctx'> 	enum cleanup_prefix_rt_t action = CLEANUP_PREFIX_RT_NOP;</div><div class='add'>+	struct net *net = dev_net(ifp-&gt;idev-&gt;dev);</div><div class='ctx'> 	unsigned long expires;</div><div class='add'>+	int state;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='hunk'>@@ -1211,9 +1309,9 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)</div><div class='ctx'> 	if (state == INET6_IFADDR_STATE_DEAD)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;addrconf_hash_lock);</div><div class='add'>+	spin_lock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> 	hlist_del_init_rcu(&amp;ifp-&gt;addr_lst);</div><div class='del'>-	spin_unlock_bh(&amp;addrconf_hash_lock);</div><div class='add'>+	spin_unlock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;ifp-&gt;idev-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1226,7 +1324,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)</div><div class='ctx'> 		__in6_ifa_put(ifp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ifp-&gt;flags &amp; IFA_F_PERMANENT &amp;&amp; !(ifp-&gt;flags &amp; IFA_F_NOPREFIXROUTE))</div><div class='add'>+	if (!(ifp-&gt;flags &amp; IFA_F_NOPREFIXROUTE))</div><div class='ctx'> 		action = check_cleanup_prefix_route(ifp, &amp;expires);</div><div class='ctx'> </div><div class='ctx'> 	list_del_rcu(&amp;ifp-&gt;if_list);</div><div class='hunk'>@@ -1242,7 +1340,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> 	if (action != CLEANUP_PREFIX_RT_NOP) {</div><div class='ctx'> 		cleanup_prefix_route(ifp, expires,</div><div class='del'>-			action == CLEANUP_PREFIX_RT_DEL);</div><div class='add'>+			action == CLEANUP_PREFIX_RT_DEL, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clean up prefsrc entries */</div><div class='hunk'>@@ -1251,32 +1349,33 @@ out:</div><div class='ctx'> 	in6_ifa_put(ifp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp,</div><div class='del'>-				struct inet6_ifaddr *ift,</div><div class='del'>-				bool block)</div><div class='add'>+static unsigned long ipv6_get_regen_advance(const struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(idev-&gt;cnf.regen_min_advance) +</div><div class='add'>+		READ_ONCE(idev-&gt;cnf.regen_max_retry) *</div><div class='add'>+		READ_ONCE(idev-&gt;cnf.dad_transmits) *</div><div class='add'>+		max(NEIGH_VAR(idev-&gt;nd_parms, RETRANS_TIME), HZ/100) / HZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, bool block)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_dev *idev = ifp-&gt;idev;</div><div class='del'>-	struct in6_addr addr, *tmpaddr;</div><div class='ctx'> 	unsigned long tmp_tstamp, age;</div><div class='ctx'> 	unsigned long regen_advance;</div><div class='del'>-	struct ifa6_config cfg;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='del'>-	long max_desync_factor;</div><div class='add'>+	u32 if_public_preferred_lft;</div><div class='ctx'> 	s32 cnf_temp_preferred_lft;</div><div class='add'>+	struct inet6_ifaddr *ift;</div><div class='add'>+	struct ifa6_config cfg;</div><div class='add'>+	long max_desync_factor;</div><div class='add'>+	struct in6_addr addr;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	if (ift) {</div><div class='del'>-		spin_lock_bh(&amp;ift-&gt;lock);</div><div class='del'>-		memcpy(&amp;addr.s6_addr[8], &amp;ift-&gt;addr.s6_addr[8], 8);</div><div class='del'>-		spin_unlock_bh(&amp;ift-&gt;lock);</div><div class='del'>-		tmpaddr = &amp;addr;</div><div class='del'>-	} else {</div><div class='del'>-		tmpaddr = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='ctx'> 	in6_dev_hold(idev);</div><div class='del'>-	if (idev-&gt;cnf.use_tempaddr &lt;= 0) {</div><div class='add'>+	if (READ_ONCE(idev-&gt;cnf.use_tempaddr) &lt;= 0) {</div><div class='ctx'> 		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		pr_info("%s: use_tempaddr is disabled\n", __func__);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='hunk'>@@ -1284,8 +1383,8 @@ retry:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_bh(&amp;ifp-&gt;lock);</div><div class='del'>-	if (ifp-&gt;regen_count++ &gt;= idev-&gt;cnf.regen_max_retry) {</div><div class='del'>-		idev-&gt;cnf.use_tempaddr = -1;	/*XXX*/</div><div class='add'>+	if (ifp-&gt;regen_count++ &gt;= READ_ONCE(idev-&gt;cnf.regen_max_retry)) {</div><div class='add'>+		WRITE_ONCE(idev-&gt;cnf.use_tempaddr, -1);	/*XXX*/</div><div class='ctx'> 		spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='ctx'> 		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		pr_warn("%s: regeneration time exceeded - disabled temporary address support\n",</div><div class='hunk'>@@ -1296,20 +1395,18 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> 	in6_ifa_hold(ifp);</div><div class='ctx'> 	memcpy(addr.s6_addr, ifp-&gt;addr.s6_addr, 8);</div><div class='del'>-	ipv6_try_regen_rndid(idev, tmpaddr);</div><div class='del'>-	memcpy(&amp;addr.s6_addr[8], idev-&gt;rndid, 8);</div><div class='add'>+	ipv6_gen_rnd_iid(&amp;addr);</div><div class='add'>+</div><div class='ctx'> 	age = (now - ifp-&gt;tstamp) / HZ;</div><div class='ctx'> </div><div class='del'>-	regen_advance = idev-&gt;cnf.regen_max_retry *</div><div class='del'>-			idev-&gt;cnf.dad_transmits *</div><div class='del'>-			NEIGH_VAR(idev-&gt;nd_parms, RETRANS_TIME) / HZ;</div><div class='add'>+	regen_advance = ipv6_get_regen_advance(idev);</div><div class='ctx'> </div><div class='ctx'> 	/* recalculate max_desync_factor each time and update</div><div class='ctx'> 	 * idev-&gt;desync_factor if it's larger</div><div class='ctx'> 	 */</div><div class='ctx'> 	cnf_temp_preferred_lft = READ_ONCE(idev-&gt;cnf.temp_prefered_lft);</div><div class='del'>-	max_desync_factor = min_t(__u32,</div><div class='del'>-				  idev-&gt;cnf.max_desync_factor,</div><div class='add'>+	max_desync_factor = min_t(long,</div><div class='add'>+				  READ_ONCE(idev-&gt;cnf.max_desync_factor),</div><div class='ctx'> 				  cnf_temp_preferred_lft - regen_advance);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(idev-&gt;desync_factor &gt; max_desync_factor)) {</div><div class='hunk'>@@ -1322,11 +1419,14 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if_public_preferred_lft = ifp-&gt;prefered_lft;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;cfg, 0, sizeof(cfg));</div><div class='ctx'> 	cfg.valid_lft = min_t(__u32, ifp-&gt;valid_lft,</div><div class='del'>-			      idev-&gt;cnf.temp_valid_lft + age);</div><div class='add'>+			      READ_ONCE(idev-&gt;cnf.temp_valid_lft) + age);</div><div class='ctx'> 	cfg.preferred_lft = cnf_temp_preferred_lft + age - idev-&gt;desync_factor;</div><div class='del'>-	cfg.preferred_lft = min_t(__u32, ifp-&gt;prefered_lft, cfg.preferred_lft);</div><div class='add'>+	cfg.preferred_lft = min_t(__u32, if_public_preferred_lft, cfg.preferred_lft);</div><div class='add'>+	cfg.preferred_lft = min_t(__u32, cfg.valid_lft, cfg.preferred_lft);</div><div class='ctx'> </div><div class='ctx'> 	cfg.plen = ifp-&gt;prefix_len;</div><div class='ctx'> 	tmp_tstamp = ifp-&gt;tstamp;</div><div class='hunk'>@@ -1334,19 +1434,41 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* A temporary address is created only if this calculated Preferred</div><div class='del'>-	 * Lifetime is greater than REGEN_ADVANCE time units.  In particular,</div><div class='del'>-	 * an implementation must not create a temporary address with a zero</div><div class='del'>-	 * Preferred Lifetime.</div><div class='add'>+	/* From RFC 4941:</div><div class='add'>+	 *</div><div class='add'>+	 *     A temporary address is created only if this calculated Preferred</div><div class='add'>+	 *     Lifetime is greater than REGEN_ADVANCE time units.  In</div><div class='add'>+	 *     particular, an implementation must not create a temporary address</div><div class='add'>+	 *     with a zero Preferred Lifetime.</div><div class='add'>+	 *</div><div class='add'>+	 *     ...</div><div class='add'>+	 *</div><div class='add'>+	 *     When creating a temporary address, the lifetime values MUST be</div><div class='add'>+	 *     derived from the corresponding prefix as follows:</div><div class='add'>+	 *</div><div class='add'>+	 *     ...</div><div class='add'>+	 *</div><div class='add'>+	 *     *  Its Preferred Lifetime is the lower of the Preferred Lifetime</div><div class='add'>+	 *        of the public address or TEMP_PREFERRED_LIFETIME -</div><div class='add'>+	 *        DESYNC_FACTOR.</div><div class='add'>+	 *</div><div class='add'>+	 * To comply with the RFC's requirements, clamp the preferred lifetime</div><div class='add'>+	 * to a minimum of regen_advance, unless that would exceed valid_lft or</div><div class='add'>+	 * ifp-&gt;prefered_lft.</div><div class='add'>+	 *</div><div class='ctx'> 	 * Use age calculation as in addrconf_verify to avoid unnecessary</div><div class='ctx'> 	 * temporary addresses being generated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	age = (now - tmp_tstamp + ADDRCONF_TIMER_FUZZ_MINUS) / HZ;</div><div class='ctx'> 	if (cfg.preferred_lft &lt;= regen_advance + age) {</div><div class='del'>-		in6_ifa_put(ifp);</div><div class='del'>-		in6_dev_put(idev);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='add'>+		cfg.preferred_lft = regen_advance + age + 1;</div><div class='add'>+		if (cfg.preferred_lft &gt; cfg.valid_lft ||</div><div class='add'>+		    cfg.preferred_lft &gt; if_public_preferred_lft) {</div><div class='add'>+			in6_ifa_put(ifp);</div><div class='add'>+			in6_dev_put(idev);</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfg.ifa_flags = IFA_F_TEMPORARY;</div><div class='hunk'>@@ -1362,7 +1484,6 @@ retry:</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 		pr_info("%s: retry temporary address regeneration\n", __func__);</div><div class='del'>-		tmpaddr = &amp;addr;</div><div class='ctx'> 		write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1426,15 +1547,17 @@ static inline int ipv6_saddr_preferred(int type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ipv6_use_optimistic_addr(struct net *net,</div><div class='del'>-				     struct inet6_dev *idev)</div><div class='add'>+static bool ipv6_use_optimistic_addr(const struct net *net,</div><div class='add'>+				     const struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_IPV6_OPTIMISTIC_DAD</div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!net-&gt;ipv6.devconf_all-&gt;optimistic_dad &amp;&amp; !idev-&gt;cnf.optimistic_dad)</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.devconf_all-&gt;optimistic_dad) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(idev-&gt;cnf.optimistic_dad))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!net-&gt;ipv6.devconf_all-&gt;use_optimistic &amp;&amp; !idev-&gt;cnf.use_optimistic)</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.devconf_all-&gt;use_optimistic) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(idev-&gt;cnf.use_optimistic))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1443,13 +1566,14 @@ static bool ipv6_use_optimistic_addr(struct net *net,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ipv6_allow_optimistic_dad(struct net *net,</div><div class='del'>-				      struct inet6_dev *idev)</div><div class='add'>+static bool ipv6_allow_optimistic_dad(const struct net *net,</div><div class='add'>+				      const struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_IPV6_OPTIMISTIC_DAD</div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!net-&gt;ipv6.devconf_all-&gt;optimistic_dad &amp;&amp; !idev-&gt;cnf.optimistic_dad)</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.devconf_all-&gt;optimistic_dad) &amp;&amp;</div><div class='add'>+	    !READ_ONCE(idev-&gt;cnf.optimistic_dad))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1555,7 +1679,7 @@ static int ipv6_get_saddr_eval(struct net *net,</div><div class='ctx'> 		 */</div><div class='ctx'> 		int preftmp = dst-&gt;prefs &amp; (IPV6_PREFER_SRC_PUBLIC|IPV6_PREFER_SRC_TMP) ?</div><div class='ctx'> 				!!(dst-&gt;prefs &amp; IPV6_PREFER_SRC_TMP) :</div><div class='del'>-				score-&gt;ifa-&gt;idev-&gt;cnf.use_tempaddr &gt;= 2;</div><div class='add'>+				READ_ONCE(score-&gt;ifa-&gt;idev-&gt;cnf.use_tempaddr) &gt;= 2;</div><div class='ctx'> 		ret = (!(score-&gt;ifa-&gt;flags &amp; IFA_F_TEMPORARY)) ^ preftmp;</div><div class='ctx'> 		break;</div><div class='ctx'> 	    }</div><div class='hunk'>@@ -1731,7 +1855,7 @@ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,</div><div class='ctx'> 		idev = __in6_dev_get(dst_dev);</div><div class='ctx'> 		if ((dst_type &amp; IPV6_ADDR_MULTICAST) ||</div><div class='ctx'> 		    dst.scope &lt;= IPV6_ADDR_SCOPE_LINKLOCAL ||</div><div class='del'>-		    (idev &amp;&amp; idev-&gt;cnf.use_oif_addrs_only)) {</div><div class='add'>+		    (idev &amp;&amp; READ_ONCE(idev-&gt;cnf.use_oif_addrs_only))) {</div><div class='ctx'> 			use_oif_addr = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1755,7 +1879,8 @@ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,</div><div class='ctx'> 							    master, &amp;dst,</div><div class='ctx'> 							    scores, hiscore_idx);</div><div class='ctx'> </div><div class='del'>-			if (scores[hiscore_idx].ifa)</div><div class='add'>+			if (scores[hiscore_idx].ifa &amp;&amp;</div><div class='add'>+			    scores[hiscore_idx].scopedist &gt;= 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1784,8 +1909,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_dev_get_saddr);</div><div class='ctx'> </div><div class='del'>-int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,</div><div class='del'>-		      u32 banned_flags)</div><div class='add'>+static int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,</div><div class='add'>+			      u32 banned_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	int err = -EADDRNOTAVAIL;</div><div class='hunk'>@@ -1849,12 +1974,13 @@ EXPORT_SYMBOL(ipv6_chk_addr);</div><div class='ctx'>  *   2. does the address exist on the specific device</div><div class='ctx'>  *      (skip_dev_check = false)</div><div class='ctx'>  */</div><div class='del'>-int ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,</div><div class='del'>-			    const struct net_device *dev, bool skip_dev_check,</div><div class='del'>-			    int strict, u32 banned_flags)</div><div class='add'>+static struct net_device *</div><div class='add'>+__ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,</div><div class='add'>+			  const struct net_device *dev, bool skip_dev_check,</div><div class='add'>+			  int strict, u32 banned_flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int hash = inet6_addr_hash(net, addr);</div><div class='del'>-	const struct net_device *l3mdev;</div><div class='add'>+	struct net_device *l3mdev, *ndev;</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	u32 ifp_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1864,11 +1990,10 @@ int ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> 	if (skip_dev_check)</div><div class='ctx'> 		dev = NULL;</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry_rcu(ifp, &amp;inet6_addr_lst[hash], addr_lst) {</div><div class='del'>-		if (!net_eq(dev_net(ifp-&gt;idev-&gt;dev), net))</div><div class='del'>-			continue;</div><div class='add'>+	hlist_for_each_entry_rcu(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[hash], addr_lst) {</div><div class='add'>+		ndev = ifp-&gt;idev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		if (l3mdev_master_dev_rcu(ifp-&gt;idev-&gt;dev) != l3mdev)</div><div class='add'>+		if (l3mdev_master_dev_rcu(ndev) != l3mdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Decouple optimistic from tentative for evaluation here.</div><div class='hunk'>@@ -1879,15 +2004,23 @@ int ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> 			    : ifp-&gt;flags;</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ifp-&gt;addr, addr) &amp;&amp;</div><div class='ctx'> 		    !(ifp_flags&amp;banned_flags) &amp;&amp;</div><div class='del'>-		    (!dev || ifp-&gt;idev-&gt;dev == dev ||</div><div class='add'>+		    (!dev || ndev == dev ||</div><div class='ctx'> 		     !(ifp-&gt;scope&amp;(IFA_LINK|IFA_HOST) || strict))) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-			return 1;</div><div class='add'>+			return ndev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,</div><div class='add'>+			    const struct net_device *dev, bool skip_dev_check,</div><div class='add'>+			    int strict, u32 banned_flags)</div><div class='add'>+{</div><div class='add'>+	return __ipv6_chk_addr_and_flags(net, addr, dev, skip_dev_check,</div><div class='add'>+					 strict, banned_flags) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_chk_addr_and_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1939,6 +2072,22 @@ int ipv6_chk_prefix(const struct in6_addr *addr, struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_chk_prefix);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ipv6_dev_find - find the first device with a given source address.</div><div class='add'>+ * @net: the net namespace</div><div class='add'>+ * @addr: the source address</div><div class='add'>+ * @dev: used to find the L3 domain of interest</div><div class='add'>+ *</div><div class='add'>+ * The caller should be protected by RCU, or RTNL.</div><div class='add'>+ */</div><div class='add'>+struct net_device *ipv6_dev_find(struct net *net, const struct in6_addr *addr,</div><div class='add'>+				 struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return __ipv6_chk_addr_and_flags(net, addr, dev, !dev, 1,</div><div class='add'>+					 IFA_F_TENTATIVE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ipv6_dev_find);</div><div class='add'>+</div><div class='ctx'> struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> 				     struct net_device *dev, int strict)</div><div class='ctx'> {</div><div class='hunk'>@@ -1946,15 +2095,14 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add</div><div class='ctx'> 	struct inet6_ifaddr *ifp, *result = NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(ifp, &amp;inet6_addr_lst[hash], addr_lst) {</div><div class='del'>-		if (!net_eq(dev_net(ifp-&gt;idev-&gt;dev), net))</div><div class='del'>-			continue;</div><div class='add'>+	hlist_for_each_entry_rcu(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[hash], addr_lst) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ifp-&gt;addr, addr)) {</div><div class='ctx'> 			if (!dev || ifp-&gt;idev-&gt;dev == dev ||</div><div class='ctx'> 			    !(ifp-&gt;scope&amp;(IFA_LINK|IFA_HOST) || strict)) {</div><div class='del'>-				result = ifp;</div><div class='del'>-				in6_ifa_hold(ifp);</div><div class='del'>-				break;</div><div class='add'>+				if (in6_ifa_hold_safe(ifp)) {</div><div class='add'>+					result = ifp;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1977,7 +2125,7 @@ static void addrconf_dad_stop(struct inet6_ifaddr *ifp, int dad_failed)</div><div class='ctx'> 		if (ifpub) {</div><div class='ctx'> 			in6_ifa_hold(ifpub);</div><div class='ctx'> 			spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='del'>-			ipv6_create_tempaddr(ifpub, ifp, true);</div><div class='add'>+			ipv6_create_tempaddr(ifpub, true);</div><div class='ctx'> 			in6_ifa_put(ifpub);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='hunk'>@@ -2015,7 +2163,8 @@ static int addrconf_dad_end(struct inet6_ifaddr *ifp)</div><div class='ctx'> void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_dev *idev = ifp-&gt;idev;</div><div class='del'>-	struct net *net = dev_net(ifp-&gt;idev-&gt;dev);</div><div class='add'>+	struct net *net = dev_net(idev-&gt;dev);</div><div class='add'>+	int max_addresses;</div><div class='ctx'> </div><div class='ctx'> 	if (addrconf_dad_end(ifp)) {</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='hunk'>@@ -2053,9 +2202,9 @@ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		if (idev-&gt;cnf.max_addresses &amp;&amp;</div><div class='del'>-		    ipv6_count_addresses(idev) &gt;=</div><div class='del'>-		    idev-&gt;cnf.max_addresses)</div><div class='add'>+		max_addresses = READ_ONCE(idev-&gt;cnf.max_addresses);</div><div class='add'>+		if (max_addresses &amp;&amp;</div><div class='add'>+		    ipv6_count_addresses(idev) &gt;= max_addresses)</div><div class='ctx'> 			goto lock_errdad;</div><div class='ctx'> </div><div class='ctx'> 		net_info_ratelimited("%s: generating new stable privacy address because of DAD conflict\n",</div><div class='hunk'>@@ -2085,32 +2234,29 @@ errdad:</div><div class='ctx'> 	in6_ifa_put(ifp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Join to solicited addr multicast group.</div><div class='del'>- * caller must hold RTNL */</div><div class='add'>+/* Join to solicited addr multicast group. */</div><div class='ctx'> void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr maddr;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags&amp;(IFF_LOOPBACK|IFF_NOARP))</div><div class='add'>+	if (READ_ONCE(dev-&gt;flags) &amp; (IFF_LOOPBACK | IFF_NOARP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	addrconf_addr_solict_mult(addr, &amp;maddr);</div><div class='ctx'> 	ipv6_dev_mc_inc(dev, &amp;maddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* caller must hold RTNL */</div><div class='ctx'> void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr maddr;</div><div class='ctx'> </div><div class='del'>-	if (idev-&gt;dev-&gt;flags&amp;(IFF_LOOPBACK|IFF_NOARP))</div><div class='add'>+	if (READ_ONCE(idev-&gt;dev-&gt;flags) &amp; (IFF_LOOPBACK | IFF_NOARP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	addrconf_addr_solict_mult(addr, &amp;maddr);</div><div class='ctx'> 	__ipv6_dev_mc_dec(idev, &amp;maddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* caller must hold RTNL */</div><div class='ctx'> static void addrconf_join_anycast(struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr addr;</div><div class='hunk'>@@ -2123,7 +2269,6 @@ static void addrconf_join_anycast(struct inet6_ifaddr *ifp)</div><div class='ctx'> 	__ipv6_dev_ac_inc(ifp-&gt;idev, &amp;addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* caller must hold RTNL */</div><div class='ctx'> static void addrconf_leave_anycast(struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr addr;</div><div class='hunk'>@@ -2158,12 +2303,12 @@ static int addrconf_ifid_6lowpan(u8 *eui, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int addrconf_ifid_ieee1394(u8 *eui, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	union fwnet_hwaddr *ha;</div><div class='add'>+	const union fwnet_hwaddr *ha;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;addr_len != FWNET_ALEN)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	ha = (union fwnet_hwaddr *)dev-&gt;dev_addr;</div><div class='add'>+	ha = (const union fwnet_hwaddr *)dev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(eui, &amp;ha-&gt;uc.uniq_id, sizeof(ha-&gt;uc.uniq_id));</div><div class='ctx'> 	eui[0] ^= 2;</div><div class='hunk'>@@ -2274,40 +2419,38 @@ static int ipv6_inherit_eui64(u8 *eui, struct inet6_dev *idev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* (re)generation of randomized interface identifier (RFC 3041 3.2, 3.5) */</div><div class='del'>-static void ipv6_regen_rndid(struct inet6_dev *idev)</div><div class='add'>+/* Generation of a randomized Interface Identifier</div><div class='add'>+ * draft-ietf-6man-rfc4941bis, Section 3.3.1</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void ipv6_gen_rnd_iid(struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> regen:</div><div class='del'>-	get_random_bytes(idev-&gt;rndid, sizeof(idev-&gt;rndid));</div><div class='del'>-	idev-&gt;rndid[0] &amp;= ~0x02;</div><div class='add'>+	get_random_bytes(&amp;addr-&gt;s6_addr[8], 8);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * &lt;draft-ietf-ipngwg-temp-addresses-v2-00.txt&gt;:</div><div class='del'>-	 * check if generated address is not inappropriate</div><div class='add'>+	/* &lt;draft-ietf-6man-rfc4941bis-08.txt&gt;, Section 3.3.1:</div><div class='add'>+	 * check if generated address is not inappropriate:</div><div class='ctx'> 	 *</div><div class='del'>-	 *  - Reserved subnet anycast (RFC 2526)</div><div class='del'>-	 *	11111101 11....11 1xxxxxxx</div><div class='del'>-	 *  - ISATAP (RFC4214) 6.1</div><div class='del'>-	 *	00-00-5E-FE-xx-xx-xx-xx</div><div class='del'>-	 *  - value 0</div><div class='del'>-	 *  - XXX: already assigned to an address on the device</div><div class='add'>+	 * - Reserved IPv6 Interface Identifiers</div><div class='add'>+	 * - XXX: already assigned to an address on the device</div><div class='ctx'> 	 */</div><div class='del'>-	if (idev-&gt;rndid[0] == 0xfd &amp;&amp;</div><div class='del'>-	    (idev-&gt;rndid[1]&amp;idev-&gt;rndid[2]&amp;idev-&gt;rndid[3]&amp;idev-&gt;rndid[4]&amp;idev-&gt;rndid[5]&amp;idev-&gt;rndid[6]) == 0xff &amp;&amp;</div><div class='del'>-	    (idev-&gt;rndid[7]&amp;0x80))</div><div class='add'>+</div><div class='add'>+	/* Subnet-router anycast: 0000:0000:0000:0000 */</div><div class='add'>+	if (!(addr-&gt;s6_addr32[2] | addr-&gt;s6_addr32[3]))</div><div class='ctx'> 		goto regen;</div><div class='del'>-	if ((idev-&gt;rndid[0]|idev-&gt;rndid[1]) == 0) {</div><div class='del'>-		if (idev-&gt;rndid[2] == 0x5e &amp;&amp; idev-&gt;rndid[3] == 0xfe)</div><div class='del'>-			goto regen;</div><div class='del'>-		if ((idev-&gt;rndid[2]|idev-&gt;rndid[3]|idev-&gt;rndid[4]|idev-&gt;rndid[5]|idev-&gt;rndid[6]|idev-&gt;rndid[7]) == 0x00)</div><div class='del'>-			goto regen;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void  ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr)</div><div class='del'>-{</div><div class='del'>-	if (tmpaddr &amp;&amp; memcmp(idev-&gt;rndid, &amp;tmpaddr-&gt;s6_addr[8], 8) == 0)</div><div class='del'>-		ipv6_regen_rndid(idev);</div><div class='add'>+	/* IANA Ethernet block: 0200:5EFF:FE00:0000-0200:5EFF:FE00:5212</div><div class='add'>+	 * Proxy Mobile IPv6:   0200:5EFF:FE00:5213</div><div class='add'>+	 * IANA Ethernet block: 0200:5EFF:FE00:5214-0200:5EFF:FEFF:FFFF</div><div class='add'>+	 */</div><div class='add'>+	if (ntohl(addr-&gt;s6_addr32[2]) == 0x02005eff &amp;&amp;</div><div class='add'>+	    (ntohl(addr-&gt;s6_addr32[3]) &amp; 0Xff000000) == 0xfe000000)</div><div class='add'>+		goto regen;</div><div class='add'>+</div><div class='add'>+	/* Reserved subnet anycast addresses */</div><div class='add'>+	if (ntohl(addr-&gt;s6_addr32[2]) == 0xfdffffff &amp;&amp;</div><div class='add'>+	    ntohl(addr-&gt;s6_addr32[3]) &gt;= 0Xffffff80)</div><div class='add'>+		goto regen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2349,7 +2492,8 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, u32 metric,</div><div class='ctx'> static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,</div><div class='ctx'> 						  int plen,</div><div class='ctx'> 						  const struct net_device *dev,</div><div class='del'>-						  u32 flags, u32 noflags)</div><div class='add'>+						  u32 flags, u32 noflags,</div><div class='add'>+						  bool no_gw)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_node *fn;</div><div class='ctx'> 	struct fib6_info *rt = NULL;</div><div class='hunk'>@@ -2366,7 +2510,13 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	for_each_fib6_node_rt_rcu(fn) {</div><div class='del'>-		if (rt-&gt;fib6_nh.nh_dev-&gt;ifindex != dev-&gt;ifindex)</div><div class='add'>+		/* prefix routes only use builtin fib6_nh */</div><div class='add'>+		if (rt-&gt;nh)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rt-&gt;fib6_nh-&gt;fib_nh_dev-&gt;ifindex != dev-&gt;ifindex)</div><div class='add'>+			continue;</div><div class='add'>+		if (no_gw &amp;&amp; rt-&gt;fib6_nh-&gt;fib_nh_gw_family)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if ((rt-&gt;fib6_flags &amp; flags) != flags)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2392,8 +2542,9 @@ static void addrconf_add_mroute(struct net_device *dev)</div><div class='ctx'> 		.fc_ifindex = dev-&gt;ifindex,</div><div class='ctx'> 		.fc_dst_len = 8,</div><div class='ctx'> 		.fc_flags = RTF_UP,</div><div class='del'>-		.fc_type = RTN_UNICAST,</div><div class='add'>+		.fc_type = RTN_MULTICAST,</div><div class='ctx'> 		.fc_nlinfo.nl_net = dev_net(dev),</div><div class='add'>+		.fc_protocol = RTPROT_KERNEL,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ipv6_addr_set(&amp;cfg.fc_dst, htonl(0xFF000000), 0, 0, 0);</div><div class='hunk'>@@ -2408,8 +2559,8 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	idev = ipv6_find_idev(dev);</div><div class='del'>-	if (!idev)</div><div class='del'>-		return ERR_PTR(-ENOBUFS);</div><div class='add'>+	if (IS_ERR(idev))</div><div class='add'>+		return idev;</div><div class='ctx'> </div><div class='ctx'> 	if (idev-&gt;cnf.disable_ipv6)</div><div class='ctx'> 		return ERR_PTR(-EACCES);</div><div class='hunk'>@@ -2421,6 +2572,24 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)</div><div class='ctx'> 	return idev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void delete_tempaddrs(struct inet6_dev *idev,</div><div class='add'>+			     struct inet6_ifaddr *ifp)</div><div class='add'>+{</div><div class='add'>+	struct inet6_ifaddr *ift, *tmp;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	list_for_each_entry_safe(ift, tmp, &amp;idev-&gt;tempaddr_list, tmp_list) {</div><div class='add'>+		if (ift-&gt;ifpub != ifp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		in6_ifa_hold(ift);</div><div class='add'>+		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		ipv6_del_addr(ift);</div><div class='add'>+		write_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void manage_tempaddrs(struct inet6_dev *idev,</div><div class='ctx'> 			     struct inet6_ifaddr *ifp,</div><div class='ctx'> 			     __u32 valid_lft, __u32 prefered_lft,</div><div class='hunk'>@@ -2446,11 +2615,11 @@ static void manage_tempaddrs(struct inet6_dev *idev,</div><div class='ctx'> 		 * (TEMP_PREFERRED_LIFETIME - DESYNC_FACTOR), respectively.</div><div class='ctx'> 		 */</div><div class='ctx'> 		age = (now - ift-&gt;cstamp) / HZ;</div><div class='del'>-		max_valid = idev-&gt;cnf.temp_valid_lft - age;</div><div class='add'>+		max_valid = READ_ONCE(idev-&gt;cnf.temp_valid_lft) - age;</div><div class='ctx'> 		if (max_valid &lt; 0)</div><div class='ctx'> 			max_valid = 0;</div><div class='ctx'> </div><div class='del'>-		max_prefered = idev-&gt;cnf.temp_prefered_lft -</div><div class='add'>+		max_prefered = READ_ONCE(idev-&gt;cnf.temp_prefered_lft) -</div><div class='ctx'> 			       idev-&gt;desync_factor - age;</div><div class='ctx'> 		if (max_prefered &lt; 0)</div><div class='ctx'> 			max_prefered = 0;</div><div class='hunk'>@@ -2474,15 +2643,21 @@ static void manage_tempaddrs(struct inet6_dev *idev,</div><div class='ctx'> 			ipv6_ifa_notify(0, ift);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((create || list_empty(&amp;idev-&gt;tempaddr_list)) &amp;&amp;</div><div class='del'>-	    idev-&gt;cnf.use_tempaddr &gt; 0) {</div><div class='add'>+	/* Also create a temporary address if it's enabled but no temporary</div><div class='add'>+	 * address currently exists.</div><div class='add'>+	 * However, we get called with valid_lft == 0, prefered_lft == 0, create == false</div><div class='add'>+	 * as part of cleanup (ie. deleting the mngtmpaddr).</div><div class='add'>+	 * We don't want that to result in creating a new temporary ip address.</div><div class='add'>+	 */</div><div class='add'>+	if (list_empty(&amp;idev-&gt;tempaddr_list) &amp;&amp; (valid_lft || prefered_lft))</div><div class='add'>+		create = true;</div><div class='add'>+</div><div class='add'>+	if (create &amp;&amp; READ_ONCE(idev-&gt;cnf.use_tempaddr) &gt; 0) {</div><div class='ctx'> 		/* When a new public address is created as described</div><div class='ctx'> 		 * in [ADDRCONF], also create a new temporary address.</div><div class='del'>-		 * Also create a temporary address if it's enabled but</div><div class='del'>-		 * no temporary address currently exists.</div><div class='ctx'> 		 */</div><div class='ctx'> 		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		ipv6_create_tempaddr(ifp, NULL, false);</div><div class='add'>+		ipv6_create_tempaddr(ifp, false);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2505,7 +2680,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,</div><div class='ctx'> 	int create = 0, update_lft = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ifp &amp;&amp; valid_lft) {</div><div class='del'>-		int max_addresses = in6_dev-&gt;cnf.max_addresses;</div><div class='add'>+		int max_addresses = READ_ONCE(in6_dev-&gt;cnf.max_addresses);</div><div class='ctx'> 		struct ifa6_config cfg = {</div><div class='ctx'> 			.pfx = addr,</div><div class='ctx'> 			.plen = pinfo-&gt;prefix_len,</div><div class='hunk'>@@ -2513,11 +2688,12 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,</div><div class='ctx'> 			.valid_lft = valid_lft,</div><div class='ctx'> 			.preferred_lft = prefered_lft,</div><div class='ctx'> 			.scope = addr_type &amp; IPV6_ADDR_SCOPE_MASK,</div><div class='add'>+			.ifa_proto = IFAPROT_KERNEL_RA</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_OPTIMISTIC_DAD</div><div class='del'>-		if ((net-&gt;ipv6.devconf_all-&gt;optimistic_dad ||</div><div class='del'>-		     in6_dev-&gt;cnf.optimistic_dad) &amp;&amp;</div><div class='add'>+		if ((READ_ONCE(net-&gt;ipv6.devconf_all-&gt;optimistic_dad) ||</div><div class='add'>+		     READ_ONCE(in6_dev-&gt;cnf.optimistic_dad)) &amp;&amp;</div><div class='ctx'> 		    !net-&gt;ipv6.devconf_all-&gt;forwarding &amp;&amp; sllao)</div><div class='ctx'> 			cfg.ifa_flags |= IFA_F_OPTIMISTIC;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2553,28 +2729,29 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,</div><div class='ctx'> 			stored_lft = ifp-&gt;valid_lft - (now - ifp-&gt;tstamp) / HZ;</div><div class='ctx'> 		else</div><div class='ctx'> 			stored_lft = 0;</div><div class='del'>-		if (!create &amp;&amp; stored_lft) {</div><div class='add'>+</div><div class='add'>+		/* RFC4862 Section 5.5.3e:</div><div class='add'>+		 * "Note that the preferred lifetime of the</div><div class='add'>+		 *  corresponding address is always reset to</div><div class='add'>+		 *  the Preferred Lifetime in the received</div><div class='add'>+		 *  Prefix Information option, regardless of</div><div class='add'>+		 *  whether the valid lifetime is also reset or</div><div class='add'>+		 *  ignored."</div><div class='add'>+		 *</div><div class='add'>+		 * So we should always update prefered_lft here.</div><div class='add'>+		 */</div><div class='add'>+		update_lft = !create &amp;&amp; stored_lft;</div><div class='add'>+</div><div class='add'>+		if (update_lft &amp;&amp; !READ_ONCE(in6_dev-&gt;cnf.ra_honor_pio_life)) {</div><div class='ctx'> 			const u32 minimum_lft = min_t(u32,</div><div class='ctx'> 				stored_lft, MIN_VALID_LIFETIME);</div><div class='ctx'> 			valid_lft = max(valid_lft, minimum_lft);</div><div class='del'>-</div><div class='del'>-			/* RFC4862 Section 5.5.3e:</div><div class='del'>-			 * "Note that the preferred lifetime of the</div><div class='del'>-			 *  corresponding address is always reset to</div><div class='del'>-			 *  the Preferred Lifetime in the received</div><div class='del'>-			 *  Prefix Information option, regardless of</div><div class='del'>-			 *  whether the valid lifetime is also reset or</div><div class='del'>-			 *  ignored."</div><div class='del'>-			 *</div><div class='del'>-			 * So we should always update prefered_lft here.</div><div class='del'>-			 */</div><div class='del'>-			update_lft = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (update_lft) {</div><div class='ctx'> 			ifp-&gt;valid_lft = valid_lft;</div><div class='ctx'> 			ifp-&gt;prefered_lft = prefered_lft;</div><div class='del'>-			ifp-&gt;tstamp = now;</div><div class='add'>+			WRITE_ONCE(ifp-&gt;tstamp, now);</div><div class='ctx'> 			flags = ifp-&gt;flags;</div><div class='ctx'> 			ifp-&gt;flags &amp;= ~IFA_F_DEPRECATED;</div><div class='ctx'> 			spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='hunk'>@@ -2588,7 +2765,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,</div><div class='ctx'> 				 create, now);</div><div class='ctx'> </div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='del'>-		addrconf_verify();</div><div class='add'>+		addrconf_verify(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2598,12 +2775,14 @@ EXPORT_SYMBOL_GPL(addrconf_prefix_rcv_add_addr);</div><div class='ctx'> void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)</div><div class='ctx'> {</div><div class='ctx'> 	struct prefix_info *pinfo;</div><div class='add'>+	struct fib6_table *table;</div><div class='ctx'> 	__u32 valid_lft;</div><div class='ctx'> 	__u32 prefered_lft;</div><div class='ctx'> 	int addr_type, err;</div><div class='ctx'> 	u32 addr_flags = 0;</div><div class='ctx'> 	struct inet6_dev *in6_dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='add'>+	bool ignore_autoconf = false;</div><div class='ctx'> </div><div class='ctx'> 	pinfo = (struct prefix_info *) opt;</div><div class='ctx'> </div><div class='hunk'>@@ -2637,6 +2816,9 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (valid_lft != 0 &amp;&amp; valid_lft &lt; in6_dev-&gt;cnf.accept_ra_min_lft)</div><div class='add'>+		goto put;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Two things going on here:</div><div class='ctx'> 	 *	1) Add routes for on-link prefixes</div><div class='hunk'>@@ -2664,18 +2846,27 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)</div><div class='ctx'> 					       pinfo-&gt;prefix_len,</div><div class='ctx'> 					       dev,</div><div class='ctx'> 					       RTF_ADDRCONF | RTF_PREFIX_RT,</div><div class='del'>-					       RTF_GATEWAY | RTF_DEFAULT);</div><div class='add'>+					       RTF_DEFAULT, true);</div><div class='ctx'> </div><div class='ctx'> 		if (rt) {</div><div class='ctx'> 			/* Autoconf prefix route */</div><div class='ctx'> 			if (valid_lft == 0) {</div><div class='del'>-				ip6_del_rt(net, rt);</div><div class='add'>+				ip6_del_rt(net, rt, false);</div><div class='ctx'> 				rt = NULL;</div><div class='del'>-			} else if (addrconf_finite_timeout(rt_expires)) {</div><div class='del'>-				/* not infinity */</div><div class='del'>-				fib6_set_expires(rt, jiffies + rt_expires);</div><div class='ctx'> 			} else {</div><div class='del'>-				fib6_clean_expires(rt);</div><div class='add'>+				table = rt-&gt;fib6_table;</div><div class='add'>+				spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='add'>+				if (addrconf_finite_timeout(rt_expires)) {</div><div class='add'>+					/* not infinity */</div><div class='add'>+					fib6_set_expires(rt, jiffies + rt_expires);</div><div class='add'>+					fib6_add_gc_list(rt);</div><div class='add'>+				} else {</div><div class='add'>+					fib6_clean_expires(rt);</div><div class='add'>+					fib6_remove_gc_list(rt);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (valid_lft) {</div><div class='ctx'> 			clock_t expires = 0;</div><div class='hunk'>@@ -2694,7 +2885,8 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)</div><div class='ctx'> </div><div class='ctx'> 	/* Try to figure out our local address for this prefix */</div><div class='ctx'> </div><div class='del'>-	if (pinfo-&gt;autoconf &amp;&amp; in6_dev-&gt;cnf.autoconf) {</div><div class='add'>+	ignore_autoconf = READ_ONCE(in6_dev-&gt;cnf.ra_honor_pio_pflag) &amp;&amp; pinfo-&gt;preferpd;</div><div class='add'>+	if (pinfo-&gt;autoconf &amp;&amp; in6_dev-&gt;cnf.autoconf &amp;&amp; !ignore_autoconf) {</div><div class='ctx'> 		struct in6_addr addr;</div><div class='ctx'> 		bool tokenized = false, dev_addr_generated = false;</div><div class='ctx'> </div><div class='hunk'>@@ -2747,6 +2939,33 @@ put:</div><div class='ctx'> 	in6_dev_put(in6_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int addrconf_set_sit_dstaddr(struct net *net, struct net_device *dev,</div><div class='add'>+		struct in6_ifreq *ireq)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_parm_kern p = { };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(ipv6_addr_type(&amp;ireq-&gt;ifr6_addr) &amp; IPV6_ADDR_COMPATv4))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	p.iph.daddr = ireq-&gt;ifr6_addr.s6_addr32[3];</div><div class='add'>+	p.iph.version = 4;</div><div class='add'>+	p.iph.ihl = 5;</div><div class='add'>+	p.iph.protocol = IPPROTO_IPV6;</div><div class='add'>+	p.iph.ttl = 64;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	err = dev-&gt;netdev_ops-&gt;ndo_tunnel_ctl(dev, &amp;p, SIOCADDTUNNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev = __dev_get_by_name(net, p.name);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	return dev_open(dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Set destination address.</div><div class='ctx'>  *	Special case for SIT interfaces where we create a new "virtual"</div><div class='hunk'>@@ -2754,62 +2973,20 @@ put:</div><div class='ctx'>  */</div><div class='ctx'> int addrconf_set_dstaddr(struct net *net, void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	struct in6_ifreq ireq;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	struct in6_ifreq ireq;</div><div class='add'>+	int err = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	err = -EFAULT;</div><div class='add'>+	if (!IS_ENABLED(CONFIG_IPV6_SIT))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (copy_from_user(&amp;ireq, arg, sizeof(struct in6_ifreq)))</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> 	dev = __dev_get_by_index(net, ireq.ifr6_ifindex);</div><div class='del'>-</div><div class='del'>-	err = -ENODEV;</div><div class='del'>-	if (!dev)</div><div class='del'>-		goto err_exit;</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_SIT)</div><div class='del'>-	if (dev-&gt;type == ARPHRD_SIT) {</div><div class='del'>-		const struct net_device_ops *ops = dev-&gt;netdev_ops;</div><div class='del'>-		struct ifreq ifr;</div><div class='del'>-		struct ip_tunnel_parm p;</div><div class='del'>-</div><div class='del'>-		err = -EADDRNOTAVAIL;</div><div class='del'>-		if (!(ipv6_addr_type(&amp;ireq.ifr6_addr) &amp; IPV6_ADDR_COMPATv4))</div><div class='del'>-			goto err_exit;</div><div class='del'>-</div><div class='del'>-		memset(&amp;p, 0, sizeof(p));</div><div class='del'>-		p.iph.daddr = ireq.ifr6_addr.s6_addr32[3];</div><div class='del'>-		p.iph.saddr = 0;</div><div class='del'>-		p.iph.version = 4;</div><div class='del'>-		p.iph.ihl = 5;</div><div class='del'>-		p.iph.protocol = IPPROTO_IPV6;</div><div class='del'>-		p.iph.ttl = 64;</div><div class='del'>-		ifr.ifr_ifru.ifru_data = (__force void __user *)&amp;p;</div><div class='del'>-</div><div class='del'>-		if (ops-&gt;ndo_do_ioctl) {</div><div class='del'>-			mm_segment_t oldfs = get_fs();</div><div class='del'>-</div><div class='del'>-			set_fs(KERNEL_DS);</div><div class='del'>-			err = ops-&gt;ndo_do_ioctl(dev, &amp;ifr, SIOCADDTUNNEL);</div><div class='del'>-			set_fs(oldfs);</div><div class='del'>-		} else</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		if (err == 0) {</div><div class='del'>-			err = -ENOBUFS;</div><div class='del'>-			dev = __dev_get_by_name(net, p.name);</div><div class='del'>-			if (!dev)</div><div class='del'>-				goto err_exit;</div><div class='del'>-			err = dev_open(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-err_exit:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	if (dev &amp;&amp; dev-&gt;type == ARPHRD_SIT)</div><div class='add'>+		err = addrconf_set_sit_dstaddr(net, dev, &amp;ireq);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2833,65 +3010,43 @@ static int ipv6_mc_config(struct sock *sk, bool join,</div><div class='ctx'> /*</div><div class='ctx'>  *	Manual configuration of address on an interface</div><div class='ctx'>  */</div><div class='del'>-static int inet6_addr_add(struct net *net, int ifindex,</div><div class='del'>-			  struct ifa6_config *cfg,</div><div class='add'>+static int inet6_addr_add(struct net *net, struct net_device *dev,</div><div class='add'>+			  struct ifa6_config *cfg, clock_t expires, u32 flags,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	clock_t expires;</div><div class='del'>-	u32 flags;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;plen &gt; 128)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* check the lifetime */</div><div class='del'>-	if (!cfg-&gt;valid_lft || cfg-&gt;preferred_lft &gt; cfg-&gt;valid_lft)</div><div class='add'>+	if (cfg-&gt;plen &gt; 128) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid prefix length");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ifa_flags &amp; IFA_F_MANAGETEMPADDR &amp;&amp; cfg-&gt;plen != 64)</div><div class='add'>+	if (cfg-&gt;ifa_flags &amp; IFA_F_MANAGETEMPADDR &amp;&amp; cfg-&gt;plen != 64) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "address with \"mngtmpaddr\" flag must have a prefix length of 64");</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev = __dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	idev = addrconf_add_dev(dev);</div><div class='del'>-	if (IS_ERR(idev))</div><div class='add'>+	if (IS_ERR(idev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "IPv6 is disabled on this device");</div><div class='ctx'> 		return PTR_ERR(idev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;ifa_flags &amp; IFA_F_MCAUTOJOIN) {</div><div class='ctx'> 		int ret = ipv6_mc_config(net-&gt;ipv6.mc_autojoin_sk,</div><div class='del'>-					 true, cfg-&gt;pfx, ifindex);</div><div class='add'>+					 true, cfg-&gt;pfx, dev-&gt;ifindex);</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Multicast auto join failed");</div><div class='ctx'> 			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;scope = ipv6_addr_scope(cfg-&gt;pfx);</div><div class='ctx'> </div><div class='del'>-	timeout = addrconf_timeout_fixup(cfg-&gt;valid_lft, HZ);</div><div class='del'>-	if (addrconf_finite_timeout(timeout)) {</div><div class='del'>-		expires = jiffies_to_clock_t(timeout * HZ);</div><div class='del'>-		cfg-&gt;valid_lft = timeout;</div><div class='del'>-		flags = RTF_EXPIRES;</div><div class='del'>-	} else {</div><div class='del'>-		expires = 0;</div><div class='del'>-		flags = 0;</div><div class='del'>-		cfg-&gt;ifa_flags |= IFA_F_PERMANENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeout = addrconf_timeout_fixup(cfg-&gt;preferred_lft, HZ);</div><div class='del'>-	if (addrconf_finite_timeout(timeout)) {</div><div class='del'>-		if (timeout == 0)</div><div class='del'>-			cfg-&gt;ifa_flags |= IFA_F_DEPRECATED;</div><div class='del'>-		cfg-&gt;preferred_lft = timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ifp = ipv6_add_addr(idev, cfg, true, extack);</div><div class='ctx'> 	if (!IS_ERR(ifp)) {</div><div class='ctx'> 		if (!(cfg-&gt;ifa_flags &amp; IFA_F_NOPREFIXROUTE)) {</div><div class='hunk'>@@ -2915,33 +3070,40 @@ static int inet6_addr_add(struct net *net, int ifindex,</div><div class='ctx'> 			manage_tempaddrs(idev, ifp, cfg-&gt;valid_lft,</div><div class='ctx'> 					 cfg-&gt;preferred_lft, true, jiffies);</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='del'>-		addrconf_verify_rtnl();</div><div class='add'>+		addrconf_verify_rtnl(net);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if (cfg-&gt;ifa_flags &amp; IFA_F_MCAUTOJOIN) {</div><div class='ctx'> 		ipv6_mc_config(net-&gt;ipv6.mc_autojoin_sk, false,</div><div class='del'>-			       cfg-&gt;pfx, ifindex);</div><div class='add'>+			       cfg-&gt;pfx, dev-&gt;ifindex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return PTR_ERR(ifp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet6_addr_del(struct net *net, int ifindex, u32 ifa_flags,</div><div class='del'>-			  const struct in6_addr *pfx, unsigned int plen)</div><div class='add'>+			  const struct in6_addr *pfx, unsigned int plen,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	if (plen &gt; 128)</div><div class='add'>+	if (plen &gt; 128) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid prefix length");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev = __dev_get_by_index(net, ifindex);</div><div class='del'>-	if (!dev)</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to find the interface");</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	idev = __in6_dev_get(dev);</div><div class='del'>-	if (!idev)</div><div class='add'>+	idev = __in6_dev_get_rtnl_net(dev);</div><div class='add'>+	if (!idev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "IPv6 is disabled on this device");</div><div class='ctx'> 		return -ENXIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(ifp, &amp;idev-&gt;addr_list, if_list) {</div><div class='hunk'>@@ -2950,12 +3112,13 @@ static int inet6_addr_del(struct net *net, int ifindex, u32 ifa_flags,</div><div class='ctx'> 			in6_ifa_hold(ifp);</div><div class='ctx'> 			read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-			if (!(ifp-&gt;flags &amp; IFA_F_TEMPORARY) &amp;&amp;</div><div class='del'>-			    (ifa_flags &amp; IFA_F_MANAGETEMPADDR))</div><div class='del'>-				manage_tempaddrs(idev, ifp, 0, 0, false,</div><div class='del'>-						 jiffies);</div><div class='ctx'> 			ipv6_del_addr(ifp);</div><div class='del'>-			addrconf_verify_rtnl();</div><div class='add'>+</div><div class='add'>+			if (!(ifp-&gt;flags &amp; IFA_F_TEMPORARY) &amp;&amp;</div><div class='add'>+			    (ifp-&gt;flags &amp; IFA_F_MANAGETEMPADDR))</div><div class='add'>+				delete_tempaddrs(idev, ifp);</div><div class='add'>+</div><div class='add'>+			addrconf_verify_rtnl(net);</div><div class='ctx'> 			if (ipv6_addr_is_multicast(pfx)) {</div><div class='ctx'> 				ipv6_mc_config(net-&gt;ipv6.mc_autojoin_sk,</div><div class='ctx'> 					       false, pfx, dev-&gt;ifindex);</div><div class='hunk'>@@ -2964,6 +3127,8 @@ static int inet6_addr_del(struct net *net, int ifindex, u32 ifa_flags,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "address not found");</div><div class='ctx'> 	return -EADDRNOTAVAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2975,6 +3140,7 @@ int addrconf_add_ifaddr(struct net *net, void __user *arg)</div><div class='ctx'> 		.preferred_lft = INFINITY_LIFE_TIME,</div><div class='ctx'> 		.valid_lft = INFINITY_LIFE_TIME,</div><div class='ctx'> 	};</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct in6_ifreq ireq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2987,9 +3153,16 @@ int addrconf_add_ifaddr(struct net *net, void __user *arg)</div><div class='ctx'> 	cfg.pfx = &amp;ireq.ifr6_addr;</div><div class='ctx'> 	cfg.plen = ireq.ifr6_prefixlen;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	err = inet6_addr_add(net, ireq.ifr6_ifindex, &amp;cfg, NULL);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+	dev = __dev_get_by_index(net, ireq.ifr6_ifindex);</div><div class='add'>+	if (dev) {</div><div class='add'>+		netdev_lock_ops(dev);</div><div class='add'>+		err = inet6_addr_add(net, dev, &amp;cfg, 0, 0, NULL);</div><div class='add'>+		netdev_unlock_ops(dev);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3004,15 +3177,15 @@ int addrconf_del_ifaddr(struct net *net, void __user *arg)</div><div class='ctx'> 	if (copy_from_user(&amp;ireq, arg, sizeof(struct in6_ifreq)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> 	err = inet6_addr_del(net, ireq.ifr6_ifindex, 0, &amp;ireq.ifr6_addr,</div><div class='del'>-			     ireq.ifr6_prefixlen);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+			     ireq.ifr6_prefixlen, NULL);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,</div><div class='del'>-		     int plen, int scope)</div><div class='add'>+		     int plen, int scope, u8 proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	struct ifa6_config cfg = {</div><div class='hunk'>@@ -3021,7 +3194,8 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,</div><div class='ctx'> 		.ifa_flags = IFA_F_PERMANENT,</div><div class='ctx'> 		.valid_lft = INFINITY_LIFE_TIME,</div><div class='ctx'> 		.preferred_lft = INFINITY_LIFE_TIME,</div><div class='del'>-		.scope = scope</div><div class='add'>+		.scope = scope,</div><div class='add'>+		.ifa_proto = proto</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ifp = ipv6_add_addr(idev, &amp;cfg, true, NULL);</div><div class='hunk'>@@ -3035,8 +3209,8 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_SIT)</div><div class='del'>-static void sit_add_v4_addrs(struct inet6_dev *idev)</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_SIT) || IS_ENABLED(CONFIG_NET_IPGRE)</div><div class='add'>+static void add_v4_addrs(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr addr;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -3049,18 +3223,21 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)</div><div class='ctx'> 	memset(&amp;addr, 0, sizeof(struct in6_addr));</div><div class='ctx'> 	memcpy(&amp;addr.s6_addr32[3], idev-&gt;dev-&gt;dev_addr, 4);</div><div class='ctx'> </div><div class='del'>-	if (idev-&gt;dev-&gt;flags&amp;IFF_POINTOPOINT) {</div><div class='del'>-		addr.s6_addr32[0] = htonl(0xfe800000);</div><div class='del'>-		scope = IFA_LINK;</div><div class='del'>-		plen = 64;</div><div class='del'>-	} else {</div><div class='add'>+	if (!(idev-&gt;dev-&gt;flags &amp; IFF_POINTOPOINT) &amp;&amp; idev-&gt;dev-&gt;type == ARPHRD_SIT) {</div><div class='ctx'> 		scope = IPV6_ADDR_COMPATv4;</div><div class='ctx'> 		plen = 96;</div><div class='ctx'> 		pflags |= RTF_NONEXTHOP;</div><div class='add'>+	} else {</div><div class='add'>+		if (idev-&gt;cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_NONE)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		addr.s6_addr32[0] = htonl(0xfe800000);</div><div class='add'>+		scope = IFA_LINK;</div><div class='add'>+		plen = 64;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (addr.s6_addr32[3]) {</div><div class='del'>-		add_addr(idev, &amp;addr, plen, scope);</div><div class='add'>+		add_addr(idev, &amp;addr, plen, scope, IFAPROT_UNSPEC);</div><div class='ctx'> 		addrconf_prefix_route(&amp;addr, plen, 0, idev-&gt;dev, 0, pflags,</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3070,11 +3247,9 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)</div><div class='ctx'> 		struct in_device *in_dev = __in_dev_get_rtnl(dev);</div><div class='ctx'> 		if (in_dev &amp;&amp; (dev-&gt;flags &amp; IFF_UP)) {</div><div class='ctx'> 			struct in_ifaddr *ifa;</div><div class='del'>-</div><div class='ctx'> 			int flag = scope;</div><div class='ctx'> </div><div class='del'>-			for (ifa = in_dev-&gt;ifa_list; ifa; ifa = ifa-&gt;ifa_next) {</div><div class='del'>-</div><div class='add'>+			in_dev_for_each_ifa_rtnl(ifa, in_dev) {</div><div class='ctx'> 				addr.s6_addr32[3] = ifa-&gt;ifa_local;</div><div class='ctx'> </div><div class='ctx'> 				if (ifa-&gt;ifa_scope == RT_SCOPE_LINK)</div><div class='hunk'>@@ -3085,7 +3260,8 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)</div><div class='ctx'> 					flag |= IFA_HOST;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				add_addr(idev, &amp;addr, plen, flag);</div><div class='add'>+				add_addr(idev, &amp;addr, plen, flag,</div><div class='add'>+					 IFAPROT_UNSPEC);</div><div class='ctx'> 				addrconf_prefix_route(&amp;addr, plen, 0, idev-&gt;dev,</div><div class='ctx'> 						      0, pflags, GFP_KERNEL);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3103,12 +3279,12 @@ static void init_loopback(struct net_device *dev)</div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	idev = ipv6_find_idev(dev);</div><div class='del'>-	if (!idev) {</div><div class='add'>+	if (IS_ERR(idev)) {</div><div class='ctx'> 		pr_debug("%s: add_dev failed\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	add_addr(idev, &amp;in6addr_loopback, 128, IFA_HOST);</div><div class='add'>+	add_addr(idev, &amp;in6addr_loopback, 128, IFA_HOST, IFAPROT_KERNEL_LO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void addrconf_add_linklocal(struct inet6_dev *idev,</div><div class='hunk'>@@ -3120,13 +3296,14 @@ void addrconf_add_linklocal(struct inet6_dev *idev,</div><div class='ctx'> 		.ifa_flags = flags | IFA_F_PERMANENT,</div><div class='ctx'> 		.valid_lft = INFINITY_LIFE_TIME,</div><div class='ctx'> 		.preferred_lft = INFINITY_LIFE_TIME,</div><div class='del'>-		.scope = IFA_LINK</div><div class='add'>+		.scope = IFA_LINK,</div><div class='add'>+		.ifa_proto = IFAPROT_KERNEL_LL</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_OPTIMISTIC_DAD</div><div class='del'>-	if ((dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;optimistic_dad ||</div><div class='del'>-	     idev-&gt;cnf.optimistic_dad) &amp;&amp;</div><div class='add'>+	if ((READ_ONCE(dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;optimistic_dad) ||</div><div class='add'>+	     READ_ONCE(idev-&gt;cnf.optimistic_dad)) &amp;&amp;</div><div class='ctx'> 	    !dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;forwarding)</div><div class='ctx'> 		cfg.ifa_flags |= IFA_F_OPTIMISTIC;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3162,11 +3339,11 @@ static int ipv6_generate_stable_address(struct in6_addr *address,</div><div class='ctx'> 					const struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_SPINLOCK(lock);</div><div class='del'>-	static __u32 digest[SHA_DIGEST_WORDS];</div><div class='del'>-	static __u32 workspace[SHA_WORKSPACE_WORDS];</div><div class='add'>+	static __u32 digest[SHA1_DIGEST_WORDS];</div><div class='add'>+	static __u32 workspace[SHA1_WORKSPACE_WORDS];</div><div class='ctx'> </div><div class='ctx'> 	static union {</div><div class='del'>-		char __data[SHA_MESSAGE_BYTES];</div><div class='add'>+		char __data[SHA1_BLOCK_SIZE];</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct in6_addr secret;</div><div class='ctx'> 			__be32 prefix[2];</div><div class='hunk'>@@ -3191,7 +3368,7 @@ static int ipv6_generate_stable_address(struct in6_addr *address,</div><div class='ctx'> retry:</div><div class='ctx'> 	spin_lock_bh(&amp;lock);</div><div class='ctx'> </div><div class='del'>-	sha_init(digest);</div><div class='add'>+	sha1_init_raw(digest);</div><div class='ctx'> 	memset(&amp;data, 0, sizeof(data));</div><div class='ctx'> 	memset(workspace, 0, sizeof(workspace));</div><div class='ctx'> 	memcpy(data.hwaddr, idev-&gt;dev-&gt;perm_addr, idev-&gt;dev-&gt;addr_len);</div><div class='hunk'>@@ -3200,7 +3377,7 @@ retry:</div><div class='ctx'> 	data.secret = secret;</div><div class='ctx'> 	data.dad_count = dad_count;</div><div class='ctx'> </div><div class='del'>-	sha_transform(digest, data.__data, workspace);</div><div class='add'>+	sha1_transform(digest, data.__data, workspace);</div><div class='ctx'> </div><div class='ctx'> 	temp = *address;</div><div class='ctx'> 	temp.s6_addr32[2] = (__force __be32)digest[0];</div><div class='hunk'>@@ -3238,12 +3415,16 @@ static void addrconf_addr_gen(struct inet6_dev *idev, bool prefix_route)</div><div class='ctx'> 	if (netif_is_l3_master(idev-&gt;dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* no link local addresses on devices flagged as slaves */</div><div class='add'>+	if (idev-&gt;dev-&gt;priv_flags &amp; IFF_NO_ADDRCONF)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	ipv6_addr_set(&amp;addr, htonl(0xFE800000), 0, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	switch (idev-&gt;cnf.addr_gen_mode) {</div><div class='ctx'> 	case IN6_ADDR_GEN_MODE_RANDOM:</div><div class='ctx'> 		ipv6_gen_mode_random_init(idev);</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IN6_ADDR_GEN_MODE_STABLE_PRIVACY:</div><div class='ctx'> 		if (!ipv6_generate_stable_address(&amp;addr, 0, idev))</div><div class='ctx'> 			addrconf_add_linklocal(idev, &amp;addr,</div><div class='hunk'>@@ -3284,11 +3465,14 @@ static void addrconf_dev_config(struct net_device *dev)</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_TUNNEL6) &amp;&amp;</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_6LOWPAN) &amp;&amp;</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_IP6GRE) &amp;&amp;</div><div class='del'>-	    (dev-&gt;type != ARPHRD_IPGRE) &amp;&amp;</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_TUNNEL) &amp;&amp;</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_NONE) &amp;&amp;</div><div class='ctx'> 	    (dev-&gt;type != ARPHRD_RAWIP)) {</div><div class='ctx'> 		/* Alas, we support only Ethernet autoconfiguration. */</div><div class='add'>+		idev = __in6_dev_get(dev);</div><div class='add'>+		if (!IS_ERR_OR_NULL(idev) &amp;&amp; dev-&gt;flags &amp; IFF_UP &amp;&amp;</div><div class='add'>+		    dev-&gt;flags &amp; IFF_MULTICAST)</div><div class='add'>+			ipv6_mc_up(idev);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3299,7 +3483,8 @@ static void addrconf_dev_config(struct net_device *dev)</div><div class='ctx'> 	/* this device type has no EUI support */</div><div class='ctx'> 	if (dev-&gt;type == ARPHRD_NONE &amp;&amp;</div><div class='ctx'> 	    idev-&gt;cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_EUI64)</div><div class='del'>-		idev-&gt;cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_RANDOM;</div><div class='add'>+		WRITE_ONCE(idev-&gt;cnf.addr_gen_mode,</div><div class='add'>+			   IN6_ADDR_GEN_MODE_RANDOM);</div><div class='ctx'> </div><div class='ctx'> 	addrconf_addr_gen(idev, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -3318,7 +3503,7 @@ static void addrconf_sit_config(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	idev = ipv6_find_idev(dev);</div><div class='del'>-	if (!idev) {</div><div class='add'>+	if (IS_ERR(idev)) {</div><div class='ctx'> 		pr_debug("%s: add_dev failed\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3328,7 +3513,7 @@ static void addrconf_sit_config(struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sit_add_v4_addrs(idev);</div><div class='add'>+	add_v4_addrs(idev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags&amp;IFF_POINTOPOINT)</div><div class='ctx'> 		addrconf_add_mroute(dev);</div><div class='hunk'>@@ -3342,18 +3527,48 @@ static void addrconf_gre_config(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	idev = ipv6_find_idev(dev);</div><div class='del'>-	if (!idev) {</div><div class='del'>-		pr_debug("%s: add_dev failed\n", __func__);</div><div class='add'>+	idev = addrconf_add_dev(dev);</div><div class='add'>+	if (IS_ERR(idev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Generate the IPv6 link-local address using addrconf_addr_gen(),</div><div class='add'>+	 * unless we have an IPv4 GRE device not bound to an IP address and</div><div class='add'>+	 * which is in EUI64 mode (as __ipv6_isatap_ifid() would fail in this</div><div class='add'>+	 * case). Such devices fall back to add_v4_addrs() instead.</div><div class='add'>+	 */</div><div class='add'>+	if (!(*(__be32 *)dev-&gt;dev_addr == 0 &amp;&amp;</div><div class='add'>+	      idev-&gt;cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_EUI64)) {</div><div class='add'>+		addrconf_addr_gen(idev, true);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addrconf_addr_gen(idev, true);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_POINTOPOINT)</div><div class='del'>-		addrconf_add_mroute(dev);</div><div class='add'>+	add_v4_addrs(idev);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void addrconf_init_auto_addrs(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	switch (dev-&gt;type) {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_SIT)</div><div class='add'>+	case ARPHRD_SIT:</div><div class='add'>+		addrconf_sit_config(dev);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_IPGRE)</div><div class='add'>+	case ARPHRD_IPGRE:</div><div class='add'>+		addrconf_gre_config(dev);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case ARPHRD_LOOPBACK:</div><div class='add'>+		init_loopback(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		addrconf_dev_config(dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fixup_permanent_addr(struct net *net,</div><div class='ctx'> 				struct inet6_dev *idev,</div><div class='ctx'> 				struct inet6_ifaddr *ifp)</div><div class='hunk'>@@ -3366,7 +3581,7 @@ static int fixup_permanent_addr(struct net *net,</div><div class='ctx'> 		struct fib6_info *f6i, *prev;</div><div class='ctx'> </div><div class='ctx'> 		f6i = addrconf_f6i_alloc(net, idev, &amp;ifp-&gt;addr, false,</div><div class='del'>-					 GFP_ATOMIC);</div><div class='add'>+					 GFP_ATOMIC, NULL);</div><div class='ctx'> 		if (IS_ERR(f6i))</div><div class='ctx'> 			return PTR_ERR(f6i);</div><div class='ctx'> </div><div class='hunk'>@@ -3422,6 +3637,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 			   void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct netdev_notifier_change_info *change_info;</div><div class='ctx'> 	struct netdev_notifier_changeupper_info *info;</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='hunk'>@@ -3446,7 +3662,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> </div><div class='ctx'> 		if (idev) {</div><div class='ctx'> 			rt6_mtu_change(dev, dev-&gt;mtu);</div><div class='del'>-			idev-&gt;cnf.mtu6 = dev-&gt;mtu;</div><div class='add'>+			WRITE_ONCE(idev-&gt;cnf.mtu6, dev-&gt;mtu);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3460,16 +3676,18 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		run_pending = 1;</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_UP:</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_SLAVE)</div><div class='add'>+		if (idev &amp;&amp; idev-&gt;cnf.disable_ipv6)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (idev &amp;&amp; idev-&gt;cnf.disable_ipv6)</div><div class='add'>+		if (dev-&gt;priv_flags &amp; IFF_NO_ADDRCONF) {</div><div class='add'>+			if (event == NETDEV_UP &amp;&amp; !IS_ERR_OR_NULL(idev) &amp;&amp;</div><div class='add'>+			    dev-&gt;flags &amp; IFF_UP &amp;&amp; dev-&gt;flags &amp; IFF_MULTICAST)</div><div class='add'>+				ipv6_mc_up(idev);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (event == NETDEV_UP) {</div><div class='ctx'> 			/* restore routes for permanent addresses */</div><div class='hunk'>@@ -3477,8 +3695,8 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> </div><div class='ctx'> 			if (!addrconf_link_ready(dev)) {</div><div class='ctx'> 				/* device is not ready yet. */</div><div class='del'>-				pr_info("ADDRCONF(NETDEV_UP): %s: link is not ready\n",</div><div class='del'>-					dev-&gt;name);</div><div class='add'>+				pr_debug("ADDRCONF(NETDEV_UP): %s: link is not ready\n",</div><div class='add'>+					 dev-&gt;name);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -3496,7 +3714,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (idev) {</div><div class='add'>+			if (!IS_ERR_OR_NULL(idev)) {</div><div class='ctx'> 				if (idev-&gt;if_flags &amp; IF_READY) {</div><div class='ctx'> 					/* device is already configured -</div><div class='ctx'> 					 * but resend MLD reports, we might</div><div class='hunk'>@@ -3504,41 +3722,26 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 					 * multicast snooping switches</div><div class='ctx'> 					 */</div><div class='ctx'> 					ipv6_mc_up(idev);</div><div class='add'>+					change_info = ptr;</div><div class='add'>+					if (change_info-&gt;flags_changed &amp; IFF_NOARP)</div><div class='add'>+						addrconf_dad_run(idev, true);</div><div class='ctx'> 					rt6_sync_up(dev, RTNH_F_LINKDOWN);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				idev-&gt;if_flags |= IF_READY;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			pr_info("ADDRCONF(NETDEV_CHANGE): %s: link becomes ready\n",</div><div class='del'>-				dev-&gt;name);</div><div class='add'>+			pr_debug("ADDRCONF(NETDEV_CHANGE): %s: link becomes ready\n",</div><div class='add'>+				 dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 			run_pending = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (dev-&gt;type) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_SIT)</div><div class='del'>-		case ARPHRD_SIT:</div><div class='del'>-			addrconf_sit_config(dev);</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-#if IS_ENABLED(CONFIG_NET_IPGRE)</div><div class='del'>-		case ARPHRD_IPGRE:</div><div class='del'>-			addrconf_gre_config(dev);</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-		case ARPHRD_LOOPBACK:</div><div class='del'>-			init_loopback(dev);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			addrconf_dev_config(dev);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		addrconf_init_auto_addrs(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR_OR_NULL(idev)) {</div><div class='ctx'> 			if (run_pending)</div><div class='del'>-				addrconf_dad_run(idev);</div><div class='add'>+				addrconf_dad_run(idev, false);</div><div class='ctx'> </div><div class='ctx'> 			/* Device has an address by now */</div><div class='ctx'> 			rt6_sync_up(dev, RTNH_F_DEAD);</div><div class='hunk'>@@ -3551,9 +3754,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 			if (idev-&gt;cnf.mtu6 != dev-&gt;mtu &amp;&amp;</div><div class='ctx'> 			    dev-&gt;mtu &gt;= IPV6_MIN_MTU) {</div><div class='ctx'> 				rt6_mtu_change(dev, dev-&gt;mtu);</div><div class='del'>-				idev-&gt;cnf.mtu6 = dev-&gt;mtu;</div><div class='add'>+				WRITE_ONCE(idev-&gt;cnf.mtu6, dev-&gt;mtu);</div><div class='ctx'> 			}</div><div class='del'>-			idev-&gt;tstamp = jiffies;</div><div class='add'>+			WRITE_ONCE(idev-&gt;tstamp, jiffies);</div><div class='ctx'> 			inet6_ifinfo_notify(RTM_NEWLINK, idev);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3601,7 +3804,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 		 * an L3 master device (e.g., VRF)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (info-&gt;upper_dev &amp;&amp; netif_is_l3_master(info-&gt;upper_dev))</div><div class='del'>-			addrconf_ifdown(dev, 0);</div><div class='add'>+			addrconf_ifdown(dev, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_OK;</div><div class='hunk'>@@ -3634,13 +3837,15 @@ static bool addr_is_local(const struct in6_addr *addr)</div><div class='ctx'> 		(IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_ifdown(struct net_device *dev, int how)</div><div class='add'>+static int addrconf_ifdown(struct net_device *dev, bool unregister)</div><div class='ctx'> {</div><div class='del'>-	unsigned long event = how ? NETDEV_UNREGISTER : NETDEV_DOWN;</div><div class='add'>+	unsigned long event = unregister ? NETDEV_UNREGISTER : NETDEV_DOWN;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct inet6_ifaddr *ifa, *tmp;</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+	LIST_HEAD(tmp_addr_list);</div><div class='ctx'> 	bool keep_addr = false;</div><div class='add'>+	bool was_ready;</div><div class='ctx'> 	int state, i;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='hunk'>@@ -3655,8 +3860,8 @@ static int addrconf_ifdown(struct net_device *dev, int how)</div><div class='ctx'> 	 * Step 1: remove reference to ipv6 device from parent device.</div><div class='ctx'> 	 *	   Do not dev_put!</div><div class='ctx'> 	 */</div><div class='del'>-	if (how) {</div><div class='del'>-		idev-&gt;dead = 1;</div><div class='add'>+	if (unregister) {</div><div class='add'>+		WRITE_ONCE(idev-&gt;dead, 1);</div><div class='ctx'> </div><div class='ctx'> 		/* protected by rtnl_lock */</div><div class='ctx'> 		RCU_INIT_POINTER(dev-&gt;ip6_ptr, NULL);</div><div class='hunk'>@@ -3669,21 +3874,21 @@ static int addrconf_ifdown(struct net_device *dev, int how)</div><div class='ctx'> 	/* combine the user config with event to determine if permanent</div><div class='ctx'> 	 * addresses are to be removed from address hash table</div><div class='ctx'> 	 */</div><div class='del'>-	if (!how &amp;&amp; !idev-&gt;cnf.disable_ipv6) {</div><div class='add'>+	if (!unregister &amp;&amp; !idev-&gt;cnf.disable_ipv6) {</div><div class='ctx'> 		/* aggregate the system setting and interface setting */</div><div class='del'>-		int _keep_addr = net-&gt;ipv6.devconf_all-&gt;keep_addr_on_down;</div><div class='add'>+		int _keep_addr = READ_ONCE(net-&gt;ipv6.devconf_all-&gt;keep_addr_on_down);</div><div class='ctx'> </div><div class='ctx'> 		if (!_keep_addr)</div><div class='del'>-			_keep_addr = idev-&gt;cnf.keep_addr_on_down;</div><div class='add'>+			_keep_addr = READ_ONCE(idev-&gt;cnf.keep_addr_on_down);</div><div class='ctx'> </div><div class='ctx'> 		keep_addr = (_keep_addr &gt; 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Step 2: clear hash table */</div><div class='ctx'> 	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++) {</div><div class='del'>-		struct hlist_head *h = &amp;inet6_addr_lst[i];</div><div class='add'>+		struct hlist_head *h = &amp;net-&gt;ipv6.inet6_addr_lst[i];</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;addrconf_hash_lock);</div><div class='add'>+		spin_lock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> restart:</div><div class='ctx'> 		hlist_for_each_entry_rcu(ifa, h, addr_lst) {</div><div class='ctx'> 			if (ifa-&gt;idev == idev) {</div><div class='hunk'>@@ -3699,15 +3904,18 @@ restart:</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;addrconf_hash_lock);</div><div class='add'>+		spin_unlock_bh(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	addrconf_del_rs_timer(idev);</div><div class='ctx'> </div><div class='del'>-	/* Step 2: clear flags for stateless addrconf */</div><div class='del'>-	if (!how)</div><div class='add'>+	/* Step 2: clear flags for stateless addrconf, repeated down</div><div class='add'>+	 *         detection</div><div class='add'>+	 */</div><div class='add'>+	was_ready = idev-&gt;if_flags &amp; IF_READY;</div><div class='add'>+	if (!unregister)</div><div class='ctx'> 		idev-&gt;if_flags &amp;= ~(IF_RS_SENT|IF_RA_RCVD|IF_READY);</div><div class='ctx'> </div><div class='ctx'> 	/* Step 3: clear tempaddr list */</div><div class='hunk'>@@ -3727,16 +3935,23 @@ restart:</div><div class='ctx'> 		write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(ifa, tmp, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list)</div><div class='add'>+		list_add_tail(&amp;ifa-&gt;if_list_aux, &amp;tmp_addr_list);</div><div class='add'>+	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;tmp_addr_list)) {</div><div class='ctx'> 		struct fib6_info *rt = NULL;</div><div class='ctx'> 		bool keep;</div><div class='ctx'> </div><div class='add'>+		ifa = list_first_entry(&amp;tmp_addr_list,</div><div class='add'>+				       struct inet6_ifaddr, if_list_aux);</div><div class='add'>+		list_del(&amp;ifa-&gt;if_list_aux);</div><div class='add'>+</div><div class='ctx'> 		addrconf_del_dad_work(ifa);</div><div class='ctx'> </div><div class='ctx'> 		keep = keep_addr &amp;&amp; (ifa-&gt;flags &amp; IFA_F_PERMANENT) &amp;&amp;</div><div class='ctx'> 			!addr_is_local(&amp;ifa-&gt;addr);</div><div class='ctx'> </div><div class='del'>-		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		spin_lock_bh(&amp;ifa-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if (keep) {</div><div class='hunk'>@@ -3756,7 +3971,7 @@ restart:</div><div class='ctx'> 		spin_unlock_bh(&amp;ifa-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if (rt)</div><div class='del'>-			ip6_del_rt(net, rt);</div><div class='add'>+			ip6_del_rt(net, rt, false);</div><div class='ctx'> </div><div class='ctx'> 		if (state != INET6_IFADDR_STATE_DEAD) {</div><div class='ctx'> 			__ipv6_ifa_notify(RTM_DELADDR, ifa);</div><div class='hunk'>@@ -3767,27 +3982,27 @@ restart:</div><div class='ctx'> 			addrconf_leave_solict(ifa-&gt;idev, &amp;ifa-&gt;addr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		if (!keep) {</div><div class='add'>+			write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 			list_del_rcu(&amp;ifa-&gt;if_list);</div><div class='add'>+			write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 			in6_ifa_put(ifa);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	/* Step 5: Discard anycast and multicast list */</div><div class='del'>-	if (how) {</div><div class='add'>+	if (unregister) {</div><div class='ctx'> 		ipv6_ac_destroy_dev(idev);</div><div class='ctx'> 		ipv6_mc_destroy_dev(idev);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (was_ready) {</div><div class='ctx'> 		ipv6_mc_down(idev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idev-&gt;tstamp = jiffies;</div><div class='add'>+	WRITE_ONCE(idev-&gt;tstamp, jiffies);</div><div class='add'>+	idev-&gt;ra_mtu = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Last: Shot the device (if unregistered) */</div><div class='del'>-	if (how) {</div><div class='add'>+	if (unregister) {</div><div class='ctx'> 		addrconf_sysctl_unregister(idev);</div><div class='ctx'> 		neigh_parms_release(&amp;nd_tbl, idev-&gt;nd_parms);</div><div class='ctx'> 		neigh_ifdown(&amp;nd_tbl, dev);</div><div class='hunk'>@@ -3798,9 +4013,10 @@ restart:</div><div class='ctx'> </div><div class='ctx'> static void addrconf_rs_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = from_timer(idev, t, rs_timer);</div><div class='add'>+	struct inet6_dev *idev = timer_container_of(idev, t, rs_timer);</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='ctx'> 	struct in6_addr lladdr;</div><div class='add'>+	int rtr_solicits;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (idev-&gt;dead || !(idev-&gt;if_flags &amp; IF_READY))</div><div class='hunk'>@@ -3813,7 +4029,9 @@ static void addrconf_rs_timer(struct timer_list *t)</div><div class='ctx'> 	if (idev-&gt;if_flags &amp; IF_RA_RCVD)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (idev-&gt;rs_probes++ &lt; idev-&gt;cnf.rtr_solicits || idev-&gt;cnf.rtr_solicits &lt; 0) {</div><div class='add'>+	rtr_solicits = READ_ONCE(idev-&gt;cnf.rtr_solicits);</div><div class='add'>+</div><div class='add'>+	if (idev-&gt;rs_probes++ &lt; rtr_solicits || rtr_solicits &lt; 0) {</div><div class='ctx'> 		write_unlock(&amp;idev-&gt;lock);</div><div class='ctx'> 		if (!ipv6_get_lladdr(dev, &amp;lladdr, IFA_F_TENTATIVE))</div><div class='ctx'> 			ndisc_send_rs(dev, &amp;lladdr,</div><div class='hunk'>@@ -3823,11 +4041,12 @@ static void addrconf_rs_timer(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 		write_lock(&amp;idev-&gt;lock);</div><div class='ctx'> 		idev-&gt;rs_interval = rfc3315_s14_backoff_update(</div><div class='del'>-			idev-&gt;rs_interval, idev-&gt;cnf.rtr_solicit_max_interval);</div><div class='add'>+				idev-&gt;rs_interval,</div><div class='add'>+				READ_ONCE(idev-&gt;cnf.rtr_solicit_max_interval));</div><div class='ctx'> 		/* The wait after the last probe can be shorter */</div><div class='ctx'> 		addrconf_mod_rs_timer(idev, (idev-&gt;rs_probes ==</div><div class='del'>-					     idev-&gt;cnf.rtr_solicits) ?</div><div class='del'>-				      idev-&gt;cnf.rtr_solicit_delay :</div><div class='add'>+					     READ_ONCE(idev-&gt;cnf.rtr_solicits)) ?</div><div class='add'>+				      READ_ONCE(idev-&gt;cnf.rtr_solicit_delay) :</div><div class='ctx'> 				      idev-&gt;rs_interval);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3848,24 +4067,25 @@ put:</div><div class='ctx'>  */</div><div class='ctx'> static void addrconf_dad_kick(struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rand_num;</div><div class='ctx'> 	struct inet6_dev *idev = ifp-&gt;idev;</div><div class='add'>+	unsigned long rand_num;</div><div class='ctx'> 	u64 nonce;</div><div class='ctx'> </div><div class='ctx'> 	if (ifp-&gt;flags &amp; IFA_F_OPTIMISTIC)</div><div class='ctx'> 		rand_num = 0;</div><div class='ctx'> 	else</div><div class='del'>-		rand_num = prandom_u32() % (idev-&gt;cnf.rtr_solicit_delay ? : 1);</div><div class='add'>+		rand_num = get_random_u32_below(</div><div class='add'>+				READ_ONCE(idev-&gt;cnf.rtr_solicit_delay) ? : 1);</div><div class='ctx'> </div><div class='ctx'> 	nonce = 0;</div><div class='del'>-	if (idev-&gt;cnf.enhanced_dad ||</div><div class='del'>-	    dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;enhanced_dad) {</div><div class='add'>+	if (READ_ONCE(idev-&gt;cnf.enhanced_dad) ||</div><div class='add'>+	    READ_ONCE(dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;enhanced_dad)) {</div><div class='ctx'> 		do</div><div class='ctx'> 			get_random_bytes(&amp;nonce, 6);</div><div class='ctx'> 		while (nonce == 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	ifp-&gt;dad_nonce = nonce;</div><div class='del'>-	ifp-&gt;dad_probes = idev-&gt;cnf.dad_transmits;</div><div class='add'>+	ifp-&gt;dad_probes = READ_ONCE(idev-&gt;cnf.dad_transmits);</div><div class='ctx'> 	addrconf_mod_dad_work(ifp, rand_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3878,8 +4098,6 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> 	addrconf_join_solict(dev, &amp;ifp-&gt;addr);</div><div class='ctx'> </div><div class='del'>-	prandom_seed((__force u32) ifp-&gt;addr.s6_addr32[3]);</div><div class='del'>-</div><div class='ctx'> 	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	spin_lock(&amp;ifp-&gt;lock);</div><div class='ctx'> 	if (ifp-&gt;state == INET6_IFADDR_STATE_DEAD)</div><div class='hunk'>@@ -3887,8 +4105,8 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> 	net = dev_net(dev);</div><div class='ctx'> 	if (dev-&gt;flags&amp;(IFF_NOARP|IFF_LOOPBACK) ||</div><div class='del'>-	    (net-&gt;ipv6.devconf_all-&gt;accept_dad &lt; 1 &amp;&amp;</div><div class='del'>-	     idev-&gt;cnf.accept_dad &lt; 1) ||</div><div class='add'>+	    (READ_ONCE(net-&gt;ipv6.devconf_all-&gt;accept_dad) &lt; 1 &amp;&amp;</div><div class='add'>+	     READ_ONCE(idev-&gt;cnf.accept_dad) &lt; 1) ||</div><div class='ctx'> 	    !(ifp-&gt;flags&amp;IFA_F_TENTATIVE) ||</div><div class='ctx'> 	    ifp-&gt;flags &amp; IFA_F_NODAD) {</div><div class='ctx'> 		bool send_na = false;</div><div class='hunk'>@@ -3963,6 +4181,7 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 	struct inet6_dev *idev = ifp-&gt;idev;</div><div class='ctx'> 	bool bump_id, disable_ipv6 = false;</div><div class='ctx'> 	struct in6_addr mcaddr;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	enum {</div><div class='ctx'> 		DAD_PROCESS,</div><div class='hunk'>@@ -3970,7 +4189,9 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 		DAD_ABORT,</div><div class='ctx'> 	} action = DAD_PROCESS;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	net = dev_net(idev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ifp-&gt;lock);</div><div class='ctx'> 	if (ifp-&gt;state == INET6_IFADDR_STATE_PREDAD) {</div><div class='hunk'>@@ -3980,8 +4201,8 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 		action = DAD_ABORT;</div><div class='ctx'> 		ifp-&gt;state = INET6_IFADDR_STATE_POSTDAD;</div><div class='ctx'> </div><div class='del'>-		if ((dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;accept_dad &gt; 1 ||</div><div class='del'>-		     idev-&gt;cnf.accept_dad &gt; 1) &amp;&amp;</div><div class='add'>+		if ((READ_ONCE(net-&gt;ipv6.devconf_all-&gt;accept_dad) &gt; 1 ||</div><div class='add'>+		     READ_ONCE(idev-&gt;cnf.accept_dad) &gt; 1) &amp;&amp;</div><div class='ctx'> 		    !idev-&gt;cnf.disable_ipv6 &amp;&amp;</div><div class='ctx'> 		    !(ifp-&gt;flags &amp; IFA_F_STABLE_PRIVACY)) {</div><div class='ctx'> 			struct in6_addr addr;</div><div class='hunk'>@@ -3992,7 +4213,7 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 			if (!ipv6_generate_eui64(addr.s6_addr + 8, idev-&gt;dev) &amp;&amp;</div><div class='ctx'> 			    ipv6_addr_equal(&amp;ifp-&gt;addr, &amp;addr)) {</div><div class='ctx'> 				/* DAD failed for link-local based on MAC */</div><div class='del'>-				idev-&gt;cnf.disable_ipv6 = 1;</div><div class='add'>+				WRITE_ONCE(idev-&gt;cnf.disable_ipv6, 1);</div><div class='ctx'> </div><div class='ctx'> 				pr_info("%s: IPv6 being disabled!\n",</div><div class='ctx'> 					ifp-&gt;idev-&gt;dev-&gt;name);</div><div class='hunk'>@@ -4009,7 +4230,7 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 		in6_ifa_hold(ifp);</div><div class='ctx'> 		addrconf_dad_stop(ifp, 1);</div><div class='ctx'> 		if (disable_ipv6)</div><div class='del'>-			addrconf_ifdown(idev-&gt;dev, 0);</div><div class='add'>+			addrconf_ifdown(idev-&gt;dev, false);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4051,7 +4272,8 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> </div><div class='ctx'> 	ifp-&gt;dad_probes--;</div><div class='ctx'> 	addrconf_mod_dad_work(ifp,</div><div class='del'>-			      NEIGH_VAR(ifp-&gt;idev-&gt;nd_parms, RETRANS_TIME));</div><div class='add'>+			      max(NEIGH_VAR(ifp-&gt;idev-&gt;nd_parms, RETRANS_TIME),</div><div class='add'>+				  HZ/100));</div><div class='ctx'> 	spin_unlock(&amp;ifp-&gt;lock);</div><div class='ctx'> 	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -4061,7 +4283,7 @@ static void addrconf_dad_work(struct work_struct *w)</div><div class='ctx'> 		      ifp-&gt;dad_nonce);</div><div class='ctx'> out:</div><div class='ctx'> 	in6_ifa_put(ifp);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ifp-&gt;idev must be at least read locked */</div><div class='hunk'>@@ -4105,8 +4327,10 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id,</div><div class='ctx'> 	send_mld = ifp-&gt;scope == IFA_LINK &amp;&amp; ipv6_lonely_lladdr(ifp);</div><div class='ctx'> 	send_rs = send_mld &amp;&amp;</div><div class='ctx'> 		  ipv6_accept_ra(ifp-&gt;idev) &amp;&amp;</div><div class='del'>-		  ifp-&gt;idev-&gt;cnf.rtr_solicits != 0 &amp;&amp;</div><div class='del'>-		  (dev-&gt;flags&amp;IFF_LOOPBACK) == 0;</div><div class='add'>+		  READ_ONCE(ifp-&gt;idev-&gt;cnf.rtr_solicits) != 0 &amp;&amp;</div><div class='add'>+		  (dev-&gt;flags &amp; IFF_LOOPBACK) == 0 &amp;&amp;</div><div class='add'>+		  (dev-&gt;type != ARPHRD_TUNNEL) &amp;&amp;</div><div class='add'>+		  !netif_is_team_port(dev);</div><div class='ctx'> 	read_unlock_bh(&amp;ifp-&gt;idev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* While dad is in progress mld report's source address is in6_addrany.</div><div class='hunk'>@@ -4117,8 +4341,8 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id,</div><div class='ctx'> </div><div class='ctx'> 	/* send unsolicited NA if enabled */</div><div class='ctx'> 	if (send_na &amp;&amp;</div><div class='del'>-	    (ifp-&gt;idev-&gt;cnf.ndisc_notify ||</div><div class='del'>-	     dev_net(dev)-&gt;ipv6.devconf_all-&gt;ndisc_notify)) {</div><div class='add'>+	    (READ_ONCE(ifp-&gt;idev-&gt;cnf.ndisc_notify) ||</div><div class='add'>+	     READ_ONCE(dev_net(dev)-&gt;ipv6.devconf_all-&gt;ndisc_notify))) {</div><div class='ctx'> 		ndisc_send_na(dev, &amp;in6addr_linklocal_allnodes, &amp;ifp-&gt;addr,</div><div class='ctx'> 			      /*router=*/ !!ifp-&gt;idev-&gt;cnf.forwarding,</div><div class='ctx'> 			      /*solicited=*/ false, /*override=*/ true,</div><div class='hunk'>@@ -4138,7 +4362,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id,</div><div class='ctx'> 		write_lock_bh(&amp;ifp-&gt;idev-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;ifp-&gt;lock);</div><div class='ctx'> 		ifp-&gt;idev-&gt;rs_interval = rfc3315_s14_backoff_init(</div><div class='del'>-			ifp-&gt;idev-&gt;cnf.rtr_solicit_interval);</div><div class='add'>+			READ_ONCE(ifp-&gt;idev-&gt;cnf.rtr_solicit_interval));</div><div class='ctx'> 		ifp-&gt;idev-&gt;rs_probes = 1;</div><div class='ctx'> 		ifp-&gt;idev-&gt;if_flags |= IF_RS_SENT;</div><div class='ctx'> 		addrconf_mod_rs_timer(ifp-&gt;idev, ifp-&gt;idev-&gt;rs_interval);</div><div class='hunk'>@@ -4153,19 +4377,22 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id,</div><div class='ctx'> 	 * before this temporary address becomes deprecated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ifp-&gt;flags &amp; IFA_F_TEMPORARY)</div><div class='del'>-		addrconf_verify_rtnl();</div><div class='add'>+		addrconf_verify_rtnl(dev_net(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void addrconf_dad_run(struct inet6_dev *idev)</div><div class='add'>+static void addrconf_dad_run(struct inet6_dev *idev, bool restart)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(ifp, &amp;idev-&gt;addr_list, if_list) {</div><div class='ctx'> 		spin_lock(&amp;ifp-&gt;lock);</div><div class='del'>-		if (ifp-&gt;flags &amp; IFA_F_TENTATIVE &amp;&amp;</div><div class='del'>-		    ifp-&gt;state == INET6_IFADDR_STATE_DAD)</div><div class='add'>+		if ((ifp-&gt;flags &amp; IFA_F_TENTATIVE &amp;&amp;</div><div class='add'>+		     ifp-&gt;state == INET6_IFADDR_STATE_DAD) || restart) {</div><div class='add'>+			if (restart)</div><div class='add'>+				ifp-&gt;state = INET6_IFADDR_STATE_PREDAD;</div><div class='ctx'> 			addrconf_dad_kick(ifp);</div><div class='add'>+		}</div><div class='ctx'> 		spin_unlock(&amp;ifp-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='hunk'>@@ -4192,10 +4419,8 @@ static struct inet6_ifaddr *if6_get_first(struct seq_file *seq, loff_t pos)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (; state-&gt;bucket &lt; IN6_ADDR_HSIZE; ++state-&gt;bucket) {</div><div class='del'>-		hlist_for_each_entry_rcu(ifa, &amp;inet6_addr_lst[state-&gt;bucket],</div><div class='add'>+		hlist_for_each_entry_rcu(ifa, &amp;net-&gt;ipv6.inet6_addr_lst[state-&gt;bucket],</div><div class='ctx'> 					 addr_lst) {</div><div class='del'>-			if (!net_eq(dev_net(ifa-&gt;idev-&gt;dev), net))</div><div class='del'>-				continue;</div><div class='ctx'> 			/* sync with offset */</div><div class='ctx'> 			if (p &lt; state-&gt;offset) {</div><div class='ctx'> 				p++;</div><div class='hunk'>@@ -4218,8 +4443,6 @@ static struct inet6_ifaddr *if6_get_next(struct seq_file *seq,</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_continue_rcu(ifa, addr_lst) {</div><div class='del'>-		if (!net_eq(dev_net(ifa-&gt;idev-&gt;dev), net))</div><div class='del'>-			continue;</div><div class='ctx'> 		state-&gt;offset++;</div><div class='ctx'> 		return ifa;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4227,9 +4450,7 @@ static struct inet6_ifaddr *if6_get_next(struct seq_file *seq,</div><div class='ctx'> 	state-&gt;offset = 0;</div><div class='ctx'> 	while (++state-&gt;bucket &lt; IN6_ADDR_HSIZE) {</div><div class='ctx'> 		hlist_for_each_entry_rcu(ifa,</div><div class='del'>-				     &amp;inet6_addr_lst[state-&gt;bucket], addr_lst) {</div><div class='del'>-			if (!net_eq(dev_net(ifa-&gt;idev-&gt;dev), net))</div><div class='del'>-				continue;</div><div class='add'>+				     &amp;net-&gt;ipv6.inet6_addr_lst[state-&gt;bucket], addr_lst) {</div><div class='ctx'> 			return ifa;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4317,9 +4538,7 @@ int ipv6_chk_home_addr(struct net *net, const struct in6_addr *addr)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(ifp, &amp;inet6_addr_lst[hash], addr_lst) {</div><div class='del'>-		if (!net_eq(dev_net(ifp-&gt;idev-&gt;dev), net))</div><div class='del'>-			continue;</div><div class='add'>+	hlist_for_each_entry_rcu(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[hash], addr_lst) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ifp-&gt;addr, addr) &amp;&amp;</div><div class='ctx'> 		    (ifp-&gt;flags &amp; IFA_F_HOMEADDRESS)) {</div><div class='ctx'> 			ret = 1;</div><div class='hunk'>@@ -4331,11 +4550,62 @@ int ipv6_chk_home_addr(struct net *net, const struct in6_addr *addr)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* RFC6554 has some algorithm to avoid loops in segment routing by</div><div class='add'>+ * checking if the segments contains any of a local interface address.</div><div class='add'>+ *</div><div class='add'>+ * Quote:</div><div class='add'>+ *</div><div class='add'>+ * To detect loops in the SRH, a router MUST determine if the SRH</div><div class='add'>+ * includes multiple addresses assigned to any interface on that router.</div><div class='add'>+ * If such addresses appear more than once and are separated by at least</div><div class='add'>+ * one address not assigned to that router.</div><div class='add'>+ */</div><div class='add'>+int ipv6_chk_rpl_srh_loop(struct net *net, const struct in6_addr *segs,</div><div class='add'>+			  unsigned char nsegs)</div><div class='add'>+{</div><div class='add'>+	const struct in6_addr *addr;</div><div class='add'>+	int i, ret = 0, found = 0;</div><div class='add'>+	struct inet6_ifaddr *ifp;</div><div class='add'>+	bool separated = false;</div><div class='add'>+	unsigned int hash;</div><div class='add'>+	bool hash_found;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; nsegs; i++) {</div><div class='add'>+		addr = &amp;segs[i];</div><div class='add'>+		hash = inet6_addr_hash(net, addr);</div><div class='add'>+</div><div class='add'>+		hash_found = false;</div><div class='add'>+		hlist_for_each_entry_rcu(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[hash], addr_lst) {</div><div class='add'>+</div><div class='add'>+			if (ipv6_addr_equal(&amp;ifp-&gt;addr, addr)) {</div><div class='add'>+				hash_found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hash_found) {</div><div class='add'>+			if (found &gt; 1 &amp;&amp; separated) {</div><div class='add'>+				ret = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			separated = false;</div><div class='add'>+			found++;</div><div class='add'>+		} else {</div><div class='add'>+			separated = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Periodic address status verification</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void addrconf_verify_rtnl(void)</div><div class='add'>+static void addrconf_verify_rtnl(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now, next, next_sec, next_sched;</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='hunk'>@@ -4347,11 +4617,11 @@ static void addrconf_verify_rtnl(void)</div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	next = round_jiffies_up(now + ADDR_CHECK_FREQUENCY);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;addr_chk_work);</div><div class='add'>+	cancel_delayed_work(&amp;net-&gt;ipv6.addr_chk_work);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++) {</div><div class='ctx'> restart:</div><div class='del'>-		hlist_for_each_entry_rcu_bh(ifp, &amp;inet6_addr_lst[i], addr_lst) {</div><div class='add'>+		hlist_for_each_entry_rcu_bh(ifp, &amp;net-&gt;ipv6.inet6_addr_lst[i], addr_lst) {</div><div class='ctx'> 			unsigned long age;</div><div class='ctx'> </div><div class='ctx'> 			/* When setting preferred_lft to a value not zero or</div><div class='hunk'>@@ -4366,11 +4636,44 @@ restart:</div><div class='ctx'> 			/* We try to batch several events at once. */</div><div class='ctx'> 			age = (now - ifp-&gt;tstamp + ADDRCONF_TIMER_FUZZ_MINUS) / HZ;</div><div class='ctx'> </div><div class='add'>+			if ((ifp-&gt;flags&amp;IFA_F_TEMPORARY) &amp;&amp;</div><div class='add'>+			    !(ifp-&gt;flags&amp;IFA_F_TENTATIVE) &amp;&amp;</div><div class='add'>+			    ifp-&gt;prefered_lft != INFINITY_LIFE_TIME &amp;&amp;</div><div class='add'>+			    !ifp-&gt;regen_count &amp;&amp; ifp-&gt;ifpub) {</div><div class='add'>+				/* This is a non-regenerated temporary addr. */</div><div class='add'>+</div><div class='add'>+				unsigned long regen_advance = ipv6_get_regen_advance(ifp-&gt;idev);</div><div class='add'>+</div><div class='add'>+				if (age + regen_advance &gt;= ifp-&gt;prefered_lft) {</div><div class='add'>+					struct inet6_ifaddr *ifpub = ifp-&gt;ifpub;</div><div class='add'>+					if (time_before(ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ, next))</div><div class='add'>+						next = ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ;</div><div class='add'>+</div><div class='add'>+					ifp-&gt;regen_count++;</div><div class='add'>+					in6_ifa_hold(ifp);</div><div class='add'>+					in6_ifa_hold(ifpub);</div><div class='add'>+					spin_unlock(&amp;ifp-&gt;lock);</div><div class='add'>+</div><div class='add'>+					spin_lock(&amp;ifpub-&gt;lock);</div><div class='add'>+					ifpub-&gt;regen_count = 0;</div><div class='add'>+					spin_unlock(&amp;ifpub-&gt;lock);</div><div class='add'>+					rcu_read_unlock_bh();</div><div class='add'>+					ipv6_create_tempaddr(ifpub, true);</div><div class='add'>+					in6_ifa_put(ifpub);</div><div class='add'>+					in6_ifa_put(ifp);</div><div class='add'>+					rcu_read_lock_bh();</div><div class='add'>+					goto restart;</div><div class='add'>+				} else if (time_before(ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ - regen_advance * HZ, next))</div><div class='add'>+					next = ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ - regen_advance * HZ;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (ifp-&gt;valid_lft != INFINITY_LIFE_TIME &amp;&amp;</div><div class='ctx'> 			    age &gt;= ifp-&gt;valid_lft) {</div><div class='ctx'> 				spin_unlock(&amp;ifp-&gt;lock);</div><div class='ctx'> 				in6_ifa_hold(ifp);</div><div class='add'>+				rcu_read_unlock_bh();</div><div class='ctx'> 				ipv6_del_addr(ifp);</div><div class='add'>+				rcu_read_lock_bh();</div><div class='ctx'> 				goto restart;</div><div class='ctx'> 			} else if (ifp-&gt;prefered_lft == INFINITY_LIFE_TIME) {</div><div class='ctx'> 				spin_unlock(&amp;ifp-&gt;lock);</div><div class='hunk'>@@ -4397,35 +4700,6 @@ restart:</div><div class='ctx'> 					in6_ifa_put(ifp);</div><div class='ctx'> 					goto restart;</div><div class='ctx'> 				}</div><div class='del'>-			} else if ((ifp-&gt;flags&amp;IFA_F_TEMPORARY) &amp;&amp;</div><div class='del'>-				   !(ifp-&gt;flags&amp;IFA_F_TENTATIVE)) {</div><div class='del'>-				unsigned long regen_advance = ifp-&gt;idev-&gt;cnf.regen_max_retry *</div><div class='del'>-					ifp-&gt;idev-&gt;cnf.dad_transmits *</div><div class='del'>-					NEIGH_VAR(ifp-&gt;idev-&gt;nd_parms, RETRANS_TIME) / HZ;</div><div class='del'>-</div><div class='del'>-				if (age &gt;= ifp-&gt;prefered_lft - regen_advance) {</div><div class='del'>-					struct inet6_ifaddr *ifpub = ifp-&gt;ifpub;</div><div class='del'>-					if (time_before(ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ, next))</div><div class='del'>-						next = ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ;</div><div class='del'>-					if (!ifp-&gt;regen_count &amp;&amp; ifpub) {</div><div class='del'>-						ifp-&gt;regen_count++;</div><div class='del'>-						in6_ifa_hold(ifp);</div><div class='del'>-						in6_ifa_hold(ifpub);</div><div class='del'>-						spin_unlock(&amp;ifp-&gt;lock);</div><div class='del'>-</div><div class='del'>-						spin_lock(&amp;ifpub-&gt;lock);</div><div class='del'>-						ifpub-&gt;regen_count = 0;</div><div class='del'>-						spin_unlock(&amp;ifpub-&gt;lock);</div><div class='del'>-						rcu_read_unlock_bh();</div><div class='del'>-						ipv6_create_tempaddr(ifpub, ifp, true);</div><div class='del'>-						in6_ifa_put(ifpub);</div><div class='del'>-						in6_ifa_put(ifp);</div><div class='del'>-						rcu_read_lock_bh();</div><div class='del'>-						goto restart;</div><div class='del'>-					}</div><div class='del'>-				} else if (time_before(ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ - regen_advance * HZ, next))</div><div class='del'>-					next = ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ - regen_advance * HZ;</div><div class='del'>-				spin_unlock(&amp;ifp-&gt;lock);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* ifp-&gt;prefered_lft &lt;= ifp-&gt;valid_lft */</div><div class='ctx'> 				if (time_before(ifp-&gt;tstamp + ifp-&gt;prefered_lft * HZ, next))</div><div class='hunk'>@@ -4448,20 +4722,23 @@ restart:</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("now = %lu, schedule = %lu, rounded schedule = %lu =&gt; %lu\n",</div><div class='ctx'> 		 now, next, next_sec, next_sched);</div><div class='del'>-	mod_delayed_work(addrconf_wq, &amp;addr_chk_work, next_sched - now);</div><div class='add'>+	mod_delayed_work(addrconf_wq, &amp;net-&gt;ipv6.addr_chk_work, next_sched - now);</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void addrconf_verify_work(struct work_struct *w)</div><div class='ctx'> {</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	addrconf_verify_rtnl();</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	struct net *net = container_of(to_delayed_work(w), struct net,</div><div class='add'>+				       ipv6.addr_chk_work);</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+	addrconf_verify_rtnl(net);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void addrconf_verify(void)</div><div class='add'>+static void addrconf_verify(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	mod_delayed_work(addrconf_wq, &amp;addr_chk_work, 0);</div><div class='add'>+	mod_delayed_work(addrconf_wq, &amp;net-&gt;ipv6.addr_chk_work, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct in6_addr *extract_addr(struct nlattr *addr, struct nlattr *local,</div><div class='hunk'>@@ -4489,6 +4766,8 @@ static const struct nla_policy ifa_ipv6_policy[IFA_MAX+1] = {</div><div class='ctx'> 	[IFA_CACHEINFO]		= { .len = sizeof(struct ifa_cacheinfo) },</div><div class='ctx'> 	[IFA_FLAGS]		= { .len = sizeof(u32) },</div><div class='ctx'> 	[IFA_RT_PRIORITY]	= { .len = sizeof(u32) },</div><div class='add'>+	[IFA_TARGET_NETNSID]	= { .type = NLA_S32 },</div><div class='add'>+	[IFA_PROTO]		= { .type = NLA_U8 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -4502,8 +4781,8 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 ifa_flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+				     ifa_ipv6_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4512,61 +4791,73 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!pfx)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ifa_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) : ifm-&gt;ifa_flags;</div><div class='add'>+	ifa_flags = nla_get_u32_default(tb[IFA_FLAGS], ifm-&gt;ifa_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* We ignore other flags so far. */</div><div class='ctx'> 	ifa_flags &amp;= IFA_F_MANAGETEMPADDR;</div><div class='ctx'> </div><div class='del'>-	return inet6_addr_del(net, ifm-&gt;ifa_index, ifa_flags, pfx,</div><div class='del'>-			      ifm-&gt;ifa_prefixlen);</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+	err = inet6_addr_del(net, ifm-&gt;ifa_index, ifa_flags, pfx,</div><div class='add'>+			     ifm-&gt;ifa_prefixlen, extack);</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int modify_prefix_route(struct inet6_ifaddr *ifp,</div><div class='del'>-			       unsigned long expires, u32 flags)</div><div class='add'>+static int modify_prefix_route(struct net *net, struct inet6_ifaddr *ifp,</div><div class='add'>+			       unsigned long expires, u32 flags,</div><div class='add'>+			       bool modify_peer)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_table *table;</div><div class='ctx'> 	struct fib6_info *f6i;</div><div class='ctx'> 	u32 prio;</div><div class='ctx'> </div><div class='del'>-	f6i = addrconf_get_prefix_route(&amp;ifp-&gt;addr,</div><div class='add'>+	f6i = addrconf_get_prefix_route(modify_peer ? &amp;ifp-&gt;peer_addr : &amp;ifp-&gt;addr,</div><div class='ctx'> 					ifp-&gt;prefix_len,</div><div class='del'>-					ifp-&gt;idev-&gt;dev,</div><div class='del'>-					0, RTF_GATEWAY | RTF_DEFAULT);</div><div class='add'>+					ifp-&gt;idev-&gt;dev, 0, RTF_DEFAULT, true);</div><div class='ctx'> 	if (!f6i)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	prio = ifp-&gt;rt_priority ? : IP6_RT_PRIO_ADDRCONF;</div><div class='ctx'> 	if (f6i-&gt;fib6_metric != prio) {</div><div class='ctx'> 		/* delete old one */</div><div class='del'>-		ip6_del_rt(dev_net(ifp-&gt;idev-&gt;dev), f6i);</div><div class='add'>+		ip6_del_rt(dev_net(ifp-&gt;idev-&gt;dev), f6i, false);</div><div class='ctx'> </div><div class='ctx'> 		/* add new one */</div><div class='del'>-		addrconf_prefix_route(&amp;ifp-&gt;addr, ifp-&gt;prefix_len,</div><div class='add'>+		addrconf_prefix_route(modify_peer ? &amp;ifp-&gt;peer_addr : &amp;ifp-&gt;addr,</div><div class='add'>+				      ifp-&gt;prefix_len,</div><div class='ctx'> 				      ifp-&gt;rt_priority, ifp-&gt;idev-&gt;dev,</div><div class='ctx'> 				      expires, flags, GFP_KERNEL);</div><div class='del'>-	} else {</div><div class='del'>-		if (!expires)</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (f6i != net-&gt;ipv6.fib6_null_entry) {</div><div class='add'>+		table = f6i-&gt;fib6_table;</div><div class='add'>+		spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='add'>+		if (!(flags &amp; RTF_EXPIRES)) {</div><div class='ctx'> 			fib6_clean_expires(f6i);</div><div class='del'>-		else</div><div class='add'>+			fib6_remove_gc_list(f6i);</div><div class='add'>+		} else {</div><div class='ctx'> 			fib6_set_expires(f6i, expires);</div><div class='add'>+			fib6_add_gc_list(f6i);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		fib6_info_release(f6i);</div><div class='add'>+		spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 	}</div><div class='add'>+	fib6_info_release(f6i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='add'>+static int inet6_addr_modify(struct net *net, struct inet6_ifaddr *ifp,</div><div class='add'>+			     struct ifa6_config *cfg, clock_t expires,</div><div class='add'>+			     u32 flags)</div><div class='ctx'> {</div><div class='del'>-	u32 flags;</div><div class='del'>-	clock_t expires;</div><div class='del'>-	unsigned long timeout;</div><div class='ctx'> 	bool was_managetempaddr;</div><div class='add'>+	bool new_peer = false;</div><div class='ctx'> 	bool had_prefixroute;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;valid_lft || cfg-&gt;preferred_lft &gt; cfg-&gt;valid_lft)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ASSERT_RTNL_NET(net);</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;ifa_flags &amp; IFA_F_MANAGETEMPADDR &amp;&amp;</div><div class='ctx'> 	    (ifp-&gt;flags &amp; IFA_F_TEMPORARY || ifp-&gt;prefix_len != 64))</div><div class='hunk'>@@ -4575,22 +4866,11 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='ctx'> 	if (!(ifp-&gt;flags &amp; IFA_F_TENTATIVE) || ifp-&gt;flags &amp; IFA_F_DADFAILED)</div><div class='ctx'> 		cfg-&gt;ifa_flags &amp;= ~IFA_F_OPTIMISTIC;</div><div class='ctx'> </div><div class='del'>-	timeout = addrconf_timeout_fixup(cfg-&gt;valid_lft, HZ);</div><div class='del'>-	if (addrconf_finite_timeout(timeout)) {</div><div class='del'>-		expires = jiffies_to_clock_t(timeout * HZ);</div><div class='del'>-		cfg-&gt;valid_lft = timeout;</div><div class='del'>-		flags = RTF_EXPIRES;</div><div class='del'>-	} else {</div><div class='del'>-		expires = 0;</div><div class='del'>-		flags = 0;</div><div class='del'>-		cfg-&gt;ifa_flags |= IFA_F_PERMANENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeout = addrconf_timeout_fixup(cfg-&gt;preferred_lft, HZ);</div><div class='del'>-	if (addrconf_finite_timeout(timeout)) {</div><div class='del'>-		if (timeout == 0)</div><div class='del'>-			cfg-&gt;ifa_flags |= IFA_F_DEPRECATED;</div><div class='del'>-		cfg-&gt;preferred_lft = timeout;</div><div class='add'>+	if (cfg-&gt;peer_pfx &amp;&amp;</div><div class='add'>+	    memcmp(&amp;ifp-&gt;peer_addr, cfg-&gt;peer_pfx, sizeof(struct in6_addr))) {</div><div class='add'>+		if (!ipv6_addr_any(&amp;ifp-&gt;peer_addr))</div><div class='add'>+			cleanup_prefix_route(ifp, expires, true, true);</div><div class='add'>+		new_peer = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ifp-&gt;lock);</div><div class='hunk'>@@ -4601,12 +4881,16 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='ctx'> 			IFA_F_HOMEADDRESS | IFA_F_MANAGETEMPADDR |</div><div class='ctx'> 			IFA_F_NOPREFIXROUTE);</div><div class='ctx'> 	ifp-&gt;flags |= cfg-&gt;ifa_flags;</div><div class='del'>-	ifp-&gt;tstamp = jiffies;</div><div class='del'>-	ifp-&gt;valid_lft = cfg-&gt;valid_lft;</div><div class='del'>-	ifp-&gt;prefered_lft = cfg-&gt;preferred_lft;</div><div class='add'>+	WRITE_ONCE(ifp-&gt;tstamp, jiffies);</div><div class='add'>+	WRITE_ONCE(ifp-&gt;valid_lft, cfg-&gt;valid_lft);</div><div class='add'>+	WRITE_ONCE(ifp-&gt;prefered_lft, cfg-&gt;preferred_lft);</div><div class='add'>+	WRITE_ONCE(ifp-&gt;ifa_proto, cfg-&gt;ifa_proto);</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;rt_priority &amp;&amp; cfg-&gt;rt_priority != ifp-&gt;rt_priority)</div><div class='del'>-		ifp-&gt;rt_priority = cfg-&gt;rt_priority;</div><div class='add'>+		WRITE_ONCE(ifp-&gt;rt_priority, cfg-&gt;rt_priority);</div><div class='add'>+</div><div class='add'>+	if (new_peer)</div><div class='add'>+		ifp-&gt;peer_addr = *cfg-&gt;peer_pfx;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ifp-&gt;lock);</div><div class='ctx'> 	if (!(ifp-&gt;flags&amp;IFA_F_TENTATIVE))</div><div class='hunk'>@@ -4616,7 +4900,7 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='ctx'> 		int rc = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 		if (had_prefixroute)</div><div class='del'>-			rc = modify_prefix_route(ifp, expires, flags);</div><div class='add'>+			rc = modify_prefix_route(net, ifp, expires, flags, false);</div><div class='ctx'> </div><div class='ctx'> 		/* prefix route could have been deleted; if so restore it */</div><div class='ctx'> 		if (rc == -ENOENT) {</div><div class='hunk'>@@ -4624,6 +4908,15 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='ctx'> 					      ifp-&gt;rt_priority, ifp-&gt;idev-&gt;dev,</div><div class='ctx'> 					      expires, flags, GFP_KERNEL);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (had_prefixroute &amp;&amp; !ipv6_addr_any(&amp;ifp-&gt;peer_addr))</div><div class='add'>+			rc = modify_prefix_route(net, ifp, expires, flags, true);</div><div class='add'>+</div><div class='add'>+		if (rc == -ENOENT &amp;&amp; !ipv6_addr_any(&amp;ifp-&gt;peer_addr)) {</div><div class='add'>+			addrconf_prefix_route(&amp;ifp-&gt;peer_addr, ifp-&gt;prefix_len,</div><div class='add'>+					      ifp-&gt;rt_priority, ifp-&gt;idev-&gt;dev,</div><div class='add'>+					      expires, flags, GFP_KERNEL);</div><div class='add'>+		}</div><div class='ctx'> 	} else if (had_prefixroute) {</div><div class='ctx'> 		enum cleanup_prefix_rt_t action;</div><div class='ctx'> 		unsigned long rt_expires;</div><div class='hunk'>@@ -4634,22 +4927,20 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, struct ifa6_config *cfg)</div><div class='ctx'> </div><div class='ctx'> 		if (action != CLEANUP_PREFIX_RT_NOP) {</div><div class='ctx'> 			cleanup_prefix_route(ifp, rt_expires,</div><div class='del'>-				action == CLEANUP_PREFIX_RT_DEL);</div><div class='add'>+				action == CLEANUP_PREFIX_RT_DEL, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (was_managetempaddr || ifp-&gt;flags &amp; IFA_F_MANAGETEMPADDR) {</div><div class='del'>-		if (was_managetempaddr &amp;&amp;</div><div class='del'>-		    !(ifp-&gt;flags &amp; IFA_F_MANAGETEMPADDR)) {</div><div class='del'>-			cfg-&gt;valid_lft = 0;</div><div class='del'>-			cfg-&gt;preferred_lft = 0;</div><div class='del'>-		}</div><div class='del'>-		manage_tempaddrs(ifp-&gt;idev, ifp, cfg-&gt;valid_lft,</div><div class='del'>-				 cfg-&gt;preferred_lft, !was_managetempaddr,</div><div class='del'>-				 jiffies);</div><div class='add'>+		if (was_managetempaddr &amp;&amp; !(ifp-&gt;flags &amp; IFA_F_MANAGETEMPADDR))</div><div class='add'>+			delete_tempaddrs(ifp-&gt;idev, ifp);</div><div class='add'>+		else</div><div class='add'>+			manage_tempaddrs(ifp-&gt;idev, ifp, cfg-&gt;valid_lft,</div><div class='add'>+					 cfg-&gt;preferred_lft, !was_managetempaddr,</div><div class='add'>+					 jiffies);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addrconf_verify_rtnl();</div><div class='add'>+	addrconf_verify_rtnl(net);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4659,17 +4950,20 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct ifaddrmsg *ifm;</div><div class='ctx'> 	struct nlattr *tb[IFA_MAX+1];</div><div class='ctx'> 	struct in6_addr *peer_pfx;</div><div class='ctx'> 	struct inet6_ifaddr *ifa;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	struct ifa6_config cfg;</div><div class='add'>+	struct ifaddrmsg *ifm;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	clock_t expires;</div><div class='add'>+	u32 flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+				     ifa_ipv6_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4685,8 +4979,21 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (tb[IFA_RT_PRIORITY])</div><div class='ctx'> 		cfg.rt_priority = nla_get_u32(tb[IFA_RT_PRIORITY]);</div><div class='ctx'> </div><div class='add'>+	if (tb[IFA_PROTO])</div><div class='add'>+		cfg.ifa_proto = nla_get_u8(tb[IFA_PROTO]);</div><div class='add'>+</div><div class='add'>+	cfg.ifa_flags = nla_get_u32_default(tb[IFA_FLAGS], ifm-&gt;ifa_flags);</div><div class='add'>+</div><div class='add'>+	/* We ignore other flags so far. */</div><div class='add'>+	cfg.ifa_flags &amp;= IFA_F_NODAD | IFA_F_HOMEADDRESS |</div><div class='add'>+			 IFA_F_MANAGETEMPADDR | IFA_F_NOPREFIXROUTE |</div><div class='add'>+			 IFA_F_MCAUTOJOIN | IFA_F_OPTIMISTIC;</div><div class='add'>+</div><div class='add'>+	cfg.ifa_flags |= IFA_F_PERMANENT;</div><div class='ctx'> 	cfg.valid_lft = INFINITY_LIFE_TIME;</div><div class='ctx'> 	cfg.preferred_lft = INFINITY_LIFE_TIME;</div><div class='add'>+	expires = 0;</div><div class='add'>+	flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFA_CACHEINFO]) {</div><div class='ctx'> 		struct ifa_cacheinfo *ci;</div><div class='hunk'>@@ -4694,25 +5001,44 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		ci = nla_data(tb[IFA_CACHEINFO]);</div><div class='ctx'> 		cfg.valid_lft = ci-&gt;ifa_valid;</div><div class='ctx'> 		cfg.preferred_lft = ci-&gt;ifa_prefered;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	dev =  __dev_get_by_index(net, ifm-&gt;ifa_index);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		if (!cfg.valid_lft || cfg.preferred_lft &gt; cfg.valid_lft) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "address lifetime invalid");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (tb[IFA_FLAGS])</div><div class='del'>-		cfg.ifa_flags = nla_get_u32(tb[IFA_FLAGS]);</div><div class='del'>-	else</div><div class='del'>-		cfg.ifa_flags = ifm-&gt;ifa_flags;</div><div class='add'>+		timeout = addrconf_timeout_fixup(cfg.valid_lft, HZ);</div><div class='add'>+		if (addrconf_finite_timeout(timeout)) {</div><div class='add'>+			cfg.ifa_flags &amp;= ~IFA_F_PERMANENT;</div><div class='add'>+			cfg.valid_lft = timeout;</div><div class='add'>+			expires = jiffies_to_clock_t(timeout * HZ);</div><div class='add'>+			flags = RTF_EXPIRES;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* We ignore other flags so far. */</div><div class='del'>-	cfg.ifa_flags &amp;= IFA_F_NODAD | IFA_F_HOMEADDRESS |</div><div class='del'>-			 IFA_F_MANAGETEMPADDR | IFA_F_NOPREFIXROUTE |</div><div class='del'>-			 IFA_F_MCAUTOJOIN | IFA_F_OPTIMISTIC;</div><div class='add'>+		timeout = addrconf_timeout_fixup(cfg.preferred_lft, HZ);</div><div class='add'>+		if (addrconf_finite_timeout(timeout)) {</div><div class='add'>+			if (timeout == 0)</div><div class='add'>+				cfg.ifa_flags |= IFA_F_DEPRECATED;</div><div class='ctx'> </div><div class='add'>+			cfg.preferred_lft = timeout;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(net);</div><div class='add'>+</div><div class='add'>+	dev =  __dev_get_by_index(net, ifm-&gt;ifa_index);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to find the interface");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto unlock_rtnl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_lock_ops(dev);</div><div class='ctx'> 	idev = ipv6_find_idev(dev);</div><div class='del'>-	if (IS_ERR(idev))</div><div class='del'>-		return PTR_ERR(idev);</div><div class='add'>+	if (IS_ERR(idev)) {</div><div class='add'>+		err = PTR_ERR(idev);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_allow_optimistic_dad(net, idev))</div><div class='ctx'> 		cfg.ifa_flags &amp;= ~IFA_F_OPTIMISTIC;</div><div class='hunk'>@@ -4720,7 +5046,8 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (cfg.ifa_flags &amp; IFA_F_NODAD &amp;&amp;</div><div class='ctx'> 	    cfg.ifa_flags &amp; IFA_F_OPTIMISTIC) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "IFA_F_NODAD and IFA_F_OPTIMISTIC are mutually exclusive");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ifa = ipv6_get_ifaddr(net, cfg.pfx, dev, 1);</div><div class='hunk'>@@ -4729,16 +5056,23 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		 * It would be best to check for !NLM_F_CREATE here but</div><div class='ctx'> 		 * userspace already relies on not having to provide this.</div><div class='ctx'> 		 */</div><div class='del'>-		return inet6_addr_add(net, ifm-&gt;ifa_index, &amp;cfg, extack);</div><div class='add'>+		err = inet6_addr_add(net, dev, &amp;cfg, expires, flags, extack);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nlh-&gt;nlmsg_flags &amp; NLM_F_EXCL ||</div><div class='del'>-	    !(nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE))</div><div class='add'>+	    !(nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "address already assigned");</div><div class='ctx'> 		err = -EEXIST;</div><div class='del'>-	else</div><div class='del'>-		err = inet6_addr_modify(ifa, &amp;cfg);</div><div class='add'>+	} else {</div><div class='add'>+		err = inet6_addr_modify(net, ifa, &amp;cfg, expires, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	in6_ifa_put(ifa);</div><div class='add'>+unlock:</div><div class='add'>+	netdev_unlock_ops(dev);</div><div class='add'>+unlock_rtnl:</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -4788,28 +5122,40 @@ static inline int inet6_ifaddr_msgsize(void)</div><div class='ctx'> 	       + nla_total_size(16) /* IFA_ADDRESS */</div><div class='ctx'> 	       + nla_total_size(sizeof(struct ifa_cacheinfo))</div><div class='ctx'> 	       + nla_total_size(4)  /* IFA_FLAGS */</div><div class='add'>+	       + nla_total_size(1)  /* IFA_PROTO */</div><div class='ctx'> 	       + nla_total_size(4)  /* IFA_RT_PRIORITY */;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,</div><div class='del'>-			     u32 portid, u32 seq, int event, unsigned int flags)</div><div class='add'>+static int inet6_fill_ifaddr(struct sk_buff *skb,</div><div class='add'>+			     const struct inet6_ifaddr *ifa,</div><div class='add'>+			     struct inet6_fill_args *args)</div><div class='ctx'> {</div><div class='del'>-	struct nlmsghdr  *nlh;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='ctx'> 	u32 preferred, valid;</div><div class='add'>+	u32 flags, priority;</div><div class='add'>+	u8 proto;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;event,</div><div class='add'>+			sizeof(struct ifaddrmsg), args-&gt;flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	flags = READ_ONCE(ifa-&gt;flags);</div><div class='ctx'> 	put_ifaddrmsg(nlh, ifa-&gt;prefix_len, ifa-&gt;flags, rt_scope(ifa-&gt;scope),</div><div class='ctx'> 		      ifa-&gt;idev-&gt;dev-&gt;ifindex);</div><div class='ctx'> </div><div class='del'>-	if (!((ifa-&gt;flags&amp;IFA_F_PERMANENT) &amp;&amp;</div><div class='del'>-	      (ifa-&gt;prefered_lft == INFINITY_LIFE_TIME))) {</div><div class='del'>-		preferred = ifa-&gt;prefered_lft;</div><div class='del'>-		valid = ifa-&gt;valid_lft;</div><div class='add'>+	if (args-&gt;netnsid &gt;= 0 &amp;&amp;</div><div class='add'>+	    nla_put_s32(skb, IFA_TARGET_NETNSID, args-&gt;netnsid))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	preferred = READ_ONCE(ifa-&gt;prefered_lft);</div><div class='add'>+	valid = READ_ONCE(ifa-&gt;valid_lft);</div><div class='add'>+</div><div class='add'>+	if (!((flags &amp; IFA_F_PERMANENT) &amp;&amp;</div><div class='add'>+	      (preferred == INFINITY_LIFE_TIME))) {</div><div class='ctx'> 		if (preferred != INFINITY_LIFE_TIME) {</div><div class='del'>-			long tval = (jiffies - ifa-&gt;tstamp)/HZ;</div><div class='add'>+			long tval = (jiffies - READ_ONCE(ifa-&gt;tstamp)) / HZ;</div><div class='add'>+</div><div class='ctx'> 			if (preferred &gt; tval)</div><div class='ctx'> 				preferred -= tval;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -4830,18 +5176,24 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,</div><div class='ctx'> 		if (nla_put_in6_addr(skb, IFA_LOCAL, &amp;ifa-&gt;addr) &lt; 0 ||</div><div class='ctx'> 		    nla_put_in6_addr(skb, IFA_ADDRESS, &amp;ifa-&gt;peer_addr) &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		if (nla_put_in6_addr(skb, IFA_ADDRESS, &amp;ifa-&gt;addr) &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ifa-&gt;rt_priority &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, IFA_RT_PRIORITY, ifa-&gt;rt_priority))</div><div class='add'>+	priority = READ_ONCE(ifa-&gt;rt_priority);</div><div class='add'>+	if (priority &amp;&amp; nla_put_u32(skb, IFA_RT_PRIORITY, priority))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	if (put_cacheinfo(skb, ifa-&gt;cstamp, ifa-&gt;tstamp, preferred, valid) &lt; 0)</div><div class='add'>+	if (put_cacheinfo(skb, ifa-&gt;cstamp, READ_ONCE(ifa-&gt;tstamp),</div><div class='add'>+			  preferred, valid) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u32(skb, IFA_FLAGS, ifa-&gt;flags) &lt; 0)</div><div class='add'>+	if (nla_put_u32(skb, IFA_FLAGS, flags) &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	proto = READ_ONCE(ifa-&gt;ifa_proto);</div><div class='add'>+	if (proto &amp;&amp; nla_put_u8(skb, IFA_PROTO, proto))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	nlmsg_end(skb, nlh);</div><div class='hunk'>@@ -4852,23 +5204,32 @@ error:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,</div><div class='del'>-				u32 portid, u32 seq, int event, u16 flags)</div><div class='add'>+int inet6_fill_ifmcaddr(struct sk_buff *skb,</div><div class='add'>+			const struct ifmcaddr6 *ifmca,</div><div class='add'>+			struct inet6_fill_args *args)</div><div class='ctx'> {</div><div class='del'>-	struct nlmsghdr  *nlh;</div><div class='del'>-	u8 scope = RT_SCOPE_UNIVERSE;</div><div class='ctx'> 	int ifindex = ifmca-&gt;idev-&gt;dev-&gt;ifindex;</div><div class='add'>+	u8 scope = RT_SCOPE_UNIVERSE;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='ctx'> </div><div class='del'>-	if (ipv6_addr_scope(&amp;ifmca-&gt;mca_addr) &amp; IFA_SITE)</div><div class='add'>+	if (!args-&gt;force_rt_scope_universe &amp;&amp;</div><div class='add'>+	    ipv6_addr_scope(&amp;ifmca-&gt;mca_addr) &amp; IFA_SITE)</div><div class='ctx'> 		scope = RT_SCOPE_SITE;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;event,</div><div class='add'>+			sizeof(struct ifaddrmsg), args-&gt;flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	if (args-&gt;netnsid &gt;= 0 &amp;&amp;</div><div class='add'>+	    nla_put_s32(skb, IFA_TARGET_NETNSID, args-&gt;netnsid)) {</div><div class='add'>+		nlmsg_cancel(skb, nlh);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);</div><div class='ctx'> 	if (nla_put_in6_addr(skb, IFA_MULTICAST, &amp;ifmca-&gt;mca_addr) &lt; 0 ||</div><div class='del'>-	    put_cacheinfo(skb, ifmca-&gt;mca_cstamp, ifmca-&gt;mca_tstamp,</div><div class='add'>+	    put_cacheinfo(skb, ifmca-&gt;mca_cstamp, READ_ONCE(ifmca-&gt;mca_tstamp),</div><div class='ctx'> 			  INFINITY_LIFE_TIME, INFINITY_LIFE_TIME) &lt; 0) {</div><div class='ctx'> 		nlmsg_cancel(skb, nlh);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='hunk'>@@ -4878,24 +5239,32 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,</div><div class='del'>-				u32 portid, u32 seq, int event, unsigned int flags)</div><div class='add'>+int inet6_fill_ifacaddr(struct sk_buff *skb,</div><div class='add'>+			const struct ifacaddr6 *ifaca,</div><div class='add'>+			struct inet6_fill_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = fib6_info_nh_dev(ifaca-&gt;aca_rt);</div><div class='ctx'> 	int ifindex = dev ? dev-&gt;ifindex : 1;</div><div class='del'>-	struct nlmsghdr  *nlh;</div><div class='ctx'> 	u8 scope = RT_SCOPE_UNIVERSE;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_scope(&amp;ifaca-&gt;aca_addr) &amp; IFA_SITE)</div><div class='ctx'> 		scope = RT_SCOPE_SITE;</div><div class='ctx'> </div><div class='del'>-	nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);</div><div class='add'>+	nlh = nlmsg_put(skb, args-&gt;portid, args-&gt;seq, args-&gt;event,</div><div class='add'>+			sizeof(struct ifaddrmsg), args-&gt;flags);</div><div class='ctx'> 	if (!nlh)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='add'>+	if (args-&gt;netnsid &gt;= 0 &amp;&amp;</div><div class='add'>+	    nla_put_s32(skb, IFA_TARGET_NETNSID, args-&gt;netnsid)) {</div><div class='add'>+		nlmsg_cancel(skb, nlh);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);</div><div class='ctx'> 	if (nla_put_in6_addr(skb, IFA_ANYCAST, &amp;ifaca-&gt;aca_addr) &lt; 0 ||</div><div class='del'>-	    put_cacheinfo(skb, ifaca-&gt;aca_cstamp, ifaca-&gt;aca_tstamp,</div><div class='add'>+	    put_cacheinfo(skb, ifaca-&gt;aca_cstamp, READ_ONCE(ifaca-&gt;aca_tstamp),</div><div class='ctx'> 			  INFINITY_LIFE_TIME, INFINITY_LIFE_TIME) &lt; 0) {</div><div class='ctx'> 		nlmsg_cancel(skb, nlh);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='hunk'>@@ -4905,68 +5274,56 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum addr_type_t {</div><div class='del'>-	UNICAST_ADDR,</div><div class='del'>-	MULTICAST_ADDR,</div><div class='del'>-	ANYCAST_ADDR,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,</div><div class='del'>-			  struct netlink_callback *cb, enum addr_type_t type,</div><div class='del'>-			  int s_ip_idx, int *p_ip_idx)</div><div class='add'>+static int in6_dump_addrs(const struct inet6_dev *idev, struct sk_buff *skb,</div><div class='add'>+			  struct netlink_callback *cb, int *s_ip_idx,</div><div class='add'>+			  struct inet6_fill_args *fillargs)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *ifmca;</div><div class='del'>-	struct ifacaddr6 *ifaca;</div><div class='del'>-	int err = 1;</div><div class='del'>-	int ip_idx = *p_ip_idx;</div><div class='add'>+	const struct ifmcaddr6 *ifmca;</div><div class='add'>+	const struct ifacaddr6 *ifaca;</div><div class='add'>+	int ip_idx = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	switch (type) {</div><div class='add'>+	switch (fillargs-&gt;type) {</div><div class='ctx'> 	case UNICAST_ADDR: {</div><div class='del'>-		struct inet6_ifaddr *ifa;</div><div class='add'>+		const struct inet6_ifaddr *ifa;</div><div class='add'>+		fillargs-&gt;event = RTM_NEWADDR;</div><div class='ctx'> </div><div class='ctx'> 		/* unicast address incl. temp addr */</div><div class='del'>-		list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='del'>-			if (++ip_idx &lt; s_ip_idx)</div><div class='del'>-				continue;</div><div class='del'>-			err = inet6_fill_ifaddr(skb, ifa,</div><div class='del'>-						NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						RTM_NEWADDR,</div><div class='del'>-						NLM_F_MULTI);</div><div class='add'>+		list_for_each_entry_rcu(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+			if (ip_idx &lt; *s_ip_idx)</div><div class='add'>+				goto next;</div><div class='add'>+			err = inet6_fill_ifaddr(skb, ifa, fillargs);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			nl_dump_check_consistent(cb, nlmsg_hdr(skb));</div><div class='add'>+next:</div><div class='add'>+			ip_idx++;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case MULTICAST_ADDR:</div><div class='add'>+		fillargs-&gt;event = RTM_GETMULTICAST;</div><div class='add'>+</div><div class='ctx'> 		/* multicast address */</div><div class='del'>-		for (ifmca = idev-&gt;mc_list; ifmca;</div><div class='del'>-		     ifmca = ifmca-&gt;next, ip_idx++) {</div><div class='del'>-			if (ip_idx &lt; s_ip_idx)</div><div class='add'>+		for (ifmca = rcu_dereference(idev-&gt;mc_list);</div><div class='add'>+		     ifmca;</div><div class='add'>+		     ifmca = rcu_dereference(ifmca-&gt;next), ip_idx++) {</div><div class='add'>+			if (ip_idx &lt; *s_ip_idx)</div><div class='ctx'> 				continue;</div><div class='del'>-			err = inet6_fill_ifmcaddr(skb, ifmca,</div><div class='del'>-						  NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						  cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						  RTM_GETMULTICAST,</div><div class='del'>-						  NLM_F_MULTI);</div><div class='add'>+			err = inet6_fill_ifmcaddr(skb, ifmca, fillargs);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYCAST_ADDR:</div><div class='add'>+		fillargs-&gt;event = RTM_GETANYCAST;</div><div class='ctx'> 		/* anycast address */</div><div class='del'>-		for (ifaca = idev-&gt;ac_list; ifaca;</div><div class='del'>-		     ifaca = ifaca-&gt;aca_next, ip_idx++) {</div><div class='del'>-			if (ip_idx &lt; s_ip_idx)</div><div class='add'>+		for (ifaca = rcu_dereference(idev-&gt;ac_list); ifaca;</div><div class='add'>+		     ifaca = rcu_dereference(ifaca-&gt;aca_next), ip_idx++) {</div><div class='add'>+			if (ip_idx &lt; *s_ip_idx)</div><div class='ctx'> 				continue;</div><div class='del'>-			err = inet6_fill_ifacaddr(skb, ifaca,</div><div class='del'>-						  NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-						  cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-						  RTM_GETANYCAST,</div><div class='del'>-						  NLM_F_MULTI);</div><div class='add'>+			err = inet6_fill_ifacaddr(skb, ifaca, fillargs);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4974,55 +5331,126 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	*p_ip_idx = ip_idx;</div><div class='add'>+	*s_ip_idx = err ? ip_idx : 0;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inet6_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,</div><div class='add'>+				       struct inet6_fill_args *fillargs,</div><div class='add'>+				       struct net **tgt_net, struct sock *sk,</div><div class='add'>+				       struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cb-&gt;extack;</div><div class='add'>+	struct nlattr *tb[IFA_MAX+1];</div><div class='add'>+	struct ifaddrmsg *ifm;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for address dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;ifa_prefixlen || ifm-&gt;ifa_flags || ifm-&gt;ifa_scope) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fillargs-&gt;ifindex = ifm-&gt;ifa_index;</div><div class='add'>+	if (fillargs-&gt;ifindex) {</div><div class='add'>+		cb-&gt;answer_flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+		fillargs-&gt;flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+					    ifa_ipv6_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IFA_MAX; ++i) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i == IFA_TARGET_NETNSID) {</div><div class='add'>+			struct net *net;</div><div class='add'>+</div><div class='add'>+			fillargs-&gt;netnsid = nla_get_s32(tb[i]);</div><div class='add'>+			net = rtnl_get_net_ns_capable(sk, fillargs-&gt;netnsid);</div><div class='add'>+			if (IS_ERR(net)) {</div><div class='add'>+				fillargs-&gt;netnsid = -1;</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "Invalid target network namespace id");</div><div class='add'>+				return PTR_ERR(net);</div><div class='add'>+			}</div><div class='add'>+			*tgt_net = net;</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in dump request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 			   enum addr_type_t type)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx, ip_idx;</div><div class='del'>-	int s_idx, s_ip_idx;</div><div class='add'>+	struct net *tgt_net = sock_net(skb-&gt;sk);</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct inet6_fill_args fillargs = {</div><div class='add'>+		.portid = NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+		.seq = cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+		.flags = NLM_F_MULTI,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+		.type = type,</div><div class='add'>+		.force_rt_scope_universe = false,</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+		int ip_idx;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-</div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = idx = cb-&gt;args[1];</div><div class='del'>-	s_ip_idx = ip_idx = cb-&gt;args[2];</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	cb-&gt;seq = atomic_read(&amp;net-&gt;ipv6.dev_addr_genid) ^ net-&gt;dev_base_seq;</div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		hlist_for_each_entry_rcu(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			if (h &gt; s_h || idx &gt; s_idx)</div><div class='del'>-				s_ip_idx = 0;</div><div class='del'>-			ip_idx = 0;</div><div class='del'>-			idev = __in6_dev_get(dev);</div><div class='del'>-			if (!idev)</div><div class='del'>-				goto cont;</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = inet6_valid_dump_ifaddr_req(nlh, &amp;fillargs, &amp;tgt_net,</div><div class='add'>+						  skb-&gt;sk, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='del'>-			if (in6_dump_addrs(idev, skb, cb, type,</div><div class='del'>-					   s_ip_idx, &amp;ip_idx) &lt; 0)</div><div class='add'>+		err = 0;</div><div class='add'>+		if (fillargs.ifindex) {</div><div class='add'>+			dev = dev_get_by_index_rcu(tgt_net, fillargs.ifindex);</div><div class='add'>+			if (!dev) {</div><div class='add'>+				err = -ENODEV;</div><div class='ctx'> 				goto done;</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='add'>+			}</div><div class='add'>+			idev = __in6_dev_get(dev);</div><div class='add'>+			if (idev)</div><div class='add'>+				err = in6_dump_addrs(idev, skb, cb,</div><div class='add'>+						     &amp;ctx-&gt;ip_idx,</div><div class='add'>+						     &amp;fillargs);</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cb-&gt;seq = inet6_base_seq(tgt_net);</div><div class='add'>+	for_each_netdev_dump(tgt_net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		idev = __in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			continue;</div><div class='add'>+		err = in6_dump_addrs(idev, skb, cb, &amp;ctx-&gt;ip_idx,</div><div class='add'>+				     &amp;fillargs);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='ctx'> done:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[2] = ip_idx;</div><div class='add'>+	if (fillargs.netnsid &gt;= 0)</div><div class='add'>+		put_net(tgt_net);</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='hunk'>@@ -5047,10 +5475,64 @@ static int inet6_dump_ifacaddr(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	return inet6_dump_addr(skb, cb, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inet6_rtm_valid_getaddr_req(struct sk_buff *skb,</div><div class='add'>+				       const struct nlmsghdr *nlh,</div><div class='add'>+				       struct nlattr **tb,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifaddrmsg *ifm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for get address request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+					      ifa_ipv6_policy, extack);</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;ifa_prefixlen || ifm-&gt;ifa_flags || ifm-&gt;ifa_scope) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for get address request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,</div><div class='add'>+					    ifa_ipv6_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IFA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case IFA_TARGET_NETNSID:</div><div class='add'>+		case IFA_ADDRESS:</div><div class='add'>+		case IFA_LOCAL:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in get address request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct net *tgt_net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct inet6_fill_args fillargs = {</div><div class='add'>+		.portid = NETLINK_CB(in_skb).portid,</div><div class='add'>+		.seq = nlh-&gt;nlmsg_seq,</div><div class='add'>+		.event = RTM_NEWADDR,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+		.force_rt_scope_universe = false,</div><div class='add'>+	};</div><div class='ctx'> 	struct ifaddrmsg *ifm;</div><div class='ctx'> 	struct nlattr *tb[IFA_MAX+1];</div><div class='ctx'> 	struct in6_addr *addr = NULL, *peer;</div><div class='hunk'>@@ -5059,20 +5541,29 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = inet6_rtm_valid_getaddr_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	addr = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &amp;peer);</div><div class='del'>-	if (!addr)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (tb[IFA_TARGET_NETNSID]) {</div><div class='add'>+		fillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);</div><div class='add'>+</div><div class='add'>+		tgt_net = rtnl_get_net_ns_capable(NETLINK_CB(in_skb).sk,</div><div class='add'>+						  fillargs.netnsid);</div><div class='add'>+		if (IS_ERR(tgt_net))</div><div class='add'>+			return PTR_ERR(tgt_net);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	addr = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &amp;peer);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='ctx'> 	ifm = nlmsg_data(nlh);</div><div class='ctx'> 	if (ifm-&gt;ifa_index)</div><div class='del'>-		dev = dev_get_by_index(net, ifm-&gt;ifa_index);</div><div class='add'>+		dev = dev_get_by_index(tgt_net, ifm-&gt;ifa_index);</div><div class='ctx'> </div><div class='del'>-	ifa = ipv6_get_ifaddr(net, addr, dev, 1);</div><div class='add'>+	ifa = ipv6_get_ifaddr(tgt_net, addr, dev, 1);</div><div class='ctx'> 	if (!ifa) {</div><div class='ctx'> 		err = -EADDRNOTAVAIL;</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -5084,20 +5575,21 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		goto errout_ifa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(in_skb).portid,</div><div class='del'>-				nlh-&gt;nlmsg_seq, RTM_NEWADDR, 0);</div><div class='add'>+	err = inet6_fill_ifaddr(skb, ifa, &amp;fillargs);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in inet6_ifaddr_msgsize() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		goto errout_ifa;</div><div class='ctx'> 	}</div><div class='del'>-	err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='add'>+	err = rtnl_unicast(skb, tgt_net, NETLINK_CB(in_skb).portid);</div><div class='ctx'> errout_ifa:</div><div class='ctx'> 	in6_ifa_put(ifa);</div><div class='ctx'> errout:</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_put(dev);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	if (fillargs.netnsid &gt;= 0)</div><div class='add'>+		put_net(tgt_net);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5105,13 +5597,21 @@ static void inet6_ifa_notify(int event, struct inet6_ifaddr *ifa)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct net *net = dev_net(ifa-&gt;idev-&gt;dev);</div><div class='add'>+	struct inet6_fill_args fillargs = {</div><div class='add'>+		.portid = 0,</div><div class='add'>+		.seq = 0,</div><div class='add'>+		.event = event,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+		.force_rt_scope_universe = false,</div><div class='add'>+	};</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	skb = nlmsg_new(inet6_ifaddr_msgsize(), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = inet6_fill_ifaddr(skb, ifa, 0, 0, event, 0);</div><div class='add'>+	err = inet6_fill_ifaddr(skb, ifa, &amp;fillargs);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in inet6_ifaddr_msgsize() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='hunk'>@@ -5121,83 +5621,101 @@ static void inet6_ifa_notify(int event, struct inet6_ifaddr *ifa)</div><div class='ctx'> 	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_IFADDR, NULL, GFP_ATOMIC);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV6_IFADDR, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_IFADDR, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,</div><div class='del'>-				__s32 *array, int bytes)</div><div class='add'>+static void ipv6_store_devconf(const struct ipv6_devconf *cnf,</div><div class='add'>+			       __s32 *array, int bytes)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(bytes &lt; (DEVCONF_MAX * 4));</div><div class='ctx'> </div><div class='ctx'> 	memset(array, 0, bytes);</div><div class='del'>-	array[DEVCONF_FORWARDING] = cnf-&gt;forwarding;</div><div class='del'>-	array[DEVCONF_HOPLIMIT] = cnf-&gt;hop_limit;</div><div class='del'>-	array[DEVCONF_MTU6] = cnf-&gt;mtu6;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA] = cnf-&gt;accept_ra;</div><div class='del'>-	array[DEVCONF_ACCEPT_REDIRECTS] = cnf-&gt;accept_redirects;</div><div class='del'>-	array[DEVCONF_AUTOCONF] = cnf-&gt;autoconf;</div><div class='del'>-	array[DEVCONF_DAD_TRANSMITS] = cnf-&gt;dad_transmits;</div><div class='del'>-	array[DEVCONF_RTR_SOLICITS] = cnf-&gt;rtr_solicits;</div><div class='add'>+	array[DEVCONF_FORWARDING] = READ_ONCE(cnf-&gt;forwarding);</div><div class='add'>+	array[DEVCONF_HOPLIMIT] = READ_ONCE(cnf-&gt;hop_limit);</div><div class='add'>+	array[DEVCONF_MTU6] = READ_ONCE(cnf-&gt;mtu6);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA] = READ_ONCE(cnf-&gt;accept_ra);</div><div class='add'>+	array[DEVCONF_ACCEPT_REDIRECTS] = READ_ONCE(cnf-&gt;accept_redirects);</div><div class='add'>+	array[DEVCONF_AUTOCONF] = READ_ONCE(cnf-&gt;autoconf);</div><div class='add'>+	array[DEVCONF_DAD_TRANSMITS] = READ_ONCE(cnf-&gt;dad_transmits);</div><div class='add'>+	array[DEVCONF_RTR_SOLICITS] = READ_ONCE(cnf-&gt;rtr_solicits);</div><div class='ctx'> 	array[DEVCONF_RTR_SOLICIT_INTERVAL] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;rtr_solicit_interval);</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;rtr_solicit_interval));</div><div class='ctx'> 	array[DEVCONF_RTR_SOLICIT_MAX_INTERVAL] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;rtr_solicit_max_interval);</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;rtr_solicit_max_interval));</div><div class='ctx'> 	array[DEVCONF_RTR_SOLICIT_DELAY] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;rtr_solicit_delay);</div><div class='del'>-	array[DEVCONF_FORCE_MLD_VERSION] = cnf-&gt;force_mld_version;</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;rtr_solicit_delay));</div><div class='add'>+	array[DEVCONF_FORCE_MLD_VERSION] = READ_ONCE(cnf-&gt;force_mld_version);</div><div class='ctx'> 	array[DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;mldv1_unsolicited_report_interval);</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;mldv1_unsolicited_report_interval));</div><div class='ctx'> 	array[DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;mldv2_unsolicited_report_interval);</div><div class='del'>-	array[DEVCONF_USE_TEMPADDR] = cnf-&gt;use_tempaddr;</div><div class='del'>-	array[DEVCONF_TEMP_VALID_LFT] = cnf-&gt;temp_valid_lft;</div><div class='del'>-	array[DEVCONF_TEMP_PREFERED_LFT] = cnf-&gt;temp_prefered_lft;</div><div class='del'>-	array[DEVCONF_REGEN_MAX_RETRY] = cnf-&gt;regen_max_retry;</div><div class='del'>-	array[DEVCONF_MAX_DESYNC_FACTOR] = cnf-&gt;max_desync_factor;</div><div class='del'>-	array[DEVCONF_MAX_ADDRESSES] = cnf-&gt;max_addresses;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_DEFRTR] = cnf-&gt;accept_ra_defrtr;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT] = cnf-&gt;accept_ra_min_hop_limit;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_PINFO] = cnf-&gt;accept_ra_pinfo;</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;mldv2_unsolicited_report_interval));</div><div class='add'>+	array[DEVCONF_USE_TEMPADDR] = READ_ONCE(cnf-&gt;use_tempaddr);</div><div class='add'>+	array[DEVCONF_TEMP_VALID_LFT] = READ_ONCE(cnf-&gt;temp_valid_lft);</div><div class='add'>+	array[DEVCONF_TEMP_PREFERED_LFT] = READ_ONCE(cnf-&gt;temp_prefered_lft);</div><div class='add'>+	array[DEVCONF_REGEN_MAX_RETRY] = READ_ONCE(cnf-&gt;regen_max_retry);</div><div class='add'>+	array[DEVCONF_MAX_DESYNC_FACTOR] = READ_ONCE(cnf-&gt;max_desync_factor);</div><div class='add'>+	array[DEVCONF_MAX_ADDRESSES] = READ_ONCE(cnf-&gt;max_addresses);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_DEFRTR] = READ_ONCE(cnf-&gt;accept_ra_defrtr);</div><div class='add'>+	array[DEVCONF_RA_DEFRTR_METRIC] = READ_ONCE(cnf-&gt;ra_defrtr_metric);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_ra_min_hop_limit);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_PINFO] = READ_ONCE(cnf-&gt;accept_ra_pinfo);</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf-&gt;accept_ra_rtr_pref;</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_RTR_PREF] = READ_ONCE(cnf-&gt;accept_ra_rtr_pref);</div><div class='ctx'> 	array[DEVCONF_RTR_PROBE_INTERVAL] =</div><div class='del'>-		jiffies_to_msecs(cnf-&gt;rtr_probe_interval);</div><div class='add'>+		jiffies_to_msecs(READ_ONCE(cnf-&gt;rtr_probe_interval));</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTE_INFO</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN] = cnf-&gt;accept_ra_rt_info_min_plen;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf-&gt;accept_ra_rt_info_max_plen;</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_ra_rt_info_min_plen);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_ra_rt_info_max_plen);</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='del'>-	array[DEVCONF_PROXY_NDP] = cnf-&gt;proxy_ndp;</div><div class='del'>-	array[DEVCONF_ACCEPT_SOURCE_ROUTE] = cnf-&gt;accept_source_route;</div><div class='add'>+	array[DEVCONF_PROXY_NDP] = READ_ONCE(cnf-&gt;proxy_ndp);</div><div class='add'>+	array[DEVCONF_ACCEPT_SOURCE_ROUTE] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_source_route);</div><div class='ctx'> #ifdef CONFIG_IPV6_OPTIMISTIC_DAD</div><div class='del'>-	array[DEVCONF_OPTIMISTIC_DAD] = cnf-&gt;optimistic_dad;</div><div class='del'>-	array[DEVCONF_USE_OPTIMISTIC] = cnf-&gt;use_optimistic;</div><div class='add'>+	array[DEVCONF_OPTIMISTIC_DAD] = READ_ONCE(cnf-&gt;optimistic_dad);</div><div class='add'>+	array[DEVCONF_USE_OPTIMISTIC] = READ_ONCE(cnf-&gt;use_optimistic);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_IPV6_MROUTE</div><div class='del'>-	array[DEVCONF_MC_FORWARDING] = cnf-&gt;mc_forwarding;</div><div class='add'>+	array[DEVCONF_MC_FORWARDING] = atomic_read(&amp;cnf-&gt;mc_forwarding);</div><div class='ctx'> #endif</div><div class='del'>-	array[DEVCONF_DISABLE_IPV6] = cnf-&gt;disable_ipv6;</div><div class='del'>-	array[DEVCONF_ACCEPT_DAD] = cnf-&gt;accept_dad;</div><div class='del'>-	array[DEVCONF_FORCE_TLLAO] = cnf-&gt;force_tllao;</div><div class='del'>-	array[DEVCONF_NDISC_NOTIFY] = cnf-&gt;ndisc_notify;</div><div class='del'>-	array[DEVCONF_SUPPRESS_FRAG_NDISC] = cnf-&gt;suppress_frag_ndisc;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_FROM_LOCAL] = cnf-&gt;accept_ra_from_local;</div><div class='del'>-	array[DEVCONF_ACCEPT_RA_MTU] = cnf-&gt;accept_ra_mtu;</div><div class='del'>-	array[DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN] = cnf-&gt;ignore_routes_with_linkdown;</div><div class='add'>+	array[DEVCONF_DISABLE_IPV6] = READ_ONCE(cnf-&gt;disable_ipv6);</div><div class='add'>+	array[DEVCONF_ACCEPT_DAD] = READ_ONCE(cnf-&gt;accept_dad);</div><div class='add'>+	array[DEVCONF_FORCE_TLLAO] = READ_ONCE(cnf-&gt;force_tllao);</div><div class='add'>+	array[DEVCONF_NDISC_NOTIFY] = READ_ONCE(cnf-&gt;ndisc_notify);</div><div class='add'>+	array[DEVCONF_SUPPRESS_FRAG_NDISC] =</div><div class='add'>+		READ_ONCE(cnf-&gt;suppress_frag_ndisc);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_FROM_LOCAL] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_ra_from_local);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_MTU] = READ_ONCE(cnf-&gt;accept_ra_mtu);</div><div class='add'>+	array[DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN] =</div><div class='add'>+		READ_ONCE(cnf-&gt;ignore_routes_with_linkdown);</div><div class='ctx'> 	/* we omit DEVCONF_STABLE_SECRET for now */</div><div class='del'>-	array[DEVCONF_USE_OIF_ADDRS_ONLY] = cnf-&gt;use_oif_addrs_only;</div><div class='del'>-	array[DEVCONF_DROP_UNICAST_IN_L2_MULTICAST] = cnf-&gt;drop_unicast_in_l2_multicast;</div><div class='del'>-	array[DEVCONF_DROP_UNSOLICITED_NA] = cnf-&gt;drop_unsolicited_na;</div><div class='del'>-	array[DEVCONF_KEEP_ADDR_ON_DOWN] = cnf-&gt;keep_addr_on_down;</div><div class='del'>-	array[DEVCONF_SEG6_ENABLED] = cnf-&gt;seg6_enabled;</div><div class='add'>+	array[DEVCONF_USE_OIF_ADDRS_ONLY] = READ_ONCE(cnf-&gt;use_oif_addrs_only);</div><div class='add'>+	array[DEVCONF_DROP_UNICAST_IN_L2_MULTICAST] =</div><div class='add'>+		READ_ONCE(cnf-&gt;drop_unicast_in_l2_multicast);</div><div class='add'>+	array[DEVCONF_DROP_UNSOLICITED_NA] = READ_ONCE(cnf-&gt;drop_unsolicited_na);</div><div class='add'>+	array[DEVCONF_KEEP_ADDR_ON_DOWN] = READ_ONCE(cnf-&gt;keep_addr_on_down);</div><div class='add'>+	array[DEVCONF_SEG6_ENABLED] = READ_ONCE(cnf-&gt;seg6_enabled);</div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='del'>-	array[DEVCONF_SEG6_REQUIRE_HMAC] = cnf-&gt;seg6_require_hmac;</div><div class='add'>+	array[DEVCONF_SEG6_REQUIRE_HMAC] = READ_ONCE(cnf-&gt;seg6_require_hmac);</div><div class='ctx'> #endif</div><div class='del'>-	array[DEVCONF_ENHANCED_DAD] = cnf-&gt;enhanced_dad;</div><div class='del'>-	array[DEVCONF_ADDR_GEN_MODE] = cnf-&gt;addr_gen_mode;</div><div class='del'>-	array[DEVCONF_DISABLE_POLICY] = cnf-&gt;disable_policy;</div><div class='del'>-	array[DEVCONF_NDISC_TCLASS] = cnf-&gt;ndisc_tclass;</div><div class='add'>+	array[DEVCONF_ENHANCED_DAD] = READ_ONCE(cnf-&gt;enhanced_dad);</div><div class='add'>+	array[DEVCONF_ADDR_GEN_MODE] = READ_ONCE(cnf-&gt;addr_gen_mode);</div><div class='add'>+	array[DEVCONF_DISABLE_POLICY] = READ_ONCE(cnf-&gt;disable_policy);</div><div class='add'>+	array[DEVCONF_NDISC_TCLASS] = READ_ONCE(cnf-&gt;ndisc_tclass);</div><div class='add'>+	array[DEVCONF_RPL_SEG_ENABLED] = READ_ONCE(cnf-&gt;rpl_seg_enabled);</div><div class='add'>+	array[DEVCONF_IOAM6_ENABLED] = READ_ONCE(cnf-&gt;ioam6_enabled);</div><div class='add'>+	array[DEVCONF_IOAM6_ID] = READ_ONCE(cnf-&gt;ioam6_id);</div><div class='add'>+	array[DEVCONF_IOAM6_ID_WIDE] = READ_ONCE(cnf-&gt;ioam6_id_wide);</div><div class='add'>+	array[DEVCONF_NDISC_EVICT_NOCARRIER] =</div><div class='add'>+		READ_ONCE(cnf-&gt;ndisc_evict_nocarrier);</div><div class='add'>+	array[DEVCONF_ACCEPT_UNTRACKED_NA] =</div><div class='add'>+		READ_ONCE(cnf-&gt;accept_untracked_na);</div><div class='add'>+	array[DEVCONF_ACCEPT_RA_MIN_LFT] = READ_ONCE(cnf-&gt;accept_ra_min_lft);</div><div class='add'>+	array[DEVCONF_FORCE_FORWARDING] = READ_ONCE(cnf-&gt;force_forwarding);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline size_t inet6_ifla6_size(void)</div><div class='hunk'>@@ -5209,6 +5727,7 @@ static inline size_t inet6_ifla6_size(void)</div><div class='ctx'> 	     + nla_total_size(ICMP6_MIB_MAX * 8) /* IFLA_INET6_ICMP6STATS */</div><div class='ctx'> 	     + nla_total_size(sizeof(struct in6_addr)) /* IFLA_INET6_TOKEN */</div><div class='ctx'> 	     + nla_total_size(1) /* IFLA_INET6_ADDR_GEN_MODE */</div><div class='add'>+	     + nla_total_size(4) /* IFLA_INET6_RA_MTU */</div><div class='ctx'> 	     + 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5273,16 +5792,38 @@ static void snmp6_fill_stats(u64 *stats, struct inet6_dev *idev, int attrtype,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inet6_fill_ifla6_stats_attrs(struct sk_buff *skb,</div><div class='add'>+					struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+</div><div class='add'>+	nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64));</div><div class='add'>+	if (!nla)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla));</div><div class='add'>+</div><div class='add'>+	nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64));</div><div class='add'>+	if (!nla)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='ctx'> 				  u32 ext_filter_mask)</div><div class='ctx'> {</div><div class='del'>-	struct nlattr *nla;</div><div class='ctx'> 	struct ifla_cacheinfo ci;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	u32 ra_mtu;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u32(skb, IFLA_INET6_FLAGS, idev-&gt;if_flags))</div><div class='add'>+	if (nla_put_u32(skb, IFLA_INET6_FLAGS, READ_ONCE(idev-&gt;if_flags)))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	ci.max_reasm_len = IPV6_MAXPLEN;</div><div class='del'>-	ci.tstamp = cstamp_delta(idev-&gt;tstamp);</div><div class='add'>+	ci.tstamp = cstamp_delta(READ_ONCE(idev-&gt;tstamp));</div><div class='ctx'> 	ci.reachable_time = jiffies_to_msecs(idev-&gt;nd_parms-&gt;reachable_time);</div><div class='ctx'> 	ci.retrans_time = jiffies_to_msecs(NEIGH_VAR(idev-&gt;nd_parms, RETRANS_TIME));</div><div class='ctx'> 	if (nla_put(skb, IFLA_INET6_CACHEINFO, sizeof(ci), &amp;ci))</div><div class='hunk'>@@ -5294,30 +5835,26 @@ static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='ctx'> </div><div class='ctx'> 	/* XXX - MC not implemented */</div><div class='ctx'> </div><div class='del'>-	if (ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64));</div><div class='del'>-	if (!nla)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla));</div><div class='del'>-</div><div class='del'>-	nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64));</div><div class='del'>-	if (!nla)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla));</div><div class='add'>+	if (!(ext_filter_mask &amp; RTEXT_FILTER_SKIP_STATS)) {</div><div class='add'>+		if (inet6_fill_ifla6_stats_attrs(skb, idev) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nla = nla_reserve(skb, IFLA_INET6_TOKEN, sizeof(struct in6_addr));</div><div class='ctx'> 	if (!nla)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (nla_put_u8(skb, IFLA_INET6_ADDR_GEN_MODE, idev-&gt;cnf.addr_gen_mode))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='ctx'> 	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	memcpy(nla_data(nla), idev-&gt;token.s6_addr, nla_len(nla));</div><div class='ctx'> 	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (nla_put_u8(skb, IFLA_INET6_ADDR_GEN_MODE,</div><div class='add'>+		       READ_ONCE(idev-&gt;cnf.addr_gen_mode)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	ra_mtu = READ_ONCE(idev-&gt;ra_mtu);</div><div class='add'>+	if (ra_mtu &amp;&amp; nla_put_u32(skb, IFLA_INET6_RA_MTU, ra_mtu))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='hunk'>@@ -5347,7 +5884,8 @@ static int inet6_fill_link_af(struct sk_buff *skb, const struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)</div><div class='add'>+static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='hunk'>@@ -5358,12 +5896,29 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)</div><div class='ctx'> </div><div class='ctx'> 	if (!token)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (dev-&gt;flags &amp; (IFF_LOOPBACK | IFF_NOARP))</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Device is loopback");</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (!ipv6_accept_ra(idev))</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_NOARP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Device does not do neighbour discovery");</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (idev-&gt;cnf.rtr_solicits == 0)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ipv6_accept_ra(idev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Router advertisement is disabled on device");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(idev-&gt;cnf.rtr_solicits) == 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Router solicitation is disabled on device");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -5392,7 +5947,7 @@ update_lft:</div><div class='ctx'> 	if (update_rs) {</div><div class='ctx'> 		idev-&gt;if_flags |= IF_RS_SENT;</div><div class='ctx'> 		idev-&gt;rs_interval = rfc3315_s14_backoff_init(</div><div class='del'>-			idev-&gt;cnf.rtr_solicit_interval);</div><div class='add'>+			READ_ONCE(idev-&gt;cnf.rtr_solicit_interval));</div><div class='ctx'> 		idev-&gt;rs_probes = 1;</div><div class='ctx'> 		addrconf_mod_rs_timer(idev, idev-&gt;rs_interval);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5409,27 +5964,18 @@ update_lft:</div><div class='ctx'> </div><div class='ctx'> 	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	inet6_ifinfo_notify(RTM_NEWLINK, idev);</div><div class='del'>-	addrconf_verify_rtnl();</div><div class='add'>+	addrconf_verify_rtnl(dev_net(dev));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy inet6_af_policy[IFLA_INET6_MAX + 1] = {</div><div class='ctx'> 	[IFLA_INET6_ADDR_GEN_MODE]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_INET6_TOKEN]		= { .len = sizeof(struct in6_addr) },</div><div class='add'>+	[IFLA_INET6_RA_MTU]		= { .type = NLA_REJECT,</div><div class='add'>+					    .reject_message =</div><div class='add'>+						"IFLA_INET6_RA_MTU can not be set" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int inet6_validate_link_af(const struct net_device *dev,</div><div class='del'>-				  const struct nlattr *nla)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *tb[IFLA_INET6_MAX + 1];</div><div class='del'>-</div><div class='del'>-	if (dev &amp;&amp; !__in6_dev_get(dev))</div><div class='del'>-		return -EAFNOSUPPORT;</div><div class='del'>-</div><div class='del'>-	return nla_parse_nested(tb, IFLA_INET6_MAX, nla, inet6_af_policy,</div><div class='del'>-				NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int check_addr_gen_mode(int mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode != IN6_ADDR_GEN_MODE_EUI64 &amp;&amp;</div><div class='hunk'>@@ -5450,20 +5996,56 @@ static int check_stable_privacy(struct inet6_dev *idev, struct net *net,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)</div><div class='add'>+static int inet6_validate_link_af(const struct net_device *dev,</div><div class='add'>+				  const struct nlattr *nla,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IFLA_INET6_MAX + 1];</div><div class='add'>+	struct inet6_dev *idev = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		idev = __in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			return -EAFNOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla,</div><div class='add'>+					  inet6_af_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[IFLA_INET6_TOKEN] &amp;&amp; !tb[IFLA_INET6_ADDR_GEN_MODE])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_INET6_ADDR_GEN_MODE]) {</div><div class='add'>+		u8 mode = nla_get_u8(tb[IFLA_INET6_ADDR_GEN_MODE]);</div><div class='add'>+</div><div class='add'>+		if (check_addr_gen_mode(mode) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (dev &amp;&amp; check_stable_privacy(idev, dev_net(dev), mode) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int err = -EINVAL;</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='ctx'> 	struct nlattr *tb[IFLA_INET6_MAX + 1];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(tb, IFLA_INET6_MAX, nla, NULL, NULL) &lt; 0)</div><div class='del'>-		BUG();</div><div class='add'>+	if (nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, NULL, NULL) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tb[IFLA_INET6_TOKEN]) {</div><div class='del'>-		err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN]));</div><div class='add'>+		err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN]),</div><div class='add'>+					extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5471,15 +6053,10 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)</div><div class='ctx'> 	if (tb[IFLA_INET6_ADDR_GEN_MODE]) {</div><div class='ctx'> 		u8 mode = nla_get_u8(tb[IFLA_INET6_ADDR_GEN_MODE]);</div><div class='ctx'> </div><div class='del'>-		if (check_addr_gen_mode(mode) &lt; 0 ||</div><div class='del'>-		    check_stable_privacy(idev, dev_net(dev), mode) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		idev-&gt;cnf.addr_gen_mode = mode;</div><div class='del'>-		err = 0;</div><div class='add'>+		WRITE_ONCE(idev-&gt;cnf.addr_gen_mode, mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='hunk'>@@ -5488,6 +6065,7 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='ctx'> 	struct ifinfomsg *hdr;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='add'>+	int ifindex, iflink;</div><div class='ctx'> 	void *protoinfo;</div><div class='ctx'> </div><div class='ctx'> 	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*hdr), flags);</div><div class='hunk'>@@ -5498,20 +6076,22 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='ctx'> 	hdr-&gt;ifi_family = AF_INET6;</div><div class='ctx'> 	hdr-&gt;__ifi_pad = 0;</div><div class='ctx'> 	hdr-&gt;ifi_type = dev-&gt;type;</div><div class='del'>-	hdr-&gt;ifi_index = dev-&gt;ifindex;</div><div class='del'>-	hdr-&gt;ifi_flags = dev_get_flags(dev);</div><div class='add'>+	ifindex = READ_ONCE(dev-&gt;ifindex);</div><div class='add'>+	hdr-&gt;ifi_index = ifindex;</div><div class='add'>+	hdr-&gt;ifi_flags = netif_get_flags(dev);</div><div class='ctx'> 	hdr-&gt;ifi_change = 0;</div><div class='ctx'> </div><div class='add'>+	iflink = dev_get_iflink(dev);</div><div class='ctx'> 	if (nla_put_string(skb, IFLA_IFNAME, dev-&gt;name) ||</div><div class='ctx'> 	    (dev-&gt;addr_len &amp;&amp;</div><div class='ctx'> 	     nla_put(skb, IFLA_ADDRESS, dev-&gt;addr_len, dev-&gt;dev_addr)) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_MTU, dev-&gt;mtu) ||</div><div class='del'>-	    (dev-&gt;ifindex != dev_get_iflink(dev) &amp;&amp;</div><div class='del'>-	     nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev))) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_MTU, READ_ONCE(dev-&gt;mtu)) ||</div><div class='add'>+	    (ifindex != iflink &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, IFLA_LINK, iflink)) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_OPERSTATE,</div><div class='del'>-		       netif_running(dev) ? dev-&gt;operstate : IF_OPER_DOWN))</div><div class='add'>+		       netif_running(dev) ? READ_ONCE(dev-&gt;operstate) : IF_OPER_DOWN))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	protoinfo = nla_nest_start(skb, IFLA_PROTINFO);</div><div class='add'>+	protoinfo = nla_nest_start_noflag(skb, IFLA_PROTINFO);</div><div class='ctx'> 	if (!protoinfo)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -5527,43 +6107,67 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inet6_valid_dump_ifinfo(const struct nlmsghdr *nlh,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifinfomsg *ifm;</div><div class='add'>+</div><div class='add'>+	ifm = nlmsg_payload(nlh, sizeof(*ifm));</div><div class='add'>+	if (!ifm) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for link dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*ifm))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid data after header");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifm-&gt;__ifi_pad || ifm-&gt;ifi_type || ifm-&gt;ifi_flags ||</div><div class='add'>+	    ifm-&gt;ifi_change || ifm-&gt;ifi_index) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	int h, s_h;</div><div class='del'>-	int idx = 0, s_idx;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long ifindex;</div><div class='add'>+	} *ctx = (void *)cb-&gt;ctx;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* only requests using strict checking can pass data to</div><div class='add'>+	 * influence the dump</div><div class='add'>+	 */</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = inet6_valid_dump_ifinfo(cb-&gt;nlh, cb-&gt;extack);</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_idx = cb-&gt;args[1];</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	err = 0;</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	for (h = s_h; h &lt; NETDEV_HASHENTRIES; h++, s_idx = 0) {</div><div class='del'>-		idx = 0;</div><div class='del'>-		head = &amp;net-&gt;dev_index_head[h];</div><div class='del'>-		hlist_for_each_entry_rcu(dev, head, index_hlist) {</div><div class='del'>-			if (idx &lt; s_idx)</div><div class='del'>-				goto cont;</div><div class='del'>-			idev = __in6_dev_get(dev);</div><div class='del'>-			if (!idev)</div><div class='del'>-				goto cont;</div><div class='del'>-			if (inet6_fill_ifinfo(skb, idev,</div><div class='del'>-					      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='del'>-					      RTM_NEWLINK, NLM_F_MULTI) &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-cont:</div><div class='del'>-			idx++;</div><div class='del'>-		}</div><div class='add'>+	for_each_netdev_dump(net, dev, ctx-&gt;ifindex) {</div><div class='add'>+		idev = __in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			continue;</div><div class='add'>+		err = inet6_fill_ifinfo(skb, idev,</div><div class='add'>+					NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+					cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					RTM_NEWLINK, NLM_F_MULTI);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	cb-&gt;args[1] = idx;</div><div class='del'>-	cb-&gt;args[0] = h;</div><div class='ctx'> </div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void inet6_ifinfo_notify(int event, struct inet6_dev *idev)</div><div class='hunk'>@@ -5586,8 +6190,7 @@ void inet6_ifinfo_notify(int event, struct inet6_dev *idev)</div><div class='ctx'> 	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_IFINFO, NULL, GFP_ATOMIC);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV6_IFINFO, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_IFINFO, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline size_t inet6_prefix_nlmsg_size(void)</div><div class='hunk'>@@ -5617,11 +6220,7 @@ static int inet6_fill_prefix(struct sk_buff *skb, struct inet6_dev *idev,</div><div class='ctx'> 	pmsg-&gt;prefix_len = pinfo-&gt;prefix_len;</div><div class='ctx'> 	pmsg-&gt;prefix_type = pinfo-&gt;type;</div><div class='ctx'> 	pmsg-&gt;prefix_pad3 = 0;</div><div class='del'>-	pmsg-&gt;prefix_flags = 0;</div><div class='del'>-	if (pinfo-&gt;onlink)</div><div class='del'>-		pmsg-&gt;prefix_flags |= IF_PREFIX_ONLINK;</div><div class='del'>-	if (pinfo-&gt;autoconf)</div><div class='del'>-		pmsg-&gt;prefix_flags |= IF_PREFIX_AUTOCONF;</div><div class='add'>+	pmsg-&gt;prefix_flags = pinfo-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put(skb, PREFIX_ADDRESS, sizeof(pinfo-&gt;prefix), &amp;pinfo-&gt;prefix))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -5658,8 +6257,7 @@ static void inet6_prefix_notify(int event, struct inet6_dev *idev,</div><div class='ctx'> 	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_PREFIX, NULL, GFP_ATOMIC);</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV6_PREFIX, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_PREFIX, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)</div><div class='hunk'>@@ -5674,19 +6272,26 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case RTM_NEWADDR:</div><div class='ctx'> 		/*</div><div class='del'>-		 * If the address was optimistic</div><div class='del'>-		 * we inserted the route at the start of</div><div class='del'>-		 * our DAD process, so we don't need</div><div class='del'>-		 * to do it again</div><div class='add'>+		 * If the address was optimistic we inserted the route at the</div><div class='add'>+		 * start of our DAD process, so we don't need to do it again.</div><div class='add'>+		 * If the device was taken down in the middle of the DAD</div><div class='add'>+		 * cycle there is a race where we could get here without a</div><div class='add'>+		 * host route, so nothing to insert. That will be fixed when</div><div class='add'>+		 * the device is brought up.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!rcu_access_pointer(ifp-&gt;rt-&gt;fib6_node))</div><div class='add'>+		if (ifp-&gt;rt &amp;&amp; !rcu_access_pointer(ifp-&gt;rt-&gt;fib6_node)) {</div><div class='ctx'> 			ip6_ins_rt(net, ifp-&gt;rt);</div><div class='add'>+		} else if (!ifp-&gt;rt &amp;&amp; (ifp-&gt;idev-&gt;dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+			pr_warn("BUG: Address %pI6c on device %s is missing its host route.\n",</div><div class='add'>+				&amp;ifp-&gt;addr, ifp-&gt;idev-&gt;dev-&gt;name);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (ifp-&gt;idev-&gt;cnf.forwarding)</div><div class='ctx'> 			addrconf_join_anycast(ifp);</div><div class='ctx'> 		if (!ipv6_addr_any(&amp;ifp-&gt;peer_addr))</div><div class='del'>-			addrconf_prefix_route(&amp;ifp-&gt;peer_addr, 128, 0,</div><div class='del'>-					      ifp-&gt;idev-&gt;dev, 0, 0,</div><div class='del'>-					      GFP_ATOMIC);</div><div class='add'>+			addrconf_prefix_route(&amp;ifp-&gt;peer_addr, 128,</div><div class='add'>+					      ifp-&gt;rt_priority, ifp-&gt;idev-&gt;dev,</div><div class='add'>+					      0, 0, GFP_ATOMIC);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RTM_DELADDR:</div><div class='ctx'> 		if (ifp-&gt;idev-&gt;cnf.forwarding)</div><div class='hunk'>@@ -5696,12 +6301,13 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)</div><div class='ctx'> 			struct fib6_info *rt;</div><div class='ctx'> </div><div class='ctx'> 			rt = addrconf_get_prefix_route(&amp;ifp-&gt;peer_addr, 128,</div><div class='del'>-						       ifp-&gt;idev-&gt;dev, 0, 0);</div><div class='add'>+						       ifp-&gt;idev-&gt;dev, 0, 0,</div><div class='add'>+						       false);</div><div class='ctx'> 			if (rt)</div><div class='del'>-				ip6_del_rt(net, rt);</div><div class='add'>+				ip6_del_rt(net, rt, false);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ifp-&gt;rt) {</div><div class='del'>-			ip6_del_rt(net, ifp-&gt;rt);</div><div class='add'>+			ip6_del_rt(net, ifp-&gt;rt, false);</div><div class='ctx'> 			ifp-&gt;rt = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		rt_genid_bump_ipv6(net);</div><div class='hunk'>@@ -5712,17 +6318,14 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)</div><div class='ctx'> </div><div class='ctx'> static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='del'>-	rcu_read_lock_bh();</div><div class='ctx'> 	if (likely(ifp-&gt;idev-&gt;dead == 0))</div><div class='ctx'> 		__ipv6_ifa_notify(event, ifp);</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int addrconf_sysctl_forward(struct ctl_table *ctl, int write,</div><div class='del'>-			   void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int addrconf_sysctl_forward(const struct ctl_table *ctl, int write,</div><div class='add'>+		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int val = *valp;</div><div class='hunk'>@@ -5746,9 +6349,8 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,</div><div class='del'>-			void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int addrconf_sysctl_mtu(const struct ctl_table *ctl, int write,</div><div class='add'>+		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_dev *idev = ctl-&gt;extra1;</div><div class='ctx'> 	int min_mtu = IPV6_MIN_MTU;</div><div class='hunk'>@@ -5781,46 +6383,46 @@ static void addrconf_disable_change(struct net *net, __s32 newf)</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	for_each_netdev(net, dev) {</div><div class='del'>-		idev = __in6_dev_get(dev);</div><div class='add'>+		idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> 		if (idev) {</div><div class='ctx'> 			int changed = (!idev-&gt;cnf.disable_ipv6) ^ (!newf);</div><div class='del'>-			idev-&gt;cnf.disable_ipv6 = newf;</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(idev-&gt;cnf.disable_ipv6, newf);</div><div class='ctx'> 			if (changed)</div><div class='ctx'> 				dev_disable_change(idev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)</div><div class='add'>+static int addrconf_disable_ipv6(const struct ctl_table *table, int *p, int newf)</div><div class='ctx'> {</div><div class='del'>-	struct net *net;</div><div class='add'>+	struct net *net = (struct net *)table-&gt;extra2;</div><div class='ctx'> 	int old;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='del'>-</div><div class='del'>-	net = (struct net *)table-&gt;extra2;</div><div class='del'>-	old = *p;</div><div class='del'>-	*p = newf;</div><div class='del'>-</div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_dflt-&gt;disable_ipv6) {</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		WRITE_ONCE(*p, newf);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='add'>+		return restart_syscall();</div><div class='add'>+</div><div class='add'>+	old = *p;</div><div class='add'>+	WRITE_ONCE(*p, newf);</div><div class='add'>+</div><div class='ctx'> 	if (p == &amp;net-&gt;ipv6.devconf_all-&gt;disable_ipv6) {</div><div class='del'>-		net-&gt;ipv6.devconf_dflt-&gt;disable_ipv6 = newf;</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv6.devconf_dflt-&gt;disable_ipv6, newf);</div><div class='ctx'> 		addrconf_disable_change(net, newf);</div><div class='del'>-	} else if ((!newf) ^ (!old))</div><div class='add'>+	} else if ((!newf) ^ (!old)) {</div><div class='ctx'> 		dev_disable_change((struct inet6_dev *)table-&gt;extra1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int addrconf_sysctl_disable(struct ctl_table *ctl, int write,</div><div class='del'>-			    void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int addrconf_sysctl_disable(const struct ctl_table *ctl, int write,</div><div class='add'>+		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int val = *valp;</div><div class='hunk'>@@ -5844,9 +6446,8 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int addrconf_sysctl_proxy_ndp(struct ctl_table *ctl, int write,</div><div class='del'>-			      void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int addrconf_sysctl_proxy_ndp(const struct ctl_table *ctl, int write,</div><div class='add'>+		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5859,20 +6460,20 @@ int addrconf_sysctl_proxy_ndp(struct ctl_table *ctl, int write,</div><div class='ctx'> 	if (write &amp;&amp; old != new) {</div><div class='ctx'> 		struct net *net = ctl-&gt;extra2;</div><div class='ctx'> </div><div class='del'>-		if (!rtnl_trylock())</div><div class='add'>+		if (!rtnl_net_trylock(net))</div><div class='ctx'> 			return restart_syscall();</div><div class='ctx'> </div><div class='del'>-		if (valp == &amp;net-&gt;ipv6.devconf_dflt-&gt;proxy_ndp)</div><div class='add'>+		if (valp == &amp;net-&gt;ipv6.devconf_dflt-&gt;proxy_ndp) {</div><div class='ctx'> 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='ctx'> 						     NETCONFA_PROXY_NEIGH,</div><div class='ctx'> 						     NETCONFA_IFINDEX_DEFAULT,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_dflt);</div><div class='del'>-		else if (valp == &amp;net-&gt;ipv6.devconf_all-&gt;proxy_ndp)</div><div class='add'>+		} else if (valp == &amp;net-&gt;ipv6.devconf_all-&gt;proxy_ndp) {</div><div class='ctx'> 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='ctx'> 						     NETCONFA_PROXY_NEIGH,</div><div class='ctx'> 						     NETCONFA_IFINDEX_ALL,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_all);</div><div class='del'>-		else {</div><div class='add'>+		} else {</div><div class='ctx'> 			struct inet6_dev *idev = ctl-&gt;extra1;</div><div class='ctx'> </div><div class='ctx'> 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='hunk'>@@ -5880,14 +6481,14 @@ int addrconf_sysctl_proxy_ndp(struct ctl_table *ctl, int write,</div><div class='ctx'> 						     idev-&gt;dev-&gt;ifindex,</div><div class='ctx'> 						     &amp;idev-&gt;cnf);</div><div class='ctx'> 		}</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_sysctl_addr_gen_mode(struct ctl_table *ctl, int write,</div><div class='del'>-					 void __user *buffer, size_t *lenp,</div><div class='add'>+static int addrconf_sysctl_addr_gen_mode(const struct ctl_table *ctl, int write,</div><div class='add'>+					 void *buffer, size_t *lenp,</div><div class='ctx'> 					 loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -5900,7 +6501,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_table *ctl, int write,</div><div class='ctx'> 		.mode = ctl-&gt;mode,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='ctx'> 	new_val = *((u32 *)ctl-&gt;data);</div><div class='hunk'>@@ -5922,34 +6523,39 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_table *ctl, int write,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (idev-&gt;cnf.addr_gen_mode != new_val) {</div><div class='del'>-				idev-&gt;cnf.addr_gen_mode = new_val;</div><div class='del'>-				addrconf_dev_config(idev-&gt;dev);</div><div class='add'>+				WRITE_ONCE(idev-&gt;cnf.addr_gen_mode, new_val);</div><div class='add'>+				netdev_lock_ops(idev-&gt;dev);</div><div class='add'>+				addrconf_init_auto_addrs(idev-&gt;dev);</div><div class='add'>+				netdev_unlock_ops(idev-&gt;dev);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (&amp;net-&gt;ipv6.devconf_all-&gt;addr_gen_mode == ctl-&gt;data) {</div><div class='ctx'> 			struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-			net-&gt;ipv6.devconf_dflt-&gt;addr_gen_mode = new_val;</div><div class='add'>+			WRITE_ONCE(net-&gt;ipv6.devconf_dflt-&gt;addr_gen_mode, new_val);</div><div class='ctx'> 			for_each_netdev(net, dev) {</div><div class='del'>-				idev = __in6_dev_get(dev);</div><div class='add'>+				idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> 				if (idev &amp;&amp;</div><div class='ctx'> 				    idev-&gt;cnf.addr_gen_mode != new_val) {</div><div class='del'>-					idev-&gt;cnf.addr_gen_mode = new_val;</div><div class='del'>-					addrconf_dev_config(idev-&gt;dev);</div><div class='add'>+					WRITE_ONCE(idev-&gt;cnf.addr_gen_mode,</div><div class='add'>+						  new_val);</div><div class='add'>+					netdev_lock_ops(idev-&gt;dev);</div><div class='add'>+					addrconf_init_auto_addrs(idev-&gt;dev);</div><div class='add'>+					netdev_unlock_ops(idev-&gt;dev);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*((u32 *)ctl-&gt;data) = new_val;</div><div class='add'>+		WRITE_ONCE(*((u32 *)ctl-&gt;data), new_val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,</div><div class='del'>-					 void __user *buffer, size_t *lenp,</div><div class='add'>+static int addrconf_sysctl_stable_secret(const struct ctl_table *ctl, int write,</div><div class='add'>+					 void *buffer, size_t *lenp,</div><div class='ctx'> 					 loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -5965,7 +6571,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,</div><div class='ctx'> 	lctl.maxlen = IPV6_MAX_STRLEN;</div><div class='ctx'> 	lctl.data = str;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='ctx'> 		return restart_syscall();</div><div class='ctx'> </div><div class='ctx'> 	if (!write &amp;&amp; !secret-&gt;initialized) {</div><div class='hunk'>@@ -5995,29 +6601,29 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,</div><div class='ctx'> 		struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 		for_each_netdev(net, dev) {</div><div class='del'>-			struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='add'>+			struct inet6_dev *idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> </div><div class='ctx'> 			if (idev) {</div><div class='del'>-				idev-&gt;cnf.addr_gen_mode =</div><div class='del'>-					IN6_ADDR_GEN_MODE_STABLE_PRIVACY;</div><div class='add'>+				WRITE_ONCE(idev-&gt;cnf.addr_gen_mode,</div><div class='add'>+					   IN6_ADDR_GEN_MODE_STABLE_PRIVACY);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct inet6_dev *idev = ctl-&gt;extra1;</div><div class='ctx'> </div><div class='del'>-		idev-&gt;cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;</div><div class='add'>+		WRITE_ONCE(idev-&gt;cnf.addr_gen_mode,</div><div class='add'>+			   IN6_ADDR_GEN_MODE_STABLE_PRIVACY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl,</div><div class='del'>-						int write,</div><div class='del'>-						void __user *buffer,</div><div class='add'>+int addrconf_sysctl_ignore_routes_with_linkdown(const struct ctl_table *ctl,</div><div class='add'>+						int write, void *buffer,</div><div class='ctx'> 						size_t *lenp,</div><div class='ctx'> 						loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -6062,16 +6668,17 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)</div><div class='ctx'> 	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='ctx'> 		spin_lock(&amp;ifa-&gt;lock);</div><div class='ctx'> 		if (ifa-&gt;rt) {</div><div class='del'>-			struct fib6_info *rt = ifa-&gt;rt;</div><div class='add'>+			/* host routes only use builtin fib6_nh */</div><div class='add'>+			struct fib6_nh *nh = ifa-&gt;rt-&gt;fib6_nh;</div><div class='ctx'> 			int cpu;</div><div class='ctx'> </div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			ifa-&gt;rt-&gt;dst_nopolicy = val ? true : false;</div><div class='del'>-			if (rt-&gt;rt6i_pcpu) {</div><div class='add'>+			if (nh-&gt;rt6i_pcpu) {</div><div class='ctx'> 				for_each_possible_cpu(cpu) {</div><div class='ctx'> 					struct rt6_info **rtp;</div><div class='ctx'> </div><div class='del'>-					rtp = per_cpu_ptr(rt-&gt;rt6i_pcpu, cpu);</div><div class='add'>+					rtp = per_cpu_ptr(nh-&gt;rt6i_pcpu, cpu);</div><div class='ctx'> 					addrconf_set_nopolicy(*rtp, val);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -6083,27 +6690,26 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-int addrconf_disable_policy(struct ctl_table *ctl, int *valp, int val)</div><div class='add'>+int addrconf_disable_policy(const struct ctl_table *ctl, int *valp, int val)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = (struct net *)ctl-&gt;extra2;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='ctx'> </div><div class='del'>-	*valp = val;</div><div class='del'>-</div><div class='del'>-	net = (struct net *)ctl-&gt;extra2;</div><div class='ctx'> 	if (valp == &amp;net-&gt;ipv6.devconf_dflt-&gt;disable_policy) {</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+		WRITE_ONCE(*valp, val);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!rtnl_net_trylock(net))</div><div class='add'>+		return restart_syscall();</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(*valp, val);</div><div class='add'>+</div><div class='ctx'> 	if (valp == &amp;net-&gt;ipv6.devconf_all-&gt;disable_policy)  {</div><div class='ctx'> 		struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 		for_each_netdev(net, dev) {</div><div class='del'>-			idev = __in6_dev_get(dev);</div><div class='add'>+			idev = __in6_dev_get_rtnl_net(dev);</div><div class='ctx'> 			if (idev)</div><div class='ctx'> 				addrconf_disable_policy_idev(idev, val);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6112,14 +6718,12 @@ int addrconf_disable_policy(struct ctl_table *ctl, int *valp, int val)</div><div class='ctx'> 		addrconf_disable_policy_idev(idev, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(net);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int addrconf_sysctl_disable_policy(struct ctl_table *ctl, int write,</div><div class='del'>-				   void __user *buffer, size_t *lenp,</div><div class='del'>-				   loff_t *ppos)</div><div class='add'>+static int addrconf_sysctl_disable_policy(const struct ctl_table *ctl, int write,</div><div class='add'>+				   void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int *valp = ctl-&gt;data;</div><div class='ctx'> 	int val = *valp;</div><div class='hunk'>@@ -6140,10 +6744,78 @@ int addrconf_sysctl_disable_policy(struct ctl_table *ctl, int write,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void addrconf_force_forward_change(struct net *net, __s32 newf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+</div><div class='add'>+	for_each_netdev(net, dev) {</div><div class='add'>+		idev = __in6_dev_get_rtnl_net(dev);</div><div class='add'>+		if (idev) {</div><div class='add'>+			int changed = (!idev-&gt;cnf.force_forwarding) ^ (!newf);</div><div class='add'>+</div><div class='add'>+			WRITE_ONCE(idev-&gt;cnf.force_forwarding, newf);</div><div class='add'>+			if (changed)</div><div class='add'>+				inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,</div><div class='add'>+							     NETCONFA_FORCE_FORWARDING,</div><div class='add'>+							     dev-&gt;ifindex, &amp;idev-&gt;cnf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int write,</div><div class='add'>+					    void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = ctl-&gt;extra1;</div><div class='add'>+	struct ctl_table tmp_ctl = *ctl;</div><div class='add'>+	struct net *net = ctl-&gt;extra2;</div><div class='add'>+	int *valp = ctl-&gt;data;</div><div class='add'>+	int new_val = *valp;</div><div class='add'>+	int old_val = *valp;</div><div class='add'>+	loff_t pos = *ppos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tmp_ctl.extra1 = SYSCTL_ZERO;</div><div class='add'>+	tmp_ctl.extra2 = SYSCTL_ONE;</div><div class='add'>+	tmp_ctl.data = &amp;new_val;</div><div class='add'>+</div><div class='add'>+	ret = proc_douintvec_minmax(&amp;tmp_ctl, write, buffer, lenp, ppos);</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; old_val != new_val) {</div><div class='add'>+		if (!rtnl_net_trylock(net))</div><div class='add'>+			return restart_syscall();</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(*valp, new_val);</div><div class='add'>+</div><div class='add'>+		if (valp == &amp;net-&gt;ipv6.devconf_dflt-&gt;force_forwarding) {</div><div class='add'>+			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='add'>+						     NETCONFA_FORCE_FORWARDING,</div><div class='add'>+						     NETCONFA_IFINDEX_DEFAULT,</div><div class='add'>+						     net-&gt;ipv6.devconf_dflt);</div><div class='add'>+		} else if (valp == &amp;net-&gt;ipv6.devconf_all-&gt;force_forwarding) {</div><div class='add'>+			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='add'>+						     NETCONFA_FORCE_FORWARDING,</div><div class='add'>+						     NETCONFA_IFINDEX_ALL,</div><div class='add'>+						     net-&gt;ipv6.devconf_all);</div><div class='add'>+</div><div class='add'>+			addrconf_force_forward_change(net, new_val);</div><div class='add'>+		} else {</div><div class='add'>+			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='add'>+						     NETCONFA_FORCE_FORWARDING,</div><div class='add'>+						     idev-&gt;dev-&gt;ifindex,</div><div class='add'>+						     &amp;idev-&gt;cnf);</div><div class='add'>+		}</div><div class='add'>+		rtnl_net_unlock(net);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		*ppos = pos;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int minus_one = -1;</div><div class='del'>-static const int zero = 0;</div><div class='del'>-static const int one = 1;</div><div class='ctx'> static const int two_five_five = 255;</div><div class='add'>+static u32 ioam6_if_id_max = U16_MAX;</div><div class='ctx'> </div><div class='ctx'> static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -6159,7 +6831,7 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= (void *)&amp;one,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ONE,</div><div class='ctx'> 		.extra2		= (void *)&amp;two_five_five,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -6271,6 +6943,13 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname       = "regen_min_advance",</div><div class='add'>+		.data           = &amp;ipv6_devconf.regen_min_advance,</div><div class='add'>+		.maxlen         = sizeof(int),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "regen_max_retry",</div><div class='ctx'> 		.data		= &amp;ipv6_devconf.regen_max_retry,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -6299,6 +6978,14 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "ra_defrtr_metric",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ra_defrtr_metric,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "accept_ra_min_hop_limit",</div><div class='ctx'> 		.data		= &amp;ipv6_devconf.accept_ra_min_hop_limit,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -6306,12 +6993,37 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.procname	= "accept_ra_min_lft",</div><div class='add'>+		.data		= &amp;ipv6_devconf.accept_ra_min_lft,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.procname	= "accept_ra_pinfo",</div><div class='ctx'> 		.data		= &amp;ipv6_devconf.accept_ra_pinfo,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ra_honor_pio_life",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ra_honor_pio_life,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ra_honor_pio_pflag",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ra_honor_pio_pflag,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "accept_ra_rtr_pref",</div><div class='hunk'>@@ -6499,10 +7211,10 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.proc_handler   = proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname		= "addr_gen_mode",</div><div class='del'>-		.data			= &amp;ipv6_devconf.addr_gen_mode,</div><div class='del'>-		.maxlen			= sizeof(int),</div><div class='del'>-		.mode			= 0644,</div><div class='add'>+		.procname	= "addr_gen_mode",</div><div class='add'>+		.data		= &amp;ipv6_devconf.addr_gen_mode,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= addrconf_sysctl_addr_gen_mode,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -6518,26 +7230,83 @@ static const struct ctl_table addrconf_sysctl[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= (void *)&amp;zero,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ZERO,</div><div class='ctx'> 		.extra2		= (void *)&amp;two_five_five,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* sentinel */</div><div class='del'>-	}</div><div class='add'>+		.procname	= "rpl_seg_enabled",</div><div class='add'>+		.data		= &amp;ipv6_devconf.rpl_seg_enabled,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler   = proc_dointvec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ioam6_enabled",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ioam6_enabled,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ZERO,</div><div class='add'>+		.extra2		= (void *)SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ioam6_id",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ioam6_id,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ZERO,</div><div class='add'>+		.extra2		= (void *)&amp;ioam6_if_id_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ioam6_id_wide",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ioam6_id_wide,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ndisc_evict_nocarrier",</div><div class='add'>+		.data		= &amp;ipv6_devconf.ndisc_evict_nocarrier,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= (void *)SYSCTL_ZERO,</div><div class='add'>+		.extra2		= (void *)SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "accept_untracked_na",</div><div class='add'>+		.data		= &amp;ipv6_devconf.accept_untracked_na,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_TWO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "force_forwarding",</div><div class='add'>+		.data		= &amp;ipv6_devconf.force_forwarding,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= addrconf_sysctl_force_forwarding,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __addrconf_sysctl_register(struct net *net, char *dev_name,</div><div class='ctx'> 		struct inet6_dev *idev, struct ipv6_devconf *p)</div><div class='ctx'> {</div><div class='add'>+	size_t table_size = ARRAY_SIZE(addrconf_sysctl);</div><div class='ctx'> 	int i, ifindex;</div><div class='ctx'> 	struct ctl_table *table;</div><div class='ctx'> 	char path[sizeof("net/ipv6/conf/") + IFNAMSIZ];</div><div class='ctx'> </div><div class='del'>-	table = kmemdup(addrconf_sysctl, sizeof(addrconf_sysctl), GFP_KERNEL);</div><div class='add'>+	table = kmemdup(addrconf_sysctl, sizeof(addrconf_sysctl), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!table)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; table[i].data; i++) {</div><div class='add'>+	for (i = 0; i &lt; table_size; i++) {</div><div class='ctx'> 		table[i].data += (char *)p - (char *)&amp;ipv6_devconf;</div><div class='ctx'> 		/* If one of these is already set, then it is not safe to</div><div class='ctx'> 		 * overwrite either of them: this makes proc_dointvec_minmax</div><div class='hunk'>@@ -6551,7 +7320,8 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name,</div><div class='ctx'> </div><div class='ctx'> 	snprintf(path, sizeof(path), "net/ipv6/conf/%s", dev_name);</div><div class='ctx'> </div><div class='del'>-	p-&gt;sysctl_header = register_net_sysctl(net, path, table);</div><div class='add'>+	p-&gt;sysctl_header = register_net_sysctl_sz(net, path, table,</div><div class='add'>+						  table_size);</div><div class='ctx'> 	if (!p-&gt;sysctl_header)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='hunk'>@@ -6574,7 +7344,7 @@ out:</div><div class='ctx'> static void __addrconf_sysctl_unregister(struct net *net,</div><div class='ctx'> 					 struct ipv6_devconf *p, int ifindex)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	if (!p-&gt;sysctl_header)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6621,6 +7391,14 @@ static int __net_init addrconf_init_net(struct net *net)</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	struct ipv6_devconf *all, *dflt;</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;net-&gt;ipv6.addrconf_hash_lock);</div><div class='add'>+	INIT_DEFERRABLE_WORK(&amp;net-&gt;ipv6.addr_chk_work, addrconf_verify_work);</div><div class='add'>+	net-&gt;ipv6.inet6_addr_lst = kcalloc(IN6_ADDR_HSIZE,</div><div class='add'>+					   sizeof(struct hlist_head),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!net-&gt;ipv6.inet6_addr_lst)</div><div class='add'>+		goto err_alloc_addr;</div><div class='add'>+</div><div class='ctx'> 	all = kmemdup(&amp;ipv6_devconf, sizeof(ipv6_devconf), GFP_KERNEL);</div><div class='ctx'> 	if (!all)</div><div class='ctx'> 		goto err_alloc_all;</div><div class='hunk'>@@ -6629,6 +7407,28 @@ static int __net_init addrconf_init_net(struct net *net)</div><div class='ctx'> 	if (!dflt)</div><div class='ctx'> 		goto err_alloc_dflt;</div><div class='ctx'> </div><div class='add'>+	if (!net_eq(net, &amp;init_net)) {</div><div class='add'>+		switch (net_inherit_devconf()) {</div><div class='add'>+		case 1:  /* copy from init_net */</div><div class='add'>+			memcpy(all, init_net.ipv6.devconf_all,</div><div class='add'>+			       sizeof(ipv6_devconf));</div><div class='add'>+			memcpy(dflt, init_net.ipv6.devconf_dflt,</div><div class='add'>+			       sizeof(ipv6_devconf_dflt));</div><div class='add'>+			break;</div><div class='add'>+		case 3: /* copy from the current netns */</div><div class='add'>+			memcpy(all, current-&gt;nsproxy-&gt;net_ns-&gt;ipv6.devconf_all,</div><div class='add'>+			       sizeof(ipv6_devconf));</div><div class='add'>+			memcpy(dflt,</div><div class='add'>+			       current-&gt;nsproxy-&gt;net_ns-&gt;ipv6.devconf_dflt,</div><div class='add'>+			       sizeof(ipv6_devconf_dflt));</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+		case 2:</div><div class='add'>+			/* use compiled values */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* these will be inherited by all namespaces */</div><div class='ctx'> 	dflt-&gt;autoconf = ipv6_defaults.autoconf;</div><div class='ctx'> 	dflt-&gt;disable_ipv6 = ipv6_defaults.disable_ipv6;</div><div class='hunk'>@@ -6655,15 +7455,21 @@ err_reg_dflt:</div><div class='ctx'> 	__addrconf_sysctl_unregister(net, all, NETCONFA_IFINDEX_ALL);</div><div class='ctx'> err_reg_all:</div><div class='ctx'> 	kfree(dflt);</div><div class='add'>+	net-&gt;ipv6.devconf_dflt = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> err_alloc_dflt:</div><div class='ctx'> 	kfree(all);</div><div class='add'>+	net-&gt;ipv6.devconf_all = NULL;</div><div class='ctx'> err_alloc_all:</div><div class='add'>+	kfree(net-&gt;ipv6.inet6_addr_lst);</div><div class='add'>+err_alloc_addr:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit addrconf_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> 	__addrconf_sysctl_unregister(net, net-&gt;ipv6.devconf_dflt,</div><div class='ctx'> 				     NETCONFA_IFINDEX_DEFAULT);</div><div class='hunk'>@@ -6671,7 +7477,19 @@ static void __net_exit addrconf_exit_net(struct net *net)</div><div class='ctx'> 				     NETCONFA_IFINDEX_ALL);</div><div class='ctx'> #endif</div><div class='ctx'> 	kfree(net-&gt;ipv6.devconf_dflt);</div><div class='add'>+	net-&gt;ipv6.devconf_dflt = NULL;</div><div class='ctx'> 	kfree(net-&gt;ipv6.devconf_all);</div><div class='add'>+	net-&gt;ipv6.devconf_all = NULL;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;net-&gt;ipv6.addr_chk_work);</div><div class='add'>+	/*</div><div class='add'>+	 *	Check hash table, then free it.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++)</div><div class='add'>+		WARN_ON_ONCE(!hlist_empty(&amp;net-&gt;ipv6.inet6_addr_lst[i]));</div><div class='add'>+</div><div class='add'>+	kfree(net-&gt;ipv6.inet6_addr_lst);</div><div class='add'>+	net-&gt;ipv6.inet6_addr_lst = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations addrconf_ops = {</div><div class='hunk'>@@ -6687,6 +7505,27 @@ static struct rtnl_af_ops inet6_ops __read_mostly = {</div><div class='ctx'> 	.set_link_af	  = inet6_set_link_af,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler addrconf_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETLINK,</div><div class='add'>+	 .dumpit = inet6_dump_ifinfo, .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_NEWADDR,</div><div class='add'>+	 .doit = inet6_rtm_newaddr, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_DELADDR,</div><div class='add'>+	 .doit = inet6_rtm_deladdr, .flags = RTNL_FLAG_DOIT_PERNET},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETADDR,</div><div class='add'>+	 .doit = inet6_rtm_getaddr, .dumpit = inet6_dump_ifaddr,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETMULTICAST,</div><div class='add'>+	 .dumpit = inet6_dump_ifmcaddr,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETANYCAST,</div><div class='add'>+	 .dumpit = inet6_dump_ifacaddr,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETNETCONF,</div><div class='add'>+	 .doit = inet6_netconf_get_devconf, .dumpit = inet6_netconf_dump_devconf,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Init / cleanup code</div><div class='ctx'>  */</div><div class='hunk'>@@ -6694,7 +7533,7 @@ static struct rtnl_af_ops inet6_ops __read_mostly = {</div><div class='ctx'> int __init addrconf_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = ipv6_addr_label_init();</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -6707,33 +7546,16 @@ int __init addrconf_init(void)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_addrlabel;</div><div class='ctx'> </div><div class='del'>-	addrconf_wq = create_workqueue("ipv6_addrconf");</div><div class='add'>+	/* All works using addrconf_wq need to lock rtnl. */</div><div class='add'>+	addrconf_wq = create_singlethread_workqueue("ipv6_addrconf");</div><div class='ctx'> 	if (!addrconf_wq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out_nowq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The addrconf netdev notifier requires that loopback_dev</div><div class='del'>-	 * has it's ipv6 private information allocated and setup</div><div class='del'>-	 * before it can bring up and give link-local addresses</div><div class='del'>-	 * to other devices which are up.</div><div class='del'>-	 *</div><div class='del'>-	 * Unfortunately, loopback_dev is not necessarily the first</div><div class='del'>-	 * entry in the global dev_base list of net devices.  In fact,</div><div class='del'>-	 * it is likely to be the very last entry on that list.</div><div class='del'>-	 * So this causes the notifier registry below to try and</div><div class='del'>-	 * give link-local addresses to all devices besides loopback_dev</div><div class='del'>-	 * first, then loopback_dev, which cases all the non-loopback_dev</div><div class='del'>-	 * devices to fail to get a link-local address.</div><div class='del'>-	 *</div><div class='del'>-	 * So, as a temporary fix, allocate the ipv6 structure for</div><div class='del'>-	 * loopback_dev first by hand.</div><div class='del'>-	 * Longer term, all of the dependencies ipv6 has upon the loopback</div><div class='del'>-	 * device and it being up should be removed.</div><div class='del'>-	 */</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	idev = ipv6_add_dev(init_net.loopback_dev);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_lock(&amp;init_net);</div><div class='add'>+	idev = ipv6_add_dev(blackhole_netdev);</div><div class='add'>+	rtnl_net_unlock(&amp;init_net);</div><div class='ctx'> 	if (IS_ERR(idev)) {</div><div class='ctx'> 		err = PTR_ERR(idev);</div><div class='ctx'> 		goto errlo;</div><div class='hunk'>@@ -6741,47 +7563,18 @@ int __init addrconf_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ip6_route_init_special_entries();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++)</div><div class='del'>-		INIT_HLIST_HEAD(&amp;inet6_addr_lst[i]);</div><div class='del'>-</div><div class='ctx'> 	register_netdevice_notifier(&amp;ipv6_dev_notf);</div><div class='ctx'> </div><div class='del'>-	addrconf_verify();</div><div class='add'>+	addrconf_verify(&amp;init_net);</div><div class='ctx'> </div><div class='del'>-	rtnl_af_register(&amp;inet6_ops);</div><div class='add'>+	err = rtnl_af_register(&amp;inet6_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto erraf;</div><div class='ctx'> </div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETLINK,</div><div class='del'>-				   NULL, inet6_dump_ifinfo, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = rtnl_register_many(addrconf_rtnl_msg_handlers);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_NEWADDR,</div><div class='del'>-				   inet6_rtm_newaddr, NULL, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_DELADDR,</div><div class='del'>-				   inet6_rtm_deladdr, NULL, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETADDR,</div><div class='del'>-				   inet6_rtm_getaddr, inet6_dump_ifaddr,</div><div class='del'>-				   RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETMULTICAST,</div><div class='del'>-				   NULL, inet6_dump_ifmcaddr, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETANYCAST,</div><div class='del'>-				   NULL, inet6_dump_ifacaddr, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETNETCONF,</div><div class='del'>-				   inet6_netconf_get_devconf,</div><div class='del'>-				   inet6_netconf_dump_devconf,</div><div class='del'>-				   RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='ctx'> 	err = ipv6_addr_label_rtnl_register();</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='hunk'>@@ -6790,6 +7583,7 @@ int __init addrconf_init(void)</div><div class='ctx'> errout:</div><div class='ctx'> 	rtnl_unregister_all(PF_INET6);</div><div class='ctx'> 	rtnl_af_unregister(&amp;inet6_ops);</div><div class='add'>+erraf:</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;ipv6_dev_notf);</div><div class='ctx'> errlo:</div><div class='ctx'> 	destroy_workqueue(addrconf_wq);</div><div class='hunk'>@@ -6804,7 +7598,6 @@ out:</div><div class='ctx'> void addrconf_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdevice_notifier(&amp;ipv6_dev_notf);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;addrconf_ops);</div><div class='hunk'>@@ -6812,25 +7605,17 @@ void addrconf_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_af_unregister(&amp;inet6_ops);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rtnl_net_lock(&amp;init_net);</div><div class='ctx'> </div><div class='ctx'> 	/* clean dev list */</div><div class='ctx'> 	for_each_netdev(&amp;init_net, dev) {</div><div class='del'>-		if (__in6_dev_get(dev) == NULL)</div><div class='add'>+		if (!__in6_dev_get_rtnl_net(dev))</div><div class='ctx'> 			continue;</div><div class='del'>-		addrconf_ifdown(dev, 1);</div><div class='add'>+		addrconf_ifdown(dev, true);</div><div class='ctx'> 	}</div><div class='del'>-	addrconf_ifdown(init_net.loopback_dev, 2);</div><div class='add'>+	addrconf_ifdown(init_net.loopback_dev, true);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Check hash table.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_bh(&amp;addrconf_hash_lock);</div><div class='del'>-	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++)</div><div class='del'>-		WARN_ON(!hlist_empty(&amp;inet6_addr_lst[i]));</div><div class='del'>-	spin_unlock_bh(&amp;addrconf_hash_lock);</div><div class='del'>-	cancel_delayed_work(&amp;addr_chk_work);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rtnl_net_unlock(&amp;init_net);</div><div class='ctx'> </div><div class='ctx'> 	destroy_workqueue(addrconf_wq);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c<br/>index 5cd0029d930e..c008d21925d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrconf_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrconf_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrconf_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/addrconf_core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 library code, needed by static components when full IPv6 support is</div><div class='ctx'>  * not configured or static.</div><div class='hunk'>@@ -5,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -127,9 +129,15 @@ int inet6addr_validator_notifier_call_chain(unsigned long val, void *v)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);</div><div class='ctx'> </div><div class='del'>-static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1,</div><div class='del'>-					struct dst_entry **u2,</div><div class='del'>-					struct flowi6 *u3)</div><div class='add'>+static struct dst_entry *eafnosupport_ipv6_dst_lookup_flow(struct net *net,</div><div class='add'>+							   const struct sock *sk,</div><div class='add'>+							   struct flowi6 *fl6,</div><div class='add'>+							   const struct in6_addr *final_dst)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EAFNOSUPPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eafnosupport_ipv6_route_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return -EAFNOSUPPORT;</div><div class='ctx'> }</div><div class='hunk'>@@ -139,59 +147,99 @@ static struct fib6_table *eafnosupport_fib6_get_table(struct net *net, u32 id)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *</div><div class='add'>+static int</div><div class='ctx'> eafnosupport_fib6_table_lookup(struct net *net, struct fib6_table *table,</div><div class='del'>-			       int oif, struct flowi6 *fl6, int flags)</div><div class='add'>+			       int oif, struct flowi6 *fl6,</div><div class='add'>+			       struct fib6_result *res, int flags)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *</div><div class='add'>+static int</div><div class='ctx'> eafnosupport_fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='del'>-			 int flags)</div><div class='add'>+			 struct fib6_result *res, int flags)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *</div><div class='del'>-eafnosupport_fib6_multipath_select(const struct net *net, struct fib6_info *f6i,</div><div class='del'>-				   struct flowi6 *fl6, int oif,</div><div class='del'>-				   const struct sk_buff *skb, int strict)</div><div class='add'>+static void</div><div class='add'>+eafnosupport_fib6_select_path(const struct net *net, struct fib6_result *res,</div><div class='add'>+			      struct flowi6 *fl6, int oif, bool have_oif_match,</div><div class='add'>+			      const struct sk_buff *skb, int strict)</div><div class='ctx'> {</div><div class='del'>-	return f6i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-eafnosupport_ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,</div><div class='del'>-			       struct in6_addr *saddr)</div><div class='add'>+eafnosupport_ip6_mtu_from_fib6(const struct fib6_result *res,</div><div class='add'>+			       const struct in6_addr *daddr,</div><div class='add'>+			       const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int eafnosupport_fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,</div><div class='add'>+				     struct fib6_config *cfg, gfp_t gfp_flags,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG(extack, "IPv6 support not enabled in kernel");</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eafnosupport_ip6_del_rt(struct net *net, struct fib6_info *rt,</div><div class='add'>+				   bool skip_notify)</div><div class='add'>+{</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eafnosupport_ipv6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				      int (*output)(struct net *, struct sock *, struct sk_buff *))</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -EAFNOSUPPORT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *eafnosupport_ipv6_dev_find(struct net *net, const struct in6_addr *addr,</div><div class='add'>+						     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EAFNOSUPPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ipv6_stub *ipv6_stub __read_mostly = &amp;(struct ipv6_stub) {</div><div class='del'>-	.ipv6_dst_lookup   = eafnosupport_ipv6_dst_lookup,</div><div class='add'>+	.ipv6_dst_lookup_flow = eafnosupport_ipv6_dst_lookup_flow,</div><div class='add'>+	.ipv6_route_input  = eafnosupport_ipv6_route_input,</div><div class='ctx'> 	.fib6_get_table    = eafnosupport_fib6_get_table,</div><div class='ctx'> 	.fib6_table_lookup = eafnosupport_fib6_table_lookup,</div><div class='ctx'> 	.fib6_lookup       = eafnosupport_fib6_lookup,</div><div class='del'>-	.fib6_multipath_select = eafnosupport_fib6_multipath_select,</div><div class='add'>+	.fib6_select_path  = eafnosupport_fib6_select_path,</div><div class='ctx'> 	.ip6_mtu_from_fib6 = eafnosupport_ip6_mtu_from_fib6,</div><div class='add'>+	.fib6_nh_init	   = eafnosupport_fib6_nh_init,</div><div class='add'>+	.ip6_del_rt	   = eafnosupport_ip6_del_rt,</div><div class='add'>+	.ipv6_fragment	   = eafnosupport_ipv6_fragment,</div><div class='add'>+	.ipv6_dev_find     = eafnosupport_ipv6_dev_find,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipv6_stub);</div><div class='ctx'> </div><div class='ctx'> /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */</div><div class='del'>-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;</div><div class='add'>+const struct in6_addr in6addr_loopback __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_LOOPBACK_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_loopback);</div><div class='del'>-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;</div><div class='add'>+const struct in6_addr in6addr_any __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_ANY_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_any);</div><div class='del'>-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;</div><div class='add'>+const struct in6_addr in6addr_linklocal_allnodes __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_LINKLOCAL_ALLNODES_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_linklocal_allnodes);</div><div class='del'>-const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;</div><div class='add'>+const struct in6_addr in6addr_linklocal_allrouters __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_linklocal_allrouters);</div><div class='del'>-const struct in6_addr in6addr_interfacelocal_allnodes = IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;</div><div class='add'>+const struct in6_addr in6addr_interfacelocal_allnodes __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_interfacelocal_allnodes);</div><div class='del'>-const struct in6_addr in6addr_interfacelocal_allrouters = IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;</div><div class='add'>+const struct in6_addr in6addr_interfacelocal_allrouters __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_interfacelocal_allrouters);</div><div class='del'>-const struct in6_addr in6addr_sitelocal_allrouters = IN6ADDR_SITELOCAL_ALLROUTERS_INIT;</div><div class='add'>+const struct in6_addr in6addr_sitelocal_allrouters __aligned(BITS_PER_LONG/8)</div><div class='add'>+	= IN6ADDR_SITELOCAL_ALLROUTERS_INIT;</div><div class='ctx'> EXPORT_SYMBOL(in6addr_sitelocal_allrouters);</div><div class='ctx'> </div><div class='ctx'> static void snmp6_free_dev(struct inet6_dev *idev)</div><div class='hunk'>@@ -216,13 +264,13 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!list_empty(&amp;idev-&gt;addr_list));</div><div class='del'>-	WARN_ON(idev-&gt;mc_list);</div><div class='add'>+	WARN_ON(rcu_access_pointer(idev-&gt;mc_list));</div><div class='ctx'> 	WARN_ON(timer_pending(&amp;idev-&gt;rs_timer));</div><div class='ctx'> </div><div class='ctx'> #ifdef NET_REFCNT_DEBUG</div><div class='ctx'> 	pr_debug("%s: %s\n", __func__, dev ? dev-&gt;name : "NIL");</div><div class='ctx'> #endif</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;idev-&gt;dev_tracker);</div><div class='ctx'> 	if (!idev-&gt;dead) {</div><div class='ctx'> 		pr_warn("Freeing alive inet6 device %p\n", idev);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c<br/>index 1d6ced37ad71..567efd626ab4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrlabel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/addrlabel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/addrlabel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/addrlabel.c</a></div><div class='hunk'>@@ -20,12 +20,6 @@</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-#define ADDRLABEL(x...) printk(x)</div><div class='del'>-#else</div><div class='del'>-#define ADDRLABEL(x...) do { ; } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Policy Table</div><div class='ctx'>  */</div><div class='hunk'>@@ -150,8 +144,8 @@ u32 ipv6_addr_label(struct net *net,</div><div class='ctx'> 	label = p ? p-&gt;label : IPV6_ADDR_LABEL_DEFAULT;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(addr=%pI6, type=%d, ifindex=%d) =&gt; %08x\n",</div><div class='del'>-		  __func__, addr, type, ifindex, label);</div><div class='add'>+	net_dbg_ratelimited("%s(addr=%pI6, type=%d, ifindex=%d) =&gt; %08x\n", __func__, addr, type,</div><div class='add'>+			    ifindex, label);</div><div class='ctx'> </div><div class='ctx'> 	return label;</div><div class='ctx'> }</div><div class='hunk'>@@ -164,8 +158,8 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(const struct in6_addr *prefix,</div><div class='ctx'> 	struct ip6addrlbl_entry *newp;</div><div class='ctx'> 	int addrtype;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u)\n",</div><div class='del'>-		  __func__, prefix, prefixlen, ifindex, (unsigned int)label);</div><div class='add'>+	net_dbg_ratelimited("%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u)\n", __func__,</div><div class='add'>+			    prefix, prefixlen, ifindex, (unsigned int)label);</div><div class='ctx'> </div><div class='ctx'> 	addrtype = ipv6_addr_type(prefix) &amp; (IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK);</div><div class='ctx'> </div><div class='hunk'>@@ -207,8 +201,7 @@ static int __ip6addrlbl_add(struct net *net, struct ip6addrlbl_entry *newp,</div><div class='ctx'> 	struct hlist_node *n;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(newp=%p, replace=%d)\n", __func__, newp,</div><div class='del'>-		  replace);</div><div class='add'>+	net_dbg_ratelimited("%s(newp=%p, replace=%d)\n", __func__, newp, replace);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(p, n,	&amp;net-&gt;ipv6.ip6addrlbl_table.head, list) {</div><div class='ctx'> 		if (p-&gt;prefixlen == newp-&gt;prefixlen &amp;&amp;</div><div class='hunk'>@@ -234,7 +227,8 @@ static int __ip6addrlbl_add(struct net *net, struct ip6addrlbl_entry *newp,</div><div class='ctx'> 		hlist_add_head_rcu(&amp;newp-&gt;list, &amp;net-&gt;ipv6.ip6addrlbl_table.head);</div><div class='ctx'> out:</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		net-&gt;ipv6.ip6addrlbl_table.seq++;</div><div class='add'>+		WRITE_ONCE(net-&gt;ipv6.ip6addrlbl_table.seq,</div><div class='add'>+			   net-&gt;ipv6.ip6addrlbl_table.seq + 1);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -246,9 +240,8 @@ static int ip6addrlbl_add(struct net *net,</div><div class='ctx'> 	struct ip6addrlbl_entry *newp;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",</div><div class='del'>-		  __func__, prefix, prefixlen, ifindex, (unsigned int)label,</div><div class='del'>-		  replace);</div><div class='add'>+	net_dbg_ratelimited("%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",</div><div class='add'>+			    __func__, prefix, prefixlen, ifindex, (unsigned int)label, replace);</div><div class='ctx'> </div><div class='ctx'> 	newp = ip6addrlbl_alloc(prefix, prefixlen, ifindex, label);</div><div class='ctx'> 	if (IS_ERR(newp))</div><div class='hunk'>@@ -270,8 +263,8 @@ static int __ip6addrlbl_del(struct net *net,</div><div class='ctx'> 	struct hlist_node *n;</div><div class='ctx'> 	int ret = -ESRCH;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",</div><div class='del'>-		  __func__, prefix, prefixlen, ifindex);</div><div class='add'>+	net_dbg_ratelimited("%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n", __func__, prefix,</div><div class='add'>+			    prefixlen, ifindex);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(p, n, &amp;net-&gt;ipv6.ip6addrlbl_table.head, list) {</div><div class='ctx'> 		if (p-&gt;prefixlen == prefixlen &amp;&amp;</div><div class='hunk'>@@ -293,8 +286,8 @@ static int ip6addrlbl_del(struct net *net,</div><div class='ctx'> 	struct in6_addr prefix_buf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",</div><div class='del'>-		  __func__, prefix, prefixlen, ifindex);</div><div class='add'>+	net_dbg_ratelimited("%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n", __func__, prefix,</div><div class='add'>+			    prefixlen, ifindex);</div><div class='ctx'> </div><div class='ctx'> 	ipv6_addr_prefix(&amp;prefix_buf, prefix, prefixlen);</div><div class='ctx'> 	spin_lock(&amp;net-&gt;ipv6.ip6addrlbl_table.lock);</div><div class='hunk'>@@ -306,23 +299,29 @@ static int ip6addrlbl_del(struct net *net,</div><div class='ctx'> /* add default label */</div><div class='ctx'> static int __net_init ip6addrlbl_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct ip6addrlbl_entry *p = NULL;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ADDRLABEL(KERN_DEBUG "%s\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;net-&gt;ipv6.ip6addrlbl_table.lock);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;net-&gt;ipv6.ip6addrlbl_table.head);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(ip6addrlbl_init_table); i++) {</div><div class='del'>-		int ret = ip6addrlbl_add(net,</div><div class='del'>-					 ip6addrlbl_init_table[i].prefix,</div><div class='del'>-					 ip6addrlbl_init_table[i].prefixlen,</div><div class='del'>-					 0,</div><div class='del'>-					 ip6addrlbl_init_table[i].label, 0);</div><div class='del'>-		/* XXX: should we free all rules when we catch an error? */</div><div class='del'>-		if (ret &amp;&amp; (!err || err != -ENOMEM))</div><div class='del'>-			err = ret;</div><div class='add'>+		err = ip6addrlbl_add(net,</div><div class='add'>+				     ip6addrlbl_init_table[i].prefix,</div><div class='add'>+				     ip6addrlbl_init_table[i].prefixlen,</div><div class='add'>+				     0,</div><div class='add'>+				     ip6addrlbl_init_table[i].label, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_ip6addrlbl_add;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_ip6addrlbl_add:</div><div class='add'>+	hlist_for_each_entry_safe(p, n, &amp;net-&gt;ipv6.ip6addrlbl_table.head, list) {</div><div class='add'>+		hlist_del_rcu(&amp;p-&gt;list);</div><div class='add'>+		kfree_rcu(p, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -383,8 +382,8 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 label;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb, IFAL_MAX,</div><div class='add'>+				     ifal_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -429,6 +428,7 @@ static void ip6addrlbl_putmsg(struct nlmsghdr *nlh,</div><div class='ctx'> {</div><div class='ctx'> 	struct ifaddrlblmsg *ifal = nlmsg_data(nlh);</div><div class='ctx'> 	ifal-&gt;ifal_family = AF_INET6;</div><div class='add'>+	ifal-&gt;__ifal_reserved = 0;</div><div class='ctx'> 	ifal-&gt;ifal_prefixlen = prefixlen;</div><div class='ctx'> 	ifal-&gt;ifal_flags = 0;</div><div class='ctx'> 	ifal-&gt;ifal_index = ifindex;</div><div class='hunk'>@@ -436,7 +436,7 @@ static void ip6addrlbl_putmsg(struct nlmsghdr *nlh,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ip6addrlbl_fill(struct sk_buff *skb,</div><div class='del'>-			   struct ip6addrlbl_entry *p,</div><div class='add'>+			   const struct ip6addrlbl_entry *p,</div><div class='ctx'> 			   u32 lseq,</div><div class='ctx'> 			   u32 portid, u32 seq, int event,</div><div class='ctx'> 			   unsigned int flags)</div><div class='hunk'>@@ -458,20 +458,54 @@ static int ip6addrlbl_fill(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ip6addrlbl_valid_dump_req(const struct nlmsghdr *nlh,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifaddrlblmsg *ifal;</div><div class='add'>+</div><div class='add'>+	ifal = nlmsg_payload(nlh, sizeof(*ifal));</div><div class='add'>+	if (!ifal) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for address label dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifal-&gt;__ifal_reserved || ifal-&gt;ifal_prefixlen ||</div><div class='add'>+	    ifal-&gt;ifal_flags || ifal-&gt;ifal_index || ifal-&gt;ifal_seq) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address label dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nlmsg_attrlen(nlh, sizeof(*ifal))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid data after header for address label dump request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip6addrlbl_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct ip6addrlbl_entry *p;</div><div class='ctx'> 	int idx = 0, s_idx = cb-&gt;args[0];</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 lseq;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = ip6addrlbl_valid_dump_req(nlh, cb-&gt;extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	lseq = READ_ONCE(net-&gt;ipv6.ip6addrlbl_table.seq);</div><div class='ctx'> 	hlist_for_each_entry_rcu(p, &amp;net-&gt;ipv6.ip6addrlbl_table.head, list) {</div><div class='ctx'> 		if (idx &gt;= s_idx) {</div><div class='ctx'> 			err = ip6addrlbl_fill(skb, p,</div><div class='del'>-					      net-&gt;ipv6.ip6addrlbl_table.seq,</div><div class='add'>+					      lseq,</div><div class='ctx'> 					      NETLINK_CB(cb-&gt;skb).portid,</div><div class='del'>-					      cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+					      nlh-&gt;nlmsg_seq,</div><div class='ctx'> 					      RTM_NEWADDRLABEL,</div><div class='ctx'> 					      NLM_F_MULTI);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -481,7 +515,7 @@ static int ip6addrlbl_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	cb-&gt;args[0] = idx;</div><div class='del'>-	return skb-&gt;len;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ip6addrlbl_msgsize(void)</div><div class='hunk'>@@ -491,6 +525,50 @@ static inline int ip6addrlbl_msgsize(void)</div><div class='ctx'> 		+ nla_total_size(4);	/* IFAL_LABEL */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ip6addrlbl_valid_get_req(struct sk_buff *skb,</div><div class='add'>+				    const struct nlmsghdr *nlh,</div><div class='add'>+				    struct nlattr **tb,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ifaddrlblmsg *ifal;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	ifal = nlmsg_payload(nlh, sizeof(*ifal));</div><div class='add'>+	if (!ifal) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid header for addrlabel get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb,</div><div class='add'>+					      IFAL_MAX, ifal_policy, extack);</div><div class='add'>+</div><div class='add'>+	if (ifal-&gt;__ifal_reserved || ifal-&gt;ifal_flags || ifal-&gt;ifal_seq) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for addrlabel get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifal), tb, IFAL_MAX,</div><div class='add'>+					    ifal_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IFAL_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case IFAL_ADDRESS:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in addrlabel get request");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -503,8 +581,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct ip6addrlbl_entry *p;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = ip6addrlbl_valid_get_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -530,7 +607,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal-&gt;ifal_index);</div><div class='del'>-	lseq = net-&gt;ipv6.ip6addrlbl_table.seq;</div><div class='add'>+	lseq = READ_ONCE(net-&gt;ipv6.ip6addrlbl_table.seq);</div><div class='ctx'> 	if (p)</div><div class='ctx'> 		err = ip6addrlbl_fill(skb, p, lseq,</div><div class='ctx'> 				      NETLINK_CB(in_skb).portid,</div><div class='hunk'>@@ -547,22 +624,17 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler ipv6_adddr_label_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_NEWADDRLABEL,</div><div class='add'>+	 .doit = ip6addrlbl_newdel, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_DELADDRLABEL,</div><div class='add'>+	 .doit = ip6addrlbl_newdel, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETADDRLABEL,</div><div class='add'>+	 .doit = ip6addrlbl_get, .dumpit = ip6addrlbl_dump,</div><div class='add'>+	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init ipv6_addr_label_rtnl_register(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_NEWADDRLABEL,</div><div class='del'>-				   ip6addrlbl_newdel,</div><div class='del'>-				   NULL, RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_DELADDRLABEL,</div><div class='del'>-				   ip6addrlbl_newdel,</div><div class='del'>-				   NULL, RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETADDRLABEL,</div><div class='del'>-				   ip6addrlbl_get,</div><div class='del'>-				   ip6addrlbl_dump, RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	return ret;</div><div class='add'>+	return rtnl_register_many(ipv6_adddr_label_rtnl_msg_handlers);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c<br/>index 9a4261e50272..b705751eb73c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/af_inet6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/af_inet6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/af_inet6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/af_inet6.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	PF_INET6 socket protocol family</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -11,11 +12,6 @@</div><div class='ctx'>  *	piggy, Karl Knutson	:	Socket protocol table</div><div class='ctx'>  *	Hideaki YOSHIFUJI	:	sin6_scope_id support</div><div class='ctx'>  *	Arnaldo Melo		:	check proc_net_create return, cleanups</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv6: " fmt</div><div class='hunk'>@@ -56,12 +52,19 @@</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='ctx'> #ifdef CONFIG_IPV6_TUNNEL</div><div class='ctx'> #include &lt;net/ip6_tunnel.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/calipso.h&gt;</div><div class='ctx'> #include &lt;net/seg6.h&gt;</div><div class='add'>+#include &lt;net/rpl.h&gt;</div><div class='add'>+#include &lt;net/compat.h&gt;</div><div class='add'>+#include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/ioam6.h&gt;</div><div class='add'>+#include &lt;net/rawv6.h&gt;</div><div class='add'>+#include &lt;net/rps.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/mroute6.h&gt;</div><div class='hunk'>@@ -100,13 +103,20 @@ bool ipv6_mod_enabled(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipv6_mod_enabled);</div><div class='ctx'> </div><div class='del'>-static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)</div><div class='add'>+static struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	const int offset = sk-&gt;sk_prot-&gt;obj_size - sizeof(struct ipv6_pinfo);</div><div class='add'>+	const int offset = sk-&gt;sk_prot-&gt;ipv6_pinfo_offset;</div><div class='ctx'> </div><div class='ctx'> 	return (struct ipv6_pinfo *)(((u8 *)sk) + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void inet6_sock_destruct(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	inet6_cleanup_sock(sk);</div><div class='add'>+	inet_sock_destruct(sk);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_sock_destruct);</div><div class='add'>+</div><div class='ctx'> static int inet6_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 			int kern)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,16 +200,19 @@ lookup_protocol:</div><div class='ctx'> 	if (INET_PROTOSW_REUSE &amp; answer_flags)</div><div class='ctx'> 		sk-&gt;sk_reuse = SK_CAN_REUSE;</div><div class='ctx'> </div><div class='add'>+	if (INET_PROTOSW_ICSK &amp; answer_flags)</div><div class='add'>+		inet_init_csk_locks(sk);</div><div class='add'>+</div><div class='ctx'> 	inet = inet_sk(sk);</div><div class='del'>-	inet-&gt;is_icsk = (INET_PROTOSW_ICSK &amp; answer_flags) != 0;</div><div class='add'>+	inet_assign_bit(IS_ICSK, sk, INET_PROTOSW_ICSK &amp; answer_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (SOCK_RAW == sock-&gt;type) {</div><div class='ctx'> 		inet-&gt;inet_num = protocol;</div><div class='ctx'> 		if (IPPROTO_RAW == protocol)</div><div class='del'>-			inet-&gt;hdrincl = 1;</div><div class='add'>+			inet_set_bit(HDRINCL, sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_destruct		= inet_sock_destruct;</div><div class='add'>+	sk-&gt;sk_destruct		= inet6_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_family		= PF_INET6;</div><div class='ctx'> 	sk-&gt;sk_protocol		= protocol;</div><div class='ctx'> </div><div class='hunk'>@@ -208,36 +221,29 @@ lookup_protocol:</div><div class='ctx'> 	inet_sk(sk)-&gt;pinet6 = np = inet6_sk_generic(sk);</div><div class='ctx'> 	np-&gt;hop_limit	= -1;</div><div class='ctx'> 	np-&gt;mcast_hops	= IPV6_DEFAULT_MCASTHOPS;</div><div class='del'>-	np-&gt;mc_loop	= 1;</div><div class='add'>+	inet6_set_bit(MC6_LOOP, sk);</div><div class='add'>+	inet6_set_bit(MC6_ALL, sk);</div><div class='ctx'> 	np-&gt;pmtudisc	= IPV6_PMTUDISC_WANT;</div><div class='del'>-	np-&gt;repflow	= net-&gt;ipv6.sysctl.flowlabel_reflect;</div><div class='add'>+	inet6_assign_bit(REPFLOW, sk, net-&gt;ipv6.sysctl.flowlabel_reflect &amp;</div><div class='add'>+				     FLOWLABEL_REFLECT_ESTABLISHED);</div><div class='ctx'> 	sk-&gt;sk_ipv6only	= net-&gt;ipv6.sysctl.bindv6only;</div><div class='add'>+	sk-&gt;sk_txrehash = READ_ONCE(net-&gt;core.sysctl_txrehash);</div><div class='ctx'> </div><div class='ctx'> 	/* Init the ipv4 part of the socket since we can have sockets</div><div class='ctx'> 	 * using v6 API for ipv4.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inet-&gt;uc_ttl	= -1;</div><div class='ctx'> </div><div class='del'>-	inet-&gt;mc_loop	= 1;</div><div class='add'>+	inet_set_bit(MC_LOOP, sk);</div><div class='ctx'> 	inet-&gt;mc_ttl	= 1;</div><div class='ctx'> 	inet-&gt;mc_index	= 0;</div><div class='del'>-	inet-&gt;mc_list	= NULL;</div><div class='add'>+	RCU_INIT_POINTER(inet-&gt;mc_list, NULL);</div><div class='ctx'> 	inet-&gt;rcv_tos	= 0;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv4.sysctl_ip_no_pmtu_disc)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_no_pmtu_disc))</div><div class='ctx'> 		inet-&gt;pmtudisc = IP_PMTUDISC_DONT;</div><div class='ctx'> 	else</div><div class='ctx'> 		inet-&gt;pmtudisc = IP_PMTUDISC_WANT;</div><div class='del'>-	/*</div><div class='del'>-	 * Increment only the relevant sk_prot-&gt;socks debug field, this changes</div><div class='del'>-	 * the previous behaviour of incrementing both the equivalent to</div><div class='del'>-	 * answer-&gt;prot-&gt;socks (inet6_sock_nr) and inet_sock_nr.</div><div class='del'>-	 *</div><div class='del'>-	 * This allows better debug granularity as we'll know exactly how many</div><div class='del'>-	 * UDPv6, TCPv6, etc socks were allocated, not the sum of all IPv6</div><div class='del'>-	 * transport protocol socks. -acme</div><div class='del'>-	 */</div><div class='del'>-	sk_refcnt_debug_inc(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (inet-&gt;inet_num) {</div><div class='ctx'> 		/* It assumes that any protocol which allows</div><div class='hunk'>@@ -246,35 +252,33 @@ lookup_protocol:</div><div class='ctx'> 		 */</div><div class='ctx'> 		inet-&gt;inet_sport = htons(inet-&gt;inet_num);</div><div class='ctx'> 		err = sk-&gt;sk_prot-&gt;hash(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sk-&gt;sk_prot-&gt;init) {</div><div class='ctx'> 		err = sk-&gt;sk_prot-&gt;init(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!kern) {</div><div class='ctx'> 		err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk);</div><div class='del'>-		if (err) {</div><div class='del'>-			sk_common_release(sk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_sk_release;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> out_rcu_unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	goto out;</div><div class='add'>+out_sk_release:</div><div class='add'>+	sk_common_release(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='del'>-			bool force_bind_address_no_port, bool with_lock)</div><div class='add'>+static int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,</div><div class='add'>+			u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in6 *addr = (struct sockaddr_in6 *)uaddr;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='hunk'>@@ -294,11 +298,12 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	snum = ntohs(addr-&gt;sin6_port);</div><div class='del'>-	if (snum &amp;&amp; snum &lt; inet_prot_sock(net) &amp;&amp;</div><div class='add'>+	if (!(flags &amp; BIND_NO_CAP_NET_BIND_SERVICE) &amp;&amp;</div><div class='add'>+	    snum &amp;&amp; inet_port_requires_bind_service(net, snum) &amp;&amp;</div><div class='ctx'> 	    !ns_capable(net-&gt;user_ns, CAP_NET_BIND_SERVICE))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	if (with_lock)</div><div class='add'>+	if (flags &amp; BIND_WITH_LOCK)</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Check these errors (active socket, double bind). */</div><div class='hunk'>@@ -309,24 +314,33 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the address belongs to the host. */</div><div class='ctx'> 	if (addr_type == IPV6_ADDR_MAPPED) {</div><div class='add'>+		struct net_device *dev = NULL;</div><div class='ctx'> 		int chk_addr_ret;</div><div class='ctx'> </div><div class='ctx'> 		/* Binding to v4-mapped address on a v6-only socket</div><div class='ctx'> 		 * makes no sense</div><div class='ctx'> 		 */</div><div class='del'>-		if (sk-&gt;sk_ipv6only) {</div><div class='add'>+		if (ipv6_only_sock(sk)) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (sk-&gt;sk_bound_dev_if) {</div><div class='add'>+			dev = dev_get_by_index_rcu(net, sk-&gt;sk_bound_dev_if);</div><div class='add'>+			if (!dev) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out_unlock;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Reproduce AF_INET checks to make the bindings consistent */</div><div class='ctx'> 		v4addr = addr-&gt;sin6_addr.s6_addr32[3];</div><div class='del'>-		chk_addr_ret = inet_addr_type(net, v4addr);</div><div class='del'>-		if (!inet_can_nonlocal_bind(net, inet) &amp;&amp;</div><div class='del'>-		    v4addr != htonl(INADDR_ANY) &amp;&amp;</div><div class='del'>-		    chk_addr_ret != RTN_LOCAL &amp;&amp;</div><div class='del'>-		    chk_addr_ret != RTN_MULTICAST &amp;&amp;</div><div class='del'>-		    chk_addr_ret != RTN_BROADCAST) {</div><div class='add'>+		chk_addr_ret = inet_addr_type_dev_table(net, dev, v4addr);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (!inet_addr_valid_or_nonlocal(net, inet, v4addr,</div><div class='add'>+						 chk_addr_ret)) {</div><div class='ctx'> 			err = -EADDRNOTAVAIL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -349,6 +363,9 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 					err = -EINVAL;</div><div class='ctx'> 					goto out_unlock;</div><div class='ctx'> 				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (sk-&gt;sk_bound_dev_if) {</div><div class='ctx'> 				dev = dev_get_by_index_rcu(net, sk-&gt;sk_bound_dev_if);</div><div class='ctx'> 				if (!dev) {</div><div class='ctx'> 					err = -ENODEV;</div><div class='hunk'>@@ -385,20 +402,24 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 		sk-&gt;sk_ipv6only = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we are allowed to bind here. */</div><div class='del'>-	if (snum || !(inet-&gt;bind_address_no_port ||</div><div class='del'>-		      force_bind_address_no_port)) {</div><div class='del'>-		if (sk-&gt;sk_prot-&gt;get_port(sk, snum)) {</div><div class='del'>-			sk-&gt;sk_ipv6only = saved_ipv6only;</div><div class='del'>-			inet_reset_saddr(sk);</div><div class='del'>-			err = -EADDRINUSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		err = BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk);</div><div class='add'>+	if (snum || !(inet_test_bit(BIND_ADDRESS_NO_PORT, sk) ||</div><div class='add'>+		      (flags &amp; BIND_FORCE_ADDRESS_NO_PORT))) {</div><div class='add'>+		err = sk-&gt;sk_prot-&gt;get_port(sk, snum);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			sk-&gt;sk_ipv6only = saved_ipv6only;</div><div class='ctx'> 			inet_reset_saddr(sk);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		if (!(flags &amp; BIND_FROM_BPF)) {</div><div class='add'>+			err = BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk);</div><div class='add'>+			if (err) {</div><div class='add'>+				sk-&gt;sk_ipv6only = saved_ipv6only;</div><div class='add'>+				inet_reset_saddr(sk);</div><div class='add'>+				if (sk-&gt;sk_prot-&gt;put_port)</div><div class='add'>+					sk-&gt;sk_prot-&gt;put_port(sk);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (addr_type != IPV6_ADDR_ANY)</div><div class='hunk'>@@ -409,7 +430,7 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,</div><div class='ctx'> 	inet-&gt;inet_dport = 0;</div><div class='ctx'> 	inet-&gt;inet_daddr = 0;</div><div class='ctx'> out:</div><div class='del'>-	if (with_lock)</div><div class='add'>+	if (flags &amp; BIND_WITH_LOCK)</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -417,15 +438,17 @@ out_unlock:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* bind for INET6 API */</div><div class='del'>-int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int inet6_bind_sk(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	u32 flags = BIND_WITH_LOCK;</div><div class='add'>+	const struct proto *prot;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='ctx'> 	/* If the socket has its own bind function then use it. */</div><div class='del'>-	if (sk-&gt;sk_prot-&gt;bind)</div><div class='del'>-		return sk-&gt;sk_prot-&gt;bind(sk, uaddr, addr_len);</div><div class='add'>+	if (prot-&gt;bind)</div><div class='add'>+		return prot-&gt;bind(sk, uaddr, addr_len);</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -433,11 +456,18 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	/* BPF prog is run before any checks are done so that if the prog</div><div class='ctx'> 	 * changes context in a wrong way it will be caught.</div><div class='ctx'> 	 */</div><div class='del'>-	err = BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr);</div><div class='add'>+	err = BPF_CGROUP_RUN_PROG_INET_BIND_LOCK(sk, uaddr, &amp;addr_len,</div><div class='add'>+						 CGROUP_INET6_BIND, &amp;flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return __inet6_bind(sk, uaddr, addr_len, false, true);</div><div class='add'>+	return __inet6_bind(sk, uaddr, addr_len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* bind for INET6 API */</div><div class='add'>+int inet6_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='add'>+{</div><div class='add'>+	return inet6_bind_sk(sock-&gt;sk, uaddr, addr_len);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6_bind);</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +488,7 @@ int inet6_release(struct socket *sock)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6_release);</div><div class='ctx'> </div><div class='del'>-void inet6_destroy_sock(struct sock *sk)</div><div class='add'>+void inet6_cleanup_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -467,34 +497,32 @@ void inet6_destroy_sock(struct sock *sk)</div><div class='ctx'> 	/* Release rx options */</div><div class='ctx'> </div><div class='ctx'> 	skb = xchg(&amp;np-&gt;pktoptions, NULL);</div><div class='del'>-	if (skb)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	skb = xchg(&amp;np-&gt;rxpmtu, NULL);</div><div class='del'>-	if (skb)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Free flowlabels */</div><div class='ctx'> 	fl6_free_socklist(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Free tx options */</div><div class='ctx'> </div><div class='del'>-	opt = xchg((__force struct ipv6_txoptions **)&amp;np-&gt;opt, NULL);</div><div class='add'>+	opt = unrcu_pointer(xchg(&amp;np-&gt;opt, NULL));</div><div class='ctx'> 	if (opt) {</div><div class='ctx'> 		atomic_sub(opt-&gt;tot_len, &amp;sk-&gt;sk_omem_alloc);</div><div class='ctx'> 		txopt_put(opt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet6_destroy_sock);</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_cleanup_sock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	This does both peername and sockname.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int inet6_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='del'>-		 int peer)</div><div class='add'>+		  int peer)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in6 *sin = (struct sockaddr_in6 *)uaddr;</div><div class='add'>+	int sin_addr_len = sizeof(*sin);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='hunk'>@@ -502,63 +530,158 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 	sin-&gt;sin6_family = AF_INET6;</div><div class='ctx'> 	sin-&gt;sin6_flowinfo = 0;</div><div class='ctx'> 	sin-&gt;sin6_scope_id = 0;</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	if (peer) {</div><div class='del'>-		if (!inet-&gt;inet_dport)</div><div class='del'>-			return -ENOTCONN;</div><div class='del'>-		if (((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_SYN_SENT)) &amp;&amp;</div><div class='del'>-		    peer == 1)</div><div class='add'>+		if (!inet-&gt;inet_dport ||</div><div class='add'>+		    (((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_SYN_SENT)) &amp;&amp;</div><div class='add'>+		    peer == 1)) {</div><div class='add'>+			release_sock(sk);</div><div class='ctx'> 			return -ENOTCONN;</div><div class='add'>+		}</div><div class='ctx'> 		sin-&gt;sin6_port = inet-&gt;inet_dport;</div><div class='ctx'> 		sin-&gt;sin6_addr = sk-&gt;sk_v6_daddr;</div><div class='del'>-		if (np-&gt;sndflow)</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk))</div><div class='ctx'> 			sin-&gt;sin6_flowinfo = np-&gt;flow_label;</div><div class='add'>+		BPF_CGROUP_RUN_SA_PROG(sk, (struct sockaddr *)sin, &amp;sin_addr_len,</div><div class='add'>+				       CGROUP_INET6_GETPEERNAME);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='ctx'> 			sin-&gt;sin6_addr = np-&gt;saddr;</div><div class='ctx'> 		else</div><div class='ctx'> 			sin-&gt;sin6_addr = sk-&gt;sk_v6_rcv_saddr;</div><div class='del'>-</div><div class='ctx'> 		sin-&gt;sin6_port = inet-&gt;inet_sport;</div><div class='add'>+		BPF_CGROUP_RUN_SA_PROG(sk, (struct sockaddr *)sin, &amp;sin_addr_len,</div><div class='add'>+				       CGROUP_INET6_GETSOCKNAME);</div><div class='ctx'> 	}</div><div class='ctx'> 	sin-&gt;sin6_scope_id = ipv6_iface_scope_id(&amp;sin-&gt;sin6_addr,</div><div class='ctx'> 						 sk-&gt;sk_bound_dev_if);</div><div class='del'>-	return sizeof(*sin);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return sin_addr_len;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6_getname);</div><div class='ctx'> </div><div class='ctx'> int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	const struct proto *prot;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SIOCGSTAMP:</div><div class='del'>-		return sock_get_timestamp(sk, (struct timeval __user *)arg);</div><div class='del'>-</div><div class='del'>-	case SIOCGSTAMPNS:</div><div class='del'>-		return sock_get_timestampns(sk, (struct timespec __user *)arg);</div><div class='del'>-</div><div class='ctx'> 	case SIOCADDRT:</div><div class='del'>-	case SIOCDELRT:</div><div class='del'>-</div><div class='del'>-		return ipv6_route_ioctl(net, cmd, (void __user *)arg);</div><div class='add'>+	case SIOCDELRT: {</div><div class='add'>+		struct in6_rtmsg rtmsg;</div><div class='ctx'> </div><div class='add'>+		if (copy_from_user(&amp;rtmsg, argp, sizeof(rtmsg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return ipv6_route_ioctl(net, cmd, &amp;rtmsg);</div><div class='add'>+	}</div><div class='ctx'> 	case SIOCSIFADDR:</div><div class='del'>-		return addrconf_add_ifaddr(net, (void __user *) arg);</div><div class='add'>+		return addrconf_add_ifaddr(net, argp);</div><div class='ctx'> 	case SIOCDIFADDR:</div><div class='del'>-		return addrconf_del_ifaddr(net, (void __user *) arg);</div><div class='add'>+		return addrconf_del_ifaddr(net, argp);</div><div class='ctx'> 	case SIOCSIFDSTADDR:</div><div class='del'>-		return addrconf_set_dstaddr(net, (void __user *) arg);</div><div class='add'>+		return addrconf_set_dstaddr(net, argp);</div><div class='ctx'> 	default:</div><div class='del'>-		if (!sk-&gt;sk_prot-&gt;ioctl)</div><div class='add'>+		/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+		prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+		if (!prot-&gt;ioctl)</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='del'>-		return sk-&gt;sk_prot-&gt;ioctl(sk, cmd, arg);</div><div class='add'>+		return sk_ioctl(sk, cmd, (void __user *)arg);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*NOTREACHED*/</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6_ioctl);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+struct compat_in6_rtmsg {</div><div class='add'>+	struct in6_addr		rtmsg_dst;</div><div class='add'>+	struct in6_addr		rtmsg_src;</div><div class='add'>+	struct in6_addr		rtmsg_gateway;</div><div class='add'>+	u32			rtmsg_type;</div><div class='add'>+	u16			rtmsg_dst_len;</div><div class='add'>+	u16			rtmsg_src_len;</div><div class='add'>+	u32			rtmsg_metric;</div><div class='add'>+	u32			rtmsg_info;</div><div class='add'>+	u32			rtmsg_flags;</div><div class='add'>+	s32			rtmsg_ifindex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int inet6_compat_routing_ioctl(struct sock *sk, unsigned int cmd,</div><div class='add'>+		struct compat_in6_rtmsg __user *ur)</div><div class='add'>+{</div><div class='add'>+	struct in6_rtmsg rt;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;rt.rtmsg_dst, &amp;ur-&gt;rtmsg_dst,</div><div class='add'>+			3 * sizeof(struct in6_addr)) ||</div><div class='add'>+	    get_user(rt.rtmsg_type, &amp;ur-&gt;rtmsg_type) ||</div><div class='add'>+	    get_user(rt.rtmsg_dst_len, &amp;ur-&gt;rtmsg_dst_len) ||</div><div class='add'>+	    get_user(rt.rtmsg_src_len, &amp;ur-&gt;rtmsg_src_len) ||</div><div class='add'>+	    get_user(rt.rtmsg_metric, &amp;ur-&gt;rtmsg_metric) ||</div><div class='add'>+	    get_user(rt.rtmsg_info, &amp;ur-&gt;rtmsg_info) ||</div><div class='add'>+	    get_user(rt.rtmsg_flags, &amp;ur-&gt;rtmsg_flags) ||</div><div class='add'>+	    get_user(rt.rtmsg_ifindex, &amp;ur-&gt;rtmsg_ifindex))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return ipv6_route_ioctl(sock_net(sk), cmd, &amp;rt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int inet6_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = compat_ptr(arg);</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+	case SIOCDELRT:</div><div class='add'>+		return inet6_compat_routing_ioctl(sk, cmd, argp);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_compat_ioctl);</div><div class='add'>+#endif /* CONFIG_COMPAT */</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int udpv6_sendmsg(struct sock *, struct msghdr *,</div><div class='add'>+					    size_t));</div><div class='add'>+int inet6_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	const struct proto *prot;</div><div class='add'>+</div><div class='add'>+	if (unlikely(inet_send_prepare(sk)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+	return INDIRECT_CALL_2(prot-&gt;sendmsg, tcp_sendmsg, udpv6_sendmsg,</div><div class='add'>+			       sk, msg, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int udpv6_recvmsg(struct sock *, struct msghdr *,</div><div class='add'>+					    size_t, int, int *));</div><div class='add'>+int inet6_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,</div><div class='add'>+		  int flags)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	const struct proto *prot;</div><div class='add'>+	int addr_len = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (likely(!(flags &amp; MSG_ERRQUEUE)))</div><div class='add'>+		sock_rps_record_flow(sk);</div><div class='add'>+</div><div class='add'>+	/* IPV6_ADDRFORM can change sk-&gt;sk_prot under us. */</div><div class='add'>+	prot = READ_ONCE(sk-&gt;sk_prot);</div><div class='add'>+	err = INDIRECT_CALL_2(prot-&gt;recvmsg, tcp_recvmsg, udpv6_recvmsg,</div><div class='add'>+			      sk, msg, size, flags, &amp;addr_len);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		msg-&gt;msg_namelen = addr_len;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct proto_ops inet6_stream_ops = {</div><div class='ctx'> 	.family		   = PF_INET6,</div><div class='ctx'> 	.owner		   = THIS_MODULE,</div><div class='hunk'>@@ -570,27 +693,29 @@ const struct proto_ops inet6_stream_ops = {</div><div class='ctx'> 	.getname	   = inet6_getname,</div><div class='ctx'> 	.poll		   = tcp_poll,			/* ok		*/</div><div class='ctx'> 	.ioctl		   = inet6_ioctl,		/* must change  */</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = inet_listen,		/* ok		*/</div><div class='ctx'> 	.shutdown	   = inet_shutdown,		/* ok		*/</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,	/* ok		*/</div><div class='ctx'> 	.getsockopt	   = sock_common_getsockopt,	/* ok		*/</div><div class='del'>-	.sendmsg	   = inet_sendmsg,		/* ok		*/</div><div class='del'>-	.recvmsg	   = inet_recvmsg,		/* ok		*/</div><div class='add'>+	.sendmsg	   = inet6_sendmsg,		/* retpoline's sake */</div><div class='add'>+	.recvmsg	   = inet6_recvmsg,		/* retpoline's sake */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	.mmap		   = tcp_mmap,</div><div class='ctx'> #endif</div><div class='del'>-	.sendpage	   = inet_sendpage,</div><div class='add'>+	.splice_eof	   = inet_splice_eof,</div><div class='ctx'> 	.sendmsg_locked    = tcp_sendmsg_locked,</div><div class='del'>-	.sendpage_locked   = tcp_sendpage_locked,</div><div class='ctx'> 	.splice_read	   = tcp_splice_read,</div><div class='add'>+	.set_peek_off      = sk_set_peek_off,</div><div class='ctx'> 	.read_sock	   = tcp_read_sock,</div><div class='add'>+	.read_skb	   = tcp_read_skb,</div><div class='ctx'> 	.peek_len	   = tcp_peek_len,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='add'>+	.compat_ioctl	   = inet6_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.set_rcvlowat	   = tcp_set_rcvlowat,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_stream_ops);</div><div class='ctx'> </div><div class='ctx'> const struct proto_ops inet6_dgram_ops = {</div><div class='ctx'> 	.family		   = PF_INET6,</div><div class='hunk'>@@ -603,18 +728,18 @@ const struct proto_ops inet6_dgram_ops = {</div><div class='ctx'> 	.getname	   = inet6_getname,</div><div class='ctx'> 	.poll		   = udp_poll,			/* ok		*/</div><div class='ctx'> 	.ioctl		   = inet6_ioctl,		/* must change  */</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,		/* ok		*/</div><div class='ctx'> 	.shutdown	   = inet_shutdown,		/* ok		*/</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,	/* ok		*/</div><div class='ctx'> 	.getsockopt	   = sock_common_getsockopt,	/* ok		*/</div><div class='del'>-	.sendmsg	   = inet_sendmsg,		/* ok		*/</div><div class='del'>-	.recvmsg	   = inet_recvmsg,		/* ok		*/</div><div class='add'>+	.sendmsg	   = inet6_sendmsg,		/* retpoline's sake */</div><div class='add'>+	.recvmsg	   = inet6_recvmsg,		/* retpoline's sake */</div><div class='add'>+	.read_skb	   = udp_read_skb,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-	.set_peek_off	   = sk_set_peek_off,</div><div class='add'>+	.set_peek_off	   = udp_set_peek_off,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='add'>+	.compat_ioctl	   = inet6_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -717,22 +842,22 @@ int inet6_sk_rebuild_header(struct sock *sk)</div><div class='ctx'> 		fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='ctx'> 		fl6.fl6_dport = inet-&gt;inet_dport;</div><div class='ctx'> 		fl6.fl6_sport = inet-&gt;inet_sport;</div><div class='del'>-		fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='del'>-		security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+		fl6.flowi6_uid = sk_uid(sk);</div><div class='add'>+		security_sk_classify_flow(sk, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		final_p = fl6_update_dst(&amp;fl6, rcu_dereference(np-&gt;opt),</div><div class='ctx'> 					 &amp;final);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='add'>+		dst = ip6_dst_lookup_flow(sock_net(sk), sk, &amp;fl6, final_p);</div><div class='ctx'> 		if (IS_ERR(dst)) {</div><div class='ctx'> 			sk-&gt;sk_route_caps = 0;</div><div class='del'>-			sk-&gt;sk_err_soft = -PTR_ERR(dst);</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_err_soft, -PTR_ERR(dst));</div><div class='ctx'> 			return PTR_ERR(dst);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ip6_dst_store(sk, dst, NULL, NULL);</div><div class='add'>+		ip6_dst_store(sk, dst, false, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -757,7 +882,6 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ipv6_opt_accepted);</div><div class='ctx'> </div><div class='ctx'> static struct packet_type ipv6_packet_type __read_mostly = {</div><div class='ctx'> 	.type = cpu_to_be16(ETH_P_IPV6),</div><div class='hunk'>@@ -833,6 +957,19 @@ static int __net_init inet6_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.sysctl.bindv6only = 0;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.icmpv6_time = 1*HZ;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.icmpv6_echo_ignore_all = 0;</div><div class='add'>+	net-&gt;ipv6.sysctl.icmpv6_echo_ignore_multicast = 0;</div><div class='add'>+	net-&gt;ipv6.sysctl.icmpv6_echo_ignore_anycast = 0;</div><div class='add'>+	net-&gt;ipv6.sysctl.icmpv6_error_anycast_as_unicast = 0;</div><div class='add'>+	net-&gt;ipv6.sysctl.icmpv6_errors_extension_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* By default, rate limit error messages.</div><div class='add'>+	 * Except for pmtu discovery, it would break it.</div><div class='add'>+	 * proc_do_large_bitmap needs pointer to the bitmap.</div><div class='add'>+	 */</div><div class='add'>+	bitmap_set(net-&gt;ipv6.sysctl.icmpv6_ratemask, 0, ICMPV6_ERRMSG_MAX + 1);</div><div class='add'>+	bitmap_clear(net-&gt;ipv6.sysctl.icmpv6_ratemask, ICMPV6_PKT_TOOBIG, 1);</div><div class='add'>+	net-&gt;ipv6.sysctl.icmpv6_ratemask_ptr = net-&gt;ipv6.sysctl.icmpv6_ratemask;</div><div class='add'>+</div><div class='ctx'> 	net-&gt;ipv6.sysctl.flowlabel_consistency = 1;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.auto_flowlabels = IP6_DEFAULT_AUTO_FLOW_LABELS;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.idgen_retries = 3;</div><div class='hunk'>@@ -842,8 +979,12 @@ static int __net_init inet6_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.sysctl.max_hbh_opts_cnt = IP6_DEFAULT_MAX_HBH_OPTS_CNT;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.max_dst_opts_len = IP6_DEFAULT_MAX_DST_OPTS_LEN;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.max_hbh_opts_len = IP6_DEFAULT_MAX_HBH_OPTS_LEN;</div><div class='add'>+	net-&gt;ipv6.sysctl.fib_notify_on_flag_change = 0;</div><div class='ctx'> 	atomic_set(&amp;net-&gt;ipv6.fib6_sernum, 1);</div><div class='ctx'> </div><div class='add'>+	net-&gt;ipv6.sysctl.ioam6_id = IOAM6_DEFAULT_ID;</div><div class='add'>+	net-&gt;ipv6.sysctl.ioam6_id_wide = IOAM6_DEFAULT_ID_WIDE;</div><div class='add'>+</div><div class='ctx'> 	err = ipv6_init_mibs(net);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -886,22 +1027,48 @@ static struct pernet_operations inet6_net_ops = {</div><div class='ctx'> 	.exit = inet6_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ipv6_route_input(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	ip6_route_input(skb);</div><div class='add'>+	return skb_dst(skb)-&gt;error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ipv6_stub ipv6_stub_impl = {</div><div class='ctx'> 	.ipv6_sock_mc_join = ipv6_sock_mc_join,</div><div class='ctx'> 	.ipv6_sock_mc_drop = ipv6_sock_mc_drop,</div><div class='del'>-	.ipv6_dst_lookup   = ip6_dst_lookup,</div><div class='add'>+	.ipv6_dst_lookup_flow = ip6_dst_lookup_flow,</div><div class='add'>+	.ipv6_route_input  = ipv6_route_input,</div><div class='ctx'> 	.fib6_get_table	   = fib6_get_table,</div><div class='ctx'> 	.fib6_table_lookup = fib6_table_lookup,</div><div class='ctx'> 	.fib6_lookup       = fib6_lookup,</div><div class='del'>-	.fib6_multipath_select = fib6_multipath_select,</div><div class='add'>+	.fib6_select_path  = fib6_select_path,</div><div class='ctx'> 	.ip6_mtu_from_fib6 = ip6_mtu_from_fib6,</div><div class='add'>+	.fib6_nh_init	   = fib6_nh_init,</div><div class='add'>+	.fib6_nh_release   = fib6_nh_release,</div><div class='add'>+	.fib6_nh_release_dsts = fib6_nh_release_dsts,</div><div class='add'>+	.fib6_update_sernum = fib6_update_sernum_stub,</div><div class='add'>+	.fib6_rt_update	   = fib6_rt_update,</div><div class='add'>+	.ip6_del_rt	   = ip6_del_rt,</div><div class='ctx'> 	.udpv6_encap_enable = udpv6_encap_enable,</div><div class='ctx'> 	.ndisc_send_na = ndisc_send_na,</div><div class='add'>+#if IS_ENABLED(CONFIG_XFRM)</div><div class='add'>+	.xfrm6_local_rxpmtu = xfrm6_local_rxpmtu,</div><div class='add'>+	.xfrm6_udp_encap_rcv = xfrm6_udp_encap_rcv,</div><div class='add'>+	.xfrm6_gro_udp_encap_rcv = xfrm6_gro_udp_encap_rcv,</div><div class='add'>+	.xfrm6_rcv_encap = xfrm6_rcv_encap,</div><div class='add'>+#endif</div><div class='ctx'> 	.nd_tbl	= &amp;nd_tbl,</div><div class='add'>+	.ipv6_fragment = ip6_fragment,</div><div class='add'>+	.ipv6_dev_find = ipv6_dev_find,</div><div class='add'>+	.ip6_xmit = ip6_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ipv6_bpf_stub ipv6_bpf_stub_impl = {</div><div class='ctx'> 	.inet6_bind = __inet6_bind,</div><div class='add'>+	.udp6_lib_lookup = __udp6_lib_lookup,</div><div class='add'>+	.ipv6_setsockopt = do_ipv6_setsockopt,</div><div class='add'>+	.ipv6_getsockopt = do_ipv6_getsockopt,</div><div class='add'>+	.ipv6_dev_get_saddr = ipv6_dev_get_saddr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init inet6_init(void)</div><div class='hunk'>@@ -915,6 +1082,8 @@ static int __init inet6_init(void)</div><div class='ctx'> 	for (r = &amp;inetsw6[0]; r &lt; &amp;inetsw6[SOCK_MAX]; ++r)</div><div class='ctx'> 		INIT_LIST_HEAD(r);</div><div class='ctx'> </div><div class='add'>+	raw_hashinfo_init(&amp;raw_v6_hashinfo);</div><div class='add'>+</div><div class='ctx'> 	if (disable_ipv6_mod) {</div><div class='ctx'> 		pr_info("Loaded, but administratively disabled, reboot required to enable\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1001,6 +1170,9 @@ static int __init inet6_init(void)</div><div class='ctx'> 	err = ip6_flowlabel_init();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto ip6_flowlabel_fail;</div><div class='add'>+	err = ipv6_anycast_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto ipv6_anycast_fail;</div><div class='ctx'> 	err = addrconf_init();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto addrconf_fail;</div><div class='hunk'>@@ -1047,6 +1219,14 @@ static int __init inet6_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto seg6_fail;</div><div class='ctx'> </div><div class='add'>+	err = rpl_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto rpl_fail;</div><div class='add'>+</div><div class='add'>+	err = ioam6_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto ioam6_fail;</div><div class='add'>+</div><div class='ctx'> 	err = igmp6_late_init();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto igmp6_late_err;</div><div class='hunk'>@@ -1069,6 +1249,10 @@ sysctl_fail:</div><div class='ctx'> 	igmp6_late_cleanup();</div><div class='ctx'> #endif</div><div class='ctx'> igmp6_late_err:</div><div class='add'>+	ioam6_exit();</div><div class='add'>+ioam6_fail:</div><div class='add'>+	rpl_exit();</div><div class='add'>+rpl_fail:</div><div class='ctx'> 	seg6_exit();</div><div class='ctx'> seg6_fail:</div><div class='ctx'> 	calipso_exit();</div><div class='hunk'>@@ -1091,6 +1275,8 @@ ipv6_frag_fail:</div><div class='ctx'> ipv6_exthdrs_fail:</div><div class='ctx'> 	addrconf_cleanup();</div><div class='ctx'> addrconf_fail:</div><div class='add'>+	ipv6_anycast_cleanup();</div><div class='add'>+ipv6_anycast_fail:</div><div class='ctx'> 	ip6_flowlabel_cleanup();</div><div class='ctx'> ip6_flowlabel_fail:</div><div class='ctx'> 	ndisc_late_cleanup();</div><div class='head'>diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c<br/>index 78c974391567..95372e0f1d21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ah6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ah6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ah6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ah6.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2002 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Authors</div><div class='ctx'>  *</div><div class='ctx'>  *	Mitsuru KANDA @USAGI       : IPv6 Support</div><div class='hunk'>@@ -25,8 +13,8 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv6: " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/utils.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='hunk'>@@ -48,7 +36,7 @@ struct tmp_ext {</div><div class='ctx'> 		struct in6_addr saddr;</div><div class='ctx'> #endif</div><div class='ctx'> 		struct in6_addr daddr;</div><div class='del'>-		char hdrs[0];</div><div class='add'>+		char hdrs[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ah_skb_cb {</div><div class='hunk'>@@ -58,14 +46,40 @@ struct ah_skb_cb {</div><div class='ctx'> </div><div class='ctx'> #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='ctx'> </div><div class='add'>+/* Helper to save IPv6 addresses and extension headers to temporary storage */</div><div class='add'>+static inline void ah6_save_hdrs(struct tmp_ext *iph_ext,</div><div class='add'>+				 struct ipv6hdr *top_iph, int extlen)</div><div class='add'>+{</div><div class='add'>+	if (!extlen)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='add'>+	iph_ext-&gt;saddr = top_iph-&gt;saddr;</div><div class='add'>+#endif</div><div class='add'>+	iph_ext-&gt;daddr = top_iph-&gt;daddr;</div><div class='add'>+	memcpy(&amp;iph_ext-&gt;hdrs, top_iph + 1, extlen - sizeof(*iph_ext));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper to restore IPv6 addresses and extension headers from temporary storage */</div><div class='add'>+static inline void ah6_restore_hdrs(struct ipv6hdr *top_iph,</div><div class='add'>+				    struct tmp_ext *iph_ext, int extlen)</div><div class='add'>+{</div><div class='add'>+	if (!extlen)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='add'>+	top_iph-&gt;saddr = iph_ext-&gt;saddr;</div><div class='add'>+#endif</div><div class='add'>+	top_iph-&gt;daddr = iph_ext-&gt;daddr;</div><div class='add'>+	memcpy(top_iph + 1, &amp;iph_ext-&gt;hdrs, extlen - sizeof(*iph_ext));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,</div><div class='ctx'> 			  unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> </div><div class='del'>-	len = size + crypto_ahash_digestsize(ahash) +</div><div class='del'>-	      (crypto_ahash_alignmask(ahash) &amp;</div><div class='del'>-	       ~(crypto_tfm_ctx_alignment() - 1));</div><div class='add'>+	len = size + crypto_ahash_digestsize(ahash);</div><div class='ctx'> </div><div class='ctx'> 	len = ALIGN(len, crypto_tfm_ctx_alignment());</div><div class='ctx'> </div><div class='hunk'>@@ -87,10 +101,9 @@ static inline u8 *ah_tmp_auth(u8 *tmp, unsigned int offset)</div><div class='ctx'> 	return tmp + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 *ah_tmp_icv(struct crypto_ahash *ahash, void *tmp,</div><div class='del'>-			     unsigned int offset)</div><div class='add'>+static inline u8 *ah_tmp_icv(void *tmp, unsigned int offset)</div><div class='ctx'> {</div><div class='del'>-	return PTR_ALIGN((u8 *)tmp + offset, crypto_ahash_alignmask(ahash) + 1);</div><div class='add'>+	return tmp + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ahash_request *ah_tmp_req(struct crypto_ahash *ahash,</div><div class='hunk'>@@ -187,7 +200,6 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des</div><div class='ctx'> 			 * See 11.3.2 of RFC 3775 for details.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (opt[off] == IPV6_TLV_HAO) {</div><div class='del'>-				struct in6_addr final_addr;</div><div class='ctx'> 				struct ipv6_destopt_hao *hao;</div><div class='ctx'> </div><div class='ctx'> 				hao = (struct ipv6_destopt_hao *)&amp;opt[off];</div><div class='hunk'>@@ -196,9 +208,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des</div><div class='ctx'> 							     hao-&gt;length);</div><div class='ctx'> 					goto bad;</div><div class='ctx'> 				}</div><div class='del'>-				final_addr = hao-&gt;addr;</div><div class='del'>-				hao-&gt;addr = iph-&gt;saddr;</div><div class='del'>-				iph-&gt;saddr = final_addr;</div><div class='add'>+				swap(hao-&gt;addr, iph-&gt;saddr);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -271,7 +281,7 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)</div><div class='ctx'> 		case NEXTHDR_DEST:</div><div class='ctx'> 			if (dir == XFRM_POLICY_OUT)</div><div class='ctx'> 				ipv6_rearrange_destopt(iph, exthdr.opth);</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case NEXTHDR_HOP:</div><div class='ctx'> 			if (!zero_out_mutable_opts(exthdr.opth)) {</div><div class='ctx'> 				net_dbg_ratelimited("overrun %sopts\n",</div><div class='hunk'>@@ -296,12 +306,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ah6_output_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void ah6_output_done(void *data, int err)</div><div class='ctx'> {</div><div class='ctx'> 	int extlen;</div><div class='ctx'> 	u8 *iph_base;</div><div class='ctx'> 	u8 *icv;</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_state *x = skb_dst(skb)-&gt;xfrm;</div><div class='ctx'> 	struct ah_data *ahp = x-&gt;data;</div><div class='ctx'> 	struct ipv6hdr *top_iph = ipv6_hdr(skb);</div><div class='hunk'>@@ -314,21 +324,15 @@ static void ah6_output_done(struct crypto_async_request *base, int err)</div><div class='ctx'> </div><div class='ctx'> 	iph_base = AH_SKB_CB(skb)-&gt;tmp;</div><div class='ctx'> 	iph_ext = ah_tmp_ext(iph_base);</div><div class='del'>-	icv = ah_tmp_icv(ahp-&gt;ahash, iph_ext, extlen);</div><div class='add'>+	icv = ah_tmp_icv(iph_ext, extlen);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ah-&gt;auth_data, icv, ahp-&gt;icv_trunc_len);</div><div class='ctx'> 	memcpy(top_iph, iph_base, IPV6HDR_BASELEN);</div><div class='ctx'> </div><div class='del'>-	if (extlen) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-		memcpy(&amp;top_iph-&gt;saddr, iph_ext, extlen);</div><div class='del'>-#else</div><div class='del'>-		memcpy(&amp;top_iph-&gt;daddr, iph_ext, extlen);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	ah6_restore_hdrs(top_iph, iph_ext, extlen);</div><div class='ctx'> </div><div class='ctx'> 	kfree(AH_SKB_CB(skb)-&gt;tmp);</div><div class='del'>-	xfrm_output_resume(skb, err);</div><div class='add'>+	xfrm_output_resume(skb-&gt;sk, skb, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -377,7 +381,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	iph_ext = ah_tmp_ext(iph_base);</div><div class='ctx'> 	seqhi = (__be32 *)((char *)iph_ext + extlen);</div><div class='del'>-	icv = ah_tmp_icv(ahash, seqhi, seqhi_len);</div><div class='add'>+	icv = ah_tmp_icv(seqhi, seqhi_len);</div><div class='ctx'> 	req = ah_tmp_req(ahash, icv);</div><div class='ctx'> 	sg = ah_req_sg(ahash, req);</div><div class='ctx'> 	seqhisg = sg + nfrags;</div><div class='hunk'>@@ -396,12 +400,8 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(iph_base, top_iph, IPV6HDR_BASELEN);</div><div class='ctx'> </div><div class='add'>+	ah6_save_hdrs(iph_ext, top_iph, extlen);</div><div class='ctx'> 	if (extlen) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-		memcpy(iph_ext, &amp;top_iph-&gt;saddr, extlen);</div><div class='del'>-#else</div><div class='del'>-		memcpy(iph_ext, &amp;top_iph-&gt;daddr, extlen);</div><div class='del'>-#endif</div><div class='ctx'> 		err = ipv6_clear_mutable_options(top_iph,</div><div class='ctx'> 						 extlen - sizeof(*iph_ext) +</div><div class='ctx'> 						 sizeof(*top_iph),</div><div class='hunk'>@@ -452,13 +452,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	memcpy(ah-&gt;auth_data, icv, ahp-&gt;icv_trunc_len);</div><div class='ctx'> 	memcpy(top_iph, iph_base, IPV6HDR_BASELEN);</div><div class='ctx'> </div><div class='del'>-	if (extlen) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-		memcpy(&amp;top_iph-&gt;saddr, iph_ext, extlen);</div><div class='del'>-#else</div><div class='del'>-		memcpy(&amp;top_iph-&gt;daddr, iph_ext, extlen);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	ah6_restore_hdrs(top_iph, iph_ext, extlen);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(iph_base);</div><div class='hunk'>@@ -466,24 +460,24 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ah6_input_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void ah6_input_done(void *data, int err)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *auth_data;</div><div class='ctx'> 	u8 *icv;</div><div class='ctx'> 	u8 *work_iph;</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='ctx'> 	struct ah_data *ahp = x-&gt;data;</div><div class='ctx'> 	struct ip_auth_hdr *ah = ip_auth_hdr(skb);</div><div class='ctx'> 	int hdr_len = skb_network_header_len(skb);</div><div class='del'>-	int ah_hlen = (ah-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+	int ah_hlen = ipv6_authlen(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	work_iph = AH_SKB_CB(skb)-&gt;tmp;</div><div class='ctx'> 	auth_data = ah_tmp_auth(work_iph, hdr_len);</div><div class='del'>-	icv = ah_tmp_icv(ahp-&gt;ahash, auth_data, ahp-&gt;icv_trunc_len);</div><div class='add'>+	icv = ah_tmp_icv(auth_data, ahp-&gt;icv_trunc_len);</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_memneq(icv, auth_data, ahp-&gt;icv_trunc_len) ? -EBADMSG : 0;</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -558,7 +552,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	ahash = ahp-&gt;ahash;</div><div class='ctx'> </div><div class='ctx'> 	nexthdr = ah-&gt;nexthdr;</div><div class='del'>-	ah_hlen = (ah-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+	ah_hlen = ipv6_authlen(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (ah_hlen != XFRM_ALIGN8(sizeof(*ah) + ahp-&gt;icv_full_len) &amp;&amp;</div><div class='ctx'> 	    ah_hlen != XFRM_ALIGN8(sizeof(*ah) + ahp-&gt;icv_trunc_len))</div><div class='hunk'>@@ -591,7 +585,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	auth_data = ah_tmp_auth((u8 *)work_iph, hdr_len);</div><div class='ctx'> 	seqhi = (__be32 *)(auth_data + ahp-&gt;icv_trunc_len);</div><div class='del'>-	icv = ah_tmp_icv(ahash, seqhi, seqhi_len);</div><div class='add'>+	icv = ah_tmp_icv(seqhi, seqhi_len);</div><div class='ctx'> 	req = ah_tmp_req(ahash, icv);</div><div class='ctx'> 	sg = ah_req_sg(ahash, req);</div><div class='ctx'> 	seqhisg = sg + nfrags;</div><div class='hunk'>@@ -600,7 +594,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	memcpy(auth_data, ah-&gt;auth_data, ahp-&gt;icv_trunc_len);</div><div class='ctx'> 	memset(ah-&gt;auth_data, 0, ahp-&gt;icv_trunc_len);</div><div class='ctx'> </div><div class='del'>-	if (ipv6_clear_mutable_options(ip6h, hdr_len, XFRM_POLICY_IN))</div><div class='add'>+	err = ipv6_clear_mutable_options(ip6h, hdr_len, XFRM_POLICY_IN);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	ip6h-&gt;priority    = 0;</div><div class='hunk'>@@ -680,30 +675,38 @@ static int ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ah6_init_state(struct xfrm_state *x)</div><div class='add'>+static int ah6_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ah_data *ahp = NULL;</div><div class='ctx'> 	struct xfrm_algo_desc *aalg_desc;</div><div class='ctx'> 	struct crypto_ahash *ahash;</div><div class='ctx'> </div><div class='del'>-	if (!x-&gt;aalg)</div><div class='add'>+	if (!x-&gt;aalg) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "AH requires a state with an AUTH algorithm");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;encap)</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "AH is not compatible with encapsulation");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ahp = kzalloc(sizeof(*ahp), GFP_KERNEL);</div><div class='ctx'> 	if (!ahp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ahash = crypto_alloc_ahash(x-&gt;aalg-&gt;alg_name, 0, 0);</div><div class='del'>-	if (IS_ERR(ahash))</div><div class='add'>+	if (IS_ERR(ahash)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ahp-&gt;ahash = ahash;</div><div class='ctx'> 	if (crypto_ahash_setkey(ahash, x-&gt;aalg-&gt;alg_key,</div><div class='del'>-			       (x-&gt;aalg-&gt;alg_key_len + 7) / 8))</div><div class='add'>+			       (x-&gt;aalg-&gt;alg_key_len + 7) / 8)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lookup the algorithm description maintained by xfrm_algo,</div><div class='hunk'>@@ -716,9 +719,7 @@ static int ah6_init_state(struct xfrm_state *x)</div><div class='ctx'> </div><div class='ctx'> 	if (aalg_desc-&gt;uinfo.auth.icv_fullbits/8 !=</div><div class='ctx'> 	    crypto_ahash_digestsize(ahash)) {</div><div class='del'>-		pr_info("AH: %s digestsize %u != %hu\n",</div><div class='del'>-			x-&gt;aalg-&gt;alg_name, crypto_ahash_digestsize(ahash),</div><div class='del'>-			aalg_desc-&gt;uinfo.auth.icv_fullbits/8);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -735,6 +736,7 @@ static int ah6_init_state(struct xfrm_state *x)</div><div class='ctx'> 		x-&gt;props.header_len += sizeof(struct ipv6hdr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid mode requested for AH, must be one of TRANSPORT, TUNNEL, BEET");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	x-&gt;data = ahp;</div><div class='hunk'>@@ -766,7 +768,6 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type ah6_type = {</div><div class='del'>-	.description	= "AH6",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_AH,</div><div class='ctx'> 	.flags		= XFRM_TYPE_REPLAY_PROT,</div><div class='hunk'>@@ -774,11 +775,11 @@ static const struct xfrm_type ah6_type = {</div><div class='ctx'> 	.destructor	= ah6_destroy,</div><div class='ctx'> 	.input		= ah6_input,</div><div class='ctx'> 	.output		= ah6_output,</div><div class='del'>-	.hdr_offset	= xfrm6_find_1stfragopt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol ah6_protocol = {</div><div class='ctx'> 	.handler	=	xfrm6_rcv,</div><div class='add'>+	.input_handler	=	xfrm_input,</div><div class='ctx'> 	.cb_handler	=	ah6_rcv_cb,</div><div class='ctx'> 	.err_handler	=	ah6_err,</div><div class='ctx'> 	.priority	=	0,</div><div class='hunk'>@@ -805,13 +806,12 @@ static void __exit ah6_fini(void)</div><div class='ctx'> 	if (xfrm6_protocol_deregister(&amp;ah6_protocol, IPPROTO_AH) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (xfrm_unregister_type(&amp;ah6_type, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='del'>-</div><div class='add'>+	xfrm_unregister_type(&amp;ah6_type, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ah6_init);</div><div class='ctx'> module_exit(ah6_fini);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IPv6 AH transformation helpers");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_AH);</div><div class='head'>diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c<br/>index 4e0ff7031edd..52599584422b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/anycast.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/anycast.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/anycast.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/anycast.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Anycast support for IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	David L Stevens (dlstevens@us.ibm.com)</div><div class='ctx'>  *</div><div class='ctx'>  *	based heavily on net/ipv6/mcast.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -44,8 +40,26 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> </div><div class='add'>+#define IN6_ADDR_HSIZE_SHIFT	8</div><div class='add'>+#define IN6_ADDR_HSIZE		BIT(IN6_ADDR_HSIZE_SHIFT)</div><div class='add'>+/*	anycast address hash table</div><div class='add'>+ */</div><div class='add'>+static struct hlist_head inet6_acaddr_lst[IN6_ADDR_HSIZE];</div><div class='add'>+static DEFINE_SPINLOCK(acaddr_hash_lock);</div><div class='add'>+</div><div class='add'>+#define ac_dereference(a, idev)						\</div><div class='add'>+	rcu_dereference_protected(a, lockdep_is_held(&amp;(idev)-&gt;lock))</div><div class='add'>+</div><div class='ctx'> static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr);</div><div class='ctx'> </div><div class='add'>+static u32 inet6_acaddr_hash(const struct net *net,</div><div class='add'>+			     const struct in6_addr *addr)</div><div class='add'>+{</div><div class='add'>+	u32 val = __ipv6_addr_jhash(addr, net_hash_mix(net));</div><div class='add'>+</div><div class='add'>+	return hash_32(val, IN6_ADDR_HSIZE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	socket join an anycast group</div><div class='ctx'>  */</div><div class='hunk'>@@ -53,14 +67,12 @@ static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr);</div><div class='ctx'> int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct ipv6_ac_socklist *pac = NULL;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-	struct ipv6_ac_socklist *pac;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-	int	ishost = !net-&gt;ipv6.devconf_all-&gt;forwarding;</div><div class='del'>-	int	err = 0;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	int err = 0, ishost;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -68,32 +80,43 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ifindex)</div><div class='del'>-		dev = __dev_get_by_index(net, ifindex);</div><div class='add'>+		dev = netdev_get_by_index(net, ifindex, &amp;dev_tracker, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (ipv6_chk_addr_and_flags(net, addr, dev, true, 0, IFA_F_TENTATIVE))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (ipv6_chk_addr_and_flags(net, addr, dev, true, 0, IFA_F_TENTATIVE)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pac = sock_kmalloc(sk, sizeof(struct ipv6_ac_socklist), GFP_KERNEL);</div><div class='del'>-	if (!pac)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!pac) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pac-&gt;acl_next = NULL;</div><div class='ctx'> 	pac-&gt;acl_addr = *addr;</div><div class='ctx'> </div><div class='add'>+	ishost = !READ_ONCE(net-&gt;ipv6.devconf_all-&gt;forwarding);</div><div class='add'>+</div><div class='ctx'> 	if (ifindex == 0) {</div><div class='ctx'> 		struct rt6_info *rt;</div><div class='ctx'> </div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		rt = rt6_lookup(net, addr, NULL, 0, NULL, 0);</div><div class='ctx'> 		if (rt) {</div><div class='del'>-			dev = rt-&gt;dst.dev;</div><div class='add'>+			dev = dst_dev_rcu(&amp;rt-&gt;dst);</div><div class='add'>+			netdev_hold(dev, &amp;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 			ip6_rt_put(rt);</div><div class='ctx'> 		} else if (ishost) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			err = -EADDRNOTAVAIL;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* router, no matching interface: just pick one */</div><div class='del'>-			dev = __dev_get_by_flags(net, IFF_UP,</div><div class='del'>-						 IFF_UP | IFF_LOOPBACK);</div><div class='add'>+			dev = netdev_get_by_flags_rcu(net, &amp;dev_tracker, IFF_UP,</div><div class='add'>+						      IFF_UP | IFF_LOOPBACK);</div><div class='ctx'> 		}</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dev) {</div><div class='hunk'>@@ -101,7 +124,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idev = __in6_dev_get(dev);</div><div class='add'>+	idev = in6_dev_get(dev);</div><div class='ctx'> 	if (!idev) {</div><div class='ctx'> 		if (ifindex)</div><div class='ctx'> 			err = -ENODEV;</div><div class='hunk'>@@ -109,8 +132,9 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 			err = -EADDRNOTAVAIL;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* reset ishost, now that we have a specific device */</div><div class='del'>-	ishost = !idev-&gt;cnf.forwarding;</div><div class='add'>+	ishost = !READ_ONCE(idev-&gt;cnf.forwarding);</div><div class='ctx'> </div><div class='ctx'> 	pac-&gt;acl_ifindex = dev-&gt;ifindex;</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +147,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 		if (ishost)</div><div class='ctx'> 			err = -EADDRNOTAVAIL;</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto error;</div><div class='add'>+			goto error_idev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = __ipv6_dev_ac_inc(idev, addr);</div><div class='hunk'>@@ -133,7 +157,11 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 		pac = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+error_idev:</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> error:</div><div class='add'>+	netdev_put(dev, &amp;dev_tracker);</div><div class='add'>+</div><div class='ctx'> 	if (pac)</div><div class='ctx'> 		sock_kfree_s(sk, pac, sizeof(*pac));</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -144,12 +172,10 @@ error:</div><div class='ctx'>  */</div><div class='ctx'> int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct ipv6_ac_socklist *pac, *prev_pac;</div><div class='add'>+	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	prev_pac = NULL;</div><div class='ctx'> 	for (pac = np-&gt;ipv6_ac_list; pac; pac = pac-&gt;acl_next) {</div><div class='hunk'>@@ -165,35 +191,33 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> 	else</div><div class='ctx'> 		np-&gt;ipv6_ac_list = pac-&gt;acl_next;</div><div class='ctx'> </div><div class='del'>-	dev = __dev_get_by_index(net, pac-&gt;acl_ifindex);</div><div class='del'>-	if (dev)</div><div class='add'>+	dev = dev_get_by_index(net, pac-&gt;acl_ifindex);</div><div class='add'>+	if (dev) {</div><div class='ctx'> 		ipv6_dev_ac_dec(dev, &amp;pac-&gt;acl_addr);</div><div class='add'>+		dev_put(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sock_kfree_s(sk, pac, sizeof(*pac));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipv6_sock_ac_close(struct sock *sk)</div><div class='add'>+void __ipv6_sock_ac_close(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	struct ipv6_ac_socklist *pac;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-	int	prev_index;</div><div class='add'>+	int prev_index = 0;</div><div class='ctx'> </div><div class='del'>-	if (!np-&gt;ipv6_ac_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='ctx'> 	pac = np-&gt;ipv6_ac_list;</div><div class='ctx'> 	np-&gt;ipv6_ac_list = NULL;</div><div class='ctx'> </div><div class='del'>-	prev_index = 0;</div><div class='ctx'> 	while (pac) {</div><div class='ctx'> 		struct ipv6_ac_socklist *next = pac-&gt;acl_next;</div><div class='ctx'> </div><div class='ctx'> 		if (pac-&gt;acl_ifindex != prev_index) {</div><div class='del'>-			dev = __dev_get_by_index(net, pac-&gt;acl_ifindex);</div><div class='add'>+			dev_put(dev);</div><div class='add'>+			dev = dev_get_by_index(net, pac-&gt;acl_ifindex);</div><div class='ctx'> 			prev_index = pac-&gt;acl_ifindex;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dev)</div><div class='hunk'>@@ -201,7 +225,34 @@ void ipv6_sock_ac_close(struct sock *sk)</div><div class='ctx'> 		sock_kfree_s(sk, pac, sizeof(*pac));</div><div class='ctx'> 		pac = next;</div><div class='ctx'> 	}</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ipv6_sock_ac_close(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!np-&gt;ipv6_ac_list)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__ipv6_sock_ac_close(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipv6_add_acaddr_hash(struct net *net, struct ifacaddr6 *aca)</div><div class='add'>+{</div><div class='add'>+	unsigned int hash = inet6_acaddr_hash(net, &amp;aca-&gt;aca_addr);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;acaddr_hash_lock);</div><div class='add'>+	hlist_add_head_rcu(&amp;aca-&gt;aca_addr_lst, &amp;inet6_acaddr_lst[hash]);</div><div class='add'>+	spin_unlock(&amp;acaddr_hash_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipv6_del_acaddr_hash(struct ifacaddr6 *aca)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;acaddr_hash_lock);</div><div class='add'>+	hlist_del_init_rcu(&amp;aca-&gt;aca_addr_lst);</div><div class='add'>+	spin_unlock(&amp;acaddr_hash_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aca_get(struct ifacaddr6 *aca)</div><div class='hunk'>@@ -209,12 +260,18 @@ static void aca_get(struct ifacaddr6 *aca)</div><div class='ctx'> 	refcount_inc(&amp;aca-&gt;aca_refcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void aca_free_rcu(struct rcu_head *h)</div><div class='add'>+{</div><div class='add'>+	struct ifacaddr6 *aca = container_of(h, struct ifacaddr6, rcu);</div><div class='add'>+</div><div class='add'>+	fib6_info_release(aca-&gt;aca_rt);</div><div class='add'>+	kfree(aca);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void aca_put(struct ifacaddr6 *ac)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_test(&amp;ac-&gt;aca_refcnt)) {</div><div class='del'>-		fib6_info_release(ac-&gt;aca_rt);</div><div class='del'>-		kfree(ac);</div><div class='del'>-	}</div><div class='add'>+	if (refcount_dec_and_test(&amp;ac-&gt;aca_refcnt))</div><div class='add'>+		call_rcu_hurry(&amp;ac-&gt;rcu, aca_free_rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ifacaddr6 *aca_alloc(struct fib6_info *f6i,</div><div class='hunk'>@@ -229,6 +286,7 @@ static struct ifacaddr6 *aca_alloc(struct fib6_info *f6i,</div><div class='ctx'> 	aca-&gt;aca_addr = *addr;</div><div class='ctx'> 	fib6_info_hold(f6i);</div><div class='ctx'> 	aca-&gt;aca_rt = f6i;</div><div class='add'>+	INIT_HLIST_NODE(&amp;aca-&gt;aca_addr_lst);</div><div class='ctx'> 	aca-&gt;aca_users = 1;</div><div class='ctx'> 	/* aca_tstamp should be updated upon changes */</div><div class='ctx'> 	aca-&gt;aca_cstamp = aca-&gt;aca_tstamp = jiffies;</div><div class='hunk'>@@ -237,6 +295,37 @@ static struct ifacaddr6 *aca_alloc(struct fib6_info *f6i,</div><div class='ctx'> 	return aca;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void inet6_ifacaddr_notify(struct net_device *dev,</div><div class='add'>+				  const struct ifacaddr6 *ifaca, int event)</div><div class='add'>+{</div><div class='add'>+	struct inet6_fill_args fillargs = {</div><div class='add'>+		.event = event,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+	};</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +</div><div class='add'>+			nla_total_size(sizeof(struct in6_addr)) +</div><div class='add'>+			nla_total_size(sizeof(struct ifa_cacheinfo)),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = inet6_fill_ifacaddr(skb, ifaca, &amp;fillargs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("Failed to fill in anycast addresses (err %d)\n", err);</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_ACADDR, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_ACADDR, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	device anycast group inc (add if not found)</div><div class='ctx'>  */</div><div class='hunk'>@@ -247,15 +336,14 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (idev-&gt;dead) {</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (aca = idev-&gt;ac_list; aca; aca = aca-&gt;aca_next) {</div><div class='add'>+	for (aca = ac_dereference(idev-&gt;ac_list, idev); aca;</div><div class='add'>+	     aca = ac_dereference(aca-&gt;aca_next, idev)) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;aca-&gt;aca_addr, addr)) {</div><div class='ctx'> 			aca-&gt;aca_users++;</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -264,7 +352,7 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	net = dev_net(idev-&gt;dev);</div><div class='del'>-	f6i = addrconf_f6i_alloc(net, idev, addr, true, GFP_ATOMIC);</div><div class='add'>+	f6i = addrconf_f6i_alloc(net, idev, addr, true, GFP_ATOMIC, NULL);</div><div class='ctx'> 	if (IS_ERR(f6i)) {</div><div class='ctx'> 		err = PTR_ERR(f6i);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -276,19 +364,23 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aca-&gt;aca_next = idev-&gt;ac_list;</div><div class='del'>-	idev-&gt;ac_list = aca;</div><div class='del'>-</div><div class='ctx'> 	/* Hold this for addrconf_join_solict() below before we unlock,</div><div class='ctx'> 	 * it is already exposed via idev-&gt;ac_list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	aca_get(aca);</div><div class='add'>+	aca-&gt;aca_next = idev-&gt;ac_list;</div><div class='add'>+	rcu_assign_pointer(idev-&gt;ac_list, aca);</div><div class='add'>+</div><div class='ctx'> 	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	ipv6_add_acaddr_hash(net, aca);</div><div class='add'>+</div><div class='ctx'> 	ip6_ins_rt(net, f6i);</div><div class='ctx'> </div><div class='ctx'> 	addrconf_join_solict(idev-&gt;dev, &amp;aca-&gt;aca_addr);</div><div class='ctx'> </div><div class='add'>+	inet6_ifacaddr_notify(idev-&gt;dev, aca, RTM_NEWANYCAST);</div><div class='add'>+</div><div class='ctx'> 	aca_put(aca);</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -303,11 +395,10 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifacaddr6 *aca, *prev_aca;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	prev_aca = NULL;</div><div class='del'>-	for (aca = idev-&gt;ac_list; aca; aca = aca-&gt;aca_next) {</div><div class='add'>+	for (aca = ac_dereference(idev-&gt;ac_list, idev); aca;</div><div class='add'>+	     aca = ac_dereference(aca-&gt;aca_next, idev)) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;aca-&gt;aca_addr, addr))</div><div class='ctx'> 			break;</div><div class='ctx'> 		prev_aca = aca;</div><div class='hunk'>@@ -321,26 +412,33 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (prev_aca)</div><div class='del'>-		prev_aca-&gt;aca_next = aca-&gt;aca_next;</div><div class='add'>+		rcu_assign_pointer(prev_aca-&gt;aca_next, aca-&gt;aca_next);</div><div class='ctx'> 	else</div><div class='del'>-		idev-&gt;ac_list = aca-&gt;aca_next;</div><div class='add'>+		rcu_assign_pointer(idev-&gt;ac_list, aca-&gt;aca_next);</div><div class='ctx'> 	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	ipv6_del_acaddr_hash(aca);</div><div class='ctx'> 	addrconf_leave_solict(idev, &amp;aca-&gt;aca_addr);</div><div class='ctx'> </div><div class='del'>-	ip6_del_rt(dev_net(idev-&gt;dev), aca-&gt;aca_rt);</div><div class='add'>+	ip6_del_rt(dev_net(idev-&gt;dev), aca-&gt;aca_rt, false);</div><div class='add'>+</div><div class='add'>+	inet6_ifacaddr_notify(idev-&gt;dev, aca, RTM_DELANYCAST);</div><div class='ctx'> </div><div class='ctx'> 	aca_put(aca);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called with rtnl_lock() */</div><div class='ctx'> static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='add'>+	struct inet6_dev *idev = in6_dev_get(dev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	return __ipv6_dev_ac_dec(idev, addr);</div><div class='add'>+</div><div class='add'>+	err = __ipv6_dev_ac_dec(idev, addr);</div><div class='add'>+	in6_dev_put(idev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipv6_ac_destroy_dev(struct inet6_dev *idev)</div><div class='hunk'>@@ -348,13 +446,15 @@ void ipv6_ac_destroy_dev(struct inet6_dev *idev)</div><div class='ctx'> 	struct ifacaddr6 *aca;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	while ((aca = idev-&gt;ac_list) != NULL) {</div><div class='del'>-		idev-&gt;ac_list = aca-&gt;aca_next;</div><div class='add'>+	while ((aca = ac_dereference(idev-&gt;ac_list, idev)) != NULL) {</div><div class='add'>+		rcu_assign_pointer(idev-&gt;ac_list, aca-&gt;aca_next);</div><div class='ctx'> 		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='add'>+		ipv6_del_acaddr_hash(aca);</div><div class='add'>+</div><div class='ctx'> 		addrconf_leave_solict(idev, &amp;aca-&gt;aca_addr);</div><div class='ctx'> </div><div class='del'>-		ip6_del_rt(dev_net(idev-&gt;dev), aca-&gt;aca_rt);</div><div class='add'>+		ip6_del_rt(dev_net(idev-&gt;dev), aca-&gt;aca_rt, false);</div><div class='ctx'> </div><div class='ctx'> 		aca_put(aca);</div><div class='ctx'> </div><div class='hunk'>@@ -374,11 +474,10 @@ static bool ipv6_chk_acast_dev(struct net_device *dev, const struct in6_addr *ad</div><div class='ctx'> </div><div class='ctx'> 	idev = __in6_dev_get(dev);</div><div class='ctx'> 	if (idev) {</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		for (aca = idev-&gt;ac_list; aca; aca = aca-&gt;aca_next)</div><div class='add'>+		for (aca = rcu_dereference(idev-&gt;ac_list); aca;</div><div class='add'>+		     aca = rcu_dereference(aca-&gt;aca_next))</div><div class='ctx'> 			if (ipv6_addr_equal(&amp;aca-&gt;aca_addr, addr))</div><div class='ctx'> 				break;</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 		return aca != NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -390,17 +489,27 @@ static bool ipv6_chk_acast_dev(struct net_device *dev, const struct in6_addr *ad</div><div class='ctx'> bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,</div><div class='ctx'> 			 const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *nh_dev;</div><div class='add'>+	struct ifacaddr6 *aca;</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		found = ipv6_chk_acast_dev(dev, addr);</div><div class='del'>-	else</div><div class='del'>-		for_each_netdev_rcu(net, dev)</div><div class='del'>-			if (ipv6_chk_acast_dev(dev, addr)) {</div><div class='add'>+	else {</div><div class='add'>+		unsigned int hash = inet6_acaddr_hash(net, addr);</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_rcu(aca, &amp;inet6_acaddr_lst[hash],</div><div class='add'>+					 aca_addr_lst) {</div><div class='add'>+			nh_dev = fib6_info_nh_dev(aca-&gt;aca_rt);</div><div class='add'>+			if (!nh_dev || !net_eq(dev_net(nh_dev), net))</div><div class='add'>+				continue;</div><div class='add'>+			if (ipv6_addr_equal(&amp;aca-&gt;aca_addr, addr)) {</div><div class='ctx'> 				found = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='hunk'>@@ -421,30 +530,25 @@ bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,</div><div class='ctx'> struct ac6_iter_state {</div><div class='ctx'> 	struct seq_net_private p;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct inet6_dev *idev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ac6_seq_private(seq)	((struct ac6_iter_state *)(seq)-&gt;private)</div><div class='ctx'> </div><div class='ctx'> static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	struct ifacaddr6 *im = NULL;</div><div class='ctx'> 	struct ac6_iter_state *state = ac6_seq_private(seq);</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='add'>+	struct ifacaddr6 *im = NULL;</div><div class='ctx'> </div><div class='del'>-	state-&gt;idev = NULL;</div><div class='ctx'> 	for_each_netdev_rcu(net, state-&gt;dev) {</div><div class='ctx'> 		struct inet6_dev *idev;</div><div class='add'>+</div><div class='ctx'> 		idev = __in6_dev_get(state-&gt;dev);</div><div class='ctx'> 		if (!idev)</div><div class='ctx'> 			continue;</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		im = idev-&gt;ac_list;</div><div class='del'>-		if (im) {</div><div class='del'>-			state-&gt;idev = idev;</div><div class='add'>+		im = rcu_dereference(idev-&gt;ac_list);</div><div class='add'>+		if (im)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return im;</div><div class='ctx'> }</div><div class='hunk'>@@ -452,22 +556,17 @@ static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)</div><div class='ctx'> static struct ifacaddr6 *ac6_get_next(struct seq_file *seq, struct ifacaddr6 *im)</div><div class='ctx'> {</div><div class='ctx'> 	struct ac6_iter_state *state = ac6_seq_private(seq);</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='del'>-	im = im-&gt;aca_next;</div><div class='add'>+	im = rcu_dereference(im-&gt;aca_next);</div><div class='ctx'> 	while (!im) {</div><div class='del'>-		if (likely(state-&gt;idev != NULL))</div><div class='del'>-			read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 		state-&gt;dev = next_net_device_rcu(state-&gt;dev);</div><div class='del'>-		if (!state-&gt;dev) {</div><div class='del'>-			state-&gt;idev = NULL;</div><div class='add'>+		if (!state-&gt;dev)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-		state-&gt;idev = __in6_dev_get(state-&gt;dev);</div><div class='del'>-		if (!state-&gt;idev)</div><div class='add'>+		idev = __in6_dev_get(state-&gt;dev);</div><div class='add'>+		if (!idev)</div><div class='ctx'> 			continue;</div><div class='del'>-		read_lock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-		im = state-&gt;idev-&gt;ac_list;</div><div class='add'>+		im = rcu_dereference(idev-&gt;ac_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	return im;</div><div class='ctx'> }</div><div class='hunk'>@@ -499,12 +598,6 @@ static void *ac6_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> static void ac6_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	__releases(RCU)</div><div class='ctx'> {</div><div class='del'>-	struct ac6_iter_state *state = ac6_seq_private(seq);</div><div class='del'>-</div><div class='del'>-	if (likely(state-&gt;idev != NULL)) {</div><div class='del'>-		read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-		state-&gt;idev = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -540,3 +633,24 @@ void ac6_proc_exit(struct net *net)</div><div class='ctx'> 	remove_proc_entry("anycast6", net-&gt;proc_net);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/*	Init / cleanup code</div><div class='add'>+ */</div><div class='add'>+int __init ipv6_anycast_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;inet6_acaddr_lst[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ipv6_anycast_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;acaddr_hash_lock);</div><div class='add'>+	for (i = 0; i &lt; IN6_ADDR_HSIZE; i++)</div><div class='add'>+		WARN_ON(!hlist_empty(&amp;inet6_acaddr_lst[i]));</div><div class='add'>+	spin_unlock(&amp;acaddr_hash_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/calipso.c b/net/ipv6/calipso.c<br/>index 1c0bb9fb76e6..df1986973430 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/calipso.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/calipso.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/calipso.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/calipso.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * CALIPSO - Common Architecture Label IPv6 Security Option</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,25 +7,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Authors: Paul Moore &lt;paul.moore@hp.com&gt;</div><div class='ctx'>  *          Huw Davies &lt;huw@codeweavers.com&gt;</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* (c) Copyright Hewlett-Packard Development Company, L.P., 2006, 2008</div><div class='ctx'>  * (c) Copyright Huw Davies &lt;huw@codeweavers.com&gt;, 2015</div><div class='del'>- *</div><div class='del'>- * This program is free software;  you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY;  without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See</div><div class='del'>- * the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program;  if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -43,10 +29,10 @@</div><div class='ctx'> #include &lt;net/calipso.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/crc-ccitt.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Maximium size of the calipso option including</div><div class='add'>+/* Maximum size of the calipso option including</div><div class='ctx'>  * the two-byte TLV header.</div><div class='ctx'>  */</div><div class='ctx'> #define CALIPSO_OPT_LEN_MAX (2 + 252)</div><div class='hunk'>@@ -56,13 +42,13 @@</div><div class='ctx'>  */</div><div class='ctx'> #define CALIPSO_HDR_LEN (2 + 8)</div><div class='ctx'> </div><div class='del'>-/* Maximium size of the calipso option including</div><div class='add'>+/* Maximum size of the calipso option including</div><div class='ctx'>  * the two-byte TLV header and upto 3 bytes of</div><div class='ctx'>  * leading pad and 7 bytes of trailing pad.</div><div class='ctx'>  */</div><div class='ctx'> #define CALIPSO_OPT_LEN_MAX_WITH_PAD (3 + CALIPSO_OPT_LEN_MAX + 7)</div><div class='ctx'> </div><div class='del'>- /* Maximium size of u32 aligned buffer required to hold calipso</div><div class='add'>+ /* Maximum size of u32 aligned buffer required to hold calipso</div><div class='ctx'>   * option.  Max of 3 initial pad bytes starting from buffer + 3.</div><div class='ctx'>   * i.e. the worst case is when the previous tlv finishes on 4n + 3.</div><div class='ctx'>   */</div><div class='hunk'>@@ -97,6 +83,9 @@ struct calipso_map_cache_entry {</div><div class='ctx'> </div><div class='ctx'> static struct calipso_map_cache_bkt *calipso_cache;</div><div class='ctx'> </div><div class='add'>+static void calipso_cache_invalidate(void);</div><div class='add'>+static void calipso_doi_putdef(struct calipso_doi *doi_def);</div><div class='add'>+</div><div class='ctx'> /* Label Mapping Cache Functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +426,7 @@ static void calipso_doi_free_rcu(struct rcu_head *entry)</div><div class='ctx'> /**</div><div class='ctx'>  * calipso_doi_remove - Remove an existing DOI from the CALIPSO protocol engine</div><div class='ctx'>  * @doi: the DOI value</div><div class='del'>- * @audit_secid: the LSM secid to use in the audit message</div><div class='add'>+ * @audit_info: NetLabel audit information</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Removes a DOI definition from the CALIPSO engine.  The NetLabel routines will</div><div class='hunk'>@@ -458,15 +447,10 @@ static int calipso_doi_remove(u32 doi, struct netlbl_audit *audit_info)</div><div class='ctx'> 		ret_val = -ENOENT;</div><div class='ctx'> 		goto doi_remove_return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!refcount_dec_and_test(&amp;doi_def-&gt;refcount)) {</div><div class='del'>-		spin_unlock(&amp;calipso_doi_list_lock);</div><div class='del'>-		ret_val = -EBUSY;</div><div class='del'>-		goto doi_remove_return;</div><div class='del'>-	}</div><div class='ctx'> 	list_del_rcu(&amp;doi_def-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;calipso_doi_list_lock);</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;doi_def-&gt;rcu, calipso_doi_free_rcu);</div><div class='add'>+	calipso_doi_putdef(doi_def);</div><div class='ctx'> 	ret_val = 0;</div><div class='ctx'> </div><div class='ctx'> doi_remove_return:</div><div class='hunk'>@@ -522,10 +506,8 @@ static void calipso_doi_putdef(struct calipso_doi *doi_def)</div><div class='ctx'> </div><div class='ctx'> 	if (!refcount_dec_and_test(&amp;doi_def-&gt;refcount))</div><div class='ctx'> 		return;</div><div class='del'>-	spin_lock(&amp;calipso_doi_list_lock);</div><div class='del'>-	list_del_rcu(&amp;doi_def-&gt;list);</div><div class='del'>-	spin_unlock(&amp;calipso_doi_list_lock);</div><div class='ctx'> </div><div class='add'>+	calipso_cache_invalidate();</div><div class='ctx'> 	call_rcu(&amp;doi_def-&gt;rcu, calipso_doi_free_rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -675,11 +657,8 @@ static int calipso_map_cat_ntoh(const struct calipso_doi *doi_def,</div><div class='ctx'> 					  net_clen_bits,</div><div class='ctx'> 					  spot + 1,</div><div class='ctx'> 					  1);</div><div class='del'>-		if (spot &lt; 0) {</div><div class='del'>-			if (spot == -2)</div><div class='del'>-				return -EFAULT;</div><div class='add'>+		if (spot &lt; 0)</div><div class='ctx'> 			return 0;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		ret_val = netlbl_catmap_setbit(&amp;secattr-&gt;attr.mls.cat,</div><div class='ctx'> 					       spot,</div><div class='hunk'>@@ -775,7 +754,7 @@ static int calipso_genopt(unsigned char *buf, u32 start, u32 buf_len,</div><div class='ctx'> 	calipso[1] = len - 2;</div><div class='ctx'> 	*(__be32 *)(calipso + 2) = htonl(doi_def-&gt;doi);</div><div class='ctx'> 	calipso[6] = (len - CALIPSO_HDR_LEN) / 4;</div><div class='del'>-	calipso[7] = secattr-&gt;attr.mls.lvl,</div><div class='add'>+	calipso[7] = secattr-&gt;attr.mls.lvl;</div><div class='ctx'> 	crc = ~crc_ccitt(0xffff, calipso, len);</div><div class='ctx'> 	calipso[8] = crc &amp; 0xff;</div><div class='ctx'> 	calipso[9] = (crc &gt;&gt; 8) &amp; 0xff;</div><div class='hunk'>@@ -1061,7 +1040,8 @@ static int calipso_opt_getattr(const unsigned char *calipso,</div><div class='ctx'> 			goto getattr_return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='add'>+		if (secattr-&gt;attr.mls.cat)</div><div class='add'>+			secattr-&gt;flags |= NETLBL_SECATTR_MLS_CAT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	secattr-&gt;type = NETLBL_NLTYPE_CALIPSO;</div><div class='hunk'>@@ -1092,8 +1072,13 @@ static int calipso_sock_getattr(struct sock *sk,</div><div class='ctx'> 	struct ipv6_opt_hdr *hop;</div><div class='ctx'> 	int opt_len, len, ret_val = -ENOMSG, offset;</div><div class='ctx'> 	unsigned char *opt;</div><div class='del'>-	struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));</div><div class='add'>+	struct ipv6_pinfo *pinfo = inet6_sk(sk);</div><div class='add'>+	struct ipv6_txoptions *txopts;</div><div class='ctx'> </div><div class='add'>+	if (!pinfo)</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='add'>+</div><div class='add'>+	txopts = txopt_get(pinfo);</div><div class='ctx'> 	if (!txopts || !txopts-&gt;hopopt)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='hunk'>@@ -1145,8 +1130,13 @@ static int calipso_sock_setattr(struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	int ret_val;</div><div class='ctx'> 	struct ipv6_opt_hdr *old, *new;</div><div class='del'>-	struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));</div><div class='add'>+	struct ipv6_pinfo *pinfo = inet6_sk(sk);</div><div class='add'>+	struct ipv6_txoptions *txopts;</div><div class='add'>+</div><div class='add'>+	if (!pinfo)</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='add'>+	txopts = txopt_get(pinfo);</div><div class='ctx'> 	old = NULL;</div><div class='ctx'> 	if (txopts)</div><div class='ctx'> 		old = txopts-&gt;hopopt;</div><div class='hunk'>@@ -1173,8 +1163,13 @@ static int calipso_sock_setattr(struct sock *sk,</div><div class='ctx'> static void calipso_sock_delattr(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_opt_hdr *new_hop;</div><div class='del'>-	struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));</div><div class='add'>+	struct ipv6_pinfo *pinfo = inet6_sk(sk);</div><div class='add'>+	struct ipv6_txoptions *txopts;</div><div class='add'>+</div><div class='add'>+	if (!pinfo)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	txopts = txopt_get(pinfo);</div><div class='ctx'> 	if (!txopts || !txopts-&gt;hopopt)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='hunk'>@@ -1212,6 +1207,10 @@ static int calipso_req_setattr(struct request_sock *req,</div><div class='ctx'> 	struct ipv6_opt_hdr *old, *new;</div><div class='ctx'> 	struct sock *sk = sk_to_full_sk(req_to_sk(req));</div><div class='ctx'> </div><div class='add'>+	/* sk is NULL for SYN+ACK w/ SYN Cookie */</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (req_inet-&gt;ipv6_opt &amp;&amp; req_inet-&gt;ipv6_opt-&gt;hopopt)</div><div class='ctx'> 		old = req_inet-&gt;ipv6_opt-&gt;hopopt;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1239,7 +1238,7 @@ static int calipso_req_setattr(struct request_sock *req,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * calipso_req_delattr - Delete the CALIPSO option from a request socket</div><div class='del'>- * @reg: the request socket</div><div class='add'>+ * @req: the request socket</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  * Removes the CALIPSO option from a request socket, if present.</div><div class='hunk'>@@ -1252,6 +1251,10 @@ static void calipso_req_delattr(struct request_sock *req)</div><div class='ctx'> 	struct ipv6_txoptions *txopts;</div><div class='ctx'> 	struct sock *sk = sk_to_full_sk(req_to_sk(req));</div><div class='ctx'> </div><div class='add'>+	/* sk is NULL for SYN+ACK w/ SYN Cookie */</div><div class='add'>+	if (!sk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (!req_inet-&gt;ipv6_opt || !req_inet-&gt;ipv6_opt-&gt;hopopt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c<br/>index 1ede7a16a0be..83e03176819c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/datagram.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/datagram.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/datagram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/datagram.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	common UDP/RAW code</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='hunk'>@@ -23,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/icmp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='hunk'>@@ -31,6 +28,7 @@</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;net/dsfield.h&gt;</div><div class='add'>+#include &lt;net/sock_reuseport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -40,29 +38,35 @@ static bool ipv6_mapped_addr_any(const struct in6_addr *a)</div><div class='ctx'> 	return ipv6_addr_v4mapped(a) &amp;&amp; (a-&gt;s6_addr32[3] == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip6_datagram_flow_key_init(struct flowi6 *fl6, struct sock *sk)</div><div class='add'>+static void ip6_datagram_flow_key_init(struct flowi6 *fl6,</div><div class='add'>+				       const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	int oif = sk-&gt;sk_bound_dev_if;</div><div class='ctx'> </div><div class='ctx'> 	memset(fl6, 0, sizeof(*fl6));</div><div class='ctx'> 	fl6-&gt;flowi6_proto = sk-&gt;sk_protocol;</div><div class='ctx'> 	fl6-&gt;daddr = sk-&gt;sk_v6_daddr;</div><div class='ctx'> 	fl6-&gt;saddr = np-&gt;saddr;</div><div class='del'>-	fl6-&gt;flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='ctx'> 	fl6-&gt;flowi6_mark = sk-&gt;sk_mark;</div><div class='ctx'> 	fl6-&gt;fl6_dport = inet-&gt;inet_dport;</div><div class='ctx'> 	fl6-&gt;fl6_sport = inet-&gt;inet_sport;</div><div class='del'>-	fl6-&gt;flowlabel = np-&gt;flow_label;</div><div class='del'>-	fl6-&gt;flowi6_uid = sk-&gt;sk_uid;</div><div class='add'>+	fl6-&gt;flowlabel = ip6_make_flowinfo(np-&gt;tclass, np-&gt;flow_label);</div><div class='add'>+	fl6-&gt;flowi6_uid = sk_uid(sk);</div><div class='ctx'> </div><div class='del'>-	if (!fl6-&gt;flowi6_oif)</div><div class='del'>-		fl6-&gt;flowi6_oif = np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='add'>+	if (!oif)</div><div class='add'>+		oif = np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='ctx'> </div><div class='del'>-	if (!fl6-&gt;flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6-&gt;daddr))</div><div class='del'>-		fl6-&gt;flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+	if (!oif) {</div><div class='add'>+		if (ipv6_addr_is_multicast(&amp;fl6-&gt;daddr))</div><div class='add'>+			oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='add'>+		else</div><div class='add'>+			oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(fl6));</div><div class='add'>+	fl6-&gt;flowi6_oif = oif;</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr)</div><div class='hunk'>@@ -76,9 +80,10 @@ int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr)</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;sndflow &amp;&amp; (np-&gt;flow_label &amp; IPV6_FLOWLABEL_MASK)) {</div><div class='add'>+	if (inet6_test_bit(SNDFLOW, sk) &amp;&amp;</div><div class='add'>+	    (np-&gt;flow_label &amp; IPV6_FLOWLABEL_MASK)) {</div><div class='ctx'> 		flowlabel = fl6_sock_lookup(sk, np-&gt;flow_label);</div><div class='del'>-		if (!flowlabel)</div><div class='add'>+		if (IS_ERR(flowlabel))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ip6_datagram_flow_key_init(&amp;fl6, sk);</div><div class='hunk'>@@ -88,7 +93,7 @@ int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr)</div><div class='ctx'> 	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='add'>+	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &amp;fl6, final_p);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -122,7 +127,7 @@ void ip6_datagram_release_cb(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	dst = __sk_dst_get(sk);</div><div class='del'>-	if (!dst || !dst-&gt;obsolete ||</div><div class='add'>+	if (!dst || !READ_ONCE(dst-&gt;obsolete) ||</div><div class='ctx'> 	    dst-&gt;ops-&gt;check(dst, inet6_sk(sk)-&gt;dst_cookie)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -133,7 +138,7 @@ void ip6_datagram_release_cb(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_datagram_release_cb);</div><div class='ctx'> </div><div class='del'>-int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+int __ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			   int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in6	*usin = (struct sockaddr_in6 *) uaddr;</div><div class='hunk'>@@ -147,7 +152,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	int			err;</div><div class='ctx'> </div><div class='ctx'> 	if (usin-&gt;sin6_family == AF_INET) {</div><div class='del'>-		if (__ipv6_only_sock(sk))</div><div class='add'>+		if (ipv6_only_sock(sk))</div><div class='ctx'> 			return -EAFNOSUPPORT;</div><div class='ctx'> 		err = __ip4_datagram_connect(sk, uaddr, addr_len);</div><div class='ctx'> 		goto ipv4_connected;</div><div class='hunk'>@@ -159,7 +164,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	if (usin-&gt;sin6_family != AF_INET6)</div><div class='ctx'> 		return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;sndflow)</div><div class='add'>+	if (inet6_test_bit(SNDFLOW, sk))</div><div class='ctx'> 		fl6_flowlabel = usin-&gt;sin6_flowinfo &amp; IPV6_FLOWINFO_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_any(&amp;usin-&gt;sin6_addr)) {</div><div class='hunk'>@@ -180,7 +185,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	if (addr_type &amp; IPV6_ADDR_MAPPED) {</div><div class='ctx'> 		struct sockaddr_in sin;</div><div class='ctx'> </div><div class='del'>-		if (__ipv6_only_sock(sk)) {</div><div class='add'>+		if (ipv6_only_sock(sk)) {</div><div class='ctx'> 			err = -ENETUNREACH;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -189,7 +194,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 		sin.sin_port = usin-&gt;sin6_port;</div><div class='ctx'> </div><div class='ctx'> 		err = __ip4_datagram_connect(sk,</div><div class='del'>-					     (struct sockaddr *) &amp;sin,</div><div class='add'>+					     (struct sockaddr_unsized *)&amp;sin,</div><div class='ctx'> 					     sizeof(sin));</div><div class='ctx'> </div><div class='ctx'> ipv4_connected:</div><div class='hunk'>@@ -220,11 +225,11 @@ ipv4_connected:</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			sk-&gt;sk_bound_dev_if = usin-&gt;sin6_scope_id;</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_bound_dev_if, usin-&gt;sin6_scope_id);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!sk-&gt;sk_bound_dev_if &amp;&amp; (addr_type &amp; IPV6_ADDR_MULTICAST))</div><div class='del'>-			sk-&gt;sk_bound_dev_if = np-&gt;mcast_oif;</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_bound_dev_if, READ_ONCE(np-&gt;mcast_oif));</div><div class='ctx'> </div><div class='ctx'> 		/* Connect to link-local address requires an interface */</div><div class='ctx'> 		if (!sk-&gt;sk_bound_dev_if) {</div><div class='hunk'>@@ -258,6 +263,7 @@ ipv4_connected:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	reuseport_has_conns_set(sk);</div><div class='ctx'> 	sk-&gt;sk_state = TCP_ESTABLISHED;</div><div class='ctx'> 	sk_set_txhash(sk);</div><div class='ctx'> out:</div><div class='hunk'>@@ -265,7 +271,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__ip6_datagram_connect);</div><div class='ctx'> </div><div class='del'>-int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+int ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +282,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_datagram_connect);</div><div class='ctx'> </div><div class='del'>-int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 				 int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, uaddr);</div><div class='hunk'>@@ -286,14 +292,24 @@ int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_datagram_connect_v6_only);</div><div class='ctx'> </div><div class='add'>+static void ipv6_icmp_error_rfc4884(const struct sk_buff *skb,</div><div class='add'>+				    struct sock_ee_data_rfc4884 *out)</div><div class='add'>+{</div><div class='add'>+	switch (icmp6_hdr(skb)-&gt;icmp6_type) {</div><div class='add'>+	case ICMPV6_TIME_EXCEED:</div><div class='add'>+	case ICMPV6_DEST_UNREACH:</div><div class='add'>+		ip_icmp_error_rfc4884(skb, out, sizeof(struct icmp6hdr),</div><div class='add'>+				      icmp6_hdr(skb)-&gt;icmp6_datagram_len * 8);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,</div><div class='ctx'> 		     __be16 port, u32 info, u8 *payload)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np  = inet6_sk(sk);</div><div class='ctx'> 	struct icmp6hdr *icmph = icmp6_hdr(skb);</div><div class='ctx'> 	struct sock_exterr_skb *serr;</div><div class='ctx'> </div><div class='del'>-	if (!np-&gt;recverr)</div><div class='add'>+	if (!inet6_test_bit(RECVERR6, sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_clone(skb, GFP_ATOMIC);</div><div class='hunk'>@@ -315,20 +331,24 @@ void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,</div><div class='ctx'> 	serr-&gt;port = port;</div><div class='ctx'> </div><div class='ctx'> 	__skb_pull(skb, payload - skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (inet6_test_bit(RECVERR6_RFC4884, sk))</div><div class='add'>+		ipv6_icmp_error_rfc4884(skb, &amp;serr-&gt;ee.ee_rfc4884);</div><div class='add'>+</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (sock_queue_err_skb(sk, skb))</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ipv6_icmp_error);</div><div class='ctx'> </div><div class='ctx'> void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info)</div><div class='ctx'> {</div><div class='del'>-	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct sock_exterr_skb *serr;</div><div class='ctx'> 	struct ipv6hdr *iph;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (!np-&gt;recverr)</div><div class='add'>+	if (!inet6_test_bit(RECVERR6, sk))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(sizeof(struct ipv6hdr), GFP_ATOMIC);</div><div class='hunk'>@@ -341,6 +361,7 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info)</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> 	iph = ipv6_hdr(skb);</div><div class='ctx'> 	iph-&gt;daddr = fl6-&gt;daddr;</div><div class='add'>+	ip6_flow_hdr(iph, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	serr = SKB_EXT_ERR(skb);</div><div class='ctx'> 	serr-&gt;ee.ee_errno = err;</div><div class='hunk'>@@ -471,7 +492,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)</div><div class='ctx'> 			const struct ipv6hdr *ip6h = container_of((struct in6_addr *)(nh + serr-&gt;addr_offset),</div><div class='ctx'> 								  struct ipv6hdr, daddr);</div><div class='ctx'> 			sin-&gt;sin6_addr = ip6h-&gt;daddr;</div><div class='del'>-			if (np-&gt;sndflow)</div><div class='add'>+			if (inet6_test_bit(SNDFLOW, sk))</div><div class='ctx'> 				sin-&gt;sin6_flowinfo = ip6_flowinfo(ip6h);</div><div class='ctx'> 			sin-&gt;sin6_scope_id =</div><div class='ctx'> 				ipv6_iface_scope_id(&amp;sin-&gt;sin6_addr,</div><div class='hunk'>@@ -502,7 +523,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ipv6_addr_set_v4mapped(ip_hdr(skb)-&gt;saddr,</div><div class='ctx'> 					       &amp;sin-&gt;sin6_addr);</div><div class='del'>-			if (inet_sk(sk)-&gt;cmsg_flags)</div><div class='add'>+			if (inet_cmsg_flags(inet_sk(sk)))</div><div class='ctx'> 				ip_cmsg_recv(msg, skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -700,17 +721,15 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (np-&gt;rxopt.bits.rxorigdstaddr) {</div><div class='ctx'> 		struct sockaddr_in6 sin6;</div><div class='del'>-		__be16 *ports;</div><div class='del'>-		int end;</div><div class='add'>+		__be16 _ports[2], *ports;</div><div class='ctx'> </div><div class='del'>-		end = skb_transport_offset(skb) + 4;</div><div class='del'>-		if (end &lt;= 0 || pskb_may_pull(skb, end)) {</div><div class='add'>+		ports = skb_header_pointer(skb, skb_transport_offset(skb),</div><div class='add'>+					   sizeof(_ports), &amp;_ports);</div><div class='add'>+		if (ports) {</div><div class='ctx'> 			/* All current transport protocols have the port numbers in the</div><div class='ctx'> 			 * first four bytes of the transport header and this function is</div><div class='ctx'> 			 * written with this assumption in mind.</div><div class='ctx'> 			 */</div><div class='del'>-			ports = (__be16 *)skb_transport_header(skb);</div><div class='del'>-</div><div class='ctx'> 			sin6.sin6_family = AF_INET6;</div><div class='ctx'> 			sin6.sin6_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='ctx'> 			sin6.sin6_port = ports[1];</div><div class='hunk'>@@ -758,7 +777,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cmsg-&gt;cmsg_level == SOL_SOCKET) {</div><div class='del'>-			err = __sock_cmsg_send(sk, msg, cmsg, &amp;ipc6-&gt;sockc);</div><div class='add'>+			err = __sock_cmsg_send(sk, cmsg, &amp;ipc6-&gt;sockc);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -772,6 +791,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,</div><div class='ctx'> 		case IPV6_2292PKTINFO:</div><div class='ctx'> 		    {</div><div class='ctx'> 			struct net_device *dev = NULL;</div><div class='add'>+			int src_idx;</div><div class='ctx'> </div><div class='ctx'> 			if (cmsg-&gt;cmsg_len &lt; CMSG_LEN(sizeof(struct in6_pktinfo))) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='hunk'>@@ -779,12 +799,15 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			src_info = (struct in6_pktinfo *)CMSG_DATA(cmsg);</div><div class='add'>+			src_idx = src_info-&gt;ipi6_ifindex;</div><div class='ctx'> </div><div class='del'>-			if (src_info-&gt;ipi6_ifindex) {</div><div class='add'>+			if (src_idx) {</div><div class='ctx'> 				if (fl6-&gt;flowi6_oif &amp;&amp;</div><div class='del'>-				    src_info-&gt;ipi6_ifindex != fl6-&gt;flowi6_oif)</div><div class='add'>+				    src_idx != fl6-&gt;flowi6_oif &amp;&amp;</div><div class='add'>+				    (READ_ONCE(sk-&gt;sk_bound_dev_if) != fl6-&gt;flowi6_oif ||</div><div class='add'>+				     !sk_dev_equal_l3scope(sk, src_idx)))</div><div class='ctx'> 					return -EINVAL;</div><div class='del'>-				fl6-&gt;flowi6_oif = src_info-&gt;ipi6_ifindex;</div><div class='add'>+				fl6-&gt;flowi6_oif = src_idx;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			addr_type = __ipv6_addr_type(&amp;src_info-&gt;ipi6_addr);</div><div class='hunk'>@@ -1031,7 +1054,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,</div><div class='ctx'> 	src   = &amp;sp-&gt;sk_v6_rcv_saddr;</div><div class='ctx'> 	seq_printf(seq,</div><div class='ctx'> 		   "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "</div><div class='del'>-		   "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n",</div><div class='add'>+		   "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u\n",</div><div class='ctx'> 		   bucket,</div><div class='ctx'> 		   src-&gt;s6_addr32[0], src-&gt;s6_addr32[1],</div><div class='ctx'> 		   src-&gt;s6_addr32[2], src-&gt;s6_addr32[3], srcp,</div><div class='hunk'>@@ -1041,9 +1064,9 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,</div><div class='ctx'> 		   sk_wmem_alloc_get(sp),</div><div class='ctx'> 		   rqueue,</div><div class='ctx'> 		   0, 0L, 0,</div><div class='del'>-		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),</div><div class='add'>+		   from_kuid_munged(seq_user_ns(seq), sk_uid(sp)),</div><div class='ctx'> 		   0,</div><div class='ctx'> 		   sock_i_ino(sp),</div><div class='ctx'> 		   refcount_read(&amp;sp-&gt;sk_refcnt), sp,</div><div class='del'>-		   atomic_read(&amp;sp-&gt;sk_drops));</div><div class='add'>+		   sk_drops_read(sp));</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c<br/>index 88a7579c23bd..e75da98f5283 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/esp6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/esp6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/esp6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/esp6.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2002 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Authors</div><div class='ctx'>  *</div><div class='ctx'>  *	Mitsuru KANDA @USAGI       : IPv6 Support</div><div class='hunk'>@@ -38,11 +26,17 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;linux/icmpv6.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/espintcp.h&gt;</div><div class='add'>+#include &lt;net/inet6_hashtables.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -51,9 +45,12 @@ struct esp_skb_cb {</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='add'>+struct esp_output_extra {</div><div class='add'>+	__be32 seqhi;</div><div class='add'>+	u32 esphoff;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static u32 esp6_get_mtu(struct xfrm_state *x, int mtu);</div><div class='add'>+#define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&amp;((__skb)-&gt;cb[0]))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Allocate an AEAD request structure with extra space for SG and IV.</div><div class='hunk'>@@ -86,9 +83,9 @@ static void *esp_alloc_tmp(struct crypto_aead *aead, int nfrags, int seqihlen)</div><div class='ctx'> 	return kmalloc(len, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __be32 *esp_tmp_seqhi(void *tmp)</div><div class='add'>+static inline void *esp_tmp_extra(void *tmp)</div><div class='ctx'> {</div><div class='del'>-	return PTR_ALIGN((__be32 *)tmp, __alignof__(__be32));</div><div class='add'>+	return PTR_ALIGN(tmp, __alignof__(struct esp_output_extra));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u8 *esp_tmp_iv(struct crypto_aead *aead, void *tmp, int seqhilen)</div><div class='hunk'>@@ -116,18 +113,18 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead,</div><div class='ctx'> 			     __alignof__(struct scatterlist));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_ssg_unref(struct xfrm_state *x, void *tmp)</div><div class='add'>+static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='del'>-	int seqhilen = 0;</div><div class='add'>+	int extralen = 0;</div><div class='ctx'> 	u8 *iv;</div><div class='ctx'> 	struct aead_request *req;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.flags &amp; XFRM_STATE_ESN)</div><div class='del'>-		seqhilen += sizeof(__be32);</div><div class='add'>+		extralen += sizeof(struct esp_output_extra);</div><div class='ctx'> </div><div class='del'>-	iv = esp_tmp_iv(aead, tmp, seqhilen);</div><div class='add'>+	iv = esp_tmp_iv(aead, tmp, extralen);</div><div class='ctx'> 	req = esp_tmp_req(aead, iv);</div><div class='ctx'> </div><div class='ctx'> 	/* Unref skb_frag_pages in the src scatterlist if necessary.</div><div class='hunk'>@@ -135,25 +132,133 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req-&gt;src != req-&gt;dst)</div><div class='ctx'> 		for (sg = sg_next(req-&gt;src); sg; sg = sg_next(sg))</div><div class='del'>-			put_page(sg_page(sg));</div><div class='add'>+			skb_page_unref(page_to_netmem(sg_page(sg)),</div><div class='add'>+				       skb-&gt;pp_recycle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET6_ESPINTCP</div><div class='add'>+static struct sock *esp6_find_tcp_sk(struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+	struct net *net = xs_net(x);</div><div class='add'>+	__be16 sport, dport;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;x-&gt;lock);</div><div class='add'>+	sport = encap-&gt;encap_sport;</div><div class='add'>+	dport = encap-&gt;encap_dport;</div><div class='add'>+	spin_unlock_bh(&amp;x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	sk = __inet6_lookup_established(net, &amp;x-&gt;id.daddr.in6, dport,</div><div class='add'>+					&amp;x-&gt;props.saddr.in6, ntohs(sport), 0, 0);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	if (!tcp_is_ulp_esp(sk)) {</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esp_output_tcp_finish(struct xfrm_state *x, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sk = esp6_find_tcp_sk(x);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(sk);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+	if (sock_owned_by_user(sk))</div><div class='add'>+		err = espintcp_queue_out(sk, skb);</div><div class='add'>+	else</div><div class='add'>+		err = espintcp_push_skb(sk, skb);</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esp_output_tcp_encap_cb(struct net *net, struct sock *sk,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct xfrm_state *x = dst-&gt;xfrm;</div><div class='add'>+</div><div class='add'>+	return esp_output_tcp_finish(x, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	err = xfrm_trans_queue_net(xs_net(x), skb, esp_output_tcp_encap_cb);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	/* EINPROGRESS just happens to do the right thing.  It</div><div class='add'>+	 * actually means that the skb has been consumed and</div><div class='add'>+	 * isn't coming back.</div><div class='add'>+	 */</div><div class='add'>+	return err ?: -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void esp_output_encap_csum(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* UDP encap with IPv6 requires a valid checksum */</div><div class='add'>+	if (*skb_mac_header(skb) == IPPROTO_UDP) {</div><div class='add'>+		struct udphdr *uh = udp_hdr(skb);</div><div class='add'>+		struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+		int len = ntohs(uh-&gt;len);</div><div class='add'>+		unsigned int offset = skb_transport_offset(skb);</div><div class='add'>+		__wsum csum = skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='add'>+</div><div class='add'>+		uh-&gt;check = csum_ipv6_magic(&amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr,</div><div class='add'>+					    len, IPPROTO_UDP, csum);</div><div class='add'>+		if (uh-&gt;check == 0)</div><div class='add'>+			uh-&gt;check = CSUM_MANGLED_0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_output_done(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='ctx'> </div><div class='del'>-	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME))</div><div class='del'>-		x = skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len - 1];</div><div class='del'>-	else</div><div class='add'>+	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME)) {</div><div class='add'>+		struct sec_path *sp = skb_sec_path(skb);</div><div class='add'>+</div><div class='add'>+		x = sp-&gt;xvec[sp-&gt;len - 1];</div><div class='add'>+	} else {</div><div class='ctx'> 		x = skb_dst(skb)-&gt;xfrm;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = ESP_SKB_CB(skb)-&gt;tmp;</div><div class='del'>-	esp_ssg_unref(x, tmp);</div><div class='add'>+	esp_ssg_unref(x, tmp, skb);</div><div class='ctx'> 	kfree(tmp);</div><div class='ctx'> </div><div class='add'>+	esp_output_encap_csum(skb);</div><div class='add'>+</div><div class='ctx'> 	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_DEV_RESUME)) {</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			XFRM_INC_STATS(xs_net(x), LINUX_MIB_XFRMOUTSTATEPROTOERROR);</div><div class='hunk'>@@ -165,7 +270,11 @@ static void esp_output_done(struct crypto_async_request *base, int err)</div><div class='ctx'> 		secpath_reset(skb);</div><div class='ctx'> 		xfrm_dev_resume(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		xfrm_output_resume(skb, err);</div><div class='add'>+		if (!err &amp;&amp;</div><div class='add'>+		    x-&gt;encap &amp;&amp; x-&gt;encap-&gt;encap_type == TCP_ENCAP_ESPINTCP)</div><div class='add'>+			esp_output_tail_tcp(x, skb);</div><div class='add'>+		else</div><div class='add'>+			xfrm_output_resume(skb_to_full_sk(skb), skb, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +283,7 @@ static void esp_restore_header(struct sk_buff *skb, unsigned int offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_esp_hdr *esph = (void *)(skb-&gt;data + offset);</div><div class='ctx'> 	void *tmp = ESP_SKB_CB(skb)-&gt;tmp;</div><div class='del'>-	__be32 *seqhi = esp_tmp_seqhi(tmp);</div><div class='add'>+	__be32 *seqhi = esp_tmp_extra(tmp);</div><div class='ctx'> </div><div class='ctx'> 	esph-&gt;seq_no = esph-&gt;spi;</div><div class='ctx'> 	esph-&gt;spi = *seqhi;</div><div class='hunk'>@@ -182,27 +291,36 @@ static void esp_restore_header(struct sk_buff *skb, unsigned int offset)</div><div class='ctx'> </div><div class='ctx'> static void esp_output_restore_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	esp_restore_header(skb, skb_transport_offset(skb) - sizeof(__be32));</div><div class='add'>+	void *tmp = ESP_SKB_CB(skb)-&gt;tmp;</div><div class='add'>+	struct esp_output_extra *extra = esp_tmp_extra(tmp);</div><div class='add'>+</div><div class='add'>+	esp_restore_header(skb, skb_transport_offset(skb) + extra-&gt;esphoff -</div><div class='add'>+				sizeof(__be32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb,</div><div class='ctx'> 					     struct xfrm_state *x,</div><div class='ctx'> 					     struct ip_esp_hdr *esph,</div><div class='del'>-					     __be32 *seqhi)</div><div class='add'>+					     struct esp_output_extra *extra)</div><div class='ctx'> {</div><div class='ctx'> 	/* For ESN we move the header forward by 4 bytes to</div><div class='del'>-	 * accomodate the high bits.  We will move it back after</div><div class='add'>+	 * accommodate the high bits.  We will move it back after</div><div class='ctx'> 	 * encryption.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='add'>+		__u32 seqhi;</div><div class='ctx'> 		struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='ctx'> </div><div class='del'>-		esph = (void *)(skb_transport_header(skb) - sizeof(__be32));</div><div class='del'>-		*seqhi = esph-&gt;spi;</div><div class='ctx'> 		if (xo)</div><div class='del'>-			esph-&gt;seq_no = htonl(xo-&gt;seq.hi);</div><div class='add'>+			seqhi = xo-&gt;seq.hi;</div><div class='ctx'> 		else</div><div class='del'>-			esph-&gt;seq_no = htonl(XFRM_SKB_CB(skb)-&gt;seq.output.hi);</div><div class='add'>+			seqhi = XFRM_SKB_CB(skb)-&gt;seq.output.hi;</div><div class='add'>+</div><div class='add'>+		extra-&gt;esphoff = (unsigned char *)esph -</div><div class='add'>+				 skb_transport_header(skb);</div><div class='add'>+		esph = (struct ip_esp_hdr *)((unsigned char *)esph - 4);</div><div class='add'>+		extra-&gt;seqhi = esph-&gt;spi;</div><div class='add'>+		esph-&gt;seq_no = htonl(seqhi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	esph-&gt;spi = x-&gt;id.spi;</div><div class='hunk'>@@ -210,39 +328,127 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb,</div><div class='ctx'> 	return esph;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_done_esn(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_output_done_esn(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	esp_output_restore_header(skb);</div><div class='del'>-	esp_output_done(base, err);</div><div class='add'>+	esp_output_done(data, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)</div><div class='add'>+static struct ip_esp_hdr *esp6_output_udp_encap(struct sk_buff *skb,</div><div class='add'>+					       int encap_type,</div><div class='add'>+					       struct esp_info *esp,</div><div class='add'>+					       __be16 sport,</div><div class='add'>+					       __be16 dport)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + esp-&gt;tailen - skb_transport_offset(skb);</div><div class='add'>+	if (len &gt; U16_MAX)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	uh = (struct udphdr *)esp-&gt;esph;</div><div class='add'>+	uh-&gt;source = sport;</div><div class='add'>+	uh-&gt;dest = dport;</div><div class='add'>+	uh-&gt;len = htons(len);</div><div class='add'>+	uh-&gt;check = 0;</div><div class='add'>+</div><div class='add'>+	*skb_mac_header(skb) = IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+	return (struct ip_esp_hdr *)(uh + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET6_ESPINTCP</div><div class='add'>+static struct ip_esp_hdr *esp6_output_tcp_encap(struct xfrm_state *x,</div><div class='add'>+						struct sk_buff *skb,</div><div class='add'>+						struct esp_info *esp)</div><div class='add'>+{</div><div class='add'>+	__be16 *lenp = (void *)esp-&gt;esph;</div><div class='add'>+	struct ip_esp_hdr *esph;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len + esp-&gt;tailen - skb_transport_offset(skb);</div><div class='add'>+	if (len &gt; IP_MAX_MTU)</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk = esp6_find_tcp_sk(x);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(sk))</div><div class='add'>+		return ERR_CAST(sk);</div><div class='add'>+</div><div class='add'>+	sock_put(sk);</div><div class='add'>+</div><div class='add'>+	*lenp = htons(len);</div><div class='add'>+	esph = (struct ip_esp_hdr *)(lenp + 1);</div><div class='add'>+</div><div class='add'>+	return esph;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static struct ip_esp_hdr *esp6_output_tcp_encap(struct xfrm_state *x,</div><div class='add'>+						struct sk_buff *skb,</div><div class='add'>+						struct esp_info *esp)</div><div class='ctx'> {</div><div class='del'>-	/* Fill padding... */</div><div class='del'>-	if (tfclen) {</div><div class='del'>-		memset(tail, 0, tfclen);</div><div class='del'>-		tail += tfclen;</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int esp6_output_encap(struct xfrm_state *x, struct sk_buff *skb,</div><div class='add'>+			    struct esp_info *esp)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+	struct ip_esp_hdr *esph;</div><div class='add'>+	__be16 sport, dport;</div><div class='add'>+	int encap_type;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;x-&gt;lock);</div><div class='add'>+	sport = encap-&gt;encap_sport;</div><div class='add'>+	dport = encap-&gt;encap_dport;</div><div class='add'>+	encap_type = encap-&gt;encap_type;</div><div class='add'>+	spin_unlock_bh(&amp;x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (encap_type) {</div><div class='add'>+	default:</div><div class='add'>+	case UDP_ENCAP_ESPINUDP:</div><div class='add'>+		esph = esp6_output_udp_encap(skb, encap_type, esp, sport, dport);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_ENCAP_ESPINTCP:</div><div class='add'>+		esph = esp6_output_tcp_encap(x, skb, esp);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	do {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; plen - 2; i++)</div><div class='del'>-			tail[i] = i + 1;</div><div class='del'>-	} while (0);</div><div class='del'>-	tail[plen - 2] = plen - 2;</div><div class='del'>-	tail[plen - 1] = proto;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(esph))</div><div class='add'>+		return PTR_ERR(esph);</div><div class='add'>+</div><div class='add'>+	esp-&gt;esph = esph;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *tail;</div><div class='del'>-	u8 *vaddr;</div><div class='ctx'> 	int nfrags;</div><div class='add'>+	int esph_offset;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	struct sk_buff *trailer;</div><div class='ctx'> 	int tailen = esp-&gt;tailen;</div><div class='ctx'> </div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		int err = esp6_output_encap(x, skb, esp);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ALIGN(tailen, L1_CACHE_BYTES) &gt; PAGE_SIZE ||</div><div class='add'>+	    ALIGN(skb-&gt;data_len, L1_CACHE_BYTES) &gt; PAGE_SIZE)</div><div class='add'>+		goto cow;</div><div class='add'>+</div><div class='ctx'> 	if (!skb_cloned(skb)) {</div><div class='ctx'> 		if (tailen &lt;= skb_tailroom(skb)) {</div><div class='ctx'> 			nfrags = 1;</div><div class='hunk'>@@ -270,14 +476,10 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 			page = pfrag-&gt;page;</div><div class='ctx'> 			get_page(page);</div><div class='ctx'> </div><div class='del'>-			vaddr = kmap_atomic(page);</div><div class='del'>-</div><div class='del'>-			tail = vaddr + pfrag-&gt;offset;</div><div class='add'>+			tail = page_address(page) + pfrag-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 			esp_output_fill_trailer(tail, esp-&gt;tfclen, esp-&gt;plen, esp-&gt;proto);</div><div class='ctx'> </div><div class='del'>-			kunmap_atomic(vaddr);</div><div class='del'>-</div><div class='ctx'> 			nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 			__skb_fill_page_desc(skb, nfrags, page, pfrag-&gt;offset,</div><div class='hunk'>@@ -293,7 +495,7 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 			skb-&gt;len += tailen;</div><div class='ctx'> 			skb-&gt;data_len += tailen;</div><div class='ctx'> 			skb-&gt;truesize += tailen;</div><div class='del'>-			if (sk)</div><div class='add'>+			if (sk &amp;&amp; sk_fullsock(sk))</div><div class='ctx'> 				refcount_add(tailen, &amp;sk-&gt;sk_wmem_alloc);</div><div class='ctx'> </div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -301,10 +503,13 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> cow:</div><div class='add'>+	esph_offset = (unsigned char *)esp-&gt;esph - skb_transport_header(skb);</div><div class='add'>+</div><div class='ctx'> 	nfrags = skb_cow_data(skb, tailen, &amp;trailer);</div><div class='ctx'> 	if (nfrags &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	tail = skb_tail_pointer(trailer);</div><div class='add'>+	esp-&gt;esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esph_offset);</div><div class='ctx'> </div><div class='ctx'> skip_cow:</div><div class='ctx'> 	esp_output_fill_trailer(tail, esp-&gt;tfclen, esp-&gt;plen, esp-&gt;proto);</div><div class='hunk'>@@ -322,20 +527,20 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	int ivlen;</div><div class='ctx'> 	int assoclen;</div><div class='del'>-	int seqhilen;</div><div class='del'>-	__be32 *seqhi;</div><div class='add'>+	int extralen;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	struct ip_esp_hdr *esph;</div><div class='ctx'> 	struct aead_request *req;</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	struct scatterlist *sg, *dsg;</div><div class='add'>+	struct esp_output_extra *extra;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	assoclen = sizeof(struct ip_esp_hdr);</div><div class='del'>-	seqhilen = 0;</div><div class='add'>+	extralen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.flags &amp; XFRM_STATE_ESN) {</div><div class='del'>-		seqhilen += sizeof(__be32);</div><div class='add'>+		extralen += sizeof(*extra);</div><div class='ctx'> 		assoclen += sizeof(__be32);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -343,12 +548,12 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 	alen = crypto_aead_authsize(aead);</div><div class='ctx'> 	ivlen = crypto_aead_ivsize(aead);</div><div class='ctx'> </div><div class='del'>-	tmp = esp_alloc_tmp(aead, esp-&gt;nfrags + 2, seqhilen);</div><div class='add'>+	tmp = esp_alloc_tmp(aead, esp-&gt;nfrags + 2, extralen);</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	seqhi = esp_tmp_seqhi(tmp);</div><div class='del'>-	iv = esp_tmp_iv(aead, tmp, seqhilen);</div><div class='add'>+	extra = esp_tmp_extra(tmp);</div><div class='add'>+	iv = esp_tmp_iv(aead, tmp, extralen);</div><div class='ctx'> 	req = esp_tmp_req(aead, iv);</div><div class='ctx'> 	sg = esp_req_sg(aead, req);</div><div class='ctx'> </div><div class='hunk'>@@ -357,7 +562,8 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 	else</div><div class='ctx'> 		dsg = &amp;sg[esp-&gt;nfrags];</div><div class='ctx'> </div><div class='del'>-	esph = esp_output_set_esn(skb, x, ip_esp_hdr(skb), seqhi);</div><div class='add'>+	esph = esp_output_set_esn(skb, x, esp-&gt;esph, extra);</div><div class='add'>+	esp-&gt;esph = esph;</div><div class='ctx'> </div><div class='ctx'> 	sg_init_table(sg, esp-&gt;nfrags);</div><div class='ctx'> 	err = skb_to_sgvec(skb, sg,</div><div class='hunk'>@@ -421,10 +627,14 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		if ((x-&gt;props.flags &amp; XFRM_STATE_ESN))</div><div class='ctx'> 			esp_output_restore_header(skb);</div><div class='add'>+		esp_output_encap_csum(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sg != dsg)</div><div class='del'>-		esp_ssg_unref(x, tmp);</div><div class='add'>+		esp_ssg_unref(x, tmp, skb);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; x-&gt;encap &amp;&amp; x-&gt;encap-&gt;encap_type == TCP_ENCAP_ESPINTCP)</div><div class='add'>+		err = esp_output_tail_tcp(x, skb);</div><div class='ctx'> </div><div class='ctx'> error_free:</div><div class='ctx'> 	kfree(tmp);</div><div class='hunk'>@@ -456,7 +666,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);</div><div class='ctx'> 		u32 padto;</div><div class='ctx'> </div><div class='del'>-		padto = min(x-&gt;tfcpad, esp6_get_mtu(x, dst-&gt;child_mtu_cached));</div><div class='add'>+		padto = min(x-&gt;tfcpad, xfrm_state_mtu(x, dst-&gt;child_mtu_cached));</div><div class='ctx'> 		if (skb-&gt;len &lt; padto)</div><div class='ctx'> 			esp.tfclen = padto - skb-&gt;len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -465,11 +675,13 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	esp.plen = esp.clen - skb-&gt;len - esp.tfclen;</div><div class='ctx'> 	esp.tailen = esp.tfclen + esp.plen + alen;</div><div class='ctx'> </div><div class='add'>+	esp.esph = ip_esp_hdr(skb);</div><div class='add'>+</div><div class='ctx'> 	esp.nfrags = esp6_output_head(x, skb, &amp;esp);</div><div class='ctx'> 	if (esp.nfrags &lt; 0)</div><div class='ctx'> 		return esp.nfrags;</div><div class='ctx'> </div><div class='del'>-	esph = ip_esp_hdr(skb);</div><div class='add'>+	esph = esp.esph;</div><div class='ctx'> 	esph-&gt;spi = x-&gt;id.spi;</div><div class='ctx'> </div><div class='ctx'> 	esph-&gt;seq_no = htonl(XFRM_SKB_CB(skb)-&gt;seq.output.low);</div><div class='hunk'>@@ -484,7 +696,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='ctx'> 	int alen, hlen, elen;</div><div class='ctx'> 	int padlen, trimlen;</div><div class='hunk'>@@ -496,11 +707,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> 	hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);</div><div class='ctx'> 	elen = skb-&gt;len - hlen;</div><div class='ctx'> </div><div class='del'>-	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_ESP_NO_TRAILER)) {</div><div class='del'>-		ret = xo-&gt;proto;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = skb_copy_bits(skb, skb-&gt;len - alen - 2, nexthdr, 2);</div><div class='ctx'> 	BUG_ON(ret);</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +724,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb)</div><div class='ctx'> 		skb-&gt;csum = csum_block_sub(skb-&gt;csum, csumdiff,</div><div class='ctx'> 					   skb-&gt;len - trimlen);</div><div class='ctx'> 	}</div><div class='del'>-	pskb_trim(skb, skb-&gt;len - trimlen);</div><div class='add'>+	ret = pskb_trim(skb, skb-&gt;len - trimlen);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nexthdr[1];</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +742,7 @@ int esp6_input_done2(struct sk_buff *skb, int err)</div><div class='ctx'> 	int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);</div><div class='ctx'> 	int hdr_len = skb_network_header_len(skb);</div><div class='ctx'> </div><div class='del'>-	if (!xo || (xo &amp;&amp; !(xo-&gt;flags &amp; CRYPTO_DONE)))</div><div class='add'>+	if (!xo || !(xo-&gt;flags &amp; CRYPTO_DONE))</div><div class='ctx'> 		kfree(ESP_SKB_CB(skb)-&gt;tmp);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(err))</div><div class='hunk'>@@ -544,10 +752,76 @@ int esp6_input_done2(struct sk_buff *skb, int err)</div><div class='ctx'> 	if (unlikely(err &lt; 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+		int offset = skb_network_offset(skb) + sizeof(*ip6h);</div><div class='add'>+		struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+		u8 nexthdr = ip6h-&gt;nexthdr;</div><div class='add'>+		__be16 frag_off, source;</div><div class='add'>+		struct udphdr *uh;</div><div class='add'>+		struct tcphdr *th;</div><div class='add'>+</div><div class='add'>+		offset = ipv6_skip_exthdr(skb, offset, &amp;nexthdr, &amp;frag_off);</div><div class='add'>+		if (offset == -1) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		uh = (void *)(skb-&gt;data + offset);</div><div class='add'>+		th = (void *)(skb-&gt;data + offset);</div><div class='add'>+		hdr_len += offset;</div><div class='add'>+</div><div class='add'>+		switch (x-&gt;encap-&gt;encap_type) {</div><div class='add'>+		case TCP_ENCAP_ESPINTCP:</div><div class='add'>+			source = th-&gt;source;</div><div class='add'>+			break;</div><div class='add'>+		case UDP_ENCAP_ESPINUDP:</div><div class='add'>+			source = uh-&gt;source;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * 1) if the NAT-T peer's IP or port changed then</div><div class='add'>+		 *    advertise the change to the keying daemon.</div><div class='add'>+		 *    This is an inbound SA, so just compare</div><div class='add'>+		 *    SRC ports.</div><div class='add'>+		 */</div><div class='add'>+		if (!ipv6_addr_equal(&amp;ip6h-&gt;saddr, &amp;x-&gt;props.saddr.in6) ||</div><div class='add'>+		    source != encap-&gt;encap_sport) {</div><div class='add'>+			xfrm_address_t ipaddr;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ipaddr.a6, &amp;ip6h-&gt;saddr.s6_addr, sizeof(ipaddr.a6));</div><div class='add'>+			km_new_mapping(x, &amp;ipaddr, source);</div><div class='add'>+</div><div class='add'>+			/* XXX: perhaps add an extra</div><div class='add'>+			 * policy check here, to see</div><div class='add'>+			 * if we should allow or</div><div class='add'>+			 * reject a packet from a</div><div class='add'>+			 * different source</div><div class='add'>+			 * address/port.</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * 2) ignore UDP/TCP checksums in case</div><div class='add'>+		 *    of NAT-T in Transport Mode, or</div><div class='add'>+		 *    perform other post-processing fixes</div><div class='add'>+		 *    as per draft-ietf-ipsec-udp-encaps-06,</div><div class='add'>+		 *    section 3.1.2</div><div class='add'>+		 */</div><div class='add'>+		if (x-&gt;props.mode == XFRM_MODE_TRANSPORT)</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_postpull_rcsum(skb, skb_network_header(skb),</div><div class='ctx'> 			   skb_network_header_len(skb));</div><div class='ctx'> 	skb_pull_rcsum(skb, hlen);</div><div class='del'>-	if (x-&gt;props.mode == XFRM_MODE_TUNNEL)</div><div class='add'>+	if (x-&gt;props.mode == XFRM_MODE_TUNNEL ||</div><div class='add'>+	    x-&gt;props.mode == XFRM_MODE_IPTFS)</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='ctx'> 	else</div><div class='ctx'> 		skb_set_transport_header(skb, -hdr_len);</div><div class='hunk'>@@ -561,9 +835,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(esp6_input_done2);</div><div class='ctx'> </div><div class='del'>-static void esp_input_done(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_input_done(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	xfrm_input_resume(skb, esp6_input_done2(skb, err));</div><div class='ctx'> }</div><div class='hunk'>@@ -579,7 +853,7 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)</div><div class='ctx'> 	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* For ESN we move the header forward by 4 bytes to</div><div class='del'>-	 * accomodate the high bits.  We will move it back after</div><div class='add'>+	 * accommodate the high bits.  We will move it back after</div><div class='ctx'> 	 * decryption.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='hunk'>@@ -591,22 +865,21 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_input_done_esn(struct crypto_async_request *base, int err)</div><div class='add'>+static void esp_input_done_esn(void *data, int err)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = base-&gt;data;</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='ctx'> </div><div class='ctx'> 	esp_input_restore_header(skb);</div><div class='del'>-	esp_input_done(base, err);</div><div class='add'>+	esp_input_done(data, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ip_esp_hdr *esph;</div><div class='ctx'> 	struct crypto_aead *aead = x-&gt;data;</div><div class='ctx'> 	struct aead_request *req;</div><div class='ctx'> 	struct sk_buff *trailer;</div><div class='ctx'> 	int ivlen = crypto_aead_ivsize(aead);</div><div class='del'>-	int elen = skb-&gt;len - sizeof(*esph) - ivlen;</div><div class='add'>+	int elen = skb-&gt;len - sizeof(struct ip_esp_hdr) - ivlen;</div><div class='ctx'> 	int nfrags;</div><div class='ctx'> 	int assoclen;</div><div class='ctx'> 	int seqhilen;</div><div class='hunk'>@@ -616,7 +889,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	u8 *iv;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(*esph) + ivlen)) {</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -626,7 +899,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	assoclen = sizeof(*esph);</div><div class='add'>+	assoclen = sizeof(struct ip_esp_hdr);</div><div class='ctx'> 	seqhilen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.flags &amp; XFRM_STATE_ESN) {</div><div class='hunk'>@@ -660,7 +933,7 @@ skip_cow:</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ESP_SKB_CB(skb)-&gt;tmp = tmp;</div><div class='del'>-	seqhi = esp_tmp_seqhi(tmp);</div><div class='add'>+	seqhi = esp_tmp_extra(tmp);</div><div class='ctx'> 	iv = esp_tmp_iv(aead, tmp, seqhilen);</div><div class='ctx'> 	req = esp_tmp_req(aead, iv);</div><div class='ctx'> 	sg = esp_req_sg(aead, req);</div><div class='hunk'>@@ -697,21 +970,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = x-&gt;data;</div><div class='del'>-	u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);</div><div class='del'>-	unsigned int net_adj;</div><div class='del'>-</div><div class='del'>-	if (x-&gt;props.mode != XFRM_MODE_TUNNEL)</div><div class='del'>-		net_adj = sizeof(struct ipv6hdr);</div><div class='del'>-	else</div><div class='del'>-		net_adj = 0;</div><div class='del'>-</div><div class='del'>-	return ((mtu - x-&gt;props.header_len - crypto_aead_authsize(aead) -</div><div class='del'>-		 net_adj) &amp; ~(blksize - 1)) + net_adj - 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		    u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='hunk'>@@ -749,16 +1007,17 @@ static void esp6_destroy(struct xfrm_state *x)</div><div class='ctx'> 	crypto_free_aead(aead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp_init_aead(struct xfrm_state *x)</div><div class='add'>+static int esp_init_aead(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	char aead_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -ENAMETOOLONG;</div><div class='ctx'> 	if (snprintf(aead_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",</div><div class='del'>-		     x-&gt;geniv, x-&gt;aead-&gt;alg_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		goto error;</div><div class='add'>+		     x-&gt;geniv, x-&gt;aead-&gt;alg_name) &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	aead = crypto_alloc_aead(aead_name, 0, 0);</div><div class='ctx'> 	err = PTR_ERR(aead);</div><div class='hunk'>@@ -776,11 +1035,15 @@ static int esp_init_aead(struct xfrm_state *x)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> error:</div><div class='add'>+	NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp_init_authenc(struct xfrm_state *x)</div><div class='add'>+static int esp_init_authenc(struct xfrm_state *x,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	struct crypto_authenc_key_param *param;</div><div class='hunk'>@@ -791,10 +1054,6 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 	unsigned int keylen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (!x-&gt;ealg)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='ctx'> </div><div class='ctx'> 	if ((x-&gt;props.flags &amp; XFRM_STATE_ESN)) {</div><div class='hunk'>@@ -803,22 +1062,28 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 			     x-&gt;geniv ?: "", x-&gt;geniv ? "(" : "",</div><div class='ctx'> 			     x-&gt;aalg ? x-&gt;aalg-&gt;alg_name : "digest_null",</div><div class='ctx'> 			     x-&gt;ealg-&gt;alg_name,</div><div class='del'>-			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (snprintf(authenc_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 			     "%s%sauthenc(%s,%s)%s",</div><div class='ctx'> 			     x-&gt;geniv ?: "", x-&gt;geniv ? "(" : "",</div><div class='ctx'> 			     x-&gt;aalg ? x-&gt;aalg-&gt;alg_name : "digest_null",</div><div class='ctx'> 			     x-&gt;ealg-&gt;alg_name,</div><div class='del'>-			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			     x-&gt;geniv ? ")" : "") &gt;= CRYPTO_MAX_ALG_NAME) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Algorithm name is too long");</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aead = crypto_alloc_aead(authenc_name, 0, 0);</div><div class='ctx'> 	err = PTR_ERR(aead);</div><div class='del'>-	if (IS_ERR(aead))</div><div class='add'>+	if (IS_ERR(aead)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 		goto error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	x-&gt;data = aead;</div><div class='ctx'> </div><div class='hunk'>@@ -848,17 +1113,16 @@ static int esp_init_authenc(struct xfrm_state *x)</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (aalg_desc-&gt;uinfo.auth.icv_fullbits / 8 !=</div><div class='ctx'> 		    crypto_aead_authsize(aead)) {</div><div class='del'>-			pr_info("ESP: %s digestsize %u != %hu\n",</div><div class='del'>-				x-&gt;aalg-&gt;alg_name,</div><div class='del'>-				crypto_aead_authsize(aead),</div><div class='del'>-				aalg_desc-&gt;uinfo.auth.icv_fullbits / 8);</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 			goto free_key;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = crypto_aead_setauthsize(</div><div class='ctx'> 			aead, x-&gt;aalg-&gt;alg_trunc_len / 8);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel was unable to initialize cryptographic operations");</div><div class='ctx'> 			goto free_key;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;enckeylen = cpu_to_be32((x-&gt;ealg-&gt;alg_key_len + 7) / 8);</div><div class='hunk'>@@ -873,21 +1137,22 @@ error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esp6_init_state(struct xfrm_state *x)</div><div class='add'>+static int esp6_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	u32 align;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;encap)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	x-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;aead)</div><div class='del'>-		err = esp_init_aead(x);</div><div class='del'>-	else</div><div class='del'>-		err = esp_init_authenc(x);</div><div class='add'>+	if (x-&gt;aead) {</div><div class='add'>+		err = esp_init_aead(x, extack);</div><div class='add'>+	} else if (x-&gt;ealg) {</div><div class='add'>+		err = esp_init_authenc(x, extack);</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ESP: AEAD or CRYPT must be provided");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -910,6 +1175,28 @@ static int esp6_init_state(struct xfrm_state *x)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		struct xfrm_encap_tmpl *encap = x-&gt;encap;</div><div class='add'>+</div><div class='add'>+		switch (encap-&gt;encap_type) {</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Unsupported encapsulation type for ESP");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		case UDP_ENCAP_ESPINUDP:</div><div class='add'>+			x-&gt;props.header_len += sizeof(struct udphdr);</div><div class='add'>+			break;</div><div class='add'>+#ifdef CONFIG_INET6_ESPINTCP</div><div class='add'>+		case TCP_ENCAP_ESPINTCP:</div><div class='add'>+			/* only the length field, TCP encap is done by</div><div class='add'>+			 * the socket</div><div class='add'>+			 */</div><div class='add'>+			x-&gt;props.header_len += 2;</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	align = ALIGN(crypto_aead_blocksize(aead), 4);</div><div class='ctx'> 	x-&gt;props.trailer_len = align + 1 + crypto_aead_authsize(aead);</div><div class='ctx'> </div><div class='hunk'>@@ -923,20 +1210,18 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type esp6_type = {</div><div class='del'>-	.description	= "ESP6",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_ESP,</div><div class='ctx'> 	.flags		= XFRM_TYPE_REPLAY_PROT,</div><div class='ctx'> 	.init_state	= esp6_init_state,</div><div class='ctx'> 	.destructor	= esp6_destroy,</div><div class='del'>-	.get_mtu	= esp6_get_mtu,</div><div class='ctx'> 	.input		= esp6_input,</div><div class='ctx'> 	.output		= esp6_output,</div><div class='del'>-	.hdr_offset	= xfrm6_find_1stfragopt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol esp6_protocol = {</div><div class='ctx'> 	.handler	=	xfrm6_rcv,</div><div class='add'>+	.input_handler	=	xfrm_input,</div><div class='ctx'> 	.cb_handler	=	esp6_rcv_cb,</div><div class='ctx'> 	.err_handler	=	esp6_err,</div><div class='ctx'> 	.priority	=	0,</div><div class='hunk'>@@ -961,12 +1246,12 @@ static void __exit esp6_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfrm6_protocol_deregister(&amp;esp6_protocol, IPPROTO_ESP) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;esp6_type, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;esp6_type, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(esp6_init);</div><div class='ctx'> module_exit(esp6_fini);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IPv6 ESP transformation helpers");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ESP);</div><div class='head'>diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c<br/>index 6177e2171171..22410243ebe8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/esp6_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/esp6_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/esp6_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/esp6_offload.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPV6 GSO/GRO offload support</div><div class='ctx'>  * Linux INET implementation</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  * Copyright (C) 2016 secunet Security Networks AG</div><div class='ctx'>  * Author: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * ESP GRO support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -19,6 +16,8 @@</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/esp.h&gt;</div><div class='hunk'>@@ -35,7 +34,9 @@ static __u16 esp6_nexthdr_esp_offset(struct ipv6hdr *ipv6_hdr, int nhlen)</div><div class='ctx'> 	int off = sizeof(struct ipv6hdr);</div><div class='ctx'> 	struct ipv6_opt_hdr *exthdr;</div><div class='ctx'> </div><div class='del'>-	if (likely(ipv6_hdr-&gt;nexthdr == NEXTHDR_ESP))</div><div class='add'>+	/* ESP or ESPINUDP */</div><div class='add'>+	if (likely(ipv6_hdr-&gt;nexthdr == NEXTHDR_ESP ||</div><div class='add'>+		   ipv6_hdr-&gt;nexthdr == NEXTHDR_UDP))</div><div class='ctx'> 		return offsetof(struct ipv6hdr, nexthdr);</div><div class='ctx'> </div><div class='ctx'> 	while (off &lt; nhlen) {</div><div class='hunk'>@@ -55,40 +56,51 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head,</div><div class='ctx'> 	int offset = skb_gro_offset(skb);</div><div class='ctx'> 	struct xfrm_offload *xo;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='add'>+	int encap_type = 0;</div><div class='ctx'> 	__be32 seq;</div><div class='ctx'> 	__be32 spi;</div><div class='ctx'> 	int nhoff;</div><div class='del'>-	int err;</div><div class='add'>+</div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;proto == IPPROTO_UDP)</div><div class='add'>+		encap_type = UDP_ENCAP_ESPINUDP;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_pull(skb, offset))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if ((err = xfrm_parse_spi(skb, IPPROTO_ESP, &amp;spi, &amp;seq)) != 0)</div><div class='add'>+	if (xfrm_parse_spi(skb, IPPROTO_ESP, &amp;spi, &amp;seq) != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	xo = xfrm_offload(skb);</div><div class='ctx'> 	if (!xo || !(xo-&gt;flags &amp; CRYPTO_DONE)) {</div><div class='del'>-		err = secpath_set(skb);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+		struct sec_path *sp = secpath_set(skb);</div><div class='ctx'> </div><div class='del'>-		if (skb-&gt;sp-&gt;len == XFRM_MAX_DEPTH)</div><div class='add'>+		if (!sp)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		x = xfrm_state_lookup(dev_net(skb-&gt;dev), skb-&gt;mark,</div><div class='del'>-				      (xfrm_address_t *)&amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='del'>-				      spi, IPPROTO_ESP, AF_INET6);</div><div class='del'>-		if (!x)</div><div class='del'>-			goto out;</div><div class='add'>+		if (sp-&gt;len == XFRM_MAX_DEPTH)</div><div class='add'>+			goto out_reset;</div><div class='ctx'> </div><div class='del'>-		skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len++] = x;</div><div class='del'>-		skb-&gt;sp-&gt;olen++;</div><div class='add'>+		x = xfrm_input_state_lookup(dev_net(skb-&gt;dev), skb-&gt;mark,</div><div class='add'>+					    (xfrm_address_t *)&amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+					    spi, IPPROTO_ESP, AF_INET6);</div><div class='ctx'> </div><div class='del'>-		xo = xfrm_offload(skb);</div><div class='del'>-		if (!xo) {</div><div class='add'>+		if (unlikely(x &amp;&amp; x-&gt;dir &amp;&amp; x-&gt;dir != XFRM_SA_DIR_IN)) {</div><div class='add'>+			/* non-offload path will record the error and audit log */</div><div class='ctx'> 			xfrm_state_put(x);</div><div class='del'>-			goto out;</div><div class='add'>+			x = NULL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!x)</div><div class='add'>+			goto out_reset;</div><div class='add'>+</div><div class='add'>+		skb-&gt;mark = xfrm_smark_get(skb-&gt;mark, x);</div><div class='add'>+</div><div class='add'>+		sp-&gt;xvec[sp-&gt;len++] = x;</div><div class='add'>+		sp-&gt;olen++;</div><div class='add'>+</div><div class='add'>+		xo = xfrm_offload(skb);</div><div class='add'>+		if (!xo)</div><div class='add'>+			goto out_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xo-&gt;flags |= XFRM_GRO;</div><div class='hunk'>@@ -105,9 +117,11 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	/* We don't need to handle errors from xfrm_input, it does all</div><div class='ctx'> 	 * the error handling and frees the resources on error. */</div><div class='del'>-	xfrm_input(skb, IPPROTO_ESP, spi, -2);</div><div class='add'>+	xfrm_input(skb, IPPROTO_ESP, spi, encap_type);</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-EINPROGRESS);</div><div class='add'>+out_reset:</div><div class='add'>+	secpath_reset(skb);</div><div class='ctx'> out:</div><div class='ctx'> 	skb_push(skb, offset);</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;same_flow = 0;</div><div class='hunk'>@@ -121,9 +135,16 @@ static void esp6_gso_encap(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	struct ip_esp_hdr *esph;</div><div class='ctx'> 	struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-	int proto = iph-&gt;nexthdr;</div><div class='add'>+	u8 proto = iph-&gt;nexthdr;</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, -skb_network_offset(skb));</div><div class='add'>+</div><div class='add'>+	if (x-&gt;outer_mode.encap == XFRM_MODE_TRANSPORT) {</div><div class='add'>+		__be16 frag;</div><div class='add'>+</div><div class='add'>+		ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &amp;proto, &amp;frag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	esph = ip_esp_hdr(skb);</div><div class='ctx'> 	*skb_mac_header(skb) = IPPROTO_ESP;</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +154,95 @@ static void esp6_gso_encap(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	xo-&gt;proto = proto;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *xfrm6_tunnel_gso_segment(struct xfrm_state *x,</div><div class='add'>+						struct sk_buff *skb,</div><div class='add'>+						netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	const struct xfrm_mode *inner_mode = xfrm_ip2inner_mode(x,</div><div class='add'>+					XFRM_MODE_SKB_CB(skb)-&gt;protocol);</div><div class='add'>+	__be16 type = inner_mode-&gt;family == AF_INET ? htons(ETH_P_IP)</div><div class='add'>+						    : htons(ETH_P_IPV6);</div><div class='add'>+</div><div class='add'>+	return skb_eth_gso_segment(skb, features, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm6_transport_gso_segment(struct xfrm_state *x,</div><div class='add'>+						   struct sk_buff *skb,</div><div class='add'>+						   netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='add'>+	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='add'>+	ops = rcu_dereference(inet6_offloads[xo-&gt;proto]);</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='add'>+		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm6_beet_gso_segment(struct xfrm_state *x,</div><div class='add'>+					      struct sk_buff *skb,</div><div class='add'>+					      netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	u8 proto = xo-&gt;proto;</div><div class='add'>+</div><div class='add'>+	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='add'>+</div><div class='add'>+	if (x-&gt;sel.family != AF_INET6) {</div><div class='add'>+		skb-&gt;transport_header -=</div><div class='add'>+			(sizeof(struct ipv6hdr) - sizeof(struct iphdr));</div><div class='add'>+</div><div class='add'>+		if (proto == IPPROTO_BEETPH) {</div><div class='add'>+			struct ip_beet_phdr *ph =</div><div class='add'>+				(struct ip_beet_phdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+			skb-&gt;transport_header += ph-&gt;hdrlen * 8;</div><div class='add'>+			proto = ph-&gt;nexthdr;</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;transport_header -= IPV4_BEET_PHMAXLEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (proto == IPPROTO_TCP)</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCPV6;</div><div class='add'>+	} else {</div><div class='add'>+		__be16 frag;</div><div class='add'>+</div><div class='add'>+		skb-&gt;transport_header +=</div><div class='add'>+			ipv6_skip_exthdr(skb, 0, &amp;proto, &amp;frag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (proto == IPPROTO_IPIP)</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_IPXIP6;</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, skb_transport_offset(skb));</div><div class='add'>+	ops = rcu_dereference(inet6_offloads[proto]);</div><div class='add'>+	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='add'>+		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *xfrm6_outer_mode_gso_segment(struct xfrm_state *x,</div><div class='add'>+						    struct sk_buff *skb,</div><div class='add'>+						    netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	switch (x-&gt;outer_mode.encap) {</div><div class='add'>+	case XFRM_MODE_TUNNEL:</div><div class='add'>+		return xfrm6_tunnel_gso_segment(x, skb, features);</div><div class='add'>+	case XFRM_MODE_TRANSPORT:</div><div class='add'>+		return xfrm6_transport_gso_segment(x, skb, features);</div><div class='add'>+	case XFRM_MODE_BEET:</div><div class='add'>+		return xfrm6_beet_gso_segment(x, skb, features);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 				        netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,6 +251,7 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	netdev_features_t esp_features = features;</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='add'>+	struct sec_path *sp;</div><div class='ctx'> </div><div class='ctx'> 	if (!xo)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -148,7 +259,8 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_ESP))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	x = skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len - 1];</div><div class='add'>+	sp = skb_sec_path(skb);</div><div class='add'>+	x = sp-&gt;xvec[sp-&gt;len - 1];</div><div class='ctx'> 	aead = x-&gt;data;</div><div class='ctx'> 	esph = ip_esp_hdr(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -163,13 +275,15 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	skb-&gt;encap_hdr_csum = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!(features &amp; NETIF_F_HW_ESP) || x-&gt;xso.dev != skb-&gt;dev)</div><div class='del'>-		esp_features = features &amp; ~(NETIF_F_SG | NETIF_F_CSUM_MASK);</div><div class='add'>+		esp_features = features &amp; ~(NETIF_F_SG | NETIF_F_CSUM_MASK |</div><div class='add'>+					    NETIF_F_SCTP_CRC);</div><div class='ctx'> 	else if (!(features &amp; NETIF_F_HW_ESP_TX_CSUM))</div><div class='del'>-		esp_features = features &amp; ~NETIF_F_CSUM_MASK;</div><div class='add'>+		esp_features = features &amp; ~(NETIF_F_CSUM_MASK |</div><div class='add'>+					    NETIF_F_SCTP_CRC);</div><div class='ctx'> </div><div class='ctx'> 	xo-&gt;flags |= XFRM_GSO_SEGMENT;</div><div class='ctx'> </div><div class='del'>-	return x-&gt;outer_mode-&gt;gso_segment(x, skb, esp_features);</div><div class='add'>+	return xfrm6_outer_mode_gso_segment(x, skb, esp_features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int esp6_input_tail(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -193,7 +307,6 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> 	int alen;</div><div class='ctx'> 	int blksize;</div><div class='ctx'> 	struct xfrm_offload *xo;</div><div class='del'>-	struct ip_esp_hdr *esph;</div><div class='ctx'> 	struct crypto_aead *aead;</div><div class='ctx'> 	struct esp_info esp;</div><div class='ctx'> 	bool hw_offload = true;</div><div class='hunk'>@@ -226,7 +339,7 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> 	esp.plen = esp.clen - skb-&gt;len - esp.tfclen;</div><div class='ctx'> 	esp.tailen = esp.tfclen + esp.plen + alen;</div><div class='ctx'> </div><div class='del'>-	if (!hw_offload || (hw_offload &amp;&amp; !skb_is_gso(skb))) {</div><div class='add'>+	if (!hw_offload || !skb_is_gso(skb)) {</div><div class='ctx'> 		esp.nfrags = esp6_output_head(x, skb, &amp;esp);</div><div class='ctx'> 		if (esp.nfrags &lt; 0)</div><div class='ctx'> 			return esp.nfrags;</div><div class='hunk'>@@ -234,13 +347,13 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> </div><div class='ctx'> 	seq = xo-&gt;seq.low;</div><div class='ctx'> </div><div class='del'>-	esph = ip_esp_hdr(skb);</div><div class='del'>-	esph-&gt;spi = x-&gt;id.spi;</div><div class='add'>+	esp.esph = ip_esp_hdr(skb);</div><div class='add'>+	esp.esph-&gt;spi = x-&gt;id.spi;</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, -skb_network_offset(skb));</div><div class='ctx'> </div><div class='ctx'> 	if (xo-&gt;flags &amp; XFRM_GSO_SEGMENT) {</div><div class='del'>-		esph-&gt;seq_no = htonl(seq);</div><div class='add'>+		esp.esph-&gt;seq_no = htonl(seq);</div><div class='ctx'> </div><div class='ctx'> 		if (!skb_is_gso(skb))</div><div class='ctx'> 			xo-&gt;seq.low++;</div><div class='hunk'>@@ -248,6 +361,9 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> 			xo-&gt;seq.low += skb_shinfo(skb)-&gt;gso_segs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (xo-&gt;seq.low &lt; seq)</div><div class='add'>+		xo-&gt;seq.hi++;</div><div class='add'>+</div><div class='ctx'> 	esp.seqno = cpu_to_be64(xo-&gt;seq.low + ((u64)xo-&gt;seq.hi &lt;&lt; 32));</div><div class='ctx'> </div><div class='ctx'> 	len = skb-&gt;len - sizeof(struct ipv6hdr);</div><div class='hunk'>@@ -256,8 +372,17 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> </div><div class='ctx'> 	ipv6_hdr(skb)-&gt;payload_len = htons(len);</div><div class='ctx'> </div><div class='del'>-	if (hw_offload)</div><div class='add'>+	if (hw_offload) {</div><div class='add'>+		if (!skb_ext_add(skb, SKB_EXT_SEC_PATH))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		xo = xfrm_offload(skb);</div><div class='add'>+		if (!xo)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		xo-&gt;flags |= XFRM_XMIT;</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = esp6_output_tail(x, skb, &amp;esp);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -265,6 +390,9 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features</div><div class='ctx'> </div><div class='ctx'> 	secpath_reset(skb);</div><div class='ctx'> </div><div class='add'>+	if (skb_needs_linearize(skb, skb-&gt;dev-&gt;features) &amp;&amp;</div><div class='add'>+	    __skb_linearize(skb))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +404,6 @@ static const struct net_offload esp6_offload = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type_offload esp6_type_offload = {</div><div class='del'>-	.description	= "ESP6 OFFLOAD",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto	     	= IPPROTO_ESP,</div><div class='ctx'> 	.input_tail	= esp6_input_tail,</div><div class='hunk'>@@ -296,9 +423,7 @@ static int __init esp6_offload_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit esp6_offload_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (xfrm_unregister_type_offload(&amp;esp6_type_offload, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type offload\n", __func__);</div><div class='del'>-</div><div class='add'>+	xfrm_unregister_type_offload(&amp;esp6_type_offload, AF_INET6);</div><div class='ctx'> 	inet6_del_offload(&amp;esp6_offload, IPPROTO_ESP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -307,3 +432,4 @@ module_exit(esp6_offload_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Steffen Klassert &lt;steffen.klassert@secunet.com&gt;");</div><div class='ctx'> MODULE_ALIAS_XFRM_OFFLOAD_TYPE(AF_INET6, XFRM_PROTO_ESP);</div><div class='add'>+MODULE_DESCRIPTION("IPV6 GSO/GRO offload support");</div><div class='head'>diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c<br/>index 20291c2036fc..a23eb8734e15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/exthdrs.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Extension Header handling for IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *	Andi Kleen		&lt;ak@muc.de&gt;</div><div class='ctx'>  *	Alexey Kuznetsov	&lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Changes:</div><div class='hunk'>@@ -52,22 +48,14 @@</div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> #include &lt;net/seg6_hmac.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;net/rpl.h&gt;</div><div class='add'>+#include &lt;linux/ioam6.h&gt;</div><div class='add'>+#include &lt;linux/ioam6_genl.h&gt;</div><div class='add'>+#include &lt;net/ioam6.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Parsing tlv encoded headers.</div><div class='del'>- *</div><div class='del'>- *	Parsing function "func" returns true, if parsing succeed</div><div class='del'>- *	and false, if it failed.</div><div class='del'>- *	It MUST NOT touch skb-&gt;h.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct tlvtype_proc {</div><div class='del'>-	int	type;</div><div class='del'>-	bool	(*func)(struct sk_buff *skb, int offset);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*********************</div><div class='ctx'>   Generic functions</div><div class='ctx'>  *********************/</div><div class='hunk'>@@ -101,27 +89,35 @@ static bool ip6_tlvopt_unknown(struct sk_buff *skb, int optoff,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ipv6_addr_is_multicast(&amp;ipv6_hdr(skb)-&gt;daddr))</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2: /* send ICMP PARM PROB regardless and drop packet */</div><div class='del'>-		icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);</div><div class='add'>+		icmpv6_param_prob_reason(skb, ICMPV6_UNK_OPTION, optoff,</div><div class='add'>+					 SKB_DROP_REASON_UNHANDLED_PROTO);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_UNHANDLED_PROTO);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ipv6_hop_ra(struct sk_buff *skb, int optoff);</div><div class='add'>+static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff);</div><div class='add'>+static bool ipv6_hop_jumbo(struct sk_buff *skb, int optoff);</div><div class='add'>+static bool ipv6_hop_calipso(struct sk_buff *skb, int optoff);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='add'>+static bool ipv6_dest_hao(struct sk_buff *skb, int optoff);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Parse tlv encoded option header (hop-by-hop or destination) */</div><div class='ctx'> </div><div class='del'>-static bool ip6_parse_tlv(const struct tlvtype_proc *procs,</div><div class='add'>+static bool ip6_parse_tlv(bool hopbyhop,</div><div class='ctx'> 			  struct sk_buff *skb,</div><div class='ctx'> 			  int max_count)</div><div class='ctx'> {</div><div class='ctx'> 	int len = (skb_transport_header(skb)[1] + 1) &lt;&lt; 3;</div><div class='ctx'> 	const unsigned char *nh = skb_network_header(skb);</div><div class='ctx'> 	int off = skb_network_header_len(skb);</div><div class='del'>-	const struct tlvtype_proc *curr;</div><div class='ctx'> 	bool disallow_unknowns = false;</div><div class='ctx'> 	int tlv_count = 0;</div><div class='ctx'> 	int padlen = 0;</div><div class='hunk'>@@ -131,25 +127,27 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs,</div><div class='ctx'> 		max_count = -max_count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_transport_offset(skb) + len &gt; skb_headlen(skb))</div><div class='del'>-		goto bad;</div><div class='del'>-</div><div class='ctx'> 	off += 2;</div><div class='ctx'> 	len -= 2;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='del'>-		int optlen = nh[off + 1] + 2;</div><div class='del'>-		int i;</div><div class='add'>+		int optlen, i;</div><div class='ctx'> </div><div class='del'>-		switch (nh[off]) {</div><div class='del'>-		case IPV6_TLV_PAD1:</div><div class='del'>-			optlen = 1;</div><div class='add'>+		if (nh[off] == IPV6_TLV_PAD1) {</div><div class='ctx'> 			padlen++;</div><div class='ctx'> 			if (padlen &gt; 7)</div><div class='ctx'> 				goto bad;</div><div class='del'>-			break;</div><div class='add'>+			off++;</div><div class='add'>+			len--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (len &lt; 2)</div><div class='add'>+			goto bad;</div><div class='add'>+		optlen = nh[off + 1] + 2;</div><div class='add'>+		if (optlen &gt; len)</div><div class='add'>+			goto bad;</div><div class='ctx'> </div><div class='del'>-		case IPV6_TLV_PADN:</div><div class='add'>+		if (nh[off] == IPV6_TLV_PADN) {</div><div class='ctx'> 			/* RFC 2460 states that the purpose of PadN is</div><div class='ctx'> 			 * to align the containing header to multiples</div><div class='ctx'> 			 * of 8. 7 is therefore the highest valid value.</div><div class='hunk'>@@ -166,32 +164,53 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs,</div><div class='ctx'> 				if (nh[off + i] != 0)</div><div class='ctx'> 					goto bad;</div><div class='ctx'> 			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default: /* Other TLV code so scan list */</div><div class='del'>-			if (optlen &gt; len)</div><div class='del'>-				goto bad;</div><div class='del'>-</div><div class='add'>+		} else {</div><div class='ctx'> 			tlv_count++;</div><div class='ctx'> 			if (tlv_count &gt; max_count)</div><div class='ctx'> 				goto bad;</div><div class='ctx'> </div><div class='del'>-			for (curr = procs; curr-&gt;type &gt;= 0; curr++) {</div><div class='del'>-				if (curr-&gt;type == nh[off]) {</div><div class='del'>-					/* type specific length/alignment</div><div class='del'>-					   checks will be performed in the</div><div class='del'>-					   func(). */</div><div class='del'>-					if (curr-&gt;func(skb, off) == false)</div><div class='add'>+			if (hopbyhop) {</div><div class='add'>+				switch (nh[off]) {</div><div class='add'>+				case IPV6_TLV_ROUTERALERT:</div><div class='add'>+					if (!ipv6_hop_ra(skb, off))</div><div class='add'>+						return false;</div><div class='add'>+					break;</div><div class='add'>+				case IPV6_TLV_IOAM:</div><div class='add'>+					if (!ipv6_hop_ioam(skb, off))</div><div class='add'>+						return false;</div><div class='add'>+</div><div class='add'>+					nh = skb_network_header(skb);</div><div class='add'>+					break;</div><div class='add'>+				case IPV6_TLV_JUMBO:</div><div class='add'>+					if (!ipv6_hop_jumbo(skb, off))</div><div class='add'>+						return false;</div><div class='add'>+					break;</div><div class='add'>+				case IPV6_TLV_CALIPSO:</div><div class='add'>+					if (!ipv6_hop_calipso(skb, off))</div><div class='add'>+						return false;</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					if (!ip6_tlvopt_unknown(skb, off,</div><div class='add'>+								disallow_unknowns))</div><div class='add'>+						return false;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				switch (nh[off]) {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='add'>+				case IPV6_TLV_HAO:</div><div class='add'>+					if (!ipv6_dest_hao(skb, off))</div><div class='add'>+						return false;</div><div class='add'>+					break;</div><div class='add'>+#endif</div><div class='add'>+				default:</div><div class='add'>+					if (!ip6_tlvopt_unknown(skb, off,</div><div class='add'>+								disallow_unknowns))</div><div class='ctx'> 						return false;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			if (curr-&gt;type &lt; 0 &amp;&amp;</div><div class='del'>-			    !ip6_tlvopt_unknown(skb, off, disallow_unknowns))</div><div class='del'>-				return false;</div><div class='del'>-</div><div class='ctx'> 			padlen = 0;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		off += optlen;</div><div class='ctx'> 		len -= optlen;</div><div class='hunk'>@@ -200,7 +219,7 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs,</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return true;</div><div class='ctx'> bad:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -214,6 +233,7 @@ static bool ipv6_dest_hao(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	struct ipv6_destopt_hao *hao;</div><div class='ctx'> 	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='ctx'> 	struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;dsthao) {</div><div class='hunk'>@@ -228,19 +248,23 @@ static bool ipv6_dest_hao(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	if (hao-&gt;length != 16) {</div><div class='ctx'> 		net_dbg_ratelimited("hao invalid option length = %d\n",</div><div class='ctx'> 				    hao-&gt;length);</div><div class='add'>+		SKB_DR_SET(reason, IP_INHDR);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ipv6_addr_type(&amp;hao-&gt;addr) &amp; IPV6_ADDR_UNICAST)) {</div><div class='ctx'> 		net_dbg_ratelimited("hao is not an unicast addr: %pI6\n",</div><div class='ctx'> 				    &amp;hao-&gt;addr);</div><div class='add'>+		SKB_DR_SET(reason, INVALID_PROTO);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = xfrm6_input_addr(skb, (xfrm_address_t *)&amp;ipv6h-&gt;daddr,</div><div class='ctx'> 			       (xfrm_address_t *)&amp;hao-&gt;addr, IPPROTO_DSTOPTS);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		SKB_DR_SET(reason, XFRM_POLICY);</div><div class='ctx'> 		goto discard;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cloned(skb)) {</div><div class='ctx'> 		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))</div><div class='hunk'>@@ -263,21 +287,11 @@ static bool ipv6_dest_hao(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'>  discard:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static const struct tlvtype_proc tlvprocdestopt_lst[] = {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-	{</div><div class='del'>-		.type	= IPV6_TLV_HAO,</div><div class='del'>-		.func	= ipv6_dest_hao,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-	{-1,			NULL}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int ipv6_destopt_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(skb-&gt;dev);</div><div class='hunk'>@@ -292,7 +306,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb)</div><div class='ctx'> 	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||</div><div class='ctx'> 	    !pskb_may_pull(skb, (skb_transport_offset(skb) +</div><div class='ctx'> 				 ((skb_transport_header(skb)[1] + 1) &lt;&lt; 3)))) {</div><div class='del'>-		__IP6_INC_STATS(dev_net(dst-&gt;dev), idev,</div><div class='add'>+		__IP6_INC_STATS(dev_net(dst_dev(dst)), idev,</div><div class='ctx'> 				IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> fail_and_free:</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -308,8 +322,7 @@ fail_and_free:</div><div class='ctx'> 	dstbuf = opt-&gt;dst1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (ip6_parse_tlv(tlvprocdestopt_lst, skb,</div><div class='del'>-			  init_net.ipv6.sysctl.max_dst_opts_cnt)) {</div><div class='add'>+	if (ip6_parse_tlv(false, skb, net-&gt;ipv6.sysctl.max_dst_opts_cnt)) {</div><div class='ctx'> 		skb-&gt;transport_header += extlen;</div><div class='ctx'> 		opt = IP6CB(skb);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='hunk'>@@ -366,9 +379,8 @@ static int ipv6_srh_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	accept_seg6 = net-&gt;ipv6.devconf_all-&gt;seg6_enabled;</div><div class='del'>-	if (accept_seg6 &gt; idev-&gt;cnf.seg6_enabled)</div><div class='del'>-		accept_seg6 = idev-&gt;cnf.seg6_enabled;</div><div class='add'>+	accept_seg6 = min(READ_ONCE(net-&gt;ipv6.devconf_all-&gt;seg6_enabled),</div><div class='add'>+			  READ_ONCE(idev-&gt;cnf.seg6_enabled));</div><div class='ctx'> </div><div class='ctx'> 	if (!accept_seg6) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -384,23 +396,20 @@ static int ipv6_srh_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> looped_back:</div><div class='ctx'> 	if (hdr-&gt;segments_left == 0) {</div><div class='del'>-		if (hdr-&gt;nexthdr == NEXTHDR_IPV6) {</div><div class='add'>+		if (hdr-&gt;nexthdr == NEXTHDR_IPV6 || hdr-&gt;nexthdr == NEXTHDR_IPV4) {</div><div class='ctx'> 			int offset = (hdr-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='ctx'> </div><div class='ctx'> 			skb_postpull_rcsum(skb, skb_network_header(skb),</div><div class='ctx'> 					   skb_network_header_len(skb));</div><div class='del'>-</div><div class='del'>-			if (!pskb_pull(skb, offset)) {</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='add'>+			skb_pull(skb, offset);</div><div class='ctx'> 			skb_postpull_rcsum(skb, skb_transport_header(skb),</div><div class='ctx'> 					   offset);</div><div class='ctx'> </div><div class='ctx'> 			skb_reset_network_header(skb);</div><div class='ctx'> 			skb_reset_transport_header(skb);</div><div class='ctx'> 			skb-&gt;encapsulation = 0;</div><div class='del'>-</div><div class='add'>+			if (hdr-&gt;nexthdr == NEXTHDR_IPV4)</div><div class='add'>+				skb-&gt;protocol = htons(ETH_P_IP);</div><div class='ctx'> 			__skb_tunnel_rx(skb, skb-&gt;dev, net);</div><div class='ctx'> </div><div class='ctx'> 			netif_rx(skb);</div><div class='hunk'>@@ -430,9 +439,9 @@ looped_back:</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	hdr = (struct ipv6_sr_hdr *)skb_transport_header(skb);</div><div class='add'>+		hdr = (struct ipv6_sr_hdr *)skb_transport_header(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;segments_left--;</div><div class='ctx'> 	addr = hdr-&gt;segments + hdr-&gt;segments_left;</div><div class='hunk'>@@ -444,7 +453,164 @@ looped_back:</div><div class='ctx'> </div><div class='ctx'> 	ipv6_hdr(skb)-&gt;daddr = *addr;</div><div class='ctx'> </div><div class='del'>-	skb_dst_drop(skb);</div><div class='add'>+	ip6_route_input(skb);</div><div class='add'>+</div><div class='add'>+	if (skb_dst(skb)-&gt;error) {</div><div class='add'>+		dst_input(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_dst_dev(skb)-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;hop_limit &lt;= 1) {</div><div class='add'>+			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+			icmpv6_send(skb, ICMPV6_TIME_EXCEED,</div><div class='add'>+				    ICMPV6_EXC_HOPLIMIT, 0);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		ipv6_hdr(skb)-&gt;hop_limit--;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, sizeof(struct ipv6hdr));</div><div class='add'>+		goto looped_back;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst_input(skb);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv6_rpl_srh_rcv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_rpl_sr_hdr *hdr, *ohdr, *chdr;</div><div class='add'>+	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+	struct ipv6hdr *oldhdr;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	int accept_rpl_seg;</div><div class='add'>+	int i, err;</div><div class='add'>+	u64 n = 0;</div><div class='add'>+	u32 r;</div><div class='add'>+</div><div class='add'>+	idev = __in6_dev_get(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	accept_rpl_seg = min(READ_ONCE(net-&gt;ipv6.devconf_all-&gt;rpl_seg_enabled),</div><div class='add'>+			     READ_ONCE(idev-&gt;cnf.rpl_seg_enabled));</div><div class='add'>+	if (!accept_rpl_seg) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+looped_back:</div><div class='add'>+	hdr = (struct ipv6_rpl_sr_hdr *)skb_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;segments_left == 0) {</div><div class='add'>+		if (hdr-&gt;nexthdr == NEXTHDR_IPV6) {</div><div class='add'>+			int offset = (hdr-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+			skb_postpull_rcsum(skb, skb_network_header(skb),</div><div class='add'>+					   skb_network_header_len(skb));</div><div class='add'>+			skb_pull(skb, offset);</div><div class='add'>+			skb_postpull_rcsum(skb, skb_transport_header(skb),</div><div class='add'>+					   offset);</div><div class='add'>+</div><div class='add'>+			skb_reset_network_header(skb);</div><div class='add'>+			skb_reset_transport_header(skb);</div><div class='add'>+			skb-&gt;encapsulation = 0;</div><div class='add'>+</div><div class='add'>+			__skb_tunnel_rx(skb, skb-&gt;dev, net);</div><div class='add'>+</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		opt-&gt;srcrt = skb_network_header_len(skb);</div><div class='add'>+		opt-&gt;lastopt = opt-&gt;srcrt;</div><div class='add'>+		skb-&gt;transport_header += (hdr-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='add'>+		opt-&gt;nhoff = (&amp;hdr-&gt;nexthdr) - skb_network_header(skb);</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = (hdr-&gt;hdrlen &lt;&lt; 3) - hdr-&gt;pad - (16 - hdr-&gt;cmpre);</div><div class='add'>+	r = do_div(n, (16 - hdr-&gt;cmpri));</div><div class='add'>+	/* checks if calculation was without remainder and n fits into</div><div class='add'>+	 * unsigned char which is segments_left field. Should not be</div><div class='add'>+	 * higher than that.</div><div class='add'>+	 */</div><div class='add'>+	if (r || (n + 1) &gt; 255) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;segments_left &gt; n + 1) {</div><div class='add'>+		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,</div><div class='add'>+				  ((&amp;hdr-&gt;segments_left) -</div><div class='add'>+				   skb_network_header(skb)));</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;segments_left--;</div><div class='add'>+	i = n - hdr-&gt;segments_left;</div><div class='add'>+</div><div class='add'>+	buf = kcalloc(struct_size(hdr, segments.addr, n + 2), 2, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!buf)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ohdr = (struct ipv6_rpl_sr_hdr *)buf;</div><div class='add'>+	ipv6_rpl_srh_decompress(ohdr, hdr, &amp;ipv6_hdr(skb)-&gt;daddr, n);</div><div class='add'>+	chdr = (struct ipv6_rpl_sr_hdr *)(buf + ((ohdr-&gt;hdrlen + 1) &lt;&lt; 3));</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_is_multicast(&amp;ohdr-&gt;rpl_segaddr[i])) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ipv6_chk_rpl_srh_loop(net, ohdr-&gt;rpl_segaddr, n + 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		icmpv6_send(skb, ICMPV6_PARAMPROB, 0, 0);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	swap(ipv6_hdr(skb)-&gt;daddr, ohdr-&gt;rpl_segaddr[i]);</div><div class='add'>+</div><div class='add'>+	ipv6_rpl_srh_compress(chdr, ohdr, &amp;ipv6_hdr(skb)-&gt;daddr, n);</div><div class='add'>+</div><div class='add'>+	oldhdr = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, ((hdr-&gt;hdrlen + 1) &lt;&lt; 3));</div><div class='add'>+	skb_postpull_rcsum(skb, oldhdr,</div><div class='add'>+			   sizeof(struct ipv6hdr) + ((hdr-&gt;hdrlen + 1) &lt;&lt; 3));</div><div class='add'>+	if (unlikely(!hdr-&gt;segments_left)) {</div><div class='add'>+		if (pskb_expand_head(skb, sizeof(struct ipv6hdr) + ((chdr-&gt;hdrlen + 1) &lt;&lt; 3), 0,</div><div class='add'>+				     GFP_ATOMIC)) {</div><div class='add'>+			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUTDISCARDS);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			kfree(buf);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		oldhdr = ipv6_hdr(skb);</div><div class='add'>+	}</div><div class='add'>+	skb_push(skb, ((chdr-&gt;hdrlen + 1) &lt;&lt; 3) + sizeof(struct ipv6hdr));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	memmove(ipv6_hdr(skb), oldhdr, sizeof(struct ipv6hdr));</div><div class='add'>+	memcpy(skb_transport_header(skb), chdr, (chdr-&gt;hdrlen + 1) &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+	skb_postpush_rcsum(skb, ipv6_hdr(skb),</div><div class='add'>+			   sizeof(struct ipv6hdr) + ((chdr-&gt;hdrlen + 1) &lt;&lt; 3));</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='ctx'> </div><div class='ctx'> 	ip6_route_input(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +619,7 @@ looped_back:</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_dst(skb)-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='add'>+	if (skb_dst_dev(skb)-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='ctx'> 		if (ipv6_hdr(skb)-&gt;hop_limit &lt;= 1) {</div><div class='ctx'> 			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> 			icmpv6_send(skb, ICMPV6_TIME_EXCEED,</div><div class='hunk'>@@ -482,16 +648,17 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb)</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='ctx'> 	struct in6_addr *addr = NULL;</div><div class='del'>-	struct in6_addr daddr;</div><div class='ctx'> 	int n, i;</div><div class='ctx'> 	struct ipv6_rt_hdr *hdr;</div><div class='ctx'> 	struct rt0_hdr *rthdr;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-	int accept_source_route = net-&gt;ipv6.devconf_all-&gt;accept_source_route;</div><div class='add'>+	int accept_source_route;</div><div class='ctx'> </div><div class='del'>-	idev = __in6_dev_get(skb-&gt;dev);</div><div class='del'>-	if (idev &amp;&amp; accept_source_route &gt; idev-&gt;cnf.accept_source_route)</div><div class='del'>-		accept_source_route = idev-&gt;cnf.accept_source_route;</div><div class='add'>+	accept_source_route = READ_ONCE(net-&gt;ipv6.devconf_all-&gt;accept_source_route);</div><div class='add'>+</div><div class='add'>+	if (idev)</div><div class='add'>+		accept_source_route = min(accept_source_route,</div><div class='add'>+					  READ_ONCE(idev-&gt;cnf.accept_source_route));</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||</div><div class='ctx'> 	    !pskb_may_pull(skb, (skb_transport_offset(skb) +</div><div class='hunk'>@@ -510,9 +677,16 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* segment routing */</div><div class='del'>-	if (hdr-&gt;type == IPV6_SRCRT_TYPE_4)</div><div class='add'>+	switch (hdr-&gt;type) {</div><div class='add'>+	case IPV6_SRCRT_TYPE_4:</div><div class='add'>+		/* segment routing */</div><div class='ctx'> 		return ipv6_srh_rcv(skb);</div><div class='add'>+	case IPV6_SRCRT_TYPE_3:</div><div class='add'>+		/* rpl segment routing */</div><div class='add'>+		return ipv6_rpl_srh_rcv(skb);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> looped_back:</div><div class='ctx'> 	if (hdr-&gt;segments_left == 0) {</div><div class='hunk'>@@ -607,7 +781,7 @@ looped_back:</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		if (!ipv6_chk_home_addr(dev_net(skb_dst(skb)-&gt;dev), addr)) {</div><div class='add'>+		if (!ipv6_chk_home_addr(skb_dst_dev_net(skb), addr)) {</div><div class='ctx'> 			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -624,19 +798,16 @@ looped_back:</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	daddr = *addr;</div><div class='del'>-	*addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='del'>-	ipv6_hdr(skb)-&gt;daddr = daddr;</div><div class='add'>+	swap(*addr, ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> </div><div class='del'>-	skb_dst_drop(skb);</div><div class='ctx'> 	ip6_route_input(skb);</div><div class='ctx'> 	if (skb_dst(skb)-&gt;error) {</div><div class='del'>-		skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='add'>+		skb_push(skb, -skb_network_offset(skb));</div><div class='ctx'> 		dst_input(skb);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_dst(skb)-&gt;dev-&gt;flags&amp;IFF_LOOPBACK) {</div><div class='add'>+	if (skb_dst_dev(skb)-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='ctx'> 		if (ipv6_hdr(skb)-&gt;hop_limit &lt;= 1) {</div><div class='ctx'> 			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> 			icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,</div><div class='hunk'>@@ -648,7 +819,7 @@ looped_back:</div><div class='ctx'> 		goto looped_back;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_push(skb, skb-&gt;data - skb_network_header(skb));</div><div class='add'>+	skb_push(skb, -skb_network_offset(skb));</div><div class='ctx'> 	dst_input(skb);</div><div class='ctx'> 	return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -710,19 +881,6 @@ void ipv6_exthdrs_exit(void)</div><div class='ctx'>   Hop-by-hop options.</div><div class='ctx'>  **********************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note: we cannot rely on skb_dst(skb) before we assign it in ip6_route_input().</div><div class='del'>- */</div><div class='del'>-static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return skb_dst(skb) ? ip6_dst_idev(skb_dst(skb)) : __in6_dev_get(skb-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct net *ipv6_skb_net(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return skb_dst(skb) ? dev_net(skb_dst(skb)-&gt;dev) : dev_net(skb-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Router Alert as of RFC 2711 */</div><div class='ctx'> </div><div class='ctx'> static bool ipv6_hop_ra(struct sk_buff *skb, int optoff)</div><div class='hunk'>@@ -736,7 +894,72 @@ static bool ipv6_hop_ra(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	}</div><div class='ctx'> 	net_dbg_ratelimited("ipv6_hop_ra: wrong RA length %d\n",</div><div class='ctx'> 			    nh[optoff + 1]);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_IP_INHDR);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* IOAM */</div><div class='add'>+</div><div class='add'>+static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_trace_hdr *trace;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	struct ioam6_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	/* Bad alignment (must be 4n-aligned) */</div><div class='add'>+	if (optoff &amp; 3)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	/* Ignore if IOAM is not enabled on ingress */</div><div class='add'>+	if (!READ_ONCE(__in6_dev_get(skb-&gt;dev)-&gt;cnf.ioam6_enabled))</div><div class='add'>+		goto ignore;</div><div class='add'>+</div><div class='add'>+	/* Truncated Option header */</div><div class='add'>+	hdr = (struct ioam6_hdr *)(skb_network_header(skb) + optoff);</div><div class='add'>+	if (hdr-&gt;opt_len &lt; 2)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;type) {</div><div class='add'>+	case IOAM6_TYPE_PREALLOC:</div><div class='add'>+		/* Truncated Pre-allocated Trace header */</div><div class='add'>+		if (hdr-&gt;opt_len &lt; 2 + sizeof(*trace))</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* Malformed Pre-allocated Trace header */</div><div class='add'>+		trace = (struct ioam6_trace_hdr *)((u8 *)hdr + sizeof(*hdr));</div><div class='add'>+		if (hdr-&gt;opt_len &lt; 2 + sizeof(*trace) + trace-&gt;remlen * 4)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* Ignore if the IOAM namespace is unknown */</div><div class='add'>+		ns = ioam6_namespace(dev_net(skb-&gt;dev), trace-&gt;namespace_id);</div><div class='add'>+		if (!ns)</div><div class='add'>+			goto ignore;</div><div class='add'>+</div><div class='add'>+		if (!skb_valid_dst(skb))</div><div class='add'>+			ip6_route_input(skb);</div><div class='add'>+</div><div class='add'>+		/* About to mangle packet header */</div><div class='add'>+		if (skb_ensure_writable(skb, optoff + 2 + hdr-&gt;opt_len))</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* Trace pointer may have changed */</div><div class='add'>+		trace = (struct ioam6_trace_hdr *)(skb_network_header(skb)</div><div class='add'>+						   + optoff + sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+		ioam6_fill_trace_data(skb, ns, trace, true);</div><div class='add'>+</div><div class='add'>+		ioam6_event(IOAM6_EVENT_TRACE, dev_net(skb-&gt;dev),</div><div class='add'>+			    GFP_ATOMIC, (void *)trace, hdr-&gt;opt_len - 2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ignore:</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -745,31 +968,30 @@ static bool ipv6_hop_ra(struct sk_buff *skb, int optoff)</div><div class='ctx'> static bool ipv6_hop_jumbo(struct sk_buff *skb, int optoff)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned char *nh = skb_network_header(skb);</div><div class='del'>-	struct inet6_dev *idev = __in6_dev_get_safely(skb-&gt;dev);</div><div class='del'>-	struct net *net = ipv6_skb_net(skb);</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	u32 pkt_len;</div><div class='ctx'> </div><div class='ctx'> 	if (nh[optoff + 1] != 4 || (optoff &amp; 3) != 2) {</div><div class='ctx'> 		net_dbg_ratelimited("ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",</div><div class='ctx'> 				    nh[optoff+1]);</div><div class='del'>-		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+		SKB_DR_SET(reason, IP_INHDR);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));</div><div class='ctx'> 	if (pkt_len &lt;= IPV6_MAXPLEN) {</div><div class='del'>-		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='del'>-		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);</div><div class='add'>+		icmpv6_param_prob_reason(skb, ICMPV6_HDR_FIELD, optoff + 2,</div><div class='add'>+					 SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ipv6_hdr(skb)-&gt;payload_len) {</div><div class='del'>-		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='del'>-		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff);</div><div class='add'>+		icmpv6_param_prob_reason(skb, ICMPV6_HDR_FIELD, optoff,</div><div class='add'>+					 SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_len &gt; skb-&gt;len - sizeof(struct ipv6hdr)) {</div><div class='del'>-		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='add'>+		SKB_DR_SET(reason, PKT_TOO_SMALL);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -780,7 +1002,7 @@ static bool ipv6_hop_jumbo(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -802,26 +1024,10 @@ static bool ipv6_hop_calipso(struct sk_buff *skb, int optoff)</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct tlvtype_proc tlvprochopopt_lst[] = {</div><div class='del'>-	{</div><div class='del'>-		.type	= IPV6_TLV_ROUTERALERT,</div><div class='del'>-		.func	= ipv6_hop_ra,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.type	= IPV6_TLV_JUMBO,</div><div class='del'>-		.func	= ipv6_hop_jumbo,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.type	= IPV6_TLV_CALIPSO,</div><div class='del'>-		.func	= ipv6_hop_calipso,</div><div class='del'>-	},</div><div class='del'>-	{ -1, }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int ipv6_parse_hopopts(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='hunk'>@@ -847,8 +1053,7 @@ fail_and_free:</div><div class='ctx'> 		goto fail_and_free;</div><div class='ctx'> </div><div class='ctx'> 	opt-&gt;flags |= IP6SKB_HOPBYHOP;</div><div class='del'>-	if (ip6_parse_tlv(tlvprochopopt_lst, skb,</div><div class='del'>-			  init_net.ipv6.sysctl.max_hbh_opts_cnt)) {</div><div class='add'>+	if (ip6_parse_tlv(true, skb, net-&gt;ipv6.sysctl.max_hbh_opts_cnt)) {</div><div class='ctx'> 		skb-&gt;transport_header += extlen;</div><div class='ctx'> 		opt = IP6CB(skb);</div><div class='ctx'> 		opt-&gt;nhoff = sizeof(struct ipv6hdr);</div><div class='hunk'>@@ -997,10 +1202,9 @@ ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_txoptions *opt2;</div><div class='ctx'> </div><div class='del'>-	opt2 = sock_kmalloc(sk, opt-&gt;tot_len, GFP_ATOMIC);</div><div class='add'>+	opt2 = sock_kmemdup(sk, opt, opt-&gt;tot_len, GFP_ATOMIC);</div><div class='ctx'> 	if (opt2) {</div><div class='ctx'> 		long dif = (char *)opt2 - (char *)opt;</div><div class='del'>-		memcpy(opt2, opt, opt-&gt;tot_len);</div><div class='ctx'> 		if (opt2-&gt;hopopt)</div><div class='ctx'> 			*((char **)&amp;opt2-&gt;hopopt) += dif;</div><div class='ctx'> 		if (opt2-&gt;dst0opt)</div><div class='hunk'>@@ -1039,7 +1243,6 @@ static void ipv6_renew_option(int renewtype,</div><div class='ctx'>  * @opt: original options</div><div class='ctx'>  * @newtype: option type to replace in @opt</div><div class='ctx'>  * @newopt: new option of type @newtype to replace (user-mem)</div><div class='del'>- * @newoptlen: length of @newopt</div><div class='ctx'>  *</div><div class='ctx'>  * Returns a new set of options which is a copy of @opt with the</div><div class='ctx'>  * option type @newtype replaced with @newopt.</div><div class='hunk'>@@ -1110,14 +1313,14 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,</div><div class='ctx'> 	return opt2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,</div><div class='del'>-					  struct ipv6_txoptions *opt)</div><div class='add'>+struct ipv6_txoptions *__ipv6_fixup_options(struct ipv6_txoptions *opt_space,</div><div class='add'>+					    struct ipv6_txoptions *opt)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ignore the dest before srcrt unless srcrt is being included.</div><div class='ctx'> 	 * --yoshfuji</div><div class='ctx'> 	 */</div><div class='del'>-	if (opt &amp;&amp; opt-&gt;dst0opt &amp;&amp; !opt-&gt;srcrt) {</div><div class='add'>+	if (opt-&gt;dst0opt &amp;&amp; !opt-&gt;srcrt) {</div><div class='ctx'> 		if (opt_space != opt) {</div><div class='ctx'> 			memcpy(opt_space, opt, sizeof(*opt_space));</div><div class='ctx'> 			opt = opt_space;</div><div class='hunk'>@@ -1128,7 +1331,7 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,</div><div class='ctx'> </div><div class='ctx'> 	return opt;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ipv6_fixup_options);</div><div class='add'>+EXPORT_SYMBOL_GPL(__ipv6_fixup_options);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fl6_update_dst - update flowi destination address with info given</div><div class='head'>diff --git a/net/ipv6/exthdrs_core.c b/net/ipv6/exthdrs_core.c<br/>index ae365df8abf7..49e31e4ae7b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/exthdrs_core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 library code, needed by static components when full IPv6 support is</div><div class='ctx'>  * not configured or static.</div><div class='hunk'>@@ -142,6 +143,8 @@ int ipv6_find_tlv(const struct sk_buff *skb, int offset, int type)</div><div class='ctx'> 			optlen = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='add'>+			if (len &lt; 2)</div><div class='add'>+				goto bad;</div><div class='ctx'> 			optlen = nh[offset + 1] + 2;</div><div class='ctx'> 			if (optlen &gt; len)</div><div class='ctx'> 				goto bad;</div><div class='hunk'>@@ -196,10 +199,8 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,</div><div class='ctx'> 		struct ipv6hdr _ip6, *ip6;</div><div class='ctx'> </div><div class='ctx'> 		ip6 = skb_header_pointer(skb, *offset, sizeof(_ip6), &amp;_ip6);</div><div class='del'>-		if (!ip6 || (ip6-&gt;version != 6)) {</div><div class='del'>-			printk(KERN_ERR "IPv6 header not found\n");</div><div class='add'>+		if (!ip6 || (ip6-&gt;version != 6))</div><div class='ctx'> 			return -EBADMSG;</div><div class='del'>-		}</div><div class='ctx'> 		start = *offset + sizeof(struct ipv6hdr);</div><div class='ctx'> 		nexthdr = ip6-&gt;nexthdr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -265,7 +266,7 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,</div><div class='ctx'> 		} else if (nexthdr == NEXTHDR_AUTH) {</div><div class='ctx'> 			if (flags &amp;&amp; (*flags &amp; IP6_FH_F_AUTH) &amp;&amp; (target &lt; 0))</div><div class='ctx'> 				break;</div><div class='del'>-			hdrlen = (hp-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+			hdrlen = ipv6_authlen(hp);</div><div class='ctx'> 		} else</div><div class='ctx'> 			hdrlen = ipv6_optlen(hp);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/exthdrs_offload.c b/net/ipv6/exthdrs_offload.c<br/>index f5e2ba1c18bf..4c00398f4dca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/exthdrs_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/exthdrs_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/exthdrs_offload.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV6 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *      IPV6 Extension Header GSO/GRO support</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -20,6 +16,10 @@ static const struct net_offload dstopt_offload = {</div><div class='ctx'> 	.flags		=	INET6_PROTO_GSO_EXTHDR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct net_offload hbh_offload = {</div><div class='add'>+	.flags		=	INET6_PROTO_GSO_EXTHDR,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init ipv6_exthdrs_offload_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -32,9 +32,16 @@ int __init ipv6_exthdrs_offload_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_rt;</div><div class='ctx'> </div><div class='add'>+	ret = inet6_add_offload(&amp;hbh_offload, IPPROTO_HOPOPTS);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_dstopts;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+out_dstopts:</div><div class='add'>+	inet6_del_offload(&amp;dstopt_offload, IPPROTO_DSTOPTS);</div><div class='add'>+</div><div class='ctx'> out_rt:</div><div class='ctx'> 	inet6_del_offload(&amp;rthdr_offload, IPPROTO_ROUTING);</div><div class='ctx'> 	goto out;</div><div class='head'>diff --git a/net/ipv6/fib6_notifier.c b/net/ipv6/fib6_notifier.c<br/>index 05f82baaa99e..949b72610df7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/fib6_notifier.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fib6_notifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/fib6_notifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/fib6_notifier.c</a></div><div class='hunk'>@@ -7,12 +7,12 @@</div><div class='ctx'> #include &lt;net/netns/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_fib.h&gt;</div><div class='ctx'> </div><div class='del'>-int call_fib6_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+int call_fib6_notifier(struct notifier_block *nb,</div><div class='ctx'> 		       enum fib_event_type event_type,</div><div class='ctx'> 		       struct fib_notifier_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;family = AF_INET6;</div><div class='del'>-	return call_fib_notifier(nb, net, event_type, info);</div><div class='add'>+	return call_fib_notifier(nb, event_type, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int call_fib6_notifiers(struct net *net, enum fib_event_type event_type,</div><div class='hunk'>@@ -22,20 +22,21 @@ int call_fib6_notifiers(struct net *net, enum fib_event_type event_type,</div><div class='ctx'> 	return call_fib_notifiers(net, event_type, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int fib6_seq_read(struct net *net)</div><div class='add'>+static unsigned int fib6_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return fib6_tables_seq_read(net) + fib6_rules_seq_read(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib6_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int fib6_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = fib6_rules_dump(net, nb);</div><div class='add'>+	err = fib6_rules_dump(net, nb, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return fib6_tables_dump(net, nb);</div><div class='add'>+	return fib6_tables_dump(net, nb, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fib_notifier_ops fib6_notifier_ops_template = {</div><div class='head'>diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c<br/>index f590446595d8..fd5f7112a51f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/fib6_rules.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fib6_rules.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/fib6_rules.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/fib6_rules.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * net/ipv6/fib6_rules.c	IPv6 Routing Policy Rules</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C)2003-2006 Helsinki University of Technology</div><div class='ctx'>  * Copyright (C)2003-2006 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License as</div><div class='del'>- *	published by the Free Software Foundation, version 2.</div><div class='del'>- *</div><div class='ctx'>  * Authors</div><div class='ctx'>  *	Thomas Graf		&lt;tgraf@suug.ch&gt;</div><div class='ctx'>  *	Ville Nuorvala		&lt;vnuorval@tcs.hut.fi&gt;</div><div class='hunk'>@@ -16,8 +13,10 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='hunk'>@@ -27,14 +26,18 @@ struct fib6_rule {</div><div class='ctx'> 	struct fib_rule		common;</div><div class='ctx'> 	struct rt6key		src;</div><div class='ctx'> 	struct rt6key		dst;</div><div class='del'>-	u8			tclass;</div><div class='add'>+	__be32			flowlabel;</div><div class='add'>+	__be32			flowlabel_mask;</div><div class='add'>+	dscp_t			dscp;</div><div class='add'>+	dscp_t			dscp_mask;</div><div class='add'>+	u8			dscp_full:1;	/* DSCP or TOS selector */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static bool fib6_rule_matchall(const struct fib_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_rule *r = container_of(rule, struct fib6_rule, common);</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;dst.plen || r-&gt;src.plen || r-&gt;tclass)</div><div class='add'>+	if (r-&gt;dst.plen || r-&gt;src.plen || r-&gt;dscp || r-&gt;flowlabel_mask)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return fib_rule_matchall(rule);</div><div class='ctx'> }</div><div class='hunk'>@@ -50,27 +53,28 @@ bool fib6_rule_default(const struct fib_rule *rule)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib6_rule_default);</div><div class='ctx'> </div><div class='del'>-int fib6_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+int fib6_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return fib_rules_dump(net, nb, AF_INET6);</div><div class='add'>+	return fib_rules_dump(net, nb, AF_INET6, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int fib6_rules_seq_read(struct net *net)</div><div class='add'>+unsigned int fib6_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return fib_rules_seq_read(net, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu lock held; no reference taken on fib6_info */</div><div class='del'>-struct fib6_info *fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='del'>-			      int flags)</div><div class='add'>+int fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='add'>+		struct fib6_result *res, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *f6i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (net-&gt;ipv6.fib6_has_custom_rules) {</div><div class='ctx'> 		struct fib_lookup_arg arg = {</div><div class='ctx'> 			.lookup_ptr = fib6_table_lookup,</div><div class='ctx'> 			.lookup_data = &amp;oif,</div><div class='add'>+			.result = res,</div><div class='ctx'> 			.flags = FIB_LOOKUP_NOREF,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -78,19 +82,15 @@ struct fib6_info *fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='ctx'> </div><div class='ctx'> 		err = fib_rules_lookup(net-&gt;ipv6.fib6_rules_ops,</div><div class='ctx'> 				       flowi6_to_flowi(fl6), flags, &amp;arg);</div><div class='del'>-		if (err)</div><div class='del'>-			return ERR_PTR(err);</div><div class='del'>-</div><div class='del'>-		f6i = arg.result ? : net-&gt;ipv6.fib6_null_entry;</div><div class='ctx'> 	} else {</div><div class='del'>-		f6i = fib6_table_lookup(net, net-&gt;ipv6.fib6_local_tbl,</div><div class='del'>-					oif, fl6, flags);</div><div class='del'>-		if (!f6i || f6i == net-&gt;ipv6.fib6_null_entry)</div><div class='del'>-			f6i = fib6_table_lookup(net, net-&gt;ipv6.fib6_main_tbl,</div><div class='del'>-						oif, fl6, flags);</div><div class='add'>+		err = fib6_table_lookup(net, net-&gt;ipv6.fib6_local_tbl, oif,</div><div class='add'>+					fl6, res, flags);</div><div class='add'>+		if (err || res-&gt;f6i == net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+			err = fib6_table_lookup(net, net-&gt;ipv6.fib6_main_tbl,</div><div class='add'>+						oif, fl6, res, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return f6i;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,</div><div class='hunk'>@@ -98,9 +98,11 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,</div><div class='ctx'> 				   int flags, pol_lookup_t lookup)</div><div class='ctx'> {</div><div class='ctx'> 	if (net-&gt;ipv6.fib6_has_custom_rules) {</div><div class='add'>+		struct fib6_result res = {};</div><div class='ctx'> 		struct fib_lookup_arg arg = {</div><div class='ctx'> 			.lookup_ptr = lookup,</div><div class='ctx'> 			.lookup_data = skb,</div><div class='add'>+			.result = &amp;res,</div><div class='ctx'> 			.flags = FIB_LOOKUP_NOREF,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -110,22 +112,25 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,</div><div class='ctx'> 		fib_rules_lookup(net-&gt;ipv6.fib6_rules_ops,</div><div class='ctx'> 				 flowi6_to_flowi(fl6), flags, &amp;arg);</div><div class='ctx'> </div><div class='del'>-		if (arg.result)</div><div class='del'>-			return arg.result;</div><div class='add'>+		if (res.rt6)</div><div class='add'>+			return &amp;res.rt6-&gt;dst;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct rt6_info *rt;</div><div class='ctx'> </div><div class='del'>-		rt = lookup(net, net-&gt;ipv6.fib6_local_tbl, fl6, skb, flags);</div><div class='add'>+		rt = pol_lookup_func(lookup,</div><div class='add'>+			     net, net-&gt;ipv6.fib6_local_tbl, fl6, skb, flags);</div><div class='ctx'> 		if (rt != net-&gt;ipv6.ip6_null_entry &amp;&amp; rt-&gt;dst.error != -EAGAIN)</div><div class='ctx'> 			return &amp;rt-&gt;dst;</div><div class='del'>-		ip6_rt_put(rt);</div><div class='del'>-		rt = lookup(net, net-&gt;ipv6.fib6_main_tbl, fl6, skb, flags);</div><div class='add'>+		ip6_rt_put_flags(rt, flags);</div><div class='add'>+		rt = pol_lookup_func(lookup,</div><div class='add'>+			     net, net-&gt;ipv6.fib6_main_tbl, fl6, skb, flags);</div><div class='ctx'> 		if (rt-&gt;dst.error != -EAGAIN)</div><div class='ctx'> 			return &amp;rt-&gt;dst;</div><div class='del'>-		ip6_rt_put(rt);</div><div class='add'>+		ip6_rt_put_flags(rt, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dst_hold(&amp;net-&gt;ipv6.ip6_null_entry-&gt;dst);</div><div class='add'>+	if (!(flags &amp; RT6_LOOKUP_F_DST_NOREF))</div><div class='add'>+		dst_hold(&amp;net-&gt;ipv6.ip6_null_entry-&gt;dst);</div><div class='ctx'> 	return &amp;net-&gt;ipv6.ip6_null_entry-&gt;dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,11 +162,11 @@ static int fib6_rule_saddr(struct net *net, struct fib_rule *rule, int flags,</div><div class='ctx'> static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 				int flags, struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_result *res = arg-&gt;result;</div><div class='ctx'> 	struct flowi6 *flp6 = &amp;flp-&gt;u.ip6;</div><div class='ctx'> 	struct net *net = rule-&gt;fr_net;</div><div class='ctx'> 	struct fib6_table *table;</div><div class='del'>-	struct fib6_info *f6i;</div><div class='del'>-	int err = -EAGAIN, *oif;</div><div class='add'>+	int err, *oif;</div><div class='ctx'> 	u32 tb_id;</div><div class='ctx'> </div><div class='ctx'> 	switch (rule-&gt;action) {</div><div class='hunk'>@@ -182,14 +187,12 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	oif = (int *)arg-&gt;lookup_data;</div><div class='del'>-	f6i = fib6_table_lookup(net, table, *oif, flp6, flags);</div><div class='del'>-	if (f6i != net-&gt;ipv6.fib6_null_entry) {</div><div class='add'>+	err = fib6_table_lookup(net, table, *oif, flp6, res, flags);</div><div class='add'>+	if (!err &amp;&amp; res-&gt;f6i != net-&gt;ipv6.fib6_null_entry)</div><div class='ctx'> 		err = fib6_rule_saddr(net, rule, flags, flp6,</div><div class='del'>-				      fib6_info_nh_dev(f6i));</div><div class='del'>-</div><div class='del'>-		if (likely(!err))</div><div class='del'>-			arg-&gt;result = f6i;</div><div class='del'>-	}</div><div class='add'>+				      res-&gt;nh-&gt;fib_nh_dev);</div><div class='add'>+	else</div><div class='add'>+		err = -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -197,6 +200,7 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 			      int flags, struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_result *res = arg-&gt;result;</div><div class='ctx'> 	struct flowi6 *flp6 = &amp;flp-&gt;u.ip6;</div><div class='ctx'> 	struct rt6_info *rt = NULL;</div><div class='ctx'> 	struct fib6_table *table;</div><div class='hunk'>@@ -230,10 +234,15 @@ static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rt = lookup(net, table, flp6, arg-&gt;lookup_data, flags);</div><div class='add'>+	rt = pol_lookup_func(lookup,</div><div class='add'>+			     net, table, flp6, arg-&gt;lookup_data, flags);</div><div class='ctx'> 	if (rt != net-&gt;ipv6.ip6_null_entry) {</div><div class='add'>+		struct inet6_dev *idev = ip6_dst_idev(&amp;rt-&gt;dst);</div><div class='add'>+</div><div class='add'>+		if (!idev)</div><div class='add'>+			goto again;</div><div class='ctx'> 		err = fib6_rule_saddr(net, rule, flags, flp6,</div><div class='del'>-				      ip6_dst_idev(&amp;rt-&gt;dst)-&gt;dev);</div><div class='add'>+				      idev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if (err == -EAGAIN)</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -243,20 +252,22 @@ static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> again:</div><div class='del'>-	ip6_rt_put(rt);</div><div class='add'>+	ip6_rt_put_flags(rt, flags);</div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> 	rt = NULL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> discard_pkt:</div><div class='del'>-	dst_hold(&amp;rt-&gt;dst);</div><div class='add'>+	if (!(flags &amp; RT6_LOOKUP_F_DST_NOREF))</div><div class='add'>+		dst_hold(&amp;rt-&gt;dst);</div><div class='ctx'> out:</div><div class='del'>-	arg-&gt;result = rt;</div><div class='add'>+	res-&gt;rt6 = rt;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='del'>-			    int flags, struct fib_lookup_arg *arg)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int fib6_rule_action(struct fib_rule *rule,</div><div class='add'>+					     struct flowi *flp, int flags,</div><div class='add'>+					     struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	if (arg-&gt;lookup_ptr == fib6_table_lookup)</div><div class='ctx'> 		return fib6_rule_action_alt(rule, flp, flags, arg);</div><div class='hunk'>@@ -264,11 +275,17 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 	return __fib6_rule_action(rule, flp, flags, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE bool fib6_rule_suppress(struct fib_rule *rule,</div><div class='add'>+						int flags,</div><div class='add'>+						struct fib_lookup_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *) arg-&gt;result;</div><div class='add'>+	struct fib6_result *res = arg-&gt;result;</div><div class='add'>+	struct rt6_info *rt = res-&gt;rt6;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!rt)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (rt-&gt;rt6i_idev)</div><div class='ctx'> 		dev = rt-&gt;rt6i_idev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -287,11 +304,12 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg</div><div class='ctx'> 	return false;</div><div class='ctx'> </div><div class='ctx'> suppress_route:</div><div class='del'>-	ip6_rt_put(rt);</div><div class='add'>+	ip6_rt_put_flags(rt, flags);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fib6_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int fib6_rule_match(struct fib_rule *rule,</div><div class='add'>+					    struct flowi *fl, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_rule *r = (struct fib6_rule *) rule;</div><div class='ctx'> 	struct flowi6 *fl6 = &amp;fl-&gt;u.ip6;</div><div class='hunk'>@@ -314,35 +332,120 @@ static int fib6_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;tclass &amp;&amp; r-&gt;tclass != ip6_tclass(fl6-&gt;flowlabel))</div><div class='add'>+	if ((r-&gt;dscp ^ ip6_dscp(fl6-&gt;flowlabel)) &amp; r-&gt;dscp_mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((r-&gt;flowlabel ^ flowi6_get_flowlabel(fl6)) &amp; r-&gt;flowlabel_mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;ip_proto &amp;&amp; (rule-&gt;ip_proto != fl6-&gt;flowi6_proto))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (fib_rule_port_range_set(&amp;rule-&gt;sport_range) &amp;&amp;</div><div class='del'>-	    !fib_rule_port_inrange(&amp;rule-&gt;sport_range, fl6-&gt;fl6_sport))</div><div class='add'>+	if (!fib_rule_port_match(&amp;rule-&gt;sport_range, rule-&gt;sport_mask,</div><div class='add'>+				 fl6-&gt;fl6_sport))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (fib_rule_port_range_set(&amp;rule-&gt;dport_range) &amp;&amp;</div><div class='del'>-	    !fib_rule_port_inrange(&amp;rule-&gt;dport_range, fl6-&gt;fl6_dport))</div><div class='add'>+	if (!fib_rule_port_match(&amp;rule-&gt;dport_range, rule-&gt;dport_mask,</div><div class='add'>+				 fl6-&gt;fl6_dport))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy fib6_rule_policy[FRA_MAX+1] = {</div><div class='del'>-	FRA_GENERIC_POLICY,</div><div class='del'>-};</div><div class='add'>+static int fib6_nl2rule_dscp(const struct nlattr *nla, struct fib6_rule *rule6,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (rule6-&gt;dscp) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot specify both TOS and DSCP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule6-&gt;dscp = inet_dsfield_to_dscp(nla_get_u8(nla) &lt;&lt; 2);</div><div class='add'>+	rule6-&gt;dscp_mask = inet_dsfield_to_dscp(INET_DSCP_MASK);</div><div class='add'>+	rule6-&gt;dscp_full = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib6_nl2rule_dscp_mask(const struct nlattr *nla,</div><div class='add'>+				  struct fib6_rule *rule6,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	dscp_t dscp_mask;</div><div class='add'>+</div><div class='add'>+	if (!rule6-&gt;dscp_full) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla,</div><div class='add'>+				    "Cannot specify DSCP mask without DSCP value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dscp_mask = inet_dsfield_to_dscp(nla_get_u8(nla) &lt;&lt; 2);</div><div class='add'>+	if (rule6-&gt;dscp &amp; ~dscp_mask) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, nla, "Invalid DSCP mask");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule6-&gt;dscp_mask = dscp_mask;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib6_nl2rule_flowlabel(struct nlattr **tb, struct fib6_rule *rule6,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	__be32 flowlabel, flowlabel_mask;</div><div class='add'>+</div><div class='add'>+	if (NL_REQ_ATTR_CHECK(extack, NULL, tb, FRA_FLOWLABEL) ||</div><div class='add'>+	    NL_REQ_ATTR_CHECK(extack, NULL, tb, FRA_FLOWLABEL_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	flowlabel = nla_get_be32(tb[FRA_FLOWLABEL]);</div><div class='add'>+	flowlabel_mask = nla_get_be32(tb[FRA_FLOWLABEL_MASK]);</div><div class='add'>+</div><div class='add'>+	if (flowlabel_mask &amp; ~IPV6_FLOWLABEL_MASK) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[FRA_FLOWLABEL_MASK],</div><div class='add'>+				    "Invalid flow label mask");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flowlabel &amp; ~flowlabel_mask) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Flow label and mask do not match");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule6-&gt;flowlabel = flowlabel;</div><div class='add'>+	rule6-&gt;flowlabel_mask = flowlabel_mask;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 			       struct fib_rule_hdr *frh,</div><div class='ctx'> 			       struct nlattr **tb,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_rule *rule6 = (struct fib6_rule *)rule;</div><div class='add'>+	struct net *net = rule-&gt;fr_net;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='del'>-	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct fib6_rule *rule6 = (struct fib6_rule *) rule;</div><div class='add'>+</div><div class='add'>+	if (!inet_validate_dscp(frh-&gt;tos)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid dsfield (tos): ECN bits must be 0");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+	rule6-&gt;dscp = inet_dsfield_to_dscp(frh-&gt;tos);</div><div class='add'>+	rule6-&gt;dscp_mask = frh-&gt;tos ? inet_dsfield_to_dscp(INET_DSCP_MASK) : 0;</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP] &amp;&amp; fib6_nl2rule_dscp(tb[FRA_DSCP], rule6, extack) &lt; 0)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP_MASK] &amp;&amp;</div><div class='add'>+	    fib6_nl2rule_dscp_mask(tb[FRA_DSCP_MASK], rule6, extack) &lt; 0)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	if ((tb[FRA_FLOWLABEL] || tb[FRA_FLOWLABEL_MASK]) &amp;&amp;</div><div class='add'>+	    fib6_nl2rule_flowlabel(tb, rule6, extack) &lt; 0)</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	if (rule-&gt;action == FR_ACT_TO_TBL &amp;&amp; !rule-&gt;l3mdev) {</div><div class='ctx'> 		if (rule-&gt;table == RT6_TABLE_UNSPEC) {</div><div class='hunk'>@@ -364,7 +467,6 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	rule6-&gt;src.plen = frh-&gt;src_len;</div><div class='ctx'> 	rule6-&gt;dst.plen = frh-&gt;dst_len;</div><div class='del'>-	rule6-&gt;tclass = frh-&gt;tos;</div><div class='ctx'> </div><div class='ctx'> 	if (fib_rule_requires_fldissect(rule))</div><div class='ctx'> 		net-&gt;ipv6.fib6_rules_require_fldissect++;</div><div class='hunk'>@@ -397,7 +499,33 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,</div><div class='ctx'> 	if (frh-&gt;dst_len &amp;&amp; (rule6-&gt;dst.plen != frh-&gt;dst_len))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (frh-&gt;tos &amp;&amp; (rule6-&gt;tclass != frh-&gt;tos))</div><div class='add'>+	if (frh-&gt;tos &amp;&amp;</div><div class='add'>+	    (rule6-&gt;dscp_full ||</div><div class='add'>+	     inet_dscp_to_dsfield(rule6-&gt;dscp) != frh-&gt;tos))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP]) {</div><div class='add'>+		dscp_t dscp;</div><div class='add'>+</div><div class='add'>+		dscp = inet_dsfield_to_dscp(nla_get_u8(tb[FRA_DSCP]) &lt;&lt; 2);</div><div class='add'>+		if (!rule6-&gt;dscp_full || rule6-&gt;dscp != dscp)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_DSCP_MASK]) {</div><div class='add'>+		dscp_t dscp_mask;</div><div class='add'>+</div><div class='add'>+		dscp_mask = inet_dsfield_to_dscp(nla_get_u8(tb[FRA_DSCP_MASK]) &lt;&lt; 2);</div><div class='add'>+		if (!rule6-&gt;dscp_full || rule6-&gt;dscp_mask != dscp_mask)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_FLOWLABEL] &amp;&amp;</div><div class='add'>+	    nla_get_be32(tb[FRA_FLOWLABEL]) != rule6-&gt;flowlabel)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (tb[FRA_FLOWLABEL_MASK] &amp;&amp;</div><div class='add'>+	    nla_get_be32(tb[FRA_FLOWLABEL_MASK]) != rule6-&gt;flowlabel_mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (frh-&gt;src_len &amp;&amp;</div><div class='hunk'>@@ -418,7 +546,22 @@ static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	frh-&gt;dst_len = rule6-&gt;dst.plen;</div><div class='ctx'> 	frh-&gt;src_len = rule6-&gt;src.plen;</div><div class='del'>-	frh-&gt;tos = rule6-&gt;tclass;</div><div class='add'>+</div><div class='add'>+	if (rule6-&gt;dscp_full) {</div><div class='add'>+		frh-&gt;tos = 0;</div><div class='add'>+		if (nla_put_u8(skb, FRA_DSCP,</div><div class='add'>+			       inet_dscp_to_dsfield(rule6-&gt;dscp) &gt;&gt; 2) ||</div><div class='add'>+		    nla_put_u8(skb, FRA_DSCP_MASK,</div><div class='add'>+			       inet_dscp_to_dsfield(rule6-&gt;dscp_mask) &gt;&gt; 2))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else {</div><div class='add'>+		frh-&gt;tos = inet_dscp_to_dsfield(rule6-&gt;dscp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rule6-&gt;flowlabel_mask &amp;&amp;</div><div class='add'>+	    (nla_put_be32(skb, FRA_FLOWLABEL, rule6-&gt;flowlabel) ||</div><div class='add'>+	     nla_put_be32(skb, FRA_FLOWLABEL_MASK, rule6-&gt;flowlabel_mask)))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if ((rule6-&gt;dst.plen &amp;&amp;</div><div class='ctx'> 	     nla_put_in6_addr(skb, FRA_DST, &amp;rule6-&gt;dst.addr)) ||</div><div class='hunk'>@@ -434,7 +577,16 @@ nla_put_failure:</div><div class='ctx'> static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	return nla_total_size(16) /* dst */</div><div class='del'>-	       + nla_total_size(16); /* src */</div><div class='add'>+	       + nla_total_size(16) /* src */</div><div class='add'>+	       + nla_total_size(1) /* dscp */</div><div class='add'>+	       + nla_total_size(1) /* dscp mask */</div><div class='add'>+	       + nla_total_size(4) /* flowlabel */</div><div class='add'>+	       + nla_total_size(4); /* flowlabel mask */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fib6_rule_flush_cache(struct fib_rules_ops *ops)</div><div class='add'>+{</div><div class='add'>+	rt_genid_bump_ipv6(ops-&gt;fro_net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = {</div><div class='hunk'>@@ -449,8 +601,8 @@ static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = {</div><div class='ctx'> 	.compare		= fib6_rule_compare,</div><div class='ctx'> 	.fill			= fib6_rule_fill,</div><div class='ctx'> 	.nlmsg_payload		= fib6_rule_nlmsg_payload,</div><div class='add'>+	.flush_cache		= fib6_rule_flush_cache,</div><div class='ctx'> 	.nlgroup		= RTNLGRP_IPV6_RULE,</div><div class='del'>-	.policy			= fib6_rule_policy,</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.fro_net		= &amp;init_net,</div><div class='ctx'> };</div><div class='hunk'>@@ -458,17 +610,17 @@ static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = {</div><div class='ctx'> static int __net_init fib6_rules_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib_rules_ops *ops;</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	ops = fib_rules_register(&amp;fib6_rules_ops_template, net);</div><div class='ctx'> 	if (IS_ERR(ops))</div><div class='ctx'> 		return PTR_ERR(ops);</div><div class='ctx'> </div><div class='del'>-	err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_fib6_rules_ops;</div><div class='ctx'> </div><div class='del'>-	err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_fib6_rules_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -482,16 +634,21 @@ out_fib6_rules_ops:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit fib6_rules_net_exit(struct net *net)</div><div class='add'>+static void __net_exit fib6_rules_net_exit_batch(struct list_head *net_list)</div><div class='ctx'> {</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	fib_rules_unregister(net-&gt;ipv6.fib6_rules_ops);</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list) {</div><div class='add'>+		fib_rules_unregister(net-&gt;ipv6.fib6_rules_ops);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations fib6_rules_net_ops = {</div><div class='ctx'> 	.init = fib6_rules_net_init,</div><div class='del'>-	.exit = fib6_rules_net_exit,</div><div class='add'>+	.exit_batch = fib6_rules_net_exit_batch,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init fib6_rules_init(void)</div><div class='head'>diff --git a/net/ipv6/fou6.c b/net/ipv6/fou6.c<br/>index 6de3c04b0f30..430518ae26fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/fou6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/fou6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/fou6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/fou6.c</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;net/fou.h&gt;</div><div class='hunk'>@@ -69,14 +71,100 @@ static int gue6_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gue6_err_proto_handler(int proto, struct sk_buff *skb,</div><div class='add'>+				  struct inet6_skb_parm *opt,</div><div class='add'>+				  u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+{</div><div class='add'>+	const struct inet6_protocol *ipprot;</div><div class='add'>+</div><div class='add'>+	ipprot = rcu_dereference(inet6_protos[proto]);</div><div class='add'>+	if (ipprot &amp;&amp; ipprot-&gt;err_handler) {</div><div class='add'>+		if (!ipprot-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gue6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+		    u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+{</div><div class='add'>+	int transport_offset = skb_transport_offset(skb);</div><div class='add'>+	struct guehdr *guehdr;</div><div class='add'>+	size_t len, optlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len = sizeof(struct udphdr) + sizeof(struct guehdr);</div><div class='add'>+	if (!pskb_may_pull(skb, transport_offset + len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guehdr = (struct guehdr *)&amp;udp_hdr(skb)[1];</div><div class='add'>+</div><div class='add'>+	switch (guehdr-&gt;version) {</div><div class='add'>+	case 0: /* Full GUE header present */</div><div class='add'>+		break;</div><div class='add'>+	case 1: {</div><div class='add'>+		/* Direct encasulation of IPv4 or IPv6 */</div><div class='add'>+		skb_set_transport_header(skb, -(int)sizeof(struct icmp6hdr));</div><div class='add'>+</div><div class='add'>+		switch (((struct iphdr *)guehdr)-&gt;version) {</div><div class='add'>+		case 4:</div><div class='add'>+			ret = gue6_err_proto_handler(IPPROTO_IPIP, skb, opt,</div><div class='add'>+						     type, code, offset, info);</div><div class='add'>+			goto out;</div><div class='add'>+		case 6:</div><div class='add'>+			ret = gue6_err_proto_handler(IPPROTO_IPV6, skb, opt,</div><div class='add'>+						     type, code, offset, info);</div><div class='add'>+			goto out;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	default: /* Undefined version */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (guehdr-&gt;control)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	optlen = guehdr-&gt;hlen &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, transport_offset + len + optlen))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guehdr = (struct guehdr *)&amp;udp_hdr(skb)[1];</div><div class='add'>+	if (validate_gue_flags(guehdr, optlen))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Handling exceptions for direct UDP encapsulation in GUE would lead to</div><div class='add'>+	 * recursion. Besides, this kind of encapsulation can't even be</div><div class='add'>+	 * configured currently. Discard this.</div><div class='add'>+	 */</div><div class='add'>+	if (guehdr-&gt;proto_ctype == IPPROTO_UDP ||</div><div class='add'>+	    guehdr-&gt;proto_ctype == IPPROTO_UDPLITE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, -(int)sizeof(struct icmp6hdr));</div><div class='add'>+	ret = gue6_err_proto_handler(guehdr-&gt;proto_ctype, skb,</div><div class='add'>+				     opt, type, code, offset, info);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	skb_set_transport_header(skb, transport_offset);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static const struct ip6_tnl_encap_ops fou_ip6tun_ops = {</div><div class='ctx'> 	.encap_hlen = fou_encap_hlen,</div><div class='ctx'> 	.build_header = fou6_build_header,</div><div class='add'>+	.err_handler = gue6_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ip6_tnl_encap_ops gue_ip6tun_ops = {</div><div class='ctx'> 	.encap_hlen = gue_encap_hlen,</div><div class='ctx'> 	.build_header = gue6_build_header,</div><div class='add'>+	.err_handler = gue6_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ip6_tnl_encap_add_fou_ops(void)</div><div class='hunk'>@@ -136,3 +224,4 @@ module_init(fou6_init);</div><div class='ctx'> module_exit(fou6_fini);</div><div class='ctx'> MODULE_AUTHOR("Tom Herbert &lt;therbert@google.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Foo over UDP (IPv6)");</div><div class='head'>diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c<br/>index c9c53ade55c3..5d2f90babaa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/icmp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/icmp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/icmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/icmp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Internet Control Message Protocol (ICMPv6)</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -8,11 +9,6 @@</div><div class='ctx'>  *	Based on net/ipv4/icmp.c</div><div class='ctx'>  *</div><div class='ctx'>  *	RFC 1885</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -61,6 +57,7 @@</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/raw.h&gt;</div><div class='ctx'> #include &lt;net/rawv6.h&gt;</div><div class='add'>+#include &lt;net/seg6.h&gt;</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='hunk'>@@ -72,24 +69,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	The ICMP socket(s). This is the most convenient way to flow control</div><div class='del'>- *	our ICMP output as well as maintain a clean interface throughout</div><div class='del'>- *	all layers. All Socketless IP sends will soon be gone.</div><div class='del'>- *</div><div class='del'>- *	On SMP we have one ICMP socket per-cpu.</div><div class='del'>- */</div><div class='del'>-static inline struct sock *icmpv6_sk(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return net-&gt;ipv6.icmp_sk[smp_processor_id()];</div><div class='del'>-}</div><div class='add'>+static DEFINE_PER_CPU(struct sock *, ipv6_icmp_sk);</div><div class='ctx'> </div><div class='del'>-static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		       u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	/* icmpv6_notify checks 8 bytes can be pulled, icmp6hdr is 8 bytes */</div><div class='ctx'> 	struct icmp6hdr *icmp6 = (struct icmp6hdr *) (skb-&gt;data + offset);</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMPV6_PKT_TOOBIG)</div><div class='ctx'> 		ip6_update_pmtu(skb, net, info, skb-&gt;dev-&gt;ifindex, 0, sock_net_uid(net, NULL));</div><div class='hunk'>@@ -100,6 +87,8 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	if (!(type &amp; ICMPV6_INFOMSG_MASK))</div><div class='ctx'> 		if (icmp6-&gt;icmp6_type == ICMPV6_ECHO_REQUEST)</div><div class='ctx'> 			ping_err(skb, offset, ntohl(info));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int icmpv6_rcv(struct sk_buff *skb);</div><div class='hunk'>@@ -111,11 +100,11 @@ static const struct inet6_protocol icmpv6_protocol = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Called with BH disabled */</div><div class='del'>-static __inline__ struct sock *icmpv6_xmit_lock(struct net *net)</div><div class='add'>+static struct sock *icmpv6_xmit_lock(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk = icmpv6_sk(net);</div><div class='add'>+	sk = this_cpu_read(ipv6_icmp_sk);</div><div class='ctx'> 	if (unlikely(!spin_trylock(&amp;sk-&gt;sk_lock.slock))) {</div><div class='ctx'> 		/* This can happen if the output path (f.e. SIT or</div><div class='ctx'> 		 * ip6ip6 tunnel) signals dst_link_failure() for an</div><div class='hunk'>@@ -123,11 +112,13 @@ static __inline__ struct sock *icmpv6_xmit_lock(struct net *net)</div><div class='ctx'> 		 */</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	sock_net_set(sk, net);</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __inline__ void icmpv6_xmit_unlock(struct sock *sk)</div><div class='add'>+static void icmpv6_xmit_unlock(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	sock_net_set(sk, &amp;init_net);</div><div class='ctx'> 	spin_unlock(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -160,33 +151,41 @@ static bool is_ineligible(const struct sk_buff *skb)</div><div class='ctx'> 		tp = skb_header_pointer(skb,</div><div class='ctx'> 			ptr+offsetof(struct icmp6hdr, icmp6_type),</div><div class='ctx'> 			sizeof(_type), &amp;_type);</div><div class='del'>-		if (!tp || !(*tp &amp; ICMPV6_INFOMSG_MASK))</div><div class='add'>+</div><div class='add'>+		/* Based on RFC 8200, Section 4.5 Fragment Header, return</div><div class='add'>+		 * false if this is a fragment packet with no icmp header info.</div><div class='add'>+		 */</div><div class='add'>+		if (!tp &amp;&amp; frag_off != 0)</div><div class='add'>+			return false;</div><div class='add'>+		else if (!tp || !(*tp &amp; ICMPV6_INFOMSG_MASK))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool icmpv6_mask_allow(int type)</div><div class='add'>+static bool icmpv6_mask_allow(struct net *net, int type)</div><div class='ctx'> {</div><div class='del'>-	/* Informational messages are not limited. */</div><div class='del'>-	if (type &amp; ICMPV6_INFOMSG_MASK)</div><div class='add'>+	if (type &gt; ICMPV6_MSG_MAX)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	/* Do not limit pmtu discovery, it would break it. */</div><div class='del'>-	if (type == ICMPV6_PKT_TOOBIG)</div><div class='add'>+	/* Limit if icmp type is set in ratemask. */</div><div class='add'>+	if (!test_bit(type, net-&gt;ipv6.sysctl.icmpv6_ratemask))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool icmpv6_global_allow(int type)</div><div class='add'>+static bool icmpv6_global_allow(struct net *net, int type,</div><div class='add'>+				bool *apply_ratelimit)</div><div class='ctx'> {</div><div class='del'>-	if (icmpv6_mask_allow(type))</div><div class='add'>+	if (icmpv6_mask_allow(net, type))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (icmp_global_allow())</div><div class='add'>+	if (icmp_global_allow(net)) {</div><div class='add'>+		*apply_ratelimit = true;</div><div class='ctx'> 		return true;</div><div class='del'>-</div><div class='add'>+	}</div><div class='add'>+	__ICMP_INC_STATS(net, ICMP_MIB_RATELIMITGLOBAL);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -194,13 +193,14 @@ static bool icmpv6_global_allow(int type)</div><div class='ctx'>  * Check the ICMP output rate limit</div><div class='ctx'>  */</div><div class='ctx'> static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,</div><div class='del'>-			       struct flowi6 *fl6)</div><div class='add'>+			       struct flowi6 *fl6, bool apply_ratelimit)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	bool res = false;</div><div class='ctx'> </div><div class='del'>-	if (icmpv6_mask_allow(type))</div><div class='add'>+	if (!apply_ratelimit)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -209,13 +209,15 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,</div><div class='ctx'> 	 * this lookup should be more aggressive (not longer than timeout).</div><div class='ctx'> 	 */</div><div class='ctx'> 	dst = ip6_route_output(net, sk, fl6);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='ctx'> 	if (dst-&gt;error) {</div><div class='ctx'> 		IP6_INC_STATS(net, ip6_dst_idev(dst),</div><div class='ctx'> 			      IPSTATS_MIB_OUTNOROUTES);</div><div class='del'>-	} else if (dst-&gt;dev &amp;&amp; (dst-&gt;dev-&gt;flags&amp;IFF_LOOPBACK)) {</div><div class='add'>+	} else if (dev &amp;&amp; (dev-&gt;flags &amp; IFF_LOOPBACK)) {</div><div class='ctx'> 		res = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct rt6_info *rt = (struct rt6_info *)dst;</div><div class='add'>+		struct rt6_info *rt = dst_rt6_info(dst);</div><div class='ctx'> 		int tmo = net-&gt;ipv6.sysctl.icmpv6_time;</div><div class='ctx'> 		struct inet_peer *peer;</div><div class='ctx'> </div><div class='hunk'>@@ -223,10 +225,32 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,</div><div class='ctx'> 		if (rt-&gt;rt6i_dst.plen &lt; 128)</div><div class='ctx'> 			tmo &gt;&gt;= ((128 - rt-&gt;rt6i_dst.plen)&gt;&gt;5);</div><div class='ctx'> </div><div class='del'>-		peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;fl6-&gt;daddr, 1);</div><div class='add'>+		peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;fl6-&gt;daddr);</div><div class='ctx'> 		res = inet_peer_xrlim_allow(peer, tmo);</div><div class='del'>-		if (peer)</div><div class='del'>-			inet_putpeer(peer);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!res)</div><div class='add'>+		__ICMP6_INC_STATS(net, NULL, ICMP6_MIB_RATELIMITHOST);</div><div class='add'>+	else</div><div class='add'>+		icmp_global_consume(net);</div><div class='add'>+	dst_release(dst);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool icmpv6_rt_has_prefsrc(struct sock *sk, u8 type,</div><div class='add'>+				  struct flowi6 *fl6)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	bool res = false;</div><div class='add'>+</div><div class='add'>+	dst = ip6_route_output(net, sk, fl6);</div><div class='add'>+	if (!dst-&gt;error) {</div><div class='add'>+		struct rt6_info *rt = dst_rt6_info(dst);</div><div class='add'>+		struct in6_addr prefsrc;</div><div class='add'>+</div><div class='add'>+		rt6_get_prefsrc(rt, &amp;prefsrc);</div><div class='add'>+		res = !ipv6_addr_any(&amp;prefsrc);</div><div class='ctx'> 	}</div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -298,10 +322,10 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st</div><div class='ctx'> {</div><div class='ctx'> 	struct icmpv6_msg *msg = (struct icmpv6_msg *) from;</div><div class='ctx'> 	struct sk_buff *org_skb = msg-&gt;skb;</div><div class='del'>-	__wsum csum = 0;</div><div class='add'>+	__wsum csum;</div><div class='ctx'> </div><div class='ctx'> 	csum = skb_copy_and_csum_bits(org_skb, msg-&gt;offset + offset,</div><div class='del'>-				      to, len, csum);</div><div class='add'>+				      to, len);</div><div class='ctx'> 	skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, odd);</div><div class='ctx'> 	if (!(msg-&gt;type &amp; ICMPV6_INFOMSG_MASK))</div><div class='ctx'> 		nf_ct_attach(skb, org_skb);</div><div class='hunk'>@@ -309,12 +333,10 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-static void mip6_addr_swap(struct sk_buff *skb)</div><div class='add'>+static void mip6_addr_swap(struct sk_buff *skb, const struct inet6_skb_parm *opt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='del'>-	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='ctx'> 	struct ipv6_destopt_hao *hao;</div><div class='del'>-	struct in6_addr tmp;</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='ctx'> 	if (opt-&gt;dsthao) {</div><div class='hunk'>@@ -322,14 +344,12 @@ static void mip6_addr_swap(struct sk_buff *skb)</div><div class='ctx'> 		if (likely(off &gt;= 0)) {</div><div class='ctx'> 			hao = (struct ipv6_destopt_hao *)</div><div class='ctx'> 					(skb_network_header(skb) + off);</div><div class='del'>-			tmp = iph-&gt;saddr;</div><div class='del'>-			iph-&gt;saddr = hao-&gt;addr;</div><div class='del'>-			hao-&gt;addr = tmp;</div><div class='add'>+			swap(iph-&gt;saddr, hao-&gt;addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline void mip6_addr_swap(struct sk_buff *skb) {}</div><div class='add'>+static inline void mip6_addr_swap(struct sk_buff *skb, const struct inet6_skb_parm *opt) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct dst_entry *icmpv6_route_lookup(struct net *net,</div><div class='hunk'>@@ -347,9 +367,10 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We won't send icmp if the destination is known</div><div class='del'>-	 * anycast.</div><div class='add'>+	 * anycast unless we need to treat anycast as unicast.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ipv6_anycast_destination(dst, &amp;fl6-&gt;daddr)) {</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.sysctl.icmpv6_error_anycast_as_unicast) &amp;&amp;</div><div class='add'>+	    ipv6_anycast_destination(dst, &amp;fl6-&gt;daddr)) {</div><div class='ctx'> 		net_dbg_ratelimited("icmp6_send: acast source\n");</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -369,7 +390,7 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net,</div><div class='ctx'> 			return dst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = xfrm_decode_session_reverse(skb, flowi6_to_flowi(&amp;fl2), AF_INET6);</div><div class='add'>+	err = xfrm_decode_session_reverse(net, skb, flowi6_to_flowi(&amp;fl2), AF_INET6);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto relookup_failed;</div><div class='ctx'> </div><div class='hunk'>@@ -396,38 +417,237 @@ relookup_failed:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int icmp6_iif(const struct sk_buff *skb)</div><div class='add'>+static struct net_device *icmp6_dev(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int iif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* for local traffic to local address, skb dev is the loopback</div><div class='ctx'> 	 * device. Check if there is a dst attached to the skb and if so</div><div class='ctx'> 	 * get the real device index. Same is needed for replies to a link</div><div class='ctx'> 	 * local address on a device enslaved to an L3 master device</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(iif == LOOPBACK_IFINDEX || netif_is_l3_master(skb-&gt;dev))) {</div><div class='add'>+	if (unlikely(dev-&gt;ifindex == LOOPBACK_IFINDEX || netif_is_l3_master(skb-&gt;dev))) {</div><div class='ctx'> 		const struct rt6_info *rt6 = skb_rt6_info(skb);</div><div class='ctx'> </div><div class='del'>-		if (rt6)</div><div class='del'>-			iif = rt6-&gt;rt6i_idev-&gt;dev-&gt;ifindex;</div><div class='add'>+		/* The destination could be an external IP in Ext Hdr (SRv6, RPL, etc.),</div><div class='add'>+		 * and ip6_null_entry could be set to skb if no route is found.</div><div class='add'>+		 */</div><div class='add'>+		if (rt6 &amp;&amp; rt6-&gt;rt6i_idev)</div><div class='add'>+			dev = rt6-&gt;rt6i_idev-&gt;dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int icmp6_iif(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return icmp6_dev(skb)-&gt;ifindex;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct icmp6_ext_iio_addr6_subobj {</div><div class='add'>+	__be16 afi;</div><div class='add'>+	__be16 reserved;</div><div class='add'>+	struct in6_addr addr6;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int icmp6_ext_iio_len(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct icmp_extobj_hdr) +</div><div class='add'>+		/* ifIndex */</div><div class='add'>+		sizeof(__be32) +</div><div class='add'>+		/* Interface Address Sub-Object */</div><div class='add'>+		sizeof(struct icmp6_ext_iio_addr6_subobj) +</div><div class='add'>+		/* Interface Name Sub-Object. Length must be a multiple of 4</div><div class='add'>+		 * bytes.</div><div class='add'>+		 */</div><div class='add'>+		ALIGN(sizeof(struct icmp_ext_iio_name_subobj), 4) +</div><div class='add'>+		/* MTU */</div><div class='add'>+		sizeof(__be32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int icmp6_ext_max_len(u8 ext_objs)</div><div class='add'>+{</div><div class='add'>+	unsigned int ext_max_len;</div><div class='add'>+</div><div class='add'>+	ext_max_len = sizeof(struct icmp_ext_hdr);</div><div class='add'>+</div><div class='add'>+	if (ext_objs &amp; BIT(ICMP_ERR_EXT_IIO_IIF))</div><div class='add'>+		ext_max_len += icmp6_ext_iio_len();</div><div class='add'>+</div><div class='add'>+	return ext_max_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct in6_addr *icmp6_ext_iio_addr6_find(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *in6_dev;</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+</div><div class='add'>+	in6_dev = __in6_dev_get(dev);</div><div class='add'>+	if (!in6_dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* It is unclear from RFC 5837 which IP address should be chosen, but</div><div class='add'>+	 * it makes sense to choose a global unicast address.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_rcu(ifa, &amp;in6_dev-&gt;addr_list, if_list) {</div><div class='add'>+		if (ifa-&gt;flags &amp; (IFA_F_TENTATIVE | IFA_F_DADFAILED))</div><div class='add'>+			continue;</div><div class='add'>+		if (ipv6_addr_type(&amp;ifa-&gt;addr) != IPV6_ADDR_UNICAST ||</div><div class='add'>+		    ipv6_addr_src_scope(&amp;ifa-&gt;addr) != IPV6_ADDR_SCOPE_GLOBAL)</div><div class='add'>+			continue;</div><div class='add'>+		return &amp;ifa-&gt;addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void icmp6_ext_iio_iif_append(struct net *net, struct sk_buff *skb,</div><div class='add'>+				     int iif)</div><div class='add'>+{</div><div class='add'>+	struct icmp_ext_iio_name_subobj *name_subobj;</div><div class='add'>+	struct icmp_extobj_hdr *objh;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct in6_addr *addr6;</div><div class='add'>+	__be32 data;</div><div class='add'>+</div><div class='add'>+	if (!iif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Add the fields in the order specified by RFC 5837. */</div><div class='add'>+	objh = skb_put(skb, sizeof(*objh));</div><div class='add'>+	objh-&gt;class_num = ICMP_EXT_OBJ_CLASS_IIO;</div><div class='add'>+	objh-&gt;class_type = ICMP_EXT_CTYPE_IIO_ROLE(ICMP_EXT_CTYPE_IIO_ROLE_IIF);</div><div class='add'>+</div><div class='add'>+	data = htonl(iif);</div><div class='add'>+	skb_put_data(skb, &amp;data, sizeof(__be32));</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_IFINDEX;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index_rcu(net, iif);</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	addr6 = icmp6_ext_iio_addr6_find(dev);</div><div class='add'>+	if (addr6) {</div><div class='add'>+		struct icmp6_ext_iio_addr6_subobj *addr6_subobj;</div><div class='add'>+</div><div class='add'>+		addr6_subobj = skb_put_zero(skb, sizeof(*addr6_subobj));</div><div class='add'>+		addr6_subobj-&gt;afi = htons(ICMP_AFI_IP6);</div><div class='add'>+		addr6_subobj-&gt;addr6 = *addr6;</div><div class='add'>+		objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_IPADDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return iif;</div><div class='add'>+	name_subobj = skb_put_zero(skb, ALIGN(sizeof(*name_subobj), 4));</div><div class='add'>+	name_subobj-&gt;len = ALIGN(sizeof(*name_subobj), 4);</div><div class='add'>+	netdev_copy_name(dev, name_subobj-&gt;name);</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_NAME;</div><div class='add'>+</div><div class='add'>+	data = htonl(READ_ONCE(dev-&gt;mtu));</div><div class='add'>+	skb_put_data(skb, &amp;data, sizeof(__be32));</div><div class='add'>+	objh-&gt;class_type |= ICMP_EXT_CTYPE_IIO_MTU;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	objh-&gt;length = htons(skb_tail_pointer(skb) - (unsigned char *)objh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void icmp6_ext_objs_append(struct net *net, struct sk_buff *skb,</div><div class='add'>+				  u8 ext_objs, int iif)</div><div class='add'>+{</div><div class='add'>+	if (ext_objs &amp; BIT(ICMP_ERR_EXT_IIO_IIF))</div><div class='add'>+		icmp6_ext_iio_iif_append(net, skb, iif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+icmp6_ext_append(struct net *net, struct sk_buff *skb_in,</div><div class='add'>+		 struct icmp6hdr *icmp6h, unsigned int room, int iif)</div><div class='add'>+{</div><div class='add'>+	unsigned int payload_len, ext_max_len, ext_len;</div><div class='add'>+	struct icmp_ext_hdr *ext_hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 ext_objs;</div><div class='add'>+	int nhoff;</div><div class='add'>+</div><div class='add'>+	switch (icmp6h-&gt;icmp6_type) {</div><div class='add'>+	case ICMPV6_DEST_UNREACH:</div><div class='add'>+	case ICMPV6_TIME_EXCEED:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not overwrite existing extensions. This can happen when we</div><div class='add'>+	 * receive an ICMPv4 message with extensions from a tunnel and</div><div class='add'>+	 * translate it to an ICMPv6 message towards an IPv6 host in the</div><div class='add'>+	 * overlay network.</div><div class='add'>+	 */</div><div class='add'>+	if (icmp6h-&gt;icmp6_datagram_len)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ext_objs = READ_ONCE(net-&gt;ipv6.sysctl.icmpv6_errors_extension_mask);</div><div class='add'>+	if (!ext_objs)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ext_max_len = icmp6_ext_max_len(ext_objs);</div><div class='add'>+	if (ICMP_EXT_ORIG_DGRAM_MIN_LEN + ext_max_len &gt; room)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(skb_in, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='add'>+	payload_len = min(skb-&gt;len - nhoff, ICMP_EXT_ORIG_DGRAM_MIN_LEN);</div><div class='add'>+</div><div class='add'>+	if (!pskb_network_may_pull(skb, payload_len))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	if (pskb_trim(skb, nhoff + ICMP_EXT_ORIG_DGRAM_MIN_LEN) ||</div><div class='add'>+	    __skb_put_padto(skb, nhoff + ICMP_EXT_ORIG_DGRAM_MIN_LEN, false))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	if (pskb_expand_head(skb, 0, ext_max_len, GFP_ATOMIC))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ext_hdr = skb_put_zero(skb, sizeof(*ext_hdr));</div><div class='add'>+	ext_hdr-&gt;version = ICMP_EXT_VERSION_2;</div><div class='add'>+</div><div class='add'>+	icmp6_ext_objs_append(net, skb, ext_objs, iif);</div><div class='add'>+</div><div class='add'>+	/* Do not send an empty extension structure. */</div><div class='add'>+	ext_len = skb_tail_pointer(skb) - (unsigned char *)ext_hdr;</div><div class='add'>+	if (ext_len == sizeof(*ext_hdr))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ext_hdr-&gt;checksum = ip_compute_csum(ext_hdr, ext_len);</div><div class='add'>+	/* The length of the original datagram in 64-bit words (RFC 4884). */</div><div class='add'>+	icmp6h-&gt;icmp6_datagram_len = ICMP_EXT_ORIG_DGRAM_MIN_LEN / sizeof(u64);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Send an ICMP message in response to a packet in error</div><div class='ctx'>  */</div><div class='del'>-static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='del'>-		       const struct in6_addr *force_saddr)</div><div class='add'>+void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='add'>+		const struct in6_addr *force_saddr,</div><div class='add'>+		const struct inet6_skb_parm *parm)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct inet6_dev *idev = NULL;</div><div class='ctx'> 	struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='ctx'> 	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	struct ipv6_pinfo *np;</div><div class='ctx'> 	const struct in6_addr *saddr = NULL;</div><div class='add'>+	bool apply_ratelimit = false;</div><div class='add'>+	struct sk_buff *ext_skb;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	unsigned int room;</div><div class='ctx'> 	struct icmp6hdr tmp_hdr;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	struct icmpv6_msg msg;</div><div class='hunk'>@@ -435,12 +655,19 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	int iif = 0;</div><div class='ctx'> 	int addr_type = 0;</div><div class='ctx'> 	int len;</div><div class='del'>-	u32 mark = IP6_REPLY_MARK(net, skb-&gt;mark);</div><div class='add'>+	u32 mark;</div><div class='ctx'> </div><div class='ctx'> 	if ((u8 *)hdr &lt; skb-&gt;head ||</div><div class='ctx'> 	    (skb_network_header(skb) + sizeof(*hdr)) &gt; skb_tail_pointer(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!skb-&gt;dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	mark = IP6_REPLY_MARK(net, skb-&gt;mark);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Make sure we respect the rules</div><div class='ctx'> 	 *	i.e. RFC 1885 2.4(e)</div><div class='hunk'>@@ -462,7 +689,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 		    !(type == ICMPV6_PARAMPROB &amp;&amp;</div><div class='ctx'> 		      code == ICMPV6_UNK_OPTION &amp;&amp;</div><div class='ctx'> 		      (opt_unrec(skb, info))))</div><div class='del'>-			return;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		saddr = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -476,8 +703,11 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	if (__ipv6_addr_needs_scope_id(addr_type)) {</div><div class='ctx'> 		iif = icmp6_iif(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		dst = skb_dst(skb);</div><div class='del'>-		iif = l3mdev_master_ifindex(dst ? dst-&gt;dev : skb-&gt;dev);</div><div class='add'>+		/*</div><div class='add'>+		 * The source device is used for looking up which routing table</div><div class='add'>+		 * to use for sending an ICMP error.</div><div class='add'>+		 */</div><div class='add'>+		iif = l3mdev_master_ifindex(skb-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -489,7 +719,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	if ((addr_type == IPV6_ADDR_ANY) || (addr_type &amp; IPV6_ADDR_MULTICAST)) {</div><div class='ctx'> 		net_dbg_ratelimited("icmp6_send: addr_any/mcast source [%pI6c &gt; %pI6c]\n",</div><div class='ctx'> 				    &amp;hdr-&gt;saddr, &amp;hdr-&gt;daddr);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -498,42 +728,54 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	if (is_ineligible(skb)) {</div><div class='ctx'> 		net_dbg_ratelimited("icmp6_send: no reply to icmp error [%pI6c &gt; %pI6c]\n",</div><div class='ctx'> 				    &amp;hdr-&gt;saddr, &amp;hdr-&gt;daddr);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Needed by both icmp_global_allow and icmpv6_xmit_lock */</div><div class='add'>+	/* Needed by both icmpv6_global_allow and icmpv6_xmit_lock */</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> </div><div class='ctx'> 	/* Check global sysctl_icmp_msgs_per_sec ratelimit */</div><div class='del'>-	if (!(skb-&gt;dev-&gt;flags&amp;IFF_LOOPBACK) &amp;&amp; !icmpv6_global_allow(type))</div><div class='add'>+	if (!(skb-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='add'>+	    !icmpv6_global_allow(net, type, &amp;apply_ratelimit))</div><div class='ctx'> 		goto out_bh_enable;</div><div class='ctx'> </div><div class='del'>-	mip6_addr_swap(skb);</div><div class='add'>+	mip6_addr_swap(skb, parm);</div><div class='add'>+</div><div class='add'>+	sk = icmpv6_xmit_lock(net);</div><div class='add'>+	if (!sk)</div><div class='add'>+		goto out_bh_enable;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> 	fl6.flowi6_proto = IPPROTO_ICMPV6;</div><div class='ctx'> 	fl6.daddr = hdr-&gt;saddr;</div><div class='ctx'> 	if (force_saddr)</div><div class='ctx'> 		saddr = force_saddr;</div><div class='del'>-	if (saddr)</div><div class='add'>+	if (saddr) {</div><div class='ctx'> 		fl6.saddr = *saddr;</div><div class='add'>+	} else if (!icmpv6_rt_has_prefsrc(sk, type, &amp;fl6)) {</div><div class='add'>+		/* select a more meaningful saddr from input if */</div><div class='add'>+		struct net_device *in_netdev;</div><div class='add'>+</div><div class='add'>+		in_netdev = dev_get_by_index(net, parm-&gt;iif);</div><div class='add'>+		if (in_netdev) {</div><div class='add'>+			ipv6_dev_get_saddr(net, in_netdev, &amp;fl6.daddr,</div><div class='add'>+					   inet6_sk(sk)-&gt;srcprefs,</div><div class='add'>+					   &amp;fl6.saddr);</div><div class='add'>+			dev_put(in_netdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	fl6.flowi6_mark = mark;</div><div class='ctx'> 	fl6.flowi6_oif = iif;</div><div class='ctx'> 	fl6.fl6_icmp_type = type;</div><div class='ctx'> 	fl6.fl6_icmp_code = code;</div><div class='ctx'> 	fl6.flowi6_uid = sock_net_uid(net, NULL);</div><div class='ctx'> 	fl6.mp_hash = rt6_multipath_hash(net, &amp;fl6, skb, NULL);</div><div class='del'>-	security_skb_classify_flow(skb, flowi6_to_flowi(&amp;fl6));</div><div class='del'>-</div><div class='del'>-	sk = icmpv6_xmit_lock(net);</div><div class='del'>-	if (!sk)</div><div class='del'>-		goto out_bh_enable;</div><div class='add'>+	security_skb_classify_flow(skb, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='del'>-	sk-&gt;sk_mark = mark;</div><div class='ctx'> 	np = inet6_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (!icmpv6_xrlim_allow(sk, type, &amp;fl6))</div><div class='del'>-		goto out;</div><div class='add'>+	if (!icmpv6_xrlim_allow(sk, type, &amp;fl6, apply_ratelimit))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	tmp_hdr.icmp6_type = type;</div><div class='ctx'> 	tmp_hdr.icmp6_code = code;</div><div class='hunk'>@@ -541,16 +783,17 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	tmp_hdr.icmp6_pointer = htonl(info);</div><div class='ctx'> </div><div class='ctx'> 	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr))</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='del'>-	ipcm6_init_sk(&amp;ipc6, np);</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='add'>+	ipc6.sockc.mark = mark;</div><div class='ctx'> 	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);</div><div class='ctx'> </div><div class='ctx'> 	dst = icmpv6_route_lookup(net, skb, sk, &amp;fl6);</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='ctx'> </div><div class='hunk'>@@ -558,21 +801,25 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 	msg.offset = skb_network_offset(skb);</div><div class='ctx'> 	msg.type = type;</div><div class='ctx'> </div><div class='del'>-	len = skb-&gt;len - msg.offset;</div><div class='del'>-	len = min_t(unsigned int, len, IPV6_MIN_MTU - sizeof(struct ipv6hdr) - sizeof(struct icmp6hdr));</div><div class='add'>+	room = IPV6_MIN_MTU - sizeof(struct ipv6hdr) - sizeof(struct icmp6hdr);</div><div class='add'>+	ext_skb = icmp6_ext_append(net, skb, &amp;tmp_hdr, room, parm-&gt;iif);</div><div class='add'>+	if (ext_skb)</div><div class='add'>+		msg.skb = ext_skb;</div><div class='add'>+</div><div class='add'>+	len = msg.skb-&gt;len - msg.offset;</div><div class='add'>+	len = min_t(unsigned int, len, room);</div><div class='ctx'> 	if (len &lt; 0) {</div><div class='ctx'> 		net_dbg_ratelimited("icmp: len problem [%pI6c &gt; %pI6c]\n",</div><div class='ctx'> 				    &amp;hdr-&gt;saddr, &amp;hdr-&gt;daddr);</div><div class='ctx'> 		goto out_dst_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ip6_append_data(sk, icmpv6_getfrag, &amp;msg,</div><div class='ctx'> 			    len + sizeof(struct icmp6hdr),</div><div class='ctx'> 			    sizeof(struct icmp6hdr),</div><div class='del'>-			    &amp;ipc6, &amp;fl6, (struct rt6_info *)dst,</div><div class='add'>+			    &amp;ipc6, &amp;fl6, dst_rt6_info(dst),</div><div class='ctx'> 			    MSG_DONTWAIT)) {</div><div class='ctx'> 		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);</div><div class='ctx'> 		ip6_flush_pending_frames(sk);</div><div class='hunk'>@@ -580,21 +827,27 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='ctx'> 		icmpv6_push_pending_frames(sk, &amp;fl6, &amp;tmp_hdr,</div><div class='ctx'> 					   len + sizeof(struct icmp6hdr));</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> out_dst_release:</div><div class='add'>+	if (ext_skb)</div><div class='add'>+		consume_skb(ext_skb);</div><div class='ctx'> 	dst_release(dst);</div><div class='del'>-out:</div><div class='add'>+out_unlock:</div><div class='ctx'> 	icmpv6_xmit_unlock(sk);</div><div class='ctx'> out_bh_enable:</div><div class='ctx'> 	local_bh_enable();</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(icmp6_send);</div><div class='ctx'> </div><div class='del'>-/* Slightly more convenient version of icmp6_send.</div><div class='add'>+/* Slightly more convenient version of icmp6_send with drop reasons.</div><div class='ctx'>  */</div><div class='del'>-void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)</div><div class='add'>+void icmpv6_param_prob_reason(struct sk_buff *skb, u8 code, int pos,</div><div class='add'>+			      enum skb_drop_reason reason)</div><div class='ctx'> {</div><div class='del'>-	icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL, IP6CB(skb));</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Generate icmpv6 with type/code ICMPV6_DEST_UNREACH/ICMPV6_ADDR_UNREACH</div><div class='hunk'>@@ -627,8 +880,8 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,</div><div class='ctx'> 	skb_pull(skb2, nhs);</div><div class='ctx'> 	skb_reset_network_header(skb2);</div><div class='ctx'> </div><div class='del'>-	rt = rt6_lookup(dev_net(skb-&gt;dev), &amp;ipv6_hdr(skb2)-&gt;saddr, NULL, 0,</div><div class='del'>-			skb, 0);</div><div class='add'>+	rt = rt6_lookup(dev_net_rcu(skb-&gt;dev), &amp;ipv6_hdr(skb2)-&gt;saddr,</div><div class='add'>+			NULL, 0, skb, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (rt &amp;&amp; rt-&gt;dst.dev)</div><div class='ctx'> 		skb2-&gt;dev = rt-&gt;dst.dev;</div><div class='hunk'>@@ -650,10 +903,10 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (type == ICMP_TIME_EXCEEDED)</div><div class='ctx'> 		icmp6_send(skb2, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,</div><div class='del'>-			   info, &amp;temp_saddr);</div><div class='add'>+			   info, &amp;temp_saddr, IP6CB(skb2));</div><div class='ctx'> 	else</div><div class='ctx'> 		icmp6_send(skb2, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH,</div><div class='del'>-			   info, &amp;temp_saddr);</div><div class='add'>+			   info, &amp;temp_saddr, IP6CB(skb2));</div><div class='ctx'> 	if (rt)</div><div class='ctx'> 		ip6_rt_put(rt);</div><div class='ctx'> </div><div class='hunk'>@@ -663,53 +916,71 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_err_gen_icmpv6_unreach);</div><div class='ctx'> </div><div class='del'>-static void icmpv6_echo_reply(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason icmpv6_echo_reply(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	struct ipv6_pinfo *np;</div><div class='ctx'> 	const struct in6_addr *saddr = NULL;</div><div class='ctx'> 	struct icmp6hdr *icmph = icmp6_hdr(skb);</div><div class='add'>+	bool apply_ratelimit = false;</div><div class='ctx'> 	struct icmp6hdr tmp_hdr;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	struct icmpv6_msg msg;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct ipcm6_cookie ipc6;</div><div class='ctx'> 	u32 mark = IP6_REPLY_MARK(net, skb-&gt;mark);</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+	bool acast;</div><div class='add'>+	u8 type;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_is_multicast(&amp;ipv6_hdr(skb)-&gt;daddr) &amp;&amp;</div><div class='add'>+	    net-&gt;ipv6.sysctl.icmpv6_echo_ignore_multicast)</div><div class='add'>+		return reason;</div><div class='ctx'> </div><div class='ctx'> 	saddr = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='ctx'> </div><div class='add'>+	acast = ipv6_anycast_destination(skb_dst(skb), saddr);</div><div class='add'>+	if (acast &amp;&amp; net-&gt;ipv6.sysctl.icmpv6_echo_ignore_anycast)</div><div class='add'>+		return reason;</div><div class='add'>+</div><div class='ctx'> 	if (!ipv6_unicast_destination(skb) &amp;&amp;</div><div class='del'>-	    !(net-&gt;ipv6.sysctl.anycast_src_echo_reply &amp;&amp;</div><div class='del'>-	      ipv6_anycast_destination(skb_dst(skb), saddr)))</div><div class='add'>+	    !(net-&gt;ipv6.sysctl.anycast_src_echo_reply &amp;&amp; acast))</div><div class='ctx'> 		saddr = NULL;</div><div class='ctx'> </div><div class='add'>+	if (icmph-&gt;icmp6_type == ICMPV6_EXT_ECHO_REQUEST)</div><div class='add'>+		type = ICMPV6_EXT_ECHO_REPLY;</div><div class='add'>+	else</div><div class='add'>+		type = ICMPV6_ECHO_REPLY;</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;tmp_hdr, icmph, sizeof(tmp_hdr));</div><div class='del'>-	tmp_hdr.icmp6_type = ICMPV6_ECHO_REPLY;</div><div class='add'>+	tmp_hdr.icmp6_type = type;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+	if (net-&gt;ipv6.sysctl.flowlabel_reflect &amp; FLOWLABEL_REFLECT_ICMPV6_ECHO_REPLIES)</div><div class='add'>+		fl6.flowlabel = ip6_flowlabel(ipv6_hdr(skb));</div><div class='add'>+</div><div class='ctx'> 	fl6.flowi6_proto = IPPROTO_ICMPV6;</div><div class='ctx'> 	fl6.daddr = ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	if (saddr)</div><div class='ctx'> 		fl6.saddr = *saddr;</div><div class='ctx'> 	fl6.flowi6_oif = icmp6_iif(skb);</div><div class='del'>-	fl6.fl6_icmp_type = ICMPV6_ECHO_REPLY;</div><div class='add'>+	fl6.fl6_icmp_type = type;</div><div class='ctx'> 	fl6.flowi6_mark = mark;</div><div class='ctx'> 	fl6.flowi6_uid = sock_net_uid(net, NULL);</div><div class='del'>-	security_skb_classify_flow(skb, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	security_skb_classify_flow(skb, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	sk = icmpv6_xmit_lock(net);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto out_bh_enable;</div><div class='del'>-	sk-&gt;sk_mark = mark;</div><div class='ctx'> 	np = inet6_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr))</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='ctx'> 	if (ip6_dst_lookup(net, sk, &amp;dst, &amp;fl6))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -717,57 +988,80 @@ static void icmpv6_echo_reply(struct sk_buff *skb)</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Check the ratelimit */</div><div class='add'>+	if ((!(skb-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='add'>+	    !icmpv6_global_allow(net, ICMPV6_ECHO_REPLY, &amp;apply_ratelimit)) ||</div><div class='add'>+	    !icmpv6_xrlim_allow(sk, ICMPV6_ECHO_REPLY, &amp;fl6, apply_ratelimit))</div><div class='add'>+		goto out_dst_release;</div><div class='add'>+</div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	msg.skb = skb;</div><div class='ctx'> 	msg.offset = 0;</div><div class='del'>-	msg.type = ICMPV6_ECHO_REPLY;</div><div class='add'>+	msg.type = type;</div><div class='ctx'> </div><div class='del'>-	ipcm6_init_sk(&amp;ipc6, np);</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='ctx'> 	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='ctx'> 	ipc6.tclass = ipv6_get_dsfield(ipv6_hdr(skb));</div><div class='add'>+	ipc6.sockc.mark = mark;</div><div class='add'>+</div><div class='add'>+	if (icmph-&gt;icmp6_type == ICMPV6_EXT_ECHO_REQUEST)</div><div class='add'>+		if (!icmp_build_probe(skb, (struct icmphdr *)&amp;tmp_hdr))</div><div class='add'>+			goto out_dst_release;</div><div class='ctx'> </div><div class='ctx'> 	if (ip6_append_data(sk, icmpv6_getfrag, &amp;msg,</div><div class='ctx'> 			    skb-&gt;len + sizeof(struct icmp6hdr),</div><div class='ctx'> 			    sizeof(struct icmp6hdr), &amp;ipc6, &amp;fl6,</div><div class='del'>-			    (struct rt6_info *)dst, MSG_DONTWAIT)) {</div><div class='add'>+			    dst_rt6_info(dst), MSG_DONTWAIT)) {</div><div class='ctx'> 		__ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);</div><div class='ctx'> 		ip6_flush_pending_frames(sk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		icmpv6_push_pending_frames(sk, &amp;fl6, &amp;tmp_hdr,</div><div class='ctx'> 					   skb-&gt;len + sizeof(struct icmp6hdr));</div><div class='add'>+		reason = SKB_CONSUMED;</div><div class='ctx'> 	}</div><div class='add'>+out_dst_release:</div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> out:</div><div class='ctx'> 	icmpv6_xmit_unlock(sk);</div><div class='ctx'> out_bh_enable:</div><div class='ctx'> 	local_bh_enable();</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info)</div><div class='add'>+enum skb_drop_reason icmpv6_notify(struct sk_buff *skb, u8 type,</div><div class='add'>+				   u8 code, __be32 info)</div><div class='ctx'> {</div><div class='add'>+	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	const struct inet6_protocol *ipprot;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	int inner_offset;</div><div class='ctx'> 	__be16 frag_off;</div><div class='ctx'> 	u8 nexthdr;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='add'>+	reason = pskb_may_pull_reason(skb, sizeof(struct ipv6hdr));</div><div class='add'>+	if (reason != SKB_NOT_DROPPED_YET)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	seg6_icmp_srh(skb, opt);</div><div class='add'>+</div><div class='ctx'> 	nexthdr = ((struct ipv6hdr *)skb-&gt;data)-&gt;nexthdr;</div><div class='ctx'> 	if (ipv6_ext_hdr(nexthdr)) {</div><div class='ctx'> 		/* now skip over extension headers */</div><div class='ctx'> 		inner_offset = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr),</div><div class='ctx'> 						&amp;nexthdr, &amp;frag_off);</div><div class='del'>-		if (inner_offset &lt; 0)</div><div class='add'>+		if (inner_offset &lt; 0) {</div><div class='add'>+			SKB_DR_SET(reason, IPV6_BAD_EXTHDR);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inner_offset = sizeof(struct ipv6hdr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Checkin header including 8 bytes of inner protocol header. */</div><div class='del'>-	if (!pskb_may_pull(skb, inner_offset+8))</div><div class='add'>+	reason = pskb_may_pull_reason(skb, inner_offset + 8);</div><div class='add'>+	if (reason != SKB_NOT_DROPPED_YET)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* BUGGG_FUTURE: we should try to parse exthdrs in this packet.</div><div class='hunk'>@@ -779,13 +1073,14 @@ void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info)</div><div class='ctx'> </div><div class='ctx'> 	ipprot = rcu_dereference(inet6_protos[nexthdr]);</div><div class='ctx'> 	if (ipprot &amp;&amp; ipprot-&gt;err_handler)</div><div class='del'>-		ipprot-&gt;err_handler(skb, NULL, type, code, inner_offset, info);</div><div class='add'>+		ipprot-&gt;err_handler(skb, opt, type, code, inner_offset, info);</div><div class='ctx'> </div><div class='ctx'> 	raw6_icmp_error(skb, nexthdr, type, code, inner_offset, info);</div><div class='del'>-	return;</div><div class='add'>+	return SKB_CONSUMED;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	__ICMP6_INC_STATS(net, __in6_dev_get(skb-&gt;dev), ICMP6_MIB_INERRORS);</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -794,21 +1089,23 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	struct net_device *dev = icmp6_dev(skb);</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='ctx'> 	const struct in6_addr *saddr, *daddr;</div><div class='ctx'> 	struct icmp6hdr *hdr;</div><div class='ctx'> 	u8 type;</div><div class='del'>-	bool success = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='ctx'> 		struct sec_path *sp = skb_sec_path(skb);</div><div class='ctx'> 		int nh;</div><div class='ctx'> </div><div class='ctx'> 		if (!(sp &amp;&amp; sp-&gt;xvec[sp-&gt;len - 1]-&gt;props.flags &amp;</div><div class='del'>-				 XFRM_STATE_ICMP))</div><div class='add'>+				 XFRM_STATE_ICMP)) {</div><div class='add'>+			reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 			goto drop_no_count;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!pskb_may_pull(skb, sizeof(*hdr) + sizeof(struct ipv6hdr)))</div><div class='ctx'> 			goto drop_no_count;</div><div class='hunk'>@@ -816,13 +1113,16 @@ static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> 		nh = skb_network_offset(skb);</div><div class='ctx'> 		skb_set_network_header(skb, sizeof(*hdr));</div><div class='ctx'> </div><div class='del'>-		if (!xfrm6_policy_check_reverse(NULL, XFRM_POLICY_IN, skb))</div><div class='add'>+		if (!xfrm6_policy_check_reverse(NULL, XFRM_POLICY_IN,</div><div class='add'>+						skb)) {</div><div class='add'>+			reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 			goto drop_no_count;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		skb_set_network_header(skb, nh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INMSGS);</div><div class='add'>+	__ICMP6_INC_STATS(dev_net_rcu(dev), idev, ICMP6_MIB_INMSGS);</div><div class='ctx'> </div><div class='ctx'> 	saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	daddr = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='hunk'>@@ -840,17 +1140,23 @@ static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	type = hdr-&gt;icmp6_type;</div><div class='ctx'> </div><div class='del'>-	ICMP6MSGIN_INC_STATS(dev_net(dev), idev, type);</div><div class='add'>+	ICMP6MSGIN_INC_STATS(dev_net_rcu(dev), idev, type);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ICMPV6_ECHO_REQUEST:</div><div class='ctx'> 		if (!net-&gt;ipv6.sysctl.icmpv6_echo_ignore_all)</div><div class='del'>-			icmpv6_echo_reply(skb);</div><div class='add'>+			reason = icmpv6_echo_reply(skb);</div><div class='add'>+		break;</div><div class='add'>+	case ICMPV6_EXT_ECHO_REQUEST:</div><div class='add'>+		if (!net-&gt;ipv6.sysctl.icmpv6_echo_ignore_all &amp;&amp;</div><div class='add'>+		    READ_ONCE(net-&gt;ipv4.sysctl_icmp_echo_enable_probe))</div><div class='add'>+			reason = icmpv6_echo_reply(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ICMPV6_ECHO_REPLY:</div><div class='del'>-		success = ping_rcv(skb);</div><div class='del'>-		break;</div><div class='add'>+	case ICMPV6_EXT_ECHO_REPLY:</div><div class='add'>+		ping_rcv(skb);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case ICMPV6_PKT_TOOBIG:</div><div class='ctx'> 		/* BUGGG_FUTURE: if packet contains rthdr, we cannot update</div><div class='hunk'>@@ -863,11 +1169,12 @@ static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> 		hdr = icmp6_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		/* to notify */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ICMPV6_DEST_UNREACH:</div><div class='ctx'> 	case ICMPV6_TIME_EXCEED:</div><div class='ctx'> 	case ICMPV6_PARAMPROB:</div><div class='del'>-		icmpv6_notify(skb, type, hdr-&gt;icmp6_code, hdr-&gt;icmp6_mtu);</div><div class='add'>+		reason = icmpv6_notify(skb, type, hdr-&gt;icmp6_code,</div><div class='add'>+				       hdr-&gt;icmp6_mtu);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NDISC_ROUTER_SOLICITATION:</div><div class='hunk'>@@ -875,16 +1182,16 @@ static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> 	case NDISC_NEIGHBOUR_SOLICITATION:</div><div class='ctx'> 	case NDISC_NEIGHBOUR_ADVERTISEMENT:</div><div class='ctx'> 	case NDISC_REDIRECT:</div><div class='del'>-		ndisc_rcv(skb);</div><div class='add'>+		reason = ndisc_rcv(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ICMPV6_MGM_QUERY:</div><div class='ctx'> 		igmp6_event_query(skb);</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case ICMPV6_MGM_REPORT:</div><div class='ctx'> 		igmp6_event_report(skb);</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case ICMPV6_MGM_REDUCTION:</div><div class='ctx'> 	case ICMPV6_NI_QUERY:</div><div class='hunk'>@@ -909,33 +1216,33 @@ static int icmpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> 		 * must pass to upper level</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		icmpv6_notify(skb, type, hdr-&gt;icmp6_code, hdr-&gt;icmp6_mtu);</div><div class='add'>+		reason = icmpv6_notify(skb, type, hdr-&gt;icmp6_code,</div><div class='add'>+				       hdr-&gt;icmp6_mtu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* until the v6 path can be better sorted assume failure and</div><div class='ctx'> 	 * preserve the status quo behaviour for the rest of the paths to here</div><div class='ctx'> 	 */</div><div class='del'>-	if (success)</div><div class='del'>-		consume_skb(skb);</div><div class='add'>+	if (reason)</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='ctx'> 	else</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		consume_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> csum_error:</div><div class='del'>-	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_CSUMERRORS);</div><div class='add'>+	reason = SKB_DROP_REASON_ICMP_CSUM;</div><div class='add'>+	__ICMP6_INC_STATS(dev_net_rcu(dev), idev, ICMP6_MIB_CSUMERRORS);</div><div class='ctx'> discard_it:</div><div class='del'>-	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INERRORS);</div><div class='add'>+	__ICMP6_INC_STATS(dev_net_rcu(dev), idev, ICMP6_MIB_INERRORS);</div><div class='ctx'> drop_no_count:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6,</div><div class='del'>-		      u8 type,</div><div class='add'>+void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type,</div><div class='ctx'> 		      const struct in6_addr *saddr,</div><div class='del'>-		      const struct in6_addr *daddr,</div><div class='del'>-		      int oif)</div><div class='add'>+		      const struct in6_addr *daddr, int oif)</div><div class='ctx'> {</div><div class='ctx'> 	memset(fl6, 0, sizeof(*fl6));</div><div class='ctx'> 	fl6-&gt;saddr = *saddr;</div><div class='hunk'>@@ -944,66 +1251,30 @@ void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6,</div><div class='ctx'> 	fl6-&gt;fl6_icmp_type	= type;</div><div class='ctx'> 	fl6-&gt;fl6_icmp_code	= 0;</div><div class='ctx'> 	fl6-&gt;flowi6_oif		= oif;</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(fl6));</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init icmpv6_sk_init(struct net *net)</div><div class='add'>+int __init icmpv6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='del'>-	int err, i, j;</div><div class='del'>-</div><div class='del'>-	net-&gt;ipv6.icmp_sk =</div><div class='del'>-		kcalloc(nr_cpu_ids, sizeof(struct sock *), GFP_KERNEL);</div><div class='del'>-	if (!net-&gt;ipv6.icmp_sk)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		err = inet_ctl_sock_create(&amp;sk, PF_INET6,</div><div class='del'>-					   SOCK_RAW, IPPROTO_ICMPV6, net);</div><div class='add'>+					   SOCK_RAW, IPPROTO_ICMPV6, &amp;init_net);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			pr_err("Failed to initialize the ICMP6 control socket (err %d)\n",</div><div class='ctx'> 			       err);</div><div class='del'>-			goto fail;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		net-&gt;ipv6.icmp_sk[i] = sk;</div><div class='add'>+		per_cpu(ipv6_icmp_sk, i) = sk;</div><div class='ctx'> </div><div class='ctx'> 		/* Enough space for 2 64K ICMP packets, including</div><div class='ctx'> 		 * sk_buff struct overhead.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sk-&gt;sk_sndbuf = 2 * SKB_TRUESIZE(64 * 1024);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	for (j = 0; j &lt; i; j++)</div><div class='del'>-		inet_ctl_sock_destroy(net-&gt;ipv6.icmp_sk[j]);</div><div class='del'>-	kfree(net-&gt;ipv6.icmp_sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit icmpv6_sk_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		inet_ctl_sock_destroy(net-&gt;ipv6.icmp_sk[i]);</div><div class='del'>-	}</div><div class='del'>-	kfree(net-&gt;ipv6.icmp_sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations icmpv6_sk_ops = {</div><div class='del'>-	.init = icmpv6_sk_init,</div><div class='del'>-	.exit = icmpv6_sk_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init icmpv6_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = register_pernet_subsys(&amp;icmpv6_sk_ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> 	if (inet6_add_protocol(&amp;icmpv6_protocol, IPPROTO_ICMPV6) &lt; 0)</div><div class='hunk'>@@ -1018,14 +1289,12 @@ sender_reg_err:</div><div class='ctx'> 	inet6_del_protocol(&amp;icmpv6_protocol, IPPROTO_ICMPV6);</div><div class='ctx'> fail:</div><div class='ctx'> 	pr_err("Failed to register ICMP6 protocol\n");</div><div class='del'>-	unregister_pernet_subsys(&amp;icmpv6_sk_ops);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void icmpv6_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	inet6_unregister_icmp_sender(icmp6_send);</div><div class='del'>-	unregister_pernet_subsys(&amp;icmpv6_sk_ops);</div><div class='ctx'> 	inet6_del_protocol(&amp;icmpv6_protocol, IPPROTO_ICMPV6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1098,6 +1367,10 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)</div><div class='ctx'> EXPORT_SYMBOL(icmpv6_err_convert);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='add'>+</div><div class='add'>+static u32 icmpv6_errors_extension_mask_all =</div><div class='add'>+	GENMASK_U8(ICMP_ERR_EXT_COUNT - 1, 0);</div><div class='add'>+</div><div class='ctx'> static struct ctl_table ipv6_icmp_table_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ratelimit",</div><div class='hunk'>@@ -1109,11 +1382,49 @@ static struct ctl_table ipv6_icmp_table_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "echo_ignore_all",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.icmpv6_echo_ignore_all,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler = proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "echo_ignore_multicast",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.icmpv6_echo_ignore_multicast,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler = proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "echo_ignore_anycast",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.icmpv6_echo_ignore_anycast,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler = proc_dointvec,</div><div class='add'>+		.proc_handler = proc_dou8vec_minmax,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ratemask",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.icmpv6_ratemask_ptr,</div><div class='add'>+		.maxlen		= ICMPV6_MSG_MAX + 1,</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler = proc_do_large_bitmap,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "error_anycast_as_unicast",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.icmpv6_error_anycast_as_unicast,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "errors_extension_mask",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.icmpv6_errors_extension_mask,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;icmpv6_errors_extension_mask_all,</div><div class='ctx'> 	},</div><div class='del'>-	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)</div><div class='hunk'>@@ -1127,7 +1438,17 @@ struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)</div><div class='ctx'> 	if (table) {</div><div class='ctx'> 		table[0].data = &amp;net-&gt;ipv6.sysctl.icmpv6_time;</div><div class='ctx'> 		table[1].data = &amp;net-&gt;ipv6.sysctl.icmpv6_echo_ignore_all;</div><div class='add'>+		table[2].data = &amp;net-&gt;ipv6.sysctl.icmpv6_echo_ignore_multicast;</div><div class='add'>+		table[3].data = &amp;net-&gt;ipv6.sysctl.icmpv6_echo_ignore_anycast;</div><div class='add'>+		table[4].data = &amp;net-&gt;ipv6.sysctl.icmpv6_ratemask_ptr;</div><div class='add'>+		table[5].data = &amp;net-&gt;ipv6.sysctl.icmpv6_error_anycast_as_unicast;</div><div class='add'>+		table[6].data = &amp;net-&gt;ipv6.sysctl.icmpv6_errors_extension_mask;</div><div class='ctx'> 	}</div><div class='ctx'> 	return table;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+size_t ipv6_icmp_sysctl_table_size(void)</div><div class='add'>+{</div><div class='add'>+	return ARRAY_SIZE(ipv6_icmp_table_template);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/ipv6/ila/Makefile b/net/ipv6/ila/Makefile<br/>index b7739aba6e68..1bc88ed7edc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ILA module</div><div class='ctx'> #</div><div class='head'>diff --git a/net/ipv6/ila/ila.h b/net/ipv6/ila/ila.h<br/>index 1f747bcbec29..85b92917849b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/ila.h</a></div><div class='hunk'>@@ -1,11 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015 Tom Herbert &lt;tom@herbertland.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of</div><div class='del'>- * the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ILA_H</div><div class='hunk'>@@ -73,11 +68,6 @@ static inline struct ila_addr *ila_a2i(struct in6_addr *addr)</div><div class='ctx'> 	return (struct ila_addr *)addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ila_addr_is_ila(struct ila_addr *iaddr)</div><div class='del'>-{</div><div class='del'>-	return (iaddr-&gt;ident.type != ILA_ATYPE_IID);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct ila_params {</div><div class='ctx'> 	struct ila_locator locator;</div><div class='ctx'> 	struct ila_locator locator_match;</div><div class='hunk'>@@ -118,6 +108,7 @@ int ila_lwt_init(void);</div><div class='ctx'> void ila_lwt_fini(void);</div><div class='ctx'> </div><div class='ctx'> int ila_xlat_init_net(struct net *net);</div><div class='add'>+void ila_xlat_pre_exit_net(struct net *net);</div><div class='ctx'> void ila_xlat_exit_net(struct net *net);</div><div class='ctx'> </div><div class='ctx'> int ila_xlat_nl_cmd_add_mapping(struct sk_buff *skb, struct genl_info *info);</div><div class='head'>diff --git a/net/ipv6/ila/ila_common.c b/net/ipv6/ila/ila_common.c<br/>index 95e9146918cc..b8d43ed4689d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_common.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/ila_common.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 			diff = get_csum_diff(ip6h, p);</div><div class='ctx'> 			inet_proto_csum_replace_by_diff(&amp;th-&gt;check, skb,</div><div class='del'>-							diff, true);</div><div class='add'>+							diff, true, true);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NEXTHDR_UDP:</div><div class='hunk'>@@ -97,7 +97,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb,</div><div class='ctx'> 			if (uh-&gt;check || skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='ctx'> 				diff = get_csum_diff(ip6h, p);</div><div class='ctx'> 				inet_proto_csum_replace_by_diff(&amp;uh-&gt;check, skb,</div><div class='del'>-								diff, true);</div><div class='add'>+								diff, true, true);</div><div class='ctx'> 				if (!uh-&gt;check)</div><div class='ctx'> 					uh-&gt;check = CSUM_MANGLED_0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -111,7 +111,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 			diff = get_csum_diff(ip6h, p);</div><div class='ctx'> 			inet_proto_csum_replace_by_diff(&amp;ih-&gt;icmp6_cksum, skb,</div><div class='del'>-							diff, true);</div><div class='add'>+							diff, true, true);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c<br/>index 3d56a2fb6f86..7bb9edc5c28c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_lwt.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_lwt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_lwt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/ila_lwt.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ static inline struct ila_params *ila_params_lwtunnel(</div><div class='ctx'> static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)orig_dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(orig_dst);</div><div class='ctx'> 	struct ila_lwt *ilwt = ila_lwt_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='hunk'>@@ -58,7 +58,9 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		return orig_dst-&gt;lwtstate-&gt;orig_output(net, sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	local_bh_disable();</div><div class='ctx'> 	dst = dst_cache_get(&amp;ilwt-&gt;dst_cache);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> 	if (unlikely(!dst)) {</div><div class='ctx'> 		struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='ctx'> 		struct flowi6 fl6;</div><div class='hunk'>@@ -68,9 +70,9 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-		fl6.flowi6_oif = orig_dst-&gt;dev-&gt;ifindex;</div><div class='add'>+		fl6.flowi6_oif = dst_dev(orig_dst)-&gt;ifindex;</div><div class='ctx'> 		fl6.flowi6_iif = LOOPBACK_IFINDEX;</div><div class='del'>-		fl6.daddr = *rt6_nexthop((struct rt6_info *)orig_dst,</div><div class='add'>+		fl6.daddr = *rt6_nexthop(dst_rt6_info(orig_dst),</div><div class='ctx'> 					 &amp;ip6h-&gt;daddr);</div><div class='ctx'> </div><div class='ctx'> 		dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='hunk'>@@ -86,10 +88,15 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ilwt-&gt;connected)</div><div class='add'>+		/* cache only if we don't create a dst reference loop */</div><div class='add'>+		if (ilwt-&gt;connected &amp;&amp; orig_dst-&gt;lwtstate != dst-&gt;lwtstate) {</div><div class='add'>+			local_bh_disable();</div><div class='ctx'> 			dst_cache_set_ip6(&amp;ilwt-&gt;dst_cache, dst, &amp;fl6.saddr);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_dst_drop(skb);</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='ctx'> 	return dst_output(net, sk, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +132,7 @@ static const struct nla_policy ila_nl_policy[ILA_ATTR_MAX + 1] = {</div><div class='ctx'> 	[ILA_ATTR_HOOK_TYPE] = { .type = NLA_U8, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ila_build_state(struct nlattr *nla,</div><div class='add'>+static int ila_build_state(struct net *net, struct nlattr *nla,</div><div class='ctx'> 			   unsigned int family, const void *cfg,</div><div class='ctx'> 			   struct lwtunnel_state **ts,</div><div class='ctx'> 			   struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -146,7 +153,8 @@ static int ila_build_state(struct nlattr *nla,</div><div class='ctx'> 	if (family != AF_INET6)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(tb, ILA_ATTR_MAX, nla, ila_nl_policy, extack);</div><div class='add'>+	ret = nla_parse_nested_deprecated(tb, ILA_ATTR_MAX, nla,</div><div class='add'>+					  ila_nl_policy, extack);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/ila/ila_main.c b/net/ipv6/ila/ila_main.c<br/>index 18fac76b9520..976c78efbae1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_main.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/ila_main.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='del'>-#include &lt;net/ila.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/genetlink.h&gt;</div><div class='ctx'> #include "ila.h"</div><div class='hunk'>@@ -16,29 +15,29 @@ static const struct nla_policy ila_nl_policy[ILA_ATTR_MAX + 1] = {</div><div class='ctx'> static const struct genl_ops ila_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = ILA_CMD_ADD,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = ila_xlat_nl_cmd_add_mapping,</div><div class='del'>-		.policy = ila_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = ILA_CMD_DEL,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = ila_xlat_nl_cmd_del_mapping,</div><div class='del'>-		.policy = ila_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = ILA_CMD_FLUSH,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = ila_xlat_nl_cmd_flush,</div><div class='del'>-		.policy = ila_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = ILA_CMD_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = ila_xlat_nl_cmd_get_mapping,</div><div class='ctx'> 		.start = ila_xlat_nl_dump_start,</div><div class='ctx'> 		.dumpit = ila_xlat_nl_dump,</div><div class='ctx'> 		.done = ila_xlat_nl_dump_done,</div><div class='del'>-		.policy = ila_nl_policy,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -49,11 +48,13 @@ struct genl_family ila_nl_family __ro_after_init = {</div><div class='ctx'> 	.name		= ILA_GENL_NAME,</div><div class='ctx'> 	.version	= ILA_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= ILA_ATTR_MAX,</div><div class='add'>+	.policy = ila_nl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.parallel_ops	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.ops		= ila_nl_ops,</div><div class='ctx'> 	.n_ops		= ARRAY_SIZE(ila_nl_ops),</div><div class='add'>+	.resv_start_op	= ILA_CMD_FLUSH + 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __net_init int ila_init_net(struct net *net)</div><div class='hunk'>@@ -70,6 +71,11 @@ ila_xlat_init_fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __net_exit void ila_pre_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ila_xlat_pre_exit_net(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __net_exit void ila_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	ila_xlat_exit_net(net);</div><div class='hunk'>@@ -77,6 +83,7 @@ static __net_exit void ila_exit_net(struct net *net)</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ila_net_ops = {</div><div class='ctx'> 	.init = ila_init_net,</div><div class='add'>+	.pre_exit = ila_pre_exit_net,</div><div class='ctx'> 	.exit = ila_exit_net,</div><div class='ctx'> 	.id   = &amp;ila_net_id,</div><div class='ctx'> 	.size = sizeof(struct ila_net),</div><div class='hunk'>@@ -119,3 +126,4 @@ module_init(ila_init);</div><div class='ctx'> module_exit(ila_fini);</div><div class='ctx'> MODULE_AUTHOR("Tom Herbert &lt;tom@herbertland.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IPv6: Identifier Locator Addressing (ILA)");</div><div class='head'>diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c<br/>index 17c455ff69ff..1d41b2ab4884 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_xlat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ila/ila_xlat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ila/ila_xlat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ila/ila_xlat.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='del'>-#include &lt;net/ila.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/genetlink.h&gt;</div><div class='ctx'> #include "ila.h"</div><div class='hunk'>@@ -106,16 +105,11 @@ static int parse_nl_config(struct genl_info *info,</div><div class='ctx'> 		xp-&gt;ip.locator_match.v64 = (__force __be64)nla_get_u64(</div><div class='ctx'> 			info-&gt;attrs[ILA_ATTR_LOCATOR_MATCH]);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[ILA_ATTR_CSUM_MODE])</div><div class='del'>-		xp-&gt;ip.csum_mode = nla_get_u8(info-&gt;attrs[ILA_ATTR_CSUM_MODE]);</div><div class='del'>-	else</div><div class='del'>-		xp-&gt;ip.csum_mode = ILA_CSUM_NO_ACTION;</div><div class='add'>+	xp-&gt;ip.csum_mode = nla_get_u8_default(info-&gt;attrs[ILA_ATTR_CSUM_MODE],</div><div class='add'>+					      ILA_CSUM_NO_ACTION);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[ILA_ATTR_IDENT_TYPE])</div><div class='del'>-		xp-&gt;ip.ident_type = nla_get_u8(</div><div class='del'>-				info-&gt;attrs[ILA_ATTR_IDENT_TYPE]);</div><div class='del'>-	else</div><div class='del'>-		xp-&gt;ip.ident_type = ILA_ATYPE_USE_FORMAT;</div><div class='add'>+	xp-&gt;ip.ident_type = nla_get_u8_default(info-&gt;attrs[ILA_ATTR_IDENT_TYPE],</div><div class='add'>+					       ILA_ATYPE_USE_FORMAT);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;attrs[ILA_ATTR_IFINDEX])</div><div class='ctx'> 		xp-&gt;ifindex = nla_get_s32(info-&gt;attrs[ILA_ATTR_IFINDEX]);</div><div class='hunk'>@@ -201,6 +195,8 @@ static const struct nf_hook_ops ila_nf_hook_ops[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static DEFINE_MUTEX(ila_mutex);</div><div class='add'>+</div><div class='ctx'> static int ila_add_mapping(struct net *net, struct ila_xlat_params *xp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ila_net *ilan = net_generic(net, ila_net_id);</div><div class='hunk'>@@ -208,16 +204,20 @@ static int ila_add_mapping(struct net *net, struct ila_xlat_params *xp)</div><div class='ctx'> 	spinlock_t *lock = ila_get_lock(ilan, xp-&gt;ip.locator_match);</div><div class='ctx'> 	int err = 0, order;</div><div class='ctx'> </div><div class='del'>-	if (!ilan-&gt;xlat.hooks_registered) {</div><div class='add'>+	if (!READ_ONCE(ilan-&gt;xlat.hooks_registered)) {</div><div class='ctx'> 		/* We defer registering net hooks in the namespace until the</div><div class='ctx'> 		 * first mapping is added.</div><div class='ctx'> 		 */</div><div class='del'>-		err = nf_register_net_hooks(net, ila_nf_hook_ops,</div><div class='del'>-					    ARRAY_SIZE(ila_nf_hook_ops));</div><div class='add'>+		mutex_lock(&amp;ila_mutex);</div><div class='add'>+		if (!ilan-&gt;xlat.hooks_registered) {</div><div class='add'>+			err = nf_register_net_hooks(net, ila_nf_hook_ops,</div><div class='add'>+						ARRAY_SIZE(ila_nf_hook_ops));</div><div class='add'>+			if (!err)</div><div class='add'>+				WRITE_ONCE(ilan-&gt;xlat.hooks_registered, true);</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;ila_mutex);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		ilan-&gt;xlat.hooks_registered = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ila = kzalloc(sizeof(*ila), GFP_KERNEL);</div><div class='hunk'>@@ -383,12 +383,9 @@ int ila_xlat_nl_cmd_flush(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	struct rhashtable_iter iter;</div><div class='ctx'> 	struct ila_map *ila;</div><div class='ctx'> 	spinlock_t *lock;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = rhashtable_walk_init(&amp;ilan-&gt;xlat.rhash_table, &amp;iter, GFP_KERNEL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto done;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	rhashtable_walk_enter(&amp;ilan-&gt;xlat.rhash_table, &amp;iter);</div><div class='ctx'> 	rhashtable_walk_start(&amp;iter);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -420,6 +417,7 @@ int ila_xlat_nl_cmd_flush(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	rhashtable_walk_stop(&amp;iter);</div><div class='add'>+	rhashtable_walk_exit(&amp;iter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,6 +477,7 @@ int ila_xlat_nl_cmd_get_mapping(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='add'>+	ret = -ESRCH;</div><div class='ctx'> 	ila = ila_lookup_by_params(&amp;xp, ilan);</div><div class='ctx'> 	if (ila) {</div><div class='ctx'> 		ret = ila_dump_info(ila,</div><div class='hunk'>@@ -509,23 +508,17 @@ int ila_xlat_nl_dump_start(struct netlink_callback *cb)</div><div class='ctx'> 	struct net *net = sock_net(cb-&gt;skb-&gt;sk);</div><div class='ctx'> 	struct ila_net *ilan = net_generic(net, ila_net_id);</div><div class='ctx'> 	struct ila_dump_iter *iter;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iter = kmalloc(sizeof(*iter), GFP_KERNEL);</div><div class='ctx'> 	if (!iter)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = rhashtable_walk_init(&amp;ilan-&gt;xlat.rhash_table, &amp;iter-&gt;rhiter,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(iter);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	rhashtable_walk_enter(&amp;ilan-&gt;xlat.rhash_table, &amp;iter-&gt;rhiter);</div><div class='ctx'> </div><div class='ctx'> 	iter-&gt;skip = 0;</div><div class='ctx'> 	cb-&gt;args[0] = (long)iter;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ila_xlat_nl_dump_done(struct netlink_callback *cb)</div><div class='hunk'>@@ -609,8 +602,6 @@ out_ret:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define ILA_HASH_TABLE_SIZE 1024</div><div class='del'>-</div><div class='ctx'> int ila_xlat_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ila_net *ilan = net_generic(net, ila_net_id);</div><div class='hunk'>@@ -620,11 +611,24 @@ int ila_xlat_init_net(struct net *net)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	rhashtable_init(&amp;ilan-&gt;xlat.rhash_table, &amp;rht_params);</div><div class='add'>+	err = rhashtable_init(&amp;ilan-&gt;xlat.rhash_table, &amp;rht_params);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_bucket_spinlocks(ilan-&gt;xlat.locks);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ila_xlat_pre_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct ila_net *ilan = net_generic(net, ila_net_id);</div><div class='add'>+</div><div class='add'>+	if (ilan-&gt;xlat.hooks_registered)</div><div class='add'>+		nf_unregister_net_hooks(net, ila_nf_hook_ops,</div><div class='add'>+					ARRAY_SIZE(ila_nf_hook_ops));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ila_xlat_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ila_net *ilan = net_generic(net, ila_net_id);</div><div class='hunk'>@@ -632,10 +636,6 @@ void ila_xlat_exit_net(struct net *net)</div><div class='ctx'> 	rhashtable_free_and_destroy(&amp;ilan-&gt;xlat.rhash_table, ila_free_cb, NULL);</div><div class='ctx'> </div><div class='ctx'> 	free_bucket_spinlocks(ilan-&gt;xlat.locks);</div><div class='del'>-</div><div class='del'>-	if (ilan-&gt;xlat.hooks_registered)</div><div class='del'>-		nf_unregister_net_hooks(net, ila_nf_hook_ops,</div><div class='del'>-					ARRAY_SIZE(ila_nf_hook_ops));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ila_xlat_addr(struct sk_buff *skb, bool sir2ila)</div><div class='head'>diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c<br/>index 9a31d13bf180..ea5cf3fdfdd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/inet6_connection_sock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/inet6_connection_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/inet6_connection_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/inet6_connection_sock.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET        An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *             operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *             Support for INET6 connection oriented protocols.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:    See the TCPv6 sources</div><div class='del'>- *</div><div class='del'>- *             This program is free software; you can redistribute it and/or</div><div class='del'>- *             modify it under the terms of the GNU General Public License</div><div class='del'>- *             as published by the Free Software Foundation; either version</div><div class='del'>- *             2 of the License, or(at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -49,30 +45,15 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk,</div><div class='ctx'> 	fl6-&gt;flowi6_mark = ireq-&gt;ir_mark;</div><div class='ctx'> 	fl6-&gt;fl6_dport = ireq-&gt;ir_rmt_port;</div><div class='ctx'> 	fl6-&gt;fl6_sport = htons(ireq-&gt;ir_num);</div><div class='del'>-	fl6-&gt;flowi6_uid = sk-&gt;sk_uid;</div><div class='del'>-	security_req_classify_flow(req, flowi6_to_flowi(fl6));</div><div class='add'>+	fl6-&gt;flowi6_uid = sk_uid(sk);</div><div class='add'>+	security_req_classify_flow(req, flowi6_to_flowi_common(fl6));</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, fl6, final_p);</div><div class='add'>+	dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inet6_csk_route_req);</div><div class='del'>-</div><div class='del'>-void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) uaddr;</div><div class='del'>-</div><div class='del'>-	sin6-&gt;sin6_family = AF_INET6;</div><div class='del'>-	sin6-&gt;sin6_addr = sk-&gt;sk_v6_daddr;</div><div class='del'>-	sin6-&gt;sin6_port	= inet_sk(sk)-&gt;inet_dport;</div><div class='del'>-	/* We do not store received flowlabel for TCP */</div><div class='del'>-	sin6-&gt;sin6_flowinfo = 0;</div><div class='del'>-	sin6-&gt;sin6_scope_id = ipv6_iface_scope_id(&amp;sin6-&gt;sin6_addr,</div><div class='del'>-						  sk-&gt;sk_bound_dev_if);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr);</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)</div><div class='hunk'>@@ -98,8 +79,8 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk,</div><div class='ctx'> 	fl6-&gt;flowi6_mark = sk-&gt;sk_mark;</div><div class='ctx'> 	fl6-&gt;fl6_sport = inet-&gt;inet_sport;</div><div class='ctx'> 	fl6-&gt;fl6_dport = inet-&gt;inet_dport;</div><div class='del'>-	fl6-&gt;flowi6_uid = sk-&gt;sk_uid;</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(fl6));</div><div class='add'>+	fl6-&gt;flowi6_uid = sk_uid(sk);</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6));</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	final_p = fl6_update_dst(fl6, rcu_dereference(np-&gt;opt), &amp;final);</div><div class='hunk'>@@ -107,10 +88,10 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	dst = __inet6_csk_dst_check(sk, np-&gt;dst_cookie);</div><div class='ctx'> 	if (!dst) {</div><div class='del'>-		dst = ip6_dst_lookup_flow(sk, fl6, final_p);</div><div class='add'>+		dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR(dst))</div><div class='del'>-			ip6_dst_store(sk, dst, NULL, NULL);</div><div class='add'>+			ip6_dst_store(sk, dst, false, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='hunk'>@@ -124,7 +105,7 @@ int inet6_csk_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl_unused</div><div class='ctx'> </div><div class='ctx'> 	dst = inet6_csk_route_socket(sk, &amp;fl6);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='del'>-		sk-&gt;sk_err_soft = -PTR_ERR(dst);</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, -PTR_ERR(dst));</div><div class='ctx'> 		sk-&gt;sk_route_caps = 0;</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return PTR_ERR(dst);</div><div class='hunk'>@@ -137,7 +118,7 @@ int inet6_csk_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl_unused</div><div class='ctx'> 	fl6.daddr = sk-&gt;sk_v6_daddr;</div><div class='ctx'> </div><div class='ctx'> 	res = ip6_xmit(sk, skb, &amp;fl6, sk-&gt;sk_mark, rcu_dereference(np-&gt;opt),</div><div class='del'>-		       np-&gt;tclass);</div><div class='add'>+		       np-&gt;tclass, READ_ONCE(sk-&gt;sk_priority));</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -150,9 +131,8 @@ struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	dst-&gt;ops-&gt;update_pmtu(dst, sk, NULL, mtu);</div><div class='add'>+	dst-&gt;ops-&gt;update_pmtu(dst, sk, NULL, mtu, true);</div><div class='ctx'> </div><div class='ctx'> 	dst = inet6_csk_route_socket(sk, &amp;fl6);</div><div class='ctx'> 	return IS_ERR(dst) ? NULL : dst;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);</div><div class='head'>diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c<br/>index 3d7c7460a0c5..5e1da088d8e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/inet6_hashtables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/inet6_hashtables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/inet6_hashtables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/inet6_hashtables.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the BSD Socket</div><div class='hunk'>@@ -7,42 +8,37 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Lotsa people, from code originally in tcp, generalised here</div><div class='ctx'>  *		by Arnaldo Carvalho de Melo &lt;acme@mandriva.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> #include &lt;net/inet_connection_sock.h&gt;</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/inet6_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> u32 inet6_ehashfn(const struct net *net,</div><div class='ctx'> 		  const struct in6_addr *laddr, const u16 lport,</div><div class='ctx'> 		  const struct in6_addr *faddr, const __be16 fport)</div><div class='ctx'> {</div><div class='del'>-	static u32 inet6_ehash_secret __read_mostly;</div><div class='del'>-	static u32 ipv6_hash_secret __read_mostly;</div><div class='del'>-</div><div class='ctx'> 	u32 lhash, fhash;</div><div class='ctx'> </div><div class='ctx'> 	net_get_random_once(&amp;inet6_ehash_secret, sizeof(inet6_ehash_secret));</div><div class='del'>-	net_get_random_once(&amp;ipv6_hash_secret, sizeof(ipv6_hash_secret));</div><div class='add'>+	net_get_random_once(&amp;tcp_ipv6_hash_secret, sizeof(tcp_ipv6_hash_secret));</div><div class='ctx'> </div><div class='ctx'> 	lhash = (__force u32)laddr-&gt;s6_addr32[3];</div><div class='del'>-	fhash = __ipv6_addr_jhash(faddr, ipv6_hash_secret);</div><div class='add'>+	fhash = __ipv6_addr_jhash(faddr, tcp_ipv6_hash_secret);</div><div class='ctx'> </div><div class='del'>-	return __inet6_ehashfn(lhash, lport, fhash, fport,</div><div class='del'>-			       inet6_ehash_secret + net_hash_mix(net));</div><div class='add'>+	return lport + __inet6_ehashfn(lhash, 0, fhash, fport,</div><div class='add'>+				       inet6_ehash_secret + net_hash_mix(net));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_ehashfn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so</div><div class='hunk'>@@ -50,35 +46,34 @@ u32 inet6_ehashfn(const struct net *net,</div><div class='ctx'>  *</div><div class='ctx'>  * The sockhash lock must be held as a reader here.</div><div class='ctx'>  */</div><div class='del'>-struct sock *__inet6_lookup_established(struct net *net,</div><div class='del'>-					struct inet_hashinfo *hashinfo,</div><div class='del'>-					   const struct in6_addr *saddr,</div><div class='del'>-					   const __be16 sport,</div><div class='del'>-					   const struct in6_addr *daddr,</div><div class='del'>-					   const u16 hnum,</div><div class='del'>-					   const int dif, const int sdif)</div><div class='add'>+struct sock *__inet6_lookup_established(const struct net *net,</div><div class='add'>+					const struct in6_addr *saddr,</div><div class='add'>+					const __be16 sport,</div><div class='add'>+					const struct in6_addr *daddr,</div><div class='add'>+					const u16 hnum,</div><div class='add'>+					const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk;</div><div class='del'>-	const struct hlist_nulls_node *node;</div><div class='ctx'> 	const __portpair ports = INET_COMBINED_PORTS(sport, hnum);</div><div class='del'>-	/* Optimize here for direct hit, only listening connections can</div><div class='del'>-	 * have wildcards anyways.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int hash = inet6_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='del'>-	unsigned int slot = hash &amp; hashinfo-&gt;ehash_mask;</div><div class='del'>-	struct inet_ehash_bucket *head = &amp;hashinfo-&gt;ehash[slot];</div><div class='del'>-</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct inet_ehash_bucket *head;</div><div class='add'>+	struct inet_hashinfo *hashinfo;</div><div class='add'>+	unsigned int hash, slot;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='add'>+	hashinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='add'>+	hash = inet6_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='add'>+	slot = hash &amp; hashinfo-&gt;ehash_mask;</div><div class='add'>+	head = &amp;hashinfo-&gt;ehash[slot];</div><div class='ctx'> begin:</div><div class='ctx'> 	sk_nulls_for_each_rcu(sk, node, &amp;head-&gt;chain) {</div><div class='ctx'> 		if (sk-&gt;sk_hash != hash)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!INET6_MATCH(sk, net, saddr, daddr, ports, dif, sdif))</div><div class='add'>+		if (!inet6_match(net, sk, saddr, daddr, ports, dif, sdif))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (unlikely(!refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(!INET6_MATCH(sk, net, saddr, daddr, ports, dif, sdif))) {</div><div class='add'>+		if (unlikely(!inet6_match(net, sk, saddr, daddr, ports, dif, sdif))) {</div><div class='ctx'> 			sock_gen_put(sk);</div><div class='ctx'> 			goto begin;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -93,64 +88,83 @@ found:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__inet6_lookup_established);</div><div class='ctx'> </div><div class='del'>-static inline int compute_score(struct sock *sk, struct net *net,</div><div class='add'>+static inline int compute_score(struct sock *sk, const struct net *net,</div><div class='ctx'> 				const unsigned short hnum,</div><div class='ctx'> 				const struct in6_addr *daddr,</div><div class='del'>-				const int dif, const int sdif, bool exact_dif)</div><div class='add'>+				const int dif, const int sdif)</div><div class='ctx'> {</div><div class='ctx'> 	int score = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (net_eq(sock_net(sk), net) &amp;&amp; inet_sk(sk)-&gt;inet_num == hnum &amp;&amp;</div><div class='ctx'> 	    sk-&gt;sk_family == PF_INET6) {</div><div class='add'>+		if (!ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, daddr))</div><div class='add'>+			return -1;</div><div class='ctx'> </div><div class='del'>-		score = 1;</div><div class='del'>-		if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr)) {</div><div class='del'>-			if (!ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, daddr))</div><div class='del'>-				return -1;</div><div class='del'>-			score++;</div><div class='del'>-		}</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if || exact_dif) {</div><div class='del'>-			bool dev_match = (sk-&gt;sk_bound_dev_if == dif ||</div><div class='del'>-					  sk-&gt;sk_bound_dev_if == sdif);</div><div class='del'>-</div><div class='del'>-			if (!dev_match)</div><div class='del'>-				return -1;</div><div class='del'>-			if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-				score++;</div><div class='del'>-		}</div><div class='del'>-		if (sk-&gt;sk_incoming_cpu == raw_smp_processor_id())</div><div class='add'>+		if (!inet_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if, dif, sdif))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		score =  sk-&gt;sk_bound_dev_if ? 2 : 1;</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_incoming_cpu) == raw_smp_processor_id())</div><div class='ctx'> 			score++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return score;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * inet6_lookup_reuseport() - execute reuseport logic on AF_INET6 socket if necessary.</div><div class='add'>+ * @net: network namespace.</div><div class='add'>+ * @sk: AF_INET6 socket, must be in TCP_LISTEN state for TCP or TCP_CLOSE for UDP.</div><div class='add'>+ * @skb: context for a potential SK_REUSEPORT program.</div><div class='add'>+ * @doff: header offset.</div><div class='add'>+ * @saddr: source address.</div><div class='add'>+ * @sport: source port.</div><div class='add'>+ * @daddr: destination address.</div><div class='add'>+ * @hnum: destination port in host byte order.</div><div class='add'>+ * @ehashfn: hash function used to generate the fallback hash.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL if sk doesn't have SO_REUSEPORT set, otherwise a pointer to</div><div class='add'>+ *         the selected sock or an error.</div><div class='add'>+ */</div><div class='add'>+struct sock *inet6_lookup_reuseport(const struct net *net, struct sock *sk,</div><div class='add'>+				    struct sk_buff *skb, int doff,</div><div class='add'>+				    const struct in6_addr *saddr,</div><div class='add'>+				    __be16 sport,</div><div class='add'>+				    const struct in6_addr *daddr,</div><div class='add'>+				    unsigned short hnum,</div><div class='add'>+				    inet6_ehashfn_t *ehashfn)</div><div class='add'>+{</div><div class='add'>+	struct sock *reuse_sk = NULL;</div><div class='add'>+	u32 phash;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_reuseport) {</div><div class='add'>+		phash = INDIRECT_CALL_INET(ehashfn, udp6_ehashfn, inet6_ehashfn,</div><div class='add'>+					   net, daddr, hnum, saddr, sport);</div><div class='add'>+		reuse_sk = reuseport_select_sock(sk, phash, skb, doff);</div><div class='add'>+	}</div><div class='add'>+	return reuse_sk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_lookup_reuseport);</div><div class='add'>+</div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-static struct sock *inet6_lhash2_lookup(struct net *net,</div><div class='add'>+static struct sock *inet6_lhash2_lookup(const struct net *net,</div><div class='ctx'> 		struct inet_listen_hashbucket *ilb2,</div><div class='ctx'> 		struct sk_buff *skb, int doff,</div><div class='ctx'> 		const struct in6_addr *saddr,</div><div class='ctx'> 		const __be16 sport, const struct in6_addr *daddr,</div><div class='ctx'> 		const unsigned short hnum, const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	bool exact_dif = inet6_exact_dif_match(net, skb);</div><div class='del'>-	struct inet_connection_sock *icsk;</div><div class='ctx'> 	struct sock *sk, *result = NULL;</div><div class='add'>+	struct hlist_nulls_node *node;</div><div class='ctx'> 	int score, hiscore = 0;</div><div class='del'>-	u32 phash = 0;</div><div class='ctx'> </div><div class='del'>-	inet_lhash2_for_each_icsk_rcu(icsk, &amp;ilb2-&gt;head) {</div><div class='del'>-		sk = (struct sock *)icsk;</div><div class='del'>-		score = compute_score(sk, net, hnum, daddr, dif, sdif,</div><div class='del'>-				      exact_dif);</div><div class='add'>+	sk_nulls_for_each_rcu(sk, node, &amp;ilb2-&gt;nulls_head) {</div><div class='add'>+		score = compute_score(sk, net, hnum, daddr, dif, sdif);</div><div class='ctx'> 		if (score &gt; hiscore) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				phash = inet6_ehashfn(net, daddr, hnum,</div><div class='del'>-						      saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, phash,</div><div class='del'>-							       skb, doff);</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='add'>+			result = inet6_lookup_reuseport(net, sk, skb, doff,</div><div class='add'>+							saddr, sport, daddr, hnum, inet6_ehashfn);</div><div class='add'>+			if (result)</div><div class='add'>+				return result;</div><div class='add'>+</div><div class='ctx'> 			result = sk;</div><div class='ctx'> 			hiscore = score;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -159,33 +173,56 @@ static struct sock *inet6_lhash2_lookup(struct net *net,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sock *inet6_lookup_listener(struct net *net,</div><div class='del'>-		struct inet_hashinfo *hashinfo,</div><div class='del'>-		struct sk_buff *skb, int doff,</div><div class='del'>-		const struct in6_addr *saddr,</div><div class='del'>-		const __be16 sport, const struct in6_addr *daddr,</div><div class='del'>-		const unsigned short hnum, const int dif, const int sdif)</div><div class='add'>+struct sock *inet6_lookup_run_sk_lookup(const struct net *net,</div><div class='add'>+					int protocol,</div><div class='add'>+					struct sk_buff *skb, int doff,</div><div class='add'>+					const struct in6_addr *saddr,</div><div class='add'>+					const __be16 sport,</div><div class='add'>+					const struct in6_addr *daddr,</div><div class='add'>+					const u16 hnum, const int dif,</div><div class='add'>+					inet6_ehashfn_t *ehashfn)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk, *reuse_sk;</div><div class='add'>+	bool no_reuseport;</div><div class='add'>+</div><div class='add'>+	no_reuseport = bpf_sk_lookup_run_v6(net, protocol, saddr, sport,</div><div class='add'>+					    daddr, hnum, dif, &amp;sk);</div><div class='add'>+	if (no_reuseport || IS_ERR_OR_NULL(sk))</div><div class='add'>+		return sk;</div><div class='add'>+</div><div class='add'>+	reuse_sk = inet6_lookup_reuseport(net, sk, skb, doff,</div><div class='add'>+					  saddr, sport, daddr, hnum, ehashfn);</div><div class='add'>+	if (reuse_sk)</div><div class='add'>+		sk = reuse_sk;</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_lookup_run_sk_lookup);</div><div class='add'>+</div><div class='add'>+struct sock *inet6_lookup_listener(const struct net *net,</div><div class='add'>+				   struct sk_buff *skb, int doff,</div><div class='add'>+				   const struct in6_addr *saddr,</div><div class='add'>+				   const __be16 sport,</div><div class='add'>+				   const struct in6_addr *daddr,</div><div class='add'>+				   const unsigned short hnum,</div><div class='add'>+				   const int dif, const int sdif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hash = inet_lhashfn(net, hnum);</div><div class='del'>-	struct inet_listen_hashbucket *ilb = &amp;hashinfo-&gt;listening_hash[hash];</div><div class='del'>-	bool exact_dif = inet6_exact_dif_match(net, skb);</div><div class='ctx'> 	struct inet_listen_hashbucket *ilb2;</div><div class='del'>-	struct sock *sk, *result = NULL;</div><div class='del'>-	int score, hiscore = 0;</div><div class='add'>+	struct inet_hashinfo *hashinfo;</div><div class='add'>+	struct sock *result = NULL;</div><div class='ctx'> 	unsigned int hash2;</div><div class='del'>-	u32 phash = 0;</div><div class='ctx'> </div><div class='del'>-	if (ilb-&gt;count &lt;= 10 || !hashinfo-&gt;lhash2)</div><div class='del'>-		goto port_lookup;</div><div class='del'>-</div><div class='del'>-	/* Too many sk in the ilb bucket (which is hashed by port alone).</div><div class='del'>-	 * Try lhash2 (which is hashed by port and addr) instead.</div><div class='del'>-	 */</div><div class='add'>+	/* Lookup redirect from BPF */</div><div class='add'>+	if (static_branch_unlikely(&amp;bpf_sk_lookup_enabled)) {</div><div class='add'>+		result = inet6_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,</div><div class='add'>+						    saddr, sport, daddr, hnum, dif,</div><div class='add'>+						    inet6_ehashfn);</div><div class='add'>+		if (result)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	hashinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	hash2 = ipv6_portaddr_hash(net, daddr, hnum);</div><div class='ctx'> 	ilb2 = inet_lhash2_bucket(hashinfo, hash2);</div><div class='del'>-	if (ilb2-&gt;count &gt; ilb-&gt;count)</div><div class='del'>-		goto port_lookup;</div><div class='ctx'> </div><div class='ctx'> 	result = inet6_lhash2_lookup(net, ilb2, skb, doff,</div><div class='ctx'> 				     saddr, sport, daddr, hnum,</div><div class='hunk'>@@ -194,41 +231,20 @@ struct sock *inet6_lookup_listener(struct net *net,</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* Lookup lhash2 with in6addr_any */</div><div class='del'>-</div><div class='ctx'> 	hash2 = ipv6_portaddr_hash(net, &amp;in6addr_any, hnum);</div><div class='ctx'> 	ilb2 = inet_lhash2_bucket(hashinfo, hash2);</div><div class='del'>-	if (ilb2-&gt;count &gt; ilb-&gt;count)</div><div class='del'>-		goto port_lookup;</div><div class='ctx'> </div><div class='ctx'> 	result = inet6_lhash2_lookup(net, ilb2, skb, doff,</div><div class='del'>-				     saddr, sport, daddr, hnum,</div><div class='add'>+				     saddr, sport, &amp;in6addr_any, hnum,</div><div class='ctx'> 				     dif, sdif);</div><div class='del'>-	goto done;</div><div class='del'>-</div><div class='del'>-port_lookup:</div><div class='del'>-	sk_for_each(sk, &amp;ilb-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, hnum, daddr, dif, sdif, exact_dif);</div><div class='del'>-		if (score &gt; hiscore) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				phash = inet6_ehashfn(net, daddr, hnum,</div><div class='del'>-						      saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, phash,</div><div class='del'>-							       skb, doff);</div><div class='del'>-				if (result)</div><div class='del'>-					goto done;</div><div class='del'>-			}</div><div class='del'>-			result = sk;</div><div class='del'>-			hiscore = score;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> done:</div><div class='del'>-	if (unlikely(IS_ERR(result)))</div><div class='add'>+	if (IS_ERR(result))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inet6_lookup_listener);</div><div class='ctx'> </div><div class='del'>-struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,</div><div class='add'>+struct sock *inet6_lookup(const struct net *net,</div><div class='ctx'> 			  struct sk_buff *skb, int doff,</div><div class='ctx'> 			  const struct in6_addr *saddr, const __be16 sport,</div><div class='ctx'> 			  const struct in6_addr *daddr, const __be16 dport,</div><div class='hunk'>@@ -237,7 +253,7 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	bool refcounted;</div><div class='ctx'> </div><div class='del'>-	sk = __inet6_lookup(net, hashinfo, skb, doff, saddr, sport, daddr,</div><div class='add'>+	sk = __inet6_lookup(net, skb, doff, saddr, sport, daddr,</div><div class='ctx'> 			    ntohs(dport), dif, 0, &amp;refcounted);</div><div class='ctx'> 	if (sk &amp;&amp; !refcounted &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='ctx'> 		sk = NULL;</div><div class='hunk'>@@ -247,7 +263,9 @@ EXPORT_SYMBOL_GPL(inet6_lookup);</div><div class='ctx'> </div><div class='ctx'> static int __inet6_check_established(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 				     struct sock *sk, const __u16 lport,</div><div class='del'>-				     struct inet_timewait_sock **twp)</div><div class='add'>+				     struct inet_timewait_sock **twp,</div><div class='add'>+				     bool rcu_lookup,</div><div class='add'>+				     u32 hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_hashinfo *hinfo = death_row-&gt;hashinfo;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='hunk'>@@ -257,25 +275,37 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	const int sdif = l3mdev_master_ifindex_by_index(net, dif);</div><div class='ctx'> 	const __portpair ports = INET_COMBINED_PORTS(inet-&gt;inet_dport, lport);</div><div class='del'>-	const unsigned int hash = inet6_ehashfn(net, daddr, lport, saddr,</div><div class='del'>-						inet-&gt;inet_dport);</div><div class='ctx'> 	struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);</div><div class='del'>-	spinlock_t *lock = inet_ehash_lockp(hinfo, hash);</div><div class='del'>-	struct sock *sk2;</div><div class='del'>-	const struct hlist_nulls_node *node;</div><div class='ctx'> 	struct inet_timewait_sock *tw = NULL;</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct sock *sk2;</div><div class='add'>+	spinlock_t *lock;</div><div class='add'>+</div><div class='add'>+	if (rcu_lookup) {</div><div class='add'>+		sk_nulls_for_each(sk2, node, &amp;head-&gt;chain) {</div><div class='add'>+			if (sk2-&gt;sk_hash != hash ||</div><div class='add'>+			    !inet6_match(net, sk2, saddr, daddr,</div><div class='add'>+					 ports, dif, sdif))</div><div class='add'>+				continue;</div><div class='add'>+			if (sk2-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+				break;</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	lock = inet_ehash_lockp(hinfo, hash);</div><div class='ctx'> 	spin_lock(lock);</div><div class='ctx'> </div><div class='ctx'> 	sk_nulls_for_each(sk2, node, &amp;head-&gt;chain) {</div><div class='ctx'> 		if (sk2-&gt;sk_hash != hash)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (likely(INET6_MATCH(sk2, net, saddr, daddr, ports,</div><div class='add'>+		if (likely(inet6_match(net, sk2, saddr, daddr, ports,</div><div class='ctx'> 				       dif, sdif))) {</div><div class='ctx'> 			if (sk2-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='ctx'> 				tw = inet_twsk(sk2);</div><div class='del'>-				if (twsk_unique(sk, sk2, twp))</div><div class='add'>+				if (tcp_twsk_unique(sk, sk2, twp))</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 			goto not_unique;</div><div class='hunk'>@@ -310,7 +340,7 @@ not_unique:</div><div class='ctx'> 	return -EADDRNOTAVAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 inet6_sk_port_offset(const struct sock *sk)</div><div class='add'>+static u64 inet6_sk_port_offset(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -322,25 +352,19 @@ static u32 inet6_sk_port_offset(const struct sock *sk)</div><div class='ctx'> int inet6_hash_connect(struct inet_timewait_death_row *death_row,</div><div class='ctx'> 		       struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	u32 port_offset = 0;</div><div class='add'>+	const struct in6_addr *daddr = &amp;sk-&gt;sk_v6_rcv_saddr;</div><div class='add'>+	const struct in6_addr *saddr = &amp;sk-&gt;sk_v6_daddr;</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct net *net = sock_net(sk);</div><div class='add'>+	u64 port_offset = 0;</div><div class='add'>+	u32 hash_port0;</div><div class='ctx'> </div><div class='ctx'> 	if (!inet_sk(sk)-&gt;inet_num)</div><div class='ctx'> 		port_offset = inet6_sk_port_offset(sk);</div><div class='del'>-	return __inet_hash_connect(death_row, sk, port_offset,</div><div class='del'>-				   __inet6_check_established);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(inet6_hash_connect);</div><div class='ctx'> </div><div class='del'>-int inet6_hash(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='add'>+	hash_port0 = inet6_ehashfn(net, daddr, 0, saddr, inet-&gt;inet_dport);</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		err = __inet_hash(sk, NULL);</div><div class='del'>-		local_bh_enable();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return __inet_hash_connect(death_row, sk, port_offset, hash_port0,</div><div class='add'>+				   __inet6_check_established);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(inet6_hash);</div><div class='add'>+EXPORT_SYMBOL_GPL(inet6_hash_connect);</div><div class='head'>diff --git a/net/ipv6/ioam6.c b/net/ipv6/ioam6.c<br/>new file mode 100644<br/>index 000000000000..9553a3200081<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ioam6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ioam6.c</a></div><div class='hunk'>@@ -0,0 +1,1040 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ *  IPv6 IOAM implementation</div><div class='add'>+ *</div><div class='add'>+ *  Author:</div><div class='add'>+ *  Justin Iurman &lt;justin.iurman@uliege.be&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/ioam6.h&gt;</div><div class='add'>+#include &lt;linux/ioam6_genl.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/ioam6.h&gt;</div><div class='add'>+#include &lt;net/sch_generic.h&gt;</div><div class='add'>+</div><div class='add'>+static void ioam6_ns_release(struct ioam6_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	kfree_rcu(ns, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioam6_sc_release(struct ioam6_schema *sc)</div><div class='add'>+{</div><div class='add'>+	kfree_rcu(sc, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioam6_free_ns(void *ptr, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_namespace *ns = (struct ioam6_namespace *)ptr;</div><div class='add'>+</div><div class='add'>+	if (ns)</div><div class='add'>+		ioam6_ns_release(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioam6_free_sc(void *ptr, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_schema *sc = (struct ioam6_schema *)ptr;</div><div class='add'>+</div><div class='add'>+	if (sc)</div><div class='add'>+		ioam6_sc_release(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_ns_cmpfn(struct rhashtable_compare_arg *arg, const void *obj)</div><div class='add'>+{</div><div class='add'>+	const struct ioam6_namespace *ns = obj;</div><div class='add'>+</div><div class='add'>+	return (ns-&gt;id != *(__be16 *)arg-&gt;key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_sc_cmpfn(struct rhashtable_compare_arg *arg, const void *obj)</div><div class='add'>+{</div><div class='add'>+	const struct ioam6_schema *sc = obj;</div><div class='add'>+</div><div class='add'>+	return (sc-&gt;id != *(u32 *)arg-&gt;key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params rht_ns_params = {</div><div class='add'>+	.key_len		= sizeof(__be16),</div><div class='add'>+	.key_offset		= offsetof(struct ioam6_namespace, id),</div><div class='add'>+	.head_offset		= offsetof(struct ioam6_namespace, head),</div><div class='add'>+	.automatic_shrinking	= true,</div><div class='add'>+	.obj_cmpfn		= ioam6_ns_cmpfn,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params rht_sc_params = {</div><div class='add'>+	.key_len		= sizeof(u32),</div><div class='add'>+	.key_offset		= offsetof(struct ioam6_schema, id),</div><div class='add'>+	.head_offset		= offsetof(struct ioam6_schema, head),</div><div class='add'>+	.automatic_shrinking	= true,</div><div class='add'>+	.obj_cmpfn		= ioam6_sc_cmpfn,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct genl_family ioam6_genl_family;</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_genl_policy_addns[] = {</div><div class='add'>+	[IOAM6_ATTR_NS_ID]	= { .type = NLA_U16 },</div><div class='add'>+	[IOAM6_ATTR_NS_DATA]	= { .type = NLA_U32 },</div><div class='add'>+	[IOAM6_ATTR_NS_DATA_WIDE] = { .type = NLA_U64 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_genl_policy_delns[] = {</div><div class='add'>+	[IOAM6_ATTR_NS_ID]	= { .type = NLA_U16 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_genl_policy_addsc[] = {</div><div class='add'>+	[IOAM6_ATTR_SC_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IOAM6_ATTR_SC_DATA]	= { .type = NLA_BINARY,</div><div class='add'>+				    .len = IOAM6_MAX_SCHEMA_DATA_LEN },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_genl_policy_delsc[] = {</div><div class='add'>+	[IOAM6_ATTR_SC_ID]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_genl_policy_ns_sc[] = {</div><div class='add'>+	[IOAM6_ATTR_NS_ID]	= { .type = NLA_U16 },</div><div class='add'>+	[IOAM6_ATTR_SC_ID]	= { .type = NLA_U32 },</div><div class='add'>+	[IOAM6_ATTR_SC_NONE]	= { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_addns(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	u64 data64;</div><div class='add'>+	u32 data32;</div><div class='add'>+	__be16 id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[IOAM6_ATTR_NS_ID])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = cpu_to_be16(nla_get_u16(info-&gt;attrs[IOAM6_ATTR_NS_ID]));</div><div class='add'>+	nsdata = ioam6_pernet(genl_info_net(info));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ns = rhashtable_lookup_fast(&amp;nsdata-&gt;namespaces, &amp;id, rht_ns_params);</div><div class='add'>+	if (ns) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ns = kzalloc(sizeof(*ns), GFP_KERNEL);</div><div class='add'>+	if (!ns) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ns-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	data32 = nla_get_u32_default(info-&gt;attrs[IOAM6_ATTR_NS_DATA],</div><div class='add'>+				     IOAM6_U32_UNAVAILABLE);</div><div class='add'>+</div><div class='add'>+	data64 = nla_get_u64_default(info-&gt;attrs[IOAM6_ATTR_NS_DATA_WIDE],</div><div class='add'>+				     IOAM6_U64_UNAVAILABLE);</div><div class='add'>+</div><div class='add'>+	ns-&gt;data = cpu_to_be32(data32);</div><div class='add'>+	ns-&gt;data_wide = cpu_to_be64(data64);</div><div class='add'>+</div><div class='add'>+	err = rhashtable_lookup_insert_fast(&amp;nsdata-&gt;namespaces, &amp;ns-&gt;head,</div><div class='add'>+					    rht_ns_params);</div><div class='add'>+	if (err)</div><div class='add'>+		kfree(ns);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nsdata-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_delns(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	__be16 id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[IOAM6_ATTR_NS_ID])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = cpu_to_be16(nla_get_u16(info-&gt;attrs[IOAM6_ATTR_NS_ID]));</div><div class='add'>+	nsdata = ioam6_pernet(genl_info_net(info));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ns = rhashtable_lookup_fast(&amp;nsdata-&gt;namespaces, &amp;id, rht_ns_params);</div><div class='add'>+	if (!ns) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc = rcu_dereference_protected(ns-&gt;schema,</div><div class='add'>+				       lockdep_is_held(&amp;nsdata-&gt;lock));</div><div class='add'>+</div><div class='add'>+	err = rhashtable_remove_fast(&amp;nsdata-&gt;namespaces, &amp;ns-&gt;head,</div><div class='add'>+				     rht_ns_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (sc)</div><div class='add'>+		rcu_assign_pointer(sc-&gt;ns, NULL);</div><div class='add'>+</div><div class='add'>+	ioam6_ns_release(ns);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nsdata-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ioam6_genl_dumpns_element(struct ioam6_namespace *ns,</div><div class='add'>+				       u32 portid,</div><div class='add'>+				       u32 seq,</div><div class='add'>+				       u32 flags,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       u8 cmd)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	u64 data64;</div><div class='add'>+	u32 data32;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, portid, seq, &amp;ioam6_genl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data32 = be32_to_cpu(ns-&gt;data);</div><div class='add'>+	data64 = be64_to_cpu(ns-&gt;data_wide);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u16(skb, IOAM6_ATTR_NS_ID, be16_to_cpu(ns-&gt;id)) ||</div><div class='add'>+	    (data32 != IOAM6_U32_UNAVAILABLE &amp;&amp;</div><div class='add'>+	     nla_put_u32(skb, IOAM6_ATTR_NS_DATA, data32)) ||</div><div class='add'>+	    (data64 != IOAM6_U64_UNAVAILABLE &amp;&amp;</div><div class='add'>+	     nla_put_u64_64bit(skb, IOAM6_ATTR_NS_DATA_WIDE,</div><div class='add'>+			       data64, IOAM6_ATTR_PAD)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sc = rcu_dereference(ns-&gt;schema);</div><div class='add'>+	if (sc &amp;&amp; nla_put_u32(skb, IOAM6_ATTR_SC_ID, sc-&gt;id)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpns_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata = ioam6_pernet(sock_net(cb-&gt;skb-&gt;sk));</div><div class='add'>+	struct rhashtable_iter *iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (!iter) {</div><div class='add'>+		iter = kmalloc(sizeof(*iter), GFP_KERNEL);</div><div class='add'>+		if (!iter)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cb-&gt;args[0] = (long)iter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rhashtable_walk_enter(&amp;nsdata-&gt;namespaces, iter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpns_done(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_iter *iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	rhashtable_walk_exit(iter);</div><div class='add'>+	kfree(iter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpns(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_iter *iter;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+	rhashtable_walk_start(iter);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		ns = rhashtable_walk_next(iter);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(ns)) {</div><div class='add'>+			if (PTR_ERR(ns) == -EAGAIN)</div><div class='add'>+				continue;</div><div class='add'>+			err = PTR_ERR(ns);</div><div class='add'>+			goto done;</div><div class='add'>+		} else if (!ns) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = __ioam6_genl_dumpns_element(ns,</div><div class='add'>+						  NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						  cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+						  NLM_F_MULTI,</div><div class='add'>+						  skb,</div><div class='add'>+						  IOAM6_CMD_DUMP_NAMESPACES);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	rhashtable_walk_stop(iter);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_addsc(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	int len, len_aligned, err;</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[IOAM6_ATTR_SC_ID] || !info-&gt;attrs[IOAM6_ATTR_SC_DATA])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = nla_get_u32(info-&gt;attrs[IOAM6_ATTR_SC_ID]);</div><div class='add'>+	nsdata = ioam6_pernet(genl_info_net(info));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	sc = rhashtable_lookup_fast(&amp;nsdata-&gt;schemas, &amp;id, rht_sc_params);</div><div class='add'>+	if (sc) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = nla_len(info-&gt;attrs[IOAM6_ATTR_SC_DATA]);</div><div class='add'>+	len_aligned = ALIGN(len, 4);</div><div class='add'>+</div><div class='add'>+	sc = kzalloc(sizeof(*sc) + len_aligned, GFP_KERNEL);</div><div class='add'>+	if (!sc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc-&gt;id = id;</div><div class='add'>+	sc-&gt;len = len_aligned;</div><div class='add'>+	sc-&gt;hdr = cpu_to_be32(sc-&gt;id | ((u8)(sc-&gt;len / 4) &lt;&lt; 24));</div><div class='add'>+	nla_memcpy(sc-&gt;data, info-&gt;attrs[IOAM6_ATTR_SC_DATA], len);</div><div class='add'>+</div><div class='add'>+	err = rhashtable_lookup_insert_fast(&amp;nsdata-&gt;schemas, &amp;sc-&gt;head,</div><div class='add'>+					    rht_sc_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_sc;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nsdata-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+free_sc:</div><div class='add'>+	kfree(sc);</div><div class='add'>+	goto out_unlock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_delsc(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[IOAM6_ATTR_SC_ID])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = nla_get_u32(info-&gt;attrs[IOAM6_ATTR_SC_ID]);</div><div class='add'>+	nsdata = ioam6_pernet(genl_info_net(info));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	sc = rhashtable_lookup_fast(&amp;nsdata-&gt;schemas, &amp;id, rht_sc_params);</div><div class='add'>+	if (!sc) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ns = rcu_dereference_protected(sc-&gt;ns, lockdep_is_held(&amp;nsdata-&gt;lock));</div><div class='add'>+</div><div class='add'>+	err = rhashtable_remove_fast(&amp;nsdata-&gt;schemas, &amp;sc-&gt;head,</div><div class='add'>+				     rht_sc_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (ns)</div><div class='add'>+		rcu_assign_pointer(ns-&gt;schema, NULL);</div><div class='add'>+</div><div class='add'>+	ioam6_sc_release(sc);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nsdata-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ioam6_genl_dumpsc_element(struct ioam6_schema *sc,</div><div class='add'>+				       u32 portid, u32 seq, u32 flags,</div><div class='add'>+				       struct sk_buff *skb, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, portid, seq, &amp;ioam6_genl_family, flags, cmd);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IOAM6_ATTR_SC_ID, sc-&gt;id) ||</div><div class='add'>+	    nla_put(skb, IOAM6_ATTR_SC_DATA, sc-&gt;len, sc-&gt;data))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ns = rcu_dereference(sc-&gt;ns);</div><div class='add'>+	if (ns &amp;&amp; nla_put_u16(skb, IOAM6_ATTR_NS_ID, be16_to_cpu(ns-&gt;id))) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpsc_start(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata = ioam6_pernet(sock_net(cb-&gt;skb-&gt;sk));</div><div class='add'>+	struct rhashtable_iter *iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (!iter) {</div><div class='add'>+		iter = kmalloc(sizeof(*iter), GFP_KERNEL);</div><div class='add'>+		if (!iter)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cb-&gt;args[0] = (long)iter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rhashtable_walk_enter(&amp;nsdata-&gt;schemas, iter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpsc_done(struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_iter *iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	rhashtable_walk_exit(iter);</div><div class='add'>+	kfree(iter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_dumpsc(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_iter *iter;</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iter = (struct rhashtable_iter *)cb-&gt;args[0];</div><div class='add'>+	rhashtable_walk_start(iter);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		sc = rhashtable_walk_next(iter);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(sc)) {</div><div class='add'>+			if (PTR_ERR(sc) == -EAGAIN)</div><div class='add'>+				continue;</div><div class='add'>+			err = PTR_ERR(sc);</div><div class='add'>+			goto done;</div><div class='add'>+		} else if (!sc) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = __ioam6_genl_dumpsc_element(sc,</div><div class='add'>+						  NETLINK_CB(cb-&gt;skb).portid,</div><div class='add'>+						  cb-&gt;nlh-&gt;nlmsg_seq,</div><div class='add'>+						  NLM_F_MULTI,</div><div class='add'>+						  skb,</div><div class='add'>+						  IOAM6_CMD_DUMP_SCHEMAS);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	rhashtable_walk_stop(iter);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_genl_ns_set_schema(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_namespace *ns, *ns_ref;</div><div class='add'>+	struct ioam6_schema *sc, *sc_ref;</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	__be16 ns_id;</div><div class='add'>+	u32 sc_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[IOAM6_ATTR_NS_ID] ||</div><div class='add'>+	    (!info-&gt;attrs[IOAM6_ATTR_SC_ID] &amp;&amp;</div><div class='add'>+	     !info-&gt;attrs[IOAM6_ATTR_SC_NONE]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ns_id = cpu_to_be16(nla_get_u16(info-&gt;attrs[IOAM6_ATTR_NS_ID]));</div><div class='add'>+	nsdata = ioam6_pernet(genl_info_net(info));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ns = rhashtable_lookup_fast(&amp;nsdata-&gt;namespaces, &amp;ns_id, rht_ns_params);</div><div class='add'>+	if (!ns) {</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[IOAM6_ATTR_SC_NONE]) {</div><div class='add'>+		sc = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		sc_id = nla_get_u32(info-&gt;attrs[IOAM6_ATTR_SC_ID]);</div><div class='add'>+		sc = rhashtable_lookup_fast(&amp;nsdata-&gt;schemas, &amp;sc_id,</div><div class='add'>+					    rht_sc_params);</div><div class='add'>+		if (!sc) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc_ref = rcu_dereference_protected(ns-&gt;schema,</div><div class='add'>+					   lockdep_is_held(&amp;nsdata-&gt;lock));</div><div class='add'>+	if (sc_ref)</div><div class='add'>+		rcu_assign_pointer(sc_ref-&gt;ns, NULL);</div><div class='add'>+	rcu_assign_pointer(ns-&gt;schema, sc);</div><div class='add'>+</div><div class='add'>+	if (sc) {</div><div class='add'>+		ns_ref = rcu_dereference_protected(sc-&gt;ns,</div><div class='add'>+						   lockdep_is_held(&amp;nsdata-&gt;lock));</div><div class='add'>+		if (ns_ref)</div><div class='add'>+			rcu_assign_pointer(ns_ref-&gt;schema, NULL);</div><div class='add'>+		rcu_assign_pointer(sc-&gt;ns, ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nsdata-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct genl_ops ioam6_genl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_ADD_NAMESPACE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit	= ioam6_genl_addns,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+		.policy	= ioam6_genl_policy_addns,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ioam6_genl_policy_addns) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_DEL_NAMESPACE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit	= ioam6_genl_delns,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+		.policy	= ioam6_genl_policy_delns,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ioam6_genl_policy_delns) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_DUMP_NAMESPACES,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.start	= ioam6_genl_dumpns_start,</div><div class='add'>+		.dumpit	= ioam6_genl_dumpns,</div><div class='add'>+		.done	= ioam6_genl_dumpns_done,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_ADD_SCHEMA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit	= ioam6_genl_addsc,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+		.policy	= ioam6_genl_policy_addsc,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ioam6_genl_policy_addsc) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_DEL_SCHEMA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit	= ioam6_genl_delsc,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+		.policy	= ioam6_genl_policy_delsc,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ioam6_genl_policy_delsc) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_DUMP_SCHEMAS,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.start	= ioam6_genl_dumpsc_start,</div><div class='add'>+		.dumpit	= ioam6_genl_dumpsc,</div><div class='add'>+		.done	= ioam6_genl_dumpsc_done,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= IOAM6_CMD_NS_SET_SCHEMA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='add'>+		.doit	= ioam6_genl_ns_set_schema,</div><div class='add'>+		.flags	= GENL_ADMIN_PERM,</div><div class='add'>+		.policy	= ioam6_genl_policy_ns_sc,</div><div class='add'>+		.maxattr = ARRAY_SIZE(ioam6_genl_policy_ns_sc) - 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOAM6_GENL_EV_GRP_OFFSET 0</div><div class='add'>+</div><div class='add'>+static const struct genl_multicast_group ioam6_mcgrps[] = {</div><div class='add'>+	[IOAM6_GENL_EV_GRP_OFFSET] = { .name = IOAM6_GENL_EV_GRP_NAME,</div><div class='add'>+				       .flags = GENL_MCAST_CAP_NET_ADMIN },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ioam6_event_put_trace(struct sk_buff *skb,</div><div class='add'>+				 struct ioam6_trace_hdr *trace,</div><div class='add'>+				 unsigned int len)</div><div class='add'>+{</div><div class='add'>+	if (nla_put_u16(skb, IOAM6_EVENT_ATTR_TRACE_NAMESPACE,</div><div class='add'>+			be16_to_cpu(trace-&gt;namespace_id)) ||</div><div class='add'>+	    nla_put_u8(skb, IOAM6_EVENT_ATTR_TRACE_NODELEN, trace-&gt;nodelen) ||</div><div class='add'>+	    nla_put_u32(skb, IOAM6_EVENT_ATTR_TRACE_TYPE,</div><div class='add'>+			be32_to_cpu(trace-&gt;type_be32)) ||</div><div class='add'>+	    nla_put(skb, IOAM6_EVENT_ATTR_TRACE_DATA,</div><div class='add'>+		    len - sizeof(struct ioam6_trace_hdr) - trace-&gt;remlen * 4,</div><div class='add'>+		    trace-&gt;data + trace-&gt;remlen * 4))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ioam6_event(enum ioam6_event_type type, struct net *net, gfp_t gfp,</div><div class='add'>+		 void *opt, unsigned int opt_len)</div><div class='add'>+{</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!genl_has_listeners(&amp;ioam6_genl_family, net,</div><div class='add'>+				IOAM6_GENL_EV_GRP_OFFSET))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nlh = genlmsg_put(skb, 0, 0, &amp;ioam6_genl_family, 0, type);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IOAM6_EVENT_UNSPEC:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+	case IOAM6_EVENT_TRACE:</div><div class='add'>+		if (ioam6_event_put_trace(skb, (struct ioam6_trace_hdr *)opt,</div><div class='add'>+					  opt_len))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, nlh);</div><div class='add'>+	genlmsg_multicast_netns(&amp;ioam6_genl_family, net, skb, 0,</div><div class='add'>+				IOAM6_GENL_EV_GRP_OFFSET, gfp);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct genl_family ioam6_genl_family __ro_after_init = {</div><div class='add'>+	.name		= IOAM6_GENL_NAME,</div><div class='add'>+	.version	= IOAM6_GENL_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.ops		= ioam6_genl_ops,</div><div class='add'>+	.n_ops		= ARRAY_SIZE(ioam6_genl_ops),</div><div class='add'>+	.resv_start_op	= IOAM6_CMD_NS_SET_SCHEMA + 1,</div><div class='add'>+	.mcgrps		= ioam6_mcgrps,</div><div class='add'>+	.n_mcgrps	= ARRAY_SIZE(ioam6_mcgrps),</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ioam6_namespace *ioam6_namespace(struct net *net, __be16 id)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata = ioam6_pernet(net);</div><div class='add'>+</div><div class='add'>+	return rhashtable_lookup_fast(&amp;nsdata-&gt;namespaces, &amp;id, rht_ns_params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ioam6_fill_trace_data(struct sk_buff *skb,</div><div class='add'>+				    struct ioam6_namespace *ns,</div><div class='add'>+				    struct ioam6_trace_hdr *trace,</div><div class='add'>+				    struct ioam6_schema *sc,</div><div class='add'>+				    u8 sclen, bool is_input)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb_dst_dev(skb);</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	ktime_t tstamp;</div><div class='add'>+	u64 raw64;</div><div class='add'>+	u32 raw32;</div><div class='add'>+	u16 raw16;</div><div class='add'>+	u8 *data;</div><div class='add'>+	u8 byte;</div><div class='add'>+</div><div class='add'>+	data = trace-&gt;data + trace-&gt;remlen * 4 - trace-&gt;nodelen * 4 - sclen * 4;</div><div class='add'>+</div><div class='add'>+	/* hop_lim and node_id */</div><div class='add'>+	if (trace-&gt;type.bit0) {</div><div class='add'>+		byte = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='add'>+		if (is_input)</div><div class='add'>+			byte--;</div><div class='add'>+</div><div class='add'>+		raw32 = dev_net(dev)-&gt;ipv6.sysctl.ioam6_id;</div><div class='add'>+</div><div class='add'>+		*(__be32 *)data = cpu_to_be32((byte &lt;&lt; 24) | raw32);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ingress_if_id and egress_if_id */</div><div class='add'>+	if (trace-&gt;type.bit1) {</div><div class='add'>+		if (!skb-&gt;dev)</div><div class='add'>+			raw16 = IOAM6_U16_UNAVAILABLE;</div><div class='add'>+		else</div><div class='add'>+			raw16 = (__force u16)READ_ONCE(__in6_dev_get(skb-&gt;dev)-&gt;cnf.ioam6_id);</div><div class='add'>+</div><div class='add'>+		*(__be16 *)data = cpu_to_be16(raw16);</div><div class='add'>+		data += sizeof(__be16);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_LOOPBACK)</div><div class='add'>+			raw16 = IOAM6_U16_UNAVAILABLE;</div><div class='add'>+		else</div><div class='add'>+			raw16 = (__force u16)READ_ONCE(__in6_dev_get(dev)-&gt;cnf.ioam6_id);</div><div class='add'>+</div><div class='add'>+		*(__be16 *)data = cpu_to_be16(raw16);</div><div class='add'>+		data += sizeof(__be16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* timestamp seconds */</div><div class='add'>+	if (trace-&gt;type.bit2) {</div><div class='add'>+		if (!skb-&gt;dev) {</div><div class='add'>+			*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		} else {</div><div class='add'>+			tstamp = skb_tstamp_cond(skb, true);</div><div class='add'>+			ts = ktime_to_timespec64(tstamp);</div><div class='add'>+</div><div class='add'>+			*(__be32 *)data = cpu_to_be32((u32)ts.tv_sec);</div><div class='add'>+		}</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* timestamp subseconds */</div><div class='add'>+	if (trace-&gt;type.bit3) {</div><div class='add'>+		if (!skb-&gt;dev) {</div><div class='add'>+			*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		} else {</div><div class='add'>+			if (!trace-&gt;type.bit2) {</div><div class='add'>+				tstamp = skb_tstamp_cond(skb, true);</div><div class='add'>+				ts = ktime_to_timespec64(tstamp);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			*(__be32 *)data = cpu_to_be32((u32)(ts.tv_nsec / NSEC_PER_USEC));</div><div class='add'>+		}</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* transit delay */</div><div class='add'>+	if (trace-&gt;type.bit4) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* namespace data */</div><div class='add'>+	if (trace-&gt;type.bit5) {</div><div class='add'>+		*(__be32 *)data = ns-&gt;data;</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* queue depth */</div><div class='add'>+	if (trace-&gt;type.bit6) {</div><div class='add'>+		struct netdev_queue *queue;</div><div class='add'>+		struct Qdisc *qdisc;</div><div class='add'>+		__u32 qlen, backlog;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='add'>+			*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		} else {</div><div class='add'>+			queue = skb_get_tx_queue(dev, skb);</div><div class='add'>+			qdisc = rcu_dereference(queue-&gt;qdisc);</div><div class='add'>+			qdisc_qstats_qlen_backlog(qdisc, &amp;qlen, &amp;backlog);</div><div class='add'>+</div><div class='add'>+			*(__be32 *)data = cpu_to_be32(backlog);</div><div class='add'>+		}</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* checksum complement */</div><div class='add'>+	if (trace-&gt;type.bit7) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hop_lim and node_id (wide) */</div><div class='add'>+	if (trace-&gt;type.bit8) {</div><div class='add'>+		byte = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='add'>+		if (is_input)</div><div class='add'>+			byte--;</div><div class='add'>+</div><div class='add'>+		raw64 = dev_net(dev)-&gt;ipv6.sysctl.ioam6_id_wide;</div><div class='add'>+</div><div class='add'>+		*(__be64 *)data = cpu_to_be64(((u64)byte &lt;&lt; 56) | raw64);</div><div class='add'>+		data += sizeof(__be64);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ingress_if_id and egress_if_id (wide) */</div><div class='add'>+	if (trace-&gt;type.bit9) {</div><div class='add'>+		if (!skb-&gt;dev)</div><div class='add'>+			raw32 = IOAM6_U32_UNAVAILABLE;</div><div class='add'>+		else</div><div class='add'>+			raw32 = READ_ONCE(__in6_dev_get(skb-&gt;dev)-&gt;cnf.ioam6_id_wide);</div><div class='add'>+</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(raw32);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_LOOPBACK)</div><div class='add'>+			raw32 = IOAM6_U32_UNAVAILABLE;</div><div class='add'>+		else</div><div class='add'>+			raw32 = READ_ONCE(__in6_dev_get(dev)-&gt;cnf.ioam6_id_wide);</div><div class='add'>+</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(raw32);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* namespace data (wide) */</div><div class='add'>+	if (trace-&gt;type.bit10) {</div><div class='add'>+		*(__be64 *)data = ns-&gt;data_wide;</div><div class='add'>+		data += sizeof(__be64);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* buffer occupancy */</div><div class='add'>+	if (trace-&gt;type.bit11) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit12 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit12) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit13 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit13) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit14 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit14) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit15 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit15) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit16 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit16) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit17 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit17) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit18 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit18) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit19 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit19) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit20 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit20) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bit21 undefined: filled with empty value */</div><div class='add'>+	if (trace-&gt;type.bit21) {</div><div class='add'>+		*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE);</div><div class='add'>+		data += sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* opaque state snapshot */</div><div class='add'>+	if (trace-&gt;type.bit22) {</div><div class='add'>+		if (!sc) {</div><div class='add'>+			*(__be32 *)data = cpu_to_be32(IOAM6_U32_UNAVAILABLE &gt;&gt; 8);</div><div class='add'>+		} else {</div><div class='add'>+			*(__be32 *)data = sc-&gt;hdr;</div><div class='add'>+			data += sizeof(__be32);</div><div class='add'>+</div><div class='add'>+			memcpy(data, sc-&gt;data, sc-&gt;len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called with rcu_read_lock() */</div><div class='add'>+void ioam6_fill_trace_data(struct sk_buff *skb,</div><div class='add'>+			   struct ioam6_namespace *ns,</div><div class='add'>+			   struct ioam6_trace_hdr *trace,</div><div class='add'>+			   bool is_input)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_schema *sc;</div><div class='add'>+	u8 sclen = 0;</div><div class='add'>+</div><div class='add'>+	/* Skip if Overflow flag is set</div><div class='add'>+	 */</div><div class='add'>+	if (trace-&gt;overflow)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* NodeLen does not include Opaque State Snapshot length. We need to</div><div class='add'>+	 * take it into account if the corresponding bit is set (bit 22) and</div><div class='add'>+	 * if the current IOAM namespace has an active schema attached to it</div><div class='add'>+	 */</div><div class='add'>+	sc = rcu_dereference(ns-&gt;schema);</div><div class='add'>+	if (trace-&gt;type.bit22) {</div><div class='add'>+		sclen = sizeof_field(struct ioam6_schema, hdr) / 4;</div><div class='add'>+</div><div class='add'>+		if (sc)</div><div class='add'>+			sclen += sc-&gt;len / 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there is no space remaining, we set the Overflow flag and we</div><div class='add'>+	 * skip without filling the trace</div><div class='add'>+	 */</div><div class='add'>+	if (!trace-&gt;remlen || trace-&gt;remlen &lt; trace-&gt;nodelen + sclen) {</div><div class='add'>+		trace-&gt;overflow = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__ioam6_fill_trace_data(skb, ns, trace, sc, sclen, is_input);</div><div class='add'>+	trace-&gt;remlen -= trace-&gt;nodelen + sclen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __net_init ioam6_net_init(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nsdata = kzalloc(sizeof(*nsdata), GFP_KERNEL);</div><div class='add'>+	if (!nsdata)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;nsdata-&gt;lock);</div><div class='add'>+	net-&gt;ipv6.ioam6_data = nsdata;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;nsdata-&gt;namespaces, &amp;rht_ns_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_nsdata;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;nsdata-&gt;schemas, &amp;rht_sc_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_rht_ns;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+free_rht_ns:</div><div class='add'>+	rhashtable_destroy(&amp;nsdata-&gt;namespaces);</div><div class='add'>+free_nsdata:</div><div class='add'>+	kfree(nsdata);</div><div class='add'>+	net-&gt;ipv6.ioam6_data = NULL;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit ioam6_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_pernet_data *nsdata = ioam6_pernet(net);</div><div class='add'>+</div><div class='add'>+	rhashtable_free_and_destroy(&amp;nsdata-&gt;namespaces, ioam6_free_ns, NULL);</div><div class='add'>+	rhashtable_free_and_destroy(&amp;nsdata-&gt;schemas, ioam6_free_sc, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(nsdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations ioam6_net_ops = {</div><div class='add'>+	.init = ioam6_net_init,</div><div class='add'>+	.exit = ioam6_net_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init ioam6_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = register_pernet_subsys(&amp;ioam6_net_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = genl_register_family(&amp;ioam6_genl_family);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister_pernet_subsys;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPV6_IOAM6_LWTUNNEL</div><div class='add'>+	err = ioam6_iptunnel_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister_genl;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pr_info("In-situ OAM (IOAM) with IPv6\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+#ifdef CONFIG_IPV6_IOAM6_LWTUNNEL</div><div class='add'>+out_unregister_genl:</div><div class='add'>+	genl_unregister_family(&amp;ioam6_genl_family);</div><div class='add'>+#endif</div><div class='add'>+out_unregister_pernet_subsys:</div><div class='add'>+	unregister_pernet_subsys(&amp;ioam6_net_ops);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ioam6_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IPV6_IOAM6_LWTUNNEL</div><div class='add'>+	ioam6_iptunnel_exit();</div><div class='add'>+#endif</div><div class='add'>+	genl_unregister_family(&amp;ioam6_genl_family);</div><div class='add'>+	unregister_pernet_subsys(&amp;ioam6_net_ops);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/ioam6_iptunnel.c b/net/ipv6/ioam6_iptunnel.c<br/>new file mode 100644<br/>index 000000000000..1fe7894f14dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ioam6_iptunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ioam6_iptunnel.c</a></div><div class='hunk'>@@ -0,0 +1,570 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ *  IPv6 IOAM Lightweight Tunnel implementation</div><div class='add'>+ *</div><div class='add'>+ *  Author:</div><div class='add'>+ *  Justin Iurman &lt;justin.iurman@uliege.be&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;linux/ioam6.h&gt;</div><div class='add'>+#include &lt;linux/ioam6_iptunnel.h&gt;</div><div class='add'>+#include &lt;net/dst.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/ioam6.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/dst_cache.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+</div><div class='add'>+#define IOAM6_MASK_SHORT_FIELDS 0xff100000</div><div class='add'>+#define IOAM6_MASK_WIDE_FIELDS 0xe00000</div><div class='add'>+</div><div class='add'>+struct ioam6_lwt_encap {</div><div class='add'>+	struct ipv6_hopopt_hdr eh;</div><div class='add'>+	u8 pad[2];			/* 2-octet padding for 4n-alignment */</div><div class='add'>+	struct ioam6_hdr ioamh;</div><div class='add'>+	struct ioam6_trace_hdr traceh;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ioam6_lwt_freq {</div><div class='add'>+	u32 k;</div><div class='add'>+	u32 n;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ioam6_lwt {</div><div class='add'>+	struct dst_entry null_dst;</div><div class='add'>+	struct dst_cache cache;</div><div class='add'>+	struct ioam6_lwt_freq freq;</div><div class='add'>+	atomic_t pkt_cnt;</div><div class='add'>+	u8 mode;</div><div class='add'>+	bool has_tunsrc;</div><div class='add'>+	struct in6_addr tunsrc;</div><div class='add'>+	struct in6_addr tundst;</div><div class='add'>+	struct ioam6_lwt_encap tuninfo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct netlink_range_validation freq_range = {</div><div class='add'>+	.min = IOAM6_IPTUNNEL_FREQ_MIN,</div><div class='add'>+	.max = IOAM6_IPTUNNEL_FREQ_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ioam6_lwt *ioam6_lwt_state(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	return (struct ioam6_lwt *)lwt-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ioam6_lwt_encap *ioam6_lwt_info(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	return &amp;ioam6_lwt_state(lwt)-&gt;tuninfo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ioam6_trace_hdr *ioam6_lwt_trace(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	return &amp;(ioam6_lwt_state(lwt)-&gt;tuninfo.traceh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ioam6_iptunnel_policy[IOAM6_IPTUNNEL_MAX + 1] = {</div><div class='add'>+	[IOAM6_IPTUNNEL_FREQ_K] = NLA_POLICY_FULL_RANGE(NLA_U32, &amp;freq_range),</div><div class='add'>+	[IOAM6_IPTUNNEL_FREQ_N] = NLA_POLICY_FULL_RANGE(NLA_U32, &amp;freq_range),</div><div class='add'>+	[IOAM6_IPTUNNEL_MODE]	= NLA_POLICY_RANGE(NLA_U8,</div><div class='add'>+						   IOAM6_IPTUNNEL_MODE_MIN,</div><div class='add'>+						   IOAM6_IPTUNNEL_MODE_MAX),</div><div class='add'>+	[IOAM6_IPTUNNEL_SRC]	= NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+	[IOAM6_IPTUNNEL_DST]	= NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+	[IOAM6_IPTUNNEL_TRACE]	= NLA_POLICY_EXACT_LEN(</div><div class='add'>+					sizeof(struct ioam6_trace_hdr)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool ioam6_validate_trace_hdr(struct ioam6_trace_hdr *trace)</div><div class='add'>+{</div><div class='add'>+	u32 fields;</div><div class='add'>+</div><div class='add'>+	if (!trace-&gt;type_be32 || !trace-&gt;remlen ||</div><div class='add'>+	    trace-&gt;remlen &gt; IOAM6_TRACE_DATA_SIZE_MAX / 4 ||</div><div class='add'>+	    trace-&gt;type.bit12 | trace-&gt;type.bit13 | trace-&gt;type.bit14 |</div><div class='add'>+	    trace-&gt;type.bit15 | trace-&gt;type.bit16 | trace-&gt;type.bit17 |</div><div class='add'>+	    trace-&gt;type.bit18 | trace-&gt;type.bit19 | trace-&gt;type.bit20 |</div><div class='add'>+	    trace-&gt;type.bit21 | trace-&gt;type.bit23)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	trace-&gt;nodelen = 0;</div><div class='add'>+	fields = be32_to_cpu(trace-&gt;type_be32);</div><div class='add'>+</div><div class='add'>+	trace-&gt;nodelen += hweight32(fields &amp; IOAM6_MASK_SHORT_FIELDS)</div><div class='add'>+				* (sizeof(__be32) / 4);</div><div class='add'>+	trace-&gt;nodelen += hweight32(fields &amp; IOAM6_MASK_WIDE_FIELDS)</div><div class='add'>+				* (sizeof(__be64) / 4);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_build_state(struct net *net, struct nlattr *nla,</div><div class='add'>+			     unsigned int family, const void *cfg,</div><div class='add'>+			     struct lwtunnel_state **ts,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[IOAM6_IPTUNNEL_MAX + 1];</div><div class='add'>+	struct ioam6_lwt_encap *tuninfo;</div><div class='add'>+	struct ioam6_trace_hdr *trace;</div><div class='add'>+	struct lwtunnel_state *lwt;</div><div class='add'>+	struct ioam6_lwt *ilwt;</div><div class='add'>+	int len_aligned, err;</div><div class='add'>+	u32 freq_k, freq_n;</div><div class='add'>+	u8 mode;</div><div class='add'>+</div><div class='add'>+	if (family != AF_INET6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, IOAM6_IPTUNNEL_MAX, nla,</div><div class='add'>+			       ioam6_iptunnel_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((!tb[IOAM6_IPTUNNEL_FREQ_K] &amp;&amp; tb[IOAM6_IPTUNNEL_FREQ_N]) ||</div><div class='add'>+	    (tb[IOAM6_IPTUNNEL_FREQ_K] &amp;&amp; !tb[IOAM6_IPTUNNEL_FREQ_N])) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "freq: missing parameter");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (!tb[IOAM6_IPTUNNEL_FREQ_K] &amp;&amp; !tb[IOAM6_IPTUNNEL_FREQ_N]) {</div><div class='add'>+		freq_k = IOAM6_IPTUNNEL_FREQ_MIN;</div><div class='add'>+		freq_n = IOAM6_IPTUNNEL_FREQ_MIN;</div><div class='add'>+	} else {</div><div class='add'>+		freq_k = nla_get_u32(tb[IOAM6_IPTUNNEL_FREQ_K]);</div><div class='add'>+		freq_n = nla_get_u32(tb[IOAM6_IPTUNNEL_FREQ_N]);</div><div class='add'>+</div><div class='add'>+		if (freq_k &gt; freq_n) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "freq: k &gt; n is forbidden");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = nla_get_u8_default(tb[IOAM6_IPTUNNEL_MODE],</div><div class='add'>+				  IOAM6_IPTUNNEL_MODE_INLINE);</div><div class='add'>+</div><div class='add'>+	if (tb[IOAM6_IPTUNNEL_SRC] &amp;&amp; mode == IOAM6_IPTUNNEL_MODE_INLINE) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "no tunnel src expected with this mode");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[IOAM6_IPTUNNEL_DST] &amp;&amp; mode != IOAM6_IPTUNNEL_MODE_INLINE) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "this mode needs a tunnel destination");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[IOAM6_IPTUNNEL_TRACE]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "missing trace");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace = nla_data(tb[IOAM6_IPTUNNEL_TRACE]);</div><div class='add'>+	if (!ioam6_validate_trace_hdr(trace)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[IOAM6_IPTUNNEL_TRACE],</div><div class='add'>+				    "invalid trace validation");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len_aligned = ALIGN(trace-&gt;remlen * 4, 8);</div><div class='add'>+	lwt = lwtunnel_state_alloc(sizeof(*ilwt) + len_aligned);</div><div class='add'>+	if (!lwt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ilwt = ioam6_lwt_state(lwt);</div><div class='add'>+	err = dst_cache_init(&amp;ilwt-&gt;cache, GFP_ATOMIC);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_lwt;</div><div class='add'>+</div><div class='add'>+	/* This "fake" dst_entry will be stored in a dst_cache, which will call</div><div class='add'>+	 * dst_hold() and dst_release() on it. We must ensure that dst_destroy()</div><div class='add'>+	 * will never be called. For that, its initial refcount is 1 and +1 when</div><div class='add'>+	 * it is stored in the cache. Then, +1/-1 each time we read the cache</div><div class='add'>+	 * and release it. Long story short, we're fine.</div><div class='add'>+	 */</div><div class='add'>+	dst_init(&amp;ilwt-&gt;null_dst, NULL, NULL, DST_OBSOLETE_NONE, DST_NOCOUNT);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;ilwt-&gt;pkt_cnt, 0);</div><div class='add'>+	ilwt-&gt;freq.k = freq_k;</div><div class='add'>+	ilwt-&gt;freq.n = freq_n;</div><div class='add'>+</div><div class='add'>+	ilwt-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	if (!tb[IOAM6_IPTUNNEL_SRC]) {</div><div class='add'>+		ilwt-&gt;has_tunsrc = false;</div><div class='add'>+	} else {</div><div class='add'>+		ilwt-&gt;has_tunsrc = true;</div><div class='add'>+		ilwt-&gt;tunsrc = nla_get_in6_addr(tb[IOAM6_IPTUNNEL_SRC]);</div><div class='add'>+</div><div class='add'>+		if (ipv6_addr_any(&amp;ilwt-&gt;tunsrc)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[IOAM6_IPTUNNEL_SRC],</div><div class='add'>+					    "invalid tunnel source address");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto free_cache;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[IOAM6_IPTUNNEL_DST]) {</div><div class='add'>+		ilwt-&gt;tundst = nla_get_in6_addr(tb[IOAM6_IPTUNNEL_DST]);</div><div class='add'>+</div><div class='add'>+		if (ipv6_addr_any(&amp;ilwt-&gt;tundst)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[IOAM6_IPTUNNEL_DST],</div><div class='add'>+					    "invalid tunnel dest address");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto free_cache;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tuninfo = ioam6_lwt_info(lwt);</div><div class='add'>+	tuninfo-&gt;eh.hdrlen = ((sizeof(*tuninfo) + len_aligned) &gt;&gt; 3) - 1;</div><div class='add'>+	tuninfo-&gt;pad[0] = IPV6_TLV_PADN;</div><div class='add'>+	tuninfo-&gt;ioamh.type = IOAM6_TYPE_PREALLOC;</div><div class='add'>+	tuninfo-&gt;ioamh.opt_type = IPV6_TLV_IOAM;</div><div class='add'>+	tuninfo-&gt;ioamh.opt_len = sizeof(tuninfo-&gt;ioamh) - 2 + sizeof(*trace)</div><div class='add'>+					+ trace-&gt;remlen * 4;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;tuninfo-&gt;traceh, trace, sizeof(*trace));</div><div class='add'>+</div><div class='add'>+	if (len_aligned - trace-&gt;remlen * 4) {</div><div class='add'>+		tuninfo-&gt;traceh.data[trace-&gt;remlen * 4] = IPV6_TLV_PADN;</div><div class='add'>+		tuninfo-&gt;traceh.data[trace-&gt;remlen * 4 + 1] = 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lwt-&gt;type = LWTUNNEL_ENCAP_IOAM6;</div><div class='add'>+	lwt-&gt;flags |= LWTUNNEL_STATE_OUTPUT_REDIRECT;</div><div class='add'>+</div><div class='add'>+	*ts = lwt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+free_cache:</div><div class='add'>+	dst_cache_destroy(&amp;ilwt-&gt;cache);</div><div class='add'>+free_lwt:</div><div class='add'>+	kfree(lwt);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_do_fill(struct net *net, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_trace_hdr *trace;</div><div class='add'>+	struct ioam6_namespace *ns;</div><div class='add'>+</div><div class='add'>+	trace = (struct ioam6_trace_hdr *)(skb_transport_header(skb)</div><div class='add'>+					   + sizeof(struct ipv6_hopopt_hdr) + 2</div><div class='add'>+					   + sizeof(struct ioam6_hdr));</div><div class='add'>+</div><div class='add'>+	ns = ioam6_namespace(net, trace-&gt;namespace_id);</div><div class='add'>+	if (ns)</div><div class='add'>+		ioam6_fill_trace_data(skb, ns, trace, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_do_inline(struct net *net, struct sk_buff *skb,</div><div class='add'>+			   struct ioam6_lwt_encap *tuninfo,</div><div class='add'>+			   struct dst_entry *cache_dst)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *oldhdr, *hdr;</div><div class='add'>+	int hdrlen, err;</div><div class='add'>+</div><div class='add'>+	hdrlen = (tuninfo-&gt;eh.hdrlen + 1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, hdrlen + dst_dev_overhead(cache_dst, skb));</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	oldhdr = ipv6_hdr(skb);</div><div class='add'>+	skb_pull(skb, sizeof(*oldhdr));</div><div class='add'>+	skb_postpull_rcsum(skb, skb_network_header(skb), sizeof(*oldhdr));</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*oldhdr) + hdrlen);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	memmove(hdr, oldhdr, sizeof(*oldhdr));</div><div class='add'>+	tuninfo-&gt;eh.nexthdr = hdr-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, sizeof(*hdr));</div><div class='add'>+	skb_postpush_rcsum(skb, hdr, sizeof(*hdr) + hdrlen);</div><div class='add'>+</div><div class='add'>+	memcpy(skb_transport_header(skb), (u8 *)tuninfo, hdrlen);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;nexthdr = NEXTHDR_HOP;</div><div class='add'>+	hdr-&gt;payload_len = cpu_to_be16(skb-&gt;len - sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	return ioam6_do_fill(net, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_do_encap(struct net *net, struct sk_buff *skb,</div><div class='add'>+			  struct ioam6_lwt_encap *tuninfo,</div><div class='add'>+			  bool has_tunsrc,</div><div class='add'>+			  struct in6_addr *tunsrc,</div><div class='add'>+			  struct in6_addr *tundst,</div><div class='add'>+			  struct dst_entry *cache_dst)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct ipv6hdr *hdr, *inner_hdr;</div><div class='add'>+	int hdrlen, len, err;</div><div class='add'>+</div><div class='add'>+	hdrlen = (tuninfo-&gt;eh.hdrlen + 1) &lt;&lt; 3;</div><div class='add'>+	len = sizeof(*hdr) + hdrlen;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, len + dst_dev_overhead(cache_dst, skb));</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	inner_hdr = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, len);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+	skb_set_transport_header(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	tuninfo-&gt;eh.nexthdr = NEXTHDR_IPV6;</div><div class='add'>+	memcpy(skb_transport_header(skb), (u8 *)tuninfo, hdrlen);</div><div class='add'>+</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	memcpy(hdr, inner_hdr, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;nexthdr = NEXTHDR_HOP;</div><div class='add'>+	hdr-&gt;payload_len = cpu_to_be16(skb-&gt;len - sizeof(*hdr));</div><div class='add'>+	hdr-&gt;daddr = *tundst;</div><div class='add'>+</div><div class='add'>+	if (has_tunsrc)</div><div class='add'>+		memcpy(&amp;hdr-&gt;saddr, tunsrc, sizeof(*tunsrc));</div><div class='add'>+	else</div><div class='add'>+		ipv6_dev_get_saddr(net, dst_dev(dst), &amp;hdr-&gt;daddr,</div><div class='add'>+				   IPV6_PREFER_SRC_PUBLIC, &amp;hdr-&gt;saddr);</div><div class='add'>+</div><div class='add'>+	skb_postpush_rcsum(skb, hdr, len);</div><div class='add'>+</div><div class='add'>+	return ioam6_do_fill(net, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct ioam6_lwt *ilwt;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	u32 pkt_cnt;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IPV6))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	ilwt = ioam6_lwt_state(orig_dst-&gt;lwtstate);</div><div class='add'>+</div><div class='add'>+	/* Check for insertion frequency (i.e., "k over n" insertions) */</div><div class='add'>+	pkt_cnt = atomic_fetch_inc(&amp;ilwt-&gt;pkt_cnt);</div><div class='add'>+	if (pkt_cnt % ilwt-&gt;freq.n &gt;= ilwt-&gt;freq.k)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	dst = dst_cache_get(&amp;ilwt-&gt;cache);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	/* This is how we notify that the destination does not change after</div><div class='add'>+	 * transformation and that we need to use orig_dst instead of the cache</div><div class='add'>+	 */</div><div class='add'>+	if (dst == &amp;ilwt-&gt;null_dst) {</div><div class='add'>+		dst_release(dst);</div><div class='add'>+</div><div class='add'>+		dst = orig_dst;</div><div class='add'>+		/* keep refcount balance: dst_release() is called at the end */</div><div class='add'>+		dst_hold(dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ilwt-&gt;mode) {</div><div class='add'>+	case IOAM6_IPTUNNEL_MODE_INLINE:</div><div class='add'>+do_inline:</div><div class='add'>+		/* Direct insertion - if there is no Hop-by-Hop yet */</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;nexthdr == NEXTHDR_HOP)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		err = ioam6_do_inline(net, skb, &amp;ilwt-&gt;tuninfo, dst);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case IOAM6_IPTUNNEL_MODE_ENCAP:</div><div class='add'>+do_encap:</div><div class='add'>+		/* Encapsulation (ip6ip6) */</div><div class='add'>+		err = ioam6_do_encap(net, skb, &amp;ilwt-&gt;tuninfo,</div><div class='add'>+				     ilwt-&gt;has_tunsrc, &amp;ilwt-&gt;tunsrc,</div><div class='add'>+				     &amp;ilwt-&gt;tundst, dst);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case IOAM6_IPTUNNEL_MODE_AUTO:</div><div class='add'>+		/* Automatic (RFC8200 compliant):</div><div class='add'>+		 *  - local packets -&gt; INLINE mode</div><div class='add'>+		 *  - in-transit packets -&gt; ENCAP mode</div><div class='add'>+		 */</div><div class='add'>+		if (!skb-&gt;dev)</div><div class='add'>+			goto do_inline;</div><div class='add'>+</div><div class='add'>+		goto do_encap;</div><div class='add'>+	default:</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!dst)) {</div><div class='add'>+		struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='add'>+		struct flowi6 fl6;</div><div class='add'>+</div><div class='add'>+		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+		fl6.daddr = hdr-&gt;daddr;</div><div class='add'>+		fl6.saddr = hdr-&gt;saddr;</div><div class='add'>+		fl6.flowlabel = ip6_flowinfo(hdr);</div><div class='add'>+		fl6.flowi6_mark = skb-&gt;mark;</div><div class='add'>+		fl6.flowi6_proto = hdr-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+		dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='add'>+		if (dst-&gt;error) {</div><div class='add'>+			err = dst-&gt;error;</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If the destination is the same after transformation (which is</div><div class='add'>+		 * a valid use case for IOAM), then we don't want to add it to</div><div class='add'>+		 * the cache in order to avoid a reference loop. Instead, we add</div><div class='add'>+		 * our fake dst_entry to the cache as a way to detect this case.</div><div class='add'>+		 * Otherwise, we add the resolved destination to the cache.</div><div class='add'>+		 */</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		if (orig_dst-&gt;lwtstate == dst-&gt;lwtstate)</div><div class='add'>+			dst_cache_set_ip6(&amp;ilwt-&gt;cache,</div><div class='add'>+					  &amp;ilwt-&gt;null_dst, &amp;fl6.saddr);</div><div class='add'>+		else</div><div class='add'>+			dst_cache_set_ip6(&amp;ilwt-&gt;cache, dst, &amp;fl6.saddr);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+</div><div class='add'>+		err = skb_cow_head(skb, LL_RESERVED_SPACE(dst_dev(dst)));</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* avoid lwtunnel_output() reentry loop when destination is the same</div><div class='add'>+	 * after transformation (e.g., with the inline mode)</div><div class='add'>+	 */</div><div class='add'>+	if (orig_dst-&gt;lwtstate != dst-&gt;lwtstate) {</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_dst_set(skb, dst);</div><div class='add'>+		return dst_output(net, sk, skb);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	dst_release(dst);</div><div class='add'>+	return orig_dst-&gt;lwtstate-&gt;orig_output(net, sk, skb);</div><div class='add'>+drop:</div><div class='add'>+	dst_release(dst);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioam6_destroy_state(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	/* Since the refcount of per-cpu dst_entry caches will never be 0 (see</div><div class='add'>+	 * why above) when our "fake" dst_entry is used, it is not necessary to</div><div class='add'>+	 * remove them before calling dst_cache_destroy()</div><div class='add'>+	 */</div><div class='add'>+	dst_cache_destroy(&amp;ioam6_lwt_state(lwt)-&gt;cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_fill_encap_info(struct sk_buff *skb,</div><div class='add'>+				 struct lwtunnel_state *lwtstate)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_lwt *ilwt = ioam6_lwt_state(lwtstate);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(skb, IOAM6_IPTUNNEL_FREQ_K, ilwt-&gt;freq.k);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(skb, IOAM6_IPTUNNEL_FREQ_N, ilwt-&gt;freq.n);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	err = nla_put_u8(skb, IOAM6_IPTUNNEL_MODE, ilwt-&gt;mode);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	if (ilwt-&gt;mode != IOAM6_IPTUNNEL_MODE_INLINE) {</div><div class='add'>+		if (ilwt-&gt;has_tunsrc) {</div><div class='add'>+			err = nla_put_in6_addr(skb, IOAM6_IPTUNNEL_SRC,</div><div class='add'>+					       &amp;ilwt-&gt;tunsrc);</div><div class='add'>+			if (err)</div><div class='add'>+				goto ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = nla_put_in6_addr(skb, IOAM6_IPTUNNEL_DST, &amp;ilwt-&gt;tundst);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_put(skb, IOAM6_IPTUNNEL_TRACE, sizeof(ilwt-&gt;tuninfo.traceh),</div><div class='add'>+		      &amp;ilwt-&gt;tuninfo.traceh);</div><div class='add'>+ret:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_encap_nlsize(struct lwtunnel_state *lwtstate)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_lwt *ilwt = ioam6_lwt_state(lwtstate);</div><div class='add'>+	int nlsize;</div><div class='add'>+</div><div class='add'>+	nlsize = nla_total_size(sizeof(ilwt-&gt;freq.k)) +</div><div class='add'>+		  nla_total_size(sizeof(ilwt-&gt;freq.n)) +</div><div class='add'>+		  nla_total_size(sizeof(ilwt-&gt;mode)) +</div><div class='add'>+		  nla_total_size(sizeof(ilwt-&gt;tuninfo.traceh));</div><div class='add'>+</div><div class='add'>+	if (ilwt-&gt;mode != IOAM6_IPTUNNEL_MODE_INLINE) {</div><div class='add'>+		if (ilwt-&gt;has_tunsrc)</div><div class='add'>+			nlsize += nla_total_size(sizeof(ilwt-&gt;tunsrc));</div><div class='add'>+</div><div class='add'>+		nlsize += nla_total_size(sizeof(ilwt-&gt;tundst));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nlsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ioam6_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)</div><div class='add'>+{</div><div class='add'>+	struct ioam6_trace_hdr *trace_a = ioam6_lwt_trace(a);</div><div class='add'>+	struct ioam6_trace_hdr *trace_b = ioam6_lwt_trace(b);</div><div class='add'>+	struct ioam6_lwt *ilwt_a = ioam6_lwt_state(a);</div><div class='add'>+	struct ioam6_lwt *ilwt_b = ioam6_lwt_state(b);</div><div class='add'>+</div><div class='add'>+	return (ilwt_a-&gt;freq.k != ilwt_b-&gt;freq.k ||</div><div class='add'>+		ilwt_a-&gt;freq.n != ilwt_b-&gt;freq.n ||</div><div class='add'>+		ilwt_a-&gt;mode != ilwt_b-&gt;mode ||</div><div class='add'>+		ilwt_a-&gt;has_tunsrc != ilwt_b-&gt;has_tunsrc ||</div><div class='add'>+		(ilwt_a-&gt;mode != IOAM6_IPTUNNEL_MODE_INLINE &amp;&amp;</div><div class='add'>+		 !ipv6_addr_equal(&amp;ilwt_a-&gt;tundst, &amp;ilwt_b-&gt;tundst)) ||</div><div class='add'>+		(ilwt_a-&gt;mode != IOAM6_IPTUNNEL_MODE_INLINE &amp;&amp;</div><div class='add'>+		 ilwt_a-&gt;has_tunsrc &amp;&amp;</div><div class='add'>+		 !ipv6_addr_equal(&amp;ilwt_a-&gt;tunsrc, &amp;ilwt_b-&gt;tunsrc)) ||</div><div class='add'>+		trace_a-&gt;namespace_id != trace_b-&gt;namespace_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct lwtunnel_encap_ops ioam6_iptun_ops = {</div><div class='add'>+	.build_state		= ioam6_build_state,</div><div class='add'>+	.destroy_state		= ioam6_destroy_state,</div><div class='add'>+	.output			= ioam6_output,</div><div class='add'>+	.fill_encap		= ioam6_fill_encap_info,</div><div class='add'>+	.get_encap_size		= ioam6_encap_nlsize,</div><div class='add'>+	.cmp_encap		= ioam6_encap_cmp,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init ioam6_iptunnel_init(void)</div><div class='add'>+{</div><div class='add'>+	return lwtunnel_encap_add_ops(&amp;ioam6_iptun_ops, LWTUNNEL_ENCAP_IOAM6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ioam6_iptunnel_exit(void)</div><div class='add'>+{</div><div class='add'>+	lwtunnel_encap_del_ops(&amp;ioam6_iptun_ops, LWTUNNEL_ENCAP_IOAM6);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c<br/>index 547515e8450a..377717045f8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_checksum.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_checksum.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_checksum.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_checksum.c</a></div><div class='hunk'>@@ -88,8 +88,24 @@ int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto)</div><div class='ctx'> 	 * Note, we are only interested in != 0 or == 0, thus the</div><div class='ctx'> 	 * force to int.</div><div class='ctx'> 	 */</div><div class='del'>-	return (__force int)skb_checksum_init_zero_check(skb, proto, uh-&gt;check,</div><div class='del'>-							 ip6_compute_pseudo);</div><div class='add'>+	err = (__force int)skb_checksum_init_zero_check(skb, proto, uh-&gt;check,</div><div class='add'>+							ip6_compute_pseudo);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE &amp;&amp; !skb-&gt;csum_valid) {</div><div class='add'>+		/* If SW calculated the value, we know it's bad */</div><div class='add'>+		if (skb-&gt;csum_complete_sw)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* HW says the value is bad. Let's validate that.</div><div class='add'>+		 * skb-&gt;csum is no longer the full packet checksum,</div><div class='add'>+		 * so don't treat is as such.</div><div class='add'>+		 */</div><div class='add'>+		skb_checksum_complete_unset(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udp6_csum_init);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c<br/>index 5516f55e214b..2111af022d94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_fib.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_fib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_fib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_fib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *	Forwarding Information Database</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Changes:</div><div class='ctx'>  *	Yuji SEKIYA @USAGI:	Support default route on router node;</div><div class='ctx'>  *				remove ip6_null_entry from the top of</div><div class='hunk'>@@ -19,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv6: " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -29,12 +26,14 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='ctx'> #include &lt;net/fib_notifier.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/ip6_fib.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +45,7 @@ struct fib6_cleaner {</div><div class='ctx'> 	int (*func)(struct fib6_info *, void *arg);</div><div class='ctx'> 	int sernum;</div><div class='ctx'> 	void *arg;</div><div class='add'>+	bool skip_notify;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='hunk'>@@ -91,13 +91,12 @@ static void fib6_walker_unlink(struct net *net, struct fib6_walker *w)</div><div class='ctx'> </div><div class='ctx'> static int fib6_new_sernum(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int new, old;</div><div class='add'>+	int new, old = atomic_read(&amp;net-&gt;ipv6.fib6_sernum);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		old = atomic_read(&amp;net-&gt;ipv6.fib6_sernum);</div><div class='ctx'> 		new = old &lt; INT_MAX ? old + 1 : 1;</div><div class='del'>-	} while (atomic_cmpxchg(&amp;net-&gt;ipv6.fib6_sernum,</div><div class='del'>-				old, new) != old);</div><div class='add'>+	} while (!atomic_try_cmpxchg(&amp;net-&gt;ipv6.fib6_sernum, &amp;old, new));</div><div class='add'>+</div><div class='ctx'> 	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +111,7 @@ void fib6_update_sernum(struct net *net, struct fib6_info *f6i)</div><div class='ctx'> 	fn = rcu_dereference_protected(f6i-&gt;fib6_node,</div><div class='ctx'> 			lockdep_is_held(&amp;f6i-&gt;fib6_table-&gt;tb6_lock));</div><div class='ctx'> 	if (fn)</div><div class='del'>-		fn-&gt;fn_sernum = fib6_new_sernum(net);</div><div class='add'>+		WRITE_ONCE(fn-&gt;fn_sernum, fib6_new_sernum(net));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -145,24 +144,23 @@ static __be32 addr_bit_set(const void *token, int fn_bit)</div><div class='ctx'> 	       addr[fn_bit &gt;&gt; 5];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)</div><div class='add'>+struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *f6i;</div><div class='add'>+	size_t sz = sizeof(*f6i);</div><div class='ctx'> </div><div class='del'>-	f6i = kzalloc(sizeof(*f6i), gfp_flags);</div><div class='del'>-	if (!f6i)</div><div class='del'>-		return NULL;</div><div class='add'>+	if (with_fib6_nh)</div><div class='add'>+		sz += sizeof(struct fib6_nh);</div><div class='ctx'> </div><div class='del'>-	f6i-&gt;rt6i_pcpu = alloc_percpu_gfp(struct rt6_info *, gfp_flags);</div><div class='del'>-	if (!f6i-&gt;rt6i_pcpu) {</div><div class='del'>-		kfree(f6i);</div><div class='add'>+	f6i = kzalloc(sz, gfp_flags);</div><div class='add'>+	if (!f6i)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	/* fib6_siblings is a union with nh_list, so this initializes both */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;f6i-&gt;fib6_siblings);</div><div class='del'>-	f6i-&gt;fib6_metrics = (struct dst_metrics *)&amp;dst_default_metrics;</div><div class='add'>+	refcount_set(&amp;f6i-&gt;fib6_ref, 1);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;f6i-&gt;fib6_ref);</div><div class='add'>+	INIT_HLIST_NODE(&amp;f6i-&gt;gc_link);</div><div class='ctx'> </div><div class='ctx'> 	return f6i;</div><div class='ctx'> }</div><div class='hunk'>@@ -170,43 +168,15 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)</div><div class='ctx'> void fib6_info_destroy_rcu(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *f6i = container_of(head, struct fib6_info, rcu);</div><div class='del'>-	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct dst_metrics *m;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(f6i-&gt;fib6_node);</div><div class='ctx'> </div><div class='del'>-	bucket = rcu_dereference_protected(f6i-&gt;rt6i_exception_bucket, 1);</div><div class='del'>-	if (bucket) {</div><div class='del'>-		f6i-&gt;rt6i_exception_bucket = NULL;</div><div class='del'>-		kfree(bucket);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (f6i-&gt;rt6i_pcpu) {</div><div class='del'>-		int cpu;</div><div class='del'>-</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			struct rt6_info **ppcpu_rt;</div><div class='del'>-			struct rt6_info *pcpu_rt;</div><div class='del'>-</div><div class='del'>-			ppcpu_rt = per_cpu_ptr(f6i-&gt;rt6i_pcpu, cpu);</div><div class='del'>-			pcpu_rt = *ppcpu_rt;</div><div class='del'>-			if (pcpu_rt) {</div><div class='del'>-				dst_dev_put(&amp;pcpu_rt-&gt;dst);</div><div class='del'>-				dst_release(&amp;pcpu_rt-&gt;dst);</div><div class='del'>-				*ppcpu_rt = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lwtstate_put(f6i-&gt;fib6_nh.nh_lwtstate);</div><div class='del'>-</div><div class='del'>-	if (f6i-&gt;fib6_nh.nh_dev)</div><div class='del'>-		dev_put(f6i-&gt;fib6_nh.nh_dev);</div><div class='del'>-</div><div class='del'>-	m = f6i-&gt;fib6_metrics;</div><div class='del'>-	if (m != &amp;dst_default_metrics &amp;&amp; refcount_dec_and_test(&amp;m-&gt;refcnt))</div><div class='del'>-		kfree(m);</div><div class='add'>+	if (f6i-&gt;nh)</div><div class='add'>+		nexthop_put(f6i-&gt;nh);</div><div class='add'>+	else</div><div class='add'>+		fib6_nh_release(f6i-&gt;fib6_nh);</div><div class='ctx'> </div><div class='add'>+	ip_fib_metrics_put(f6i-&gt;fib6_metrics);</div><div class='ctx'> 	kfree(f6i);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib6_info_destroy_rcu);</div><div class='hunk'>@@ -228,16 +198,9 @@ static void node_free_immediate(struct net *net, struct fib6_node *fn)</div><div class='ctx'> 	net-&gt;ipv6.rt6_stats-&gt;fib_nodes--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void node_free_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct fib6_node *fn = container_of(head, struct fib6_node, rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(fib6_node_kmem, fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void node_free(struct net *net, struct fib6_node *fn)</div><div class='ctx'> {</div><div class='del'>-	call_rcu(&amp;fn-&gt;rcu, node_free_rcu);</div><div class='add'>+	kfree_rcu(fn, rcu);</div><div class='ctx'> 	net-&gt;ipv6.rt6_stats-&gt;fib_nodes--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -278,6 +241,7 @@ static struct fib6_table *fib6_alloc_table(struct net *net, u32 id)</div><div class='ctx'> 				   net-&gt;ipv6.fib6_null_entry);</div><div class='ctx'> 		table-&gt;tb6_root.fn_flags = RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;</div><div class='ctx'> 		inet_peer_base_init(&amp;table-&gt;tb6_peers);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;table-&gt;tb6_gc_hlist);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return table;</div><div class='hunk'>@@ -285,40 +249,52 @@ static struct fib6_table *fib6_alloc_table(struct net *net, u32 id)</div><div class='ctx'> </div><div class='ctx'> struct fib6_table *fib6_new_table(struct net *net, u32 id)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_table *tb;</div><div class='add'>+	struct fib6_table *tb, *new_tb;</div><div class='ctx'> </div><div class='ctx'> 	if (id == 0)</div><div class='ctx'> 		id = RT6_TABLE_MAIN;</div><div class='add'>+</div><div class='ctx'> 	tb = fib6_get_table(net, id);</div><div class='ctx'> 	if (tb)</div><div class='ctx'> 		return tb;</div><div class='ctx'> </div><div class='del'>-	tb = fib6_alloc_table(net, id);</div><div class='del'>-	if (tb)</div><div class='del'>-		fib6_link_table(net, tb);</div><div class='add'>+	new_tb = fib6_alloc_table(net, id);</div><div class='add'>+	if (!new_tb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;net-&gt;ipv6.fib_table_hash_lock);</div><div class='add'>+</div><div class='add'>+	tb = fib6_get_table(net, id);</div><div class='add'>+	if (unlikely(tb)) {</div><div class='add'>+		spin_unlock_bh(&amp;net-&gt;ipv6.fib_table_hash_lock);</div><div class='add'>+		kfree(new_tb);</div><div class='add'>+		return tb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fib6_link_table(net, new_tb);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;net-&gt;ipv6.fib_table_hash_lock);</div><div class='ctx'> </div><div class='del'>-	return tb;</div><div class='add'>+	return new_tb;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fib6_new_table);</div><div class='ctx'> </div><div class='ctx'> struct fib6_table *fib6_get_table(struct net *net, u32 id)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_table *tb;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='del'>-	unsigned int h;</div><div class='add'>+	struct fib6_table *tb;</div><div class='ctx'> </div><div class='del'>-	if (id == 0)</div><div class='add'>+	if (!id)</div><div class='ctx'> 		id = RT6_TABLE_MAIN;</div><div class='del'>-	h = id &amp; (FIB6_TABLE_HASHSZ - 1);</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='del'>-	hlist_for_each_entry_rcu(tb, head, tb6_hlist) {</div><div class='del'>-		if (tb-&gt;tb6_id == id) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	head = &amp;net-&gt;ipv6.fib_table_hash[id &amp; (FIB6_TABLE_HASHSZ - 1)];</div><div class='add'>+</div><div class='add'>+	/* See comment in fib6_link_table().  RCU is not required,</div><div class='add'>+	 * but rcu_dereference_raw() is used to avoid data-race.</div><div class='add'>+	 */</div><div class='add'>+	hlist_for_each_entry_rcu(tb, head, tb6_hlist, true)</div><div class='add'>+		if (tb-&gt;tb6_id == id)</div><div class='ctx'> 			return tb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -347,21 +323,24 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> </div><div class='del'>-	rt = lookup(net, net-&gt;ipv6.fib6_main_tbl, fl6, skb, flags);</div><div class='add'>+	rt = pol_lookup_func(lookup,</div><div class='add'>+			net, net-&gt;ipv6.fib6_main_tbl, fl6, skb, flags);</div><div class='ctx'> 	if (rt-&gt;dst.error == -EAGAIN) {</div><div class='del'>-		ip6_rt_put(rt);</div><div class='add'>+		ip6_rt_put_flags(rt, flags);</div><div class='ctx'> 		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-		dst_hold(&amp;rt-&gt;dst);</div><div class='add'>+		if (!(flags &amp; RT6_LOOKUP_F_DST_NOREF))</div><div class='add'>+			dst_hold(&amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return &amp;rt-&gt;dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu lock held; no reference taken on fib6_info */</div><div class='del'>-struct fib6_info *fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='del'>-			      int flags)</div><div class='add'>+int fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,</div><div class='add'>+		struct fib6_result *res, int flags)</div><div class='ctx'> {</div><div class='del'>-	return fib6_table_lookup(net, net-&gt;ipv6.fib6_main_tbl, oif, fl6, flags);</div><div class='add'>+	return fib6_table_lookup(net, net-&gt;ipv6.fib6_main_tbl, oif, fl6,</div><div class='add'>+				 res, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_init fib6_tables_init(struct net *net)</div><div class='hunk'>@@ -371,85 +350,149 @@ static void __net_init fib6_tables_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned int fib6_tables_seq_read(struct net *net)</div><div class='add'>+unsigned int fib6_tables_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int h, fib_seq = 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for (h = 0; h &lt; FIB6_TABLE_HASHSZ; h++) {</div><div class='del'>-		struct hlist_head *head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='del'>-		struct fib6_table *tb;</div><div class='add'>+		const struct hlist_head *head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='add'>+		const struct fib6_table *tb;</div><div class='ctx'> </div><div class='ctx'> 		hlist_for_each_entry_rcu(tb, head, tb6_hlist)</div><div class='del'>-			fib_seq += tb-&gt;fib_seq;</div><div class='add'>+			fib_seq += READ_ONCE(tb-&gt;fib_seq);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return fib_seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int call_fib6_entry_notifier(struct notifier_block *nb, struct net *net,</div><div class='add'>+static int call_fib6_entry_notifier(struct notifier_block *nb,</div><div class='ctx'> 				    enum fib_event_type event_type,</div><div class='del'>-				    struct fib6_info *rt)</div><div class='add'>+				    struct fib6_info *rt,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_entry_notifier_info info = {</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.rt = rt,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return call_fib6_notifier(nb, event_type, &amp;info.info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int call_fib6_multipath_entry_notifier(struct notifier_block *nb,</div><div class='add'>+					      enum fib_event_type event_type,</div><div class='add'>+					      struct fib6_info *rt,</div><div class='add'>+					      unsigned int nsiblings,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib6_entry_notifier_info info = {</div><div class='add'>+		.info.extack = extack,</div><div class='ctx'> 		.rt = rt,</div><div class='add'>+		.nsiblings = nsiblings,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return call_fib6_notifier(nb, net, event_type, &amp;info.info);</div><div class='add'>+	return call_fib6_notifier(nb, event_type, &amp;info.info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int call_fib6_entry_notifiers(struct net *net,</div><div class='del'>-				     enum fib_event_type event_type,</div><div class='del'>-				     struct fib6_info *rt,</div><div class='del'>-				     struct netlink_ext_ack *extack)</div><div class='add'>+int call_fib6_entry_notifiers(struct net *net,</div><div class='add'>+			      enum fib_event_type event_type,</div><div class='add'>+			      struct fib6_info *rt,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_entry_notifier_info info = {</div><div class='ctx'> 		.info.extack = extack,</div><div class='ctx'> 		.rt = rt,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rt-&gt;fib6_table-&gt;fib_seq++;</div><div class='add'>+	WRITE_ONCE(rt-&gt;fib6_table-&gt;fib_seq, rt-&gt;fib6_table-&gt;fib_seq + 1);</div><div class='ctx'> 	return call_fib6_notifiers(net, event_type, &amp;info.info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int call_fib6_multipath_entry_notifiers(struct net *net,</div><div class='add'>+					enum fib_event_type event_type,</div><div class='add'>+					struct fib6_info *rt,</div><div class='add'>+					unsigned int nsiblings,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct fib6_entry_notifier_info info = {</div><div class='add'>+		.info.extack = extack,</div><div class='add'>+		.rt = rt,</div><div class='add'>+		.nsiblings = nsiblings,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(rt-&gt;fib6_table-&gt;fib_seq, rt-&gt;fib6_table-&gt;fib_seq + 1);</div><div class='add'>+	return call_fib6_notifiers(net, event_type, &amp;info.info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int call_fib6_entry_notifiers_replace(struct net *net, struct fib6_info *rt)</div><div class='add'>+{</div><div class='add'>+	struct fib6_entry_notifier_info info = {</div><div class='add'>+		.rt = rt,</div><div class='add'>+		.nsiblings = rt-&gt;fib6_nsiblings,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(rt-&gt;fib6_table-&gt;fib_seq, rt-&gt;fib6_table-&gt;fib_seq + 1);</div><div class='add'>+	return call_fib6_notifiers(net, FIB_EVENT_ENTRY_REPLACE, &amp;info.info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct fib6_dump_arg {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	struct notifier_block *nb;</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void fib6_rt_dump(struct fib6_info *rt, struct fib6_dump_arg *arg)</div><div class='add'>+static int fib6_rt_dump(struct fib6_info *rt, struct fib6_dump_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	if (rt == arg-&gt;net-&gt;ipv6.fib6_null_entry)</div><div class='del'>-		return;</div><div class='del'>-	call_fib6_entry_notifier(arg-&gt;nb, arg-&gt;net, FIB_EVENT_ENTRY_ADD, rt);</div><div class='add'>+	enum fib_event_type fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+	unsigned int nsiblings;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!rt || rt == arg-&gt;net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nsiblings = READ_ONCE(rt-&gt;fib6_nsiblings);</div><div class='add'>+	if (nsiblings)</div><div class='add'>+		err = call_fib6_multipath_entry_notifier(arg-&gt;nb, fib_event,</div><div class='add'>+							 rt,</div><div class='add'>+							 nsiblings,</div><div class='add'>+							 arg-&gt;extack);</div><div class='add'>+	else</div><div class='add'>+		err = call_fib6_entry_notifier(arg-&gt;nb, fib_event, rt,</div><div class='add'>+					       arg-&gt;extack);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fib6_node_dump(struct fib6_walker *w)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *rt;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for_each_fib6_walker_rt(w)</div><div class='del'>-		fib6_rt_dump(rt, w-&gt;args);</div><div class='add'>+	err = fib6_rt_dump(w-&gt;leaf, w-&gt;args);</div><div class='ctx'> 	w-&gt;leaf = NULL;</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib6_table_dump(struct net *net, struct fib6_table *tb,</div><div class='del'>-			    struct fib6_walker *w)</div><div class='add'>+static int fib6_table_dump(struct net *net, struct fib6_table *tb,</div><div class='add'>+			   struct fib6_walker *w)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	w-&gt;root = &amp;tb-&gt;tb6_root;</div><div class='ctx'> 	spin_lock_bh(&amp;tb-&gt;tb6_lock);</div><div class='del'>-	fib6_walk(net, w);</div><div class='add'>+	err = fib6_walk(net, w);</div><div class='ctx'> 	spin_unlock_bh(&amp;tb-&gt;tb6_lock);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with rcu_read_lock() */</div><div class='del'>-int fib6_tables_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+int fib6_tables_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_dump_arg arg;</div><div class='ctx'> 	struct fib6_walker *w;</div><div class='ctx'> 	unsigned int h;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	w = kzalloc(sizeof(*w), GFP_ATOMIC);</div><div class='ctx'> 	if (!w)</div><div class='hunk'>@@ -458,19 +501,25 @@ int fib6_tables_dump(struct net *net, struct notifier_block *nb)</div><div class='ctx'> 	w-&gt;func = fib6_node_dump;</div><div class='ctx'> 	arg.net = net;</div><div class='ctx'> 	arg.nb = nb;</div><div class='add'>+	arg.extack = extack;</div><div class='ctx'> 	w-&gt;args = &amp;arg;</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; FIB6_TABLE_HASHSZ; h++) {</div><div class='ctx'> 		struct hlist_head *head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='ctx'> 		struct fib6_table *tb;</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry_rcu(tb, head, tb6_hlist)</div><div class='del'>-			fib6_table_dump(net, tb, w);</div><div class='add'>+		hlist_for_each_entry_rcu(tb, head, tb6_hlist) {</div><div class='add'>+			err = fib6_table_dump(net, tb, w);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	kfree(w);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* The tree traversal function should never return a positive value. */</div><div class='add'>+	return err &gt; 0 ? -EINVAL : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fib6_dump_node(struct fib6_walker *w)</div><div class='hunk'>@@ -479,12 +528,19 @@ static int fib6_dump_node(struct fib6_walker *w)</div><div class='ctx'> 	struct fib6_info *rt;</div><div class='ctx'> </div><div class='ctx'> 	for_each_fib6_walker_rt(w) {</div><div class='del'>-		res = rt6_dump_route(rt, w-&gt;args);</div><div class='del'>-		if (res &lt; 0) {</div><div class='add'>+		res = rt6_dump_route(rt, w-&gt;args, w-&gt;skip_in_node);</div><div class='add'>+		if (res &gt;= 0) {</div><div class='ctx'> 			/* Frame is full, suspend walking */</div><div class='ctx'> 			w-&gt;leaf = rt;</div><div class='add'>+</div><div class='add'>+			/* We'll restart from this node, so if some routes were</div><div class='add'>+			 * already dumped, skip them next time.</div><div class='add'>+			 */</div><div class='add'>+			w-&gt;skip_in_node += res;</div><div class='add'>+</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='add'>+		w-&gt;skip_in_node = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Multipath routes are dumped in one route with the</div><div class='ctx'> 		 * RTA_MULTIPATH attribute. Jump 'rt' to point to the</div><div class='hunk'>@@ -536,21 +592,24 @@ static int fib6_dump_table(struct fib6_table *table, struct sk_buff *skb,</div><div class='ctx'> 	if (cb-&gt;args[4] == 0) {</div><div class='ctx'> 		w-&gt;count = 0;</div><div class='ctx'> 		w-&gt;skip = 0;</div><div class='add'>+		w-&gt;skip_in_node = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 		res = fib6_walk(net, w);</div><div class='ctx'> 		spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 		if (res &gt; 0) {</div><div class='ctx'> 			cb-&gt;args[4] = 1;</div><div class='del'>-			cb-&gt;args[5] = w-&gt;root-&gt;fn_sernum;</div><div class='add'>+			cb-&gt;args[5] = READ_ONCE(w-&gt;root-&gt;fn_sernum);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (cb-&gt;args[5] != w-&gt;root-&gt;fn_sernum) {</div><div class='add'>+		int sernum = READ_ONCE(w-&gt;root-&gt;fn_sernum);</div><div class='add'>+		if (cb-&gt;args[5] != sernum) {</div><div class='ctx'> 			/* Begin at the root if the tree changed */</div><div class='del'>-			cb-&gt;args[5] = w-&gt;root-&gt;fn_sernum;</div><div class='add'>+			cb-&gt;args[5] = sernum;</div><div class='ctx'> 			w-&gt;state = FWS_INIT;</div><div class='ctx'> 			w-&gt;node = w-&gt;root;</div><div class='ctx'> 			w-&gt;skip = w-&gt;count;</div><div class='add'>+			w-&gt;skip_in_node = 0;</div><div class='ctx'> 		} else</div><div class='ctx'> 			w-&gt;skip = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -568,35 +627,51 @@ static int fib6_dump_table(struct fib6_table *table, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	struct rt6_rtnl_dump_arg arg = {</div><div class='add'>+		.filter.dump_exceptions = true,</div><div class='add'>+		.filter.dump_routes = true,</div><div class='add'>+		.filter.rtnl_held = false,</div><div class='add'>+	};</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	unsigned int h, s_h;</div><div class='ctx'> 	unsigned int e = 0, s_e;</div><div class='del'>-	struct rt6_rtnl_dump_arg arg;</div><div class='add'>+	struct hlist_head *head;</div><div class='ctx'> 	struct fib6_walker *w;</div><div class='ctx'> 	struct fib6_table *tb;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	int res = 0;</div><div class='add'>+	unsigned int h, s_h;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	s_h = cb-&gt;args[0];</div><div class='del'>-	s_e = cb-&gt;args[1];</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = ip_valid_fib_dump_req(net, nlh, &amp;arg.filter, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto unlock;</div><div class='add'>+	} else if (nlmsg_len(nlh) &gt;= sizeof(struct rtmsg)) {</div><div class='add'>+		struct rtmsg *rtm = nlmsg_data(nlh);</div><div class='add'>+</div><div class='add'>+		if (rtm-&gt;rtm_flags &amp; RTM_F_PREFIX)</div><div class='add'>+			arg.filter.flags = RTM_F_PREFIX;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	w = (void *)cb-&gt;args[2];</div><div class='ctx'> 	if (!w) {</div><div class='ctx'> 		/* New dump:</div><div class='ctx'> 		 *</div><div class='del'>-		 * 1. hook callback destructor.</div><div class='del'>-		 */</div><div class='del'>-		cb-&gt;args[3] = (long)cb-&gt;done;</div><div class='del'>-		cb-&gt;done = fib6_dump_done;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * 2. allocate and initialize walker.</div><div class='add'>+		 * 1. allocate and initialize walker.</div><div class='ctx'> 		 */</div><div class='ctx'> 		w = kzalloc(sizeof(*w), GFP_ATOMIC);</div><div class='del'>-		if (!w)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (!w) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> 		w-&gt;func = fib6_dump_node;</div><div class='ctx'> 		cb-&gt;args[2] = (long)w;</div><div class='add'>+</div><div class='add'>+		/* 2. hook callback destructor.</div><div class='add'>+		 */</div><div class='add'>+		cb-&gt;args[3] = (long)cb-&gt;done;</div><div class='add'>+		cb-&gt;done = fib6_dump_done;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arg.skb = skb;</div><div class='hunk'>@@ -604,29 +679,50 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> 	arg.net = net;</div><div class='ctx'> 	w-&gt;args = &amp;arg;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	if (arg.filter.table_id) {</div><div class='add'>+		tb = fib6_get_table(net, arg.filter.table_id);</div><div class='add'>+		if (!tb) {</div><div class='add'>+			if (rtnl_msg_family(cb-&gt;nlh) != PF_INET6)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='add'>+			NL_SET_ERR_MSG_MOD(cb-&gt;extack, "FIB table does not exist");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!cb-&gt;args[0]) {</div><div class='add'>+			err = fib6_dump_table(tb, skb, cb);</div><div class='add'>+			if (!err)</div><div class='add'>+				cb-&gt;args[0] = 1;</div><div class='add'>+		}</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s_h = cb-&gt;args[0];</div><div class='add'>+	s_e = cb-&gt;args[1];</div><div class='add'>+</div><div class='ctx'> 	for (h = s_h; h &lt; FIB6_TABLE_HASHSZ; h++, s_e = 0) {</div><div class='ctx'> 		e = 0;</div><div class='ctx'> 		head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='ctx'> 		hlist_for_each_entry_rcu(tb, head, tb6_hlist) {</div><div class='ctx'> 			if (e &lt; s_e)</div><div class='ctx'> 				goto next;</div><div class='del'>-			res = fib6_dump_table(tb, skb, cb);</div><div class='del'>-			if (res != 0)</div><div class='add'>+			err = fib6_dump_table(tb, skb, cb);</div><div class='add'>+			if (err != 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> next:</div><div class='ctx'> 			e++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	cb-&gt;args[1] = e;</div><div class='ctx'> 	cb-&gt;args[0] = h;</div><div class='ctx'> </div><div class='del'>-	res = res &lt; 0 ? res : skb-&gt;len;</div><div class='del'>-	if (res &lt;= 0)</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (err &lt;= 0)</div><div class='ctx'> 		fib6_dump_end(cb);</div><div class='del'>-	return res;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fib6_metric_set(struct fib6_info *f6i, int metric, u32 val)</div><div class='hunk'>@@ -669,8 +765,6 @@ static struct fib6_node *fib6_add_1(struct net *net,</div><div class='ctx'> 	int	bit;</div><div class='ctx'> 	__be32	dir = 0;</div><div class='ctx'> </div><div class='del'>-	RT6_TRACE("fib6_add_1\n");</div><div class='del'>-</div><div class='ctx'> 	/* insert node in tree */</div><div class='ctx'> </div><div class='ctx'> 	fn = root;</div><div class='hunk'>@@ -817,8 +911,8 @@ insert_above:</div><div class='ctx'> </div><div class='ctx'> 		RCU_INIT_POINTER(in-&gt;parent, pn);</div><div class='ctx'> 		in-&gt;leaf = fn-&gt;leaf;</div><div class='del'>-		atomic_inc(&amp;rcu_dereference_protected(in-&gt;leaf,</div><div class='del'>-				lockdep_is_held(&amp;table-&gt;tb6_lock))-&gt;fib6_ref);</div><div class='add'>+		fib6_info_hold(rcu_dereference_protected(in-&gt;leaf,</div><div class='add'>+				lockdep_is_held(&amp;table-&gt;tb6_lock)));</div><div class='ctx'> </div><div class='ctx'> 		/* update parent pointer */</div><div class='ctx'> 		if (dir)</div><div class='hunk'>@@ -870,11 +964,15 @@ insert_above:</div><div class='ctx'> 	return ln;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fib6_drop_pcpu_from(struct fib6_info *f6i,</div><div class='del'>-				const struct fib6_table *table)</div><div class='add'>+static void __fib6_drop_pcpu_from(struct fib6_nh *fib6_nh,</div><div class='add'>+				  const struct fib6_info *match)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='add'>+	if (!fib6_nh-&gt;rt6i_pcpu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	/* release the reference to this fib entry from</div><div class='ctx'> 	 * all of its cached pcpu routes</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -882,17 +980,52 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i,</div><div class='ctx'> 		struct rt6_info **ppcpu_rt;</div><div class='ctx'> 		struct rt6_info *pcpu_rt;</div><div class='ctx'> </div><div class='del'>-		ppcpu_rt = per_cpu_ptr(f6i-&gt;rt6i_pcpu, cpu);</div><div class='del'>-		pcpu_rt = *ppcpu_rt;</div><div class='del'>-		if (pcpu_rt) {</div><div class='add'>+		ppcpu_rt = per_cpu_ptr(fib6_nh-&gt;rt6i_pcpu, cpu);</div><div class='add'>+</div><div class='add'>+		/* Paired with xchg() in rt6_get_pcpu_route() */</div><div class='add'>+		pcpu_rt = READ_ONCE(*ppcpu_rt);</div><div class='add'>+</div><div class='add'>+		/* only dropping the 'from' reference if the cached route</div><div class='add'>+		 * is using 'match'. The cached pcpu_rt-&gt;from only changes</div><div class='add'>+		 * from a fib6_info to NULL (ip6_dst_destroy); it can never</div><div class='add'>+		 * change from one fib6_info reference to another</div><div class='add'>+		 */</div><div class='add'>+		if (pcpu_rt &amp;&amp; rcu_access_pointer(pcpu_rt-&gt;from) == match) {</div><div class='ctx'> 			struct fib6_info *from;</div><div class='ctx'> </div><div class='del'>-			from = rcu_dereference_protected(pcpu_rt-&gt;from,</div><div class='del'>-					     lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='del'>-			rcu_assign_pointer(pcpu_rt-&gt;from, NULL);</div><div class='add'>+			from = unrcu_pointer(xchg(&amp;pcpu_rt-&gt;from, NULL));</div><div class='ctx'> 			fib6_info_release(from);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib6_nh_drop_pcpu_from(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *arg = _arg;</div><div class='add'>+</div><div class='add'>+	__fib6_drop_pcpu_from(nh, arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fib6_drop_pcpu_from(struct fib6_info *f6i)</div><div class='add'>+{</div><div class='add'>+	/* Make sure rt6_make_pcpu_route() wont add other percpu routes</div><div class='add'>+	 * while we are cleaning them here.</div><div class='add'>+	 */</div><div class='add'>+	f6i-&gt;fib6_destroying = 1;</div><div class='add'>+	mb(); /* paired with the cmpxchg() in rt6_make_pcpu_route() */</div><div class='add'>+</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		nexthop_for_each_fib6_nh(f6i-&gt;nh, fib6_nh_drop_pcpu_from, f6i);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		struct fib6_nh *fib6_nh;</div><div class='add'>+</div><div class='add'>+		fib6_nh = f6i-&gt;fib6_nh;</div><div class='add'>+		__fib6_drop_pcpu_from(fib6_nh, f6i);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,</div><div class='hunk'>@@ -900,7 +1033,20 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_table *table = rt-&gt;fib6_table;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;rt-&gt;fib6_ref) != 1) {</div><div class='add'>+	/* Flush all cached dst in exception table */</div><div class='add'>+	rt6_flush_exceptions(rt);</div><div class='add'>+	fib6_drop_pcpu_from(rt);</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;nh) {</div><div class='add'>+		spin_lock(&amp;rt-&gt;nh-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (!list_empty(&amp;rt-&gt;nh_list))</div><div class='add'>+			list_del_init(&amp;rt-&gt;nh_list);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;rt-&gt;nh-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (refcount_read(&amp;rt-&gt;fib6_ref) != 1) {</div><div class='ctx'> 		/* This route is used as dummy address holder in some split</div><div class='ctx'> 		 * nodes. It is not leaked, but it still holds other resources,</div><div class='ctx'> 		 * which must be released in time. So, scan ascendant nodes</div><div class='hunk'>@@ -913,7 +1059,7 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,</div><div class='ctx'> 			struct fib6_info *new_leaf;</div><div class='ctx'> 			if (!(fn-&gt;fn_flags &amp; RTN_RTINFO) &amp;&amp; leaf == rt) {</div><div class='ctx'> 				new_leaf = fib6_find_prefix(net, table, fn);</div><div class='del'>-				atomic_inc(&amp;new_leaf-&gt;fib6_ref);</div><div class='add'>+				fib6_info_hold(new_leaf);</div><div class='ctx'> </div><div class='ctx'> 				rcu_assign_pointer(fn-&gt;leaf, new_leaf);</div><div class='ctx'> 				fib6_info_release(rt);</div><div class='hunk'>@@ -921,10 +1067,10 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,</div><div class='ctx'> 			fn = rcu_dereference_protected(fn-&gt;parent,</div><div class='ctx'> 				    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (rt-&gt;rt6i_pcpu)</div><div class='del'>-			fib6_drop_pcpu_from(rt, table);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	fib6_clean_expires(rt);</div><div class='add'>+	fib6_remove_gc_list(rt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -932,8 +1078,8 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,</div><div class='del'>-			    struct nl_info *info,</div><div class='del'>-			    struct netlink_ext_ack *extack)</div><div class='add'>+			    struct nl_info *info, struct netlink_ext_ack *extack,</div><div class='add'>+			    struct list_head *purge_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *leaf = rcu_dereference_protected(fn-&gt;leaf,</div><div class='ctx'> 				    lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='hunk'>@@ -946,6 +1092,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,</div><div class='ctx'> 		   (info-&gt;nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE));</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> 	bool rt_can_ecmp = rt6_qualify_for_ecmp(rt);</div><div class='add'>+	bool notify_sibling_rt = false;</div><div class='ctx'> 	u16 nlflags = NLM_F_EXCL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -975,20 +1122,26 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,</div><div class='ctx'> 					found++;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (rt_can_ecmp)</div><div class='del'>-					fallback_ins = fallback_ins ?: ins;</div><div class='add'>+				fallback_ins = fallback_ins ?: ins;</div><div class='ctx'> 				goto next_iter;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (rt6_duplicate_nexthop(iter, rt)) {</div><div class='ctx'> 				if (rt-&gt;fib6_nsiblings)</div><div class='del'>-					rt-&gt;fib6_nsiblings = 0;</div><div class='add'>+					WRITE_ONCE(rt-&gt;fib6_nsiblings, 0);</div><div class='ctx'> 				if (!(iter-&gt;fib6_flags &amp; RTF_EXPIRES))</div><div class='ctx'> 					return -EEXIST;</div><div class='del'>-				if (!(rt-&gt;fib6_flags &amp; RTF_EXPIRES))</div><div class='add'>+				if (!(rt-&gt;fib6_flags &amp; RTF_EXPIRES)) {</div><div class='ctx'> 					fib6_clean_expires(iter);</div><div class='del'>-				else</div><div class='add'>+					fib6_remove_gc_list(iter);</div><div class='add'>+				} else {</div><div class='ctx'> 					fib6_set_expires(iter, rt-&gt;expires);</div><div class='add'>+					fib6_add_gc_list(iter);</div><div class='add'>+				}</div><div class='add'>+				if (!(rt-&gt;fib6_flags &amp; (RTF_ADDRCONF | RTF_PREFIX_RT))) {</div><div class='add'>+					iter-&gt;fib6_flags &amp;= ~RTF_ADDRCONF;</div><div class='add'>+					iter-&gt;fib6_flags &amp;= ~RTF_PREFIX_RT;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='ctx'> 				if (rt-&gt;fib6_pmtu)</div><div class='ctx'> 					fib6_metric_set(iter, RTAX_MTU,</div><div class='hunk'>@@ -1008,7 +1161,8 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (rt_can_ecmp &amp;&amp;</div><div class='ctx'> 			    rt6_qualify_for_ecmp(iter))</div><div class='del'>-				rt-&gt;fib6_nsiblings++;</div><div class='add'>+				WRITE_ONCE(rt-&gt;fib6_nsiblings,</div><div class='add'>+					   rt-&gt;fib6_nsiblings + 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (iter-&gt;fib6_metric &gt; rt-&gt;fib6_metric)</div><div class='hunk'>@@ -1019,7 +1173,9 @@ next_iter:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fallback_ins &amp;&amp; !found) {</div><div class='del'>-		/* No ECMP-able route found, replace first non-ECMP one */</div><div class='add'>+		/* No matching route with same ecmp-able-ness found, replace</div><div class='add'>+		 * first matching route</div><div class='add'>+		 */</div><div class='ctx'> 		ins = fallback_ins;</div><div class='ctx'> 		iter = rcu_dereference_protected(*ins,</div><div class='ctx'> 				    lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='hunk'>@@ -1037,15 +1193,17 @@ next_iter:</div><div class='ctx'> </div><div class='ctx'> 		/* Find the first route that have the same metric */</div><div class='ctx'> 		sibling = leaf;</div><div class='add'>+		notify_sibling_rt = true;</div><div class='ctx'> 		while (sibling) {</div><div class='ctx'> 			if (sibling-&gt;fib6_metric == rt-&gt;fib6_metric &amp;&amp;</div><div class='ctx'> 			    rt6_qualify_for_ecmp(sibling)) {</div><div class='del'>-				list_add_tail(&amp;rt-&gt;fib6_siblings,</div><div class='del'>-					      &amp;sibling-&gt;fib6_siblings);</div><div class='add'>+				list_add_tail_rcu(&amp;rt-&gt;fib6_siblings,</div><div class='add'>+						  &amp;sibling-&gt;fib6_siblings);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			sibling = rcu_dereference_protected(sibling-&gt;fib6_next,</div><div class='ctx'> 				    lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='add'>+			notify_sibling_rt = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* For each sibling in the list, increment the counter of</div><div class='ctx'> 		 * siblings. BUG() if counters does not match, list of siblings</div><div class='hunk'>@@ -1054,12 +1212,15 @@ next_iter:</div><div class='ctx'> 		fib6_nsiblings = 0;</div><div class='ctx'> 		list_for_each_entry_safe(sibling, temp_sibling,</div><div class='ctx'> 					 &amp;rt-&gt;fib6_siblings, fib6_siblings) {</div><div class='del'>-			sibling-&gt;fib6_nsiblings++;</div><div class='add'>+			WRITE_ONCE(sibling-&gt;fib6_nsiblings,</div><div class='add'>+				   sibling-&gt;fib6_nsiblings + 1);</div><div class='ctx'> 			BUG_ON(sibling-&gt;fib6_nsiblings != rt-&gt;fib6_nsiblings);</div><div class='ctx'> 			fib6_nsiblings++;</div><div class='ctx'> 		}</div><div class='ctx'> 		BUG_ON(fib6_nsiblings != rt-&gt;fib6_nsiblings);</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		rt6_multipath_rebalance(temp_sibling);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1072,14 +1233,46 @@ next_iter:</div><div class='ctx'> add:</div><div class='ctx'> 		nlflags |= NLM_F_CREATE;</div><div class='ctx'> </div><div class='del'>-		err = call_fib6_entry_notifiers(info-&gt;nl_net,</div><div class='del'>-						FIB_EVENT_ENTRY_ADD,</div><div class='del'>-						rt, extack);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		/* The route should only be notified if it is the first</div><div class='add'>+		 * route in the node or if it is added as a sibling</div><div class='add'>+		 * route to the first route in the node.</div><div class='add'>+		 */</div><div class='add'>+		if (!info-&gt;skip_notify_kernel &amp;&amp;</div><div class='add'>+		    (notify_sibling_rt || ins == &amp;fn-&gt;leaf)) {</div><div class='add'>+			enum fib_event_type fib_event;</div><div class='add'>+</div><div class='add'>+			if (notify_sibling_rt)</div><div class='add'>+				fib_event = FIB_EVENT_ENTRY_APPEND;</div><div class='add'>+			else</div><div class='add'>+				fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+			err = call_fib6_entry_notifiers(info-&gt;nl_net,</div><div class='add'>+							fib_event, rt,</div><div class='add'>+							extack);</div><div class='add'>+			if (err) {</div><div class='add'>+				struct fib6_info *sibling, *next_sibling;</div><div class='add'>+</div><div class='add'>+				/* If the route has siblings, then it first</div><div class='add'>+				 * needs to be unlinked from them.</div><div class='add'>+				 */</div><div class='add'>+				if (!rt-&gt;fib6_nsiblings)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='add'>+				list_for_each_entry_safe(sibling, next_sibling,</div><div class='add'>+							 &amp;rt-&gt;fib6_siblings,</div><div class='add'>+							 fib6_siblings)</div><div class='add'>+					WRITE_ONCE(sibling-&gt;fib6_nsiblings,</div><div class='add'>+						   sibling-&gt;fib6_nsiblings - 1);</div><div class='add'>+				WRITE_ONCE(rt-&gt;fib6_nsiblings, 0);</div><div class='add'>+				list_del_rcu(&amp;rt-&gt;fib6_siblings);</div><div class='add'>+				rcu_read_lock();</div><div class='add'>+				rt6_multipath_rebalance(next_sibling);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rcu_assign_pointer(rt-&gt;fib6_next, iter);</div><div class='del'>-		atomic_inc(&amp;rt-&gt;fib6_ref);</div><div class='add'>+		fib6_info_hold(rt);</div><div class='ctx'> 		rcu_assign_pointer(rt-&gt;fib6_node, fn);</div><div class='ctx'> 		rcu_assign_pointer(*ins, rt);</div><div class='ctx'> 		if (!info-&gt;skip_notify)</div><div class='hunk'>@@ -1101,13 +1294,15 @@ add:</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = call_fib6_entry_notifiers(info-&gt;nl_net,</div><div class='del'>-						FIB_EVENT_ENTRY_REPLACE,</div><div class='del'>-						rt, extack);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		if (!info-&gt;skip_notify_kernel &amp;&amp; ins == &amp;fn-&gt;leaf) {</div><div class='add'>+			err = call_fib6_entry_notifiers(info-&gt;nl_net,</div><div class='add'>+							FIB_EVENT_ENTRY_REPLACE,</div><div class='add'>+							rt, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		atomic_inc(&amp;rt-&gt;fib6_ref);</div><div class='add'>+		fib6_info_hold(rt);</div><div class='ctx'> 		rcu_assign_pointer(rt-&gt;fib6_node, fn);</div><div class='ctx'> 		rt-&gt;fib6_next = iter-&gt;fib6_next;</div><div class='ctx'> 		rcu_assign_pointer(*ins, rt);</div><div class='hunk'>@@ -1119,10 +1314,9 @@ add:</div><div class='ctx'> 		}</div><div class='ctx'> 		nsiblings = iter-&gt;fib6_nsiblings;</div><div class='ctx'> 		iter-&gt;fib6_node = NULL;</div><div class='del'>-		fib6_purge_rt(iter, fn, info-&gt;nl_net);</div><div class='add'>+		list_add(&amp;iter-&gt;purge_link, purge_list);</div><div class='ctx'> 		if (rcu_access_pointer(fn-&gt;rr_ptr) == iter)</div><div class='ctx'> 			fn-&gt;rr_ptr = NULL;</div><div class='del'>-		fib6_info_release(iter);</div><div class='ctx'> </div><div class='ctx'> 		if (nsiblings) {</div><div class='ctx'> 			/* Replacing an ECMP route, remove all siblings */</div><div class='hunk'>@@ -1135,10 +1329,9 @@ add:</div><div class='ctx'> 				if (rt6_qualify_for_ecmp(iter)) {</div><div class='ctx'> 					*ins = iter-&gt;fib6_next;</div><div class='ctx'> 					iter-&gt;fib6_node = NULL;</div><div class='del'>-					fib6_purge_rt(iter, fn, info-&gt;nl_net);</div><div class='add'>+					list_add(&amp;iter-&gt;purge_link, purge_list);</div><div class='ctx'> 					if (rcu_access_pointer(fn-&gt;rr_ptr) == iter)</div><div class='ctx'> 						fn-&gt;rr_ptr = NULL;</div><div class='del'>-					fib6_info_release(iter);</div><div class='ctx'> 					nsiblings--;</div><div class='ctx'> 					info-&gt;nl_net-&gt;ipv6.rt6_stats-&gt;fib_rt_entries--;</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -1154,6 +1347,28 @@ add:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fib6_add_rt2node_nh(struct fib6_node *fn, struct fib6_info *rt,</div><div class='add'>+			       struct nl_info *info, struct netlink_ext_ack *extack,</div><div class='add'>+			       struct list_head *purge_list)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rt-&gt;nh-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;nh-&gt;dead) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop has been deleted");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		err = fib6_add_rt2node(fn, rt, info, extack, purge_list);</div><div class='add'>+		if (!err)</div><div class='add'>+			list_add(&amp;rt-&gt;nh_list, &amp;rt-&gt;nh-&gt;f6i_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;rt-&gt;nh-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fib6_start_gc(struct net *net, struct fib6_info *rt)</div><div class='ctx'> {</div><div class='ctx'> 	if (!timer_pending(&amp;net-&gt;ipv6.ip6_fib_timer) &amp;&amp;</div><div class='hunk'>@@ -1175,10 +1390,10 @@ static void __fib6_update_sernum_upto_root(struct fib6_info *rt,</div><div class='ctx'> 	struct fib6_node *fn = rcu_dereference_protected(rt-&gt;fib6_node,</div><div class='ctx'> 				lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='ctx'> </div><div class='del'>-	/* paired with smp_rmb() in rt6_get_cookie_safe() */</div><div class='add'>+	/* paired with smp_rmb() in fib6_get_cookie_safe() */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	while (fn) {</div><div class='del'>-		fn-&gt;fn_sernum = sernum;</div><div class='add'>+		WRITE_ONCE(fn-&gt;fn_sernum, sernum);</div><div class='ctx'> 		fn = rcu_dereference_protected(fn-&gt;parent,</div><div class='ctx'> 				lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1189,6 +1404,14 @@ void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt)</div><div class='ctx'> 	__fib6_update_sernum_upto_root(rt, fib6_new_sernum(net));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* allow ipv4 to update sernum via ipv6_stub */</div><div class='add'>+void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;f6i-&gt;fib6_table-&gt;tb6_lock);</div><div class='add'>+	fib6_update_sernum_upto_root(net, f6i);</div><div class='add'>+	spin_unlock_bh(&amp;f6i-&gt;fib6_table-&gt;tb6_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Add routing information to the routing tree.</div><div class='ctx'>  *	&lt;destination addr&gt;/&lt;source addr&gt;</div><div class='hunk'>@@ -1200,11 +1423,14 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,</div><div class='ctx'> 	     struct nl_info *info, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_table *table = rt-&gt;fib6_table;</div><div class='del'>-	struct fib6_node *fn, *pn = NULL;</div><div class='add'>+	LIST_HEAD(purge_list);</div><div class='add'>+	struct fib6_node *fn;</div><div class='add'>+#ifdef CONFIG_IPV6_SUBTREES</div><div class='add'>+	struct fib6_node *pn = NULL;</div><div class='add'>+#endif</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	int allow_create = 1;</div><div class='ctx'> 	int replace_required = 0;</div><div class='del'>-	int sernum = fib6_new_sernum(info-&gt;nl_net);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;nlh) {</div><div class='ctx'> 		if (!(info-&gt;nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE))</div><div class='hunk'>@@ -1225,9 +1451,9 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	pn = fn;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	if (rt-&gt;fib6_src.plen) {</div><div class='ctx'> 		struct fib6_node *sn;</div><div class='ctx'> </div><div class='hunk'>@@ -1249,7 +1475,7 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,</div><div class='ctx'> 			if (!sfn)</div><div class='ctx'> 				goto failure;</div><div class='ctx'> </div><div class='del'>-			atomic_inc(&amp;info-&gt;nl_net-&gt;ipv6.fib6_null_entry-&gt;fib6_ref);</div><div class='add'>+			fib6_info_hold(info-&gt;nl_net-&gt;ipv6.fib6_null_entry);</div><div class='ctx'> 			rcu_assign_pointer(sfn-&gt;leaf,</div><div class='ctx'> 					   info-&gt;nl_net-&gt;ipv6.fib6_null_entry);</div><div class='ctx'> 			sfn-&gt;fn_flags = RTN_ROOT;</div><div class='hunk'>@@ -1292,7 +1518,7 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,</div><div class='ctx'> 				rcu_assign_pointer(fn-&gt;leaf,</div><div class='ctx'> 					    info-&gt;nl_net-&gt;ipv6.fib6_null_entry);</div><div class='ctx'> 			} else {</div><div class='del'>-				atomic_inc(&amp;rt-&gt;fib6_ref);</div><div class='add'>+				fib6_info_hold(rt);</div><div class='ctx'> 				rcu_assign_pointer(fn-&gt;leaf, rt);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1300,9 +1526,24 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	err = fib6_add_rt2node(fn, rt, info, extack);</div><div class='add'>+	if (rt-&gt;nh)</div><div class='add'>+		err = fib6_add_rt2node_nh(fn, rt, info, extack, &amp;purge_list);</div><div class='add'>+	else</div><div class='add'>+		err = fib6_add_rt2node(fn, rt, info, extack, &amp;purge_list);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		__fib6_update_sernum_upto_root(rt, sernum);</div><div class='add'>+		struct fib6_info *iter, *next;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(iter, next, &amp;purge_list, purge_link) {</div><div class='add'>+			list_del(&amp;iter-&gt;purge_link);</div><div class='add'>+			fib6_purge_rt(iter, fn, info-&gt;nl_net);</div><div class='add'>+			fib6_info_release(iter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__fib6_update_sernum_upto_root(rt, fib6_new_sernum(info-&gt;nl_net));</div><div class='add'>+</div><div class='add'>+		if (rt-&gt;fib6_flags &amp; RTF_EXPIRES)</div><div class='add'>+			fib6_add_gc_list(rt);</div><div class='add'>+</div><div class='ctx'> 		fib6_start_gc(info-&gt;nl_net, rt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1325,19 +1566,17 @@ out:</div><div class='ctx'> 			if (!pn_leaf &amp;&amp; !(pn-&gt;fn_flags &amp; RTN_RTINFO)) {</div><div class='ctx'> 				pn_leaf = fib6_find_prefix(info-&gt;nl_net, table,</div><div class='ctx'> 							   pn);</div><div class='del'>-#if RT6_DEBUG &gt;= 2</div><div class='del'>-				if (!pn_leaf) {</div><div class='del'>-					WARN_ON(!pn_leaf);</div><div class='add'>+				if (!pn_leaf)</div><div class='ctx'> 					pn_leaf =</div><div class='ctx'> 					    info-&gt;nl_net-&gt;ipv6.fib6_null_entry;</div><div class='del'>-				}</div><div class='del'>-#endif</div><div class='ctx'> 				fib6_info_hold(pn_leaf);</div><div class='ctx'> 				rcu_assign_pointer(pn-&gt;leaf, pn_leaf);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		goto failure;</div><div class='add'>+	} else if (fib6_requires_src(rt)) {</div><div class='add'>+		fib6_routes_require_src_inc(info-&gt;nl_net);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1507,7 +1746,8 @@ static struct fib6_node *fib6_locate_1(struct fib6_node *root,</div><div class='ctx'> 		if (plen == fn-&gt;fn_bit)</div><div class='ctx'> 			return fn;</div><div class='ctx'> </div><div class='del'>-		prev = fn;</div><div class='add'>+		if (fn-&gt;fn_flags &amp; RTN_RTINFO)</div><div class='add'>+			prev = fn;</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1628,7 +1868,7 @@ static struct fib6_node *fib6_repair_tree(struct net *net,</div><div class='ctx'> 					    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='ctx'> 		struct fib6_info *new_fn_leaf;</div><div class='ctx'> </div><div class='del'>-		RT6_TRACE("fixing tree: plen=%d iter=%d\n", fn-&gt;fn_bit, iter);</div><div class='add'>+		pr_debug("fixing tree: plen=%d iter=%d\n", fn-&gt;fn_bit, iter);</div><div class='ctx'> 		iter++;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON(fn-&gt;fn_flags &amp; RTN_RTINFO);</div><div class='hunk'>@@ -1637,10 +1877,14 @@ static struct fib6_node *fib6_repair_tree(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 		children = 0;</div><div class='ctx'> 		child = NULL;</div><div class='del'>-		if (fn_r)</div><div class='del'>-			child = fn_r, children |= 1;</div><div class='del'>-		if (fn_l)</div><div class='del'>-			child = fn_l, children |= 2;</div><div class='add'>+		if (fn_r) {</div><div class='add'>+			child = fn_r;</div><div class='add'>+			children |= 1;</div><div class='add'>+		}</div><div class='add'>+		if (fn_l) {</div><div class='add'>+			child = fn_l;</div><div class='add'>+			children |= 2;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (children == 3 || FIB6_SUBTREE(fn)</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='hunk'>@@ -1687,7 +1931,8 @@ static struct fib6_node *fib6_repair_tree(struct net *net,</div><div class='ctx'> 		FOR_WALKERS(net, w) {</div><div class='ctx'> 			if (!child) {</div><div class='ctx'> 				if (w-&gt;node == fn) {</div><div class='del'>-					RT6_TRACE("W %p adjusted by delnode 1, s=%d/%d\n", w, w-&gt;state, nstate);</div><div class='add'>+					pr_debug("W %p adjusted by delnode 1, s=%d/%d\n",</div><div class='add'>+						 w, w-&gt;state, nstate);</div><div class='ctx'> 					w-&gt;node = pn;</div><div class='ctx'> 					w-&gt;state = nstate;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1695,10 +1940,12 @@ static struct fib6_node *fib6_repair_tree(struct net *net,</div><div class='ctx'> 				if (w-&gt;node == fn) {</div><div class='ctx'> 					w-&gt;node = child;</div><div class='ctx'> 					if (children&amp;2) {</div><div class='del'>-						RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w-&gt;state);</div><div class='add'>+						pr_debug("W %p adjusted by delnode 2, s=%d\n",</div><div class='add'>+							 w, w-&gt;state);</div><div class='ctx'> 						w-&gt;state = w-&gt;state &gt;= FWS_R ? FWS_U : FWS_INIT;</div><div class='ctx'> 					} else {</div><div class='del'>-						RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w-&gt;state);</div><div class='add'>+						pr_debug("W %p adjusted by delnode 2, s=%d\n",</div><div class='add'>+							 w, w-&gt;state);</div><div class='ctx'> 						w-&gt;state = w-&gt;state &gt;= FWS_C ? FWS_U : FWS_INIT;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1719,12 +1966,26 @@ static struct fib6_node *fib6_repair_tree(struct net *net,</div><div class='ctx'> static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,</div><div class='ctx'> 			   struct fib6_info __rcu **rtp, struct nl_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_info *leaf, *replace_rt = NULL;</div><div class='ctx'> 	struct fib6_walker *w;</div><div class='ctx'> 	struct fib6_info *rt = rcu_dereference_protected(*rtp,</div><div class='ctx'> 				    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='ctx'> 	struct net *net = info-&gt;nl_net;</div><div class='add'>+	bool notify_del = false;</div><div class='ctx'> </div><div class='del'>-	RT6_TRACE("fib6_del_route\n");</div><div class='add'>+	/* If the deleted route is the first in the node and it is not part of</div><div class='add'>+	 * a multipath route, then we need to replace it with the next route</div><div class='add'>+	 * in the node, if exists.</div><div class='add'>+	 */</div><div class='add'>+	leaf = rcu_dereference_protected(fn-&gt;leaf,</div><div class='add'>+					 lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='add'>+	if (leaf == rt &amp;&amp; !rt-&gt;fib6_nsiblings) {</div><div class='add'>+		if (rcu_access_pointer(rt-&gt;fib6_next))</div><div class='add'>+			replace_rt = rcu_dereference_protected(rt-&gt;fib6_next,</div><div class='add'>+					    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='add'>+		else</div><div class='add'>+			notify_del = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Unlink it */</div><div class='ctx'> 	*rtp = rt-&gt;fib6_next;</div><div class='hunk'>@@ -1732,9 +1993,6 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,</div><div class='ctx'> 	net-&gt;ipv6.rt6_stats-&gt;fib_rt_entries--;</div><div class='ctx'> 	net-&gt;ipv6.rt6_stats-&gt;fib_discarded_routes++;</div><div class='ctx'> </div><div class='del'>-	/* Flush all cached dst in exception table */</div><div class='del'>-	rt6_flush_exceptions(rt);</div><div class='del'>-</div><div class='ctx'> 	/* Reset round-robin state, if necessary */</div><div class='ctx'> 	if (rcu_access_pointer(fn-&gt;rr_ptr) == rt)</div><div class='ctx'> 		fn-&gt;rr_ptr = NULL;</div><div class='hunk'>@@ -1743,11 +2001,20 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,</div><div class='ctx'> 	if (rt-&gt;fib6_nsiblings) {</div><div class='ctx'> 		struct fib6_info *sibling, *next_sibling;</div><div class='ctx'> </div><div class='add'>+		/* The route is deleted from a multipath route. If this</div><div class='add'>+		 * multipath route is the first route in the node, then we need</div><div class='add'>+		 * to emit a delete notification. Otherwise, we need to skip</div><div class='add'>+		 * the notification.</div><div class='add'>+		 */</div><div class='add'>+		if (rt-&gt;fib6_metric == leaf-&gt;fib6_metric &amp;&amp;</div><div class='add'>+		    rt6_qualify_for_ecmp(leaf))</div><div class='add'>+			notify_del = true;</div><div class='ctx'> 		list_for_each_entry_safe(sibling, next_sibling,</div><div class='ctx'> 					 &amp;rt-&gt;fib6_siblings, fib6_siblings)</div><div class='del'>-			sibling-&gt;fib6_nsiblings--;</div><div class='del'>-		rt-&gt;fib6_nsiblings = 0;</div><div class='del'>-		list_del_init(&amp;rt-&gt;fib6_siblings);</div><div class='add'>+			WRITE_ONCE(sibling-&gt;fib6_nsiblings,</div><div class='add'>+				   sibling-&gt;fib6_nsiblings - 1);</div><div class='add'>+		WRITE_ONCE(rt-&gt;fib6_nsiblings, 0);</div><div class='add'>+		list_del_rcu(&amp;rt-&gt;fib6_siblings);</div><div class='ctx'> 		rt6_multipath_rebalance(next_sibling);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1755,7 +2022,7 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,</div><div class='ctx'> 	read_lock(&amp;net-&gt;ipv6.fib6_walker_lock);</div><div class='ctx'> 	FOR_WALKERS(net, w) {</div><div class='ctx'> 		if (w-&gt;state == FWS_C &amp;&amp; w-&gt;leaf == rt) {</div><div class='del'>-			RT6_TRACE("walker %p adjusted by delroute\n", w);</div><div class='add'>+			pr_debug("walker %p adjusted by delroute\n", w);</div><div class='ctx'> 			w-&gt;leaf = rcu_dereference_protected(rt-&gt;fib6_next,</div><div class='ctx'> 					    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='ctx'> 			if (!w-&gt;leaf)</div><div class='hunk'>@@ -1778,23 +2045,35 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,</div><div class='ctx'> </div><div class='ctx'> 	fib6_purge_rt(rt, fn, net);</div><div class='ctx'> </div><div class='del'>-	call_fib6_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, rt, NULL);</div><div class='add'>+	if (!info-&gt;skip_notify_kernel) {</div><div class='add'>+		if (notify_del)</div><div class='add'>+			call_fib6_entry_notifiers(net, FIB_EVENT_ENTRY_DEL,</div><div class='add'>+						  rt, NULL);</div><div class='add'>+		else if (replace_rt)</div><div class='add'>+			call_fib6_entry_notifiers_replace(net, replace_rt);</div><div class='add'>+	}</div><div class='ctx'> 	if (!info-&gt;skip_notify)</div><div class='ctx'> 		inet6_rt_notify(RTM_DELROUTE, rt, info, 0);</div><div class='add'>+</div><div class='ctx'> 	fib6_info_release(rt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Need to own table-&gt;tb6_lock */</div><div class='ctx'> int fib6_del(struct fib6_info *rt, struct nl_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_node *fn = rcu_dereference_protected(rt-&gt;fib6_node,</div><div class='del'>-				    lockdep_is_held(&amp;rt-&gt;fib6_table-&gt;tb6_lock));</div><div class='del'>-	struct fib6_table *table = rt-&gt;fib6_table;</div><div class='ctx'> 	struct net *net = info-&gt;nl_net;</div><div class='ctx'> 	struct fib6_info __rcu **rtp;</div><div class='ctx'> 	struct fib6_info __rcu **rtp_next;</div><div class='add'>+	struct fib6_table *table;</div><div class='add'>+	struct fib6_node *fn;</div><div class='add'>+</div><div class='add'>+	if (rt == net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	if (!fn || rt == net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+	table = rt-&gt;fib6_table;</div><div class='add'>+	fn = rcu_dereference_protected(rt-&gt;fib6_node,</div><div class='add'>+				       lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='add'>+	if (!fn)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!(fn-&gt;fn_flags &amp; RTN_RTINFO));</div><div class='hunk'>@@ -1807,6 +2086,8 @@ int fib6_del(struct fib6_info *rt, struct nl_info *info)</div><div class='ctx'> 		struct fib6_info *cur = rcu_dereference_protected(*rtp,</div><div class='ctx'> 					lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='ctx'> 		if (rt == cur) {</div><div class='add'>+			if (fib6_requires_src(cur))</div><div class='add'>+				fib6_routes_require_src_dec(info-&gt;nl_net);</div><div class='ctx'> 			fib6_del_route(table, fn, rtp, info);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1861,8 +2142,8 @@ static int fib6_walk_continue(struct fib6_walker *w)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			w-&gt;state = FWS_L;</div><div class='add'>+			fallthrough;</div><div class='ctx'> #endif</div><div class='del'>-			/* fall through */</div><div class='ctx'> 		case FWS_L:</div><div class='ctx'> 			left = rcu_dereference_protected(fn-&gt;left, 1);</div><div class='ctx'> 			if (left) {</div><div class='hunk'>@@ -1871,7 +2152,7 @@ static int fib6_walk_continue(struct fib6_walker *w)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			w-&gt;state = FWS_R;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case FWS_R:</div><div class='ctx'> 			right = rcu_dereference_protected(fn-&gt;right, 1);</div><div class='ctx'> 			if (right) {</div><div class='hunk'>@@ -1881,7 +2162,7 @@ static int fib6_walk_continue(struct fib6_walker *w)</div><div class='ctx'> 			}</div><div class='ctx'> 			w-&gt;state = FWS_C;</div><div class='ctx'> 			w-&gt;leaf = rcu_dereference_protected(fn-&gt;leaf, 1);</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case FWS_C:</div><div class='ctx'> 			if (w-&gt;leaf &amp;&amp; fn-&gt;fn_flags &amp; RTN_RTINFO) {</div><div class='ctx'> 				int err;</div><div class='hunk'>@@ -1900,7 +2181,7 @@ static int fib6_walk_continue(struct fib6_walker *w)</div><div class='ctx'> 			}</div><div class='ctx'> skip:</div><div class='ctx'> 			w-&gt;state = FWS_U;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case FWS_U:</div><div class='ctx'> 			if (fn == w-&gt;root)</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -1952,11 +2233,12 @@ static int fib6_clean_node(struct fib6_walker *w)</div><div class='ctx'> 	struct fib6_cleaner *c = container_of(w, struct fib6_cleaner, w);</div><div class='ctx'> 	struct nl_info info = {</div><div class='ctx'> 		.nl_net = c-&gt;net,</div><div class='add'>+		.skip_notify = c-&gt;skip_notify,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;sernum != FIB6_NO_SERNUM_CHANGE &amp;&amp;</div><div class='del'>-	    w-&gt;node-&gt;fn_sernum != c-&gt;sernum)</div><div class='del'>-		w-&gt;node-&gt;fn_sernum = c-&gt;sernum;</div><div class='add'>+	    READ_ONCE(w-&gt;node-&gt;fn_sernum) != c-&gt;sernum)</div><div class='add'>+		WRITE_ONCE(w-&gt;node-&gt;fn_sernum, c-&gt;sernum);</div><div class='ctx'> </div><div class='ctx'> 	if (!c-&gt;func) {</div><div class='ctx'> 		WARN_ON_ONCE(c-&gt;sernum == FIB6_NO_SERNUM_CHANGE);</div><div class='hunk'>@@ -2003,7 +2285,7 @@ static int fib6_clean_node(struct fib6_walker *w)</div><div class='ctx'> </div><div class='ctx'> static void fib6_clean_tree(struct net *net, struct fib6_node *root,</div><div class='ctx'> 			    int (*func)(struct fib6_info *, void *arg),</div><div class='del'>-			    int sernum, void *arg)</div><div class='add'>+			    int sernum, void *arg, bool skip_notify)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_cleaner c;</div><div class='ctx'> </div><div class='hunk'>@@ -2011,17 +2293,19 @@ static void fib6_clean_tree(struct net *net, struct fib6_node *root,</div><div class='ctx'> 	c.w.func = fib6_clean_node;</div><div class='ctx'> 	c.w.count = 0;</div><div class='ctx'> 	c.w.skip = 0;</div><div class='add'>+	c.w.skip_in_node = 0;</div><div class='ctx'> 	c.func = func;</div><div class='ctx'> 	c.sernum = sernum;</div><div class='ctx'> 	c.arg = arg;</div><div class='ctx'> 	c.net = net;</div><div class='add'>+	c.skip_notify = skip_notify;</div><div class='ctx'> </div><div class='ctx'> 	fib6_walk(net, &amp;c.w);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __fib6_clean_all(struct net *net,</div><div class='ctx'> 			     int (*func)(struct fib6_info *, void *),</div><div class='del'>-			     int sernum, void *arg)</div><div class='add'>+			     int sernum, void *arg, bool skip_notify)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_table *table;</div><div class='ctx'> 	struct hlist_head *head;</div><div class='hunk'>@@ -2033,7 +2317,7 @@ static void __fib6_clean_all(struct net *net,</div><div class='ctx'> 		hlist_for_each_entry_rcu(table, head, tb6_hlist) {</div><div class='ctx'> 			spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 			fib6_clean_tree(net, &amp;table-&gt;tb6_root,</div><div class='del'>-					func, sernum, arg);</div><div class='add'>+					func, sernum, arg, skip_notify);</div><div class='ctx'> 			spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2043,23 +2327,29 @@ static void __fib6_clean_all(struct net *net,</div><div class='ctx'> void fib6_clean_all(struct net *net, int (*func)(struct fib6_info *, void *),</div><div class='ctx'> 		    void *arg)</div><div class='ctx'> {</div><div class='del'>-	__fib6_clean_all(net, func, FIB6_NO_SERNUM_CHANGE, arg);</div><div class='add'>+	__fib6_clean_all(net, func, FIB6_NO_SERNUM_CHANGE, arg, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_clean_all_skip_notify(struct net *net,</div><div class='add'>+				int (*func)(struct fib6_info *, void *),</div><div class='add'>+				void *arg)</div><div class='add'>+{</div><div class='add'>+	__fib6_clean_all(net, func, FIB6_NO_SERNUM_CHANGE, arg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fib6_flush_trees(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int new_sernum = fib6_new_sernum(net);</div><div class='ctx'> </div><div class='del'>-	__fib6_clean_all(net, NULL, new_sernum, NULL);</div><div class='add'>+	__fib6_clean_all(net, NULL, new_sernum, NULL, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Garbage collection</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int fib6_age(struct fib6_info *rt, void *arg)</div><div class='add'>+static int fib6_age(struct fib6_info *rt, struct fib6_gc_args *gc_args)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_gc_args *gc_args = arg;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2069,7 +2359,7 @@ static int fib6_age(struct fib6_info *rt, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;fib6_flags &amp; RTF_EXPIRES &amp;&amp; rt-&gt;expires) {</div><div class='ctx'> 		if (time_after(now, rt-&gt;expires)) {</div><div class='del'>-			RT6_TRACE("expiring %p\n", rt);</div><div class='add'>+			pr_debug("expiring %p\n", rt);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		gc_args-&gt;more++;</div><div class='hunk'>@@ -2084,6 +2374,42 @@ static int fib6_age(struct fib6_info *rt, void *arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fib6_gc_table(struct net *net,</div><div class='add'>+			  struct fib6_table *tb6,</div><div class='add'>+			  struct fib6_gc_args *gc_args)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *rt;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+	struct nl_info info = {</div><div class='add'>+		.nl_net = net,</div><div class='add'>+		.skip_notify = false,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(rt, n, &amp;tb6-&gt;tb6_gc_hlist, gc_link)</div><div class='add'>+		if (fib6_age(rt, gc_args) == -1)</div><div class='add'>+			fib6_del(rt, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fib6_gc_all(struct net *net, struct fib6_gc_args *gc_args)</div><div class='add'>+{</div><div class='add'>+	struct fib6_table *table;</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+	unsigned int h;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (h = 0; h &lt; FIB6_TABLE_HASHSZ; h++) {</div><div class='add'>+		head = &amp;net-&gt;ipv6.fib_table_hash[h];</div><div class='add'>+		hlist_for_each_entry_rcu(table, head, tb6_hlist) {</div><div class='add'>+			spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='add'>+			fib6_gc_table(net, table, gc_args);</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void fib6_run_gc(unsigned long expires, struct net *net, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_gc_args gc_args;</div><div class='hunk'>@@ -2099,7 +2425,7 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force)</div><div class='ctx'> 			  net-&gt;ipv6.sysctl.ip6_rt_gc_interval;</div><div class='ctx'> 	gc_args.more = 0;</div><div class='ctx'> </div><div class='del'>-	fib6_clean_all(net, fib6_age, &amp;gc_args);</div><div class='add'>+	fib6_gc_all(net, &amp;gc_args);</div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	net-&gt;ipv6.ip6_rt_last_gc = now;</div><div class='ctx'> </div><div class='hunk'>@@ -2108,13 +2434,13 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force)</div><div class='ctx'> 			  round_jiffies(now</div><div class='ctx'> 					+ net-&gt;ipv6.sysctl.ip6_rt_gc_interval));</div><div class='ctx'> 	else</div><div class='del'>-		del_timer(&amp;net-&gt;ipv6.ip6_fib_timer);</div><div class='add'>+		timer_delete(&amp;net-&gt;ipv6.ip6_fib_timer);</div><div class='ctx'> 	spin_unlock_bh(&amp;net-&gt;ipv6.fib6_gc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fib6_gc_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct net *arg = from_timer(arg, t, ipv6.ip6_fib_timer);</div><div class='add'>+	struct net *arg = timer_container_of(arg, t, ipv6.ip6_fib_timer);</div><div class='ctx'> </div><div class='ctx'> 	fib6_run_gc(0, arg, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -2128,6 +2454,10 @@ static int __net_init fib6_net_init(struct net *net)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* Default to 3-tuple */</div><div class='add'>+	net-&gt;ipv6.sysctl.multipath_hash_fields =</div><div class='add'>+		FIB_MULTIPATH_HASH_FIELD_DEFAULT_MASK;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;net-&gt;ipv6.fib6_gc_lock);</div><div class='ctx'> 	rwlock_init(&amp;net-&gt;ipv6.fib6_walker_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;net-&gt;ipv6.fib6_walkers);</div><div class='hunk'>@@ -2135,7 +2465,7 @@ static int __net_init fib6_net_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv6.rt6_stats = kzalloc(sizeof(*net-&gt;ipv6.rt6_stats), GFP_KERNEL);</div><div class='ctx'> 	if (!net-&gt;ipv6.rt6_stats)</div><div class='del'>-		goto out_timer;</div><div class='add'>+		goto out_notifier;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid false sharing : Use at least a full cache line */</div><div class='ctx'> 	size = max_t(size_t, size, L1_CACHE_BYTES);</div><div class='hunk'>@@ -2144,6 +2474,8 @@ static int __net_init fib6_net_init(struct net *net)</div><div class='ctx'> 	if (!net-&gt;ipv6.fib_table_hash)</div><div class='ctx'> 		goto out_rt6_stats;</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;net-&gt;ipv6.fib_table_hash_lock);</div><div class='add'>+</div><div class='ctx'> 	net-&gt;ipv6.fib6_main_tbl = kzalloc(sizeof(*net-&gt;ipv6.fib6_main_tbl),</div><div class='ctx'> 					  GFP_KERNEL);</div><div class='ctx'> 	if (!net-&gt;ipv6.fib6_main_tbl)</div><div class='hunk'>@@ -2155,6 +2487,7 @@ static int __net_init fib6_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.fib6_main_tbl-&gt;tb6_root.fn_flags =</div><div class='ctx'> 		RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;</div><div class='ctx'> 	inet_peer_base_init(&amp;net-&gt;ipv6.fib6_main_tbl-&gt;tb6_peers);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;net-&gt;ipv6.fib6_main_tbl-&gt;tb6_gc_hlist);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_MULTIPLE_TABLES</div><div class='ctx'> 	net-&gt;ipv6.fib6_local_tbl = kzalloc(sizeof(*net-&gt;ipv6.fib6_local_tbl),</div><div class='hunk'>@@ -2167,6 +2500,7 @@ static int __net_init fib6_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.fib6_local_tbl-&gt;tb6_root.fn_flags =</div><div class='ctx'> 		RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;</div><div class='ctx'> 	inet_peer_base_init(&amp;net-&gt;ipv6.fib6_local_tbl-&gt;tb6_peers);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;net-&gt;ipv6.fib6_local_tbl-&gt;tb6_gc_hlist);</div><div class='ctx'> #endif</div><div class='ctx'> 	fib6_tables_init(net);</div><div class='ctx'> </div><div class='hunk'>@@ -2180,7 +2514,7 @@ out_fib_table_hash:</div><div class='ctx'> 	kfree(net-&gt;ipv6.fib_table_hash);</div><div class='ctx'> out_rt6_stats:</div><div class='ctx'> 	kfree(net-&gt;ipv6.rt6_stats);</div><div class='del'>-out_timer:</div><div class='add'>+out_notifier:</div><div class='ctx'> 	fib6_notifier_exit(net);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -2189,7 +2523,7 @@ static void fib6_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;net-&gt;ipv6.ip6_fib_timer);</div><div class='add'>+	timer_delete_sync(&amp;net-&gt;ipv6.ip6_fib_timer);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; FIB6_TABLE_HASHSZ; i++) {</div><div class='ctx'> 		struct hlist_head *head = &amp;net-&gt;ipv6.fib_table_hash[i];</div><div class='hunk'>@@ -2212,14 +2546,18 @@ static struct pernet_operations fib6_net_ops = {</div><div class='ctx'> 	.exit = fib6_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rtnl_msg_handler fib6_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .dumpit = inet6_dump_fib,</div><div class='add'>+	 .flags = RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init fib6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	fib6_node_kmem = kmem_cache_create("fib6_nodes",</div><div class='del'>-					   sizeof(struct fib6_node),</div><div class='del'>-					   0, SLAB_HWCACHE_ALIGN,</div><div class='del'>-					   NULL);</div><div class='add'>+	fib6_node_kmem = KMEM_CACHE(fib6_node,</div><div class='add'>+				    SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT);</div><div class='ctx'> 	if (!fib6_node_kmem)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2227,8 +2565,7 @@ int __init fib6_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_kmem_cache_create;</div><div class='ctx'> </div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETROUTE, NULL,</div><div class='del'>-				   inet6_dump_fib, 0);</div><div class='add'>+	ret = rtnl_register_many(fib6_rtnl_msg_handlers);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unregister_subsys;</div><div class='ctx'> </div><div class='hunk'>@@ -2250,12 +2587,17 @@ void fib6_gc_cleanup(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-static int ipv6_route_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+static int ipv6_route_native_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *rt = v;</div><div class='ctx'> 	struct ipv6_route_iter *iter = seq-&gt;private;</div><div class='add'>+	struct fib6_nh *fib6_nh = rt-&gt;fib6_nh;</div><div class='add'>+	unsigned int flags = rt-&gt;fib6_flags;</div><div class='ctx'> 	const struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	if (rt-&gt;nh)</div><div class='add'>+		fib6_nh = nexthop_fib6_nh(rt-&gt;nh);</div><div class='add'>+</div><div class='ctx'> 	seq_printf(seq, "%pi6 %02x ", &amp;rt-&gt;fib6_dst.addr, rt-&gt;fib6_dst.plen);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='hunk'>@@ -2263,15 +2605,17 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> #else</div><div class='ctx'> 	seq_puts(seq, "00000000000000000000000000000000 00 ");</div><div class='ctx'> #endif</div><div class='del'>-	if (rt-&gt;fib6_flags &amp; RTF_GATEWAY)</div><div class='del'>-		seq_printf(seq, "%pi6", &amp;rt-&gt;fib6_nh.nh_gw);</div><div class='del'>-	else</div><div class='add'>+	if (fib6_nh-&gt;fib_nh_gw_family) {</div><div class='add'>+		flags |= RTF_GATEWAY;</div><div class='add'>+		seq_printf(seq, "%pi6", &amp;fib6_nh-&gt;fib_nh_gw6);</div><div class='add'>+	} else {</div><div class='ctx'> 		seq_puts(seq, "00000000000000000000000000000000");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev = rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+	dev = fib6_nh-&gt;fib_nh_dev;</div><div class='ctx'> 	seq_printf(seq, " %08x %08x %08x %08x %8s\n",</div><div class='del'>-		   rt-&gt;fib6_metric, atomic_read(&amp;rt-&gt;fib6_ref), 0,</div><div class='del'>-		   rt-&gt;fib6_flags, dev ? dev-&gt;name : "");</div><div class='add'>+		   rt-&gt;fib6_metric, refcount_read(&amp;rt-&gt;fib6_ref), 0,</div><div class='add'>+		   flags, dev ? dev-&gt;name : "");</div><div class='ctx'> 	iter-&gt;w.leaf = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2304,7 +2648,7 @@ static void ipv6_route_seq_setup_walk(struct ipv6_route_iter *iter,</div><div class='ctx'> 	iter-&gt;w.state = FWS_INIT;</div><div class='ctx'> 	iter-&gt;w.node = iter-&gt;w.root;</div><div class='ctx'> 	iter-&gt;w.args = iter;</div><div class='del'>-	iter-&gt;sernum = iter-&gt;w.root-&gt;fn_sernum;</div><div class='add'>+	iter-&gt;sernum = READ_ONCE(iter-&gt;w.root-&gt;fn_sernum);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;iter-&gt;w.lh);</div><div class='ctx'> 	fib6_walker_link(net, &amp;iter-&gt;w);</div><div class='ctx'> }</div><div class='hunk'>@@ -2317,14 +2661,14 @@ static struct fib6_table *ipv6_route_seq_next_table(struct fib6_table *tbl,</div><div class='ctx'> </div><div class='ctx'> 	if (tbl) {</div><div class='ctx'> 		h = (tbl-&gt;tb6_id &amp; (FIB6_TABLE_HASHSZ - 1)) + 1;</div><div class='del'>-		node = rcu_dereference_bh(hlist_next_rcu(&amp;tbl-&gt;tb6_hlist));</div><div class='add'>+		node = rcu_dereference(hlist_next_rcu(&amp;tbl-&gt;tb6_hlist));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		h = 0;</div><div class='ctx'> 		node = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (!node &amp;&amp; h &lt; FIB6_TABLE_HASHSZ) {</div><div class='del'>-		node = rcu_dereference_bh(</div><div class='add'>+		node = rcu_dereference(</div><div class='ctx'> 			hlist_first_rcu(&amp;net-&gt;ipv6.fib_table_hash[h++]));</div><div class='ctx'> 	}</div><div class='ctx'> 	return hlist_entry_safe(node, struct fib6_table, tb6_hlist);</div><div class='hunk'>@@ -2332,8 +2676,10 @@ static struct fib6_table *ipv6_route_seq_next_table(struct fib6_table *tbl,</div><div class='ctx'> </div><div class='ctx'> static void ipv6_route_check_sernum(struct ipv6_route_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	if (iter-&gt;sernum != iter-&gt;w.root-&gt;fn_sernum) {</div><div class='del'>-		iter-&gt;sernum = iter-&gt;w.root-&gt;fn_sernum;</div><div class='add'>+	int sernum = READ_ONCE(iter-&gt;w.root-&gt;fn_sernum);</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;sernum != sernum) {</div><div class='add'>+		iter-&gt;sernum = sernum;</div><div class='ctx'> 		iter-&gt;w.state = FWS_INIT;</div><div class='ctx'> 		iter-&gt;w.node = iter-&gt;w.root;</div><div class='ctx'> 		WARN_ON(iter-&gt;w.skip);</div><div class='hunk'>@@ -2348,14 +2694,13 @@ static void *ipv6_route_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct ipv6_route_iter *iter = seq-&gt;private;</div><div class='ctx'> </div><div class='add'>+	++(*pos);</div><div class='ctx'> 	if (!v)</div><div class='ctx'> 		goto iter_table;</div><div class='ctx'> </div><div class='del'>-	n = rcu_dereference_bh(((struct fib6_info *)v)-&gt;fib6_next);</div><div class='del'>-	if (n) {</div><div class='del'>-		++*pos;</div><div class='add'>+	n = rcu_dereference(((struct fib6_info *)v)-&gt;fib6_next);</div><div class='add'>+	if (n)</div><div class='ctx'> 		return n;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> iter_table:</div><div class='ctx'> 	ipv6_route_check_sernum(iter);</div><div class='hunk'>@@ -2363,8 +2708,6 @@ iter_table:</div><div class='ctx'> 	r = fib6_walk_continue(&amp;iter-&gt;w);</div><div class='ctx'> 	spin_unlock_bh(&amp;iter-&gt;tbl-&gt;tb6_lock);</div><div class='ctx'> 	if (r &gt; 0) {</div><div class='del'>-		if (v)</div><div class='del'>-			++*pos;</div><div class='ctx'> 		return iter-&gt;w.leaf;</div><div class='ctx'> 	} else if (r &lt; 0) {</div><div class='ctx'> 		fib6_walker_unlink(net, &amp;iter-&gt;w);</div><div class='hunk'>@@ -2381,18 +2724,20 @@ iter_table:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *ipv6_route_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-	__acquires(RCU_BH)</div><div class='add'>+	__acquires(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct ipv6_route_iter *iter = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	iter-&gt;tbl = ipv6_route_seq_next_table(NULL, net);</div><div class='ctx'> 	iter-&gt;skip = *pos;</div><div class='ctx'> </div><div class='ctx'> 	if (iter-&gt;tbl) {</div><div class='add'>+		loff_t p = 0;</div><div class='add'>+</div><div class='ctx'> 		ipv6_route_seq_setup_walk(iter, net);</div><div class='del'>-		return ipv6_route_seq_next(seq, NULL, pos);</div><div class='add'>+		return ipv6_route_seq_next(seq, NULL, &amp;p);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2404,8 +2749,8 @@ static bool ipv6_route_iter_active(struct ipv6_route_iter *iter)</div><div class='ctx'> 	return w-&gt;node &amp;&amp; !(w-&gt;state == FWS_U &amp;&amp; w-&gt;node == w-&gt;root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ipv6_route_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-	__releases(RCU_BH)</div><div class='add'>+static void ipv6_route_native_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+	__releases(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct ipv6_route_iter *iter = seq-&gt;private;</div><div class='hunk'>@@ -2413,9 +2758,65 @@ static void ipv6_route_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	if (ipv6_route_iter_active(iter))</div><div class='ctx'> 		fib6_walker_unlink(net, &amp;iter-&gt;w);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6) &amp;&amp; defined(CONFIG_BPF_SYSCALL)</div><div class='add'>+static int ipv6_route_prog_seq_show(struct bpf_prog *prog,</div><div class='add'>+				    struct bpf_iter_meta *meta,</div><div class='add'>+				    void *v)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter__ipv6_route ctx;</div><div class='add'>+</div><div class='add'>+	ctx.meta = meta;</div><div class='add'>+	ctx.rt = v;</div><div class='add'>+	return bpf_iter_run_prog(prog, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv6_route_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_route_iter *iter = seq-&gt;private;</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	meta.seq = seq;</div><div class='add'>+	prog = bpf_iter_get_info(&amp;meta, false);</div><div class='add'>+	if (!prog)</div><div class='add'>+		return ipv6_route_native_seq_show(seq, v);</div><div class='add'>+</div><div class='add'>+	ret = ipv6_route_prog_seq_show(prog, &amp;meta, v);</div><div class='add'>+	iter-&gt;w.leaf = NULL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipv6_route_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_meta meta;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	if (!v) {</div><div class='add'>+		meta.seq = seq;</div><div class='add'>+		prog = bpf_iter_get_info(&amp;meta, true);</div><div class='add'>+		if (prog)</div><div class='add'>+			(void)ipv6_route_prog_seq_show(prog, &amp;meta, v);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ipv6_route_native_seq_stop(seq, v);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int ipv6_route_seq_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	return ipv6_route_native_seq_show(seq, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipv6_route_seq_stop(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	ipv6_route_native_seq_stop(seq, v);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> const struct seq_operations ipv6_route_seq_ops = {</div><div class='ctx'> 	.start	= ipv6_route_seq_start,</div><div class='ctx'> 	.next	= ipv6_route_seq_next,</div><div class='head'>diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c<br/>index cb54a8a3c273..60d0be47a9f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_flowlabel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_flowlabel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_flowlabel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_flowlabel.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	ip6_flowlabel.c		IPv6 flowlabel manager.</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Authors:	Alexey Kuznetsov, &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='add'>+#include &lt;linux/jump_label_ratelimit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='hunk'>@@ -57,19 +54,22 @@ static DEFINE_SPINLOCK(ip6_fl_lock);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ip6_sk_fl_lock);</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_DEFERRED_FALSE(ipv6_flowlabel_exclusive, HZ);</div><div class='add'>+EXPORT_SYMBOL(ipv6_flowlabel_exclusive);</div><div class='add'>+</div><div class='ctx'> #define for_each_fl_rcu(hash, fl)				\</div><div class='del'>-	for (fl = rcu_dereference_bh(fl_ht[(hash)]);		\</div><div class='add'>+	for (fl = rcu_dereference(fl_ht[(hash)]);		\</div><div class='ctx'> 	     fl != NULL;					\</div><div class='del'>-	     fl = rcu_dereference_bh(fl-&gt;next))</div><div class='add'>+	     fl = rcu_dereference(fl-&gt;next))</div><div class='ctx'> #define for_each_fl_continue_rcu(fl)				\</div><div class='del'>-	for (fl = rcu_dereference_bh(fl-&gt;next);			\</div><div class='add'>+	for (fl = rcu_dereference(fl-&gt;next);			\</div><div class='ctx'> 	     fl != NULL;					\</div><div class='del'>-	     fl = rcu_dereference_bh(fl-&gt;next))</div><div class='add'>+	     fl = rcu_dereference(fl-&gt;next))</div><div class='ctx'> </div><div class='del'>-#define for_each_sk_fl_rcu(np, sfl)				\</div><div class='del'>-	for (sfl = rcu_dereference_bh(np-&gt;ipv6_fl_list);	\</div><div class='add'>+#define for_each_sk_fl_rcu(sk, sfl)				\</div><div class='add'>+	for (sfl = rcu_dereference(inet_sk(sk)-&gt;ipv6_fl_list);	\</div><div class='ctx'> 	     sfl != NULL;					\</div><div class='del'>-	     sfl = rcu_dereference_bh(sfl-&gt;next))</div><div class='add'>+	     sfl = rcu_dereference(sfl-&gt;next))</div><div class='ctx'> </div><div class='ctx'> static inline struct ip6_flowlabel *__fl_lookup(struct net *net, __be32 label)</div><div class='ctx'> {</div><div class='hunk'>@@ -86,23 +86,41 @@ static struct ip6_flowlabel *fl_lookup(struct net *net, __be32 label)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_flowlabel *fl;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	fl = __fl_lookup(net, label);</div><div class='ctx'> 	if (fl &amp;&amp; !atomic_inc_not_zero(&amp;fl-&gt;users))</div><div class='ctx'> 		fl = NULL;</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return fl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool fl_shared_exclusive(struct ip6_flowlabel *fl)</div><div class='add'>+{</div><div class='add'>+	return fl-&gt;share == IPV6_FL_S_EXCL ||</div><div class='add'>+	       fl-&gt;share == IPV6_FL_S_PROCESS ||</div><div class='add'>+	       fl-&gt;share == IPV6_FL_S_USER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fl_free_rcu(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ip6_flowlabel *fl = container_of(head, struct ip6_flowlabel, rcu);</div><div class='add'>+</div><div class='add'>+	if (fl-&gt;share == IPV6_FL_S_PROCESS)</div><div class='add'>+		put_pid(fl-&gt;owner.pid);</div><div class='add'>+	kfree(fl-&gt;opt);</div><div class='add'>+	kfree(fl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void fl_free(struct ip6_flowlabel *fl)</div><div class='ctx'> {</div><div class='del'>-	if (fl) {</div><div class='del'>-		if (fl-&gt;share == IPV6_FL_S_PROCESS)</div><div class='del'>-			put_pid(fl-&gt;owner.pid);</div><div class='del'>-		kfree(fl-&gt;opt);</div><div class='del'>-		kfree_rcu(fl, rcu);</div><div class='del'>-	}</div><div class='add'>+	if (!fl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fl_shared_exclusive(fl) || fl-&gt;opt)</div><div class='add'>+		static_branch_slow_dec_deferred(&amp;ipv6_flowlabel_exclusive);</div><div class='add'>+</div><div class='add'>+	call_rcu(&amp;fl-&gt;rcu, fl_free_rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fl_release(struct ip6_flowlabel *fl)</div><div class='hunk'>@@ -199,10 +217,11 @@ static struct ip6_flowlabel *fl_intern(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	fl-&gt;label = label &amp; IPV6_FLOWLABEL_MASK;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	spin_lock_bh(&amp;ip6_fl_lock);</div><div class='ctx'> 	if (label == 0) {</div><div class='ctx'> 		for (;;) {</div><div class='del'>-			fl-&gt;label = htonl(prandom_u32())&amp;IPV6_FLOWLABEL_MASK;</div><div class='add'>+			fl-&gt;label = htonl(get_random_u32())&amp;IPV6_FLOWLABEL_MASK;</div><div class='ctx'> 			if (fl-&gt;label) {</div><div class='ctx'> 				lfl = __fl_lookup(net, fl-&gt;label);</div><div class='ctx'> 				if (!lfl)</div><div class='hunk'>@@ -222,6 +241,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net,</div><div class='ctx'> 		if (lfl) {</div><div class='ctx'> 			atomic_inc(&amp;lfl-&gt;users);</div><div class='ctx'> 			spin_unlock_bh(&amp;ip6_fl_lock);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return lfl;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -231,6 +251,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net,</div><div class='ctx'> 	rcu_assign_pointer(fl_ht[FL_HASH(fl-&gt;label)], fl);</div><div class='ctx'> 	atomic_inc(&amp;fl_size);</div><div class='ctx'> 	spin_unlock_bh(&amp;ip6_fl_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -238,40 +259,39 @@ static struct ip6_flowlabel *fl_intern(struct net *net,</div><div class='ctx'> </div><div class='ctx'> /* Socket flowlabel lists */</div><div class='ctx'> </div><div class='del'>-struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)</div><div class='add'>+struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_fl_socklist *sfl;</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	label &amp;= IPV6_FLOWLABEL_MASK;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	for_each_sk_fl_rcu(np, sfl) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_sk_fl_rcu(sk, sfl) {</div><div class='ctx'> 		struct ip6_flowlabel *fl = sfl-&gt;fl;</div><div class='del'>-		if (fl-&gt;label == label) {</div><div class='add'>+</div><div class='add'>+		if (fl-&gt;label == label &amp;&amp; atomic_inc_not_zero(&amp;fl-&gt;users)) {</div><div class='ctx'> 			fl-&gt;lastuse = jiffies;</div><div class='del'>-			atomic_inc(&amp;fl-&gt;users);</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return fl;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(fl6_sock_lookup);</div><div class='add'>+EXPORT_SYMBOL_GPL(__fl6_sock_lookup);</div><div class='ctx'> </div><div class='ctx'> void fl6_free_socklist(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct ipv6_fl_socklist *sfl;</div><div class='ctx'> </div><div class='del'>-	if (!rcu_access_pointer(np-&gt;ipv6_fl_list))</div><div class='add'>+	if (!rcu_access_pointer(inet-&gt;ipv6_fl_list))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ip6_sk_fl_lock);</div><div class='del'>-	while ((sfl = rcu_dereference_protected(np-&gt;ipv6_fl_list,</div><div class='add'>+	while ((sfl = rcu_dereference_protected(inet-&gt;ipv6_fl_list,</div><div class='ctx'> 						lockdep_is_held(&amp;ip6_sk_fl_lock))) != NULL) {</div><div class='del'>-		np-&gt;ipv6_fl_list = sfl-&gt;next;</div><div class='add'>+		inet-&gt;ipv6_fl_list = sfl-&gt;next;</div><div class='ctx'> 		spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='ctx'> </div><div class='ctx'> 		fl_release(sfl-&gt;fl);</div><div class='hunk'>@@ -353,7 +373,7 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo</div><div class='ctx'> </div><div class='ctx'> static struct ip6_flowlabel *</div><div class='ctx'> fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='del'>-	  char __user *optval, int optlen, int *err_p)</div><div class='add'>+	  sockptr_t optval, int optlen, int *err_p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_flowlabel *fl = NULL;</div><div class='ctx'> 	int olen;</div><div class='hunk'>@@ -383,7 +403,8 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='ctx'> 		memset(fl-&gt;opt, 0, sizeof(*fl-&gt;opt));</div><div class='ctx'> 		fl-&gt;opt-&gt;tot_len = sizeof(*fl-&gt;opt) + olen;</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(fl-&gt;opt+1, optval+CMSG_ALIGN(sizeof(*freq)), olen))</div><div class='add'>+		if (copy_from_sockptr_offset(fl-&gt;opt + 1, optval,</div><div class='add'>+				CMSG_ALIGN(sizeof(*freq)), olen))</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 		msg.msg_controllen = olen;</div><div class='hunk'>@@ -431,28 +452,34 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='add'>+	if (fl_shared_exclusive(fl) || fl-&gt;opt) {</div><div class='add'>+		WRITE_ONCE(sock_net(sk)-&gt;ipv6.flowlabel_has_excl, 1);</div><div class='add'>+		static_branch_deferred_inc(&amp;ipv6_flowlabel_exclusive);</div><div class='add'>+	}</div><div class='ctx'> 	return fl;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	fl_free(fl);</div><div class='add'>+	if (fl) {</div><div class='add'>+		kfree(fl-&gt;opt);</div><div class='add'>+		kfree(fl);</div><div class='add'>+	}</div><div class='ctx'> 	*err_p = err;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mem_check(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct ipv6_fl_socklist *sfl;</div><div class='ctx'> 	int room = FL_MAX_SIZE - atomic_read(&amp;fl_size);</div><div class='add'>+	struct ipv6_fl_socklist *sfl;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (room &gt; FL_MAX_SIZE - FL_MAX_PER_SOCK)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	for_each_sk_fl_rcu(np, sfl)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_sk_fl_rcu(sk, sfl)</div><div class='ctx'> 		count++;</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (room &lt;= 0 ||</div><div class='ctx'> 	    ((count &gt;= FL_MAX_PER_SOCK ||</div><div class='hunk'>@@ -463,13 +490,15 @@ static int mem_check(struct sock *sk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void fl_link(struct ipv6_pinfo *np, struct ipv6_fl_socklist *sfl,</div><div class='del'>-		struct ip6_flowlabel *fl)</div><div class='add'>+static inline void fl_link(struct sock *sk, struct ipv6_fl_socklist *sfl,</div><div class='add'>+			   struct ip6_flowlabel *fl)</div><div class='ctx'> {</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;ip6_sk_fl_lock);</div><div class='ctx'> 	sfl-&gt;fl = fl;</div><div class='del'>-	sfl-&gt;next = np-&gt;ipv6_fl_list;</div><div class='del'>-	rcu_assign_pointer(np-&gt;ipv6_fl_list, sfl);</div><div class='add'>+	sfl-&gt;next = inet-&gt;ipv6_fl_list;</div><div class='add'>+	rcu_assign_pointer(inet-&gt;ipv6_fl_list, sfl);</div><div class='ctx'> 	spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -484,14 +513,14 @@ int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;repflow) {</div><div class='add'>+	if (inet6_test_bit(REPFLOW, sk)) {</div><div class='ctx'> 		freq-&gt;flr_label = np-&gt;flow_label;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	for_each_sk_fl_rcu(np, sfl) {</div><div class='add'>+	for_each_sk_fl_rcu(sk, sfl) {</div><div class='ctx'> 		if (sfl-&gt;fl-&gt;label == (np-&gt;flow_label &amp; IPV6_FLOWLABEL_MASK)) {</div><div class='ctx'> 			spin_lock_bh(&amp;ip6_fl_lock);</div><div class='ctx'> 			freq-&gt;flr_label = sfl-&gt;fl-&gt;label;</div><div class='hunk'>@@ -501,195 +530,219 @@ int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='ctx'> 			freq-&gt;flr_linger = sfl-&gt;fl-&gt;linger / HZ;</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock_bh(&amp;ip6_fl_lock);</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)</div><div class='add'>+#define socklist_dereference(__sflp) \</div><div class='add'>+	rcu_dereference_protected(__sflp, lockdep_is_held(&amp;ip6_sk_fl_lock))</div><div class='add'>+</div><div class='add'>+static int ipv6_flowlabel_put(struct sock *sk, struct in6_flowlabel_req *freq)</div><div class='ctx'> {</div><div class='del'>-	int uninitialized_var(err);</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct in6_flowlabel_req freq;</div><div class='del'>-	struct ipv6_fl_socklist *sfl1 = NULL;</div><div class='del'>-	struct ipv6_fl_socklist *sfl;</div><div class='ctx'> 	struct ipv6_fl_socklist __rcu **sflp;</div><div class='del'>-	struct ip6_flowlabel *fl, *fl1 = NULL;</div><div class='add'>+	struct ipv6_fl_socklist *sfl;</div><div class='ctx'> </div><div class='add'>+	if (freq-&gt;flr_flags &amp; IPV6_FL_F_REFLECT) {</div><div class='add'>+		if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+		if (!inet6_test_bit(REPFLOW, sk))</div><div class='add'>+			return -ESRCH;</div><div class='add'>+		np-&gt;flow_label = 0;</div><div class='add'>+		inet6_clear_bit(REPFLOW, sk);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (optlen &lt; sizeof(freq))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	spin_lock_bh(&amp;ip6_sk_fl_lock);</div><div class='add'>+	for (sflp = &amp;inet_sk(sk)-&gt;ipv6_fl_list;</div><div class='add'>+	     (sfl = socklist_dereference(*sflp)) != NULL;</div><div class='add'>+	     sflp = &amp;sfl-&gt;next) {</div><div class='add'>+		if (sfl-&gt;fl-&gt;label == freq-&gt;flr_label)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='add'>+	return -ESRCH;</div><div class='add'>+found:</div><div class='add'>+	if (freq-&gt;flr_label == (np-&gt;flow_label &amp; IPV6_FLOWLABEL_MASK))</div><div class='add'>+		np-&gt;flow_label &amp;= ~IPV6_FLOWLABEL_MASK;</div><div class='add'>+	*sflp = sfl-&gt;next;</div><div class='add'>+	spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='add'>+	fl_release(sfl-&gt;fl);</div><div class='add'>+	kfree_rcu(sfl, rcu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;freq, optval, sizeof(freq)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+static int ipv6_flowlabel_renew(struct sock *sk, struct in6_flowlabel_req *freq)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct ipv6_fl_socklist *sfl;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	switch (freq.flr_action) {</div><div class='del'>-	case IPV6_FL_A_PUT:</div><div class='del'>-		if (freq.flr_flags &amp; IPV6_FL_F_REFLECT) {</div><div class='del'>-			if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='del'>-				return -ENOPROTOOPT;</div><div class='del'>-			if (!np-&gt;repflow)</div><div class='del'>-				return -ESRCH;</div><div class='del'>-			np-&gt;flow_label = 0;</div><div class='del'>-			np-&gt;repflow = 0;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_bh(&amp;ip6_sk_fl_lock);</div><div class='del'>-		for (sflp = &amp;np-&gt;ipv6_fl_list;</div><div class='del'>-		     (sfl = rcu_dereference_protected(*sflp,</div><div class='del'>-						      lockdep_is_held(&amp;ip6_sk_fl_lock))) != NULL;</div><div class='del'>-		     sflp = &amp;sfl-&gt;next) {</div><div class='del'>-			if (sfl-&gt;fl-&gt;label == freq.flr_label) {</div><div class='del'>-				if (freq.flr_label == (np-&gt;flow_label&amp;IPV6_FLOWLABEL_MASK))</div><div class='del'>-					np-&gt;flow_label &amp;= ~IPV6_FLOWLABEL_MASK;</div><div class='del'>-				*sflp = sfl-&gt;next;</div><div class='del'>-				spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='del'>-				fl_release(sfl-&gt;fl);</div><div class='del'>-				kfree_rcu(sfl, rcu);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_sk_fl_rcu(sk, sfl) {</div><div class='add'>+		if (sfl-&gt;fl-&gt;label == freq-&gt;flr_label) {</div><div class='add'>+			err = fl6_renew(sfl-&gt;fl, freq-&gt;flr_linger,</div><div class='add'>+					freq-&gt;flr_expires);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;ip6_sk_fl_lock);</div><div class='del'>-		return -ESRCH;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	case IPV6_FL_A_RENEW:</div><div class='del'>-		rcu_read_lock_bh();</div><div class='del'>-		for_each_sk_fl_rcu(np, sfl) {</div><div class='del'>-			if (sfl-&gt;fl-&gt;label == freq.flr_label) {</div><div class='del'>-				err = fl6_renew(sfl-&gt;fl, freq.flr_linger, freq.flr_expires);</div><div class='del'>-				rcu_read_unlock_bh();</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-</div><div class='del'>-		if (freq.flr_share == IPV6_FL_S_NONE &amp;&amp;</div><div class='del'>-		    ns_capable(net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='del'>-			fl = fl_lookup(net, freq.flr_label);</div><div class='del'>-			if (fl) {</div><div class='del'>-				err = fl6_renew(fl, freq.flr_linger, freq.flr_expires);</div><div class='del'>-				fl_release(fl);</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return -ESRCH;</div><div class='add'>+	if (freq-&gt;flr_share == IPV6_FL_S_NONE &amp;&amp;</div><div class='add'>+	    ns_capable(net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='add'>+		struct ip6_flowlabel *fl = fl_lookup(net, freq-&gt;flr_label);</div><div class='ctx'> </div><div class='del'>-	case IPV6_FL_A_GET:</div><div class='del'>-		if (freq.flr_flags &amp; IPV6_FL_F_REFLECT) {</div><div class='del'>-			struct net *net = sock_net(sk);</div><div class='del'>-			if (net-&gt;ipv6.sysctl.flowlabel_consistency) {</div><div class='del'>-				net_info_ratelimited("Can not set IPV6_FL_F_REFLECT if flowlabel_consistency sysctl is enable\n");</div><div class='del'>-				return -EPERM;</div><div class='del'>-			}</div><div class='add'>+		if (fl) {</div><div class='add'>+			err = fl6_renew(fl, freq-&gt;flr_linger,</div><div class='add'>+					freq-&gt;flr_expires);</div><div class='add'>+			fl_release(fl);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ESRCH;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='del'>-				return -ENOPROTOOPT;</div><div class='add'>+static int ipv6_flowlabel_get(struct sock *sk, struct in6_flowlabel_req *freq,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_fl_socklist *sfl, *sfl1 = NULL;</div><div class='add'>+	struct ip6_flowlabel *fl, *fl1 = NULL;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-			np-&gt;repflow = 1;</div><div class='del'>-			return 0;</div><div class='add'>+	if (freq-&gt;flr_flags &amp; IPV6_FL_F_REFLECT) {</div><div class='add'>+		if (net-&gt;ipv6.sysctl.flowlabel_consistency) {</div><div class='add'>+			net_info_ratelimited("Can not set IPV6_FL_F_REFLECT if flowlabel_consistency sysctl is enable\n");</div><div class='add'>+			return -EPERM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (freq.flr_label &amp; ~IPV6_FLOWLABEL_MASK)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (net-&gt;ipv6.sysctl.flowlabel_state_ranges &amp;&amp;</div><div class='del'>-		    (freq.flr_label &amp; IPV6_FLOWLABEL_STATELESS_FLAG))</div><div class='del'>-			return -ERANGE;</div><div class='add'>+		if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+		inet6_set_bit(REPFLOW, sk);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		fl = fl_create(net, sk, &amp;freq, optval, optlen, &amp;err);</div><div class='del'>-		if (!fl)</div><div class='del'>-			return err;</div><div class='del'>-		sfl1 = kmalloc(sizeof(*sfl1), GFP_KERNEL);</div><div class='add'>+	if (freq-&gt;flr_label &amp; ~IPV6_FLOWLABEL_MASK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (net-&gt;ipv6.sysctl.flowlabel_state_ranges &amp;&amp;</div><div class='add'>+	    (freq-&gt;flr_label &amp; IPV6_FLOWLABEL_STATELESS_FLAG))</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-		if (freq.flr_label) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-			rcu_read_lock_bh();</div><div class='del'>-			for_each_sk_fl_rcu(np, sfl) {</div><div class='del'>-				if (sfl-&gt;fl-&gt;label == freq.flr_label) {</div><div class='del'>-					if (freq.flr_flags&amp;IPV6_FL_F_EXCL) {</div><div class='del'>-						rcu_read_unlock_bh();</div><div class='del'>-						goto done;</div><div class='del'>-					}</div><div class='del'>-					fl1 = sfl-&gt;fl;</div><div class='del'>-					atomic_inc(&amp;fl1-&gt;users);</div><div class='del'>-					break;</div><div class='add'>+	fl = fl_create(net, sk, freq, optval, optlen, &amp;err);</div><div class='add'>+	if (!fl)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	sfl1 = kmalloc(sizeof(*sfl1), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (freq-&gt;flr_label) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		for_each_sk_fl_rcu(sk, sfl) {</div><div class='add'>+			if (sfl-&gt;fl-&gt;label == freq-&gt;flr_label) {</div><div class='add'>+				if (freq-&gt;flr_flags &amp; IPV6_FL_F_EXCL) {</div><div class='add'>+					rcu_read_unlock();</div><div class='add'>+					goto done;</div><div class='ctx'> 				}</div><div class='add'>+				fl1 = sfl-&gt;fl;</div><div class='add'>+				if (!atomic_inc_not_zero(&amp;fl1-&gt;users))</div><div class='add'>+					fl1 = NULL;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-			if (!fl1)</div><div class='del'>-				fl1 = fl_lookup(net, freq.flr_label);</div><div class='del'>-			if (fl1) {</div><div class='add'>+		if (!fl1)</div><div class='add'>+			fl1 = fl_lookup(net, freq-&gt;flr_label);</div><div class='add'>+		if (fl1) {</div><div class='ctx'> recheck:</div><div class='del'>-				err = -EEXIST;</div><div class='del'>-				if (freq.flr_flags&amp;IPV6_FL_F_EXCL)</div><div class='del'>-					goto release;</div><div class='del'>-				err = -EPERM;</div><div class='del'>-				if (fl1-&gt;share == IPV6_FL_S_EXCL ||</div><div class='del'>-				    fl1-&gt;share != fl-&gt;share ||</div><div class='del'>-				    ((fl1-&gt;share == IPV6_FL_S_PROCESS) &amp;&amp;</div><div class='del'>-				     (fl1-&gt;owner.pid == fl-&gt;owner.pid)) ||</div><div class='del'>-				    ((fl1-&gt;share == IPV6_FL_S_USER) &amp;&amp;</div><div class='del'>-				     uid_eq(fl1-&gt;owner.uid, fl-&gt;owner.uid)))</div><div class='del'>-					goto release;</div><div class='del'>-</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				if (!sfl1)</div><div class='del'>-					goto release;</div><div class='del'>-				if (fl-&gt;linger &gt; fl1-&gt;linger)</div><div class='del'>-					fl1-&gt;linger = fl-&gt;linger;</div><div class='del'>-				if ((long)(fl-&gt;expires - fl1-&gt;expires) &gt; 0)</div><div class='del'>-					fl1-&gt;expires = fl-&gt;expires;</div><div class='del'>-				fl_link(np, sfl1, fl1);</div><div class='del'>-				fl_free(fl);</div><div class='del'>-				return 0;</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			if (freq-&gt;flr_flags&amp;IPV6_FL_F_EXCL)</div><div class='add'>+				goto release;</div><div class='add'>+			err = -EPERM;</div><div class='add'>+			if (fl1-&gt;share == IPV6_FL_S_EXCL ||</div><div class='add'>+			    fl1-&gt;share != fl-&gt;share ||</div><div class='add'>+			    ((fl1-&gt;share == IPV6_FL_S_PROCESS) &amp;&amp;</div><div class='add'>+			     (fl1-&gt;owner.pid != fl-&gt;owner.pid)) ||</div><div class='add'>+			    ((fl1-&gt;share == IPV6_FL_S_USER) &amp;&amp;</div><div class='add'>+			     !uid_eq(fl1-&gt;owner.uid, fl-&gt;owner.uid)))</div><div class='add'>+				goto release;</div><div class='add'>+</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			if (!sfl1)</div><div class='add'>+				goto release;</div><div class='add'>+			if (fl-&gt;linger &gt; fl1-&gt;linger)</div><div class='add'>+				fl1-&gt;linger = fl-&gt;linger;</div><div class='add'>+			if ((long)(fl-&gt;expires - fl1-&gt;expires) &gt; 0)</div><div class='add'>+				fl1-&gt;expires = fl-&gt;expires;</div><div class='add'>+			fl_link(sk, sfl1, fl1);</div><div class='add'>+			fl_free(fl);</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> release:</div><div class='del'>-				fl_release(fl1);</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		if (!(freq.flr_flags&amp;IPV6_FL_F_CREATE))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		if (!sfl1)</div><div class='add'>+			fl_release(fl1);</div><div class='ctx'> 			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	if (!(freq-&gt;flr_flags &amp; IPV6_FL_F_CREATE))</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-		err = mem_check(sk);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto done;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (!sfl1)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-		fl1 = fl_intern(net, fl, freq.flr_label);</div><div class='del'>-		if (fl1)</div><div class='del'>-			goto recheck;</div><div class='add'>+	err = mem_check(sk);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-		if (!freq.flr_label) {</div><div class='del'>-			if (copy_to_user(&amp;((struct in6_flowlabel_req __user *) optval)-&gt;flr_label,</div><div class='del'>-					 &amp;fl-&gt;label, sizeof(fl-&gt;label))) {</div><div class='del'>-				/* Intentionally ignore fault. */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	fl1 = fl_intern(net, fl, freq-&gt;flr_label);</div><div class='add'>+	if (fl1)</div><div class='add'>+		goto recheck;</div><div class='ctx'> </div><div class='del'>-		fl_link(np, sfl1, fl);</div><div class='del'>-		return 0;</div><div class='add'>+	if (!freq-&gt;flr_label) {</div><div class='add'>+		size_t offset = offsetof(struct in6_flowlabel_req, flr_label);</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		if (copy_to_sockptr_offset(optval, offset, &amp;fl-&gt;label,</div><div class='add'>+				sizeof(fl-&gt;label))) {</div><div class='add'>+			/* Intentionally ignore fault. */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fl_link(sk, sfl1, fl);</div><div class='add'>+	return 0;</div><div class='ctx'> done:</div><div class='ctx'> 	fl_free(fl);</div><div class='ctx'> 	kfree(sfl1);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ipv6_flowlabel_opt(struct sock *sk, sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct in6_flowlabel_req freq;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(freq))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;freq, optval, sizeof(freq)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (freq.flr_action) {</div><div class='add'>+	case IPV6_FL_A_PUT:</div><div class='add'>+		return ipv6_flowlabel_put(sk, &amp;freq);</div><div class='add'>+	case IPV6_FL_A_RENEW:</div><div class='add'>+		return ipv6_flowlabel_renew(sk, &amp;freq);</div><div class='add'>+	case IPV6_FL_A_GET:</div><div class='add'>+		return ipv6_flowlabel_get(sk, &amp;freq, optval, optlen);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='ctx'> struct ip6fl_iter_state {</div><div class='hunk'>@@ -755,9 +808,9 @@ static void *ip6fl_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6fl_iter_state *state = ip6fl_seq_private(seq);</div><div class='ctx'> </div><div class='del'>-	state-&gt;pid_ns = proc_pid_ns(file_inode(seq-&gt;file));</div><div class='add'>+	state-&gt;pid_ns = proc_pid_ns(file_inode(seq-&gt;file)-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	return *pos ? ip6fl_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -776,7 +829,7 @@ static void *ip6fl_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> static void ip6fl_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	__releases(RCU)</div><div class='ctx'> {</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6fl_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -851,6 +904,7 @@ int ip6_flowlabel_init(void)</div><div class='ctx'> </div><div class='ctx'> void ip6_flowlabel_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ip6_fl_gc_timer);</div><div class='add'>+	static_key_deferred_flush(&amp;ipv6_flowlabel_exclusive);</div><div class='add'>+	timer_delete(&amp;ip6_fl_gc_timer);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6_flowlabel_net_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c<br/>index e493b041d4ac..c82a75510c0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_gre.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_gre.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_gre.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_gre.c</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	GRE over IPv6 protocol decoder.</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors: Dmitry Kozlov (xeb@mail.ru)</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -48,6 +43,7 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='hunk'>@@ -115,8 +111,32 @@ static u32 HASH_ADDR(const struct in6_addr *addr)</div><div class='ctx'> #define tunnels_l	tunnels[1]</div><div class='ctx'> #define tunnels_wc	tunnels[0]</div><div class='ctx'> </div><div class='del'>-/* Given src, dst and key, find appropriate for input tunnel. */</div><div class='add'>+static bool ip6gre_tunnel_match(struct ip6_tnl *t, int dev_type, int link,</div><div class='add'>+				int *cand_score, struct ip6_tnl **ret)</div><div class='add'>+{</div><div class='add'>+	int score = 0;</div><div class='add'>+</div><div class='add'>+	if (t-&gt;dev-&gt;type != ARPHRD_IP6GRE &amp;&amp;</div><div class='add'>+	    t-&gt;dev-&gt;type != dev_type)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (t-&gt;parms.link != link)</div><div class='add'>+		score |= 1;</div><div class='add'>+	if (t-&gt;dev-&gt;type != dev_type)</div><div class='add'>+		score |= 2;</div><div class='add'>+	if (score == 0) {</div><div class='add'>+		*ret = t;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (score &lt; *cand_score) {</div><div class='add'>+		*ret = t;</div><div class='add'>+		*cand_score = score;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Given src, dst and key, find appropriate for input tunnel. */</div><div class='ctx'> static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 		const struct in6_addr *remote, const struct in6_addr *local,</div><div class='ctx'> 		__be32 key, __be16 gre_proto)</div><div class='hunk'>@@ -131,7 +151,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 			gre_proto == htons(ETH_P_ERSPAN) ||</div><div class='ctx'> 			gre_proto == htons(ETH_P_ERSPAN2)) ?</div><div class='ctx'> 		       ARPHRD_ETHER : ARPHRD_IP6GRE;</div><div class='del'>-	int score, cand_score = 4;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	int cand_score = 4;</div><div class='ctx'> </div><div class='ctx'> 	for_each_ip_tunnel_rcu(t, ign-&gt;tunnels_r_l[h0 ^ h1]) {</div><div class='ctx'> 		if (!ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) ||</div><div class='hunk'>@@ -140,22 +161,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;dev-&gt;type != ARPHRD_IP6GRE &amp;&amp;</div><div class='del'>-		    t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		score = 0;</div><div class='del'>-		if (t-&gt;parms.link != link)</div><div class='del'>-			score |= 1;</div><div class='del'>-		if (t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			score |= 2;</div><div class='del'>-		if (score == 0)</div><div class='del'>-			return t;</div><div class='del'>-</div><div class='del'>-		if (score &lt; cand_score) {</div><div class='del'>-			cand = t;</div><div class='del'>-			cand_score = score;</div><div class='del'>-		}</div><div class='add'>+		if (ip6gre_tunnel_match(t, dev_type, link, &amp;cand_score, &amp;cand))</div><div class='add'>+			return cand;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_ip_tunnel_rcu(t, ign-&gt;tunnels_r[h0 ^ h1]) {</div><div class='hunk'>@@ -164,22 +171,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;dev-&gt;type != ARPHRD_IP6GRE &amp;&amp;</div><div class='del'>-		    t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		score = 0;</div><div class='del'>-		if (t-&gt;parms.link != link)</div><div class='del'>-			score |= 1;</div><div class='del'>-		if (t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			score |= 2;</div><div class='del'>-		if (score == 0)</div><div class='del'>-			return t;</div><div class='del'>-</div><div class='del'>-		if (score &lt; cand_score) {</div><div class='del'>-			cand = t;</div><div class='del'>-			cand_score = score;</div><div class='del'>-		}</div><div class='add'>+		if (ip6gre_tunnel_match(t, dev_type, link, &amp;cand_score, &amp;cand))</div><div class='add'>+			return cand;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_ip_tunnel_rcu(t, ign-&gt;tunnels_l[h1]) {</div><div class='hunk'>@@ -190,22 +183,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;dev-&gt;type != ARPHRD_IP6GRE &amp;&amp;</div><div class='del'>-		    t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		score = 0;</div><div class='del'>-		if (t-&gt;parms.link != link)</div><div class='del'>-			score |= 1;</div><div class='del'>-		if (t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			score |= 2;</div><div class='del'>-		if (score == 0)</div><div class='del'>-			return t;</div><div class='del'>-</div><div class='del'>-		if (score &lt; cand_score) {</div><div class='del'>-			cand = t;</div><div class='del'>-			cand_score = score;</div><div class='del'>-		}</div><div class='add'>+		if (ip6gre_tunnel_match(t, dev_type, link, &amp;cand_score, &amp;cand))</div><div class='add'>+			return cand;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_ip_tunnel_rcu(t, ign-&gt;tunnels_wc[h1]) {</div><div class='hunk'>@@ -213,22 +192,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;dev-&gt;type != ARPHRD_IP6GRE &amp;&amp;</div><div class='del'>-		    t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		score = 0;</div><div class='del'>-		if (t-&gt;parms.link != link)</div><div class='del'>-			score |= 1;</div><div class='del'>-		if (t-&gt;dev-&gt;type != dev_type)</div><div class='del'>-			score |= 2;</div><div class='del'>-		if (score == 0)</div><div class='del'>-			return t;</div><div class='del'>-</div><div class='del'>-		if (score &lt; cand_score) {</div><div class='del'>-			cand = t;</div><div class='del'>-			cand_score = score;</div><div class='del'>-		}</div><div class='add'>+		if (ip6gre_tunnel_match(t, dev_type, link, &amp;cand_score, &amp;cand))</div><div class='add'>+			return cand;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cand)</div><div class='hunk'>@@ -243,9 +208,9 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,</div><div class='ctx'> 	if (t &amp;&amp; t-&gt;dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return t;</div><div class='ctx'> </div><div class='del'>-	dev = ign-&gt;fb_tunnel_dev;</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-		return netdev_priv(dev);</div><div class='add'>+	ndev = READ_ONCE(ign-&gt;fb_tunnel_dev);</div><div class='add'>+	if (ndev &amp;&amp; ndev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		return netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -364,9 +329,9 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net,</div><div class='ctx'> 	if (parms-&gt;name[0]) {</div><div class='ctx'> 		if (!dev_valid_name(parms-&gt;name))</div><div class='ctx'> 			return NULL;</div><div class='del'>-		strlcpy(name, parms-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, parms-&gt;name);</div><div class='ctx'> 	} else {</div><div class='del'>-		strcpy(name, "ip6gre%d");</div><div class='add'>+		strscpy(name, "ip6gre%d");</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN,</div><div class='ctx'> 			   ip6gre_tunnel_setup);</div><div class='hunk'>@@ -386,12 +351,6 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net,</div><div class='ctx'> 		goto failed_free;</div><div class='ctx'> </div><div class='ctx'> 	ip6gre_tnl_link_config(nt, 1);</div><div class='del'>-</div><div class='del'>-	/* Can use a lockless transmit, unless we generate output sequences */</div><div class='del'>-	if (!(nt-&gt;parms.o_flags &amp; TUNNEL_SEQ))</div><div class='del'>-		dev-&gt;features |= NETIF_F_LLTX;</div><div class='del'>-</div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> 	ip6gre_tunnel_link(ign, nt);</div><div class='ctx'> 	return nt;</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +367,7 @@ static void ip6erspan_tunnel_uninit(struct net_device *dev)</div><div class='ctx'> 	ip6erspan_tunnel_unlink_md(ign, t);</div><div class='ctx'> 	ip6gre_tunnel_unlink(ign, t);</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;t-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6gre_tunnel_uninit(struct net_device *dev)</div><div class='hunk'>@@ -418,64 +377,49 @@ static void ip6gre_tunnel_uninit(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ip6gre_tunnel_unlink_md(ign, t);</div><div class='ctx'> 	ip6gre_tunnel_unlink(ign, t);</div><div class='add'>+	if (ign-&gt;fb_tunnel_dev == dev)</div><div class='add'>+		WRITE_ONCE(ign-&gt;fb_tunnel_dev, NULL);</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;t-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		       u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-	const struct gre_base_hdr *greh;</div><div class='ctx'> 	const struct ipv6hdr *ipv6h;</div><div class='del'>-	int grehlen = sizeof(*greh);</div><div class='add'>+	struct tnl_ptk_info tpi;</div><div class='ctx'> 	struct ip6_tnl *t;</div><div class='del'>-	int key_off = 0;</div><div class='del'>-	__be16 flags;</div><div class='del'>-	__be32 key;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, offset + grehlen))</div><div class='del'>-		return;</div><div class='del'>-	greh = (const struct gre_base_hdr *)(skb-&gt;data + offset);</div><div class='del'>-	flags = greh-&gt;flags;</div><div class='del'>-	if (flags &amp; (GRE_VERSION | GRE_ROUTING))</div><div class='del'>-		return;</div><div class='del'>-	if (flags &amp; GRE_CSUM)</div><div class='del'>-		grehlen += 4;</div><div class='del'>-	if (flags &amp; GRE_KEY) {</div><div class='del'>-		key_off = grehlen + offset;</div><div class='del'>-		grehlen += 4;</div><div class='del'>-	}</div><div class='add'>+	if (gre_parse_header(skb, &amp;tpi, NULL, htons(ETH_P_IPV6),</div><div class='add'>+			     offset) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!pskb_may_pull(skb, offset + grehlen))</div><div class='del'>-		return;</div><div class='ctx'> 	ipv6h = (const struct ipv6hdr *)skb-&gt;data;</div><div class='del'>-	greh = (const struct gre_base_hdr *)(skb-&gt;data + offset);</div><div class='del'>-	key = key_off ? *(__be32 *)(skb-&gt;data + key_off) : 0;</div><div class='del'>-</div><div class='ctx'> 	t = ip6gre_tunnel_lookup(skb-&gt;dev, &amp;ipv6h-&gt;daddr, &amp;ipv6h-&gt;saddr,</div><div class='del'>-				 key, greh-&gt;protocol);</div><div class='add'>+				 tpi.key, tpi.proto);</div><div class='ctx'> 	if (!t)</div><div class='del'>-		return;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='del'>-		struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='del'>-		__u32 teli;</div><div class='ctx'> 	case ICMPV6_DEST_UNREACH:</div><div class='ctx'> 		net_dbg_ratelimited("%s: Path to destination invalid or inactive!\n",</div><div class='ctx'> 				    t-&gt;parms.name);</div><div class='ctx'> 		if (code != ICMPV6_PORT_UNREACH)</div><div class='ctx'> 			break;</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case ICMPV6_TIME_EXCEED:</div><div class='ctx'> 		if (code == ICMPV6_EXC_HOPLIMIT) {</div><div class='ctx'> 			net_dbg_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n",</div><div class='ctx'> 					    t-&gt;parms.name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		return;</div><div class='del'>-	case ICMPV6_PARAMPROB:</div><div class='add'>+		return 0;</div><div class='add'>+	case ICMPV6_PARAMPROB: {</div><div class='add'>+		struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='add'>+		__u32 teli;</div><div class='add'>+</div><div class='ctx'> 		teli = 0;</div><div class='ctx'> 		if (code == ICMPV6_HDR_FIELD)</div><div class='ctx'> 			teli = ip6_tnl_parse_tlv_enc_lim(skb, skb-&gt;data);</div><div class='hunk'>@@ -490,14 +434,15 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			net_dbg_ratelimited("%s: Recipient unable to parse tunneled packet!\n",</div><div class='ctx'> 					    t-&gt;parms.name);</div><div class='ctx'> 		}</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	case ICMPV6_PKT_TOOBIG:</div><div class='ctx'> 		ip6_update_pmtu(skb, net, info, 0, 0, sock_net_uid(net, NULL));</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case NDISC_REDIRECT:</div><div class='ctx'> 		ip6_redirect(skb, net, skb-&gt;dev-&gt;ifindex, 0,</div><div class='ctx'> 			     sock_net_uid(net, NULL));</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (time_before(jiffies, t-&gt;err_time + IP6TUNNEL_ERR_TIMEO))</div><div class='hunk'>@@ -505,6 +450,8 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	else</div><div class='ctx'> 		t-&gt;err_count = 1;</div><div class='ctx'> 	t-&gt;err_time = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)</div><div class='hunk'>@@ -518,11 +465,11 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)</div><div class='ctx'> 				      tpi-&gt;proto);</div><div class='ctx'> 	if (tunnel) {</div><div class='ctx'> 		if (tunnel-&gt;parms.collect_md) {</div><div class='add'>+			IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> 			struct metadata_dst *tun_dst;</div><div class='ctx'> 			__be64 tun_id;</div><div class='del'>-			__be16 flags;</div><div class='ctx'> </div><div class='del'>-			flags = tpi-&gt;flags;</div><div class='add'>+			ip_tunnel_flags_copy(flags, tpi-&gt;flags);</div><div class='ctx'> 			tun_id = key32_to_tunnel_id(tpi-&gt;key);</div><div class='ctx'> </div><div class='ctx'> 			tun_dst = ipv6_tun_rx_dst(skb, flags, tun_id, 0);</div><div class='hunk'>@@ -540,11 +487,11 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)</div><div class='ctx'> 	return PACKET_REJECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len,</div><div class='del'>-			 struct tnl_ptk_info *tpi)</div><div class='add'>+static int ip6erspan_rcv(struct sk_buff *skb,</div><div class='add'>+			 struct tnl_ptk_info *tpi,</div><div class='add'>+			 int gre_hdr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct erspan_base_hdr *ershdr;</div><div class='del'>-	struct erspan_metadata *pkt_md;</div><div class='ctx'> 	const struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct erspan_md2 *md2;</div><div class='ctx'> 	struct ip6_tnl *tunnel;</div><div class='hunk'>@@ -556,7 +503,6 @@ static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len,</div><div class='ctx'> 	ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 	ershdr = (struct erspan_base_hdr *)skb-&gt;data;</div><div class='ctx'> 	ver = ershdr-&gt;ver;</div><div class='del'>-	tpi-&gt;key = cpu_to_be32(get_session_id(ershdr));</div><div class='ctx'> </div><div class='ctx'> 	tunnel = ip6gre_tunnel_lookup(skb-&gt;dev,</div><div class='ctx'> 				      &amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr, tpi-&gt;key,</div><div class='hunk'>@@ -567,23 +513,21 @@ static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len,</div><div class='ctx'> 		if (unlikely(!pskb_may_pull(skb, len)))</div><div class='ctx'> 			return PACKET_REJECT;</div><div class='ctx'> </div><div class='del'>-		ershdr = (struct erspan_base_hdr *)skb-&gt;data;</div><div class='del'>-		pkt_md = (struct erspan_metadata *)(ershdr + 1);</div><div class='del'>-</div><div class='ctx'> 		if (__iptunnel_pull_header(skb, len,</div><div class='ctx'> 					   htons(ETH_P_TEB),</div><div class='ctx'> 					   false, false) &lt; 0)</div><div class='ctx'> 			return PACKET_REJECT;</div><div class='ctx'> </div><div class='ctx'> 		if (tunnel-&gt;parms.collect_md) {</div><div class='add'>+			struct erspan_metadata *pkt_md, *md;</div><div class='add'>+			IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> 			struct metadata_dst *tun_dst;</div><div class='ctx'> 			struct ip_tunnel_info *info;</div><div class='del'>-			struct erspan_metadata *md;</div><div class='add'>+			unsigned char *gh;</div><div class='ctx'> 			__be64 tun_id;</div><div class='del'>-			__be16 flags;</div><div class='ctx'> </div><div class='del'>-			tpi-&gt;flags |= TUNNEL_KEY;</div><div class='del'>-			flags = tpi-&gt;flags;</div><div class='add'>+			__set_bit(IP_TUNNEL_KEY_BIT, tpi-&gt;flags);</div><div class='add'>+			ip_tunnel_flags_copy(flags, tpi-&gt;flags);</div><div class='ctx'> 			tun_id = key32_to_tunnel_id(tpi-&gt;key);</div><div class='ctx'> </div><div class='ctx'> 			tun_dst = ipv6_tun_rx_dst(skb, flags, tun_id,</div><div class='hunk'>@@ -591,13 +535,22 @@ static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len,</div><div class='ctx'> 			if (!tun_dst)</div><div class='ctx'> 				return PACKET_REJECT;</div><div class='ctx'> </div><div class='add'>+			/* skb can be uncloned in __iptunnel_pull_header, so</div><div class='add'>+			 * old pkt_md is no longer valid and we need to reset</div><div class='add'>+			 * it</div><div class='add'>+			 */</div><div class='add'>+			gh = skb_network_header(skb) +</div><div class='add'>+			     skb_network_header_len(skb);</div><div class='add'>+			pkt_md = (struct erspan_metadata *)(gh + gre_hdr_len +</div><div class='add'>+							    sizeof(*ershdr));</div><div class='ctx'> 			info = &amp;tun_dst-&gt;u.tun_info;</div><div class='ctx'> 			md = ip_tunnel_info_opts(info);</div><div class='ctx'> 			md-&gt;version = ver;</div><div class='ctx'> 			md2 = &amp;md-&gt;u.md2;</div><div class='ctx'> 			memcpy(md2, pkt_md, ver == 1 ? ERSPAN_V1_MDSIZE :</div><div class='ctx'> 						       ERSPAN_V2_MDSIZE);</div><div class='del'>-			info-&gt;key.tun_flags |= TUNNEL_ERSPAN_OPT;</div><div class='add'>+			__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT,</div><div class='add'>+				  info-&gt;key.tun_flags);</div><div class='ctx'> 			info-&gt;options_len = sizeof(*md);</div><div class='ctx'> </div><div class='ctx'> 			ip6_tnl_rcv(tunnel, skb, tpi, tun_dst, log_ecn_error);</div><div class='hunk'>@@ -627,7 +580,7 @@ static int gre_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(tpi.proto == htons(ETH_P_ERSPAN) ||</div><div class='ctx'> 		     tpi.proto == htons(ETH_P_ERSPAN2))) {</div><div class='del'>-		if (ip6erspan_rcv(skb, hdr_len, &amp;tpi) == PACKET_RCVD)</div><div class='add'>+		if (ip6erspan_rcv(skb, &amp;tpi, hdr_len) == PACKET_RCVD)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -679,20 +632,21 @@ static int prepare_ip6gre_xmit_ipv6(struct sk_buff *skb,</div><div class='ctx'> 				    struct flowi6 *fl6, __u8 *dsfield,</div><div class='ctx'> 				    int *encap_limit)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='add'>+	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> 	__u16 offset;</div><div class='ctx'> </div><div class='ctx'> 	offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));</div><div class='ctx'> 	/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb-&gt;head */</div><div class='add'>+	ipv6h = ipv6_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt; 0) {</div><div class='ctx'> 		struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='ctx'> </div><div class='ctx'> 		tel = (struct ipv6_tlv_tnl_enc_lim *)&amp;skb_network_header(skb)[offset];</div><div class='ctx'> 		if (tel-&gt;encap_limit == 0) {</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PARAMPROB,</div><div class='del'>-				    ICMPV6_HDR_FIELD, offset + 2);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PARAMPROB,</div><div class='add'>+					ICMPV6_HDR_FIELD, offset + 2);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		*encap_limit = tel-&gt;encap_limit - 1;</div><div class='hunk'>@@ -720,12 +674,51 @@ static int prepare_ip6gre_xmit_ipv6(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int prepare_ip6gre_xmit_other(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev,</div><div class='add'>+				     struct flowi6 *fl6, __u8 *dsfield,</div><div class='add'>+				     int *encap_limit)</div><div class='add'>+{</div><div class='add'>+	struct ip6_tnl *t = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='add'>+		*encap_limit = t-&gt;parms.encap_limit;</div><div class='add'>+</div><div class='add'>+	memcpy(fl6, &amp;t-&gt;fl.u.ip6, sizeof(*fl6));</div><div class='add'>+</div><div class='add'>+	if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_TCLASS)</div><div class='add'>+		*dsfield = 0;</div><div class='add'>+	else</div><div class='add'>+		*dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='add'>+</div><div class='add'>+	if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_FWMARK)</div><div class='add'>+		fl6-&gt;flowi6_mark = skb-&gt;mark;</div><div class='add'>+	else</div><div class='add'>+		fl6-&gt;flowi6_mark = t-&gt;parms.fwmark;</div><div class='add'>+</div><div class='add'>+	fl6-&gt;flowi6_uid = sock_net_uid(dev_net(dev), NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ip_tunnel_info *skb_tunnel_info_txcheck(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_info *tun_info;</div><div class='add'>+</div><div class='add'>+	tun_info = skb_tunnel_info(skb);</div><div class='add'>+	if (unlikely(!tun_info || !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return tun_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t __gre6_xmit(struct sk_buff *skb,</div><div class='ctx'> 			       struct net_device *dev, __u8 dsfield,</div><div class='ctx'> 			       struct flowi6 *fl6, int encap_limit,</div><div class='ctx'> 			       __u32 *pmtu, __be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *tunnel = netdev_priv(dev);</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags);</div><div class='ctx'> 	__be16 protocol;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;type == ARPHRD_ETHER)</div><div class='hunk'>@@ -736,21 +729,17 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,</div><div class='ctx'> 	else</div><div class='ctx'> 		fl6-&gt;daddr = tunnel-&gt;parms.raddr;</div><div class='ctx'> </div><div class='del'>-	if (skb_cow_head(skb, dev-&gt;needed_headroom ?: tunnel-&gt;hlen))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	/* Push GRE header. */</div><div class='ctx'> 	protocol = (dev-&gt;type == ARPHRD_ETHER) ? htons(ETH_P_TEB) : proto;</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;parms.collect_md) {</div><div class='ctx'> 		struct ip_tunnel_info *tun_info;</div><div class='ctx'> 		const struct ip_tunnel_key *key;</div><div class='del'>-		__be16 flags;</div><div class='add'>+		int tun_hlen;</div><div class='ctx'> </div><div class='del'>-		tun_info = skb_tunnel_info(skb);</div><div class='del'>-		if (unlikely(!tun_info ||</div><div class='del'>-			     !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='del'>-			     ip_tunnel_info_af(tun_info) != AF_INET6))</div><div class='add'>+		tun_info = skb_tunnel_info_txcheck(skb);</div><div class='add'>+		if (IS_ERR(tun_info) ||</div><div class='add'>+		    unlikely(ip_tunnel_info_af(tun_info) != AF_INET6))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		key = &amp;tun_info-&gt;key;</div><div class='hunk'>@@ -759,25 +748,37 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,</div><div class='ctx'> 		fl6-&gt;daddr = key-&gt;u.ipv6.dst;</div><div class='ctx'> 		fl6-&gt;flowlabel = key-&gt;label;</div><div class='ctx'> 		fl6-&gt;flowi6_uid = sock_net_uid(dev_net(dev), NULL);</div><div class='add'>+		fl6-&gt;fl6_gre_key = tunnel_id_to_key32(key-&gt;tun_id);</div><div class='ctx'> </div><div class='ctx'> 		dsfield = key-&gt;tos;</div><div class='del'>-		flags = key-&gt;tun_flags &amp;</div><div class='del'>-			(TUNNEL_CSUM | TUNNEL_KEY | TUNNEL_SEQ);</div><div class='del'>-		tunnel-&gt;tun_hlen = gre_calc_hlen(flags);</div><div class='add'>+		ip_tunnel_flags_zero(flags);</div><div class='add'>+		__set_bit(IP_TUNNEL_CSUM_BIT, flags);</div><div class='add'>+		__set_bit(IP_TUNNEL_KEY_BIT, flags);</div><div class='add'>+		__set_bit(IP_TUNNEL_SEQ_BIT, flags);</div><div class='add'>+		ip_tunnel_flags_and(flags, flags, key-&gt;tun_flags);</div><div class='add'>+		tun_hlen = gre_calc_hlen(flags);</div><div class='add'>+</div><div class='add'>+		if (skb_cow_head(skb, dev-&gt;needed_headroom ?: tun_hlen + tunnel-&gt;encap_hlen))</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		gre_build_header(skb, tunnel-&gt;tun_hlen,</div><div class='add'>+		gre_build_header(skb, tun_hlen,</div><div class='ctx'> 				 flags, protocol,</div><div class='ctx'> 				 tunnel_id_to_key32(tun_info-&gt;key.tun_id),</div><div class='del'>-				 (flags &amp; TUNNEL_SEQ) ? htonl(tunnel-&gt;o_seqno++)</div><div class='del'>-						      : 0);</div><div class='add'>+				 test_bit(IP_TUNNEL_SEQ_BIT, flags) ?</div><div class='add'>+				 htonl(atomic_fetch_inc(&amp;tunnel-&gt;o_seqno)) :</div><div class='add'>+				 0);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		if (tunnel-&gt;parms.o_flags &amp; TUNNEL_SEQ)</div><div class='del'>-			tunnel-&gt;o_seqno++;</div><div class='add'>+		if (skb_cow_head(skb, dev-&gt;needed_headroom ?: tunnel-&gt;hlen))</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		gre_build_header(skb, tunnel-&gt;tun_hlen, tunnel-&gt;parms.o_flags,</div><div class='add'>+		ip_tunnel_flags_copy(flags, tunnel-&gt;parms.o_flags);</div><div class='add'>+</div><div class='add'>+		gre_build_header(skb, tunnel-&gt;tun_hlen, flags,</div><div class='ctx'> 				 protocol, tunnel-&gt;parms.o_key,</div><div class='del'>-				 htonl(tunnel-&gt;o_seqno));</div><div class='add'>+				 test_bit(IP_TUNNEL_SEQ_BIT, flags) ?</div><div class='add'>+				 htonl(atomic_fetch_inc(&amp;tunnel-&gt;o_seqno)) :</div><div class='add'>+				 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ip6_tnl_xmit(skb, dev, dsfield, fl6, encap_limit, pmtu,</div><div class='hunk'>@@ -799,7 +800,8 @@ static inline int ip6gre_xmit_ipv4(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		prepare_ip6gre_xmit_ipv4(skb, dev, &amp;fl6,</div><div class='ctx'> 					 &amp;dsfield, &amp;encap_limit);</div><div class='ctx'> </div><div class='del'>-	err = gre_handle_offloads(skb, !!(t-&gt;parms.o_flags &amp; TUNNEL_CSUM));</div><div class='add'>+	err = gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+						t-&gt;parms.o_flags));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -808,8 +810,8 @@ static inline int ip6gre_xmit_ipv4(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (err != 0) {</div><div class='ctx'> 		/* XXX: send ICMP error even if DF is not set. */</div><div class='ctx'> 		if (err == -EMSGSIZE)</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='del'>-				  htonl(mtu));</div><div class='add'>+			icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='add'>+				      htonl(mtu));</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -833,59 +835,39 @@ static inline int ip6gre_xmit_ipv6(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	    prepare_ip6gre_xmit_ipv6(skb, dev, &amp;fl6, &amp;dsfield, &amp;encap_limit))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (gre_handle_offloads(skb, !!(t-&gt;parms.o_flags &amp; TUNNEL_CSUM)))</div><div class='add'>+	if (gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+					      t-&gt;parms.o_flags)))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	err = __gre6_xmit(skb, dev, dsfield, &amp;fl6, encap_limit,</div><div class='ctx'> 			  &amp;mtu, skb-&gt;protocol);</div><div class='ctx'> 	if (err != 0) {</div><div class='ctx'> 		if (err == -EMSGSIZE)</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * ip6gre_tnl_addr_conflict - compare packet addresses to tunnel's own</div><div class='del'>- *   @t: the outgoing tunnel device</div><div class='del'>- *   @hdr: IPv6 header from the incoming packet</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *   Avoid trivial tunneling loop by checking that tunnel exit-point</div><div class='del'>- *   doesn't match source of incoming packet.</div><div class='del'>- *</div><div class='del'>- * Return:</div><div class='del'>- *   1 if conflict,</div><div class='del'>- *   0 else</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-static inline bool ip6gre_tnl_addr_conflict(const struct ip6_tnl *t,</div><div class='del'>-	const struct ipv6hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	return ipv6_addr_equal(&amp;t-&gt;parms.raddr, &amp;hdr-&gt;saddr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ip6gre_xmit_other(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> 	int encap_limit = -1;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='add'>+	__u8 dsfield = 0;</div><div class='ctx'> 	__u32 mtu;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='del'>-		encap_limit = t-&gt;parms.encap_limit;</div><div class='del'>-</div><div class='del'>-	if (!t-&gt;parms.collect_md)</div><div class='del'>-		memcpy(&amp;fl6, &amp;t-&gt;fl.u.ip6, sizeof(fl6));</div><div class='add'>+	if (!t-&gt;parms.collect_md &amp;&amp;</div><div class='add'>+	    prepare_ip6gre_xmit_other(skb, dev, &amp;fl6, &amp;dsfield, &amp;encap_limit))</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	err = gre_handle_offloads(skb, !!(t-&gt;parms.o_flags &amp; TUNNEL_CSUM));</div><div class='add'>+	err = gre_handle_offloads(skb, test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+						t-&gt;parms.o_flags));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-</div><div class='del'>-	err = __gre6_xmit(skb, dev, 0, &amp;fl6, encap_limit, &amp;mtu, skb-&gt;protocol);</div><div class='add'>+	err = __gre6_xmit(skb, dev, dsfield, &amp;fl6, encap_limit, &amp;mtu, skb-&gt;protocol);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -894,13 +876,17 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;t-&gt;dev-&gt;stats;</div><div class='add'>+	__be16 payload_protocol;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='ctx'> 	if (!ip6_tnl_xmit_ctl(t, &amp;t-&gt;parms.laddr, &amp;t-&gt;parms.raddr))</div><div class='ctx'> 		goto tx_err;</div><div class='ctx'> </div><div class='del'>-	switch (skb-&gt;protocol) {</div><div class='add'>+	payload_protocol = skb_protocol(skb, true);</div><div class='add'>+	switch (payload_protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='ctx'> 		ret = ip6gre_xmit_ipv4(skb, dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -918,8 +904,9 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_err:</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='add'>+	if (!t-&gt;parms.collect_md || !IS_ERR(skb_tunnel_info_txcheck(skb)))</div><div class='add'>+		DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -927,17 +914,21 @@ tx_err:</div><div class='ctx'> static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 					 struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ip_tunnel_info *tun_info = NULL;</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct net_device_stats *stats;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='ctx'> 	bool truncate = false;</div><div class='ctx'> 	int encap_limit = -1;</div><div class='ctx'> 	__u8 dsfield = false;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='add'>+	__be16 proto;</div><div class='ctx'> 	__u32 mtu;</div><div class='ctx'> 	int nhoff;</div><div class='del'>-	int thoff;</div><div class='add'>+</div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ip6_tnl_xmit_ctl(t, &amp;t-&gt;parms.laddr, &amp;t-&gt;parms.raddr))</div><div class='ctx'> 		goto tx_err;</div><div class='hunk'>@@ -946,40 +937,45 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		goto tx_err;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &gt; dev-&gt;mtu + dev-&gt;hard_header_len) {</div><div class='del'>-		pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len);</div><div class='add'>+		if (pskb_trim(skb, dev-&gt;mtu + dev-&gt;hard_header_len))</div><div class='add'>+			goto tx_err;</div><div class='ctx'> 		truncate = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nhoff = skb_network_header(skb) - skb_mac_header(skb);</div><div class='add'>+	nhoff = skb_network_offset(skb);</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='ctx'> 	    (ntohs(ip_hdr(skb)-&gt;tot_len) &gt; skb-&gt;len - nhoff))</div><div class='ctx'> 		truncate = true;</div><div class='ctx'> </div><div class='del'>-	thoff = skb_transport_header(skb) - skb_mac_header(skb);</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-	    (ntohs(ipv6_hdr(skb)-&gt;payload_len) &gt; skb-&gt;len - thoff))</div><div class='del'>-		truncate = true;</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		int thoff;</div><div class='add'>+</div><div class='add'>+		if (skb_transport_header_was_set(skb))</div><div class='add'>+			thoff = skb_transport_offset(skb);</div><div class='add'>+		else</div><div class='add'>+			thoff = nhoff + sizeof(struct ipv6hdr);</div><div class='add'>+		if (ntohs(ipv6_hdr(skb)-&gt;payload_len) &gt; skb-&gt;len - thoff)</div><div class='add'>+			truncate = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cow_head(skb, dev-&gt;needed_headroom ?: t-&gt;hlen))</div><div class='ctx'> 		goto tx_err;</div><div class='ctx'> </div><div class='del'>-	t-&gt;parms.o_flags &amp;= ~TUNNEL_KEY;</div><div class='add'>+	__clear_bit(IP_TUNNEL_KEY_BIT, t-&gt;parms.o_flags);</div><div class='ctx'> 	IPCB(skb)-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* For collect_md mode, derive fl6 from the tunnel key,</div><div class='ctx'> 	 * for native mode, call prepare_ip6gre_xmit_{ipv4,ipv6}.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (t-&gt;parms.collect_md) {</div><div class='del'>-		struct ip_tunnel_info *tun_info;</div><div class='ctx'> 		const struct ip_tunnel_key *key;</div><div class='ctx'> 		struct erspan_metadata *md;</div><div class='ctx'> 		__be32 tun_id;</div><div class='ctx'> </div><div class='del'>-		tun_info = skb_tunnel_info(skb);</div><div class='del'>-		if (unlikely(!tun_info ||</div><div class='del'>-			     !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='del'>-			     ip_tunnel_info_af(tun_info) != AF_INET6))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		tun_info = skb_tunnel_info_txcheck(skb);</div><div class='add'>+		if (IS_ERR(tun_info) ||</div><div class='add'>+		    unlikely(ip_tunnel_info_af(tun_info) != AF_INET6))</div><div class='add'>+			goto tx_err;</div><div class='ctx'> </div><div class='ctx'> 		key = &amp;tun_info-&gt;key;</div><div class='ctx'> 		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='hunk'>@@ -987,13 +983,15 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		fl6.daddr = key-&gt;u.ipv6.dst;</div><div class='ctx'> 		fl6.flowlabel = key-&gt;label;</div><div class='ctx'> 		fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);</div><div class='add'>+		fl6.fl6_gre_key = tunnel_id_to_key32(key-&gt;tun_id);</div><div class='ctx'> </div><div class='ctx'> 		dsfield = key-&gt;tos;</div><div class='del'>-		if (!(tun_info-&gt;key.tun_flags &amp; TUNNEL_ERSPAN_OPT))</div><div class='add'>+		if (!test_bit(IP_TUNNEL_ERSPAN_OPT_BIT,</div><div class='add'>+			      tun_info-&gt;key.tun_flags))</div><div class='ctx'> 			goto tx_err;</div><div class='del'>-		md = ip_tunnel_info_opts(tun_info);</div><div class='del'>-		if (!md)</div><div class='add'>+		if (tun_info-&gt;options_len &lt; sizeof(*md))</div><div class='ctx'> 			goto tx_err;</div><div class='add'>+		md = ip_tunnel_info_opts(tun_info);</div><div class='ctx'> </div><div class='ctx'> 		tun_id = tunnel_id_to_key32(key-&gt;tun_id);</div><div class='ctx'> 		if (md-&gt;version == 1) {</div><div class='hunk'>@@ -1001,18 +999,18 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 					    ntohl(tun_id),</div><div class='ctx'> 					    ntohl(md-&gt;u.index), truncate,</div><div class='ctx'> 					    false);</div><div class='add'>+			proto = htons(ETH_P_ERSPAN);</div><div class='ctx'> 		} else if (md-&gt;version == 2) {</div><div class='ctx'> 			erspan_build_header_v2(skb,</div><div class='ctx'> 					       ntohl(tun_id),</div><div class='ctx'> 					       md-&gt;u.md2.dir,</div><div class='ctx'> 					       get_hwid(&amp;md-&gt;u.md2),</div><div class='ctx'> 					       truncate, false);</div><div class='add'>+			proto = htons(ETH_P_ERSPAN2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			goto tx_err;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='del'>-</div><div class='ctx'> 		switch (skb-&gt;protocol) {</div><div class='ctx'> 		case htons(ETH_P_IP):</div><div class='ctx'> 			memset(&amp;(IPCB(skb)-&gt;opt), 0, sizeof(IPCB(skb)-&gt;opt));</div><div class='hunk'>@@ -1020,7 +1018,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 						 &amp;dsfield, &amp;encap_limit);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case htons(ETH_P_IPV6):</div><div class='del'>-			if (ipv6_addr_equal(&amp;t-&gt;parms.raddr, &amp;ipv6h-&gt;saddr))</div><div class='add'>+			if (ipv6_addr_equal(&amp;t-&gt;parms.raddr, &amp;ipv6_hdr(skb)-&gt;saddr))</div><div class='ctx'> 				goto tx_err;</div><div class='ctx'> 			if (prepare_ip6gre_xmit_ipv6(skb, dev, &amp;fl6,</div><div class='ctx'> 						     &amp;dsfield, &amp;encap_limit))</div><div class='hunk'>@@ -1031,39 +1029,45 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.erspan_ver == 1)</div><div class='add'>+		if (t-&gt;parms.erspan_ver == 1) {</div><div class='ctx'> 			erspan_build_header(skb, ntohl(t-&gt;parms.o_key),</div><div class='ctx'> 					    t-&gt;parms.index,</div><div class='ctx'> 					    truncate, false);</div><div class='del'>-		else if (t-&gt;parms.erspan_ver == 2)</div><div class='add'>+			proto = htons(ETH_P_ERSPAN);</div><div class='add'>+		} else if (t-&gt;parms.erspan_ver == 2) {</div><div class='ctx'> 			erspan_build_header_v2(skb, ntohl(t-&gt;parms.o_key),</div><div class='ctx'> 					       t-&gt;parms.dir,</div><div class='ctx'> 					       t-&gt;parms.hwid,</div><div class='ctx'> 					       truncate, false);</div><div class='del'>-		else</div><div class='add'>+			proto = htons(ETH_P_ERSPAN2);</div><div class='add'>+		} else {</div><div class='ctx'> 			goto tx_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fl6.daddr = t-&gt;parms.raddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Push GRE header. */</div><div class='del'>-	gre_build_header(skb, 8, TUNNEL_SEQ,</div><div class='del'>-			 htons(ETH_P_ERSPAN), 0, htonl(t-&gt;o_seqno++));</div><div class='add'>+	__set_bit(IP_TUNNEL_SEQ_BIT, flags);</div><div class='add'>+	gre_build_header(skb, 8, flags, proto, 0,</div><div class='add'>+			 htonl(atomic_fetch_inc(&amp;t-&gt;o_seqno)));</div><div class='ctx'> </div><div class='ctx'> 	/* TooBig packet may have updated dst-&gt;dev's mtu */</div><div class='del'>-	if (!t-&gt;parms.collect_md &amp;&amp; dst &amp;&amp; dst_mtu(dst) &gt; dst-&gt;dev-&gt;mtu)</div><div class='del'>-		dst-&gt;ops-&gt;update_pmtu(dst, NULL, skb, dst-&gt;dev-&gt;mtu);</div><div class='del'>-</div><div class='add'>+	if (!t-&gt;parms.collect_md &amp;&amp; dst) {</div><div class='add'>+		mtu = READ_ONCE(dst_dev(dst)-&gt;mtu);</div><div class='add'>+		if (dst_mtu(dst) &gt; mtu)</div><div class='add'>+			dst-&gt;ops-&gt;update_pmtu(dst, NULL, skb, mtu, false);</div><div class='add'>+	}</div><div class='ctx'> 	err = ip6_tnl_xmit(skb, dev, dsfield, &amp;fl6, encap_limit, &amp;mtu,</div><div class='ctx'> 			   NEXTHDR_GRE);</div><div class='ctx'> 	if (err != 0) {</div><div class='ctx'> 		/* XXX: send ICMP error even if DF is not set. */</div><div class='ctx'> 		if (err == -EMSGSIZE) {</div><div class='ctx'> 			if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='del'>-				icmp_send(skb, ICMP_DEST_UNREACH,</div><div class='del'>-					  ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='add'>+				icmp_ndo_send(skb, ICMP_DEST_UNREACH,</div><div class='add'>+					      ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='ctx'> 			else</div><div class='del'>-				icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+				icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		goto tx_err;</div><div class='hunk'>@@ -1071,9 +1075,9 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_err:</div><div class='del'>-	stats = &amp;t-&gt;dev-&gt;stats;</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='add'>+	if (!IS_ERR(tun_info))</div><div class='add'>+		DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -1085,7 +1089,7 @@ static void ip6gre_tnl_link_config_common(struct ip6_tnl *t)</div><div class='ctx'> 	struct flowi6 *fl6 = &amp;t-&gt;fl.u.ip6;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;type != ARPHRD_ETHER) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='add'>+		__dev_addr_set(dev, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='ctx'> 		memcpy(dev-&gt;broadcast, &amp;p-&gt;raddr, sizeof(struct in6_addr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1095,6 +1099,7 @@ static void ip6gre_tnl_link_config_common(struct ip6_tnl *t)</div><div class='ctx'> 	fl6-&gt;flowi6_oif = p-&gt;link;</div><div class='ctx'> 	fl6-&gt;flowlabel = 0;</div><div class='ctx'> 	fl6-&gt;flowi6_proto = IPPROTO_GRE;</div><div class='add'>+	fl6-&gt;fl6_gre_key = t-&gt;parms.o_key;</div><div class='ctx'> </div><div class='ctx'> 	if (!(p-&gt;flags&amp;IP6_TNL_F_USE_ORIG_TCLASS))</div><div class='ctx'> 		fl6-&gt;flowlabel |= IPV6_TCLASS_MASK &amp; p-&gt;flowinfo;</div><div class='hunk'>@@ -1129,18 +1134,25 @@ static void ip6gre_tnl_link_config_route(struct ip6_tnl *t, int set_mtu,</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (rt-&gt;dst.dev) {</div><div class='del'>-			dev-&gt;needed_headroom = rt-&gt;dst.dev-&gt;hard_header_len +</div><div class='del'>-					       t_hlen;</div><div class='add'>+			unsigned short dst_len = rt-&gt;dst.dev-&gt;hard_header_len +</div><div class='add'>+						 t_hlen;</div><div class='add'>+</div><div class='add'>+			if (t-&gt;dev-&gt;header_ops)</div><div class='add'>+				dev-&gt;hard_header_len = dst_len;</div><div class='add'>+			else</div><div class='add'>+				dev-&gt;needed_headroom = dst_len;</div><div class='ctx'> </div><div class='ctx'> 			if (set_mtu) {</div><div class='del'>-				dev-&gt;mtu = rt-&gt;dst.dev-&gt;mtu - t_hlen;</div><div class='add'>+				int mtu = rt-&gt;dst.dev-&gt;mtu - t_hlen;</div><div class='add'>+</div><div class='ctx'> 				if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='del'>-					dev-&gt;mtu -= 8;</div><div class='add'>+					mtu -= 8;</div><div class='ctx'> 				if (dev-&gt;type == ARPHRD_ETHER)</div><div class='del'>-					dev-&gt;mtu -= ETH_HLEN;</div><div class='add'>+					mtu -= ETH_HLEN;</div><div class='ctx'> </div><div class='del'>-				if (dev-&gt;mtu &lt; IPV6_MIN_MTU)</div><div class='del'>-					dev-&gt;mtu = IPV6_MIN_MTU;</div><div class='add'>+				if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+					mtu = IPV6_MIN_MTU;</div><div class='add'>+				WRITE_ONCE(dev-&gt;mtu, mtu);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ip6_rt_put(rt);</div><div class='hunk'>@@ -1155,7 +1167,12 @@ static int ip6gre_calc_hlen(struct ip6_tnl *tunnel)</div><div class='ctx'> 	tunnel-&gt;hlen = tunnel-&gt;tun_hlen + tunnel-&gt;encap_hlen;</div><div class='ctx'> </div><div class='ctx'> 	t_hlen = tunnel-&gt;hlen + sizeof(struct ipv6hdr);</div><div class='del'>-	tunnel-&gt;dev-&gt;needed_headroom = LL_MAX_HEADER + t_hlen;</div><div class='add'>+</div><div class='add'>+	if (tunnel-&gt;dev-&gt;header_ops)</div><div class='add'>+		tunnel-&gt;dev-&gt;hard_header_len = LL_MAX_HEADER + t_hlen;</div><div class='add'>+	else</div><div class='add'>+		tunnel-&gt;dev-&gt;needed_headroom = LL_MAX_HEADER + t_hlen;</div><div class='add'>+</div><div class='ctx'> 	return t_hlen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1178,9 +1195,13 @@ static void ip6gre_tnl_copy_tnl_parm(struct ip6_tnl *t,</div><div class='ctx'> 	t-&gt;parms.proto = p-&gt;proto;</div><div class='ctx'> 	t-&gt;parms.i_key = p-&gt;i_key;</div><div class='ctx'> 	t-&gt;parms.o_key = p-&gt;o_key;</div><div class='del'>-	t-&gt;parms.i_flags = p-&gt;i_flags;</div><div class='del'>-	t-&gt;parms.o_flags = p-&gt;o_flags;</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.i_flags, p-&gt;i_flags);</div><div class='add'>+	ip_tunnel_flags_copy(t-&gt;parms.o_flags, p-&gt;o_flags);</div><div class='ctx'> 	t-&gt;parms.fwmark = p-&gt;fwmark;</div><div class='add'>+	t-&gt;parms.erspan_ver = p-&gt;erspan_ver;</div><div class='add'>+	t-&gt;parms.index = p-&gt;index;</div><div class='add'>+	t-&gt;parms.dir = p-&gt;dir;</div><div class='add'>+	t-&gt;parms.hwid = p-&gt;hwid;</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1204,8 +1225,8 @@ static void ip6gre_tnl_parm_from_user(struct __ip6_tnl_parm *p,</div><div class='ctx'> 	p-&gt;link = u-&gt;link;</div><div class='ctx'> 	p-&gt;i_key = u-&gt;i_key;</div><div class='ctx'> 	p-&gt;o_key = u-&gt;o_key;</div><div class='del'>-	p-&gt;i_flags = gre_flags_to_tnl_flags(u-&gt;i_flags);</div><div class='del'>-	p-&gt;o_flags = gre_flags_to_tnl_flags(u-&gt;o_flags);</div><div class='add'>+	gre_flags_to_tnl_flags(p-&gt;i_flags, u-&gt;i_flags);</div><div class='add'>+	gre_flags_to_tnl_flags(p-&gt;o_flags, u-&gt;o_flags);</div><div class='ctx'> 	memcpy(p-&gt;name, u-&gt;name, sizeof(u-&gt;name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1227,8 +1248,9 @@ static void ip6gre_tnl_parm_to_user(struct ip6_tnl_parm2 *u,</div><div class='ctx'> 	memcpy(u-&gt;name, p-&gt;name, sizeof(u-&gt;name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='del'>-	struct ifreq *ifr, int cmd)</div><div class='add'>+static int ip6gre_tunnel_siocdevprivate(struct net_device *dev,</div><div class='add'>+					struct ifreq *ifr, void __user *data,</div><div class='add'>+					int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ip6_tnl_parm2 p;</div><div class='hunk'>@@ -1242,7 +1264,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGETTUNNEL:</div><div class='ctx'> 		if (dev == ign-&gt;fb_tunnel_dev) {</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p))) {</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p))) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1253,7 +1275,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 		ip6gre_tnl_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-		if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='add'>+		if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1264,7 +1286,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+		if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -1301,7 +1323,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 			memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 			ip6gre_tnl_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='add'>+			if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 		} else</div><div class='ctx'> 			err = (cmd == SIOCADDTUNNEL ? -ENOBUFS : -ENOENT);</div><div class='hunk'>@@ -1314,7 +1336,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (dev == ign-&gt;fb_tunnel_dev) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 			ip6gre_tnl_parm_from_user(&amp;p1, &amp;p);</div><div class='hunk'>@@ -1356,7 +1378,7 @@ static int ip6gre_header(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	ipv6h-&gt;daddr = t-&gt;parms.raddr;</div><div class='ctx'> </div><div class='ctx'> 	p = (__be16 *)(ipv6h + 1);</div><div class='del'>-	p[0] = t-&gt;parms.o_flags;</div><div class='add'>+	p[0] = ip_tunnel_flags_to_be16(t-&gt;parms.o_flags);</div><div class='ctx'> 	p[1] = htons(type);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1381,9 +1403,8 @@ static const struct net_device_ops ip6gre_netdev_ops = {</div><div class='ctx'> 	.ndo_init		= ip6gre_tunnel_init,</div><div class='ctx'> 	.ndo_uninit		= ip6gre_tunnel_uninit,</div><div class='ctx'> 	.ndo_start_xmit		= ip6gre_tunnel_xmit,</div><div class='del'>-	.ndo_do_ioctl		= ip6gre_tunnel_ioctl,</div><div class='add'>+	.ndo_siocdevprivate	= ip6gre_tunnel_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu		= ip6_tnl_change_mtu,</div><div class='del'>-	.ndo_get_stats64	= ip_tunnel_get_stats64,</div><div class='ctx'> 	.ndo_get_iflink		= ip6_tnl_get_iflink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1393,7 +1414,6 @@ static void ip6gre_dev_free(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	gro_cells_destroy(&amp;t-&gt;gro_cells);</div><div class='ctx'> 	dst_cache_destroy(&amp;t-&gt;dst_cache);</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6gre_tunnel_setup(struct net_device *dev)</div><div class='hunk'>@@ -1402,6 +1422,7 @@ static void ip6gre_tunnel_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='ctx'> 	dev-&gt;priv_destructor = ip6gre_dev_free;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> 	dev-&gt;type = ARPHRD_IP6GRE;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags |= IFF_NOARP;</div><div class='hunk'>@@ -1424,22 +1445,19 @@ static void ip6gre_tnl_init_features(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;features		|= GRE6_FEATURES;</div><div class='ctx'> 	dev-&gt;hw_features	|= GRE6_FEATURES;</div><div class='ctx'> </div><div class='del'>-	if (!(nt-&gt;parms.o_flags &amp; TUNNEL_SEQ)) {</div><div class='del'>-		/* TCP offload with GRE SEQ is not supported, nor</div><div class='del'>-		 * can we support 2 levels of outer headers requiring</div><div class='del'>-		 * an update.</div><div class='del'>-		 */</div><div class='del'>-		if (!(nt-&gt;parms.o_flags &amp; TUNNEL_CSUM) ||</div><div class='del'>-		    nt-&gt;encap.type == TUNNEL_ENCAP_NONE) {</div><div class='del'>-			dev-&gt;features    |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-			dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='del'>-		}</div><div class='add'>+	/* TCP offload with GRE SEQ is not supported, nor can we support 2</div><div class='add'>+	 * levels of outer headers requiring an update.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(IP_TUNNEL_SEQ_BIT, nt-&gt;parms.o_flags))</div><div class='add'>+		return;</div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, nt-&gt;parms.o_flags) &amp;&amp;</div><div class='add'>+	    nt-&gt;encap.type != TUNNEL_ENCAP_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		/* Can use a lockless transmit, unless we generate</div><div class='del'>-		 * output sequences</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;features |= NETIF_F_LLTX;</div><div class='del'>-	}</div><div class='add'>+	dev-&gt;features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6gre_tunnel_init_common(struct net_device *dev)</div><div class='hunk'>@@ -1451,16 +1469,11 @@ static int ip6gre_tunnel_init_common(struct net_device *dev)</div><div class='ctx'> 	tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;dev = dev;</div><div class='del'>-	tunnel-&gt;net = dev_net(dev);</div><div class='del'>-	strcpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	strscpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	ret = dst_cache_init(&amp;tunnel-&gt;dst_cache, GFP_KERNEL);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto cleanup_alloc_pcpu_stats;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = gro_cells_init(&amp;tunnel-&gt;gro_cells, dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1474,18 +1487,16 @@ static int ip6gre_tunnel_init_common(struct net_device *dev)</div><div class='ctx'> 		dev-&gt;mtu -= 8;</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;parms.collect_md) {</div><div class='del'>-		dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='ctx'> 		netif_keep_dst(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	ip6gre_tnl_init_features(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_hold(dev, &amp;tunnel-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cleanup_dst_cache_init:</div><div class='ctx'> 	dst_cache_destroy(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-cleanup_alloc_pcpu_stats:</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='del'>-	dev-&gt;tstats = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1503,7 +1514,7 @@ static int ip6gre_tunnel_init(struct net_device *dev)</div><div class='ctx'> 	if (tunnel-&gt;parms.collect_md)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;tunnel-&gt;parms.laddr, sizeof(struct in6_addr));</div><div class='add'>+	__dev_addr_set(dev, &amp;tunnel-&gt;parms.laddr, sizeof(struct in6_addr));</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;tunnel-&gt;parms.raddr, sizeof(struct in6_addr));</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_any(&amp;tunnel-&gt;parms.raddr))</div><div class='hunk'>@@ -1518,20 +1529,18 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;dev = dev;</div><div class='ctx'> 	tunnel-&gt;net = dev_net(dev);</div><div class='del'>-	strcpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='add'>+	strscpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;hlen		= sizeof(struct ipv6hdr) + 4;</div><div class='del'>-</div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct inet6_protocol ip6gre_protocol __read_mostly = {</div><div class='ctx'> 	.handler     = gre_rcv,</div><div class='ctx'> 	.err_handler = ip6gre_err,</div><div class='del'>-	.flags       = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,</div><div class='add'>+	.flags       = INET6_PROTO_FINAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void ip6gre_destroy_tunnels(struct net *net, struct list_head *head)</div><div class='add'>+static void __net_exit ip6gre_exit_rtnl_net(struct net *net, struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='hunk'>@@ -1548,16 +1557,16 @@ static void ip6gre_destroy_tunnels(struct net *net, struct list_head *head)</div><div class='ctx'> 		for (h = 0; h &lt; IP6_GRE_HASH_SIZE; h++) {</div><div class='ctx'> 			struct ip6_tnl *t;</div><div class='ctx'> </div><div class='del'>-			t = rtnl_dereference(ign-&gt;tunnels[prio][h]);</div><div class='add'>+			t = rtnl_net_dereference(net, ign-&gt;tunnels[prio][h]);</div><div class='ctx'> </div><div class='ctx'> 			while (t) {</div><div class='ctx'> 				/* If dev is in the same netns, it has already</div><div class='ctx'> 				 * been added to the list by the previous loop.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (!net_eq(dev_net(t-&gt;dev), net))</div><div class='del'>-					unregister_netdevice_queue(t-&gt;dev,</div><div class='del'>-								   head);</div><div class='del'>-				t = rtnl_dereference(t-&gt;next);</div><div class='add'>+					unregister_netdevice_queue(t-&gt;dev, head);</div><div class='add'>+</div><div class='add'>+				t = rtnl_net_dereference(net, t-&gt;next);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1566,23 +1575,23 @@ static void ip6gre_destroy_tunnels(struct net *net, struct list_head *head)</div><div class='ctx'> static int __net_init ip6gre_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);</div><div class='add'>+	struct net_device *ndev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_has_fallback_tunnels(net))</div><div class='ctx'> 		return 0;</div><div class='del'>-	ign-&gt;fb_tunnel_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0",</div><div class='del'>-					  NET_NAME_UNKNOWN,</div><div class='del'>-					  ip6gre_tunnel_setup);</div><div class='del'>-	if (!ign-&gt;fb_tunnel_dev) {</div><div class='add'>+	ndev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0",</div><div class='add'>+			    NET_NAME_UNKNOWN, ip6gre_tunnel_setup);</div><div class='add'>+	if (!ndev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_alloc_dev;</div><div class='ctx'> 	}</div><div class='add'>+	ign-&gt;fb_tunnel_dev = ndev;</div><div class='ctx'> 	dev_net_set(ign-&gt;fb_tunnel_dev, net);</div><div class='ctx'> 	/* FB netdevice is special: we have one, and only one per netns.</div><div class='ctx'> 	 * Allowing to move it to another netns is clearly unsafe.</div><div class='ctx'> 	 */</div><div class='del'>-	ign-&gt;fb_tunnel_dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='del'>-</div><div class='add'>+	ign-&gt;fb_tunnel_dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='ctx'> 	ip6gre_fb_tunnel_init(ign-&gt;fb_tunnel_dev);</div><div class='ctx'> 	ign-&gt;fb_tunnel_dev-&gt;rtnl_link_ops = &amp;ip6gre_link_ops;</div><div class='hunk'>@@ -1596,26 +1605,14 @@ static int __net_init ip6gre_init_net(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reg_dev:</div><div class='del'>-	free_netdev(ign-&gt;fb_tunnel_dev);</div><div class='add'>+	free_netdev(ndev);</div><div class='ctx'> err_alloc_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ip6gre_exit_batch_net(struct list_head *net_list)</div><div class='del'>-{</div><div class='del'>-	struct net *net;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry(net, net_list, exit_list)</div><div class='del'>-		ip6gre_destroy_tunnels(net, &amp;list);</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations ip6gre_net_ops = {</div><div class='ctx'> 	.init = ip6gre_init_net,</div><div class='del'>-	.exit_batch = ip6gre_exit_batch_net,</div><div class='add'>+	.exit_rtnl = ip6gre_exit_rtnl_net,</div><div class='ctx'> 	.id   = &amp;ip6gre_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip6gre_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -1729,6 +1726,27 @@ static int ip6erspan_tap_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ip6erspan_set_version(struct nlattr *data[],</div><div class='add'>+				  struct __ip6_tnl_parm *parms)</div><div class='add'>+{</div><div class='add'>+	if (!data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	parms-&gt;erspan_ver = 1;</div><div class='add'>+	if (data[IFLA_GRE_ERSPAN_VER])</div><div class='add'>+		parms-&gt;erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);</div><div class='add'>+</div><div class='add'>+	if (parms-&gt;erspan_ver == 1) {</div><div class='add'>+		if (data[IFLA_GRE_ERSPAN_INDEX])</div><div class='add'>+			parms-&gt;index = nla_get_u32(data[IFLA_GRE_ERSPAN_INDEX]);</div><div class='add'>+	} else if (parms-&gt;erspan_ver == 2) {</div><div class='add'>+		if (data[IFLA_GRE_ERSPAN_DIR])</div><div class='add'>+			parms-&gt;dir = nla_get_u8(data[IFLA_GRE_ERSPAN_DIR]);</div><div class='add'>+		if (data[IFLA_GRE_ERSPAN_HWID])</div><div class='add'>+			parms-&gt;hwid = nla_get_u16(data[IFLA_GRE_ERSPAN_HWID]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ip6gre_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 				struct __ip6_tnl_parm *parms)</div><div class='ctx'> {</div><div class='hunk'>@@ -1741,12 +1759,12 @@ static void ip6gre_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 		parms-&gt;link = nla_get_u32(data[IFLA_GRE_LINK]);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_IFLAGS])</div><div class='del'>-		parms-&gt;i_flags = gre_flags_to_tnl_flags(</div><div class='del'>-				nla_get_be16(data[IFLA_GRE_IFLAGS]));</div><div class='add'>+		gre_flags_to_tnl_flags(parms-&gt;i_flags,</div><div class='add'>+				       nla_get_be16(data[IFLA_GRE_IFLAGS]));</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_OFLAGS])</div><div class='del'>-		parms-&gt;o_flags = gre_flags_to_tnl_flags(</div><div class='del'>-				nla_get_be16(data[IFLA_GRE_OFLAGS]));</div><div class='add'>+		gre_flags_to_tnl_flags(parms-&gt;o_flags,</div><div class='add'>+				       nla_get_be16(data[IFLA_GRE_OFLAGS]));</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_IKEY])</div><div class='ctx'> 		parms-&gt;i_key = nla_get_be32(data[IFLA_GRE_IKEY]);</div><div class='hunk'>@@ -1777,20 +1795,6 @@ static void ip6gre_netlink_parms(struct nlattr *data[],</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_GRE_COLLECT_METADATA])</div><div class='ctx'> 		parms-&gt;collect_md = true;</div><div class='del'>-</div><div class='del'>-	parms-&gt;erspan_ver = 1;</div><div class='del'>-	if (data[IFLA_GRE_ERSPAN_VER])</div><div class='del'>-		parms-&gt;erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);</div><div class='del'>-</div><div class='del'>-	if (parms-&gt;erspan_ver == 1) {</div><div class='del'>-		if (data[IFLA_GRE_ERSPAN_INDEX])</div><div class='del'>-			parms-&gt;index = nla_get_u32(data[IFLA_GRE_ERSPAN_INDEX]);</div><div class='del'>-	} else if (parms-&gt;erspan_ver == 2) {</div><div class='del'>-		if (data[IFLA_GRE_ERSPAN_DIR])</div><div class='del'>-			parms-&gt;dir = nla_get_u8(data[IFLA_GRE_ERSPAN_DIR]);</div><div class='del'>-		if (data[IFLA_GRE_ERSPAN_HWID])</div><div class='del'>-			parms-&gt;hwid = nla_get_u16(data[IFLA_GRE_ERSPAN_HWID]);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6gre_tap_init(struct net_device *dev)</div><div class='hunk'>@@ -1813,7 +1817,6 @@ static const struct net_device_ops ip6gre_tap_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address = eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr = eth_validate_addr,</div><div class='ctx'> 	.ndo_change_mtu = ip6_tnl_change_mtu,</div><div class='del'>-	.ndo_get_stats64 = ip_tunnel_get_stats64,</div><div class='ctx'> 	.ndo_get_iflink = ip6_tnl_get_iflink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1839,16 +1842,11 @@ static int ip6erspan_tap_init(struct net_device *dev)</div><div class='ctx'> 	tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;dev = dev;</div><div class='del'>-	tunnel-&gt;net = dev_net(dev);</div><div class='del'>-	strcpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	strscpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	ret = dst_cache_init(&amp;tunnel-&gt;dst_cache, GFP_KERNEL);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto cleanup_alloc_pcpu_stats;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = gro_cells_init(&amp;tunnel-&gt;gro_cells, dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1864,13 +1862,12 @@ static int ip6erspan_tap_init(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> 	ip6erspan_tnl_link_config(tunnel, 1);</div><div class='ctx'> </div><div class='add'>+	netdev_hold(dev, &amp;tunnel-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cleanup_dst_cache_init:</div><div class='ctx'> 	dst_cache_destroy(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-cleanup_alloc_pcpu_stats:</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='del'>-	dev-&gt;tstats = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1881,7 +1878,6 @@ static const struct net_device_ops ip6erspan_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address =	eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr =	eth_validate_addr,</div><div class='ctx'> 	.ndo_change_mtu =	ip6_tnl_change_mtu,</div><div class='del'>-	.ndo_get_stats64 =	ip_tunnel_get_stats64,</div><div class='ctx'> 	.ndo_get_iflink =	ip6_tnl_get_iflink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1895,18 +1891,12 @@ static void ip6gre_tap_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='ctx'> 	dev-&gt;priv_destructor = ip6gre_dev_free;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> 	dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool is_ip6gretap_dev(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;netdev_ops == &amp;ip6gre_tap_netdev_ops;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(is_ip6gretap_dev);</div><div class='del'>-</div><div class='ctx'> static bool ip6gre_netlink_encap_parms(struct nlattr *data[],</div><div class='ctx'> 				       struct ip_tunnel_encap *ipencap)</div><div class='ctx'> {</div><div class='hunk'>@@ -1940,7 +1930,7 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[],</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev,</div><div class='add'>+static int ip6gre_newlink_common(struct net *link_net, struct net_device *dev,</div><div class='ctx'> 				 struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> 				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -1961,7 +1951,7 @@ static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='ctx'> </div><div class='ctx'> 	nt-&gt;dev = dev;</div><div class='del'>-	nt-&gt;net = dev_net(dev);</div><div class='add'>+	nt-&gt;net = link_net;</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdevice(dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1970,18 +1960,18 @@ static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 	if (tb[IFLA_MTU])</div><div class='ctx'> 		ip6_tnl_change_mtu(dev, nla_get_u32(tb[IFLA_MTU]));</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6gre_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			  struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ip6gre_newlink(struct net_device *dev,</div><div class='add'>+			  struct rtnl_newlink_params *params,</div><div class='ctx'> 			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = params-&gt;link_net ? : dev_net(dev);</div><div class='ctx'> 	struct ip6_tnl *nt = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct ip6gre_net *ign;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1996,7 +1986,7 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ip6gre_newlink_common(src_net, dev, tb, data, extack);</div><div class='add'>+	err = ip6gre_newlink_common(net, dev, tb, data, extack);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		ip6gre_tnl_link_config(nt, !tb[IFLA_MTU]);</div><div class='ctx'> 		ip6gre_tunnel_link_md(ign, nt);</div><div class='hunk'>@@ -2043,9 +2033,9 @@ static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 			     struct nlattr *data[],</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ip6gre_net *ign = net_generic(dev_net(dev), ip6gre_net_id);</div><div class='add'>+	struct ip6_tnl *t = netdev_priv(dev);</div><div class='add'>+	struct ip6gre_net *ign = net_generic(t-&gt;net, ip6gre_net_id);</div><div class='ctx'> 	struct __ip6_tnl_parm p;</div><div class='del'>-	struct ip6_tnl *t;</div><div class='ctx'> </div><div class='ctx'> 	t = ip6gre_changelink_common(dev, tb, data, &amp;p, extack);</div><div class='ctx'> 	if (IS_ERR(t))</div><div class='hunk'>@@ -2114,12 +2104,33 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> 	struct __ip6_tnl_parm *p = &amp;t-&gt;parms;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(o_flags);</div><div class='add'>+</div><div class='add'>+	ip_tunnel_flags_copy(o_flags, p-&gt;o_flags);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;erspan_ver == 1 || p-&gt;erspan_ver == 2) {</div><div class='add'>+		if (!p-&gt;collect_md)</div><div class='add'>+			__set_bit(IP_TUNNEL_KEY_BIT, o_flags);</div><div class='add'>+</div><div class='add'>+		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, p-&gt;erspan_ver))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (p-&gt;erspan_ver == 1) {</div><div class='add'>+			if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p-&gt;index))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		} else {</div><div class='add'>+			if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, p-&gt;dir))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, p-&gt;hwid))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_GRE_LINK, p-&gt;link) ||</div><div class='ctx'> 	    nla_put_be16(skb, IFLA_GRE_IFLAGS,</div><div class='ctx'> 			 gre_tnl_flags_to_gre_flags(p-&gt;i_flags)) ||</div><div class='ctx'> 	    nla_put_be16(skb, IFLA_GRE_OFLAGS,</div><div class='del'>-			 gre_tnl_flags_to_gre_flags(p-&gt;o_flags)) ||</div><div class='add'>+			 gre_tnl_flags_to_gre_flags(o_flags)) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_GRE_IKEY, p-&gt;i_key) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_GRE_OKEY, p-&gt;o_key) ||</div><div class='ctx'> 	    nla_put_in6_addr(skb, IFLA_GRE_LOCAL, &amp;p-&gt;laddr) ||</div><div class='hunk'>@@ -2128,8 +2139,7 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p-&gt;encap_limit) ||</div><div class='ctx'> 	    nla_put_be32(skb, IFLA_GRE_FLOWINFO, p-&gt;flowinfo) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_GRE_FLAGS, p-&gt;flags) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_GRE_FWMARK, p-&gt;fwmark) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p-&gt;index))</div><div class='add'>+	    nla_put_u32(skb, IFLA_GRE_FWMARK, p-&gt;fwmark))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,</div><div class='hunk'>@@ -2147,19 +2157,6 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, p-&gt;erspan_ver))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;erspan_ver == 1) {</div><div class='del'>-		if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p-&gt;index))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	} else if (p-&gt;erspan_ver == 2) {</div><div class='del'>-		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, p-&gt;dir))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, p-&gt;hwid))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='hunk'>@@ -2172,8 +2169,8 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {</div><div class='ctx'> 	[IFLA_GRE_OFLAGS]      = { .type = NLA_U16 },</div><div class='ctx'> 	[IFLA_GRE_IKEY]        = { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_GRE_OKEY]        = { .type = NLA_U32 },</div><div class='del'>-	[IFLA_GRE_LOCAL]       = { .len = FIELD_SIZEOF(struct ipv6hdr, saddr) },</div><div class='del'>-	[IFLA_GRE_REMOTE]      = { .len = FIELD_SIZEOF(struct ipv6hdr, daddr) },</div><div class='add'>+	[IFLA_GRE_LOCAL]       = { .len = sizeof_field(struct ipv6hdr, saddr) },</div><div class='add'>+	[IFLA_GRE_REMOTE]      = { .len = sizeof_field(struct ipv6hdr, daddr) },</div><div class='ctx'> 	[IFLA_GRE_TTL]         = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_GRE_ENCAP_LIMIT] = { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_GRE_FLOWINFO]    = { .type = NLA_U32 },</div><div class='hunk'>@@ -2194,26 +2191,30 @@ static void ip6erspan_tap_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ether_setup(dev);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;max_mtu = 0;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;ip6erspan_netdev_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='ctx'> 	dev-&gt;priv_destructor = ip6gre_dev_free;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> 	dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6erspan_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			     struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ip6erspan_newlink(struct net_device *dev,</div><div class='add'>+			     struct rtnl_newlink_params *params,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = params-&gt;link_net ? : dev_net(dev);</div><div class='ctx'> 	struct ip6_tnl *nt = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct ip6gre_net *ign;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ip6gre_netlink_parms(data, &amp;nt-&gt;parms);</div><div class='add'>+	ip6erspan_set_version(data, &amp;nt-&gt;parms);</div><div class='ctx'> 	ign = net_generic(net, ip6gre_net_id);</div><div class='ctx'> </div><div class='ctx'> 	if (nt-&gt;parms.collect_md) {</div><div class='hunk'>@@ -2224,7 +2225,7 @@ static int ip6erspan_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ip6gre_newlink_common(src_net, dev, tb, data, extack);</div><div class='add'>+	err = ip6gre_newlink_common(net, dev, tb, data, extack);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		ip6erspan_tnl_link_config(nt, !tb[IFLA_MTU]);</div><div class='ctx'> 		ip6erspan_tunnel_link_md(ign, nt);</div><div class='hunk'>@@ -2259,6 +2260,7 @@ static int ip6erspan_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	if (IS_ERR(t))</div><div class='ctx'> 		return PTR_ERR(t);</div><div class='ctx'> </div><div class='add'>+	ip6erspan_set_version(data, &amp;p);</div><div class='ctx'> 	ip6gre_tunnel_unlink_md(ign, t);</div><div class='ctx'> 	ip6gre_tunnel_unlink(ign, t);</div><div class='ctx'> 	ip6erspan_tnl_change(t, &amp;p, !tb[IFLA_MTU]);</div><div class='hunk'>@@ -2368,7 +2370,7 @@ static void __exit ip6gre_fini(void)</div><div class='ctx'> module_init(ip6gre_init);</div><div class='ctx'> module_exit(ip6gre_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("D. Kozlov (xeb@mail.ru)");</div><div class='add'>+MODULE_AUTHOR("D. Kozlov &lt;xeb@mail.ru&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GRE over IPv6 tunneling device");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("ip6gre");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("ip6gretap");</div><div class='head'>diff --git a/net/ipv6/ip6_icmp.c b/net/ipv6/ip6_icmp.c<br/>index 02045494c24c..233914b63bdb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_icmp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_icmp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_icmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_icmp.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> </div><div class='add'>+#if !IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+</div><div class='ctx'> static ip6_icmp_send_t __rcu *ip6_icmp_send;</div><div class='ctx'> </div><div class='ctx'> int inet6_register_icmp_sender(ip6_icmp_send_t *fn)</div><div class='hunk'>@@ -31,18 +33,54 @@ int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inet6_unregister_icmp_sender);</div><div class='ctx'> </div><div class='del'>-void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)</div><div class='add'>+void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,</div><div class='add'>+		   const struct inet6_skb_parm *parm)</div><div class='ctx'> {</div><div class='ctx'> 	ip6_icmp_send_t *send;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	send = rcu_dereference(ip6_icmp_send);</div><div class='add'>+	if (send)</div><div class='add'>+		send(skb, type, code, info, NULL, parm);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__icmpv6_send);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_NAT)</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='add'>+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)</div><div class='add'>+{</div><div class='add'>+	struct inet6_skb_parm parm = { 0 };</div><div class='add'>+	struct sk_buff *cloned_skb = NULL;</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	enum ip_conntrack_dir dir;</div><div class='add'>+	struct in6_addr orig_ip;</div><div class='add'>+	struct nf_conn *ct;</div><div class='ctx'> </div><div class='del'>-	if (!send)</div><div class='add'>+	ct = nf_ct_get(skb_in, &amp;ctinfo);</div><div class='add'>+	if (!ct || !(READ_ONCE(ct-&gt;status) &amp; IPS_NAT_MASK)) {</div><div class='add'>+		__icmpv6_send(skb_in, type, code, info, &amp;parm);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_shared(skb_in))</div><div class='add'>+		skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb_in || skb_network_header(skb_in) &lt; skb_in-&gt;head ||</div><div class='add'>+	    (skb_network_header(skb_in) + sizeof(struct ipv6hdr)) &gt;</div><div class='add'>+	    skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in,</div><div class='add'>+	    skb_network_offset(skb_in) + sizeof(struct ipv6hdr))))</div><div class='ctx'> 		goto out;</div><div class='del'>-	send(skb, type, code, info, NULL);</div><div class='add'>+</div><div class='add'>+	orig_ip = ipv6_hdr(skb_in)-&gt;saddr;</div><div class='add'>+	dir = CTINFO2DIR(ctinfo);</div><div class='add'>+	ipv6_hdr(skb_in)-&gt;saddr = ct-&gt;tuplehash[dir].tuple.src.u3.in6;</div><div class='add'>+	__icmpv6_send(skb_in, type, code, info, &amp;parm);</div><div class='add'>+	ipv6_hdr(skb_in)-&gt;saddr = orig_ip;</div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	consume_skb(cloned_skb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(icmpv6_send);</div><div class='add'>+EXPORT_SYMBOL(icmpv6_ndo_send);</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c<br/>index 6242682be876..168ec07e31cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_input.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 input</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *	Ian P. Morris		&lt;I.P.Morris@soton.ac.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Based in linux/net/ipv4/ip_input.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> /* Changes</div><div class='ctx'>  *</div><div class='hunk'>@@ -29,12 +25,14 @@</div><div class='ctx'> #include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;linux/mroute6.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -50,15 +48,20 @@</div><div class='ctx'> static void ip6_rcv_finish_core(struct net *net, struct sock *sk,</div><div class='ctx'> 				struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	void (*edemux)(struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-	if (net-&gt;ipv4.sysctl_ip_early_demux &amp;&amp; !skb_dst(skb) &amp;&amp; skb-&gt;sk == NULL) {</div><div class='del'>-		const struct inet6_protocol *ipprot;</div><div class='del'>-</div><div class='del'>-		ipprot = rcu_dereference(inet6_protos[ipv6_hdr(skb)-&gt;nexthdr]);</div><div class='del'>-		if (ipprot &amp;&amp; (edemux = READ_ONCE(ipprot-&gt;early_demux)))</div><div class='del'>-			edemux(skb);</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv4.sysctl_ip_early_demux) &amp;&amp;</div><div class='add'>+	    !skb_dst(skb) &amp;&amp; !skb-&gt;sk) {</div><div class='add'>+		switch (ipv6_hdr(skb)-&gt;nexthdr) {</div><div class='add'>+		case IPPROTO_TCP:</div><div class='add'>+			if (READ_ONCE(net-&gt;ipv4.sysctl_tcp_early_demux))</div><div class='add'>+				tcp_v6_early_demux(skb);</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_UDP:</div><div class='add'>+			if (READ_ONCE(net-&gt;ipv4.sysctl_udp_early_demux))</div><div class='add'>+				udp_v6_early_demux(skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (!skb_valid_dst(skb))</div><div class='ctx'> 		ip6_route_input(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -80,31 +83,55 @@ static void ip6_sublist_rcv_finish(struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(skb, next, head, list)</div><div class='add'>+	list_for_each_entry_safe(skb, next, head, list) {</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		dst_input(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ip6_can_use_hint(const struct sk_buff *skb,</div><div class='add'>+			     const struct sk_buff *hint)</div><div class='add'>+{</div><div class='add'>+	return hint &amp;&amp; !skb_dst(skb) &amp;&amp;</div><div class='add'>+	       ipv6_addr_equal(&amp;ipv6_hdr(hint)-&gt;daddr, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ip6_extract_route_hint(const struct net *net,</div><div class='add'>+					      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (fib6_routes_require_src(net) || fib6_has_custom_rules(net) ||</div><div class='add'>+	    IP6CB(skb)-&gt;flags &amp; IP6SKB_MULTIPATH)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6_list_rcv_finish(struct net *net, struct sock *sk,</div><div class='ctx'> 				struct list_head *head)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *skb, *next, *hint = NULL;</div><div class='ctx'> 	struct dst_entry *curr_dst = NULL;</div><div class='del'>-	struct sk_buff *skb, *next;</div><div class='del'>-	struct list_head sublist;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='ctx'> 		struct dst_entry *dst;</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		/* if ingress device is enslaved to an L3 master device pass the</div><div class='ctx'> 		 * skb to its handler for processing</div><div class='ctx'> 		 */</div><div class='ctx'> 		skb = l3mdev_ip6_rcv(skb);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			continue;</div><div class='del'>-		ip6_rcv_finish_core(net, sk, skb);</div><div class='add'>+</div><div class='add'>+		if (ip6_can_use_hint(skb, hint))</div><div class='add'>+			skb_dst_copy(skb, hint);</div><div class='add'>+		else</div><div class='add'>+			ip6_rcv_finish_core(net, sk, skb);</div><div class='ctx'> 		dst = skb_dst(skb);</div><div class='ctx'> 		if (curr_dst != dst) {</div><div class='add'>+			hint = ip6_extract_route_hint(net, skb);</div><div class='add'>+</div><div class='ctx'> 			/* dispatch old sublist */</div><div class='ctx'> 			if (!list_empty(&amp;sublist))</div><div class='ctx'> 				ip6_sublist_rcv_finish(&amp;sublist);</div><div class='hunk'>@@ -121,12 +148,14 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,</div><div class='ctx'> static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 				    struct net *net)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='ctx'> 	const struct ipv6hdr *hdr;</div><div class='ctx'> 	u32 pkt_len;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;pkt_type == PACKET_OTHERHOST) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		dev_core_stats_rx_otherhost_dropped_inc(skb-&gt;dev);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_OTHERHOST);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +165,12 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	__IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_IN, skb-&gt;len);</div><div class='ctx'> </div><div class='add'>+	SKB_DR_SET(reason, NOT_SPECIFIED);</div><div class='ctx'> 	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||</div><div class='del'>-	    !idev || unlikely(idev-&gt;cnf.disable_ipv6)) {</div><div class='add'>+	    !idev || unlikely(READ_ONCE(idev-&gt;cnf.disable_ipv6))) {</div><div class='ctx'> 		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);</div><div class='add'>+		if (idev &amp;&amp; unlikely(READ_ONCE(idev-&gt;cnf.disable_ipv6)))</div><div class='add'>+			SKB_DR_SET(reason, IPV6DISABLED);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -155,15 +187,19 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	 * arrived via the sending interface (ethX), because of the</div><div class='ctx'> 	 * nature of scoping architecture. --yoshfuji</div><div class='ctx'> 	 */</div><div class='del'>-	IP6CB(skb)-&gt;iif = skb_valid_dst(skb) ? ip6_dst_idev(skb_dst(skb))-&gt;dev-&gt;ifindex : dev-&gt;ifindex;</div><div class='add'>+	IP6CB(skb)-&gt;iif = skb_valid_dst(skb) ?</div><div class='add'>+				ip6_dst_idev(skb_dst(skb))-&gt;dev-&gt;ifindex :</div><div class='add'>+				dev-&gt;ifindex;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, sizeof(*hdr))))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	if (hdr-&gt;version != 6)</div><div class='add'>+	if (hdr-&gt;version != 6) {</div><div class='add'>+		SKB_DR_SET(reason, UNHANDLED_PROTO);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__IP6_ADD_STATS(net, idev,</div><div class='ctx'> 			IPSTATS_MIB_NOECTPKTS +</div><div class='hunk'>@@ -178,7 +214,8 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ipv6_addr_loopback(&amp;hdr-&gt;saddr) ||</div><div class='ctx'> 	     ipv6_addr_loopback(&amp;hdr-&gt;daddr)) &amp;&amp;</div><div class='del'>-	     !(dev-&gt;flags &amp; IFF_LOOPBACK))</div><div class='add'>+	    !(dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='add'>+	    !netif_is_l3_master(dev))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC4291 Errata ID: 3480</div><div class='hunk'>@@ -200,8 +237,10 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	if (!ipv6_addr_is_multicast(&amp;hdr-&gt;daddr) &amp;&amp;</div><div class='ctx'> 	    (skb-&gt;pkt_type == PACKET_BROADCAST ||</div><div class='ctx'> 	     skb-&gt;pkt_type == PACKET_MULTICAST) &amp;&amp;</div><div class='del'>-	    idev-&gt;cnf.drop_unicast_in_l2_multicast)</div><div class='add'>+	    READ_ONCE(idev-&gt;cnf.drop_unicast_in_l2_multicast)) {</div><div class='add'>+		SKB_DR_SET(reason, UNICAST_IN_L2_MULTICAST);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* RFC4291 2.7</div><div class='ctx'> 	 * Nodes must not originate a packet to a multicast address whose scope</div><div class='hunk'>@@ -230,12 +269,11 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 		if (pkt_len + sizeof(struct ipv6hdr) &gt; skb-&gt;len) {</div><div class='ctx'> 			__IP6_INC_STATS(net,</div><div class='ctx'> 					idev, IPSTATS_MIB_INTRUNCATEDPKTS);</div><div class='add'>+			SKB_DR_SET(reason, PKT_TOO_SMALL);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='del'>-		if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr))) {</div><div class='del'>-			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='add'>+		if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr)))</div><div class='add'>+			goto err;</div><div class='ctx'> 		hdr = ipv6_hdr(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -250,14 +288,16 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/* Must drop socket now because of tproxy. */</div><div class='del'>-	skb_orphan(skb);</div><div class='add'>+	if (!skb_sk_is_prefetched(skb))</div><div class='add'>+		skb_orphan(skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> err:</div><div class='ctx'> 	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+	SKB_DR_OR(reason, IP_INHDR);</div><div class='ctx'> drop:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -288,14 +328,13 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt,</div><div class='ctx'> 	struct net_device *curr_dev = NULL;</div><div class='ctx'> 	struct net *curr_net = NULL;</div><div class='ctx'> 	struct sk_buff *skb, *next;</div><div class='del'>-	struct list_head sublist;</div><div class='add'>+	LIST_HEAD(sublist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sublist);</div><div class='ctx'> 	list_for_each_entry_safe(skb, next, head, list) {</div><div class='ctx'> 		struct net_device *dev = skb-&gt;dev;</div><div class='ctx'> 		struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;skb-&gt;list);</div><div class='add'>+		skb_list_del_init(skb);</div><div class='ctx'> 		skb = ip6_rcv_core(skb, dev, net);</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -312,34 +351,36 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt,</div><div class='ctx'> 		list_add_tail(&amp;skb-&gt;list, &amp;sublist);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* dispatch final sublist */</div><div class='del'>-	ip6_sublist_rcv(&amp;sublist, curr_dev, curr_net);</div><div class='add'>+	if (!list_empty(&amp;sublist))</div><div class='add'>+		ip6_sublist_rcv(&amp;sublist, curr_dev, curr_net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_DECLARE(int tcp_v6_rcv(struct sk_buff *));</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Deliver the packet to the host</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,</div><div class='add'>+			      bool have_final)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inet6_protocol *ipprot;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	unsigned int nhoff;</div><div class='del'>-	int nexthdr;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	bool raw;</div><div class='del'>-	bool have_final = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Parse extension headers</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> resubmit:</div><div class='ctx'> 	idev = ip6_dst_idev(skb_dst(skb));</div><div class='del'>-	if (!pskb_pull(skb, skb_transport_offset(skb)))</div><div class='del'>-		goto discard;</div><div class='ctx'> 	nhoff = IP6CB(skb)-&gt;nhoff;</div><div class='del'>-	nexthdr = skb_network_header(skb)[nhoff];</div><div class='add'>+	if (!have_final) {</div><div class='add'>+		if (!pskb_pull(skb, skb_transport_offset(skb)))</div><div class='add'>+			goto discard;</div><div class='add'>+		nexthdr = skb_network_header(skb)[nhoff];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> resubmit_final:</div><div class='ctx'> 	raw = raw6_local_deliver(skb, nexthdr);</div><div class='hunk'>@@ -358,29 +399,44 @@ resubmit_final:</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (ipprot-&gt;flags &amp; INET6_PROTO_FINAL) {</div><div class='ctx'> 			const struct ipv6hdr *hdr;</div><div class='add'>+			int sdif = inet6_sdif(skb);</div><div class='add'>+			struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 			/* Only do this once for first final protocol */</div><div class='ctx'> 			have_final = true;</div><div class='ctx'> </div><div class='del'>-			/* Free reference early: we don't need it any more,</div><div class='del'>-			   and it may hold ip_conntrack module loaded</div><div class='del'>-			   indefinitely. */</div><div class='del'>-			nf_reset(skb);</div><div class='ctx'> </div><div class='ctx'> 			skb_postpull_rcsum(skb, skb_network_header(skb),</div><div class='ctx'> 					   skb_network_header_len(skb));</div><div class='ctx'> 			hdr = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+			/* skb-&gt;dev passed may be master dev for vrfs. */</div><div class='add'>+			if (sdif) {</div><div class='add'>+				dev = dev_get_by_index_rcu(net, sdif);</div><div class='add'>+				if (!dev)</div><div class='add'>+					goto discard;</div><div class='add'>+			} else {</div><div class='add'>+				dev = skb-&gt;dev;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (ipv6_addr_is_multicast(&amp;hdr-&gt;daddr) &amp;&amp;</div><div class='del'>-			    !ipv6_chk_mcast_addr(skb-&gt;dev, &amp;hdr-&gt;daddr,</div><div class='del'>-			    &amp;hdr-&gt;saddr) &amp;&amp;</div><div class='del'>-			    !ipv6_is_mld(skb, nexthdr, skb_network_header_len(skb)))</div><div class='add'>+			    !ipv6_chk_mcast_addr(dev, &amp;hdr-&gt;daddr,</div><div class='add'>+						 &amp;hdr-&gt;saddr) &amp;&amp;</div><div class='add'>+			    !ipv6_is_mld(skb, nexthdr, skb_network_header_len(skb))) {</div><div class='add'>+				SKB_DR_SET(reason, IP_INADDRERRORS);</div><div class='ctx'> 				goto discard;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!(ipprot-&gt;flags &amp; INET6_PROTO_NOPOLICY)) {</div><div class='add'>+			if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='add'>+				SKB_DR_SET(reason, XFRM_POLICY);</div><div class='add'>+				goto discard;</div><div class='add'>+			}</div><div class='add'>+			nf_reset_ct(skb);</div><div class='ctx'> 		}</div><div class='del'>-		if (!(ipprot-&gt;flags &amp; INET6_PROTO_NOPOLICY) &amp;&amp;</div><div class='del'>-		    !xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='del'>-			goto discard;</div><div class='ctx'> </div><div class='del'>-		ret = ipprot-&gt;handler(skb);</div><div class='add'>+		ret = INDIRECT_CALL_2(ipprot-&gt;handler, tcp_v6_rcv, udpv6_rcv,</div><div class='add'>+				      skb);</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			if (ipprot-&gt;flags &amp; INET6_PROTO_FINAL) {</div><div class='ctx'> 				/* Not an extension header, most likely UDP</div><div class='hunk'>@@ -403,49 +459,81 @@ resubmit_final:</div><div class='ctx'> 						IPSTATS_MIB_INUNKNOWNPROTOS);</div><div class='ctx'> 				icmpv6_send(skb, ICMPV6_PARAMPROB,</div><div class='ctx'> 					    ICMPV6_UNK_NEXTHDR, nhoff);</div><div class='add'>+				SKB_DR_SET(reason, IP_NOPROTO);</div><div class='add'>+			} else {</div><div class='add'>+				SKB_DR_SET(reason, XFRM_POLICY);</div><div class='ctx'> 			}</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			kfree_skb_reason(skb, reason);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDELIVERS);</div><div class='ctx'> 			consume_skb(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='ctx'> discard:</div><div class='ctx'> 	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC))) {</div><div class='add'>+		__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='add'>+				IPSTATS_MIB_INDISCARDS);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_NOMEM);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_clear_delivery_time(skb);</div><div class='add'>+	ip6_protocol_deliver_rcu(net, skb, 0, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int ip6_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN,</div><div class='del'>-		       dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='del'>-		       ip6_input_finish);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	res = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN,</div><div class='add'>+		      dev_net_rcu(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='add'>+		      ip6_input_finish);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_input);</div><div class='ctx'> </div><div class='ctx'> int ip6_mc_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	int sdif = inet6_sdif(skb);</div><div class='ctx'> 	const struct ipv6hdr *hdr;</div><div class='ctx'> 	bool deliver;</div><div class='ctx'> </div><div class='del'>-	__IP6_UPD_PO_STATS(dev_net(skb_dst(skb)-&gt;dev),</div><div class='del'>-			 __in6_dev_get_safely(skb-&gt;dev), IPSTATS_MIB_INMCAST,</div><div class='del'>-			 skb-&gt;len);</div><div class='add'>+	__IP6_UPD_PO_STATS(skb_dst_dev_net_rcu(skb),</div><div class='add'>+			   __in6_dev_get_safely(dev), IPSTATS_MIB_INMCAST,</div><div class='add'>+			   skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* skb-&gt;dev passed may be master dev for vrfs. */</div><div class='add'>+	if (sdif) {</div><div class='add'>+		dev = dev_get_by_index_rcu(dev_net_rcu(dev), sdif);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='del'>-	deliver = ipv6_chk_mcast_addr(skb-&gt;dev, &amp;hdr-&gt;daddr, NULL);</div><div class='add'>+	deliver = ipv6_chk_mcast_addr(dev, &amp;hdr-&gt;daddr, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_MROUTE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *      IPv6 multicast router mode is now supported ;)</div><div class='ctx'> 	 */</div><div class='del'>-	if (dev_net(skb-&gt;dev)-&gt;ipv6.devconf_all-&gt;mc_forwarding &amp;&amp;</div><div class='add'>+	if (atomic_read(&amp;dev_net_rcu(skb-&gt;dev)-&gt;ipv6.devconf_all-&gt;mc_forwarding) &amp;&amp;</div><div class='ctx'> 	    !(ipv6_addr_type(&amp;hdr-&gt;daddr) &amp;</div><div class='ctx'> 	      (IPV6_ADDR_LOOPBACK|IPV6_ADDR_LINKLOCAL)) &amp;&amp;</div><div class='ctx'> 	    likely(!(IP6CB(skb)-&gt;flags &amp; IP6SKB_FORWARDED))) {</div><div class='hunk'>@@ -486,22 +574,21 @@ int ip6_mc_input(struct sk_buff *skb)</div><div class='ctx'> 			/* unknown RA - process it normally */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (deliver)</div><div class='add'>+		if (deliver) {</div><div class='ctx'> 			skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-		else {</div><div class='add'>+		} else {</div><div class='ctx'> 			skb2 = skb;</div><div class='ctx'> 			skb = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (skb2) {</div><div class='add'>+		if (skb2)</div><div class='ctx'> 			ip6_mr_input(skb2);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> #endif</div><div class='del'>-	if (likely(deliver))</div><div class='add'>+	if (likely(deliver)) {</div><div class='ctx'> 		ip6_input(skb);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		/* discard */</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c<br/>index c7e495f12011..fce91183797a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_offload.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV6 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -17,9 +13,64 @@</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ip6_offload.h"</div><div class='ctx'> </div><div class='add'>+/* All GRO functions are always builtin, except UDP over ipv6, which lays in</div><div class='add'>+ * ipv6 module, as it depends on UDPv6 lookup function, so we need special care</div><div class='add'>+ * when ipv6 is built as a module</div><div class='add'>+ */</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+#define INDIRECT_CALL_L4(f, f2, f1, ...) INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define INDIRECT_CALL_L4(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define indirect_call_gro_receive_l4(f2, f1, cb, head, skb)	\</div><div class='add'>+({								\</div><div class='add'>+	unlikely(gro_recursion_inc_test(skb)) ?			\</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;flush |= 1, NULL :		\</div><div class='add'>+		INDIRECT_CALL_L4(cb, f2, f1, head, skb);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static int ipv6_gro_pull_exthdrs(struct sk_buff *skb, int off, int proto)</div><div class='add'>+{</div><div class='add'>+	const struct net_offload *ops = NULL;</div><div class='add'>+	struct ipv6_opt_hdr *opth;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		ops = rcu_dereference(inet6_offloads[proto]);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!ops))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!(ops-&gt;flags &amp; INET6_PROTO_GSO_EXTHDR))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		opth = skb_gro_header(skb, off + sizeof(*opth), off);</div><div class='add'>+		if (unlikely(!opth))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len = ipv6_optlen(opth);</div><div class='add'>+</div><div class='add'>+		opth = skb_gro_header(skb, off + len, off);</div><div class='add'>+		if (unlikely(!opth))</div><div class='add'>+			break;</div><div class='add'>+		proto = opth-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+		off += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_gro_pull(skb, off - skb_gro_receive_network_offset(skb));</div><div class='add'>+	return proto;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_offload *ops = NULL;</div><div class='hunk'>@@ -28,15 +79,13 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)</div><div class='ctx'> 		struct ipv6_opt_hdr *opth;</div><div class='ctx'> 		int len;</div><div class='ctx'> </div><div class='del'>-		if (proto != NEXTHDR_HOP) {</div><div class='del'>-			ops = rcu_dereference(inet6_offloads[proto]);</div><div class='add'>+		ops = rcu_dereference(inet6_offloads[proto]);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(!ops))</div><div class='del'>-				break;</div><div class='add'>+		if (unlikely(!ops))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			if (!(ops-&gt;flags &amp; INET6_PROTO_GSO_EXTHDR))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		if (!(ops-&gt;flags &amp; INET6_PROTO_GSO_EXTHDR))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!pskb_may_pull(skb, 8)))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -61,7 +110,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='ctx'> 	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='del'>-	int proto;</div><div class='add'>+	int proto, err;</div><div class='ctx'> 	struct frag_hdr *fptr;</div><div class='ctx'> 	unsigned int payload_len;</div><div class='ctx'> 	u8 *prevhdr;</div><div class='hunk'>@@ -71,6 +120,9 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	bool gso_partial;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='add'>+	err = ipv6_hopopt_jumbo_remove(skb);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> 	nhoff = skb_network_header(skb) - skb_mac_header(skb);</div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -96,8 +148,12 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	ops = rcu_dereference(inet6_offloads[proto]);</div><div class='ctx'> 	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment)) {</div><div class='del'>-		skb_reset_transport_header(skb);</div><div class='add'>+		if (!skb_reset_transport_header_careful(skb))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='add'>+		if (!segs)</div><div class='add'>+			skb-&gt;network_header = skb_mac_header(skb) + nhoff - skb-&gt;head;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR_OR_NULL(segs))</div><div class='hunk'>@@ -149,13 +205,12 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,</div><div class='ctx'> </div><div class='ctx'> 	proto = iph-&gt;nexthdr;</div><div class='ctx'> 	for (;;) {</div><div class='del'>-		if (proto != NEXTHDR_HOP) {</div><div class='del'>-			*opps = rcu_dereference(inet6_offloads[proto]);</div><div class='del'>-			if (unlikely(!(*opps)))</div><div class='del'>-				break;</div><div class='del'>-			if (!((*opps)-&gt;flags &amp; INET6_PROTO_GSO_EXTHDR))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		*opps = rcu_dereference(inet6_offloads[proto]);</div><div class='add'>+		if (unlikely(!(*opps)))</div><div class='add'>+			break;</div><div class='add'>+		if (!((*opps)-&gt;flags &amp; INET6_PROTO_GSO_EXTHDR))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		opth = (void *)opth + optlen;</div><div class='ctx'> 		optlen = ipv6_optlen(opth);</div><div class='ctx'> 		len += optlen;</div><div class='hunk'>@@ -164,8 +219,8 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *ipv6_gro_receive(struct list_head *head,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head,</div><div class='add'>+							 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='ctx'> 	struct sk_buff *pp = NULL;</div><div class='hunk'>@@ -179,41 +234,34 @@ static struct sk_buff *ipv6_gro_receive(struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	off = skb_gro_offset(skb);</div><div class='ctx'> 	hlen = off + sizeof(*iph);</div><div class='del'>-	iph = skb_gro_header_fast(skb, off);</div><div class='del'>-	if (skb_gro_header_hard(skb, hlen)) {</div><div class='del'>-		iph = skb_gro_header_slow(skb, hlen, off);</div><div class='del'>-		if (unlikely(!iph))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	iph = skb_gro_header(skb, hlen, off);</div><div class='add'>+	if (unlikely(!iph))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	skb_set_network_header(skb, off);</div><div class='del'>-	skb_gro_pull(skb, sizeof(*iph));</div><div class='del'>-	skb_set_transport_header(skb, skb_gro_offset(skb));</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;network_offsets[NAPI_GRO_CB(skb)-&gt;encap_mark] = off;</div><div class='ctx'> </div><div class='del'>-	flush += ntohs(iph-&gt;payload_len) != skb_gro_len(skb);</div><div class='add'>+	flush += ntohs(iph-&gt;payload_len) != skb-&gt;len - hlen;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	proto = iph-&gt;nexthdr;</div><div class='ctx'> 	ops = rcu_dereference(inet6_offloads[proto]);</div><div class='ctx'> 	if (!ops || !ops-&gt;callbacks.gro_receive) {</div><div class='del'>-		__pskb_pull(skb, skb_gro_offset(skb));</div><div class='del'>-		skb_gro_frag0_invalidate(skb);</div><div class='del'>-		proto = ipv6_gso_pull_exthdrs(skb, proto);</div><div class='del'>-		skb_gro_pull(skb, -skb_transport_offset(skb));</div><div class='del'>-		skb_reset_transport_header(skb);</div><div class='del'>-		__skb_push(skb, skb_gro_offset(skb));</div><div class='add'>+		proto = ipv6_gro_pull_exthdrs(skb, hlen, proto);</div><div class='ctx'> </div><div class='ctx'> 		ops = rcu_dereference(inet6_offloads[proto]);</div><div class='ctx'> 		if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-		iph = ipv6_hdr(skb);</div><div class='add'>+		iph = skb_gro_network_header(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb_gro_pull(skb, sizeof(*iph));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_set_transport_header(skb, skb_gro_offset(skb));</div><div class='add'>+</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;proto = proto;</div><div class='ctx'> </div><div class='ctx'> 	flush--;</div><div class='del'>-	nlen = skb_network_header_len(skb);</div><div class='add'>+	nlen = skb_gro_offset(skb) - off;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(p, head, list) {</div><div class='ctx'> 		const struct ipv6hdr *iph2;</div><div class='hunk'>@@ -229,34 +277,29 @@ static struct sk_buff *ipv6_gro_receive(struct list_head *head,</div><div class='ctx'> 		 * XXX skbs on the gro_list have all been parsed and pulled</div><div class='ctx'> 		 * already so we don't need to compare nlen</div><div class='ctx'> 		 * (nlen != (sizeof(*iph2) + ipv6_exthdrs_len(iph2, &amp;ops)))</div><div class='del'>-		 * memcmp() alone below is suffcient, right?</div><div class='add'>+		 * memcmp() alone below is sufficient, right?</div><div class='ctx'> 		 */</div><div class='ctx'> 		 if ((first_word &amp; htonl(0xF00FFFFF)) ||</div><div class='del'>-		    memcmp(&amp;iph-&gt;nexthdr, &amp;iph2-&gt;nexthdr,</div><div class='del'>-			   nlen - offsetof(struct ipv6hdr, nexthdr))) {</div><div class='add'>+		     !ipv6_addr_equal(&amp;iph-&gt;saddr, &amp;iph2-&gt;saddr) ||</div><div class='add'>+		     !ipv6_addr_equal(&amp;iph-&gt;daddr, &amp;iph2-&gt;daddr) ||</div><div class='add'>+		     iph-&gt;nexthdr != iph2-&gt;nexthdr) {</div><div class='add'>+not_same_flow:</div><div class='ctx'> 			NAPI_GRO_CB(p)-&gt;same_flow = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		/* flush if Traffic Class fields are different */</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;flush |= !!(first_word &amp; htonl(0x0FF00000));</div><div class='del'>-		NAPI_GRO_CB(p)-&gt;flush |= flush;</div><div class='del'>-</div><div class='del'>-		/* If the previous IP ID value was based on an atomic</div><div class='del'>-		 * datagram we can overwrite the value and ignore it.</div><div class='del'>-		 */</div><div class='del'>-		if (NAPI_GRO_CB(skb)-&gt;is_atomic)</div><div class='del'>-			NAPI_GRO_CB(p)-&gt;flush_id = 0;</div><div class='add'>+		if (unlikely(nlen &gt; sizeof(struct ipv6hdr))) {</div><div class='add'>+			if (memcmp(iph + 1, iph2 + 1,</div><div class='add'>+				   nlen - sizeof(struct ipv6hdr)))</div><div class='add'>+				goto not_same_flow;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;is_atomic = true;</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;flush |= flush;</div><div class='ctx'> </div><div class='ctx'> 	skb_gro_postpull_rcsum(skb, iph, nlen);</div><div class='ctx'> </div><div class='del'>-	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	pp = indirect_call_gro_receive_l4(tcp6_gro_receive, udp6_gro_receive,</div><div class='add'>+					 ops-&gt;callbacks.gro_receive, head, skb);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	skb_gro_flush_final(skb, pp, flush);</div><div class='hunk'>@@ -294,30 +337,55 @@ static struct sk_buff *ip4ip6_gro_receive(struct list_head *head,</div><div class='ctx'> 	return inet_gro_receive(head, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipv6_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_offload *ops;</div><div class='del'>-	struct ipv6hdr *iph = (struct ipv6hdr *)(skb-&gt;data + nhoff);</div><div class='add'>+	struct ipv6hdr *iph;</div><div class='ctx'> 	int err = -ENOSYS;</div><div class='add'>+	u32 payload_len;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;encapsulation) {</div><div class='ctx'> 		skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IPV6));</div><div class='ctx'> 		skb_set_inner_network_header(skb, nhoff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iph-&gt;payload_len = htons(skb-&gt;len - nhoff - sizeof(*iph));</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	payload_len = skb-&gt;len - nhoff - sizeof(*iph);</div><div class='add'>+	if (unlikely(payload_len &gt; IPV6_MAXPLEN)) {</div><div class='add'>+		struct hop_jumbo_hdr *hop_jumbo;</div><div class='add'>+		int hoplen = sizeof(*hop_jumbo);</div><div class='add'>+</div><div class='add'>+		/* Move network header left */</div><div class='add'>+		memmove(skb_mac_header(skb) - hoplen, skb_mac_header(skb),</div><div class='add'>+			skb-&gt;transport_header - skb-&gt;mac_header);</div><div class='add'>+		skb-&gt;data -= hoplen;</div><div class='add'>+		skb-&gt;len += hoplen;</div><div class='add'>+		skb-&gt;mac_header -= hoplen;</div><div class='add'>+		skb-&gt;network_header -= hoplen;</div><div class='add'>+		iph = (struct ipv6hdr *)(skb-&gt;data + nhoff);</div><div class='add'>+		hop_jumbo = (struct hop_jumbo_hdr *)(iph + 1);</div><div class='add'>+</div><div class='add'>+		/* Build hop-by-hop options */</div><div class='add'>+		hop_jumbo-&gt;nexthdr = iph-&gt;nexthdr;</div><div class='add'>+		hop_jumbo-&gt;hdrlen = 0;</div><div class='add'>+		hop_jumbo-&gt;tlv_type = IPV6_TLV_JUMBO;</div><div class='add'>+		hop_jumbo-&gt;tlv_len = 4;</div><div class='add'>+		hop_jumbo-&gt;jumbo_payload_len = htonl(payload_len + hoplen);</div><div class='add'>+</div><div class='add'>+		iph-&gt;nexthdr = NEXTHDR_HOP;</div><div class='add'>+		iph-&gt;payload_len = 0;</div><div class='add'>+	} else {</div><div class='add'>+		iph = (struct ipv6hdr *)(skb-&gt;data + nhoff);</div><div class='add'>+		iph-&gt;payload_len = htons(payload_len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &amp;ops);</div><div class='ctx'> 	if (WARN_ON(!ops || !ops-&gt;callbacks.gro_complete))</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	err = ops-&gt;callbacks.gro_complete(skb, nhoff);</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	err = INDIRECT_CALL_L4(ops-&gt;callbacks.gro_complete, tcp6_gro_complete,</div><div class='add'>+			       udp6_gro_complete, skb, nhoff);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -342,18 +410,37 @@ static int ip4ip6_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> 	return inet_gro_complete(skb, nhoff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct packet_offload ipv6_packet_offload __read_mostly = {</div><div class='del'>-	.type = cpu_to_be16(ETH_P_IPV6),</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment = ipv6_gso_segment,</div><div class='del'>-		.gro_receive = ipv6_gro_receive,</div><div class='del'>-		.gro_complete = ipv6_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+</div><div class='add'>+static struct sk_buff *sit_gso_segment(struct sk_buff *skb,</div><div class='add'>+				       netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_IPXIP4))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return ipv6_gso_segment(skb, features);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ip4ip6_gso_segment(struct sk_buff *skb,</div><div class='add'>+					  netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_IPXIP6))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return inet_gso_segment(skb, features);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ip6ip6_gso_segment(struct sk_buff *skb,</div><div class='add'>+					  netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_IPXIP6))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return ipv6_gso_segment(skb, features);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct net_offload sit_offload = {</div><div class='ctx'> 	.callbacks = {</div><div class='del'>-		.gso_segment	= ipv6_gso_segment,</div><div class='add'>+		.gso_segment	= sit_gso_segment,</div><div class='ctx'> 		.gro_receive    = sit_ip6ip6_gro_receive,</div><div class='ctx'> 		.gro_complete   = sit_gro_complete,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -361,7 +448,7 @@ static const struct net_offload sit_offload = {</div><div class='ctx'> </div><div class='ctx'> static const struct net_offload ip4ip6_offload = {</div><div class='ctx'> 	.callbacks = {</div><div class='del'>-		.gso_segment	= inet_gso_segment,</div><div class='add'>+		.gso_segment	= ip4ip6_gso_segment,</div><div class='ctx'> 		.gro_receive    = ip4ip6_gro_receive,</div><div class='ctx'> 		.gro_complete   = ip4ip6_gro_complete,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -369,7 +456,7 @@ static const struct net_offload ip4ip6_offload = {</div><div class='ctx'> </div><div class='ctx'> static const struct net_offload ip6ip6_offload = {</div><div class='ctx'> 	.callbacks = {</div><div class='del'>-		.gso_segment	= ipv6_gso_segment,</div><div class='add'>+		.gso_segment	= ip6ip6_gso_segment,</div><div class='ctx'> 		.gro_receive    = sit_ip6ip6_gro_receive,</div><div class='ctx'> 		.gro_complete   = ip6ip6_gro_complete,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -382,7 +469,15 @@ static int __init ipv6_offload_init(void)</div><div class='ctx'> 	if (ipv6_exthdrs_offload_init() &lt; 0)</div><div class='ctx'> 		pr_crit("%s: Cannot add EXTHDRS protocol offload\n", __func__);</div><div class='ctx'> </div><div class='del'>-	dev_add_offload(&amp;ipv6_packet_offload);</div><div class='add'>+	net_hotdata.ipv6_packet_offload = (struct packet_offload) {</div><div class='add'>+		.type = cpu_to_be16(ETH_P_IPV6),</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment = ipv6_gso_segment,</div><div class='add'>+			.gro_receive = ipv6_gro_receive,</div><div class='add'>+			.gro_complete = ipv6_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	dev_add_offload(&amp;net_hotdata.ipv6_packet_offload);</div><div class='ctx'> </div><div class='ctx'> 	inet_add_offload(&amp;sit_offload, IPPROTO_IPV6);</div><div class='ctx'> 	inet6_add_offload(&amp;ip6ip6_offload, IPPROTO_IPV6);</div><div class='head'>diff --git a/net/ipv6/ip6_offload.h b/net/ipv6/ip6_offload.h<br/>index 96b40e41ac53..e768987604f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_offload.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_offload.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_offload.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_offload.h</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV6 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ip6_offload_h</div><div class='head'>diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c<br/>index f9f8f554d141..f904739e99b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_output.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 output functions</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on linux/net/ipv4/ip_output.c</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Changes:</div><div class='ctx'>  *	A.N.Kuznetsov	:	airthmetics in fragmentation.</div><div class='ctx'>  *				extension headers are implemented.</div><div class='hunk'>@@ -46,6 +42,7 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -58,23 +55,36 @@</div><div class='ctx'> #include &lt;linux/mroute6.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='add'>+	struct net_device *dev = dst_dev_rcu(dst);</div><div class='add'>+	struct inet6_dev *idev = ip6_dst_idev(dst);</div><div class='add'>+	unsigned int hh_len = LL_RESERVED_SPACE(dev);</div><div class='add'>+	const struct in6_addr *daddr, *nexthop;</div><div class='add'>+	struct ipv6hdr *hdr;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='del'>-	struct in6_addr *nexthop;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (ipv6_addr_is_multicast(&amp;ipv6_hdr(skb)-&gt;daddr)) {</div><div class='del'>-		struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));</div><div class='add'>+	/* Be paranoid, rather than too clever. */</div><div class='add'>+	if (unlikely(hh_len &gt; skb_headroom(skb)) &amp;&amp; dev-&gt;header_ops) {</div><div class='add'>+		/* idev stays alive because we hold rcu_read_lock(). */</div><div class='add'>+		skb = skb_expand_head(skb, hh_len);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	daddr = &amp;hdr-&gt;daddr;</div><div class='add'>+	if (ipv6_addr_is_multicast(daddr)) {</div><div class='ctx'> 		if (!(dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp; sk_mc_loop(sk) &amp;&amp;</div><div class='ctx'> 		    ((mroute6_is_socket(net, skb) &amp;&amp;</div><div class='ctx'> 		     !(IP6CB(skb)-&gt;flags &amp; IP6SKB_FORWARDED)) ||</div><div class='del'>-		     ipv6_chk_mcast_addr(dev, &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='del'>-					 &amp;ipv6_hdr(skb)-&gt;saddr))) {</div><div class='add'>+		     ipv6_chk_mcast_addr(dev, daddr, &amp;hdr-&gt;saddr))) {</div><div class='ctx'> 			struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 			/* Do not check for IFF_ALLMULTI; multicast routing</div><div class='hunk'>@@ -85,7 +95,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *</div><div class='ctx'> 					net, sk, newskb, NULL, newskb-&gt;dev,</div><div class='ctx'> 					dev_loopback_xmit);</div><div class='ctx'> </div><div class='del'>-			if (ipv6_hdr(skb)-&gt;hop_limit == 0) {</div><div class='add'>+			if (hdr-&gt;hop_limit == 0) {</div><div class='ctx'> 				IP6_INC_STATS(net, idev,</div><div class='ctx'> 					      IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 				kfree_skb(skb);</div><div class='hunk'>@@ -94,9 +104,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-		if (IPV6_ADDR_MC_SCOPE(&amp;ipv6_hdr(skb)-&gt;daddr) &lt;=</div><div class='del'>-		    IPV6_ADDR_SCOPE_NODELOCAL &amp;&amp;</div><div class='add'>+		if (IPV6_ADDR_MC_SCOPE(daddr) &lt;= IPV6_ADDR_SCOPE_NODELOCAL &amp;&amp;</div><div class='ctx'> 		    !(dev-&gt;flags &amp; IFF_LOOPBACK)) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -106,131 +114,218 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *</div><div class='ctx'> 	if (lwtunnel_xmit_redirect(dst-&gt;lwtstate)) {</div><div class='ctx'> 		int res = lwtunnel_xmit(skb);</div><div class='ctx'> </div><div class='del'>-		if (res &lt; 0 || res == LWTUNNEL_XMIT_DONE)</div><div class='add'>+		if (res != LWTUNNEL_XMIT_CONTINUE)</div><div class='ctx'> 			return res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	nexthop = rt6_nexthop((struct rt6_info *)dst, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='del'>-	neigh = __ipv6_neigh_lookup_noref(dst-&gt;dev, nexthop);</div><div class='del'>-	if (unlikely(!neigh))</div><div class='del'>-		neigh = __neigh_create(&amp;nd_tbl, nexthop, dst-&gt;dev, false);</div><div class='del'>-	if (!IS_ERR(neigh)) {</div><div class='del'>-		sock_confirm_neigh(skb, neigh);</div><div class='del'>-		ret = neigh_output(neigh, skb);</div><div class='del'>-		rcu_read_unlock_bh();</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	nexthop = rt6_nexthop(dst_rt6_info(dst), daddr);</div><div class='add'>+	neigh = __ipv6_neigh_lookup_noref(dev, nexthop);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(neigh)) {</div><div class='add'>+		if (unlikely(!neigh))</div><div class='add'>+			neigh = __neigh_create(&amp;nd_tbl, nexthop, dev, false);</div><div class='add'>+		if (IS_ERR(neigh)) {</div><div class='add'>+			IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTNOROUTES);</div><div class='add'>+			kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_CREATEFAIL);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sock_confirm_neigh(skb, neigh);</div><div class='add'>+	ret = neigh_output(neigh, skb, false);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int</div><div class='add'>+ip6_finish_output_gso_slowpath_drop(struct net *net, struct sock *sk,</div><div class='add'>+				    struct sk_buff *skb, unsigned int mtu)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct sk_buff *segs, *nskb;</div><div class='add'>+	netdev_features_t features;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ret = BPF_CGROUP_RUN_PROG_INET_EGRESS(sk, skb);</div><div class='del'>-	if (ret) {</div><div class='add'>+	/* Please see corresponding comment in ip_finish_output_gso</div><div class='add'>+	 * describing the cases where GSO segment length exceeds the</div><div class='add'>+	 * egress MTU.</div><div class='add'>+	 */</div><div class='add'>+	features = netif_skb_features(skb);</div><div class='add'>+	segs = skb_gso_segment(skb, features &amp; ~NETIF_F_GSO_MASK);</div><div class='add'>+	if (IS_ERR_OR_NULL(segs)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-		return ret;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+</div><div class='add'>+	skb_list_walk_safe(segs, segs, nskb) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		skb_mark_not_on_list(segs);</div><div class='add'>+		/* Last GSO segment can be smaller than gso_size (and MTU).</div><div class='add'>+		 * Adding a fragment header would produce an "atomic fragment",</div><div class='add'>+		 * which is considered harmful (RFC-8021). Avoid that.</div><div class='add'>+		 */</div><div class='add'>+		err = segs-&gt;len &gt; mtu ?</div><div class='add'>+			ip6_fragment(net, sk, segs, ip6_finish_output2) :</div><div class='add'>+			ip6_finish_output2(net, sk, segs);</div><div class='add'>+		if (err &amp;&amp; ret == 0)</div><div class='add'>+			ret = err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip6_finish_output_gso(struct net *net, struct sock *sk,</div><div class='add'>+				 struct sk_buff *skb, unsigned int mtu)</div><div class='add'>+{</div><div class='add'>+	if (!(IP6CB(skb)-&gt;flags &amp; IP6SKB_FAKEJUMBO) &amp;&amp;</div><div class='add'>+	    !skb_gso_validate_network_len(skb, mtu))</div><div class='add'>+		return ip6_finish_output_gso_slowpath_drop(net, sk, skb, mtu);</div><div class='add'>+</div><div class='add'>+	return ip6_finish_output2(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int mtu;</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_NETFILTER) &amp;&amp; defined(CONFIG_XFRM)</div><div class='ctx'> 	/* Policy lookup after SNAT yielded a new policy */</div><div class='ctx'> 	if (skb_dst(skb)-&gt;xfrm) {</div><div class='del'>-		IPCB(skb)-&gt;flags |= IPSKB_REROUTED;</div><div class='add'>+		IP6CB(skb)-&gt;flags |= IP6SKB_REROUTED;</div><div class='ctx'> 		return dst_output(net, sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((skb-&gt;len &gt; ip6_skb_dst_mtu(skb) &amp;&amp; !skb_is_gso(skb)) ||</div><div class='del'>-	    dst_allfrag(skb_dst(skb)) ||</div><div class='add'>+	mtu = ip6_skb_dst_mtu(skb);</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='add'>+		return ip6_finish_output_gso(net, sk, skb, mtu);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; mtu ||</div><div class='ctx'> 	    (IP6CB(skb)-&gt;frag_max_size &amp;&amp; skb-&gt;len &gt; IP6CB(skb)-&gt;frag_max_size))</div><div class='ctx'> 		return ip6_fragment(net, sk, skb, ip6_finish_output2);</div><div class='del'>-	else</div><div class='del'>-		return ip6_finish_output2(net, sk, skb);</div><div class='add'>+</div><div class='add'>+	return ip6_finish_output2(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = BPF_CGROUP_RUN_PROG_INET_EGRESS(sk, skb);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case NET_XMIT_SUCCESS:</div><div class='add'>+	case NET_XMIT_CN:</div><div class='add'>+		return __ip6_finish_output(net, sk, skb) ? : ret;</div><div class='add'>+	default:</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_BPF_CGROUP_EGRESS);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = skb_dst(skb)-&gt;dev;</div><div class='del'>-	struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct net_device *dev, *indev = skb-&gt;dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	idev = ip6_dst_idev(dst);</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(idev-&gt;cnf.disable_ipv6)) {</div><div class='add'>+	if (unlikely(!idev || READ_ONCE(idev-&gt;cnf.disable_ipv6))) {</div><div class='ctx'> 		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_IPV6DISABLED);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,</div><div class='del'>-			    net, sk, skb, NULL, dev,</div><div class='del'>-			    ip6_finish_output,</div><div class='del'>-			    !(IP6CB(skb)-&gt;flags &amp; IP6SKB_REROUTED));</div><div class='add'>+	ret = NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,</div><div class='add'>+			   net, sk, skb, indev, dev,</div><div class='add'>+			   ip6_finish_output,</div><div class='add'>+			   !(IP6CB(skb)-&gt;flags &amp; IP6SKB_REROUTED));</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ip6_output);</div><div class='ctx'> </div><div class='del'>-bool ip6_autoflowlabel(struct net *net, const struct ipv6_pinfo *np)</div><div class='add'>+bool ip6_autoflowlabel(struct net *net, const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	if (!np-&gt;autoflowlabel_set)</div><div class='add'>+	if (!inet6_test_bit(AUTOFLOWLABEL_SET, sk))</div><div class='ctx'> 		return ip6_default_np_autolabel(net);</div><div class='del'>-	else</div><div class='del'>-		return np-&gt;autoflowlabel;</div><div class='add'>+	return inet6_test_bit(AUTOFLOWLABEL, sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * xmit an sk_buff (used by TCP, SCTP and DCCP)</div><div class='add'>+ * xmit an sk_buff (used by TCP and SCTP)</div><div class='ctx'>  * Note : socket lock is not held for SYNACK packets, but might be modified</div><div class='ctx'>  * by calls to skb_set_owner_w() and ipv6_local_error(),</div><div class='ctx'>  * which are using proper atomic operations or spinlocks.</div><div class='ctx'>  */</div><div class='ctx'> int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,</div><div class='del'>-	     __u32 mark, struct ipv6_txoptions *opt, int tclass)</div><div class='add'>+	     __u32 mark, struct ipv6_txoptions *opt, int tclass, u32 priority)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='ctx'> 	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct in6_addr *first_hop = &amp;fl6-&gt;daddr;</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct inet6_dev *idev = ip6_dst_idev(dst);</div><div class='add'>+	struct hop_jumbo_hdr *hop_jumbo;</div><div class='add'>+	int hoplen = sizeof(*hop_jumbo);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	unsigned int head_room;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct ipv6hdr *hdr;</div><div class='ctx'> 	u8  proto = fl6-&gt;flowi6_proto;</div><div class='ctx'> 	int seg_len = skb-&gt;len;</div><div class='del'>-	int hlimit = -1;</div><div class='add'>+	int ret, hlimit = -1;</div><div class='ctx'> 	u32 mtu;</div><div class='ctx'> </div><div class='del'>-	if (opt) {</div><div class='del'>-		unsigned int head_room;</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-		/* First: exthdrs may take lots of space (~8K for now)</div><div class='del'>-		   MAX_HEADER is not enough.</div><div class='del'>-		 */</div><div class='del'>-		head_room = opt-&gt;opt_nflen + opt-&gt;opt_flen;</div><div class='del'>-		seg_len += head_room;</div><div class='del'>-		head_room += sizeof(struct ipv6hdr) + LL_RESERVED_SPACE(dst-&gt;dev);</div><div class='del'>-</div><div class='del'>-		if (skb_headroom(skb) &lt; head_room) {</div><div class='del'>-			struct sk_buff *skb2 = skb_realloc_headroom(skb, head_room);</div><div class='del'>-			if (!skb2) {</div><div class='del'>-				IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='del'>-					      IPSTATS_MIB_OUTDISCARDS);</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-				return -ENOBUFS;</div><div class='del'>-			}</div><div class='del'>-			if (skb-&gt;sk)</div><div class='del'>-				skb_set_owner_w(skb2, skb-&gt;sk);</div><div class='del'>-			consume_skb(skb);</div><div class='del'>-			skb = skb2;</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	head_room = sizeof(struct ipv6hdr) + hoplen + LL_RESERVED_SPACE(dev);</div><div class='add'>+	if (opt)</div><div class='add'>+		head_room += opt-&gt;opt_nflen + opt-&gt;opt_flen;</div><div class='add'>+</div><div class='add'>+	if (unlikely(head_room &gt; skb_headroom(skb))) {</div><div class='add'>+		/* idev stays alive while we hold rcu_read_lock(). */</div><div class='add'>+		skb = skb_expand_head(skb, head_room);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='add'>+			ret = -ENOBUFS;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (opt) {</div><div class='add'>+		seg_len += opt-&gt;opt_nflen + opt-&gt;opt_flen;</div><div class='add'>+</div><div class='ctx'> 		if (opt-&gt;opt_flen)</div><div class='ctx'> 			ipv6_push_frag_opts(skb, opt, &amp;proto);</div><div class='add'>+</div><div class='ctx'> 		if (opt-&gt;opt_nflen)</div><div class='ctx'> 			ipv6_push_nfrag_opts(skb, opt, &amp;proto, &amp;first_hop,</div><div class='ctx'> 					     &amp;fl6-&gt;saddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(seg_len &gt; IPV6_MAXPLEN)) {</div><div class='add'>+		hop_jumbo = skb_push(skb, hoplen);</div><div class='add'>+</div><div class='add'>+		hop_jumbo-&gt;nexthdr = proto;</div><div class='add'>+		hop_jumbo-&gt;hdrlen = 0;</div><div class='add'>+		hop_jumbo-&gt;tlv_type = IPV6_TLV_JUMBO;</div><div class='add'>+		hop_jumbo-&gt;tlv_len = 4;</div><div class='add'>+		hop_jumbo-&gt;jumbo_payload_len = htonl(seg_len + hoplen);</div><div class='add'>+</div><div class='add'>+		proto = IPPROTO_HOPOPTS;</div><div class='add'>+		seg_len = 0;</div><div class='add'>+		IP6CB(skb)-&gt;flags |= IP6SKB_FAKEJUMBO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_push(skb, sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='hunk'>@@ -239,12 +334,12 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,</div><div class='ctx'> 	 *	Fill in the IPv6 header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (np)</div><div class='del'>-		hlimit = np-&gt;hop_limit;</div><div class='add'>+		hlimit = READ_ONCE(np-&gt;hop_limit);</div><div class='ctx'> 	if (hlimit &lt; 0)</div><div class='ctx'> 		hlimit = ip6_dst_hoplimit(dst);</div><div class='ctx'> </div><div class='ctx'> 	ip6_flow_hdr(hdr, tclass, ip6_make_flowlabel(net, skb, fl6-&gt;flowlabel,</div><div class='del'>-				ip6_autoflowlabel(net, np), fl6));</div><div class='add'>+				ip6_autoflowlabel(net, sk), fl6));</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;payload_len = htons(seg_len);</div><div class='ctx'> 	hdr-&gt;nexthdr = proto;</div><div class='hunk'>@@ -254,38 +349,43 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,</div><div class='ctx'> 	hdr-&gt;daddr = *first_hop;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='add'>+	skb-&gt;priority = priority;</div><div class='ctx'> 	skb-&gt;mark = mark;</div><div class='ctx'> </div><div class='ctx'> 	mtu = dst_mtu(dst);</div><div class='ctx'> 	if ((skb-&gt;len &lt;= mtu) || skb-&gt;ignore_df || skb_is_gso(skb)) {</div><div class='del'>-		IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='del'>-			      IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> </div><div class='ctx'> 		/* if egress device is enslaved to an L3 master device pass the</div><div class='ctx'> 		 * skb to its handler for processing</div><div class='ctx'> 		 */</div><div class='ctx'> 		skb = l3mdev_ip6_out((struct sock *)sk, skb);</div><div class='del'>-		if (unlikely(!skb))</div><div class='del'>-			return 0;</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* hooks should never assume socket lock is held.</div><div class='ctx'> 		 * we promote our socket to non const</div><div class='ctx'> 		 */</div><div class='del'>-		return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,</div><div class='del'>-			       net, (struct sock *)sk, skb, NULL, dst-&gt;dev,</div><div class='del'>-			       dst_output);</div><div class='add'>+		ret = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,</div><div class='add'>+			      net, (struct sock *)sk, skb, NULL, dev,</div><div class='add'>+			      dst_output);</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = dst-&gt;dev;</div><div class='add'>+	ret = -EMSGSIZE;</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='ctx'> 	/* ipv6_local_error() does not require socket lock,</div><div class='ctx'> 	 * we promote our socket to non const</div><div class='ctx'> 	 */</div><div class='ctx'> 	ipv6_local_error((struct sock *)sk, EMSGSIZE, fl6, mtu);</div><div class='ctx'> </div><div class='del'>-	IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_FRAGFAILS);</div><div class='add'>+	IP6_INC_STATS(net, idev, IPSTATS_MIB_FRAGFAILS);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	return -EMSGSIZE;</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_xmit);</div><div class='ctx'> </div><div class='hunk'>@@ -300,6 +400,11 @@ static int ip6_call_ra_chain(struct sk_buff *skb, int sel)</div><div class='ctx'> 		if (sk &amp;&amp; ra-&gt;sel == sel &amp;&amp;</div><div class='ctx'> 		    (!sk-&gt;sk_bound_dev_if ||</div><div class='ctx'> 		     sk-&gt;sk_bound_dev_if == skb-&gt;dev-&gt;ifindex)) {</div><div class='add'>+</div><div class='add'>+			if (inet6_test_bit(RTALERT_ISOLATE, sk) &amp;&amp;</div><div class='add'>+			    !net_eq(sock_net(sk), dev_net(skb-&gt;dev))) {</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			if (last) {</div><div class='ctx'> 				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 				if (skb2)</div><div class='hunk'>@@ -373,11 +478,14 @@ static int ip6_forward_proxy_check(struct sk_buff *skb)</div><div class='ctx'> static inline int ip6_forward_finish(struct net *net, struct sock *sk,</div><div class='ctx'> 				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-</div><div class='del'>-	__IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='del'>-	__IP6_ADD_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb-&gt;len);</div><div class='add'>+#ifdef CONFIG_NET_SWITCHDEV</div><div class='add'>+	if (skb-&gt;offload_l3_fwd_mark) {</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+	skb_clear_tstamp(skb);</div><div class='ctx'> 	return dst_output(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -401,14 +509,18 @@ static bool ip6_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)</div><div class='ctx'> </div><div class='ctx'> int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = __in6_dev_get_safely(skb-&gt;dev);</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='ctx'> 	struct inet6_skb_parm *opt = IP6CB(skb);</div><div class='del'>-	struct net *net = dev_net(dst-&gt;dev);</div><div class='add'>+	struct net *net = dev_net(dst_dev(dst));</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	u32 mtu;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.devconf_all-&gt;forwarding == 0)</div><div class='add'>+	idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)-&gt;iif));</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.devconf_all-&gt;forwarding) &amp;&amp;</div><div class='add'>+	    (!idev || !READ_ONCE(idev-&gt;cnf.force_forwarding)))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='hunk'>@@ -420,7 +532,9 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> 	if (skb_warn_if_lro(skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	if (!xfrm6_policy_check(NULL, XFRM_POLICY_FWD, skb)) {</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv6.devconf_all-&gt;disable_policy) &amp;&amp;</div><div class='add'>+	    (!idev || !READ_ONCE(idev-&gt;cnf.disable_policy)) &amp;&amp;</div><div class='add'>+	    !xfrm6_policy_check(NULL, XFRM_POLICY_FWD, skb)) {</div><div class='ctx'> 		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -449,22 +563,34 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> 	 *	check and decrement ttl</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hdr-&gt;hop_limit &lt;= 1) {</div><div class='del'>-		/* Force OUTPUT device used as source address */</div><div class='del'>-		skb-&gt;dev = dst-&gt;dev;</div><div class='ctx'> 		icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT, 0);</div><div class='ctx'> 		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);</div><div class='ctx'> </div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_IP_INHDR);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: idev-&gt;cnf.proxy_ndp? */</div><div class='del'>-	if (net-&gt;ipv6.devconf_all-&gt;proxy_ndp &amp;&amp;</div><div class='del'>-	    pneigh_lookup(&amp;nd_tbl, net, &amp;hdr-&gt;daddr, skb-&gt;dev, 0)) {</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv6.devconf_all-&gt;proxy_ndp) &amp;&amp;</div><div class='add'>+	    pneigh_lookup(&amp;nd_tbl, net, &amp;hdr-&gt;daddr, skb-&gt;dev)) {</div><div class='ctx'> 		int proxied = ip6_forward_proxy_check(skb);</div><div class='del'>-		if (proxied &gt; 0)</div><div class='add'>+		if (proxied &gt; 0) {</div><div class='add'>+			/* It's tempting to decrease the hop limit</div><div class='add'>+			 * here by 1, as we do at the end of the</div><div class='add'>+			 * function too.</div><div class='add'>+			 *</div><div class='add'>+			 * But that would be incorrect, as proxying is</div><div class='add'>+			 * not forwarding.  The ip6_input function</div><div class='add'>+			 * will handle this packet locally, and it</div><div class='add'>+			 * depends on the hop limit being unchanged.</div><div class='add'>+			 *</div><div class='add'>+			 * One example is the NDP hop limit, that</div><div class='add'>+			 * always has to stay 255, but other would be</div><div class='add'>+			 * similar checks around RA packets, where the</div><div class='add'>+			 * user can even change the desired limit.</div><div class='add'>+			 */</div><div class='ctx'> 			return ip6_input(skb);</div><div class='del'>-		else if (proxied &lt; 0) {</div><div class='add'>+		} else if (proxied &lt; 0) {</div><div class='ctx'> 			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -472,15 +598,16 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm6_route_forward(skb)) {</div><div class='ctx'> 		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);</div><div class='add'>+		SKB_DR_SET(reason, XFRM_POLICY);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> 	dst = skb_dst(skb);</div><div class='del'>-</div><div class='add'>+	dev = dst_dev(dst);</div><div class='ctx'> 	/* IPv6 specs say nothing about it, but it is clear that we cannot</div><div class='ctx'> 	   send redirects to source routed frames.</div><div class='ctx'> 	   We don't send redirects to frames decapsulated from IPsec.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IP6CB(skb)-&gt;iif == dst-&gt;dev-&gt;ifindex &amp;&amp;</div><div class='add'>+	if (IP6CB(skb)-&gt;iif == dev-&gt;ifindex &amp;&amp;</div><div class='ctx'> 	    opt-&gt;srcrt == 0 &amp;&amp; !skb_sec_path(skb)) {</div><div class='ctx'> 		struct in6_addr *target = NULL;</div><div class='ctx'> 		struct inet_peer *peer;</div><div class='hunk'>@@ -491,21 +618,21 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> 		 *	send a redirect.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		rt = (struct rt6_info *) dst;</div><div class='add'>+		rt = dst_rt6_info(dst);</div><div class='ctx'> 		if (rt-&gt;rt6i_flags &amp; RTF_GATEWAY)</div><div class='ctx'> 			target = &amp;rt-&gt;rt6i_gateway;</div><div class='ctx'> 		else</div><div class='ctx'> 			target = &amp;hdr-&gt;daddr;</div><div class='ctx'> </div><div class='del'>-		peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;hdr-&gt;daddr, 1);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;hdr-&gt;daddr);</div><div class='ctx'> </div><div class='ctx'> 		/* Limit redirects both by destination (here)</div><div class='ctx'> 		   and by source (inside ndisc_send_redirect)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (inet_peer_xrlim_allow(peer, 1*HZ))</div><div class='ctx'> 			ndisc_send_redirect(skb, target);</div><div class='del'>-		if (peer)</div><div class='del'>-			inet_putpeer(peer);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int addrtype = ipv6_addr_type(&amp;hdr-&gt;saddr);</div><div class='ctx'> </div><div class='hunk'>@@ -520,22 +647,24 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mtu = ip6_dst_mtu_forward(dst);</div><div class='add'>+	__IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='add'>+</div><div class='add'>+	mtu = ip6_dst_mtu_maybe_forward(dst, true);</div><div class='ctx'> 	if (mtu &lt; IPV6_MIN_MTU)</div><div class='ctx'> 		mtu = IPV6_MIN_MTU;</div><div class='ctx'> </div><div class='ctx'> 	if (ip6_pkt_too_big(skb, mtu)) {</div><div class='ctx'> 		/* Again, force OUTPUT device used as source address */</div><div class='del'>-		skb-&gt;dev = dst-&gt;dev;</div><div class='add'>+		skb-&gt;dev = dev;</div><div class='ctx'> 		icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INTOOBIGERRORS);</div><div class='ctx'> 		__IP6_INC_STATS(net, ip6_dst_idev(dst),</div><div class='ctx'> 				IPSTATS_MIB_FRAGFAILS);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb_reason(skb, SKB_DROP_REASON_PKT_TOO_BIG);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_cow(skb, dst-&gt;dev-&gt;hard_header_len)) {</div><div class='add'>+	if (skb_cow(skb, dev-&gt;hard_header_len)) {</div><div class='ctx'> 		__IP6_INC_STATS(net, ip6_dst_idev(dst),</div><div class='ctx'> 				IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 		goto drop;</div><div class='hunk'>@@ -548,13 +677,14 @@ int ip6_forward(struct sk_buff *skb)</div><div class='ctx'> 	hdr-&gt;hop_limit--;</div><div class='ctx'> </div><div class='ctx'> 	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,</div><div class='del'>-		       net, NULL, skb, skb-&gt;dev, dst-&gt;dev,</div><div class='add'>+		       net, NULL, skb, skb-&gt;dev, dev,</div><div class='ctx'> 		       ip6_forward_finish);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);</div><div class='add'>+	SKB_DR_SET(reason, IP_INADDRERRORS);</div><div class='ctx'> drop:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,22 +704,186 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from)</div><div class='ctx'> 	to-&gt;tc_index = from-&gt;tc_index;</div><div class='ctx'> #endif</div><div class='ctx'> 	nf_copy(to, from);</div><div class='add'>+	skb_ext_copy(to, from);</div><div class='ctx'> 	skb_copy_secmark(to, from);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ip6_fraglist_init(struct sk_buff *skb, unsigned int hlen, u8 *prevhdr,</div><div class='add'>+		      u8 nexthdr, __be32 frag_id,</div><div class='add'>+		      struct ip6_fraglist_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned int first_len;</div><div class='add'>+	struct frag_hdr *fh;</div><div class='add'>+</div><div class='add'>+	/* BUILD HEADER */</div><div class='add'>+	*prevhdr = NEXTHDR_FRAGMENT;</div><div class='add'>+	iter-&gt;tmp_hdr = kmemdup(skb_network_header(skb), hlen, GFP_ATOMIC);</div><div class='add'>+	if (!iter-&gt;tmp_hdr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iter-&gt;frag = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+	skb_frag_list_init(skb);</div><div class='add'>+</div><div class='add'>+	iter-&gt;offset = 0;</div><div class='add'>+	iter-&gt;hlen = hlen;</div><div class='add'>+	iter-&gt;frag_id = frag_id;</div><div class='add'>+	iter-&gt;nexthdr = nexthdr;</div><div class='add'>+</div><div class='add'>+	__skb_pull(skb, hlen);</div><div class='add'>+	fh = __skb_push(skb, sizeof(struct frag_hdr));</div><div class='add'>+	__skb_push(skb, hlen);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	memcpy(skb_network_header(skb), iter-&gt;tmp_hdr, hlen);</div><div class='add'>+</div><div class='add'>+	fh-&gt;nexthdr = nexthdr;</div><div class='add'>+	fh-&gt;reserved = 0;</div><div class='add'>+	fh-&gt;frag_off = htons(IP6_MF);</div><div class='add'>+	fh-&gt;identification = frag_id;</div><div class='add'>+</div><div class='add'>+	first_len = skb_pagelen(skb);</div><div class='add'>+	skb-&gt;data_len = first_len - skb_headlen(skb);</div><div class='add'>+	skb-&gt;len = first_len;</div><div class='add'>+	ipv6_hdr(skb)-&gt;payload_len = htons(first_len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip6_fraglist_init);</div><div class='add'>+</div><div class='add'>+void ip6_fraglist_prepare(struct sk_buff *skb,</div><div class='add'>+			  struct ip6_fraglist_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *frag = iter-&gt;frag;</div><div class='add'>+	unsigned int hlen = iter-&gt;hlen;</div><div class='add'>+	struct frag_hdr *fh;</div><div class='add'>+</div><div class='add'>+	frag-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	skb_reset_transport_header(frag);</div><div class='add'>+	fh = __skb_push(frag, sizeof(struct frag_hdr));</div><div class='add'>+	__skb_push(frag, hlen);</div><div class='add'>+	skb_reset_network_header(frag);</div><div class='add'>+	memcpy(skb_network_header(frag), iter-&gt;tmp_hdr, hlen);</div><div class='add'>+	iter-&gt;offset += skb-&gt;len - hlen - sizeof(struct frag_hdr);</div><div class='add'>+	fh-&gt;nexthdr = iter-&gt;nexthdr;</div><div class='add'>+	fh-&gt;reserved = 0;</div><div class='add'>+	fh-&gt;frag_off = htons(iter-&gt;offset);</div><div class='add'>+	if (frag-&gt;next)</div><div class='add'>+		fh-&gt;frag_off |= htons(IP6_MF);</div><div class='add'>+	fh-&gt;identification = iter-&gt;frag_id;</div><div class='add'>+	ipv6_hdr(frag)-&gt;payload_len = htons(frag-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+	ip6_copy_metadata(frag, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip6_fraglist_prepare);</div><div class='add'>+</div><div class='add'>+void ip6_frag_init(struct sk_buff *skb, unsigned int hlen, unsigned int mtu,</div><div class='add'>+		   unsigned short needed_tailroom, int hdr_room, u8 *prevhdr,</div><div class='add'>+		   u8 nexthdr, __be32 frag_id, struct ip6_frag_state *state)</div><div class='add'>+{</div><div class='add'>+	state-&gt;prevhdr = prevhdr;</div><div class='add'>+	state-&gt;nexthdr = nexthdr;</div><div class='add'>+	state-&gt;frag_id = frag_id;</div><div class='add'>+</div><div class='add'>+	state-&gt;hlen = hlen;</div><div class='add'>+	state-&gt;mtu = mtu;</div><div class='add'>+</div><div class='add'>+	state-&gt;left = skb-&gt;len - hlen;	/* Space per frame */</div><div class='add'>+	state-&gt;ptr = hlen;		/* Where to start from */</div><div class='add'>+</div><div class='add'>+	state-&gt;hroom = hdr_room;</div><div class='add'>+	state-&gt;troom = needed_tailroom;</div><div class='add'>+</div><div class='add'>+	state-&gt;offset = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip6_frag_init);</div><div class='add'>+</div><div class='add'>+struct sk_buff *ip6_frag_next(struct sk_buff *skb, struct ip6_frag_state *state)</div><div class='add'>+{</div><div class='add'>+	u8 *prevhdr = state-&gt;prevhdr, *fragnexthdr_offset;</div><div class='add'>+	struct sk_buff *frag;</div><div class='add'>+	struct frag_hdr *fh;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	len = state-&gt;left;</div><div class='add'>+	/* IF: it doesn't fit, use 'mtu' - the data space left */</div><div class='add'>+	if (len &gt; state-&gt;mtu)</div><div class='add'>+		len = state-&gt;mtu;</div><div class='add'>+	/* IF: we are not sending up to and including the packet end</div><div class='add'>+	   then align the next start on an eight byte boundary */</div><div class='add'>+	if (len &lt; state-&gt;left)</div><div class='add'>+		len &amp;= ~7;</div><div class='add'>+</div><div class='add'>+	/* Allocate buffer */</div><div class='add'>+	frag = alloc_skb(len + state-&gt;hlen + sizeof(struct frag_hdr) +</div><div class='add'>+			 state-&gt;hroom + state-&gt;troom, GFP_ATOMIC);</div><div class='add'>+	if (!frag)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Set up data on packet</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ip6_copy_metadata(frag, skb);</div><div class='add'>+	skb_reserve(frag, state-&gt;hroom);</div><div class='add'>+	skb_put(frag, len + state-&gt;hlen + sizeof(struct frag_hdr));</div><div class='add'>+	skb_reset_network_header(frag);</div><div class='add'>+	fh = (struct frag_hdr *)(skb_network_header(frag) + state-&gt;hlen);</div><div class='add'>+	frag-&gt;transport_header = (frag-&gt;network_header + state-&gt;hlen +</div><div class='add'>+				  sizeof(struct frag_hdr));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Charge the memory for the fragment to any owner</div><div class='add'>+	 *	it might possess</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;sk)</div><div class='add'>+		skb_set_owner_w(frag, skb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy the packet header into the new buffer.</div><div class='add'>+	 */</div><div class='add'>+	skb_copy_from_linear_data(skb, skb_network_header(frag), state-&gt;hlen);</div><div class='add'>+</div><div class='add'>+	fragnexthdr_offset = skb_network_header(frag);</div><div class='add'>+	fragnexthdr_offset += prevhdr - skb_network_header(skb);</div><div class='add'>+	*fragnexthdr_offset = NEXTHDR_FRAGMENT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Build fragment header.</div><div class='add'>+	 */</div><div class='add'>+	fh-&gt;nexthdr = state-&gt;nexthdr;</div><div class='add'>+	fh-&gt;reserved = 0;</div><div class='add'>+	fh-&gt;identification = state-&gt;frag_id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy a block of the IP datagram.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(skb_copy_bits(skb, state-&gt;ptr, skb_transport_header(frag),</div><div class='add'>+			     len));</div><div class='add'>+	state-&gt;left -= len;</div><div class='add'>+</div><div class='add'>+	fh-&gt;frag_off = htons(state-&gt;offset);</div><div class='add'>+	if (state-&gt;left &gt; 0)</div><div class='add'>+		fh-&gt;frag_off |= htons(IP6_MF);</div><div class='add'>+	ipv6_hdr(frag)-&gt;payload_len = htons(frag-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	state-&gt;ptr += len;</div><div class='add'>+	state-&gt;offset += len;</div><div class='add'>+</div><div class='add'>+	return frag;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ip6_frag_next);</div><div class='add'>+</div><div class='ctx'> int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		 int (*output)(struct net *, struct sock *, struct sk_buff *))</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *frag;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(skb_dst(skb));</div><div class='ctx'> 	struct ipv6_pinfo *np = skb-&gt;sk &amp;&amp; !dev_recursion_level() ?</div><div class='ctx'> 				inet6_sk(skb-&gt;sk) : NULL;</div><div class='del'>-	struct ipv6hdr *tmp_hdr;</div><div class='del'>-	struct frag_hdr *fh;</div><div class='del'>-	unsigned int mtu, hlen, left, len;</div><div class='del'>-	int hroom, troom;</div><div class='add'>+	u8 tstamp_type = skb-&gt;tstamp_type;</div><div class='add'>+	struct ip6_frag_state state;</div><div class='add'>+	unsigned int mtu, hlen, nexthdr_offset;</div><div class='add'>+	ktime_t tstamp = skb-&gt;tstamp;</div><div class='add'>+	int hroom, err = 0;</div><div class='ctx'> 	__be32 frag_id;</div><div class='del'>-	int ptr, offset = 0, err = 0;</div><div class='ctx'> 	u8 *prevhdr, nexthdr = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = ip6_find_1stfragopt(skb, &amp;prevhdr);</div><div class='hunk'>@@ -597,6 +891,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	hlen = err;</div><div class='ctx'> 	nexthdr = *prevhdr;</div><div class='add'>+	nexthdr_offset = prevhdr - skb_network_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	mtu = ip6_skb_dst_mtu(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -616,9 +911,11 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			mtu = IPV6_MIN_MTU;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (np &amp;&amp; np-&gt;frag_size &lt; mtu) {</div><div class='del'>-		if (np-&gt;frag_size)</div><div class='del'>-			mtu = np-&gt;frag_size;</div><div class='add'>+	if (np) {</div><div class='add'>+		u32 frag_size = READ_ONCE(np-&gt;frag_size);</div><div class='add'>+</div><div class='add'>+		if (frag_size &amp;&amp; frag_size &lt; mtu)</div><div class='add'>+			mtu = frag_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mtu &lt; hlen + sizeof(struct frag_hdr) + 8)</div><div class='ctx'> 		goto fail_toobig;</div><div class='hunk'>@@ -631,9 +928,11 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	    (err = skb_checksum_help(skb)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	prevhdr = skb_network_header(skb) + nexthdr_offset;</div><div class='ctx'> 	hroom = LL_RESERVED_SPACE(rt-&gt;dst.dev);</div><div class='ctx'> 	if (skb_has_frag_list(skb)) {</div><div class='ctx'> 		unsigned int first_len = skb_pagelen(skb);</div><div class='add'>+		struct ip6_fraglist_iter iter;</div><div class='ctx'> 		struct sk_buff *frag2;</div><div class='ctx'> </div><div class='ctx'> 		if (first_len - hlen &gt; mtu ||</div><div class='hunk'>@@ -661,85 +960,46 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			skb-&gt;truesize -= frag-&gt;truesize;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = 0;</div><div class='del'>-		offset = 0;</div><div class='del'>-		/* BUILD HEADER */</div><div class='del'>-</div><div class='del'>-		*prevhdr = NEXTHDR_FRAGMENT;</div><div class='del'>-		tmp_hdr = kmemdup(skb_network_header(skb), hlen, GFP_ATOMIC);</div><div class='del'>-		if (!tmp_hdr) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		err = ip6_fraglist_init(skb, hlen, prevhdr, nexthdr, frag_id,</div><div class='add'>+					&amp;iter);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='del'>-		}</div><div class='del'>-		frag = skb_shinfo(skb)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(skb);</div><div class='del'>-</div><div class='del'>-		__skb_pull(skb, hlen);</div><div class='del'>-		fh = __skb_push(skb, sizeof(struct frag_hdr));</div><div class='del'>-		__skb_push(skb, hlen);</div><div class='del'>-		skb_reset_network_header(skb);</div><div class='del'>-		memcpy(skb_network_header(skb), tmp_hdr, hlen);</div><div class='del'>-</div><div class='del'>-		fh-&gt;nexthdr = nexthdr;</div><div class='del'>-		fh-&gt;reserved = 0;</div><div class='del'>-		fh-&gt;frag_off = htons(IP6_MF);</div><div class='del'>-		fh-&gt;identification = frag_id;</div><div class='del'>-</div><div class='del'>-		first_len = skb_pagelen(skb);</div><div class='del'>-		skb-&gt;data_len = first_len - skb_headlen(skb);</div><div class='del'>-		skb-&gt;len = first_len;</div><div class='del'>-		ipv6_hdr(skb)-&gt;payload_len = htons(first_len -</div><div class='del'>-						   sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+		/* We prevent @rt from being freed. */</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			/* Prepare header of the next frame,</div><div class='ctx'> 			 * before previous one went down. */</div><div class='del'>-			if (frag) {</div><div class='del'>-				frag-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-				skb_reset_transport_header(frag);</div><div class='del'>-				fh = __skb_push(frag, sizeof(struct frag_hdr));</div><div class='del'>-				__skb_push(frag, hlen);</div><div class='del'>-				skb_reset_network_header(frag);</div><div class='del'>-				memcpy(skb_network_header(frag), tmp_hdr,</div><div class='del'>-				       hlen);</div><div class='del'>-				offset += skb-&gt;len - hlen - sizeof(struct frag_hdr);</div><div class='del'>-				fh-&gt;nexthdr = nexthdr;</div><div class='del'>-				fh-&gt;reserved = 0;</div><div class='del'>-				fh-&gt;frag_off = htons(offset);</div><div class='del'>-				if (frag-&gt;next)</div><div class='del'>-					fh-&gt;frag_off |= htons(IP6_MF);</div><div class='del'>-				fh-&gt;identification = frag_id;</div><div class='del'>-				ipv6_hdr(frag)-&gt;payload_len =</div><div class='del'>-						htons(frag-&gt;len -</div><div class='del'>-						      sizeof(struct ipv6hdr));</div><div class='del'>-				ip6_copy_metadata(frag, skb);</div><div class='del'>-			}</div><div class='add'>+			if (iter.frag)</div><div class='add'>+				ip6_fraglist_prepare(skb, &amp;iter);</div><div class='ctx'> </div><div class='add'>+			skb_set_delivery_time(skb, tstamp, tstamp_type);</div><div class='ctx'> 			err = output(net, sk, skb);</div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				IP6_INC_STATS(net, ip6_dst_idev(&amp;rt-&gt;dst),</div><div class='ctx'> 					      IPSTATS_MIB_FRAGCREATES);</div><div class='ctx'> </div><div class='del'>-			if (err || !frag)</div><div class='add'>+			if (err || !iter.frag)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			skb = frag;</div><div class='del'>-			frag = skb-&gt;next;</div><div class='del'>-			skb-&gt;next = NULL;</div><div class='add'>+			skb = ip6_fraglist_next(&amp;iter);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kfree(tmp_hdr);</div><div class='add'>+		kfree(iter.tmp_hdr);</div><div class='ctx'> </div><div class='ctx'> 		if (err == 0) {</div><div class='ctx'> 			IP6_INC_STATS(net, ip6_dst_idev(&amp;rt-&gt;dst),</div><div class='ctx'> 				      IPSTATS_MIB_FRAGOKS);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kfree_skb_list(frag);</div><div class='add'>+		kfree_skb_list(iter.frag);</div><div class='ctx'> </div><div class='ctx'> 		IP6_INC_STATS(net, ip6_dst_idev(&amp;rt-&gt;dst),</div><div class='ctx'> 			      IPSTATS_MIB_FRAGFAILS);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> slow_path_clean:</div><div class='hunk'>@@ -753,93 +1013,29 @@ slow_path_clean:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> slow_path:</div><div class='del'>-	left = skb-&gt;len - hlen;		/* Space per frame */</div><div class='del'>-	ptr = hlen;			/* Where to start from */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Fragment the datagram.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	troom = rt-&gt;dst.dev-&gt;needed_tailroom;</div><div class='add'>+	ip6_frag_init(skb, hlen, mtu, rt-&gt;dst.dev-&gt;needed_tailroom,</div><div class='add'>+		      LL_RESERVED_SPACE(rt-&gt;dst.dev), prevhdr, nexthdr, frag_id,</div><div class='add'>+		      &amp;state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Keep copying data until we run out.</div><div class='ctx'> 	 */</div><div class='del'>-	while (left &gt; 0)	{</div><div class='del'>-		u8 *fragnexthdr_offset;</div><div class='del'>-</div><div class='del'>-		len = left;</div><div class='del'>-		/* IF: it doesn't fit, use 'mtu' - the data space left */</div><div class='del'>-		if (len &gt; mtu)</div><div class='del'>-			len = mtu;</div><div class='del'>-		/* IF: we are not sending up to and including the packet end</div><div class='del'>-		   then align the next start on an eight byte boundary */</div><div class='del'>-		if (len &lt; left)	{</div><div class='del'>-			len &amp;= ~7;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Allocate buffer */</div><div class='del'>-		frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) +</div><div class='del'>-				 hroom + troom, GFP_ATOMIC);</div><div class='del'>-		if (!frag) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+	while (state.left &gt; 0) {</div><div class='add'>+		frag = ip6_frag_next(skb, &amp;state);</div><div class='add'>+		if (IS_ERR(frag)) {</div><div class='add'>+			err = PTR_ERR(frag);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 *	Set up data on packet</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		ip6_copy_metadata(frag, skb);</div><div class='del'>-		skb_reserve(frag, hroom);</div><div class='del'>-		skb_put(frag, len + hlen + sizeof(struct frag_hdr));</div><div class='del'>-		skb_reset_network_header(frag);</div><div class='del'>-		fh = (struct frag_hdr *)(skb_network_header(frag) + hlen);</div><div class='del'>-		frag-&gt;transport_header = (frag-&gt;network_header + hlen +</div><div class='del'>-					  sizeof(struct frag_hdr));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Charge the memory for the fragment to any owner</div><div class='del'>-		 *	it might possess</div><div class='del'>-		 */</div><div class='del'>-		if (skb-&gt;sk)</div><div class='del'>-			skb_set_owner_w(frag, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Copy the packet header into the new buffer.</div><div class='del'>-		 */</div><div class='del'>-		skb_copy_from_linear_data(skb, skb_network_header(frag), hlen);</div><div class='del'>-</div><div class='del'>-		fragnexthdr_offset = skb_network_header(frag);</div><div class='del'>-		fragnexthdr_offset += prevhdr - skb_network_header(skb);</div><div class='del'>-		*fragnexthdr_offset = NEXTHDR_FRAGMENT;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Build fragment header.</div><div class='del'>-		 */</div><div class='del'>-		fh-&gt;nexthdr = nexthdr;</div><div class='del'>-		fh-&gt;reserved = 0;</div><div class='del'>-		fh-&gt;identification = frag_id;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *	Copy a block of the IP datagram.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(skb_copy_bits(skb, ptr, skb_transport_header(frag),</div><div class='del'>-				     len));</div><div class='del'>-		left -= len;</div><div class='del'>-</div><div class='del'>-		fh-&gt;frag_off = htons(offset);</div><div class='del'>-		if (left &gt; 0)</div><div class='del'>-			fh-&gt;frag_off |= htons(IP6_MF);</div><div class='del'>-		ipv6_hdr(frag)-&gt;payload_len = htons(frag-&gt;len -</div><div class='del'>-						    sizeof(struct ipv6hdr));</div><div class='del'>-</div><div class='del'>-		ptr += len;</div><div class='del'>-		offset += len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='ctx'> 		 *	Put this fragment into the sending queue.</div><div class='ctx'> 		 */</div><div class='add'>+		skb_set_delivery_time(frag, tstamp, tstamp_type);</div><div class='ctx'> 		err = output(net, sk, frag);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -853,9 +1049,6 @@ slow_path:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> fail_toobig:</div><div class='del'>-	if (skb-&gt;sk &amp;&amp; dst_allfrag(skb_dst(skb)))</div><div class='del'>-		sk_nocaps_add(skb-&gt;sk, NETIF_F_GSO_MASK);</div><div class='del'>-</div><div class='ctx'> 	icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 	err = -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -889,7 +1082,7 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rt = (struct rt6_info *)dst;</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='ctx'> 	/* Yes, checking route validity in not connected</div><div class='ctx'> 	 * case is not very simple. Take into account,</div><div class='ctx'> 	 * that we do not support routing by source, TOS,</div><div class='hunk'>@@ -907,12 +1100,13 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk,</div><div class='ctx'> 	 *    sockets.</div><div class='ctx'> 	 * 2. oif also should be the same.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ip6_rt_check(&amp;rt-&gt;rt6i_dst, &amp;fl6-&gt;daddr, np-&gt;daddr_cache) ||</div><div class='add'>+	if (ip6_rt_check(&amp;rt-&gt;rt6i_dst, &amp;fl6-&gt;daddr,</div><div class='add'>+			 np-&gt;daddr_cache ? &amp;sk-&gt;sk_v6_daddr : NULL) ||</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	    ip6_rt_check(&amp;rt-&gt;rt6i_src, &amp;fl6-&gt;saddr, np-&gt;saddr_cache) ||</div><div class='add'>+	    ip6_rt_check(&amp;rt-&gt;rt6i_src, &amp;fl6-&gt;saddr,</div><div class='add'>+			 np-&gt;saddr_cache ? &amp;np-&gt;saddr : NULL) ||</div><div class='ctx'> #endif</div><div class='del'>-	   (!(fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_SKIP_NH_OIF) &amp;&amp;</div><div class='del'>-	      (fl6-&gt;flowi6_oif &amp;&amp; fl6-&gt;flowi6_oif != dst-&gt;dev-&gt;ifindex))) {</div><div class='add'>+	   (fl6-&gt;flowi6_oif &amp;&amp; fl6-&gt;flowi6_oif != dst_dev(dst)-&gt;ifindex)) {</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		dst = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -940,19 +1134,18 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,</div><div class='ctx'> 	 * ip6_route_output will fail given src=any saddr, though, so</div><div class='ctx'> 	 * that's why we try it again later.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ipv6_addr_any(&amp;fl6-&gt;saddr) &amp;&amp; (!*dst || !(*dst)-&gt;error)) {</div><div class='add'>+	if (ipv6_addr_any(&amp;fl6-&gt;saddr)) {</div><div class='ctx'> 		struct fib6_info *from;</div><div class='ctx'> 		struct rt6_info *rt;</div><div class='del'>-		bool had_dst = *dst != NULL;</div><div class='ctx'> </div><div class='del'>-		if (!had_dst)</div><div class='del'>-			*dst = ip6_route_output(net, sk, fl6);</div><div class='del'>-		rt = (*dst)-&gt;error ? NULL : (struct rt6_info *)*dst;</div><div class='add'>+		*dst = ip6_route_output(net, sk, fl6);</div><div class='add'>+		rt = (*dst)-&gt;error ? NULL : dst_rt6_info(*dst);</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		from = rt ? rcu_dereference(rt-&gt;from) : NULL;</div><div class='ctx'> 		err = ip6_route_get_saddr(net, from, &amp;fl6-&gt;daddr,</div><div class='del'>-					  sk ? inet6_sk(sk)-&gt;srcprefs : 0,</div><div class='add'>+					  sk ? READ_ONCE(inet6_sk(sk)-&gt;srcprefs) : 0,</div><div class='add'>+					  fl6-&gt;flowi6_l3mdev,</div><div class='ctx'> 					  &amp;fl6-&gt;saddr);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -963,7 +1156,7 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,</div><div class='ctx'> 		 * never existed and let the SA-enabled version take</div><div class='ctx'> 		 * over.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!had_dst &amp;&amp; (*dst)-&gt;error) {</div><div class='add'>+		if ((*dst)-&gt;error) {</div><div class='ctx'> 			dst_release(*dst);</div><div class='ctx'> 			*dst = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -988,12 +1181,12 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,</div><div class='ctx'> 	 * dst entry and replace it instead with the</div><div class='ctx'> 	 * dst entry of the nexthop router</div><div class='ctx'> 	 */</div><div class='del'>-	rt = (struct rt6_info *) *dst;</div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	rt = dst_rt6_info(*dst);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	n = __ipv6_neigh_lookup_noref(rt-&gt;dst.dev,</div><div class='ctx'> 				      rt6_nexthop(rt, &amp;fl6-&gt;daddr));</div><div class='del'>-	err = n &amp;&amp; !(n-&gt;nud_state &amp; NUD_VALID) ? -EINVAL : 0;</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	err = n &amp;&amp; !(READ_ONCE(n-&gt;nud_state) &amp; NUD_VALID) ? -EINVAL : 0;</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		struct inet6_ifaddr *ifp;</div><div class='hunk'>@@ -1041,6 +1234,7 @@ out_err_release:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ip6_dst_lookup - perform route lookup on flow</div><div class='add'>+ *	@net: Network namespace to perform lookup in</div><div class='ctx'>  *	@sk: socket which provides route info</div><div class='ctx'>  *	@dst: pointer to dst_entry * for result</div><div class='ctx'>  *	@fl6: flow to lookup</div><div class='hunk'>@@ -1059,6 +1253,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ip6_dst_lookup_flow - perform route lookup on flow with ipsec</div><div class='add'>+ *	@net: Network namespace to perform lookup in</div><div class='ctx'>  *	@sk: socket which provides route info</div><div class='ctx'>  *	@fl6: flow to lookup</div><div class='ctx'>  *	@final_dst: final destination address for ipsec lookup</div><div class='hunk'>@@ -1068,19 +1263,19 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);</div><div class='ctx'>  *	It returns a valid dst pointer on success, or a pointer encoded</div><div class='ctx'>  *	error code.</div><div class='ctx'>  */</div><div class='del'>-struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,</div><div class='add'>+struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,</div><div class='ctx'> 				      const struct in6_addr *final_dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = ip6_dst_lookup_tail(sock_net(sk), sk, &amp;dst, fl6);</div><div class='add'>+	err = ip6_dst_lookup_tail(net, sk, &amp;dst, fl6);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	if (final_dst)</div><div class='ctx'> 		fl6-&gt;daddr = *final_dst;</div><div class='ctx'> </div><div class='del'>-	return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);</div><div class='add'>+	return xfrm_lookup_route(net, dst, flowi6_to_flowi(fl6), sk, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);</div><div class='ctx'> </div><div class='hunk'>@@ -1112,7 +1307,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,</div><div class='ctx'> 	if (dst)</div><div class='ctx'> 		return dst;</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, fl6, final_dst);</div><div class='add'>+	dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_dst);</div><div class='ctx'> 	if (connected &amp;&amp; !IS_ERR(dst))</div><div class='ctx'> 		ip6_sk_dst_store_flow(sk, dst_clone(dst), fl6);</div><div class='ctx'> </div><div class='hunk'>@@ -1158,11 +1353,16 @@ static void ip6_append_data_mtu(unsigned int *mtu,</div><div class='ctx'> </div><div class='ctx'> static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,</div><div class='ctx'> 			  struct inet6_cork *v6_cork, struct ipcm6_cookie *ipc6,</div><div class='del'>-			  struct rt6_info *rt, struct flowi6 *fl6)</div><div class='add'>+			  struct rt6_info *rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	unsigned int mtu;</div><div class='del'>-	struct ipv6_txoptions *opt = ipc6-&gt;opt;</div><div class='add'>+	unsigned int mtu, frag_size;</div><div class='add'>+	struct ipv6_txoptions *nopt, *opt = ipc6-&gt;opt;</div><div class='add'>+</div><div class='add'>+	/* callers pass dst together with a reference, set it first so</div><div class='add'>+	 * ip6_cork_release() can put it down even in case of an error.</div><div class='add'>+	 */</div><div class='add'>+	cork-&gt;base.dst = &amp;rt-&gt;dst;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * setup for corking</div><div class='hunk'>@@ -1171,93 +1371,91 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,</div><div class='ctx'> 		if (WARN_ON(v6_cork-&gt;opt))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt = kzalloc(sizeof(*opt), sk-&gt;sk_allocation);</div><div class='del'>-		if (unlikely(!v6_cork-&gt;opt))</div><div class='add'>+		nopt = v6_cork-&gt;opt = kzalloc(sizeof(*opt), sk-&gt;sk_allocation);</div><div class='add'>+		if (unlikely(!nopt))</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt-&gt;tot_len = sizeof(*opt);</div><div class='del'>-		v6_cork-&gt;opt-&gt;opt_flen = opt-&gt;opt_flen;</div><div class='del'>-		v6_cork-&gt;opt-&gt;opt_nflen = opt-&gt;opt_nflen;</div><div class='add'>+		nopt-&gt;tot_len = sizeof(*opt);</div><div class='add'>+		nopt-&gt;opt_flen = opt-&gt;opt_flen;</div><div class='add'>+		nopt-&gt;opt_nflen = opt-&gt;opt_nflen;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt-&gt;dst0opt = ip6_opt_dup(opt-&gt;dst0opt,</div><div class='del'>-						    sk-&gt;sk_allocation);</div><div class='del'>-		if (opt-&gt;dst0opt &amp;&amp; !v6_cork-&gt;opt-&gt;dst0opt)</div><div class='add'>+		nopt-&gt;dst0opt = ip6_opt_dup(opt-&gt;dst0opt, sk-&gt;sk_allocation);</div><div class='add'>+		if (opt-&gt;dst0opt &amp;&amp; !nopt-&gt;dst0opt)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt-&gt;dst1opt = ip6_opt_dup(opt-&gt;dst1opt,</div><div class='del'>-						    sk-&gt;sk_allocation);</div><div class='del'>-		if (opt-&gt;dst1opt &amp;&amp; !v6_cork-&gt;opt-&gt;dst1opt)</div><div class='add'>+		nopt-&gt;dst1opt = ip6_opt_dup(opt-&gt;dst1opt, sk-&gt;sk_allocation);</div><div class='add'>+		if (opt-&gt;dst1opt &amp;&amp; !nopt-&gt;dst1opt)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt-&gt;hopopt = ip6_opt_dup(opt-&gt;hopopt,</div><div class='del'>-						   sk-&gt;sk_allocation);</div><div class='del'>-		if (opt-&gt;hopopt &amp;&amp; !v6_cork-&gt;opt-&gt;hopopt)</div><div class='add'>+		nopt-&gt;hopopt = ip6_opt_dup(opt-&gt;hopopt, sk-&gt;sk_allocation);</div><div class='add'>+		if (opt-&gt;hopopt &amp;&amp; !nopt-&gt;hopopt)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-		v6_cork-&gt;opt-&gt;srcrt = ip6_rthdr_dup(opt-&gt;srcrt,</div><div class='del'>-						    sk-&gt;sk_allocation);</div><div class='del'>-		if (opt-&gt;srcrt &amp;&amp; !v6_cork-&gt;opt-&gt;srcrt)</div><div class='add'>+		nopt-&gt;srcrt = ip6_rthdr_dup(opt-&gt;srcrt, sk-&gt;sk_allocation);</div><div class='add'>+		if (opt-&gt;srcrt &amp;&amp; !nopt-&gt;srcrt)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 		/* need source address above miyazawa*/</div><div class='ctx'> 	}</div><div class='del'>-	dst_hold(&amp;rt-&gt;dst);</div><div class='del'>-	cork-&gt;base.dst = &amp;rt-&gt;dst;</div><div class='del'>-	cork-&gt;fl.u.ip6 = *fl6;</div><div class='ctx'> 	v6_cork-&gt;hop_limit = ipc6-&gt;hlimit;</div><div class='ctx'> 	v6_cork-&gt;tclass = ipc6-&gt;tclass;</div><div class='add'>+	v6_cork-&gt;dontfrag = ipc6-&gt;dontfrag;</div><div class='ctx'> 	if (rt-&gt;dst.flags &amp; DST_XFRM_TUNNEL)</div><div class='del'>-		mtu = np-&gt;pmtudisc &gt;= IPV6_PMTUDISC_PROBE ?</div><div class='add'>+		mtu = READ_ONCE(np-&gt;pmtudisc) &gt;= IPV6_PMTUDISC_PROBE ?</div><div class='ctx'> 		      READ_ONCE(rt-&gt;dst.dev-&gt;mtu) : dst_mtu(&amp;rt-&gt;dst);</div><div class='ctx'> 	else</div><div class='del'>-		mtu = np-&gt;pmtudisc &gt;= IPV6_PMTUDISC_PROBE ?</div><div class='add'>+		mtu = READ_ONCE(np-&gt;pmtudisc) &gt;= IPV6_PMTUDISC_PROBE ?</div><div class='ctx'> 			READ_ONCE(rt-&gt;dst.dev-&gt;mtu) : dst_mtu(xfrm_dst_path(&amp;rt-&gt;dst));</div><div class='del'>-	if (np-&gt;frag_size &lt; mtu) {</div><div class='del'>-		if (np-&gt;frag_size)</div><div class='del'>-			mtu = np-&gt;frag_size;</div><div class='del'>-	}</div><div class='del'>-	if (mtu &lt; IPV6_MIN_MTU)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	frag_size = READ_ONCE(np-&gt;frag_size);</div><div class='add'>+	if (frag_size &amp;&amp; frag_size &lt; mtu)</div><div class='add'>+		mtu = frag_size;</div><div class='add'>+</div><div class='ctx'> 	cork-&gt;base.fragsize = mtu;</div><div class='ctx'> 	cork-&gt;base.gso_size = ipc6-&gt;gso_size;</div><div class='ctx'> 	cork-&gt;base.tx_flags = 0;</div><div class='del'>-	sock_tx_timestamp(sk, ipc6-&gt;sockc.tsflags, &amp;cork-&gt;base.tx_flags);</div><div class='del'>-</div><div class='del'>-	if (dst_allfrag(xfrm_dst_path(&amp;rt-&gt;dst)))</div><div class='del'>-		cork-&gt;base.flags |= IPCORK_ALLFRAG;</div><div class='add'>+	cork-&gt;base.mark = ipc6-&gt;sockc.mark;</div><div class='add'>+	cork-&gt;base.priority = ipc6-&gt;sockc.priority;</div><div class='add'>+	sock_tx_timestamp(sk, &amp;ipc6-&gt;sockc, &amp;cork-&gt;base.tx_flags);</div><div class='add'>+	if (ipc6-&gt;sockc.tsflags &amp; SOCKCM_FLAG_TS_OPT_ID) {</div><div class='add'>+		cork-&gt;base.flags |= IPCORK_TS_OPT_ID;</div><div class='add'>+		cork-&gt;base.ts_opt_id = ipc6-&gt;sockc.ts_opt_id;</div><div class='add'>+	}</div><div class='ctx'> 	cork-&gt;base.length = 0;</div><div class='del'>-</div><div class='ctx'> 	cork-&gt;base.transmit_time = ipc6-&gt;sockc.transmit_time;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __ip6_append_data(struct sock *sk,</div><div class='del'>-			     struct flowi6 *fl6,</div><div class='ctx'> 			     struct sk_buff_head *queue,</div><div class='del'>-			     struct inet_cork *cork,</div><div class='add'>+			     struct inet_cork_full *cork_full,</div><div class='ctx'> 			     struct inet6_cork *v6_cork,</div><div class='ctx'> 			     struct page_frag *pfrag,</div><div class='ctx'> 			     int getfrag(void *from, char *to, int offset,</div><div class='ctx'> 					 int len, int odd, struct sk_buff *skb),</div><div class='del'>-			     void *from, int length, int transhdrlen,</div><div class='del'>-			     unsigned int flags, struct ipcm6_cookie *ipc6)</div><div class='add'>+			     void *from, size_t length, int transhdrlen,</div><div class='add'>+			     unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *skb_prev = NULL;</div><div class='add'>+	struct inet_cork *cork = &amp;cork_full-&gt;base;</div><div class='add'>+	struct flowi6 *fl6 = &amp;cork_full-&gt;fl.u.ip6;</div><div class='ctx'> 	unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu;</div><div class='add'>+	struct ubuf_info *uarg = NULL;</div><div class='ctx'> 	int exthdrlen = 0;</div><div class='ctx'> 	int dst_exthdrlen = 0;</div><div class='ctx'> 	int hh_len;</div><div class='ctx'> 	int copy;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int offset = 0;</div><div class='add'>+	bool zc = false;</div><div class='ctx'> 	u32 tskey = 0;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)cork-&gt;dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(cork-&gt;dst);</div><div class='add'>+	bool paged, hold_tskey = false, extra_uref = false;</div><div class='ctx'> 	struct ipv6_txoptions *opt = v6_cork-&gt;opt;</div><div class='ctx'> 	int csummode = CHECKSUM_NONE;</div><div class='ctx'> 	unsigned int maxnonfragsize, headersize;</div><div class='ctx'> 	unsigned int wmem_alloc_delta = 0;</div><div class='del'>-	bool paged;</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_peek_tail(queue);</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -1269,31 +1467,31 @@ static int __ip6_append_data(struct sock *sk,</div><div class='ctx'> 	mtu = cork-&gt;gso_size ? IP6_MAX_MTU : cork-&gt;fragsize;</div><div class='ctx'> 	orig_mtu = mtu;</div><div class='ctx'> </div><div class='del'>-	if (cork-&gt;tx_flags &amp; SKBTX_ANY_SW_TSTAMP &amp;&amp;</div><div class='del'>-	    sk-&gt;sk_tsflags &amp; SOF_TIMESTAMPING_OPT_ID)</div><div class='del'>-		tskey = sk-&gt;sk_tskey++;</div><div class='del'>-</div><div class='ctx'> 	hh_len = LL_RESERVED_SPACE(rt-&gt;dst.dev);</div><div class='ctx'> </div><div class='ctx'> 	fragheaderlen = sizeof(struct ipv6hdr) + rt-&gt;rt6i_nfheader_len +</div><div class='ctx'> 			(opt ? opt-&gt;opt_nflen : 0);</div><div class='del'>-	maxfraglen = ((mtu - fragheaderlen) &amp; ~7) + fragheaderlen -</div><div class='del'>-		     sizeof(struct frag_hdr);</div><div class='ctx'> </div><div class='ctx'> 	headersize = sizeof(struct ipv6hdr) +</div><div class='ctx'> 		     (opt ? opt-&gt;opt_flen + opt-&gt;opt_nflen : 0) +</div><div class='del'>-		     (dst_allfrag(&amp;rt-&gt;dst) ?</div><div class='del'>-		      sizeof(struct frag_hdr) : 0) +</div><div class='ctx'> 		     rt-&gt;rt6i_nfheader_len;</div><div class='ctx'> </div><div class='add'>+	if (mtu &lt;= fragheaderlen ||</div><div class='add'>+	    ((mtu - fragheaderlen) &amp; ~7) + fragheaderlen &lt;= sizeof(struct frag_hdr))</div><div class='add'>+		goto emsgsize;</div><div class='add'>+</div><div class='add'>+	maxfraglen = ((mtu - fragheaderlen) &amp; ~7) + fragheaderlen -</div><div class='add'>+		     sizeof(struct frag_hdr);</div><div class='add'>+</div><div class='ctx'> 	/* as per RFC 7112 section 5, the entire IPv6 Header Chain must fit</div><div class='ctx'> 	 * the first fragment</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (headersize + transhdrlen &gt; mtu)</div><div class='ctx'> 		goto emsgsize;</div><div class='ctx'> </div><div class='del'>-	if (cork-&gt;length + length &gt; mtu - headersize &amp;&amp; ipc6-&gt;dontfrag &amp;&amp;</div><div class='add'>+	if (cork-&gt;length + length &gt; mtu - headersize &amp;&amp; v6_cork-&gt;dontfrag &amp;&amp;</div><div class='ctx'> 	    (sk-&gt;sk_protocol == IPPROTO_UDP ||</div><div class='add'>+	     sk-&gt;sk_protocol == IPPROTO_ICMPV6 ||</div><div class='ctx'> 	     sk-&gt;sk_protocol == IPPROTO_RAW)) {</div><div class='ctx'> 		ipv6_local_rxpmtu(sk, fl6, mtu - headersize +</div><div class='ctx'> 				sizeof(struct ipv6hdr));</div><div class='hunk'>@@ -1322,13 +1520,65 @@ emsgsize:</div><div class='ctx'> 	    rt-&gt;dst.dev-&gt;features &amp; (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))</div><div class='ctx'> 		csummode = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='add'>+	if ((flags &amp; MSG_ZEROCOPY) &amp;&amp; length) {</div><div class='add'>+		struct msghdr *msg = from;</div><div class='add'>+</div><div class='add'>+		if (getfrag == ip_generic_getfrag &amp;&amp; msg-&gt;msg_ubuf) {</div><div class='add'>+			if (skb_zcopy(skb) &amp;&amp; msg-&gt;msg_ubuf != skb_zcopy(skb))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Leave uarg NULL if can't zerocopy, callers should</div><div class='add'>+			 * be able to handle it.</div><div class='add'>+			 */</div><div class='add'>+			if ((rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG) &amp;&amp;</div><div class='add'>+			    csummode == CHECKSUM_PARTIAL) {</div><div class='add'>+				paged = true;</div><div class='add'>+				zc = true;</div><div class='add'>+				uarg = msg-&gt;msg_ubuf;</div><div class='add'>+			}</div><div class='add'>+		} else if (sock_flag(sk, SOCK_ZEROCOPY)) {</div><div class='add'>+			uarg = msg_zerocopy_realloc(sk, length, skb_zcopy(skb),</div><div class='add'>+						    false);</div><div class='add'>+			if (!uarg)</div><div class='add'>+				return -ENOBUFS;</div><div class='add'>+			extra_uref = !skb_zcopy(skb);	/* only ref on new uarg */</div><div class='add'>+			if (rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG &amp;&amp;</div><div class='add'>+			    csummode == CHECKSUM_PARTIAL) {</div><div class='add'>+				paged = true;</div><div class='add'>+				zc = true;</div><div class='add'>+			} else {</div><div class='add'>+				uarg_to_msgzc(uarg)-&gt;zerocopy = 0;</div><div class='add'>+				skb_zcopy_set(skb, uarg, &amp;extra_uref);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if ((flags &amp; MSG_SPLICE_PAGES) &amp;&amp; length) {</div><div class='add'>+		if (inet_test_bit(HDRINCL, sk))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		if (rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG &amp;&amp;</div><div class='add'>+		    getfrag == ip_generic_getfrag)</div><div class='add'>+			/* We need an empty buffer to attach stuff to */</div><div class='add'>+			paged = true;</div><div class='add'>+		else</div><div class='add'>+			flags &amp;= ~MSG_SPLICE_PAGES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cork-&gt;tx_flags &amp; SKBTX_ANY_TSTAMP &amp;&amp;</div><div class='add'>+	    READ_ONCE(sk-&gt;sk_tsflags) &amp; SOF_TIMESTAMPING_OPT_ID) {</div><div class='add'>+		if (cork-&gt;flags &amp; IPCORK_TS_OPT_ID) {</div><div class='add'>+			tskey = cork-&gt;ts_opt_id;</div><div class='add'>+		} else {</div><div class='add'>+			tskey = atomic_inc_return(&amp;sk-&gt;sk_tskey) - 1;</div><div class='add'>+			hold_tskey = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let's try using as much space as possible.</div><div class='ctx'> 	 * Use MTU if total length of the message fits into the MTU.</div><div class='ctx'> 	 * Otherwise, we need to reserve fragment header and</div><div class='ctx'> 	 * fragment alignment (= 8-15 octects, in total).</div><div class='ctx'> 	 *</div><div class='del'>-	 * Note that we may need to "move" the data from the tail of</div><div class='add'>+	 * Note that we may need to "move" the data from the tail</div><div class='ctx'> 	 * of the buffer to the new fragment when we split</div><div class='ctx'> 	 * the message.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1344,7 +1594,7 @@ emsgsize:</div><div class='ctx'> </div><div class='ctx'> 	while (length &gt; 0) {</div><div class='ctx'> 		/* Check if the remaining data fits into current packet. */</div><div class='del'>-		copy = (cork-&gt;length &lt;= mtu &amp;&amp; !(cork-&gt;flags &amp; IPCORK_ALLFRAG) ? mtu : maxfraglen) - skb-&gt;len;</div><div class='add'>+		copy = (cork-&gt;length &lt;= mtu ? mtu : maxfraglen) - skb-&gt;len;</div><div class='ctx'> 		if (copy &lt; length)</div><div class='ctx'> 			copy = maxfraglen - skb-&gt;len;</div><div class='ctx'> </div><div class='hunk'>@@ -1353,8 +1603,8 @@ emsgsize:</div><div class='ctx'> 			unsigned int datalen;</div><div class='ctx'> 			unsigned int fraglen;</div><div class='ctx'> 			unsigned int fraggap;</div><div class='del'>-			unsigned int alloclen;</div><div class='del'>-			unsigned int pagedlen = 0;</div><div class='add'>+			unsigned int alloclen, alloc_extra;</div><div class='add'>+			unsigned int pagedlen;</div><div class='ctx'> alloc_new_skb:</div><div class='ctx'> 			/* There's no room in the current skb */</div><div class='ctx'> 			if (skb)</div><div class='hunk'>@@ -1375,21 +1625,33 @@ alloc_new_skb:</div><div class='ctx'> 			 */</div><div class='ctx'> 			datalen = length + fraggap;</div><div class='ctx'> </div><div class='del'>-			if (datalen &gt; (cork-&gt;length &lt;= mtu &amp;&amp; !(cork-&gt;flags &amp; IPCORK_ALLFRAG) ? mtu : maxfraglen) - fragheaderlen)</div><div class='add'>+			if (datalen &gt; (cork-&gt;length &lt;= mtu ? mtu : maxfraglen) - fragheaderlen)</div><div class='ctx'> 				datalen = maxfraglen - fragheaderlen - rt-&gt;dst.trailer_len;</div><div class='ctx'> 			fraglen = datalen + fragheaderlen;</div><div class='add'>+			pagedlen = 0;</div><div class='add'>+</div><div class='add'>+			alloc_extra = hh_len;</div><div class='add'>+			alloc_extra += dst_exthdrlen;</div><div class='add'>+			alloc_extra += rt-&gt;dst.trailer_len;</div><div class='add'>+</div><div class='add'>+			/* We just reserve space for fragment header.</div><div class='add'>+			 * Note: this may be overallocation if the message</div><div class='add'>+			 * (without MSG_MORE) fits into the MTU.</div><div class='add'>+			 */</div><div class='add'>+			alloc_extra += sizeof(struct frag_hdr);</div><div class='ctx'> </div><div class='ctx'> 			if ((flags &amp; MSG_MORE) &amp;&amp;</div><div class='ctx'> 			    !(rt-&gt;dst.dev-&gt;features&amp;NETIF_F_SG))</div><div class='ctx'> 				alloclen = mtu;</div><div class='del'>-			else if (!paged)</div><div class='add'>+			else if (!paged &amp;&amp;</div><div class='add'>+				 (fraglen + alloc_extra &lt; SKB_MAX_ALLOC ||</div><div class='add'>+				  !(rt-&gt;dst.dev-&gt;features &amp; NETIF_F_SG)))</div><div class='ctx'> 				alloclen = fraglen;</div><div class='ctx'> 			else {</div><div class='del'>-				alloclen = min_t(int, fraglen, MAX_HEADER);</div><div class='del'>-				pagedlen = fraglen - alloclen;</div><div class='add'>+				alloclen = fragheaderlen + transhdrlen;</div><div class='add'>+				pagedlen = datalen - transhdrlen;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			alloclen += dst_exthdrlen;</div><div class='add'>+			alloclen += alloc_extra;</div><div class='ctx'> </div><div class='ctx'> 			if (datalen != length + fraggap) {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -1399,30 +1661,24 @@ alloc_new_skb:</div><div class='ctx'> 				datalen += rt-&gt;dst.trailer_len;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			alloclen += rt-&gt;dst.trailer_len;</div><div class='ctx'> 			fraglen = datalen + fragheaderlen;</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * We just reserve space for fragment header.</div><div class='del'>-			 * Note: this may be overallocation if the message</div><div class='del'>-			 * (without MSG_MORE) fits into the MTU.</div><div class='del'>-			 */</div><div class='del'>-			alloclen += sizeof(struct frag_hdr);</div><div class='del'>-</div><div class='ctx'> 			copy = datalen - transhdrlen - fraggap - pagedlen;</div><div class='del'>-			if (copy &lt; 0) {</div><div class='add'>+			/* [!] NOTE: copy may be negative if pagedlen&gt;0</div><div class='add'>+			 * because then the equation may reduces to -fraggap.</div><div class='add'>+			 */</div><div class='add'>+			if (copy &lt; 0 &amp;&amp; !(flags &amp; MSG_SPLICE_PAGES)) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (transhdrlen) {</div><div class='del'>-				skb = sock_alloc_send_skb(sk,</div><div class='del'>-						alloclen + hh_len,</div><div class='add'>+				skb = sock_alloc_send_skb(sk, alloclen,</div><div class='ctx'> 						(flags &amp; MSG_DONTWAIT), &amp;err);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				skb = NULL;</div><div class='ctx'> 				if (refcount_read(&amp;sk-&gt;sk_wmem_alloc) + wmem_alloc_delta &lt;=</div><div class='ctx'> 				    2 * sk-&gt;sk_sndbuf)</div><div class='del'>-					skb = alloc_skb(alloclen + hh_len,</div><div class='add'>+					skb = alloc_skb(alloclen,</div><div class='ctx'> 							sk-&gt;sk_allocation);</div><div class='ctx'> 				if (unlikely(!skb))</div><div class='ctx'> 					err = -ENOBUFS;</div><div class='hunk'>@@ -1439,12 +1695,6 @@ alloc_new_skb:</div><div class='ctx'> 			skb_reserve(skb, hh_len + sizeof(struct frag_hdr) +</div><div class='ctx'> 				    dst_exthdrlen);</div><div class='ctx'> </div><div class='del'>-			/* Only the initial fragment is time stamped */</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags = cork-&gt;tx_flags;</div><div class='del'>-			cork-&gt;tx_flags = 0;</div><div class='del'>-			skb_shinfo(skb)-&gt;tskey = tskey;</div><div class='del'>-			tskey = 0;</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 *	Find where to start putting bytes</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1456,18 +1706,21 @@ alloc_new_skb:</div><div class='ctx'> 			if (fraggap) {</div><div class='ctx'> 				skb-&gt;csum = skb_copy_and_csum_bits(</div><div class='ctx'> 					skb_prev, maxfraglen,</div><div class='del'>-					data + transhdrlen, fraggap, 0);</div><div class='add'>+					data + transhdrlen, fraggap);</div><div class='ctx'> 				skb_prev-&gt;csum = csum_sub(skb_prev-&gt;csum,</div><div class='ctx'> 							  skb-&gt;csum);</div><div class='ctx'> 				data += fraggap;</div><div class='ctx'> 				pskb_trim_unique(skb_prev, maxfraglen);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (copy &gt; 0 &amp;&amp;</div><div class='del'>-			    getfrag(from, data + transhdrlen, offset,</div><div class='del'>-				    copy, fraggap, skb) &lt; 0) {</div><div class='add'>+			    INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+					   from, data + transhdrlen, offset,</div><div class='add'>+					   copy, fraggap, skb) &lt; 0) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				kfree_skb(skb);</div><div class='ctx'> 				goto error;</div><div class='add'>+			} else if (flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+				copy = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			offset += copy;</div><div class='hunk'>@@ -1476,6 +1729,13 @@ alloc_new_skb:</div><div class='ctx'> 			exthdrlen = 0;</div><div class='ctx'> 			dst_exthdrlen = 0;</div><div class='ctx'> </div><div class='add'>+			/* Only the initial fragment is time stamped */</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags = cork-&gt;tx_flags;</div><div class='add'>+			cork-&gt;tx_flags = 0;</div><div class='add'>+			skb_shinfo(skb)-&gt;tskey = tskey;</div><div class='add'>+			tskey = 0;</div><div class='add'>+			skb_zcopy_set(skb, uarg, &amp;extra_uref);</div><div class='add'>+</div><div class='ctx'> 			if ((flags &amp; MSG_CONFIRM) &amp;&amp; !skb_prev)</div><div class='ctx'> 				skb_set_dst_pending_confirm(skb, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1499,19 +1759,33 @@ alloc_new_skb:</div><div class='ctx'> 			unsigned int off;</div><div class='ctx'> </div><div class='ctx'> 			off = skb-&gt;len;</div><div class='del'>-			if (getfrag(from, skb_put(skb, copy),</div><div class='del'>-						offset, copy, off, skb) &lt; 0) {</div><div class='add'>+			if (INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+					    from, skb_put(skb, copy),</div><div class='add'>+					    offset, copy, off, skb) &lt; 0) {</div><div class='ctx'> 				__skb_trim(skb, off);</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='add'>+		} else if (flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+			struct msghdr *msg = from;</div><div class='add'>+</div><div class='add'>+			err = -EIO;</div><div class='add'>+			if (WARN_ON_ONCE(copy &gt; msg-&gt;msg_iter.count))</div><div class='add'>+				goto error;</div><div class='add'>+</div><div class='add'>+			err = skb_splice_from_iter(skb, &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto error;</div><div class='add'>+			copy = err;</div><div class='add'>+			wmem_alloc_delta += copy;</div><div class='add'>+		} else if (!zc) {</div><div class='ctx'> 			int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			if (!sk_page_frag_refill(sk, pfrag))</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='add'>+			skb_zcopy_downgrade_managed(skb);</div><div class='ctx'> 			if (!skb_can_coalesce(skb, i, pfrag-&gt;page,</div><div class='ctx'> 					      pfrag-&gt;offset)) {</div><div class='ctx'> 				err = -EMSGSIZE;</div><div class='hunk'>@@ -1524,7 +1798,8 @@ alloc_new_skb:</div><div class='ctx'> 				get_page(pfrag-&gt;page);</div><div class='ctx'> 			}</div><div class='ctx'> 			copy = min_t(int, copy, pfrag-&gt;size - pfrag-&gt;offset);</div><div class='del'>-			if (getfrag(from,</div><div class='add'>+			if (INDIRECT_CALL_1(getfrag, ip_generic_getfrag,</div><div class='add'>+				    from,</div><div class='ctx'> 				    page_address(pfrag-&gt;page) + pfrag-&gt;offset,</div><div class='ctx'> 				    offset, copy, skb-&gt;len, skb) &lt; 0)</div><div class='ctx'> 				goto error_efault;</div><div class='hunk'>@@ -1535,6 +1810,10 @@ alloc_new_skb:</div><div class='ctx'> 			skb-&gt;data_len += copy;</div><div class='ctx'> 			skb-&gt;truesize += copy;</div><div class='ctx'> 			wmem_alloc_delta += copy;</div><div class='add'>+		} else {</div><div class='add'>+			err = skb_zerocopy_iter_dgram(skb, from, copy);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += copy;</div><div class='ctx'> 		length -= copy;</div><div class='hunk'>@@ -1547,16 +1826,19 @@ alloc_new_skb:</div><div class='ctx'> error_efault:</div><div class='ctx'> 	err = -EFAULT;</div><div class='ctx'> error:</div><div class='add'>+	net_zcopy_put_abort(uarg, extra_uref);</div><div class='ctx'> 	cork-&gt;length -= length;</div><div class='ctx'> 	IP6_INC_STATS(sock_net(sk), rt-&gt;rt6i_idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 	refcount_add(wmem_alloc_delta, &amp;sk-&gt;sk_wmem_alloc);</div><div class='add'>+	if (hold_tskey)</div><div class='add'>+		atomic_dec(&amp;sk-&gt;sk_tskey);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_append_data(struct sock *sk,</div><div class='ctx'> 		    int getfrag(void *from, char *to, int offset, int len,</div><div class='ctx'> 				int odd, struct sk_buff *skb),</div><div class='del'>-		    void *from, int length, int transhdrlen,</div><div class='add'>+		    void *from, size_t length, int transhdrlen,</div><div class='ctx'> 		    struct ipcm6_cookie *ipc6, struct flowi6 *fl6,</div><div class='ctx'> 		    struct rt6_info *rt, unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1571,43 +1853,52 @@ int ip6_append_data(struct sock *sk,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * setup for corking</div><div class='ctx'> 		 */</div><div class='add'>+		dst_hold(&amp;rt-&gt;dst);</div><div class='ctx'> 		err = ip6_setup_cork(sk, &amp;inet-&gt;cork, &amp;np-&gt;cork,</div><div class='del'>-				     ipc6, rt, fl6);</div><div class='add'>+				     ipc6, rt);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='add'>+		inet-&gt;cork.fl.u.ip6 = *fl6;</div><div class='ctx'> 		exthdrlen = (ipc6-&gt;opt ? ipc6-&gt;opt-&gt;opt_flen : 0);</div><div class='ctx'> 		length += exthdrlen;</div><div class='ctx'> 		transhdrlen += exthdrlen;</div><div class='ctx'> 	} else {</div><div class='del'>-		fl6 = &amp;inet-&gt;cork.fl.u.ip6;</div><div class='ctx'> 		transhdrlen = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __ip6_append_data(sk, fl6, &amp;sk-&gt;sk_write_queue, &amp;inet-&gt;cork.base,</div><div class='add'>+	return __ip6_append_data(sk, &amp;sk-&gt;sk_write_queue, &amp;inet-&gt;cork,</div><div class='ctx'> 				 &amp;np-&gt;cork, sk_page_frag(sk), getfrag,</div><div class='del'>-				 from, length, transhdrlen, flags, ipc6);</div><div class='add'>+				 from, length, transhdrlen, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_append_data);</div><div class='ctx'> </div><div class='add'>+static void ip6_cork_steal_dst(struct sk_buff *skb, struct inet_cork_full *cork)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = cork-&gt;base.dst;</div><div class='add'>+</div><div class='add'>+	cork-&gt;base.dst = NULL;</div><div class='add'>+	skb_dst_set(skb, dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ip6_cork_release(struct inet_cork_full *cork,</div><div class='ctx'> 			     struct inet6_cork *v6_cork)</div><div class='ctx'> {</div><div class='ctx'> 	if (v6_cork-&gt;opt) {</div><div class='del'>-		kfree(v6_cork-&gt;opt-&gt;dst0opt);</div><div class='del'>-		kfree(v6_cork-&gt;opt-&gt;dst1opt);</div><div class='del'>-		kfree(v6_cork-&gt;opt-&gt;hopopt);</div><div class='del'>-		kfree(v6_cork-&gt;opt-&gt;srcrt);</div><div class='del'>-		kfree(v6_cork-&gt;opt);</div><div class='add'>+		struct ipv6_txoptions *opt = v6_cork-&gt;opt;</div><div class='add'>+</div><div class='add'>+		kfree(opt-&gt;dst0opt);</div><div class='add'>+		kfree(opt-&gt;dst1opt);</div><div class='add'>+		kfree(opt-&gt;hopopt);</div><div class='add'>+		kfree(opt-&gt;srcrt);</div><div class='add'>+		kfree(opt);</div><div class='ctx'> 		v6_cork-&gt;opt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cork-&gt;base.dst) {</div><div class='ctx'> 		dst_release(cork-&gt;base.dst);</div><div class='ctx'> 		cork-&gt;base.dst = NULL;</div><div class='del'>-		cork-&gt;base.flags &amp;= ~IPCORK_ALLFRAG;</div><div class='ctx'> 	}</div><div class='del'>-	memset(&amp;cork-&gt;fl, 0, sizeof(cork-&gt;fl));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *__ip6_make_skb(struct sock *sk,</div><div class='hunk'>@@ -1617,12 +1908,11 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb, *tmp_skb;</div><div class='ctx'> 	struct sk_buff **tail_skb;</div><div class='del'>-	struct in6_addr final_dst_buf, *final_dst = &amp;final_dst_buf;</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct in6_addr *final_dst;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ipv6hdr *hdr;</div><div class='ctx'> 	struct ipv6_txoptions *opt = v6_cork-&gt;opt;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)cork-&gt;base.dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(cork-&gt;base.dst);</div><div class='ctx'> 	struct flowi6 *fl6 = &amp;cork-&gt;fl.u.ip6;</div><div class='ctx'> 	unsigned char proto = fl6-&gt;flowi6_proto;</div><div class='ctx'> </div><div class='hunk'>@@ -1647,9 +1937,9 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	/* Allow local fragmentation. */</div><div class='ctx'> 	skb-&gt;ignore_df = ip6_sk_ignore_df(sk);</div><div class='del'>-</div><div class='del'>-	*final_dst = fl6-&gt;daddr;</div><div class='ctx'> 	__skb_pull(skb, skb_network_header_len(skb));</div><div class='add'>+</div><div class='add'>+	final_dst = &amp;fl6-&gt;daddr;</div><div class='ctx'> 	if (opt &amp;&amp; opt-&gt;opt_flen)</div><div class='ctx'> 		ipv6_push_frag_opts(skb, opt, &amp;proto);</div><div class='ctx'> 	if (opt &amp;&amp; opt-&gt;opt_nflen)</div><div class='hunk'>@@ -1661,23 +1951,31 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	ip6_flow_hdr(hdr, v6_cork-&gt;tclass,</div><div class='ctx'> 		     ip6_make_flowlabel(net, skb, fl6-&gt;flowlabel,</div><div class='del'>-					ip6_autoflowlabel(net, np), fl6));</div><div class='add'>+					ip6_autoflowlabel(net, sk), fl6));</div><div class='ctx'> 	hdr-&gt;hop_limit = v6_cork-&gt;hop_limit;</div><div class='ctx'> 	hdr-&gt;nexthdr = proto;</div><div class='ctx'> 	hdr-&gt;saddr = fl6-&gt;saddr;</div><div class='ctx'> 	hdr-&gt;daddr = *final_dst;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='del'>-	skb-&gt;mark = sk-&gt;sk_mark;</div><div class='del'>-</div><div class='del'>-	skb-&gt;tstamp = cork-&gt;base.transmit_time;</div><div class='add'>+	skb-&gt;priority = cork-&gt;base.priority;</div><div class='add'>+	skb-&gt;mark = cork-&gt;base.mark;</div><div class='add'>+	if (sk_is_tcp(sk))</div><div class='add'>+		skb_set_delivery_time(skb, cork-&gt;base.transmit_time, SKB_CLOCK_MONOTONIC);</div><div class='add'>+	else</div><div class='add'>+		skb_set_delivery_type_by_clockid(skb, cork-&gt;base.transmit_time, sk-&gt;sk_clockid);</div><div class='ctx'> </div><div class='del'>-	skb_dst_set(skb, dst_clone(&amp;rt-&gt;dst));</div><div class='del'>-	IP6_UPD_PO_STATS(net, rt-&gt;rt6i_idev, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+	ip6_cork_steal_dst(skb, cork);</div><div class='add'>+	IP6_INC_STATS(net, rt-&gt;rt6i_idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> 	if (proto == IPPROTO_ICMPV6) {</div><div class='ctx'> 		struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));</div><div class='add'>+		u8 icmp6_type;</div><div class='ctx'> </div><div class='del'>-		ICMP6MSGOUT_INC_STATS(net, idev, icmp6_hdr(skb)-&gt;icmp6_type);</div><div class='add'>+		if (sk-&gt;sk_socket-&gt;type == SOCK_RAW &amp;&amp;</div><div class='add'>+		   !(fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_KNOWN_NH))</div><div class='add'>+			icmp6_type = fl6-&gt;fl6_icmp_type;</div><div class='add'>+		else</div><div class='add'>+			icmp6_type = icmp6_hdr(skb)-&gt;icmp6_type;</div><div class='add'>+		ICMP6MSGOUT_INC_STATS(net, idev, icmp6_type);</div><div class='ctx'> 		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1689,9 +1987,10 @@ out:</div><div class='ctx'> int ip6_send_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(skb_dst(skb));</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	err = ip6_local_out(net, skb-&gt;sk, skb);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err &gt; 0)</div><div class='hunk'>@@ -1701,6 +2000,7 @@ int ip6_send_skb(struct sk_buff *skb)</div><div class='ctx'> 				      IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1743,38 +2043,36 @@ EXPORT_SYMBOL_GPL(ip6_flush_pending_frames);</div><div class='ctx'> struct sk_buff *ip6_make_skb(struct sock *sk,</div><div class='ctx'> 			     int getfrag(void *from, char *to, int offset,</div><div class='ctx'> 					 int len, int odd, struct sk_buff *skb),</div><div class='del'>-			     void *from, int length, int transhdrlen,</div><div class='del'>-			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,</div><div class='del'>-			     struct rt6_info *rt, unsigned int flags,</div><div class='del'>-			     struct inet_cork_full *cork)</div><div class='add'>+			     void *from, size_t length, int transhdrlen,</div><div class='add'>+			     struct ipcm6_cookie *ipc6, struct rt6_info *rt,</div><div class='add'>+			     unsigned int flags, struct inet_cork_full *cork)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_cork v6_cork;</div><div class='ctx'> 	struct sk_buff_head queue;</div><div class='ctx'> 	int exthdrlen = (ipc6-&gt;opt ? ipc6-&gt;opt-&gt;opt_flen : 0);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MSG_PROBE)</div><div class='add'>+	if (flags &amp; MSG_PROBE) {</div><div class='add'>+		dst_release(&amp;rt-&gt;dst);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_head_init(&amp;queue);</div><div class='ctx'> </div><div class='ctx'> 	cork-&gt;base.flags = 0;</div><div class='ctx'> 	cork-&gt;base.addr = 0;</div><div class='ctx'> 	cork-&gt;base.opt = NULL;</div><div class='del'>-	cork-&gt;base.dst = NULL;</div><div class='ctx'> 	v6_cork.opt = NULL;</div><div class='del'>-	err = ip6_setup_cork(sk, cork, &amp;v6_cork, ipc6, rt, fl6);</div><div class='add'>+	err = ip6_setup_cork(sk, cork, &amp;v6_cork, ipc6, rt);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		ip6_cork_release(cork, &amp;v6_cork);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='del'>-	if (ipc6-&gt;dontfrag &lt; 0)</div><div class='del'>-		ipc6-&gt;dontfrag = inet6_sk(sk)-&gt;dontfrag;</div><div class='ctx'> </div><div class='del'>-	err = __ip6_append_data(sk, fl6, &amp;queue, &amp;cork-&gt;base, &amp;v6_cork,</div><div class='add'>+	err = __ip6_append_data(sk, &amp;queue, cork, &amp;v6_cork,</div><div class='ctx'> 				&amp;current-&gt;task_frag, getfrag, from,</div><div class='ctx'> 				length + exthdrlen, transhdrlen + exthdrlen,</div><div class='del'>-				flags, ipc6);</div><div class='add'>+				flags);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		__ip6_flush_pending_frames(sk, &amp;queue, cork, &amp;v6_cork);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='head'>diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c<br/>index a0b6932c3afd..6405072050e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_tunnel.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 tunneling device</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -10,12 +11,6 @@</div><div class='ctx'>  *      linux/net/ipv6/sit.c and linux/net/ipv4/ipip.c</div><div class='ctx'>  *</div><div class='ctx'>  *      RFC 2473</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -57,7 +52,9 @@</div><div class='ctx'> #include &lt;net/inet_ecn.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ville Nuorvala");</div><div class='ctx'> MODULE_DESCRIPTION("IPv6 tunneling device");</div><div class='hunk'>@@ -94,38 +91,18 @@ struct ip6_tnl_net {</div><div class='ctx'> 	struct ip6_tnl __rcu *collect_md_tun;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *ip6_get_stats(struct net_device *dev)</div><div class='add'>+static inline int ip6_tnl_mpls_supported(void)</div><div class='ctx'> {</div><div class='del'>-	struct pcpu_sw_netstats tmp, sum = { 0 };</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		unsigned int start;</div><div class='del'>-		const struct pcpu_sw_netstats *tstats =</div><div class='del'>-						   per_cpu_ptr(dev-&gt;tstats, i);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;tstats-&gt;syncp);</div><div class='del'>-			tmp.rx_packets = tstats-&gt;rx_packets;</div><div class='del'>-			tmp.rx_bytes = tstats-&gt;rx_bytes;</div><div class='del'>-			tmp.tx_packets = tstats-&gt;tx_packets;</div><div class='del'>-			tmp.tx_bytes =  tstats-&gt;tx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;tstats-&gt;syncp, start));</div><div class='del'>-</div><div class='del'>-		sum.rx_packets += tmp.rx_packets;</div><div class='del'>-		sum.rx_bytes   += tmp.rx_bytes;</div><div class='del'>-		sum.tx_packets += tmp.tx_packets;</div><div class='del'>-		sum.tx_bytes   += tmp.tx_bytes;</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;stats.rx_packets = sum.rx_packets;</div><div class='del'>-	dev-&gt;stats.rx_bytes   = sum.rx_bytes;</div><div class='del'>-	dev-&gt;stats.tx_packets = sum.tx_packets;</div><div class='del'>-	dev-&gt;stats.tx_bytes   = sum.tx_bytes;</div><div class='del'>-	return &amp;dev-&gt;stats;</div><div class='add'>+	return IS_ENABLED(CONFIG_MPLS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define for_each_ip6_tunnel_rcu(start) \</div><div class='add'>+	for (t = rcu_dereference(start); t; t = rcu_dereference(t-&gt;next))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_lookup - fetch tunnel matching the end-point addresses</div><div class='add'>+ *   @net: network namespace</div><div class='add'>+ *   @link: ifindex of underlying interface</div><div class='ctx'>  *   @remote: the address of the tunnel exit-point</div><div class='ctx'>  *   @local: the address of the tunnel entry-point</div><div class='ctx'>  *</div><div class='hunk'>@@ -135,41 +112,57 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)</div><div class='ctx'>  *   else %NULL</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-#define for_each_ip6_tunnel_rcu(start) \</div><div class='del'>-	for (t = rcu_dereference(start); t; t = rcu_dereference(t-&gt;next))</div><div class='del'>-</div><div class='ctx'> static struct ip6_tnl *</div><div class='del'>-ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)</div><div class='add'>+ip6_tnl_lookup(struct net *net, int link,</div><div class='add'>+	       const struct in6_addr *remote, const struct in6_addr *local)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int hash = HASH(remote, local);</div><div class='del'>-	struct ip6_tnl *t;</div><div class='add'>+	struct ip6_tnl *t, *cand = NULL;</div><div class='ctx'> 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='ctx'> 	struct in6_addr any;</div><div class='ctx'> </div><div class='ctx'> 	for_each_ip6_tunnel_rcu(ip6n-&gt;tnls_r_l[hash]) {</div><div class='del'>-		if (ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) &amp;&amp;</div><div class='del'>-		    ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr) &amp;&amp;</div><div class='del'>-		    (t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		if (!ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) ||</div><div class='add'>+		    !ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr) ||</div><div class='add'>+		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link == t-&gt;parms.link)</div><div class='ctx'> 			return t;</div><div class='add'>+		else</div><div class='add'>+			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;any, 0, sizeof(any));</div><div class='ctx'> 	hash = HASH(&amp;any, local);</div><div class='ctx'> 	for_each_ip6_tunnel_rcu(ip6n-&gt;tnls_r_l[hash]) {</div><div class='del'>-		if (ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) &amp;&amp;</div><div class='del'>-		    ipv6_addr_any(&amp;t-&gt;parms.raddr) &amp;&amp;</div><div class='del'>-		    (t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		if (!ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) ||</div><div class='add'>+		    !ipv6_addr_any(&amp;t-&gt;parms.raddr) ||</div><div class='add'>+		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link == t-&gt;parms.link)</div><div class='ctx'> 			return t;</div><div class='add'>+		else if (!cand)</div><div class='add'>+			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hash = HASH(remote, &amp;any);</div><div class='ctx'> 	for_each_ip6_tunnel_rcu(ip6n-&gt;tnls_r_l[hash]) {</div><div class='del'>-		if (ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr) &amp;&amp;</div><div class='del'>-		    ipv6_addr_any(&amp;t-&gt;parms.laddr) &amp;&amp;</div><div class='del'>-		    (t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		if (!ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr) ||</div><div class='add'>+		    !ipv6_addr_any(&amp;t-&gt;parms.laddr) ||</div><div class='add'>+		    !(t-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link == t-&gt;parms.link)</div><div class='ctx'> 			return t;</div><div class='add'>+		else if (!cand)</div><div class='add'>+			cand = t;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cand)</div><div class='add'>+		return cand;</div><div class='add'>+</div><div class='ctx'> 	t = rcu_dereference(ip6n-&gt;collect_md_tun);</div><div class='ctx'> 	if (t &amp;&amp; t-&gt;dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return t;</div><div class='hunk'>@@ -183,6 +176,7 @@ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_bucket - get head of list matching given tunnel parameters</div><div class='add'>+ *   @ip6n: the private data for ip6_vti in the netns</div><div class='ctx'>  *   @p: parameters containing tunnel end-points</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -209,6 +203,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, const struct __ip6_tnl_parm *p)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_link - add tunnel to hash table</div><div class='add'>+ *   @ip6n: the private data for ip6_vti in the netns</div><div class='ctx'>  *   @t: tunnel to be added</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='hunk'>@@ -225,6 +220,7 @@ ip6_tnl_link(struct ip6_tnl_net *ip6n, struct ip6_tnl *t)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_unlink - remove tunnel from hash table</div><div class='add'>+ *   @ip6n: the private data for ip6_vti in the netns</div><div class='ctx'>  *   @t: tunnel to be removed</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='hunk'>@@ -253,18 +249,14 @@ static void ip6_dev_free(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	gro_cells_destroy(&amp;t-&gt;gro_cells);</div><div class='ctx'> 	dst_cache_destroy(&amp;t-&gt;dst_cache);</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_tnl_create2(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='add'>+	struct ip6_tnl_net *ip6n = net_generic(t-&gt;net, ip6_tnl_net_id);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	t = netdev_priv(dev);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;rtnl_link_ops = &amp;ip6_link_ops;</div><div class='ctx'> 	err = register_netdevice(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -272,7 +264,6 @@ static int ip6_tnl_create2(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	strcpy(t-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> 	ip6_tnl_link(ip6n, t);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -282,8 +273,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_create - create a new tunnel</div><div class='add'>+ *   @net: network namespace</div><div class='ctx'>  *   @p: tunnel parameters</div><div class='del'>- *   @pt: pointer to new tunnel</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *   Create tunnel matching given parameters.</div><div class='hunk'>@@ -302,7 +293,7 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p)</div><div class='ctx'> 	if (p-&gt;name[0]) {</div><div class='ctx'> 		if (!dev_valid_name(p-&gt;name))</div><div class='ctx'> 			goto failed;</div><div class='del'>-		strlcpy(name, p-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, p-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sprintf(name, "ip6tnl%%d");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -331,6 +322,7 @@ failed:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ip6_tnl_locate - find or create tunnel matching given parameters</div><div class='add'>+ *   @net: network namespace</div><div class='ctx'>  *   @p: tunnel parameters</div><div class='ctx'>  *   @create: != 0 if allowed to create new tunnel if no match found</div><div class='ctx'>  *</div><div class='hunk'>@@ -356,7 +348,8 @@ static struct ip6_tnl *ip6_tnl_locate(struct net *net,</div><div class='ctx'> 	     (t = rtnl_dereference(*tp)) != NULL;</div><div class='ctx'> 	     tp = &amp;t-&gt;next) {</div><div class='ctx'> 		if (ipv6_addr_equal(local, &amp;t-&gt;parms.laddr) &amp;&amp;</div><div class='del'>-		    ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr)) {</div><div class='add'>+		    ipv6_addr_equal(remote, &amp;t-&gt;parms.raddr) &amp;&amp;</div><div class='add'>+		    p-&gt;link == t-&gt;parms.link) {</div><div class='ctx'> 			if (create)</div><div class='ctx'> 				return ERR_PTR(-EEXIST);</div><div class='ctx'> </div><div class='hunk'>@@ -388,12 +381,13 @@ ip6_tnl_dev_uninit(struct net_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		ip6_tnl_unlink(ip6n, t);</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;t-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * parse_tvl_tnl_enc_lim - handle encapsulation limit option</div><div class='add'>+ * ip6_tnl_parse_tlv_enc_lim - handle encapsulation limit option</div><div class='ctx'>  *   @skb: received socket buffer</div><div class='add'>+ *   @raw: the ICMPv6 error message data</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='ctx'>  *   0 if none was found,</div><div class='hunk'>@@ -405,7 +399,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw)</div><div class='ctx'> 	const struct ipv6hdr *ipv6h = (const struct ipv6hdr *)raw;</div><div class='ctx'> 	unsigned int nhoff = raw - skb-&gt;data;</div><div class='ctx'> 	unsigned int off = nhoff + sizeof(*ipv6h);</div><div class='del'>-	u8 next, nexthdr = ipv6h-&gt;nexthdr;</div><div class='add'>+	u8 nexthdr = ipv6h-&gt;nexthdr;</div><div class='ctx'> </div><div class='ctx'> 	while (ipv6_ext_hdr(nexthdr) &amp;&amp; nexthdr != NEXTHDR_NONE) {</div><div class='ctx'> 		struct ipv6_opt_hdr *hdr;</div><div class='hunk'>@@ -416,25 +410,25 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw)</div><div class='ctx'> </div><div class='ctx'> 		hdr = (struct ipv6_opt_hdr *)(skb-&gt;data + off);</div><div class='ctx'> 		if (nexthdr == NEXTHDR_FRAGMENT) {</div><div class='del'>-			struct frag_hdr *frag_hdr = (struct frag_hdr *) hdr;</div><div class='del'>-			if (frag_hdr-&gt;frag_off)</div><div class='del'>-				break;</div><div class='ctx'> 			optlen = 8;</div><div class='ctx'> 		} else if (nexthdr == NEXTHDR_AUTH) {</div><div class='del'>-			optlen = (hdr-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+			optlen = ipv6_authlen(hdr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			optlen = ipv6_optlen(hdr);</div><div class='ctx'> 		}</div><div class='del'>-		/* cache hdr-&gt;nexthdr, since pskb_may_pull() might</div><div class='del'>-		 * invalidate hdr</div><div class='del'>-		 */</div><div class='del'>-		next = hdr-&gt;nexthdr;</div><div class='del'>-		if (nexthdr == NEXTHDR_DEST) {</div><div class='del'>-			u16 i = 2;</div><div class='ctx'> </div><div class='del'>-			/* Remember : hdr is no longer valid at this point. */</div><div class='del'>-			if (!pskb_may_pull(skb, off + optlen))</div><div class='add'>+		if (!pskb_may_pull(skb, off + optlen))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		hdr = (struct ipv6_opt_hdr *)(skb-&gt;data + off);</div><div class='add'>+		if (nexthdr == NEXTHDR_FRAGMENT) {</div><div class='add'>+			struct frag_hdr *frag_hdr = (struct frag_hdr *)hdr;</div><div class='add'>+</div><div class='add'>+			if (frag_hdr-&gt;frag_off)</div><div class='ctx'> 				break;</div><div class='add'>+		}</div><div class='add'>+		if (nexthdr == NEXTHDR_DEST) {</div><div class='add'>+			u16 i = 2;</div><div class='ctx'> </div><div class='ctx'> 			while (1) {</div><div class='ctx'> 				struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='hunk'>@@ -455,21 +449,16 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw)</div><div class='ctx'> 					i++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		nexthdr = next;</div><div class='add'>+		nexthdr = hdr-&gt;nexthdr;</div><div class='ctx'> 		off += optlen;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_parse_tlv_enc_lim);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * ip6_tnl_err - tunnel error handler</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *   ip6_tnl_err() should handle errors in the tunnel according</div><div class='del'>- *   to the specifications in RFC 2473.</div><div class='del'>- **/</div><div class='del'>-</div><div class='add'>+/* ip6_tnl_err() should handle errors in the tunnel according to the</div><div class='add'>+ * specifications in RFC 2473.</div><div class='add'>+ */</div><div class='ctx'> static int</div><div class='ctx'> ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 	    u8 *type, u8 *code, int *msg, __u32 *info, int offset)</div><div class='hunk'>@@ -490,7 +479,7 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 	   processing of the error. */</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	t = ip6_tnl_lookup(dev_net(skb-&gt;dev), &amp;ipv6h-&gt;daddr, &amp;ipv6h-&gt;saddr);</div><div class='add'>+	t = ip6_tnl_lookup(dev_net(skb-&gt;dev), skb-&gt;dev-&gt;ifindex, &amp;ipv6h-&gt;daddr, &amp;ipv6h-&gt;saddr);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -501,8 +490,6 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (*type) {</div><div class='del'>-		struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='del'>-		__u32 mtu, teli;</div><div class='ctx'> 	case ICMPV6_DEST_UNREACH:</div><div class='ctx'> 		net_dbg_ratelimited("%s: Path to destination invalid or inactive!\n",</div><div class='ctx'> 				    t-&gt;parms.name);</div><div class='hunk'>@@ -515,7 +502,10 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 			rel_msg = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case ICMPV6_PARAMPROB:</div><div class='add'>+	case ICMPV6_PARAMPROB: {</div><div class='add'>+		struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='add'>+		__u32 teli;</div><div class='add'>+</div><div class='ctx'> 		teli = 0;</div><div class='ctx'> 		if ((*code) == ICMPV6_HDR_FIELD)</div><div class='ctx'> 			teli = ip6_tnl_parse_tlv_enc_lim(skb, skb-&gt;data);</div><div class='hunk'>@@ -532,7 +522,10 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 					    t-&gt;parms.name);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case ICMPV6_PKT_TOOBIG:</div><div class='add'>+	}</div><div class='add'>+	case ICMPV6_PKT_TOOBIG: {</div><div class='add'>+		__u32 mtu;</div><div class='add'>+</div><div class='ctx'> 		ip6_update_pmtu(skb, net, htonl(*info), 0, 0,</div><div class='ctx'> 				sock_net_uid(net, NULL));</div><div class='ctx'> 		mtu = *info - offset;</div><div class='hunk'>@@ -546,6 +539,7 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,</div><div class='ctx'> 			rel_msg = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> 	case NDISC_REDIRECT:</div><div class='ctx'> 		ip6_redirect(skb, net, skb-&gt;dev-&gt;ifindex, 0,</div><div class='ctx'> 			     sock_net_uid(net, NULL));</div><div class='hunk'>@@ -615,7 +609,8 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> </div><div class='ctx'> 	/* Try to guess incoming interface */</div><div class='ctx'> 	rt = ip_route_output_ports(dev_net(skb-&gt;dev), &amp;fl4, NULL, eiph-&gt;saddr,</div><div class='del'>-				   0, 0, 0, IPPROTO_IPIP, RT_TOS(eiph-&gt;tos), 0);</div><div class='add'>+				   0, 0, 0, IPPROTO_IPIP,</div><div class='add'>+				   eiph-&gt;tos &amp; INET_DSCP_MASK, 0);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -626,17 +621,18 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	if (rt-&gt;rt_flags &amp; RTCF_LOCAL) {</div><div class='ctx'> 		rt = ip_route_output_ports(dev_net(skb-&gt;dev), &amp;fl4, NULL,</div><div class='ctx'> 					   eiph-&gt;daddr, eiph-&gt;saddr, 0, 0,</div><div class='del'>-					   IPPROTO_IPIP, RT_TOS(eiph-&gt;tos), 0);</div><div class='del'>-		if (IS_ERR(rt) || rt-&gt;dst.dev-&gt;type != ARPHRD_TUNNEL) {</div><div class='add'>+					   IPPROTO_IPIP,</div><div class='add'>+					   eiph-&gt;tos &amp; INET_DSCP_MASK, 0);</div><div class='add'>+		if (IS_ERR(rt) || rt-&gt;dst.dev-&gt;type != ARPHRD_TUNNEL6) {</div><div class='ctx'> 			if (!IS_ERR(rt))</div><div class='ctx'> 				ip_rt_put(rt);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		skb_dst_set(skb2, &amp;rt-&gt;dst);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (ip_route_input(skb2, eiph-&gt;daddr, eiph-&gt;saddr, eiph-&gt;tos,</div><div class='del'>-				   skb2-&gt;dev) ||</div><div class='del'>-		    skb_dst(skb2)-&gt;dev-&gt;type != ARPHRD_TUNNEL)</div><div class='add'>+		if (ip_route_input(skb2, eiph-&gt;daddr, eiph-&gt;saddr,</div><div class='add'>+				   ip4h_dscp(eiph), skb2-&gt;dev) ||</div><div class='add'>+		    skb_dst_dev(skb2)-&gt;type != ARPHRD_TUNNEL6)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -645,7 +641,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		if (rel_info &gt; dst_mtu(skb_dst(skb2)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		skb_dst_update_pmtu(skb2, rel_info);</div><div class='add'>+		skb_dst_update_pmtu_no_confirm(skb2, rel_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	icmp_send(skb2, rel_type, rel_code, htonl(rel_info));</div><div class='hunk'>@@ -697,6 +693,20 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mplsip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+	    u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+{</div><div class='add'>+	__u32 rel_info = ntohl(info);</div><div class='add'>+	int err, rel_msg = 0;</div><div class='add'>+	u8 rel_type = type;</div><div class='add'>+	u8 rel_code = code;</div><div class='add'>+</div><div class='add'>+	err = ip6_tnl_err(skb, IPPROTO_MPLS, opt, &amp;rel_type, &amp;rel_code,</div><div class='add'>+			  &amp;rel_msg, &amp;rel_info, offset);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip4ip6_dscp_ecn_decapsulate(const struct ip6_tnl *t,</div><div class='ctx'> 				       const struct ipv6hdr *ipv6h,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='hunk'>@@ -719,6 +729,14 @@ static int ip6ip6_dscp_ecn_decapsulate(const struct ip6_tnl *t,</div><div class='ctx'> 	return IP6_ECN_decapsulate(ipv6h, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int mplsip6_dscp_ecn_decapsulate(const struct ip6_tnl *t,</div><div class='add'>+					       const struct ipv6hdr *ipv6h,</div><div class='add'>+					       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* ECN is not supported in AF_MPLS */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __u32 ip6_tnl_get_cap(struct ip6_tnl *t,</div><div class='ctx'> 			     const struct in6_addr *laddr,</div><div class='ctx'> 			     const struct in6_addr *raddr)</div><div class='hunk'>@@ -780,25 +798,22 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,</div><div class='ctx'> 						struct sk_buff *skb),</div><div class='ctx'> 			 bool log_ecn_err)</div><div class='ctx'> {</div><div class='del'>-	struct pcpu_sw_netstats *tstats;</div><div class='del'>-	const struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='del'>-	int err;</div><div class='add'>+	const struct ipv6hdr *ipv6h;</div><div class='add'>+	int nh, err;</div><div class='ctx'> </div><div class='del'>-	if ((!(tpi-&gt;flags &amp; TUNNEL_CSUM) &amp;&amp;</div><div class='del'>-	     (tunnel-&gt;parms.i_flags &amp; TUNNEL_CSUM)) ||</div><div class='del'>-	    ((tpi-&gt;flags &amp; TUNNEL_CSUM) &amp;&amp;</div><div class='del'>-	     !(tunnel-&gt;parms.i_flags &amp; TUNNEL_CSUM))) {</div><div class='del'>-		tunnel-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-		tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+	if (test_bit(IP_TUNNEL_CSUM_BIT, tunnel-&gt;parms.i_flags) !=</div><div class='add'>+	    test_bit(IP_TUNNEL_CSUM_BIT, tpi-&gt;flags)) {</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_crc_errors);</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tunnel-&gt;parms.i_flags &amp; TUNNEL_SEQ) {</div><div class='del'>-		if (!(tpi-&gt;flags &amp; TUNNEL_SEQ) ||</div><div class='add'>+	if (test_bit(IP_TUNNEL_SEQ_BIT, tunnel-&gt;parms.i_flags)) {</div><div class='add'>+		if (!test_bit(IP_TUNNEL_SEQ_BIT, tpi-&gt;flags) ||</div><div class='ctx'> 		    (tunnel-&gt;i_seqno &amp;&amp;</div><div class='ctx'> 		     (s32)(ntohl(tpi-&gt;seq) - tunnel-&gt;i_seqno) &lt; 0)) {</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_fifo_errors++;</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_fifo_errors);</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 		tunnel-&gt;i_seqno = ntohl(tpi-&gt;seq) + 1;</div><div class='hunk'>@@ -809,19 +824,35 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,</div><div class='ctx'> 	/* Warning: All skb pointers will be invalidated! */</div><div class='ctx'> 	if (tunnel-&gt;dev-&gt;type == ARPHRD_ETHER) {</div><div class='ctx'> 		if (!pskb_may_pull(skb, ETH_HLEN)) {</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_length_errors++;</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_length_errors);</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, tunnel-&gt;dev);</div><div class='ctx'> 		skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		skb-&gt;dev = tunnel-&gt;dev;</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Save offset of outer header relative to skb-&gt;head,</div><div class='add'>+	 * because we are going to reset the network header to the inner header</div><div class='add'>+	 * and might change skb-&gt;head.</div><div class='add'>+	 */</div><div class='add'>+	nh = skb_network_header(skb) - skb-&gt;head;</div><div class='add'>+</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	if (!pskb_inet_may_pull(skb)) {</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_length_errors);</div><div class='add'>+		DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the outer header. */</div><div class='add'>+	ipv6h = (struct ipv6hdr *)(skb-&gt;head + nh);</div><div class='add'>+</div><div class='ctx'> 	memset(skb-&gt;cb, 0, sizeof(struct inet6_skb_parm));</div><div class='ctx'> </div><div class='ctx'> 	__skb_tunnel_rx(skb, tunnel-&gt;dev, tunnel-&gt;net);</div><div class='hunk'>@@ -833,17 +864,13 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,</div><div class='ctx'> 					     &amp;ipv6h-&gt;saddr,</div><div class='ctx'> 					     ipv6_get_dsfield(ipv6h));</div><div class='ctx'> 		if (err &gt; 1) {</div><div class='del'>-			++tunnel-&gt;dev-&gt;stats.rx_frame_errors;</div><div class='del'>-			++tunnel-&gt;dev-&gt;stats.rx_errors;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_frame_errors);</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tstats = this_cpu_ptr(tunnel-&gt;dev-&gt;tstats);</div><div class='del'>-	u64_stats_update_begin(&amp;tstats-&gt;syncp);</div><div class='del'>-	tstats-&gt;rx_packets++;</div><div class='del'>-	tstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;tstats-&gt;syncp);</div><div class='add'>+	dev_sw_netstats_rx_add(tunnel-&gt;dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(tunnel-&gt;net, dev_net(tunnel-&gt;dev)));</div><div class='ctx'> </div><div class='hunk'>@@ -865,7 +892,15 @@ int ip6_tnl_rcv(struct ip6_tnl *t, struct sk_buff *skb,</div><div class='ctx'> 		struct metadata_dst *tun_dst,</div><div class='ctx'> 		bool log_ecn_err)</div><div class='ctx'> {</div><div class='del'>-	return __ip6_tnl_rcv(t, skb, tpi, tun_dst, ip6ip6_dscp_ecn_decapsulate,</div><div class='add'>+	int (*dscp_ecn_decapsulate)(const struct ip6_tnl *t,</div><div class='add'>+				    const struct ipv6hdr *ipv6h,</div><div class='add'>+				    struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+	dscp_ecn_decapsulate = ip6ip6_dscp_ecn_decapsulate;</div><div class='add'>+	if (tpi-&gt;proto == htons(ETH_P_IP))</div><div class='add'>+		dscp_ecn_decapsulate = ip4ip6_dscp_ecn_decapsulate;</div><div class='add'>+</div><div class='add'>+	return __ip6_tnl_rcv(t, skb, tpi, tun_dst, dscp_ecn_decapsulate,</div><div class='ctx'> 			     log_ecn_err);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_rcv);</div><div class='hunk'>@@ -880,6 +915,11 @@ static const struct tnl_ptk_info tpi_v4 = {</div><div class='ctx'> 	.proto = htons(ETH_P_IP),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct tnl_ptk_info tpi_mpls = {</div><div class='add'>+	/* no tunnel info required for mplsip6. */</div><div class='add'>+	.proto = htons(ETH_P_MPLS_UC),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,</div><div class='ctx'> 		      const struct tnl_ptk_info *tpi,</div><div class='ctx'> 		      int (*dscp_ecn_decapsulate)(const struct ip6_tnl *t,</div><div class='hunk'>@@ -892,7 +932,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	t = ip6_tnl_lookup(dev_net(skb-&gt;dev), &amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr);</div><div class='add'>+	t = ip6_tnl_lookup(dev_net(skb-&gt;dev), skb-&gt;dev-&gt;ifindex, &amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr);</div><div class='ctx'> </div><div class='ctx'> 	if (t) {</div><div class='ctx'> 		u8 tproto = READ_ONCE(t-&gt;parms.proto);</div><div class='hunk'>@@ -901,12 +941,15 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='ctx'> 			goto drop;</div><div class='add'>+		ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 		if (!ip6_tnl_rcv_ctl(t, &amp;ipv6h-&gt;daddr, &amp;ipv6h-&gt;saddr))</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		if (iptunnel_pull_header(skb, 0, tpi-&gt;proto, false))</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		if (t-&gt;parms.collect_md) {</div><div class='del'>-			tun_dst = ipv6_tun_rx_dst(skb, 0, 0, 0);</div><div class='add'>+			IP_TUNNEL_DECLARE_FLAGS(flags) = { };</div><div class='add'>+</div><div class='add'>+			tun_dst = ipv6_tun_rx_dst(skb, flags, 0, 0);</div><div class='ctx'> 			if (!tun_dst)</div><div class='ctx'> 				goto drop;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -936,6 +979,12 @@ static int ip6ip6_rcv(struct sk_buff *skb)</div><div class='ctx'> 			  ip6ip6_dscp_ecn_decapsulate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mplsip6_rcv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return ipxip6_rcv(skb, IPPROTO_MPLS, &amp;tpi_mpls,</div><div class='add'>+			  mplsip6_dscp_ecn_decapsulate);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct ipv6_tel_txoption {</div><div class='ctx'> 	struct ipv6_txoptions ops;</div><div class='ctx'> 	__u8 dst_opt[8];</div><div class='hunk'>@@ -997,14 +1046,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t,</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!ipv6_chk_addr_and_flags(net, laddr, ldev, false,</div><div class='ctx'> 						      0, IFA_F_TENTATIVE)))</div><div class='del'>-			pr_warn("%s xmit: Local address not yet configured!\n",</div><div class='del'>-				p-&gt;name);</div><div class='add'>+			pr_warn_ratelimited("%s xmit: Local address not yet configured!\n",</div><div class='add'>+					    p-&gt;name);</div><div class='ctx'> 		else if (!(p-&gt;flags &amp; IP6_TNL_F_ALLOW_LOCAL_REMOTE) &amp;&amp;</div><div class='ctx'> 			 !ipv6_addr_is_multicast(raddr) &amp;&amp;</div><div class='ctx'> 			 unlikely(ipv6_chk_addr_and_flags(net, raddr, ldev,</div><div class='ctx'> 							  true, 0, IFA_F_TENTATIVE)))</div><div class='del'>-			pr_warn("%s xmit: Routing loop! Remote address found on this node!\n",</div><div class='del'>-				p-&gt;name);</div><div class='add'>+			pr_warn_ratelimited("%s xmit: Routing loop! Remote address found on this node!\n",</div><div class='add'>+					    p-&gt;name);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -1039,7 +1088,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> 	struct net *net = t-&gt;net;</div><div class='del'>-	struct net_device_stats *stats = &amp;t-&gt;dev-&gt;stats;</div><div class='ctx'> 	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct ipv6_tel_txoption opt;</div><div class='ctx'> 	struct dst_entry *dst = NULL, *ndst = NULL;</div><div class='hunk'>@@ -1048,10 +1096,13 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,</div><div class='ctx'> 	unsigned int eth_hlen = t-&gt;dev-&gt;type == ARPHRD_ETHER ? ETH_HLEN : 0;</div><div class='ctx'> 	unsigned int psh_hlen = sizeof(struct ipv6hdr) + t-&gt;encap_hlen;</div><div class='ctx'> 	unsigned int max_headroom = psh_hlen;</div><div class='add'>+	__be16 payload_protocol;</div><div class='ctx'> 	bool use_cache = false;</div><div class='ctx'> 	u8 hop_limit;</div><div class='ctx'> 	int err = -1;</div><div class='ctx'> </div><div class='add'>+	payload_protocol = skb_protocol(skb, true);</div><div class='add'>+</div><div class='ctx'> 	if (t-&gt;parms.collect_md) {</div><div class='ctx'> 		hop_limit = skb_tunnel_info(skb)-&gt;key.ttl;</div><div class='ctx'> 		goto route_lookup;</div><div class='hunk'>@@ -1061,7 +1112,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,</div><div class='ctx'> </div><div class='ctx'> 	/* NBMA tunnel */</div><div class='ctx'> 	if (ipv6_addr_any(&amp;t-&gt;parms.raddr)) {</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		if (payload_protocol == htons(ETH_P_IPV6)) {</div><div class='ctx'> 			struct in6_addr *addr6;</div><div class='ctx'> 			struct neighbour *neigh;</div><div class='ctx'> 			int addr_type;</div><div class='hunk'>@@ -1082,6 +1133,14 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,</div><div class='ctx'> </div><div class='ctx'> 			memcpy(&amp;fl6-&gt;daddr, addr6, sizeof(fl6-&gt;daddr));</div><div class='ctx'> 			neigh_release(neigh);</div><div class='add'>+		} else if (payload_protocol == htons(ETH_P_IP)) {</div><div class='add'>+			const struct rtable *rt = skb_rtable(skb);</div><div class='add'>+</div><div class='add'>+			if (!rt)</div><div class='add'>+				goto tx_err_link_failure;</div><div class='add'>+</div><div class='add'>+			if (rt-&gt;rt_gw_family == AF_INET6)</div><div class='add'>+				memcpy(&amp;fl6-&gt;daddr, &amp;rt-&gt;rt_gw6, sizeof(fl6-&gt;daddr));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (t-&gt;parms.proto != 0 &amp;&amp; !(t-&gt;parms.flags &amp;</div><div class='ctx'> 					    (IP6_TNL_F_USE_ORIG_TCLASS |</div><div class='hunk'>@@ -1120,10 +1179,10 @@ route_lookup:</div><div class='ctx'> 		ndst = dst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tdev = dst-&gt;dev;</div><div class='add'>+	tdev = dst_dev(dst);</div><div class='ctx'> </div><div class='ctx'> 	if (tdev == dev) {</div><div class='del'>-		stats-&gt;collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 		net_warn_ratelimited("%s: Local routing loop detected!\n",</div><div class='ctx'> 				     t-&gt;parms.name);</div><div class='ctx'> 		goto tx_err_dst_release;</div><div class='hunk'>@@ -1136,7 +1195,7 @@ route_lookup:</div><div class='ctx'> 	mtu = max(mtu, skb-&gt;protocol == htons(ETH_P_IPV6) ?</div><div class='ctx'> 		       IPV6_MIN_MTU : IPV4_MIN_MTU);</div><div class='ctx'> </div><div class='del'>-	skb_dst_update_pmtu(skb, mtu);</div><div class='add'>+	skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='ctx'> 	if (skb-&gt;len - t-&gt;tun_hlen - eth_hlen &gt; mtu &amp;&amp; !skb_is_gso(skb)) {</div><div class='ctx'> 		*pmtu = mtu;</div><div class='ctx'> 		err = -EMSGSIZE;</div><div class='hunk'>@@ -1184,15 +1243,10 @@ route_lookup:</div><div class='ctx'> 	}</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='ctx'> </div><div class='del'>-	if (encap_limit &gt;= 0) {</div><div class='del'>-		init_tel_txopt(&amp;opt, encap_limit);</div><div class='del'>-		ipv6_push_frag_opts(skb, &amp;opt.ops, &amp;proto);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (hop_limit == 0) {</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		if (payload_protocol == htons(ETH_P_IP))</div><div class='ctx'> 			hop_limit = ip_hdr(skb)-&gt;ttl;</div><div class='del'>-		else if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='add'>+		else if (payload_protocol == htons(ETH_P_IPV6))</div><div class='ctx'> 			hop_limit = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='ctx'> 		else</div><div class='ctx'> 			hop_limit = ip6_dst_hoplimit(dst);</div><div class='hunk'>@@ -1201,15 +1255,19 @@ route_lookup:</div><div class='ctx'> 	/* Calculate max headroom for all the headers and adjust</div><div class='ctx'> 	 * needed_headroom if necessary.</div><div class='ctx'> 	 */</div><div class='del'>-	max_headroom = LL_RESERVED_SPACE(dst-&gt;dev) + sizeof(struct ipv6hdr)</div><div class='add'>+	max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(struct ipv6hdr)</div><div class='ctx'> 			+ dst-&gt;header_len + t-&gt;hlen;</div><div class='del'>-	if (max_headroom &gt; dev-&gt;needed_headroom)</div><div class='del'>-		dev-&gt;needed_headroom = max_headroom;</div><div class='add'>+	ip_tunnel_adj_headroom(dev, max_headroom);</div><div class='ctx'> </div><div class='ctx'> 	err = ip6_tnl_encap(skb, t, &amp;proto, fl6);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (encap_limit &gt;= 0) {</div><div class='add'>+		init_tel_txopt(&amp;opt, encap_limit);</div><div class='add'>+		ipv6_push_frag_opts(skb, &amp;opt.ops, &amp;proto);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_push(skb, sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> 	ipv6h = ipv6_hdr(skb);</div><div class='hunk'>@@ -1219,10 +1277,10 @@ route_lookup:</div><div class='ctx'> 	ipv6h-&gt;nexthdr = proto;</div><div class='ctx'> 	ipv6h-&gt;saddr = fl6-&gt;saddr;</div><div class='ctx'> 	ipv6h-&gt;daddr = fl6-&gt;daddr;</div><div class='del'>-	ip6tunnel_xmit(NULL, skb, dev);</div><div class='add'>+	ip6tunnel_xmit(NULL, skb, dev, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> tx_err_link_failure:</div><div class='del'>-	stats-&gt;tx_carrier_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='ctx'> tx_err_dst_release:</div><div class='ctx'> 	dst_release(dst);</div><div class='hunk'>@@ -1231,26 +1289,22 @@ tx_err_dst_release:</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_xmit);</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+ipxip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		u8 protocol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='add'>+	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	const struct iphdr  *iph;</div><div class='ctx'> 	int encap_limit = -1;</div><div class='add'>+	__u16 offset;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='del'>-	__u8 dsfield;</div><div class='add'>+	__u8 dsfield, orig_dsfield;</div><div class='ctx'> 	__u32 mtu;</div><div class='ctx'> 	u8 tproto;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* ensure we can access the full inner ip header */</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	iph = ip_hdr(skb);</div><div class='del'>-	memset(&amp;(IPCB(skb)-&gt;opt), 0, sizeof(IPCB(skb)-&gt;opt));</div><div class='del'>-</div><div class='ctx'> 	tproto = READ_ONCE(t-&gt;parms.proto);</div><div class='del'>-	if (tproto != IPPROTO_IPIP &amp;&amp; tproto != 0)</div><div class='add'>+	if (tproto != protocol &amp;&amp; tproto != 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;parms.collect_md) {</div><div class='hunk'>@@ -1263,134 +1317,102 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		key = &amp;tun_info-&gt;key;</div><div class='ctx'> 		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-		fl6.flowi6_proto = IPPROTO_IPIP;</div><div class='add'>+		fl6.flowi6_proto = protocol;</div><div class='ctx'> 		fl6.saddr = key-&gt;u.ipv6.src;</div><div class='ctx'> 		fl6.daddr = key-&gt;u.ipv6.dst;</div><div class='ctx'> 		fl6.flowlabel = key-&gt;label;</div><div class='ctx'> 		dsfield =  key-&gt;tos;</div><div class='add'>+		switch (protocol) {</div><div class='add'>+		case IPPROTO_IPIP:</div><div class='add'>+			iph = ip_hdr(skb);</div><div class='add'>+			orig_dsfield = ipv4_get_dsfield(iph);</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_IPV6:</div><div class='add'>+			ipv6h = ipv6_hdr(skb);</div><div class='add'>+			orig_dsfield = ipv6_get_dsfield(ipv6h);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			orig_dsfield = dsfield;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='ctx'> 			encap_limit = t-&gt;parms.encap_limit;</div><div class='add'>+		if (protocol == IPPROTO_IPV6) {</div><div class='add'>+			offset = ip6_tnl_parse_tlv_enc_lim(skb,</div><div class='add'>+						skb_network_header(skb));</div><div class='add'>+			/* ip6_tnl_parse_tlv_enc_lim() might have</div><div class='add'>+			 * reallocated skb-&gt;head</div><div class='add'>+			 */</div><div class='add'>+			if (offset &gt; 0) {</div><div class='add'>+				struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;fl6, &amp;t-&gt;fl.u.ip6, sizeof(fl6));</div><div class='del'>-		fl6.flowi6_proto = IPPROTO_IPIP;</div><div class='del'>-</div><div class='del'>-		if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_TCLASS)</div><div class='del'>-			dsfield = ipv4_get_dsfield(iph);</div><div class='del'>-		else</div><div class='del'>-			dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='del'>-		if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_FWMARK)</div><div class='del'>-			fl6.flowi6_mark = skb-&gt;mark;</div><div class='del'>-		else</div><div class='del'>-			fl6.flowi6_mark = t-&gt;parms.fwmark;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);</div><div class='del'>-</div><div class='del'>-	if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	dsfield = INET_ECN_encapsulate(dsfield, ipv4_get_dsfield(iph));</div><div class='del'>-</div><div class='del'>-	skb_set_inner_ipproto(skb, IPPROTO_IPIP);</div><div class='del'>-</div><div class='del'>-	err = ip6_tnl_xmit(skb, dev, dsfield, &amp;fl6, encap_limit, &amp;mtu,</div><div class='del'>-			   IPPROTO_IPIP);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		/* XXX: send ICMP error even if DF is not set. */</div><div class='del'>-		if (err == -EMSGSIZE)</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='del'>-				  htonl(mtu));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct ipv6hdr *ipv6h;</div><div class='del'>-	int encap_limit = -1;</div><div class='del'>-	__u16 offset;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-	__u8 dsfield;</div><div class='del'>-	__u32 mtu;</div><div class='del'>-	u8 tproto;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	ipv6h = ipv6_hdr(skb);</div><div class='del'>-	tproto = READ_ONCE(t-&gt;parms.proto);</div><div class='del'>-	if ((tproto != IPPROTO_IPV6 &amp;&amp; tproto != 0) ||</div><div class='del'>-	    ip6_tnl_addr_conflict(t, ipv6h))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (t-&gt;parms.collect_md) {</div><div class='del'>-		struct ip_tunnel_info *tun_info;</div><div class='del'>-		const struct ip_tunnel_key *key;</div><div class='del'>-</div><div class='del'>-		tun_info = skb_tunnel_info(skb);</div><div class='del'>-		if (unlikely(!tun_info || !(tun_info-&gt;mode &amp; IP_TUNNEL_INFO_TX) ||</div><div class='del'>-			     ip_tunnel_info_af(tun_info) != AF_INET6))</div><div class='del'>-			return -1;</div><div class='del'>-		key = &amp;tun_info-&gt;key;</div><div class='del'>-		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-		fl6.flowi6_proto = IPPROTO_IPV6;</div><div class='del'>-		fl6.saddr = key-&gt;u.ipv6.src;</div><div class='del'>-		fl6.daddr = key-&gt;u.ipv6.dst;</div><div class='del'>-		fl6.flowlabel = key-&gt;label;</div><div class='del'>-		dsfield = key-&gt;tos;</div><div class='del'>-	} else {</div><div class='del'>-		offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));</div><div class='del'>-		/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb-&gt;head */</div><div class='del'>-		ipv6h = ipv6_hdr(skb);</div><div class='del'>-		if (offset &gt; 0) {</div><div class='del'>-			struct ipv6_tlv_tnl_enc_lim *tel;</div><div class='del'>-</div><div class='del'>-			tel = (void *)&amp;skb_network_header(skb)[offset];</div><div class='del'>-			if (tel-&gt;encap_limit == 0) {</div><div class='del'>-				icmpv6_send(skb, ICMPV6_PARAMPROB,</div><div class='del'>-					    ICMPV6_HDR_FIELD, offset + 2);</div><div class='del'>-				return -1;</div><div class='add'>+				tel = (void *)&amp;skb_network_header(skb)[offset];</div><div class='add'>+				if (tel-&gt;encap_limit == 0) {</div><div class='add'>+					icmpv6_ndo_send(skb, ICMPV6_PARAMPROB,</div><div class='add'>+							ICMPV6_HDR_FIELD, offset + 2);</div><div class='add'>+					return -1;</div><div class='add'>+				}</div><div class='add'>+				encap_limit = tel-&gt;encap_limit - 1;</div><div class='ctx'> 			}</div><div class='del'>-			encap_limit = tel-&gt;encap_limit - 1;</div><div class='del'>-		} else if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT)) {</div><div class='del'>-			encap_limit = t-&gt;parms.encap_limit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;fl6, &amp;t-&gt;fl.u.ip6, sizeof(fl6));</div><div class='del'>-		fl6.flowi6_proto = IPPROTO_IPV6;</div><div class='add'>+		fl6.flowi6_proto = protocol;</div><div class='ctx'> </div><div class='del'>-		if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_TCLASS)</div><div class='del'>-			dsfield = ipv6_get_dsfield(ipv6h);</div><div class='del'>-		else</div><div class='del'>-			dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='del'>-		if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_FLOWLABEL)</div><div class='del'>-			fl6.flowlabel |= ip6_flowlabel(ipv6h);</div><div class='ctx'> 		if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_FWMARK)</div><div class='ctx'> 			fl6.flowi6_mark = skb-&gt;mark;</div><div class='ctx'> 		else</div><div class='ctx'> 			fl6.flowi6_mark = t-&gt;parms.fwmark;</div><div class='add'>+		switch (protocol) {</div><div class='add'>+		case IPPROTO_IPIP:</div><div class='add'>+			iph = ip_hdr(skb);</div><div class='add'>+			orig_dsfield = ipv4_get_dsfield(iph);</div><div class='add'>+			if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_TCLASS)</div><div class='add'>+				dsfield = orig_dsfield;</div><div class='add'>+			else</div><div class='add'>+				dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_IPV6:</div><div class='add'>+			ipv6h = ipv6_hdr(skb);</div><div class='add'>+			orig_dsfield = ipv6_get_dsfield(ipv6h);</div><div class='add'>+			if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_TCLASS)</div><div class='add'>+				dsfield = orig_dsfield;</div><div class='add'>+			else</div><div class='add'>+				dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='add'>+			if (t-&gt;parms.flags &amp; IP6_TNL_F_USE_ORIG_FLOWLABEL)</div><div class='add'>+				fl6.flowlabel |= ip6_flowlabel(ipv6h);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			orig_dsfield = dsfield = ip6_tclass(t-&gt;parms.flowinfo);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);</div><div class='add'>+	dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);</div><div class='ctx'> </div><div class='ctx'> 	if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));</div><div class='del'>-</div><div class='del'>-	skb_set_inner_ipproto(skb, IPPROTO_IPV6);</div><div class='add'>+	skb_set_inner_ipproto(skb, protocol);</div><div class='ctx'> </div><div class='ctx'> 	err = ip6_tnl_xmit(skb, dev, dsfield, &amp;fl6, encap_limit, &amp;mtu,</div><div class='del'>-			   IPPROTO_IPV6);</div><div class='add'>+			   protocol);</div><div class='ctx'> 	if (err != 0) {</div><div class='add'>+		/* XXX: send ICMP error even if DF is not set. */</div><div class='ctx'> 		if (err == -EMSGSIZE)</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			switch (protocol) {</div><div class='add'>+			case IPPROTO_IPIP:</div><div class='add'>+				icmp_ndo_send(skb, ICMP_DEST_UNREACH,</div><div class='add'>+					      ICMP_FRAG_NEEDED, htonl(mtu));</div><div class='add'>+				break;</div><div class='add'>+			case IPPROTO_IPV6:</div><div class='add'>+				icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1401,28 +1423,37 @@ static netdev_tx_t</div><div class='ctx'> ip6_tnl_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;t-&gt;dev-&gt;stats;</div><div class='add'>+	u8 ipproto;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		ret = ip4ip6_tnl_xmit(skb, dev);</div><div class='add'>+		ipproto = IPPROTO_IPIP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case htons(ETH_P_IPV6):</div><div class='del'>-		ret = ip6ip6_tnl_xmit(skb, dev);</div><div class='add'>+		if (ip6_tnl_addr_conflict(t, ipv6_hdr(skb)))</div><div class='add'>+			goto tx_err;</div><div class='add'>+		ipproto = IPPROTO_IPV6;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_MPLS_UC):</div><div class='add'>+		ipproto = IPPROTO_MPLS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto tx_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ipxip6_tnl_xmit(skb, dev, ipproto);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto tx_err;</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_err:</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -1430,11 +1461,13 @@ tx_err:</div><div class='ctx'> static void ip6_tnl_link_config(struct ip6_tnl *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = t-&gt;dev;</div><div class='add'>+	struct net_device *tdev = NULL;</div><div class='ctx'> 	struct __ip6_tnl_parm *p = &amp;t-&gt;parms;</div><div class='ctx'> 	struct flowi6 *fl6 = &amp;t-&gt;fl.u.ip6;</div><div class='ctx'> 	int t_hlen;</div><div class='add'>+	int mtu;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='add'>+	__dev_addr_set(dev, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;p-&gt;raddr, sizeof(struct in6_addr));</div><div class='ctx'> </div><div class='ctx'> 	/* Set up flowi template */</div><div class='hunk'>@@ -1467,22 +1500,27 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)</div><div class='ctx'> 		struct rt6_info *rt = rt6_lookup(t-&gt;net,</div><div class='ctx'> 						 &amp;p-&gt;raddr, &amp;p-&gt;laddr,</div><div class='ctx'> 						 p-&gt;link, NULL, strict);</div><div class='add'>+		if (rt) {</div><div class='add'>+			tdev = rt-&gt;dst.dev;</div><div class='add'>+			ip6_rt_put(rt);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (!rt)</div><div class='del'>-			return;</div><div class='add'>+		if (!tdev &amp;&amp; p-&gt;link)</div><div class='add'>+			tdev = __dev_get_by_index(t-&gt;net, p-&gt;link);</div><div class='ctx'> </div><div class='del'>-		if (rt-&gt;dst.dev) {</div><div class='del'>-			dev-&gt;hard_header_len = rt-&gt;dst.dev-&gt;hard_header_len +</div><div class='del'>-				t_hlen;</div><div class='add'>+		if (tdev) {</div><div class='add'>+			dev-&gt;needed_headroom = tdev-&gt;hard_header_len +</div><div class='add'>+				tdev-&gt;needed_headroom + t_hlen;</div><div class='add'>+			mtu = min_t(unsigned int, tdev-&gt;mtu, IP6_MAX_MTU);</div><div class='ctx'> </div><div class='del'>-			dev-&gt;mtu = rt-&gt;dst.dev-&gt;mtu - t_hlen;</div><div class='add'>+			mtu = mtu - t_hlen;</div><div class='ctx'> 			if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='del'>-				dev-&gt;mtu -= 8;</div><div class='add'>+				mtu -= 8;</div><div class='ctx'> </div><div class='del'>-			if (dev-&gt;mtu &lt; IPV6_MIN_MTU)</div><div class='del'>-				dev-&gt;mtu = IPV6_MIN_MTU;</div><div class='add'>+			if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+				mtu = IPV6_MIN_MTU;</div><div class='add'>+			WRITE_ONCE(dev-&gt;mtu, mtu);</div><div class='ctx'> 		}</div><div class='del'>-		ip6_rt_put(rt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1495,7 +1533,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)</div><div class='ctx'>  *   ip6_tnl_change() updates the tunnel parameters</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> ip6_tnl_change(struct ip6_tnl *t, const struct __ip6_tnl_parm *p)</div><div class='ctx'> {</div><div class='ctx'> 	t-&gt;parms.laddr = p-&gt;laddr;</div><div class='hunk'>@@ -1509,26 +1547,33 @@ ip6_tnl_change(struct ip6_tnl *t, const struct __ip6_tnl_parm *p)</div><div class='ctx'> 	t-&gt;parms.fwmark = p-&gt;fwmark;</div><div class='ctx'> 	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='ctx'> 	ip6_tnl_link_config(t);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_tnl_update(struct ip6_tnl *t, struct __ip6_tnl_parm *p)</div><div class='add'>+static void ip6_tnl_update(struct ip6_tnl *t, struct __ip6_tnl_parm *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = t-&gt;net;</div><div class='ctx'> 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	ip6_tnl_unlink(ip6n, t);</div><div class='ctx'> 	synchronize_net();</div><div class='del'>-	err = ip6_tnl_change(t, p);</div><div class='add'>+	ip6_tnl_change(t, p);</div><div class='ctx'> 	ip6_tnl_link(ip6n, t);</div><div class='ctx'> 	netdev_state_change(t-&gt;dev);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_tnl0_update(struct ip6_tnl *t, struct __ip6_tnl_parm *p)</div><div class='add'>+static int ip6_tnl0_update(struct ip6_tnl *t, struct __ip6_tnl_parm *p,</div><div class='add'>+			   bool strict)</div><div class='ctx'> {</div><div class='del'>-	/* for default tnl0 device allow to change only the proto */</div><div class='add'>+	/* For the default ip6tnl0 device, allow changing only the protocol</div><div class='add'>+	 * (the IP6_TNL_F_CAP_PER_PACKET flag is set on ip6tnl0, and all other</div><div class='add'>+	 * parameters are 0).</div><div class='add'>+	 */</div><div class='add'>+	if (strict &amp;&amp;</div><div class='add'>+	    (!ipv6_addr_any(&amp;p-&gt;laddr) || !ipv6_addr_any(&amp;p-&gt;raddr) ||</div><div class='add'>+	     p-&gt;flags != t-&gt;parms.flags || p-&gt;hop_limit || p-&gt;encap_limit ||</div><div class='add'>+	     p-&gt;flowinfo || p-&gt;link || p-&gt;fwmark || p-&gt;collect_md))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	t-&gt;parms.proto = p-&gt;proto;</div><div class='ctx'> 	netdev_state_change(t-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1563,9 +1608,10 @@ ip6_tnl_parm_to_user(struct ip6_tnl_parm *u, const struct __ip6_tnl_parm *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ip6_tnl_ioctl - configure ipv6 tunnels from userspace</div><div class='add'>+ * ip6_tnl_siocdevprivate - configure ipv6 tunnels from userspace</div><div class='ctx'>  *   @dev: virtual device associated with tunnel</div><div class='del'>- *   @ifr: parameters passed from userspace</div><div class='add'>+ *   @ifr: unused</div><div class='add'>+ *   @data: parameters passed from userspace</div><div class='ctx'>  *   @cmd: command to be performed</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -1591,7 +1637,8 @@ ip6_tnl_parm_to_user(struct ip6_tnl_parm *u, const struct __ip6_tnl_parm *p)</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+ip6_tnl_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+		       void __user *data, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ip6_tnl_parm p;</div><div class='hunk'>@@ -1605,7 +1652,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGETTUNNEL:</div><div class='ctx'> 		if (dev == ip6n-&gt;fb_tnl_dev) {</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p))) {</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p))) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1617,9 +1664,8 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 		}</div><div class='ctx'> 		ip6_tnl_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-		if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p))) {</div><div class='add'>+		if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCADDTUNNEL:</div><div class='ctx'> 	case SIOCCHGTUNNEL:</div><div class='hunk'>@@ -1627,7 +1673,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+		if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (p.proto != IPPROTO_IPV6 &amp;&amp; p.proto != IPPROTO_IPIP &amp;&amp;</div><div class='hunk'>@@ -1644,14 +1690,14 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			} else</div><div class='ctx'> 				t = netdev_priv(dev);</div><div class='ctx'> 			if (dev == ip6n-&gt;fb_tnl_dev)</div><div class='del'>-				err = ip6_tnl0_update(t, &amp;p1);</div><div class='add'>+				ip6_tnl0_update(t, &amp;p1, false);</div><div class='ctx'> 			else</div><div class='del'>-				err = ip6_tnl_update(t, &amp;p1);</div><div class='add'>+				ip6_tnl_update(t, &amp;p1);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!IS_ERR(t)) {</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			ip6_tnl_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='add'>+			if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1665,7 +1711,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> 		if (dev == ip6n-&gt;fb_tnl_dev) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 				break;</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 			ip6_tnl_parm_from_user(&amp;p1, &amp;p);</div><div class='hunk'>@@ -1699,7 +1745,9 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *tnl = netdev_priv(dev);</div><div class='add'>+	int t_hlen;</div><div class='ctx'> </div><div class='add'>+	t_hlen = tnl-&gt;hlen + sizeof(struct ipv6hdr);</div><div class='ctx'> 	if (tnl-&gt;parms.proto == IPPROTO_IPV6) {</div><div class='ctx'> 		if (new_mtu &lt; IPV6_MIN_MTU)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1708,13 +1756,13 @@ int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tnl-&gt;parms.proto == IPPROTO_IPV6 || tnl-&gt;parms.proto == 0) {</div><div class='del'>-		if (new_mtu &gt; IP6_MAX_MTU - dev-&gt;hard_header_len)</div><div class='add'>+		if (new_mtu &gt; IP6_MAX_MTU - dev-&gt;hard_header_len - t_hlen)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (new_mtu &gt; IP_MAX_MTU - dev-&gt;hard_header_len)</div><div class='add'>+		if (new_mtu &gt; IP_MAX_MTU - dev-&gt;hard_header_len - t_hlen)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_change_mtu);</div><div class='hunk'>@@ -1723,7 +1771,7 @@ int ip6_tnl_get_iflink(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return t-&gt;parms.link;</div><div class='add'>+	return READ_ONCE(t-&gt;parms.link);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_get_iflink);</div><div class='ctx'> </div><div class='hunk'>@@ -1784,9 +1832,9 @@ static const struct net_device_ops ip6_tnl_netdev_ops = {</div><div class='ctx'> 	.ndo_init	= ip6_tnl_dev_init,</div><div class='ctx'> 	.ndo_uninit	= ip6_tnl_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit = ip6_tnl_start_xmit,</div><div class='del'>-	.ndo_do_ioctl	= ip6_tnl_ioctl,</div><div class='add'>+	.ndo_siocdevprivate = ip6_tnl_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu = ip6_tnl_change_mtu,</div><div class='del'>-	.ndo_get_stats	= ip6_get_stats,</div><div class='add'>+	.ndo_get_stats64 = dev_get_tstats64,</div><div class='ctx'> 	.ndo_get_iflink = ip6_tnl_get_iflink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1807,13 +1855,15 @@ static const struct net_device_ops ip6_tnl_netdev_ops = {</div><div class='ctx'> static void ip6_tnl_dev_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;ip6_tnl_netdev_ops;</div><div class='add'>+	dev-&gt;header_ops = &amp;ip_tunnel_header_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='ctx'> 	dev-&gt;priv_destructor = ip6_dev_free;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;type = ARPHRD_TUNNEL6;</div><div class='ctx'> 	dev-&gt;flags |= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;addr_len = sizeof(struct in6_addr);</div><div class='del'>-	dev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features		|= IPXIPX_FEATURES;</div><div class='hunk'>@@ -1838,14 +1888,10 @@ ip6_tnl_dev_init_gen(struct net_device *dev)</div><div class='ctx'> 	int t_hlen;</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;dev = dev;</div><div class='del'>-	t-&gt;net = dev_net(dev);</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = dst_cache_init(&amp;t-&gt;dst_cache, GFP_KERNEL);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto free_stats;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = gro_cells_init(&amp;t-&gt;gro_cells, dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1856,20 +1902,18 @@ ip6_tnl_dev_init_gen(struct net_device *dev)</div><div class='ctx'> 	t_hlen = t-&gt;hlen + sizeof(struct ipv6hdr);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;type = ARPHRD_TUNNEL6;</div><div class='del'>-	dev-&gt;hard_header_len = LL_MAX_HEADER + t_hlen;</div><div class='ctx'> 	dev-&gt;mtu = ETH_DATA_LEN - t_hlen;</div><div class='ctx'> 	if (!(t-&gt;parms.flags &amp; IP6_TNL_F_IGN_ENCAP_LIMIT))</div><div class='ctx'> 		dev-&gt;mtu -= 8;</div><div class='ctx'> 	dev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='del'>-	dev-&gt;max_mtu = IP6_MAX_MTU - dev-&gt;hard_header_len;</div><div class='add'>+	dev-&gt;max_mtu = IP6_MAX_MTU - dev-&gt;hard_header_len - t_hlen;</div><div class='ctx'> </div><div class='add'>+	netdev_hold(dev, &amp;t-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> destroy_dst:</div><div class='ctx'> 	dst_cache_destroy(&amp;t-&gt;dst_cache);</div><div class='del'>-free_stats:</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='del'>-	dev-&gt;tstats = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1887,10 +1931,8 @@ static int ip6_tnl_dev_init(struct net_device *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	ip6_tnl_link_config(t);</div><div class='del'>-	if (t-&gt;parms.collect_md) {</div><div class='del'>-		dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	if (t-&gt;parms.collect_md)</div><div class='ctx'> 		netif_keep_dst(dev);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1907,8 +1949,8 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='ctx'> </div><div class='add'>+	t-&gt;net = net;</div><div class='ctx'> 	t-&gt;parms.proto = IPPROTO_IPV6;</div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(ip6n-&gt;tnls_wc[0], t);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1970,52 +2012,24 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 		parms-&gt;fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],</div><div class='del'>-					struct ip_tunnel_encap *ipencap)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	memset(ipencap, 0, sizeof(*ipencap));</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_TYPE]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;type = nla_get_u16(data[IFLA_IPTUN_ENCAP_TYPE]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_FLAGS]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;flags = nla_get_u16(data[IFLA_IPTUN_ENCAP_FLAGS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_SPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_DPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			   struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ip6_tnl_newlink(struct net_device *dev,</div><div class='add'>+			   struct rtnl_newlink_params *params,</div><div class='ctx'> 			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='add'>+	struct ip6_tnl_net *ip6n;</div><div class='ctx'> 	struct ip6_tnl *nt, *t;</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	net = params-&gt;link_net ? : dev_net(dev);</div><div class='add'>+	ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='ctx'> 	nt = netdev_priv(dev);</div><div class='add'>+	nt-&gt;net = net;</div><div class='ctx'> </div><div class='del'>-	if (ip6_tnl_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		err = ip6_tnl_encap_setup(nt, &amp;ipencap);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -2049,10 +2063,30 @@ static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='ctx'> </div><div class='del'>-	if (dev == ip6n-&gt;fb_tnl_dev)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (dev == ip6n-&gt;fb_tnl_dev) {</div><div class='add'>+		if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+			/* iproute2 always sets TUNNEL_ENCAP_FLAG_CSUM6, so</div><div class='add'>+			 * let's ignore this flag.</div><div class='add'>+			 */</div><div class='add'>+			ipencap.flags &amp;= ~TUNNEL_ENCAP_FLAG_CSUM6;</div><div class='add'>+			if (memchr_inv(&amp;ipencap, 0, sizeof(ipencap))) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "Only protocol can be changed for fallback tunnel, not encap params");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ip6_tnl_netlink_parms(data, &amp;p);</div><div class='add'>+		if (ip6_tnl0_update(t, &amp;p, true) &lt; 0) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Only protocol can be changed for fallback tunnel");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ip6_tnl_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		int err = ip6_tnl_encap_setup(t, &amp;ipencap);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -2069,7 +2103,8 @@ static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	} else</div><div class='ctx'> 		t = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return ip6_tnl_update(t, &amp;p);</div><div class='add'>+	ip6_tnl_update(t, &amp;p);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6_tnl_dellink(struct net_device *dev, struct list_head *head)</div><div class='hunk'>@@ -2151,7 +2186,7 @@ struct net *ip6_tnl_get_link_net(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return tunnel-&gt;net;</div><div class='add'>+	return READ_ONCE(tunnel-&gt;net);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_tnl_get_link_net);</div><div class='ctx'> </div><div class='hunk'>@@ -2199,7 +2234,13 @@ static struct xfrm6_tunnel ip6ip6_handler __read_mostly = {</div><div class='ctx'> 	.priority	=	1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __net_exit ip6_tnl_destroy_tunnels(struct net *net, struct list_head *list)</div><div class='add'>+static struct xfrm6_tunnel mplsip6_handler __read_mostly = {</div><div class='add'>+	.handler	= mplsip6_rcv,</div><div class='add'>+	.err_handler	= mplsip6_err,</div><div class='add'>+	.priority	=	1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __net_exit ip6_tnl_exit_rtnl_net(struct net *net, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='hunk'>@@ -2211,16 +2252,28 @@ static void __net_exit ip6_tnl_destroy_tunnels(struct net *net, struct list_head</div><div class='ctx'> 			unregister_netdevice_queue(dev, list);</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; IP6_TUNNEL_HASH_SIZE; h++) {</div><div class='del'>-		t = rtnl_dereference(ip6n-&gt;tnls_r_l[h]);</div><div class='add'>+		t = rtnl_net_dereference(net, ip6n-&gt;tnls_r_l[h]);</div><div class='ctx'> 		while (t) {</div><div class='ctx'> 			/* If dev is in the same netns, it has already</div><div class='ctx'> 			 * been added to the list by the previous loop.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!net_eq(dev_net(t-&gt;dev), net))</div><div class='ctx'> 				unregister_netdevice_queue(t-&gt;dev, list);</div><div class='del'>-			t = rtnl_dereference(t-&gt;next);</div><div class='add'>+</div><div class='add'>+			t = rtnl_net_dereference(net, t-&gt;next);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	t = rtnl_net_dereference(net, ip6n-&gt;tnls_wc[0]);</div><div class='add'>+	while (t) {</div><div class='add'>+		/* If dev is in the same netns, it has already</div><div class='add'>+		 * been added to the list by the previous loop.</div><div class='add'>+		 */</div><div class='add'>+		if (!net_eq(dev_net(t-&gt;dev), net))</div><div class='add'>+			unregister_netdevice_queue(t-&gt;dev, list);</div><div class='add'>+</div><div class='add'>+		t = rtnl_net_dereference(net, t-&gt;next);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __net_init ip6_tnl_init_net(struct net *net)</div><div class='hunk'>@@ -2245,7 +2298,7 @@ static int __net_init ip6_tnl_init_net(struct net *net)</div><div class='ctx'> 	/* FB netdevice is special: we have one, and only one per netns.</div><div class='ctx'> 	 * Allowing to move it to another netns is clearly unsafe.</div><div class='ctx'> 	 */</div><div class='del'>-	ip6n-&gt;fb_tnl_dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	ip6n-&gt;fb_tnl_dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='ctx'> 	err = ip6_fb_tnl_dev_init(ip6n-&gt;fb_tnl_dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -2266,21 +2319,9 @@ err_alloc_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ip6_tnl_exit_batch_net(struct list_head *net_list)</div><div class='del'>-{</div><div class='del'>-	struct net *net;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry(net, net_list, exit_list)</div><div class='del'>-		ip6_tnl_destroy_tunnels(net, &amp;list);</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations ip6_tnl_net_ops = {</div><div class='ctx'> 	.init = ip6_tnl_init_net,</div><div class='del'>-	.exit_batch = ip6_tnl_exit_batch_net,</div><div class='add'>+	.exit_rtnl = ip6_tnl_exit_rtnl_net,</div><div class='ctx'> 	.id   = &amp;ip6_tnl_net_id,</div><div class='ctx'> 	.size = sizeof(struct ip6_tnl_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -2313,6 +2354,15 @@ static int __init ip6_tunnel_init(void)</div><div class='ctx'> 		pr_err("%s: can't register ip6ip6\n", __func__);</div><div class='ctx'> 		goto out_ip6ip6;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (ip6_tnl_mpls_supported()) {</div><div class='add'>+		err = xfrm6_tunnel_register(&amp;mplsip6_handler, AF_MPLS);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			pr_err("%s: can't register mplsip6\n", __func__);</div><div class='add'>+			goto out_mplsip6;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = rtnl_link_register(&amp;ip6_link_ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto rtnl_link_failed;</div><div class='hunk'>@@ -2320,6 +2370,9 @@ static int __init ip6_tunnel_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> rtnl_link_failed:</div><div class='add'>+	if (ip6_tnl_mpls_supported())</div><div class='add'>+		xfrm6_tunnel_deregister(&amp;mplsip6_handler, AF_MPLS);</div><div class='add'>+out_mplsip6:</div><div class='ctx'> 	xfrm6_tunnel_deregister(&amp;ip6ip6_handler, AF_INET6);</div><div class='ctx'> out_ip6ip6:</div><div class='ctx'> 	xfrm6_tunnel_deregister(&amp;ip4ip6_handler, AF_INET);</div><div class='hunk'>@@ -2342,6 +2395,9 @@ static void __exit ip6_tunnel_cleanup(void)</div><div class='ctx'> 	if (xfrm6_tunnel_deregister(&amp;ip6ip6_handler, AF_INET6))</div><div class='ctx'> 		pr_info("%s: can't deregister ip6ip6\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (ip6_tnl_mpls_supported() &amp;&amp;</div><div class='add'>+	    xfrm6_tunnel_deregister(&amp;mplsip6_handler, AF_MPLS))</div><div class='add'>+		pr_info("%s: can't deregister mplsip6\n", __func__);</div><div class='ctx'> 	unregister_pernet_device(&amp;ip6_tnl_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c<br/>index b283f293ee4a..cef3e0210744 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_udp_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_udp_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_udp_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_udp_tunnel.c</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -15,7 +17,7 @@</div><div class='ctx'> int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 		     struct socket **sockp)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_in6 udp6_addr;</div><div class='add'>+	struct sockaddr_in6 udp6_addr = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct socket *sock = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -24,10 +26,12 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;ipv6_v6only) {</div><div class='del'>-		int val = 1;</div><div class='del'>-</div><div class='del'>-		err = kernel_setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,</div><div class='del'>-					(char *) &amp;val, sizeof(val));</div><div class='add'>+		err = ip6_sock_set_v6only(sock-&gt;sk);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	if (cfg-&gt;bind_ifindex) {</div><div class='add'>+		err = sock_bindtoindex(sock-&gt;sk, cfg-&gt;bind_ifindex, true);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -36,18 +40,19 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,</div><div class='ctx'> 	memcpy(&amp;udp6_addr.sin6_addr, &amp;cfg-&gt;local_ip6,</div><div class='ctx'> 	       sizeof(udp6_addr.sin6_addr));</div><div class='ctx'> 	udp6_addr.sin6_port = cfg-&gt;local_udp_port;</div><div class='del'>-	err = kernel_bind(sock, (struct sockaddr *)&amp;udp6_addr,</div><div class='add'>+	err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;udp6_addr,</div><div class='ctx'> 			  sizeof(udp6_addr));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;peer_udp_port) {</div><div class='add'>+		memset(&amp;udp6_addr, 0, sizeof(udp6_addr));</div><div class='ctx'> 		udp6_addr.sin6_family = AF_INET6;</div><div class='ctx'> 		memcpy(&amp;udp6_addr.sin6_addr, &amp;cfg-&gt;peer_ip6,</div><div class='ctx'> 		       sizeof(udp6_addr.sin6_addr));</div><div class='ctx'> 		udp6_addr.sin6_port = cfg-&gt;peer_udp_port;</div><div class='ctx'> 		err = kernel_connect(sock,</div><div class='del'>-				     (struct sockaddr *)&amp;udp6_addr,</div><div class='add'>+				     (struct sockaddr_unsized *)&amp;udp6_addr,</div><div class='ctx'> 				     sizeof(udp6_addr), 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -69,12 +74,14 @@ error:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_sock_create6);</div><div class='ctx'> </div><div class='del'>-int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			 struct sk_buff *skb,</div><div class='del'>-			 struct net_device *dev, struct in6_addr *saddr,</div><div class='del'>-			 struct in6_addr *daddr,</div><div class='del'>-			 __u8 prio, __u8 ttl, __be32 label,</div><div class='del'>-			 __be16 src_port, __be16 dst_port, bool nocheck)</div><div class='add'>+void udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,</div><div class='add'>+			  struct sk_buff *skb,</div><div class='add'>+			  struct net_device *dev,</div><div class='add'>+			  const struct in6_addr *saddr,</div><div class='add'>+			  const struct in6_addr *daddr,</div><div class='add'>+			  __u8 prio, __u8 ttl, __be32 label,</div><div class='add'>+			  __be16 src_port, __be16 dst_port, bool nocheck,</div><div class='add'>+			  u16 ip6cb_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct udphdr *uh;</div><div class='ctx'> 	struct ipv6hdr *ip6h;</div><div class='hunk'>@@ -102,9 +109,78 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,</div><div class='ctx'> 	ip6h-&gt;daddr	  = *daddr;</div><div class='ctx'> 	ip6h-&gt;saddr	  = *saddr;</div><div class='ctx'> </div><div class='del'>-	ip6tunnel_xmit(sk, skb, dev);</div><div class='del'>-	return 0;</div><div class='add'>+	ip6tunnel_xmit(sk, skb, dev, ip6cb_flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *      udp_tunnel6_dst_lookup - perform route lookup on UDP tunnel</div><div class='add'>+ *      @skb: Packet for which lookup is done</div><div class='add'>+ *      @dev: Tunnel device</div><div class='add'>+ *      @net: Network namespace of tunnel device</div><div class='add'>+ *      @sock: Socket which provides route info</div><div class='add'>+ *      @oif: Index of the output interface</div><div class='add'>+ *      @saddr: Memory to store the src ip address</div><div class='add'>+ *      @key: Tunnel information</div><div class='add'>+ *      @sport: UDP source port</div><div class='add'>+ *      @dport: UDP destination port</div><div class='add'>+ *      @dsfield: The traffic class field</div><div class='add'>+ *      @dst_cache: The dst cache to use for lookup</div><div class='add'>+ *      This function performs a route lookup on a UDP tunnel</div><div class='add'>+ *</div><div class='add'>+ *      It returns a valid dst pointer and stores src address to be used in</div><div class='add'>+ *      tunnel in param saddr on success, else a pointer encoded error code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct dst_entry *udp_tunnel6_dst_lookup(struct sk_buff *skb,</div><div class='add'>+					 struct net_device *dev,</div><div class='add'>+					 struct net *net,</div><div class='add'>+					 struct socket *sock,</div><div class='add'>+					 int oif,</div><div class='add'>+					 struct in6_addr *saddr,</div><div class='add'>+					 const struct ip_tunnel_key *key,</div><div class='add'>+					 __be16 sport, __be16 dport, u8 dsfield,</div><div class='add'>+					 struct dst_cache *dst_cache)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct flowi6 fl6;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	if (dst_cache) {</div><div class='add'>+		dst = dst_cache_get_ip6(dst_cache, saddr);</div><div class='add'>+		if (dst)</div><div class='add'>+			return dst;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+	fl6.flowi6_mark = skb-&gt;mark;</div><div class='add'>+	fl6.flowi6_proto = IPPROTO_UDP;</div><div class='add'>+	fl6.flowi6_oif = oif;</div><div class='add'>+	fl6.daddr = key-&gt;u.ipv6.dst;</div><div class='add'>+	fl6.saddr = key-&gt;u.ipv6.src;</div><div class='add'>+	fl6.fl6_sport = sport;</div><div class='add'>+	fl6.fl6_dport = dport;</div><div class='add'>+	fl6.flowlabel = ip6_make_flowinfo(dsfield, key-&gt;label);</div><div class='add'>+</div><div class='add'>+	dst = ipv6_stub-&gt;ipv6_dst_lookup_flow(net, sock-&gt;sk, &amp;fl6,</div><div class='add'>+					      NULL);</div><div class='add'>+	if (IS_ERR(dst)) {</div><div class='add'>+		netdev_dbg(dev, "no route to %pI6\n", &amp;fl6.daddr);</div><div class='add'>+		return ERR_PTR(-ENETUNREACH);</div><div class='add'>+	}</div><div class='add'>+	if (dst_dev(dst) == dev) { /* is this necessary? */</div><div class='add'>+		netdev_dbg(dev, "circular route to %pI6\n", &amp;fl6.daddr);</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		return ERR_PTR(-ELOOP);</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_DST_CACHE</div><div class='add'>+	if (dst_cache)</div><div class='add'>+		dst_cache_set_ip6(dst_cache, dst, &amp;fl6.saddr);</div><div class='add'>+#endif</div><div class='add'>+	*saddr = fl6.saddr;</div><div class='add'>+	return dst;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(udp_tunnel6_dst_lookup);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("IPv6 Foo over UDP tunnel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c<br/>index eeaf7455d51e..ad5290be4dd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_vti.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6_vti.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6_vti.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6_vti.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 virtual tunneling interface</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,11 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on:</div><div class='ctx'>  *	net/ipv6/ip6_tunnel.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -49,6 +45,7 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IP6_VTI_HASH_SIZE_SHIFT  5</div><div class='hunk'>@@ -129,6 +126,7 @@ vti6_tnl_lookup(struct net *net, const struct in6_addr *remote,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vti6_tnl_bucket - get head of list matching given tunnel parameters</div><div class='add'>+ *   @ip6n: the private data for ip6_vti in the netns</div><div class='ctx'>  *   @p: parameters containing tunnel end-points</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -157,7 +155,7 @@ vti6_tnl_link(struct vti6_net *ip6n, struct ip6_tnl *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl __rcu **tp = vti6_tnl_bucket(ip6n, &amp;t-&gt;parms);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(t-&gt;next , rtnl_dereference(*tp));</div><div class='add'>+	rcu_assign_pointer(t-&gt;next, rtnl_dereference(*tp));</div><div class='ctx'> 	rcu_assign_pointer(*tp, t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -177,16 +175,10 @@ vti6_tnl_unlink(struct vti6_net *ip6n, struct ip6_tnl *t)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vti6_dev_free(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int vti6_tnl_create2(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct vti6_net *ip6n = net_generic(net, vti6_net_id);</div><div class='add'>+	struct vti6_net *ip6n = net_generic(t-&gt;net, vti6_net_id);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;rtnl_link_ops = &amp;vti6_link_ops;</div><div class='hunk'>@@ -196,7 +188,6 @@ static int vti6_tnl_create2(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	strcpy(t-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> 	vti6_tnl_link(ip6n, t);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -215,7 +206,7 @@ static struct ip6_tnl *vti6_tnl_create(struct net *net, struct __ip6_tnl_parm *p</div><div class='ctx'> 	if (p-&gt;name[0]) {</div><div class='ctx'> 		if (!dev_valid_name(p-&gt;name))</div><div class='ctx'> 			goto failed;</div><div class='del'>-		strlcpy(name, p-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, p-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sprintf(name, "ip6_vti%%d");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -297,10 +288,11 @@ static void vti6_dev_uninit(struct net_device *dev)</div><div class='ctx'> 		RCU_INIT_POINTER(ip6n-&gt;tnls_wc[0], NULL);</div><div class='ctx'> 	else</div><div class='ctx'> 		vti6_tnl_unlink(ip6n, t);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;t-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vti6_rcv(struct sk_buff *skb)</div><div class='add'>+static int vti6_input_proto(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='add'>+			    int encap_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t;</div><div class='ctx'> 	const struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='hunk'>@@ -315,18 +307,22 @@ static int vti6_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-			return 0;</div><div class='add'>+			goto discard;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 		if (!ip6_tnl_rcv_ctl(t, &amp;ipv6h-&gt;daddr, &amp;ipv6h-&gt;saddr)) {</div><div class='del'>-			t-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+			DEV_STATS_INC(t-&gt;dev, rx_dropped);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		return xfrm6_rcv_tnl(skb, t);</div><div class='add'>+		XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip6 = t;</div><div class='add'>+		XFRM_SPI_SKB_CB(skb)-&gt;family = AF_INET6;</div><div class='add'>+		XFRM_SPI_SKB_CB(skb)-&gt;daddroff = offsetof(struct ipv6hdr, daddr);</div><div class='add'>+		return xfrm_input(skb, nexthdr, spi, encap_type);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -335,13 +331,19 @@ discard:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vti6_rcv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int nexthdr = skb_network_header(skb)[IP6CB(skb)-&gt;nhoff];</div><div class='add'>+</div><div class='add'>+	return vti6_input_proto(skb, nexthdr, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vti6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short family;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct pcpu_sw_netstats *tstats;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='del'>-	struct xfrm_mode *inner_mode;</div><div class='add'>+	const struct xfrm_mode *inner_mode;</div><div class='ctx'> 	struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip6;</div><div class='ctx'> 	u32 orig_mark = skb-&gt;mark;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -352,15 +354,15 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> 	dev = t-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev-&gt;stats.rx_errors++;</div><div class='del'>-		dev-&gt;stats.rx_dropped++;</div><div class='add'>+		DEV_STATS_INC(dev, rx_errors);</div><div class='add'>+		DEV_STATS_INC(dev, rx_dropped);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	x = xfrm_input_state(skb);</div><div class='ctx'> </div><div class='del'>-	inner_mode = x-&gt;inner_mode;</div><div class='add'>+	inner_mode = &amp;x-&gt;inner_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;sel.family == AF_UNSPEC) {</div><div class='ctx'> 		inner_mode = xfrm_ip2inner_mode(x, XFRM_MODE_SKB_CB(skb)-&gt;protocol);</div><div class='hunk'>@@ -371,7 +373,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	family = inner_mode-&gt;afinfo-&gt;family;</div><div class='add'>+	family = inner_mode-&gt;family;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;mark = be32_to_cpu(t-&gt;parms.i_key);</div><div class='ctx'> 	ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);</div><div class='hunk'>@@ -382,12 +384,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> </div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(t-&gt;net, dev_net(skb-&gt;dev)));</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	tstats = this_cpu_ptr(dev-&gt;tstats);</div><div class='del'>-	u64_stats_update_begin(&amp;tstats-&gt;syncp);</div><div class='del'>-	tstats-&gt;rx_packets++;</div><div class='del'>-	tstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;tstats-&gt;syncp);</div><div class='add'>+	dev_sw_netstats_rx_add(dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -444,7 +441,6 @@ static int</div><div class='ctx'> vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;t-&gt;dev-&gt;stats;</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	struct net_device *tdev;</div><div class='ctx'> 	struct xfrm_state *x;</div><div class='hunk'>@@ -452,17 +448,47 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)</div><div class='ctx'> 	int err = -1;</div><div class='ctx'> 	int mtu;</div><div class='ctx'> </div><div class='del'>-	if (!dst)</div><div class='del'>-		goto tx_err_link_failure;</div><div class='add'>+	if (!dst) {</div><div class='add'>+		switch (skb-&gt;protocol) {</div><div class='add'>+		case htons(ETH_P_IP): {</div><div class='add'>+			struct rtable *rt;</div><div class='add'>+</div><div class='add'>+			fl-&gt;u.ip4.flowi4_oif = dev-&gt;ifindex;</div><div class='add'>+			fl-&gt;u.ip4.flowi4_flags |= FLOWI_FLAG_ANYSRC;</div><div class='add'>+			rt = __ip_route_output_key(dev_net(dev), &amp;fl-&gt;u.ip4);</div><div class='add'>+			if (IS_ERR(rt))</div><div class='add'>+				goto tx_err_link_failure;</div><div class='add'>+			dst = &amp;rt-&gt;dst;</div><div class='add'>+			skb_dst_set(skb, dst);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			fl-&gt;u.ip6.flowi6_oif = dev-&gt;ifindex;</div><div class='add'>+			fl-&gt;u.ip6.flowi6_flags |= FLOWI_FLAG_ANYSRC;</div><div class='add'>+			dst = ip6_route_output(dev_net(dev), NULL, &amp;fl-&gt;u.ip6);</div><div class='add'>+			if (dst-&gt;error) {</div><div class='add'>+				dst_release(dst);</div><div class='add'>+				dst = NULL;</div><div class='add'>+				goto tx_err_link_failure;</div><div class='add'>+			}</div><div class='add'>+			skb_dst_set(skb, dst);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto tx_err_link_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dst_hold(dst);</div><div class='del'>-	dst = xfrm_lookup(t-&gt;net, dst, fl, NULL, 0);</div><div class='add'>+	dst = xfrm_lookup_route(t-&gt;net, dst, fl, NULL, 0);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		dst = NULL;</div><div class='ctx'> 		goto tx_err_link_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dst-&gt;flags &amp; DST_XFRM_QUEUE)</div><div class='add'>+		goto xmit;</div><div class='add'>+</div><div class='ctx'> 	x = dst-&gt;xfrm;</div><div class='ctx'> 	if (!vti6_state_check(x, &amp;t-&gt;parms.raddr, &amp;t-&gt;parms.laddr))</div><div class='ctx'> 		goto tx_err_link_failure;</div><div class='hunk'>@@ -471,10 +497,10 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)</div><div class='ctx'> 			      (const struct in6_addr *)&amp;x-&gt;id.daddr))</div><div class='ctx'> 		goto tx_err_link_failure;</div><div class='ctx'> </div><div class='del'>-	tdev = dst-&gt;dev;</div><div class='add'>+	tdev = dst_dev(dst);</div><div class='ctx'> </div><div class='ctx'> 	if (tdev == dev) {</div><div class='del'>-		stats-&gt;collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 		net_warn_ratelimited("%s: Local routing loop detected!\n",</div><div class='ctx'> 				     t-&gt;parms.name);</div><div class='ctx'> 		goto tx_err_dst_release;</div><div class='hunk'>@@ -482,25 +508,28 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)</div><div class='ctx'> </div><div class='ctx'> 	mtu = dst_mtu(dst);</div><div class='ctx'> 	if (skb-&gt;len &gt; mtu) {</div><div class='del'>-		skb_dst_update_pmtu(skb, mtu);</div><div class='add'>+		skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='ctx'> 			if (mtu &lt; IPV6_MIN_MTU)</div><div class='ctx'> 				mtu = IPV6_MIN_MTU;</div><div class='ctx'> </div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 		} else {</div><div class='del'>-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='del'>-				  htonl(mtu));</div><div class='add'>+			if (!(ip_hdr(skb)-&gt;frag_off &amp; htons(IP_DF)))</div><div class='add'>+				goto xmit;</div><div class='add'>+			icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,</div><div class='add'>+				      htonl(mtu));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = -EMSGSIZE;</div><div class='ctx'> 		goto tx_err_dst_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+xmit:</div><div class='ctx'> 	skb_scrub_packet(skb, !net_eq(t-&gt;net, dev_net(dev)));</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='del'>-	skb-&gt;dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	skb-&gt;dev = dst_dev(dst);</div><div class='ctx'> </div><div class='ctx'> 	err = dst_output(t-&gt;net, skb-&gt;sk, skb);</div><div class='ctx'> 	if (net_xmit_eval(err) == 0)</div><div class='hunk'>@@ -509,7 +538,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> tx_err_link_failure:</div><div class='del'>-	stats-&gt;tx_carrier_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='ctx'> tx_err_dst_release:</div><div class='ctx'> 	dst_release(dst);</div><div class='hunk'>@@ -520,27 +549,26 @@ static netdev_tx_t</div><div class='ctx'> vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;t-&gt;dev-&gt;stats;</div><div class='del'>-	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct flowi fl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;fl, 0, sizeof(fl));</div><div class='ctx'> </div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IPV6):</div><div class='del'>-		ipv6h = ipv6_hdr(skb);</div><div class='del'>-</div><div class='ctx'> 		if ((t-&gt;parms.proto != IPPROTO_IPV6 &amp;&amp; t-&gt;parms.proto != 0) ||</div><div class='del'>-		    vti6_addr_conflict(t, ipv6h))</div><div class='add'>+		    vti6_addr_conflict(t, ipv6_hdr(skb)))</div><div class='ctx'> 			goto tx_err;</div><div class='ctx'> </div><div class='del'>-		xfrm_decode_session(skb, &amp;fl, AF_INET6);</div><div class='ctx'> 		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));</div><div class='add'>+		xfrm_decode_session(dev_net(dev), skb, &amp;fl, AF_INET6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='del'>-		xfrm_decode_session(skb, &amp;fl, AF_INET);</div><div class='ctx'> 		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));</div><div class='add'>+		xfrm_decode_session(dev_net(dev), skb, &amp;fl, AF_INET);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto tx_err;</div><div class='hunk'>@@ -556,8 +584,8 @@ vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_err:</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -625,7 +653,7 @@ static void vti6_link_config(struct ip6_tnl *t, bool keep_mtu)</div><div class='ctx'> 	struct net_device *tdev = NULL;</div><div class='ctx'> 	int mtu;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='add'>+	__dev_addr_set(dev, &amp;p-&gt;laddr, sizeof(struct in6_addr));</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;p-&gt;raddr, sizeof(struct in6_addr));</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;flags &amp;= ~(IP6_TNL_F_CAP_XMIT | IP6_TNL_F_CAP_RCV |</div><div class='hunk'>@@ -638,7 +666,8 @@ static void vti6_link_config(struct ip6_tnl *t, bool keep_mtu)</div><div class='ctx'> 		dev-&gt;flags &amp;= ~IFF_POINTOPOINT;</div><div class='ctx'> </div><div class='ctx'> 	if (keep_mtu &amp;&amp; dev-&gt;mtu) {</div><div class='del'>-		dev-&gt;mtu = clamp(dev-&gt;mtu, dev-&gt;min_mtu, dev-&gt;max_mtu);</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu,</div><div class='add'>+			   clamp(dev-&gt;mtu, dev-&gt;min_mtu, dev-&gt;max_mtu));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -736,13 +765,14 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vti6_ioctl - configure vti6 tunnels from userspace</div><div class='add'>+ * vti6_siocdevprivate - configure vti6 tunnels from userspace</div><div class='ctx'>  *   @dev: virtual device associated with tunnel</div><div class='del'>- *   @ifr: parameters passed from userspace</div><div class='add'>+ *   @ifr: unused</div><div class='add'>+ *   @data: parameters passed from userspace</div><div class='ctx'>  *   @cmd: command to be performed</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *   vti6_ioctl() is used for managing vti6 tunnels</div><div class='add'>+ *   vti6_siocdevprivate() is used for managing vti6 tunnels</div><div class='ctx'>  *   from userspace.</div><div class='ctx'>  *</div><div class='ctx'>  *   The possible commands are the following:</div><div class='hunk'>@@ -763,7 +793,7 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p)</div><div class='ctx'>  *   %-ENODEV if attempting to change or delete a nonexisting device</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='del'>-vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+vti6_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ip6_tnl_parm2 p;</div><div class='hunk'>@@ -772,10 +802,12 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct vti6_net *ip6n = net_generic(net, vti6_net_id);</div><div class='ctx'> </div><div class='add'>+	memset(&amp;p1, 0, sizeof(p1));</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGETTUNNEL:</div><div class='ctx'> 		if (dev == ip6n-&gt;fb_tnl_dev) {</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p))) {</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p))) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -787,7 +819,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		if (!t)</div><div class='ctx'> 			t = netdev_priv(dev);</div><div class='ctx'> 		vti6_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-		if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='add'>+		if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCADDTUNNEL:</div><div class='hunk'>@@ -796,7 +828,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+		if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (p.proto != IPPROTO_IPV6  &amp;&amp; p.proto != 0)</div><div class='hunk'>@@ -817,7 +849,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		if (t) {</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			vti6_parm_to_user(&amp;p, &amp;t-&gt;parms);</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p, sizeof(p)))</div><div class='add'>+			if (copy_to_user(data, &amp;p, sizeof(p)))</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		} else</div><div class='hunk'>@@ -830,7 +862,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> 		if (dev == ip6n-&gt;fb_tnl_dev) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='add'>+			if (copy_from_user(&amp;p, data, sizeof(p)))</div><div class='ctx'> 				break;</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 			vti6_parm_from_user(&amp;p1, &amp;p);</div><div class='hunk'>@@ -855,8 +887,7 @@ static const struct net_device_ops vti6_netdev_ops = {</div><div class='ctx'> 	.ndo_init	= vti6_dev_init,</div><div class='ctx'> 	.ndo_uninit	= vti6_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit = vti6_tnl_xmit,</div><div class='del'>-	.ndo_do_ioctl	= vti6_ioctl,</div><div class='del'>-	.ndo_get_stats64 = ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_siocdevprivate = vti6_siocdevprivate,</div><div class='ctx'> 	.ndo_get_iflink = ip6_tnl_get_iflink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -870,9 +901,10 @@ static const struct net_device_ops vti6_netdev_ops = {</div><div class='ctx'> static void vti6_dev_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;vti6_netdev_ops;</div><div class='add'>+	dev-&gt;header_ops = &amp;ip_tunnel_header_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='del'>-	dev-&gt;priv_destructor = vti6_dev_free;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;</div><div class='ctx'> 	dev-&gt;type = ARPHRD_TUNNEL6;</div><div class='ctx'> 	dev-&gt;min_mtu = IPV4_MIN_MTU;</div><div class='ctx'> 	dev-&gt;max_mtu = IP_MAX_MTU - sizeof(struct ipv6hdr);</div><div class='hunk'>@@ -893,10 +925,8 @@ static inline int vti6_dev_init_gen(struct net_device *dev)</div><div class='ctx'> 	struct ip6_tnl *t = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;dev = dev;</div><div class='del'>-	t-&gt;net = dev_net(dev);</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	netdev_hold(dev, &amp;t-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -927,8 +957,8 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev)</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct vti6_net *ip6n = net_generic(net, vti6_net_id);</div><div class='ctx'> </div><div class='add'>+	t-&gt;net = net;</div><div class='ctx'> 	t-&gt;parms.proto = IPPROTO_IPV6;</div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(ip6n-&gt;tnls_wc[0], t);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -967,17 +997,20 @@ static void vti6_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 		parms-&gt;fwmark = nla_get_u32(data[IFLA_VTI_FWMARK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vti6_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int vti6_newlink(struct net_device *dev,</div><div class='add'>+			struct rtnl_newlink_params *params,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='ctx'> 	struct ip6_tnl *nt;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='add'>+	net = params-&gt;link_net ? : dev_net(dev);</div><div class='ctx'> 	nt = netdev_priv(dev);</div><div class='ctx'> 	vti6_netlink_parms(data, &amp;nt-&gt;parms);</div><div class='ctx'> </div><div class='ctx'> 	nt-&gt;parms.proto = IPPROTO_IPV6;</div><div class='add'>+	nt-&gt;net = net;</div><div class='ctx'> </div><div class='ctx'> 	if (vti6_locate(net, &amp;nt-&gt;parms, 0))</div><div class='ctx'> 		return -EEXIST;</div><div class='hunk'>@@ -1079,21 +1112,21 @@ static struct rtnl_link_ops vti6_link_ops __read_mostly = {</div><div class='ctx'> 	.get_link_net	= ip6_tnl_get_link_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __net_exit vti6_destroy_tunnels(struct vti6_net *ip6n,</div><div class='del'>-					    struct list_head *list)</div><div class='add'>+static void __net_exit vti6_exit_rtnl_net(struct net *net, struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	int h;</div><div class='add'>+	struct vti6_net *ip6n = net_generic(net, vti6_net_id);</div><div class='ctx'> 	struct ip6_tnl *t;</div><div class='add'>+	int h;</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; IP6_VTI_HASH_SIZE; h++) {</div><div class='del'>-		t = rtnl_dereference(ip6n-&gt;tnls_r_l[h]);</div><div class='add'>+		t = rtnl_net_dereference(net, ip6n-&gt;tnls_r_l[h]);</div><div class='ctx'> 		while (t) {</div><div class='ctx'> 			unregister_netdevice_queue(t-&gt;dev, list);</div><div class='del'>-			t = rtnl_dereference(t-&gt;next);</div><div class='add'>+			t = rtnl_net_dereference(net, t-&gt;next);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	t = rtnl_dereference(ip6n-&gt;tnls_wc[0]);</div><div class='add'>+	t = rtnl_net_dereference(net, ip6n-&gt;tnls_wc[0]);</div><div class='ctx'> 	if (t)</div><div class='ctx'> 		unregister_netdevice_queue(t-&gt;dev, list);</div><div class='ctx'> }</div><div class='hunk'>@@ -1137,30 +1170,16 @@ err_alloc_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit vti6_exit_batch_net(struct list_head *net_list)</div><div class='del'>-{</div><div class='del'>-	struct vti6_net *ip6n;</div><div class='del'>-	struct net *net;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry(net, net_list, exit_list) {</div><div class='del'>-		ip6n = net_generic(net, vti6_net_id);</div><div class='del'>-		vti6_destroy_tunnels(ip6n, &amp;list);</div><div class='del'>-	}</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations vti6_net_ops = {</div><div class='ctx'> 	.init = vti6_init_net,</div><div class='del'>-	.exit_batch = vti6_exit_batch_net,</div><div class='add'>+	.exit_rtnl = vti6_exit_rtnl_net,</div><div class='ctx'> 	.id   = &amp;vti6_net_id,</div><div class='ctx'> 	.size = sizeof(struct vti6_net),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol vti_esp6_protocol __read_mostly = {</div><div class='ctx'> 	.handler	=	vti6_rcv,</div><div class='add'>+	.input_handler	=	vti6_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti6_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti6_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='hunk'>@@ -1168,6 +1187,7 @@ static struct xfrm6_protocol vti_esp6_protocol __read_mostly = {</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol vti_ah6_protocol __read_mostly = {</div><div class='ctx'> 	.handler	=	vti6_rcv,</div><div class='add'>+	.input_handler	=	vti6_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti6_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti6_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='hunk'>@@ -1175,11 +1195,39 @@ static struct xfrm6_protocol vti_ah6_protocol __read_mostly = {</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol vti_ipcomp6_protocol __read_mostly = {</div><div class='ctx'> 	.handler	=	vti6_rcv,</div><div class='add'>+	.input_handler	=	vti6_input_proto,</div><div class='ctx'> 	.cb_handler	=	vti6_rcv_cb,</div><div class='ctx'> 	.err_handler	=	vti6_err,</div><div class='ctx'> 	.priority	=	100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_REACHABLE(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+static int vti6_rcv_tunnel(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const xfrm_address_t *saddr;</div><div class='add'>+	__be32 spi;</div><div class='add'>+</div><div class='add'>+	saddr = (const xfrm_address_t *)&amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+	spi = xfrm6_tunnel_spi_lookup(dev_net(skb-&gt;dev), saddr);</div><div class='add'>+</div><div class='add'>+	return vti6_input_proto(skb, IPPROTO_IPV6, spi, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct xfrm6_tunnel vti_ipv6_handler __read_mostly = {</div><div class='add'>+	.handler	=	vti6_rcv_tunnel,</div><div class='add'>+	.cb_handler	=	vti6_rcv_cb,</div><div class='add'>+	.err_handler	=	vti6_err,</div><div class='add'>+	.priority	=	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct xfrm6_tunnel vti_ip6ip_handler __read_mostly = {</div><div class='add'>+	.handler	=	vti6_rcv_tunnel,</div><div class='add'>+	.cb_handler	=	vti6_rcv_cb,</div><div class='add'>+	.err_handler	=	vti6_err,</div><div class='add'>+	.priority	=	0,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * vti6_tunnel_init - register protocol and reserve needed resources</div><div class='ctx'>  *</div><div class='hunk'>@@ -1205,6 +1253,15 @@ static int __init vti6_tunnel_init(void)</div><div class='ctx'> 	err = xfrm6_protocol_register(&amp;vti_ipcomp6_protocol, IPPROTO_COMP);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto xfrm_proto_comp_failed;</div><div class='add'>+#if IS_REACHABLE(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+	msg = "ipv6 tunnel";</div><div class='add'>+	err = xfrm6_tunnel_register(&amp;vti_ipv6_handler, AF_INET6);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto vti_tunnel_ipv6_failed;</div><div class='add'>+	err = xfrm6_tunnel_register(&amp;vti_ip6ip_handler, AF_INET);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto vti_tunnel_ip6ip_failed;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	msg = "netlink interface";</div><div class='ctx'> 	err = rtnl_link_register(&amp;vti6_link_ops);</div><div class='hunk'>@@ -1214,6 +1271,12 @@ static int __init vti6_tunnel_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> rtnl_link_failed:</div><div class='add'>+#if IS_REACHABLE(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+	err = xfrm6_tunnel_deregister(&amp;vti_ip6ip_handler, AF_INET);</div><div class='add'>+vti_tunnel_ip6ip_failed:</div><div class='add'>+	err = xfrm6_tunnel_deregister(&amp;vti_ipv6_handler, AF_INET6);</div><div class='add'>+vti_tunnel_ipv6_failed:</div><div class='add'>+#endif</div><div class='ctx'> 	xfrm6_protocol_deregister(&amp;vti_ipcomp6_protocol, IPPROTO_COMP);</div><div class='ctx'> xfrm_proto_comp_failed:</div><div class='ctx'> 	xfrm6_protocol_deregister(&amp;vti_ah6_protocol, IPPROTO_AH);</div><div class='hunk'>@@ -1232,6 +1295,10 @@ pernet_dev_failed:</div><div class='ctx'> static void __exit vti6_tunnel_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_link_unregister(&amp;vti6_link_ops);</div><div class='add'>+#if IS_REACHABLE(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+	xfrm6_tunnel_deregister(&amp;vti_ip6ip_handler, AF_INET);</div><div class='add'>+	xfrm6_tunnel_deregister(&amp;vti_ipv6_handler, AF_INET6);</div><div class='add'>+#endif</div><div class='ctx'> 	xfrm6_protocol_deregister(&amp;vti_ipcomp6_protocol, IPPROTO_COMP);</div><div class='ctx'> 	xfrm6_protocol_deregister(&amp;vti_ah6_protocol, IPPROTO_AH);</div><div class='ctx'> 	xfrm6_protocol_deregister(&amp;vti_esp6_protocol, IPPROTO_ESP);</div><div class='head'>diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c<br/>index d0b7e0249c13..e047a4680ab0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6mr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ip6mr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ip6mr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ip6mr.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux IPv6 multicast routing support for BSD pim6sd</div><div class='ctx'>  *	Based on net/ipv4/ipmr.c.</div><div class='hunk'>@@ -8,12 +9,6 @@</div><div class='ctx'>  *		6WIND, Paris, France</div><div class='ctx'>  *	Copyright (C)2007,2008 USAGI/WIDE Project</div><div class='ctx'>  *		YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -51,6 +46,9 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;linux/netconf.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ip6mr_rule {</div><div class='ctx'> 	struct fib_rule		common;</div><div class='hunk'>@@ -64,7 +62,12 @@ struct ip6mr_result {</div><div class='ctx'>    Note that the changes are semaphored via rtnl_lock.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static DEFINE_RWLOCK(mrt_lock);</div><div class='add'>+static DEFINE_SPINLOCK(mrt_lock);</div><div class='add'>+</div><div class='add'>+static struct net_device *vif_dev_read(const struct vif_device *vif)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference(vif-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Multicast router control variables */</div><div class='ctx'> </div><div class='hunk'>@@ -85,20 +88,25 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id);</div><div class='ctx'> static void ip6mr_free_table(struct mr_table *mrt);</div><div class='ctx'> </div><div class='ctx'> static void ip6_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='del'>-			   struct sk_buff *skb, struct mfc6_cache *cache);</div><div class='del'>-static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='add'>+			   struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			   struct mfc6_cache *cache);</div><div class='add'>+static int ip6mr_cache_report(const struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> 			      mifi_t mifi, int assert);</div><div class='ctx'> static void mr6_netlink_event(struct mr_table *mrt, struct mfc6_cache *mfc,</div><div class='ctx'> 			      int cmd);</div><div class='del'>-static void mrt6msg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt);</div><div class='add'>+static void mrt6msg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt);</div><div class='add'>+static int ip6mr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='ctx'> static int ip6mr_rtm_dumproute(struct sk_buff *skb,</div><div class='ctx'> 			       struct netlink_callback *cb);</div><div class='del'>-static void mroute_clean_tables(struct mr_table *mrt, bool all);</div><div class='add'>+static void mroute_clean_tables(struct mr_table *mrt, int flags);</div><div class='ctx'> static void ipmr_expire_process(struct timer_list *t);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES</div><div class='ctx'> #define ip6mr_for_each_table(mrt, net) \</div><div class='del'>-	list_for_each_entry_rcu(mrt, &amp;net-&gt;ipv6.mr6_tables, list)</div><div class='add'>+	list_for_each_entry_rcu(mrt, &amp;net-&gt;ipv6.mr6_tables, list, \</div><div class='add'>+				lockdep_rtnl_is_held() || \</div><div class='add'>+				list_empty(&amp;net-&gt;ipv6.mr6_tables))</div><div class='ctx'> </div><div class='ctx'> static struct mr_table *ip6mr_mr_table_iter(struct net *net,</div><div class='ctx'> 					    struct mr_table *mrt)</div><div class='hunk'>@@ -117,7 +125,7 @@ static struct mr_table *ip6mr_mr_table_iter(struct net *net,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mr_table *ip6mr_get_table(struct net *net, u32 id)</div><div class='add'>+static struct mr_table *__ip6mr_get_table(struct net *net, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='hunk'>@@ -128,6 +136,16 @@ static struct mr_table *ip6mr_get_table(struct net *net, u32 id)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct mr_table *ip6mr_get_table(struct net *net, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct mr_table *mrt;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ip6mr_get_table(net, id);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return mrt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip6mr_fib_lookup(struct net *net, struct flowi6 *flp6,</div><div class='ctx'> 			    struct mr_table **mrt)</div><div class='ctx'> {</div><div class='hunk'>@@ -138,6 +156,9 @@ static int ip6mr_fib_lookup(struct net *net, struct flowi6 *flp6,</div><div class='ctx'> 		.flags = FIB_LOOKUP_NOREF,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* update flow if oif or iif point to device enslaved to l3mdev */</div><div class='add'>+	l3mdev_update_flow(net, flowi6_to_flowi(flp6));</div><div class='add'>+</div><div class='ctx'> 	err = fib_rules_lookup(net-&gt;ipv6.mr6_rules_ops,</div><div class='ctx'> 			       flowi6_to_flowi(flp6), 0, &amp;arg);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -164,7 +185,9 @@ static int ip6mr_rule_action(struct fib_rule *rule, struct flowi *flp,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mrt = ip6mr_get_table(rule-&gt;fr_net, rule-&gt;table);</div><div class='add'>+	arg-&gt;table = fib_rule_get_table(rule, arg);</div><div class='add'>+</div><div class='add'>+	mrt = __ip6mr_get_table(rule-&gt;fr_net, arg-&gt;table);</div><div class='ctx'> 	if (!mrt)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	res-&gt;mrt = mrt;</div><div class='hunk'>@@ -176,10 +199,6 @@ static int ip6mr_rule_match(struct fib_rule *rule, struct flowi *flp, int flags)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct nla_policy ip6mr_rule_policy[FRA_MAX + 1] = {</div><div class='del'>-	FRA_GENERIC_POLICY,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int ip6mr_rule_configure(struct fib_rule *rule, struct sk_buff *skb,</div><div class='ctx'> 				struct fib_rule_hdr *frh, struct nlattr **tb,</div><div class='ctx'> 				struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -212,7 +231,6 @@ static const struct fib_rules_ops __net_initconst ip6mr_rules_ops_template = {</div><div class='ctx'> 	.compare	= ip6mr_rule_compare,</div><div class='ctx'> 	.fill		= ip6mr_rule_fill,</div><div class='ctx'> 	.nlgroup	= RTNLGRP_IPV6_RULE,</div><div class='del'>-	.policy		= ip6mr_rule_policy,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +252,7 @@ static int __net_init ip6mr_rules_init(struct net *net)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT, 0);</div><div class='add'>+	err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -242,7 +260,9 @@ static int __net_init ip6mr_rules_init(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err2:</div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	ip6mr_free_table(mrt);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> err1:</div><div class='ctx'> 	fib_rules_unregister(ops);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -252,21 +272,21 @@ static void __net_exit ip6mr_rules_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt, *next;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	list_for_each_entry_safe(mrt, next, &amp;net-&gt;ipv6.mr6_tables, list) {</div><div class='ctx'> 		list_del(&amp;mrt-&gt;list);</div><div class='ctx'> 		ip6mr_free_table(mrt);</div><div class='ctx'> 	}</div><div class='ctx'> 	fib_rules_unregister(net-&gt;ipv6.mr6_rules_ops);</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return fib_rules_dump(net, nb, RTNL_FAMILY_IP6MR);</div><div class='add'>+	return fib_rules_dump(net, nb, RTNL_FAMILY_IP6MR, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6mr_rules_seq_read(struct net *net)</div><div class='add'>+static unsigned int ip6mr_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return fib_rules_seq_read(net, RTNL_FAMILY_IP6MR);</div><div class='ctx'> }</div><div class='hunk'>@@ -294,6 +314,8 @@ static struct mr_table *ip6mr_get_table(struct net *net, u32 id)</div><div class='ctx'> 	return net-&gt;ipv6.mrt6;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __ip6mr_get_table ip6mr_get_table</div><div class='add'>+</div><div class='ctx'> static int ip6mr_fib_lookup(struct net *net, struct flowi6 *flp6,</div><div class='ctx'> 			    struct mr_table **mrt)</div><div class='ctx'> {</div><div class='hunk'>@@ -314,18 +336,18 @@ static int __net_init ip6mr_rules_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> static void __net_exit ip6mr_rules_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> 	ip6mr_free_table(net-&gt;ipv6.mrt6);</div><div class='ctx'> 	net-&gt;ipv6.mrt6 = NULL;</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6mr_rules_seq_read(struct net *net)</div><div class='add'>+static unsigned int ip6mr_rules_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -346,7 +368,6 @@ static const struct rhashtable_params ip6mr_rht_params = {</div><div class='ctx'> 	.key_offset = offsetof(struct mfc6_cache, cmparg),</div><div class='ctx'> 	.key_len = sizeof(struct mfc6_cache_cmp_arg),</div><div class='ctx'> 	.nelem_hint = 3,</div><div class='del'>-	.locks_mul = 1,</div><div class='ctx'> 	.obj_cmpfn = ip6mr_hash_cmp,</div><div class='ctx'> 	.automatic_shrinking = true,</div><div class='ctx'> };</div><div class='hunk'>@@ -373,7 +394,7 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='del'>-	mrt = ip6mr_get_table(net, id);</div><div class='add'>+	mrt = __ip6mr_get_table(net, id);</div><div class='ctx'> 	if (mrt)</div><div class='ctx'> 		return mrt;</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +404,13 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id)</div><div class='ctx'> </div><div class='ctx'> static void ip6mr_free_table(struct mr_table *mrt)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='del'>-	mroute_clean_tables(mrt, true);</div><div class='add'>+	struct net *net = read_pnet(&amp;mrt-&gt;net);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!mr_can_free_table(net));</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='add'>+	mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC |</div><div class='add'>+				 MRT6_FLUSH_MFC | MRT6_FLUSH_MFC_STATIC);</div><div class='ctx'> 	rhltable_destroy(&amp;mrt-&gt;mfc_hash);</div><div class='ctx'> 	kfree(mrt);</div><div class='ctx'> }</div><div class='hunk'>@@ -395,26 +421,28 @@ static void ip6mr_free_table(struct mr_table *mrt)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void *ip6mr_vif_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-	__acquires(mrt_lock)</div><div class='add'>+	__acquires(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_vif_iter *iter = seq-&gt;private;</div><div class='ctx'> 	struct net *net = seq_file_net(seq);</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> </div><div class='del'>-	mrt = ip6mr_get_table(net, RT6_TABLE_DFLT);</div><div class='del'>-	if (!mrt)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ip6mr_get_table(net, RT6_TABLE_DFLT);</div><div class='add'>+	if (!mrt) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iter-&gt;mrt = mrt;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	return mr_vif_seq_start(seq, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6mr_vif_seq_stop(struct seq_file *seq, void *v)</div><div class='del'>-	__releases(mrt_lock)</div><div class='add'>+	__releases(RCU)</div><div class='ctx'> {</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6mr_vif_seq_show(struct seq_file *seq, void *v)</div><div class='hunk'>@@ -427,7 +455,11 @@ static int ip6mr_vif_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			 "Interface      BytesIn  PktsIn  BytesOut PktsOut Flags\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		const struct vif_device *vif = v;</div><div class='del'>-		const char *name = vif-&gt;dev ? vif-&gt;dev-&gt;name : "none";</div><div class='add'>+		const struct net_device *vif_dev;</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='add'>+		vif_dev = vif_dev_read(vif);</div><div class='add'>+		name = vif_dev ? vif_dev-&gt;name : "none";</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(seq,</div><div class='ctx'> 			   "%2td %-10s %8ld %7ld  %8ld %7ld %05X\n",</div><div class='hunk'>@@ -478,9 +510,9 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 		if (it-&gt;cache != &amp;mrt-&gt;mfc_unres_queue) {</div><div class='ctx'> 			seq_printf(seq, " %8lu %8lu %8lu",</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.pkt,</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.bytes,</div><div class='del'>-				   mfc-&gt;_c.mfc_un.res.wrong_if);</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.pkt),</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.bytes),</div><div class='add'>+				   atomic_long_read(&amp;mfc-&gt;_c.mfc_un.res.wrong_if));</div><div class='ctx'> 			for (n = mfc-&gt;_c.mfc_un.res.minvif;</div><div class='ctx'> 			     n &lt; mfc-&gt;_c.mfc_un.res.maxvif; n++) {</div><div class='ctx'> 				if (VIF_EXISTS(mrt, n) &amp;&amp;</div><div class='hunk'>@@ -546,14 +578,11 @@ static int pim6_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (ip6mr_fib_lookup(net, &amp;fl6, &amp;mrt) &lt; 0)</div><div class='ctx'> 		goto drop;</div><div class='del'>-	reg_vif_num = mrt-&gt;mroute_reg_vif_num;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='add'>+	/* Pairs with WRITE_ONCE() in mif6_add()/mif6_delete() */</div><div class='add'>+	reg_vif_num = READ_ONCE(mrt-&gt;mroute_reg_vif_num);</div><div class='ctx'> 	if (reg_vif_num &gt;= 0)</div><div class='del'>-		reg_dev = mrt-&gt;vif_table[reg_vif_num].dev;</div><div class='del'>-	if (reg_dev)</div><div class='del'>-		dev_hold(reg_dev);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+		reg_dev = vif_dev_read(&amp;mrt-&gt;vif_table[reg_vif_num]);</div><div class='ctx'> </div><div class='ctx'> 	if (!reg_dev)</div><div class='ctx'> 		goto drop;</div><div class='hunk'>@@ -568,7 +597,6 @@ static int pim6_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='del'>-	dev_put(reg_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'>  drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -591,19 +619,24 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb,</div><div class='ctx'> 		.flowi6_iif	= skb-&gt;skb_iif ? : LOOPBACK_IFINDEX,</div><div class='ctx'> 		.flowi6_mark	= skb-&gt;mark,</div><div class='ctx'> 	};</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = ip6mr_fib_lookup(net, &amp;fl6, &amp;mrt);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='add'>+	if (ip6mr_fib_lookup(net, &amp;fl6, &amp;mrt) &lt; 0)</div><div class='add'>+		goto tx_err;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	ip6mr_cache_report(mrt, skb, mrt-&gt;mroute_reg_vif_num, MRT6MSG_WHOLEPKT);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	DEV_STATS_ADD(dev, tx_bytes, skb-&gt;len);</div><div class='add'>+	DEV_STATS_INC(dev, tx_packets);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ip6mr_cache_report(mrt, skb, READ_ONCE(mrt-&gt;mroute_reg_vif_num),</div><div class='add'>+			   MRT6MSG_WHOLEPKT);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+tx_err:</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -625,7 +658,7 @@ static void reg_vif_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;reg_vif_netdev_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	dev-&gt;netns_immutable	= true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device *ip6mr_reg_vif(struct net *net, struct mr_table *mrt)</div><div class='hunk'>@@ -649,7 +682,7 @@ static struct net_device *ip6mr_reg_vif(struct net *net, struct mr_table *mrt)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev_open(dev))</div><div class='add'>+	if (dev_open(dev, NULL))</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='ctx'> 	dev_hold(dev);</div><div class='hunk'>@@ -664,10 +697,11 @@ failure:</div><div class='ctx'> static int call_ip6mr_vif_entry_notifiers(struct net *net,</div><div class='ctx'> 					  enum fib_event_type event_type,</div><div class='ctx'> 					  struct vif_device *vif,</div><div class='add'>+					  struct net_device *vif_dev,</div><div class='ctx'> 					  mifi_t vif_index, u32 tb_id)</div><div class='ctx'> {</div><div class='ctx'> 	return mr_call_vif_notifiers(net, RTNL_FAMILY_IP6MR, event_type,</div><div class='del'>-				     vif, vif_index, tb_id,</div><div class='add'>+				     vif, vif_dev, vif_index, tb_id,</div><div class='ctx'> 				     &amp;net-&gt;ipv6.ipmr_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -692,23 +726,21 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> </div><div class='ctx'> 	v = &amp;mrt-&gt;vif_table[vifi];</div><div class='ctx'> </div><div class='del'>-	if (VIF_EXISTS(mrt, vifi))</div><div class='del'>-		call_ip6mr_vif_entry_notifiers(read_pnet(&amp;mrt-&gt;net),</div><div class='del'>-					       FIB_EVENT_VIF_DEL, v, vifi,</div><div class='del'>-					       mrt-&gt;id);</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;mrt_lock);</div><div class='del'>-	dev = v-&gt;dev;</div><div class='del'>-	v-&gt;dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+	dev = rtnl_dereference(v-&gt;dev);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	call_ip6mr_vif_entry_notifiers(read_pnet(&amp;mrt-&gt;net),</div><div class='add'>+				       FIB_EVENT_VIF_DEL, v, dev,</div><div class='add'>+				       vifi, mrt-&gt;id);</div><div class='add'>+	spin_lock(&amp;mrt_lock);</div><div class='add'>+	RCU_INIT_POINTER(v-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='del'>-	if (vifi == mrt-&gt;mroute_reg_vif_num)</div><div class='del'>-		mrt-&gt;mroute_reg_vif_num = -1;</div><div class='add'>+	if (vifi == mrt-&gt;mroute_reg_vif_num) {</div><div class='add'>+		/* Pairs with READ_ONCE() in ip6mr_cache_report() and reg_vif_xmit() */</div><div class='add'>+		WRITE_ONCE(mrt-&gt;mroute_reg_vif_num, -1);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (vifi + 1 == mrt-&gt;maxvif) {</div><div class='hunk'>@@ -717,16 +749,16 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> 			if (VIF_EXISTS(mrt, tmp))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		mrt-&gt;maxvif = tmp + 1;</div><div class='add'>+		WRITE_ONCE(mrt-&gt;maxvif, tmp + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+	spin_unlock(&amp;mrt_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev_set_allmulti(dev, -1);</div><div class='ctx'> </div><div class='ctx'> 	in6_dev = __in6_dev_get(dev);</div><div class='ctx'> 	if (in6_dev) {</div><div class='del'>-		in6_dev-&gt;cnf.mc_forwarding--;</div><div class='add'>+		atomic_dec(&amp;in6_dev-&gt;cnf.mc_forwarding);</div><div class='ctx'> 		inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,</div><div class='ctx'> 					     NETCONFA_MC_FORWARDING,</div><div class='ctx'> 					     dev-&gt;ifindex, &amp;in6_dev-&gt;cnf);</div><div class='hunk'>@@ -735,7 +767,7 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify,</div><div class='ctx'> 	if ((v-&gt;flags &amp; MIFF_REGISTER) &amp;&amp; !notify)</div><div class='ctx'> 		unregister_netdevice_queue(dev, head);</div><div class='ctx'> </div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;v-&gt;dev_tracker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -807,7 +839,7 @@ static void ipmr_do_expire_process(struct mr_table *mrt)</div><div class='ctx'> </div><div class='ctx'> static void ipmr_expire_process(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mr_table *mrt = from_timer(mrt, t, ipmr_expire_timer);</div><div class='add'>+	struct mr_table *mrt = timer_container_of(mrt, t, ipmr_expire_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!spin_trylock(&amp;mfc_unres_lock)) {</div><div class='ctx'> 		mod_timer(&amp;mrt-&gt;ipmr_expire_timer, jiffies + 1);</div><div class='hunk'>@@ -820,7 +852,7 @@ static void ipmr_expire_process(struct timer_list *t)</div><div class='ctx'> 	spin_unlock(&amp;mfc_unres_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Fill oifs list. It is called under write locked mrt_lock. */</div><div class='add'>+/* Fill oifs list. It is called under locked mrt_lock. */</div><div class='ctx'> </div><div class='ctx'> static void ip6mr_update_thresholds(struct mr_table *mrt,</div><div class='ctx'> 				    struct mr_mfc *cache,</div><div class='hunk'>@@ -842,7 +874,7 @@ static void ip6mr_update_thresholds(struct mr_table *mrt,</div><div class='ctx'> 				cache-&gt;mfc_un.res.maxvif = vifi + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	cache-&gt;mfc_un.res.lastuse = jiffies;</div><div class='add'>+	WRITE_ONCE(cache-&gt;mfc_un.res.lastuse, jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mif6_add(struct net *net, struct mr_table *mrt,</div><div class='hunk'>@@ -894,7 +926,7 @@ static int mif6_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> </div><div class='ctx'> 	in6_dev = __in6_dev_get(dev);</div><div class='ctx'> 	if (in6_dev) {</div><div class='del'>-		in6_dev-&gt;cnf.mc_forwarding++;</div><div class='add'>+		atomic_inc(&amp;in6_dev-&gt;cnf.mc_forwarding);</div><div class='ctx'> 		inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,</div><div class='ctx'> 					     NETCONFA_MC_FORWARDING,</div><div class='ctx'> 					     dev-&gt;ifindex, &amp;in6_dev-&gt;cnf);</div><div class='hunk'>@@ -906,17 +938,18 @@ static int mif6_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			MIFF_REGISTER);</div><div class='ctx'> </div><div class='ctx'> 	/* And finish update writing critical data */</div><div class='del'>-	write_lock_bh(&amp;mrt_lock);</div><div class='del'>-	v-&gt;dev = dev;</div><div class='add'>+	spin_lock(&amp;mrt_lock);</div><div class='add'>+	rcu_assign_pointer(v-&gt;dev, dev);</div><div class='add'>+	netdev_tracker_alloc(dev, &amp;v-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='ctx'> 	if (v-&gt;flags &amp; MIFF_REGISTER)</div><div class='del'>-		mrt-&gt;mroute_reg_vif_num = vifi;</div><div class='add'>+		WRITE_ONCE(mrt-&gt;mroute_reg_vif_num, vifi);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (vifi + 1 &gt; mrt-&gt;maxvif)</div><div class='del'>-		mrt-&gt;maxvif = vifi + 1;</div><div class='del'>-	write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+		WRITE_ONCE(mrt-&gt;maxvif, vifi + 1);</div><div class='add'>+	spin_unlock(&amp;mrt_lock);</div><div class='ctx'> 	call_ip6mr_vif_entry_notifiers(net, FIB_EVENT_VIF_ADD,</div><div class='del'>-				       v, vifi, mrt-&gt;id);</div><div class='add'>+				       v, dev, vifi, mrt-&gt;id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1013,18 +1046,21 @@ static void ip6mr_cache_resolve(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 				((struct nlmsgerr *)nlmsg_data(nlh))-&gt;error = -EMSGSIZE;</div><div class='ctx'> 			}</div><div class='ctx'> 			rtnl_unicast(skb, net, NETLINK_CB(skb).portid);</div><div class='del'>-		} else</div><div class='del'>-			ip6_mr_forward(net, mrt, skb, c);</div><div class='add'>+		} else {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			ip6_mr_forward(net, mrt, skb-&gt;dev, skb, c);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Bounce a cache query up to pim6sd and netlink.</div><div class='ctx'>  *</div><div class='del'>- *	Called under mrt_lock.</div><div class='add'>+ *	Called under rcu_read_lock()</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='add'>+static int ip6mr_cache_report(const struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> 			      mifi_t mifi, int assert)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *mroute6_sk;</div><div class='hunk'>@@ -1033,7 +1069,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='del'>-	if (assert == MRT6MSG_WHOLEPKT)</div><div class='add'>+	if (assert == MRT6MSG_WHOLEPKT || assert == MRT6MSG_WRMIFWHOLE)</div><div class='ctx'> 		skb = skb_realloc_headroom(pkt, -skb_network_offset(pkt)</div><div class='ctx'> 						+sizeof(*msg));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1049,20 +1085,23 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='del'>-	if (assert == MRT6MSG_WHOLEPKT) {</div><div class='add'>+	if (assert == MRT6MSG_WHOLEPKT || assert == MRT6MSG_WRMIFWHOLE) {</div><div class='ctx'> 		/* Ugly, but we have no choice with this interface.</div><div class='ctx'> 		   Duplicate old header, fix length etc.</div><div class='ctx'> 		   And all this only to mangle msg-&gt;im6_msgtype and</div><div class='ctx'> 		   to set msg-&gt;im6_mbz to "mbz" :-)</div><div class='ctx'> 		 */</div><div class='del'>-		skb_push(skb, -skb_network_offset(pkt));</div><div class='add'>+		__skb_pull(skb, skb_network_offset(pkt));</div><div class='ctx'> </div><div class='ctx'> 		skb_push(skb, sizeof(*msg));</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='ctx'> 		msg = (struct mrt6msg *)skb_transport_header(skb);</div><div class='ctx'> 		msg-&gt;im6_mbz = 0;</div><div class='del'>-		msg-&gt;im6_msgtype = MRT6MSG_WHOLEPKT;</div><div class='del'>-		msg-&gt;im6_mif = mrt-&gt;mroute_reg_vif_num;</div><div class='add'>+		msg-&gt;im6_msgtype = assert;</div><div class='add'>+		if (assert == MRT6MSG_WRMIFWHOLE)</div><div class='add'>+			msg-&gt;im6_mif = mifi;</div><div class='add'>+		else</div><div class='add'>+			msg-&gt;im6_mif = READ_ONCE(mrt-&gt;mroute_reg_vif_num);</div><div class='ctx'> 		msg-&gt;im6_pad = 0;</div><div class='ctx'> 		msg-&gt;im6_src = ipv6_hdr(pkt)-&gt;saddr;</div><div class='ctx'> 		msg-&gt;im6_dst = ipv6_hdr(pkt)-&gt;daddr;</div><div class='hunk'>@@ -1097,10 +1136,8 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	mroute6_sk = rcu_dereference(mrt-&gt;mroute_sk);</div><div class='ctx'> 	if (!mroute6_sk) {</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1109,7 +1146,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> </div><div class='ctx'> 	/* Deliver to user space multicast routing algorithms */</div><div class='ctx'> 	ret = sock_queue_rcv_skb(mroute6_sk, skb);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		net_warn_ratelimited("mroute6: pending queue full, dropping entries\n");</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -1120,7 +1157,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,</div><div class='ctx'> </div><div class='ctx'> /* Queue a packet for resolution. It gets locked cache entry! */</div><div class='ctx'> static int ip6mr_cache_unresolved(struct mr_table *mrt, mifi_t mifi,</div><div class='del'>-				  struct sk_buff *skb)</div><div class='add'>+				  struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mfc6_cache *c;</div><div class='ctx'> 	bool found = false;</div><div class='hunk'>@@ -1140,8 +1177,8 @@ static int ip6mr_cache_unresolved(struct mr_table *mrt, mifi_t mifi,</div><div class='ctx'> 		 *	Create a new entry if allowable</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) &gt;= 10 ||</div><div class='del'>-		    (c = ip6mr_cache_alloc_unres()) == NULL) {</div><div class='add'>+		c = ip6mr_cache_alloc_unres();</div><div class='add'>+		if (!c) {</div><div class='ctx'> 			spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> </div><div class='ctx'> 			kfree_skb(skb);</div><div class='hunk'>@@ -1180,6 +1217,10 @@ static int ip6mr_cache_unresolved(struct mr_table *mrt, mifi_t mifi,</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		err = -ENOBUFS;</div><div class='ctx'> 	} else {</div><div class='add'>+		if (dev) {</div><div class='add'>+			skb-&gt;dev = dev;</div><div class='add'>+			skb-&gt;skb_iif = dev-&gt;ifindex;</div><div class='add'>+		}</div><div class='ctx'> 		skb_queue_tail(&amp;c-&gt;_c.mfc_un.unres.unresolved, skb);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1229,7 +1270,7 @@ static int ip6mr_device_event(struct notifier_block *this,</div><div class='ctx'> 	ip6mr_for_each_table(mrt, net) {</div><div class='ctx'> 		v = &amp;mrt-&gt;vif_table[0];</div><div class='ctx'> 		for (ct = 0; ct &lt; mrt-&gt;maxvif; ct++, v++) {</div><div class='del'>-			if (v-&gt;dev == dev)</div><div class='add'>+			if (rcu_access_pointer(v-&gt;dev) == dev)</div><div class='ctx'> 				mif6_delete(mrt, ct, 1, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1237,17 +1278,16 @@ static int ip6mr_device_event(struct notifier_block *this,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6mr_seq_read(struct net *net)</div><div class='add'>+static unsigned int ip6mr_seq_read(const struct net *net)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	return net-&gt;ipv6.ipmr_seq + ip6mr_rules_seq_read(net);</div><div class='add'>+	return READ_ONCE(net-&gt;ipv6.ipmr_seq) + ip6mr_rules_seq_read(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6mr_dump(struct net *net, struct notifier_block *nb)</div><div class='add'>+static int ip6mr_dump(struct net *net, struct notifier_block *nb,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return mr_dump(net, nb, RTNL_FAMILY_IP6MR, ip6mr_rules_dump,</div><div class='del'>-		       ip6mr_mr_table_iter, &amp;mrt_lock);</div><div class='add'>+		       ip6mr_mr_table_iter, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block ip6_mr_notifier = {</div><div class='hunk'>@@ -1311,7 +1351,9 @@ static int __net_init ip6mr_net_init(struct net *net)</div><div class='ctx'> proc_cache_fail:</div><div class='ctx'> 	remove_proc_entry("ip6_mr_vif", net-&gt;proc_net);</div><div class='ctx'> proc_vif_fail:</div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	ip6mr_rules_exit(net);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> #endif</div><div class='ctx'> ip6mr_rules_fail:</div><div class='ctx'> 	ip6mr_notifier_exit(net);</div><div class='hunk'>@@ -1324,23 +1366,36 @@ static void __net_exit ip6mr_net_exit(struct net *net)</div><div class='ctx'> 	remove_proc_entry("ip6_mr_cache", net-&gt;proc_net);</div><div class='ctx'> 	remove_proc_entry("ip6_mr_vif", net-&gt;proc_net);</div><div class='ctx'> #endif</div><div class='del'>-	ip6mr_rules_exit(net);</div><div class='ctx'> 	ip6mr_notifier_exit(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ip6mr_net_exit_batch(struct list_head *net_list)</div><div class='add'>+{</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list)</div><div class='add'>+		ip6mr_rules_exit(net);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pernet_operations ip6mr_net_ops = {</div><div class='ctx'> 	.init = ip6mr_net_init,</div><div class='ctx'> 	.exit = ip6mr_net_exit,</div><div class='add'>+	.exit_batch = ip6mr_net_exit_batch,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler ip6mr_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = RTNL_FAMILY_IP6MR,</div><div class='add'>+	 .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .doit = ip6mr_rtm_getroute, .dumpit = ip6mr_rtm_dumproute},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init ip6_mr_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mrt_cachep = kmem_cache_create("ip6_mrt_cache",</div><div class='del'>-				       sizeof(struct mfc6_cache),</div><div class='del'>-				       0, SLAB_HWCACHE_ALIGN,</div><div class='del'>-				       NULL);</div><div class='add'>+	mrt_cachep = KMEM_CACHE(mfc6_cache, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!mrt_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1358,9 +1413,8 @@ int __init ip6_mr_init(void)</div><div class='ctx'> 		goto add_proto_fail;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	err = rtnl_register_module(THIS_MODULE, RTNL_FAMILY_IP6MR, RTM_GETROUTE,</div><div class='del'>-				   NULL, ip6mr_rtm_dumproute, 0);</div><div class='del'>-	if (err == 0)</div><div class='add'>+	err = rtnl_register_many(ip6mr_rtnl_msg_handlers);</div><div class='add'>+	if (!err)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='hunk'>@@ -1375,9 +1429,9 @@ reg_pernet_fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ip6_mr_cleanup(void)</div><div class='add'>+void __init ip6_mr_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	rtnl_unregister(RTNL_FAMILY_IP6MR, RTM_GETROUTE);</div><div class='add'>+	rtnl_unregister_many(ip6mr_rtnl_msg_handlers);</div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='ctx'> 	inet6_del_protocol(&amp;pim6_protocol, IPPROTO_PIM);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1410,12 +1464,12 @@ static int ip6mr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 				    &amp;mfc-&gt;mf6cc_mcastgrp.sin6_addr, parent);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (c) {</div><div class='del'>-		write_lock_bh(&amp;mrt_lock);</div><div class='add'>+		spin_lock(&amp;mrt_lock);</div><div class='ctx'> 		c-&gt;_c.mfc_parent = mfc-&gt;mf6cc_parent;</div><div class='ctx'> 		ip6mr_update_thresholds(mrt, &amp;c-&gt;_c, ttls);</div><div class='ctx'> 		if (!mrtsock)</div><div class='ctx'> 			c-&gt;_c.mfc_flags |= MFC_STATIC;</div><div class='del'>-		write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+		spin_unlock(&amp;mrt_lock);</div><div class='ctx'> 		call_ip6mr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE,</div><div class='ctx'> 					       c, mrt-&gt;id);</div><div class='ctx'> 		mr6_netlink_event(mrt, c, RTM_NEWROUTE);</div><div class='hunk'>@@ -1462,7 +1516,7 @@ static int ip6mr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (list_empty(&amp;mrt-&gt;mfc_unres_queue))</div><div class='del'>-		del_timer(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='add'>+		timer_delete(&amp;mrt-&gt;ipmr_expire_timer);</div><div class='ctx'> 	spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (found) {</div><div class='hunk'>@@ -1479,43 +1533,51 @@ static int ip6mr_mfc_add(struct net *net, struct mr_table *mrt,</div><div class='ctx'>  *	Close the multicast socket, and clear the vif tables etc</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void mroute_clean_tables(struct mr_table *mrt, bool all)</div><div class='add'>+static void mroute_clean_tables(struct mr_table *mrt, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mr_mfc *c, *tmp;</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Shut down all active vif entries */</div><div class='del'>-	for (i = 0; i &lt; mrt-&gt;maxvif; i++) {</div><div class='del'>-		if (!all &amp;&amp; (mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC))</div><div class='del'>-			continue;</div><div class='del'>-		mif6_delete(mrt, i, 0, &amp;list);</div><div class='add'>+	if (flags &amp; (MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC)) {</div><div class='add'>+		for (i = 0; i &lt; mrt-&gt;maxvif; i++) {</div><div class='add'>+			if (((mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC) &amp;&amp;</div><div class='add'>+			     !(flags &amp; MRT6_FLUSH_MIFS_STATIC)) ||</div><div class='add'>+			    (!(mrt-&gt;vif_table[i].flags &amp; VIFF_STATIC) &amp;&amp; !(flags &amp; MRT6_FLUSH_MIFS)))</div><div class='add'>+				continue;</div><div class='add'>+			mif6_delete(mrt, i, 0, &amp;list);</div><div class='add'>+		}</div><div class='add'>+		unregister_netdevice_many(&amp;list);</div><div class='ctx'> 	}</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='ctx'> </div><div class='ctx'> 	/* Wipe the cache */</div><div class='del'>-	list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='del'>-		if (!all &amp;&amp; (c-&gt;mfc_flags &amp; MFC_STATIC))</div><div class='del'>-			continue;</div><div class='del'>-		rhltable_remove(&amp;mrt-&gt;mfc_hash, &amp;c-&gt;mnode, ip6mr_rht_params);</div><div class='del'>-		list_del_rcu(&amp;c-&gt;list);</div><div class='del'>-		mr6_netlink_event(mrt, (struct mfc6_cache *)c, RTM_DELROUTE);</div><div class='del'>-		mr_cache_put(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) != 0) {</div><div class='del'>-		spin_lock_bh(&amp;mfc_unres_lock);</div><div class='del'>-		list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='del'>-			list_del(&amp;c-&gt;list);</div><div class='add'>+	if (flags &amp; (MRT6_FLUSH_MFC | MRT6_FLUSH_MFC_STATIC)) {</div><div class='add'>+		list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_cache_list, list) {</div><div class='add'>+			if (((c-&gt;mfc_flags &amp; MFC_STATIC) &amp;&amp; !(flags &amp; MRT6_FLUSH_MFC_STATIC)) ||</div><div class='add'>+			    (!(c-&gt;mfc_flags &amp; MFC_STATIC) &amp;&amp; !(flags &amp; MRT6_FLUSH_MFC)))</div><div class='add'>+				continue;</div><div class='add'>+			rhltable_remove(&amp;mrt-&gt;mfc_hash, &amp;c-&gt;mnode, ip6mr_rht_params);</div><div class='add'>+			list_del_rcu(&amp;c-&gt;list);</div><div class='ctx'> 			call_ip6mr_mfc_entry_notifiers(read_pnet(&amp;mrt-&gt;net),</div><div class='ctx'> 						       FIB_EVENT_ENTRY_DEL,</div><div class='del'>-						       (struct mfc6_cache *)c,</div><div class='del'>-						       mrt-&gt;id);</div><div class='del'>-			mr6_netlink_event(mrt, (struct mfc6_cache *)c,</div><div class='del'>-					  RTM_DELROUTE);</div><div class='del'>-			ip6mr_destroy_unres(mrt, (struct mfc6_cache *)c);</div><div class='add'>+						       (struct mfc6_cache *)c, mrt-&gt;id);</div><div class='add'>+			mr6_netlink_event(mrt, (struct mfc6_cache *)c, RTM_DELROUTE);</div><div class='add'>+			mr_cache_put(c);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MRT6_FLUSH_MFC) {</div><div class='add'>+		if (atomic_read(&amp;mrt-&gt;cache_resolve_queue_len) != 0) {</div><div class='add'>+			spin_lock_bh(&amp;mfc_unres_lock);</div><div class='add'>+			list_for_each_entry_safe(c, tmp, &amp;mrt-&gt;mfc_unres_queue, list) {</div><div class='add'>+				list_del(&amp;c-&gt;list);</div><div class='add'>+				mr6_netlink_event(mrt, (struct mfc6_cache *)c,</div><div class='add'>+						  RTM_DELROUTE);</div><div class='add'>+				ip6mr_destroy_unres(mrt, (struct mfc6_cache *)c);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;mfc_unres_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1525,15 +1587,15 @@ static int ip6mr_sk_init(struct mr_table *mrt, struct sock *sk)</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	write_lock_bh(&amp;mrt_lock);</div><div class='add'>+	spin_lock(&amp;mrt_lock);</div><div class='ctx'> 	if (rtnl_dereference(mrt-&gt;mroute_sk)) {</div><div class='ctx'> 		err = -EADDRINUSE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rcu_assign_pointer(mrt-&gt;mroute_sk, sk);</div><div class='ctx'> 		sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='del'>-		net-&gt;ipv6.devconf_all-&gt;mc_forwarding++;</div><div class='add'>+		atomic_inc(&amp;net-&gt;ipv6.devconf_all-&gt;mc_forwarding);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+	spin_unlock(&amp;mrt_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='hunk'>@@ -1547,31 +1609,36 @@ static int ip6mr_sk_init(struct mr_table *mrt, struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> int ip6mr_sk_done(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	int err = -EACCES;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct ipv6_devconf *devconf;</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='add'>+	int err = -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type != SOCK_RAW ||</div><div class='ctx'> 	    inet_sk(sk)-&gt;inet_num != IPPROTO_ICMPV6)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	devconf = net-&gt;ipv6.devconf_all;</div><div class='add'>+	if (!devconf || !atomic_read(&amp;devconf-&gt;mc_forwarding))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	ip6mr_for_each_table(mrt, net) {</div><div class='ctx'> 		if (sk == rtnl_dereference(mrt-&gt;mroute_sk)) {</div><div class='del'>-			write_lock_bh(&amp;mrt_lock);</div><div class='add'>+			spin_lock(&amp;mrt_lock);</div><div class='ctx'> 			RCU_INIT_POINTER(mrt-&gt;mroute_sk, NULL);</div><div class='ctx'> 			/* Note that mroute_sk had SOCK_RCU_FREE set,</div><div class='ctx'> 			 * so the RCU grace period before sk freeing</div><div class='ctx'> 			 * is guaranteed by sk_destruct()</div><div class='ctx'> 			 */</div><div class='del'>-			net-&gt;ipv6.devconf_all-&gt;mc_forwarding--;</div><div class='del'>-			write_unlock_bh(&amp;mrt_lock);</div><div class='add'>+			atomic_dec(&amp;devconf-&gt;mc_forwarding);</div><div class='add'>+			spin_unlock(&amp;mrt_lock);</div><div class='ctx'> 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,</div><div class='ctx'> 						     NETCONFA_MC_FORWARDING,</div><div class='ctx'> 						     NETCONFA_IFINDEX_ALL,</div><div class='ctx'> 						     net-&gt;ipv6.devconf_all);</div><div class='ctx'> </div><div class='del'>-			mroute_clean_tables(mrt, false);</div><div class='add'>+			mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MFC);</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1604,7 +1671,8 @@ EXPORT_SYMBOL(mroute6_is_socket);</div><div class='ctx'>  *	MOSPF/PIM router set up we can clean this up.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsigned int optlen)</div><div class='add'>+int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval,</div><div class='add'>+			  unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, parent = 0;</div><div class='ctx'> 	struct mif6ctl vif;</div><div class='hunk'>@@ -1640,7 +1708,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> 	case MRT6_ADD_MIF:</div><div class='ctx'> 		if (optlen &lt; sizeof(vif))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;vif, optval, sizeof(vif)))</div><div class='add'>+		if (copy_from_sockptr(&amp;vif, optval, sizeof(vif)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (vif.mif6c_mifi &gt;= MAXMIFS)</div><div class='ctx'> 			return -ENFILE;</div><div class='hunk'>@@ -1653,7 +1721,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> 	case MRT6_DEL_MIF:</div><div class='ctx'> 		if (optlen &lt; sizeof(mifi_t))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;mifi, optval, sizeof(mifi_t)))</div><div class='add'>+		if (copy_from_sockptr(&amp;mifi, optval, sizeof(mifi_t)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 		ret = mif6_delete(mrt, mifi, 0, NULL);</div><div class='hunk'>@@ -1667,12 +1735,12 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> 	case MRT6_ADD_MFC:</div><div class='ctx'> 	case MRT6_DEL_MFC:</div><div class='ctx'> 		parent = -1;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case MRT6_ADD_MFC_PROXY:</div><div class='ctx'> 	case MRT6_DEL_MFC_PROXY:</div><div class='ctx'> 		if (optlen &lt; sizeof(mfc))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;mfc, optval, sizeof(mfc)))</div><div class='add'>+		if (copy_from_sockptr(&amp;mfc, optval, sizeof(mfc)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (parent == 0)</div><div class='ctx'> 			parent = mfc.mf6cc_parent;</div><div class='hunk'>@@ -1687,6 +1755,20 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	case MRT6_FLUSH:</div><div class='add'>+	{</div><div class='add'>+		int flags;</div><div class='add'>+</div><div class='add'>+		if (optlen != sizeof(flags))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;flags, optval, sizeof(flags)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		mroute_clean_tables(mrt, flags);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Control PIM assert (to activate pim will activate assert)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1696,7 +1778,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> </div><div class='ctx'> 		if (optlen != sizeof(v))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (get_user(v, (int __user *)optval))</div><div class='add'>+		if (copy_from_sockptr(&amp;v, optval, sizeof(v)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		mrt-&gt;mroute_do_assert = v;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1705,18 +1787,22 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='ctx'> 	case MRT6_PIM:</div><div class='ctx'> 	{</div><div class='add'>+		bool do_wrmifwhole;</div><div class='ctx'> 		int v;</div><div class='ctx'> </div><div class='ctx'> 		if (optlen != sizeof(v))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (get_user(v, (int __user *)optval))</div><div class='add'>+		if (copy_from_sockptr(&amp;v, optval, sizeof(v)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		do_wrmifwhole = (v == MRT6MSG_WRMIFWHOLE);</div><div class='ctx'> 		v = !!v;</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (v != mrt-&gt;mroute_do_pim) {</div><div class='ctx'> 			mrt-&gt;mroute_do_pim = v;</div><div class='ctx'> 			mrt-&gt;mroute_do_assert = v;</div><div class='add'>+			mrt-&gt;mroute_do_wrvifwhole = do_wrmifwhole;</div><div class='ctx'> 		}</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1730,7 +1816,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'> </div><div class='ctx'> 		if (optlen != sizeof(u32))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (get_user(v, (u32 __user *)optval))</div><div class='add'>+		if (copy_from_sockptr(&amp;v, optval, sizeof(v)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		/* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */</div><div class='ctx'> 		if (v != RT_TABLE_DEFAULT &amp;&amp; v &gt;= 100000000)</div><div class='hunk'>@@ -1762,8 +1848,8 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns</div><div class='ctx'>  *	Getsock opt support for the multicast routing system.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int ip6_mroute_getsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='del'>-			  int __user *optlen)</div><div class='add'>+int ip6_mroute_getsockopt(struct sock *sk, int optname, sockptr_t optval,</div><div class='add'>+			  sockptr_t optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int olr;</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -1794,16 +1880,16 @@ int ip6_mroute_getsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (get_user(olr, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;olr, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	olr = min_t(int, olr, sizeof(int));</div><div class='ctx'> 	if (olr &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (put_user(olr, optlen))</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;olr, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (copy_to_user(optval, &amp;val, olr))</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;val, olr))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1811,11 +1897,10 @@ int ip6_mroute_getsockopt(struct sock *sk, int optname, char __user *optval,</div><div class='ctx'> /*</div><div class='ctx'>  *	The IP multicast ioctl support routines.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)</div><div class='add'>+int ip6mr_ioctl(struct sock *sk, int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct sioc_sg_req6 sr;</div><div class='del'>-	struct sioc_mif_req6 vr;</div><div class='add'>+	struct sioc_sg_req6 *sr;</div><div class='add'>+	struct sioc_mif_req6 *vr;</div><div class='ctx'> 	struct vif_device *vif;</div><div class='ctx'> 	struct mfc6_cache *c;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='hunk'>@@ -1827,39 +1912,33 @@ int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGETMIFCNT_IN6:</div><div class='del'>-		if (copy_from_user(&amp;vr, arg, sizeof(vr)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (vr.mifi &gt;= mrt-&gt;maxvif)</div><div class='add'>+		vr = (struct sioc_mif_req6 *)arg;</div><div class='add'>+		if (vr-&gt;mifi &gt;= mrt-&gt;maxvif)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='del'>-		vif = &amp;mrt-&gt;vif_table[vr.mifi];</div><div class='del'>-		if (VIF_EXISTS(mrt, vr.mifi)) {</div><div class='del'>-			vr.icount = vif-&gt;pkt_in;</div><div class='del'>-			vr.ocount = vif-&gt;pkt_out;</div><div class='del'>-			vr.ibytes = vif-&gt;bytes_in;</div><div class='del'>-			vr.obytes = vif-&gt;bytes_out;</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='del'>-</div><div class='del'>-			if (copy_to_user(arg, &amp;vr, sizeof(vr)))</div><div class='del'>-				return -EFAULT;</div><div class='add'>+		vr-&gt;mifi = array_index_nospec(vr-&gt;mifi, mrt-&gt;maxvif);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		vif = &amp;mrt-&gt;vif_table[vr-&gt;mifi];</div><div class='add'>+		if (VIF_EXISTS(mrt, vr-&gt;mifi)) {</div><div class='add'>+			vr-&gt;icount = READ_ONCE(vif-&gt;pkt_in);</div><div class='add'>+			vr-&gt;ocount = READ_ONCE(vif-&gt;pkt_out);</div><div class='add'>+			vr-&gt;ibytes = READ_ONCE(vif-&gt;bytes_in);</div><div class='add'>+			vr-&gt;obytes = READ_ONCE(vif-&gt;bytes_out);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	case SIOCGETSGCNT_IN6:</div><div class='del'>-		if (copy_from_user(&amp;sr, arg, sizeof(sr)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		sr = (struct sioc_sg_req6 *)arg;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		c = ip6mr_cache_find(mrt, &amp;sr.src.sin6_addr, &amp;sr.grp.sin6_addr);</div><div class='add'>+		c = ip6mr_cache_find(mrt, &amp;sr-&gt;src.sin6_addr,</div><div class='add'>+				     &amp;sr-&gt;grp.sin6_addr);</div><div class='ctx'> 		if (c) {</div><div class='del'>-			sr.pktcnt = c-&gt;_c.mfc_un.res.pkt;</div><div class='del'>-			sr.bytecnt = c-&gt;_c.mfc_un.res.bytes;</div><div class='del'>-			sr.wrong_if = c-&gt;_c.mfc_un.res.wrong_if;</div><div class='add'>+			sr-&gt;pktcnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+			sr-&gt;bytecnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+			sr-&gt;wrong_if = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			if (copy_to_user(arg, &amp;sr, sizeof(sr)))</div><div class='del'>-				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -1905,20 +1984,21 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (vr.mifi &gt;= mrt-&gt;maxvif)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		read_lock(&amp;mrt_lock);</div><div class='add'>+		vr.mifi = array_index_nospec(vr.mifi, mrt-&gt;maxvif);</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		vif = &amp;mrt-&gt;vif_table[vr.mifi];</div><div class='ctx'> 		if (VIF_EXISTS(mrt, vr.mifi)) {</div><div class='del'>-			vr.icount = vif-&gt;pkt_in;</div><div class='del'>-			vr.ocount = vif-&gt;pkt_out;</div><div class='del'>-			vr.ibytes = vif-&gt;bytes_in;</div><div class='del'>-			vr.obytes = vif-&gt;bytes_out;</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+			vr.icount = READ_ONCE(vif-&gt;pkt_in);</div><div class='add'>+			vr.ocount = READ_ONCE(vif-&gt;pkt_out);</div><div class='add'>+			vr.ibytes = READ_ONCE(vif-&gt;bytes_in);</div><div class='add'>+			vr.obytes = READ_ONCE(vif-&gt;bytes_out);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(arg, &amp;vr, sizeof(vr)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	case SIOCGETSGCNT_IN6:</div><div class='ctx'> 		if (copy_from_user(&amp;sr, arg, sizeof(sr)))</div><div class='hunk'>@@ -1927,9 +2007,9 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		c = ip6mr_cache_find(mrt, &amp;sr.src.sin6_addr, &amp;sr.grp.sin6_addr);</div><div class='ctx'> 		if (c) {</div><div class='del'>-			sr.pktcnt = c-&gt;_c.mfc_un.res.pkt;</div><div class='del'>-			sr.bytecnt = c-&gt;_c.mfc_un.res.bytes;</div><div class='del'>-			sr.wrong_if = c-&gt;_c.mfc_un.res.wrong_if;</div><div class='add'>+			sr.pktcnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+			sr.bytecnt = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+			sr.wrong_if = atomic_long_read(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(arg, &amp;sr, sizeof(sr)))</div><div class='hunk'>@@ -1946,10 +2026,8 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='del'>-			IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='del'>-	__IP6_ADD_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='del'>-			IPSTATS_MIB_OUTOCTETS, skb-&gt;len);</div><div class='add'>+	IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='add'>+		      IPSTATS_MIB_OUTFORWDATAGRAMS);</div><div class='ctx'> 	return dst_output(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1957,26 +2035,27 @@ static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct</div><div class='ctx'>  *	Processing handlers for ip6mr_forward</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ip6mr_forward2(struct net *net, struct mr_table *mrt,</div><div class='del'>-			  struct sk_buff *skb, struct mfc6_cache *c, int vifi)</div><div class='add'>+static int ip6mr_prepare_xmit(struct net *net, struct mr_table *mrt,</div><div class='add'>+			      struct sk_buff *skb, int vifi)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct vif_device *vif = &amp;mrt-&gt;vif_table[vifi];</div><div class='del'>-	struct net_device *dev;</div><div class='add'>+	struct net_device *vif_dev;</div><div class='add'>+	struct ipv6hdr *ipv6h;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;dev)</div><div class='del'>-		goto out_free;</div><div class='add'>+	vif_dev = vif_dev_read(vif);</div><div class='add'>+	if (!vif_dev)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_PIMSM_V2</div><div class='ctx'> 	if (vif-&gt;flags &amp; MIFF_REGISTER) {</div><div class='del'>-		vif-&gt;pkt_out++;</div><div class='del'>-		vif-&gt;bytes_out += skb-&gt;len;</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-		vif-&gt;dev-&gt;stats.tx_packets++;</div><div class='add'>+		WRITE_ONCE(vif-&gt;pkt_out, vif-&gt;pkt_out + 1);</div><div class='add'>+		WRITE_ONCE(vif-&gt;bytes_out, vif-&gt;bytes_out + skb-&gt;len);</div><div class='add'>+		DEV_STATS_ADD(vif_dev, tx_bytes, skb-&gt;len);</div><div class='add'>+		DEV_STATS_INC(vif_dev, tx_packets);</div><div class='ctx'> 		ip6mr_cache_report(mrt, skb, vifi, MRT6MSG_WHOLEPKT);</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1990,7 +2069,7 @@ static int ip6mr_forward2(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='ctx'> 	if (dst-&gt;error) {</div><div class='ctx'> 		dst_release(dst);</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='hunk'>@@ -2007,52 +2086,78 @@ static int ip6mr_forward2(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 	 * not mrouter) cannot join to more than one interface - it will</div><div class='ctx'> 	 * result in receiving multiple packets.</div><div class='ctx'> 	 */</div><div class='del'>-	dev = vif-&gt;dev;</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	vif-&gt;pkt_out++;</div><div class='del'>-	vif-&gt;bytes_out += skb-&gt;len;</div><div class='add'>+	skb-&gt;dev = vif_dev;</div><div class='add'>+	WRITE_ONCE(vif-&gt;pkt_out, vif-&gt;pkt_out + 1);</div><div class='add'>+	WRITE_ONCE(vif-&gt;bytes_out, vif-&gt;bytes_out + skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* We are about to write */</div><div class='ctx'> 	/* XXX: extension headers? */</div><div class='del'>-	if (skb_cow(skb, sizeof(*ipv6h) + LL_RESERVED_SPACE(dev)))</div><div class='del'>-		goto out_free;</div><div class='add'>+	if (skb_cow(skb, sizeof(*ipv6h) + LL_RESERVED_SPACE(vif_dev)))</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 	ipv6h-&gt;hop_limit--;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ip6mr_forward2(struct net *net, struct mr_table *mrt,</div><div class='add'>+			   struct sk_buff *skb, int vifi)</div><div class='add'>+{</div><div class='add'>+	struct net_device *indev = skb-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (ip6mr_prepare_xmit(net, mrt, skb, vifi))</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	IP6CB(skb)-&gt;flags |= IP6SKB_FORWARDED;</div><div class='ctx'> </div><div class='del'>-	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,</div><div class='del'>-		       net, NULL, skb, skb-&gt;dev, dev,</div><div class='del'>-		       ip6mr_forward2_finish);</div><div class='add'>+	NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,</div><div class='add'>+		net, NULL, skb, indev, skb-&gt;dev,</div><div class='add'>+		ip6mr_forward2_finish);</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ip6mr_output2(struct net *net, struct mr_table *mrt,</div><div class='add'>+			  struct sk_buff *skb, int vifi)</div><div class='add'>+{</div><div class='add'>+	if (ip6mr_prepare_xmit(net, mrt, skb, vifi))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	ip6_output(net, NULL, skb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with rcu_read_lock() */</div><div class='ctx'> static int ip6mr_find_vif(struct mr_table *mrt, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ct;</div><div class='ctx'> </div><div class='del'>-	for (ct = mrt-&gt;maxvif - 1; ct &gt;= 0; ct--) {</div><div class='del'>-		if (mrt-&gt;vif_table[ct].dev == dev)</div><div class='add'>+	/* Pairs with WRITE_ONCE() in mif6_delete()/mif6_add() */</div><div class='add'>+	for (ct = READ_ONCE(mrt-&gt;maxvif) - 1; ct &gt;= 0; ct--) {</div><div class='add'>+		if (rcu_access_pointer(mrt-&gt;vif_table[ct].dev) == dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ct;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='ctx'> static void ip6_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='del'>-			   struct sk_buff *skb, struct mfc6_cache *c)</div><div class='add'>+			   struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			   struct mfc6_cache *c)</div><div class='ctx'> {</div><div class='ctx'> 	int psend = -1;</div><div class='ctx'> 	int vif, ct;</div><div class='del'>-	int true_vifi = ip6mr_find_vif(mrt, skb-&gt;dev);</div><div class='add'>+	int true_vifi = ip6mr_find_vif(mrt, dev);</div><div class='ctx'> </div><div class='ctx'> 	vif = c-&gt;_c.mfc_parent;</div><div class='del'>-	c-&gt;_c.mfc_un.res.pkt++;</div><div class='del'>-	c-&gt;_c.mfc_un.res.bytes += skb-&gt;len;</div><div class='del'>-	c-&gt;_c.mfc_un.res.lastuse = jiffies;</div><div class='add'>+	atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+	atomic_long_add(skb-&gt;len, &amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+	WRITE_ONCE(c-&gt;_c.mfc_un.res.lastuse, jiffies);</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_any(&amp;c-&gt;mf6c_origin) &amp;&amp; true_vifi &gt;= 0) {</div><div class='ctx'> 		struct mfc6_cache *cache_proxy;</div><div class='hunk'>@@ -2060,21 +2165,17 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 		/* For an (*,G) entry, we only check that the incoming</div><div class='ctx'> 		 * interface is part of the static tree.</div><div class='ctx'> 		 */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		cache_proxy = mr_mfc_find_any_parent(mrt, vif);</div><div class='ctx'> 		if (cache_proxy &amp;&amp;</div><div class='del'>-		    cache_proxy-&gt;_c.mfc_un.res.ttls[true_vifi] &lt; 255) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+		    cache_proxy-&gt;_c.mfc_un.res.ttls[true_vifi] &lt; 255)</div><div class='ctx'> 			goto forward;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wrong interface: drop packet and (maybe) send PIM assert.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mrt-&gt;vif_table[vif].dev != skb-&gt;dev) {</div><div class='del'>-		c-&gt;_c.mfc_un.res.wrong_if++;</div><div class='add'>+	if (rcu_access_pointer(mrt-&gt;vif_table[vif].dev) != dev) {</div><div class='add'>+		atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.wrong_if);</div><div class='ctx'> </div><div class='ctx'> 		if (true_vifi &gt;= 0 &amp;&amp; mrt-&gt;mroute_do_assert &amp;&amp;</div><div class='ctx'> 		    /* pimsm uses asserts, when switching from RPT to SPT,</div><div class='hunk'>@@ -2089,13 +2190,18 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt,</div><div class='ctx'> 			       MFC_ASSERT_THRESH)) {</div><div class='ctx'> 			c-&gt;_c.mfc_un.res.last_assert = jiffies;</div><div class='ctx'> 			ip6mr_cache_report(mrt, skb, true_vifi, MRT6MSG_WRONGMIF);</div><div class='add'>+			if (mrt-&gt;mroute_do_wrvifwhole)</div><div class='add'>+				ip6mr_cache_report(mrt, skb, true_vifi,</div><div class='add'>+						   MRT6MSG_WRMIFWHOLE);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto dont_forward;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> forward:</div><div class='del'>-	mrt-&gt;vif_table[vif].pkt_in++;</div><div class='del'>-	mrt-&gt;vif_table[vif].bytes_in += skb-&gt;len;</div><div class='add'>+	WRITE_ONCE(mrt-&gt;vif_table[vif].pkt_in,</div><div class='add'>+		   mrt-&gt;vif_table[vif].pkt_in + 1);</div><div class='add'>+	WRITE_ONCE(mrt-&gt;vif_table[vif].bytes_in,</div><div class='add'>+		   mrt-&gt;vif_table[vif].bytes_in + skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Forward the frame</div><div class='hunk'>@@ -2123,15 +2229,14 @@ forward:</div><div class='ctx'> 			if (psend != -1) {</div><div class='ctx'> 				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 				if (skb2)</div><div class='del'>-					ip6mr_forward2(net, mrt, skb2,</div><div class='del'>-						       c, psend);</div><div class='add'>+					ip6mr_forward2(net, mrt, skb2, psend);</div><div class='ctx'> 			}</div><div class='ctx'> 			psend = ct;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> last_forward:</div><div class='ctx'> 	if (psend != -1) {</div><div class='del'>-		ip6mr_forward2(net, mrt, skb, c, psend);</div><div class='add'>+		ip6mr_forward2(net, mrt, skb, psend);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2139,6 +2244,56 @@ dont_forward:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='add'>+static void ip6_mr_output_finish(struct net *net, struct mr_table *mrt,</div><div class='add'>+				 struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+				 struct mfc6_cache *c)</div><div class='add'>+{</div><div class='add'>+	int psend = -1;</div><div class='add'>+	int ct;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='add'>+</div><div class='add'>+	atomic_long_inc(&amp;c-&gt;_c.mfc_un.res.pkt);</div><div class='add'>+	atomic_long_add(skb-&gt;len, &amp;c-&gt;_c.mfc_un.res.bytes);</div><div class='add'>+	WRITE_ONCE(c-&gt;_c.mfc_un.res.lastuse, jiffies);</div><div class='add'>+</div><div class='add'>+	/* Forward the frame */</div><div class='add'>+	if (ipv6_addr_any(&amp;c-&gt;mf6c_origin) &amp;&amp;</div><div class='add'>+	    ipv6_addr_any(&amp;c-&gt;mf6c_mcastgrp)) {</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;hop_limit &gt;</div><div class='add'>+		    c-&gt;_c.mfc_un.res.ttls[c-&gt;_c.mfc_parent]) {</div><div class='add'>+			/* It's an (*,*) entry and the packet is not coming from</div><div class='add'>+			 * the upstream: forward the packet to the upstream</div><div class='add'>+			 * only.</div><div class='add'>+			 */</div><div class='add'>+			psend = c-&gt;_c.mfc_parent;</div><div class='add'>+			goto last_forward;</div><div class='add'>+		}</div><div class='add'>+		goto dont_forward;</div><div class='add'>+	}</div><div class='add'>+	for (ct = c-&gt;_c.mfc_un.res.maxvif - 1;</div><div class='add'>+	     ct &gt;= c-&gt;_c.mfc_un.res.minvif; ct--) {</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;hop_limit &gt; c-&gt;_c.mfc_un.res.ttls[ct]) {</div><div class='add'>+			if (psend != -1) {</div><div class='add'>+				struct sk_buff *skb2;</div><div class='add'>+</div><div class='add'>+				skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+				if (skb2)</div><div class='add'>+					ip6mr_output2(net, mrt, skb2, psend);</div><div class='add'>+			}</div><div class='add'>+			psend = ct;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+last_forward:</div><div class='add'>+	if (psend != -1) {</div><div class='add'>+		ip6mr_output2(net, mrt, skb, psend);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+dont_forward:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Multicast packets for forwarding arrive here</div><div class='hunk'>@@ -2146,26 +2301,37 @@ dont_forward:</div><div class='ctx'> </div><div class='ctx'> int ip6_mr_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	struct net *net = dev_net_rcu(dev);</div><div class='ctx'> 	struct mfc6_cache *cache;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='del'>-		.flowi6_iif	= skb-&gt;dev-&gt;ifindex,</div><div class='add'>+		.flowi6_iif	= dev-&gt;ifindex,</div><div class='ctx'> 		.flowi6_mark	= skb-&gt;mark,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* skb-&gt;dev passed in is the master dev for vrfs.</div><div class='add'>+	 * Get the proper interface that does have a vif associated with it.</div><div class='add'>+	 */</div><div class='add'>+	if (netif_is_l3_master(dev)) {</div><div class='add'>+		dev = dev_get_by_index_rcu(net, IPCB(skb)-&gt;iif);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = ip6mr_fib_lookup(net, &amp;fl6, &amp;mrt);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	cache = ip6mr_cache_find(mrt,</div><div class='ctx'> 				 &amp;ipv6_hdr(skb)-&gt;saddr, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> 	if (!cache) {</div><div class='del'>-		int vif = ip6mr_find_vif(mrt, skb-&gt;dev);</div><div class='add'>+		int vif = ip6mr_find_vif(mrt, dev);</div><div class='ctx'> </div><div class='ctx'> 		if (vif &gt;= 0)</div><div class='ctx'> 			cache = ip6mr_cache_find_any(mrt,</div><div class='hunk'>@@ -2179,23 +2345,74 @@ int ip6_mr_input(struct sk_buff *skb)</div><div class='ctx'> 	if (!cache) {</div><div class='ctx'> 		int vif;</div><div class='ctx'> </div><div class='del'>-		vif = ip6mr_find_vif(mrt, skb-&gt;dev);</div><div class='add'>+		vif = ip6mr_find_vif(mrt, dev);</div><div class='ctx'> 		if (vif &gt;= 0) {</div><div class='del'>-			int err = ip6mr_cache_unresolved(mrt, vif, skb);</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+			int err = ip6mr_cache_unresolved(mrt, vif, skb, dev);</div><div class='ctx'> </div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ip6_mr_forward(net, mrt, skb, cache);</div><div class='add'>+	ip6_mr_forward(net, mrt, dev, skb, cache);</div><div class='ctx'> </div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ip6_mr_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	struct flowi6 fl6 = (struct flowi6) {</div><div class='add'>+		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		.flowi6_mark = skb-&gt;mark,</div><div class='add'>+	};</div><div class='add'>+	struct mfc6_cache *cache;</div><div class='add'>+	struct mr_table *mrt;</div><div class='add'>+	int err;</div><div class='add'>+	int vif;</div><div class='ctx'> </div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	if (IP6CB(skb)-&gt;flags &amp; IP6SKB_FORWARDED)</div><div class='add'>+		goto ip6_output;</div><div class='add'>+	if (!(IP6CB(skb)-&gt;flags &amp; IP6SKB_MCROUTE))</div><div class='add'>+		goto ip6_output;</div><div class='add'>+</div><div class='add'>+	err = ip6mr_fib_lookup(net, &amp;fl6, &amp;mrt);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cache = ip6mr_cache_find(mrt,</div><div class='add'>+				 &amp;ipv6_hdr(skb)-&gt;saddr, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='add'>+	if (!cache) {</div><div class='add'>+		vif = ip6mr_find_vif(mrt, dev);</div><div class='add'>+		if (vif &gt;= 0)</div><div class='add'>+			cache = ip6mr_cache_find_any(mrt,</div><div class='add'>+						     &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+						     vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No usable cache entry */</div><div class='add'>+	if (!cache) {</div><div class='add'>+		vif = ip6mr_find_vif(mrt, dev);</div><div class='add'>+		if (vif &gt;= 0)</div><div class='add'>+			return ip6mr_cache_unresolved(mrt, vif, skb, dev);</div><div class='add'>+		goto ip6_output;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wrong interface */</div><div class='add'>+	vif = cache-&gt;_c.mfc_parent;</div><div class='add'>+	if (rcu_access_pointer(mrt-&gt;vif_table[vif].dev) != dev)</div><div class='add'>+		goto ip6_output;</div><div class='add'>+</div><div class='add'>+	ip6_mr_output_finish(net, mrt, dev, skb, cache);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ip6_output:</div><div class='add'>+	return ip6_output(net, sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,</div><div class='hunk'>@@ -2204,13 +2421,15 @@ int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct mr_table *mrt;</div><div class='ctx'> 	struct mfc6_cache *cache;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(skb_dst(skb));</div><div class='ctx'> </div><div class='del'>-	mrt = ip6mr_get_table(net, RT6_TABLE_DFLT);</div><div class='del'>-	if (!mrt)</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mrt = __ip6mr_get_table(net, RT6_TABLE_DFLT);</div><div class='add'>+	if (!mrt) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;mrt_lock);</div><div class='ctx'> 	cache = ip6mr_cache_find(mrt, &amp;rt-&gt;rt6i_src.addr, &amp;rt-&gt;rt6i_dst.addr);</div><div class='ctx'> 	if (!cache &amp;&amp; skb-&gt;dev) {</div><div class='ctx'> 		int vif = ip6mr_find_vif(mrt, skb-&gt;dev);</div><div class='hunk'>@@ -2228,14 +2447,14 @@ int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,</div><div class='ctx'> </div><div class='ctx'> 		dev = skb-&gt;dev;</div><div class='ctx'> 		if (!dev || (vif = ip6mr_find_vif(mrt, dev)) &lt; 0) {</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* really correct? */</div><div class='ctx'> 		skb2 = alloc_skb(sizeof(struct ipv6hdr), GFP_ATOMIC);</div><div class='ctx'> 		if (!skb2) {</div><div class='del'>-			read_unlock(&amp;mrt_lock);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2257,14 +2476,14 @@ int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,</div><div class='ctx'> 		iph-&gt;saddr = rt-&gt;rt6i_src.addr;</div><div class='ctx'> 		iph-&gt;daddr = rt-&gt;rt6i_dst.addr;</div><div class='ctx'> </div><div class='del'>-		err = ip6mr_cache_unresolved(mrt, vif, skb2);</div><div class='del'>-		read_unlock(&amp;mrt_lock);</div><div class='add'>+		err = ip6mr_cache_unresolved(mrt, vif, skb2, dev);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mr_fill_mroute(mrt, skb, &amp;cache-&gt;_c, rtm);</div><div class='del'>-	read_unlock(&amp;mrt_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2362,8 +2581,7 @@ static void mr6_netlink_event(struct mr_table *mrt, struct mfc6_cache *mfc,</div><div class='ctx'> </div><div class='ctx'> errout:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t mrt6msg_netlink_msgsize(size_t payloadlen)</div><div class='hunk'>@@ -2383,7 +2601,7 @@ static size_t mrt6msg_netlink_msgsize(size_t payloadlen)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mrt6msg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt)</div><div class='add'>+static void mrt6msg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = read_pnet(&amp;mrt-&gt;net);</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='hunk'>@@ -2431,8 +2649,126 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE_R, -ENOBUFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nla_policy ip6mr_getroute_policy[RTA_MAX + 1] = {</div><div class='add'>+	[RTA_SRC]		= NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+	[RTA_DST]		= NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='add'>+	[RTA_TABLE]		= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ip6mr_rtm_valid_getroute_req(struct sk_buff *skb,</div><div class='add'>+					const struct nlmsghdr *nlh,</div><div class='add'>+					struct nlattr **tb,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rtmsg *rtm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, ip6mr_getroute_policy,</div><div class='add'>+			  extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rtm = nlmsg_data(nlh);</div><div class='add'>+	if ((rtm-&gt;rtm_src_len &amp;&amp; rtm-&gt;rtm_src_len != 128) ||</div><div class='add'>+	    (rtm-&gt;rtm_dst_len &amp;&amp; rtm-&gt;rtm_dst_len != 128) ||</div><div class='add'>+	    rtm-&gt;rtm_tos || rtm-&gt;rtm_table || rtm-&gt;rtm_protocol ||</div><div class='add'>+	    rtm-&gt;rtm_scope || rtm-&gt;rtm_type || rtm-&gt;rtm_flags) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Invalid values in header for multicast route get request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((tb[RTA_SRC] &amp;&amp; !rtm-&gt;rtm_src_len) ||</div><div class='add'>+	    (tb[RTA_DST] &amp;&amp; !rtm-&gt;rtm_dst_len)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "rtm_src_len and rtm_dst_len must be 128 for IPv6");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip6mr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(in_skb-&gt;sk);</div><div class='add'>+	struct in6_addr src = {}, grp = {};</div><div class='add'>+	struct nlattr *tb[RTA_MAX + 1];</div><div class='add'>+	struct mfc6_cache *cache;</div><div class='add'>+	struct mr_table *mrt;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 tableid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ip6mr_rtm_valid_getroute_req(in_skb, nlh, tb, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[RTA_SRC])</div><div class='add'>+		src = nla_get_in6_addr(tb[RTA_SRC]);</div><div class='add'>+	if (tb[RTA_DST])</div><div class='add'>+		grp = nla_get_in6_addr(tb[RTA_DST]);</div><div class='add'>+	tableid = nla_get_u32_default(tb[RTA_TABLE], 0);</div><div class='add'>+</div><div class='add'>+	mrt = __ip6mr_get_table(net, tableid ?: RT_TABLE_DEFAULT);</div><div class='add'>+	if (!mrt) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "MR table does not exist");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* entries are added/deleted only under RTNL */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	cache = ip6mr_cache_find(mrt, &amp;src, &amp;grp);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!cache) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "MR cache entry not found");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(mr6_msgsize(false, mrt-&gt;maxvif), GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	err = ip6mr_fill_mroute(mrt, skb, NETLINK_CB(in_skb).portid,</div><div class='add'>+				nlh-&gt;nlmsg_seq, cache, RTM_NEWROUTE, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	const struct nlmsghdr *nlh = cb-&gt;nlh;</div><div class='add'>+	struct fib_dump_filter filter = {</div><div class='add'>+		.rtnl_held = true,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;strict_check) {</div><div class='add'>+		err = ip_valid_fib_dump_req(sock_net(skb-&gt;sk), nlh,</div><div class='add'>+					    &amp;filter, cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter.table_id) {</div><div class='add'>+		struct mr_table *mrt;</div><div class='add'>+</div><div class='add'>+		mrt = __ip6mr_get_table(sock_net(skb-&gt;sk), filter.table_id);</div><div class='add'>+		if (!mrt) {</div><div class='add'>+			if (rtnl_msg_family(cb-&gt;nlh) != RTNL_FAMILY_IP6MR)</div><div class='add'>+				return skb-&gt;len;</div><div class='add'>+</div><div class='add'>+			NL_SET_ERR_MSG_MOD(cb-&gt;extack, "MR table does not exist");</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		err = mr_table_dump(mrt, skb, cb, _ip6mr_fill_mroute,</div><div class='add'>+				    &amp;mfc_unres_lock, &amp;filter);</div><div class='add'>+		return skb-&gt;len ? : err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mr_rtm_dumproute(skb, cb, ip6mr_mr_table_iter,</div><div class='del'>-				_ip6mr_fill_mroute, &amp;mfc_unres_lock);</div><div class='add'>+				_ip6mr_fill_mroute, &amp;mfc_unres_lock, &amp;filter);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c<br/>index 54d165b9845a..8607569de34f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ipcomp6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ipcomp6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ipcomp6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ipcomp6.c</a></div><div class='hunk'>@@ -1,22 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C)2003 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='ctx'>  * Author	Mitsuru KANDA  &lt;mk@linux-ipv6.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'>  * [Memo]</div><div class='hunk'>@@ -83,6 +71,7 @@ static int ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct lock_class_key xfrm_state_lock_key;</div><div class='ctx'> static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = xs_net(x);</div><div class='hunk'>@@ -91,6 +80,7 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> 	t = xfrm_state_alloc(net);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		goto out;</div><div class='add'>+	lockdep_set_class(&amp;t-&gt;lock, &amp;xfrm_state_lock_key);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;id.proto = IPPROTO_IPV6;</div><div class='ctx'> 	t-&gt;id.spi = xfrm6_tunnel_alloc_spi(net, (xfrm_address_t *)&amp;x-&gt;props.saddr);</div><div class='hunk'>@@ -103,6 +93,7 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)</div><div class='ctx'> 	t-&gt;props.mode = x-&gt;props.mode;</div><div class='ctx'> 	memcpy(t-&gt;props.saddr.a6, x-&gt;props.saddr.a6, sizeof(struct in6_addr));</div><div class='ctx'> 	memcpy(&amp;t-&gt;mark, &amp;x-&gt;mark, sizeof(t-&gt;mark));</div><div class='add'>+	t-&gt;if_id = x-&gt;if_id;</div><div class='ctx'> </div><div class='ctx'> 	if (xfrm_init_state(t))</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -147,7 +138,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipcomp6_init_state(struct xfrm_state *x)</div><div class='add'>+static int ipcomp6_init_state(struct xfrm_state *x,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -159,17 +151,20 @@ static int ipcomp6_init_state(struct xfrm_state *x)</div><div class='ctx'> 		x-&gt;props.header_len += sizeof(struct ipv6hdr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported XFRM mode for IPcomp");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ipcomp_init_state(x);</div><div class='add'>+	err = ipcomp_init_state(x, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;props.mode == XFRM_MODE_TUNNEL) {</div><div class='ctx'> 		err = ipcomp6_tunnel_attach(x);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Kernel error: failed to initialize the associated state");</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -183,18 +178,17 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type ipcomp6_type = {</div><div class='del'>-	.description	= "IPCOMP6",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_COMP,</div><div class='ctx'> 	.init_state	= ipcomp6_init_state,</div><div class='ctx'> 	.destructor	= ipcomp_destroy,</div><div class='ctx'> 	.input		= ipcomp_input,</div><div class='ctx'> 	.output		= ipcomp_output,</div><div class='del'>-	.hdr_offset	= xfrm6_find_1stfragopt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_protocol ipcomp6_protocol = {</div><div class='ctx'> 	.handler	= xfrm6_rcv,</div><div class='add'>+	.input_handler	= xfrm_input,</div><div class='ctx'> 	.cb_handler	= ipcomp6_rcv_cb,</div><div class='ctx'> 	.err_handler	= ipcomp6_err,</div><div class='ctx'> 	.priority	= 0,</div><div class='hunk'>@@ -218,8 +212,7 @@ static void __exit ipcomp6_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfrm6_protocol_deregister(&amp;ipcomp6_protocol, IPPROTO_COMP) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove protocol\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;ipcomp6_type, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;ipcomp6_type, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ipcomp6_init);</div><div class='head'>diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c<br/>index c0cac9cc3a28..a61e742794f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ipv6_sockglue.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ipv6_sockglue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ipv6_sockglue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ipv6_sockglue.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 BSD socket options interface</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on linux/net/ipv4/ip_sockglue.c</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	FIXME: Make the setsockopt code POSIX compliant: That is</div><div class='ctx'>  *</div><div class='ctx'>  *	o	Truncate getsockopt returns</div><div class='hunk'>@@ -53,12 +49,15 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/compat.h&gt;</div><div class='ctx'> #include &lt;net/seg6.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ip6_ra_chain *ip6_ra_chain;</div><div class='ctx'> DEFINE_RWLOCK(ip6_ra_lock);</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(ip6_min_hopcount);</div><div class='add'>+</div><div class='ctx'> int ip6_ra_control(struct sock *sk, int sel)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_ra_chain *ra, *new_ra, **rap;</div><div class='hunk'>@@ -68,6 +67,8 @@ int ip6_ra_control(struct sock *sk, int sel)</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> </div><div class='ctx'> 	new_ra = (sel &gt;= 0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;</div><div class='add'>+	if (sel &gt;= 0 &amp;&amp; !new_ra)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;ip6_ra_lock);</div><div class='ctx'> 	for (rap = &amp;ip6_ra_chain; (ra = *rap) != NULL; rap = &amp;ra-&gt;next) {</div><div class='hunk'>@@ -102,56 +103,290 @@ int ip6_ra_control(struct sock *sk, int sel)</div><div class='ctx'> struct ipv6_txoptions *ipv6_update_options(struct sock *sk,</div><div class='ctx'> 					   struct ipv6_txoptions *opt)</div><div class='ctx'> {</div><div class='del'>-	if (inet_sk(sk)-&gt;is_icsk) {</div><div class='add'>+	if (inet_test_bit(IS_ICSK, sk)) {</div><div class='ctx'> 		if (opt &amp;&amp;</div><div class='ctx'> 		    !((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE)) &amp;&amp;</div><div class='ctx'> 		    inet_sk(sk)-&gt;inet_daddr != LOOPBACK4_IPV6) {</div><div class='ctx'> 			struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-			icsk-&gt;icsk_ext_hdr_len = opt-&gt;opt_flen + opt-&gt;opt_nflen;</div><div class='add'>+</div><div class='add'>+			icsk-&gt;icsk_ext_hdr_len =</div><div class='add'>+				psp_sk_overhead(sk) +</div><div class='add'>+				opt-&gt;opt_flen + opt-&gt;opt_nflen;</div><div class='ctx'> 			icsk-&gt;icsk_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	opt = xchg((__force struct ipv6_txoptions **)&amp;inet6_sk(sk)-&gt;opt,</div><div class='del'>-		   opt);</div><div class='add'>+	opt = unrcu_pointer(xchg(&amp;inet6_sk(sk)-&gt;opt, RCU_INITIALIZER(opt)));</div><div class='ctx'> 	sk_dst_reset(sk);</div><div class='ctx'> </div><div class='ctx'> 	return opt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool setsockopt_needs_rtnl(int optname)</div><div class='add'>+static int copy_group_source_from_sockptr(struct group_source_req *greqs,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='ctx'> {</div><div class='del'>-	switch (optname) {</div><div class='del'>-	case IPV6_ADDRFORM:</div><div class='del'>-	case IPV6_ADD_MEMBERSHIP:</div><div class='del'>-	case IPV6_DROP_MEMBERSHIP:</div><div class='del'>-	case IPV6_JOIN_ANYCAST:</div><div class='del'>-	case IPV6_LEAVE_ANYCAST:</div><div class='del'>-	case MCAST_JOIN_GROUP:</div><div class='del'>-	case MCAST_LEAVE_GROUP:</div><div class='del'>-	case MCAST_JOIN_SOURCE_GROUP:</div><div class='del'>-	case MCAST_LEAVE_SOURCE_GROUP:</div><div class='del'>-	case MCAST_BLOCK_SOURCE:</div><div class='del'>-	case MCAST_UNBLOCK_SOURCE:</div><div class='del'>-	case MCAST_MSFILTER:</div><div class='del'>-		return true;</div><div class='add'>+	if (in_compat_syscall()) {</div><div class='add'>+		struct compat_group_source_req gr32;</div><div class='add'>+</div><div class='add'>+		if (optlen &lt; sizeof(gr32))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(&amp;gr32, optval, sizeof(gr32)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		greqs-&gt;gsr_interface = gr32.gsr_interface;</div><div class='add'>+		greqs-&gt;gsr_group = gr32.gsr_group;</div><div class='add'>+		greqs-&gt;gsr_source = gr32.gsr_source;</div><div class='add'>+	} else {</div><div class='add'>+		if (optlen &lt; sizeof(*greqs))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_sockptr(greqs, optval, sizeof(*greqs)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_ipv6_mcast_group_source(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct group_source_req greqs;</div><div class='add'>+	int omode, add;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = copy_group_source_from_sockptr(&amp;greqs, optval, optlen);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (greqs.gsr_group.ss_family != AF_INET6 ||</div><div class='add'>+	    greqs.gsr_source.ss_family != AF_INET6)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	if (optname == MCAST_BLOCK_SOURCE) {</div><div class='add'>+		omode = MCAST_EXCLUDE;</div><div class='add'>+		add = 1;</div><div class='add'>+	} else if (optname == MCAST_UNBLOCK_SOURCE) {</div><div class='add'>+		omode = MCAST_EXCLUDE;</div><div class='add'>+		add = 0;</div><div class='add'>+	} else if (optname == MCAST_JOIN_SOURCE_GROUP) {</div><div class='add'>+		struct sockaddr_in6 *psin6;</div><div class='add'>+		int retv;</div><div class='add'>+</div><div class='add'>+		psin6 = (struct sockaddr_in6 *)&amp;greqs.gsr_group;</div><div class='add'>+		retv = ipv6_sock_mc_join_ssm(sk, greqs.gsr_interface,</div><div class='add'>+					     &amp;psin6-&gt;sin6_addr,</div><div class='add'>+					     MCAST_INCLUDE);</div><div class='add'>+		/* prior join w/ different source is ok */</div><div class='add'>+		if (retv &amp;&amp; retv != -EADDRINUSE)</div><div class='add'>+			return retv;</div><div class='add'>+		omode = MCAST_INCLUDE;</div><div class='add'>+		add = 1;</div><div class='add'>+	} else /* MCAST_LEAVE_SOURCE_GROUP */ {</div><div class='add'>+		omode = MCAST_INCLUDE;</div><div class='add'>+		add = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return false;</div><div class='add'>+	return ip6_mc_source(add, omode, sk, &amp;greqs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen)</div><div class='add'>+static int ipv6_set_mcast_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+		int optlen)</div><div class='add'>+{</div><div class='add'>+	struct group_filter *gsf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; GROUP_FILTER_SIZE(0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (optlen &gt; READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max))</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	gsf = memdup_sockptr(optval, optlen);</div><div class='add'>+	if (IS_ERR(gsf))</div><div class='add'>+		return PTR_ERR(gsf);</div><div class='add'>+</div><div class='add'>+	/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='add'>+	ret = -ENOBUFS;</div><div class='add'>+	if (gsf-&gt;gf_numsrc &gt;= 0x1ffffffU ||</div><div class='add'>+	    gsf-&gt;gf_numsrc &gt; sysctl_mld_max_msf)</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (GROUP_FILTER_SIZE(gsf-&gt;gf_numsrc) &gt; optlen)</div><div class='add'>+		goto out_free_gsf;</div><div class='add'>+</div><div class='add'>+	ret = ip6_mc_msfilter(sk, gsf, gsf-&gt;gf_slist_flex);</div><div class='add'>+out_free_gsf:</div><div class='add'>+	kfree(gsf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ipv6_set_mcast_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+		int optlen)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct compat_group_filter, gf_slist_flex);</div><div class='add'>+	struct compat_group_filter *gf32;</div><div class='add'>+	void *p;</div><div class='add'>+	int ret;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (optlen &gt; READ_ONCE(sock_net(sk)-&gt;core.sysctl_optmem_max) - 4)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	p = kmalloc(optlen + 4, GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	gf32 = p + 4; /* we want -&gt;gf_group and -&gt;gf_slist_flex aligned */</div><div class='add'>+	ret = -EFAULT;</div><div class='add'>+	if (copy_from_sockptr(gf32, optval, optlen))</div><div class='add'>+		goto out_free_p;</div><div class='add'>+</div><div class='add'>+	/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='add'>+	ret = -ENOBUFS;</div><div class='add'>+	n = gf32-&gt;gf_numsrc;</div><div class='add'>+	if (n &gt;= 0x1ffffffU || n &gt; sysctl_mld_max_msf)</div><div class='add'>+		goto out_free_p;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (offsetof(struct compat_group_filter, gf_slist_flex[n]) &gt; optlen)</div><div class='add'>+		goto out_free_p;</div><div class='add'>+</div><div class='add'>+	ret = ip6_mc_msfilter(sk, &amp;(struct group_filter){</div><div class='add'>+			.gf_interface = gf32-&gt;gf_interface,</div><div class='add'>+			.gf_group = gf32-&gt;gf_group,</div><div class='add'>+			.gf_fmode = gf32-&gt;gf_fmode,</div><div class='add'>+			.gf_numsrc = gf32-&gt;gf_numsrc}, gf32-&gt;gf_slist_flex);</div><div class='add'>+</div><div class='add'>+out_free_p:</div><div class='add'>+	kfree(p);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv6_mcast_join_leave(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in6 *psin6;</div><div class='add'>+	struct group_req greq;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(greq))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;greq, optval, sizeof(greq)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (greq.gr_group.ss_family != AF_INET6)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	psin6 = (struct sockaddr_in6 *)&amp;greq.gr_group;</div><div class='add'>+	if (optname == MCAST_JOIN_GROUP)</div><div class='add'>+		return ipv6_sock_mc_join(sk, greq.gr_interface,</div><div class='add'>+					 &amp;psin6-&gt;sin6_addr);</div><div class='add'>+	return ipv6_sock_mc_drop(sk, greq.gr_interface, &amp;psin6-&gt;sin6_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ipv6_mcast_join_leave(struct sock *sk, int optname,</div><div class='add'>+		sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	struct compat_group_req gr32;</div><div class='add'>+	struct sockaddr_in6 *psin6;</div><div class='add'>+</div><div class='add'>+	if (optlen &lt; sizeof(gr32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;gr32, optval, sizeof(gr32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (gr32.gr_group.ss_family != AF_INET6)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	psin6 = (struct sockaddr_in6 *)&amp;gr32.gr_group;</div><div class='add'>+	if (optname == MCAST_JOIN_GROUP)</div><div class='add'>+		return ipv6_sock_mc_join(sk, gr32.gr_interface,</div><div class='add'>+					&amp;psin6-&gt;sin6_addr);</div><div class='add'>+	return ipv6_sock_mc_drop(sk, gr32.gr_interface, &amp;psin6-&gt;sin6_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipv6_set_opt_hdr(struct sock *sk, int optname, sockptr_t optval,</div><div class='add'>+		int optlen)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct ipv6_opt_hdr *new = NULL;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct ipv6_txoptions *opt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* hop-by-hop / destination options are privileged option */</div><div class='add'>+	if (optname != IPV6_RTHDR &amp;&amp; !sockopt_ns_capable(net-&gt;user_ns, CAP_NET_RAW))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* remove any sticky options header with a zero option</div><div class='add'>+	 * length, per RFC3542.</div><div class='add'>+	 */</div><div class='add'>+	if (optlen &gt; 0) {</div><div class='add'>+		if (sockptr_is_null(optval))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (optlen &lt; sizeof(struct ipv6_opt_hdr) ||</div><div class='add'>+		    optlen &amp; 0x7 ||</div><div class='add'>+		    optlen &gt; 8 * 255)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		new = memdup_sockptr(optval, optlen);</div><div class='add'>+		if (IS_ERR(new))</div><div class='add'>+			return PTR_ERR(new);</div><div class='add'>+		if (unlikely(ipv6_optlen(new) &gt; optlen)) {</div><div class='add'>+			kfree(new);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opt = rcu_dereference_protected(np-&gt;opt, lockdep_sock_is_held(sk));</div><div class='add'>+	opt = ipv6_renew_options(sk, opt, optname, new);</div><div class='add'>+	kfree(new);</div><div class='add'>+	if (IS_ERR(opt))</div><div class='add'>+		return PTR_ERR(opt);</div><div class='add'>+</div><div class='add'>+	/* routing header option needs extra check */</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (optname == IPV6_RTHDR &amp;&amp; opt &amp;&amp; opt-&gt;srcrt) {</div><div class='add'>+		struct ipv6_rt_hdr *rthdr = opt-&gt;srcrt;</div><div class='add'>+		switch (rthdr-&gt;type) {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='add'>+		case IPV6_SRCRT_TYPE_2:</div><div class='add'>+			if (rthdr-&gt;hdrlen != 2 || rthdr-&gt;segments_left != 1)</div><div class='add'>+				goto sticky_done;</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		case IPV6_SRCRT_TYPE_4:</div><div class='add'>+		{</div><div class='add'>+			struct ipv6_sr_hdr *srh =</div><div class='add'>+				(struct ipv6_sr_hdr *)opt-&gt;srcrt;</div><div class='add'>+</div><div class='add'>+			if (!seg6_validate_srh(srh, optlen, false))</div><div class='add'>+				goto sticky_done;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		default:</div><div class='add'>+			goto sticky_done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	opt = ipv6_update_options(sk, opt);</div><div class='add'>+sticky_done:</div><div class='add'>+	if (opt) {</div><div class='add'>+		atomic_sub(opt-&gt;tot_len, &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+		txopt_put(opt);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		       sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='del'>-	int val, valbool;</div><div class='ctx'> 	int retv = -ENOPROTOOPT;</div><div class='del'>-	bool needs_rtnl = setsockopt_needs_rtnl(optname);</div><div class='add'>+	int val, valbool;</div><div class='ctx'> </div><div class='del'>-	if (!optval)</div><div class='add'>+	if (sockptr_is_null(optval))</div><div class='ctx'> 		val = 0;</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (optlen &gt;= sizeof(int)) {</div><div class='del'>-			if (get_user(val, (int __user *) optval))</div><div class='add'>+			if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		} else</div><div class='ctx'> 			val = 0;</div><div class='hunk'>@@ -162,9 +397,162 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	if (ip6_mroute_opt(optname))</div><div class='ctx'> 		return ip6_mroute_setsockopt(sk, optname, optval, optlen);</div><div class='ctx'> </div><div class='del'>-	if (needs_rtnl)</div><div class='del'>-		rtnl_lock();</div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	/* Handle options that can be set without locking the socket. */</div><div class='add'>+	switch (optname) {</div><div class='add'>+	case IPV6_UNICAST_HOPS:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &gt; 255 || val &lt; -1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(np-&gt;hop_limit, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MULTICAST_LOOP:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val != valbool)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(MC6_LOOP, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MULTICAST_HOPS:</div><div class='add'>+		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+			return retv;</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &gt; 255 || val &lt; -1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(np-&gt;mcast_hops,</div><div class='add'>+			   val == -1 ? IPV6_DEFAULT_MCASTHOPS : val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MTU:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &amp;&amp; val &lt; IPV6_MIN_MTU)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(np-&gt;frag_size, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MINHOPCOUNT:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &lt; 0 || val &gt; 255)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (val)</div><div class='add'>+			static_branch_enable(&amp;ip6_min_hopcount);</div><div class='add'>+</div><div class='add'>+		/* tcp_v6_err() and tcp_v6_rcv() might read min_hopcount</div><div class='add'>+		 * while we are changing it.</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(np-&gt;min_hopcount, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_RECVERR_RFC4884:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &lt; 0 || val &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(RECVERR6_RFC4884, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MULTICAST_ALL:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(MC6_ALL, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_AUTOFLOWLABEL:</div><div class='add'>+		inet6_assign_bit(AUTOFLOWLABEL, sk, valbool);</div><div class='add'>+		inet6_set_bit(AUTOFLOWLABEL_SET, sk);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_DONTFRAG:</div><div class='add'>+		inet6_assign_bit(DONTFRAG, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_RECVERR:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(RECVERR6, sk, valbool);</div><div class='add'>+		if (!val)</div><div class='add'>+			skb_errqueue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_ROUTER_ALERT_ISOLATE:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(RTALERT_ISOLATE, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_MTU_DISCOVER:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val &lt; IPV6_PMTUDISC_DONT || val &gt; IPV6_PMTUDISC_OMIT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		WRITE_ONCE(np-&gt;pmtudisc, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_FLOWINFO_SEND:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		inet6_assign_bit(SNDFLOW, sk, valbool);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_ADDR_PREFERENCES:</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return ip6_sock_set_addr_preferences(sk, val);</div><div class='add'>+	case IPV6_MULTICAST_IF:</div><div class='add'>+		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='add'>+			return -ENOPROTOOPT;</div><div class='add'>+		if (optlen &lt; sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (val) {</div><div class='add'>+			struct net_device *dev;</div><div class='add'>+			int bound_dev_if, midx;</div><div class='add'>+</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+</div><div class='add'>+			dev = dev_get_by_index_rcu(net, val);</div><div class='add'>+			if (!dev) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+			midx = l3mdev_master_ifindex_rcu(dev);</div><div class='add'>+</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+			bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+			if (bound_dev_if &amp;&amp;</div><div class='add'>+			    bound_dev_if != val &amp;&amp;</div><div class='add'>+			    (!midx || midx != bound_dev_if))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(np-&gt;mcast_oif, val);</div><div class='add'>+		return 0;</div><div class='add'>+	case IPV6_UNICAST_IF:</div><div class='add'>+	{</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+		int ifindex;</div><div class='add'>+</div><div class='add'>+		if (optlen != sizeof(int))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ifindex = (__force int)ntohl((__force __be32)val);</div><div class='add'>+		if (!ifindex) {</div><div class='add'>+			WRITE_ONCE(np-&gt;ucast_oif, 0);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev = dev_get_by_index(net, ifindex);</div><div class='add'>+		if (!dev)</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		dev_put(dev);</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_bound_dev_if))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(np-&gt;ucast_oif, ifindex);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* Another thread has converted the socket into IPv4 with</div><div class='add'>+	 * IPV6_ADDRFORM concurrently.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(sk-&gt;sk_family != AF_INET6))</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> </div><div class='hunk'>@@ -172,9 +560,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (optlen &lt; sizeof(int))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> 		if (val == PF_INET) {</div><div class='del'>-			struct ipv6_txoptions *opt;</div><div class='del'>-			struct sk_buff *pktopt;</div><div class='del'>-</div><div class='ctx'> 			if (sk-&gt;sk_type == SOCK_RAW)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -185,8 +570,14 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 					retv = -EBUSY;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-			} else if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+			} else if (sk-&gt;sk_protocol == IPPROTO_TCP) {</div><div class='add'>+				if (sk-&gt;sk_prot != &amp;tcpv6_prot) {</div><div class='add'>+					retv = -EBUSY;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (sk-&gt;sk_state != TCP_ESTABLISHED) {</div><div class='ctx'> 				retv = -ENOTCONN;</div><div class='hunk'>@@ -199,54 +590,45 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			fl6_free_socklist(sk);</div><div class='ctx'> 			__ipv6_sock_mc_close(sk);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Sock is moving from IPv6 to IPv4 (sk_prot), so</div><div class='del'>-			 * remove it from the refcnt debug socks count in the</div><div class='del'>-			 * original family...</div><div class='del'>-			 */</div><div class='del'>-			sk_refcnt_debug_dec(sk);</div><div class='add'>+			__ipv6_sock_ac_close(sk);</div><div class='ctx'> </div><div class='ctx'> 			if (sk-&gt;sk_protocol == IPPROTO_TCP) {</div><div class='ctx'> 				struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-				local_bh_disable();</div><div class='add'>+</div><div class='ctx'> 				sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='ctx'> 				sock_prot_inuse_add(net, &amp;tcp_prot, 1);</div><div class='del'>-				local_bh_enable();</div><div class='del'>-				sk-&gt;sk_prot = &amp;tcp_prot;</div><div class='del'>-				icsk-&gt;icsk_af_ops = &amp;ipv4_specific;</div><div class='del'>-				sk-&gt;sk_socket-&gt;ops = &amp;inet_stream_ops;</div><div class='del'>-				sk-&gt;sk_family = PF_INET;</div><div class='add'>+</div><div class='add'>+				/* Paired with READ_ONCE(sk-&gt;sk_prot) in inet6_stream_ops */</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_prot, &amp;tcp_prot);</div><div class='add'>+				/* Paired with READ_ONCE() in tcp_(get|set)sockopt() */</div><div class='add'>+				WRITE_ONCE(icsk-&gt;icsk_af_ops, &amp;ipv4_specific);</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_socket-&gt;ops, &amp;inet_stream_ops);</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_family, PF_INET);</div><div class='ctx'> 				tcp_sync_mss(sk, icsk-&gt;icsk_pmtu_cookie);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				struct proto *prot = &amp;udp_prot;</div><div class='ctx'> </div><div class='ctx'> 				if (sk-&gt;sk_protocol == IPPROTO_UDPLITE)</div><div class='ctx'> 					prot = &amp;udplite_prot;</div><div class='del'>-				local_bh_disable();</div><div class='add'>+</div><div class='ctx'> 				sock_prot_inuse_add(net, sk-&gt;sk_prot, -1);</div><div class='ctx'> 				sock_prot_inuse_add(net, prot, 1);</div><div class='del'>-				local_bh_enable();</div><div class='del'>-				sk-&gt;sk_prot = prot;</div><div class='del'>-				sk-&gt;sk_socket-&gt;ops = &amp;inet_dgram_ops;</div><div class='del'>-				sk-&gt;sk_family = PF_INET;</div><div class='del'>-			}</div><div class='del'>-			opt = xchg((__force struct ipv6_txoptions **)&amp;np-&gt;opt,</div><div class='del'>-				   NULL);</div><div class='del'>-			if (opt) {</div><div class='del'>-				atomic_sub(opt-&gt;tot_len, &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-				txopt_put(opt);</div><div class='add'>+</div><div class='add'>+				/* Paired with READ_ONCE(sk-&gt;sk_prot) in inet6_dgram_ops */</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_prot, prot);</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_socket-&gt;ops, &amp;inet_dgram_ops);</div><div class='add'>+				WRITE_ONCE(sk-&gt;sk_family, PF_INET);</div><div class='ctx'> 			}</div><div class='del'>-			pktopt = xchg(&amp;np-&gt;pktoptions, NULL);</div><div class='del'>-			kfree_skb(pktopt);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * ... and add it to the refcnt debug socks count</div><div class='del'>-			 * in the new family. -acme</div><div class='add'>+			/* Disable all options not to allocate memory anymore,</div><div class='add'>+			 * but there is still a race.  See the lockless path</div><div class='add'>+			 * in udpv6_sendmsg() and ipv6_local_rxpmtu().</div><div class='ctx'> 			 */</div><div class='del'>-			sk_refcnt_debug_inc(sk);</div><div class='add'>+			np-&gt;rxopt.all = 0;</div><div class='add'>+</div><div class='add'>+			inet6_cleanup_sock(sk);</div><div class='add'>+</div><div class='ctx'> 			module_put(THIS_MODULE);</div><div class='ctx'> 			retv = 0;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -339,7 +721,14 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		/* RFC 3542, 6.5: default traffic class of 0x0 */</div><div class='ctx'> 		if (val == -1)</div><div class='ctx'> 			val = 0;</div><div class='del'>-		np-&gt;tclass = val;</div><div class='add'>+		if (sk-&gt;sk_type == SOCK_STREAM) {</div><div class='add'>+			val &amp;= ~INET_ECN_MASK;</div><div class='add'>+			val |= np-&gt;tclass &amp; INET_ECN_MASK;</div><div class='add'>+		}</div><div class='add'>+		if (np-&gt;tclass != val) {</div><div class='add'>+			np-&gt;tclass = val;</div><div class='add'>+			sk_dst_reset(sk);</div><div class='add'>+		}</div><div class='ctx'> 		retv = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -365,15 +754,15 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_TRANSPARENT:</div><div class='del'>-		if (valbool &amp;&amp; !ns_capable(net-&gt;user_ns, CAP_NET_ADMIN) &amp;&amp;</div><div class='del'>-		    !ns_capable(net-&gt;user_ns, CAP_NET_RAW)) {</div><div class='add'>+		if (valbool &amp;&amp; !sockopt_ns_capable(net-&gt;user_ns, CAP_NET_RAW) &amp;&amp;</div><div class='add'>+		    !sockopt_ns_capable(net-&gt;user_ns, CAP_NET_ADMIN)) {</div><div class='ctx'> 			retv = -EPERM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (optlen &lt; sizeof(int))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> 		/* we don't have a separate transparent bit for IPV6 we use the one in the IPv4 socket */</div><div class='del'>-		inet_sk(sk)-&gt;transparent = valbool;</div><div class='add'>+		inet_assign_bit(TRANSPARENT, sk, valbool);</div><div class='ctx'> 		retv = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -381,7 +770,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (optlen &lt; sizeof(int))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> 		/* we also don't have a separate freebind bit for IPV6 */</div><div class='del'>-		inet_sk(sk)-&gt;freebind = valbool;</div><div class='add'>+		inet_assign_bit(FREEBIND, sk, valbool);</div><div class='ctx'> 		retv = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -396,82 +785,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	case IPV6_RTHDRDSTOPTS:</div><div class='ctx'> 	case IPV6_RTHDR:</div><div class='ctx'> 	case IPV6_DSTOPTS:</div><div class='del'>-	{</div><div class='del'>-		struct ipv6_txoptions *opt;</div><div class='del'>-		struct ipv6_opt_hdr *new = NULL;</div><div class='del'>-</div><div class='del'>-		/* hop-by-hop / destination options are privileged option */</div><div class='del'>-		retv = -EPERM;</div><div class='del'>-		if (optname != IPV6_RTHDR &amp;&amp; !ns_capable(net-&gt;user_ns, CAP_NET_RAW))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* remove any sticky options header with a zero option</div><div class='del'>-		 * length, per RFC3542.</div><div class='del'>-		 */</div><div class='del'>-		if (optlen == 0)</div><div class='del'>-			optval = NULL;</div><div class='del'>-		else if (!optval)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		else if (optlen &lt; sizeof(struct ipv6_opt_hdr) ||</div><div class='del'>-			 optlen &amp; 0x7 || optlen &gt; 8 * 255)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		else {</div><div class='del'>-			new = memdup_user(optval, optlen);</div><div class='del'>-			if (IS_ERR(new)) {</div><div class='del'>-				retv = PTR_ERR(new);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (unlikely(ipv6_optlen(new) &gt; optlen)) {</div><div class='del'>-				kfree(new);</div><div class='del'>-				goto e_inval;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		opt = rcu_dereference_protected(np-&gt;opt,</div><div class='del'>-						lockdep_sock_is_held(sk));</div><div class='del'>-		opt = ipv6_renew_options(sk, opt, optname, new);</div><div class='del'>-		kfree(new);</div><div class='del'>-		if (IS_ERR(opt)) {</div><div class='del'>-			retv = PTR_ERR(opt);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* routing header option needs extra check */</div><div class='del'>-		retv = -EINVAL;</div><div class='del'>-		if (optname == IPV6_RTHDR &amp;&amp; opt &amp;&amp; opt-&gt;srcrt) {</div><div class='del'>-			struct ipv6_rt_hdr *rthdr = opt-&gt;srcrt;</div><div class='del'>-			switch (rthdr-&gt;type) {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-			case IPV6_SRCRT_TYPE_2:</div><div class='del'>-				if (rthdr-&gt;hdrlen != 2 ||</div><div class='del'>-				    rthdr-&gt;segments_left != 1)</div><div class='del'>-					goto sticky_done;</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-#endif</div><div class='del'>-			case IPV6_SRCRT_TYPE_4:</div><div class='del'>-			{</div><div class='del'>-				struct ipv6_sr_hdr *srh = (struct ipv6_sr_hdr *)</div><div class='del'>-							  opt-&gt;srcrt;</div><div class='del'>-</div><div class='del'>-				if (!seg6_validate_srh(srh, optlen))</div><div class='del'>-					goto sticky_done;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			default:</div><div class='del'>-				goto sticky_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retv = 0;</div><div class='del'>-		opt = ipv6_update_options(sk, opt);</div><div class='del'>-sticky_done:</div><div class='del'>-		if (opt) {</div><div class='del'>-			atomic_sub(opt-&gt;tot_len, &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-			txopt_put(opt);</div><div class='del'>-		}</div><div class='add'>+		retv = ipv6_set_opt_hdr(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_PKTINFO:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -479,14 +794,15 @@ sticky_done:</div><div class='ctx'> </div><div class='ctx'> 		if (optlen == 0)</div><div class='ctx'> 			goto e_inval;</div><div class='del'>-		else if (optlen &lt; sizeof(struct in6_pktinfo) || !optval)</div><div class='add'>+		else if (optlen &lt; sizeof(struct in6_pktinfo) ||</div><div class='add'>+			 sockptr_is_null(optval))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;pkt, optval, sizeof(struct in6_pktinfo))) {</div><div class='del'>-				retv = -EFAULT;</div><div class='del'>-				break;</div><div class='add'>+		if (copy_from_sockptr(&amp;pkt, optval, sizeof(pkt))) {</div><div class='add'>+			retv = -EFAULT;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if &amp;&amp; pkt.ipi6_ifindex != sk-&gt;sk_bound_dev_if)</div><div class='add'>+		if (!sk_dev_equal_l3scope(sk, pkt.ipi6_ifindex))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;sticky_pktinfo.ipi6_ifindex = pkt.ipi6_ifindex;</div><div class='hunk'>@@ -525,10 +841,11 @@ sticky_done:</div><div class='ctx'> 		refcount_set(&amp;opt-&gt;refcnt, 1);</div><div class='ctx'> 		opt-&gt;tot_len = sizeof(*opt) + optlen;</div><div class='ctx'> 		retv = -EFAULT;</div><div class='del'>-		if (copy_from_user(opt+1, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(opt + 1, optval, optlen))</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 		msg.msg_controllen = optlen;</div><div class='add'>+		msg.msg_control_is_user = false;</div><div class='ctx'> 		msg.msg_control = (void *)(opt+1);</div><div class='ctx'> 		ipc6.opt = opt;</div><div class='ctx'> </div><div class='hunk'>@@ -545,95 +862,7 @@ done:</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	case IPV6_UNICAST_HOPS:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &gt; 255 || val &lt; -1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;hop_limit = val;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IPV6_MULTICAST_HOPS:</div><div class='del'>-		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='del'>-			break;</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &gt; 255 || val &lt; -1)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;mcast_hops = (val == -1 ? IPV6_DEFAULT_MCASTHOPS : val);</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IPV6_MULTICAST_LOOP:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val != valbool)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;mc_loop = valbool;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IPV6_UNICAST_IF:</div><div class='del'>-	{</div><div class='del'>-		struct net_device *dev = NULL;</div><div class='del'>-		int ifindex;</div><div class='del'>-</div><div class='del'>-		if (optlen != sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		ifindex = (__force int)ntohl((__force __be32)val);</div><div class='del'>-		if (ifindex == 0) {</div><div class='del'>-			np-&gt;ucast_oif = 0;</div><div class='del'>-			retv = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev = dev_get_by_index(net, ifindex);</div><div class='del'>-		retv = -EADDRNOTAVAIL;</div><div class='del'>-		if (!dev)</div><div class='del'>-			break;</div><div class='del'>-		dev_put(dev);</div><div class='del'>-</div><div class='del'>-		retv = -EINVAL;</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		np-&gt;ucast_oif = ifindex;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case IPV6_MULTICAST_IF:</div><div class='del'>-		if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='del'>-			break;</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		if (val) {</div><div class='del'>-			struct net_device *dev;</div><div class='del'>-			int midx;</div><div class='ctx'> </div><div class='del'>-			rcu_read_lock();</div><div class='del'>-</div><div class='del'>-			dev = dev_get_by_index_rcu(net, val);</div><div class='del'>-			if (!dev) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				retv = -ENODEV;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			midx = l3mdev_master_ifindex_rcu(dev);</div><div class='del'>-</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			if (sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_bound_dev_if != val &amp;&amp;</div><div class='del'>-			    (!midx || midx != sk-&gt;sk_bound_dev_if))</div><div class='del'>-				goto e_inval;</div><div class='del'>-		}</div><div class='del'>-		np-&gt;mcast_oif = val;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='ctx'> 	case IPV6_ADD_MEMBERSHIP:</div><div class='ctx'> 	case IPV6_DROP_MEMBERSHIP:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -643,11 +872,11 @@ done:</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> </div><div class='ctx'> 		retv = -EPROTO;</div><div class='del'>-		if (inet_sk(sk)-&gt;is_icsk)</div><div class='add'>+		if (inet_test_bit(IS_ICSK, sk))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		retv = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;mreq, optval, sizeof(struct ipv6_mreq)))</div><div class='add'>+		if (copy_from_sockptr(&amp;mreq, optval, sizeof(struct ipv6_mreq)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (optname == IPV6_ADD_MEMBERSHIP)</div><div class='hunk'>@@ -665,7 +894,7 @@ done:</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> </div><div class='ctx'> 		retv = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;mreq, optval, sizeof(struct ipv6_mreq)))</div><div class='add'>+		if (copy_from_sockptr(&amp;mreq, optval, sizeof(struct ipv6_mreq)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (optname == IPV6_JOIN_ANYCAST)</div><div class='hunk'>@@ -676,139 +905,32 @@ done:</div><div class='ctx'> 	}</div><div class='ctx'> 	case MCAST_JOIN_GROUP:</div><div class='ctx'> 	case MCAST_LEAVE_GROUP:</div><div class='del'>-	{</div><div class='del'>-		struct group_req greq;</div><div class='del'>-		struct sockaddr_in6 *psin6;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; sizeof(struct group_req))</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		retv = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;greq, optval, sizeof(struct group_req)))</div><div class='del'>-			break;</div><div class='del'>-		if (greq.gr_group.ss_family != AF_INET6) {</div><div class='del'>-			retv = -EADDRNOTAVAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		psin6 = (struct sockaddr_in6 *)&amp;greq.gr_group;</div><div class='del'>-		if (optname == MCAST_JOIN_GROUP)</div><div class='del'>-			retv = ipv6_sock_mc_join(sk, greq.gr_interface,</div><div class='del'>-						 &amp;psin6-&gt;sin6_addr);</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			retv = compat_ipv6_mcast_join_leave(sk, optname, optval,</div><div class='add'>+							    optlen);</div><div class='ctx'> 		else</div><div class='del'>-			retv = ipv6_sock_mc_drop(sk, greq.gr_interface,</div><div class='del'>-						 &amp;psin6-&gt;sin6_addr);</div><div class='add'>+			retv = ipv6_mcast_join_leave(sk, optname, optval,</div><div class='add'>+						     optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case MCAST_JOIN_SOURCE_GROUP:</div><div class='ctx'> 	case MCAST_LEAVE_SOURCE_GROUP:</div><div class='ctx'> 	case MCAST_BLOCK_SOURCE:</div><div class='ctx'> 	case MCAST_UNBLOCK_SOURCE:</div><div class='del'>-	{</div><div class='del'>-		struct group_source_req greqs;</div><div class='del'>-		int omode, add;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; sizeof(struct group_source_req))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (copy_from_user(&amp;greqs, optval, sizeof(greqs))) {</div><div class='del'>-			retv = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (greqs.gsr_group.ss_family != AF_INET6 ||</div><div class='del'>-		    greqs.gsr_source.ss_family != AF_INET6) {</div><div class='del'>-			retv = -EADDRNOTAVAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (optname == MCAST_BLOCK_SOURCE) {</div><div class='del'>-			omode = MCAST_EXCLUDE;</div><div class='del'>-			add = 1;</div><div class='del'>-		} else if (optname == MCAST_UNBLOCK_SOURCE) {</div><div class='del'>-			omode = MCAST_EXCLUDE;</div><div class='del'>-			add = 0;</div><div class='del'>-		} else if (optname == MCAST_JOIN_SOURCE_GROUP) {</div><div class='del'>-			struct sockaddr_in6 *psin6;</div><div class='del'>-</div><div class='del'>-			psin6 = (struct sockaddr_in6 *)&amp;greqs.gsr_group;</div><div class='del'>-			retv = ipv6_sock_mc_join_ssm(sk, greqs.gsr_interface,</div><div class='del'>-						     &amp;psin6-&gt;sin6_addr,</div><div class='del'>-						     MCAST_INCLUDE);</div><div class='del'>-			/* prior join w/ different source is ok */</div><div class='del'>-			if (retv &amp;&amp; retv != -EADDRINUSE)</div><div class='del'>-				break;</div><div class='del'>-			omode = MCAST_INCLUDE;</div><div class='del'>-			add = 1;</div><div class='del'>-		} else /* MCAST_LEAVE_SOURCE_GROUP */ {</div><div class='del'>-			omode = MCAST_INCLUDE;</div><div class='del'>-			add = 0;</div><div class='del'>-		}</div><div class='del'>-		retv = ip6_mc_source(add, omode, sk, &amp;greqs);</div><div class='add'>+		retv = do_ipv6_mcast_group_source(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case MCAST_MSFILTER:</div><div class='del'>-	{</div><div class='del'>-		struct group_filter *gsf;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; GROUP_FILTER_SIZE(0))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (optlen &gt; sysctl_optmem_max) {</div><div class='del'>-			retv = -ENOBUFS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		gsf = memdup_user(optval, optlen);</div><div class='del'>-		if (IS_ERR(gsf)) {</div><div class='del'>-			retv = PTR_ERR(gsf);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* numsrc &gt;= (4G-140)/128 overflow in 32 bits */</div><div class='del'>-		if (gsf-&gt;gf_numsrc &gt;= 0x1ffffffU ||</div><div class='del'>-		    gsf-&gt;gf_numsrc &gt; sysctl_mld_max_msf) {</div><div class='del'>-			kfree(gsf);</div><div class='del'>-			retv = -ENOBUFS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (GROUP_FILTER_SIZE(gsf-&gt;gf_numsrc) &gt; optlen) {</div><div class='del'>-			kfree(gsf);</div><div class='del'>-			retv = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		retv = ip6_mc_msfilter(sk, gsf);</div><div class='del'>-		kfree(gsf);</div><div class='del'>-</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			retv = compat_ipv6_set_mcast_msfilter(sk, optval,</div><div class='add'>+							      optlen);</div><div class='add'>+		else</div><div class='add'>+			retv = ipv6_set_mcast_msfilter(sk, optval, optlen);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case IPV6_ROUTER_ALERT:</div><div class='ctx'> 		if (optlen &lt; sizeof(int))</div><div class='ctx'> 			goto e_inval;</div><div class='ctx'> 		retv = ip6_ra_control(sk, val);</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_MTU_DISCOVER:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &lt; IPV6_PMTUDISC_DONT || val &gt; IPV6_PMTUDISC_OMIT)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;pmtudisc = val;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_MTU:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &amp;&amp; val &lt; IPV6_MIN_MTU)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;frag_size = val;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_RECVERR:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;recverr = valbool;</div><div class='del'>-		if (!val)</div><div class='del'>-			skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_FLOWINFO_SEND:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;sndflow = valbool;</div><div class='del'>-		retv = 0;</div><div class='add'>+		if (retv == 0)</div><div class='add'>+			inet6_assign_bit(RTALERT, sk, valbool);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPV6_FLOWLABEL_MGR:</div><div class='ctx'> 		retv = ipv6_flowlabel_opt(sk, optval, optlen);</div><div class='hunk'>@@ -816,116 +938,34 @@ done:</div><div class='ctx'> 	case IPV6_IPSEC_POLICY:</div><div class='ctx'> 	case IPV6_XFRM_POLICY:</div><div class='ctx'> 		retv = -EPERM;</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		if (!sockopt_ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 			break;</div><div class='ctx'> 		retv = xfrm_user_policy(sk, optname, optval, optlen);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IPV6_ADDR_PREFERENCES:</div><div class='del'>-	    {</div><div class='del'>-		unsigned int pref = 0;</div><div class='del'>-		unsigned int prefmask = ~0;</div><div class='del'>-</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-</div><div class='del'>-		retv = -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* check PUBLIC/TMP/PUBTMP_DEFAULT conflicts */</div><div class='del'>-		switch (val &amp; (IPV6_PREFER_SRC_PUBLIC|</div><div class='del'>-			       IPV6_PREFER_SRC_TMP|</div><div class='del'>-			       IPV6_PREFER_SRC_PUBTMP_DEFAULT)) {</div><div class='del'>-		case IPV6_PREFER_SRC_PUBLIC:</div><div class='del'>-			pref |= IPV6_PREFER_SRC_PUBLIC;</div><div class='del'>-			break;</div><div class='del'>-		case IPV6_PREFER_SRC_TMP:</div><div class='del'>-			pref |= IPV6_PREFER_SRC_TMP;</div><div class='del'>-			break;</div><div class='del'>-		case IPV6_PREFER_SRC_PUBTMP_DEFAULT:</div><div class='del'>-			break;</div><div class='del'>-		case 0:</div><div class='del'>-			goto pref_skip_pubtmp;</div><div class='del'>-		default:</div><div class='del'>-			goto e_inval;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prefmask &amp;= ~(IPV6_PREFER_SRC_PUBLIC|</div><div class='del'>-			      IPV6_PREFER_SRC_TMP);</div><div class='del'>-pref_skip_pubtmp:</div><div class='del'>-</div><div class='del'>-		/* check HOME/COA conflicts */</div><div class='del'>-		switch (val &amp; (IPV6_PREFER_SRC_HOME|IPV6_PREFER_SRC_COA)) {</div><div class='del'>-		case IPV6_PREFER_SRC_HOME:</div><div class='del'>-			break;</div><div class='del'>-		case IPV6_PREFER_SRC_COA:</div><div class='del'>-			pref |= IPV6_PREFER_SRC_COA;</div><div class='del'>-		case 0:</div><div class='del'>-			goto pref_skip_coa;</div><div class='del'>-		default:</div><div class='del'>-			goto e_inval;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prefmask &amp;= ~IPV6_PREFER_SRC_COA;</div><div class='del'>-pref_skip_coa:</div><div class='del'>-</div><div class='del'>-		/* check CGA/NONCGA conflicts */</div><div class='del'>-		switch (val &amp; (IPV6_PREFER_SRC_CGA|IPV6_PREFER_SRC_NONCGA)) {</div><div class='del'>-		case IPV6_PREFER_SRC_CGA:</div><div class='del'>-		case IPV6_PREFER_SRC_NONCGA:</div><div class='del'>-		case 0:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto e_inval;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		np-&gt;srcprefs = (np-&gt;srcprefs &amp; prefmask) | pref;</div><div class='del'>-		retv = 0;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	    }</div><div class='del'>-	case IPV6_MINHOPCOUNT:</div><div class='del'>-		if (optlen &lt; sizeof(int))</div><div class='del'>-			goto e_inval;</div><div class='del'>-		if (val &lt; 0 || val &gt; 255)</div><div class='del'>-			goto e_inval;</div><div class='del'>-		np-&gt;min_hopcount = val;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_DONTFRAG:</div><div class='del'>-		np-&gt;dontfrag = valbool;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPV6_AUTOFLOWLABEL:</div><div class='del'>-		np-&gt;autoflowlabel = valbool;</div><div class='del'>-		np-&gt;autoflowlabel_set = 1;</div><div class='del'>-		retv = 0;</div><div class='del'>-		break;</div><div class='ctx'> 	case IPV6_RECVFRAGSIZE:</div><div class='ctx'> 		np-&gt;rxopt.bits.recvfragsize = valbool;</div><div class='ctx'> 		retv = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	release_sock(sk);</div><div class='del'>-	if (needs_rtnl)</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+unlock:</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	return retv;</div><div class='ctx'> </div><div class='ctx'> e_inval:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	if (needs_rtnl)</div><div class='del'>-		rtnl_unlock();</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	retv = -EINVAL;</div><div class='add'>+	goto unlock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, unsigned int optlen)</div><div class='add'>+int ipv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		    unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (level == SOL_IP &amp;&amp; sk-&gt;sk_type != SOCK_RAW)</div><div class='del'>-		return udp_prot.setsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+		return ip_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_IPV6)</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='hunk'>@@ -941,41 +981,8 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_setsockopt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_ipv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (level == SOL_IP &amp;&amp; sk-&gt;sk_type != SOCK_RAW) {</div><div class='del'>-		if (udp_prot.compat_setsockopt != NULL)</div><div class='del'>-			return udp_prot.compat_setsockopt(sk, level, optname,</div><div class='del'>-							  optval, optlen);</div><div class='del'>-		return udp_prot.setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (level != SOL_IPV6)</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-</div><div class='del'>-	if (optname &gt;= MCAST_JOIN_GROUP &amp;&amp; optname &lt;= MCAST_MSFILTER)</div><div class='del'>-		return compat_mc_setsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-			ipv6_setsockopt);</div><div class='del'>-</div><div class='del'>-	err = do_ipv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != IPV6_IPSEC_POLICY &amp;&amp;</div><div class='del'>-	    optname != IPV6_XFRM_POLICY)</div><div class='del'>-		err = compat_nf_setsockopt(sk, PF_INET6, optname, optval,</div><div class='del'>-					   optlen);</div><div class='del'>-#endif</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_ipv6_setsockopt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt,</div><div class='del'>-				  int optname, char __user *optval, int len)</div><div class='add'>+				  int optname, sockptr_t optval, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_opt_hdr *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -1003,13 +1010,81 @@ static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	len = min_t(unsigned int, len, ipv6_optlen(hdr));</div><div class='del'>-	if (copy_to_user(optval, hdr, len))</div><div class='add'>+	if (copy_to_sockptr(optval, hdr, len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		    char __user *optval, int __user *optlen, unsigned int flags)</div><div class='add'>+static int ipv6_get_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+			     sockptr_t optlen, int len)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct group_filter, gf_slist_flex);</div><div class='add'>+	struct group_filter gsf;</div><div class='add'>+	int num;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (len &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;gsf, optval, size0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (gsf.gf_group.ss_family != AF_INET6)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	num = gsf.gf_numsrc;</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+	err = ip6_mc_msfget(sk, &amp;gsf, optval, size0);</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (num &gt; gsf.gf_numsrc)</div><div class='add'>+			num = gsf.gf_numsrc;</div><div class='add'>+		len = GROUP_FILTER_SIZE(num);</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)) ||</div><div class='add'>+		    copy_to_sockptr(optval, &amp;gsf, size0))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compat_ipv6_get_msfilter(struct sock *sk, sockptr_t optval,</div><div class='add'>+				    sockptr_t optlen, int len)</div><div class='add'>+{</div><div class='add'>+	const int size0 = offsetof(struct compat_group_filter, gf_slist_flex);</div><div class='add'>+	struct compat_group_filter gf32;</div><div class='add'>+	struct group_filter gf;</div><div class='add'>+	int err;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	if (len &lt; size0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(&amp;gf32, optval, size0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	gf.gf_interface = gf32.gf_interface;</div><div class='add'>+	gf.gf_fmode = gf32.gf_fmode;</div><div class='add'>+	num = gf.gf_numsrc = gf32.gf_numsrc;</div><div class='add'>+	gf.gf_group = gf32.gf_group;</div><div class='add'>+</div><div class='add'>+	if (gf.gf_group.ss_family != AF_INET6)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	sockopt_lock_sock(sk);</div><div class='add'>+	err = ip6_mc_msfget(sk, &amp;gf, optval, size0);</div><div class='add'>+	sockopt_release_sock(sk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (num &gt; gf.gf_numsrc)</div><div class='add'>+		num = gf.gf_numsrc;</div><div class='add'>+	len = GROUP_FILTER_SIZE(num) - (sizeof(gf)-sizeof(gf32));</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)) ||</div><div class='add'>+	    copy_to_sockptr_offset(optval, offsetof(struct compat_group_filter, gf_fmode),</div><div class='add'>+				   &amp;gf.gf_fmode, sizeof(gf32.gf_fmode)) ||</div><div class='add'>+	    copy_to_sockptr_offset(optval, offsetof(struct compat_group_filter, gf_numsrc),</div><div class='add'>+				   &amp;gf.gf_numsrc, sizeof(gf32.gf_numsrc)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+		       sockptr_t optval, sockptr_t optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -1018,7 +1093,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	if (ip6_mroute_opt(optname))</div><div class='ctx'> 		return ip6_mroute_getsockopt(sk, optname, optval, optlen);</div><div class='ctx'> </div><div class='del'>-	if (get_user(len, optlen))</div><div class='add'>+	if (copy_from_sockptr(&amp;len, optlen, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case IPV6_ADDRFORM:</div><div class='hunk'>@@ -1031,23 +1106,9 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		val = sk-&gt;sk_family;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MCAST_MSFILTER:</div><div class='del'>-	{</div><div class='del'>-		struct group_filter gsf;</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		if (len &lt; GROUP_FILTER_SIZE(0))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;gsf, optval, GROUP_FILTER_SIZE(0)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (gsf.gf_group.ss_family != AF_INET6)</div><div class='del'>-			return -EADDRNOTAVAIL;</div><div class='del'>-		lock_sock(sk);</div><div class='del'>-		err = ip6_mc_msfget(sk, &amp;gsf,</div><div class='del'>-			(struct group_filter __user *)optval, optlen);</div><div class='del'>-		release_sock(sk);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			return compat_ipv6_get_msfilter(sk, optval, optlen, len);</div><div class='add'>+		return ipv6_get_msfilter(sk, optval, optlen, len);</div><div class='ctx'> 	case IPV6_2292PKTOPTIONS:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct msghdr msg;</div><div class='hunk'>@@ -1056,25 +1117,34 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='ctx'> 			return -ENOPROTOOPT;</div><div class='ctx'> </div><div class='del'>-		msg.msg_control = optval;</div><div class='add'>+		if (optval.is_kernel) {</div><div class='add'>+			msg.msg_control_is_user = false;</div><div class='add'>+			msg.msg_control = optval.kernel;</div><div class='add'>+		} else {</div><div class='add'>+			msg.msg_control_is_user = true;</div><div class='add'>+			msg.msg_control_user = optval.user;</div><div class='add'>+		}</div><div class='ctx'> 		msg.msg_controllen = len;</div><div class='del'>-		msg.msg_flags = flags;</div><div class='add'>+		msg.msg_flags = 0;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='ctx'> 		skb = np-&gt;pktoptions;</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			ip6_datagram_recv_ctl(sk, &amp;msg, skb);</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxinfo) {</div><div class='add'>+				int mcast_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 				struct in6_pktinfo src_info;</div><div class='del'>-				src_info.ipi6_ifindex = np-&gt;mcast_oif ? np-&gt;mcast_oif :</div><div class='add'>+</div><div class='add'>+				src_info.ipi6_ifindex = mcast_oif ? :</div><div class='ctx'> 					np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='del'>-				src_info.ipi6_addr = np-&gt;mcast_oif ? sk-&gt;sk_v6_daddr : np-&gt;sticky_pktinfo.ipi6_addr;</div><div class='add'>+				src_info.ipi6_addr = mcast_oif ? sk-&gt;sk_v6_daddr : np-&gt;sticky_pktinfo.ipi6_addr;</div><div class='ctx'> 				put_cmsg(&amp;msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &amp;src_info);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxhlim) {</div><div class='del'>-				int hlim = np-&gt;mcast_hops;</div><div class='add'>+				int hlim = READ_ONCE(np-&gt;mcast_hops);</div><div class='add'>+</div><div class='ctx'> 				put_cmsg(&amp;msg, SOL_IPV6, IPV6_HOPLIMIT, sizeof(hlim), &amp;hlim);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxtclass) {</div><div class='hunk'>@@ -1083,15 +1153,18 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 				put_cmsg(&amp;msg, SOL_IPV6, IPV6_TCLASS, sizeof(tclass), &amp;tclass);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxoinfo) {</div><div class='add'>+				int mcast_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 				struct in6_pktinfo src_info;</div><div class='del'>-				src_info.ipi6_ifindex = np-&gt;mcast_oif ? np-&gt;mcast_oif :</div><div class='add'>+</div><div class='add'>+				src_info.ipi6_ifindex = mcast_oif ? :</div><div class='ctx'> 					np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='del'>-				src_info.ipi6_addr = np-&gt;mcast_oif ? sk-&gt;sk_v6_daddr :</div><div class='del'>-								     np-&gt;sticky_pktinfo.ipi6_addr;</div><div class='add'>+				src_info.ipi6_addr = mcast_oif ? sk-&gt;sk_v6_daddr :</div><div class='add'>+								 np-&gt;sticky_pktinfo.ipi6_addr;</div><div class='ctx'> 				put_cmsg(&amp;msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &amp;src_info);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxohlim) {</div><div class='del'>-				int hlim = np-&gt;mcast_hops;</div><div class='add'>+				int hlim = READ_ONCE(np-&gt;mcast_hops);</div><div class='add'>+</div><div class='ctx'> 				put_cmsg(&amp;msg, SOL_IPV6, IPV6_2292HOPLIMIT, sizeof(hlim), &amp;hlim);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (np-&gt;rxopt.bits.rxflow) {</div><div class='hunk'>@@ -1101,7 +1174,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		len -= msg.msg_controllen;</div><div class='del'>-		return put_user(len, optlen);</div><div class='add'>+		return copy_to_sockptr(optlen, &amp;len, sizeof(int));</div><div class='ctx'> 	}</div><div class='ctx'> 	case IPV6_MTU:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1153,15 +1226,15 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ipv6_txoptions *opt;</div><div class='ctx'> </div><div class='del'>-		lock_sock(sk);</div><div class='add'>+		sockopt_lock_sock(sk);</div><div class='ctx'> 		opt = rcu_dereference_protected(np-&gt;opt,</div><div class='ctx'> 						lockdep_sock_is_held(sk));</div><div class='ctx'> 		len = ipv6_getsockopt_sticky(sk, opt, optname, optval, len);</div><div class='del'>-		release_sock(sk);</div><div class='add'>+		sockopt_release_sock(sk);</div><div class='ctx'> 		/* check if ipv6_getsockopt_sticky() returns err code */</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='del'>-		return put_user(len, optlen);</div><div class='add'>+		return copy_to_sockptr(optlen, &amp;len, sizeof(int));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_RECVHOPOPTS:</div><div class='hunk'>@@ -1215,20 +1288,20 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (!mtuinfo.ip6m_mtu)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> </div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;mtuinfo, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;mtuinfo, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_TRANSPARENT:</div><div class='del'>-		val = inet_sk(sk)-&gt;transparent;</div><div class='add'>+		val = inet_test_bit(TRANSPARENT, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_FREEBIND:</div><div class='del'>-		val = inet_sk(sk)-&gt;freebind;</div><div class='add'>+		val = inet_test_bit(FREEBIND, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_RECVORIGDSTADDR:</div><div class='hunk'>@@ -1241,9 +1314,9 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		struct dst_entry *dst;</div><div class='ctx'> </div><div class='ctx'> 		if (optname == IPV6_UNICAST_HOPS)</div><div class='del'>-			val = np-&gt;hop_limit;</div><div class='add'>+			val = READ_ONCE(np-&gt;hop_limit);</div><div class='ctx'> 		else</div><div class='del'>-			val = np-&gt;mcast_hops;</div><div class='add'>+			val = READ_ONCE(np-&gt;mcast_hops);</div><div class='ctx'> </div><div class='ctx'> 		if (val &lt; 0) {</div><div class='ctx'> 			rcu_read_lock();</div><div class='hunk'>@@ -1254,32 +1327,36 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (val &lt; 0)</div><div class='del'>-			val = sock_net(sk)-&gt;ipv6.devconf_all-&gt;hop_limit;</div><div class='add'>+			val = READ_ONCE(sock_net(sk)-&gt;ipv6.devconf_all-&gt;hop_limit);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_MULTICAST_LOOP:</div><div class='del'>-		val = np-&gt;mc_loop;</div><div class='add'>+		val = inet6_test_bit(MC6_LOOP, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_MULTICAST_IF:</div><div class='del'>-		val = np-&gt;mcast_oif;</div><div class='add'>+		val = READ_ONCE(np-&gt;mcast_oif);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IPV6_MULTICAST_ALL:</div><div class='add'>+		val = inet6_test_bit(MC6_ALL, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_UNICAST_IF:</div><div class='del'>-		val = (__force int)htonl((__u32) np-&gt;ucast_oif);</div><div class='add'>+		val = (__force int)htonl((__u32) READ_ONCE(np-&gt;ucast_oif));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_MTU_DISCOVER:</div><div class='del'>-		val = np-&gt;pmtudisc;</div><div class='add'>+		val = READ_ONCE(np-&gt;pmtudisc);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_RECVERR:</div><div class='del'>-		val = np-&gt;recverr;</div><div class='add'>+		val = inet6_test_bit(RECVERR6, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_FLOWINFO_SEND:</div><div class='del'>-		val = np-&gt;sndflow;</div><div class='add'>+		val = inet6_test_bit(SNDFLOW, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_FLOWLABEL_MGR:</div><div class='hunk'>@@ -1290,7 +1367,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (len &lt; sizeof(freq))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;freq, optval, sizeof(freq)))</div><div class='add'>+		if (copy_from_sockptr(&amp;freq, optval, sizeof(freq)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		if (freq.flr_action != IPV6_FL_A_GET)</div><div class='hunk'>@@ -1305,55 +1382,69 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		if (val &lt; 0)</div><div class='ctx'> 			return val;</div><div class='ctx'> </div><div class='del'>-		if (put_user(len, optlen))</div><div class='add'>+		if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (copy_to_user(optval, &amp;freq, len))</div><div class='add'>+		if (copy_to_sockptr(optval, &amp;freq, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_ADDR_PREFERENCES:</div><div class='add'>+		{</div><div class='add'>+		u8 srcprefs = READ_ONCE(np-&gt;srcprefs);</div><div class='ctx'> 		val = 0;</div><div class='ctx'> </div><div class='del'>-		if (np-&gt;srcprefs &amp; IPV6_PREFER_SRC_TMP)</div><div class='add'>+		if (srcprefs &amp; IPV6_PREFER_SRC_TMP)</div><div class='ctx'> 			val |= IPV6_PREFER_SRC_TMP;</div><div class='del'>-		else if (np-&gt;srcprefs &amp; IPV6_PREFER_SRC_PUBLIC)</div><div class='add'>+		else if (srcprefs &amp; IPV6_PREFER_SRC_PUBLIC)</div><div class='ctx'> 			val |= IPV6_PREFER_SRC_PUBLIC;</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* XXX: should we return system default? */</div><div class='ctx'> 			val |= IPV6_PREFER_SRC_PUBTMP_DEFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (np-&gt;srcprefs &amp; IPV6_PREFER_SRC_COA)</div><div class='add'>+		if (srcprefs &amp; IPV6_PREFER_SRC_COA)</div><div class='ctx'> 			val |= IPV6_PREFER_SRC_COA;</div><div class='ctx'> 		else</div><div class='ctx'> 			val |= IPV6_PREFER_SRC_HOME;</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 	case IPV6_MINHOPCOUNT:</div><div class='del'>-		val = np-&gt;min_hopcount;</div><div class='add'>+		val = READ_ONCE(np-&gt;min_hopcount);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_DONTFRAG:</div><div class='del'>-		val = np-&gt;dontfrag;</div><div class='add'>+		val = inet6_test_bit(DONTFRAG, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_AUTOFLOWLABEL:</div><div class='del'>-		val = ip6_autoflowlabel(sock_net(sk), np);</div><div class='add'>+		val = ip6_autoflowlabel(sock_net(sk), sk);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IPV6_RECVFRAGSIZE:</div><div class='ctx'> 		val = np-&gt;rxopt.bits.recvfragsize;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IPV6_ROUTER_ALERT:</div><div class='add'>+		val = inet6_test_bit(RTALERT, sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IPV6_ROUTER_ALERT_ISOLATE:</div><div class='add'>+		val = inet6_test_bit(RTALERT_ISOLATE, sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IPV6_RECVERR_RFC4884:</div><div class='add'>+		val = inet6_test_bit(RECVERR6_RFC4884, sk);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	}</div><div class='ctx'> 	len = min_t(unsigned int, sizeof(int), len);</div><div class='del'>-	if (put_user(len, optlen))</div><div class='add'>+	if (copy_to_sockptr(optlen, &amp;len, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (copy_to_user(optval, &amp;val, len))</div><div class='add'>+	if (copy_to_sockptr(optval, &amp;val, len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1364,12 +1455,13 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (level == SOL_IP &amp;&amp; sk-&gt;sk_type != SOCK_RAW)</div><div class='del'>-		return udp_prot.getsockopt(sk, level, optname, optval, optlen);</div><div class='add'>+		return ip_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> </div><div class='ctx'> 	if (level != SOL_IPV6)</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> </div><div class='del'>-	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen, 0);</div><div class='add'>+	err = do_ipv6_getsockopt(sk, level, optname,</div><div class='add'>+				 USER_SOCKPTR(optval), USER_SOCKPTR(optlen));</div><div class='ctx'> #ifdef CONFIG_NETFILTER</div><div class='ctx'> 	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='ctx'> 	if (err == -ENOPROTOOPT &amp;&amp; optname != IPV6_2292PKTOPTIONS) {</div><div class='hunk'>@@ -1386,43 +1478,3 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_getsockopt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			   char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (level == SOL_IP &amp;&amp; sk-&gt;sk_type != SOCK_RAW) {</div><div class='del'>-		if (udp_prot.compat_getsockopt != NULL)</div><div class='del'>-			return udp_prot.compat_getsockopt(sk, level, optname,</div><div class='del'>-							  optval, optlen);</div><div class='del'>-		return udp_prot.getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (level != SOL_IPV6)</div><div class='del'>-		return -ENOPROTOOPT;</div><div class='del'>-</div><div class='del'>-	if (optname == MCAST_MSFILTER)</div><div class='del'>-		return compat_mc_getsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-			ipv6_getsockopt);</div><div class='del'>-</div><div class='del'>-	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-				 MSG_CMSG_COMPAT);</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	/* we need to exclude all possible ENOPROTOOPTs except default case */</div><div class='del'>-	if (err == -ENOPROTOOPT &amp;&amp; optname != IPV6_2292PKTOPTIONS) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		if (get_user(len, optlen))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		err = compat_nf_getsockopt(sk, PF_INET6, optname, optval, &amp;len);</div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			err = put_user(len, optlen);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compat_ipv6_getsockopt);</div><div class='del'>-#endif</div><div class='head'>diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c<br/>index 4ae54aaca373..016b572e7d6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/mcast.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mcast.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/mcast.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/mcast.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Multicast support for IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Changes:</div><div class='hunk'>@@ -33,24 +29,27 @@</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/sockios.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_addr.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='ctx'> #include &lt;net/mld.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -71,18 +70,14 @@ static int __mld2_query_bugs[] __attribute__((__unused__)) = {</div><div class='ctx'> 	BUILD_BUG_ON_ZERO(offsetof(struct mld2_grec, grec_mca) % 4)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct workqueue_struct *mld_wq;</div><div class='ctx'> static struct in6_addr mld2_all_mcr = MLD2_ALL_MCR_INIT;</div><div class='ctx'> </div><div class='ctx'> static void igmp6_join_group(struct ifmcaddr6 *ma);</div><div class='ctx'> static void igmp6_leave_group(struct ifmcaddr6 *ma);</div><div class='del'>-static void igmp6_timer_handler(struct timer_list *t);</div><div class='add'>+static void mld_mca_work(struct work_struct *work);</div><div class='ctx'> </div><div class='del'>-static void mld_gq_timer_expire(struct timer_list *t);</div><div class='del'>-static void mld_ifc_timer_expire(struct timer_list *t);</div><div class='ctx'> static void mld_ifc_event(struct inet6_dev *idev);</div><div class='del'>-static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *pmc);</div><div class='del'>-static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *pmc);</div><div class='del'>-static void mld_clear_delrec(struct inet6_dev *idev);</div><div class='ctx'> static bool mld_in_v1_mode(const struct inet6_dev *idev);</div><div class='ctx'> static int sf_setstate(struct ifmcaddr6 *pmc);</div><div class='ctx'> static void sf_markstate(struct ifmcaddr6 *pmc);</div><div class='hunk'>@@ -113,69 +108,119 @@ static int __ipv6_dev_mc_inc(struct net_device *dev,</div><div class='ctx'> int sysctl_mld_max_msf __read_mostly = IPV6_MLD_MAX_MSF;</div><div class='ctx'> int sysctl_mld_qrv __read_mostly = MLD_QRV_DEFAULT;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	socket join on multicast group</div><div class='del'>- */</div><div class='add'>+#define mc_assert_locked(idev)			\</div><div class='add'>+	lockdep_assert_held(&amp;(idev)-&gt;mc_lock)</div><div class='add'>+</div><div class='add'>+#define mc_dereference(e, idev) \</div><div class='add'>+	rcu_dereference_protected(e, lockdep_is_held(&amp;(idev)-&gt;mc_lock))</div><div class='add'>+</div><div class='add'>+#define sock_dereference(e, sk) \</div><div class='add'>+	rcu_dereference_protected(e, lockdep_sock_is_held(sk))</div><div class='add'>+</div><div class='add'>+#define for_each_pmc_socklock(np, sk, pmc)			\</div><div class='add'>+	for (pmc = sock_dereference((np)-&gt;ipv6_mc_list, sk);	\</div><div class='add'>+	     pmc;						\</div><div class='add'>+	     pmc = sock_dereference(pmc-&gt;next, sk))</div><div class='ctx'> </div><div class='ctx'> #define for_each_pmc_rcu(np, pmc)				\</div><div class='del'>-	for (pmc = rcu_dereference(np-&gt;ipv6_mc_list);		\</div><div class='del'>-	     pmc != NULL;					\</div><div class='add'>+	for (pmc = rcu_dereference((np)-&gt;ipv6_mc_list);		\</div><div class='add'>+	     pmc;						\</div><div class='ctx'> 	     pmc = rcu_dereference(pmc-&gt;next))</div><div class='ctx'> </div><div class='add'>+#define for_each_psf_mclock(mc, psf)				\</div><div class='add'>+	for (psf = mc_dereference((mc)-&gt;mca_sources, mc-&gt;idev);	\</div><div class='add'>+	     psf;						\</div><div class='add'>+	     psf = mc_dereference(psf-&gt;sf_next, mc-&gt;idev))</div><div class='add'>+</div><div class='add'>+#define for_each_psf_rcu(mc, psf)				\</div><div class='add'>+	for (psf = rcu_dereference((mc)-&gt;mca_sources);		\</div><div class='add'>+	     psf;						\</div><div class='add'>+	     psf = rcu_dereference(psf-&gt;sf_next))</div><div class='add'>+</div><div class='add'>+#define for_each_psf_tomb(mc, psf)				\</div><div class='add'>+	for (psf = mc_dereference((mc)-&gt;mca_tomb, mc-&gt;idev);	\</div><div class='add'>+	     psf;						\</div><div class='add'>+	     psf = mc_dereference(psf-&gt;sf_next, mc-&gt;idev))</div><div class='add'>+</div><div class='add'>+#define for_each_mc_mclock(idev, mc)				\</div><div class='add'>+	for (mc = mc_dereference((idev)-&gt;mc_list, idev);	\</div><div class='add'>+	     mc;						\</div><div class='add'>+	     mc = mc_dereference(mc-&gt;next, idev))</div><div class='add'>+</div><div class='add'>+#define for_each_mc_rcu(idev, mc)				\</div><div class='add'>+	for (mc = rcu_dereference((idev)-&gt;mc_list);             \</div><div class='add'>+	     mc;                                                \</div><div class='add'>+	     mc = rcu_dereference(mc-&gt;next))</div><div class='add'>+</div><div class='add'>+#define for_each_mc_tomb(idev, mc)				\</div><div class='add'>+	for (mc = mc_dereference((idev)-&gt;mc_tomb, idev);	\</div><div class='add'>+	     mc;						\</div><div class='add'>+	     mc = mc_dereference(mc-&gt;next, idev))</div><div class='add'>+</div><div class='ctx'> static int unsolicited_report_interval(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	int iv;</div><div class='ctx'> </div><div class='ctx'> 	if (mld_in_v1_mode(idev))</div><div class='del'>-		iv = idev-&gt;cnf.mldv1_unsolicited_report_interval;</div><div class='add'>+		iv = READ_ONCE(idev-&gt;cnf.mldv1_unsolicited_report_interval);</div><div class='ctx'> 	else</div><div class='del'>-		iv = idev-&gt;cnf.mldv2_unsolicited_report_interval;</div><div class='add'>+		iv = READ_ONCE(idev-&gt;cnf.mldv2_unsolicited_report_interval);</div><div class='ctx'> </div><div class='ctx'> 	return iv &gt; 0 ? iv : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *ip6_mc_find_dev(struct net *net,</div><div class='add'>+					  const struct in6_addr *group,</div><div class='add'>+					  int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='add'>+	struct rt6_info *rt;</div><div class='add'>+</div><div class='add'>+	if (ifindex == 0) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		rt = rt6_lookup(net, group, NULL, 0, NULL, 0);</div><div class='add'>+		if (rt) {</div><div class='add'>+			dev = dst_dev_rcu(&amp;rt-&gt;dst);</div><div class='add'>+			dev_hold(dev);</div><div class='add'>+			ip6_rt_put(rt);</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		dev = dev_get_by_index(net, ifindex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	socket join on multicast group</div><div class='add'>+ */</div><div class='ctx'> static int __ipv6_sock_mc_join(struct sock *sk, int ifindex,</div><div class='ctx'> 			       const struct in6_addr *addr, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct ipv6_mc_socklist *mc_lst;</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct ipv6_mc_socklist *mc_lst;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='ctx'> 	if (!ipv6_addr_is_multicast(addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_pmc_rcu(np, mc_lst) {</div><div class='add'>+	for_each_pmc_socklock(np, sk, mc_lst) {</div><div class='ctx'> 		if ((ifindex == 0 || mc_lst-&gt;ifindex == ifindex) &amp;&amp;</div><div class='del'>-		    ipv6_addr_equal(&amp;mc_lst-&gt;addr, addr)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+		    ipv6_addr_equal(&amp;mc_lst-&gt;addr, addr))</div><div class='ctx'> 			return -EADDRINUSE;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	mc_lst = sock_kmalloc(sk, sizeof(struct ipv6_mc_socklist), GFP_KERNEL);</div><div class='del'>-</div><div class='ctx'> 	if (!mc_lst)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mc_lst-&gt;next = NULL;</div><div class='ctx'> 	mc_lst-&gt;addr = *addr;</div><div class='ctx'> </div><div class='del'>-	if (ifindex == 0) {</div><div class='del'>-		struct rt6_info *rt;</div><div class='del'>-		rt = rt6_lookup(net, addr, NULL, 0, NULL, 0);</div><div class='del'>-		if (rt) {</div><div class='del'>-			dev = rt-&gt;dst.dev;</div><div class='del'>-			ip6_rt_put(rt);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		dev = __dev_get_by_index(net, ifindex);</div><div class='del'>-</div><div class='add'>+	dev = ip6_mc_find_dev(net, addr, ifindex);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -183,15 +228,13 @@ static int __ipv6_sock_mc_join(struct sock *sk, int ifindex,</div><div class='ctx'> </div><div class='ctx'> 	mc_lst-&gt;ifindex = dev-&gt;ifindex;</div><div class='ctx'> 	mc_lst-&gt;sfmode = mode;</div><div class='del'>-	rwlock_init(&amp;mc_lst-&gt;sflock);</div><div class='del'>-	mc_lst-&gt;sflist = NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	now add/increase the group membership on the device</div><div class='del'>-	 */</div><div class='add'>+	RCU_INIT_POINTER(mc_lst-&gt;sflist, NULL);</div><div class='ctx'> </div><div class='add'>+	/* now add/increase the group membership on the device */</div><div class='ctx'> 	err = __ipv6_dev_mc_inc(dev, addr, mode);</div><div class='ctx'> </div><div class='add'>+	dev_put(dev);</div><div class='add'>+</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -218,39 +261,47 @@ int ipv6_sock_mc_join_ssm(struct sock *sk, int ifindex,</div><div class='ctx'> /*</div><div class='ctx'>  *	socket leave on multicast group</div><div class='ctx'>  */</div><div class='add'>+static void __ipv6_sock_mc_drop(struct sock *sk, struct ipv6_mc_socklist *mc_lst)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index(net, mc_lst-&gt;ifindex);</div><div class='add'>+	if (dev) {</div><div class='add'>+		struct inet6_dev *idev = in6_dev_get(dev);</div><div class='add'>+</div><div class='add'>+		ip6_mc_leave_src(sk, mc_lst, idev);</div><div class='add'>+</div><div class='add'>+		if (idev) {</div><div class='add'>+			__ipv6_dev_mc_dec(idev, &amp;mc_lst-&gt;addr);</div><div class='add'>+			in6_dev_put(idev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_put(dev);</div><div class='add'>+	} else {</div><div class='add'>+		ip6_mc_leave_src(sk, mc_lst, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_sub(sizeof(*mc_lst), &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	kfree_rcu(mc_lst, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct ipv6_mc_socklist *mc_lst;</div><div class='ctx'> 	struct ipv6_mc_socklist __rcu **lnk;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct ipv6_mc_socklist *mc_lst;</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_is_multicast(addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (lnk = &amp;np-&gt;ipv6_mc_list;</div><div class='del'>-	     (mc_lst = rtnl_dereference(*lnk)) != NULL;</div><div class='add'>+	     (mc_lst = sock_dereference(*lnk, sk)) != NULL;</div><div class='ctx'> 	      lnk = &amp;mc_lst-&gt;next) {</div><div class='ctx'> 		if ((ifindex == 0 || mc_lst-&gt;ifindex == ifindex) &amp;&amp;</div><div class='ctx'> 		    ipv6_addr_equal(&amp;mc_lst-&gt;addr, addr)) {</div><div class='del'>-			struct net_device *dev;</div><div class='del'>-</div><div class='ctx'> 			*lnk = mc_lst-&gt;next;</div><div class='del'>-</div><div class='del'>-			dev = __dev_get_by_index(net, mc_lst-&gt;ifindex);</div><div class='del'>-			if (dev) {</div><div class='del'>-				struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='del'>-</div><div class='del'>-				(void) ip6_mc_leave_src(sk, mc_lst, idev);</div><div class='del'>-				if (idev)</div><div class='del'>-					__ipv6_dev_mc_dec(idev, &amp;mc_lst-&gt;addr);</div><div class='del'>-			} else</div><div class='del'>-				(void) ip6_mc_leave_src(sk, mc_lst, NULL);</div><div class='del'>-</div><div class='del'>-			atomic_sub(sizeof(*mc_lst), &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-			kfree_rcu(mc_lst, rcu);</div><div class='add'>+			__ipv6_sock_mc_drop(sk, mc_lst);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -259,34 +310,20 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_sock_mc_drop);</div><div class='ctx'> </div><div class='del'>-/* called with rcu_read_lock() */</div><div class='del'>-static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,</div><div class='del'>-					     const struct in6_addr *group,</div><div class='del'>-					     int ifindex)</div><div class='add'>+static struct inet6_dev *ip6_mc_find_idev(struct net *net,</div><div class='add'>+					  const struct in6_addr *group,</div><div class='add'>+					  int ifindex)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct inet6_dev *idev = NULL;</div><div class='del'>-</div><div class='del'>-	if (ifindex == 0) {</div><div class='del'>-		struct rt6_info *rt = rt6_lookup(net, group, NULL, 0, NULL, 0);</div><div class='del'>-</div><div class='del'>-		if (rt) {</div><div class='del'>-			dev = rt-&gt;dst.dev;</div><div class='del'>-			ip6_rt_put(rt);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		dev = dev_get_by_index_rcu(net, ifindex);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='add'>+	dev = ip6_mc_find_dev(net, group, ifindex);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	idev = __in6_dev_get(dev);</div><div class='del'>-	if (!idev)</div><div class='del'>-		return NULL;</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	if (idev-&gt;dead) {</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	idev = in6_dev_get(dev);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+</div><div class='ctx'> 	return idev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -294,27 +331,10 @@ void __ipv6_sock_mc_close(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct ipv6_mc_socklist *mc_lst;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	while ((mc_lst = rtnl_dereference(np-&gt;ipv6_mc_list)) != NULL) {</div><div class='del'>-		struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	while ((mc_lst = sock_dereference(np-&gt;ipv6_mc_list, sk)) != NULL) {</div><div class='ctx'> 		np-&gt;ipv6_mc_list = mc_lst-&gt;next;</div><div class='del'>-</div><div class='del'>-		dev = __dev_get_by_index(net, mc_lst-&gt;ifindex);</div><div class='del'>-		if (dev) {</div><div class='del'>-			struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='del'>-</div><div class='del'>-			(void) ip6_mc_leave_src(sk, mc_lst, idev);</div><div class='del'>-			if (idev)</div><div class='del'>-				__ipv6_dev_mc_dec(idev, &amp;mc_lst-&gt;addr);</div><div class='del'>-		} else</div><div class='del'>-			(void) ip6_mc_leave_src(sk, mc_lst, NULL);</div><div class='del'>-</div><div class='del'>-		atomic_sub(sizeof(*mc_lst), &amp;sk-&gt;sk_omem_alloc);</div><div class='del'>-		kfree_rcu(mc_lst, rcu);</div><div class='add'>+		__ipv6_sock_mc_drop(sk, mc_lst);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,23 +344,23 @@ void ipv6_sock_mc_close(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (!rcu_access_pointer(np-&gt;ipv6_mc_list))</div><div class='ctx'> 		return;</div><div class='del'>-	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	__ipv6_sock_mc_close(sk);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='del'>-	struct group_source_req *pgsr)</div><div class='add'>+		  struct group_source_req *pgsr)</div><div class='ctx'> {</div><div class='add'>+	struct ipv6_pinfo *inet6 = inet6_sk(sk);</div><div class='ctx'> 	struct in6_addr *source, *group;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ipv6_mc_socklist *pmc;</div><div class='del'>-	struct inet6_dev *idev;</div><div class='del'>-	struct ipv6_pinfo *inet6 = inet6_sk(sk);</div><div class='ctx'> 	struct ip6_sf_socklist *psl;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='del'>-	int i, j, rv;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> 	int leavegroup = 0;</div><div class='del'>-	int pmclocked = 0;</div><div class='add'>+	int i, j, rv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	source = &amp;((struct sockaddr_in6 *)&amp;pgsr-&gt;gsr_source)-&gt;sin6_addr;</div><div class='hunk'>@@ -349,16 +369,20 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> 	if (!ipv6_addr_is_multicast(group))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = ip6_mc_find_dev_rcu(net, group, pgsr-&gt;gsr_interface);</div><div class='del'>-	if (!idev) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	idev = ip6_mc_find_idev(net, group, pgsr-&gt;gsr_interface);</div><div class='add'>+	if (!idev)</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (idev-&gt;dead) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	for_each_pmc_rcu(inet6, pmc) {</div><div class='add'>+	for_each_pmc_socklock(inet6, sk, pmc) {</div><div class='ctx'> 		if (pgsr-&gt;gsr_interface &amp;&amp; pmc-&gt;ifindex != pgsr-&gt;gsr_interface)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;pmc-&gt;addr, group))</div><div class='hunk'>@@ -369,7 +393,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* if a source filter was set, must be the same mode as before */</div><div class='del'>-	if (pmc-&gt;sflist) {</div><div class='add'>+	if (rcu_access_pointer(pmc-&gt;sflist)) {</div><div class='ctx'> 		if (pmc-&gt;sfmode != omode) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -381,10 +405,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> 		pmc-&gt;sfmode = omode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;pmc-&gt;sflock);</div><div class='del'>-	pmclocked = 1;</div><div class='del'>-</div><div class='del'>-	psl = pmc-&gt;sflist;</div><div class='add'>+	psl = sock_dereference(pmc-&gt;sflist, sk);</div><div class='ctx'> 	if (!add) {</div><div class='ctx'> 		if (!psl)</div><div class='ctx'> 			goto done;	/* err = -EADDRNOTAVAIL */</div><div class='hunk'>@@ -424,7 +445,8 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 		if (psl)</div><div class='ctx'> 			count += psl-&gt;sl_max;</div><div class='del'>-		newpsl = sock_kmalloc(sk, IP6_SFLSIZE(count), GFP_ATOMIC);</div><div class='add'>+		newpsl = sock_kmalloc(sk, struct_size(newpsl, sl_addr, count),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (!newpsl) {</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -434,9 +456,12 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> 		if (psl) {</div><div class='ctx'> 			for (i = 0; i &lt; psl-&gt;sl_count; i++)</div><div class='ctx'> 				newpsl-&gt;sl_addr[i] = psl-&gt;sl_addr[i];</div><div class='del'>-			sock_kfree_s(sk, psl, IP6_SFLSIZE(psl-&gt;sl_max));</div><div class='add'>+			atomic_sub(struct_size(psl, sl_addr, psl-&gt;sl_max),</div><div class='add'>+				   &amp;sk-&gt;sk_omem_alloc);</div><div class='ctx'> 		}</div><div class='del'>-		pmc-&gt;sflist = psl = newpsl;</div><div class='add'>+		rcu_assign_pointer(pmc-&gt;sflist, newpsl);</div><div class='add'>+		kfree_rcu(psl, rcu);</div><div class='add'>+		psl = newpsl;</div><div class='ctx'> 	}</div><div class='ctx'> 	rv = 1;	/* &gt; 0 for insert logic below if sl_count is 0 */</div><div class='ctx'> 	for (i = 0; i &lt; psl-&gt;sl_count; i++) {</div><div class='hunk'>@@ -452,23 +477,22 @@ int ip6_mc_source(int add, int omode, struct sock *sk,</div><div class='ctx'> 	/* update the interface list */</div><div class='ctx'> 	ip6_mc_add_src(idev, group, omode, 1, source, 1);</div><div class='ctx'> done:</div><div class='del'>-	if (pmclocked)</div><div class='del'>-		write_unlock(&amp;pmc-&gt;sflock);</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> 	if (leavegroup)</div><div class='ctx'> 		err = ipv6_sock_mc_drop(sk, pgsr-&gt;gsr_interface, group);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)</div><div class='add'>+int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf,</div><div class='add'>+		    struct sockaddr_storage *list)</div><div class='ctx'> {</div><div class='del'>-	const struct in6_addr *group;</div><div class='del'>-	struct ipv6_mc_socklist *pmc;</div><div class='del'>-	struct inet6_dev *idev;</div><div class='ctx'> 	struct ipv6_pinfo *inet6 = inet6_sk(sk);</div><div class='ctx'> 	struct ip6_sf_socklist *newpsl, *psl;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	const struct in6_addr *group;</div><div class='add'>+	struct ipv6_mc_socklist *pmc;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> 	int leavegroup = 0;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='hunk'>@@ -480,12 +504,15 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)</div><div class='ctx'> 	    gsf-&gt;gf_fmode != MCAST_EXCLUDE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = ip6_mc_find_dev_rcu(net, group, gsf-&gt;gf_interface);</div><div class='del'>-</div><div class='del'>-	if (!idev) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	idev = ip6_mc_find_idev(net, group, gsf-&gt;gf_interface);</div><div class='add'>+	if (!idev)</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (idev-&gt;dead) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -495,7 +522,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for_each_pmc_rcu(inet6, pmc) {</div><div class='add'>+	for_each_pmc_socklock(inet6, sk, pmc) {</div><div class='ctx'> 		if (pmc-&gt;ifindex != gsf-&gt;gf_interface)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;pmc-&gt;addr, group))</div><div class='hunk'>@@ -506,103 +533,85 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (gsf-&gt;gf_numsrc) {</div><div class='del'>-		newpsl = sock_kmalloc(sk, IP6_SFLSIZE(gsf-&gt;gf_numsrc),</div><div class='del'>-							  GFP_ATOMIC);</div><div class='add'>+		newpsl = sock_kmalloc(sk, struct_size(newpsl, sl_addr,</div><div class='add'>+						      gsf-&gt;gf_numsrc),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (!newpsl) {</div><div class='ctx'> 			err = -ENOBUFS;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		newpsl-&gt;sl_max = newpsl-&gt;sl_count = gsf-&gt;gf_numsrc;</div><div class='del'>-		for (i = 0; i &lt; newpsl-&gt;sl_count; ++i) {</div><div class='add'>+		for (i = 0; i &lt; newpsl-&gt;sl_count; ++i, ++list) {</div><div class='ctx'> 			struct sockaddr_in6 *psin6;</div><div class='ctx'> </div><div class='del'>-			psin6 = (struct sockaddr_in6 *)&amp;gsf-&gt;gf_slist[i];</div><div class='add'>+			psin6 = (struct sockaddr_in6 *)list;</div><div class='ctx'> 			newpsl-&gt;sl_addr[i] = psin6-&gt;sin6_addr;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		err = ip6_mc_add_src(idev, group, gsf-&gt;gf_fmode,</div><div class='del'>-			newpsl-&gt;sl_count, newpsl-&gt;sl_addr, 0);</div><div class='add'>+				     newpsl-&gt;sl_count, newpsl-&gt;sl_addr, 0);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			sock_kfree_s(sk, newpsl, IP6_SFLSIZE(newpsl-&gt;sl_max));</div><div class='add'>+			sock_kfree_s(sk, newpsl, struct_size(newpsl, sl_addr,</div><div class='add'>+							     newpsl-&gt;sl_max));</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		newpsl = NULL;</div><div class='del'>-		(void) ip6_mc_add_src(idev, group, gsf-&gt;gf_fmode, 0, NULL, 0);</div><div class='add'>+		ip6_mc_add_src(idev, group, gsf-&gt;gf_fmode, 0, NULL, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;pmc-&gt;sflock);</div><div class='del'>-	psl = pmc-&gt;sflist;</div><div class='add'>+	psl = sock_dereference(pmc-&gt;sflist, sk);</div><div class='ctx'> 	if (psl) {</div><div class='del'>-		(void) ip6_mc_del_src(idev, group, pmc-&gt;sfmode,</div><div class='del'>-			psl-&gt;sl_count, psl-&gt;sl_addr, 0);</div><div class='del'>-		sock_kfree_s(sk, psl, IP6_SFLSIZE(psl-&gt;sl_max));</div><div class='del'>-	} else</div><div class='del'>-		(void) ip6_mc_del_src(idev, group, pmc-&gt;sfmode, 0, NULL, 0);</div><div class='del'>-	pmc-&gt;sflist = newpsl;</div><div class='add'>+		ip6_mc_del_src(idev, group, pmc-&gt;sfmode,</div><div class='add'>+			       psl-&gt;sl_count, psl-&gt;sl_addr, 0);</div><div class='add'>+		atomic_sub(struct_size(psl, sl_addr, psl-&gt;sl_max),</div><div class='add'>+			   &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+	} else {</div><div class='add'>+		ip6_mc_del_src(idev, group, pmc-&gt;sfmode, 0, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(pmc-&gt;sflist, newpsl);</div><div class='add'>+	kfree_rcu(psl, rcu);</div><div class='ctx'> 	pmc-&gt;sfmode = gsf-&gt;gf_fmode;</div><div class='del'>-	write_unlock(&amp;pmc-&gt;sflock);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> done:</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> 	if (leavegroup)</div><div class='ctx'> 		err = ipv6_sock_mc_drop(sk, gsf-&gt;gf_interface, group);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,</div><div class='del'>-	struct group_filter __user *optval, int __user *optlen)</div><div class='add'>+		  sockptr_t optval, size_t ss_offset)</div><div class='ctx'> {</div><div class='del'>-	int err, i, count, copycount;</div><div class='add'>+	struct ipv6_pinfo *inet6 = inet6_sk(sk);</div><div class='ctx'> 	const struct in6_addr *group;</div><div class='ctx'> 	struct ipv6_mc_socklist *pmc;</div><div class='del'>-	struct inet6_dev *idev;</div><div class='del'>-	struct ipv6_pinfo *inet6 = inet6_sk(sk);</div><div class='ctx'> 	struct ip6_sf_socklist *psl;</div><div class='del'>-	struct net *net = sock_net(sk);</div><div class='add'>+	unsigned int count;</div><div class='add'>+	int i, copycount;</div><div class='ctx'> </div><div class='ctx'> 	group = &amp;((struct sockaddr_in6 *)&amp;gsf-&gt;gf_group)-&gt;sin6_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_is_multicast(group))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = ip6_mc_find_dev_rcu(net, group, gsf-&gt;gf_interface);</div><div class='del'>-</div><div class='del'>-	if (!idev) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = -EADDRNOTAVAIL;</div><div class='del'>-	/* changes to the ipv6_mc_list require the socket lock and</div><div class='del'>-	 * rtnl lock. We have the socket lock and rcu read lock,</div><div class='del'>-	 * so reading the list is safe.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for_each_pmc_rcu(inet6, pmc) {</div><div class='add'>+	for_each_pmc_socklock(inet6, sk, pmc) {</div><div class='ctx'> 		if (pmc-&gt;ifindex != gsf-&gt;gf_interface)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ipv6_addr_equal(group, &amp;pmc-&gt;addr))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!pmc)		/* must have a prior join */</div><div class='del'>-		goto done;</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='ctx'> 	gsf-&gt;gf_fmode = pmc-&gt;sfmode;</div><div class='del'>-	psl = pmc-&gt;sflist;</div><div class='add'>+	psl = sock_dereference(pmc-&gt;sflist, sk);</div><div class='ctx'> 	count = psl ? psl-&gt;sl_count : 0;</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	copycount = count &lt; gsf-&gt;gf_numsrc ? count : gsf-&gt;gf_numsrc;</div><div class='add'>+	copycount = min(count, gsf-&gt;gf_numsrc);</div><div class='ctx'> 	gsf-&gt;gf_numsrc = count;</div><div class='del'>-	if (put_user(GROUP_FILTER_SIZE(copycount), optlen) ||</div><div class='del'>-	    copy_to_user(optval, gsf, GROUP_FILTER_SIZE(0))) {</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	/* changes to psl require the socket lock, and a write lock</div><div class='del'>-	 * on pmc-&gt;sflock. We have the socket lock so reading here is safe.</div><div class='del'>-	 */</div><div class='ctx'> 	for (i = 0; i &lt; copycount; i++) {</div><div class='ctx'> 		struct sockaddr_in6 *psin6;</div><div class='ctx'> 		struct sockaddr_storage ss;</div><div class='hunk'>@@ -611,22 +620,19 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,</div><div class='ctx'> 		memset(&amp;ss, 0, sizeof(ss));</div><div class='ctx'> 		psin6-&gt;sin6_family = AF_INET6;</div><div class='ctx'> 		psin6-&gt;sin6_addr = psl-&gt;sl_addr[i];</div><div class='del'>-		if (copy_to_user(&amp;optval-&gt;gf_slist[i], &amp;ss, sizeof(ss)))</div><div class='add'>+		if (copy_to_sockptr_offset(optval, ss_offset, &amp;ss, sizeof(ss)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+		ss_offset += sizeof(ss);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-done:</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr,</div><div class='add'>+bool inet6_mc_check(const struct sock *sk, const struct in6_addr *mc_addr,</div><div class='ctx'> 		    const struct in6_addr *src_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct ipv6_mc_socklist *mc;</div><div class='del'>-	struct ip6_sf_socklist *psl;</div><div class='add'>+	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	const struct ipv6_mc_socklist *mc;</div><div class='add'>+	const struct ip6_sf_socklist *psl;</div><div class='ctx'> 	bool rv = true;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -636,10 +642,9 @@ bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!mc) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		return true;</div><div class='add'>+		return inet6_test_bit(MC6_ALL, sk);</div><div class='ctx'> 	}</div><div class='del'>-	read_lock(&amp;mc-&gt;sflock);</div><div class='del'>-	psl = mc-&gt;sflist;</div><div class='add'>+	psl = rcu_dereference(mc-&gt;sflist);</div><div class='ctx'> 	if (!psl) {</div><div class='ctx'> 		rv = mc-&gt;sfmode == MCAST_EXCLUDE;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -654,7 +659,6 @@ bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr,</div><div class='ctx'> 		if (mc-&gt;sfmode == MCAST_EXCLUDE &amp;&amp; i &lt; psl-&gt;sl_count)</div><div class='ctx'> 			rv = false;</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;mc-&gt;sflock);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return rv;</div><div class='hunk'>@@ -665,17 +669,17 @@ static void igmp6_group_added(struct ifmcaddr6 *mc)</div><div class='ctx'> 	struct net_device *dev = mc-&gt;idev-&gt;dev;</div><div class='ctx'> 	char buf[MAX_ADDR_LEN];</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(mc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	if (IPV6_ADDR_MC_SCOPE(&amp;mc-&gt;mca_addr) &lt;</div><div class='ctx'> 	    IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;mc-&gt;mca_lock);</div><div class='ctx'> 	if (!(mc-&gt;mca_flags&amp;MAF_LOADED)) {</div><div class='ctx'> 		mc-&gt;mca_flags |= MAF_LOADED;</div><div class='ctx'> 		if (ndisc_mc_map(&amp;mc-&gt;mca_addr, buf, dev, 0) == 0)</div><div class='ctx'> 			dev_mc_add(dev, buf);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;mc-&gt;mca_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!(dev-&gt;flags &amp; IFF_UP) || (mc-&gt;mca_flags &amp; MAF_NOREPORT))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -701,49 +705,45 @@ static void igmp6_group_dropped(struct ifmcaddr6 *mc)</div><div class='ctx'> 	struct net_device *dev = mc-&gt;idev-&gt;dev;</div><div class='ctx'> 	char buf[MAX_ADDR_LEN];</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(mc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	if (IPV6_ADDR_MC_SCOPE(&amp;mc-&gt;mca_addr) &lt;</div><div class='ctx'> 	    IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;mc-&gt;mca_lock);</div><div class='ctx'> 	if (mc-&gt;mca_flags&amp;MAF_LOADED) {</div><div class='ctx'> 		mc-&gt;mca_flags &amp;= ~MAF_LOADED;</div><div class='ctx'> 		if (ndisc_mc_map(&amp;mc-&gt;mca_addr, buf, dev, 0) == 0)</div><div class='ctx'> 			dev_mc_del(dev, buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;mc-&gt;mca_lock);</div><div class='ctx'> 	if (mc-&gt;mca_flags &amp; MAF_NOREPORT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!mc-&gt;idev-&gt;dead)</div><div class='ctx'> 		igmp6_leave_group(mc);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;mc-&gt;mca_lock);</div><div class='del'>-	if (del_timer(&amp;mc-&gt;mca_timer))</div><div class='add'>+	if (cancel_delayed_work(&amp;mc-&gt;mca_work))</div><div class='ctx'> 		refcount_dec(&amp;mc-&gt;mca_refcnt);</div><div class='del'>-	spin_unlock_bh(&amp;mc-&gt;mca_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * deleted ifmcaddr6 manipulation</div><div class='del'>- */</div><div class='add'>+/* deleted ifmcaddr6 manipulation */</div><div class='ctx'> static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *pmc;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	/* this is an "ifmcaddr6" for convenience; only the fields below</div><div class='ctx'> 	 * are actually used. In particular, the refcnt and users are not</div><div class='ctx'> 	 * used for management of the delete list. Using the same structure</div><div class='ctx'> 	 * for deleted items allows change reports to use common code with</div><div class='ctx'> 	 * non-deleted or query-response MCA's.</div><div class='ctx'> 	 */</div><div class='del'>-	pmc = kzalloc(sizeof(*pmc), GFP_ATOMIC);</div><div class='add'>+	pmc = kzalloc(sizeof(*pmc), GFP_KERNEL);</div><div class='ctx'> 	if (!pmc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;im-&gt;mca_lock);</div><div class='del'>-	spin_lock_init(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 	pmc-&gt;idev = im-&gt;idev;</div><div class='ctx'> 	in6_dev_hold(idev);</div><div class='ctx'> 	pmc-&gt;mca_addr = im-&gt;mca_addr;</div><div class='hunk'>@@ -752,101 +752,111 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)</div><div class='ctx'> 	if (pmc-&gt;mca_sfmode == MCAST_INCLUDE) {</div><div class='ctx'> 		struct ip6_sf_list *psf;</div><div class='ctx'> </div><div class='del'>-		pmc-&gt;mca_tomb = im-&gt;mca_tomb;</div><div class='del'>-		pmc-&gt;mca_sources = im-&gt;mca_sources;</div><div class='del'>-		im-&gt;mca_tomb = im-&gt;mca_sources = NULL;</div><div class='del'>-		for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next)</div><div class='add'>+		rcu_assign_pointer(pmc-&gt;mca_tomb,</div><div class='add'>+				   mc_dereference(im-&gt;mca_tomb, idev));</div><div class='add'>+		rcu_assign_pointer(pmc-&gt;mca_sources,</div><div class='add'>+				   mc_dereference(im-&gt;mca_sources, idev));</div><div class='add'>+		RCU_INIT_POINTER(im-&gt;mca_tomb, NULL);</div><div class='add'>+		RCU_INIT_POINTER(im-&gt;mca_sources, NULL);</div><div class='add'>+</div><div class='add'>+		for_each_psf_mclock(pmc, psf)</div><div class='ctx'> 			psf-&gt;sf_crcount = pmc-&gt;mca_crcount;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;im-&gt;mca_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;idev-&gt;mc_lock);</div><div class='del'>-	pmc-&gt;next = idev-&gt;mc_tomb;</div><div class='del'>-	idev-&gt;mc_tomb = pmc;</div><div class='del'>-	spin_unlock_bh(&amp;idev-&gt;mc_lock);</div><div class='add'>+	rcu_assign_pointer(pmc-&gt;next, idev-&gt;mc_tomb);</div><div class='add'>+	rcu_assign_pointer(idev-&gt;mc_tomb, pmc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *pmc, *pmc_prev;</div><div class='del'>-	struct ip6_sf_list *psf;</div><div class='add'>+	struct ip6_sf_list *psf, *sources, *tomb;</div><div class='ctx'> 	struct in6_addr *pmca = &amp;im-&gt;mca_addr;</div><div class='add'>+	struct ifmcaddr6 *pmc, *pmc_prev;</div><div class='add'>+</div><div class='add'>+	mc_assert_locked(idev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	pmc_prev = NULL;</div><div class='del'>-	for (pmc = idev-&gt;mc_tomb; pmc; pmc = pmc-&gt;next) {</div><div class='add'>+	for_each_mc_tomb(idev, pmc) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;pmc-&gt;mca_addr, pmca))</div><div class='ctx'> 			break;</div><div class='ctx'> 		pmc_prev = pmc;</div><div class='ctx'> 	}</div><div class='del'>-	if (pmc) {</div><div class='del'>-		if (pmc_prev)</div><div class='del'>-			pmc_prev-&gt;next = pmc-&gt;next;</div><div class='del'>-		else</div><div class='del'>-			idev-&gt;mc_tomb = pmc-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;idev-&gt;mc_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;im-&gt;mca_lock);</div><div class='del'>-	if (pmc) {</div><div class='del'>-		im-&gt;idev = pmc-&gt;idev;</div><div class='del'>-		if (im-&gt;mca_sfmode == MCAST_INCLUDE) {</div><div class='del'>-			im-&gt;mca_tomb = pmc-&gt;mca_tomb;</div><div class='del'>-			im-&gt;mca_sources = pmc-&gt;mca_sources;</div><div class='del'>-			for (psf = im-&gt;mca_sources; psf; psf = psf-&gt;sf_next)</div><div class='del'>-				psf-&gt;sf_crcount = idev-&gt;mc_qrv;</div><div class='del'>-		} else {</div><div class='del'>-			im-&gt;mca_crcount = idev-&gt;mc_qrv;</div><div class='del'>-		}</div><div class='del'>-		in6_dev_put(pmc-&gt;idev);</div><div class='del'>-		kfree(pmc);</div><div class='add'>+	if (!pmc)</div><div class='add'>+		return;</div><div class='add'>+	if (pmc_prev)</div><div class='add'>+		rcu_assign_pointer(pmc_prev-&gt;next, pmc-&gt;next);</div><div class='add'>+	else</div><div class='add'>+		rcu_assign_pointer(idev-&gt;mc_tomb, pmc-&gt;next);</div><div class='add'>+</div><div class='add'>+	im-&gt;idev = pmc-&gt;idev;</div><div class='add'>+	if (im-&gt;mca_sfmode == MCAST_INCLUDE) {</div><div class='add'>+		tomb = rcu_replace_pointer(im-&gt;mca_tomb,</div><div class='add'>+					   mc_dereference(pmc-&gt;mca_tomb, pmc-&gt;idev),</div><div class='add'>+					   lockdep_is_held(&amp;im-&gt;idev-&gt;mc_lock));</div><div class='add'>+		rcu_assign_pointer(pmc-&gt;mca_tomb, tomb);</div><div class='add'>+</div><div class='add'>+		sources = rcu_replace_pointer(im-&gt;mca_sources,</div><div class='add'>+					      mc_dereference(pmc-&gt;mca_sources, pmc-&gt;idev),</div><div class='add'>+					      lockdep_is_held(&amp;im-&gt;idev-&gt;mc_lock));</div><div class='add'>+		rcu_assign_pointer(pmc-&gt;mca_sources, sources);</div><div class='add'>+		for_each_psf_mclock(im, psf)</div><div class='add'>+			psf-&gt;sf_crcount = idev-&gt;mc_qrv;</div><div class='add'>+	} else {</div><div class='add'>+		im-&gt;mca_crcount = idev-&gt;mc_qrv;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;im-&gt;mca_lock);</div><div class='add'>+	ip6_mc_clear_src(pmc);</div><div class='add'>+	in6_dev_put(pmc-&gt;idev);</div><div class='add'>+	kfree_rcu(pmc, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mld_clear_delrec(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *pmc, *nextpmc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;idev-&gt;mc_lock);</div><div class='del'>-	pmc = idev-&gt;mc_tomb;</div><div class='del'>-	idev-&gt;mc_tomb = NULL;</div><div class='del'>-	spin_unlock_bh(&amp;idev-&gt;mc_lock);</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='add'>+	pmc = mc_dereference(idev-&gt;mc_tomb, idev);</div><div class='add'>+	RCU_INIT_POINTER(idev-&gt;mc_tomb, NULL);</div><div class='ctx'> </div><div class='ctx'> 	for (; pmc; pmc = nextpmc) {</div><div class='del'>-		nextpmc = pmc-&gt;next;</div><div class='add'>+		nextpmc = mc_dereference(pmc-&gt;next, idev);</div><div class='ctx'> 		ip6_mc_clear_src(pmc);</div><div class='ctx'> 		in6_dev_put(pmc-&gt;idev);</div><div class='del'>-		kfree(pmc);</div><div class='add'>+		kfree_rcu(pmc, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear dead sources, too */</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='add'>+	for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 		struct ip6_sf_list *psf, *psf_next;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='del'>-		psf = pmc-&gt;mca_tomb;</div><div class='del'>-		pmc-&gt;mca_tomb = NULL;</div><div class='del'>-		spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='add'>+		psf = mc_dereference(pmc-&gt;mca_tomb, idev);</div><div class='add'>+		RCU_INIT_POINTER(pmc-&gt;mca_tomb, NULL);</div><div class='ctx'> 		for (; psf; psf = psf_next) {</div><div class='del'>-			psf_next = psf-&gt;sf_next;</div><div class='del'>-			kfree(psf);</div><div class='add'>+			psf_next = mc_dereference(psf-&gt;sf_next, idev);</div><div class='add'>+			kfree_rcu(psf, rcu);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mca_get(struct ifmcaddr6 *mc)</div><div class='add'>+static void mld_clear_query(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	refcount_inc(&amp;mc-&gt;mca_refcnt);</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+	__skb_queue_purge(&amp;idev-&gt;mc_query_queue);</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mld_clear_report(struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+	__skb_queue_purge(&amp;idev-&gt;mc_report_queue);</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ma_put(struct ifmcaddr6 *mc)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;mc-&gt;mca_refcnt)) {</div><div class='ctx'> 		in6_dev_put(mc-&gt;idev);</div><div class='del'>-		kfree(mc);</div><div class='add'>+		kfree_rcu(mc, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -856,11 +866,13 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *mc;</div><div class='ctx'> </div><div class='del'>-	mc = kzalloc(sizeof(*mc), GFP_ATOMIC);</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='add'>+	mc = kzalloc(sizeof(*mc), GFP_KERNEL);</div><div class='ctx'> 	if (!mc)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	timer_setup(&amp;mc-&gt;mca_timer, igmp6_timer_handler, 0);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mc-&gt;mca_work, mld_mca_work);</div><div class='ctx'> </div><div class='ctx'> 	mc-&gt;mca_addr = *addr;</div><div class='ctx'> 	mc-&gt;idev = idev; /* reference taken by caller */</div><div class='hunk'>@@ -868,7 +880,6 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,</div><div class='ctx'> 	/* mca_stamp should be updated upon changes */</div><div class='ctx'> 	mc-&gt;mca_cstamp = mc-&gt;mca_tstamp = jiffies;</div><div class='ctx'> 	refcount_set(&amp;mc-&gt;mca_refcnt, 1);</div><div class='del'>-	spin_lock_init(&amp;mc-&gt;mca_lock);</div><div class='ctx'> </div><div class='ctx'> 	mc-&gt;mca_sfmode = mode;</div><div class='ctx'> 	mc-&gt;mca_sfcount[mode] = 1;</div><div class='hunk'>@@ -880,35 +891,68 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,</div><div class='ctx'> 	return mc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void inet6_ifmcaddr_notify(struct net_device *dev,</div><div class='add'>+				  const struct ifmcaddr6 *ifmca, int event)</div><div class='add'>+{</div><div class='add'>+	struct inet6_fill_args fillargs = {</div><div class='add'>+		.portid = 0,</div><div class='add'>+		.seq = 0,</div><div class='add'>+		.event = event,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.netnsid = -1,</div><div class='add'>+		.force_rt_scope_universe = true,</div><div class='add'>+	};</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +</div><div class='add'>+			nla_total_size(sizeof(struct in6_addr)) +</div><div class='add'>+			nla_total_size(sizeof(struct ifa_cacheinfo)),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = inet6_fill_ifmcaddr(skb, ifmca, &amp;fillargs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		WARN_ON_ONCE(err == -EMSGSIZE);</div><div class='add'>+		nlmsg_free(skb);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_MCADDR, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_MCADDR, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	device multicast group inc (add if not found)</div><div class='ctx'>  */</div><div class='ctx'> static int __ipv6_dev_mc_inc(struct net_device *dev,</div><div class='ctx'> 			     const struct in6_addr *addr, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *mc;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	struct ifmcaddr6 *mc;</div><div class='ctx'> </div><div class='ctx'> 	/* we need to take a reference on idev */</div><div class='ctx'> 	idev = in6_dev_get(dev);</div><div class='del'>-</div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	if (idev-&gt;dead) {</div><div class='del'>-		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(idev-&gt;dead)) {</div><div class='add'>+		mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (mc = idev-&gt;mc_list; mc; mc = mc-&gt;next) {</div><div class='add'>+	for_each_mc_mclock(idev, mc) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;mc-&gt;mca_addr, addr)) {</div><div class='ctx'> 			mc-&gt;mca_users++;</div><div class='del'>-			write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 			ip6_mc_add_src(idev, &amp;mc-&gt;mca_addr, mode, 0, NULL, 0);</div><div class='add'>+			mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 			in6_dev_put(idev);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -916,23 +960,19 @@ static int __ipv6_dev_mc_inc(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mc = mca_alloc(idev, addr, mode);</div><div class='ctx'> 	if (!mc) {</div><div class='del'>-		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mc-&gt;next = idev-&gt;mc_list;</div><div class='del'>-	idev-&gt;mc_list = mc;</div><div class='del'>-</div><div class='del'>-	/* Hold this for the code below before we unlock,</div><div class='del'>-	 * it is already exposed via idev-&gt;mc_list.</div><div class='del'>-	 */</div><div class='del'>-	mca_get(mc);</div><div class='del'>-	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	rcu_assign_pointer(mc-&gt;next, idev-&gt;mc_list);</div><div class='add'>+	rcu_assign_pointer(idev-&gt;mc_list, mc);</div><div class='ctx'> </div><div class='ctx'> 	mld_del_delrec(idev, mc);</div><div class='ctx'> 	igmp6_group_added(mc);</div><div class='del'>-	ma_put(mc);</div><div class='add'>+	inet6_ifmcaddr_notify(dev, mc, RTM_NEWMULTICAST);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -940,35 +980,39 @@ int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	return __ipv6_dev_mc_inc(dev, addr, MCAST_EXCLUDE);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ipv6_dev_mc_inc);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	device multicast group del</div><div class='add'>+ * device multicast group del</div><div class='ctx'>  */</div><div class='ctx'> int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *ma, **map;</div><div class='add'>+	struct ifmcaddr6 *ma, __rcu **map;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (map = &amp;idev-&gt;mc_list; (ma = *map) != NULL; map = &amp;ma-&gt;next) {</div><div class='add'>+	for (map = &amp;idev-&gt;mc_list;</div><div class='add'>+	     (ma = mc_dereference(*map, idev));</div><div class='add'>+	     map = &amp;ma-&gt;next) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ma-&gt;mca_addr, addr)) {</div><div class='ctx'> 			if (--ma-&gt;mca_users == 0) {</div><div class='ctx'> 				*map = ma-&gt;next;</div><div class='del'>-				write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 				igmp6_group_dropped(ma);</div><div class='add'>+				inet6_ifmcaddr_notify(idev-&gt;dev, ma,</div><div class='add'>+						      RTM_DELMULTICAST);</div><div class='ctx'> 				ip6_mc_clear_src(ma);</div><div class='add'>+				mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> </div><div class='ctx'> 				ma_put(ma);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='del'>-			write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -977,16 +1021,16 @@ int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr)</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	idev = __in6_dev_get(dev);</div><div class='add'>+	idev = in6_dev_get(dev);</div><div class='ctx'> 	if (!idev)</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-	else</div><div class='del'>-		err = __ipv6_dev_mc_dec(idev, addr);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = __ipv6_dev_mc_dec(idev, addr);</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ipv6_dev_mc_dec);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	check if the interface/address pair is valid</div><div class='hunk'>@@ -1000,105 +1044,125 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	idev = __in6_dev_get(dev);</div><div class='del'>-	if (idev) {</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		for (mc = idev-&gt;mc_list; mc; mc = mc-&gt;next) {</div><div class='del'>-			if (ipv6_addr_equal(&amp;mc-&gt;mca_addr, group))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (mc) {</div><div class='del'>-			if (src_addr &amp;&amp; !ipv6_addr_any(src_addr)) {</div><div class='del'>-				struct ip6_sf_list *psf;</div><div class='add'>+	if (!idev)</div><div class='add'>+		goto unlock;</div><div class='add'>+	for_each_mc_rcu(idev, mc) {</div><div class='add'>+		if (ipv6_addr_equal(&amp;mc-&gt;mca_addr, group))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!mc)</div><div class='add'>+		goto unlock;</div><div class='add'>+	if (src_addr &amp;&amp; !ipv6_addr_any(src_addr)) {</div><div class='add'>+		struct ip6_sf_list *psf;</div><div class='ctx'> </div><div class='del'>-				spin_lock_bh(&amp;mc-&gt;mca_lock);</div><div class='del'>-				for (psf = mc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='del'>-					if (ipv6_addr_equal(&amp;psf-&gt;sf_addr, src_addr))</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-				if (psf)</div><div class='del'>-					rv = psf-&gt;sf_count[MCAST_INCLUDE] ||</div><div class='del'>-						psf-&gt;sf_count[MCAST_EXCLUDE] !=</div><div class='del'>-						mc-&gt;mca_sfcount[MCAST_EXCLUDE];</div><div class='del'>-				else</div><div class='del'>-					rv = mc-&gt;mca_sfcount[MCAST_EXCLUDE] != 0;</div><div class='del'>-				spin_unlock_bh(&amp;mc-&gt;mca_lock);</div><div class='del'>-			} else</div><div class='del'>-				rv = true; /* don't filter unspecified source */</div><div class='add'>+		for_each_psf_rcu(mc, psf) {</div><div class='add'>+			if (ipv6_addr_equal(&amp;psf-&gt;sf_addr, src_addr))</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		if (psf)</div><div class='add'>+			rv = READ_ONCE(psf-&gt;sf_count[MCAST_INCLUDE]) ||</div><div class='add'>+				READ_ONCE(psf-&gt;sf_count[MCAST_EXCLUDE]) !=</div><div class='add'>+				READ_ONCE(mc-&gt;mca_sfcount[MCAST_EXCLUDE]);</div><div class='add'>+		else</div><div class='add'>+			rv = READ_ONCE(mc-&gt;mca_sfcount[MCAST_EXCLUDE]) != 0;</div><div class='add'>+	} else {</div><div class='add'>+		rv = true; /* don't filter unspecified source */</div><div class='ctx'> 	}</div><div class='add'>+unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_gq_start_timer(struct inet6_dev *idev)</div><div class='add'>+static void mld_gq_start_work(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long tv = prandom_u32() % idev-&gt;mc_maxdelay;</div><div class='add'>+	unsigned long tv = get_random_u32_below(idev-&gt;mc_maxdelay);</div><div class='add'>+</div><div class='add'>+	mc_assert_locked(idev);</div><div class='ctx'> </div><div class='ctx'> 	idev-&gt;mc_gq_running = 1;</div><div class='del'>-	if (!mod_timer(&amp;idev-&gt;mc_gq_timer, jiffies+tv+2))</div><div class='add'>+	if (!mod_delayed_work(mld_wq, &amp;idev-&gt;mc_gq_work, tv + 2))</div><div class='ctx'> 		in6_dev_hold(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_gq_stop_timer(struct inet6_dev *idev)</div><div class='add'>+static void mld_gq_stop_work(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	idev-&gt;mc_gq_running = 0;</div><div class='del'>-	if (del_timer(&amp;idev-&gt;mc_gq_timer))</div><div class='add'>+	if (cancel_delayed_work(&amp;idev-&gt;mc_gq_work))</div><div class='ctx'> 		__in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_ifc_start_timer(struct inet6_dev *idev, unsigned long delay)</div><div class='add'>+static void mld_ifc_start_work(struct inet6_dev *idev, unsigned long delay)</div><div class='ctx'> {</div><div class='del'>-	unsigned long tv = prandom_u32() % delay;</div><div class='add'>+	unsigned long tv = get_random_u32_below(delay);</div><div class='ctx'> </div><div class='del'>-	if (!mod_timer(&amp;idev-&gt;mc_ifc_timer, jiffies+tv+2))</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='add'>+	if (!mod_delayed_work(mld_wq, &amp;idev-&gt;mc_ifc_work, tv + 2))</div><div class='ctx'> 		in6_dev_hold(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_ifc_stop_timer(struct inet6_dev *idev)</div><div class='add'>+static void mld_ifc_stop_work(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	idev-&gt;mc_ifc_count = 0;</div><div class='del'>-	if (del_timer(&amp;idev-&gt;mc_ifc_timer))</div><div class='add'>+	if (cancel_delayed_work(&amp;idev-&gt;mc_ifc_work))</div><div class='ctx'> 		__in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_dad_start_timer(struct inet6_dev *idev, unsigned long delay)</div><div class='add'>+static void mld_dad_start_work(struct inet6_dev *idev, unsigned long delay)</div><div class='ctx'> {</div><div class='del'>-	unsigned long tv = prandom_u32() % delay;</div><div class='add'>+	unsigned long tv = get_random_u32_below(delay);</div><div class='add'>+</div><div class='add'>+	mc_assert_locked(idev);</div><div class='ctx'> </div><div class='del'>-	if (!mod_timer(&amp;idev-&gt;mc_dad_timer, jiffies+tv+2))</div><div class='add'>+	if (!mod_delayed_work(mld_wq, &amp;idev-&gt;mc_dad_work, tv + 2))</div><div class='ctx'> 		in6_dev_hold(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_dad_stop_timer(struct inet6_dev *idev)</div><div class='add'>+static void mld_dad_stop_work(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer(&amp;idev-&gt;mc_dad_timer))</div><div class='add'>+	if (cancel_delayed_work(&amp;idev-&gt;mc_dad_work))</div><div class='ctx'> 		__in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	IGMP handling (alias multicast ICMPv6 messages)</div><div class='del'>- */</div><div class='add'>+static void mld_query_stop_work(struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+	if (cancel_delayed_work(&amp;idev-&gt;mc_query_work))</div><div class='add'>+		__in6_dev_put(idev);</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void mld_report_stop_work(struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	if (cancel_delayed_work_sync(&amp;idev-&gt;mc_report_work))</div><div class='add'>+		__in6_dev_put(idev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* IGMP handling (alias multicast ICMPv6 messages) */</div><div class='ctx'> static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay = resptime;</div><div class='ctx'> </div><div class='del'>-	/* Do not start timer for these addresses */</div><div class='add'>+	mc_assert_locked(ma-&gt;idev);</div><div class='add'>+</div><div class='add'>+	/* Do not start work for these addresses */</div><div class='ctx'> 	if (ipv6_addr_is_ll_all_nodes(&amp;ma-&gt;mca_addr) ||</div><div class='ctx'> 	    IPV6_ADDR_MC_SCOPE(&amp;ma-&gt;mca_addr) &lt; IPV6_ADDR_SCOPE_LINKLOCAL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (del_timer(&amp;ma-&gt;mca_timer)) {</div><div class='add'>+	if (cancel_delayed_work(&amp;ma-&gt;mca_work)) {</div><div class='ctx'> 		refcount_dec(&amp;ma-&gt;mca_refcnt);</div><div class='del'>-		delay = ma-&gt;mca_timer.expires - jiffies;</div><div class='add'>+		delay = ma-&gt;mca_work.timer.expires - jiffies;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (delay &gt;= resptime)</div><div class='del'>-		delay = prandom_u32() % resptime;</div><div class='add'>+		delay = get_random_u32_below(resptime);</div><div class='ctx'> </div><div class='del'>-	ma-&gt;mca_timer.expires = jiffies + delay;</div><div class='del'>-	if (!mod_timer(&amp;ma-&gt;mca_timer, jiffies + delay))</div><div class='add'>+	if (!mod_delayed_work(mld_wq, &amp;ma-&gt;mca_work, delay))</div><div class='ctx'> 		refcount_inc(&amp;ma-&gt;mca_refcnt);</div><div class='ctx'> 	ma-&gt;mca_flags |= MAF_TIMER_RUNNING;</div><div class='ctx'> }</div><div class='hunk'>@@ -1110,8 +1174,10 @@ static bool mld_xmarksources(struct ifmcaddr6 *pmc, int nsrcs,</div><div class='ctx'> 	struct ip6_sf_list *psf;</div><div class='ctx'> 	int i, scount;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	scount = 0;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (scount == nsrcs)</div><div class='ctx'> 			break;</div><div class='ctx'> 		for (i = 0; i &lt; nsrcs; i++) {</div><div class='hunk'>@@ -1138,13 +1204,15 @@ static bool mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,</div><div class='ctx'> 	struct ip6_sf_list *psf;</div><div class='ctx'> 	int i, scount;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	if (pmc-&gt;mca_sfmode == MCAST_EXCLUDE)</div><div class='ctx'> 		return mld_xmarksources(pmc, nsrcs, srcs);</div><div class='ctx'> </div><div class='ctx'> 	/* mark INCLUDE-mode sources */</div><div class='ctx'> </div><div class='ctx'> 	scount = 0;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (scount == nsrcs)</div><div class='ctx'> 			break;</div><div class='ctx'> 		for (i = 0; i &lt; nsrcs; i++) {</div><div class='hunk'>@@ -1165,15 +1233,15 @@ static bool mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,</div><div class='ctx'> </div><div class='ctx'> static int mld_force_mld_version(const struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	const struct net *net = dev_net(idev-&gt;dev);</div><div class='add'>+	int all_force;</div><div class='add'>+</div><div class='add'>+	all_force = READ_ONCE(net-&gt;ipv6.devconf_all-&gt;force_mld_version);</div><div class='ctx'> 	/* Normally, both are 0 here. If enforcement to a particular is</div><div class='ctx'> 	 * being used, individual device enforcement will have a lower</div><div class='ctx'> 	 * precedence over 'all' device (.../conf/all/force_mld_version).</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	if (dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;force_mld_version != 0)</div><div class='del'>-		return dev_net(idev-&gt;dev)-&gt;ipv6.devconf_all-&gt;force_mld_version;</div><div class='del'>-	else</div><div class='del'>-		return idev-&gt;cnf.force_mld_version;</div><div class='add'>+	return all_force ?: READ_ONCE(idev-&gt;cnf.force_mld_version);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool mld_in_v2_mode_only(const struct inet6_dev *idev)</div><div class='hunk'>@@ -1309,18 +1377,18 @@ static int mld_process_v1(struct inet6_dev *idev, struct mld_msg *mld,</div><div class='ctx'> 	if (v1_query)</div><div class='ctx'> 		mld_set_v1_mode(idev);</div><div class='ctx'> </div><div class='del'>-	/* cancel MLDv2 report timer */</div><div class='del'>-	mld_gq_stop_timer(idev);</div><div class='del'>-	/* cancel the interface change timer */</div><div class='del'>-	mld_ifc_stop_timer(idev);</div><div class='add'>+	/* cancel MLDv2 report work */</div><div class='add'>+	mld_gq_stop_work(idev);</div><div class='add'>+	/* cancel the interface change work */</div><div class='add'>+	mld_ifc_stop_work(idev);</div><div class='ctx'> 	/* clear deleted report items */</div><div class='ctx'> 	mld_clear_delrec(idev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,</div><div class='del'>-			  unsigned long *max_delay)</div><div class='add'>+static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,</div><div class='add'>+			   unsigned long *max_delay)</div><div class='ctx'> {</div><div class='ctx'> 	*max_delay = max(msecs_to_jiffies(mldv2_mrc(mld)), 1UL);</div><div class='ctx'> </div><div class='hunk'>@@ -1330,24 +1398,43 @@ static int mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,</div><div class='ctx'> </div><div class='ctx'> 	idev-&gt;mc_maxdelay = *max_delay;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-int igmp6_event_query(struct sk_buff *skb)</div><div class='add'>+void igmp6_event_query(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = __in6_dev_get(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!idev || idev-&gt;dead)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+	if (skb_queue_len(&amp;idev-&gt;mc_query_queue) &lt; MLD_MAX_SKBS) {</div><div class='add'>+		__skb_queue_tail(&amp;idev-&gt;mc_query_queue, skb);</div><div class='add'>+		if (!mod_delayed_work(mld_wq, &amp;idev-&gt;mc_query_work, 0))</div><div class='add'>+			in6_dev_hold(idev);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __mld_query_work(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mld2_query *mlh2 = NULL;</div><div class='del'>-	struct ifmcaddr6 *ma;</div><div class='ctx'> 	const struct in6_addr *group;</div><div class='ctx'> 	unsigned long max_delay;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	struct ifmcaddr6 *ma;</div><div class='ctx'> 	struct mld_msg *mld;</div><div class='ctx'> 	int group_type;</div><div class='ctx'> 	int mark = 0;</div><div class='ctx'> 	int len, err;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct in6_addr)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	/* compute payload length excluding extension headers */</div><div class='ctx'> 	len = ntohs(ipv6_hdr(skb)-&gt;payload_len) + sizeof(struct ipv6hdr);</div><div class='hunk'>@@ -1364,11 +1451,11 @@ int igmp6_event_query(struct sk_buff *skb)</div><div class='ctx'> 	    ipv6_hdr(skb)-&gt;hop_limit != 1 ||</div><div class='ctx'> 	    !(IP6CB(skb)-&gt;flags &amp; IP6SKB_ROUTERALERT) ||</div><div class='ctx'> 	    IP6CB(skb)-&gt;ra != htons(IPV6_OPT_ROUTERALERT_MLD))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='del'>-	idev = __in6_dev_get(skb-&gt;dev);</div><div class='add'>+	idev = in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	if (!idev)</div><div class='del'>-		return 0;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	mld = (struct mld_msg *)icmp6_hdr(skb);</div><div class='ctx'> 	group = &amp;mld-&gt;mld_mca;</div><div class='hunk'>@@ -1376,60 +1463,54 @@ int igmp6_event_query(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (group_type != IPV6_ADDR_ANY &amp;&amp;</div><div class='ctx'> 	    !(group_type&amp;IPV6_ADDR_MULTICAST))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; MLD_V1_QUERY_LEN) {</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	} else if (len == MLD_V1_QUERY_LEN || mld_in_v1_mode(idev)) {</div><div class='ctx'> 		err = mld_process_v1(idev, mld, &amp;max_delay,</div><div class='ctx'> 				     len == MLD_V1_QUERY_LEN);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+			goto out;</div><div class='ctx'> 	} else if (len &gt;= MLD_V2_QUERY_LEN_MIN) {</div><div class='ctx'> 		int srcs_offset = sizeof(struct mld2_query) -</div><div class='ctx'> 				  sizeof(struct icmp6hdr);</div><div class='ctx'> </div><div class='ctx'> 		if (!pskb_may_pull(skb, srcs_offset))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		mlh2 = (struct mld2_query *)skb_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-		err = mld_process_v2(idev, mlh2, &amp;max_delay);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		mld_process_v2(idev, mlh2, &amp;max_delay);</div><div class='ctx'> </div><div class='ctx'> 		if (group_type == IPV6_ADDR_ANY) { /* general query */</div><div class='ctx'> 			if (mlh2-&gt;mld2q_nsrcs)</div><div class='del'>-				return -EINVAL; /* no sources allowed */</div><div class='add'>+				goto out; /* no sources allowed */</div><div class='ctx'> </div><div class='del'>-			mld_gq_start_timer(idev);</div><div class='del'>-			return 0;</div><div class='add'>+			mld_gq_start_work(idev);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* mark sources to include, if group &amp; source-specific */</div><div class='ctx'> 		if (mlh2-&gt;mld2q_nsrcs != 0) {</div><div class='ctx'> 			if (!pskb_may_pull(skb, srcs_offset +</div><div class='ctx'> 			    ntohs(mlh2-&gt;mld2q_nsrcs) * sizeof(struct in6_addr)))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+				goto out;</div><div class='ctx'> </div><div class='ctx'> 			mlh2 = (struct mld2_query *)skb_transport_header(skb);</div><div class='ctx'> 			mark = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (group_type == IPV6_ADDR_ANY) {</div><div class='del'>-		for (ma = idev-&gt;mc_list; ma; ma = ma-&gt;next) {</div><div class='del'>-			spin_lock_bh(&amp;ma-&gt;mca_lock);</div><div class='add'>+		for_each_mc_mclock(idev, ma) {</div><div class='ctx'> 			igmp6_group_queried(ma, max_delay);</div><div class='del'>-			spin_unlock_bh(&amp;ma-&gt;mca_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		for (ma = idev-&gt;mc_list; ma; ma = ma-&gt;next) {</div><div class='add'>+		for_each_mc_mclock(idev, ma) {</div><div class='ctx'> 			if (!ipv6_addr_equal(group, &amp;ma-&gt;mca_addr))</div><div class='ctx'> 				continue;</div><div class='del'>-			spin_lock_bh(&amp;ma-&gt;mca_lock);</div><div class='ctx'> 			if (ma-&gt;mca_flags &amp; MAF_TIMER_RUNNING) {</div><div class='ctx'> 				/* gsquery &lt;- gsquery &amp;&amp; mark */</div><div class='ctx'> 				if (!mark)</div><div class='hunk'>@@ -1444,34 +1525,88 @@ int igmp6_event_query(struct sk_buff *skb)</div><div class='ctx'> 			if (!(ma-&gt;mca_flags &amp; MAF_GSQUERY) ||</div><div class='ctx'> 			    mld_marksources(ma, ntohs(mlh2-&gt;mld2q_nsrcs), mlh2-&gt;mld2q_srcs))</div><div class='ctx'> 				igmp6_group_queried(ma, max_delay);</div><div class='del'>-			spin_unlock_bh(&amp;ma-&gt;mca_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	in6_dev_put(idev);</div><div class='add'>+kfree_skb:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mld_query_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = container_of(to_delayed_work(work),</div><div class='add'>+					      struct inet6_dev,</div><div class='add'>+					      mc_query_work);</div><div class='add'>+	struct sk_buff_head q;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool rework = false;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;q);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;idev-&gt;mc_query_queue))) {</div><div class='add'>+		__skb_queue_tail(&amp;q, skb);</div><div class='add'>+</div><div class='add'>+		if (++cnt &gt;= MLD_MAX_QUEUE) {</div><div class='add'>+			rework = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;q)))</div><div class='add'>+		__mld_query_work(skb);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (rework &amp;&amp; queue_delayed_work(mld_wq, &amp;idev-&gt;mc_query_work, 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-int igmp6_event_report(struct sk_buff *skb)</div><div class='add'>+void igmp6_event_report(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = __in6_dev_get(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!idev || idev-&gt;dead)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+	if (skb_queue_len(&amp;idev-&gt;mc_report_queue) &lt; MLD_MAX_SKBS) {</div><div class='add'>+		__skb_queue_tail(&amp;idev-&gt;mc_report_queue, skb);</div><div class='add'>+		if (!mod_delayed_work(mld_wq, &amp;idev-&gt;mc_report_work, 0))</div><div class='add'>+			in6_dev_hold(idev);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __mld_report_work(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *ma;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	struct ifmcaddr6 *ma;</div><div class='ctx'> 	struct mld_msg *mld;</div><div class='ctx'> 	int addr_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Our own report looped back. Ignore it. */</div><div class='ctx'> 	if (skb-&gt;pkt_type == PACKET_LOOPBACK)</div><div class='del'>-		return 0;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	/* send our report if the MC router may not have heard this report */</div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_MULTICAST &amp;&amp;</div><div class='ctx'> 	    skb-&gt;pkt_type != PACKET_BROADCAST)</div><div class='del'>-		return 0;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(*mld) - sizeof(struct icmp6hdr)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	mld = (struct mld_msg *)icmp6_hdr(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -1479,29 +1614,62 @@ int igmp6_event_report(struct sk_buff *skb)</div><div class='ctx'> 	addr_type = ipv6_addr_type(&amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='ctx'> 	if (addr_type != IPV6_ADDR_ANY &amp;&amp;</div><div class='ctx'> 	    !(addr_type&amp;IPV6_ADDR_LINKLOCAL))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='del'>-	idev = __in6_dev_get(skb-&gt;dev);</div><div class='add'>+	idev = in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	if (!idev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		goto kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *	Cancel the timer for this group</div><div class='add'>+	 *	Cancel the work for this group</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (ma = idev-&gt;mc_list; ma; ma = ma-&gt;next) {</div><div class='add'>+	for_each_mc_mclock(idev, ma) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;ma-&gt;mca_addr, &amp;mld-&gt;mld_mca)) {</div><div class='del'>-			spin_lock(&amp;ma-&gt;mca_lock);</div><div class='del'>-			if (del_timer(&amp;ma-&gt;mca_timer))</div><div class='add'>+			if (cancel_delayed_work(&amp;ma-&gt;mca_work))</div><div class='ctx'> 				refcount_dec(&amp;ma-&gt;mca_refcnt);</div><div class='del'>-			ma-&gt;mca_flags &amp;= ~(MAF_LAST_REPORTER|MAF_TIMER_RUNNING);</div><div class='del'>-			spin_unlock(&amp;ma-&gt;mca_lock);</div><div class='add'>+			ma-&gt;mca_flags &amp;= ~(MAF_LAST_REPORTER |</div><div class='add'>+					   MAF_TIMER_RUNNING);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	in6_dev_put(idev);</div><div class='add'>+kfree_skb:</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mld_report_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = container_of(to_delayed_work(work),</div><div class='add'>+					      struct inet6_dev,</div><div class='add'>+					      mc_report_work);</div><div class='add'>+	struct sk_buff_head q;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool rework = false;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;q);</div><div class='add'>+	spin_lock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;idev-&gt;mc_report_queue))) {</div><div class='add'>+		__skb_queue_tail(&amp;q, skb);</div><div class='add'>+</div><div class='add'>+		if (++cnt &gt;= MLD_MAX_QUEUE) {</div><div class='add'>+			rework = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;q)))</div><div class='add'>+		__mld_report_work(skb);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (rework &amp;&amp; queue_delayed_work(mld_wq, &amp;idev-&gt;mc_report_work, 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool is_in(struct ifmcaddr6 *pmc, struct ip6_sf_list *psf, int type,</div><div class='hunk'>@@ -1554,7 +1722,7 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)</div><div class='ctx'> 	struct ip6_sf_list *psf;</div><div class='ctx'> 	int scount = 0;</div><div class='ctx'> </div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (!is_in(pmc, psf, type, gdeleted, sdeleted))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		scount++;</div><div class='hunk'>@@ -1562,11 +1730,9 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)</div><div class='ctx'> 	return scount;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *dev,</div><div class='del'>-		       const struct in6_addr *saddr,</div><div class='del'>-		       const struct in6_addr *daddr,</div><div class='del'>-		       int proto, int len)</div><div class='add'>+static void ip6_mc_hdr(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+		       struct net_device *dev, const struct in6_addr *saddr,</div><div class='add'>+		       const struct in6_addr *daddr, int proto, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -1581,7 +1747,7 @@ static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;payload_len = htons(len);</div><div class='ctx'> 	hdr-&gt;nexthdr = proto;</div><div class='del'>-	hdr-&gt;hop_limit = inet6_sk(sk)-&gt;hop_limit;</div><div class='add'>+	hdr-&gt;hop_limit = READ_ONCE(inet6_sk(sk)-&gt;hop_limit);</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;saddr = *saddr;</div><div class='ctx'> 	hdr-&gt;daddr = *daddr;</div><div class='hunk'>@@ -1589,26 +1755,24 @@ static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *mld_newpack(struct inet6_dev *idev, unsigned int mtu)</div><div class='ctx'> {</div><div class='add'>+	u8 ra[8] = { IPPROTO_ICMPV6, 0, IPV6_TLV_ROUTERALERT,</div><div class='add'>+		     2, 0, 0, IPV6_TLV_PADN, 0 };</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct sock *sk = net-&gt;ipv6.igmp_sk;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct mld2_report *pmr;</div><div class='del'>-	struct in6_addr addr_buf;</div><div class='del'>-	const struct in6_addr *saddr;</div><div class='ctx'> 	int hlen = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	int tlen = dev-&gt;needed_tailroom;</div><div class='del'>-	unsigned int size = mtu + hlen + tlen;</div><div class='del'>-	int err;</div><div class='del'>-	u8 ra[8] = { IPPROTO_ICMPV6, 0,</div><div class='del'>-		     IPV6_TLV_ROUTERALERT, 2, 0, 0,</div><div class='del'>-		     IPV6_TLV_PADN, 0 };</div><div class='del'>-</div><div class='del'>-	/* we assume size &gt; sizeof(ra) here */</div><div class='del'>-	/* limit our allocations to order-0 page */</div><div class='del'>-	size = min_t(int, size, SKB_MAX_ORDER(0, 0));</div><div class='del'>-	skb = sock_alloc_send_skb(sk, size, 1, &amp;err);</div><div class='add'>+	const struct in6_addr *saddr;</div><div class='add'>+	struct in6_addr addr_buf;</div><div class='add'>+	struct mld2_report *pmr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='add'>+	/* we assume size &gt; sizeof(ra) here</div><div class='add'>+	 * Also try to not allocate high-order pages for big MTU</div><div class='add'>+	 */</div><div class='add'>+	size = min_t(int, mtu, PAGE_SIZE / 2) + hlen + tlen;</div><div class='add'>+	skb = alloc_skb(size, GFP_KERNEL);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1616,7 +1780,13 @@ static struct sk_buff *mld_newpack(struct inet6_dev *idev, unsigned int mtu)</div><div class='ctx'> 	skb_reserve(skb, hlen);</div><div class='ctx'> 	skb_tailroom_reserve(skb, mtu, tlen);</div><div class='ctx'> </div><div class='del'>-	if (__ipv6_get_lladdr(idev, &amp;addr_buf, IFA_F_TENTATIVE)) {</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	net = dev_net_rcu(dev);</div><div class='add'>+	sk = net-&gt;ipv6.igmp_sk;</div><div class='add'>+	skb_set_owner_w(skb, sk);</div><div class='add'>+</div><div class='add'>+	if (ipv6_get_lladdr(dev, &amp;addr_buf, IFA_F_TENTATIVE)) {</div><div class='ctx'> 		/* &lt;draft-ietf-magma-mld-source-05.txt&gt;:</div><div class='ctx'> 		 * use unspecified address as the source address</div><div class='ctx'> 		 * when a valid link-local address is not available.</div><div class='hunk'>@@ -1627,6 +1797,8 @@ static struct sk_buff *mld_newpack(struct inet6_dev *idev, unsigned int mtu)</div><div class='ctx'> </div><div class='ctx'> 	ip6_mc_hdr(sk, skb, dev, saddr, &amp;mld2_all_mcr, NEXTHDR_HOP, 0);</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	skb_put_data(skb, ra, sizeof(ra));</div><div class='ctx'> </div><div class='ctx'> 	skb_set_transport_header(skb, skb_tail_pointer(skb) - skb-&gt;data);</div><div class='hunk'>@@ -1654,7 +1826,7 @@ static void mld_sendpack(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='del'>-	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> </div><div class='ctx'> 	payload_len = (skb_tail_pointer(skb) - skb_network_header(skb)) -</div><div class='ctx'> 		sizeof(*pip6);</div><div class='hunk'>@@ -1729,16 +1901,20 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,</div><div class='ctx'> #define AVAILABLE(skb)	((skb) ? skb_availroom(skb) : 0)</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,</div><div class='del'>-	int type, int gdeleted, int sdeleted, int crsend)</div><div class='add'>+				int type, int gdeleted, int sdeleted,</div><div class='add'>+				int crsend)</div><div class='ctx'> {</div><div class='add'>+	struct ip6_sf_list *psf, *psf_prev, *psf_next;</div><div class='add'>+	int scount, stotal, first, isquery, truncate;</div><div class='add'>+	struct ip6_sf_list __rcu **psf_list;</div><div class='ctx'> 	struct inet6_dev *idev = pmc-&gt;idev;</div><div class='ctx'> 	struct net_device *dev = idev-&gt;dev;</div><div class='del'>-	struct mld2_report *pmr;</div><div class='ctx'> 	struct mld2_grec *pgr = NULL;</div><div class='del'>-	struct ip6_sf_list *psf, *psf_next, *psf_prev, **psf_list;</div><div class='del'>-	int scount, stotal, first, isquery, truncate;</div><div class='add'>+	struct mld2_report *pmr;</div><div class='ctx'> 	unsigned int mtu;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	if (pmc-&gt;mca_flags &amp; MAF_NOREPORT)</div><div class='ctx'> 		return skb;</div><div class='ctx'> </div><div class='hunk'>@@ -1755,7 +1931,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,</div><div class='ctx'> </div><div class='ctx'> 	psf_list = sdeleted ? &amp;pmc-&gt;mca_tomb : &amp;pmc-&gt;mca_sources;</div><div class='ctx'> </div><div class='del'>-	if (!*psf_list)</div><div class='add'>+	if (!rcu_access_pointer(*psf_list))</div><div class='ctx'> 		goto empty_source;</div><div class='ctx'> </div><div class='ctx'> 	pmr = skb ? (struct mld2_report *)skb_transport_header(skb) : NULL;</div><div class='hunk'>@@ -1771,10 +1947,12 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,</div><div class='ctx'> 	}</div><div class='ctx'> 	first = 1;</div><div class='ctx'> 	psf_prev = NULL;</div><div class='del'>-	for (psf = *psf_list; psf; psf = psf_next) {</div><div class='add'>+	for (psf = mc_dereference(*psf_list, idev);</div><div class='add'>+	     psf;</div><div class='add'>+	     psf = psf_next) {</div><div class='ctx'> 		struct in6_addr *psrc;</div><div class='ctx'> </div><div class='del'>-		psf_next = psf-&gt;sf_next;</div><div class='add'>+		psf_next = mc_dereference(psf-&gt;sf_next, idev);</div><div class='ctx'> </div><div class='ctx'> 		if (!is_in(pmc, psf, type, gdeleted, sdeleted) &amp;&amp; !crsend) {</div><div class='ctx'> 			psf_prev = psf;</div><div class='hunk'>@@ -1821,10 +1999,12 @@ decrease_sf_crcount:</div><div class='ctx'> 			psf-&gt;sf_crcount--;</div><div class='ctx'> 			if ((sdeleted || gdeleted) &amp;&amp; psf-&gt;sf_crcount == 0) {</div><div class='ctx'> 				if (psf_prev)</div><div class='del'>-					psf_prev-&gt;sf_next = psf-&gt;sf_next;</div><div class='add'>+					rcu_assign_pointer(psf_prev-&gt;sf_next,</div><div class='add'>+							   mc_dereference(psf-&gt;sf_next, idev));</div><div class='ctx'> 				else</div><div class='del'>-					*psf_list = psf-&gt;sf_next;</div><div class='del'>-				kfree(psf);</div><div class='add'>+					rcu_assign_pointer(*psf_list,</div><div class='add'>+							   mc_dereference(psf-&gt;sf_next, idev));</div><div class='add'>+				kfree_rcu(psf, rcu);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1858,51 +2038,50 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc)</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	if (!pmc) {</div><div class='del'>-		for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='add'>+		for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 			if (pmc-&gt;mca_flags &amp; MAF_NOREPORT)</div><div class='ctx'> 				continue;</div><div class='del'>-			spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 			if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE])</div><div class='ctx'> 				type = MLD2_MODE_IS_EXCLUDE;</div><div class='ctx'> 			else</div><div class='ctx'> 				type = MLD2_MODE_IS_INCLUDE;</div><div class='ctx'> 			skb = add_grec(skb, pmc, type, 0, 0, 0);</div><div class='del'>-			spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 		if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE])</div><div class='ctx'> 			type = MLD2_MODE_IS_EXCLUDE;</div><div class='ctx'> 		else</div><div class='ctx'> 			type = MLD2_MODE_IS_INCLUDE;</div><div class='ctx'> 		skb = add_grec(skb, pmc, type, 0, 0, 0);</div><div class='del'>-		spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (skb)</div><div class='ctx'> 		mld_sendpack(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * remove zero-count source records from a source filter list</div><div class='del'>- */</div><div class='del'>-static void mld_clear_zeros(struct ip6_sf_list **ppsf)</div><div class='add'>+/* remove zero-count source records from a source filter list */</div><div class='add'>+static void mld_clear_zeros(struct ip6_sf_list __rcu **ppsf, struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_sf_list *psf_prev, *psf_next, *psf;</div><div class='ctx'> </div><div class='ctx'> 	psf_prev = NULL;</div><div class='del'>-	for (psf = *ppsf; psf; psf = psf_next) {</div><div class='del'>-		psf_next = psf-&gt;sf_next;</div><div class='add'>+	for (psf = mc_dereference(*ppsf, idev);</div><div class='add'>+	     psf;</div><div class='add'>+	     psf = psf_next) {</div><div class='add'>+		psf_next = mc_dereference(psf-&gt;sf_next, idev);</div><div class='ctx'> 		if (psf-&gt;sf_crcount == 0) {</div><div class='ctx'> 			if (psf_prev)</div><div class='del'>-				psf_prev-&gt;sf_next = psf-&gt;sf_next;</div><div class='add'>+				rcu_assign_pointer(psf_prev-&gt;sf_next,</div><div class='add'>+						   mc_dereference(psf-&gt;sf_next, idev));</div><div class='ctx'> 			else</div><div class='del'>-				*ppsf = psf-&gt;sf_next;</div><div class='del'>-			kfree(psf);</div><div class='del'>-		} else</div><div class='add'>+				rcu_assign_pointer(*ppsf,</div><div class='add'>+						   mc_dereference(psf-&gt;sf_next, idev));</div><div class='add'>+			kfree_rcu(psf, rcu);</div><div class='add'>+		} else {</div><div class='ctx'> 			psf_prev = psf;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1912,13 +2091,12 @@ static void mld_send_cr(struct inet6_dev *idev)</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	int type, dtype;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	spin_lock(&amp;idev-&gt;mc_lock);</div><div class='del'>-</div><div class='ctx'> 	/* deleted MCA's */</div><div class='ctx'> 	pmc_prev = NULL;</div><div class='del'>-	for (pmc = idev-&gt;mc_tomb; pmc; pmc = pmc_next) {</div><div class='del'>-		pmc_next = pmc-&gt;next;</div><div class='add'>+	for (pmc = mc_dereference(idev-&gt;mc_tomb, idev);</div><div class='add'>+	     pmc;</div><div class='add'>+	     pmc = pmc_next) {</div><div class='add'>+		pmc_next = mc_dereference(pmc-&gt;next, idev);</div><div class='ctx'> 		if (pmc-&gt;mca_sfmode == MCAST_INCLUDE) {</div><div class='ctx'> 			type = MLD2_BLOCK_OLD_SOURCES;</div><div class='ctx'> 			dtype = MLD2_BLOCK_OLD_SOURCES;</div><div class='hunk'>@@ -1932,26 +2110,25 @@ static void mld_send_cr(struct inet6_dev *idev)</div><div class='ctx'> 			}</div><div class='ctx'> 			pmc-&gt;mca_crcount--;</div><div class='ctx'> 			if (pmc-&gt;mca_crcount == 0) {</div><div class='del'>-				mld_clear_zeros(&amp;pmc-&gt;mca_tomb);</div><div class='del'>-				mld_clear_zeros(&amp;pmc-&gt;mca_sources);</div><div class='add'>+				mld_clear_zeros(&amp;pmc-&gt;mca_tomb, idev);</div><div class='add'>+				mld_clear_zeros(&amp;pmc-&gt;mca_sources, idev);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (pmc-&gt;mca_crcount == 0 &amp;&amp; !pmc-&gt;mca_tomb &amp;&amp;</div><div class='del'>-		    !pmc-&gt;mca_sources) {</div><div class='add'>+		if (pmc-&gt;mca_crcount == 0 &amp;&amp;</div><div class='add'>+		    !rcu_access_pointer(pmc-&gt;mca_tomb) &amp;&amp;</div><div class='add'>+		    !rcu_access_pointer(pmc-&gt;mca_sources)) {</div><div class='ctx'> 			if (pmc_prev)</div><div class='del'>-				pmc_prev-&gt;next = pmc_next;</div><div class='add'>+				rcu_assign_pointer(pmc_prev-&gt;next, pmc_next);</div><div class='ctx'> 			else</div><div class='del'>-				idev-&gt;mc_tomb = pmc_next;</div><div class='add'>+				rcu_assign_pointer(idev-&gt;mc_tomb, pmc_next);</div><div class='ctx'> 			in6_dev_put(pmc-&gt;idev);</div><div class='del'>-			kfree(pmc);</div><div class='add'>+			kfree_rcu(pmc, rcu);</div><div class='ctx'> 		} else</div><div class='ctx'> 			pmc_prev = pmc;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* change recs */</div><div class='del'>-	for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='del'>-		spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='add'>+	for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 		if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE]) {</div><div class='ctx'> 			type = MLD2_BLOCK_OLD_SOURCES;</div><div class='ctx'> 			dtype = MLD2_ALLOW_NEW_SOURCES;</div><div class='hunk'>@@ -1971,9 +2148,7 @@ static void mld_send_cr(struct inet6_dev *idev)</div><div class='ctx'> 			skb = add_grec(skb, pmc, type, 0, 0, 0);</div><div class='ctx'> 			pmc-&gt;mca_crcount--;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	(void) mld_sendpack(skb);</div><div class='hunk'>@@ -1981,21 +2156,21 @@ static void mld_send_cr(struct inet6_dev *idev)</div><div class='ctx'> </div><div class='ctx'> static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct sock *sk = net-&gt;ipv6.igmp_sk;</div><div class='add'>+	const struct in6_addr *snd_addr, *saddr;</div><div class='add'>+	int err, len, payload_len, full_len;</div><div class='add'>+	struct in6_addr addr_buf;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct mld_msg *hdr;</div><div class='del'>-	const struct in6_addr *snd_addr, *saddr;</div><div class='del'>-	struct in6_addr addr_buf;</div><div class='ctx'> 	int hlen = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	int tlen = dev-&gt;needed_tailroom;</div><div class='del'>-	int err, len, payload_len, full_len;</div><div class='ctx'> 	u8 ra[8] = { IPPROTO_ICMPV6, 0,</div><div class='ctx'> 		     IPV6_TLV_ROUTERALERT, 2, 0, 0,</div><div class='ctx'> 		     IPV6_TLV_PADN, 0 };</div><div class='del'>-	struct flowi6 fl6;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	struct flowi6 fl6;</div><div class='add'>+	struct net *net;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMPV6_MGM_REDUCTION)</div><div class='ctx'> 		snd_addr = &amp;in6addr_linklocal_allrouters;</div><div class='hunk'>@@ -2006,20 +2181,21 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)</div><div class='ctx'> 	payload_len = len + sizeof(ra);</div><div class='ctx'> 	full_len = sizeof(struct ipv6hdr) + payload_len;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	IP6_UPD_PO_STATS(net, __in6_dev_get(dev),</div><div class='del'>-		      IPSTATS_MIB_OUT, full_len);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	skb = alloc_skb(hlen + tlen + full_len, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	skb = sock_alloc_send_skb(sk, hlen + tlen + full_len, 1, &amp;err);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='add'>+	net = dev_net_rcu(dev);</div><div class='add'>+	idev = __in6_dev_get(dev);</div><div class='add'>+	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		IP6_INC_STATS(net, __in6_dev_get(dev),</div><div class='del'>-			      IPSTATS_MIB_OUTDISCARDS);</div><div class='add'>+		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	sk = net-&gt;ipv6.igmp_sk;</div><div class='add'>+	skb_set_owner_w(skb, sk);</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='ctx'> 	skb_reserve(skb, hlen);</div><div class='ctx'> </div><div class='hunk'>@@ -2044,9 +2220,6 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)</div><div class='ctx'> 					 IPPROTO_ICMPV6,</div><div class='ctx'> 					 csum_partial(hdr, len, 0));</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = __in6_dev_get(skb-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	icmpv6_flow_init(sk, &amp;fl6, type,</div><div class='ctx'> 			 &amp;ipv6_hdr(skb)-&gt;saddr, &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='ctx'> 			 skb-&gt;dev-&gt;ifindex);</div><div class='hunk'>@@ -2077,63 +2250,68 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static void mld_send_initial_cr(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	struct ifmcaddr6 *pmc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	if (mld_in_v1_mode(idev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = NULL;</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='del'>-		spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='add'>+	for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 		if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE])</div><div class='ctx'> 			type = MLD2_CHANGE_TO_EXCLUDE;</div><div class='ctx'> 		else</div><div class='ctx'> 			type = MLD2_ALLOW_NEW_SOURCES;</div><div class='ctx'> 		skb = add_grec(skb, pmc, type, 0, 0, 1);</div><div class='del'>-		spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	if (skb)</div><div class='ctx'> 		mld_sendpack(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipv6_mc_dad_complete(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	idev-&gt;mc_dad_count = idev-&gt;mc_qrv;</div><div class='ctx'> 	if (idev-&gt;mc_dad_count) {</div><div class='ctx'> 		mld_send_initial_cr(idev);</div><div class='ctx'> 		idev-&gt;mc_dad_count--;</div><div class='ctx'> 		if (idev-&gt;mc_dad_count)</div><div class='del'>-			mld_dad_start_timer(idev,</div><div class='del'>-					    unsolicited_report_interval(idev));</div><div class='add'>+			mld_dad_start_work(idev,</div><div class='add'>+					   unsolicited_report_interval(idev));</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_dad_timer_expire(struct timer_list *t)</div><div class='add'>+static void mld_dad_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = from_timer(idev, t, mc_dad_timer);</div><div class='del'>-</div><div class='add'>+	struct inet6_dev *idev = container_of(to_delayed_work(work),</div><div class='add'>+					      struct inet6_dev,</div><div class='add'>+					      mc_dad_work);</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	mld_send_initial_cr(idev);</div><div class='ctx'> 	if (idev-&gt;mc_dad_count) {</div><div class='ctx'> 		idev-&gt;mc_dad_count--;</div><div class='ctx'> 		if (idev-&gt;mc_dad_count)</div><div class='del'>-			mld_dad_start_timer(idev,</div><div class='del'>-					    unsolicited_report_interval(idev));</div><div class='add'>+			mld_dad_start_work(idev,</div><div class='add'>+					   unsolicited_report_interval(idev));</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode,</div><div class='del'>-	const struct in6_addr *psfsrc)</div><div class='add'>+			   const struct in6_addr *psfsrc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_sf_list *psf, *psf_prev;</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	psf_prev = NULL;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;psf-&gt;sf_addr, psfsrc))</div><div class='ctx'> 			break;</div><div class='ctx'> 		psf_prev = psf;</div><div class='hunk'>@@ -2142,23 +2320,28 @@ static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode,</div><div class='ctx'> 		/* source filter not found, or count wrong =&gt;  bug */</div><div class='ctx'> 		return -ESRCH;</div><div class='ctx'> 	}</div><div class='del'>-	psf-&gt;sf_count[sfmode]--;</div><div class='add'>+	WRITE_ONCE(psf-&gt;sf_count[sfmode], psf-&gt;sf_count[sfmode] - 1);</div><div class='ctx'> 	if (!psf-&gt;sf_count[MCAST_INCLUDE] &amp;&amp; !psf-&gt;sf_count[MCAST_EXCLUDE]) {</div><div class='ctx'> 		struct inet6_dev *idev = pmc-&gt;idev;</div><div class='ctx'> </div><div class='ctx'> 		/* no more filters for this source */</div><div class='ctx'> 		if (psf_prev)</div><div class='del'>-			psf_prev-&gt;sf_next = psf-&gt;sf_next;</div><div class='add'>+			rcu_assign_pointer(psf_prev-&gt;sf_next,</div><div class='add'>+					   mc_dereference(psf-&gt;sf_next, idev));</div><div class='ctx'> 		else</div><div class='del'>-			pmc-&gt;mca_sources = psf-&gt;sf_next;</div><div class='add'>+			rcu_assign_pointer(pmc-&gt;mca_sources,</div><div class='add'>+					   mc_dereference(psf-&gt;sf_next, idev));</div><div class='add'>+</div><div class='ctx'> 		if (psf-&gt;sf_oldin &amp;&amp; !(pmc-&gt;mca_flags &amp; MAF_NOREPORT) &amp;&amp;</div><div class='ctx'> 		    !mld_in_v1_mode(idev)) {</div><div class='ctx'> 			psf-&gt;sf_crcount = idev-&gt;mc_qrv;</div><div class='del'>-			psf-&gt;sf_next = pmc-&gt;mca_tomb;</div><div class='del'>-			pmc-&gt;mca_tomb = psf;</div><div class='add'>+			rcu_assign_pointer(psf-&gt;sf_next,</div><div class='add'>+					   mc_dereference(pmc-&gt;mca_tomb, idev));</div><div class='add'>+			rcu_assign_pointer(pmc-&gt;mca_tomb, psf);</div><div class='ctx'> 			rv = 1;</div><div class='del'>-		} else</div><div class='del'>-			kfree(psf);</div><div class='add'>+		} else {</div><div class='add'>+			kfree_rcu(psf, rcu);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='hunk'>@@ -2173,24 +2356,21 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> </div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='add'>+</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='add'>+	for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 		if (ipv6_addr_equal(pmca, &amp;pmc-&gt;mca_addr))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (!pmc) {</div><div class='del'>-		/* MCA not found?? bug */</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	if (!pmc)</div><div class='ctx'> 		return -ESRCH;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='add'>+</div><div class='ctx'> 	sf_markstate(pmc);</div><div class='ctx'> 	if (!delta) {</div><div class='del'>-		if (!pmc-&gt;mca_sfcount[sfmode]) {</div><div class='del'>-			spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='del'>-			read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		if (!pmc-&gt;mca_sfcount[sfmode])</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		pmc-&gt;mca_sfcount[sfmode]--;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -2210,68 +2390,75 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> 		pmc-&gt;mca_sfmode = MCAST_INCLUDE;</div><div class='ctx'> 		pmc-&gt;mca_crcount = idev-&gt;mc_qrv;</div><div class='ctx'> 		idev-&gt;mc_ifc_count = pmc-&gt;mca_crcount;</div><div class='del'>-		for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next)</div><div class='add'>+		for_each_psf_mclock(pmc, psf)</div><div class='ctx'> 			psf-&gt;sf_crcount = 0;</div><div class='ctx'> 		mld_ifc_event(pmc-&gt;idev);</div><div class='del'>-	} else if (sf_setstate(pmc) || changerec)</div><div class='add'>+	} else if (sf_setstate(pmc) || changerec) {</div><div class='ctx'> 		mld_ifc_event(pmc-&gt;idev);</div><div class='del'>-	spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add multicast single-source filter to the interface list</div><div class='del'>- */</div><div class='add'>+/* Add multicast single-source filter to the interface list */</div><div class='ctx'> static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode,</div><div class='del'>-	const struct in6_addr *psfsrc)</div><div class='add'>+			   const struct in6_addr *psfsrc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_sf_list *psf, *psf_prev;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	psf_prev = NULL;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (ipv6_addr_equal(&amp;psf-&gt;sf_addr, psfsrc))</div><div class='ctx'> 			break;</div><div class='ctx'> 		psf_prev = psf;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!psf) {</div><div class='del'>-		psf = kzalloc(sizeof(*psf), GFP_ATOMIC);</div><div class='add'>+		psf = kzalloc(sizeof(*psf), GFP_KERNEL);</div><div class='ctx'> 		if (!psf)</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 		psf-&gt;sf_addr = *psfsrc;</div><div class='ctx'> 		if (psf_prev) {</div><div class='del'>-			psf_prev-&gt;sf_next = psf;</div><div class='del'>-		} else</div><div class='del'>-			pmc-&gt;mca_sources = psf;</div><div class='add'>+			rcu_assign_pointer(psf_prev-&gt;sf_next, psf);</div><div class='add'>+		} else {</div><div class='add'>+			rcu_assign_pointer(pmc-&gt;mca_sources, psf);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	psf-&gt;sf_count[sfmode]++;</div><div class='add'>+	WRITE_ONCE(psf-&gt;sf_count[sfmode], psf-&gt;sf_count[sfmode] + 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sf_markstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> {</div><div class='del'>-	struct ip6_sf_list *psf;</div><div class='ctx'> 	int mca_xcount = pmc-&gt;mca_sfcount[MCAST_EXCLUDE];</div><div class='add'>+	struct ip6_sf_list *psf;</div><div class='ctx'> </div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next)</div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE]) {</div><div class='ctx'> 			psf-&gt;sf_oldin = mca_xcount ==</div><div class='ctx'> 				psf-&gt;sf_count[MCAST_EXCLUDE] &amp;&amp;</div><div class='ctx'> 				!psf-&gt;sf_count[MCAST_INCLUDE];</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='ctx'> 			psf-&gt;sf_oldin = psf-&gt;sf_count[MCAST_INCLUDE] != 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sf_setstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> {</div><div class='del'>-	struct ip6_sf_list *psf, *dpsf;</div><div class='ctx'> 	int mca_xcount = pmc-&gt;mca_sfcount[MCAST_EXCLUDE];</div><div class='add'>+	struct ip6_sf_list *psf, *dpsf;</div><div class='ctx'> 	int qrv = pmc-&gt;idev-&gt;mc_qrv;</div><div class='ctx'> 	int new_in, rv;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	rv = 0;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next) {</div><div class='add'>+	for_each_psf_mclock(pmc, psf) {</div><div class='ctx'> 		if (pmc-&gt;mca_sfcount[MCAST_EXCLUDE]) {</div><div class='ctx'> 			new_in = mca_xcount == psf-&gt;sf_count[MCAST_EXCLUDE] &amp;&amp;</div><div class='ctx'> 				!psf-&gt;sf_count[MCAST_INCLUDE];</div><div class='hunk'>@@ -2281,8 +2468,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> 			if (!psf-&gt;sf_oldin) {</div><div class='ctx'> 				struct ip6_sf_list *prev = NULL;</div><div class='ctx'> </div><div class='del'>-				for (dpsf = pmc-&gt;mca_tomb; dpsf;</div><div class='del'>-				     dpsf = dpsf-&gt;sf_next) {</div><div class='add'>+				for_each_psf_tomb(pmc, dpsf) {</div><div class='ctx'> 					if (ipv6_addr_equal(&amp;dpsf-&gt;sf_addr,</div><div class='ctx'> 					    &amp;psf-&gt;sf_addr))</div><div class='ctx'> 						break;</div><div class='hunk'>@@ -2290,10 +2476,14 @@ static int sf_setstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> 				}</div><div class='ctx'> 				if (dpsf) {</div><div class='ctx'> 					if (prev)</div><div class='del'>-						prev-&gt;sf_next = dpsf-&gt;sf_next;</div><div class='add'>+						rcu_assign_pointer(prev-&gt;sf_next,</div><div class='add'>+								   mc_dereference(dpsf-&gt;sf_next,</div><div class='add'>+										  pmc-&gt;idev));</div><div class='ctx'> 					else</div><div class='del'>-						pmc-&gt;mca_tomb = dpsf-&gt;sf_next;</div><div class='del'>-					kfree(dpsf);</div><div class='add'>+						rcu_assign_pointer(pmc-&gt;mca_tomb,</div><div class='add'>+								   mc_dereference(dpsf-&gt;sf_next,</div><div class='add'>+										  pmc-&gt;idev));</div><div class='add'>+					kfree_rcu(dpsf, rcu);</div><div class='ctx'> 				}</div><div class='ctx'> 				psf-&gt;sf_crcount = qrv;</div><div class='ctx'> 				rv++;</div><div class='hunk'>@@ -2304,18 +2494,19 @@ static int sf_setstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> 			 * add or update "delete" records if an active filter</div><div class='ctx'> 			 * is now inactive</div><div class='ctx'> 			 */</div><div class='del'>-			for (dpsf = pmc-&gt;mca_tomb; dpsf; dpsf = dpsf-&gt;sf_next)</div><div class='add'>+</div><div class='add'>+			for_each_psf_tomb(pmc, dpsf)</div><div class='ctx'> 				if (ipv6_addr_equal(&amp;dpsf-&gt;sf_addr,</div><div class='ctx'> 				    &amp;psf-&gt;sf_addr))</div><div class='ctx'> 					break;</div><div class='ctx'> 			if (!dpsf) {</div><div class='del'>-				dpsf = kmalloc(sizeof(*dpsf), GFP_ATOMIC);</div><div class='add'>+				dpsf = kmalloc(sizeof(*dpsf), GFP_KERNEL);</div><div class='ctx'> 				if (!dpsf)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				*dpsf = *psf;</div><div class='del'>-				/* pmc-&gt;mca_lock held by callers */</div><div class='del'>-				dpsf-&gt;sf_next = pmc-&gt;mca_tomb;</div><div class='del'>-				pmc-&gt;mca_tomb = dpsf;</div><div class='add'>+				rcu_assign_pointer(dpsf-&gt;sf_next,</div><div class='add'>+						   mc_dereference(pmc-&gt;mca_tomb, pmc-&gt;idev));</div><div class='add'>+				rcu_assign_pointer(pmc-&gt;mca_tomb, dpsf);</div><div class='ctx'> 			}</div><div class='ctx'> 			dpsf-&gt;sf_crcount = qrv;</div><div class='ctx'> 			rv++;</div><div class='hunk'>@@ -2324,9 +2515,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add multicast source filter list to the interface list</div><div class='del'>- */</div><div class='add'>+/* Add multicast source filter list to the interface list */</div><div class='ctx'> static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> 			  int sfmode, int sfcount, const struct in6_addr *psfsrc,</div><div class='ctx'> 			  int delta)</div><div class='hunk'>@@ -2337,22 +2526,21 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> </div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next) {</div><div class='add'>+</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='add'>+	for_each_mc_mclock(idev, pmc) {</div><div class='ctx'> 		if (ipv6_addr_equal(pmca, &amp;pmc-&gt;mca_addr))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (!pmc) {</div><div class='del'>-		/* MCA not found?? bug */</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	if (!pmc)</div><div class='ctx'> 		return -ESRCH;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_bh(&amp;pmc-&gt;mca_lock);</div><div class='ctx'> </div><div class='ctx'> 	sf_markstate(pmc);</div><div class='ctx'> 	isexclude = pmc-&gt;mca_sfmode == MCAST_EXCLUDE;</div><div class='ctx'> 	if (!delta)</div><div class='del'>-		pmc-&gt;mca_sfcount[sfmode]++;</div><div class='add'>+		WRITE_ONCE(pmc-&gt;mca_sfcount[sfmode],</div><div class='add'>+			   pmc-&gt;mca_sfcount[sfmode] + 1);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	for (i = 0; i &lt; sfcount; i++) {</div><div class='ctx'> 		err = ip6_mc_add1_src(pmc, sfmode, &amp;psfsrc[i]);</div><div class='hunk'>@@ -2363,7 +2551,8 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='ctx'> 		if (!delta)</div><div class='del'>-			pmc-&gt;mca_sfcount[sfmode]--;</div><div class='add'>+			WRITE_ONCE(pmc-&gt;mca_sfcount[sfmode],</div><div class='add'>+				   pmc-&gt;mca_sfcount[sfmode] - 1);</div><div class='ctx'> 		for (j = 0; j &lt; i; j++)</div><div class='ctx'> 			ip6_mc_del1_src(pmc, sfmode, &amp;psfsrc[j]);</div><div class='ctx'> 	} else if (isexclude != (pmc-&gt;mca_sfcount[MCAST_EXCLUDE] != 0)) {</div><div class='hunk'>@@ -2378,13 +2567,12 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,</div><div class='ctx'> </div><div class='ctx'> 		pmc-&gt;mca_crcount = idev-&gt;mc_qrv;</div><div class='ctx'> 		idev-&gt;mc_ifc_count = pmc-&gt;mca_crcount;</div><div class='del'>-		for (psf = pmc-&gt;mca_sources; psf; psf = psf-&gt;sf_next)</div><div class='add'>+		for_each_psf_mclock(pmc, psf)</div><div class='ctx'> 			psf-&gt;sf_crcount = 0;</div><div class='ctx'> 		mld_ifc_event(idev);</div><div class='del'>-	} else if (sf_setstate(pmc))</div><div class='add'>+	} else if (sf_setstate(pmc)) {</div><div class='ctx'> 		mld_ifc_event(idev);</div><div class='del'>-	spin_unlock_bh(&amp;pmc-&gt;mca_lock);</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2392,120 +2580,153 @@ static void ip6_mc_clear_src(struct ifmcaddr6 *pmc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6_sf_list *psf, *nextpsf;</div><div class='ctx'> </div><div class='del'>-	for (psf = pmc-&gt;mca_tomb; psf; psf = nextpsf) {</div><div class='del'>-		nextpsf = psf-&gt;sf_next;</div><div class='del'>-		kfree(psf);</div><div class='add'>+	mc_assert_locked(pmc-&gt;idev);</div><div class='add'>+</div><div class='add'>+	for (psf = mc_dereference(pmc-&gt;mca_tomb, pmc-&gt;idev);</div><div class='add'>+	     psf;</div><div class='add'>+	     psf = nextpsf) {</div><div class='add'>+		nextpsf = mc_dereference(psf-&gt;sf_next, pmc-&gt;idev);</div><div class='add'>+		kfree_rcu(psf, rcu);</div><div class='ctx'> 	}</div><div class='del'>-	pmc-&gt;mca_tomb = NULL;</div><div class='del'>-	for (psf = pmc-&gt;mca_sources; psf; psf = nextpsf) {</div><div class='del'>-		nextpsf = psf-&gt;sf_next;</div><div class='del'>-		kfree(psf);</div><div class='add'>+	RCU_INIT_POINTER(pmc-&gt;mca_tomb, NULL);</div><div class='add'>+	for (psf = mc_dereference(pmc-&gt;mca_sources, pmc-&gt;idev);</div><div class='add'>+	     psf;</div><div class='add'>+	     psf = nextpsf) {</div><div class='add'>+		nextpsf = mc_dereference(psf-&gt;sf_next, pmc-&gt;idev);</div><div class='add'>+		kfree_rcu(psf, rcu);</div><div class='ctx'> 	}</div><div class='del'>-	pmc-&gt;mca_sources = NULL;</div><div class='add'>+	RCU_INIT_POINTER(pmc-&gt;mca_sources, NULL);</div><div class='ctx'> 	pmc-&gt;mca_sfmode = MCAST_EXCLUDE;</div><div class='ctx'> 	pmc-&gt;mca_sfcount[MCAST_INCLUDE] = 0;</div><div class='del'>-	pmc-&gt;mca_sfcount[MCAST_EXCLUDE] = 1;</div><div class='add'>+	/* Paired with the READ_ONCE() from ipv6_chk_mcast_addr() */</div><div class='add'>+	WRITE_ONCE(pmc-&gt;mca_sfcount[MCAST_EXCLUDE], 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void igmp6_join_group(struct ifmcaddr6 *ma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay;</div><div class='ctx'> </div><div class='add'>+	mc_assert_locked(ma-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	if (ma-&gt;mca_flags &amp; MAF_NOREPORT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	igmp6_send(&amp;ma-&gt;mca_addr, ma-&gt;idev-&gt;dev, ICMPV6_MGM_REPORT);</div><div class='ctx'> </div><div class='del'>-	delay = prandom_u32() % unsolicited_report_interval(ma-&gt;idev);</div><div class='add'>+	delay = get_random_u32_below(unsolicited_report_interval(ma-&gt;idev));</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ma-&gt;mca_lock);</div><div class='del'>-	if (del_timer(&amp;ma-&gt;mca_timer)) {</div><div class='add'>+	if (cancel_delayed_work(&amp;ma-&gt;mca_work)) {</div><div class='ctx'> 		refcount_dec(&amp;ma-&gt;mca_refcnt);</div><div class='del'>-		delay = ma-&gt;mca_timer.expires - jiffies;</div><div class='add'>+		delay = ma-&gt;mca_work.timer.expires - jiffies;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!mod_timer(&amp;ma-&gt;mca_timer, jiffies + delay))</div><div class='add'>+	if (!mod_delayed_work(mld_wq, &amp;ma-&gt;mca_work, delay))</div><div class='ctx'> 		refcount_inc(&amp;ma-&gt;mca_refcnt);</div><div class='ctx'> 	ma-&gt;mca_flags |= MAF_TIMER_RUNNING | MAF_LAST_REPORTER;</div><div class='del'>-	spin_unlock_bh(&amp;ma-&gt;mca_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml,</div><div class='ctx'> 			    struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	struct ip6_sf_socklist *psl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* callers have the socket lock and rtnl lock</div><div class='del'>-	 * so no other readers or writers of iml or its sflist</div><div class='del'>-	 */</div><div class='del'>-	if (!iml-&gt;sflist) {</div><div class='add'>+	psl = sock_dereference(iml-&gt;sflist, sk);</div><div class='add'>+</div><div class='add'>+	if (idev)</div><div class='add'>+		mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	if (!psl) {</div><div class='ctx'> 		/* any-source empty exclude case */</div><div class='del'>-		return ip6_mc_del_src(idev, &amp;iml-&gt;addr, iml-&gt;sfmode, 0, NULL, 0);</div><div class='add'>+		err = ip6_mc_del_src(idev, &amp;iml-&gt;addr, iml-&gt;sfmode, 0, NULL, 0);</div><div class='add'>+	} else {</div><div class='add'>+		err = ip6_mc_del_src(idev, &amp;iml-&gt;addr, iml-&gt;sfmode,</div><div class='add'>+				     psl-&gt;sl_count, psl-&gt;sl_addr, 0);</div><div class='add'>+		RCU_INIT_POINTER(iml-&gt;sflist, NULL);</div><div class='add'>+		atomic_sub(struct_size(psl, sl_addr, psl-&gt;sl_max),</div><div class='add'>+			   &amp;sk-&gt;sk_omem_alloc);</div><div class='add'>+		kfree_rcu(psl, rcu);</div><div class='ctx'> 	}</div><div class='del'>-	err = ip6_mc_del_src(idev, &amp;iml-&gt;addr, iml-&gt;sfmode,</div><div class='del'>-		iml-&gt;sflist-&gt;sl_count, iml-&gt;sflist-&gt;sl_addr, 0);</div><div class='del'>-	sock_kfree_s(sk, iml-&gt;sflist, IP6_SFLSIZE(iml-&gt;sflist-&gt;sl_max));</div><div class='del'>-	iml-&gt;sflist = NULL;</div><div class='add'>+</div><div class='add'>+	if (idev)</div><div class='add'>+		mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void igmp6_leave_group(struct ifmcaddr6 *ma)</div><div class='ctx'> {</div><div class='add'>+	mc_assert_locked(ma-&gt;idev);</div><div class='add'>+</div><div class='ctx'> 	if (mld_in_v1_mode(ma-&gt;idev)) {</div><div class='del'>-		if (ma-&gt;mca_flags &amp; MAF_LAST_REPORTER)</div><div class='add'>+		if (ma-&gt;mca_flags &amp; MAF_LAST_REPORTER) {</div><div class='ctx'> 			igmp6_send(&amp;ma-&gt;mca_addr, ma-&gt;idev-&gt;dev,</div><div class='ctx'> 				ICMPV6_MGM_REDUCTION);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mld_add_delrec(ma-&gt;idev, ma);</div><div class='ctx'> 		mld_ifc_event(ma-&gt;idev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_gq_timer_expire(struct timer_list *t)</div><div class='add'>+static void mld_gq_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = from_timer(idev, t, mc_gq_timer);</div><div class='add'>+	struct inet6_dev *idev = container_of(to_delayed_work(work),</div><div class='add'>+					      struct inet6_dev,</div><div class='add'>+					      mc_gq_work);</div><div class='ctx'> </div><div class='del'>-	idev-&gt;mc_gq_running = 0;</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	mld_send_report(idev, NULL);</div><div class='add'>+	idev-&gt;mc_gq_running = 0;</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='ctx'> 	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mld_ifc_timer_expire(struct timer_list *t)</div><div class='add'>+static void mld_ifc_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev = from_timer(idev, t, mc_ifc_timer);</div><div class='add'>+	struct inet6_dev *idev = container_of(to_delayed_work(work),</div><div class='add'>+					      struct inet6_dev,</div><div class='add'>+					      mc_ifc_work);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	mld_send_cr(idev);</div><div class='add'>+</div><div class='ctx'> 	if (idev-&gt;mc_ifc_count) {</div><div class='ctx'> 		idev-&gt;mc_ifc_count--;</div><div class='ctx'> 		if (idev-&gt;mc_ifc_count)</div><div class='del'>-			mld_ifc_start_timer(idev,</div><div class='del'>-					    unsolicited_report_interval(idev));</div><div class='add'>+			mld_ifc_start_work(idev,</div><div class='add'>+					   unsolicited_report_interval(idev));</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mld_ifc_event(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='add'>+	mc_assert_locked(idev);</div><div class='add'>+</div><div class='ctx'> 	if (mld_in_v1_mode(idev))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	idev-&gt;mc_ifc_count = idev-&gt;mc_qrv;</div><div class='del'>-	mld_ifc_start_timer(idev, 1);</div><div class='add'>+	mld_ifc_start_work(idev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igmp6_timer_handler(struct timer_list *t)</div><div class='add'>+static void mld_mca_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct ifmcaddr6 *ma = from_timer(ma, t, mca_timer);</div><div class='add'>+	struct ifmcaddr6 *ma = container_of(to_delayed_work(work),</div><div class='add'>+					    struct ifmcaddr6, mca_work);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ma-&gt;idev-&gt;mc_lock);</div><div class='ctx'> 	if (mld_in_v1_mode(ma-&gt;idev))</div><div class='ctx'> 		igmp6_send(&amp;ma-&gt;mca_addr, ma-&gt;idev-&gt;dev, ICMPV6_MGM_REPORT);</div><div class='ctx'> 	else</div><div class='ctx'> 		mld_send_report(ma-&gt;idev, ma);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ma-&gt;mca_lock);</div><div class='ctx'> 	ma-&gt;mca_flags |=  MAF_LAST_REPORTER;</div><div class='ctx'> 	ma-&gt;mca_flags &amp;= ~MAF_TIMER_RUNNING;</div><div class='del'>-	spin_unlock(&amp;ma-&gt;mca_lock);</div><div class='add'>+	mutex_unlock(&amp;ma-&gt;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='ctx'> 	ma_put(ma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2517,10 +2738,10 @@ void ipv6_mc_unmap(struct inet6_dev *idev)</div><div class='ctx'> </div><div class='ctx'> 	/* Install multicast list, except for all-nodes (already installed) */</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	for (i = idev-&gt;mc_list; i; i = i-&gt;next)</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	for_each_mc_mclock(idev, i)</div><div class='ctx'> 		igmp6_group_dropped(i);</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipv6_mc_remap(struct inet6_dev *idev)</div><div class='hunk'>@@ -2529,25 +2750,28 @@ void ipv6_mc_remap(struct inet6_dev *idev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Device going down */</div><div class='del'>-</div><div class='ctx'> void ipv6_mc_down(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *i;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	/* Withdraw multicast list */</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = idev-&gt;mc_list; i; i = i-&gt;next)</div><div class='add'>+	for_each_mc_mclock(idev, i)</div><div class='ctx'> 		igmp6_group_dropped(i);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> </div><div class='del'>-	/* Should stop timer after group drop. or we will</div><div class='del'>-	 * start timer again in mld_ifc_event()</div><div class='add'>+	/* Should stop work after group drop. or we will</div><div class='add'>+	 * start work again in mld_ifc_event()</div><div class='ctx'> 	 */</div><div class='del'>-	mld_ifc_stop_timer(idev);</div><div class='del'>-	mld_gq_stop_timer(idev);</div><div class='del'>-	mld_dad_stop_timer(idev);</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mld_query_stop_work(idev);</div><div class='add'>+	mld_report_stop_work(idev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	mld_ifc_stop_work(idev);</div><div class='add'>+	mld_gq_stop_work(idev);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+</div><div class='add'>+	mld_dad_stop_work(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipv6_mc_reset(struct inet6_dev *idev)</div><div class='hunk'>@@ -2567,29 +2791,33 @@ void ipv6_mc_up(struct inet6_dev *idev)</div><div class='ctx'> </div><div class='ctx'> 	/* Install multicast list, except for all-nodes (already installed) */</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	ipv6_mc_reset(idev);</div><div class='del'>-	for (i = idev-&gt;mc_list; i; i = i-&gt;next) {</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	for_each_mc_mclock(idev, i) {</div><div class='ctx'> 		mld_del_delrec(idev, i);</div><div class='ctx'> 		igmp6_group_added(i);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* IPv6 device initialization. */</div><div class='ctx'> </div><div class='ctx'> void ipv6_mc_init_dev(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='del'>-	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	idev-&gt;mc_gq_running = 0;</div><div class='del'>-	timer_setup(&amp;idev-&gt;mc_gq_timer, mld_gq_timer_expire, 0);</div><div class='del'>-	idev-&gt;mc_tomb = NULL;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;idev-&gt;mc_gq_work, mld_gq_work);</div><div class='add'>+	RCU_INIT_POINTER(idev-&gt;mc_tomb, NULL);</div><div class='ctx'> 	idev-&gt;mc_ifc_count = 0;</div><div class='del'>-	timer_setup(&amp;idev-&gt;mc_ifc_timer, mld_ifc_timer_expire, 0);</div><div class='del'>-	timer_setup(&amp;idev-&gt;mc_dad_timer, mld_dad_timer_expire, 0);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;idev-&gt;mc_ifc_work, mld_ifc_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;idev-&gt;mc_dad_work, mld_dad_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;idev-&gt;mc_query_work, mld_query_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;idev-&gt;mc_report_work, mld_report_work);</div><div class='add'>+	skb_queue_head_init(&amp;idev-&gt;mc_query_queue);</div><div class='add'>+	skb_queue_head_init(&amp;idev-&gt;mc_report_queue);</div><div class='add'>+	spin_lock_init(&amp;idev-&gt;mc_query_lock);</div><div class='add'>+	spin_lock_init(&amp;idev-&gt;mc_report_lock);</div><div class='add'>+	mutex_init(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	ipv6_mc_reset(idev);</div><div class='del'>-	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2600,9 +2828,13 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *i;</div><div class='ctx'> </div><div class='del'>-	/* Deactivate timers */</div><div class='add'>+	/* Deactivate works */</div><div class='ctx'> 	ipv6_mc_down(idev);</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	mld_clear_delrec(idev);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	mld_clear_query(idev);</div><div class='add'>+	mld_clear_report(idev);</div><div class='ctx'> </div><div class='ctx'> 	/* Delete all-nodes address. */</div><div class='ctx'> 	/* We cannot call ipv6_dev_mc_dec() directly, our caller in</div><div class='hunk'>@@ -2614,30 +2846,28 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev)</div><div class='ctx'> 	if (idev-&gt;cnf.forwarding)</div><div class='ctx'> 		__ipv6_dev_mc_dec(idev, &amp;in6addr_linklocal_allrouters);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	while ((i = idev-&gt;mc_list) != NULL) {</div><div class='del'>-		idev-&gt;mc_list = i-&gt;next;</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='add'>+	while ((i = mc_dereference(idev-&gt;mc_list, idev))) {</div><div class='add'>+		rcu_assign_pointer(idev-&gt;mc_list, mc_dereference(i-&gt;next, idev));</div><div class='ctx'> </div><div class='del'>-		write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+		ip6_mc_clear_src(i);</div><div class='ctx'> 		ma_put(i);</div><div class='del'>-		write_lock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipv6_mc_rejoin_groups(struct inet6_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifmcaddr6 *pmc;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> 	if (mld_in_v1_mode(idev)) {</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		for (pmc = idev-&gt;mc_list; pmc; pmc = pmc-&gt;next)</div><div class='add'>+		for_each_mc_mclock(idev, pmc)</div><div class='ctx'> 			igmp6_join_group(pmc);</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		mld_send_report(idev, NULL);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipv6_mc_netdev_event(struct notifier_block *this,</div><div class='hunk'>@@ -2684,13 +2914,12 @@ static inline struct ifmcaddr6 *igmp6_mc_get_first(struct seq_file *seq)</div><div class='ctx'> 		idev = __in6_dev_get(state-&gt;dev);</div><div class='ctx'> 		if (!idev)</div><div class='ctx'> 			continue;</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		im = idev-&gt;mc_list;</div><div class='add'>+</div><div class='add'>+		im = rcu_dereference(idev-&gt;mc_list);</div><div class='ctx'> 		if (im) {</div><div class='ctx'> 			state-&gt;idev = idev;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return im;</div><div class='ctx'> }</div><div class='hunk'>@@ -2699,11 +2928,8 @@ static struct ifmcaddr6 *igmp6_mc_get_next(struct seq_file *seq, struct ifmcaddr</div><div class='ctx'> {</div><div class='ctx'> 	struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);</div><div class='ctx'> </div><div class='del'>-	im = im-&gt;next;</div><div class='add'>+	im = rcu_dereference(im-&gt;next);</div><div class='ctx'> 	while (!im) {</div><div class='del'>-		if (likely(state-&gt;idev))</div><div class='del'>-			read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 		state-&gt;dev = next_net_device_rcu(state-&gt;dev);</div><div class='ctx'> 		if (!state-&gt;dev) {</div><div class='ctx'> 			state-&gt;idev = NULL;</div><div class='hunk'>@@ -2712,8 +2938,7 @@ static struct ifmcaddr6 *igmp6_mc_get_next(struct seq_file *seq, struct ifmcaddr</div><div class='ctx'> 		state-&gt;idev = __in6_dev_get(state-&gt;dev);</div><div class='ctx'> 		if (!state-&gt;idev)</div><div class='ctx'> 			continue;</div><div class='del'>-		read_lock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-		im = state-&gt;idev-&gt;mc_list;</div><div class='add'>+		im = rcu_dereference(state-&gt;idev-&gt;mc_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	return im;</div><div class='ctx'> }</div><div class='hunk'>@@ -2747,10 +2972,8 @@ static void igmp6_mc_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);</div><div class='ctx'> </div><div class='del'>-	if (likely(state-&gt;idev)) {</div><div class='del'>-		read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='add'>+	if (likely(state-&gt;idev))</div><div class='ctx'> 		state-&gt;idev = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	state-&gt;dev = NULL;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -2765,8 +2988,8 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   state-&gt;dev-&gt;ifindex, state-&gt;dev-&gt;name,</div><div class='ctx'> 		   &amp;im-&gt;mca_addr,</div><div class='ctx'> 		   im-&gt;mca_users, im-&gt;mca_flags,</div><div class='del'>-		   (im-&gt;mca_flags&amp;MAF_TIMER_RUNNING) ?</div><div class='del'>-		   jiffies_to_clock_t(im-&gt;mca_timer.expires-jiffies) : 0);</div><div class='add'>+		   (im-&gt;mca_flags &amp; MAF_TIMER_RUNNING) ?</div><div class='add'>+		   jiffies_to_clock_t(im-&gt;mca_work.timer.expires - jiffies) : 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2800,19 +3023,16 @@ static inline struct ip6_sf_list *igmp6_mcf_get_first(struct seq_file *seq)</div><div class='ctx'> 		idev = __in6_dev_get(state-&gt;dev);</div><div class='ctx'> 		if (unlikely(idev == NULL))</div><div class='ctx'> 			continue;</div><div class='del'>-		read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-		im = idev-&gt;mc_list;</div><div class='add'>+</div><div class='add'>+		im = rcu_dereference(idev-&gt;mc_list);</div><div class='ctx'> 		if (likely(im)) {</div><div class='del'>-			spin_lock_bh(&amp;im-&gt;mca_lock);</div><div class='del'>-			psf = im-&gt;mca_sources;</div><div class='add'>+			psf = rcu_dereference(im-&gt;mca_sources);</div><div class='ctx'> 			if (likely(psf)) {</div><div class='ctx'> 				state-&gt;im = im;</div><div class='ctx'> 				state-&gt;idev = idev;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_bh(&amp;im-&gt;mca_lock);</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock_bh(&amp;idev-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return psf;</div><div class='ctx'> }</div><div class='hunk'>@@ -2821,14 +3041,10 @@ static struct ip6_sf_list *igmp6_mcf_get_next(struct seq_file *seq, struct ip6_s</div><div class='ctx'> {</div><div class='ctx'> 	struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);</div><div class='ctx'> </div><div class='del'>-	psf = psf-&gt;sf_next;</div><div class='add'>+	psf = rcu_dereference(psf-&gt;sf_next);</div><div class='ctx'> 	while (!psf) {</div><div class='del'>-		spin_unlock_bh(&amp;state-&gt;im-&gt;mca_lock);</div><div class='del'>-		state-&gt;im = state-&gt;im-&gt;next;</div><div class='add'>+		state-&gt;im = rcu_dereference(state-&gt;im-&gt;next);</div><div class='ctx'> 		while (!state-&gt;im) {</div><div class='del'>-			if (likely(state-&gt;idev))</div><div class='del'>-				read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 			state-&gt;dev = next_net_device_rcu(state-&gt;dev);</div><div class='ctx'> 			if (!state-&gt;dev) {</div><div class='ctx'> 				state-&gt;idev = NULL;</div><div class='hunk'>@@ -2837,13 +3053,9 @@ static struct ip6_sf_list *igmp6_mcf_get_next(struct seq_file *seq, struct ip6_s</div><div class='ctx'> 			state-&gt;idev = __in6_dev_get(state-&gt;dev);</div><div class='ctx'> 			if (!state-&gt;idev)</div><div class='ctx'> 				continue;</div><div class='del'>-			read_lock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='del'>-			state-&gt;im = state-&gt;idev-&gt;mc_list;</div><div class='add'>+			state-&gt;im = rcu_dereference(state-&gt;idev-&gt;mc_list);</div><div class='ctx'> 		}</div><div class='del'>-		if (!state-&gt;im)</div><div class='del'>-			break;</div><div class='del'>-		spin_lock_bh(&amp;state-&gt;im-&gt;mca_lock);</div><div class='del'>-		psf = state-&gt;im-&gt;mca_sources;</div><div class='add'>+		psf = rcu_dereference(state-&gt;im-&gt;mca_sources);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return psf;</div><div class='hunk'>@@ -2880,14 +3092,12 @@ static void igmp6_mcf_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> 	__releases(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);</div><div class='del'>-	if (likely(state-&gt;im)) {</div><div class='del'>-		spin_unlock_bh(&amp;state-&gt;im-&gt;mca_lock);</div><div class='add'>+</div><div class='add'>+	if (likely(state-&gt;im))</div><div class='ctx'> 		state-&gt;im = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (likely(state-&gt;idev)) {</div><div class='del'>-		read_unlock_bh(&amp;state-&gt;idev-&gt;lock);</div><div class='add'>+	if (likely(state-&gt;idev))</div><div class='ctx'> 		state-&gt;idev = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	state-&gt;dev = NULL;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -2905,8 +3115,8 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			   state-&gt;dev-&gt;ifindex, state-&gt;dev-&gt;name,</div><div class='ctx'> 			   &amp;state-&gt;im-&gt;mca_addr,</div><div class='ctx'> 			   &amp;psf-&gt;sf_addr,</div><div class='del'>-			   psf-&gt;sf_count[MCAST_INCLUDE],</div><div class='del'>-			   psf-&gt;sf_count[MCAST_EXCLUDE]);</div><div class='add'>+			   READ_ONCE(psf-&gt;sf_count[MCAST_INCLUDE]),</div><div class='add'>+			   READ_ONCE(psf-&gt;sf_count[MCAST_EXCLUDE]));</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2968,6 +3178,7 @@ static int __net_init igmp6_net_init(struct net *net)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inet6_sk(net-&gt;ipv6.igmp_sk)-&gt;hop_limit = 1;</div><div class='add'>+	net-&gt;ipv6.igmp_sk-&gt;sk_allocation = GFP_KERNEL;</div><div class='ctx'> </div><div class='ctx'> 	err = inet_ctl_sock_create(&amp;net-&gt;ipv6.mc_autojoin_sk, PF_INET6,</div><div class='ctx'> 				   SOCK_RAW, IPPROTO_ICMPV6, net);</div><div class='hunk'>@@ -3005,7 +3216,19 @@ static struct pernet_operations igmp6_net_ops = {</div><div class='ctx'> </div><div class='ctx'> int __init igmp6_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_pernet_subsys(&amp;igmp6_net_ops);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_pernet_subsys(&amp;igmp6_net_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mld_wq = create_workqueue("mld");</div><div class='add'>+	if (!mld_wq) {</div><div class='add'>+		unregister_pernet_subsys(&amp;igmp6_net_ops);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init igmp6_late_init(void)</div><div class='hunk'>@@ -3016,6 +3239,7 @@ int __init igmp6_late_init(void)</div><div class='ctx'> void igmp6_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;igmp6_net_ops);</div><div class='add'>+	destroy_workqueue(mld_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void igmp6_late_cleanup(void)</div><div class='head'>diff --git a/net/ipv6/mcast_snoop.c b/net/ipv6/mcast_snoop.c<br/>index 9405b04eecc6..04d5fcdfa6e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/mcast_snoop.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mcast_snoop.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/mcast_snoop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/mcast_snoop.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Copyright (C) 2010: YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='ctx'>  * Copyright (C) 2015: Linus Lüssing &lt;linus.luessing@c0d3.blue&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * Based on the MLD support added to br_multicast.c by YOSHIFUJI Hideaki.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +29,8 @@ static int ipv6_mc_check_ip6hdr(struct sk_buff *skb)</div><div class='ctx'> 	if (skb-&gt;len &lt; len || len &lt;= offset)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	skb_set_transport_header(skb, offset);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -77,27 +67,27 @@ static int ipv6_mc_check_mld_reportv2(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	len += sizeof(struct mld2_report);</div><div class='ctx'> </div><div class='del'>-	return pskb_may_pull(skb, len) ? 0 : -EINVAL;</div><div class='add'>+	return ipv6_mc_may_pull(skb, len) ? 0 : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipv6_mc_check_mld_query(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	unsigned int transport_len = ipv6_transport_len(skb);</div><div class='ctx'> 	struct mld_msg *mld;</div><div class='del'>-	unsigned int len = skb_transport_offset(skb);</div><div class='add'>+	unsigned int len;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC2710+RFC3810 (MLDv1+MLDv2) require link-local source addresses */</div><div class='ctx'> 	if (!(ipv6_addr_type(&amp;ipv6_hdr(skb)-&gt;saddr) &amp; IPV6_ADDR_LINKLOCAL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	len += sizeof(struct mld_msg);</div><div class='del'>-	if (skb-&gt;len &lt; len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/* MLDv1? */</div><div class='del'>-	if (skb-&gt;len != len) {</div><div class='add'>+	if (transport_len != sizeof(struct mld_msg)) {</div><div class='ctx'> 		/* or MLDv2? */</div><div class='del'>-		len += sizeof(struct mld2_query) - sizeof(struct mld_msg);</div><div class='del'>-		if (skb-&gt;len &lt; len || !pskb_may_pull(skb, len))</div><div class='add'>+		if (transport_len &lt; sizeof(struct mld2_query))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		len = skb_transport_offset(skb) + sizeof(struct mld2_query);</div><div class='add'>+		if (!ipv6_mc_may_pull(skb, len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -115,19 +105,24 @@ static int ipv6_mc_check_mld_query(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int ipv6_mc_check_mld_msg(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mld_msg *mld = (struct mld_msg *)skb_transport_header(skb);</div><div class='add'>+	unsigned int len = skb_transport_offset(skb) + sizeof(struct mld_msg);</div><div class='add'>+	struct mld_msg *mld;</div><div class='add'>+</div><div class='add'>+	if (!ipv6_mc_may_pull(skb, len))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	mld = (struct mld_msg *)skb_transport_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	switch (mld-&gt;mld_type) {</div><div class='ctx'> 	case ICMPV6_MGM_REDUCTION:</div><div class='ctx'> 	case ICMPV6_MGM_REPORT:</div><div class='del'>-		/* fall through */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case ICMPV6_MLD2_REPORT:</div><div class='ctx'> 		return ipv6_mc_check_mld_reportv2(skb);</div><div class='ctx'> 	case ICMPV6_MGM_QUERY:</div><div class='ctx'> 		return ipv6_mc_check_mld_query(skb);</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOMSG;</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,70 +131,45 @@ static inline __sum16 ipv6_mc_validate_checksum(struct sk_buff *skb)</div><div class='ctx'> 	return skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __ipv6_mc_check_mld(struct sk_buff *skb,</div><div class='del'>-			       struct sk_buff **skb_trimmed)</div><div class='del'>-</div><div class='add'>+static int ipv6_mc_check_icmpv6(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb_chk = NULL;</div><div class='del'>-	unsigned int transport_len;</div><div class='del'>-	unsigned int len = skb_transport_offset(skb) + sizeof(struct mld_msg);</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	unsigned int len = skb_transport_offset(skb) + sizeof(struct icmp6hdr);</div><div class='add'>+	unsigned int transport_len = ipv6_transport_len(skb);</div><div class='add'>+	struct sk_buff *skb_chk;</div><div class='ctx'> </div><div class='del'>-	transport_len = ntohs(ipv6_hdr(skb)-&gt;payload_len);</div><div class='del'>-	transport_len -= skb_transport_offset(skb) - sizeof(struct ipv6hdr);</div><div class='add'>+	if (!ipv6_mc_may_pull(skb, len))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	skb_chk = skb_checksum_trimmed(skb, transport_len,</div><div class='ctx'> 				       ipv6_mc_validate_checksum);</div><div class='ctx'> 	if (!skb_chk)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb_chk, len))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = ipv6_mc_check_mld_msg(skb_chk);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (skb_trimmed)</div><div class='del'>-		*skb_trimmed = skb_chk;</div><div class='del'>-	/* free now unneeded clone */</div><div class='del'>-	else if (skb_chk != skb)</div><div class='del'>-		kfree_skb(skb_chk);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-err:</div><div class='del'>-	if (ret &amp;&amp; skb_chk &amp;&amp; skb_chk != skb)</div><div class='add'>+	if (skb_chk != skb)</div><div class='ctx'> 		kfree_skb(skb_chk);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ipv6_mc_check_mld - checks whether this is a sane MLD packet</div><div class='ctx'>  * @skb: the skb to validate</div><div class='del'>- * @skb_trimmed: to store an skb pointer trimmed to IPv6 packet tail (optional)</div><div class='ctx'>  *</div><div class='ctx'>  * Checks whether an IPv6 packet is a valid MLD packet. If so sets</div><div class='ctx'>  * skb transport header accordingly and returns zero.</div><div class='ctx'>  *</div><div class='ctx'>  * -EINVAL: A broken packet was detected, i.e. it violates some internet</div><div class='ctx'>  *  standard</div><div class='del'>- * -ENOMSG: IP header validation succeeded but it is not an MLD packet.</div><div class='add'>+ * -ENOMSG: IP header validation succeeded but it is not an ICMPv6 packet</div><div class='add'>+ *  with a hop-by-hop option.</div><div class='add'>+ * -ENODATA: IP+ICMPv6 header with hop-by-hop option validation succeeded</div><div class='add'>+ *  but it is not an MLD packet.</div><div class='ctx'>  * -ENOMEM: A memory allocation failure happened.</div><div class='ctx'>  *</div><div class='del'>- * Optionally, an skb pointer might be provided via skb_trimmed (or set it</div><div class='del'>- * to NULL): After parsing an MLD packet successfully it will point to</div><div class='del'>- * an skb which has its tail aligned to the IP packet end. This might</div><div class='del'>- * either be the originally provided skb or a trimmed, cloned version if</div><div class='del'>- * the skb frame had data beyond the IP packet. A cloned skb allows us</div><div class='del'>- * to leave the original skb and its full frame unchanged (which might be</div><div class='del'>- * desirable for layer 2 frame jugglers).</div><div class='del'>- *</div><div class='ctx'>  * Caller needs to set the skb network header and free any returned skb if it</div><div class='ctx'>  * differs from the provided skb.</div><div class='ctx'>  */</div><div class='del'>-int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed)</div><div class='add'>+int ipv6_mc_check_mld(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -211,6 +181,10 @@ int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return __ipv6_mc_check_mld(skb, skb_trimmed);</div><div class='add'>+	ret = ipv6_mc_check_icmpv6(skb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ipv6_mc_check_mld_msg(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_mc_check_mld);</div><div class='head'>diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c<br/>index 64f0f7be9e5e..6a16a5bd0d91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/mip6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/mip6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/mip6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/mip6.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2003-2006 Helsinki University of Technology</div><div class='ctx'>  * Copyright (C)2003-2006 USAGI/WIDE Project</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'>  * Authors:</div><div class='hunk'>@@ -259,63 +247,14 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mip6_destopt_offset(struct xfrm_state *x, struct sk_buff *skb,</div><div class='del'>-			       u8 **nexthdr)</div><div class='del'>-{</div><div class='del'>-	u16 offset = sizeof(struct ipv6hdr);</div><div class='del'>-	struct ipv6_opt_hdr *exthdr =</div><div class='del'>-				   (struct ipv6_opt_hdr *)(ipv6_hdr(skb) + 1);</div><div class='del'>-	const unsigned char *nh = skb_network_header(skb);</div><div class='del'>-	unsigned int packet_len = skb_tail_pointer(skb) -</div><div class='del'>-		skb_network_header(skb);</div><div class='del'>-	int found_rhdr = 0;</div><div class='del'>-</div><div class='del'>-	*nexthdr = &amp;ipv6_hdr(skb)-&gt;nexthdr;</div><div class='del'>-</div><div class='del'>-	while (offset + 1 &lt;= packet_len) {</div><div class='del'>-</div><div class='del'>-		switch (**nexthdr) {</div><div class='del'>-		case NEXTHDR_HOP:</div><div class='del'>-			break;</div><div class='del'>-		case NEXTHDR_ROUTING:</div><div class='del'>-			found_rhdr = 1;</div><div class='del'>-			break;</div><div class='del'>-		case NEXTHDR_DEST:</div><div class='del'>-			/*</div><div class='del'>-			 * HAO MUST NOT appear more than once.</div><div class='del'>-			 * XXX: It is better to try to find by the end of</div><div class='del'>-			 * XXX: packet if HAO exists.</div><div class='del'>-			 */</div><div class='del'>-			if (ipv6_find_tlv(skb, offset, IPV6_TLV_HAO) &gt;= 0) {</div><div class='del'>-				net_dbg_ratelimited("mip6: hao exists already, override\n");</div><div class='del'>-				return offset;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (found_rhdr)</div><div class='del'>-				return offset;</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return offset;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset += ipv6_optlen(exthdr);</div><div class='del'>-		*nexthdr = &amp;exthdr-&gt;nexthdr;</div><div class='del'>-		exthdr = (struct ipv6_opt_hdr *)(nh + offset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mip6_destopt_init_state(struct xfrm_state *x)</div><div class='add'>+static int mip6_destopt_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	if (x-&gt;id.spi) {</div><div class='del'>-		pr_info("%s: spi is not 0: %u\n", __func__, x-&gt;id.spi);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "SPI must be 0");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (x-&gt;props.mode != XFRM_MODE_ROUTEOPTIMIZATION) {</div><div class='del'>-		pr_info("%s: state's mode is not %u: %u\n",</div><div class='del'>-			__func__, XFRM_MODE_ROUTEOPTIMIZATION, x-&gt;props.mode);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "XFRM mode must be XFRM_MODE_ROUTEOPTIMIZATION");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -336,7 +275,6 @@ static void mip6_destopt_destroy(struct xfrm_state *x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type mip6_destopt_type = {</div><div class='del'>-	.description	= "MIP6DESTOPT",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_DSTOPTS,</div><div class='ctx'> 	.flags		= XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR,</div><div class='hunk'>@@ -345,7 +283,6 @@ static const struct xfrm_type mip6_destopt_type = {</div><div class='ctx'> 	.input		= mip6_destopt_input,</div><div class='ctx'> 	.output		= mip6_destopt_output,</div><div class='ctx'> 	.reject		= mip6_destopt_reject,</div><div class='del'>-	.hdr_offset	= mip6_destopt_offset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mip6_rthdr_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='hunk'>@@ -395,62 +332,14 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mip6_rthdr_offset(struct xfrm_state *x, struct sk_buff *skb,</div><div class='del'>-			     u8 **nexthdr)</div><div class='del'>-{</div><div class='del'>-	u16 offset = sizeof(struct ipv6hdr);</div><div class='del'>-	struct ipv6_opt_hdr *exthdr =</div><div class='del'>-				   (struct ipv6_opt_hdr *)(ipv6_hdr(skb) + 1);</div><div class='del'>-	const unsigned char *nh = skb_network_header(skb);</div><div class='del'>-	unsigned int packet_len = skb_tail_pointer(skb) -</div><div class='del'>-		skb_network_header(skb);</div><div class='del'>-	int found_rhdr = 0;</div><div class='del'>-</div><div class='del'>-	*nexthdr = &amp;ipv6_hdr(skb)-&gt;nexthdr;</div><div class='del'>-</div><div class='del'>-	while (offset + 1 &lt;= packet_len) {</div><div class='del'>-</div><div class='del'>-		switch (**nexthdr) {</div><div class='del'>-		case NEXTHDR_HOP:</div><div class='del'>-			break;</div><div class='del'>-		case NEXTHDR_ROUTING:</div><div class='del'>-			if (offset + 3 &lt;= packet_len) {</div><div class='del'>-				struct ipv6_rt_hdr *rt;</div><div class='del'>-				rt = (struct ipv6_rt_hdr *)(nh + offset);</div><div class='del'>-				if (rt-&gt;type != 0)</div><div class='del'>-					return offset;</div><div class='del'>-			}</div><div class='del'>-			found_rhdr = 1;</div><div class='del'>-			break;</div><div class='del'>-		case NEXTHDR_DEST:</div><div class='del'>-			if (ipv6_find_tlv(skb, offset, IPV6_TLV_HAO) &gt;= 0)</div><div class='del'>-				return offset;</div><div class='del'>-</div><div class='del'>-			if (found_rhdr)</div><div class='del'>-				return offset;</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return offset;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset += ipv6_optlen(exthdr);</div><div class='del'>-		*nexthdr = &amp;exthdr-&gt;nexthdr;</div><div class='del'>-		exthdr = (struct ipv6_opt_hdr *)(nh + offset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mip6_rthdr_init_state(struct xfrm_state *x)</div><div class='add'>+static int mip6_rthdr_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	if (x-&gt;id.spi) {</div><div class='del'>-		pr_info("%s: spi is not 0: %u\n", __func__, x-&gt;id.spi);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "SPI must be 0");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (x-&gt;props.mode != XFRM_MODE_ROUTEOPTIMIZATION) {</div><div class='del'>-		pr_info("%s: state's mode is not %u: %u\n",</div><div class='del'>-			__func__, XFRM_MODE_ROUTEOPTIMIZATION, x-&gt;props.mode);</div><div class='add'>+		NL_SET_ERR_MSG(extack, "XFRM mode must be XFRM_MODE_ROUTEOPTIMIZATION");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +357,6 @@ static void mip6_rthdr_destroy(struct xfrm_state *x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type mip6_rthdr_type = {</div><div class='del'>-	.description	= "MIP6RT",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_ROUTING,</div><div class='ctx'> 	.flags		= XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR,</div><div class='hunk'>@@ -476,7 +364,6 @@ static const struct xfrm_type mip6_rthdr_type = {</div><div class='ctx'> 	.destructor	= mip6_rthdr_destroy,</div><div class='ctx'> 	.input		= mip6_rthdr_input,</div><div class='ctx'> 	.output		= mip6_rthdr_output,</div><div class='del'>-	.hdr_offset	= mip6_rthdr_offset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init mip6_init(void)</div><div class='hunk'>@@ -511,15 +398,14 @@ static void __exit mip6_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (rawv6_mh_filter_unregister(mip6_mh_filter) &lt; 0)</div><div class='ctx'> 		pr_info("%s: can't remove rawv6 mh filter\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;mip6_rthdr_type, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type(rthdr)\n", __func__);</div><div class='del'>-	if (xfrm_unregister_type(&amp;mip6_destopt_type, AF_INET6) &lt; 0)</div><div class='del'>-		pr_info("%s: can't remove xfrm type(destopt)\n", __func__);</div><div class='add'>+	xfrm_unregister_type(&amp;mip6_rthdr_type, AF_INET6);</div><div class='add'>+	xfrm_unregister_type(&amp;mip6_destopt_type, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(mip6_init);</div><div class='ctx'> module_exit(mip6_fini);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("IPv6 Mobility driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_DSTOPTS);</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ROUTING);</div><div class='head'>diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c<br/>index 0ec273997d1d..59d17b6f06bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ndisc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ndisc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ndisc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ndisc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Neighbour Discovery for IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *	Mike Shaver		&lt;shaver@ingenia.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -77,12 +73,15 @@ static u32 ndisc_hash(const void *pkey,</div><div class='ctx'> 		      const struct net_device *dev,</div><div class='ctx'> 		      __u32 *hash_rnd);</div><div class='ctx'> static bool ndisc_key_eq(const struct neighbour *neigh, const void *pkey);</div><div class='add'>+static bool ndisc_allow_add(const struct net_device *dev,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='ctx'> static int ndisc_constructor(struct neighbour *neigh);</div><div class='ctx'> static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb);</div><div class='ctx'> static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb);</div><div class='ctx'> static int pndisc_constructor(struct pneigh_entry *n);</div><div class='ctx'> static void pndisc_destructor(struct pneigh_entry *n);</div><div class='ctx'> static void pndisc_redo(struct sk_buff *skb);</div><div class='add'>+static int ndisc_is_multicast(const void *pkey);</div><div class='ctx'> </div><div class='ctx'> static const struct neigh_ops ndisc_generic_ops = {</div><div class='ctx'> 	.family =		AF_INET6,</div><div class='hunk'>@@ -117,6 +116,8 @@ struct neigh_table nd_tbl = {</div><div class='ctx'> 	.pconstructor =	pndisc_constructor,</div><div class='ctx'> 	.pdestructor =	pndisc_destructor,</div><div class='ctx'> 	.proxy_redo =	pndisc_redo,</div><div class='add'>+	.is_multicast =	ndisc_is_multicast,</div><div class='add'>+	.allow_add  =   ndisc_allow_add,</div><div class='ctx'> 	.id =		"ndisc_cache",</div><div class='ctx'> 	.parms = {</div><div class='ctx'> 		.tbl			= &amp;nd_tbl,</div><div class='hunk'>@@ -127,8 +128,9 @@ struct neigh_table nd_tbl = {</div><div class='ctx'> 			[NEIGH_VAR_RETRANS_TIME] = ND_RETRANS_TIMER,</div><div class='ctx'> 			[NEIGH_VAR_BASE_REACHABLE_TIME] = ND_REACHABLE_TIME,</div><div class='ctx'> 			[NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ,</div><div class='add'>+			[NEIGH_VAR_INTERVAL_PROBE_TIME_MS] = 5 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_GC_STALETIME] = 60 * HZ,</div><div class='del'>-			[NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX,</div><div class='add'>+			[NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_DEFAULT,</div><div class='ctx'> 			[NEIGH_VAR_PROXY_QLEN] = 64,</div><div class='ctx'> 			[NEIGH_VAR_ANYCAST_DELAY] = 1 * HZ,</div><div class='ctx'> 			[NEIGH_VAR_PROXY_DELAY] = (8 * HZ) / 10,</div><div class='hunk'>@@ -141,7 +143,7 @@ struct neigh_table nd_tbl = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(nd_tbl);</div><div class='ctx'> </div><div class='del'>-void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,</div><div class='add'>+void __ndisc_fill_addr_option(struct sk_buff *skb, int type, const void *data,</div><div class='ctx'> 			      int data_len, int pad)</div><div class='ctx'> {</div><div class='ctx'> 	int space = __ndisc_opt_addr_space(data_len, pad);</div><div class='hunk'>@@ -164,7 +166,7 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,</div><div class='ctx'> EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);</div><div class='ctx'> </div><div class='ctx'> static inline void ndisc_fill_addr_option(struct sk_buff *skb, int type,</div><div class='del'>-					  void *data, u8 icmp6_type)</div><div class='add'>+					  const void *data, u8 icmp6_type)</div><div class='ctx'> {</div><div class='ctx'> 	__ndisc_fill_addr_option(skb, type, data, skb-&gt;dev-&gt;addr_len,</div><div class='ctx'> 				 ndisc_addr_option_pad(skb-&gt;dev-&gt;type));</div><div class='hunk'>@@ -195,9 +197,12 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,</div><div class='ctx'> static inline int ndisc_is_useropt(const struct net_device *dev,</div><div class='ctx'> 				   struct nd_opt_hdr *opt)</div><div class='ctx'> {</div><div class='del'>-	return opt-&gt;nd_opt_type == ND_OPT_RDNSS ||</div><div class='add'>+	return opt-&gt;nd_opt_type == ND_OPT_PREFIX_INFO ||</div><div class='add'>+		opt-&gt;nd_opt_type == ND_OPT_RDNSS ||</div><div class='ctx'> 		opt-&gt;nd_opt_type == ND_OPT_DNSSL ||</div><div class='del'>-		ndisc_ops_is_useropt(dev, opt-&gt;nd_opt_type);</div><div class='add'>+		opt-&gt;nd_opt_type == ND_OPT_6CO ||</div><div class='add'>+		opt-&gt;nd_opt_type == ND_OPT_CAPTIVE_PORTAL ||</div><div class='add'>+		opt-&gt;nd_opt_type == ND_OPT_PREF64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nd_opt_hdr *ndisc_next_useropt(const struct net_device *dev,</div><div class='hunk'>@@ -222,6 +227,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	memset(ndopts, 0, sizeof(*ndopts));</div><div class='ctx'> 	while (opt_len) {</div><div class='add'>+		bool unknown = false;</div><div class='ctx'> 		int l;</div><div class='ctx'> 		if (opt_len &lt; sizeof(struct nd_opt_hdr))</div><div class='ctx'> 			return NULL;</div><div class='hunk'>@@ -237,9 +243,8 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,</div><div class='ctx'> 		case ND_OPT_NONCE:</div><div class='ctx'> 		case ND_OPT_REDIRECT_HDR:</div><div class='ctx'> 			if (ndopts-&gt;nd_opt_array[nd_opt-&gt;nd_opt_type]) {</div><div class='del'>-				ND_PRINTK(2, warn,</div><div class='del'>-					  "%s: duplicated ND6 option found: type=%d\n",</div><div class='del'>-					  __func__, nd_opt-&gt;nd_opt_type);</div><div class='add'>+				net_dbg_ratelimited("%s: duplicated ND6 option found: type=%d\n",</div><div class='add'>+						    __func__, nd_opt-&gt;nd_opt_type);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ndopts-&gt;nd_opt_array[nd_opt-&gt;nd_opt_type] = nd_opt;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -257,22 +262,20 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,</div><div class='ctx'> 			break;</div><div class='ctx'> #endif</div><div class='ctx'> 		default:</div><div class='del'>-			if (ndisc_is_useropt(dev, nd_opt)) {</div><div class='del'>-				ndopts-&gt;nd_useropts_end = nd_opt;</div><div class='del'>-				if (!ndopts-&gt;nd_useropts)</div><div class='del'>-					ndopts-&gt;nd_useropts = nd_opt;</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * Unknown options must be silently ignored,</div><div class='del'>-				 * to accommodate future extension to the</div><div class='del'>-				 * protocol.</div><div class='del'>-				 */</div><div class='del'>-				ND_PRINTK(2, notice,</div><div class='del'>-					  "%s: ignored unsupported option; type=%d, len=%d\n",</div><div class='del'>-					  __func__,</div><div class='del'>-					  nd_opt-&gt;nd_opt_type,</div><div class='del'>-					  nd_opt-&gt;nd_opt_len);</div><div class='del'>-			}</div><div class='add'>+			unknown = true;</div><div class='add'>+		}</div><div class='add'>+		if (ndisc_is_useropt(dev, nd_opt)) {</div><div class='add'>+			ndopts-&gt;nd_useropts_end = nd_opt;</div><div class='add'>+			if (!ndopts-&gt;nd_useropts)</div><div class='add'>+				ndopts-&gt;nd_useropts = nd_opt;</div><div class='add'>+		} else if (unknown) {</div><div class='add'>+			/*</div><div class='add'>+			 * Unknown options must be silently ignored,</div><div class='add'>+			 * to accommodate future extension to the</div><div class='add'>+			 * protocol.</div><div class='add'>+			 */</div><div class='add'>+			net_dbg_ratelimited("%s: ignored unsupported option; type=%d, len=%d\n",</div><div class='add'>+					    __func__, nd_opt-&gt;nd_opt_type, nd_opt-&gt;nd_opt_len);</div><div class='ctx'> 		}</div><div class='ctx'> next_opt:</div><div class='ctx'> 		opt_len -= l;</div><div class='hunk'>@@ -370,42 +373,53 @@ static int ndisc_constructor(struct neighbour *neigh)</div><div class='ctx'> static int pndisc_constructor(struct pneigh_entry *n)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr *addr = (struct in6_addr *)&amp;n-&gt;key;</div><div class='del'>-	struct in6_addr maddr;</div><div class='ctx'> 	struct net_device *dev = n-&gt;dev;</div><div class='add'>+	struct in6_addr maddr;</div><div class='ctx'> </div><div class='del'>-	if (!dev || !__in6_dev_get(dev))</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	addrconf_addr_solict_mult(addr, &amp;maddr);</div><div class='del'>-	ipv6_dev_mc_inc(dev, &amp;maddr);</div><div class='del'>-	return 0;</div><div class='add'>+	return ipv6_dev_mc_inc(dev, &amp;maddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pndisc_destructor(struct pneigh_entry *n)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr *addr = (struct in6_addr *)&amp;n-&gt;key;</div><div class='del'>-	struct in6_addr maddr;</div><div class='ctx'> 	struct net_device *dev = n-&gt;dev;</div><div class='add'>+	struct in6_addr maddr;</div><div class='ctx'> </div><div class='del'>-	if (!dev || !__in6_dev_get(dev))</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	addrconf_addr_solict_mult(addr, &amp;maddr);</div><div class='ctx'> 	ipv6_dev_mc_dec(dev, &amp;maddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* called with rtnl held */</div><div class='add'>+static bool ndisc_allow_add(const struct net_device *dev,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='add'>+</div><div class='add'>+	if (!idev || idev-&gt;cnf.disable_ipv6) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 is disabled on this device");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,</div><div class='ctx'> 				       int len)</div><div class='ctx'> {</div><div class='ctx'> 	int hlen = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	int tlen = dev-&gt;needed_tailroom;</div><div class='del'>-	struct sock *sk = dev_net(dev)-&gt;ipv6.ndisc_sk;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(hlen + sizeof(struct ipv6hdr) + len + tlen, GFP_ATOMIC);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		ND_PRINTK(0, err, "ndisc: %s failed to allocate an skb\n",</div><div class='del'>-			  __func__);</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='hunk'>@@ -416,7 +430,9 @@ static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,</div><div class='ctx'> 	/* Manually assign socket ownership as we avoid calling</div><div class='ctx'> 	 * sock_alloc_send_pskb() to bypass wmem buffer limits</div><div class='ctx'> 	 */</div><div class='del'>-	skb_set_owner_w(skb, sk);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	skb_set_owner_w(skb, dev_net_rcu(dev)-&gt;ipv6.ndisc_sk);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -432,7 +448,7 @@ static void ip6_nd_hdr(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='del'>-	tclass = idev ? idev-&gt;cnf.ndisc_tclass : 0;</div><div class='add'>+	tclass = idev ? READ_ONCE(idev-&gt;cnf.ndisc_tclass) : 0;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, sizeof(*hdr));</div><div class='hunk'>@@ -449,20 +465,24 @@ static void ip6_nd_hdr(struct sk_buff *skb,</div><div class='ctx'> 	hdr-&gt;daddr = *daddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_send_skb(struct sk_buff *skb,</div><div class='del'>-			   const struct in6_addr *daddr,</div><div class='del'>-			   const struct in6_addr *saddr)</div><div class='add'>+void ndisc_send_skb(struct sk_buff *skb, const struct in6_addr *daddr,</div><div class='add'>+		    const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='add'>+	struct icmp6hdr *icmp6h = icmp6_hdr(skb);</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-	struct sock *sk = net-&gt;ipv6.ndisc_sk;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	struct net *net;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct icmp6hdr *icmp6h = icmp6_hdr(skb);</div><div class='ctx'> 	u8 type;</div><div class='ctx'> </div><div class='ctx'> 	type = icmp6h-&gt;icmp6_type;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	sk = net-&gt;ipv6.ndisc_sk;</div><div class='ctx'> 	if (!dst) {</div><div class='ctx'> 		struct flowi6 fl6;</div><div class='ctx'> 		int oif = skb-&gt;dev-&gt;ifindex;</div><div class='hunk'>@@ -470,6 +490,7 @@ static void ndisc_send_skb(struct sk_buff *skb,</div><div class='ctx'> 		icmpv6_flow_init(sk, &amp;fl6, type, saddr, daddr, oif);</div><div class='ctx'> 		dst = icmp6_dst_alloc(skb-&gt;dev, &amp;fl6);</div><div class='ctx'> 		if (IS_ERR(dst)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -482,14 +503,14 @@ static void ndisc_send_skb(struct sk_buff *skb,</div><div class='ctx'> 					      csum_partial(icmp6h,</div><div class='ctx'> 							   skb-&gt;len, 0));</div><div class='ctx'> </div><div class='del'>-	ip6_nd_hdr(skb, saddr, daddr, inet6_sk(sk)-&gt;hop_limit, skb-&gt;len);</div><div class='add'>+	ip6_nd_hdr(skb, saddr, daddr, READ_ONCE(inet6_sk(sk)-&gt;hop_limit), skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = __in6_dev_get(dst-&gt;dev);</div><div class='del'>-	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+	dev = dst_dev_rcu(dst);</div><div class='add'>+	idev = __in6_dev_get(dev);</div><div class='add'>+	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> </div><div class='ctx'> 	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,</div><div class='del'>-		      net, sk, skb, NULL, dst-&gt;dev,</div><div class='add'>+		      net, sk, skb, NULL, dev,</div><div class='ctx'> 		      dst_output);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		ICMP6MSGOUT_INC_STATS(net, idev, type);</div><div class='hunk'>@@ -498,6 +519,7 @@ static void ndisc_send_skb(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ndisc_send_skb);</div><div class='ctx'> </div><div class='ctx'> void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,</div><div class='ctx'> 		   const struct in6_addr *solicited_addr,</div><div class='hunk'>@@ -516,7 +538,7 @@ void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,</div><div class='ctx'> 		src_addr = solicited_addr;</div><div class='ctx'> 		if (ifp-&gt;flags &amp; IFA_F_OPTIMISTIC)</div><div class='ctx'> 			override = false;</div><div class='del'>-		inc_opt |= ifp-&gt;idev-&gt;cnf.force_tllao;</div><div class='add'>+		inc_opt |= READ_ONCE(ifp-&gt;idev-&gt;cnf.force_tllao);</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,</div><div class='hunk'>@@ -581,22 +603,16 @@ static void ndisc_send_unsol_na(struct net_device *dev)</div><div class='ctx'> 	in6_dev_put(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,</div><div class='del'>-		   const struct in6_addr *daddr, const struct in6_addr *saddr,</div><div class='del'>-		   u64 nonce)</div><div class='add'>+struct sk_buff *ndisc_ns_create(struct net_device *dev, const struct in6_addr *solicit,</div><div class='add'>+				const struct in6_addr *saddr, u64 nonce)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct in6_addr addr_buf;</div><div class='ctx'> 	int inc_opt = dev-&gt;addr_len;</div><div class='del'>-	int optlen = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	struct nd_msg *msg;</div><div class='add'>+	int optlen = 0;</div><div class='ctx'> </div><div class='del'>-	if (!saddr) {</div><div class='del'>-		if (ipv6_get_lladdr(dev, &amp;addr_buf,</div><div class='del'>-				   (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)))</div><div class='del'>-			return;</div><div class='del'>-		saddr = &amp;addr_buf;</div><div class='del'>-	}</div><div class='add'>+	if (!saddr)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_any(saddr))</div><div class='ctx'> 		inc_opt = false;</div><div class='hunk'>@@ -608,7 +624,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,</div><div class='ctx'> </div><div class='ctx'> 	skb = ndisc_alloc_skb(dev, sizeof(*msg) + optlen);</div><div class='ctx'> 	if (!skb)</div><div class='del'>-		return;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	msg = skb_put(skb, sizeof(*msg));</div><div class='ctx'> 	*msg = (struct nd_msg) {</div><div class='hunk'>@@ -630,7 +646,28 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,</div><div class='ctx'> 		memcpy(opt + 2, &amp;nonce, 6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ndisc_send_skb(skb, daddr, saddr);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ndisc_ns_create);</div><div class='add'>+</div><div class='add'>+void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,</div><div class='add'>+		   const struct in6_addr *daddr, const struct in6_addr *saddr,</div><div class='add'>+		   u64 nonce)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr addr_buf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!saddr) {</div><div class='add'>+		if (ipv6_get_lladdr(dev, &amp;addr_buf,</div><div class='add'>+				    (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)))</div><div class='add'>+			return;</div><div class='add'>+		saddr = &amp;addr_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ndisc_ns_create(dev, solicit, saddr, nonce);</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		ndisc_send_skb(skb, daddr, saddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,</div><div class='hunk'>@@ -712,10 +749,9 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)</div><div class='ctx'> 		saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	probes -= NEIGH_VAR(neigh-&gt;parms, UCAST_PROBES);</div><div class='ctx'> 	if (probes &lt; 0) {</div><div class='del'>-		if (!(neigh-&gt;nud_state &amp; NUD_VALID)) {</div><div class='del'>-			ND_PRINTK(1, dbg,</div><div class='del'>-				  "%s: trying to ucast probe in NUD_INVALID: %pI6\n",</div><div class='del'>-				  __func__, target);</div><div class='add'>+		if (!(READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID)) {</div><div class='add'>+			net_dbg_ratelimited("%s: trying to ucast probe in NUD_INVALID: %pI6\n",</div><div class='add'>+					    __func__, target);</div><div class='ctx'> 		}</div><div class='ctx'> 		ndisc_send_ns(dev, target, target, saddr, 0);</div><div class='ctx'> 	} else if ((probes -= NEIGH_VAR(neigh-&gt;parms, APP_PROBES)) &lt; 0) {</div><div class='hunk'>@@ -732,11 +768,9 @@ static int pndisc_is_router(const void *pkey,</div><div class='ctx'> 	struct pneigh_entry *n;</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;nd_tbl.lock);</div><div class='del'>-	n = __pneigh_lookup(&amp;nd_tbl, dev_net(dev), pkey, dev);</div><div class='add'>+	n = pneigh_lookup(&amp;nd_tbl, dev_net(dev), pkey, dev);</div><div class='ctx'> 	if (n)</div><div class='del'>-		ret = !!(n-&gt;flags &amp; NTF_ROUTER);</div><div class='del'>-	read_unlock_bh(&amp;nd_tbl.lock);</div><div class='add'>+		ret = !!(READ_ONCE(n-&gt;flags) &amp; NTF_ROUTER);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -750,7 +784,7 @@ void ndisc_update(const struct net_device *dev, struct neighbour *neigh,</div><div class='ctx'> 	ndisc_ops_update(dev, neigh, flags, icmp6_type, ndopts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_recv_ns(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason ndisc_recv_ns(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb);</div><div class='ctx'> 	const struct in6_addr *saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='hunk'>@@ -764,18 +798,17 @@ static void ndisc_recv_ns(struct sk_buff *skb)</div><div class='ctx'> 	struct inet6_dev *idev = NULL;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> 	int dad = ipv6_addr_any(saddr);</div><div class='del'>-	bool inc;</div><div class='ctx'> 	int is_router = -1;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	u64 nonce = 0;</div><div class='add'>+	bool inc;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(struct nd_msg)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NS: packet too short\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(struct nd_msg))</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_is_multicast(&amp;msg-&gt;target)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NS: multicast target address\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("NS: multicast target address\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -783,21 +816,18 @@ static void ndisc_recv_ns(struct sk_buff *skb)</div><div class='ctx'> 	 * DAD has to be destined for solicited node multicast address.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dad &amp;&amp; !ipv6_addr_is_solict_mult(daddr)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NS: bad DAD packet (wrong destination)\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("NS: bad DAD packet (wrong destination)\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ndisc_parse_options(dev, msg-&gt;opt, ndoptlen, &amp;ndopts)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NS: invalid ND options\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (!ndisc_parse_options(dev, msg-&gt;opt, ndoptlen, &amp;ndopts))</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS;</div><div class='ctx'> </div><div class='ctx'> 	if (ndopts.nd_opts_src_lladdr) {</div><div class='ctx'> 		lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr, dev);</div><div class='ctx'> 		if (!lladdr) {</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "NS: invalid link-layer address length\n");</div><div class='del'>-			return;</div><div class='add'>+			net_dbg_ratelimited("NS: invalid link-layer address length\n");</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* RFC2461 7.1.1:</div><div class='hunk'>@@ -806,9 +836,8 @@ static void ndisc_recv_ns(struct sk_buff *skb)</div><div class='ctx'> 		 *	in the message.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dad) {</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "NS: bad DAD packet (link-layer address option)\n");</div><div class='del'>-			return;</div><div class='add'>+			net_dbg_ratelimited("NS: bad DAD packet (link-layer address option)\n");</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ndopts.nd_opts_nonce &amp;&amp; ndopts.nd_opts_nonce-&gt;nd_opt_len == 1)</div><div class='hunk'>@@ -824,10 +853,8 @@ have_ifp:</div><div class='ctx'> 				if (nonce != 0 &amp;&amp; ifp-&gt;dad_nonce == nonce) {</div><div class='ctx'> 					u8 *np = (u8 *)&amp;nonce;</div><div class='ctx'> 					/* Matching nonce if looped back */</div><div class='del'>-					ND_PRINTK(2, notice,</div><div class='del'>-						  "%s: IPv6 DAD loopback for address %pI6c nonce %pM ignored\n",</div><div class='del'>-						  ifp-&gt;idev-&gt;dev-&gt;name,</div><div class='del'>-						  &amp;ifp-&gt;addr, np);</div><div class='add'>+					net_dbg_ratelimited("%s: IPv6 DAD loopback for address %pI6c nonce %pM ignored\n",</div><div class='add'>+							    ifp-&gt;idev-&gt;dev-&gt;name, &amp;ifp-&gt;addr, np);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -836,7 +863,7 @@ have_ifp:</div><div class='ctx'> 				 * so fail our DAD process</div><div class='ctx'> 				 */</div><div class='ctx'> 				addrconf_dad_failure(skb, ifp);</div><div class='del'>-				return;</div><div class='add'>+				return reason;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * This is not a dad solicitation.</div><div class='hunk'>@@ -868,12 +895,13 @@ have_ifp:</div><div class='ctx'> 		idev = in6_dev_get(dev);</div><div class='ctx'> 		if (!idev) {</div><div class='ctx'> 			/* XXX: count this drop? */</div><div class='del'>-			return;</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ipv6_chk_acast_addr(net, dev, &amp;msg-&gt;target) ||</div><div class='del'>-		    (idev-&gt;cnf.forwarding &amp;&amp;</div><div class='del'>-		     (net-&gt;ipv6.devconf_all-&gt;proxy_ndp || idev-&gt;cnf.proxy_ndp) &amp;&amp;</div><div class='add'>+		    (READ_ONCE(idev-&gt;cnf.forwarding) &amp;&amp;</div><div class='add'>+		     (READ_ONCE(net-&gt;ipv6.devconf_all-&gt;proxy_ndp) ||</div><div class='add'>+		      READ_ONCE(idev-&gt;cnf.proxy_ndp)) &amp;&amp;</div><div class='ctx'> 		     (is_router = pndisc_is_router(&amp;msg-&gt;target, dev)) &gt;= 0)) {</div><div class='ctx'> 			if (!(NEIGH_CB(skb)-&gt;flags &amp; LOCALLY_ENQUEUED) &amp;&amp;</div><div class='ctx'> 			    skb-&gt;pkt_type != PACKET_HOST &amp;&amp;</div><div class='hunk'>@@ -891,12 +919,14 @@ have_ifp:</div><div class='ctx'> 					pneigh_enqueue(&amp;nd_tbl, idev-&gt;nd_parms, n);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='add'>+			SKB_DR_SET(reason, IPV6_NDISC_NS_OTHERHOST);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_router &lt; 0)</div><div class='del'>-		is_router = idev-&gt;cnf.forwarding;</div><div class='add'>+		is_router = READ_ONCE(idev-&gt;cnf.forwarding);</div><div class='ctx'> </div><div class='ctx'> 	if (dad) {</div><div class='ctx'> 		ndisc_send_na(dev, &amp;in6addr_linklocal_allnodes, &amp;msg-&gt;target,</div><div class='hunk'>@@ -925,6 +955,7 @@ have_ifp:</div><div class='ctx'> 			      true, (ifp != NULL &amp;&amp; inc), inc);</div><div class='ctx'> 		if (neigh)</div><div class='ctx'> 			neigh_release(neigh);</div><div class='add'>+		reason = SKB_CONSUMED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -932,9 +963,29 @@ out:</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='ctx'> 	else</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='add'>+	return reason;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int accept_untracked_na(struct net_device *dev, struct in6_addr *saddr)</div><div class='add'>+{</div><div class='add'>+	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='add'>+</div><div class='add'>+	switch (READ_ONCE(idev-&gt;cnf.accept_untracked_na)) {</div><div class='add'>+	case 0: /* Don't accept untracked na (absent in neighbor cache) */</div><div class='add'>+		return 0;</div><div class='add'>+	case 1: /* Create new entries from na if currently untracked */</div><div class='add'>+		return 1;</div><div class='add'>+	case 2: /* Create new entries from untracked na only if saddr is in the</div><div class='add'>+		 * same subnet as an address configured on the interface that</div><div class='add'>+		 * received the na</div><div class='add'>+		 */</div><div class='add'>+		return !!ipv6_chk_prefix(saddr, dev);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_recv_na(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb);</div><div class='ctx'> 	struct in6_addr *saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='hunk'>@@ -947,41 +998,40 @@ static void ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> 	struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='ctx'> 	struct inet6_ifaddr *ifp;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+	u8 new_state;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(struct nd_msg)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NA: packet too short\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(struct nd_msg))</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_is_multicast(&amp;msg-&gt;target)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NA: target address is multicast\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("NA: target address is multicast\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_addr_is_multicast(daddr) &amp;&amp;</div><div class='ctx'> 	    msg-&gt;icmph.icmp6_solicited) {</div><div class='del'>-		ND_PRINTK(2, warn, "NA: solicited NA is multicasted\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("NA: solicited NA is multicasted\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* For some 802.11 wireless deployments (and possibly other networks),</div><div class='ctx'> 	 * there will be a NA proxy and unsolicitd packets are attacks</div><div class='ctx'> 	 * and thus should not be accepted.</div><div class='add'>+	 * drop_unsolicited_na takes precedence over accept_untracked_na</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!msg-&gt;icmph.icmp6_solicited &amp;&amp; idev &amp;&amp;</div><div class='del'>-	    idev-&gt;cnf.drop_unsolicited_na)</div><div class='del'>-		return;</div><div class='add'>+	    READ_ONCE(idev-&gt;cnf.drop_unsolicited_na))</div><div class='add'>+		return reason;</div><div class='add'>+</div><div class='add'>+	if (!ndisc_parse_options(dev, msg-&gt;opt, ndoptlen, &amp;ndopts))</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS;</div><div class='ctx'> </div><div class='del'>-	if (!ndisc_parse_options(dev, msg-&gt;opt, ndoptlen, &amp;ndopts)) {</div><div class='del'>-		ND_PRINTK(2, warn, "NS: invalid ND option\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	if (ndopts.nd_opts_tgt_lladdr) {</div><div class='ctx'> 		lladdr = ndisc_opt_addr_data(ndopts.nd_opts_tgt_lladdr, dev);</div><div class='ctx'> 		if (!lladdr) {</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "NA: invalid link-layer address length\n");</div><div class='del'>-			return;</div><div class='add'>+			net_dbg_ratelimited("NA: invalid link-layer address length\n");</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ifp = ipv6_get_ifaddr(dev_net(dev), &amp;msg-&gt;target, dev, 1);</div><div class='hunk'>@@ -989,7 +1039,7 @@ static void ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> 		if (skb-&gt;pkt_type != PACKET_LOOPBACK</div><div class='ctx'> 		    &amp;&amp; (ifp-&gt;flags &amp; IFA_F_TENTATIVE)) {</div><div class='ctx'> 				addrconf_dad_failure(skb, ifp);</div><div class='del'>-				return;</div><div class='add'>+				return reason;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* What should we make now? The advertisement</div><div class='ctx'> 		   is invalid, but ndisc specs say nothing</div><div class='hunk'>@@ -1001,19 +1051,43 @@ static void ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> 		   unsolicited advertisement.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (skb-&gt;pkt_type != PACKET_LOOPBACK)</div><div class='del'>-			ND_PRINTK(1, warn,</div><div class='del'>-				  "NA: %pM advertised our address %pI6c on %s!\n",</div><div class='del'>-				  eth_hdr(skb)-&gt;h_source, &amp;ifp-&gt;addr, ifp-&gt;idev-&gt;dev-&gt;name);</div><div class='add'>+			net_warn_ratelimited("NA: %pM advertised our address %pI6c on %s!\n",</div><div class='add'>+					     eth_hdr(skb)-&gt;h_source, &amp;ifp-&gt;addr,</div><div class='add'>+					     ifp-&gt;idev-&gt;dev-&gt;name);</div><div class='ctx'> 		in6_ifa_put(ifp);</div><div class='del'>-		return;</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	neigh = neigh_lookup(&amp;nd_tbl, &amp;msg-&gt;target, dev);</div><div class='ctx'> </div><div class='del'>-	if (neigh) {</div><div class='add'>+	/* RFC 9131 updates original Neighbour Discovery RFC 4861.</div><div class='add'>+	 * NAs with Target LL Address option without a corresponding</div><div class='add'>+	 * entry in the neighbour cache can now create a STALE neighbour</div><div class='add'>+	 * cache entry on routers.</div><div class='add'>+	 *</div><div class='add'>+	 *   entry accept  fwding  solicited        behaviour</div><div class='add'>+	 * ------- ------  ------  ---------    ----------------------</div><div class='add'>+	 * present      X       X         0     Set state to STALE</div><div class='add'>+	 * present      X       X         1     Set state to REACHABLE</div><div class='add'>+	 *  absent      0       X         X     Do nothing</div><div class='add'>+	 *  absent      1       0         X     Do nothing</div><div class='add'>+	 *  absent      1       1         X     Add a new STALE entry</div><div class='add'>+	 *</div><div class='add'>+	 * Note that we don't do a (daddr == all-routers-mcast) check.</div><div class='add'>+	 */</div><div class='add'>+	new_state = msg-&gt;icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE;</div><div class='add'>+	if (!neigh &amp;&amp; lladdr &amp;&amp; idev &amp;&amp; READ_ONCE(idev-&gt;cnf.forwarding)) {</div><div class='add'>+		if (accept_untracked_na(dev, saddr)) {</div><div class='add'>+			neigh = neigh_create(&amp;nd_tbl, &amp;msg-&gt;target, dev);</div><div class='add'>+			new_state = NUD_STALE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (neigh &amp;&amp; !IS_ERR(neigh)) {</div><div class='ctx'> 		u8 old_flags = neigh-&gt;flags;</div><div class='ctx'> 		struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-		if (neigh-&gt;nud_state &amp; NUD_FAILED)</div><div class='add'>+		if (READ_ONCE(neigh-&gt;nud_state) &amp; NUD_FAILED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1022,14 +1096,15 @@ static void ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> 		 * has already sent a NA to us.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (lladdr &amp;&amp; !memcmp(lladdr, dev-&gt;dev_addr, dev-&gt;addr_len) &amp;&amp;</div><div class='del'>-		    net-&gt;ipv6.devconf_all-&gt;forwarding &amp;&amp; net-&gt;ipv6.devconf_all-&gt;proxy_ndp &amp;&amp;</div><div class='del'>-		    pneigh_lookup(&amp;nd_tbl, net, &amp;msg-&gt;target, dev, 0)) {</div><div class='add'>+		    READ_ONCE(net-&gt;ipv6.devconf_all-&gt;forwarding) &amp;&amp;</div><div class='add'>+		    READ_ONCE(net-&gt;ipv6.devconf_all-&gt;proxy_ndp) &amp;&amp;</div><div class='add'>+		    pneigh_lookup(&amp;nd_tbl, net, &amp;msg-&gt;target, dev)) {</div><div class='ctx'> 			/* XXX: idev-&gt;cnf.proxy_ndp */</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ndisc_update(dev, neigh, lladdr,</div><div class='del'>-			     msg-&gt;icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE,</div><div class='add'>+			     new_state,</div><div class='ctx'> 			     NEIGH_UPDATE_F_WEAK_OVERRIDE|</div><div class='ctx'> 			     (msg-&gt;icmph.icmp6_override ? NEIGH_UPDATE_F_OVERRIDE : 0)|</div><div class='ctx'> 			     NEIGH_UPDATE_F_OVERRIDE_ISROUTER|</div><div class='hunk'>@@ -1042,13 +1117,14 @@ static void ndisc_recv_na(struct sk_buff *skb)</div><div class='ctx'> 			 */</div><div class='ctx'> 			rt6_clean_tohost(dev_net(dev),  saddr);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		reason = SKB_CONSUMED;</div><div class='ctx'> out:</div><div class='ctx'> 		neigh_release(neigh);</div><div class='ctx'> 	}</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_recv_rs(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason ndisc_recv_rs(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct rs_msg *rs_msg = (struct rs_msg *)skb_transport_header(skb);</div><div class='ctx'> 	unsigned long ndoptlen = skb-&gt;len - sizeof(*rs_msg);</div><div class='hunk'>@@ -1057,18 +1133,19 @@ static void ndisc_recv_rs(struct sk_buff *skb)</div><div class='ctx'> 	const struct in6_addr *saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	struct ndisc_options ndopts;</div><div class='ctx'> 	u8 *lladdr = NULL;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(*rs_msg))</div><div class='del'>-		return;</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> </div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	if (!idev) {</div><div class='del'>-		ND_PRINTK(1, err, "RS: can't find in6 device\n");</div><div class='del'>-		return;</div><div class='add'>+		net_err_ratelimited("RS: can't find in6 device\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't accept RS if we're not in router mode */</div><div class='del'>-	if (!idev-&gt;cnf.forwarding)</div><div class='add'>+	if (!READ_ONCE(idev-&gt;cnf.forwarding))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1079,10 +1156,8 @@ static void ndisc_recv_rs(struct sk_buff *skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Parse ND options */</div><div class='del'>-	if (!ndisc_parse_options(skb-&gt;dev, rs_msg-&gt;opt, ndoptlen, &amp;ndopts)) {</div><div class='del'>-		ND_PRINTK(2, notice, "NS: invalid ND option, ignored\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!ndisc_parse_options(skb-&gt;dev, rs_msg-&gt;opt, ndoptlen, &amp;ndopts))</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS;</div><div class='ctx'> </div><div class='ctx'> 	if (ndopts.nd_opts_src_lladdr) {</div><div class='ctx'> 		lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr,</div><div class='hunk'>@@ -1099,9 +1174,10 @@ static void ndisc_recv_rs(struct sk_buff *skb)</div><div class='ctx'> 			     NEIGH_UPDATE_F_OVERRIDE_ISROUTER,</div><div class='ctx'> 			     NDISC_ROUTER_SOLICITATION, &amp;ndopts);</div><div class='ctx'> 		neigh_release(neigh);</div><div class='add'>+		reason = SKB_CONSUMED;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return;</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)</div><div class='hunk'>@@ -1150,73 +1226,63 @@ errout:</div><div class='ctx'> 	rtnl_set_sk_err(net, RTNLGRP_ND_USEROPT, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_router_discovery(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ra_msg *ra_msg = (struct ra_msg *)skb_transport_header(skb);</div><div class='add'>+	bool send_ifinfo_notify = false;</div><div class='ctx'> 	struct neighbour *neigh = NULL;</div><div class='del'>-	struct inet6_dev *in6_dev;</div><div class='add'>+	struct ndisc_options ndopts;</div><div class='ctx'> 	struct fib6_info *rt = NULL;</div><div class='add'>+	struct inet6_dev *in6_dev;</div><div class='add'>+	struct fib6_table *table;</div><div class='add'>+	u32 defrtr_usr_metric;</div><div class='add'>+	unsigned int pref = 0;</div><div class='add'>+	__u32 old_if_flags;</div><div class='ctx'> 	struct net *net;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	int lifetime;</div><div class='del'>-	struct ndisc_options ndopts;</div><div class='ctx'> 	int optlen;</div><div class='del'>-	unsigned int pref = 0;</div><div class='del'>-	__u32 old_if_flags;</div><div class='del'>-	bool send_ifinfo_notify = false;</div><div class='ctx'> </div><div class='ctx'> 	__u8 *opt = (__u8 *)(ra_msg + 1);</div><div class='ctx'> </div><div class='ctx'> 	optlen = (skb_tail_pointer(skb) - skb_transport_header(skb)) -</div><div class='ctx'> 		sizeof(struct ra_msg);</div><div class='ctx'> </div><div class='del'>-	ND_PRINTK(2, info,</div><div class='del'>-		  "RA: %s, dev: %s\n",</div><div class='del'>-		  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+	net_dbg_ratelimited("RA: %s, dev: %s\n", __func__, skb-&gt;dev-&gt;name);</div><div class='ctx'> 	if (!(ipv6_addr_type(&amp;ipv6_hdr(skb)-&gt;saddr) &amp; IPV6_ADDR_LINKLOCAL)) {</div><div class='del'>-		ND_PRINTK(2, warn, "RA: source address is not link-local\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (optlen &lt; 0) {</div><div class='del'>-		ND_PRINTK(2, warn, "RA: packet too short\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("RA: source address is not link-local\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='add'>+	if (optlen &lt; 0)</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_NDISC_NODETYPE</div><div class='ctx'> 	if (skb-&gt;ndisc_nodetype == NDISC_NODETYPE_HOST) {</div><div class='del'>-		ND_PRINTK(2, warn, "RA: from host or unauthorized router\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("RA: from host or unauthorized router\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	set the RA_RECV flag in the interface</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	in6_dev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	if (!in6_dev) {</div><div class='del'>-		ND_PRINTK(0, err, "RA: can't find inet6 device for %s\n",</div><div class='del'>-			  skb-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='add'>+		net_err_ratelimited("RA: can't find inet6 device for %s\n", skb-&gt;dev-&gt;name);</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ndisc_parse_options(skb-&gt;dev, opt, optlen, &amp;ndopts)) {</div><div class='del'>-		ND_PRINTK(2, warn, "RA: invalid ND options\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (!ndisc_parse_options(skb-&gt;dev, opt, optlen, &amp;ndopts))</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS;</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_accept_ra(in6_dev)) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA: %s, did not accept ra for dev: %s\n",</div><div class='del'>-			  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA: %s, did not accept ra for dev: %s\n", __func__,</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto skip_linkparms;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_NDISC_NODETYPE</div><div class='ctx'> 	/* skip link-specific parameters from interior routers */</div><div class='ctx'> 	if (skb-&gt;ndisc_nodetype == NDISC_NODETYPE_NODEFAULT) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA: %s, nodetype is NODEFAULT, dev: %s\n",</div><div class='del'>-			  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA: %s, nodetype is NODEFAULT, dev: %s\n", __func__,</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto skip_linkparms;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1244,10 +1310,17 @@ static void ndisc_router_discovery(struct sk_buff *skb)</div><div class='ctx'> 	if (old_if_flags != in6_dev-&gt;if_flags)</div><div class='ctx'> 		send_ifinfo_notify = true;</div><div class='ctx'> </div><div class='del'>-	if (!in6_dev-&gt;cnf.accept_ra_defrtr) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA: %s, defrtr is false for dev: %s\n",</div><div class='del'>-			  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+	if (!READ_ONCE(in6_dev-&gt;cnf.accept_ra_defrtr)) {</div><div class='add'>+		net_dbg_ratelimited("RA: %s, defrtr is false for dev: %s\n", __func__,</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='add'>+		goto skip_defrtr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lifetime = ntohs(ra_msg-&gt;icmph.icmp6_rt_lifetime);</div><div class='add'>+	if (lifetime != 0 &amp;&amp;</div><div class='add'>+	    lifetime &lt; READ_ONCE(in6_dev-&gt;cnf.accept_ra_min_lft)) {</div><div class='add'>+		net_dbg_ratelimited("RA: router lifetime (%ds) is too short: %s\n", lifetime,</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto skip_defrtr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1255,82 +1328,94 @@ static void ndisc_router_discovery(struct sk_buff *skb)</div><div class='ctx'> 	 * accept_ra_from_local is set to true.</div><div class='ctx'> 	 */</div><div class='ctx'> 	net = dev_net(in6_dev-&gt;dev);</div><div class='del'>-	if (!in6_dev-&gt;cnf.accept_ra_from_local &amp;&amp;</div><div class='add'>+	if (!READ_ONCE(in6_dev-&gt;cnf.accept_ra_from_local) &amp;&amp;</div><div class='ctx'> 	    ipv6_chk_addr(net, &amp;ipv6_hdr(skb)-&gt;saddr, in6_dev-&gt;dev, 0)) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA from local address detected on dev: %s: default router ignored\n",</div><div class='del'>-			  skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA from local address detected on dev: %s: default router ignored\n",</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto skip_defrtr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lifetime = ntohs(ra_msg-&gt;icmph.icmp6_rt_lifetime);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='ctx'> 	pref = ra_msg-&gt;icmph.icmp6_router_pref;</div><div class='ctx'> 	/* 10b is handled as if it were 00b (medium) */</div><div class='ctx'> 	if (pref == ICMPV6_ROUTER_PREF_INVALID ||</div><div class='del'>-	    !in6_dev-&gt;cnf.accept_ra_rtr_pref)</div><div class='add'>+	    !READ_ONCE(in6_dev-&gt;cnf.accept_ra_rtr_pref))</div><div class='ctx'> 		pref = ICMPV6_ROUTER_PREF_MEDIUM;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+	/* routes added from RAs do not use nexthop objects */</div><div class='ctx'> 	rt = rt6_get_dflt_router(net, &amp;ipv6_hdr(skb)-&gt;saddr, skb-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	if (rt) {</div><div class='del'>-		neigh = ip6_neigh_lookup(&amp;rt-&gt;fib6_nh.nh_gw,</div><div class='del'>-					 rt-&gt;fib6_nh.nh_dev, NULL,</div><div class='add'>+		neigh = ip6_neigh_lookup(&amp;rt-&gt;fib6_nh-&gt;fib_nh_gw6,</div><div class='add'>+					 rt-&gt;fib6_nh-&gt;fib_nh_dev, NULL,</div><div class='ctx'> 					  &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='ctx'> 		if (!neigh) {</div><div class='del'>-			ND_PRINTK(0, err,</div><div class='del'>-				  "RA: %s got default router without neighbour\n",</div><div class='del'>-				  __func__);</div><div class='add'>+			net_err_ratelimited("RA: %s got default router without neighbour\n",</div><div class='add'>+					    __func__);</div><div class='ctx'> 			fib6_info_release(rt);</div><div class='del'>-			return;</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (rt &amp;&amp; lifetime == 0) {</div><div class='del'>-		ip6_del_rt(net, rt);</div><div class='add'>+	/* Set default route metric as specified by user */</div><div class='add'>+	defrtr_usr_metric = in6_dev-&gt;cnf.ra_defrtr_metric;</div><div class='add'>+	/* delete the route if lifetime is 0 or if metric needs change */</div><div class='add'>+	if (rt &amp;&amp; (lifetime == 0 || rt-&gt;fib6_metric != defrtr_usr_metric)) {</div><div class='add'>+		ip6_del_rt(net, rt, false);</div><div class='ctx'> 		rt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ND_PRINTK(3, info, "RA: rt: %p  lifetime: %d, for dev: %s\n",</div><div class='del'>-		  rt, lifetime, skb-&gt;dev-&gt;name);</div><div class='add'>+	net_dbg_ratelimited("RA: rt: %p  lifetime: %d, metric: %d, for dev: %s\n", rt, lifetime,</div><div class='add'>+			    defrtr_usr_metric, skb-&gt;dev-&gt;name);</div><div class='ctx'> 	if (!rt &amp;&amp; lifetime) {</div><div class='del'>-		ND_PRINTK(3, info, "RA: adding default router\n");</div><div class='add'>+		net_dbg_ratelimited("RA: adding default router\n");</div><div class='add'>+</div><div class='add'>+		if (neigh)</div><div class='add'>+			neigh_release(neigh);</div><div class='ctx'> </div><div class='ctx'> 		rt = rt6_add_dflt_router(net, &amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-					 skb-&gt;dev, pref);</div><div class='add'>+					 skb-&gt;dev, pref, defrtr_usr_metric,</div><div class='add'>+					 lifetime);</div><div class='ctx'> 		if (!rt) {</div><div class='del'>-			ND_PRINTK(0, err,</div><div class='del'>-				  "RA: %s failed to add default route\n",</div><div class='del'>-				  __func__);</div><div class='del'>-			return;</div><div class='add'>+			net_err_ratelimited("RA: %s failed to add default route\n", __func__);</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		neigh = ip6_neigh_lookup(&amp;rt-&gt;fib6_nh.nh_gw,</div><div class='del'>-					 rt-&gt;fib6_nh.nh_dev, NULL,</div><div class='add'>+		neigh = ip6_neigh_lookup(&amp;rt-&gt;fib6_nh-&gt;fib_nh_gw6,</div><div class='add'>+					 rt-&gt;fib6_nh-&gt;fib_nh_dev, NULL,</div><div class='ctx'> 					  &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='ctx'> 		if (!neigh) {</div><div class='del'>-			ND_PRINTK(0, err,</div><div class='del'>-				  "RA: %s got default router without neighbour\n",</div><div class='del'>-				  __func__);</div><div class='add'>+			net_err_ratelimited("RA: %s got default router without neighbour\n",</div><div class='add'>+					    __func__);</div><div class='ctx'> 			fib6_info_release(rt);</div><div class='del'>-			return;</div><div class='add'>+			return reason;</div><div class='ctx'> 		}</div><div class='ctx'> 		neigh-&gt;flags |= NTF_ROUTER;</div><div class='del'>-	} else if (rt) {</div><div class='add'>+	} else if (rt &amp;&amp; IPV6_EXTRACT_PREF(rt-&gt;fib6_flags) != pref) {</div><div class='add'>+		struct nl_info nlinfo = {</div><div class='add'>+			.nl_net = net,</div><div class='add'>+		};</div><div class='ctx'> 		rt-&gt;fib6_flags = (rt-&gt;fib6_flags &amp; ~RTF_PREF_MASK) | RTF_PREF(pref);</div><div class='add'>+		inet6_rt_notify(RTM_NEWROUTE, rt, &amp;nlinfo, NLM_F_REPLACE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt)</div><div class='add'>+	if (rt) {</div><div class='add'>+		table = rt-&gt;fib6_table;</div><div class='add'>+		spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='ctx'> 		fib6_set_expires(rt, jiffies + (HZ * lifetime));</div><div class='del'>-	if (in6_dev-&gt;cnf.accept_ra_min_hop_limit &lt; 256 &amp;&amp;</div><div class='add'>+		fib6_add_gc_list(rt);</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+	}</div><div class='add'>+	if (READ_ONCE(in6_dev-&gt;cnf.accept_ra_min_hop_limit) &lt; 256 &amp;&amp;</div><div class='ctx'> 	    ra_msg-&gt;icmph.icmp6_hop_limit) {</div><div class='del'>-		if (in6_dev-&gt;cnf.accept_ra_min_hop_limit &lt;= ra_msg-&gt;icmph.icmp6_hop_limit) {</div><div class='del'>-			in6_dev-&gt;cnf.hop_limit = ra_msg-&gt;icmph.icmp6_hop_limit;</div><div class='add'>+		if (READ_ONCE(in6_dev-&gt;cnf.accept_ra_min_hop_limit) &lt;=</div><div class='add'>+		    ra_msg-&gt;icmph.icmp6_hop_limit) {</div><div class='add'>+			WRITE_ONCE(in6_dev-&gt;cnf.hop_limit,</div><div class='add'>+				   ra_msg-&gt;icmph.icmp6_hop_limit);</div><div class='ctx'> 			fib6_metric_set(rt, RTAX_HOPLIMIT,</div><div class='ctx'> 					ra_msg-&gt;icmph.icmp6_hop_limit);</div><div class='ctx'> 		} else {</div><div class='del'>-			ND_PRINTK(2, warn, "RA: Got route advertisement with lower hop_limit than minimum\n");</div><div class='add'>+			net_dbg_ratelimited("RA: Got route advertisement with lower hop_limit than minimum\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1345,8 +1430,8 @@ skip_defrtr:</div><div class='ctx'> </div><div class='ctx'> 		if (rtime &amp;&amp; rtime/1000 &lt; MAX_SCHEDULE_TIMEOUT/HZ) {</div><div class='ctx'> 			rtime = (rtime*HZ)/1000;</div><div class='del'>-			if (rtime &lt; HZ/10)</div><div class='del'>-				rtime = HZ/10;</div><div class='add'>+			if (rtime &lt; HZ/100)</div><div class='add'>+				rtime = HZ/100;</div><div class='ctx'> 			NEIGH_VAR_SET(in6_dev-&gt;nd_parms, RETRANS_TIME, rtime);</div><div class='ctx'> 			in6_dev-&gt;tstamp = jiffies;</div><div class='ctx'> 			send_ifinfo_notify = true;</div><div class='hunk'>@@ -1364,19 +1449,13 @@ skip_defrtr:</div><div class='ctx'> 					      BASE_REACHABLE_TIME, rtime);</div><div class='ctx'> 				NEIGH_VAR_SET(in6_dev-&gt;nd_parms,</div><div class='ctx'> 					      GC_STALETIME, 3 * rtime);</div><div class='del'>-				in6_dev-&gt;nd_parms-&gt;reachable_time = neigh_rand_reach_time(rtime);</div><div class='add'>+				neigh_set_reach_time(in6_dev-&gt;nd_parms);</div><div class='ctx'> 				in6_dev-&gt;tstamp = jiffies;</div><div class='ctx'> 				send_ifinfo_notify = true;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Send a notify if RA changed managed/otherconf flags or timer settings</div><div class='del'>-	 */</div><div class='del'>-	if (send_ifinfo_notify)</div><div class='del'>-		inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);</div><div class='del'>-</div><div class='ctx'> skip_linkparms:</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1392,8 +1471,7 @@ skip_linkparms:</div><div class='ctx'> 			lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr,</div><div class='ctx'> 						     skb-&gt;dev);</div><div class='ctx'> 			if (!lladdr) {</div><div class='del'>-				ND_PRINTK(2, warn,</div><div class='del'>-					  "RA: invalid link-layer address length\n");</div><div class='add'>+				net_dbg_ratelimited("RA: invalid link-layer address length\n");</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1403,26 +1481,25 @@ skip_linkparms:</div><div class='ctx'> 			     NEIGH_UPDATE_F_OVERRIDE_ISROUTER|</div><div class='ctx'> 			     NEIGH_UPDATE_F_ISROUTER,</div><div class='ctx'> 			     NDISC_ROUTER_ADVERTISEMENT, &amp;ndopts);</div><div class='add'>+		reason = SKB_CONSUMED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_accept_ra(in6_dev)) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA: %s, accept_ra is false for dev: %s\n",</div><div class='del'>-			  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA: %s, accept_ra is false for dev: %s\n", __func__,</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTE_INFO</div><div class='del'>-	if (!in6_dev-&gt;cnf.accept_ra_from_local &amp;&amp;</div><div class='add'>+	if (!READ_ONCE(in6_dev-&gt;cnf.accept_ra_from_local) &amp;&amp;</div><div class='ctx'> 	    ipv6_chk_addr(dev_net(in6_dev-&gt;dev), &amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='ctx'> 			  in6_dev-&gt;dev, 0)) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA from local address detected on dev: %s: router info ignored.\n",</div><div class='del'>-			  skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA from local address detected on dev: %s: router info ignored.\n",</div><div class='add'>+				    skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto skip_routeinfo;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (in6_dev-&gt;cnf.accept_ra_rtr_pref &amp;&amp; ndopts.nd_opts_ri) {</div><div class='add'>+	if (READ_ONCE(in6_dev-&gt;cnf.accept_ra_rtr_pref) &amp;&amp; ndopts.nd_opts_ri) {</div><div class='ctx'> 		struct nd_opt_hdr *p;</div><div class='ctx'> 		for (p = ndopts.nd_opts_ri;</div><div class='ctx'> 		     p;</div><div class='hunk'>@@ -1434,11 +1511,14 @@ skip_linkparms:</div><div class='ctx'> 				continue;</div><div class='ctx'> #endif</div><div class='ctx'> 			if (ri-&gt;prefix_len == 0 &amp;&amp;</div><div class='del'>-			    !in6_dev-&gt;cnf.accept_ra_defrtr)</div><div class='add'>+			    !READ_ONCE(in6_dev-&gt;cnf.accept_ra_defrtr))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (ri-&gt;prefix_len &lt; in6_dev-&gt;cnf.accept_ra_rt_info_min_plen)</div><div class='add'>+			if (ri-&gt;lifetime != 0 &amp;&amp;</div><div class='add'>+			    ntohl(ri-&gt;lifetime) &lt; READ_ONCE(in6_dev-&gt;cnf.accept_ra_min_lft))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (ri-&gt;prefix_len &gt; in6_dev-&gt;cnf.accept_ra_rt_info_max_plen)</div><div class='add'>+			if (ri-&gt;prefix_len &lt; READ_ONCE(in6_dev-&gt;cnf.accept_ra_rt_info_min_plen))</div><div class='add'>+				continue;</div><div class='add'>+			if (ri-&gt;prefix_len &gt; READ_ONCE(in6_dev-&gt;cnf.accept_ra_rt_info_max_plen))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			rt6_route_rcv(skb-&gt;dev, (u8 *)p, (p-&gt;nd_opt_len) &lt;&lt; 3,</div><div class='ctx'> 				      &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='hunk'>@@ -1451,14 +1531,13 @@ skip_routeinfo:</div><div class='ctx'> #ifdef CONFIG_IPV6_NDISC_NODETYPE</div><div class='ctx'> 	/* skip link-specific ndopts from interior routers */</div><div class='ctx'> 	if (skb-&gt;ndisc_nodetype == NDISC_NODETYPE_NODEFAULT) {</div><div class='del'>-		ND_PRINTK(2, info,</div><div class='del'>-			  "RA: %s, nodetype is NODEFAULT (interior routes), dev: %s\n",</div><div class='del'>-			  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("RA: %s, nodetype is NODEFAULT (interior routes), dev: %s\n",</div><div class='add'>+				    __func__, skb-&gt;dev-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (in6_dev-&gt;cnf.accept_ra_pinfo &amp;&amp; ndopts.nd_opts_pi) {</div><div class='add'>+	if (READ_ONCE(in6_dev-&gt;cnf.accept_ra_pinfo) &amp;&amp; ndopts.nd_opts_pi) {</div><div class='ctx'> 		struct nd_opt_hdr *p;</div><div class='ctx'> 		for (p = ndopts.nd_opts_pi;</div><div class='ctx'> 		     p;</div><div class='hunk'>@@ -1469,17 +1548,22 @@ skip_routeinfo:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ndopts.nd_opts_mtu &amp;&amp; in6_dev-&gt;cnf.accept_ra_mtu) {</div><div class='add'>+	if (ndopts.nd_opts_mtu &amp;&amp; READ_ONCE(in6_dev-&gt;cnf.accept_ra_mtu)) {</div><div class='ctx'> 		__be32 n;</div><div class='ctx'> 		u32 mtu;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;n, ((u8 *)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));</div><div class='ctx'> 		mtu = ntohl(n);</div><div class='ctx'> </div><div class='add'>+		if (in6_dev-&gt;ra_mtu != mtu) {</div><div class='add'>+			in6_dev-&gt;ra_mtu = mtu;</div><div class='add'>+			send_ifinfo_notify = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (mtu &lt; IPV6_MIN_MTU || mtu &gt; skb-&gt;dev-&gt;mtu) {</div><div class='del'>-			ND_PRINTK(2, warn, "RA: invalid mtu: %d\n", mtu);</div><div class='del'>-		} else if (in6_dev-&gt;cnf.mtu6 != mtu) {</div><div class='del'>-			in6_dev-&gt;cnf.mtu6 = mtu;</div><div class='add'>+			net_dbg_ratelimited("RA: invalid mtu: %d\n", mtu);</div><div class='add'>+		} else if (READ_ONCE(in6_dev-&gt;cnf.mtu6) != mtu) {</div><div class='add'>+			WRITE_ONCE(in6_dev-&gt;cnf.mtu6, mtu);</div><div class='ctx'> 			fib6_metric_set(rt, RTAX_MTU, mtu);</div><div class='ctx'> 			rt6_mtu_change(skb-&gt;dev, mtu);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1496,53 +1580,59 @@ skip_routeinfo:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh) {</div><div class='del'>-		ND_PRINTK(2, warn, "RA: invalid RA options\n");</div><div class='add'>+		net_dbg_ratelimited("RA: invalid RA options\n");</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	/* Send a notify if RA changed managed/otherconf flags or</div><div class='add'>+	 * timer settings or ra_mtu value</div><div class='add'>+	 */</div><div class='add'>+	if (send_ifinfo_notify)</div><div class='add'>+		inet6_ifinfo_notify(RTM_NEWLINK, in6_dev);</div><div class='add'>+</div><div class='ctx'> 	fib6_info_release(rt);</div><div class='ctx'> 	if (neigh)</div><div class='ctx'> 		neigh_release(neigh);</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ndisc_redirect_rcv(struct sk_buff *skb)</div><div class='add'>+static enum skb_drop_reason ndisc_redirect_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u8 *hdr;</div><div class='del'>-	struct ndisc_options ndopts;</div><div class='ctx'> 	struct rd_msg *msg = (struct rd_msg *)skb_transport_header(skb);</div><div class='ctx'> 	u32 ndoptlen = skb_tail_pointer(skb) - (skb_transport_header(skb) +</div><div class='ctx'> 				    offsetof(struct rd_msg, opt));</div><div class='add'>+	struct ndisc_options ndopts;</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+	u8 *hdr;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_NDISC_NODETYPE</div><div class='ctx'> 	switch (skb-&gt;ndisc_nodetype) {</div><div class='ctx'> 	case NDISC_NODETYPE_HOST:</div><div class='ctx'> 	case NDISC_NODETYPE_NODEFAULT:</div><div class='del'>-		ND_PRINTK(2, warn,</div><div class='del'>-			  "Redirect: from host or unauthorized router\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("Redirect: from host or unauthorized router\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (!(ipv6_addr_type(&amp;ipv6_hdr(skb)-&gt;saddr) &amp; IPV6_ADDR_LINKLOCAL)) {</div><div class='del'>-		ND_PRINTK(2, warn,</div><div class='del'>-			  "Redirect: source address is not link-local\n");</div><div class='del'>-		return;</div><div class='add'>+		net_dbg_ratelimited("Redirect: source address is not link-local\n");</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ndisc_parse_options(skb-&gt;dev, msg-&gt;opt, ndoptlen, &amp;ndopts))</div><div class='del'>-		return;</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_OPTIONS;</div><div class='ctx'> </div><div class='ctx'> 	if (!ndopts.nd_opts_rh) {</div><div class='ctx'> 		ip6_redirect_no_header(skb, dev_net(skb-&gt;dev),</div><div class='del'>-					skb-&gt;dev-&gt;ifindex, 0);</div><div class='del'>-		return;</div><div class='add'>+					skb-&gt;dev-&gt;ifindex);</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hdr = (u8 *)ndopts.nd_opts_rh;</div><div class='ctx'> 	hdr += 8;</div><div class='ctx'> 	if (!pskb_pull(skb, hdr - skb_transport_header(skb)))</div><div class='del'>-		return;</div><div class='add'>+		return SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> </div><div class='del'>-	icmpv6_notify(skb, NDISC_REDIRECT, 0, 0);</div><div class='add'>+	return icmpv6_notify(skb, NDISC_REDIRECT, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ndisc_fill_redirect_hdr_option(struct sk_buff *skb,</div><div class='hunk'>@@ -1563,7 +1653,7 @@ static void ndisc_fill_redirect_hdr_option(struct sk_buff *skb,</div><div class='ctx'> void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct net *net = dev_net_rcu(dev);</div><div class='ctx'> 	struct sock *sk = net-&gt;ipv6.ndisc_sk;</div><div class='ctx'> 	int optlen = 0;</div><div class='ctx'> 	struct inet_peer *peer;</div><div class='hunk'>@@ -1578,22 +1668,20 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)</div><div class='ctx'> 	   ops_data_buf[NDISC_OPS_REDIRECT_DATA_SPACE], *ops_data = NULL;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='del'>-	if (netif_is_l3_master(skb-&gt;dev)) {</div><div class='del'>-		dev = __dev_get_by_index(dev_net(skb-&gt;dev), IPCB(skb)-&gt;iif);</div><div class='add'>+	if (netif_is_l3_master(dev)) {</div><div class='add'>+		dev = dev_get_by_index_rcu(net, IPCB(skb)-&gt;iif);</div><div class='ctx'> 		if (!dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_get_lladdr(dev, &amp;saddr_buf, IFA_F_TENTATIVE)) {</div><div class='del'>-		ND_PRINTK(2, warn, "Redirect: no link-local address on %s\n",</div><div class='del'>-			  dev-&gt;name);</div><div class='add'>+		net_dbg_ratelimited("Redirect: no link-local address on %s\n", dev-&gt;name);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_equal(&amp;ipv6_hdr(skb)-&gt;daddr, target) &amp;&amp;</div><div class='ctx'> 	    ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {</div><div class='del'>-		ND_PRINTK(2, warn,</div><div class='del'>-			  "Redirect: target address is not link-local unicast\n");</div><div class='add'>+		net_dbg_ratelimited("Redirect: target address is not link-local unicast\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1609,25 +1697,23 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rt = (struct rt6_info *) dst;</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; RTF_GATEWAY) {</div><div class='del'>-		ND_PRINTK(2, warn,</div><div class='del'>-			  "Redirect: destination is not a neighbour\n");</div><div class='add'>+		net_dbg_ratelimited("Redirect: destination is not a neighbour\n");</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='del'>-	peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;ipv6_hdr(skb)-&gt;saddr, 1);</div><div class='add'>+</div><div class='add'>+	peer = inet_getpeer_v6(net-&gt;ipv6.peers, &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='ctx'> 	ret = inet_peer_xrlim_allow(peer, 1*HZ);</div><div class='del'>-	if (peer)</div><div class='del'>-		inet_putpeer(peer);</div><div class='add'>+</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		goto release;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;addr_len) {</div><div class='ctx'> 		struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);</div><div class='ctx'> 		if (!neigh) {</div><div class='del'>-			ND_PRINTK(2, warn,</div><div class='del'>-				  "Redirect: no neigh for target address\n");</div><div class='add'>+			net_dbg_ratelimited("Redirect: no neigh for target address\n");</div><div class='ctx'> 			goto release;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1688,8 +1774,14 @@ release:</div><div class='ctx'> </div><div class='ctx'> static void pndisc_redo(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	ndisc_recv_ns(skb);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	enum skb_drop_reason reason = ndisc_recv_ns(skb);</div><div class='add'>+</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndisc_is_multicast(const void *pkey)</div><div class='add'>+{</div><div class='add'>+	return ipv6_addr_is_multicast((struct in6_addr *)pkey);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ndisc_suppress_frag_ndisc(struct sk_buff *skb)</div><div class='hunk'>@@ -1699,64 +1791,62 @@ static bool ndisc_suppress_frag_ndisc(struct sk_buff *skb)</div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (IP6CB(skb)-&gt;flags &amp; IP6SKB_FRAGMENTED &amp;&amp;</div><div class='del'>-	    idev-&gt;cnf.suppress_frag_ndisc) {</div><div class='add'>+	    READ_ONCE(idev-&gt;cnf.suppress_frag_ndisc)) {</div><div class='ctx'> 		net_warn_ratelimited("Received fragmented ndisc packet. Carefully consider disabling suppress_frag_ndisc.\n");</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ndisc_rcv(struct sk_buff *skb)</div><div class='add'>+enum skb_drop_reason ndisc_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nd_msg *msg;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> </div><div class='ctx'> 	if (ndisc_suppress_frag_ndisc(skb))</div><div class='del'>-		return 0;</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_FRAG;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_linearize(skb))</div><div class='del'>-		return 0;</div><div class='add'>+		return SKB_DROP_REASON_NOMEM;</div><div class='ctx'> </div><div class='ctx'> 	msg = (struct nd_msg *)skb_transport_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	__skb_push(skb, skb-&gt;data - skb_transport_header(skb));</div><div class='ctx'> </div><div class='ctx'> 	if (ipv6_hdr(skb)-&gt;hop_limit != 255) {</div><div class='del'>-		ND_PRINTK(2, warn, "NDISC: invalid hop-limit: %d\n",</div><div class='del'>-			  ipv6_hdr(skb)-&gt;hop_limit);</div><div class='del'>-		return 0;</div><div class='add'>+		net_dbg_ratelimited("NDISC: invalid hop-limit: %d\n", ipv6_hdr(skb)-&gt;hop_limit);</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_HOP_LIMIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;icmph.icmp6_code != 0) {</div><div class='del'>-		ND_PRINTK(2, warn, "NDISC: invalid ICMPv6 code: %d\n",</div><div class='del'>-			  msg-&gt;icmph.icmp6_code);</div><div class='del'>-		return 0;</div><div class='add'>+		net_dbg_ratelimited("NDISC: invalid ICMPv6 code: %d\n", msg-&gt;icmph.icmp6_code);</div><div class='add'>+		return SKB_DROP_REASON_IPV6_NDISC_BAD_CODE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));</div><div class='del'>-</div><div class='ctx'> 	switch (msg-&gt;icmph.icmp6_type) {</div><div class='ctx'> 	case NDISC_NEIGHBOUR_SOLICITATION:</div><div class='del'>-		ndisc_recv_ns(skb);</div><div class='add'>+		memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));</div><div class='add'>+		reason = ndisc_recv_ns(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NDISC_NEIGHBOUR_ADVERTISEMENT:</div><div class='del'>-		ndisc_recv_na(skb);</div><div class='add'>+		reason = ndisc_recv_na(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NDISC_ROUTER_SOLICITATION:</div><div class='del'>-		ndisc_recv_rs(skb);</div><div class='add'>+		reason = ndisc_recv_rs(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NDISC_ROUTER_ADVERTISEMENT:</div><div class='del'>-		ndisc_router_discovery(skb);</div><div class='add'>+		reason = ndisc_router_discovery(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NDISC_REDIRECT:</div><div class='del'>-		ndisc_redirect_rcv(skb);</div><div class='add'>+		reason = ndisc_redirect_rcv(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='hunk'>@@ -1765,25 +1855,37 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> 	struct netdev_notifier_change_info *change_info;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	bool evict_nocarrier;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='ctx'> 		neigh_changeaddr(&amp;nd_tbl, dev);</div><div class='ctx'> 		fib6_run_gc(0, net, false);</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_UP:</div><div class='ctx'> 		idev = in6_dev_get(dev);</div><div class='ctx'> 		if (!idev)</div><div class='ctx'> 			break;</div><div class='del'>-		if (idev-&gt;cnf.ndisc_notify ||</div><div class='del'>-		    net-&gt;ipv6.devconf_all-&gt;ndisc_notify)</div><div class='add'>+		if (READ_ONCE(idev-&gt;cnf.ndisc_notify) ||</div><div class='add'>+		    READ_ONCE(net-&gt;ipv6.devconf_all-&gt;ndisc_notify))</div><div class='ctx'> 			ndisc_send_unsol_na(dev);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='add'>+		idev = in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			evict_nocarrier = true;</div><div class='add'>+		else {</div><div class='add'>+			evict_nocarrier = READ_ONCE(idev-&gt;cnf.ndisc_evict_nocarrier) &amp;&amp;</div><div class='add'>+					  READ_ONCE(net-&gt;ipv6.devconf_all-&gt;ndisc_evict_nocarrier);</div><div class='add'>+			in6_dev_put(idev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		change_info = ptr;</div><div class='ctx'> 		if (change_info-&gt;flags_changed &amp; IFF_NOARP)</div><div class='ctx'> 			neigh_changeaddr(&amp;nd_tbl, dev);</div><div class='add'>+		if (evict_nocarrier &amp;&amp; !netif_carrier_ok(dev))</div><div class='add'>+			neigh_carrier_down(&amp;nd_tbl, dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='ctx'> 		neigh_ifdown(&amp;nd_tbl, dev);</div><div class='hunk'>@@ -1805,13 +1907,13 @@ static struct notifier_block ndisc_netdev_notifier = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,</div><div class='add'>+static void ndisc_warn_deprecated_sysctl(const struct ctl_table *ctl,</div><div class='ctx'> 					 const char *func, const char *dev_name)</div><div class='ctx'> {</div><div class='ctx'> 	static char warncomm[TASK_COMM_LEN];</div><div class='ctx'> 	static int warned;</div><div class='ctx'> 	if (strcmp(warncomm, current-&gt;comm) &amp;&amp; warned &lt; 5) {</div><div class='del'>-		strcpy(warncomm, current-&gt;comm);</div><div class='add'>+		strscpy(warncomm, current-&gt;comm);</div><div class='ctx'> 		pr_warn("process `%s' is using deprecated sysctl (%s) net.ipv6.neigh.%s.%s - use net.ipv6.neigh.%s.%s_ms instead\n",</div><div class='ctx'> 			warncomm, func,</div><div class='ctx'> 			dev_name, ctl-&gt;procname,</div><div class='hunk'>@@ -1820,7 +1922,8 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+int ndisc_ifinfo_sysctl_change(const struct ctl_table *ctl, int write, void *buffer,</div><div class='add'>+		size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = ctl-&gt;extra1;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='hunk'>@@ -1845,10 +1948,10 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *bu</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (write &amp;&amp; ret == 0 &amp;&amp; dev &amp;&amp; (idev = in6_dev_get(dev)) != NULL) {</div><div class='del'>-		if (ctl-&gt;data == &amp;NEIGH_VAR(idev-&gt;nd_parms, BASE_REACHABLE_TIME))</div><div class='del'>-			idev-&gt;nd_parms-&gt;reachable_time =</div><div class='del'>-					neigh_rand_reach_time(NEIGH_VAR(idev-&gt;nd_parms, BASE_REACHABLE_TIME));</div><div class='del'>-		idev-&gt;tstamp = jiffies;</div><div class='add'>+		if (ctl-&gt;data == NEIGH_VAR_PTR(idev-&gt;nd_parms, BASE_REACHABLE_TIME))</div><div class='add'>+			neigh_set_reach_time(idev-&gt;nd_parms);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(idev-&gt;tstamp, jiffies);</div><div class='ctx'> 		inet6_ifinfo_notify(RTM_NEWLINK, idev);</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1867,9 +1970,8 @@ static int __net_init ndisc_net_init(struct net *net)</div><div class='ctx'> 	err = inet_ctl_sock_create(&amp;sk, PF_INET6,</div><div class='ctx'> 				   SOCK_RAW, IPPROTO_ICMPV6, net);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		ND_PRINTK(0, err,</div><div class='del'>-			  "NDISC: Failed to initialize the control socket (err %d)\n",</div><div class='del'>-			  err);</div><div class='add'>+		net_err_ratelimited("NDISC: Failed to initialize the control socket (err %d)\n",</div><div class='add'>+				    err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1878,7 +1980,7 @@ static int __net_init ndisc_net_init(struct net *net)</div><div class='ctx'> 	np = inet6_sk(sk);</div><div class='ctx'> 	np-&gt;hop_limit = 255;</div><div class='ctx'> 	/* Do not loopback ndisc messages */</div><div class='del'>-	np-&gt;mc_loop = 0;</div><div class='add'>+	inet6_clear_bit(MC6_LOOP, sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c<br/>index 5ae8e1c51079..46540a5a4331 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter.c</a></div><div class='hunk'>@@ -16,22 +16,36 @@</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/nf_queue.h&gt;</div><div class='add'>+#include &lt;net/netfilter/nf_conntrack_bridge.h&gt;</div><div class='add'>+#include &lt;net/netfilter/ipv6/nf_defrag_ipv6.h&gt;</div><div class='add'>+#include "../bridge/br_private.h"</div><div class='ctx'> </div><div class='del'>-int ip6_route_me_harder(struct net *net, struct sk_buff *skb)</div><div class='add'>+int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='del'>-	struct sock *sk = sk_to_full_sk(skb-&gt;sk);</div><div class='add'>+	struct sock *sk = sk_to_full_sk(sk_partial);</div><div class='add'>+	struct net_device *dev = skb_dst_dev(skb);</div><div class='add'>+	struct flow_keys flkeys;</div><div class='ctx'> 	unsigned int hh_len;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	int strict = (ipv6_addr_type(&amp;iph-&gt;daddr) &amp;</div><div class='add'>+		      (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL));</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='del'>-		.flowi6_oif = sk ? sk-&gt;sk_bound_dev_if : 0,</div><div class='add'>+		.flowi6_l3mdev = l3mdev_master_ifindex(dev),</div><div class='ctx'> 		.flowi6_mark = skb-&gt;mark,</div><div class='ctx'> 		.flowi6_uid = sock_net_uid(net, sk),</div><div class='ctx'> 		.daddr = iph-&gt;daddr,</div><div class='ctx'> 		.saddr = iph-&gt;saddr,</div><div class='add'>+		.flowlabel = ip6_flowinfo(iph),</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_bound_dev_if)</div><div class='add'>+		fl6.flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	else if (strict)</div><div class='add'>+		fl6.flowi6_oif = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	fib6_rules_early_flow_dissect(net, skb, &amp;fl6, &amp;flkeys);</div><div class='ctx'> 	dst = ip6_route_output(net, sk, &amp;fl6);</div><div class='ctx'> 	err = dst-&gt;error;</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -48,8 +62,11 @@ int ip6_route_me_harder(struct net *net, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XFRM</div><div class='ctx'> 	if (!(IP6CB(skb)-&gt;flags &amp; IP6SKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-	    xfrm_decode_session(skb, flowi6_to_flowi(&amp;fl6), AF_INET6) == 0) {</div><div class='del'>-		skb_dst_set(skb, NULL);</div><div class='add'>+	    xfrm_decode_session(net, skb, flowi6_to_flowi(&amp;fl6), AF_INET6) == 0) {</div><div class='add'>+		/* ignore return value from skb_dstref_steal, xfrm_lookup takes</div><div class='add'>+		 * care of dropping the refcnt if needed.</div><div class='add'>+		 */</div><div class='add'>+		skb_dstref_steal(skb);</div><div class='ctx'> 		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&amp;fl6), sk, 0);</div><div class='ctx'> 		if (IS_ERR(dst))</div><div class='ctx'> 			return PTR_ERR(dst);</div><div class='hunk'>@@ -58,7 +75,7 @@ int ip6_route_me_harder(struct net *net, struct sk_buff *skb)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Change in oif may mean change in hh_len. */</div><div class='del'>-	hh_len = skb_dst(skb)-&gt;dev-&gt;hard_header_len;</div><div class='add'>+	hh_len = skb_dst_dev(skb)-&gt;hard_header_len;</div><div class='ctx'> 	if (skb_headroom(skb) &lt; hh_len &amp;&amp;</div><div class='ctx'> 	    pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)),</div><div class='ctx'> 			     0, GFP_ATOMIC))</div><div class='hunk'>@@ -78,13 +95,13 @@ static int nf_ip6_reroute(struct sk_buff *skb,</div><div class='ctx'> 		if (!ipv6_addr_equal(&amp;iph-&gt;daddr, &amp;rt_info-&gt;daddr) ||</div><div class='ctx'> 		    !ipv6_addr_equal(&amp;iph-&gt;saddr, &amp;rt_info-&gt;saddr) ||</div><div class='ctx'> 		    skb-&gt;mark != rt_info-&gt;mark)</div><div class='del'>-			return ip6_route_me_harder(entry-&gt;state.net, skb);</div><div class='add'>+			return ip6_route_me_harder(entry-&gt;state.net, entry-&gt;state.sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nf_ip6_route(struct net *net, struct dst_entry **dst,</div><div class='del'>-			struct flowi *fl, bool strict)</div><div class='add'>+int __nf_ip6_route(struct net *net, struct dst_entry **dst,</div><div class='add'>+		   struct flowi *fl, bool strict)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct ipv6_pinfo fake_pinfo;</div><div class='ctx'> 	static const struct inet_sock fake_sk = {</div><div class='hunk'>@@ -104,13 +121,145 @@ static int nf_ip6_route(struct net *net, struct dst_entry **dst,</div><div class='ctx'> 		*dst = result;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__nf_ip6_route);</div><div class='add'>+</div><div class='add'>+int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,</div><div class='add'>+		    struct nf_bridge_frag_data *data,</div><div class='add'>+		    int (*output)(struct net *, struct sock *sk,</div><div class='add'>+				  const struct nf_bridge_frag_data *data,</div><div class='add'>+				  struct sk_buff *))</div><div class='add'>+{</div><div class='add'>+	int frag_max_size = BR_INPUT_SKB_CB(skb)-&gt;frag_max_size;</div><div class='add'>+	u8 tstamp_type = skb-&gt;tstamp_type;</div><div class='add'>+	ktime_t tstamp = skb-&gt;tstamp;</div><div class='add'>+	struct ip6_frag_state state;</div><div class='add'>+	u8 *prevhdr, nexthdr = 0;</div><div class='add'>+	unsigned int mtu, hlen;</div><div class='add'>+	int hroom, err = 0;</div><div class='add'>+	__be32 frag_id;</div><div class='add'>+</div><div class='add'>+	err = ip6_find_1stfragopt(skb, &amp;prevhdr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto blackhole;</div><div class='add'>+	hlen = err;</div><div class='add'>+	nexthdr = *prevhdr;</div><div class='add'>+</div><div class='add'>+	mtu = skb-&gt;dev-&gt;mtu;</div><div class='add'>+	if (frag_max_size &gt; mtu ||</div><div class='add'>+	    frag_max_size &lt; IPV6_MIN_MTU)</div><div class='add'>+		goto blackhole;</div><div class='add'>+</div><div class='add'>+	mtu = frag_max_size;</div><div class='add'>+	if (mtu &lt; hlen + sizeof(struct frag_hdr) + 8)</div><div class='add'>+		goto blackhole;</div><div class='add'>+	mtu -= hlen + sizeof(struct frag_hdr);</div><div class='add'>+</div><div class='add'>+	frag_id = ipv6_select_ident(net, &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+				    &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    (err = skb_checksum_help(skb)))</div><div class='add'>+		goto blackhole;</div><div class='add'>+</div><div class='add'>+	hroom = LL_RESERVED_SPACE(skb-&gt;dev);</div><div class='add'>+	if (skb_has_frag_list(skb)) {</div><div class='add'>+		unsigned int first_len = skb_pagelen(skb);</div><div class='add'>+		struct ip6_fraglist_iter iter;</div><div class='add'>+		struct sk_buff *frag2;</div><div class='add'>+</div><div class='add'>+		if (first_len - hlen &gt; mtu)</div><div class='add'>+			goto blackhole;</div><div class='add'>+</div><div class='add'>+		if (skb_cloned(skb) ||</div><div class='add'>+		    skb_headroom(skb) &lt; (hroom + sizeof(struct frag_hdr)))</div><div class='add'>+			goto slow_path;</div><div class='add'>+</div><div class='add'>+		skb_walk_frags(skb, frag2) {</div><div class='add'>+			if (frag2-&gt;len &gt; mtu)</div><div class='add'>+				goto blackhole;</div><div class='add'>+</div><div class='add'>+			/* Partially cloned skb? */</div><div class='add'>+			if (skb_shared(frag2) ||</div><div class='add'>+			    skb_headroom(frag2) &lt; (hlen + hroom + sizeof(struct frag_hdr)))</div><div class='add'>+				goto slow_path;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = ip6_fraglist_init(skb, hlen, prevhdr, nexthdr, frag_id,</div><div class='add'>+					&amp;iter);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto blackhole;</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			/* Prepare header of the next frame,</div><div class='add'>+			 * before previous one went down.</div><div class='add'>+			 */</div><div class='add'>+			if (iter.frag)</div><div class='add'>+				ip6_fraglist_prepare(skb, &amp;iter);</div><div class='add'>+</div><div class='add'>+			skb_set_delivery_time(skb, tstamp, tstamp_type);</div><div class='add'>+			err = output(net, sk, data, skb);</div><div class='add'>+			if (err || !iter.frag)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			skb = ip6_fraglist_next(&amp;iter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(iter.tmp_hdr);</div><div class='add'>+		if (!err)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		kfree_skb_list(iter.frag);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+slow_path:</div><div class='add'>+	/* This is a linearized skbuff, the original geometry is lost for us.</div><div class='add'>+	 * This may also be a clone skbuff, we could preserve the geometry for</div><div class='add'>+	 * the copies but probably not worth the effort.</div><div class='add'>+	 */</div><div class='add'>+	ip6_frag_init(skb, hlen, mtu, skb-&gt;dev-&gt;needed_tailroom,</div><div class='add'>+		      LL_RESERVED_SPACE(skb-&gt;dev), prevhdr, nexthdr, frag_id,</div><div class='add'>+		      &amp;state);</div><div class='add'>+</div><div class='add'>+	while (state.left &gt; 0) {</div><div class='add'>+		struct sk_buff *skb2;</div><div class='add'>+</div><div class='add'>+		skb2 = ip6_frag_next(skb, &amp;state);</div><div class='add'>+		if (IS_ERR(skb2)) {</div><div class='add'>+			err = PTR_ERR(skb2);</div><div class='add'>+			goto blackhole;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_set_delivery_time(skb2, tstamp, tstamp_type);</div><div class='add'>+		err = output(net, sk, data, skb2);</div><div class='add'>+		if (err)</div><div class='add'>+			goto blackhole;</div><div class='add'>+	}</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+blackhole:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(br_ip6_fragment);</div><div class='ctx'> </div><div class='ctx'> static const struct nf_ipv6_ops ipv6ops = {</div><div class='add'>+#if IS_MODULE(CONFIG_IPV6)</div><div class='ctx'> 	.chk_addr		= ipv6_chk_addr,</div><div class='del'>-	.route_input    	= ip6_route_input,</div><div class='add'>+	.route_me_harder	= ip6_route_me_harder,</div><div class='add'>+	.dev_get_saddr		= ipv6_dev_get_saddr,</div><div class='add'>+	.route			= __nf_ip6_route,</div><div class='add'>+#if IS_ENABLED(CONFIG_SYN_COOKIES)</div><div class='add'>+	.cookie_init_sequence	= __cookie_v6_init_sequence,</div><div class='add'>+	.cookie_v6_check	= __cookie_v6_check,</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	.route_input		= ip6_route_input,</div><div class='ctx'> 	.fragment		= ip6_fragment,</div><div class='del'>-	.route			= nf_ip6_route,</div><div class='ctx'> 	.reroute		= nf_ip6_reroute,</div><div class='add'>+#if IS_MODULE(CONFIG_IPV6)</div><div class='add'>+	.br_fragment		= br_ip6_fragment,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init ipv6_netfilter_init(void)</div><div class='head'>diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig<br/>index 339d0762b027..81daf82ddc2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # IP netfilter configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,6 +6,17 @@</div><div class='ctx'> menu "IPv6: Netfilter Configuration"</div><div class='ctx'> 	depends on INET &amp;&amp; IPV6 &amp;&amp; NETFILTER</div><div class='ctx'> </div><div class='add'>+# old sockopt interface and eval loop</div><div class='add'>+config IP6_NF_IPTABLES_LEGACY</div><div class='add'>+	tristate "Legacy IP6 tables support"</div><div class='add'>+	depends on INET &amp;&amp; IPV6 &amp;&amp; NETFILTER_XTABLES_LEGACY</div><div class='add'>+	depends on NETFILTER_XTABLES</div><div class='add'>+	default	m if NETFILTER_XTABLES_LEGACY</div><div class='add'>+	help</div><div class='add'>+	  ip6tables is a legacy packet classifier.</div><div class='add'>+	  This is not needed if you are using iptables over nftables</div><div class='add'>+	  (iptables-nft).</div><div class='add'>+</div><div class='ctx'> config NF_SOCKET_IPV6</div><div class='ctx'> 	tristate "IPv6 socket lookup support"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -23,42 +35,6 @@ config NF_TABLES_IPV6</div><div class='ctx'> </div><div class='ctx'> if NF_TABLES_IPV6</div><div class='ctx'> </div><div class='del'>-config NFT_CHAIN_ROUTE_IPV6</div><div class='del'>-	tristate "IPv6 nf_tables route chain support"</div><div class='del'>-	help</div><div class='del'>-	  This option enables the "route" chain for IPv6 in nf_tables. This</div><div class='del'>-	  chain type is used to force packet re-routing after mangling header</div><div class='del'>-	  fields such as the source, destination, flowlabel, hop-limit and</div><div class='del'>-	  the packet mark.</div><div class='del'>-</div><div class='del'>-if NF_NAT_IPV6</div><div class='del'>-</div><div class='del'>-config NFT_CHAIN_NAT_IPV6</div><div class='del'>-	tristate "IPv6 nf_tables nat chain support"</div><div class='del'>-	help</div><div class='del'>-	  This option enables the "nat" chain for IPv6 in nf_tables. This</div><div class='del'>-	  chain type is used to perform Network Address Translation (NAT)</div><div class='del'>-	  packet transformations such as the source, destination address and</div><div class='del'>-	  source and destination ports.</div><div class='del'>-</div><div class='del'>-config NFT_MASQ_IPV6</div><div class='del'>-	tristate "IPv6 masquerade support for nf_tables"</div><div class='del'>-	depends on NFT_MASQ</div><div class='del'>-	select NF_NAT_MASQUERADE_IPV6</div><div class='del'>-	help</div><div class='del'>-	  This is the expression that provides IPv4 masquerading support for</div><div class='del'>-	  nf_tables.</div><div class='del'>-</div><div class='del'>-config NFT_REDIR_IPV6</div><div class='del'>-	tristate "IPv6 redirect support for nf_tables"</div><div class='del'>-	depends on NFT_REDIR</div><div class='del'>-	select NF_NAT_REDIRECT</div><div class='del'>-	help</div><div class='del'>-	  This is the expression that provides IPv4 redirect support for</div><div class='del'>-	  nf_tables.</div><div class='del'>-</div><div class='del'>-endif # NF_NAT_IPV6</div><div class='del'>-</div><div class='ctx'> config NFT_REJECT_IPV6</div><div class='ctx'> 	select NF_REJECT_IPV6</div><div class='ctx'> 	default NFT_REJECT</div><div class='hunk'>@@ -82,14 +58,6 @@ config NFT_FIB_IPV6</div><div class='ctx'> endif # NF_TABLES_IPV6</div><div class='ctx'> endif # NF_TABLES</div><div class='ctx'> </div><div class='del'>-config NF_FLOW_TABLE_IPV6</div><div class='del'>-	tristate "Netfilter flow table IPv6 module"</div><div class='del'>-	depends on NF_FLOW_TABLE</div><div class='del'>-	help</div><div class='del'>-	  This option adds the flow table IPv6 support.</div><div class='del'>-</div><div class='del'>-	  To compile it as a module, choose M here.</div><div class='del'>-</div><div class='ctx'> config NF_DUP_IPV6</div><div class='ctx'> 	tristate "Netfilter IPv6 packet duplication to alternate destination"</div><div class='ctx'> 	depends on !NF_CONNTRACK || NF_CONNTRACK</div><div class='hunk'>@@ -104,24 +72,10 @@ config NF_REJECT_IPV6</div><div class='ctx'> config NF_LOG_IPV6</div><div class='ctx'> 	tristate "IPv6 packet logging"</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='del'>-	select NF_LOG_COMMON</div><div class='del'>-</div><div class='del'>-config NF_NAT_IPV6</div><div class='del'>-	tristate "IPv6 NAT"</div><div class='del'>-	depends on NF_CONNTRACK</div><div class='del'>-	depends on NETFILTER_ADVANCED</div><div class='del'>-	select NF_NAT</div><div class='add'>+	select NF_LOG_SYSLOG</div><div class='ctx'> 	help</div><div class='del'>-	  The IPv6 NAT option allows masquerading, port forwarding and other</div><div class='del'>-	  forms of full Network Address Port Translation. This can be</div><div class='del'>-	  controlled by iptables or nft.</div><div class='del'>-</div><div class='del'>-if NF_NAT_IPV6</div><div class='del'>-</div><div class='del'>-config NF_NAT_MASQUERADE_IPV6</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-endif # NF_NAT_IPV6</div><div class='add'>+	  This is a backwards-compat option for the user's convenience</div><div class='add'>+	  (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_IPTABLES</div><div class='ctx'> 	tristate "IP6 tables support (required for filtering)"</div><div class='hunk'>@@ -179,10 +133,10 @@ config IP6_NF_MATCH_HL</div><div class='ctx'> 	tristate '"hl" hoplimit match support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='ctx'> 	select NETFILTER_XT_MATCH_HL</div><div class='del'>-	---help---</div><div class='del'>-	This is a backwards-compat option for the user's convenience</div><div class='del'>-	(e.g. when running oldconfig). It selects</div><div class='del'>-	CONFIG_NETFILTER_XT_MATCH_HL.</div><div class='add'>+	help</div><div class='add'>+	  This is a backwards-compat option for the user's convenience</div><div class='add'>+	  (e.g. when running oldconfig). It selects</div><div class='add'>+	  CONFIG_NETFILTER_XT_MATCH_HL.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_MATCH_IPV6HEADER</div><div class='ctx'> 	tristate '"ipv6header" IPv6 Extension Headers Match'</div><div class='hunk'>@@ -204,8 +158,8 @@ config IP6_NF_MATCH_MH</div><div class='ctx'> config IP6_NF_MATCH_RPFILTER</div><div class='ctx'> 	tristate '"rpfilter" reverse path filter match support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='del'>-	depends on IP6_NF_MANGLE || IP6_NF_RAW</div><div class='del'>-	---help---</div><div class='add'>+	depends on IP6_NF_MANGLE || IP6_NF_RAW || NFT_COMPAT</div><div class='add'>+	help</div><div class='ctx'> 	  This option allows you to match packets whose replies would</div><div class='ctx'> 	  go out via the interface the packet came in.</div><div class='ctx'> </div><div class='hunk'>@@ -222,27 +176,29 @@ config IP6_NF_MATCH_RT</div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_MATCH_SRH</div><div class='del'>-        tristate '"srh" Segment Routing header match support'</div><div class='del'>-        depends on NETFILTER_ADVANCED</div><div class='del'>-        help</div><div class='del'>-          srh matching allows you to match packets based on the segment</div><div class='add'>+	tristate '"srh" Segment Routing header match support'</div><div class='add'>+	depends on NETFILTER_ADVANCED</div><div class='add'>+	help</div><div class='add'>+	  srh matching allows you to match packets based on the segment</div><div class='ctx'> 	  routing header of the packet.</div><div class='ctx'> </div><div class='del'>-          To compile it as a module, choose M here.  If unsure, say N.</div><div class='add'>+	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> # The targets</div><div class='ctx'> config IP6_NF_TARGET_HL</div><div class='ctx'> 	tristate '"HL" hoplimit target support'</div><div class='ctx'> 	depends on NETFILTER_ADVANCED &amp;&amp; IP6_NF_MANGLE</div><div class='ctx'> 	select NETFILTER_XT_TARGET_HL</div><div class='del'>-	---help---</div><div class='del'>-	This is a backwards-compatible option for the user's convenience</div><div class='del'>-	(e.g. when running oldconfig). It selects</div><div class='del'>-	CONFIG_NETFILTER_XT_TARGET_HL.</div><div class='add'>+	help</div><div class='add'>+	  This is a backwards-compatible option for the user's convenience</div><div class='add'>+	  (e.g. when running oldconfig). It selects</div><div class='add'>+	  CONFIG_NETFILTER_XT_TARGET_HL.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_FILTER</div><div class='ctx'> 	tristate "Packet filtering"</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='add'>+	default m if NETFILTER_ADVANCED=n || IP6_NF_IPTABLES_LEGACY</div><div class='add'>+	depends on IP6_NF_IPTABLES_LEGACY</div><div class='add'>+	tristate</div><div class='ctx'> 	help</div><div class='ctx'> 	  Packet filtering defines a table `filter', which has a series of</div><div class='ctx'> 	  rules for simple packet filtering at local input, forwarding and</div><div class='hunk'>@@ -252,7 +208,7 @@ config IP6_NF_FILTER</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_TARGET_REJECT</div><div class='ctx'> 	tristate "REJECT target support"</div><div class='del'>-	depends on IP6_NF_FILTER</div><div class='add'>+	depends on IP6_NF_FILTER || NFT_COMPAT</div><div class='ctx'> 	select NF_REJECT_IPV6</div><div class='ctx'> 	default m if NETFILTER_ADVANCED=n</div><div class='ctx'> 	help</div><div class='hunk'>@@ -277,7 +233,8 @@ config IP6_NF_TARGET_SYNPROXY</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_MANGLE</div><div class='ctx'> 	tristate "Packet mangling"</div><div class='del'>-	default m if NETFILTER_ADVANCED=n</div><div class='add'>+	default m if NETFILTER_ADVANCED=n || IP6_NF_IPTABLES_LEGACY</div><div class='add'>+	depends on IP6_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds a `mangle' table to iptables: see the man page for</div><div class='ctx'> 	  iptables(8).  This table is used for various packet alterations</div><div class='hunk'>@@ -287,31 +244,33 @@ config IP6_NF_MANGLE</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_RAW</div><div class='ctx'> 	tristate  'raw table support (required for TRACE)'</div><div class='add'>+	depends on IP6_NF_IPTABLES_LEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds a `raw' table to ip6tables. This table is the very</div><div class='ctx'> 	  first in the netfilter framework and hooks in at the PREROUTING</div><div class='ctx'> 	  and OUTPUT chains.</div><div class='ctx'> </div><div class='ctx'> 	  If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.  If unsure, say `N'.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.  If unsure, say `N'.</div><div class='ctx'> </div><div class='ctx'> # security table for MAC policy</div><div class='ctx'> config IP6_NF_SECURITY</div><div class='del'>-       tristate "Security table"</div><div class='del'>-       depends on SECURITY</div><div class='del'>-       depends on NETFILTER_ADVANCED</div><div class='del'>-       help</div><div class='del'>-         This option adds a `security' table to iptables, for use</div><div class='del'>-         with Mandatory Access Control (MAC) policy.</div><div class='add'>+	tristate "Security table"</div><div class='add'>+	depends on SECURITY</div><div class='add'>+	depends on NETFILTER_ADVANCED</div><div class='add'>+	depends on IP6_NF_IPTABLES_LEGACY</div><div class='add'>+	help</div><div class='add'>+	  This option adds a `security' table to iptables, for use</div><div class='add'>+	  with Mandatory Access Control (MAC) policy.</div><div class='ctx'> </div><div class='del'>-         If unsure, say N.</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_NAT</div><div class='ctx'> 	tristate "ip6tables NAT support"</div><div class='ctx'> 	depends on NF_CONNTRACK</div><div class='ctx'> 	depends on NETFILTER_ADVANCED</div><div class='add'>+	depends on IP6_NF_IPTABLES_LEGACY</div><div class='ctx'> 	select NF_NAT</div><div class='del'>-	select NF_NAT_IPV6</div><div class='ctx'> 	select NETFILTER_XT_NAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables the `nat' table in ip6tables. This allows masquerading,</div><div class='hunk'>@@ -320,30 +279,23 @@ config IP6_NF_NAT</div><div class='ctx'> </div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-if IP6_NF_NAT</div><div class='del'>-</div><div class='ctx'> config IP6_NF_TARGET_MASQUERADE</div><div class='ctx'> 	tristate "MASQUERADE target support"</div><div class='del'>-	select NF_NAT_MASQUERADE_IPV6</div><div class='add'>+	select NETFILTER_XT_TARGET_MASQUERADE</div><div class='add'>+	depends on IP6_NF_NAT</div><div class='ctx'> 	help</div><div class='del'>-	  Masquerading is a special case of NAT: all outgoing connections are</div><div class='del'>-	  changed to seem to come from a particular interface's address, and</div><div class='del'>-	  if the interface goes down, those connections are lost.  This is</div><div class='del'>-	  only useful for dialup accounts with dynamic IP address (ie. your IP</div><div class='del'>-	  address will be different on next dialup).</div><div class='del'>-</div><div class='del'>-	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='add'>+	  This is a backwards-compat option for the user's convenience</div><div class='add'>+	  (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE.</div><div class='ctx'> </div><div class='ctx'> config IP6_NF_TARGET_NPT</div><div class='ctx'> 	tristate "NPT (Network Prefix translation) target support"</div><div class='add'>+	depends on IP6_NF_NAT || NFT_COMPAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds the `SNPT' and `DNPT' target, which perform</div><div class='ctx'> 	  stateless IPv6-to-IPv6 Network Prefix Translation per RFC 6296.</div><div class='ctx'> </div><div class='ctx'> 	  To compile it as a module, choose M here.  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-endif # IP6_NF_NAT</div><div class='del'>-</div><div class='ctx'> endif # IP6_NF_IPTABLES</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile<br/>index 200c0c235565..66ce6fa5b2f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/Makefile</a></div><div class='hunk'>@@ -4,17 +4,13 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # Link order matters here.</div><div class='del'>-obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o</div><div class='add'>+obj-$(CONFIG_IP6_NF_IPTABLES_LEGACY) += ip6_tables.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_NAT) += ip6table_nat.o</div><div class='ctx'> </div><div class='del'>-nf_nat_ipv6-y		:= nf_nat_l3proto_ipv6.o nf_nat_proto_icmpv6.o</div><div class='del'>-nf_nat_ipv6-$(CONFIG_NF_NAT_MASQUERADE_IPV6) += nf_nat_masquerade_ipv6.o</div><div class='del'>-obj-$(CONFIG_NF_NAT_IPV6) += nf_nat_ipv6.o</div><div class='del'>-</div><div class='ctx'> # defrag</div><div class='ctx'> nf_defrag_ipv6-y := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o</div><div class='ctx'> obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o</div><div class='hunk'>@@ -22,26 +18,16 @@ obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o</div><div class='ctx'> obj-$(CONFIG_NF_SOCKET_IPV6) += nf_socket_ipv6.o</div><div class='ctx'> obj-$(CONFIG_NF_TPROXY_IPV6) += nf_tproxy_ipv6.o</div><div class='ctx'> </div><div class='del'>-# logging</div><div class='del'>-obj-$(CONFIG_NF_LOG_IPV6) += nf_log_ipv6.o</div><div class='del'>-</div><div class='ctx'> # reject</div><div class='ctx'> obj-$(CONFIG_NF_REJECT_IPV6) += nf_reject_ipv6.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NF_DUP_IPV6) += nf_dup_ipv6.o</div><div class='ctx'> </div><div class='ctx'> # nf_tables</div><div class='del'>-obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV6) += nft_chain_route_ipv6.o</div><div class='del'>-obj-$(CONFIG_NFT_CHAIN_NAT_IPV6) += nft_chain_nat_ipv6.o</div><div class='ctx'> obj-$(CONFIG_NFT_REJECT_IPV6) += nft_reject_ipv6.o</div><div class='del'>-obj-$(CONFIG_NFT_MASQ_IPV6) += nft_masq_ipv6.o</div><div class='del'>-obj-$(CONFIG_NFT_REDIR_IPV6) += nft_redir_ipv6.o</div><div class='ctx'> obj-$(CONFIG_NFT_DUP_IPV6) += nft_dup_ipv6.o</div><div class='ctx'> obj-$(CONFIG_NFT_FIB_IPV6) += nft_fib_ipv6.o</div><div class='ctx'> </div><div class='del'>-# flow table support</div><div class='del'>-obj-$(CONFIG_NF_FLOW_TABLE_IPV6) += nf_flow_table_ipv6.o</div><div class='del'>-</div><div class='ctx'> # matches</div><div class='ctx'> obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o</div><div class='hunk'>@@ -54,7 +40,6 @@ obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_MATCH_SRH) += ip6t_srh.o</div><div class='ctx'> </div><div class='ctx'> # targets</div><div class='del'>-obj-$(CONFIG_IP6_NF_TARGET_MASQUERADE) += ip6t_MASQUERADE.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_TARGET_NPT) += ip6t_NPT.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o</div><div class='ctx'> obj-$(CONFIG_IP6_NF_TARGET_SYNPROXY) += ip6t_SYNPROXY.o</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c<br/>index daf2e9e9193d..d585ac3c1113 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6_tables.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6_tables.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6_tables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6_tables.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Packet matching code.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2005 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='ctx'>  * Copyright (c) 2006-2010 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -21,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/poison.h&gt;</div><div class='del'>-#include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/compat.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -38,7 +34,6 @@</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Netfilter Core Team &lt;coreteam@netfilter.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IPv6 packet filter");</div><div class='del'>-MODULE_ALIAS("ip6t_icmp6");</div><div class='ctx'> </div><div class='ctx'> void *ip6t_alloc_initial_table(const struct xt_table *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,7 +49,7 @@ ip6_packet_match(const struct sk_buff *skb,</div><div class='ctx'> 		 const char *outdev,</div><div class='ctx'> 		 const struct ip6t_ip6 *ip6info,</div><div class='ctx'> 		 unsigned int *protoff,</div><div class='del'>-		 int *fragoff, bool *hotdrop)</div><div class='add'>+		 u16 *fragoff, bool *hotdrop)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> 	const struct ipv6hdr *ipv6 = ipv6_hdr(skb);</div><div class='hunk'>@@ -250,10 +245,10 @@ ip6t_next_entry(const struct ip6t_entry *entry)</div><div class='ctx'> </div><div class='ctx'> /* Returns one of the generic firewall policies, like NF_ACCEPT. */</div><div class='ctx'> unsigned int</div><div class='del'>-ip6t_do_table(struct sk_buff *skb,</div><div class='del'>-	      const struct nf_hook_state *state,</div><div class='del'>-	      struct xt_table *table)</div><div class='add'>+ip6t_do_table(void *priv, struct sk_buff *skb,</div><div class='add'>+	      const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='add'>+	const struct xt_table *table = priv;</div><div class='ctx'> 	unsigned int hook = state-&gt;hook;</div><div class='ctx'> 	static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));</div><div class='ctx'> 	/* Initializing verdict to NF_DROP keeps gcc happy. */</div><div class='hunk'>@@ -276,6 +271,7 @@ ip6t_do_table(struct sk_buff *skb,</div><div class='ctx'> 	 * things we don't know, ie. tcp syn flag or ports).  If the</div><div class='ctx'> 	 * rule is also a fragment-specific rule, non-fragments won't</div><div class='ctx'> 	 * match it. */</div><div class='add'>+	acpar.fragoff = 0;</div><div class='ctx'> 	acpar.hotdrop = false;</div><div class='ctx'> 	acpar.state   = state;</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +292,7 @@ ip6t_do_table(struct sk_buff *skb,</div><div class='ctx'> 	 * but it is no problem since absolute verdict is issued by these.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (static_key_false(&amp;xt_tee_enabled))</div><div class='del'>-		jumpstack += private-&gt;stacksize * __this_cpu_read(nf_skb_duplicated);</div><div class='add'>+		jumpstack += private-&gt;stacksize * current-&gt;in_nf_duplicate;</div><div class='ctx'> </div><div class='ctx'> 	e = get_entry(table_base, private-&gt;hook_entry[hook]);</div><div class='ctx'> </div><div class='hunk'>@@ -887,7 +883,7 @@ copy_entries_to_user(unsigned int total_size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> static void compat_standard_from_user(void *dst, const void *src)</div><div class='ctx'> {</div><div class='ctx'> 	int v = *(compat_int_t *)src;</div><div class='hunk'>@@ -963,8 +959,7 @@ static int compat_table_info(const struct xt_table_info *info,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int get_info(struct net *net, void __user *user,</div><div class='del'>-		    const int *len, int compat)</div><div class='add'>+static int get_info(struct net *net, void __user *user, const int *len)</div><div class='ctx'> {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	struct xt_table *t;</div><div class='hunk'>@@ -977,18 +972,18 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	name[XT_TABLE_MAXNAMELEN-1] = '\0';</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_lock(AF_INET6);</div><div class='ctx'> #endif</div><div class='ctx'> 	t = xt_request_find_table_lock(net, AF_INET6, name);</div><div class='ctx'> 	if (!IS_ERR(t)) {</div><div class='ctx'> 		struct ip6t_getinfo info;</div><div class='ctx'> 		const struct xt_table_info *private = t-&gt;private;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		struct xt_table_info tmp;</div><div class='ctx'> </div><div class='del'>-		if (compat) {</div><div class='add'>+		if (in_compat_syscall()) {</div><div class='ctx'> 			ret = compat_table_info(private, &amp;tmp);</div><div class='ctx'> 			xt_compat_flush_offsets(AF_INET6);</div><div class='ctx'> 			private = &amp;tmp;</div><div class='hunk'>@@ -1013,8 +1008,8 @@ static int get_info(struct net *net, void __user *user,</div><div class='ctx'> 		module_put(t-&gt;me);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = PTR_ERR(t);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	if (compat)</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+	if (in_compat_syscall())</div><div class='ctx'> 		xt_compat_unlock(AF_INET6);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1065,7 +1060,6 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> 	struct xt_counters *counters;</div><div class='ctx'> 	struct ip6t_entry *iter;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	counters = xt_counters_alloc(num_counters);</div><div class='ctx'> 	if (!counters) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1111,7 +1105,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> 		net_warn_ratelimited("ip6tables: counters copy to user failed while replacing table\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	vfree(counters);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>  put_module:</div><div class='ctx'> 	module_put(t-&gt;me);</div><div class='hunk'>@@ -1123,7 +1117,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='add'>+do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ip6t_replace tmp;</div><div class='hunk'>@@ -1131,7 +1125,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct ip6t_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -1139,6 +1135,8 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1147,8 +1145,8 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),</div><div class='del'>-			   tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1172,8 +1170,7 @@ do_replace(struct net *net, const void __user *user, unsigned int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_add_counters(struct net *net, const void __user *user, unsigned int len,</div><div class='del'>-		int compat)</div><div class='add'>+do_add_counters(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct xt_counters_info tmp;</div><div class='hunk'>@@ -1184,7 +1181,7 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len,</div><div class='ctx'> 	struct ip6t_entry *iter;</div><div class='ctx'> 	unsigned int addend;</div><div class='ctx'> </div><div class='del'>-	paddc = xt_copy_counters_from_user(user, len, &amp;tmp, compat);</div><div class='add'>+	paddc = xt_copy_counters(arg, len, &amp;tmp);</div><div class='ctx'> 	if (IS_ERR(paddc))</div><div class='ctx'> 		return PTR_ERR(paddc);</div><div class='ctx'> 	t = xt_find_table_lock(net, AF_INET6, tmp.name);</div><div class='hunk'>@@ -1220,7 +1217,7 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> struct compat_ip6t_replace {</div><div class='ctx'> 	char			name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	u32			valid_hooks;</div><div class='hunk'>@@ -1230,7 +1227,7 @@ struct compat_ip6t_replace {</div><div class='ctx'> 	u32			underflow[NF_INET_NUMHOOKS];</div><div class='ctx'> 	u32			num_counters;</div><div class='ctx'> 	compat_uptr_t		counters;	/* struct xt_counters * */</div><div class='del'>-	struct compat_ip6t_entry entries[0];</div><div class='add'>+	struct compat_ip6t_entry entries[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1448,6 +1445,8 @@ translate_compat_table(struct net *net,</div><div class='ctx'> 	if (!newinfo)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	memset(newinfo-&gt;entries, 0, size);</div><div class='add'>+</div><div class='ctx'> 	newinfo-&gt;number = compatr-&gt;num_entries;</div><div class='ctx'> 	for (i = 0; i &lt; NF_INET_NUMHOOKS; i++) {</div><div class='ctx'> 		newinfo-&gt;hook_entry[i] = compatr-&gt;hook_entry[i];</div><div class='hunk'>@@ -1498,7 +1497,7 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='add'>+compat_do_replace(struct net *net, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct compat_ip6t_replace tmp;</div><div class='hunk'>@@ -1506,7 +1505,9 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='ctx'> 	struct ip6t_entry *iter;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp, user, sizeof(tmp)) != 0)</div><div class='add'>+	if (len &lt; sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;tmp, arg, sizeof(tmp)) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* overflow check */</div><div class='hunk'>@@ -1514,6 +1515,8 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (tmp.num_counters == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if ((u64)len &lt; (u64)tmp.size + sizeof(tmp))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tmp.name[sizeof(tmp.name)-1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1522,8 +1525,8 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	loc_cpu_entry = newinfo-&gt;entries;</div><div class='del'>-	if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),</div><div class='del'>-			   tmp.size) != 0) {</div><div class='add'>+	if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),</div><div class='add'>+			tmp.size) != 0) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto free_newinfo;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1546,35 +1549,10 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-compat_do_ip6t_set_ctl(struct sock *sk, int cmd, void __user *user,</div><div class='del'>-		       unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case IP6T_SO_SET_REPLACE:</div><div class='del'>-		ret = compat_do_replace(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IP6T_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct compat_ip6t_get_entries {</div><div class='ctx'> 	char name[XT_TABLE_MAXNAMELEN];</div><div class='ctx'> 	compat_uint_t size;</div><div class='del'>-	struct compat_ip6t_entry entrytable[0];</div><div class='add'>+	struct compat_ip6t_entry entrytable[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1646,33 +1624,10 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr,</div><div class='ctx'> 	xt_compat_unlock(AF_INET6);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int do_ip6t_get_ctl(struct sock *, int, void __user *, int *);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!ns_capable(sock_net(sk)-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case IP6T_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 1);</div><div class='del'>-		break;</div><div class='del'>-	case IP6T_SO_GET_ENTRIES:</div><div class='del'>-		ret = compat_get_entries(sock_net(sk), user, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = do_ip6t_get_ctl(sk, cmd, user, len);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-do_ip6t_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)</div><div class='add'>+do_ip6t_set_ctl(struct sock *sk, int cmd, sockptr_t arg, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1681,11 +1636,16 @@ do_ip6t_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case IP6T_SO_SET_REPLACE:</div><div class='del'>-		ret = do_replace(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_do_replace(sock_net(sk), arg, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = do_replace(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IP6T_SO_SET_ADD_COUNTERS:</div><div class='del'>-		ret = do_add_counters(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = do_add_counters(sock_net(sk), arg, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1705,11 +1665,16 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case IP6T_SO_GET_INFO:</div><div class='del'>-		ret = get_info(sock_net(sk), user, len, 0);</div><div class='add'>+		ret = get_info(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IP6T_SO_GET_ENTRIES:</div><div class='del'>-		ret = get_entries(sock_net(sk), user, len);</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='add'>+		if (in_compat_syscall())</div><div class='add'>+			ret = compat_get_entries(sock_net(sk), user, len);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			ret = get_entries(sock_net(sk), user, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IP6T_SO_GET_REVISION_MATCH:</div><div class='hunk'>@@ -1766,10 +1731,11 @@ static void __ip6t_unregister_table(struct net *net, struct xt_table *table)</div><div class='ctx'> </div><div class='ctx'> int ip6t_register_table(struct net *net, const struct xt_table *table,</div><div class='ctx'> 			const struct ip6t_replace *repl,</div><div class='del'>-			const struct nf_hook_ops *ops,</div><div class='del'>-			struct xt_table **res)</div><div class='add'>+			const struct nf_hook_ops *template_ops)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	unsigned int num_ops;</div><div class='add'>+	int ret, i;</div><div class='ctx'> 	struct xt_table_info *newinfo;</div><div class='ctx'> 	struct xt_table_info bootstrap = {0};</div><div class='ctx'> 	void *loc_cpu_entry;</div><div class='hunk'>@@ -1783,85 +1749,66 @@ int ip6t_register_table(struct net *net, const struct xt_table *table,</div><div class='ctx'> 	memcpy(loc_cpu_entry, repl-&gt;entries, repl-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	ret = translate_table(net, newinfo, loc_cpu_entry, repl);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	new_table = xt_register_table(net, table, &amp;bootstrap, newinfo);</div><div class='ctx'> 	if (IS_ERR(new_table)) {</div><div class='del'>-		ret = PTR_ERR(new_table);</div><div class='del'>-		goto out_free;</div><div class='add'>+		struct ip6t_entry *iter;</div><div class='add'>+</div><div class='add'>+		xt_entry_foreach(iter, loc_cpu_entry, newinfo-&gt;size)</div><div class='add'>+			cleanup_entry(iter, net);</div><div class='add'>+		xt_free_table_info(newinfo);</div><div class='add'>+		return PTR_ERR(new_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set res now, will see skbs right after nf_register_net_hooks */</div><div class='del'>-	WRITE_ONCE(*res, new_table);</div><div class='del'>-	if (!ops)</div><div class='add'>+	if (!template_ops)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = nf_register_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		__ip6t_unregister_table(net, new_table);</div><div class='del'>-		*res = NULL;</div><div class='add'>+	num_ops = hweight32(table-&gt;valid_hooks);</div><div class='add'>+	if (num_ops == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops = kmemdup_array(template_ops, num_ops, sizeof(*ops), GFP_KERNEL);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; num_ops; i++)</div><div class='add'>+		ops[i].priv = new_table;</div><div class='add'>+</div><div class='add'>+	new_table-&gt;ops = ops;</div><div class='add'>+</div><div class='add'>+	ret = nf_register_net_hooks(net, ops, num_ops);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	xt_free_table_info(newinfo);</div><div class='add'>+	__ip6t_unregister_table(net, new_table);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ip6t_unregister_table(struct net *net, struct xt_table *table,</div><div class='del'>-			   const struct nf_hook_ops *ops)</div><div class='add'>+void ip6t_unregister_table_pre_exit(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	if (ops)</div><div class='del'>-		nf_unregister_net_hooks(net, ops, hweight32(table-&gt;valid_hooks));</div><div class='del'>-	__ip6t_unregister_table(net, table);</div><div class='del'>-}</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_IPV6, name);</div><div class='ctx'> </div><div class='del'>-/* Returns 1 if the type and code is matched by the range, 0 otherwise */</div><div class='del'>-static inline bool</div><div class='del'>-icmp6_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,</div><div class='del'>-		     u_int8_t type, u_int8_t code,</div><div class='del'>-		     bool invert)</div><div class='del'>-{</div><div class='del'>-	return (type == test_type &amp;&amp; code &gt;= min_code &amp;&amp; code &lt;= max_code)</div><div class='del'>-		^ invert;</div><div class='add'>+	if (table)</div><div class='add'>+		nf_unregister_net_hooks(net, table-&gt;ops, hweight32(table-&gt;valid_hooks));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-icmp6_match(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='add'>+void ip6t_unregister_table_exit(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='del'>-	const struct icmp6hdr *ic;</div><div class='del'>-	struct icmp6hdr _icmph;</div><div class='del'>-	const struct ip6t_icmp *icmpinfo = par-&gt;matchinfo;</div><div class='del'>-</div><div class='del'>-	/* Must not be a fragment. */</div><div class='del'>-	if (par-&gt;fragoff != 0)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	ic = skb_header_pointer(skb, par-&gt;thoff, sizeof(_icmph), &amp;_icmph);</div><div class='del'>-	if (ic == NULL) {</div><div class='del'>-		/* We've been asked to examine this packet, and we</div><div class='del'>-		 * can't.  Hence, no choice but to drop.</div><div class='del'>-		 */</div><div class='del'>-		par-&gt;hotdrop = true;</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='add'>+	struct xt_table *table = xt_find_table(net, NFPROTO_IPV6, name);</div><div class='ctx'> </div><div class='del'>-	return icmp6_type_code_match(icmpinfo-&gt;type,</div><div class='del'>-				     icmpinfo-&gt;code[0],</div><div class='del'>-				     icmpinfo-&gt;code[1],</div><div class='del'>-				     ic-&gt;icmp6_type, ic-&gt;icmp6_code,</div><div class='del'>-				     !!(icmpinfo-&gt;invflags&amp;IP6T_ICMP_INV));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when user tries to insert an entry of this type. */</div><div class='del'>-static int icmp6_checkentry(const struct xt_mtchk_param *par)</div><div class='del'>-{</div><div class='del'>-	const struct ip6t_icmp *icmpinfo = par-&gt;matchinfo;</div><div class='del'>-</div><div class='del'>-	/* Must specify no unknown invflags */</div><div class='del'>-	return (icmpinfo-&gt;invflags &amp; ~IP6T_ICMP_INV) ? -EINVAL : 0;</div><div class='add'>+	if (table)</div><div class='add'>+		__ip6t_unregister_table(net, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The built-in targets: standard (NULL) and error. */</div><div class='hunk'>@@ -1870,7 +1817,7 @@ static struct xt_target ip6t_builtin_tg[] __read_mostly = {</div><div class='ctx'> 		.name             = XT_STANDARD_TARGET,</div><div class='ctx'> 		.targetsize       = sizeof(int),</div><div class='ctx'> 		.family           = NFPROTO_IPV6,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_NETFILTER_XTABLES_COMPAT</div><div class='ctx'> 		.compatsize       = sizeof(compat_int_t),</div><div class='ctx'> 		.compat_from_user = compat_standard_from_user,</div><div class='ctx'> 		.compat_to_user   = compat_standard_to_user,</div><div class='hunk'>@@ -1889,30 +1836,12 @@ static struct nf_sockopt_ops ip6t_sockopts = {</div><div class='ctx'> 	.set_optmin	= IP6T_BASE_CTL,</div><div class='ctx'> 	.set_optmax	= IP6T_SO_SET_MAX+1,</div><div class='ctx'> 	.set		= do_ip6t_set_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_set	= compat_do_ip6t_set_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.get_optmin	= IP6T_BASE_CTL,</div><div class='ctx'> 	.get_optmax	= IP6T_SO_GET_MAX+1,</div><div class='ctx'> 	.get		= do_ip6t_get_ctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_get	= compat_do_ip6t_get_ctl,</div><div class='del'>-#endif</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct xt_match ip6t_builtin_mt[] __read_mostly = {</div><div class='del'>-	{</div><div class='del'>-		.name       = "icmp6",</div><div class='del'>-		.match      = icmp6_match,</div><div class='del'>-		.matchsize  = sizeof(struct ip6t_icmp),</div><div class='del'>-		.checkentry = icmp6_checkentry,</div><div class='del'>-		.proto      = IPPROTO_ICMPV6,</div><div class='del'>-		.family     = NFPROTO_IPV6,</div><div class='del'>-		.me	    = THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __net_init ip6_tables_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	return xt_proto_init(net, NFPROTO_IPV6);</div><div class='hunk'>@@ -1940,19 +1869,14 @@ static int __init ip6_tables_init(void)</div><div class='ctx'> 	ret = xt_register_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='del'>-	ret = xt_register_matches(ip6t_builtin_mt, ARRAY_SIZE(ip6t_builtin_mt));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err4;</div><div class='ctx'> </div><div class='ctx'> 	/* Register setsockopt */</div><div class='ctx'> 	ret = nf_register_sockopt(&amp;ip6t_sockopts);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto err5;</div><div class='add'>+		goto err4;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err5:</div><div class='del'>-	xt_unregister_matches(ip6t_builtin_mt, ARRAY_SIZE(ip6t_builtin_mt));</div><div class='ctx'> err4:</div><div class='ctx'> 	xt_unregister_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg));</div><div class='ctx'> err2:</div><div class='hunk'>@@ -1965,13 +1889,13 @@ static void __exit ip6_tables_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	nf_unregister_sockopt(&amp;ip6t_sockopts);</div><div class='ctx'> </div><div class='del'>-	xt_unregister_matches(ip6t_builtin_mt, ARRAY_SIZE(ip6t_builtin_mt));</div><div class='ctx'> 	xt_unregister_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg));</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6_tables_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ip6t_register_table);</div><div class='del'>-EXPORT_SYMBOL(ip6t_unregister_table);</div><div class='add'>+EXPORT_SYMBOL(ip6t_unregister_table_pre_exit);</div><div class='add'>+EXPORT_SYMBOL(ip6t_unregister_table_exit);</div><div class='ctx'> EXPORT_SYMBOL(ip6t_do_table);</div><div class='ctx'> </div><div class='ctx'> module_init(ip6_tables_init);</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c<br/>deleted file mode 100644<br/>index 491f808e356a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_MASQUERADE.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_MASQUERADE.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Based on Rusty Russell's IPv6 MASQUERADE target. Development of IPv6</div><div class='del'>- * NAT funded by Astaro.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/x_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv6/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-masquerade_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_masquerade_ipv6(skb, par-&gt;targinfo, xt_out(par));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int masquerade_tg6_checkentry(const struct xt_tgchk_param *par)</div><div class='del'>-{</div><div class='del'>-	const struct nf_nat_range2 *range = par-&gt;targinfo;</div><div class='del'>-</div><div class='del'>-	if (range-&gt;flags &amp; NF_NAT_RANGE_MAP_IPS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return nf_ct_netns_get(par-&gt;net, par-&gt;family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void masquerade_tg6_destroy(const struct xt_tgdtor_param *par)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xt_target masquerade_tg6_reg __read_mostly = {</div><div class='del'>-	.name		= "MASQUERADE",</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.checkentry	= masquerade_tg6_checkentry,</div><div class='del'>-	.destroy	= masquerade_tg6_destroy,</div><div class='del'>-	.target		= masquerade_tg6,</div><div class='del'>-	.targetsize	= sizeof(struct nf_nat_range),</div><div class='del'>-	.table		= "nat",</div><div class='del'>-	.hooks		= 1 &lt;&lt; NF_INET_POST_ROUTING,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init masquerade_tg6_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xt_register_target(&amp;masquerade_tg6_reg);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		nf_nat_masquerade_ipv6_register_notifier();</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-static void __exit masquerade_tg6_exit(void)</div><div class='del'>-{</div><div class='del'>-	nf_nat_masquerade_ipv6_unregister_notifier();</div><div class='del'>-	xt_unregister_target(&amp;masquerade_tg6_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(masquerade_tg6_init);</div><div class='del'>-module_exit(masquerade_tg6_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Xtables: automatic address SNAT");</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_NPT.c b/net/ipv6/netfilter/ip6t_NPT.c<br/>index a379d2f79b19..787c74aa85e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_NPT.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_NPT.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_NPT.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_NPT.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011, 2012 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -80,16 +77,43 @@ static bool ip6t_npt_map_pfx(const struct ip6t_npt_tginfo *npt,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ipv6hdr *icmpv6_bounced_ipv6hdr(struct sk_buff *skb,</div><div class='add'>+					      struct ipv6hdr *_bounced_hdr)</div><div class='add'>+{</div><div class='add'>+	if (ipv6_hdr(skb)-&gt;nexthdr != IPPROTO_ICMPV6)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!icmpv6_is_err(icmp6_hdr(skb)-&gt;icmp6_type))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb_header_pointer(skb,</div><div class='add'>+				  skb_transport_offset(skb) + sizeof(struct icmp6hdr),</div><div class='add'>+				  sizeof(struct ipv6hdr),</div><div class='add'>+				  _bounced_hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned int</div><div class='ctx'> ip6t_snpt_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ip6t_npt_tginfo *npt = par-&gt;targinfo;</div><div class='add'>+	struct ipv6hdr _bounced_hdr;</div><div class='add'>+	struct ipv6hdr *bounced_hdr;</div><div class='add'>+	struct in6_addr bounced_pfx;</div><div class='ctx'> </div><div class='ctx'> 	if (!ip6t_npt_map_pfx(npt, &amp;ipv6_hdr(skb)-&gt;saddr)) {</div><div class='ctx'> 		icmpv6_send(skb, ICMPV6_PARAMPROB, ICMPV6_HDR_FIELD,</div><div class='ctx'> 			    offsetof(struct ipv6hdr, saddr));</div><div class='ctx'> 		return NF_DROP;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* rewrite dst addr of bounced packet which was sent to dst range */</div><div class='add'>+	bounced_hdr = icmpv6_bounced_ipv6hdr(skb, &amp;_bounced_hdr);</div><div class='add'>+	if (bounced_hdr) {</div><div class='add'>+		ipv6_addr_prefix(&amp;bounced_pfx, &amp;bounced_hdr-&gt;daddr, npt-&gt;src_pfx_len);</div><div class='add'>+		if (ipv6_addr_cmp(&amp;bounced_pfx, &amp;npt-&gt;src_pfx.in6) == 0)</div><div class='add'>+			ip6t_npt_map_pfx(npt, &amp;bounced_hdr-&gt;daddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return XT_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -97,12 +121,24 @@ static unsigned int</div><div class='ctx'> ip6t_dnpt_tg(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ip6t_npt_tginfo *npt = par-&gt;targinfo;</div><div class='add'>+	struct ipv6hdr _bounced_hdr;</div><div class='add'>+	struct ipv6hdr *bounced_hdr;</div><div class='add'>+	struct in6_addr bounced_pfx;</div><div class='ctx'> </div><div class='ctx'> 	if (!ip6t_npt_map_pfx(npt, &amp;ipv6_hdr(skb)-&gt;daddr)) {</div><div class='ctx'> 		icmpv6_send(skb, ICMPV6_PARAMPROB, ICMPV6_HDR_FIELD,</div><div class='ctx'> 			    offsetof(struct ipv6hdr, daddr));</div><div class='ctx'> 		return NF_DROP;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* rewrite src addr of bounced packet which was sent from dst range */</div><div class='add'>+	bounced_hdr = icmpv6_bounced_ipv6hdr(skb, &amp;_bounced_hdr);</div><div class='add'>+	if (bounced_hdr) {</div><div class='add'>+		ipv6_addr_prefix(&amp;bounced_pfx, &amp;bounced_hdr-&gt;saddr, npt-&gt;src_pfx_len);</div><div class='add'>+		if (ipv6_addr_cmp(&amp;bounced_pfx, &amp;npt-&gt;src_pfx.in6) == 0)</div><div class='add'>+			ip6t_npt_map_pfx(npt, &amp;bounced_hdr-&gt;saddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return XT_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c<br/>index 38dea8ff680f..a35019d2e480 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_REJECT.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_REJECT.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_REJECT.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_REJECT.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * IP6 tables REJECT target module</div><div class='ctx'>  * Linux INET6 implementation</div><div class='hunk'>@@ -10,11 +11,6 @@</div><div class='ctx'>  * Copyright (c) 2005-2007 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on net/ipv4/netfilter/ipt_REJECT.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +61,7 @@ reject_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 		/* Do nothing */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IP6T_TCP_RESET:</div><div class='del'>-		nf_send_reset6(net, skb, xt_hooknum(par));</div><div class='add'>+		nf_send_reset6(net, par-&gt;state-&gt;sk, skb, xt_hooknum(par));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IP6T_ICMP6_POLICY_FAIL:</div><div class='ctx'> 		nf_send_unreach6(net, skb, ICMPV6_POLICY_FAIL, xt_hooknum(par));</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_SYNPROXY.c b/net/ipv6/netfilter/ip6t_SYNPROXY.c<br/>index cb6d42b03cb5..d51d0c3e5fe9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_SYNPROXY.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_SYNPROXY.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_SYNPROXY.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_SYNPROXY.c</a></div><div class='hunk'>@@ -1,277 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2013 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;net/ip6_checksum.h&gt;</div><div class='del'>-#include &lt;net/ip6_route.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/netfilter_ipv6/ip6_tables.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter/x_tables.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter/xt_SYNPROXY.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_seqadj.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_synproxy.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_ecache.h&gt;</div><div class='del'>-</div><div class='del'>-static struct ipv6hdr *</div><div class='del'>-synproxy_build_ip(struct net *net, struct sk_buff *skb,</div><div class='del'>-		  const struct in6_addr *saddr,</div><div class='del'>-		  const struct in6_addr *daddr)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *iph;</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	iph = skb_put(skb, sizeof(*iph));</div><div class='del'>-	ip6_flow_hdr(iph, 0, 0);</div><div class='del'>-	iph-&gt;hop_limit	= net-&gt;ipv6.devconf_all-&gt;hop_limit;</div><div class='del'>-	iph-&gt;nexthdr	= IPPROTO_TCP;</div><div class='del'>-	iph-&gt;saddr	= *saddr;</div><div class='del'>-	iph-&gt;daddr	= *daddr;</div><div class='del'>-</div><div class='del'>-	return iph;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_tcp(struct net *net,</div><div class='del'>-		  const struct sk_buff *skb, struct sk_buff *nskb,</div><div class='del'>-		  struct nf_conntrack *nfct, enum ip_conntrack_info ctinfo,</div><div class='del'>-		  struct ipv6hdr *niph, struct tcphdr *nth,</div><div class='del'>-		  unsigned int tcp_hdr_size)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-</div><div class='del'>-	nth-&gt;check = ~tcp_v6_check(tcp_hdr_size, &amp;niph-&gt;saddr, &amp;niph-&gt;daddr, 0);</div><div class='del'>-	nskb-&gt;ip_summed   = CHECKSUM_PARTIAL;</div><div class='del'>-	nskb-&gt;csum_start  = (unsigned char *)nth - nskb-&gt;head;</div><div class='del'>-	nskb-&gt;csum_offset = offsetof(struct tcphdr, check);</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_proto = IPPROTO_TCP;</div><div class='del'>-	fl6.saddr = niph-&gt;saddr;</div><div class='del'>-	fl6.daddr = niph-&gt;daddr;</div><div class='del'>-	fl6.fl6_sport = nth-&gt;source;</div><div class='del'>-	fl6.fl6_dport = nth-&gt;dest;</div><div class='del'>-	security_skb_classify_flow((struct sk_buff *)skb, flowi6_to_flowi(&amp;fl6));</div><div class='del'>-	dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='del'>-	if (dst-&gt;error) {</div><div class='del'>-		dst_release(dst);</div><div class='del'>-		goto free_nskb;</div><div class='del'>-	}</div><div class='del'>-	dst = xfrm_lookup(net, dst, flowi6_to_flowi(&amp;fl6), NULL, 0);</div><div class='del'>-	if (IS_ERR(dst))</div><div class='del'>-		goto free_nskb;</div><div class='del'>-</div><div class='del'>-	skb_dst_set(nskb, dst);</div><div class='del'>-</div><div class='del'>-	if (nfct) {</div><div class='del'>-		nf_ct_set(nskb, (struct nf_conn *)nfct, ctinfo);</div><div class='del'>-		nf_conntrack_get(nfct);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ip6_local_out(net, nskb-&gt;sk, nskb);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-free_nskb:</div><div class='del'>-	kfree_skb(nskb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_client_synack(struct net *net,</div><div class='del'>-			    const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			    const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct ipv6hdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-	u16 mss = opts-&gt;mss;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, &amp;iph-&gt;daddr, &amp;iph-&gt;saddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;dest;</div><div class='del'>-	nth-&gt;dest	= th-&gt;source;</div><div class='del'>-	nth-&gt;seq	= htonl(__cookie_v6_init_sequence(iph, th, &amp;mss));</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_SYN | TCP_FLAG_ACK;</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_ECN)</div><div class='del'>-		tcp_flag_word(nth) |= TCP_FLAG_ECE;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= 0;</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),</div><div class='del'>-			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-synproxy_send_server_syn(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts, u32 recv_seq)</div><div class='del'>-{</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct ipv6hdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, &amp;iph-&gt;saddr, &amp;iph-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;source;</div><div class='del'>-	nth-&gt;dest	= th-&gt;dest;</div><div class='del'>-	nth-&gt;seq	= htonl(recv_seq - 1);</div><div class='del'>-	/* ack_seq is used to relay our ISN to the synproxy hook to initialize</div><div class='del'>-	 * sequence number translation once a connection tracking entry exists.</div><div class='del'>-	 */</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;ack_seq) - 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_SYN;</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_ECN)</div><div class='del'>-		tcp_flag_word(nth) |= TCP_FLAG_ECE | TCP_FLAG_CWR;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= th-&gt;window;</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, &amp;snet-&gt;tmpl-&gt;ct_general, IP_CT_NEW,</div><div class='del'>-			  niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_server_ack(struct net *net,</div><div class='del'>-			 const struct ip_ct_tcp *state,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct ipv6hdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, &amp;iph-&gt;daddr, &amp;iph-&gt;saddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;dest;</div><div class='del'>-	nth-&gt;dest	= th-&gt;source;</div><div class='del'>-	nth-&gt;seq	= htonl(ntohl(th-&gt;ack_seq));</div><div class='del'>-	nth-&gt;ack_seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_ACK;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= htons(state-&gt;seen[IP_CT_DIR_ORIGINAL].td_maxwin);</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-synproxy_send_client_ack(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 const struct synproxy_options *opts)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct ipv6hdr *iph, *niph;</div><div class='del'>-	struct tcphdr *nth;</div><div class='del'>-	unsigned int tcp_hdr_size;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	tcp_hdr_size = sizeof(*nth) + synproxy_options_size(opts);</div><div class='del'>-	nskb = alloc_skb(sizeof(*niph) + tcp_hdr_size + MAX_TCP_HEADER,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='del'>-	if (nskb == NULL)</div><div class='del'>-		return;</div><div class='del'>-	skb_reserve(nskb, MAX_TCP_HEADER);</div><div class='del'>-</div><div class='del'>-	niph = synproxy_build_ip(net, nskb, &amp;iph-&gt;saddr, &amp;iph-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(nskb);</div><div class='del'>-	nth = skb_put(nskb, tcp_hdr_size);</div><div class='del'>-	nth-&gt;source	= th-&gt;source;</div><div class='del'>-	nth-&gt;dest	= th-&gt;dest;</div><div class='del'>-	nth-&gt;seq	= htonl(ntohl(th-&gt;seq) + 1);</div><div class='del'>-	nth-&gt;ack_seq	= th-&gt;ack_seq;</div><div class='del'>-	tcp_flag_word(nth) = TCP_FLAG_ACK;</div><div class='del'>-	nth-&gt;doff	= tcp_hdr_size / 4;</div><div class='del'>-	nth-&gt;window	= htons(ntohs(th-&gt;window) &gt;&gt; opts-&gt;wscale);</div><div class='del'>-	nth-&gt;check	= 0;</div><div class='del'>-	nth-&gt;urg_ptr	= 0;</div><div class='del'>-</div><div class='del'>-	synproxy_build_options(nth, opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),</div><div class='del'>-			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-synproxy_recv_client_ack(struct net *net,</div><div class='del'>-			 const struct sk_buff *skb, const struct tcphdr *th,</div><div class='del'>-			 struct synproxy_options *opts, u32 recv_seq)</div><div class='del'>-{</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	int mss;</div><div class='del'>-</div><div class='del'>-	mss = __cookie_v6_check(ipv6_hdr(skb), th, ntohl(th-&gt;ack_seq) - 1);</div><div class='del'>-	if (mss == 0) {</div><div class='del'>-		this_cpu_inc(snet-&gt;stats-&gt;cookie_invalid);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	this_cpu_inc(snet-&gt;stats-&gt;cookie_valid);</div><div class='del'>-	opts-&gt;mss = mss;</div><div class='del'>-	opts-&gt;options |= XT_SYNPROXY_OPT_MSS;</div><div class='del'>-</div><div class='del'>-	if (opts-&gt;options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='del'>-		synproxy_check_timestamp_cookie(opts);</div><div class='del'>-</div><div class='del'>-	synproxy_send_server_syn(net, skb, th, opts, recv_seq);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='add'>+#include &lt;net/netfilter/nf_synproxy.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='ctx'> synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='hunk'>@@ -300,6 +36,8 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 			opts.options |= XT_SYNPROXY_OPT_ECN;</div><div class='ctx'> </div><div class='ctx'> 		opts.options &amp;= info-&gt;options;</div><div class='add'>+		opts.mss_encode = opts.mss_option;</div><div class='add'>+		opts.mss_option = info-&gt;mss;</div><div class='ctx'> 		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='ctx'> 			synproxy_init_timestamp_cookie(info, &amp;opts);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -307,13 +45,14 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 					  XT_SYNPROXY_OPT_SACK_PERM |</div><div class='ctx'> 					  XT_SYNPROXY_OPT_ECN);</div><div class='ctx'> </div><div class='del'>-		synproxy_send_client_synack(net, skb, th, &amp;opts);</div><div class='add'>+		synproxy_send_client_synack_ipv6(net, skb, th, &amp;opts);</div><div class='ctx'> 		consume_skb(skb);</div><div class='ctx'> 		return NF_STOLEN;</div><div class='ctx'> </div><div class='ctx'> 	} else if (th-&gt;ack &amp;&amp; !(th-&gt;fin || th-&gt;rst || th-&gt;syn)) {</div><div class='ctx'> 		/* ACK from client */</div><div class='del'>-		if (synproxy_recv_client_ack(net, skb, th, &amp;opts, ntohl(th-&gt;seq))) {</div><div class='add'>+		if (synproxy_recv_client_ack_ipv6(net, skb, th, &amp;opts,</div><div class='add'>+						  ntohl(th-&gt;seq))) {</div><div class='ctx'> 			consume_skb(skb);</div><div class='ctx'> 			return NF_STOLEN;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -324,141 +63,6 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par)</div><div class='ctx'> 	return XT_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ipv6_synproxy_hook(void *priv,</div><div class='del'>-				       struct sk_buff *skb,</div><div class='del'>-				       const struct nf_hook_state *nhs)</div><div class='del'>-{</div><div class='del'>-	struct net *net = nhs-&gt;net;</div><div class='del'>-	struct synproxy_net *snet = synproxy_pernet(net);</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	struct nf_conn_synproxy *synproxy;</div><div class='del'>-	struct synproxy_options opts = {};</div><div class='del'>-	const struct ip_ct_tcp *state;</div><div class='del'>-	struct tcphdr *th, _th;</div><div class='del'>-	__be16 frag_off;</div><div class='del'>-	u8 nexthdr;</div><div class='del'>-	int thoff;</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	if (ct == NULL)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	synproxy = nfct_synproxy(ct);</div><div class='del'>-	if (synproxy == NULL)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	if (nf_is_loopback_packet(skb))</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	nexthdr = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='del'>-	thoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &amp;nexthdr,</div><div class='del'>-				 &amp;frag_off);</div><div class='del'>-	if (thoff &lt; 0 || nexthdr != IPPROTO_TCP)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	th = skb_header_pointer(skb, thoff, sizeof(_th), &amp;_th);</div><div class='del'>-	if (th == NULL)</div><div class='del'>-		return NF_DROP;</div><div class='del'>-</div><div class='del'>-	state = &amp;ct-&gt;proto.tcp;</div><div class='del'>-	switch (state-&gt;state) {</div><div class='del'>-	case TCP_CONNTRACK_CLOSE:</div><div class='del'>-		if (th-&gt;rst &amp;&amp; !test_bit(IPS_SEEN_REPLY_BIT, &amp;ct-&gt;status)) {</div><div class='del'>-			nf_ct_seqadj_init(ct, ctinfo, synproxy-&gt;isn -</div><div class='del'>-						      ntohl(th-&gt;seq) + 1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!th-&gt;syn || th-&gt;ack ||</div><div class='del'>-		    CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Reopened connection - reset the sequence number and timestamp</div><div class='del'>-		 * adjustments, they will get initialized once the connection is</div><div class='del'>-		 * reestablished.</div><div class='del'>-		 */</div><div class='del'>-		nf_ct_seqadj_init(ct, ctinfo, 0);</div><div class='del'>-		synproxy-&gt;tsoff = 0;</div><div class='del'>-		this_cpu_inc(snet-&gt;stats-&gt;conn_reopened);</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='del'>-	case TCP_CONNTRACK_SYN_SENT:</div><div class='del'>-		if (!synproxy_parse_options(skb, thoff, th, &amp;opts))</div><div class='del'>-			return NF_DROP;</div><div class='del'>-</div><div class='del'>-		if (!th-&gt;syn &amp;&amp; th-&gt;ack &amp;&amp;</div><div class='del'>-		    CTINFO2DIR(ctinfo) == IP_CT_DIR_ORIGINAL) {</div><div class='del'>-			/* Keep-Alives are sent with SEG.SEQ = SND.NXT-1,</div><div class='del'>-			 * therefore we need to add 1 to make the SYN sequence</div><div class='del'>-			 * number match the one of first SYN.</div><div class='del'>-			 */</div><div class='del'>-			if (synproxy_recv_client_ack(net, skb, th, &amp;opts,</div><div class='del'>-						     ntohl(th-&gt;seq) + 1)) {</div><div class='del'>-				this_cpu_inc(snet-&gt;stats-&gt;cookie_retrans);</div><div class='del'>-				consume_skb(skb);</div><div class='del'>-				return NF_STOLEN;</div><div class='del'>-			} else {</div><div class='del'>-				return NF_DROP;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		synproxy-&gt;isn = ntohl(th-&gt;ack_seq);</div><div class='del'>-		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP)</div><div class='del'>-			synproxy-&gt;its = opts.tsecr;</div><div class='del'>-</div><div class='del'>-		nf_conntrack_event_cache(IPCT_SYNPROXY, ct);</div><div class='del'>-		break;</div><div class='del'>-	case TCP_CONNTRACK_SYN_RECV:</div><div class='del'>-		if (!th-&gt;syn || !th-&gt;ack)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!synproxy_parse_options(skb, thoff, th, &amp;opts))</div><div class='del'>-			return NF_DROP;</div><div class='del'>-</div><div class='del'>-		if (opts.options &amp; XT_SYNPROXY_OPT_TIMESTAMP) {</div><div class='del'>-			synproxy-&gt;tsoff = opts.tsval - synproxy-&gt;its;</div><div class='del'>-			nf_conntrack_event_cache(IPCT_SYNPROXY, ct);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		opts.options &amp;= ~(XT_SYNPROXY_OPT_MSS |</div><div class='del'>-				  XT_SYNPROXY_OPT_WSCALE |</div><div class='del'>-				  XT_SYNPROXY_OPT_SACK_PERM);</div><div class='del'>-</div><div class='del'>-		swap(opts.tsval, opts.tsecr);</div><div class='del'>-		synproxy_send_server_ack(net, state, skb, th, &amp;opts);</div><div class='del'>-</div><div class='del'>-		nf_ct_seqadj_init(ct, ctinfo, synproxy-&gt;isn - ntohl(th-&gt;seq));</div><div class='del'>-		nf_conntrack_event_cache(IPCT_SEQADJ, ct);</div><div class='del'>-</div><div class='del'>-		swap(opts.tsval, opts.tsecr);</div><div class='del'>-		synproxy_send_client_ack(net, skb, th, &amp;opts);</div><div class='del'>-</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		return NF_STOLEN;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	synproxy_tstamp_adjust(skb, thoff, th, ct, ctinfo, synproxy);</div><div class='del'>-	return NF_ACCEPT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops ipv6_synproxy_ops[] = {</div><div class='del'>-	{</div><div class='del'>-		.hook		= ipv6_synproxy_hook,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_IN,</div><div class='del'>-		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.hook		= ipv6_synproxy_hook,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_POST_ROUTING,</div><div class='del'>-		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int synproxy_tg6_check(const struct xt_tgchk_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	struct synproxy_net *snet = synproxy_pernet(par-&gt;net);</div><div class='hunk'>@@ -474,16 +78,12 @@ static int synproxy_tg6_check(const struct xt_tgchk_param *par)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (snet-&gt;hook_ref6 == 0) {</div><div class='del'>-		err = nf_register_net_hooks(par-&gt;net, ipv6_synproxy_ops,</div><div class='del'>-					    ARRAY_SIZE(ipv6_synproxy_ops));</div><div class='del'>-		if (err) {</div><div class='del'>-			nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+	err = nf_synproxy_ipv6_init(snet, par-&gt;net);</div><div class='add'>+	if (err) {</div><div class='add'>+		nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snet-&gt;hook_ref6++;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -491,10 +91,7 @@ static void synproxy_tg6_destroy(const struct xt_tgdtor_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	struct synproxy_net *snet = synproxy_pernet(par-&gt;net);</div><div class='ctx'> </div><div class='del'>-	snet-&gt;hook_ref6--;</div><div class='del'>-	if (snet-&gt;hook_ref6 == 0)</div><div class='del'>-		nf_unregister_net_hooks(par-&gt;net, ipv6_synproxy_ops,</div><div class='del'>-					ARRAY_SIZE(ipv6_synproxy_ops));</div><div class='add'>+	nf_synproxy_ipv6_fini(snet, par-&gt;net);</div><div class='ctx'> 	nf_ct_netns_put(par-&gt;net, par-&gt;family);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -524,3 +121,4 @@ module_exit(synproxy_tg6_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Intercept IPv6 TCP connections and establish them using syncookies");</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_ah.c b/net/ipv6/netfilter/ip6t_ah.c<br/>index 04099ab7d2e3..70da2f2ce064 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_ah.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_ah.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_ah.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_ah.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match AH parameters. */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -58,7 +55,7 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdrlen = (ah-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+	hdrlen = ipv6_authlen(ah);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("IPv6 AH LEN %u %u ", hdrlen, ah-&gt;hdrlen);</div><div class='ctx'> 	pr_debug("RES %04X ", ah-&gt;reserved);</div><div class='hunk'>@@ -77,8 +74,7 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		 ahinfo-&gt;hdrres, ah-&gt;reserved,</div><div class='ctx'> 		 !(ahinfo-&gt;hdrres &amp;&amp; ah-&gt;reserved));</div><div class='ctx'> </div><div class='del'>-	return (ah != NULL) &amp;&amp;</div><div class='del'>-		spi_match(ahinfo-&gt;spis[0], ahinfo-&gt;spis[1],</div><div class='add'>+	return spi_match(ahinfo-&gt;spis[0], ahinfo-&gt;spis[1],</div><div class='ctx'> 			  ntohl(ah-&gt;spi),</div><div class='ctx'> 			  !!(ahinfo-&gt;invflags &amp; IP6T_AH_INV_SPI)) &amp;&amp;</div><div class='ctx'> 		(!ahinfo-&gt;hdrlen ||</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c<br/>index aab0706908c5..d704f7ed300c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_eui64.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_eui64.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_eui64.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_eui64.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match EUI64 address parameters. */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c<br/>index 3b5735e56bfe..3aad6439386b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_frag.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_frag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_frag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_frag.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match FRAG parameters. */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -88,8 +85,7 @@ frag_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		 !((fraginfo-&gt;flags &amp; IP6T_FRAG_NMF) &amp;&amp;</div><div class='ctx'> 		   (ntohs(fh-&gt;frag_off) &amp; IP6_MF)));</div><div class='ctx'> </div><div class='del'>-	return (fh != NULL) &amp;&amp;</div><div class='del'>-		id_match(fraginfo-&gt;ids[0], fraginfo-&gt;ids[1],</div><div class='add'>+	return id_match(fraginfo-&gt;ids[0], fraginfo-&gt;ids[1],</div><div class='ctx'> 			 ntohl(fh-&gt;identification),</div><div class='ctx'> 			 !!(fraginfo-&gt;invflags &amp; IP6T_FRAG_INV_IDS)) &amp;&amp;</div><div class='ctx'> 		!((fraginfo-&gt;flags &amp; IP6T_FRAG_RES) &amp;&amp;</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c<br/>index 01df142bb027..e7a3fb9355ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_hbh.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_hbh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_hbh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_hbh.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match Hop-by-Hop and Destination parameters. */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -89,8 +86,7 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		  ((optinfo-&gt;hdrlen == hdrlen) ^</div><div class='ctx'> 		   !!(optinfo-&gt;invflags &amp; IP6T_OPTS_INV_LEN))));</div><div class='ctx'> </div><div class='del'>-	ret = (oh != NULL) &amp;&amp;</div><div class='del'>-	      (!(optinfo-&gt;flags &amp; IP6T_OPTS_LEN) ||</div><div class='add'>+	ret = (!(optinfo-&gt;flags &amp; IP6T_OPTS_LEN) ||</div><div class='ctx'> 	       ((optinfo-&gt;hdrlen == hdrlen) ^</div><div class='ctx'> 		!!(optinfo-&gt;invflags &amp; IP6T_OPTS_INV_LEN)));</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c<br/>index 8b147440fbdc..c52ff929c93b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_ipv6header.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_ipv6header.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_ipv6header.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_ipv6header.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* ipv6header match - matches IPv6 packets based</div><div class='ctx'>    on whether they contain certain headers */</div><div class='ctx'> </div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  * Rewritten by: Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt; */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -19,7 +16,7 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netfilter/x_tables.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6/ip6_tables.h&gt;</div><div class='add'>+#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv6/ip6t_ipv6header.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='hunk'>@@ -45,7 +42,7 @@ ipv6header_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 	len = skb-&gt;len - ptr;</div><div class='ctx'> 	temp = 0;</div><div class='ctx'> </div><div class='del'>-	while (ip6t_ext_hdr(nexthdr)) {</div><div class='add'>+	while (nf_ip6_ext_hdr(nexthdr)) {</div><div class='ctx'> 		const struct ipv6_opt_hdr *hp;</div><div class='ctx'> 		struct ipv6_opt_hdr _hdr;</div><div class='ctx'> 		int hdrlen;</div><div class='hunk'>@@ -65,13 +62,16 @@ ipv6header_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hp = skb_header_pointer(skb, ptr, sizeof(_hdr), &amp;_hdr);</div><div class='del'>-		BUG_ON(hp == NULL);</div><div class='add'>+		if (!hp) {</div><div class='add'>+			par-&gt;hotdrop = true;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate the header length */</div><div class='ctx'> 		if (nexthdr == NEXTHDR_FRAGMENT)</div><div class='ctx'> 			hdrlen = 8;</div><div class='ctx'> 		else if (nexthdr == NEXTHDR_AUTH)</div><div class='del'>-			hdrlen = (hp-&gt;hdrlen + 2) &lt;&lt; 2;</div><div class='add'>+			hdrlen = ipv6_authlen(hp);</div><div class='ctx'> 		else</div><div class='ctx'> 			hdrlen = ipv6_optlen(hp);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_mh.c b/net/ipv6/netfilter/ip6t_mh.c<br/>index 0c90c66b1992..fd492b69acbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_mh.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_mh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_mh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_mh.c</a></div><div class='hunk'>@@ -1,15 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2006 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Author:</div><div class='ctx'>  *	Masahide NAKAMURA @USAGI &lt;masahide.nakamura.cz@hitachi.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on net/netfilter/xt_tcpudp.c</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_rpfilter.c b/net/ipv6/netfilter/ip6t_rpfilter.c<br/>index c3c6b09acdc4..67c87a88cde4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_rpfilter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_rpfilter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_rpfilter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_rpfilter.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011 Florian Westphal &lt;fw@strlen.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -40,8 +37,10 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='ctx'> 		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		.flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev),</div><div class='ctx'> 		.flowlabel = (* (__be32 *) iph) &amp; IPV6_FLOWINFO_MASK,</div><div class='ctx'> 		.flowi6_proto = iph-&gt;nexthdr,</div><div class='add'>+		.flowi6_uid = sock_net_uid(net, NULL),</div><div class='ctx'> 		.daddr = iph-&gt;saddr,</div><div class='ctx'> 	};</div><div class='ctx'> 	int lookup_flags;</div><div class='hunk'>@@ -73,7 +72,9 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;rt6i_idev-&gt;dev == dev || (flags &amp; XT_RPFILTER_LOOSE))</div><div class='add'>+	if (rt-&gt;rt6i_idev-&gt;dev == dev ||</div><div class='add'>+	    l3mdev_master_ifindex_rcu(rt-&gt;rt6i_idev-&gt;dev) == dev-&gt;ifindex ||</div><div class='add'>+	    (flags &amp; XT_RPFILTER_LOOSE))</div><div class='ctx'> 		ret = true;</div><div class='ctx'>  out:</div><div class='ctx'> 	ip6_rt_put(rt);</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c<br/>index 2c99b94eeca3..4ad8b2032f1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_rt.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_rt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_rt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_rt.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Kernel module to match ROUTING parameters. */</div><div class='ctx'> </div><div class='ctx'> /* (C) 2001-2002 Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -28,12 +25,7 @@ MODULE_AUTHOR("Andras Kis-Szabo &lt;kisza@sch.bme.hu&gt;");</div><div class='ctx'> static inline bool</div><div class='ctx'> segsleft_match(u_int32_t min, u_int32_t max, u_int32_t id, bool invert)</div><div class='ctx'> {</div><div class='del'>-	bool r;</div><div class='del'>-	pr_debug("segsleft_match:%c 0x%x &lt;= 0x%x &lt;= 0x%x\n",</div><div class='del'>-		 invert ? '!' : ' ', min, id, max);</div><div class='del'>-	r = (id &gt;= min &amp;&amp; id &lt;= max) ^ invert;</div><div class='del'>-	pr_debug(" result %s\n", r ? "PASS" : "FAILED");</div><div class='del'>-	return r;</div><div class='add'>+	return (id &gt;= min &amp;&amp; id &lt;= max) ^ invert;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='hunk'>@@ -68,32 +60,7 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("IPv6 RT LEN %u %u ", hdrlen, rh-&gt;hdrlen);</div><div class='del'>-	pr_debug("TYPE %04X ", rh-&gt;type);</div><div class='del'>-	pr_debug("SGS_LEFT %u %02X\n", rh-&gt;segments_left, rh-&gt;segments_left);</div><div class='del'>-</div><div class='del'>-	pr_debug("IPv6 RT segsleft %02X ",</div><div class='del'>-		 segsleft_match(rtinfo-&gt;segsleft[0], rtinfo-&gt;segsleft[1],</div><div class='del'>-				rh-&gt;segments_left,</div><div class='del'>-				!!(rtinfo-&gt;invflags &amp; IP6T_RT_INV_SGS)));</div><div class='del'>-	pr_debug("type %02X %02X %02X ",</div><div class='del'>-		 rtinfo-&gt;rt_type, rh-&gt;type,</div><div class='del'>-		 (!(rtinfo-&gt;flags &amp; IP6T_RT_TYP) ||</div><div class='del'>-		  ((rtinfo-&gt;rt_type == rh-&gt;type) ^</div><div class='del'>-		   !!(rtinfo-&gt;invflags &amp; IP6T_RT_INV_TYP))));</div><div class='del'>-	pr_debug("len %02X %04X %02X ",</div><div class='del'>-		 rtinfo-&gt;hdrlen, hdrlen,</div><div class='del'>-		 !(rtinfo-&gt;flags &amp; IP6T_RT_LEN) ||</div><div class='del'>-		  ((rtinfo-&gt;hdrlen == hdrlen) ^</div><div class='del'>-		   !!(rtinfo-&gt;invflags &amp; IP6T_RT_INV_LEN)));</div><div class='del'>-	pr_debug("res %02X %02X %02X ",</div><div class='del'>-		 rtinfo-&gt;flags &amp; IP6T_RT_RES,</div><div class='del'>-		 ((const struct rt0_hdr *)rh)-&gt;reserved,</div><div class='del'>-		 !((rtinfo-&gt;flags &amp; IP6T_RT_RES) &amp;&amp;</div><div class='del'>-		   (((const struct rt0_hdr *)rh)-&gt;reserved)));</div><div class='del'>-</div><div class='del'>-	ret = (rh != NULL) &amp;&amp;</div><div class='del'>-	      (segsleft_match(rtinfo-&gt;segsleft[0], rtinfo-&gt;segsleft[1],</div><div class='add'>+	ret = (segsleft_match(rtinfo-&gt;segsleft[0], rtinfo-&gt;segsleft[1],</div><div class='ctx'> 			      rh-&gt;segments_left,</div><div class='ctx'> 			      !!(rtinfo-&gt;invflags &amp; IP6T_RT_INV_SGS))) &amp;&amp;</div><div class='ctx'> 	      (!(rtinfo-&gt;flags &amp; IP6T_RT_LEN) ||</div><div class='hunk'>@@ -111,22 +78,22 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 						       reserved),</div><div class='ctx'> 					sizeof(_reserved),</div><div class='ctx'> 					&amp;_reserved);</div><div class='add'>+		if (!rp) {</div><div class='add'>+			par-&gt;hotdrop = true;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = (*rp == 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("#%d ", rtinfo-&gt;addrnr);</div><div class='ctx'> 	if (!(rtinfo-&gt;flags &amp; IP6T_RT_FST)) {</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	} else if (rtinfo-&gt;flags &amp; IP6T_RT_FST_NSTRICT) {</div><div class='del'>-		pr_debug("Not strict ");</div><div class='ctx'> 		if (rtinfo-&gt;addrnr &gt; (unsigned int)((hdrlen - 8) / 16)) {</div><div class='del'>-			pr_debug("There isn't enough space\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unsigned int i = 0;</div><div class='ctx'> </div><div class='del'>-			pr_debug("#%d ", rtinfo-&gt;addrnr);</div><div class='ctx'> 			for (temp = 0;</div><div class='ctx'> 			     temp &lt; (unsigned int)((hdrlen - 8) / 16);</div><div class='ctx'> 			     temp++) {</div><div class='hunk'>@@ -137,28 +104,25 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 							sizeof(_addr),</div><div class='ctx'> 							&amp;_addr);</div><div class='ctx'> </div><div class='del'>-				BUG_ON(ap == NULL);</div><div class='add'>+				if (ap == NULL) {</div><div class='add'>+					par-&gt;hotdrop = true;</div><div class='add'>+					return false;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-				if (ipv6_addr_equal(ap, &amp;rtinfo-&gt;addrs[i])) {</div><div class='del'>-					pr_debug("i=%d temp=%d;\n", i, temp);</div><div class='add'>+				if (ipv6_addr_equal(ap, &amp;rtinfo-&gt;addrs[i]))</div><div class='ctx'> 					i++;</div><div class='del'>-				}</div><div class='ctx'> 				if (i == rtinfo-&gt;addrnr)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			pr_debug("i=%d #%d\n", i, rtinfo-&gt;addrnr);</div><div class='ctx'> 			if (i == rtinfo-&gt;addrnr)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			else</div><div class='ctx'> 				return false;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_debug("Strict ");</div><div class='ctx'> 		if (rtinfo-&gt;addrnr &gt; (unsigned int)((hdrlen - 8) / 16)) {</div><div class='del'>-			pr_debug("There isn't enough space\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_debug("#%d ", rtinfo-&gt;addrnr);</div><div class='ctx'> 			for (temp = 0; temp &lt; rtinfo-&gt;addrnr; temp++) {</div><div class='ctx'> 				ap = skb_header_pointer(skb,</div><div class='ctx'> 							ptr</div><div class='hunk'>@@ -166,12 +130,14 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 							+ temp * sizeof(_addr),</div><div class='ctx'> 							sizeof(_addr),</div><div class='ctx'> 							&amp;_addr);</div><div class='del'>-				BUG_ON(ap == NULL);</div><div class='add'>+				if (ap == NULL) {</div><div class='add'>+					par-&gt;hotdrop = true;</div><div class='add'>+					return false;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='ctx'> 				if (!ipv6_addr_equal(ap, &amp;rtinfo-&gt;addrs[temp]))</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			pr_debug("temp=%d #%d\n", temp, rtinfo-&gt;addrnr);</div><div class='ctx'> 			if (temp == rtinfo-&gt;addrnr &amp;&amp;</div><div class='ctx'> 			    temp == (unsigned int)((hdrlen - 8) / 16))</div><div class='ctx'> 				return ret;</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6t_srh.c b/net/ipv6/netfilter/ip6t_srh.c<br/>index 1059894a6f4c..db0fd64d8986 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_srh.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6t_srh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6t_srh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6t_srh.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* Kernel module to match Segment Routing Header (SRH) parameters. */</div><div class='ctx'> </div><div class='ctx'> /* Author:</div><div class='ctx'>  * Ahmed Abdelsalam &lt;amsalam20@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version 2</div><div class='del'>- *	of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -210,6 +206,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		psidoff = srhoff + sizeof(struct ipv6_sr_hdr) +</div><div class='ctx'> 			  ((srh-&gt;segments_left + 1) * sizeof(struct in6_addr));</div><div class='ctx'> 		psid = skb_header_pointer(skb, psidoff, sizeof(_psid), &amp;_psid);</div><div class='add'>+		if (!psid)</div><div class='add'>+			return false;</div><div class='ctx'> 		if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_PSID,</div><div class='ctx'> 				ipv6_masked_addr_cmp(psid, &amp;srhinfo-&gt;psid_msk,</div><div class='ctx'> 						     &amp;srhinfo-&gt;psid_addr)))</div><div class='hunk'>@@ -223,6 +221,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 		nsidoff = srhoff + sizeof(struct ipv6_sr_hdr) +</div><div class='ctx'> 			  ((srh-&gt;segments_left - 1) * sizeof(struct in6_addr));</div><div class='ctx'> 		nsid = skb_header_pointer(skb, nsidoff, sizeof(_nsid), &amp;_nsid);</div><div class='add'>+		if (!nsid)</div><div class='add'>+			return false;</div><div class='ctx'> 		if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_NSID,</div><div class='ctx'> 				ipv6_masked_addr_cmp(nsid, &amp;srhinfo-&gt;nsid_msk,</div><div class='ctx'> 						     &amp;srhinfo-&gt;nsid_addr)))</div><div class='hunk'>@@ -233,6 +233,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)</div><div class='ctx'> 	if (srhinfo-&gt;mt_flags &amp; IP6T_SRH_LSID) {</div><div class='ctx'> 		lsidoff = srhoff + sizeof(struct ipv6_sr_hdr);</div><div class='ctx'> 		lsid = skb_header_pointer(skb, lsidoff, sizeof(_lsid), &amp;_lsid);</div><div class='add'>+		if (!lsid)</div><div class='add'>+			return false;</div><div class='ctx'> 		if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_LSID,</div><div class='ctx'> 				ipv6_masked_addr_cmp(lsid, &amp;srhinfo-&gt;lsid_msk,</div><div class='ctx'> 						     &amp;srhinfo-&gt;lsid_addr)))</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c<br/>index 1343077dde93..e8992693e14a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_filter.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6table_filter.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -22,84 +19,81 @@ MODULE_DESCRIPTION("ip6tables filter table");</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_FORWARD) | \</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_LOCAL_OUT))</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_filter_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table packet_filter = {</div><div class='ctx'> 	.name		= "filter",</div><div class='ctx'> 	.valid_hooks	= FILTER_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV6,</div><div class='ctx'> 	.priority	= NF_IP6_PRI_FILTER,</div><div class='del'>-	.table_init	= ip6table_filter_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The work comes in here from netfilter.c. */</div><div class='del'>-static unsigned int</div><div class='del'>-ip6table_filter_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_filter);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *filter_ops __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* Default to forward because I got too much mail already. */</div><div class='ctx'> static bool forward = true;</div><div class='ctx'> module_param(forward, bool, 0000);</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_filter_table_init(struct net *net)</div><div class='add'>+static int ip6table_filter_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6t_replace *repl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.ip6table_filter)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ip6t_alloc_initial_table(&amp;packet_filter);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	/* Entry 1 is the FORWARD hook */</div><div class='ctx'> 	((struct ip6t_standard *)repl-&gt;entries)[1].target.verdict =</div><div class='del'>-		forward ? -NF_ACCEPT - 1 : -NF_DROP - 1;</div><div class='add'>+		forward ? -NF_ACCEPT - 1 : NF_DROP - 1;</div><div class='ctx'> </div><div class='del'>-	err = ip6t_register_table(net, &amp;packet_filter, repl, filter_ops,</div><div class='del'>-				  &amp;net-&gt;ipv6.ip6table_filter);</div><div class='add'>+	err = ip6t_register_table(net, &amp;packet_filter, repl, filter_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __net_init ip6table_filter_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (net == &amp;init_net || !forward)</div><div class='add'>+	if (!forward)</div><div class='ctx'> 		return ip6table_filter_table_init(net);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ip6table_filter_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ip6t_unregister_table_pre_exit(net, "filter");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit ip6table_filter_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv6.ip6table_filter)</div><div class='del'>-		return;</div><div class='del'>-	ip6t_unregister_table(net, net-&gt;ipv6.ip6table_filter, filter_ops);</div><div class='del'>-	net-&gt;ipv6.ip6table_filter = NULL;</div><div class='add'>+	ip6t_unregister_table_exit(net, "filter");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6table_filter_net_ops = {</div><div class='ctx'> 	.init = ip6table_filter_net_init,</div><div class='add'>+	.pre_exit = ip6table_filter_net_pre_exit,</div><div class='ctx'> 	.exit = ip6table_filter_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ip6table_filter_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;packet_filter,</div><div class='add'>+					ip6table_filter_table_init);</div><div class='ctx'> </div><div class='del'>-	filter_ops = xt_hook_ops_alloc(&amp;packet_filter, ip6table_filter_hook);</div><div class='del'>-	if (IS_ERR(filter_ops))</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	filter_ops = xt_hook_ops_alloc(&amp;packet_filter, ip6t_do_table);</div><div class='add'>+	if (IS_ERR(filter_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		return PTR_ERR(filter_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;ip6table_filter_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 		kfree(filter_ops);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -107,6 +101,7 @@ static int __init ip6table_filter_init(void)</div><div class='ctx'> static void __exit ip6table_filter_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6table_filter_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_filter);</div><div class='ctx'> 	kfree(filter_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c<br/>index b0524b18c4fb..8dd4cd0c47bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_mangle.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_mangle.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_mangle.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6table_mangle.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 packet mangling table, a port of the IPv4 mangle table to IPv6</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000-2001 by Harald Welte &lt;laforge@gnumonks.org&gt;</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv6/ip6_tables.h&gt;</div><div class='hunk'>@@ -23,24 +20,21 @@ MODULE_DESCRIPTION("ip6tables mangle table");</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_LOCAL_OUT) | \</div><div class='ctx'> 			    (1 &lt;&lt; NF_INET_POST_ROUTING))</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_mangle_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table packet_mangler = {</div><div class='ctx'> 	.name		= "mangle",</div><div class='ctx'> 	.valid_hooks	= MANGLE_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV6,</div><div class='ctx'> 	.priority	= NF_IP6_PRI_MANGLE,</div><div class='del'>-	.table_init	= ip6table_mangle_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='del'>-ip6t_mangle_out(struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='add'>+ip6t_mangle_out(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ret;</div><div class='ctx'> 	struct in6_addr saddr, daddr;</div><div class='del'>-	u_int8_t hop_limit;</div><div class='del'>-	u_int32_t flowlabel, mark;</div><div class='add'>+	unsigned int ret, verdict;</div><div class='add'>+	u32 flowlabel, mark;</div><div class='add'>+	u8 hop_limit;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* save source/dest address, mark, hoplimit, flowlabel, priority,  */</div><div class='hunk'>@@ -52,15 +46,16 @@ ip6t_mangle_out(struct sk_buff *skb, const struct nf_hook_state *state)</div><div class='ctx'> 	/* flowlabel and prio (includes version, which shouldn't change either */</div><div class='ctx'> 	flowlabel = *((u_int32_t *)ipv6_hdr(skb));</div><div class='ctx'> </div><div class='del'>-	ret = ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_mangle);</div><div class='add'>+	ret = ip6t_do_table(priv, skb, state);</div><div class='add'>+	verdict = ret &amp; NF_VERDICT_MASK;</div><div class='ctx'> </div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='add'>+	if (verdict != NF_DROP &amp;&amp; verdict != NF_STOLEN &amp;&amp;</div><div class='ctx'> 	    (!ipv6_addr_equal(&amp;ipv6_hdr(skb)-&gt;saddr, &amp;saddr) ||</div><div class='ctx'> 	     !ipv6_addr_equal(&amp;ipv6_hdr(skb)-&gt;daddr, &amp;daddr) ||</div><div class='ctx'> 	     skb-&gt;mark != mark ||</div><div class='ctx'> 	     ipv6_hdr(skb)-&gt;hop_limit != hop_limit ||</div><div class='ctx'> 	     flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {</div><div class='del'>-		err = ip6_route_me_harder(state-&gt;net, skb);</div><div class='add'>+		err = ip6_route_me_harder(state-&gt;net, state-&gt;sk, skb);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			ret = NF_DROP_ERR(err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -74,66 +69,67 @@ ip6table_mangle_hook(void *priv, struct sk_buff *skb,</div><div class='ctx'> 		     const struct nf_hook_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	if (state-&gt;hook == NF_INET_LOCAL_OUT)</div><div class='del'>-		return ip6t_mangle_out(skb, state);</div><div class='del'>-	return ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_mangle);</div><div class='add'>+		return ip6t_mangle_out(priv, skb, state);</div><div class='add'>+	return ip6t_do_table(priv, skb, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nf_hook_ops *mangle_ops __read_mostly;</div><div class='del'>-static int __net_init ip6table_mangle_table_init(struct net *net)</div><div class='add'>+static int ip6table_mangle_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6t_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.ip6table_mangle)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ip6t_alloc_initial_table(&amp;packet_mangler);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ip6t_register_table(net, &amp;packet_mangler, repl, mangle_ops,</div><div class='del'>-				  &amp;net-&gt;ipv6.ip6table_mangle);</div><div class='add'>+	ret = ip6t_register_table(net, &amp;packet_mangler, repl, mangle_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ip6table_mangle_net_exit(struct net *net)</div><div class='add'>+static void __net_exit ip6table_mangle_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv6.ip6table_mangle)</div><div class='del'>-		return;</div><div class='add'>+	ip6t_unregister_table_pre_exit(net, "mangle");</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ip6t_unregister_table(net, net-&gt;ipv6.ip6table_mangle, mangle_ops);</div><div class='del'>-	net-&gt;ipv6.ip6table_mangle = NULL;</div><div class='add'>+static void __net_exit ip6table_mangle_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ip6t_unregister_table_exit(net, "mangle");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6table_mangle_net_ops = {</div><div class='add'>+	.pre_exit = ip6table_mangle_net_pre_exit,</div><div class='ctx'> 	.exit = ip6table_mangle_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ip6table_mangle_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;packet_mangler,</div><div class='add'>+				       ip6table_mangle_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mangle_ops = xt_hook_ops_alloc(&amp;packet_mangler, ip6table_mangle_hook);</div><div class='del'>-	if (IS_ERR(mangle_ops))</div><div class='add'>+	if (IS_ERR(mangle_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 		return PTR_ERR(mangle_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;ip6table_mangle_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 		kfree(mangle_ops);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ip6table_mangle_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;ip6table_mangle_net_ops);</div><div class='del'>-		kfree(mangle_ops);</div><div class='del'>-	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ip6table_mangle_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6table_mangle_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_mangler);</div><div class='ctx'> 	kfree(mangle_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c<br/>index 67ba70ab9f5c..e119d4f090cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_nat.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_nat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_nat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6table_nat.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Based on Rusty Russell's IPv4 NAT code. Development of IPv6 NAT</div><div class='ctx'>  * funded by Astaro.</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,10 +14,12 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_nat_table_init(struct net *net);</div><div class='add'>+struct ip6table_nat_pernet {</div><div class='add'>+	struct nf_hook_ops *nf_nat_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int ip6table_nat_net_id __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static const struct xt_table nf_nat_ipv6_table = {</div><div class='ctx'> 	.name		= "nat",</div><div class='hunk'>@@ -30,37 +29,29 @@ static const struct xt_table nf_nat_ipv6_table = {</div><div class='ctx'> 			  (1 &lt;&lt; NF_INET_LOCAL_IN),</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV6,</div><div class='del'>-	.table_init	= ip6table_nat_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6table_nat_do_chain(void *priv,</div><div class='del'>-					  struct sk_buff *skb,</div><div class='del'>-					  const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_nat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct nf_hook_ops nf_nat_ipv6_ops[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ip6table_nat_do_chain,</div><div class='add'>+		.hook		= ip6t_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV6,</div><div class='ctx'> 		.hooknum	= NF_INET_PRE_ROUTING,</div><div class='ctx'> 		.priority	= NF_IP6_PRI_NAT_DST,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ip6table_nat_do_chain,</div><div class='add'>+		.hook		= ip6t_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV6,</div><div class='ctx'> 		.hooknum	= NF_INET_POST_ROUTING,</div><div class='ctx'> 		.priority	= NF_IP6_PRI_NAT_SRC,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ip6table_nat_do_chain,</div><div class='add'>+		.hook		= ip6t_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV6,</div><div class='ctx'> 		.hooknum	= NF_INET_LOCAL_OUT,</div><div class='ctx'> 		.priority	= NF_IP6_PRI_NAT_DST,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.hook		= ip6table_nat_do_chain,</div><div class='add'>+		.hook		= ip6t_do_table,</div><div class='ctx'> 		.pf		= NFPROTO_IPV6,</div><div class='ctx'> 		.hooknum	= NF_INET_LOCAL_IN,</div><div class='ctx'> 		.priority	= NF_IP6_PRI_NAT_SRC,</div><div class='hunk'>@@ -69,84 +60,113 @@ static const struct nf_hook_ops nf_nat_ipv6_ops[] = {</div><div class='ctx'> </div><div class='ctx'> static int ip6t_nat_register_lookups(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct ip6table_nat_pernet *xt_nat_net;</div><div class='add'>+	struct nf_hook_ops *ops;</div><div class='add'>+	struct xt_table *table;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='add'>+	table = xt_find_table(net, NFPROTO_IPV6, "nat");</div><div class='add'>+	if (WARN_ON_ONCE(!table))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	xt_nat_net = net_generic(net, ip6table_nat_net_id);</div><div class='add'>+	ops = kmemdup(nf_nat_ipv6_ops, sizeof(nf_nat_ipv6_ops), GFP_KERNEL);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(nf_nat_ipv6_ops); i++) {</div><div class='del'>-		ret = nf_nat_l3proto_ipv6_register_fn(net, &amp;nf_nat_ipv6_ops[i]);</div><div class='add'>+		ops[i].priv = table;</div><div class='add'>+		ret = nf_nat_ipv6_register_fn(net, &amp;ops[i]);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			while (i)</div><div class='del'>-				nf_nat_l3proto_ipv6_unregister_fn(net, &amp;nf_nat_ipv6_ops[--i]);</div><div class='add'>+				nf_nat_ipv6_unregister_fn(net, &amp;ops[--i]);</div><div class='ctx'> </div><div class='add'>+			kfree(ops);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	xt_nat_net-&gt;nf_nat_ops = ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6t_nat_unregister_lookups(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct ip6table_nat_pernet *xt_nat_net = net_generic(net, ip6table_nat_net_id);</div><div class='add'>+	struct nf_hook_ops *ops = xt_nat_net-&gt;nf_nat_ops;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(nf_nat_ipv6_ops); i++)</div><div class='del'>-		nf_nat_l3proto_ipv6_unregister_fn(net, &amp;nf_nat_ipv6_ops[i]);</div><div class='add'>+		nf_nat_ipv6_unregister_fn(net, &amp;ops[i]);</div><div class='add'>+</div><div class='add'>+	kfree(ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_nat_table_init(struct net *net)</div><div class='add'>+static int ip6table_nat_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6t_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.ip6table_nat)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ip6t_alloc_initial_table(&amp;nf_nat_ipv6_table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = ip6t_register_table(net, &amp;nf_nat_ipv6_table, repl,</div><div class='del'>-				  NULL, &amp;net-&gt;ipv6.ip6table_nat);</div><div class='add'>+				  NULL);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(repl);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ip6t_nat_register_lookups(net);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		ip6t_unregister_table(net, net-&gt;ipv6.ip6table_nat, NULL);</div><div class='del'>-		net-&gt;ipv6.ip6table_nat = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ip6t_unregister_table_exit(net, "nat");</div><div class='add'>+</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit ip6table_nat_net_exit(struct net *net)</div><div class='add'>+static void __net_exit ip6table_nat_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv6.ip6table_nat)</div><div class='del'>-		return;</div><div class='ctx'> 	ip6t_nat_unregister_lookups(net);</div><div class='del'>-	ip6t_unregister_table(net, net-&gt;ipv6.ip6table_nat, NULL);</div><div class='del'>-	net-&gt;ipv6.ip6table_nat = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit ip6table_nat_net_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ip6t_unregister_table_exit(net, "nat");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6table_nat_net_ops = {</div><div class='add'>+	.pre_exit = ip6table_nat_net_pre_exit,</div><div class='ctx'> 	.exit	= ip6table_nat_net_exit,</div><div class='add'>+	.id	= &amp;ip6table_nat_net_id,</div><div class='add'>+	.size	= sizeof(struct ip6table_nat_pernet),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ip6table_nat_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret = register_pernet_subsys(&amp;ip6table_nat_net_ops);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	/* net-&gt;gen-&gt;ptr[ip6table_nat_net_id] must be allocated</div><div class='add'>+	 * before calling ip6t_nat_register_lookups().</div><div class='add'>+	 */</div><div class='add'>+	ret = register_pernet_subsys(&amp;ip6table_nat_net_ops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = ip6table_nat_table_init(&amp;init_net);</div><div class='add'>+	ret = xt_register_template(&amp;nf_nat_ipv6_table,</div><div class='add'>+				   ip6table_nat_table_init);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		unregister_pernet_subsys(&amp;ip6table_nat_net_ops);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ip6table_nat_exit(void)</div><div class='ctx'> {</div><div class='add'>+	xt_unregister_template(&amp;nf_nat_ipv6_table);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6table_nat_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -154,3 +174,4 @@ module_init(ip6table_nat_init);</div><div class='ctx'> module_exit(ip6table_nat_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Ip6tables legacy nat table");</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c<br/>index 710fa0806c37..fc9f6754028f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6table_raw.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 raw table, a port of the IPv4 raw table to IPv6</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 Jozsef Kadlecsik &lt;kadlec@blackhole.kfki.hu&gt;</div><div class='add'>+ * Copyright (C) 2003 Jozsef Kadlecsik &lt;kadlec@netfilter.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -10,8 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #define RAW_VALID_HOOKS ((1 &lt;&lt; NF_INET_PRE_ROUTING) | (1 &lt;&lt; NF_INET_LOCAL_OUT))</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_raw_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static bool raw_before_defrag __read_mostly;</div><div class='ctx'> MODULE_PARM_DESC(raw_before_defrag, "Enable raw table before defrag");</div><div class='ctx'> module_param(raw_before_defrag, bool, 0000);</div><div class='hunk'>@@ -22,7 +21,6 @@ static const struct xt_table packet_raw = {</div><div class='ctx'> 	.me = THIS_MODULE,</div><div class='ctx'> 	.af = NFPROTO_IPV6,</div><div class='ctx'> 	.priority = NF_IP6_PRI_RAW,</div><div class='del'>-	.table_init = ip6table_raw_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xt_table packet_raw_before_defrag = {</div><div class='hunk'>@@ -31,20 +29,11 @@ static const struct xt_table packet_raw_before_defrag = {</div><div class='ctx'> 	.me = THIS_MODULE,</div><div class='ctx'> 	.af = NFPROTO_IPV6,</div><div class='ctx'> 	.priority = NF_IP6_PRI_RAW_BEFORE_DEFRAG,</div><div class='del'>-	.table_init = ip6table_raw_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The work comes in here from netfilter.c. */</div><div class='del'>-static unsigned int</div><div class='del'>-ip6table_raw_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		  const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *rawtable_ops __read_mostly;</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_raw_table_init(struct net *net)</div><div class='add'>+static int ip6table_raw_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6t_replace *repl;</div><div class='ctx'> 	const struct xt_table *table = &amp;packet_raw;</div><div class='hunk'>@@ -53,66 +42,68 @@ static int __net_init ip6table_raw_table_init(struct net *net)</div><div class='ctx'> 	if (raw_before_defrag)</div><div class='ctx'> 		table = &amp;packet_raw_before_defrag;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.ip6table_raw)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ip6t_alloc_initial_table(table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ip6t_register_table(net, table, repl, rawtable_ops,</div><div class='del'>-				  &amp;net-&gt;ipv6.ip6table_raw);</div><div class='add'>+	ret = ip6t_register_table(net, table, repl, rawtable_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ip6table_raw_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ip6t_unregister_table_pre_exit(net, "raw");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit ip6table_raw_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv6.ip6table_raw)</div><div class='del'>-		return;</div><div class='del'>-	ip6t_unregister_table(net, net-&gt;ipv6.ip6table_raw, rawtable_ops);</div><div class='del'>-	net-&gt;ipv6.ip6table_raw = NULL;</div><div class='add'>+	ip6t_unregister_table_exit(net, "raw");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6table_raw_net_ops = {</div><div class='add'>+	.pre_exit = ip6table_raw_net_pre_exit,</div><div class='ctx'> 	.exit = ip6table_raw_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ip6table_raw_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	const struct xt_table *table = &amp;packet_raw;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (raw_before_defrag) {</div><div class='ctx'> 		table = &amp;packet_raw_before_defrag;</div><div class='del'>-</div><div class='ctx'> 		pr_info("Enabling raw table before defrag\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = xt_register_template(table, ip6table_raw_table_init);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* Register hooks */</div><div class='del'>-	rawtable_ops = xt_hook_ops_alloc(table, ip6table_raw_hook);</div><div class='del'>-	if (IS_ERR(rawtable_ops))</div><div class='add'>+	rawtable_ops = xt_hook_ops_alloc(table, ip6t_do_table);</div><div class='add'>+	if (IS_ERR(rawtable_ops)) {</div><div class='add'>+		xt_unregister_template(table);</div><div class='ctx'> 		return PTR_ERR(rawtable_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;ip6table_raw_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(rawtable_ops);</div><div class='add'>+		xt_unregister_template(table);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ip6table_raw_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;ip6table_raw_net_ops);</div><div class='del'>-		kfree(rawtable_ops);</div><div class='del'>-	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ip6table_raw_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6table_raw_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;packet_raw);</div><div class='ctx'> 	kfree(rawtable_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ip6table_raw_init);</div><div class='ctx'> module_exit(ip6table_raw_fini);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Ip6tables legacy raw table");</div><div class='head'>diff --git a/net/ipv6/netfilter/ip6table_security.c b/net/ipv6/netfilter/ip6table_security.c<br/>index cf26ccb04056..4df14a9bae78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_security.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/ip6table_security.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/ip6table_security.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/ip6table_security.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * "security" table for IPv6</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,10 +11,6 @@</div><div class='ctx'>  * Copyright (C) 1999 Paul `Rusty' Russell &amp; Michael J. Neuling</div><div class='ctx'>  * Copyright (C) 2000-2004 Netfilter Core Team &lt;coreteam &lt;at&gt; netfilter.org&gt;</div><div class='ctx'>  * Copyright (C) 2008 Red Hat, Inc., James Morris &lt;jmorris &lt;at&gt; redhat.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_ipv6/ip6_tables.h&gt;</div><div class='hunk'>@@ -27,80 +24,72 @@ MODULE_DESCRIPTION("ip6tables security table, for MAC rules");</div><div class='ctx'> 				(1 &lt;&lt; NF_INET_FORWARD) | \</div><div class='ctx'> 				(1 &lt;&lt; NF_INET_LOCAL_OUT)</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_security_table_init(struct net *net);</div><div class='del'>-</div><div class='ctx'> static const struct xt_table security_table = {</div><div class='ctx'> 	.name		= "security",</div><div class='ctx'> 	.valid_hooks	= SECURITY_VALID_HOOKS,</div><div class='ctx'> 	.me		= THIS_MODULE,</div><div class='ctx'> 	.af		= NFPROTO_IPV6,</div><div class='ctx'> 	.priority	= NF_IP6_PRI_SECURITY,</div><div class='del'>-	.table_init     = ip6table_security_table_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='del'>-ip6table_security_hook(void *priv, struct sk_buff *skb,</div><div class='del'>-		       const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	return ip6t_do_table(skb, state, state-&gt;net-&gt;ipv6.ip6table_security);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nf_hook_ops *sectbl_ops __read_mostly;</div><div class='ctx'> </div><div class='del'>-static int __net_init ip6table_security_table_init(struct net *net)</div><div class='add'>+static int ip6table_security_table_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6t_replace *repl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (net-&gt;ipv6.ip6table_security)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	repl = ip6t_alloc_initial_table(&amp;security_table);</div><div class='ctx'> 	if (repl == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = ip6t_register_table(net, &amp;security_table, repl, sectbl_ops,</div><div class='del'>-				  &amp;net-&gt;ipv6.ip6table_security);</div><div class='add'>+	ret = ip6t_register_table(net, &amp;security_table, repl, sectbl_ops);</div><div class='ctx'> 	kfree(repl);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ip6table_security_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ip6t_unregister_table_pre_exit(net, "security");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit ip6table_security_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (!net-&gt;ipv6.ip6table_security)</div><div class='del'>-		return;</div><div class='del'>-	ip6t_unregister_table(net, net-&gt;ipv6.ip6table_security, sectbl_ops);</div><div class='del'>-	net-&gt;ipv6.ip6table_security = NULL;</div><div class='add'>+	ip6t_unregister_table_exit(net, "security");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6table_security_net_ops = {</div><div class='add'>+	.pre_exit = ip6table_security_net_pre_exit,</div><div class='ctx'> 	.exit = ip6table_security_net_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ip6table_security_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = xt_register_template(&amp;security_table,</div><div class='add'>+				       ip6table_security_table_init);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	sectbl_ops = xt_hook_ops_alloc(&amp;security_table, ip6table_security_hook);</div><div class='del'>-	if (IS_ERR(sectbl_ops))</div><div class='add'>+	sectbl_ops = xt_hook_ops_alloc(&amp;security_table, ip6t_do_table);</div><div class='add'>+	if (IS_ERR(sectbl_ops)) {</div><div class='add'>+		xt_unregister_template(&amp;security_table);</div><div class='ctx'> 		return PTR_ERR(sectbl_ops);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = register_pernet_subsys(&amp;ip6table_security_net_ops);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(sectbl_ops);</div><div class='add'>+		xt_unregister_template(&amp;security_table);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ip6table_security_table_init(&amp;init_net);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unregister_pernet_subsys(&amp;ip6table_security_net_ops);</div><div class='del'>-		kfree(sectbl_ops);</div><div class='del'>-	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ip6table_security_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6table_security_net_ops);</div><div class='add'>+	xt_unregister_template(&amp;security_table);</div><div class='ctx'> 	kfree(sectbl_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c<br/>index 8f68a518d9db..64ab23ff559b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_conntrack_reasm.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_conntrack_reasm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_conntrack_reasm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_conntrack_reasm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 fragment reassembly for connection tracking</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,11 +8,6 @@</div><div class='ctx'>  *	Yasuyuki Kozakai @USAGI &lt;yasuyuki.kozakai@toshiba.co.jp&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on: net/ipv6/reassembly.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) "IPv6-nf: " fmt</div><div class='hunk'>@@ -19,28 +15,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/socket.h&gt;</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/icmpv6.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6_frag.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-#include &lt;net/transp_v6.h&gt;</div><div class='del'>-#include &lt;net/rawv6.h&gt;</div><div class='del'>-#include &lt;net/ndisc.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-#include &lt;net/inet_ecn.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/ipv6/nf_conntrack_ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='hunk'>@@ -48,42 +29,44 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/ipv6/nf_defrag_ipv6.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const char nf_frags_cache_name[] = "nf-frags";</div><div class='ctx'> </div><div class='add'>+static unsigned int nf_frag_pernet_id __read_mostly;</div><div class='ctx'> static struct inet_frags nf_frags;</div><div class='ctx'> </div><div class='add'>+static struct nft_ct_frag6_pernet *nf_frag_pernet(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return net_generic(net, nf_frag_pernet_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table nf_ct_frag6_sysctl_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nf_conntrack_frag6_timeout",</div><div class='del'>-		.data		= &amp;init_net.nf_frag.frags.timeout,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nf_conntrack_frag6_low_thresh",</div><div class='del'>-		.data		= &amp;init_net.nf_frag.frags.low_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra2		= &amp;init_net.nf_frag.frags.high_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nf_conntrack_frag6_high_thresh",</div><div class='del'>-		.data		= &amp;init_net.nf_frag.frags.high_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra1		= &amp;init_net.nf_frag.frags.low_thresh</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nf_ct_frag6_sysctl_register(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag;</div><div class='ctx'> 	struct ctl_table *table;</div><div class='ctx'> 	struct ctl_table_header *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -93,20 +76,22 @@ static int nf_ct_frag6_sysctl_register(struct net *net)</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 		if (table == NULL)</div><div class='ctx'> 			goto err_alloc;</div><div class='del'>-</div><div class='del'>-		table[0].data = &amp;net-&gt;nf_frag.frags.timeout;</div><div class='del'>-		table[1].data = &amp;net-&gt;nf_frag.frags.low_thresh;</div><div class='del'>-		table[1].extra2 = &amp;net-&gt;nf_frag.frags.high_thresh;</div><div class='del'>-		table[2].data = &amp;net-&gt;nf_frag.frags.high_thresh;</div><div class='del'>-		table[2].extra1 = &amp;net-&gt;nf_frag.frags.low_thresh;</div><div class='del'>-		table[2].extra2 = &amp;init_net.nf_frag.frags.high_thresh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = register_net_sysctl(net, "net/netfilter", table);</div><div class='add'>+	nf_frag = nf_frag_pernet(net);</div><div class='add'>+</div><div class='add'>+	table[0].data	= &amp;nf_frag-&gt;fqdir-&gt;timeout;</div><div class='add'>+	table[1].data	= &amp;nf_frag-&gt;fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].extra2	= &amp;nf_frag-&gt;fqdir-&gt;high_thresh;</div><div class='add'>+	table[2].data	= &amp;nf_frag-&gt;fqdir-&gt;high_thresh;</div><div class='add'>+	table[2].extra1	= &amp;nf_frag-&gt;fqdir-&gt;low_thresh;</div><div class='add'>+</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/netfilter", table,</div><div class='add'>+				     ARRAY_SIZE(nf_ct_frag6_sysctl_table));</div><div class='ctx'> 	if (hdr == NULL)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='del'>-	net-&gt;nf_frag_frags_hdr = hdr;</div><div class='add'>+	nf_frag-&gt;nf_frag_frags_hdr = hdr;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reg:</div><div class='hunk'>@@ -118,10 +103,11 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag = nf_frag_pernet(net);</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='del'>-	table = net-&gt;nf_frag_frags_hdr-&gt;ctl_table_arg;</div><div class='del'>-	unregister_net_sysctl_table(net-&gt;nf_frag_frags_hdr);</div><div class='add'>+	table = nf_frag-&gt;nf_frag_frags_hdr-&gt;ctl_table_arg;</div><div class='add'>+	unregister_net_sysctl_table(nf_frag-&gt;nf_frag_frags_hdr);</div><div class='ctx'> 	if (!net_eq(net, &amp;init_net))</div><div class='ctx'> 		kfree(table);</div><div class='ctx'> }</div><div class='hunk'>@@ -136,6 +122,10 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int nf_ct_frag6_reasm(struct frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			     struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			     int *refs);</div><div class='add'>+</div><div class='ctx'> static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)</div><div class='ctx'> {</div><div class='ctx'> 	return 1 &lt;&lt; (ipv6_get_dsfield(ipv6h) &amp; INET_ECN_MASK);</div><div class='hunk'>@@ -143,20 +133,19 @@ static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)</div><div class='ctx'> </div><div class='ctx'> static void nf_ct_frag6_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frag_queue *frag = from_timer(frag, t, timer);</div><div class='add'>+	struct inet_frag_queue *frag = timer_container_of(frag, t, timer);</div><div class='ctx'> 	struct frag_queue *fq;</div><div class='del'>-	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	fq = container_of(frag, struct frag_queue, q);</div><div class='del'>-	net = container_of(fq-&gt;q.net, struct net, nf_frag.frags);</div><div class='ctx'> </div><div class='del'>-	ip6frag_expire_frag_queue(net, fq);</div><div class='add'>+	ip6frag_expire_frag_queue(fq-&gt;q.fqdir-&gt;net, fq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Creation primitives. */</div><div class='ctx'> static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user,</div><div class='ctx'> 				  const struct ipv6hdr *hdr, int iif)</div><div class='ctx'> {</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag = nf_frag_pernet(net);</div><div class='ctx'> 	struct frag_v6_compare_key key = {</div><div class='ctx'> 		.id = id,</div><div class='ctx'> 		.saddr = hdr-&gt;saddr,</div><div class='hunk'>@@ -166,7 +155,11 @@ static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inet_frag_queue *q;</div><div class='ctx'> </div><div class='del'>-	q = inet_frag_find(&amp;net-&gt;nf_frag.frags, &amp;key);</div><div class='add'>+	if (!(ipv6_addr_type(&amp;hdr-&gt;daddr) &amp; (IPV6_ADDR_MULTICAST |</div><div class='add'>+					    IPV6_ADDR_LINKLOCAL)))</div><div class='add'>+		key.iif = 0;</div><div class='add'>+</div><div class='add'>+	q = inet_frag_find(nf_frag-&gt;fqdir, &amp;key);</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -175,11 +168,13 @@ static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='del'>-			     const struct frag_hdr *fhdr, int nhoff)</div><div class='add'>+			     const struct frag_hdr *fhdr, int nhoff,</div><div class='add'>+			     int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *prev, *next;</div><div class='ctx'> 	unsigned int payload_len;</div><div class='del'>-	int offset, end;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sk_buff *prev;</div><div class='add'>+	int offset, end, err;</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='ctx'> 	if (fq-&gt;q.flags &amp; INET_FRAG_COMPLETE) {</div><div class='hunk'>@@ -228,7 +223,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='ctx'> 			 * this case. -DaveM</div><div class='ctx'> 			 */</div><div class='ctx'> 			pr_debug("end of fragment not rounded to 8 bytes.\n");</div><div class='del'>-			inet_frag_kill(&amp;fq-&gt;q);</div><div class='add'>+			inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> 			return -EPROTO;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (end &gt; fq-&gt;q.len) {</div><div class='hunk'>@@ -254,62 +249,32 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Find out which fragments are in front and at the back of us</div><div class='del'>-	 * in the chain of fragments so far.  We must know where to put</div><div class='del'>-	 * this fragment, right?</div><div class='del'>-	 */</div><div class='del'>-	prev = fq-&gt;q.fragments_tail;</div><div class='del'>-	if (!prev || prev-&gt;ip_defrag_offset &lt; offset) {</div><div class='del'>-		next = NULL;</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-	prev = NULL;</div><div class='del'>-	for (next = fq-&gt;q.fragments; next != NULL; next = next-&gt;next) {</div><div class='del'>-		if (next-&gt;ip_defrag_offset &gt;= offset)</div><div class='del'>-			break;	/* bingo! */</div><div class='del'>-		prev = next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	/* RFC5722, Section 4:</div><div class='del'>-	 *                                  When reassembling an IPv6 datagram, if</div><div class='del'>-	 *   one or more its constituent fragments is determined to be an</div><div class='del'>-	 *   overlapping fragment, the entire datagram (and any constituent</div><div class='del'>-	 *   fragments, including those not yet received) MUST be silently</div><div class='del'>-	 *   discarded.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Check for overlap with preceding fragment. */</div><div class='del'>-	if (prev &amp;&amp;</div><div class='del'>-	    (prev-&gt;ip_defrag_offset + prev-&gt;len) &gt; offset)</div><div class='del'>-		goto discard_fq;</div><div class='del'>-</div><div class='del'>-	/* Look for overlap with succeeding segment. */</div><div class='del'>-	if (next &amp;&amp; next-&gt;ip_defrag_offset &lt; end)</div><div class='del'>-		goto discard_fq;</div><div class='del'>-</div><div class='del'>-	/* Note : skb-&gt;ip_defrag_offset and skb-&gt;dev share the same location */</div><div class='del'>-	if (skb-&gt;dev)</div><div class='del'>-		fq-&gt;iif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	/* Note : skb-&gt;rbnode and skb-&gt;dev share the same location. */</div><div class='add'>+	dev = skb-&gt;dev;</div><div class='ctx'> 	/* Makes sure compiler wont do silly aliasing games */</div><div class='ctx'> 	barrier();</div><div class='del'>-	skb-&gt;ip_defrag_offset = offset;</div><div class='ctx'> </div><div class='del'>-	/* Insert this fragment in the chain of fragments. */</div><div class='del'>-	skb-&gt;next = next;</div><div class='del'>-	if (!next)</div><div class='del'>-		fq-&gt;q.fragments_tail = skb;</div><div class='del'>-	if (prev)</div><div class='del'>-		prev-&gt;next = skb;</div><div class='del'>-	else</div><div class='del'>-		fq-&gt;q.fragments = skb;</div><div class='add'>+	prev = fq-&gt;q.fragments_tail;</div><div class='add'>+	err = inet_frag_queue_insert(&amp;fq-&gt;q, skb, offset, end);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == IPFRAG_DUP) {</div><div class='add'>+			/* No error for duplicates, pretend they got queued. */</div><div class='add'>+			kfree_skb_reason(skb, SKB_DROP_REASON_DUP_FRAG);</div><div class='add'>+			return -EINPROGRESS;</div><div class='add'>+		}</div><div class='add'>+		goto insert_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		fq-&gt;iif = dev-&gt;ifindex;</div><div class='ctx'> </div><div class='ctx'> 	fq-&gt;q.stamp = skb-&gt;tstamp;</div><div class='add'>+	fq-&gt;q.tstamp_type = skb-&gt;tstamp_type;</div><div class='ctx'> 	fq-&gt;q.meat += skb-&gt;len;</div><div class='ctx'> 	fq-&gt;ecn |= ecn;</div><div class='ctx'> 	if (payload_len &gt; fq-&gt;q.max_size)</div><div class='ctx'> 		fq-&gt;q.max_size = payload_len;</div><div class='del'>-	add_frag_mem_limit(fq-&gt;q.net, skb-&gt;truesize);</div><div class='add'>+	add_frag_mem_limit(fq-&gt;q.fqdir, skb-&gt;truesize);</div><div class='ctx'> </div><div class='ctx'> 	/* The first fragment.</div><div class='ctx'> 	 * nhoffset is obtained from the first fragment, of course.</div><div class='hunk'>@@ -319,11 +284,28 @@ found:</div><div class='ctx'> 		fq-&gt;q.flags |= INET_FRAG_FIRST_IN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (fq-&gt;q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &amp;&amp;</div><div class='add'>+	    fq-&gt;q.meat == fq-&gt;q.len) {</div><div class='add'>+		unsigned long orefdst = skb-&gt;_skb_refdst;</div><div class='add'>+</div><div class='add'>+		skb-&gt;_skb_refdst = 0UL;</div><div class='add'>+		err = nf_ct_frag6_reasm(fq, skb, prev, dev, refs);</div><div class='add'>+		skb-&gt;_skb_refdst = orefdst;</div><div class='add'>+</div><div class='add'>+		/* After queue has assumed skb ownership, only 0 or</div><div class='add'>+		 * -EINPROGRESS must be returned.</div><div class='add'>+		 */</div><div class='add'>+		return err ? -EINPROGRESS : 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-discard_fq:</div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='add'>+	skb_dst_drop(skb);</div><div class='add'>+	skb_orphan(skb);</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+insert_error:</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> err:</div><div class='add'>+	skb_dst_drop(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,141 +315,68 @@ err:</div><div class='ctx'>  *	It is called with locked fq, and caller must check that</div><div class='ctx'>  *	queue is eligible for reassembly i.e. it is not COMPLETE,</div><div class='ctx'>  *	the last and the first frames arrived and all the bits are here.</div><div class='del'>- *</div><div class='del'>- *	returns true if *prev skb has been transformed into the reassembled</div><div class='del'>- *	skb, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static bool</div><div class='del'>-nf_ct_frag6_reasm(struct frag_queue *fq, struct sk_buff *prev,  struct net_device *dev)</div><div class='add'>+static int nf_ct_frag6_reasm(struct frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			     struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			     int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *fp, *head = fq-&gt;q.fragments;</div><div class='del'>-	int    payload_len;</div><div class='add'>+	void *reasm_data;</div><div class='add'>+	int payload_len;</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='del'>-</div><div class='del'>-	WARN_ON(head == NULL);</div><div class='del'>-	WARN_ON(head-&gt;ip_defrag_offset != 0);</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> </div><div class='ctx'> 	ecn = ip_frag_ecn_table[fq-&gt;ecn];</div><div class='ctx'> 	if (unlikely(ecn == 0xff))</div><div class='del'>-		return false;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* Unfragmented part is taken from the first segment. */</div><div class='del'>-	payload_len = ((head-&gt;data - skb_network_header(head)) -</div><div class='add'>+	reasm_data = inet_frag_reasm_prepare(&amp;fq-&gt;q, skb, prev_tail);</div><div class='add'>+	if (!reasm_data)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	payload_len = -skb_network_offset(skb) -</div><div class='ctx'> 		       sizeof(struct ipv6hdr) + fq-&gt;q.len -</div><div class='del'>-		       sizeof(struct frag_hdr));</div><div class='add'>+		       sizeof(struct frag_hdr);</div><div class='ctx'> 	if (payload_len &gt; IPV6_MAXPLEN) {</div><div class='ctx'> 		net_dbg_ratelimited("nf_ct_frag6_reasm: payload len = %d\n",</div><div class='ctx'> 				    payload_len);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Head of list must not be cloned. */</div><div class='del'>-	if (skb_unclone(head, GFP_ATOMIC))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* If the first fragment is fragmented itself, we split</div><div class='del'>-	 * it to two chunks: the first with data and paged part</div><div class='del'>-	 * and the second, holding only fragments. */</div><div class='del'>-	if (skb_has_frag_list(head)) {</div><div class='del'>-		struct sk_buff *clone;</div><div class='del'>-		int i, plen = 0;</div><div class='del'>-</div><div class='del'>-		clone = alloc_skb(0, GFP_ATOMIC);</div><div class='del'>-		if (clone == NULL)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		clone-&gt;next = head-&gt;next;</div><div class='del'>-		head-&gt;next = clone;</div><div class='del'>-		skb_shinfo(clone)-&gt;frag_list = skb_shinfo(head)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(head);</div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(head)-&gt;nr_frags; i++)</div><div class='del'>-			plen += skb_frag_size(&amp;skb_shinfo(head)-&gt;frags[i]);</div><div class='del'>-		clone-&gt;len = clone-&gt;data_len = head-&gt;data_len - plen;</div><div class='del'>-		head-&gt;data_len -= clone-&gt;len;</div><div class='del'>-		head-&gt;len -= clone-&gt;len;</div><div class='del'>-		clone-&gt;csum = 0;</div><div class='del'>-		clone-&gt;ip_summed = head-&gt;ip_summed;</div><div class='del'>-</div><div class='del'>-		add_frag_mem_limit(fq-&gt;q.net, clone-&gt;truesize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* morph head into last received skb: prev.</div><div class='del'>-	 *</div><div class='del'>-	 * This allows callers of ipv6 conntrack defrag to continue</div><div class='del'>-	 * to use the last skb(frag) passed into the reasm engine.</div><div class='del'>-	 * The last skb frag 'silently' turns into the full reassembled skb.</div><div class='del'>-	 *</div><div class='del'>-	 * Since prev is also part of q-&gt;fragments we have to clone it first.</div><div class='del'>-	 */</div><div class='del'>-	if (head != prev) {</div><div class='del'>-		struct sk_buff *iter;</div><div class='del'>-</div><div class='del'>-		fp = skb_clone(prev, GFP_ATOMIC);</div><div class='del'>-		if (!fp)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		fp-&gt;next = prev-&gt;next;</div><div class='del'>-</div><div class='del'>-		iter = head;</div><div class='del'>-		while (iter) {</div><div class='del'>-			if (iter-&gt;next == prev) {</div><div class='del'>-				iter-&gt;next = fp;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			iter = iter-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb_morph(prev, head);</div><div class='del'>-		prev-&gt;next = head-&gt;next;</div><div class='del'>-		consume_skb(head);</div><div class='del'>-		head = prev;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have to remove fragment header from datagram and to relocate</div><div class='ctx'> 	 * header in order to calculate ICV correctly. */</div><div class='del'>-	skb_network_header(head)[fq-&gt;nhoffset] = skb_transport_header(head)[0];</div><div class='del'>-	memmove(head-&gt;head + sizeof(struct frag_hdr), head-&gt;head,</div><div class='del'>-		(head-&gt;data - head-&gt;head) - sizeof(struct frag_hdr));</div><div class='del'>-	head-&gt;mac_header += sizeof(struct frag_hdr);</div><div class='del'>-	head-&gt;network_header += sizeof(struct frag_hdr);</div><div class='del'>-</div><div class='del'>-	skb_shinfo(head)-&gt;frag_list = head-&gt;next;</div><div class='del'>-	skb_reset_transport_header(head);</div><div class='del'>-	skb_push(head, head-&gt;data - skb_network_header(head));</div><div class='del'>-</div><div class='del'>-	for (fp = head-&gt;next; fp; fp = fp-&gt;next) {</div><div class='del'>-		head-&gt;data_len += fp-&gt;len;</div><div class='del'>-		head-&gt;len += fp-&gt;len;</div><div class='del'>-		if (head-&gt;ip_summed != fp-&gt;ip_summed)</div><div class='del'>-			head-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-		else if (head-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='del'>-			head-&gt;csum = csum_add(head-&gt;csum, fp-&gt;csum);</div><div class='del'>-		head-&gt;truesize += fp-&gt;truesize;</div><div class='del'>-		fp-&gt;sk = NULL;</div><div class='del'>-	}</div><div class='del'>-	sub_frag_mem_limit(fq-&gt;q.net, head-&gt;truesize);</div><div class='add'>+	skb_network_header(skb)[fq-&gt;nhoffset] = skb_transport_header(skb)[0];</div><div class='add'>+	memmove(skb-&gt;head + sizeof(struct frag_hdr), skb-&gt;head,</div><div class='add'>+		(skb-&gt;data - skb-&gt;head) - sizeof(struct frag_hdr));</div><div class='add'>+	skb-&gt;mac_header += sizeof(struct frag_hdr);</div><div class='add'>+	skb-&gt;network_header += sizeof(struct frag_hdr);</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	inet_frag_reasm_finish(&amp;fq-&gt;q, skb, reasm_data, false);</div><div class='ctx'> </div><div class='del'>-	head-&gt;ignore_df = 1;</div><div class='del'>-	head-&gt;next = NULL;</div><div class='del'>-	head-&gt;dev = dev;</div><div class='del'>-	head-&gt;tstamp = fq-&gt;q.stamp;</div><div class='del'>-	ipv6_hdr(head)-&gt;payload_len = htons(payload_len);</div><div class='del'>-	ipv6_change_dsfield(ipv6_hdr(head), 0xff, ecn);</div><div class='del'>-	IP6CB(head)-&gt;frag_max_size = sizeof(struct ipv6hdr) + fq-&gt;q.max_size;</div><div class='add'>+	skb-&gt;ignore_df = 1;</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	ipv6_hdr(skb)-&gt;payload_len = htons(payload_len);</div><div class='add'>+	ipv6_change_dsfield(ipv6_hdr(skb), 0xff, ecn);</div><div class='add'>+	IP6CB(skb)-&gt;frag_max_size = sizeof(struct ipv6hdr) + fq-&gt;q.max_size;</div><div class='add'>+	IP6CB(skb)-&gt;flags |= IP6SKB_FRAGMENTED;</div><div class='ctx'> </div><div class='ctx'> 	/* Yes, and fold redundant checksum back. 8) */</div><div class='del'>-	if (head-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='del'>-		head-&gt;csum = csum_partial(skb_network_header(head),</div><div class='del'>-					  skb_network_header_len(head),</div><div class='del'>-					  head-&gt;csum);</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='add'>+		skb-&gt;csum = csum_partial(skb_network_header(skb),</div><div class='add'>+					 skb_network_header_len(skb),</div><div class='add'>+					 skb-&gt;csum);</div><div class='ctx'> </div><div class='del'>-	fq-&gt;q.fragments = NULL;</div><div class='ctx'> 	fq-&gt;q.rb_fragments = RB_ROOT;</div><div class='ctx'> 	fq-&gt;q.fragments_tail = NULL;</div><div class='add'>+	fq-&gt;q.last_run_head = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+err:</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -511,7 +420,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)</div><div class='ctx'> 		if (skb_copy_bits(skb, start, &amp;hdr, sizeof(hdr)))</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		if (nexthdr == NEXTHDR_AUTH)</div><div class='del'>-			hdrlen = (hdr.hdrlen+2)&lt;&lt;2;</div><div class='add'>+			hdrlen = ipv6_authlen(&amp;hdr);</div><div class='ctx'> 		else</div><div class='ctx'> 			hdrlen = ipv6_optlen(&amp;hdr);</div><div class='ctx'> </div><div class='hunk'>@@ -536,11 +445,12 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)</div><div class='ctx'> int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> {</div><div class='ctx'> 	u16 savethdr = skb-&gt;transport_header;</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='add'>+	u8 nexthdr = NEXTHDR_FRAGMENT;</div><div class='ctx'> 	int fhoff, nhoff, ret;</div><div class='ctx'> 	struct frag_hdr *fhdr;</div><div class='ctx'> 	struct frag_queue *fq;</div><div class='ctx'> 	struct ipv6hdr *hdr;</div><div class='add'>+	int refs = 0;</div><div class='ctx'> 	u8 prevhdr;</div><div class='ctx'> </div><div class='ctx'> 	/* Jumbo payload inhibits frag. header */</div><div class='hunk'>@@ -552,6 +462,14 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> 	if (find_prev_fhdr(skb, &amp;prevhdr, &amp;nhoff, &amp;fhoff) &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Discard the first fragment if it does not include all headers</div><div class='add'>+	 * RFC 8200, Section 4.5</div><div class='add'>+	 */</div><div class='add'>+	if (ipv6frag_thdr_truncated(skb, fhoff, &amp;nexthdr)) {</div><div class='add'>+		pr_debug("Drop incomplete fragment\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!pskb_may_pull(skb, fhoff + sizeof(*fhdr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -559,74 +477,70 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)</div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='ctx'> 	fhdr = (struct frag_hdr *)skb_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len - skb_network_offset(skb) &lt; IPV6_MIN_MTU &amp;&amp;</div><div class='del'>-	    fhdr-&gt;frag_off &amp; htons(IP6_MF))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	skb_orphan(skb);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	fq = fq_find(net, fhdr-&gt;identification, user, hdr,</div><div class='ctx'> 		     skb-&gt;dev ? skb-&gt;dev-&gt;ifindex : 0);</div><div class='ctx'> 	if (fq == NULL) {</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		pr_debug("Can't find and can't create new queue\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;fq-&gt;q.lock);</div><div class='ctx'> </div><div class='del'>-	ret = nf_ct_frag6_queue(fq, skb, fhdr, nhoff);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		if (ret == -EPROTO) {</div><div class='del'>-			skb-&gt;transport_header = savethdr;</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* after queue has assumed skb ownership, only 0 or -EINPROGRESS</div><div class='del'>-	 * must be returned.</div><div class='del'>-	 */</div><div class='del'>-	ret = -EINPROGRESS;</div><div class='del'>-	if (fq-&gt;q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &amp;&amp;</div><div class='del'>-	    fq-&gt;q.meat == fq-&gt;q.len &amp;&amp;</div><div class='del'>-	    nf_ct_frag6_reasm(fq, skb, dev))</div><div class='add'>+	ret = nf_ct_frag6_queue(fq, skb, fhdr, nhoff, &amp;refs);</div><div class='add'>+	if (ret == -EPROTO) {</div><div class='add'>+		skb-&gt;transport_header = savethdr;</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	else</div><div class='del'>-		skb_dst_drop(skb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;fq-&gt;q.lock);</div><div class='del'>-	inet_frag_put(&amp;fq-&gt;q);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	inet_frag_putn(&amp;fq-&gt;q, refs);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_ct_frag6_gather);</div><div class='ctx'> </div><div class='ctx'> static int nf_ct_net_init(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag  = nf_frag_pernet(net);</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	net-&gt;nf_frag.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='del'>-	net-&gt;nf_frag.frags.low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='del'>-	net-&gt;nf_frag.frags.timeout = IPV6_FRAG_TIMEOUT;</div><div class='del'>-	net-&gt;nf_frag.frags.f = &amp;nf_frags;</div><div class='del'>-</div><div class='del'>-	res = inet_frags_init_net(&amp;net-&gt;nf_frag.frags);</div><div class='add'>+	res = fqdir_init(&amp;nf_frag-&gt;fqdir, &amp;nf_frags, net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='add'>+</div><div class='add'>+	nf_frag-&gt;fqdir-&gt;high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='add'>+	nf_frag-&gt;fqdir-&gt;low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='add'>+	nf_frag-&gt;fqdir-&gt;timeout = IPV6_FRAG_TIMEOUT;</div><div class='add'>+</div><div class='ctx'> 	res = nf_ct_frag6_sysctl_register(net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='del'>-		inet_frags_exit_net(&amp;net-&gt;nf_frag.frags);</div><div class='add'>+		fqdir_exit(nf_frag-&gt;fqdir);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nf_ct_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag  = nf_frag_pernet(net);</div><div class='add'>+</div><div class='add'>+	fqdir_pre_exit(nf_frag-&gt;fqdir);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nf_ct_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct nft_ct_frag6_pernet *nf_frag  = nf_frag_pernet(net);</div><div class='add'>+</div><div class='ctx'> 	nf_ct_frags6_sysctl_unregister(net);</div><div class='del'>-	inet_frags_exit_net(&amp;net-&gt;nf_frag.frags);</div><div class='add'>+	fqdir_exit(nf_frag-&gt;fqdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations nf_ct_net_ops = {</div><div class='del'>-	.init = nf_ct_net_init,</div><div class='del'>-	.exit = nf_ct_net_exit,</div><div class='add'>+	.init		= nf_ct_net_init,</div><div class='add'>+	.pre_exit	= nf_ct_net_pre_exit,</div><div class='add'>+	.exit		= nf_ct_net_exit,</div><div class='add'>+	.id		= &amp;nf_frag_pernet_id,</div><div class='add'>+	.size		= sizeof(struct nft_ct_frag6_pernet),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct rhashtable_params nfct_rhash_params = {</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c<br/>index 72dd3e202375..be7817fbc024 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_defrag_ipv6_hooks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_defrag_ipv6_hooks.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -13,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/icmp.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;net/ipv6_frag.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -92,13 +90,19 @@ static const struct nf_hook_ops ipv6_defrag_ops[] = {</div><div class='ctx'> </div><div class='ctx'> static void __net_exit defrag6_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	if (net-&gt;nf.defrag_ipv6) {</div><div class='add'>+	if (net-&gt;nf.defrag_ipv6_users) {</div><div class='ctx'> 		nf_unregister_net_hooks(net, ipv6_defrag_ops,</div><div class='ctx'> 					ARRAY_SIZE(ipv6_defrag_ops));</div><div class='del'>-		net-&gt;nf.defrag_ipv6 = false;</div><div class='add'>+		net-&gt;nf.defrag_ipv6_users = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct nf_defrag_hook defrag_hook = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.enable = nf_defrag_ipv6_enable,</div><div class='add'>+	.disable = nf_defrag_ipv6_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct pernet_operations defrag6_net_ops = {</div><div class='ctx'> 	.exit = defrag6_net_exit,</div><div class='ctx'> };</div><div class='hunk'>@@ -117,6 +121,9 @@ static int __init nf_defrag_init(void)</div><div class='ctx'> 		pr_err("nf_defrag_ipv6: can't register pernet ops\n");</div><div class='ctx'> 		goto cleanup_frag6;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(nf_defrag_v6_hook, &amp;defrag_hook);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> cleanup_frag6:</div><div class='hunk'>@@ -127,6 +134,7 @@ cleanup_frag6:</div><div class='ctx'> </div><div class='ctx'> static void __exit nf_defrag_fini(void)</div><div class='ctx'> {</div><div class='add'>+	rcu_assign_pointer(nf_defrag_v6_hook, NULL);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;defrag6_net_ops);</div><div class='ctx'> 	nf_ct_frag6_cleanup();</div><div class='ctx'> }</div><div class='hunk'>@@ -135,19 +143,21 @@ int nf_defrag_ipv6_enable(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (net-&gt;nf.defrag_ipv6)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;defrag6_mutex);</div><div class='del'>-	if (net-&gt;nf.defrag_ipv6)</div><div class='add'>+	if (net-&gt;nf.defrag_ipv6_users == UINT_MAX) {</div><div class='add'>+		err = -EOVERFLOW;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (net-&gt;nf.defrag_ipv6_users) {</div><div class='add'>+		net-&gt;nf.defrag_ipv6_users++;</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = nf_register_net_hooks(net, ipv6_defrag_ops,</div><div class='ctx'> 				    ARRAY_SIZE(ipv6_defrag_ops));</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		net-&gt;nf.defrag_ipv6 = true;</div><div class='add'>+		net-&gt;nf.defrag_ipv6_users = 1;</div><div class='ctx'> </div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;defrag6_mutex);</div><div class='hunk'>@@ -155,7 +165,21 @@ int nf_defrag_ipv6_enable(struct net *net)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_defrag_ipv6_enable);</div><div class='ctx'> </div><div class='add'>+void nf_defrag_ipv6_disable(struct net *net)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;defrag6_mutex);</div><div class='add'>+	if (net-&gt;nf.defrag_ipv6_users) {</div><div class='add'>+		net-&gt;nf.defrag_ipv6_users--;</div><div class='add'>+		if (net-&gt;nf.defrag_ipv6_users == 0)</div><div class='add'>+			nf_unregister_net_hooks(net, ipv6_defrag_ops,</div><div class='add'>+						ARRAY_SIZE(ipv6_defrag_ops));</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;defrag6_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_defrag_ipv6_disable);</div><div class='add'>+</div><div class='ctx'> module_init(nf_defrag_init);</div><div class='ctx'> module_exit(nf_defrag_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IPv6 defragmentation support");</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c<br/>index 4a7ddeddbaab..6da3102b7c1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_dup_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_dup_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_dup_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_dup_ipv6.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * (C) 2007 by Sebastian Claßen &lt;sebastian.classen@freenet.ag&gt;</div><div class='ctx'>  * (C) 2007-2010 by Jan Engelhardt &lt;jengelh@medozas.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Extracted from xt_TEE.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 or later, as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -41,7 +38,7 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='del'>-	skb-&gt;dev      = dst-&gt;dev;</div><div class='add'>+	skb-&gt;dev      = dst_dev(dst);</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -50,14 +47,15 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb,</div><div class='ctx'> void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,</div><div class='ctx'> 		 const struct in6_addr *gw, int oif)</div><div class='ctx'> {</div><div class='del'>-	if (this_cpu_read(nf_skb_duplicated))</div><div class='del'>-		return;</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	if (current-&gt;in_nf_duplicate)</div><div class='add'>+		goto out;</div><div class='ctx'> 	skb = pskb_copy(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> 	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (hooknum == NF_INET_PRE_ROUTING ||</div><div class='hunk'>@@ -66,12 +64,14 @@ void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,</div><div class='ctx'> 		--iph-&gt;hop_limit;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (nf_dup_ipv6_route(net, skb, gw, oif)) {</div><div class='del'>-		__this_cpu_write(nf_skb_duplicated, true);</div><div class='add'>+		current-&gt;in_nf_duplicate = true;</div><div class='ctx'> 		ip6_local_out(net, skb-&gt;sk, skb);</div><div class='del'>-		__this_cpu_write(nf_skb_duplicated, false);</div><div class='add'>+		current-&gt;in_nf_duplicate = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_dup_ipv6);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/netfilter/nf_flow_table_ipv6.c b/net/ipv6/netfilter/nf_flow_table_ipv6.c<br/>deleted file mode 100644<br/>index c511d206bf9b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_flow_table_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_flow_table_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/rhashtable.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_flow_table.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-</div><div class='del'>-static struct nf_flowtable_type flowtable_ipv6 = {</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.init		= nf_flow_table_init,</div><div class='del'>-	.free		= nf_flow_table_free,</div><div class='del'>-	.hook		= nf_flow_offload_ipv6_hook,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_flow_ipv6_module_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_flowtable_type(&amp;flowtable_ipv6);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_flow_ipv6_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_flowtable_type(&amp;flowtable_ipv6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_flow_ipv6_module_init);</div><div class='del'>-module_exit(nf_flow_ipv6_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='del'>-MODULE_ALIAS_NF_FLOWTABLE(AF_INET6);</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_log_ipv6.c b/net/ipv6/netfilter/nf_log_ipv6.c<br/>deleted file mode 100644<br/>index c6bf580d0f33..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_log_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_log_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,428 +0,0 @@</div><div class='del'>-/* (C) 1999-2001 Paul `Rusty' Russell</div><div class='del'>- * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/icmp.h&gt;</div><div class='del'>-#include &lt;net/udp.h&gt;</div><div class='del'>-#include &lt;net/tcp.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6/ip6_tables.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/xt_LOG.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_log.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct nf_loginfo default_loginfo = {</div><div class='del'>-	.type	= NF_LOG_TYPE_LOG,</div><div class='del'>-	.u = {</div><div class='del'>-		.log = {</div><div class='del'>-			.level	  = LOGLEVEL_NOTICE,</div><div class='del'>-			.logflags = NF_LOG_DEFAULT_MASK,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* One level of recursion won't kill us */</div><div class='del'>-static void dump_ipv6_packet(struct net *net, struct nf_log_buf *m,</div><div class='del'>-			     const struct nf_loginfo *info,</div><div class='del'>-			     const struct sk_buff *skb, unsigned int ip6hoff,</div><div class='del'>-			     int recurse)</div><div class='del'>-{</div><div class='del'>-	u_int8_t currenthdr;</div><div class='del'>-	int fragment;</div><div class='del'>-	struct ipv6hdr _ip6h;</div><div class='del'>-	const struct ipv6hdr *ih;</div><div class='del'>-	unsigned int ptr;</div><div class='del'>-	unsigned int hdrlen = 0;</div><div class='del'>-	unsigned int logflags;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;type == NF_LOG_TYPE_LOG)</div><div class='del'>-		logflags = info-&gt;u.log.logflags;</div><div class='del'>-	else</div><div class='del'>-		logflags = NF_LOG_DEFAULT_MASK;</div><div class='del'>-</div><div class='del'>-	ih = skb_header_pointer(skb, ip6hoff, sizeof(_ip6h), &amp;_ip6h);</div><div class='del'>-	if (ih == NULL) {</div><div class='del'>-		nf_log_buf_add(m, "TRUNCATED");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000 " */</div><div class='del'>-	nf_log_buf_add(m, "SRC=%pI6 DST=%pI6 ", &amp;ih-&gt;saddr, &amp;ih-&gt;daddr);</div><div class='del'>-</div><div class='del'>-	/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */</div><div class='del'>-	nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",</div><div class='del'>-	       ntohs(ih-&gt;payload_len) + sizeof(struct ipv6hdr),</div><div class='del'>-	       (ntohl(*(__be32 *)ih) &amp; 0x0ff00000) &gt;&gt; 20,</div><div class='del'>-	       ih-&gt;hop_limit,</div><div class='del'>-	       (ntohl(*(__be32 *)ih) &amp; 0x000fffff));</div><div class='del'>-</div><div class='del'>-	fragment = 0;</div><div class='del'>-	ptr = ip6hoff + sizeof(struct ipv6hdr);</div><div class='del'>-	currenthdr = ih-&gt;nexthdr;</div><div class='del'>-	while (currenthdr != NEXTHDR_NONE &amp;&amp; ip6t_ext_hdr(currenthdr)) {</div><div class='del'>-		struct ipv6_opt_hdr _hdr;</div><div class='del'>-		const struct ipv6_opt_hdr *hp;</div><div class='del'>-</div><div class='del'>-		hp = skb_header_pointer(skb, ptr, sizeof(_hdr), &amp;_hdr);</div><div class='del'>-		if (hp == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "TRUNCATED");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Max length: 48 "OPT (...) " */</div><div class='del'>-		if (logflags &amp; NF_LOG_IPOPT)</div><div class='del'>-			nf_log_buf_add(m, "OPT ( ");</div><div class='del'>-</div><div class='del'>-		switch (currenthdr) {</div><div class='del'>-		case IPPROTO_FRAGMENT: {</div><div class='del'>-			struct frag_hdr _fhdr;</div><div class='del'>-			const struct frag_hdr *fh;</div><div class='del'>-</div><div class='del'>-			nf_log_buf_add(m, "FRAG:");</div><div class='del'>-			fh = skb_header_pointer(skb, ptr, sizeof(_fhdr),</div><div class='del'>-						&amp;_fhdr);</div><div class='del'>-			if (fh == NULL) {</div><div class='del'>-				nf_log_buf_add(m, "TRUNCATED ");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Max length: 6 "65535 " */</div><div class='del'>-			nf_log_buf_add(m, "%u ", ntohs(fh-&gt;frag_off) &amp; 0xFFF8);</div><div class='del'>-</div><div class='del'>-			/* Max length: 11 "INCOMPLETE " */</div><div class='del'>-			if (fh-&gt;frag_off &amp; htons(0x0001))</div><div class='del'>-				nf_log_buf_add(m, "INCOMPLETE ");</div><div class='del'>-</div><div class='del'>-			nf_log_buf_add(m, "ID:%08x ",</div><div class='del'>-				       ntohl(fh-&gt;identification));</div><div class='del'>-</div><div class='del'>-			if (ntohs(fh-&gt;frag_off) &amp; 0xFFF8)</div><div class='del'>-				fragment = 1;</div><div class='del'>-</div><div class='del'>-			hdrlen = 8;</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case IPPROTO_DSTOPTS:</div><div class='del'>-		case IPPROTO_ROUTING:</div><div class='del'>-		case IPPROTO_HOPOPTS:</div><div class='del'>-			if (fragment) {</div><div class='del'>-				if (logflags &amp; NF_LOG_IPOPT)</div><div class='del'>-					nf_log_buf_add(m, ")");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			hdrlen = ipv6_optlen(hp);</div><div class='del'>-			break;</div><div class='del'>-		/* Max Length */</div><div class='del'>-		case IPPROTO_AH:</div><div class='del'>-			if (logflags &amp; NF_LOG_IPOPT) {</div><div class='del'>-				struct ip_auth_hdr _ahdr;</div><div class='del'>-				const struct ip_auth_hdr *ah;</div><div class='del'>-</div><div class='del'>-				/* Max length: 3 "AH " */</div><div class='del'>-				nf_log_buf_add(m, "AH ");</div><div class='del'>-</div><div class='del'>-				if (fragment) {</div><div class='del'>-					nf_log_buf_add(m, ")");</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				ah = skb_header_pointer(skb, ptr, sizeof(_ahdr),</div><div class='del'>-							&amp;_ahdr);</div><div class='del'>-				if (ah == NULL) {</div><div class='del'>-					/*</div><div class='del'>-					 * Max length: 26 "INCOMPLETE [65535</div><div class='del'>-					 *  bytes] )"</div><div class='del'>-					 */</div><div class='del'>-					nf_log_buf_add(m, "INCOMPLETE [%u bytes] )",</div><div class='del'>-						       skb-&gt;len - ptr);</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* Length: 15 "SPI=0xF1234567 */</div><div class='del'>-				nf_log_buf_add(m, "SPI=0x%x ", ntohl(ah-&gt;spi));</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			hdrlen = (hp-&gt;hdrlen+2)&lt;&lt;2;</div><div class='del'>-			break;</div><div class='del'>-		case IPPROTO_ESP:</div><div class='del'>-			if (logflags &amp; NF_LOG_IPOPT) {</div><div class='del'>-				struct ip_esp_hdr _esph;</div><div class='del'>-				const struct ip_esp_hdr *eh;</div><div class='del'>-</div><div class='del'>-				/* Max length: 4 "ESP " */</div><div class='del'>-				nf_log_buf_add(m, "ESP ");</div><div class='del'>-</div><div class='del'>-				if (fragment) {</div><div class='del'>-					nf_log_buf_add(m, ")");</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * Max length: 26 "INCOMPLETE [65535 bytes] )"</div><div class='del'>-				 */</div><div class='del'>-				eh = skb_header_pointer(skb, ptr, sizeof(_esph),</div><div class='del'>-							&amp;_esph);</div><div class='del'>-				if (eh == NULL) {</div><div class='del'>-					nf_log_buf_add(m, "INCOMPLETE [%u bytes] )",</div><div class='del'>-						       skb-&gt;len - ptr);</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* Length: 16 "SPI=0xF1234567 )" */</div><div class='del'>-				nf_log_buf_add(m, "SPI=0x%x )",</div><div class='del'>-					       ntohl(eh-&gt;spi));</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		default:</div><div class='del'>-			/* Max length: 20 "Unknown Ext Hdr 255" */</div><div class='del'>-			nf_log_buf_add(m, "Unknown Ext Hdr %u", currenthdr);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (logflags &amp; NF_LOG_IPOPT)</div><div class='del'>-			nf_log_buf_add(m, ") ");</div><div class='del'>-</div><div class='del'>-		currenthdr = hp-&gt;nexthdr;</div><div class='del'>-		ptr += hdrlen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (currenthdr) {</div><div class='del'>-	case IPPROTO_TCP:</div><div class='del'>-		if (nf_log_dump_tcp_header(m, skb, currenthdr, fragment,</div><div class='del'>-					   ptr, logflags))</div><div class='del'>-			return;</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_UDP:</div><div class='del'>-	case IPPROTO_UDPLITE:</div><div class='del'>-		if (nf_log_dump_udp_header(m, skb, currenthdr, fragment, ptr))</div><div class='del'>-			return;</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_ICMPV6: {</div><div class='del'>-		struct icmp6hdr _icmp6h;</div><div class='del'>-		const struct icmp6hdr *ic;</div><div class='del'>-</div><div class='del'>-		/* Max length: 13 "PROTO=ICMPv6 " */</div><div class='del'>-		nf_log_buf_add(m, "PROTO=ICMPv6 ");</div><div class='del'>-</div><div class='del'>-		if (fragment)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Max length: 25 "INCOMPLETE [65535 bytes] " */</div><div class='del'>-		ic = skb_header_pointer(skb, ptr, sizeof(_icmp6h), &amp;_icmp6h);</div><div class='del'>-		if (ic == NULL) {</div><div class='del'>-			nf_log_buf_add(m, "INCOMPLETE [%u bytes] ",</div><div class='del'>-				       skb-&gt;len - ptr);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Max length: 18 "TYPE=255 CODE=255 " */</div><div class='del'>-		nf_log_buf_add(m, "TYPE=%u CODE=%u ",</div><div class='del'>-			       ic-&gt;icmp6_type, ic-&gt;icmp6_code);</div><div class='del'>-</div><div class='del'>-		switch (ic-&gt;icmp6_type) {</div><div class='del'>-		case ICMPV6_ECHO_REQUEST:</div><div class='del'>-		case ICMPV6_ECHO_REPLY:</div><div class='del'>-			/* Max length: 19 "ID=65535 SEQ=65535 " */</div><div class='del'>-			nf_log_buf_add(m, "ID=%u SEQ=%u ",</div><div class='del'>-				ntohs(ic-&gt;icmp6_identifier),</div><div class='del'>-				ntohs(ic-&gt;icmp6_sequence));</div><div class='del'>-			break;</div><div class='del'>-		case ICMPV6_MGM_QUERY:</div><div class='del'>-		case ICMPV6_MGM_REPORT:</div><div class='del'>-		case ICMPV6_MGM_REDUCTION:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICMPV6_PARAMPROB:</div><div class='del'>-			/* Max length: 17 "POINTER=ffffffff " */</div><div class='del'>-			nf_log_buf_add(m, "POINTER=%08x ",</div><div class='del'>-				       ntohl(ic-&gt;icmp6_pointer));</div><div class='del'>-			/* Fall through */</div><div class='del'>-		case ICMPV6_DEST_UNREACH:</div><div class='del'>-		case ICMPV6_PKT_TOOBIG:</div><div class='del'>-		case ICMPV6_TIME_EXCEED:</div><div class='del'>-			/* Max length: 3+maxlen */</div><div class='del'>-			if (recurse) {</div><div class='del'>-				nf_log_buf_add(m, "[");</div><div class='del'>-				dump_ipv6_packet(net, m, info, skb,</div><div class='del'>-						 ptr + sizeof(_icmp6h), 0);</div><div class='del'>-				nf_log_buf_add(m, "] ");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Max length: 10 "MTU=65535 " */</div><div class='del'>-			if (ic-&gt;icmp6_type == ICMPV6_PKT_TOOBIG) {</div><div class='del'>-				nf_log_buf_add(m, "MTU=%u ",</div><div class='del'>-					       ntohl(ic-&gt;icmp6_mtu));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Max length: 10 "PROTO=255 " */</div><div class='del'>-	default:</div><div class='del'>-		nf_log_buf_add(m, "PROTO=%u ", currenthdr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Max length: 15 "UID=4294967295 " */</div><div class='del'>-	if ((logflags &amp; NF_LOG_UID) &amp;&amp; recurse)</div><div class='del'>-		nf_log_dump_sk_uid_gid(net, m, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-	/* Max length: 16 "MARK=0xFFFFFFFF " */</div><div class='del'>-	if (recurse &amp;&amp; skb-&gt;mark)</div><div class='del'>-		nf_log_buf_add(m, "MARK=0x%x ", skb-&gt;mark);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dump_ipv6_mac_header(struct nf_log_buf *m,</div><div class='del'>-				 const struct nf_loginfo *info,</div><div class='del'>-				 const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	unsigned int logflags = 0;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;type == NF_LOG_TYPE_LOG)</div><div class='del'>-		logflags = info-&gt;u.log.logflags;</div><div class='del'>-</div><div class='del'>-	if (!(logflags &amp; NF_LOG_MACDECODE))</div><div class='del'>-		goto fallback;</div><div class='del'>-</div><div class='del'>-	switch (dev-&gt;type) {</div><div class='del'>-	case ARPHRD_ETHER:</div><div class='del'>-		nf_log_buf_add(m, "MACSRC=%pM MACDST=%pM MACPROTO=%04x ",</div><div class='del'>-		       eth_hdr(skb)-&gt;h_source, eth_hdr(skb)-&gt;h_dest,</div><div class='del'>-		       ntohs(eth_hdr(skb)-&gt;h_proto));</div><div class='del'>-		return;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fallback:</div><div class='del'>-	nf_log_buf_add(m, "MAC=");</div><div class='del'>-	if (dev-&gt;hard_header_len &amp;&amp;</div><div class='del'>-	    skb-&gt;mac_header != skb-&gt;network_header) {</div><div class='del'>-		const unsigned char *p = skb_mac_header(skb);</div><div class='del'>-		unsigned int len = dev-&gt;hard_header_len;</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;type == ARPHRD_SIT) {</div><div class='del'>-			p -= ETH_HLEN;</div><div class='del'>-</div><div class='del'>-			if (p &lt; skb-&gt;head)</div><div class='del'>-				p = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (p != NULL) {</div><div class='del'>-			nf_log_buf_add(m, "%02x", *p++);</div><div class='del'>-			for (i = 1; i &lt; len; i++)</div><div class='del'>-				nf_log_buf_add(m, ":%02x", *p++);</div><div class='del'>-		}</div><div class='del'>-		nf_log_buf_add(m, " ");</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;type == ARPHRD_SIT) {</div><div class='del'>-			const struct iphdr *iph =</div><div class='del'>-				(struct iphdr *)skb_mac_header(skb);</div><div class='del'>-			nf_log_buf_add(m, "TUNNEL=%pI4-&gt;%pI4 ", &amp;iph-&gt;saddr,</div><div class='del'>-				       &amp;iph-&gt;daddr);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		nf_log_buf_add(m, " ");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_log_ip6_packet(struct net *net, u_int8_t pf,</div><div class='del'>-			      unsigned int hooknum, const struct sk_buff *skb,</div><div class='del'>-			      const struct net_device *in,</div><div class='del'>-			      const struct net_device *out,</div><div class='del'>-			      const struct nf_loginfo *loginfo,</div><div class='del'>-			      const char *prefix)</div><div class='del'>-{</div><div class='del'>-	struct nf_log_buf *m;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Disabled from containers until syslog ns is supported */</div><div class='del'>-	if (!net_eq(net, &amp;init_net) &amp;&amp; !sysctl_nf_log_all_netns)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	m = nf_log_buf_open();</div><div class='del'>-</div><div class='del'>-	if (!loginfo)</div><div class='del'>-		loginfo = &amp;default_loginfo;</div><div class='del'>-</div><div class='del'>-	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out,</div><div class='del'>-				  loginfo, prefix);</div><div class='del'>-</div><div class='del'>-	if (in != NULL)</div><div class='del'>-		dump_ipv6_mac_header(m, loginfo, skb);</div><div class='del'>-</div><div class='del'>-	dump_ipv6_packet(net, m, loginfo, skb, skb_network_offset(skb), 1);</div><div class='del'>-</div><div class='del'>-	nf_log_buf_close(m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nf_logger nf_ip6_logger __read_mostly = {</div><div class='del'>-	.name		= "nf_log_ipv6",</div><div class='del'>-	.type		= NF_LOG_TYPE_LOG,</div><div class='del'>-	.logfn		= nf_log_ip6_packet,</div><div class='del'>-	.me		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __net_init nf_log_ipv6_net_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	return nf_log_set(net, NFPROTO_IPV6, &amp;nf_ip6_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __net_exit nf_log_ipv6_net_exit(struct net *net)</div><div class='del'>-{</div><div class='del'>-	nf_log_unset(net, &amp;nf_ip6_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nf_log_ipv6_net_ops = {</div><div class='del'>-	.init = nf_log_ipv6_net_init,</div><div class='del'>-	.exit = nf_log_ipv6_net_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nf_log_ipv6_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_pernet_subsys(&amp;nf_log_ipv6_net_ops);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = nf_log_register(NFPROTO_IPV6, &amp;nf_ip6_logger);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("failed to register logger\n");</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err1:</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_ipv6_net_ops);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_log_ipv6_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nf_log_ipv6_net_ops);</div><div class='del'>-	nf_log_unregister(&amp;nf_ip6_logger);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nf_log_ipv6_init);</div><div class='del'>-module_exit(nf_log_ipv6_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Netfilter Core Team &lt;coreteam@netfilter.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter IPv6 packet logging");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_NF_LOGGER(AF_INET6, 0);</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c<br/>deleted file mode 100644<br/>index ca6d38698b1a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_l3proto_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,444 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Development of IPv6 NAT funded by Astaro.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;net/secure_seq.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;net/ip6_checksum.h&gt;</div><div class='del'>-#include &lt;net/ip6_route.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l4proto.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct nf_nat_l3proto nf_nat_l3proto_ipv6;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-static void nf_nat_ipv6_decode_session(struct sk_buff *skb,</div><div class='del'>-				       const struct nf_conn *ct,</div><div class='del'>-				       enum ip_conntrack_dir dir,</div><div class='del'>-				       unsigned long statusbit,</div><div class='del'>-				       struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conntrack_tuple *t = &amp;ct-&gt;tuplehash[dir].tuple;</div><div class='del'>-	struct flowi6 *fl6 = &amp;fl-&gt;u.ip6;</div><div class='del'>-</div><div class='del'>-	if (ct-&gt;status &amp; statusbit) {</div><div class='del'>-		fl6-&gt;daddr = t-&gt;dst.u3.in6;</div><div class='del'>-		if (t-&gt;dst.protonum == IPPROTO_TCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDPLITE ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_DCCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_SCTP)</div><div class='del'>-			fl6-&gt;fl6_dport = t-&gt;dst.u.all;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	statusbit ^= IPS_NAT_MASK;</div><div class='del'>-</div><div class='del'>-	if (ct-&gt;status &amp; statusbit) {</div><div class='del'>-		fl6-&gt;saddr = t-&gt;src.u3.in6;</div><div class='del'>-		if (t-&gt;dst.protonum == IPPROTO_TCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_UDPLITE ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_DCCP ||</div><div class='del'>-		    t-&gt;dst.protonum == IPPROTO_SCTP)</div><div class='del'>-			fl6-&gt;fl6_sport = t-&gt;src.u.all;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static bool nf_nat_ipv6_in_range(const struct nf_conntrack_tuple *t,</div><div class='del'>-				 const struct nf_nat_range2 *range)</div><div class='del'>-{</div><div class='del'>-	return ipv6_addr_cmp(&amp;t-&gt;src.u3.in6, &amp;range-&gt;min_addr.in6) &gt;= 0 &amp;&amp;</div><div class='del'>-	       ipv6_addr_cmp(&amp;t-&gt;src.u3.in6, &amp;range-&gt;max_addr.in6) &lt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 nf_nat_ipv6_secure_port(const struct nf_conntrack_tuple *t,</div><div class='del'>-				   __be16 dport)</div><div class='del'>-{</div><div class='del'>-	return secure_ipv6_port_ephemeral(t-&gt;src.u3.ip6, t-&gt;dst.u3.ip6, dport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool nf_nat_ipv6_manip_pkt(struct sk_buff *skb,</div><div class='del'>-				  unsigned int iphdroff,</div><div class='del'>-				  const struct nf_nat_l4proto *l4proto,</div><div class='del'>-				  const struct nf_conntrack_tuple *target,</div><div class='del'>-				  enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *ipv6h;</div><div class='del'>-	__be16 frag_off;</div><div class='del'>-	int hdroff;</div><div class='del'>-	u8 nexthdr;</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, iphdroff + sizeof(*ipv6h)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	ipv6h = (void *)skb-&gt;data + iphdroff;</div><div class='del'>-	nexthdr = ipv6h-&gt;nexthdr;</div><div class='del'>-	hdroff = ipv6_skip_exthdr(skb, iphdroff + sizeof(*ipv6h),</div><div class='del'>-				  &amp;nexthdr, &amp;frag_off);</div><div class='del'>-	if (hdroff &lt; 0)</div><div class='del'>-		goto manip_addr;</div><div class='del'>-</div><div class='del'>-	if ((frag_off &amp; htons(~0x7)) == 0 &amp;&amp;</div><div class='del'>-	    !l4proto-&gt;manip_pkt(skb, &amp;nf_nat_l3proto_ipv6, iphdroff, hdroff,</div><div class='del'>-				target, maniptype))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* must reload, offset might have changed */</div><div class='del'>-	ipv6h = (void *)skb-&gt;data + iphdroff;</div><div class='del'>-</div><div class='del'>-manip_addr:</div><div class='del'>-	if (maniptype == NF_NAT_MANIP_SRC)</div><div class='del'>-		ipv6h-&gt;saddr = target-&gt;src.u3.in6;</div><div class='del'>-	else</div><div class='del'>-		ipv6h-&gt;daddr = target-&gt;dst.u3.in6;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_nat_ipv6_csum_update(struct sk_buff *skb,</div><div class='del'>-				    unsigned int iphdroff, __sum16 *check,</div><div class='del'>-				    const struct nf_conntrack_tuple *t,</div><div class='del'>-				    enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	const struct ipv6hdr *ipv6h = (struct ipv6hdr *)(skb-&gt;data + iphdroff);</div><div class='del'>-	const struct in6_addr *oldip, *newip;</div><div class='del'>-</div><div class='del'>-	if (maniptype == NF_NAT_MANIP_SRC) {</div><div class='del'>-		oldip = &amp;ipv6h-&gt;saddr;</div><div class='del'>-		newip = &amp;t-&gt;src.u3.in6;</div><div class='del'>-	} else {</div><div class='del'>-		oldip = &amp;ipv6h-&gt;daddr;</div><div class='del'>-		newip = &amp;t-&gt;dst.u3.in6;</div><div class='del'>-	}</div><div class='del'>-	inet_proto_csum_replace16(check, skb, oldip-&gt;s6_addr32,</div><div class='del'>-				  newip-&gt;s6_addr32, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb,</div><div class='del'>-				    u8 proto, void *data, __sum16 *check,</div><div class='del'>-				    int datalen, int oldlen)</div><div class='del'>-{</div><div class='del'>-	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='del'>-		const struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-		skb-&gt;csum_start = skb_headroom(skb) + skb_network_offset(skb) +</div><div class='del'>-			(data - (void *)skb-&gt;data);</div><div class='del'>-		skb-&gt;csum_offset = (void *)check - data;</div><div class='del'>-		*check = ~csum_ipv6_magic(&amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr,</div><div class='del'>-					  datalen, proto, 0);</div><div class='del'>-	} else</div><div class='del'>-		inet_proto_csum_replace2(check, skb,</div><div class='del'>-					 htons(oldlen), htons(datalen), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-static int nf_nat_ipv6_nlattr_to_range(struct nlattr *tb[],</div><div class='del'>-				       struct nf_nat_range2 *range)</div><div class='del'>-{</div><div class='del'>-	if (tb[CTA_NAT_V6_MINIP]) {</div><div class='del'>-		nla_memcpy(&amp;range-&gt;min_addr.ip6, tb[CTA_NAT_V6_MINIP],</div><div class='del'>-			   sizeof(struct in6_addr));</div><div class='del'>-		range-&gt;flags |= NF_NAT_RANGE_MAP_IPS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tb[CTA_NAT_V6_MAXIP])</div><div class='del'>-		nla_memcpy(&amp;range-&gt;max_addr.ip6, tb[CTA_NAT_V6_MAXIP],</div><div class='del'>-			   sizeof(struct in6_addr));</div><div class='del'>-	else</div><div class='del'>-		range-&gt;max_addr = range-&gt;min_addr;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct nf_nat_l3proto nf_nat_l3proto_ipv6 = {</div><div class='del'>-	.l3proto		= NFPROTO_IPV6,</div><div class='del'>-	.secure_port		= nf_nat_ipv6_secure_port,</div><div class='del'>-	.in_range		= nf_nat_ipv6_in_range,</div><div class='del'>-	.manip_pkt		= nf_nat_ipv6_manip_pkt,</div><div class='del'>-	.csum_update		= nf_nat_ipv6_csum_update,</div><div class='del'>-	.csum_recalc		= nf_nat_ipv6_csum_recalc,</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-	.nlattr_to_range	= nf_nat_ipv6_nlattr_to_range,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	.decode_session	= nf_nat_ipv6_decode_session,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int nf_nat_icmpv6_reply_translation(struct sk_buff *skb,</div><div class='del'>-				    struct nf_conn *ct,</div><div class='del'>-				    enum ip_conntrack_info ctinfo,</div><div class='del'>-				    unsigned int hooknum,</div><div class='del'>-				    unsigned int hdrlen)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		struct icmp6hdr	icmp6;</div><div class='del'>-		struct ipv6hdr	ip6;</div><div class='del'>-	} *inside;</div><div class='del'>-	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-	enum nf_nat_manip_type manip = HOOK2MANIP(hooknum);</div><div class='del'>-	const struct nf_nat_l4proto *l4proto;</div><div class='del'>-	struct nf_conntrack_tuple target;</div><div class='del'>-	unsigned long statusbit;</div><div class='del'>-</div><div class='del'>-	WARN_ON(ctinfo != IP_CT_RELATED &amp;&amp; ctinfo != IP_CT_RELATED_REPLY);</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, hdrlen + sizeof(*inside)))</div><div class='del'>-		return 0;</div><div class='del'>-	if (nf_ip6_checksum(skb, hooknum, hdrlen, IPPROTO_ICMPV6))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	inside = (void *)skb-&gt;data + hdrlen;</div><div class='del'>-	if (inside-&gt;icmp6.icmp6_type == NDISC_REDIRECT) {</div><div class='del'>-		if ((ct-&gt;status &amp; IPS_NAT_DONE_MASK) != IPS_NAT_DONE_MASK)</div><div class='del'>-			return 0;</div><div class='del'>-		if (ct-&gt;status &amp; IPS_NAT_MASK)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (manip == NF_NAT_MANIP_SRC)</div><div class='del'>-		statusbit = IPS_SRC_NAT;</div><div class='del'>-	else</div><div class='del'>-		statusbit = IPS_DST_NAT;</div><div class='del'>-</div><div class='del'>-	/* Invert if this is reply direction */</div><div class='del'>-	if (dir == IP_CT_DIR_REPLY)</div><div class='del'>-		statusbit ^= IPS_NAT_MASK;</div><div class='del'>-</div><div class='del'>-	if (!(ct-&gt;status &amp; statusbit))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	l4proto = __nf_nat_l4proto_find(NFPROTO_IPV6, inside-&gt;ip6.nexthdr);</div><div class='del'>-	if (!nf_nat_ipv6_manip_pkt(skb, hdrlen + sizeof(inside-&gt;icmp6),</div><div class='del'>-				   l4proto, &amp;ct-&gt;tuplehash[!dir].tuple, !manip))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL) {</div><div class='del'>-		struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='del'>-		inside = (void *)skb-&gt;data + hdrlen;</div><div class='del'>-		inside-&gt;icmp6.icmp6_cksum = 0;</div><div class='del'>-		inside-&gt;icmp6.icmp6_cksum =</div><div class='del'>-			csum_ipv6_magic(&amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr,</div><div class='del'>-					skb-&gt;len - hdrlen, IPPROTO_ICMPV6,</div><div class='del'>-					skb_checksum(skb, hdrlen,</div><div class='del'>-						     skb-&gt;len - hdrlen, 0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nf_ct_invert_tuplepr(&amp;target, &amp;ct-&gt;tuplehash[!dir].tuple);</div><div class='del'>-	l4proto = __nf_nat_l4proto_find(NFPROTO_IPV6, IPPROTO_ICMPV6);</div><div class='del'>-	if (!nf_nat_ipv6_manip_pkt(skb, 0, l4proto, &amp;target, manip))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_icmpv6_reply_translation);</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv6_fn(void *priv, struct sk_buff *skb,</div><div class='del'>-	       const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	__be16 frag_off;</div><div class='del'>-	int hdrlen;</div><div class='del'>-	u8 nexthdr;</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	/* Can't track?  It's not due to stress, or conntrack would</div><div class='del'>-	 * have dropped it.  Hence it's the user's responsibilty to</div><div class='del'>-	 * packet filter it out, or implement conntrack/NAT for that</div><div class='del'>-	 * protocol. 8) --RR</div><div class='del'>-	 */</div><div class='del'>-	if (!ct)</div><div class='del'>-		return NF_ACCEPT;</div><div class='del'>-</div><div class='del'>-	if (ctinfo == IP_CT_RELATED || ctinfo == IP_CT_RELATED_REPLY) {</div><div class='del'>-		nexthdr = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='del'>-		hdrlen = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr),</div><div class='del'>-					  &amp;nexthdr, &amp;frag_off);</div><div class='del'>-</div><div class='del'>-		if (hdrlen &gt;= 0 &amp;&amp; nexthdr == IPPROTO_ICMPV6) {</div><div class='del'>-			if (!nf_nat_icmpv6_reply_translation(skb, ct, ctinfo,</div><div class='del'>-							     state-&gt;hook,</div><div class='del'>-							     hdrlen))</div><div class='del'>-				return NF_DROP;</div><div class='del'>-			else</div><div class='del'>-				return NF_ACCEPT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nf_nat_inet_fn(priv, skb, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv6_in(void *priv, struct sk_buff *skb,</div><div class='del'>-	       const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	struct in6_addr daddr = ipv6_hdr(skb)-&gt;daddr;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv6_fn(priv, skb, state);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    ipv6_addr_cmp(&amp;daddr, &amp;ipv6_hdr(skb)-&gt;daddr))</div><div class='del'>-		skb_dst_drop(skb);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv6_out(void *priv, struct sk_buff *skb,</div><div class='del'>-		const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	const struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	int err;</div><div class='del'>-#endif</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv6_fn(priv, skb, state);</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    !(IP6CB(skb)-&gt;flags &amp; IP6SKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-	    (ct = nf_ct_get(skb, &amp;ctinfo)) != NULL) {</div><div class='del'>-		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-</div><div class='del'>-		if (!nf_inet_addr_cmp(&amp;ct-&gt;tuplehash[dir].tuple.src.u3,</div><div class='del'>-				      &amp;ct-&gt;tuplehash[!dir].tuple.dst.u3) ||</div><div class='del'>-		    (ct-&gt;tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMPV6 &amp;&amp;</div><div class='del'>-		     ct-&gt;tuplehash[dir].tuple.src.u.all !=</div><div class='del'>-		     ct-&gt;tuplehash[!dir].tuple.dst.u.all)) {</div><div class='del'>-			err = nf_xfrm_me_harder(state-&gt;net, skb, AF_INET6);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-nf_nat_ipv6_local_fn(void *priv, struct sk_buff *skb,</div><div class='del'>-		     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conn *ct;</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ret = nf_nat_ipv6_fn(priv, skb, state);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    (ct = nf_ct_get(skb, &amp;ctinfo)) != NULL) {</div><div class='del'>-		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);</div><div class='del'>-</div><div class='del'>-		if (!nf_inet_addr_cmp(&amp;ct-&gt;tuplehash[dir].tuple.dst.u3,</div><div class='del'>-				      &amp;ct-&gt;tuplehash[!dir].tuple.src.u3)) {</div><div class='del'>-			err = ip6_route_me_harder(state-&gt;net, skb);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_XFRM</div><div class='del'>-		else if (!(IP6CB(skb)-&gt;flags &amp; IP6SKB_XFRM_TRANSFORMED) &amp;&amp;</div><div class='del'>-			 ct-&gt;tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMPV6 &amp;&amp;</div><div class='del'>-			 ct-&gt;tuplehash[dir].tuple.dst.u.all !=</div><div class='del'>-			 ct-&gt;tuplehash[!dir].tuple.src.u.all) {</div><div class='del'>-			err = nf_xfrm_me_harder(state-&gt;net, skb, AF_INET6);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				ret = NF_DROP_ERR(err);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nf_hook_ops nf_nat_ipv6_ops[] = {</div><div class='del'>-	/* Before packet filtering, change destination */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv6_in,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_PRE_ROUTING,</div><div class='del'>-		.priority	= NF_IP6_PRI_NAT_DST,</div><div class='del'>-	},</div><div class='del'>-	/* After packet filtering, change source */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv6_out,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_POST_ROUTING,</div><div class='del'>-		.priority	= NF_IP6_PRI_NAT_SRC,</div><div class='del'>-	},</div><div class='del'>-	/* Before packet filtering, change destination */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv6_local_fn,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_OUT,</div><div class='del'>-		.priority	= NF_IP6_PRI_NAT_DST,</div><div class='del'>-	},</div><div class='del'>-	/* After packet filtering, change source */</div><div class='del'>-	{</div><div class='del'>-		.hook		= nf_nat_ipv6_fn,</div><div class='del'>-		.pf		= NFPROTO_IPV6,</div><div class='del'>-		.hooknum	= NF_INET_LOCAL_IN,</div><div class='del'>-		.priority	= NF_IP6_PRI_NAT_SRC,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int nf_nat_l3proto_ipv6_register_fn(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_register_fn(net, ops, nf_nat_ipv6_ops, ARRAY_SIZE(nf_nat_ipv6_ops));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv6_register_fn);</div><div class='del'>-</div><div class='del'>-void nf_nat_l3proto_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv6_ops));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv6_unregister_fn);</div><div class='del'>-</div><div class='del'>-static int __init nf_nat_l3proto_ipv6_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nf_nat_l4proto_register(NFPROTO_IPV6, &amp;nf_nat_l4proto_icmpv6);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err1;</div><div class='del'>-	err = nf_nat_l3proto_register(&amp;nf_nat_l3proto_ipv6);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err2;</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-err2:</div><div class='del'>-	nf_nat_l4proto_unregister(NFPROTO_IPV6, &amp;nf_nat_l4proto_icmpv6);</div><div class='del'>-err1:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nf_nat_l3proto_ipv6_exit(void)</div><div class='del'>-{</div><div class='del'>-	nf_nat_l3proto_unregister(&amp;nf_nat_l3proto_ipv6);</div><div class='del'>-	nf_nat_l4proto_unregister(NFPROTO_IPV6, &amp;nf_nat_l4proto_icmpv6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("nf-nat-" __stringify(AF_INET6));</div><div class='del'>-</div><div class='del'>-module_init(nf_nat_l3proto_ipv6_init);</div><div class='del'>-module_exit(nf_nat_l3proto_ipv6_exit);</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c b/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c<br/>deleted file mode 100644<br/>index e6eb7cf9b54f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_masquerade_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,187 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Based on Rusty Russell's IPv6 MASQUERADE target. Development of IPv6</div><div class='del'>- * NAT funded by Astaro.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv6/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-#define MAX_WORK_COUNT	16</div><div class='del'>-</div><div class='del'>-static atomic_t v6_worker_count;</div><div class='del'>-</div><div class='del'>-unsigned int</div><div class='del'>-nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,</div><div class='del'>-		       const struct net_device *out)</div><div class='del'>-{</div><div class='del'>-	enum ip_conntrack_info ctinfo;</div><div class='del'>-	struct nf_conn_nat *nat;</div><div class='del'>-	struct in6_addr src;</div><div class='del'>-	struct nf_conn *ct;</div><div class='del'>-	struct nf_nat_range2 newrange;</div><div class='del'>-</div><div class='del'>-	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='del'>-	WARN_ON(!(ct &amp;&amp; (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||</div><div class='del'>-			 ctinfo == IP_CT_RELATED_REPLY)));</div><div class='del'>-</div><div class='del'>-	if (ipv6_dev_get_saddr(nf_ct_net(ct), out,</div><div class='del'>-			       &amp;ipv6_hdr(skb)-&gt;daddr, 0, &amp;src) &lt; 0)</div><div class='del'>-		return NF_DROP;</div><div class='del'>-</div><div class='del'>-	nat = nf_ct_nat_ext_add(ct);</div><div class='del'>-	if (nat)</div><div class='del'>-		nat-&gt;masq_index = out-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	newrange.flags		= range-&gt;flags | NF_NAT_RANGE_MAP_IPS;</div><div class='del'>-	newrange.min_addr.in6	= src;</div><div class='del'>-	newrange.max_addr.in6	= src;</div><div class='del'>-	newrange.min_proto	= range-&gt;min_proto;</div><div class='del'>-	newrange.max_proto	= range-&gt;max_proto;</div><div class='del'>-</div><div class='del'>-	return nf_nat_setup_info(ct, &amp;newrange, NF_NAT_MANIP_SRC);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv6);</div><div class='del'>-</div><div class='del'>-static int device_cmp(struct nf_conn *ct, void *ifindex)</div><div class='del'>-{</div><div class='del'>-	const struct nf_conn_nat *nat = nfct_nat(ct);</div><div class='del'>-</div><div class='del'>-	if (!nat)</div><div class='del'>-		return 0;</div><div class='del'>-	if (nf_ct_l3num(ct) != NFPROTO_IPV6)</div><div class='del'>-		return 0;</div><div class='del'>-	return nat-&gt;masq_index == (int)(long)ifindex;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int masq_device_event(struct notifier_block *this,</div><div class='del'>-			     unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	const struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	if (event == NETDEV_DOWN)</div><div class='del'>-		nf_ct_iterate_cleanup_net(net, device_cmp,</div><div class='del'>-					  (void *)(long)dev-&gt;ifindex, 0, 0);</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block masq_dev_notifier = {</div><div class='del'>-	.notifier_call	= masq_device_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct masq_dev_work {</div><div class='del'>-	struct work_struct work;</div><div class='del'>-	struct net *net;</div><div class='del'>-	int ifindex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iterate_cleanup_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct masq_dev_work *w;</div><div class='del'>-	long index;</div><div class='del'>-</div><div class='del'>-	w = container_of(work, struct masq_dev_work, work);</div><div class='del'>-</div><div class='del'>-	index = w-&gt;ifindex;</div><div class='del'>-	nf_ct_iterate_cleanup_net(w-&gt;net, device_cmp, (void *)index, 0, 0);</div><div class='del'>-</div><div class='del'>-	put_net(w-&gt;net);</div><div class='del'>-	kfree(w);</div><div class='del'>-	atomic_dec(&amp;v6_worker_count);</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ipv6 inet notifier is an atomic notifier, i.e. we cannot</div><div class='del'>- * schedule.</div><div class='del'>- *</div><div class='del'>- * Unfortunately, nf_ct_iterate_cleanup_net can run for a long</div><div class='del'>- * time if there are lots of conntracks and the system</div><div class='del'>- * handles high softirq load, so it frequently calls cond_resched</div><div class='del'>- * while iterating the conntrack table.</div><div class='del'>- *</div><div class='del'>- * So we defer nf_ct_iterate_cleanup_net walk to the system workqueue.</div><div class='del'>- *</div><div class='del'>- * As we can have 'a lot' of inet_events (depending on amount</div><div class='del'>- * of ipv6 addresses being deleted), we also need to add an upper</div><div class='del'>- * limit to the number of queued work items.</div><div class='del'>- */</div><div class='del'>-static int masq_inet_event(struct notifier_block *this,</div><div class='del'>-			   unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct inet6_ifaddr *ifa = ptr;</div><div class='del'>-	const struct net_device *dev;</div><div class='del'>-	struct masq_dev_work *w;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	if (event != NETDEV_DOWN ||</div><div class='del'>-	    atomic_read(&amp;v6_worker_count) &gt;= MAX_WORK_COUNT)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	dev = ifa-&gt;idev-&gt;dev;</div><div class='del'>-	net = maybe_get_net(dev_net(dev));</div><div class='del'>-	if (!net)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (!try_module_get(THIS_MODULE))</div><div class='del'>-		goto err_module;</div><div class='del'>-</div><div class='del'>-	w = kmalloc(sizeof(*w), GFP_ATOMIC);</div><div class='del'>-	if (w) {</div><div class='del'>-		atomic_inc(&amp;v6_worker_count);</div><div class='del'>-</div><div class='del'>-		INIT_WORK(&amp;w-&gt;work, iterate_cleanup_work);</div><div class='del'>-		w-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-		w-&gt;net = net;</div><div class='del'>-		schedule_work(&amp;w-&gt;work);</div><div class='del'>-</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>- err_module:</div><div class='del'>-	put_net(net);</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block masq_inet_notifier = {</div><div class='del'>-	.notifier_call	= masq_inet_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static atomic_t masquerade_notifier_refcount = ATOMIC_INIT(0);</div><div class='del'>-</div><div class='del'>-void nf_nat_masquerade_ipv6_register_notifier(void)</div><div class='del'>-{</div><div class='del'>-	/* check if the notifier is already set */</div><div class='del'>-	if (atomic_inc_return(&amp;masquerade_notifier_refcount) &gt; 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	register_netdevice_notifier(&amp;masq_dev_notifier);</div><div class='del'>-	register_inet6addr_notifier(&amp;masq_inet_notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv6_register_notifier);</div><div class='del'>-</div><div class='del'>-void nf_nat_masquerade_ipv6_unregister_notifier(void)</div><div class='del'>-{</div><div class='del'>-	/* check if the notifier still has clients */</div><div class='del'>-	if (atomic_dec_return(&amp;masquerade_notifier_refcount) &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	unregister_inet6addr_notifier(&amp;masq_inet_notifier);</div><div class='del'>-	unregister_netdevice_notifier(&amp;masq_dev_notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv6_unregister_notifier);</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_nat_proto_icmpv6.c b/net/ipv6/netfilter/nf_nat_proto_icmpv6.c<br/>deleted file mode 100644<br/>index d9bf42ba44fa..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_nat_proto_icmpv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_nat_proto_icmpv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Patrick Mchardy &lt;kaber@trash.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Based on Rusty Russell's IPv4 ICMP NAT code. Development of IPv6</div><div class='del'>- * NAT funded by Astaro.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/icmpv6.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l4proto.h&gt;</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-icmpv6_in_range(const struct nf_conntrack_tuple *tuple,</div><div class='del'>-		enum nf_nat_manip_type maniptype,</div><div class='del'>-		const union nf_conntrack_man_proto *min,</div><div class='del'>-		const union nf_conntrack_man_proto *max)</div><div class='del'>-{</div><div class='del'>-	return ntohs(tuple-&gt;src.u.icmp.id) &gt;= ntohs(min-&gt;icmp.id) &amp;&amp;</div><div class='del'>-	       ntohs(tuple-&gt;src.u.icmp.id) &lt;= ntohs(max-&gt;icmp.id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icmpv6_unique_tuple(const struct nf_nat_l3proto *l3proto,</div><div class='del'>-		    struct nf_conntrack_tuple *tuple,</div><div class='del'>-		    const struct nf_nat_range2 *range,</div><div class='del'>-		    enum nf_nat_manip_type maniptype,</div><div class='del'>-		    const struct nf_conn *ct)</div><div class='del'>-{</div><div class='del'>-	static u16 id;</div><div class='del'>-	unsigned int range_size;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	range_size = ntohs(range-&gt;max_proto.icmp.id) -</div><div class='del'>-		     ntohs(range-&gt;min_proto.icmp.id) + 1;</div><div class='del'>-</div><div class='del'>-	if (!(range-&gt;flags &amp; NF_NAT_RANGE_PROTO_SPECIFIED))</div><div class='del'>-		range_size = 0xffff;</div><div class='del'>-</div><div class='del'>-	for (i = 0; ; ++id) {</div><div class='del'>-		tuple-&gt;src.u.icmp.id = htons(ntohs(range-&gt;min_proto.icmp.id) +</div><div class='del'>-					     (id % range_size));</div><div class='del'>-		if (++i == range_size || !nf_nat_used_tuple(tuple, ct))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-icmpv6_manip_pkt(struct sk_buff *skb,</div><div class='del'>-		 const struct nf_nat_l3proto *l3proto,</div><div class='del'>-		 unsigned int iphdroff, unsigned int hdroff,</div><div class='del'>-		 const struct nf_conntrack_tuple *tuple,</div><div class='del'>-		 enum nf_nat_manip_type maniptype)</div><div class='del'>-{</div><div class='del'>-	struct icmp6hdr *hdr;</div><div class='del'>-</div><div class='del'>-	if (!skb_make_writable(skb, hdroff + sizeof(*hdr)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	hdr = (struct icmp6hdr *)(skb-&gt;data + hdroff);</div><div class='del'>-	l3proto-&gt;csum_update(skb, iphdroff, &amp;hdr-&gt;icmp6_cksum,</div><div class='del'>-			     tuple, maniptype);</div><div class='del'>-	if (hdr-&gt;icmp6_type == ICMPV6_ECHO_REQUEST ||</div><div class='del'>-	    hdr-&gt;icmp6_type == ICMPV6_ECHO_REPLY) {</div><div class='del'>-		inet_proto_csum_replace2(&amp;hdr-&gt;icmp6_cksum, skb,</div><div class='del'>-					 hdr-&gt;icmp6_identifier,</div><div class='del'>-					 tuple-&gt;src.u.icmp.id, false);</div><div class='del'>-		hdr-&gt;icmp6_identifier = tuple-&gt;src.u.icmp.id;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct nf_nat_l4proto nf_nat_l4proto_icmpv6 = {</div><div class='del'>-	.l4proto		= IPPROTO_ICMPV6,</div><div class='del'>-	.manip_pkt		= icmpv6_manip_pkt,</div><div class='del'>-	.in_range		= icmpv6_in_range,</div><div class='del'>-	.unique_tuple		= icmpv6_unique_tuple,</div><div class='del'>-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)</div><div class='del'>-	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c<br/>index 24858402e374..ef5b7e85cffa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_reject_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_reject_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_reject_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_reject_ipv6.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* (C) 1999-2001 Paul `Rusty' Russell</div><div class='ctx'>  * (C) 2002-2004 Netfilter Core Team &lt;coreteam@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -15,9 +12,187 @@</div><div class='ctx'> #include &lt;linux/netfilter_ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter_bridge.h&gt;</div><div class='ctx'> </div><div class='del'>-const struct tcphdr *nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,</div><div class='del'>-					      struct tcphdr *otcph,</div><div class='del'>-					      unsigned int *otcplen, int hook)</div><div class='add'>+static struct ipv6hdr *</div><div class='add'>+nf_reject_ip6hdr_put(struct sk_buff *nskb,</div><div class='add'>+		     const struct sk_buff *oldskb,</div><div class='add'>+		     __u8 protocol, int hoplimit);</div><div class='add'>+static void</div><div class='add'>+nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,</div><div class='add'>+			 const struct sk_buff *oldskb,</div><div class='add'>+			 const struct tcphdr *oth, unsigned int otcplen);</div><div class='add'>+static const struct tcphdr *</div><div class='add'>+nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,</div><div class='add'>+			 struct tcphdr *otcph,</div><div class='add'>+			 unsigned int *otcplen, int hook);</div><div class='add'>+</div><div class='add'>+static bool nf_reject_v6_csum_ok(struct sk_buff *skb, int hook)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	int thoff;</div><div class='add'>+	__be16 fo;</div><div class='add'>+	u8 proto = ip6h-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+	if (skb_csum_unnecessary(skb))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (ip6h-&gt;payload_len &amp;&amp;</div><div class='add'>+	    pskb_trim_rcsum(skb, ntohs(ip6h-&gt;payload_len) + sizeof(*ip6h)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ip6h = ipv6_hdr(skb);</div><div class='add'>+	thoff = ipv6_skip_exthdr(skb, ((u8*)(ip6h+1) - skb-&gt;data), &amp;proto, &amp;fo);</div><div class='add'>+	if (thoff &lt; 0 || thoff &gt;= skb-&gt;len || (fo &amp; htons(~0x7)) != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_verify_csum(skb, thoff, proto))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return nf_ip6_checksum(skb, hook, thoff, proto) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nf_reject_ip6hdr_validate(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *hdr;</div><div class='add'>+	u32 pkt_len;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	if (hdr-&gt;version != 6)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pkt_len = ntohs(hdr-&gt;payload_len);</div><div class='add'>+	if (pkt_len + sizeof(struct ipv6hdr) &gt; skb-&gt;len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *nf_reject_skb_v6_tcp_reset(struct net *net,</div><div class='add'>+					   struct sk_buff *oldskb,</div><div class='add'>+					   const struct net_device *dev,</div><div class='add'>+					   int hook)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	const struct tcphdr *oth;</div><div class='add'>+	struct tcphdr _oth;</div><div class='add'>+	unsigned int otcplen;</div><div class='add'>+	struct ipv6hdr *nip6h;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_ip6hdr_validate(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	oth = nf_reject_ip6_tcphdr_get(oldskb, &amp;_oth, &amp;otcplen, hook);</div><div class='add'>+	if (!oth)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(sizeof(struct ipv6hdr) + sizeof(struct tcphdr) +</div><div class='add'>+			 LL_MAX_HEADER, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb-&gt;dev = (struct net_device *)dev;</div><div class='add'>+</div><div class='add'>+	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='add'>+	nip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='add'>+				     READ_ONCE(net-&gt;ipv6.devconf_all-&gt;hop_limit));</div><div class='add'>+	nf_reject_ip6_tcphdr_put(nskb, oldskb, oth, otcplen);</div><div class='add'>+	nip6h-&gt;payload_len = htons(nskb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	return nskb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_reject_skb_v6_tcp_reset);</div><div class='add'>+</div><div class='add'>+static bool nf_skb_is_icmp6_unreach(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	u8 proto = ip6h-&gt;nexthdr;</div><div class='add'>+	u8 _type, *tp;</div><div class='add'>+	int thoff;</div><div class='add'>+	__be16 fo;</div><div class='add'>+</div><div class='add'>+	thoff = ipv6_skip_exthdr(skb, ((u8 *)(ip6h + 1) - skb-&gt;data), &amp;proto, &amp;fo);</div><div class='add'>+</div><div class='add'>+	if (thoff &lt; 0 || thoff &gt;= skb-&gt;len || fo != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (proto != IPPROTO_ICMPV6)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	tp = skb_header_pointer(skb,</div><div class='add'>+				thoff + offsetof(struct icmp6hdr, icmp6_type),</div><div class='add'>+				sizeof(_type), &amp;_type);</div><div class='add'>+</div><div class='add'>+	if (!tp)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return *tp == ICMPV6_DEST_UNREACH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *nf_reject_skb_v6_unreach(struct net *net,</div><div class='add'>+					 struct sk_buff *oldskb,</div><div class='add'>+					 const struct net_device *dev,</div><div class='add'>+					 int hook, u8 code)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct ipv6hdr *nip6h;</div><div class='add'>+	struct icmp6hdr *icmp6h;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_ip6hdr_validate(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Don't reply to ICMPV6_DEST_UNREACH with ICMPV6_DEST_UNREACH */</div><div class='add'>+	if (nf_skb_is_icmp6_unreach(oldskb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Include "As much of invoking packet as possible without the ICMPv6</div><div class='add'>+	 * packet exceeding the minimum IPv6 MTU" in the ICMP payload.</div><div class='add'>+	 */</div><div class='add'>+	len = min_t(unsigned int, 1220, oldskb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(oldskb, len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!nf_reject_v6_csum_ok(oldskb, hook))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb = alloc_skb(sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr) +</div><div class='add'>+			 LL_MAX_HEADER + len, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nskb-&gt;dev = (struct net_device *)dev;</div><div class='add'>+</div><div class='add'>+	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='add'>+	nip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_ICMPV6,</div><div class='add'>+				     READ_ONCE(net-&gt;ipv6.devconf_all-&gt;hop_limit));</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(nskb);</div><div class='add'>+	icmp6h = skb_put_zero(nskb, sizeof(struct icmp6hdr));</div><div class='add'>+	icmp6h-&gt;icmp6_type = ICMPV6_DEST_UNREACH;</div><div class='add'>+	icmp6h-&gt;icmp6_code = code;</div><div class='add'>+</div><div class='add'>+	skb_put_data(nskb, skb_network_header(oldskb), len);</div><div class='add'>+	nip6h-&gt;payload_len = htons(nskb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	icmp6h-&gt;icmp6_cksum =</div><div class='add'>+		csum_ipv6_magic(&amp;nip6h-&gt;saddr, &amp;nip6h-&gt;daddr,</div><div class='add'>+				nskb-&gt;len - sizeof(struct ipv6hdr),</div><div class='add'>+				IPPROTO_ICMPV6,</div><div class='add'>+				csum_partial(icmp6h,</div><div class='add'>+					     nskb-&gt;len - sizeof(struct ipv6hdr),</div><div class='add'>+					     0));</div><div class='add'>+</div><div class='add'>+	return nskb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nf_reject_skb_v6_unreach);</div><div class='add'>+</div><div class='add'>+static const struct tcphdr *</div><div class='add'>+nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,</div><div class='add'>+			 struct tcphdr *otcph,</div><div class='add'>+			 unsigned int *otcplen, int hook)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);</div><div class='ctx'> 	u8 proto;</div><div class='hunk'>@@ -61,11 +236,11 @@ const struct tcphdr *nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,</div><div class='ctx'> </div><div class='ctx'> 	return otcph;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_ip6_tcphdr_get);</div><div class='ctx'> </div><div class='del'>-struct ipv6hdr *nf_reject_ip6hdr_put(struct sk_buff *nskb,</div><div class='del'>-				     const struct sk_buff *oldskb,</div><div class='del'>-				     __u8 protocol, int hoplimit)</div><div class='add'>+static struct ipv6hdr *</div><div class='add'>+nf_reject_ip6hdr_put(struct sk_buff *nskb,</div><div class='add'>+		     const struct sk_buff *oldskb,</div><div class='add'>+		     __u8 protocol, int hoplimit)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *ip6h;</div><div class='ctx'> 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);</div><div class='hunk'>@@ -85,40 +260,30 @@ struct ipv6hdr *nf_reject_ip6hdr_put(struct sk_buff *nskb,</div><div class='ctx'> </div><div class='ctx'> 	return ip6h;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_ip6hdr_put);</div><div class='ctx'> </div><div class='del'>-void nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,</div><div class='del'>-			      const struct sk_buff *oldskb,</div><div class='del'>-			      const struct tcphdr *oth, unsigned int otcplen)</div><div class='add'>+static void</div><div class='add'>+nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,</div><div class='add'>+			 const struct sk_buff *oldskb,</div><div class='add'>+			 const struct tcphdr *oth, unsigned int otcplen)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcphdr *tcph;</div><div class='del'>-	int needs_ack;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_transport_header(nskb);</div><div class='del'>-	tcph = skb_put(nskb, sizeof(struct tcphdr));</div><div class='add'>+	tcph = skb_put_zero(nskb, sizeof(struct tcphdr));</div><div class='ctx'> 	/* Truncate to length (no data) */</div><div class='ctx'> 	tcph-&gt;doff = sizeof(struct tcphdr)/4;</div><div class='ctx'> 	tcph-&gt;source = oth-&gt;dest;</div><div class='ctx'> 	tcph-&gt;dest = oth-&gt;source;</div><div class='ctx'> </div><div class='ctx'> 	if (oth-&gt;ack) {</div><div class='del'>-		needs_ack = 0;</div><div class='ctx'> 		tcph-&gt;seq = oth-&gt;ack_seq;</div><div class='del'>-		tcph-&gt;ack_seq = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		needs_ack = 1;</div><div class='ctx'> 		tcph-&gt;ack_seq = htonl(ntohl(oth-&gt;seq) + oth-&gt;syn + oth-&gt;fin +</div><div class='ctx'> 				      otcplen - (oth-&gt;doff&lt;&lt;2));</div><div class='del'>-		tcph-&gt;seq = 0;</div><div class='add'>+		tcph-&gt;ack = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Reset flags */</div><div class='del'>-	((u_int8_t *)tcph)[13] = 0;</div><div class='ctx'> 	tcph-&gt;rst = 1;</div><div class='del'>-	tcph-&gt;ack = needs_ack;</div><div class='del'>-	tcph-&gt;window = 0;</div><div class='del'>-	tcph-&gt;urg_ptr = 0;</div><div class='del'>-	tcph-&gt;check = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust TCP checksum */</div><div class='ctx'> 	tcph-&gt;check = csum_ipv6_magic(&amp;ipv6_hdr(nskb)-&gt;saddr,</div><div class='hunk'>@@ -127,17 +292,31 @@ void nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,</div><div class='ctx'> 				      csum_partial(tcph,</div><div class='ctx'> 						   sizeof(struct tcphdr), 0));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nf_reject_ip6_tcphdr_put);</div><div class='ctx'> </div><div class='del'>-void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='add'>+static int nf_reject6_fill_skb_dst(struct sk_buff *skb_in)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct flowi fl;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fl, 0, sizeof(struct flowi));</div><div class='add'>+	fl.u.ip6.daddr = ipv6_hdr(skb_in)-&gt;saddr;</div><div class='add'>+	nf_ip6_route(dev_net(skb_in-&gt;dev), &amp;dst, &amp;fl, false);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	skb_dst_set(skb_in, dst);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,</div><div class='add'>+		    int hook)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	struct tcphdr _otcph;</div><div class='del'>-	const struct tcphdr *otcph;</div><div class='del'>-	unsigned int otcplen, hh_len;</div><div class='ctx'> 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);</div><div class='del'>-	struct ipv6hdr *ip6h;</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='add'>+	const struct tcphdr *otcph;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct tcphdr _otcph;</div><div class='add'>+	unsigned int otcplen;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> </div><div class='ctx'> 	if ((!(ipv6_addr_type(&amp;oip6h-&gt;saddr) &amp; IPV6_ADDR_UNICAST)) ||</div><div class='hunk'>@@ -156,9 +335,17 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> 	fl6.daddr = oip6h-&gt;saddr;</div><div class='ctx'> 	fl6.fl6_sport = otcph-&gt;dest;</div><div class='ctx'> 	fl6.fl6_dport = otcph-&gt;source;</div><div class='del'>-	fl6.flowi6_oif = l3mdev_master_ifindex(skb_dst(oldskb)-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!skb_dst(oldskb)) {</div><div class='add'>+		nf_ip6_route(net, &amp;dst, flowi6_to_flowi(&amp;fl6), false);</div><div class='add'>+		if (!dst)</div><div class='add'>+			return;</div><div class='add'>+		skb_dst_set(oldskb, dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fl6.flowi6_oif = l3mdev_master_ifindex(skb_dst_dev(oldskb));</div><div class='ctx'> 	fl6.flowi6_mark = IP6_REPLY_MARK(net, oldskb-&gt;mark);</div><div class='del'>-	security_skb_classify_flow(oldskb, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	security_skb_classify_flow(oldskb, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> 	dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='ctx'> 	if (dst-&gt;error) {</div><div class='ctx'> 		dst_release(dst);</div><div class='hunk'>@@ -168,9 +355,8 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	hh_len = (dst-&gt;dev-&gt;hard_header_len + 15)&amp;~15;</div><div class='del'>-	nskb = alloc_skb(hh_len + 15 + dst-&gt;header_len + sizeof(struct ipv6hdr)</div><div class='del'>-			 + sizeof(struct tcphdr) + dst-&gt;trailer_len,</div><div class='add'>+	nskb = alloc_skb(LL_MAX_HEADER + sizeof(struct ipv6hdr) +</div><div class='add'>+			 sizeof(struct tcphdr) + dst-&gt;trailer_len,</div><div class='ctx'> 			 GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (!nskb) {</div><div class='hunk'>@@ -183,12 +369,12 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> </div><div class='ctx'> 	nskb-&gt;mark = fl6.flowi6_mark;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(nskb, hh_len + dst-&gt;header_len);</div><div class='del'>-	ip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP,</div><div class='del'>-				    ip6_dst_hoplimit(dst));</div><div class='add'>+	skb_reserve(nskb, LL_MAX_HEADER);</div><div class='add'>+	nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP, ip6_dst_hoplimit(dst));</div><div class='ctx'> 	nf_reject_ip6_tcphdr_put(nskb, oldskb, otcph, otcplen);</div><div class='ctx'> </div><div class='ctx'> 	nf_ct_attach(nskb, oldskb);</div><div class='add'>+	nf_ct_set_closing(skb_nfct(oldskb));</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)</div><div class='ctx'> 	/* If we use ip6_local_out for bridged traffic, the MAC source on</div><div class='hunk'>@@ -197,19 +383,29 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)</div><div class='ctx'> 	 * build the eth header using the original destination's MAC as the</div><div class='ctx'> 	 * source, and send the RST packet directly.</div><div class='ctx'> 	 */</div><div class='del'>-	if (oldskb-&gt;nf_bridge) {</div><div class='add'>+	if (nf_bridge_info_exists(oldskb)) {</div><div class='ctx'> 		struct ethhdr *oeth = eth_hdr(oldskb);</div><div class='add'>+		struct ipv6hdr *ip6h = ipv6_hdr(nskb);</div><div class='add'>+		struct net_device *br_indev;</div><div class='ctx'> </div><div class='del'>-		nskb-&gt;dev = nf_bridge_get_physindev(oldskb);</div><div class='add'>+		br_indev = nf_bridge_get_physindev(oldskb, net);</div><div class='add'>+		if (!br_indev) {</div><div class='add'>+			kfree_skb(nskb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nskb-&gt;dev = br_indev;</div><div class='ctx'> 		nskb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> 		ip6h-&gt;payload_len = htons(sizeof(struct tcphdr));</div><div class='ctx'> 		if (dev_hard_header(nskb, nskb-&gt;dev, ntohs(nskb-&gt;protocol),</div><div class='del'>-				    oeth-&gt;h_source, oeth-&gt;h_dest, nskb-&gt;len) &lt; 0)</div><div class='add'>+				    oeth-&gt;h_source, oeth-&gt;h_dest, nskb-&gt;len) &lt; 0) {</div><div class='add'>+			kfree_skb(nskb);</div><div class='ctx'> 			return;</div><div class='add'>+		}</div><div class='ctx'> 		dev_queue_xmit(nskb);</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='del'>-		ip6_local_out(net, nskb-&gt;sk, nskb);</div><div class='add'>+		ip6_local_out(net, sk, nskb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_send_reset6);</div><div class='ctx'> </div><div class='hunk'>@@ -229,6 +425,9 @@ static bool reject6_csum_ok(struct sk_buff *skb, int hook)</div><div class='ctx'> 	if (thoff &lt; 0 || thoff &gt;= skb-&gt;len || (fo &amp; htons(~0x7)) != 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	if (!nf_reject_verify_csum(skb, thoff, proto))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	return nf_ip6_checksum(skb, hook, thoff, proto) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,8 +440,12 @@ void nf_send_unreach6(struct net *net, struct sk_buff *skb_in,</div><div class='ctx'> 	if (hooknum == NF_INET_LOCAL_OUT &amp;&amp; skb_in-&gt;dev == NULL)</div><div class='ctx'> 		skb_in-&gt;dev = net-&gt;loopback_dev;</div><div class='ctx'> </div><div class='add'>+	if (!skb_dst(skb_in) &amp;&amp; nf_reject6_fill_skb_dst(skb_in) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nf_send_unreach6);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IPv6 packet rejection core");</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_socket_ipv6.c b/net/ipv6/netfilter/nf_socket_ipv6.c<br/>index f14de4b6d639..ced8bd44828e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_socket_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_socket_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_socket_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_socket_ipv6.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007-2008 BalaBit IT Ltd.</div><div class='ctx'>  * Author: Krisztian Kovacs</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -16,7 +12,6 @@</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/inet_sock.h&gt;</div><div class='ctx'> #include &lt;net/inet6_hashtables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv6/nf_defrag_ipv6.h&gt;</div><div class='ctx'> #include &lt;net/netfilter/nf_socket.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='ctx'> #include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='hunk'>@@ -88,8 +83,7 @@ nf_socket_get_sock_v6(struct net *net, struct sk_buff *skb, int doff,</div><div class='ctx'> {</div><div class='ctx'> 	switch (protocol) {</div><div class='ctx'> 	case IPPROTO_TCP:</div><div class='del'>-		return inet6_lookup(net, &amp;tcp_hashinfo, skb, doff,</div><div class='del'>-				    saddr, sport, daddr, dport,</div><div class='add'>+		return inet6_lookup(net, skb, doff, saddr, sport, daddr, dport,</div><div class='ctx'> 				    in-&gt;ifindex);</div><div class='ctx'> 	case IPPROTO_UDP:</div><div class='ctx'> 		return udp6_lib_lookup(net, saddr, sport, daddr, dport,</div><div class='hunk'>@@ -102,12 +96,16 @@ nf_socket_get_sock_v6(struct net *net, struct sk_buff *skb, int doff,</div><div class='ctx'> struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 				  const struct net_device *indev)</div><div class='ctx'> {</div><div class='del'>-	__be16 uninitialized_var(dport), uninitialized_var(sport);</div><div class='add'>+	__be16 dport, sport;</div><div class='ctx'> 	const struct in6_addr *daddr = NULL, *saddr = NULL;</div><div class='del'>-	struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+	struct ipv6hdr *iph = ipv6_hdr(skb), ipv6_var;</div><div class='ctx'> 	struct sk_buff *data_skb = NULL;</div><div class='ctx'> 	int doff = 0;</div><div class='ctx'> 	int thoff = 0, tproto;</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+	enum ip_conntrack_info ctinfo;</div><div class='add'>+	struct nf_conn const *ct;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	tproto = ipv6_find_hdr(skb, &amp;thoff, -1, NULL, NULL);</div><div class='ctx'> 	if (tproto &lt; 0) {</div><div class='hunk'>@@ -134,8 +132,6 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 			thoff + sizeof(*hp);</div><div class='ctx'> </div><div class='ctx'> 	} else if (tproto == IPPROTO_ICMPV6) {</div><div class='del'>-		struct ipv6hdr ipv6_var;</div><div class='del'>-</div><div class='ctx'> 		if (extract_icmp6_fields(skb, thoff, &amp;tproto, &amp;saddr, &amp;daddr,</div><div class='ctx'> 					 &amp;sport, &amp;dport, &amp;ipv6_var))</div><div class='ctx'> 			return NULL;</div><div class='hunk'>@@ -143,6 +139,25 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='add'>+	/* Do the lookup with the original socket address in</div><div class='add'>+	 * case this is a reply packet of an established</div><div class='add'>+	 * SNAT-ted connection.</div><div class='add'>+	 */</div><div class='add'>+	ct = nf_ct_get(skb, &amp;ctinfo);</div><div class='add'>+	if (ct &amp;&amp;</div><div class='add'>+	    ((tproto != IPPROTO_ICMPV6 &amp;&amp;</div><div class='add'>+	      ctinfo == IP_CT_ESTABLISHED_REPLY) ||</div><div class='add'>+	     (tproto == IPPROTO_ICMPV6 &amp;&amp;</div><div class='add'>+	      ctinfo == IP_CT_RELATED_REPLY)) &amp;&amp;</div><div class='add'>+	    (ct-&gt;status &amp; IPS_SRC_NAT_DONE)) {</div><div class='add'>+		daddr = &amp;ct-&gt;tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in6;</div><div class='add'>+		dport = (tproto == IPPROTO_TCP) ?</div><div class='add'>+			ct-&gt;tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.tcp.port :</div><div class='add'>+			ct-&gt;tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return nf_socket_get_sock_v6(net, data_skb, doff, tproto, saddr, daddr,</div><div class='ctx'> 				     sport, dport, indev);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/netfilter/nf_tproxy_ipv6.c b/net/ipv6/netfilter/nf_tproxy_ipv6.c<br/>index 5dfd33af6451..b2f59ed9d7cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_tproxy_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nf_tproxy_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nf_tproxy_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nf_tproxy_ipv6.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #include &lt;net/netfilter/nf_tproxy.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/inet6_hashtables.h&gt;</div><div class='hunk'>@@ -62,7 +63,7 @@ nf_tproxy_handle_time_wait6(struct sk_buff *skb, int tproto, int thoff,</div><div class='ctx'> 					    lport ? lport : hp-&gt;dest,</div><div class='ctx'> 					    skb-&gt;dev, NF_TPROXY_LOOKUP_LISTENER);</div><div class='ctx'> 		if (sk2) {</div><div class='del'>-			inet_twsk_deschedule_put(inet_twsk(sk));</div><div class='add'>+			nf_tproxy_twsk_deschedule_put(inet_twsk(sk));</div><div class='ctx'> 			sk = sk2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -92,7 +93,7 @@ nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff,</div><div class='ctx'> </div><div class='ctx'> 		switch (lookup_type) {</div><div class='ctx'> 		case NF_TPROXY_LOOKUP_LISTENER:</div><div class='del'>-			sk = inet6_lookup_listener(net, &amp;tcp_hashinfo, skb,</div><div class='add'>+			sk = inet6_lookup_listener(net, skb,</div><div class='ctx'> 						   thoff + __tcp_hdrlen(hp),</div><div class='ctx'> 						   saddr, sport,</div><div class='ctx'> 						   daddr, ntohs(dport),</div><div class='hunk'>@@ -107,9 +108,8 @@ nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff,</div><div class='ctx'> 			 */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NF_TPROXY_LOOKUP_ESTABLISHED:</div><div class='del'>-			sk = __inet6_lookup_established(net, &amp;tcp_hashinfo,</div><div class='del'>-							saddr, sport, daddr, ntohs(dport),</div><div class='del'>-							in-&gt;ifindex, 0);</div><div class='add'>+			sk = __inet6_lookup_established(net, saddr, sport, daddr,</div><div class='add'>+							ntohs(dport), in-&gt;ifindex, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='hunk'>@@ -149,4 +149,4 @@ EXPORT_SYMBOL_GPL(nf_tproxy_get_sock_v6);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Balazs Scheidler, Krisztian Kovacs");</div><div class='del'>-MODULE_DESCRIPTION("Netfilter IPv4 transparent proxy support");</div><div class='add'>+MODULE_DESCRIPTION("Netfilter IPv6 transparent proxy support");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_chain_nat_ipv6.c b/net/ipv6/netfilter/nft_chain_nat_ipv6.c<br/>deleted file mode 100644<br/>index 8a081ad7d5db..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_chain_nat_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_chain_nat_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- * Copyright (c) 2012 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_conntrack.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_core.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables_ipv6.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_l3proto.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int nft_nat_do_chain(void *priv,</div><div class='del'>-				     struct sk_buff *skb,</div><div class='del'>-				     const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	struct nft_pktinfo pkt;</div><div class='del'>-</div><div class='del'>-	nft_set_pktinfo(&amp;pkt, skb, state);</div><div class='del'>-	nft_set_pktinfo_ipv6(&amp;pkt, skb);</div><div class='del'>-</div><div class='del'>-	return nft_do_chain(&amp;pkt, priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nft_nat_ipv6_reg(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	return nf_nat_l3proto_ipv6_register_fn(net, ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nft_nat_ipv6_unreg(struct net *net, const struct nf_hook_ops *ops)</div><div class='del'>-{</div><div class='del'>-	nf_nat_l3proto_ipv6_unregister_fn(net, ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nft_chain_type nft_chain_nat_ipv6 = {</div><div class='del'>-	.name		= "nat",</div><div class='del'>-	.type		= NFT_CHAIN_T_NAT,</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.hook_mask	= (1 &lt;&lt; NF_INET_PRE_ROUTING) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_POST_ROUTING) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_LOCAL_OUT) |</div><div class='del'>-			  (1 &lt;&lt; NF_INET_LOCAL_IN),</div><div class='del'>-	.hooks		= {</div><div class='del'>-		[NF_INET_PRE_ROUTING]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_POST_ROUTING]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_LOCAL_OUT]	= nft_nat_do_chain,</div><div class='del'>-		[NF_INET_LOCAL_IN]	= nft_nat_do_chain,</div><div class='del'>-	},</div><div class='del'>-	.ops_register		= nft_nat_ipv6_reg,</div><div class='del'>-	.ops_unregister		= nft_nat_ipv6_unreg,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_chain_nat_ipv6_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_chain_type(&amp;nft_chain_nat_ipv6);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_chain_nat_ipv6_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_chain_type(&amp;nft_chain_nat_ipv6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_chain_nat_ipv6_init);</div><div class='del'>-module_exit(nft_chain_nat_ipv6_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Tomasz Bursztyka &lt;tomasz.bursztyka@linux.intel.com&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_CHAIN(AF_INET6, "nat");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_chain_route_ipv6.c b/net/ipv6/netfilter/nft_chain_route_ipv6.c<br/>deleted file mode 100644<br/>index da3f1f8cb325..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_chain_route_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_chain_route_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2008 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='del'>- * Copyright (c) 2012 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Development of this code funded by Astaro AG (http://www.astaro.com/)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nfnetlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables_ipv6.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int nf_route_table_hook(void *priv,</div><div class='del'>-					struct sk_buff *skb,</div><div class='del'>-					const struct nf_hook_state *state)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	struct nft_pktinfo pkt;</div><div class='del'>-	struct in6_addr saddr, daddr;</div><div class='del'>-	u_int8_t hop_limit;</div><div class='del'>-	u32 mark, flowlabel;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	nft_set_pktinfo(&amp;pkt, skb, state);</div><div class='del'>-	nft_set_pktinfo_ipv6(&amp;pkt, skb);</div><div class='del'>-</div><div class='del'>-	/* save source/dest address, mark, hoplimit, flowlabel, priority */</div><div class='del'>-	memcpy(&amp;saddr, &amp;ipv6_hdr(skb)-&gt;saddr, sizeof(saddr));</div><div class='del'>-	memcpy(&amp;daddr, &amp;ipv6_hdr(skb)-&gt;daddr, sizeof(daddr));</div><div class='del'>-	mark = skb-&gt;mark;</div><div class='del'>-	hop_limit = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='del'>-</div><div class='del'>-	/* flowlabel and prio (includes version, which shouldn't change either */</div><div class='del'>-	flowlabel = *((u32 *)ipv6_hdr(skb));</div><div class='del'>-</div><div class='del'>-	ret = nft_do_chain(&amp;pkt, priv);</div><div class='del'>-	if (ret != NF_DROP &amp;&amp; ret != NF_STOLEN &amp;&amp;</div><div class='del'>-	    (memcmp(&amp;ipv6_hdr(skb)-&gt;saddr, &amp;saddr, sizeof(saddr)) ||</div><div class='del'>-	     memcmp(&amp;ipv6_hdr(skb)-&gt;daddr, &amp;daddr, sizeof(daddr)) ||</div><div class='del'>-	     skb-&gt;mark != mark ||</div><div class='del'>-	     ipv6_hdr(skb)-&gt;hop_limit != hop_limit ||</div><div class='del'>-	     flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {</div><div class='del'>-		err = ip6_route_me_harder(state-&gt;net, skb);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			ret = NF_DROP_ERR(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nft_chain_type nft_chain_route_ipv6 = {</div><div class='del'>-	.name		= "route",</div><div class='del'>-	.type		= NFT_CHAIN_T_ROUTE,</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.hook_mask	= (1 &lt;&lt; NF_INET_LOCAL_OUT),</div><div class='del'>-	.hooks		= {</div><div class='del'>-		[NF_INET_LOCAL_OUT]	= nf_route_table_hook,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_chain_route_init(void)</div><div class='del'>-{</div><div class='del'>-	nft_register_chain_type(&amp;nft_chain_route_ipv6);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_chain_route_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_chain_type(&amp;nft_chain_route_ipv6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_chain_route_init);</div><div class='del'>-module_exit(nft_chain_route_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_CHAIN(AF_INET6, "route");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_dup_ipv6.c b/net/ipv6/netfilter/nft_dup_ipv6.c<br/>index d8b5b60b7d53..492a811828a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_dup_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_dup_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_dup_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nft_dup_ipv6.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015 Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -16,8 +13,8 @@</div><div class='ctx'> #include &lt;net/netfilter/ipv6/nf_dup_ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct nft_dup_ipv6 {</div><div class='del'>-	enum nft_registers	sreg_addr:8;</div><div class='del'>-	enum nft_registers	sreg_dev:8;</div><div class='add'>+	u8	sreg_addr;</div><div class='add'>+	u8	sreg_dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nft_dup_ipv6_eval(const struct nft_expr *expr,</div><div class='hunk'>@@ -41,19 +38,20 @@ static int nft_dup_ipv6_init(const struct nft_ctx *ctx,</div><div class='ctx'> 	if (tb[NFTA_DUP_SREG_ADDR] == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;sreg_addr = nft_parse_register(tb[NFTA_DUP_SREG_ADDR]);</div><div class='del'>-	err = nft_validate_register_load(priv-&gt;sreg_addr, sizeof(struct in6_addr));</div><div class='add'>+	err = nft_parse_register_load(ctx, tb[NFTA_DUP_SREG_ADDR], &amp;priv-&gt;sreg_addr,</div><div class='add'>+				      sizeof(struct in6_addr));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (tb[NFTA_DUP_SREG_DEV] != NULL) {</div><div class='del'>-		priv-&gt;sreg_dev = nft_parse_register(tb[NFTA_DUP_SREG_DEV]);</div><div class='del'>-		return nft_validate_register_load(priv-&gt;sreg_dev, sizeof(int));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (tb[NFTA_DUP_SREG_DEV])</div><div class='add'>+		err = nft_parse_register_load(ctx, tb[NFTA_DUP_SREG_DEV],</div><div class='add'>+					      &amp;priv-&gt;sreg_dev, sizeof(int));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nft_dup_ipv6_dump(struct sk_buff *skb, const struct nft_expr *expr)</div><div class='add'>+static int nft_dup_ipv6_dump(struct sk_buff *skb,</div><div class='add'>+			     const struct nft_expr *expr, bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct nft_dup_ipv6 *priv = nft_expr_priv(expr);</div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +74,7 @@ static const struct nft_expr_ops nft_dup_ipv6_ops = {</div><div class='ctx'> 	.eval		= nft_dup_ipv6_eval,</div><div class='ctx'> 	.init		= nft_dup_ipv6_init,</div><div class='ctx'> 	.dump		= nft_dup_ipv6_dump,</div><div class='add'>+	.reduce		= NFT_REDUCE_READONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy nft_dup_ipv6_policy[NFTA_DUP_MAX + 1] = {</div><div class='hunk'>@@ -108,3 +107,4 @@ module_exit(nft_dup_ipv6_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "dup");</div><div class='add'>+MODULE_DESCRIPTION("IPv6 nftables packet duplication support");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c<br/>index 36be3cf0adef..421036a3605b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_fib_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_fib_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_fib_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nft_fib_ipv6.c</a></div><div class='hunk'>@@ -1,8 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -34,6 +30,10 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv,</div><div class='ctx'> 		fl6-&gt;daddr = iph-&gt;daddr;</div><div class='ctx'> 		fl6-&gt;saddr = iph-&gt;saddr;</div><div class='ctx'> 	} else {</div><div class='add'>+		if (nft_hook(pkt) == NF_INET_FORWARD &amp;&amp;</div><div class='add'>+		    priv-&gt;flags &amp; NFTA_FIB_F_IIF)</div><div class='add'>+			fl6-&gt;flowi6_iif = nft_out(pkt)-&gt;ifindex;</div><div class='add'>+</div><div class='ctx'> 		fl6-&gt;daddr = iph-&gt;saddr;</div><div class='ctx'> 		fl6-&gt;saddr = iph-&gt;daddr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -50,6 +50,7 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv,</div><div class='ctx'> 		fl6-&gt;flowi6_mark = pkt-&gt;skb-&gt;mark;</div><div class='ctx'> </div><div class='ctx'> 	fl6-&gt;flowlabel = (*(__be32 *)iph) &amp; IPV6_FLOWINFO_MASK;</div><div class='add'>+	fl6-&gt;flowi6_l3mdev = nft_fib_l3mdev_master_ifindex_rcu(pkt, dev);</div><div class='ctx'> </div><div class='ctx'> 	return lookup_flags;</div><div class='ctx'> }</div><div class='hunk'>@@ -59,19 +60,15 @@ static u32 __nft_fib6_eval_type(const struct nft_fib *priv,</div><div class='ctx'> 				struct ipv6hdr *iph)</div><div class='ctx'> {</div><div class='ctx'> 	const struct net_device *dev = NULL;</div><div class='del'>-	const struct nf_ipv6_ops *v6ops;</div><div class='ctx'> 	int route_err, addrtype;</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='ctx'> 		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='ctx'> 		.flowi6_proto = pkt-&gt;tprot,</div><div class='add'>+		.flowi6_uid = sock_net_uid(nft_net(pkt), NULL),</div><div class='ctx'> 	};</div><div class='ctx'> 	u32 ret = 0;</div><div class='ctx'> </div><div class='del'>-	v6ops = nf_get_ipv6_ops();</div><div class='del'>-	if (!v6ops)</div><div class='del'>-		return RTN_UNREACHABLE;</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;flags &amp; NFTA_FIB_F_IIF)</div><div class='ctx'> 		dev = nft_in(pkt);</div><div class='ctx'> 	else if (priv-&gt;flags &amp; NFTA_FIB_F_OIF)</div><div class='hunk'>@@ -79,10 +76,10 @@ static u32 __nft_fib6_eval_type(const struct nft_fib *priv,</div><div class='ctx'> </div><div class='ctx'> 	nft_fib6_flowi_init(&amp;fl6, priv, pkt, dev, iph);</div><div class='ctx'> </div><div class='del'>-	if (dev &amp;&amp; v6ops-&gt;chk_addr(nft_net(pkt), &amp;fl6.daddr, dev, true))</div><div class='add'>+	if (dev &amp;&amp; nf_ipv6_chk_addr(nft_net(pkt), &amp;fl6.daddr, dev, true))</div><div class='ctx'> 		ret = RTN_LOCAL;</div><div class='ctx'> </div><div class='del'>-	route_err = v6ops-&gt;route(nft_net(pkt), (struct dst_entry **)&amp;rt,</div><div class='add'>+	route_err = nf_ip6_route(nft_net(pkt), (struct dst_entry **)&amp;rt,</div><div class='ctx'> 				 flowi6_to_flowi(&amp;fl6), false);</div><div class='ctx'> 	if (route_err)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -144,21 +141,39 @@ void nft_fib6_eval_type(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nft_fib6_eval_type);</div><div class='ctx'> </div><div class='add'>+static bool nft_fib_v6_skip_icmpv6(const struct sk_buff *skb, u8 next, const struct ipv6hdr *iph)</div><div class='add'>+{</div><div class='add'>+	if (likely(next != IPPROTO_ICMPV6))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_type(&amp;iph-&gt;saddr) != IPV6_ADDR_ANY)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return ipv6_addr_type(&amp;iph-&gt;daddr) &amp; IPV6_ADDR_LINKLOCAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 		   const struct nft_pktinfo *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	const struct nft_fib *priv = nft_expr_priv(expr);</div><div class='ctx'> 	int noff = skb_network_offset(pkt-&gt;skb);</div><div class='add'>+	const struct net_device *found = NULL;</div><div class='ctx'> 	const struct net_device *oif = NULL;</div><div class='ctx'> 	u32 *dest = &amp;regs-&gt;data[priv-&gt;dreg];</div><div class='ctx'> 	struct ipv6hdr *iph, _iph;</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='ctx'> 		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='ctx'> 		.flowi6_proto = pkt-&gt;tprot,</div><div class='add'>+		.flowi6_uid = sock_net_uid(nft_net(pkt), NULL),</div><div class='ctx'> 	};</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> 	int lookup_flags;</div><div class='ctx'> </div><div class='add'>+	if (nft_fib_can_skip(pkt)) {</div><div class='add'>+		nft_fib_store_result(dest, priv, nft_in(pkt));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;flags &amp; NFTA_FIB_F_IIF)</div><div class='ctx'> 		oif = nft_in(pkt);</div><div class='ctx'> 	else if (priv-&gt;flags &amp; NFTA_FIB_F_OIF)</div><div class='hunk'>@@ -170,15 +185,13 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lookup_flags = nft_fib6_flowi_init(&amp;fl6, priv, pkt, oif, iph);</div><div class='del'>-</div><div class='del'>-	if (nft_hook(pkt) == NF_INET_PRE_ROUTING &amp;&amp;</div><div class='del'>-	    nft_fib_is_loopback(pkt-&gt;skb, nft_in(pkt))) {</div><div class='del'>-		nft_fib_store_result(dest, priv, pkt,</div><div class='del'>-				     nft_in(pkt)-&gt;ifindex);</div><div class='add'>+	if (nft_fib_v6_skip_icmpv6(pkt-&gt;skb, pkt-&gt;tprot, iph)) {</div><div class='add'>+		nft_fib_store_result(dest, priv, nft_in(pkt));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lookup_flags = nft_fib6_flowi_init(&amp;fl6, priv, pkt, oif, iph);</div><div class='add'>+</div><div class='ctx'> 	*dest = 0;</div><div class='ctx'> 	rt = (void *)ip6_route_lookup(nft_net(pkt), &amp;fl6, pkt-&gt;skb,</div><div class='ctx'> 				      lookup_flags);</div><div class='hunk'>@@ -189,21 +202,15 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,</div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; (RTF_REJECT | RTF_ANYCAST | RTF_LOCAL))</div><div class='ctx'> 		goto put_rt_err;</div><div class='ctx'> </div><div class='del'>-	if (oif &amp;&amp; oif != rt-&gt;rt6i_idev-&gt;dev)</div><div class='del'>-		goto put_rt_err;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;result) {</div><div class='del'>-	case NFT_FIB_RESULT_OIF:</div><div class='del'>-		*dest = rt-&gt;rt6i_idev-&gt;dev-&gt;ifindex;</div><div class='del'>-		break;</div><div class='del'>-	case NFT_FIB_RESULT_OIFNAME:</div><div class='del'>-		strncpy((char *)dest, rt-&gt;rt6i_idev-&gt;dev-&gt;name, IFNAMSIZ);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='add'>+	if (!oif) {</div><div class='add'>+		found = rt-&gt;rt6i_idev-&gt;dev;</div><div class='add'>+	} else {</div><div class='add'>+		if (oif == rt-&gt;rt6i_idev-&gt;dev ||</div><div class='add'>+		    l3mdev_master_ifindex_rcu(rt-&gt;rt6i_idev-&gt;dev) == oif-&gt;ifindex)</div><div class='add'>+			found = oif;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nft_fib_store_result(dest, priv, found);</div><div class='ctx'>  put_rt_err:</div><div class='ctx'> 	ip6_rt_put(rt);</div><div class='ctx'> }</div><div class='hunk'>@@ -218,6 +225,7 @@ static const struct nft_expr_ops nft_fib6_type_ops = {</div><div class='ctx'> 	.init		= nft_fib_init,</div><div class='ctx'> 	.dump		= nft_fib_dump,</div><div class='ctx'> 	.validate	= nft_fib_validate,</div><div class='add'>+	.reduce		= nft_fib_reduce,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nft_expr_ops nft_fib6_ops = {</div><div class='hunk'>@@ -227,6 +235,7 @@ static const struct nft_expr_ops nft_fib6_ops = {</div><div class='ctx'> 	.init		= nft_fib_init,</div><div class='ctx'> 	.dump		= nft_fib_dump,</div><div class='ctx'> 	.validate	= nft_fib_validate,</div><div class='add'>+	.reduce		= nft_fib_reduce,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nft_expr_ops *</div><div class='hunk'>@@ -276,3 +285,4 @@ module_exit(nft_fib6_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Florian Westphal &lt;fw@strlen.de&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(10, "fib");</div><div class='add'>+MODULE_DESCRIPTION("nftables fib / ipv6 route lookup support");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_masq_ipv6.c b/net/ipv6/netfilter/nft_masq_ipv6.c<br/>deleted file mode 100644<br/>index dd0122f3cffe..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_masq_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_masq_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nft_masq.h&gt;</div><div class='del'>-#include &lt;net/netfilter/ipv6/nf_nat_masquerade.h&gt;</div><div class='del'>-</div><div class='del'>-static void nft_masq_ipv6_eval(const struct nft_expr *expr,</div><div class='del'>-			       struct nft_regs *regs,</div><div class='del'>-			       const struct nft_pktinfo *pkt)</div><div class='del'>-{</div><div class='del'>-	struct nft_masq *priv = nft_expr_priv(expr);</div><div class='del'>-	struct nf_nat_range2 range;</div><div class='del'>-</div><div class='del'>-	memset(&amp;range, 0, sizeof(range));</div><div class='del'>-	range.flags = priv-&gt;flags;</div><div class='del'>-	if (priv-&gt;sreg_proto_min) {</div><div class='del'>-		range.min_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_min]);</div><div class='del'>-		range.max_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_max]);</div><div class='del'>-	}</div><div class='del'>-	regs-&gt;verdict.code = nf_nat_masquerade_ipv6(pkt-&gt;skb, &amp;range,</div><div class='del'>-						    nft_out(pkt));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nft_masq_ipv6_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(ctx-&gt;net, NFPROTO_IPV6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_masq_ipv6_type;</div><div class='del'>-static const struct nft_expr_ops nft_masq_ipv6_ops = {</div><div class='del'>-	.type		= &amp;nft_masq_ipv6_type,</div><div class='del'>-	.size		= NFT_EXPR_SIZE(sizeof(struct nft_masq)),</div><div class='del'>-	.eval		= nft_masq_ipv6_eval,</div><div class='del'>-	.init		= nft_masq_init,</div><div class='del'>-	.destroy	= nft_masq_ipv6_destroy,</div><div class='del'>-	.dump		= nft_masq_dump,</div><div class='del'>-	.validate	= nft_masq_validate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_masq_ipv6_type __read_mostly = {</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.name		= "masq",</div><div class='del'>-	.ops		= &amp;nft_masq_ipv6_ops,</div><div class='del'>-	.policy		= nft_masq_policy,</div><div class='del'>-	.maxattr	= NFTA_MASQ_MAX,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_masq_ipv6_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = nft_register_expr(&amp;nft_masq_ipv6_type);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	nf_nat_masquerade_ipv6_register_notifier();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_masq_ipv6_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_expr(&amp;nft_masq_ipv6_type);</div><div class='del'>-	nf_nat_masquerade_ipv6_unregister_notifier();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_masq_ipv6_module_init);</div><div class='del'>-module_exit(nft_masq_ipv6_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "masq");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_redir_ipv6.c b/net/ipv6/netfilter/nft_redir_ipv6.c<br/>deleted file mode 100644<br/>index 74269865acc8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_redir_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_redir_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/netfilter.h&gt;</div><div class='del'>-#include &lt;linux/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_tables.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nft_redir.h&gt;</div><div class='del'>-#include &lt;net/netfilter/nf_nat_redirect.h&gt;</div><div class='del'>-</div><div class='del'>-static void nft_redir_ipv6_eval(const struct nft_expr *expr,</div><div class='del'>-				struct nft_regs *regs,</div><div class='del'>-				const struct nft_pktinfo *pkt)</div><div class='del'>-{</div><div class='del'>-	struct nft_redir *priv = nft_expr_priv(expr);</div><div class='del'>-	struct nf_nat_range2 range;</div><div class='del'>-</div><div class='del'>-	memset(&amp;range, 0, sizeof(range));</div><div class='del'>-	if (priv-&gt;sreg_proto_min) {</div><div class='del'>-		range.min_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_min]);</div><div class='del'>-		range.max_proto.all = (__force __be16)nft_reg_load16(</div><div class='del'>-			&amp;regs-&gt;data[priv-&gt;sreg_proto_max]);</div><div class='del'>-		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	range.flags |= priv-&gt;flags;</div><div class='del'>-</div><div class='del'>-	regs-&gt;verdict.code =</div><div class='del'>-		nf_nat_redirect_ipv6(pkt-&gt;skb, &amp;range, nft_hook(pkt));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nft_redir_ipv6_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)</div><div class='del'>-{</div><div class='del'>-	nf_ct_netns_put(ctx-&gt;net, NFPROTO_IPV6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_redir_ipv6_type;</div><div class='del'>-static const struct nft_expr_ops nft_redir_ipv6_ops = {</div><div class='del'>-	.type		= &amp;nft_redir_ipv6_type,</div><div class='del'>-	.size		= NFT_EXPR_SIZE(sizeof(struct nft_redir)),</div><div class='del'>-	.eval		= nft_redir_ipv6_eval,</div><div class='del'>-	.init		= nft_redir_init,</div><div class='del'>-	.destroy	= nft_redir_ipv6_destroy,</div><div class='del'>-	.dump		= nft_redir_dump,</div><div class='del'>-	.validate	= nft_redir_validate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct nft_expr_type nft_redir_ipv6_type __read_mostly = {</div><div class='del'>-	.family		= NFPROTO_IPV6,</div><div class='del'>-	.name		= "redir",</div><div class='del'>-	.ops		= &amp;nft_redir_ipv6_ops,</div><div class='del'>-	.policy		= nft_redir_policy,</div><div class='del'>-	.maxattr	= NFTA_REDIR_MAX,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init nft_redir_ipv6_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return nft_register_expr(&amp;nft_redir_ipv6_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nft_redir_ipv6_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	nft_unregister_expr(&amp;nft_redir_ipv6_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nft_redir_ipv6_module_init);</div><div class='del'>-module_exit(nft_redir_ipv6_module_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Arturo Borrero Gonzalez &lt;arturo@debian.org&gt;");</div><div class='del'>-MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "redir");</div><div class='head'>diff --git a/net/ipv6/netfilter/nft_reject_ipv6.c b/net/ipv6/netfilter/nft_reject_ipv6.c<br/>index 057deeaff1cb..5c61294f410e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_reject_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/netfilter/nft_reject_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/netfilter/nft_reject_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/netfilter/nft_reject_ipv6.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2008-2009 Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'>  * Copyright (c) 2013 Eric Leblond &lt;eric@regit.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Development of this code funded by Astaro AG (http://www.astaro.com/)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +28,8 @@ static void nft_reject_ipv6_eval(const struct nft_expr *expr,</div><div class='ctx'> 				 nft_hook(pkt));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFT_REJECT_TCP_RST:</div><div class='del'>-		nf_send_reset6(nft_net(pkt), pkt-&gt;skb, nft_hook(pkt));</div><div class='add'>+		nf_send_reset6(nft_net(pkt), nft_sk(pkt), pkt-&gt;skb,</div><div class='add'>+			       nft_hook(pkt));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -48,6 +46,7 @@ static const struct nft_expr_ops nft_reject_ipv6_ops = {</div><div class='ctx'> 	.init		= nft_reject_init,</div><div class='ctx'> 	.dump		= nft_reject_dump,</div><div class='ctx'> 	.validate	= nft_reject_validate,</div><div class='add'>+	.reduce		= NFT_REDUCE_READONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nft_expr_type nft_reject_ipv6_type __read_mostly = {</div><div class='hunk'>@@ -75,3 +74,4 @@ module_exit(nft_reject_ipv6_module_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Patrick McHardy &lt;kaber@trash.net&gt;");</div><div class='ctx'> MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "reject");</div><div class='add'>+MODULE_DESCRIPTION("IPv6 packet rejection for nftables");</div><div class='head'>diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c<br/>index 4fe7c90962dd..1c9b283a4132 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/output_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/output_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/output_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/output_core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * IPv6 library code, needed by static components when full IPv6 support is</div><div class='ctx'>  * not configured or static.  These functions are needed by GSO/GRO implementation.</div><div class='hunk'>@@ -10,25 +11,11 @@</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='ctx'> </div><div class='del'>-static u32 __ipv6_select_ident(struct net *net, u32 hashrnd,</div><div class='add'>+static u32 __ipv6_select_ident(struct net *net,</div><div class='ctx'> 			       const struct in6_addr *dst,</div><div class='ctx'> 			       const struct in6_addr *src)</div><div class='ctx'> {</div><div class='del'>-	u32 hash, id;</div><div class='del'>-</div><div class='del'>-	hash = __ipv6_addr_jhash(dst, hashrnd);</div><div class='del'>-	hash = __ipv6_addr_jhash(src, hash);</div><div class='del'>-	hash ^= net_hash_mix(net);</div><div class='del'>-</div><div class='del'>-	/* Treat id of 0 as unset and if we get 0 back from ip_idents_reserve,</div><div class='del'>-	 * set the hight order instead thus minimizing possible future</div><div class='del'>-	 * collisions.</div><div class='del'>-	 */</div><div class='del'>-	id = ip_idents_reserve(hash, 1);</div><div class='del'>-	if (unlikely(!id))</div><div class='del'>-		id = 1 &lt;&lt; 31;</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='add'>+	return get_random_u32_above(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function exists only for tap drivers that must support broken</div><div class='hunk'>@@ -41,7 +28,6 @@ static u32 __ipv6_select_ident(struct net *net, u32 hashrnd,</div><div class='ctx'>  */</div><div class='ctx'> __be32 ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	static u32 ip6_proxy_idents_hashrnd __read_mostly;</div><div class='ctx'> 	struct in6_addr buf[2];</div><div class='ctx'> 	struct in6_addr *addrs;</div><div class='ctx'> 	u32 id;</div><div class='hunk'>@@ -53,11 +39,7 @@ __be32 ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb)</div><div class='ctx'> 	if (!addrs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	net_get_random_once(&amp;ip6_proxy_idents_hashrnd,</div><div class='del'>-			    sizeof(ip6_proxy_idents_hashrnd));</div><div class='del'>-</div><div class='del'>-	id = __ipv6_select_ident(net, ip6_proxy_idents_hashrnd,</div><div class='del'>-				 &amp;addrs[1], &amp;addrs[0]);</div><div class='add'>+	id = __ipv6_select_ident(net, &amp;addrs[1], &amp;addrs[0]);</div><div class='ctx'> 	return htonl(id);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident);</div><div class='hunk'>@@ -66,12 +48,9 @@ __be32 ipv6_select_ident(struct net *net,</div><div class='ctx'> 			 const struct in6_addr *daddr,</div><div class='ctx'> 			 const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='del'>-	static u32 ip6_idents_hashrnd __read_mostly;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> </div><div class='del'>-	net_get_random_once(&amp;ip6_idents_hashrnd, sizeof(ip6_idents_hashrnd));</div><div class='del'>-</div><div class='del'>-	id = __ipv6_select_ident(net, ip6_idents_hashrnd, daddr, saddr);</div><div class='add'>+	id = __ipv6_select_ident(net, daddr, saddr);</div><div class='ctx'> 	return htonl(id);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ipv6_select_ident);</div><div class='hunk'>@@ -125,18 +104,20 @@ EXPORT_SYMBOL(ip6_find_1stfragopt);</div><div class='ctx'> int ip6_dst_hoplimit(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (hoplimit == 0) {</div><div class='del'>-		struct net_device *dev = dst-&gt;dev;</div><div class='add'>+		struct net_device *dev = dst_dev_rcu(dst);</div><div class='ctx'> 		struct inet6_dev *idev;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		idev = __in6_dev_get(dev);</div><div class='ctx'> 		if (idev)</div><div class='del'>-			hoplimit = idev-&gt;cnf.hop_limit;</div><div class='add'>+			hoplimit = READ_ONCE(idev-&gt;cnf.hop_limit);</div><div class='ctx'> 		else</div><div class='del'>-			hoplimit = dev_net(dev)-&gt;ipv6.devconf_all-&gt;hop_limit;</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+			hoplimit = READ_ONCE(dev_net(dev)-&gt;ipv6.devconf_all-&gt;hop_limit);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	return hoplimit;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ip6_dst_hoplimit);</div><div class='hunk'>@@ -162,7 +143,7 @@ int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> </div><div class='ctx'> 	return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,</div><div class='del'>-		       net, sk, skb, NULL, skb_dst(skb)-&gt;dev,</div><div class='add'>+		       net, sk, skb, NULL, skb_dst_dev(skb),</div><div class='ctx'> 		       dst_output);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__ip6_local_out);</div><div class='head'>diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c<br/>index 4c04bccc7417..e4afc651731a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/ping.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/ping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/ping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/ping.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -5,17 +6,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  *		"Ping" sockets</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Based on ipv4/ping.c code.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Lorenzo Colitti (IPv6 support)</div><div class='ctx'>  *		Vasiliy Kulikov / Openwall (IPv4 implementation, for Linux 2.6),</div><div class='ctx'>  *		Pavel Kankovsky (IPv4 implementation, for Linux 2.4.32)</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='hunk'>@@ -25,6 +20,7 @@</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;net/ping.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Compatibility glue so we can support IPv6 when it's compiled as a module */</div><div class='hunk'>@@ -49,6 +45,20 @@ static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ping_v6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			       int addr_len)</div><div class='add'>+{</div><div class='add'>+	/* This check is replicated from __ip6_datagram_connect() and</div><div class='add'>+	 * intended to prevent BPF program called below from accessing</div><div class='add'>+	 * bytes that are out of the bound specified by user in addr_len.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr, &amp;addr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='hunk'>@@ -64,13 +74,13 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct pingfakehdr pfh;</div><div class='ctx'> 	struct ipcm6_cookie ipc6;</div><div class='ctx'> </div><div class='del'>-	pr_debug("ping_v6_sendmsg(sk=%p,sk-&gt;num=%u)\n", inet, inet-&gt;inet_num);</div><div class='del'>-</div><div class='ctx'> 	err = ping_common_sendmsg(AF_INET6, msg, len, &amp;user_icmph,</div><div class='ctx'> 				  sizeof(user_icmph));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+</div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='ctx'> 		DECLARE_SOCKADDR(struct sockaddr_in6 *, u, msg-&gt;msg_name);</div><div class='ctx'> 		if (msg-&gt;msg_namelen &lt; sizeof(*u))</div><div class='hunk'>@@ -79,12 +89,15 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 			return -EAFNOSUPPORT;</div><div class='ctx'> 		}</div><div class='ctx'> 		daddr = &amp;(u-&gt;sin6_addr);</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk))</div><div class='add'>+			fl6.flowlabel = u-&gt;sin6_flowinfo &amp; IPV6_FLOWINFO_MASK;</div><div class='ctx'> 		if (__ipv6_addr_needs_scope_id(ipv6_addr_type(daddr)))</div><div class='ctx'> 			oif = u-&gt;sin6_scope_id;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			return -EDESTADDRREQ;</div><div class='ctx'> 		daddr = &amp;sk-&gt;sk_v6_daddr;</div><div class='add'>+		fl6.flowlabel = np-&gt;flow_label;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!oif)</div><div class='hunk'>@@ -94,42 +107,57 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		oif = np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='ctx'> </div><div class='ctx'> 	if (!oif &amp;&amp; ipv6_addr_is_multicast(daddr))</div><div class='del'>-		oif = np-&gt;mcast_oif;</div><div class='add'>+		oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!oif)</div><div class='del'>-		oif = np-&gt;ucast_oif;</div><div class='add'>+		oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='ctx'> 	addr_type = ipv6_addr_type(daddr);</div><div class='ctx'> 	if ((__ipv6_addr_needs_scope_id(addr_type) &amp;&amp; !oif) ||</div><div class='ctx'> 	    (addr_type &amp; IPV6_ADDR_MAPPED) ||</div><div class='del'>-	    (oif &amp;&amp; sk-&gt;sk_bound_dev_if &amp;&amp; oif != sk-&gt;sk_bound_dev_if))</div><div class='add'>+	    (oif &amp;&amp; sk-&gt;sk_bound_dev_if &amp;&amp; oif != sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='add'>+	     l3mdev_master_ifindex_by_index(sock_net(sk), oif) != sk-&gt;sk_bound_dev_if))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* TODO: use ip6_datagram_send_ctl to get options from cmsg */</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+	fl6.flowi6_oif = oif;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;msg_controllen) {</div><div class='add'>+		struct ipv6_txoptions opt = {};</div><div class='add'>+</div><div class='add'>+		opt.tot_len = sizeof(opt);</div><div class='add'>+		ipc6.opt = &amp;opt;</div><div class='add'>+</div><div class='add'>+		err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &amp;fl6, &amp;ipc6);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Changes to txoptions and flow info are not implemented, yet.</div><div class='add'>+		 * Drop the options.</div><div class='add'>+		 */</div><div class='add'>+		ipc6.opt = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fl6.flowi6_proto = IPPROTO_ICMPV6;</div><div class='ctx'> 	fl6.saddr = np-&gt;saddr;</div><div class='ctx'> 	fl6.daddr = *daddr;</div><div class='del'>-	fl6.flowi6_oif = oif;</div><div class='del'>-	fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='del'>-	fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='add'>+	fl6.flowi6_mark = ipc6.sockc.mark;</div><div class='add'>+	fl6.flowi6_uid = sk_uid(sk);</div><div class='ctx'> 	fl6.fl6_icmp_type = user_icmph.icmp6_type;</div><div class='ctx'> 	fl6.fl6_icmp_code = user_icmph.icmp6_code;</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='del'>-	ipcm6_init_sk(&amp;ipc6, np);</div><div class='ctx'> 	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);</div><div class='ctx'> </div><div class='ctx'> 	dst = ip6_sk_dst_lookup_flow(sk, &amp;fl6, daddr, false);</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return PTR_ERR(dst);</div><div class='del'>-	rt = (struct rt6_info *) dst;</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='ctx'> </div><div class='ctx'> 	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr))</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='ctx'> 	pfh.icmph.type = user_icmph.icmp6_type;</div><div class='ctx'> 	pfh.icmph.code = user_icmph.icmp6_code;</div><div class='hunk'>@@ -140,11 +168,12 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	pfh.wcheck = 0;</div><div class='ctx'> 	pfh.family = AF_INET6;</div><div class='ctx'> </div><div class='del'>-	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='add'>+	if (ipc6.hlimit &lt; 0)</div><div class='add'>+		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	err = ip6_append_data(sk, ping_getfrag, &amp;pfh, len,</div><div class='del'>-			      0, &amp;ipc6, &amp;fl6, rt,</div><div class='add'>+			      sizeof(struct icmp6hdr), &amp;ipc6, &amp;fl6, rt,</div><div class='ctx'> 			      MSG_DONTWAIT);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -170,6 +199,7 @@ struct proto pingv6_prot = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.init =		ping_init_sock,</div><div class='ctx'> 	.close =	ping_close,</div><div class='add'>+	.pre_connect =	ping_v6_pre_connect,</div><div class='ctx'> 	.connect =	ip6_datagram_connect_v6_only,</div><div class='ctx'> 	.disconnect =	__udp_disconnect,</div><div class='ctx'> 	.setsockopt =	ipv6_setsockopt,</div><div class='hunk'>@@ -178,10 +208,11 @@ struct proto pingv6_prot = {</div><div class='ctx'> 	.recvmsg =	ping_recvmsg,</div><div class='ctx'> 	.bind =		ping_bind,</div><div class='ctx'> 	.backlog_rcv =	ping_queue_rcv_skb,</div><div class='del'>-	.hash =		ping_hash,</div><div class='ctx'> 	.unhash =	ping_unhash,</div><div class='ctx'> 	.get_port =	ping_get_port,</div><div class='add'>+	.put_port =	ping_unhash,</div><div class='ctx'> 	.obj_size =	sizeof(struct raw6_sock),</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct raw6_sock, inet6),</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(pingv6_prot);</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +236,7 @@ static int ping_v6_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int bucket = ((struct ping_iter_state *) seq-&gt;private)-&gt;bucket;</div><div class='del'>-		struct inet_sock *inet = inet_sk(v);</div><div class='add'>+		struct inet_sock *inet = inet_sk((struct sock *)v);</div><div class='ctx'> 		__u16 srcp = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> 		__u16 destp = ntohs(inet-&gt;inet_dport);</div><div class='ctx'> 		ip6_dgram_sock_seq_show(seq, v, srcp, destp, bucket);</div><div class='hunk'>@@ -228,7 +259,7 @@ static int __net_init ping_v6_proc_init_net(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_init ping_v6_proc_exit_net(struct net *net)</div><div class='add'>+static void __net_exit ping_v6_proc_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	remove_proc_entry("icmp6", net-&gt;proc_net);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c<br/>index 2356b4af7309..73296f38c252 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/proc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -9,11 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  *		YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -31,7 +27,7 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX4(a, b, c, d) \</div><div class='del'>-	max_t(u32, max_t(u32, a, b), max_t(u32, c, d))</div><div class='add'>+	MAX_T(u32, MAX_T(u32, a, b), MAX_T(u32, c, d))</div><div class='ctx'> #define SNMP_MIB_MAX MAX4(UDP_MIB_MAX, TCP_MIB_MAX, \</div><div class='ctx'> 			IPSTATS_MIB_MAX, ICMP_MIB_MAX)</div><div class='ctx'> </div><div class='hunk'>@@ -48,8 +44,8 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "RAW6: inuse %d\n",</div><div class='ctx'> 		       sock_prot_inuse_get(net, &amp;rawv6_prot));</div><div class='ctx'> 	seq_printf(seq, "FRAG6: inuse %u memory %lu\n",</div><div class='del'>-		   atomic_read(&amp;net-&gt;ipv6.frags.rhashtable.nelems),</div><div class='del'>-		   frag_mem_limit(&amp;net-&gt;ipv6.frags));</div><div class='add'>+		   atomic_read(&amp;net-&gt;ipv6.fqdir-&gt;rhashtable.nelems),</div><div class='add'>+		   frag_mem_limit(net-&gt;ipv6.fqdir));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +61,7 @@ static const struct snmp_mib snmp6_ipstats_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6InDiscards", IPSTATS_MIB_INDISCARDS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6InDelivers", IPSTATS_MIB_INDELIVERS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6OutForwDatagrams", IPSTATS_MIB_OUTFORWDATAGRAMS),</div><div class='del'>-	SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTPKTS),</div><div class='add'>+	SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTREQUESTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6OutDiscards", IPSTATS_MIB_OUTDISCARDS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6OutNoRoutes", IPSTATS_MIB_OUTNOROUTES),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT),</div><div class='hunk'>@@ -88,7 +84,7 @@ static const struct snmp_mib snmp6_ipstats_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6InECT1Pkts", IPSTATS_MIB_ECT1PKTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6InECT0Pkts", IPSTATS_MIB_ECT0PKTS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Ip6InCEPkts", IPSTATS_MIB_CEPKTS),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("Ip6OutTransmits", IPSTATS_MIB_OUTPKTS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct snmp_mib snmp6_icmp6_list[] = {</div><div class='hunk'>@@ -98,29 +94,10 @@ static const struct snmp_mib snmp6_icmp6_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("Icmp6OutMsgs", ICMP6_MIB_OUTMSGS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Icmp6OutErrors", ICMP6_MIB_OUTERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Icmp6InCsumErrors", ICMP6_MIB_CSUMERRORS),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+/* ICMP6_MIB_RATELIMITHOST needs to be last, see snmp6_dev_seq_show(). */</div><div class='add'>+	SNMP_MIB_ITEM("Icmp6OutRateLimitHost", ICMP6_MIB_RATELIMITHOST),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* RFC 4293 v6 ICMPMsgStatsTable; named items for RFC 2466 compatibility */</div><div class='del'>-static const char *const icmp6type2name[256] = {</div><div class='del'>-	[ICMPV6_DEST_UNREACH] = "DestUnreachs",</div><div class='del'>-	[ICMPV6_PKT_TOOBIG] = "PktTooBigs",</div><div class='del'>-	[ICMPV6_TIME_EXCEED] = "TimeExcds",</div><div class='del'>-	[ICMPV6_PARAMPROB] = "ParmProblems",</div><div class='del'>-	[ICMPV6_ECHO_REQUEST] = "Echos",</div><div class='del'>-	[ICMPV6_ECHO_REPLY] = "EchoReplies",</div><div class='del'>-	[ICMPV6_MGM_QUERY] = "GroupMembQueries",</div><div class='del'>-	[ICMPV6_MGM_REPORT] = "GroupMembResponses",</div><div class='del'>-	[ICMPV6_MGM_REDUCTION] = "GroupMembReductions",</div><div class='del'>-	[ICMPV6_MLD2_REPORT] = "MLDv2Reports",</div><div class='del'>-	[NDISC_ROUTER_ADVERTISEMENT] = "RouterAdvertisements",</div><div class='del'>-	[NDISC_ROUTER_SOLICITATION] = "RouterSolicits",</div><div class='del'>-	[NDISC_NEIGHBOUR_ADVERTISEMENT] = "NeighborAdvertisements",</div><div class='del'>-	[NDISC_NEIGHBOUR_SOLICITATION] = "NeighborSolicits",</div><div class='del'>-	[NDISC_REDIRECT] = "Redirects",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static const struct snmp_mib snmp6_udp6_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("Udp6InDatagrams", UDP_MIB_INDATAGRAMS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Udp6NoPorts", UDP_MIB_NOPORTS),</div><div class='hunk'>@@ -130,7 +107,7 @@ static const struct snmp_mib snmp6_udp6_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("Udp6SndbufErrors", UDP_MIB_SNDBUFERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Udp6InCsumErrors", UDP_MIB_CSUMERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("Udp6IgnoredMulti", UDP_MIB_IGNOREDMULTI),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("Udp6MemErrors", UDP_MIB_MEMERRORS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct snmp_mib snmp6_udplite6_list[] = {</div><div class='hunk'>@@ -141,7 +118,7 @@ static const struct snmp_mib snmp6_udplite6_list[] = {</div><div class='ctx'> 	SNMP_MIB_ITEM("UdpLite6RcvbufErrors", UDP_MIB_RCVBUFERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("UdpLite6SndbufErrors", UDP_MIB_SNDBUFERRORS),</div><div class='ctx'> 	SNMP_MIB_ITEM("UdpLite6InCsumErrors", UDP_MIB_CSUMERRORS),</div><div class='del'>-	SNMP_MIB_SENTINEL</div><div class='add'>+	SNMP_MIB_ITEM("UdpLite6MemErrors", UDP_MIB_MEMERRORS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, atomic_long_t *smib)</div><div class='hunk'>@@ -151,11 +128,31 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, atomic_long_t *smib)</div><div class='ctx'> </div><div class='ctx'> 	/* print by name -- deprecated items */</div><div class='ctx'> 	for (i = 0; i &lt; ICMP6MSG_MIB_MAX; i++) {</div><div class='add'>+		const char *p = NULL;</div><div class='ctx'> 		int icmptype;</div><div class='del'>-		const char *p;</div><div class='add'>+</div><div class='add'>+#define CASE(TYP, STR) case TYP: p = STR; break;</div><div class='ctx'> </div><div class='ctx'> 		icmptype = i &amp; 0xff;</div><div class='del'>-		p = icmp6type2name[icmptype];</div><div class='add'>+		switch (icmptype) {</div><div class='add'>+/* RFC 4293 v6 ICMPMsgStatsTable; named items for RFC 2466 compatibility */</div><div class='add'>+		CASE(ICMPV6_DEST_UNREACH,	"DestUnreachs")</div><div class='add'>+		CASE(ICMPV6_PKT_TOOBIG,		"PktTooBigs")</div><div class='add'>+		CASE(ICMPV6_TIME_EXCEED,	"TimeExcds")</div><div class='add'>+		CASE(ICMPV6_PARAMPROB,		"ParmProblems")</div><div class='add'>+		CASE(ICMPV6_ECHO_REQUEST,	"Echos")</div><div class='add'>+		CASE(ICMPV6_ECHO_REPLY,		"EchoReplies")</div><div class='add'>+		CASE(ICMPV6_MGM_QUERY,		"GroupMembQueries")</div><div class='add'>+		CASE(ICMPV6_MGM_REPORT,		"GroupMembResponses")</div><div class='add'>+		CASE(ICMPV6_MGM_REDUCTION,	"GroupMembReductions")</div><div class='add'>+		CASE(ICMPV6_MLD2_REPORT,	"MLDv2Reports")</div><div class='add'>+		CASE(NDISC_ROUTER_ADVERTISEMENT, "RouterAdvertisements")</div><div class='add'>+		CASE(NDISC_ROUTER_SOLICITATION, "RouterSolicits")</div><div class='add'>+		CASE(NDISC_NEIGHBOUR_ADVERTISEMENT, "NeighborAdvertisements")</div><div class='add'>+		CASE(NDISC_NEIGHBOUR_SOLICITATION, "NeighborSolicits")</div><div class='add'>+		CASE(NDISC_REDIRECT,		"Redirects")</div><div class='add'>+		}</div><div class='add'>+#undef CASE</div><div class='ctx'> 		if (!p)	/* don't print un-named types here */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		snprintf(name, sizeof(name), "Icmp6%s%s",</div><div class='hunk'>@@ -182,35 +179,37 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, atomic_long_t *smib)</div><div class='ctx'>  */</div><div class='ctx'> static void snmp6_seq_show_item(struct seq_file *seq, void __percpu *pcpumib,</div><div class='ctx'> 				atomic_long_t *smib,</div><div class='del'>-				const struct snmp_mib *itemlist)</div><div class='add'>+				const struct snmp_mib *itemlist,</div><div class='add'>+				int cnt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long buff[SNMP_MIB_MAX];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (pcpumib) {</div><div class='del'>-		memset(buff, 0, sizeof(unsigned long) * SNMP_MIB_MAX);</div><div class='add'>+		memset(buff, 0, sizeof(unsigned long) * cnt);</div><div class='ctx'> </div><div class='del'>-		snmp_get_cpu_field_batch(buff, itemlist, pcpumib);</div><div class='del'>-		for (i = 0; itemlist[i].name; i++)</div><div class='add'>+		snmp_get_cpu_field_batch_cnt(buff, itemlist, cnt, pcpumib);</div><div class='add'>+		for (i = 0; i &lt; cnt; i++)</div><div class='ctx'> 			seq_printf(seq, "%-32s\t%lu\n",</div><div class='ctx'> 				   itemlist[i].name, buff[i]);</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; itemlist[i].name; i++)</div><div class='add'>+		for (i = 0; i &lt; cnt; i++)</div><div class='ctx'> 			seq_printf(seq, "%-32s\t%lu\n", itemlist[i].name,</div><div class='ctx'> 				   atomic_long_read(smib + itemlist[i].entry));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snmp6_seq_show_item64(struct seq_file *seq, void __percpu *mib,</div><div class='del'>-				  const struct snmp_mib *itemlist, size_t syncpoff)</div><div class='add'>+				  const struct snmp_mib *itemlist,</div><div class='add'>+				  int cnt, size_t syncpoff)</div><div class='ctx'> {</div><div class='ctx'> 	u64 buff64[SNMP_MIB_MAX];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	memset(buff64, 0, sizeof(u64) * SNMP_MIB_MAX);</div><div class='add'>+	memset(buff64, 0, sizeof(u64) * cnt);</div><div class='ctx'> </div><div class='del'>-	snmp_get_cpu_field64_batch(buff64, itemlist, mib, syncpoff);</div><div class='del'>-	for (i = 0; itemlist[i].name; i++)</div><div class='add'>+	snmp_get_cpu_field64_batch_cnt(buff64, itemlist, cnt, mib, syncpoff);</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='ctx'> 		seq_printf(seq, "%-32s\t%llu\n", itemlist[i].name, buff64[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -219,14 +218,19 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	struct net *net = (struct net *)seq-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	snmp6_seq_show_item64(seq, net-&gt;mib.ipv6_statistics,</div><div class='del'>-			    snmp6_ipstats_list, offsetof(struct ipstats_mib, syncp));</div><div class='add'>+			      snmp6_ipstats_list,</div><div class='add'>+			      ARRAY_SIZE(snmp6_ipstats_list),</div><div class='add'>+			      offsetof(struct ipstats_mib, syncp));</div><div class='ctx'> 	snmp6_seq_show_item(seq, net-&gt;mib.icmpv6_statistics,</div><div class='del'>-			    NULL, snmp6_icmp6_list);</div><div class='add'>+			    NULL, snmp6_icmp6_list,</div><div class='add'>+			    ARRAY_SIZE(snmp6_icmp6_list));</div><div class='ctx'> 	snmp6_seq_show_icmpv6msg(seq, net-&gt;mib.icmpv6msg_statistics-&gt;mibs);</div><div class='ctx'> 	snmp6_seq_show_item(seq, net-&gt;mib.udp_stats_in6,</div><div class='del'>-			    NULL, snmp6_udp6_list);</div><div class='add'>+			    NULL, snmp6_udp6_list,</div><div class='add'>+			    ARRAY_SIZE(snmp6_udp6_list));</div><div class='ctx'> 	snmp6_seq_show_item(seq, net-&gt;mib.udplite_stats_in6,</div><div class='del'>-			    NULL, snmp6_udplite6_list);</div><div class='add'>+			    NULL, snmp6_udplite6_list,</div><div class='add'>+			    ARRAY_SIZE(snmp6_udplite6_list));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,9 +240,14 @@ static int snmp6_dev_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev-&gt;dev-&gt;ifindex);</div><div class='ctx'> 	snmp6_seq_show_item64(seq, idev-&gt;stats.ipv6,</div><div class='del'>-			    snmp6_ipstats_list, offsetof(struct ipstats_mib, syncp));</div><div class='add'>+			      snmp6_ipstats_list,</div><div class='add'>+			      ARRAY_SIZE(snmp6_ipstats_list),</div><div class='add'>+			      offsetof(struct ipstats_mib, syncp));</div><div class='add'>+</div><div class='add'>+	/* Per idev icmp stats do not have ICMP6_MIB_RATELIMITHOST */</div><div class='ctx'> 	snmp6_seq_show_item(seq, NULL, idev-&gt;stats.icmpv6dev-&gt;mibs,</div><div class='del'>-			    snmp6_icmp6_list);</div><div class='add'>+			    snmp6_icmp6_list, ARRAY_SIZE(snmp6_icmp6_list) - 1);</div><div class='add'>+</div><div class='ctx'> 	snmp6_seq_show_icmpv6msg(seq, idev-&gt;stats.icmpv6msgdev-&gt;mibs);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c<br/>index b5d54d4f995c..d4b1806bab1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/protocol.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/protocol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/protocol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/protocol.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='ctx'>  *		operating system.  INET is implemented using the  BSD Socket</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *		PF_INET6 protocol dispatch tables.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:	Pedro Roque	&lt;roque@di.fc.ul.pt&gt;</div><div class='del'>- *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c<br/>index 5e0efd3954e9..b4cd05dba9b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/raw.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/raw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/raw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/raw.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	RAW sockets for IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -11,11 +12,6 @@</div><div class='ctx'>  *	Hideaki YOSHIFUJI	:	sin6_scope_id support</div><div class='ctx'>  *	YOSHIFUJI,H.@USAGI	:	raw checksum (RFC2292(bis) compliance)</div><div class='ctx'>  *	Kazunori MIYAZAWA @USAGI:	change process style to use ip6_append_data</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -65,47 +61,30 @@</div><div class='ctx'> </div><div class='ctx'> #define	ICMPV6_HDRLEN	4	/* ICMPv6 header, RFC 4443 Section 2.1 */</div><div class='ctx'> </div><div class='del'>-struct raw_hashinfo raw_v6_hashinfo = {</div><div class='del'>-	.lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),</div><div class='del'>-};</div><div class='add'>+struct raw_hashinfo raw_v6_hashinfo;</div><div class='ctx'> EXPORT_SYMBOL_GPL(raw_v6_hashinfo);</div><div class='ctx'> </div><div class='del'>-struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,</div><div class='del'>-		unsigned short num, const struct in6_addr *loc_addr,</div><div class='del'>-		const struct in6_addr *rmt_addr, int dif, int sdif)</div><div class='add'>+bool raw_v6_match(struct net *net, const struct sock *sk, unsigned short num,</div><div class='add'>+		  const struct in6_addr *loc_addr,</div><div class='add'>+		  const struct in6_addr *rmt_addr, int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	bool is_multicast = ipv6_addr_is_multicast(loc_addr);</div><div class='del'>-</div><div class='del'>-	sk_for_each_from(sk)</div><div class='del'>-		if (inet_sk(sk)-&gt;inet_num == num) {</div><div class='del'>-</div><div class='del'>-			if (!net_eq(sock_net(sk), net))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr) &amp;&amp;</div><div class='del'>-			    !ipv6_addr_equal(&amp;sk-&gt;sk_v6_daddr, rmt_addr))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_bound_dev_if != dif &amp;&amp;</div><div class='del'>-			    sk-&gt;sk_bound_dev_if != sdif)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr)) {</div><div class='del'>-				if (ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, loc_addr))</div><div class='del'>-					goto found;</div><div class='del'>-				if (is_multicast &amp;&amp;</div><div class='del'>-				    inet6_mc_check(sk, loc_addr, rmt_addr))</div><div class='del'>-					goto found;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-	sk = NULL;</div><div class='del'>-found:</div><div class='del'>-	return sk;</div><div class='add'>+	if (inet_sk(sk)-&gt;inet_num != num ||</div><div class='add'>+	    !net_eq(sock_net(sk), net) ||</div><div class='add'>+	    (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr) &amp;&amp;</div><div class='add'>+	     !ipv6_addr_equal(&amp;sk-&gt;sk_v6_daddr, rmt_addr)) ||</div><div class='add'>+	    !raw_sk_bound_dev_eq(net, sk-&gt;sk_bound_dev_if,</div><div class='add'>+				 dif, sdif))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr) ||</div><div class='add'>+	    ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, loc_addr) ||</div><div class='add'>+	    (ipv6_addr_is_multicast(loc_addr) &amp;&amp;</div><div class='add'>+	     inet6_mc_check(sk, loc_addr, rmt_addr)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__raw_v6_lookup);</div><div class='add'>+EXPORT_SYMBOL_GPL(raw_v6_match);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	0 - deliver</div><div class='hunk'>@@ -161,30 +140,32 @@ EXPORT_SYMBOL(rawv6_mh_filter_unregister);</div><div class='ctx'>  */</div><div class='ctx'> static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	const struct in6_addr *saddr;</div><div class='ctx'> 	const struct in6_addr *daddr;</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	bool delivered = false;</div><div class='ctx'> 	__u8 hash;</div><div class='del'>-	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	saddr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	daddr = saddr + 1;</div><div class='ctx'> </div><div class='del'>-	hash = nexthdr &amp; (RAW_HTABLE_SIZE - 1);</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;raw_v6_hashinfo.lock);</div><div class='del'>-	sk = sk_head(&amp;raw_v6_hashinfo.ht[hash]);</div><div class='del'>-</div><div class='del'>-	if (!sk)</div><div class='del'>-		goto out;</div><div class='add'>+	hash = raw_hashfunc(net, nexthdr);</div><div class='add'>+	hlist = &amp;raw_v6_hashinfo.ht[hash];</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_for_each_rcu(sk, hlist) {</div><div class='add'>+		int filtered;</div><div class='ctx'> </div><div class='del'>-	net = dev_net(skb-&gt;dev);</div><div class='del'>-	sk = __raw_v6_lookup(net, sk, nexthdr, daddr, saddr,</div><div class='del'>-			     inet6_iif(skb), inet6_sdif(skb));</div><div class='add'>+		if (!raw_v6_match(net, sk, nexthdr, daddr, saddr,</div><div class='add'>+				  inet6_iif(skb), inet6_sdif(skb)))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	while (sk) {</div><div class='del'>-		int filtered;</div><div class='add'>+		if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt;=</div><div class='add'>+		    READ_ONCE(sk-&gt;sk_rcvbuf)) {</div><div class='add'>+			sk_drops_inc(sk);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		delivered = true;</div><div class='ctx'> 		switch (nexthdr) {</div><div class='hunk'>@@ -219,32 +200,22 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)</div><div class='ctx'> 			struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 			/* Not releasing hash table! */</div><div class='del'>-			if (clone) {</div><div class='del'>-				nf_reset(clone);</div><div class='add'>+			if (clone)</div><div class='ctx'> 				rawv6_rcv(sk, clone);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='del'>-		sk = __raw_v6_lookup(net, sk_next(sk), nexthdr, daddr, saddr,</div><div class='del'>-				     inet6_iif(skb), inet6_sdif(skb));</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	read_unlock(&amp;raw_v6_hashinfo.lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return delivered;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool raw6_local_deliver(struct sk_buff *skb, int nexthdr)</div><div class='ctx'> {</div><div class='del'>-	struct sock *raw_sk;</div><div class='del'>-</div><div class='del'>-	raw_sk = sk_head(&amp;raw_v6_hashinfo.ht[nexthdr &amp; (RAW_HTABLE_SIZE - 1)]);</div><div class='del'>-	if (raw_sk &amp;&amp; !ipv6_raw_deliver(skb, nexthdr))</div><div class='del'>-		raw_sk = NULL;</div><div class='del'>-</div><div class='del'>-	return raw_sk != NULL;</div><div class='add'>+	return ipv6_raw_deliver(skb, nexthdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This cleans up af_inet6 a bit. -DaveM */</div><div class='del'>-static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int rawv6_bind(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+		      int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='hunk'>@@ -288,7 +259,9 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 			/* Binding to link-local address requires an interface */</div><div class='ctx'> 			if (!sk-&gt;sk_bound_dev_if)</div><div class='ctx'> 				goto out_unlock;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (sk-&gt;sk_bound_dev_if) {</div><div class='ctx'> 			err = -ENODEV;</div><div class='ctx'> 			dev = dev_get_by_index_rcu(sock_net(sk),</div><div class='ctx'> 						   sk-&gt;sk_bound_dev_if);</div><div class='hunk'>@@ -301,7 +274,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 		 */</div><div class='ctx'> 		v4addr = LOOPBACK4_IPV6;</div><div class='ctx'> 		if (!(addr_type &amp; IPV6_ADDR_MULTICAST) &amp;&amp;</div><div class='del'>-		    !sock_net(sk)-&gt;ipv6.sysctl.ip_nonlocal_bind) {</div><div class='add'>+		    !ipv6_can_nonlocal_bind(sock_net(sk), inet)) {</div><div class='ctx'> 			err = -EADDRNOTAVAIL;</div><div class='ctx'> 			if (!ipv6_chk_addr(sock_net(sk), &amp;addr-&gt;sin6_addr,</div><div class='ctx'> 					   dev, 0)) {</div><div class='hunk'>@@ -323,10 +296,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rawv6_err(struct sock *sk, struct sk_buff *skb,</div><div class='del'>-	       struct inet6_skb_parm *opt,</div><div class='del'>-	       u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+		      u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	bool recverr = inet6_test_bit(RECVERR6, sk);</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int harderr;</div><div class='hunk'>@@ -336,73 +308,69 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	   2. Socket is connected (otherwise the error indication</div><div class='ctx'> 	      is useless without recverr and error is hard.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!np-&gt;recverr &amp;&amp; sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='add'>+	if (!recverr &amp;&amp; sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	harderr = icmpv6_err_convert(type, code, &amp;err);</div><div class='ctx'> 	if (type == ICMPV6_PKT_TOOBIG) {</div><div class='ctx'> 		ip6_sk_update_pmtu(skb, sk, info);</div><div class='del'>-		harderr = (np-&gt;pmtudisc == IPV6_PMTUDISC_DO);</div><div class='add'>+		harderr = (READ_ONCE(np-&gt;pmtudisc) == IPV6_PMTUDISC_DO);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (type == NDISC_REDIRECT) {</div><div class='ctx'> 		ip6_sk_redirect(skb, sk);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (np-&gt;recverr) {</div><div class='add'>+	if (recverr) {</div><div class='ctx'> 		u8 *payload = skb-&gt;data;</div><div class='del'>-		if (!inet-&gt;hdrincl)</div><div class='add'>+		if (!inet_test_bit(HDRINCL, sk))</div><div class='ctx'> 			payload += offset;</div><div class='ctx'> 		ipv6_icmp_error(sk, skb, err, 0, ntohl(info), payload);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;recverr || harderr) {</div><div class='add'>+	if (recverr || harderr) {</div><div class='ctx'> 		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='add'>+		sk_error_report(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void raw6_icmp_error(struct sk_buff *skb, int nexthdr,</div><div class='ctx'> 		u8 type, u8 code, int inner_offset, __be32 info)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct hlist_head *hlist;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	int hash;</div><div class='del'>-	const struct in6_addr *saddr, *daddr;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	hash = nexthdr &amp; (RAW_HTABLE_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;raw_v6_hashinfo.lock);</div><div class='del'>-	sk = sk_head(&amp;raw_v6_hashinfo.ht[hash]);</div><div class='del'>-	if (sk) {</div><div class='add'>+	hash = raw_hashfunc(net, nexthdr);</div><div class='add'>+	hlist = &amp;raw_v6_hashinfo.ht[hash];</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sk_for_each_rcu(sk, hlist) {</div><div class='ctx'> 		/* Note: ipv6_hdr(skb) != skb-&gt;data */</div><div class='ctx'> 		const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb-&gt;data;</div><div class='del'>-		saddr = &amp;ip6h-&gt;saddr;</div><div class='del'>-		daddr = &amp;ip6h-&gt;daddr;</div><div class='del'>-		net = dev_net(skb-&gt;dev);</div><div class='del'>-</div><div class='del'>-		while ((sk = __raw_v6_lookup(net, sk, nexthdr, saddr, daddr,</div><div class='del'>-					     inet6_iif(skb), inet6_iif(skb)))) {</div><div class='del'>-			rawv6_err(sk, skb, NULL, type, code,</div><div class='del'>-					inner_offset, info);</div><div class='del'>-			sk = sk_next(sk);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if (!raw_v6_match(net, sk, nexthdr, &amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr,</div><div class='add'>+				  inet6_iif(skb), inet6_iif(skb)))</div><div class='add'>+			continue;</div><div class='add'>+		rawv6_err(sk, skb, type, code, inner_offset, info);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;raw_v6_hashinfo.lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+</div><div class='ctx'> 	if ((raw6_sk(sk)-&gt;checksum || rcu_access_pointer(sk-&gt;sk_filter)) &amp;&amp;</div><div class='ctx'> 	    skb_checksum_complete(skb)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		sk_drops_inc(sk);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_SKB_CSUM);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Charge it to the socket. */</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	if (sock_queue_rcv_skb(sk, skb) &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	if (sock_queue_rcv_skb_reason(sk, skb, &amp;reason) &lt; 0) {</div><div class='add'>+		sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -422,10 +390,11 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct raw6_sock *rp = raw6_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		sk_drops_inc(sk);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_XFRM_POLICY);</div><div class='ctx'> 		return NET_RX_DROP;</div><div class='ctx'> 	}</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!rp-&gt;checksum)</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='hunk'>@@ -444,10 +413,10 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 							 skb-&gt;len,</div><div class='ctx'> 							 inet-&gt;inet_num, 0));</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;hdrincl) {</div><div class='add'>+	if (inet_test_bit(HDRINCL, sk)) {</div><div class='ctx'> 		if (skb_checksum_complete(skb)) {</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			sk_drops_inc(sk);</div><div class='add'>+			sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_SKB_CSUM);</div><div class='ctx'> 			return NET_RX_DROP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -463,7 +432,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int rawv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-			 int noblock, int flags, int *addr_len)</div><div class='add'>+			 int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg-&gt;msg_name);</div><div class='hunk'>@@ -477,10 +446,10 @@ static int rawv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (flags &amp; MSG_ERRQUEUE)</div><div class='ctx'> 		return ipv6_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;rxpmtu &amp;&amp; np-&gt;rxopt.bits.rxpmtu)</div><div class='add'>+	if (np-&gt;rxopt.bits.rxpmtu &amp;&amp; READ_ONCE(np-&gt;rxpmtu))</div><div class='ctx'> 		return ipv6_recv_rxpmtu(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +484,7 @@ static int rawv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 		*addr_len = sizeof(*sin6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;rxopt.all)</div><div class='ctx'> 		ip6_datagram_recv_ctl(sk, msg, skb);</div><div class='hunk'>@@ -542,6 +511,7 @@ csum_copy_err:</div><div class='ctx'> static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,</div><div class='ctx'> 				     struct raw6_sock *rp)</div><div class='ctx'> {</div><div class='add'>+	struct ipv6_txoptions *opt;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int offset;</div><div class='hunk'>@@ -559,6 +529,9 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,</div><div class='ctx'> </div><div class='ctx'> 	offset = rp-&gt;offset;</div><div class='ctx'> 	total_len = inet_sk(sk)-&gt;cork.base.length;</div><div class='add'>+	opt = inet6_sk(sk)-&gt;cork.opt;</div><div class='add'>+	total_len -= opt ? opt-&gt;opt_flen : 0;</div><div class='add'>+</div><div class='ctx'> 	if (offset &gt;= total_len - 1) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		ip6_flush_pending_frames(sk);</div><div class='hunk'>@@ -622,12 +595,11 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,</div><div class='ctx'> 			struct flowi6 *fl6, struct dst_entry **dstp,</div><div class='ctx'> 			unsigned int flags, const struct sockcm_cookie *sockc)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ipv6hdr *iph;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)*dstp;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(*dstp);</div><div class='ctx'> 	int hlen = LL_RESERVED_SPACE(rt-&gt;dst.dev);</div><div class='ctx'> 	int tlen = rt-&gt;dst.dev-&gt;needed_tailroom;</div><div class='ctx'> </div><div class='hunk'>@@ -648,9 +620,9 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,</div><div class='ctx'> 	skb_reserve(skb, hlen);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='del'>-	skb-&gt;priority = sk-&gt;sk_priority;</div><div class='del'>-	skb-&gt;mark = sk-&gt;sk_mark;</div><div class='del'>-	skb-&gt;tstamp = sockc-&gt;transmit_time;</div><div class='add'>+	skb-&gt;priority = sockc-&gt;priority;</div><div class='add'>+	skb-&gt;mark = sockc-&gt;mark;</div><div class='add'>+	skb_set_delivery_type_by_clockid(skb, sockc-&gt;transmit_time, sk-&gt;sk_clockid);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(skb, length);</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='hunk'>@@ -658,6 +630,8 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='add'>+	skb_setup_tx_timestamp(skb, sockc);</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; MSG_CONFIRM)</div><div class='ctx'> 		skb_set_dst_pending_confirm(skb, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -684,7 +658,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,</div><div class='ctx'> 	 * have been queued for deletion.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	IP6_UPD_PO_STATS(net, rt-&gt;rt6i_idev, IPSTATS_MIB_OUT, skb-&gt;len);</div><div class='add'>+	IP6_INC_STATS(net, rt-&gt;rt6i_idev, IPSTATS_MIB_OUTREQUESTS);</div><div class='ctx'> 	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, sk, skb,</div><div class='ctx'> 		      NULL, rt-&gt;dst.dev, dst_output);</div><div class='ctx'> 	if (err &gt; 0)</div><div class='hunk'>@@ -701,7 +675,7 @@ out:</div><div class='ctx'> error:</div><div class='ctx'> 	IP6_INC_STATS(net, rt-&gt;rt6i_idev, IPSTATS_MIB_OUTDISCARDS);</div><div class='ctx'> error_check:</div><div class='del'>-	if (err == -ENOBUFS &amp;&amp; !np-&gt;recverr)</div><div class='add'>+	if (err == -ENOBUFS &amp;&amp; !inet6_test_bit(RECVERR6, sk))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -747,7 +721,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,</div><div class='ctx'> 			skb-&gt;csum = csum_block_add(</div><div class='ctx'> 				skb-&gt;csum,</div><div class='ctx'> 				csum_partial_copy_nocheck(rfv-&gt;c + offset,</div><div class='del'>-							  to, copy, 0),</div><div class='add'>+							  to, copy),</div><div class='ctx'> 				odd);</div><div class='ctx'> </div><div class='ctx'> 		odd = 0;</div><div class='hunk'>@@ -780,6 +754,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	struct ipcm6_cookie ipc6;</div><div class='ctx'> 	int addr_len = msg-&gt;msg_namelen;</div><div class='add'>+	int hdrincl;</div><div class='ctx'> 	u16 proto;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -793,16 +768,17 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	if (msg-&gt;msg_flags &amp; MSG_OOB)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	hdrincl = inet_test_bit(HDRINCL, sk);</div><div class='add'>+</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Get and verify the address.</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> </div><div class='del'>-	fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='del'>-	fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='del'>-</div><div class='del'>-	ipcm6_init(&amp;ipc6);</div><div class='del'>-	ipc6.sockc.tsflags = sk-&gt;sk_tsflags;</div><div class='add'>+	fl6.flowi6_mark = ipc6.sockc.mark;</div><div class='add'>+	fl6.flowi6_uid = sk_uid(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sin6) {</div><div class='ctx'> 		if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='hunk'>@@ -816,18 +792,19 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> </div><div class='ctx'> 		if (!proto)</div><div class='ctx'> 			proto = inet-&gt;inet_num;</div><div class='del'>-		else if (proto != inet-&gt;inet_num)</div><div class='add'>+		else if (proto != inet-&gt;inet_num &amp;&amp;</div><div class='add'>+			 inet-&gt;inet_num != IPPROTO_RAW)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (proto &gt; 255)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		daddr = &amp;sin6-&gt;sin6_addr;</div><div class='del'>-		if (np-&gt;sndflow) {</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk)) {</div><div class='ctx'> 			fl6.flowlabel = sin6-&gt;sin6_flowinfo&amp;IPV6_FLOWINFO_MASK;</div><div class='ctx'> 			if (fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) {</div><div class='ctx'> 				flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-				if (!flowlabel)</div><div class='add'>+				if (IS_ERR(flowlabel))</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -869,7 +846,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) &amp;&amp; !flowlabel) {</div><div class='ctx'> 			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-			if (!flowlabel)</div><div class='add'>+			if (IS_ERR(flowlabel))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(opt-&gt;opt_nflen|opt-&gt;opt_flen))</div><div class='hunk'>@@ -884,11 +861,15 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	opt = ipv6_fixup_options(&amp;opt_space, opt);</div><div class='ctx'> </div><div class='ctx'> 	fl6.flowi6_proto = proto;</div><div class='del'>-	rfv.msg = msg;</div><div class='del'>-	rfv.hlen = 0;</div><div class='del'>-	err = rawv6_probe_proto_opt(&amp;rfv, &amp;fl6);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+	fl6.flowi6_mark = ipc6.sockc.mark;</div><div class='add'>+</div><div class='add'>+	if (!hdrincl) {</div><div class='add'>+		rfv.msg = msg;</div><div class='add'>+		rfv.hlen = 0;</div><div class='add'>+		err = rawv6_probe_proto_opt(&amp;rfv, &amp;fl6);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_any(daddr))</div><div class='ctx'> 		fl6.daddr = *daddr;</div><div class='hunk'>@@ -900,20 +881,17 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='ctx'> </div><div class='ctx'> 	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr))</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='del'>-	if (inet-&gt;hdrincl)</div><div class='add'>+	if (hdrincl)</div><div class='ctx'> 		fl6.flowi6_flags |= FLOWI_FLAG_KNOWN_NH;</div><div class='ctx'> </div><div class='del'>-	if (ipc6.tclass &lt; 0)</div><div class='del'>-		ipc6.tclass = np-&gt;tclass;</div><div class='del'>-</div><div class='ctx'> 	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='add'>+	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &amp;fl6, final_p);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -921,21 +899,18 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	if (ipc6.hlimit &lt; 0)</div><div class='ctx'> 		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='ctx'> </div><div class='del'>-	if (ipc6.dontfrag &lt; 0)</div><div class='del'>-		ipc6.dontfrag = np-&gt;dontfrag;</div><div class='del'>-</div><div class='ctx'> 	if (msg-&gt;msg_flags&amp;MSG_CONFIRM)</div><div class='ctx'> 		goto do_confirm;</div><div class='ctx'> </div><div class='ctx'> back_from_confirm:</div><div class='del'>-	if (inet-&gt;hdrincl)</div><div class='add'>+	if (hdrincl)</div><div class='ctx'> 		err = rawv6_send_hdrinc(sk, msg, len, &amp;fl6, &amp;dst,</div><div class='ctx'> 					msg-&gt;msg_flags, &amp;ipc6.sockc);</div><div class='ctx'> 	else {</div><div class='ctx'> 		ipc6.opt = opt;</div><div class='ctx'> 		lock_sock(sk);</div><div class='ctx'> 		err = ip6_append_data(sk, raw6_getfrag, &amp;rfv,</div><div class='del'>-			len, 0, &amp;ipc6, &amp;fl6, (struct rt6_info *)dst,</div><div class='add'>+			len, 0, &amp;ipc6, &amp;fl6, dst_rt6_info(dst),</div><div class='ctx'> 			msg-&gt;msg_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -959,14 +934,14 @@ do_confirm:</div><div class='ctx'> 	goto done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,</div><div class='del'>-			       char __user *optval, int optlen)</div><div class='add'>+static int rawv6_seticmpfilter(struct sock *sk, int optname,</div><div class='add'>+			       sockptr_t optval, int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case ICMPV6_FILTER:</div><div class='ctx'> 		if (optlen &gt; sizeof(struct icmp6_filter))</div><div class='ctx'> 			optlen = sizeof(struct icmp6_filter);</div><div class='del'>-		if (copy_from_user(&amp;raw6_sk(sk)-&gt;filter, optval, optlen))</div><div class='add'>+		if (copy_from_sockptr(&amp;raw6_sk(sk)-&gt;filter, optval, optlen))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -976,7 +951,7 @@ static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,</div><div class='add'>+static int rawv6_geticmpfilter(struct sock *sk, int optname,</div><div class='ctx'> 			       char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -1003,19 +978,22 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int do_rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, unsigned int optlen)</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw6_sock *rp = raw6_sk(sk);</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (optlen &lt; sizeof(val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(val)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case IPV6_HDRINCL:</div><div class='ctx'> 		if (sk-&gt;sk_type != SOCK_RAW)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		inet_sk(sk)-&gt;hdrincl = !!val;</div><div class='add'>+		inet_assign_bit(HDRINCL, sk, val);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case IPV6_CHECKSUM:</div><div class='ctx'> 		if (inet_sk(sk)-&gt;inet_num == IPPROTO_ICMPV6 &amp;&amp;</div><div class='hunk'>@@ -1050,7 +1028,7 @@ static int do_rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			    sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	switch (level) {</div><div class='ctx'> 	case SOL_RAW:</div><div class='hunk'>@@ -1059,12 +1037,12 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	case SOL_ICMPV6:</div><div class='ctx'> 		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMPV6)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='del'>-		return rawv6_seticmpfilter(sk, level, optname, optval, optlen);</div><div class='add'>+		return rawv6_seticmpfilter(sk, optname, optval, optlen);</div><div class='ctx'> 	case SOL_IPV6:</div><div class='ctx'> 		if (optname == IPV6_CHECKSUM ||</div><div class='ctx'> 		    optname == IPV6_HDRINCL)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return ipv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1072,30 +1050,6 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return do_rawv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-				   char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	switch (level) {</div><div class='del'>-	case SOL_RAW:</div><div class='del'>-		break;</div><div class='del'>-	case SOL_ICMPV6:</div><div class='del'>-		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMPV6)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		return rawv6_seticmpfilter(sk, level, optname, optval, optlen);</div><div class='del'>-	case SOL_IPV6:</div><div class='del'>-		if (optname == IPV6_CHECKSUM ||</div><div class='del'>-		    optname == IPV6_HDRINCL)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		return compat_ipv6_setsockopt(sk, level, optname,</div><div class='del'>-					      optval, optlen);</div><div class='del'>-	}</div><div class='del'>-	return do_rawv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int do_rawv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 			    char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -1107,7 +1061,7 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case IPV6_HDRINCL:</div><div class='del'>-		val = inet_sk(sk)-&gt;hdrincl;</div><div class='add'>+		val = inet_test_bit(HDRINCL, sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPV6_CHECKSUM:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1144,12 +1098,12 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	case SOL_ICMPV6:</div><div class='ctx'> 		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMPV6)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='del'>-		return rawv6_geticmpfilter(sk, level, optname, optval, optlen);</div><div class='add'>+		return rawv6_geticmpfilter(sk, optname, optval, optlen);</div><div class='ctx'> 	case SOL_IPV6:</div><div class='ctx'> 		if (optname == IPV6_CHECKSUM ||</div><div class='ctx'> 		    optname == IPV6_HDRINCL)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return ipv6_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1157,53 +1111,29 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return do_rawv6_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-				   char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	switch (level) {</div><div class='del'>-	case SOL_RAW:</div><div class='del'>-		break;</div><div class='del'>-	case SOL_ICMPV6:</div><div class='del'>-		if (inet_sk(sk)-&gt;inet_num != IPPROTO_ICMPV6)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		return rawv6_geticmpfilter(sk, level, optname, optval, optlen);</div><div class='del'>-	case SOL_IPV6:</div><div class='del'>-		if (optname == IPV6_CHECKSUM ||</div><div class='del'>-		    optname == IPV6_HDRINCL)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		return compat_ipv6_getsockopt(sk, level, optname,</div><div class='del'>-					      optval, optlen);</div><div class='del'>-	}</div><div class='del'>-	return do_rawv6_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+static int rawv6_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCOUTQ: {</div><div class='del'>-		int amount = sk_wmem_alloc_get(sk);</div><div class='del'>-</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		*karg = sk_wmem_alloc_get(sk);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SIOCINQ: {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		int amount = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 		if (skb)</div><div class='del'>-			amount = skb-&gt;len;</div><div class='add'>+			*karg = skb-&gt;len;</div><div class='add'>+		else</div><div class='add'>+			*karg = 0;</div><div class='ctx'> 		spin_unlock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='del'>-		return put_user(amount, (int __user *)arg);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> #ifdef CONFIG_IPV6_MROUTE</div><div class='del'>-		return ip6mr_ioctl(sk, cmd, (void __user *)arg);</div><div class='add'>+		return ip6mr_ioctl(sk, cmd, karg);</div><div class='ctx'> #else</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1240,14 +1170,13 @@ static void raw6_destroy(struct sock *sk)</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	ip6_flush_pending_frames(sk);</div><div class='ctx'> 	release_sock(sk);</div><div class='del'>-</div><div class='del'>-	inet6_destroy_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rawv6_init_sk(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct raw6_sock *rp = raw6_sk(sk);</div><div class='ctx'> </div><div class='add'>+	sk-&gt;sk_drop_counters = &amp;rp-&gt;drop_counters;</div><div class='ctx'> 	switch (inet_sk(sk)-&gt;inet_num) {</div><div class='ctx'> 	case IPPROTO_ICMPV6:</div><div class='ctx'> 		rp-&gt;checksum = 1;</div><div class='hunk'>@@ -1281,12 +1210,11 @@ struct proto rawv6_prot = {</div><div class='ctx'> 	.hash		   = raw_hash_sk,</div><div class='ctx'> 	.unhash		   = raw_unhash_sk,</div><div class='ctx'> 	.obj_size	   = sizeof(struct raw6_sock),</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct raw6_sock, inet6),</div><div class='ctx'> 	.useroffset	   = offsetof(struct raw6_sock, filter),</div><div class='ctx'> 	.usersize	   = sizeof_field(struct raw6_sock, filter),</div><div class='ctx'> 	.h.raw_hash	   = &amp;raw_v6_hashinfo,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_rawv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_rawv6_getsockopt,</div><div class='ctx'> 	.compat_ioctl	   = compat_rawv6_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.diag_destroy	   = raw_abort,</div><div class='hunk'>@@ -1355,6 +1283,7 @@ const struct proto_ops inet6_sockraw_ops = {</div><div class='ctx'> 	.getname	   = inet6_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,		/* ok		*/</div><div class='ctx'> 	.ioctl		   = inet6_ioctl,		/* must change  */</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,		/* ok		*/</div><div class='ctx'> 	.shutdown	   = inet_shutdown,		/* ok		*/</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,	/* ok		*/</div><div class='hunk'>@@ -1362,10 +1291,8 @@ const struct proto_ops inet6_sockraw_ops = {</div><div class='ctx'> 	.sendmsg	   = inet_sendmsg,		/* ok		*/</div><div class='ctx'> 	.recvmsg	   = sock_common_recvmsg,	/* ok		*/</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='add'>+	.compat_ioctl	   = inet6_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c<br/>index 5c5b4f79296e..25ec8001898d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/reassembly.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/reassembly.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/reassembly.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/reassembly.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 fragment reassembly</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *	Based on: net/ipv4/ip_fragment.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -46,6 +42,8 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='hunk'>@@ -69,19 +67,18 @@ static u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)</div><div class='ctx'> </div><div class='ctx'> static struct inet_frags ip6_frags;</div><div class='ctx'> </div><div class='del'>-static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,</div><div class='del'>-			  struct net_device *dev);</div><div class='add'>+static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			  struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			  int *refs);</div><div class='ctx'> </div><div class='ctx'> static void ip6_frag_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct inet_frag_queue *frag = from_timer(frag, t, timer);</div><div class='add'>+	struct inet_frag_queue *frag = timer_container_of(frag, t, timer);</div><div class='ctx'> 	struct frag_queue *fq;</div><div class='del'>-	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	fq = container_of(frag, struct frag_queue, q);</div><div class='del'>-	net = container_of(fq-&gt;q.net, struct net, ipv6.frags);</div><div class='ctx'> </div><div class='del'>-	ip6frag_expire_frag_queue(net, fq);</div><div class='add'>+	ip6frag_expire_frag_queue(fq-&gt;q.fqdir-&gt;net, fq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct frag_queue *</div><div class='hunk'>@@ -100,32 +97,41 @@ fq_find(struct net *net, __be32 id, const struct ipv6hdr *hdr, int iif)</div><div class='ctx'> 					    IPV6_ADDR_LINKLOCAL)))</div><div class='ctx'> 		key.iif = 0;</div><div class='ctx'> </div><div class='del'>-	q = inet_frag_find(&amp;net-&gt;ipv6.frags, &amp;key);</div><div class='add'>+	q = inet_frag_find(net-&gt;ipv6.fqdir, &amp;key);</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return container_of(q, struct frag_queue, q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+static int ip6_frag_queue(struct net *net,</div><div class='add'>+			  struct frag_queue *fq, struct sk_buff *skb,</div><div class='ctx'> 			  struct frag_hdr *fhdr, int nhoff,</div><div class='del'>-			  u32 *prob_offset)</div><div class='add'>+			  u32 *prob_offset, int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *prev, *next;</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	int offset, end, fragsize;</div><div class='del'>-	struct net *net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+	struct sk_buff *prev_tail;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+	SKB_DR(reason);</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='del'>-	if (fq-&gt;q.flags &amp; INET_FRAG_COMPLETE)</div><div class='add'>+	/* If reassembly is already done, @skb must be a duplicate frag. */</div><div class='add'>+	if (fq-&gt;q.flags &amp; INET_FRAG_COMPLETE) {</div><div class='add'>+		SKB_DR_SET(reason, DUP_FRAG);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	offset = ntohs(fhdr-&gt;frag_off) &amp; ~0x7;</div><div class='ctx'> 	end = offset + (ntohs(ipv6_hdr(skb)-&gt;payload_len) -</div><div class='ctx'> 			((u8 *)(fhdr + 1) - (u8 *)(ipv6_hdr(skb) + 1)));</div><div class='ctx'> </div><div class='ctx'> 	if ((unsigned int)end &gt; IPV6_MAXPLEN) {</div><div class='ctx'> 		*prob_offset = (u8 *)&amp;fhdr-&gt;frag_off - skb_network_header(skb);</div><div class='add'>+		/* note that if prob_offset is set, the skb is freed elsewhere,</div><div class='add'>+		 * we do not free it here.</div><div class='add'>+		 */</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +151,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (end &lt; fq-&gt;q.len ||</div><div class='ctx'> 		    ((fq-&gt;q.flags &amp; INET_FRAG_LAST_IN) &amp;&amp; end != fq-&gt;q.len))</div><div class='del'>-			goto err;</div><div class='add'>+			goto discard_fq;</div><div class='ctx'> 		fq-&gt;q.flags |= INET_FRAG_LAST_IN;</div><div class='ctx'> 		fq-&gt;q.len = end;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -162,75 +168,41 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,</div><div class='ctx'> 		if (end &gt; fq-&gt;q.len) {</div><div class='ctx'> 			/* Some bits beyond end -&gt; corruption. */</div><div class='ctx'> 			if (fq-&gt;q.flags &amp; INET_FRAG_LAST_IN)</div><div class='del'>-				goto err;</div><div class='add'>+				goto discard_fq;</div><div class='ctx'> 			fq-&gt;q.len = end;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (end == offset)</div><div class='del'>-		goto err;</div><div class='add'>+		goto discard_fq;</div><div class='ctx'> </div><div class='add'>+	err = -ENOMEM;</div><div class='ctx'> 	/* Point into the IP datagram 'data' part. */</div><div class='ctx'> 	if (!pskb_pull(skb, (u8 *) (fhdr + 1) - skb-&gt;data))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (pskb_trim_rcsum(skb, end - offset))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* Find out which fragments are in front and at the back of us</div><div class='del'>-	 * in the chain of fragments so far.  We must know where to put</div><div class='del'>-	 * this fragment, right?</div><div class='del'>-	 */</div><div class='del'>-	prev = fq-&gt;q.fragments_tail;</div><div class='del'>-	if (!prev || prev-&gt;ip_defrag_offset &lt; offset) {</div><div class='del'>-		next = NULL;</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-	prev = NULL;</div><div class='del'>-	for (next = fq-&gt;q.fragments; next != NULL; next = next-&gt;next) {</div><div class='del'>-		if (next-&gt;ip_defrag_offset &gt;= offset)</div><div class='del'>-			break;	/* bingo! */</div><div class='del'>-		prev = next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	/* RFC5722, Section 4, amended by Errata ID : 3089</div><div class='del'>-	 *                          When reassembling an IPv6 datagram, if</div><div class='del'>-	 *   one or more its constituent fragments is determined to be an</div><div class='del'>-	 *   overlapping fragment, the entire datagram (and any constituent</div><div class='del'>-	 *   fragments) MUST be silently discarded.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Check for overlap with preceding fragment. */</div><div class='del'>-	if (prev &amp;&amp;</div><div class='del'>-	    (prev-&gt;ip_defrag_offset + prev-&gt;len) &gt; offset)</div><div class='ctx'> 		goto discard_fq;</div><div class='ctx'> </div><div class='del'>-	/* Look for overlap with succeeding segment. */</div><div class='del'>-	if (next &amp;&amp; next-&gt;ip_defrag_offset &lt; end)</div><div class='add'>+	err = pskb_trim_rcsum(skb, end - offset);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto discard_fq;</div><div class='ctx'> </div><div class='del'>-	/* Note : skb-&gt;ip_defrag_offset and skb-&gt;dev share the same location */</div><div class='add'>+	/* Note : skb-&gt;rbnode and skb-&gt;dev share the same location. */</div><div class='ctx'> 	dev = skb-&gt;dev;</div><div class='del'>-	if (dev)</div><div class='del'>-		fq-&gt;iif = dev-&gt;ifindex;</div><div class='ctx'> 	/* Makes sure compiler wont do silly aliasing games */</div><div class='ctx'> 	barrier();</div><div class='del'>-	skb-&gt;ip_defrag_offset = offset;</div><div class='ctx'> </div><div class='del'>-	/* Insert this fragment in the chain of fragments. */</div><div class='del'>-	skb-&gt;next = next;</div><div class='del'>-	if (!next)</div><div class='del'>-		fq-&gt;q.fragments_tail = skb;</div><div class='del'>-	if (prev)</div><div class='del'>-		prev-&gt;next = skb;</div><div class='del'>-	else</div><div class='del'>-		fq-&gt;q.fragments = skb;</div><div class='add'>+	prev_tail = fq-&gt;q.fragments_tail;</div><div class='add'>+	err = inet_frag_queue_insert(&amp;fq-&gt;q, skb, offset, end);</div><div class='add'>+	if (err)</div><div class='add'>+		goto insert_error;</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		fq-&gt;iif = dev-&gt;ifindex;</div><div class='ctx'> </div><div class='ctx'> 	fq-&gt;q.stamp = skb-&gt;tstamp;</div><div class='add'>+	fq-&gt;q.tstamp_type = skb-&gt;tstamp_type;</div><div class='ctx'> 	fq-&gt;q.meat += skb-&gt;len;</div><div class='ctx'> 	fq-&gt;ecn |= ecn;</div><div class='del'>-	add_frag_mem_limit(fq-&gt;q.net, skb-&gt;truesize);</div><div class='add'>+	add_frag_mem_limit(fq-&gt;q.fqdir, skb-&gt;truesize);</div><div class='ctx'> </div><div class='ctx'> 	fragsize = -skb_network_offset(skb) + skb-&gt;len;</div><div class='ctx'> 	if (fragsize &gt; fq-&gt;q.max_size)</div><div class='hunk'>@@ -246,167 +218,97 @@ found:</div><div class='ctx'> </div><div class='ctx'> 	if (fq-&gt;q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &amp;&amp;</div><div class='ctx'> 	    fq-&gt;q.meat == fq-&gt;q.len) {</div><div class='del'>-		int res;</div><div class='ctx'> 		unsigned long orefdst = skb-&gt;_skb_refdst;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;_skb_refdst = 0UL;</div><div class='del'>-		res = ip6_frag_reasm(fq, prev, dev);</div><div class='add'>+		err = ip6_frag_reasm(fq, skb, prev_tail, dev, refs);</div><div class='ctx'> 		skb-&gt;_skb_refdst = orefdst;</div><div class='del'>-		return res;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	return -1;</div><div class='add'>+	return -EINPROGRESS;</div><div class='ctx'> </div><div class='add'>+insert_error:</div><div class='add'>+	if (err == IPFRAG_DUP) {</div><div class='add'>+		SKB_DR_SET(reason, DUP_FRAG);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='add'>+			IPSTATS_MIB_REASM_OVERLAPS);</div><div class='ctx'> discard_fq:</div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='del'>-err:</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> 	__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),</div><div class='ctx'> 			IPSTATS_MIB_REASMFAILS);</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return -1;</div><div class='add'>+err:</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Check if this packet is complete.</div><div class='del'>- *	Returns NULL on failure by any reason, and pointer</div><div class='del'>- *	to current nexthdr field in reassembled frame.</div><div class='ctx'>  *</div><div class='ctx'>  *	It is called with locked fq, and caller must check that</div><div class='ctx'>  *	queue is eligible for reassembly i.e. it is not COMPLETE,</div><div class='ctx'>  *	the last and the first frames arrived and all the bits are here.</div><div class='ctx'>  */</div><div class='del'>-static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,</div><div class='del'>-			  struct net_device *dev)</div><div class='add'>+static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *skb,</div><div class='add'>+			  struct sk_buff *prev_tail, struct net_device *dev,</div><div class='add'>+			  int *refs)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = container_of(fq-&gt;q.net, struct net, ipv6.frags);</div><div class='del'>-	struct sk_buff *fp, *head = fq-&gt;q.fragments;</div><div class='del'>-	int    payload_len;</div><div class='add'>+	struct net *net = fq-&gt;q.fqdir-&gt;net;</div><div class='ctx'> 	unsigned int nhoff;</div><div class='del'>-	int sum_truesize;</div><div class='add'>+	void *reasm_data;</div><div class='add'>+	int payload_len;</div><div class='ctx'> 	u8 ecn;</div><div class='ctx'> </div><div class='del'>-	inet_frag_kill(&amp;fq-&gt;q);</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> </div><div class='ctx'> 	ecn = ip_frag_ecn_table[fq-&gt;ecn];</div><div class='ctx'> 	if (unlikely(ecn == 0xff))</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> </div><div class='del'>-	/* Make the one we just received the head. */</div><div class='del'>-	if (prev) {</div><div class='del'>-		head = prev-&gt;next;</div><div class='del'>-		fp = skb_clone(head, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!fp)</div><div class='del'>-			goto out_oom;</div><div class='del'>-</div><div class='del'>-		fp-&gt;next = head-&gt;next;</div><div class='del'>-		if (!fp-&gt;next)</div><div class='del'>-			fq-&gt;q.fragments_tail = fp;</div><div class='del'>-		prev-&gt;next = fp;</div><div class='del'>-</div><div class='del'>-		skb_morph(head, fq-&gt;q.fragments);</div><div class='del'>-		head-&gt;next = fq-&gt;q.fragments-&gt;next;</div><div class='del'>-</div><div class='del'>-		consume_skb(fq-&gt;q.fragments);</div><div class='del'>-		fq-&gt;q.fragments = head;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(head == NULL);</div><div class='del'>-	WARN_ON(head-&gt;ip_defrag_offset != 0);</div><div class='add'>+	reasm_data = inet_frag_reasm_prepare(&amp;fq-&gt;q, skb, prev_tail);</div><div class='add'>+	if (!reasm_data)</div><div class='add'>+		goto out_oom;</div><div class='ctx'> </div><div class='del'>-	/* Unfragmented part is taken from the first segment. */</div><div class='del'>-	payload_len = ((head-&gt;data - skb_network_header(head)) -</div><div class='add'>+	payload_len = -skb_network_offset(skb) -</div><div class='ctx'> 		       sizeof(struct ipv6hdr) + fq-&gt;q.len -</div><div class='del'>-		       sizeof(struct frag_hdr));</div><div class='add'>+		       sizeof(struct frag_hdr);</div><div class='ctx'> 	if (payload_len &gt; IPV6_MAXPLEN)</div><div class='ctx'> 		goto out_oversize;</div><div class='ctx'> </div><div class='del'>-	/* Head of list must not be cloned. */</div><div class='del'>-	if (skb_unclone(head, GFP_ATOMIC))</div><div class='del'>-		goto out_oom;</div><div class='del'>-</div><div class='del'>-	/* If the first fragment is fragmented itself, we split</div><div class='del'>-	 * it to two chunks: the first with data and paged part</div><div class='del'>-	 * and the second, holding only fragments. */</div><div class='del'>-	if (skb_has_frag_list(head)) {</div><div class='del'>-		struct sk_buff *clone;</div><div class='del'>-		int i, plen = 0;</div><div class='del'>-</div><div class='del'>-		clone = alloc_skb(0, GFP_ATOMIC);</div><div class='del'>-		if (!clone)</div><div class='del'>-			goto out_oom;</div><div class='del'>-		clone-&gt;next = head-&gt;next;</div><div class='del'>-		head-&gt;next = clone;</div><div class='del'>-		skb_shinfo(clone)-&gt;frag_list = skb_shinfo(head)-&gt;frag_list;</div><div class='del'>-		skb_frag_list_init(head);</div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(head)-&gt;nr_frags; i++)</div><div class='del'>-			plen += skb_frag_size(&amp;skb_shinfo(head)-&gt;frags[i]);</div><div class='del'>-		clone-&gt;len = clone-&gt;data_len = head-&gt;data_len - plen;</div><div class='del'>-		head-&gt;data_len -= clone-&gt;len;</div><div class='del'>-		head-&gt;len -= clone-&gt;len;</div><div class='del'>-		clone-&gt;csum = 0;</div><div class='del'>-		clone-&gt;ip_summed = head-&gt;ip_summed;</div><div class='del'>-		add_frag_mem_limit(fq-&gt;q.net, clone-&gt;truesize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* We have to remove fragment header from datagram and to relocate</div><div class='ctx'> 	 * header in order to calculate ICV correctly. */</div><div class='ctx'> 	nhoff = fq-&gt;nhoffset;</div><div class='del'>-	skb_network_header(head)[nhoff] = skb_transport_header(head)[0];</div><div class='del'>-	memmove(head-&gt;head + sizeof(struct frag_hdr), head-&gt;head,</div><div class='del'>-		(head-&gt;data - head-&gt;head) - sizeof(struct frag_hdr));</div><div class='del'>-	if (skb_mac_header_was_set(head))</div><div class='del'>-		head-&gt;mac_header += sizeof(struct frag_hdr);</div><div class='del'>-	head-&gt;network_header += sizeof(struct frag_hdr);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(head);</div><div class='del'>-	skb_push(head, head-&gt;data - skb_network_header(head));</div><div class='del'>-</div><div class='del'>-	sum_truesize = head-&gt;truesize;</div><div class='del'>-	for (fp = head-&gt;next; fp;) {</div><div class='del'>-		bool headstolen;</div><div class='del'>-		int delta;</div><div class='del'>-		struct sk_buff *next = fp-&gt;next;</div><div class='del'>-</div><div class='del'>-		sum_truesize += fp-&gt;truesize;</div><div class='del'>-		if (head-&gt;ip_summed != fp-&gt;ip_summed)</div><div class='del'>-			head-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-		else if (head-&gt;ip_summed == CHECKSUM_COMPLETE)</div><div class='del'>-			head-&gt;csum = csum_add(head-&gt;csum, fp-&gt;csum);</div><div class='del'>-</div><div class='del'>-		if (skb_try_coalesce(head, fp, &amp;headstolen, &amp;delta)) {</div><div class='del'>-			kfree_skb_partial(fp, headstolen);</div><div class='del'>-		} else {</div><div class='del'>-			if (!skb_shinfo(head)-&gt;frag_list)</div><div class='del'>-				skb_shinfo(head)-&gt;frag_list = fp;</div><div class='del'>-			head-&gt;data_len += fp-&gt;len;</div><div class='del'>-			head-&gt;len += fp-&gt;len;</div><div class='del'>-			head-&gt;truesize += fp-&gt;truesize;</div><div class='del'>-		}</div><div class='del'>-		fp = next;</div><div class='del'>-	}</div><div class='del'>-	sub_frag_mem_limit(fq-&gt;q.net, sum_truesize);</div><div class='add'>+	skb_network_header(skb)[nhoff] = skb_transport_header(skb)[0];</div><div class='add'>+	memmove(skb-&gt;head + sizeof(struct frag_hdr), skb-&gt;head,</div><div class='add'>+		(skb-&gt;data - skb-&gt;head) - sizeof(struct frag_hdr));</div><div class='add'>+	if (skb_mac_header_was_set(skb))</div><div class='add'>+		skb-&gt;mac_header += sizeof(struct frag_hdr);</div><div class='add'>+	skb-&gt;network_header += sizeof(struct frag_hdr);</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-	head-&gt;next = NULL;</div><div class='del'>-	head-&gt;dev = dev;</div><div class='del'>-	head-&gt;tstamp = fq-&gt;q.stamp;</div><div class='del'>-	ipv6_hdr(head)-&gt;payload_len = htons(payload_len);</div><div class='del'>-	ipv6_change_dsfield(ipv6_hdr(head), 0xff, ecn);</div><div class='del'>-	IP6CB(head)-&gt;nhoff = nhoff;</div><div class='del'>-	IP6CB(head)-&gt;flags |= IP6SKB_FRAGMENTED;</div><div class='del'>-	IP6CB(head)-&gt;frag_max_size = fq-&gt;q.max_size;</div><div class='add'>+	inet_frag_reasm_finish(&amp;fq-&gt;q, skb, reasm_data, true);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	ipv6_hdr(skb)-&gt;payload_len = htons(payload_len);</div><div class='add'>+	ipv6_change_dsfield(ipv6_hdr(skb), 0xff, ecn);</div><div class='add'>+	IP6CB(skb)-&gt;nhoff = nhoff;</div><div class='add'>+	IP6CB(skb)-&gt;flags |= IP6SKB_FRAGMENTED;</div><div class='add'>+	IP6CB(skb)-&gt;frag_max_size = fq-&gt;q.max_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Yes, and fold redundant checksum back. 8) */</div><div class='del'>-	skb_postpush_rcsum(head, skb_network_header(head),</div><div class='del'>-			   skb_network_header_len(head));</div><div class='add'>+	skb_postpush_rcsum(skb, skb_network_header(skb),</div><div class='add'>+			   skb_network_header_len(skb));</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	__IP6_INC_STATS(net, __in6_dev_get(dev), IPSTATS_MIB_REASMOKS);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	fq-&gt;q.fragments = NULL;</div><div class='add'>+	__IP6_INC_STATS(net, __in6_dev_stats_get(dev, skb), IPSTATS_MIB_REASMOKS);</div><div class='ctx'> 	fq-&gt;q.rb_fragments = RB_ROOT;</div><div class='ctx'> 	fq-&gt;q.fragments_tail = NULL;</div><div class='add'>+	fq-&gt;q.last_run_head = NULL;</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> out_oversize:</div><div class='hunk'>@@ -415,18 +317,18 @@ out_oversize:</div><div class='ctx'> out_oom:</div><div class='ctx'> 	net_dbg_ratelimited("ip6_frag_reasm: no memory for reassembly\n");</div><div class='ctx'> out_fail:</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	__IP6_INC_STATS(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	__IP6_INC_STATS(net, __in6_dev_stats_get(dev, skb), IPSTATS_MIB_REASMFAILS);</div><div class='add'>+	inet_frag_kill(&amp;fq-&gt;q, refs);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipv6_frag_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	const struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='add'>+	struct net *net = skb_dst_dev_net(skb);</div><div class='ctx'> 	struct frag_hdr *fhdr;</div><div class='ctx'> 	struct frag_queue *fq;</div><div class='del'>-	const struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='del'>-	struct net *net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+	u8 nexthdr;</div><div class='ctx'> 	int iif;</div><div class='ctx'> </div><div class='ctx'> 	if (IP6CB(skb)-&gt;flags &amp; IP6SKB_FRAGMENTED)</div><div class='hunk'>@@ -445,7 +347,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)</div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='ctx'> 	fhdr = (struct frag_hdr *)skb_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-	if (!(fhdr-&gt;frag_off &amp; htons(0xFFF9))) {</div><div class='add'>+	if (!(fhdr-&gt;frag_off &amp; htons(IP6_OFFSET | IP6_MF))) {</div><div class='ctx'> 		/* It is not a fragmented frame */</div><div class='ctx'> 		skb-&gt;transport_header += sizeof(struct frag_hdr);</div><div class='ctx'> 		__IP6_INC_STATS(net,</div><div class='hunk'>@@ -453,34 +355,50 @@ static int ipv6_frag_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		IP6CB(skb)-&gt;nhoff = (u8 *)fhdr - skb_network_header(skb);</div><div class='ctx'> 		IP6CB(skb)-&gt;flags |= IP6SKB_FRAGMENTED;</div><div class='add'>+		IP6CB(skb)-&gt;frag_max_size = ntohs(hdr-&gt;payload_len) +</div><div class='add'>+					    sizeof(struct ipv6hdr);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len - skb_network_offset(skb) &lt; IPV6_MIN_MTU &amp;&amp;</div><div class='del'>-	    fhdr-&gt;frag_off &amp; htons(IP6_MF))</div><div class='del'>-		goto fail_hdr;</div><div class='add'>+	/* RFC 8200, Section 4.5 Fragment Header:</div><div class='add'>+	 * If the first fragment does not include all headers through an</div><div class='add'>+	 * Upper-Layer header, then that fragment should be discarded and</div><div class='add'>+	 * an ICMP Parameter Problem, Code 3, message should be sent to</div><div class='add'>+	 * the source of the fragment, with the Pointer field set to zero.</div><div class='add'>+	 */</div><div class='add'>+	nexthdr = hdr-&gt;nexthdr;</div><div class='add'>+	if (ipv6frag_thdr_truncated(skb, skb_network_offset(skb) + sizeof(struct ipv6hdr), &amp;nexthdr)) {</div><div class='add'>+		__IP6_INC_STATS(net, __in6_dev_get_safely(skb-&gt;dev),</div><div class='add'>+				IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+		icmpv6_param_prob(skb, ICMPV6_HDR_INCOMP, 0);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iif = skb-&gt;dev ? skb-&gt;dev-&gt;ifindex : 0;</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	fq = fq_find(net, fhdr-&gt;identification, hdr, iif);</div><div class='ctx'> 	if (fq) {</div><div class='ctx'> 		u32 prob_offset = 0;</div><div class='del'>-		int ret;</div><div class='add'>+		int ret, refs = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;fq-&gt;q.lock);</div><div class='ctx'> </div><div class='ctx'> 		fq-&gt;iif = iif;</div><div class='del'>-		ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)-&gt;nhoff,</div><div class='del'>-				     &amp;prob_offset);</div><div class='add'>+		ret = ip6_frag_queue(net, fq, skb, fhdr, IP6CB(skb)-&gt;nhoff,</div><div class='add'>+				     &amp;prob_offset, &amp;refs);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;fq-&gt;q.lock);</div><div class='del'>-		inet_frag_put(&amp;fq-&gt;q);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		inet_frag_putn(&amp;fq-&gt;q, refs);</div><div class='ctx'> 		if (prob_offset) {</div><div class='ctx'> 			__IP6_INC_STATS(net, __in6_dev_get_safely(skb-&gt;dev),</div><div class='ctx'> 					IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+			/* icmpv6_param_prob() calls kfree_skb(skb) */</div><div class='ctx'> 			icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, prob_offset);</div><div class='ctx'> 		}</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_REASMFAILS);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -503,28 +421,22 @@ static const struct inet6_protocol frag_protocol = {</div><div class='ctx'> static struct ctl_table ip6_frags_ns_ctl_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip6frag_high_thresh",</div><div class='del'>-		.data		= &amp;init_net.ipv6.frags.high_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra1		= &amp;init_net.ipv6.frags.low_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip6frag_low_thresh",</div><div class='del'>-		.data		= &amp;init_net.ipv6.frags.low_thresh,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned long),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_doulongvec_minmax,</div><div class='del'>-		.extra2		= &amp;init_net.ipv6.frags.high_thresh</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip6frag_time",</div><div class='del'>-		.data		= &amp;init_net.ipv6.frags.timeout,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* secret interval has been deprecated */</div><div class='hunk'>@@ -537,7 +449,6 @@ static struct ctl_table ip6_frags_ctl_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init ip6_frags_ns_sysctl_register(struct net *net)</div><div class='hunk'>@@ -551,15 +462,15 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)</div><div class='ctx'> 		if (!table)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='del'>-		table[0].data = &amp;net-&gt;ipv6.frags.high_thresh;</div><div class='del'>-		table[0].extra1 = &amp;net-&gt;ipv6.frags.low_thresh;</div><div class='del'>-		table[0].extra2 = &amp;init_net.ipv6.frags.high_thresh;</div><div class='del'>-		table[1].data = &amp;net-&gt;ipv6.frags.low_thresh;</div><div class='del'>-		table[1].extra2 = &amp;net-&gt;ipv6.frags.high_thresh;</div><div class='del'>-		table[2].data = &amp;net-&gt;ipv6.frags.timeout;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hdr = register_net_sysctl(net, "net/ipv6", table);</div><div class='add'>+	table[0].data	= &amp;net-&gt;ipv6.fqdir-&gt;high_thresh;</div><div class='add'>+	table[0].extra1	= &amp;net-&gt;ipv6.fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].data	= &amp;net-&gt;ipv6.fqdir-&gt;low_thresh;</div><div class='add'>+	table[1].extra2	= &amp;net-&gt;ipv6.fqdir-&gt;high_thresh;</div><div class='add'>+	table[2].data	= &amp;net-&gt;ipv6.fqdir-&gt;timeout;</div><div class='add'>+</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/ipv6", table,</div><div class='add'>+				     ARRAY_SIZE(ip6_frags_ns_ctl_table));</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -575,7 +486,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit ip6_frags_ns_sysctl_unregister(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	table = net-&gt;ipv6.sysctl.frags_hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	unregister_net_sysctl_table(net-&gt;ipv6.sysctl.frags_hdr);</div><div class='hunk'>@@ -620,30 +531,35 @@ static int __net_init ipv6_frags_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='del'>-	net-&gt;ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='del'>-	net-&gt;ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;</div><div class='del'>-	net-&gt;ipv6.frags.f = &amp;ip6_frags;</div><div class='del'>-</div><div class='del'>-	res = inet_frags_init_net(&amp;net-&gt;ipv6.frags);</div><div class='add'>+	res = fqdir_init(&amp;net-&gt;ipv6.fqdir, &amp;ip6_frags, net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='add'>+	net-&gt;ipv6.fqdir-&gt;high_thresh = IPV6_FRAG_HIGH_THRESH;</div><div class='add'>+	net-&gt;ipv6.fqdir-&gt;low_thresh = IPV6_FRAG_LOW_THRESH;</div><div class='add'>+	net-&gt;ipv6.fqdir-&gt;timeout = IPV6_FRAG_TIMEOUT;</div><div class='add'>+</div><div class='ctx'> 	res = ip6_frags_ns_sysctl_register(net);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='del'>-		inet_frags_exit_net(&amp;net-&gt;ipv6.frags);</div><div class='add'>+		fqdir_exit(net-&gt;ipv6.fqdir);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __net_exit ipv6_frags_pre_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	fqdir_pre_exit(net-&gt;ipv6.fqdir);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __net_exit ipv6_frags_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	ip6_frags_ns_sysctl_unregister(net);</div><div class='del'>-	inet_frags_exit_net(&amp;net-&gt;ipv6.frags);</div><div class='add'>+	fqdir_exit(net-&gt;ipv6.fqdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations ip6_frags_ops = {</div><div class='del'>-	.init = ipv6_frags_init_net,</div><div class='del'>-	.exit = ipv6_frags_exit_net,</div><div class='add'>+	.init		= ipv6_frags_init_net,</div><div class='add'>+	.pre_exit	= ipv6_frags_pre_exit_net,</div><div class='add'>+	.exit		= ipv6_frags_exit_net,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct rhashtable_params ip6_rhash_params = {</div><div class='hunk'>@@ -694,8 +610,8 @@ err_protocol:</div><div class='ctx'> </div><div class='ctx'> void ipv6_frag_exit(void)</div><div class='ctx'> {</div><div class='del'>-	inet_frags_fini(&amp;ip6_frags);</div><div class='ctx'> 	ip6_frags_sysctl_unregister();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6_frags_ops);</div><div class='ctx'> 	inet6_del_protocol(&amp;frag_protocol, IPPROTO_FRAGMENT);</div><div class='add'>+	inet_frags_fini(&amp;ip6_frags);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/route.c b/net/ipv6/route.c<br/>index a366c05a239d..aee6a10b112a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/route.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/route.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/route.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/route.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *	FIB front-end.</div><div class='ctx'>  *</div><div class='ctx'>  *	Authors:</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*	Changes:</div><div class='hunk'>@@ -45,6 +41,7 @@</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='add'>+#include &lt;linux/siphash.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/snmp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='hunk'>@@ -59,12 +56,13 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='del'>-#include &lt;net/nexthop.h&gt;</div><div class='add'>+#include &lt;net/rtnh.h&gt;</div><div class='ctx'> #include &lt;net/lwtunnel.h&gt;</div><div class='ctx'> #include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='hunk'>@@ -84,14 +82,17 @@ enum rt6_nud_state {</div><div class='ctx'> 	RT6_NUD_SUCCEED = 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dst_entry	*ip6_dst_check(struct dst_entry *dst, u32 cookie);</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct dst_entry	*ip6_dst_check(struct dst_entry *dst, u32 cookie);</div><div class='ctx'> static unsigned int	 ip6_default_advmss(const struct dst_entry *dst);</div><div class='del'>-static unsigned int	 ip6_mtu(const struct dst_entry *dst);</div><div class='del'>-static struct dst_entry *ip6_negative_advice(struct dst_entry *);</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+unsigned int		ip6_mtu(const struct dst_entry *dst);</div><div class='add'>+static void		ip6_negative_advice(struct sock *sk,</div><div class='add'>+					    struct dst_entry *dst);</div><div class='ctx'> static void		ip6_dst_destroy(struct dst_entry *);</div><div class='ctx'> static void		ip6_dst_ifdown(struct dst_entry *,</div><div class='del'>-				       struct net_device *dev, int how);</div><div class='del'>-static int		 ip6_dst_gc(struct dst_ops *ops);</div><div class='add'>+				       struct net_device *dev);</div><div class='add'>+static void		 ip6_dst_gc(struct dst_ops *ops);</div><div class='ctx'> </div><div class='ctx'> static int		ip6_pkt_discard(struct sk_buff *skb);</div><div class='ctx'> static int		ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);</div><div class='hunk'>@@ -99,19 +100,21 @@ static int		ip6_pkt_prohibit(struct sk_buff *skb);</div><div class='ctx'> static int		ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> static void		ip6_link_failure(struct sk_buff *skb);</div><div class='ctx'> static void		ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-					   struct sk_buff *skb, u32 mtu);</div><div class='add'>+					   struct sk_buff *skb, u32 mtu,</div><div class='add'>+					   bool confirm_neigh);</div><div class='ctx'> static void		rt6_do_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='ctx'> 					struct sk_buff *skb);</div><div class='del'>-static int rt6_score_route(struct fib6_info *rt, int oif, int strict);</div><div class='del'>-static size_t rt6_nlmsg_size(struct fib6_info *rt);</div><div class='add'>+static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,</div><div class='add'>+			   int strict);</div><div class='add'>+static size_t rt6_nlmsg_size(struct fib6_info *f6i);</div><div class='ctx'> static int rt6_fill_node(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			 struct fib6_info *rt, struct dst_entry *dst,</div><div class='ctx'> 			 struct in6_addr *dest, struct in6_addr *src,</div><div class='ctx'> 			 int iif, int type, u32 portid, u32 seq,</div><div class='ctx'> 			 unsigned int flags);</div><div class='del'>-static struct rt6_info *rt6_find_cached_rt(struct fib6_info *rt,</div><div class='del'>-					   struct in6_addr *daddr,</div><div class='del'>-					   struct in6_addr *saddr);</div><div class='add'>+static struct rt6_info *rt6_find_cached_rt(const struct fib6_result *res,</div><div class='add'>+					   const struct in6_addr *daddr,</div><div class='add'>+					   const struct in6_addr *saddr);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTE_INFO</div><div class='ctx'> static struct fib6_info *rt6_add_route_info(struct net *net,</div><div class='hunk'>@@ -136,53 +139,56 @@ void rt6_uncached_list_add(struct rt6_info *rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct uncached_list *ul = raw_cpu_ptr(&amp;rt6_uncached_list);</div><div class='ctx'> </div><div class='del'>-	rt-&gt;rt6i_uncached_list = ul;</div><div class='add'>+	rt-&gt;dst.rt_uncached_list = ul;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-	list_add_tail(&amp;rt-&gt;rt6i_uncached, &amp;ul-&gt;head);</div><div class='add'>+	list_add_tail(&amp;rt-&gt;dst.rt_uncached, &amp;ul-&gt;head);</div><div class='ctx'> 	spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt6_uncached_list_del(struct rt6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	if (!list_empty(&amp;rt-&gt;rt6i_uncached)) {</div><div class='del'>-		struct uncached_list *ul = rt-&gt;rt6i_uncached_list;</div><div class='del'>-		struct net *net = dev_net(rt-&gt;dst.dev);</div><div class='add'>+	if (!list_empty(&amp;rt-&gt;dst.rt_uncached)) {</div><div class='add'>+		struct uncached_list *ul = rt-&gt;dst.rt_uncached_list;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-		list_del(&amp;rt-&gt;rt6i_uncached);</div><div class='del'>-		atomic_dec(&amp;net-&gt;ipv6.rt6_stats-&gt;fib_rt_uncache);</div><div class='add'>+		list_del_init(&amp;rt-&gt;dst.rt_uncached);</div><div class='ctx'> 		spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt6_uncached_list_flush_dev(struct net *net, struct net_device *dev)</div><div class='add'>+static void rt6_uncached_list_flush_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *loopback_dev = net-&gt;loopback_dev;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	if (dev == loopback_dev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct uncached_list *ul = per_cpu_ptr(&amp;rt6_uncached_list, cpu);</div><div class='del'>-		struct rt6_info *rt;</div><div class='add'>+		struct rt6_info *rt, *safe;</div><div class='add'>+</div><div class='add'>+		if (list_empty(&amp;ul-&gt;head))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;ul-&gt;lock);</div><div class='del'>-		list_for_each_entry(rt, &amp;ul-&gt;head, rt6i_uncached) {</div><div class='add'>+		list_for_each_entry_safe(rt, safe, &amp;ul-&gt;head, dst.rt_uncached) {</div><div class='ctx'> 			struct inet6_dev *rt_idev = rt-&gt;rt6i_idev;</div><div class='ctx'> 			struct net_device *rt_dev = rt-&gt;dst.dev;</div><div class='add'>+			bool handled = false;</div><div class='ctx'> </div><div class='del'>-			if (rt_idev-&gt;dev == dev) {</div><div class='del'>-				rt-&gt;rt6i_idev = in6_dev_get(loopback_dev);</div><div class='add'>+			if (rt_idev &amp;&amp; rt_idev-&gt;dev == dev) {</div><div class='add'>+				rt-&gt;rt6i_idev = in6_dev_get(blackhole_netdev);</div><div class='ctx'> 				in6_dev_put(rt_idev);</div><div class='add'>+				handled = true;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (rt_dev == dev) {</div><div class='del'>-				rt-&gt;dst.dev = loopback_dev;</div><div class='del'>-				dev_hold(rt-&gt;dst.dev);</div><div class='del'>-				dev_put(rt_dev);</div><div class='add'>+				rt-&gt;dst.dev = blackhole_netdev;</div><div class='add'>+				netdev_ref_replace(rt_dev, blackhole_netdev,</div><div class='add'>+						   &amp;rt-&gt;dst.dev_tracker,</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+				handled = true;</div><div class='ctx'> 			}</div><div class='add'>+			if (handled)</div><div class='add'>+				list_del_init(&amp;rt-&gt;dst.rt_uncached);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;ul-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -210,24 +216,27 @@ struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw,</div><div class='ctx'> 	n = __ipv6_neigh_lookup(dev, daddr);</div><div class='ctx'> 	if (n)</div><div class='ctx'> 		return n;</div><div class='del'>-	return neigh_create(&amp;nd_tbl, daddr, dev);</div><div class='add'>+</div><div class='add'>+	n = neigh_create(&amp;nd_tbl, daddr, dev);</div><div class='add'>+	return IS_ERR(n) ? NULL : n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct neighbour *ip6_dst_neigh_lookup(const struct dst_entry *dst,</div><div class='ctx'> 					      struct sk_buff *skb,</div><div class='ctx'> 					      const void *daddr)</div><div class='ctx'> {</div><div class='del'>-	const struct rt6_info *rt = container_of(dst, struct rt6_info, dst);</div><div class='add'>+	const struct rt6_info *rt = dst_rt6_info(dst);</div><div class='ctx'> </div><div class='del'>-	return ip6_neigh_lookup(&amp;rt-&gt;rt6i_gateway, dst-&gt;dev, skb, daddr);</div><div class='add'>+	return ip6_neigh_lookup(rt6_nexthop(rt, &amp;in6addr_any),</div><div class='add'>+				dst_dev(dst), skb, daddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6_confirm_neigh(const struct dst_entry *dst, const void *daddr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)dst;</div><div class='add'>+	const struct rt6_info *rt = dst_rt6_info(dst);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='ctx'> </div><div class='del'>-	daddr = choose_neigh_daddr(&amp;rt-&gt;rt6i_gateway, NULL, daddr);</div><div class='add'>+	daddr = choose_neigh_daddr(rt6_nexthop(rt, &amp;in6addr_any), NULL, daddr);</div><div class='ctx'> 	if (!daddr)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (dev-&gt;flags &amp; (IFF_NOARP | IFF_LOOPBACK))</div><div class='hunk'>@@ -256,33 +265,16 @@ static struct dst_ops ip6_dst_ops_template = {</div><div class='ctx'> 	.confirm_neigh		=	ip6_confirm_neigh,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6_blackhole_mtu(const struct dst_entry *dst)</div><div class='del'>-{</div><div class='del'>-	unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='del'>-</div><div class='del'>-	return mtu ? : dst-&gt;dev-&gt;mtu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ip6_rt_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-					 struct sk_buff *skb, u32 mtu)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ip6_rt_blackhole_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct dst_ops ip6_dst_blackhole_ops = {</div><div class='del'>-	.family			=	AF_INET6,</div><div class='del'>-	.destroy		=	ip6_dst_destroy,</div><div class='del'>-	.check			=	ip6_dst_check,</div><div class='del'>-	.mtu			=	ip6_blackhole_mtu,</div><div class='del'>-	.default_advmss		=	ip6_default_advmss,</div><div class='del'>-	.update_pmtu		=	ip6_rt_blackhole_update_pmtu,</div><div class='del'>-	.redirect		=	ip6_rt_blackhole_redirect,</div><div class='del'>-	.cow_metrics		=	dst_cow_metrics_generic,</div><div class='del'>-	.neigh_lookup		=	ip6_dst_neigh_lookup,</div><div class='add'>+	.family			= AF_INET6,</div><div class='add'>+	.default_advmss		= ip6_default_advmss,</div><div class='add'>+	.neigh_lookup		= ip6_dst_neigh_lookup,</div><div class='add'>+	.check			= ip6_dst_check,</div><div class='add'>+	.destroy		= ip6_dst_destroy,</div><div class='add'>+	.cow_metrics		= dst_cow_metrics_generic,</div><div class='add'>+	.update_pmtu		= dst_blackhole_update_pmtu,</div><div class='add'>+	.redirect		= dst_blackhole_redirect,</div><div class='add'>+	.mtu			= dst_blackhole_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u32 ip6_template_metrics[RTAX_MAX] = {</div><div class='hunk'>@@ -293,14 +285,14 @@ static const struct fib6_info fib6_null_entry_template = {</div><div class='ctx'> 	.fib6_flags	= (RTF_REJECT | RTF_NONEXTHOP),</div><div class='ctx'> 	.fib6_protocol  = RTPROT_KERNEL,</div><div class='ctx'> 	.fib6_metric	= ~(u32)0,</div><div class='del'>-	.fib6_ref	= ATOMIC_INIT(1),</div><div class='add'>+	.fib6_ref	= REFCOUNT_INIT(1),</div><div class='ctx'> 	.fib6_type	= RTN_UNREACHABLE,</div><div class='ctx'> 	.fib6_metrics	= (struct dst_metrics *)&amp;dst_default_metrics,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct rt6_info ip6_null_entry_template = {</div><div class='ctx'> 	.dst = {</div><div class='del'>-		.__refcnt	= ATOMIC_INIT(1),</div><div class='add'>+		.__rcuref	= RCUREF_INIT(1),</div><div class='ctx'> 		.__use		= 1,</div><div class='ctx'> 		.obsolete	= DST_OBSOLETE_FORCE_CHK,</div><div class='ctx'> 		.error		= -ENETUNREACH,</div><div class='hunk'>@@ -314,7 +306,7 @@ static const struct rt6_info ip6_null_entry_template = {</div><div class='ctx'> </div><div class='ctx'> static const struct rt6_info ip6_prohibit_entry_template = {</div><div class='ctx'> 	.dst = {</div><div class='del'>-		.__refcnt	= ATOMIC_INIT(1),</div><div class='add'>+		.__rcuref	= RCUREF_INIT(1),</div><div class='ctx'> 		.__use		= 1,</div><div class='ctx'> 		.obsolete	= DST_OBSOLETE_FORCE_CHK,</div><div class='ctx'> 		.error		= -EACCES,</div><div class='hunk'>@@ -326,7 +318,7 @@ static const struct rt6_info ip6_prohibit_entry_template = {</div><div class='ctx'> </div><div class='ctx'> static const struct rt6_info ip6_blk_hole_entry_template = {</div><div class='ctx'> 	.dst = {</div><div class='del'>-		.__refcnt	= ATOMIC_INIT(1),</div><div class='add'>+		.__rcuref	= RCUREF_INIT(1),</div><div class='ctx'> 		.__use		= 1,</div><div class='ctx'> 		.obsolete	= DST_OBSOLETE_FORCE_CHK,</div><div class='ctx'> 		.error		= -EINVAL,</div><div class='hunk'>@@ -340,10 +332,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = {</div><div class='ctx'> </div><div class='ctx'> static void rt6_info_init(struct rt6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	struct dst_entry *dst = &amp;rt-&gt;dst;</div><div class='del'>-</div><div class='del'>-	memset(dst + 1, 0, sizeof(*rt) - sizeof(*dst));</div><div class='del'>-	INIT_LIST_HEAD(&amp;rt-&gt;rt6i_uncached);</div><div class='add'>+	memset_after(rt, 0, dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* allocate dst with ip6_dst_ops */</div><div class='hunk'>@@ -351,7 +340,7 @@ struct rt6_info *ip6_dst_alloc(struct net *net, struct net_device *dev,</div><div class='ctx'> 			       int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_info *rt = dst_alloc(&amp;net-&gt;ipv6.ip6_dst_ops, dev,</div><div class='del'>-					1, DST_OBSOLETE_FORCE_CHK, flags);</div><div class='add'>+					DST_OBSOLETE_FORCE_CHK, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (rt) {</div><div class='ctx'> 		rt6_info_init(rt);</div><div class='hunk'>@@ -364,14 +353,11 @@ EXPORT_SYMBOL(ip6_dst_alloc);</div><div class='ctx'> </div><div class='ctx'> static void ip6_dst_destroy(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(dst);</div><div class='ctx'> 	struct fib6_info *from;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='del'>-	if (p != &amp;dst_default_metrics &amp;&amp; refcount_dec_and_test(&amp;p-&gt;refcnt))</div><div class='del'>-		kfree(p);</div><div class='del'>-</div><div class='add'>+	ip_dst_metrics_put(dst);</div><div class='ctx'> 	rt6_uncached_list_del(rt);</div><div class='ctx'> </div><div class='ctx'> 	idev = rt-&gt;rt6i_idev;</div><div class='hunk'>@@ -380,36 +366,33 @@ static void ip6_dst_destroy(struct dst_entry *dst)</div><div class='ctx'> 		in6_dev_put(idev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	from = rcu_dereference(rt-&gt;from);</div><div class='del'>-	rcu_assign_pointer(rt-&gt;from, NULL);</div><div class='add'>+	from = unrcu_pointer(xchg(&amp;rt-&gt;from, NULL));</div><div class='ctx'> 	fib6_info_release(from);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,</div><div class='del'>-			   int how)</div><div class='add'>+static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(dst);</div><div class='ctx'> 	struct inet6_dev *idev = rt-&gt;rt6i_idev;</div><div class='del'>-	struct net_device *loopback_dev =</div><div class='del'>-		dev_net(dev)-&gt;loopback_dev;</div><div class='add'>+	struct fib6_info *from;</div><div class='ctx'> </div><div class='del'>-	if (idev &amp;&amp; idev-&gt;dev != loopback_dev) {</div><div class='del'>-		struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev);</div><div class='del'>-		if (loopback_idev) {</div><div class='del'>-			rt-&gt;rt6i_idev = loopback_idev;</div><div class='add'>+	if (idev &amp;&amp; idev-&gt;dev != blackhole_netdev) {</div><div class='add'>+		struct inet6_dev *blackhole_idev = in6_dev_get(blackhole_netdev);</div><div class='add'>+</div><div class='add'>+		if (blackhole_idev) {</div><div class='add'>+			rt-&gt;rt6i_idev = blackhole_idev;</div><div class='ctx'> 			in6_dev_put(idev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	from = unrcu_pointer(xchg(&amp;rt-&gt;from, NULL));</div><div class='add'>+	fib6_info_release(from);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool __rt6_check_expired(const struct rt6_info *rt)</div><div class='ctx'> {</div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; RTF_EXPIRES)</div><div class='del'>-		return time_after(jiffies, rt-&gt;dst.expires);</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='add'>+		return time_after(jiffies, READ_ONCE(rt-&gt;dst.expires));</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool rt6_check_expired(const struct rt6_info *rt)</div><div class='hunk'>@@ -419,84 +402,229 @@ static bool rt6_check_expired(const struct rt6_info *rt)</div><div class='ctx'> 	from = rcu_dereference(rt-&gt;from);</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; RTF_EXPIRES) {</div><div class='del'>-		if (time_after(jiffies, rt-&gt;dst.expires))</div><div class='add'>+		if (time_after(jiffies, READ_ONCE(rt-&gt;dst.expires)))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	} else if (from) {</div><div class='del'>-		return rt-&gt;dst.obsolete != DST_OBSOLETE_FORCE_CHK ||</div><div class='add'>+		return READ_ONCE(rt-&gt;dst.obsolete) != DST_OBSOLETE_FORCE_CHK ||</div><div class='ctx'> 			fib6_check_expired(from);</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fib6_info *fib6_multipath_select(const struct net *net,</div><div class='del'>-					struct fib6_info *match,</div><div class='del'>-					struct flowi6 *fl6, int oif,</div><div class='del'>-					const struct sk_buff *skb,</div><div class='del'>-					int strict)</div><div class='add'>+static struct fib6_info *</div><div class='add'>+rt6_multipath_first_sibling_rcu(const struct fib6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *sibling, *next_sibling;</div><div class='add'>+	struct fib6_info *iter;</div><div class='add'>+	struct fib6_node *fn;</div><div class='add'>+</div><div class='add'>+	fn = rcu_dereference(rt-&gt;fib6_node);</div><div class='add'>+	if (!fn)</div><div class='add'>+		goto out;</div><div class='add'>+	iter = rcu_dereference(fn-&gt;leaf);</div><div class='add'>+	if (!iter)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	while (iter) {</div><div class='add'>+		if (iter-&gt;fib6_metric == rt-&gt;fib6_metric &amp;&amp;</div><div class='add'>+		    rt6_qualify_for_ecmp(iter))</div><div class='add'>+			return iter;</div><div class='add'>+		iter = rcu_dereference(iter-&gt;fib6_next);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_select_path(const struct net *net, struct fib6_result *res,</div><div class='add'>+		      struct flowi6 *fl6, int oif, bool have_oif_match,</div><div class='add'>+		      const struct sk_buff *skb, int strict)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *first, *match = res-&gt;f6i;</div><div class='add'>+	struct fib6_info *sibling;</div><div class='add'>+	int hash;</div><div class='add'>+</div><div class='add'>+	if (!match-&gt;nh &amp;&amp; (!match-&gt;fib6_nsiblings || have_oif_match))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (match-&gt;nh &amp;&amp; have_oif_match &amp;&amp; res-&gt;nh)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		IP6CB(skb)-&gt;flags |= IP6SKB_MULTIPATH;</div><div class='ctx'> </div><div class='ctx'> 	/* We might have already computed the hash for ICMPv6 errors. In such</div><div class='ctx'> 	 * case it will always be non-zero. Otherwise now is the time to do it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!fl6-&gt;mp_hash)</div><div class='add'>+	if (!fl6-&gt;mp_hash &amp;&amp;</div><div class='add'>+	    (!match-&gt;nh || nexthop_is_multipath(match-&gt;nh)))</div><div class='ctx'> 		fl6-&gt;mp_hash = rt6_multipath_hash(net, fl6, skb, NULL);</div><div class='ctx'> </div><div class='del'>-	if (fl6-&gt;mp_hash &lt;= atomic_read(&amp;match-&gt;fib6_nh.nh_upper_bound))</div><div class='del'>-		return match;</div><div class='add'>+	if (unlikely(match-&gt;nh)) {</div><div class='add'>+		nexthop_path_fib6_result(res, fl6-&gt;mp_hash);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	first = rt6_multipath_first_sibling_rcu(match);</div><div class='add'>+	if (!first)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	hash = fl6-&gt;mp_hash;</div><div class='add'>+	if (hash &lt;= atomic_read(&amp;first-&gt;fib6_nh-&gt;fib_nh_upper_bound)) {</div><div class='add'>+		if (rt6_score_route(first-&gt;fib6_nh, first-&gt;fib6_flags, oif,</div><div class='add'>+				    strict) &gt;= 0)</div><div class='add'>+			match = first;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(sibling, next_sibling, &amp;match-&gt;fib6_siblings,</div><div class='del'>-				 fib6_siblings) {</div><div class='add'>+	list_for_each_entry_rcu(sibling, &amp;first-&gt;fib6_siblings,</div><div class='add'>+				fib6_siblings) {</div><div class='add'>+		const struct fib6_nh *nh = sibling-&gt;fib6_nh;</div><div class='ctx'> 		int nh_upper_bound;</div><div class='ctx'> </div><div class='del'>-		nh_upper_bound = atomic_read(&amp;sibling-&gt;fib6_nh.nh_upper_bound);</div><div class='del'>-		if (fl6-&gt;mp_hash &gt; nh_upper_bound)</div><div class='add'>+		nh_upper_bound = atomic_read(&amp;nh-&gt;fib_nh_upper_bound);</div><div class='add'>+		if (hash &gt; nh_upper_bound)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (rt6_score_route(sibling, oif, strict) &lt; 0)</div><div class='add'>+		if (rt6_score_route(nh, sibling-&gt;fib6_flags, oif, strict) &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		match = sibling;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return match;</div><div class='add'>+out:</div><div class='add'>+	res-&gt;f6i = match;</div><div class='add'>+	res-&gt;nh = match-&gt;fib6_nh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Route lookup. rcu_read_lock() should be held.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline struct fib6_info *rt6_device_match(struct net *net,</div><div class='del'>-						 struct fib6_info *rt,</div><div class='del'>-						    const struct in6_addr *saddr,</div><div class='del'>-						    int oif,</div><div class='del'>-						    int flags)</div><div class='add'>+static bool __rt6_device_match(struct net *net, const struct fib6_nh *nh,</div><div class='add'>+			       const struct in6_addr *saddr, int oif, int flags)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	dev = nh-&gt;fib_nh_dev;</div><div class='add'>+	if (oif) {</div><div class='add'>+		if (dev-&gt;ifindex == oif)</div><div class='add'>+			return true;</div><div class='add'>+	} else {</div><div class='add'>+		if (ipv6_chk_addr(net, saddr, dev,</div><div class='add'>+				  flags &amp; RT6_LOOKUP_F_IFACE))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fib6_nh_dm_arg {</div><div class='add'>+	struct net		*net;</div><div class='add'>+	const struct in6_addr	*saddr;</div><div class='add'>+	int			oif;</div><div class='add'>+	int			flags;</div><div class='add'>+	struct fib6_nh		*nh;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __rt6_nh_dev_match(struct fib6_nh *nh, void *_arg)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *sprt;</div><div class='add'>+	struct fib6_nh_dm_arg *arg = _arg;</div><div class='ctx'> </div><div class='del'>-	if (!oif &amp;&amp; ipv6_addr_any(saddr) &amp;&amp;</div><div class='del'>-	    !(rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD))</div><div class='del'>-		return rt;</div><div class='add'>+	arg-&gt;nh = nh;</div><div class='add'>+	return __rt6_device_match(arg-&gt;net, nh, arg-&gt;saddr, arg-&gt;oif,</div><div class='add'>+				  arg-&gt;flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (sprt = rt; sprt; sprt = rcu_dereference(sprt-&gt;fib6_next)) {</div><div class='del'>-		const struct net_device *dev = sprt-&gt;fib6_nh.nh_dev;</div><div class='add'>+/* returns fib6_nh from nexthop or NULL */</div><div class='add'>+static struct fib6_nh *rt6_nh_dev_match(struct net *net, struct nexthop *nh,</div><div class='add'>+					struct fib6_result *res,</div><div class='add'>+					const struct in6_addr *saddr,</div><div class='add'>+					int oif, int flags)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_dm_arg arg = {</div><div class='add'>+		.net   = net,</div><div class='add'>+		.saddr = saddr,</div><div class='add'>+		.oif   = oif,</div><div class='add'>+		.flags = flags,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		if (sprt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='del'>-			continue;</div><div class='add'>+	if (nexthop_is_blackhole(nh))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (nexthop_for_each_fib6_nh(nh, __rt6_nh_dev_match, &amp;arg))</div><div class='add'>+		return arg.nh;</div><div class='ctx'> </div><div class='del'>-		if (oif) {</div><div class='del'>-			if (dev-&gt;ifindex == oif)</div><div class='del'>-				return sprt;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rt6_device_match(struct net *net, struct fib6_result *res,</div><div class='add'>+			     const struct in6_addr *saddr, int oif, int flags)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='add'>+	struct fib6_info *spf6i;</div><div class='add'>+	struct fib6_nh *nh;</div><div class='add'>+</div><div class='add'>+	if (!oif &amp;&amp; ipv6_addr_any(saddr)) {</div><div class='add'>+		if (unlikely(f6i-&gt;nh)) {</div><div class='add'>+			nh = nexthop_fib6_nh(f6i-&gt;nh);</div><div class='add'>+			if (nexthop_is_blackhole(f6i-&gt;nh))</div><div class='add'>+				goto out_blackhole;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (ipv6_chk_addr(net, saddr, dev,</div><div class='del'>-					  flags &amp; RT6_LOOKUP_F_IFACE))</div><div class='del'>-				return sprt;</div><div class='add'>+			nh = f6i-&gt;fib6_nh;</div><div class='ctx'> 		}</div><div class='add'>+		if (!(nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD))</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (oif &amp;&amp; flags &amp; RT6_LOOKUP_F_IFACE)</div><div class='del'>-		return net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+	for (spf6i = f6i; spf6i; spf6i = rcu_dereference(spf6i-&gt;fib6_next)) {</div><div class='add'>+		bool matched = false;</div><div class='ctx'> </div><div class='del'>-	return rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD ? net-&gt;ipv6.fib6_null_entry : rt;</div><div class='add'>+		if (unlikely(spf6i-&gt;nh)) {</div><div class='add'>+			nh = rt6_nh_dev_match(net, spf6i-&gt;nh, res, saddr,</div><div class='add'>+					      oif, flags);</div><div class='add'>+			if (nh)</div><div class='add'>+				matched = true;</div><div class='add'>+		} else {</div><div class='add'>+			nh = spf6i-&gt;fib6_nh;</div><div class='add'>+			if (__rt6_device_match(net, nh, saddr, oif, flags))</div><div class='add'>+				matched = true;</div><div class='add'>+		}</div><div class='add'>+		if (matched) {</div><div class='add'>+			res-&gt;f6i = spf6i;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oif &amp;&amp; flags &amp; RT6_LOOKUP_F_IFACE) {</div><div class='add'>+		res-&gt;f6i = net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+		nh = res-&gt;f6i-&gt;fib6_nh;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(f6i-&gt;nh)) {</div><div class='add'>+		nh = nexthop_fib6_nh(f6i-&gt;nh);</div><div class='add'>+		if (nexthop_is_blackhole(f6i-&gt;nh))</div><div class='add'>+			goto out_blackhole;</div><div class='add'>+	} else {</div><div class='add'>+		nh = f6i-&gt;fib6_nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD) {</div><div class='add'>+		res-&gt;f6i = net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+		nh = res-&gt;f6i-&gt;fib6_nh;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	res-&gt;nh = nh;</div><div class='add'>+	res-&gt;fib6_type = res-&gt;f6i-&gt;fib6_type;</div><div class='add'>+	res-&gt;fib6_flags = res-&gt;f6i-&gt;fib6_flags;</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_blackhole:</div><div class='add'>+	res-&gt;fib6_flags |= RTF_REJECT;</div><div class='add'>+	res-&gt;fib6_type = RTN_BLACKHOLE;</div><div class='add'>+	res-&gt;nh = nh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='hunk'>@@ -504,6 +632,7 @@ struct __rt6_probe_work {</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	struct in6_addr target;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	netdevice_tracker dev_tracker;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void rt6_probe_deferred(struct work_struct *w)</div><div class='hunk'>@@ -514,16 +643,18 @@ static void rt6_probe_deferred(struct work_struct *w)</div><div class='ctx'> </div><div class='ctx'> 	addrconf_addr_solict_mult(&amp;work-&gt;target, &amp;mcaddr);</div><div class='ctx'> 	ndisc_send_ns(work-&gt;dev, &amp;work-&gt;target, &amp;mcaddr, NULL, 0);</div><div class='del'>-	dev_put(work-&gt;dev);</div><div class='add'>+	netdev_put(work-&gt;dev, &amp;work-&gt;dev_tracker);</div><div class='ctx'> 	kfree(work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt6_probe(struct fib6_info *rt)</div><div class='add'>+static void rt6_probe(struct fib6_nh *fib6_nh)</div><div class='ctx'> {</div><div class='del'>-	struct __rt6_probe_work *work;</div><div class='add'>+	struct __rt6_probe_work *work = NULL;</div><div class='ctx'> 	const struct in6_addr *nh_gw;</div><div class='add'>+	unsigned long last_probe;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Okay, this does not seem to be appropriate</div><div class='hunk'>@@ -533,47 +664,52 @@ static void rt6_probe(struct fib6_info *rt)</div><div class='ctx'> 	 * Router Reachability Probe MUST be rate-limited</div><div class='ctx'> 	 * to no more than one per minute.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!rt || !(rt-&gt;fib6_flags &amp; RTF_GATEWAY))</div><div class='add'>+	if (!fib6_nh-&gt;fib_nh_gw_family)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	nh_gw = &amp;rt-&gt;fib6_nh.nh_gw;</div><div class='del'>-	dev = rt-&gt;fib6_nh.nh_dev;</div><div class='del'>-	rcu_read_lock_bh();</div><div class='add'>+	nh_gw = &amp;fib6_nh-&gt;fib_nh_gw6;</div><div class='add'>+	dev = fib6_nh-&gt;fib_nh_dev;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	last_probe = READ_ONCE(fib6_nh-&gt;last_probe);</div><div class='add'>+	idev = __in6_dev_get(dev);</div><div class='add'>+	if (!idev)</div><div class='add'>+		goto out;</div><div class='ctx'> 	neigh = __ipv6_neigh_lookup_noref(dev, nh_gw);</div><div class='ctx'> 	if (neigh) {</div><div class='del'>-		struct inet6_dev *idev;</div><div class='del'>-</div><div class='del'>-		if (neigh-&gt;nud_state &amp; NUD_VALID)</div><div class='add'>+		if (READ_ONCE(neigh-&gt;nud_state) &amp; NUD_VALID)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		idev = __in6_dev_get(dev);</div><div class='del'>-		work = NULL;</div><div class='del'>-		write_lock(&amp;neigh-&gt;lock);</div><div class='add'>+		write_lock_bh(&amp;neigh-&gt;lock);</div><div class='ctx'> 		if (!(neigh-&gt;nud_state &amp; NUD_VALID) &amp;&amp;</div><div class='ctx'> 		    time_after(jiffies,</div><div class='del'>-			       neigh-&gt;updated + idev-&gt;cnf.rtr_probe_interval)) {</div><div class='add'>+			       neigh-&gt;updated +</div><div class='add'>+			       READ_ONCE(idev-&gt;cnf.rtr_probe_interval))) {</div><div class='ctx'> 			work = kmalloc(sizeof(*work), GFP_ATOMIC);</div><div class='ctx'> 			if (work)</div><div class='ctx'> 				__neigh_set_probe_once(neigh);</div><div class='ctx'> 		}</div><div class='del'>-		write_unlock(&amp;neigh-&gt;lock);</div><div class='del'>-	} else {</div><div class='add'>+		write_unlock_bh(&amp;neigh-&gt;lock);</div><div class='add'>+	} else if (time_after(jiffies, last_probe +</div><div class='add'>+				       READ_ONCE(idev-&gt;cnf.rtr_probe_interval))) {</div><div class='ctx'> 		work = kmalloc(sizeof(*work), GFP_ATOMIC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (work) {</div><div class='add'>+	if (!work || cmpxchg(&amp;fib6_nh-&gt;last_probe,</div><div class='add'>+			     last_probe, jiffies) != last_probe) {</div><div class='add'>+		kfree(work);</div><div class='add'>+	} else {</div><div class='ctx'> 		INIT_WORK(&amp;work-&gt;work, rt6_probe_deferred);</div><div class='ctx'> 		work-&gt;target = *nh_gw;</div><div class='del'>-		dev_hold(dev);</div><div class='add'>+		netdev_hold(dev, &amp;work-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 		work-&gt;dev = dev;</div><div class='ctx'> 		schedule_work(&amp;work-&gt;work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline void rt6_probe(struct fib6_info *rt)</div><div class='add'>+static inline void rt6_probe(struct fib6_nh *fib6_nh)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -581,99 +717,72 @@ static inline void rt6_probe(struct fib6_info *rt)</div><div class='ctx'> /*</div><div class='ctx'>  * Default Router Selection (RFC 2461 6.3.6)</div><div class='ctx'>  */</div><div class='del'>-static inline int rt6_check_dev(struct fib6_info *rt, int oif)</div><div class='del'>-{</div><div class='del'>-	const struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='del'>-</div><div class='del'>-	if (!oif || dev-&gt;ifindex == oif)</div><div class='del'>-		return 2;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum rt6_nud_state rt6_check_neigh(struct fib6_info *rt)</div><div class='add'>+static enum rt6_nud_state rt6_check_neigh(const struct fib6_nh *fib6_nh)</div><div class='ctx'> {</div><div class='ctx'> 	enum rt6_nud_state ret = RT6_NUD_FAIL_HARD;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_flags &amp; RTF_NONEXTHOP ||</div><div class='del'>-	    !(rt-&gt;fib6_flags &amp; RTF_GATEWAY))</div><div class='del'>-		return RT6_NUD_SUCCEED;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock_bh();</div><div class='del'>-	neigh = __ipv6_neigh_lookup_noref(rt-&gt;fib6_nh.nh_dev,</div><div class='del'>-					  &amp;rt-&gt;fib6_nh.nh_gw);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	neigh = __ipv6_neigh_lookup_noref(fib6_nh-&gt;fib_nh_dev,</div><div class='add'>+					  &amp;fib6_nh-&gt;fib_nh_gw6);</div><div class='ctx'> 	if (neigh) {</div><div class='del'>-		read_lock(&amp;neigh-&gt;lock);</div><div class='del'>-		if (neigh-&gt;nud_state &amp; NUD_VALID)</div><div class='add'>+		u8 nud_state = READ_ONCE(neigh-&gt;nud_state);</div><div class='add'>+</div><div class='add'>+		if (nud_state &amp; NUD_VALID)</div><div class='ctx'> 			ret = RT6_NUD_SUCCEED;</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='del'>-		else if (!(neigh-&gt;nud_state &amp; NUD_FAILED))</div><div class='add'>+		else if (!(nud_state &amp; NUD_FAILED))</div><div class='ctx'> 			ret = RT6_NUD_SUCCEED;</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = RT6_NUD_FAIL_PROBE;</div><div class='ctx'> #endif</div><div class='del'>-		read_unlock(&amp;neigh-&gt;lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = IS_ENABLED(CONFIG_IPV6_ROUTER_PREF) ?</div><div class='ctx'> 		      RT6_NUD_SUCCEED : RT6_NUD_FAIL_DO_RR;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock_bh();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rt6_score_route(struct fib6_info *rt, int oif, int strict)</div><div class='add'>+static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,</div><div class='add'>+			   int strict)</div><div class='ctx'> {</div><div class='del'>-	int m;</div><div class='add'>+	int m = 0;</div><div class='add'>+</div><div class='add'>+	if (!oif || nh-&gt;fib_nh_dev-&gt;ifindex == oif)</div><div class='add'>+		m = 2;</div><div class='ctx'> </div><div class='del'>-	m = rt6_check_dev(rt, oif);</div><div class='ctx'> 	if (!m &amp;&amp; (strict &amp; RT6_LOOKUP_F_IFACE))</div><div class='ctx'> 		return RT6_NUD_FAIL_HARD;</div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='del'>-	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt-&gt;fib6_flags)) &lt;&lt; 2;</div><div class='add'>+	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(fib6_flags)) &lt;&lt; 2;</div><div class='ctx'> #endif</div><div class='del'>-	if (strict &amp; RT6_LOOKUP_F_REACHABLE) {</div><div class='del'>-		int n = rt6_check_neigh(rt);</div><div class='add'>+	if ((strict &amp; RT6_LOOKUP_F_REACHABLE) &amp;&amp;</div><div class='add'>+	    !(fib6_flags &amp; RTF_NONEXTHOP) &amp;&amp; nh-&gt;fib_nh_gw_family) {</div><div class='add'>+		int n = rt6_check_neigh(nh);</div><div class='ctx'> 		if (n &lt; 0)</div><div class='ctx'> 			return n;</div><div class='ctx'> 	}</div><div class='ctx'> 	return m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called with rc_read_lock held */</div><div class='del'>-static inline bool fib6_ignore_linkdown(const struct fib6_info *f6i)</div><div class='add'>+static bool find_match(struct fib6_nh *nh, u32 fib6_flags,</div><div class='add'>+		       int oif, int strict, int *mpri, bool *do_rr)</div><div class='ctx'> {</div><div class='del'>-	const struct net_device *dev = fib6_info_nh_dev(f6i);</div><div class='add'>+	bool match_do_rr = false;</div><div class='ctx'> 	bool rc = false;</div><div class='del'>-</div><div class='del'>-	if (dev) {</div><div class='del'>-		const struct inet6_dev *idev = __in6_dev_get(dev);</div><div class='del'>-</div><div class='del'>-		rc = !!idev-&gt;cnf.ignore_routes_with_linkdown;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct fib6_info *find_match(struct fib6_info *rt, int oif, int strict,</div><div class='del'>-				   int *mpri, struct fib6_info *match,</div><div class='del'>-				   bool *do_rr)</div><div class='del'>-{</div><div class='ctx'> 	int m;</div><div class='del'>-	bool match_do_rr = false;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (fib6_ignore_linkdown(rt) &amp;&amp;</div><div class='del'>-	    rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='add'>+	if (ip6_ignore_linkdown(nh-&gt;fib_nh_dev) &amp;&amp;</div><div class='add'>+	    nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='ctx'> 	    !(strict &amp; RT6_LOOKUP_F_IGNORE_LINKSTATE))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (fib6_check_expired(rt))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	m = rt6_score_route(rt, oif, strict);</div><div class='add'>+	m = rt6_score_route(nh, fib6_flags, oif, strict);</div><div class='ctx'> 	if (m == RT6_NUD_FAIL_DO_RR) {</div><div class='ctx'> 		match_do_rr = true;</div><div class='ctx'> 		m = 0; /* lowest valid score */</div><div class='hunk'>@@ -682,67 +791,127 @@ static struct fib6_info *find_match(struct fib6_info *rt, int oif, int strict,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (strict &amp; RT6_LOOKUP_F_REACHABLE)</div><div class='del'>-		rt6_probe(rt);</div><div class='add'>+		rt6_probe(nh);</div><div class='ctx'> </div><div class='ctx'> 	/* note that m can be RT6_NUD_FAIL_PROBE at this point */</div><div class='ctx'> 	if (m &gt; *mpri) {</div><div class='ctx'> 		*do_rr = match_do_rr;</div><div class='ctx'> 		*mpri = m;</div><div class='del'>-		match = rt;</div><div class='add'>+		rc = true;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return match;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *find_rr_leaf(struct fib6_node *fn,</div><div class='del'>-				     struct fib6_info *leaf,</div><div class='del'>-				     struct fib6_info *rr_head,</div><div class='del'>-				     u32 metric, int oif, int strict,</div><div class='del'>-				     bool *do_rr)</div><div class='add'>+struct fib6_nh_frl_arg {</div><div class='add'>+	u32		flags;</div><div class='add'>+	int		oif;</div><div class='add'>+	int		strict;</div><div class='add'>+	int		*mpri;</div><div class='add'>+	bool		*do_rr;</div><div class='add'>+	struct fib6_nh	*nh;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rt6_nh_find_match(struct fib6_nh *nh, void *_arg)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *rt, *match, *cont;</div><div class='del'>-	int mpri = -1;</div><div class='add'>+	struct fib6_nh_frl_arg *arg = _arg;</div><div class='ctx'> </div><div class='del'>-	match = NULL;</div><div class='del'>-	cont = NULL;</div><div class='del'>-	for (rt = rr_head; rt; rt = rcu_dereference(rt-&gt;fib6_next)) {</div><div class='del'>-		if (rt-&gt;fib6_metric != metric) {</div><div class='del'>-			cont = rt;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	arg-&gt;nh = nh;</div><div class='add'>+	return find_match(nh, arg-&gt;flags, arg-&gt;oif, arg-&gt;strict,</div><div class='add'>+			  arg-&gt;mpri, arg-&gt;do_rr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		match = find_match(rt, oif, strict, &amp;mpri, match, do_rr);</div><div class='del'>-	}</div><div class='add'>+static void __find_rr_leaf(struct fib6_info *f6i_start,</div><div class='add'>+			   struct fib6_info *nomatch, u32 metric,</div><div class='add'>+			   struct fib6_result *res, struct fib6_info **cont,</div><div class='add'>+			   int oif, int strict, bool *do_rr, int *mpri)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i;</div><div class='ctx'> </div><div class='del'>-	for (rt = leaf; rt &amp;&amp; rt != rr_head;</div><div class='del'>-	     rt = rcu_dereference(rt-&gt;fib6_next)) {</div><div class='del'>-		if (rt-&gt;fib6_metric != metric) {</div><div class='del'>-			cont = rt;</div><div class='del'>-			break;</div><div class='add'>+	for (f6i = f6i_start;</div><div class='add'>+	     f6i &amp;&amp; f6i != nomatch;</div><div class='add'>+	     f6i = rcu_dereference(f6i-&gt;fib6_next)) {</div><div class='add'>+		bool matched = false;</div><div class='add'>+		struct fib6_nh *nh;</div><div class='add'>+</div><div class='add'>+		if (cont &amp;&amp; f6i-&gt;fib6_metric != metric) {</div><div class='add'>+			*cont = f6i;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		match = find_match(rt, oif, strict, &amp;mpri, match, do_rr);</div><div class='add'>+		if (fib6_check_expired(f6i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (unlikely(f6i-&gt;nh)) {</div><div class='add'>+			struct fib6_nh_frl_arg arg = {</div><div class='add'>+				.flags  = f6i-&gt;fib6_flags,</div><div class='add'>+				.oif    = oif,</div><div class='add'>+				.strict = strict,</div><div class='add'>+				.mpri   = mpri,</div><div class='add'>+				.do_rr  = do_rr</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			if (nexthop_is_blackhole(f6i-&gt;nh)) {</div><div class='add'>+				res-&gt;fib6_flags = RTF_REJECT;</div><div class='add'>+				res-&gt;fib6_type = RTN_BLACKHOLE;</div><div class='add'>+				res-&gt;f6i = f6i;</div><div class='add'>+				res-&gt;nh = nexthop_fib6_nh(f6i-&gt;nh);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			if (nexthop_for_each_fib6_nh(f6i-&gt;nh, rt6_nh_find_match,</div><div class='add'>+						     &amp;arg)) {</div><div class='add'>+				matched = true;</div><div class='add'>+				nh = arg.nh;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			nh = f6i-&gt;fib6_nh;</div><div class='add'>+			if (find_match(nh, f6i-&gt;fib6_flags, oif, strict,</div><div class='add'>+				       mpri, do_rr))</div><div class='add'>+				matched = true;</div><div class='add'>+		}</div><div class='add'>+		if (matched) {</div><div class='add'>+			res-&gt;f6i = f6i;</div><div class='add'>+			res-&gt;nh = nh;</div><div class='add'>+			res-&gt;fib6_flags = f6i-&gt;fib6_flags;</div><div class='add'>+			res-&gt;fib6_type = f6i-&gt;fib6_type;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (match || !cont)</div><div class='del'>-		return match;</div><div class='add'>+static void find_rr_leaf(struct fib6_node *fn, struct fib6_info *leaf,</div><div class='add'>+			 struct fib6_info *rr_head, int oif, int strict,</div><div class='add'>+			 bool *do_rr, struct fib6_result *res)</div><div class='add'>+{</div><div class='add'>+	u32 metric = rr_head-&gt;fib6_metric;</div><div class='add'>+	struct fib6_info *cont = NULL;</div><div class='add'>+	int mpri = -1;</div><div class='add'>+</div><div class='add'>+	__find_rr_leaf(rr_head, NULL, metric, res, &amp;cont,</div><div class='add'>+		       oif, strict, do_rr, &amp;mpri);</div><div class='ctx'> </div><div class='del'>-	for (rt = cont; rt; rt = rcu_dereference(rt-&gt;fib6_next))</div><div class='del'>-		match = find_match(rt, oif, strict, &amp;mpri, match, do_rr);</div><div class='add'>+	__find_rr_leaf(leaf, rr_head, metric, res, &amp;cont,</div><div class='add'>+		       oif, strict, do_rr, &amp;mpri);</div><div class='ctx'> </div><div class='del'>-	return match;</div><div class='add'>+	if (res-&gt;f6i || !cont)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__find_rr_leaf(cont, NULL, metric, res, NULL,</div><div class='add'>+		       oif, strict, do_rr, &amp;mpri);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *rt6_select(struct net *net, struct fib6_node *fn,</div><div class='del'>-				   int oif, int strict)</div><div class='add'>+static void rt6_select(struct net *net, struct fib6_node *fn, int oif,</div><div class='add'>+		       struct fib6_result *res, int strict)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *leaf = rcu_dereference(fn-&gt;leaf);</div><div class='del'>-	struct fib6_info *match, *rt0;</div><div class='add'>+	struct fib6_info *rt0;</div><div class='ctx'> 	bool do_rr = false;</div><div class='ctx'> 	int key_plen;</div><div class='ctx'> </div><div class='add'>+	/* make sure this function or its helpers sets f6i */</div><div class='add'>+	res-&gt;f6i = NULL;</div><div class='add'>+</div><div class='ctx'> 	if (!leaf || leaf == net-&gt;ipv6.fib6_null_entry)</div><div class='del'>-		return net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rt0 = rcu_dereference(fn-&gt;rr_ptr);</div><div class='ctx'> 	if (!rt0)</div><div class='hunk'>@@ -759,11 +928,9 @@ static struct fib6_info *rt6_select(struct net *net, struct fib6_node *fn,</div><div class='ctx'> 		key_plen = rt0-&gt;fib6_src.plen;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (fn-&gt;fn_bit != key_plen)</div><div class='del'>-		return net-&gt;ipv6.fib6_null_entry;</div><div class='del'>-</div><div class='del'>-	match = find_rr_leaf(fn, leaf, rt0, rt0-&gt;fib6_metric, oif, strict,</div><div class='del'>-			     &amp;do_rr);</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+	find_rr_leaf(fn, leaf, rt0, oif, strict, &amp;do_rr, res);</div><div class='ctx'> 	if (do_rr) {</div><div class='ctx'> 		struct fib6_info *next = rcu_dereference(rt0-&gt;fib6_next);</div><div class='ctx'> </div><div class='hunk'>@@ -780,12 +947,19 @@ static struct fib6_info *rt6_select(struct net *net, struct fib6_node *fn,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return match ? match : net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+out:</div><div class='add'>+	if (!res-&gt;f6i) {</div><div class='add'>+		res-&gt;f6i = net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+		res-&gt;nh = res-&gt;f6i-&gt;fib6_nh;</div><div class='add'>+		res-&gt;fib6_flags = res-&gt;f6i-&gt;fib6_flags;</div><div class='add'>+		res-&gt;fib6_type = res-&gt;f6i-&gt;fib6_type;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool rt6_is_gw_or_nonexthop(const struct fib6_info *rt)</div><div class='add'>+static bool rt6_is_gw_or_nonexthop(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	return (rt-&gt;fib6_flags &amp; (RTF_NONEXTHOP | RTF_GATEWAY));</div><div class='add'>+	return (res-&gt;f6i-&gt;fib6_flags &amp; RTF_NONEXTHOP) ||</div><div class='add'>+	       res-&gt;nh-&gt;fib_nh_gw_family;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_ROUTE_INFO</div><div class='hunk'>@@ -795,6 +969,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct route_info *rinfo = (struct route_info *) opt;</div><div class='ctx'> 	struct in6_addr prefix_buf, *prefix;</div><div class='add'>+	struct fib6_table *table;</div><div class='ctx'> 	unsigned int pref;</div><div class='ctx'> 	unsigned long lifetime;</div><div class='ctx'> 	struct fib6_info *rt;</div><div class='hunk'>@@ -841,7 +1016,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,</div><div class='ctx'> 					gwaddr, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (rt &amp;&amp; !lifetime) {</div><div class='del'>-		ip6_del_rt(net, rt);</div><div class='add'>+		ip6_del_rt(net, rt, false);</div><div class='ctx'> 		rt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -853,10 +1028,18 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,</div><div class='ctx'> 				 (rt-&gt;fib6_flags &amp; ~RTF_PREF_MASK) | RTF_PREF(pref);</div><div class='ctx'> </div><div class='ctx'> 	if (rt) {</div><div class='del'>-		if (!addrconf_finite_timeout(lifetime))</div><div class='add'>+		table = rt-&gt;fib6_table;</div><div class='add'>+		spin_lock_bh(&amp;table-&gt;tb6_lock);</div><div class='add'>+</div><div class='add'>+		if (!addrconf_finite_timeout(lifetime)) {</div><div class='ctx'> 			fib6_clean_expires(rt);</div><div class='del'>-		else</div><div class='add'>+			fib6_remove_gc_list(rt);</div><div class='add'>+		} else {</div><div class='ctx'> 			fib6_set_expires(rt, jiffies + HZ * lifetime);</div><div class='add'>+			fib6_add_gc_list(rt);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;table-&gt;tb6_lock);</div><div class='ctx'> </div><div class='ctx'> 		fib6_info_release(rt);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -869,17 +1052,17 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_lock held */</div><div class='del'>-static struct net_device *ip6_rt_get_dev_rcu(struct fib6_info *rt)</div><div class='add'>+static struct net_device *ip6_rt_get_dev_rcu(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+	struct net_device *dev = res-&gt;nh-&gt;fib_nh_dev;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_flags &amp; (RTF_LOCAL | RTF_ANYCAST)) {</div><div class='add'>+	if (res-&gt;fib6_flags &amp; (RTF_LOCAL | RTF_ANYCAST)) {</div><div class='ctx'> 		/* for copies of local routes, dst-&gt;dev needs to be the</div><div class='ctx'> 		 * device if it is a master device, the master device if</div><div class='ctx'> 		 * device is enslaved, and the loopback as the default</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (netif_is_l3_slave(dev) &amp;&amp;</div><div class='del'>-		    !rt6_need_strict(&amp;rt-&gt;fib6_dst.addr))</div><div class='add'>+		    !rt6_need_strict(&amp;res-&gt;f6i-&gt;fib6_dst.addr))</div><div class='ctx'> 			dev = l3mdev_master_dev_rcu(dev);</div><div class='ctx'> 		else if (!netif_is_l3_master(dev))</div><div class='ctx'> 			dev = dev_net(dev)-&gt;loopback_dev;</div><div class='hunk'>@@ -919,17 +1102,15 @@ static unsigned short fib6_info_dst_flags(struct fib6_info *rt)</div><div class='ctx'> 		flags |= DST_NOCOUNT;</div><div class='ctx'> 	if (rt-&gt;dst_nopolicy)</div><div class='ctx'> 		flags |= DST_NOPOLICY;</div><div class='del'>-	if (rt-&gt;dst_host)</div><div class='del'>-		flags |= DST_HOST;</div><div class='ctx'> </div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip6_rt_init_dst_reject(struct rt6_info *rt, struct fib6_info *ort)</div><div class='add'>+static void ip6_rt_init_dst_reject(struct rt6_info *rt, u8 fib6_type)</div><div class='ctx'> {</div><div class='del'>-	rt-&gt;dst.error = ip6_rt_type_to_error(ort-&gt;fib6_type);</div><div class='add'>+	rt-&gt;dst.error = ip6_rt_type_to_error(fib6_type);</div><div class='ctx'> </div><div class='del'>-	switch (ort-&gt;fib6_type) {</div><div class='add'>+	switch (fib6_type) {</div><div class='ctx'> 	case RTN_BLACKHOLE:</div><div class='ctx'> 		rt-&gt;dst.output = dst_discard_out;</div><div class='ctx'> 		rt-&gt;dst.input = dst_discard;</div><div class='hunk'>@@ -947,26 +1128,29 @@ static void ip6_rt_init_dst_reject(struct rt6_info *rt, struct fib6_info *ort)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip6_rt_init_dst(struct rt6_info *rt, struct fib6_info *ort)</div><div class='add'>+static void ip6_rt_init_dst(struct rt6_info *rt, const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	if (ort-&gt;fib6_flags &amp; RTF_REJECT) {</div><div class='del'>-		ip6_rt_init_dst_reject(rt, ort);</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='add'>+</div><div class='add'>+	if (res-&gt;fib6_flags &amp; RTF_REJECT) {</div><div class='add'>+		ip6_rt_init_dst_reject(rt, res-&gt;fib6_type);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rt-&gt;dst.error = 0;</div><div class='ctx'> 	rt-&gt;dst.output = ip6_output;</div><div class='ctx'> </div><div class='del'>-	if (ort-&gt;fib6_type == RTN_LOCAL || ort-&gt;fib6_type == RTN_ANYCAST) {</div><div class='add'>+	if (res-&gt;fib6_type == RTN_LOCAL || res-&gt;fib6_type == RTN_ANYCAST) {</div><div class='ctx'> 		rt-&gt;dst.input = ip6_input;</div><div class='del'>-	} else if (ipv6_addr_type(&amp;ort-&gt;fib6_dst.addr) &amp; IPV6_ADDR_MULTICAST) {</div><div class='add'>+	} else if (ipv6_addr_type(&amp;f6i-&gt;fib6_dst.addr) &amp; IPV6_ADDR_MULTICAST) {</div><div class='ctx'> 		rt-&gt;dst.input = ip6_mc_input;</div><div class='add'>+		rt-&gt;dst.output = ip6_mr_output;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rt-&gt;dst.input = ip6_forward;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ort-&gt;fib6_nh.nh_lwtstate) {</div><div class='del'>-		rt-&gt;dst.lwtstate = lwtstate_get(ort-&gt;fib6_nh.nh_lwtstate);</div><div class='add'>+	if (res-&gt;nh-&gt;fib_nh_lws) {</div><div class='add'>+		rt-&gt;dst.lwtstate = lwtstate_get(res-&gt;nh-&gt;fib_nh_lws);</div><div class='ctx'> 		lwtunnel_set_redirect(&amp;rt-&gt;dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -978,29 +1162,29 @@ static void rt6_set_from(struct rt6_info *rt, struct fib6_info *from)</div><div class='ctx'> {</div><div class='ctx'> 	rt-&gt;rt6i_flags &amp;= ~RTF_EXPIRES;</div><div class='ctx'> 	rcu_assign_pointer(rt-&gt;from, from);</div><div class='del'>-	dst_init_metrics(&amp;rt-&gt;dst, from-&gt;fib6_metrics-&gt;metrics, true);</div><div class='del'>-	if (from-&gt;fib6_metrics != &amp;dst_default_metrics) {</div><div class='del'>-		rt-&gt;dst._metrics |= DST_METRICS_REFCOUNTED;</div><div class='del'>-		refcount_inc(&amp;from-&gt;fib6_metrics-&gt;refcnt);</div><div class='del'>-	}</div><div class='add'>+	ip_dst_init_metrics(&amp;rt-&gt;dst, from-&gt;fib6_metrics);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller must already hold reference to @ort */</div><div class='del'>-static void ip6_rt_copy_init(struct rt6_info *rt, struct fib6_info *ort)</div><div class='add'>+/* Caller must already hold reference to f6i in result */</div><div class='add'>+static void ip6_rt_copy_init(struct rt6_info *rt, const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = fib6_info_nh_dev(ort);</div><div class='add'>+	const struct fib6_nh *nh = res-&gt;nh;</div><div class='add'>+	const struct net_device *dev = nh-&gt;fib_nh_dev;</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='ctx'> </div><div class='del'>-	ip6_rt_init_dst(rt, ort);</div><div class='add'>+	ip6_rt_init_dst(rt, res);</div><div class='ctx'> </div><div class='del'>-	rt-&gt;rt6i_dst = ort-&gt;fib6_dst;</div><div class='add'>+	rt-&gt;rt6i_dst = f6i-&gt;fib6_dst;</div><div class='ctx'> 	rt-&gt;rt6i_idev = dev ? in6_dev_get(dev) : NULL;</div><div class='del'>-	rt-&gt;rt6i_gateway = ort-&gt;fib6_nh.nh_gw;</div><div class='del'>-	rt-&gt;rt6i_flags = ort-&gt;fib6_flags;</div><div class='del'>-	rt6_set_from(rt, ort);</div><div class='add'>+	rt-&gt;rt6i_flags = res-&gt;fib6_flags;</div><div class='add'>+	if (nh-&gt;fib_nh_gw_family) {</div><div class='add'>+		rt-&gt;rt6i_gateway = nh-&gt;fib_nh_gw6;</div><div class='add'>+		rt-&gt;rt6i_flags |= RTF_GATEWAY;</div><div class='add'>+	}</div><div class='add'>+	rt6_set_from(rt, f6i);</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	rt-&gt;rt6i_src = ort-&gt;fib6_src;</div><div class='add'>+	rt-&gt;rt6i_src = f6i-&gt;fib6_src;</div><div class='ctx'> #endif</div><div class='del'>-	rt-&gt;rt6i_prefsrc = ort-&gt;fib6_prefsrc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fib6_node* fib6_backtrack(struct fib6_node *fn,</div><div class='hunk'>@@ -1021,14 +1205,13 @@ static struct fib6_node* fib6_backtrack(struct fib6_node *fn,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ip6_hold_safe(struct net *net, struct rt6_info **prt,</div><div class='del'>-			  bool null_fallback)</div><div class='add'>+static bool ip6_hold_safe(struct net *net, struct rt6_info **prt)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_info *rt = *prt;</div><div class='ctx'> </div><div class='ctx'> 	if (dst_hold_safe(&amp;rt-&gt;dst))</div><div class='ctx'> 		return true;</div><div class='del'>-	if (null_fallback) {</div><div class='add'>+	if (net) {</div><div class='ctx'> 		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='ctx'> 		dst_hold(&amp;rt-&gt;dst);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1039,75 +1222,80 @@ static bool ip6_hold_safe(struct net *net, struct rt6_info **prt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_lock held */</div><div class='del'>-static struct rt6_info *ip6_create_rt_rcu(struct fib6_info *rt)</div><div class='add'>+static struct rt6_info *ip6_create_rt_rcu(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	unsigned short flags = fib6_info_dst_flags(rt);</div><div class='del'>-	struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+	struct net_device *dev = res-&gt;nh-&gt;fib_nh_dev;</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='add'>+	unsigned short flags;</div><div class='ctx'> 	struct rt6_info *nrt;</div><div class='ctx'> </div><div class='del'>-	if (!fib6_info_hold_safe(rt))</div><div class='del'>-		return NULL;</div><div class='add'>+	if (!fib6_info_hold_safe(f6i))</div><div class='add'>+		goto fallback;</div><div class='ctx'> </div><div class='add'>+	flags = fib6_info_dst_flags(f6i);</div><div class='ctx'> 	nrt = ip6_dst_alloc(dev_net(dev), dev, flags);</div><div class='del'>-	if (nrt)</div><div class='del'>-		ip6_rt_copy_init(nrt, rt);</div><div class='del'>-	else</div><div class='del'>-		fib6_info_release(rt);</div><div class='add'>+	if (!nrt) {</div><div class='add'>+		fib6_info_release(f6i);</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ip6_rt_copy_init(nrt, res);</div><div class='add'>+	return nrt;</div><div class='ctx'> </div><div class='add'>+fallback:</div><div class='add'>+	nrt = dev_net(dev)-&gt;ipv6.ip6_null_entry;</div><div class='add'>+	dst_hold(&amp;nrt-&gt;dst);</div><div class='ctx'> 	return nrt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *ip6_pol_route_lookup(struct net *net,</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct rt6_info *ip6_pol_route_lookup(struct net *net,</div><div class='ctx'> 					     struct fib6_table *table,</div><div class='ctx'> 					     struct flowi6 *fl6,</div><div class='ctx'> 					     const struct sk_buff *skb,</div><div class='ctx'> 					     int flags)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *f6i;</div><div class='add'>+	struct fib6_result res = {};</div><div class='ctx'> 	struct fib6_node *fn;</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> </div><div class='del'>-	if (fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_SKIP_NH_OIF)</div><div class='del'>-		flags &amp;= ~RT6_LOOKUP_F_IFACE;</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	fn = fib6_node_lookup(&amp;table-&gt;tb6_root, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='ctx'> restart:</div><div class='del'>-	f6i = rcu_dereference(fn-&gt;leaf);</div><div class='del'>-	if (!f6i) {</div><div class='del'>-		f6i = net-&gt;ipv6.fib6_null_entry;</div><div class='del'>-	} else {</div><div class='del'>-		f6i = rt6_device_match(net, f6i, &amp;fl6-&gt;saddr,</div><div class='del'>-				      fl6-&gt;flowi6_oif, flags);</div><div class='del'>-		if (f6i-&gt;fib6_nsiblings &amp;&amp; fl6-&gt;flowi6_oif == 0)</div><div class='del'>-			f6i = fib6_multipath_select(net, f6i, fl6,</div><div class='del'>-						    fl6-&gt;flowi6_oif, skb,</div><div class='del'>-						    flags);</div><div class='del'>-	}</div><div class='del'>-	if (f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='add'>+	res.f6i = rcu_dereference(fn-&gt;leaf);</div><div class='add'>+	if (!res.f6i)</div><div class='add'>+		res.f6i = net-&gt;ipv6.fib6_null_entry;</div><div class='add'>+	else</div><div class='add'>+		rt6_device_match(net, &amp;res, &amp;fl6-&gt;saddr, fl6-&gt;flowi6_oif,</div><div class='add'>+				 flags);</div><div class='add'>+</div><div class='add'>+	if (res.f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='ctx'> 		fn = fib6_backtrack(fn, &amp;fl6-&gt;saddr);</div><div class='ctx'> 		if (fn)</div><div class='ctx'> 			goto restart;</div><div class='add'>+</div><div class='add'>+		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='add'>+		dst_hold(&amp;rt-&gt;dst);</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (res.fib6_flags &amp; RTF_REJECT) {</div><div class='add'>+		goto do_create;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_fib6_table_lookup(net, f6i, table, fl6);</div><div class='add'>+	fib6_select_path(net, &amp;res, fl6, fl6-&gt;flowi6_oif,</div><div class='add'>+			 fl6-&gt;flowi6_oif != 0, skb, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Search through exception table */</div><div class='del'>-	rt = rt6_find_cached_rt(f6i, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='add'>+	rt = rt6_find_cached_rt(&amp;res, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='ctx'> 	if (rt) {</div><div class='del'>-		if (ip6_hold_safe(net, &amp;rt, true))</div><div class='add'>+		if (ip6_hold_safe(net, &amp;rt))</div><div class='ctx'> 			dst_use_noref(&amp;rt-&gt;dst, jiffies);</div><div class='del'>-	} else if (f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='del'>-		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-		dst_hold(&amp;rt-&gt;dst);</div><div class='ctx'> 	} else {</div><div class='del'>-		rt = ip6_create_rt_rcu(f6i);</div><div class='del'>-		if (!rt) {</div><div class='del'>-			rt = net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-			dst_hold(&amp;rt-&gt;dst);</div><div class='del'>-		}</div><div class='add'>+do_create:</div><div class='add'>+		rt = ip6_create_rt_rcu(&amp;res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	trace_fib6_table_lookup(net, &amp;res, table, fl6);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return rt;</div><div class='hunk'>@@ -1138,7 +1326,7 @@ struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,</div><div class='ctx'> </div><div class='ctx'> 	dst = fib6_rule_lookup(net, &amp;fl6, skb, flags, ip6_pol_route_lookup);</div><div class='ctx'> 	if (dst-&gt;error == 0)</div><div class='del'>-		return (struct rt6_info *) dst;</div><div class='add'>+		return dst_rt6_info(dst);</div><div class='ctx'> </div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> </div><div class='hunk'>@@ -1173,10 +1361,11 @@ int ip6_ins_rt(struct net *net, struct fib6_info *rt)</div><div class='ctx'> 	return __ip6_ins_rt(rt, &amp;info, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *ip6_rt_cache_alloc(struct fib6_info *ort,</div><div class='add'>+static struct rt6_info *ip6_rt_cache_alloc(const struct fib6_result *res,</div><div class='ctx'> 					   const struct in6_addr *daddr,</div><div class='ctx'> 					   const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> </div><div class='hunk'>@@ -1184,25 +1373,24 @@ static struct rt6_info *ip6_rt_cache_alloc(struct fib6_info *ort,</div><div class='ctx'> 	 *	Clone the route.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (!fib6_info_hold_safe(ort))</div><div class='add'>+	if (!fib6_info_hold_safe(f6i))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	dev = ip6_rt_get_dev_rcu(ort);</div><div class='add'>+	dev = ip6_rt_get_dev_rcu(res);</div><div class='ctx'> 	rt = ip6_dst_alloc(dev_net(dev), dev, 0);</div><div class='ctx'> 	if (!rt) {</div><div class='del'>-		fib6_info_release(ort);</div><div class='add'>+		fib6_info_release(f6i);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ip6_rt_copy_init(rt, ort);</div><div class='add'>+	ip6_rt_copy_init(rt, res);</div><div class='ctx'> 	rt-&gt;rt6i_flags |= RTF_CACHE;</div><div class='del'>-	rt-&gt;dst.flags |= DST_HOST;</div><div class='ctx'> 	rt-&gt;rt6i_dst.addr = *daddr;</div><div class='ctx'> 	rt-&gt;rt6i_dst.plen = 128;</div><div class='ctx'> </div><div class='del'>-	if (!rt6_is_gw_or_nonexthop(ort)) {</div><div class='del'>-		if (ort-&gt;fib6_dst.plen != 128 &amp;&amp;</div><div class='del'>-		    ipv6_addr_equal(&amp;ort-&gt;fib6_dst.addr, daddr))</div><div class='add'>+	if (!rt6_is_gw_or_nonexthop(res)) {</div><div class='add'>+		if (f6i-&gt;fib6_dst.plen != 128 &amp;&amp;</div><div class='add'>+		    ipv6_addr_equal(&amp;f6i-&gt;fib6_dst.addr, daddr))</div><div class='ctx'> 			rt-&gt;rt6i_flags |= RTF_ANYCAST;</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 		if (rt-&gt;rt6i_src.plen &amp;&amp; saddr) {</div><div class='hunk'>@@ -1215,58 +1403,82 @@ static struct rt6_info *ip6_rt_cache_alloc(struct fib6_info *ort,</div><div class='ctx'> 	return rt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *ip6_rt_pcpu_alloc(struct fib6_info *rt)</div><div class='add'>+static struct rt6_info *ip6_rt_pcpu_alloc(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	unsigned short flags = fib6_info_dst_flags(rt);</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='add'>+	unsigned short flags = fib6_info_dst_flags(f6i);</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct rt6_info *pcpu_rt;</div><div class='ctx'> </div><div class='del'>-	if (!fib6_info_hold_safe(rt))</div><div class='add'>+	if (!fib6_info_hold_safe(f6i))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	dev = ip6_rt_get_dev_rcu(rt);</div><div class='del'>-	pcpu_rt = ip6_dst_alloc(dev_net(dev), dev, flags);</div><div class='add'>+	dev = ip6_rt_get_dev_rcu(res);</div><div class='add'>+	pcpu_rt = ip6_dst_alloc(dev_net(dev), dev, flags | DST_NOCOUNT);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (!pcpu_rt) {</div><div class='del'>-		fib6_info_release(rt);</div><div class='add'>+		fib6_info_release(f6i);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	ip6_rt_copy_init(pcpu_rt, rt);</div><div class='add'>+	ip6_rt_copy_init(pcpu_rt, res);</div><div class='ctx'> 	pcpu_rt-&gt;rt6i_flags |= RTF_PCPU;</div><div class='add'>+</div><div class='add'>+	if (f6i-&gt;nh)</div><div class='add'>+		pcpu_rt-&gt;sernum = rt_genid_ipv6(dev_net(dev));</div><div class='add'>+</div><div class='ctx'> 	return pcpu_rt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool rt6_is_valid(const struct rt6_info *rt6)</div><div class='add'>+{</div><div class='add'>+	return rt6-&gt;sernum == rt_genid_ipv6(dev_net(rt6-&gt;dst.dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* It should be called with rcu_read_lock() acquired */</div><div class='del'>-static struct rt6_info *rt6_get_pcpu_route(struct fib6_info *rt)</div><div class='add'>+static struct rt6_info *rt6_get_pcpu_route(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *pcpu_rt, **p;</div><div class='add'>+	struct rt6_info *pcpu_rt;</div><div class='ctx'> </div><div class='del'>-	p = this_cpu_ptr(rt-&gt;rt6i_pcpu);</div><div class='del'>-	pcpu_rt = *p;</div><div class='add'>+	pcpu_rt = this_cpu_read(*res-&gt;nh-&gt;rt6i_pcpu);</div><div class='ctx'> </div><div class='del'>-	if (pcpu_rt)</div><div class='del'>-		ip6_hold_safe(NULL, &amp;pcpu_rt, false);</div><div class='add'>+	if (pcpu_rt &amp;&amp; pcpu_rt-&gt;sernum &amp;&amp; !rt6_is_valid(pcpu_rt)) {</div><div class='add'>+		struct rt6_info *prev, **p;</div><div class='add'>+</div><div class='add'>+		p = this_cpu_ptr(res-&gt;nh-&gt;rt6i_pcpu);</div><div class='add'>+		/* Paired with READ_ONCE() in __fib6_drop_pcpu_from() */</div><div class='add'>+		prev = xchg(p, NULL);</div><div class='add'>+		if (prev) {</div><div class='add'>+			dst_dev_put(&amp;prev-&gt;dst);</div><div class='add'>+			dst_release(&amp;prev-&gt;dst);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pcpu_rt = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return pcpu_rt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rt6_info *rt6_make_pcpu_route(struct net *net,</div><div class='del'>-					    struct fib6_info *rt)</div><div class='add'>+					    const struct fib6_result *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_info *pcpu_rt, *prev, **p;</div><div class='ctx'> </div><div class='del'>-	pcpu_rt = ip6_rt_pcpu_alloc(rt);</div><div class='del'>-	if (!pcpu_rt) {</div><div class='del'>-		dst_hold(&amp;net-&gt;ipv6.ip6_null_entry-&gt;dst);</div><div class='del'>-		return net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-	}</div><div class='add'>+	pcpu_rt = ip6_rt_pcpu_alloc(res);</div><div class='add'>+	if (!pcpu_rt)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	dst_hold(&amp;pcpu_rt-&gt;dst);</div><div class='del'>-	p = this_cpu_ptr(rt-&gt;rt6i_pcpu);</div><div class='add'>+	p = this_cpu_ptr(res-&gt;nh-&gt;rt6i_pcpu);</div><div class='ctx'> 	prev = cmpxchg(p, NULL, pcpu_rt);</div><div class='ctx'> 	BUG_ON(prev);</div><div class='ctx'> </div><div class='add'>+	if (res-&gt;f6i-&gt;fib6_destroying) {</div><div class='add'>+		struct fib6_info *from;</div><div class='add'>+</div><div class='add'>+		from = unrcu_pointer(xchg(&amp;pcpu_rt-&gt;from, NULL));</div><div class='add'>+		fib6_info_release(from);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return pcpu_rt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1286,12 +1498,18 @@ static void rt6_remove_exception(struct rt6_exception_bucket *bucket,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	net = dev_net(rt6_ex-&gt;rt6i-&gt;dst.dev);</div><div class='add'>+	net-&gt;ipv6.rt6_stats-&gt;fib_rt_cache--;</div><div class='add'>+</div><div class='add'>+	/* purge completely the exception to allow releasing the held resources:</div><div class='add'>+	 * some [sk] cache may keep the dst around for unlimited time</div><div class='add'>+	 */</div><div class='add'>+	dst_dev_put(&amp;rt6_ex-&gt;rt6i-&gt;dst);</div><div class='add'>+</div><div class='ctx'> 	hlist_del_rcu(&amp;rt6_ex-&gt;hlist);</div><div class='ctx'> 	dst_release(&amp;rt6_ex-&gt;rt6i-&gt;dst);</div><div class='ctx'> 	kfree_rcu(rt6_ex, rcu);</div><div class='ctx'> 	WARN_ON_ONCE(!bucket-&gt;depth);</div><div class='ctx'> 	bucket-&gt;depth--;</div><div class='del'>-	net-&gt;ipv6.rt6_stats-&gt;fib_rt_cache--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove oldest rt6_ex in bucket and free the memory</div><div class='hunk'>@@ -1314,17 +1532,24 @@ static void rt6_exception_remove_oldest(struct rt6_exception_bucket *bucket)</div><div class='ctx'> static u32 rt6_exception_hash(const struct in6_addr *dst,</div><div class='ctx'> 			      const struct in6_addr *src)</div><div class='ctx'> {</div><div class='del'>-	static u32 seed __read_mostly;</div><div class='del'>-	u32 val;</div><div class='add'>+	static siphash_aligned_key_t rt6_exception_key;</div><div class='add'>+	struct {</div><div class='add'>+		struct in6_addr dst;</div><div class='add'>+		struct in6_addr src;</div><div class='add'>+	} __aligned(SIPHASH_ALIGNMENT) combined = {</div><div class='add'>+		.dst = *dst,</div><div class='add'>+	};</div><div class='add'>+	u64 val;</div><div class='ctx'> </div><div class='del'>-	net_get_random_once(&amp;seed, sizeof(seed));</div><div class='del'>-	val = jhash(dst, sizeof(*dst), seed);</div><div class='add'>+	net_get_random_once(&amp;rt6_exception_key, sizeof(rt6_exception_key));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	if (src)</div><div class='del'>-		val = jhash(src, sizeof(*src), val);</div><div class='add'>+		combined.src = *src;</div><div class='ctx'> #endif</div><div class='del'>-	return hash_32(val, FIB6_EXCEPTION_BUCKET_SIZE_SHIFT);</div><div class='add'>+	val = siphash(&amp;combined, sizeof(combined), &amp;rt6_exception_key);</div><div class='add'>+</div><div class='add'>+	return hash_64(val, FIB6_EXCEPTION_BUCKET_SIZE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Helper function to find the cached rt in the hash table</div><div class='hunk'>@@ -1395,45 +1620,97 @@ __rt6_find_exception_rcu(struct rt6_exception_bucket **bucket,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int fib6_mtu(const struct fib6_info *rt)</div><div class='add'>+static unsigned int fib6_mtu(const struct fib6_result *res)</div><div class='ctx'> {</div><div class='add'>+	const struct fib6_nh *nh = res-&gt;nh;</div><div class='ctx'> 	unsigned int mtu;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_pmtu) {</div><div class='del'>-		mtu = rt-&gt;fib6_pmtu;</div><div class='add'>+	if (res-&gt;f6i-&gt;fib6_pmtu) {</div><div class='add'>+		mtu = res-&gt;f6i-&gt;fib6_pmtu;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct net_device *dev = fib6_info_nh_dev(rt);</div><div class='add'>+		struct net_device *dev = nh-&gt;fib_nh_dev;</div><div class='ctx'> 		struct inet6_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		idev = __in6_dev_get(dev);</div><div class='del'>-		mtu = idev-&gt;cnf.mtu6;</div><div class='add'>+		mtu = READ_ONCE(idev-&gt;cnf.mtu6);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mtu = min_t(unsigned int, mtu, IP6_MAX_MTU);</div><div class='ctx'> </div><div class='del'>-	return mtu - lwtunnel_headroom(rt-&gt;fib6_nh.nh_lwtstate, mtu);</div><div class='add'>+	return mtu - lwtunnel_headroom(nh-&gt;fib_nh_lws, mtu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FIB6_EXCEPTION_BUCKET_FLUSHED  0x1UL</div><div class='add'>+</div><div class='add'>+/* used when the flushed bit is not relevant, only access to the bucket</div><div class='add'>+ * (ie., all bucket users except rt6_insert_exception);</div><div class='add'>+ *</div><div class='add'>+ * called under rcu lock; sometimes called with rt6_exception_lock held</div><div class='add'>+ */</div><div class='add'>+static</div><div class='add'>+struct rt6_exception_bucket *fib6_nh_get_excptn_bucket(const struct fib6_nh *nh,</div><div class='add'>+						       spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct rt6_exception_bucket *bucket;</div><div class='add'>+</div><div class='add'>+	if (lock)</div><div class='add'>+		bucket = rcu_dereference_protected(nh-&gt;rt6i_exception_bucket,</div><div class='add'>+						   lockdep_is_held(lock));</div><div class='add'>+	else</div><div class='add'>+		bucket = rcu_dereference(nh-&gt;rt6i_exception_bucket);</div><div class='add'>+</div><div class='add'>+	/* remove bucket flushed bit if set */</div><div class='add'>+	if (bucket) {</div><div class='add'>+		unsigned long p = (unsigned long)bucket;</div><div class='add'>+</div><div class='add'>+		p &amp;= ~FIB6_EXCEPTION_BUCKET_FLUSHED;</div><div class='add'>+		bucket = (struct rt6_exception_bucket *)p;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bucket;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fib6_nh_excptn_bucket_flushed(struct rt6_exception_bucket *bucket)</div><div class='add'>+{</div><div class='add'>+	unsigned long p = (unsigned long)bucket;</div><div class='add'>+</div><div class='add'>+	return !!(p &amp; FIB6_EXCEPTION_BUCKET_FLUSHED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called with rt6_exception_lock held */</div><div class='add'>+static void fib6_nh_excptn_bucket_set_flushed(struct fib6_nh *nh,</div><div class='add'>+					      spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct rt6_exception_bucket *bucket;</div><div class='add'>+	unsigned long p;</div><div class='add'>+</div><div class='add'>+	bucket = rcu_dereference_protected(nh-&gt;rt6i_exception_bucket,</div><div class='add'>+					   lockdep_is_held(lock));</div><div class='add'>+</div><div class='add'>+	p = (unsigned long)bucket;</div><div class='add'>+	p |= FIB6_EXCEPTION_BUCKET_FLUSHED;</div><div class='add'>+	bucket = (struct rt6_exception_bucket *)p;</div><div class='add'>+	rcu_assign_pointer(nh-&gt;rt6i_exception_bucket, bucket);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt6_insert_exception(struct rt6_info *nrt,</div><div class='del'>-				struct fib6_info *ort)</div><div class='add'>+				const struct fib6_result *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(nrt-&gt;dst.dev);</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='ctx'> 	struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='add'>+	struct fib6_nh *nh = res-&gt;nh;</div><div class='add'>+	int max_depth;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rt6_exception_lock);</div><div class='ctx'> </div><div class='del'>-	if (ort-&gt;exception_bucket_flushed) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bucket = rcu_dereference_protected(ort-&gt;rt6i_exception_bucket,</div><div class='del'>-					lockdep_is_held(&amp;rt6_exception_lock));</div><div class='add'>+	bucket = rcu_dereference_protected(nh-&gt;rt6i_exception_bucket,</div><div class='add'>+					  lockdep_is_held(&amp;rt6_exception_lock));</div><div class='ctx'> 	if (!bucket) {</div><div class='ctx'> 		bucket = kcalloc(FIB6_EXCEPTION_BUCKET_SIZE, sizeof(*bucket),</div><div class='ctx'> 				 GFP_ATOMIC);</div><div class='hunk'>@@ -1441,29 +1718,27 @@ static int rt6_insert_exception(struct rt6_info *nrt,</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_assign_pointer(ort-&gt;rt6i_exception_bucket, bucket);</div><div class='add'>+		rcu_assign_pointer(nh-&gt;rt6i_exception_bucket, bucket);</div><div class='add'>+	} else if (fib6_nh_excptn_bucket_flushed(bucket)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	/* rt6i_src.plen != 0 indicates ort is in subtree</div><div class='add'>+	/* fib6_src.plen != 0 indicates f6i is in subtree</div><div class='ctx'> 	 * and exception table is indexed by a hash of</div><div class='del'>-	 * both rt6i_dst and rt6i_src.</div><div class='add'>+	 * both fib6_dst and fib6_src.</div><div class='ctx'> 	 * Otherwise, the exception table is indexed by</div><div class='del'>-	 * a hash of only rt6i_dst.</div><div class='add'>+	 * a hash of only fib6_dst.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ort-&gt;fib6_src.plen)</div><div class='add'>+	if (f6i-&gt;fib6_src.plen)</div><div class='ctx'> 		src_key = &amp;nrt-&gt;rt6i_src.addr;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	/* Update rt6i_prefsrc as it could be changed</div><div class='del'>-	 * in rt6_remove_prefsrc()</div><div class='del'>-	 */</div><div class='del'>-	nrt-&gt;rt6i_prefsrc = ort-&gt;fib6_prefsrc;</div><div class='del'>-	/* rt6_mtu_change() might lower mtu on ort.</div><div class='add'>+	/* rt6_mtu_change() might lower mtu on f6i.</div><div class='ctx'> 	 * Only insert this exception route if its mtu</div><div class='del'>-	 * is less than ort's mtu value.</div><div class='add'>+	 * is less than f6i's mtu value.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dst_metric_raw(&amp;nrt-&gt;dst, RTAX_MTU) &gt;= fib6_mtu(ort)) {</div><div class='add'>+	if (dst_metric_raw(&amp;nrt-&gt;dst, RTAX_MTU) &gt;= fib6_mtu(res)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1484,7 +1759,9 @@ static int rt6_insert_exception(struct rt6_info *nrt,</div><div class='ctx'> 	bucket-&gt;depth++;</div><div class='ctx'> 	net-&gt;ipv6.rt6_stats-&gt;fib_rt_cache++;</div><div class='ctx'> </div><div class='del'>-	if (bucket-&gt;depth &gt; FIB6_MAX_DEPTH)</div><div class='add'>+	/* Randomize max depth to avoid some side channels attacks. */</div><div class='add'>+	max_depth = FIB6_MAX_DEPTH + get_random_u32_below(FIB6_MAX_DEPTH);</div><div class='add'>+	while (bucket-&gt;depth &gt; max_depth)</div><div class='ctx'> 		rt6_exception_remove_oldest(bucket);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1492,16 +1769,17 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	/* Update fn-&gt;fn_sernum to invalidate all cached dst */</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		spin_lock_bh(&amp;ort-&gt;fib6_table-&gt;tb6_lock);</div><div class='del'>-		fib6_update_sernum(net, ort);</div><div class='del'>-		spin_unlock_bh(&amp;ort-&gt;fib6_table-&gt;tb6_lock);</div><div class='add'>+		spin_lock_bh(&amp;f6i-&gt;fib6_table-&gt;tb6_lock);</div><div class='add'>+		fib6_update_sernum(net, f6i);</div><div class='add'>+		fib6_add_gc_list(f6i);</div><div class='add'>+		spin_unlock_bh(&amp;f6i-&gt;fib6_table-&gt;tb6_lock);</div><div class='ctx'> 		fib6_force_start_gc(net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rt6_flush_exceptions(struct fib6_info *rt)</div><div class='add'>+static void fib6_nh_flush_exceptions(struct fib6_nh *nh, struct fib6_info *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='hunk'>@@ -1509,77 +1787,108 @@ void rt6_flush_exceptions(struct fib6_info *rt)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rt6_exception_lock);</div><div class='del'>-	/* Prevent rt6_insert_exception() to recreate the bucket list */</div><div class='del'>-	rt-&gt;exception_bucket_flushed = 1;</div><div class='ctx'> </div><div class='del'>-	bucket = rcu_dereference_protected(rt-&gt;rt6i_exception_bucket,</div><div class='del'>-				    lockdep_is_held(&amp;rt6_exception_lock));</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, &amp;rt6_exception_lock);</div><div class='ctx'> 	if (!bucket)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Prevent rt6_insert_exception() to recreate the bucket list */</div><div class='add'>+	if (!from)</div><div class='add'>+		fib6_nh_excptn_bucket_set_flushed(nh, &amp;rt6_exception_lock);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; FIB6_EXCEPTION_BUCKET_SIZE; i++) {</div><div class='del'>-		hlist_for_each_entry_safe(rt6_ex, tmp, &amp;bucket-&gt;chain, hlist)</div><div class='del'>-			rt6_remove_exception(bucket, rt6_ex);</div><div class='del'>-		WARN_ON_ONCE(bucket-&gt;depth);</div><div class='add'>+		hlist_for_each_entry_safe(rt6_ex, tmp, &amp;bucket-&gt;chain, hlist) {</div><div class='add'>+			if (!from ||</div><div class='add'>+			    rcu_access_pointer(rt6_ex-&gt;rt6i-&gt;from) == from)</div><div class='add'>+				rt6_remove_exception(bucket, rt6_ex);</div><div class='add'>+		}</div><div class='add'>+		WARN_ON_ONCE(!from &amp;&amp; bucket-&gt;depth);</div><div class='ctx'> 		bucket++;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;rt6_exception_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rt6_nh_flush_exceptions(struct fib6_nh *nh, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *f6i = arg;</div><div class='add'>+</div><div class='add'>+	fib6_nh_flush_exceptions(nh, f6i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rt6_flush_exceptions(struct fib6_info *f6i)</div><div class='add'>+{</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		nexthop_for_each_fib6_nh(f6i-&gt;nh, rt6_nh_flush_exceptions, f6i);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		fib6_nh_flush_exceptions(f6i-&gt;fib6_nh, f6i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find cached rt in the hash table inside passed in rt</div><div class='ctx'>  * Caller has to hold rcu_read_lock()</div><div class='ctx'>  */</div><div class='del'>-static struct rt6_info *rt6_find_cached_rt(struct fib6_info *rt,</div><div class='del'>-					   struct in6_addr *daddr,</div><div class='del'>-					   struct in6_addr *saddr)</div><div class='add'>+static struct rt6_info *rt6_find_cached_rt(const struct fib6_result *res,</div><div class='add'>+					   const struct in6_addr *daddr,</div><div class='add'>+					   const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='add'>+	const struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='del'>-	struct rt6_info *res = NULL;</div><div class='del'>-</div><div class='del'>-	bucket = rcu_dereference(rt-&gt;rt6i_exception_bucket);</div><div class='add'>+	struct rt6_info *ret = NULL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	/* rt6i_src.plen != 0 indicates rt is in subtree</div><div class='add'>+	/* fib6i_src.plen != 0 indicates f6i is in subtree</div><div class='ctx'> 	 * and exception table is indexed by a hash of</div><div class='del'>-	 * both rt6i_dst and rt6i_src.</div><div class='del'>-	 * Otherwise, the exception table is indexed by</div><div class='del'>-	 * a hash of only rt6i_dst.</div><div class='add'>+	 * both fib6_dst and fib6_src.</div><div class='add'>+	 * However, the src addr used to create the hash</div><div class='add'>+	 * might not be exactly the passed in saddr which</div><div class='add'>+	 * is a /128 addr from the flow.</div><div class='add'>+	 * So we need to use f6i-&gt;fib6_src to redo lookup</div><div class='add'>+	 * if the passed in saddr does not find anything.</div><div class='add'>+	 * (See the logic in ip6_rt_cache_alloc() on how</div><div class='add'>+	 * rt-&gt;rt6i_src is updated.)</div><div class='ctx'> 	 */</div><div class='del'>-	if (rt-&gt;fib6_src.plen)</div><div class='add'>+	if (res-&gt;f6i-&gt;fib6_src.plen)</div><div class='ctx'> 		src_key = saddr;</div><div class='add'>+find_ex:</div><div class='ctx'> #endif</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(res-&gt;nh, NULL);</div><div class='ctx'> 	rt6_ex = __rt6_find_exception_rcu(&amp;bucket, daddr, src_key);</div><div class='ctx'> </div><div class='ctx'> 	if (rt6_ex &amp;&amp; !rt6_check_expired(rt6_ex-&gt;rt6i))</div><div class='del'>-		res = rt6_ex-&gt;rt6i;</div><div class='add'>+		ret = rt6_ex-&gt;rt6i;</div><div class='ctx'> </div><div class='del'>-	return res;</div><div class='add'>+#ifdef CONFIG_IPV6_SUBTREES</div><div class='add'>+	/* Use fib6_src as src_key and redo lookup */</div><div class='add'>+	if (!ret &amp;&amp; src_key &amp;&amp; src_key != &amp;res-&gt;f6i-&gt;fib6_src.addr) {</div><div class='add'>+		src_key = &amp;res-&gt;f6i-&gt;fib6_src.addr;</div><div class='add'>+		goto find_ex;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove the passed in cached rt from the hash table that contains it */</div><div class='del'>-static int rt6_remove_exception_rt(struct rt6_info *rt)</div><div class='add'>+static int fib6_nh_remove_exception(const struct fib6_nh *nh, int plen,</div><div class='add'>+				    const struct rt6_info *rt)</div><div class='ctx'> {</div><div class='add'>+	const struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='del'>-	struct fib6_info *from;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	from = rcu_dereference(rt-&gt;from);</div><div class='del'>-	if (!from ||</div><div class='del'>-	    !(rt-&gt;rt6i_flags &amp; RTF_CACHE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!rcu_access_pointer(from-&gt;rt6i_exception_bucket))</div><div class='add'>+	if (!rcu_access_pointer(nh-&gt;rt6i_exception_bucket))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rt6_exception_lock);</div><div class='del'>-	bucket = rcu_dereference_protected(from-&gt;rt6i_exception_bucket,</div><div class='del'>-				    lockdep_is_held(&amp;rt6_exception_lock));</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, &amp;rt6_exception_lock);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	/* rt6i_src.plen != 0 indicates 'from' is in subtree</div><div class='ctx'> 	 * and exception table is indexed by a hash of</div><div class='hunk'>@@ -1587,7 +1896,7 @@ static int rt6_remove_exception_rt(struct rt6_info *rt)</div><div class='ctx'> 	 * Otherwise, the exception table is indexed by</div><div class='ctx'> 	 * a hash of only rt6i_dst.</div><div class='ctx'> 	 */</div><div class='del'>-	if (from-&gt;fib6_src.plen)</div><div class='add'>+	if (plen)</div><div class='ctx'> 		src_key = &amp;rt-&gt;rt6i_src.addr;</div><div class='ctx'> #endif</div><div class='ctx'> 	rt6_ex = __rt6_find_exception_spinlock(&amp;bucket,</div><div class='hunk'>@@ -1604,23 +1913,60 @@ static int rt6_remove_exception_rt(struct rt6_info *rt)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct fib6_nh_excptn_arg {</div><div class='add'>+	struct rt6_info	*rt;</div><div class='add'>+	int		plen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rt6_nh_remove_exception_rt(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_excptn_arg *arg = _arg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fib6_nh_remove_exception(nh, arg-&gt;plen, arg-&gt;rt);</div><div class='add'>+	if (err == 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rt6_remove_exception_rt(struct rt6_info *rt)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *from;</div><div class='add'>+</div><div class='add'>+	from = rcu_dereference(rt-&gt;from);</div><div class='add'>+	if (!from || !(rt-&gt;rt6i_flags &amp; RTF_CACHE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (from-&gt;nh) {</div><div class='add'>+		struct fib6_nh_excptn_arg arg = {</div><div class='add'>+			.rt = rt,</div><div class='add'>+			.plen = from-&gt;fib6_src.plen</div><div class='add'>+		};</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		/* rc = 1 means an entry was found */</div><div class='add'>+		rc = nexthop_for_each_fib6_nh(from-&gt;nh,</div><div class='add'>+					      rt6_nh_remove_exception_rt,</div><div class='add'>+					      &amp;arg);</div><div class='add'>+		return rc ? 0 : -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fib6_nh_remove_exception(from-&gt;fib6_nh,</div><div class='add'>+					from-&gt;fib6_src.plen, rt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find rt6_ex which contains the passed in rt cache and</div><div class='ctx'>  * refresh its stamp</div><div class='ctx'>  */</div><div class='del'>-static void rt6_update_exception_stamp_rt(struct rt6_info *rt)</div><div class='add'>+static void fib6_nh_update_exception(const struct fib6_nh *nh, int plen,</div><div class='add'>+				     const struct rt6_info *rt)</div><div class='ctx'> {</div><div class='add'>+	const struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct fib6_info *from = rt-&gt;from;</div><div class='del'>-	struct in6_addr *src_key = NULL;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='ctx'> </div><div class='del'>-	if (!from ||</div><div class='del'>-	    !(rt-&gt;rt6i_flags &amp; RTF_CACHE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	bucket = rcu_dereference(from-&gt;rt6i_exception_bucket);</div><div class='del'>-</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, NULL);</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	/* rt6i_src.plen != 0 indicates 'from' is in subtree</div><div class='ctx'> 	 * and exception table is indexed by a hash of</div><div class='hunk'>@@ -1628,35 +1974,65 @@ static void rt6_update_exception_stamp_rt(struct rt6_info *rt)</div><div class='ctx'> 	 * Otherwise, the exception table is indexed by</div><div class='ctx'> 	 * a hash of only rt6i_dst.</div><div class='ctx'> 	 */</div><div class='del'>-	if (from-&gt;fib6_src.plen)</div><div class='add'>+	if (plen)</div><div class='ctx'> 		src_key = &amp;rt-&gt;rt6i_src.addr;</div><div class='ctx'> #endif</div><div class='del'>-	rt6_ex = __rt6_find_exception_rcu(&amp;bucket,</div><div class='del'>-					  &amp;rt-&gt;rt6i_dst.addr,</div><div class='del'>-					  src_key);</div><div class='add'>+	rt6_ex = __rt6_find_exception_rcu(&amp;bucket, &amp;rt-&gt;rt6i_dst.addr, src_key);</div><div class='ctx'> 	if (rt6_ex)</div><div class='ctx'> 		rt6_ex-&gt;stamp = jiffies;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+struct fib6_nh_match_arg {</div><div class='add'>+	const struct net_device *dev;</div><div class='add'>+	const struct in6_addr	*gw;</div><div class='add'>+	struct fib6_nh		*match;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* determine if fib6_nh has given device and gateway */</div><div class='add'>+static int fib6_nh_find_match(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_match_arg *arg = _arg;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;dev != nh-&gt;fib_nh_dev ||</div><div class='add'>+	    (arg-&gt;gw &amp;&amp; !nh-&gt;fib_nh_gw_family) ||</div><div class='add'>+	    (!arg-&gt;gw &amp;&amp; nh-&gt;fib_nh_gw_family) ||</div><div class='add'>+	    (arg-&gt;gw &amp;&amp; !ipv6_addr_equal(arg-&gt;gw, &amp;nh-&gt;fib_nh_gw6)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	arg-&gt;match = nh;</div><div class='add'>+</div><div class='add'>+	/* found a match, break the loop */</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt6_exceptions_remove_prefsrc(struct fib6_info *rt)</div><div class='add'>+static void rt6_update_exception_stamp_rt(struct rt6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct rt6_exception *rt6_ex;</div><div class='del'>-	int i;</div><div class='add'>+	struct fib6_info *from;</div><div class='add'>+	struct fib6_nh *fib6_nh;</div><div class='ctx'> </div><div class='del'>-	bucket = rcu_dereference_protected(rt-&gt;rt6i_exception_bucket,</div><div class='del'>-					lockdep_is_held(&amp;rt6_exception_lock));</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	if (bucket) {</div><div class='del'>-		for (i = 0; i &lt; FIB6_EXCEPTION_BUCKET_SIZE; i++) {</div><div class='del'>-			hlist_for_each_entry(rt6_ex, &amp;bucket-&gt;chain, hlist) {</div><div class='del'>-				rt6_ex-&gt;rt6i-&gt;rt6i_prefsrc.plen = 0;</div><div class='del'>-			}</div><div class='del'>-			bucket++;</div><div class='del'>-		}</div><div class='add'>+	from = rcu_dereference(rt-&gt;from);</div><div class='add'>+	if (!from || !(rt-&gt;rt6i_flags &amp; RTF_CACHE))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (from-&gt;nh) {</div><div class='add'>+		struct fib6_nh_match_arg arg = {</div><div class='add'>+			.dev = rt-&gt;dst.dev,</div><div class='add'>+			.gw = &amp;rt-&gt;rt6i_gateway,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nexthop_for_each_fib6_nh(from-&gt;nh, fib6_nh_find_match, &amp;arg);</div><div class='add'>+</div><div class='add'>+		if (!arg.match)</div><div class='add'>+			goto unlock;</div><div class='add'>+		fib6_nh = arg.match;</div><div class='add'>+	} else {</div><div class='add'>+		fib6_nh = from-&gt;fib6_nh;</div><div class='ctx'> 	}</div><div class='add'>+	fib6_nh_update_exception(fib6_nh, from-&gt;fib6_src.plen, rt);</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool rt6_mtu_change_route_allowed(struct inet6_dev *idev,</div><div class='hunk'>@@ -1682,15 +2058,13 @@ static bool rt6_mtu_change_route_allowed(struct inet6_dev *idev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rt6_exceptions_update_pmtu(struct inet6_dev *idev,</div><div class='del'>-				       struct fib6_info *rt, int mtu)</div><div class='add'>+				       const struct fib6_nh *nh, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	bucket = rcu_dereference_protected(rt-&gt;rt6i_exception_bucket,</div><div class='del'>-					lockdep_is_held(&amp;rt6_exception_lock));</div><div class='del'>-</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, &amp;rt6_exception_lock);</div><div class='ctx'> 	if (!bucket)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1712,21 +2086,19 @@ static void rt6_exceptions_update_pmtu(struct inet6_dev *idev,</div><div class='ctx'> </div><div class='ctx'> #define RTF_CACHE_GATEWAY	(RTF_GATEWAY | RTF_CACHE)</div><div class='ctx'> </div><div class='del'>-static void rt6_exceptions_clean_tohost(struct fib6_info *rt,</div><div class='del'>-					struct in6_addr *gateway)</div><div class='add'>+static void fib6_nh_exceptions_clean_tohost(const struct fib6_nh *nh,</div><div class='add'>+					    const struct in6_addr *gateway)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!rcu_access_pointer(rt-&gt;rt6i_exception_bucket))</div><div class='add'>+	if (!rcu_access_pointer(nh-&gt;rt6i_exception_bucket))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rt6_exception_lock);</div><div class='del'>-	bucket = rcu_dereference_protected(rt-&gt;rt6i_exception_bucket,</div><div class='del'>-				     lockdep_is_held(&amp;rt6_exception_lock));</div><div class='del'>-</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, &amp;rt6_exception_lock);</div><div class='ctx'> 	if (bucket) {</div><div class='ctx'> 		for (i = 0; i &lt; FIB6_EXCEPTION_BUCKET_SIZE; i++) {</div><div class='ctx'> 			hlist_for_each_entry_safe(rt6_ex, tmp,</div><div class='hunk'>@@ -1761,28 +2133,26 @@ static void rt6_age_examine_exception(struct rt6_exception_bucket *bucket,</div><div class='ctx'> 	 * expired, independently from their aging, as per RFC 8201 section 4</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(rt-&gt;rt6i_flags &amp; RTF_EXPIRES)) {</div><div class='del'>-		if (time_after_eq(now, rt-&gt;dst.lastuse + gc_args-&gt;timeout)) {</div><div class='del'>-			RT6_TRACE("aging clone %p\n", rt);</div><div class='add'>+		if (time_after_eq(now, READ_ONCE(rt-&gt;dst.lastuse) +</div><div class='add'>+				       gc_args-&gt;timeout)) {</div><div class='add'>+			pr_debug("aging clone %p\n", rt);</div><div class='ctx'> 			rt6_remove_exception(bucket, rt6_ex);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (time_after(jiffies, rt-&gt;dst.expires)) {</div><div class='del'>-		RT6_TRACE("purging expired route %p\n", rt);</div><div class='add'>+	} else if (time_after(jiffies, READ_ONCE(rt-&gt;dst.expires))) {</div><div class='add'>+		pr_debug("purging expired route %p\n", rt);</div><div class='ctx'> 		rt6_remove_exception(bucket, rt6_ex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; RTF_GATEWAY) {</div><div class='ctx'> 		struct neighbour *neigh;</div><div class='del'>-		__u8 neigh_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 		neigh = __ipv6_neigh_lookup_noref(rt-&gt;dst.dev, &amp;rt-&gt;rt6i_gateway);</div><div class='del'>-		if (neigh)</div><div class='del'>-			neigh_flags = neigh-&gt;flags;</div><div class='ctx'> </div><div class='del'>-		if (!(neigh_flags &amp; NTF_ROUTER)) {</div><div class='del'>-			RT6_TRACE("purging route %p via non-router but gateway\n",</div><div class='del'>-				  rt);</div><div class='add'>+		if (!(neigh &amp;&amp; (neigh-&gt;flags &amp; NTF_ROUTER))) {</div><div class='add'>+			pr_debug("purging route %p via non-router but gateway\n",</div><div class='add'>+				 rt);</div><div class='ctx'> 			rt6_remove_exception(bucket, rt6_ex);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1791,23 +2161,21 @@ static void rt6_age_examine_exception(struct rt6_exception_bucket *bucket,</div><div class='ctx'> 	gc_args-&gt;more++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rt6_age_exceptions(struct fib6_info *rt,</div><div class='del'>-			struct fib6_gc_args *gc_args,</div><div class='del'>-			unsigned long now)</div><div class='add'>+static void fib6_nh_age_exceptions(const struct fib6_nh *nh,</div><div class='add'>+				   struct fib6_gc_args *gc_args,</div><div class='add'>+				   unsigned long now)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_exception_bucket *bucket;</div><div class='ctx'> 	struct rt6_exception *rt6_ex;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!rcu_access_pointer(rt-&gt;rt6i_exception_bucket))</div><div class='add'>+	if (!rcu_access_pointer(nh-&gt;rt6i_exception_bucket))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='ctx'> 	spin_lock(&amp;rt6_exception_lock);</div><div class='del'>-	bucket = rcu_dereference_protected(rt-&gt;rt6i_exception_bucket,</div><div class='del'>-				    lockdep_is_held(&amp;rt6_exception_lock));</div><div class='del'>-</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, &amp;rt6_exception_lock);</div><div class='ctx'> 	if (bucket) {</div><div class='ctx'> 		for (i = 0; i &lt; FIB6_EXCEPTION_BUCKET_SIZE; i++) {</div><div class='ctx'> 			hlist_for_each_entry_safe(rt6_ex, tmp,</div><div class='hunk'>@@ -1822,22 +2190,48 @@ void rt6_age_exceptions(struct fib6_info *rt,</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct fib6_nh_age_excptn_arg {</div><div class='add'>+	struct fib6_gc_args	*gc_args;</div><div class='add'>+	unsigned long		now;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rt6_nh_age_exceptions(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_age_excptn_arg *arg = _arg;</div><div class='add'>+</div><div class='add'>+	fib6_nh_age_exceptions(nh, arg-&gt;gc_args, arg-&gt;now);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rt6_age_exceptions(struct fib6_info *f6i,</div><div class='add'>+			struct fib6_gc_args *gc_args,</div><div class='add'>+			unsigned long now)</div><div class='add'>+{</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		struct fib6_nh_age_excptn_arg arg = {</div><div class='add'>+			.gc_args = gc_args,</div><div class='add'>+			.now = now</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nexthop_for_each_fib6_nh(f6i-&gt;nh, rt6_nh_age_exceptions,</div><div class='add'>+					 &amp;arg);</div><div class='add'>+	} else {</div><div class='add'>+		fib6_nh_age_exceptions(f6i-&gt;fib6_nh, gc_args, now);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* must be called with rcu lock held */</div><div class='del'>-struct fib6_info *fib6_table_lookup(struct net *net, struct fib6_table *table,</div><div class='del'>-				    int oif, struct flowi6 *fl6, int strict)</div><div class='add'>+int fib6_table_lookup(struct net *net, struct fib6_table *table, int oif,</div><div class='add'>+		      struct flowi6 *fl6, struct fib6_result *res, int strict)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_node *fn, *saved_fn;</div><div class='del'>-	struct fib6_info *f6i;</div><div class='ctx'> </div><div class='ctx'> 	fn = fib6_node_lookup(&amp;table-&gt;tb6_root, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='ctx'> 	saved_fn = fn;</div><div class='ctx'> </div><div class='del'>-	if (fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_SKIP_NH_OIF)</div><div class='del'>-		oif = 0;</div><div class='del'>-</div><div class='ctx'> redo_rt6_select:</div><div class='del'>-	f6i = rt6_select(net, fn, oif, strict);</div><div class='del'>-	if (f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='add'>+	rt6_select(net, fn, oif, res, strict);</div><div class='add'>+	if (res-&gt;f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='ctx'> 		fn = fib6_backtrack(fn, &amp;fl6-&gt;saddr);</div><div class='ctx'> 		if (fn)</div><div class='ctx'> 			goto redo_rt6_select;</div><div class='hunk'>@@ -1849,90 +2243,81 @@ redo_rt6_select:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_fib6_table_lookup(net, f6i, table, fl6);</div><div class='add'>+	trace_fib6_table_lookup(net, res, table, fl6);</div><div class='ctx'> </div><div class='del'>-	return f6i;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,</div><div class='ctx'> 			       int oif, struct flowi6 *fl6,</div><div class='ctx'> 			       const struct sk_buff *skb, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct fib6_info *f6i;</div><div class='del'>-	struct rt6_info *rt;</div><div class='add'>+	struct fib6_result res = {};</div><div class='add'>+	struct rt6_info *rt = NULL;</div><div class='ctx'> 	int strict = 0;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE((flags &amp; RT6_LOOKUP_F_DST_NOREF) &amp;&amp;</div><div class='add'>+		     !rcu_read_lock_held());</div><div class='add'>+</div><div class='ctx'> 	strict |= flags &amp; RT6_LOOKUP_F_IFACE;</div><div class='ctx'> 	strict |= flags &amp; RT6_LOOKUP_F_IGNORE_LINKSTATE;</div><div class='del'>-	if (net-&gt;ipv6.devconf_all-&gt;forwarding == 0)</div><div class='add'>+	if (READ_ONCE(net-&gt;ipv6.devconf_all-&gt;forwarding) == 0)</div><div class='ctx'> 		strict |= RT6_LOOKUP_F_REACHABLE;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	f6i = fib6_table_lookup(net, table, oif, fl6, strict);</div><div class='del'>-	if (f6i-&gt;fib6_nsiblings)</div><div class='del'>-		f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict);</div><div class='add'>+	fib6_table_lookup(net, table, oif, fl6, &amp;res, strict);</div><div class='add'>+	if (res.f6i == net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (f6i == net-&gt;ipv6.fib6_null_entry) {</div><div class='del'>-		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		dst_hold(&amp;rt-&gt;dst);</div><div class='del'>-		return rt;</div><div class='del'>-	}</div><div class='add'>+	fib6_select_path(net, &amp;res, fl6, oif, false, skb, strict);</div><div class='ctx'> </div><div class='ctx'> 	/*Search through exception table */</div><div class='del'>-	rt = rt6_find_cached_rt(f6i, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='add'>+	rt = rt6_find_cached_rt(&amp;res, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='ctx'> 	if (rt) {</div><div class='del'>-		if (ip6_hold_safe(net, &amp;rt, true))</div><div class='del'>-			dst_use_noref(&amp;rt-&gt;dst, jiffies);</div><div class='del'>-</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return rt;</div><div class='add'>+		goto out;</div><div class='ctx'> 	} else if (unlikely((fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_KNOWN_NH) &amp;&amp;</div><div class='del'>-			    !(f6i-&gt;fib6_flags &amp; RTF_GATEWAY))) {</div><div class='add'>+			    !res.nh-&gt;fib_nh_gw_family)) {</div><div class='ctx'> 		/* Create a RTF_CACHE clone which will not be</div><div class='ctx'> 		 * owned by the fib6 tree.  It is for the special case where</div><div class='ctx'> 		 * the daddr in the skb during the neighbor look-up is different</div><div class='ctx'> 		 * from the fl6-&gt;daddr used to look-up route here.</div><div class='ctx'> 		 */</div><div class='del'>-		struct rt6_info *uncached_rt;</div><div class='del'>-</div><div class='del'>-		uncached_rt = ip6_rt_cache_alloc(f6i, &amp;fl6-&gt;daddr, NULL);</div><div class='add'>+		rt = ip6_rt_cache_alloc(&amp;res, &amp;fl6-&gt;daddr, NULL);</div><div class='ctx'> </div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (uncached_rt) {</div><div class='del'>-			/* Uncached_rt's refcnt is taken during ip6_rt_cache_alloc()</div><div class='del'>-			 * No need for another dst_hold()</div><div class='add'>+		if (rt) {</div><div class='add'>+			/* 1 refcnt is taken during ip6_rt_cache_alloc().</div><div class='add'>+			 * As rt6_uncached_list_add() does not consume refcnt,</div><div class='add'>+			 * this refcnt is always returned to the caller even</div><div class='add'>+			 * if caller sets RT6_LOOKUP_F_DST_NOREF flag.</div><div class='ctx'> 			 */</div><div class='del'>-			rt6_uncached_list_add(uncached_rt);</div><div class='del'>-			atomic_inc(&amp;net-&gt;ipv6.rt6_stats-&gt;fib_rt_uncache);</div><div class='del'>-		} else {</div><div class='del'>-			uncached_rt = net-&gt;ipv6.ip6_null_entry;</div><div class='del'>-			dst_hold(&amp;uncached_rt-&gt;dst);</div><div class='del'>-		}</div><div class='add'>+			rt6_uncached_list_add(rt);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		return uncached_rt;</div><div class='add'>+			return rt;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Get a percpu copy */</div><div class='del'>-</div><div class='del'>-		struct rt6_info *pcpu_rt;</div><div class='del'>-</div><div class='ctx'> 		local_bh_disable();</div><div class='del'>-		pcpu_rt = rt6_get_pcpu_route(f6i);</div><div class='add'>+		rt = rt6_get_pcpu_route(&amp;res);</div><div class='ctx'> </div><div class='del'>-		if (!pcpu_rt)</div><div class='del'>-			pcpu_rt = rt6_make_pcpu_route(net, f6i);</div><div class='add'>+		if (!rt)</div><div class='add'>+			rt = rt6_make_pcpu_route(net, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 		local_bh_enable();</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		return pcpu_rt;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	if (!rt)</div><div class='add'>+		rt = net-&gt;ipv6.ip6_null_entry;</div><div class='add'>+	if (!(flags &amp; RT6_LOOKUP_F_DST_NOREF))</div><div class='add'>+		ip6_hold_safe(net, &amp;rt);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return rt;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_pol_route);</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *ip6_pol_route_input(struct net *net,</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct rt6_info *ip6_pol_route_input(struct net *net,</div><div class='ctx'> 					    struct fib6_table *table,</div><div class='ctx'> 					    struct flowi6 *fl6,</div><div class='ctx'> 					    const struct sk_buff *skb,</div><div class='hunk'>@@ -1974,10 +2359,7 @@ static void ip6_multipath_l3_keys(const struct sk_buff *skb,</div><div class='ctx'> 	if (!icmph)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (icmph-&gt;icmp6_type != ICMPV6_DEST_UNREACH &amp;&amp;</div><div class='del'>-	    icmph-&gt;icmp6_type != ICMPV6_PKT_TOOBIG &amp;&amp;</div><div class='del'>-	    icmph-&gt;icmp6_type != ICMPV6_TIME_EXCEED &amp;&amp;</div><div class='del'>-	    icmph-&gt;icmp6_type != ICMPV6_PARAMPROB)</div><div class='add'>+	if (!icmpv6_is_err(icmph-&gt;icmp6_type))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	inner_iph = skb_header_pointer(skb,</div><div class='hunk'>@@ -2002,12 +2384,135 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 rt6_multipath_custom_hash_outer(const struct net *net,</div><div class='add'>+					   const struct sk_buff *skb,</div><div class='add'>+					   bool *p_has_inner)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = ip6_multipath_hash_fields(net);</div><div class='add'>+	struct flow_keys keys, hash_keys;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_OUTER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	skb_flow_dissect_flow_keys(skb, &amp;keys, FLOW_DISSECTOR_F_STOP_AT_ENCAP);</div><div class='add'>+</div><div class='add'>+	hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_IP)</div><div class='add'>+		hash_keys.addrs.v6addrs.src = keys.addrs.v6addrs.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_IP)</div><div class='add'>+		hash_keys.addrs.v6addrs.dst = keys.addrs.v6addrs.dst;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = keys.basic.ip_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_FLOWLABEL)</div><div class='add'>+		hash_keys.tags.flow_label = keys.tags.flow_label;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_PORT)</div><div class='add'>+		hash_keys.ports.src = keys.ports.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = keys.ports.dst;</div><div class='add'>+</div><div class='add'>+	*p_has_inner = !!(keys.control.flags &amp; FLOW_DIS_ENCAPSULATION);</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rt6_multipath_custom_hash_inner(const struct net *net,</div><div class='add'>+					   const struct sk_buff *skb,</div><div class='add'>+					   bool has_inner)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = ip6_multipath_hash_fields(net);</div><div class='add'>+	struct flow_keys keys, hash_keys;</div><div class='add'>+</div><div class='add'>+	/* We assume the packet carries an encapsulation, but if none was</div><div class='add'>+	 * encountered during dissection of the outer flow, then there is no</div><div class='add'>+	 * point in calling the flow dissector again.</div><div class='add'>+	 */</div><div class='add'>+	if (!has_inner)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	skb_flow_dissect_flow_keys(skb, &amp;keys, 0);</div><div class='add'>+</div><div class='add'>+	if (!(keys.control.flags &amp; FLOW_DIS_ENCAPSULATION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_IP)</div><div class='add'>+			hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_IP)</div><div class='add'>+			hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;</div><div class='add'>+	} else if (keys.control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {</div><div class='add'>+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_IP)</div><div class='add'>+			hash_keys.addrs.v6addrs.src = keys.addrs.v6addrs.src;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_IP)</div><div class='add'>+			hash_keys.addrs.v6addrs.dst = keys.addrs.v6addrs.dst;</div><div class='add'>+		if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_FLOWLABEL)</div><div class='add'>+			hash_keys.tags.flow_label = keys.tags.flow_label;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = keys.basic.ip_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_SRC_PORT)</div><div class='add'>+		hash_keys.ports.src = keys.ports.src;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_INNER_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = keys.ports.dst;</div><div class='add'>+</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rt6_multipath_custom_hash_skb(const struct net *net,</div><div class='add'>+					 const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 mhash, mhash_inner;</div><div class='add'>+	bool has_inner = true;</div><div class='add'>+</div><div class='add'>+	mhash = rt6_multipath_custom_hash_outer(net, skb, &amp;has_inner);</div><div class='add'>+	mhash_inner = rt6_multipath_custom_hash_inner(net, skb, has_inner);</div><div class='add'>+</div><div class='add'>+	return jhash_2words(mhash, mhash_inner, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rt6_multipath_custom_hash_fl6(const struct net *net,</div><div class='add'>+					 const struct flowi6 *fl6)</div><div class='add'>+{</div><div class='add'>+	u32 hash_fields = ip6_multipath_hash_fields(net);</div><div class='add'>+	struct flow_keys hash_keys;</div><div class='add'>+</div><div class='add'>+	if (!(hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_OUTER_MASK))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+	hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_IP)</div><div class='add'>+		hash_keys.addrs.v6addrs.src = fl6-&gt;saddr;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_IP)</div><div class='add'>+		hash_keys.addrs.v6addrs.dst = fl6-&gt;daddr;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_IP_PROTO)</div><div class='add'>+		hash_keys.basic.ip_proto = fl6-&gt;flowi6_proto;</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_FLOWLABEL)</div><div class='add'>+		hash_keys.tags.flow_label = (__force u32)flowi6_get_flowlabel(fl6);</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_SRC_PORT) {</div><div class='add'>+		if (fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_ANY_SPORT)</div><div class='add'>+			hash_keys.ports.src = (__force __be16)get_random_u16();</div><div class='add'>+		else</div><div class='add'>+			hash_keys.ports.src = fl6-&gt;fl6_sport;</div><div class='add'>+	}</div><div class='add'>+	if (hash_fields &amp; FIB_MULTIPATH_HASH_FIELD_DST_PORT)</div><div class='add'>+		hash_keys.ports.dst = fl6-&gt;fl6_dport;</div><div class='add'>+</div><div class='add'>+	return fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* if skb is set it will be used and fl6 can be NULL */</div><div class='ctx'> u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6,</div><div class='ctx'> 		       const struct sk_buff *skb, struct flow_keys *flkeys)</div><div class='ctx'> {</div><div class='ctx'> 	struct flow_keys hash_keys;</div><div class='del'>-	u32 mhash;</div><div class='add'>+	u32 mhash = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (ip6_multipath_hash_policy(net)) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -2021,6 +2526,7 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6,</div><div class='ctx'> 			hash_keys.tags.flow_label = (__force u32)flowi6_get_flowlabel(fl6);</div><div class='ctx'> 			hash_keys.basic.ip_proto = fl6-&gt;flowi6_proto;</div><div class='ctx'> 		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		if (skb) {</div><div class='hunk'>@@ -2033,7 +2539,7 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6,</div><div class='ctx'> </div><div class='ctx'> 			memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='ctx'> </div><div class='del'>-                        if (!flkeys) {</div><div class='add'>+			if (!flkeys) {</div><div class='ctx'> 				skb_flow_dissect_flow_keys(skb, &amp;keys, flag);</div><div class='ctx'> 				flkeys = &amp;keys;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2048,22 +2554,69 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6,</div><div class='ctx'> 			hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='ctx'> 			hash_keys.addrs.v6addrs.src = fl6-&gt;saddr;</div><div class='ctx'> 			hash_keys.addrs.v6addrs.dst = fl6-&gt;daddr;</div><div class='del'>-			hash_keys.ports.src = fl6-&gt;fl6_sport;</div><div class='add'>+			if (fl6-&gt;flowi6_flags &amp; FLOWI_FLAG_ANY_SPORT)</div><div class='add'>+				hash_keys.ports.src = (__force __be16)get_random_u16();</div><div class='add'>+			else</div><div class='add'>+				hash_keys.ports.src = fl6-&gt;fl6_sport;</div><div class='ctx'> 			hash_keys.ports.dst = fl6-&gt;fl6_dport;</div><div class='ctx'> 			hash_keys.basic.ip_proto = fl6-&gt;flowi6_proto;</div><div class='ctx'> 		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		memset(&amp;hash_keys, 0, sizeof(hash_keys));</div><div class='add'>+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+		if (skb) {</div><div class='add'>+			struct flow_keys keys;</div><div class='add'>+</div><div class='add'>+			if (!flkeys) {</div><div class='add'>+				skb_flow_dissect_flow_keys(skb, &amp;keys, 0);</div><div class='add'>+				flkeys = &amp;keys;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Inner can be v4 or v6 */</div><div class='add'>+			if (flkeys-&gt;control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+				hash_keys.addrs.v4addrs.src = flkeys-&gt;addrs.v4addrs.src;</div><div class='add'>+				hash_keys.addrs.v4addrs.dst = flkeys-&gt;addrs.v4addrs.dst;</div><div class='add'>+			} else if (flkeys-&gt;control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+				hash_keys.addrs.v6addrs.src = flkeys-&gt;addrs.v6addrs.src;</div><div class='add'>+				hash_keys.addrs.v6addrs.dst = flkeys-&gt;addrs.v6addrs.dst;</div><div class='add'>+				hash_keys.tags.flow_label = flkeys-&gt;tags.flow_label;</div><div class='add'>+				hash_keys.basic.ip_proto = flkeys-&gt;basic.ip_proto;</div><div class='add'>+			} else {</div><div class='add'>+				/* Same as case 0 */</div><div class='add'>+				hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+				ip6_multipath_l3_keys(skb, &amp;hash_keys, flkeys);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Same as case 0 */</div><div class='add'>+			hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+			hash_keys.addrs.v6addrs.src = fl6-&gt;saddr;</div><div class='add'>+			hash_keys.addrs.v6addrs.dst = fl6-&gt;daddr;</div><div class='add'>+			hash_keys.tags.flow_label = (__force u32)flowi6_get_flowlabel(fl6);</div><div class='add'>+			hash_keys.basic.ip_proto = fl6-&gt;flowi6_proto;</div><div class='add'>+		}</div><div class='add'>+		mhash = fib_multipath_hash_from_keys(net, &amp;hash_keys);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (skb)</div><div class='add'>+			mhash = rt6_multipath_custom_hash_skb(net, skb);</div><div class='add'>+		else</div><div class='add'>+			mhash = rt6_multipath_custom_hash_fl6(net, fl6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mhash = flow_hash_from_keys(&amp;hash_keys);</div><div class='ctx'> </div><div class='ctx'> 	return mhash &gt;&gt; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Called with rcu held */</div><div class='ctx'> void ip6_route_input(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='del'>-	int flags = RT6_LOOKUP_F_HAS_SADDR;</div><div class='add'>+	int flags = RT6_LOOKUP_F_HAS_SADDR | RT6_LOOKUP_F_DST_NOREF;</div><div class='ctx'> 	struct ip_tunnel_info *tun_info;</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='ctx'> 		.flowi6_iif = skb-&gt;dev-&gt;ifindex,</div><div class='hunk'>@@ -2085,11 +2638,11 @@ void ip6_route_input(struct sk_buff *skb)</div><div class='ctx'> 	if (unlikely(fl6.flowi6_proto == IPPROTO_ICMPV6))</div><div class='ctx'> 		fl6.mp_hash = rt6_multipath_hash(net, &amp;fl6, skb, flkeys);</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	skb_dst_set(skb,</div><div class='del'>-		    ip6_route_input_lookup(net, skb-&gt;dev, &amp;fl6, skb, flags));</div><div class='add'>+	skb_dst_set_noref(skb, ip6_route_input_lookup(net, skb-&gt;dev,</div><div class='add'>+						      &amp;fl6, skb, flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *ip6_pol_route_output(struct net *net,</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct rt6_info *ip6_pol_route_output(struct net *net,</div><div class='ctx'> 					     struct fib6_table *table,</div><div class='ctx'> 					     struct flowi6 *fl6,</div><div class='ctx'> 					     const struct sk_buff *skb,</div><div class='hunk'>@@ -2098,14 +2651,18 @@ static struct rt6_info *ip6_pol_route_output(struct net *net,</div><div class='ctx'> 	return ip6_pol_route(net, table, fl6-&gt;flowi6_oif, fl6, skb, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,</div><div class='del'>-					 struct flowi6 *fl6, int flags)</div><div class='add'>+static struct dst_entry *ip6_route_output_flags_noref(struct net *net,</div><div class='add'>+						      const struct sock *sk,</div><div class='add'>+						      struct flowi6 *fl6,</div><div class='add'>+						      int flags)</div><div class='ctx'> {</div><div class='ctx'> 	bool any_src;</div><div class='ctx'> </div><div class='del'>-	if (rt6_need_strict(&amp;fl6-&gt;daddr)) {</div><div class='add'>+	if (ipv6_addr_type(&amp;fl6-&gt;daddr) &amp;</div><div class='add'>+	    (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL)) {</div><div class='ctx'> 		struct dst_entry *dst;</div><div class='ctx'> </div><div class='add'>+		/* This function does not take refcnt on the dst */</div><div class='ctx'> 		dst = l3mdev_link_scope_lookup(net, fl6);</div><div class='ctx'> 		if (dst)</div><div class='ctx'> 			return dst;</div><div class='hunk'>@@ -2113,6 +2670,7 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	fl6-&gt;flowi6_iif = LOOPBACK_IFINDEX;</div><div class='ctx'> </div><div class='add'>+	flags |= RT6_LOOKUP_F_DST_NOREF;</div><div class='ctx'> 	any_src = ipv6_addr_any(&amp;fl6-&gt;saddr);</div><div class='ctx'> 	if ((sk &amp;&amp; sk-&gt;sk_bound_dev_if) || rt6_need_strict(&amp;fl6-&gt;daddr) ||</div><div class='ctx'> 	    (fl6-&gt;flowi6_oif &amp;&amp; any_src))</div><div class='hunk'>@@ -2121,19 +2679,40 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,</div><div class='ctx'> 	if (!any_src)</div><div class='ctx'> 		flags |= RT6_LOOKUP_F_HAS_SADDR;</div><div class='ctx'> 	else if (sk)</div><div class='del'>-		flags |= rt6_srcprefs2flags(inet6_sk(sk)-&gt;srcprefs);</div><div class='add'>+		flags |= rt6_srcprefs2flags(READ_ONCE(inet6_sk(sk)-&gt;srcprefs));</div><div class='ctx'> </div><div class='ctx'> 	return fib6_rule_lookup(net, fl6, NULL, flags, ip6_pol_route_output);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct dst_entry *ip6_route_output_flags(struct net *net,</div><div class='add'>+					 const struct sock *sk,</div><div class='add'>+					 struct flowi6 *fl6,</div><div class='add'>+					 int flags)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	struct rt6_info *rt6;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dst = ip6_route_output_flags_noref(net, sk, fl6, flags);</div><div class='add'>+	rt6 = dst_rt6_info(dst);</div><div class='add'>+	/* For dst cached in uncached_list, refcnt is already taken. */</div><div class='add'>+	if (list_empty(&amp;rt6-&gt;dst.rt_uncached) &amp;&amp; !dst_hold_safe(dst)) {</div><div class='add'>+		dst = &amp;net-&gt;ipv6.ip6_null_entry-&gt;dst;</div><div class='add'>+		dst_hold(dst);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return dst;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_route_output_flags);</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_orig)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt, *ort = (struct rt6_info *) dst_orig;</div><div class='add'>+	struct rt6_info *rt, *ort = dst_rt6_info(dst_orig);</div><div class='ctx'> 	struct net_device *loopback_dev = net-&gt;loopback_dev;</div><div class='ctx'> 	struct dst_entry *new = NULL;</div><div class='ctx'> </div><div class='del'>-	rt = dst_alloc(&amp;ip6_dst_blackhole_ops, loopback_dev, 1,</div><div class='add'>+	rt = dst_alloc(&amp;ip6_dst_blackhole_ops, loopback_dev,</div><div class='ctx'> 		       DST_OBSOLETE_DEAD, 0);</div><div class='ctx'> 	if (rt) {</div><div class='ctx'> 		rt6_info_init(rt);</div><div class='hunk'>@@ -2183,7 +2762,7 @@ static struct dst_entry *rt6_check(struct rt6_info *rt,</div><div class='ctx'> {</div><div class='ctx'> 	u32 rt_cookie = 0;</div><div class='ctx'> </div><div class='del'>-	if ((from &amp;&amp; !fib6_get_cookie_safe(from, &amp;rt_cookie)) ||</div><div class='add'>+	if (!from || !fib6_get_cookie_safe(from, &amp;rt_cookie) ||</div><div class='ctx'> 	    rt_cookie != cookie)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2198,20 +2777,23 @@ static struct dst_entry *rt6_dst_from_check(struct rt6_info *rt,</div><div class='ctx'> 					    u32 cookie)</div><div class='ctx'> {</div><div class='ctx'> 	if (!__rt6_check_expired(rt) &amp;&amp;</div><div class='del'>-	    rt-&gt;dst.obsolete == DST_OBSOLETE_FORCE_CHK &amp;&amp;</div><div class='add'>+	    READ_ONCE(rt-&gt;dst.obsolete) == DST_OBSOLETE_FORCE_CHK &amp;&amp;</div><div class='ctx'> 	    fib6_check(from, cookie))</div><div class='ctx'> 		return &amp;rt-&gt;dst;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct dst_entry *ip6_dst_check(struct dst_entry *dst,</div><div class='add'>+							u32 cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst_ret;</div><div class='ctx'> 	struct fib6_info *from;</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> </div><div class='del'>-	rt = container_of(dst, struct rt6_info, dst);</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;sernum)</div><div class='add'>+		return rt6_is_valid(rt) ? dst : NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='hunk'>@@ -2223,7 +2805,7 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='ctx'> 	from = rcu_dereference(rt-&gt;from);</div><div class='ctx'> </div><div class='ctx'> 	if (from &amp;&amp; (rt-&gt;rt6i_flags &amp; RTF_PCPU ||</div><div class='del'>-	    unlikely(!list_empty(&amp;rt-&gt;rt6i_uncached))))</div><div class='add'>+	    unlikely(!list_empty(&amp;rt-&gt;dst.rt_uncached))))</div><div class='ctx'> 		dst_ret = rt6_dst_from_check(rt, from, cookie);</div><div class='ctx'> 	else</div><div class='ctx'> 		dst_ret = rt6_check(rt, from, cookie);</div><div class='hunk'>@@ -2232,25 +2814,26 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)</div><div class='ctx'> </div><div class='ctx'> 	return dst_ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_INDIRECT_CALLABLE(ip6_dst_check);</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *ip6_negative_advice(struct dst_entry *dst)</div><div class='add'>+static void ip6_negative_advice(struct sock *sk,</div><div class='add'>+				struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *) dst;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(dst);</div><div class='ctx'> </div><div class='del'>-	if (rt) {</div><div class='del'>-		if (rt-&gt;rt6i_flags &amp; RTF_CACHE) {</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			if (rt6_check_expired(rt)) {</div><div class='del'>-				rt6_remove_exception_rt(rt);</div><div class='del'>-				dst = NULL;</div><div class='del'>-			}</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-		} else {</div><div class='del'>-			dst_release(dst);</div><div class='del'>-			dst = NULL;</div><div class='add'>+	if (rt-&gt;rt6i_flags &amp; RTF_CACHE) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (rt6_check_expired(rt)) {</div><div class='add'>+			/* rt/dst can not be destroyed yet,</div><div class='add'>+			 * because of rcu_read_lock()</div><div class='add'>+			 */</div><div class='add'>+			sk_dst_reset(sk);</div><div class='add'>+			rt6_remove_exception_rt(rt);</div><div class='ctx'> 		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	return dst;</div><div class='add'>+	sk_dst_reset(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6_link_failure(struct sk_buff *skb)</div><div class='hunk'>@@ -2259,12 +2842,11 @@ static void ip6_link_failure(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH, 0);</div><div class='ctx'> </div><div class='del'>-	rt = (struct rt6_info *) skb_dst(skb);</div><div class='add'>+	rt = dst_rt6_info(skb_dst(skb));</div><div class='ctx'> 	if (rt) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		if (rt-&gt;rt6i_flags &amp; RTF_CACHE) {</div><div class='del'>-			if (dst_hold_safe(&amp;rt-&gt;dst))</div><div class='del'>-				rt6_remove_exception_rt(rt);</div><div class='add'>+			rt6_remove_exception_rt(rt);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct fib6_info *from;</div><div class='ctx'> 			struct fib6_node *fn;</div><div class='hunk'>@@ -2273,7 +2855,7 @@ static void ip6_link_failure(struct sk_buff *skb)</div><div class='ctx'> 			if (from) {</div><div class='ctx'> 				fn = rcu_dereference(from-&gt;fib6_node);</div><div class='ctx'> 				if (fn &amp;&amp; (rt-&gt;rt6i_flags &amp; RTF_DEFAULT))</div><div class='del'>-					fn-&gt;fn_sernum = -1;</div><div class='add'>+					WRITE_ONCE(fn-&gt;fn_sernum, -1);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -2288,7 +2870,7 @@ static void rt6_update_expires(struct rt6_info *rt0, int timeout)</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		from = rcu_dereference(rt0-&gt;from);</div><div class='ctx'> 		if (from)</div><div class='del'>-			rt0-&gt;dst.expires = from-&gt;expires;</div><div class='add'>+			WRITE_ONCE(rt0-&gt;dst.expires, from-&gt;expires);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2307,24 +2889,21 @@ static void rt6_do_update_pmtu(struct rt6_info *rt, u32 mtu)</div><div class='ctx'> </div><div class='ctx'> static bool rt6_cache_allowed_for_pmtu(const struct rt6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	bool from_set;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	from_set = !!rcu_dereference(rt-&gt;from);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='ctx'> 	return !(rt-&gt;rt6i_flags &amp; RTF_CACHE) &amp;&amp;</div><div class='del'>-		(rt-&gt;rt6i_flags &amp; RTF_PCPU || from_set);</div><div class='add'>+		(rt-&gt;rt6i_flags &amp; RTF_PCPU || rcu_access_pointer(rt-&gt;from));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,</div><div class='del'>-				 const struct ipv6hdr *iph, u32 mtu)</div><div class='add'>+				 const struct ipv6hdr *iph, u32 mtu,</div><div class='add'>+				 bool confirm_neigh)</div><div class='ctx'> {</div><div class='ctx'> 	const struct in6_addr *daddr, *saddr;</div><div class='del'>-	struct rt6_info *rt6 = (struct rt6_info *)dst;</div><div class='add'>+	struct rt6_info *rt6 = dst_rt6_info(dst);</div><div class='ctx'> </div><div class='del'>-	if (dst_metric_locked(dst, RTAX_MTU))</div><div class='del'>-		return;</div><div class='add'>+	/* Note: do *NOT* check dst_metric_locked(dst, RTAX_MTU)</div><div class='add'>+	 * IPv6 pmtu discovery isn't optional, so 'mtu lock' cannot disable it.</div><div class='add'>+	 * [see also comment in rt6_mtu_change_route()]</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	if (iph) {</div><div class='ctx'> 		daddr = &amp;iph-&gt;daddr;</div><div class='hunk'>@@ -2336,8 +2915,12 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,</div><div class='ctx'> 		daddr = NULL;</div><div class='ctx'> 		saddr = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	dst_confirm_neigh(dst, daddr);</div><div class='del'>-	mtu = max_t(u32, mtu, IPV6_MIN_MTU);</div><div class='add'>+</div><div class='add'>+	if (confirm_neigh)</div><div class='add'>+		dst_confirm_neigh(dst, daddr);</div><div class='add'>+</div><div class='add'>+	if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+		return;</div><div class='ctx'> 	if (mtu &gt;= dst_mtu(dst))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2347,25 +2930,54 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,</div><div class='ctx'> 		if (rt6-&gt;rt6i_flags &amp; RTF_CACHE)</div><div class='ctx'> 			rt6_update_exception_stamp_rt(rt6);</div><div class='ctx'> 	} else if (daddr) {</div><div class='del'>-		struct fib6_info *from;</div><div class='add'>+		struct fib6_result res = {};</div><div class='ctx'> 		struct rt6_info *nrt6;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		from = rcu_dereference(rt6-&gt;from);</div><div class='del'>-		nrt6 = ip6_rt_cache_alloc(from, daddr, saddr);</div><div class='add'>+		res.f6i = rcu_dereference(rt6-&gt;from);</div><div class='add'>+		if (!res.f6i)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		res.fib6_flags = res.f6i-&gt;fib6_flags;</div><div class='add'>+		res.fib6_type = res.f6i-&gt;fib6_type;</div><div class='add'>+</div><div class='add'>+		if (res.f6i-&gt;nh) {</div><div class='add'>+			struct fib6_nh_match_arg arg = {</div><div class='add'>+				.dev = dst_dev_rcu(dst),</div><div class='add'>+				.gw = &amp;rt6-&gt;rt6i_gateway,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			nexthop_for_each_fib6_nh(res.f6i-&gt;nh,</div><div class='add'>+						 fib6_nh_find_match, &amp;arg);</div><div class='add'>+</div><div class='add'>+			/* fib6_info uses a nexthop that does not have fib6_nh</div><div class='add'>+			 * using the dst-&gt;dev + gw. Should be impossible.</div><div class='add'>+			 */</div><div class='add'>+			if (!arg.match)</div><div class='add'>+				goto out_unlock;</div><div class='add'>+</div><div class='add'>+			res.nh = arg.match;</div><div class='add'>+		} else {</div><div class='add'>+			res.nh = res.f6i-&gt;fib6_nh;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nrt6 = ip6_rt_cache_alloc(&amp;res, daddr, saddr);</div><div class='ctx'> 		if (nrt6) {</div><div class='ctx'> 			rt6_do_update_pmtu(nrt6, mtu);</div><div class='del'>-			if (rt6_insert_exception(nrt6, from))</div><div class='add'>+			if (rt6_insert_exception(nrt6, &amp;res))</div><div class='ctx'> 				dst_release_immediate(&amp;nrt6-&gt;dst);</div><div class='ctx'> 		}</div><div class='add'>+out_unlock:</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			       struct sk_buff *skb, u32 mtu)</div><div class='add'>+			       struct sk_buff *skb, u32 mtu,</div><div class='add'>+			       bool confirm_neigh)</div><div class='ctx'> {</div><div class='del'>-	__ip6_rt_update_pmtu(dst, sk, skb ? ipv6_hdr(skb) : NULL, mtu);</div><div class='add'>+	__ip6_rt_update_pmtu(dst, sk, skb ? ipv6_hdr(skb) : NULL, mtu,</div><div class='add'>+			     confirm_neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,</div><div class='hunk'>@@ -2373,32 +2985,35 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph = (struct ipv6hdr *) skb-&gt;data;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_oif = oif;</div><div class='del'>-	fl6.flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb-&gt;mark);</div><div class='del'>-	fl6.daddr = iph-&gt;daddr;</div><div class='del'>-	fl6.saddr = iph-&gt;saddr;</div><div class='del'>-	fl6.flowlabel = ip6_flowinfo(iph);</div><div class='del'>-	fl6.flowi6_uid = uid;</div><div class='add'>+	struct flowi6 fl6 = {</div><div class='add'>+		.flowi6_oif = oif,</div><div class='add'>+		.flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb-&gt;mark),</div><div class='add'>+		.daddr = iph-&gt;daddr,</div><div class='add'>+		.saddr = iph-&gt;saddr,</div><div class='add'>+		.flowlabel = ip6_flowinfo(iph),</div><div class='add'>+		.flowi6_uid = uid,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='ctx'> 	if (!dst-&gt;error)</div><div class='del'>-		__ip6_rt_update_pmtu(dst, NULL, iph, ntohl(mtu));</div><div class='add'>+		__ip6_rt_update_pmtu(dst, NULL, iph, ntohl(mtu), true);</div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_update_pmtu);</div><div class='ctx'> </div><div class='ctx'> void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)</div><div class='ctx'> {</div><div class='add'>+	int oif = sk-&gt;sk_bound_dev_if;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> </div><div class='del'>-	ip6_update_pmtu(skb, sock_net(sk), mtu,</div><div class='del'>-			sk-&gt;sk_bound_dev_if, sk-&gt;sk_mark, sk-&gt;sk_uid);</div><div class='add'>+	if (!oif &amp;&amp; skb-&gt;dev)</div><div class='add'>+		oif = l3mdev_master_ifindex(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ip6_update_pmtu(skb, sock_net(sk), mtu, oif, READ_ONCE(sk-&gt;sk_mark),</div><div class='add'>+			sk_uid(sk));</div><div class='ctx'> </div><div class='ctx'> 	dst = __sk_dst_get(sk);</div><div class='del'>-	if (!dst || !dst-&gt;obsolete ||</div><div class='add'>+	if (!dst || !READ_ONCE(dst-&gt;obsolete) ||</div><div class='ctx'> 	    dst-&gt;ops-&gt;check(dst, inet6_sk(sk)-&gt;dst_cookie))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2417,13 +3032,57 @@ void ip6_sk_dst_store_flow(struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ip6_dst_store(sk, dst,</div><div class='del'>-		      ipv6_addr_equal(&amp;fl6-&gt;daddr, &amp;sk-&gt;sk_v6_daddr) ?</div><div class='del'>-		      &amp;sk-&gt;sk_v6_daddr : NULL,</div><div class='add'>+		      ipv6_addr_equal(&amp;fl6-&gt;daddr, &amp;sk-&gt;sk_v6_daddr),</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 		      ipv6_addr_equal(&amp;fl6-&gt;saddr, &amp;np-&gt;saddr) ?</div><div class='del'>-		      &amp;np-&gt;saddr :</div><div class='add'>+		      true :</div><div class='ctx'> #endif</div><div class='del'>-		      NULL);</div><div class='add'>+		      false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ip6_redirect_nh_match(const struct fib6_result *res,</div><div class='add'>+				  struct flowi6 *fl6,</div><div class='add'>+				  const struct in6_addr *gw,</div><div class='add'>+				  struct rt6_info **ret)</div><div class='add'>+{</div><div class='add'>+	const struct fib6_nh *nh = res-&gt;nh;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD || !nh-&gt;fib_nh_gw_family ||</div><div class='add'>+	    fl6-&gt;flowi6_oif != nh-&gt;fib_nh_dev-&gt;ifindex)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* rt_cache's gateway might be different from its 'parent'</div><div class='add'>+	 * in the case of an ip redirect.</div><div class='add'>+	 * So we keep searching in the exception table if the gateway</div><div class='add'>+	 * is different.</div><div class='add'>+	 */</div><div class='add'>+	if (!ipv6_addr_equal(gw, &amp;nh-&gt;fib_nh_gw6)) {</div><div class='add'>+		struct rt6_info *rt_cache;</div><div class='add'>+</div><div class='add'>+		rt_cache = rt6_find_cached_rt(res, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='add'>+		if (rt_cache &amp;&amp;</div><div class='add'>+		    ipv6_addr_equal(gw, &amp;rt_cache-&gt;rt6i_gateway)) {</div><div class='add'>+			*ret = rt_cache;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fib6_nh_rd_arg {</div><div class='add'>+	struct fib6_result	*res;</div><div class='add'>+	struct flowi6		*fl6;</div><div class='add'>+	const struct in6_addr	*gw;</div><div class='add'>+	struct rt6_info		**ret;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fib6_nh_redirect_match(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_rd_arg *arg = _arg;</div><div class='add'>+</div><div class='add'>+	arg-&gt;res-&gt;nh = nh;</div><div class='add'>+	return ip6_redirect_nh_match(arg-&gt;res, arg-&gt;fl6, arg-&gt;gw, arg-&gt;ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Handle redirects */</div><div class='hunk'>@@ -2432,14 +3091,21 @@ struct ip6rd_flowi {</div><div class='ctx'> 	struct in6_addr gateway;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct rt6_info *__ip6_route_redirect(struct net *net,</div><div class='add'>+INDIRECT_CALLABLE_SCOPE struct rt6_info *__ip6_route_redirect(struct net *net,</div><div class='ctx'> 					     struct fib6_table *table,</div><div class='ctx'> 					     struct flowi6 *fl6,</div><div class='ctx'> 					     const struct sk_buff *skb,</div><div class='ctx'> 					     int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip6rd_flowi *rdfl = (struct ip6rd_flowi *)fl6;</div><div class='del'>-	struct rt6_info *ret = NULL, *rt_cache;</div><div class='add'>+	struct rt6_info *ret = NULL;</div><div class='add'>+	struct fib6_result res = {};</div><div class='add'>+	struct fib6_nh_rd_arg arg = {</div><div class='add'>+		.res = &amp;res,</div><div class='add'>+		.fl6 = fl6,</div><div class='add'>+		.gw  = &amp;rdfl-&gt;gateway,</div><div class='add'>+		.ret = &amp;ret</div><div class='add'>+	};</div><div class='ctx'> 	struct fib6_info *rt;</div><div class='ctx'> 	struct fib6_node *fn;</div><div class='ctx'> </div><div class='hunk'>@@ -2457,34 +3123,25 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,</div><div class='ctx'> 	fn = fib6_node_lookup(&amp;table-&gt;tb6_root, &amp;fl6-&gt;daddr, &amp;fl6-&gt;saddr);</div><div class='ctx'> restart:</div><div class='ctx'> 	for_each_fib6_node_rt_rcu(fn) {</div><div class='del'>-		if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='del'>-			continue;</div><div class='add'>+		res.f6i = rt;</div><div class='ctx'> 		if (fib6_check_expired(rt))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (rt-&gt;fib6_flags &amp; RTF_REJECT)</div><div class='ctx'> 			break;</div><div class='del'>-		if (!(rt-&gt;fib6_flags &amp; RTF_GATEWAY))</div><div class='del'>-			continue;</div><div class='del'>-		if (fl6-&gt;flowi6_oif != rt-&gt;fib6_nh.nh_dev-&gt;ifindex)</div><div class='del'>-			continue;</div><div class='del'>-		/* rt_cache's gateway might be different from its 'parent'</div><div class='del'>-		 * in the case of an ip redirect.</div><div class='del'>-		 * So we keep searching in the exception table if the gateway</div><div class='del'>-		 * is different.</div><div class='del'>-		 */</div><div class='del'>-		if (!ipv6_addr_equal(&amp;rdfl-&gt;gateway, &amp;rt-&gt;fib6_nh.nh_gw)) {</div><div class='del'>-			rt_cache = rt6_find_cached_rt(rt,</div><div class='del'>-						      &amp;fl6-&gt;daddr,</div><div class='del'>-						      &amp;fl6-&gt;saddr);</div><div class='del'>-			if (rt_cache &amp;&amp;</div><div class='del'>-			    ipv6_addr_equal(&amp;rdfl-&gt;gateway,</div><div class='del'>-					    &amp;rt_cache-&gt;rt6i_gateway)) {</div><div class='del'>-				ret = rt_cache;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='add'>+		if (unlikely(rt-&gt;nh)) {</div><div class='add'>+			if (nexthop_is_blackhole(rt-&gt;nh))</div><div class='add'>+				continue;</div><div class='add'>+			/* on match, res-&gt;nh is filled in and potentially ret */</div><div class='add'>+			if (nexthop_for_each_fib6_nh(rt-&gt;nh,</div><div class='add'>+						     fib6_nh_redirect_match,</div><div class='add'>+						     &amp;arg))</div><div class='add'>+				goto out;</div><div class='add'>+		} else {</div><div class='add'>+			res.nh = rt-&gt;fib6_nh;</div><div class='add'>+			if (ip6_redirect_nh_match(&amp;res, fl6, &amp;rdfl-&gt;gateway,</div><div class='add'>+						  &amp;ret))</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rt)</div><div class='hunk'>@@ -2500,15 +3157,20 @@ restart:</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	res.f6i = rt;</div><div class='add'>+	res.nh = rt-&gt;fib6_nh;</div><div class='ctx'> out:</div><div class='del'>-	if (ret)</div><div class='del'>-		ip6_hold_safe(net, &amp;ret, true);</div><div class='del'>-	else</div><div class='del'>-		ret = ip6_create_rt_rcu(rt);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ip6_hold_safe(net, &amp;ret);</div><div class='add'>+	} else {</div><div class='add'>+		res.fib6_flags = res.f6i-&gt;fib6_flags;</div><div class='add'>+		res.fib6_type = res.f6i-&gt;fib6_type;</div><div class='add'>+		ret = ip6_create_rt_rcu(&amp;res);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	trace_fib6_table_lookup(net, rt, table, fl6);</div><div class='add'>+	trace_fib6_table_lookup(net, &amp;res, table, fl6);</div><div class='ctx'> 	return ret;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2532,16 +3194,15 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark,</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph = (struct ipv6hdr *) skb-&gt;data;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_iif = LOOPBACK_IFINDEX;</div><div class='del'>-	fl6.flowi6_oif = oif;</div><div class='del'>-	fl6.flowi6_mark = mark;</div><div class='del'>-	fl6.daddr = iph-&gt;daddr;</div><div class='del'>-	fl6.saddr = iph-&gt;saddr;</div><div class='del'>-	fl6.flowlabel = ip6_flowinfo(iph);</div><div class='del'>-	fl6.flowi6_uid = uid;</div><div class='add'>+	struct flowi6 fl6 = {</div><div class='add'>+		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		.flowi6_oif = oif,</div><div class='add'>+		.flowi6_mark = mark,</div><div class='add'>+		.daddr = iph-&gt;daddr,</div><div class='add'>+		.saddr = iph-&gt;saddr,</div><div class='add'>+		.flowlabel = ip6_flowinfo(iph),</div><div class='add'>+		.flowi6_uid = uid,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dst = ip6_route_redirect(net, &amp;fl6, skb, &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='ctx'> 	rt6_do_redirect(dst, NULL, skb);</div><div class='hunk'>@@ -2549,21 +3210,18 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_redirect);</div><div class='ctx'> </div><div class='del'>-void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,</div><div class='del'>-			    u32 mark)</div><div class='add'>+void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='ctx'> 	const struct rd_msg *msg = (struct rd_msg *)icmp6_hdr(skb);</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='del'>-	struct flowi6 fl6;</div><div class='del'>-</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_iif = LOOPBACK_IFINDEX;</div><div class='del'>-	fl6.flowi6_oif = oif;</div><div class='del'>-	fl6.flowi6_mark = mark;</div><div class='del'>-	fl6.daddr = msg-&gt;dest;</div><div class='del'>-	fl6.saddr = iph-&gt;daddr;</div><div class='del'>-	fl6.flowi6_uid = sock_net_uid(net, NULL);</div><div class='add'>+	struct flowi6 fl6 = {</div><div class='add'>+		.flowi6_iif = LOOPBACK_IFINDEX,</div><div class='add'>+		.flowi6_oif = oif,</div><div class='add'>+		.daddr = msg-&gt;dest,</div><div class='add'>+		.saddr = iph-&gt;daddr,</div><div class='add'>+		.flowi6_uid = sock_net_uid(net, NULL),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dst = ip6_route_redirect(net, &amp;fl6, skb, &amp;iph-&gt;saddr);</div><div class='ctx'> 	rt6_do_redirect(dst, NULL, skb);</div><div class='hunk'>@@ -2572,22 +3230,26 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,</div><div class='ctx'> </div><div class='ctx'> void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	ip6_redirect(skb, sock_net(sk), sk-&gt;sk_bound_dev_if, sk-&gt;sk_mark,</div><div class='del'>-		     sk-&gt;sk_uid);</div><div class='add'>+	ip6_redirect(skb, sock_net(sk), sk-&gt;sk_bound_dev_if,</div><div class='add'>+		     READ_ONCE(sk-&gt;sk_mark), sk_uid(sk));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ip6_sk_redirect);</div><div class='ctx'> </div><div class='ctx'> static unsigned int ip6_default_advmss(const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = dst-&gt;dev;</div><div class='ctx'> 	unsigned int mtu = dst_mtu(dst);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='ctx'> 	mtu -= sizeof(struct ipv6hdr) + sizeof(struct tcphdr);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	net = dst_dev_net_rcu(dst);</div><div class='ctx'> 	if (mtu &lt; net-&gt;ipv6.sysctl.ip6_rt_min_advmss)</div><div class='ctx'> 		mtu = net-&gt;ipv6.sysctl.ip6_rt_min_advmss;</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Maximal non-jumbo IPv6 payload is IPV6_MAXPLEN and</div><div class='ctx'> 	 * corresponding MSS is IPV6_MAXPLEN - tcp_header_size.</div><div class='hunk'>@@ -2599,28 +3261,11 @@ static unsigned int ip6_default_advmss(const struct dst_entry *dst)</div><div class='ctx'> 	return mtu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ip6_mtu(const struct dst_entry *dst)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE unsigned int ip6_mtu(const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	struct inet6_dev *idev;</div><div class='del'>-	unsigned int mtu;</div><div class='del'>-</div><div class='del'>-	mtu = dst_metric_raw(dst, RTAX_MTU);</div><div class='del'>-	if (mtu)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mtu = IPV6_MIN_MTU;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	idev = __in6_dev_get(dst-&gt;dev);</div><div class='del'>-	if (idev)</div><div class='del'>-		mtu = idev-&gt;cnf.mtu6;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mtu = min_t(unsigned int, mtu, IP6_MAX_MTU);</div><div class='del'>-</div><div class='del'>-	return mtu - lwtunnel_headroom(dst-&gt;lwtstate, mtu);</div><div class='add'>+	return ip6_dst_mtu_maybe_forward(dst, false);</div><div class='ctx'> }</div><div class='add'>+EXPORT_INDIRECT_CALLABLE(ip6_mtu);</div><div class='ctx'> </div><div class='ctx'> /* MTU selection:</div><div class='ctx'>  * 1. mtu on route is locked - use it</div><div class='hunk'>@@ -2630,13 +3275,14 @@ out:</div><div class='ctx'>  * based on ip6_dst_mtu_forward and exception logic of</div><div class='ctx'>  * rt6_find_cached_rt; called with rcu_read_lock</div><div class='ctx'>  */</div><div class='del'>-u32 ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,</div><div class='del'>-		      struct in6_addr *saddr)</div><div class='add'>+u32 ip6_mtu_from_fib6(const struct fib6_result *res,</div><div class='add'>+		      const struct in6_addr *daddr,</div><div class='add'>+		      const struct in6_addr *saddr)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_exception_bucket *bucket;</div><div class='del'>-	struct rt6_exception *rt6_ex;</div><div class='del'>-	struct in6_addr *src_key;</div><div class='add'>+	const struct fib6_nh *nh = res-&gt;nh;</div><div class='add'>+	struct fib6_info *f6i = res-&gt;f6i;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	struct rt6_info *rt;</div><div class='ctx'> 	u32 mtu = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(fib6_metric_locked(f6i, RTAX_MTU))) {</div><div class='hunk'>@@ -2645,29 +3291,21 @@ u32 ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	src_key = NULL;</div><div class='del'>-#ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	if (f6i-&gt;fib6_src.plen)</div><div class='del'>-		src_key = saddr;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	bucket = rcu_dereference(f6i-&gt;rt6i_exception_bucket);</div><div class='del'>-	rt6_ex = __rt6_find_exception_rcu(&amp;bucket, daddr, src_key);</div><div class='del'>-	if (rt6_ex &amp;&amp; !rt6_check_expired(rt6_ex-&gt;rt6i))</div><div class='del'>-		mtu = dst_metric_raw(&amp;rt6_ex-&gt;rt6i-&gt;dst, RTAX_MTU);</div><div class='del'>-</div><div class='del'>-	if (likely(!mtu)) {</div><div class='del'>-		struct net_device *dev = fib6_info_nh_dev(f6i);</div><div class='add'>+	rt = rt6_find_cached_rt(res, daddr, saddr);</div><div class='add'>+	if (unlikely(rt)) {</div><div class='add'>+		mtu = dst_metric_raw(&amp;rt-&gt;dst, RTAX_MTU);</div><div class='add'>+	} else {</div><div class='add'>+		struct net_device *dev = nh-&gt;fib_nh_dev;</div><div class='ctx'> </div><div class='ctx'> 		mtu = IPV6_MIN_MTU;</div><div class='ctx'> 		idev = __in6_dev_get(dev);</div><div class='del'>-		if (idev &amp;&amp; idev-&gt;cnf.mtu6 &gt; mtu)</div><div class='del'>-			mtu = idev-&gt;cnf.mtu6;</div><div class='add'>+		if (idev)</div><div class='add'>+			mtu = max_t(u32, mtu, READ_ONCE(idev-&gt;cnf.mtu6));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mtu = min_t(unsigned int, mtu, IP6_MAX_MTU);</div><div class='ctx'> out:</div><div class='del'>-	return mtu - lwtunnel_headroom(fib6_info_nh_lwt(f6i), mtu);</div><div class='add'>+	return mtu - lwtunnel_headroom(nh-&gt;fib_nh_lws, mtu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *icmp6_dst_alloc(struct net_device *dev,</div><div class='hunk'>@@ -2688,7 +3326,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rt-&gt;dst.flags |= DST_HOST;</div><div class='ctx'> 	rt-&gt;dst.input = ip6_input;</div><div class='ctx'> 	rt-&gt;dst.output  = ip6_output;</div><div class='ctx'> 	rt-&gt;rt6i_gateway  = fl6-&gt;daddr;</div><div class='hunk'>@@ -2701,7 +3338,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,</div><div class='ctx'> 	 * do proper release of the net_device</div><div class='ctx'> 	 */</div><div class='ctx'> 	rt6_uncached_list_add(rt);</div><div class='del'>-	atomic_inc(&amp;net-&gt;ipv6.rt6_stats-&gt;fib_rt_uncache);</div><div class='ctx'> </div><div class='ctx'> 	dst = xfrm_lookup(net, &amp;rt-&gt;dst, flowi6_to_flowi(fl6), NULL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2709,53 +3345,31 @@ out:</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_dst_gc(struct dst_ops *ops)</div><div class='add'>+static void ip6_dst_gc(struct dst_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = container_of(ops, struct net, ipv6.ip6_dst_ops);</div><div class='ctx'> 	int rt_min_interval = net-&gt;ipv6.sysctl.ip6_rt_gc_min_interval;</div><div class='del'>-	int rt_max_size = net-&gt;ipv6.sysctl.ip6_rt_max_size;</div><div class='ctx'> 	int rt_elasticity = net-&gt;ipv6.sysctl.ip6_rt_gc_elasticity;</div><div class='ctx'> 	int rt_gc_timeout = net-&gt;ipv6.sysctl.ip6_rt_gc_timeout;</div><div class='ctx'> 	unsigned long rt_last_gc = net-&gt;ipv6.ip6_rt_last_gc;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int entries;</div><div class='ctx'> </div><div class='del'>-	entries = dst_entries_get_fast(ops);</div><div class='del'>-	if (time_after(rt_last_gc + rt_min_interval, jiffies) &amp;&amp;</div><div class='del'>-	    entries &lt;= rt_max_size)</div><div class='add'>+	if (time_after(rt_last_gc + rt_min_interval, jiffies))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.ip6_rt_gc_expire++;</div><div class='del'>-	fib6_run_gc(net-&gt;ipv6.ip6_rt_gc_expire, net, true);</div><div class='add'>+	fib6_run_gc(atomic_inc_return(&amp;net-&gt;ipv6.ip6_rt_gc_expire), net, true);</div><div class='ctx'> 	entries = dst_entries_get_slow(ops);</div><div class='ctx'> 	if (entries &lt; ops-&gt;gc_thresh)</div><div class='del'>-		net-&gt;ipv6.ip6_rt_gc_expire = rt_gc_timeout&gt;&gt;1;</div><div class='add'>+		atomic_set(&amp;net-&gt;ipv6.ip6_rt_gc_expire, rt_gc_timeout &gt;&gt; 1);</div><div class='ctx'> out:</div><div class='del'>-	net-&gt;ipv6.ip6_rt_gc_expire -= net-&gt;ipv6.ip6_rt_gc_expire&gt;&gt;rt_elasticity;</div><div class='del'>-	return entries &gt; rt_max_size;</div><div class='add'>+	val = atomic_read(&amp;net-&gt;ipv6.ip6_rt_gc_expire);</div><div class='add'>+	atomic_set(&amp;net-&gt;ipv6.ip6_rt_gc_expire, val - (val &gt;&gt; rt_elasticity));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_convert_metrics(struct net *net, struct fib6_info *rt,</div><div class='del'>-			       struct fib6_config *cfg)</div><div class='del'>-{</div><div class='del'>-	struct dst_metrics *p;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;fc_mx)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = kzalloc(sizeof(*rt-&gt;fib6_metrics), GFP_KERNEL);</div><div class='del'>-	if (unlikely(!p))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;p-&gt;refcnt, 1);</div><div class='del'>-	rt-&gt;fib6_metrics = p;</div><div class='del'>-</div><div class='del'>-	return ip_metrics_convert(net, cfg-&gt;fc_mx, cfg-&gt;fc_mx_len, p-&gt;metrics);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rt6_info *ip6_nh_lookup_table(struct net *net,</div><div class='del'>-					    struct fib6_config *cfg,</div><div class='del'>-					    const struct in6_addr *gw_addr,</div><div class='del'>-					    u32 tbid, int flags)</div><div class='add'>+static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,</div><div class='add'>+			       const struct in6_addr *gw_addr, u32 tbid,</div><div class='add'>+			       int flags, struct fib6_result *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct flowi6 fl6 = {</div><div class='ctx'> 		.flowi6_oif = cfg-&gt;fc_ifindex,</div><div class='hunk'>@@ -2763,25 +3377,23 @@ static struct rt6_info *ip6_nh_lookup_table(struct net *net,</div><div class='ctx'> 		.saddr = cfg-&gt;fc_prefsrc,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct fib6_table *table;</div><div class='del'>-	struct rt6_info *rt;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	table = fib6_get_table(net, tbid);</div><div class='ctx'> 	if (!table)</div><div class='del'>-		return NULL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_any(&amp;cfg-&gt;fc_prefsrc))</div><div class='ctx'> 		flags |= RT6_LOOKUP_F_HAS_SADDR;</div><div class='ctx'> </div><div class='ctx'> 	flags |= RT6_LOOKUP_F_IGNORE_LINKSTATE;</div><div class='del'>-	rt = ip6_pol_route(net, table, cfg-&gt;fc_ifindex, &amp;fl6, NULL, flags);</div><div class='ctx'> </div><div class='del'>-	/* if table lookup failed, fall back to full lookup */</div><div class='del'>-	if (rt == net-&gt;ipv6.ip6_null_entry) {</div><div class='del'>-		ip6_rt_put(rt);</div><div class='del'>-		rt = NULL;</div><div class='del'>-	}</div><div class='add'>+	err = fib6_table_lookup(net, table, cfg-&gt;fc_ifindex, &amp;fl6, res, flags);</div><div class='add'>+	if (!err &amp;&amp; res-&gt;f6i != net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+		fib6_select_path(net, res, &amp;fl6, cfg-&gt;fc_ifindex,</div><div class='add'>+				 cfg-&gt;fc_ifindex != 0, NULL, flags);</div><div class='ctx'> </div><div class='del'>-	return rt;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_route_check_nh_onlink(struct net *net,</div><div class='hunk'>@@ -2789,23 +3401,19 @@ static int ip6_route_check_nh_onlink(struct net *net,</div><div class='ctx'> 				     const struct net_device *dev,</div><div class='ctx'> 				     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	u32 tbid = l3mdev_fib_table(dev) ? : RT_TABLE_MAIN;</div><div class='add'>+	u32 tbid = l3mdev_fib_table_rcu(dev) ? : RT_TABLE_MAIN;</div><div class='ctx'> 	const struct in6_addr *gw_addr = &amp;cfg-&gt;fc_gateway;</div><div class='del'>-	u32 flags = RTF_LOCAL | RTF_ANYCAST | RTF_REJECT;</div><div class='del'>-	struct rt6_info *grt;</div><div class='add'>+	struct fib6_result res = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	grt = ip6_nh_lookup_table(net, cfg, gw_addr, tbid, 0);</div><div class='del'>-	if (grt) {</div><div class='del'>-		if (!grt-&gt;dst.error &amp;&amp;</div><div class='del'>-		    (grt-&gt;rt6i_flags &amp; flags || dev != grt-&gt;dst.dev)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Nexthop has invalid gateway or device mismatch");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ip6_rt_put(grt);</div><div class='add'>+	err = ip6_nh_lookup_table(net, cfg, gw_addr, tbid, 0, &amp;res);</div><div class='add'>+	if (!err &amp;&amp; !(res.fib6_flags &amp; RTF_REJECT) &amp;&amp;</div><div class='add'>+	    /* ignore match if it is the default route */</div><div class='add'>+	    !ipv6_addr_any(&amp;res.f6i-&gt;fib6_dst.addr) &amp;&amp;</div><div class='add'>+	    (res.fib6_type != RTN_UNICAST || dev != res.nh-&gt;fib_nh_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Nexthop has invalid gateway or device mismatch");</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2814,56 +3422,62 @@ static int ip6_route_check_nh_onlink(struct net *net,</div><div class='ctx'> static int ip6_route_check_nh(struct net *net,</div><div class='ctx'> 			      struct fib6_config *cfg,</div><div class='ctx'> 			      struct net_device **_dev,</div><div class='add'>+			      netdevice_tracker *dev_tracker,</div><div class='ctx'> 			      struct inet6_dev **idev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct in6_addr *gw_addr = &amp;cfg-&gt;fc_gateway;</div><div class='ctx'> 	struct net_device *dev = _dev ? *_dev : NULL;</div><div class='del'>-	struct rt6_info *grt = NULL;</div><div class='add'>+	int flags = RT6_LOOKUP_F_IFACE;</div><div class='add'>+	struct fib6_result res = {};</div><div class='ctx'> 	int err = -EHOSTUNREACH;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_table) {</div><div class='del'>-		int flags = RT6_LOOKUP_F_IFACE;</div><div class='del'>-</div><div class='del'>-		grt = ip6_nh_lookup_table(net, cfg, gw_addr,</div><div class='del'>-					  cfg-&gt;fc_table, flags);</div><div class='del'>-		if (grt) {</div><div class='del'>-			if (grt-&gt;rt6i_flags &amp; RTF_GATEWAY ||</div><div class='del'>-			    (dev &amp;&amp; dev != grt-&gt;dst.dev)) {</div><div class='del'>-				ip6_rt_put(grt);</div><div class='del'>-				grt = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		err = ip6_nh_lookup_table(net, cfg, gw_addr,</div><div class='add'>+					  cfg-&gt;fc_table, flags, &amp;res);</div><div class='add'>+		/* gw_addr can not require a gateway or resolve to a reject</div><div class='add'>+		 * route. If a device is given, it must match the result.</div><div class='add'>+		 */</div><div class='add'>+		if (err || res.fib6_flags &amp; RTF_REJECT ||</div><div class='add'>+		    res.nh-&gt;fib_nh_gw_family ||</div><div class='add'>+		    (dev &amp;&amp; dev != res.nh-&gt;fib_nh_dev))</div><div class='add'>+			err = -EHOSTUNREACH;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!grt)</div><div class='del'>-		grt = rt6_lookup(net, gw_addr, NULL, cfg-&gt;fc_ifindex, NULL, 1);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		struct flowi6 fl6 = {</div><div class='add'>+			.flowi6_oif = cfg-&gt;fc_ifindex,</div><div class='add'>+			.daddr = *gw_addr,</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	if (!grt)</div><div class='del'>-		goto out;</div><div class='add'>+		err = fib6_lookup(net, cfg-&gt;fc_ifindex, &amp;fl6, &amp;res, flags);</div><div class='add'>+		if (err || res.fib6_flags &amp; RTF_REJECT ||</div><div class='add'>+		    res.nh-&gt;fib_nh_gw_family)</div><div class='add'>+			err = -EHOSTUNREACH;</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='add'>+		fib6_select_path(net, &amp;res, &amp;fl6, cfg-&gt;fc_ifindex,</div><div class='add'>+				 cfg-&gt;fc_ifindex != 0, NULL, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='ctx'> 	if (dev) {</div><div class='del'>-		if (dev != grt-&gt;dst.dev) {</div><div class='del'>-			ip6_rt_put(grt);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (dev != res.nh-&gt;fib_nh_dev)</div><div class='add'>+			err = -EHOSTUNREACH;</div><div class='ctx'> 	} else {</div><div class='del'>-		*_dev = dev = grt-&gt;dst.dev;</div><div class='del'>-		*idev = grt-&gt;rt6i_idev;</div><div class='del'>-		dev_hold(dev);</div><div class='del'>-		in6_dev_hold(grt-&gt;rt6i_idev);</div><div class='add'>+		*_dev = dev = res.nh-&gt;fib_nh_dev;</div><div class='add'>+		netdev_hold(dev, dev_tracker, GFP_ATOMIC);</div><div class='add'>+		*idev = in6_dev_get(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(grt-&gt;rt6i_flags &amp; RTF_GATEWAY))</div><div class='del'>-		err = 0;</div><div class='del'>-</div><div class='del'>-	ip6_rt_put(grt);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_validate_gw(struct net *net, struct fib6_config *cfg,</div><div class='del'>-			   struct net_device **_dev, struct inet6_dev **idev,</div><div class='add'>+			   struct net_device **_dev,</div><div class='add'>+			   netdevice_tracker *dev_tracker,</div><div class='add'>+			   struct inet6_dev **idev,</div><div class='ctx'> 			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct in6_addr *gw_addr = &amp;cfg-&gt;fc_gateway;</div><div class='hunk'>@@ -2899,10 +3513,15 @@ static int ip6_validate_gw(struct net *net, struct fib6_config *cfg,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 		if (cfg-&gt;fc_flags &amp; RTNH_F_ONLINK)</div><div class='ctx'> 			err = ip6_route_check_nh_onlink(net, cfg, dev, extack);</div><div class='ctx'> 		else</div><div class='del'>-			err = ip6_route_check_nh(net, cfg, _dev, idev);</div><div class='add'>+			err = ip6_route_check_nh(net, cfg, _dev, dev_tracker,</div><div class='add'>+						 idev);</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2935,79 +3554,243 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,</div><div class='del'>-					      gfp_t gfp_flags,</div><div class='del'>-					      struct netlink_ext_ack *extack)</div><div class='add'>+static bool fib6_is_reject(u32 flags, struct net_device *dev, int addr_type)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = cfg-&gt;fc_nlinfo.nl_net;</div><div class='del'>-	struct fib6_info *rt = NULL;</div><div class='add'>+	if ((flags &amp; RTF_REJECT) ||</div><div class='add'>+	    (dev &amp;&amp; (dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='add'>+	     !(addr_type &amp; IPV6_ADDR_LOOPBACK) &amp;&amp;</div><div class='add'>+	     !(flags &amp; (RTF_ANYCAST | RTF_LOCAL))))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,</div><div class='add'>+		 struct fib6_config *cfg, gfp_t gfp_flags,</div><div class='add'>+		 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	netdevice_tracker *dev_tracker = &amp;fib6_nh-&gt;fib_nh_dev_tracker;</div><div class='ctx'> 	struct net_device *dev = NULL;</div><div class='ctx'> 	struct inet6_dev *idev = NULL;</div><div class='del'>-	struct fib6_table *table;</div><div class='ctx'> 	int addr_type;</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fib6_nh-&gt;fib_nh_family = AF_INET6;</div><div class='add'>+#ifdef CONFIG_IPV6_ROUTER_PREF</div><div class='add'>+	fib6_nh-&gt;last_probe = jiffies;</div><div class='add'>+#endif</div><div class='add'>+	if (cfg-&gt;fc_is_fdb) {</div><div class='add'>+		fib6_nh-&gt;fib_nh_gw6 = cfg-&gt;fc_gateway;</div><div class='add'>+		fib6_nh-&gt;fib_nh_gw_family = AF_INET6;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (cfg-&gt;fc_ifindex) {</div><div class='add'>+		dev = netdev_get_by_index(net, cfg-&gt;fc_ifindex,</div><div class='add'>+					  dev_tracker, gfp_flags);</div><div class='add'>+		if (!dev)</div><div class='add'>+			goto out;</div><div class='add'>+		idev = in6_dev_get(dev);</div><div class='add'>+		if (!idev)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_flags &amp; RTNH_F_ONLINK) {</div><div class='add'>+		if (!dev) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Nexthop device required for onlink");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='add'>+			err = -ENETDOWN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fib6_nh-&gt;fib_nh_flags |= RTNH_F_ONLINK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fib6_nh-&gt;fib_nh_weight = 1;</div><div class='add'>+</div><div class='add'>+	/* We cannot add true routes via loopback here,</div><div class='add'>+	 * they would result in kernel looping; promote them to reject routes</div><div class='add'>+	 */</div><div class='add'>+	addr_type = ipv6_addr_type(&amp;cfg-&gt;fc_dst);</div><div class='add'>+	if (fib6_is_reject(cfg-&gt;fc_flags, dev, addr_type)) {</div><div class='add'>+		/* hold loopback dev/idev if we haven't done so. */</div><div class='add'>+		if (dev != net-&gt;loopback_dev) {</div><div class='add'>+			if (dev) {</div><div class='add'>+				netdev_put(dev, dev_tracker);</div><div class='add'>+				in6_dev_put(idev);</div><div class='add'>+			}</div><div class='add'>+			dev = net-&gt;loopback_dev;</div><div class='add'>+			netdev_hold(dev, dev_tracker, gfp_flags);</div><div class='add'>+			idev = in6_dev_get(dev);</div><div class='add'>+			if (!idev) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		goto pcpu_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_flags &amp; RTF_GATEWAY) {</div><div class='add'>+		err = ip6_validate_gw(net, cfg, &amp;dev, dev_tracker,</div><div class='add'>+				      &amp;idev, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		fib6_nh-&gt;fib_nh_gw6 = cfg-&gt;fc_gateway;</div><div class='add'>+		fib6_nh-&gt;fib_nh_gw_family = AF_INET6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!idev || idev-&gt;cnf.disable_ipv6) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 is disabled on nexthop device");</div><div class='add'>+		err = -EACCES;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_UP) &amp;&amp; !cfg-&gt;fc_ignore_dev_down) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='add'>+		err = -ENETDOWN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(cfg-&gt;fc_flags &amp; (RTF_LOCAL | RTF_ANYCAST)) &amp;&amp;</div><div class='add'>+	    !netif_carrier_ok(dev))</div><div class='add'>+		fib6_nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+</div><div class='add'>+	err = fib_nh_common_init(net, &amp;fib6_nh-&gt;nh_common, cfg-&gt;fc_encap,</div><div class='add'>+				 cfg-&gt;fc_encap_type, cfg, gfp_flags, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+pcpu_alloc:</div><div class='add'>+	fib6_nh-&gt;rt6i_pcpu = alloc_percpu_gfp(struct rt6_info *, gfp_flags);</div><div class='add'>+	if (!fib6_nh-&gt;rt6i_pcpu) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fib6_nh-&gt;fib_nh_dev = dev;</div><div class='add'>+	fib6_nh-&gt;fib_nh_oif = dev-&gt;ifindex;</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	if (idev)</div><div class='add'>+		in6_dev_put(idev);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		fib_nh_common_release(&amp;fib6_nh-&gt;nh_common);</div><div class='add'>+		fib6_nh-&gt;nh_common.nhc_pcpu_rth_output = NULL;</div><div class='add'>+		fib6_nh-&gt;fib_nh_lws = NULL;</div><div class='add'>+		netdev_put(dev, dev_tracker);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_nh_release(struct fib6_nh *fib6_nh)</div><div class='add'>+{</div><div class='add'>+	struct rt6_exception_bucket *bucket;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	fib6_nh_flush_exceptions(fib6_nh, NULL);</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(fib6_nh, NULL);</div><div class='add'>+	if (bucket) {</div><div class='add'>+		rcu_assign_pointer(fib6_nh-&gt;rt6i_exception_bucket, NULL);</div><div class='add'>+		kfree(bucket);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	fib6_nh_release_dsts(fib6_nh);</div><div class='add'>+	free_percpu(fib6_nh-&gt;rt6i_pcpu);</div><div class='add'>+</div><div class='add'>+	fib_nh_common_release(&amp;fib6_nh-&gt;nh_common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_nh_release_dsts(struct fib6_nh *fib6_nh)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!fib6_nh-&gt;rt6i_pcpu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct rt6_info *pcpu_rt, **ppcpu_rt;</div><div class='add'>+</div><div class='add'>+		ppcpu_rt = per_cpu_ptr(fib6_nh-&gt;rt6i_pcpu, cpu);</div><div class='add'>+		pcpu_rt = xchg(ppcpu_rt, NULL);</div><div class='add'>+		if (pcpu_rt) {</div><div class='add'>+			dst_dev_put(&amp;pcpu_rt-&gt;dst);</div><div class='add'>+			dst_release(&amp;pcpu_rt-&gt;dst);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fib6_config_validate(struct fib6_config *cfg,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='ctx'> 	/* RTF_PCPU is an internal flag; can not be set by userspace */</div><div class='ctx'> 	if (cfg-&gt;fc_flags &amp; RTF_PCPU) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Userspace can not set RTF_PCPU");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* RTF_CACHE is an internal flag; can not be set by userspace */</div><div class='ctx'> 	if (cfg-&gt;fc_flags &amp; RTF_CACHE) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Userspace can not set RTF_CACHE");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_type &gt; RTN_MAX) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid route type");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_dst_len &gt; 128) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid prefix length");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	if (cfg-&gt;fc_src_len &gt; 128) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Invalid source address length");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;fc_nh_id &amp;&amp; cfg-&gt;fc_src_len) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Nexthops can not be used with source routing");</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='del'>-#ifndef CONFIG_IPV6_SUBTREES</div><div class='add'>+#else</div><div class='ctx'> 	if (cfg-&gt;fc_src_len) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack,</div><div class='ctx'> 			       "Specifying source address requires IPV6_SUBTREES to be enabled");</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (cfg-&gt;fc_ifindex) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		dev = dev_get_by_index(net, cfg-&gt;fc_ifindex);</div><div class='del'>-		if (!dev)</div><div class='del'>-			goto out;</div><div class='del'>-		idev = in6_dev_get(dev);</div><div class='del'>-		if (!idev)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;fc_metric == 0)</div><div class='del'>-		cfg-&gt;fc_metric = IP6_RT_PRIO_USER;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;fc_flags &amp; RTNH_F_ONLINK) {</div><div class='del'>-		if (!dev) {</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Nexthop device required for onlink");</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	return 0;</div><div class='add'>+errout:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='del'>-			err = -ENETDOWN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,</div><div class='add'>+					       gfp_t gfp_flags,</div><div class='add'>+					       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = cfg-&gt;fc_nlinfo.nl_net;</div><div class='add'>+	struct fib6_table *table;</div><div class='add'>+	struct fib6_info *rt;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = -ENOBUFS;</div><div class='ctx'> 	if (cfg-&gt;fc_nlinfo.nlh &amp;&amp;</div><div class='ctx'> 	    !(cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags &amp; NLM_F_CREATE)) {</div><div class='ctx'> 		table = fib6_get_table(net, cfg-&gt;fc_table);</div><div class='hunk'>@@ -3018,144 +3801,128 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		table = fib6_new_table(net, cfg-&gt;fc_table);</div><div class='ctx'> 	}</div><div class='add'>+	if (!table) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!table)</div><div class='del'>-		goto out;</div><div class='add'>+	rt = fib6_info_alloc(gfp_flags, !cfg-&gt;fc_nh_id);</div><div class='add'>+	if (!rt) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	rt = fib6_info_alloc(gfp_flags);</div><div class='del'>-	if (!rt)</div><div class='del'>-		goto out;</div><div class='add'>+	rt-&gt;fib6_metrics = ip_fib_metrics_init(cfg-&gt;fc_mx, cfg-&gt;fc_mx_len,</div><div class='add'>+					       extack);</div><div class='add'>+	if (IS_ERR(rt-&gt;fib6_metrics)) {</div><div class='add'>+		err = PTR_ERR(rt-&gt;fib6_metrics);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_flags &amp; RTF_ADDRCONF)</div><div class='ctx'> 		rt-&gt;dst_nocount = true;</div><div class='ctx'> </div><div class='del'>-	err = ip6_convert_metrics(net, rt, cfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (cfg-&gt;fc_flags &amp; RTF_EXPIRES)</div><div class='ctx'> 		fib6_set_expires(rt, jiffies +</div><div class='del'>-				clock_t_to_jiffies(cfg-&gt;fc_expires));</div><div class='del'>-	else</div><div class='del'>-		fib6_clean_expires(rt);</div><div class='add'>+				 clock_t_to_jiffies(cfg-&gt;fc_expires));</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;fc_protocol == RTPROT_UNSPEC)</div><div class='ctx'> 		cfg-&gt;fc_protocol = RTPROT_BOOT;</div><div class='del'>-	rt-&gt;fib6_protocol = cfg-&gt;fc_protocol;</div><div class='del'>-</div><div class='del'>-	addr_type = ipv6_addr_type(&amp;cfg-&gt;fc_dst);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;fc_encap) {</div><div class='del'>-		struct lwtunnel_state *lwtstate;</div><div class='del'>-</div><div class='del'>-		err = lwtunnel_build_state(cfg-&gt;fc_encap_type,</div><div class='del'>-					   cfg-&gt;fc_encap, AF_INET6, cfg,</div><div class='del'>-					   &amp;lwtstate, extack);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		rt-&gt;fib6_nh.nh_lwtstate = lwtstate_get(lwtstate);</div><div class='del'>-	}</div><div class='add'>+	rt-&gt;fib6_protocol = cfg-&gt;fc_protocol;</div><div class='add'>+	rt-&gt;fib6_table = table;</div><div class='add'>+	rt-&gt;fib6_metric = cfg-&gt;fc_metric;</div><div class='add'>+	rt-&gt;fib6_type = cfg-&gt;fc_type ? : RTN_UNICAST;</div><div class='add'>+	rt-&gt;fib6_flags = cfg-&gt;fc_flags &amp; ~RTF_GATEWAY;</div><div class='ctx'> </div><div class='ctx'> 	ipv6_addr_prefix(&amp;rt-&gt;fib6_dst.addr, &amp;cfg-&gt;fc_dst, cfg-&gt;fc_dst_len);</div><div class='ctx'> 	rt-&gt;fib6_dst.plen = cfg-&gt;fc_dst_len;</div><div class='del'>-	if (rt-&gt;fib6_dst.plen == 128)</div><div class='del'>-		rt-&gt;dst_host = true;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='ctx'> 	ipv6_addr_prefix(&amp;rt-&gt;fib6_src.addr, &amp;cfg-&gt;fc_src, cfg-&gt;fc_src_len);</div><div class='ctx'> 	rt-&gt;fib6_src.plen = cfg-&gt;fc_src_len;</div><div class='ctx'> #endif</div><div class='add'>+	return rt;</div><div class='add'>+free:</div><div class='add'>+	kfree(rt);</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rt-&gt;fib6_metric = cfg-&gt;fc_metric;</div><div class='del'>-	rt-&gt;fib6_nh.nh_weight = 1;</div><div class='add'>+static int ip6_route_info_create_nh(struct fib6_info *rt,</div><div class='add'>+				    struct fib6_config *cfg,</div><div class='add'>+				    gfp_t gfp_flags,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *net = cfg-&gt;fc_nlinfo.nl_net;</div><div class='add'>+	struct fib6_nh *fib6_nh;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	rt-&gt;fib6_type = cfg-&gt;fc_type;</div><div class='add'>+	if (cfg-&gt;fc_nh_id) {</div><div class='add'>+		struct nexthop *nh;</div><div class='ctx'> </div><div class='del'>-	/* We cannot add true routes via loopback here,</div><div class='del'>-	   they would result in kernel looping; promote them to reject routes</div><div class='del'>-	 */</div><div class='del'>-	if ((cfg-&gt;fc_flags &amp; RTF_REJECT) ||</div><div class='del'>-	    (dev &amp;&amp; (dev-&gt;flags &amp; IFF_LOOPBACK) &amp;&amp;</div><div class='del'>-	     !(addr_type &amp; IPV6_ADDR_LOOPBACK) &amp;&amp;</div><div class='del'>-	     !(cfg-&gt;fc_flags &amp; RTF_LOCAL))) {</div><div class='del'>-		/* hold loopback dev/idev if we haven't done so. */</div><div class='del'>-		if (dev != net-&gt;loopback_dev) {</div><div class='del'>-			if (dev) {</div><div class='del'>-				dev_put(dev);</div><div class='del'>-				in6_dev_put(idev);</div><div class='del'>-			}</div><div class='del'>-			dev = net-&gt;loopback_dev;</div><div class='del'>-			dev_hold(dev);</div><div class='del'>-			idev = in6_dev_get(dev);</div><div class='del'>-			if (!idev) {</div><div class='del'>-				err = -ENODEV;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='add'>+		nh = nexthop_find_by_id(net, cfg-&gt;fc_nh_id);</div><div class='add'>+		if (!nh) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop id does not exist");</div><div class='add'>+			goto out_free;</div><div class='ctx'> 		}</div><div class='del'>-		rt-&gt;fib6_flags = RTF_REJECT|RTF_NONEXTHOP;</div><div class='del'>-		goto install_route;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;fc_flags &amp; RTF_GATEWAY) {</div><div class='del'>-		err = ip6_validate_gw(net, cfg, &amp;dev, &amp;idev, extack);</div><div class='add'>+		err = fib6_check_nexthop(nh, cfg, extack);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_free;</div><div class='ctx'> </div><div class='del'>-		rt-&gt;fib6_nh.nh_gw = cfg-&gt;fc_gateway;</div><div class='del'>-	}</div><div class='add'>+		if (!nexthop_get(nh)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop has been deleted");</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	err = -ENODEV;</div><div class='del'>-	if (!dev)</div><div class='del'>-		goto out;</div><div class='add'>+		rt-&gt;nh = nh;</div><div class='add'>+		fib6_nh = nexthop_fib6_nh(rt-&gt;nh);</div><div class='ctx'> </div><div class='del'>-	if (idev-&gt;cnf.disable_ipv6) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "IPv6 is disabled on nexthop device");</div><div class='del'>-		err = -EACCES;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		int addr_type;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Nexthop device is not up");</div><div class='del'>-		err = -ENETDOWN;</div><div class='del'>-		goto out;</div><div class='add'>+		err = fib6_nh_init(net, rt-&gt;fib6_nh, cfg, gfp_flags, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_release;</div><div class='add'>+</div><div class='add'>+		fib6_nh = rt-&gt;fib6_nh;</div><div class='add'>+</div><div class='add'>+		/* We cannot add true routes via loopback here, they would</div><div class='add'>+		 * result in kernel looping; promote them to reject routes</div><div class='add'>+		 */</div><div class='add'>+		addr_type = ipv6_addr_type(&amp;cfg-&gt;fc_dst);</div><div class='add'>+		if (fib6_is_reject(cfg-&gt;fc_flags, rt-&gt;fib6_nh-&gt;fib_nh_dev,</div><div class='add'>+				   addr_type))</div><div class='add'>+			rt-&gt;fib6_flags = RTF_REJECT | RTF_NONEXTHOP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ipv6_addr_any(&amp;cfg-&gt;fc_prefsrc)) {</div><div class='add'>+		struct net_device *dev = fib6_nh-&gt;fib_nh_dev;</div><div class='add'>+</div><div class='ctx'> 		if (!ipv6_chk_addr(net, &amp;cfg-&gt;fc_prefsrc, dev, 0)) {</div><div class='ctx'> 			NL_SET_ERR_MSG(extack, "Invalid source address");</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_release;</div><div class='ctx'> 		}</div><div class='ctx'> 		rt-&gt;fib6_prefsrc.addr = cfg-&gt;fc_prefsrc;</div><div class='ctx'> 		rt-&gt;fib6_prefsrc.plen = 128;</div><div class='del'>-	} else</div><div class='del'>-		rt-&gt;fib6_prefsrc.plen = 0;</div><div class='del'>-</div><div class='del'>-	rt-&gt;fib6_flags = cfg-&gt;fc_flags;</div><div class='del'>-</div><div class='del'>-install_route:</div><div class='del'>-	if (!(rt-&gt;fib6_flags &amp; (RTF_LOCAL | RTF_ANYCAST)) &amp;&amp;</div><div class='del'>-	    !netif_carrier_ok(dev))</div><div class='del'>-		rt-&gt;fib6_nh.nh_flags |= RTNH_F_LINKDOWN;</div><div class='del'>-	rt-&gt;fib6_nh.nh_flags |= (cfg-&gt;fc_flags &amp; RTNH_F_ONLINK);</div><div class='del'>-	rt-&gt;fib6_nh.nh_dev = dev;</div><div class='del'>-	rt-&gt;fib6_table = table;</div><div class='del'>-</div><div class='del'>-	cfg-&gt;fc_nlinfo.nl_net = dev_net(dev);</div><div class='del'>-</div><div class='del'>-	if (idev)</div><div class='del'>-		in6_dev_put(idev);</div><div class='del'>-</div><div class='del'>-	return rt;</div><div class='del'>-out:</div><div class='del'>-	if (dev)</div><div class='del'>-		dev_put(dev);</div><div class='del'>-	if (idev)</div><div class='del'>-		in6_dev_put(idev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+out_release:</div><div class='ctx'> 	fib6_info_release(rt);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+	return err;</div><div class='add'>+out_free:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	ip_fib_metrics_put(rt-&gt;fib6_metrics);</div><div class='add'>+	kfree(rt);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,</div><div class='hunk'>@@ -3164,10 +3931,18 @@ int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,</div><div class='ctx'> 	struct fib6_info *rt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = fib6_config_validate(cfg, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	rt = ip6_route_info_create(cfg, gfp_flags, extack);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return PTR_ERR(rt);</div><div class='ctx'> </div><div class='add'>+	err = ip6_route_info_create_nh(rt, cfg, gfp_flags, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = __ip6_ins_rt(rt, &amp;cfg-&gt;fc_nlinfo, extack);</div><div class='ctx'> 	fib6_info_release(rt);</div><div class='ctx'> </div><div class='hunk'>@@ -3195,9 +3970,12 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ip6_del_rt(struct net *net, struct fib6_info *rt)</div><div class='add'>+int ip6_del_rt(struct net *net, struct fib6_info *rt, bool skip_notify)</div><div class='ctx'> {</div><div class='del'>-	struct nl_info info = { .nl_net = net };</div><div class='add'>+	struct nl_info info = {</div><div class='add'>+		.nl_net = net,</div><div class='add'>+		.skip_notify = skip_notify</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	return __ip6_del_rt(rt, &amp;info);</div><div class='ctx'> }</div><div class='hunk'>@@ -3217,6 +3995,7 @@ static int __ip6_del_rt_siblings(struct fib6_info *rt, struct fib6_config *cfg)</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;fib6_nsiblings &amp;&amp; cfg-&gt;fc_delete_all_nh) {</div><div class='ctx'> 		struct fib6_info *sibling, *next_sibling;</div><div class='add'>+		struct fib6_node *fn;</div><div class='ctx'> </div><div class='ctx'> 		/* prefer to send a single notification with all hops */</div><div class='ctx'> 		skb = nlmsg_new(rt6_nlmsg_size(rt), gfp_any());</div><div class='hunk'>@@ -3232,6 +4011,32 @@ static int __ip6_del_rt_siblings(struct fib6_info *rt, struct fib6_config *cfg)</div><div class='ctx'> 				info-&gt;skip_notify = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* 'rt' points to the first sibling route. If it is not the</div><div class='add'>+		 * leaf, then we do not need to send a notification. Otherwise,</div><div class='add'>+		 * we need to check if the last sibling has a next route or not</div><div class='add'>+		 * and emit a replace or delete notification, respectively.</div><div class='add'>+		 */</div><div class='add'>+		info-&gt;skip_notify_kernel = 1;</div><div class='add'>+		fn = rcu_dereference_protected(rt-&gt;fib6_node,</div><div class='add'>+					    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='add'>+		if (rcu_access_pointer(fn-&gt;leaf) == rt) {</div><div class='add'>+			struct fib6_info *last_sibling, *replace_rt;</div><div class='add'>+</div><div class='add'>+			last_sibling = list_last_entry(&amp;rt-&gt;fib6_siblings,</div><div class='add'>+						       struct fib6_info,</div><div class='add'>+						       fib6_siblings);</div><div class='add'>+			replace_rt = rcu_dereference_protected(</div><div class='add'>+					    last_sibling-&gt;fib6_next,</div><div class='add'>+					    lockdep_is_held(&amp;table-&gt;tb6_lock));</div><div class='add'>+			if (replace_rt)</div><div class='add'>+				call_fib6_entry_notifiers_replace(net,</div><div class='add'>+								  replace_rt);</div><div class='add'>+			else</div><div class='add'>+				call_fib6_multipath_entry_notifiers(net,</div><div class='add'>+						       FIB_EVENT_ENTRY_DEL,</div><div class='add'>+						       rt, rt-&gt;fib6_nsiblings,</div><div class='add'>+						       NULL);</div><div class='add'>+		}</div><div class='ctx'> 		list_for_each_entry_safe(sibling, next_sibling,</div><div class='ctx'> 					 &amp;rt-&gt;fib6_siblings,</div><div class='ctx'> 					 fib6_siblings) {</div><div class='hunk'>@@ -3254,7 +4059,7 @@ out_put:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ip6_del_cached_rt(struct rt6_info *rt, struct fib6_config *cfg)</div><div class='add'>+static int __ip6_del_cached_rt(struct rt6_info *rt, struct fib6_config *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = -ESRCH;</div><div class='ctx'> </div><div class='hunk'>@@ -3264,16 +4069,55 @@ static int ip6_del_cached_rt(struct rt6_info *rt, struct fib6_config *cfg)</div><div class='ctx'> 	if (cfg-&gt;fc_flags &amp; RTF_GATEWAY &amp;&amp;</div><div class='ctx'> 	    !ipv6_addr_equal(&amp;cfg-&gt;fc_gateway, &amp;rt-&gt;rt6i_gateway))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (dst_hold_safe(&amp;rt-&gt;dst))</div><div class='del'>-		rc = rt6_remove_exception_rt(rt);</div><div class='add'>+</div><div class='add'>+	rc = rt6_remove_exception_rt(rt);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ip6_del_cached_rt(struct fib6_config *cfg, struct fib6_info *rt,</div><div class='add'>+			     struct fib6_nh *nh)</div><div class='add'>+{</div><div class='add'>+	struct fib6_result res = {</div><div class='add'>+		.f6i = rt,</div><div class='add'>+		.nh = nh,</div><div class='add'>+	};</div><div class='add'>+	struct rt6_info *rt_cache;</div><div class='add'>+</div><div class='add'>+	rt_cache = rt6_find_cached_rt(&amp;res, &amp;cfg-&gt;fc_dst, &amp;cfg-&gt;fc_src);</div><div class='add'>+	if (rt_cache)</div><div class='add'>+		return __ip6_del_cached_rt(rt_cache, cfg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fib6_nh_del_cached_rt_arg {</div><div class='add'>+	struct fib6_config *cfg;</div><div class='add'>+	struct fib6_info *f6i;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fib6_nh_del_cached_rt(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_del_cached_rt_arg *arg = _arg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = ip6_del_cached_rt(arg-&gt;cfg, arg-&gt;f6i, nh);</div><div class='add'>+	return rc != -ESRCH ? rc : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip6_del_cached_rt_nh(struct fib6_config *cfg, struct fib6_info *f6i)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_del_cached_rt_arg arg = {</div><div class='add'>+		.cfg = cfg,</div><div class='add'>+		.f6i = f6i</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return nexthop_for_each_fib6_nh(f6i-&gt;nh, fib6_nh_del_cached_rt, &amp;arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ip6_route_del(struct fib6_config *cfg,</div><div class='ctx'> 			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt_cache;</div><div class='ctx'> 	struct fib6_table *table;</div><div class='ctx'> 	struct fib6_info *rt;</div><div class='ctx'> 	struct fib6_node *fn;</div><div class='hunk'>@@ -3294,40 +4138,63 @@ static int ip6_route_del(struct fib6_config *cfg,</div><div class='ctx'> </div><div class='ctx'> 	if (fn) {</div><div class='ctx'> 		for_each_fib6_node_rt_rcu(fn) {</div><div class='add'>+			struct fib6_nh *nh;</div><div class='add'>+</div><div class='add'>+			if (rt-&gt;nh &amp;&amp; cfg-&gt;fc_nh_id &amp;&amp;</div><div class='add'>+			    rt-&gt;nh-&gt;id != cfg-&gt;fc_nh_id)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			if (cfg-&gt;fc_flags &amp; RTF_CACHE) {</div><div class='del'>-				int rc;</div><div class='del'>-</div><div class='del'>-				rt_cache = rt6_find_cached_rt(rt, &amp;cfg-&gt;fc_dst,</div><div class='del'>-							      &amp;cfg-&gt;fc_src);</div><div class='del'>-				if (rt_cache) {</div><div class='del'>-					rc = ip6_del_cached_rt(rt_cache, cfg);</div><div class='del'>-					if (rc != -ESRCH) {</div><div class='del'>-						rcu_read_unlock();</div><div class='del'>-						return rc;</div><div class='del'>-					}</div><div class='add'>+				int rc = 0;</div><div class='add'>+</div><div class='add'>+				if (rt-&gt;nh) {</div><div class='add'>+					rc = ip6_del_cached_rt_nh(cfg, rt);</div><div class='add'>+				} else if (cfg-&gt;fc_nh_id) {</div><div class='add'>+					continue;</div><div class='add'>+				} else {</div><div class='add'>+					nh = rt-&gt;fib6_nh;</div><div class='add'>+					rc = ip6_del_cached_rt(cfg, rt, nh);</div><div class='add'>+				}</div><div class='add'>+				if (rc != -ESRCH) {</div><div class='add'>+					rcu_read_unlock();</div><div class='add'>+					return rc;</div><div class='ctx'> 				}</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (cfg-&gt;fc_ifindex &amp;&amp;</div><div class='del'>-			    (!rt-&gt;fib6_nh.nh_dev ||</div><div class='del'>-			     rt-&gt;fib6_nh.nh_dev-&gt;ifindex != cfg-&gt;fc_ifindex))</div><div class='add'>+</div><div class='add'>+			if (cfg-&gt;fc_metric &amp;&amp; cfg-&gt;fc_metric != rt-&gt;fib6_metric)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (cfg-&gt;fc_flags &amp; RTF_GATEWAY &amp;&amp;</div><div class='del'>-			    !ipv6_addr_equal(&amp;cfg-&gt;fc_gateway, &amp;rt-&gt;fib6_nh.nh_gw))</div><div class='add'>+			if (cfg-&gt;fc_protocol &amp;&amp;</div><div class='add'>+			    cfg-&gt;fc_protocol != rt-&gt;fib6_protocol)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (cfg-&gt;fc_metric &amp;&amp; cfg-&gt;fc_metric != rt-&gt;fib6_metric)</div><div class='add'>+</div><div class='add'>+			if (rt-&gt;nh) {</div><div class='add'>+				if (!fib6_info_hold_safe(rt))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				err =  __ip6_del_rt(rt, &amp;cfg-&gt;fc_nlinfo);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (cfg-&gt;fc_nh_id)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (cfg-&gt;fc_protocol &amp;&amp; cfg-&gt;fc_protocol != rt-&gt;fib6_protocol)</div><div class='add'>+</div><div class='add'>+			nh = rt-&gt;fib6_nh;</div><div class='add'>+			if (cfg-&gt;fc_ifindex &amp;&amp;</div><div class='add'>+			    (!nh-&gt;fib_nh_dev ||</div><div class='add'>+			     nh-&gt;fib_nh_dev-&gt;ifindex != cfg-&gt;fc_ifindex))</div><div class='add'>+				continue;</div><div class='add'>+			if (cfg-&gt;fc_flags &amp; RTF_GATEWAY &amp;&amp;</div><div class='add'>+			    !ipv6_addr_equal(&amp;cfg-&gt;fc_gateway, &amp;nh-&gt;fib_nh_gw6))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (!fib6_info_hold_safe(rt))</div><div class='ctx'> 				continue;</div><div class='del'>-			rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 			/* if gateway was specified only delete the one hop */</div><div class='ctx'> 			if (cfg-&gt;fc_flags &amp; RTF_GATEWAY)</div><div class='del'>-				return __ip6_del_rt(rt, &amp;cfg-&gt;fc_nlinfo);</div><div class='del'>-</div><div class='del'>-			return __ip6_del_rt_siblings(rt, cfg);</div><div class='add'>+				err = __ip6_del_rt(rt, &amp;cfg-&gt;fc_nlinfo);</div><div class='add'>+			else</div><div class='add'>+				err = __ip6_del_rt_siblings(rt, cfg);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -3339,10 +4206,10 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> {</div><div class='ctx'> 	struct netevent_redirect netevent;</div><div class='ctx'> 	struct rt6_info *rt, *nrt = NULL;</div><div class='add'>+	struct fib6_result res = {};</div><div class='ctx'> 	struct ndisc_options ndopts;</div><div class='ctx'> 	struct inet6_dev *in6_dev;</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='del'>-	struct fib6_info *from;</div><div class='ctx'> 	struct rd_msg *msg;</div><div class='ctx'> 	int optlen, on_link;</div><div class='ctx'> 	u8 *lladdr;</div><div class='hunk'>@@ -3374,7 +4241,8 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> 	in6_dev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> 	if (!in6_dev)</div><div class='ctx'> 		return;</div><div class='del'>-	if (in6_dev-&gt;cnf.forwarding || !in6_dev-&gt;cnf.accept_redirects)</div><div class='add'>+	if (READ_ONCE(in6_dev-&gt;cnf.forwarding) ||</div><div class='add'>+	    !READ_ONCE(in6_dev-&gt;cnf.accept_redirects))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC2461 8.1:</div><div class='hunk'>@@ -3397,7 +4265,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rt = (struct rt6_info *) dst;</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='ctx'> 	if (rt-&gt;rt6i_flags &amp; RTF_REJECT) {</div><div class='ctx'> 		net_dbg_ratelimited("rt6_redirect: source isn't a valid nexthop for redirect target\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3425,14 +4293,32 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> 		     NDISC_REDIRECT, &amp;ndopts);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	from = rcu_dereference(rt-&gt;from);</div><div class='del'>-	/* This fib6_info_hold() is safe here because we hold reference to rt</div><div class='del'>-	 * and rt already holds reference to fib6_info.</div><div class='del'>-	 */</div><div class='del'>-	fib6_info_hold(from);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	res.f6i = rcu_dereference(rt-&gt;from);</div><div class='add'>+	if (!res.f6i)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (res.f6i-&gt;nh) {</div><div class='add'>+		struct fib6_nh_match_arg arg = {</div><div class='add'>+			.dev = dst_dev_rcu(dst),</div><div class='add'>+			.gw = &amp;rt-&gt;rt6i_gateway,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nexthop_for_each_fib6_nh(res.f6i-&gt;nh,</div><div class='add'>+					 fib6_nh_find_match, &amp;arg);</div><div class='ctx'> </div><div class='del'>-	nrt = ip6_rt_cache_alloc(from, &amp;msg-&gt;dest, NULL);</div><div class='add'>+		/* fib6_info uses a nexthop that does not have fib6_nh</div><div class='add'>+		 * using the dst-&gt;dev. Should be impossible</div><div class='add'>+		 */</div><div class='add'>+		if (!arg.match)</div><div class='add'>+			goto out;</div><div class='add'>+		res.nh = arg.match;</div><div class='add'>+	} else {</div><div class='add'>+		res.nh = res.f6i-&gt;fib6_nh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res.fib6_flags = res.f6i-&gt;fib6_flags;</div><div class='add'>+	res.fib6_type = res.f6i-&gt;fib6_type;</div><div class='add'>+	nrt = ip6_rt_cache_alloc(&amp;res, &amp;msg-&gt;dest, NULL);</div><div class='ctx'> 	if (!nrt)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3442,11 +4328,8 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> </div><div class='ctx'> 	nrt-&gt;rt6i_gateway = *(struct in6_addr *)neigh-&gt;primary_key;</div><div class='ctx'> </div><div class='del'>-	/* No need to remove rt from the exception table if rt is</div><div class='del'>-	 * a cached route because rt6_insert_exception() will</div><div class='del'>-	 * takes care of it</div><div class='del'>-	 */</div><div class='del'>-	if (rt6_insert_exception(nrt, from)) {</div><div class='add'>+	/* rt6_insert_exception() will take care of duplicated exceptions */</div><div class='add'>+	if (rt6_insert_exception(nrt, &amp;res)) {</div><div class='ctx'> 		dst_release_immediate(&amp;nrt-&gt;dst);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3458,7 +4341,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu</div><div class='ctx'> 	call_netevent_notifiers(NETEVENT_REDIRECT, &amp;netevent);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	fib6_info_release(from);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	neigh_release(neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3484,11 +4367,15 @@ static struct fib6_info *rt6_get_route_info(struct net *net,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	for_each_fib6_node_rt_rcu(fn) {</div><div class='del'>-		if (rt-&gt;fib6_nh.nh_dev-&gt;ifindex != ifindex)</div><div class='add'>+		/* these routes do not use nexthops */</div><div class='add'>+		if (rt-&gt;nh)</div><div class='add'>+			continue;</div><div class='add'>+		if (rt-&gt;fib6_nh-&gt;fib_nh_dev-&gt;ifindex != ifindex)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((rt-&gt;fib6_flags &amp; (RTF_ROUTEINFO|RTF_GATEWAY)) != (RTF_ROUTEINFO|RTF_GATEWAY))</div><div class='add'>+		if (!(rt-&gt;fib6_flags &amp; RTF_ROUTEINFO) ||</div><div class='add'>+		    !rt-&gt;fib6_nh-&gt;fib_nh_gw_family)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!ipv6_addr_equal(&amp;rt-&gt;fib6_nh.nh_gw, gwaddr))</div><div class='add'>+		if (!ipv6_addr_equal(&amp;rt-&gt;fib6_nh-&gt;fib_nh_gw6, gwaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!fib6_info_hold_safe(rt))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -3518,7 +4405,7 @@ static struct fib6_info *rt6_add_route_info(struct net *net,</div><div class='ctx'> 		.fc_nlinfo.nl_net = net,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	cfg.fc_table = l3mdev_fib_table(dev) ? : RT6_TABLE_INFO,</div><div class='add'>+	cfg.fc_table = l3mdev_fib_table(dev) ? : RT6_TABLE_INFO;</div><div class='ctx'> 	cfg.fc_dst = *prefix;</div><div class='ctx'> 	cfg.fc_gateway = *gwaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -3546,9 +4433,16 @@ struct fib6_info *rt6_get_dflt_router(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for_each_fib6_node_rt_rcu(&amp;table-&gt;tb6_root) {</div><div class='del'>-		if (dev == rt-&gt;fib6_nh.nh_dev &amp;&amp;</div><div class='add'>+		struct fib6_nh *nh;</div><div class='add'>+</div><div class='add'>+		/* RA routes do not use nexthops */</div><div class='add'>+		if (rt-&gt;nh)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nh = rt-&gt;fib6_nh;</div><div class='add'>+		if (dev == nh-&gt;fib_nh_dev &amp;&amp;</div><div class='ctx'> 		    ((rt-&gt;fib6_flags &amp; (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) &amp;&amp;</div><div class='del'>-		    ipv6_addr_equal(&amp;rt-&gt;fib6_nh.nh_gw, addr))</div><div class='add'>+		    ipv6_addr_equal(&amp;nh-&gt;fib_nh_gw6, addr))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rt &amp;&amp; !fib6_info_hold_safe(rt))</div><div class='hunk'>@@ -3560,11 +4454,13 @@ struct fib6_info *rt6_get_dflt_router(struct net *net,</div><div class='ctx'> struct fib6_info *rt6_add_dflt_router(struct net *net,</div><div class='ctx'> 				     const struct in6_addr *gwaddr,</div><div class='ctx'> 				     struct net_device *dev,</div><div class='del'>-				     unsigned int pref)</div><div class='add'>+				     unsigned int pref,</div><div class='add'>+				     u32 defrtr_usr_metric,</div><div class='add'>+				     int lifetime)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_config cfg = {</div><div class='ctx'> 		.fc_table	= l3mdev_fib_table(dev) ? : RT6_TABLE_DFLT,</div><div class='del'>-		.fc_metric	= IP6_RT_PRIO_USER,</div><div class='add'>+		.fc_metric	= defrtr_usr_metric,</div><div class='ctx'> 		.fc_ifindex	= dev-&gt;ifindex,</div><div class='ctx'> 		.fc_flags	= RTF_GATEWAY | RTF_ADDRCONF | RTF_DEFAULT |</div><div class='ctx'> 				  RTF_UP | RTF_EXPIRES | RTF_PREF(pref),</div><div class='hunk'>@@ -3573,6 +4469,7 @@ struct fib6_info *rt6_add_dflt_router(struct net *net,</div><div class='ctx'> 		.fc_nlinfo.portid = 0,</div><div class='ctx'> 		.fc_nlinfo.nlh = NULL,</div><div class='ctx'> 		.fc_nlinfo.nl_net = net,</div><div class='add'>+		.fc_expires = jiffies_to_clock_t(lifetime * HZ),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cfg.fc_gateway = *gwaddr;</div><div class='hunk'>@@ -3603,7 +4500,7 @@ restart:</div><div class='ctx'> 		    (!idev || idev-&gt;cnf.accept_ra != 2) &amp;&amp;</div><div class='ctx'> 		    fib6_info_hold_safe(rt)) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-			ip6_del_rt(net, rt);</div><div class='add'>+			ip6_del_rt(net, rt, false);</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3635,60 +4532,50 @@ static void rtmsg_to_fib6_config(struct net *net,</div><div class='ctx'> 				 struct in6_rtmsg *rtmsg,</div><div class='ctx'> 				 struct fib6_config *cfg)</div><div class='ctx'> {</div><div class='del'>-	memset(cfg, 0, sizeof(*cfg));</div><div class='del'>-</div><div class='del'>-	cfg-&gt;fc_table = l3mdev_fib_table_by_index(net, rtmsg-&gt;rtmsg_ifindex) ?</div><div class='del'>-			 : RT6_TABLE_MAIN;</div><div class='del'>-	cfg-&gt;fc_ifindex = rtmsg-&gt;rtmsg_ifindex;</div><div class='del'>-	cfg-&gt;fc_metric = rtmsg-&gt;rtmsg_metric;</div><div class='del'>-	cfg-&gt;fc_expires = rtmsg-&gt;rtmsg_info;</div><div class='del'>-	cfg-&gt;fc_dst_len = rtmsg-&gt;rtmsg_dst_len;</div><div class='del'>-	cfg-&gt;fc_src_len = rtmsg-&gt;rtmsg_src_len;</div><div class='del'>-	cfg-&gt;fc_flags = rtmsg-&gt;rtmsg_flags;</div><div class='del'>-	cfg-&gt;fc_type = rtmsg-&gt;rtmsg_type;</div><div class='add'>+	*cfg = (struct fib6_config){</div><div class='add'>+		.fc_table = l3mdev_fib_table_by_index(net, rtmsg-&gt;rtmsg_ifindex) ?</div><div class='add'>+			 : RT6_TABLE_MAIN,</div><div class='add'>+		.fc_ifindex = rtmsg-&gt;rtmsg_ifindex,</div><div class='add'>+		.fc_metric = rtmsg-&gt;rtmsg_metric,</div><div class='add'>+		.fc_expires = rtmsg-&gt;rtmsg_info,</div><div class='add'>+		.fc_dst_len = rtmsg-&gt;rtmsg_dst_len,</div><div class='add'>+		.fc_src_len = rtmsg-&gt;rtmsg_src_len,</div><div class='add'>+		.fc_flags = rtmsg-&gt;rtmsg_flags,</div><div class='add'>+		.fc_type = rtmsg-&gt;rtmsg_type,</div><div class='ctx'> </div><div class='del'>-	cfg-&gt;fc_nlinfo.nl_net = net;</div><div class='add'>+		.fc_nlinfo.nl_net = net,</div><div class='ctx'> </div><div class='del'>-	cfg-&gt;fc_dst = rtmsg-&gt;rtmsg_dst;</div><div class='del'>-	cfg-&gt;fc_src = rtmsg-&gt;rtmsg_src;</div><div class='del'>-	cfg-&gt;fc_gateway = rtmsg-&gt;rtmsg_gateway;</div><div class='add'>+		.fc_dst = rtmsg-&gt;rtmsg_dst,</div><div class='add'>+		.fc_src = rtmsg-&gt;rtmsg_src,</div><div class='add'>+		.fc_gateway = rtmsg-&gt;rtmsg_gateway,</div><div class='add'>+	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)</div><div class='add'>+int ipv6_route_ioctl(struct net *net, unsigned int cmd, struct in6_rtmsg *rtmsg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_config cfg;</div><div class='del'>-	struct in6_rtmsg rtmsg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCADDRT:		/* Add a route */</div><div class='del'>-	case SIOCDELRT:		/* Delete a route */</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='del'>-		err = copy_from_user(&amp;rtmsg, arg,</div><div class='del'>-				     sizeof(struct in6_rtmsg));</div><div class='del'>-		if (err)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		rtmsg_to_fib6_config(net, &amp;rtmsg, &amp;cfg);</div><div class='add'>+	if (cmd != SIOCADDRT &amp;&amp; cmd != SIOCDELRT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='del'>-		rtnl_lock();</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case SIOCADDRT:</div><div class='del'>-			err = ip6_route_add(&amp;cfg, GFP_KERNEL, NULL);</div><div class='del'>-			break;</div><div class='del'>-		case SIOCDELRT:</div><div class='del'>-			err = ip6_route_del(&amp;cfg, NULL);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+	rtmsg_to_fib6_config(net, rtmsg, &amp;cfg);</div><div class='ctx'> </div><div class='del'>-		return err;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCADDRT:</div><div class='add'>+		/* Only do the default setting of fc_metric in route adding */</div><div class='add'>+		if (cfg.fc_metric == 0)</div><div class='add'>+			cfg.fc_metric = IP6_RT_PRIO_USER;</div><div class='add'>+		err = ip6_route_add(&amp;cfg, GFP_KERNEL, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCDELRT:</div><div class='add'>+		err = ip6_route_del(&amp;cfg, NULL);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3697,25 +4584,41 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes)</div><div class='ctx'> {</div><div class='del'>-	int type;</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+	int type;</div><div class='add'>+</div><div class='add'>+	if (netif_is_l3_master(skb-&gt;dev) ||</div><div class='add'>+	    dev == net-&gt;loopback_dev)</div><div class='add'>+		idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)-&gt;iif));</div><div class='add'>+	else</div><div class='add'>+		idev = ip6_dst_idev(dst);</div><div class='add'>+</div><div class='ctx'> 	switch (ipstats_mib_noroutes) {</div><div class='ctx'> 	case IPSTATS_MIB_INNOROUTES:</div><div class='ctx'> 		type = ipv6_addr_type(&amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> 		if (type == IPV6_ADDR_ANY) {</div><div class='del'>-			IP6_INC_STATS(dev_net(dst-&gt;dev),</div><div class='del'>-				      __in6_dev_get_safely(skb-&gt;dev),</div><div class='del'>-				      IPSTATS_MIB_INADDRERRORS);</div><div class='add'>+			SKB_DR_SET(reason, IP_INADDRERRORS);</div><div class='add'>+			IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* FALLTHROUGH */</div><div class='add'>+		SKB_DR_SET(reason, IP_INNOROUTES);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IPSTATS_MIB_OUTNOROUTES:</div><div class='del'>-		IP6_INC_STATS(dev_net(dst-&gt;dev), ip6_dst_idev(dst),</div><div class='del'>-			      ipstats_mib_noroutes);</div><div class='add'>+		SKB_DR_OR(reason, IP_OUTNOROUTES);</div><div class='add'>+		IP6_INC_STATS(net, idev, ipstats_mib_noroutes);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Start over by dropping the dst for l3mdev case */</div><div class='add'>+	if (netif_is_l3_master(skb-&gt;dev))</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+</div><div class='ctx'> 	icmpv6_send(skb, ICMPV6_DEST_UNREACH, code, 0);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3726,7 +4629,7 @@ static int ip6_pkt_discard(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	skb-&gt;dev = skb_dst_dev(skb);</div><div class='ctx'> 	return ip6_pkt_drop(skb, ICMPV6_NOROUTE, IPSTATS_MIB_OUTNOROUTES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3737,7 +4640,7 @@ static int ip6_pkt_prohibit(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;dev = skb_dst(skb)-&gt;dev;</div><div class='add'>+	skb-&gt;dev = skb_dst_dev(skb);</div><div class='ctx'> 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3748,60 +4651,66 @@ static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff</div><div class='ctx'> struct fib6_info *addrconf_f6i_alloc(struct net *net,</div><div class='ctx'> 				     struct inet6_dev *idev,</div><div class='ctx'> 				     const struct in6_addr *addr,</div><div class='del'>-				     bool anycast, gfp_t gfp_flags)</div><div class='add'>+				     bool anycast, gfp_t gfp_flags,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	u32 tb_id;</div><div class='del'>-	struct net_device *dev = idev-&gt;dev;</div><div class='add'>+	struct fib6_config cfg = {</div><div class='add'>+		.fc_table = l3mdev_fib_table(idev-&gt;dev) ? : RT6_TABLE_LOCAL,</div><div class='add'>+		.fc_ifindex = idev-&gt;dev-&gt;ifindex,</div><div class='add'>+		.fc_flags = RTF_UP | RTF_NONEXTHOP,</div><div class='add'>+		.fc_dst = *addr,</div><div class='add'>+		.fc_dst_len = 128,</div><div class='add'>+		.fc_protocol = RTPROT_KERNEL,</div><div class='add'>+		.fc_nlinfo.nl_net = net,</div><div class='add'>+		.fc_ignore_dev_down = true,</div><div class='add'>+	};</div><div class='ctx'> 	struct fib6_info *f6i;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	f6i = fib6_info_alloc(gfp_flags);</div><div class='del'>-	if (!f6i)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	f6i-&gt;dst_nocount = true;</div><div class='del'>-	f6i-&gt;dst_host = true;</div><div class='del'>-	f6i-&gt;fib6_protocol = RTPROT_KERNEL;</div><div class='del'>-	f6i-&gt;fib6_flags = RTF_UP | RTF_NONEXTHOP;</div><div class='ctx'> 	if (anycast) {</div><div class='del'>-		f6i-&gt;fib6_type = RTN_ANYCAST;</div><div class='del'>-		f6i-&gt;fib6_flags |= RTF_ANYCAST;</div><div class='add'>+		cfg.fc_type = RTN_ANYCAST;</div><div class='add'>+		cfg.fc_flags |= RTF_ANYCAST;</div><div class='ctx'> 	} else {</div><div class='del'>-		f6i-&gt;fib6_type = RTN_LOCAL;</div><div class='del'>-		f6i-&gt;fib6_flags |= RTF_LOCAL;</div><div class='add'>+		cfg.fc_type = RTN_LOCAL;</div><div class='add'>+		cfg.fc_flags |= RTF_LOCAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f6i-&gt;fib6_nh.nh_gw = *addr;</div><div class='del'>-	dev_hold(dev);</div><div class='del'>-	f6i-&gt;fib6_nh.nh_dev = dev;</div><div class='del'>-	f6i-&gt;fib6_dst.addr = *addr;</div><div class='del'>-	f6i-&gt;fib6_dst.plen = 128;</div><div class='del'>-	tb_id = l3mdev_fib_table(idev-&gt;dev) ? : RT6_TABLE_LOCAL;</div><div class='del'>-	f6i-&gt;fib6_table = fib6_get_table(net, tb_id);</div><div class='add'>+	f6i = ip6_route_info_create(&amp;cfg, gfp_flags, extack);</div><div class='add'>+	if (IS_ERR(f6i))</div><div class='add'>+		return f6i;</div><div class='add'>+</div><div class='add'>+	err = ip6_route_info_create_nh(f6i, &amp;cfg, gfp_flags, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	f6i-&gt;dst_nocount = true;</div><div class='add'>+</div><div class='add'>+	if (!anycast &amp;&amp;</div><div class='add'>+	    (READ_ONCE(net-&gt;ipv6.devconf_all-&gt;disable_policy) ||</div><div class='add'>+	     READ_ONCE(idev-&gt;cnf.disable_policy)))</div><div class='add'>+		f6i-&gt;dst_nopolicy = true;</div><div class='ctx'> </div><div class='ctx'> 	return f6i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* remove deleted ip from prefsrc entries */</div><div class='ctx'> struct arg_dev_net_ip {</div><div class='del'>-	struct net_device *dev;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	struct in6_addr *addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int fib6_remove_prefsrc(struct fib6_info *rt, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = ((struct arg_dev_net_ip *)arg)-&gt;dev;</div><div class='ctx'> 	struct net *net = ((struct arg_dev_net_ip *)arg)-&gt;net;</div><div class='ctx'> 	struct in6_addr *addr = ((struct arg_dev_net_ip *)arg)-&gt;addr;</div><div class='ctx'> </div><div class='del'>-	if (((void *)rt-&gt;fib6_nh.nh_dev == dev || !dev) &amp;&amp;</div><div class='add'>+	if (!rt-&gt;nh &amp;&amp;</div><div class='ctx'> 	    rt != net-&gt;ipv6.fib6_null_entry &amp;&amp;</div><div class='del'>-	    ipv6_addr_equal(addr, &amp;rt-&gt;fib6_prefsrc.addr)) {</div><div class='add'>+	    ipv6_addr_equal(addr, &amp;rt-&gt;fib6_prefsrc.addr) &amp;&amp;</div><div class='add'>+	    !ipv6_chk_addr(net, addr, rt-&gt;fib6_nh-&gt;fib_nh_dev, 0)) {</div><div class='ctx'> 		spin_lock_bh(&amp;rt6_exception_lock);</div><div class='ctx'> 		/* remove prefsrc entry */</div><div class='ctx'> 		rt-&gt;fib6_prefsrc.plen = 0;</div><div class='del'>-		/* need to update cache as well */</div><div class='del'>-		rt6_exceptions_remove_prefsrc(rt);</div><div class='ctx'> 		spin_unlock_bh(&amp;rt6_exception_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3811,30 +4720,34 @@ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(ifp-&gt;idev-&gt;dev);</div><div class='ctx'> 	struct arg_dev_net_ip adni = {</div><div class='del'>-		.dev = ifp-&gt;idev-&gt;dev,</div><div class='ctx'> 		.net = net,</div><div class='ctx'> 		.addr = &amp;ifp-&gt;addr,</div><div class='ctx'> 	};</div><div class='ctx'> 	fib6_clean_all(net, fib6_remove_prefsrc, &amp;adni);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define RTF_RA_ROUTER		(RTF_ADDRCONF | RTF_DEFAULT | RTF_GATEWAY)</div><div class='add'>+#define RTF_RA_ROUTER		(RTF_ADDRCONF | RTF_DEFAULT)</div><div class='ctx'> </div><div class='ctx'> /* Remove routers and update dst entries when gateway turn into host. */</div><div class='ctx'> static int fib6_clean_tohost(struct fib6_info *rt, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct in6_addr *gateway = (struct in6_addr *)arg;</div><div class='add'>+	struct fib6_nh *nh;</div><div class='ctx'> </div><div class='add'>+	/* RA routes do not use nexthops */</div><div class='add'>+	if (rt-&gt;nh)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nh = rt-&gt;fib6_nh;</div><div class='ctx'> 	if (((rt-&gt;fib6_flags &amp; RTF_RA_ROUTER) == RTF_RA_ROUTER) &amp;&amp;</div><div class='del'>-	    ipv6_addr_equal(gateway, &amp;rt-&gt;fib6_nh.nh_gw)) {</div><div class='add'>+	    nh-&gt;fib_nh_gw_family &amp;&amp; ipv6_addr_equal(gateway, &amp;nh-&gt;fib_nh_gw6))</div><div class='ctx'> 		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Further clean up cached routes in exception table.</div><div class='ctx'> 	 * This is needed because cached route may have a different</div><div class='ctx'> 	 * gateway than its 'parent' in the case of an ip redirect.</div><div class='ctx'> 	 */</div><div class='del'>-	rt6_exceptions_clean_tohost(rt, gateway);</div><div class='add'>+	fib6_nh_exceptions_clean_tohost(nh, gateway);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3847,7 +4760,7 @@ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway)</div><div class='ctx'> struct arg_netdev_event {</div><div class='ctx'> 	const struct net_device *dev;</div><div class='ctx'> 	union {</div><div class='del'>-		unsigned int nh_flags;</div><div class='add'>+		unsigned char nh_flags;</div><div class='ctx'> 		unsigned long event;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='hunk'>@@ -3872,11 +4785,12 @@ static struct fib6_info *rt6_multipath_first_sibling(const struct fib6_info *rt)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* only called for fib entries with builtin fib6_nh */</div><div class='ctx'> static bool rt6_is_dead(const struct fib6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD ||</div><div class='del'>-	    (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='del'>-	     fib6_ignore_linkdown(rt)))</div><div class='add'>+	if (rt-&gt;fib6_nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD ||</div><div class='add'>+	    (rt-&gt;fib6_nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN &amp;&amp;</div><div class='add'>+	     ip6_ignore_linkdown(rt-&gt;fib6_nh-&gt;fib_nh_dev)))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -3888,11 +4802,11 @@ static int rt6_multipath_total_weight(const struct fib6_info *rt)</div><div class='ctx'> 	int total = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!rt6_is_dead(rt))</div><div class='del'>-		total += rt-&gt;fib6_nh.nh_weight;</div><div class='add'>+		total += rt-&gt;fib6_nh-&gt;fib_nh_weight;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(iter, &amp;rt-&gt;fib6_siblings, fib6_siblings) {</div><div class='ctx'> 		if (!rt6_is_dead(iter))</div><div class='del'>-			total += iter-&gt;fib6_nh.nh_weight;</div><div class='add'>+			total += iter-&gt;fib6_nh-&gt;fib_nh_weight;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return total;</div><div class='hunk'>@@ -3903,11 +4817,11 @@ static void rt6_upper_bound_set(struct fib6_info *rt, int *weight, int total)</div><div class='ctx'> 	int upper_bound = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (!rt6_is_dead(rt)) {</div><div class='del'>-		*weight += rt-&gt;fib6_nh.nh_weight;</div><div class='add'>+		*weight += rt-&gt;fib6_nh-&gt;fib_nh_weight;</div><div class='ctx'> 		upper_bound = DIV_ROUND_CLOSEST_ULL((u64) (*weight) &lt;&lt; 31,</div><div class='ctx'> 						    total) - 1;</div><div class='ctx'> 	}</div><div class='del'>-	atomic_set(&amp;rt-&gt;fib6_nh.nh_upper_bound, upper_bound);</div><div class='add'>+	atomic_set(&amp;rt-&gt;fib6_nh-&gt;fib_nh_upper_bound, upper_bound);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rt6_multipath_upper_bound_set(struct fib6_info *rt, int total)</div><div class='hunk'>@@ -3950,8 +4864,9 @@ static int fib6_ifup(struct fib6_info *rt, void *p_arg)</div><div class='ctx'> 	const struct arg_netdev_event *arg = p_arg;</div><div class='ctx'> 	struct net *net = dev_net(arg-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (rt != net-&gt;ipv6.fib6_null_entry &amp;&amp; rt-&gt;fib6_nh.nh_dev == arg-&gt;dev) {</div><div class='del'>-		rt-&gt;fib6_nh.nh_flags &amp;= ~arg-&gt;nh_flags;</div><div class='add'>+	if (rt != net-&gt;ipv6.fib6_null_entry &amp;&amp; !rt-&gt;nh &amp;&amp;</div><div class='add'>+	    rt-&gt;fib6_nh-&gt;fib_nh_dev == arg-&gt;dev) {</div><div class='add'>+		rt-&gt;fib6_nh-&gt;fib_nh_flags &amp;= ~arg-&gt;nh_flags;</div><div class='ctx'> 		fib6_update_sernum_upto_root(net, rt);</div><div class='ctx'> 		rt6_multipath_rebalance(rt);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3959,7 +4874,7 @@ static int fib6_ifup(struct fib6_info *rt, void *p_arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rt6_sync_up(struct net_device *dev, unsigned int nh_flags)</div><div class='add'>+void rt6_sync_up(struct net_device *dev, unsigned char nh_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct arg_netdev_event arg = {</div><div class='ctx'> 		.dev = dev,</div><div class='hunk'>@@ -3974,15 +4889,16 @@ void rt6_sync_up(struct net_device *dev, unsigned int nh_flags)</div><div class='ctx'> 	fib6_clean_all(dev_net(dev), fib6_ifup, &amp;arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* only called for fib entries with inline fib6_nh */</div><div class='ctx'> static bool rt6_multipath_uses_dev(const struct fib6_info *rt,</div><div class='ctx'> 				   const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *iter;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_nh.nh_dev == dev)</div><div class='add'>+	if (rt-&gt;fib6_nh-&gt;fib_nh_dev == dev)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	list_for_each_entry(iter, &amp;rt-&gt;fib6_siblings, fib6_siblings)</div><div class='del'>-		if (iter-&gt;fib6_nh.nh_dev == dev)</div><div class='add'>+		if (iter-&gt;fib6_nh-&gt;fib_nh_dev == dev)</div><div class='ctx'> 			return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -4003,12 +4919,12 @@ static unsigned int rt6_multipath_dead_count(const struct fib6_info *rt,</div><div class='ctx'> 	struct fib6_info *iter;</div><div class='ctx'> 	unsigned int dead = 0;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_nh.nh_dev == down_dev ||</div><div class='del'>-	    rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+	if (rt-&gt;fib6_nh-&gt;fib_nh_dev == down_dev ||</div><div class='add'>+	    rt-&gt;fib6_nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 		dead++;</div><div class='ctx'> 	list_for_each_entry(iter, &amp;rt-&gt;fib6_siblings, fib6_siblings)</div><div class='del'>-		if (iter-&gt;fib6_nh.nh_dev == down_dev ||</div><div class='del'>-		    iter-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='add'>+		if (iter-&gt;fib6_nh-&gt;fib_nh_dev == down_dev ||</div><div class='add'>+		    iter-&gt;fib6_nh-&gt;fib_nh_flags &amp; RTNH_F_DEAD)</div><div class='ctx'> 			dead++;</div><div class='ctx'> </div><div class='ctx'> 	return dead;</div><div class='hunk'>@@ -4016,15 +4932,15 @@ static unsigned int rt6_multipath_dead_count(const struct fib6_info *rt,</div><div class='ctx'> </div><div class='ctx'> static void rt6_multipath_nh_flags_set(struct fib6_info *rt,</div><div class='ctx'> 				       const struct net_device *dev,</div><div class='del'>-				       unsigned int nh_flags)</div><div class='add'>+				       unsigned char nh_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *iter;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_nh.nh_dev == dev)</div><div class='del'>-		rt-&gt;fib6_nh.nh_flags |= nh_flags;</div><div class='add'>+	if (rt-&gt;fib6_nh-&gt;fib_nh_dev == dev)</div><div class='add'>+		rt-&gt;fib6_nh-&gt;fib_nh_flags |= nh_flags;</div><div class='ctx'> 	list_for_each_entry(iter, &amp;rt-&gt;fib6_siblings, fib6_siblings)</div><div class='del'>-		if (iter-&gt;fib6_nh.nh_dev == dev)</div><div class='del'>-			iter-&gt;fib6_nh.nh_flags |= nh_flags;</div><div class='add'>+		if (iter-&gt;fib6_nh-&gt;fib_nh_dev == dev)</div><div class='add'>+			iter-&gt;fib6_nh-&gt;fib_nh_flags |= nh_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with write lock held for table with rt */</div><div class='hunk'>@@ -4034,17 +4950,17 @@ static int fib6_ifdown(struct fib6_info *rt, void *p_arg)</div><div class='ctx'> 	const struct net_device *dev = arg-&gt;dev;</div><div class='ctx'> 	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-	if (rt == net-&gt;ipv6.fib6_null_entry)</div><div class='add'>+	if (rt == net-&gt;ipv6.fib6_null_entry || rt-&gt;nh)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (arg-&gt;event) {</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='del'>-		return rt-&gt;fib6_nh.nh_dev == dev ? -1 : 0;</div><div class='add'>+		return rt-&gt;fib6_nh-&gt;fib_nh_dev == dev ? -1 : 0;</div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='ctx'> 		if (rt-&gt;should_flush)</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (!rt-&gt;fib6_nsiblings)</div><div class='del'>-			return rt-&gt;fib6_nh.nh_dev == dev ? -1 : 0;</div><div class='add'>+			return rt-&gt;fib6_nh-&gt;fib_nh_dev == dev ? -1 : 0;</div><div class='ctx'> 		if (rt6_multipath_uses_dev(rt, dev)) {</div><div class='ctx'> 			unsigned int count;</div><div class='ctx'> </div><div class='hunk'>@@ -4060,10 +4976,10 @@ static int fib6_ifdown(struct fib6_info *rt, void *p_arg)</div><div class='ctx'> 		}</div><div class='ctx'> 		return -2;</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='del'>-		if (rt-&gt;fib6_nh.nh_dev != dev ||</div><div class='add'>+		if (rt-&gt;fib6_nh-&gt;fib_nh_dev != dev ||</div><div class='ctx'> 		    rt-&gt;fib6_flags &amp; (RTF_LOCAL | RTF_ANYCAST))</div><div class='ctx'> 			break;</div><div class='del'>-		rt-&gt;fib6_nh.nh_flags |= RTNH_F_LINKDOWN;</div><div class='add'>+		rt-&gt;fib6_nh-&gt;fib_nh_flags |= RTNH_F_LINKDOWN;</div><div class='ctx'> 		rt6_multipath_rebalance(rt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4079,23 +4995,54 @@ void rt6_sync_down_dev(struct net_device *dev, unsigned long event)</div><div class='ctx'> 			.event = event,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='ctx'> </div><div class='del'>-	fib6_clean_all(dev_net(dev), fib6_ifdown, &amp;arg);</div><div class='add'>+	if (net-&gt;ipv6.sysctl.skip_notify_on_dev_down)</div><div class='add'>+		fib6_clean_all_skip_notify(net, fib6_ifdown, &amp;arg);</div><div class='add'>+	else</div><div class='add'>+		fib6_clean_all(net, fib6_ifdown, &amp;arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt6_disable_ip(struct net_device *dev, unsigned long event)</div><div class='ctx'> {</div><div class='ctx'> 	rt6_sync_down_dev(dev, event);</div><div class='del'>-	rt6_uncached_list_flush_dev(dev_net(dev), dev);</div><div class='add'>+	rt6_uncached_list_flush_dev(dev);</div><div class='ctx'> 	neigh_ifdown(&amp;nd_tbl, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct rt6_mtu_change_arg {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	unsigned int mtu;</div><div class='add'>+	struct fib6_info *f6i;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int rt6_mtu_change_route(struct fib6_info *rt, void *p_arg)</div><div class='add'>+static int fib6_nh_mtu_change(struct fib6_nh *nh, void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct rt6_mtu_change_arg *arg = (struct rt6_mtu_change_arg *)_arg;</div><div class='add'>+	struct fib6_info *f6i = arg-&gt;f6i;</div><div class='add'>+</div><div class='add'>+	/* For administrative MTU increase, there is no way to discover</div><div class='add'>+	 * IPv6 PMTU increase, so PMTU increase should be updated here.</div><div class='add'>+	 * Since RFC 1981 doesn't include administrative MTU increase</div><div class='add'>+	 * update PMTU increase is a MUST. (i.e. jumbo frame)</div><div class='add'>+	 */</div><div class='add'>+	if (nh-&gt;fib_nh_dev == arg-&gt;dev) {</div><div class='add'>+		struct inet6_dev *idev = __in6_dev_get(arg-&gt;dev);</div><div class='add'>+		u32 mtu = f6i-&gt;fib6_pmtu;</div><div class='add'>+</div><div class='add'>+		if (mtu &gt;= arg-&gt;mtu ||</div><div class='add'>+		    (mtu &lt; arg-&gt;mtu &amp;&amp; mtu == idev-&gt;cnf.mtu6))</div><div class='add'>+			fib6_metric_set(f6i, RTAX_MTU, arg-&gt;mtu);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;rt6_exception_lock);</div><div class='add'>+		rt6_exceptions_update_pmtu(idev, nh, arg-&gt;mtu);</div><div class='add'>+		spin_unlock_bh(&amp;rt6_exception_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rt6_mtu_change_route(struct fib6_info *f6i, void *p_arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_mtu_change_arg *arg = (struct rt6_mtu_change_arg *) p_arg;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='hunk'>@@ -4110,24 +5057,17 @@ static int rt6_mtu_change_route(struct fib6_info *rt, void *p_arg)</div><div class='ctx'> 	if (!idev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* For administrative MTU increase, there is no way to discover</div><div class='del'>-	   IPv6 PMTU increase, so PMTU increase should be updated here.</div><div class='del'>-	   Since RFC 1981 doesn't include administrative MTU increase</div><div class='del'>-	   update PMTU increase is a MUST. (i.e. jumbo frame)</div><div class='del'>-	 */</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_dev == arg-&gt;dev &amp;&amp;</div><div class='del'>-	    !fib6_metric_locked(rt, RTAX_MTU)) {</div><div class='del'>-		u32 mtu = rt-&gt;fib6_pmtu;</div><div class='del'>-</div><div class='del'>-		if (mtu &gt;= arg-&gt;mtu ||</div><div class='del'>-		    (mtu &lt; arg-&gt;mtu &amp;&amp; mtu == idev-&gt;cnf.mtu6))</div><div class='del'>-			fib6_metric_set(rt, RTAX_MTU, arg-&gt;mtu);</div><div class='add'>+	if (fib6_metric_locked(f6i, RTAX_MTU))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;rt6_exception_lock);</div><div class='del'>-		rt6_exceptions_update_pmtu(idev, rt, arg-&gt;mtu);</div><div class='del'>-		spin_unlock_bh(&amp;rt6_exception_lock);</div><div class='add'>+	arg-&gt;f6i = f6i;</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		/* fib6_nh_mtu_change only returns 0, so this is safe */</div><div class='add'>+		return nexthop_for_each_fib6_nh(f6i-&gt;nh, fib6_nh_mtu_change,</div><div class='add'>+						arg);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return fib6_nh_mtu_change(f6i-&gt;fib6_nh, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt6_mtu_change(struct net_device *dev, unsigned int mtu)</div><div class='hunk'>@@ -4141,6 +5081,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {</div><div class='add'>+	[RTA_UNSPEC]		= { .strict_start_type = RTA_DPORT + 1 },</div><div class='ctx'> 	[RTA_GATEWAY]           = { .len = sizeof(struct in6_addr) },</div><div class='ctx'> 	[RTA_PREFSRC]		= { .len = sizeof(struct in6_addr) },</div><div class='ctx'> 	[RTA_OIF]               = { .type = NLA_U32 },</div><div class='hunk'>@@ -4158,32 +5099,99 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {</div><div class='ctx'> 	[RTA_IP_PROTO]		= { .type = NLA_U8 },</div><div class='ctx'> 	[RTA_SPORT]		= { .type = NLA_U16 },</div><div class='ctx'> 	[RTA_DPORT]		= { .type = NLA_U16 },</div><div class='add'>+	[RTA_NH_ID]		= { .type = NLA_U32 },</div><div class='add'>+	[RTA_FLOWLABEL]		= { .type = NLA_BE32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int rtm_to_fib6_multipath_config(struct fib6_config *cfg,</div><div class='add'>+					struct netlink_ext_ack *extack,</div><div class='add'>+					bool newroute)</div><div class='add'>+{</div><div class='add'>+	struct rtnexthop *rtnh;</div><div class='add'>+	int remaining;</div><div class='add'>+</div><div class='add'>+	remaining = cfg-&gt;fc_mp_len;</div><div class='add'>+	rtnh = (struct rtnexthop *)cfg-&gt;fc_mp;</div><div class='add'>+</div><div class='add'>+	if (!rtnh_ok(rtnh, remaining)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Invalid nexthop configuration - no valid nexthops");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		bool has_gateway = cfg-&gt;fc_flags &amp; RTF_GATEWAY;</div><div class='add'>+		int attrlen = rtnh_attrlen(rtnh);</div><div class='add'>+</div><div class='add'>+		if (attrlen &gt; 0) {</div><div class='add'>+			struct nlattr *nla, *attrs;</div><div class='add'>+</div><div class='add'>+			attrs = rtnh_attrs(rtnh);</div><div class='add'>+			nla = nla_find(attrs, attrlen, RTA_GATEWAY);</div><div class='add'>+			if (nla) {</div><div class='add'>+				if (nla_len(nla) &lt; sizeof(cfg-&gt;fc_gateway)) {</div><div class='add'>+					NL_SET_ERR_MSG(extack,</div><div class='add'>+						       "Invalid IPv6 address in RTA_GATEWAY");</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				has_gateway = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (newroute &amp;&amp; (cfg-&gt;fc_nh_id || !has_gateway)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Device only routes can not be added for IPv6 using the multipath API.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rtnh = rtnh_next(rtnh, &amp;remaining);</div><div class='add'>+	} while (rtnh_ok(rtnh, remaining));</div><div class='add'>+</div><div class='add'>+	return lwtunnel_valid_encap_type_attr(cfg-&gt;fc_mp, cfg-&gt;fc_mp_len, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 			      struct fib6_config *cfg,</div><div class='ctx'> 			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct rtmsg *rtm;</div><div class='add'>+	bool newroute = nlh-&gt;nlmsg_type == RTM_NEWROUTE;</div><div class='ctx'> 	struct nlattr *tb[RTA_MAX+1];</div><div class='add'>+	struct rtmsg *rtm;</div><div class='ctx'> 	unsigned int pref;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,</div><div class='del'>-			  NULL);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+				     rtm_ipv6_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='del'>-	memset(cfg, 0, sizeof(*cfg));</div><div class='ctx'> </div><div class='del'>-	cfg-&gt;fc_table = rtm-&gt;rtm_table;</div><div class='del'>-	cfg-&gt;fc_dst_len = rtm-&gt;rtm_dst_len;</div><div class='del'>-	cfg-&gt;fc_src_len = rtm-&gt;rtm_src_len;</div><div class='del'>-	cfg-&gt;fc_flags = RTF_UP;</div><div class='del'>-	cfg-&gt;fc_protocol = rtm-&gt;rtm_protocol;</div><div class='del'>-	cfg-&gt;fc_type = rtm-&gt;rtm_type;</div><div class='add'>+	if (rtm-&gt;rtm_tos) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid dsfield (tos): option not available for IPv6");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[RTA_FLOWLABEL]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[RTA_FLOWLABEL],</div><div class='add'>+				    "Flow label cannot be specified for this operation");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*cfg = (struct fib6_config){</div><div class='add'>+		.fc_table = rtm-&gt;rtm_table,</div><div class='add'>+		.fc_dst_len = rtm-&gt;rtm_dst_len,</div><div class='add'>+		.fc_src_len = rtm-&gt;rtm_src_len,</div><div class='add'>+		.fc_flags = RTF_UP,</div><div class='add'>+		.fc_protocol = rtm-&gt;rtm_protocol,</div><div class='add'>+		.fc_type = rtm-&gt;rtm_type,</div><div class='add'>+</div><div class='add'>+		.fc_nlinfo.portid = NETLINK_CB(skb).portid,</div><div class='add'>+		.fc_nlinfo.nlh = nlh,</div><div class='add'>+		.fc_nlinfo.nl_net = sock_net(skb-&gt;sk),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	if (rtm-&gt;rtm_type == RTN_UNREACHABLE ||</div><div class='ctx'> 	    rtm-&gt;rtm_type == RTN_BLACKHOLE ||</div><div class='hunk'>@@ -4199,14 +5207,24 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;fc_flags |= (rtm-&gt;rtm_flags &amp; RTNH_F_ONLINK);</div><div class='ctx'> </div><div class='del'>-	cfg-&gt;fc_nlinfo.portid = NETLINK_CB(skb).portid;</div><div class='del'>-	cfg-&gt;fc_nlinfo.nlh = nlh;</div><div class='del'>-	cfg-&gt;fc_nlinfo.nl_net = sock_net(skb-&gt;sk);</div><div class='add'>+	if (tb[RTA_NH_ID]) {</div><div class='add'>+		if (tb[RTA_GATEWAY]   || tb[RTA_OIF] ||</div><div class='add'>+		    tb[RTA_MULTIPATH] || tb[RTA_ENCAP]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Nexthop specification and nexthop id are mutually exclusive");</div><div class='add'>+			goto errout;</div><div class='add'>+		}</div><div class='add'>+		cfg-&gt;fc_nh_id = nla_get_u32(tb[RTA_NH_ID]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[RTA_GATEWAY]) {</div><div class='ctx'> 		cfg-&gt;fc_gateway = nla_get_in6_addr(tb[RTA_GATEWAY]);</div><div class='ctx'> 		cfg-&gt;fc_flags |= RTF_GATEWAY;</div><div class='ctx'> 	}</div><div class='add'>+	if (tb[RTA_VIA]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 does not support RTA_VIA attribute");</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (tb[RTA_DST]) {</div><div class='ctx'> 		int plen = (rtm-&gt;rtm_dst_len + 7) &gt;&gt; 3;</div><div class='hunk'>@@ -4247,8 +5265,7 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		cfg-&gt;fc_mp = nla_data(tb[RTA_MULTIPATH]);</div><div class='ctx'> 		cfg-&gt;fc_mp_len = nla_len(tb[RTA_MULTIPATH]);</div><div class='ctx'> </div><div class='del'>-		err = lwtunnel_valid_encap_type_attr(cfg-&gt;fc_mp,</div><div class='del'>-						     cfg-&gt;fc_mp_len, extack);</div><div class='add'>+		err = rtm_to_fib6_multipath_config(cfg, extack, newroute);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4289,40 +5306,28 @@ errout:</div><div class='ctx'> struct rt6_nh {</div><div class='ctx'> 	struct fib6_info *fib6_info;</div><div class='ctx'> 	struct fib6_config r_cfg;</div><div class='del'>-	struct list_head next;</div><div class='add'>+	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void ip6_print_replace_route_err(struct list_head *rt6_nh_list)</div><div class='del'>-{</div><div class='del'>-	struct rt6_nh *nh;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(nh, rt6_nh_list, next) {</div><div class='del'>-		pr_warn("IPV6: multipath route replace failed (check consistency of installed routes): %pI6c nexthop %pI6c ifi %d\n",</div><div class='del'>-		        &amp;nh-&gt;r_cfg.fc_dst, &amp;nh-&gt;r_cfg.fc_gateway,</div><div class='del'>-		        nh-&gt;r_cfg.fc_ifindex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ip6_route_info_append(struct net *net,</div><div class='del'>-				 struct list_head *rt6_nh_list,</div><div class='add'>+static int ip6_route_info_append(struct list_head *rt6_nh_list,</div><div class='ctx'> 				 struct fib6_info *rt,</div><div class='ctx'> 				 struct fib6_config *r_cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_nh *nh;</div><div class='del'>-	int err = -EEXIST;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(nh, rt6_nh_list, next) {</div><div class='add'>+	list_for_each_entry(nh, rt6_nh_list, list) {</div><div class='ctx'> 		/* check if fib6_info already exists */</div><div class='ctx'> 		if (rt6_duplicate_nexthop(nh-&gt;fib6_info, rt))</div><div class='del'>-			return err;</div><div class='add'>+			return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nh = kzalloc(sizeof(*nh), GFP_KERNEL);</div><div class='ctx'> 	if (!nh)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	nh-&gt;fib6_info = rt;</div><div class='ctx'> 	memcpy(&amp;nh-&gt;r_cfg, r_cfg, sizeof(*r_cfg));</div><div class='del'>-	list_add_tail(&amp;nh-&gt;next, rt6_nh_list);</div><div class='add'>+	list_add_tail(&amp;nh-&gt;list, rt6_nh_list);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4338,14 +5343,45 @@ static void ip6_route_mpath_notify(struct fib6_info *rt,</div><div class='ctx'> 	 * nexthop. Since sibling routes are always added at the end of</div><div class='ctx'> 	 * the list, find the first sibling of the last route appended</div><div class='ctx'> 	 */</div><div class='del'>-	if ((nlflags &amp; NLM_F_APPEND) &amp;&amp; rt_last &amp;&amp; rt_last-&gt;fib6_nsiblings) {</div><div class='del'>-		rt = list_first_entry(&amp;rt_last-&gt;fib6_siblings,</div><div class='del'>-				      struct fib6_info,</div><div class='del'>-				      fib6_siblings);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if ((nlflags &amp; NLM_F_APPEND) &amp;&amp; rt_last &amp;&amp;</div><div class='add'>+	    READ_ONCE(rt_last-&gt;fib6_nsiblings)) {</div><div class='add'>+		rt = list_first_or_null_rcu(&amp;rt_last-&gt;fib6_siblings,</div><div class='add'>+					    struct fib6_info,</div><div class='add'>+					    fib6_siblings);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt)</div><div class='ctx'> 		inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ip6_route_mpath_should_notify(const struct fib6_info *rt)</div><div class='add'>+{</div><div class='add'>+	bool rt_can_ecmp = rt6_qualify_for_ecmp(rt);</div><div class='add'>+	bool should_notify = false;</div><div class='add'>+	struct fib6_info *leaf;</div><div class='add'>+	struct fib6_node *fn;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fn = rcu_dereference(rt-&gt;fib6_node);</div><div class='add'>+	if (!fn)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	leaf = rcu_dereference(fn-&gt;leaf);</div><div class='add'>+	if (!leaf)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (rt == leaf ||</div><div class='add'>+	    (rt_can_ecmp &amp;&amp; rt-&gt;fib6_metric == leaf-&gt;fib6_metric &amp;&amp;</div><div class='add'>+	     rt6_qualify_for_ecmp(leaf)))</div><div class='add'>+		should_notify = true;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return should_notify;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='hunk'>@@ -4353,19 +5389,25 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_info *rt_notif = NULL, *rt_last = NULL;</div><div class='ctx'> 	struct nl_info *info = &amp;cfg-&gt;fc_nlinfo;</div><div class='add'>+	struct rt6_nh *nh, *nh_safe;</div><div class='ctx'> 	struct fib6_config r_cfg;</div><div class='ctx'> 	struct rtnexthop *rtnh;</div><div class='del'>-	struct fib6_info *rt;</div><div class='add'>+	LIST_HEAD(rt6_nh_list);</div><div class='ctx'> 	struct rt6_nh *err_nh;</div><div class='del'>-	struct rt6_nh *nh, *nh_safe;</div><div class='add'>+	struct fib6_info *rt;</div><div class='ctx'> 	__u16 nlflags;</div><div class='ctx'> 	int remaining;</div><div class='ctx'> 	int attrlen;</div><div class='del'>-	int err = 1;</div><div class='add'>+	int replace;</div><div class='ctx'> 	int nhn = 0;</div><div class='del'>-	int replace = (cfg-&gt;fc_nlinfo.nlh &amp;&amp;</div><div class='del'>-		       (cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE));</div><div class='del'>-	LIST_HEAD(rt6_nh_list);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fib6_config_validate(cfg, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	replace = (cfg-&gt;fc_nlinfo.nlh &amp;&amp;</div><div class='add'>+		   (cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags &amp; NLM_F_REPLACE));</div><div class='ctx'> </div><div class='ctx'> 	nlflags = replace ? NLM_F_REPLACE : NLM_F_CREATE;</div><div class='ctx'> 	if (info-&gt;nlh &amp;&amp; info-&gt;nlh-&gt;nlmsg_flags &amp; NLM_F_APPEND)</div><div class='hunk'>@@ -4391,6 +5433,7 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='ctx'> 				r_cfg.fc_gateway = nla_get_in6_addr(nla);</div><div class='ctx'> 				r_cfg.fc_flags |= RTF_GATEWAY;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			r_cfg.fc_encap = nla_find(attrs, attrlen, RTA_ENCAP);</div><div class='ctx'> 			nla = nla_find(attrs, attrlen, RTA_ENCAP_TYPE);</div><div class='ctx'> 			if (nla)</div><div class='hunk'>@@ -4404,18 +5447,16 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='ctx'> 			rt = NULL;</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='del'>-		if (!rt6_qualify_for_ecmp(rt)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			NL_SET_ERR_MSG(extack,</div><div class='del'>-				       "Device only routes can not be added for IPv6 using the multipath API.");</div><div class='del'>-			fib6_info_release(rt);</div><div class='add'>+</div><div class='add'>+		err = ip6_route_info_create_nh(rt, &amp;r_cfg, GFP_KERNEL, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			rt = NULL;</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rt-&gt;fib6_nh.nh_weight = rtnh-&gt;rtnh_hops + 1;</div><div class='add'>+		rt-&gt;fib6_nh-&gt;fib_nh_weight = rtnh-&gt;rtnh_hops + 1;</div><div class='ctx'> </div><div class='del'>-		err = ip6_route_info_append(info-&gt;nl_net, &amp;rt6_nh_list,</div><div class='del'>-					    rt, &amp;r_cfg);</div><div class='add'>+		err = ip6_route_info_append(&amp;rt6_nh_list, rt, &amp;r_cfg);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			fib6_info_release(rt);</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -4430,28 +5471,28 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='ctx'> 	 */</div><div class='ctx'> 	info-&gt;skip_notify = 1;</div><div class='ctx'> </div><div class='add'>+	/* For add and replace, send one notification with all nexthops. For</div><div class='add'>+	 * append, send one notification with all appended nexthops.</div><div class='add'>+	 */</div><div class='add'>+	info-&gt;skip_notify_kernel = 1;</div><div class='add'>+</div><div class='ctx'> 	err_nh = NULL;</div><div class='del'>-	list_for_each_entry(nh, &amp;rt6_nh_list, next) {</div><div class='add'>+	list_for_each_entry(nh, &amp;rt6_nh_list, list) {</div><div class='ctx'> 		err = __ip6_ins_rt(nh-&gt;fib6_info, info, extack);</div><div class='del'>-		fib6_info_release(nh-&gt;fib6_info);</div><div class='del'>-</div><div class='del'>-		if (!err) {</div><div class='del'>-			/* save reference to last route successfully inserted */</div><div class='del'>-			rt_last = nh-&gt;fib6_info;</div><div class='del'>-</div><div class='del'>-			/* save reference to first route for notification */</div><div class='del'>-			if (!rt_notif)</div><div class='del'>-				rt_notif = nh-&gt;fib6_info;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* nh-&gt;fib6_info is used or freed at this point, reset to NULL*/</div><div class='del'>-		nh-&gt;fib6_info = NULL;</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			if (replace &amp;&amp; nhn)</div><div class='del'>-				ip6_print_replace_route_err(&amp;rt6_nh_list);</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "multipath route replace failed (check consistency of installed routes)");</div><div class='ctx'> 			err_nh = nh;</div><div class='ctx'> 			goto add_errout;</div><div class='ctx'> 		}</div><div class='add'>+		/* save reference to last route successfully inserted */</div><div class='add'>+		rt_last = nh-&gt;fib6_info;</div><div class='add'>+</div><div class='add'>+		/* save reference to first route for notification */</div><div class='add'>+		if (!rt_notif)</div><div class='add'>+			rt_notif = nh-&gt;fib6_info;</div><div class='ctx'> </div><div class='ctx'> 		/* Because each route is added like a single route we remove</div><div class='ctx'> 		 * these flags after the first nexthop: if there is a collision,</div><div class='hunk'>@@ -4460,11 +5501,37 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,</div><div class='ctx'> 		 * nexthops have been replaced by first new, the rest should</div><div class='ctx'> 		 * be added to it.</div><div class='ctx'> 		 */</div><div class='del'>-		cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags &amp;= ~(NLM_F_EXCL |</div><div class='del'>-						     NLM_F_REPLACE);</div><div class='add'>+		if (cfg-&gt;fc_nlinfo.nlh) {</div><div class='add'>+			cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags &amp;= ~(NLM_F_EXCL |</div><div class='add'>+							     NLM_F_REPLACE);</div><div class='add'>+			cfg-&gt;fc_nlinfo.nlh-&gt;nlmsg_flags |= NLM_F_CREATE;</div><div class='add'>+		}</div><div class='ctx'> 		nhn++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* An in-kernel notification should only be sent in case the new</div><div class='add'>+	 * multipath route is added as the first route in the node, or if</div><div class='add'>+	 * it was appended to it. We pass 'rt_notif' since it is the first</div><div class='add'>+	 * sibling and might allow us to skip some checks in the replace case.</div><div class='add'>+	 */</div><div class='add'>+	if (ip6_route_mpath_should_notify(rt_notif)) {</div><div class='add'>+		enum fib_event_type fib_event;</div><div class='add'>+</div><div class='add'>+		if (rt_notif-&gt;fib6_nsiblings != nhn - 1)</div><div class='add'>+			fib_event = FIB_EVENT_ENTRY_APPEND;</div><div class='add'>+		else</div><div class='add'>+			fib_event = FIB_EVENT_ENTRY_REPLACE;</div><div class='add'>+</div><div class='add'>+		err = call_fib6_multipath_entry_notifiers(info-&gt;nl_net,</div><div class='add'>+							  fib_event, rt_notif,</div><div class='add'>+							  nhn - 1, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			/* Delete all the siblings that were just added */</div><div class='add'>+			err_nh = NULL;</div><div class='add'>+			goto add_errout;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* success ... tell user about new route */</div><div class='ctx'> 	ip6_route_mpath_notify(rt_notif, rt_last, info, nlflags);</div><div class='ctx'> 	goto cleanup;</div><div class='hunk'>@@ -4478,17 +5545,16 @@ add_errout:</div><div class='ctx'> 		ip6_route_mpath_notify(rt_notif, rt_last, info, nlflags);</div><div class='ctx'> </div><div class='ctx'> 	/* Delete routes that were already added */</div><div class='del'>-	list_for_each_entry(nh, &amp;rt6_nh_list, next) {</div><div class='add'>+	list_for_each_entry(nh, &amp;rt6_nh_list, list) {</div><div class='ctx'> 		if (err_nh == nh)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ip6_route_del(&amp;nh-&gt;r_cfg, extack);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='del'>-	list_for_each_entry_safe(nh, nh_safe, &amp;rt6_nh_list, next) {</div><div class='del'>-		if (nh-&gt;fib6_info)</div><div class='del'>-			fib6_info_release(nh-&gt;fib6_info);</div><div class='del'>-		list_del(&amp;nh-&gt;next);</div><div class='add'>+	list_for_each_entry_safe(nh, nh_safe, &amp;rt6_nh_list, list) {</div><div class='add'>+		fib6_info_release(nh-&gt;fib6_info);</div><div class='add'>+		list_del(&amp;nh-&gt;list);</div><div class='ctx'> 		kfree(nh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4500,9 +5566,10 @@ static int ip6_route_multipath_del(struct fib6_config *cfg,</div><div class='ctx'> {</div><div class='ctx'> 	struct fib6_config r_cfg;</div><div class='ctx'> 	struct rtnexthop *rtnh;</div><div class='add'>+	int last_err = 0;</div><div class='ctx'> 	int remaining;</div><div class='ctx'> 	int attrlen;</div><div class='del'>-	int err = 1, last_err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	remaining = cfg-&gt;fc_mp_len;</div><div class='ctx'> 	rtnh = (struct rtnexthop *)cfg-&gt;fc_mp;</div><div class='hunk'>@@ -4519,10 +5586,11 @@ static int ip6_route_multipath_del(struct fib6_config *cfg,</div><div class='ctx'> </div><div class='ctx'> 			nla = nla_find(attrs, attrlen, RTA_GATEWAY);</div><div class='ctx'> 			if (nla) {</div><div class='del'>-				nla_memcpy(&amp;r_cfg.fc_gateway, nla, 16);</div><div class='add'>+				r_cfg.fc_gateway = nla_get_in6_addr(nla);</div><div class='ctx'> 				r_cfg.fc_flags |= RTF_GATEWAY;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		err = ip6_route_del(&amp;r_cfg, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			last_err = err;</div><div class='hunk'>@@ -4543,9 +5611,20 @@ static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (cfg.fc_mp)</div><div class='add'>+	if (cfg.fc_nh_id) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		err = !nexthop_find_by_id(sock_net(skb-&gt;sk), cfg.fc_nh_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "Nexthop id does not exist");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg.fc_mp) {</div><div class='ctx'> 		return ip6_route_multipath_del(&amp;cfg, extack);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		cfg.fc_delete_all_nh = 1;</div><div class='ctx'> 		return ip6_route_del(&amp;cfg, extack);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4561,25 +5640,64 @@ static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (cfg.fc_metric == 0)</div><div class='add'>+		cfg.fc_metric = IP6_RT_PRIO_USER;</div><div class='add'>+</div><div class='ctx'> 	if (cfg.fc_mp)</div><div class='ctx'> 		return ip6_route_multipath_add(&amp;cfg, extack);</div><div class='ctx'> 	else</div><div class='ctx'> 		return ip6_route_add(&amp;cfg, GFP_KERNEL, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t rt6_nlmsg_size(struct fib6_info *rt)</div><div class='add'>+/* add the overhead of this fib6_nh to nexthop_len */</div><div class='add'>+static int rt6_nh_nlmsg_size(struct fib6_nh *nh, void *arg)</div><div class='ctx'> {</div><div class='del'>-	int nexthop_len = 0;</div><div class='add'>+	int *nexthop_len = arg;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_nsiblings) {</div><div class='del'>-		nexthop_len = nla_total_size(0)	 /* RTA_MULTIPATH */</div><div class='del'>-			    + NLA_ALIGN(sizeof(struct rtnexthop))</div><div class='del'>-			    + nla_total_size(16) /* RTA_GATEWAY */</div><div class='del'>-			    + lwtunnel_get_encap_size(rt-&gt;fib6_nh.nh_lwtstate);</div><div class='add'>+	*nexthop_len += nla_total_size(0)	 /* RTA_MULTIPATH */</div><div class='add'>+		     + NLA_ALIGN(sizeof(struct rtnexthop))</div><div class='add'>+		     + nla_total_size(16); /* RTA_GATEWAY */</div><div class='ctx'> </div><div class='del'>-		nexthop_len *= rt-&gt;fib6_nsiblings;</div><div class='add'>+	if (nh-&gt;fib_nh_lws) {</div><div class='add'>+		/* RTA_ENCAP_TYPE */</div><div class='add'>+		*nexthop_len += lwtunnel_get_encap_size(nh-&gt;fib_nh_lws);</div><div class='add'>+		/* RTA_ENCAP */</div><div class='add'>+		*nexthop_len += nla_total_size(2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t rt6_nlmsg_size(struct fib6_info *f6i)</div><div class='add'>+{</div><div class='add'>+	struct fib6_info *sibling;</div><div class='add'>+	struct fib6_nh *nh;</div><div class='add'>+	int nexthop_len;</div><div class='add'>+</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		nexthop_len = nla_total_size(4); /* RTA_NH_ID */</div><div class='add'>+		nexthop_for_each_fib6_nh(f6i-&gt;nh, rt6_nh_nlmsg_size,</div><div class='add'>+					 &amp;nexthop_len);</div><div class='add'>+		goto common;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+retry:</div><div class='add'>+	nh = f6i-&gt;fib6_nh;</div><div class='add'>+	nexthop_len = 0;</div><div class='add'>+	if (READ_ONCE(f6i-&gt;fib6_nsiblings)) {</div><div class='add'>+		rt6_nh_nlmsg_size(nh, &amp;nexthop_len);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_rcu(sibling, &amp;f6i-&gt;fib6_siblings,</div><div class='add'>+					fib6_siblings) {</div><div class='add'>+			rt6_nh_nlmsg_size(sibling-&gt;fib6_nh, &amp;nexthop_len);</div><div class='add'>+			if (!READ_ONCE(f6i-&gt;fib6_nsiblings))</div><div class='add'>+				goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	nexthop_len += lwtunnel_get_encap_size(nh-&gt;fib_nh_lws);</div><div class='add'>+common:</div><div class='ctx'> 	return NLMSG_ALIGN(sizeof(struct rtmsg))</div><div class='ctx'> 	       + nla_total_size(16) /* RTA_SRC */</div><div class='ctx'> 	       + nla_total_size(16) /* RTA_DST */</div><div class='hunk'>@@ -4593,70 +5711,31 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt)</div><div class='ctx'> 	       + nla_total_size(sizeof(struct rta_cacheinfo))</div><div class='ctx'> 	       + nla_total_size(TCP_CA_NAME_MAX) /* RTAX_CC_ALGO */</div><div class='ctx'> 	       + nla_total_size(1) /* RTA_PREF */</div><div class='del'>-	       + lwtunnel_get_encap_size(rt-&gt;fib6_nh.nh_lwtstate)</div><div class='ctx'> 	       + nexthop_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt,</div><div class='del'>-			    unsigned int *flags, bool skip_oif)</div><div class='add'>+static int rt6_fill_node_nexthop(struct sk_buff *skb, struct nexthop *nh,</div><div class='add'>+				 unsigned char *flags)</div><div class='ctx'> {</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_DEAD)</div><div class='del'>-		*flags |= RTNH_F_DEAD;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_LINKDOWN) {</div><div class='del'>-		*flags |= RTNH_F_LINKDOWN;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		if (fib6_ignore_linkdown(rt))</div><div class='del'>-			*flags |= RTNH_F_DEAD;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='add'>+	if (nexthop_is_multipath(nh)) {</div><div class='add'>+		struct nlattr *mp;</div><div class='ctx'> </div><div class='del'>-	if (rt-&gt;fib6_flags &amp; RTF_GATEWAY) {</div><div class='del'>-		if (nla_put_in6_addr(skb, RTA_GATEWAY, &amp;rt-&gt;fib6_nh.nh_gw) &lt; 0)</div><div class='add'>+		mp = nla_nest_start_noflag(skb, RTA_MULTIPATH);</div><div class='add'>+		if (!mp)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*flags |= (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_ONLINK);</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_flags &amp; RTNH_F_OFFLOAD)</div><div class='del'>-		*flags |= RTNH_F_OFFLOAD;</div><div class='del'>-</div><div class='del'>-	/* not needed for multipath encoding b/c it has a rtnexthop struct */</div><div class='del'>-	if (!skip_oif &amp;&amp; rt-&gt;fib6_nh.nh_dev &amp;&amp;</div><div class='del'>-	    nla_put_u32(skb, RTA_OIF, rt-&gt;fib6_nh.nh_dev-&gt;ifindex))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	if (rt-&gt;fib6_nh.nh_lwtstate &amp;&amp;</div><div class='del'>-	    lwtunnel_fill_encap(skb, rt-&gt;fib6_nh.nh_lwtstate) &lt; 0)</div><div class='del'>-		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add multipath next hop */</div><div class='del'>-static int rt6_add_nexthop(struct sk_buff *skb, struct fib6_info *rt)</div><div class='del'>-{</div><div class='del'>-	const struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='del'>-	struct rtnexthop *rtnh;</div><div class='del'>-	unsigned int flags = 0;</div><div class='del'>-</div><div class='del'>-	rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));</div><div class='del'>-	if (!rtnh)</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-</div><div class='del'>-	rtnh-&gt;rtnh_hops = rt-&gt;fib6_nh.nh_weight - 1;</div><div class='del'>-	rtnh-&gt;rtnh_ifindex = dev ? dev-&gt;ifindex : 0;</div><div class='del'>-</div><div class='del'>-	if (rt6_nexthop_info(skb, rt, &amp;flags, true) &lt; 0)</div><div class='del'>-		goto nla_put_failure;</div><div class='add'>+		if (nexthop_mpath_fill_node(skb, nh, AF_INET6))</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	rtnh-&gt;rtnh_flags = flags;</div><div class='add'>+		nla_nest_end(skb, mp);</div><div class='add'>+	} else {</div><div class='add'>+		struct fib6_nh *fib6_nh;</div><div class='ctx'> </div><div class='del'>-	/* length of rtnetlink header + attributes */</div><div class='del'>-	rtnh-&gt;rtnh_len = nlmsg_get_pos(skb) - (void *)rtnh;</div><div class='add'>+		fib6_nh = nexthop_fib6_nh(nh);</div><div class='add'>+		if (fib_nexthop_info(skb, &amp;fib6_nh-&gt;nh_common, AF_INET6,</div><div class='add'>+				     flags, false) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4670,9 +5749,10 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			 int iif, int type, u32 portid, u32 seq,</div><div class='ctx'> 			 unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt6 = (struct rt6_info *)dst;</div><div class='add'>+	struct rt6_info *rt6 = dst_rt6_info(dst);</div><div class='ctx'> 	struct rt6key *rt6_dst, *rt6_src;</div><div class='ctx'> 	u32 *pmetrics, table, rt6_flags;</div><div class='add'>+	unsigned char nh_flags = 0;</div><div class='ctx'> 	struct nlmsghdr *nlh;</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='ctx'> 	long expires = 0;</div><div class='hunk'>@@ -4700,7 +5780,7 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 		table = rt-&gt;fib6_table-&gt;tb6_id;</div><div class='ctx'> 	else</div><div class='ctx'> 		table = RT6_TABLE_UNSPEC;</div><div class='del'>-	rtm-&gt;rtm_table = table;</div><div class='add'>+	rtm-&gt;rtm_table = table &lt; 256 ? table : RT_TABLE_COMPAT;</div><div class='ctx'> 	if (nla_put_u32(skb, RTA_TABLE, table))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -4743,7 +5823,7 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 				goto nla_put_failure;</div><div class='ctx'> 	} else if (dest) {</div><div class='ctx'> 		struct in6_addr saddr_buf;</div><div class='del'>-		if (ip6_route_get_saddr(net, rt, dest, 0, &amp;saddr_buf) == 0 &amp;&amp;</div><div class='add'>+		if (ip6_route_get_saddr(net, rt, dest, 0, 0, &amp;saddr_buf) == 0 &amp;&amp;</div><div class='ctx'> 		    nla_put_in6_addr(skb, RTA_PREFSRC, &amp;saddr_buf))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4766,40 +5846,81 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	 * each as a nexthop within RTA_MULTIPATH.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rt6) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='ctx'> 		if (rt6_flags &amp; RTF_GATEWAY &amp;&amp;</div><div class='ctx'> 		    nla_put_in6_addr(skb, RTA_GATEWAY, &amp;rt6-&gt;rt6i_gateway))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-		if (dst-&gt;dev &amp;&amp; nla_put_u32(skb, RTA_OIF, dst-&gt;dev-&gt;ifindex))</div><div class='add'>+		dev = dst_dev(dst);</div><div class='add'>+		if (dev &amp;&amp; nla_put_u32(skb, RTA_OIF, dev-&gt;ifindex))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='del'>-	} else if (rt-&gt;fib6_nsiblings) {</div><div class='del'>-		struct fib6_info *sibling, *next_sibling;</div><div class='add'>+</div><div class='add'>+		if (lwtunnel_fill_encap(skb, dst-&gt;lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	} else if (READ_ONCE(rt-&gt;fib6_nsiblings)) {</div><div class='add'>+		struct fib6_info *sibling;</div><div class='ctx'> 		struct nlattr *mp;</div><div class='ctx'> </div><div class='del'>-		mp = nla_nest_start(skb, RTA_MULTIPATH);</div><div class='add'>+		mp = nla_nest_start_noflag(skb, RTA_MULTIPATH);</div><div class='ctx'> 		if (!mp)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-		if (rt6_add_nexthop(skb, rt) &lt; 0)</div><div class='add'>+		if (fib_add_nexthop(skb, &amp;rt-&gt;fib6_nh-&gt;nh_common,</div><div class='add'>+				    rt-&gt;fib6_nh-&gt;fib_nh_weight, AF_INET6,</div><div class='add'>+				    0) &lt; 0)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(sibling, next_sibling,</div><div class='del'>-					 &amp;rt-&gt;fib6_siblings, fib6_siblings) {</div><div class='del'>-			if (rt6_add_nexthop(skb, sibling) &lt; 0)</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_rcu(sibling, &amp;rt-&gt;fib6_siblings,</div><div class='add'>+					fib6_siblings) {</div><div class='add'>+			if (fib_add_nexthop(skb, &amp;sibling-&gt;fib6_nh-&gt;nh_common,</div><div class='add'>+					    sibling-&gt;fib6_nh-&gt;fib_nh_weight,</div><div class='add'>+					    AF_INET6, 0) &lt; 0) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 				goto nla_put_failure;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 		nla_nest_end(skb, mp);</div><div class='add'>+	} else if (rt-&gt;nh) {</div><div class='add'>+		if (nla_put_u32(skb, RTA_NH_ID, rt-&gt;nh-&gt;id))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		if (nexthop_is_blackhole(rt-&gt;nh))</div><div class='add'>+			rtm-&gt;rtm_type = RTN_BLACKHOLE;</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(net-&gt;ipv4.sysctl_nexthop_compat_mode) &amp;&amp;</div><div class='add'>+		    rt6_fill_node_nexthop(skb, rt-&gt;nh, &amp;nh_flags) &lt; 0)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		rtm-&gt;rtm_flags |= nh_flags;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (rt6_nexthop_info(skb, rt, &amp;rtm-&gt;rtm_flags, false) &lt; 0)</div><div class='add'>+		if (fib_nexthop_info(skb, &amp;rt-&gt;fib6_nh-&gt;nh_common, AF_INET6,</div><div class='add'>+				     &amp;nh_flags, false) &lt; 0)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+		rtm-&gt;rtm_flags |= nh_flags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt6_flags &amp; RTF_EXPIRES) {</div><div class='del'>-		expires = dst ? dst-&gt;expires : rt-&gt;expires;</div><div class='add'>+		expires = dst ? READ_ONCE(dst-&gt;expires) : rt-&gt;expires;</div><div class='ctx'> 		expires -= jiffies;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!dst) {</div><div class='add'>+		if (READ_ONCE(rt-&gt;offload))</div><div class='add'>+			rtm-&gt;rtm_flags |= RTM_F_OFFLOAD;</div><div class='add'>+		if (READ_ONCE(rt-&gt;trap))</div><div class='add'>+			rtm-&gt;rtm_flags |= RTM_F_TRAP;</div><div class='add'>+		if (READ_ONCE(rt-&gt;offload_failed))</div><div class='add'>+			rtm-&gt;rtm_flags |= RTM_F_OFFLOAD_FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rtnl_put_cacheinfo(skb, dst, 0, expires, dst ? dst-&gt;error : 0) &lt; 0)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -4815,28 +5936,248 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rt6_dump_route(struct fib6_info *rt, void *p_arg)</div><div class='add'>+static int fib6_info_nh_uses_dev(struct fib6_nh *nh, void *arg)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *dev = arg;</div><div class='add'>+</div><div class='add'>+	if (nh-&gt;fib_nh_dev == dev)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fib6_info_uses_dev(const struct fib6_info *f6i,</div><div class='add'>+			       const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (f6i-&gt;nh) {</div><div class='add'>+		struct net_device *_dev = (struct net_device *)dev;</div><div class='add'>+</div><div class='add'>+		return !!nexthop_for_each_fib6_nh(f6i-&gt;nh,</div><div class='add'>+						  fib6_info_nh_uses_dev,</div><div class='add'>+						  _dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f6i-&gt;fib6_nh-&gt;fib_nh_dev == dev)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(f6i-&gt;fib6_nsiblings)) {</div><div class='add'>+		const struct fib6_info *sibling;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		list_for_each_entry_rcu(sibling, &amp;f6i-&gt;fib6_siblings,</div><div class='add'>+					fib6_siblings) {</div><div class='add'>+			if (sibling-&gt;fib6_nh-&gt;fib_nh_dev == dev) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+			if (!READ_ONCE(f6i-&gt;fib6_nsiblings))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fib6_nh_exception_dump_walker {</div><div class='add'>+	struct rt6_rtnl_dump_arg *dump;</div><div class='add'>+	struct fib6_info *rt;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	unsigned int skip;</div><div class='add'>+	unsigned int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rt6_nh_dump_exceptions(struct fib6_nh *nh, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct fib6_nh_exception_dump_walker *w = arg;</div><div class='add'>+	struct rt6_rtnl_dump_arg *dump = w-&gt;dump;</div><div class='add'>+	struct rt6_exception_bucket *bucket;</div><div class='add'>+	struct rt6_exception *rt6_ex;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	bucket = fib6_nh_get_excptn_bucket(nh, NULL);</div><div class='add'>+	if (!bucket)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FIB6_EXCEPTION_BUCKET_SIZE; i++) {</div><div class='add'>+		hlist_for_each_entry(rt6_ex, &amp;bucket-&gt;chain, hlist) {</div><div class='add'>+			if (w-&gt;skip) {</div><div class='add'>+				w-&gt;skip--;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Expiration of entries doesn't bump sernum, insertion</div><div class='add'>+			 * does. Removal is triggered by insertion, so we can</div><div class='add'>+			 * rely on the fact that if entries change between two</div><div class='add'>+			 * partial dumps, this node is scanned again completely,</div><div class='add'>+			 * see rt6_insert_exception() and fib6_dump_table().</div><div class='add'>+			 *</div><div class='add'>+			 * Count expired entries we go through as handled</div><div class='add'>+			 * entries that we'll skip next time, in case of partial</div><div class='add'>+			 * node dump. Otherwise, if entries expire meanwhile,</div><div class='add'>+			 * we'll skip the wrong amount.</div><div class='add'>+			 */</div><div class='add'>+			if (rt6_check_expired(rt6_ex-&gt;rt6i)) {</div><div class='add'>+				w-&gt;count++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = rt6_fill_node(dump-&gt;net, dump-&gt;skb, w-&gt;rt,</div><div class='add'>+					    &amp;rt6_ex-&gt;rt6i-&gt;dst, NULL, NULL, 0,</div><div class='add'>+					    RTM_NEWROUTE,</div><div class='add'>+					    NETLINK_CB(dump-&gt;cb-&gt;skb).portid,</div><div class='add'>+					    dump-&gt;cb-&gt;nlh-&gt;nlmsg_seq, w-&gt;flags);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			w-&gt;count++;</div><div class='add'>+		}</div><div class='add'>+		bucket++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return -1 if done with node, number of handled routes on partial dump */</div><div class='add'>+int rt6_dump_route(struct fib6_info *rt, void *p_arg, unsigned int skip)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt6_rtnl_dump_arg *arg = (struct rt6_rtnl_dump_arg *) p_arg;</div><div class='add'>+	struct fib_dump_filter *filter = &amp;arg-&gt;filter;</div><div class='add'>+	unsigned int flags = NLM_F_MULTI;</div><div class='ctx'> 	struct net *net = arg-&gt;net;</div><div class='add'>+	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rt == net-&gt;ipv6.fib6_null_entry)</div><div class='del'>-		return 0;</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if ((filter-&gt;flags &amp; RTM_F_PREFIX) &amp;&amp;</div><div class='add'>+	    !(rt-&gt;fib6_flags &amp; RTF_PREFIX_RT)) {</div><div class='add'>+		/* success since this is not a prefix route */</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	if (filter-&gt;filter_set &amp;&amp;</div><div class='add'>+	    ((filter-&gt;rt_type  &amp;&amp; rt-&gt;fib6_type != filter-&gt;rt_type) ||</div><div class='add'>+	     (filter-&gt;dev      &amp;&amp; !fib6_info_uses_dev(rt, filter-&gt;dev)) ||</div><div class='add'>+	     (filter-&gt;protocol &amp;&amp; rt-&gt;fib6_protocol != filter-&gt;protocol))) {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;filter_set ||</div><div class='add'>+	    !filter-&gt;dump_routes || !filter-&gt;dump_exceptions) {</div><div class='add'>+		flags |= NLM_F_DUMP_FILTERED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;dump_routes) {</div><div class='add'>+		if (skip) {</div><div class='add'>+			skip--;</div><div class='add'>+		} else {</div><div class='add'>+			if (rt6_fill_node(net, arg-&gt;skb, rt, NULL, NULL, NULL,</div><div class='add'>+					  0, RTM_NEWROUTE,</div><div class='add'>+					  NETLINK_CB(arg-&gt;cb-&gt;skb).portid,</div><div class='add'>+					  arg-&gt;cb-&gt;nlh-&gt;nlmsg_seq, flags)) {</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;dump_exceptions) {</div><div class='add'>+		struct fib6_nh_exception_dump_walker w = { .dump = arg,</div><div class='add'>+							   .rt = rt,</div><div class='add'>+							   .flags = flags,</div><div class='add'>+							   .skip = skip,</div><div class='add'>+							   .count = 0 };</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (rt-&gt;nh) {</div><div class='add'>+			err = nexthop_for_each_fib6_nh(rt-&gt;nh,</div><div class='add'>+						       rt6_nh_dump_exceptions,</div><div class='add'>+						       &amp;w);</div><div class='add'>+		} else {</div><div class='add'>+			err = rt6_nh_dump_exceptions(rt-&gt;fib6_nh, &amp;w);</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return count + w.count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,</div><div class='add'>+					const struct nlmsghdr *nlh,</div><div class='add'>+					struct nlattr **tb,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct rtmsg *rtm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	rtm = nlmsg_payload(nlh, sizeof(*rtm));</div><div class='add'>+	if (!rtm) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Invalid header for get route request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netlink_strict_get_check(skb))</div><div class='add'>+		return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					      rtm_ipv6_policy, extack);</div><div class='add'>+</div><div class='add'>+	if ((rtm-&gt;rtm_src_len &amp;&amp; rtm-&gt;rtm_src_len != 128) ||</div><div class='add'>+	    (rtm-&gt;rtm_dst_len &amp;&amp; rtm-&gt;rtm_dst_len != 128) ||</div><div class='add'>+	    rtm-&gt;rtm_table || rtm-&gt;rtm_protocol || rtm-&gt;rtm_scope ||</div><div class='add'>+	    rtm-&gt;rtm_type) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for get route request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (rtm-&gt;rtm_flags &amp; ~RTM_F_FIB_MATCH) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Invalid flags for get route request");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,</div><div class='add'>+					    rtm_ipv6_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((tb[RTA_SRC] &amp;&amp; !rtm-&gt;rtm_src_len) ||</div><div class='add'>+	    (tb[RTA_DST] &amp;&amp; !rtm-&gt;rtm_dst_len)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "rtm_src_len and rtm_dst_len must be 128 for IPv6");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb[RTA_FLOWLABEL] &amp;&amp;</div><div class='add'>+	    (nla_get_be32(tb[RTA_FLOWLABEL]) &amp; ~IPV6_FLOWLABEL_MASK)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[RTA_FLOWLABEL],</div><div class='add'>+				    "Invalid flow label");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (nlmsg_len(arg-&gt;cb-&gt;nlh) &gt;= sizeof(struct rtmsg)) {</div><div class='del'>-		struct rtmsg *rtm = nlmsg_data(arg-&gt;cb-&gt;nlh);</div><div class='add'>+	for (i = 0; i &lt;= RTA_MAX; i++) {</div><div class='add'>+		if (!tb[i])</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		/* user wants prefix routes only */</div><div class='del'>-		if (rtm-&gt;rtm_flags &amp; RTM_F_PREFIX &amp;&amp;</div><div class='del'>-		    !(rt-&gt;fib6_flags &amp; RTF_PREFIX_RT)) {</div><div class='del'>-			/* success since this is not a prefix route */</div><div class='del'>-			return 1;</div><div class='add'>+		switch (i) {</div><div class='add'>+		case RTA_SRC:</div><div class='add'>+		case RTA_DST:</div><div class='add'>+		case RTA_IIF:</div><div class='add'>+		case RTA_OIF:</div><div class='add'>+		case RTA_MARK:</div><div class='add'>+		case RTA_UID:</div><div class='add'>+		case RTA_SPORT:</div><div class='add'>+		case RTA_DPORT:</div><div class='add'>+		case RTA_IP_PROTO:</div><div class='add'>+		case RTA_FLOWLABEL:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in get route request");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rt6_fill_node(net, arg-&gt;skb, rt, NULL, NULL, NULL, 0,</div><div class='del'>-			     RTM_NEWROUTE, NETLINK_CB(arg-&gt;cb-&gt;skb).portid,</div><div class='del'>-			     arg-&gt;cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='hunk'>@@ -4850,18 +6191,16 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct rtmsg *rtm;</div><div class='del'>-	struct flowi6 fl6;</div><div class='add'>+	struct flowi6 fl6 = {};</div><div class='add'>+	__be32 flowlabel;</div><div class='ctx'> 	bool fibmatch;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = inet6_rtm_valid_getroute_req(in_skb, nlh, tb, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> 	rtm = nlmsg_data(nlh);</div><div class='del'>-	fl6.flowlabel = ip6_make_flowinfo(rtm-&gt;rtm_tos, 0);</div><div class='ctx'> 	fibmatch = !!(rtm-&gt;rtm_flags &amp; RTM_F_FIB_MATCH);</div><div class='ctx'> </div><div class='ctx'> 	if (tb[RTA_SRC]) {</div><div class='hunk'>@@ -4901,11 +6240,15 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	if (tb[RTA_IP_PROTO]) {</div><div class='ctx'> 		err = rtm_getroute_parse_ip_proto(tb[RTA_IP_PROTO],</div><div class='del'>-						  &amp;fl6.flowi6_proto, extack);</div><div class='add'>+						  &amp;fl6.flowi6_proto, AF_INET6,</div><div class='add'>+						  extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	flowlabel = nla_get_be32_default(tb[RTA_FLOWLABEL], 0);</div><div class='add'>+	fl6.flowlabel = ip6_make_flowinfo(rtm-&gt;rtm_tos, flowlabel);</div><div class='add'>+</div><div class='ctx'> 	if (iif) {</div><div class='ctx'> 		struct net_device *dev;</div><div class='ctx'> 		int flags = 0;</div><div class='hunk'>@@ -4934,7 +6277,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	rt = container_of(dst, struct rt6_info, dst);</div><div class='add'>+	rt = dst_rt6_info(dst);</div><div class='ctx'> 	if (rt-&gt;dst.error) {</div><div class='ctx'> 		err = rt-&gt;dst.error;</div><div class='ctx'> 		ip6_rt_put(rt);</div><div class='hunk'>@@ -4958,16 +6301,20 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	from = rcu_dereference(rt-&gt;from);</div><div class='del'>-</div><div class='del'>-	if (fibmatch)</div><div class='del'>-		err = rt6_fill_node(net, skb, from, NULL, NULL, NULL, iif,</div><div class='del'>-				    RTM_NEWROUTE, NETLINK_CB(in_skb).portid,</div><div class='del'>-				    nlh-&gt;nlmsg_seq, 0);</div><div class='del'>-	else</div><div class='del'>-		err = rt6_fill_node(net, skb, from, dst, &amp;fl6.daddr,</div><div class='del'>-				    &amp;fl6.saddr, iif, RTM_NEWROUTE,</div><div class='del'>-				    NETLINK_CB(in_skb).portid, nlh-&gt;nlmsg_seq,</div><div class='del'>-				    0);</div><div class='add'>+	if (from) {</div><div class='add'>+		if (fibmatch)</div><div class='add'>+			err = rt6_fill_node(net, skb, from, NULL, NULL, NULL,</div><div class='add'>+					    iif, RTM_NEWROUTE,</div><div class='add'>+					    NETLINK_CB(in_skb).portid,</div><div class='add'>+					    nlh-&gt;nlmsg_seq, 0);</div><div class='add'>+		else</div><div class='add'>+			err = rt6_fill_node(net, skb, from, dst, &amp;fl6.daddr,</div><div class='add'>+					    &amp;fl6.saddr, iif, RTM_NEWROUTE,</div><div class='add'>+					    NETLINK_CB(in_skb).portid,</div><div class='add'>+					    nlh-&gt;nlmsg_seq, 0);</div><div class='add'>+	} else {</div><div class='add'>+		err = -ENETUNREACH;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -4983,21 +6330,58 @@ errout:</div><div class='ctx'> void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,</div><div class='ctx'> 		     unsigned int nlm_flags)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	struct net *net = info-&gt;nl_net;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t sz;</div><div class='ctx'> 	u32 seq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOBUFS;</div><div class='ctx'> 	seq = info-&gt;nlh ? info-&gt;nlh-&gt;nlmsg_seq : 0;</div><div class='ctx'> </div><div class='del'>-	skb = nlmsg_new(rt6_nlmsg_size(rt), gfp_any());</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sz = rt6_nlmsg_size(rt);</div><div class='add'>+retry:</div><div class='add'>+	skb = nlmsg_new(sz, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	err = rt6_fill_node(net, skb, rt, NULL, NULL, NULL, 0,</div><div class='ctx'> 			    event, info-&gt;portid, seq, nlm_flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		/* -EMSGSIZE implies needed space grew under us. */</div><div class='add'>+		if (err == -EMSGSIZE) {</div><div class='add'>+			sz = max(rt6_nlmsg_size(rt), sz &lt;&lt; 1);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, info-&gt;portid, RTNLGRP_IPV6_ROUTE,</div><div class='add'>+		    info-&gt;nlh, GFP_ATOMIC);</div><div class='add'>+	return;</div><div class='add'>+errout:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_rt_update(struct net *net, struct fib6_info *rt,</div><div class='add'>+		    struct nl_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 seq = info-&gt;nlh ? info-&gt;nlh-&gt;nlmsg_seq : 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(rt6_nlmsg_size(rt), gfp_any());</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='add'>+	err = rt6_fill_node(net, skb, rt, NULL, NULL, NULL, 0,</div><div class='add'>+			    RTM_NEWROUTE, info-&gt;portid, seq, NLM_F_REPLACE);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		/* -EMSGSIZE implies BUG in rt6_nlmsg_size() */</div><div class='ctx'> 		WARN_ON(err == -EMSGSIZE);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -5007,9 +6391,61 @@ void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,</div><div class='ctx'> 		    info-&gt;nlh, gfp_any());</div><div class='ctx'> 	return;</div><div class='ctx'> errout:</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fib6_info_hw_flags_set(struct net *net, struct fib6_info *f6i,</div><div class='add'>+			    bool offload, bool trap, bool offload_failed)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(f6i-&gt;offload) == offload &amp;&amp;</div><div class='add'>+	    READ_ONCE(f6i-&gt;trap) == trap &amp;&amp;</div><div class='add'>+	    READ_ONCE(f6i-&gt;offload_failed) == offload_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(f6i-&gt;offload, offload);</div><div class='add'>+	WRITE_ONCE(f6i-&gt;trap, trap);</div><div class='add'>+</div><div class='add'>+	/* 2 means send notifications only if offload_failed was changed. */</div><div class='add'>+	if (net-&gt;ipv6.sysctl.fib_notify_on_flag_change == 2 &amp;&amp;</div><div class='add'>+	    READ_ONCE(f6i-&gt;offload_failed) == offload_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(f6i-&gt;offload_failed, offload_failed);</div><div class='add'>+</div><div class='add'>+	if (!rcu_access_pointer(f6i-&gt;fib6_node))</div><div class='add'>+		/* The route was removed from the tree, do not send</div><div class='add'>+		 * notification.</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!net-&gt;ipv6.sysctl.fib_notify_on_flag_change)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(rt6_nlmsg_size(f6i), GFP_KERNEL);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = rt6_fill_node(net, skb, f6i, NULL, NULL, NULL, 0, RTM_NEWROUTE, 0,</div><div class='add'>+			    0, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* -EMSGSIZE implies BUG in rt6_nlmsg_size() */</div><div class='add'>+		WARN_ON(err == -EMSGSIZE);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto errout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_notify(skb, net, 0, RTNLGRP_IPV6_ROUTE, NULL, GFP_KERNEL);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(fib6_info_hw_flags_set);</div><div class='ctx'> </div><div class='ctx'> static int ip6_route_dev_notify(struct notifier_block *this,</div><div class='ctx'> 				unsigned long event, void *ptr)</div><div class='hunk'>@@ -5021,7 +6457,7 @@ static int ip6_route_dev_notify(struct notifier_block *this,</div><div class='ctx'> 		return NOTIFY_OK;</div><div class='ctx'> </div><div class='ctx'> 	if (event == NETDEV_REGISTER) {</div><div class='del'>-		net-&gt;ipv6.fib6_null_entry-&gt;fib6_nh.nh_dev = dev;</div><div class='add'>+		net-&gt;ipv6.fib6_null_entry-&gt;fib6_nh-&gt;fib_nh_dev = dev;</div><div class='ctx'> 		net-&gt;ipv6.ip6_null_entry-&gt;dst.dev = dev;</div><div class='ctx'> 		net-&gt;ipv6.ip6_null_entry-&gt;rt6i_idev = in6_dev_get(dev);</div><div class='ctx'> #ifdef CONFIG_IPV6_MULTIPLE_TABLES</div><div class='hunk'>@@ -5068,29 +6504,32 @@ static int rt6_stats_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int ipv6_sysctl_rtcache_flush(struct ctl_table *ctl, int write,</div><div class='del'>-			      void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+static int ipv6_sysctl_rtcache_flush(const struct ctl_table *ctl, int write,</div><div class='add'>+			      void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int delay;</div><div class='add'>+	int ret;</div><div class='ctx'> 	if (!write)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ret = proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	net = (struct net *)ctl-&gt;extra1;</div><div class='ctx'> 	delay = net-&gt;ipv6.sysctl.flush_delay;</div><div class='del'>-	proc_dointvec(ctl, write, buffer, lenp, ppos);</div><div class='ctx'> 	fib6_run_gc(delay &lt;= 0 ? 0 : (unsigned long)delay, net, delay &gt; 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ctl_table ipv6_route_table_template[] = {</div><div class='add'>+static struct ctl_table ipv6_route_table_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.procname	=	"flush",</div><div class='del'>-		.data		=	&amp;init_net.ipv6.sysctl.flush_delay,</div><div class='add'>+		.procname	=	"max_size",</div><div class='add'>+		.data		=	&amp;init_net.ipv6.sysctl.ip6_rt_max_size,</div><div class='ctx'> 		.maxlen		=	sizeof(int),</div><div class='del'>-		.mode		=	0200,</div><div class='del'>-		.proc_handler	=	ipv6_sysctl_rtcache_flush</div><div class='add'>+		.mode		=	0644,</div><div class='add'>+		.proc_handler	=	proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	=	"gc_thresh",</div><div class='hunk'>@@ -5100,11 +6539,11 @@ struct ctl_table ipv6_route_table_template[] = {</div><div class='ctx'> 		.proc_handler	=	proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.procname	=	"max_size",</div><div class='del'>-		.data		=	&amp;init_net.ipv6.sysctl.ip6_rt_max_size,</div><div class='add'>+		.procname	=	"flush",</div><div class='add'>+		.data		=	&amp;init_net.ipv6.sysctl.flush_delay,</div><div class='ctx'> 		.maxlen		=	sizeof(int),</div><div class='del'>-		.mode		=	0644,</div><div class='del'>-		.proc_handler	=	proc_dointvec,</div><div class='add'>+		.mode		=	0200,</div><div class='add'>+		.proc_handler	=	ipv6_sysctl_rtcache_flush</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	=	"gc_min_interval",</div><div class='hunk'>@@ -5155,7 +6594,15 @@ struct ctl_table ipv6_route_table_template[] = {</div><div class='ctx'> 		.mode		=	0644,</div><div class='ctx'> 		.proc_handler	=	proc_dointvec_ms_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.procname	=	"skip_notify_on_dev_down",</div><div class='add'>+		.data		=	&amp;init_net.ipv6.sysctl.skip_notify_on_dev_down,</div><div class='add'>+		.maxlen		=	sizeof(u8),</div><div class='add'>+		.mode		=	0644,</div><div class='add'>+		.proc_handler	=	proc_dou8vec_minmax,</div><div class='add'>+		.extra1		=	SYSCTL_ZERO,</div><div class='add'>+		.extra2		=	SYSCTL_ONE,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)</div><div class='hunk'>@@ -5167,10 +6614,10 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (table) {</div><div class='del'>-		table[0].data = &amp;net-&gt;ipv6.sysctl.flush_delay;</div><div class='del'>-		table[0].extra1 = net;</div><div class='add'>+		table[0].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_max_size;</div><div class='ctx'> 		table[1].data = &amp;net-&gt;ipv6.ip6_dst_ops.gc_thresh;</div><div class='del'>-		table[2].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_max_size;</div><div class='add'>+		table[2].data = &amp;net-&gt;ipv6.sysctl.flush_delay;</div><div class='add'>+		table[2].extra1 = net;</div><div class='ctx'> 		table[3].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_gc_min_interval;</div><div class='ctx'> 		table[4].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_gc_timeout;</div><div class='ctx'> 		table[5].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_gc_interval;</div><div class='hunk'>@@ -5178,14 +6625,20 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)</div><div class='ctx'> 		table[7].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_mtu_expires;</div><div class='ctx'> 		table[8].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_min_advmss;</div><div class='ctx'> 		table[9].data = &amp;net-&gt;ipv6.sysctl.ip6_rt_gc_min_interval;</div><div class='del'>-</div><div class='del'>-		/* Don't export sysctls to unprivileged users */</div><div class='del'>-		if (net-&gt;user_ns != &amp;init_user_ns)</div><div class='del'>-			table[0].procname = NULL;</div><div class='add'>+		table[10].data = &amp;net-&gt;ipv6.sysctl.skip_notify_on_dev_down;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return table;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+size_t ipv6_route_sysctl_table_size(struct net *net)</div><div class='add'>+{</div><div class='add'>+	/* Don't export sysctls to unprivileged users */</div><div class='add'>+	if (net-&gt;user_ns != &amp;init_user_ns)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(ipv6_route_table_template);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int __net_init ip6_route_net_init(struct net *net)</div><div class='hunk'>@@ -5198,11 +6651,11 @@ static int __net_init ip6_route_net_init(struct net *net)</div><div class='ctx'> 	if (dst_entries_init(&amp;net-&gt;ipv6.ip6_dst_ops) &lt; 0)</div><div class='ctx'> 		goto out_ip6_dst_ops;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.fib6_null_entry = kmemdup(&amp;fib6_null_entry_template,</div><div class='del'>-					    sizeof(*net-&gt;ipv6.fib6_null_entry),</div><div class='del'>-					    GFP_KERNEL);</div><div class='add'>+	net-&gt;ipv6.fib6_null_entry = fib6_info_alloc(GFP_KERNEL, true);</div><div class='ctx'> 	if (!net-&gt;ipv6.fib6_null_entry)</div><div class='ctx'> 		goto out_ip6_dst_entries;</div><div class='add'>+	memcpy(net-&gt;ipv6.fib6_null_entry, &amp;fib6_null_entry_template,</div><div class='add'>+	       sizeof(*net-&gt;ipv6.fib6_null_entry));</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv6.ip6_null_entry = kmemdup(&amp;ip6_null_entry_template,</div><div class='ctx'> 					   sizeof(*net-&gt;ipv6.ip6_null_entry),</div><div class='hunk'>@@ -5212,6 +6665,7 @@ static int __net_init ip6_route_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.ip6_null_entry-&gt;dst.ops = &amp;net-&gt;ipv6.ip6_dst_ops;</div><div class='ctx'> 	dst_init_metrics(&amp;net-&gt;ipv6.ip6_null_entry-&gt;dst,</div><div class='ctx'> 			 ip6_template_metrics, true);</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;ipv6.ip6_null_entry-&gt;dst.rt_uncached);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_MULTIPLE_TABLES</div><div class='ctx'> 	net-&gt;ipv6.fib6_has_custom_rules = false;</div><div class='hunk'>@@ -5223,6 +6677,7 @@ static int __net_init ip6_route_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.ip6_prohibit_entry-&gt;dst.ops = &amp;net-&gt;ipv6.ip6_dst_ops;</div><div class='ctx'> 	dst_init_metrics(&amp;net-&gt;ipv6.ip6_prohibit_entry-&gt;dst,</div><div class='ctx'> 			 ip6_template_metrics, true);</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;ipv6.ip6_prohibit_entry-&gt;dst.rt_uncached);</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv6.ip6_blk_hole_entry = kmemdup(&amp;ip6_blk_hole_entry_template,</div><div class='ctx'> 					       sizeof(*net-&gt;ipv6.ip6_blk_hole_entry),</div><div class='hunk'>@@ -5232,18 +6687,23 @@ static int __net_init ip6_route_net_init(struct net *net)</div><div class='ctx'> 	net-&gt;ipv6.ip6_blk_hole_entry-&gt;dst.ops = &amp;net-&gt;ipv6.ip6_dst_ops;</div><div class='ctx'> 	dst_init_metrics(&amp;net-&gt;ipv6.ip6_blk_hole_entry-&gt;dst,</div><div class='ctx'> 			 ip6_template_metrics, true);</div><div class='add'>+	INIT_LIST_HEAD(&amp;net-&gt;ipv6.ip6_blk_hole_entry-&gt;dst.rt_uncached);</div><div class='add'>+#ifdef CONFIG_IPV6_SUBTREES</div><div class='add'>+	net-&gt;ipv6.fib6_routes_require_src = 0;</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv6.sysctl.flush_delay = 0;</div><div class='del'>-	net-&gt;ipv6.sysctl.ip6_rt_max_size = 4096;</div><div class='add'>+	net-&gt;ipv6.sysctl.ip6_rt_max_size = INT_MAX;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_gc_elasticity = 9;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;</div><div class='ctx'> 	net-&gt;ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;</div><div class='add'>+	net-&gt;ipv6.sysctl.skip_notify_on_dev_down = 0;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.ip6_rt_gc_expire = 30*HZ;</div><div class='add'>+	atomic_set(&amp;net-&gt;ipv6.ip6_rt_gc_expire, 30*HZ);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -5277,10 +6737,16 @@ static void __net_exit ip6_route_net_exit(struct net *net)</div><div class='ctx'> static int __net_init ip6_route_net_init_late(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-	proc_create_net("ipv6_route", 0, net-&gt;proc_net, &amp;ipv6_route_seq_ops,</div><div class='del'>-			sizeof(struct ipv6_route_iter));</div><div class='del'>-	proc_create_net_single("rt6_stats", 0444, net-&gt;proc_net,</div><div class='del'>-			rt6_stats_seq_show, NULL);</div><div class='add'>+	if (!proc_create_net("ipv6_route", 0, net-&gt;proc_net,</div><div class='add'>+			     &amp;ipv6_route_seq_ops,</div><div class='add'>+			     sizeof(struct ipv6_route_iter)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!proc_create_net_single("rt6_stats", 0444, net-&gt;proc_net,</div><div class='add'>+				    rt6_stats_seq_show, NULL)) {</div><div class='add'>+		remove_proc_entry("ipv6_route", net-&gt;proc_net);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5338,7 +6804,7 @@ void __init ip6_route_init_special_entries(void)</div><div class='ctx'> 	/* Registering of the loopback is done before this portion of code,</div><div class='ctx'> 	 * the loopback reference in rt6_info will not be taken, do it</div><div class='ctx'> 	 * manually for init_net */</div><div class='del'>-	init_net.ipv6.fib6_null_entry-&gt;fib6_nh.nh_dev = init_net.loopback_dev;</div><div class='add'>+	init_net.ipv6.fib6_null_entry-&gt;fib6_nh-&gt;fib_nh_dev = init_net.loopback_dev;</div><div class='ctx'> 	init_net.ipv6.ip6_null_entry-&gt;dst.dev = init_net.loopback_dev;</div><div class='ctx'> 	init_net.ipv6.ip6_null_entry-&gt;rt6i_idev = in6_dev_get(init_net.loopback_dev);</div><div class='ctx'>   #ifdef CONFIG_IPV6_MULTIPLE_TABLES</div><div class='hunk'>@@ -5349,6 +6815,51 @@ void __init ip6_route_init_special_entries(void)</div><div class='ctx'>   #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+DEFINE_BPF_ITER_FUNC(ipv6_route, struct bpf_iter_meta *meta, struct fib6_info *rt)</div><div class='add'>+</div><div class='add'>+BTF_ID_LIST_SINGLE(btf_fib6_info_id, struct, fib6_info)</div><div class='add'>+</div><div class='add'>+static const struct bpf_iter_seq_info ipv6_route_seq_info = {</div><div class='add'>+	.seq_ops		= &amp;ipv6_route_seq_ops,</div><div class='add'>+	.init_seq_private	= bpf_iter_init_seq_net,</div><div class='add'>+	.fini_seq_private	= bpf_iter_fini_seq_net,</div><div class='add'>+	.seq_priv_size		= sizeof(struct ipv6_route_iter),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bpf_iter_reg ipv6_route_reg_info = {</div><div class='add'>+	.target			= "ipv6_route",</div><div class='add'>+	.ctx_arg_info_size	= 1,</div><div class='add'>+	.ctx_arg_info		= {</div><div class='add'>+		{ offsetof(struct bpf_iter__ipv6_route, rt),</div><div class='add'>+		  PTR_TO_BTF_ID_OR_NULL },</div><div class='add'>+	},</div><div class='add'>+	.seq_info		= &amp;ipv6_route_seq_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_iter_register(void)</div><div class='add'>+{</div><div class='add'>+	ipv6_route_reg_info.ctx_arg_info[0].btf_id = *btf_fib6_info_id;</div><div class='add'>+	return bpf_iter_reg_target(&amp;ipv6_route_reg_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_iter_unregister(void)</div><div class='add'>+{</div><div class='add'>+	bpf_iter_unreg_target(&amp;ipv6_route_reg_info);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct rtnl_msg_handler ip6_route_rtnl_msg_handlers[] __initconst_or_module = {</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_NEWROUTE,</div><div class='add'>+	 .doit = inet6_rtm_newroute, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_DELROUTE,</div><div class='add'>+	 .doit = inet6_rtm_delroute, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+	{.owner = THIS_MODULE, .protocol = PF_INET6, .msgtype = RTM_GETROUTE,</div><div class='add'>+	 .doit = inet6_rtm_getroute, .flags = RTNL_FLAG_DOIT_UNLOCKED},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init ip6_route_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5357,7 +6868,7 @@ int __init ip6_route_init(void)</div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> 	ip6_dst_ops_template.kmem_cachep =</div><div class='ctx'> 		kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+				  SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT, NULL);</div><div class='ctx'> 	if (!ip6_dst_ops_template.kmem_cachep)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -5391,25 +6902,21 @@ int __init ip6_route_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fib6_rules_init;</div><div class='ctx'> </div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_NEWROUTE,</div><div class='del'>-				   inet6_rtm_newroute, NULL, 0);</div><div class='add'>+	ret = rtnl_register_many(ip6_route_rtnl_msg_handlers);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_register_late_subsys;</div><div class='ctx'> </div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_DELROUTE,</div><div class='del'>-				   inet6_rtm_delroute, NULL, 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_register_late_subsys;</div><div class='del'>-</div><div class='del'>-	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETROUTE,</div><div class='del'>-				   inet6_rtm_getroute, NULL,</div><div class='del'>-				   RTNL_FLAG_DOIT_UNLOCKED);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = register_netdevice_notifier(&amp;ip6_route_dev_notifier);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_register_late_subsys;</div><div class='ctx'> </div><div class='del'>-	ret = register_netdevice_notifier(&amp;ip6_route_dev_notifier);</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+	ret = bpf_iter_register();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_register_late_subsys;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct uncached_list *ul = per_cpu_ptr(&amp;rt6_uncached_list, cpu);</div><div class='hunk'>@@ -5443,6 +6950,11 @@ out_kmem_cache:</div><div class='ctx'> </div><div class='ctx'> void ip6_route_cleanup(void)</div><div class='ctx'> {</div><div class='add'>+#if IS_BUILTIN(CONFIG_IPV6)</div><div class='add'>+#if defined(CONFIG_BPF_SYSCALL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+	bpf_iter_unregister();</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;ip6_route_dev_notifier);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;ip6_route_net_late_ops);</div><div class='ctx'> 	fib6_rules_cleanup();</div><div class='head'>diff --git a/net/ipv6/rpl.c b/net/ipv6/rpl.c<br/>new file mode 100644<br/>index 000000000000..e186998bfbf7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/rpl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/rpl.c</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Authors:</div><div class='add'>+ * (C) 2020 Alexander Aring &lt;alex.aring@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/rpl.h&gt;</div><div class='add'>+</div><div class='add'>+#define IPV6_PFXTAIL_LEN(x) (sizeof(struct in6_addr) - (x))</div><div class='add'>+#define IPV6_RPL_BEST_ADDR_COMPRESSION 15</div><div class='add'>+</div><div class='add'>+static void ipv6_rpl_addr_decompress(struct in6_addr *dst,</div><div class='add'>+				     const struct in6_addr *daddr,</div><div class='add'>+				     const void *post, unsigned char pfx)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, daddr, pfx);</div><div class='add'>+	memcpy(&amp;dst-&gt;s6_addr[pfx], post, IPV6_PFXTAIL_LEN(pfx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipv6_rpl_addr_compress(void *dst, const struct in6_addr *addr,</div><div class='add'>+				   unsigned char pfx)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, &amp;addr-&gt;s6_addr[pfx], IPV6_PFXTAIL_LEN(pfx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *ipv6_rpl_segdata_pos(const struct ipv6_rpl_sr_hdr *hdr, int i)</div><div class='add'>+{</div><div class='add'>+	return (void *)&amp;hdr-&gt;rpl_segdata[i * IPV6_PFXTAIL_LEN(hdr-&gt;cmpri)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ipv6_rpl_srh_decompress(struct ipv6_rpl_sr_hdr *outhdr,</div><div class='add'>+			     const struct ipv6_rpl_sr_hdr *inhdr,</div><div class='add'>+			     const struct in6_addr *daddr, unsigned char n)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	outhdr-&gt;nexthdr = inhdr-&gt;nexthdr;</div><div class='add'>+	outhdr-&gt;hdrlen = (((n + 1) * sizeof(struct in6_addr)) &gt;&gt; 3);</div><div class='add'>+	outhdr-&gt;pad = 0;</div><div class='add'>+	outhdr-&gt;type = inhdr-&gt;type;</div><div class='add'>+	outhdr-&gt;segments_left = inhdr-&gt;segments_left;</div><div class='add'>+	outhdr-&gt;cmpri = 0;</div><div class='add'>+	outhdr-&gt;cmpre = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		ipv6_rpl_addr_decompress(&amp;outhdr-&gt;rpl_segaddr[i], daddr,</div><div class='add'>+					 ipv6_rpl_segdata_pos(inhdr, i),</div><div class='add'>+					 inhdr-&gt;cmpri);</div><div class='add'>+</div><div class='add'>+	ipv6_rpl_addr_decompress(&amp;outhdr-&gt;rpl_segaddr[n], daddr,</div><div class='add'>+				 ipv6_rpl_segdata_pos(inhdr, n),</div><div class='add'>+				 inhdr-&gt;cmpre);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char ipv6_rpl_srh_calc_cmpri(const struct ipv6_rpl_sr_hdr *inhdr,</div><div class='add'>+					     const struct in6_addr *daddr,</div><div class='add'>+					     unsigned char n)</div><div class='add'>+{</div><div class='add'>+	unsigned char plen;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (plen = 0; plen &lt; sizeof(*daddr); plen++) {</div><div class='add'>+		for (i = 0; i &lt; n; i++) {</div><div class='add'>+			if (daddr-&gt;s6_addr[plen] !=</div><div class='add'>+			    inhdr-&gt;rpl_segaddr[i].s6_addr[plen])</div><div class='add'>+				return plen;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IPV6_RPL_BEST_ADDR_COMPRESSION;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char ipv6_rpl_srh_calc_cmpre(const struct in6_addr *daddr,</div><div class='add'>+					     const struct in6_addr *last_segment)</div><div class='add'>+{</div><div class='add'>+	unsigned int plen;</div><div class='add'>+</div><div class='add'>+	for (plen = 0; plen &lt; sizeof(*daddr); plen++) {</div><div class='add'>+		if (daddr-&gt;s6_addr[plen] != last_segment-&gt;s6_addr[plen])</div><div class='add'>+			return plen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IPV6_RPL_BEST_ADDR_COMPRESSION;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ipv6_rpl_srh_compress(struct ipv6_rpl_sr_hdr *outhdr,</div><div class='add'>+			   const struct ipv6_rpl_sr_hdr *inhdr,</div><div class='add'>+			   const struct in6_addr *daddr, unsigned char n)</div><div class='add'>+{</div><div class='add'>+	unsigned char cmpri, cmpre;</div><div class='add'>+	size_t seglen;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cmpri = ipv6_rpl_srh_calc_cmpri(inhdr, daddr, n);</div><div class='add'>+	cmpre = ipv6_rpl_srh_calc_cmpre(daddr, &amp;inhdr-&gt;rpl_segaddr[n]);</div><div class='add'>+</div><div class='add'>+	outhdr-&gt;nexthdr = inhdr-&gt;nexthdr;</div><div class='add'>+	seglen = (n * IPV6_PFXTAIL_LEN(cmpri)) + IPV6_PFXTAIL_LEN(cmpre);</div><div class='add'>+	outhdr-&gt;hdrlen = seglen &gt;&gt; 3;</div><div class='add'>+	if (seglen &amp; 0x7) {</div><div class='add'>+		outhdr-&gt;hdrlen++;</div><div class='add'>+		outhdr-&gt;pad = 8 - (seglen &amp; 0x7);</div><div class='add'>+	} else {</div><div class='add'>+		outhdr-&gt;pad = 0;</div><div class='add'>+	}</div><div class='add'>+	outhdr-&gt;type = inhdr-&gt;type;</div><div class='add'>+	outhdr-&gt;segments_left = inhdr-&gt;segments_left;</div><div class='add'>+	outhdr-&gt;cmpri = cmpri;</div><div class='add'>+	outhdr-&gt;cmpre = cmpre;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		ipv6_rpl_addr_compress(ipv6_rpl_segdata_pos(outhdr, i),</div><div class='add'>+				       &amp;inhdr-&gt;rpl_segaddr[i], cmpri);</div><div class='add'>+</div><div class='add'>+	ipv6_rpl_addr_compress(ipv6_rpl_segdata_pos(outhdr, n),</div><div class='add'>+			       &amp;inhdr-&gt;rpl_segaddr[n], cmpre);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c<br/>new file mode 100644<br/>index 000000000000..c7942cf65567<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/rpl_iptunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/rpl_iptunnel.c</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Authors:</div><div class='add'>+ * (C) 2020 Alexander Aring &lt;alex.aring@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/rpl_iptunnel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/dst_cache.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/lwtunnel.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/rpl.h&gt;</div><div class='add'>+</div><div class='add'>+struct rpl_iptunnel_encap {</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct ipv6_rpl_sr_hdr, srh);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpl_lwt {</div><div class='add'>+	struct dst_cache cache;</div><div class='add'>+	struct rpl_iptunnel_encap tuninfo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct rpl_lwt *rpl_lwt_lwtunnel(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	return (struct rpl_lwt *)lwt-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rpl_iptunnel_encap *</div><div class='add'>+rpl_encap_lwtunnel(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	return &amp;rpl_lwt_lwtunnel(lwt)-&gt;tuninfo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy rpl_iptunnel_policy[RPL_IPTUNNEL_MAX + 1] = {</div><div class='add'>+	[RPL_IPTUNNEL_SRH]	= { .type = NLA_BINARY },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool rpl_validate_srh(struct net *net, struct ipv6_rpl_sr_hdr *srh,</div><div class='add'>+			     size_t seglen)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if ((srh-&gt;hdrlen &lt;&lt; 3) != seglen)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* check at least one segment and seglen fit with segments_left */</div><div class='add'>+	if (!srh-&gt;segments_left ||</div><div class='add'>+	    (srh-&gt;segments_left * sizeof(struct in6_addr)) != seglen)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (srh-&gt;cmpri || srh-&gt;cmpre)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	err = ipv6_chk_rpl_srh_loop(net, srh-&gt;rpl_segaddr,</div><div class='add'>+				    srh-&gt;segments_left);</div><div class='add'>+	if (err)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_type(&amp;srh-&gt;rpl_segaddr[srh-&gt;segments_left - 1]) &amp;</div><div class='add'>+	    IPV6_ADDR_MULTICAST)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_build_state(struct net *net, struct nlattr *nla,</div><div class='add'>+			   unsigned int family, const void *cfg,</div><div class='add'>+			   struct lwtunnel_state **ts,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[RPL_IPTUNNEL_MAX + 1];</div><div class='add'>+	struct lwtunnel_state *newts;</div><div class='add'>+	struct ipv6_rpl_sr_hdr *srh;</div><div class='add'>+	struct rpl_lwt *rlwt;</div><div class='add'>+	int err, srh_len;</div><div class='add'>+</div><div class='add'>+	if (family != AF_INET6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb, RPL_IPTUNNEL_MAX, nla,</div><div class='add'>+			       rpl_iptunnel_policy, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb[RPL_IPTUNNEL_SRH])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	srh = nla_data(tb[RPL_IPTUNNEL_SRH]);</div><div class='add'>+	srh_len = nla_len(tb[RPL_IPTUNNEL_SRH]);</div><div class='add'>+</div><div class='add'>+	if (srh_len &lt; sizeof(*srh))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* verify that SRH is consistent */</div><div class='add'>+	if (!rpl_validate_srh(net, srh, srh_len - sizeof(*srh)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	newts = lwtunnel_state_alloc(srh_len + sizeof(*rlwt));</div><div class='add'>+	if (!newts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rlwt = rpl_lwt_lwtunnel(newts);</div><div class='add'>+</div><div class='add'>+	err = dst_cache_init(&amp;rlwt-&gt;cache, GFP_ATOMIC);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(newts);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;rlwt-&gt;tuninfo.srh, srh, srh_len);</div><div class='add'>+</div><div class='add'>+	newts-&gt;type = LWTUNNEL_ENCAP_RPL;</div><div class='add'>+	newts-&gt;flags |= LWTUNNEL_STATE_INPUT_REDIRECT;</div><div class='add'>+	newts-&gt;flags |= LWTUNNEL_STATE_OUTPUT_REDIRECT;</div><div class='add'>+</div><div class='add'>+	*ts = newts;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rpl_destroy_state(struct lwtunnel_state *lwt)</div><div class='add'>+{</div><div class='add'>+	dst_cache_destroy(&amp;rpl_lwt_lwtunnel(lwt)-&gt;cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt,</div><div class='add'>+			     const struct ipv6_rpl_sr_hdr *srh,</div><div class='add'>+			     struct dst_entry *cache_dst)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_rpl_sr_hdr *isrh, *csrh;</div><div class='add'>+	struct ipv6hdr oldhdr;</div><div class='add'>+	struct ipv6hdr *hdr;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	size_t hdrlen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;oldhdr, ipv6_hdr(skb), sizeof(oldhdr));</div><div class='add'>+</div><div class='add'>+	buf = kcalloc(struct_size(srh, segments.addr, srh-&gt;segments_left), 2, GFP_ATOMIC);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	isrh = (struct ipv6_rpl_sr_hdr *)buf;</div><div class='add'>+	csrh = (struct ipv6_rpl_sr_hdr *)(buf + ((srh-&gt;hdrlen + 1) &lt;&lt; 3));</div><div class='add'>+</div><div class='add'>+	memcpy(isrh, srh, sizeof(*isrh));</div><div class='add'>+	memcpy(isrh-&gt;rpl_segaddr, &amp;srh-&gt;rpl_segaddr[1],</div><div class='add'>+	       (srh-&gt;segments_left - 1) * 16);</div><div class='add'>+	isrh-&gt;rpl_segaddr[srh-&gt;segments_left - 1] = oldhdr.daddr;</div><div class='add'>+</div><div class='add'>+	ipv6_rpl_srh_compress(csrh, isrh, &amp;srh-&gt;rpl_segaddr[0],</div><div class='add'>+			      isrh-&gt;segments_left - 1);</div><div class='add'>+</div><div class='add'>+	hdrlen = ((csrh-&gt;hdrlen + 1) &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, hdrlen + dst_dev_overhead(cache_dst, skb));</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct ipv6hdr));</div><div class='add'>+	skb_postpull_rcsum(skb, skb_network_header(skb),</div><div class='add'>+			   sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(struct ipv6hdr) + hdrlen);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+	memmove(hdr, &amp;oldhdr, sizeof(*hdr));</div><div class='add'>+	isrh = (void *)hdr + sizeof(*hdr);</div><div class='add'>+	memcpy(isrh, csrh, hdrlen);</div><div class='add'>+</div><div class='add'>+	isrh-&gt;nexthdr = hdr-&gt;nexthdr;</div><div class='add'>+	hdr-&gt;nexthdr = NEXTHDR_ROUTING;</div><div class='add'>+	hdr-&gt;daddr = srh-&gt;rpl_segaddr[0];</div><div class='add'>+</div><div class='add'>+	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	skb_postpush_rcsum(skb, hdr, sizeof(struct ipv6hdr) + hdrlen);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt,</div><div class='add'>+		      struct dst_entry *cache_dst)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct rpl_iptunnel_encap *tinfo;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IPV6))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tinfo = rpl_encap_lwtunnel(dst-&gt;lwtstate);</div><div class='add'>+</div><div class='add'>+	return rpl_do_srh_inline(skb, rlwt, tinfo-&gt;srh, cache_dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct rpl_lwt *rlwt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rlwt = rpl_lwt_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	dst = dst_cache_get(&amp;rlwt-&gt;cache);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	err = rpl_do_srh(skb, rlwt, dst);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!dst)) {</div><div class='add'>+		struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='add'>+		struct flowi6 fl6;</div><div class='add'>+</div><div class='add'>+		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+		fl6.daddr = hdr-&gt;daddr;</div><div class='add'>+		fl6.saddr = hdr-&gt;saddr;</div><div class='add'>+		fl6.flowlabel = ip6_flowinfo(hdr);</div><div class='add'>+		fl6.flowi6_mark = skb-&gt;mark;</div><div class='add'>+		fl6.flowi6_proto = hdr-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+		dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='add'>+		if (dst-&gt;error) {</div><div class='add'>+			err = dst-&gt;error;</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* cache only if we don't create a dst reference loop */</div><div class='add'>+		if (orig_dst-&gt;lwtstate != dst-&gt;lwtstate) {</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			dst_cache_set_ip6(&amp;rlwt-&gt;cache, dst, &amp;fl6.saddr);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = skb_cow_head(skb, LL_RESERVED_SPACE(dst_dev(dst)));</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_dst_drop(skb);</div><div class='add'>+	skb_dst_set(skb, dst);</div><div class='add'>+</div><div class='add'>+	return dst_output(net, sk, skb);</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	dst_release(dst);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_input(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct lwtunnel_state *lwtst;</div><div class='add'>+	struct rpl_lwt *rlwt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* We cannot dereference "orig_dst" once ip6_route_input() or</div><div class='add'>+	 * skb_dst_drop() is called. However, in order to detect a dst loop, we</div><div class='add'>+	 * need the address of its lwtstate. So, save the address of lwtstate</div><div class='add'>+	 * now and use it later as a comparison.</div><div class='add'>+	 */</div><div class='add'>+	lwtst = orig_dst-&gt;lwtstate;</div><div class='add'>+</div><div class='add'>+	rlwt = rpl_lwt_lwtunnel(lwtst);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	dst = dst_cache_get(&amp;rlwt-&gt;cache);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	err = rpl_do_srh(skb, rlwt, dst);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dst) {</div><div class='add'>+		ip6_route_input(skb);</div><div class='add'>+		dst = skb_dst(skb);</div><div class='add'>+</div><div class='add'>+		/* cache only if we don't create a dst reference loop */</div><div class='add'>+		if (!dst-&gt;error &amp;&amp; lwtst != dst-&gt;lwtstate) {</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			dst_cache_set_ip6(&amp;rlwt-&gt;cache, dst,</div><div class='add'>+					  &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = skb_cow_head(skb, LL_RESERVED_SPACE(dst_dev(dst)));</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='add'>+	} else {</div><div class='add'>+		skb_dst_drop(skb);</div><div class='add'>+		skb_dst_set(skb, dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nla_put_rpl_srh(struct sk_buff *skb, int attrtype,</div><div class='add'>+			   struct rpl_iptunnel_encap *tuninfo)</div><div class='add'>+{</div><div class='add'>+	struct rpl_iptunnel_encap *data;</div><div class='add'>+	struct nlattr *nla;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = RPL_IPTUNNEL_SRH_SIZE(tuninfo-&gt;srh);</div><div class='add'>+</div><div class='add'>+	nla = nla_reserve(skb, attrtype, len);</div><div class='add'>+	if (!nla)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	data = nla_data(nla);</div><div class='add'>+	memcpy(data, tuninfo-&gt;srh, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_fill_encap_info(struct sk_buff *skb,</div><div class='add'>+			       struct lwtunnel_state *lwtstate)</div><div class='add'>+{</div><div class='add'>+	struct rpl_iptunnel_encap *tuninfo = rpl_encap_lwtunnel(lwtstate);</div><div class='add'>+</div><div class='add'>+	if (nla_put_rpl_srh(skb, RPL_IPTUNNEL_SRH, tuninfo))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_encap_nlsize(struct lwtunnel_state *lwtstate)</div><div class='add'>+{</div><div class='add'>+	struct rpl_iptunnel_encap *tuninfo = rpl_encap_lwtunnel(lwtstate);</div><div class='add'>+</div><div class='add'>+	return nla_total_size(RPL_IPTUNNEL_SRH_SIZE(tuninfo-&gt;srh));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpl_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)</div><div class='add'>+{</div><div class='add'>+	struct rpl_iptunnel_encap *a_hdr = rpl_encap_lwtunnel(a);</div><div class='add'>+	struct rpl_iptunnel_encap *b_hdr = rpl_encap_lwtunnel(b);</div><div class='add'>+	int len = RPL_IPTUNNEL_SRH_SIZE(a_hdr-&gt;srh);</div><div class='add'>+</div><div class='add'>+	if (len != RPL_IPTUNNEL_SRH_SIZE(b_hdr-&gt;srh))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return memcmp(a_hdr, b_hdr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct lwtunnel_encap_ops rpl_ops = {</div><div class='add'>+	.build_state	= rpl_build_state,</div><div class='add'>+	.destroy_state	= rpl_destroy_state,</div><div class='add'>+	.output		= rpl_output,</div><div class='add'>+	.input		= rpl_input,</div><div class='add'>+	.fill_encap	= rpl_fill_encap_info,</div><div class='add'>+	.get_encap_size	= rpl_encap_nlsize,</div><div class='add'>+	.cmp_encap	= rpl_encap_cmp,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init rpl_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lwtunnel_encap_add_ops(&amp;rpl_ops, LWTUNNEL_ENCAP_RPL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pr_info("RPL Segment Routing with IPv6\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rpl_exit(void)</div><div class='add'>+{</div><div class='add'>+	lwtunnel_encap_del_ops(&amp;rpl_ops, LWTUNNEL_ENCAP_RPL);</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c<br/>index 8d0ba757a46c..a5c4c629b788 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/seg6.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  SR-IPv6 implementation</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:</div><div class='ctx'>  *  David Lebrun &lt;david.lebrun@uclouvain.be&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *	  modify it under the terms of the GNU General Public License</div><div class='del'>- *	  as published by the Free Software Foundation; either version</div><div class='del'>- *	  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -26,14 +21,13 @@</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;linux/seg6.h&gt;</div><div class='ctx'> #include &lt;linux/seg6_genl.h&gt;</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> #include &lt;net/seg6_hmac.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len)</div><div class='add'>+bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len, bool reduced)</div><div class='ctx'> {</div><div class='del'>-	int trailing;</div><div class='ctx'> 	unsigned int tlv_offset;</div><div class='add'>+	int max_last_entry;</div><div class='add'>+	int trailing;</div><div class='ctx'> </div><div class='ctx'> 	if (srh-&gt;type != IPV6_SRCRT_TYPE_4)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -41,8 +35,17 @@ bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len)</div><div class='ctx'> 	if (((srh-&gt;hdrlen + 1) &lt;&lt; 3) != len)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (srh-&gt;segments_left &gt; srh-&gt;first_segment)</div><div class='add'>+	if (!reduced &amp;&amp; srh-&gt;segments_left &gt; srh-&gt;first_segment) {</div><div class='ctx'> 		return false;</div><div class='add'>+	} else {</div><div class='add'>+		max_last_entry = (srh-&gt;hdrlen / 2) - 1;</div><div class='add'>+</div><div class='add'>+		if (srh-&gt;first_segment &gt; max_last_entry)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (srh-&gt;segments_left &gt; srh-&gt;first_segment + 1)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tlv_offset = sizeof(*srh) + ((srh-&gt;first_segment + 1) &lt;&lt; 4);</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +73,65 @@ bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ipv6_sr_hdr *seg6_get_srh(struct sk_buff *skb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_sr_hdr *srh;</div><div class='add'>+	int len, srhoff = 0;</div><div class='add'>+</div><div class='add'>+	if (ipv6_find_hdr(skb, &amp;srhoff, IPPROTO_ROUTING, NULL, &amp;flags) &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, srhoff + sizeof(*srh)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	srh = (struct ipv6_sr_hdr *)(skb-&gt;data + srhoff);</div><div class='add'>+</div><div class='add'>+	len = (srh-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, srhoff + len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* note that pskb_may_pull may change pointers in header;</div><div class='add'>+	 * for this reason it is necessary to reload them when needed.</div><div class='add'>+	 */</div><div class='add'>+	srh = (struct ipv6_sr_hdr *)(skb-&gt;data + srhoff);</div><div class='add'>+</div><div class='add'>+	if (!seg6_validate_srh(srh, len, true))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return srh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if an ICMP invoking packet contains a segment routing</div><div class='add'>+ * header.  If it does, extract the offset to the true destination</div><div class='add'>+ * address, which is in the first segment address.</div><div class='add'>+ */</div><div class='add'>+void seg6_icmp_srh(struct sk_buff *skb, struct inet6_skb_parm *opt)</div><div class='add'>+{</div><div class='add'>+	__u16 network_header = skb-&gt;network_header;</div><div class='add'>+	struct ipv6_sr_hdr *srh;</div><div class='add'>+</div><div class='add'>+	/* Update network header to point to the invoking packet</div><div class='add'>+	 * inside the ICMP packet, so we can use the seg6_get_srh()</div><div class='add'>+	 * helper.</div><div class='add'>+	 */</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	srh = seg6_get_srh(skb, 0);</div><div class='add'>+	if (!srh)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (srh-&gt;type != IPV6_SRCRT_TYPE_4)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	opt-&gt;flags |= IP6SKB_SEG6;</div><div class='add'>+	opt-&gt;srhoff = (unsigned char *)srh - skb-&gt;data;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* Restore the network header back to the ICMP packet */</div><div class='add'>+	skb-&gt;network_header = network_header;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct genl_family seg6_genl_family;</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy seg6_genl_policy[SEG6_ATTR_MAX + 1] = {</div><div class='hunk'>@@ -117,9 +179,6 @@ static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	hinfo = seg6_hmac_info_lookup(net, hmackeyid);</div><div class='ctx'> </div><div class='ctx'> 	if (!slen) {</div><div class='del'>-		if (!hinfo)</div><div class='del'>-			err = -ENOENT;</div><div class='del'>-</div><div class='ctx'> 		err = seg6_hmac_info_del(net, hmackeyid);</div><div class='ctx'> </div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -130,6 +189,11 @@ static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (slen &gt; nla_len(info-&gt;attrs[SEG6_ATTR_SECRET])) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (hinfo) {</div><div class='ctx'> 		err = seg6_hmac_info_del(net, hmackeyid);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -221,9 +285,7 @@ static int seg6_genl_get_tunsrc(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	genlmsg_end(msg, hdr);</div><div class='del'>-	genlmsg_reply(msg, info);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return genlmsg_reply(msg, info);</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -373,9 +435,11 @@ static int __net_init seg6_net_init(struct net *net)</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;ipv6.seg6_data = sdata;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='del'>-	seg6_hmac_net_init(net);</div><div class='del'>-#endif</div><div class='add'>+	if (seg6_hmac_net_init(net)) {</div><div class='add'>+		kfree(rcu_dereference_raw(sdata-&gt;tun_src));</div><div class='add'>+		kfree(sdata);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -384,11 +448,9 @@ static void __net_exit seg6_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_pernet_data *sdata = seg6_pernet(net);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> 	seg6_hmac_net_exit(net);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	kfree(sdata-&gt;tun_src);</div><div class='add'>+	kfree(rcu_dereference_raw(sdata-&gt;tun_src));</div><div class='ctx'> 	kfree(sdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -400,28 +462,28 @@ static struct pernet_operations ip6_segments_ops = {</div><div class='ctx'> static const struct genl_ops seg6_genl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= SEG6_CMD_SETHMAC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= seg6_genl_sethmac,</div><div class='del'>-		.policy	= seg6_genl_policy,</div><div class='ctx'> 		.flags	= GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= SEG6_CMD_DUMPHMAC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.start	= seg6_genl_dumphmac_start,</div><div class='ctx'> 		.dumpit	= seg6_genl_dumphmac,</div><div class='ctx'> 		.done	= seg6_genl_dumphmac_done,</div><div class='del'>-		.policy	= seg6_genl_policy,</div><div class='ctx'> 		.flags	= GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= SEG6_CMD_SET_TUNSRC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= seg6_genl_set_tunsrc,</div><div class='del'>-		.policy	= seg6_genl_policy,</div><div class='ctx'> 		.flags	= GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= SEG6_CMD_GET_TUNSRC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= seg6_genl_get_tunsrc,</div><div class='del'>-		.policy = seg6_genl_policy,</div><div class='ctx'> 		.flags	= GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -431,69 +493,52 @@ static struct genl_family seg6_genl_family __ro_after_init = {</div><div class='ctx'> 	.name		= SEG6_GENL_NAME,</div><div class='ctx'> 	.version	= SEG6_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= SEG6_ATTR_MAX,</div><div class='add'>+	.policy = seg6_genl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.parallel_ops	= true,</div><div class='ctx'> 	.ops		= seg6_genl_ops,</div><div class='ctx'> 	.n_ops		= ARRAY_SIZE(seg6_genl_ops),</div><div class='add'>+	.resv_start_op	= SEG6_CMD_GET_TUNSRC + 1,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init seg6_init(void)</div><div class='ctx'> {</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = genl_register_family(&amp;seg6_genl_family);</div><div class='add'>+	err = register_pernet_subsys(&amp;ip6_segments_ops);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = register_pernet_subsys(&amp;ip6_segments_ops);</div><div class='add'>+	err = genl_register_family(&amp;seg6_genl_family);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_unregister_genl;</div><div class='add'>+		goto out_unregister_pernet;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_LWTUNNEL</div><div class='ctx'> 	err = seg6_iptunnel_init();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_unregister_pernet;</div><div class='add'>+		goto out_unregister_genl;</div><div class='ctx'> </div><div class='ctx'> 	err = seg6_local_init();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_unregister_pernet;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='del'>-	err = seg6_hmac_init();</div><div class='del'>-	if (err)</div><div class='ctx'> 		goto out_unregister_iptun;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Segment Routing with IPv6\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> out_unregister_iptun:</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_LWTUNNEL</div><div class='del'>-	seg6_local_exit();</div><div class='ctx'> 	seg6_iptunnel_exit();</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_LWTUNNEL</div><div class='del'>-out_unregister_pernet:</div><div class='del'>-	unregister_pernet_subsys(&amp;ip6_segments_ops);</div><div class='del'>-#endif</div><div class='ctx'> out_unregister_genl:</div><div class='ctx'> 	genl_unregister_family(&amp;seg6_genl_family);</div><div class='add'>+out_unregister_pernet:</div><div class='add'>+	unregister_pernet_subsys(&amp;ip6_segments_ops);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void seg6_exit(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='del'>-	seg6_hmac_exit();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_IPV6_SEG6_LWTUNNEL</div><div class='add'>+	seg6_local_exit();</div><div class='ctx'> 	seg6_iptunnel_exit();</div><div class='del'>-#endif</div><div class='del'>-	unregister_pernet_subsys(&amp;ip6_segments_ops);</div><div class='ctx'> 	genl_unregister_family(&amp;seg6_genl_family);</div><div class='add'>+	unregister_pernet_subsys(&amp;ip6_segments_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c<br/>index 8546f94f30d4..ee6bac0160ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_hmac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_hmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_hmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/seg6_hmac.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  SR-IPv6 implementation -- HMAC functions</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:</div><div class='ctx'>  *  David Lebrun &lt;david.lebrun@uclouvain.be&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -21,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;linux/mroute6.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netfilter.h&gt;</div><div class='hunk'>@@ -39,15 +33,22 @@</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cryptohash.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/sha1.h&gt;</div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='add'>+#include &lt;crypto/utils.h&gt;</div><div class='ctx'> #include &lt;net/seg6.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> #include &lt;net/seg6_hmac.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(char [SEG6_HMAC_RING_SIZE], hmac_ring);</div><div class='add'>+struct hmac_storage {</div><div class='add'>+	local_lock_t bh_lock;</div><div class='add'>+	char hmac_ring[SEG6_HMAC_RING_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct hmac_storage, hmac_storage) = {</div><div class='add'>+	.bh_lock = INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int seg6_hmac_cmpfn(struct rhashtable_compare_arg *arg, const void *obj)</div><div class='ctx'> {</div><div class='hunk'>@@ -77,17 +78,6 @@ static const struct rhashtable_params rht_params = {</div><div class='ctx'> 	.obj_cmpfn		= seg6_hmac_cmpfn,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct seg6_hmac_algo hmac_algos[] = {</div><div class='del'>-	{</div><div class='del'>-		.alg_id = SEG6_HMAC_ALGO_SHA1,</div><div class='del'>-		.name = "hmac(sha1)",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.alg_id = SEG6_HMAC_ALGO_SHA256,</div><div class='del'>-		.name = "hmac(sha256)",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct sr6_tlv_hmac *seg6_get_tlv_hmac(struct ipv6_sr_hdr *srh)</div><div class='ctx'> {</div><div class='ctx'> 	struct sr6_tlv_hmac *tlv;</div><div class='hunk'>@@ -107,75 +97,13 @@ static struct sr6_tlv_hmac *seg6_get_tlv_hmac(struct ipv6_sr_hdr *srh)</div><div class='ctx'> 	return tlv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct seg6_hmac_algo *__hmac_get_algo(u8 alg_id)</div><div class='del'>-{</div><div class='del'>-	struct seg6_hmac_algo *algo;</div><div class='del'>-	int i, alg_count;</div><div class='del'>-</div><div class='del'>-	alg_count = ARRAY_SIZE(hmac_algos);</div><div class='del'>-	for (i = 0; i &lt; alg_count; i++) {</div><div class='del'>-		algo = &amp;hmac_algos[i];</div><div class='del'>-		if (algo-&gt;alg_id == alg_id)</div><div class='del'>-			return algo;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __do_hmac(struct seg6_hmac_info *hinfo, const char *text, u8 psize,</div><div class='del'>-		     u8 *output, int outlen)</div><div class='del'>-{</div><div class='del'>-	struct seg6_hmac_algo *algo;</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='del'>-	struct shash_desc *shash;</div><div class='del'>-	int ret, dgsize;</div><div class='del'>-</div><div class='del'>-	algo = __hmac_get_algo(hinfo-&gt;alg_id);</div><div class='del'>-	if (!algo)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	tfm = *this_cpu_ptr(algo-&gt;tfms);</div><div class='del'>-</div><div class='del'>-	dgsize = crypto_shash_digestsize(tfm);</div><div class='del'>-	if (dgsize &gt; outlen) {</div><div class='del'>-		pr_debug("sr-ipv6: __do_hmac: digest size too big (%d / %d)\n",</div><div class='del'>-			 dgsize, outlen);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_shash_setkey(tfm, hinfo-&gt;secret, hinfo-&gt;slen);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_debug("sr-ipv6: crypto_shash_setkey failed: err %d\n", ret);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shash = *this_cpu_ptr(algo-&gt;shashs);</div><div class='del'>-	shash-&gt;tfm = tfm;</div><div class='del'>-</div><div class='del'>-	ret = crypto_shash_digest(shash, text, psize, output);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_debug("sr-ipv6: crypto_shash_digest failed: err %d\n", ret);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dgsize;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int seg6_hmac_compute(struct seg6_hmac_info *hinfo, struct ipv6_sr_hdr *hdr,</div><div class='ctx'> 		      struct in6_addr *saddr, u8 *output)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 hmackeyid = cpu_to_be32(hinfo-&gt;hmackeyid);</div><div class='del'>-	u8 tmp_out[SEG6_HMAC_MAX_DIGESTSIZE];</div><div class='del'>-	int plen, i, dgsize, wrsize;</div><div class='add'>+	int plen, i, ret = 0;</div><div class='ctx'> 	char *ring, *off;</div><div class='ctx'> </div><div class='del'>-	/* a 160-byte buffer for digest output allows to store highest known</div><div class='del'>-	 * hash function (RadioGatun) with up to 1216 bits</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	/* saddr(16) + first_seg(1) + flags(1) + keyid(4) + seglist(16n) */</div><div class='ctx'> 	plen = 16 + 1 + 1 + 4 + (hdr-&gt;first_segment + 1) * 16;</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +122,8 @@ int seg6_hmac_compute(struct seg6_hmac_info *hinfo, struct ipv6_sr_hdr *hdr,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	ring = this_cpu_ptr(hmac_ring);</div><div class='add'>+	local_lock_nested_bh(&amp;hmac_storage.bh_lock);</div><div class='add'>+	ring = this_cpu_ptr(hmac_storage.hmac_ring);</div><div class='ctx'> 	off = ring;</div><div class='ctx'> </div><div class='ctx'> 	/* source address */</div><div class='hunk'>@@ -217,21 +146,25 @@ int seg6_hmac_compute(struct seg6_hmac_info *hinfo, struct ipv6_sr_hdr *hdr,</div><div class='ctx'> 		off += 16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dgsize = __do_hmac(hinfo, ring, plen, tmp_out,</div><div class='del'>-			   SEG6_HMAC_MAX_DIGESTSIZE);</div><div class='add'>+	switch (hinfo-&gt;alg_id) {</div><div class='add'>+	case SEG6_HMAC_ALGO_SHA1:</div><div class='add'>+		hmac_sha1(&amp;hinfo-&gt;key.sha1, ring, plen, output);</div><div class='add'>+		static_assert(SEG6_HMAC_FIELD_LEN &gt; SHA1_DIGEST_SIZE);</div><div class='add'>+		memset(&amp;output[SHA1_DIGEST_SIZE], 0,</div><div class='add'>+		       SEG6_HMAC_FIELD_LEN - SHA1_DIGEST_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_HMAC_ALGO_SHA256:</div><div class='add'>+		hmac_sha256(&amp;hinfo-&gt;key.sha256, ring, plen, output);</div><div class='add'>+		static_assert(SEG6_HMAC_FIELD_LEN == SHA256_DIGEST_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	local_unlock_nested_bh(&amp;hmac_storage.bh_lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='del'>-</div><div class='del'>-	if (dgsize &lt; 0)</div><div class='del'>-		return dgsize;</div><div class='del'>-</div><div class='del'>-	wrsize = SEG6_HMAC_FIELD_LEN;</div><div class='del'>-	if (wrsize &gt; dgsize)</div><div class='del'>-		wrsize = dgsize;</div><div class='del'>-</div><div class='del'>-	memset(output, 0, SEG6_HMAC_FIELD_LEN);</div><div class='del'>-	memcpy(output, tmp_out, wrsize);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(seg6_hmac_compute);</div><div class='ctx'> </div><div class='hunk'>@@ -248,6 +181,7 @@ bool seg6_hmac_validate_skb(struct sk_buff *skb)</div><div class='ctx'> 	struct sr6_tlv_hmac *tlv;</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> 	struct inet6_dev *idev;</div><div class='add'>+	int require_hmac;</div><div class='ctx'> </div><div class='ctx'> 	idev = __in6_dev_get(skb-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -255,16 +189,17 @@ bool seg6_hmac_validate_skb(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	tlv = seg6_get_tlv_hmac(srh);</div><div class='ctx'> </div><div class='add'>+	require_hmac = READ_ONCE(idev-&gt;cnf.seg6_require_hmac);</div><div class='ctx'> 	/* mandatory check but no tlv */</div><div class='del'>-	if (idev-&gt;cnf.seg6_require_hmac &gt; 0 &amp;&amp; !tlv)</div><div class='add'>+	if (require_hmac &gt; 0 &amp;&amp; !tlv)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* no check */</div><div class='del'>-	if (idev-&gt;cnf.seg6_require_hmac &lt; 0)</div><div class='add'>+	if (require_hmac &lt; 0)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* check only if present */</div><div class='del'>-	if (idev-&gt;cnf.seg6_require_hmac == 0 &amp;&amp; !tlv)</div><div class='add'>+	if (require_hmac == 0 &amp;&amp; !tlv)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* now, seg6_require_hmac &gt;= 0 &amp;&amp; tlv */</div><div class='hunk'>@@ -276,7 +211,7 @@ bool seg6_hmac_validate_skb(struct sk_buff *skb)</div><div class='ctx'> 	if (seg6_hmac_compute(hinfo, srh, &amp;ipv6_hdr(skb)-&gt;saddr, hmac_output))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (memcmp(hmac_output, tlv-&gt;hmac, SEG6_HMAC_FIELD_LEN) != 0)</div><div class='add'>+	if (crypto_memneq(hmac_output, tlv-&gt;hmac, SEG6_HMAC_FIELD_LEN))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -300,6 +235,19 @@ int seg6_hmac_info_add(struct net *net, u32 key, struct seg6_hmac_info *hinfo)</div><div class='ctx'> 	struct seg6_pernet_data *sdata = seg6_pernet(net);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	switch (hinfo-&gt;alg_id) {</div><div class='add'>+	case SEG6_HMAC_ALGO_SHA1:</div><div class='add'>+		hmac_sha1_preparekey(&amp;hinfo-&gt;key.sha1,</div><div class='add'>+				     hinfo-&gt;secret, hinfo-&gt;slen);</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_HMAC_ALGO_SHA256:</div><div class='add'>+		hmac_sha256_preparekey(&amp;hinfo-&gt;key.sha256,</div><div class='add'>+				       hinfo-&gt;secret, hinfo-&gt;slen);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = rhashtable_lookup_insert_fast(&amp;sdata-&gt;hmac_infos, &amp;hinfo-&gt;node,</div><div class='ctx'> 					    rht_params);</div><div class='ctx'> </div><div class='hunk'>@@ -355,91 +303,12 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(seg6_push_hmac);</div><div class='ctx'> </div><div class='del'>-static int seg6_hmac_init_algo(void)</div><div class='del'>-{</div><div class='del'>-	struct seg6_hmac_algo *algo;</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='del'>-	struct shash_desc *shash;</div><div class='del'>-	int i, alg_count, cpu;</div><div class='del'>-</div><div class='del'>-	alg_count = ARRAY_SIZE(hmac_algos);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; alg_count; i++) {</div><div class='del'>-		struct crypto_shash **p_tfm;</div><div class='del'>-		int shsize;</div><div class='del'>-</div><div class='del'>-		algo = &amp;hmac_algos[i];</div><div class='del'>-		algo-&gt;tfms = alloc_percpu(struct crypto_shash *);</div><div class='del'>-		if (!algo-&gt;tfms)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			tfm = crypto_alloc_shash(algo-&gt;name, 0, 0);</div><div class='del'>-			if (IS_ERR(tfm))</div><div class='del'>-				return PTR_ERR(tfm);</div><div class='del'>-			p_tfm = per_cpu_ptr(algo-&gt;tfms, cpu);</div><div class='del'>-			*p_tfm = tfm;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		p_tfm = raw_cpu_ptr(algo-&gt;tfms);</div><div class='del'>-		tfm = *p_tfm;</div><div class='del'>-</div><div class='del'>-		shsize = sizeof(*shash) + crypto_shash_descsize(tfm);</div><div class='del'>-</div><div class='del'>-		algo-&gt;shashs = alloc_percpu(struct shash_desc *);</div><div class='del'>-		if (!algo-&gt;shashs)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			shash = kzalloc_node(shsize, GFP_KERNEL,</div><div class='del'>-					     cpu_to_node(cpu));</div><div class='del'>-			if (!shash)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			*per_cpu_ptr(algo-&gt;shashs, cpu) = shash;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init seg6_hmac_init(void)</div><div class='del'>-{</div><div class='del'>-	return seg6_hmac_init_algo();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(seg6_hmac_init);</div><div class='del'>-</div><div class='ctx'> int __net_init seg6_hmac_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_pernet_data *sdata = seg6_pernet(net);</div><div class='ctx'> </div><div class='del'>-	rhashtable_init(&amp;sdata-&gt;hmac_infos, &amp;rht_params);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(seg6_hmac_net_init);</div><div class='del'>-</div><div class='del'>-void seg6_hmac_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct seg6_hmac_algo *algo = NULL;</div><div class='del'>-	int i, alg_count, cpu;</div><div class='del'>-</div><div class='del'>-	alg_count = ARRAY_SIZE(hmac_algos);</div><div class='del'>-	for (i = 0; i &lt; alg_count; i++) {</div><div class='del'>-		algo = &amp;hmac_algos[i];</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			struct crypto_shash *tfm;</div><div class='del'>-			struct shash_desc *shash;</div><div class='del'>-</div><div class='del'>-			shash = *per_cpu_ptr(algo-&gt;shashs, cpu);</div><div class='del'>-			kfree(shash);</div><div class='del'>-			tfm = *per_cpu_ptr(algo-&gt;tfms, cpu);</div><div class='del'>-			crypto_free_shash(tfm);</div><div class='del'>-		}</div><div class='del'>-		free_percpu(algo-&gt;tfms);</div><div class='del'>-		free_percpu(algo-&gt;shashs);</div><div class='del'>-	}</div><div class='add'>+	return rhashtable_init(&amp;sdata-&gt;hmac_infos, &amp;rht_params);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(seg6_hmac_exit);</div><div class='ctx'> </div><div class='ctx'> void __net_exit seg6_hmac_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='head'>diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c<br/>index a8854dd3e9c5..3e1b9991131a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_iptunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_iptunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_iptunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/seg6_iptunnel.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  SR-IPv6 implementation</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:</div><div class='ctx'>  *  David Lebrun &lt;david.lebrun@uclouvain.be&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *        modify it under the terms of the GNU General Public License</div><div class='del'>- *        as published by the Free Software Foundation; either version</div><div class='del'>- *        2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -31,10 +26,30 @@</div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> #include &lt;net/seg6_hmac.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;linux/netfilter.h&gt;</div><div class='add'>+</div><div class='add'>+static size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)</div><div class='add'>+{</div><div class='add'>+	int head = 0;</div><div class='add'>+</div><div class='add'>+	switch (tuninfo-&gt;mode) {</div><div class='add'>+	case SEG6_IPTUN_MODE_INLINE:</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_IPTUN_MODE_ENCAP:</div><div class='add'>+	case SEG6_IPTUN_MODE_ENCAP_RED:</div><div class='add'>+		head = sizeof(struct ipv6hdr);</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_IPTUN_MODE_L2ENCAP:</div><div class='add'>+	case SEG6_IPTUN_MODE_L2ENCAP_RED:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ((tuninfo-&gt;srh-&gt;hdrlen + 1) &lt;&lt; 3) + head;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct seg6_lwt {</div><div class='ctx'> 	struct dst_cache cache;</div><div class='del'>-	struct seg6_iptunnel_encap tuninfo[0];</div><div class='add'>+	struct seg6_iptunnel_encap tuninfo[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct seg6_lwt *seg6_lwt_lwtunnel(struct lwtunnel_state *lwt)</div><div class='hunk'>@@ -109,11 +124,12 @@ static __be32 seg6_make_flowlabel(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	return flowlabel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* encapsulate an IPv6 packet within an outer IPv6 header with a given SRH */</div><div class='del'>-int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='add'>+static int __seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh,</div><div class='add'>+			       int proto, struct dst_entry *cache_dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct net *net = dev_net(dst-&gt;dev);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='ctx'> 	struct ipv6hdr *hdr, *inner_hdr;</div><div class='ctx'> 	struct ipv6_sr_hdr *isrh;</div><div class='ctx'> 	int hdrlen, tot_len, err;</div><div class='hunk'>@@ -122,7 +138,7 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='ctx'> 	hdrlen = (osrh-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='ctx'> 	tot_len = hdrlen + sizeof(*hdr);</div><div class='ctx'> </div><div class='del'>-	err = skb_cow_head(skb, tot_len + skb-&gt;mac_len);</div><div class='add'>+	err = skb_cow_head(skb, tot_len + dst_dev_overhead(cache_dst, skb));</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -146,6 +162,16 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ip6_flow_hdr(hdr, 0, flowlabel);</div><div class='ctx'> 		hdr-&gt;hop_limit = ip6_dst_hoplimit(skb_dst(skb));</div><div class='add'>+</div><div class='add'>+		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));</div><div class='add'>+</div><div class='add'>+		/* the control block has been erased, so we have to set the</div><div class='add'>+		 * iif once again.</div><div class='add'>+		 * We read the receiving interface index directly from the</div><div class='add'>+		 * skb-&gt;skb_iif as it is done in the IPv4 receiving path (i.e.:</div><div class='add'>+		 * ip_rcv_core(...)).</div><div class='add'>+		 */</div><div class='add'>+		IP6CB(skb)-&gt;iif = skb-&gt;skb_iif;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;nexthdr = NEXTHDR_ROUTING;</div><div class='hunk'>@@ -156,7 +182,7 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='ctx'> 	isrh-&gt;nexthdr = proto;</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;daddr = isrh-&gt;segments[isrh-&gt;first_segment];</div><div class='del'>-	set_tun_src(net, dst-&gt;dev, &amp;hdr-&gt;daddr, &amp;hdr-&gt;saddr);</div><div class='add'>+	set_tun_src(net, dev, &amp;hdr-&gt;daddr, &amp;hdr-&gt;saddr);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> 	if (sr_has_hmac(isrh)) {</div><div class='hunk'>@@ -166,14 +192,142 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	hdr-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='ctx'> 	skb_postpush_rcsum(skb, hdr, tot_len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* encapsulate an IPv6 packet within an outer IPv6 header with a given SRH */</div><div class='add'>+int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)</div><div class='add'>+{</div><div class='add'>+	return __seg6_do_srh_encap(skb, osrh, proto, NULL);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(seg6_do_srh_encap);</div><div class='ctx'> </div><div class='del'>-/* insert an SRH within an IPv6 packet, just after the IPv6 header */</div><div class='del'>-int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)</div><div class='add'>+/* encapsulate an IPv6 packet within an outer IPv6 header with reduced SRH */</div><div class='add'>+static int seg6_do_srh_encap_red(struct sk_buff *skb,</div><div class='add'>+				 struct ipv6_sr_hdr *osrh, int proto,</div><div class='add'>+				 struct dst_entry *cache_dst)</div><div class='add'>+{</div><div class='add'>+	__u8 first_seg = osrh-&gt;first_segment;</div><div class='add'>+	struct dst_entry *dst = skb_dst(skb);</div><div class='add'>+	struct net_device *dev = dst_dev(dst);</div><div class='add'>+	struct net *net = dev_net(dev);</div><div class='add'>+	struct ipv6hdr *hdr, *inner_hdr;</div><div class='add'>+	int hdrlen = ipv6_optlen(osrh);</div><div class='add'>+	int red_tlv_offset, tlv_offset;</div><div class='add'>+	struct ipv6_sr_hdr *isrh;</div><div class='add'>+	bool skip_srh = false;</div><div class='add'>+	__be32 flowlabel;</div><div class='add'>+	int tot_len, err;</div><div class='add'>+	int red_hdrlen;</div><div class='add'>+	int tlvs_len;</div><div class='add'>+</div><div class='add'>+	if (first_seg &gt; 0) {</div><div class='add'>+		red_hdrlen = hdrlen - sizeof(struct in6_addr);</div><div class='add'>+	} else {</div><div class='add'>+		/* NOTE: if tag/flags and/or other TLVs are introduced in the</div><div class='add'>+		 * seg6_iptunnel infrastructure, they should be considered when</div><div class='add'>+		 * deciding to skip the SRH.</div><div class='add'>+		 */</div><div class='add'>+		skip_srh = !sr_has_hmac(osrh);</div><div class='add'>+</div><div class='add'>+		red_hdrlen = skip_srh ? 0 : hdrlen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tot_len = red_hdrlen + sizeof(struct ipv6hdr);</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, tot_len + dst_dev_overhead(cache_dst, skb));</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	inner_hdr = ipv6_hdr(skb);</div><div class='add'>+	flowlabel = seg6_make_flowlabel(net, skb, inner_hdr);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, tot_len);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+	hdr = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* based on seg6_do_srh_encap() */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		ip6_flow_hdr(hdr, ip6_tclass(ip6_flowinfo(inner_hdr)),</div><div class='add'>+			     flowlabel);</div><div class='add'>+		hdr-&gt;hop_limit = inner_hdr-&gt;hop_limit;</div><div class='add'>+	} else {</div><div class='add'>+		ip6_flow_hdr(hdr, 0, flowlabel);</div><div class='add'>+		hdr-&gt;hop_limit = ip6_dst_hoplimit(skb_dst(skb));</div><div class='add'>+</div><div class='add'>+		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));</div><div class='add'>+		IP6CB(skb)-&gt;iif = skb-&gt;skb_iif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no matter if we have to skip the SRH or not, the first segment</div><div class='add'>+	 * always comes in the pushed IPv6 header.</div><div class='add'>+	 */</div><div class='add'>+	hdr-&gt;daddr = osrh-&gt;segments[first_seg];</div><div class='add'>+</div><div class='add'>+	if (skip_srh) {</div><div class='add'>+		hdr-&gt;nexthdr = proto;</div><div class='add'>+</div><div class='add'>+		set_tun_src(net, dev, &amp;hdr-&gt;daddr, &amp;hdr-&gt;saddr);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we cannot skip the SRH, slow path */</div><div class='add'>+</div><div class='add'>+	hdr-&gt;nexthdr = NEXTHDR_ROUTING;</div><div class='add'>+	isrh = (void *)hdr + sizeof(struct ipv6hdr);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!first_seg)) {</div><div class='add'>+		/* this is a very rare case; we have only one SID but</div><div class='add'>+		 * we cannot skip the SRH since we are carrying some</div><div class='add'>+		 * other info.</div><div class='add'>+		 */</div><div class='add'>+		memcpy(isrh, osrh, hdrlen);</div><div class='add'>+		goto srcaddr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv_offset = sizeof(*osrh) + (first_seg + 1) * sizeof(struct in6_addr);</div><div class='add'>+	red_tlv_offset = tlv_offset - sizeof(struct in6_addr);</div><div class='add'>+</div><div class='add'>+	memcpy(isrh, osrh, red_tlv_offset);</div><div class='add'>+</div><div class='add'>+	tlvs_len = hdrlen - tlv_offset;</div><div class='add'>+	if (unlikely(tlvs_len &gt; 0)) {</div><div class='add'>+		const void *s = (const void *)osrh + tlv_offset;</div><div class='add'>+		void *d = (void *)isrh + red_tlv_offset;</div><div class='add'>+</div><div class='add'>+		memcpy(d, s, tlvs_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	--isrh-&gt;first_segment;</div><div class='add'>+	isrh-&gt;hdrlen -= 2;</div><div class='add'>+</div><div class='add'>+srcaddr:</div><div class='add'>+	isrh-&gt;nexthdr = proto;</div><div class='add'>+	set_tun_src(net, dev, &amp;hdr-&gt;daddr, &amp;hdr-&gt;saddr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='add'>+	if (unlikely(!skip_srh &amp;&amp; sr_has_hmac(isrh))) {</div><div class='add'>+		err = seg6_push_hmac(net, &amp;hdr-&gt;saddr, isrh);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	hdr-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	skb_postpush_rcsum(skb, hdr, tot_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh,</div><div class='add'>+				struct dst_entry *cache_dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *hdr, *oldhdr;</div><div class='ctx'> 	struct ipv6_sr_hdr *isrh;</div><div class='hunk'>@@ -181,7 +335,7 @@ int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)</div><div class='ctx'> </div><div class='ctx'> 	hdrlen = (osrh-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='ctx'> </div><div class='del'>-	err = skb_cow_head(skb, hdrlen + skb-&gt;mac_len);</div><div class='add'>+	err = skb_cow_head(skb, hdrlen + dst_dev_overhead(cache_dst, skb));</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +364,7 @@ int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> 	if (sr_has_hmac(isrh)) {</div><div class='del'>-		struct net *net = dev_net(skb_dst(skb)-&gt;dev);</div><div class='add'>+		struct net *net = skb_dst_dev_net(skb);</div><div class='ctx'> </div><div class='ctx'> 		err = seg6_push_hmac(net, &amp;hdr-&gt;saddr, isrh);</div><div class='ctx'> 		if (unlikely(err))</div><div class='hunk'>@@ -218,13 +372,14 @@ int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	hdr-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='ctx'> 	skb_postpush_rcsum(skb, hdr, sizeof(struct ipv6hdr) + hdrlen);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(seg6_do_srh_inline);</div><div class='ctx'> </div><div class='del'>-static int seg6_do_srh(struct sk_buff *skb)</div><div class='add'>+static int seg6_do_srh(struct sk_buff *skb, struct dst_entry *cache_dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	struct seg6_iptunnel_encap *tinfo;</div><div class='hunk'>@@ -237,11 +392,12 @@ static int seg6_do_srh(struct sk_buff *skb)</div><div class='ctx'> 		if (skb-&gt;protocol != htons(ETH_P_IPV6))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		err = seg6_do_srh_inline(skb, tinfo-&gt;srh);</div><div class='add'>+		err = __seg6_do_srh_inline(skb, tinfo-&gt;srh, cache_dst);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEG6_IPTUN_MODE_ENCAP:</div><div class='add'>+	case SEG6_IPTUN_MODE_ENCAP_RED:</div><div class='ctx'> 		err = iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -253,7 +409,13 @@ static int seg6_do_srh(struct sk_buff *skb)</div><div class='ctx'> 		else</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		err = seg6_do_srh_encap(skb, tinfo-&gt;srh, proto);</div><div class='add'>+		if (tinfo-&gt;mode == SEG6_IPTUN_MODE_ENCAP)</div><div class='add'>+			err = __seg6_do_srh_encap(skb, tinfo-&gt;srh,</div><div class='add'>+						  proto, cache_dst);</div><div class='add'>+		else</div><div class='add'>+			err = seg6_do_srh_encap_red(skb, tinfo-&gt;srh,</div><div class='add'>+						    proto, cache_dst);</div><div class='add'>+</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -262,6 +424,7 @@ static int seg6_do_srh(struct sk_buff *skb)</div><div class='ctx'> 		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEG6_IPTUN_MODE_L2ENCAP:</div><div class='add'>+	case SEG6_IPTUN_MODE_L2ENCAP_RED:</div><div class='ctx'> 		if (!skb_mac_header_was_set(skb))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -271,7 +434,15 @@ static int seg6_do_srh(struct sk_buff *skb)</div><div class='ctx'> 		skb_mac_header_rebuild(skb);</div><div class='ctx'> 		skb_push(skb, skb-&gt;mac_len);</div><div class='ctx'> </div><div class='del'>-		err = seg6_do_srh_encap(skb, tinfo-&gt;srh, NEXTHDR_NONE);</div><div class='add'>+		if (tinfo-&gt;mode == SEG6_IPTUN_MODE_L2ENCAP)</div><div class='add'>+			err = __seg6_do_srh_encap(skb, tinfo-&gt;srh,</div><div class='add'>+						  IPPROTO_ETHERNET,</div><div class='add'>+						  cache_dst);</div><div class='add'>+		else</div><div class='add'>+			err = seg6_do_srh_encap_red(skb, tinfo-&gt;srh,</div><div class='add'>+						    IPPROTO_ETHERNET,</div><div class='add'>+						    cache_dst);</div><div class='add'>+</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -279,74 +450,132 @@ static int seg6_do_srh(struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seg6_input(struct sk_buff *skb)</div><div class='add'>+/* insert an SRH within an IPv6 packet, just after the IPv6 header */</div><div class='add'>+int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)</div><div class='add'>+{</div><div class='add'>+	return __seg6_do_srh_inline(skb, osrh, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(seg6_do_srh_inline);</div><div class='add'>+</div><div class='add'>+static int seg6_input_finish(struct net *net, struct sock *sk,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_input_core(struct net *net, struct sock *sk,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='add'>+	struct lwtunnel_state *lwtst;</div><div class='ctx'> 	struct seg6_lwt *slwt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = seg6_do_srh(skb);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	/* We cannot dereference "orig_dst" once ip6_route_input() or</div><div class='add'>+	 * skb_dst_drop() is called. However, in order to detect a dst loop, we</div><div class='add'>+	 * need the address of its lwtstate. So, save the address of lwtstate</div><div class='add'>+	 * now and use it later as a comparison.</div><div class='add'>+	 */</div><div class='add'>+	lwtst = orig_dst-&gt;lwtstate;</div><div class='ctx'> </div><div class='del'>-	slwt = seg6_lwt_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='add'>+	slwt = seg6_lwt_lwtunnel(lwtst);</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='add'>+	local_bh_disable();</div><div class='ctx'> 	dst = dst_cache_get(&amp;slwt-&gt;cache);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='del'>-	skb_dst_drop(skb);</div><div class='add'>+	err = seg6_do_srh(skb, dst);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dst) {</div><div class='ctx'> 		ip6_route_input(skb);</div><div class='ctx'> 		dst = skb_dst(skb);</div><div class='del'>-		if (!dst-&gt;error) {</div><div class='del'>-			preempt_disable();</div><div class='add'>+</div><div class='add'>+		/* cache only if we don't create a dst reference loop */</div><div class='add'>+		if (!dst-&gt;error &amp;&amp; lwtst != dst-&gt;lwtstate) {</div><div class='add'>+			local_bh_disable();</div><div class='ctx'> 			dst_cache_set_ip6(&amp;slwt-&gt;cache, dst,</div><div class='ctx'> 					  &amp;ipv6_hdr(skb)-&gt;saddr);</div><div class='del'>-			preempt_enable();</div><div class='add'>+			local_bh_enable();</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		err = skb_cow_head(skb, LL_RESERVED_SPACE(dst_dev(dst)));</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='ctx'> 	} else {</div><div class='add'>+		skb_dst_drop(skb);</div><div class='ctx'> 		skb_dst_set(skb, dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = skb_cow_head(skb, LL_RESERVED_SPACE(dst-&gt;dev));</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		return err;</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,</div><div class='add'>+			       dev_net(skb-&gt;dev), NULL, skb, NULL,</div><div class='add'>+			       skb_dst_dev(skb), seg6_input_finish);</div><div class='ctx'> </div><div class='del'>-	return dst_input(skb);</div><div class='add'>+	return seg6_input_finish(dev_net(skb-&gt;dev), NULL, skb);</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int seg6_input_nf(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb_dst_dev(skb);</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, net, NULL,</div><div class='add'>+			       skb, NULL, dev, seg6_input_core);</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, net, NULL,</div><div class='add'>+			       skb, NULL, dev, seg6_input_core);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_input(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return seg6_input_nf(skb);</div><div class='add'>+</div><div class='add'>+	return seg6_input_core(dev_net(skb-&gt;dev), NULL, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_output_core(struct net *net, struct sock *sk,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='ctx'> 	struct seg6_lwt *slwt;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = seg6_do_srh(skb);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto drop;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	slwt = seg6_lwt_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='add'>+	local_bh_disable();</div><div class='ctx'> 	dst = dst_cache_get(&amp;slwt-&gt;cache);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	err = seg6_do_srh(skb, dst);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!dst)) {</div><div class='ctx'> 		struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='ctx'> 		struct flowi6 fl6;</div><div class='ctx'> </div><div class='add'>+		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> 		fl6.daddr = hdr-&gt;daddr;</div><div class='ctx'> 		fl6.saddr = hdr-&gt;saddr;</div><div class='ctx'> 		fl6.flowlabel = ip6_flowinfo(hdr);</div><div class='hunk'>@@ -356,29 +585,60 @@ static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='ctx'> 		if (dst-&gt;error) {</div><div class='ctx'> 			err = dst-&gt;error;</div><div class='del'>-			dst_release(dst);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		preempt_disable();</div><div class='del'>-		dst_cache_set_ip6(&amp;slwt-&gt;cache, dst, &amp;fl6.saddr);</div><div class='del'>-		preempt_enable();</div><div class='add'>+		/* cache only if we don't create a dst reference loop */</div><div class='add'>+		if (orig_dst-&gt;lwtstate != dst-&gt;lwtstate) {</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			dst_cache_set_ip6(&amp;slwt-&gt;cache, dst, &amp;fl6.saddr);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = skb_cow_head(skb, LL_RESERVED_SPACE(dst_dev(dst)));</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> 	skb_dst_set(skb, dst);</div><div class='ctx'> </div><div class='del'>-	err = skb_cow_head(skb, LL_RESERVED_SPACE(dst-&gt;dev));</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto drop;</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, sk, skb,</div><div class='add'>+			       NULL, dst_dev(dst), dst_output);</div><div class='ctx'> </div><div class='ctx'> 	return dst_output(net, sk, skb);</div><div class='ctx'> drop:</div><div class='add'>+	dst_release(dst);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seg6_build_state(struct nlattr *nla,</div><div class='add'>+static int seg6_output_nf(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = skb_dst_dev(skb);</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, net, sk, skb,</div><div class='add'>+			       NULL, dev, seg6_output_core);</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, net, sk, skb,</div><div class='add'>+			       NULL, dev, seg6_output_core);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return seg6_output_nf(net, sk, skb);</div><div class='add'>+</div><div class='add'>+	return seg6_output_core(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_build_state(struct net *net, struct nlattr *nla,</div><div class='ctx'> 			    unsigned int family, const void *cfg,</div><div class='ctx'> 			    struct lwtunnel_state **ts,</div><div class='ctx'> 			    struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -393,8 +653,8 @@ static int seg6_build_state(struct nlattr *nla,</div><div class='ctx'> 	if (family != AF_INET &amp;&amp; family != AF_INET6)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, SEG6_IPTUNNEL_MAX, nla,</div><div class='del'>-			       seg6_iptunnel_policy, extack);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, SEG6_IPTUNNEL_MAX, nla,</div><div class='add'>+					  seg6_iptunnel_policy, extack);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -423,12 +683,16 @@ static int seg6_build_state(struct nlattr *nla,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEG6_IPTUN_MODE_L2ENCAP:</div><div class='ctx'> 		break;</div><div class='add'>+	case SEG6_IPTUN_MODE_ENCAP_RED:</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_IPTUN_MODE_L2ENCAP_RED:</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* verify that SRH is consistent */</div><div class='del'>-	if (!seg6_validate_srh(tuninfo-&gt;srh, tuninfo_len - sizeof(*tuninfo)))</div><div class='add'>+	if (!seg6_validate_srh(tuninfo-&gt;srh, tuninfo_len - sizeof(*tuninfo), false))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	newts = lwtunnel_state_alloc(tuninfo_len + sizeof(*slwt));</div><div class='head'>diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c<br/>index 60325dbfe88b..2b41e4c0dddd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_local.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/seg6_local.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/seg6_local.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/seg6_local.c</a></div><div class='hunk'>@@ -1,17 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  SR-IPv6 implementation</div><div class='ctx'>  *</div><div class='ctx'>  *  Authors:</div><div class='ctx'>  *  David Lebrun &lt;david.lebrun@uclouvain.be&gt;</div><div class='ctx'>  *  eBPF support: Mathieu Xhonneux &lt;m.xhonneux@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *        modify it under the terms of the GNU General Public License</div><div class='del'>- *        as published by the Free Software Foundation; either version</div><div class='del'>- *        2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -28,20 +24,48 @@</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/dst_cache.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> #include &lt;net/seg6_hmac.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/seg6_local.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/netfilter.h&gt;</div><div class='add'>+</div><div class='add'>+#define SEG6_F_ATTR(i)		BIT(i)</div><div class='ctx'> </div><div class='ctx'> struct seg6_local_lwt;</div><div class='ctx'> </div><div class='add'>+/* callbacks used for customizing the creation and destruction of a behavior */</div><div class='add'>+struct seg6_local_lwtunnel_ops {</div><div class='add'>+	int (*build_state)(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+	void (*destroy_state)(struct seg6_local_lwt *slwt);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct seg6_action_desc {</div><div class='ctx'> 	int action;</div><div class='ctx'> 	unsigned long attrs;</div><div class='add'>+</div><div class='add'>+	/* The optattrs field is used for specifying all the optional</div><div class='add'>+	 * attributes supported by a specific behavior.</div><div class='add'>+	 * It means that if one of these attributes is not provided in the</div><div class='add'>+	 * netlink message during the behavior creation, no errors will be</div><div class='add'>+	 * returned to the userspace.</div><div class='add'>+	 *</div><div class='add'>+	 * Each attribute can be only of two types (mutually exclusive):</div><div class='add'>+	 * 1) required or 2) optional.</div><div class='add'>+	 * Every user MUST obey to this rule! If you set an attribute as</div><div class='add'>+	 * required the same attribute CANNOT be set as optional and vice</div><div class='add'>+	 * versa.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long optattrs;</div><div class='add'>+</div><div class='ctx'> 	int (*input)(struct sk_buff *skb, struct seg6_local_lwt *slwt);</div><div class='ctx'> 	int static_headroom;</div><div class='add'>+</div><div class='add'>+	struct seg6_local_lwtunnel_ops slwt_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_lwt_prog {</div><div class='hunk'>@@ -49,6 +73,117 @@ struct bpf_lwt_prog {</div><div class='ctx'> 	char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* default length values (expressed in bits) for both Locator-Block and</div><div class='add'>+ * Locator-Node Function.</div><div class='add'>+ *</div><div class='add'>+ * Both SEG6_LOCAL_LCBLOCK_DBITS and SEG6_LOCAL_LCNODE_FN_DBITS *must* be:</div><div class='add'>+ *    i) greater than 0;</div><div class='add'>+ *   ii) evenly divisible by 8. In other terms, the lengths of the</div><div class='add'>+ *	 Locator-Block and Locator-Node Function must be byte-aligned (we can</div><div class='add'>+ *	 relax this constraint in the future if really needed).</div><div class='add'>+ *</div><div class='add'>+ * Moreover, a third condition must hold:</div><div class='add'>+ *  iii) SEG6_LOCAL_LCBLOCK_DBITS + SEG6_LOCAL_LCNODE_FN_DBITS &lt;= 128.</div><div class='add'>+ *</div><div class='add'>+ * The correctness of SEG6_LOCAL_LCBLOCK_DBITS and SEG6_LOCAL_LCNODE_FN_DBITS</div><div class='add'>+ * values are checked during the kernel compilation. If the compilation stops,</div><div class='add'>+ * check the value of these parameters to see if they meet conditions (i), (ii)</div><div class='add'>+ * and (iii).</div><div class='add'>+ */</div><div class='add'>+#define SEG6_LOCAL_LCBLOCK_DBITS	32</div><div class='add'>+#define SEG6_LOCAL_LCNODE_FN_DBITS	16</div><div class='add'>+</div><div class='add'>+/* The following next_csid_chk_{cntr,lcblock,lcblock_fn}_bits macros can be</div><div class='add'>+ * used directly to check whether the lengths (in bits) of Locator-Block and</div><div class='add'>+ * Locator-Node Function are valid according to (i), (ii), (iii).</div><div class='add'>+ */</div><div class='add'>+#define next_csid_chk_cntr_bits(blen, flen)		\</div><div class='add'>+	((blen) + (flen) &gt; 128)</div><div class='add'>+</div><div class='add'>+#define next_csid_chk_lcblock_bits(blen)		\</div><div class='add'>+({							\</div><div class='add'>+	typeof(blen) __tmp = blen;			\</div><div class='add'>+	(!__tmp || __tmp &gt; 120 || (__tmp &amp; 0x07));	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define next_csid_chk_lcnode_fn_bits(flen)		\</div><div class='add'>+	next_csid_chk_lcblock_bits(flen)</div><div class='add'>+</div><div class='add'>+/* flag indicating that flavors are set up for a given End* behavior */</div><div class='add'>+#define SEG6_F_LOCAL_FLAVORS		SEG6_F_ATTR(SEG6_LOCAL_FLAVORS)</div><div class='add'>+</div><div class='add'>+#define SEG6_F_LOCAL_FLV_OP(flvname)	BIT(SEG6_LOCAL_FLV_OP_##flvname)</div><div class='add'>+#define SEG6_F_LOCAL_FLV_NEXT_CSID	SEG6_F_LOCAL_FLV_OP(NEXT_CSID)</div><div class='add'>+#define SEG6_F_LOCAL_FLV_PSP		SEG6_F_LOCAL_FLV_OP(PSP)</div><div class='add'>+</div><div class='add'>+/* Supported RFC8986 Flavor operations are reported in this bitmask */</div><div class='add'>+#define SEG6_LOCAL_FLV8986_SUPP_OPS	SEG6_F_LOCAL_FLV_PSP</div><div class='add'>+</div><div class='add'>+#define SEG6_LOCAL_END_FLV_SUPP_OPS	(SEG6_F_LOCAL_FLV_NEXT_CSID | \</div><div class='add'>+					 SEG6_LOCAL_FLV8986_SUPP_OPS)</div><div class='add'>+#define SEG6_LOCAL_END_X_FLV_SUPP_OPS	SEG6_F_LOCAL_FLV_NEXT_CSID</div><div class='add'>+</div><div class='add'>+struct seg6_flavors_info {</div><div class='add'>+	/* Flavor operations */</div><div class='add'>+	__u32 flv_ops;</div><div class='add'>+</div><div class='add'>+	/* Locator-Block length, expressed in bits */</div><div class='add'>+	__u8 lcblock_bits;</div><div class='add'>+	/* Locator-Node Function length, expressed in bits*/</div><div class='add'>+	__u8 lcnode_func_bits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum seg6_end_dt_mode {</div><div class='add'>+	DT_INVALID_MODE	= -EINVAL,</div><div class='add'>+	DT_LEGACY_MODE	= 0,</div><div class='add'>+	DT_VRF_MODE	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct seg6_end_dt_info {</div><div class='add'>+	enum seg6_end_dt_mode mode;</div><div class='add'>+</div><div class='add'>+	struct net *net;</div><div class='add'>+	/* VRF device associated to the routing table used by the SRv6</div><div class='add'>+	 * End.DT4/DT6 behavior for routing IPv4/IPv6 packets.</div><div class='add'>+	 */</div><div class='add'>+	int vrf_ifindex;</div><div class='add'>+	int vrf_table;</div><div class='add'>+</div><div class='add'>+	/* tunneled packet family (IPv4 or IPv6).</div><div class='add'>+	 * Protocol and header length are inferred from family.</div><div class='add'>+	 */</div><div class='add'>+	u16 family;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pcpu_seg6_local_counters {</div><div class='add'>+	u64_stats_t packets;</div><div class='add'>+	u64_stats_t bytes;</div><div class='add'>+	u64_stats_t errors;</div><div class='add'>+</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This struct groups all the SRv6 Behavior counters supported so far.</div><div class='add'>+ *</div><div class='add'>+ * put_nla_counters() makes use of this data structure to collect all counter</div><div class='add'>+ * values after the per-CPU counter evaluation has been performed.</div><div class='add'>+ * Finally, each counter value (in seg6_local_counters) is stored in the</div><div class='add'>+ * corresponding netlink attribute and sent to user space.</div><div class='add'>+ *</div><div class='add'>+ * NB: we don't want to expose this structure to user space!</div><div class='add'>+ */</div><div class='add'>+struct seg6_local_counters {</div><div class='add'>+	__u64 packets;</div><div class='add'>+	__u64 bytes;</div><div class='add'>+	__u64 errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define seg6_local_alloc_pcpu_counters(__gfp)				\</div><div class='add'>+	__netdev_alloc_pcpu_stats(struct pcpu_seg6_local_counters,	\</div><div class='add'>+				  ((__gfp) | __GFP_ZERO))</div><div class='add'>+</div><div class='add'>+#define SEG6_F_LOCAL_COUNTERS	SEG6_F_ATTR(SEG6_LOCAL_COUNTERS)</div><div class='add'>+</div><div class='ctx'> struct seg6_local_lwt {</div><div class='ctx'> 	int action;</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='hunk'>@@ -58,9 +193,19 @@ struct seg6_local_lwt {</div><div class='ctx'> 	int iif;</div><div class='ctx'> 	int oif;</div><div class='ctx'> 	struct bpf_lwt_prog bpf;</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+	struct seg6_end_dt_info dt_info;</div><div class='add'>+#endif</div><div class='add'>+	struct seg6_flavors_info flv_info;</div><div class='add'>+</div><div class='add'>+	struct pcpu_seg6_local_counters __percpu *pcpu_counters;</div><div class='ctx'> </div><div class='ctx'> 	int headroom;</div><div class='ctx'> 	struct seg6_action_desc *desc;</div><div class='add'>+	/* unlike the required attrs, we have to track the optional attributes</div><div class='add'>+	 * that have been effectively parsed.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long parsed_optattrs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct seg6_local_lwt *seg6_local_lwtunnel(struct lwtunnel_state *lwt)</div><div class='hunk'>@@ -68,41 +213,14 @@ static struct seg6_local_lwt *seg6_local_lwtunnel(struct lwtunnel_state *lwt)</div><div class='ctx'> 	return (struct seg6_local_lwt *)lwt-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipv6_sr_hdr *get_srh(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6_sr_hdr *srh;</div><div class='del'>-	int len, srhoff = 0;</div><div class='del'>-</div><div class='del'>-	if (ipv6_find_hdr(skb, &amp;srhoff, IPPROTO_ROUTING, NULL, NULL) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, srhoff + sizeof(*srh)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	srh = (struct ipv6_sr_hdr *)(skb-&gt;data + srhoff);</div><div class='del'>-</div><div class='del'>-	len = (srh-&gt;hdrlen + 1) &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, srhoff + len))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!seg6_validate_srh(srh, len))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return srh;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct ipv6_sr_hdr *get_and_validate_srh(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> </div><div class='del'>-	srh = get_srh(skb);</div><div class='add'>+	srh = seg6_get_srh(skb, IP6_FH_F_SKIP_RH);</div><div class='ctx'> 	if (!srh)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (srh-&gt;segments_left == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='ctx'> 	if (!seg6_hmac_validate_skb(skb))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -116,7 +234,7 @@ static bool decap_and_validate(struct sk_buff *skb, int proto)</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> 	unsigned int off = 0;</div><div class='ctx'> </div><div class='del'>-	srh = get_srh(skb);</div><div class='add'>+	srh = seg6_get_srh(skb, 0);</div><div class='ctx'> 	if (srh &amp;&amp; srh-&gt;segments_left &gt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +253,8 @@ static bool decap_and_validate(struct sk_buff *skb, int proto)</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='del'>-	skb-&gt;encapsulation = 0;</div><div class='add'>+	if (iptunnel_pull_offloads(skb))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -149,8 +268,9 @@ static void advance_nextseg(struct ipv6_sr_hdr *srh, struct in6_addr *daddr)</div><div class='ctx'> 	*daddr = *addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int seg6_lookup_nexthop(struct sk_buff *skb, struct in6_addr *nhaddr,</div><div class='del'>-			u32 tbl_id)</div><div class='add'>+static int</div><div class='add'>+seg6_lookup_any_nexthop(struct sk_buff *skb, struct in6_addr *nhaddr,</div><div class='add'>+			u32 tbl_id, bool local_delivery, int oif)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='hunk'>@@ -158,8 +278,11 @@ int seg6_lookup_nexthop(struct sk_buff *skb, struct in6_addr *nhaddr,</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='ctx'> 	struct rt6_info *rt;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='add'>+	int dev_flags = 0;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> 	fl6.flowi6_iif = skb-&gt;dev-&gt;ifindex;</div><div class='add'>+	fl6.flowi6_oif = oif;</div><div class='ctx'> 	fl6.daddr = nhaddr ? *nhaddr : hdr-&gt;daddr;</div><div class='ctx'> 	fl6.saddr = hdr-&gt;saddr;</div><div class='ctx'> 	fl6.flowlabel = ip6_flowinfo(hdr);</div><div class='hunk'>@@ -169,20 +292,28 @@ int seg6_lookup_nexthop(struct sk_buff *skb, struct in6_addr *nhaddr,</div><div class='ctx'> 	if (nhaddr)</div><div class='ctx'> 		fl6.flowi6_flags = FLOWI_FLAG_KNOWN_NH;</div><div class='ctx'> </div><div class='del'>-	if (!tbl_id) {</div><div class='add'>+	if (!tbl_id &amp;&amp; !oif) {</div><div class='ctx'> 		dst = ip6_route_input_lookup(net, skb-&gt;dev, &amp;fl6, skb, flags);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (tbl_id) {</div><div class='ctx'> 		struct fib6_table *table;</div><div class='ctx'> </div><div class='ctx'> 		table = fib6_get_table(net, tbl_id);</div><div class='ctx'> 		if (!table)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		rt = ip6_pol_route(net, table, 0, &amp;fl6, skb, flags);</div><div class='add'>+		rt = ip6_pol_route(net, table, oif, &amp;fl6, skb, flags);</div><div class='ctx'> 		dst = &amp;rt-&gt;dst;</div><div class='add'>+	} else {</div><div class='add'>+		dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dst &amp;&amp; dst-&gt;dev-&gt;flags &amp; IFF_LOOPBACK &amp;&amp; !dst-&gt;error) {</div><div class='add'>+	/* we want to discard traffic destined for local packet processing,</div><div class='add'>+	 * if @local_delivery is set to false.</div><div class='add'>+	 */</div><div class='add'>+	if (!local_delivery)</div><div class='add'>+		dev_flags |= IFF_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	if (dst &amp;&amp; (dst_dev(dst)-&gt;flags &amp; dev_flags) &amp;&amp; !dst-&gt;error) {</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		dst = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,8 +330,64 @@ out:</div><div class='ctx'> 	return dst-&gt;error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* regular endpoint function */</div><div class='del'>-static int input_action_end(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+int seg6_lookup_nexthop(struct sk_buff *skb,</div><div class='add'>+			struct in6_addr *nhaddr, u32 tbl_id)</div><div class='add'>+{</div><div class='add'>+	return seg6_lookup_any_nexthop(skb, nhaddr, tbl_id, false, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u8 seg6_flv_lcblock_octects(const struct seg6_flavors_info *finfo)</div><div class='add'>+{</div><div class='add'>+	return finfo-&gt;lcblock_bits &gt;&gt; 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u8 seg6_flv_lcnode_func_octects(const struct seg6_flavors_info *finfo)</div><div class='add'>+{</div><div class='add'>+	return finfo-&gt;lcnode_func_bits &gt;&gt; 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool seg6_next_csid_is_arg_zero(const struct in6_addr *addr,</div><div class='add'>+				       const struct seg6_flavors_info *finfo)</div><div class='add'>+{</div><div class='add'>+	__u8 fnc_octects = seg6_flv_lcnode_func_octects(finfo);</div><div class='add'>+	__u8 blk_octects = seg6_flv_lcblock_octects(finfo);</div><div class='add'>+	__u8 arg_octects;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	arg_octects = 16 - blk_octects - fnc_octects;</div><div class='add'>+	for (i = 0; i &lt; arg_octects; ++i) {</div><div class='add'>+		if (addr-&gt;s6_addr[blk_octects + fnc_octects + i] != 0x00)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* assume that DA.Argument length &gt; 0 */</div><div class='add'>+static void seg6_next_csid_advance_arg(struct in6_addr *addr,</div><div class='add'>+				       const struct seg6_flavors_info *finfo)</div><div class='add'>+{</div><div class='add'>+	__u8 fnc_octects = seg6_flv_lcnode_func_octects(finfo);</div><div class='add'>+	__u8 blk_octects = seg6_flv_lcblock_octects(finfo);</div><div class='add'>+</div><div class='add'>+	/* advance DA.Argument */</div><div class='add'>+	memmove(&amp;addr-&gt;s6_addr[blk_octects],</div><div class='add'>+		&amp;addr-&gt;s6_addr[blk_octects + fnc_octects],</div><div class='add'>+		16 - blk_octects - fnc_octects);</div><div class='add'>+</div><div class='add'>+	memset(&amp;addr-&gt;s6_addr[16 - fnc_octects], 0x00, fnc_octects);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_finish(struct sk_buff *skb,</div><div class='add'>+				   struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	seg6_lookup_nexthop(skb, NULL, 0);</div><div class='add'>+</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_core(struct sk_buff *skb,</div><div class='add'>+				 struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> </div><div class='hunk'>@@ -210,17 +397,37 @@ static int input_action_end(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> </div><div class='ctx'> 	advance_nextseg(srh, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> </div><div class='del'>-	seg6_lookup_nexthop(skb, NULL, 0);</div><div class='del'>-</div><div class='del'>-	return dst_input(skb);</div><div class='add'>+	return input_action_end_finish(skb, slwt);</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* regular endpoint, and forward to specified nexthop */</div><div class='del'>-static int input_action_end_x(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+static int end_next_csid_core(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	const struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	struct in6_addr *daddr = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_is_arg_zero(daddr, finfo))</div><div class='add'>+		return input_action_end_core(skb, slwt);</div><div class='add'>+</div><div class='add'>+	/* update DA */</div><div class='add'>+	seg6_next_csid_advance_arg(daddr, finfo);</div><div class='add'>+</div><div class='add'>+	return input_action_end_finish(skb, slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_x_finish(struct sk_buff *skb,</div><div class='add'>+				     struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	seg6_lookup_any_nexthop(skb, &amp;slwt-&gt;nh6, 0, false, slwt-&gt;oif);</div><div class='add'>+</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_x_core(struct sk_buff *skb,</div><div class='add'>+				   struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> </div><div class='hunk'>@@ -230,15 +437,395 @@ static int input_action_end_x(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> </div><div class='ctx'> 	advance_nextseg(srh, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> </div><div class='del'>-	seg6_lookup_nexthop(skb, &amp;slwt-&gt;nh6, 0);</div><div class='add'>+	return input_action_end_x_finish(skb, slwt);</div><div class='ctx'> </div><div class='del'>-	return dst_input(skb);</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int end_x_next_csid_core(struct sk_buff *skb,</div><div class='add'>+				struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	const struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	struct in6_addr *daddr = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_is_arg_zero(daddr, finfo))</div><div class='add'>+		return input_action_end_x_core(skb, slwt);</div><div class='add'>+</div><div class='add'>+	/* update DA */</div><div class='add'>+	seg6_next_csid_advance_arg(daddr, finfo);</div><div class='add'>+</div><div class='add'>+	return input_action_end_x_finish(skb, slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool seg6_next_csid_enabled(__u32 fops)</div><div class='add'>+{</div><div class='add'>+	return fops &amp; SEG6_F_LOCAL_FLV_NEXT_CSID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Processing of SRv6 End, End.X, and End.T behaviors can be extended through</div><div class='add'>+ * the flavors framework. These behaviors must report the subset of (flavor)</div><div class='add'>+ * operations they currently implement. In this way, if a user specifies a</div><div class='add'>+ * flavor combination that is not supported by a given End* behavior, the</div><div class='add'>+ * kernel refuses to instantiate the tunnel reporting the error.</div><div class='add'>+ */</div><div class='add'>+static int seg6_flv_supp_ops_by_action(int action, __u32 *fops)</div><div class='add'>+{</div><div class='add'>+	switch (action) {</div><div class='add'>+	case SEG6_LOCAL_ACTION_END:</div><div class='add'>+		*fops = SEG6_LOCAL_END_FLV_SUPP_OPS;</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_LOCAL_ACTION_END_X:</div><div class='add'>+		*fops = SEG6_LOCAL_END_X_FLV_SUPP_OPS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We describe the packet state in relation to the absence/presence of the SRH</div><div class='add'>+ * and the Segment Left (SL) field.</div><div class='add'>+ * For our purposes, it is not necessary to record the exact value of the SL</div><div class='add'>+ * when the SID List consists of two or more segments.</div><div class='add'>+ */</div><div class='add'>+enum seg6_local_pktinfo {</div><div class='add'>+	/* the order really matters! */</div><div class='add'>+	SEG6_LOCAL_PKTINFO_NOHDR	= 0,</div><div class='add'>+	SEG6_LOCAL_PKTINFO_SL_ZERO,</div><div class='add'>+	SEG6_LOCAL_PKTINFO_SL_ONE,</div><div class='add'>+	SEG6_LOCAL_PKTINFO_SL_MORE,</div><div class='add'>+	__SEG6_LOCAL_PKTINFO_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SEG6_LOCAL_PKTINFO_MAX (__SEG6_LOCAL_PKTINFO_MAX - 1)</div><div class='add'>+</div><div class='add'>+static enum seg6_local_pktinfo seg6_get_srh_pktinfo(struct ipv6_sr_hdr *srh)</div><div class='add'>+{</div><div class='add'>+	__u8 sgl;</div><div class='add'>+</div><div class='add'>+	if (!srh)</div><div class='add'>+		return SEG6_LOCAL_PKTINFO_NOHDR;</div><div class='add'>+</div><div class='add'>+	sgl = srh-&gt;segments_left;</div><div class='add'>+	if (sgl &lt; 2)</div><div class='add'>+		return SEG6_LOCAL_PKTINFO_SL_ZERO + sgl;</div><div class='add'>+</div><div class='add'>+	return SEG6_LOCAL_PKTINFO_SL_MORE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum seg6_local_flv_action {</div><div class='add'>+	SEG6_LOCAL_FLV_ACT_UNSPEC	= 0,</div><div class='add'>+	SEG6_LOCAL_FLV_ACT_END,</div><div class='add'>+	SEG6_LOCAL_FLV_ACT_PSP,</div><div class='add'>+	SEG6_LOCAL_FLV_ACT_USP,</div><div class='add'>+	SEG6_LOCAL_FLV_ACT_USD,</div><div class='add'>+	__SEG6_LOCAL_FLV_ACT_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SEG6_LOCAL_FLV_ACT_MAX (__SEG6_LOCAL_FLV_ACT_MAX - 1)</div><div class='add'>+</div><div class='add'>+/* The action table for RFC8986 flavors (see the flv8986_act_tbl below)</div><div class='add'>+ * contains the actions (i.e. processing operations) to be applied on packets</div><div class='add'>+ * when flavors are configured for an End* behavior.</div><div class='add'>+ * By combining the pkinfo data and from the flavors mask, the macro</div><div class='add'>+ * computes the index used to access the elements (actions) stored in the</div><div class='add'>+ * action table. The index is structured as follows:</div><div class='add'>+ *</div><div class='add'>+ *                     index</div><div class='add'>+ *       _______________/\________________</div><div class='add'>+ *      /                                 \</div><div class='add'>+ *      +----------------+----------------+</div><div class='add'>+ *      |        pf      |      afm       |</div><div class='add'>+ *      +----------------+----------------+</div><div class='add'>+ *        ph-1 ... p1 p0   fk-1 ... f1 f0</div><div class='add'>+ *     MSB                               LSB</div><div class='add'>+ *</div><div class='add'>+ * where:</div><div class='add'>+ *  - 'afm' (adjusted flavor mask) is the mask containing a combination of the</div><div class='add'>+ *     RFC8986 flavors currently supported. 'afm' corresponds to the @fm</div><div class='add'>+ *     argument of the macro whose value is righ-shifted by 1 bit. By doing so,</div><div class='add'>+ *     we discard the SEG6_LOCAL_FLV_OP_UNSPEC flag (bit 0 in @fm) which is</div><div class='add'>+ *     never used here;</div><div class='add'>+ *  - 'pf' encodes the packet info (pktinfo) regarding the presence/absence of</div><div class='add'>+ *    the SRH, SL = 0, etc. 'pf' is set with the value of @pf provided as</div><div class='add'>+ *    argument to the macro.</div><div class='add'>+ */</div><div class='add'>+#define flv8986_act_tbl_idx(pf, fm)					\</div><div class='add'>+	((((pf) &lt;&lt; bits_per(SEG6_LOCAL_FLV8986_SUPP_OPS)) |		\</div><div class='add'>+	  ((fm) &amp; SEG6_LOCAL_FLV8986_SUPP_OPS)) &gt;&gt; SEG6_LOCAL_FLV_OP_PSP)</div><div class='add'>+</div><div class='add'>+/* We compute the size of the action table by considering the RFC8986 flavors</div><div class='add'>+ * actually supported by the kernel. In this way, the size is automatically</div><div class='add'>+ * adjusted when new flavors are supported.</div><div class='add'>+ */</div><div class='add'>+#define FLV8986_ACT_TBL_SIZE						\</div><div class='add'>+	roundup_pow_of_two(flv8986_act_tbl_idx(SEG6_LOCAL_PKTINFO_MAX,	\</div><div class='add'>+					       SEG6_LOCAL_FLV8986_SUPP_OPS))</div><div class='add'>+</div><div class='add'>+/* tbl_cfg(act, pf, fm) macro is used to easily configure the action</div><div class='add'>+ * table; it accepts 3 arguments:</div><div class='add'>+ *     i) @act, the suffix from SEG6_LOCAL_FLV_ACT_{act} representing</div><div class='add'>+ *        the action that should be applied on the packet;</div><div class='add'>+ *    ii) @pf, the suffix from SEG6_LOCAL_PKTINFO_{pf} reporting the packet</div><div class='add'>+ *        info about the lack/presence of SRH, SRH with SL = 0, etc;</div><div class='add'>+ *   iii) @fm, the mask of flavors.</div><div class='add'>+ */</div><div class='add'>+#define tbl_cfg(act, pf, fm)						\</div><div class='add'>+	[flv8986_act_tbl_idx(SEG6_LOCAL_PKTINFO_##pf,			\</div><div class='add'>+			     (fm))] = SEG6_LOCAL_FLV_ACT_##act</div><div class='add'>+</div><div class='add'>+/* shorthand for improving readability */</div><div class='add'>+#define F_PSP	SEG6_F_LOCAL_FLV_PSP</div><div class='add'>+</div><div class='add'>+/* The table contains, for each combination of the pktinfo data and</div><div class='add'>+ * flavors, the action that should be taken on a packet (e.g.</div><div class='add'>+ * "standard" Endpoint processing, Penultimate Segment Pop, etc).</div><div class='add'>+ *</div><div class='add'>+ * By default, table entries not explicitly configured are initialized with the</div><div class='add'>+ * SEG6_LOCAL_FLV_ACT_UNSPEC action, which generally has the effect of</div><div class='add'>+ * discarding the processed packet.</div><div class='add'>+ */</div><div class='add'>+static const u8 flv8986_act_tbl[FLV8986_ACT_TBL_SIZE] = {</div><div class='add'>+	/* PSP variant for packet where SRH with SL = 1 */</div><div class='add'>+	tbl_cfg(PSP, SL_ONE, F_PSP),</div><div class='add'>+	/* End for packet where the SRH with SL &gt; 1*/</div><div class='add'>+	tbl_cfg(END, SL_MORE, F_PSP),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#undef F_PSP</div><div class='add'>+#undef tbl_cfg</div><div class='add'>+</div><div class='add'>+/* For each flavor defined in RFC8986 (or a combination of them) an action is</div><div class='add'>+ * performed on the packet. The specific action depends on:</div><div class='add'>+ *  - info extracted from the packet (i.e. pktinfo data) regarding the</div><div class='add'>+ *    lack/presence of the SRH, and if the SRH is available, on the value of</div><div class='add'>+ *    Segment Left field;</div><div class='add'>+ *  - the mask of flavors configured for the specific SRv6 End* behavior.</div><div class='add'>+ *</div><div class='add'>+ * The function combines both the pkinfo and the flavors mask to evaluate the</div><div class='add'>+ * corresponding action to be taken on the packet.</div><div class='add'>+ */</div><div class='add'>+static enum seg6_local_flv_action</div><div class='add'>+seg6_local_flv8986_act_lookup(enum seg6_local_pktinfo pinfo, __u32 flvmask)</div><div class='add'>+{</div><div class='add'>+	unsigned long index;</div><div class='add'>+</div><div class='add'>+	/* check if the provided mask of flavors is supported */</div><div class='add'>+	if (unlikely(flvmask &amp; ~SEG6_LOCAL_FLV8986_SUPP_OPS))</div><div class='add'>+		return SEG6_LOCAL_FLV_ACT_UNSPEC;</div><div class='add'>+</div><div class='add'>+	index = flv8986_act_tbl_idx(pinfo, flvmask);</div><div class='add'>+	if (unlikely(index &gt;= FLV8986_ACT_TBL_SIZE))</div><div class='add'>+		return SEG6_LOCAL_FLV_ACT_UNSPEC;</div><div class='add'>+</div><div class='add'>+	return flv8986_act_tbl[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* skb-&gt;data must be aligned with skb-&gt;network_header */</div><div class='add'>+static bool seg6_pop_srh(struct sk_buff *skb, int srhoff)</div><div class='add'>+{</div><div class='add'>+	struct ipv6_sr_hdr *srh;</div><div class='add'>+	struct ipv6hdr *iph;</div><div class='add'>+	__u8 srh_nexthdr;</div><div class='add'>+	int thoff = -1;</div><div class='add'>+	int srhlen;</div><div class='add'>+	int nhlen;</div><div class='add'>+</div><div class='add'>+	if (unlikely(srhoff &lt; sizeof(*iph) ||</div><div class='add'>+		     !pskb_may_pull(skb, srhoff + sizeof(*srh))))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	srh = (struct ipv6_sr_hdr *)(skb-&gt;data + srhoff);</div><div class='add'>+	srhlen = ipv6_optlen(srh);</div><div class='add'>+</div><div class='add'>+	/* we are about to mangle the pkt, let's check if we can write on it */</div><div class='add'>+	if (unlikely(skb_ensure_writable(skb, srhoff + srhlen)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* skb_ensure_writable() may change skb pointers; evaluate srh again */</div><div class='add'>+	srh = (struct ipv6_sr_hdr *)(skb-&gt;data + srhoff);</div><div class='add'>+	srh_nexthdr = srh-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb_transport_header_was_set(skb)))</div><div class='add'>+		goto pull;</div><div class='add'>+</div><div class='add'>+	nhlen = skb_network_header_len(skb);</div><div class='add'>+	/* we have to deal with the transport header: it could be set before</div><div class='add'>+	 * the SRH, after the SRH, or within it (which is considered wrong,</div><div class='add'>+	 * however).</div><div class='add'>+	 */</div><div class='add'>+	if (likely(nhlen &lt;= srhoff))</div><div class='add'>+		thoff = nhlen;</div><div class='add'>+	else if (nhlen &gt;= srhoff + srhlen)</div><div class='add'>+		/* transport_header is set after the SRH */</div><div class='add'>+		thoff = nhlen - srhlen;</div><div class='add'>+	else</div><div class='add'>+		/* transport_header falls inside the SRH; hence, we can't</div><div class='add'>+		 * restore the transport_header pointer properly after</div><div class='add'>+		 * SRH removing operation.</div><div class='add'>+		 */</div><div class='add'>+		return false;</div><div class='add'>+pull:</div><div class='add'>+	/* we need to pop the SRH:</div><div class='add'>+	 *  1) first of all, we pull out everything from IPv6 header up to SRH</div><div class='add'>+	 *     (included) evaluating also the rcsum;</div><div class='add'>+	 *  2) we overwrite (and then remove) the SRH by properly moving the</div><div class='add'>+	 *     IPv6 along with any extension header that precedes the SRH;</div><div class='add'>+	 *  3) At the end, we push back the pulled headers (except for SRH,</div><div class='add'>+	 *     obviously).</div><div class='add'>+	 */</div><div class='add'>+	skb_pull_rcsum(skb, srhoff + srhlen);</div><div class='add'>+	memmove(skb_network_header(skb) + srhlen, skb_network_header(skb),</div><div class='add'>+		srhoff);</div><div class='add'>+	skb_push(skb, srhoff);</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_mac_header_rebuild(skb);</div><div class='add'>+	if (likely(thoff &gt;= 0))</div><div class='add'>+		skb_set_transport_header(skb, thoff);</div><div class='add'>+</div><div class='add'>+	iph = ipv6_hdr(skb);</div><div class='add'>+	if (iph-&gt;nexthdr == NEXTHDR_ROUTING) {</div><div class='add'>+		iph-&gt;nexthdr = srh_nexthdr;</div><div class='add'>+	} else {</div><div class='add'>+		/* we must look for the extension header (EXTH, for short) that</div><div class='add'>+		 * immediately precedes the SRH we have just removed.</div><div class='add'>+		 * Then, we update the value of the EXTH nexthdr with the one</div><div class='add'>+		 * contained in the SRH nexthdr.</div><div class='add'>+		 */</div><div class='add'>+		unsigned int off = sizeof(*iph);</div><div class='add'>+		struct ipv6_opt_hdr *hp, _hdr;</div><div class='add'>+		__u8 nexthdr = iph-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			if (unlikely(!ipv6_ext_hdr(nexthdr) ||</div><div class='add'>+				     nexthdr == NEXTHDR_NONE))</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			hp = skb_header_pointer(skb, off, sizeof(_hdr), &amp;_hdr);</div><div class='add'>+			if (unlikely(!hp))</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			if (hp-&gt;nexthdr == NEXTHDR_ROUTING) {</div><div class='add'>+				hp-&gt;nexthdr = srh_nexthdr;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			switch (nexthdr) {</div><div class='add'>+			case NEXTHDR_FRAGMENT:</div><div class='add'>+				fallthrough;</div><div class='add'>+			case NEXTHDR_AUTH:</div><div class='add'>+				/* we expect SRH before FRAG and AUTH */</div><div class='add'>+				return false;</div><div class='add'>+			default:</div><div class='add'>+				off += ipv6_optlen(hp);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			nexthdr = hp-&gt;nexthdr;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iph-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	skb_postpush_rcsum(skb, iph, srhoff);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process the packet on the basis of the RFC8986 flavors set for the given</div><div class='add'>+ * SRv6 End behavior instance.</div><div class='add'>+ */</div><div class='add'>+static int end_flv8986_core(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	const struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	enum seg6_local_flv_action action;</div><div class='add'>+	enum seg6_local_pktinfo pinfo;</div><div class='add'>+	struct ipv6_sr_hdr *srh;</div><div class='add'>+	__u32 flvmask;</div><div class='add'>+	int srhoff;</div><div class='add'>+</div><div class='add'>+	srh = seg6_get_srh(skb, 0);</div><div class='add'>+	srhoff = srh ? ((unsigned char *)srh - skb-&gt;data) : 0;</div><div class='add'>+	pinfo = seg6_get_srh_pktinfo(srh);</div><div class='add'>+#ifdef CONFIG_IPV6_SEG6_HMAC</div><div class='add'>+	if (srh &amp;&amp; !seg6_hmac_validate_skb(skb))</div><div class='add'>+		goto drop;</div><div class='add'>+#endif</div><div class='add'>+	flvmask = finfo-&gt;flv_ops;</div><div class='add'>+	if (unlikely(flvmask &amp; ~SEG6_LOCAL_FLV8986_SUPP_OPS)) {</div><div class='add'>+		pr_warn_once("seg6local: invalid RFC8986 flavors\n");</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* retrieve the action triggered by the combination of pktinfo data and</div><div class='add'>+	 * the flavors mask.</div><div class='add'>+	 */</div><div class='add'>+	action = seg6_local_flv8986_act_lookup(pinfo, flvmask);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case SEG6_LOCAL_FLV_ACT_END:</div><div class='add'>+		/* process the packet as the "standard" End behavior */</div><div class='add'>+		advance_nextseg(srh, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_LOCAL_FLV_ACT_PSP:</div><div class='add'>+		advance_nextseg(srh, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!seg6_pop_srh(skb, srhoff)))</div><div class='add'>+			goto drop;</div><div class='add'>+		break;</div><div class='add'>+	case SEG6_LOCAL_FLV_ACT_UNSPEC:</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		/* by default, we drop the packet since we could not find a</div><div class='add'>+		 * suitable action.</div><div class='add'>+		 */</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return input_action_end_finish(skb, slwt);</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* regular endpoint function */</div><div class='add'>+static int input_action_end(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	const struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	__u32 fops = finfo-&gt;flv_ops;</div><div class='add'>+</div><div class='add'>+	if (!fops)</div><div class='add'>+		return input_action_end_core(skb, slwt);</div><div class='add'>+</div><div class='add'>+	/* check for the presence of NEXT-C-SID since it applies first */</div><div class='add'>+	if (seg6_next_csid_enabled(fops))</div><div class='add'>+		return end_next_csid_core(skb, slwt);</div><div class='add'>+</div><div class='add'>+	/* the specific processing function to be performed on the packet</div><div class='add'>+	 * depends on the combination of flavors defined in RFC8986 and some</div><div class='add'>+	 * information extracted from the packet, e.g. presence/absence of SRH,</div><div class='add'>+	 * Segment Left = 0, etc.</div><div class='add'>+	 */</div><div class='add'>+	return end_flv8986_core(skb, slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* regular endpoint, and forward to specified nexthop */</div><div class='add'>+static int input_action_end_x(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	const struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	__u32 fops = finfo-&gt;flv_ops;</div><div class='add'>+</div><div class='add'>+	/* check for the presence of NEXT-C-SID since it applies first */</div><div class='add'>+	if (seg6_next_csid_enabled(fops))</div><div class='add'>+		return end_x_next_csid_core(skb, slwt);</div><div class='add'>+</div><div class='add'>+	return input_action_end_x_core(skb, slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int input_action_end_t(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='hunk'>@@ -266,7 +853,7 @@ static int input_action_end_dx2(struct sk_buff *skb,</div><div class='ctx'> 	struct net_device *odev;</div><div class='ctx'> 	struct ethhdr *eth;</div><div class='ctx'> </div><div class='del'>-	if (!decap_and_validate(skb, NEXTHDR_NONE))</div><div class='add'>+	if (!decap_and_validate(skb, IPPROTO_ETHERNET))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, ETH_HLEN))</div><div class='hunk'>@@ -315,21 +902,14 @@ drop:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* decapsulate and forward to specified nexthop */</div><div class='del'>-static int input_action_end_dx6(struct sk_buff *skb,</div><div class='del'>-				struct seg6_local_lwt *slwt)</div><div class='add'>+static int input_action_end_dx6_finish(struct net *net, struct sock *sk,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='ctx'> 	struct in6_addr *nhaddr = NULL;</div><div class='add'>+	struct seg6_local_lwt *slwt;</div><div class='ctx'> </div><div class='del'>-	/* this function accepts IPv6 encapsulated packets, with either</div><div class='del'>-	 * an SRH with SL=0, or no SRH.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!decap_and_validate(skb, IPPROTO_IPV6))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='del'>-		goto drop;</div><div class='add'>+	slwt = seg6_local_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='ctx'> </div><div class='ctx'> 	/* The inner packet is not associated to any local interface,</div><div class='ctx'> 	 * so we do not call netif_rx().</div><div class='hunk'>@@ -337,25 +917,71 @@ static int input_action_end_dx6(struct sk_buff *skb,</div><div class='ctx'> 	 * If slwt-&gt;nh6 is set to ::, then lookup the nexthop for the</div><div class='ctx'> 	 * inner packet's DA. Otherwise, use the specified nexthop.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	if (!ipv6_addr_any(&amp;slwt-&gt;nh6))</div><div class='ctx'> 		nhaddr = &amp;slwt-&gt;nh6;</div><div class='ctx'> </div><div class='ctx'> 	seg6_lookup_nexthop(skb, nhaddr, 0);</div><div class='ctx'> </div><div class='ctx'> 	return dst_input(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* decapsulate and forward to specified nexthop */</div><div class='add'>+static int input_action_end_dx6(struct sk_buff *skb,</div><div class='add'>+				struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	/* this function accepts IPv6 encapsulated packets, with either</div><div class='add'>+	 * an SRH with SL=0, or no SRH.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!decap_and_validate(skb, IPPROTO_IPV6))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='add'>+	nf_reset_ct(skb);</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING,</div><div class='add'>+			       dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev,</div><div class='add'>+			       NULL, input_action_end_dx6_finish);</div><div class='add'>+</div><div class='add'>+	return input_action_end_dx6_finish(dev_net(skb-&gt;dev), NULL, skb);</div><div class='ctx'> drop:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int input_action_end_dx4(struct sk_buff *skb,</div><div class='del'>-				struct seg6_local_lwt *slwt)</div><div class='add'>+static int input_action_end_dx4_finish(struct net *net, struct sock *sk,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	struct seg6_local_lwt *slwt;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='ctx'> 	__be32 nhaddr;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='add'>+	slwt = seg6_local_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	nhaddr = slwt-&gt;nh4.s_addr ?: iph-&gt;daddr;</div><div class='add'>+</div><div class='add'>+	skb_dst_drop(skb);</div><div class='add'>+</div><div class='add'>+	reason = ip_route_input(skb, nhaddr, iph-&gt;saddr, 0, skb-&gt;dev);</div><div class='add'>+	if (reason) {</div><div class='add'>+		kfree_skb_reason(skb, reason);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_dx4(struct sk_buff *skb,</div><div class='add'>+				struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='ctx'> 	if (!decap_and_validate(skb, IPPROTO_IPIP))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='hunk'>@@ -363,15 +989,215 @@ static int input_action_end_dx4(struct sk_buff *skb,</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	skb_set_transport_header(skb, sizeof(struct iphdr));</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='del'>-	iph = ip_hdr(skb);</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING,</div><div class='add'>+			       dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev,</div><div class='add'>+			       NULL, input_action_end_dx4_finish);</div><div class='ctx'> </div><div class='del'>-	nhaddr = slwt-&gt;nh4.s_addr ?: iph-&gt;daddr;</div><div class='add'>+	return input_action_end_dx4_finish(dev_net(skb-&gt;dev), NULL, skb);</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+static struct net *fib6_config_get_net(const struct fib6_config *fib6_cfg)</div><div class='add'>+{</div><div class='add'>+	const struct nl_info *nli = &amp;fib6_cfg-&gt;fc_nlinfo;</div><div class='add'>+</div><div class='add'>+	return nli-&gt;nl_net;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __seg6_end_dt_vrf_build(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+				   u16 family, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info = &amp;slwt-&gt;dt_info;</div><div class='add'>+	int vrf_ifindex;</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	net = fib6_config_get_net(cfg);</div><div class='add'>+</div><div class='add'>+	/* note that vrf_table was already set by parse_nla_vrftable() */</div><div class='add'>+	vrf_ifindex = l3mdev_ifindex_lookup_by_table_id(L3MDEV_TYPE_VRF, net,</div><div class='add'>+							info-&gt;vrf_table);</div><div class='add'>+	if (vrf_ifindex &lt; 0) {</div><div class='add'>+		if (vrf_ifindex == -EPERM) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Strict mode for VRF is disabled");</div><div class='add'>+		} else if (vrf_ifindex == -ENODEV) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Table has no associated VRF device");</div><div class='add'>+		} else {</div><div class='add'>+			pr_debug("seg6local: SRv6 End.DT* creation error=%d\n",</div><div class='add'>+				 vrf_ifindex);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return vrf_ifindex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;net = net;</div><div class='add'>+	info-&gt;vrf_ifindex = vrf_ifindex;</div><div class='add'>+</div><div class='add'>+	info-&gt;family = family;</div><div class='add'>+	info-&gt;mode = DT_VRF_MODE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The SRv6 End.DT4/DT6 behavior extracts the inner (IPv4/IPv6) packet and</div><div class='add'>+ * routes the IPv4/IPv6 packet by looking at the configured routing table.</div><div class='add'>+ *</div><div class='add'>+ * In the SRv6 End.DT4/DT6 use case, we can receive traffic (IPv6+Segment</div><div class='add'>+ * Routing Header packets) from several interfaces and the outer IPv6</div><div class='add'>+ * destination address (DA) is used for retrieving the specific instance of the</div><div class='add'>+ * End.DT4/DT6 behavior that should process the packets.</div><div class='add'>+ *</div><div class='add'>+ * However, the inner IPv4/IPv6 packet is not really bound to any receiving</div><div class='add'>+ * interface and thus the End.DT4/DT6 sets the VRF (associated with the</div><div class='add'>+ * corresponding routing table) as the *receiving* interface.</div><div class='add'>+ * In other words, the End.DT4/DT6 processes a packet as if it has been received</div><div class='add'>+ * directly by the VRF (and not by one of its slave devices, if any).</div><div class='add'>+ * In this way, the VRF interface is used for routing the IPv4/IPv6 packet in</div><div class='add'>+ * according to the routing table configured by the End.DT4/DT6 instance.</div><div class='add'>+ *</div><div class='add'>+ * This design allows you to get some interesting features like:</div><div class='add'>+ *  1) the statistics on rx packets;</div><div class='add'>+ *  2) the possibility to install a packet sniffer on the receiving interface</div><div class='add'>+ *     (the VRF one) for looking at the incoming packets;</div><div class='add'>+ *  3) the possibility to leverage the netfilter prerouting hook for the inner</div><div class='add'>+ *     IPv4 packet.</div><div class='add'>+ *</div><div class='add'>+ * This function returns:</div><div class='add'>+ *  - the sk_buff* when the VRF rcv handler has processed the packet correctly;</div><div class='add'>+ *  - NULL when the skb is consumed by the VRF rcv handler;</div><div class='add'>+ *  - a pointer which encodes a negative error number in case of error.</div><div class='add'>+ *    Note that in this case, the function takes care of freeing the skb.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *end_dt_vrf_rcv(struct sk_buff *skb, u16 family,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* based on l3mdev_ip_rcv; we are only interested in the master */</div><div class='add'>+	if (unlikely(!netif_is_l3_master(dev) &amp;&amp; !netif_has_l3_rx_handler(dev)))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!dev-&gt;l3mdev_ops-&gt;l3mdev_l3_rcv))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	/* the decap packet IPv4/IPv6 does not come with any mac header info.</div><div class='add'>+	 * We must unset the mac header to allow the VRF device to rebuild it,</div><div class='add'>+	 * just in case there is a sniffer attached on the device.</div><div class='add'>+	 */</div><div class='add'>+	skb_unset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	skb = dev-&gt;l3mdev_ops-&gt;l3mdev_l3_rcv(dev, skb, family);</div><div class='add'>+	if (!skb)</div><div class='add'>+		/* the skb buffer was consumed by the handler */</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* when a packet is received by a VRF or by one of its slaves, the</div><div class='add'>+	 * master device reference is set into the skb.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb-&gt;dev != dev || skb-&gt;skb_iif != dev-&gt;ifindex))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *end_dt_get_vrf_rcu(struct sk_buff *skb,</div><div class='add'>+					     struct seg6_end_dt_info *info)</div><div class='add'>+{</div><div class='add'>+	int vrf_ifindex = info-&gt;vrf_ifindex;</div><div class='add'>+	struct net *net = info-&gt;net;</div><div class='add'>+</div><div class='add'>+	if (unlikely(vrf_ifindex &lt; 0))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!net_eq(dev_net(skb-&gt;dev), net)))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return dev_get_by_index_rcu(net, vrf_ifindex);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *end_dt_vrf_core(struct sk_buff *skb,</div><div class='add'>+				       struct seg6_local_lwt *slwt, u16 family)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info = &amp;slwt-&gt;dt_info;</div><div class='add'>+	struct net_device *vrf;</div><div class='add'>+	__be16 protocol;</div><div class='add'>+	int hdrlen;</div><div class='add'>+</div><div class='add'>+	vrf = end_dt_get_vrf_rcu(skb, info);</div><div class='add'>+	if (unlikely(!vrf))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	switch (family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		protocol = htons(ETH_P_IP);</div><div class='add'>+		hdrlen = sizeof(struct iphdr);</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		protocol = htons(ETH_P_IPV6);</div><div class='add'>+		hdrlen = sizeof(struct ipv6hdr);</div><div class='add'>+		break;</div><div class='add'>+	case AF_UNSPEC:</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(info-&gt;family != AF_UNSPEC &amp;&amp; info-&gt;family != family)) {</div><div class='add'>+		pr_warn_once("seg6local: SRv6 End.DT* family mismatch");</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = protocol;</div><div class='ctx'> </div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='ctx'> </div><div class='del'>-	err = ip_route_input(skb, nhaddr, iph-&gt;saddr, 0, skb-&gt;dev);</div><div class='del'>-	if (err)</div><div class='add'>+	skb_set_transport_header(skb, hdrlen);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='add'>+</div><div class='add'>+	return end_dt_vrf_rcv(skb, family, vrf);</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_dt4(struct sk_buff *skb,</div><div class='add'>+				struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	if (!decap_and_validate(skb, IPPROTO_IPIP))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct iphdr)))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	skb = end_dt_vrf_core(skb, slwt, AF_INET);</div><div class='add'>+	if (!skb)</div><div class='add'>+		/* packet has been processed and consumed by the VRF */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	reason = ip_route_input(skb, iph-&gt;daddr, iph-&gt;saddr, 0, skb-&gt;dev);</div><div class='add'>+	if (unlikely(reason))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	return dst_input(skb);</div><div class='hunk'>@@ -381,6 +1207,54 @@ drop:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int seg6_end_dt4_build(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return __seg6_end_dt_vrf_build(slwt, cfg, AF_INET, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum</div><div class='add'>+seg6_end_dt_mode seg6_end_dt6_parse_mode(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	unsigned long parsed_optattrs = slwt-&gt;parsed_optattrs;</div><div class='add'>+	bool legacy, vrfmode;</div><div class='add'>+</div><div class='add'>+	legacy	= !!(parsed_optattrs &amp; SEG6_F_ATTR(SEG6_LOCAL_TABLE));</div><div class='add'>+	vrfmode	= !!(parsed_optattrs &amp; SEG6_F_ATTR(SEG6_LOCAL_VRFTABLE));</div><div class='add'>+</div><div class='add'>+	if (!(legacy ^ vrfmode))</div><div class='add'>+		/* both are absent or present: invalid DT6 mode */</div><div class='add'>+		return DT_INVALID_MODE;</div><div class='add'>+</div><div class='add'>+	return legacy ? DT_LEGACY_MODE : DT_VRF_MODE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum seg6_end_dt_mode seg6_end_dt6_get_mode(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info = &amp;slwt-&gt;dt_info;</div><div class='add'>+</div><div class='add'>+	return info-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_end_dt6_build(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum seg6_end_dt_mode mode = seg6_end_dt6_parse_mode(slwt);</div><div class='add'>+	struct seg6_end_dt_info *info = &amp;slwt-&gt;dt_info;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DT_LEGACY_MODE:</div><div class='add'>+		info-&gt;mode = DT_LEGACY_MODE;</div><div class='add'>+		return 0;</div><div class='add'>+	case DT_VRF_MODE:</div><div class='add'>+		return __seg6_end_dt_vrf_build(slwt, cfg, AF_INET6, extack);</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG(extack, "table or vrftable must be specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int input_action_end_dt6(struct sk_buff *skb,</div><div class='ctx'> 				struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='hunk'>@@ -390,7 +1264,31 @@ static int input_action_end_dt6(struct sk_buff *skb,</div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	seg6_lookup_nexthop(skb, NULL, slwt-&gt;table);</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+	if (seg6_end_dt6_get_mode(slwt) == DT_LEGACY_MODE)</div><div class='add'>+		goto legacy_mode;</div><div class='add'>+</div><div class='add'>+	/* DT6_VRF_MODE */</div><div class='add'>+	skb = end_dt_vrf_core(skb, slwt, AF_INET6);</div><div class='add'>+	if (!skb)</div><div class='add'>+		/* packet has been processed and consumed by the VRF */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	/* note: this time we do not need to specify the table because the VRF</div><div class='add'>+	 * takes care of selecting the correct table.</div><div class='add'>+	 */</div><div class='add'>+	seg6_lookup_any_nexthop(skb, NULL, 0, true, 0);</div><div class='add'>+</div><div class='add'>+	return dst_input(skb);</div><div class='add'>+</div><div class='add'>+legacy_mode:</div><div class='add'>+#endif</div><div class='add'>+	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	seg6_lookup_any_nexthop(skb, NULL, slwt-&gt;table, true, 0);</div><div class='ctx'> </div><div class='ctx'> 	return dst_input(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -399,6 +1297,36 @@ drop:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+static int seg6_end_dt46_build(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return __seg6_end_dt_vrf_build(slwt, cfg, AF_UNSPEC, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int input_action_end_dt46(struct sk_buff *skb,</div><div class='add'>+				 struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	unsigned int off = 0;</div><div class='add'>+	int nexthdr;</div><div class='add'>+</div><div class='add'>+	nexthdr = ipv6_find_hdr(skb, &amp;off, -1, NULL, NULL);</div><div class='add'>+	if (unlikely(nexthdr &lt; 0))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	switch (nexthdr) {</div><div class='add'>+	case IPPROTO_IPIP:</div><div class='add'>+		return input_action_end_dt4(skb, slwt);</div><div class='add'>+	case IPPROTO_IPV6:</div><div class='add'>+		return input_action_end_dt6(skb, slwt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* push an SRH on top of the current one */</div><div class='ctx'> static int input_action_end_b6(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='hunk'>@@ -413,7 +1341,6 @@ static int input_action_end_b6(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='ctx'> </div><div class='ctx'> 	seg6_lookup_nexthop(skb, NULL, 0);</div><div class='hunk'>@@ -445,7 +1372,6 @@ static int input_action_end_b6_encap(struct sk_buff *skb,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len - sizeof(struct ipv6hdr));</div><div class='ctx'> 	skb_set_transport_header(skb, sizeof(struct ipv6hdr));</div><div class='ctx'> </div><div class='ctx'> 	seg6_lookup_nexthop(skb, NULL, 0);</div><div class='hunk'>@@ -457,7 +1383,9 @@ drop:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct seg6_bpf_srh_state, seg6_bpf_srh_states);</div><div class='add'>+DEFINE_PER_CPU(struct seg6_bpf_srh_state, seg6_bpf_srh_states) = {</div><div class='add'>+	.bh_lock	= INIT_LOCAL_LOCK(bh_lock),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> bool seg6_bpf_has_valid_srh(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -465,6 +1393,7 @@ bool seg6_bpf_has_valid_srh(struct sk_buff *skb)</div><div class='ctx'> 		this_cpu_ptr(&amp;seg6_bpf_srh_states);</div><div class='ctx'> 	struct ipv6_sr_hdr *srh = srh_state-&gt;srh;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;srh_state-&gt;bh_lock);</div><div class='ctx'> 	if (unlikely(srh == NULL))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -473,7 +1402,7 @@ bool seg6_bpf_has_valid_srh(struct sk_buff *skb)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		srh-&gt;hdrlen = (u8)(srh_state-&gt;hdrlen &gt;&gt; 3);</div><div class='del'>-		if (!seg6_validate_srh(srh, (srh-&gt;hdrlen + 1) &lt;&lt; 3))</div><div class='add'>+		if (!seg6_validate_srh(srh, (srh-&gt;hdrlen + 1) &lt;&lt; 3, true))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		srh_state-&gt;valid = true;</div><div class='hunk'>@@ -485,8 +1414,7 @@ bool seg6_bpf_has_valid_srh(struct sk_buff *skb)</div><div class='ctx'> static int input_action_end_bpf(struct sk_buff *skb,</div><div class='ctx'> 				struct seg6_local_lwt *slwt)</div><div class='ctx'> {</div><div class='del'>-	struct seg6_bpf_srh_state *srh_state =</div><div class='del'>-		this_cpu_ptr(&amp;seg6_bpf_srh_states);</div><div class='add'>+	struct seg6_bpf_srh_state *srh_state;</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -497,10 +1425,14 @@ static int input_action_end_bpf(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	advance_nextseg(srh, &amp;ipv6_hdr(skb)-&gt;daddr);</div><div class='ctx'> </div><div class='del'>-	/* preempt_disable is needed to protect the per-CPU buffer srh_state,</div><div class='del'>-	 * which is also accessed by the bpf_lwt_seg6_* helpers</div><div class='add'>+	/* The access to the per-CPU buffer srh_state is protected by running</div><div class='add'>+	 * always in softirq context (with disabled BH). On PREEMPT_RT the</div><div class='add'>+	 * required locking is provided by the following local_lock_nested_bh()</div><div class='add'>+	 * statement. It is also accessed by the bpf_lwt_seg6_* helpers via</div><div class='add'>+	 * bpf_prog_run_save_cb().</div><div class='ctx'> 	 */</div><div class='del'>-	preempt_disable();</div><div class='add'>+	local_lock_nested_bh(&amp;seg6_bpf_srh_states.bh_lock);</div><div class='add'>+	srh_state = this_cpu_ptr(&amp;seg6_bpf_srh_states);</div><div class='ctx'> 	srh_state-&gt;srh = srh;</div><div class='ctx'> 	srh_state-&gt;hdrlen = srh-&gt;hdrlen &lt;&lt; 3;</div><div class='ctx'> 	srh_state-&gt;valid = true;</div><div class='hunk'>@@ -523,15 +1455,15 @@ static int input_action_end_bpf(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (srh_state-&gt;srh &amp;&amp; !seg6_bpf_has_valid_srh(skb))</div><div class='ctx'> 		goto drop;</div><div class='add'>+	local_unlock_nested_bh(&amp;seg6_bpf_srh_states.bh_lock);</div><div class='ctx'> </div><div class='del'>-	preempt_enable();</div><div class='ctx'> 	if (ret != BPF_REDIRECT)</div><div class='ctx'> 		seg6_lookup_nexthop(skb, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	return dst_input(skb);</div><div class='ctx'> </div><div class='ctx'> drop:</div><div class='del'>-	preempt_enable();</div><div class='add'>+	local_unlock_nested_bh(&amp;seg6_bpf_srh_states.bh_lock);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -540,52 +1472,97 @@ static struct seg6_action_desc seg6_action_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END,</div><div class='ctx'> 		.attrs		= 0,</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS |</div><div class='add'>+				  SEG6_F_LOCAL_FLAVORS,</div><div class='ctx'> 		.input		= input_action_end,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_X,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_NH6),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_NH6),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS |</div><div class='add'>+				  SEG6_F_LOCAL_FLAVORS |</div><div class='add'>+				  SEG6_F_ATTR(SEG6_LOCAL_OIF),</div><div class='ctx'> 		.input		= input_action_end_x,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_T,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_TABLE),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_TABLE),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_t,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_DX2,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_OIF),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_OIF),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_dx2,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_DX6,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_NH6),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_NH6),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_dx6,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_DX4,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_NH4),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_NH4),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_dx4,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.action		= SEG6_LOCAL_ACTION_END_DT4,</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_VRFTABLE),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+		.input		= input_action_end_dt4,</div><div class='add'>+		.slwt_ops	= {</div><div class='add'>+					.build_state = seg6_end_dt4_build,</div><div class='add'>+				  },</div><div class='add'>+#endif</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_DT6,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_TABLE),</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+		.attrs		= 0,</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS		|</div><div class='add'>+				  SEG6_F_ATTR(SEG6_LOCAL_TABLE) |</div><div class='add'>+				  SEG6_F_ATTR(SEG6_LOCAL_VRFTABLE),</div><div class='add'>+		.slwt_ops	= {</div><div class='add'>+					.build_state = seg6_end_dt6_build,</div><div class='add'>+				  },</div><div class='add'>+#else</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_TABLE),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='add'>+#endif</div><div class='ctx'> 		.input		= input_action_end_dt6,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.action		= SEG6_LOCAL_ACTION_END_DT46,</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_VRFTABLE),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+		.input		= input_action_end_dt46,</div><div class='add'>+		.slwt_ops	= {</div><div class='add'>+					.build_state = seg6_end_dt46_build,</div><div class='add'>+				  },</div><div class='add'>+#endif</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_B6,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_SRH),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_SRH),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_b6,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_B6_ENCAP,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_SRH),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_SRH),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_b6_encap,</div><div class='ctx'> 		.static_headroom	= sizeof(struct ipv6hdr),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.action		= SEG6_LOCAL_ACTION_END_BPF,</div><div class='del'>-		.attrs		= (1 &lt;&lt; SEG6_LOCAL_BPF),</div><div class='add'>+		.attrs		= SEG6_F_ATTR(SEG6_LOCAL_BPF),</div><div class='add'>+		.optattrs	= SEG6_F_LOCAL_COUNTERS,</div><div class='ctx'> 		.input		= input_action_end_bpf,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -606,37 +1583,82 @@ static struct seg6_action_desc *__get_action_desc(int action)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seg6_local_input(struct sk_buff *skb)</div><div class='add'>+static bool seg6_lwtunnel_counters_enabled(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	return slwt-&gt;parsed_optattrs &amp; SEG6_F_LOCAL_COUNTERS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void seg6_local_update_counters(struct seg6_local_lwt *slwt,</div><div class='add'>+				       unsigned int len, int err)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_seg6_local_counters *pcounters;</div><div class='add'>+</div><div class='add'>+	pcounters = this_cpu_ptr(slwt-&gt;pcpu_counters);</div><div class='add'>+	u64_stats_update_begin(&amp;pcounters-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	if (likely(!err)) {</div><div class='add'>+		u64_stats_inc(&amp;pcounters-&gt;packets);</div><div class='add'>+		u64_stats_add(&amp;pcounters-&gt;bytes, len);</div><div class='add'>+	} else {</div><div class='add'>+		u64_stats_inc(&amp;pcounters-&gt;errors);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	u64_stats_update_end(&amp;pcounters-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_local_input_core(struct net *net, struct sock *sk,</div><div class='add'>+				 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *orig_dst = skb_dst(skb);</div><div class='ctx'> 	struct seg6_action_desc *desc;</div><div class='ctx'> 	struct seg6_local_lwt *slwt;</div><div class='add'>+	unsigned int len = skb-&gt;len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	slwt = seg6_local_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='add'>+	desc = slwt-&gt;desc;</div><div class='add'>+</div><div class='add'>+	rc = desc-&gt;input(skb, slwt);</div><div class='ctx'> </div><div class='add'>+	if (!seg6_lwtunnel_counters_enabled(slwt))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	seg6_local_update_counters(slwt, len, rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_local_input(struct sk_buff *skb)</div><div class='add'>+{</div><div class='ctx'> 	if (skb-&gt;protocol != htons(ETH_P_IPV6)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	slwt = seg6_local_lwtunnel(orig_dst-&gt;lwtstate);</div><div class='del'>-	desc = slwt-&gt;desc;</div><div class='add'>+	if (static_branch_unlikely(&amp;nf_hooks_lwtunnel_enabled))</div><div class='add'>+		return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN,</div><div class='add'>+			       dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='add'>+			       seg6_local_input_core);</div><div class='ctx'> </div><div class='del'>-	return desc-&gt;input(skb, slwt);</div><div class='add'>+	return seg6_local_input_core(dev_net(skb-&gt;dev), NULL, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy seg6_local_policy[SEG6_LOCAL_MAX + 1] = {</div><div class='ctx'> 	[SEG6_LOCAL_ACTION]	= { .type = NLA_U32 },</div><div class='ctx'> 	[SEG6_LOCAL_SRH]	= { .type = NLA_BINARY },</div><div class='ctx'> 	[SEG6_LOCAL_TABLE]	= { .type = NLA_U32 },</div><div class='del'>-	[SEG6_LOCAL_NH4]	= { .type = NLA_BINARY,</div><div class='del'>-				    .len = sizeof(struct in_addr) },</div><div class='del'>-	[SEG6_LOCAL_NH6]	= { .type = NLA_BINARY,</div><div class='del'>-				    .len = sizeof(struct in6_addr) },</div><div class='add'>+	[SEG6_LOCAL_VRFTABLE]	= { .type = NLA_U32 },</div><div class='add'>+	[SEG6_LOCAL_NH4]	= NLA_POLICY_EXACT_LEN(sizeof(struct in_addr)),</div><div class='add'>+	[SEG6_LOCAL_NH6]	= NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),</div><div class='ctx'> 	[SEG6_LOCAL_IIF]	= { .type = NLA_U32 },</div><div class='ctx'> 	[SEG6_LOCAL_OIF]	= { .type = NLA_U32 },</div><div class='ctx'> 	[SEG6_LOCAL_BPF]	= { .type = NLA_NESTED },</div><div class='add'>+	[SEG6_LOCAL_COUNTERS]	= { .type = NLA_NESTED },</div><div class='add'>+	[SEG6_LOCAL_FLAVORS]	= { .type = NLA_NESTED },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_nla_srh(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static int parse_nla_srh(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_sr_hdr *srh;</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -648,7 +1670,7 @@ static int parse_nla_srh(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='ctx'> 	if (len &lt; sizeof(*srh) + sizeof(struct in6_addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!seg6_validate_srh(srh, len))</div><div class='add'>+	if (!seg6_validate_srh(srh, len, false))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	slwt-&gt;srh = kmemdup(srh, len, GFP_KERNEL);</div><div class='hunk'>@@ -688,7 +1710,13 @@ static int cmp_nla_srh(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return memcmp(a-&gt;srh, b-&gt;srh, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_nla_table(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static void destroy_attr_srh(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	kfree(slwt-&gt;srh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_table(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	slwt-&gt;table = nla_get_u32(attrs[SEG6_LOCAL_TABLE]);</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +1739,56 @@ static int cmp_nla_table(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_nla_nh4(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static struct</div><div class='add'>+seg6_end_dt_info *seg6_possible_end_dt_info(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='add'>+	return &amp;slwt-&gt;dt_info;</div><div class='add'>+#else</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_vrftable(struct nlattr **attrs,</div><div class='add'>+			      struct seg6_local_lwt *slwt,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info = seg6_possible_end_dt_info(slwt);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(info))</div><div class='add'>+		return PTR_ERR(info);</div><div class='add'>+</div><div class='add'>+	info-&gt;vrf_table = nla_get_u32(attrs[SEG6_LOCAL_VRFTABLE]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int put_nla_vrftable(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info = seg6_possible_end_dt_info(slwt);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(info))</div><div class='add'>+		return PTR_ERR(info);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, SEG6_LOCAL_VRFTABLE, info-&gt;vrf_table))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmp_nla_vrftable(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='add'>+{</div><div class='add'>+	struct seg6_end_dt_info *info_a = seg6_possible_end_dt_info(a);</div><div class='add'>+	struct seg6_end_dt_info *info_b = seg6_possible_end_dt_info(b);</div><div class='add'>+</div><div class='add'>+	if (info_a-&gt;vrf_table != info_b-&gt;vrf_table)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_nh4(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;slwt-&gt;nh4, nla_data(attrs[SEG6_LOCAL_NH4]),</div><div class='ctx'> 	       sizeof(struct in_addr));</div><div class='hunk'>@@ -737,7 +1814,8 @@ static int cmp_nla_nh4(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return memcmp(&amp;a-&gt;nh4, &amp;b-&gt;nh4, sizeof(struct in_addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_nla_nh6(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static int parse_nla_nh6(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;slwt-&gt;nh6, nla_data(attrs[SEG6_LOCAL_NH6]),</div><div class='ctx'> 	       sizeof(struct in6_addr));</div><div class='hunk'>@@ -763,7 +1841,8 @@ static int cmp_nla_nh6(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return memcmp(&amp;a-&gt;nh6, &amp;b-&gt;nh6, sizeof(struct in6_addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_nla_iif(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static int parse_nla_iif(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	slwt-&gt;iif = nla_get_u32(attrs[SEG6_LOCAL_IIF]);</div><div class='ctx'> </div><div class='hunk'>@@ -786,7 +1865,8 @@ static int cmp_nla_iif(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_nla_oif(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static int parse_nla_oif(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	slwt-&gt;oif = nla_get_u32(attrs[SEG6_LOCAL_OIF]);</div><div class='ctx'> </div><div class='hunk'>@@ -816,15 +1896,17 @@ static const struct nla_policy bpf_prog_policy[SEG6_LOCAL_BPF_PROG_MAX + 1] = {</div><div class='ctx'> 				       .len = MAX_PROG_NAME },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_nla_bpf(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+static int parse_nla_bpf(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *tb[SEG6_LOCAL_BPF_PROG_MAX + 1];</div><div class='ctx'> 	struct bpf_prog *p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 fd;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse_nested(tb, SEG6_LOCAL_BPF_PROG_MAX,</div><div class='del'>-			       attrs[SEG6_LOCAL_BPF], bpf_prog_policy, NULL);</div><div class='add'>+	ret = nla_parse_nested_deprecated(tb, SEG6_LOCAL_BPF_PROG_MAX,</div><div class='add'>+					  attrs[SEG6_LOCAL_BPF],</div><div class='add'>+					  bpf_prog_policy, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -853,7 +1935,7 @@ static int put_nla_bpf(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='ctx'> 	if (!slwt-&gt;bpf.prog)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, SEG6_LOCAL_BPF);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, SEG6_LOCAL_BPF);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -878,16 +1960,326 @@ static int cmp_nla_bpf(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='ctx'> 	return strcmp(a-&gt;bpf.name, b-&gt;bpf.name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void destroy_attr_bpf(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	kfree(slwt-&gt;bpf.name);</div><div class='add'>+	if (slwt-&gt;bpf.prog)</div><div class='add'>+		bpf_prog_put(slwt-&gt;bpf.prog);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct</div><div class='add'>+nla_policy seg6_local_counters_policy[SEG6_LOCAL_CNT_MAX + 1] = {</div><div class='add'>+	[SEG6_LOCAL_CNT_PACKETS]	= { .type = NLA_U64 },</div><div class='add'>+	[SEG6_LOCAL_CNT_BYTES]		= { .type = NLA_U64 },</div><div class='add'>+	[SEG6_LOCAL_CNT_ERRORS]		= { .type = NLA_U64 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int parse_nla_counters(struct nlattr **attrs,</div><div class='add'>+			      struct seg6_local_lwt *slwt,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_seg6_local_counters __percpu *pcounters;</div><div class='add'>+	struct nlattr *tb[SEG6_LOCAL_CNT_MAX + 1];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nla_parse_nested_deprecated(tb, SEG6_LOCAL_CNT_MAX,</div><div class='add'>+					  attrs[SEG6_LOCAL_COUNTERS],</div><div class='add'>+					  seg6_local_counters_policy, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* basic support for SRv6 Behavior counters requires at least:</div><div class='add'>+	 * packets, bytes and errors.</div><div class='add'>+	 */</div><div class='add'>+	if (!tb[SEG6_LOCAL_CNT_PACKETS] || !tb[SEG6_LOCAL_CNT_BYTES] ||</div><div class='add'>+	    !tb[SEG6_LOCAL_CNT_ERRORS])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* counters are always zero initialized */</div><div class='add'>+	pcounters = seg6_local_alloc_pcpu_counters(GFP_KERNEL);</div><div class='add'>+	if (!pcounters)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slwt-&gt;pcpu_counters = pcounters;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_local_fill_nla_counters(struct sk_buff *skb,</div><div class='add'>+					struct seg6_local_counters *counters)</div><div class='add'>+{</div><div class='add'>+	if (nla_put_u64_64bit(skb, SEG6_LOCAL_CNT_PACKETS, counters-&gt;packets,</div><div class='add'>+			      SEG6_LOCAL_CNT_PAD))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(skb, SEG6_LOCAL_CNT_BYTES, counters-&gt;bytes,</div><div class='add'>+			      SEG6_LOCAL_CNT_PAD))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u64_64bit(skb, SEG6_LOCAL_CNT_ERRORS, counters-&gt;errors,</div><div class='add'>+			      SEG6_LOCAL_CNT_PAD))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int put_nla_counters(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_local_counters counters = { 0, 0, 0 };</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, SEG6_LOCAL_COUNTERS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		struct pcpu_seg6_local_counters *pcounters;</div><div class='add'>+		u64 packets, bytes, errors;</div><div class='add'>+		unsigned int start;</div><div class='add'>+</div><div class='add'>+		pcounters = per_cpu_ptr(slwt-&gt;pcpu_counters, i);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;pcounters-&gt;syncp);</div><div class='add'>+</div><div class='add'>+			packets = u64_stats_read(&amp;pcounters-&gt;packets);</div><div class='add'>+			bytes = u64_stats_read(&amp;pcounters-&gt;bytes);</div><div class='add'>+			errors = u64_stats_read(&amp;pcounters-&gt;errors);</div><div class='add'>+</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;pcounters-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		counters.packets += packets;</div><div class='add'>+		counters.bytes += bytes;</div><div class='add'>+		counters.errors += errors;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = seg6_local_fill_nla_counters(skb, &amp;counters);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nla_nest_end(skb, nest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmp_nla_counters(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='add'>+{</div><div class='add'>+	/* a and b are equal if both have pcpu_counters set or not */</div><div class='add'>+	return (!!((unsigned long)a-&gt;pcpu_counters)) ^</div><div class='add'>+		(!!((unsigned long)b-&gt;pcpu_counters));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_attr_counters(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	free_percpu(slwt-&gt;pcpu_counters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const</div><div class='add'>+struct nla_policy seg6_local_flavors_policy[SEG6_LOCAL_FLV_MAX + 1] = {</div><div class='add'>+	[SEG6_LOCAL_FLV_OPERATION]	= { .type = NLA_U32 },</div><div class='add'>+	[SEG6_LOCAL_FLV_LCBLOCK_BITS]	= { .type = NLA_U8 },</div><div class='add'>+	[SEG6_LOCAL_FLV_LCNODE_FN_BITS]	= { .type = NLA_U8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* check whether the lengths of the Locator-Block and Locator-Node Function</div><div class='add'>+ * are compatible with the dimension of a C-SID container.</div><div class='add'>+ */</div><div class='add'>+static int seg6_chk_next_csid_cfg(__u8 block_len, __u8 func_len)</div><div class='add'>+{</div><div class='add'>+	/* Locator-Block and Locator-Node Function cannot exceed 128 bits</div><div class='add'>+	 * (i.e. C-SID container length).</div><div class='add'>+	 */</div><div class='add'>+	if (next_csid_chk_cntr_bits(block_len, func_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Locator-Block length must be greater than zero and evenly divisible</div><div class='add'>+	 * by 8. There must be room for a Locator-Node Function, at least.</div><div class='add'>+	 */</div><div class='add'>+	if (next_csid_chk_lcblock_bits(block_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Locator-Node Function length must be greater than zero and evenly</div><div class='add'>+	 * divisible by 8. There must be room for the Locator-Block.</div><div class='add'>+	 */</div><div class='add'>+	if (next_csid_chk_lcnode_fn_bits(func_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_parse_nla_next_csid_cfg(struct nlattr **tb,</div><div class='add'>+					struct seg6_flavors_info *finfo,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	__u8 func_len = SEG6_LOCAL_LCNODE_FN_DBITS;</div><div class='add'>+	__u8 block_len = SEG6_LOCAL_LCBLOCK_DBITS;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (tb[SEG6_LOCAL_FLV_LCBLOCK_BITS])</div><div class='add'>+		block_len = nla_get_u8(tb[SEG6_LOCAL_FLV_LCBLOCK_BITS]);</div><div class='add'>+</div><div class='add'>+	if (tb[SEG6_LOCAL_FLV_LCNODE_FN_BITS])</div><div class='add'>+		func_len = nla_get_u8(tb[SEG6_LOCAL_FLV_LCNODE_FN_BITS]);</div><div class='add'>+</div><div class='add'>+	rc = seg6_chk_next_csid_cfg(block_len, func_len);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Invalid Locator Block/Node Function lengths");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	finfo-&gt;lcblock_bits = block_len;</div><div class='add'>+	finfo-&gt;lcnode_func_bits = func_len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_flavors(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	struct nlattr *tb[SEG6_LOCAL_FLV_MAX + 1];</div><div class='add'>+	int action = slwt-&gt;action;</div><div class='add'>+	__u32 fops, supp_fops;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = nla_parse_nested_deprecated(tb, SEG6_LOCAL_FLV_MAX,</div><div class='add'>+					 attrs[SEG6_LOCAL_FLAVORS],</div><div class='add'>+					 seg6_local_flavors_policy, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* this attribute MUST always be present since it represents the Flavor</div><div class='add'>+	 * operation(s) to be carried out.</div><div class='add'>+	 */</div><div class='add'>+	if (!tb[SEG6_LOCAL_FLV_OPERATION])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fops = nla_get_u32(tb[SEG6_LOCAL_FLV_OPERATION]);</div><div class='add'>+	rc = seg6_flv_supp_ops_by_action(action, &amp;supp_fops);</div><div class='add'>+	if (rc &lt; 0 || (fops &amp; ~supp_fops)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Unsupported Flavor operation(s)");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	finfo-&gt;flv_ops = fops;</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_enabled(fops)) {</div><div class='add'>+		/* Locator-Block and Locator-Node Function lengths can be</div><div class='add'>+		 * provided by the user space. Otherwise, default values are</div><div class='add'>+		 * applied.</div><div class='add'>+		 */</div><div class='add'>+		rc = seg6_parse_nla_next_csid_cfg(tb, finfo, extack);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_fill_nla_next_csid_cfg(struct sk_buff *skb,</div><div class='add'>+				       struct seg6_flavors_info *finfo)</div><div class='add'>+{</div><div class='add'>+	if (nla_put_u8(skb, SEG6_LOCAL_FLV_LCBLOCK_BITS, finfo-&gt;lcblock_bits))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, SEG6_LOCAL_FLV_LCNODE_FN_BITS,</div><div class='add'>+		       finfo-&gt;lcnode_func_bits))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int put_nla_flavors(struct sk_buff *skb, struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	__u32 fops = finfo-&gt;flv_ops;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, SEG6_LOCAL_FLAVORS);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, SEG6_LOCAL_FLV_OPERATION, fops)) {</div><div class='add'>+		rc = -EMSGSIZE;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_enabled(fops)) {</div><div class='add'>+		rc = seg6_fill_nla_next_csid_cfg(skb, finfo);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nla_nest_end(skb, nest);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seg6_cmp_nla_next_csid_cfg(struct seg6_flavors_info *finfo_a,</div><div class='add'>+				      struct seg6_flavors_info *finfo_b)</div><div class='add'>+{</div><div class='add'>+	if (finfo_a-&gt;lcblock_bits != finfo_b-&gt;lcblock_bits)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (finfo_a-&gt;lcnode_func_bits != finfo_b-&gt;lcnode_func_bits)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmp_nla_flavors(struct seg6_local_lwt *a, struct seg6_local_lwt *b)</div><div class='add'>+{</div><div class='add'>+	struct seg6_flavors_info *finfo_a = &amp;a-&gt;flv_info;</div><div class='add'>+	struct seg6_flavors_info *finfo_b = &amp;b-&gt;flv_info;</div><div class='add'>+</div><div class='add'>+	if (finfo_a-&gt;flv_ops != finfo_b-&gt;flv_ops)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_enabled(finfo_a-&gt;flv_ops)) {</div><div class='add'>+		if (seg6_cmp_nla_next_csid_cfg(finfo_a, finfo_b))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int encap_size_flavors(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_flavors_info *finfo = &amp;slwt-&gt;flv_info;</div><div class='add'>+	int nlsize;</div><div class='add'>+</div><div class='add'>+	nlsize = nla_total_size(0) +	/* nest SEG6_LOCAL_FLAVORS */</div><div class='add'>+		 nla_total_size(4);	/* SEG6_LOCAL_FLV_OPERATION */</div><div class='add'>+</div><div class='add'>+	if (seg6_next_csid_enabled(finfo-&gt;flv_ops))</div><div class='add'>+		nlsize += nla_total_size(1) + /* SEG6_LOCAL_FLV_LCBLOCK_BITS */</div><div class='add'>+			  nla_total_size(1); /* SEG6_LOCAL_FLV_LCNODE_FN_BITS */</div><div class='add'>+</div><div class='add'>+	return nlsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct seg6_action_param {</div><div class='del'>-	int (*parse)(struct nlattr **attrs, struct seg6_local_lwt *slwt);</div><div class='add'>+	int (*parse)(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='ctx'> 	int (*put)(struct sk_buff *skb, struct seg6_local_lwt *slwt);</div><div class='ctx'> 	int (*cmp)(struct seg6_local_lwt *a, struct seg6_local_lwt *b);</div><div class='add'>+</div><div class='add'>+	/* optional destroy() callback useful for releasing resources which</div><div class='add'>+	 * have been previously acquired in the corresponding parse()</div><div class='add'>+	 * function.</div><div class='add'>+	 */</div><div class='add'>+	void (*destroy)(struct seg6_local_lwt *slwt);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct seg6_action_param seg6_action_params[SEG6_LOCAL_MAX + 1] = {</div><div class='ctx'> 	[SEG6_LOCAL_SRH]	= { .parse = parse_nla_srh,</div><div class='ctx'> 				    .put = put_nla_srh,</div><div class='del'>-				    .cmp = cmp_nla_srh },</div><div class='add'>+				    .cmp = cmp_nla_srh,</div><div class='add'>+				    .destroy = destroy_attr_srh },</div><div class='ctx'> </div><div class='ctx'> 	[SEG6_LOCAL_TABLE]	= { .parse = parse_nla_table,</div><div class='ctx'> 				    .put = put_nla_table,</div><div class='hunk'>@@ -911,14 +2303,140 @@ static struct seg6_action_param seg6_action_params[SEG6_LOCAL_MAX + 1] = {</div><div class='ctx'> </div><div class='ctx'> 	[SEG6_LOCAL_BPF]	= { .parse = parse_nla_bpf,</div><div class='ctx'> 				    .put = put_nla_bpf,</div><div class='del'>-				    .cmp = cmp_nla_bpf },</div><div class='add'>+				    .cmp = cmp_nla_bpf,</div><div class='add'>+				    .destroy = destroy_attr_bpf },</div><div class='add'>+</div><div class='add'>+	[SEG6_LOCAL_VRFTABLE]	= { .parse = parse_nla_vrftable,</div><div class='add'>+				    .put = put_nla_vrftable,</div><div class='add'>+				    .cmp = cmp_nla_vrftable },</div><div class='ctx'> </div><div class='add'>+	[SEG6_LOCAL_COUNTERS]	= { .parse = parse_nla_counters,</div><div class='add'>+				    .put = put_nla_counters,</div><div class='add'>+				    .cmp = cmp_nla_counters,</div><div class='add'>+				    .destroy = destroy_attr_counters },</div><div class='add'>+</div><div class='add'>+	[SEG6_LOCAL_FLAVORS]	= { .parse = parse_nla_flavors,</div><div class='add'>+				    .put = put_nla_flavors,</div><div class='add'>+				    .cmp = cmp_nla_flavors },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_nla_action(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='add'>+/* call the destroy() callback (if available) for each set attribute in</div><div class='add'>+ * @parsed_attrs, starting from the first attribute up to the @max_parsed</div><div class='add'>+ * (excluded) attribute.</div><div class='add'>+ */</div><div class='add'>+static void __destroy_attrs(unsigned long parsed_attrs, int max_parsed,</div><div class='add'>+			    struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_action_param *param;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Every required seg6local attribute is identified by an ID which is</div><div class='add'>+	 * encoded as a flag (i.e: 1 &lt;&lt; ID) in the 'attrs' bitmask;</div><div class='add'>+	 *</div><div class='add'>+	 * We scan the 'parsed_attrs' bitmask, starting from the first attribute</div><div class='add'>+	 * up to the @max_parsed (excluded) attribute.</div><div class='add'>+	 * For each set attribute, we retrieve the corresponding destroy()</div><div class='add'>+	 * callback. If the callback is not available, then we skip to the next</div><div class='add'>+	 * attribute; otherwise, we call the destroy() callback.</div><div class='add'>+	 */</div><div class='add'>+	for (i = SEG6_LOCAL_SRH; i &lt; max_parsed; ++i) {</div><div class='add'>+		if (!(parsed_attrs &amp; SEG6_F_ATTR(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		param = &amp;seg6_action_params[i];</div><div class='add'>+</div><div class='add'>+		if (param-&gt;destroy)</div><div class='add'>+			param-&gt;destroy(slwt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* release all the resources that may have been acquired during parsing</div><div class='add'>+ * operations.</div><div class='add'>+ */</div><div class='add'>+static void destroy_attrs(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	unsigned long attrs = slwt-&gt;desc-&gt;attrs | slwt-&gt;parsed_optattrs;</div><div class='add'>+</div><div class='add'>+	__destroy_attrs(attrs, SEG6_LOCAL_MAX + 1, slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_optional_attrs(struct nlattr **attrs,</div><div class='add'>+				    struct seg6_local_lwt *slwt,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct seg6_action_desc *desc = slwt-&gt;desc;</div><div class='add'>+	unsigned long parsed_optattrs = 0;</div><div class='add'>+	struct seg6_action_param *param;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = SEG6_LOCAL_SRH; i &lt; SEG6_LOCAL_MAX + 1; ++i) {</div><div class='add'>+		if (!(desc-&gt;optattrs &amp; SEG6_F_ATTR(i)) || !attrs[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* once here, the i-th attribute is provided by the</div><div class='add'>+		 * userspace AND it is identified optional as well.</div><div class='add'>+		 */</div><div class='add'>+		param = &amp;seg6_action_params[i];</div><div class='add'>+</div><div class='add'>+		err = param-&gt;parse(attrs, slwt, extack);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto parse_optattrs_err;</div><div class='add'>+</div><div class='add'>+		/* current attribute has been correctly parsed */</div><div class='add'>+		parsed_optattrs |= SEG6_F_ATTR(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* store in the tunnel state all the optional attributed successfully</div><div class='add'>+	 * parsed.</div><div class='add'>+	 */</div><div class='add'>+	slwt-&gt;parsed_optattrs = parsed_optattrs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+parse_optattrs_err:</div><div class='add'>+	__destroy_attrs(parsed_optattrs, i, slwt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call the custom constructor of the behavior during its initialization phase</div><div class='add'>+ * and after that all its attributes have been parsed successfully.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+seg6_local_lwtunnel_build_state(struct seg6_local_lwt *slwt, const void *cfg,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct seg6_action_desc *desc = slwt-&gt;desc;</div><div class='add'>+	struct seg6_local_lwtunnel_ops *ops;</div><div class='add'>+</div><div class='add'>+	ops = &amp;desc-&gt;slwt_ops;</div><div class='add'>+	if (!ops-&gt;build_state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;build_state(slwt, cfg, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call the custom destructor of the behavior which is invoked before the</div><div class='add'>+ * tunnel is going to be destroyed.</div><div class='add'>+ */</div><div class='add'>+static void seg6_local_lwtunnel_destroy_state(struct seg6_local_lwt *slwt)</div><div class='add'>+{</div><div class='add'>+	struct seg6_action_desc *desc = slwt-&gt;desc;</div><div class='add'>+	struct seg6_local_lwtunnel_ops *ops;</div><div class='add'>+</div><div class='add'>+	ops = &amp;desc-&gt;slwt_ops;</div><div class='add'>+	if (!ops-&gt;destroy_state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ops-&gt;destroy_state(slwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_nla_action(struct nlattr **attrs, struct seg6_local_lwt *slwt,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_action_param *param;</div><div class='ctx'> 	struct seg6_action_desc *desc;</div><div class='add'>+	unsigned long invalid_attrs;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	desc = __get_action_desc(slwt-&gt;action);</div><div class='hunk'>@@ -931,24 +2449,58 @@ static int parse_nla_action(struct nlattr **attrs, struct seg6_local_lwt *slwt)</div><div class='ctx'> 	slwt-&gt;desc = desc;</div><div class='ctx'> 	slwt-&gt;headroom += desc-&gt;static_headroom;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='del'>-		if (desc-&gt;attrs &amp; (1 &lt;&lt; i)) {</div><div class='add'>+	/* Forcing the desc-&gt;optattrs *set* and the desc-&gt;attrs *set* to be</div><div class='add'>+	 * disjoined, this allow us to release acquired resources by optional</div><div class='add'>+	 * attributes and by required attributes independently from each other</div><div class='add'>+	 * without any interference.</div><div class='add'>+	 * In other terms, we are sure that we do not release some the acquired</div><div class='add'>+	 * resources twice.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that if an attribute is configured both as required and as</div><div class='add'>+	 * optional, it means that the user has messed something up in the</div><div class='add'>+	 * seg6_action_table. Therefore, this check is required for SRv6</div><div class='add'>+	 * behaviors to work properly.</div><div class='add'>+	 */</div><div class='add'>+	invalid_attrs = desc-&gt;attrs &amp; desc-&gt;optattrs;</div><div class='add'>+	if (invalid_attrs) {</div><div class='add'>+		WARN_ONCE(1,</div><div class='add'>+			  "An attribute cannot be both required AND optional");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* parse the required attributes */</div><div class='add'>+	for (i = SEG6_LOCAL_SRH; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='add'>+		if (desc-&gt;attrs &amp; SEG6_F_ATTR(i)) {</div><div class='ctx'> 			if (!attrs[i])</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			param = &amp;seg6_action_params[i];</div><div class='ctx'> </div><div class='del'>-			err = param-&gt;parse(attrs, slwt);</div><div class='add'>+			err = param-&gt;parse(attrs, slwt, extack);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='add'>+				goto parse_attrs_err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* parse the optional attributes, if any */</div><div class='add'>+	err = parse_nla_optional_attrs(attrs, slwt, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto parse_attrs_err;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+parse_attrs_err:</div><div class='add'>+	/* release any resource that may have been acquired during the i-1</div><div class='add'>+	 * parse() operations.</div><div class='add'>+	 */</div><div class='add'>+	__destroy_attrs(desc-&gt;attrs, i, slwt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seg6_local_build_state(struct nlattr *nla, unsigned int family,</div><div class='del'>-				  const void *cfg, struct lwtunnel_state **ts,</div><div class='add'>+static int seg6_local_build_state(struct net *net, struct nlattr *nla,</div><div class='add'>+				  unsigned int family, const void *cfg,</div><div class='add'>+				  struct lwtunnel_state **ts,</div><div class='ctx'> 				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *tb[SEG6_LOCAL_MAX + 1];</div><div class='hunk'>@@ -959,8 +2511,8 @@ static int seg6_local_build_state(struct nlattr *nla, unsigned int family,</div><div class='ctx'> 	if (family != AF_INET6)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse_nested(tb, SEG6_LOCAL_MAX, nla, seg6_local_policy,</div><div class='del'>-			       extack);</div><div class='add'>+	err = nla_parse_nested_deprecated(tb, SEG6_LOCAL_MAX, nla,</div><div class='add'>+					  seg6_local_policy, extack);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -975,10 +2527,14 @@ static int seg6_local_build_state(struct nlattr *nla, unsigned int family,</div><div class='ctx'> 	slwt = seg6_local_lwtunnel(newts);</div><div class='ctx'> 	slwt-&gt;action = nla_get_u32(tb[SEG6_LOCAL_ACTION]);</div><div class='ctx'> </div><div class='del'>-	err = parse_nla_action(tb, slwt);</div><div class='add'>+	err = parse_nla_action(tb, slwt, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='add'>+	err = seg6_local_lwtunnel_build_state(slwt, cfg, extack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_destroy_attrs;</div><div class='add'>+</div><div class='ctx'> 	newts-&gt;type = LWTUNNEL_ENCAP_SEG6_LOCAL;</div><div class='ctx'> 	newts-&gt;flags = LWTUNNEL_STATE_INPUT_REDIRECT;</div><div class='ctx'> 	newts-&gt;headroom = slwt-&gt;headroom;</div><div class='hunk'>@@ -987,8 +2543,9 @@ static int seg6_local_build_state(struct nlattr *nla, unsigned int family,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_destroy_attrs:</div><div class='add'>+	destroy_attrs(slwt);</div><div class='ctx'> out_free:</div><div class='del'>-	kfree(slwt-&gt;srh);</div><div class='ctx'> 	kfree(newts);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -997,12 +2554,9 @@ static void seg6_local_destroy_state(struct lwtunnel_state *lwt)</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_local_lwt *slwt = seg6_local_lwtunnel(lwt);</div><div class='ctx'> </div><div class='del'>-	kfree(slwt-&gt;srh);</div><div class='add'>+	seg6_local_lwtunnel_destroy_state(slwt);</div><div class='ctx'> </div><div class='del'>-	if (slwt-&gt;desc-&gt;attrs &amp; (1 &lt;&lt; SEG6_LOCAL_BPF)) {</div><div class='del'>-		kfree(slwt-&gt;bpf.name);</div><div class='del'>-		bpf_prog_put(slwt-&gt;bpf.prog);</div><div class='del'>-	}</div><div class='add'>+	destroy_attrs(slwt);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -1012,13 +2566,16 @@ static int seg6_local_fill_encap(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_local_lwt *slwt = seg6_local_lwtunnel(lwt);</div><div class='ctx'> 	struct seg6_action_param *param;</div><div class='add'>+	unsigned long attrs;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, SEG6_LOCAL_ACTION, slwt-&gt;action))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='del'>-		if (slwt-&gt;desc-&gt;attrs &amp; (1 &lt;&lt; i)) {</div><div class='add'>+	attrs = slwt-&gt;desc-&gt;attrs | slwt-&gt;parsed_optattrs;</div><div class='add'>+</div><div class='add'>+	for (i = SEG6_LOCAL_SRH; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='add'>+		if (attrs &amp; SEG6_F_ATTR(i)) {</div><div class='ctx'> 			param = &amp;seg6_action_params[i];</div><div class='ctx'> 			err = param-&gt;put(skb, slwt);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -1037,31 +2594,46 @@ static int seg6_local_get_encap_size(struct lwtunnel_state *lwt)</div><div class='ctx'> </div><div class='ctx'> 	nlsize = nla_total_size(4); /* action */</div><div class='ctx'> </div><div class='del'>-	attrs = slwt-&gt;desc-&gt;attrs;</div><div class='add'>+	attrs = slwt-&gt;desc-&gt;attrs | slwt-&gt;parsed_optattrs;</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_SRH))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_SRH))</div><div class='ctx'> 		nlsize += nla_total_size((slwt-&gt;srh-&gt;hdrlen + 1) &lt;&lt; 3);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_TABLE))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_TABLE))</div><div class='ctx'> 		nlsize += nla_total_size(4);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_NH4))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_NH4))</div><div class='ctx'> 		nlsize += nla_total_size(4);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_NH6))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_NH6))</div><div class='ctx'> 		nlsize += nla_total_size(16);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_IIF))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_IIF))</div><div class='ctx'> 		nlsize += nla_total_size(4);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_OIF))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_OIF))</div><div class='ctx'> 		nlsize += nla_total_size(4);</div><div class='ctx'> </div><div class='del'>-	if (attrs &amp; (1 &lt;&lt; SEG6_LOCAL_BPF))</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_BPF))</div><div class='ctx'> 		nlsize += nla_total_size(sizeof(struct nlattr)) +</div><div class='ctx'> 		       nla_total_size(MAX_PROG_NAME) +</div><div class='ctx'> 		       nla_total_size(4);</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_VRFTABLE))</div><div class='add'>+		nlsize += nla_total_size(4);</div><div class='add'>+</div><div class='add'>+	if (attrs &amp; SEG6_F_LOCAL_COUNTERS)</div><div class='add'>+		nlsize += nla_total_size(0) + /* nest SEG6_LOCAL_COUNTERS */</div><div class='add'>+			  /* SEG6_LOCAL_CNT_PACKETS */</div><div class='add'>+			  nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+			  /* SEG6_LOCAL_CNT_BYTES */</div><div class='add'>+			  nla_total_size_64bit(sizeof(__u64)) +</div><div class='add'>+			  /* SEG6_LOCAL_CNT_ERRORS */</div><div class='add'>+			  nla_total_size_64bit(sizeof(__u64));</div><div class='add'>+</div><div class='add'>+	if (attrs &amp; SEG6_F_ATTR(SEG6_LOCAL_FLAVORS))</div><div class='add'>+		nlsize += encap_size_flavors(slwt);</div><div class='add'>+</div><div class='ctx'> 	return nlsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1070,6 +2642,7 @@ static int seg6_local_cmp_encap(struct lwtunnel_state *a,</div><div class='ctx'> {</div><div class='ctx'> 	struct seg6_local_lwt *slwt_a, *slwt_b;</div><div class='ctx'> 	struct seg6_action_param *param;</div><div class='add'>+	unsigned long attrs_a, attrs_b;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	slwt_a = seg6_local_lwtunnel(a);</div><div class='hunk'>@@ -1078,11 +2651,14 @@ static int seg6_local_cmp_encap(struct lwtunnel_state *a,</div><div class='ctx'> 	if (slwt_a-&gt;action != slwt_b-&gt;action)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (slwt_a-&gt;desc-&gt;attrs != slwt_b-&gt;desc-&gt;attrs)</div><div class='add'>+	attrs_a = slwt_a-&gt;desc-&gt;attrs | slwt_a-&gt;parsed_optattrs;</div><div class='add'>+	attrs_b = slwt_b-&gt;desc-&gt;attrs | slwt_b-&gt;parsed_optattrs;</div><div class='add'>+</div><div class='add'>+	if (attrs_a != attrs_b)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='del'>-		if (slwt_a-&gt;desc-&gt;attrs &amp; (1 &lt;&lt; i)) {</div><div class='add'>+	for (i = SEG6_LOCAL_SRH; i &lt; SEG6_LOCAL_MAX + 1; i++) {</div><div class='add'>+		if (attrs_a &amp; SEG6_F_ATTR(i)) {</div><div class='ctx'> 			param = &amp;seg6_action_params[i];</div><div class='ctx'> 			if (param-&gt;cmp(slwt_a, slwt_b))</div><div class='ctx'> 				return 1;</div><div class='hunk'>@@ -1104,6 +2680,36 @@ static const struct lwtunnel_encap_ops seg6_local_ops = {</div><div class='ctx'> </div><div class='ctx'> int __init seg6_local_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* If the max total number of defined attributes is reached, then your</div><div class='add'>+	 * kernel build stops here.</div><div class='add'>+	 *</div><div class='add'>+	 * This check is required to avoid arithmetic overflows when processing</div><div class='add'>+	 * behavior attributes and the maximum number of defined attributes</div><div class='add'>+	 * exceeds the allowed value.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(SEG6_LOCAL_MAX + 1 &gt; BITS_PER_TYPE(unsigned long));</div><div class='add'>+</div><div class='add'>+	/* Check whether the number of defined flavors exceeds the maximum</div><div class='add'>+	 * allowed value.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(SEG6_LOCAL_FLV_OP_MAX + 1 &gt; BITS_PER_TYPE(__u32));</div><div class='add'>+</div><div class='add'>+	/* If the default NEXT-C-SID Locator-Block/Node Function lengths (in</div><div class='add'>+	 * bits) have been changed with invalid values, kernel build stops</div><div class='add'>+	 * here.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(next_csid_chk_cntr_bits(SEG6_LOCAL_LCBLOCK_DBITS,</div><div class='add'>+					     SEG6_LOCAL_LCNODE_FN_DBITS));</div><div class='add'>+	BUILD_BUG_ON(next_csid_chk_lcblock_bits(SEG6_LOCAL_LCBLOCK_DBITS));</div><div class='add'>+	BUILD_BUG_ON(next_csid_chk_lcnode_fn_bits(SEG6_LOCAL_LCNODE_FN_DBITS));</div><div class='add'>+</div><div class='add'>+	/* To be memory efficient, we use 'u8' to represent the different</div><div class='add'>+	 * actions related to RFC8986 flavors. If the kernel build stops here,</div><div class='add'>+	 * it means that it is not possible to correctly encode these actions</div><div class='add'>+	 * with the data type chosen for the action table.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(SEG6_LOCAL_FLV_ACT_MAX &gt; (typeof(flv8986_act_tbl[0]))~0U);</div><div class='add'>+</div><div class='ctx'> 	return lwtunnel_encap_add_ops(&amp;seg6_local_ops,</div><div class='ctx'> 				      LWTUNNEL_ENCAP_SEG6_LOCAL);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c<br/>index e9400ffa7875..cf37ad9686e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/sit.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/sit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/sit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/sit.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPv6 over IPv4 tunnel device - Simple Internet Transition (SIT)</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  *	Pedro Roque		&lt;roque@di.fc.ul.pt&gt;</div><div class='ctx'>  *	Alexey Kuznetsov	&lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	Changes:</div><div class='ctx'>  * Roger Venning &lt;r.venning@telstra.com&gt;:	6to4 support</div><div class='ctx'>  * Nate Thompson &lt;nate@thebog.net&gt;:		6to4 support</div><div class='hunk'>@@ -55,6 +51,8 @@</div><div class='ctx'> #include &lt;net/dsfield.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>    This version of net/ipv6/sit.c is cloned of net/ipv4/ip_gre.c</div><div class='hunk'>@@ -87,6 +85,13 @@ struct sit_net {</div><div class='ctx'> 	struct net_device *fb_tunnel_dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline struct sit_net *dev_to_sit_net(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return net_generic(t-&gt;net, sit_net_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Must be invoked with rcu_read_lock</div><div class='ctx'>  */</div><div class='hunk'>@@ -129,8 +134,8 @@ static struct ip_tunnel *ipip6_tunnel_lookup(struct net *net,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ip_tunnel __rcu **__ipip6_bucket(struct sit_net *sitn,</div><div class='del'>-		struct ip_tunnel_parm *parms)</div><div class='add'>+static struct ip_tunnel __rcu **</div><div class='add'>+__ipip6_bucket(struct sit_net *sitn, struct ip_tunnel_parm_kern *parms)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 remote = parms-&gt;iph.daddr;</div><div class='ctx'> 	__be32 local = parms-&gt;iph.saddr;</div><div class='hunk'>@@ -197,14 +202,13 @@ static void ipip6_tunnel_clone_6rd(struct net_device *dev, struct sit_net *sitn)</div><div class='ctx'> static int ipip6_tunnel_create(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='del'>-	struct sit_net *sitn = net_generic(net, sit_net_id);</div><div class='add'>+	struct sit_net *sitn = net_generic(t-&gt;net, sit_net_id);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, &amp;t-&gt;parms.iph.saddr, 4);</div><div class='add'>+	__dev_addr_set(dev, &amp;t-&gt;parms.iph.saddr, 4);</div><div class='ctx'> 	memcpy(dev-&gt;broadcast, &amp;t-&gt;parms.iph.daddr, 4);</div><div class='ctx'> </div><div class='del'>-	if ((__force u16)t-&gt;parms.i_flags &amp; SIT_ISATAP)</div><div class='add'>+	if (test_bit(IP_TUNNEL_SIT_ISATAP_BIT, t-&gt;parms.i_flags))</div><div class='ctx'> 		dev-&gt;priv_flags |= IFF_ISATAP;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;rtnl_link_ops = &amp;sit_link_ops;</div><div class='hunk'>@@ -215,8 +219,6 @@ static int ipip6_tunnel_create(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ipip6_tunnel_clone_6rd(dev, sitn);</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='del'>-</div><div class='ctx'> 	ipip6_tunnel_link(sitn, t);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +227,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ip_tunnel *ipip6_tunnel_locate(struct net *net,</div><div class='del'>-		struct ip_tunnel_parm *parms, int create)</div><div class='add'>+					     struct ip_tunnel_parm_kern *parms,</div><div class='add'>+					     int create)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 remote = parms-&gt;iph.daddr;</div><div class='ctx'> 	__be32 local = parms-&gt;iph.saddr;</div><div class='hunk'>@@ -253,7 +256,7 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net,</div><div class='ctx'> 	if (parms-&gt;name[0]) {</div><div class='ctx'> 		if (!dev_valid_name(parms-&gt;name))</div><div class='ctx'> 			goto failed;</div><div class='del'>-		strlcpy(name, parms-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, parms-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		strcpy(name, "sit%d");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -266,10 +269,14 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	nt = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	nt-&gt;net = net;</div><div class='ctx'> 	nt-&gt;parms = *parms;</div><div class='ctx'> 	if (ipip6_tunnel_create(dev) &lt; 0)</div><div class='ctx'> 		goto failed_free;</div><div class='ctx'> </div><div class='add'>+	if (!parms-&gt;name[0])</div><div class='add'>+		strcpy(parms-&gt;name, dev-&gt;name);</div><div class='add'>+</div><div class='ctx'> 	return nt;</div><div class='ctx'> </div><div class='ctx'> failed_free:</div><div class='hunk'>@@ -295,14 +302,17 @@ __ipip6_tunnel_locate_prl(struct ip_tunnel *t, __be32 addr)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipip6_tunnel_get_prl(struct ip_tunnel *t,</div><div class='del'>-				struct ip_tunnel_prl __user *a)</div><div class='add'>+static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __user *a)</div><div class='ctx'> {</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='ctx'> 	struct ip_tunnel_prl kprl, *kp;</div><div class='ctx'> 	struct ip_tunnel_prl_entry *prl;</div><div class='ctx'> 	unsigned int cmax, c = 0, ca, len;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;kprl, a, sizeof(kprl)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	cmax = kprl.datalen / sizeof(kprl);</div><div class='hunk'>@@ -313,12 +323,10 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,</div><div class='ctx'> 	 * we try harder to allocate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	kp = (cmax &lt;= 1 || capable(CAP_NET_ADMIN)) ?</div><div class='del'>-		kcalloc(cmax, sizeof(*kp), GFP_KERNEL | __GFP_NOWARN) :</div><div class='add'>+		kcalloc(cmax, sizeof(*kp), GFP_KERNEL_ACCOUNT | __GFP_NOWARN) :</div><div class='ctx'> 		NULL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	ca = t-&gt;prl_count &lt; cmax ? t-&gt;prl_count : cmax;</div><div class='add'>+	ca = min(t-&gt;prl_count, cmax);</div><div class='ctx'> </div><div class='ctx'> 	if (!kp) {</div><div class='ctx'> 		/* We don't try hard to allocate much memory for</div><div class='hunk'>@@ -326,14 +334,15 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,</div><div class='ctx'> 		 * For root users, retry allocating enough memory for</div><div class='ctx'> 		 * the answer.</div><div class='ctx'> 		 */</div><div class='del'>-		kp = kcalloc(ca, sizeof(*kp), GFP_ATOMIC);</div><div class='add'>+		kp = kcalloc(ca, sizeof(*kp), GFP_ATOMIC | __GFP_ACCOUNT |</div><div class='add'>+					      __GFP_NOWARN);</div><div class='ctx'> 		if (!kp) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	c = 0;</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for_each_prl_rcu(t-&gt;prl) {</div><div class='ctx'> 		if (c &gt;= cmax)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -345,7 +354,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,</div><div class='ctx'> 		if (kprl.addr != htonl(INADDR_ANY))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(*kp) * c;</div><div class='hunk'>@@ -354,7 +363,7 @@ out:</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	kfree(kp);</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -445,6 +454,35 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ipip6_tunnel_prl_ctl(struct net_device *dev,</div><div class='add'>+				struct ip_tunnel_prl __user *data, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_prl prl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(t-&gt;net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;prl, data, sizeof(prl)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCDELPRL:</div><div class='add'>+		err = ipip6_tunnel_del_prl(t, &amp;prl);</div><div class='add'>+		break;</div><div class='add'>+	case SIOCADDPRL:</div><div class='add'>+	case SIOCCHGPRL:</div><div class='add'>+		err = ipip6_tunnel_add_prl(t, &amp;prl, cmd == SIOCCHGPRL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='add'>+	netdev_state_change(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> isatap_chksrc(struct sk_buff *skb, const struct iphdr *iph, struct ip_tunnel *t)</div><div class='ctx'> {</div><div class='hunk'>@@ -484,7 +522,7 @@ static void ipip6_tunnel_uninit(struct net_device *dev)</div><div class='ctx'> 		ipip6_tunnel_del_prl(tunnel, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	dst_cache_reset(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-	dev_put(dev);</div><div class='add'>+	netdev_put(dev, &amp;tunnel-&gt;dev_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipip6_err(struct sk_buff *skb, u32 info)</div><div class='hunk'>@@ -534,19 +572,20 @@ static int ipip6_err(struct sk_buff *skb, u32 info)</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMP_DEST_UNREACH &amp;&amp; code == ICMP_FRAG_NEEDED) {</div><div class='ctx'> 		ipv4_update_pmtu(skb, dev_net(skb-&gt;dev), info,</div><div class='del'>-				 t-&gt;parms.link, 0, iph-&gt;protocol, 0);</div><div class='add'>+				 t-&gt;parms.link, iph-&gt;protocol);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (type == ICMP_REDIRECT) {</div><div class='del'>-		ipv4_redirect(skb, dev_net(skb-&gt;dev), t-&gt;parms.link, 0,</div><div class='del'>-			      iph-&gt;protocol, 0);</div><div class='add'>+		ipv4_redirect(skb, dev_net(skb-&gt;dev), t-&gt;parms.link,</div><div class='add'>+			      iph-&gt;protocol);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	if (!ip6_err_gen_icmpv6_unreach(skb, iph-&gt;ihl * 4, type, data_len))</div><div class='add'>+	if (__in6_dev_get(skb-&gt;dev) &amp;&amp;</div><div class='add'>+	    !ip6_err_gen_icmpv6_unreach(skb, iph-&gt;ihl * 4, type, data_len))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;parms.iph.daddr == 0)</div><div class='hunk'>@@ -648,8 +687,6 @@ static int ipip6_rcv(struct sk_buff *skb)</div><div class='ctx'> 	tunnel = ipip6_tunnel_lookup(dev_net(skb-&gt;dev), skb-&gt;dev,</div><div class='ctx'> 				     iph-&gt;saddr, iph-&gt;daddr, sifindex);</div><div class='ctx'> 	if (tunnel) {</div><div class='del'>-		struct pcpu_sw_netstats *tstats;</div><div class='del'>-</div><div class='ctx'> 		if (tunnel-&gt;parms.iph.protocol != IPPROTO_IPV6 &amp;&amp;</div><div class='ctx'> 		    tunnel-&gt;parms.iph.protocol != 0)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -660,7 +697,7 @@ static int ipip6_rcv(struct sk_buff *skb)</div><div class='ctx'> 		skb-&gt;dev = tunnel-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 		if (packet_is_spoofed(skb, iph, tunnel)) {</div><div class='del'>-			tunnel-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+			DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -668,23 +705,25 @@ static int ipip6_rcv(struct sk_buff *skb)</div><div class='ctx'> 		    !net_eq(tunnel-&gt;net, dev_net(tunnel-&gt;dev))))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='add'>+		/* skb can be uncloned in iptunnel_pull_header, so</div><div class='add'>+		 * old iph is no longer valid</div><div class='add'>+		 */</div><div class='add'>+		iph = (const struct iphdr *)skb_mac_header(skb);</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='ctx'> 		err = IP_ECN_decapsulate(iph, skb);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			if (log_ecn_error)</div><div class='ctx'> 				net_info_ratelimited("non-ECT from %pI4 with TOS=%#x\n",</div><div class='ctx'> 						     &amp;iph-&gt;saddr, iph-&gt;tos);</div><div class='ctx'> 			if (err &gt; 1) {</div><div class='del'>-				++tunnel-&gt;dev-&gt;stats.rx_frame_errors;</div><div class='del'>-				++tunnel-&gt;dev-&gt;stats.rx_errors;</div><div class='add'>+				DEV_STATS_INC(tunnel-&gt;dev, rx_frame_errors);</div><div class='add'>+				DEV_STATS_INC(tunnel-&gt;dev, rx_errors);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tstats = this_cpu_ptr(tunnel-&gt;dev-&gt;tstats);</div><div class='del'>-		u64_stats_update_begin(&amp;tstats-&gt;syncp);</div><div class='del'>-		tstats-&gt;rx_packets++;</div><div class='del'>-		tstats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-		u64_stats_update_end(&amp;tstats-&gt;syncp);</div><div class='add'>+		dev_sw_netstats_rx_add(tunnel-&gt;dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		netif_rx(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -738,6 +777,8 @@ static int sit_tunnel_rcv(struct sk_buff *skb, u8 ipproto)</div><div class='ctx'> 			tpi = &amp;ipip_tpi;</div><div class='ctx'> 		if (iptunnel_pull_header(skb, 0, tpi-&gt;proto, false))</div><div class='ctx'> 			goto drop;</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='ctx'> 		return ip_tunnel_rcv(tunnel, skb, tpi, NULL, log_ecn_error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -777,8 +818,9 @@ static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,</div><div class='ctx'> 		pbw0 = tunnel-&gt;ip6rd.prefixlen &gt;&gt; 5;</div><div class='ctx'> 		pbi0 = tunnel-&gt;ip6rd.prefixlen &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-		d = (ntohl(v6dst-&gt;s6_addr32[pbw0]) &lt;&lt; pbi0) &gt;&gt;</div><div class='del'>-		    tunnel-&gt;ip6rd.relay_prefixlen;</div><div class='add'>+		d = tunnel-&gt;ip6rd.relay_prefixlen &lt; 32 ?</div><div class='add'>+			(ntohl(v6dst-&gt;s6_addr32[pbw0]) &lt;&lt; pbi0) &gt;&gt;</div><div class='add'>+		    tunnel-&gt;ip6rd.relay_prefixlen : 0;</div><div class='ctx'> </div><div class='ctx'> 		pbi1 = pbi0 - tunnel-&gt;ip6rd.relay_prefixlen;</div><div class='ctx'> 		if (pbi1 &gt; 0)</div><div class='hunk'>@@ -806,6 +848,49 @@ static inline __be32 try_6rd(struct ip_tunnel *tunnel,</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ipip6_tunnel_dst_find(struct sk_buff *skb, __be32 *dst,</div><div class='add'>+				  bool is_isatap)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *iph6 = ipv6_hdr(skb);</div><div class='add'>+	struct neighbour *neigh = NULL;</div><div class='add'>+	const struct in6_addr *addr6;</div><div class='add'>+	bool found = false;</div><div class='add'>+	int addr_type;</div><div class='add'>+</div><div class='add'>+	if (skb_dst(skb))</div><div class='add'>+		neigh = dst_neigh_lookup(skb_dst(skb), &amp;iph6-&gt;daddr);</div><div class='add'>+</div><div class='add'>+	if (!neigh) {</div><div class='add'>+		net_dbg_ratelimited("nexthop == NULL\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr6 = (const struct in6_addr *)&amp;neigh-&gt;primary_key;</div><div class='add'>+	addr_type = ipv6_addr_type(addr6);</div><div class='add'>+</div><div class='add'>+	if (is_isatap) {</div><div class='add'>+		if ((addr_type &amp; IPV6_ADDR_UNICAST) &amp;&amp;</div><div class='add'>+		    ipv6_addr_is_isatap(addr6)) {</div><div class='add'>+			*dst = addr6-&gt;s6_addr32[3];</div><div class='add'>+			found = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (addr_type == IPV6_ADDR_ANY) {</div><div class='add'>+			addr6 = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+			addr_type = ipv6_addr_type(addr6);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((addr_type &amp; IPV6_ADDR_COMPATv4) != 0) {</div><div class='add'>+			*dst = addr6-&gt;s6_addr32[3];</div><div class='add'>+			found = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	neigh_release(neigh);</div><div class='add'>+</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	This function assumes it is being called from dev_queue_xmit()</div><div class='ctx'>  *	and that skb is filled properly by that function.</div><div class='hunk'>@@ -825,8 +910,6 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	__be32 dst = tiph-&gt;daddr;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	int    mtu;</div><div class='del'>-	const struct in6_addr *addr6;</div><div class='del'>-	int addr_type;</div><div class='ctx'> 	u8 ttl;</div><div class='ctx'> 	u8 protocol = IPPROTO_IPV6;</div><div class='ctx'> 	int t_hlen = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='hunk'>@@ -835,85 +918,41 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		tos = ipv6_get_dsfield(iph6);</div><div class='ctx'> </div><div class='ctx'> 	/* ISATAP (RFC4214) - must come before 6to4 */</div><div class='del'>-	if (dev-&gt;priv_flags &amp; IFF_ISATAP) {</div><div class='del'>-		struct neighbour *neigh = NULL;</div><div class='del'>-		bool do_tx_error = false;</div><div class='del'>-</div><div class='del'>-		if (skb_dst(skb))</div><div class='del'>-			neigh = dst_neigh_lookup(skb_dst(skb), &amp;iph6-&gt;daddr);</div><div class='del'>-</div><div class='del'>-		if (!neigh) {</div><div class='del'>-			net_dbg_ratelimited("nexthop == NULL\n");</div><div class='del'>-			goto tx_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addr6 = (const struct in6_addr *)&amp;neigh-&gt;primary_key;</div><div class='del'>-		addr_type = ipv6_addr_type(addr6);</div><div class='del'>-</div><div class='del'>-		if ((addr_type &amp; IPV6_ADDR_UNICAST) &amp;&amp;</div><div class='del'>-		     ipv6_addr_is_isatap(addr6))</div><div class='del'>-			dst = addr6-&gt;s6_addr32[3];</div><div class='del'>-		else</div><div class='del'>-			do_tx_error = true;</div><div class='del'>-</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-		if (do_tx_error)</div><div class='del'>-			goto tx_error;</div><div class='del'>-	}</div><div class='add'>+	if ((dev-&gt;priv_flags &amp; IFF_ISATAP) &amp;&amp;</div><div class='add'>+	    !ipip6_tunnel_dst_find(skb, &amp;dst, true))</div><div class='add'>+		goto tx_error;</div><div class='ctx'> </div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		dst = try_6rd(tunnel, &amp;iph6-&gt;daddr);</div><div class='ctx'> </div><div class='del'>-	if (!dst) {</div><div class='del'>-		struct neighbour *neigh = NULL;</div><div class='del'>-		bool do_tx_error = false;</div><div class='del'>-</div><div class='del'>-		if (skb_dst(skb))</div><div class='del'>-			neigh = dst_neigh_lookup(skb_dst(skb), &amp;iph6-&gt;daddr);</div><div class='del'>-</div><div class='del'>-		if (!neigh) {</div><div class='del'>-			net_dbg_ratelimited("nexthop == NULL\n");</div><div class='del'>-			goto tx_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addr6 = (const struct in6_addr *)&amp;neigh-&gt;primary_key;</div><div class='del'>-		addr_type = ipv6_addr_type(addr6);</div><div class='del'>-</div><div class='del'>-		if (addr_type == IPV6_ADDR_ANY) {</div><div class='del'>-			addr6 = &amp;ipv6_hdr(skb)-&gt;daddr;</div><div class='del'>-			addr_type = ipv6_addr_type(addr6);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((addr_type &amp; IPV6_ADDR_COMPATv4) != 0)</div><div class='del'>-			dst = addr6-&gt;s6_addr32[3];</div><div class='del'>-		else</div><div class='del'>-			do_tx_error = true;</div><div class='del'>-</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-		if (do_tx_error)</div><div class='del'>-			goto tx_error;</div><div class='del'>-	}</div><div class='add'>+	if (!dst &amp;&amp; !ipip6_tunnel_dst_find(skb, &amp;dst, false))</div><div class='add'>+		goto tx_error;</div><div class='ctx'> </div><div class='ctx'> 	flowi4_init_output(&amp;fl4, tunnel-&gt;parms.link, tunnel-&gt;fwmark,</div><div class='del'>-			   RT_TOS(tos), RT_SCOPE_UNIVERSE, IPPROTO_IPV6,</div><div class='del'>-			   0, dst, tiph-&gt;saddr, 0, 0,</div><div class='add'>+			   tos &amp; INET_DSCP_MASK, RT_SCOPE_UNIVERSE,</div><div class='add'>+			   IPPROTO_IPV6, 0, dst, tiph-&gt;saddr, 0, 0,</div><div class='ctx'> 			   sock_net_uid(tunnel-&gt;net, NULL));</div><div class='del'>-	rt = ip_route_output_flow(tunnel-&gt;net, &amp;fl4, NULL);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(rt)) {</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='del'>-		goto tx_error_icmp;</div><div class='add'>+	rt = dst_cache_get_ip4(&amp;tunnel-&gt;dst_cache, &amp;fl4.saddr);</div><div class='add'>+	if (!rt) {</div><div class='add'>+		rt = ip_route_output_flow(tunnel-&gt;net, &amp;fl4, NULL);</div><div class='add'>+		if (IS_ERR(rt)) {</div><div class='add'>+			DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+			goto tx_error_icmp;</div><div class='add'>+		}</div><div class='add'>+		dst_cache_set_ip4(&amp;tunnel-&gt;dst_cache, &amp;rt-&gt;dst, fl4.saddr);</div><div class='ctx'> 	}</div><div class='del'>-	if (rt-&gt;rt_type != RTN_UNICAST) {</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;rt_type != RTN_UNICAST &amp;&amp; rt-&gt;rt_type != RTN_LOCAL) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+		DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='ctx'> 		goto tx_error_icmp;</div><div class='ctx'> 	}</div><div class='ctx'> 	tdev = rt-&gt;dst.dev;</div><div class='ctx'> </div><div class='ctx'> 	if (tdev == dev) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		dev-&gt;stats.collisions++;</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -925,8 +964,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (df) {</div><div class='ctx'> 		mtu = dst_mtu(&amp;rt-&gt;dst) - t_hlen;</div><div class='ctx'> </div><div class='del'>-		if (mtu &lt; 68) {</div><div class='del'>-			dev-&gt;stats.collisions++;</div><div class='add'>+		if (mtu &lt; IPV4_MIN_MTU) {</div><div class='add'>+			DEV_STATS_INC(dev, collisions);</div><div class='ctx'> 			ip_rt_put(rt);</div><div class='ctx'> 			goto tx_error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -937,10 +976,10 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tunnel-&gt;parms.iph.daddr)</div><div class='del'>-			skb_dst_update_pmtu(skb, mtu);</div><div class='add'>+			skb_dst_update_pmtu_no_confirm(skb, mtu);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;len &gt; mtu &amp;&amp; !skb_is_gso(skb)) {</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='add'>+			icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='ctx'> 			ip_rt_put(rt);</div><div class='ctx'> 			goto tx_error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -965,7 +1004,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom);</div><div class='ctx'> 		if (!new_skb) {</div><div class='ctx'> 			ip_rt_put(rt);</div><div class='del'>-			dev-&gt;stats.tx_dropped++;</div><div class='add'>+			DEV_STATS_INC(dev, tx_dropped);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -980,7 +1019,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 		ttl = iph6-&gt;hop_limit;</div><div class='ctx'> 	tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));</div><div class='ctx'> </div><div class='del'>-	if (ip_tunnel_encap(skb, tunnel, &amp;protocol, &amp;fl4) &lt; 0) {</div><div class='add'>+	if (ip_tunnel_encap(skb, &amp;tunnel-&gt;encap, &amp;protocol, &amp;fl4) &lt; 0) {</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='ctx'> 		goto tx_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -988,14 +1027,14 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	skb_set_inner_ipproto(skb, IPPROTO_IPV6);</div><div class='ctx'> </div><div class='ctx'> 	iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, protocol, tos, ttl,</div><div class='del'>-		      df, !net_eq(tunnel-&gt;net, dev_net(dev)));</div><div class='add'>+		      df, !net_eq(tunnel-&gt;net, dev_net(dev)), 0);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_error_icmp:</div><div class='ctx'> 	dst_link_failure(skb);</div><div class='ctx'> tx_error:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1014,13 +1053,16 @@ static netdev_tx_t sit_tunnel_xmit__(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> tx_error:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 				   struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	if (!pskb_inet_may_pull(skb))</div><div class='add'>+		goto tx_err;</div><div class='add'>+</div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='ctx'> 	case htons(ETH_P_IP):</div><div class='ctx'> 		sit_tunnel_xmit__(skb, dev, IPPROTO_IPIP);</div><div class='hunk'>@@ -1040,7 +1082,7 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> tx_err:</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -1048,12 +1090,13 @@ tx_err:</div><div class='ctx'> </div><div class='ctx'> static void ipip6_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='add'>+	int t_hlen = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='ctx'> 	struct net_device *tdev = NULL;</div><div class='del'>-	struct ip_tunnel *tunnel;</div><div class='add'>+	int hlen = LL_MAX_HEADER;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> </div><div class='del'>-	tunnel = netdev_priv(dev);</div><div class='ctx'> 	iph = &amp;tunnel-&gt;parms.iph;</div><div class='ctx'> </div><div class='ctx'> 	if (iph-&gt;daddr) {</div><div class='hunk'>@@ -1062,7 +1105,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> 							  iph-&gt;daddr, iph-&gt;saddr,</div><div class='ctx'> 							  0, 0,</div><div class='ctx'> 							  IPPROTO_IPV6,</div><div class='del'>-							  RT_TOS(iph-&gt;tos),</div><div class='add'>+							  iph-&gt;tos &amp; INET_DSCP_MASK,</div><div class='ctx'> 							  tunnel-&gt;parms.link);</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR(rt)) {</div><div class='hunk'>@@ -1075,17 +1118,20 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)</div><div class='ctx'> 	if (!tdev &amp;&amp; tunnel-&gt;parms.link)</div><div class='ctx'> 		tdev = __dev_get_by_index(tunnel-&gt;net, tunnel-&gt;parms.link);</div><div class='ctx'> </div><div class='del'>-	if (tdev) {</div><div class='del'>-		int t_hlen = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='add'>+	if (tdev &amp;&amp; !netif_is_l3_master(tdev)) {</div><div class='add'>+		int mtu;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;hard_header_len = tdev-&gt;hard_header_len + sizeof(struct iphdr);</div><div class='del'>-		dev-&gt;mtu = tdev-&gt;mtu - t_hlen;</div><div class='del'>-		if (dev-&gt;mtu &lt; IPV6_MIN_MTU)</div><div class='del'>-			dev-&gt;mtu = IPV6_MIN_MTU;</div><div class='add'>+		mtu = tdev-&gt;mtu - t_hlen;</div><div class='add'>+		if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+			mtu = IPV6_MIN_MTU;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, mtu);</div><div class='add'>+		hlen = tdev-&gt;hard_header_len + tdev-&gt;needed_headroom;</div><div class='ctx'> 	}</div><div class='add'>+	dev-&gt;needed_headroom = t_hlen + hlen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,</div><div class='add'>+static void ipip6_tunnel_update(struct ip_tunnel *t,</div><div class='add'>+				struct ip_tunnel_parm_kern *p,</div><div class='ctx'> 				__u32 fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = t-&gt;net;</div><div class='hunk'>@@ -1095,7 +1141,7 @@ static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,</div><div class='ctx'> 	synchronize_net();</div><div class='ctx'> 	t-&gt;parms.iph.saddr = p-&gt;iph.saddr;</div><div class='ctx'> 	t-&gt;parms.iph.daddr = p-&gt;iph.daddr;</div><div class='del'>-	memcpy(t-&gt;dev-&gt;dev_addr, &amp;p-&gt;iph.saddr, 4);</div><div class='add'>+	__dev_addr_set(t-&gt;dev, &amp;p-&gt;iph.saddr, 4);</div><div class='ctx'> 	memcpy(t-&gt;dev-&gt;broadcast, &amp;p-&gt;iph.daddr, 4);</div><div class='ctx'> 	ipip6_tunnel_link(sitn, t);</div><div class='ctx'> 	t-&gt;parms.iph.ttl = p-&gt;iph.ttl;</div><div class='hunk'>@@ -1141,7 +1187,54 @@ static int ipip6_tunnel_update_6rd(struct ip_tunnel *t,</div><div class='ctx'> 	netdev_state_change(t-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_get6rd(struct net_device *dev, struct ip_tunnel_parm __user *data)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='add'>+	struct ip_tunnel_6rd ip6rd;</div><div class='add'>+</div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev) {</div><div class='add'>+		if (!ip_tunnel_parm_from_user(&amp;p, data))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		t = ipip6_tunnel_locate(t-&gt;net, &amp;p, 0);</div><div class='add'>+	}</div><div class='add'>+	if (!t)</div><div class='add'>+		t = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	ip6rd.prefix = t-&gt;ip6rd.prefix;</div><div class='add'>+	ip6rd.relay_prefix = t-&gt;ip6rd.relay_prefix;</div><div class='add'>+	ip6rd.prefixlen = t-&gt;ip6rd.prefixlen;</div><div class='add'>+	ip6rd.relay_prefixlen = t-&gt;ip6rd.relay_prefixlen;</div><div class='add'>+	if (copy_to_user(data, &amp;ip6rd, sizeof(ip6rd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_6rdctl(struct net_device *dev, struct ip_tunnel_6rd __user *data,</div><div class='add'>+		    int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_6rd ip6rd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(t-&gt;net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+	if (copy_from_user(&amp;ip6rd, data, sizeof(ip6rd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (cmd != SIOCDEL6RD) {</div><div class='add'>+		err = ipip6_tunnel_update_6rd(t, &amp;ip6rd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	} else</div><div class='add'>+		ipip6_tunnel_clone_6rd(dev, dev_to_sit_net(dev));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IPV6_SIT_6RD */</div><div class='ctx'> </div><div class='ctx'> static bool ipip6_valid_ip_proto(u8 ipproto)</div><div class='ctx'> {</div><div class='hunk'>@@ -1154,194 +1247,156 @@ static bool ipip6_valid_ip_proto(u8 ipproto)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ipip6_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+__ipip6_tunnel_ioctl_validate(struct net *net, struct ip_tunnel_parm_kern *p)</div><div class='add'>+{</div><div class='add'>+	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (!ipip6_valid_ip_proto(p-&gt;iph.protocol))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (p-&gt;iph.version != 4 ||</div><div class='add'>+	    p-&gt;iph.ihl != 5 || (p-&gt;iph.frag_off &amp; htons(~IP_DF)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;iph.ttl)</div><div class='add'>+		p-&gt;iph.frag_off |= htons(IP_DF);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_get(struct net_device *dev, struct ip_tunnel_parm_kern *p)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='del'>-	struct ip_tunnel_prl prl;</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct net *net = t-&gt;net;</div><div class='del'>-	struct sit_net *sitn = net_generic(net, sit_net_id);</div><div class='del'>-#ifdef CONFIG_IPV6_SIT_6RD</div><div class='del'>-	struct ip_tunnel_6rd ip6rd;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGETTUNNEL:</div><div class='del'>-#ifdef CONFIG_IPV6_SIT_6RD</div><div class='del'>-	case SIOCGET6RD:</div><div class='del'>-#endif</div><div class='del'>-		if (dev == sitn-&gt;fb_tunnel_dev) {</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p))) {</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			t = ipip6_tunnel_locate(net, &amp;p, 0);</div><div class='del'>-			if (!t)</div><div class='del'>-				t = netdev_priv(dev);</div><div class='del'>-		}</div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev)</div><div class='add'>+		t = ipip6_tunnel_locate(t-&gt;net, p, 0);</div><div class='add'>+	if (!t)</div><div class='add'>+		t = netdev_priv(dev);</div><div class='add'>+	memcpy(p, &amp;t-&gt;parms, sizeof(*p));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (cmd == SIOCGETTUNNEL) {</div><div class='del'>-			memcpy(&amp;p, &amp;t-&gt;parms, sizeof(p));</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;p,</div><div class='del'>-					 sizeof(p)))</div><div class='del'>-				goto done;</div><div class='del'>-#ifdef CONFIG_IPV6_SIT_6RD</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_add(struct net_device *dev, struct ip_tunnel_parm_kern *p)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __ipip6_tunnel_ioctl_validate(t-&gt;net, p);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	t = ipip6_tunnel_locate(t-&gt;net, p, 1);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_change(struct net_device *dev, struct ip_tunnel_parm_kern *p)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __ipip6_tunnel_ioctl_validate(t-&gt;net, p);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	t = ipip6_tunnel_locate(t-&gt;net, p, 0);</div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev) {</div><div class='add'>+		if (!t)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+	} else {</div><div class='add'>+		if (t) {</div><div class='add'>+			if (t-&gt;dev != dev)</div><div class='add'>+				return -EEXIST;</div><div class='ctx'> 		} else {</div><div class='del'>-			ip6rd.prefix = t-&gt;ip6rd.prefix;</div><div class='del'>-			ip6rd.relay_prefix = t-&gt;ip6rd.relay_prefix;</div><div class='del'>-			ip6rd.prefixlen = t-&gt;ip6rd.prefixlen;</div><div class='del'>-			ip6rd.relay_prefixlen = t-&gt;ip6rd.relay_prefixlen;</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;ip6rd,</div><div class='del'>-					 sizeof(ip6rd)))</div><div class='del'>-				goto done;</div><div class='del'>-#endif</div><div class='add'>+			if (((dev-&gt;flags &amp; IFF_POINTOPOINT) &amp;&amp; !p-&gt;iph.daddr) ||</div><div class='add'>+			    (!(dev-&gt;flags &amp; IFF_POINTOPOINT) &amp;&amp; p-&gt;iph.daddr))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			t = netdev_priv(dev);</div><div class='ctx'> 		}</div><div class='del'>-		err = 0;</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='del'>-	case SIOCADDTUNNEL:</div><div class='del'>-	case SIOCCHGTUNNEL:</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (!ipip6_valid_ip_proto(p.iph.protocol))</div><div class='del'>-			goto done;</div><div class='del'>-		if (p.iph.version != 4 ||</div><div class='del'>-		    p.iph.ihl != 5 || (p.iph.frag_off&amp;htons(~IP_DF)))</div><div class='del'>-			goto done;</div><div class='del'>-		if (p.iph.ttl)</div><div class='del'>-			p.iph.frag_off |= htons(IP_DF);</div><div class='del'>-</div><div class='del'>-		t = ipip6_tunnel_locate(net, &amp;p, cmd == SIOCADDTUNNEL);</div><div class='del'>-</div><div class='del'>-		if (dev != sitn-&gt;fb_tunnel_dev &amp;&amp; cmd == SIOCCHGTUNNEL) {</div><div class='del'>-			if (t) {</div><div class='del'>-				if (t-&gt;dev != dev) {</div><div class='del'>-					err = -EEXIST;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (((dev-&gt;flags&amp;IFF_POINTOPOINT) &amp;&amp; !p.iph.daddr) ||</div><div class='del'>-				    (!(dev-&gt;flags&amp;IFF_POINTOPOINT) &amp;&amp; p.iph.daddr)) {</div><div class='del'>-					err = -EINVAL;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				t = netdev_priv(dev);</div><div class='del'>-			}</div><div class='add'>+		ipip6_tunnel_update(t, p, t-&gt;fwmark);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			ipip6_tunnel_update(t, &amp;p, t-&gt;fwmark);</div><div class='del'>-		}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (t) {</div><div class='del'>-			err = 0;</div><div class='del'>-			if (copy_to_user(ifr-&gt;ifr_ifru.ifru_data, &amp;t-&gt;parms, sizeof(p)))</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-		} else</div><div class='del'>-			err = (cmd == SIOCADDTUNNEL ? -ENOBUFS : -ENOENT);</div><div class='del'>-		break;</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_del(struct net_device *dev, struct ip_tunnel_parm_kern *p)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel *t = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!ns_capable(t-&gt;net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (dev == dev_to_sit_net(dev)-&gt;fb_tunnel_dev) {</div><div class='add'>+		t = ipip6_tunnel_locate(t-&gt;net, p, 0);</div><div class='add'>+		if (!t)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		if (t == netdev_priv(dev_to_sit_net(dev)-&gt;fb_tunnel_dev))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		dev = t-&gt;dev;</div><div class='add'>+	}</div><div class='add'>+	unregister_netdevice(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm_kern *p,</div><div class='add'>+		 int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGETTUNNEL:</div><div class='add'>+		return ipip6_tunnel_get(dev, p);</div><div class='add'>+	case SIOCADDTUNNEL:</div><div class='add'>+		return ipip6_tunnel_add(dev, p);</div><div class='add'>+	case SIOCCHGTUNNEL:</div><div class='add'>+		return ipip6_tunnel_change(dev, p);</div><div class='ctx'> 	case SIOCDELTUNNEL:</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		if (dev == sitn-&gt;fb_tunnel_dev) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			if (copy_from_user(&amp;p, ifr-&gt;ifr_ifru.ifru_data, sizeof(p)))</div><div class='del'>-				goto done;</div><div class='del'>-			err = -ENOENT;</div><div class='del'>-			t = ipip6_tunnel_locate(net, &amp;p, 0);</div><div class='del'>-			if (!t)</div><div class='del'>-				goto done;</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			if (t == netdev_priv(sitn-&gt;fb_tunnel_dev))</div><div class='del'>-				goto done;</div><div class='del'>-			dev = t-&gt;dev;</div><div class='del'>-		}</div><div class='del'>-		unregister_netdevice(dev);</div><div class='del'>-		err = 0;</div><div class='del'>-		break;</div><div class='add'>+		return ipip6_tunnel_del(dev, p);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ipip6_tunnel_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+			    void __user *data, int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGETTUNNEL:</div><div class='add'>+	case SIOCADDTUNNEL:</div><div class='add'>+	case SIOCCHGTUNNEL:</div><div class='add'>+	case SIOCDELTUNNEL:</div><div class='add'>+		return ip_tunnel_siocdevprivate(dev, ifr, data, cmd);</div><div class='ctx'> 	case SIOCGETPRL:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (dev == sitn-&gt;fb_tunnel_dev)</div><div class='del'>-			goto done;</div><div class='del'>-		err = ipip6_tunnel_get_prl(t, ifr-&gt;ifr_ifru.ifru_data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='add'>+		return ipip6_tunnel_get_prl(dev, data);</div><div class='ctx'> 	case SIOCADDPRL:</div><div class='ctx'> 	case SIOCDELPRL:</div><div class='ctx'> 	case SIOCCHGPRL:</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			goto done;</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		if (dev == sitn-&gt;fb_tunnel_dev)</div><div class='del'>-			goto done;</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;prl, ifr-&gt;ifr_ifru.ifru_data, sizeof(prl)))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case SIOCDELPRL:</div><div class='del'>-			err = ipip6_tunnel_del_prl(t, &amp;prl);</div><div class='del'>-			break;</div><div class='del'>-		case SIOCADDPRL:</div><div class='del'>-		case SIOCCHGPRL:</div><div class='del'>-			err = ipip6_tunnel_add_prl(t, &amp;prl, cmd == SIOCCHGPRL);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		dst_cache_reset(&amp;t-&gt;dst_cache);</div><div class='del'>-		netdev_state_change(dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='add'>+		return ipip6_tunnel_prl_ctl(dev, data, cmd);</div><div class='ctx'> #ifdef CONFIG_IPV6_SIT_6RD</div><div class='add'>+	case SIOCGET6RD:</div><div class='add'>+		return ipip6_tunnel_get6rd(dev, data);</div><div class='ctx'> 	case SIOCADD6RD:</div><div class='ctx'> 	case SIOCCHG6RD:</div><div class='ctx'> 	case SIOCDEL6RD:</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;ip6rd, ifr-&gt;ifr_ifru.ifru_data,</div><div class='del'>-				   sizeof(ip6rd)))</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		if (cmd != SIOCDEL6RD) {</div><div class='del'>-			err = ipip6_tunnel_update_6rd(t, &amp;ip6rd);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto done;</div><div class='del'>-		} else</div><div class='del'>-			ipip6_tunnel_clone_6rd(dev, sitn);</div><div class='del'>-</div><div class='del'>-		err = 0;</div><div class='del'>-		break;</div><div class='add'>+		return ipip6_tunnel_6rdctl(dev, data, cmd);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops ipip6_netdev_ops = {</div><div class='ctx'> 	.ndo_init	= ipip6_tunnel_init,</div><div class='ctx'> 	.ndo_uninit	= ipip6_tunnel_uninit,</div><div class='ctx'> 	.ndo_start_xmit	= sit_tunnel_xmit,</div><div class='del'>-	.ndo_do_ioctl	= ipip6_tunnel_ioctl,</div><div class='del'>-	.ndo_get_stats64 = ip_tunnel_get_stats64,</div><div class='add'>+	.ndo_siocdevprivate = ipip6_tunnel_siocdevprivate,</div><div class='ctx'> 	.ndo_get_iflink = ip_tunnel_get_iflink,</div><div class='add'>+	.ndo_tunnel_ctl = ipip6_tunnel_ctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ipip6_dev_free(struct net_device *dev)</div><div class='hunk'>@@ -1349,7 +1404,6 @@ static void ipip6_dev_free(struct net_device *dev)</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	dst_cache_destroy(&amp;tunnel-&gt;dst_cache);</div><div class='del'>-	free_percpu(dev-&gt;tstats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SIT_FEATURES (NETIF_F_SG	   | \</div><div class='hunk'>@@ -1364,20 +1418,22 @@ static void ipip6_tunnel_setup(struct net_device *dev)</div><div class='ctx'> 	int t_hlen = tunnel-&gt;hlen + sizeof(struct iphdr);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;ipip6_netdev_ops;</div><div class='add'>+	dev-&gt;header_ops		= &amp;ip_tunnel_header_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='ctx'> 	dev-&gt;priv_destructor	= ipip6_dev_free;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;type		= ARPHRD_SIT;</div><div class='del'>-	dev-&gt;hard_header_len	= LL_MAX_HEADER + t_hlen;</div><div class='ctx'> 	dev-&gt;mtu		= ETH_DATA_LEN - t_hlen;</div><div class='ctx'> 	dev-&gt;min_mtu		= IPV6_MIN_MTU;</div><div class='ctx'> 	dev-&gt;max_mtu		= IP6_MAX_MTU - t_hlen;</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	netif_keep_dst(dev);</div><div class='ctx'> 	dev-&gt;addr_len		= 4;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;lltx		= true;</div><div class='ctx'> 	dev-&gt;features		|= SIT_FEATURES;</div><div class='ctx'> 	dev-&gt;hw_features	|= SIT_FEATURES;</div><div class='add'>+	dev-&gt;pcpu_stat_type	= NETDEV_PCPU_STAT_TSTATS;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipip6_tunnel_init(struct net_device *dev)</div><div class='hunk'>@@ -1386,21 +1442,16 @@ static int ipip6_tunnel_init(struct net_device *dev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;dev = dev;</div><div class='del'>-	tunnel-&gt;net = dev_net(dev);</div><div class='ctx'> 	strcpy(tunnel-&gt;parms.name, dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	ipip6_tunnel_bind_dev(dev);</div><div class='del'>-	dev-&gt;tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='del'>-	if (!dev-&gt;tstats)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	err = dst_cache_init(&amp;tunnel-&gt;dst_cache, GFP_KERNEL);</div><div class='del'>-	if (err) {</div><div class='del'>-		free_percpu(dev-&gt;tstats);</div><div class='del'>-		dev-&gt;tstats = NULL;</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	netdev_hold(dev, &amp;tunnel-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1416,7 +1467,6 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev)</div><div class='ctx'> 	iph-&gt;ihl		= 5;</div><div class='ctx'> 	iph-&gt;ttl		= 64;</div><div class='ctx'> </div><div class='del'>-	dev_hold(dev);</div><div class='ctx'> 	rcu_assign_pointer(sitn-&gt;tunnels_wc[0], tunnel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1436,7 +1486,7 @@ static int ipip6_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipip6_netlink_parms(struct nlattr *data[],</div><div class='del'>-				struct ip_tunnel_parm *parms,</div><div class='add'>+				struct ip_tunnel_parm_kern *parms,</div><div class='ctx'> 				__u32 *fwmark)</div><div class='ctx'> {</div><div class='ctx'> 	memset(parms, 0, sizeof(*parms));</div><div class='hunk'>@@ -1449,71 +1499,12 @@ static void ipip6_netlink_parms(struct nlattr *data[],</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data[IFLA_IPTUN_LINK])</div><div class='del'>-		parms-&gt;link = nla_get_u32(data[IFLA_IPTUN_LINK]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_LOCAL])</div><div class='del'>-		parms-&gt;iph.saddr = nla_get_be32(data[IFLA_IPTUN_LOCAL]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_REMOTE])</div><div class='del'>-		parms-&gt;iph.daddr = nla_get_be32(data[IFLA_IPTUN_REMOTE]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_TTL]) {</div><div class='del'>-		parms-&gt;iph.ttl = nla_get_u8(data[IFLA_IPTUN_TTL]);</div><div class='del'>-		if (parms-&gt;iph.ttl)</div><div class='del'>-			parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_TOS])</div><div class='del'>-		parms-&gt;iph.tos = nla_get_u8(data[IFLA_IPTUN_TOS]);</div><div class='del'>-</div><div class='del'>-	if (!data[IFLA_IPTUN_PMTUDISC] || nla_get_u8(data[IFLA_IPTUN_PMTUDISC]))</div><div class='del'>-		parms-&gt;iph.frag_off = htons(IP_DF);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_FLAGS])</div><div class='del'>-		parms-&gt;i_flags = nla_get_be16(data[IFLA_IPTUN_FLAGS]);</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_PROTO])</div><div class='del'>-		parms-&gt;iph.protocol = nla_get_u8(data[IFLA_IPTUN_PROTO]);</div><div class='add'>+	ip_tunnel_netlink_parms(data, parms);</div><div class='ctx'> </div><div class='ctx'> 	if (data[IFLA_IPTUN_FWMARK])</div><div class='ctx'> 		*fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function returns true when ENCAP attributes are present in the nl msg */</div><div class='del'>-static bool ipip6_netlink_encap_parms(struct nlattr *data[],</div><div class='del'>-				      struct ip_tunnel_encap *ipencap)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	memset(ipencap, 0, sizeof(*ipencap));</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_TYPE]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;type = nla_get_u16(data[IFLA_IPTUN_ENCAP_TYPE]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_FLAGS]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;flags = nla_get_u16(data[IFLA_IPTUN_ENCAP_FLAGS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_SPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_IPTUN_ENCAP_DPORT]) {</div><div class='del'>-		ret = true;</div><div class='del'>-		ipencap-&gt;dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IPV6_SIT_6RD</div><div class='ctx'> /* This function returns true when 6RD attributes are present in the nl msg */</div><div class='ctx'> static bool ipip6_netlink_6rd_parms(struct nlattr *data[],</div><div class='hunk'>@@ -1551,21 +1542,25 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[],</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int ipip6_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			 struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int ipip6_newlink(struct net_device *dev,</div><div class='add'>+			 struct rtnl_newlink_params *params,</div><div class='ctx'> 			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct net *net = dev_net(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct ip_tunnel *nt;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='ctx'> #ifdef CONFIG_IPV6_SIT_6RD</div><div class='ctx'> 	struct ip_tunnel_6rd ip6rd;</div><div class='ctx'> #endif</div><div class='add'>+	struct net *net;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	net = params-&gt;link_net ? : dev_net(dev);</div><div class='ctx'> 	nt = netdev_priv(dev);</div><div class='add'>+	nt-&gt;net = net;</div><div class='ctx'> </div><div class='del'>-	if (ipip6_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		err = ip_tunnel_encap_setup(nt, &amp;ipencap);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1589,8 +1584,11 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPV6_SIT_6RD</div><div class='del'>-	if (ipip6_netlink_6rd_parms(data, &amp;ip6rd))</div><div class='add'>+	if (ipip6_netlink_6rd_parms(data, &amp;ip6rd)) {</div><div class='ctx'> 		err = ipip6_tunnel_update_6rd(nt, &amp;ip6rd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			unregister_netdevice_queue(dev, NULL);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1601,8 +1599,8 @@ static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *t = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm p;</div><div class='ctx'> 	struct ip_tunnel_encap ipencap;</div><div class='add'>+	struct ip_tunnel_parm_kern p;</div><div class='ctx'> 	struct net *net = t-&gt;net;</div><div class='ctx'> 	struct sit_net *sitn = net_generic(net, sit_net_id);</div><div class='ctx'> #ifdef CONFIG_IPV6_SIT_6RD</div><div class='hunk'>@@ -1614,7 +1612,7 @@ static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='ctx'> 	if (dev == sitn-&gt;fb_tunnel_dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ipip6_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='add'>+	if (ip_tunnel_netlink_encap_parms(data, &amp;ipencap)) {</div><div class='ctx'> 		err = ip_tunnel_encap_setup(t, &amp;ipencap);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1689,7 +1687,7 @@ static size_t ipip6_get_size(const struct net_device *dev)</div><div class='ctx'> static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ip_tunnel *tunnel = netdev_priv(dev);</div><div class='del'>-	struct ip_tunnel_parm *parm = &amp;tunnel-&gt;parms;</div><div class='add'>+	struct ip_tunnel_parm_kern *parm = &amp;tunnel-&gt;parms;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm-&gt;link) ||</div><div class='ctx'> 	    nla_put_in_addr(skb, IFLA_IPTUN_LOCAL, parm-&gt;iph.saddr) ||</div><div class='hunk'>@@ -1699,7 +1697,8 @@ static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_IPTUN_PMTUDISC,</div><div class='ctx'> 		       !!(parm-&gt;iph.frag_off &amp; htons(IP_DF))) ||</div><div class='ctx'> 	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm-&gt;iph.protocol) ||</div><div class='del'>-	    nla_put_be16(skb, IFLA_IPTUN_FLAGS, parm-&gt;i_flags) ||</div><div class='add'>+	    nla_put_be16(skb, IFLA_IPTUN_FLAGS,</div><div class='add'>+			 ip_tunnel_flags_to_be16(parm-&gt;i_flags)) ||</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_IPTUN_FWMARK, tunnel-&gt;fwmark))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -1797,8 +1796,7 @@ static struct xfrm_tunnel mplsip_handler __read_mostly = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void __net_exit sit_destroy_tunnels(struct net *net,</div><div class='del'>-					   struct list_head *head)</div><div class='add'>+static void __net_exit sit_exit_rtnl_net(struct net *net, struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct sit_net *sitn = net_generic(net, sit_net_id);</div><div class='ctx'> 	struct net_device *dev, *aux;</div><div class='hunk'>@@ -1808,20 +1806,20 @@ static void __net_exit sit_destroy_tunnels(struct net *net,</div><div class='ctx'> 		if (dev-&gt;rtnl_link_ops == &amp;sit_link_ops)</div><div class='ctx'> 			unregister_netdevice_queue(dev, head);</div><div class='ctx'> </div><div class='del'>-	for (prio = 1; prio &lt; 4; prio++) {</div><div class='add'>+	for (prio = 0; prio &lt; 4; prio++) {</div><div class='ctx'> 		int h;</div><div class='del'>-		for (h = 0; h &lt; IP6_SIT_HASH_SIZE; h++) {</div><div class='add'>+		for (h = 0; h &lt; (prio ? IP6_SIT_HASH_SIZE : 1); h++) {</div><div class='ctx'> 			struct ip_tunnel *t;</div><div class='ctx'> </div><div class='del'>-			t = rtnl_dereference(sitn-&gt;tunnels[prio][h]);</div><div class='add'>+			t = rtnl_net_dereference(net, sitn-&gt;tunnels[prio][h]);</div><div class='ctx'> 			while (t) {</div><div class='ctx'> 				/* If dev is in the same netns, it has already</div><div class='ctx'> 				 * been added to the list by the previous loop.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (!net_eq(dev_net(t-&gt;dev), net))</div><div class='del'>-					unregister_netdevice_queue(t-&gt;dev,</div><div class='del'>-								   head);</div><div class='del'>-				t = rtnl_dereference(t-&gt;next);</div><div class='add'>+					unregister_netdevice_queue(t-&gt;dev, head);</div><div class='add'>+</div><div class='add'>+				t = rtnl_net_dereference(net, t-&gt;next);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1853,7 +1851,10 @@ static int __net_init sit_init_net(struct net *net)</div><div class='ctx'> 	/* FB netdevice is special: we have one, and only one per netns.</div><div class='ctx'> 	 * Allowing to move it to another netns is clearly unsafe.</div><div class='ctx'> 	 */</div><div class='del'>-	sitn-&gt;fb_tunnel_dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='add'>+	sitn-&gt;fb_tunnel_dev-&gt;netns_immutable = true;</div><div class='add'>+</div><div class='add'>+	t = netdev_priv(sitn-&gt;fb_tunnel_dev);</div><div class='add'>+	t-&gt;net = net;</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(sitn-&gt;fb_tunnel_dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1862,33 +1863,18 @@ static int __net_init sit_init_net(struct net *net)</div><div class='ctx'> 	ipip6_tunnel_clone_6rd(sitn-&gt;fb_tunnel_dev, sitn);</div><div class='ctx'> 	ipip6_fb_tunnel_init(sitn-&gt;fb_tunnel_dev);</div><div class='ctx'> </div><div class='del'>-	t = netdev_priv(sitn-&gt;fb_tunnel_dev);</div><div class='del'>-</div><div class='ctx'> 	strcpy(t-&gt;parms.name, sitn-&gt;fb_tunnel_dev-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reg_dev:</div><div class='del'>-	ipip6_dev_free(sitn-&gt;fb_tunnel_dev);</div><div class='add'>+	free_netdev(sitn-&gt;fb_tunnel_dev);</div><div class='ctx'> err_alloc_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit sit_exit_batch_net(struct list_head *net_list)</div><div class='del'>-{</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_entry(net, net_list, exit_list)</div><div class='del'>-		sit_destroy_tunnels(net, &amp;list);</div><div class='del'>-</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations sit_net_ops = {</div><div class='ctx'> 	.init = sit_init_net,</div><div class='del'>-	.exit_batch = sit_exit_batch_net,</div><div class='add'>+	.exit_rtnl = sit_exit_rtnl_net,</div><div class='ctx'> 	.id   = &amp;sit_net_id,</div><div class='ctx'> 	.size = sizeof(struct sit_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -1954,6 +1940,7 @@ xfrm_tunnel_failed:</div><div class='ctx'> </div><div class='ctx'> module_init(sit_init);</div><div class='ctx'> module_exit(sit_cleanup);</div><div class='add'>+MODULE_DESCRIPTION("IPv6-in-IPv4 tunnel SIT driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK("sit");</div><div class='ctx'> MODULE_ALIAS_NETDEV("sit0");</div><div class='head'>diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c<br/>index e997141aed8c..7e007f013ec8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/syncookies.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/syncookies.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/syncookies.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/syncookies.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  IPv6 Syncookies implementation for the Linux kernel</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,12 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on IPv4 implementation by Andi Kleen</div><div class='ctx'>  *  linux/net/ipv4/syncookies.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='hunk'>@@ -21,11 +16,12 @@</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tcp_ecn.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COOKIEBITS 24	/* Upper bits store count */</div><div class='ctx'> #define COOKIEMASK (((__u32)1 &lt;&lt; COOKIEBITS) - 1)</div><div class='ctx'> </div><div class='del'>-static siphash_key_t syncookie6_secret[2] __read_mostly;</div><div class='add'>+static siphash_aligned_key_t syncookie6_secret[2];</div><div class='ctx'> </div><div class='ctx'> /* RFC 2460, Section 8.3:</div><div class='ctx'>  * [ipv6 tcp] MSS must be computed as the maximum packet size minus 60 [..]</div><div class='hunk'>@@ -119,78 +115,97 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb, __u16 *mssp)</div><div class='ctx'> 	return __cookie_v6_init_sequence(iph, th, mssp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __cookie_v6_check(const struct ipv6hdr *iph, const struct tcphdr *th,</div><div class='del'>-		      __u32 cookie)</div><div class='add'>+int __cookie_v6_check(const struct ipv6hdr *iph, const struct tcphdr *th)</div><div class='ctx'> {</div><div class='add'>+	__u32 cookie = ntohl(th-&gt;ack_seq) - 1;</div><div class='ctx'> 	__u32 seq = ntohl(th-&gt;seq) - 1;</div><div class='del'>-	__u32 mssind = check_tcp_syn_cookie(cookie, &amp;iph-&gt;saddr, &amp;iph-&gt;daddr,</div><div class='del'>-					    th-&gt;source, th-&gt;dest, seq);</div><div class='add'>+	__u32 mssind;</div><div class='add'>+</div><div class='add'>+	mssind = check_tcp_syn_cookie(cookie, &amp;iph-&gt;saddr, &amp;iph-&gt;daddr,</div><div class='add'>+				      th-&gt;source, th-&gt;dest, seq);</div><div class='ctx'> </div><div class='ctx'> 	return mssind &lt; ARRAY_SIZE(msstab) ? msstab[mssind] : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__cookie_v6_check);</div><div class='ctx'> </div><div class='del'>-struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static struct request_sock *cookie_tcp_check(struct net *net, struct sock *sk,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_options_received tcp_opt;</div><div class='del'>-	struct inet_request_sock *ireq;</div><div class='del'>-	struct tcp_request_sock *treq;</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='del'>-	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	__u32 cookie = ntohl(th-&gt;ack_seq) - 1;</div><div class='del'>-	struct sock *ret = sk;</div><div class='del'>-	struct request_sock *req;</div><div class='del'>-	int mss;</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	__u8 rcv_wscale;</div><div class='ctx'> 	u32 tsoff = 0;</div><div class='del'>-</div><div class='del'>-	if (!sock_net(sk)-&gt;ipv4.sysctl_tcp_syncookies || !th-&gt;ack || th-&gt;rst)</div><div class='del'>-		goto out;</div><div class='add'>+	int mss;</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_synq_no_recent_overflow(sk))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mss = __cookie_v6_check(ipv6_hdr(skb), th, cookie);</div><div class='del'>-	if (mss == 0) {</div><div class='del'>-		__NET_INC_STATS(sock_net(sk), LINUX_MIB_SYNCOOKIESFAILED);</div><div class='add'>+	mss = __cookie_v6_check(ipv6_hdr(skb), tcp_hdr(skb));</div><div class='add'>+	if (!mss) {</div><div class='add'>+		__NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESFAILED);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__NET_INC_STATS(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);</div><div class='add'>+	__NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESRECV);</div><div class='ctx'> </div><div class='ctx'> 	/* check for timestamp cookie support */</div><div class='ctx'> 	memset(&amp;tcp_opt, 0, sizeof(tcp_opt));</div><div class='del'>-	tcp_parse_options(sock_net(sk), skb, &amp;tcp_opt, 0, NULL);</div><div class='add'>+	tcp_parse_options(net, skb, &amp;tcp_opt, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_opt.saw_tstamp &amp;&amp; tcp_opt.rcv_tsecr) {</div><div class='del'>-		tsoff = secure_tcpv6_ts_off(sock_net(sk),</div><div class='add'>+		tsoff = secure_tcpv6_ts_off(net,</div><div class='ctx'> 					    ipv6_hdr(skb)-&gt;daddr.s6_addr32,</div><div class='ctx'> 					    ipv6_hdr(skb)-&gt;saddr.s6_addr32);</div><div class='ctx'> 		tcp_opt.rcv_tsecr -= tsoff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cookie_timestamp_decode(sock_net(sk), &amp;tcp_opt))</div><div class='add'>+	if (!cookie_timestamp_decode(net, &amp;tcp_opt))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = NULL;</div><div class='del'>-	req = inet_reqsk_alloc(&amp;tcp6_request_sock_ops, sk, false);</div><div class='del'>-	if (!req)</div><div class='add'>+	return cookie_tcp_reqsk_alloc(&amp;tcp6_request_sock_ops, sk, skb,</div><div class='add'>+				      &amp;tcp_opt, mss, tsoff);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct inet_request_sock *ireq;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	struct sock *ret = sk;</div><div class='add'>+	__u8 rcv_wscale;</div><div class='add'>+	int full_space;</div><div class='add'>+	SKB_DR(reason);</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(net-&gt;ipv4.sysctl_tcp_syncookies) ||</div><div class='add'>+	    !th-&gt;ack || th-&gt;rst)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ireq = inet_rsk(req);</div><div class='del'>-	treq = tcp_rsk(req);</div><div class='del'>-	treq-&gt;tfo_listener = false;</div><div class='add'>+	if (cookie_bpf_ok(skb)) {</div><div class='add'>+		req = cookie_bpf_check(sk, skb);</div><div class='add'>+	} else {</div><div class='add'>+		req = cookie_tcp_check(net, sk, skb);</div><div class='add'>+		if (IS_ERR(req))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!req) {</div><div class='add'>+		SKB_DR_SET(reason, NO_SOCKET);</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (security_inet_conn_request(sk, skb, req))</div><div class='del'>-		goto out_free;</div><div class='add'>+	ireq = inet_rsk(req);</div><div class='ctx'> </div><div class='del'>-	req-&gt;mss = mss;</div><div class='del'>-	ireq-&gt;ir_rmt_port = th-&gt;source;</div><div class='del'>-	ireq-&gt;ir_num = ntohs(th-&gt;dest);</div><div class='ctx'> 	ireq-&gt;ir_v6_rmt_addr = ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	ireq-&gt;ir_v6_loc_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+</div><div class='add'>+	if (security_inet_conn_request(sk, skb, req)) {</div><div class='add'>+		SKB_DR_SET(reason, SECURITY_HOOK);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ipv6_opt_accepted(sk, skb, &amp;TCP_SKB_CB(skb)-&gt;header.h6) ||</div><div class='ctx'> 	    np-&gt;rxopt.bits.rxinfo || np-&gt;rxopt.bits.rxoinfo ||</div><div class='ctx'> 	    np-&gt;rxopt.bits.rxhlim || np-&gt;rxopt.bits.rxohlim) {</div><div class='hunk'>@@ -198,27 +213,12 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		ireq-&gt;pktopts = skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ireq-&gt;ir_iif = inet_request_bound_dev_if(sk, skb);</div><div class='ctx'> 	/* So that link locals have meaning */</div><div class='ctx'> 	if (!sk-&gt;sk_bound_dev_if &amp;&amp;</div><div class='ctx'> 	    ipv6_addr_type(&amp;ireq-&gt;ir_v6_rmt_addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='ctx'> 		ireq-&gt;ir_iif = tcp_v6_iif(skb);</div><div class='ctx'> </div><div class='del'>-	ireq-&gt;ir_mark = inet_request_mark(sk, skb);</div><div class='del'>-</div><div class='del'>-	req-&gt;num_retrans = 0;</div><div class='del'>-	ireq-&gt;snd_wscale	= tcp_opt.snd_wscale;</div><div class='del'>-	ireq-&gt;sack_ok		= tcp_opt.sack_ok;</div><div class='del'>-	ireq-&gt;wscale_ok		= tcp_opt.wscale_ok;</div><div class='del'>-	ireq-&gt;tstamp_ok		= tcp_opt.saw_tstamp;</div><div class='del'>-	req-&gt;ts_recent		= tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;</div><div class='del'>-	treq-&gt;snt_synack	= 0;</div><div class='del'>-	treq-&gt;rcv_isn = ntohl(th-&gt;seq) - 1;</div><div class='del'>-	treq-&gt;snt_isn = cookie;</div><div class='del'>-	treq-&gt;ts_off = 0;</div><div class='del'>-	treq-&gt;txhash = net_tx_rndhash();</div><div class='del'>-	if (IS_ENABLED(CONFIG_SMC))</div><div class='del'>-		ireq-&gt;smc_ok = 0;</div><div class='add'>+	tcp_ao_syncookie(sk, skb, req, AF_INET6);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to lookup the dst_entry to get the correct window size.</div><div class='hunk'>@@ -237,27 +237,46 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		fl6.flowi6_mark = ireq-&gt;ir_mark;</div><div class='ctx'> 		fl6.fl6_dport = ireq-&gt;ir_rmt_port;</div><div class='ctx'> 		fl6.fl6_sport = inet_sk(sk)-&gt;inet_sport;</div><div class='del'>-		fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='del'>-		security_req_classify_flow(req, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+		fl6.flowi6_uid = sk_uid(sk);</div><div class='add'>+		security_req_classify_flow(req, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='del'>-		dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='del'>-		if (IS_ERR(dst))</div><div class='add'>+		dst = ip6_dst_lookup_flow(net, sk, &amp;fl6, final_p);</div><div class='add'>+		if (IS_ERR(dst)) {</div><div class='add'>+			SKB_DR_SET(reason, IP_OUTNOROUTES);</div><div class='ctx'> 			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;rsk_window_clamp = tp-&gt;window_clamp ? :dst_metric(dst, RTAX_WINDOW);</div><div class='del'>-	tcp_select_initial_window(sk, tcp_full_space(sk), req-&gt;mss,</div><div class='add'>+	req-&gt;rsk_window_clamp = READ_ONCE(tp-&gt;window_clamp) ? :dst_metric(dst, RTAX_WINDOW);</div><div class='add'>+	/* limit the window selection if the user enforce a smaller rx buffer */</div><div class='add'>+	full_space = tcp_full_space(sk);</div><div class='add'>+	if (sk-&gt;sk_userlocks &amp; SOCK_RCVBUF_LOCK &amp;&amp;</div><div class='add'>+	    (req-&gt;rsk_window_clamp &gt; full_space || req-&gt;rsk_window_clamp == 0))</div><div class='add'>+		req-&gt;rsk_window_clamp = full_space;</div><div class='add'>+</div><div class='add'>+	tcp_select_initial_window(sk, full_space, req-&gt;mss,</div><div class='ctx'> 				  &amp;req-&gt;rsk_rcv_wnd, &amp;req-&gt;rsk_window_clamp,</div><div class='ctx'> 				  ireq-&gt;wscale_ok, &amp;rcv_wscale,</div><div class='ctx'> 				  dst_metric(dst, RTAX_INITRWND));</div><div class='ctx'> </div><div class='del'>-	ireq-&gt;rcv_wscale = rcv_wscale;</div><div class='del'>-	ireq-&gt;ecn_ok = cookie_ecn_ok(&amp;tcp_opt, sock_net(sk), dst);</div><div class='del'>-</div><div class='del'>-	ret = tcp_get_cookie_sock(sk, skb, req, dst, tsoff);</div><div class='add'>+	/* req-&gt;syncookie is set true only if ACK is validated</div><div class='add'>+	 * by BPF kfunc, then, rcv_wscale is already configured.</div><div class='add'>+	 */</div><div class='add'>+	if (!req-&gt;syncookie)</div><div class='add'>+		ireq-&gt;rcv_wscale = rcv_wscale;</div><div class='add'>+	ireq-&gt;ecn_ok &amp;= cookie_ecn_ok(net, dst);</div><div class='add'>+	tcp_rsk(req)-&gt;accecn_ok = ireq-&gt;ecn_ok &amp;&amp; cookie_accecn_ok(th);</div><div class='add'>+</div><div class='add'>+	ret = tcp_get_cookie_sock(sk, skb, req, dst);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		SKB_DR_SET(reason, NO_SOCKET);</div><div class='add'>+		goto out_drop;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_free:</div><div class='ctx'> 	reqsk_free(req);</div><div class='add'>+out_drop:</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c<br/>index e15cd37024fd..d2cd33e2698d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/sysctl_net_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/sysctl_net_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/sysctl_net_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/sysctl_net_ipv6.c</a></div><div class='hunk'>@@ -17,25 +17,44 @@</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/inet_frag.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='add'>+#include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #ifdef CONFIG_NETLABEL</div><div class='ctx'> #include &lt;net/calipso.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;linux/ioam6.h&gt;</div><div class='ctx'> </div><div class='del'>-static int zero;</div><div class='del'>-static int one = 1;</div><div class='del'>-static int auto_flowlabels_min;</div><div class='add'>+static int flowlabel_reflect_max = 0x7;</div><div class='ctx'> static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;</div><div class='add'>+static u32 rt6_multipath_hash_fields_all_mask =</div><div class='add'>+	FIB_MULTIPATH_HASH_FIELD_ALL_MASK;</div><div class='add'>+static u32 ioam6_id_max = IOAM6_DEFAULT_ID;</div><div class='add'>+static u64 ioam6_id_wide_max = IOAM6_DEFAULT_ID_WIDE;</div><div class='ctx'> </div><div class='del'>-static int proc_rt6_multipath_hash_policy(struct ctl_table *table, int write,</div><div class='del'>-					  void __user *buffer, size_t *lenp,</div><div class='del'>-					  loff_t *ppos)</div><div class='add'>+static int proc_rt6_multipath_hash_policy(const struct ctl_table *table, int write,</div><div class='add'>+					  void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	net = container_of(table-&gt;data, struct net,</div><div class='ctx'> 			   ipv6.sysctl.multipath_hash_policy);</div><div class='del'>-	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	ret = proc_dou8vec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+	if (write &amp;&amp; ret == 0)</div><div class='add'>+		call_netevent_notifiers(NETEVENT_IPV6_MPATH_HASH_UPDATE, net);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+proc_rt6_multipath_hash_fields(const struct ctl_table *table, int write, void *buffer,</div><div class='add'>+			       size_t *lenp, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct net *net;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	net = container_of(table-&gt;data, struct net,</div><div class='add'>+			   ipv6.sysctl.multipath_hash_fields);</div><div class='add'>+	ret = proc_douintvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> 	if (write &amp;&amp; ret == 0)</div><div class='ctx'> 		call_netevent_notifiers(NETEVENT_IPV6_MPATH_HASH_UPDATE, net);</div><div class='ctx'> </div><div class='hunk'>@@ -46,39 +65,38 @@ static struct ctl_table ipv6_table_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "bindv6only",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.bindv6only,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "anycast_src_echo_reply",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.anycast_src_echo_reply,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "flowlabel_consistency",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.flowlabel_consistency,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "auto_flowlabels",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.auto_flowlabels,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;auto_flowlabels_min,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 		.extra2		= &amp;auto_flowlabels_max</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fwmark_reflect",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.fwmark_reflect,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "idgen_retries",</div><div class='hunk'>@@ -97,23 +115,25 @@ static struct ctl_table ipv6_table_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "flowlabel_state_ranges",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.flowlabel_state_ranges,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ip_nonlocal_bind",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.ip_nonlocal_bind,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "flowlabel_reflect",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.flowlabel_reflect,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;flowlabel_reflect_max,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max_dst_opts_number",</div><div class='hunk'>@@ -146,11 +166,20 @@ static struct ctl_table ipv6_table_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "fib_multipath_hash_policy",</div><div class='ctx'> 		.data		= &amp;init_net.ipv6.sysctl.multipath_hash_policy,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler   = proc_rt6_multipath_hash_policy,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-		.extra2		= &amp;one,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_THREE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_multipath_hash_fields",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.multipath_hash_fields,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_rt6_multipath_hash_fields,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= &amp;rt6_multipath_hash_fields_all_mask,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "seg6_flowlabel",</div><div class='hunk'>@@ -159,7 +188,31 @@ static struct ctl_table ipv6_table_template[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.procname	= "fib_notify_on_flag_change",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.fib_notify_on_flag_change,</div><div class='add'>+		.maxlen		= sizeof(u8),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dou8vec_minmax,</div><div class='add'>+		.extra1         = SYSCTL_ZERO,</div><div class='add'>+		.extra2         = SYSCTL_TWO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ioam6_id",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.ioam6_id,</div><div class='add'>+		.maxlen		= sizeof(u32),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra2		= &amp;ioam6_id_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "ioam6_id_wide",</div><div class='add'>+		.data		= &amp;init_net.ipv6.sysctl.ioam6_id_wide,</div><div class='add'>+		.maxlen		= sizeof(u64),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_doulongvec_minmax,</div><div class='add'>+		.extra2		= &amp;ioam6_id_wide_max,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table ipv6_rotable[] = {</div><div class='hunk'>@@ -176,7 +229,7 @@ static struct ctl_table ipv6_rotable[] = {</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='del'>-		.extra1		= &amp;one</div><div class='add'>+		.extra1		= SYSCTL_ONE</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_NETLABEL</div><div class='ctx'> 	{</div><div class='hunk'>@@ -194,37 +247,24 @@ static struct ctl_table ipv6_rotable[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> #endif /* CONFIG_NETLABEL */</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init ipv6_sysctl_net_init(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	size_t table_size = ARRAY_SIZE(ipv6_table_template);</div><div class='ctx'> 	struct ctl_table *ipv6_table;</div><div class='ctx'> 	struct ctl_table *ipv6_route_table;</div><div class='ctx'> 	struct ctl_table *ipv6_icmp_table;</div><div class='del'>-	int err;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	ipv6_table = kmemdup(ipv6_table_template, sizeof(ipv6_table_template),</div><div class='ctx'> 			     GFP_KERNEL);</div><div class='ctx'> 	if (!ipv6_table)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ipv6_table[0].data = &amp;net-&gt;ipv6.sysctl.bindv6only;</div><div class='del'>-	ipv6_table[1].data = &amp;net-&gt;ipv6.sysctl.anycast_src_echo_reply;</div><div class='del'>-	ipv6_table[2].data = &amp;net-&gt;ipv6.sysctl.flowlabel_consistency;</div><div class='del'>-	ipv6_table[3].data = &amp;net-&gt;ipv6.sysctl.auto_flowlabels;</div><div class='del'>-	ipv6_table[4].data = &amp;net-&gt;ipv6.sysctl.fwmark_reflect;</div><div class='del'>-	ipv6_table[5].data = &amp;net-&gt;ipv6.sysctl.idgen_retries;</div><div class='del'>-	ipv6_table[6].data = &amp;net-&gt;ipv6.sysctl.idgen_delay;</div><div class='del'>-	ipv6_table[7].data = &amp;net-&gt;ipv6.sysctl.flowlabel_state_ranges;</div><div class='del'>-	ipv6_table[8].data = &amp;net-&gt;ipv6.sysctl.ip_nonlocal_bind;</div><div class='del'>-	ipv6_table[9].data = &amp;net-&gt;ipv6.sysctl.flowlabel_reflect;</div><div class='del'>-	ipv6_table[10].data = &amp;net-&gt;ipv6.sysctl.max_dst_opts_cnt;</div><div class='del'>-	ipv6_table[11].data = &amp;net-&gt;ipv6.sysctl.max_hbh_opts_cnt;</div><div class='del'>-	ipv6_table[12].data = &amp;net-&gt;ipv6.sysctl.max_dst_opts_len;</div><div class='del'>-	ipv6_table[13].data = &amp;net-&gt;ipv6.sysctl.max_hbh_opts_len;</div><div class='del'>-	ipv6_table[14].data = &amp;net-&gt;ipv6.sysctl.multipath_hash_policy,</div><div class='del'>-	ipv6_table[15].data = &amp;net-&gt;ipv6.sysctl.seg6_flowlabel;</div><div class='add'>+	/* Update the variables to point into the current struct net */</div><div class='add'>+	for (i = 0; i &lt; table_size; i++)</div><div class='add'>+		ipv6_table[i].data += (void *)net - (void *)&amp;init_net;</div><div class='ctx'> </div><div class='ctx'> 	ipv6_route_table = ipv6_route_sysctl_init(net);</div><div class='ctx'> 	if (!ipv6_route_table)</div><div class='hunk'>@@ -234,17 +274,22 @@ static int __net_init ipv6_sysctl_net_init(struct net *net)</div><div class='ctx'> 	if (!ipv6_icmp_table)</div><div class='ctx'> 		goto out_ipv6_route_table;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.sysctl.hdr = register_net_sysctl(net, "net/ipv6", ipv6_table);</div><div class='add'>+	net-&gt;ipv6.sysctl.hdr = register_net_sysctl_sz(net, "net/ipv6",</div><div class='add'>+						      ipv6_table, table_size);</div><div class='ctx'> 	if (!net-&gt;ipv6.sysctl.hdr)</div><div class='ctx'> 		goto out_ipv6_icmp_table;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.sysctl.route_hdr =</div><div class='del'>-		register_net_sysctl(net, "net/ipv6/route", ipv6_route_table);</div><div class='add'>+	net-&gt;ipv6.sysctl.route_hdr = register_net_sysctl_sz(net,</div><div class='add'>+							    "net/ipv6/route",</div><div class='add'>+							    ipv6_route_table,</div><div class='add'>+							    ipv6_route_sysctl_table_size(net));</div><div class='ctx'> 	if (!net-&gt;ipv6.sysctl.route_hdr)</div><div class='ctx'> 		goto out_unregister_ipv6_table;</div><div class='ctx'> </div><div class='del'>-	net-&gt;ipv6.sysctl.icmp_hdr =</div><div class='del'>-		register_net_sysctl(net, "net/ipv6/icmp", ipv6_icmp_table);</div><div class='add'>+	net-&gt;ipv6.sysctl.icmp_hdr = register_net_sysctl_sz(net,</div><div class='add'>+							   "net/ipv6/icmp",</div><div class='add'>+							   ipv6_icmp_table,</div><div class='add'>+							   ipv6_icmp_sysctl_table_size());</div><div class='ctx'> 	if (!net-&gt;ipv6.sysctl.icmp_hdr)</div><div class='ctx'> 		goto out_unregister_route_table;</div><div class='ctx'> </div><div class='hunk'>@@ -266,9 +311,9 @@ out_ipv6_table:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit ipv6_sysctl_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *ipv6_table;</div><div class='del'>-	struct ctl_table *ipv6_route_table;</div><div class='del'>-	struct ctl_table *ipv6_icmp_table;</div><div class='add'>+	const struct ctl_table *ipv6_table;</div><div class='add'>+	const struct ctl_table *ipv6_route_table;</div><div class='add'>+	const struct ctl_table *ipv6_icmp_table;</div><div class='ctx'> </div><div class='ctx'> 	ipv6_table = net-&gt;ipv6.sysctl.hdr-&gt;ctl_table_arg;</div><div class='ctx'> 	ipv6_route_table = net-&gt;ipv6.sysctl.route_hdr-&gt;ctl_table_arg;</div><div class='head'>diff --git a/net/ipv6/tcp_ao.c b/net/ipv6/tcp_ao.c<br/>new file mode 100644<br/>index 000000000000..3c09ac26206e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/tcp_ao.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/tcp_ao.c</a></div><div class='hunk'>@@ -0,0 +1,168 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * INET		An implementation of the TCP Authentication Option (TCP-AO).</div><div class='add'>+ *		See RFC5925.</div><div class='add'>+ *</div><div class='add'>+ * Authors:	Dmitry Safonov &lt;dima@arista.com&gt;</div><div class='add'>+ *		Francesco Ruggeri &lt;fruggeri@arista.com&gt;</div><div class='add'>+ *		Salam Noureddine &lt;noureddine@arista.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+</div><div class='add'>+static int tcp_v6_ao_calc_key(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			      const struct in6_addr *saddr,</div><div class='add'>+			      const struct in6_addr *daddr,</div><div class='add'>+			      __be16 sport, __be16 dport,</div><div class='add'>+			      __be32 sisn, __be32 disn)</div><div class='add'>+{</div><div class='add'>+	struct kdf_input_block {</div><div class='add'>+		u8			counter;</div><div class='add'>+		u8			label[6];</div><div class='add'>+		struct tcp6_ao_context	ctx;</div><div class='add'>+		__be16			outlen;</div><div class='add'>+	} __packed * tmp;</div><div class='add'>+	struct tcp_sigpool hp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = tcp_sigpool_start(mkt-&gt;tcp_sigpool_id, &amp;hp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tmp = hp.scratch;</div><div class='add'>+	tmp-&gt;counter	= 1;</div><div class='add'>+	memcpy(tmp-&gt;label, "TCP-AO", 6);</div><div class='add'>+	tmp-&gt;ctx.saddr	= *saddr;</div><div class='add'>+	tmp-&gt;ctx.daddr	= *daddr;</div><div class='add'>+	tmp-&gt;ctx.sport	= sport;</div><div class='add'>+	tmp-&gt;ctx.dport	= dport;</div><div class='add'>+	tmp-&gt;ctx.sisn	= sisn;</div><div class='add'>+	tmp-&gt;ctx.disn	= disn;</div><div class='add'>+	tmp-&gt;outlen	= htons(tcp_ao_digest_size(mkt) * 8); /* in bits */</div><div class='add'>+</div><div class='add'>+	err = tcp_ao_calc_traffic_key(mkt, key, tmp, sizeof(*tmp), &amp;hp);</div><div class='add'>+	tcp_sigpool_end(&amp;hp);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_calc_key_skb(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			   const struct sk_buff *skb,</div><div class='add'>+			   __be32 sisn, __be32 disn)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	return tcp_v6_ao_calc_key(mkt, key, &amp;iph-&gt;saddr,</div><div class='add'>+				  &amp;iph-&gt;daddr, th-&gt;source,</div><div class='add'>+				  th-&gt;dest, sisn, disn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_calc_key_sk(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			  const struct sock *sk, __be32 sisn,</div><div class='add'>+			  __be32 disn, bool send)</div><div class='add'>+{</div><div class='add'>+	if (send)</div><div class='add'>+		return tcp_v6_ao_calc_key(mkt, key, &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+					  &amp;sk-&gt;sk_v6_daddr, htons(sk-&gt;sk_num),</div><div class='add'>+					  sk-&gt;sk_dport, sisn, disn);</div><div class='add'>+	else</div><div class='add'>+		return tcp_v6_ao_calc_key(mkt, key, &amp;sk-&gt;sk_v6_daddr,</div><div class='add'>+					  &amp;sk-&gt;sk_v6_rcv_saddr, sk-&gt;sk_dport,</div><div class='add'>+					  htons(sk-&gt;sk_num), disn, sisn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_calc_key_rsk(struct tcp_ao_key *mkt, u8 *key,</div><div class='add'>+			   struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+</div><div class='add'>+	return tcp_v6_ao_calc_key(mkt, key,</div><div class='add'>+			&amp;ireq-&gt;ir_v6_loc_addr, &amp;ireq-&gt;ir_v6_rmt_addr,</div><div class='add'>+			htons(ireq-&gt;ir_num), ireq-&gt;ir_rmt_port,</div><div class='add'>+			htonl(tcp_rsk(req)-&gt;snt_isn),</div><div class='add'>+			htonl(tcp_rsk(req)-&gt;rcv_isn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tcp_ao_key *tcp_v6_ao_lookup(const struct sock *sk,</div><div class='add'>+				    struct sock *addr_sk,</div><div class='add'>+				    int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	int l3index = l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='add'>+						     addr_sk-&gt;sk_bound_dev_if);</div><div class='add'>+	struct in6_addr *addr = &amp;addr_sk-&gt;sk_v6_daddr;</div><div class='add'>+</div><div class='add'>+	return tcp_ao_do_lookup(sk, l3index, (union tcp_ao_addr *)addr,</div><div class='add'>+				AF_INET6, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tcp_ao_key *tcp_v6_ao_lookup_rsk(const struct sock *sk,</div><div class='add'>+					struct request_sock *req,</div><div class='add'>+					int sndid, int rcvid)</div><div class='add'>+{</div><div class='add'>+	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='add'>+	struct in6_addr *addr = &amp;ireq-&gt;ir_v6_rmt_addr;</div><div class='add'>+	int l3index;</div><div class='add'>+</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk), ireq-&gt;ir_iif);</div><div class='add'>+	return tcp_ao_do_lookup(sk, l3index, (union tcp_ao_addr *)addr,</div><div class='add'>+				AF_INET6, sndid, rcvid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_hash_pseudoheader(struct tcp_sigpool *hp,</div><div class='add'>+				const struct in6_addr *daddr,</div><div class='add'>+				const struct in6_addr *saddr, int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct tcp6_pseudohdr *bp;</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+</div><div class='add'>+	bp = hp-&gt;scratch;</div><div class='add'>+	/* 1. TCP pseudo-header (RFC2460) */</div><div class='add'>+	bp-&gt;saddr = *saddr;</div><div class='add'>+	bp-&gt;daddr = *daddr;</div><div class='add'>+	bp-&gt;len = cpu_to_be32(nbytes);</div><div class='add'>+	bp-&gt;protocol = cpu_to_be32(IPPROTO_TCP);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, bp, sizeof(*bp));</div><div class='add'>+	ahash_request_set_crypt(hp-&gt;req, &amp;sg, NULL, sizeof(*bp));</div><div class='add'>+	return crypto_ahash_update(hp-&gt;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_hash_skb(char *ao_hash, struct tcp_ao_key *key,</div><div class='add'>+		       const struct sock *sk, const struct sk_buff *skb,</div><div class='add'>+		       const u8 *tkey, int hash_offset, u32 sne)</div><div class='add'>+{</div><div class='add'>+	return tcp_ao_hash_skb(AF_INET6, ao_hash, key, sk, skb, tkey,</div><div class='add'>+			hash_offset, sne);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_parse_ao(struct sock *sk, int cmd,</div><div class='add'>+		    sockptr_t optval, int optlen)</div><div class='add'>+{</div><div class='add'>+	return tcp_parse_ao(sk, cmd, AF_INET6, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcp_v6_ao_synack_hash(char *ao_hash, struct tcp_ao_key *ao_key,</div><div class='add'>+			  struct request_sock *req, const struct sk_buff *skb,</div><div class='add'>+			  int hash_offset, u32 sne)</div><div class='add'>+{</div><div class='add'>+	void *hash_buf = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hash_buf = kmalloc(tcp_ao_digest_size(ao_key), GFP_ATOMIC);</div><div class='add'>+	if (!hash_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = tcp_v6_ao_calc_key_rsk(ao_key, hash_buf, req);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = tcp_ao_hash_skb(AF_INET6, ao_hash, ao_key, req_to_sk(req), skb,</div><div class='add'>+			      hash_buf, hash_offset, sne);</div><div class='add'>+out:</div><div class='add'>+	kfree(hash_buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c<br/>index 03e6b7a2bc53..280fe5978559 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/tcp_ipv6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tcp_ipv6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/tcp_ipv6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/tcp_ipv6.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	TCP over IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -16,11 +17,6 @@</div><div class='ctx'>  *	Alexey Kuznetsov		allow both IPv4 and IPv6 sockets to bind</div><div class='ctx'>  *					a single port at the same time.</div><div class='ctx'>  *	YOSHIFUJI Hideaki @USAGI:	convert /proc/net/tcp6 to seq_file.</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bottom_half.h&gt;</div><div class='hunk'>@@ -43,7 +39,9 @@</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='ctx'> #include &lt;net/inet6_hashtables.h&gt;</div><div class='hunk'>@@ -61,45 +59,48 @@</div><div class='ctx'> #include &lt;net/timewait_sock.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='ctx'> #include &lt;net/secure_seq.h&gt;</div><div class='add'>+#include &lt;net/hotdata.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;net/rstreason.h&gt;</div><div class='add'>+#include &lt;net/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/tcp.h&gt;</div><div class='ctx'> </div><div class='del'>-static void	tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb);</div><div class='add'>+static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			      enum sk_rst_reason reason);</div><div class='ctx'> static void	tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				      struct request_sock *req);</div><div class='ctx'> </div><div class='del'>-static int	tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> static const struct inet_connection_sock_af_ops ipv6_mapped;</div><div class='del'>-static const struct inet_connection_sock_af_ops ipv6_specific;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+const struct inet_connection_sock_af_ops ipv6_specific;</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> static const struct tcp_sock_af_ops tcp_sock_ipv6_specific;</div><div class='ctx'> static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific;</div><div class='del'>-#else</div><div class='del'>-static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk,</div><div class='del'>-						   const struct in6_addr *addr)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Helper returning the inet6 address from a given tcp socket.</div><div class='add'>+ * It can be used in TCP stack instead of inet6_sk(sk).</div><div class='add'>+ * This avoids a dereference and allow compiler optimizations.</div><div class='add'>+ * It is a specialized version of inet6_sk_generic().</div><div class='add'>+ */</div><div class='add'>+#define tcp_inet6_sk(sk) (&amp;container_of_const(tcp_sk(sk), \</div><div class='add'>+					      struct tcp6_sock, tcp)-&gt;inet6)</div><div class='add'>+</div><div class='ctx'> static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (dst &amp;&amp; dst_hold_safe(dst)) {</div><div class='del'>-		const struct rt6_info *rt = (const struct rt6_info *)dst;</div><div class='del'>-</div><div class='del'>-		sk-&gt;sk_rx_dst = dst;</div><div class='del'>-		inet_sk(sk)-&gt;rx_dst_ifindex = skb-&gt;skb_iif;</div><div class='del'>-		inet6_sk(sk)-&gt;rx_dst_cookie = rt6_get_cookie(rt);</div><div class='add'>+		rcu_assign_pointer(sk-&gt;sk_rx_dst, dst);</div><div class='add'>+		sk-&gt;sk_rx_dst_ifindex = skb-&gt;skb_iif;</div><div class='add'>+		sk-&gt;sk_rx_dst_cookie = rt6_get_cookie(dst_rt6_info(dst));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +118,7 @@ static u32 tcp_v6_init_ts_off(const struct net *net, const struct sk_buff *skb)</div><div class='ctx'> 				   ipv6_hdr(skb)-&gt;saddr.s6_addr32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			      int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	/* This check is replicated from tcp_v6_connect() and intended to</div><div class='hunk'>@@ -129,24 +130,25 @@ static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	sock_owned_by_me(sk);</div><div class='ctx'> </div><div class='del'>-	return BPF_CGROUP_RUN_PROG_INET6_CONNECT(sk, uaddr);</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET6_CONNECT(sk, uaddr, &amp;addr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int tcp_v6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			  int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct tcp_sock *tp = tcp_sk(sk);</div><div class='ctx'> 	struct in6_addr *saddr = NULL, *final_p, final;</div><div class='add'>+	struct inet_timewait_death_row *tcp_death_row;</div><div class='add'>+	struct ipv6_pinfo *np = tcp_inet6_sk(sk);</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	struct ipv6_txoptions *opt;</div><div class='del'>-	struct flowi6 fl6;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	struct flowi6 fl6;</div><div class='ctx'> 	int addr_type;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct inet_timewait_death_row *tcp_death_row = &amp;sock_net(sk)-&gt;ipv4.tcp_death_row;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -156,13 +158,13 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;sndflow) {</div><div class='add'>+	if (inet6_test_bit(SNDFLOW, sk)) {</div><div class='ctx'> 		fl6.flowlabel = usin-&gt;sin6_flowinfo&amp;IPV6_FLOWINFO_MASK;</div><div class='ctx'> 		IP6_ECN_flow_init(fl6.flowlabel);</div><div class='ctx'> 		if (fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) {</div><div class='ctx'> 			struct ip6_flowlabel *flowlabel;</div><div class='ctx'> 			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-			if (!flowlabel)</div><div class='add'>+			if (IS_ERR(flowlabel))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			fl6_sock_release(flowlabel);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -206,7 +208,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	    !ipv6_addr_equal(&amp;sk-&gt;sk_v6_daddr, &amp;usin-&gt;sin6_addr)) {</div><div class='ctx'> 		tp-&gt;rx_opt.ts_recent = 0;</div><div class='ctx'> 		tp-&gt;rx_opt.ts_recent_stamp = 0;</div><div class='del'>-		tp-&gt;write_seq = 0;</div><div class='add'>+		WRITE_ONCE(tp-&gt;write_seq, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_v6_daddr = usin-&gt;sin6_addr;</div><div class='hunk'>@@ -220,28 +222,32 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 		u32 exthdrlen = icsk-&gt;icsk_ext_hdr_len;</div><div class='ctx'> 		struct sockaddr_in sin;</div><div class='ctx'> </div><div class='del'>-		SOCK_DEBUG(sk, "connect: ipv4 mapped\n");</div><div class='del'>-</div><div class='del'>-		if (__ipv6_only_sock(sk))</div><div class='add'>+		if (ipv6_only_sock(sk))</div><div class='ctx'> 			return -ENETUNREACH;</div><div class='ctx'> </div><div class='ctx'> 		sin.sin_family = AF_INET;</div><div class='ctx'> 		sin.sin_port = usin-&gt;sin6_port;</div><div class='ctx'> 		sin.sin_addr.s_addr = usin-&gt;sin6_addr.s6_addr32[3];</div><div class='ctx'> </div><div class='del'>-		icsk-&gt;icsk_af_ops = &amp;ipv6_mapped;</div><div class='add'>+		/* Paired with READ_ONCE() in tcp_(get|set)sockopt() */</div><div class='add'>+		WRITE_ONCE(icsk-&gt;icsk_af_ops, &amp;ipv6_mapped);</div><div class='add'>+		if (sk_is_mptcp(sk))</div><div class='add'>+			mptcpv6_handle_mapped(sk, true);</div><div class='ctx'> 		sk-&gt;sk_backlog_rcv = tcp_v4_do_rcv;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 		tp-&gt;af_specific = &amp;tcp_sock_ipv6_mapped_specific;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		err = tcp_v4_connect(sk, (struct sockaddr *)&amp;sin, sizeof(sin));</div><div class='add'>+		err = tcp_v4_connect(sk, (struct sockaddr_unsized *)&amp;sin, sizeof(sin));</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			icsk-&gt;icsk_ext_hdr_len = exthdrlen;</div><div class='del'>-			icsk-&gt;icsk_af_ops = &amp;ipv6_specific;</div><div class='add'>+			/* Paired with READ_ONCE() in tcp_(get|set)sockopt() */</div><div class='add'>+			WRITE_ONCE(icsk-&gt;icsk_af_ops, &amp;ipv6_specific);</div><div class='add'>+			if (sk_is_mptcp(sk))</div><div class='add'>+				mptcpv6_handle_mapped(sk, false);</div><div class='ctx'> 			sk-&gt;sk_backlog_rcv = tcp_v6_do_rcv;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 			tp-&gt;af_specific = &amp;tcp_sock_ipv6_specific;</div><div class='ctx'> #endif</div><div class='ctx'> 			goto failure;</div><div class='hunk'>@@ -257,26 +263,35 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	fl6.flowi6_proto = IPPROTO_TCP;</div><div class='ctx'> 	fl6.daddr = sk-&gt;sk_v6_daddr;</div><div class='ctx'> 	fl6.saddr = saddr ? *saddr : np-&gt;saddr;</div><div class='add'>+	fl6.flowlabel = ip6_make_flowinfo(np-&gt;tclass, np-&gt;flow_label);</div><div class='ctx'> 	fl6.flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='ctx'> 	fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='ctx'> 	fl6.fl6_dport = usin-&gt;sin6_port;</div><div class='ctx'> 	fl6.fl6_sport = inet-&gt;inet_sport;</div><div class='del'>-	fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='add'>+	if (IS_ENABLED(CONFIG_IP_ROUTE_MULTIPATH) &amp;&amp; !fl6.fl6_sport)</div><div class='add'>+		fl6.flowi6_flags = FLOWI_FLAG_ANY_SPORT;</div><div class='add'>+	fl6.flowi6_uid = sk_uid(sk);</div><div class='ctx'> </div><div class='ctx'> 	opt = rcu_dereference_protected(np-&gt;opt, lockdep_sock_is_held(sk));</div><div class='ctx'> 	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='ctx'> </div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='add'>+	dst = ip6_dst_lookup_flow(net, sk, &amp;fl6, final_p);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tp-&gt;tcp_usec_ts = dst_tcp_usec_ts(dst);</div><div class='add'>+	tcp_death_row = &amp;sock_net(sk)-&gt;ipv4.tcp_death_row;</div><div class='add'>+</div><div class='ctx'> 	if (!saddr) {</div><div class='ctx'> 		saddr = &amp;fl6.saddr;</div><div class='del'>-		sk-&gt;sk_v6_rcv_saddr = *saddr;</div><div class='add'>+</div><div class='add'>+		err = inet_bhash2_update_saddr(sk, saddr, AF_INET6);</div><div class='add'>+		if (err)</div><div class='add'>+			goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the source address */</div><div class='hunk'>@@ -284,12 +299,12 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	inet-&gt;inet_rcv_saddr = LOOPBACK4_IPV6;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_gso_type = SKB_GSO_TCPV6;</div><div class='del'>-	ip6_dst_store(sk, dst, NULL, NULL);</div><div class='add'>+	ip6_dst_store(sk, dst, false, false);</div><div class='ctx'> </div><div class='del'>-	icsk-&gt;icsk_ext_hdr_len = 0;</div><div class='add'>+	icsk-&gt;icsk_ext_hdr_len = psp_sk_overhead(sk);</div><div class='ctx'> 	if (opt)</div><div class='del'>-		icsk-&gt;icsk_ext_hdr_len = opt-&gt;opt_flen +</div><div class='del'>-					 opt-&gt;opt_nflen;</div><div class='add'>+		icsk-&gt;icsk_ext_hdr_len += opt-&gt;opt_flen +</div><div class='add'>+					  opt-&gt;opt_nflen;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_opt.mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr);</div><div class='ctx'> </div><div class='hunk'>@@ -304,12 +319,12 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!tp-&gt;repair)) {</div><div class='ctx'> 		if (!tp-&gt;write_seq)</div><div class='del'>-			tp-&gt;write_seq = secure_tcpv6_seq(np-&gt;saddr.s6_addr32,</div><div class='del'>-							 sk-&gt;sk_v6_daddr.s6_addr32,</div><div class='del'>-							 inet-&gt;inet_sport,</div><div class='del'>-							 inet-&gt;inet_dport);</div><div class='del'>-		tp-&gt;tsoffset = secure_tcpv6_ts_off(sock_net(sk),</div><div class='del'>-						   np-&gt;saddr.s6_addr32,</div><div class='add'>+			WRITE_ONCE(tp-&gt;write_seq,</div><div class='add'>+				   secure_tcpv6_seq(np-&gt;saddr.s6_addr32,</div><div class='add'>+						    sk-&gt;sk_v6_daddr.s6_addr32,</div><div class='add'>+						    inet-&gt;inet_sport,</div><div class='add'>+						    inet-&gt;inet_dport));</div><div class='add'>+		tp-&gt;tsoffset = secure_tcpv6_ts_off(net, np-&gt;saddr.s6_addr32,</div><div class='ctx'> 						   sk-&gt;sk_v6_daddr.s6_addr32);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -326,6 +341,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> late_failure:</div><div class='ctx'> 	tcp_set_state(sk, TCP_CLOSE);</div><div class='add'>+	inet_bhash2_reset_saddr(sk);</div><div class='ctx'> failure:</div><div class='ctx'> 	inet-&gt;inet_dport = 0;</div><div class='ctx'> 	sk-&gt;sk_route_caps = 0;</div><div class='hunk'>@@ -335,11 +351,20 @@ failure:</div><div class='ctx'> static void tcp_v6_mtu_reduced(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='add'>+	u32 mtu;</div><div class='ctx'> </div><div class='ctx'> 	if ((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_LISTEN | TCPF_CLOSE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	dst = inet6_csk_update_pmtu(sk, tcp_sk(sk)-&gt;mtu_info);</div><div class='add'>+	mtu = READ_ONCE(tcp_sk(sk)-&gt;mtu_info);</div><div class='add'>+</div><div class='add'>+	/* Drop requests trying to increase our current mss.</div><div class='add'>+	 * Check done in __ip6_rt_update_pmtu() is too late.</div><div class='add'>+	 */</div><div class='add'>+	if (tcp_mtu_to_mss(sk, mtu) &gt;= tcp_sk(sk)-&gt;mss_cache)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dst = inet6_csk_update_pmtu(sk, mtu);</div><div class='ctx'> 	if (!dst)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -349,12 +374,12 @@ static void tcp_v6_mtu_reduced(struct sock *sk)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb-&gt;data;</div><div class='ctx'> 	const struct tcphdr *th = (struct tcphdr *)(skb-&gt;data+offset);</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	struct request_sock *fastopen;</div><div class='ctx'> 	struct ipv6_pinfo *np;</div><div class='ctx'> 	struct tcp_sock *tp;</div><div class='hunk'>@@ -363,25 +388,33 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	bool fatal;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	sk = __inet6_lookup_established(net, &amp;tcp_hashinfo,</div><div class='del'>-					&amp;hdr-&gt;daddr, th-&gt;dest,</div><div class='add'>+	sk = __inet6_lookup_established(net, &amp;hdr-&gt;daddr, th-&gt;dest,</div><div class='ctx'> 					&amp;hdr-&gt;saddr, ntohs(th-&gt;source),</div><div class='ctx'> 					skb-&gt;dev-&gt;ifindex, inet6_sdif(skb));</div><div class='ctx'> </div><div class='ctx'> 	if (!sk) {</div><div class='ctx'> 		__ICMP6_INC_STATS(net, __in6_dev_get(skb-&gt;dev),</div><div class='ctx'> 				  ICMP6_MIB_INERRORS);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+		/* To increase the counter of ignored icmps for TCP-AO */</div><div class='add'>+		tcp_ao_ignore_icmp(sk, AF_INET6, type, code);</div><div class='ctx'> 		inet_twsk_put(inet_twsk(sk));</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	seq = ntohl(th-&gt;seq);</div><div class='ctx'> 	fatal = icmpv6_err_convert(type, code, &amp;err);</div><div class='del'>-	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV)</div><div class='del'>-		return tcp_req_err(sk, seq, fatal);</div><div class='add'>+	if (sk-&gt;sk_state == TCP_NEW_SYN_RECV) {</div><div class='add'>+		tcp_req_err(sk, seq, fatal);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tcp_ao_ignore_icmp(sk, AF_INET6, type, code)) {</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (sock_owned_by_user(sk) &amp;&amp; type != ICMPV6_PKT_TOOBIG)</div><div class='hunk'>@@ -390,14 +423,17 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (ipv6_hdr(skb)-&gt;hop_limit &lt; inet6_sk(sk)-&gt;min_hopcount) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='del'>-		goto out;</div><div class='add'>+	if (static_branch_unlikely(&amp;ip6_min_hopcount)) {</div><div class='add'>+		/* min_hopcount can be changed concurrently from do_ipv6_setsockopt() */</div><div class='add'>+		if (ipv6_hdr(skb)-&gt;hop_limit &lt; READ_ONCE(tcp_inet6_sk(sk)-&gt;min_hopcount)) {</div><div class='add'>+			__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp = tcp_sk(sk);</div><div class='ctx'> 	/* XXX (TFO) - tp-&gt;snd_una should be ISN (tcp_create_openreq_child() */</div><div class='del'>-	fastopen = tp-&gt;fastopen_rsk;</div><div class='add'>+	fastopen = rcu_dereference(tp-&gt;fastopen_rsk);</div><div class='ctx'> 	snd_una = fastopen ? tcp_rsk(fastopen)-&gt;snt_isn : tp-&gt;snd_una;</div><div class='ctx'> 	if (sk-&gt;sk_state != TCP_LISTEN &amp;&amp;</div><div class='ctx'> 	    !between(seq, snd_una, tp-&gt;snd_nxt)) {</div><div class='hunk'>@@ -405,7 +441,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	np = inet6_sk(sk);</div><div class='add'>+	np = tcp_inet6_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (type == NDISC_REDIRECT) {</div><div class='ctx'> 		if (!sock_owned_by_user(sk)) {</div><div class='hunk'>@@ -418,6 +454,8 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (type == ICMPV6_PKT_TOOBIG) {</div><div class='add'>+		u32 mtu = ntohl(info);</div><div class='add'>+</div><div class='ctx'> 		/* We are not interested in TCP_LISTEN and open_requests</div><div class='ctx'> 		 * (SYN-ACKs send out by Linux are always &lt;576bytes so</div><div class='ctx'> 		 * they should go through unfragmented).</div><div class='hunk'>@@ -428,7 +466,11 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		if (!ip6_sk_accept_pmtu(sk))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		tp-&gt;mtu_info = ntohl(info);</div><div class='add'>+		if (mtu &lt; IPV6_MIN_MTU)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(tp-&gt;mtu_info, mtu);</div><div class='add'>+</div><div class='ctx'> 		if (!sock_owned_by_user(sk))</div><div class='ctx'> 			tcp_v6_mtu_reduced(sk);</div><div class='ctx'> 		else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,</div><div class='hunk'>@@ -443,30 +485,39 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	case TCP_SYN_SENT:</div><div class='ctx'> 	case TCP_SYN_RECV:</div><div class='ctx'> 		/* Only in fast or simultaneous open. If a fast open socket is</div><div class='del'>-		 * is already accepted it is treated as a connected one below.</div><div class='add'>+		 * already accepted it is treated as a connected one below.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (fastopen &amp;&amp; !fastopen-&gt;sk)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!sock_owned_by_user(sk)) {</div><div class='del'>-			sk-&gt;sk_err = err;</div><div class='del'>-			sk-&gt;sk_error_report(sk);		/* Wake people up to see the error (see connect in sock.c) */</div><div class='add'>+		ipv6_icmp_error(sk, skb, err, th-&gt;dest, ntohl(info), (u8 *)th);</div><div class='ctx'> </div><div class='del'>-			tcp_done(sk);</div><div class='del'>-		} else</div><div class='del'>-			sk-&gt;sk_err_soft = err;</div><div class='add'>+		if (!sock_owned_by_user(sk))</div><div class='add'>+			tcp_done_with_error(sk, err);</div><div class='add'>+		else</div><div class='add'>+			WRITE_ONCE(sk-&gt;sk_err_soft, err);</div><div class='ctx'> 		goto out;</div><div class='add'>+	case TCP_LISTEN:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* check if this ICMP message allows revert of backoff.</div><div class='add'>+		 * (see RFC 6069)</div><div class='add'>+		 */</div><div class='add'>+		if (!fastopen &amp;&amp; type == ICMPV6_DEST_UNREACH &amp;&amp;</div><div class='add'>+		    code == ICMPV6_NOROUTE)</div><div class='add'>+			tcp_ld_RTO_revert(sk, seq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sock_owned_by_user(sk) &amp;&amp; np-&gt;recverr) {</div><div class='del'>-		sk-&gt;sk_err = err;</div><div class='del'>-		sk-&gt;sk_error_report(sk);</div><div class='del'>-	} else</div><div class='del'>-		sk-&gt;sk_err_soft = err;</div><div class='del'>-</div><div class='add'>+	if (!sock_owned_by_user(sk) &amp;&amp; inet6_test_bit(RECVERR6, sk)) {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err, err);</div><div class='add'>+		sk_error_report(sk);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_ONCE(sk-&gt;sk_err_soft, err);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> 	sock_put(sk);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -474,35 +525,48 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,</div><div class='ctx'> 			      struct flowi *fl,</div><div class='ctx'> 			      struct request_sock *req,</div><div class='ctx'> 			      struct tcp_fastopen_cookie *foc,</div><div class='del'>-			      enum tcp_synack_type synack_type)</div><div class='add'>+			      enum tcp_synack_type synack_type,</div><div class='add'>+			      struct sk_buff *syn_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	const struct ipv6_pinfo *np = tcp_inet6_sk(sk);</div><div class='ctx'> 	struct ipv6_txoptions *opt;</div><div class='ctx'> 	struct flowi6 *fl6 = &amp;fl-&gt;u.ip6;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='add'>+	u8 tclass;</div><div class='ctx'> </div><div class='ctx'> 	/* First, grab a route. */</div><div class='ctx'> 	if (!dst &amp;&amp; (dst = inet6_csk_route_req(sk, fl6, req,</div><div class='ctx'> 					       IPPROTO_TCP)) == NULL)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	skb = tcp_make_synack(sk, dst, req, foc, synack_type);</div><div class='add'>+	skb = tcp_make_synack(sk, dst, req, foc, synack_type, syn_skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb) {</div><div class='add'>+		tcp_rsk(req)-&gt;syn_ect_snt = np-&gt;tclass &amp; INET_ECN_MASK;</div><div class='ctx'> 		__tcp_v6_send_check(skb, &amp;ireq-&gt;ir_v6_loc_addr,</div><div class='ctx'> 				    &amp;ireq-&gt;ir_v6_rmt_addr);</div><div class='ctx'> </div><div class='ctx'> 		fl6-&gt;daddr = ireq-&gt;ir_v6_rmt_addr;</div><div class='del'>-		if (np-&gt;repflow &amp;&amp; ireq-&gt;pktopts)</div><div class='add'>+		if (inet6_test_bit(REPFLOW, sk) &amp;&amp; ireq-&gt;pktopts)</div><div class='ctx'> 			fl6-&gt;flowlabel = ip6_flowlabel(ipv6_hdr(ireq-&gt;pktopts));</div><div class='ctx'> </div><div class='add'>+		tclass = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reflect_tos) ?</div><div class='add'>+				(tcp_rsk(req)-&gt;syn_tos &amp; ~INET_ECN_MASK) |</div><div class='add'>+				(np-&gt;tclass &amp; INET_ECN_MASK) :</div><div class='add'>+				np-&gt;tclass;</div><div class='add'>+</div><div class='add'>+		if (!INET_ECN_is_capable(tclass) &amp;&amp;</div><div class='add'>+		    tcp_bpf_ca_needs_ecn((struct sock *)req))</div><div class='add'>+			tclass |= INET_ECN_ECT_0;</div><div class='add'>+</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		opt = ireq-&gt;ipv6_opt;</div><div class='ctx'> 		if (!opt)</div><div class='ctx'> 			opt = rcu_dereference(np-&gt;opt);</div><div class='del'>-		err = ip6_xmit(sk, skb, fl6, sk-&gt;sk_mark, opt, np-&gt;tclass);</div><div class='add'>+		err = ip6_xmit(sk, skb, fl6, skb-&gt;mark ? : READ_ONCE(sk-&gt;sk_mark),</div><div class='add'>+			       opt, tclass, READ_ONCE(sk-&gt;sk_priority));</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		err = net_xmit_eval(err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -515,38 +579,52 @@ done:</div><div class='ctx'> static void tcp_v6_reqsk_destructor(struct request_sock *req)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(inet_rsk(req)-&gt;ipv6_opt);</div><div class='del'>-	kfree_skb(inet_rsk(req)-&gt;pktopts);</div><div class='add'>+	consume_skb(inet_rsk(req)-&gt;pktopts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk,</div><div class='del'>-						   const struct in6_addr *addr)</div><div class='add'>+						   const struct in6_addr *addr,</div><div class='add'>+						   int l3index)</div><div class='ctx'> {</div><div class='del'>-	return tcp_md5_do_lookup(sk, (union tcp_md5_addr *)addr, AF_INET6);</div><div class='add'>+	return tcp_md5_do_lookup(sk, l3index,</div><div class='add'>+				 (union tcp_md5_addr *)addr, AF_INET6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tcp_md5sig_key *tcp_v6_md5_lookup(const struct sock *sk,</div><div class='ctx'> 						const struct sock *addr_sk)</div><div class='ctx'> {</div><div class='del'>-	return tcp_v6_md5_do_lookup(sk, &amp;addr_sk-&gt;sk_v6_daddr);</div><div class='add'>+	int l3index;</div><div class='add'>+</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk),</div><div class='add'>+						 addr_sk-&gt;sk_bound_dev_if);</div><div class='add'>+	return tcp_v6_md5_do_lookup(sk, &amp;addr_sk-&gt;sk_v6_daddr,</div><div class='add'>+				    l3index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tcp_v6_parse_md5_keys(struct sock *sk, int optname,</div><div class='del'>-				 char __user *optval, int optlen)</div><div class='add'>+				 sockptr_t optval, int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcp_md5sig cmd;</div><div class='ctx'> 	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&amp;cmd.tcpm_addr;</div><div class='add'>+	union tcp_ao_addr *addr;</div><div class='add'>+	int l3index = 0;</div><div class='ctx'> 	u8 prefixlen;</div><div class='add'>+	bool l3flag;</div><div class='add'>+	u8 flags;</div><div class='ctx'> </div><div class='ctx'> 	if (optlen &lt; sizeof(cmd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;cmd, optval, sizeof(cmd)))</div><div class='add'>+	if (copy_from_sockptr(&amp;cmd, optval, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (sin6-&gt;sin6_family != AF_INET6)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	flags = cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX;</div><div class='add'>+	l3flag = cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX;</div><div class='add'>+</div><div class='ctx'> 	if (optname == TCP_MD5SIG_EXT &amp;&amp;</div><div class='ctx'> 	    cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_PREFIX) {</div><div class='ctx'> 		prefixlen = cmd.tcpm_prefixlen;</div><div class='hunk'>@@ -557,94 +635,100 @@ static int tcp_v6_parse_md5_keys(struct sock *sk, int optname,</div><div class='ctx'> 		prefixlen = ipv6_addr_v4mapped(&amp;sin6-&gt;sin6_addr) ? 32 : 128;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (optname == TCP_MD5SIG_EXT &amp;&amp; cmd.tcpm_ifindex &amp;&amp;</div><div class='add'>+	    cmd.tcpm_flags &amp; TCP_MD5SIG_FLAG_IFINDEX) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		dev = dev_get_by_index_rcu(sock_net(sk), cmd.tcpm_ifindex);</div><div class='add'>+		if (dev &amp;&amp; netif_is_l3_master(dev))</div><div class='add'>+			l3index = dev-&gt;ifindex;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		/* ok to reference set/not set outside of rcu;</div><div class='add'>+		 * right now device MUST be an L3 master</div><div class='add'>+		 */</div><div class='add'>+		if (!dev || !l3index)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!cmd.tcpm_keylen) {</div><div class='ctx'> 		if (ipv6_addr_v4mapped(&amp;sin6-&gt;sin6_addr))</div><div class='ctx'> 			return tcp_md5_do_del(sk, (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr.s6_addr32[3],</div><div class='del'>-					      AF_INET, prefixlen);</div><div class='add'>+					      AF_INET, prefixlen,</div><div class='add'>+					      l3index, flags);</div><div class='ctx'> 		return tcp_md5_do_del(sk, (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr,</div><div class='del'>-				      AF_INET6, prefixlen);</div><div class='add'>+				      AF_INET6, prefixlen, l3index, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cmd.tcpm_keylen &gt; TCP_MD5SIG_MAXKEYLEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ipv6_addr_v4mapped(&amp;sin6-&gt;sin6_addr))</div><div class='del'>-		return tcp_md5_do_add(sk, (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr.s6_addr32[3],</div><div class='del'>-				      AF_INET, prefixlen, cmd.tcpm_key,</div><div class='del'>-				      cmd.tcpm_keylen, GFP_KERNEL);</div><div class='add'>+	if (ipv6_addr_v4mapped(&amp;sin6-&gt;sin6_addr)) {</div><div class='add'>+		addr = (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr.s6_addr32[3];</div><div class='ctx'> </div><div class='del'>-	return tcp_md5_do_add(sk, (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr,</div><div class='del'>-			      AF_INET6, prefixlen, cmd.tcpm_key,</div><div class='del'>-			      cmd.tcpm_keylen, GFP_KERNEL);</div><div class='add'>+		/* Don't allow keys for peers that have a matching TCP-AO key.</div><div class='add'>+		 * See the comment in tcp_ao_add_cmd()</div><div class='add'>+		 */</div><div class='add'>+		if (tcp_ao_required(sk, addr, AF_INET,</div><div class='add'>+				    l3flag ? l3index : -1, false))</div><div class='add'>+			return -EKEYREJECTED;</div><div class='add'>+		return tcp_md5_do_add(sk, addr,</div><div class='add'>+				      AF_INET, prefixlen, l3index, flags,</div><div class='add'>+				      cmd.tcpm_key, cmd.tcpm_keylen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = (union tcp_md5_addr *)&amp;sin6-&gt;sin6_addr;</div><div class='add'>+</div><div class='add'>+	/* Don't allow keys for peers that have a matching TCP-AO key.</div><div class='add'>+	 * See the comment in tcp_ao_add_cmd()</div><div class='add'>+	 */</div><div class='add'>+	if (tcp_ao_required(sk, addr, AF_INET6, l3flag ? l3index : -1, false))</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	return tcp_md5_do_add(sk, addr, AF_INET6, prefixlen, l3index, flags,</div><div class='add'>+			      cmd.tcpm_key, cmd.tcpm_keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_md5_hash_headers(struct tcp_md5sig_pool *hp,</div><div class='del'>-				   const struct in6_addr *daddr,</div><div class='del'>-				   const struct in6_addr *saddr,</div><div class='del'>-				   const struct tcphdr *th, int nbytes)</div><div class='add'>+static void tcp_v6_md5_hash_headers(struct md5_ctx *ctx,</div><div class='add'>+				    const struct in6_addr *daddr,</div><div class='add'>+				    const struct in6_addr *saddr,</div><div class='add'>+				    const struct tcphdr *th, int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct tcp6_pseudohdr *bp;</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-	struct tcphdr *_th;</div><div class='del'>-</div><div class='del'>-	bp = hp-&gt;scratch;</div><div class='del'>-	/* 1. TCP pseudo-header (RFC2460) */</div><div class='del'>-	bp-&gt;saddr = *saddr;</div><div class='del'>-	bp-&gt;daddr = *daddr;</div><div class='del'>-	bp-&gt;protocol = cpu_to_be32(IPPROTO_TCP);</div><div class='del'>-	bp-&gt;len = cpu_to_be32(nbytes);</div><div class='del'>-</div><div class='del'>-	_th = (struct tcphdr *)(bp + 1);</div><div class='del'>-	memcpy(_th, th, sizeof(*th));</div><div class='del'>-	_th-&gt;check = 0;</div><div class='del'>-</div><div class='del'>-	sg_init_one(&amp;sg, bp, sizeof(*bp) + sizeof(*th));</div><div class='del'>-	ahash_request_set_crypt(hp-&gt;md5_req, &amp;sg, NULL,</div><div class='del'>-				sizeof(*bp) + sizeof(*th));</div><div class='del'>-	return crypto_ahash_update(hp-&gt;md5_req);</div><div class='add'>+	struct {</div><div class='add'>+		struct tcp6_pseudohdr ip; /* TCP pseudo-header (RFC2460) */</div><div class='add'>+		struct tcphdr tcp;</div><div class='add'>+	} h;</div><div class='add'>+</div><div class='add'>+	h.ip.saddr = *saddr;</div><div class='add'>+	h.ip.daddr = *daddr;</div><div class='add'>+	h.ip.protocol = cpu_to_be32(IPPROTO_TCP);</div><div class='add'>+	h.ip.len = cpu_to_be32(nbytes);</div><div class='add'>+	h.tcp = *th;</div><div class='add'>+	h.tcp.check = 0;</div><div class='add'>+	md5_update(ctx, (const u8 *)&amp;h, sizeof(h.ip) + sizeof(h.tcp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='del'>-			       const struct in6_addr *daddr, struct in6_addr *saddr,</div><div class='del'>-			       const struct tcphdr *th)</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+tcp_v6_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='add'>+		    const struct in6_addr *daddr, struct in6_addr *saddr,</div><div class='add'>+		    const struct tcphdr *th)</div><div class='ctx'> {</div><div class='del'>-	struct tcp_md5sig_pool *hp;</div><div class='del'>-	struct ahash_request *req;</div><div class='del'>-</div><div class='del'>-	hp = tcp_get_md5sig_pool();</div><div class='del'>-	if (!hp)</div><div class='del'>-		goto clear_hash_noput;</div><div class='del'>-	req = hp-&gt;md5_req;</div><div class='del'>-</div><div class='del'>-	if (crypto_ahash_init(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_v6_md5_hash_headers(hp, daddr, saddr, th, th-&gt;doff &lt;&lt; 2))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_key(hp, key))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	ahash_request_set_crypt(req, NULL, md5_hash, 0);</div><div class='del'>-	if (crypto_ahash_final(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-	return 0;</div><div class='add'>+	struct md5_ctx ctx;</div><div class='ctx'> </div><div class='del'>-clear_hash:</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-clear_hash_noput:</div><div class='del'>-	memset(md5_hash, 0, 16);</div><div class='del'>-	return 1;</div><div class='add'>+	md5_init(&amp;ctx);</div><div class='add'>+	tcp_v6_md5_hash_headers(&amp;ctx, daddr, saddr, th, th-&gt;doff &lt;&lt; 2);</div><div class='add'>+	tcp_md5_hash_key(&amp;ctx, key);</div><div class='add'>+	md5_final(&amp;ctx, md5_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_md5_hash_skb(char *md5_hash,</div><div class='del'>-			       const struct tcp_md5sig_key *key,</div><div class='del'>-			       const struct sock *sk,</div><div class='del'>-			       const struct sk_buff *skb)</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+tcp_v6_md5_hash_skb(char *md5_hash, const struct tcp_md5sig_key *key,</div><div class='add'>+		    const struct sock *sk, const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	const struct in6_addr *saddr, *daddr;</div><div class='del'>-	struct tcp_md5sig_pool *hp;</div><div class='del'>-	struct ahash_request *req;</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	const struct in6_addr *saddr, *daddr;</div><div class='add'>+	struct md5_ctx ctx;</div><div class='ctx'> </div><div class='ctx'> 	if (sk) { /* valid for establish/request sockets */</div><div class='ctx'> 		saddr = &amp;sk-&gt;sk_v6_rcv_saddr;</div><div class='hunk'>@@ -655,131 +739,77 @@ static int tcp_v6_md5_hash_skb(char *md5_hash,</div><div class='ctx'> 		daddr = &amp;ip6h-&gt;daddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp = tcp_get_md5sig_pool();</div><div class='del'>-	if (!hp)</div><div class='del'>-		goto clear_hash_noput;</div><div class='del'>-	req = hp-&gt;md5_req;</div><div class='del'>-</div><div class='del'>-	if (crypto_ahash_init(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	if (tcp_v6_md5_hash_headers(hp, daddr, saddr, th, skb-&gt;len))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_skb_data(hp, skb, th-&gt;doff &lt;&lt; 2))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	if (tcp_md5_hash_key(hp, key))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-	ahash_request_set_crypt(req, NULL, md5_hash, 0);</div><div class='del'>-	if (crypto_ahash_final(req))</div><div class='del'>-		goto clear_hash;</div><div class='del'>-</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-clear_hash:</div><div class='del'>-	tcp_put_md5sig_pool();</div><div class='del'>-clear_hash_noput:</div><div class='del'>-	memset(md5_hash, 0, 16);</div><div class='del'>-	return 1;</div><div class='add'>+	md5_init(&amp;ctx);</div><div class='add'>+	tcp_v6_md5_hash_headers(&amp;ctx, daddr, saddr, th, skb-&gt;len);</div><div class='add'>+	tcp_md5_hash_skb_data(&amp;ctx, skb, th-&gt;doff &lt;&lt; 2);</div><div class='add'>+	tcp_md5_hash_key(&amp;ctx, key);</div><div class='add'>+	md5_final(&amp;ctx, md5_hash);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool tcp_v6_inbound_md5_hash(const struct sock *sk,</div><div class='del'>-				    const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	const __u8 *hash_location = NULL;</div><div class='del'>-	struct tcp_md5sig_key *hash_expected;</div><div class='del'>-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='del'>-	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	int genhash;</div><div class='del'>-	u8 newhash[16];</div><div class='del'>-</div><div class='del'>-	hash_expected = tcp_v6_md5_do_lookup(sk, &amp;ip6h-&gt;saddr);</div><div class='del'>-	hash_location = tcp_parse_md5sig_option(th);</div><div class='del'>-</div><div class='del'>-	/* We've parsed the options - do we have a hash? */</div><div class='del'>-	if (!hash_expected &amp;&amp; !hash_location)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (hash_expected &amp;&amp; !hash_location) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hash_expected &amp;&amp; hash_location) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check the signature */</div><div class='del'>-	genhash = tcp_v6_md5_hash_skb(newhash,</div><div class='del'>-				      hash_expected,</div><div class='del'>-				      NULL, skb);</div><div class='del'>-</div><div class='del'>-	if (genhash || memcmp(hash_location, newhash, 16) != 0) {</div><div class='del'>-		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5FAILURE);</div><div class='del'>-		net_info_ratelimited("MD5 Hash %s for [%pI6c]:%u-&gt;[%pI6c]:%u\n",</div><div class='del'>-				     genhash ? "failed" : "mismatch",</div><div class='del'>-				     &amp;ip6h-&gt;saddr, ntohs(th-&gt;source),</div><div class='del'>-				     &amp;ip6h-&gt;daddr, ntohs(th-&gt;dest));</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void tcp_v6_init_req(struct request_sock *req,</div><div class='ctx'> 			    const struct sock *sk_listener,</div><div class='del'>-			    struct sk_buff *skb)</div><div class='add'>+			    struct sk_buff *skb,</div><div class='add'>+			    u32 tw_isn)</div><div class='ctx'> {</div><div class='add'>+	bool l3_slave = ipv6_l3mdev_skb(TCP_SKB_CB(skb)-&gt;header.h6.flags);</div><div class='ctx'> 	struct inet_request_sock *ireq = inet_rsk(req);</div><div class='del'>-	const struct ipv6_pinfo *np = inet6_sk(sk_listener);</div><div class='add'>+	const struct ipv6_pinfo *np = tcp_inet6_sk(sk_listener);</div><div class='ctx'> </div><div class='ctx'> 	ireq-&gt;ir_v6_rmt_addr = ipv6_hdr(skb)-&gt;saddr;</div><div class='ctx'> 	ireq-&gt;ir_v6_loc_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+	ireq-&gt;ir_rmt_addr = LOOPBACK4_IPV6;</div><div class='add'>+	ireq-&gt;ir_loc_addr = LOOPBACK4_IPV6;</div><div class='ctx'> </div><div class='ctx'> 	/* So that link locals have meaning */</div><div class='del'>-	if (!sk_listener-&gt;sk_bound_dev_if &amp;&amp;</div><div class='add'>+	if ((!sk_listener-&gt;sk_bound_dev_if || l3_slave) &amp;&amp;</div><div class='ctx'> 	    ipv6_addr_type(&amp;ireq-&gt;ir_v6_rmt_addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='ctx'> 		ireq-&gt;ir_iif = tcp_v6_iif(skb);</div><div class='ctx'> </div><div class='del'>-	if (!TCP_SKB_CB(skb)-&gt;tcp_tw_isn &amp;&amp;</div><div class='add'>+	if (!tw_isn &amp;&amp;</div><div class='ctx'> 	    (ipv6_opt_accepted(sk_listener, skb, &amp;TCP_SKB_CB(skb)-&gt;header.h6) ||</div><div class='ctx'> 	     np-&gt;rxopt.bits.rxinfo ||</div><div class='ctx'> 	     np-&gt;rxopt.bits.rxoinfo || np-&gt;rxopt.bits.rxhlim ||</div><div class='del'>-	     np-&gt;rxopt.bits.rxohlim || np-&gt;repflow)) {</div><div class='add'>+	     np-&gt;rxopt.bits.rxohlim || inet6_test_bit(REPFLOW, sk_listener))) {</div><div class='ctx'> 		refcount_inc(&amp;skb-&gt;users);</div><div class='ctx'> 		ireq-&gt;pktopts = skb;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dst_entry *tcp_v6_route_req(const struct sock *sk,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='ctx'> 					  struct flowi *fl,</div><div class='del'>-					  const struct request_sock *req)</div><div class='add'>+					  struct request_sock *req,</div><div class='add'>+					  u32 tw_isn)</div><div class='ctx'> {</div><div class='add'>+	tcp_v6_init_req(req, sk, skb, tw_isn);</div><div class='add'>+</div><div class='add'>+	if (security_inet_conn_request(sk, skb, req))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	return inet6_csk_route_req(sk, &amp;fl-&gt;u.ip6, req, IPPROTO_TCP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct request_sock_ops tcp6_request_sock_ops __read_mostly = {</div><div class='ctx'> 	.family		=	AF_INET6,</div><div class='ctx'> 	.obj_size	=	sizeof(struct tcp6_request_sock),</div><div class='del'>-	.rtx_syn_ack	=	tcp_rtx_synack,</div><div class='ctx'> 	.send_ack	=	tcp_v6_reqsk_send_ack,</div><div class='ctx'> 	.destructor	=	tcp_v6_reqsk_destructor,</div><div class='ctx'> 	.send_reset	=	tcp_v6_send_reset,</div><div class='del'>-	.syn_ack_timeout =	tcp_syn_ack_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {</div><div class='add'>+const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {</div><div class='ctx'> 	.mss_clamp	=	IPV6_MIN_MTU - sizeof(struct tcphdr) -</div><div class='ctx'> 				sizeof(struct ipv6hdr),</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	.req_md5_lookup	=	tcp_v6_md5_lookup,</div><div class='ctx'> 	.calc_md5_hash	=	tcp_v6_md5_hash_skb,</div><div class='ctx'> #endif</div><div class='del'>-	.init_req	=	tcp_v6_init_req,</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	.ao_lookup	=	tcp_v6_ao_lookup_rsk,</div><div class='add'>+	.ao_calc_key	=	tcp_v6_ao_calc_key_rsk,</div><div class='add'>+	.ao_synack_hash =	tcp_v6_ao_synack_hash,</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SYN_COOKIES</div><div class='ctx'> 	.cookie_init_seq =	cookie_v6_init_sequence,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -791,33 +821,41 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {</div><div class='ctx'> </div><div class='ctx'> static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 seq,</div><div class='ctx'> 				 u32 ack, u32 win, u32 tsval, u32 tsecr,</div><div class='del'>-				 int oif, struct tcp_md5sig_key *key, int rst,</div><div class='del'>-				 u8 tclass, __be32 label)</div><div class='add'>+				 int oif, int rst, u8 tclass, __be32 label,</div><div class='add'>+				 u32 priority, u32 txhash, struct tcp_key *key)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = sk ? sock_net(sk) : skb_dst_dev_net_rcu(skb);</div><div class='add'>+	unsigned int tot_len = sizeof(struct tcphdr);</div><div class='add'>+	struct sock *ctl_sk = net-&gt;ipv6.tcp_sk;</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='del'>-	struct tcphdr *t1;</div><div class='add'>+	__be32 mrst = 0, *topt;</div><div class='add'>+	struct dst_entry *dst;</div><div class='ctx'> 	struct sk_buff *buff;</div><div class='add'>+	struct tcphdr *t1;</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='del'>-	struct net *net = sk ? sock_net(sk) : dev_net(skb_dst(skb)-&gt;dev);</div><div class='del'>-	struct sock *ctl_sk = net-&gt;ipv6.tcp_sk;</div><div class='del'>-	unsigned int tot_len = sizeof(struct tcphdr);</div><div class='del'>-	struct dst_entry *dst;</div><div class='del'>-	__be32 *topt;</div><div class='del'>-	__u32 mark = 0;</div><div class='add'>+	u32 mark = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tsecr)</div><div class='ctx'> 		tot_len += TCPOLEN_TSTAMP_ALIGNED;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (key)</div><div class='add'>+	if (tcp_key_is_md5(key))</div><div class='ctx'> 		tot_len += TCPOLEN_MD5SIG_ALIGNED;</div><div class='add'>+	if (tcp_key_is_ao(key))</div><div class='add'>+		tot_len += tcp_ao_len_aligned(key-&gt;ao_key);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MPTCP</div><div class='add'>+	if (rst &amp;&amp; !tcp_key_is_md5(key)) {</div><div class='add'>+		mrst = mptcp_reset_option(skb);</div><div class='add'>+</div><div class='add'>+		if (mrst)</div><div class='add'>+			tot_len += sizeof(__be32);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len,</div><div class='del'>-			 GFP_ATOMIC);</div><div class='add'>+	buff = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);</div><div class='ctx'> 	if (!buff)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);</div><div class='add'>+	skb_reserve(buff, MAX_TCP_HEADER);</div><div class='ctx'> </div><div class='ctx'> 	t1 = skb_push(buff, tot_len);</div><div class='ctx'> 	skb_reset_transport_header(buff);</div><div class='hunk'>@@ -842,15 +880,32 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32</div><div class='ctx'> 		*topt++ = htonl(tsecr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mrst)</div><div class='add'>+		*topt++ = mrst;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	if (key) {</div><div class='add'>+	if (tcp_key_is_md5(key)) {</div><div class='ctx'> 		*topt++ = htonl((TCPOPT_NOP &lt;&lt; 24) | (TCPOPT_NOP &lt;&lt; 16) |</div><div class='ctx'> 				(TCPOPT_MD5SIG &lt;&lt; 8) | TCPOLEN_MD5SIG);</div><div class='del'>-		tcp_v6_md5_hash_hdr((__u8 *)topt, key,</div><div class='add'>+		tcp_v6_md5_hash_hdr((__u8 *)topt, key-&gt;md5_key,</div><div class='ctx'> 				    &amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='ctx'> 				    &amp;ipv6_hdr(skb)-&gt;daddr, t1);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (tcp_key_is_ao(key)) {</div><div class='add'>+		*topt++ = htonl((TCPOPT_AO &lt;&lt; 24) |</div><div class='add'>+				(tcp_ao_len(key-&gt;ao_key) &lt;&lt; 16) |</div><div class='add'>+				(key-&gt;ao_key-&gt;sndid &lt;&lt; 8) |</div><div class='add'>+				(key-&gt;rcv_next));</div><div class='add'>+</div><div class='add'>+		tcp_ao_hash_hdr(AF_INET6, (char *)topt, key-&gt;ao_key,</div><div class='add'>+				key-&gt;traffic_key,</div><div class='add'>+				(union tcp_ao_addr *)&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='add'>+				(union tcp_ao_addr *)&amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+				t1, key-&gt;sne);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> 	fl6.daddr = ipv6_hdr(skb)-&gt;saddr;</div><div class='hunk'>@@ -858,7 +913,6 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32</div><div class='ctx'> 	fl6.flowlabel = label;</div><div class='ctx'> </div><div class='ctx'> 	buff-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='del'>-	buff-&gt;csum = 0;</div><div class='ctx'> </div><div class='ctx'> 	__tcp_v6_send_check(buff, &amp;fl6.saddr, &amp;fl6.daddr);</div><div class='ctx'> </div><div class='hunk'>@@ -872,23 +926,39 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32</div><div class='ctx'> 		fl6.flowi6_oif = oif;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sk)</div><div class='del'>-		mark = (sk-&gt;sk_state == TCP_TIME_WAIT) ?</div><div class='del'>-			inet_twsk(sk)-&gt;tw_mark : sk-&gt;sk_mark;</div><div class='add'>+	if (sk) {</div><div class='add'>+		/* unconstify the socket only to attach it to buff with care. */</div><div class='add'>+		skb_set_owner_edemux(buff, (struct sock *)sk);</div><div class='add'>+		psp_reply_set_decrypted(sk, buff);</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='add'>+			mark = inet_twsk(sk)-&gt;tw_mark;</div><div class='add'>+		else</div><div class='add'>+			mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+		skb_set_delivery_time(buff, tcp_transmit_time(sk), SKB_CLOCK_MONOTONIC);</div><div class='add'>+	}</div><div class='add'>+	if (txhash) {</div><div class='add'>+		/* autoflowlabel/skb_get_hash_flowi6 rely on buff-&gt;hash */</div><div class='add'>+		skb_set_hash(buff, txhash, PKT_HASH_TYPE_L4);</div><div class='add'>+	}</div><div class='ctx'> 	fl6.flowi6_mark = IP6_REPLY_MARK(net, skb-&gt;mark) ?: mark;</div><div class='ctx'> 	fl6.fl6_dport = t1-&gt;dest;</div><div class='ctx'> 	fl6.fl6_sport = t1-&gt;source;</div><div class='ctx'> 	fl6.flowi6_uid = sock_net_uid(net, sk &amp;&amp; sk_fullsock(sk) ? sk : NULL);</div><div class='del'>-	security_skb_classify_flow(skb, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	security_skb_classify_flow(skb, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='ctx'> 	/* Pass a socket to ip6_dst_lookup either it is for RST</div><div class='ctx'> 	 * Underlying function will use this to retrieve the network</div><div class='ctx'> 	 * namespace</div><div class='ctx'> 	 */</div><div class='del'>-	dst = ip6_dst_lookup_flow(ctl_sk, &amp;fl6, NULL);</div><div class='add'>+	if (sk &amp;&amp; sk-&gt;sk_state != TCP_TIME_WAIT)</div><div class='add'>+		dst = ip6_dst_lookup_flow(net, sk, &amp;fl6, NULL); /*sk's xfrm_policy can be referred*/</div><div class='add'>+	else</div><div class='add'>+		dst = ip6_dst_lookup_flow(net, ctl_sk, &amp;fl6, NULL);</div><div class='ctx'> 	if (!IS_ERR(dst)) {</div><div class='ctx'> 		skb_dst_set(buff, dst);</div><div class='del'>-		ip6_xmit(ctl_sk, buff, &amp;fl6, fl6.flowi6_mark, NULL, tclass);</div><div class='add'>+		ip6_xmit(ctl_sk, buff, &amp;fl6, fl6.flowi6_mark, NULL,</div><div class='add'>+			 tclass, priority);</div><div class='ctx'> 		TCP_INC_STATS(net, TCP_MIB_OUTSEGS);</div><div class='ctx'> 		if (rst)</div><div class='ctx'> 			TCP_INC_STATS(net, TCP_MIB_OUTRSTS);</div><div class='hunk'>@@ -898,19 +968,27 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32</div><div class='ctx'> 	kfree_skb(buff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			      enum sk_rst_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='add'>+	const __u8 *md5_hash_location = NULL;</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='add'>+	bool allocated_traffic_key = false;</div><div class='add'>+#endif</div><div class='add'>+	const struct tcp_ao_hdr *aoh;</div><div class='add'>+	struct tcp_key key = {};</div><div class='ctx'> 	u32 seq = 0, ack_seq = 0;</div><div class='del'>-	struct tcp_md5sig_key *key = NULL;</div><div class='add'>+	__be32 label = 0;</div><div class='add'>+	u32 priority = 0;</div><div class='add'>+	struct net *net;</div><div class='add'>+	u32 txhash = 0;</div><div class='add'>+	int oif = 0;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	const __u8 *hash_location = NULL;</div><div class='del'>-	struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 	unsigned char newhash[16];</div><div class='del'>-	int genhash;</div><div class='ctx'> 	struct sock *sk1 = NULL;</div><div class='ctx'> #endif</div><div class='del'>-	int oif = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (th-&gt;rst)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -921,12 +999,29 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (!sk &amp;&amp; !ipv6_unicast_destination(skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	net = sk ? sock_net(sk) : skb_dst_dev_net_rcu(skb);</div><div class='add'>+	/* Invalid TCP option size or twice included auth */</div><div class='add'>+	if (tcp_parse_auth_options(th, &amp;md5_hash_location, &amp;aoh))</div><div class='add'>+		return;</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hash_location = tcp_parse_md5sig_option(th);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	if (sk &amp;&amp; sk_fullsock(sk)) {</div><div class='del'>-		key = tcp_v6_md5_do_lookup(sk, &amp;ipv6h-&gt;saddr);</div><div class='del'>-	} else if (hash_location) {</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		/* sdif set, means packet ingressed via a device</div><div class='add'>+		 * in an L3 domain and inet_iif is set to it.</div><div class='add'>+		 */</div><div class='add'>+		l3index = tcp_v6_sdif(skb) ? tcp_v6_iif_l3_slave(skb) : 0;</div><div class='add'>+		key.md5_key = tcp_v6_md5_do_lookup(sk, &amp;ipv6h-&gt;saddr, l3index);</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+	} else if (md5_hash_location) {</div><div class='add'>+		int dif = tcp_v6_iif_l3_slave(skb);</div><div class='add'>+		int sdif = tcp_v6_sdif(skb);</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * active side is lost. Try to find listening socket through</div><div class='ctx'> 		 * source port, and then find md5 key through listening socket.</div><div class='hunk'>@@ -934,22 +1029,24 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * Incoming packet is checked with md5 hash with finding key,</div><div class='ctx'> 		 * no RST generated if md5 hash doesn't match.</div><div class='ctx'> 		 */</div><div class='del'>-		sk1 = inet6_lookup_listener(dev_net(skb_dst(skb)-&gt;dev),</div><div class='del'>-					   &amp;tcp_hashinfo, NULL, 0,</div><div class='del'>-					   &amp;ipv6h-&gt;saddr,</div><div class='del'>-					   th-&gt;source, &amp;ipv6h-&gt;daddr,</div><div class='del'>-					   ntohs(th-&gt;source),</div><div class='del'>-					   tcp_v6_iif_l3_slave(skb),</div><div class='del'>-					   tcp_v6_sdif(skb));</div><div class='add'>+		sk1 = inet6_lookup_listener(net, NULL, 0, &amp;ipv6h-&gt;saddr, th-&gt;source,</div><div class='add'>+					    &amp;ipv6h-&gt;daddr, ntohs(th-&gt;source),</div><div class='add'>+					    dif, sdif);</div><div class='ctx'> 		if (!sk1)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		key = tcp_v6_md5_do_lookup(sk1, &amp;ipv6h-&gt;saddr);</div><div class='del'>-		if (!key)</div><div class='add'>+		/* sdif set, means packet ingressed via a device</div><div class='add'>+		 * in an L3 domain and dif is set to it.</div><div class='add'>+		 */</div><div class='add'>+		l3index = tcp_v6_sdif(skb) ? dif : 0;</div><div class='add'>+</div><div class='add'>+		key.md5_key = tcp_v6_md5_do_lookup(sk1, &amp;ipv6h-&gt;saddr, l3index);</div><div class='add'>+		if (!key.md5_key)</div><div class='ctx'> 			goto out;</div><div class='add'>+		key.type = TCP_KEY_MD5;</div><div class='ctx'> </div><div class='del'>-		genhash = tcp_v6_md5_hash_skb(newhash, key, NULL, skb);</div><div class='del'>-		if (genhash || memcmp(hash_location, newhash, 16) != 0)</div><div class='add'>+		tcp_v6_md5_hash_skb(newhash, key.md5_key, NULL, skb);</div><div class='add'>+		if (memcmp(md5_hash_location, newhash, 16) != 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -960,62 +1057,198 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		ack_seq = ntohl(th-&gt;seq) + th-&gt;syn + th-&gt;fin + skb-&gt;len -</div><div class='ctx'> 			  (th-&gt;doff &lt;&lt; 2);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (aoh) {</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		l3index = tcp_v6_sdif(skb) ? tcp_v6_iif_l3_slave(skb) : 0;</div><div class='add'>+		if (tcp_ao_prepare_reset(sk, skb, aoh, l3index, seq,</div><div class='add'>+					 &amp;key.ao_key, &amp;key.traffic_key,</div><div class='add'>+					 &amp;allocated_traffic_key,</div><div class='add'>+					 &amp;key.rcv_next, &amp;key.sne))</div><div class='add'>+			goto out;</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		oif = sk-&gt;sk_bound_dev_if;</div><div class='del'>-		if (sk_fullsock(sk))</div><div class='del'>-			trace_tcp_send_reset(sk, skb);</div><div class='add'>+		if (sk_fullsock(sk)) {</div><div class='add'>+			if (inet6_test_bit(REPFLOW, sk))</div><div class='add'>+				label = ip6_flowlabel(ipv6h);</div><div class='add'>+			priority = READ_ONCE(sk-&gt;sk_priority);</div><div class='add'>+			txhash = sk-&gt;sk_txhash;</div><div class='add'>+		}</div><div class='add'>+		if (sk-&gt;sk_state == TCP_TIME_WAIT) {</div><div class='add'>+			label = cpu_to_be32(inet_twsk(sk)-&gt;tw_flowlabel);</div><div class='add'>+			priority = inet_twsk(sk)-&gt;tw_priority;</div><div class='add'>+			txhash = inet_twsk(sk)-&gt;tw_txhash;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (net-&gt;ipv6.sysctl.flowlabel_reflect &amp; FLOWLABEL_REFLECT_TCP_RESET)</div><div class='add'>+			label = ip6_flowlabel(ipv6h);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0, 0);</div><div class='add'>+	trace_tcp_send_reset(sk, skb, reason);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, 1,</div><div class='add'>+			     ipv6_get_dsfield(ipv6h) &amp; ~INET_ECN_MASK,</div><div class='add'>+			     label, priority, txhash,</div><div class='add'>+			     &amp;key);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> out:</div><div class='add'>+	if (allocated_traffic_key)</div><div class='add'>+		kfree(key.traffic_key);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_v6_send_ack(const struct sock *sk, struct sk_buff *skb, u32 seq,</div><div class='ctx'> 			    u32 ack, u32 win, u32 tsval, u32 tsecr, int oif,</div><div class='del'>-			    struct tcp_md5sig_key *key, u8 tclass,</div><div class='del'>-			    __be32 label)</div><div class='add'>+			    struct tcp_key *key, u8 tclass,</div><div class='add'>+			    __be32 label, u32 priority, u32 txhash)</div><div class='ctx'> {</div><div class='del'>-	tcp_v6_send_response(sk, skb, seq, ack, win, tsval, tsecr, oif, key, 0,</div><div class='del'>-			     tclass, label);</div><div class='add'>+	tcp_v6_send_response(sk, skb, seq, ack, win, tsval, tsecr, oif, 0,</div><div class='add'>+			     tclass, label, priority, txhash, key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				enum tcp_tw_status tw_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_timewait_sock *tw = inet_twsk(sk);</div><div class='ctx'> 	struct tcp_timewait_sock *tcptw = tcp_twsk(sk);</div><div class='add'>+	u8 tclass = tw-&gt;tw_tclass;</div><div class='add'>+	struct tcp_key key = {};</div><div class='add'>+</div><div class='add'>+	if (tw_status == TCP_TW_ACK_OOW)</div><div class='add'>+		tclass &amp;= ~INET_ECN_MASK;</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	struct tcp_ao_info *ao_info;</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_ao_needed.key)) {</div><div class='add'>+</div><div class='add'>+		/* FIXME: the segment to-be-acked is not verified yet */</div><div class='add'>+		ao_info = rcu_dereference(tcptw-&gt;ao_info);</div><div class='add'>+		if (ao_info) {</div><div class='add'>+			const struct tcp_ao_hdr *aoh;</div><div class='add'>+</div><div class='add'>+			/* Invalid TCP option size or twice included auth */</div><div class='add'>+			if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &amp;aoh))</div><div class='add'>+				goto out;</div><div class='add'>+			if (aoh)</div><div class='add'>+				key.ao_key = tcp_ao_established_key(sk, ao_info,</div><div class='add'>+								    aoh-&gt;rnext_keyid, -1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (key.ao_key) {</div><div class='add'>+		struct tcp_ao_key *rnext_key;</div><div class='add'>+</div><div class='add'>+		key.traffic_key = snd_other_key(key.ao_key);</div><div class='add'>+		/* rcv_next switches to our rcv_next */</div><div class='add'>+		rnext_key = READ_ONCE(ao_info-&gt;rnext_key);</div><div class='add'>+		key.rcv_next = rnext_key-&gt;rcvid;</div><div class='add'>+		key.sne = READ_ONCE(ao_info-&gt;snd_sne);</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+#else</div><div class='add'>+	if (0) {</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	} else if (static_branch_unlikely(&amp;tcp_md5_needed.key)) {</div><div class='add'>+		key.md5_key = tcp_twsk_md5_key(tcptw);</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	tcp_v6_send_ack(sk, skb, tcptw-&gt;tw_snd_nxt, tcptw-&gt;tw_rcv_nxt,</div><div class='add'>+	tcp_v6_send_ack(sk, skb, tcptw-&gt;tw_snd_nxt,</div><div class='add'>+			READ_ONCE(tcptw-&gt;tw_rcv_nxt),</div><div class='ctx'> 			tcptw-&gt;tw_rcv_wnd &gt;&gt; tw-&gt;tw_rcv_wscale,</div><div class='del'>-			tcp_time_stamp_raw() + tcptw-&gt;tw_ts_offset,</div><div class='del'>-			tcptw-&gt;tw_ts_recent, tw-&gt;tw_bound_dev_if, tcp_twsk_md5_key(tcptw),</div><div class='del'>-			tw-&gt;tw_tclass, cpu_to_be32(tw-&gt;tw_flowlabel));</div><div class='add'>+			tcp_tw_tsval(tcptw),</div><div class='add'>+			READ_ONCE(tcptw-&gt;tw_ts_recent), tw-&gt;tw_bound_dev_if,</div><div class='add'>+			&amp;key, tclass, cpu_to_be32(tw-&gt;tw_flowlabel),</div><div class='add'>+			tw-&gt;tw_priority, tw-&gt;tw_txhash);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='ctx'> 	inet_twsk_put(tw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				  struct request_sock *req)</div><div class='ctx'> {</div><div class='add'>+	struct tcp_key key = {};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	if (static_branch_unlikely(&amp;tcp_ao_needed.key) &amp;&amp;</div><div class='add'>+	    tcp_rsk_used_ao(req)) {</div><div class='add'>+		const struct in6_addr *addr = &amp;ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+		const struct tcp_ao_hdr *aoh;</div><div class='add'>+		int l3index;</div><div class='add'>+</div><div class='add'>+		l3index = tcp_v6_sdif(skb) ? tcp_v6_iif_l3_slave(skb) : 0;</div><div class='add'>+		/* Invalid TCP option size or twice included auth */</div><div class='add'>+		if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &amp;aoh))</div><div class='add'>+			return;</div><div class='add'>+		if (!aoh)</div><div class='add'>+			return;</div><div class='add'>+		key.ao_key = tcp_ao_do_lookup(sk, l3index,</div><div class='add'>+					      (union tcp_ao_addr *)addr,</div><div class='add'>+					      AF_INET6, aoh-&gt;rnext_keyid, -1);</div><div class='add'>+		if (unlikely(!key.ao_key)) {</div><div class='add'>+			/* Send ACK with any matching MKT for the peer */</div><div class='add'>+			key.ao_key = tcp_ao_do_lookup(sk, l3index,</div><div class='add'>+						      (union tcp_ao_addr *)addr,</div><div class='add'>+						      AF_INET6, -1, -1);</div><div class='add'>+			/* Matching key disappeared (user removed the key?)</div><div class='add'>+			 * let the handshake timeout.</div><div class='add'>+			 */</div><div class='add'>+			if (!key.ao_key) {</div><div class='add'>+				net_info_ratelimited("TCP-AO key for (%pI6, %d)-&gt;(%pI6, %d) suddenly disappeared, won't ACK new connection\n",</div><div class='add'>+						     addr,</div><div class='add'>+						     ntohs(tcp_hdr(skb)-&gt;source),</div><div class='add'>+						     &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='add'>+						     ntohs(tcp_hdr(skb)-&gt;dest));</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		key.traffic_key = kmalloc(tcp_ao_digest_size(key.ao_key), GFP_ATOMIC);</div><div class='add'>+		if (!key.traffic_key)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		key.type = TCP_KEY_AO;</div><div class='add'>+		key.rcv_next = aoh-&gt;keyid;</div><div class='add'>+		tcp_v6_ao_calc_key_rsk(key.ao_key, key.traffic_key, req);</div><div class='add'>+#else</div><div class='add'>+	if (0) {</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+	} else if (static_branch_unlikely(&amp;tcp_md5_needed.key)) {</div><div class='add'>+		int l3index = tcp_v6_sdif(skb) ? tcp_v6_iif_l3_slave(skb) : 0;</div><div class='add'>+</div><div class='add'>+		key.md5_key = tcp_v6_md5_do_lookup(sk, &amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='add'>+						   l3index);</div><div class='add'>+		if (key.md5_key)</div><div class='add'>+			key.type = TCP_KEY_MD5;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* sk-&gt;sk_state == TCP_LISTEN -&gt; for regular TCP_SYN_RECV</div><div class='ctx'> 	 * sk-&gt;sk_state == TCP_SYN_RECV -&gt; for Fast Open.</div><div class='ctx'> 	 */</div><div class='del'>-	/* RFC 7323 2.3</div><div class='del'>-	 * The window field (SEG.WND) of every outgoing segment, with the</div><div class='del'>-	 * exception of &lt;SYN&gt; segments, MUST be right-shifted by</div><div class='del'>-	 * Rcv.Wind.Shift bits:</div><div class='del'>-	 */</div><div class='ctx'> 	tcp_v6_send_ack(sk, skb, (sk-&gt;sk_state == TCP_LISTEN) ?</div><div class='ctx'> 			tcp_rsk(req)-&gt;snt_isn + 1 : tcp_sk(sk)-&gt;snd_nxt,</div><div class='ctx'> 			tcp_rsk(req)-&gt;rcv_nxt,</div><div class='del'>-			req-&gt;rsk_rcv_wnd &gt;&gt; inet_rsk(req)-&gt;rcv_wscale,</div><div class='del'>-			tcp_time_stamp_raw() + tcp_rsk(req)-&gt;ts_off,</div><div class='add'>+			tcp_synack_window(req) &gt;&gt; inet_rsk(req)-&gt;rcv_wscale,</div><div class='add'>+			tcp_rsk_tsval(tcp_rsk(req)),</div><div class='ctx'> 			req-&gt;ts_recent, sk-&gt;sk_bound_dev_if,</div><div class='del'>-			tcp_v6_md5_do_lookup(sk, &amp;ipv6_hdr(skb)-&gt;saddr),</div><div class='del'>-			0, 0);</div><div class='add'>+			&amp;key, ipv6_get_dsfield(ipv6_hdr(skb)) &amp; ~INET_ECN_MASK,</div><div class='add'>+			0,</div><div class='add'>+			READ_ONCE(sk-&gt;sk_priority),</div><div class='add'>+			READ_ONCE(tcp_rsk(req)-&gt;txhash));</div><div class='add'>+	if (tcp_key_is_ao(&amp;key))</div><div class='add'>+		kfree(key.traffic_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1030,6 +1263,21 @@ static struct sock *tcp_v6_cookie_check(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u16 tcp_v6_get_syncookie(struct sock *sk, struct ipv6hdr *iph,</div><div class='add'>+			 struct tcphdr *th, u32 *cookie)</div><div class='add'>+{</div><div class='add'>+	u16 mss = 0;</div><div class='add'>+#ifdef CONFIG_SYN_COOKIES</div><div class='add'>+	mss = tcp_get_syncookie_mss(&amp;tcp6_request_sock_ops,</div><div class='add'>+				    &amp;tcp_request_sock_ipv6_ops, sk, th);</div><div class='add'>+	if (mss) {</div><div class='add'>+		*cookie = __cookie_v6_init_sequence(iph, th, &amp;mss);</div><div class='add'>+		tcp_synq_overflow(sk);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return mss;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='hunk'>@@ -1038,6 +1286,11 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (!ipv6_unicast_destination(skb))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='add'>+	if (ipv6_addr_v4mapped(&amp;ipv6_hdr(skb)-&gt;saddr)) {</div><div class='add'>+		__IP6_INC_STATS(sock_net(sk), NULL, IPSTATS_MIB_INHDRERRORS);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return tcp_conn_request(&amp;tcp6_request_sock_ops,</div><div class='ctx'> 				&amp;tcp_request_sock_ipv6_ops, sk, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -1064,14 +1317,15 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_request_sock *ireq;</div><div class='ctx'> 	struct ipv6_pinfo *newnp;</div><div class='del'>-	const struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+	const struct ipv6_pinfo *np = tcp_inet6_sk(sk);</div><div class='ctx'> 	struct ipv6_txoptions *opt;</div><div class='del'>-	struct tcp6_sock *newtcp6sk;</div><div class='ctx'> 	struct inet_sock *newinet;</div><div class='add'>+	bool found_dup_sk = false;</div><div class='ctx'> 	struct tcp_sock *newtp;</div><div class='ctx'> 	struct sock *newsk;</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	struct tcp_md5sig_key *key;</div><div class='add'>+	int l3index;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> </div><div class='hunk'>@@ -1086,11 +1340,11 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> 		if (!newsk)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='del'>-		newtcp6sk = (struct tcp6_sock *)newsk;</div><div class='del'>-		inet_sk(newsk)-&gt;pinet6 = &amp;newtcp6sk-&gt;inet6;</div><div class='del'>-</div><div class='ctx'> 		newinet = inet_sk(newsk);</div><div class='del'>-		newnp = inet6_sk(newsk);</div><div class='add'>+		newinet-&gt;pinet6 = tcp_inet6_sk(newsk);</div><div class='add'>+		newinet-&gt;ipv6_fl_list = NULL;</div><div class='add'>+</div><div class='add'>+		newnp = tcp_inet6_sk(newsk);</div><div class='ctx'> 		newtp = tcp_sk(newsk);</div><div class='ctx'> </div><div class='ctx'> 		memcpy(newnp, np, sizeof(struct ipv6_pinfo));</div><div class='hunk'>@@ -1098,21 +1352,22 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> 		newnp-&gt;saddr = newsk-&gt;sk_v6_rcv_saddr;</div><div class='ctx'> </div><div class='ctx'> 		inet_csk(newsk)-&gt;icsk_af_ops = &amp;ipv6_mapped;</div><div class='add'>+		if (sk_is_mptcp(newsk))</div><div class='add'>+			mptcpv6_handle_mapped(newsk, true);</div><div class='ctx'> 		newsk-&gt;sk_backlog_rcv = tcp_v4_do_rcv;</div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 		newtp-&gt;af_specific = &amp;tcp_sock_ipv6_mapped_specific;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		newnp-&gt;ipv6_mc_list = NULL;</div><div class='ctx'> 		newnp-&gt;ipv6_ac_list = NULL;</div><div class='del'>-		newnp-&gt;ipv6_fl_list = NULL;</div><div class='ctx'> 		newnp-&gt;pktoptions  = NULL;</div><div class='ctx'> 		newnp-&gt;opt	   = NULL;</div><div class='del'>-		newnp-&gt;mcast_oif   = tcp_v6_iif(skb);</div><div class='del'>-		newnp-&gt;mcast_hops  = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='del'>-		newnp-&gt;rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));</div><div class='del'>-		if (np-&gt;repflow)</div><div class='del'>-			newnp-&gt;flow_label = ip6_flowlabel(ipv6_hdr(skb));</div><div class='add'>+		newnp-&gt;mcast_oif   = inet_iif(skb);</div><div class='add'>+		newnp-&gt;mcast_hops  = ip_hdr(skb)-&gt;ttl;</div><div class='add'>+		newnp-&gt;rcv_flowinfo = 0;</div><div class='add'>+		if (inet6_test_bit(REPFLOW, sk))</div><div class='add'>+			newnp-&gt;flow_label = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No need to charge this sock to the relevant IPv6 refcnt debug socks count</div><div class='hunk'>@@ -1132,17 +1387,17 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> 	ireq = inet_rsk(req);</div><div class='ctx'> </div><div class='ctx'> 	if (sk_acceptq_is_full(sk))</div><div class='del'>-		goto out_overflow;</div><div class='add'>+		goto exit_overflow;</div><div class='ctx'> </div><div class='ctx'> 	if (!dst) {</div><div class='ctx'> 		dst = inet6_csk_route_req(sk, &amp;fl6, req, IPPROTO_TCP);</div><div class='ctx'> 		if (!dst)</div><div class='del'>-			goto out;</div><div class='add'>+			goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	newsk = tcp_create_openreq_child(sk, req, skb);</div><div class='ctx'> 	if (!newsk)</div><div class='del'>-		goto out_nonewsk;</div><div class='add'>+		goto exit_nonewsk;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No need to charge this sock to the relevant IPv6 refcnt debug socks</div><div class='hunk'>@@ -1151,31 +1406,28 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	newsk-&gt;sk_gso_type = SKB_GSO_TCPV6;</div><div class='del'>-	ip6_dst_store(newsk, dst, NULL, NULL);</div><div class='ctx'> 	inet6_sk_rx_dst_set(newsk, skb);</div><div class='ctx'> </div><div class='del'>-	newtcp6sk = (struct tcp6_sock *)newsk;</div><div class='del'>-	inet_sk(newsk)-&gt;pinet6 = &amp;newtcp6sk-&gt;inet6;</div><div class='add'>+	newinet = inet_sk(newsk);</div><div class='add'>+	newinet-&gt;pinet6 = tcp_inet6_sk(newsk);</div><div class='add'>+	newinet-&gt;ipv6_fl_list = NULL;</div><div class='add'>+	newinet-&gt;inet_opt = NULL;</div><div class='ctx'> </div><div class='ctx'> 	newtp = tcp_sk(newsk);</div><div class='del'>-	newinet = inet_sk(newsk);</div><div class='del'>-	newnp = inet6_sk(newsk);</div><div class='add'>+	newnp = tcp_inet6_sk(newsk);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(newnp, np, sizeof(struct ipv6_pinfo));</div><div class='ctx'> </div><div class='del'>-	newsk-&gt;sk_v6_daddr = ireq-&gt;ir_v6_rmt_addr;</div><div class='add'>+	ip6_dst_store(newsk, dst, false, false);</div><div class='add'>+</div><div class='ctx'> 	newnp-&gt;saddr = ireq-&gt;ir_v6_loc_addr;</div><div class='del'>-	newsk-&gt;sk_v6_rcv_saddr = ireq-&gt;ir_v6_loc_addr;</div><div class='del'>-	newsk-&gt;sk_bound_dev_if = ireq-&gt;ir_iif;</div><div class='ctx'> </div><div class='ctx'> 	/* Now IPv6 options...</div><div class='ctx'> </div><div class='ctx'> 	   First: no IPv4 options.</div><div class='ctx'> 	 */</div><div class='del'>-	newinet-&gt;inet_opt = NULL;</div><div class='ctx'> 	newnp-&gt;ipv6_mc_list = NULL;</div><div class='ctx'> 	newnp-&gt;ipv6_ac_list = NULL;</div><div class='del'>-	newnp-&gt;ipv6_fl_list = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Clone RX bits */</div><div class='ctx'> 	newnp-&gt;rxopt.all = np-&gt;rxopt.all;</div><div class='hunk'>@@ -1185,9 +1437,15 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> 	newnp-&gt;mcast_oif  = tcp_v6_iif(skb);</div><div class='ctx'> 	newnp-&gt;mcast_hops = ipv6_hdr(skb)-&gt;hop_limit;</div><div class='ctx'> 	newnp-&gt;rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));</div><div class='del'>-	if (np-&gt;repflow)</div><div class='add'>+	if (inet6_test_bit(REPFLOW, sk))</div><div class='ctx'> 		newnp-&gt;flow_label = ip6_flowlabel(ipv6_hdr(skb));</div><div class='ctx'> </div><div class='add'>+	/* Set ToS of the new socket based upon the value of incoming SYN.</div><div class='add'>+	 * ECT bits are set later in tcp_init_transfer().</div><div class='add'>+	 */</div><div class='add'>+	if (READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_reflect_tos))</div><div class='add'>+		newnp-&gt;tclass = tcp_rsk(req)-&gt;syn_tos &amp; ~INET_ECN_MASK;</div><div class='add'>+</div><div class='ctx'> 	/* Clone native IPv6 options from listening socket (if any)</div><div class='ctx'> </div><div class='ctx'> 	   Yes, keeping reference count would be much more clever,</div><div class='hunk'>@@ -1213,57 +1471,70 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *</div><div class='ctx'> </div><div class='ctx'> 	tcp_initialize_rcv_mss(newsk);</div><div class='ctx'> </div><div class='del'>-	newinet-&gt;inet_daddr = newinet-&gt;inet_saddr = LOOPBACK4_IPV6;</div><div class='del'>-	newinet-&gt;inet_rcv_saddr = LOOPBACK4_IPV6;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_TCP_MD5SIG</div><div class='del'>-	/* Copy over the MD5 key from the original socket */</div><div class='del'>-	key = tcp_v6_md5_do_lookup(sk, &amp;newsk-&gt;sk_v6_daddr);</div><div class='del'>-	if (key) {</div><div class='del'>-		/* We're using one, so create a matching key</div><div class='del'>-		 * on the newsk structure. If we fail to get</div><div class='del'>-		 * memory, then we end up not copying the key</div><div class='del'>-		 * across. Shucks.</div><div class='del'>-		 */</div><div class='del'>-		tcp_md5_do_add(newsk, (union tcp_md5_addr *)&amp;newsk-&gt;sk_v6_daddr,</div><div class='del'>-			       AF_INET6, 128, key-&gt;key, key-&gt;keylen,</div><div class='del'>-			       sk_gfp_mask(sk, GFP_ATOMIC));</div><div class='add'>+	l3index = l3mdev_master_ifindex_by_index(sock_net(sk), ireq-&gt;ir_iif);</div><div class='add'>+</div><div class='add'>+	if (!tcp_rsk_used_ao(req)) {</div><div class='add'>+		/* Copy over the MD5 key from the original socket */</div><div class='add'>+		key = tcp_v6_md5_do_lookup(sk, &amp;newsk-&gt;sk_v6_daddr, l3index);</div><div class='add'>+		if (key) {</div><div class='add'>+			const union tcp_md5_addr *addr;</div><div class='add'>+</div><div class='add'>+			addr = (union tcp_md5_addr *)&amp;newsk-&gt;sk_v6_daddr;</div><div class='add'>+			if (tcp_md5_key_copy(newsk, addr, AF_INET6, 128, l3index, key))</div><div class='add'>+				goto put_and_exit;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	/* Copy over tcp_ao_info if any */</div><div class='add'>+	if (tcp_ao_copy_all_matching(sk, newsk, req, skb, AF_INET6))</div><div class='add'>+		goto put_and_exit; /* OOM */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (__inet_inherit_port(sk, newsk) &lt; 0) {</div><div class='del'>-		inet_csk_prepare_forced_close(newsk);</div><div class='del'>-		tcp_done(newsk);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));</div><div class='add'>+	if (__inet_inherit_port(sk, newsk) &lt; 0)</div><div class='add'>+		goto put_and_exit;</div><div class='add'>+	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash),</div><div class='add'>+				       &amp;found_dup_sk);</div><div class='ctx'> 	if (*own_req) {</div><div class='ctx'> 		tcp_move_syn(newtp, req);</div><div class='ctx'> </div><div class='ctx'> 		/* Clone pktoptions received with SYN, if we own the req */</div><div class='ctx'> 		if (ireq-&gt;pktopts) {</div><div class='del'>-			newnp-&gt;pktoptions = skb_clone(ireq-&gt;pktopts,</div><div class='del'>-						      sk_gfp_mask(sk, GFP_ATOMIC));</div><div class='add'>+			newnp-&gt;pktoptions = skb_clone_and_charge_r(ireq-&gt;pktopts, newsk);</div><div class='ctx'> 			consume_skb(ireq-&gt;pktopts);</div><div class='ctx'> 			ireq-&gt;pktopts = NULL;</div><div class='del'>-			if (newnp-&gt;pktoptions) {</div><div class='add'>+			if (newnp-&gt;pktoptions)</div><div class='ctx'> 				tcp_v6_restore_cb(newnp-&gt;pktoptions);</div><div class='del'>-				skb_set_owner_r(newnp-&gt;pktoptions, newsk);</div><div class='del'>-			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!req_unhash &amp;&amp; found_dup_sk) {</div><div class='add'>+			/* This code path should only be executed in the</div><div class='add'>+			 * syncookie case only</div><div class='add'>+			 */</div><div class='add'>+			bh_unlock_sock(newsk);</div><div class='add'>+			sock_put(newsk);</div><div class='add'>+			newsk = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return newsk;</div><div class='ctx'> </div><div class='del'>-out_overflow:</div><div class='add'>+exit_overflow:</div><div class='ctx'> 	__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);</div><div class='del'>-out_nonewsk:</div><div class='add'>+exit_nonewsk:</div><div class='ctx'> 	dst_release(dst);</div><div class='del'>-out:</div><div class='add'>+exit:</div><div class='ctx'> 	tcp_listendrop(sk);</div><div class='ctx'> 	return NULL;</div><div class='add'>+put_and_exit:</div><div class='add'>+	inet_csk_prepare_forced_close(newsk);</div><div class='add'>+	tcp_done(newsk);</div><div class='add'>+	goto exit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,</div><div class='add'>+							   u32));</div><div class='ctx'> /* The socket must have it's spinlock held when we get</div><div class='ctx'>  * here, unless it is a TCP_LISTEN socket.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1272,11 +1543,13 @@ out:</div><div class='ctx'>  * This is because we cannot sleep with the original spinlock</div><div class='ctx'>  * held.</div><div class='ctx'>  */</div><div class='del'>-static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct tcp_sock *tp;</div><div class='add'>+	struct ipv6_pinfo *np = tcp_inet6_sk(sk);</div><div class='ctx'> 	struct sk_buff *opt_skb = NULL;</div><div class='add'>+	enum skb_drop_reason reason;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='ctx'> </div><div class='ctx'> 	/* Imagine: socket is IPv6. IPv4 packet arrives,</div><div class='ctx'> 	   goes to IPv4 receive handler and backlogged.</div><div class='hunk'>@@ -1289,6 +1562,10 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 		return tcp_v4_do_rcv(sk, skb);</div><div class='ctx'> </div><div class='add'>+	reason = psp_sk_rx_policy_check(sk, skb);</div><div class='add'>+	if (reason)</div><div class='add'>+		goto err_discard;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	socket locking is here for SMP purposes as backlog rcv</div><div class='ctx'> 	 *	is currently called with bh processing disabled.</div><div class='hunk'>@@ -1307,19 +1584,23 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	   by tcp. Feel free to propose better solution.</div><div class='ctx'> 					       --ANK (980728)</div><div class='ctx'> 	 */</div><div class='del'>-	if (np-&gt;rxopt.all)</div><div class='del'>-		opt_skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC));</div><div class='add'>+	if (np-&gt;rxopt.all &amp;&amp; sk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		opt_skb = skb_clone_and_charge_r(skb, sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_ESTABLISHED) { /* Fast path */</div><div class='del'>-		struct dst_entry *dst = sk-&gt;sk_rx_dst;</div><div class='add'>+		struct dst_entry *dst;</div><div class='add'>+</div><div class='add'>+		dst = rcu_dereference_protected(sk-&gt;sk_rx_dst,</div><div class='add'>+						lockdep_sock_is_held(sk));</div><div class='ctx'> </div><div class='ctx'> 		sock_rps_save_rxhash(sk, skb);</div><div class='ctx'> 		sk_mark_napi_id(sk, skb);</div><div class='ctx'> 		if (dst) {</div><div class='del'>-			if (inet_sk(sk)-&gt;rx_dst_ifindex != skb-&gt;skb_iif ||</div><div class='del'>-			    dst-&gt;ops-&gt;check(dst, np-&gt;rx_dst_cookie) == NULL) {</div><div class='add'>+			if (sk-&gt;sk_rx_dst_ifindex != skb-&gt;skb_iif ||</div><div class='add'>+			    INDIRECT_CALL_1(dst-&gt;ops-&gt;check, ip6_dst_check,</div><div class='add'>+					    dst, sk-&gt;sk_rx_dst_cookie) == NULL) {</div><div class='add'>+				RCU_INIT_POINTER(sk-&gt;sk_rx_dst, NULL);</div><div class='ctx'> 				dst_release(dst);</div><div class='del'>-				sk-&gt;sk_rx_dst = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1335,34 +1616,36 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_LISTEN) {</div><div class='ctx'> 		struct sock *nsk = tcp_v6_cookie_check(sk, skb);</div><div class='ctx'> </div><div class='del'>-		if (!nsk)</div><div class='del'>-			goto discard;</div><div class='del'>-</div><div class='ctx'> 		if (nsk != sk) {</div><div class='del'>-			if (tcp_child_process(sk, nsk, skb))</div><div class='del'>-				goto reset;</div><div class='del'>-			if (opt_skb)</div><div class='del'>-				__kfree_skb(opt_skb);</div><div class='add'>+			if (nsk) {</div><div class='add'>+				reason = tcp_child_process(sk, nsk, skb);</div><div class='add'>+				if (reason)</div><div class='add'>+					goto reset;</div><div class='add'>+			}</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		sock_rps_save_rxhash(sk, skb);</div><div class='ctx'> </div><div class='del'>-	if (tcp_rcv_state_process(sk, skb))</div><div class='add'>+	reason = tcp_rcv_state_process(sk, skb);</div><div class='add'>+	if (reason)</div><div class='ctx'> 		goto reset;</div><div class='ctx'> 	if (opt_skb)</div><div class='ctx'> 		goto ipv6_pktoptions;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> reset:</div><div class='del'>-	tcp_v6_send_reset(sk, skb);</div><div class='add'>+	tcp_v6_send_reset(sk, skb, sk_rst_convert_drop_reason(reason));</div><div class='ctx'> discard:</div><div class='ctx'> 	if (opt_skb)</div><div class='ctx'> 		__kfree_skb(opt_skb);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> csum_err:</div><div class='add'>+	reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+	trace_tcp_bad_csum(skb);</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);</div><div class='add'>+err_discard:</div><div class='ctx'> 	TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);</div><div class='ctx'> 	goto discard;</div><div class='ctx'> </div><div class='hunk'>@@ -1379,15 +1662,15 @@ ipv6_pktoptions:</div><div class='ctx'> 	if (TCP_SKB_CB(opt_skb)-&gt;end_seq == tp-&gt;rcv_nxt &amp;&amp;</div><div class='ctx'> 	    !((1 &lt;&lt; sk-&gt;sk_state) &amp; (TCPF_CLOSE | TCPF_LISTEN))) {</div><div class='ctx'> 		if (np-&gt;rxopt.bits.rxinfo || np-&gt;rxopt.bits.rxoinfo)</div><div class='del'>-			np-&gt;mcast_oif = tcp_v6_iif(opt_skb);</div><div class='add'>+			WRITE_ONCE(np-&gt;mcast_oif, tcp_v6_iif(opt_skb));</div><div class='ctx'> 		if (np-&gt;rxopt.bits.rxhlim || np-&gt;rxopt.bits.rxohlim)</div><div class='del'>-			np-&gt;mcast_hops = ipv6_hdr(opt_skb)-&gt;hop_limit;</div><div class='add'>+			WRITE_ONCE(np-&gt;mcast_hops,</div><div class='add'>+				   ipv6_hdr(opt_skb)-&gt;hop_limit);</div><div class='ctx'> 		if (np-&gt;rxopt.bits.rxflow || np-&gt;rxopt.bits.rxtclass)</div><div class='ctx'> 			np-&gt;rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));</div><div class='del'>-		if (np-&gt;repflow)</div><div class='add'>+		if (inet6_test_bit(REPFLOW, sk))</div><div class='ctx'> 			np-&gt;flow_label = ip6_flowlabel(ipv6_hdr(opt_skb));</div><div class='ctx'> 		if (ipv6_opt_accepted(sk, opt_skb, &amp;TCP_SKB_CB(opt_skb)-&gt;header.h6)) {</div><div class='del'>-			skb_set_owner_r(opt_skb, sk);</div><div class='ctx'> 			tcp_v6_restore_cb(opt_skb);</div><div class='ctx'> 			opt_skb = xchg(&amp;np-&gt;pktoptions, opt_skb);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1396,7 +1679,7 @@ ipv6_pktoptions:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree_skb(opt_skb);</div><div class='add'>+	consume_skb(opt_skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1416,24 +1699,28 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr,</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;end_seq = (TCP_SKB_CB(skb)-&gt;seq + th-&gt;syn + th-&gt;fin +</div><div class='ctx'> 				    skb-&gt;len - th-&gt;doff*4);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;ack_seq = ntohl(th-&gt;ack_seq);</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;tcp_flags = tcp_flag_byte(th);</div><div class='del'>-	TCP_SKB_CB(skb)-&gt;tcp_tw_isn = 0;</div><div class='add'>+	TCP_SKB_CB(skb)-&gt;tcp_flags = tcp_flags_ntohs(th);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;ip_dsfield = ipv6_get_dsfield(hdr);</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;sacked = 0;</div><div class='ctx'> 	TCP_SKB_CB(skb)-&gt;has_rxtstamp =</div><div class='ctx'> 			skb-&gt;tstamp || skb_hwtstamps(skb)-&gt;hwtstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp_v6_rcv(struct sk_buff *skb)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	enum skb_drop_reason drop_reason;</div><div class='add'>+	enum tcp_tw_status tw_status;</div><div class='ctx'> 	int sdif = inet6_sdif(skb);</div><div class='add'>+	int dif = inet6_iif(skb);</div><div class='ctx'> 	const struct tcphdr *th;</div><div class='ctx'> 	const struct ipv6hdr *hdr;</div><div class='add'>+	struct sock *sk = NULL;</div><div class='ctx'> 	bool refcounted;</div><div class='del'>-	struct sock *sk;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	u32 isn;</div><div class='ctx'> </div><div class='add'>+	drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_HOST)</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1447,8 +1734,10 @@ static int tcp_v6_rcv(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(th-&gt;doff &lt; sizeof(struct tcphdr)/4))</div><div class='add'>+	if (unlikely(th-&gt;doff &lt; sizeof(struct tcphdr) / 4)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 		goto bad_packet;</div><div class='add'>+	}</div><div class='ctx'> 	if (!pskb_may_pull(skb, th-&gt;doff*4))</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1459,13 +1748,12 @@ static int tcp_v6_rcv(struct sk_buff *skb)</div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> lookup:</div><div class='del'>-	sk = __inet6_lookup_skb(&amp;tcp_hashinfo, skb, __tcp_hdrlen(th),</div><div class='add'>+	sk = __inet6_lookup_skb(skb, __tcp_hdrlen(th),</div><div class='ctx'> 				th-&gt;source, th-&gt;dest, inet6_iif(skb), sdif,</div><div class='ctx'> 				&amp;refcounted);</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto no_tcp_socket;</div><div class='ctx'> </div><div class='del'>-process:</div><div class='ctx'> 	if (sk-&gt;sk_state == TCP_TIME_WAIT)</div><div class='ctx'> 		goto do_time_wait;</div><div class='ctx'> </div><div class='hunk'>@@ -1475,8 +1763,14 @@ process:</div><div class='ctx'> 		struct sock *nsk;</div><div class='ctx'> </div><div class='ctx'> 		sk = req-&gt;rsk_listener;</div><div class='del'>-		if (tcp_v6_inbound_md5_hash(sk, skb)) {</div><div class='del'>-			sk_drops_add(sk, skb);</div><div class='add'>+		if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+			drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='add'>+		else</div><div class='add'>+			drop_reason = tcp_inbound_hash(sk, req, skb,</div><div class='add'>+						       &amp;hdr-&gt;saddr, &amp;hdr-&gt;daddr,</div><div class='add'>+						       AF_INET6, dif, sdif);</div><div class='add'>+		if (drop_reason) {</div><div class='add'>+			sk_drops_skbadd(sk, skb);</div><div class='ctx'> 			reqsk_put(req);</div><div class='ctx'> 			goto discard_it;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1485,17 +1779,26 @@ process:</div><div class='ctx'> 			goto csum_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (unlikely(sk-&gt;sk_state != TCP_LISTEN)) {</div><div class='del'>-			inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='del'>-			goto lookup;</div><div class='add'>+			nsk = reuseport_migrate_sock(sk, req_to_sk(req), skb);</div><div class='add'>+			if (!nsk) {</div><div class='add'>+				inet_csk_reqsk_queue_drop_and_put(sk, req);</div><div class='add'>+				goto lookup;</div><div class='add'>+			}</div><div class='add'>+			sk = nsk;</div><div class='add'>+			/* reuseport_migrate_sock() has already held one sk_refcnt</div><div class='add'>+			 * before returning.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			sock_hold(sk);</div><div class='ctx'> 		}</div><div class='del'>-		sock_hold(sk);</div><div class='ctx'> 		refcounted = true;</div><div class='ctx'> 		nsk = NULL;</div><div class='del'>-		if (!tcp_filter(sk, skb)) {</div><div class='add'>+		if (!tcp_filter(sk, skb, &amp;drop_reason)) {</div><div class='ctx'> 			th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 			hdr = ipv6_hdr(skb);</div><div class='ctx'> 			tcp_v6_fill_cb(skb, hdr, th);</div><div class='del'>-			nsk = tcp_check_req(sk, skb, req, false, &amp;req_stolen);</div><div class='add'>+			nsk = tcp_check_req(sk, skb, req, false, &amp;req_stolen,</div><div class='add'>+					    &amp;drop_reason);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!nsk) {</div><div class='ctx'> 			reqsk_put(req);</div><div class='hunk'>@@ -1511,30 +1814,49 @@ process:</div><div class='ctx'> 			}</div><div class='ctx'> 			goto discard_and_relse;</div><div class='ctx'> 		}</div><div class='add'>+		nf_reset_ct(skb);</div><div class='ctx'> 		if (nsk == sk) {</div><div class='ctx'> 			reqsk_put(req);</div><div class='ctx'> 			tcp_v6_restore_cb(skb);</div><div class='del'>-		} else if (tcp_child_process(sk, nsk, skb)) {</div><div class='del'>-			tcp_v6_send_reset(nsk, skb);</div><div class='del'>-			goto discard_and_relse;</div><div class='ctx'> 		} else {</div><div class='add'>+			drop_reason = tcp_child_process(sk, nsk, skb);</div><div class='add'>+			if (drop_reason) {</div><div class='add'>+				enum sk_rst_reason rst_reason;</div><div class='add'>+</div><div class='add'>+				rst_reason = sk_rst_convert_drop_reason(drop_reason);</div><div class='add'>+				tcp_v6_send_reset(nsk, skb, rst_reason);</div><div class='add'>+				goto discard_and_relse;</div><div class='add'>+			}</div><div class='ctx'> 			sock_put(sk);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (hdr-&gt;hop_limit &lt; inet6_sk(sk)-&gt;min_hopcount) {</div><div class='del'>-		__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='del'>-		goto discard_and_relse;</div><div class='add'>+</div><div class='add'>+process:</div><div class='add'>+	if (static_branch_unlikely(&amp;ip6_min_hopcount)) {</div><div class='add'>+		/* min_hopcount can be changed concurrently from do_ipv6_setsockopt() */</div><div class='add'>+		if (unlikely(hdr-&gt;hop_limit &lt; READ_ONCE(tcp_inet6_sk(sk)-&gt;min_hopcount))) {</div><div class='add'>+			__NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_TCP_MINTTL;</div><div class='add'>+			goto discard_and_relse;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		goto discard_and_relse;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (tcp_v6_inbound_md5_hash(sk, skb))</div><div class='add'>+	drop_reason = tcp_inbound_hash(sk, NULL, skb, &amp;hdr-&gt;saddr, &amp;hdr-&gt;daddr,</div><div class='add'>+				       AF_INET6, dif, sdif);</div><div class='add'>+	if (drop_reason)</div><div class='ctx'> 		goto discard_and_relse;</div><div class='ctx'> </div><div class='del'>-	if (tcp_filter(sk, skb))</div><div class='add'>+	nf_reset_ct(skb);</div><div class='add'>+</div><div class='add'>+	if (tcp_filter(sk, skb, &amp;drop_reason))</div><div class='ctx'> 		goto discard_and_relse;</div><div class='add'>+</div><div class='ctx'> 	th = (const struct tcphdr *)skb-&gt;data;</div><div class='ctx'> 	hdr = ipv6_hdr(skb);</div><div class='ctx'> 	tcp_v6_fill_cb(skb, hdr, th);</div><div class='hunk'>@@ -1553,17 +1875,18 @@ process:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (!sock_owned_by_user(sk)) {</div><div class='ctx'> 		ret = tcp_v6_do_rcv(sk, skb);</div><div class='del'>-	} else if (tcp_add_backlog(sk, skb)) {</div><div class='del'>-		goto discard_and_relse;</div><div class='add'>+	} else {</div><div class='add'>+		if (tcp_add_backlog(sk, skb, &amp;drop_reason))</div><div class='add'>+			goto discard_and_relse;</div><div class='ctx'> 	}</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='del'>-</div><div class='ctx'> put_and_return:</div><div class='ctx'> 	if (refcounted)</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 	return ret ? -1 : 0;</div><div class='ctx'> </div><div class='ctx'> no_tcp_socket:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_NO_SOCKET;</div><div class='ctx'> 	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> </div><div class='hunk'>@@ -1571,25 +1894,29 @@ no_tcp_socket:</div><div class='ctx'> </div><div class='ctx'> 	if (tcp_checksum_complete(skb)) {</div><div class='ctx'> csum_error:</div><div class='add'>+		drop_reason = SKB_DROP_REASON_TCP_CSUM;</div><div class='add'>+		trace_tcp_bad_csum(skb);</div><div class='ctx'> 		__TCP_INC_STATS(net, TCP_MIB_CSUMERRORS);</div><div class='ctx'> bad_packet:</div><div class='ctx'> 		__TCP_INC_STATS(net, TCP_MIB_INERRS);</div><div class='ctx'> 	} else {</div><div class='del'>-		tcp_v6_send_reset(NULL, skb);</div><div class='add'>+		tcp_v6_send_reset(NULL, skb, sk_rst_convert_drop_reason(drop_reason));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> discard_it:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	SKB_DR_OR(drop_reason, NOT_SPECIFIED);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> discard_and_relse:</div><div class='del'>-	sk_drops_add(sk, skb);</div><div class='add'>+	sk_drops_skbadd(sk, skb);</div><div class='ctx'> 	if (refcounted)</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 	goto discard_it;</div><div class='ctx'> </div><div class='ctx'> do_time_wait:</div><div class='ctx'> 	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		inet_twsk_put(inet_twsk(sk));</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1601,13 +1928,14 @@ do_time_wait:</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (tcp_timewait_state_process(inet_twsk(sk), skb, th)) {</div><div class='add'>+	tw_status = tcp_timewait_state_process(inet_twsk(sk), skb, th, &amp;isn,</div><div class='add'>+					       &amp;drop_reason);</div><div class='add'>+	switch (tw_status) {</div><div class='ctx'> 	case TCP_TW_SYN:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct sock *sk2;</div><div class='ctx'> </div><div class='del'>-		sk2 = inet6_lookup_listener(dev_net(skb-&gt;dev), &amp;tcp_hashinfo,</div><div class='del'>-					    skb, __tcp_hdrlen(th),</div><div class='add'>+		sk2 = inet6_lookup_listener(net, skb, __tcp_hdrlen(th),</div><div class='ctx'> 					    &amp;ipv6_hdr(skb)-&gt;saddr, th-&gt;source,</div><div class='ctx'> 					    &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='ctx'> 					    ntohs(th-&gt;dest),</div><div class='hunk'>@@ -1619,16 +1947,22 @@ do_time_wait:</div><div class='ctx'> 			sk = sk2;</div><div class='ctx'> 			tcp_v6_restore_cb(skb);</div><div class='ctx'> 			refcounted = false;</div><div class='add'>+			__this_cpu_write(tcp_tw_isn, isn);</div><div class='ctx'> 			goto process;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		drop_reason = psp_twsk_rx_policy_check(inet_twsk(sk), skb);</div><div class='add'>+		if (drop_reason)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 		/* to ACK */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TCP_TW_ACK:</div><div class='del'>-		tcp_v6_timewait_ack(sk, skb);</div><div class='add'>+	case TCP_TW_ACK_OOW:</div><div class='add'>+		tcp_v6_timewait_ack(sk, skb, tw_status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_TW_RST:</div><div class='del'>-		tcp_v6_send_reset(sk, skb);</div><div class='add'>+		tcp_v6_send_reset(sk, skb, SK_RST_REASON_TCP_TIMEWAIT_SOCKET);</div><div class='ctx'> 		inet_twsk_deschedule_put(inet_twsk(sk));</div><div class='ctx'> 		goto discard_it;</div><div class='ctx'> 	case TCP_TW_SUCCESS:</div><div class='hunk'>@@ -1637,8 +1971,9 @@ do_time_wait:</div><div class='ctx'> 	goto discard_it;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v6_early_demux(struct sk_buff *skb)</div><div class='add'>+void tcp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='ctx'> 	const struct ipv6hdr *hdr;</div><div class='ctx'> 	const struct tcphdr *th;</div><div class='ctx'> 	struct sock *sk;</div><div class='hunk'>@@ -1656,20 +1991,19 @@ static void tcp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Note : We use inet6_iif() here, not tcp_v6_iif() */</div><div class='del'>-	sk = __inet6_lookup_established(dev_net(skb-&gt;dev), &amp;tcp_hashinfo,</div><div class='del'>-					&amp;hdr-&gt;saddr, th-&gt;source,</div><div class='add'>+	sk = __inet6_lookup_established(net, &amp;hdr-&gt;saddr, th-&gt;source,</div><div class='ctx'> 					&amp;hdr-&gt;daddr, ntohs(th-&gt;dest),</div><div class='ctx'> 					inet6_iif(skb), inet6_sdif(skb));</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		skb-&gt;sk = sk;</div><div class='ctx'> 		skb-&gt;destructor = sock_edemux;</div><div class='ctx'> 		if (sk_fullsock(sk)) {</div><div class='del'>-			struct dst_entry *dst = READ_ONCE(sk-&gt;sk_rx_dst);</div><div class='add'>+			struct dst_entry *dst = rcu_dereference(sk-&gt;sk_rx_dst);</div><div class='ctx'> </div><div class='ctx'> 			if (dst)</div><div class='del'>-				dst = dst_check(dst, inet6_sk(sk)-&gt;rx_dst_cookie);</div><div class='add'>+				dst = dst_check(dst, sk-&gt;sk_rx_dst_cookie);</div><div class='ctx'> 			if (dst &amp;&amp;</div><div class='del'>-			    inet_sk(sk)-&gt;rx_dst_ifindex == skb-&gt;skb_iif)</div><div class='add'>+			    sk-&gt;sk_rx_dst_ifindex == skb-&gt;skb_iif)</div><div class='ctx'> 				skb_dst_set_noref(skb, dst);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1677,11 +2011,14 @@ static void tcp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static struct timewait_sock_ops tcp6_timewait_sock_ops = {</div><div class='ctx'> 	.twsk_obj_size	= sizeof(struct tcp6_timewait_sock),</div><div class='del'>-	.twsk_unique	= tcp_twsk_unique,</div><div class='del'>-	.twsk_destructor = tcp_twsk_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct inet_connection_sock_af_ops ipv6_specific = {</div><div class='add'>+INDIRECT_CALLABLE_SCOPE void tcp_v6_send_check(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__tcp_v6_send_check(skb, &amp;sk-&gt;sk_v6_rcv_saddr, &amp;sk-&gt;sk_v6_daddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct inet_connection_sock_af_ops ipv6_specific = {</div><div class='ctx'> 	.queue_xmit	   = inet6_csk_xmit,</div><div class='ctx'> 	.send_check	   = tcp_v6_send_check,</div><div class='ctx'> 	.rebuild_header	   = inet6_sk_rebuild_header,</div><div class='hunk'>@@ -1689,23 +2026,24 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {</div><div class='ctx'> 	.conn_request	   = tcp_v6_conn_request,</div><div class='ctx'> 	.syn_recv_sock	   = tcp_v6_syn_recv_sock,</div><div class='ctx'> 	.net_header_len	   = sizeof(struct ipv6hdr),</div><div class='del'>-	.net_frag_header_len = sizeof(struct frag_hdr),</div><div class='ctx'> 	.setsockopt	   = ipv6_setsockopt,</div><div class='ctx'> 	.getsockopt	   = ipv6_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet6_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in6),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ipv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ipv6_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> 	.mtu_reduced	   = tcp_v6_mtu_reduced,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = {</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	.md5_lookup	=	tcp_v6_md5_lookup,</div><div class='ctx'> 	.calc_md5_hash	=	tcp_v6_md5_hash_skb,</div><div class='ctx'> 	.md5_parse	=	tcp_v6_parse_md5_keys,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	.ao_lookup	=	tcp_v6_ao_lookup,</div><div class='add'>+	.calc_ao_hash	=	tcp_v6_ao_hash_skb,</div><div class='add'>+	.ao_parse	=	tcp_v6_parse_ao,</div><div class='add'>+	.ao_calc_key_sk	=	tcp_v6_ao_calc_key_sk,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1722,21 +2060,30 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {</div><div class='ctx'> 	.net_header_len	   = sizeof(struct iphdr),</div><div class='ctx'> 	.setsockopt	   = ipv6_setsockopt,</div><div class='ctx'> 	.getsockopt	   = ipv6_getsockopt,</div><div class='del'>-	.addr2sockaddr	   = inet6_csk_addr2sockaddr,</div><div class='del'>-	.sockaddr_len	   = sizeof(struct sockaddr_in6),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ipv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ipv6_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> 	.mtu_reduced	   = tcp_v4_mtu_reduced,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = {</div><div class='add'>+#ifdef CONFIG_TCP_MD5SIG</div><div class='ctx'> 	.md5_lookup	=	tcp_v4_md5_lookup,</div><div class='ctx'> 	.calc_md5_hash	=	tcp_v4_md5_hash_skb,</div><div class='ctx'> 	.md5_parse	=	tcp_v6_parse_md5_keys,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TCP_AO</div><div class='add'>+	.ao_lookup	=	tcp_v6_ao_lookup,</div><div class='add'>+	.calc_ao_hash	=	tcp_v4_ao_hash_skb,</div><div class='add'>+	.ao_parse	=	tcp_v6_parse_ao,</div><div class='add'>+	.ao_calc_key_sk	=	tcp_v4_ao_calc_key_sk,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static void tcp6_destruct_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	tcp_md5_destruct_sock(sk);</div><div class='add'>+	tcp_ao_destroy_sock(sk, false);</div><div class='add'>+	inet6_sock_destruct(sk);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* NOTE: A lot of things set to zero explicitly by call to</div><div class='hunk'>@@ -1750,19 +2097,14 @@ static int tcp_v6_init_sock(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	icsk-&gt;icsk_af_ops = &amp;ipv6_specific;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TCP_MD5SIG</div><div class='add'>+#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)</div><div class='ctx'> 	tcp_sk(sk)-&gt;af_specific = &amp;tcp_sock_ipv6_specific;</div><div class='add'>+	sk-&gt;sk_destruct = tcp6_destruct_sock;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tcp_v6_destroy_sock(struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	tcp_v4_destroy_sock(sk);</div><div class='del'>-	inet6_destroy_sock(sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> /* Proc filesystem TCPv6 sock list dumping. */</div><div class='ctx'> static void get_openreq6(struct seq_file *seq,</div><div class='hunk'>@@ -1791,7 +2133,7 @@ static void get_openreq6(struct seq_file *seq,</div><div class='ctx'> 		   jiffies_to_clock_t(ttd),</div><div class='ctx'> 		   req-&gt;num_timeout,</div><div class='ctx'> 		   from_kuid_munged(seq_user_ns(seq),</div><div class='del'>-				    sock_i_uid(req-&gt;rsk_listener)),</div><div class='add'>+				    sk_uid(req-&gt;rsk_listener)),</div><div class='ctx'> 		   0,  /* non standard timer */</div><div class='ctx'> 		   0, /* open_requests have no inode */</div><div class='ctx'> 		   0, req);</div><div class='hunk'>@@ -1807,6 +2149,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)</div><div class='ctx'> 	const struct tcp_sock *tp = tcp_sk(sp);</div><div class='ctx'> 	const struct inet_connection_sock *icsk = inet_csk(sp);</div><div class='ctx'> 	const struct fastopen_queue *fastopenq = &amp;icsk-&gt;icsk_accept_queue.fastopenq;</div><div class='add'>+	u8 icsk_pending;</div><div class='ctx'> 	int rx_queue;</div><div class='ctx'> 	int state;</div><div class='ctx'> </div><div class='hunk'>@@ -1815,17 +2158,18 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)</div><div class='ctx'> 	destp = ntohs(inet-&gt;inet_dport);</div><div class='ctx'> 	srcp  = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> </div><div class='del'>-	if (icsk-&gt;icsk_pending == ICSK_TIME_RETRANS ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='del'>-	    icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='add'>+	icsk_pending = smp_load_acquire(&amp;icsk-&gt;icsk_pending);</div><div class='add'>+	if (icsk_pending == ICSK_TIME_RETRANS ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='add'>+	    icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='ctx'> 		timer_active	= 1;</div><div class='del'>-		timer_expires	= icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (icsk-&gt;icsk_pending == ICSK_TIME_PROBE0) {</div><div class='add'>+		timer_expires	= tcp_timeout_expires(sp);</div><div class='add'>+	} else if (icsk_pending == ICSK_TIME_PROBE0) {</div><div class='ctx'> 		timer_active	= 4;</div><div class='del'>-		timer_expires	= icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (timer_pending(&amp;sp-&gt;sk_timer)) {</div><div class='add'>+		timer_expires	= tcp_timeout_expires(sp);</div><div class='add'>+	} else if (timer_pending(&amp;icsk-&gt;icsk_keepalive_timer)) {</div><div class='ctx'> 		timer_active	= 2;</div><div class='del'>-		timer_expires	= sp-&gt;sk_timer.expires;</div><div class='add'>+		timer_expires	= icsk-&gt;icsk_keepalive_timer.expires;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		timer_active	= 0;</div><div class='ctx'> 		timer_expires = jiffies;</div><div class='hunk'>@@ -1833,12 +2177,13 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)</div><div class='ctx'> </div><div class='ctx'> 	state = inet_sk_state_load(sp);</div><div class='ctx'> 	if (state == TCP_LISTEN)</div><div class='del'>-		rx_queue = sp-&gt;sk_ack_backlog;</div><div class='add'>+		rx_queue = READ_ONCE(sp-&gt;sk_ack_backlog);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* Because we don't lock the socket,</div><div class='ctx'> 		 * we might find a transient negative value.</div><div class='ctx'> 		 */</div><div class='del'>-		rx_queue = max_t(int, tp-&gt;rcv_nxt - tp-&gt;copied_seq, 0);</div><div class='add'>+		rx_queue = max_t(int, READ_ONCE(tp-&gt;rcv_nxt) -</div><div class='add'>+				      READ_ONCE(tp-&gt;copied_seq), 0);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq,</div><div class='ctx'> 		   "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "</div><div class='hunk'>@@ -1849,19 +2194,19 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)</div><div class='ctx'> 		   dest-&gt;s6_addr32[0], dest-&gt;s6_addr32[1],</div><div class='ctx'> 		   dest-&gt;s6_addr32[2], dest-&gt;s6_addr32[3], destp,</div><div class='ctx'> 		   state,</div><div class='del'>-		   tp-&gt;write_seq - tp-&gt;snd_una,</div><div class='add'>+		   READ_ONCE(tp-&gt;write_seq) - tp-&gt;snd_una,</div><div class='ctx'> 		   rx_queue,</div><div class='ctx'> 		   timer_active,</div><div class='ctx'> 		   jiffies_delta_to_clock_t(timer_expires - jiffies),</div><div class='del'>-		   icsk-&gt;icsk_retransmits,</div><div class='del'>-		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),</div><div class='del'>-		   icsk-&gt;icsk_probes_out,</div><div class='add'>+		   READ_ONCE(icsk-&gt;icsk_retransmits),</div><div class='add'>+		   from_kuid_munged(seq_user_ns(seq), sk_uid(sp)),</div><div class='add'>+		   READ_ONCE(icsk-&gt;icsk_probes_out),</div><div class='ctx'> 		   sock_i_ino(sp),</div><div class='ctx'> 		   refcount_read(&amp;sp-&gt;sk_refcnt), sp,</div><div class='ctx'> 		   jiffies_to_clock_t(icsk-&gt;icsk_rto),</div><div class='ctx'> 		   jiffies_to_clock_t(icsk-&gt;icsk_ack.ato),</div><div class='del'>-		   (icsk-&gt;icsk_ack.quick &lt;&lt; 1) | icsk-&gt;icsk_ack.pingpong,</div><div class='del'>-		   tp-&gt;snd_cwnd,</div><div class='add'>+		   (icsk-&gt;icsk_ack.quick &lt;&lt; 1) | inet_csk_in_pingpong_mode(sp),</div><div class='add'>+		   tcp_snd_cwnd(tp),</div><div class='ctx'> 		   state == TCP_LISTEN ?</div><div class='ctx'> 			fastopenq-&gt;max_qlen :</div><div class='ctx'> 			(tcp_in_initial_slowstart(tp) ? -1 : tp-&gt;snd_ssthresh)</div><div class='hunk'>@@ -1888,7 +2233,7 @@ static void get_timewait6_sock(struct seq_file *seq,</div><div class='ctx'> 		   src-&gt;s6_addr32[2], src-&gt;s6_addr32[3], srcp,</div><div class='ctx'> 		   dest-&gt;s6_addr32[0], dest-&gt;s6_addr32[1],</div><div class='ctx'> 		   dest-&gt;s6_addr32[2], dest-&gt;s6_addr32[3], destp,</div><div class='del'>-		   tw-&gt;tw_substate, 0, 0,</div><div class='add'>+		   READ_ONCE(tw-&gt;tw_substate), 0, 0,</div><div class='ctx'> 		   3, jiffies_delta_to_clock_t(delta), 0, 0, 0, 0,</div><div class='ctx'> 		   refcount_read(&amp;tw-&gt;tw_refcnt), tw);</div><div class='ctx'> }</div><div class='hunk'>@@ -1954,53 +2299,48 @@ struct proto tcpv6_prot = {</div><div class='ctx'> 	.accept			= inet_csk_accept,</div><div class='ctx'> 	.ioctl			= tcp_ioctl,</div><div class='ctx'> 	.init			= tcp_v6_init_sock,</div><div class='del'>-	.destroy		= tcp_v6_destroy_sock,</div><div class='add'>+	.destroy		= tcp_v4_destroy_sock,</div><div class='ctx'> 	.shutdown		= tcp_shutdown,</div><div class='ctx'> 	.setsockopt		= tcp_setsockopt,</div><div class='ctx'> 	.getsockopt		= tcp_getsockopt,</div><div class='add'>+	.bpf_bypass_getsockopt	= tcp_bpf_bypass_getsockopt,</div><div class='ctx'> 	.keepalive		= tcp_set_keepalive,</div><div class='ctx'> 	.recvmsg		= tcp_recvmsg,</div><div class='ctx'> 	.sendmsg		= tcp_sendmsg,</div><div class='del'>-	.sendpage		= tcp_sendpage,</div><div class='add'>+	.splice_eof		= tcp_splice_eof,</div><div class='ctx'> 	.backlog_rcv		= tcp_v6_do_rcv,</div><div class='ctx'> 	.release_cb		= tcp_release_cb,</div><div class='del'>-	.hash			= inet6_hash,</div><div class='add'>+	.hash			= inet_hash,</div><div class='ctx'> 	.unhash			= inet_unhash,</div><div class='ctx'> 	.get_port		= inet_csk_get_port,</div><div class='add'>+	.put_port		= inet_put_port,</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	.psock_update_sk_prot	= tcp_bpf_update_proto,</div><div class='add'>+#endif</div><div class='ctx'> 	.enter_memory_pressure	= tcp_enter_memory_pressure,</div><div class='ctx'> 	.leave_memory_pressure	= tcp_leave_memory_pressure,</div><div class='ctx'> 	.stream_memory_free	= tcp_stream_memory_free,</div><div class='ctx'> 	.sockets_allocated	= &amp;tcp_sockets_allocated,</div><div class='del'>-	.memory_allocated	= &amp;tcp_memory_allocated,</div><div class='add'>+</div><div class='add'>+	.memory_allocated	= &amp;net_aligned_data.tcp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc	= &amp;tcp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.memory_pressure	= &amp;tcp_memory_pressure,</div><div class='del'>-	.orphan_count		= &amp;tcp_orphan_count,</div><div class='ctx'> 	.sysctl_mem		= sysctl_tcp_mem,</div><div class='ctx'> 	.sysctl_wmem_offset	= offsetof(struct net, ipv4.sysctl_tcp_wmem),</div><div class='ctx'> 	.sysctl_rmem_offset	= offsetof(struct net, ipv4.sysctl_tcp_rmem),</div><div class='ctx'> 	.max_header		= MAX_TCP_HEADER,</div><div class='ctx'> 	.obj_size		= sizeof(struct tcp6_sock),</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct tcp6_sock, inet6),</div><div class='ctx'> 	.slab_flags		= SLAB_TYPESAFE_BY_RCU,</div><div class='ctx'> 	.twsk_prot		= &amp;tcp6_timewait_sock_ops,</div><div class='ctx'> 	.rsk_prot		= &amp;tcp6_request_sock_ops,</div><div class='del'>-	.h.hashinfo		= &amp;tcp_hashinfo,</div><div class='add'>+	.h.hashinfo		= NULL,</div><div class='ctx'> 	.no_autobind		= true,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt	= compat_tcp_setsockopt,</div><div class='del'>-	.compat_getsockopt	= compat_tcp_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> 	.diag_destroy		= tcp_abort,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_GPL(tcpv6_prot);</div><div class='ctx'> </div><div class='del'>-/* thinking of making this const? Don't.</div><div class='del'>- * early_demux can change based on sysctl.</div><div class='del'>- */</div><div class='del'>-static struct inet6_protocol tcpv6_protocol = {</div><div class='del'>-	.early_demux	=	tcp_v6_early_demux,</div><div class='del'>-	.early_demux_handler =  tcp_v6_early_demux,</div><div class='del'>-	.handler	=	tcp_v6_rcv,</div><div class='del'>-	.err_handler	=	tcp_v6_err,</div><div class='del'>-	.flags		=	INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct inet_protosw tcpv6_protosw = {</div><div class='ctx'> 	.type		=	SOCK_STREAM,</div><div class='hunk'>@@ -2013,8 +2353,14 @@ static struct inet_protosw tcpv6_protosw = {</div><div class='ctx'> </div><div class='ctx'> static int __net_init tcpv6_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	return inet_ctl_sock_create(&amp;net-&gt;ipv6.tcp_sk, PF_INET6,</div><div class='del'>-				    SOCK_RAW, IPPROTO_TCP, net);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = inet_ctl_sock_create(&amp;net-&gt;ipv6.tcp_sk, PF_INET6,</div><div class='add'>+				   SOCK_RAW, IPPROTO_TCP, net);</div><div class='add'>+	if (!res)</div><div class='add'>+		net-&gt;ipv6.tcp_sk-&gt;sk_clockid = CLOCK_MONOTONIC;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __net_exit tcpv6_net_exit(struct net *net)</div><div class='hunk'>@@ -2022,22 +2368,21 @@ static void __net_exit tcpv6_net_exit(struct net *net)</div><div class='ctx'> 	inet_ctl_sock_destroy(net-&gt;ipv6.tcp_sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit tcpv6_net_exit_batch(struct list_head *net_exit_list)</div><div class='del'>-{</div><div class='del'>-	inet_twsk_purge(&amp;tcp_hashinfo, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pernet_operations tcpv6_net_ops = {</div><div class='ctx'> 	.init	    = tcpv6_net_init,</div><div class='ctx'> 	.exit	    = tcpv6_net_exit,</div><div class='del'>-	.exit_batch = tcpv6_net_exit_batch,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init tcpv6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = inet6_add_protocol(&amp;tcpv6_protocol, IPPROTO_TCP);</div><div class='add'>+	net_hotdata.tcpv6_protocol = (struct inet6_protocol) {</div><div class='add'>+		.handler     = tcp_v6_rcv,</div><div class='add'>+		.err_handler = tcp_v6_err,</div><div class='add'>+		.flags	     = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,</div><div class='add'>+	};</div><div class='add'>+	ret = inet6_add_protocol(&amp;net_hotdata.tcpv6_protocol, IPPROTO_TCP);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2049,13 +2394,20 @@ int __init tcpv6_init(void)</div><div class='ctx'> 	ret = register_pernet_subsys(&amp;tcpv6_net_ops);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_tcpv6_protosw;</div><div class='add'>+</div><div class='add'>+	ret = mptcpv6_init();</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_tcpv6_pernet_subsys;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+out_tcpv6_pernet_subsys:</div><div class='add'>+	unregister_pernet_subsys(&amp;tcpv6_net_ops);</div><div class='ctx'> out_tcpv6_protosw:</div><div class='ctx'> 	inet6_unregister_protosw(&amp;tcpv6_protosw);</div><div class='ctx'> out_tcpv6_protocol:</div><div class='del'>-	inet6_del_protocol(&amp;tcpv6_protocol, IPPROTO_TCP);</div><div class='add'>+	inet6_del_protocol(&amp;net_hotdata.tcpv6_protocol, IPPROTO_TCP);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2063,5 +2415,5 @@ void tcpv6_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_pernet_subsys(&amp;tcpv6_net_ops);</div><div class='ctx'> 	inet6_unregister_protosw(&amp;tcpv6_protosw);</div><div class='del'>-	inet6_del_protocol(&amp;tcpv6_protocol, IPPROTO_TCP);</div><div class='add'>+	inet6_del_protocol(&amp;net_hotdata.tcpv6_protocol, IPPROTO_TCP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c<br/>index e72947c99454..effeba58630b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/tcpv6_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tcpv6_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/tcpv6_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/tcpv6_offload.c</a></div><div class='hunk'>@@ -1,44 +1,159 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV6 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *      TCPv6 GSO/GRO support</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/inet6_hashtables.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include "ip6_offload.h"</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *tcp6_gro_receive(struct list_head *head,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,</div><div class='add'>+				    struct tcphdr *th)</div><div class='ctx'> {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	const struct ipv6hdr *hdr;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int iif, sdif;</div><div class='add'>+</div><div class='add'>+	if (likely(!(skb-&gt;dev-&gt;features &amp; NETIF_F_GRO_FRAGLIST)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p = tcp_gro_lookup(head, th);</div><div class='add'>+	if (p) {</div><div class='add'>+		NAPI_GRO_CB(skb)-&gt;is_flist = NAPI_GRO_CB(p)-&gt;is_flist;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inet6_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+	hdr = skb_gro_network_header(skb);</div><div class='add'>+	net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	sk = __inet6_lookup_established(net, &amp;hdr-&gt;saddr, th-&gt;source,</div><div class='add'>+					&amp;hdr-&gt;daddr, ntohs(th-&gt;dest),</div><div class='add'>+					iif, sdif);</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;is_flist = !sk;</div><div class='add'>+	if (sk)</div><div class='add'>+		sock_gen_put(sk);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+</div><div class='ctx'> 	/* Don't bother verifying checksum if we're going to flush anyway. */</div><div class='ctx'> 	if (!NAPI_GRO_CB(skb)-&gt;flush &amp;&amp;</div><div class='ctx'> 	    skb_gro_checksum_validate(skb, IPPROTO_TCP,</div><div class='del'>-				      ip6_gro_compute_pseudo)) {</div><div class='del'>-		NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+				      ip6_gro_compute_pseudo))</div><div class='add'>+		goto flush;</div><div class='ctx'> </div><div class='del'>-	return tcp_gro_receive(head, skb);</div><div class='add'>+	th = tcp_gro_pull_header(skb);</div><div class='add'>+	if (!th)</div><div class='add'>+		goto flush;</div><div class='add'>+</div><div class='add'>+	tcp6_check_fraglist_gro(head, skb, th);</div><div class='add'>+</div><div class='add'>+	return tcp_gro_receive(head, skb, th);</div><div class='add'>+</div><div class='add'>+flush:</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tcp6_gro_complete(struct sk_buff *skb, int thoff)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int tcp6_gro_complete(struct sk_buff *skb, int thoff)</div><div class='ctx'> {</div><div class='del'>-	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct ipv6hdr *iph = (struct ipv6hdr *)(skb-&gt;data + offset);</div><div class='ctx'> 	struct tcphdr *th = tcp_hdr(skb);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(NAPI_GRO_CB(skb)-&gt;is_flist)) {</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_FRAGLIST | SKB_GSO_TCPV6;</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	th-&gt;check = ~tcp_v6_check(skb-&gt;len - thoff, &amp;iph-&gt;saddr,</div><div class='ctx'> 				  &amp;iph-&gt;daddr, 0);</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCPV6;</div><div class='ctx'> </div><div class='del'>-	return tcp_gro_complete(skb);</div><div class='add'>+	tcp_gro_complete(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __tcpv6_gso_segment_csum(struct sk_buff *seg,</div><div class='add'>+				     struct in6_addr *oldip,</div><div class='add'>+				     const struct in6_addr *newip,</div><div class='add'>+				     __be16 *oldport, __be16 newport)</div><div class='add'>+{</div><div class='add'>+	struct tcphdr *th = tcp_hdr(seg);</div><div class='add'>+</div><div class='add'>+	if (!ipv6_addr_equal(oldip, newip)) {</div><div class='add'>+		inet_proto_csum_replace16(&amp;th-&gt;check, seg,</div><div class='add'>+					  oldip-&gt;s6_addr32,</div><div class='add'>+					  newip-&gt;s6_addr32,</div><div class='add'>+					  true);</div><div class='add'>+		*oldip = *newip;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*oldport == newport)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	inet_proto_csum_replace2(&amp;th-&gt;check, seg, *oldport, newport, false);</div><div class='add'>+	*oldport = newport;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__tcpv6_gso_segment_list_csum(struct sk_buff *segs)</div><div class='add'>+{</div><div class='add'>+	const struct tcphdr *th;</div><div class='add'>+	const struct ipv6hdr *iph;</div><div class='add'>+	struct sk_buff *seg;</div><div class='add'>+	struct tcphdr *th2;</div><div class='add'>+	struct ipv6hdr *iph2;</div><div class='add'>+</div><div class='add'>+	seg = segs;</div><div class='add'>+	th = tcp_hdr(seg);</div><div class='add'>+	iph = ipv6_hdr(seg);</div><div class='add'>+	th2 = tcp_hdr(seg-&gt;next);</div><div class='add'>+	iph2 = ipv6_hdr(seg-&gt;next);</div><div class='add'>+</div><div class='add'>+	if (!(*(const u32 *)&amp;th-&gt;source ^ *(const u32 *)&amp;th2-&gt;source) &amp;&amp;</div><div class='add'>+	    ipv6_addr_equal(&amp;iph-&gt;saddr, &amp;iph2-&gt;saddr) &amp;&amp;</div><div class='add'>+	    ipv6_addr_equal(&amp;iph-&gt;daddr, &amp;iph2-&gt;daddr))</div><div class='add'>+		return segs;</div><div class='add'>+</div><div class='add'>+	while ((seg = seg-&gt;next)) {</div><div class='add'>+		th2 = tcp_hdr(seg);</div><div class='add'>+		iph2 = ipv6_hdr(seg);</div><div class='add'>+</div><div class='add'>+		__tcpv6_gso_segment_csum(seg, &amp;iph2-&gt;saddr, &amp;iph-&gt;saddr,</div><div class='add'>+					 &amp;th2-&gt;source, th-&gt;source);</div><div class='add'>+		__tcpv6_gso_segment_csum(seg, &amp;iph2-&gt;daddr, &amp;iph-&gt;daddr,</div><div class='add'>+					 &amp;th2-&gt;dest, th-&gt;dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return segs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__tcp6_gso_segment_list(struct sk_buff *skb,</div><div class='add'>+					      netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	skb = skb_segment_list(skb, features, skb_mac_header_len(skb));</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	return __tcpv6_gso_segment_list_csum(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb,</div><div class='hunk'>@@ -52,6 +167,15 @@ static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(*th)))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_FRAGLIST) {</div><div class='add'>+		struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+</div><div class='add'>+		if (skb_pagelen(skb) - th-&gt;doff * 4 == skb_shinfo(skb)-&gt;gso_size)</div><div class='add'>+			return __tcp6_gso_segment_list(skb, features);</div><div class='add'>+</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(skb-&gt;ip_summed != CHECKSUM_PARTIAL)) {</div><div class='ctx'> 		const struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='ctx'> 		struct tcphdr *th = tcp_hdr(skb);</div><div class='hunk'>@@ -67,15 +191,15 @@ static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	return tcp_gso_segment(skb, features);</div><div class='ctx'> }</div><div class='del'>-static const struct net_offload tcpv6_offload = {</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment	=	tcp6_gso_segment,</div><div class='del'>-		.gro_receive	=	tcp6_gro_receive,</div><div class='del'>-		.gro_complete	=	tcp6_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> int __init tcpv6_offload_init(void)</div><div class='ctx'> {</div><div class='del'>-	return inet6_add_offload(&amp;tcpv6_offload, IPPROTO_TCP);</div><div class='add'>+	net_hotdata.tcpv6_offload = (struct net_offload) {</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment	=	tcp6_gso_segment,</div><div class='add'>+			.gro_receive	=	tcp6_gro_receive,</div><div class='add'>+			.gro_complete	=	tcp6_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	return inet6_add_offload(&amp;net_hotdata.tcpv6_offload, IPPROTO_TCP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c<br/>index dae25cad05cd..dc4ea9b11794 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/tunnel6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/tunnel6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/tunnel6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/tunnel6.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2003,2004 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Authors	Mitsuru KANDA  &lt;mk@linux-ipv6.org&gt;</div><div class='ctx'>  *		YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,8 +21,14 @@</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_tunnel __rcu *tunnel6_handlers __read_mostly;</div><div class='ctx'> static struct xfrm6_tunnel __rcu *tunnel46_handlers __read_mostly;</div><div class='add'>+static struct xfrm6_tunnel __rcu *tunnelmpls6_handlers __read_mostly;</div><div class='ctx'> static DEFINE_MUTEX(tunnel6_mutex);</div><div class='ctx'> </div><div class='add'>+static inline int xfrm6_tunnel_mpls_supported(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_MPLS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_tunnel __rcu **pprev;</div><div class='hunk'>@@ -44,8 +38,21 @@ int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;tunnel6_mutex);</div><div class='ctx'> </div><div class='del'>-	for (pprev = (family == AF_INET6) ? &amp;tunnel6_handlers : &amp;tunnel46_handlers;</div><div class='del'>-	     (t = rcu_dereference_protected(*pprev,</div><div class='add'>+	switch (family) {</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		pprev = &amp;tunnel6_handlers;</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET:</div><div class='add'>+		pprev = &amp;tunnel46_handlers;</div><div class='add'>+		break;</div><div class='add'>+	case AF_MPLS:</div><div class='add'>+		pprev = &amp;tunnelmpls6_handlers;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; (t = rcu_dereference_protected(*pprev,</div><div class='ctx'> 			lockdep_is_held(&amp;tunnel6_mutex))) != NULL;</div><div class='ctx'> 	     pprev = &amp;t-&gt;next) {</div><div class='ctx'> 		if (t-&gt;priority &gt; priority)</div><div class='hunk'>@@ -74,8 +81,21 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;tunnel6_mutex);</div><div class='ctx'> </div><div class='del'>-	for (pprev = (family == AF_INET6) ? &amp;tunnel6_handlers : &amp;tunnel46_handlers;</div><div class='del'>-	     (t = rcu_dereference_protected(*pprev,</div><div class='add'>+	switch (family) {</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		pprev = &amp;tunnel6_handlers;</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET:</div><div class='add'>+		pprev = &amp;tunnel46_handlers;</div><div class='add'>+		break;</div><div class='add'>+	case AF_MPLS:</div><div class='add'>+		pprev = &amp;tunnelmpls6_handlers;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; (t = rcu_dereference_protected(*pprev,</div><div class='ctx'> 			lockdep_is_held(&amp;tunnel6_mutex))) != NULL;</div><div class='ctx'> 	     pprev = &amp;t-&gt;next) {</div><div class='ctx'> 		if (t == handler) {</div><div class='hunk'>@@ -85,6 +105,7 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+err:</div><div class='ctx'> 	mutex_unlock(&amp;tunnel6_mutex);</div><div class='ctx'> </div><div class='ctx'> 	synchronize_net();</div><div class='hunk'>@@ -98,6 +119,24 @@ EXPORT_SYMBOL(xfrm6_tunnel_deregister);</div><div class='ctx'> 	     handler != NULL;				\</div><div class='ctx'> 	     handler = rcu_dereference(handler-&gt;next))	\</div><div class='ctx'> </div><div class='add'>+static int tunnelmpls6_rcv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct xfrm6_tunnel *handler;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	for_each_tunnel_rcu(tunnelmpls6_handlers, handler)</div><div class='add'>+		if (!handler-&gt;handler(skb))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tunnel6_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_tunnel *handler;</div><div class='hunk'>@@ -116,6 +155,33 @@ drop:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+static int tunnel6_rcv_cb(struct sk_buff *skb, u8 proto, int err)</div><div class='add'>+{</div><div class='add'>+	struct xfrm6_tunnel __rcu *head;</div><div class='add'>+	struct xfrm6_tunnel *handler;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	head = (proto == IPPROTO_IPV6) ? tunnel6_handlers : tunnel46_handlers;</div><div class='add'>+</div><div class='add'>+	for_each_tunnel_rcu(head, handler) {</div><div class='add'>+		if (handler-&gt;cb_handler) {</div><div class='add'>+			ret = handler-&gt;cb_handler(skb, err);</div><div class='add'>+			if (ret &lt;= 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xfrm_input_afinfo tunnel6_input_afinfo = {</div><div class='add'>+	.family		=	AF_INET6,</div><div class='add'>+	.is_ipip	=	true,</div><div class='add'>+	.callback	=	tunnel6_rcv_cb,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int tunnel46_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_tunnel *handler;</div><div class='hunk'>@@ -134,24 +200,40 @@ drop:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_tunnel *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_tunnel_rcu(tunnel6_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tunnel46_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int tunnel46_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			 u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_tunnel *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_tunnel_rcu(tunnel46_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tunnelmpls6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+			   u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+{</div><div class='add'>+	struct xfrm6_tunnel *handler;</div><div class='add'>+</div><div class='add'>+	for_each_tunnel_rcu(tunnelmpls6_handlers, handler)</div><div class='add'>+		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inet6_protocol tunnel6_protocol = {</div><div class='hunk'>@@ -166,6 +248,12 @@ static const struct inet6_protocol tunnel46_protocol = {</div><div class='ctx'> 	.flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct inet6_protocol tunnelmpls6_protocol = {</div><div class='add'>+	.handler	= tunnelmpls6_rcv,</div><div class='add'>+	.err_handler	= tunnelmpls6_err,</div><div class='add'>+	.flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init tunnel6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (inet6_add_protocol(&amp;tunnel6_protocol, IPPROTO_IPV6)) {</div><div class='hunk'>@@ -177,17 +265,42 @@ static int __init tunnel6_init(void)</div><div class='ctx'> 		inet6_del_protocol(&amp;tunnel6_protocol, IPPROTO_IPV6);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='add'>+	if (xfrm6_tunnel_mpls_supported() &amp;&amp;</div><div class='add'>+	    inet6_add_protocol(&amp;tunnelmpls6_protocol, IPPROTO_MPLS)) {</div><div class='add'>+		pr_err("%s: can't add protocol\n", __func__);</div><div class='add'>+		inet6_del_protocol(&amp;tunnel6_protocol, IPPROTO_IPV6);</div><div class='add'>+		inet6_del_protocol(&amp;tunnel46_protocol, IPPROTO_IPIP);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+	if (xfrm_input_register_afinfo(&amp;tunnel6_input_afinfo)) {</div><div class='add'>+		pr_err("%s: can't add input afinfo\n", __func__);</div><div class='add'>+		inet6_del_protocol(&amp;tunnel6_protocol, IPPROTO_IPV6);</div><div class='add'>+		inet6_del_protocol(&amp;tunnel46_protocol, IPPROTO_IPIP);</div><div class='add'>+		if (xfrm6_tunnel_mpls_supported())</div><div class='add'>+			inet6_del_protocol(&amp;tunnelmpls6_protocol, IPPROTO_MPLS);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit tunnel6_fini(void)</div><div class='ctx'> {</div><div class='add'>+#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)</div><div class='add'>+	if (xfrm_input_unregister_afinfo(&amp;tunnel6_input_afinfo))</div><div class='add'>+		pr_err("%s: can't remove input afinfo\n", __func__);</div><div class='add'>+#endif</div><div class='ctx'> 	if (inet6_del_protocol(&amp;tunnel46_protocol, IPPROTO_IPIP))</div><div class='ctx'> 		pr_err("%s: can't remove protocol\n", __func__);</div><div class='ctx'> 	if (inet6_del_protocol(&amp;tunnel6_protocol, IPPROTO_IPV6))</div><div class='ctx'> 		pr_err("%s: can't remove protocol\n", __func__);</div><div class='add'>+	if (xfrm6_tunnel_mpls_supported() &amp;&amp;</div><div class='add'>+	    inet6_del_protocol(&amp;tunnelmpls6_protocol, IPPROTO_MPLS))</div><div class='add'>+		pr_err("%s: can't remove protocol\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(tunnel6_init);</div><div class='ctx'> module_exit(tunnel6_fini);</div><div class='add'>+MODULE_DESCRIPTION("IP-in-IPv6 tunnel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c<br/>index 28c4aa5078fc..794c13674e8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/udp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	UDP over IPv6</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='hunk'>@@ -14,13 +15,9 @@</div><div class='ctx'>  *					a single port at the same time.</div><div class='ctx'>  *      Kazunori MIYAZAWA @USAGI:       change process style to use ip6_append_data</div><div class='ctx'>  *      YOSHIFUJI Hideaki @USAGI:	convert /proc/net/udp6 to seq_file.</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -36,6 +33,8 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='add'>+#include &lt;trace/events/udp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='hunk'>@@ -43,38 +42,45 @@</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/raw.h&gt;</div><div class='add'>+#include &lt;net/seg6.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+#include &lt;net/ip6_tunnel.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/inet_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/inet6_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;net/sock_reuseport.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;trace/events/skb.h&gt;</div><div class='ctx'> #include "udp_impl.h"</div><div class='ctx'> </div><div class='del'>-static bool udp6_lib_exact_dif_match(struct net *net, struct sk_buff *skb)</div><div class='add'>+static void udpv6_destruct_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_NET_L3_MASTER_DEV)</div><div class='del'>-	if (!net-&gt;ipv4.sysctl_udp_l3mdev_accept &amp;&amp;</div><div class='del'>-	    skb &amp;&amp; ipv6_l3mdev_skb(IP6CB(skb)-&gt;flags))</div><div class='del'>-		return true;</div><div class='del'>-#endif</div><div class='del'>-	return false;</div><div class='add'>+	udp_destruct_common(sk);</div><div class='add'>+	inet6_sock_destruct(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 udp6_ehashfn(const struct net *net,</div><div class='del'>-			const struct in6_addr *laddr,</div><div class='del'>-			const u16 lport,</div><div class='del'>-			const struct in6_addr *faddr,</div><div class='del'>-			const __be16 fport)</div><div class='add'>+int udpv6_init_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	static u32 udp6_ehash_secret __read_mostly;</div><div class='del'>-	static u32 udp_ipv6_hash_secret __read_mostly;</div><div class='add'>+	int res = udp_lib_init_sock(sk);</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_destruct = udpv6_destruct_sock;</div><div class='add'>+	set_bit(SOCK_SUPPORT_ZC, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+u32 udp6_ehashfn(const struct net *net,</div><div class='add'>+		 const struct in6_addr *laddr,</div><div class='add'>+		 const u16 lport,</div><div class='add'>+		 const struct in6_addr *faddr,</div><div class='add'>+		 const __be16 fport)</div><div class='add'>+{</div><div class='ctx'> 	u32 lhash, fhash;</div><div class='ctx'> </div><div class='ctx'> 	net_get_random_once(&amp;udp6_ehash_secret,</div><div class='hunk'>@@ -86,7 +92,7 @@ static u32 udp6_ehashfn(const struct net *net,</div><div class='ctx'> 	fhash = __ipv6_addr_jhash(faddr, udp_ipv6_hash_secret);</div><div class='ctx'> </div><div class='ctx'> 	return __inet6_ehashfn(lhash, lport, fhash, fport,</div><div class='del'>-			       udp_ipv6_hash_secret + net_hash_mix(net));</div><div class='add'>+			       udp6_ehash_secret + net_hash_mix(net));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int udp_v6_get_port(struct sock *sk, unsigned short snum)</div><div class='hunk'>@@ -101,28 +107,43 @@ int udp_v6_get_port(struct sock *sk, unsigned short snum)</div><div class='ctx'> 	return udp_lib_get_port(sk, snum, hash2_nulladdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void udp_v6_rehash(struct sock *sk)</div><div class='add'>+void udp_v6_rehash(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	u16 new_hash = ipv6_portaddr_hash(sock_net(sk),</div><div class='ctx'> 					  &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='ctx'> 					  inet_sk(sk)-&gt;inet_num);</div><div class='add'>+	u16 new_hash4;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr)) {</div><div class='add'>+		new_hash4 = udp_ehashfn(sock_net(sk),</div><div class='add'>+					sk-&gt;sk_rcv_saddr, sk-&gt;sk_num,</div><div class='add'>+					sk-&gt;sk_daddr, sk-&gt;sk_dport);</div><div class='add'>+	} else {</div><div class='add'>+		new_hash4 = udp6_ehashfn(sock_net(sk),</div><div class='add'>+					 &amp;sk-&gt;sk_v6_rcv_saddr, sk-&gt;sk_num,</div><div class='add'>+					 &amp;sk-&gt;sk_v6_daddr, sk-&gt;sk_dport);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	udp_lib_rehash(sk, new_hash);</div><div class='add'>+	udp_lib_rehash(sk, new_hash, new_hash4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int compute_score(struct sock *sk, struct net *net,</div><div class='add'>+static int compute_score(struct sock *sk, const struct net *net,</div><div class='ctx'> 			 const struct in6_addr *saddr, __be16 sport,</div><div class='ctx'> 			 const struct in6_addr *daddr, unsigned short hnum,</div><div class='del'>-			 int dif, int sdif, bool exact_dif)</div><div class='add'>+			 int dif, int sdif)</div><div class='ctx'> {</div><div class='del'>-	int score;</div><div class='add'>+	int bound_dev_if, score;</div><div class='ctx'> 	struct inet_sock *inet;</div><div class='add'>+	bool dev_match;</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(sock_net(sk), net) ||</div><div class='ctx'> 	    udp_sk(sk)-&gt;udp_port_hash != hnum ||</div><div class='ctx'> 	    sk-&gt;sk_family != PF_INET6)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	if (!ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, daddr))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	score = 0;</div><div class='ctx'> 	inet = inet_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -132,134 +153,255 @@ static int compute_score(struct sock *sk, struct net *net,</div><div class='ctx'> 		score++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr)) {</div><div class='del'>-		if (!ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, daddr))</div><div class='del'>-			return -1;</div><div class='del'>-		score++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr)) {</div><div class='ctx'> 		if (!ipv6_addr_equal(&amp;sk-&gt;sk_v6_daddr, saddr))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		score++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_bound_dev_if || exact_dif) {</div><div class='del'>-		bool dev_match = (sk-&gt;sk_bound_dev_if == dif ||</div><div class='del'>-				  sk-&gt;sk_bound_dev_if == sdif);</div><div class='del'>-</div><div class='del'>-		if (!dev_match)</div><div class='del'>-			return -1;</div><div class='del'>-		if (sk-&gt;sk_bound_dev_if)</div><div class='del'>-			score++;</div><div class='del'>-	}</div><div class='add'>+	bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+	dev_match = udp_sk_bound_dev_eq(net, bound_dev_if, dif, sdif);</div><div class='add'>+	if (!dev_match)</div><div class='add'>+		return -1;</div><div class='add'>+	if (bound_dev_if)</div><div class='add'>+		score++;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_incoming_cpu == raw_smp_processor_id())</div><div class='add'>+	if (READ_ONCE(sk-&gt;sk_incoming_cpu) == raw_smp_processor_id())</div><div class='ctx'> 		score++;</div><div class='ctx'> </div><div class='ctx'> 	return score;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * udp6_lib_lookup1() - Simplified lookup using primary hash (destination port)</div><div class='add'>+ * @net:	Network namespace</div><div class='add'>+ * @saddr:	Source address, network order</div><div class='add'>+ * @sport:	Source port, network order</div><div class='add'>+ * @daddr:	Destination address, network order</div><div class='add'>+ * @hnum:	Destination port, host order</div><div class='add'>+ * @dif:	Destination interface index</div><div class='add'>+ * @sdif:	Destination bridge port index, if relevant</div><div class='add'>+ * @udptable:	Set of UDP hash tables</div><div class='add'>+ *</div><div class='add'>+ * Simplified lookup to be used as fallback if no sockets are found due to a</div><div class='add'>+ * potential race between (receive) address change, and lookup happening before</div><div class='add'>+ * the rehash operation. This function ignores SO_REUSEPORT groups while scoring</div><div class='add'>+ * result sockets, because if we have one, we don't need the fallback at all.</div><div class='add'>+ *</div><div class='add'>+ * Called under rcu_read_lock().</div><div class='add'>+ *</div><div class='add'>+ * Return: socket with highest matching score if any, NULL if none</div><div class='add'>+ */</div><div class='add'>+static struct sock *udp6_lib_lookup1(const struct net *net,</div><div class='add'>+				     const struct in6_addr *saddr, __be16 sport,</div><div class='add'>+				     const struct in6_addr *daddr,</div><div class='add'>+				     unsigned int hnum, int dif, int sdif,</div><div class='add'>+				     const struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	unsigned int slot = udp_hashfn(net, hnum, udptable-&gt;mask);</div><div class='add'>+	struct udp_hslot *hslot = &amp;udptable-&gt;hash[slot];</div><div class='add'>+	struct sock *sk, *result = NULL;</div><div class='add'>+	int score, badness = 0;</div><div class='add'>+</div><div class='add'>+	sk_for_each_rcu(sk, &amp;hslot-&gt;head) {</div><div class='add'>+		score = compute_score(sk, net,</div><div class='add'>+				      saddr, sport, daddr, hnum, dif, sdif);</div><div class='add'>+		if (score &gt; badness) {</div><div class='add'>+			result = sk;</div><div class='add'>+			badness = score;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='del'>-static struct sock *udp6_lib_lookup2(struct net *net,</div><div class='add'>+static struct sock *udp6_lib_lookup2(const struct net *net,</div><div class='ctx'> 		const struct in6_addr *saddr, __be16 sport,</div><div class='ctx'> 		const struct in6_addr *daddr, unsigned int hnum,</div><div class='del'>-		int dif, int sdif, bool exact_dif,</div><div class='del'>-		struct udp_hslot *hslot2, struct sk_buff *skb)</div><div class='add'>+		int dif, int sdif, struct udp_hslot *hslot2,</div><div class='add'>+		struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk, *result;</div><div class='ctx'> 	int score, badness;</div><div class='del'>-	u32 hash = 0;</div><div class='add'>+	bool need_rescore;</div><div class='ctx'> </div><div class='ctx'> 	result = NULL;</div><div class='ctx'> 	badness = -1;</div><div class='ctx'> 	udp_portaddr_for_each_entry_rcu(sk, &amp;hslot2-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, saddr, sport,</div><div class='del'>-				      daddr, hnum, dif, sdif, exact_dif);</div><div class='add'>+		need_rescore = false;</div><div class='add'>+rescore:</div><div class='add'>+		score = compute_score(need_rescore ? result : sk, net, saddr,</div><div class='add'>+				      sport, daddr, hnum, dif, sdif);</div><div class='ctx'> 		if (score &gt; badness) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				hash = udp6_ehashfn(net, daddr, hnum,</div><div class='del'>-						    saddr, sport);</div><div class='del'>-</div><div class='del'>-				result = reuseport_select_sock(sk, hash, skb,</div><div class='del'>-							sizeof(struct udphdr));</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='del'>-			result = sk;</div><div class='ctx'> 			badness = score;</div><div class='add'>+</div><div class='add'>+			if (need_rescore)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (sk-&gt;sk_state == TCP_ESTABLISHED) {</div><div class='add'>+				result = sk;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			result = inet6_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),</div><div class='add'>+							saddr, sport, daddr, hnum, udp6_ehashfn);</div><div class='add'>+			if (!result) {</div><div class='add'>+				result = sk;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Fall back to scoring if group has connections */</div><div class='add'>+			if (!reuseport_has_conns(sk))</div><div class='add'>+				return result;</div><div class='add'>+</div><div class='add'>+			/* Reuseport logic returned an error, keep original score. */</div><div class='add'>+			if (IS_ERR(result))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* compute_score is too long of a function to be</div><div class='add'>+			 * inlined, and calling it again here yields</div><div class='add'>+			 * measurable overhead for some</div><div class='add'>+			 * workloads. Work around it by jumping</div><div class='add'>+			 * backwards to rescore 'result'.</div><div class='add'>+			 */</div><div class='add'>+			need_rescore = true;</div><div class='add'>+			goto rescore;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_BASE_SMALL)</div><div class='add'>+static struct sock *udp6_lib_lookup4(const struct net *net,</div><div class='add'>+				     const struct in6_addr *saddr, __be16 sport,</div><div class='add'>+				     const struct in6_addr *daddr,</div><div class='add'>+				     unsigned int hnum, int dif, int sdif,</div><div class='add'>+				     struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp6_hash4(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_BASE_SMALL */</div><div class='add'>+static struct sock *udp6_lib_lookup4(const struct net *net,</div><div class='add'>+				     const struct in6_addr *saddr, __be16 sport,</div><div class='add'>+				     const struct in6_addr *daddr,</div><div class='add'>+				     unsigned int hnum, int dif, int sdif,</div><div class='add'>+				     struct udp_table *udptable)</div><div class='add'>+{</div><div class='add'>+	const __portpair ports = INET_COMBINED_PORTS(sport, hnum);</div><div class='add'>+	const struct hlist_nulls_node *node;</div><div class='add'>+	struct udp_hslot *hslot4;</div><div class='add'>+	unsigned int hash4, slot;</div><div class='add'>+	struct udp_sock *up;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	hash4 = udp6_ehashfn(net, daddr, hnum, saddr, sport);</div><div class='add'>+	slot = hash4 &amp; udptable-&gt;mask;</div><div class='add'>+	hslot4 = &amp;udptable-&gt;hash4[slot];</div><div class='add'>+</div><div class='add'>+begin:</div><div class='add'>+	udp_lrpa_for_each_entry_rcu(up, node, &amp;hslot4-&gt;nulls_head) {</div><div class='add'>+		sk = (struct sock *)up;</div><div class='add'>+		if (inet6_match(net, sk, saddr, daddr, ports, dif, sdif))</div><div class='add'>+			return sk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if the nulls value we got at the end of this lookup is not the</div><div class='add'>+	 * expected one, we must restart lookup. We probably met an item that</div><div class='add'>+	 * was moved to another chain due to rehash.</div><div class='add'>+	 */</div><div class='add'>+	if (get_nulls_value(node) != slot)</div><div class='add'>+		goto begin;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp6_hash4(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='add'>+	unsigned int hash;</div><div class='add'>+</div><div class='add'>+	if (ipv6_addr_v4mapped(&amp;sk-&gt;sk_v6_rcv_saddr)) {</div><div class='add'>+		udp4_hash4(sk);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk) || ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hash = udp6_ehashfn(net, &amp;sk-&gt;sk_v6_rcv_saddr, sk-&gt;sk_num,</div><div class='add'>+			    &amp;sk-&gt;sk_v6_daddr, sk-&gt;sk_dport);</div><div class='add'>+</div><div class='add'>+	udp_lib_hash4(sk, hash);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BASE_SMALL */</div><div class='add'>+</div><div class='ctx'> /* rcu_read_lock() must be held */</div><div class='del'>-struct sock *__udp6_lib_lookup(struct net *net,</div><div class='add'>+struct sock *__udp6_lib_lookup(const struct net *net,</div><div class='ctx'> 			       const struct in6_addr *saddr, __be16 sport,</div><div class='ctx'> 			       const struct in6_addr *daddr, __be16 dport,</div><div class='ctx'> 			       int dif, int sdif, struct udp_table *udptable,</div><div class='ctx'> 			       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk, *result;</div><div class='ctx'> 	unsigned short hnum = ntohs(dport);</div><div class='del'>-	unsigned int hash2, slot2, slot = udp_hashfn(net, hnum, udptable-&gt;mask);</div><div class='del'>-	struct udp_hslot *hslot2, *hslot = &amp;udptable-&gt;hash[slot];</div><div class='del'>-	bool exact_dif = udp6_lib_exact_dif_match(net, skb);</div><div class='del'>-	int score, badness;</div><div class='del'>-	u32 hash = 0;</div><div class='del'>-</div><div class='del'>-	if (hslot-&gt;count &gt; 10) {</div><div class='del'>-		hash2 = ipv6_portaddr_hash(net, daddr, hnum);</div><div class='del'>-		slot2 = hash2 &amp; udptable-&gt;mask;</div><div class='del'>-		hslot2 = &amp;udptable-&gt;hash2[slot2];</div><div class='del'>-		if (hslot-&gt;count &lt; hslot2-&gt;count)</div><div class='del'>-			goto begin;</div><div class='del'>-</div><div class='del'>-		result = udp6_lib_lookup2(net, saddr, sport,</div><div class='del'>-					  daddr, hnum, dif, sdif, exact_dif,</div><div class='del'>-					  hslot2, skb);</div><div class='del'>-		if (!result) {</div><div class='del'>-			unsigned int old_slot2 = slot2;</div><div class='del'>-			hash2 = ipv6_portaddr_hash(net, &amp;in6addr_any, hnum);</div><div class='del'>-			slot2 = hash2 &amp; udptable-&gt;mask;</div><div class='del'>-			/* avoid searching the same slot again. */</div><div class='del'>-			if (unlikely(slot2 == old_slot2))</div><div class='del'>-				return result;</div><div class='del'>-</div><div class='del'>-			hslot2 = &amp;udptable-&gt;hash2[slot2];</div><div class='del'>-			if (hslot-&gt;count &lt; hslot2-&gt;count)</div><div class='del'>-				goto begin;</div><div class='del'>-</div><div class='del'>-			result = udp6_lib_lookup2(net, saddr, sport,</div><div class='del'>-						  daddr, hnum, dif, sdif,</div><div class='del'>-						  exact_dif, hslot2,</div><div class='del'>-						  skb);</div><div class='del'>-		}</div><div class='del'>-		if (unlikely(IS_ERR(result)))</div><div class='del'>-			return NULL;</div><div class='del'>-		return result;</div><div class='add'>+	struct udp_hslot *hslot2;</div><div class='add'>+	struct sock *result, *sk;</div><div class='add'>+	unsigned int hash2;</div><div class='add'>+</div><div class='add'>+	hash2 = ipv6_portaddr_hash(net, daddr, hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+</div><div class='add'>+	if (udp_has_hash4(hslot2)) {</div><div class='add'>+		result = udp6_lib_lookup4(net, saddr, sport, daddr, hnum,</div><div class='add'>+					  dif, sdif, udptable);</div><div class='add'>+		if (result) /* udp6_lib_lookup4 return sk or NULL */</div><div class='add'>+			return result;</div><div class='ctx'> 	}</div><div class='del'>-begin:</div><div class='del'>-	result = NULL;</div><div class='del'>-	badness = -1;</div><div class='del'>-	sk_for_each_rcu(sk, &amp;hslot-&gt;head) {</div><div class='del'>-		score = compute_score(sk, net, saddr, sport, daddr, hnum, dif,</div><div class='del'>-				      sdif, exact_dif);</div><div class='del'>-		if (score &gt; badness) {</div><div class='del'>-			if (sk-&gt;sk_reuseport) {</div><div class='del'>-				hash = udp6_ehashfn(net, daddr, hnum,</div><div class='del'>-						    saddr, sport);</div><div class='del'>-				result = reuseport_select_sock(sk, hash, skb,</div><div class='del'>-							sizeof(struct udphdr));</div><div class='del'>-				if (unlikely(IS_ERR(result)))</div><div class='del'>-					return NULL;</div><div class='del'>-				if (result)</div><div class='del'>-					return result;</div><div class='del'>-			}</div><div class='add'>+</div><div class='add'>+	/* Lookup connected or non-wildcard sockets */</div><div class='add'>+	result = udp6_lib_lookup2(net, saddr, sport,</div><div class='add'>+				  daddr, hnum, dif, sdif,</div><div class='add'>+				  hslot2, skb);</div><div class='add'>+	if (!IS_ERR_OR_NULL(result) &amp;&amp; result-&gt;sk_state == TCP_ESTABLISHED)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Lookup redirect from BPF */</div><div class='add'>+	if (static_branch_unlikely(&amp;bpf_sk_lookup_enabled) &amp;&amp;</div><div class='add'>+	    udptable == net-&gt;ipv4.udp_table) {</div><div class='add'>+		sk = inet6_lookup_run_sk_lookup(net, IPPROTO_UDP, skb, sizeof(struct udphdr),</div><div class='add'>+						saddr, sport, daddr, hnum, dif,</div><div class='add'>+						udp6_ehashfn);</div><div class='add'>+		if (sk) {</div><div class='ctx'> 			result = sk;</div><div class='del'>-			badness = score;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Got non-wildcard socket or error on first lookup */</div><div class='add'>+	if (result)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Lookup wildcard sockets */</div><div class='add'>+	hash2 = ipv6_portaddr_hash(net, &amp;in6addr_any, hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+</div><div class='add'>+	result = udp6_lib_lookup2(net, saddr, sport,</div><div class='add'>+				  &amp;in6addr_any, hnum, dif, sdif,</div><div class='add'>+				  hslot2, skb);</div><div class='add'>+	if (!IS_ERR_OR_NULL(result))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Cover address change/lookup/rehash race: see __udp4_lib_lookup() */</div><div class='add'>+	result = udp6_lib_lookup1(net, saddr, sport, daddr, hnum, dif, sdif,</div><div class='add'>+				  udptable);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (IS_ERR(result))</div><div class='add'>+		return NULL;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__udp6_lib_lookup);</div><div class='hunk'>@@ -275,28 +417,32 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,</div><div class='ctx'> 				 inet6_sdif(skb), udptable, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sock *udp6_lib_lookup_skb(struct sk_buff *skb,</div><div class='add'>+struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,</div><div class='ctx'> 				 __be16 sport, __be16 dport)</div><div class='ctx'> {</div><div class='del'>-	const struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct ipv6hdr *iph = (struct ipv6hdr *)(skb-&gt;data + offset);</div><div class='add'>+	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	int iif, sdif;</div><div class='ctx'> </div><div class='del'>-	return __udp6_lib_lookup(dev_net(skb-&gt;dev), &amp;iph-&gt;saddr, sport,</div><div class='del'>-				 &amp;iph-&gt;daddr, dport, inet6_iif(skb),</div><div class='del'>-				 inet6_sdif(skb), &amp;udp_table, skb);</div><div class='add'>+	inet6_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+</div><div class='add'>+	return __udp6_lib_lookup(net, &amp;iph-&gt;saddr, sport,</div><div class='add'>+				 &amp;iph-&gt;daddr, dport, iif,</div><div class='add'>+				 sdif, net-&gt;ipv4.udp_table, NULL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(udp6_lib_lookup_skb);</div><div class='ctx'> </div><div class='ctx'> /* Must be called under rcu_read_lock().</div><div class='ctx'>  * Does increment socket refcount.</div><div class='ctx'>  */</div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_TPROXY_IPV6) || IS_ENABLED(CONFIG_NF_SOCKET_IPV6)</div><div class='del'>-struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,</div><div class='add'>+struct sock *udp6_lib_lookup(const struct net *net, const struct in6_addr *saddr, __be16 sport,</div><div class='ctx'> 			     const struct in6_addr *daddr, __be16 dport, int dif)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	sk =  __udp6_lib_lookup(net, saddr, sport, daddr, dport,</div><div class='del'>-				dif, 0, &amp;udp_table, NULL);</div><div class='add'>+				dif, 0, net-&gt;ipv4.udp_table, NULL);</div><div class='ctx'> 	if (sk &amp;&amp; !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='ctx'> 		sk = NULL;</div><div class='ctx'> 	return sk;</div><div class='hunk'>@@ -304,7 +450,7 @@ struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be</div><div class='ctx'> EXPORT_SYMBOL_GPL(udp6_lib_lookup);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* do not use the scratch area len for jumbogram: their length execeeds the</div><div class='add'>+/* do not use the scratch area len for jumbogram: their length exceeds the</div><div class='ctx'>  * scratch area space; note that the IP6CB flags is still in the first</div><div class='ctx'>  * cacheline, so checking for jumbograms is cheap</div><div class='ctx'>  */</div><div class='hunk'>@@ -319,28 +465,27 @@ static int udp6_skb_len(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-		  int noblock, int flags, int *addr_len)</div><div class='add'>+		  int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int ulen, copied;</div><div class='del'>-	int peeked, peeking, off;</div><div class='del'>-	int err;</div><div class='add'>+	int off, err, peeking = flags &amp; MSG_PEEK;</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='add'>+	struct udp_mib __percpu *mib;</div><div class='ctx'> 	bool checksum_valid = false;</div><div class='ctx'> 	int is_udp4;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_ERRQUEUE)</div><div class='ctx'> 		return ipv6_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;rxpmtu &amp;&amp; np-&gt;rxopt.bits.rxpmtu)</div><div class='add'>+	if (np-&gt;rxopt.bits.rxpmtu &amp;&amp; READ_ONCE(np-&gt;rxpmtu))</div><div class='ctx'> 		return ipv6_recv_rxpmtu(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='ctx'> try_again:</div><div class='del'>-	peeking = flags &amp; MSG_PEEK;</div><div class='ctx'> 	off = sk_peek_offset(sk, flags);</div><div class='del'>-	skb = __skb_recv_udp(sk, flags, noblock, &amp;peeked, &amp;off, &amp;err);</div><div class='add'>+	skb = __skb_recv_udp(sk, flags, &amp;off, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -352,6 +497,7 @@ try_again:</div><div class='ctx'> 		msg-&gt;msg_flags |= MSG_TRUNC;</div><div class='ctx'> </div><div class='ctx'> 	is_udp4 = (skb-&gt;protocol == htons(ETH_P_IP));</div><div class='add'>+	mib = __UDPX_MIB(sk, is_udp4);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If checksum is needed at all, try to do it while copying the</div><div class='hunk'>@@ -378,28 +524,17 @@ try_again:</div><div class='ctx'> 			goto csum_copy_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		if (!peeked) {</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-			if (is_udp4)</div><div class='del'>-				UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS,</div><div class='del'>-					      is_udplite);</div><div class='del'>-			else</div><div class='del'>-				UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS,</div><div class='del'>-					       is_udplite);</div><div class='add'>+		if (!peeking) {</div><div class='add'>+			udp_drops_inc(sk);</div><div class='add'>+			SNMP_INC_STATS(mib, UDP_MIB_INERRORS);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (!peeked) {</div><div class='del'>-		if (is_udp4)</div><div class='del'>-			UDP_INC_STATS(sock_net(sk), UDP_MIB_INDATAGRAMS,</div><div class='del'>-				      is_udplite);</div><div class='del'>-		else</div><div class='del'>-			UDP6_INC_STATS(sock_net(sk), UDP_MIB_INDATAGRAMS,</div><div class='del'>-				       is_udplite);</div><div class='del'>-	}</div><div class='add'>+	if (!peeking)</div><div class='add'>+		SNMP_INC_STATS(mib, UDP_MIB_INDATAGRAMS);</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the address. */</div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='hunk'>@@ -419,13 +554,20 @@ try_again:</div><div class='ctx'> 						    inet6_iif(skb));</div><div class='ctx'> 		}</div><div class='ctx'> 		*addr_len = sizeof(*sin6);</div><div class='add'>+</div><div class='add'>+		BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK(sk,</div><div class='add'>+						      (struct sockaddr *)sin6,</div><div class='add'>+						      addr_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (udp_test_bit(GRO_ENABLED, sk))</div><div class='add'>+		udp_cmsg_recv(msg, sk, skb);</div><div class='add'>+</div><div class='ctx'> 	if (np-&gt;rxopt.all)</div><div class='ctx'> 		ip6_datagram_recv_common_ctl(sk, msg, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (is_udp4) {</div><div class='del'>-		if (inet-&gt;cmsg_flags)</div><div class='add'>+		if (inet_cmsg_flags(inet))</div><div class='ctx'> 			ip_cmsg_recv_offset(msg, sk, skb,</div><div class='ctx'> 					    sizeof(struct udphdr), off);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -443,19 +585,10 @@ try_again:</div><div class='ctx'> csum_copy_err:</div><div class='ctx'> 	if (!__sk_queue_drop_skb(sk, &amp;udp_sk(sk)-&gt;reader_queue, skb, flags,</div><div class='ctx'> 				 udp_skb_destructor)) {</div><div class='del'>-		if (is_udp4) {</div><div class='del'>-			UDP_INC_STATS(sock_net(sk),</div><div class='del'>-				      UDP_MIB_CSUMERRORS, is_udplite);</div><div class='del'>-			UDP_INC_STATS(sock_net(sk),</div><div class='del'>-				      UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-		} else {</div><div class='del'>-			UDP6_INC_STATS(sock_net(sk),</div><div class='del'>-				       UDP_MIB_CSUMERRORS, is_udplite);</div><div class='del'>-			UDP6_INC_STATS(sock_net(sk),</div><div class='del'>-				       UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-		}</div><div class='add'>+		SNMP_INC_STATS(mib, UDP_MIB_CSUMERRORS);</div><div class='add'>+		SNMP_INC_STATS(mib, UDP_MIB_INERRORS);</div><div class='ctx'> 	}</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	kfree_skb_reason(skb, SKB_DROP_REASON_UDP_CSUM);</div><div class='ctx'> </div><div class='ctx'> 	/* starting over for a new packet, but check if we need to yield */</div><div class='ctx'> 	cond_resched();</div><div class='hunk'>@@ -463,26 +596,146 @@ csum_copy_err:</div><div class='ctx'> 	goto try_again;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='del'>-		    u8 type, u8 code, int offset, __be32 info,</div><div class='del'>-		    struct udp_table *udptable)</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key);</div><div class='add'>+void udpv6_encap_enable(void)</div><div class='add'>+{</div><div class='add'>+	static_branch_inc(&amp;udpv6_encap_needed_key);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(udpv6_encap_enable);</div><div class='add'>+</div><div class='add'>+/* Handler for tunnels with arbitrary destination ports: no socket lookup, go</div><div class='add'>+ * through error handlers in encapsulations looking for a match.</div><div class='add'>+ */</div><div class='add'>+static int __udp6_lib_err_encap_no_sk(struct sk_buff *skb,</div><div class='add'>+				      struct inet6_skb_parm *opt,</div><div class='add'>+				      u8 type, u8 code, int offset, __be32 info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_IPTUN_ENCAP_OPS; i++) {</div><div class='add'>+		int (*handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+			       u8 type, u8 code, int offset, __be32 info);</div><div class='add'>+		const struct ip6_tnl_encap_ops *encap;</div><div class='add'>+</div><div class='add'>+		encap = rcu_dereference(ip6tun_encaps[i]);</div><div class='add'>+		if (!encap)</div><div class='add'>+			continue;</div><div class='add'>+		handler = encap-&gt;err_handler;</div><div class='add'>+		if (handler &amp;&amp; !handler(skb, opt, type, code, offset, info))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to match ICMP errors to UDP tunnels by looking up a socket without</div><div class='add'>+ * reversing source and destination port: this will match tunnels that force the</div><div class='add'>+ * same destination port on both endpoints (e.g. VXLAN, GENEVE). Note that</div><div class='add'>+ * lwtunnels might actually break this assumption by being configured with</div><div class='add'>+ * different destination ports on endpoints, in this case we won't be able to</div><div class='add'>+ * trace ICMP messages back to them.</div><div class='add'>+ *</div><div class='add'>+ * If this doesn't match any socket, probe tunnels with arbitrary destination</div><div class='add'>+ * ports (e.g. FoU, GUE): there, the receiving socket is useless, as the port</div><div class='add'>+ * we've sent packets to won't necessarily match the local destination port.</div><div class='add'>+ *</div><div class='add'>+ * Then ask the tunnel implementation to match the error against a valid</div><div class='add'>+ * association.</div><div class='add'>+ *</div><div class='add'>+ * Return an error if we can't find a match, the socket if we need further</div><div class='add'>+ * processing, zero otherwise.</div><div class='add'>+ */</div><div class='add'>+static struct sock *__udp6_lib_err_encap(struct net *net,</div><div class='add'>+					 const struct ipv6hdr *hdr, int offset,</div><div class='add'>+					 struct udphdr *uh,</div><div class='add'>+					 struct udp_table *udptable,</div><div class='add'>+					 struct sock *sk,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 struct inet6_skb_parm *opt,</div><div class='add'>+					 u8 type, u8 code, __be32 info)</div><div class='add'>+{</div><div class='add'>+	int (*lookup)(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+	int network_offset, transport_offset;</div><div class='add'>+	struct udp_sock *up;</div><div class='add'>+</div><div class='add'>+	network_offset = skb_network_offset(skb);</div><div class='add'>+	transport_offset = skb_transport_offset(skb);</div><div class='add'>+</div><div class='add'>+	/* Network header needs to point to the outer IPv6 header inside ICMP */</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Transport header needs to point to the UDP header */</div><div class='add'>+	skb_set_transport_header(skb, offset);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		up = udp_sk(sk);</div><div class='add'>+</div><div class='add'>+		lookup = READ_ONCE(up-&gt;encap_err_lookup);</div><div class='add'>+		if (lookup &amp;&amp; lookup(sk, skb))</div><div class='add'>+			sk = NULL;</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk = __udp6_lib_lookup(net, &amp;hdr-&gt;daddr, uh-&gt;source,</div><div class='add'>+			       &amp;hdr-&gt;saddr, uh-&gt;dest,</div><div class='add'>+			       inet6_iif(skb), 0, udptable, skb);</div><div class='add'>+	if (sk) {</div><div class='add'>+		up = udp_sk(sk);</div><div class='add'>+</div><div class='add'>+		lookup = READ_ONCE(up-&gt;encap_err_lookup);</div><div class='add'>+		if (!lookup || lookup(sk, skb))</div><div class='add'>+			sk = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!sk) {</div><div class='add'>+		sk = ERR_PTR(__udp6_lib_err_encap_no_sk(skb, opt, type, code,</div><div class='add'>+							offset, info));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, transport_offset);</div><div class='add'>+	skb_set_network_header(skb, network_offset);</div><div class='add'>+</div><div class='add'>+	return sk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+		   u8 type, u8 code, int offset, __be32 info,</div><div class='add'>+		   struct udp_table *udptable)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np;</div><div class='ctx'> 	const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb-&gt;data;</div><div class='ctx'> 	const struct in6_addr *saddr = &amp;hdr-&gt;saddr;</div><div class='del'>-	const struct in6_addr *daddr = &amp;hdr-&gt;daddr;</div><div class='add'>+	const struct in6_addr *daddr = seg6_get_daddr(skb, opt) ? : &amp;hdr-&gt;daddr;</div><div class='ctx'> 	struct udphdr *uh = (struct udphdr *)(skb-&gt;data+offset);</div><div class='add'>+	bool tunnel = false;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	int harderr;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	sk = __udp6_lib_lookup(net, daddr, uh-&gt;dest, saddr, uh-&gt;source,</div><div class='del'>-			       inet6_iif(skb), 0, udptable, skb);</div><div class='del'>-	if (!sk) {</div><div class='del'>-		__ICMP6_INC_STATS(net, __in6_dev_get(skb-&gt;dev),</div><div class='del'>-				  ICMP6_MIB_INERRORS);</div><div class='del'>-		return;</div><div class='add'>+			       inet6_iif(skb), inet6_sdif(skb), udptable, NULL);</div><div class='add'>+</div><div class='add'>+	if (!sk || READ_ONCE(udp_sk(sk)-&gt;encap_type)) {</div><div class='add'>+		/* No socket for error: try tunnels before discarding */</div><div class='add'>+		if (static_branch_unlikely(&amp;udpv6_encap_needed_key)) {</div><div class='add'>+			sk = __udp6_lib_err_encap(net, hdr, offset, uh,</div><div class='add'>+						  udptable, sk, skb,</div><div class='add'>+						  opt, type, code, info);</div><div class='add'>+			if (!sk)</div><div class='add'>+				return 0;</div><div class='add'>+		} else</div><div class='add'>+			sk = ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(sk)) {</div><div class='add'>+			__ICMP6_INC_STATS(net, __in6_dev_get(skb-&gt;dev),</div><div class='add'>+					  ICMP6_MIB_INERRORS);</div><div class='add'>+			return PTR_ERR(sk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tunnel = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	harderr = icmpv6_err_convert(type, code, &amp;err);</div><div class='hunk'>@@ -492,15 +745,29 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 		if (!ip6_sk_accept_pmtu(sk))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		ip6_sk_update_pmtu(skb, sk, info);</div><div class='del'>-		if (np-&gt;pmtudisc != IPV6_PMTUDISC_DONT)</div><div class='add'>+		if (READ_ONCE(np-&gt;pmtudisc) != IPV6_PMTUDISC_DONT)</div><div class='ctx'> 			harderr = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (type == NDISC_REDIRECT) {</div><div class='del'>-		ip6_sk_redirect(skb, sk);</div><div class='add'>+		if (tunnel) {</div><div class='add'>+			ip6_redirect(skb, sock_net(sk), inet6_iif(skb),</div><div class='add'>+				     READ_ONCE(sk-&gt;sk_mark),</div><div class='add'>+				     sk_uid(sk));</div><div class='add'>+		} else {</div><div class='add'>+			ip6_sk_redirect(skb, sk);</div><div class='add'>+		}</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tunnels don't have an application socket: don't pass errors back */</div><div class='add'>+	if (tunnel) {</div><div class='add'>+		if (udp_sk(sk)-&gt;encap_err_rcv)</div><div class='add'>+			udp_sk(sk)-&gt;encap_err_rcv(sk, skb, err, uh-&gt;dest,</div><div class='add'>+						  ntohl(info), (u8 *)(uh+1));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!np-&gt;recverr) {</div><div class='add'>+	if (!inet6_test_bit(RECVERR6, sk)) {</div><div class='ctx'> 		if (!harderr || sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -508,9 +775,9 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_err = err;</div><div class='del'>-	sk-&gt;sk_error_report(sk);</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> out:</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='hunk'>@@ -528,42 +795,49 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	rc = __udp_enqueue_schedule_skb(sk, skb);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		int is_udplite = IS_UDPLITE(sk);</div><div class='add'>+		enum skb_drop_reason drop_reason;</div><div class='ctx'> </div><div class='ctx'> 		/* Note that an ENOMEM error is charged twice */</div><div class='del'>-		if (rc == -ENOMEM)</div><div class='add'>+		if (rc == -ENOMEM) {</div><div class='ctx'> 			UDP6_INC_STATS(sock_net(sk),</div><div class='ctx'> 					 UDP_MIB_RCVBUFERRORS, is_udplite);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_SOCKET_RCVBUFF;</div><div class='add'>+		} else {</div><div class='add'>+			UDP6_INC_STATS(sock_net(sk),</div><div class='add'>+				       UDP_MIB_MEMERRORS, is_udplite);</div><div class='add'>+			drop_reason = SKB_DROP_REASON_PROTO_MEM;</div><div class='add'>+		}</div><div class='ctx'> 		UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		trace_udp_fail_queue_rcv_skb(rc, sk, skb);</div><div class='add'>+		sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __inline__ void udpv6_err(struct sk_buff *skb,</div><div class='del'>-				 struct inet6_skb_parm *opt, u8 type,</div><div class='del'>-				 u8 code, int offset, __be32 info)</div><div class='del'>-{</div><div class='del'>-	__udp6_lib_err(skb, opt, type, code, offset, info, &amp;udp_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);</div><div class='del'>-void udpv6_encap_enable(void)</div><div class='add'>+static __inline__ int udpv6_err(struct sk_buff *skb,</div><div class='add'>+				struct inet6_skb_parm *opt, u8 type,</div><div class='add'>+				u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='del'>-	static_branch_enable(&amp;udpv6_encap_needed_key);</div><div class='add'>+	return __udp6_lib_err(skb, opt, type, code, offset, info,</div><div class='add'>+			      dev_net(skb-&gt;dev)-&gt;ipv4.udp_table);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(udpv6_encap_enable);</div><div class='ctx'> </div><div class='del'>-static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> </div><div class='del'>-	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='add'>+	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {</div><div class='add'>+		drop_reason = SKB_DROP_REASON_XFRM_POLICY;</div><div class='ctx'> 		goto drop;</div><div class='add'>+	}</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;udpv6_encap_needed_key) &amp;&amp; up-&gt;encap_type) {</div><div class='add'>+	if (static_branch_unlikely(&amp;udpv6_encap_needed_key) &amp;&amp;</div><div class='add'>+	    READ_ONCE(up-&gt;encap_type)) {</div><div class='ctx'> 		int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -588,9 +862,9 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 			ret = encap_rcv(sk, skb);</div><div class='ctx'> 			if (ret &lt;= 0) {</div><div class='del'>-				__UDP_INC_STATS(sock_net(sk),</div><div class='del'>-						UDP_MIB_INDATAGRAMS,</div><div class='del'>-						is_udplite);</div><div class='add'>+				__UDP6_INC_STATS(sock_net(sk),</div><div class='add'>+						 UDP_MIB_INDATAGRAMS,</div><div class='add'>+						 is_udplite);</div><div class='ctx'> 				return -ret;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -601,16 +875,17 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c).</div><div class='ctx'> 	 */</div><div class='del'>-	if ((is_udplite &amp; UDPLITE_RECV_CC)  &amp;&amp;  UDP_SKB_CB(skb)-&gt;partial_cov) {</div><div class='add'>+	if (udp_test_bit(UDPLITE_RECV_CC, sk) &amp;&amp; UDP_SKB_CB(skb)-&gt;partial_cov) {</div><div class='add'>+		u16 pcrlen = READ_ONCE(up-&gt;pcrlen);</div><div class='ctx'> </div><div class='del'>-		if (up-&gt;pcrlen == 0) {          /* full coverage was set  */</div><div class='add'>+		if (pcrlen == 0) {          /* full coverage was set  */</div><div class='ctx'> 			net_dbg_ratelimited("UDPLITE6: partial coverage %d while full coverage %d requested\n",</div><div class='ctx'> 					    UDP_SKB_CB(skb)-&gt;cscov, skb-&gt;len);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='del'>-		if (UDP_SKB_CB(skb)-&gt;cscov  &lt;  up-&gt;pcrlen) {</div><div class='add'>+		if (UDP_SKB_CB(skb)-&gt;cscov &lt; pcrlen) {</div><div class='ctx'> 			net_dbg_ratelimited("UDPLITE6: coverage %d too small, need min %d\n",</div><div class='del'>-					    UDP_SKB_CB(skb)-&gt;cscov, up-&gt;pcrlen);</div><div class='add'>+					    UDP_SKB_CB(skb)-&gt;cscov, pcrlen);</div><div class='ctx'> 			goto drop;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -620,7 +895,7 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	    udp_lib_checksum_complete(skb))</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='del'>-	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr)))</div><div class='add'>+	if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr), &amp;drop_reason))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	udp_csum_pull_header(skb);</div><div class='hunk'>@@ -630,20 +905,43 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return __udpv6_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='ctx'> csum_error:</div><div class='add'>+	drop_reason = SKB_DROP_REASON_UDP_CSUM;</div><div class='ctx'> 	__UDP6_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);</div><div class='ctx'> drop:</div><div class='ctx'> 	__UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);</div><div class='del'>-	atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	udp_drops_inc(sk);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, drop_reason);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk,</div><div class='add'>+static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *next, *segs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (likely(!udp_unexpected_gso(sk, skb)))</div><div class='add'>+		return udpv6_queue_rcv_one_skb(sk, skb);</div><div class='add'>+</div><div class='add'>+	__skb_push(skb, -skb_mac_offset(skb));</div><div class='add'>+	segs = udp_rcv_segment(sk, skb, false);</div><div class='add'>+	skb_list_walk_safe(segs, skb, next) {</div><div class='add'>+		__skb_pull(skb, skb_transport_offset(skb));</div><div class='add'>+</div><div class='add'>+		udp_post_segment_fix_csum(skb);</div><div class='add'>+		ret = udpv6_queue_rcv_one_skb(sk, skb);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			ip6_protocol_deliver_rcu(dev_net(skb-&gt;dev), skb, ret,</div><div class='add'>+						 true);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __udp_v6_is_mcast_sock(struct net *net, const struct sock *sk,</div><div class='ctx'> 				   __be16 loc_port, const struct in6_addr *loc_addr,</div><div class='ctx'> 				   __be16 rmt_port, const struct in6_addr *rmt_addr,</div><div class='del'>-				   int dif, unsigned short hnum)</div><div class='add'>+				   int dif, int sdif, unsigned short hnum)</div><div class='ctx'> {</div><div class='del'>-	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	const struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (!net_eq(sock_net(sk), net))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -653,7 +951,7 @@ static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk,</div><div class='ctx'> 	    (inet-&gt;inet_dport &amp;&amp; inet-&gt;inet_dport != rmt_port) ||</div><div class='ctx'> 	    (!ipv6_addr_any(&amp;sk-&gt;sk_v6_daddr) &amp;&amp;</div><div class='ctx'> 		    !ipv6_addr_equal(&amp;sk-&gt;sk_v6_daddr, rmt_addr)) ||</div><div class='del'>-	    (sk-&gt;sk_bound_dev_if &amp;&amp; sk-&gt;sk_bound_dev_if != dif) ||</div><div class='add'>+	    !udp_sk_bound_dev_eq(net, READ_ONCE(sk-&gt;sk_bound_dev_if), dif, sdif) ||</div><div class='ctx'> 	    (!ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr) &amp;&amp;</div><div class='ctx'> 		    !ipv6_addr_equal(&amp;sk-&gt;sk_v6_rcv_saddr, loc_addr)))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -687,6 +985,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 	unsigned int offset = offsetof(typeof(*sk), sk_node);</div><div class='ctx'> 	unsigned int hash2 = 0, hash2_any = 0, use_hash2 = (hslot-&gt;count &gt; 10);</div><div class='ctx'> 	int dif = inet6_iif(skb);</div><div class='add'>+	int sdif = inet6_sdif(skb);</div><div class='ctx'> 	struct hlist_node *node;</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='ctx'> </div><div class='hunk'>@@ -695,18 +994,19 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,</div><div class='ctx'> 			    udptable-&gt;mask;</div><div class='ctx'> 		hash2 = ipv6_portaddr_hash(net, daddr, hnum) &amp; udptable-&gt;mask;</div><div class='ctx'> start_lookup:</div><div class='del'>-		hslot = &amp;udptable-&gt;hash2[hash2];</div><div class='add'>+		hslot = &amp;udptable-&gt;hash2[hash2].hslot;</div><div class='ctx'> 		offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk_for_each_entry_offset_rcu(sk, node, &amp;hslot-&gt;head, offset) {</div><div class='ctx'> 		if (!__udp_v6_is_mcast_sock(net, sk, uh-&gt;dest, daddr,</div><div class='del'>-					    uh-&gt;source, saddr, dif, hnum))</div><div class='add'>+					    uh-&gt;source, saddr, dif, sdif,</div><div class='add'>+					    hnum))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* If zero checksum and no_check is not on for</div><div class='ctx'> 		 * the socket then skip it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!uh-&gt;check &amp;&amp; !udp_sk(sk)-&gt;no_check6_rx)</div><div class='add'>+		if (!uh-&gt;check &amp;&amp; !udp_get_no_check6_rx(sk))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!first) {</div><div class='ctx'> 			first = sk;</div><div class='hunk'>@@ -714,7 +1014,7 @@ start_lookup:</div><div class='ctx'> 		}</div><div class='ctx'> 		nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 		if (unlikely(!nskb)) {</div><div class='del'>-			atomic_inc(&amp;sk-&gt;sk_drops);</div><div class='add'>+			udp_drops_inc(sk);</div><div class='ctx'> 			__UDP6_INC_STATS(net, UDP_MIB_RCVBUFERRORS,</div><div class='ctx'> 					 IS_UDPLITE(sk));</div><div class='ctx'> 			__UDP6_INC_STATS(net, UDP_MIB_INERRORS,</div><div class='hunk'>@@ -745,14 +1045,11 @@ start_lookup:</div><div class='ctx'> </div><div class='ctx'> static void udp6_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst)</div><div class='ctx'> {</div><div class='del'>-	if (udp_sk_rx_dst_set(sk, dst)) {</div><div class='del'>-		const struct rt6_info *rt = (const struct rt6_info *)dst;</div><div class='del'>-</div><div class='del'>-		inet6_sk(sk)-&gt;rx_dst_cookie = rt6_get_cookie(rt);</div><div class='del'>-	}</div><div class='add'>+	if (udp_sk_rx_dst_set(sk, dst))</div><div class='add'>+		sk-&gt;sk_rx_dst_cookie = rt6_get_cookie(dst_rt6_info(dst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* wrapper for udp_queue_rcv_skb tacking care of csum conversion and</div><div class='add'>+/* wrapper for udp_queue_rcv_skb taking care of csum conversion and</div><div class='ctx'>  * return code conversion for ip layer consumption</div><div class='ctx'>  */</div><div class='ctx'> static int udp6_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,</div><div class='hunk'>@@ -761,26 +1058,25 @@ static int udp6_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (inet_get_convert_csum(sk) &amp;&amp; uh-&gt;check &amp;&amp; !IS_UDPLITE(sk))</div><div class='del'>-		skb_checksum_try_convert(skb, IPPROTO_UDP, uh-&gt;check,</div><div class='del'>-					 ip6_compute_pseudo);</div><div class='add'>+		skb_checksum_try_convert(skb, IPPROTO_UDP, ip6_compute_pseudo);</div><div class='ctx'> </div><div class='ctx'> 	ret = udpv6_queue_rcv_skb(sk, skb);</div><div class='ctx'> </div><div class='del'>-	/* a return value &gt; 0 means to resubmit the input, but</div><div class='del'>-	 * it wants the return to be -protocol, or 0</div><div class='del'>-	 */</div><div class='add'>+	/* a return value &gt; 0 means to resubmit the input */</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		return -ret;</div><div class='add'>+		return ret;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 		   int proto)</div><div class='ctx'> {</div><div class='add'>+	enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;</div><div class='ctx'> 	const struct in6_addr *saddr, *daddr;</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct sock *sk = NULL;</div><div class='ctx'> 	struct udphdr *uh;</div><div class='del'>-	struct sock *sk;</div><div class='add'>+	bool refcounted;</div><div class='ctx'> 	u32 ulen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, sizeof(struct udphdr)))</div><div class='hunk'>@@ -817,21 +1113,27 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 		goto csum_error;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the socket is already available, e.g. due to early demux */</div><div class='del'>-	sk = skb_steal_sock(skb);</div><div class='add'>+	sk = inet6_steal_sock(net, skb, sizeof(struct udphdr), saddr, uh-&gt;source, daddr, uh-&gt;dest,</div><div class='add'>+			      &amp;refcounted, udp6_ehashfn);</div><div class='add'>+	if (IS_ERR(sk))</div><div class='add'>+		goto no_sk;</div><div class='add'>+</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(sk-&gt;sk_rx_dst != dst))</div><div class='add'>+		if (unlikely(rcu_dereference(sk-&gt;sk_rx_dst) != dst))</div><div class='ctx'> 			udp6_sk_rx_dst_set(sk, dst);</div><div class='ctx'> </div><div class='del'>-		if (!uh-&gt;check &amp;&amp; !udp_sk(sk)-&gt;no_check6_rx) {</div><div class='del'>-			sock_put(sk);</div><div class='add'>+		if (!uh-&gt;check &amp;&amp; !udp_get_no_check6_rx(sk)) {</div><div class='add'>+			if (refcounted)</div><div class='add'>+				sock_put(sk);</div><div class='ctx'> 			goto report_csum_error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = udp6_unicast_rcv_skb(sk, skb, uh);</div><div class='del'>-		sock_put(sk);</div><div class='add'>+		if (refcounted)</div><div class='add'>+			sock_put(sk);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -845,16 +1147,19 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 	/* Unicast */</div><div class='ctx'> 	sk = __udp6_lib_lookup_skb(skb, uh-&gt;source, uh-&gt;dest, udptable);</div><div class='ctx'> 	if (sk) {</div><div class='del'>-		if (!uh-&gt;check &amp;&amp; !udp_sk(sk)-&gt;no_check6_rx)</div><div class='add'>+		if (!uh-&gt;check &amp;&amp; !udp_get_no_check6_rx(sk))</div><div class='ctx'> 			goto report_csum_error;</div><div class='ctx'> 		return udp6_unicast_rcv_skb(sk, skb, uh);</div><div class='ctx'> 	}</div><div class='add'>+no_sk:</div><div class='add'>+	reason = SKB_DROP_REASON_NO_SOCKET;</div><div class='ctx'> </div><div class='ctx'> 	if (!uh-&gt;check)</div><div class='ctx'> 		goto report_csum_error;</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto discard;</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (udp_lib_checksum_complete(skb))</div><div class='ctx'> 		goto csum_error;</div><div class='hunk'>@@ -862,10 +1167,12 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,</div><div class='ctx'> 	__UDP6_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);</div><div class='ctx'> 	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);</div><div class='ctx'> </div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> short_packet:</div><div class='add'>+	if (reason == SKB_DROP_REASON_NOT_SPECIFIED)</div><div class='add'>+		reason = SKB_DROP_REASON_PKT_TOO_SMALL;</div><div class='ctx'> 	net_dbg_ratelimited("UDP%sv6: short packet: From [%pI6c]:%u %d/%d to [%pI6c]:%u\n",</div><div class='ctx'> 			    proto == IPPROTO_UDPLITE ? "-Lite" : "",</div><div class='ctx'> 			    saddr, ntohs(uh-&gt;source),</div><div class='hunk'>@@ -876,10 +1183,12 @@ short_packet:</div><div class='ctx'> report_csum_error:</div><div class='ctx'> 	udp6_csum_zero_error(skb);</div><div class='ctx'> csum_error:</div><div class='add'>+	if (reason == SKB_DROP_REASON_NOT_SPECIFIED)</div><div class='add'>+		reason = SKB_DROP_REASON_UDP_CSUM;</div><div class='ctx'> 	__UDP6_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);</div><div class='ctx'> discard:</div><div class='ctx'> 	__UDP6_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	sk_skb_reason_drop(sk, skb, reason);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -889,16 +1198,20 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net,</div><div class='ctx'> 			__be16 rmt_port, const struct in6_addr *rmt_addr,</div><div class='ctx'> 			int dif, int sdif)</div><div class='ctx'> {</div><div class='add'>+	struct udp_table *udptable = net-&gt;ipv4.udp_table;</div><div class='ctx'> 	unsigned short hnum = ntohs(loc_port);</div><div class='del'>-	unsigned int hash2 = ipv6_portaddr_hash(net, loc_addr, hnum);</div><div class='del'>-	unsigned int slot2 = hash2 &amp; udp_table.mask;</div><div class='del'>-	struct udp_hslot *hslot2 = &amp;udp_table.hash2[slot2];</div><div class='del'>-	const __portpair ports = INET_COMBINED_PORTS(rmt_port, hnum);</div><div class='add'>+	struct udp_hslot *hslot2;</div><div class='add'>+	unsigned int hash2;</div><div class='add'>+	__portpair ports;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='add'>+	hash2 = ipv6_portaddr_hash(net, loc_addr, hnum);</div><div class='add'>+	hslot2 = udp_hashslot2(udptable, hash2);</div><div class='add'>+	ports = INET_COMBINED_PORTS(rmt_port, hnum);</div><div class='add'>+</div><div class='ctx'> 	udp_portaddr_for_each_entry_rcu(sk, &amp;hslot2-&gt;head) {</div><div class='ctx'> 		if (sk-&gt;sk_state == TCP_ESTABLISHED &amp;&amp;</div><div class='del'>-		    INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif, sdif))</div><div class='add'>+		    inet6_match(net, sk, rmt_addr, loc_addr, ports, dif, sdif))</div><div class='ctx'> 			return sk;</div><div class='ctx'> 		/* Only check first socket in chain */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -906,7 +1219,7 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void udp_v6_early_demux(struct sk_buff *skb)</div><div class='add'>+void udp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	const struct udphdr *uh;</div><div class='hunk'>@@ -929,15 +1242,16 @@ static void udp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> 	else</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!sk || !refcount_inc_not_zero(&amp;sk-&gt;sk_refcnt))</div><div class='add'>+	if (!sk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;sk = sk;</div><div class='del'>-	skb-&gt;destructor = sock_efree;</div><div class='del'>-	dst = READ_ONCE(sk-&gt;sk_rx_dst);</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(sk_is_refcounted(sk));</div><div class='add'>+	skb-&gt;destructor = sock_pfree;</div><div class='add'>+	dst = rcu_dereference(sk-&gt;sk_rx_dst);</div><div class='ctx'> </div><div class='ctx'> 	if (dst)</div><div class='del'>-		dst = dst_check(dst, inet6_sk(sk)-&gt;rx_dst_cookie);</div><div class='add'>+		dst = dst_check(dst, sk-&gt;sk_rx_dst_cookie);</div><div class='ctx'> 	if (dst) {</div><div class='ctx'> 		/* set noref for now.</div><div class='ctx'> 		 * any place which wants to hold dst has to call</div><div class='hunk'>@@ -947,9 +1261,9 @@ static void udp_v6_early_demux(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __inline__ int udpv6_rcv(struct sk_buff *skb)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return __udp6_lib_rcv(skb, &amp;udp_table, IPPROTO_UDP);</div><div class='add'>+	return __udp6_lib_rcv(skb, dev_net(skb-&gt;dev)-&gt;ipv4.udp_table, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -963,20 +1277,22 @@ static void udp_v6_flush_pending_frames(struct sock *sk)</div><div class='ctx'> 		udp_flush_pending_frames(sk);</div><div class='ctx'> 	else if (up-&gt;pending) {</div><div class='ctx'> 		up-&gt;len = 0;</div><div class='del'>-		up-&gt;pending = 0;</div><div class='add'>+		WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> 		ip6_flush_pending_frames(sk);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int udpv6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			     int addr_len)</div><div class='ctx'> {</div><div class='add'>+	if (addr_len &lt; offsetofend(struct sockaddr, sa_family))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	/* The following checks are replicated from __ip6_datagram_connect()</div><div class='ctx'> 	 * and intended to prevent BPF program called below from accessing</div><div class='ctx'> 	 * bytes that are out of the bound specified by user in addr_len.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (uaddr-&gt;sa_family == AF_INET) {</div><div class='del'>-		if (__ipv6_only_sock(sk))</div><div class='add'>+		if (ipv6_only_sock(sk))</div><div class='ctx'> 			return -EAFNOSUPPORT;</div><div class='ctx'> 		return udp_pre_connect(sk, uaddr, addr_len);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -984,7 +1300,20 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> 	if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr);</div><div class='add'>+	return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr, &amp;addr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udpv6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			 int addr_len)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	res = __ip6_datagram_connect(sk, uaddr, addr_len);</div><div class='add'>+	if (!res)</div><div class='add'>+		udp6_hash4(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -992,6 +1321,9 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'>  *	@sk:	socket we are sending on</div><div class='ctx'>  *	@skb:	sk_buff containing the filled-in UDP header</div><div class='ctx'>  *		(checksum field must be zeroed out)</div><div class='add'>+ *	@saddr: source address</div><div class='add'>+ *	@daddr: destination address</div><div class='add'>+ *	@len:	length of packet</div><div class='ctx'>  */</div><div class='ctx'> static void udp6_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 				 const struct in6_addr *saddr,</div><div class='hunk'>@@ -1044,6 +1376,7 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,</div><div class='ctx'> 	__wsum csum = 0;</div><div class='ctx'> 	int offset = skb_transport_offset(skb);</div><div class='ctx'> 	int len = skb-&gt;len - offset;</div><div class='add'>+	int datalen = len - sizeof(*uh);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create a UDP header</div><div class='hunk'>@@ -1058,24 +1391,37 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,</div><div class='ctx'> 		const int hlen = skb_network_header_len(skb) +</div><div class='ctx'> 				 sizeof(struct udphdr);</div><div class='ctx'> </div><div class='del'>-		if (hlen + cork-&gt;gso_size &gt; cork-&gt;fragsize)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (skb-&gt;len &gt; cork-&gt;gso_size * UDP_MAX_SEGMENTS)</div><div class='add'>+		if (hlen + min(datalen, cork-&gt;gso_size) &gt; cork-&gt;fragsize) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+		if (datalen &gt; cork-&gt;gso_size * UDP_MAX_SEGMENTS) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (udp_sk(sk)-&gt;no_check6_tx)</div><div class='add'>+		}</div><div class='add'>+		if (udp_get_no_check6_tx(sk)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (skb-&gt;ip_summed != CHECKSUM_PARTIAL || is_udplite ||</div><div class='del'>-		    dst_xfrm(skb_dst(skb)))</div><div class='add'>+		}</div><div class='add'>+		if (is_udplite || dst_xfrm(skb_dst(skb))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='ctx'> 			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (datalen &gt; cork-&gt;gso_size) {</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_size = cork-&gt;gso_size;</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type = SKB_GSO_UDP_L4;</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_segs = DIV_ROUND_UP(datalen,</div><div class='add'>+								 cork-&gt;gso_size);</div><div class='ctx'> </div><div class='del'>-		skb_shinfo(skb)-&gt;gso_size = cork-&gt;gso_size;</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type = SKB_GSO_UDP_L4;</div><div class='del'>-		goto csum_partial;</div><div class='add'>+			/* Don't checksum the payload, skb will get segmented */</div><div class='add'>+			goto csum_partial;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_udplite)</div><div class='ctx'> 		csum = udplite_csum(skb);</div><div class='del'>-	else if (udp_sk(sk)-&gt;no_check6_tx) {   /* UDP csum disabled */</div><div class='add'>+	else if (udp_get_no_check6_tx(sk)) {   /* UDP csum disabled */</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 		goto send;</div><div class='ctx'> 	} else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) { /* UDP hardware csum */</div><div class='hunk'>@@ -1094,7 +1440,7 @@ csum_partial:</div><div class='ctx'> send:</div><div class='ctx'> 	err = ip6_send_skb(skb);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == -ENOBUFS &amp;&amp; !inet6_sk(sk)-&gt;recverr) {</div><div class='add'>+		if (err == -ENOBUFS &amp;&amp; !inet6_test_bit(RECVERR6, sk)) {</div><div class='ctx'> 			UDP6_INC_STATS(sock_net(sk),</div><div class='ctx'> 				       UDP_MIB_SNDBUFERRORS, is_udplite);</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -1110,26 +1456,20 @@ static int udp_v6_push_pending_frames(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct udp_sock  *up = udp_sk(sk);</div><div class='del'>-	struct flowi6 fl6;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (up-&gt;pending == AF_INET)</div><div class='ctx'> 		return udp_push_pending_frames(sk);</div><div class='ctx'> </div><div class='del'>-	/* ip6_finish_skb will release the cork, so make a copy of</div><div class='del'>-	 * fl6 here.</div><div class='del'>-	 */</div><div class='del'>-	fl6 = inet_sk(sk)-&gt;cork.fl.u.ip6;</div><div class='del'>-</div><div class='ctx'> 	skb = ip6_finish_skb(sk);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = udp_v6_send_skb(skb, &amp;fl6, &amp;inet_sk(sk)-&gt;cork.base);</div><div class='del'>-</div><div class='add'>+	err = udp_v6_send_skb(skb, &amp;inet_sk(sk)-&gt;cork.fl.u.ip6,</div><div class='add'>+			      &amp;inet_sk(sk)-&gt;cork.base);</div><div class='ctx'> out:</div><div class='ctx'> 	up-&gt;len = 0;</div><div class='del'>-	up-&gt;pending = 0;</div><div class='add'>+	WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1144,20 +1484,20 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct ipv6_txoptions *opt = NULL;</div><div class='ctx'> 	struct ipv6_txoptions *opt_to_free = NULL;</div><div class='ctx'> 	struct ip6_flowlabel *flowlabel = NULL;</div><div class='del'>-	struct flowi6 fl6;</div><div class='add'>+	struct inet_cork_full cork;</div><div class='add'>+	struct flowi6 *fl6 = &amp;cork.fl.u.ip6;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct ipcm6_cookie ipc6;</div><div class='ctx'> 	int addr_len = msg-&gt;msg_namelen;</div><div class='ctx'> 	bool connected = false;</div><div class='ctx'> 	int ulen = len;</div><div class='del'>-	int corkreq = up-&gt;corkflag || msg-&gt;msg_flags&amp;MSG_MORE;</div><div class='add'>+	int corkreq = udp_test_bit(CORK, sk) || msg-&gt;msg_flags &amp; MSG_MORE;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int is_udplite = IS_UDPLITE(sk);</div><div class='ctx'> 	int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);</div><div class='ctx'> </div><div class='del'>-	ipcm6_init(&amp;ipc6);</div><div class='del'>-	ipc6.gso_size = up-&gt;gso_size;</div><div class='del'>-	ipc6.sockc.tsflags = sk-&gt;sk_tsflags;</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='add'>+	ipc6.gso_size = READ_ONCE(up-&gt;gso_size);</div><div class='ctx'> </div><div class='ctx'> 	/* destination address check */</div><div class='ctx'> 	if (sin6) {</div><div class='hunk'>@@ -1184,7 +1524,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (!up-&gt;pending) {</div><div class='add'>+	} else if (!READ_ONCE(up-&gt;pending)) {</div><div class='ctx'> 		if (sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			return -EDESTADDRREQ;</div><div class='ctx'> 		daddr = &amp;sk-&gt;sk_v6_daddr;</div><div class='hunk'>@@ -1200,15 +1540,14 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 			msg-&gt;msg_name = &amp;sin;</div><div class='ctx'> 			msg-&gt;msg_namelen = sizeof(sin);</div><div class='ctx'> do_udp_sendmsg:</div><div class='del'>-			if (__ipv6_only_sock(sk))</div><div class='del'>-				return -ENETUNREACH;</div><div class='del'>-			return udp_sendmsg(sk, msg, len);</div><div class='add'>+			err = ipv6_only_sock(sk) ?</div><div class='add'>+				-ENETUNREACH : udp_sendmsg(sk, msg, len);</div><div class='add'>+			msg-&gt;msg_name = sin6;</div><div class='add'>+			msg-&gt;msg_namelen = addr_len;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (up-&gt;pending == AF_INET)</div><div class='del'>-		return udp_sendmsg(sk, msg, len);</div><div class='del'>-</div><div class='ctx'> 	/* Rough check on arithmetic overflow,</div><div class='ctx'> 	   better check is made in ip6_append_data().</div><div class='ctx'> 	   */</div><div class='hunk'>@@ -1216,7 +1555,9 @@ do_udp_sendmsg:</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;</div><div class='del'>-	if (up-&gt;pending) {</div><div class='add'>+	if (READ_ONCE(up-&gt;pending)) {</div><div class='add'>+		if (READ_ONCE(up-&gt;pending) == AF_INET)</div><div class='add'>+			return udp_sendmsg(sk, msg, len);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * There are pending frames.</div><div class='ctx'> 		 * The socket lock must be held while it's corked.</div><div class='hunk'>@@ -1234,20 +1575,20 @@ do_udp_sendmsg:</div><div class='ctx'> 	}</div><div class='ctx'> 	ulen += sizeof(struct udphdr);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+	memset(fl6, 0, sizeof(*fl6));</div><div class='ctx'> </div><div class='ctx'> 	if (sin6) {</div><div class='ctx'> 		if (sin6-&gt;sin6_port == 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		fl6.fl6_dport = sin6-&gt;sin6_port;</div><div class='add'>+		fl6-&gt;fl6_dport = sin6-&gt;sin6_port;</div><div class='ctx'> 		daddr = &amp;sin6-&gt;sin6_addr;</div><div class='ctx'> </div><div class='del'>-		if (np-&gt;sndflow) {</div><div class='del'>-			fl6.flowlabel = sin6-&gt;sin6_flowinfo&amp;IPV6_FLOWINFO_MASK;</div><div class='del'>-			if (fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) {</div><div class='del'>-				flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-				if (!flowlabel)</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk)) {</div><div class='add'>+			fl6-&gt;flowlabel = sin6-&gt;sin6_flowinfo&amp;IPV6_FLOWINFO_MASK;</div><div class='add'>+			if (fl6-&gt;flowlabel &amp; IPV6_FLOWLABEL_MASK) {</div><div class='add'>+				flowlabel = fl6_sock_lookup(sk, fl6-&gt;flowlabel);</div><div class='add'>+				if (IS_ERR(flowlabel))</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1263,25 +1604,24 @@ do_udp_sendmsg:</div><div class='ctx'> 		if (addr_len &gt;= sizeof(struct sockaddr_in6) &amp;&amp;</div><div class='ctx'> 		    sin6-&gt;sin6_scope_id &amp;&amp;</div><div class='ctx'> 		    __ipv6_addr_needs_scope_id(__ipv6_addr_type(daddr)))</div><div class='del'>-			fl6.flowi6_oif = sin6-&gt;sin6_scope_id;</div><div class='add'>+			fl6-&gt;flowi6_oif = sin6-&gt;sin6_scope_id;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			return -EDESTADDRREQ;</div><div class='ctx'> </div><div class='del'>-		fl6.fl6_dport = inet-&gt;inet_dport;</div><div class='add'>+		fl6-&gt;fl6_dport = inet-&gt;inet_dport;</div><div class='ctx'> 		daddr = &amp;sk-&gt;sk_v6_daddr;</div><div class='del'>-		fl6.flowlabel = np-&gt;flow_label;</div><div class='add'>+		fl6-&gt;flowlabel = np-&gt;flow_label;</div><div class='ctx'> 		connected = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	if (!fl6-&gt;flowi6_oif)</div><div class='add'>+		fl6-&gt;flowi6_oif = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='ctx'> </div><div class='del'>-	if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='add'>+	if (!fl6-&gt;flowi6_oif)</div><div class='add'>+		fl6-&gt;flowi6_oif = np-&gt;sticky_pktinfo.ipi6_ifindex;</div><div class='ctx'> </div><div class='del'>-	fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='del'>-	fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='add'>+	fl6-&gt;flowi6_uid = sk_uid(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_controllen) {</div><div class='ctx'> 		opt = &amp;opt_space;</div><div class='hunk'>@@ -1290,21 +1630,22 @@ do_udp_sendmsg:</div><div class='ctx'> 		ipc6.opt = opt;</div><div class='ctx'> </div><div class='ctx'> 		err = udp_cmsg_send(sk, msg, &amp;ipc6.gso_size);</div><div class='del'>-		if (err &gt; 0)</div><div class='del'>-			err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &amp;fl6,</div><div class='add'>+		if (err &gt; 0) {</div><div class='add'>+			err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, fl6,</div><div class='ctx'> 						    &amp;ipc6);</div><div class='add'>+			connected = false;</div><div class='add'>+		}</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			fl6_sock_release(flowlabel);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		if ((fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) &amp;&amp; !flowlabel) {</div><div class='del'>-			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-			if (!flowlabel)</div><div class='add'>+		if ((fl6-&gt;flowlabel&amp;IPV6_FLOWLABEL_MASK) &amp;&amp; !flowlabel) {</div><div class='add'>+			flowlabel = fl6_sock_lookup(sk, fl6-&gt;flowlabel);</div><div class='add'>+			if (IS_ERR(flowlabel))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(opt-&gt;opt_nflen|opt-&gt;opt_flen))</div><div class='ctx'> 			opt = NULL;</div><div class='del'>-		connected = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!opt) {</div><div class='ctx'> 		opt = txopt_get(np);</div><div class='hunk'>@@ -1315,18 +1656,18 @@ do_udp_sendmsg:</div><div class='ctx'> 	opt = ipv6_fixup_options(&amp;opt_space, opt);</div><div class='ctx'> 	ipc6.opt = opt;</div><div class='ctx'> </div><div class='del'>-	fl6.flowi6_proto = sk-&gt;sk_protocol;</div><div class='del'>-	if (!ipv6_addr_any(daddr))</div><div class='del'>-		fl6.daddr = *daddr;</div><div class='del'>-	else</div><div class='del'>-		fl6.daddr.s6_addr[15] = 0x1; /* :: means loopback (BSD'ism) */</div><div class='del'>-	if (ipv6_addr_any(&amp;fl6.saddr) &amp;&amp; !ipv6_addr_any(&amp;np-&gt;saddr))</div><div class='del'>-		fl6.saddr = np-&gt;saddr;</div><div class='del'>-	fl6.fl6_sport = inet-&gt;inet_sport;</div><div class='add'>+	fl6-&gt;flowi6_proto = sk-&gt;sk_protocol;</div><div class='add'>+	fl6-&gt;flowi6_mark = ipc6.sockc.mark;</div><div class='add'>+	fl6-&gt;daddr = *daddr;</div><div class='add'>+	if (ipv6_addr_any(&amp;fl6-&gt;saddr) &amp;&amp; !ipv6_addr_any(&amp;np-&gt;saddr))</div><div class='add'>+		fl6-&gt;saddr = np-&gt;saddr;</div><div class='add'>+	fl6-&gt;fl6_sport = inet-&gt;inet_sport;</div><div class='ctx'> </div><div class='del'>-	if (cgroup_bpf_enabled &amp;&amp; !connected) {</div><div class='add'>+	if (cgroup_bpf_enabled(CGROUP_UDP6_SENDMSG) &amp;&amp; !connected) {</div><div class='ctx'> 		err = BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK(sk,</div><div class='del'>-					   (struct sockaddr *)sin6, &amp;fl6.saddr);</div><div class='add'>+					   (struct sockaddr *)sin6,</div><div class='add'>+					   &amp;addr_len,</div><div class='add'>+					   &amp;fl6-&gt;saddr);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_no_dst;</div><div class='ctx'> 		if (sin6) {</div><div class='hunk'>@@ -1342,29 +1683,29 @@ do_udp_sendmsg:</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto out_no_dst;</div><div class='ctx'> 			}</div><div class='del'>-			fl6.fl6_dport = sin6-&gt;sin6_port;</div><div class='del'>-			fl6.daddr = sin6-&gt;sin6_addr;</div><div class='add'>+			fl6-&gt;fl6_dport = sin6-&gt;sin6_port;</div><div class='add'>+			fl6-&gt;daddr = sin6-&gt;sin6_addr;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='add'>+	if (ipv6_addr_any(&amp;fl6-&gt;daddr))</div><div class='add'>+		fl6-&gt;daddr.s6_addr[15] = 0x1; /* :: means loopback (BSD'ism) */</div><div class='add'>+</div><div class='add'>+	final_p = fl6_update_dst(fl6, opt, &amp;final);</div><div class='ctx'> 	if (final_p)</div><div class='ctx'> 		connected = false;</div><div class='ctx'> </div><div class='del'>-	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr)) {</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+	if (!fl6-&gt;flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6-&gt;daddr)) {</div><div class='add'>+		fl6-&gt;flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 		connected = false;</div><div class='del'>-	} else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='del'>-</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+	} else if (!fl6-&gt;flowi6_oif)</div><div class='add'>+		fl6-&gt;flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='del'>-	if (ipc6.tclass &lt; 0)</div><div class='del'>-		ipc6.tclass = np-&gt;tclass;</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6));</div><div class='ctx'> </div><div class='del'>-	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);</div><div class='add'>+	fl6-&gt;flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6-&gt;flowlabel);</div><div class='ctx'> </div><div class='del'>-	dst = ip6_sk_dst_lookup_flow(sk, &amp;fl6, final_p, connected);</div><div class='add'>+	dst = ip6_sk_dst_lookup_flow(sk, fl6, final_p, connected);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		dst = NULL;</div><div class='hunk'>@@ -1372,7 +1713,7 @@ do_udp_sendmsg:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ipc6.hlimit &lt; 0)</div><div class='del'>-		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='add'>+		ipc6.hlimit = ip6_sk_dst_hoplimit(np, fl6, dst);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_flags&amp;MSG_CONFIRM)</div><div class='ctx'> 		goto do_confirm;</div><div class='hunk'>@@ -1380,17 +1721,17 @@ back_from_confirm:</div><div class='ctx'> </div><div class='ctx'> 	/* Lockless fast path for the non-corking case */</div><div class='ctx'> 	if (!corkreq) {</div><div class='del'>-		struct inet_cork_full cork;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 		skb = ip6_make_skb(sk, getfrag, msg, ulen,</div><div class='ctx'> 				   sizeof(struct udphdr), &amp;ipc6,</div><div class='del'>-				   &amp;fl6, (struct rt6_info *)dst,</div><div class='add'>+				   dst_rt6_info(dst),</div><div class='ctx'> 				   msg-&gt;msg_flags, &amp;cork);</div><div class='ctx'> 		err = PTR_ERR(skb);</div><div class='ctx'> 		if (!IS_ERR_OR_NULL(skb))</div><div class='del'>-			err = udp_v6_send_skb(skb, &amp;fl6, &amp;cork.base);</div><div class='del'>-		goto out;</div><div class='add'>+			err = udp_v6_send_skb(skb, fl6, &amp;cork.base);</div><div class='add'>+		/* ip6_make_skb steals dst reference */</div><div class='add'>+		goto out_no_dst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='hunk'>@@ -1404,24 +1745,22 @@ back_from_confirm:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up-&gt;pending = AF_INET6;</div><div class='add'>+	WRITE_ONCE(up-&gt;pending, AF_INET6);</div><div class='ctx'> </div><div class='ctx'> do_append_data:</div><div class='del'>-	if (ipc6.dontfrag &lt; 0)</div><div class='del'>-		ipc6.dontfrag = np-&gt;dontfrag;</div><div class='ctx'> 	up-&gt;len += ulen;</div><div class='ctx'> 	err = ip6_append_data(sk, getfrag, msg, ulen, sizeof(struct udphdr),</div><div class='del'>-			      &amp;ipc6, &amp;fl6, (struct rt6_info *)dst,</div><div class='add'>+			      &amp;ipc6, fl6, dst_rt6_info(dst),</div><div class='ctx'> 			      corkreq ? msg-&gt;msg_flags|MSG_MORE : msg-&gt;msg_flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		udp_v6_flush_pending_frames(sk);</div><div class='ctx'> 	else if (!corkreq)</div><div class='ctx'> 		err = udp_v6_push_pending_frames(sk);</div><div class='ctx'> 	else if (unlikely(skb_queue_empty(&amp;sk-&gt;sk_write_queue)))</div><div class='del'>-		up-&gt;pending = 0;</div><div class='add'>+		WRITE_ONCE(up-&gt;pending, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (err &gt; 0)</div><div class='del'>-		err = np-&gt;recverr ? net_xmit_errno(err) : 0;</div><div class='add'>+		err = inet6_test_bit(RECVERR6, sk) ? net_xmit_errno(err) : 0;</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1446,53 +1785,66 @@ out_no_dst:</div><div class='ctx'> </div><div class='ctx'> do_confirm:</div><div class='ctx'> 	if (msg-&gt;msg_flags &amp; MSG_PROBE)</div><div class='del'>-		dst_confirm_neigh(dst, &amp;fl6.daddr);</div><div class='add'>+		dst_confirm_neigh(dst, &amp;fl6-&gt;daddr);</div><div class='ctx'> 	if (!(msg-&gt;msg_flags&amp;MSG_PROBE) || len)</div><div class='ctx'> 		goto back_from_confirm;</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(udpv6_sendmsg);</div><div class='add'>+</div><div class='add'>+static void udpv6_splice_eof(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct udp_sock *up = udp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(up-&gt;pending) || udp_test_bit(CORK, sk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	if (up-&gt;pending &amp;&amp; !udp_test_bit(CORK, sk))</div><div class='add'>+		udp_v6_push_pending_frames(sk);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void udpv6_destroy_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct udp_sock *up = udp_sk(sk);</div><div class='ctx'> 	lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	/* protects from races with udp_abort() */</div><div class='add'>+	sock_set_flag(sk, SOCK_DEAD);</div><div class='ctx'> 	udp_v6_flush_pending_frames(sk);</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (static_branch_unlikely(&amp;udpv6_encap_needed_key) &amp;&amp; up-&gt;encap_type) {</div><div class='del'>-		void (*encap_destroy)(struct sock *sk);</div><div class='del'>-		encap_destroy = READ_ONCE(up-&gt;encap_destroy);</div><div class='del'>-		if (encap_destroy)</div><div class='del'>-			encap_destroy(sk);</div><div class='add'>+	if (static_branch_unlikely(&amp;udpv6_encap_needed_key)) {</div><div class='add'>+		if (up-&gt;encap_type) {</div><div class='add'>+			void (*encap_destroy)(struct sock *sk);</div><div class='add'>+			encap_destroy = READ_ONCE(up-&gt;encap_destroy);</div><div class='add'>+			if (encap_destroy)</div><div class='add'>+				encap_destroy(sk);</div><div class='add'>+		}</div><div class='add'>+		if (udp_test_bit(ENCAP_ENABLED, sk)) {</div><div class='add'>+			static_branch_dec(&amp;udpv6_encap_needed_key);</div><div class='add'>+			udp_encap_disable();</div><div class='add'>+			udp_tunnel_cleanup_gro(sk);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	inet6_destroy_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Socket option code for UDP</div><div class='ctx'>  */</div><div class='del'>-int udpv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		     char __user *optval, unsigned int optlen)</div><div class='add'>+int udpv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		     unsigned int optlen)</div><div class='ctx'> {</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_setsockopt(sk, level, optname, optval, optlen,</div><div class='add'>+	if (level == SOL_UDP  ||  level == SOL_UDPLITE || level == SOL_SOCKET)</div><div class='add'>+		return udp_lib_setsockopt(sk, level, optname,</div><div class='add'>+					  optval, optlen,</div><div class='ctx'> 					  udp_v6_push_pending_frames);</div><div class='ctx'> 	return ipv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udpv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, unsigned int optlen)</div><div class='del'>-{</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_setsockopt(sk, level, optname, optval, optlen,</div><div class='del'>-					  udp_v6_push_pending_frames);</div><div class='del'>-	return compat_ipv6_setsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> int udpv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		     char __user *optval, int __user *optlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -1501,26 +1853,6 @@ int udpv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 	return ipv6_getsockopt(sk, level, optname, optval, optlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, int __user *optlen)</div><div class='del'>-{</div><div class='del'>-	if (level == SOL_UDP  ||  level == SOL_UDPLITE)</div><div class='del'>-		return udp_lib_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-	return compat_ipv6_getsockopt(sk, level, optname, optval, optlen);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* thinking of making this const? Don't.</div><div class='del'>- * early_demux can change based on sysctl.</div><div class='del'>- */</div><div class='del'>-static struct inet6_protocol udpv6_protocol = {</div><div class='del'>-	.early_demux	=	udp_v6_early_demux,</div><div class='del'>-	.early_demux_handler =  udp_v6_early_demux,</div><div class='del'>-	.handler	=	udpv6_rcv,</div><div class='del'>-	.err_handler	=	udpv6_err,</div><div class='del'>-	.flags		=	INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='hunk'>@@ -1530,7 +1862,7 @@ int udp6_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int bucket = ((struct udp_iter_state *)seq-&gt;private)-&gt;bucket;</div><div class='del'>-		struct inet_sock *inet = inet_sk(v);</div><div class='add'>+		const struct inet_sock *inet = inet_sk((const struct sock *)v);</div><div class='ctx'> 		__u16 srcp = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> 		__u16 destp = ntohs(inet-&gt;inet_dport);</div><div class='ctx'> 		__ip6_dgram_sock_seq_show(seq, v, srcp, destp,</div><div class='hunk'>@@ -1549,7 +1881,7 @@ EXPORT_SYMBOL(udp6_seq_ops);</div><div class='ctx'> </div><div class='ctx'> static struct udp_seq_afinfo udp6_seq_afinfo = {</div><div class='ctx'> 	.family		= AF_INET6,</div><div class='del'>-	.udp_table	= &amp;udp_table,</div><div class='add'>+	.udp_table	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __net_init udp6_proc_init(struct net *net)</div><div class='hunk'>@@ -1573,30 +1905,35 @@ struct proto udpv6_prot = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.close			= udp_lib_close,</div><div class='ctx'> 	.pre_connect		= udpv6_pre_connect,</div><div class='del'>-	.connect		= ip6_datagram_connect,</div><div class='add'>+	.connect		= udpv6_connect,</div><div class='ctx'> 	.disconnect		= udp_disconnect,</div><div class='ctx'> 	.ioctl			= udp_ioctl,</div><div class='del'>-	.init			= udp_init_sock,</div><div class='add'>+	.init			= udpv6_init_sock,</div><div class='ctx'> 	.destroy		= udpv6_destroy_sock,</div><div class='ctx'> 	.setsockopt		= udpv6_setsockopt,</div><div class='ctx'> 	.getsockopt		= udpv6_getsockopt,</div><div class='ctx'> 	.sendmsg		= udpv6_sendmsg,</div><div class='ctx'> 	.recvmsg		= udpv6_recvmsg,</div><div class='add'>+	.splice_eof		= udpv6_splice_eof,</div><div class='ctx'> 	.release_cb		= ip6_datagram_release_cb,</div><div class='ctx'> 	.hash			= udp_lib_hash,</div><div class='ctx'> 	.unhash			= udp_lib_unhash,</div><div class='ctx'> 	.rehash			= udp_v6_rehash,</div><div class='ctx'> 	.get_port		= udp_v6_get_port,</div><div class='del'>-	.memory_allocated	= &amp;udp_memory_allocated,</div><div class='add'>+	.put_port		= udp_lib_unhash,</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+	.psock_update_sk_prot	= udp_bpf_update_proto,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.memory_allocated	= &amp;net_aligned_data.udp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc	= &amp;udp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.sysctl_mem		= sysctl_udp_mem,</div><div class='ctx'> 	.sysctl_wmem_offset     = offsetof(struct net, ipv4.sysctl_udp_wmem_min),</div><div class='ctx'> 	.sysctl_rmem_offset     = offsetof(struct net, ipv4.sysctl_udp_rmem_min),</div><div class='ctx'> 	.obj_size		= sizeof(struct udp6_sock),</div><div class='del'>-	.h.udp_table		= &amp;udp_table,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt	= compat_udpv6_setsockopt,</div><div class='del'>-	.compat_getsockopt	= compat_udpv6_getsockopt,</div><div class='del'>-#endif</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct udp6_sock, inet6),</div><div class='add'>+	.h.udp_table		= NULL,</div><div class='ctx'> 	.diag_destroy		= udp_abort,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1612,7 +1949,12 @@ int __init udpv6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = inet6_add_protocol(&amp;udpv6_protocol, IPPROTO_UDP);</div><div class='add'>+	net_hotdata.udpv6_protocol = (struct inet6_protocol) {</div><div class='add'>+		.handler     = udpv6_rcv,</div><div class='add'>+		.err_handler = udpv6_err,</div><div class='add'>+		.flags	     = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,</div><div class='add'>+	};</div><div class='add'>+	ret = inet6_add_protocol(&amp;net_hotdata.udpv6_protocol, IPPROTO_UDP);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1623,12 +1965,12 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_udpv6_protocol:</div><div class='del'>-	inet6_del_protocol(&amp;udpv6_protocol, IPPROTO_UDP);</div><div class='add'>+	inet6_del_protocol(&amp;net_hotdata.udpv6_protocol, IPPROTO_UDP);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void udpv6_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	inet6_unregister_protosw(&amp;udpv6_protosw);</div><div class='del'>-	inet6_del_protocol(&amp;udpv6_protocol, IPPROTO_UDP);</div><div class='add'>+	inet6_del_protocol(&amp;net_hotdata.udpv6_protocol, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h<br/>index 7903e21c178b..8a406be25a3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp_impl.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp_impl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp_impl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/udp_impl.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef _UDP6_IMPL_H</div><div class='ctx'> #define _UDP6_IMPL_H</div><div class='add'>+#include &lt;net/aligned_data.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/udplite.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='hunk'>@@ -9,24 +10,20 @@</div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> </div><div class='ctx'> int __udp6_lib_rcv(struct sk_buff *, struct udp_table *, int);</div><div class='del'>-void __udp6_lib_err(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,</div><div class='del'>-		    __be32, struct udp_table *);</div><div class='add'>+int __udp6_lib_err(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,</div><div class='add'>+		   __be32, struct udp_table *);</div><div class='ctx'> </div><div class='add'>+int udpv6_init_sock(struct sock *sk);</div><div class='ctx'> int udp_v6_get_port(struct sock *sk, unsigned short snum);</div><div class='add'>+void udp_v6_rehash(struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> int udpv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='ctx'> 		     char __user *optval, int __user *optlen);</div><div class='del'>-int udpv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-		     char __user *optval, unsigned int optlen);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-int compat_udpv6_setsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, unsigned int optlen);</div><div class='del'>-int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,</div><div class='del'>-			    char __user *optval, int __user *optlen);</div><div class='del'>-#endif</div><div class='add'>+int udpv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,</div><div class='add'>+		     unsigned int optlen);</div><div class='ctx'> int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);</div><div class='del'>-int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,</div><div class='del'>-		  int flags, int *addr_len);</div><div class='add'>+int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,</div><div class='add'>+		  int *addr_len);</div><div class='ctx'> void udpv6_destroy_sock(struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='head'>diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c<br/>index 95dee9ca8d22..046f13b1d77a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp_offload.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udp_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/udp_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/udp_offload.c</a></div><div class='hunk'>@@ -1,21 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	IPV6 GSO/GRO offload support</div><div class='ctx'>  *	Linux INET6 implementation</div><div class='ctx'>  *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *      UDPv6 GSO support</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/indirect_call_wrapper.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include "ip6_offload.h"</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,</div><div class='ctx'> 					 netdev_features_t features)</div><div class='hunk'>@@ -31,10 +30,6 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,</div><div class='ctx'> 	int tnl_hlen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-	if (unlikely(skb-&gt;len &lt;= mss))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (skb-&gt;encapsulation &amp;&amp; skb_shinfo(skb)-&gt;gso_type &amp;</div><div class='ctx'> 	    (SKB_GSO_UDP_TUNNEL|SKB_GSO_UDP_TUNNEL_CSUM))</div><div class='ctx'> 		segs = skb_udp_tunnel_segment(skb, features, true);</div><div class='hunk'>@@ -49,7 +44,11 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4)</div><div class='del'>-			return __udp_gso_segment(skb, features);</div><div class='add'>+			return __udp_gso_segment(skb, features, true);</div><div class='add'>+</div><div class='add'>+		mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+		if (unlikely(skb-&gt;len &lt;= mss))</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* Do software UFO. Complete and fill in the UDP checksum as HW cannot</div><div class='ctx'> 		 * do checksum of UDP packets sent as multiple IP fragments.</div><div class='hunk'>@@ -114,10 +113,31 @@ out:</div><div class='ctx'> 	return segs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *udp6_gro_receive(struct list_head *head,</div><div class='del'>-					struct sk_buff *skb)</div><div class='add'>+static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport,</div><div class='add'>+					__be16 dport)</div><div class='add'>+{</div><div class='add'>+	const struct ipv6hdr *iph = skb_gro_network_header(skb);</div><div class='add'>+	struct net *net = dev_net_rcu(skb-&gt;dev);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int iif, sdif;</div><div class='add'>+</div><div class='add'>+	sk = udp_tunnel_sk(net, true);</div><div class='add'>+	if (sk &amp;&amp; dport == htons(sk-&gt;sk_num))</div><div class='add'>+		return sk;</div><div class='add'>+</div><div class='add'>+	inet6_get_iif_sdif(skb, &amp;iif, &amp;sdif);</div><div class='add'>+</div><div class='add'>+	return __udp6_lib_lookup(net, &amp;iph-&gt;saddr, sport,</div><div class='add'>+				 &amp;iph-&gt;daddr, dport, iif,</div><div class='add'>+				 sdif, net-&gt;ipv4.udp_table, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+INDIRECT_CALLABLE_SCOPE</div><div class='add'>+struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct udphdr *uh = udp_gro_udphdr(skb);</div><div class='add'>+	struct sock *sk = NULL;</div><div class='add'>+	struct sk_buff *pp;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!uh))</div><div class='ctx'> 		goto flush;</div><div class='hunk'>@@ -130,48 +150,59 @@ static struct sk_buff *udp6_gro_receive(struct list_head *head,</div><div class='ctx'> 						 ip6_gro_compute_pseudo))</div><div class='ctx'> 		goto flush;</div><div class='ctx'> 	else if (uh-&gt;check)</div><div class='del'>-		skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh-&gt;check,</div><div class='add'>+		skb_gro_checksum_try_convert(skb, IPPROTO_UDP,</div><div class='ctx'> 					     ip6_gro_compute_pseudo);</div><div class='ctx'> </div><div class='ctx'> skip:</div><div class='del'>-	NAPI_GRO_CB(skb)-&gt;is_ipv6 = 1;</div><div class='del'>-	return udp_gro_receive(head, skb, uh, udp6_lib_lookup_skb);</div><div class='add'>+	if (static_branch_unlikely(&amp;udpv6_encap_needed_key))</div><div class='add'>+		sk = udp6_gro_lookup_skb(skb, uh-&gt;source, uh-&gt;dest);</div><div class='add'>+</div><div class='add'>+	pp = udp_gro_receive(head, skb, uh, sk);</div><div class='add'>+	return pp;</div><div class='ctx'> </div><div class='ctx'> flush:</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int udp6_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='add'>+INDIRECT_CALLABLE_SCOPE int udp6_gro_complete(struct sk_buff *skb, int nhoff)</div><div class='ctx'> {</div><div class='del'>-	const struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='add'>+	const u16 offset = NAPI_GRO_CB(skb)-&gt;network_offsets[skb-&gt;encapsulation];</div><div class='add'>+	const struct ipv6hdr *ipv6h = (struct ipv6hdr *)(skb-&gt;data + offset);</div><div class='ctx'> 	struct udphdr *uh = (struct udphdr *)(skb-&gt;data + nhoff);</div><div class='ctx'> </div><div class='del'>-	if (uh-&gt;check) {</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;</div><div class='add'>+	/* do fraglist only if there is no outer UDP encap (or we already processed it) */</div><div class='add'>+	if (NAPI_GRO_CB(skb)-&gt;is_flist &amp;&amp; !NAPI_GRO_CB(skb)-&gt;encap_mark) {</div><div class='add'>+		uh-&gt;len = htons(skb-&gt;len - nhoff);</div><div class='add'>+</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= (SKB_GSO_FRAGLIST|SKB_GSO_UDP_L4);</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uh-&gt;check)</div><div class='ctx'> 		uh-&gt;check = ~udp_v6_check(skb-&gt;len - nhoff, &amp;ipv6h-&gt;saddr,</div><div class='ctx'> 					  &amp;ipv6h-&gt;daddr, 0);</div><div class='del'>-	} else {</div><div class='del'>-		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return udp_gro_complete(skb, nhoff, udp6_lib_lookup_skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct net_offload udpv6_offload = {</div><div class='del'>-	.callbacks = {</div><div class='del'>-		.gso_segment	=	udp6_ufo_fragment,</div><div class='del'>-		.gro_receive	=	udp6_gro_receive,</div><div class='del'>-		.gro_complete	=	udp6_gro_complete,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int udpv6_offload_init(void)</div><div class='add'>+int __init udpv6_offload_init(void)</div><div class='ctx'> {</div><div class='del'>-	return inet6_add_offload(&amp;udpv6_offload, IPPROTO_UDP);</div><div class='add'>+	net_hotdata.udpv6_offload = (struct net_offload) {</div><div class='add'>+		.callbacks = {</div><div class='add'>+			.gso_segment	=	udp6_ufo_fragment,</div><div class='add'>+			.gro_receive	=	udp6_gro_receive,</div><div class='add'>+			.gro_complete	=	udp6_gro_complete,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	return inet6_add_offload(&amp;net_hotdata.udpv6_offload, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int udpv6_offload_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return inet6_del_offload(&amp;udpv6_offload, IPPROTO_UDP);</div><div class='add'>+	return inet6_del_offload(&amp;net_hotdata.udpv6_offload, IPPROTO_UDP);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c<br/>index 5000ad6878e6..2cec542437f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/udplite.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/udplite.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/udplite.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/udplite.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  UDPLITEv6   An implementation of the UDP-Lite protocol over IPv6.</div><div class='ctx'>  *              See also net/ipv4/udplite.c</div><div class='hunk'>@@ -6,25 +7,32 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Changes:</div><div class='ctx'>  *  Fixes:</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='add'>+#define pr_fmt(fmt) "UDPLite6: " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include "udp_impl.h"</div><div class='ctx'> </div><div class='add'>+static int udplitev6_sk_init(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	udpv6_init_sock(sk);</div><div class='add'>+	pr_warn_once("UDP-Lite is deprecated and scheduled to be removed in 2025, "</div><div class='add'>+		     "please contact the netdev mailing list\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int udplitev6_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return __udp6_lib_rcv(skb, &amp;udplite_table, IPPROTO_UDPLITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void udplitev6_err(struct sk_buff *skb,</div><div class='add'>+static int udplitev6_err(struct sk_buff *skb,</div><div class='ctx'> 			  struct inet6_skb_parm *opt,</div><div class='ctx'> 			  u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='del'>-	__udp6_lib_err(skb, opt, type, code, offset, info, &amp;udplite_table);</div><div class='add'>+	return __udp6_lib_err(skb, opt, type, code, offset, info,</div><div class='add'>+			      &amp;udplite_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inet6_protocol udplitev6_protocol = {</div><div class='hunk'>@@ -40,7 +48,7 @@ struct proto udplitev6_prot = {</div><div class='ctx'> 	.connect	   = ip6_datagram_connect,</div><div class='ctx'> 	.disconnect	   = udp_disconnect,</div><div class='ctx'> 	.ioctl		   = udp_ioctl,</div><div class='del'>-	.init		   = udplite_sk_init,</div><div class='add'>+	.init		   = udplitev6_sk_init,</div><div class='ctx'> 	.destroy	   = udpv6_destroy_sock,</div><div class='ctx'> 	.setsockopt	   = udpv6_setsockopt,</div><div class='ctx'> 	.getsockopt	   = udpv6_getsockopt,</div><div class='hunk'>@@ -48,15 +56,18 @@ struct proto udplitev6_prot = {</div><div class='ctx'> 	.recvmsg	   = udpv6_recvmsg,</div><div class='ctx'> 	.hash		   = udp_lib_hash,</div><div class='ctx'> 	.unhash		   = udp_lib_unhash,</div><div class='add'>+	.rehash		   = udp_v6_rehash,</div><div class='ctx'> 	.get_port	   = udp_v6_get_port,</div><div class='del'>-	.memory_allocated  = &amp;udp_memory_allocated,</div><div class='add'>+</div><div class='add'>+	.memory_allocated  = &amp;net_aligned_data.udp_memory_allocated,</div><div class='add'>+	.per_cpu_fw_alloc  = &amp;udp_memory_per_cpu_fw_alloc,</div><div class='add'>+</div><div class='ctx'> 	.sysctl_mem	   = sysctl_udp_mem,</div><div class='add'>+	.sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min),</div><div class='add'>+	.sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_udp_rmem_min),</div><div class='ctx'> 	.obj_size	   = sizeof(struct udp6_sock),</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct udp6_sock, inet6),</div><div class='ctx'> 	.h.udp_table	   = &amp;udplite_table,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_udpv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_udpv6_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct inet_protosw udplite6_protosw = {</div><div class='head'>diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c<br/>index 9ef490dddcea..9005fc156a20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_input.c</a></div><div class='hunk'>@@ -16,11 +16,8 @@</div><div class='ctx'> #include &lt;linux/netfilter_ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return xfrm6_extract_header(skb);</div><div class='del'>-}</div><div class='add'>+#include &lt;net/protocol.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> </div><div class='ctx'> int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='ctx'> 		  struct ip6_tnl *t)</div><div class='hunk'>@@ -35,15 +32,18 @@ EXPORT_SYMBOL(xfrm6_rcv_spi);</div><div class='ctx'> static int xfrm6_transport_finish2(struct net *net, struct sock *sk,</div><div class='ctx'> 				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (xfrm_trans_queue(skb, ip6_rcv_finish))</div><div class='del'>-		__kfree_skb(skb);</div><div class='del'>-	return -1;</div><div class='add'>+	if (xfrm_trans_queue(skb, ip6_rcv_finish)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NET_RX_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xfrm6_transport_finish(struct sk_buff *skb, int async)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-	int nhlen = skb-&gt;data - skb_network_header(skb);</div><div class='add'>+	int nhlen = -skb_network_offset(skb);</div><div class='ctx'> </div><div class='ctx'> 	skb_network_header(skb)[IP6CB(skb)-&gt;nhoff] =</div><div class='ctx'> 		XFRM_MODE_SKB_CB(skb)-&gt;protocol;</div><div class='hunk'>@@ -58,15 +58,166 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async)</div><div class='ctx'> 	skb_postpush_rcsum(skb, skb_network_header(skb), nhlen);</div><div class='ctx'> </div><div class='ctx'> 	if (xo &amp;&amp; (xo-&gt;flags &amp; XFRM_GRO)) {</div><div class='del'>-		skb_mac_header_rebuild(skb);</div><div class='add'>+		/* The full l2 header needs to be preserved so that re-injecting the packet at l2</div><div class='add'>+		 * works correctly in the presence of vlan tags.</div><div class='add'>+		 */</div><div class='add'>+		skb_mac_header_rebuild_full(skb, xo-&gt;orig_mac_len);</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='ctx'> 		skb_reset_transport_header(skb);</div><div class='del'>-		return -1;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING,</div><div class='ctx'> 		dev_net(skb-&gt;dev), NULL, skb, skb-&gt;dev, NULL,</div><div class='ctx'> 		xfrm6_transport_finish2);</div><div class='del'>-	return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __xfrm6_udp_encap_rcv(struct sock *sk, struct sk_buff *skb, bool pull)</div><div class='add'>+{</div><div class='add'>+	struct udp_sock *up = udp_sk(sk);</div><div class='add'>+	struct udphdr *uh;</div><div class='add'>+	struct ipv6hdr *ip6h;</div><div class='add'>+	int len;</div><div class='add'>+	int ip6hlen = sizeof(struct ipv6hdr);</div><div class='add'>+	__u8 *udpdata;</div><div class='add'>+	__be32 *udpdata32;</div><div class='add'>+	u16 encap_type;</div><div class='add'>+</div><div class='add'>+	encap_type = READ_ONCE(up-&gt;encap_type);</div><div class='add'>+	/* if this is not encapsulated socket, then just return now */</div><div class='add'>+	if (!encap_type)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* If this is a paged skb, make sure we pull up</div><div class='add'>+	 * whatever data we need to look at. */</div><div class='add'>+	len = skb-&gt;len - sizeof(struct udphdr);</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct udphdr) + min(len, 8)))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Now we can get the pointers */</div><div class='add'>+	uh = udp_hdr(skb);</div><div class='add'>+	udpdata = (__u8 *)uh + sizeof(struct udphdr);</div><div class='add'>+	udpdata32 = (__be32 *)udpdata;</div><div class='add'>+</div><div class='add'>+	switch (encap_type) {</div><div class='add'>+	default:</div><div class='add'>+	case UDP_ENCAP_ESPINUDP:</div><div class='add'>+		/* Check if this is a keepalive packet.  If so, eat it. */</div><div class='add'>+		if (len == 1 &amp;&amp; udpdata[0] == 0xff) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		} else if (len &gt; sizeof(struct ip_esp_hdr) &amp;&amp; udpdata32[0] != 0) {</div><div class='add'>+			/* ESP Packet without Non-ESP header */</div><div class='add'>+			len = sizeof(struct udphdr);</div><div class='add'>+		} else</div><div class='add'>+			/* Must be an IKE packet.. pass it through */</div><div class='add'>+			return 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* At this point we are sure that this is an ESPinUDP packet,</div><div class='add'>+	 * so we need to remove 'len' bytes from the packet (the UDP</div><div class='add'>+	 * header and optional ESP marker bytes) and then modify the</div><div class='add'>+	 * protocol to ESP, and then call into the transform receiver.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_unclone(skb, GFP_ATOMIC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Now we can update and verify the packet length... */</div><div class='add'>+	ip6h = ipv6_hdr(skb);</div><div class='add'>+	ip6h-&gt;payload_len = htons(ntohs(ip6h-&gt;payload_len) - len);</div><div class='add'>+	if (skb-&gt;len &lt; ip6hlen + len) {</div><div class='add'>+		/* packet is too small!?! */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pull the data buffer up to the ESP header and set the</div><div class='add'>+	 * transport header to point to ESP.  Keep UDP on the stack</div><div class='add'>+	 * for later.</div><div class='add'>+	 */</div><div class='add'>+	if (pull) {</div><div class='add'>+		__skb_pull(skb, len);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb_set_transport_header(skb, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* process ESP */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If it's a keepalive packet, then just eat it.</div><div class='add'>+ * If it's an encapsulated packet, then pass it to the</div><div class='add'>+ * IPsec xfrm input.</div><div class='add'>+ * Returns 0 if skb passed to xfrm or was dropped.</div><div class='add'>+ * Returns &gt;0 if skb should be passed to UDP.</div><div class='add'>+ * Returns &lt;0 if skb should be resubmitted (-ret is protocol)</div><div class='add'>+ */</div><div class='add'>+int xfrm6_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		return xfrm4_udp_encap_rcv(sk, skb);</div><div class='add'>+</div><div class='add'>+	ret = __xfrm6_udp_encap_rcv(sk, skb, true);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return xfrm6_rcv_encap(skb, IPPROTO_ESP, 0,</div><div class='add'>+				       udp_sk(sk)-&gt;encap_type);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *xfrm6_gro_udp_encap_rcv(struct sock *sk, struct list_head *head,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int offset = skb_gro_offset(skb);</div><div class='add'>+	const struct net_offload *ops;</div><div class='add'>+	struct sk_buff *pp = NULL;</div><div class='add'>+	int len, dlen;</div><div class='add'>+	__u8 *udpdata;</div><div class='add'>+	__be32 *udpdata32;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		return xfrm4_gro_udp_encap_rcv(sk, head, skb);</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len - offset;</div><div class='add'>+	dlen = offset + min(len, 8);</div><div class='add'>+	udpdata = skb_gro_header(skb, dlen, offset);</div><div class='add'>+	udpdata32 = (__be32 *)udpdata;</div><div class='add'>+	if (unlikely(!udpdata))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ops = rcu_dereference(inet6_offloads[IPPROTO_ESP]);</div><div class='add'>+	if (!ops || !ops-&gt;callbacks.gro_receive)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* check if it is a keepalive or IKE packet */</div><div class='add'>+	if (len &lt;= sizeof(struct ip_esp_hdr) || udpdata32[0] == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* set the transport header to ESP */</div><div class='add'>+	skb_set_transport_header(skb, offset);</div><div class='add'>+</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;proto = IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+	pp = call_gro_receive(ops-&gt;callbacks.gro_receive, head, skb);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return pp;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;same_flow = 0;</div><div class='add'>+	NAPI_GRO_CB(skb)-&gt;flush = 1;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xfrm6_rcv_tnl(struct sk_buff *skb, struct ip6_tnl *t)</div><div class='hunk'>@@ -86,14 +237,16 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='ctx'> 	struct xfrm_state *x = NULL;</div><div class='add'>+	struct sec_path *sp;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	if (secpath_set(skb)) {</div><div class='add'>+	sp = secpath_set(skb);</div><div class='add'>+	if (!sp) {</div><div class='ctx'> 		XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (1 + skb-&gt;sp-&gt;len == XFRM_MAX_DEPTH) {</div><div class='add'>+	if (1 + sp-&gt;len == XFRM_MAX_DEPTH) {</div><div class='ctx'> 		XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -122,6 +275,13 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,</div><div class='ctx'> 		if (!x)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (unlikely(x-&gt;dir &amp;&amp; x-&gt;dir != XFRM_SA_DIR_IN)) {</div><div class='add'>+			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEDIRERROR);</div><div class='add'>+			xfrm_state_put(x);</div><div class='add'>+			x = NULL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;x-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if ((!i || (x-&gt;props.flags &amp; XFRM_STATE_WILDRECV)) &amp;&amp;</div><div class='hunk'>@@ -145,7 +305,7 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;sp-&gt;xvec[skb-&gt;sp-&gt;len++] = x;</div><div class='add'>+	sp-&gt;xvec[sp-&gt;len++] = x;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;x-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c<br/>deleted file mode 100644<br/>index 57fd314ec2b8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_mode_beet.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_beet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm6_mode_beet.c - BEET mode encapsulation for IPv6.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2006 Diego Beltrami &lt;diego.beltrami@gmail.com&gt;</div><div class='del'>- *                    Miika Komu     &lt;miika@iki.fi&gt;</div><div class='del'>- *                    Herbert Xu     &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- *                    Abhinav Pathak &lt;abhinav.pathak@hiit.fi&gt;</div><div class='del'>- *                    Jeff Ahrenholz &lt;ahrenholz@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dsfield.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/inet_ecn.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-static void xfrm6_beet_make_header(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	iph-&gt;version = 6;</div><div class='del'>-</div><div class='del'>-	memcpy(iph-&gt;flow_lbl, XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl,</div><div class='del'>-	       sizeof(iph-&gt;flow_lbl));</div><div class='del'>-	iph-&gt;nexthdr = XFRM_MODE_SKB_CB(skb)-&gt;protocol;</div><div class='del'>-</div><div class='del'>-	ipv6_change_dsfield(iph, 0, XFRM_MODE_SKB_CB(skb)-&gt;tos);</div><div class='del'>-	iph-&gt;hop_limit = XFRM_MODE_SKB_CB(skb)-&gt;ttl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.</div><div class='del'>- */</div><div class='del'>-static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *top_iph;</div><div class='del'>-	struct ip_beet_phdr *ph;</div><div class='del'>-	int optlen, hdr_len;</div><div class='del'>-</div><div class='del'>-	hdr_len = 0;</div><div class='del'>-	optlen = XFRM_MODE_SKB_CB(skb)-&gt;optlen;</div><div class='del'>-	if (unlikely(optlen))</div><div class='del'>-		hdr_len += IPV4_BEET_PHMAXLEN - (optlen &amp; 4);</div><div class='del'>-</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len - hdr_len);</div><div class='del'>-	if (x-&gt;sel.family != AF_INET6)</div><div class='del'>-		skb-&gt;network_header += IPV4_BEET_PHMAXLEN;</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;network_header +</div><div class='del'>-			  offsetof(struct ipv6hdr, nexthdr);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + sizeof(*top_iph);</div><div class='del'>-	ph = __skb_pull(skb, XFRM_MODE_SKB_CB(skb)-&gt;ihl - hdr_len);</div><div class='del'>-</div><div class='del'>-	xfrm6_beet_make_header(skb);</div><div class='del'>-</div><div class='del'>-	top_iph = ipv6_hdr(skb);</div><div class='del'>-	if (unlikely(optlen)) {</div><div class='del'>-</div><div class='del'>-		BUG_ON(optlen &lt; 0);</div><div class='del'>-</div><div class='del'>-		ph-&gt;padlen = 4 - (optlen &amp; 4);</div><div class='del'>-		ph-&gt;hdrlen = optlen / 8;</div><div class='del'>-		ph-&gt;nexthdr = top_iph-&gt;nexthdr;</div><div class='del'>-		if (ph-&gt;padlen)</div><div class='del'>-			memset(ph + 1, IPOPT_NOP, ph-&gt;padlen);</div><div class='del'>-</div><div class='del'>-		top_iph-&gt;nexthdr = IPPROTO_BEETPH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;saddr = *(struct in6_addr *)&amp;x-&gt;props.saddr;</div><div class='del'>-	top_iph-&gt;daddr = *(struct in6_addr *)&amp;x-&gt;id.daddr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *ip6h;</div><div class='del'>-	int size = sizeof(struct ipv6hdr);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = skb_cow_head(skb, size + skb-&gt;mac_len);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	__skb_push(skb, size);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_mac_header_rebuild(skb);</div><div class='del'>-</div><div class='del'>-	xfrm6_beet_make_header(skb);</div><div class='del'>-</div><div class='del'>-	ip6h = ipv6_hdr(skb);</div><div class='del'>-	ip6h-&gt;payload_len = htons(skb-&gt;len - size);</div><div class='del'>-	ip6h-&gt;daddr = x-&gt;sel.daddr.in6;</div><div class='del'>-	ip6h-&gt;saddr = x-&gt;sel.saddr.in6;</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm6_beet_mode = {</div><div class='del'>-	.input2 = xfrm6_beet_input,</div><div class='del'>-	.input = xfrm_prepare_input,</div><div class='del'>-	.output2 = xfrm6_beet_output,</div><div class='del'>-	.output = xfrm6_prepare_output,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_BEET,</div><div class='del'>-	.flags = XFRM_MODE_FLAG_TUNNEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm6_beet_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm6_beet_mode, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm6_beet_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm6_beet_mode, AF_INET6);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm6_beet_init);</div><div class='del'>-module_exit(xfrm6_beet_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_BEET);</div><div class='head'>diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c<br/>deleted file mode 100644<br/>index da28e4407b8f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_mode_ro.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_ro.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm6_mode_ro.c - Route optimization mode for IPv6.</div><div class='del'>- *</div><div class='del'>- * Copyright (C)2003-2006 Helsinki University of Technology</div><div class='del'>- * Copyright (C)2003-2006 USAGI/WIDE Project</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *	Noriaki TAKAMIYA @USAGI</div><div class='del'>- *	Masahide NAKAMURA @USAGI</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-/* Add route optimization header space.</div><div class='del'>- *</div><div class='del'>- * The IP header and mutable extension headers will be moved forward to make</div><div class='del'>- * space for the route optimization header.</div><div class='del'>- */</div><div class='del'>-static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *iph;</div><div class='del'>-	u8 *prevhdr;</div><div class='del'>-	int hdr_len;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	hdr_len = x-&gt;type-&gt;hdr_offset(x, skb, &amp;prevhdr);</div><div class='del'>-	if (hdr_len &lt; 0)</div><div class='del'>-		return hdr_len;</div><div class='del'>-	skb_set_mac_header(skb, (prevhdr - x-&gt;props.header_len) - skb-&gt;data);</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + hdr_len;</div><div class='del'>-	__skb_pull(skb, hdr_len);</div><div class='del'>-	memmove(ipv6_hdr(skb), iph, hdr_len);</div><div class='del'>-</div><div class='del'>-	x-&gt;lastused = ktime_get_real_seconds();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm6_ro_mode = {</div><div class='del'>-	.output = xfrm6_ro_output,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_ROUTEOPTIMIZATION,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm6_ro_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm6_ro_mode, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm6_ro_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm6_ro_mode, AF_INET6);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm6_ro_init);</div><div class='del'>-module_exit(xfrm6_ro_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_ROUTEOPTIMIZATION);</div><div class='head'>diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c<br/>deleted file mode 100644<br/>index 3c29da5defe6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_mode_transport.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm6_mode_transport.c - Transport mode encapsulation for IPv6.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 USAGI/WIDE Project</div><div class='del'>- * Copyright (c) 2004-2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;net/protocol.h&gt;</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The IP header and mutable extension headers will be moved forward to make</div><div class='del'>- * space for the encapsulation header.</div><div class='del'>- */</div><div class='del'>-static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *iph;</div><div class='del'>-	u8 *prevhdr;</div><div class='del'>-	int hdr_len;</div><div class='del'>-</div><div class='del'>-	iph = ipv6_hdr(skb);</div><div class='del'>-	skb_set_inner_transport_header(skb, skb_transport_offset(skb));</div><div class='del'>-</div><div class='del'>-	hdr_len = x-&gt;type-&gt;hdr_offset(x, skb, &amp;prevhdr);</div><div class='del'>-	if (hdr_len &lt; 0)</div><div class='del'>-		return hdr_len;</div><div class='del'>-	skb_set_mac_header(skb, (prevhdr - x-&gt;props.header_len) - skb-&gt;data);</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + hdr_len;</div><div class='del'>-	__skb_pull(skb, hdr_len);</div><div class='del'>-	memmove(ipv6_hdr(skb), iph, hdr_len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Remove encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The IP header will be moved over the top of the encapsulation header.</div><div class='del'>- *</div><div class='del'>- * On entry, skb-&gt;h shall point to where the IP header should be and skb-&gt;nh</div><div class='del'>- * shall be set to where the IP header currently is.  skb-&gt;data shall point</div><div class='del'>- * to the start of the payload.</div><div class='del'>- */</div><div class='del'>-static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int ihl = skb-&gt;data - skb_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;transport_header != skb-&gt;network_header) {</div><div class='del'>-		memmove(skb_transport_header(skb),</div><div class='del'>-			skb_network_header(skb), ihl);</div><div class='del'>-		skb-&gt;network_header = skb-&gt;transport_header;</div><div class='del'>-	}</div><div class='del'>-	ipv6_hdr(skb)-&gt;payload_len = htons(skb-&gt;len + ihl -</div><div class='del'>-					   sizeof(struct ipv6hdr));</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,</div><div class='del'>-						   struct sk_buff *skb,</div><div class='del'>-						   netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	const struct net_offload *ops;</div><div class='del'>-	struct sk_buff *segs = ERR_PTR(-EINVAL);</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	skb-&gt;transport_header += x-&gt;props.header_len;</div><div class='del'>-	ops = rcu_dereference(inet6_offloads[xo-&gt;proto]);</div><div class='del'>-	if (likely(ops &amp;&amp; ops-&gt;callbacks.gso_segment))</div><div class='del'>-		segs = ops-&gt;callbacks.gso_segment(skb, features);</div><div class='del'>-</div><div class='del'>-	return segs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xfrm6_transport_xmit(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_len(skb);</div><div class='del'>-	pskb_pull(skb, skb-&gt;mac_len + sizeof(struct ipv6hdr) + x-&gt;props.header_len);</div><div class='del'>-</div><div class='del'>-	if (xo-&gt;flags &amp; XFRM_GSO_SEGMENT) {</div><div class='del'>-		 skb_reset_transport_header(skb);</div><div class='del'>-		 skb-&gt;transport_header -= x-&gt;props.header_len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm6_transport_mode = {</div><div class='del'>-	.input = xfrm6_transport_input,</div><div class='del'>-	.output = xfrm6_transport_output,</div><div class='del'>-	.gso_segment = xfrm4_transport_gso_segment,</div><div class='del'>-	.xmit = xfrm6_transport_xmit,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_TRANSPORT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm6_transport_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm6_transport_mode, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm6_transport_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm6_transport_mode, AF_INET6);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm6_transport_init);</div><div class='del'>-module_exit(xfrm6_transport_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_TRANSPORT);</div><div class='head'>diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c<br/>deleted file mode 100644<br/>index de1b0b8c53b0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_mode_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_mode_tunnel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,151 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * xfrm6_mode_tunnel.c - Tunnel mode encapsulation for IPv6.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 USAGI/WIDE Project</div><div class='del'>- * Copyright (c) 2004-2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='del'>-#include &lt;net/dsfield.h&gt;</div><div class='del'>-#include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;net/inet_ecn.h&gt;</div><div class='del'>-#include &lt;net/ip6_route.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/xfrm.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *inner_iph = ipipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (INET_ECN_is_ce(XFRM_MODE_SKB_CB(skb)-&gt;tos))</div><div class='del'>-		IP6_ECN_set_ce(skb, inner_iph);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add encapsulation header.</div><div class='del'>- *</div><div class='del'>- * The top IP header will be constructed per RFC 2401.</div><div class='del'>- */</div><div class='del'>-static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct ipv6hdr *top_iph;</div><div class='del'>-	int dsfield;</div><div class='del'>-</div><div class='del'>-	skb_set_inner_network_header(skb, skb_network_offset(skb));</div><div class='del'>-	skb_set_inner_transport_header(skb, skb_transport_offset(skb));</div><div class='del'>-</div><div class='del'>-	skb_set_network_header(skb, -x-&gt;props.header_len);</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;network_header +</div><div class='del'>-			  offsetof(struct ipv6hdr, nexthdr);</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;network_header + sizeof(*top_iph);</div><div class='del'>-	top_iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	top_iph-&gt;version = 6;</div><div class='del'>-</div><div class='del'>-	memcpy(top_iph-&gt;flow_lbl, XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl,</div><div class='del'>-	       sizeof(top_iph-&gt;flow_lbl));</div><div class='del'>-	top_iph-&gt;nexthdr = xfrm_af2proto(skb_dst(skb)-&gt;ops-&gt;family);</div><div class='del'>-</div><div class='del'>-	if (x-&gt;props.extra_flags &amp; XFRM_SA_XFLAG_DONT_ENCAP_DSCP)</div><div class='del'>-		dsfield = 0;</div><div class='del'>-	else</div><div class='del'>-		dsfield = XFRM_MODE_SKB_CB(skb)-&gt;tos;</div><div class='del'>-	dsfield = INET_ECN_encapsulate(dsfield, XFRM_MODE_SKB_CB(skb)-&gt;tos);</div><div class='del'>-	if (x-&gt;props.flags &amp; XFRM_STATE_NOECN)</div><div class='del'>-		dsfield &amp;= ~INET_ECN_MASK;</div><div class='del'>-	ipv6_change_dsfield(top_iph, 0, dsfield);</div><div class='del'>-	top_iph-&gt;hop_limit = ip6_dst_hoplimit(xfrm_dst_child(dst));</div><div class='del'>-	top_iph-&gt;saddr = *(struct in6_addr *)&amp;x-&gt;props.saddr;</div><div class='del'>-	top_iph-&gt;daddr = *(struct in6_addr *)&amp;x-&gt;id.daddr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_input_rcu(head, handler)	\</div><div class='del'>-	for (handler = rcu_dereference(head);	\</div><div class='del'>-	     handler != NULL;			\</div><div class='del'>-	     handler = rcu_dereference(handler-&gt;next))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (XFRM_MODE_SKB_CB(skb)-&gt;protocol != IPPROTO_IPV6)</div><div class='del'>-		goto out;</div><div class='del'>-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = skb_unclone(skb, GFP_ATOMIC);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (x-&gt;props.flags &amp; XFRM_STATE_DECAP_DSCP)</div><div class='del'>-		ipv6_copy_dscp(ipv6_get_dsfield(ipv6_hdr(skb)),</div><div class='del'>-			       ipipv6_hdr(skb));</div><div class='del'>-	if (!(x-&gt;props.flags &amp; XFRM_STATE_NOECN))</div><div class='del'>-		ipip6_ecn_decapsulate(skb);</div><div class='del'>-</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_mac_header_rebuild(skb);</div><div class='del'>-	if (skb-&gt;mac_len)</div><div class='del'>-		eth_hdr(skb)-&gt;h_proto = skb-&gt;protocol;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *xfrm6_mode_tunnel_gso_segment(struct xfrm_state *x,</div><div class='del'>-						     struct sk_buff *skb,</div><div class='del'>-						     netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	__skb_push(skb, skb-&gt;mac_len);</div><div class='del'>-	return skb_mac_gso_segment(skb, features);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xfrm6_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_offload *xo = xfrm_offload(skb);</div><div class='del'>-</div><div class='del'>-	if (xo-&gt;flags &amp; XFRM_GSO_SEGMENT)</div><div class='del'>-		skb-&gt;transport_header = skb-&gt;network_header + sizeof(struct ipv6hdr);</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_len(skb);</div><div class='del'>-	pskb_pull(skb, skb-&gt;mac_len + x-&gt;props.header_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xfrm_mode xfrm6_tunnel_mode = {</div><div class='del'>-	.input2 = xfrm6_mode_tunnel_input,</div><div class='del'>-	.input = xfrm_prepare_input,</div><div class='del'>-	.output2 = xfrm6_mode_tunnel_output,</div><div class='del'>-	.output = xfrm6_prepare_output,</div><div class='del'>-	.gso_segment = xfrm6_mode_tunnel_gso_segment,</div><div class='del'>-	.xmit = xfrm6_mode_tunnel_xmit,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.encap = XFRM_MODE_TUNNEL,</div><div class='del'>-	.flags = XFRM_MODE_FLAG_TUNNEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xfrm6_mode_tunnel_init(void)</div><div class='del'>-{</div><div class='del'>-	return xfrm_register_mode(&amp;xfrm6_tunnel_mode, AF_INET6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xfrm6_mode_tunnel_exit(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_unregister_mode(&amp;xfrm6_tunnel_mode, AF_INET6);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xfrm6_mode_tunnel_init);</div><div class='del'>-module_exit(xfrm6_mode_tunnel_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_TUNNEL);</div><div class='head'>diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c<br/>index 6a74080005cf..512bdaf13699 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_output.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * xfrm6_output.c - Common IPsec encapsulation code for IPv6.</div><div class='ctx'>  * Copyright (C) 2002 USAGI/WIDE Project</div><div class='ctx'>  * Copyright (c) 2004 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='hunk'>@@ -20,31 +16,7 @@</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> </div><div class='del'>-int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,</div><div class='del'>-			  u8 **prevhdr)</div><div class='del'>-{</div><div class='del'>-	return ip6_find_1stfragopt(skb, prevhdr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(xfrm6_find_1stfragopt);</div><div class='del'>-</div><div class='del'>-static int xfrm6_local_dontfrag(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int proto;</div><div class='del'>-	struct sock *sk = skb-&gt;sk;</div><div class='del'>-</div><div class='del'>-	if (sk) {</div><div class='del'>-		if (sk-&gt;sk_family != AF_INET6)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		proto = sk-&gt;sk_protocol;</div><div class='del'>-		if (proto == IPPROTO_UDP || proto == IPPROTO_RAW)</div><div class='del'>-			return inet6_sk(sk)-&gt;dontfrag;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)</div><div class='add'>+void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	struct sock *sk = skb-&gt;sk;</div><div class='hunk'>@@ -68,87 +40,29 @@ void xfrm6_local_error(struct sk_buff *skb, u32 mtu)</div><div class='ctx'> 	ipv6_local_error(sk, EMSGSIZE, &amp;fl6, mtu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xfrm6_tunnel_check_size(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int mtu, ret = 0;</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;ignore_df)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mtu = dst_mtu(dst);</div><div class='del'>-	if (mtu &lt; IPV6_MIN_MTU)</div><div class='del'>-		mtu = IPV6_MIN_MTU;</div><div class='del'>-</div><div class='del'>-	if ((!skb_is_gso(skb) &amp;&amp; skb-&gt;len &gt; mtu) ||</div><div class='del'>-	    (skb_is_gso(skb) &amp;&amp;</div><div class='del'>-	     !skb_gso_validate_network_len(skb, ip6_skb_dst_mtu(skb)))) {</div><div class='del'>-		skb-&gt;dev = dst-&gt;dev;</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='del'>-</div><div class='del'>-		if (xfrm6_local_dontfrag(skb))</div><div class='del'>-			xfrm6_local_rxpmtu(skb, mtu);</div><div class='del'>-		else if (skb-&gt;sk)</div><div class='del'>-			xfrm_local_error(skb, mtu);</div><div class='del'>-		else</div><div class='del'>-			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);</div><div class='del'>-		ret = -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm6_tunnel_check_size(skb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;protocol = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='del'>-</div><div class='del'>-	return xfrm6_extract_header(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xfrm_inner_extract_output(x, skb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	skb-&gt;ignore_df = 1;</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='del'>-</div><div class='del'>-	return x-&gt;outer_mode-&gt;output2(x, skb);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(xfrm6_prepare_output);</div><div class='del'>-</div><div class='del'>-int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NETFILTER</div><div class='del'>-	IP6CB(skb)-&gt;flags |= IP6SKB_XFRM_TRANSFORMED;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return xfrm_output(sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static int xfrm6_noneed_fragment(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct xfrm_state *x = skb_dst(skb)-&gt;xfrm;</div><div class='del'>-</div><div class='del'>-	return x-&gt;outer_mode-&gt;afinfo-&gt;output_finish(sk, skb);</div><div class='add'>+	struct frag_hdr *fh;</div><div class='add'>+	u8 prevhdr = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+	if (prevhdr != NEXTHDR_FRAGMENT)</div><div class='add'>+		return 0;</div><div class='add'>+	fh = (struct frag_hdr *)(skb-&gt;data + sizeof(struct ipv6hdr));</div><div class='add'>+	if (fh-&gt;nexthdr == NEXTHDR_ESP || fh-&gt;nexthdr == NEXTHDR_AUTH)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst = skb_dst(skb);</div><div class='ctx'> 	struct xfrm_state *x = dst-&gt;xfrm;</div><div class='del'>-	int mtu;</div><div class='add'>+	unsigned int mtu;</div><div class='ctx'> 	bool toobig;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NETFILTER</div><div class='hunk'>@@ -168,28 +82,31 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	toobig = skb-&gt;len &gt; mtu &amp;&amp; !skb_is_gso(skb);</div><div class='ctx'> </div><div class='del'>-	if (toobig &amp;&amp; xfrm6_local_dontfrag(skb)) {</div><div class='add'>+	if (toobig &amp;&amp; xfrm6_local_dontfrag(sk)) {</div><div class='ctx'> 		xfrm6_local_rxpmtu(skb, mtu);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='del'>-	} else if (!skb-&gt;ignore_df &amp;&amp; toobig &amp;&amp; skb-&gt;sk) {</div><div class='add'>+	} else if (toobig &amp;&amp; xfrm6_noneed_fragment(skb)) {</div><div class='add'>+		skb-&gt;ignore_df = 1;</div><div class='add'>+		goto skip_frag;</div><div class='add'>+	} else if (!skb-&gt;ignore_df &amp;&amp; toobig &amp;&amp; sk) {</div><div class='ctx'> 		xfrm_local_error(skb, mtu);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (toobig || dst_allfrag(skb_dst(skb)))</div><div class='add'>+	if (toobig)</div><div class='ctx'> 		return ip6_fragment(net, sk, skb,</div><div class='ctx'> 				    __xfrm6_output_finish);</div><div class='ctx'> </div><div class='ctx'> skip_frag:</div><div class='del'>-	return x-&gt;outer_mode-&gt;afinfo-&gt;output_finish(sk, skb);</div><div class='add'>+	return xfrm_output(sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,</div><div class='del'>-			    net, sk, skb,  NULL, skb_dst(skb)-&gt;dev,</div><div class='add'>+			    net, sk, skb,  skb-&gt;dev, skb_dst_dev(skb),</div><div class='ctx'> 			    __xfrm6_output,</div><div class='ctx'> 			    !(IP6CB(skb)-&gt;flags &amp; IP6SKB_REROUTED));</div><div class='ctx'> }</div><div class='head'>diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c<br/>index ef3defaf43b9..1f19b6f14484 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_policy.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_policy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_policy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_policy.c</a></div><div class='hunk'>@@ -22,28 +22,25 @@</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-#include &lt;net/mip6.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,</div><div class='del'>-					  const xfrm_address_t *saddr,</div><div class='del'>-					  const xfrm_address_t *daddr,</div><div class='del'>-					  u32 mark)</div><div class='add'>+static struct dst_entry *xfrm6_dst_lookup(const struct xfrm_dst_lookup_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	fl6.flowi6_oif = l3mdev_master_ifindex_by_index(net, oif);</div><div class='del'>-	fl6.flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF;</div><div class='del'>-	fl6.flowi6_mark = mark;</div><div class='del'>-	memcpy(&amp;fl6.daddr, daddr, sizeof(fl6.daddr));</div><div class='del'>-	if (saddr)</div><div class='del'>-		memcpy(&amp;fl6.saddr, saddr, sizeof(fl6.saddr));</div><div class='add'>+	fl6.flowi6_l3mdev = l3mdev_master_ifindex_by_index(params-&gt;net,</div><div class='add'>+							   params-&gt;oif);</div><div class='add'>+	fl6.flowi6_mark = params-&gt;mark;</div><div class='add'>+	memcpy(&amp;fl6.daddr, params-&gt;daddr, sizeof(fl6.daddr));</div><div class='add'>+	if (params-&gt;saddr)</div><div class='add'>+		memcpy(&amp;fl6.saddr, params-&gt;saddr, sizeof(fl6.saddr));</div><div class='add'>+</div><div class='add'>+	fl6.flowi4_proto = params-&gt;ipproto;</div><div class='add'>+	fl6.uli = params-&gt;uli;</div><div class='ctx'> </div><div class='del'>-	dst = ip6_route_output(net, NULL, &amp;fl6);</div><div class='add'>+	dst = ip6_route_output(params-&gt;net, NULL, &amp;fl6);</div><div class='ctx'> </div><div class='ctx'> 	err = dst-&gt;error;</div><div class='ctx'> 	if (dst-&gt;error) {</div><div class='hunk'>@@ -54,52 +51,40 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,</div><div class='ctx'> 	return dst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xfrm6_get_saddr(struct net *net, int oif,</div><div class='del'>-			   xfrm_address_t *saddr, xfrm_address_t *daddr,</div><div class='del'>-			   u32 mark)</div><div class='add'>+static int xfrm6_get_saddr(xfrm_address_t *saddr,</div><div class='add'>+			   const struct xfrm_dst_lookup_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='ctx'> </div><div class='del'>-	dst = xfrm6_dst_lookup(net, 0, oif, NULL, daddr, mark);</div><div class='add'>+	dst = xfrm6_dst_lookup(params);</div><div class='ctx'> 	if (IS_ERR(dst))</div><div class='ctx'> 		return -EHOSTUNREACH;</div><div class='ctx'> </div><div class='del'>-	dev = ip6_dst_idev(dst)-&gt;dev;</div><div class='del'>-	ipv6_dev_get_saddr(dev_net(dev), dev, &amp;daddr-&gt;in6, 0, &amp;saddr-&gt;in6);</div><div class='del'>-	dst_release(dst);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm6_get_tos(const struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,</div><div class='del'>-			   int nfheader_len)</div><div class='del'>-{</div><div class='del'>-	if (dst-&gt;ops-&gt;family == AF_INET6) {</div><div class='del'>-		struct rt6_info *rt = (struct rt6_info *)dst;</div><div class='del'>-		path-&gt;path_cookie = rt6_get_cookie(rt);</div><div class='add'>+	idev = ip6_dst_idev(dst);</div><div class='add'>+	if (!idev) {</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		return -EHOSTUNREACH;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	path-&gt;u.rt6.rt6i_nfheader_len = nfheader_len;</div><div class='del'>-</div><div class='add'>+	dev = idev-&gt;dev;</div><div class='add'>+	ipv6_dev_get_saddr(dev_net(dev), dev, &amp;params-&gt;daddr-&gt;in6, 0,</div><div class='add'>+			   &amp;saddr-&gt;in6);</div><div class='add'>+	dst_release(dst);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,</div><div class='ctx'> 			  const struct flowi *fl)</div><div class='ctx'> {</div><div class='del'>-	struct rt6_info *rt = (struct rt6_info *)xdst-&gt;route;</div><div class='add'>+	struct rt6_info *rt = dst_rt6_info(xdst-&gt;route);</div><div class='ctx'> </div><div class='ctx'> 	xdst-&gt;u.dst.dev = dev;</div><div class='del'>-	dev_hold(dev);</div><div class='add'>+	netdev_hold(dev, &amp;xdst-&gt;u.dst.dev_tracker, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	xdst-&gt;u.rt6.rt6i_idev = in6_dev_get(dev);</div><div class='ctx'> 	if (!xdst-&gt;u.rt6.rt6i_idev) {</div><div class='del'>-		dev_put(dev);</div><div class='add'>+		netdev_put(dev, &amp;xdst-&gt;u.dst.dev_tracker);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -111,122 +96,19 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,</div><div class='ctx'> 	xdst-&gt;u.rt6.rt6i_gateway = rt-&gt;rt6i_gateway;</div><div class='ctx'> 	xdst-&gt;u.rt6.rt6i_dst = rt-&gt;rt6i_dst;</div><div class='ctx'> 	xdst-&gt;u.rt6.rt6i_src = rt-&gt;rt6i_src;</div><div class='del'>-	INIT_LIST_HEAD(&amp;xdst-&gt;u.rt6.rt6i_uncached);</div><div class='ctx'> 	rt6_uncached_list_add(&amp;xdst-&gt;u.rt6);</div><div class='del'>-	atomic_inc(&amp;dev_net(dev)-&gt;ipv6.rt6_stats-&gt;fib_rt_uncache);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-_decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)</div><div class='del'>-{</div><div class='del'>-	struct flowi6 *fl6 = &amp;fl-&gt;u.ip6;</div><div class='del'>-	int onlyproto = 0;</div><div class='del'>-	const struct ipv6hdr *hdr = ipv6_hdr(skb);</div><div class='del'>-	u32 offset = sizeof(*hdr);</div><div class='del'>-	struct ipv6_opt_hdr *exthdr;</div><div class='del'>-	const unsigned char *nh = skb_network_header(skb);</div><div class='del'>-	u16 nhoff = IP6CB(skb)-&gt;nhoff;</div><div class='del'>-	int oif = 0;</div><div class='del'>-	u8 nexthdr;</div><div class='del'>-</div><div class='del'>-	if (!nhoff)</div><div class='del'>-		nhoff = offsetof(struct ipv6hdr, nexthdr);</div><div class='del'>-</div><div class='del'>-	nexthdr = nh[nhoff];</div><div class='del'>-</div><div class='del'>-	if (skb_dst(skb))</div><div class='del'>-		oif = skb_dst(skb)-&gt;dev-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-	memset(fl6, 0, sizeof(struct flowi6));</div><div class='del'>-	fl6-&gt;flowi6_mark = skb-&gt;mark;</div><div class='del'>-	fl6-&gt;flowi6_oif = reverse ? skb-&gt;skb_iif : oif;</div><div class='del'>-</div><div class='del'>-	fl6-&gt;daddr = reverse ? hdr-&gt;saddr : hdr-&gt;daddr;</div><div class='del'>-	fl6-&gt;saddr = reverse ? hdr-&gt;daddr : hdr-&gt;saddr;</div><div class='del'>-</div><div class='del'>-	while (nh + offset + 1 &lt; skb-&gt;data ||</div><div class='del'>-	       pskb_may_pull(skb, nh + offset + 1 - skb-&gt;data)) {</div><div class='del'>-		nh = skb_network_header(skb);</div><div class='del'>-		exthdr = (struct ipv6_opt_hdr *)(nh + offset);</div><div class='del'>-</div><div class='del'>-		switch (nexthdr) {</div><div class='del'>-		case NEXTHDR_FRAGMENT:</div><div class='del'>-			onlyproto = 1;</div><div class='del'>-			/* fall through */</div><div class='del'>-		case NEXTHDR_ROUTING:</div><div class='del'>-		case NEXTHDR_HOP:</div><div class='del'>-		case NEXTHDR_DEST:</div><div class='del'>-			offset += ipv6_optlen(exthdr);</div><div class='del'>-			nexthdr = exthdr-&gt;nexthdr;</div><div class='del'>-			exthdr = (struct ipv6_opt_hdr *)(nh + offset);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_UDP:</div><div class='del'>-		case IPPROTO_UDPLITE:</div><div class='del'>-		case IPPROTO_TCP:</div><div class='del'>-		case IPPROTO_SCTP:</div><div class='del'>-		case IPPROTO_DCCP:</div><div class='del'>-			if (!onlyproto &amp;&amp; (nh + offset + 4 &lt; skb-&gt;data ||</div><div class='del'>-			     pskb_may_pull(skb, nh + offset + 4 - skb-&gt;data))) {</div><div class='del'>-				__be16 *ports;</div><div class='del'>-</div><div class='del'>-				nh = skb_network_header(skb);</div><div class='del'>-				ports = (__be16 *)(nh + offset);</div><div class='del'>-				fl6-&gt;fl6_sport = ports[!!reverse];</div><div class='del'>-				fl6-&gt;fl6_dport = ports[!reverse];</div><div class='del'>-			}</div><div class='del'>-			fl6-&gt;flowi6_proto = nexthdr;</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		case IPPROTO_ICMPV6:</div><div class='del'>-			if (!onlyproto &amp;&amp; (nh + offset + 2 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, nh + offset + 2 - skb-&gt;data))) {</div><div class='del'>-				u8 *icmp;</div><div class='del'>-</div><div class='del'>-				nh = skb_network_header(skb);</div><div class='del'>-				icmp = (u8 *)(nh + offset);</div><div class='del'>-				fl6-&gt;fl6_icmp_type = icmp[0];</div><div class='del'>-				fl6-&gt;fl6_icmp_code = icmp[1];</div><div class='del'>-			}</div><div class='del'>-			fl6-&gt;flowi6_proto = nexthdr;</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-		case IPPROTO_MH:</div><div class='del'>-			offset += ipv6_optlen(exthdr);</div><div class='del'>-			if (!onlyproto &amp;&amp; (nh + offset + 3 &lt; skb-&gt;data ||</div><div class='del'>-			    pskb_may_pull(skb, nh + offset + 3 - skb-&gt;data))) {</div><div class='del'>-				struct ip6_mh *mh;</div><div class='del'>-</div><div class='del'>-				nh = skb_network_header(skb);</div><div class='del'>-				mh = (struct ip6_mh *)(nh + offset);</div><div class='del'>-				fl6-&gt;fl6_mh_type = mh-&gt;ip6mh_type;</div><div class='del'>-			}</div><div class='del'>-			fl6-&gt;flowi6_proto = nexthdr;</div><div class='del'>-			return;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* XXX Why are there these headers? */</div><div class='del'>-		case IPPROTO_AH:</div><div class='del'>-		case IPPROTO_ESP:</div><div class='del'>-		case IPPROTO_COMP:</div><div class='del'>-		default:</div><div class='del'>-			fl6-&gt;fl6_ipsec_spi = 0;</div><div class='del'>-			fl6-&gt;flowi6_proto = nexthdr;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void xfrm6_update_pmtu(struct dst_entry *dst, struct sock *sk,</div><div class='del'>-			      struct sk_buff *skb, u32 mtu)</div><div class='add'>+			      struct sk_buff *skb, u32 mtu,</div><div class='add'>+			      bool confirm_neigh)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_dst *xdst = (struct xfrm_dst *)dst;</div><div class='ctx'> 	struct dst_entry *path = xdst-&gt;route;</div><div class='ctx'> </div><div class='del'>-	path-&gt;ops-&gt;update_pmtu(path, sk, skb, mtu);</div><div class='add'>+	path-&gt;ops-&gt;update_pmtu(path, sk, skb, mtu, confirm_neigh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xfrm6_redirect(struct dst_entry *dst, struct sock *sk,</div><div class='hunk'>@@ -242,27 +124,21 @@ static void xfrm6_dst_destroy(struct dst_entry *dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_dst *xdst = (struct xfrm_dst *)dst;</div><div class='ctx'> </div><div class='add'>+	dst_destroy_metrics_generic(dst);</div><div class='add'>+	rt6_uncached_list_del(&amp;xdst-&gt;u.rt6);</div><div class='ctx'> 	if (likely(xdst-&gt;u.rt6.rt6i_idev))</div><div class='ctx'> 		in6_dev_put(xdst-&gt;u.rt6.rt6i_idev);</div><div class='del'>-	dst_destroy_metrics_generic(dst);</div><div class='del'>-	if (xdst-&gt;u.rt6.rt6i_uncached_list)</div><div class='del'>-		rt6_uncached_list_del(&amp;xdst-&gt;u.rt6);</div><div class='ctx'> 	xfrm_dst_destroy(xdst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,</div><div class='del'>-			     int unregister)</div><div class='add'>+static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm_dst *xdst;</div><div class='ctx'> </div><div class='del'>-	if (!unregister)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	xdst = (struct xfrm_dst *)dst;</div><div class='ctx'> 	if (xdst-&gt;u.rt6.rt6i_idev-&gt;dev == dev) {</div><div class='ctx'> 		struct inet6_dev *loopback_idev =</div><div class='ctx'> 			in6_dev_get(dev_net(dev)-&gt;loopback_dev);</div><div class='del'>-		BUG_ON(!loopback_idev);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			in6_dev_put(xdst-&gt;u.rt6.rt6i_idev);</div><div class='hunk'>@@ -292,9 +168,6 @@ static const struct xfrm_policy_afinfo xfrm6_policy_afinfo = {</div><div class='ctx'> 	.dst_ops =		&amp;xfrm6_dst_ops_template,</div><div class='ctx'> 	.dst_lookup =		xfrm6_dst_lookup,</div><div class='ctx'> 	.get_saddr =		xfrm6_get_saddr,</div><div class='del'>-	.decode_session =	_decode_session6,</div><div class='del'>-	.get_tos =		xfrm6_get_tos,</div><div class='del'>-	.init_path =		xfrm6_init_path,</div><div class='ctx'> 	.fill_dst =		xfrm6_fill_dst,</div><div class='ctx'> 	.blackhole_route =	ip6_blackhole_route,</div><div class='ctx'> };</div><div class='hunk'>@@ -318,7 +191,6 @@ static struct ctl_table xfrm6_policy_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler   = proc_dointvec,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init xfrm6_net_sysctl_init(struct net *net)</div><div class='hunk'>@@ -335,7 +207,8 @@ static int __net_init xfrm6_net_sysctl_init(struct net *net)</div><div class='ctx'> 		table[0].data = &amp;net-&gt;xfrm.xfrm6_dst_ops.gc_thresh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = register_net_sysctl(net, "net/ipv6", table);</div><div class='add'>+	hdr = register_net_sysctl_sz(net, "net/ipv6", table,</div><div class='add'>+				     ARRAY_SIZE(xfrm6_policy_table));</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +224,7 @@ err_alloc:</div><div class='ctx'> </div><div class='ctx'> static void __net_exit xfrm6_net_sysctl_exit(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> </div><div class='ctx'> 	if (!net-&gt;ipv6.sysctl.xfrm6_hdr)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -415,9 +288,19 @@ int __init xfrm6_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_state;</div><div class='ctx'> </div><div class='del'>-	register_pernet_subsys(&amp;xfrm6_net_ops);</div><div class='add'>+	ret = register_pernet_subsys(&amp;xfrm6_net_ops);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_protocol;</div><div class='add'>+</div><div class='add'>+	ret = xfrm_nat_keepalive_init(AF_INET6);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_nat_keepalive;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='add'>+out_nat_keepalive:</div><div class='add'>+	unregister_pernet_subsys(&amp;xfrm6_net_ops);</div><div class='add'>+out_protocol:</div><div class='add'>+	xfrm6_protocol_fini();</div><div class='ctx'> out_state:</div><div class='ctx'> 	xfrm6_state_fini();</div><div class='ctx'> out_policy:</div><div class='hunk'>@@ -427,6 +310,7 @@ out_policy:</div><div class='ctx'> </div><div class='ctx'> void xfrm6_fini(void)</div><div class='ctx'> {</div><div class='add'>+	xfrm_nat_keepalive_fini(AF_INET6);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;xfrm6_net_ops);</div><div class='ctx'> 	xfrm6_protocol_fini();</div><div class='ctx'> 	xfrm6_policy_fini();</div><div class='head'>diff --git a/net/ipv6/xfrm6_protocol.c b/net/ipv6/xfrm6_protocol.c<br/>index b2dc8ce49378..ea2f805d3b01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_protocol.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_protocol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_protocol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_protocol.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* xfrm6_protocol.c - Generic xfrm protocol multiplexer for ipv6.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2013 secunet Security Networks AG</div><div class='hunk'>@@ -7,17 +8,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Based on:</div><div class='ctx'>  * net/ipv4/xfrm4_protocol.c</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/icmpv6.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='hunk'>@@ -46,7 +43,7 @@ static inline struct xfrm6_protocol __rcu **proto_handlers(u8 protocol)</div><div class='ctx'> 	     handler != NULL;				\</div><div class='ctx'> 	     handler = rcu_dereference(handler-&gt;next))	\</div><div class='ctx'> </div><div class='del'>-int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='add'>+static int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct xfrm6_protocol *handler;</div><div class='hunk'>@@ -61,7 +58,53 @@ int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(xfrm6_rcv_cb);</div><div class='add'>+</div><div class='add'>+int xfrm6_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,</div><div class='add'>+		    int encap_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct xfrm6_protocol *handler;</div><div class='add'>+	struct xfrm6_protocol __rcu **head = proto_handlers(nexthdr);</div><div class='add'>+</div><div class='add'>+	XFRM_TUNNEL_SKB_CB(skb)-&gt;tunnel.ip6 = NULL;</div><div class='add'>+	XFRM_SPI_SKB_CB(skb)-&gt;family = AF_INET6;</div><div class='add'>+	XFRM_SPI_SKB_CB(skb)-&gt;daddroff = offsetof(struct ipv6hdr, daddr);</div><div class='add'>+</div><div class='add'>+	if (!head)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!skb_dst(skb)) {</div><div class='add'>+		const struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+		int flags = RT6_LOOKUP_F_HAS_SADDR;</div><div class='add'>+		struct dst_entry *dst;</div><div class='add'>+		struct flowi6 fl6 = {</div><div class='add'>+			.flowi6_iif   = skb-&gt;dev-&gt;ifindex,</div><div class='add'>+			.daddr        = ip6h-&gt;daddr,</div><div class='add'>+			.saddr        = ip6h-&gt;saddr,</div><div class='add'>+			.flowlabel    = ip6_flowinfo(ip6h),</div><div class='add'>+			.flowi6_mark  = skb-&gt;mark,</div><div class='add'>+			.flowi6_proto = ip6h-&gt;nexthdr,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dst = ip6_route_input_lookup(dev_net(skb-&gt;dev), skb-&gt;dev, &amp;fl6,</div><div class='add'>+					     skb, flags);</div><div class='add'>+		if (dst-&gt;error)</div><div class='add'>+			goto drop;</div><div class='add'>+		skb_dst_set(skb, dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_protocol_rcu(*head, handler)</div><div class='add'>+		if ((ret = handler-&gt;input_handler(skb, nexthdr, spi, encap_type)) != -EINVAL)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xfrm6_rcv_encap);</div><div class='ctx'> </div><div class='ctx'> static int xfrm6_esp_rcv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -80,14 +123,16 @@ static int xfrm6_esp_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm6_esp_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int xfrm6_esp_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			  u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(esp6_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xfrm6_ah_rcv(struct sk_buff *skb)</div><div class='hunk'>@@ -107,14 +152,16 @@ static int xfrm6_ah_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm6_ah_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int xfrm6_ah_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			 u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(ah6_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xfrm6_ipcomp_rcv(struct sk_buff *skb)</div><div class='hunk'>@@ -134,14 +181,16 @@ static int xfrm6_ipcomp_rcv(struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xfrm6_ipcomp_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='add'>+static int xfrm6_ipcomp_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 			     u8 type, u8 code, int offset, __be32 info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xfrm6_protocol *handler;</div><div class='ctx'> </div><div class='ctx'> 	for_each_protocol_rcu(ipcomp6_handlers, handler)</div><div class='ctx'> 		if (!handler-&gt;err_handler(skb, opt, type, code, offset, info))</div><div class='del'>-			break;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inet6_protocol esp6_protocol = {</div><div class='head'>diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c<br/>index 5bdca3d5d6b7..6610b2198fa9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_state.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_state.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_state.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_state.c</a></div><div class='hunk'>@@ -13,174 +13,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='del'>-#include &lt;linux/pfkeyv2.h&gt;</div><div class='del'>-#include &lt;linux/ipsec.h&gt;</div><div class='del'>-#include &lt;linux/netfilter_ipv6.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/dsfield.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)</div><div class='del'>-{</div><div class='del'>-	const struct flowi6 *fl6 = &amp;fl-&gt;u.ip6;</div><div class='del'>-</div><div class='del'>-	/* Initialize temporary selector matching only</div><div class='del'>-	 * to current session. */</div><div class='del'>-	*(struct in6_addr *)&amp;sel-&gt;daddr = fl6-&gt;daddr;</div><div class='del'>-	*(struct in6_addr *)&amp;sel-&gt;saddr = fl6-&gt;saddr;</div><div class='del'>-	sel-&gt;dport = xfrm_flowi_dport(fl, &amp;fl6-&gt;uli);</div><div class='del'>-	sel-&gt;dport_mask = htons(0xffff);</div><div class='del'>-	sel-&gt;sport = xfrm_flowi_sport(fl, &amp;fl6-&gt;uli);</div><div class='del'>-	sel-&gt;sport_mask = htons(0xffff);</div><div class='del'>-	sel-&gt;family = AF_INET6;</div><div class='del'>-	sel-&gt;prefixlen_d = 128;</div><div class='del'>-	sel-&gt;prefixlen_s = 128;</div><div class='del'>-	sel-&gt;proto = fl6-&gt;flowi6_proto;</div><div class='del'>-	sel-&gt;ifindex = fl6-&gt;flowi6_oif;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,</div><div class='del'>-		   const xfrm_address_t *daddr, const xfrm_address_t *saddr)</div><div class='del'>-{</div><div class='del'>-	x-&gt;id = tmpl-&gt;id;</div><div class='del'>-	if (ipv6_addr_any((struct in6_addr *)&amp;x-&gt;id.daddr))</div><div class='del'>-		memcpy(&amp;x-&gt;id.daddr, daddr, sizeof(x-&gt;sel.daddr));</div><div class='del'>-	memcpy(&amp;x-&gt;props.saddr, &amp;tmpl-&gt;saddr, sizeof(x-&gt;props.saddr));</div><div class='del'>-	if (ipv6_addr_any((struct in6_addr *)&amp;x-&gt;props.saddr))</div><div class='del'>-		memcpy(&amp;x-&gt;props.saddr, saddr, sizeof(x-&gt;props.saddr));</div><div class='del'>-	x-&gt;props.mode = tmpl-&gt;mode;</div><div class='del'>-	x-&gt;props.reqid = tmpl-&gt;reqid;</div><div class='del'>-	x-&gt;props.family = AF_INET6;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* distribution counting sort function for xfrm_state and xfrm_tmpl */</div><div class='del'>-static int</div><div class='del'>-__xfrm6_sort(void **dst, void **src, int n, int (*cmp)(void *p), int maxclass)</div><div class='del'>-{</div><div class='del'>-	int count[XFRM_MAX_DEPTH] = { };</div><div class='del'>-	int class[XFRM_MAX_DEPTH];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		int c;</div><div class='del'>-		class[i] = c = cmp(src[i]);</div><div class='del'>-		count[c]++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 2; i &lt; maxclass; i++)</div><div class='del'>-		count[i] += count[i - 1];</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		dst[count[class[i] - 1]++] = src[i];</div><div class='del'>-		src[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Rule for xfrm_state:</div><div class='del'>- *</div><div class='del'>- * rule 1: select IPsec transport except AH</div><div class='del'>- * rule 2: select MIPv6 RO or inbound trigger</div><div class='del'>- * rule 3: select IPsec transport AH</div><div class='del'>- * rule 4: select IPsec tunnel</div><div class='del'>- * rule 5: others</div><div class='del'>- */</div><div class='del'>-static int __xfrm6_state_sort_cmp(void *p)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_state *v = p;</div><div class='del'>-</div><div class='del'>-	switch (v-&gt;props.mode) {</div><div class='del'>-	case XFRM_MODE_TRANSPORT:</div><div class='del'>-		if (v-&gt;id.proto != IPPROTO_AH)</div><div class='del'>-			return 1;</div><div class='del'>-		else</div><div class='del'>-			return 3;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-	case XFRM_MODE_ROUTEOPTIMIZATION:</div><div class='del'>-	case XFRM_MODE_IN_TRIGGER:</div><div class='del'>-		return 2;</div><div class='del'>-#endif</div><div class='del'>-	case XFRM_MODE_TUNNEL:</div><div class='del'>-	case XFRM_MODE_BEET:</div><div class='del'>-		return 4;</div><div class='del'>-	}</div><div class='del'>-	return 5;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)</div><div class='del'>-{</div><div class='del'>-	return __xfrm6_sort((void **)dst, (void **)src, n,</div><div class='del'>-			    __xfrm6_state_sort_cmp, 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Rule for xfrm_tmpl:</div><div class='del'>- *</div><div class='del'>- * rule 1: select IPsec transport</div><div class='del'>- * rule 2: select MIPv6 RO or inbound trigger</div><div class='del'>- * rule 3: select IPsec tunnel</div><div class='del'>- * rule 4: others</div><div class='del'>- */</div><div class='del'>-static int __xfrm6_tmpl_sort_cmp(void *p)</div><div class='del'>-{</div><div class='del'>-	struct xfrm_tmpl *v = p;</div><div class='del'>-	switch (v-&gt;mode) {</div><div class='del'>-	case XFRM_MODE_TRANSPORT:</div><div class='del'>-		return 1;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6_MIP6)</div><div class='del'>-	case XFRM_MODE_ROUTEOPTIMIZATION:</div><div class='del'>-	case XFRM_MODE_IN_TRIGGER:</div><div class='del'>-		return 2;</div><div class='del'>-#endif</div><div class='del'>-	case XFRM_MODE_TUNNEL:</div><div class='del'>-	case XFRM_MODE_BEET:</div><div class='del'>-		return 3;</div><div class='del'>-	}</div><div class='del'>-	return 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)</div><div class='del'>-{</div><div class='del'>-	return __xfrm6_sort((void **)dst, (void **)src, n,</div><div class='del'>-			    __xfrm6_tmpl_sort_cmp, 5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xfrm6_extract_header(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ipv6hdr *iph = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;ihl = sizeof(*iph);</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;id = 0;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;frag_off = htons(IP_DF);</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;tos = ipv6_get_dsfield(iph);</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;ttl = iph-&gt;hop_limit;</div><div class='del'>-	XFRM_MODE_SKB_CB(skb)-&gt;optlen = 0;</div><div class='del'>-	memcpy(XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl, iph-&gt;flow_lbl,</div><div class='del'>-	       sizeof(XFRM_MODE_SKB_CB(skb)-&gt;flow_lbl));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static struct xfrm_state_afinfo xfrm6_state_afinfo = {</div><div class='ctx'> 	.family			= AF_INET6,</div><div class='ctx'> 	.proto			= IPPROTO_IPV6,</div><div class='del'>-	.eth_proto		= htons(ETH_P_IPV6),</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.init_tempsel		= __xfrm6_init_tempsel,</div><div class='del'>-	.init_temprop		= xfrm6_init_temprop,</div><div class='del'>-	.tmpl_sort		= __xfrm6_tmpl_sort,</div><div class='del'>-	.state_sort		= __xfrm6_state_sort,</div><div class='ctx'> 	.output			= xfrm6_output,</div><div class='del'>-	.output_finish		= xfrm6_output_finish,</div><div class='del'>-	.extract_input		= xfrm6_extract_input,</div><div class='del'>-	.extract_output		= xfrm6_extract_output,</div><div class='ctx'> 	.transport_finish	= xfrm6_transport_finish,</div><div class='ctx'> 	.local_error		= xfrm6_local_error,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c<br/>index 4a46df8441c9..0a0eeaed0591 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_tunnel.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/ipv6/xfrm6_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/ipv6/xfrm6_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/ipv6/xfrm6_tunnel.c</a></div><div class='hunk'>@@ -1,24 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C)2003,2004 USAGI/WIDE Project</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  * Authors	Mitsuru KANDA  &lt;mk@linux-ipv6.org&gt;</div><div class='ctx'>  *		YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on net/ipv4/xfrm4_tunnel.c</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/xfrm.h&gt;</div><div class='hunk'>@@ -91,7 +78,7 @@ static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(struct net *net, const</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(x6spi,</div><div class='ctx'> 			     &amp;xfrm6_tn-&gt;spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],</div><div class='del'>-			     list_byaddr) {</div><div class='add'>+			     list_byaddr, lockdep_is_held(&amp;xfrm6_tunnel_spi_lock)) {</div><div class='ctx'> 		if (xfrm6_addr_equal(&amp;x6spi-&gt;addr, saddr))</div><div class='ctx'> 			return x6spi;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -144,6 +131,9 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)</div><div class='ctx'> 		index = __xfrm6_tunnel_spi_check(net, spi);</div><div class='ctx'> 		if (index &gt;= 0)</div><div class='ctx'> 			goto alloc_spi;</div><div class='add'>+</div><div class='add'>+		if (spi == XFRM6_TUNNEL_SPI_MAX)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (spi = XFRM6_TUNNEL_SPI_MIN; spi &lt; xfrm6_tn-&gt;spi; spi++) {</div><div class='ctx'> 		index = __xfrm6_tunnel_spi_check(net, spi);</div><div class='hunk'>@@ -280,13 +270,17 @@ static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xfrm6_tunnel_init_state(struct xfrm_state *x)</div><div class='add'>+static int xfrm6_tunnel_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	if (x-&gt;props.mode != XFRM_MODE_TUNNEL)</div><div class='add'>+	if (x-&gt;props.mode != XFRM_MODE_TUNNEL) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 tunnel can only be used with tunnel mode");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (x-&gt;encap)</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "IPv6 tunnel is not compatible with encapsulation");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	x-&gt;props.header_len = sizeof(struct ipv6hdr);</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +295,6 @@ static void xfrm6_tunnel_destroy(struct xfrm_state *x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct xfrm_type xfrm6_tunnel_type = {</div><div class='del'>-	.description	= "IP6IP6",</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.proto		= IPPROTO_IPV6,</div><div class='ctx'> 	.init_state	= xfrm6_tunnel_init_state,</div><div class='hunk'>@@ -313,13 +306,13 @@ static const struct xfrm_type xfrm6_tunnel_type = {</div><div class='ctx'> static struct xfrm6_tunnel xfrm6_tunnel_handler __read_mostly = {</div><div class='ctx'> 	.handler	= xfrm6_tunnel_rcv,</div><div class='ctx'> 	.err_handler	= xfrm6_tunnel_err,</div><div class='del'>-	.priority	= 2,</div><div class='add'>+	.priority	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xfrm6_tunnel xfrm46_tunnel_handler __read_mostly = {</div><div class='ctx'> 	.handler	= xfrm6_tunnel_rcv,</div><div class='ctx'> 	.err_handler	= xfrm6_tunnel_err,</div><div class='del'>-	.priority	= 2,</div><div class='add'>+	.priority	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __net_init xfrm6_tunnel_net_init(struct net *net)</div><div class='hunk'>@@ -341,7 +334,7 @@ static void __net_exit xfrm6_tunnel_net_exit(struct net *net)</div><div class='ctx'> 	struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	xfrm_state_flush(net, IPSEC_PROTO_ANY, false);</div><div class='add'>+	xfrm_state_flush(net, 0, false);</div><div class='ctx'> 	xfrm_flush_gc();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; XFRM6_TUNNEL_SPI_BYADDR_HSIZE; i++)</div><div class='hunk'>@@ -362,10 +355,7 @@ static int __init xfrm6_tunnel_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",</div><div class='del'>-						  sizeof(struct xfrm6_tunnel_spi),</div><div class='del'>-						  0, SLAB_HWCACHE_ALIGN,</div><div class='del'>-						  NULL);</div><div class='add'>+	xfrm6_tunnel_spi_kmem = KMEM_CACHE(xfrm6_tunnel_spi, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!xfrm6_tunnel_spi_kmem)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	rv = register_pernet_subsys(&amp;xfrm6_tunnel_net_ops);</div><div class='hunk'>@@ -399,10 +389,15 @@ static void __exit xfrm6_tunnel_fini(void)</div><div class='ctx'> 	xfrm6_tunnel_deregister(&amp;xfrm6_tunnel_handler, AF_INET6);</div><div class='ctx'> 	xfrm_unregister_type(&amp;xfrm6_tunnel_type, AF_INET6);</div><div class='ctx'> 	unregister_pernet_subsys(&amp;xfrm6_tunnel_net_ops);</div><div class='add'>+	/* Someone maybe has gotten the xfrm6_tunnel_spi.</div><div class='add'>+	 * So need to wait it.</div><div class='add'>+	 */</div><div class='add'>+	rcu_barrier();</div><div class='ctx'> 	kmem_cache_destroy(xfrm6_tunnel_spi_kmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(xfrm6_tunnel_init);</div><div class='ctx'> module_exit(xfrm6_tunnel_fini);</div><div class='add'>+MODULE_DESCRIPTION("IPv6 XFRM tunnel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_IPV6);</div><div class='head'>diff --git a/net/iucv/Kconfig b/net/iucv/Kconfig<br/>index 497fbe732def..5cfddc9c6498 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/iucv/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/iucv/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/iucv/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config IUCV</div><div class='ctx'> 	depends on S390</div><div class='ctx'> 	def_tristate y if S390</div><div class='head'>diff --git a/net/iucv/Makefile b/net/iucv/Makefile<br/>index 7bfdc8532675..984d7ff056ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/iucv/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/iucv/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/iucv/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for IUCV</div><div class='ctx'> #</div><div class='head'>diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c<br/>index e2f16a0173a9..1e62fbc22cb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/iucv/af_iucv.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/af_iucv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/iucv/af_iucv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/iucv/af_iucv.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  IUCV protocol stack for Linux on zSeries</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,11 +10,13 @@</div><div class='ctx'>  *		Ursula Braun &lt;ursula.braun@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define KMSG_COMPONENT "af_iucv"</div><div class='del'>-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='add'>+#define pr_fmt(fmt) "af_iucv: " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -24,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;asm/machine.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='ctx'> #include &lt;asm/cpcmd.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='hunk'>@@ -34,8 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> static char iucv_userid[80];</div><div class='ctx'> </div><div class='del'>-static const struct proto_ops iucv_sock_ops;</div><div class='del'>-</div><div class='ctx'> static struct proto iucv_proto = {</div><div class='ctx'> 	.name		= "AF_IUCV",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='hunk'>@@ -43,12 +45,13 @@ static struct proto iucv_proto = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct iucv_interface *pr_iucv;</div><div class='add'>+static struct iucv_handler af_iucv_handler;</div><div class='ctx'> </div><div class='ctx'> /* special AF_IUCV IPRM messages */</div><div class='ctx'> static const u8 iprm_shutdown[8] =</div><div class='ctx'> 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};</div><div class='ctx'> </div><div class='del'>-#define TRGCLS_SIZE	(sizeof(((struct iucv_message *)0)-&gt;class))</div><div class='add'>+#define TRGCLS_SIZE	sizeof_field(struct iucv_message, class)</div><div class='ctx'> </div><div class='ctx'> #define __iucv_sock_wait(sk, condition, timeo, ret)			\</div><div class='ctx'> do {									\</div><div class='hunk'>@@ -83,38 +86,18 @@ do {									\</div><div class='ctx'> 	__ret;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+static struct sock *iucv_accept_dequeue(struct sock *parent,</div><div class='add'>+					struct socket *newsock);</div><div class='ctx'> static void iucv_sock_kill(struct sock *sk);</div><div class='ctx'> static void iucv_sock_close(struct sock *sk);</div><div class='del'>-static void iucv_sever_path(struct sock *, int);</div><div class='ctx'> </div><div class='del'>-static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-	struct packet_type *pt, struct net_device *orig_dev);</div><div class='del'>-static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,</div><div class='del'>-		   struct sk_buff *skb, u8 flags);</div><div class='del'>-static void afiucv_hs_callback_txnotify(struct sk_buff *, enum iucv_tx_notify);</div><div class='del'>-</div><div class='del'>-/* Call Back functions */</div><div class='del'>-static void iucv_callback_rx(struct iucv_path *, struct iucv_message *);</div><div class='del'>-static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *);</div><div class='del'>-static void iucv_callback_connack(struct iucv_path *, u8 *);</div><div class='del'>-static int iucv_callback_connreq(struct iucv_path *, u8 *, u8 *);</div><div class='del'>-static void iucv_callback_connrej(struct iucv_path *, u8 *);</div><div class='del'>-static void iucv_callback_shutdown(struct iucv_path *, u8 *);</div><div class='add'>+static void afiucv_hs_callback_txnotify(struct sock *sk, enum iucv_tx_notify);</div><div class='ctx'> </div><div class='ctx'> static struct iucv_sock_list iucv_sk_list = {</div><div class='ctx'> 	.lock = __RW_LOCK_UNLOCKED(iucv_sk_list.lock),</div><div class='ctx'> 	.autobind_name = ATOMIC_INIT(0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct iucv_handler af_iucv_handler = {</div><div class='del'>-	.path_pending	  = iucv_callback_connreq,</div><div class='del'>-	.path_complete	  = iucv_callback_connack,</div><div class='del'>-	.path_severed	  = iucv_callback_connrej,</div><div class='del'>-	.message_pending  = iucv_callback_rx,</div><div class='del'>-	.message_complete = iucv_callback_txdone,</div><div class='del'>-	.path_quiesced	  = iucv_callback_shutdown,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static inline void high_nmcpy(unsigned char *dst, char *src)</div><div class='ctx'> {</div><div class='ctx'>        memcpy(dst, src, 8);</div><div class='hunk'>@@ -125,110 +108,6 @@ static inline void low_nmcpy(unsigned char *dst, char *src)</div><div class='ctx'>        memcpy(&amp;dst[8], src, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int afiucv_pm_prepare(struct device *dev)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "afiucv_pm_prepare\n");</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void afiucv_pm_complete(struct device *dev)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "afiucv_pm_complete\n");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * afiucv_pm_freeze() - Freeze PM callback</div><div class='del'>- * @dev:	AFIUCV dummy device</div><div class='del'>- *</div><div class='del'>- * Sever all established IUCV communication pathes</div><div class='del'>- */</div><div class='del'>-static int afiucv_pm_freeze(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct iucv_sock *iucv;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "afiucv_pm_freeze\n");</div><div class='del'>-#endif</div><div class='del'>-	read_lock(&amp;iucv_sk_list.lock);</div><div class='del'>-	sk_for_each(sk, &amp;iucv_sk_list.head) {</div><div class='del'>-		iucv = iucv_sk(sk);</div><div class='del'>-		switch (sk-&gt;sk_state) {</div><div class='del'>-		case IUCV_DISCONN:</div><div class='del'>-		case IUCV_CLOSING:</div><div class='del'>-		case IUCV_CONNECTED:</div><div class='del'>-			iucv_sever_path(sk, 0);</div><div class='del'>-			break;</div><div class='del'>-		case IUCV_OPEN:</div><div class='del'>-		case IUCV_BOUND:</div><div class='del'>-		case IUCV_LISTEN:</div><div class='del'>-		case IUCV_CLOSED:</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		skb_queue_purge(&amp;iucv-&gt;send_skb_q);</div><div class='del'>-		skb_queue_purge(&amp;iucv-&gt;backlog_skb_q);</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;iucv_sk_list.lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * afiucv_pm_restore_thaw() - Thaw and restore PM callback</div><div class='del'>- * @dev:	AFIUCV dummy device</div><div class='del'>- *</div><div class='del'>- * socket clean up after freeze</div><div class='del'>- */</div><div class='del'>-static int afiucv_pm_restore_thaw(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "afiucv_pm_restore_thaw\n");</div><div class='del'>-#endif</div><div class='del'>-	read_lock(&amp;iucv_sk_list.lock);</div><div class='del'>-	sk_for_each(sk, &amp;iucv_sk_list.head) {</div><div class='del'>-		switch (sk-&gt;sk_state) {</div><div class='del'>-		case IUCV_CONNECTED:</div><div class='del'>-			sk-&gt;sk_err = EPIPE;</div><div class='del'>-			sk-&gt;sk_state = IUCV_DISCONN;</div><div class='del'>-			sk-&gt;sk_state_change(sk);</div><div class='del'>-			break;</div><div class='del'>-		case IUCV_DISCONN:</div><div class='del'>-		case IUCV_CLOSING:</div><div class='del'>-		case IUCV_LISTEN:</div><div class='del'>-		case IUCV_BOUND:</div><div class='del'>-		case IUCV_OPEN:</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;iucv_sk_list.lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dev_pm_ops afiucv_pm_ops = {</div><div class='del'>-	.prepare = afiucv_pm_prepare,</div><div class='del'>-	.complete = afiucv_pm_complete,</div><div class='del'>-	.freeze = afiucv_pm_freeze,</div><div class='del'>-	.thaw = afiucv_pm_restore_thaw,</div><div class='del'>-	.restore = afiucv_pm_restore_thaw,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct device_driver af_iucv_driver = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "afiucv",</div><div class='del'>-	.bus  = NULL,</div><div class='del'>-	.pm   = &amp;afiucv_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* dummy device used as trigger for PM functions */</div><div class='del'>-static struct device *af_iucv_dev;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * iucv_msg_length() - Returns the length of an iucv message.</div><div class='ctx'>  * @msg:	Pointer to struct iucv_message, MUST NOT be NULL</div><div class='hunk'>@@ -264,7 +143,7 @@ static inline size_t iucv_msg_length(struct iucv_message *msg)</div><div class='ctx'>  * iucv_sock_in_state() - check for specific states</div><div class='ctx'>  * @sk:		sock structure</div><div class='ctx'>  * @state:	first iucv sk state</div><div class='del'>- * @state:	second iucv sk state</div><div class='add'>+ * @state2:	second iucv sk state</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if the socket in either in the first or second state.</div><div class='ctx'>  */</div><div class='hunk'>@@ -288,13 +167,13 @@ static inline int iucv_below_msglim(struct sock *sk)</div><div class='ctx'> 	if (sk-&gt;sk_state != IUCV_CONNECTED)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (iucv-&gt;transport == AF_IUCV_TRANS_IUCV)</div><div class='del'>-		return (skb_queue_len(&amp;iucv-&gt;send_skb_q) &lt; iucv-&gt;path-&gt;msglim);</div><div class='add'>+		return (atomic_read(&amp;iucv-&gt;skbs_in_xmit) &lt; iucv-&gt;path-&gt;msglim);</div><div class='ctx'> 	else</div><div class='ctx'> 		return ((atomic_read(&amp;iucv-&gt;msg_sent) &lt; iucv-&gt;msglimit_peer) &amp;&amp;</div><div class='ctx'> 			(atomic_read(&amp;iucv-&gt;pendings) &lt;= 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_sock_wake_msglim() - Wake up thread waiting on msg limit</div><div class='ctx'>  */</div><div class='ctx'> static void iucv_sock_wake_msglim(struct sock *sk)</div><div class='hunk'>@@ -305,11 +184,11 @@ static void iucv_sock_wake_msglim(struct sock *sk)</div><div class='ctx'> 	wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='ctx'> 	if (skwq_has_sleeper(wq))</div><div class='ctx'> 		wake_up_interruptible_all(&amp;wq-&gt;wait);</div><div class='del'>-	sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='add'>+	sk_wake_async_rcu(sk, SOCK_WAKE_SPACE, POLL_OUT);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_send() - send a message through HiperSockets transport</div><div class='ctx'>  */</div><div class='ctx'> static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,</div><div class='hunk'>@@ -317,16 +196,11 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sock);</div><div class='ctx'> 	struct af_iucv_trans_hdr *phs_hdr;</div><div class='del'>-	struct sk_buff *nskb;</div><div class='ctx'> 	int err, confirm_recv = 0;</div><div class='ctx'> </div><div class='del'>-	memset(skb-&gt;head, 0, ETH_HLEN);</div><div class='del'>-	phs_hdr = skb_push(skb, sizeof(struct af_iucv_trans_hdr));</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='add'>+	phs_hdr = skb_push(skb, sizeof(*phs_hdr));</div><div class='add'>+	memset(phs_hdr, 0, sizeof(*phs_hdr));</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='del'>-	skb_push(skb, ETH_HLEN);</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	memset(phs_hdr, 0, sizeof(struct af_iucv_trans_hdr));</div><div class='ctx'> </div><div class='ctx'> 	phs_hdr-&gt;magic = ETH_P_AF_IUCV;</div><div class='ctx'> 	phs_hdr-&gt;version = 1;</div><div class='hunk'>@@ -355,6 +229,9 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dev_hard_header(skb, skb-&gt;dev, ETH_P_AF_IUCV, NULL, NULL, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	if (!(skb-&gt;dev-&gt;flags &amp; IFF_UP) || !netif_carrier_ok(skb-&gt;dev)) {</div><div class='ctx'> 		err = -ENETDOWN;</div><div class='ctx'> 		goto err_free;</div><div class='hunk'>@@ -364,20 +241,16 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,</div><div class='ctx'> 			err = -EMSGSIZE;</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 		}</div><div class='del'>-		skb_trim(skb, skb-&gt;dev-&gt;mtu);</div><div class='add'>+		err = pskb_trim(skb, skb-&gt;dev-&gt;mtu);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb-&gt;protocol = cpu_to_be16(ETH_P_AF_IUCV);</div><div class='del'>-	nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-	if (!nskb) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	skb_queue_tail(&amp;iucv-&gt;send_skb_q, nskb);</div><div class='add'>+	atomic_inc(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> 	err = dev_queue_xmit(skb);</div><div class='ctx'> 	if (net_xmit_eval(err)) {</div><div class='del'>-		skb_unlink(nskb, &amp;iucv-&gt;send_skb_q);</div><div class='del'>-		kfree_skb(nskb);</div><div class='add'>+		atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		atomic_sub(confirm_recv, &amp;iucv-&gt;msg_recv);</div><div class='ctx'> 		WARN_ON(atomic_read(&amp;iucv-&gt;msg_recv) &lt; 0);</div><div class='hunk'>@@ -405,8 +278,6 @@ static void iucv_sock_destruct(struct sock *sk)</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_error_queue);</div><div class='ctx'> </div><div class='del'>-	sk_mem_reclaim(sk);</div><div class='del'>-</div><div class='ctx'> 	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='ctx'> 		pr_err("Attempt to release alive iucv socket %p\n", sk);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -432,6 +303,20 @@ static void iucv_sock_cleanup_listen(struct sock *parent)</div><div class='ctx'> 	parent-&gt;sk_state = IUCV_CLOSED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iucv_sock_link(struct iucv_sock_list *l, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	write_lock_bh(&amp;l-&gt;lock);</div><div class='add'>+	sk_add_node(sk, &amp;l-&gt;head);</div><div class='add'>+	write_unlock_bh(&amp;l-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	write_lock_bh(&amp;l-&gt;lock);</div><div class='add'>+	sk_del_node_init(sk);</div><div class='add'>+	write_unlock_bh(&amp;l-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Kill socket (only if zapped and orphaned) */</div><div class='ctx'> static void iucv_sock_kill(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -450,8 +335,8 @@ static void iucv_sever_path(struct sock *sk, int with_user_data)</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> 	struct iucv_path *path = iucv-&gt;path;</div><div class='ctx'> </div><div class='del'>-	if (iucv-&gt;path) {</div><div class='del'>-		iucv-&gt;path = NULL;</div><div class='add'>+	/* Whoever resets the path pointer, must sever and free it. */</div><div class='add'>+	if (xchg(&amp;iucv-&gt;path, NULL)) {</div><div class='ctx'> 		if (with_user_data) {</div><div class='ctx'> 			low_nmcpy(user_data, iucv-&gt;src_name);</div><div class='ctx'> 			high_nmcpy(user_data, iucv-&gt;dst_name);</div><div class='hunk'>@@ -466,12 +351,14 @@ static void iucv_sever_path(struct sock *sk, int with_user_data)</div><div class='ctx'> /* Send controlling flags through an IUCV socket for HIPER transport */</div><div class='ctx'> static int iucv_send_ctrl(struct sock *sk, u8 flags)</div><div class='ctx'> {</div><div class='add'>+	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int blen;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 shutdown = 0;</div><div class='ctx'> </div><div class='del'>-	blen = sizeof(struct af_iucv_trans_hdr) + ETH_HLEN;</div><div class='add'>+	blen = sizeof(struct af_iucv_trans_hdr) +</div><div class='add'>+	       LL_RESERVED_SPACE(iucv-&gt;hs_dev);</div><div class='ctx'> 	if (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN) {</div><div class='ctx'> 		/* controlling flags should be sent anyway */</div><div class='ctx'> 		shutdown = sk-&gt;sk_shutdown;</div><div class='hunk'>@@ -507,11 +394,13 @@ static void iucv_sock_close(struct sock *sk)</div><div class='ctx'> 			sk-&gt;sk_state = IUCV_DISCONN;</div><div class='ctx'> 			sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		}</div><div class='del'>-	case IUCV_DISCONN:   /* fall through */</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	case IUCV_DISCONN:</div><div class='ctx'> 		sk-&gt;sk_state = IUCV_CLOSING;</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; !skb_queue_empty(&amp;iucv-&gt;send_skb_q)) {</div><div class='add'>+		if (!err &amp;&amp; atomic_read(&amp;iucv-&gt;skbs_in_xmit) &gt; 0) {</div><div class='ctx'> 			if (sock_flag(sk, SOCK_LINGER) &amp;&amp; sk-&gt;sk_lingertime)</div><div class='ctx'> 				timeo = sk-&gt;sk_lingertime;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -520,8 +409,9 @@ static void iucv_sock_close(struct sock *sk)</div><div class='ctx'> 					iucv_sock_in_state(sk, IUCV_CLOSED, 0),</div><div class='ctx'> 					timeo);</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='del'>-	case IUCV_CLOSING:   /* fall through */</div><div class='add'>+	case IUCV_CLOSING:</div><div class='ctx'> 		sk-&gt;sk_state = IUCV_CLOSED;</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -530,8 +420,9 @@ static void iucv_sock_close(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 		skb_queue_purge(&amp;iucv-&gt;send_skb_q);</div><div class='ctx'> 		skb_queue_purge(&amp;iucv-&gt;backlog_skb_q);</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='del'>-	default:   /* fall through */</div><div class='add'>+	default:</div><div class='ctx'> 		iucv_sever_path(sk, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -576,11 +467,12 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio,</div><div class='ctx'> 	atomic_set(&amp;iucv-&gt;pendings, 0);</div><div class='ctx'> 	iucv-&gt;flags = 0;</div><div class='ctx'> 	iucv-&gt;msglimit = 0;</div><div class='add'>+	atomic_set(&amp;iucv-&gt;skbs_in_xmit, 0);</div><div class='ctx'> 	atomic_set(&amp;iucv-&gt;msg_sent, 0);</div><div class='ctx'> 	atomic_set(&amp;iucv-&gt;msg_recv, 0);</div><div class='ctx'> 	iucv-&gt;path = NULL;</div><div class='ctx'> 	iucv-&gt;sk_txnotify = afiucv_hs_callback_txnotify;</div><div class='del'>-	memset(&amp;iucv-&gt;src_user_id , 0, 32);</div><div class='add'>+	memset(&amp;iucv-&gt;init, 0, sizeof(iucv-&gt;init));</div><div class='ctx'> 	if (pr_iucv)</div><div class='ctx'> 		iucv-&gt;transport = AF_IUCV_TRANS_IUCV;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -588,7 +480,6 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio,</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_destruct = iucv_sock_destruct;</div><div class='ctx'> 	sk-&gt;sk_sndtimeo = IUCV_CONN_TIMEOUT;</div><div class='del'>-	sk-&gt;sk_allocation = GFP_DMA;</div><div class='ctx'> </div><div class='ctx'> 	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='ctx'> </div><div class='hunk'>@@ -599,53 +490,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio,</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Create an IUCV socket */</div><div class='del'>-static int iucv_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='del'>-			    int kern)</div><div class='del'>-{</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	if (protocol &amp;&amp; protocol != PF_IUCV)</div><div class='del'>-		return -EPROTONOSUPPORT;</div><div class='del'>-</div><div class='del'>-	sock-&gt;state = SS_UNCONNECTED;</div><div class='del'>-</div><div class='del'>-	switch (sock-&gt;type) {</div><div class='del'>-	case SOCK_STREAM:</div><div class='del'>-		sock-&gt;ops = &amp;iucv_sock_ops;</div><div class='del'>-		break;</div><div class='del'>-	case SOCK_SEQPACKET:</div><div class='del'>-		/* currently, proto ops can handle both sk types */</div><div class='del'>-		sock-&gt;ops = &amp;iucv_sock_ops;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ESOCKTNOSUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk = iucv_sock_alloc(sock, protocol, GFP_KERNEL, kern);</div><div class='del'>-	if (!sk)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	iucv_sock_init(sk, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iucv_sock_link(struct iucv_sock_list *l, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	write_lock_bh(&amp;l-&gt;lock);</div><div class='del'>-	sk_add_node(sk, &amp;l-&gt;head);</div><div class='del'>-	write_unlock_bh(&amp;l-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	write_lock_bh(&amp;l-&gt;lock);</div><div class='del'>-	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;l-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iucv_accept_enqueue(struct sock *parent, struct sock *sk)</div><div class='add'>+static void iucv_accept_enqueue(struct sock *parent, struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iucv_sock *par = iucv_sk(parent);</div><div class='hunk'>@@ -658,7 +503,7 @@ void iucv_accept_enqueue(struct sock *parent, struct sock *sk)</div><div class='ctx'> 	sk_acceptq_added(parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iucv_accept_unlink(struct sock *sk)</div><div class='add'>+static void iucv_accept_unlink(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iucv_sock *par = iucv_sk(iucv_sk(sk)-&gt;parent);</div><div class='hunk'>@@ -671,7 +516,8 @@ void iucv_accept_unlink(struct sock *sk)</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock)</div><div class='add'>+static struct sock *iucv_accept_dequeue(struct sock *parent,</div><div class='add'>+					struct socket *newsock)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *isk, *n;</div><div class='ctx'> 	struct sock *sk;</div><div class='hunk'>@@ -706,24 +552,25 @@ static void __iucv_auto_name(struct iucv_sock *iucv)</div><div class='ctx'> {</div><div class='ctx'> 	char name[12];</div><div class='ctx'> </div><div class='del'>-	sprintf(name, "%08x", atomic_inc_return(&amp;iucv_sk_list.autobind_name));</div><div class='add'>+	scnprintf(name, sizeof(name),</div><div class='add'>+		  "%08x", atomic_inc_return(&amp;iucv_sk_list.autobind_name));</div><div class='ctx'> 	while (__iucv_get_sock_by_name(name)) {</div><div class='del'>-		sprintf(name, "%08x",</div><div class='del'>-			atomic_inc_return(&amp;iucv_sk_list.autobind_name));</div><div class='add'>+		scnprintf(name, sizeof(name), "%08x",</div><div class='add'>+			  atomic_inc_return(&amp;iucv_sk_list.autobind_name));</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(iucv-&gt;src_name, name, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Bind an unbound socket */</div><div class='del'>-static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+static int iucv_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='ctx'> 			  int addr_len)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);</div><div class='add'>+	char uid[sizeof(sa-&gt;siucv_user_id)];</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	char uid[9];</div><div class='ctx'> </div><div class='ctx'> 	/* Verify the input sockaddr */</div><div class='ctx'> 	if (addr_len &lt; sizeof(struct sockaddr_iucv) ||</div><div class='hunk'>@@ -758,7 +605,7 @@ static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 	for_each_netdev_rcu(&amp;init_net, dev) {</div><div class='ctx'> 		if (!memcmp(dev-&gt;perm_addr, uid, 8)) {</div><div class='ctx'> 			memcpy(iucv-&gt;src_user_id, sa-&gt;siucv_user_id, 8);</div><div class='del'>-			/* Check for unitialized siucv_name */</div><div class='add'>+			/* Check for uninitialized siucv_name */</div><div class='ctx'> 			if (strncmp(sa-&gt;siucv_name, "        ", 8) == 0)</div><div class='ctx'> 				__iucv_auto_name(iucv);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -782,6 +629,7 @@ vm_bind:</div><div class='ctx'> 		memcpy(iucv-&gt;src_user_id, iucv_userid, 8);</div><div class='ctx'> 		sk-&gt;sk_state = IUCV_BOUND;</div><div class='ctx'> 		iucv-&gt;transport = AF_IUCV_TRANS_IUCV;</div><div class='add'>+		sk-&gt;sk_allocation |= GFP_DMA;</div><div class='ctx'> 		if (!iucv-&gt;msglimit)</div><div class='ctx'> 			iucv-&gt;msglimit = IUCV_QUEUELEN_DEFAULT;</div><div class='ctx'> 		goto done_unlock;</div><div class='hunk'>@@ -806,6 +654,8 @@ static int iucv_sock_autobind(struct sock *sk)</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(iucv-&gt;src_user_id, iucv_userid, 8);</div><div class='add'>+	iucv-&gt;transport = AF_IUCV_TRANS_IUCV;</div><div class='add'>+	sk-&gt;sk_allocation |= GFP_DMA;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;iucv_sk_list.lock);</div><div class='ctx'> 	__iucv_auto_name(iucv);</div><div class='hunk'>@@ -817,9 +667,9 @@ static int iucv_sock_autobind(struct sock *sk)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int afiucv_path_connect(struct socket *sock, struct sockaddr *addr)</div><div class='add'>+static int afiucv_path_connect(struct socket *sock, struct sockaddr_unsized *addr)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> 	unsigned char user_data[16];</div><div class='hunk'>@@ -863,10 +713,10 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Connect an unconnected socket */</div><div class='del'>-static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,</div><div class='add'>+static int iucv_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,</div><div class='ctx'> 			     int alen, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -946,7 +796,7 @@ done:</div><div class='ctx'> </div><div class='ctx'> /* Accept a pending connection */</div><div class='ctx'> static int iucv_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='del'>-			    int flags, bool kern)</div><div class='add'>+			    struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk, *nsk;</div><div class='hunk'>@@ -960,7 +810,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; O_NONBLOCK);</div><div class='add'>+	timeo = sock_rcvtimeo(sk, arg-&gt;flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for an incoming connection */</div><div class='ctx'> 	add_wait_queue_exclusive(sk_sleep(sk), &amp;wait);</div><div class='hunk'>@@ -1002,7 +852,7 @@ done:</div><div class='ctx'> static int iucv_sock_getname(struct socket *sock, struct sockaddr *addr,</div><div class='ctx'> 			     int peer)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr;</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_iucv *, siucv, addr);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> </div><div class='hunk'>@@ -1089,7 +939,6 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> </div><div class='ctx'> 	/* initialize defaults */</div><div class='ctx'> 	cmsg_done   = 0;	/* check for duplicate headers */</div><div class='del'>-	txmsg.class = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* iterate over control messages */</div><div class='ctx'> 	for_each_cmsghdr(cmsg, msg) {</div><div class='hunk'>@@ -1131,8 +980,9 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	 * segmented records using the MSG_EOR flag), but</div><div class='ctx'> 	 * for SOCK_STREAM we might want to improve it in future */</div><div class='ctx'> 	if (iucv-&gt;transport == AF_IUCV_TRANS_HIPER) {</div><div class='del'>-		headroom = sizeof(struct af_iucv_trans_hdr) + ETH_HLEN;</div><div class='del'>-		linear = len;</div><div class='add'>+		headroom = sizeof(struct af_iucv_trans_hdr) +</div><div class='add'>+			   LL_RESERVED_SPACE(iucv-&gt;hs_dev);</div><div class='add'>+		linear = min(len, PAGE_SIZE - headroom);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (len &lt; PAGE_SIZE) {</div><div class='ctx'> 			linear = len;</div><div class='hunk'>@@ -1183,6 +1033,7 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else { /* Classic VM IUCV transport */</div><div class='ctx'> 		skb_queue_tail(&amp;iucv-&gt;send_skb_q, skb);</div><div class='add'>+		atomic_inc(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> </div><div class='ctx'> 		if (((iucv-&gt;path-&gt;flags &amp; IUCV_IPRMDATA) &amp; iucv-&gt;flags) &amp;&amp;</div><div class='ctx'> 		    skb-&gt;len &lt;= 7) {</div><div class='hunk'>@@ -1191,14 +1042,16 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			/* on success: there is no message_complete callback */</div><div class='ctx'> 			/* for an IPRMDATA msg; remove skb from send queue   */</div><div class='ctx'> 			if (err == 0) {</div><div class='add'>+				atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> 				skb_unlink(skb, &amp;iucv-&gt;send_skb_q);</div><div class='del'>-				kfree_skb(skb);</div><div class='add'>+				consume_skb(skb);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* this error should never happen since the	*/</div><div class='ctx'> 			/* IUCV_IPRMDATA path flag is set... sever path */</div><div class='ctx'> 			if (err == 0x15) {</div><div class='ctx'> 				pr_iucv-&gt;path_sever(iucv-&gt;path, NULL);</div><div class='add'>+				atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> 				skb_unlink(skb, &amp;iucv-&gt;send_skb_q);</div><div class='ctx'> 				err = -EPIPE;</div><div class='ctx'> 				goto fail;</div><div class='hunk'>@@ -1208,13 +1061,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='ctx'> 			/* skip iucv_array lying in the headroom */</div><div class='del'>-			iba[0].address = (u32)(addr_t)skb-&gt;data;</div><div class='add'>+			iba[0].address = virt_to_dma32(skb-&gt;data);</div><div class='ctx'> 			iba[0].length = (u32)skb_headlen(skb);</div><div class='ctx'> 			for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 				skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='del'>-				iba[i + 1].address =</div><div class='del'>-					(u32)(addr_t)skb_frag_address(frag);</div><div class='add'>+				iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));</div><div class='ctx'> 				iba[i + 1].length = (u32)skb_frag_size(frag);</div><div class='ctx'> 			}</div><div class='ctx'> 			err = pr_iucv-&gt;message_send(iucv-&gt;path, &amp;txmsg,</div><div class='hunk'>@@ -1237,6 +1089,8 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				err = -EPIPE;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='ctx'> 			skb_unlink(skb, &amp;iucv-&gt;send_skb_q);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1308,13 +1162,12 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			struct iucv_array *iba = (struct iucv_array *)skb-&gt;head;</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			iba[0].address = (u32)(addr_t)skb-&gt;data;</div><div class='add'>+			iba[0].address = virt_to_dma32(skb-&gt;data);</div><div class='ctx'> 			iba[0].length = (u32)skb_headlen(skb);</div><div class='ctx'> 			for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 				skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='del'>-				iba[i + 1].address =</div><div class='del'>-					(u32)(addr_t)skb_frag_address(frag);</div><div class='add'>+				iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));</div><div class='ctx'> 				iba[i + 1].length = (u32)skb_frag_size(frag);</div><div class='ctx'> 			}</div><div class='ctx'> 			rc = pr_iucv-&gt;message_receive(path, msg,</div><div class='hunk'>@@ -1334,7 +1187,7 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	IUCV_SKB_CB(skb)-&gt;offset = 0;</div><div class='ctx'> 	if (sk_filter(sk, skb)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);	/* skb rejected by filter */</div><div class='add'>+		sk_drops_inc(sk);	/* skb rejected by filter */</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1367,7 +1220,6 @@ static void iucv_process_message_q(struct sock *sk)</div><div class='ctx'> static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			     size_t len, int flags)</div><div class='ctx'> {</div><div class='del'>-	int noblock = flags &amp; MSG_DONTWAIT;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> 	unsigned int copied, rlen;</div><div class='hunk'>@@ -1385,8 +1237,10 @@ static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* receive/dequeue next skb:</div><div class='del'>-	 * the function understands MSG_PEEK and, thus, does not dequeue skb */</div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	 * the function understands MSG_PEEK and, thus, does not dequeue skb</div><div class='add'>+	 * only refcount is increased.</div><div class='add'>+	 */</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1401,9 +1255,8 @@ static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> </div><div class='ctx'> 	cskb = skb;</div><div class='ctx'> 	if (skb_copy_datagram_msg(cskb, offset, msg, copied)) {</div><div class='del'>-		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			skb_queue_head(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* SOCK_SEQPACKET: set MSG_TRUNC if recv buf size is too small */</div><div class='hunk'>@@ -1420,11 +1273,8 @@ static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	err = put_cmsg(msg, SOL_IUCV, SCM_IUCV_TRGCLS,</div><div class='ctx'> 		       sizeof(IUCV_SKB_CB(skb)-&gt;class),</div><div class='ctx'> 		       (void *)&amp;IUCV_SKB_CB(skb)-&gt;class);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (!(flags &amp; MSG_PEEK))</div><div class='del'>-			skb_queue_head(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark read part of skb as used */</div><div class='ctx'> 	if (!(flags &amp; MSG_PEEK)) {</div><div class='hunk'>@@ -1438,7 +1288,7 @@ static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		consume_skb(skb);</div><div class='ctx'> 		if (iucv-&gt;transport == AF_IUCV_TRANS_HIPER) {</div><div class='ctx'> 			atomic_inc(&amp;iucv-&gt;msg_recv);</div><div class='ctx'> 			if (atomic_read(&amp;iucv-&gt;msg_recv) &gt; iucv-&gt;msglimit) {</div><div class='hunk'>@@ -1480,8 +1330,18 @@ done:</div><div class='ctx'> 	/* SOCK_SEQPACKET: return real length if MSG_TRUNC is set */</div><div class='ctx'> 	if (sk-&gt;sk_type == SOCK_SEQPACKET &amp;&amp; (flags &amp; MSG_TRUNC))</div><div class='ctx'> 		copied = rlen;</div><div class='add'>+	if (flags &amp; MSG_PEEK)</div><div class='add'>+		skb_unref(skb);</div><div class='ctx'> </div><div class='ctx'> 	return copied;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	if (!(flags &amp; MSG_PEEK))</div><div class='add'>+		skb_queue_head(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+	else</div><div class='add'>+		skb_unref(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline __poll_t iucv_accept_poll(struct sock *parent)</div><div class='hunk'>@@ -1499,13 +1359,13 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,</div><div class='del'>-			    poll_table *wait)</div><div class='add'>+static __poll_t iucv_sock_poll(struct file *file, struct socket *sock,</div><div class='add'>+			       poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	__poll_t mask = 0;</div><div class='ctx'> </div><div class='del'>-	sock_poll_wait(file, wait);</div><div class='add'>+	sock_poll_wait(file, sock, wait);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == IUCV_LISTEN)</div><div class='ctx'> 		return iucv_accept_poll(sk);</div><div class='hunk'>@@ -1562,7 +1422,8 @@ static int iucv_sock_shutdown(struct socket *sock, int how)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) {</div><div class='add'>+	if ((how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_state == IUCV_CONNECTED) {</div><div class='ctx'> 		if (iucv-&gt;transport == AF_IUCV_TRANS_IUCV) {</div><div class='ctx'> 			txmsg.class = 0;</div><div class='ctx'> 			txmsg.tag = 0;</div><div class='hunk'>@@ -1622,7 +1483,7 @@ static int iucv_sock_release(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> /* getsockopt and setsockopt */</div><div class='ctx'> static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-				char __user *optval, unsigned int optlen)</div><div class='add'>+				sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='hunk'>@@ -1635,7 +1496,7 @@ static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *) optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='hunk'>@@ -1652,7 +1513,7 @@ static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 		switch (sk-&gt;sk_state) {</div><div class='ctx'> 		case IUCV_OPEN:</div><div class='ctx'> 		case IUCV_BOUND:</div><div class='del'>-			if (val &lt; 1 || val &gt; (u16)(~0))</div><div class='add'>+			if (val &lt; 1 || val &gt; U16_MAX)</div><div class='ctx'> 				rc = -EINVAL;</div><div class='ctx'> 			else</div><div class='ctx'> 				iucv-&gt;msglimit = val;</div><div class='hunk'>@@ -1772,7 +1633,7 @@ static int iucv_callback_connreq(struct iucv_path *path,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create the new socket */</div><div class='del'>-	nsk = iucv_sock_alloc(NULL, sk-&gt;sk_type, GFP_ATOMIC, 0);</div><div class='add'>+	nsk = iucv_sock_alloc(NULL, sk-&gt;sk_protocol, GFP_ATOMIC, 0);</div><div class='ctx'> 	if (!nsk) {</div><div class='ctx'> 		err = pr_iucv-&gt;path_sever(path, user_data);</div><div class='ctx'> 		iucv_path_free(path);</div><div class='hunk'>@@ -1781,6 +1642,8 @@ static int iucv_callback_connreq(struct iucv_path *path,</div><div class='ctx'> </div><div class='ctx'> 	niucv = iucv_sk(nsk);</div><div class='ctx'> 	iucv_sock_init(nsk, sk);</div><div class='add'>+	niucv-&gt;transport = AF_IUCV_TRANS_IUCV;</div><div class='add'>+	nsk-&gt;sk_allocation |= GFP_DMA;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the new iucv_sock */</div><div class='ctx'> 	memcpy(niucv-&gt;dst_name, ipuser + 8, 8);</div><div class='hunk'>@@ -1873,35 +1736,38 @@ static void iucv_callback_txdone(struct iucv_path *path,</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = path-&gt;private;</div><div class='ctx'> 	struct sk_buff *this = NULL;</div><div class='del'>-	struct sk_buff_head *list = &amp;iucv_sk(sk)-&gt;send_skb_q;</div><div class='del'>-	struct sk_buff *list_skb = list-&gt;next;</div><div class='add'>+	struct sk_buff_head *list;</div><div class='add'>+	struct sk_buff *list_skb;</div><div class='add'>+	struct iucv_sock *iucv;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	iucv = iucv_sk(sk);</div><div class='add'>+	list = &amp;iucv-&gt;send_skb_q;</div><div class='add'>+</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='del'>-	if (!skb_queue_empty(list)) {</div><div class='del'>-		spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		while (list_skb != (struct sk_buff *)list) {</div><div class='del'>-			if (msg-&gt;tag == IUCV_SKB_CB(list_skb)-&gt;tag) {</div><div class='del'>-				this = list_skb;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			list_skb = list_skb-&gt;next;</div><div class='add'>+	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='add'>+	skb_queue_walk(list, list_skb) {</div><div class='add'>+		if (msg-&gt;tag == IUCV_SKB_CB(list_skb)-&gt;tag) {</div><div class='add'>+			this = list_skb;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (this)</div><div class='del'>-			__skb_unlink(this, list);</div><div class='add'>+	}</div><div class='add'>+	if (this) {</div><div class='add'>+		atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='add'>+		__skb_unlink(this, list);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (this) {</div><div class='del'>-			kfree_skb(this);</div><div class='del'>-			/* wake up any process waiting for sending */</div><div class='del'>-			iucv_sock_wake_msglim(sk);</div><div class='del'>-		}</div><div class='add'>+	if (this) {</div><div class='add'>+		consume_skb(this);</div><div class='add'>+		/* wake up any process waiting for sending */</div><div class='add'>+		iucv_sock_wake_msglim(sk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == IUCV_CLOSING) {</div><div class='del'>-		if (skb_queue_empty(&amp;iucv_sk(sk)-&gt;send_skb_q)) {</div><div class='add'>+		if (atomic_read(&amp;iucv-&gt;skbs_in_xmit) == 0) {</div><div class='ctx'> 			sk-&gt;sk_state = IUCV_CLOSED;</div><div class='ctx'> 			sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1940,11 +1806,19 @@ static void iucv_callback_shutdown(struct iucv_path *path, u8 ipuser[16])</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct iucv_handler af_iucv_handler = {</div><div class='add'>+	.path_pending		= iucv_callback_connreq,</div><div class='add'>+	.path_complete		= iucv_callback_connack,</div><div class='add'>+	.path_severed		= iucv_callback_connrej,</div><div class='add'>+	.message_pending	= iucv_callback_rx,</div><div class='add'>+	.message_complete	= iucv_callback_txdone,</div><div class='add'>+	.path_quiesced		= iucv_callback_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /***************** HiperSockets transport callbacks ********************/</div><div class='ctx'> static void afiucv_swap_src_dest(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct af_iucv_trans_hdr *trans_hdr =</div><div class='del'>-				(struct af_iucv_trans_hdr *)skb-&gt;data;</div><div class='add'>+	struct af_iucv_trans_hdr *trans_hdr = iucv_trans_hdr(skb);</div><div class='ctx'> 	char tmpID[8];</div><div class='ctx'> 	char tmpName[8];</div><div class='ctx'> </div><div class='hunk'>@@ -1962,18 +1836,17 @@ static void afiucv_swap_src_dest(struct sk_buff *skb)</div><div class='ctx'> 	memset(skb-&gt;data, 0, ETH_HLEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_syn - react on received SYN</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct af_iucv_trans_hdr *trans_hdr = iucv_trans_hdr(skb);</div><div class='ctx'> 	struct sock *nsk;</div><div class='ctx'> 	struct iucv_sock *iucv, *niucv;</div><div class='del'>-	struct af_iucv_trans_hdr *trans_hdr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	iucv = iucv_sk(sk);</div><div class='del'>-	trans_hdr = (struct af_iucv_trans_hdr *)skb-&gt;data;</div><div class='ctx'> 	if (!iucv) {</div><div class='ctx'> 		/* no sock - connection refused */</div><div class='ctx'> 		afiucv_swap_src_dest(skb);</div><div class='hunk'>@@ -1982,7 +1855,7 @@ static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nsk = iucv_sock_alloc(NULL, sk-&gt;sk_type, GFP_ATOMIC, 0);</div><div class='add'>+	nsk = iucv_sock_alloc(NULL, sk-&gt;sk_protocol, GFP_ATOMIC, 0);</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if ((sk-&gt;sk_state != IUCV_LISTEN) ||</div><div class='ctx'> 	    sk_acceptq_is_full(sk) ||</div><div class='hunk'>@@ -2028,78 +1901,76 @@ out:</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_synack() - react on received SYN-ACK</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_synack(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='del'>-	struct af_iucv_trans_hdr *trans_hdr =</div><div class='del'>-					(struct af_iucv_trans_hdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (!iucv)</div><div class='del'>-		goto out;</div><div class='del'>-	if (sk-&gt;sk_state != IUCV_BOUND)</div><div class='del'>-		goto out;</div><div class='add'>+	if (!iucv || sk-&gt;sk_state != IUCV_BOUND) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NET_RX_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='del'>-	iucv-&gt;msglimit_peer = trans_hdr-&gt;window;</div><div class='add'>+	iucv-&gt;msglimit_peer = iucv_trans_hdr(skb)-&gt;window;</div><div class='ctx'> 	sk-&gt;sk_state = IUCV_CONNECTED;</div><div class='ctx'> 	sk-&gt;sk_state_change(sk);</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	consume_skb(skb);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_synfin() - react on received SYN_FIN</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_synfin(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (!iucv)</div><div class='del'>-		goto out;</div><div class='del'>-	if (sk-&gt;sk_state != IUCV_BOUND)</div><div class='del'>-		goto out;</div><div class='add'>+	if (!iucv || sk-&gt;sk_state != IUCV_BOUND) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NET_RX_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	sk-&gt;sk_state = IUCV_DISCONN;</div><div class='ctx'> 	sk-&gt;sk_state_change(sk);</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	consume_skb(skb);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_fin() - react on received FIN</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_fin(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* other end of connection closed */</div><div class='del'>-	if (!iucv)</div><div class='del'>-		goto out;</div><div class='add'>+	if (!iucv) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NET_RX_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bh_lock_sock(sk);</div><div class='ctx'> 	if (sk-&gt;sk_state == IUCV_CONNECTED) {</div><div class='ctx'> 		sk-&gt;sk_state = IUCV_DISCONN;</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> 	}</div><div class='ctx'> 	bh_unlock_sock(sk);</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	consume_skb(skb);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_win() - react on received WIN</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_win(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='del'>-	struct af_iucv_trans_hdr *trans_hdr =</div><div class='del'>-					(struct af_iucv_trans_hdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (!iucv)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='hunk'>@@ -2107,14 +1978,14 @@ static int afiucv_hs_callback_win(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	if (sk-&gt;sk_state != IUCV_CONNECTED)</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	atomic_sub(trans_hdr-&gt;window, &amp;iucv-&gt;msg_sent);</div><div class='add'>+	atomic_sub(iucv_trans_hdr(skb)-&gt;window, &amp;iucv-&gt;msg_sent);</div><div class='ctx'> 	iucv_sock_wake_msglim(sk);</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_callback_rx() - react on received data</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_callback_rx(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='hunk'>@@ -2140,7 +2011,7 @@ static int afiucv_hs_callback_rx(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	skb_reset_network_header(skb);</div><div class='ctx'> 	IUCV_SKB_CB(skb)-&gt;offset = 0;</div><div class='ctx'> 	if (sk_filter(sk, skb)) {</div><div class='del'>-		atomic_inc(&amp;sk-&gt;sk_drops);	/* skb rejected by filter */</div><div class='add'>+		sk_drops_inc(sk);	/* skb rejected by filter */</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2156,11 +2027,11 @@ static int afiucv_hs_callback_rx(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	return NET_RX_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * afiucv_hs_rcv() - base function for arriving data through HiperSockets</div><div class='ctx'>  *                   transport</div><div class='ctx'>  *                   called from netif RX softirq</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	struct packet_type *pt, struct net_device *orig_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2170,22 +2041,12 @@ static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	int err = NET_RX_SUCCESS;</div><div class='ctx'> 	char nullstring[8];</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; (ETH_HLEN + sizeof(struct af_iucv_trans_hdr))) {</div><div class='del'>-		WARN_ONCE(1, "AF_IUCV too short skb, len=%d, min=%d",</div><div class='del'>-			  (int)skb-&gt;len,</div><div class='del'>-			  (int)(ETH_HLEN + sizeof(struct af_iucv_trans_hdr)));</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*trans_hdr))) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return NET_RX_SUCCESS;</div><div class='ctx'> 	}</div><div class='del'>-	if (skb_headlen(skb) &lt; (ETH_HLEN + sizeof(struct af_iucv_trans_hdr)))</div><div class='del'>-		if (skb_linearize(skb)) {</div><div class='del'>-			WARN_ONCE(1, "AF_IUCV skb_linearize failed, len=%d",</div><div class='del'>-				  (int)skb-&gt;len);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return NET_RX_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-	skb_pull(skb, ETH_HLEN);</div><div class='del'>-	trans_hdr = (struct af_iucv_trans_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	trans_hdr = iucv_trans_hdr(skb);</div><div class='ctx'> 	EBCASC(trans_hdr-&gt;destAppName, sizeof(trans_hdr-&gt;destAppName));</div><div class='ctx'> 	EBCASC(trans_hdr-&gt;destUserID, sizeof(trans_hdr-&gt;destUserID));</div><div class='ctx'> 	EBCASC(trans_hdr-&gt;srcAppName, sizeof(trans_hdr-&gt;srcAppName));</div><div class='hunk'>@@ -2253,13 +2114,13 @@ static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	case (AF_IUCV_FLAG_WIN):</div><div class='ctx'> 		err = afiucv_hs_callback_win(sk, skb);</div><div class='ctx'> 		if (skb-&gt;len == sizeof(struct af_iucv_trans_hdr)) {</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+			consume_skb(skb);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through and receive non-zero length data */</div><div class='add'>+		fallthrough;	/* and receive non-zero length data */</div><div class='ctx'> 	case (AF_IUCV_FLAG_SHT):</div><div class='ctx'> 		/* shutdown request */</div><div class='del'>-		/* fall through and receive zero length data */</div><div class='add'>+		fallthrough;	/* and receive zero length data */</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* plain data frame */</div><div class='ctx'> 		IUCV_SKB_CB(skb)-&gt;class = trans_hdr-&gt;iucv_hdr.class;</div><div class='hunk'>@@ -2272,84 +2133,44 @@ static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * afiucv_hs_callback_txnotify() - handle send notifcations from HiperSockets</div><div class='add'>+/*</div><div class='add'>+ * afiucv_hs_callback_txnotify() - handle send notifications from HiperSockets</div><div class='ctx'>  *                                 transport</div><div class='del'>- **/</div><div class='del'>-static void afiucv_hs_callback_txnotify(struct sk_buff *skb,</div><div class='del'>-					enum iucv_tx_notify n)</div><div class='add'>+ */</div><div class='add'>+static void afiucv_hs_callback_txnotify(struct sock *sk, enum iucv_tx_notify n)</div><div class='ctx'> {</div><div class='del'>-	struct sock *isk = skb-&gt;sk;</div><div class='del'>-	struct sock *sk = NULL;</div><div class='del'>-	struct iucv_sock *iucv = NULL;</div><div class='del'>-	struct sk_buff_head *list;</div><div class='del'>-	struct sk_buff *list_skb;</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	read_lock_irqsave(&amp;iucv_sk_list.lock, flags);</div><div class='del'>-	sk_for_each(sk, &amp;iucv_sk_list.head)</div><div class='del'>-		if (sk == isk) {</div><div class='del'>-			iucv = iucv_sk(sk);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	read_unlock_irqrestore(&amp;iucv_sk_list.lock, flags);</div><div class='add'>+	struct iucv_sock *iucv = iucv_sk(sk);</div><div class='ctx'> </div><div class='del'>-	if (!iucv || sock_flag(sk, SOCK_ZAPPED))</div><div class='add'>+	if (sock_flag(sk, SOCK_ZAPPED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	list = &amp;iucv-&gt;send_skb_q;</div><div class='del'>-	spin_lock_irqsave(&amp;list-&gt;lock, flags);</div><div class='del'>-	if (skb_queue_empty(list))</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	list_skb = list-&gt;next;</div><div class='del'>-	nskb = list_skb-&gt;next;</div><div class='del'>-	while (list_skb != (struct sk_buff *)list) {</div><div class='del'>-		if (skb_shinfo(list_skb) == skb_shinfo(skb)) {</div><div class='del'>-			switch (n) {</div><div class='del'>-			case TX_NOTIFY_OK:</div><div class='del'>-				__skb_unlink(list_skb, list);</div><div class='del'>-				kfree_skb(list_skb);</div><div class='del'>-				iucv_sock_wake_msglim(sk);</div><div class='del'>-				break;</div><div class='del'>-			case TX_NOTIFY_PENDING:</div><div class='del'>-				atomic_inc(&amp;iucv-&gt;pendings);</div><div class='del'>-				break;</div><div class='del'>-			case TX_NOTIFY_DELAYED_OK:</div><div class='del'>-				__skb_unlink(list_skb, list);</div><div class='del'>-				atomic_dec(&amp;iucv-&gt;pendings);</div><div class='del'>-				if (atomic_read(&amp;iucv-&gt;pendings) &lt;= 0)</div><div class='del'>-					iucv_sock_wake_msglim(sk);</div><div class='del'>-				kfree_skb(list_skb);</div><div class='del'>-				break;</div><div class='del'>-			case TX_NOTIFY_UNREACHABLE:</div><div class='del'>-			case TX_NOTIFY_DELAYED_UNREACHABLE:</div><div class='del'>-			case TX_NOTIFY_TPQFULL: /* not yet used */</div><div class='del'>-			case TX_NOTIFY_GENERALERROR:</div><div class='del'>-			case TX_NOTIFY_DELAYED_GENERALERROR:</div><div class='del'>-				__skb_unlink(list_skb, list);</div><div class='del'>-				kfree_skb(list_skb);</div><div class='del'>-				if (sk-&gt;sk_state == IUCV_CONNECTED) {</div><div class='del'>-					sk-&gt;sk_state = IUCV_DISCONN;</div><div class='del'>-					sk-&gt;sk_state_change(sk);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	switch (n) {</div><div class='add'>+	case TX_NOTIFY_OK:</div><div class='add'>+		atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='add'>+		iucv_sock_wake_msglim(sk);</div><div class='add'>+		break;</div><div class='add'>+	case TX_NOTIFY_PENDING:</div><div class='add'>+		atomic_inc(&amp;iucv-&gt;pendings);</div><div class='add'>+		break;</div><div class='add'>+	case TX_NOTIFY_DELAYED_OK:</div><div class='add'>+		atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='add'>+		if (atomic_dec_return(&amp;iucv-&gt;pendings) &lt;= 0)</div><div class='add'>+			iucv_sock_wake_msglim(sk);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		atomic_dec(&amp;iucv-&gt;skbs_in_xmit);</div><div class='add'>+		if (sk-&gt;sk_state == IUCV_CONNECTED) {</div><div class='add'>+			sk-&gt;sk_state = IUCV_DISCONN;</div><div class='add'>+			sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		}</div><div class='del'>-		list_skb = nskb;</div><div class='del'>-		nskb = nskb-&gt;next;</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;list-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_state == IUCV_CLOSING) {</div><div class='del'>-		if (skb_queue_empty(&amp;iucv_sk(sk)-&gt;send_skb_q)) {</div><div class='add'>+		if (atomic_read(&amp;iucv-&gt;skbs_in_xmit) == 0) {</div><div class='ctx'> 			sk-&gt;sk_state = IUCV_CLOSED;</div><div class='ctx'> 			sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2408,6 +2229,35 @@ static const struct proto_ops iucv_sock_ops = {</div><div class='ctx'> 	.getsockopt	= iucv_sock_getsockopt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int iucv_sock_create(struct net *net, struct socket *sock, int protocol,</div><div class='add'>+			    int kern)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (protocol &amp;&amp; protocol != PF_IUCV)</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+</div><div class='add'>+	sock-&gt;state = SS_UNCONNECTED;</div><div class='add'>+</div><div class='add'>+	switch (sock-&gt;type) {</div><div class='add'>+	case SOCK_STREAM:</div><div class='add'>+	case SOCK_SEQPACKET:</div><div class='add'>+		/* currently, proto ops can handle both sk types */</div><div class='add'>+		sock-&gt;ops = &amp;iucv_sock_ops;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ESOCKTNOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk = iucv_sock_alloc(sock, protocol, GFP_KERNEL, kern);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iucv_sock_init(sk, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_proto_family iucv_sock_family_ops = {</div><div class='ctx'> 	.family	= AF_IUCV,</div><div class='ctx'> 	.owner	= THIS_MODULE,</div><div class='hunk'>@@ -2419,48 +2269,11 @@ static struct packet_type iucv_packet_type = {</div><div class='ctx'> 	.func = afiucv_hs_rcv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int afiucv_iucv_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pr_iucv-&gt;iucv_register(&amp;af_iucv_handler, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	/* establish dummy device */</div><div class='del'>-	af_iucv_driver.bus = pr_iucv-&gt;bus;</div><div class='del'>-	err = driver_register(&amp;af_iucv_driver);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_iucv;</div><div class='del'>-	af_iucv_dev = kzalloc(sizeof(struct device), GFP_KERNEL);</div><div class='del'>-	if (!af_iucv_dev) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out_driver;</div><div class='del'>-	}</div><div class='del'>-	dev_set_name(af_iucv_dev, "af_iucv");</div><div class='del'>-	af_iucv_dev-&gt;bus = pr_iucv-&gt;bus;</div><div class='del'>-	af_iucv_dev-&gt;parent = pr_iucv-&gt;root;</div><div class='del'>-	af_iucv_dev-&gt;release = (void (*)(struct device *))kfree;</div><div class='del'>-	af_iucv_dev-&gt;driver = &amp;af_iucv_driver;</div><div class='del'>-	err = device_register(af_iucv_dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_iucv_dev;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_iucv_dev:</div><div class='del'>-	put_device(af_iucv_dev);</div><div class='del'>-out_driver:</div><div class='del'>-	driver_unregister(&amp;af_iucv_driver);</div><div class='del'>-out_iucv:</div><div class='del'>-	pr_iucv-&gt;iucv_unregister(&amp;af_iucv_handler, 0);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init afiucv_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (MACHINE_IS_VM) {</div><div class='add'>+	if (machine_is_vm() &amp;&amp; IS_ENABLED(CONFIG_IUCV)) {</div><div class='ctx'> 		cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &amp;err);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			WARN_ON(err);</div><div class='hunk'>@@ -2468,11 +2281,7 @@ static int __init afiucv_init(void)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_iucv = try_then_request_module(symbol_get(iucv_if), "iucv");</div><div class='del'>-		if (!pr_iucv) {</div><div class='del'>-			printk(KERN_WARNING "iucv_if lookup failed\n");</div><div class='del'>-			memset(&amp;iucv_userid, 0, sizeof(iucv_userid));</div><div class='del'>-		}</div><div class='add'>+		pr_iucv = &amp;iucv_if;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memset(&amp;iucv_userid, 0, sizeof(iucv_userid));</div><div class='ctx'> 		pr_iucv = NULL;</div><div class='hunk'>@@ -2486,33 +2295,35 @@ static int __init afiucv_init(void)</div><div class='ctx'> 		goto out_proto;</div><div class='ctx'> </div><div class='ctx'> 	if (pr_iucv) {</div><div class='del'>-		err = afiucv_iucv_init();</div><div class='add'>+		err = pr_iucv-&gt;iucv_register(&amp;af_iucv_handler, 0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_sock;</div><div class='del'>-	} else</div><div class='del'>-		register_netdevice_notifier(&amp;afiucv_netdev_notifier);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;afiucv_netdev_notifier);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_notifier;</div><div class='add'>+</div><div class='ctx'> 	dev_add_pack(&amp;iucv_packet_type);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_notifier:</div><div class='add'>+	if (pr_iucv)</div><div class='add'>+		pr_iucv-&gt;iucv_unregister(&amp;af_iucv_handler, 0);</div><div class='ctx'> out_sock:</div><div class='ctx'> 	sock_unregister(PF_IUCV);</div><div class='ctx'> out_proto:</div><div class='ctx'> 	proto_unregister(&amp;iucv_proto);</div><div class='ctx'> out:</div><div class='del'>-	if (pr_iucv)</div><div class='del'>-		symbol_put(iucv_if);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit afiucv_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (pr_iucv) {</div><div class='del'>-		device_unregister(af_iucv_dev);</div><div class='del'>-		driver_unregister(&amp;af_iucv_driver);</div><div class='add'>+	if (pr_iucv)</div><div class='ctx'> 		pr_iucv-&gt;iucv_unregister(&amp;af_iucv_handler, 0);</div><div class='del'>-		symbol_put(iucv_if);</div><div class='del'>-	} else</div><div class='del'>-		unregister_netdevice_notifier(&amp;afiucv_netdev_notifier);</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_notifier(&amp;afiucv_netdev_notifier);</div><div class='ctx'> 	dev_remove_pack(&amp;iucv_packet_type);</div><div class='ctx'> 	sock_unregister(PF_IUCV);</div><div class='ctx'> 	proto_unregister(&amp;iucv_proto);</div><div class='head'>diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c<br/>index eb502c6290c2..da2af413c89d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/iucv/iucv.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/iucv/iucv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/iucv/iucv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/iucv/iucv.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * IUCV base infrastructure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,26 +18,12 @@</div><div class='ctx'>  * Documentation used:</div><div class='ctx'>  *    The original source</div><div class='ctx'>  *    CP Programming Service, IBM document # SC24-5760</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define KMSG_COMPONENT "iucv"</div><div class='del'>-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='add'>+#define pr_fmt(fmt) "iucv: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -52,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;net/iucv/iucv.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;asm/machine.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -75,42 +63,55 @@</div><div class='ctx'> #define IUCV_IPNORPY	0x10</div><div class='ctx'> #define IUCV_IPALL	0x80</div><div class='ctx'> </div><div class='del'>-static int iucv_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+static int iucv_bus_match(struct device *dev, const struct device_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum iucv_pm_states {</div><div class='del'>-	IUCV_PM_INITIAL = 0,</div><div class='del'>-	IUCV_PM_FREEZING = 1,</div><div class='del'>-	IUCV_PM_THAWING = 2,</div><div class='del'>-	IUCV_PM_RESTORING = 3,</div><div class='del'>-};</div><div class='del'>-static enum iucv_pm_states iucv_pm_state;</div><div class='del'>-</div><div class='del'>-static int iucv_pm_prepare(struct device *);</div><div class='del'>-static void iucv_pm_complete(struct device *);</div><div class='del'>-static int iucv_pm_freeze(struct device *);</div><div class='del'>-static int iucv_pm_thaw(struct device *);</div><div class='del'>-static int iucv_pm_restore(struct device *);</div><div class='del'>-</div><div class='del'>-static const struct dev_pm_ops iucv_pm_ops = {</div><div class='del'>-	.prepare = iucv_pm_prepare,</div><div class='del'>-	.complete = iucv_pm_complete,</div><div class='del'>-	.freeze = iucv_pm_freeze,</div><div class='del'>-	.thaw = iucv_pm_thaw,</div><div class='del'>-	.restore = iucv_pm_restore,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bus_type iucv_bus = {</div><div class='add'>+const struct bus_type iucv_bus = {</div><div class='ctx'> 	.name = "iucv",</div><div class='ctx'> 	.match = iucv_bus_match,</div><div class='del'>-	.pm = &amp;iucv_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(iucv_bus);</div><div class='ctx'> </div><div class='del'>-struct device *iucv_root;</div><div class='del'>-EXPORT_SYMBOL(iucv_root);</div><div class='add'>+static struct device *iucv_root;</div><div class='add'>+</div><div class='add'>+static void iucv_release_device(struct device *device)</div><div class='add'>+{</div><div class='add'>+	kfree(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct device *iucv_alloc_device(const struct attribute_group **attrs,</div><div class='add'>+				 struct device_driver *driver,</div><div class='add'>+				 void *priv, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	va_list vargs;</div><div class='add'>+	char buf[20];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out_error;</div><div class='add'>+	va_start(vargs, fmt);</div><div class='add'>+	vscnprintf(buf, sizeof(buf), fmt, vargs);</div><div class='add'>+	rc = dev_set_name(dev, "%s", buf);</div><div class='add'>+	va_end(vargs);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_error;</div><div class='add'>+	dev-&gt;bus = &amp;iucv_bus;</div><div class='add'>+	dev-&gt;parent = iucv_root;</div><div class='add'>+	dev-&gt;driver = driver;</div><div class='add'>+	dev-&gt;groups = attrs;</div><div class='add'>+	dev-&gt;release = iucv_release_device;</div><div class='add'>+	dev_set_drvdata(dev, priv);</div><div class='add'>+	return dev;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iucv_alloc_device);</div><div class='ctx'> </div><div class='ctx'> static int iucv_available;</div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +120,7 @@ struct iucv_irq_data {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  ipflags1;</div><div class='ctx'> 	u8  iptype;</div><div class='del'>-	u32 res2[8];</div><div class='add'>+	u32 res2[9];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iucv_irq_list {</div><div class='hunk'>@@ -141,7 +142,7 @@ static LIST_HEAD(iucv_task_queue);</div><div class='ctx'>  * The tasklet for fast delivery of iucv interrupts.</div><div class='ctx'>  */</div><div class='ctx'> static void iucv_tasklet_fn(unsigned long);</div><div class='del'>-static DECLARE_TASKLET(iucv_tasklet, iucv_tasklet_fn,0);</div><div class='add'>+static DECLARE_TASKLET_OLD(iucv_tasklet, iucv_tasklet_fn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Queue of interrupt buffers for delivery via a work queue</div><div class='hunk'>@@ -192,7 +193,7 @@ static char iucv_error_pathid[16] = "INVALID PATHID";</div><div class='ctx'> static LIST_HEAD(iucv_handler_list);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * iucv_path_table: an array of iucv_path structures.</div><div class='add'>+ * iucv_path_table: array of pointers to iucv_path structures.</div><div class='ctx'>  */</div><div class='ctx'> static struct iucv_path **iucv_path_table;</div><div class='ctx'> static unsigned long iucv_max_pathid;</div><div class='hunk'>@@ -246,7 +247,7 @@ struct iucv_cmd_dpl {</div><div class='ctx'> 	u8  iprmmsg[8];</div><div class='ctx'> 	u32 ipsrccls;</div><div class='ctx'> 	u32 ipmsgtag;</div><div class='del'>-	u32 ipbfadr2;</div><div class='add'>+	dma32_t ipbfadr2;</div><div class='ctx'> 	u32 ipbfln2f;</div><div class='ctx'> 	u32 res;</div><div class='ctx'> } __attribute__ ((packed,aligned(8)));</div><div class='hunk'>@@ -262,11 +263,11 @@ struct iucv_cmd_db {</div><div class='ctx'> 	u8  iprcode;</div><div class='ctx'> 	u32 ipmsgid;</div><div class='ctx'> 	u32 iptrgcls;</div><div class='del'>-	u32 ipbfadr1;</div><div class='add'>+	dma32_t ipbfadr1;</div><div class='ctx'> 	u32 ipbfln1f;</div><div class='ctx'> 	u32 ipsrccls;</div><div class='ctx'> 	u32 ipmsgtag;</div><div class='del'>-	u32 ipbfadr2;</div><div class='add'>+	dma32_t ipbfadr2;</div><div class='ctx'> 	u32 ipbfln2f;</div><div class='ctx'> 	u32 res;</div><div class='ctx'> } __attribute__ ((packed,aligned(8)));</div><div class='hunk'>@@ -312,8 +313,8 @@ static union iucv_param *iucv_param[NR_CPUS];</div><div class='ctx'> static union iucv_param *iucv_param_irq[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iucv_call_b2f0</div><div class='del'>- * @code: identifier of IUCV call to CP.</div><div class='add'>+ * __iucv_call_b2f0</div><div class='add'>+ * @command: identifier of IUCV call to CP.</div><div class='ctx'>  * @parm: pointer to a struct iucv_parm block</div><div class='ctx'>  *</div><div class='ctx'>  * Calls CP to execute IUCV commands.</div><div class='hunk'>@@ -322,19 +323,20 @@ static union iucv_param *iucv_param_irq[NR_CPUS];</div><div class='ctx'>  */</div><div class='ctx'> static inline int __iucv_call_b2f0(int command, union iucv_param *parm)</div><div class='ctx'> {</div><div class='del'>-	register unsigned long reg0 asm ("0");</div><div class='del'>-	register unsigned long reg1 asm ("1");</div><div class='del'>-	int ccode;</div><div class='add'>+	unsigned long reg1 = virt_to_phys(parm);</div><div class='add'>+	int cc;</div><div class='ctx'> </div><div class='del'>-	reg0 = command;</div><div class='del'>-	reg1 = (unsigned long)parm;</div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"	.long 0xb2f01000\n"</div><div class='del'>-		"	ipm	%0\n"</div><div class='del'>-		"	srl	%0,28\n"</div><div class='del'>-		: "=d" (ccode), "=m" (*parm), "+d" (reg0), "+a" (reg1)</div><div class='del'>-		:  "m" (*parm) : "cc");</div><div class='del'>-	return ccode;</div><div class='add'>+		"	lgr	0,%[reg0]\n"</div><div class='add'>+		"	lgr	1,%[reg1]\n"</div><div class='add'>+		"	.long	0xb2f01000\n"</div><div class='add'>+		"	ipm	%[cc]\n"</div><div class='add'>+		"	srl	%[cc],28\n"</div><div class='add'>+		: [cc] "=&amp;d" (cc), "+m" (*parm)</div><div class='add'>+		: [reg0] "d" ((unsigned long)command),</div><div class='add'>+		  [reg1] "d" (reg1)</div><div class='add'>+		: "cc", "0", "1");</div><div class='add'>+	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iucv_call_b2f0(int command, union iucv_param *parm)</div><div class='hunk'>@@ -345,7 +347,7 @@ static inline int iucv_call_b2f0(int command, union iucv_param *parm)</div><div class='ctx'> 	return ccode == 1 ? parm-&gt;ctrl.iprcode : ccode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_query_maxconn</div><div class='ctx'>  *</div><div class='ctx'>  * Determines the maximum number of connections that may be established.</div><div class='hunk'>@@ -355,19 +357,21 @@ static inline int iucv_call_b2f0(int command, union iucv_param *parm)</div><div class='ctx'>  */</div><div class='ctx'> static int __iucv_query_maxconn(void *param, unsigned long *max_pathid)</div><div class='ctx'> {</div><div class='del'>-	register unsigned long reg0 asm ("0");</div><div class='del'>-	register unsigned long reg1 asm ("1");</div><div class='del'>-	int ccode;</div><div class='add'>+	unsigned long reg1 = virt_to_phys(param);</div><div class='add'>+	int cc;</div><div class='ctx'> </div><div class='del'>-	reg0 = IUCV_QUERY;</div><div class='del'>-	reg1 = (unsigned long) param;</div><div class='ctx'> 	asm volatile (</div><div class='add'>+		"	lghi	0,%[cmd]\n"</div><div class='add'>+		"	lgr	1,%[reg1]\n"</div><div class='ctx'> 		"	.long	0xb2f01000\n"</div><div class='del'>-		"	ipm	%0\n"</div><div class='del'>-		"	srl	%0,28\n"</div><div class='del'>-		: "=d" (ccode), "+d" (reg0), "+d" (reg1) : : "cc");</div><div class='add'>+		"	ipm	%[cc]\n"</div><div class='add'>+		"	srl	%[cc],28\n"</div><div class='add'>+		"	lgr	%[reg1],1\n"</div><div class='add'>+		: [cc] "=&amp;d" (cc), [reg1] "+&amp;d" (reg1)</div><div class='add'>+		: [cmd] "K" (IUCV_QUERY)</div><div class='add'>+		: "cc", "0", "1");</div><div class='ctx'> 	*max_pathid = reg1;</div><div class='del'>-	return ccode;</div><div class='add'>+	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iucv_query_maxconn(void)</div><div class='hunk'>@@ -448,31 +452,6 @@ static void iucv_block_cpu(void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iucv_block_cpu_almost</div><div class='del'>- * @data: unused</div><div class='del'>- *</div><div class='del'>- * Allow connection-severed interrupts only on this cpu.</div><div class='del'>- */</div><div class='del'>-static void iucv_block_cpu_almost(void *data)</div><div class='del'>-{</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-	union iucv_param *parm;</div><div class='del'>-</div><div class='del'>-	/* Allow iucv control interrupts only */</div><div class='del'>-	parm = iucv_param_irq[cpu];</div><div class='del'>-	memset(parm, 0, sizeof(union iucv_param));</div><div class='del'>-	parm-&gt;set_mask.ipmask = 0x08;</div><div class='del'>-	iucv_call_b2f0(IUCV_SETMASK, parm);</div><div class='del'>-	/* Allow iucv-severed interrupt only */</div><div class='del'>-	memset(parm, 0, sizeof(union iucv_param));</div><div class='del'>-	parm-&gt;set_mask.ipmask = 0x20;</div><div class='del'>-	iucv_call_b2f0(IUCV_SETCONTROLMASK, parm);</div><div class='del'>-</div><div class='del'>-	/* Clear indication that iucv interrupts are allowed for this cpu. */</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;iucv_irq_cpumask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * iucv_declare_cpu</div><div class='ctx'>  * @data: unused</div><div class='ctx'>  *</div><div class='hunk'>@@ -490,7 +469,7 @@ static void iucv_declare_cpu(void *data)</div><div class='ctx'> 	/* Declare interrupt buffer. */</div><div class='ctx'> 	parm = iucv_param_irq[cpu];</div><div class='ctx'> 	memset(parm, 0, sizeof(union iucv_param));</div><div class='del'>-	parm-&gt;db.ipbfadr1 = virt_to_phys(iucv_irq_data[cpu]);</div><div class='add'>+	parm-&gt;db.ipbfadr1 = virt_to_dma32(iucv_irq_data[cpu]);</div><div class='ctx'> 	rc = iucv_call_b2f0(IUCV_DECLARE_BUFFER, parm);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		char *err = "Unknown";</div><div class='hunk'>@@ -552,8 +531,8 @@ static void iucv_retrieve_cpu(void *data)</div><div class='ctx'> 	cpumask_clear_cpu(cpu, &amp;iucv_buffer_cpumask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_setmask_smp</div><div class='add'>+/*</div><div class='add'>+ * iucv_setmask_mp</div><div class='ctx'>  *</div><div class='ctx'>  * Allow iucv interrupts on all cpus.</div><div class='ctx'>  */</div><div class='hunk'>@@ -561,24 +540,24 @@ static void iucv_setmask_mp(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	get_online_cpus();</div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> 	for_each_online_cpu(cpu)</div><div class='ctx'> 		/* Enable all cpus with a declared buffer. */</div><div class='ctx'> 		if (cpumask_test_cpu(cpu, &amp;iucv_buffer_cpumask) &amp;&amp;</div><div class='ctx'> 		    !cpumask_test_cpu(cpu, &amp;iucv_irq_cpumask))</div><div class='ctx'> 			smp_call_function_single(cpu, iucv_allow_cpu,</div><div class='ctx'> 						 NULL, 1);</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_setmask_up</div><div class='ctx'>  *</div><div class='ctx'>  * Allow iucv interrupts on a single cpu.</div><div class='ctx'>  */</div><div class='ctx'> static void iucv_setmask_up(void)</div><div class='ctx'> {</div><div class='del'>-	cpumask_t cpumask;</div><div class='add'>+	static cpumask_t cpumask;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all cpu but the first in cpu_irq_cpumask. */</div><div class='hunk'>@@ -588,7 +567,7 @@ static void iucv_setmask_up(void)</div><div class='ctx'> 		smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_enable</div><div class='ctx'>  *</div><div class='ctx'>  * This function makes iucv ready for use. It allocates the pathid</div><div class='hunk'>@@ -601,9 +580,9 @@ static int iucv_enable(void)</div><div class='ctx'> 	size_t alloc_size;</div><div class='ctx'> 	int cpu, rc;</div><div class='ctx'> </div><div class='del'>-	get_online_cpus();</div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> 	rc = -ENOMEM;</div><div class='del'>-	alloc_size = iucv_max_pathid * sizeof(struct iucv_path);</div><div class='add'>+	alloc_size = iucv_max_pathid * sizeof(*iucv_path_table);</div><div class='ctx'> 	iucv_path_table = kzalloc(alloc_size, GFP_KERNEL);</div><div class='ctx'> 	if (!iucv_path_table)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -614,16 +593,16 @@ static int iucv_enable(void)</div><div class='ctx'> 	if (cpumask_empty(&amp;iucv_buffer_cpumask))</div><div class='ctx'> 		/* No cpu could declare an iucv buffer. */</div><div class='ctx'> 		goto out;</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(iucv_path_table);</div><div class='ctx'> 	iucv_path_table = NULL;</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_disable</div><div class='ctx'>  *</div><div class='ctx'>  * This function shuts down iucv. It disables iucv interrupts, retrieves</div><div class='hunk'>@@ -632,11 +611,11 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static void iucv_disable(void)</div><div class='ctx'> {</div><div class='del'>-	get_online_cpus();</div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> 	on_each_cpu(iucv_retrieve_cpu, NULL, 1);</div><div class='ctx'> 	kfree(iucv_path_table);</div><div class='ctx'> 	iucv_path_table = NULL;</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iucv_cpu_dead(unsigned int cpu)</div><div class='hunk'>@@ -686,23 +665,33 @@ static int iucv_cpu_online(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> static int iucv_cpu_down_prep(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	cpumask_t cpumask;</div><div class='add'>+	cpumask_var_t cpumask;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!iucv_path_table)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;cpumask, &amp;iucv_buffer_cpumask);</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpumask);</div><div class='del'>-	if (cpumask_empty(&amp;cpumask))</div><div class='add'>+	if (!alloc_cpumask_var(&amp;cpumask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cpumask_copy(cpumask, &amp;iucv_buffer_cpumask);</div><div class='add'>+	cpumask_clear_cpu(cpu, cpumask);</div><div class='add'>+	if (cpumask_empty(cpumask)) {</div><div class='ctx'> 		/* Can't offline last IUCV enabled cpu. */</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto __free_cpumask;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iucv_retrieve_cpu(NULL);</div><div class='ctx'> 	if (!cpumask_empty(&amp;iucv_irq_cpumask))</div><div class='del'>-		return 0;</div><div class='add'>+		goto __free_cpumask;</div><div class='add'>+</div><div class='ctx'> 	smp_call_function_single(cpumask_first(&amp;iucv_buffer_cpumask),</div><div class='ctx'> 				 iucv_allow_cpu, NULL, 1);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+__free_cpumask:</div><div class='add'>+	free_cpumask_var(cpumask);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -845,7 +834,7 @@ static int iucv_reboot_event(struct notifier_block *this,</div><div class='ctx'> 	if (cpumask_empty(&amp;iucv_irq_cpumask))</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	get_online_cpus();</div><div class='add'>+	cpus_read_lock();</div><div class='ctx'> 	on_each_cpu_mask(&amp;iucv_irq_cpumask, iucv_block_cpu, NULL, 1);</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	for (i = 0; i &lt; iucv_max_pathid; i++) {</div><div class='hunk'>@@ -853,7 +842,7 @@ static int iucv_reboot_event(struct notifier_block *this,</div><div class='ctx'> 			iucv_sever_pathid(i, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	preempt_enable();</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	cpus_read_unlock();</div><div class='ctx'> 	iucv_disable();</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1139,8 +1128,7 @@ static int iucv_message_receive_iprmdata(struct iucv_path *path,</div><div class='ctx'> 		size = (size &lt; 8) ? size : 8;</div><div class='ctx'> 		for (array = buffer; size &gt; 0; array++) {</div><div class='ctx'> 			copy = min_t(size_t, size, array-&gt;length);</div><div class='del'>-			memcpy((u8 *)(addr_t) array-&gt;address,</div><div class='del'>-				rmmsg, copy);</div><div class='add'>+			memcpy(dma32_to_virt(array-&gt;address), rmmsg, copy);</div><div class='ctx'> 			rmmsg += copy;</div><div class='ctx'> 			size -= copy;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1177,13 +1165,12 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 	if (msg-&gt;flags &amp; IUCV_IPRMDATA)</div><div class='ctx'> 		return iucv_message_receive_iprmdata(path, msg, flags,</div><div class='ctx'> 						     buffer, size, residual);</div><div class='del'>-	 if (cpumask_empty(&amp;iucv_buffer_cpumask)) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (cpumask_empty(&amp;iucv_buffer_cpumask))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	parm = iucv_param[smp_processor_id()];</div><div class='ctx'> 	memset(parm, 0, sizeof(union iucv_param));</div><div class='del'>-	parm-&gt;db.ipbfadr1 = (u32)(addr_t) buffer;</div><div class='add'>+	parm-&gt;db.ipbfadr1 = virt_to_dma32(buffer);</div><div class='ctx'> 	parm-&gt;db.ipbfln1f = (u32) size;</div><div class='ctx'> 	parm-&gt;db.ipmsgid = msg-&gt;id;</div><div class='ctx'> 	parm-&gt;db.ippathid = path-&gt;pathid;</div><div class='hunk'>@@ -1196,7 +1183,6 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 		if (residual)</div><div class='ctx'> 			*residual = parm-&gt;db.ipbfln1f;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__iucv_message_receive);</div><div class='hunk'>@@ -1302,7 +1288,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 		parm-&gt;dpl.iptrgcls = msg-&gt;class;</div><div class='ctx'> 		memcpy(parm-&gt;dpl.iprmmsg, reply, min_t(size_t, size, 8));</div><div class='ctx'> 	} else {</div><div class='del'>-		parm-&gt;db.ipbfadr1 = (u32)(addr_t) reply;</div><div class='add'>+		parm-&gt;db.ipbfadr1 = virt_to_dma32(reply);</div><div class='ctx'> 		parm-&gt;db.ipbfln1f = (u32) size;</div><div class='ctx'> 		parm-&gt;db.ippathid = path-&gt;pathid;</div><div class='ctx'> 		parm-&gt;db.ipflags1 = flags;</div><div class='hunk'>@@ -1354,7 +1340,7 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 		parm-&gt;dpl.ipmsgtag = msg-&gt;tag;</div><div class='ctx'> 		memcpy(parm-&gt;dpl.iprmmsg, buffer, 8);</div><div class='ctx'> 	} else {</div><div class='del'>-		parm-&gt;db.ipbfadr1 = (u32)(addr_t) buffer;</div><div class='add'>+		parm-&gt;db.ipbfadr1 = virt_to_dma32(buffer);</div><div class='ctx'> 		parm-&gt;db.ipbfln1f = (u32) size;</div><div class='ctx'> 		parm-&gt;db.ippathid = path-&gt;pathid;</div><div class='ctx'> 		parm-&gt;db.ipflags1 = flags | IUCV_IPNORPY;</div><div class='hunk'>@@ -1408,8 +1394,9 @@ EXPORT_SYMBOL(iucv_message_send);</div><div class='ctx'>  * @srccls: source class of message</div><div class='ctx'>  * @buffer: address of send buffer or address of struct iucv_array</div><div class='ctx'>  * @size: length of send buffer</div><div class='del'>- * @ansbuf: address of answer buffer or address of struct iucv_array</div><div class='add'>+ * @answer: address of answer buffer or address of struct iucv_array</div><div class='ctx'>  * @asize: size of reply buffer</div><div class='add'>+ * @residual: ignored</div><div class='ctx'>  *</div><div class='ctx'>  * This function transmits data to another application. Data to be</div><div class='ctx'>  * transmitted is in a buffer. The receiver of the send is expected to</div><div class='hunk'>@@ -1438,7 +1425,7 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 		parm-&gt;dpl.iptrgcls = msg-&gt;class;</div><div class='ctx'> 		parm-&gt;dpl.ipsrccls = srccls;</div><div class='ctx'> 		parm-&gt;dpl.ipmsgtag = msg-&gt;tag;</div><div class='del'>-		parm-&gt;dpl.ipbfadr2 = (u32)(addr_t) answer;</div><div class='add'>+		parm-&gt;dpl.ipbfadr2 = virt_to_dma32(answer);</div><div class='ctx'> 		parm-&gt;dpl.ipbfln2f = (u32) asize;</div><div class='ctx'> 		memcpy(parm-&gt;dpl.iprmmsg, buffer, 8);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1447,9 +1434,9 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,</div><div class='ctx'> 		parm-&gt;db.iptrgcls = msg-&gt;class;</div><div class='ctx'> 		parm-&gt;db.ipsrccls = srccls;</div><div class='ctx'> 		parm-&gt;db.ipmsgtag = msg-&gt;tag;</div><div class='del'>-		parm-&gt;db.ipbfadr1 = (u32)(addr_t) buffer;</div><div class='add'>+		parm-&gt;db.ipbfadr1 = virt_to_dma32(buffer);</div><div class='ctx'> 		parm-&gt;db.ipbfln1f = (u32) size;</div><div class='del'>-		parm-&gt;db.ipbfadr2 = (u32)(addr_t) answer;</div><div class='add'>+		parm-&gt;db.ipbfadr2 = virt_to_dma32(answer);</div><div class='ctx'> 		parm-&gt;db.ipbfln2f = (u32) asize;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = iucv_call_b2f0(IUCV_SEND, parm);</div><div class='hunk'>@@ -1461,13 +1448,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iucv_message_send2way);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_path_pending</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process connection pending work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_path_pending {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  ipflags1;</div><div class='hunk'>@@ -1481,6 +1461,13 @@ struct iucv_path_pending {</div><div class='ctx'> 	u8  res4[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_path_pending</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process connection pending work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_path_pending(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_path_pending *ipp = (void *) data;</div><div class='hunk'>@@ -1522,13 +1509,6 @@ out_sever:</div><div class='ctx'> 	iucv_sever_pathid(ipp-&gt;ippathid, error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_path_complete</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process connection complete work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_path_complete {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  ipflags1;</div><div class='hunk'>@@ -1542,6 +1522,13 @@ struct iucv_path_complete {</div><div class='ctx'> 	u8  res4[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_path_complete</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process connection complete work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_path_complete(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_path_complete *ipc = (void *) data;</div><div class='hunk'>@@ -1553,13 +1540,6 @@ static void iucv_path_complete(struct iucv_irq_data *data)</div><div class='ctx'> 		path-&gt;handler-&gt;path_complete(path, ipc-&gt;ipuser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_path_severed</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process connection severed work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_path_severed {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  res1;</div><div class='hunk'>@@ -1572,6 +1552,13 @@ struct iucv_path_severed {</div><div class='ctx'> 	u8  res5[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_path_severed</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process connection severed work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_path_severed(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_path_severed *ips = (void *) data;</div><div class='hunk'>@@ -1589,13 +1576,6 @@ static void iucv_path_severed(struct iucv_irq_data *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_path_quiesced</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process connection quiesced work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_path_quiesced {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  res1;</div><div class='hunk'>@@ -1608,6 +1588,13 @@ struct iucv_path_quiesced {</div><div class='ctx'> 	u8  res5[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_path_quiesced</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process connection quiesced work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_path_quiesced(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_path_quiesced *ipq = (void *) data;</div><div class='hunk'>@@ -1617,13 +1604,6 @@ static void iucv_path_quiesced(struct iucv_irq_data *data)</div><div class='ctx'> 		path-&gt;handler-&gt;path_quiesced(path, ipq-&gt;ipuser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_path_resumed</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process connection resumed work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_path_resumed {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  res1;</div><div class='hunk'>@@ -1636,6 +1616,13 @@ struct iucv_path_resumed {</div><div class='ctx'> 	u8  res5[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_path_resumed</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process connection resumed work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_path_resumed(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_path_resumed *ipr = (void *) data;</div><div class='hunk'>@@ -1645,13 +1632,6 @@ static void iucv_path_resumed(struct iucv_irq_data *data)</div><div class='ctx'> 		path-&gt;handler-&gt;path_resumed(path, ipr-&gt;ipuser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_message_complete</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process message complete work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_message_complete {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  ipflags1;</div><div class='hunk'>@@ -1667,6 +1647,13 @@ struct iucv_message_complete {</div><div class='ctx'> 	u8  res2[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_message_complete</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process message complete work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_message_complete(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_message_complete *imc = (void *) data;</div><div class='hunk'>@@ -1685,33 +1672,35 @@ static void iucv_message_complete(struct iucv_irq_data *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iucv_message_pending</div><div class='del'>- * @data: Pointer to external interrupt buffer</div><div class='del'>- *</div><div class='del'>- * Process message pending work item. Called from tasklet while holding</div><div class='del'>- * iucv_table_lock.</div><div class='del'>- */</div><div class='ctx'> struct iucv_message_pending {</div><div class='ctx'> 	u16 ippathid;</div><div class='ctx'> 	u8  ipflags1;</div><div class='ctx'> 	u8  iptype;</div><div class='ctx'> 	u32 ipmsgid;</div><div class='ctx'> 	u32 iptrgcls;</div><div class='del'>-	union {</div><div class='del'>-		u32 iprmmsg1_u32;</div><div class='del'>-		u8  iprmmsg1[4];</div><div class='del'>-	} ln1msg1;</div><div class='del'>-	union {</div><div class='del'>-		u32 ipbfln1f;</div><div class='del'>-		u8  iprmmsg2[4];</div><div class='del'>-	} ln1msg2;</div><div class='add'>+	struct {</div><div class='add'>+		union {</div><div class='add'>+			u32 iprmmsg1_u32;</div><div class='add'>+			u8  iprmmsg1[4];</div><div class='add'>+		} ln1msg1;</div><div class='add'>+		union {</div><div class='add'>+			u32 ipbfln1f;</div><div class='add'>+			u8  iprmmsg2[4];</div><div class='add'>+		} ln1msg2;</div><div class='add'>+	} rmmsg;</div><div class='ctx'> 	u32 res1[3];</div><div class='ctx'> 	u32 ipbfln2f;</div><div class='ctx'> 	u8  ippollfg;</div><div class='ctx'> 	u8  res2[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iucv_message_pending</div><div class='add'>+ * @data: Pointer to external interrupt buffer</div><div class='add'>+ *</div><div class='add'>+ * Process message pending work item. Called from tasklet while holding</div><div class='add'>+ * iucv_table_lock.</div><div class='add'>+ */</div><div class='ctx'> static void iucv_message_pending(struct iucv_irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_message_pending *imp = (void *) data;</div><div class='hunk'>@@ -1723,16 +1712,16 @@ static void iucv_message_pending(struct iucv_irq_data *data)</div><div class='ctx'> 		msg.id = imp-&gt;ipmsgid;</div><div class='ctx'> 		msg.class = imp-&gt;iptrgcls;</div><div class='ctx'> 		if (imp-&gt;ipflags1 &amp; IUCV_IPRMDATA) {</div><div class='del'>-			memcpy(msg.rmmsg, imp-&gt;ln1msg1.iprmmsg1, 8);</div><div class='add'>+			memcpy(msg.rmmsg, &amp;imp-&gt;rmmsg, 8);</div><div class='ctx'> 			msg.length = 8;</div><div class='ctx'> 		} else</div><div class='del'>-			msg.length = imp-&gt;ln1msg2.ipbfln1f;</div><div class='add'>+			msg.length = imp-&gt;rmmsg.ln1msg2.ipbfln1f;</div><div class='ctx'> 		msg.reply_size = imp-&gt;ipbfln2f;</div><div class='ctx'> 		path-&gt;handler-&gt;message_pending(path, &amp;msg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_tasklet_fn:</div><div class='ctx'>  *</div><div class='ctx'>  * This tasklet loops over the queue of irq buffers created by</div><div class='hunk'>@@ -1776,7 +1765,7 @@ static void iucv_tasklet_fn(unsigned long ignored)</div><div class='ctx'> 	spin_unlock(&amp;iucv_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_work_fn:</div><div class='ctx'>  *</div><div class='ctx'>  * This work function loops over the queue of path pending irq blocks</div><div class='hunk'>@@ -1807,9 +1796,8 @@ static void iucv_work_fn(struct work_struct *work)</div><div class='ctx'> 	spin_unlock_bh(&amp;iucv_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iucv_external_interrupt</div><div class='del'>- * @code: irq code</div><div class='ctx'>  *</div><div class='ctx'>  * Handles external interrupts coming in from CP.</div><div class='ctx'>  * Places the interrupt buffer on a queue and schedules iucv_tasklet_fn().</div><div class='hunk'>@@ -1847,146 +1835,6 @@ static void iucv_external_interrupt(struct ext_code ext_code,</div><div class='ctx'> 	spin_unlock(&amp;iucv_queue_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iucv_pm_prepare(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_INFO "iucv_pm_prepare\n");</div><div class='del'>-#endif</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm &amp;&amp; dev-&gt;driver-&gt;pm-&gt;prepare)</div><div class='del'>-		rc = dev-&gt;driver-&gt;pm-&gt;prepare(dev);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iucv_pm_complete(struct device *dev)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_INFO "iucv_pm_complete\n");</div><div class='del'>-#endif</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm &amp;&amp; dev-&gt;driver-&gt;pm-&gt;complete)</div><div class='del'>-		dev-&gt;driver-&gt;pm-&gt;complete(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iucv_path_table_empty() - determine if iucv path table is empty</div><div class='del'>- *</div><div class='del'>- * Returns 0 if there are still iucv pathes defined</div><div class='del'>- *	   1 if there are no iucv pathes defined</div><div class='del'>- */</div><div class='del'>-static int iucv_path_table_empty(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; iucv_max_pathid; i++) {</div><div class='del'>-		if (iucv_path_table[i])</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iucv_pm_freeze() - Freeze PM callback</div><div class='del'>- * @dev:	iucv-based device</div><div class='del'>- *</div><div class='del'>- * disable iucv interrupts</div><div class='del'>- * invoke callback function of the iucv-based driver</div><div class='del'>- * shut down iucv, if no iucv-pathes are established anymore</div><div class='del'>- */</div><div class='del'>-static int iucv_pm_freeze(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-	struct iucv_irq_list *p, *n;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "iucv_pm_freeze\n");</div><div class='del'>-#endif</div><div class='del'>-	if (iucv_pm_state != IUCV_PM_FREEZING) {</div><div class='del'>-		for_each_cpu(cpu, &amp;iucv_irq_cpumask)</div><div class='del'>-			smp_call_function_single(cpu, iucv_block_cpu_almost,</div><div class='del'>-						 NULL, 1);</div><div class='del'>-		cancel_work_sync(&amp;iucv_work);</div><div class='del'>-		list_for_each_entry_safe(p, n, &amp;iucv_work_queue, list) {</div><div class='del'>-			list_del_init(&amp;p-&gt;list);</div><div class='del'>-			iucv_sever_pathid(p-&gt;data.ippathid,</div><div class='del'>-					  iucv_error_no_listener);</div><div class='del'>-			kfree(p);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	iucv_pm_state = IUCV_PM_FREEZING;</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm &amp;&amp; dev-&gt;driver-&gt;pm-&gt;freeze)</div><div class='del'>-		rc = dev-&gt;driver-&gt;pm-&gt;freeze(dev);</div><div class='del'>-	if (iucv_path_table_empty())</div><div class='del'>-		iucv_disable();</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iucv_pm_thaw() - Thaw PM callback</div><div class='del'>- * @dev:	iucv-based device</div><div class='del'>- *</div><div class='del'>- * make iucv ready for use again: allocate path table, declare interrupt buffers</div><div class='del'>- *				  and enable iucv interrupts</div><div class='del'>- * invoke callback function of the iucv-based driver</div><div class='del'>- */</div><div class='del'>-static int iucv_pm_thaw(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "iucv_pm_thaw\n");</div><div class='del'>-#endif</div><div class='del'>-	iucv_pm_state = IUCV_PM_THAWING;</div><div class='del'>-	if (!iucv_path_table) {</div><div class='del'>-		rc = iucv_enable();</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	if (cpumask_empty(&amp;iucv_irq_cpumask)) {</div><div class='del'>-		if (iucv_nonsmp_handler)</div><div class='del'>-			/* enable interrupts on one cpu */</div><div class='del'>-			iucv_allow_cpu(NULL);</div><div class='del'>-		else</div><div class='del'>-			/* enable interrupts on all cpus */</div><div class='del'>-			iucv_setmask_mp();</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm &amp;&amp; dev-&gt;driver-&gt;pm-&gt;thaw)</div><div class='del'>-		rc = dev-&gt;driver-&gt;pm-&gt;thaw(dev);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iucv_pm_restore() - Restore PM callback</div><div class='del'>- * @dev:	iucv-based device</div><div class='del'>- *</div><div class='del'>- * make iucv ready for use again: allocate path table, declare interrupt buffers</div><div class='del'>- *				  and enable iucv interrupts</div><div class='del'>- * invoke callback function of the iucv-based driver</div><div class='del'>- */</div><div class='del'>-static int iucv_pm_restore(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_DEBUG</div><div class='del'>-	printk(KERN_WARNING "iucv_pm_restore %p\n", iucv_path_table);</div><div class='del'>-#endif</div><div class='del'>-	if ((iucv_pm_state != IUCV_PM_RESTORING) &amp;&amp; iucv_path_table)</div><div class='del'>-		pr_warn("Suspending Linux did not completely close all IUCV connections\n");</div><div class='del'>-	iucv_pm_state = IUCV_PM_RESTORING;</div><div class='del'>-	if (cpumask_empty(&amp;iucv_irq_cpumask)) {</div><div class='del'>-		rc = iucv_query_maxconn();</div><div class='del'>-		rc = iucv_enable();</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm &amp;&amp; dev-&gt;driver-&gt;pm-&gt;restore)</div><div class='del'>-		rc = dev-&gt;driver-&gt;pm-&gt;restore(dev);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct iucv_interface iucv_if = {</div><div class='ctx'> 	.message_receive = iucv_message_receive,</div><div class='ctx'> 	.__message_receive = __iucv_message_receive,</div><div class='hunk'>@@ -2018,11 +1866,11 @@ static int __init iucv_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!MACHINE_IS_VM) {</div><div class='add'>+	if (!machine_is_vm()) {</div><div class='ctx'> 		rc = -EPROTONOSUPPORT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	ctl_set_bit(0, 1);</div><div class='add'>+	system_ctl_set_bit(0, CR0_IUCV_BIT);</div><div class='ctx'> 	rc = iucv_query_maxconn();</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_ctl;</div><div class='hunk'>@@ -2070,7 +1918,7 @@ out_dev:</div><div class='ctx'> out_int:</div><div class='ctx'> 	unregister_external_irq(EXT_IRQ_IUCV, iucv_external_interrupt);</div><div class='ctx'> out_ctl:</div><div class='del'>-	ctl_clear_bit(0, 1);</div><div class='add'>+	system_ctl_clear_bit(0, 1);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2102,6 +1950,6 @@ static void __exit iucv_exit(void)</div><div class='ctx'> subsys_initcall(iucv_init);</div><div class='ctx'> module_exit(iucv_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("(C) 2001 IBM Corp. by Fritz Elfert (felfert@millenux.com)");</div><div class='add'>+MODULE_AUTHOR("(C) 2001 IBM Corp. by Fritz Elfert &lt;felfert@millenux.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Linux for S/390 IUCV lowlevel driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/kcm/Kconfig b/net/kcm/Kconfig<br/>index 9ca83f2ade6f..66660a06cacf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/kcm/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/kcm/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/kcm/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> config AF_KCM</div><div class='ctx'> 	tristate "KCM sockets"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select BPF_SYSCALL</div><div class='ctx'> 	select STREAM_PARSER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  KCM (Kernel Connection Multiplexor) sockets provide a method</div><div class='del'>-	  for multiplexing messages of a message based application</div><div class='del'>-	  protocol over kernel connectons (e.g. TCP connections).</div><div class='add'>+	  for multiplexing messages of a message-based application</div><div class='add'>+	  protocol over kernel connections (e.g. TCP connections).</div><div class='head'>diff --git a/net/kcm/Makefile b/net/kcm/Makefile<br/>index 71256133e677..6c4569221da8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/kcm/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/kcm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/kcm/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_AF_KCM) += kcm.o</div><div class='ctx'> </div><div class='ctx'> kcm-y := kcmsock.o kcmproc.o</div><div class='head'>diff --git a/net/kcm/kcmproc.c b/net/kcm/kcmproc.c<br/>index 370da2f80e3c..25c1007f1098 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/kcm/kcmproc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/kcmproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/kcm/kcmproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/kcm/kcmproc.c</a></div><div class='hunk'>@@ -261,7 +261,7 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	aggregate_strp_stats(&amp;knet-&gt;aggregate_strp_stats,</div><div class='ctx'> 			     &amp;strp_stats);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(mux, &amp;knet-&gt;mux_list, kcm_mux_list) {</div><div class='add'>+	list_for_each_entry(mux, &amp;knet-&gt;mux_list, kcm_mux_list) {</div><div class='ctx'> 		spin_lock_bh(&amp;mux-&gt;lock);</div><div class='ctx'> 		aggregate_mux_stats(&amp;mux-&gt;stats, &amp;mux_stats);</div><div class='ctx'> 		aggregate_psock_stats(&amp;mux-&gt;aggregate_psock_stats,</div><div class='head'>diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c<br/>index 571d824e4e24..5dd7e0509a48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/kcm/kcmsock.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/kcm/kcmsock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/kcm/kcmsock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/kcm/kcmsock.c</a></div><div class='hunk'>@@ -1,17 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Kernel Connection Multiplexor</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Tom Herbert &lt;tom@herbertland.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -21,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/splice.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='hunk'>@@ -30,6 +29,7 @@</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/kcm.h&gt;</div><div class='add'>+#include &lt;trace/events/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int kcm_net_id;</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +50,7 @@ static inline struct kcm_tx_msg *kcm_tx_msg(struct sk_buff *skb)</div><div class='ctx'> static void report_csk_error(struct sock *csk, int err)</div><div class='ctx'> {</div><div class='ctx'> 	csk-&gt;sk_err = EPIPE;</div><div class='del'>-	csk-&gt;sk_error_report(csk);</div><div class='add'>+	sk_error_report(csk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kcm_abort_tx_psock(struct kcm_psock *psock, int err,</div><div class='hunk'>@@ -164,7 +164,8 @@ static void kcm_rcv_ready(struct kcm_sock *kcm)</div><div class='ctx'> 	/* Buffer limit is okay now, add to ready list */</div><div class='ctx'> 	list_add_tail(&amp;kcm-&gt;wait_rx_list,</div><div class='ctx'> 		      &amp;kcm-&gt;mux-&gt;kcm_rx_waiters);</div><div class='del'>-	kcm-&gt;rx_wait = true;</div><div class='add'>+	/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+	WRITE_ONCE(kcm-&gt;rx_wait, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kcm_rfree(struct sk_buff *skb)</div><div class='hunk'>@@ -180,7 +181,7 @@ static void kcm_rfree(struct sk_buff *skb)</div><div class='ctx'> 	/* For reading rx_wait and rx_psock without holding lock */</div><div class='ctx'> 	smp_mb__after_atomic();</div><div class='ctx'> </div><div class='del'>-	if (!kcm-&gt;rx_wait &amp;&amp; !kcm-&gt;rx_psock &amp;&amp;</div><div class='add'>+	if (!READ_ONCE(kcm-&gt;rx_wait) &amp;&amp; !READ_ONCE(kcm-&gt;rx_psock) &amp;&amp;</div><div class='ctx'> 	    sk_rmem_alloc_get(sk) &lt; sk-&gt;sk_rcvlowat) {</div><div class='ctx'> 		spin_lock_bh(&amp;mux-&gt;rx_lock);</div><div class='ctx'> 		kcm_rcv_ready(kcm);</div><div class='hunk'>@@ -223,7 +224,7 @@ static void requeue_rx_msgs(struct kcm_mux *mux, struct sk_buff_head *head)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct kcm_sock *kcm;</div><div class='ctx'> </div><div class='del'>-	while ((skb = __skb_dequeue(head))) {</div><div class='add'>+	while ((skb = skb_dequeue(head))) {</div><div class='ctx'> 		/* Reset destructor to avoid calling kcm_rcv_ready */</div><div class='ctx'> 		skb-&gt;destructor = sock_rfree;</div><div class='ctx'> 		skb_orphan(skb);</div><div class='hunk'>@@ -239,7 +240,8 @@ try_again:</div><div class='ctx'> 		if (kcm_queue_rcv_skb(&amp;kcm-&gt;sk, skb)) {</div><div class='ctx'> 			/* Should mean socket buffer full */</div><div class='ctx'> 			list_del(&amp;kcm-&gt;wait_rx_list);</div><div class='del'>-			kcm-&gt;rx_wait = false;</div><div class='add'>+			/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+			WRITE_ONCE(kcm-&gt;rx_wait, false);</div><div class='ctx'> </div><div class='ctx'> 			/* Commit rx_wait to read in kcm_free */</div><div class='ctx'> 			smp_wmb();</div><div class='hunk'>@@ -282,10 +284,12 @@ static struct kcm_sock *reserve_rx_kcm(struct kcm_psock *psock,</div><div class='ctx'> 	kcm = list_first_entry(&amp;mux-&gt;kcm_rx_waiters,</div><div class='ctx'> 			       struct kcm_sock, wait_rx_list);</div><div class='ctx'> 	list_del(&amp;kcm-&gt;wait_rx_list);</div><div class='del'>-	kcm-&gt;rx_wait = false;</div><div class='add'>+	/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+	WRITE_ONCE(kcm-&gt;rx_wait, false);</div><div class='ctx'> </div><div class='ctx'> 	psock-&gt;rx_kcm = kcm;</div><div class='del'>-	kcm-&gt;rx_psock = psock;</div><div class='add'>+	/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+	WRITE_ONCE(kcm-&gt;rx_psock, psock);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;mux-&gt;rx_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +316,8 @@ static void unreserve_rx_kcm(struct kcm_psock *psock,</div><div class='ctx'> 	spin_lock_bh(&amp;mux-&gt;rx_lock);</div><div class='ctx'> </div><div class='ctx'> 	psock-&gt;rx_kcm = NULL;</div><div class='del'>-	kcm-&gt;rx_psock = NULL;</div><div class='add'>+	/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+	WRITE_ONCE(kcm-&gt;rx_psock, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Commit kcm-&gt;rx_psock before sk_rmem_alloc_get to sync with</div><div class='ctx'> 	 * kcm_rfree</div><div class='hunk'>@@ -346,6 +351,8 @@ static void psock_data_ready(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct kcm_psock *psock;</div><div class='ctx'> </div><div class='add'>+	trace_sk_data_ready(sk);</div><div class='add'>+</div><div class='ctx'> 	read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> </div><div class='ctx'> 	psock = (struct kcm_psock *)sk-&gt;sk_user_data;</div><div class='hunk'>@@ -381,8 +388,10 @@ static int kcm_parse_func_strparser(struct strparser *strp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp);</div><div class='ctx'> 	struct bpf_prog *prog = psock-&gt;bpf_prog;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-	return (*prog-&gt;bpf_func)(skb, prog-&gt;insnsi);</div><div class='add'>+	res = bpf_prog_run_pin_on_cpu(prog, skb);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kcm_read_sock_done(struct strparser *strp, int err)</div><div class='hunk'>@@ -421,7 +430,7 @@ static void psock_write_space(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the socket is reserved so someone is waiting for sending. */</div><div class='ctx'> 	kcm = psock-&gt;tx_kcm;</div><div class='del'>-	if (kcm &amp;&amp; !unlikely(kcm-&gt;tx_stopped))</div><div class='add'>+	if (kcm)</div><div class='ctx'> 		queue_work(kcm_wq, &amp;kcm-&gt;tx_work);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;mux-&gt;lock);</div><div class='hunk'>@@ -573,12 +582,10 @@ static void kcm_report_tx_retry(struct kcm_sock *kcm)</div><div class='ctx'>  */</div><div class='ctx'> static int kcm_write_msgs(struct kcm_sock *kcm)</div><div class='ctx'> {</div><div class='add'>+	unsigned int total_sent = 0;</div><div class='ctx'> 	struct sock *sk = &amp;kcm-&gt;sk;</div><div class='ctx'> 	struct kcm_psock *psock;</div><div class='del'>-	struct sk_buff *skb, *head;</div><div class='del'>-	struct kcm_tx_msg *txm;</div><div class='del'>-	unsigned short fragidx, frag_offset;</div><div class='del'>-	unsigned int sent, total_sent = 0;</div><div class='add'>+	struct sk_buff *head;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	kcm-&gt;tx_wait_more = false;</div><div class='hunk'>@@ -592,123 +599,108 @@ static int kcm_write_msgs(struct kcm_sock *kcm)</div><div class='ctx'> 		if (skb_queue_empty(&amp;sk-&gt;sk_write_queue))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		kcm_tx_msg(skb_peek(&amp;sk-&gt;sk_write_queue))-&gt;sent = 0;</div><div class='del'>-</div><div class='del'>-	} else if (skb_queue_empty(&amp;sk-&gt;sk_write_queue)) {</div><div class='del'>-		return 0;</div><div class='add'>+		kcm_tx_msg(skb_peek(&amp;sk-&gt;sk_write_queue))-&gt;started_tx = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	head = skb_peek(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-	txm = kcm_tx_msg(head);</div><div class='add'>+retry:</div><div class='add'>+	while ((head = skb_peek(&amp;sk-&gt;sk_write_queue))) {</div><div class='add'>+		struct msghdr msg = {</div><div class='add'>+			.msg_flags = MSG_DONTWAIT | MSG_SPLICE_PAGES,</div><div class='add'>+		};</div><div class='add'>+		struct kcm_tx_msg *txm = kcm_tx_msg(head);</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		unsigned int msize;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-	if (txm-&gt;sent) {</div><div class='del'>-		/* Send of first skbuff in queue already in progress */</div><div class='del'>-		if (WARN_ON(!psock)) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+		if (!txm-&gt;started_tx) {</div><div class='add'>+			psock = reserve_psock(kcm);</div><div class='add'>+			if (!psock)</div><div class='add'>+				goto out;</div><div class='add'>+			skb = head;</div><div class='add'>+			txm-&gt;frag_offset = 0;</div><div class='add'>+			txm-&gt;sent = 0;</div><div class='add'>+			txm-&gt;started_tx = true;</div><div class='add'>+		} else {</div><div class='add'>+			if (WARN_ON(!psock)) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			skb = txm-&gt;frag_skb;</div><div class='ctx'> 		}</div><div class='del'>-		sent = txm-&gt;sent;</div><div class='del'>-		frag_offset = txm-&gt;frag_offset;</div><div class='del'>-		fragidx = txm-&gt;fragidx;</div><div class='del'>-		skb = txm-&gt;frag_skb;</div><div class='del'>-</div><div class='del'>-		goto do_frag;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-try_again:</div><div class='del'>-	psock = reserve_psock(kcm);</div><div class='del'>-	if (!psock)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		skb = head;</div><div class='del'>-		txm = kcm_tx_msg(head);</div><div class='del'>-		sent = 0;</div><div class='del'>-</div><div class='del'>-do_frag_list:</div><div class='del'>-		if (WARN_ON(!skb_shinfo(skb)-&gt;nr_frags)) {</div><div class='add'>+		if (WARN_ON(!skb_shinfo(skb)-&gt;nr_frags) ||</div><div class='add'>+		    WARN_ON_ONCE(!skb_frag_page(&amp;skb_shinfo(skb)-&gt;frags[0]))) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (fragidx = 0; fragidx &lt; skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-		     fragidx++) {</div><div class='del'>-			skb_frag_t *frag;</div><div class='add'>+		msize = 0;</div><div class='add'>+		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++)</div><div class='add'>+			msize += skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='ctx'> </div><div class='del'>-			frag_offset = 0;</div><div class='del'>-do_frag:</div><div class='del'>-			frag = &amp;skb_shinfo(skb)-&gt;frags[fragidx];</div><div class='del'>-			if (WARN_ON(!frag-&gt;size)) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+		iov_iter_bvec(&amp;msg.msg_iter, ITER_SOURCE,</div><div class='add'>+			      (const struct bio_vec *)skb_shinfo(skb)-&gt;frags,</div><div class='add'>+			      skb_shinfo(skb)-&gt;nr_frags, msize);</div><div class='add'>+		iov_iter_advance(&amp;msg.msg_iter, txm-&gt;frag_offset);</div><div class='ctx'> </div><div class='del'>-			ret = kernel_sendpage(psock-&gt;sk-&gt;sk_socket,</div><div class='del'>-					      frag-&gt;page.p,</div><div class='del'>-					      frag-&gt;page_offset + frag_offset,</div><div class='del'>-					      frag-&gt;size - frag_offset,</div><div class='del'>-					      MSG_DONTWAIT);</div><div class='add'>+		do {</div><div class='add'>+			ret = sock_sendmsg(psock-&gt;sk-&gt;sk_socket, &amp;msg);</div><div class='ctx'> 			if (ret &lt;= 0) {</div><div class='ctx'> 				if (ret == -EAGAIN) {</div><div class='ctx'> 					/* Save state to try again when there's</div><div class='ctx'> 					 * write space on the socket</div><div class='ctx'> 					 */</div><div class='del'>-					txm-&gt;sent = sent;</div><div class='del'>-					txm-&gt;frag_offset = frag_offset;</div><div class='del'>-					txm-&gt;fragidx = fragidx;</div><div class='ctx'> 					txm-&gt;frag_skb = skb;</div><div class='del'>-</div><div class='ctx'> 					ret = 0;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				/* Hard failure in sending message, abort this</div><div class='ctx'> 				 * psock since it has lost framing</div><div class='del'>-				 * synchonization and retry sending the</div><div class='add'>+				 * synchronization and retry sending the</div><div class='ctx'> 				 * message from the beginning.</div><div class='ctx'> 				 */</div><div class='ctx'> 				kcm_abort_tx_psock(psock, ret ? -ret : EPIPE,</div><div class='ctx'> 						   true);</div><div class='ctx'> 				unreserve_psock(kcm);</div><div class='add'>+				psock = NULL;</div><div class='ctx'> </div><div class='del'>-				txm-&gt;sent = 0;</div><div class='add'>+				txm-&gt;started_tx = false;</div><div class='ctx'> 				kcm_report_tx_retry(kcm);</div><div class='ctx'> 				ret = 0;</div><div class='del'>-</div><div class='del'>-				goto try_again;</div><div class='add'>+				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			sent += ret;</div><div class='del'>-			frag_offset += ret;</div><div class='add'>+			txm-&gt;sent += ret;</div><div class='add'>+			txm-&gt;frag_offset += ret;</div><div class='ctx'> 			KCM_STATS_ADD(psock-&gt;stats.tx_bytes, ret);</div><div class='del'>-			if (frag_offset &lt; frag-&gt;size) {</div><div class='del'>-				/* Not finished with this frag */</div><div class='del'>-				goto do_frag;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		} while (msg.msg_iter.count &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 		if (skb == head) {</div><div class='ctx'> 			if (skb_has_frag_list(skb)) {</div><div class='del'>-				skb = skb_shinfo(skb)-&gt;frag_list;</div><div class='del'>-				goto do_frag_list;</div><div class='add'>+				txm-&gt;frag_skb = skb_shinfo(skb)-&gt;frag_list;</div><div class='add'>+				txm-&gt;frag_offset = 0;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (skb-&gt;next) {</div><div class='del'>-			skb = skb-&gt;next;</div><div class='del'>-			goto do_frag_list;</div><div class='add'>+			txm-&gt;frag_skb = skb-&gt;next;</div><div class='add'>+			txm-&gt;frag_offset = 0;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Successfully sent the whole packet, account for it. */</div><div class='add'>+		sk-&gt;sk_wmem_queued -= txm-&gt;sent;</div><div class='add'>+		total_sent += txm-&gt;sent;</div><div class='ctx'> 		skb_dequeue(&amp;sk-&gt;sk_write_queue);</div><div class='ctx'> 		kfree_skb(head);</div><div class='del'>-		sk-&gt;sk_wmem_queued -= sent;</div><div class='del'>-		total_sent += sent;</div><div class='ctx'> 		KCM_STATS_INCR(psock-&gt;stats.tx_msgs);</div><div class='del'>-	} while ((head = skb_peek(&amp;sk-&gt;sk_write_queue)));</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (!head) {</div><div class='ctx'> 		/* Done with all queued messages. */</div><div class='ctx'> 		WARN_ON(!skb_queue_empty(&amp;sk-&gt;sk_write_queue));</div><div class='del'>-		unreserve_psock(kcm);</div><div class='add'>+		if (psock)</div><div class='add'>+			unreserve_psock(kcm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if write space is available */</div><div class='hunk'>@@ -753,149 +745,6 @@ static void kcm_push(struct kcm_sock *kcm)</div><div class='ctx'> 		kcm_write_msgs(kcm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t kcm_sendpage(struct socket *sock, struct page *page,</div><div class='del'>-			    int offset, size_t size, int flags)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct sock *sk = sock-&gt;sk;</div><div class='del'>-	struct kcm_sock *kcm = kcm_sk(sk);</div><div class='del'>-	struct sk_buff *skb = NULL, *head = NULL;</div><div class='del'>-	long timeo = sock_sndtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-	bool eor;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MSG_SENDPAGE_NOTLAST)</div><div class='del'>-		flags |= MSG_MORE;</div><div class='del'>-</div><div class='del'>-	/* No MSG_EOR from splice, only look at MSG_MORE */</div><div class='del'>-	eor = !(flags &amp; MSG_MORE);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='del'>-</div><div class='del'>-	err = -EPIPE;</div><div class='del'>-	if (sk-&gt;sk_err)</div><div class='del'>-		goto out_error;</div><div class='del'>-</div><div class='del'>-	if (kcm-&gt;seq_skb) {</div><div class='del'>-		/* Previously opened message */</div><div class='del'>-		head = kcm-&gt;seq_skb;</div><div class='del'>-		skb = kcm_tx_msg(head)-&gt;last_skb;</div><div class='del'>-		i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-</div><div class='del'>-		if (skb_can_coalesce(skb, i, page, offset)) {</div><div class='del'>-			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[i - 1], size);</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_SHARED_FRAG;</div><div class='del'>-			goto coalesced;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i &gt;= MAX_SKB_FRAGS) {</div><div class='del'>-			struct sk_buff *tskb;</div><div class='del'>-</div><div class='del'>-			tskb = alloc_skb(0, sk-&gt;sk_allocation);</div><div class='del'>-			while (!tskb) {</div><div class='del'>-				kcm_push(kcm);</div><div class='del'>-				err = sk_stream_wait_memory(sk, &amp;timeo);</div><div class='del'>-				if (err)</div><div class='del'>-					goto out_error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (head == skb)</div><div class='del'>-				skb_shinfo(head)-&gt;frag_list = tskb;</div><div class='del'>-			else</div><div class='del'>-				skb-&gt;next = tskb;</div><div class='del'>-</div><div class='del'>-			skb = tskb;</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-			i = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Call the sk_stream functions to manage the sndbuf mem. */</div><div class='del'>-		if (!sk_stream_memory_free(sk)) {</div><div class='del'>-			kcm_push(kcm);</div><div class='del'>-			set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='del'>-			err = sk_stream_wait_memory(sk, &amp;timeo);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		head = alloc_skb(0, sk-&gt;sk_allocation);</div><div class='del'>-		while (!head) {</div><div class='del'>-			kcm_push(kcm);</div><div class='del'>-			err = sk_stream_wait_memory(sk, &amp;timeo);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb = head;</div><div class='del'>-		i = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_page(page);</div><div class='del'>-	skb_fill_page_desc(skb, i, page, offset, size);</div><div class='del'>-	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_SHARED_FRAG;</div><div class='del'>-</div><div class='del'>-coalesced:</div><div class='del'>-	skb-&gt;len += size;</div><div class='del'>-	skb-&gt;data_len += size;</div><div class='del'>-	skb-&gt;truesize += size;</div><div class='del'>-	sk-&gt;sk_wmem_queued += size;</div><div class='del'>-	sk_mem_charge(sk, size);</div><div class='del'>-</div><div class='del'>-	if (head != skb) {</div><div class='del'>-		head-&gt;len += size;</div><div class='del'>-		head-&gt;data_len += size;</div><div class='del'>-		head-&gt;truesize += size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eor) {</div><div class='del'>-		bool not_busy = skb_queue_empty(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-</div><div class='del'>-		/* Message complete, queue it on send buffer */</div><div class='del'>-		__skb_queue_tail(&amp;sk-&gt;sk_write_queue, head);</div><div class='del'>-		kcm-&gt;seq_skb = NULL;</div><div class='del'>-		KCM_STATS_INCR(kcm-&gt;stats.tx_msgs);</div><div class='del'>-</div><div class='del'>-		if (flags &amp; MSG_BATCH) {</div><div class='del'>-			kcm-&gt;tx_wait_more = true;</div><div class='del'>-		} else if (kcm-&gt;tx_wait_more || not_busy) {</div><div class='del'>-			err = kcm_write_msgs(kcm);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				/* We got a hard error in write_msgs but have</div><div class='del'>-				 * already queued this message. Report an error</div><div class='del'>-				 * in the socket, but don't affect return value</div><div class='del'>-				 * from sendmsg</div><div class='del'>-				 */</div><div class='del'>-				pr_warn("KCM: Hard failure on kcm_write_msgs\n");</div><div class='del'>-				report_csk_error(&amp;kcm-&gt;sk, -err);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Message not complete, save state */</div><div class='del'>-		kcm-&gt;seq_skb = head;</div><div class='del'>-		kcm_tx_msg(head)-&gt;last_skb = skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	KCM_STATS_ADD(kcm-&gt;stats.tx_bytes, size);</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return size;</div><div class='del'>-</div><div class='del'>-out_error:</div><div class='del'>-	kcm_push(kcm);</div><div class='del'>-</div><div class='del'>-	err = sk_stream_error(sk, flags, err);</div><div class='del'>-</div><div class='del'>-	/* make sure we wake any epoll edge trigger waiter */</div><div class='del'>-	if (unlikely(skb_queue_len(&amp;sk-&gt;sk_write_queue) == 0 &amp;&amp; err == -EAGAIN))</div><div class='del'>-		sk-&gt;sk_write_space(sk);</div><div class='del'>-</div><div class='del'>-	release_sock(sk);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -907,6 +756,7 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 		  !(msg-&gt;msg_flags &amp; MSG_MORE) : !!(msg-&gt;msg_flags &amp; MSG_EOR);</div><div class='ctx'> 	int err = -EPIPE;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;kcm-&gt;tx_mutex);</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Per tcp_sendmsg this should be in poll */</div><div class='hunk'>@@ -981,29 +831,51 @@ start:</div><div class='ctx'> 			merge = false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		copy = min_t(int, msg_data_left(msg),</div><div class='del'>-			     pfrag-&gt;size - pfrag-&gt;offset);</div><div class='add'>+		if (msg-&gt;msg_flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+			copy = msg_data_left(msg);</div><div class='add'>+			if (!sk_wmem_schedule(sk, copy))</div><div class='add'>+				goto wait_for_memory;</div><div class='ctx'> </div><div class='del'>-		if (!sk_wmem_schedule(sk, copy))</div><div class='del'>-			goto wait_for_memory;</div><div class='add'>+			err = skb_splice_from_iter(skb, &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				if (err == -EMSGSIZE)</div><div class='add'>+					goto wait_for_memory;</div><div class='add'>+				goto out_error;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		err = skb_copy_to_page_nocache(sk, &amp;msg-&gt;msg_iter, skb,</div><div class='del'>-					       pfrag-&gt;page,</div><div class='del'>-					       pfrag-&gt;offset,</div><div class='del'>-					       copy);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_error;</div><div class='add'>+			copy = err;</div><div class='add'>+			skb_shinfo(skb)-&gt;flags |= SKBFL_SHARED_FRAG;</div><div class='add'>+			sk_wmem_queued_add(sk, copy);</div><div class='add'>+			sk_mem_charge(sk, copy);</div><div class='ctx'> </div><div class='del'>-		/* Update the skb. */</div><div class='del'>-		if (merge) {</div><div class='del'>-			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[i - 1], copy);</div><div class='add'>+			if (head != skb)</div><div class='add'>+				head-&gt;truesize += copy;</div><div class='ctx'> 		} else {</div><div class='del'>-			skb_fill_page_desc(skb, i, pfrag-&gt;page,</div><div class='del'>-					   pfrag-&gt;offset, copy);</div><div class='del'>-			get_page(pfrag-&gt;page);</div><div class='add'>+			copy = min_t(int, msg_data_left(msg),</div><div class='add'>+				     pfrag-&gt;size - pfrag-&gt;offset);</div><div class='add'>+			if (!sk_wmem_schedule(sk, copy))</div><div class='add'>+				goto wait_for_memory;</div><div class='add'>+</div><div class='add'>+			err = skb_copy_to_page_nocache(sk, &amp;msg-&gt;msg_iter, skb,</div><div class='add'>+						       pfrag-&gt;page,</div><div class='add'>+						       pfrag-&gt;offset,</div><div class='add'>+						       copy);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_error;</div><div class='add'>+</div><div class='add'>+			/* Update the skb. */</div><div class='add'>+			if (merge) {</div><div class='add'>+				skb_frag_size_add(</div><div class='add'>+					&amp;skb_shinfo(skb)-&gt;frags[i - 1], copy);</div><div class='add'>+			} else {</div><div class='add'>+				skb_fill_page_desc(skb, i, pfrag-&gt;page,</div><div class='add'>+						   pfrag-&gt;offset, copy);</div><div class='add'>+				get_page(pfrag-&gt;page);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pfrag-&gt;offset += copy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pfrag-&gt;offset += copy;</div><div class='ctx'> 		copied += copy;</div><div class='ctx'> 		if (head != skb) {</div><div class='ctx'> 			head-&gt;len += copy;</div><div class='hunk'>@@ -1055,20 +927,24 @@ partial_message:</div><div class='ctx'> 	KCM_STATS_ADD(kcm-&gt;stats.tx_bytes, copied);</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	mutex_unlock(&amp;kcm-&gt;tx_mutex);</div><div class='ctx'> 	return copied;</div><div class='ctx'> </div><div class='ctx'> out_error:</div><div class='ctx'> 	kcm_push(kcm);</div><div class='ctx'> </div><div class='del'>-	if (copied &amp;&amp; sock-&gt;type == SOCK_SEQPACKET) {</div><div class='add'>+	if (sock-&gt;type == SOCK_SEQPACKET) {</div><div class='ctx'> 		/* Wrote some bytes before encountering an</div><div class='ctx'> 		 * error, return partial success.</div><div class='ctx'> 		 */</div><div class='del'>-		goto partial_message;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (head != kcm-&gt;seq_skb)</div><div class='add'>+		if (copied)</div><div class='add'>+			goto partial_message;</div><div class='add'>+		if (head != kcm-&gt;seq_skb)</div><div class='add'>+			kfree_skb(head);</div><div class='add'>+	} else {</div><div class='ctx'> 		kfree_skb(head);</div><div class='add'>+		kcm-&gt;seq_skb = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = sk_stream_error(sk, msg-&gt;msg_flags, err);</div><div class='ctx'> </div><div class='hunk'>@@ -1077,38 +953,21 @@ out_error:</div><div class='ctx'> 		sk-&gt;sk_write_space(sk);</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='add'>+	mutex_unlock(&amp;kcm-&gt;tx_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *kcm_wait_data(struct sock *sk, int flags,</div><div class='del'>-				     long timeo, int *err)</div><div class='add'>+static void kcm_splice_eof(struct socket *sock)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while (!(skb = skb_peek(&amp;sk-&gt;sk_receive_queue))) {</div><div class='del'>-		if (sk-&gt;sk_err) {</div><div class='del'>-			*err = sock_error(sk);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sock_flag(sk, SOCK_DONE))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; MSG_DONTWAIT) || !timeo) {</div><div class='del'>-			*err = -EAGAIN;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+	struct kcm_sock *kcm = kcm_sk(sk);</div><div class='ctx'> </div><div class='del'>-		/* Handle signals */</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			*err = sock_intr_errno(timeo);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (skb_queue_empty_lockless(&amp;sk-&gt;sk_write_queue))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return skb;</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	kcm_write_msgs(kcm);</div><div class='add'>+	release_sock(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kcm_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='hunk'>@@ -1117,16 +976,11 @@ static int kcm_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct kcm_sock *kcm = kcm_sk(sk);</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	long timeo;</div><div class='ctx'> 	struct strp_msg *stm;</div><div class='ctx'> 	int copied = 0;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='del'>-</div><div class='del'>-	lock_sock(sk);</div><div class='del'>-</div><div class='del'>-	skb = kcm_wait_data(sk, flags, timeo, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1157,14 +1011,11 @@ msg_finished:</div><div class='ctx'> 			/* Finished with message */</div><div class='ctx'> 			msg-&gt;msg_flags |= MSG_EOR;</div><div class='ctx'> 			KCM_STATS_INCR(kcm-&gt;stats.rx_msgs);</div><div class='del'>-			skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='del'>-			kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='add'>+	skb_free_datagram(sk, skb);</div><div class='ctx'> 	return copied ? : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1174,19 +1025,19 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos,</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct kcm_sock *kcm = kcm_sk(sk);</div><div class='del'>-	long timeo;</div><div class='ctx'> 	struct strp_msg *stm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	ssize_t copied;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	/* Only support splice for SOCKSEQPACKET */</div><div class='del'>-</div><div class='del'>-	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+	if (sock-&gt;file-&gt;f_flags &amp; O_NONBLOCK || flags &amp; SPLICE_F_NONBLOCK)</div><div class='add'>+		flags = MSG_DONTWAIT;</div><div class='add'>+	else</div><div class='add'>+		flags = 0;</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='add'>+	/* Only support splice for SOCKSEQPACKET */</div><div class='ctx'> </div><div class='del'>-	skb = kcm_wait_data(sk, flags, timeo, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -1214,13 +1065,11 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos,</div><div class='ctx'> 	 * finish reading the message.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='add'>+	skb_free_datagram(sk, skb);</div><div class='ctx'> 	return copied;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	release_sock(sk);</div><div class='del'>-</div><div class='add'>+	skb_free_datagram(sk, skb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1240,7 +1089,8 @@ static void kcm_recv_disable(struct kcm_sock *kcm)</div><div class='ctx'> 	if (!kcm-&gt;rx_psock) {</div><div class='ctx'> 		if (kcm-&gt;rx_wait) {</div><div class='ctx'> 			list_del(&amp;kcm-&gt;wait_rx_list);</div><div class='del'>-			kcm-&gt;rx_wait = false;</div><div class='add'>+			/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+			WRITE_ONCE(kcm-&gt;rx_wait, false);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		requeue_rx_msgs(mux, &amp;kcm-&gt;sk.sk_receive_queue);</div><div class='hunk'>@@ -1266,7 +1116,7 @@ static void kcm_recv_enable(struct kcm_sock *kcm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kcm_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			  char __user *optval, unsigned int optlen)</div><div class='add'>+			  sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct kcm_sock *kcm = kcm_sk(sock-&gt;sk);</div><div class='ctx'> 	int val, valbool;</div><div class='hunk'>@@ -1278,8 +1128,8 @@ static int kcm_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(int)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	valbool = val ? 1 : 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1311,10 +1161,11 @@ static int kcm_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (get_user(len, optlen))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	len = min_t(unsigned int, len, sizeof(int));</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	len = min_t(unsigned int, len, sizeof(int));</div><div class='add'>+</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case KCM_RECV_DISABLE:</div><div class='ctx'> 		val = kcm-&gt;rx_disabled;</div><div class='hunk'>@@ -1361,6 +1212,7 @@ static void init_kcm_sock(struct kcm_sock *kcm, struct kcm_mux *mux)</div><div class='ctx'> 	spin_unlock_bh(&amp;mux-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;kcm-&gt;tx_work, kcm_tx_work);</div><div class='add'>+	mutex_init(&amp;kcm-&gt;tx_mutex);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;mux-&gt;rx_lock);</div><div class='ctx'> 	kcm_rcv_ready(kcm);</div><div class='hunk'>@@ -1412,26 +1264,25 @@ static int kcm_attach(struct socket *sock, struct socket *csock,</div><div class='ctx'> 	psock-&gt;sk = csk;</div><div class='ctx'> 	psock-&gt;bpf_prog = prog;</div><div class='ctx'> </div><div class='del'>-	err = strp_init(&amp;psock-&gt;strp, csk, &amp;cb);</div><div class='del'>-	if (err) {</div><div class='del'>-		kmem_cache_free(kcm_psockp, psock);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	write_lock_bh(&amp;csk-&gt;sk_callback_lock);</div><div class='ctx'> </div><div class='del'>-	/* Check if sk_user_data is aready by KCM or someone else.</div><div class='add'>+	/* Check if sk_user_data is already by KCM or someone else.</div><div class='ctx'> 	 * Must be done under lock to prevent race conditions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (csk-&gt;sk_user_data) {</div><div class='ctx'> 		write_unlock_bh(&amp;csk-&gt;sk_callback_lock);</div><div class='del'>-		strp_stop(&amp;psock-&gt;strp);</div><div class='del'>-		strp_done(&amp;psock-&gt;strp);</div><div class='ctx'> 		kmem_cache_free(kcm_psockp, psock);</div><div class='ctx'> 		err = -EALREADY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = strp_init(&amp;psock-&gt;strp, csk, &amp;cb);</div><div class='add'>+	if (err) {</div><div class='add'>+		write_unlock_bh(&amp;csk-&gt;sk_callback_lock);</div><div class='add'>+		kmem_cache_free(kcm_psockp, psock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	psock-&gt;save_data_ready = csk-&gt;sk_data_ready;</div><div class='ctx'> 	psock-&gt;save_write_space = csk-&gt;sk_write_space;</div><div class='ctx'> 	psock-&gt;save_state_change = csk-&gt;sk_state_change;</div><div class='hunk'>@@ -1497,7 +1348,7 @@ static int kcm_attach_ioctl(struct socket *sock, struct kcm_attach *info)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='del'>-	fput(csock-&gt;file);</div><div class='add'>+	sockfd_put(csock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1645,7 +1496,7 @@ static int kcm_unattach_ioctl(struct socket *sock, struct kcm_unattach *info)</div><div class='ctx'> 	spin_unlock_bh(&amp;mux-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	fput(csock-&gt;file);</div><div class='add'>+	sockfd_put(csock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1709,24 +1560,16 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	}</div><div class='ctx'> 	case SIOCKCMCLONE: {</div><div class='ctx'> 		struct kcm_clone info;</div><div class='del'>-		struct file *file;</div><div class='ctx'> </div><div class='del'>-		info.fd = get_unused_fd_flags(0);</div><div class='del'>-		if (unlikely(info.fd &lt; 0))</div><div class='del'>-			return info.fd;</div><div class='add'>+		FD_PREPARE(fdf, 0, kcm_clone(sock));</div><div class='add'>+		if (fdf.err)</div><div class='add'>+			return fdf.err;</div><div class='ctx'> </div><div class='del'>-		file = kcm_clone(sock);</div><div class='del'>-		if (IS_ERR(file)) {</div><div class='del'>-			put_unused_fd(info.fd);</div><div class='del'>-			return PTR_ERR(file);</div><div class='del'>-		}</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;info,</div><div class='del'>-				 sizeof(info))) {</div><div class='del'>-			put_unused_fd(info.fd);</div><div class='del'>-			fput(file);</div><div class='add'>+		info.fd = fd_prepare_fd(fdf);</div><div class='add'>+		if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		fd_install(info.fd, file);</div><div class='add'>+</div><div class='add'>+		fd_publish(fdf);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1738,14 +1581,6 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_mux(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct kcm_mux *mux = container_of(rcu,</div><div class='del'>-	    struct kcm_mux, rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(kcm_muxp, mux);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void release_mux(struct kcm_mux *mux)</div><div class='ctx'> {</div><div class='ctx'> 	struct kcm_net *knet = mux-&gt;knet;</div><div class='hunk'>@@ -1773,7 +1608,7 @@ static void release_mux(struct kcm_mux *mux)</div><div class='ctx'> 	knet-&gt;count--;</div><div class='ctx'> 	mutex_unlock(&amp;knet-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;mux-&gt;rcu, free_mux);</div><div class='add'>+	kfree_rcu(mux, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kcm_done(struct kcm_sock *kcm)</div><div class='hunk'>@@ -1794,7 +1629,8 @@ static void kcm_done(struct kcm_sock *kcm)</div><div class='ctx'> </div><div class='ctx'> 	if (kcm-&gt;rx_wait) {</div><div class='ctx'> 		list_del(&amp;kcm-&gt;wait_rx_list);</div><div class='del'>-		kcm-&gt;rx_wait = false;</div><div class='add'>+		/* paired with lockless reads in kcm_rfree() */</div><div class='add'>+		WRITE_ONCE(kcm-&gt;rx_wait, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Move any pending receive messages to other kcm sockets */</div><div class='ctx'> 	requeue_rx_msgs(mux, &amp;sk-&gt;sk_receive_queue);</div><div class='hunk'>@@ -1839,22 +1675,16 @@ static int kcm_release(struct socket *sock)</div><div class='ctx'> 	kcm = kcm_sk(sk);</div><div class='ctx'> 	mux = kcm-&gt;mux;</div><div class='ctx'> </div><div class='add'>+	lock_sock(sk);</div><div class='ctx'> 	sock_orphan(sk);</div><div class='ctx'> 	kfree_skb(kcm-&gt;seq_skb);</div><div class='ctx'> </div><div class='del'>-	lock_sock(sk);</div><div class='ctx'> 	/* Purge queue under lock to avoid race condition with tx_work trying</div><div class='ctx'> 	 * to act when queue is nonempty. If tx_work runs after this point</div><div class='ctx'> 	 * it will just return.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='ctx'> </div><div class='del'>-	/* Set tx_stopped. This is checked when psock is bound to a kcm and we</div><div class='del'>-	 * get a writespace callback. This prevents further work being queued</div><div class='del'>-	 * from the callback (unbinding the psock occurs after canceling work.</div><div class='del'>-	 */</div><div class='del'>-	kcm-&gt;tx_stopped = 1;</div><div class='del'>-</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;mux-&gt;lock);</div><div class='hunk'>@@ -1870,7 +1700,7 @@ static int kcm_release(struct socket *sock)</div><div class='ctx'> 	/* Cancel work. After this point there should be no outside references</div><div class='ctx'> 	 * to the kcm socket.</div><div class='ctx'> 	 */</div><div class='del'>-	cancel_work_sync(&amp;kcm-&gt;tx_work);</div><div class='add'>+	disable_work_sync(&amp;kcm-&gt;tx_work);</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	psock = kcm-&gt;tx_psock;</div><div class='hunk'>@@ -1912,7 +1742,7 @@ static const struct proto_ops kcm_dgram_ops = {</div><div class='ctx'> 	.sendmsg =	kcm_sendmsg,</div><div class='ctx'> 	.recvmsg =	kcm_recvmsg,</div><div class='ctx'> 	.mmap =		sock_no_mmap,</div><div class='del'>-	.sendpage =	kcm_sendpage,</div><div class='add'>+	.splice_eof =	kcm_splice_eof,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct proto_ops kcm_seqpacket_ops = {</div><div class='hunk'>@@ -1933,7 +1763,7 @@ static const struct proto_ops kcm_seqpacket_ops = {</div><div class='ctx'> 	.sendmsg =	kcm_sendmsg,</div><div class='ctx'> 	.recvmsg =	kcm_recvmsg,</div><div class='ctx'> 	.mmap =		sock_no_mmap,</div><div class='del'>-	.sendpage =	kcm_sendpage,</div><div class='add'>+	.splice_eof =	kcm_splice_eof,</div><div class='ctx'> 	.splice_read =	kcm_splice_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2021,6 +1851,8 @@ static __net_exit void kcm_exit_net(struct net *net)</div><div class='ctx'> 	 * that all multiplexors and psocks have been destroyed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;knet-&gt;mux_list));</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;knet-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations kcm_net_ops = {</div><div class='hunk'>@@ -2034,15 +1866,11 @@ static int __init kcm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	kcm_muxp = kmem_cache_create("kcm_mux_cache",</div><div class='del'>-				     sizeof(struct kcm_mux), 0,</div><div class='del'>-				     SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);</div><div class='add'>+	kcm_muxp = KMEM_CACHE(kcm_mux, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!kcm_muxp)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	kcm_psockp = kmem_cache_create("kcm_psock_cache",</div><div class='del'>-				       sizeof(struct kcm_psock), 0,</div><div class='del'>-					SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);</div><div class='add'>+	kcm_psockp = KMEM_CACHE(kcm_psock, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!kcm_psockp)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -2054,14 +1882,14 @@ static int __init kcm_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	err = sock_register(&amp;kcm_family_ops);</div><div class='del'>-	if (err)</div><div class='del'>-		goto sock_register_fail;</div><div class='del'>-</div><div class='ctx'> 	err = register_pernet_device(&amp;kcm_net_ops);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto net_ops_fail;</div><div class='ctx'> </div><div class='add'>+	err = sock_register(&amp;kcm_family_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto sock_register_fail;</div><div class='add'>+</div><div class='ctx'> 	err = kcm_proc_init();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto proc_init_fail;</div><div class='hunk'>@@ -2069,12 +1897,12 @@ static int __init kcm_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> proc_init_fail:</div><div class='del'>-	unregister_pernet_device(&amp;kcm_net_ops);</div><div class='del'>-</div><div class='del'>-net_ops_fail:</div><div class='ctx'> 	sock_unregister(PF_KCM);</div><div class='ctx'> </div><div class='ctx'> sock_register_fail:</div><div class='add'>+	unregister_pernet_device(&amp;kcm_net_ops);</div><div class='add'>+</div><div class='add'>+net_ops_fail:</div><div class='ctx'> 	proto_unregister(&amp;kcm_proto);</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='hunk'>@@ -2090,8 +1918,8 @@ fail:</div><div class='ctx'> static void __exit kcm_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	kcm_proc_exit();</div><div class='del'>-	unregister_pernet_device(&amp;kcm_net_ops);</div><div class='ctx'> 	sock_unregister(PF_KCM);</div><div class='add'>+	unregister_pernet_device(&amp;kcm_net_ops);</div><div class='ctx'> 	proto_unregister(&amp;kcm_proto);</div><div class='ctx'> 	destroy_workqueue(kcm_wq);</div><div class='ctx'> </div><div class='hunk'>@@ -2103,4 +1931,5 @@ module_init(kcm_init);</div><div class='ctx'> module_exit(kcm_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("KCM (Kernel Connection Multiplexor) sockets");</div><div class='ctx'> MODULE_ALIAS_NETPROTO(PF_KCM);</div><div class='head'>diff --git a/net/key/Makefile b/net/key/Makefile<br/>index 857608042475..ed779c22fbbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/key/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/key/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/key/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/key/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the key AF.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/key/af_key.c b/net/key/af_key.c<br/>index 9d61266526e7..571200433aa9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/key/af_key.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/key/af_key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/key/af_key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/key/af_key.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/key/af_key.c	An implementation of PF_KEYv2 sockets.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * Authors:	Maxim Giryaev	&lt;gem@asplinux.ru&gt;</div><div class='ctx'>  *		David S. Miller	&lt;davem@redhat.com&gt;</div><div class='ctx'>  *		Alexey Kuznetsov &lt;kuznet@ms2.inr.ac.ru&gt;</div><div class='hunk'>@@ -145,7 +141,6 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct pfkey_sock *pfk;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -154,10 +149,9 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	if (protocol != PF_KEY_V2)</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	err = -ENOMEM;</div><div class='ctx'> 	sk = sk_alloc(net, PF_KEY, GFP_KERNEL, &amp;key_proto, kern);</div><div class='ctx'> 	if (sk == NULL)</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	pfk = pfkey_sk(sk);</div><div class='ctx'> 	mutex_init(&amp;pfk-&gt;dump_lock);</div><div class='hunk'>@@ -173,8 +167,6 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,</div><div class='ctx'> 	pfkey_insert(sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pfkey_release(struct socket *sock)</div><div class='hunk'>@@ -196,30 +188,22 @@ static int pfkey_release(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,</div><div class='del'>-			       gfp_t allocation, struct sock *sk)</div><div class='add'>+static int pfkey_broadcast_one(struct sk_buff *skb, gfp_t allocation,</div><div class='add'>+			       struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	sock_hold(sk);</div><div class='del'>-	if (*skb2 == NULL) {</div><div class='del'>-		if (refcount_read(&amp;skb-&gt;users) != 1) {</div><div class='del'>-			*skb2 = skb_clone(skb, allocation);</div><div class='del'>-		} else {</div><div class='del'>-			*skb2 = skb;</div><div class='del'>-			refcount_inc(&amp;skb-&gt;users);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (*skb2 != NULL) {</div><div class='del'>-		if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &lt;= sk-&gt;sk_rcvbuf) {</div><div class='del'>-			skb_set_owner_r(*skb2, sk);</div><div class='del'>-			skb_queue_tail(&amp;sk-&gt;sk_receive_queue, *skb2);</div><div class='del'>-			sk-&gt;sk_data_ready(sk);</div><div class='del'>-			*skb2 = NULL;</div><div class='del'>-			err = 0;</div><div class='del'>-		}</div><div class='add'>+	if (atomic_read(&amp;sk-&gt;sk_rmem_alloc) &gt; sk-&gt;sk_rcvbuf)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(skb, allocation);</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_set_owner_r(skb, sk);</div><div class='add'>+		skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+		sk-&gt;sk_data_ready(sk);</div><div class='add'>+		err = 0;</div><div class='ctx'> 	}</div><div class='del'>-	sock_put(sk);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +218,6 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,</div><div class='ctx'> {</div><div class='ctx'> 	struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);</div><div class='ctx'> 	struct sock *sk;</div><div class='del'>-	struct sk_buff *skb2 = NULL;</div><div class='ctx'> 	int err = -ESRCH;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX Do we need something like netlink_overrun?  I think</div><div class='hunk'>@@ -253,7 +236,7 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,</div><div class='ctx'> 		 * socket.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (pfk-&gt;promisc)</div><div class='del'>-			pfkey_broadcast_one(skb, &amp;skb2, GFP_ATOMIC, sk);</div><div class='add'>+			pfkey_broadcast_one(skb, GFP_ATOMIC, sk);</div><div class='ctx'> </div><div class='ctx'> 		/* the exact target will be processed later */</div><div class='ctx'> 		if (sk == one_sk)</div><div class='hunk'>@@ -268,7 +251,7 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err2 = pfkey_broadcast_one(skb, &amp;skb2, GFP_ATOMIC, sk);</div><div class='add'>+		err2 = pfkey_broadcast_one(skb, GFP_ATOMIC, sk);</div><div class='ctx'> </div><div class='ctx'> 		/* Error is cleared after successful sending to at least one</div><div class='ctx'> 		 * registered KM */</div><div class='hunk'>@@ -278,9 +261,8 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (one_sk != NULL)</div><div class='del'>-		err = pfkey_broadcast_one(skb, &amp;skb2, allocation, one_sk);</div><div class='add'>+		err = pfkey_broadcast_one(skb, allocation, one_sk);</div><div class='ctx'> </div><div class='del'>-	kfree_skb(skb2);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -942,8 +924,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,</div><div class='ctx'> 		pfkey_sockaddr_fill(&amp;x-&gt;props.saddr, 0,</div><div class='ctx'> 				    (struct sockaddr *) (addr + 1),</div><div class='ctx'> 				    x-&gt;props.family);</div><div class='del'>-	if (!addr-&gt;sadb_address_prefixlen)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(!addr-&gt;sadb_address_prefixlen);</div><div class='ctx'> </div><div class='ctx'> 	/* dst address */</div><div class='ctx'> 	addr = skb_put(skb, sizeof(struct sadb_address) + sockaddr_size);</div><div class='hunk'>@@ -958,8 +939,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,</div><div class='ctx'> 		pfkey_sockaddr_fill(&amp;x-&gt;id.daddr, 0,</div><div class='ctx'> 				    (struct sockaddr *) (addr + 1),</div><div class='ctx'> 				    x-&gt;props.family);</div><div class='del'>-	if (!addr-&gt;sadb_address_prefixlen)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(!addr-&gt;sadb_address_prefixlen);</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm_addr_equal(&amp;x-&gt;sel.saddr, &amp;x-&gt;props.saddr,</div><div class='ctx'> 			     x-&gt;props.family)) {</div><div class='hunk'>@@ -1281,7 +1261,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,</div><div class='ctx'> 		const struct sadb_x_nat_t_type* n_type;</div><div class='ctx'> 		struct xfrm_encap_tmpl *natt;</div><div class='ctx'> </div><div class='del'>-		x-&gt;encap = kmalloc(sizeof(*x-&gt;encap), GFP_KERNEL);</div><div class='add'>+		x-&gt;encap = kzalloc(sizeof(*x-&gt;encap), GFP_KERNEL);</div><div class='ctx'> 		if (!x-&gt;encap) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1301,7 +1281,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,</div><div class='ctx'> 				ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1];</div><div class='ctx'> 			natt-&gt;encap_dport = n_port-&gt;sadb_x_nat_t_port_port;</div><div class='ctx'> 		}</div><div class='del'>-		memset(&amp;natt-&gt;encap_oa, 0, sizeof(natt-&gt;encap_oa));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = xfrm_init_state(x);</div><div class='hunk'>@@ -1375,7 +1354,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;sadb_msg_seq) {</div><div class='del'>-		x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr-&gt;sadb_msg_seq);</div><div class='add'>+		x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr-&gt;sadb_msg_seq, UINT_MAX);</div><div class='ctx'> 		if (x &amp;&amp; !xfrm_addr_equal(&amp;x-&gt;id.daddr, xdaddr, family)) {</div><div class='ctx'> 			xfrm_state_put(x);</div><div class='ctx'> 			x = NULL;</div><div class='hunk'>@@ -1383,7 +1362,8 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!x)</div><div class='del'>-		x = xfrm_find_acq(net, &amp;dummy_mark, mode, reqid, 0, proto, xdaddr, xsaddr, 1, family);</div><div class='add'>+		x = xfrm_find_acq(net, &amp;dummy_mark, mode, reqid, 0, UINT_MAX,</div><div class='add'>+				  proto, xdaddr, xsaddr, 1, family);</div><div class='ctx'> </div><div class='ctx'> 	if (x == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -1397,13 +1377,13 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_</div><div class='ctx'> 		max_spi = range-&gt;sadb_spirange_max;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = verify_spi_info(x-&gt;id.proto, min_spi, max_spi);</div><div class='add'>+	err = verify_spi_info(x-&gt;id.proto, min_spi, max_spi, NULL);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		xfrm_state_put(x);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = xfrm_alloc_spi(x, min_spi, max_spi);</div><div class='add'>+	err = xfrm_alloc_spi(x, min_spi, max_spi, NULL);</div><div class='ctx'> 	resp_skb = err ? ERR_PTR(err) : pfkey_xfrm_state2msg(x);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(resp_skb)) {</div><div class='hunk'>@@ -1438,7 +1418,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, const struct sadb</div><div class='ctx'> 	if (hdr-&gt;sadb_msg_seq == 0 || hdr-&gt;sadb_msg_errno == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr-&gt;sadb_msg_seq);</div><div class='add'>+	x = xfrm_find_acq_byseq(net, DUMMY_MARK, hdr-&gt;sadb_msg_seq, UINT_MAX);</div><div class='ctx'> 	if (x == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1717,9 +1697,12 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sad</div><div class='ctx'> 		pfk-&gt;registered |= (1&lt;&lt;hdr-&gt;sadb_msg_satype);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;pfkey_mutex);</div><div class='ctx'> 	xfrm_probe_algs();</div><div class='ctx'> </div><div class='del'>-	supp_skb = compose_sadb_supported(hdr, GFP_KERNEL);</div><div class='add'>+	supp_skb = compose_sadb_supported(hdr, GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	mutex_unlock(&amp;pfkey_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (!supp_skb) {</div><div class='ctx'> 		if (hdr-&gt;sadb_msg_satype != SADB_SATYPE_UNSPEC)</div><div class='ctx'> 			pfk-&gt;registered &amp;= ~(1&lt;&lt;hdr-&gt;sadb_msg_satype);</div><div class='hunk'>@@ -1865,6 +1848,13 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms</div><div class='ctx'> 	if (ext_hdrs[SADB_X_EXT_FILTER - 1]) {</div><div class='ctx'> 		struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER - 1];</div><div class='ctx'> </div><div class='add'>+		if ((xfilter-&gt;sadb_x_filter_splen &gt;</div><div class='add'>+			(sizeof(xfrm_address_t) &lt;&lt; 3)) ||</div><div class='add'>+		    (xfilter-&gt;sadb_x_filter_dplen &gt;</div><div class='add'>+			(sizeof(xfrm_address_t) &lt;&lt; 3))) {</div><div class='add'>+			mutex_unlock(&amp;pfk-&gt;dump_lock);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		filter = kmalloc(sizeof(*filter), GFP_KERNEL);</div><div class='ctx'> 		if (filter == NULL) {</div><div class='ctx'> 			mutex_unlock(&amp;pfk-&gt;dump_lock);</div><div class='hunk'>@@ -1950,7 +1940,8 @@ static u32 gen_reqid(struct net *net)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)</div><div class='add'>+parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_policy *pol,</div><div class='add'>+		   struct sadb_x_ipsecrequest *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = xp_net(xp);</div><div class='ctx'> 	struct xfrm_tmpl *t = xp-&gt;xfrm_vec + xp-&gt;xfrm_nr;</div><div class='hunk'>@@ -1961,14 +1952,19 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;sadb_x_ipsecrequest_mode == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (!xfrm_id_proto_valid(rq-&gt;sadb_x_ipsecrequest_proto))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	t-&gt;id.proto = rq-&gt;sadb_x_ipsecrequest_proto; /* XXX check proto */</div><div class='add'>+	t-&gt;id.proto = rq-&gt;sadb_x_ipsecrequest_proto;</div><div class='ctx'> 	if ((mode = pfkey_mode_to_xfrm(rq-&gt;sadb_x_ipsecrequest_mode)) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	t-&gt;mode = mode;</div><div class='del'>-	if (rq-&gt;sadb_x_ipsecrequest_level == IPSEC_LEVEL_USE)</div><div class='add'>+	if (rq-&gt;sadb_x_ipsecrequest_level == IPSEC_LEVEL_USE) {</div><div class='add'>+		if ((mode == XFRM_MODE_TUNNEL || mode == XFRM_MODE_BEET) &amp;&amp;</div><div class='add'>+		    pol-&gt;sadb_x_policy_dir == IPSEC_DIR_OUTBOUND)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		t-&gt;optional = 1;</div><div class='del'>-	else if (rq-&gt;sadb_x_ipsecrequest_level == IPSEC_LEVEL_UNIQUE) {</div><div class='add'>+	} else if (rq-&gt;sadb_x_ipsecrequest_level == IPSEC_LEVEL_UNIQUE) {</div><div class='ctx'> 		t-&gt;reqid = rq-&gt;sadb_x_ipsecrequest_reqid;</div><div class='ctx'> 		if (t-&gt;reqid &gt; IPSEC_MANUAL_REQID_MAX)</div><div class='ctx'> 			t-&gt;reqid = 0;</div><div class='hunk'>@@ -2010,7 +2006,7 @@ parse_ipsecrequests(struct xfrm_policy *xp, struct sadb_x_policy *pol)</div><div class='ctx'> 		    rq-&gt;sadb_x_ipsecrequest_len &lt; sizeof(*rq))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if ((err = parse_ipsecrequest(xp, rq)) &lt; 0)</div><div class='add'>+		if ((err = parse_ipsecrequest(xp, pol, rq)) &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		len -= rq-&gt;sadb_x_ipsecrequest_len;</div><div class='ctx'> 		rq = (void*)((u8*)rq + rq-&gt;sadb_x_ipsecrequest_len);</div><div class='hunk'>@@ -2020,7 +2016,7 @@ parse_ipsecrequests(struct xfrm_policy *xp, struct sadb_x_policy *pol)</div><div class='ctx'> </div><div class='ctx'> static inline int pfkey_xfrm_policy2sec_ctx_size(const struct xfrm_policy *xp)</div><div class='ctx'> {</div><div class='del'>-  struct xfrm_sec_ctx *xfrm_ctx = xp-&gt;security;</div><div class='add'>+	struct xfrm_sec_ctx *xfrm_ctx = xp-&gt;security;</div><div class='ctx'> </div><div class='ctx'> 	if (xfrm_ctx) {</div><div class='ctx'> 		int len = sizeof(struct sadb_x_sec_ctx);</div><div class='hunk'>@@ -2414,7 +2410,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, const struct sa</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, 0, XFRM_POLICY_TYPE_MAIN,</div><div class='add'>+	xp = xfrm_policy_bysel_ctx(net, &amp;dummy_mark, 0, XFRM_POLICY_TYPE_MAIN,</div><div class='ctx'> 				   pol-&gt;sadb_x_policy_dir - 1, &amp;sel, pol_ctx,</div><div class='ctx'> 				   1, &amp;err);</div><div class='ctx'> 	security_xfrm_policy_free(pol_ctx);</div><div class='hunk'>@@ -2450,8 +2446,10 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, const struc</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = pfkey_xfrm_policy2msg(out_skb, xp, dir);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(out_skb);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	out_hdr = (struct sadb_msg *) out_skb-&gt;data;</div><div class='ctx'> 	out_hdr-&gt;sadb_msg_version = hdr-&gt;sadb_msg_version;</div><div class='hunk'>@@ -2632,7 +2630,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return xfrm_migrate(&amp;sel, dir, XFRM_POLICY_TYPE_MAIN, m, i,</div><div class='del'>-			    kma ? &amp;k : NULL, net, NULL);</div><div class='add'>+			    kma ? &amp;k : NULL, net, NULL, 0, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2663,7 +2661,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, const struct sadb_</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	delete = (hdr-&gt;sadb_msg_type == SADB_X_SPDDELETE2);</div><div class='del'>-	xp = xfrm_policy_byid(net, DUMMY_MARK, 0, XFRM_POLICY_TYPE_MAIN,</div><div class='add'>+	xp = xfrm_policy_byid(net, &amp;dummy_mark, 0, XFRM_POLICY_TYPE_MAIN,</div><div class='ctx'> 			      dir, pol-&gt;sadb_x_policy_id, delete, &amp;err);</div><div class='ctx'> 	if (xp == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -2702,8 +2700,10 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr)</div><div class='ctx'> 		return PTR_ERR(out_skb);</div><div class='ctx'> </div><div class='ctx'> 	err = pfkey_xfrm_policy2msg(out_skb, xp, dir);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree_skb(out_skb);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	out_hdr = (struct sadb_msg *) out_skb-&gt;data;</div><div class='ctx'> 	out_hdr-&gt;sadb_msg_version = pfk-&gt;dump.msg_version;</div><div class='hunk'>@@ -2833,6 +2833,10 @@ static int pfkey_process(struct sock *sk, struct sk_buff *skb, const struct sadb</div><div class='ctx'> 	void *ext_hdrs[SADB_EXT_MAX];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Non-zero return value of pfkey_broadcast() does not always signal</div><div class='add'>+	 * an error and even on an actual error we may still want to process</div><div class='add'>+	 * the message so rather ignore the return value.</div><div class='add'>+	 */</div><div class='ctx'> 	pfkey_broadcast(skb_clone(skb, GFP_KERNEL), GFP_KERNEL,</div><div class='ctx'> 			BROADCAST_PROMISC_ONLY, NULL, sock_net(sk));</div><div class='ctx'> </div><div class='hunk'>@@ -2905,7 +2909,7 @@ static int count_ah_combs(const struct xfrm_tmpl *t)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (!aalg-&gt;pfkey_supported)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (aalg_tmpl_set(t, aalg) &amp;&amp; aalg-&gt;available)</div><div class='add'>+		if (aalg_tmpl_set(t, aalg))</div><div class='ctx'> 			sz += sizeof(struct sadb_comb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return sz + sizeof(struct sadb_prop);</div><div class='hunk'>@@ -2923,7 +2927,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t)</div><div class='ctx'> 		if (!ealg-&gt;pfkey_supported)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!(ealg_tmpl_set(t, ealg) &amp;&amp; ealg-&gt;available))</div><div class='add'>+		if (!(ealg_tmpl_set(t, ealg)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		for (k = 1; ; k++) {</div><div class='hunk'>@@ -2934,16 +2938,17 @@ static int count_esp_combs(const struct xfrm_tmpl *t)</div><div class='ctx'> 			if (!aalg-&gt;pfkey_supported)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (aalg_tmpl_set(t, aalg) &amp;&amp; aalg-&gt;available)</div><div class='add'>+			if (aalg_tmpl_set(t, aalg))</div><div class='ctx'> 				sz += sizeof(struct sadb_comb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return sz + sizeof(struct sadb_prop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='add'>+static int dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct sadb_prop *p;</div><div class='add'>+	int sz = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	p = skb_put(skb, sizeof(struct sadb_prop));</div><div class='hunk'>@@ -2971,13 +2976,17 @@ static void dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='ctx'> 			c-&gt;sadb_comb_soft_addtime = 20*60*60;</div><div class='ctx'> 			c-&gt;sadb_comb_hard_usetime = 8*60*60;</div><div class='ctx'> 			c-&gt;sadb_comb_soft_usetime = 7*60*60;</div><div class='add'>+			sz += sizeof(*c);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return sz + sizeof(*p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='add'>+static int dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct sadb_prop *p;</div><div class='add'>+	int sz = 0;</div><div class='ctx'> 	int i, k;</div><div class='ctx'> </div><div class='ctx'> 	p = skb_put(skb, sizeof(struct sadb_prop));</div><div class='hunk'>@@ -3019,8 +3028,11 @@ static void dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t)</div><div class='ctx'> 			c-&gt;sadb_comb_soft_addtime = 20*60*60;</div><div class='ctx'> 			c-&gt;sadb_comb_hard_usetime = 8*60*60;</div><div class='ctx'> 			c-&gt;sadb_comb_soft_usetime = 7*60*60;</div><div class='add'>+			sz += sizeof(*c);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return sz + sizeof(*p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int key_notify_policy_expire(struct xfrm_policy *xp, const struct km_event *c)</div><div class='hunk'>@@ -3150,6 +3162,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct</div><div class='ctx'> 	struct sadb_x_sec_ctx *sec_ctx;</div><div class='ctx'> 	struct xfrm_sec_ctx *xfrm_ctx;</div><div class='ctx'> 	int ctx_size = 0;</div><div class='add'>+	int alg_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	sockaddr_size = pfkey_sockaddr_size(x-&gt;props.family);</div><div class='ctx'> 	if (!sockaddr_size)</div><div class='hunk'>@@ -3161,16 +3174,16 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct</div><div class='ctx'> 		sizeof(struct sadb_x_policy);</div><div class='ctx'> </div><div class='ctx'> 	if (x-&gt;id.proto == IPPROTO_AH)</div><div class='del'>-		size += count_ah_combs(t);</div><div class='add'>+		alg_size = count_ah_combs(t);</div><div class='ctx'> 	else if (x-&gt;id.proto == IPPROTO_ESP)</div><div class='del'>-		size += count_esp_combs(t);</div><div class='add'>+		alg_size = count_esp_combs(t);</div><div class='ctx'> </div><div class='ctx'> 	if ((xfrm_ctx = x-&gt;security)) {</div><div class='ctx'> 		ctx_size = PFKEY_ALIGN8(xfrm_ctx-&gt;ctx_len);</div><div class='ctx'> 		size +=  sizeof(struct sadb_x_sec_ctx) + ctx_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb =  alloc_skb(size + 16, GFP_ATOMIC);</div><div class='add'>+	skb =  alloc_skb(size + alg_size + 16, GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -3224,10 +3237,13 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct</div><div class='ctx'> 	pol-&gt;sadb_x_policy_priority = xp-&gt;priority;</div><div class='ctx'> </div><div class='ctx'> 	/* Set sadb_comb's. */</div><div class='add'>+	alg_size = 0;</div><div class='ctx'> 	if (x-&gt;id.proto == IPPROTO_AH)</div><div class='del'>-		dump_ah_combs(skb, t);</div><div class='add'>+		alg_size = dump_ah_combs(skb, t);</div><div class='ctx'> 	else if (x-&gt;id.proto == IPPROTO_ESP)</div><div class='del'>-		dump_esp_combs(skb, t);</div><div class='add'>+		alg_size = dump_esp_combs(skb, t);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;sadb_msg_len += alg_size / 8;</div><div class='ctx'> </div><div class='ctx'> 	/* security context */</div><div class='ctx'> 	if (xfrm_ctx) {</div><div class='hunk'>@@ -3382,7 +3398,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,</div><div class='ctx'> 	hdr-&gt;sadb_msg_len = size / sizeof(uint64_t);</div><div class='ctx'> 	hdr-&gt;sadb_msg_errno = 0;</div><div class='ctx'> 	hdr-&gt;sadb_msg_reserved = 0;</div><div class='del'>-	hdr-&gt;sadb_msg_seq = x-&gt;km.seq = get_acqseq();</div><div class='add'>+	hdr-&gt;sadb_msg_seq = x-&gt;km.seq;</div><div class='ctx'> 	hdr-&gt;sadb_msg_pid = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* SA */</div><div class='hunk'>@@ -3703,7 +3719,7 @@ static int pfkey_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (flags &amp; ~(MSG_PEEK|MSG_DONTWAIT|MSG_TRUNC|MSG_CMSG_COMPAT))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3718,7 +3734,7 @@ static int pfkey_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	sock_recv_ts_and_drops(msg, sk, skb);</div><div class='add'>+	sock_recv_cmsgs(msg, sk, skb);</div><div class='ctx'> </div><div class='ctx'> 	err = (flags &amp; MSG_TRUNC) ? skb-&gt;len : copied;</div><div class='ctx'> </div><div class='hunk'>@@ -3744,10 +3760,7 @@ static const struct proto_ops pfkey_ops = {</div><div class='ctx'> 	.ioctl		=	sock_no_ioctl,</div><div class='ctx'> 	.listen		=	sock_no_listen,</div><div class='ctx'> 	.shutdown	=	sock_no_shutdown,</div><div class='del'>-	.setsockopt	=	sock_no_setsockopt,</div><div class='del'>-	.getsockopt	=	sock_no_getsockopt,</div><div class='ctx'> 	.mmap		=	sock_no_mmap,</div><div class='del'>-	.sendpage	=	sock_no_sendpage,</div><div class='ctx'> </div><div class='ctx'> 	/* Now the operations that really occur. */</div><div class='ctx'> 	.release	=	pfkey_release,</div><div class='hunk'>@@ -3775,7 +3788,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)</div><div class='ctx'> 			       refcount_read(&amp;s-&gt;sk_refcnt),</div><div class='ctx'> 			       sk_rmem_alloc_get(s),</div><div class='ctx'> 			       sk_wmem_alloc_get(s),</div><div class='del'>-			       from_kuid_munged(seq_user_ns(f), sock_i_uid(s)),</div><div class='add'>+			       from_kuid_munged(seq_user_ns(f), sk_uid(s)),</div><div class='ctx'> 			       sock_i_ino(s)</div><div class='ctx'> 			       );</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3890,6 +3903,8 @@ static int __init ipsec_pfkey_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = proto_register(&amp;key_proto, 0);</div><div class='ctx'> </div><div class='add'>+	pr_warn_once("PFKEY is deprecated and scheduled to be removed in 2027, "</div><div class='add'>+	             "please contact the netdev mailing list\n");</div><div class='ctx'> 	if (err != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3899,14 +3914,10 @@ static int __init ipsec_pfkey_init(void)</div><div class='ctx'> 	err = sock_register(&amp;pfkey_family_ops);</div><div class='ctx'> 	if (err != 0)</div><div class='ctx'> 		goto out_unregister_pernet;</div><div class='del'>-	err = xfrm_register_km(&amp;pfkeyv2_mgr);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto out_sock_unregister;</div><div class='add'>+	xfrm_register_km(&amp;pfkeyv2_mgr);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-out_sock_unregister:</div><div class='del'>-	sock_unregister(PF_KEY);</div><div class='ctx'> out_unregister_pernet:</div><div class='ctx'> 	unregister_pernet_subsys(&amp;pfkey_net_ops);</div><div class='ctx'> out_unregister_key_proto:</div><div class='hunk'>@@ -3916,5 +3927,6 @@ out_unregister_key_proto:</div><div class='ctx'> </div><div class='ctx'> module_init(ipsec_pfkey_init);</div><div class='ctx'> module_exit(ipsec_pfkey_exit);</div><div class='add'>+MODULE_DESCRIPTION("PF_KEY socket helpers");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_NETPROTO(PF_KEY);</div><div class='head'>diff --git a/net/l2tp/Kconfig b/net/l2tp/Kconfig<br/>index 378c73b26093..b7856748e960 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Layer Two Tunneling Protocol (L2TP)</div><div class='ctx'> #</div><div class='hunk'>@@ -7,7 +8,7 @@ menuconfig L2TP</div><div class='ctx'> 	depends on (IPV6 || IPV6=n)</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select NET_UDP_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Layer Two Tunneling Protocol</div><div class='ctx'> </div><div class='ctx'> 	  From RFC 2661 &lt;http://www.ietf.org/rfc/rfc2661.txt&gt;.</div><div class='head'>diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile<br/>index 399a7e5db2f4..cf8f27071d3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/Makefile</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_L2TP) += l2tp_core.o</div><div class='ctx'> </div><div class='add'>+CFLAGS_l2tp_core.o += -I$(src)</div><div class='add'>+</div><div class='ctx'> # Build l2tp as modules if L2TP is M</div><div class='ctx'> obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_PPPOL2TP)) += l2tp_ppp.o</div><div class='ctx'> obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_IP)) += l2tp_ip.o</div><div class='head'>diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c<br/>index 82cdf9020b53..687c1366a4d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_core.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * L2TP core.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* L2TP core.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008,2009,2010 Katalix Systems Ltd</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,10 +12,6 @@</div><div class='ctx'>  *		Michal Ostrowski &lt;mostrows@speakeasy.net&gt;</div><div class='ctx'>  *		Arnaldo Carvalho de Melo &lt;acme@xconectiva.com.br&gt;</div><div class='ctx'>  *		David S. Miller (davem@redhat.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -43,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/l2tp.h&gt;</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='hunk'>@@ -66,6 +61,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "l2tp_core.h"</div><div class='ctx'> </div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='ctx'> #define L2TP_DRV_VERSION	"V2.0"</div><div class='ctx'> </div><div class='ctx'> /* L2TP header constants */</div><div class='hunk'>@@ -83,12 +81,16 @@</div><div class='ctx'> #define L2TP_SLFLAG_S	   0x40000000</div><div class='ctx'> #define L2TP_SL_SEQ_MASK   0x00ffffff</div><div class='ctx'> </div><div class='del'>-#define L2TP_HDR_SIZE_SEQ		10</div><div class='del'>-#define L2TP_HDR_SIZE_NOSEQ		6</div><div class='add'>+#define L2TP_HDR_SIZE_MAX		14</div><div class='ctx'> </div><div class='ctx'> /* Default trace flags */</div><div class='ctx'> #define L2TP_DEFAULT_DEBUG_FLAGS	0</div><div class='ctx'> </div><div class='add'>+#define L2TP_DEPTH_NESTING		2</div><div class='add'>+#if L2TP_DEPTH_NESTING == SINGLE_DEPTH_NESTING</div><div class='add'>+#error "L2TP requires its own lockdep subclass"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Private data stored for received packets in the skb.</div><div class='ctx'>  */</div><div class='ctx'> struct l2tp_skb_cb {</div><div class='hunk'>@@ -98,19 +100,33 @@ struct l2tp_skb_cb {</div><div class='ctx'> 	unsigned long		expires;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define L2TP_SKB_CB(skb)	((struct l2tp_skb_cb *) &amp;skb-&gt;cb[sizeof(struct inet_skb_parm)])</div><div class='add'>+#define L2TP_SKB_CB(skb)	((struct l2tp_skb_cb *)&amp;(skb)-&gt;cb[sizeof(struct inet_skb_parm)])</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *l2tp_wq;</div><div class='ctx'> </div><div class='ctx'> /* per-net private data for this module */</div><div class='ctx'> static unsigned int l2tp_net_id;</div><div class='ctx'> struct l2tp_net {</div><div class='del'>-	struct list_head l2tp_tunnel_list;</div><div class='del'>-	spinlock_t l2tp_tunnel_list_lock;</div><div class='del'>-	struct hlist_head l2tp_session_hlist[L2TP_HASH_SIZE_2];</div><div class='del'>-	spinlock_t l2tp_session_hlist_lock;</div><div class='add'>+	/* Lock for write access to l2tp_tunnel_idr */</div><div class='add'>+	spinlock_t l2tp_tunnel_idr_lock;</div><div class='add'>+	struct idr l2tp_tunnel_idr;</div><div class='add'>+	/* Lock for write access to l2tp_v[23]_session_idr/htable */</div><div class='add'>+	spinlock_t l2tp_session_idr_lock;</div><div class='add'>+	struct idr l2tp_v2_session_idr;</div><div class='add'>+	struct idr l2tp_v3_session_idr;</div><div class='add'>+	struct hlist_head l2tp_v3_session_htable[16];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u32 l2tp_v2_session_key(u16 tunnel_id, u16 session_id)</div><div class='add'>+{</div><div class='add'>+	return ((u32)tunnel_id) &lt;&lt; 16 | session_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long l2tp_v3_session_hashkey(struct sock *sk, u32 session_id)</div><div class='add'>+{</div><div class='add'>+	return ((unsigned long)sk) + session_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static bool l2tp_sk_is_v6(struct sock *sk)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,48 +135,81 @@ static bool l2tp_sk_is_v6(struct sock *sk)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk)</div><div class='add'>+static struct l2tp_net *l2tp_pernet(const struct net *net)</div><div class='ctx'> {</div><div class='del'>-	return sk-&gt;sk_user_data;</div><div class='add'>+	return net_generic(net, l2tp_net_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct l2tp_net *l2tp_pernet(const struct net *net)</div><div class='add'>+static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(!net);</div><div class='add'>+	struct sock *sk = tunnel-&gt;sock;</div><div class='ctx'> </div><div class='del'>-	return net_generic(net, l2tp_net_id);</div><div class='add'>+	trace_free_tunnel(tunnel);</div><div class='add'>+</div><div class='add'>+	if (sk) {</div><div class='add'>+		/* Disable udp encapsulation */</div><div class='add'>+		switch (tunnel-&gt;encap) {</div><div class='add'>+		case L2TP_ENCAPTYPE_UDP:</div><div class='add'>+			/* No longer an encapsulation socket. See net/ipv4/udp.c */</div><div class='add'>+			WRITE_ONCE(udp_sk(sk)-&gt;encap_type, 0);</div><div class='add'>+			udp_sk(sk)-&gt;encap_rcv = NULL;</div><div class='add'>+			udp_sk(sk)-&gt;encap_destroy = NULL;</div><div class='add'>+			break;</div><div class='add'>+		case L2TP_ENCAPTYPE_IP:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tunnel-&gt;sock = NULL;</div><div class='add'>+		sock_put(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree_rcu(tunnel, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Session hash global list for L2TPv3.</div><div class='del'>- * The session_id SHOULD be random according to RFC3931, but several</div><div class='del'>- * L2TP implementations use incrementing session_ids.  So we do a real</div><div class='del'>- * hash on the session_id, rather than a simple bitmask.</div><div class='del'>- */</div><div class='del'>-static inline struct hlist_head *</div><div class='del'>-l2tp_session_id_hash_2(struct l2tp_net *pn, u32 session_id)</div><div class='add'>+static void l2tp_session_free(struct l2tp_session *session)</div><div class='add'>+{</div><div class='add'>+	trace_free_session(session);</div><div class='add'>+	if (session-&gt;tunnel)</div><div class='add'>+		l2tp_tunnel_put(session-&gt;tunnel);</div><div class='add'>+	kfree_rcu(session, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct l2tp_tunnel *l2tp_sk_to_tunnel(const struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	return &amp;pn-&gt;l2tp_session_hlist[hash_32(session_id, L2TP_HASH_BITS_2)];</div><div class='add'>+	const struct net *net = sock_net(sk);</div><div class='add'>+	unsigned long tunnel_id, tmp;</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='add'>+	struct l2tp_net *pn;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	pn = l2tp_pernet(net);</div><div class='add'>+	idr_for_each_entry_ul(&amp;pn-&gt;l2tp_tunnel_idr, tunnel, tmp, tunnel_id) {</div><div class='add'>+		if (tunnel &amp;&amp;</div><div class='add'>+		    tunnel-&gt;sock == sk &amp;&amp;</div><div class='add'>+		    refcount_inc_not_zero(&amp;tunnel-&gt;ref_count)) {</div><div class='add'>+			rcu_read_unlock_bh();</div><div class='add'>+			return tunnel;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_sk_to_tunnel);</div><div class='ctx'> </div><div class='del'>-/* Session hash list.</div><div class='del'>- * The session_id SHOULD be random according to RFC2661, but several</div><div class='del'>- * L2TP implementations (Cisco and Microsoft) use incrementing</div><div class='del'>- * session_ids.  So we do a real hash on the session_id, rather than a</div><div class='del'>- * simple bitmask.</div><div class='del'>- */</div><div class='del'>-static inline struct hlist_head *</div><div class='del'>-l2tp_session_id_hash(struct l2tp_tunnel *tunnel, u32 session_id)</div><div class='add'>+void l2tp_tunnel_put(struct l2tp_tunnel *tunnel)</div><div class='ctx'> {</div><div class='del'>-	return &amp;tunnel-&gt;session_hlist[hash_32(session_id, L2TP_HASH_BITS)];</div><div class='add'>+	if (refcount_dec_and_test(&amp;tunnel-&gt;ref_count))</div><div class='add'>+		l2tp_tunnel_free(tunnel);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_tunnel_put);</div><div class='ctx'> </div><div class='del'>-void l2tp_tunnel_free(struct l2tp_tunnel *tunnel)</div><div class='add'>+void l2tp_session_put(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='del'>-	sock_put(tunnel-&gt;sock);</div><div class='del'>-	/* the tunnel is freed in the socket destructor */</div><div class='add'>+	if (refcount_dec_and_test(&amp;session-&gt;ref_count))</div><div class='add'>+		l2tp_session_free(session);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(l2tp_tunnel_free);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_session_put);</div><div class='ctx'> </div><div class='ctx'> /* Lookup a tunnel. A new reference is held on the returned tunnel. */</div><div class='ctx'> struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id)</div><div class='hunk'>@@ -169,13 +218,10 @@ struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id)</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	list_for_each_entry_rcu(tunnel, &amp;pn-&gt;l2tp_tunnel_list, list) {</div><div class='del'>-		if (tunnel-&gt;tunnel_id == tunnel_id) {</div><div class='del'>-			l2tp_tunnel_inc_refcount(tunnel);</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='del'>-</div><div class='del'>-			return tunnel;</div><div class='del'>-		}</div><div class='add'>+	tunnel = idr_find(&amp;pn-&gt;l2tp_tunnel_idr, tunnel_id);</div><div class='add'>+	if (tunnel &amp;&amp; refcount_inc_not_zero(&amp;tunnel-&gt;ref_count)) {</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return tunnel;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='hunk'>@@ -183,91 +229,202 @@ struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_tunnel_get);</div><div class='ctx'> </div><div class='del'>-struct l2tp_tunnel *l2tp_tunnel_get_nth(const struct net *net, int nth)</div><div class='add'>+struct l2tp_tunnel *l2tp_tunnel_get_next(const struct net *net, unsigned long *key)</div><div class='ctx'> {</div><div class='del'>-	const struct l2tp_net *pn = l2tp_pernet(net);</div><div class='del'>-	struct l2tp_tunnel *tunnel;</div><div class='del'>-	int count = 0;</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+	struct l2tp_tunnel *tunnel = NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	list_for_each_entry_rcu(tunnel, &amp;pn-&gt;l2tp_tunnel_list, list) {</div><div class='del'>-		if (++count &gt; nth) {</div><div class='del'>-			l2tp_tunnel_inc_refcount(tunnel);</div><div class='add'>+again:</div><div class='add'>+	tunnel = idr_get_next_ul(&amp;pn-&gt;l2tp_tunnel_idr, key);</div><div class='add'>+	if (tunnel) {</div><div class='add'>+		if (refcount_inc_not_zero(&amp;tunnel-&gt;ref_count)) {</div><div class='ctx'> 			rcu_read_unlock_bh();</div><div class='ctx'> 			return tunnel;</div><div class='ctx'> 		}</div><div class='add'>+		(*key)++;</div><div class='add'>+		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_tunnel_get_nth);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_tunnel_get_next);</div><div class='ctx'> </div><div class='del'>-struct l2tp_session *l2tp_tunnel_get_session(struct l2tp_tunnel *tunnel,</div><div class='del'>-					     u32 session_id)</div><div class='add'>+struct l2tp_session *l2tp_v3_session_get(const struct net *net, struct sock *sk, u32 session_id)</div><div class='ctx'> {</div><div class='del'>-	struct hlist_head *session_list;</div><div class='add'>+	const struct l2tp_net *pn = l2tp_pernet(net);</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-	session_list = l2tp_session_id_hash(tunnel, session_id);</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	session = idr_find(&amp;pn-&gt;l2tp_v3_session_idr, session_id);</div><div class='add'>+	if (session &amp;&amp; !hash_hashed(&amp;session-&gt;hlist) &amp;&amp;</div><div class='add'>+	    refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return session;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-	hlist_for_each_entry(session, session_list, hlist)</div><div class='del'>-		if (session-&gt;session_id == session_id) {</div><div class='del'>-			l2tp_session_inc_refcount(session);</div><div class='del'>-			read_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	/* If we get here and session is non-NULL, the session_id</div><div class='add'>+	 * collides with one in another tunnel. If sk is non-NULL,</div><div class='add'>+	 * find the session matching sk.</div><div class='add'>+	 */</div><div class='add'>+	if (session &amp;&amp; sk) {</div><div class='add'>+		unsigned long key = l2tp_v3_session_hashkey(sk, session-&gt;session_id);</div><div class='add'>+</div><div class='add'>+		hash_for_each_possible_rcu(pn-&gt;l2tp_v3_session_htable, session,</div><div class='add'>+					   hlist, key) {</div><div class='add'>+			/* session-&gt;tunnel may be NULL if another thread is in</div><div class='add'>+			 * l2tp_session_register and has added an item to</div><div class='add'>+			 * l2tp_v3_session_htable but hasn't yet added the</div><div class='add'>+			 * session to its tunnel's session_list.</div><div class='add'>+			 */</div><div class='add'>+			struct l2tp_tunnel *tunnel = READ_ONCE(session-&gt;tunnel);</div><div class='ctx'> </div><div class='del'>-			return session;</div><div class='add'>+			if (session-&gt;session_id == session_id &amp;&amp;</div><div class='add'>+			    tunnel &amp;&amp; tunnel-&gt;sock == sk &amp;&amp;</div><div class='add'>+			    refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+				rcu_read_unlock_bh();</div><div class='add'>+				return session;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	read_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_tunnel_get_session);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_v3_session_get);</div><div class='ctx'> </div><div class='del'>-struct l2tp_session *l2tp_session_get(const struct net *net, u32 session_id)</div><div class='add'>+struct l2tp_session *l2tp_v2_session_get(const struct net *net, u16 tunnel_id, u16 session_id)</div><div class='ctx'> {</div><div class='del'>-	struct hlist_head *session_list;</div><div class='add'>+	u32 session_key = l2tp_v2_session_key(tunnel_id, session_id);</div><div class='add'>+	const struct l2tp_net *pn = l2tp_pernet(net);</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-	session_list = l2tp_session_id_hash_2(l2tp_pernet(net), session_id);</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	session = idr_find(&amp;pn-&gt;l2tp_v2_session_idr, session_key);</div><div class='add'>+	if (session &amp;&amp; refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+		rcu_read_unlock_bh();</div><div class='add'>+		return session;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_v2_session_get);</div><div class='add'>+</div><div class='add'>+struct l2tp_session *l2tp_session_get(const struct net *net, struct sock *sk, int pver,</div><div class='add'>+				      u32 tunnel_id, u32 session_id)</div><div class='add'>+{</div><div class='add'>+	if (pver == L2TP_HDR_VER_2)</div><div class='add'>+		return l2tp_v2_session_get(net, tunnel_id, session_id);</div><div class='add'>+	else</div><div class='add'>+		return l2tp_v3_session_get(net, sk, session_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_session_get);</div><div class='add'>+</div><div class='add'>+static struct l2tp_session *l2tp_v2_session_get_next(const struct net *net,</div><div class='add'>+						     u16 tid,</div><div class='add'>+						     unsigned long *key)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+	struct l2tp_session *session = NULL;</div><div class='add'>+</div><div class='add'>+	/* Start searching within the range of the tid */</div><div class='add'>+	if (*key == 0)</div><div class='add'>+		*key = l2tp_v2_session_key(tid, 0);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	hlist_for_each_entry_rcu(session, session_list, global_hlist)</div><div class='del'>-		if (session-&gt;session_id == session_id) {</div><div class='del'>-			l2tp_session_inc_refcount(session);</div><div class='del'>-			rcu_read_unlock_bh();</div><div class='add'>+again:</div><div class='add'>+	session = idr_get_next_ul(&amp;pn-&gt;l2tp_v2_session_idr, key);</div><div class='add'>+	if (session) {</div><div class='add'>+		struct l2tp_tunnel *tunnel = READ_ONCE(session-&gt;tunnel);</div><div class='ctx'> </div><div class='add'>+		/* ignore sessions with id 0 as they are internal for pppol2tp */</div><div class='add'>+		if (session-&gt;session_id == 0) {</div><div class='add'>+			(*key)++;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tunnel-&gt;tunnel_id == tid &amp;&amp;</div><div class='add'>+		    refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+			rcu_read_unlock_bh();</div><div class='ctx'> 			return session;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		(*key)++;</div><div class='add'>+		if (tunnel-&gt;tunnel_id == tid)</div><div class='add'>+			goto again;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_session_get);</div><div class='ctx'> </div><div class='del'>-struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth)</div><div class='add'>+static struct l2tp_session *l2tp_v3_session_get_next(const struct net *net,</div><div class='add'>+						     u32 tid, struct sock *sk,</div><div class='add'>+						     unsigned long *key)</div><div class='ctx'> {</div><div class='del'>-	int hash;</div><div class='del'>-	struct l2tp_session *session;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE; hash++) {</div><div class='del'>-		hlist_for_each_entry(session, &amp;tunnel-&gt;session_hlist[hash], hlist) {</div><div class='del'>-			if (++count &gt; nth) {</div><div class='del'>-				l2tp_session_inc_refcount(session);</div><div class='del'>-				read_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+	struct l2tp_session *session = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+again:</div><div class='add'>+	session = idr_get_next_ul(&amp;pn-&gt;l2tp_v3_session_idr, key);</div><div class='add'>+	if (session &amp;&amp; !hash_hashed(&amp;session-&gt;hlist)) {</div><div class='add'>+		struct l2tp_tunnel *tunnel = READ_ONCE(session-&gt;tunnel);</div><div class='add'>+</div><div class='add'>+		if (tunnel &amp;&amp; tunnel-&gt;tunnel_id == tid &amp;&amp;</div><div class='add'>+		    refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+			rcu_read_unlock_bh();</div><div class='add'>+			return session;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		(*key)++;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we get here and session is non-NULL, the IDR entry may be one</div><div class='add'>+	 * where the session_id collides with one in another tunnel. Check</div><div class='add'>+	 * session_htable for a match. There can only be one session of a given</div><div class='add'>+	 * ID per tunnel so we can return as soon as a match is found.</div><div class='add'>+	 */</div><div class='add'>+	if (session &amp;&amp; hash_hashed(&amp;session-&gt;hlist)) {</div><div class='add'>+		unsigned long hkey = l2tp_v3_session_hashkey(sk, session-&gt;session_id);</div><div class='add'>+		u32 sid = session-&gt;session_id;</div><div class='add'>+</div><div class='add'>+		hash_for_each_possible_rcu(pn-&gt;l2tp_v3_session_htable, session,</div><div class='add'>+					   hlist, hkey) {</div><div class='add'>+			struct l2tp_tunnel *tunnel = READ_ONCE(session-&gt;tunnel);</div><div class='add'>+</div><div class='add'>+			if (session-&gt;session_id == sid &amp;&amp;</div><div class='add'>+			    tunnel &amp;&amp; tunnel-&gt;tunnel_id == tid &amp;&amp;</div><div class='add'>+			    refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+				rcu_read_unlock_bh();</div><div class='ctx'> 				return session;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* If no match found, the colliding session ID isn't in our</div><div class='add'>+		 * tunnel so try the next session ID.</div><div class='add'>+		 */</div><div class='add'>+		(*key)++;</div><div class='add'>+		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_session_get_nth);</div><div class='add'>+</div><div class='add'>+struct l2tp_session *l2tp_session_get_next(const struct net *net, struct sock *sk, int pver,</div><div class='add'>+					   u32 tunnel_id, unsigned long *key)</div><div class='add'>+{</div><div class='add'>+	if (pver == L2TP_HDR_VER_2)</div><div class='add'>+		return l2tp_v2_session_get_next(net, tunnel_id, key);</div><div class='add'>+	else</div><div class='add'>+		return l2tp_v3_session_get_next(net, tunnel_id, sk, key);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_session_get_next);</div><div class='ctx'> </div><div class='ctx'> /* Lookup a session by interface name.</div><div class='ctx'>  * This is very inefficient but is only used by management interfaces.</div><div class='hunk'>@@ -276,79 +433,190 @@ struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,</div><div class='ctx'> 						const char *ifname)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='del'>-	int hash;</div><div class='add'>+	unsigned long tunnel_id, tmp;</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE_2; hash++) {</div><div class='del'>-		hlist_for_each_entry_rcu(session, &amp;pn-&gt;l2tp_session_hlist[hash], global_hlist) {</div><div class='del'>-			if (!strcmp(session-&gt;ifname, ifname)) {</div><div class='del'>-				l2tp_session_inc_refcount(session);</div><div class='del'>-				rcu_read_unlock_bh();</div><div class='del'>-</div><div class='del'>-				return session;</div><div class='add'>+	idr_for_each_entry_ul(&amp;pn-&gt;l2tp_tunnel_idr, tunnel, tmp, tunnel_id) {</div><div class='add'>+		if (tunnel) {</div><div class='add'>+			list_for_each_entry_rcu(session, &amp;tunnel-&gt;session_list, list) {</div><div class='add'>+				if (!strcmp(session-&gt;ifname, ifname)) {</div><div class='add'>+					refcount_inc(&amp;session-&gt;ref_count);</div><div class='add'>+					rcu_read_unlock_bh();</div><div class='add'>+</div><div class='add'>+					return session;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_session_get_by_ifname);</div><div class='ctx'> </div><div class='add'>+static void l2tp_session_coll_list_add(struct l2tp_session_coll_list *clist,</div><div class='add'>+				       struct l2tp_session *session)</div><div class='add'>+{</div><div class='add'>+	refcount_inc(&amp;session-&gt;ref_count);</div><div class='add'>+	WARN_ON_ONCE(session-&gt;coll_list);</div><div class='add'>+	session-&gt;coll_list = clist;</div><div class='add'>+	spin_lock(&amp;clist-&gt;lock);</div><div class='add'>+	list_add(&amp;session-&gt;clist, &amp;clist-&gt;list);</div><div class='add'>+	spin_unlock(&amp;clist-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int l2tp_session_collision_add(struct l2tp_net *pn,</div><div class='add'>+				      struct l2tp_session *session1,</div><div class='add'>+				      struct l2tp_session *session2)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_session_coll_list *clist;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='add'>+</div><div class='add'>+	if (!session2)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/* If existing session is in IP-encap tunnel, refuse new session */</div><div class='add'>+	if (session2-&gt;tunnel-&gt;encap == L2TP_ENCAPTYPE_IP)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	clist = session2-&gt;coll_list;</div><div class='add'>+	if (!clist) {</div><div class='add'>+		/* First collision. Allocate list to manage the collided sessions</div><div class='add'>+		 * and add the existing session to the list.</div><div class='add'>+		 */</div><div class='add'>+		clist = kmalloc(sizeof(*clist), GFP_ATOMIC);</div><div class='add'>+		if (!clist)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;clist-&gt;lock);</div><div class='add'>+		INIT_LIST_HEAD(&amp;clist-&gt;list);</div><div class='add'>+		refcount_set(&amp;clist-&gt;ref_count, 1);</div><div class='add'>+		l2tp_session_coll_list_add(clist, session2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If existing session isn't already in the session hlist, add it. */</div><div class='add'>+	if (!hash_hashed(&amp;session2-&gt;hlist))</div><div class='add'>+		hash_add_rcu(pn-&gt;l2tp_v3_session_htable, &amp;session2-&gt;hlist,</div><div class='add'>+			     session2-&gt;hlist_key);</div><div class='add'>+</div><div class='add'>+	/* Add new session to the hlist and collision list */</div><div class='add'>+	hash_add_rcu(pn-&gt;l2tp_v3_session_htable, &amp;session1-&gt;hlist,</div><div class='add'>+		     session1-&gt;hlist_key);</div><div class='add'>+	refcount_inc(&amp;clist-&gt;ref_count);</div><div class='add'>+	l2tp_session_coll_list_add(clist, session1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2tp_session_collision_del(struct l2tp_net *pn,</div><div class='add'>+				       struct l2tp_session *session)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_session_coll_list *clist = session-&gt;coll_list;</div><div class='add'>+	unsigned long session_key = session-&gt;session_id;</div><div class='add'>+	struct l2tp_session *session2;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='add'>+</div><div class='add'>+	hash_del_rcu(&amp;session-&gt;hlist);</div><div class='add'>+</div><div class='add'>+	if (clist) {</div><div class='add'>+		/* Remove session from its collision list. If there</div><div class='add'>+		 * are other sessions with the same ID, replace this</div><div class='add'>+		 * session's IDR entry with that session, otherwise</div><div class='add'>+		 * remove the IDR entry. If this is the last session,</div><div class='add'>+		 * the collision list data is freed.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;clist-&gt;lock);</div><div class='add'>+		list_del_init(&amp;session-&gt;clist);</div><div class='add'>+		session2 = list_first_entry_or_null(&amp;clist-&gt;list, struct l2tp_session, clist);</div><div class='add'>+		if (session2) {</div><div class='add'>+			void *old = idr_replace(&amp;pn-&gt;l2tp_v3_session_idr, session2, session_key);</div><div class='add'>+</div><div class='add'>+			WARN_ON_ONCE(IS_ERR_VALUE(old));</div><div class='add'>+		} else {</div><div class='add'>+			void *removed = idr_remove(&amp;pn-&gt;l2tp_v3_session_idr, session_key);</div><div class='add'>+</div><div class='add'>+			WARN_ON_ONCE(removed != session);</div><div class='add'>+		}</div><div class='add'>+		session-&gt;coll_list = NULL;</div><div class='add'>+		spin_unlock(&amp;clist-&gt;lock);</div><div class='add'>+		if (refcount_dec_and_test(&amp;clist-&gt;ref_count))</div><div class='add'>+			kfree(clist);</div><div class='add'>+		l2tp_session_put(session);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int l2tp_session_register(struct l2tp_session *session,</div><div class='ctx'> 			  struct l2tp_tunnel *tunnel)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_session *session_walk;</div><div class='del'>-	struct hlist_head *g_head;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-	struct l2tp_net *pn;</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(tunnel-&gt;l2tp_net);</div><div class='add'>+	struct l2tp_session *other_session = NULL;</div><div class='add'>+	void *old = NULL;</div><div class='add'>+	u32 session_key;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	head = l2tp_session_id_hash(tunnel, session-&gt;session_id);</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;list_lock);</div><div class='add'>+	spin_lock_bh(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='ctx'> 	if (!tunnel-&gt;acpt_newsess) {</div><div class='ctx'> 		err = -ENODEV;</div><div class='del'>-		goto err_tlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hlist_for_each_entry(session_walk, head, hlist)</div><div class='del'>-		if (session_walk-&gt;session_id == session-&gt;session_id) {</div><div class='del'>-			err = -EEXIST;</div><div class='del'>-			goto err_tlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 	if (tunnel-&gt;version == L2TP_HDR_VER_3) {</div><div class='del'>-		pn = l2tp_pernet(tunnel-&gt;l2tp_net);</div><div class='del'>-		g_head = l2tp_session_id_hash_2(pn, session-&gt;session_id);</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='add'>+		session_key = session-&gt;session_id;</div><div class='add'>+		err = idr_alloc_u32(&amp;pn-&gt;l2tp_v3_session_idr, NULL,</div><div class='add'>+				    &amp;session_key, session_key, GFP_ATOMIC);</div><div class='add'>+		/* IP encap expects session IDs to be globally unique, while</div><div class='add'>+		 * UDP encap doesn't. This isn't per the RFC, which says that</div><div class='add'>+		 * sessions are identified only by the session ID, but is to</div><div class='add'>+		 * support existing userspace which depends on it.</div><div class='add'>+		 */</div><div class='add'>+		if (err == -ENOSPC &amp;&amp; tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) {</div><div class='add'>+			other_session = idr_find(&amp;pn-&gt;l2tp_v3_session_idr,</div><div class='add'>+						 session_key);</div><div class='add'>+			err = l2tp_session_collision_add(pn, session,</div><div class='add'>+							 other_session);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		session_key = l2tp_v2_session_key(tunnel-&gt;tunnel_id,</div><div class='add'>+						  session-&gt;session_id);</div><div class='add'>+		err = idr_alloc_u32(&amp;pn-&gt;l2tp_v2_session_idr, NULL,</div><div class='add'>+				    &amp;session_key, session_key, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		hlist_for_each_entry(session_walk, g_head, global_hlist)</div><div class='del'>-			if (session_walk-&gt;session_id == session-&gt;session_id) {</div><div class='del'>-				err = -EEXIST;</div><div class='del'>-				goto err_tlock_pnlock;</div><div class='del'>-			}</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -ENOSPC)</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		l2tp_tunnel_inc_refcount(tunnel);</div><div class='del'>-		hlist_add_head_rcu(&amp;session-&gt;global_hlist, g_head);</div><div class='add'>+	refcount_inc(&amp;tunnel-&gt;ref_count);</div><div class='add'>+	WRITE_ONCE(session-&gt;tunnel, tunnel);</div><div class='add'>+	list_add_rcu(&amp;session-&gt;list, &amp;tunnel-&gt;session_list);</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='add'>+	/* this makes session available to lockless getters */</div><div class='add'>+	if (tunnel-&gt;version == L2TP_HDR_VER_3) {</div><div class='add'>+		if (!other_session)</div><div class='add'>+			old = idr_replace(&amp;pn-&gt;l2tp_v3_session_idr, session, session_key);</div><div class='ctx'> 	} else {</div><div class='del'>-		l2tp_tunnel_inc_refcount(tunnel);</div><div class='add'>+		old = idr_replace(&amp;pn-&gt;l2tp_v2_session_idr, session, session_key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hlist_add_head(&amp;session-&gt;hlist, head);</div><div class='del'>-	write_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	/* old should be NULL, unless something removed or modified</div><div class='add'>+	 * the IDR entry after our idr_alloc_32 above (which shouldn't</div><div class='add'>+	 * happen).</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(old);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;list_lock);</div><div class='ctx'> </div><div class='del'>-err_tlock_pnlock:</div><div class='del'>-	spin_unlock_bh(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='del'>-err_tlock:</div><div class='del'>-	write_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	if (!err)</div><div class='add'>+		trace_register_session(session);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -371,10 +639,6 @@ static void l2tp_recv_queue_skb(struct l2tp_session *session, struct sk_buff *sk</div><div class='ctx'> 	skb_queue_walk_safe(&amp;session-&gt;reorder_q, skbp, tmp) {</div><div class='ctx'> 		if (L2TP_SKB_CB(skbp)-&gt;ns &gt; ns) {</div><div class='ctx'> 			__skb_queue_before(&amp;session-&gt;reorder_q, skbp, skb);</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: pkt %hu, inserted before %hu, reorder_q len=%d\n",</div><div class='del'>-				 session-&gt;name, ns, L2TP_SKB_CB(skbp)-&gt;ns,</div><div class='del'>-				 skb_queue_len(&amp;session-&gt;reorder_q));</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_oos_packets);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -407,13 +671,11 @@ static void l2tp_recv_dequeue_skb(struct l2tp_session *session, struct sk_buff *</div><div class='ctx'> 		/* Bump our Nr */</div><div class='ctx'> 		session-&gt;nr++;</div><div class='ctx'> 		session-&gt;nr &amp;= session-&gt;nr_max;</div><div class='del'>-</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_SEQ, "%s: updated nr to %hu\n",</div><div class='del'>-			 session-&gt;name, session-&gt;nr);</div><div class='add'>+		trace_session_seqnum_update(session);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* call private receive handler */</div><div class='del'>-	if (session-&gt;recv_skb != NULL)</div><div class='add'>+	if (session-&gt;recv_skb)</div><div class='ctx'> 		(*session-&gt;recv_skb)(session, skb, L2TP_SKB_CB(skb)-&gt;length);</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree_skb(skb);</div><div class='hunk'>@@ -434,37 +696,27 @@ static void l2tp_recv_dequeue(struct l2tp_session *session)</div><div class='ctx'> start:</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;reorder_q.lock);</div><div class='ctx'> 	skb_queue_walk_safe(&amp;session-&gt;reorder_q, skb, tmp) {</div><div class='del'>-		if (time_after(jiffies, L2TP_SKB_CB(skb)-&gt;expires)) {</div><div class='add'>+		struct l2tp_skb_cb *cb = L2TP_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		/* If the packet has been pending on the queue for too long, discard it */</div><div class='add'>+		if (time_after(jiffies, cb-&gt;expires)) {</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_seq_discards);</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_errors);</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: oos pkt %u len %d discarded (too old), waiting for %u, reorder_q_len=%d\n",</div><div class='del'>-				 session-&gt;name, L2TP_SKB_CB(skb)-&gt;ns,</div><div class='del'>-				 L2TP_SKB_CB(skb)-&gt;length, session-&gt;nr,</div><div class='del'>-				 skb_queue_len(&amp;session-&gt;reorder_q));</div><div class='add'>+			trace_session_pkt_expired(session, cb-&gt;ns);</div><div class='ctx'> 			session-&gt;reorder_skip = 1;</div><div class='ctx'> 			__skb_unlink(skb, &amp;session-&gt;reorder_q);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (L2TP_SKB_CB(skb)-&gt;has_seq) {</div><div class='add'>+		if (cb-&gt;has_seq) {</div><div class='ctx'> 			if (session-&gt;reorder_skip) {</div><div class='del'>-				l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-					 "%s: advancing nr to next pkt: %u -&gt; %u",</div><div class='del'>-					 session-&gt;name, session-&gt;nr,</div><div class='del'>-					 L2TP_SKB_CB(skb)-&gt;ns);</div><div class='ctx'> 				session-&gt;reorder_skip = 0;</div><div class='del'>-				session-&gt;nr = L2TP_SKB_CB(skb)-&gt;ns;</div><div class='add'>+				session-&gt;nr = cb-&gt;ns;</div><div class='add'>+				trace_session_seqnum_reset(session);</div><div class='ctx'> 			}</div><div class='del'>-			if (L2TP_SKB_CB(skb)-&gt;ns != session-&gt;nr) {</div><div class='del'>-				l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-					 "%s: holding oos pkt %u len %d, waiting for %u, reorder_q_len=%d\n",</div><div class='del'>-					 session-&gt;name, L2TP_SKB_CB(skb)-&gt;ns,</div><div class='del'>-					 L2TP_SKB_CB(skb)-&gt;length, session-&gt;nr,</div><div class='del'>-					 skb_queue_len(&amp;session-&gt;reorder_q));</div><div class='add'>+			if (cb-&gt;ns != session-&gt;nr)</div><div class='ctx'> 				goto out;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 		__skb_unlink(skb, &amp;session-&gt;reorder_q);</div><div class='ctx'> </div><div class='hunk'>@@ -497,14 +749,13 @@ static int l2tp_seq_check_rx_window(struct l2tp_session *session, u32 nr)</div><div class='ctx'>  */</div><div class='ctx'> static int l2tp_recv_data_seq(struct l2tp_session *session, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (!l2tp_seq_check_rx_window(session, L2TP_SKB_CB(skb)-&gt;ns)) {</div><div class='add'>+	struct l2tp_skb_cb *cb = L2TP_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	if (!l2tp_seq_check_rx_window(session, cb-&gt;ns)) {</div><div class='ctx'> 		/* Packet sequence number is outside allowed window.</div><div class='ctx'> 		 * Discard it.</div><div class='ctx'> 		 */</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-			 "%s: pkt %u len %d discarded, outside window, nr=%u\n",</div><div class='del'>-			 session-&gt;name, L2TP_SKB_CB(skb)-&gt;ns,</div><div class='del'>-			 L2TP_SKB_CB(skb)-&gt;length, session-&gt;nr);</div><div class='add'>+		trace_session_pkt_outside_rx_window(session, cb-&gt;ns);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -521,10 +772,10 @@ static int l2tp_recv_data_seq(struct l2tp_session *session, struct sk_buff *skb)</div><div class='ctx'> 	 * is seen. After nr_oos_count_max in-sequence packets, reset the</div><div class='ctx'> 	 * sequence number to re-enable packet reception.</div><div class='ctx'> 	 */</div><div class='del'>-	if (L2TP_SKB_CB(skb)-&gt;ns == session-&gt;nr) {</div><div class='add'>+	if (cb-&gt;ns == session-&gt;nr) {</div><div class='ctx'> 		skb_queue_tail(&amp;session-&gt;reorder_q, skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		u32 nr_oos = L2TP_SKB_CB(skb)-&gt;ns;</div><div class='add'>+		u32 nr_oos = cb-&gt;ns;</div><div class='ctx'> 		u32 nr_next = (session-&gt;nr_oos + 1) &amp; session-&gt;nr_max;</div><div class='ctx'> </div><div class='ctx'> 		if (nr_oos == nr_next)</div><div class='hunk'>@@ -535,17 +786,10 @@ static int l2tp_recv_data_seq(struct l2tp_session *session, struct sk_buff *skb)</div><div class='ctx'> 		session-&gt;nr_oos = nr_oos;</div><div class='ctx'> 		if (session-&gt;nr_oos_count &gt; session-&gt;nr_oos_count_max) {</div><div class='ctx'> 			session-&gt;reorder_skip = 1;</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: %d oos packets received. Resetting sequence numbers\n",</div><div class='del'>-				 session-&gt;name, session-&gt;nr_oos_count);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!session-&gt;reorder_skip) {</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_seq_discards);</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: oos pkt %u len %d discarded, waiting for %u, reorder_q_len=%d\n",</div><div class='del'>-				 session-&gt;name, L2TP_SKB_CB(skb)-&gt;ns,</div><div class='del'>-				 L2TP_SKB_CB(skb)-&gt;length, session-&gt;nr,</div><div class='del'>-				 skb_queue_len(&amp;session-&gt;reorder_q));</div><div class='add'>+			trace_session_pkt_oos(session, cb-&gt;ns);</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='ctx'> 		skb_queue_tail(&amp;session-&gt;reorder_q, skb);</div><div class='hunk'>@@ -623,15 +867,13 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='ctx'> 	int offset;</div><div class='del'>-	u32 ns, nr;</div><div class='ctx'> </div><div class='ctx'> 	/* Parse and check optional cookie */</div><div class='ctx'> 	if (session-&gt;peer_cookie_len &gt; 0) {</div><div class='ctx'> 		if (memcmp(ptr, &amp;session-&gt;peer_cookie[0], session-&gt;peer_cookie_len)) {</div><div class='del'>-			l2tp_info(tunnel, L2TP_MSG_DATA,</div><div class='del'>-				  "%s: cookie mismatch (%u/%u). Discarding.\n",</div><div class='del'>-				  tunnel-&gt;name, tunnel-&gt;tunnel_id,</div><div class='del'>-				  session-&gt;session_id);</div><div class='add'>+			pr_debug_ratelimited("%s: cookie mismatch (%u/%u). Discarding.\n",</div><div class='add'>+					     tunnel-&gt;name, tunnel-&gt;tunnel_id,</div><div class='add'>+					     session-&gt;session_id);</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_cookie_discards);</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -645,60 +887,46 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,</div><div class='ctx'> 	 * the control of the LNS.  If no sequence numbers present but</div><div class='ctx'> 	 * we were expecting them, discard frame.</div><div class='ctx'> 	 */</div><div class='del'>-	ns = nr = 0;</div><div class='ctx'> 	L2TP_SKB_CB(skb)-&gt;has_seq = 0;</div><div class='ctx'> 	if (tunnel-&gt;version == L2TP_HDR_VER_2) {</div><div class='ctx'> 		if (hdrflags &amp; L2TP_HDRFLAG_S) {</div><div class='del'>-			ns = ntohs(*(__be16 *) ptr);</div><div class='del'>-			ptr += 2;</div><div class='del'>-			nr = ntohs(*(__be16 *) ptr);</div><div class='del'>-			ptr += 2;</div><div class='del'>-</div><div class='ctx'> 			/* Store L2TP info in the skb */</div><div class='del'>-			L2TP_SKB_CB(skb)-&gt;ns = ns;</div><div class='add'>+			L2TP_SKB_CB(skb)-&gt;ns = ntohs(*(__be16 *)ptr);</div><div class='ctx'> 			L2TP_SKB_CB(skb)-&gt;has_seq = 1;</div><div class='add'>+			ptr += 2;</div><div class='add'>+			/* Skip past nr in the header */</div><div class='add'>+			ptr += 2;</div><div class='ctx'> </div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: recv data ns=%u, nr=%u, session nr=%u\n",</div><div class='del'>-				 session-&gt;name, ns, nr, session-&gt;nr);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (session-&gt;l2specific_type == L2TP_L2SPECTYPE_DEFAULT) {</div><div class='del'>-		u32 l2h = ntohl(*(__be32 *) ptr);</div><div class='add'>+		u32 l2h = ntohl(*(__be32 *)ptr);</div><div class='ctx'> </div><div class='ctx'> 		if (l2h &amp; 0x40000000) {</div><div class='del'>-			ns = l2h &amp; 0x00ffffff;</div><div class='del'>-</div><div class='ctx'> 			/* Store L2TP info in the skb */</div><div class='del'>-			L2TP_SKB_CB(skb)-&gt;ns = ns;</div><div class='add'>+			L2TP_SKB_CB(skb)-&gt;ns = l2h &amp; 0x00ffffff;</div><div class='ctx'> 			L2TP_SKB_CB(skb)-&gt;has_seq = 1;</div><div class='del'>-</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: recv data ns=%u, session nr=%u\n",</div><div class='del'>-				 session-&gt;name, ns, session-&gt;nr);</div><div class='ctx'> 		}</div><div class='ctx'> 		ptr += 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (L2TP_SKB_CB(skb)-&gt;has_seq) {</div><div class='del'>-		/* Received a packet with sequence numbers. If we're the LNS,</div><div class='add'>+		/* Received a packet with sequence numbers. If we're the LAC,</div><div class='ctx'> 		 * check if we sre sending sequence numbers and if not,</div><div class='ctx'> 		 * configure it so.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((!session-&gt;lns_mode) &amp;&amp; (!session-&gt;send_seq)) {</div><div class='del'>-			l2tp_info(session, L2TP_MSG_SEQ,</div><div class='del'>-				  "%s: requested to enable seq numbers by LNS\n",</div><div class='del'>-				  session-&gt;name);</div><div class='add'>+		if (!session-&gt;lns_mode &amp;&amp; !session-&gt;send_seq) {</div><div class='add'>+			trace_session_seqnum_lns_enable(session);</div><div class='ctx'> 			session-&gt;send_seq = 1;</div><div class='del'>-			l2tp_session_set_header_len(session, tunnel-&gt;version);</div><div class='add'>+			l2tp_session_set_header_len(session, tunnel-&gt;version,</div><div class='add'>+						    tunnel-&gt;encap);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* No sequence numbers.</div><div class='ctx'> 		 * If user has configured mandatory sequence numbers, discard.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (session-&gt;recv_seq) {</div><div class='del'>-			l2tp_warn(session, L2TP_MSG_SEQ,</div><div class='del'>-				  "%s: recv data has no seq numbers when required. Discarding.\n",</div><div class='del'>-				  session-&gt;name);</div><div class='add'>+			pr_debug_ratelimited("%s: recv data has no seq numbers when required. Discarding.\n",</div><div class='add'>+					     session-&gt;name);</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_seq_discards);</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -708,16 +936,14 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,</div><div class='ctx'> 		 * If we're the LNS and we're sending sequence numbers, the</div><div class='ctx'> 		 * LAC is broken. Discard the frame.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((!session-&gt;lns_mode) &amp;&amp; (session-&gt;send_seq)) {</div><div class='del'>-			l2tp_info(session, L2TP_MSG_SEQ,</div><div class='del'>-				  "%s: requested to disable seq numbers by LNS\n",</div><div class='del'>-				  session-&gt;name);</div><div class='add'>+		if (!session-&gt;lns_mode &amp;&amp; session-&gt;send_seq) {</div><div class='add'>+			trace_session_seqnum_lns_disable(session);</div><div class='ctx'> 			session-&gt;send_seq = 0;</div><div class='del'>-			l2tp_session_set_header_len(session, tunnel-&gt;version);</div><div class='add'>+			l2tp_session_set_header_len(session, tunnel-&gt;version,</div><div class='add'>+						    tunnel-&gt;encap);</div><div class='ctx'> 		} else if (session-&gt;send_seq) {</div><div class='del'>-			l2tp_warn(session, L2TP_MSG_SEQ,</div><div class='del'>-				  "%s: recv data has no seq numbers when required. Discarding.\n",</div><div class='del'>-				  session-&gt;name);</div><div class='add'>+			pr_debug_ratelimited("%s: recv data has no seq numbers when required. Discarding.\n",</div><div class='add'>+					     session-&gt;name);</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_seq_discards);</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -771,157 +997,137 @@ discard:</div><div class='ctx'> 	atomic_long_inc(&amp;session-&gt;stats.rx_errors);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(l2tp_recv_common);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_recv_common);</div><div class='ctx'> </div><div class='ctx'> /* Drop skbs from the session's reorder_q</div><div class='ctx'>  */</div><div class='del'>-static int l2tp_session_queue_purge(struct l2tp_session *session)</div><div class='add'>+static void l2tp_session_queue_purge(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	BUG_ON(!session);</div><div class='del'>-	BUG_ON(session-&gt;magic != L2TP_SESSION_MAGIC);</div><div class='add'>+</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;session-&gt;reorder_q))) {</div><div class='ctx'> 		atomic_long_inc(&amp;session-&gt;stats.rx_errors);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Internal UDP receive frame. Do the real work of receiving an L2TP data frame</div><div class='del'>- * here. The skb is not on a list when we get here.</div><div class='del'>- * Returns 0 if the packet was a data packet and was successfully passed on.</div><div class='del'>- * Returns 1 if the packet was not a good data packet and could not be</div><div class='del'>- * forwarded.  All such packets are passed up to userspace to deal with.</div><div class='del'>- */</div><div class='del'>-static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb)</div><div class='add'>+/* UDP encapsulation receive handler. See net/ipv4/udp.c for details. */</div><div class='add'>+int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_session *session = NULL;</div><div class='add'>+	struct l2tp_tunnel *tunnel = NULL;</div><div class='add'>+	struct net *net = sock_net(sk);</div><div class='ctx'> 	unsigned char *ptr, *optr;</div><div class='ctx'> 	u16 hdrflags;</div><div class='del'>-	u32 tunnel_id, session_id;</div><div class='ctx'> 	u16 version;</div><div class='ctx'> 	int length;</div><div class='ctx'> </div><div class='del'>-	/* UDP has verifed checksum */</div><div class='add'>+	/* UDP has verified checksum */</div><div class='ctx'> </div><div class='ctx'> 	/* UDP always verifies the packet length. */</div><div class='ctx'> 	__skb_pull(skb, sizeof(struct udphdr));</div><div class='ctx'> </div><div class='ctx'> 	/* Short packet? */</div><div class='del'>-	if (!pskb_may_pull(skb, L2TP_HDR_SIZE_SEQ)) {</div><div class='del'>-		l2tp_info(tunnel, L2TP_MSG_DATA,</div><div class='del'>-			  "%s: recv short packet (len=%d)\n",</div><div class='del'>-			  tunnel-&gt;name, skb-&gt;len);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Trace packet contents, if enabled */</div><div class='del'>-	if (tunnel-&gt;debug &amp; L2TP_MSG_DATA) {</div><div class='del'>-		length = min(32u, skb-&gt;len);</div><div class='del'>-		if (!pskb_may_pull(skb, length))</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		pr_debug("%s: recv\n", tunnel-&gt;name);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, skb-&gt;data, length);</div><div class='del'>-	}</div><div class='add'>+	if (!pskb_may_pull(skb, L2TP_HDR_SIZE_MAX))</div><div class='add'>+		goto pass;</div><div class='ctx'> </div><div class='ctx'> 	/* Point to L2TP header */</div><div class='del'>-	optr = ptr = skb-&gt;data;</div><div class='add'>+	optr = skb-&gt;data;</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* Get L2TP header flags */</div><div class='del'>-	hdrflags = ntohs(*(__be16 *) ptr);</div><div class='add'>+	hdrflags = ntohs(*(__be16 *)ptr);</div><div class='ctx'> </div><div class='del'>-	/* Check protocol version */</div><div class='add'>+	/* Get protocol version */</div><div class='ctx'> 	version = hdrflags &amp; L2TP_HDR_VER_MASK;</div><div class='del'>-	if (version != tunnel-&gt;version) {</div><div class='del'>-		l2tp_info(tunnel, L2TP_MSG_DATA,</div><div class='del'>-			  "%s: recv protocol version mismatch: got %d expected %d\n",</div><div class='del'>-			  tunnel-&gt;name, version, tunnel-&gt;version);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get length of L2TP packet */</div><div class='ctx'> 	length = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	/* If type is control packet, it is handled by userspace. */</div><div class='del'>-	if (hdrflags &amp; L2TP_HDRFLAG_T) {</div><div class='del'>-		l2tp_dbg(tunnel, L2TP_MSG_DATA,</div><div class='del'>-			 "%s: recv control packet, len=%d\n",</div><div class='del'>-			 tunnel-&gt;name, length);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	if (hdrflags &amp; L2TP_HDRFLAG_T)</div><div class='add'>+		goto pass;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip flags */</div><div class='ctx'> 	ptr += 2;</div><div class='ctx'> </div><div class='del'>-	if (tunnel-&gt;version == L2TP_HDR_VER_2) {</div><div class='add'>+	if (version == L2TP_HDR_VER_2) {</div><div class='add'>+		u16 tunnel_id, session_id;</div><div class='add'>+</div><div class='ctx'> 		/* If length is present, skip it */</div><div class='ctx'> 		if (hdrflags &amp; L2TP_HDRFLAG_L)</div><div class='ctx'> 			ptr += 2;</div><div class='ctx'> </div><div class='ctx'> 		/* Extract tunnel and session ID */</div><div class='del'>-		tunnel_id = ntohs(*(__be16 *) ptr);</div><div class='add'>+		tunnel_id = ntohs(*(__be16 *)ptr);</div><div class='ctx'> 		ptr += 2;</div><div class='del'>-		session_id = ntohs(*(__be16 *) ptr);</div><div class='add'>+		session_id = ntohs(*(__be16 *)ptr);</div><div class='ctx'> 		ptr += 2;</div><div class='add'>+</div><div class='add'>+		session = l2tp_v2_session_get(net, tunnel_id, session_id);</div><div class='ctx'> 	} else {</div><div class='add'>+		u32 session_id;</div><div class='add'>+</div><div class='ctx'> 		ptr += 2;	/* skip reserved bits */</div><div class='del'>-		tunnel_id = tunnel-&gt;tunnel_id;</div><div class='del'>-		session_id = ntohl(*(__be32 *) ptr);</div><div class='add'>+		session_id = ntohl(*(__be32 *)ptr);</div><div class='ctx'> 		ptr += 4;</div><div class='add'>+</div><div class='add'>+		session = l2tp_v3_session_get(net, sk, session_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Find the session context */</div><div class='del'>-	session = l2tp_tunnel_get_session(tunnel, session_id);</div><div class='ctx'> 	if (!session || !session-&gt;recv_skb) {</div><div class='ctx'> 		if (session)</div><div class='del'>-			l2tp_session_dec_refcount(session);</div><div class='add'>+			l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 		/* Not found? Pass to userspace to deal with */</div><div class='del'>-		l2tp_info(tunnel, L2TP_MSG_DATA,</div><div class='del'>-			  "%s: no session found (%u/%u). Passing up.\n",</div><div class='del'>-			  tunnel-&gt;name, tunnel_id, session_id);</div><div class='del'>-		goto error;</div><div class='add'>+		goto pass;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tunnel = session-&gt;tunnel;</div><div class='add'>+</div><div class='add'>+	/* Check protocol version */</div><div class='add'>+	if (version != tunnel-&gt;version)</div><div class='add'>+		goto invalid;</div><div class='add'>+</div><div class='add'>+	if (version == L2TP_HDR_VER_3 &amp;&amp;</div><div class='add'>+	    l2tp_v3_ensure_opt_in_linear(session, skb, &amp;ptr, &amp;optr)) {</div><div class='add'>+		l2tp_session_put(session);</div><div class='add'>+		goto invalid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	l2tp_recv_common(session, skb, ptr, optr, hdrflags, length);</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-error:</div><div class='add'>+invalid:</div><div class='add'>+	atomic_long_inc(&amp;tunnel-&gt;stats.rx_invalid);</div><div class='add'>+</div><div class='add'>+pass:</div><div class='ctx'> 	/* Put UDP header back */</div><div class='ctx'> 	__skb_push(skb, sizeof(struct udphdr));</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_udp_encap_recv);</div><div class='ctx'> </div><div class='del'>-/* UDP encapsulation receive handler. See net/ipv4/udp.c.</div><div class='del'>- * Return codes:</div><div class='del'>- * 0 : success.</div><div class='del'>- * &lt;0: error</div><div class='del'>- * &gt;0: skb should be passed up to userspace as UDP.</div><div class='del'>- */</div><div class='del'>-int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+/* UDP encapsulation receive error handler. See net/ipv4/udp.c for details. */</div><div class='add'>+static void l2tp_udp_encap_err_recv(struct sock *sk, struct sk_buff *skb, int err,</div><div class='add'>+				    __be16 port, u32 info, u8 *payload)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel;</div><div class='del'>-</div><div class='del'>-	tunnel = l2tp_tunnel(sk);</div><div class='del'>-	if (tunnel == NULL)</div><div class='del'>-		goto pass_up;</div><div class='del'>-</div><div class='del'>-	l2tp_dbg(tunnel, L2TP_MSG_DATA, "%s: received %d bytes\n",</div><div class='del'>-		 tunnel-&gt;name, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (l2tp_udp_recv_core(tunnel, skb))</div><div class='del'>-		goto pass_up;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	sk-&gt;sk_err = err;</div><div class='add'>+	sk_error_report(sk);</div><div class='ctx'> </div><div class='del'>-pass_up:</div><div class='del'>-	return 1;</div><div class='add'>+	if (ip_hdr(skb)-&gt;version == IPVERSION) {</div><div class='add'>+		if (inet_test_bit(RECVERR, sk))</div><div class='add'>+			return ip_icmp_error(sk, skb, err, port, info, payload);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (inet6_test_bit(RECVERR6, sk))</div><div class='add'>+			return ipv6_icmp_error(sk, skb, err, port, info, payload);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_udp_encap_recv);</div><div class='ctx'> </div><div class='ctx'> /************************************************************************</div><div class='ctx'>  * Transmit handling</div><div class='hunk'>@@ -950,8 +1156,7 @@ static int l2tp_build_l2tpv2_header(struct l2tp_session *session, void *buf)</div><div class='ctx'> 		*bufp++ = 0;</div><div class='ctx'> 		session-&gt;ns++;</div><div class='ctx'> 		session-&gt;ns &amp;= 0xffff;</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_SEQ, "%s: updated ns to %u\n",</div><div class='del'>-			 session-&gt;name, session-&gt;ns);</div><div class='add'>+		trace_session_seqnum_update(session);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bufp - optr;</div><div class='hunk'>@@ -968,13 +1173,13 @@ static int l2tp_build_l2tpv3_header(struct l2tp_session *session, void *buf)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) {</div><div class='ctx'> 		u16 flags = L2TP_HDR_VER_3;</div><div class='del'>-		*((__be16 *) bufp) = htons(flags);</div><div class='add'>+		*((__be16 *)bufp) = htons(flags);</div><div class='ctx'> 		bufp += 2;</div><div class='del'>-		*((__be16 *) bufp) = 0;</div><div class='add'>+		*((__be16 *)bufp) = 0;</div><div class='ctx'> 		bufp += 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*((__be32 *) bufp) = htonl(session-&gt;peer_session_id);</div><div class='add'>+	*((__be32 *)bufp) = htonl(session-&gt;peer_session_id);</div><div class='ctx'> 	bufp += 4;</div><div class='ctx'> 	if (session-&gt;cookie_len) {</div><div class='ctx'> 		memcpy(bufp, &amp;session-&gt;cookie[0], session-&gt;cookie_len);</div><div class='hunk'>@@ -987,9 +1192,7 @@ static int l2tp_build_l2tpv3_header(struct l2tp_session *session, void *buf)</div><div class='ctx'> 			l2h = 0x40000000 | session-&gt;ns;</div><div class='ctx'> 			session-&gt;ns++;</div><div class='ctx'> 			session-&gt;ns &amp;= 0xffffff;</div><div class='del'>-			l2tp_dbg(session, L2TP_MSG_SEQ,</div><div class='del'>-				 "%s: updated ns to %u\n",</div><div class='del'>-				 session-&gt;name, session-&gt;ns);</div><div class='add'>+			trace_session_seqnum_update(session);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		*((__be32 *)bufp) = htonl(l2h);</div><div class='hunk'>@@ -999,88 +1202,62 @@ static int l2tp_build_l2tpv3_header(struct l2tp_session *session, void *buf)</div><div class='ctx'> 	return bufp - optr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,</div><div class='del'>-			   struct flowi *fl, size_t data_len)</div><div class='add'>+/* Queue the packet to IP for output: tunnel socket lock must be held */</div><div class='add'>+static int l2tp_xmit_queue(struct l2tp_tunnel *tunnel, struct sk_buff *skb, struct flowi *fl)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='del'>-	unsigned int len = skb-&gt;len;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	/* Debug */</div><div class='del'>-	if (session-&gt;send_seq)</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes, ns=%u\n",</div><div class='del'>-			 session-&gt;name, data_len, session-&gt;ns - 1);</div><div class='del'>-	else</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes\n",</div><div class='del'>-			 session-&gt;name, data_len);</div><div class='del'>-</div><div class='del'>-	if (session-&gt;debug &amp; L2TP_MSG_DATA) {</div><div class='del'>-		int uhlen = (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) ? sizeof(struct udphdr) : 0;</div><div class='del'>-		unsigned char *datap = skb-&gt;data + uhlen;</div><div class='del'>-</div><div class='del'>-		pr_debug("%s: xmit\n", session-&gt;name);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,</div><div class='del'>-				     datap, min_t(size_t, 32, len - uhlen));</div><div class='del'>-	}</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* Queue the packet to IP for output */</div><div class='ctx'> 	skb-&gt;ignore_df = 1;</div><div class='add'>+	skb_dst_drop(skb);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	if (l2tp_sk_is_v6(tunnel-&gt;sock))</div><div class='del'>-		error = inet6_csk_xmit(tunnel-&gt;sock, skb, NULL);</div><div class='add'>+		err = inet6_csk_xmit(tunnel-&gt;sock, skb, NULL);</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='del'>-		error = ip_queue_xmit(tunnel-&gt;sock, skb, fl);</div><div class='add'>+		err = ip_queue_xmit(tunnel-&gt;sock, skb, fl);</div><div class='ctx'> </div><div class='del'>-	/* Update stats */</div><div class='del'>-	if (error &gt;= 0) {</div><div class='del'>-		atomic_long_inc(&amp;tunnel-&gt;stats.tx_packets);</div><div class='del'>-		atomic_long_add(len, &amp;tunnel-&gt;stats.tx_bytes);</div><div class='del'>-		atomic_long_inc(&amp;session-&gt;stats.tx_packets);</div><div class='del'>-		atomic_long_add(len, &amp;session-&gt;stats.tx_bytes);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_long_inc(&amp;tunnel-&gt;stats.tx_errors);</div><div class='del'>-		atomic_long_inc(&amp;session-&gt;stats.tx_errors);</div><div class='del'>-	}</div><div class='add'>+	return err &gt;= 0 ? NET_XMIT_SUCCESS : NET_XMIT_DROP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* If caller requires the skb to have a ppp header, the header must be</div><div class='del'>- * inserted in the skb data before calling this function.</div><div class='del'>- */</div><div class='del'>-int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len)</div><div class='add'>+static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, unsigned int *len)</div><div class='ctx'> {</div><div class='del'>-	int data_len = skb-&gt;len;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='add'>+	unsigned int data_len = skb-&gt;len;</div><div class='ctx'> 	struct sock *sk = tunnel-&gt;sock;</div><div class='del'>-	struct flowi *fl;</div><div class='del'>-	struct udphdr *uh;</div><div class='del'>-	struct inet_sock *inet;</div><div class='del'>-	int headroom;</div><div class='del'>-	int uhlen = (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) ? sizeof(struct udphdr) : 0;</div><div class='del'>-	int udp_len;</div><div class='add'>+	int headroom, uhlen, udp_len;</div><div class='ctx'> 	int ret = NET_XMIT_SUCCESS;</div><div class='add'>+	struct inet_sock *inet;</div><div class='add'>+	struct udphdr *uh;</div><div class='ctx'> </div><div class='ctx'> 	/* Check that there's enough headroom in the skb to insert IP,</div><div class='ctx'> 	 * UDP and L2TP headers. If not enough, expand it to</div><div class='ctx'> 	 * make room. Adjust truesize.</div><div class='ctx'> 	 */</div><div class='del'>-	headroom = NET_SKB_PAD + sizeof(struct iphdr) +</div><div class='del'>-		uhlen + hdr_len;</div><div class='add'>+	uhlen = (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) ? sizeof(*uh) : 0;</div><div class='add'>+	headroom = NET_SKB_PAD + sizeof(struct iphdr) + uhlen + session-&gt;hdr_len;</div><div class='ctx'> 	if (skb_cow_head(skb, headroom)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return NET_XMIT_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup L2TP header */</div><div class='del'>-	session-&gt;build_header(session, __skb_push(skb, hdr_len));</div><div class='add'>+	if (tunnel-&gt;version == L2TP_HDR_VER_2)</div><div class='add'>+		l2tp_build_l2tpv2_header(session, __skb_push(skb, session-&gt;hdr_len));</div><div class='add'>+	else</div><div class='add'>+		l2tp_build_l2tpv3_header(session, __skb_push(skb, session-&gt;hdr_len));</div><div class='add'>+</div><div class='add'>+	/* Reset control buffer */</div><div class='add'>+	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='ctx'> </div><div class='del'>-	/* Reset skb netfilter state */</div><div class='del'>-	memset(&amp;(IPCB(skb)-&gt;opt), 0, sizeof(IPCB(skb)-&gt;opt));</div><div class='del'>-	IPCB(skb)-&gt;flags &amp;= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |</div><div class='del'>-			      IPSKB_REROUTED);</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='add'>+</div><div class='add'>+	/* L2TP uses its own lockdep subclass to avoid lockdep splats caused by</div><div class='add'>+	 * nested socket calls on the same lockdep socket class. This can</div><div class='add'>+	 * happen when data from a user socket is routed over l2tp, which uses</div><div class='add'>+	 * another userspace socket.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_nested(&amp;sk-&gt;sk_lock.slock, L2TP_DEPTH_NESTING);</div><div class='ctx'> </div><div class='del'>-	bh_lock_sock(sk);</div><div class='ctx'> 	if (sock_owned_by_user(sk)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		ret = NET_XMIT_DROP;</div><div class='hunk'>@@ -1096,12 +1273,12 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get routing info from the tunnel socket */</div><div class='del'>-	skb_dst_drop(skb);</div><div class='del'>-	skb_dst_set(skb, sk_dst_check(sk, 0));</div><div class='add'>+	/* Report transmitted length before we add encap header, which keeps</div><div class='add'>+	 * statistics consistent for both UDP and IP encap tx/rx paths.</div><div class='add'>+	 */</div><div class='add'>+	*len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	inet = inet_sk(sk);</div><div class='del'>-	fl = &amp;inet-&gt;cork.fl;</div><div class='ctx'> 	switch (tunnel-&gt;encap) {</div><div class='ctx'> 	case L2TP_ENCAPTYPE_UDP:</div><div class='ctx'> 		/* Setup UDP header */</div><div class='hunk'>@@ -1110,7 +1287,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len</div><div class='ctx'> 		uh = udp_hdr(skb);</div><div class='ctx'> 		uh-&gt;source = inet-&gt;inet_sport;</div><div class='ctx'> 		uh-&gt;dest = inet-&gt;inet_dport;</div><div class='del'>-		udp_len = uhlen + hdr_len + data_len;</div><div class='add'>+		udp_len = uhlen + session-&gt;hdr_len + data_len;</div><div class='ctx'> 		uh-&gt;len = htons(udp_len);</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate UDP checksum if configured to do so */</div><div class='hunk'>@@ -1121,123 +1298,115 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len</div><div class='ctx'> 				      &amp;sk-&gt;sk_v6_daddr, udp_len);</div><div class='ctx'> 		else</div><div class='ctx'> #endif</div><div class='del'>-		udp_set_csum(sk-&gt;sk_no_check_tx, skb, inet-&gt;inet_saddr,</div><div class='del'>-			     inet-&gt;inet_daddr, udp_len);</div><div class='add'>+			udp_set_csum(sk-&gt;sk_no_check_tx, skb, inet-&gt;inet_saddr,</div><div class='add'>+				     inet-&gt;inet_daddr, udp_len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case L2TP_ENCAPTYPE_IP:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l2tp_xmit_core(session, skb, fl, data_len);</div><div class='add'>+	ret = l2tp_xmit_queue(tunnel, skb, &amp;inet-&gt;cork.fl);</div><div class='add'>+</div><div class='ctx'> out_unlock:</div><div class='del'>-	bh_unlock_sock(sk);</div><div class='add'>+	spin_unlock(&amp;sk-&gt;sk_lock.slock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* If caller requires the skb to have a ppp header, the header must be</div><div class='add'>+ * inserted in the skb data before calling this function.</div><div class='add'>+ */</div><div class='add'>+int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = l2tp_xmit_core(session, skb, &amp;len);</div><div class='add'>+	if (ret == NET_XMIT_SUCCESS) {</div><div class='add'>+		atomic_long_inc(&amp;session-&gt;tunnel-&gt;stats.tx_packets);</div><div class='add'>+		atomic_long_add(len, &amp;session-&gt;tunnel-&gt;stats.tx_bytes);</div><div class='add'>+		atomic_long_inc(&amp;session-&gt;stats.tx_packets);</div><div class='add'>+		atomic_long_add(len, &amp;session-&gt;stats.tx_bytes);</div><div class='add'>+	} else {</div><div class='add'>+		atomic_long_inc(&amp;session-&gt;tunnel-&gt;stats.tx_errors);</div><div class='add'>+		atomic_long_inc(&amp;session-&gt;stats.tx_errors);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_xmit_skb);</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Tinnel and session create/destroy.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* Tunnel socket destruct hook.</div><div class='del'>- * The tunnel context is deleted only when all session sockets have been</div><div class='del'>- * closed.</div><div class='del'>- */</div><div class='del'>-static void l2tp_tunnel_destruct(struct sock *sk)</div><div class='add'>+/* Remove an l2tp session from l2tp_core's lists. */</div><div class='add'>+static void l2tp_session_unhash(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel = l2tp_tunnel(sk);</div><div class='del'>-</div><div class='del'>-	if (tunnel == NULL)</div><div class='del'>-		goto end;</div><div class='add'>+	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='ctx'> </div><div class='del'>-	l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: closing...\n", tunnel-&gt;name);</div><div class='add'>+	if (tunnel) {</div><div class='add'>+		struct l2tp_net *pn = l2tp_pernet(tunnel-&gt;l2tp_net);</div><div class='add'>+		struct l2tp_session *removed = session;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;tunnel-&gt;list_lock);</div><div class='add'>+		spin_lock_bh(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='add'>+</div><div class='add'>+		/* Remove from the per-tunnel list */</div><div class='add'>+		list_del_init(&amp;session-&gt;list);</div><div class='add'>+</div><div class='add'>+		/* Remove from per-net IDR */</div><div class='add'>+		if (tunnel-&gt;version == L2TP_HDR_VER_3) {</div><div class='add'>+			if (hash_hashed(&amp;session-&gt;hlist))</div><div class='add'>+				l2tp_session_collision_del(pn, session);</div><div class='add'>+			else</div><div class='add'>+				removed = idr_remove(&amp;pn-&gt;l2tp_v3_session_idr,</div><div class='add'>+						     session-&gt;session_id);</div><div class='add'>+		} else {</div><div class='add'>+			u32 session_key = l2tp_v2_session_key(tunnel-&gt;tunnel_id,</div><div class='add'>+							      session-&gt;session_id);</div><div class='add'>+			removed = idr_remove(&amp;pn-&gt;l2tp_v2_session_idr,</div><div class='add'>+					     session_key);</div><div class='add'>+		}</div><div class='add'>+		WARN_ON_ONCE(removed &amp;&amp; removed != session);</div><div class='ctx'> </div><div class='del'>-	/* Disable udp encapsulation */</div><div class='del'>-	switch (tunnel-&gt;encap) {</div><div class='del'>-	case L2TP_ENCAPTYPE_UDP:</div><div class='del'>-		/* No longer an encapsulation socket. See net/ipv4/udp.c */</div><div class='del'>-		(udp_sk(sk))-&gt;encap_type = 0;</div><div class='del'>-		(udp_sk(sk))-&gt;encap_rcv = NULL;</div><div class='del'>-		(udp_sk(sk))-&gt;encap_destroy = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case L2TP_ENCAPTYPE_IP:</div><div class='del'>-		break;</div><div class='add'>+		spin_unlock_bh(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='add'>+		spin_unlock_bh(&amp;tunnel-&gt;list_lock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Remove hooks into tunnel socket */</div><div class='del'>-	sk-&gt;sk_destruct = tunnel-&gt;old_sk_destruct;</div><div class='del'>-	sk-&gt;sk_user_data = NULL;</div><div class='del'>-</div><div class='del'>-	/* Call the original destructor */</div><div class='del'>-	if (sk-&gt;sk_destruct)</div><div class='del'>-		(*sk-&gt;sk_destruct)(sk);</div><div class='del'>-</div><div class='del'>-	kfree_rcu(tunnel, rcu);</div><div class='del'>-end:</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When the tunnel is closed, all the attached sessions need to go too.</div><div class='ctx'>  */</div><div class='ctx'> static void l2tp_tunnel_closeall(struct l2tp_tunnel *tunnel)</div><div class='ctx'> {</div><div class='del'>-	int hash;</div><div class='del'>-	struct hlist_node *walk;</div><div class='del'>-	struct hlist_node *tmp;</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(tunnel == NULL);</div><div class='del'>-</div><div class='del'>-	l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: closing all sessions...\n",</div><div class='del'>-		  tunnel-&gt;name);</div><div class='del'>-</div><div class='del'>-	write_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;list_lock);</div><div class='ctx'> 	tunnel-&gt;acpt_newsess = false;</div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE; hash++) {</div><div class='del'>-again:</div><div class='del'>-		hlist_for_each_safe(walk, tmp, &amp;tunnel-&gt;session_hlist[hash]) {</div><div class='del'>-			session = hlist_entry(walk, struct l2tp_session, hlist);</div><div class='del'>-</div><div class='del'>-			l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-				  "%s: closing session\n", session-&gt;name);</div><div class='del'>-</div><div class='del'>-			hlist_del_init(&amp;session-&gt;hlist);</div><div class='del'>-</div><div class='del'>-			if (test_and_set_bit(0, &amp;session-&gt;dead))</div><div class='del'>-				goto again;</div><div class='del'>-</div><div class='del'>-			write_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-</div><div class='del'>-			__l2tp_session_unhash(session);</div><div class='del'>-			l2tp_session_queue_purge(session);</div><div class='del'>-</div><div class='del'>-			if (session-&gt;session_close != NULL)</div><div class='del'>-				(*session-&gt;session_close)(session);</div><div class='del'>-</div><div class='del'>-			l2tp_session_dec_refcount(session);</div><div class='del'>-</div><div class='del'>-			write_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-</div><div class='del'>-			/* Now restart from the beginning of this hash</div><div class='del'>-			 * chain.  We always remove a session from the</div><div class='del'>-			 * list so we are guaranteed to make forward</div><div class='del'>-			 * progress.</div><div class='del'>-			 */</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	write_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	list_for_each_entry(session, &amp;tunnel-&gt;session_list, list)</div><div class='add'>+		l2tp_session_delete(session);</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Tunnel socket destroy hook for UDP encapsulation */</div><div class='ctx'> static void l2tp_udp_encap_destroy(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel = l2tp_tunnel(sk);</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='ctx'> </div><div class='del'>-	if (tunnel)</div><div class='add'>+	tunnel = l2tp_sk_to_tunnel(sk);</div><div class='add'>+	if (tunnel) {</div><div class='ctx'> 		l2tp_tunnel_delete(tunnel);</div><div class='add'>+		l2tp_tunnel_put(tunnel);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2tp_tunnel_remove(struct net *net, struct l2tp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='add'>+	idr_remove(&amp;pn-&gt;l2tp_tunnel_idr, tunnel-&gt;tunnel_id);</div><div class='add'>+	spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Workqueue tunnel deletion function */</div><div class='hunk'>@@ -1247,7 +1416,6 @@ static void l2tp_tunnel_del_work(struct work_struct *work)</div><div class='ctx'> 						  del_work);</div><div class='ctx'> 	struct sock *sk = tunnel-&gt;sock;</div><div class='ctx'> 	struct socket *sock = sk-&gt;sk_socket;</div><div class='del'>-	struct l2tp_net *pn;</div><div class='ctx'> </div><div class='ctx'> 	l2tp_tunnel_closeall(tunnel);</div><div class='ctx'> </div><div class='hunk'>@@ -1261,17 +1429,12 @@ static void l2tp_tunnel_del_work(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Remove the tunnel struct from the tunnel list */</div><div class='del'>-	pn = l2tp_pernet(tunnel-&gt;l2tp_net);</div><div class='del'>-	spin_lock_bh(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='del'>-	list_del_rcu(&amp;tunnel-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='del'>-</div><div class='add'>+	l2tp_tunnel_remove(tunnel-&gt;l2tp_net, tunnel);</div><div class='ctx'> 	/* drop initial ref */</div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='ctx'> 	/* drop workqueue ref */</div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Create a socket for the tunnel, if one isn't set up by</div><div class='hunk'>@@ -1284,10 +1447,10 @@ static void l2tp_tunnel_del_work(struct work_struct *work)</div><div class='ctx'>  * exit hook.</div><div class='ctx'>  */</div><div class='ctx'> static int l2tp_tunnel_sock_create(struct net *net,</div><div class='del'>-				u32 tunnel_id,</div><div class='del'>-				u32 peer_tunnel_id,</div><div class='del'>-				struct l2tp_tunnel_cfg *cfg,</div><div class='del'>-				struct socket **sockp)</div><div class='add'>+				   u32 tunnel_id,</div><div class='add'>+				   u32 peer_tunnel_id,</div><div class='add'>+				   struct l2tp_tunnel_cfg *cfg,</div><div class='add'>+				   struct socket **sockp)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	struct socket *sock = NULL;</div><div class='hunk'>@@ -1305,9 +1468,9 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			memcpy(&amp;udp_conf.peer_ip6, cfg-&gt;peer_ip6,</div><div class='ctx'> 			       sizeof(udp_conf.peer_ip6));</div><div class='ctx'> 			udp_conf.use_udp6_tx_checksums =</div><div class='del'>-			  ! cfg-&gt;udp6_zero_tx_checksums;</div><div class='add'>+			  !cfg-&gt;udp6_zero_tx_checksums;</div><div class='ctx'> 			udp_conf.use_udp6_rx_checksums =</div><div class='del'>-			  ! cfg-&gt;udp6_zero_rx_checksums;</div><div class='add'>+			  !cfg-&gt;udp6_zero_rx_checksums;</div><div class='ctx'> 		} else</div><div class='ctx'> #endif</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1332,7 +1495,7 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			struct sockaddr_l2tpip6 ip6_addr = {0};</div><div class='ctx'> </div><div class='ctx'> 			err = sock_create_kern(net, AF_INET6, SOCK_DGRAM,</div><div class='del'>-					  IPPROTO_L2TP, &amp;sock);</div><div class='add'>+					       IPPROTO_L2TP, &amp;sock);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,7 +1503,7 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			memcpy(&amp;ip6_addr.l2tp_addr, cfg-&gt;local_ip6,</div><div class='ctx'> 			       sizeof(ip6_addr.l2tp_addr));</div><div class='ctx'> 			ip6_addr.l2tp_conn_id = tunnel_id;</div><div class='del'>-			err = kernel_bind(sock, (struct sockaddr *) &amp;ip6_addr,</div><div class='add'>+			err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;ip6_addr,</div><div class='ctx'> 					  sizeof(ip6_addr));</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1350,7 +1513,7 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			       sizeof(ip6_addr.l2tp_addr));</div><div class='ctx'> 			ip6_addr.l2tp_conn_id = peer_tunnel_id;</div><div class='ctx'> 			err = kernel_connect(sock,</div><div class='del'>-					     (struct sockaddr *) &amp;ip6_addr,</div><div class='add'>+					     (struct sockaddr_unsized *)&amp;ip6_addr,</div><div class='ctx'> 					     sizeof(ip6_addr), 0);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1360,14 +1523,14 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			struct sockaddr_l2tpip ip_addr = {0};</div><div class='ctx'> </div><div class='ctx'> 			err = sock_create_kern(net, AF_INET, SOCK_DGRAM,</div><div class='del'>-					  IPPROTO_L2TP, &amp;sock);</div><div class='add'>+					       IPPROTO_L2TP, &amp;sock);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			ip_addr.l2tp_family = AF_INET;</div><div class='ctx'> 			ip_addr.l2tp_addr = cfg-&gt;local_ip;</div><div class='ctx'> 			ip_addr.l2tp_conn_id = tunnel_id;</div><div class='del'>-			err = kernel_bind(sock, (struct sockaddr *) &amp;ip_addr,</div><div class='add'>+			err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;ip_addr,</div><div class='ctx'> 					  sizeof(ip_addr));</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1375,7 +1538,7 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> 			ip_addr.l2tp_family = AF_INET;</div><div class='ctx'> 			ip_addr.l2tp_addr = cfg-&gt;peer_ip;</div><div class='ctx'> 			ip_addr.l2tp_conn_id = peer_tunnel_id;</div><div class='del'>-			err = kernel_connect(sock, (struct sockaddr *) &amp;ip_addr,</div><div class='add'>+			err = kernel_connect(sock, (struct sockaddr_unsized *)&amp;ip_addr,</div><div class='ctx'> 					     sizeof(ip_addr), 0);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1388,7 +1551,7 @@ static int l2tp_tunnel_sock_create(struct net *net,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	*sockp = sock;</div><div class='del'>-	if ((err &lt; 0) &amp;&amp; sock) {</div><div class='add'>+	if (err &lt; 0 &amp;&amp; sock) {</div><div class='ctx'> 		kernel_sock_shutdown(sock, SHUT_RDWR);</div><div class='ctx'> 		sock_release(sock);</div><div class='ctx'> 		*sockp = NULL;</div><div class='hunk'>@@ -1397,19 +1560,18 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct lock_class_key l2tp_socket_class;</div><div class='del'>-</div><div class='del'>-int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg, struct l2tp_tunnel **tunnelp)</div><div class='add'>+int l2tp_tunnel_create(int fd, int version, u32 tunnel_id, u32 peer_tunnel_id,</div><div class='add'>+		       struct l2tp_tunnel_cfg *cfg, struct l2tp_tunnel **tunnelp)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	enum l2tp_encap_type encap = L2TP_ENCAPTYPE_UDP;</div><div class='ctx'> </div><div class='del'>-	if (cfg != NULL)</div><div class='add'>+	if (cfg)</div><div class='ctx'> 		encap = cfg-&gt;encap;</div><div class='ctx'> </div><div class='del'>-	tunnel = kzalloc(sizeof(struct l2tp_tunnel), GFP_KERNEL);</div><div class='del'>-	if (tunnel == NULL) {</div><div class='add'>+	tunnel = kzalloc(sizeof(*tunnel), GFP_KERNEL);</div><div class='add'>+	if (!tunnel) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1417,15 +1579,11 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32</div><div class='ctx'> 	tunnel-&gt;version = version;</div><div class='ctx'> 	tunnel-&gt;tunnel_id = tunnel_id;</div><div class='ctx'> 	tunnel-&gt;peer_tunnel_id = peer_tunnel_id;</div><div class='del'>-	tunnel-&gt;debug = L2TP_DEFAULT_DEBUG_FLAGS;</div><div class='ctx'> </div><div class='del'>-	tunnel-&gt;magic = L2TP_TUNNEL_MAGIC;</div><div class='ctx'> 	sprintf(&amp;tunnel-&gt;name[0], "tunl %u", tunnel_id);</div><div class='del'>-	rwlock_init(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	spin_lock_init(&amp;tunnel-&gt;list_lock);</div><div class='ctx'> 	tunnel-&gt;acpt_newsess = true;</div><div class='del'>-</div><div class='del'>-	if (cfg != NULL)</div><div class='del'>-		tunnel-&gt;debug = cfg-&gt;debug;</div><div class='add'>+	INIT_LIST_HEAD(&amp;tunnel-&gt;session_list);</div><div class='ctx'> </div><div class='ctx'> 	tunnel-&gt;encap = encap;</div><div class='ctx'> </div><div class='hunk'>@@ -1435,8 +1593,6 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32</div><div class='ctx'> 	/* Init delete workqueue struct */</div><div class='ctx'> 	INIT_WORK(&amp;tunnel-&gt;del_work, l2tp_tunnel_del_work);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;tunnel-&gt;list);</div><div class='del'>-</div><div class='ctx'> 	err = 0;</div><div class='ctx'> err:</div><div class='ctx'> 	if (tunnelp)</div><div class='hunk'>@@ -1449,18 +1605,29 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_create);</div><div class='ctx'> static int l2tp_validate_socket(const struct sock *sk, const struct net *net,</div><div class='ctx'> 				enum l2tp_encap_type encap)</div><div class='ctx'> {</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='add'>+</div><div class='ctx'> 	if (!net_eq(sock_net(sk), net))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_type != SOCK_DGRAM)</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='add'>+	if (sk-&gt;sk_family != PF_INET &amp;&amp; sk-&gt;sk_family != PF_INET6)</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+</div><div class='ctx'> 	if ((encap == L2TP_ENCAPTYPE_UDP &amp;&amp; sk-&gt;sk_protocol != IPPROTO_UDP) ||</div><div class='ctx'> 	    (encap == L2TP_ENCAPTYPE_IP &amp;&amp; sk-&gt;sk_protocol != IPPROTO_L2TP))</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (sk-&gt;sk_user_data)</div><div class='add'>+	if (encap == L2TP_ENCAPTYPE_UDP &amp;&amp; sk-&gt;sk_user_data)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	tunnel = l2tp_sk_to_tunnel(sk);</div><div class='add'>+	if (tunnel) {</div><div class='add'>+		l2tp_tunnel_put(tunnel);</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1468,12 +1635,19 @@ static int l2tp_validate_socket(const struct sock *sk, const struct net *net,</div><div class='ctx'> int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,</div><div class='ctx'> 			 struct l2tp_tunnel_cfg *cfg)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel_walk;</div><div class='del'>-	struct l2tp_net *pn;</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+	u32 tunnel_id = tunnel-&gt;tunnel_id;</div><div class='ctx'> 	struct socket *sock;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='add'>+	ret = idr_alloc_u32(&amp;pn-&gt;l2tp_tunnel_idr, NULL, &amp;tunnel_id, tunnel_id,</div><div class='add'>+			    GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret == -ENOSPC ? -EEXIST : ret;</div><div class='add'>+</div><div class='ctx'> 	if (tunnel-&gt;fd &lt; 0) {</div><div class='ctx'> 		ret = l2tp_tunnel_sock_create(net, tunnel-&gt;tunnel_id,</div><div class='ctx'> 					      tunnel-&gt;peer_tunnel_id, cfg,</div><div class='hunk'>@@ -1484,62 +1658,55 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,</div><div class='ctx'> 		sock = sockfd_lookup(tunnel-&gt;fd, &amp;ret);</div><div class='ctx'> 		if (!sock)</div><div class='ctx'> 			goto err;</div><div class='del'>-</div><div class='del'>-		ret = l2tp_validate_socket(sock-&gt;sk, net, tunnel-&gt;encap);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto err_sock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sk = sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-	sock_hold(sk);</div><div class='del'>-	tunnel-&gt;sock = sk;</div><div class='del'>-	tunnel-&gt;l2tp_net = net;</div><div class='del'>-</div><div class='del'>-	pn = l2tp_pernet(net);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='del'>-	list_for_each_entry(tunnel_walk, &amp;pn-&gt;l2tp_tunnel_list, list) {</div><div class='del'>-		if (tunnel_walk-&gt;tunnel_id == tunnel-&gt;tunnel_id) {</div><div class='del'>-			spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='del'>-</div><div class='del'>-			ret = -EEXIST;</div><div class='del'>-			goto err_sock;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	list_add_rcu(&amp;tunnel-&gt;list, &amp;pn-&gt;l2tp_tunnel_list);</div><div class='del'>-	spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	ret = l2tp_validate_socket(sk, net, tunnel-&gt;encap);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_inval_sock;</div><div class='add'>+	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP) {</div><div class='ctx'> 		struct udp_tunnel_sock_cfg udp_cfg = {</div><div class='del'>-			.sk_user_data = tunnel,</div><div class='ctx'> 			.encap_type = UDP_ENCAP_L2TPINUDP,</div><div class='ctx'> 			.encap_rcv = l2tp_udp_encap_recv,</div><div class='add'>+			.encap_err_rcv = l2tp_udp_encap_err_recv,</div><div class='ctx'> 			.encap_destroy = l2tp_udp_encap_destroy,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		setup_udp_tunnel_sock(net, sock, &amp;udp_cfg);</div><div class='del'>-	} else {</div><div class='del'>-		sk-&gt;sk_user_data = tunnel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tunnel-&gt;old_sk_destruct = sk-&gt;sk_destruct;</div><div class='del'>-	sk-&gt;sk_destruct = &amp;l2tp_tunnel_destruct;</div><div class='del'>-	lockdep_set_class_and_name(&amp;sk-&gt;sk_lock.slock, &amp;l2tp_socket_class,</div><div class='del'>-				   "l2tp_sock");</div><div class='ctx'> 	sk-&gt;sk_allocation = GFP_ATOMIC;</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	tunnel-&gt;sock = sk;</div><div class='add'>+	tunnel-&gt;l2tp_net = net;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='add'>+	idr_replace(&amp;pn-&gt;l2tp_tunnel_idr, tunnel, tunnel-&gt;tunnel_id);</div><div class='add'>+	spin_unlock_bh(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='add'>+</div><div class='add'>+	trace_register_tunnel(tunnel);</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;fd &gt;= 0)</div><div class='ctx'> 		sockfd_put(sock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_sock:</div><div class='add'>+err_inval_sock:</div><div class='add'>+	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='ctx'> 	if (tunnel-&gt;fd &lt; 0)</div><div class='ctx'> 		sock_release(sock);</div><div class='ctx'> 	else</div><div class='ctx'> 		sockfd_put(sock);</div><div class='ctx'> err:</div><div class='add'>+	l2tp_tunnel_remove(net, tunnel);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_tunnel_register);</div><div class='hunk'>@@ -1549,80 +1716,46 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_register);</div><div class='ctx'> void l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_and_set_bit(0, &amp;tunnel-&gt;dead)) {</div><div class='del'>-		l2tp_tunnel_inc_refcount(tunnel);</div><div class='add'>+		trace_delete_tunnel(tunnel);</div><div class='add'>+		refcount_inc(&amp;tunnel-&gt;ref_count);</div><div class='ctx'> 		queue_work(l2tp_wq, &amp;tunnel-&gt;del_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_tunnel_delete);</div><div class='ctx'> </div><div class='del'>-/* Really kill the session.</div><div class='del'>- */</div><div class='del'>-void l2tp_session_free(struct l2tp_session *session)</div><div class='add'>+void l2tp_session_delete(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='del'>-</div><div class='del'>-	BUG_ON(refcount_read(&amp;session-&gt;ref_count) != 0);</div><div class='del'>-</div><div class='del'>-	if (tunnel) {</div><div class='del'>-		BUG_ON(tunnel-&gt;magic != L2TP_TUNNEL_MAGIC);</div><div class='del'>-		l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	if (!test_and_set_bit(0, &amp;session-&gt;dead)) {</div><div class='add'>+		trace_delete_session(session);</div><div class='add'>+		refcount_inc(&amp;session-&gt;ref_count);</div><div class='add'>+		queue_work(l2tp_wq, &amp;session-&gt;del_work);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	kfree(session);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_session_free);</div><div class='del'>-</div><div class='del'>-/* Remove an l2tp session from l2tp_core's hash lists.</div><div class='del'>- * Provides a tidyup interface for pseudowire code which can't just route all</div><div class='del'>- * shutdown via. l2tp_session_delete and a pseudowire-specific session_close</div><div class='del'>- * callback.</div><div class='del'>- */</div><div class='del'>-void __l2tp_session_unhash(struct l2tp_session *session)</div><div class='del'>-{</div><div class='del'>-	struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='del'>-</div><div class='del'>-	/* Remove the session from core hashes */</div><div class='del'>-	if (tunnel) {</div><div class='del'>-		/* Remove from the per-tunnel hash */</div><div class='del'>-		write_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-		hlist_del_init(&amp;session-&gt;hlist);</div><div class='del'>-		write_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-</div><div class='del'>-		/* For L2TPv3 we have a per-net hash: remove from there, too */</div><div class='del'>-		if (tunnel-&gt;version != L2TP_HDR_VER_2) {</div><div class='del'>-			struct l2tp_net *pn = l2tp_pernet(tunnel-&gt;l2tp_net);</div><div class='del'>-			spin_lock_bh(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='del'>-			hlist_del_init_rcu(&amp;session-&gt;global_hlist);</div><div class='del'>-			spin_unlock_bh(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='del'>-			synchronize_rcu();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(__l2tp_session_unhash);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_session_delete);</div><div class='ctx'> </div><div class='del'>-/* This function is used by the netlink SESSION_DELETE command and by</div><div class='del'>-   pseudowire modules.</div><div class='del'>- */</div><div class='del'>-int l2tp_session_delete(struct l2tp_session *session)</div><div class='add'>+/* Workqueue session deletion function */</div><div class='add'>+static void l2tp_session_del_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	if (test_and_set_bit(0, &amp;session-&gt;dead))</div><div class='del'>-		return 0;</div><div class='add'>+	struct l2tp_session *session = container_of(work, struct l2tp_session,</div><div class='add'>+						    del_work);</div><div class='ctx'> </div><div class='del'>-	__l2tp_session_unhash(session);</div><div class='add'>+	l2tp_session_unhash(session);</div><div class='ctx'> 	l2tp_session_queue_purge(session);</div><div class='del'>-	if (session-&gt;session_close != NULL)</div><div class='add'>+	if (session-&gt;session_close)</div><div class='ctx'> 		(*session-&gt;session_close)(session);</div><div class='ctx'> </div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	/* drop initial ref */</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* drop workqueue ref */</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(l2tp_session_delete);</div><div class='ctx'> </div><div class='ctx'> /* We come here whenever a session's send_seq, cookie_len or</div><div class='ctx'>  * l2specific_type parameters are set.</div><div class='ctx'>  */</div><div class='del'>-void l2tp_session_set_header_len(struct l2tp_session *session, int version)</div><div class='add'>+void l2tp_session_set_header_len(struct l2tp_session *session, int version,</div><div class='add'>+				 enum l2tp_encap_type encap)</div><div class='ctx'> {</div><div class='ctx'> 	if (version == L2TP_HDR_VER_2) {</div><div class='ctx'> 		session-&gt;hdr_len = 6;</div><div class='hunk'>@@ -1631,21 +1764,20 @@ void l2tp_session_set_header_len(struct l2tp_session *session, int version)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		session-&gt;hdr_len = 4 + session-&gt;cookie_len;</div><div class='ctx'> 		session-&gt;hdr_len += l2tp_get_l2specific_len(session);</div><div class='del'>-		if (session-&gt;tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP)</div><div class='add'>+		if (encap == L2TP_ENCAPTYPE_UDP)</div><div class='ctx'> 			session-&gt;hdr_len += 4;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(l2tp_session_set_header_len);</div><div class='ctx'> </div><div class='del'>-struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunnel, u32 session_id, u32 peer_session_id, struct l2tp_session_cfg *cfg)</div><div class='add'>+struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunnel, u32 session_id,</div><div class='add'>+					 u32 peer_session_id, struct l2tp_session_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-	session = kzalloc(sizeof(struct l2tp_session) + priv_size, GFP_KERNEL);</div><div class='del'>-	if (session != NULL) {</div><div class='add'>+	session = kzalloc(sizeof(*session) + priv_size, GFP_KERNEL);</div><div class='add'>+	if (session) {</div><div class='ctx'> 		session-&gt;magic = L2TP_SESSION_MAGIC;</div><div class='del'>-		session-&gt;tunnel = tunnel;</div><div class='ctx'> </div><div class='ctx'> 		session-&gt;session_id = session_id;</div><div class='ctx'> 		session-&gt;peer_session_id = peer_session_id;</div><div class='hunk'>@@ -1665,15 +1797,14 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn</div><div class='ctx'> </div><div class='ctx'> 		skb_queue_head_init(&amp;session-&gt;reorder_q);</div><div class='ctx'> </div><div class='add'>+		session-&gt;hlist_key = l2tp_v3_session_hashkey(tunnel-&gt;sock, session-&gt;session_id);</div><div class='ctx'> 		INIT_HLIST_NODE(&amp;session-&gt;hlist);</div><div class='del'>-		INIT_HLIST_NODE(&amp;session-&gt;global_hlist);</div><div class='del'>-</div><div class='del'>-		/* Inherit debug options from tunnel */</div><div class='del'>-		session-&gt;debug = tunnel-&gt;debug;</div><div class='add'>+		INIT_LIST_HEAD(&amp;session-&gt;clist);</div><div class='add'>+		INIT_LIST_HEAD(&amp;session-&gt;list);</div><div class='add'>+		INIT_WORK(&amp;session-&gt;del_work, l2tp_session_del_work);</div><div class='ctx'> </div><div class='ctx'> 		if (cfg) {</div><div class='ctx'> 			session-&gt;pwtype = cfg-&gt;pw_type;</div><div class='del'>-			session-&gt;debug = cfg-&gt;debug;</div><div class='ctx'> 			session-&gt;send_seq = cfg-&gt;send_seq;</div><div class='ctx'> 			session-&gt;recv_seq = cfg-&gt;recv_seq;</div><div class='ctx'> 			session-&gt;lns_mode = cfg-&gt;lns_mode;</div><div class='hunk'>@@ -1685,12 +1816,7 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn</div><div class='ctx'> 			memcpy(&amp;session-&gt;peer_cookie[0], &amp;cfg-&gt;peer_cookie[0], cfg-&gt;peer_cookie_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (tunnel-&gt;version == L2TP_HDR_VER_2)</div><div class='del'>-			session-&gt;build_header = l2tp_build_l2tpv2_header;</div><div class='del'>-		else</div><div class='del'>-			session-&gt;build_header = l2tp_build_l2tpv3_header;</div><div class='del'>-</div><div class='del'>-		l2tp_session_set_header_len(session, tunnel-&gt;version);</div><div class='add'>+		l2tp_session_set_header_len(session, tunnel-&gt;version, tunnel-&gt;encap);</div><div class='ctx'> </div><div class='ctx'> 		refcount_set(&amp;session-&gt;ref_count, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1708,41 +1834,74 @@ EXPORT_SYMBOL_GPL(l2tp_session_create);</div><div class='ctx'> static __net_init int l2tp_init_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_net *pn = net_generic(net, l2tp_net_id);</div><div class='del'>-	int hash;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;pn-&gt;l2tp_tunnel_list);</div><div class='del'>-	spin_lock_init(&amp;pn-&gt;l2tp_tunnel_list_lock);</div><div class='ctx'> </div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE_2; hash++)</div><div class='del'>-		INIT_HLIST_HEAD(&amp;pn-&gt;l2tp_session_hlist[hash]);</div><div class='add'>+	idr_init(&amp;pn-&gt;l2tp_tunnel_idr);</div><div class='add'>+	spin_lock_init(&amp;pn-&gt;l2tp_tunnel_idr_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;pn-&gt;l2tp_session_hlist_lock);</div><div class='add'>+	idr_init(&amp;pn-&gt;l2tp_v2_session_idr);</div><div class='add'>+	idr_init(&amp;pn-&gt;l2tp_v3_session_idr);</div><div class='add'>+	spin_lock_init(&amp;pn-&gt;l2tp_session_idr_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __net_exit void l2tp_exit_net(struct net *net)</div><div class='add'>+static __net_exit void l2tp_pre_exit_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = NULL;</div><div class='del'>-	int hash;</div><div class='add'>+	unsigned long tunnel_id, tmp;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='del'>-	list_for_each_entry_rcu(tunnel, &amp;pn-&gt;l2tp_tunnel_list, list) {</div><div class='del'>-		l2tp_tunnel_delete(tunnel);</div><div class='add'>+	idr_for_each_entry_ul(&amp;pn-&gt;l2tp_tunnel_idr, tunnel, tmp, tunnel_id) {</div><div class='add'>+		if (tunnel)</div><div class='add'>+			l2tp_tunnel_delete(tunnel);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(l2tp_wq);</div><div class='del'>-	rcu_barrier();</div><div class='add'>+	if (l2tp_wq) {</div><div class='add'>+		/* Run all TUNNEL_DELETE work items just queued. */</div><div class='add'>+		__flush_workqueue(l2tp_wq);</div><div class='ctx'> </div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE_2; hash++)</div><div class='del'>-		WARN_ON_ONCE(!hlist_empty(&amp;pn-&gt;l2tp_session_hlist[hash]));</div><div class='add'>+		/* Each TUNNEL_DELETE work item will queue a SESSION_DELETE</div><div class='add'>+		 * work item for each session in the tunnel. Flush the</div><div class='add'>+		 * workqueue again to process these.</div><div class='add'>+		 */</div><div class='add'>+		__flush_workqueue(l2tp_wq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int l2tp_idr_item_unexpected(int id, void *p, void *data)</div><div class='add'>+{</div><div class='add'>+	const char *idr_name = data;</div><div class='add'>+</div><div class='add'>+	pr_err("l2tp: %s IDR not empty at net %d exit\n", idr_name, id);</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __net_exit void l2tp_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_net *pn = l2tp_pernet(net);</div><div class='add'>+</div><div class='add'>+	/* Our per-net IDRs should be empty. Check that is so, to</div><div class='add'>+	 * help catch cleanup races or refcnt leaks.</div><div class='add'>+	 */</div><div class='add'>+	idr_for_each(&amp;pn-&gt;l2tp_v2_session_idr, l2tp_idr_item_unexpected,</div><div class='add'>+		     "v2_session");</div><div class='add'>+	idr_for_each(&amp;pn-&gt;l2tp_v3_session_idr, l2tp_idr_item_unexpected,</div><div class='add'>+		     "v3_session");</div><div class='add'>+	idr_for_each(&amp;pn-&gt;l2tp_tunnel_idr, l2tp_idr_item_unexpected,</div><div class='add'>+		     "tunnel");</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;pn-&gt;l2tp_v2_session_idr);</div><div class='add'>+	idr_destroy(&amp;pn-&gt;l2tp_v3_session_idr);</div><div class='add'>+	idr_destroy(&amp;pn-&gt;l2tp_tunnel_idr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations l2tp_net_ops = {</div><div class='ctx'> 	.init = l2tp_init_net,</div><div class='ctx'> 	.exit = l2tp_exit_net,</div><div class='add'>+	.pre_exit = l2tp_pre_exit_net,</div><div class='ctx'> 	.id   = &amp;l2tp_net_id,</div><div class='ctx'> 	.size = sizeof(struct l2tp_net),</div><div class='ctx'> };</div><div class='head'>diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h<br/>index 9c9afe94d389..ffd8ced3a51f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_core.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_core.h</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * L2TP internal definitions.</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* L2TP internal definitions.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008,2009 Katalix Systems Ltd</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -19,18 +15,9 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Just some random numbers */</div><div class='del'>-#define L2TP_TUNNEL_MAGIC	0x42114DDA</div><div class='add'>+/* Random numbers used for internal consistency checks of tunnel and session structures */</div><div class='ctx'> #define L2TP_SESSION_MAGIC	0x0C04EB7D</div><div class='ctx'> </div><div class='del'>-/* Per tunnel, session hash table size */</div><div class='del'>-#define L2TP_HASH_BITS	4</div><div class='del'>-#define L2TP_HASH_SIZE	(1 &lt;&lt; L2TP_HASH_BITS)</div><div class='del'>-</div><div class='del'>-/* System-wide, session hash table size */</div><div class='del'>-#define L2TP_HASH_BITS_2	8</div><div class='del'>-#define L2TP_HASH_SIZE_2	(1 &lt;&lt; L2TP_HASH_BITS_2)</div><div class='del'>-</div><div class='ctx'> struct sk_buff;</div><div class='ctx'> </div><div class='ctx'> struct l2tp_stats {</div><div class='hunk'>@@ -43,41 +30,45 @@ struct l2tp_stats {</div><div class='ctx'> 	atomic_long_t		rx_oos_packets;</div><div class='ctx'> 	atomic_long_t		rx_errors;</div><div class='ctx'> 	atomic_long_t		rx_cookie_discards;</div><div class='add'>+	atomic_long_t		rx_invalid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct l2tp_tunnel;</div><div class='ctx'> </div><div class='del'>-/* Describes a session. Contains information to determine incoming</div><div class='del'>- * packets and transmit outgoing ones.</div><div class='del'>- */</div><div class='add'>+/* L2TP session configuration */</div><div class='ctx'> struct l2tp_session_cfg {</div><div class='ctx'> 	enum l2tp_pwtype	pw_type;</div><div class='del'>-	unsigned int		recv_seq:1;	/* expect receive packets with</div><div class='del'>-						 * sequence numbers? */</div><div class='del'>-	unsigned int		send_seq:1;	/* send packets with sequence</div><div class='del'>-						 * numbers? */</div><div class='del'>-	unsigned int		lns_mode:1;	/* behave as LNS? LAC enables</div><div class='del'>-						 * sequence numbers under</div><div class='del'>-						 * control of LNS. */</div><div class='del'>-	int			debug;		/* bitmask of debug message</div><div class='del'>-						 * categories */</div><div class='add'>+	unsigned int		recv_seq:1;	/* expect receive packets with sequence numbers? */</div><div class='add'>+	unsigned int		send_seq:1;	/* send packets with sequence numbers? */</div><div class='add'>+	unsigned int		lns_mode:1;	/* behave as LNS?</div><div class='add'>+						 * LAC enables sequence numbers under LNS control.</div><div class='add'>+						 */</div><div class='ctx'> 	u16			l2specific_type; /* Layer 2 specific type */</div><div class='ctx'> 	u8			cookie[8];	/* optional cookie */</div><div class='ctx'> 	int			cookie_len;	/* 0, 4 or 8 bytes */</div><div class='ctx'> 	u8			peer_cookie[8];	/* peer's cookie */</div><div class='ctx'> 	int			peer_cookie_len; /* 0, 4 or 8 bytes */</div><div class='del'>-	int			reorder_timeout; /* configured reorder timeout</div><div class='del'>-						  * (in jiffies) */</div><div class='add'>+	int			reorder_timeout; /* configured reorder timeout (in jiffies) */</div><div class='ctx'> 	char			*ifname;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct l2tp_session_coll_list {</div><div class='add'>+	spinlock_t lock;	/* for access to list */</div><div class='add'>+	struct list_head list;</div><div class='add'>+	refcount_t ref_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Represents a session (pseudowire) instance.</div><div class='add'>+ * Tracks runtime state including cookies, dataplane packet sequencing, and IO statistics.</div><div class='add'>+ * Is linked into a per-tunnel session list and a per-net ("global") IDR tree.</div><div class='add'>+ */</div><div class='add'>+#define L2TP_SESSION_NAME_MAX 32</div><div class='ctx'> struct l2tp_session {</div><div class='del'>-	int			magic;		/* should be</div><div class='del'>-						 * L2TP_SESSION_MAGIC */</div><div class='add'>+	int			magic;		/* should be L2TP_SESSION_MAGIC */</div><div class='ctx'> 	long			dead;</div><div class='add'>+	struct rcu_head		rcu;</div><div class='ctx'> </div><div class='del'>-	struct l2tp_tunnel	*tunnel;	/* back pointer to tunnel</div><div class='del'>-						 * context */</div><div class='add'>+	struct l2tp_tunnel	*tunnel;	/* back pointer to tunnel context */</div><div class='ctx'> 	u32			session_id;</div><div class='ctx'> 	u32			peer_session_id;</div><div class='ctx'> 	u8			cookie[8];</div><div class='hunk'>@@ -92,42 +83,55 @@ struct l2tp_session {</div><div class='ctx'> 	u32			nr_max;		/* max NR. Depends on tunnel */</div><div class='ctx'> 	u32			nr_window_size;	/* NR window size */</div><div class='ctx'> 	u32			nr_oos;		/* NR of last OOS packet */</div><div class='del'>-	int			nr_oos_count;	/* For OOS recovery */</div><div class='add'>+	int			nr_oos_count;	/* for OOS recovery */</div><div class='ctx'> 	int			nr_oos_count_max;</div><div class='del'>-	struct hlist_node	hlist;		/* Hash list node */</div><div class='add'>+	struct list_head	list;		/* per-tunnel list node */</div><div class='ctx'> 	refcount_t		ref_count;</div><div class='add'>+	struct hlist_node	hlist;		/* per-net session hlist */</div><div class='add'>+	unsigned long		hlist_key;	/* key for session hlist */</div><div class='add'>+	struct l2tp_session_coll_list *coll_list; /* session collision list */</div><div class='add'>+	struct list_head	clist;		/* for coll_list */</div><div class='ctx'> </div><div class='del'>-	char			name[32];	/* for logging */</div><div class='add'>+	char			name[L2TP_SESSION_NAME_MAX]; /* for logging */</div><div class='ctx'> 	char			ifname[IFNAMSIZ];</div><div class='del'>-	unsigned int		recv_seq:1;	/* expect receive packets with</div><div class='del'>-						 * sequence numbers? */</div><div class='del'>-	unsigned int		send_seq:1;	/* send packets with sequence</div><div class='del'>-						 * numbers? */</div><div class='del'>-	unsigned int		lns_mode:1;	/* behave as LNS? LAC enables</div><div class='del'>-						 * sequence numbers under</div><div class='del'>-						 * control of LNS. */</div><div class='del'>-	int			debug;		/* bitmask of debug message</div><div class='del'>-						 * categories */</div><div class='del'>-	int			reorder_timeout; /* configured reorder timeout</div><div class='del'>-						  * (in jiffies) */</div><div class='add'>+	unsigned int		recv_seq:1;	/* expect receive packets with sequence numbers? */</div><div class='add'>+	unsigned int		send_seq:1;	/* send packets with sequence numbers? */</div><div class='add'>+	unsigned int		lns_mode:1;	/* behave as LNS?</div><div class='add'>+						 * LAC enables sequence numbers under LNS control.</div><div class='add'>+						 */</div><div class='add'>+	int			reorder_timeout; /* configured reorder timeout (in jiffies) */</div><div class='ctx'> 	int			reorder_skip;	/* set if skip to next nr */</div><div class='ctx'> 	enum l2tp_pwtype	pwtype;</div><div class='ctx'> 	struct l2tp_stats	stats;</div><div class='del'>-	struct hlist_node	global_hlist;	/* Global hash list node */</div><div class='add'>+	struct work_struct	del_work;</div><div class='ctx'> </div><div class='del'>-	int (*build_header)(struct l2tp_session *session, void *buf);</div><div class='add'>+	/* Session receive handler for data packets.</div><div class='add'>+	 * Each pseudowire implementation should implement this callback in order to</div><div class='add'>+	 * handle incoming packets.  Packets are passed to the pseudowire handler after</div><div class='add'>+	 * reordering, if data sequence numbers are enabled for the session.</div><div class='add'>+	 */</div><div class='ctx'> 	void (*recv_skb)(struct l2tp_session *session, struct sk_buff *skb, int data_len);</div><div class='add'>+</div><div class='add'>+	/* Session close handler.</div><div class='add'>+	 * Each pseudowire implementation may implement this callback in order to carry</div><div class='add'>+	 * out pseudowire-specific shutdown actions.</div><div class='add'>+	 * The callback is called by core after unlisting the session and purging its</div><div class='add'>+	 * reorder queue.</div><div class='add'>+	 */</div><div class='ctx'> 	void (*session_close)(struct l2tp_session *session);</div><div class='add'>+</div><div class='add'>+	/* Session show handler.</div><div class='add'>+	 * Pseudowire-specific implementation of debugfs session rendering.</div><div class='add'>+	 * The callback is called by l2tp_debugfs.c after rendering core session</div><div class='add'>+	 * information.</div><div class='add'>+	 */</div><div class='ctx'> 	void (*show)(struct seq_file *m, void *priv);</div><div class='del'>-	uint8_t			priv[0];	/* private data */</div><div class='add'>+</div><div class='add'>+	u8			priv[];		/* private data */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Describes the tunnel. It contains info to track all the associated</div><div class='del'>- * sessions so incoming packets can be sorted out</div><div class='del'>- */</div><div class='add'>+/* L2TP tunnel configuration */</div><div class='ctx'> struct l2tp_tunnel_cfg {</div><div class='del'>-	int			debug;		/* bitmask of debug message</div><div class='del'>-						 * categories */</div><div class='ctx'> 	enum l2tp_encap_type	encap;</div><div class='ctx'> </div><div class='ctx'> 	/* Used only for kernel-created sockets */</div><div class='hunk'>@@ -144,47 +148,59 @@ struct l2tp_tunnel_cfg {</div><div class='ctx'> 				udp6_zero_rx_checksums:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Represents a tunnel instance.</div><div class='add'>+ * Tracks runtime state including IO statistics.</div><div class='add'>+ * Holds the tunnel socket (either passed from userspace or directly created by the kernel).</div><div class='add'>+ * Maintains a list of sessions belonging to the tunnel instance.</div><div class='add'>+ * Is linked into a per-net list of tunnels.</div><div class='add'>+ */</div><div class='add'>+#define L2TP_TUNNEL_NAME_MAX 20</div><div class='ctx'> struct l2tp_tunnel {</div><div class='del'>-	int			magic;		/* Should be L2TP_TUNNEL_MAGIC */</div><div class='del'>-</div><div class='ctx'> 	unsigned long		dead;</div><div class='ctx'> </div><div class='ctx'> 	struct rcu_head rcu;</div><div class='del'>-	rwlock_t		hlist_lock;	/* protect session_hlist */</div><div class='del'>-	bool			acpt_newsess;	/* Indicates whether this</div><div class='del'>-						 * tunnel accepts new sessions.</div><div class='del'>-						 * Protected by hlist_lock.</div><div class='add'>+	spinlock_t		list_lock;	/* write-protection for session_list */</div><div class='add'>+	bool			acpt_newsess;	/* indicates whether this tunnel accepts</div><div class='add'>+						 * new sessions. Protected by list_lock.</div><div class='ctx'> 						 */</div><div class='del'>-	struct hlist_head	session_hlist[L2TP_HASH_SIZE];</div><div class='del'>-						/* hashed list of sessions,</div><div class='del'>-						 * hashed by id */</div><div class='add'>+	struct list_head	session_list;	/* list of sessions */</div><div class='ctx'> 	u32			tunnel_id;</div><div class='ctx'> 	u32			peer_tunnel_id;</div><div class='ctx'> 	int			version;	/* 2=&gt;L2TPv2, 3=&gt;L2TPv3 */</div><div class='ctx'> </div><div class='del'>-	char			name[20];	/* for logging */</div><div class='del'>-	int			debug;		/* bitmask of debug message</div><div class='del'>-						 * categories */</div><div class='add'>+	char			name[L2TP_TUNNEL_NAME_MAX]; /* for logging */</div><div class='ctx'> 	enum l2tp_encap_type	encap;</div><div class='ctx'> 	struct l2tp_stats	stats;</div><div class='ctx'> </div><div class='del'>-	struct list_head	list;		/* Keep a list of all tunnels */</div><div class='ctx'> 	struct net		*l2tp_net;	/* the net we belong to */</div><div class='ctx'> </div><div class='ctx'> 	refcount_t		ref_count;</div><div class='del'>-	void (*old_sk_destruct)(struct sock *);</div><div class='del'>-	struct sock		*sock;		/* Parent socket */</div><div class='del'>-	int			fd;		/* Parent fd, if tunnel socket</div><div class='del'>-						 * was created by userspace */</div><div class='add'>+	struct sock		*sock;		/* parent socket */</div><div class='add'>+	int			fd;		/* parent fd, if tunnel socket was created</div><div class='add'>+						 * by userspace</div><div class='add'>+						 */</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct	del_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Pseudowire ops callbacks for use with the l2tp genetlink interface */</div><div class='ctx'> struct l2tp_nl_cmd_ops {</div><div class='add'>+	/* The pseudowire session create callback is responsible for creating a session</div><div class='add'>+	 * instance for a specific pseudowire type.</div><div class='add'>+	 * It must call l2tp_session_create and l2tp_session_register to register the</div><div class='add'>+	 * session instance, as well as carry out any pseudowire-specific initialisation.</div><div class='add'>+	 * It must return &gt;= 0 on success, or an appropriate negative errno value on failure.</div><div class='add'>+	 */</div><div class='ctx'> 	int (*session_create)(struct net *net, struct l2tp_tunnel *tunnel,</div><div class='ctx'> 			      u32 session_id, u32 peer_session_id,</div><div class='ctx'> 			      struct l2tp_session_cfg *cfg);</div><div class='del'>-	int (*session_delete)(struct l2tp_session *session);</div><div class='add'>+</div><div class='add'>+	/* The pseudowire session delete callback is responsible for initiating the deletion</div><div class='add'>+	 * of a session instance.</div><div class='add'>+	 * It must call l2tp_session_delete, as well as carry out any pseudowire-specific</div><div class='add'>+	 * teardown actions.</div><div class='add'>+	 */</div><div class='add'>+	void (*session_delete)(struct l2tp_session *session);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void *l2tp_session_priv(struct l2tp_session *session)</div><div class='hunk'>@@ -192,73 +208,70 @@ static inline void *l2tp_session_priv(struct l2tp_session *session)</div><div class='ctx'> 	return &amp;session-&gt;priv[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id);</div><div class='del'>-struct l2tp_tunnel *l2tp_tunnel_get_nth(const struct net *net, int nth);</div><div class='del'>-struct l2tp_session *l2tp_tunnel_get_session(struct l2tp_tunnel *tunnel,</div><div class='del'>-					     u32 session_id);</div><div class='del'>-</div><div class='del'>-void l2tp_tunnel_free(struct l2tp_tunnel *tunnel);</div><div class='add'>+/* Tunnel and session refcounts */</div><div class='add'>+void l2tp_tunnel_put(struct l2tp_tunnel *tunnel);</div><div class='add'>+void l2tp_session_put(struct l2tp_session *session);</div><div class='ctx'> </div><div class='del'>-struct l2tp_session *l2tp_session_get(const struct net *net, u32 session_id);</div><div class='del'>-struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth);</div><div class='add'>+/* Tunnel and session lookup.</div><div class='add'>+ * These functions take a reference on the instances they return, so</div><div class='add'>+ * the caller must ensure that the reference is dropped appropriately.</div><div class='add'>+ */</div><div class='add'>+struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id);</div><div class='add'>+struct l2tp_tunnel *l2tp_tunnel_get_next(const struct net *net, unsigned long *key);</div><div class='add'>+</div><div class='add'>+struct l2tp_session *l2tp_v3_session_get(const struct net *net, struct sock *sk, u32 session_id);</div><div class='add'>+struct l2tp_session *l2tp_v2_session_get(const struct net *net, u16 tunnel_id, u16 session_id);</div><div class='add'>+struct l2tp_session *l2tp_session_get(const struct net *net, struct sock *sk, int pver,</div><div class='add'>+				      u32 tunnel_id, u32 session_id);</div><div class='add'>+struct l2tp_session *l2tp_session_get_next(const struct net *net, struct sock *sk, int pver,</div><div class='add'>+					   u32 tunnel_id, unsigned long *key);</div><div class='ctx'> struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,</div><div class='ctx'> 						const char *ifname);</div><div class='ctx'> </div><div class='del'>-int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,</div><div class='add'>+/* Tunnel and session lifetime management.</div><div class='add'>+ * Creation of a new instance is a two-step process: create, then register.</div><div class='add'>+ * Destruction is triggered using the *_delete functions, and completes asynchronously.</div><div class='add'>+ */</div><div class='add'>+int l2tp_tunnel_create(int fd, int version, u32 tunnel_id,</div><div class='ctx'> 		       u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,</div><div class='ctx'> 		       struct l2tp_tunnel **tunnelp);</div><div class='ctx'> int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,</div><div class='ctx'> 			 struct l2tp_tunnel_cfg *cfg);</div><div class='del'>-</div><div class='ctx'> void l2tp_tunnel_delete(struct l2tp_tunnel *tunnel);</div><div class='add'>+</div><div class='ctx'> struct l2tp_session *l2tp_session_create(int priv_size,</div><div class='ctx'> 					 struct l2tp_tunnel *tunnel,</div><div class='ctx'> 					 u32 session_id, u32 peer_session_id,</div><div class='ctx'> 					 struct l2tp_session_cfg *cfg);</div><div class='ctx'> int l2tp_session_register(struct l2tp_session *session,</div><div class='ctx'> 			  struct l2tp_tunnel *tunnel);</div><div class='add'>+void l2tp_session_delete(struct l2tp_session *session);</div><div class='ctx'> </div><div class='del'>-void __l2tp_session_unhash(struct l2tp_session *session);</div><div class='del'>-int l2tp_session_delete(struct l2tp_session *session);</div><div class='del'>-void l2tp_session_free(struct l2tp_session *session);</div><div class='add'>+/* Receive path helpers.  If data sequencing is enabled for the session these</div><div class='add'>+ * functions handle queuing and reordering prior to passing packets to the</div><div class='add'>+ * pseudowire code to be passed to userspace.</div><div class='add'>+ */</div><div class='ctx'> void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,</div><div class='ctx'> 		      unsigned char *ptr, unsigned char *optr, u16 hdrflags,</div><div class='ctx'> 		      int length);</div><div class='ctx'> int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-void l2tp_session_set_header_len(struct l2tp_session *session, int version);</div><div class='ctx'> </div><div class='del'>-int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb,</div><div class='del'>-		  int hdr_len);</div><div class='add'>+/* Transmit path helpers for sending packets over the tunnel socket. */</div><div class='add'>+void l2tp_session_set_header_len(struct l2tp_session *session, int version,</div><div class='add'>+				 enum l2tp_encap_type encap);</div><div class='add'>+int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-int l2tp_nl_register_ops(enum l2tp_pwtype pw_type,</div><div class='del'>-			 const struct l2tp_nl_cmd_ops *ops);</div><div class='add'>+/* Pseudowire management.</div><div class='add'>+ * Pseudowires should register with l2tp core on module init, and unregister</div><div class='add'>+ * on module exit.</div><div class='add'>+ */</div><div class='add'>+int l2tp_nl_register_ops(enum l2tp_pwtype pw_type, const struct l2tp_nl_cmd_ops *ops);</div><div class='ctx'> void l2tp_nl_unregister_ops(enum l2tp_pwtype pw_type);</div><div class='del'>-int l2tp_ioctl(struct sock *sk, int cmd, unsigned long arg);</div><div class='ctx'> </div><div class='del'>-static inline void l2tp_tunnel_inc_refcount(struct l2tp_tunnel *tunnel)</div><div class='del'>-{</div><div class='del'>-	refcount_inc(&amp;tunnel-&gt;ref_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void l2tp_tunnel_dec_refcount(struct l2tp_tunnel *tunnel)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;tunnel-&gt;ref_count))</div><div class='del'>-		l2tp_tunnel_free(tunnel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Session reference counts. Incremented when code obtains a reference</div><div class='del'>- * to a session.</div><div class='del'>- */</div><div class='del'>-static inline void l2tp_session_inc_refcount(struct l2tp_session *session)</div><div class='del'>-{</div><div class='del'>-	refcount_inc(&amp;session-&gt;ref_count);</div><div class='del'>-}</div><div class='add'>+/* IOCTL helper for IP encap modules. */</div><div class='add'>+int l2tp_ioctl(struct sock *sk, int cmd, int *karg);</div><div class='ctx'> </div><div class='del'>-static inline void l2tp_session_dec_refcount(struct l2tp_session *session)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;session-&gt;ref_count))</div><div class='del'>-		l2tp_session_free(session);</div><div class='del'>-}</div><div class='add'>+struct l2tp_tunnel *l2tp_sk_to_tunnel(const struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> static inline int l2tp_get_l2specific_len(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='hunk'>@@ -301,18 +314,25 @@ static inline bool l2tp_tunnel_uses_xfrm(const struct l2tp_tunnel *tunnel)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define l2tp_printk(ptr, type, func, fmt, ...)				\</div><div class='del'>-do {									\</div><div class='del'>-	if (((ptr)-&gt;debug) &amp; (type))					\</div><div class='del'>-		func(fmt, ##__VA_ARGS__);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define l2tp_warn(ptr, type, fmt, ...)					\</div><div class='del'>-	l2tp_printk(ptr, type, pr_warn, fmt, ##__VA_ARGS__)</div><div class='del'>-#define l2tp_info(ptr, type, fmt, ...)					\</div><div class='del'>-	l2tp_printk(ptr, type, pr_info, fmt, ##__VA_ARGS__)</div><div class='del'>-#define l2tp_dbg(ptr, type, fmt, ...)					\</div><div class='del'>-	l2tp_printk(ptr, type, pr_debug, fmt, ##__VA_ARGS__)</div><div class='add'>+static inline int l2tp_v3_ensure_opt_in_linear(struct l2tp_session *session, struct sk_buff *skb,</div><div class='add'>+					       unsigned char **ptr, unsigned char **optr)</div><div class='add'>+{</div><div class='add'>+	int opt_len = session-&gt;peer_cookie_len + l2tp_get_l2specific_len(session);</div><div class='add'>+</div><div class='add'>+	if (opt_len &gt; 0) {</div><div class='add'>+		int off = *ptr - *optr;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, off + opt_len))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;data != *optr) {</div><div class='add'>+			*optr = skb-&gt;data;</div><div class='add'>+			*ptr = skb-&gt;data + off;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define MODULE_ALIAS_L2TP_PWTYPE(type) \</div><div class='ctx'> 	MODULE_ALIAS("net-l2tp-type-" __stringify(type))</div><div class='head'>diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c<br/>index 9821a1458555..5cfaab7d0890 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_debugfs.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * L2TP subsystem debugfs</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* L2TP subsystem debugfs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010 Katalix Systems Ltd</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -35,12 +30,12 @@</div><div class='ctx'> #include "l2tp_core.h"</div><div class='ctx'> </div><div class='ctx'> static struct dentry *rootdir;</div><div class='del'>-static struct dentry *tunnels;</div><div class='ctx'> </div><div class='ctx'> struct l2tp_dfs_seq_data {</div><div class='del'>-	struct net *net;</div><div class='del'>-	int tunnel_idx;			/* current tunnel */</div><div class='del'>-	int session_idx;		/* index of session within current tunnel */</div><div class='add'>+	struct net	*net;</div><div class='add'>+	netns_tracker	ns_tracker;</div><div class='add'>+	unsigned long tkey;		/* lookup key of current tunnel */</div><div class='add'>+	unsigned long skey;		/* lookup key of current session */</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> 	struct l2tp_session *session;	/* NULL means get next tunnel */</div><div class='ctx'> };</div><div class='hunk'>@@ -49,26 +44,27 @@ static void l2tp_dfs_next_tunnel(struct l2tp_dfs_seq_data *pd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop reference taken during previous invocation */</div><div class='ctx'> 	if (pd-&gt;tunnel)</div><div class='del'>-		l2tp_tunnel_dec_refcount(pd-&gt;tunnel);</div><div class='add'>+		l2tp_tunnel_put(pd-&gt;tunnel);</div><div class='ctx'> </div><div class='del'>-	pd-&gt;tunnel = l2tp_tunnel_get_nth(pd-&gt;net, pd-&gt;tunnel_idx);</div><div class='del'>-	pd-&gt;tunnel_idx++;</div><div class='add'>+	pd-&gt;tunnel = l2tp_tunnel_get_next(pd-&gt;net, &amp;pd-&gt;tkey);</div><div class='add'>+	pd-&gt;tkey++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_dfs_next_session(struct l2tp_dfs_seq_data *pd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop reference taken during previous invocation */</div><div class='ctx'> 	if (pd-&gt;session)</div><div class='del'>-		l2tp_session_dec_refcount(pd-&gt;session);</div><div class='add'>+		l2tp_session_put(pd-&gt;session);</div><div class='ctx'> </div><div class='del'>-	pd-&gt;session = l2tp_session_get_nth(pd-&gt;tunnel, pd-&gt;session_idx);</div><div class='del'>-	pd-&gt;session_idx++;</div><div class='add'>+	pd-&gt;session = l2tp_session_get_next(pd-&gt;net, pd-&gt;tunnel-&gt;sock,</div><div class='add'>+					    pd-&gt;tunnel-&gt;version,</div><div class='add'>+					    pd-&gt;tunnel-&gt;tunnel_id, &amp;pd-&gt;skey);</div><div class='add'>+	pd-&gt;skey++;</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;session == NULL) {</div><div class='del'>-		pd-&gt;session_idx = 0;</div><div class='add'>+	if (!pd-&gt;session) {</div><div class='add'>+		pd-&gt;skey = 0;</div><div class='ctx'> 		l2tp_dfs_next_tunnel(pd);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *l2tp_dfs_seq_start(struct seq_file *m, loff_t *offs)</div><div class='hunk'>@@ -79,23 +75,25 @@ static void *l2tp_dfs_seq_start(struct seq_file *m, loff_t *offs)</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(m-&gt;private == NULL);</div><div class='add'>+	if (WARN_ON(!m-&gt;private)) {</div><div class='add'>+		pd = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	pd = m-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;tunnel == NULL)</div><div class='add'>+	if (!pd-&gt;tunnel)</div><div class='ctx'> 		l2tp_dfs_next_tunnel(pd);</div><div class='ctx'> 	else</div><div class='ctx'> 		l2tp_dfs_next_session(pd);</div><div class='ctx'> </div><div class='ctx'> 	/* NULL tunnel and session indicates end of list */</div><div class='del'>-	if ((pd-&gt;tunnel == NULL) &amp;&amp; (pd-&gt;session == NULL))</div><div class='add'>+	if (!pd-&gt;tunnel &amp;&amp; !pd-&gt;session)</div><div class='ctx'> 		pd = NULL;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return pd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void *l2tp_dfs_seq_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	(*pos)++;</div><div class='hunk'>@@ -113,11 +111,11 @@ static void l2tp_dfs_seq_stop(struct seq_file *p, void *v)</div><div class='ctx'> 	 * or l2tp_dfs_next_tunnel().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pd-&gt;session) {</div><div class='del'>-		l2tp_session_dec_refcount(pd-&gt;session);</div><div class='add'>+		l2tp_session_put(pd-&gt;session);</div><div class='ctx'> 		pd-&gt;session = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pd-&gt;tunnel) {</div><div class='del'>-		l2tp_tunnel_dec_refcount(pd-&gt;tunnel);</div><div class='add'>+		l2tp_tunnel_put(pd-&gt;tunnel);</div><div class='ctx'> 		pd-&gt;tunnel = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -125,24 +123,18 @@ static void l2tp_dfs_seq_stop(struct seq_file *p, void *v)</div><div class='ctx'> static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = v;</div><div class='add'>+	struct l2tp_session *session;</div><div class='ctx'> 	int session_count = 0;</div><div class='del'>-	int hash;</div><div class='del'>-	struct hlist_node *walk;</div><div class='del'>-	struct hlist_node *tmp;</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='del'>-	for (hash = 0; hash &lt; L2TP_HASH_SIZE; hash++) {</div><div class='del'>-		hlist_for_each_safe(walk, tmp, &amp;tunnel-&gt;session_hlist[hash]) {</div><div class='del'>-			struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-			session = hlist_entry(walk, struct l2tp_session, hlist);</div><div class='del'>-			if (session-&gt;session_id == 0)</div><div class='del'>-				continue;</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	list_for_each_entry_rcu(session, &amp;tunnel-&gt;session_list, list) {</div><div class='add'>+		/* Session ID of zero is a dummy/reserved value used by pppol2tp */</div><div class='add'>+		if (session-&gt;session_id == 0)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			session_count++;</div><div class='del'>-		}</div><div class='add'>+		session_count++;</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_bh(&amp;tunnel-&gt;hlist_lock);</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "\nTUNNEL %u peer %u", tunnel-&gt;tunnel_id, tunnel-&gt;peer_tunnel_id);</div><div class='ctx'> 	if (tunnel-&gt;sock) {</div><div class='hunk'>@@ -153,11 +145,13 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v)</div><div class='ctx'> 			const struct ipv6_pinfo *np = inet6_sk(tunnel-&gt;sock);</div><div class='ctx'> </div><div class='ctx'> 			seq_printf(m, " from %pI6c to %pI6c\n",</div><div class='del'>-				&amp;np-&gt;saddr, &amp;tunnel-&gt;sock-&gt;sk_v6_daddr);</div><div class='del'>-		} else</div><div class='add'>+				   &amp;np-&gt;saddr, &amp;tunnel-&gt;sock-&gt;sk_v6_daddr);</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(m, " from %pI4 to %pI4\n",</div><div class='del'>-			   &amp;inet-&gt;inet_saddr, &amp;inet-&gt;inet_daddr);</div><div class='add'>+		if (tunnel-&gt;sock-&gt;sk_family == AF_INET)</div><div class='add'>+			seq_printf(m, " from %pI4 to %pI4\n",</div><div class='add'>+				   &amp;inet-&gt;inet_saddr, &amp;inet-&gt;inet_daddr);</div><div class='add'>+</div><div class='ctx'> 		if (tunnel-&gt;encap == L2TP_ENCAPTYPE_UDP)</div><div class='ctx'> 			seq_printf(m, " source port %hu, dest port %hu\n",</div><div class='ctx'> 				   ntohs(inet-&gt;inet_sport), ntohs(inet-&gt;inet_dport));</div><div class='hunk'>@@ -169,8 +163,8 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, " %d sessions, refcnt %d/%d\n", session_count,</div><div class='ctx'> 		   tunnel-&gt;sock ? refcount_read(&amp;tunnel-&gt;sock-&gt;sk_refcnt) : 0,</div><div class='ctx'> 		   refcount_read(&amp;tunnel-&gt;ref_count));</div><div class='del'>-	seq_printf(m, " %08x rx %ld/%ld/%ld rx %ld/%ld/%ld\n",</div><div class='del'>-		   tunnel-&gt;debug,</div><div class='add'>+	seq_printf(m, " %08x tx %ld/%ld/%ld rx %ld/%ld/%ld\n",</div><div class='add'>+		   0,</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_packets),</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_bytes),</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_errors),</div><div class='hunk'>@@ -189,15 +183,15 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   session-&gt;pwtype == L2TP_PWTYPE_PPP ? "PPP" :</div><div class='ctx'> 		   "");</div><div class='ctx'> 	if (session-&gt;send_seq || session-&gt;recv_seq)</div><div class='del'>-		seq_printf(m, "   nr %hu, ns %hu\n", session-&gt;nr, session-&gt;ns);</div><div class='add'>+		seq_printf(m, "   nr %u, ns %u\n", session-&gt;nr, session-&gt;ns);</div><div class='ctx'> 	seq_printf(m, "   refcnt %d\n", refcount_read(&amp;session-&gt;ref_count));</div><div class='ctx'> 	seq_printf(m, "   config 0/0/%c/%c/-/%s %08x %u\n",</div><div class='ctx'> 		   session-&gt;recv_seq ? 'R' : '-',</div><div class='ctx'> 		   session-&gt;send_seq ? 'S' : '-',</div><div class='ctx'> 		   session-&gt;lns_mode ? "LNS" : "LAC",</div><div class='del'>-		   session-&gt;debug,</div><div class='add'>+		   0,</div><div class='ctx'> 		   jiffies_to_msecs(session-&gt;reorder_timeout));</div><div class='del'>-	seq_printf(m, "   offset 0 l2specific %hu/%hu\n",</div><div class='add'>+	seq_printf(m, "   offset 0 l2specific %hu/%d\n",</div><div class='ctx'> 		   session-&gt;l2specific_type, l2tp_get_l2specific_len(session));</div><div class='ctx'> 	if (session-&gt;cookie_len) {</div><div class='ctx'> 		seq_printf(m, "   cookie %02x%02x%02x%02x",</div><div class='hunk'>@@ -207,7 +201,7 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 			seq_printf(m, "%02x%02x%02x%02x",</div><div class='ctx'> 				   session-&gt;cookie[4], session-&gt;cookie[5],</div><div class='ctx'> 				   session-&gt;cookie[6], session-&gt;cookie[7]);</div><div class='del'>-		seq_printf(m, "\n");</div><div class='add'>+		seq_puts(m, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (session-&gt;peer_cookie_len) {</div><div class='ctx'> 		seq_printf(m, "   peer cookie %02x%02x%02x%02x",</div><div class='hunk'>@@ -217,10 +211,10 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 			seq_printf(m, "%02x%02x%02x%02x",</div><div class='ctx'> 				   session-&gt;peer_cookie[4], session-&gt;peer_cookie[5],</div><div class='ctx'> 				   session-&gt;peer_cookie[6], session-&gt;peer_cookie[7]);</div><div class='del'>-		seq_printf(m, "\n");</div><div class='add'>+		seq_puts(m, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "   %hu/%hu tx %ld/%ld/%ld rx %ld/%ld/%ld\n",</div><div class='add'>+	seq_printf(m, "   %u/%u tx %ld/%ld/%ld rx %ld/%ld/%ld\n",</div><div class='ctx'> 		   session-&gt;nr, session-&gt;ns,</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.tx_packets),</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.tx_bytes),</div><div class='hunk'>@@ -229,7 +223,7 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.rx_bytes),</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.rx_errors));</div><div class='ctx'> </div><div class='del'>-	if (session-&gt;show != NULL)</div><div class='add'>+	if (session-&gt;show)</div><div class='ctx'> 		session-&gt;show(m, session);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +270,7 @@ static int l2tp_dfs_seq_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	pd = kzalloc(sizeof(*pd), GFP_KERNEL);</div><div class='del'>-	if (pd == NULL)</div><div class='add'>+	if (!pd)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Derive the network namespace from the pid opening the</div><div class='hunk'>@@ -287,7 +281,7 @@ static int l2tp_dfs_seq_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		rc = PTR_ERR(pd-&gt;net);</div><div class='ctx'> 		goto err_free_pd;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	netns_tracker_alloc(pd-&gt;net, &amp;pd-&gt;ns_tracker, GFP_KERNEL);</div><div class='ctx'> 	rc = seq_open(file, &amp;l2tp_dfs_seq_ops);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_free_net;</div><div class='hunk'>@@ -299,7 +293,7 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='ctx'> err_free_net:</div><div class='del'>-	put_net(pd-&gt;net);</div><div class='add'>+	put_net_track(pd-&gt;net, &amp;pd-&gt;ns_tracker);</div><div class='ctx'> err_free_pd:</div><div class='ctx'> 	kfree(pd);</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -313,7 +307,7 @@ static int l2tp_dfs_seq_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	seq = file-&gt;private_data;</div><div class='ctx'> 	pd = seq-&gt;private;</div><div class='ctx'> 	if (pd-&gt;net)</div><div class='del'>-		put_net(pd-&gt;net);</div><div class='add'>+		put_net_track(pd-&gt;net, &amp;pd-&gt;ns_tracker);</div><div class='ctx'> 	kfree(pd);</div><div class='ctx'> 	seq_release(inode, file);</div><div class='ctx'> </div><div class='hunk'>@@ -330,32 +324,18 @@ static const struct file_operations l2tp_dfs_fops = {</div><div class='ctx'> </div><div class='ctx'> static int __init l2tp_debugfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='ctx'> 	rootdir = debugfs_create_dir("l2tp", NULL);</div><div class='del'>-	if (IS_ERR(rootdir)) {</div><div class='del'>-		rc = PTR_ERR(rootdir);</div><div class='del'>-		rootdir = NULL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	tunnels = debugfs_create_file("tunnels", 0600, rootdir, NULL, &amp;l2tp_dfs_fops);</div><div class='del'>-	if (tunnels == NULL)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+	debugfs_create_file("tunnels", 0600, rootdir, NULL, &amp;l2tp_dfs_fops);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("L2TP debugfs support\n");</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (rc)</div><div class='del'>-		pr_warn("unable to init\n");</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit l2tp_debugfs_exit(void)</div><div class='ctx'> {</div><div class='del'>-	debugfs_remove(tunnels);</div><div class='del'>-	debugfs_remove(rootdir);</div><div class='add'>+	debugfs_remove_recursive(rootdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(l2tp_debugfs_init);</div><div class='head'>diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c<br/>index 8aadc4f3bb9e..cf0b66f4fb29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_eth.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_eth.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * L2TPv3 ethernet pseudowire driver</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* L2TPv3 ethernet pseudowire driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008,2009,2010 Katalix Systems Ltd</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -30,6 +25,7 @@</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='hunk'>@@ -42,12 +38,6 @@</div><div class='ctx'> /* via netdev_priv() */</div><div class='ctx'> struct l2tp_eth {</div><div class='ctx'> 	struct l2tp_session	*session;</div><div class='del'>-	atomic_long_t		tx_bytes;</div><div class='del'>-	atomic_long_t		tx_packets;</div><div class='del'>-	atomic_long_t		tx_dropped;</div><div class='del'>-	atomic_long_t		rx_bytes;</div><div class='del'>-	atomic_long_t		rx_packets;</div><div class='del'>-	atomic_long_t		rx_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* via l2tp_session_priv() */</div><div class='hunk'>@@ -55,7 +45,6 @@ struct l2tp_eth_sess {</div><div class='ctx'> 	struct net_device __rcu *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int l2tp_eth_dev_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	eth_hw_addr_random(dev);</div><div class='hunk'>@@ -77,45 +66,29 @@ static void l2tp_eth_dev_uninit(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_eth *priv = netdev_priv(dev);</div><div class='ctx'> 	struct l2tp_session *session = priv-&gt;session;</div><div class='ctx'> 	unsigned int len = skb-&gt;len;</div><div class='del'>-	int ret = l2tp_xmit_skb(session, skb, session-&gt;hdr_len);</div><div class='del'>-</div><div class='del'>-	if (likely(ret == NET_XMIT_SUCCESS)) {</div><div class='del'>-		atomic_long_add(len, &amp;priv-&gt;tx_bytes);</div><div class='del'>-		atomic_long_inc(&amp;priv-&gt;tx_packets);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_long_inc(&amp;priv-&gt;tx_dropped);</div><div class='del'>-	}</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='add'>+	int ret = l2tp_xmit_skb(session, skb);</div><div class='ctx'> </div><div class='del'>-static void l2tp_eth_get_stats64(struct net_device *dev,</div><div class='del'>-				 struct rtnl_link_stats64 *stats)</div><div class='del'>-{</div><div class='del'>-	struct l2tp_eth *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_bytes   = (unsigned long) atomic_long_read(&amp;priv-&gt;tx_bytes);</div><div class='del'>-	stats-&gt;tx_packets = (unsigned long) atomic_long_read(&amp;priv-&gt;tx_packets);</div><div class='del'>-	stats-&gt;tx_dropped = (unsigned long) atomic_long_read(&amp;priv-&gt;tx_dropped);</div><div class='del'>-	stats-&gt;rx_bytes   = (unsigned long) atomic_long_read(&amp;priv-&gt;rx_bytes);</div><div class='del'>-	stats-&gt;rx_packets = (unsigned long) atomic_long_read(&amp;priv-&gt;rx_packets);</div><div class='del'>-	stats-&gt;rx_errors  = (unsigned long) atomic_long_read(&amp;priv-&gt;rx_errors);</div><div class='add'>+	if (likely(ret == NET_XMIT_SUCCESS))</div><div class='add'>+		dev_dstats_tx_add(dev, len);</div><div class='add'>+	else</div><div class='add'>+		dev_dstats_tx_dropped(dev);</div><div class='ctx'> </div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops l2tp_eth_netdev_ops = {</div><div class='ctx'> 	.ndo_init		= l2tp_eth_dev_init,</div><div class='ctx'> 	.ndo_uninit		= l2tp_eth_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit		= l2tp_eth_dev_xmit,</div><div class='del'>-	.ndo_get_stats64	= l2tp_eth_get_stats64,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct device_type l2tpeth_type = {</div><div class='add'>+static const struct device_type l2tpeth_type = {</div><div class='ctx'> 	.name = "l2tpeth",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -124,27 +97,16 @@ static void l2tp_eth_dev_setup(struct net_device *dev)</div><div class='ctx'> 	SET_NETDEV_DEVTYPE(dev, &amp;l2tpeth_type);</div><div class='ctx'> 	ether_setup(dev);</div><div class='ctx'> 	dev-&gt;priv_flags		&amp;= ~IFF_TX_SKB_SHARING;</div><div class='del'>-	dev-&gt;features		|= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;lltx		= true;</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;l2tp_eth_netdev_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='add'>+	dev-&gt;pcpu_stat_type	= NETDEV_PCPU_STAT_DSTATS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb, int data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_eth_sess *spriv = l2tp_session_priv(session);</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct l2tp_eth *priv;</div><div class='del'>-</div><div class='del'>-	if (session-&gt;debug &amp; L2TP_MSG_DATA) {</div><div class='del'>-		unsigned int length;</div><div class='del'>-</div><div class='del'>-		length = min(32u, skb-&gt;len);</div><div class='del'>-		if (!pskb_may_pull(skb, length))</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		pr_debug("%s: eth recv\n", session-&gt;name);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, skb-&gt;data, length);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, ETH_HLEN))</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -154,21 +116,22 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,</div><div class='ctx'> 	/* checksums verified by L2TP */</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='add'>+	/* drop outer flow-hash */</div><div class='add'>+	skb_clear_hash(skb);</div><div class='add'>+</div><div class='ctx'> 	skb_dst_drop(skb);</div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	dev = rcu_dereference(spriv-&gt;dev);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto error_rcu;</div><div class='ctx'> </div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {</div><div class='del'>-		atomic_long_inc(&amp;priv-&gt;rx_packets);</div><div class='del'>-		atomic_long_add(data_len, &amp;priv-&gt;rx_bytes);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_long_inc(&amp;priv-&gt;rx_errors);</div><div class='del'>-	}</div><div class='add'>+	if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS)</div><div class='add'>+		dev_dstats_rx_add(dev, data_len);</div><div class='add'>+	else</div><div class='add'>+		DEV_STATS_INC(dev, rx_errors);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -272,7 +235,7 @@ static int l2tp_eth_create(struct net *net, struct l2tp_tunnel *tunnel,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;ifname) {</div><div class='del'>-		strlcpy(name, cfg-&gt;ifname, IFNAMSIZ);</div><div class='add'>+		strscpy(name, cfg-&gt;ifname, IFNAMSIZ);</div><div class='ctx'> 		name_assign_type = NET_NAME_USER;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		strcpy(name, L2TP_ETH_DEV_NAME);</div><div class='hunk'>@@ -308,7 +271,7 @@ static int l2tp_eth_create(struct net *net, struct l2tp_tunnel *tunnel,</div><div class='ctx'> </div><div class='ctx'> 	spriv = l2tp_session_priv(session);</div><div class='ctx'> </div><div class='del'>-	l2tp_session_inc_refcount(session);</div><div class='add'>+	refcount_inc(&amp;session-&gt;ref_count);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='hunk'>@@ -326,39 +289,37 @@ static int l2tp_eth_create(struct net *net, struct l2tp_tunnel *tunnel,</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		l2tp_session_delete(session);</div><div class='del'>-		l2tp_session_dec_refcount(session);</div><div class='add'>+		l2tp_session_put(session);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(session-&gt;ifname, dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	strscpy(session-&gt;ifname, dev-&gt;name, IFNAMSIZ);</div><div class='ctx'> 	rcu_assign_pointer(spriv-&gt;dev, dev);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_sess_dev:</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> err_sess:</div><div class='del'>-	kfree(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static const struct l2tp_nl_cmd_ops l2tp_eth_nl_cmd_ops = {</div><div class='ctx'> 	.session_create	= l2tp_eth_create,</div><div class='ctx'> 	.session_delete	= l2tp_session_delete,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int __init l2tp_eth_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='head'>diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c<br/>index 35f6f86d4dcc..cac1ff59cb83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ip.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_ip.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * L2TPv3 IP encapsulation support</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* L2TPv3 IP encapsulation support</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008,2009,2010 Katalix Systems Ltd</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -24,13 +19,22 @@</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='del'>-#include &lt;net/inet_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "l2tp_core.h"</div><div class='ctx'> </div><div class='add'>+/* per-net private data for this module */</div><div class='add'>+static unsigned int l2tp_ip_net_id;</div><div class='add'>+struct l2tp_ip_net {</div><div class='add'>+	rwlock_t l2tp_ip_lock;</div><div class='add'>+	struct hlist_head l2tp_ip_table;</div><div class='add'>+	struct hlist_head l2tp_ip_bind_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct l2tp_ip_sock {</div><div class='ctx'> 	/* inet_sock has to be the first member of l2tp_ip_sock */</div><div class='ctx'> 	struct inet_sock	inet;</div><div class='hunk'>@@ -39,28 +43,32 @@ struct l2tp_ip_sock {</div><div class='ctx'> 	u32			peer_conn_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_RWLOCK(l2tp_ip_lock);</div><div class='del'>-static struct hlist_head l2tp_ip_table;</div><div class='del'>-static struct hlist_head l2tp_ip_bind_table;</div><div class='del'>-</div><div class='del'>-static inline struct l2tp_ip_sock *l2tp_ip_sk(const struct sock *sk)</div><div class='add'>+static struct l2tp_ip_sock *l2tp_ip_sk(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct l2tp_ip_sock *)sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct l2tp_ip_net *l2tp_ip_pernet(const struct net *net)</div><div class='add'>+{</div><div class='add'>+	return net_generic(net, l2tp_ip_net_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sock *__l2tp_ip_bind_lookup(const struct net *net, __be32 laddr,</div><div class='ctx'> 					  __be32 raddr, int dif, u32 tunnel_id)</div><div class='ctx'> {</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(net);</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk_for_each_bound(sk, &amp;l2tp_ip_bind_table) {</div><div class='add'>+	sk_for_each_bound(sk, &amp;pn-&gt;l2tp_ip_bind_table) {</div><div class='ctx'> 		const struct l2tp_ip_sock *l2tp = l2tp_ip_sk(sk);</div><div class='ctx'> 		const struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+		int bound_dev_if;</div><div class='ctx'> </div><div class='ctx'> 		if (!net_eq(sock_net(sk), net))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (sk-&gt;sk_bound_dev_if &amp;&amp; dif &amp;&amp; sk-&gt;sk_bound_dev_if != dif)</div><div class='add'>+		bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+		if (bound_dev_if &amp;&amp; dif &amp;&amp; bound_dev_if != dif)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (inet-&gt;inet_rcv_saddr &amp;&amp; laddr &amp;&amp;</div><div class='hunk'>@@ -117,6 +125,7 @@ found:</div><div class='ctx'> static int l2tp_ip_recv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct l2tp_ip_net *pn;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	u32 session_id;</div><div class='ctx'> 	u32 tunnel_id;</div><div class='hunk'>@@ -124,14 +133,16 @@ static int l2tp_ip_recv(struct sk_buff *skb)</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = NULL;</div><div class='ctx'> 	struct iphdr *iph;</div><div class='del'>-	int length;</div><div class='add'>+</div><div class='add'>+	pn = l2tp_ip_pernet(net);</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, 4))</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='ctx'> 	/* Point to L2TP header */</div><div class='del'>-	optr = ptr = skb-&gt;data;</div><div class='del'>-	session_id = ntohl(*((__be32 *) ptr));</div><div class='add'>+	optr = skb-&gt;data;</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+	session_id = ntohl(*((__be32 *)ptr));</div><div class='ctx'> 	ptr += 4;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC3931: L2TP/IP packets have the first 4 bytes containing</div><div class='hunk'>@@ -144,7 +155,7 @@ static int l2tp_ip_recv(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ok, this is a data packet. Lookup the session. */</div><div class='del'>-	session = l2tp_session_get(net, session_id);</div><div class='add'>+	session = l2tp_v3_session_get(net, NULL, session_id);</div><div class='ctx'> 	if (!session)</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='hunk'>@@ -152,21 +163,11 @@ static int l2tp_ip_recv(struct sk_buff *skb)</div><div class='ctx'> 	if (!tunnel)</div><div class='ctx'> 		goto discard_sess;</div><div class='ctx'> </div><div class='del'>-	/* Trace packet contents, if enabled */</div><div class='del'>-	if (tunnel-&gt;debug &amp; L2TP_MSG_DATA) {</div><div class='del'>-		length = min(32u, skb-&gt;len);</div><div class='del'>-		if (!pskb_may_pull(skb, length))</div><div class='del'>-			goto discard_sess;</div><div class='del'>-</div><div class='del'>-		/* Point to L2TP header */</div><div class='del'>-		optr = ptr = skb-&gt;data;</div><div class='del'>-		ptr += 4;</div><div class='del'>-		pr_debug("%s: ip recv\n", tunnel-&gt;name);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);</div><div class='del'>-	}</div><div class='add'>+	if (l2tp_v3_ensure_opt_in_linear(session, skb, &amp;ptr, &amp;optr))</div><div class='add'>+		goto discard_sess;</div><div class='ctx'> </div><div class='ctx'> 	l2tp_recv_common(session, skb, ptr, optr, 0, skb-&gt;len);</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -178,28 +179,28 @@ pass_up:</div><div class='ctx'> 	if ((skb-&gt;data[0] &amp; 0xc0) != 0xc0)</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='del'>-	tunnel_id = ntohl(*(__be32 *) &amp;skb-&gt;data[4]);</div><div class='add'>+	tunnel_id = ntohl(*(__be32 *)&amp;skb-&gt;data[4]);</div><div class='ctx'> 	iph = (struct iphdr *)skb_network_header(skb);</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	read_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 	sk = __l2tp_ip_bind_lookup(net, iph-&gt;daddr, iph-&gt;saddr, inet_iif(skb),</div><div class='ctx'> 				   tunnel_id);</div><div class='ctx'> 	if (!sk) {</div><div class='del'>-		read_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+		read_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> 	sock_hold(sk);</div><div class='del'>-	read_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	read_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto discard_put;</div><div class='ctx'> </div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	return sk_receive_skb(sk, skb, 1);</div><div class='ctx'> </div><div class='ctx'> discard_sess:</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> 	goto discard;</div><div class='ctx'> </div><div class='ctx'> discard_put:</div><div class='hunk'>@@ -210,44 +211,69 @@ discard:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2tp_ip_hash(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk)) {</div><div class='add'>+		write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+		sk_add_node(sk, &amp;pn-&gt;l2tp_ip_table);</div><div class='add'>+		write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2tp_ip_unhash(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk))</div><div class='add'>+		return;</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+	sk_del_node_init(sk);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2tp_ip_open(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	/* Prevent autobind. We don't have ports. */</div><div class='ctx'> 	inet_sk(sk)-&gt;inet_num = IPPROTO_L2TP;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip_lock);</div><div class='del'>-	sk_add_node(sk, &amp;l2tp_ip_table);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip_lock);</div><div class='del'>-</div><div class='add'>+	l2tp_ip_hash(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_ip_close(struct sock *sk, long timeout)</div><div class='ctx'> {</div><div class='del'>-	write_lock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 	hlist_del_init(&amp;sk-&gt;sk_bind_node);</div><div class='ctx'> 	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 	sk_common_release(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_ip_destroy_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct l2tp_tunnel *tunnel = sk-&gt;sk_user_data;</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='ctx'> </div><div class='del'>-	while ((skb = __skb_dequeue_tail(&amp;sk-&gt;sk_write_queue)) != NULL)</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+	__skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='ctx'> </div><div class='del'>-	if (tunnel)</div><div class='add'>+	tunnel = l2tp_sk_to_tunnel(sk);</div><div class='add'>+	if (tunnel) {</div><div class='ctx'> 		l2tp_tunnel_delete(tunnel);</div><div class='add'>+		l2tp_tunnel_put(tunnel);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int l2tp_ip_bind(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='del'>-	struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr;</div><div class='add'>+	struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *)uaddr;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct l2tp_ip_net *pn;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int chk_addr_ret;</div><div class='ctx'> </div><div class='hunk'>@@ -271,15 +297,18 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	    chk_addr_ret != RTN_MULTICAST &amp;&amp; chk_addr_ret != RTN_BROADCAST)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;l2tp_addr.s_addr)</div><div class='del'>-		inet-&gt;inet_rcv_saddr = inet-&gt;inet_saddr = addr-&gt;l2tp_addr.s_addr;</div><div class='add'>+	if (addr-&gt;l2tp_addr.s_addr) {</div><div class='add'>+		inet-&gt;inet_rcv_saddr = addr-&gt;l2tp_addr.s_addr;</div><div class='add'>+		inet-&gt;inet_saddr = addr-&gt;l2tp_addr.s_addr;</div><div class='add'>+	}</div><div class='ctx'> 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)</div><div class='ctx'> 		inet-&gt;inet_saddr = 0;  /* Use device */</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	pn = l2tp_ip_pernet(net);</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 	if (__l2tp_ip_bind_lookup(net, addr-&gt;l2tp_addr.s_addr, 0,</div><div class='ctx'> 				  sk-&gt;sk_bound_dev_if, addr-&gt;l2tp_conn_id)) {</div><div class='del'>-		write_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+		write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 		ret = -EADDRINUSE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -287,9 +316,9 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	sk_dst_reset(sk);</div><div class='ctx'> 	l2tp_ip_sk(sk)-&gt;conn_id = addr-&gt;l2tp_conn_id;</div><div class='ctx'> </div><div class='del'>-	sk_add_bind_node(sk, &amp;l2tp_ip_bind_table);</div><div class='add'>+	sk_add_bind_node(sk, &amp;pn-&gt;l2tp_ip_bind_table);</div><div class='ctx'> 	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='hunk'>@@ -300,9 +329,11 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int l2tp_ip_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			   int addr_len)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr;</div><div class='add'>+	struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *)uaddr;</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(sock_net(sk));</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; sizeof(*lsa))</div><div class='hunk'>@@ -325,10 +356,10 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len</div><div class='ctx'> </div><div class='ctx'> 	l2tp_ip_sk(sk)-&gt;peer_conn_id = lsa-&gt;l2tp_conn_id;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> 	hlist_del_init(&amp;sk-&gt;sk_bind_node);</div><div class='del'>-	sk_add_bind_node(sk, &amp;l2tp_ip_bind_table);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip_lock);</div><div class='add'>+	sk_add_bind_node(sk, &amp;pn-&gt;l2tp_ip_bind_table);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='ctx'> </div><div class='ctx'> out_sk:</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -361,6 +392,7 @@ static int l2tp_ip_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		lsa-&gt;l2tp_addr.s_addr = inet-&gt;inet_daddr;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__be32 addr = inet-&gt;inet_rcv_saddr;</div><div class='add'>+</div><div class='ctx'> 		if (!addr)</div><div class='ctx'> 			addr = inet-&gt;inet_saddr;</div><div class='ctx'> 		lsa-&gt;l2tp_conn_id = lsk-&gt;conn_id;</div><div class='hunk'>@@ -395,7 +427,6 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct rtable *rt = NULL;</div><div class='del'>-	struct flowi4 *fl4;</div><div class='ctx'> 	int connected = 0;</div><div class='ctx'> 	__be32 daddr;</div><div class='ctx'> </div><div class='hunk'>@@ -408,6 +439,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	/* Get and verify the address. */</div><div class='ctx'> 	if (msg-&gt;msg_name) {</div><div class='ctx'> 		DECLARE_SOCKADDR(struct sockaddr_l2tpip *, lip, msg-&gt;msg_name);</div><div class='add'>+</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		if (msg-&gt;msg_namelen &lt; sizeof(*lip))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -424,7 +456,6 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		if (sk-&gt;sk_state != TCP_ESTABLISHED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		daddr = inet-&gt;inet_daddr;</div><div class='ctx'> 		connected = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +473,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	skb_reset_transport_header(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Insert 0 session_id */</div><div class='del'>-	*((__be32 *) skb_put(skb, 4)) = 0;</div><div class='add'>+	*((__be32 *)skb_put(skb, 4)) = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy user data into skb */</div><div class='ctx'> 	rc = memcpy_from_msg(skb_put(skb, len), msg, len);</div><div class='hunk'>@@ -451,29 +482,24 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='ctx'> 	if (connected)</div><div class='del'>-		rt = (struct rtable *) __sk_dst_check(sk, 0);</div><div class='add'>+		rt = dst_rtable(__sk_dst_check(sk, 0));</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (rt == NULL) {</div><div class='del'>-		const struct ip_options_rcu *inet_opt;</div><div class='add'>+	if (!rt) {</div><div class='add'>+		struct flowi4 *fl4 = &amp;inet-&gt;cork.fl.u.ip4;</div><div class='ctx'> </div><div class='del'>-		inet_opt = rcu_dereference(inet-&gt;inet_opt);</div><div class='add'>+		inet_sk_init_flowi4(inet, fl4);</div><div class='ctx'> </div><div class='del'>-		/* Use correct destination address if we have options. */</div><div class='del'>-		if (inet_opt &amp;&amp; inet_opt-&gt;opt.srr)</div><div class='del'>-			daddr = inet_opt-&gt;opt.faddr;</div><div class='add'>+		/* Overwrite -&gt;daddr if msg-&gt;msg_name was provided */</div><div class='add'>+		if (!connected)</div><div class='add'>+			fl4-&gt;daddr = daddr;</div><div class='ctx'> </div><div class='ctx'> 		/* If this fails, retransmit mechanism of transport layer will</div><div class='ctx'> 		 * keep trying until route appears or the connection times</div><div class='ctx'> 		 * itself out.</div><div class='ctx'> 		 */</div><div class='del'>-		rt = ip_route_output_ports(sock_net(sk), fl4, sk,</div><div class='del'>-					   daddr, inet-&gt;inet_saddr,</div><div class='del'>-					   inet-&gt;inet_dport, inet-&gt;inet_sport,</div><div class='del'>-					   sk-&gt;sk_protocol, RT_CONN_FLAGS(sk),</div><div class='del'>-					   sk-&gt;sk_bound_dev_if);</div><div class='add'>+		rt = ip_route_output_flow(sock_net(sk), fl4, sk);</div><div class='ctx'> 		if (IS_ERR(rt))</div><div class='ctx'> 			goto no_route;</div><div class='ctx'> 		if (connected) {</div><div class='hunk'>@@ -484,7 +510,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* We dont need to clone dst here, it is guaranteed to not disappear.</div><div class='add'>+	/* We don't need to clone dst here, it is guaranteed to not disappear.</div><div class='ctx'> 	 *  __dev_xmit_skb() might force a refcount if needed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_dst_set_noref(skb, &amp;rt-&gt;dst);</div><div class='hunk'>@@ -511,7 +537,7 @@ no_route:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2tp_ip_recvmsg(struct sock *sk, struct msghdr *msg,</div><div class='del'>-			   size_t len, int noblock, int flags, int *addr_len)</div><div class='add'>+			   size_t len, int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	size_t copied = 0;</div><div class='hunk'>@@ -522,7 +548,7 @@ static int l2tp_ip_recvmsg(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 	if (flags &amp; MSG_OOB)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -546,7 +572,7 @@ static int l2tp_ip_recvmsg(struct sock *sk, struct msghdr *msg,</div><div class='ctx'> 		memset(&amp;sin-&gt;sin_zero, 0, sizeof(sin-&gt;sin_zero));</div><div class='ctx'> 		*addr_len = sizeof(*sin);</div><div class='ctx'> 	}</div><div class='del'>-	if (inet-&gt;cmsg_flags)</div><div class='add'>+	if (inet_cmsg_flags(inet))</div><div class='ctx'> 		ip_cmsg_recv(msg, skb);</div><div class='ctx'> 	if (flags &amp; MSG_TRUNC)</div><div class='ctx'> 		copied = skb-&gt;len;</div><div class='hunk'>@@ -556,19 +582,18 @@ out:</div><div class='ctx'> 	return err ? err : copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int l2tp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='add'>+int l2tp_ioctl(struct sock *sk, int cmd, int *karg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int amount;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCOUTQ:</div><div class='del'>-		amount = sk_wmem_alloc_get(sk);</div><div class='add'>+		*karg = sk_wmem_alloc_get(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCINQ:</div><div class='ctx'> 		spin_lock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='del'>-		amount = skb ? skb-&gt;len : 0;</div><div class='add'>+		*karg = skb ? skb-&gt;len : 0;</div><div class='ctx'> 		spin_unlock_bh(&amp;sk-&gt;sk_receive_queue.lock);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -576,9 +601,9 @@ int l2tp_ioctl(struct sock *sk, int cmd, unsigned long arg)</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return put_user(amount, (int __user *)arg);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(l2tp_ioctl);</div><div class='add'>+EXPORT_SYMBOL_GPL(l2tp_ioctl);</div><div class='ctx'> </div><div class='ctx'> static struct proto l2tp_ip_prot = {</div><div class='ctx'> 	.name		   = "L2TP/IP",</div><div class='hunk'>@@ -595,13 +620,9 @@ static struct proto l2tp_ip_prot = {</div><div class='ctx'> 	.sendmsg	   = l2tp_ip_sendmsg,</div><div class='ctx'> 	.recvmsg	   = l2tp_ip_recvmsg,</div><div class='ctx'> 	.backlog_rcv	   = l2tp_ip_backlog_recv,</div><div class='del'>-	.hash		   = inet_hash,</div><div class='del'>-	.unhash		   = inet_unhash,</div><div class='add'>+	.hash		   = l2tp_ip_hash,</div><div class='add'>+	.unhash		   = l2tp_ip_unhash,</div><div class='ctx'> 	.obj_size	   = sizeof(struct l2tp_ip_sock),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ip_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ip_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct proto_ops l2tp_ip_ops = {</div><div class='hunk'>@@ -615,6 +636,7 @@ static const struct proto_ops l2tp_ip_ops = {</div><div class='ctx'> 	.getname	   = l2tp_ip_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,</div><div class='ctx'> 	.ioctl		   = inet_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = inet_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -622,11 +644,6 @@ static const struct proto_ops l2tp_ip_ops = {</div><div class='ctx'> 	.sendmsg	   = inet_sendmsg,</div><div class='ctx'> 	.recvmsg	   = sock_common_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct inet_protosw l2tp_ip_protosw = {</div><div class='hunk'>@@ -638,7 +655,33 @@ static struct inet_protosw l2tp_ip_protosw = {</div><div class='ctx'> </div><div class='ctx'> static struct net_protocol l2tp_ip_protocol __read_mostly = {</div><div class='ctx'> 	.handler	= l2tp_ip_recv,</div><div class='del'>-	.netns_ok	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __net_init int l2tp_ip_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip_net *pn = net_generic(net, l2tp_ip_net_id);</div><div class='add'>+</div><div class='add'>+	rwlock_init(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;pn-&gt;l2tp_ip_table);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;pn-&gt;l2tp_ip_bind_table);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __net_exit void l2tp_ip_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip_net *pn = l2tp_ip_pernet(net);</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+	WARN_ON_ONCE(hlist_count_nodes(&amp;pn-&gt;l2tp_ip_table) != 0);</div><div class='add'>+	WARN_ON_ONCE(hlist_count_nodes(&amp;pn-&gt;l2tp_ip_bind_table) != 0);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations l2tp_ip_net_ops = {</div><div class='add'>+	.init = l2tp_ip_init_net,</div><div class='add'>+	.exit = l2tp_ip_exit_net,</div><div class='add'>+	.id   = &amp;l2tp_ip_net_id,</div><div class='add'>+	.size = sizeof(struct l2tp_ip_net),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init l2tp_ip_init(void)</div><div class='hunk'>@@ -647,19 +690,25 @@ static int __init l2tp_ip_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pr_info("L2TP IP encapsulation support (L2TPv3)\n");</div><div class='ctx'> </div><div class='add'>+	err = register_pernet_device(&amp;l2tp_ip_net_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	err = proto_register(&amp;l2tp_ip_prot, 1);</div><div class='ctx'> 	if (err != 0)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out1;</div><div class='ctx'> </div><div class='ctx'> 	err = inet_add_protocol(&amp;l2tp_ip_protocol, IPPROTO_L2TP);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out1;</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	inet_register_protosw(&amp;l2tp_ip_protosw);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out1:</div><div class='add'>+out2:</div><div class='ctx'> 	proto_unregister(&amp;l2tp_ip_prot);</div><div class='add'>+out1:</div><div class='add'>+	unregister_pernet_device(&amp;l2tp_ip_net_ops);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -669,6 +718,7 @@ static void __exit l2tp_ip_exit(void)</div><div class='ctx'> 	inet_unregister_protosw(&amp;l2tp_ip_protosw);</div><div class='ctx'> 	inet_del_protocol(&amp;l2tp_ip_protocol, IPPROTO_L2TP);</div><div class='ctx'> 	proto_unregister(&amp;l2tp_ip_prot);</div><div class='add'>+	unregister_pernet_device(&amp;l2tp_ip_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(l2tp_ip_init);</div><div class='hunk'>@@ -679,8 +729,8 @@ MODULE_AUTHOR("James Chapman &lt;jchapman@katalix.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("L2TP over IP");</div><div class='ctx'> MODULE_VERSION("1.0");</div><div class='ctx'> </div><div class='del'>-/* Use the value of SOCK_DGRAM (2) directory, because __stringify doesn't like</div><div class='del'>- * enums</div><div class='add'>+/* Use the values of SOCK_DGRAM (2) as type and IPPROTO_L2TP (115) as protocol,</div><div class='add'>+ * because __stringify doesn't like enums</div><div class='ctx'>  */</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP);</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO(PF_INET, IPPROTO_L2TP);</div><div class='add'>+MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 115, 2);</div><div class='add'>+MODULE_ALIAS_NET_PF_PROTO(PF_INET, 115);</div><div class='head'>diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c<br/>index 237f1a4a0b0c..05a396ba6a3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ip6.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ip6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ip6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_ip6.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * L2TPv3 IP encapsulation support for IPv6</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* L2TPv3 IP encapsulation support for IPv6</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012 Katalix Systems Ltd</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -24,11 +19,11 @@</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='ctx'> #include &lt;net/inet_common.h&gt;</div><div class='del'>-#include &lt;net/inet_hashtables.h&gt;</div><div class='del'>-#include &lt;net/inet6_hashtables.h&gt;</div><div class='ctx'> #include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;net/protocol.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/transp_v6.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='hunk'>@@ -36,6 +31,14 @@</div><div class='ctx'> </div><div class='ctx'> #include "l2tp_core.h"</div><div class='ctx'> </div><div class='add'>+/* per-net private data for this module */</div><div class='add'>+static unsigned int l2tp_ip6_net_id;</div><div class='add'>+struct l2tp_ip6_net {</div><div class='add'>+	rwlock_t l2tp_ip6_lock;</div><div class='add'>+	struct hlist_head l2tp_ip6_table;</div><div class='add'>+	struct hlist_head l2tp_ip6_bind_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct l2tp_ip6_sock {</div><div class='ctx'> 	/* inet_sock has to be the first member of l2tp_ip6_sock */</div><div class='ctx'> 	struct inet_sock	inet;</div><div class='hunk'>@@ -43,36 +46,38 @@ struct l2tp_ip6_sock {</div><div class='ctx'> 	u32			conn_id;</div><div class='ctx'> 	u32			peer_conn_id;</div><div class='ctx'> </div><div class='del'>-	/* ipv6_pinfo has to be the last member of l2tp_ip6_sock, see</div><div class='del'>-	   inet6_sk_generic */</div><div class='ctx'> 	struct ipv6_pinfo	inet6;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_RWLOCK(l2tp_ip6_lock);</div><div class='del'>-static struct hlist_head l2tp_ip6_table;</div><div class='del'>-static struct hlist_head l2tp_ip6_bind_table;</div><div class='del'>-</div><div class='del'>-static inline struct l2tp_ip6_sock *l2tp_ip6_sk(const struct sock *sk)</div><div class='add'>+static struct l2tp_ip6_sock *l2tp_ip6_sk(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct l2tp_ip6_sock *)sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct l2tp_ip6_net *l2tp_ip6_pernet(const struct net *net)</div><div class='add'>+{</div><div class='add'>+	return net_generic(net, l2tp_ip6_net_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sock *__l2tp_ip6_bind_lookup(const struct net *net,</div><div class='ctx'> 					   const struct in6_addr *laddr,</div><div class='ctx'> 					   const struct in6_addr *raddr,</div><div class='ctx'> 					   int dif, u32 tunnel_id)</div><div class='ctx'> {</div><div class='add'>+	struct l2tp_ip6_net *pn = l2tp_ip6_pernet(net);</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	sk_for_each_bound(sk, &amp;l2tp_ip6_bind_table) {</div><div class='add'>+	sk_for_each_bound(sk, &amp;pn-&gt;l2tp_ip6_bind_table) {</div><div class='ctx'> 		const struct in6_addr *sk_laddr = inet6_rcv_saddr(sk);</div><div class='ctx'> 		const struct in6_addr *sk_raddr = &amp;sk-&gt;sk_v6_daddr;</div><div class='ctx'> 		const struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk);</div><div class='add'>+		int bound_dev_if;</div><div class='ctx'> </div><div class='ctx'> 		if (!net_eq(sock_net(sk), net))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (sk-&gt;sk_bound_dev_if &amp;&amp; dif &amp;&amp; sk-&gt;sk_bound_dev_if != dif)</div><div class='add'>+		bound_dev_if = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='add'>+		if (bound_dev_if &amp;&amp; dif &amp;&amp; bound_dev_if != dif)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (sk_laddr &amp;&amp; !ipv6_addr_any(sk_laddr) &amp;&amp;</div><div class='hunk'>@@ -130,6 +135,7 @@ found:</div><div class='ctx'> static int l2tp_ip6_recv(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net *net = dev_net(skb-&gt;dev);</div><div class='add'>+	struct l2tp_ip6_net *pn;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	u32 session_id;</div><div class='ctx'> 	u32 tunnel_id;</div><div class='hunk'>@@ -137,14 +143,16 @@ static int l2tp_ip6_recv(struct sk_buff *skb)</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = NULL;</div><div class='ctx'> 	struct ipv6hdr *iph;</div><div class='del'>-	int length;</div><div class='add'>+</div><div class='add'>+	pn = l2tp_ip6_pernet(net);</div><div class='ctx'> </div><div class='ctx'> 	if (!pskb_may_pull(skb, 4))</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='ctx'> 	/* Point to L2TP header */</div><div class='del'>-	optr = ptr = skb-&gt;data;</div><div class='del'>-	session_id = ntohl(*((__be32 *) ptr));</div><div class='add'>+	optr = skb-&gt;data;</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+	session_id = ntohl(*((__be32 *)ptr));</div><div class='ctx'> 	ptr += 4;</div><div class='ctx'> </div><div class='ctx'> 	/* RFC3931: L2TP/IP packets have the first 4 bytes containing</div><div class='hunk'>@@ -157,7 +165,7 @@ static int l2tp_ip6_recv(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ok, this is a data packet. Lookup the session. */</div><div class='del'>-	session = l2tp_session_get(net, session_id);</div><div class='add'>+	session = l2tp_v3_session_get(net, NULL, session_id);</div><div class='ctx'> 	if (!session)</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='hunk'>@@ -165,21 +173,11 @@ static int l2tp_ip6_recv(struct sk_buff *skb)</div><div class='ctx'> 	if (!tunnel)</div><div class='ctx'> 		goto discard_sess;</div><div class='ctx'> </div><div class='del'>-	/* Trace packet contents, if enabled */</div><div class='del'>-	if (tunnel-&gt;debug &amp; L2TP_MSG_DATA) {</div><div class='del'>-		length = min(32u, skb-&gt;len);</div><div class='del'>-		if (!pskb_may_pull(skb, length))</div><div class='del'>-			goto discard_sess;</div><div class='del'>-</div><div class='del'>-		/* Point to L2TP header */</div><div class='del'>-		optr = ptr = skb-&gt;data;</div><div class='del'>-		ptr += 4;</div><div class='del'>-		pr_debug("%s: ip recv\n", tunnel-&gt;name);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);</div><div class='del'>-	}</div><div class='add'>+	if (l2tp_v3_ensure_opt_in_linear(session, skb, &amp;ptr, &amp;optr))</div><div class='add'>+		goto discard_sess;</div><div class='ctx'> </div><div class='ctx'> 	l2tp_recv_common(session, skb, ptr, optr, 0, skb-&gt;len);</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -191,28 +189,28 @@ pass_up:</div><div class='ctx'> 	if ((skb-&gt;data[0] &amp; 0xc0) != 0xc0)</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='del'>-	tunnel_id = ntohl(*(__be32 *) &amp;skb-&gt;data[4]);</div><div class='add'>+	tunnel_id = ntohl(*(__be32 *)&amp;skb-&gt;data[4]);</div><div class='ctx'> 	iph = ipv6_hdr(skb);</div><div class='ctx'> </div><div class='del'>-	read_lock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	read_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 	sk = __l2tp_ip6_bind_lookup(net, &amp;iph-&gt;daddr, &amp;iph-&gt;saddr,</div><div class='ctx'> 				    inet6_iif(skb), tunnel_id);</div><div class='ctx'> 	if (!sk) {</div><div class='del'>-		read_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+		read_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='ctx'> 	sock_hold(sk);</div><div class='del'>-	read_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	read_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))</div><div class='ctx'> 		goto discard_put;</div><div class='ctx'> </div><div class='del'>-	nf_reset(skb);</div><div class='add'>+	nf_reset_ct(skb);</div><div class='ctx'> </div><div class='ctx'> 	return sk_receive_skb(sk, skb, 1);</div><div class='ctx'> </div><div class='ctx'> discard_sess:</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> 	goto discard;</div><div class='ctx'> </div><div class='ctx'> discard_put:</div><div class='hunk'>@@ -223,53 +221,80 @@ discard:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2tp_ip6_hash(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip6_net *pn = l2tp_ip6_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk)) {</div><div class='add'>+		write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+		sk_add_node(sk, &amp;pn-&gt;l2tp_ip6_table);</div><div class='add'>+		write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l2tp_ip6_unhash(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip6_net *pn = l2tp_ip6_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	if (sk_unhashed(sk))</div><div class='add'>+		return;</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+	sk_del_node_init(sk);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2tp_ip6_open(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	/* Prevent autobind. We don't have ports. */</div><div class='ctx'> 	inet_sk(sk)-&gt;inet_num = IPPROTO_L2TP;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip6_lock);</div><div class='del'>-	sk_add_node(sk, &amp;l2tp_ip6_table);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='del'>-</div><div class='add'>+	l2tp_ip6_hash(sk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_ip6_close(struct sock *sk, long timeout)</div><div class='ctx'> {</div><div class='del'>-	write_lock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	struct l2tp_ip6_net *pn = l2tp_ip6_pernet(sock_net(sk));</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 	hlist_del_init(&amp;sk-&gt;sk_bind_node);</div><div class='ctx'> 	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> </div><div class='ctx'> 	sk_common_release(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l2tp_ip6_destroy_sock(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_tunnel *tunnel = sk-&gt;sk_user_data;</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	ip6_flush_pending_frames(sk);</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='del'>-	if (tunnel)</div><div class='add'>+	tunnel = l2tp_sk_to_tunnel(sk);</div><div class='add'>+	if (tunnel) {</div><div class='ctx'> 		l2tp_tunnel_delete(tunnel);</div><div class='del'>-</div><div class='del'>-	inet6_destroy_sock(sk);</div><div class='add'>+		l2tp_tunnel_put(tunnel);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='add'>+static int l2tp_ip6_bind(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='add'>+			 int addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inet_sock *inet = inet_sk(sk);</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='del'>-	struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *) uaddr;</div><div class='add'>+	struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *)uaddr;</div><div class='ctx'> 	struct net *net = sock_net(sk);</div><div class='add'>+	struct l2tp_ip6_net *pn;</div><div class='ctx'> 	__be32 v4addr = 0;</div><div class='ctx'> 	int bound_dev_if;</div><div class='ctx'> 	int addr_type;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	pn = l2tp_ip6_pernet(net);</div><div class='add'>+</div><div class='ctx'> 	if (addr-&gt;l2tp_family != AF_INET6)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (addr_len &lt; sizeof(*addr))</div><div class='hunk'>@@ -327,10 +352,10 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 	if (__l2tp_ip6_bind_lookup(net, &amp;addr-&gt;l2tp_addr, NULL, bound_dev_if,</div><div class='ctx'> 				   addr-&gt;l2tp_conn_id)) {</div><div class='del'>-		write_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+		write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 		err = -EADDRINUSE;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -343,9 +368,9 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)</div><div class='ctx'> </div><div class='ctx'> 	l2tp_ip6_sk(sk)-&gt;conn_id = addr-&gt;l2tp_conn_id;</div><div class='ctx'> </div><div class='del'>-	sk_add_bind_node(sk, &amp;l2tp_ip6_bind_table);</div><div class='add'>+	sk_add_bind_node(sk, &amp;pn-&gt;l2tp_ip6_bind_table);</div><div class='ctx'> 	sk_del_node_init(sk);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> </div><div class='ctx'> 	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -359,14 +384,15 @@ out_unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='add'>+static int l2tp_ip6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			    int addr_len)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *) uaddr;</div><div class='del'>-	struct sockaddr_in6	*usin = (struct sockaddr_in6 *) uaddr;</div><div class='add'>+	struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *)uaddr;</div><div class='add'>+	struct sockaddr_in6	*usin = (struct sockaddr_in6 *)uaddr;</div><div class='ctx'> 	struct in6_addr	*daddr;</div><div class='ctx'> 	int	addr_type;</div><div class='ctx'> 	int rc;</div><div class='add'>+	struct l2tp_ip6_net *pn;</div><div class='ctx'> </div><div class='ctx'> 	if (addr_len &lt; sizeof(*lsa))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -398,10 +424,11 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	l2tp_ip6_sk(sk)-&gt;peer_conn_id = lsa-&gt;l2tp_conn_id;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	pn = l2tp_ip6_pernet(sock_net(sk));</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> 	hlist_del_init(&amp;sk-&gt;sk_bind_node);</div><div class='del'>-	sk_add_bind_node(sk, &amp;l2tp_ip6_bind_table);</div><div class='del'>-	write_unlock_bh(&amp;l2tp_ip6_lock);</div><div class='add'>+	sk_add_bind_node(sk, &amp;pn-&gt;l2tp_ip6_bind_table);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='ctx'> </div><div class='ctx'> out_sk:</div><div class='ctx'> 	release_sock(sk);</div><div class='hunk'>@@ -434,7 +461,7 @@ static int l2tp_ip6_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> 		lsa-&gt;l2tp_conn_id = lsk-&gt;peer_conn_id;</div><div class='ctx'> 		lsa-&gt;l2tp_addr = sk-&gt;sk_v6_daddr;</div><div class='del'>-		if (np-&gt;sndflow)</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk))</div><div class='ctx'> 			lsa-&gt;l2tp_flowinfo = np-&gt;flow_label;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ipv6_addr_any(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='hunk'>@@ -445,7 +472,7 @@ static int l2tp_ip6_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		lsa-&gt;l2tp_conn_id = lsk-&gt;conn_id;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ipv6_addr_type(&amp;lsa-&gt;l2tp_addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='del'>-		lsa-&gt;l2tp_scope_id = sk-&gt;sk_bound_dev_if;</div><div class='add'>+		lsa-&gt;l2tp_scope_id = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='ctx'> 	return sizeof(*lsa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -473,7 +500,7 @@ static int l2tp_ip6_push_pending_frames(struct sock *sk)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_peek(&amp;sk-&gt;sk_write_queue);</div><div class='del'>-	if (skb == NULL)</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	transhdr = (__be32 *)skb_transport_header(skb);</div><div class='hunk'>@@ -502,28 +529,26 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	struct ipcm6_cookie ipc6;</div><div class='ctx'> 	int addr_len = msg-&gt;msg_namelen;</div><div class='ctx'> 	int transhdrlen = 4; /* zero session-id */</div><div class='del'>-	int ulen = len + transhdrlen;</div><div class='add'>+	int ulen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Rough check on arithmetic overflow,</div><div class='del'>-	   better check is made in ip6_append_data().</div><div class='add'>+	 * better check is made in ip6_append_data().</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &gt; INT_MAX)</div><div class='add'>+	if (len &gt; INT_MAX - transhdrlen)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Mirror BSD error message compatibility */</div><div class='ctx'> 	if (msg-&gt;msg_flags &amp; MSG_OOB)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Get and verify the address.</div><div class='del'>-	 */</div><div class='add'>+	/* Get and verify the address */</div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='ctx'> </div><div class='del'>-	fl6.flowi6_mark = sk-&gt;sk_mark;</div><div class='del'>-	fl6.flowi6_uid = sk-&gt;sk_uid;</div><div class='add'>+	fl6.flowi6_mark = READ_ONCE(sk-&gt;sk_mark);</div><div class='add'>+	fl6.flowi6_uid = sk_uid(sk);</div><div class='ctx'> </div><div class='del'>-	ipcm6_init(&amp;ipc6);</div><div class='add'>+	ipcm6_init_sk(&amp;ipc6, sk);</div><div class='ctx'> </div><div class='ctx'> 	if (lsa) {</div><div class='ctx'> 		if (addr_len &lt; SIN6_LEN_RFC2133)</div><div class='hunk'>@@ -533,17 +558,16 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 			return -EAFNOSUPPORT;</div><div class='ctx'> </div><div class='ctx'> 		daddr = &amp;lsa-&gt;l2tp_addr;</div><div class='del'>-		if (np-&gt;sndflow) {</div><div class='add'>+		if (inet6_test_bit(SNDFLOW, sk)) {</div><div class='ctx'> 			fl6.flowlabel = lsa-&gt;l2tp_flowinfo &amp; IPV6_FLOWINFO_MASK;</div><div class='del'>-			if (fl6.flowlabel&amp;IPV6_FLOWLABEL_MASK) {</div><div class='add'>+			if (fl6.flowlabel &amp; IPV6_FLOWLABEL_MASK) {</div><div class='ctx'> 				flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-				if (flowlabel == NULL)</div><div class='add'>+				if (IS_ERR(flowlabel))</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Otherwise it will be difficult to maintain</div><div class='add'>+		/* Otherwise it will be difficult to maintain</div><div class='ctx'> 		 * sk-&gt;sk_dst_cache.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (sk-&gt;sk_state == TCP_ESTABLISHED &amp;&amp;</div><div class='hunk'>@@ -563,7 +587,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fl6.flowi6_oif == 0)</div><div class='del'>-		fl6.flowi6_oif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(sk-&gt;sk_bound_dev_if);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;msg_controllen) {</div><div class='ctx'> 		opt = &amp;opt_space;</div><div class='hunk'>@@ -578,10 +602,10 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((fl6.flowlabel &amp; IPV6_FLOWLABEL_MASK) &amp;&amp; !flowlabel) {</div><div class='ctx'> 			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);</div><div class='del'>-			if (flowlabel == NULL)</div><div class='add'>+			if (IS_ERR(flowlabel))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (!(opt-&gt;opt_nflen|opt-&gt;opt_flen))</div><div class='add'>+		if (!(opt-&gt;opt_nflen | opt-&gt;opt_flen))</div><div class='ctx'> 			opt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -605,18 +629,15 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	final_p = fl6_update_dst(&amp;fl6, opt, &amp;final);</div><div class='ctx'> </div><div class='ctx'> 	if (!fl6.flowi6_oif &amp;&amp; ipv6_addr_is_multicast(&amp;fl6.daddr))</div><div class='del'>-		fl6.flowi6_oif = np-&gt;mcast_oif;</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;mcast_oif);</div><div class='ctx'> 	else if (!fl6.flowi6_oif)</div><div class='del'>-		fl6.flowi6_oif = np-&gt;ucast_oif;</div><div class='del'>-</div><div class='del'>-	security_sk_classify_flow(sk, flowi6_to_flowi(&amp;fl6));</div><div class='add'>+		fl6.flowi6_oif = READ_ONCE(np-&gt;ucast_oif);</div><div class='ctx'> </div><div class='del'>-	if (ipc6.tclass &lt; 0)</div><div class='del'>-		ipc6.tclass = np-&gt;tclass;</div><div class='add'>+	security_sk_classify_flow(sk, flowi6_to_flowi_common(&amp;fl6));</div><div class='ctx'> </div><div class='ctx'> 	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);</div><div class='ctx'> </div><div class='del'>-	dst = ip6_dst_lookup_flow(sk, &amp;fl6, final_p);</div><div class='add'>+	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &amp;fl6, final_p);</div><div class='ctx'> 	if (IS_ERR(dst)) {</div><div class='ctx'> 		err = PTR_ERR(dst);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -625,17 +646,15 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)</div><div class='ctx'> 	if (ipc6.hlimit &lt; 0)</div><div class='ctx'> 		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &amp;fl6, dst);</div><div class='ctx'> </div><div class='del'>-	if (ipc6.dontfrag &lt; 0)</div><div class='del'>-		ipc6.dontfrag = np-&gt;dontfrag;</div><div class='del'>-</div><div class='ctx'> 	if (msg-&gt;msg_flags &amp; MSG_CONFIRM)</div><div class='ctx'> 		goto do_confirm;</div><div class='ctx'> </div><div class='ctx'> back_from_confirm:</div><div class='ctx'> 	lock_sock(sk);</div><div class='add'>+	ulen = len + (skb_queue_empty(&amp;sk-&gt;sk_write_queue) ? transhdrlen : 0);</div><div class='ctx'> 	err = ip6_append_data(sk, ip_generic_getfrag, msg,</div><div class='ctx'> 			      ulen, transhdrlen, &amp;ipc6,</div><div class='del'>-			      &amp;fl6, (struct rt6_info *)dst,</div><div class='add'>+			      &amp;fl6, dst_rt6_info(dst),</div><div class='ctx'> 			      msg-&gt;msg_flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ip6_flush_pending_frames(sk);</div><div class='hunk'>@@ -660,7 +679,7 @@ do_confirm:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2tp_ip6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='del'>-			    int noblock, int flags, int *addr_len)</div><div class='add'>+			    int flags, int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='ctx'> 	DECLARE_SOCKADDR(struct sockaddr_l2tpip6 *, lsa, msg-&gt;msg_name);</div><div class='hunk'>@@ -671,13 +690,10 @@ static int l2tp_ip6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 	if (flags &amp; MSG_OOB)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (addr_len)</div><div class='del'>-		*addr_len = sizeof(*lsa);</div><div class='del'>-</div><div class='ctx'> 	if (flags &amp; MSG_ERRQUEUE)</div><div class='ctx'> 		return ipv6_recv_error(sk, msg, len, addr_len);</div><div class='ctx'> </div><div class='del'>-	skb = skb_recv_datagram(sk, flags, noblock, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +719,7 @@ static int l2tp_ip6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='ctx'> 		lsa-&gt;l2tp_conn_id = 0;</div><div class='ctx'> 		if (ipv6_addr_type(&amp;lsa-&gt;l2tp_addr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='ctx'> 			lsa-&gt;l2tp_scope_id = inet6_iif(skb);</div><div class='add'>+		*addr_len = sizeof(*lsa);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;rxopt.all)</div><div class='hunk'>@@ -731,13 +748,10 @@ static struct proto l2tp_ip6_prot = {</div><div class='ctx'> 	.sendmsg	   = l2tp_ip6_sendmsg,</div><div class='ctx'> 	.recvmsg	   = l2tp_ip6_recvmsg,</div><div class='ctx'> 	.backlog_rcv	   = l2tp_ip6_backlog_recv,</div><div class='del'>-	.hash		   = inet6_hash,</div><div class='del'>-	.unhash		   = inet_unhash,</div><div class='add'>+	.hash		   = l2tp_ip6_hash,</div><div class='add'>+	.unhash		   = l2tp_ip6_unhash,</div><div class='ctx'> 	.obj_size	   = sizeof(struct l2tp_ip6_sock),</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_ipv6_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_ipv6_getsockopt,</div><div class='del'>-#endif</div><div class='add'>+	.ipv6_pinfo_offset = offsetof(struct l2tp_ip6_sock, inet6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct proto_ops l2tp_ip6_ops = {</div><div class='hunk'>@@ -751,6 +765,7 @@ static const struct proto_ops l2tp_ip6_ops = {</div><div class='ctx'> 	.getname	   = l2tp_ip6_getname,</div><div class='ctx'> 	.poll		   = datagram_poll,</div><div class='ctx'> 	.ioctl		   = inet6_ioctl,</div><div class='add'>+	.gettstamp	   = sock_gettstamp,</div><div class='ctx'> 	.listen		   = sock_no_listen,</div><div class='ctx'> 	.shutdown	   = inet_shutdown,</div><div class='ctx'> 	.setsockopt	   = sock_common_setsockopt,</div><div class='hunk'>@@ -758,10 +773,8 @@ static const struct proto_ops l2tp_ip6_ops = {</div><div class='ctx'> 	.sendmsg	   = inet_sendmsg,</div><div class='ctx'> 	.recvmsg	   = sock_common_recvmsg,</div><div class='ctx'> 	.mmap		   = sock_no_mmap,</div><div class='del'>-	.sendpage	   = sock_no_sendpage,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_setsockopt = compat_sock_common_setsockopt,</div><div class='del'>-	.compat_getsockopt = compat_sock_common_getsockopt,</div><div class='add'>+	.compat_ioctl	   = inet6_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -776,25 +789,58 @@ static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {</div><div class='ctx'> 	.handler	= l2tp_ip6_recv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __net_init int l2tp_ip6_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip6_net *pn = net_generic(net, l2tp_ip6_net_id);</div><div class='add'>+</div><div class='add'>+	rwlock_init(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;pn-&gt;l2tp_ip6_table);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;pn-&gt;l2tp_ip6_bind_table);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __net_exit void l2tp_ip6_exit_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_ip6_net *pn = l2tp_ip6_pernet(net);</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+	WARN_ON_ONCE(hlist_count_nodes(&amp;pn-&gt;l2tp_ip6_table) != 0);</div><div class='add'>+	WARN_ON_ONCE(hlist_count_nodes(&amp;pn-&gt;l2tp_ip6_bind_table) != 0);</div><div class='add'>+	write_unlock_bh(&amp;pn-&gt;l2tp_ip6_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations l2tp_ip6_net_ops = {</div><div class='add'>+	.init = l2tp_ip6_init_net,</div><div class='add'>+	.exit = l2tp_ip6_exit_net,</div><div class='add'>+	.id   = &amp;l2tp_ip6_net_id,</div><div class='add'>+	.size = sizeof(struct l2tp_ip6_net),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init l2tp_ip6_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("L2TP IP encapsulation support for IPv6 (L2TPv3)\n");</div><div class='ctx'> </div><div class='add'>+	err = register_pernet_device(&amp;l2tp_ip6_net_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	err = proto_register(&amp;l2tp_ip6_prot, 1);</div><div class='ctx'> 	if (err != 0)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out1;</div><div class='ctx'> </div><div class='ctx'> 	err = inet6_add_protocol(&amp;l2tp_ip6_protocol, IPPROTO_L2TP);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out1;</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	inet6_register_protosw(&amp;l2tp_ip6_protosw);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out1:</div><div class='add'>+out2:</div><div class='ctx'> 	proto_unregister(&amp;l2tp_ip6_prot);</div><div class='add'>+out1:</div><div class='add'>+	unregister_pernet_device(&amp;l2tp_ip6_net_ops);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -804,6 +850,7 @@ static void __exit l2tp_ip6_exit(void)</div><div class='ctx'> 	inet6_unregister_protosw(&amp;l2tp_ip6_protosw);</div><div class='ctx'> 	inet6_del_protocol(&amp;l2tp_ip6_protocol, IPPROTO_L2TP);</div><div class='ctx'> 	proto_unregister(&amp;l2tp_ip6_prot);</div><div class='add'>+	unregister_pernet_device(&amp;l2tp_ip6_net_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(l2tp_ip6_init);</div><div class='hunk'>@@ -814,8 +861,8 @@ MODULE_AUTHOR("Chris Elston &lt;celston@katalix.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("L2TP IP encapsulation for IPv6");</div><div class='ctx'> MODULE_VERSION("1.0");</div><div class='ctx'> </div><div class='del'>-/* Use the value of SOCK_DGRAM (2) directory, because __stringify doesn't like</div><div class='del'>- * enums</div><div class='add'>+/* Use the values of SOCK_DGRAM (2) as type and IPPROTO_L2TP (115) as protocol,</div><div class='add'>+ * because __stringify doesn't like enums</div><div class='ctx'>  */</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP);</div><div class='del'>-MODULE_ALIAS_NET_PF_PROTO(PF_INET6, IPPROTO_L2TP);</div><div class='add'>+MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 115, 2);</div><div class='add'>+MODULE_ALIAS_NET_PF_PROTO(PF_INET6, 115);</div><div class='head'>diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c<br/>index edbd5d1fbcde..59457c0c14aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_netlink.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_netlink.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * L2TP netlink layer, for management</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* L2TP netlink layer, for management</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008,2009,2010 Katalix Systems Ltd</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,10 +8,6 @@</div><div class='ctx'>  * Copyright (c) 2007 Samuel Ortiz &lt;samuel@sortiz.org&gt;</div><div class='ctx'>  * which is in turn partly based on the wireless netlink code:</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -30,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "l2tp_core.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct genl_family l2tp_nl_family;</div><div class='ctx'> </div><div class='ctx'> static const struct genl_multicast_group l2tp_multicast_group[] = {</div><div class='hunk'>@@ -66,8 +61,9 @@ static struct l2tp_session *l2tp_nl_session_get(struct genl_info *info)</div><div class='ctx'> 		session_id = nla_get_u32(info-&gt;attrs[L2TP_ATTR_SESSION_ID]);</div><div class='ctx'> 		tunnel = l2tp_tunnel_get(net, tunnel_id);</div><div class='ctx'> 		if (tunnel) {</div><div class='del'>-			session = l2tp_tunnel_get_session(tunnel, session_id);</div><div class='del'>-			l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+			session = l2tp_session_get(net, tunnel-&gt;sock, tunnel-&gt;version,</div><div class='add'>+						   tunnel_id, session_id);</div><div class='add'>+			l2tp_tunnel_put(tunnel);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +116,7 @@ static int l2tp_tunnel_notify(struct genl_family *family,</div><div class='ctx'> 				  NLM_F_ACK, tunnel, cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='del'>-		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);</div><div class='add'>+		ret = genlmsg_multicast_allns(family, msg, 0, 0);</div><div class='ctx'> 		/* We don't care if no one is listening */</div><div class='ctx'> 		if (ret == -ESRCH)</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -148,7 +144,7 @@ static int l2tp_session_notify(struct genl_family *family,</div><div class='ctx'> 				   NLM_F_ACK, session, cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='del'>-		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);</div><div class='add'>+		ret = genlmsg_multicast_allns(family, msg, 0, 0);</div><div class='ctx'> 		/* We don't care if no one is listening */</div><div class='ctx'> 		if (ret == -ESRCH)</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -160,87 +156,85 @@ static int l2tp_session_notify(struct genl_family *family,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int l2tp_nl_cmd_tunnel_create_get_addr(struct nlattr **attrs, struct l2tp_tunnel_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	if (attrs[L2TP_ATTR_UDP_SPORT])</div><div class='add'>+		cfg-&gt;local_udp_port = nla_get_u16(attrs[L2TP_ATTR_UDP_SPORT]);</div><div class='add'>+	if (attrs[L2TP_ATTR_UDP_DPORT])</div><div class='add'>+		cfg-&gt;peer_udp_port = nla_get_u16(attrs[L2TP_ATTR_UDP_DPORT]);</div><div class='add'>+	cfg-&gt;use_udp_checksums = nla_get_flag(attrs[L2TP_ATTR_UDP_CSUM]);</div><div class='add'>+</div><div class='add'>+	/* Must have either AF_INET or AF_INET6 address for source and destination */</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (attrs[L2TP_ATTR_IP6_SADDR] &amp;&amp; attrs[L2TP_ATTR_IP6_DADDR]) {</div><div class='add'>+		cfg-&gt;local_ip6 = nla_data(attrs[L2TP_ATTR_IP6_SADDR]);</div><div class='add'>+		cfg-&gt;peer_ip6 = nla_data(attrs[L2TP_ATTR_IP6_DADDR]);</div><div class='add'>+		cfg-&gt;udp6_zero_tx_checksums = nla_get_flag(attrs[L2TP_ATTR_UDP_ZERO_CSUM6_TX]);</div><div class='add'>+		cfg-&gt;udp6_zero_rx_checksums = nla_get_flag(attrs[L2TP_ATTR_UDP_ZERO_CSUM6_RX]);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (attrs[L2TP_ATTR_IP_SADDR] &amp;&amp; attrs[L2TP_ATTR_IP_DADDR]) {</div><div class='add'>+		cfg-&gt;local_ip.s_addr = nla_get_in_addr(attrs[L2TP_ATTR_IP_SADDR]);</div><div class='add'>+		cfg-&gt;peer_ip.s_addr = nla_get_in_addr(attrs[L2TP_ATTR_IP_DADDR]);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2tp_nl_cmd_tunnel_create(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tunnel_id;</div><div class='ctx'> 	u32 peer_tunnel_id;</div><div class='ctx'> 	int proto_version;</div><div class='del'>-	int fd;</div><div class='add'>+	int fd = -1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct l2tp_tunnel_cfg cfg = { 0, };</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> 	struct net *net = genl_info_net(info);</div><div class='add'>+	struct nlattr **attrs = info-&gt;attrs;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[L2TP_ATTR_CONN_ID]) {</div><div class='add'>+	if (!attrs[L2TP_ATTR_CONN_ID]) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	tunnel_id = nla_get_u32(info-&gt;attrs[L2TP_ATTR_CONN_ID]);</div><div class='add'>+	tunnel_id = nla_get_u32(attrs[L2TP_ATTR_CONN_ID]);</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[L2TP_ATTR_PEER_CONN_ID]) {</div><div class='add'>+	if (!attrs[L2TP_ATTR_PEER_CONN_ID]) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	peer_tunnel_id = nla_get_u32(info-&gt;attrs[L2TP_ATTR_PEER_CONN_ID]);</div><div class='add'>+	peer_tunnel_id = nla_get_u32(attrs[L2TP_ATTR_PEER_CONN_ID]);</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[L2TP_ATTR_PROTO_VERSION]) {</div><div class='add'>+	if (!attrs[L2TP_ATTR_PROTO_VERSION]) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	proto_version = nla_get_u8(info-&gt;attrs[L2TP_ATTR_PROTO_VERSION]);</div><div class='add'>+	proto_version = nla_get_u8(attrs[L2TP_ATTR_PROTO_VERSION]);</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;attrs[L2TP_ATTR_ENCAP_TYPE]) {</div><div class='add'>+	if (!attrs[L2TP_ATTR_ENCAP_TYPE]) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	cfg.encap = nla_get_u16(info-&gt;attrs[L2TP_ATTR_ENCAP_TYPE]);</div><div class='del'>-</div><div class='del'>-	fd = -1;</div><div class='del'>-	if (info-&gt;attrs[L2TP_ATTR_FD]) {</div><div class='del'>-		fd = nla_get_u32(info-&gt;attrs[L2TP_ATTR_FD]);</div><div class='add'>+	cfg.encap = nla_get_u16(attrs[L2TP_ATTR_ENCAP_TYPE]);</div><div class='add'>+</div><div class='add'>+	/* Managed tunnels take the tunnel socket from userspace.</div><div class='add'>+	 * Unmanaged tunnels must call out the source and destination addresses</div><div class='add'>+	 * for the kernel to create the tunnel socket itself.</div><div class='add'>+	 */</div><div class='add'>+	if (attrs[L2TP_ATTR_FD]) {</div><div class='add'>+		fd = nla_get_u32(attrs[L2TP_ATTR_FD]);</div><div class='ctx'> 	} else {</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		if (info-&gt;attrs[L2TP_ATTR_IP6_SADDR] &amp;&amp;</div><div class='del'>-		    info-&gt;attrs[L2TP_ATTR_IP6_DADDR]) {</div><div class='del'>-			cfg.local_ip6 = nla_data(</div><div class='del'>-				info-&gt;attrs[L2TP_ATTR_IP6_SADDR]);</div><div class='del'>-			cfg.peer_ip6 = nla_data(</div><div class='del'>-				info-&gt;attrs[L2TP_ATTR_IP6_DADDR]);</div><div class='del'>-		} else</div><div class='del'>-#endif</div><div class='del'>-		if (info-&gt;attrs[L2TP_ATTR_IP_SADDR] &amp;&amp;</div><div class='del'>-		    info-&gt;attrs[L2TP_ATTR_IP_DADDR]) {</div><div class='del'>-			cfg.local_ip.s_addr = nla_get_in_addr(</div><div class='del'>-				info-&gt;attrs[L2TP_ATTR_IP_SADDR]);</div><div class='del'>-			cfg.peer_ip.s_addr = nla_get_in_addr(</div><div class='del'>-				info-&gt;attrs[L2TP_ATTR_IP_DADDR]);</div><div class='del'>-		} else {</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+		ret = l2tp_nl_cmd_tunnel_create_get_addr(attrs, &amp;cfg);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (info-&gt;attrs[L2TP_ATTR_UDP_SPORT])</div><div class='del'>-			cfg.local_udp_port = nla_get_u16(info-&gt;attrs[L2TP_ATTR_UDP_SPORT]);</div><div class='del'>-		if (info-&gt;attrs[L2TP_ATTR_UDP_DPORT])</div><div class='del'>-			cfg.peer_udp_port = nla_get_u16(info-&gt;attrs[L2TP_ATTR_UDP_DPORT]);</div><div class='del'>-		cfg.use_udp_checksums = nla_get_flag(</div><div class='del'>-			info-&gt;attrs[L2TP_ATTR_UDP_CSUM]);</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		cfg.udp6_zero_tx_checksums = nla_get_flag(</div><div class='del'>-			info-&gt;attrs[L2TP_ATTR_UDP_ZERO_CSUM6_TX]);</div><div class='del'>-		cfg.udp6_zero_rx_checksums = nla_get_flag(</div><div class='del'>-			info-&gt;attrs[L2TP_ATTR_UDP_ZERO_CSUM6_RX]);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[L2TP_ATTR_DEBUG])</div><div class='del'>-		cfg.debug = nla_get_u32(info-&gt;attrs[L2TP_ATTR_DEBUG]);</div><div class='del'>-</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	switch (cfg.encap) {</div><div class='ctx'> 	case L2TP_ENCAPTYPE_UDP:</div><div class='ctx'> 	case L2TP_ENCAPTYPE_IP:</div><div class='del'>-		ret = l2tp_tunnel_create(net, fd, proto_version, tunnel_id,</div><div class='add'>+		ret = l2tp_tunnel_create(fd, proto_version, tunnel_id,</div><div class='ctx'> 					 peer_tunnel_id, &amp;cfg, &amp;tunnel);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -248,7 +242,7 @@ static int l2tp_nl_cmd_tunnel_create(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	l2tp_tunnel_inc_refcount(tunnel);</div><div class='add'>+	refcount_inc(&amp;tunnel-&gt;ref_count);</div><div class='ctx'> 	ret = l2tp_tunnel_register(tunnel, net, &amp;cfg);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(tunnel);</div><div class='hunk'>@@ -256,7 +250,7 @@ static int l2tp_nl_cmd_tunnel_create(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = l2tp_tunnel_notify(&amp;l2tp_nl_family, info, tunnel,</div><div class='ctx'> 				 L2TP_CMD_TUNNEL_CREATE);</div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -286,7 +280,7 @@ static int l2tp_nl_cmd_tunnel_delete(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> </div><div class='ctx'> 	l2tp_tunnel_delete(tunnel);</div><div class='ctx'> </div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -311,28 +305,88 @@ static int l2tp_nl_cmd_tunnel_modify(struct sk_buff *skb, struct genl_info *info</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[L2TP_ATTR_DEBUG])</div><div class='del'>-		tunnel-&gt;debug = nla_get_u32(info-&gt;attrs[L2TP_ATTR_DEBUG]);</div><div class='del'>-</div><div class='ctx'> 	ret = l2tp_tunnel_notify(&amp;l2tp_nl_family, info,</div><div class='ctx'> 				 tunnel, L2TP_CMD_TUNNEL_MODIFY);</div><div class='ctx'> </div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static int l2tp_nl_tunnel_send_addr6(struct sk_buff *skb, struct sock *sk,</div><div class='add'>+				     enum l2tp_encap_type encap)</div><div class='add'>+{</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct ipv6_pinfo *np = inet6_sk(sk);</div><div class='add'>+</div><div class='add'>+	switch (encap) {</div><div class='add'>+	case L2TP_ENCAPTYPE_UDP:</div><div class='add'>+		if (udp_get_no_check6_tx(sk) &amp;&amp;</div><div class='add'>+		    nla_put_flag(skb, L2TP_ATTR_UDP_ZERO_CSUM6_TX))</div><div class='add'>+			return -1;</div><div class='add'>+		if (udp_get_no_check6_rx(sk) &amp;&amp;</div><div class='add'>+		    nla_put_flag(skb, L2TP_ATTR_UDP_ZERO_CSUM6_RX))</div><div class='add'>+			return -1;</div><div class='add'>+		if (nla_put_u16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet-&gt;inet_sport)) ||</div><div class='add'>+		    nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet-&gt;inet_dport)))</div><div class='add'>+			return -1;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case L2TP_ENCAPTYPE_IP:</div><div class='add'>+		if (nla_put_in6_addr(skb, L2TP_ATTR_IP6_SADDR, &amp;np-&gt;saddr) ||</div><div class='add'>+		    nla_put_in6_addr(skb, L2TP_ATTR_IP6_DADDR, &amp;sk-&gt;sk_v6_daddr))</div><div class='add'>+			return -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int l2tp_nl_tunnel_send_addr4(struct sk_buff *skb, struct sock *sk,</div><div class='add'>+				     enum l2tp_encap_type encap)</div><div class='add'>+{</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+</div><div class='add'>+	switch (encap) {</div><div class='add'>+	case L2TP_ENCAPTYPE_UDP:</div><div class='add'>+		if (nla_put_u8(skb, L2TP_ATTR_UDP_CSUM, !sk-&gt;sk_no_check_tx) ||</div><div class='add'>+		    nla_put_u16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet-&gt;inet_sport)) ||</div><div class='add'>+		    nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet-&gt;inet_dport)))</div><div class='add'>+			return -1;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case L2TP_ENCAPTYPE_IP:</div><div class='add'>+		if (nla_put_in_addr(skb, L2TP_ATTR_IP_SADDR, inet-&gt;inet_saddr) ||</div><div class='add'>+		    nla_put_in_addr(skb, L2TP_ATTR_IP_DADDR, inet-&gt;inet_daddr))</div><div class='add'>+			return -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Append attributes for the tunnel address, handling the different attribute types</div><div class='add'>+ * used for different tunnel encapsulation and AF_INET v.s. AF_INET6.</div><div class='add'>+ */</div><div class='add'>+static int l2tp_nl_tunnel_send_addr(struct sk_buff *skb, struct l2tp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = tunnel-&gt;sock;</div><div class='add'>+</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		return l2tp_nl_tunnel_send_addr6(skb, sk, tunnel-&gt;encap);</div><div class='add'>+#endif</div><div class='add'>+	return l2tp_nl_tunnel_send_addr4(skb, sk, tunnel-&gt;encap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int flags,</div><div class='ctx'> 			       struct l2tp_tunnel *tunnel, u8 cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> 	struct nlattr *nest;</div><div class='del'>-	struct sock *sk = NULL;</div><div class='del'>-	struct inet_sock *inet;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	struct ipv6_pinfo *np = NULL;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	hdr = genlmsg_put(skb, portid, seq, &amp;l2tp_nl_family, flags, cmd);</div><div class='ctx'> 	if (!hdr)</div><div class='hunk'>@@ -341,12 +395,12 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla</div><div class='ctx'> 	if (nla_put_u8(skb, L2TP_ATTR_PROTO_VERSION, tunnel-&gt;version) ||</div><div class='ctx'> 	    nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel-&gt;tunnel_id) ||</div><div class='ctx'> 	    nla_put_u32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel-&gt;peer_tunnel_id) ||</div><div class='del'>-	    nla_put_u32(skb, L2TP_ATTR_DEBUG, tunnel-&gt;debug) ||</div><div class='add'>+	    nla_put_u32(skb, L2TP_ATTR_DEBUG, 0) ||</div><div class='ctx'> 	    nla_put_u16(skb, L2TP_ATTR_ENCAP_TYPE, tunnel-&gt;encap))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, L2TP_ATTR_STATS);</div><div class='del'>-	if (nest == NULL)</div><div class='add'>+	nest = nla_nest_start_noflag(skb, L2TP_ATTR_STATS);</div><div class='add'>+	if (!nest)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u64_64bit(skb, L2TP_ATTR_TX_PACKETS,</div><div class='hunk'>@@ -367,67 +421,24 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_SEQ_DISCARDS,</div><div class='ctx'> 			      atomic_long_read(&amp;tunnel-&gt;stats.rx_seq_discards),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_COOKIE_DISCARDS,</div><div class='add'>+			      atomic_long_read(&amp;tunnel-&gt;stats.rx_cookie_discards),</div><div class='add'>+			      L2TP_ATTR_STATS_PAD) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_OOS_PACKETS,</div><div class='ctx'> 			      atomic_long_read(&amp;tunnel-&gt;stats.rx_oos_packets),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_ERRORS,</div><div class='ctx'> 			      atomic_long_read(&amp;tunnel-&gt;stats.rx_errors),</div><div class='add'>+			      L2TP_ATTR_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_INVALID,</div><div class='add'>+			      atomic_long_read(&amp;tunnel-&gt;stats.rx_invalid),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='ctx'> </div><div class='del'>-	sk = tunnel-&gt;sock;</div><div class='del'>-	if (!sk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	if (sk-&gt;sk_family == AF_INET6)</div><div class='del'>-		np = inet6_sk(sk);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	inet = inet_sk(sk);</div><div class='del'>-</div><div class='del'>-	switch (tunnel-&gt;encap) {</div><div class='del'>-	case L2TP_ENCAPTYPE_UDP:</div><div class='del'>-		switch (sk-&gt;sk_family) {</div><div class='del'>-		case AF_INET:</div><div class='del'>-			if (nla_put_u8(skb, L2TP_ATTR_UDP_CSUM, !sk-&gt;sk_no_check_tx))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			break;</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		case AF_INET6:</div><div class='del'>-			if (udp_get_no_check6_tx(sk) &amp;&amp;</div><div class='del'>-			    nla_put_flag(skb, L2TP_ATTR_UDP_ZERO_CSUM6_TX))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			if (udp_get_no_check6_rx(sk) &amp;&amp;</div><div class='del'>-			    nla_put_flag(skb, L2TP_ATTR_UDP_ZERO_CSUM6_RX))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		if (nla_put_u16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet-&gt;inet_sport)) ||</div><div class='del'>-		    nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet-&gt;inet_dport)))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		/* fall through  */</div><div class='del'>-	case L2TP_ENCAPTYPE_IP:</div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-		if (np) {</div><div class='del'>-			if (nla_put_in6_addr(skb, L2TP_ATTR_IP6_SADDR,</div><div class='del'>-					     &amp;np-&gt;saddr) ||</div><div class='del'>-			    nla_put_in6_addr(skb, L2TP_ATTR_IP6_DADDR,</div><div class='del'>-					     &amp;sk-&gt;sk_v6_daddr))</div><div class='del'>-				goto nla_put_failure;</div><div class='del'>-		} else</div><div class='del'>-#endif</div><div class='del'>-		if (nla_put_in_addr(skb, L2TP_ATTR_IP_SADDR,</div><div class='del'>-				    inet-&gt;inet_saddr) ||</div><div class='del'>-		    nla_put_in_addr(skb, L2TP_ATTR_IP_DADDR,</div><div class='del'>-				    inet-&gt;inet_daddr))</div><div class='del'>-			goto nla_put_failure;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (l2tp_nl_tunnel_send_addr(skb, tunnel))</div><div class='add'>+		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	genlmsg_end(skb, hdr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -468,42 +479,48 @@ static int l2tp_nl_cmd_tunnel_get(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_nlmsg_tunnel;</div><div class='ctx'> </div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='ctx'> 	return genlmsg_unicast(net, msg, info-&gt;snd_portid);</div><div class='ctx'> </div><div class='ctx'> err_nlmsg_tunnel:</div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> err_nlmsg:</div><div class='ctx'> 	nlmsg_free(msg);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct l2tp_nl_cb_data {</div><div class='add'>+	unsigned long tkey;</div><div class='add'>+	unsigned long skey;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int l2tp_nl_cmd_tunnel_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	int ti = cb-&gt;args[0];</div><div class='add'>+	struct l2tp_nl_cb_data *cbd = (void *)&amp;cb-&gt;ctx[0];</div><div class='add'>+	unsigned long key = cbd-&gt;tkey;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		tunnel = l2tp_tunnel_get_nth(net, ti);</div><div class='del'>-		if (tunnel == NULL)</div><div class='add'>+		tunnel = l2tp_tunnel_get_next(net, &amp;key);</div><div class='add'>+		if (!tunnel)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (l2tp_nl_tunnel_send(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='ctx'> 					cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='ctx'> 					tunnel, L2TP_CMD_TUNNEL_GET) &lt; 0) {</div><div class='del'>-			l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+			l2tp_tunnel_put(tunnel);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+		l2tp_tunnel_put(tunnel);</div><div class='ctx'> </div><div class='del'>-		ti++;</div><div class='add'>+		key++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	cb-&gt;args[0] = ti;</div><div class='add'>+	cbd-&gt;tkey = key;</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;len;</div><div class='ctx'> }</div><div class='hunk'>@@ -573,6 +590,7 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> </div><div class='ctx'> 		if (info-&gt;attrs[L2TP_ATTR_COOKIE]) {</div><div class='ctx'> 			u16 len = nla_len(info-&gt;attrs[L2TP_ATTR_COOKIE]);</div><div class='add'>+</div><div class='ctx'> 			if (len &gt; 8) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto out_tunnel;</div><div class='hunk'>@@ -582,6 +600,7 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 		}</div><div class='ctx'> 		if (info-&gt;attrs[L2TP_ATTR_PEER_COOKIE]) {</div><div class='ctx'> 			u16 len = nla_len(info-&gt;attrs[L2TP_ATTR_PEER_COOKIE]);</div><div class='add'>+</div><div class='ctx'> 			if (len &gt; 8) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto out_tunnel;</div><div class='hunk'>@@ -593,9 +612,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 			cfg.ifname = nla_data(info-&gt;attrs[L2TP_ATTR_IFNAME]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[L2TP_ATTR_DEBUG])</div><div class='del'>-		cfg.debug = nla_get_u32(info-&gt;attrs[L2TP_ATTR_DEBUG]);</div><div class='del'>-</div><div class='ctx'> 	if (info-&gt;attrs[L2TP_ATTR_RECV_SEQ])</div><div class='ctx'> 		cfg.recv_seq = nla_get_u8(info-&gt;attrs[L2TP_ATTR_RECV_SEQ]);</div><div class='ctx'> </div><div class='hunk'>@@ -609,14 +625,13 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 		cfg.reorder_timeout = nla_get_msecs(info-&gt;attrs[L2TP_ATTR_RECV_TIMEOUT]);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='del'>-	if (l2tp_nl_cmd_ops[cfg.pw_type] == NULL) {</div><div class='add'>+	if (!l2tp_nl_cmd_ops[cfg.pw_type]) {</div><div class='ctx'> 		genl_unlock();</div><div class='ctx'> 		request_module("net-l2tp-type-%u", cfg.pw_type);</div><div class='ctx'> 		genl_lock();</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if ((l2tp_nl_cmd_ops[cfg.pw_type] == NULL) ||</div><div class='del'>-	    (l2tp_nl_cmd_ops[cfg.pw_type]-&gt;session_create == NULL)) {</div><div class='add'>+	if (!l2tp_nl_cmd_ops[cfg.pw_type] || !l2tp_nl_cmd_ops[cfg.pw_type]-&gt;session_create) {</div><div class='ctx'> 		ret = -EPROTONOSUPPORT;</div><div class='ctx'> 		goto out_tunnel;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -627,16 +642,17 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 							   &amp;cfg);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='del'>-		session = l2tp_tunnel_get_session(tunnel, session_id);</div><div class='add'>+		session = l2tp_session_get(net, tunnel-&gt;sock, tunnel-&gt;version,</div><div class='add'>+					   tunnel_id, session_id);</div><div class='ctx'> 		if (session) {</div><div class='ctx'> 			ret = l2tp_session_notify(&amp;l2tp_nl_family, info, session,</div><div class='ctx'> 						  L2TP_CMD_SESSION_CREATE);</div><div class='del'>-			l2tp_session_dec_refcount(session);</div><div class='add'>+			l2tp_session_put(session);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_tunnel:</div><div class='del'>-	l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -648,7 +664,7 @@ static int l2tp_nl_cmd_session_delete(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 	u16 pw_type;</div><div class='ctx'> </div><div class='ctx'> 	session = l2tp_nl_session_get(info);</div><div class='del'>-	if (session == NULL) {</div><div class='add'>+	if (!session) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -659,9 +675,9 @@ static int l2tp_nl_cmd_session_delete(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 	pw_type = session-&gt;pwtype;</div><div class='ctx'> 	if (pw_type &lt; __L2TP_PWTYPE_MAX)</div><div class='ctx'> 		if (l2tp_nl_cmd_ops[pw_type] &amp;&amp; l2tp_nl_cmd_ops[pw_type]-&gt;session_delete)</div><div class='del'>-			ret = (*l2tp_nl_cmd_ops[pw_type]-&gt;session_delete)(session);</div><div class='add'>+			l2tp_nl_cmd_ops[pw_type]-&gt;session_delete(session);</div><div class='ctx'> </div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -673,20 +689,19 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='ctx'> 	session = l2tp_nl_session_get(info);</div><div class='del'>-	if (session == NULL) {</div><div class='add'>+	if (!session) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;attrs[L2TP_ATTR_DEBUG])</div><div class='del'>-		session-&gt;debug = nla_get_u32(info-&gt;attrs[L2TP_ATTR_DEBUG]);</div><div class='del'>-</div><div class='ctx'> 	if (info-&gt;attrs[L2TP_ATTR_RECV_SEQ])</div><div class='ctx'> 		session-&gt;recv_seq = nla_get_u8(info-&gt;attrs[L2TP_ATTR_RECV_SEQ]);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;attrs[L2TP_ATTR_SEND_SEQ]) {</div><div class='add'>+		struct l2tp_tunnel *tunnel = session-&gt;tunnel;</div><div class='add'>+</div><div class='ctx'> 		session-&gt;send_seq = nla_get_u8(info-&gt;attrs[L2TP_ATTR_SEND_SEQ]);</div><div class='del'>-		l2tp_session_set_header_len(session, session-&gt;tunnel-&gt;version);</div><div class='add'>+		l2tp_session_set_header_len(session, tunnel-&gt;version, tunnel-&gt;encap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;attrs[L2TP_ATTR_LNS_MODE])</div><div class='hunk'>@@ -698,7 +713,7 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf</div><div class='ctx'> 	ret = l2tp_session_notify(&amp;l2tp_nl_family, info,</div><div class='ctx'> 				  session, L2TP_CMD_SESSION_MODIFY);</div><div class='ctx'> </div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -718,20 +733,17 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl</div><div class='ctx'> 	if (nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel-&gt;tunnel_id) ||</div><div class='ctx'> 	    nla_put_u32(skb, L2TP_ATTR_SESSION_ID, session-&gt;session_id) ||</div><div class='ctx'> 	    nla_put_u32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel-&gt;peer_tunnel_id) ||</div><div class='del'>-	    nla_put_u32(skb, L2TP_ATTR_PEER_SESSION_ID,</div><div class='del'>-			session-&gt;peer_session_id) ||</div><div class='del'>-	    nla_put_u32(skb, L2TP_ATTR_DEBUG, session-&gt;debug) ||</div><div class='add'>+	    nla_put_u32(skb, L2TP_ATTR_PEER_SESSION_ID, session-&gt;peer_session_id) ||</div><div class='add'>+	    nla_put_u32(skb, L2TP_ATTR_DEBUG, 0) ||</div><div class='ctx'> 	    nla_put_u16(skb, L2TP_ATTR_PW_TYPE, session-&gt;pwtype))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if ((session-&gt;ifname[0] &amp;&amp;</div><div class='ctx'> 	     nla_put_string(skb, L2TP_ATTR_IFNAME, session-&gt;ifname)) ||</div><div class='ctx'> 	    (session-&gt;cookie_len &amp;&amp;</div><div class='del'>-	     nla_put(skb, L2TP_ATTR_COOKIE, session-&gt;cookie_len,</div><div class='del'>-		     &amp;session-&gt;cookie[0])) ||</div><div class='add'>+	     nla_put(skb, L2TP_ATTR_COOKIE, session-&gt;cookie_len, session-&gt;cookie)) ||</div><div class='ctx'> 	    (session-&gt;peer_cookie_len &amp;&amp;</div><div class='del'>-	     nla_put(skb, L2TP_ATTR_PEER_COOKIE, session-&gt;peer_cookie_len,</div><div class='del'>-		     &amp;session-&gt;peer_cookie[0])) ||</div><div class='add'>+	     nla_put(skb, L2TP_ATTR_PEER_COOKIE, session-&gt;peer_cookie_len, session-&gt;peer_cookie)) ||</div><div class='ctx'> 	    nla_put_u8(skb, L2TP_ATTR_RECV_SEQ, session-&gt;recv_seq) ||</div><div class='ctx'> 	    nla_put_u8(skb, L2TP_ATTR_SEND_SEQ, session-&gt;send_seq) ||</div><div class='ctx'> 	    nla_put_u8(skb, L2TP_ATTR_LNS_MODE, session-&gt;lns_mode) ||</div><div class='hunk'>@@ -742,8 +754,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl</div><div class='ctx'> 			   session-&gt;reorder_timeout, L2TP_ATTR_PAD)))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, L2TP_ATTR_STATS);</div><div class='del'>-	if (nest == NULL)</div><div class='add'>+	nest = nla_nest_start_noflag(skb, L2TP_ATTR_STATS);</div><div class='add'>+	if (!nest)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u64_64bit(skb, L2TP_ATTR_TX_PACKETS,</div><div class='hunk'>@@ -764,11 +776,17 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_SEQ_DISCARDS,</div><div class='ctx'> 			      atomic_long_read(&amp;session-&gt;stats.rx_seq_discards),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_COOKIE_DISCARDS,</div><div class='add'>+			      atomic_long_read(&amp;session-&gt;stats.rx_cookie_discards),</div><div class='add'>+			      L2TP_ATTR_STATS_PAD) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_OOS_PACKETS,</div><div class='ctx'> 			      atomic_long_read(&amp;session-&gt;stats.rx_oos_packets),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD) ||</div><div class='ctx'> 	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_ERRORS,</div><div class='ctx'> 			      atomic_long_read(&amp;session-&gt;stats.rx_errors),</div><div class='add'>+			      L2TP_ATTR_STATS_PAD) ||</div><div class='add'>+	    nla_put_u64_64bit(skb, L2TP_ATTR_RX_INVALID,</div><div class='add'>+			      atomic_long_read(&amp;session-&gt;stats.rx_invalid),</div><div class='ctx'> 			      L2TP_ATTR_STATS_PAD))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	nla_nest_end(skb, nest);</div><div class='hunk'>@@ -788,7 +806,7 @@ static int l2tp_nl_cmd_session_get(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	session = l2tp_nl_session_get(info);</div><div class='del'>-	if (session == NULL) {</div><div class='add'>+	if (!session) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,57 +824,59 @@ static int l2tp_nl_cmd_session_get(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> </div><div class='ctx'> 	ret = genlmsg_unicast(genl_info_net(info), msg, info-&gt;snd_portid);</div><div class='ctx'> </div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> err_ref_msg:</div><div class='ctx'> 	nlmsg_free(msg);</div><div class='ctx'> err_ref:</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='add'>+	struct l2tp_nl_cb_data *cbd = (void *)&amp;cb-&gt;ctx[0];</div><div class='ctx'> 	struct net *net = sock_net(skb-&gt;sk);</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel = NULL;</div><div class='del'>-	int ti = cb-&gt;args[0];</div><div class='del'>-	int si = cb-&gt;args[1];</div><div class='add'>+	unsigned long tkey = cbd-&gt;tkey;</div><div class='add'>+	unsigned long skey = cbd-&gt;skey;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		if (tunnel == NULL) {</div><div class='del'>-			tunnel = l2tp_tunnel_get_nth(net, ti);</div><div class='del'>-			if (tunnel == NULL)</div><div class='add'>+		if (!tunnel) {</div><div class='add'>+			tunnel = l2tp_tunnel_get_next(net, &amp;tkey);</div><div class='add'>+			if (!tunnel)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		session = l2tp_session_get_nth(tunnel, si);</div><div class='del'>-		if (session == NULL) {</div><div class='del'>-			ti++;</div><div class='del'>-			l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+		session = l2tp_session_get_next(net, tunnel-&gt;sock, tunnel-&gt;version,</div><div class='add'>+						tunnel-&gt;tunnel_id, &amp;skey);</div><div class='add'>+		if (!session) {</div><div class='add'>+			tkey++;</div><div class='add'>+			l2tp_tunnel_put(tunnel);</div><div class='ctx'> 			tunnel = NULL;</div><div class='del'>-			si = 0;</div><div class='add'>+			skey = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (l2tp_nl_session_send(skb, NETLINK_CB(cb-&gt;skb).portid,</div><div class='ctx'> 					 cb-&gt;nlh-&gt;nlmsg_seq, NLM_F_MULTI,</div><div class='ctx'> 					 session, L2TP_CMD_SESSION_GET) &lt; 0) {</div><div class='del'>-			l2tp_session_dec_refcount(session);</div><div class='del'>-			l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+			l2tp_session_put(session);</div><div class='add'>+			l2tp_tunnel_put(tunnel);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		l2tp_session_dec_refcount(session);</div><div class='add'>+		l2tp_session_put(session);</div><div class='ctx'> </div><div class='del'>-		si++;</div><div class='add'>+		skey++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	cb-&gt;args[0] = ti;</div><div class='del'>-	cb-&gt;args[1] = si;</div><div class='add'>+	cbd-&gt;tkey = tkey;</div><div class='add'>+	cbd-&gt;skey = skey;</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;len;</div><div class='ctx'> }</div><div class='hunk'>@@ -912,62 +932,62 @@ static const struct nla_policy l2tp_nl_policy[L2TP_ATTR_MAX + 1] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct genl_ops l2tp_nl_ops[] = {</div><div class='add'>+static const struct genl_small_ops l2tp_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_NOOP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_noop,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='ctx'> 		/* can be retrieved by unprivileged users */</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_TUNNEL_CREATE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_tunnel_create,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_TUNNEL_DELETE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_tunnel_delete,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_TUNNEL_MODIFY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_tunnel_modify,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_TUNNEL_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_tunnel_get,</div><div class='ctx'> 		.dumpit = l2tp_nl_cmd_tunnel_dump,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_SESSION_CREATE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_session_create,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_SESSION_DELETE,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_session_delete,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_SESSION_MODIFY,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_session_modify,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = L2TP_CMD_SESSION_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = l2tp_nl_cmd_session_get,</div><div class='ctx'> 		.dumpit = l2tp_nl_cmd_session_dump,</div><div class='del'>-		.policy = l2tp_nl_policy,</div><div class='del'>-		.flags = GENL_ADMIN_PERM,</div><div class='add'>+		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -976,10 +996,12 @@ static struct genl_family l2tp_nl_family __ro_after_init = {</div><div class='ctx'> 	.version	= L2TP_GENL_VERSION,</div><div class='ctx'> 	.hdrsize	= 0,</div><div class='ctx'> 	.maxattr	= L2TP_ATTR_MAX,</div><div class='add'>+	.policy = l2tp_nl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='del'>-	.ops		= l2tp_nl_ops,</div><div class='del'>-	.n_ops		= ARRAY_SIZE(l2tp_nl_ops),</div><div class='add'>+	.small_ops	= l2tp_nl_ops,</div><div class='add'>+	.n_small_ops	= ARRAY_SIZE(l2tp_nl_ops),</div><div class='add'>+	.resv_start_op	= L2TP_CMD_SESSION_GET + 1,</div><div class='ctx'> 	.mcgrps		= l2tp_multicast_group,</div><div class='ctx'> 	.n_mcgrps	= ARRAY_SIZE(l2tp_multicast_group),</div><div class='ctx'> };</div><div class='head'>diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c<br/>index 04d9946dcdba..ae4543d5597b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ppp.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l2tp/l2tp_ppp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/l2tp_ppp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/l2tp_ppp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Linux PPP over L2TP (PPPoX/PPPoL2TP) Sockets</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +12,6 @@</div><div class='ctx'>  * Based on original work by Martijn van Oosterhout &lt;kleptog@svana.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * License:</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This driver handles only L2TP data frames; control frames are handled by a</div><div class='hunk'>@@ -121,10 +117,8 @@ struct pppol2tp_session {</div><div class='ctx'> 	int			owner;		/* pid that opened the socket */</div><div class='ctx'> </div><div class='ctx'> 	struct mutex		sk_lock;	/* Protects .sk */</div><div class='del'>-	struct sock __rcu	*sk;		/* Pointer to the session</div><div class='del'>-						 * PPPoX socket */</div><div class='add'>+	struct sock __rcu	*sk;		/* Pointer to the session PPPoX socket */</div><div class='ctx'> 	struct sock		*__sk;		/* Copy of .sk, for cleanup */</div><div class='del'>-	struct rcu_head		rcu;		/* For asynchronous release */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb);</div><div class='hunk'>@@ -135,44 +129,33 @@ static const struct ppp_channel_ops pppol2tp_chan_ops = {</div><div class='ctx'> </div><div class='ctx'> static const struct proto_ops pppol2tp_ops;</div><div class='ctx'> </div><div class='del'>-/* Retrieves the pppol2tp socket associated to a session.</div><div class='del'>- * A reference is held on the returned socket, so this function must be paired</div><div class='del'>- * with sock_put().</div><div class='del'>- */</div><div class='add'>+/* Retrieves the pppol2tp socket associated to a session. */</div><div class='ctx'> static struct sock *pppol2tp_session_get_sock(struct l2tp_session *session)</div><div class='ctx'> {</div><div class='ctx'> 	struct pppol2tp_session *ps = l2tp_session_priv(session);</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	sk = rcu_dereference(ps-&gt;sk);</div><div class='del'>-	if (sk)</div><div class='del'>-		sock_hold(sk);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return sk;</div><div class='add'>+	return rcu_dereference(ps-&gt;sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Helpers to obtain tunnel/session contexts from sockets.</div><div class='ctx'>  */</div><div class='del'>-static inline struct l2tp_session *pppol2tp_sock_to_session(struct sock *sk)</div><div class='add'>+static struct l2tp_session *pppol2tp_sock_to_session(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> </div><div class='del'>-	if (sk == NULL)</div><div class='add'>+	if (!sk)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	sock_hold(sk);</div><div class='del'>-	session = (struct l2tp_session *)(sk-&gt;sk_user_data);</div><div class='del'>-	if (session == NULL) {</div><div class='del'>-		sock_put(sk);</div><div class='del'>-		goto out;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	session = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	if (session &amp;&amp; refcount_inc_not_zero(&amp;session-&gt;ref_count)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		WARN_ON_ONCE(session-&gt;magic != L2TP_SESSION_MAGIC);</div><div class='add'>+		return session;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	BUG_ON(session-&gt;magic != L2TP_SESSION_MAGIC);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return session;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -193,8 +176,7 @@ static int pppol2tp_recvmsg(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	skb = skb_recv_datagram(sk, flags &amp; ~MSG_DONTWAIT,</div><div class='del'>-				flags &amp; MSG_DONTWAIT, &amp;err);</div><div class='add'>+	skb = skb_recv_datagram(sk, flags, &amp;err);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -214,21 +196,20 @@ end:</div><div class='ctx'> </div><div class='ctx'> static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int data_len)</div><div class='ctx'> {</div><div class='del'>-	struct pppol2tp_session *ps = l2tp_session_priv(session);</div><div class='del'>-	struct sock *sk = NULL;</div><div class='add'>+	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	/* If the socket is bound, send it in to PPP's input queue. Otherwise</div><div class='ctx'> 	 * queue it on the session socket.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	sk = rcu_dereference(ps-&gt;sk);</div><div class='del'>-	if (sk == NULL)</div><div class='add'>+	sk = pppol2tp_session_get_sock(session);</div><div class='add'>+	if (!sk)</div><div class='ctx'> 		goto no_sock;</div><div class='ctx'> </div><div class='ctx'> 	/* If the first two bytes are 0xFF03, consider that it is the PPP's</div><div class='ctx'> 	 * Address and Control fields and skip them. The L2TP module has always</div><div class='ctx'> 	 * worked this way, although, in theory, the use of these fields should</div><div class='del'>-	 * be negociated and handled at the PPP layer. These fields are</div><div class='add'>+	 * be negotiated and handled at the PPP layer. These fields are</div><div class='ctx'> 	 * constant: 0xFF is the All-Stations Address and 0x03 the Unnumbered</div><div class='ctx'> 	 * Information command with Poll/Final bit set to zero (RFC 1662).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -239,17 +220,9 @@ static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int</div><div class='ctx'> 	if (sk-&gt;sk_state &amp; PPPOX_BOUND) {</div><div class='ctx'> 		struct pppox_sock *po;</div><div class='ctx'> </div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_DATA,</div><div class='del'>-			 "%s: recv %d byte data frame, passing to ppp\n",</div><div class='del'>-			 session-&gt;name, data_len);</div><div class='del'>-</div><div class='ctx'> 		po = pppox_sk(sk);</div><div class='ctx'> 		ppp_input(&amp;po-&gt;chan, skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		l2tp_dbg(session, L2TP_MSG_DATA,</div><div class='del'>-			 "%s: recv %d byte data frame, passing to L2TP socket\n",</div><div class='del'>-			 session-&gt;name, data_len);</div><div class='del'>-</div><div class='ctx'> 		if (sock_queue_rcv_skb(sk, skb) &lt; 0) {</div><div class='ctx'> 			atomic_long_inc(&amp;session-&gt;stats.rx_errors);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='hunk'>@@ -261,7 +234,7 @@ static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int</div><div class='ctx'> </div><div class='ctx'> no_sock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	l2tp_info(session, L2TP_MSG_DATA, "%s: no socket\n", session-&gt;name);</div><div class='add'>+	pr_warn_ratelimited("%s: no socket in recv\n", session-&gt;name);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +263,7 @@ static int pppol2tp_sendmsg(struct socket *sock, struct msghdr *m,</div><div class='ctx'> 	/* Get session and tunnel contexts */</div><div class='ctx'> 	error = -EBADF;</div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='del'>-	if (session == NULL)</div><div class='add'>+	if (!session)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	tunnel = session-&gt;tunnel;</div><div class='hunk'>@@ -326,15 +299,15 @@ static int pppol2tp_sendmsg(struct socket *sock, struct msghdr *m,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	l2tp_xmit_skb(session, skb, session-&gt;hdr_len);</div><div class='add'>+	l2tp_xmit_skb(session, skb);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> </div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return total_len;</div><div class='ctx'> </div><div class='ctx'> error_put_sess:</div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> error:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -355,7 +328,7 @@ error:</div><div class='ctx'>  */</div><div class='ctx'> static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = (struct sock *) chan-&gt;private;</div><div class='add'>+	struct sock *sk = (struct sock *)chan-&gt;private;</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> 	int uhlen, headroom;</div><div class='hunk'>@@ -365,7 +338,7 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* Get session and tunnel contexts from the socket */</div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='del'>-	if (session == NULL)</div><div class='add'>+	if (!session)</div><div class='ctx'> 		goto abort;</div><div class='ctx'> </div><div class='ctx'> 	tunnel = session-&gt;tunnel;</div><div class='hunk'>@@ -385,15 +358,15 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;data[1] = PPP_UI;</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	l2tp_xmit_skb(session, skb, session-&gt;hdr_len);</div><div class='add'>+	l2tp_xmit_skb(session, skb);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> </div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> abort_put_sess:</div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> abort:</div><div class='ctx'> 	/* Free the original skb */</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -404,28 +377,32 @@ abort:</div><div class='ctx'>  * Session (and tunnel control) socket create/destroy.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void pppol2tp_put_sk(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct pppol2tp_session *ps;</div><div class='del'>-</div><div class='del'>-	ps = container_of(head, typeof(*ps), rcu);</div><div class='del'>-	sock_put(ps-&gt;__sk);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Really kill the session socket. (Called from sock_put() if</div><div class='ctx'>  * refcnt == 0.)</div><div class='ctx'>  */</div><div class='ctx'> static void pppol2tp_session_destruct(struct sock *sk)</div><div class='ctx'> {</div><div class='del'>-	struct l2tp_session *session = sk-&gt;sk_user_data;</div><div class='del'>-</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_receive_queue);</div><div class='ctx'> 	skb_queue_purge(&amp;sk-&gt;sk_write_queue);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (session) {</div><div class='del'>-		sk-&gt;sk_user_data = NULL;</div><div class='del'>-		BUG_ON(session-&gt;magic != L2TP_SESSION_MAGIC);</div><div class='del'>-		l2tp_session_dec_refcount(session);</div><div class='add'>+static void pppol2tp_session_close(struct l2tp_session *session)</div><div class='add'>+{</div><div class='add'>+	struct pppol2tp_session *ps;</div><div class='add'>+</div><div class='add'>+	ps = l2tp_session_priv(session);</div><div class='add'>+	mutex_lock(&amp;ps-&gt;sk_lock);</div><div class='add'>+	ps-&gt;__sk = rcu_dereference_protected(ps-&gt;sk,</div><div class='add'>+					     lockdep_is_held(&amp;ps-&gt;sk_lock));</div><div class='add'>+	RCU_INIT_POINTER(ps-&gt;sk, NULL);</div><div class='add'>+	mutex_unlock(&amp;ps-&gt;sk_lock);</div><div class='add'>+	if (ps-&gt;__sk) {</div><div class='add'>+		/* detach socket */</div><div class='add'>+		rcu_assign_sk_user_data(ps-&gt;__sk, NULL);</div><div class='add'>+		sock_put(ps-&gt;__sk);</div><div class='add'>+</div><div class='add'>+		/* drop ref taken when we referenced socket via sk_user_data */</div><div class='add'>+		l2tp_session_put(session);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -454,30 +431,13 @@ static int pppol2tp_release(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='ctx'> 	if (session) {</div><div class='del'>-		struct pppol2tp_session *ps;</div><div class='del'>-</div><div class='ctx'> 		l2tp_session_delete(session);</div><div class='del'>-</div><div class='del'>-		ps = l2tp_session_priv(session);</div><div class='del'>-		mutex_lock(&amp;ps-&gt;sk_lock);</div><div class='del'>-		ps-&gt;__sk = rcu_dereference_protected(ps-&gt;sk,</div><div class='del'>-						     lockdep_is_held(&amp;ps-&gt;sk_lock));</div><div class='del'>-		RCU_INIT_POINTER(ps-&gt;sk, NULL);</div><div class='del'>-		mutex_unlock(&amp;ps-&gt;sk_lock);</div><div class='del'>-		call_rcu(&amp;ps-&gt;rcu, pppol2tp_put_sk);</div><div class='del'>-</div><div class='del'>-		/* Rely on the sock_put() call at the end of the function for</div><div class='del'>-		 * dropping the reference held by pppol2tp_sock_to_session().</div><div class='del'>-		 * The last reference will be dropped by pppol2tp_put_sk().</div><div class='del'>-		 */</div><div class='add'>+		/* drop ref taken by pppol2tp_sock_to_session */</div><div class='add'>+		l2tp_session_put(session);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='del'>-	/* This will delete the session context via</div><div class='del'>-	 * pppol2tp_session_destruct() if the socket's refcnt drops to</div><div class='del'>-	 * zero.</div><div class='del'>-	 */</div><div class='ctx'> 	sock_put(sk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -516,6 +476,7 @@ static int pppol2tp_create(struct net *net, struct socket *sock, int kern)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	sock_init_data(sock, sk);</div><div class='add'>+	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='ctx'> </div><div class='ctx'> 	sock-&gt;state  = SS_UNCONNECTED;</div><div class='ctx'> 	sock-&gt;ops    = &amp;pppol2tp_ops;</div><div class='hunk'>@@ -538,13 +499,14 @@ static void pppol2tp_show(struct seq_file *m, void *arg)</div><div class='ctx'> 	struct l2tp_session *session = arg;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	sk = pppol2tp_session_get_sock(session);</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		struct pppox_sock *po = pppox_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, "   interface %s\n", ppp_dev_name(&amp;po-&gt;chan));</div><div class='del'>-		sock_put(sk);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pppol2tp_session_init(struct l2tp_session *session)</div><div class='hunk'>@@ -552,6 +514,7 @@ static void pppol2tp_session_init(struct l2tp_session *session)</div><div class='ctx'> 	struct pppol2tp_session *ps;</div><div class='ctx'> </div><div class='ctx'> 	session-&gt;recv_skb = pppol2tp_recv;</div><div class='add'>+	session-&gt;session_close = pppol2tp_session_close;</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_L2TP_DEBUGFS))</div><div class='ctx'> 		session-&gt;show = pppol2tp_show;</div><div class='ctx'> </div><div class='hunk'>@@ -660,9 +623,68 @@ static int pppol2tp_tunnel_mtu(const struct l2tp_tunnel *tunnel)</div><div class='ctx'> 	return mtu - PPPOL2TP_HEADER_OVERHEAD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct l2tp_tunnel *pppol2tp_tunnel_get(struct net *net,</div><div class='add'>+					       const struct l2tp_connect_info *info,</div><div class='add'>+					       bool *new_tunnel)</div><div class='add'>+{</div><div class='add'>+	struct l2tp_tunnel *tunnel;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	*new_tunnel = false;</div><div class='add'>+</div><div class='add'>+	tunnel = l2tp_tunnel_get(net, info-&gt;tunnel_id);</div><div class='add'>+</div><div class='add'>+	/* Special case: create tunnel context if session_id and</div><div class='add'>+	 * peer_session_id is 0. Otherwise look up tunnel using supplied</div><div class='add'>+	 * tunnel id.</div><div class='add'>+	 */</div><div class='add'>+	if (!info-&gt;session_id &amp;&amp; !info-&gt;peer_session_id) {</div><div class='add'>+		if (!tunnel) {</div><div class='add'>+			struct l2tp_tunnel_cfg tcfg = {</div><div class='add'>+				.encap = L2TP_ENCAPTYPE_UDP,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* Prevent l2tp_tunnel_register() from trying to set up</div><div class='add'>+			 * a kernel socket.</div><div class='add'>+			 */</div><div class='add'>+			if (info-&gt;fd &lt; 0)</div><div class='add'>+				return ERR_PTR(-EBADF);</div><div class='add'>+</div><div class='add'>+			error = l2tp_tunnel_create(info-&gt;fd,</div><div class='add'>+						   info-&gt;version,</div><div class='add'>+						   info-&gt;tunnel_id,</div><div class='add'>+						   info-&gt;peer_tunnel_id, &amp;tcfg,</div><div class='add'>+						   &amp;tunnel);</div><div class='add'>+			if (error &lt; 0)</div><div class='add'>+				return ERR_PTR(error);</div><div class='add'>+</div><div class='add'>+			refcount_inc(&amp;tunnel-&gt;ref_count);</div><div class='add'>+			error = l2tp_tunnel_register(tunnel, net, &amp;tcfg);</div><div class='add'>+			if (error &lt; 0) {</div><div class='add'>+				kfree(tunnel);</div><div class='add'>+				return ERR_PTR(error);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			*new_tunnel = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Error if we can't find the tunnel */</div><div class='add'>+		if (!tunnel)</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+		/* Error if socket is not prepped */</div><div class='add'>+		if (!tunnel-&gt;sock) {</div><div class='add'>+			l2tp_tunnel_put(tunnel);</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tunnel;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* connect() handler. Attach a PPPoX socket to a tunnel UDP socket</div><div class='ctx'>  */</div><div class='del'>-static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='add'>+static int pppol2tp_connect(struct socket *sock, struct sockaddr_unsized *uservaddr,</div><div class='ctx'> 			    int sockaddr_len, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -673,7 +695,6 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 	struct pppol2tp_session *ps;</div><div class='ctx'> 	struct l2tp_session_cfg cfg = { 0, };</div><div class='ctx'> 	bool drop_refcnt = false;</div><div class='del'>-	bool drop_tunnel = false;</div><div class='ctx'> 	bool new_session = false;</div><div class='ctx'> 	bool new_tunnel = false;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -682,6 +703,14 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	/* Don't bind if tunnel_id is 0 */</div><div class='add'>+	if (!info.tunnel_id)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tunnel = pppol2tp_tunnel_get(sock_net(sk), &amp;info, &amp;new_tunnel);</div><div class='add'>+	if (IS_ERR(tunnel))</div><div class='add'>+		return PTR_ERR(tunnel);</div><div class='add'>+</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for already bound sockets */</div><div class='hunk'>@@ -694,67 +723,11 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 	if (sk-&gt;sk_user_data)</div><div class='ctx'> 		goto end; /* socket is already attached */</div><div class='ctx'> </div><div class='del'>-	/* Don't bind if tunnel_id is 0 */</div><div class='del'>-	error = -EINVAL;</div><div class='del'>-	if (!info.tunnel_id)</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-	tunnel = l2tp_tunnel_get(sock_net(sk), info.tunnel_id);</div><div class='del'>-	if (tunnel)</div><div class='del'>-		drop_tunnel = true;</div><div class='del'>-</div><div class='del'>-	/* Special case: create tunnel context if session_id and</div><div class='del'>-	 * peer_session_id is 0. Otherwise look up tunnel using supplied</div><div class='del'>-	 * tunnel id.</div><div class='del'>-	 */</div><div class='del'>-	if (!info.session_id &amp;&amp; !info.peer_session_id) {</div><div class='del'>-		if (tunnel == NULL) {</div><div class='del'>-			struct l2tp_tunnel_cfg tcfg = {</div><div class='del'>-				.encap = L2TP_ENCAPTYPE_UDP,</div><div class='del'>-				.debug = 0,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Prevent l2tp_tunnel_register() from trying to set up</div><div class='del'>-			 * a kernel socket.</div><div class='del'>-			 */</div><div class='del'>-			if (info.fd &lt; 0) {</div><div class='del'>-				error = -EBADF;</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			error = l2tp_tunnel_create(sock_net(sk), info.fd,</div><div class='del'>-						   info.version,</div><div class='del'>-						   info.tunnel_id,</div><div class='del'>-						   info.peer_tunnel_id, &amp;tcfg,</div><div class='del'>-						   &amp;tunnel);</div><div class='del'>-			if (error &lt; 0)</div><div class='del'>-				goto end;</div><div class='del'>-</div><div class='del'>-			l2tp_tunnel_inc_refcount(tunnel);</div><div class='del'>-			error = l2tp_tunnel_register(tunnel, sock_net(sk),</div><div class='del'>-						     &amp;tcfg);</div><div class='del'>-			if (error &lt; 0) {</div><div class='del'>-				kfree(tunnel);</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='del'>-			drop_tunnel = true;</div><div class='del'>-			new_tunnel = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Error if we can't find the tunnel */</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-		if (tunnel == NULL)</div><div class='del'>-			goto end;</div><div class='del'>-</div><div class='del'>-		/* Error if socket is not prepped */</div><div class='del'>-		if (tunnel-&gt;sock == NULL)</div><div class='del'>-			goto end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (tunnel-&gt;peer_tunnel_id == 0)</div><div class='ctx'> 		tunnel-&gt;peer_tunnel_id = info.peer_tunnel_id;</div><div class='ctx'> </div><div class='del'>-	session = l2tp_tunnel_get_session(tunnel, info.session_id);</div><div class='add'>+	session = l2tp_session_get(sock_net(sk), tunnel-&gt;sock, tunnel-&gt;version,</div><div class='add'>+				   info.tunnel_id, info.session_id);</div><div class='ctx'> 	if (session) {</div><div class='ctx'> 		drop_refcnt = true;</div><div class='ctx'> </div><div class='hunk'>@@ -787,18 +760,20 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 			goto end;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		drop_refcnt = true;</div><div class='add'>+</div><div class='ctx'> 		pppol2tp_session_init(session);</div><div class='ctx'> 		ps = l2tp_session_priv(session);</div><div class='del'>-		l2tp_session_inc_refcount(session);</div><div class='add'>+		refcount_inc(&amp;session-&gt;ref_count);</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;ps-&gt;sk_lock);</div><div class='ctx'> 		error = l2tp_session_register(session, tunnel);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='ctx'> 			mutex_unlock(&amp;ps-&gt;sk_lock);</div><div class='del'>-			kfree(session);</div><div class='add'>+			l2tp_session_put(session);</div><div class='ctx'> 			goto end;</div><div class='ctx'> 		}</div><div class='del'>-		drop_refcnt = true;</div><div class='add'>+</div><div class='ctx'> 		new_session = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -807,8 +782,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 	 * the internal context for use by ioctl() and sockopt()</div><div class='ctx'> 	 * handlers.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((session-&gt;session_id == 0) &amp;&amp;</div><div class='del'>-	    (session-&gt;peer_session_id == 0)) {</div><div class='add'>+	if (session-&gt;session_id == 0 &amp;&amp; session-&gt;peer_session_id == 0) {</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 		goto out_no_ppp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -822,6 +796,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> 	po-&gt;chan.private = sk;</div><div class='ctx'> 	po-&gt;chan.ops	 = &amp;pppol2tp_chan_ops;</div><div class='ctx'> 	po-&gt;chan.mtu	 = pppol2tp_tunnel_mtu(tunnel);</div><div class='add'>+	po-&gt;chan.direct_xmit	= true;</div><div class='ctx'> </div><div class='ctx'> 	error = ppp_register_net_channel(sock_net(sk), &amp;po-&gt;chan);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -831,19 +806,18 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,</div><div class='ctx'> </div><div class='ctx'> out_no_ppp:</div><div class='ctx'> 	/* This is how we get the session context from the socket. */</div><div class='del'>-	sk-&gt;sk_user_data = session;</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	rcu_assign_sk_user_data(sk, session);</div><div class='ctx'> 	rcu_assign_pointer(ps-&gt;sk, sk);</div><div class='ctx'> 	mutex_unlock(&amp;ps-&gt;sk_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Keep the reference we've grabbed on the session: sk doesn't expect</div><div class='del'>-	 * the session to disappear. pppol2tp_session_destruct() is responsible</div><div class='add'>+	 * the session to disappear. pppol2tp_session_close() is responsible</div><div class='ctx'> 	 * for dropping it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	drop_refcnt = false;</div><div class='ctx'> </div><div class='ctx'> 	sk-&gt;sk_state = PPPOX_CONNECTED;</div><div class='del'>-	l2tp_info(session, L2TP_MSG_CONTROL, "%s: created\n",</div><div class='del'>-		  session-&gt;name);</div><div class='ctx'> </div><div class='ctx'> end:</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -853,9 +827,8 @@ end:</div><div class='ctx'> 			l2tp_tunnel_delete(tunnel);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (drop_refcnt)</div><div class='del'>-		l2tp_session_dec_refcount(session);</div><div class='del'>-	if (drop_tunnel)</div><div class='del'>-		l2tp_tunnel_dec_refcount(tunnel);</div><div class='add'>+		l2tp_session_put(session);</div><div class='add'>+	l2tp_tunnel_put(tunnel);</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -895,7 +868,7 @@ static int pppol2tp_session_create(struct net *net, struct l2tp_tunnel *tunnel,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_sess:</div><div class='del'>-	kfree(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> err:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -916,22 +889,23 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 	struct pppol2tp_session *pls;</div><div class='ctx'> </div><div class='ctx'> 	error = -ENOTCONN;</div><div class='del'>-	if (sk == NULL)</div><div class='add'>+	if (!sk)</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	if (!(sk-&gt;sk_state &amp; PPPOX_CONNECTED))</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	error = -EBADF;</div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='del'>-	if (session == NULL)</div><div class='add'>+	if (!session)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	pls = l2tp_session_priv(session);</div><div class='ctx'> 	tunnel = session-&gt;tunnel;</div><div class='ctx'> </div><div class='ctx'> 	inet = inet_sk(tunnel-&gt;sock);</div><div class='del'>-	if ((tunnel-&gt;version == 2) &amp;&amp; (tunnel-&gt;sock-&gt;sk_family == AF_INET)) {</div><div class='add'>+	if (tunnel-&gt;version == 2 &amp;&amp; tunnel-&gt;sock-&gt;sk_family == AF_INET) {</div><div class='ctx'> 		struct sockaddr_pppol2tp sp;</div><div class='add'>+</div><div class='ctx'> 		len = sizeof(sp);</div><div class='ctx'> 		memset(&amp;sp, 0, len);</div><div class='ctx'> 		sp.sa_family	= AF_PPPOX;</div><div class='hunk'>@@ -947,8 +921,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		sp.pppol2tp.addr.sin_addr.s_addr = inet-&gt;inet_daddr;</div><div class='ctx'> 		memcpy(uaddr, &amp;sp, len);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-	} else if ((tunnel-&gt;version == 2) &amp;&amp;</div><div class='del'>-		   (tunnel-&gt;sock-&gt;sk_family == AF_INET6)) {</div><div class='add'>+	} else if (tunnel-&gt;version == 2 &amp;&amp; tunnel-&gt;sock-&gt;sk_family == AF_INET6) {</div><div class='ctx'> 		struct sockaddr_pppol2tpin6 sp;</div><div class='ctx'> </div><div class='ctx'> 		len = sizeof(sp);</div><div class='hunk'>@@ -966,8 +939,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> 		memcpy(&amp;sp.pppol2tp.addr.sin6_addr, &amp;tunnel-&gt;sock-&gt;sk_v6_daddr,</div><div class='ctx'> 		       sizeof(tunnel-&gt;sock-&gt;sk_v6_daddr));</div><div class='ctx'> 		memcpy(uaddr, &amp;sp, len);</div><div class='del'>-	} else if ((tunnel-&gt;version == 3) &amp;&amp;</div><div class='del'>-		   (tunnel-&gt;sock-&gt;sk_family == AF_INET6)) {</div><div class='add'>+	} else if (tunnel-&gt;version == 3 &amp;&amp; tunnel-&gt;sock-&gt;sk_family == AF_INET6) {</div><div class='ctx'> 		struct sockaddr_pppol2tpv3in6 sp;</div><div class='ctx'> </div><div class='ctx'> 		len = sizeof(sp);</div><div class='hunk'>@@ -988,6 +960,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (tunnel-&gt;version == 3) {</div><div class='ctx'> 		struct sockaddr_pppol2tpv3 sp;</div><div class='add'>+</div><div class='ctx'> 		len = sizeof(sp);</div><div class='ctx'> 		memset(&amp;sp, 0, len);</div><div class='ctx'> 		sp.sa_family	= AF_PPPOX;</div><div class='hunk'>@@ -1006,7 +979,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,</div><div class='ctx'> </div><div class='ctx'> 	error = len;</div><div class='ctx'> </div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> end:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -1050,17 +1023,18 @@ static int pppol2tp_tunnel_copy_stats(struct pppol2tp_ioc_stats *stats,</div><div class='ctx'> 	/* If session_id is set, search the corresponding session in the</div><div class='ctx'> 	 * context of this tunnel and record the session's statistics.</div><div class='ctx'> 	 */</div><div class='del'>-	session = l2tp_tunnel_get_session(tunnel, stats-&gt;session_id);</div><div class='add'>+	session = l2tp_session_get(tunnel-&gt;l2tp_net, tunnel-&gt;sock, tunnel-&gt;version,</div><div class='add'>+				   tunnel-&gt;tunnel_id, stats-&gt;session_id);</div><div class='ctx'> 	if (!session)</div><div class='ctx'> 		return -EBADR;</div><div class='ctx'> </div><div class='ctx'> 	if (session-&gt;pwtype != L2TP_PWTYPE_PPP) {</div><div class='del'>-		l2tp_session_dec_refcount(session);</div><div class='add'>+		l2tp_session_put(session);</div><div class='ctx'> 		return -EBADR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pppol2tp_copy_stats(stats, &amp;session-&gt;stats);</div><div class='del'>-	l2tp_session_dec_refcount(session);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1070,7 +1044,6 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> {</div><div class='ctx'> 	struct pppol2tp_ioc_stats stats;</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='del'>-	int val;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case PPPIOCGMRU:</div><div class='hunk'>@@ -1079,6 +1052,9 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 		if (!session)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> </div><div class='add'>+		if (WARN_ON(session-&gt;magic != L2TP_SESSION_MAGIC))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='ctx'> 		/* Not defined for tunnels */</div><div class='ctx'> 		if (!session-&gt;session_id &amp;&amp; !session-&gt;peer_session_id)</div><div class='ctx'> 			return -ENOSYS;</div><div class='hunk'>@@ -1093,11 +1069,14 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 		if (!session)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> </div><div class='add'>+		if (WARN_ON(session-&gt;magic != L2TP_SESSION_MAGIC))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='ctx'> 		/* Not defined for tunnels */</div><div class='ctx'> 		if (!session-&gt;session_id &amp;&amp; !session-&gt;peer_session_id)</div><div class='ctx'> 			return -ENOSYS;</div><div class='ctx'> </div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='add'>+		if (!access_ok((int __user *)arg, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1106,6 +1085,9 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'> 		if (!session)</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> </div><div class='add'>+		if (WARN_ON(session-&gt;magic != L2TP_SESSION_MAGIC))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='ctx'> 		/* Session 0 represents the parent tunnel */</div><div class='ctx'> 		if (!session-&gt;session_id &amp;&amp; !session-&gt;peer_session_id) {</div><div class='ctx'> 			u32 session_id;</div><div class='hunk'>@@ -1160,9 +1142,7 @@ static int pppol2tp_tunnel_setsockopt(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case PPPOL2TP_SO_DEBUG:</div><div class='del'>-		tunnel-&gt;debug = val;</div><div class='del'>-		l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: set debug=%x\n",</div><div class='del'>-			  tunnel-&gt;name, tunnel-&gt;debug);</div><div class='add'>+		/* Tunnel debug flags option is deprecated */</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1183,18 +1163,15 @@ static int pppol2tp_session_setsockopt(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case PPPOL2TP_SO_RECVSEQ:</div><div class='del'>-		if ((val != 0) &amp;&amp; (val != 1)) {</div><div class='add'>+		if (val != 0 &amp;&amp; val != 1) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		session-&gt;recv_seq = !!val;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: set recv_seq=%d\n",</div><div class='del'>-			  session-&gt;name, session-&gt;recv_seq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_SENDSEQ:</div><div class='del'>-		if ((val != 0) &amp;&amp; (val != 1)) {</div><div class='add'>+		if (val != 0 &amp;&amp; val != 1) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1205,34 +1182,24 @@ static int pppol2tp_session_setsockopt(struct sock *sk,</div><div class='ctx'> 			po-&gt;chan.hdrlen = val ? PPPOL2TP_L2TP_HDR_SIZE_SEQ :</div><div class='ctx'> 				PPPOL2TP_L2TP_HDR_SIZE_NOSEQ;</div><div class='ctx'> 		}</div><div class='del'>-		l2tp_session_set_header_len(session, session-&gt;tunnel-&gt;version);</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: set send_seq=%d\n",</div><div class='del'>-			  session-&gt;name, session-&gt;send_seq);</div><div class='add'>+		l2tp_session_set_header_len(session, session-&gt;tunnel-&gt;version,</div><div class='add'>+					    session-&gt;tunnel-&gt;encap);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_LNSMODE:</div><div class='del'>-		if ((val != 0) &amp;&amp; (val != 1)) {</div><div class='add'>+		if (val != 0 &amp;&amp; val != 1) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		session-&gt;lns_mode = !!val;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: set lns_mode=%d\n",</div><div class='del'>-			  session-&gt;name, session-&gt;lns_mode);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_DEBUG:</div><div class='del'>-		session-&gt;debug = val;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL, "%s: set debug=%x\n",</div><div class='del'>-			  session-&gt;name, session-&gt;debug);</div><div class='add'>+		/* Session debug flags option is deprecated */</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_REORDERTO:</div><div class='ctx'> 		session-&gt;reorder_timeout = msecs_to_jiffies(val);</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: set reorder_timeout=%d\n",</div><div class='del'>-			  session-&gt;name, session-&gt;reorder_timeout);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1249,7 +1216,7 @@ static int pppol2tp_session_setsockopt(struct sock *sk,</div><div class='ctx'>  * session or the special tunnel type.</div><div class='ctx'>  */</div><div class='ctx'> static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			       char __user *optval, unsigned int optlen)</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct l2tp_session *session;</div><div class='hunk'>@@ -1263,30 +1230,29 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (optlen &lt; sizeof(int))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(val, (int __user *)optval))</div><div class='add'>+	if (copy_from_sockptr(&amp;val, optval, sizeof(int)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOTCONN;</div><div class='del'>-	if (sk-&gt;sk_user_data == NULL)</div><div class='add'>+	if (!sk-&gt;sk_user_data)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	/* Get session context from the socket */</div><div class='ctx'> 	err = -EBADF;</div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='del'>-	if (session == NULL)</div><div class='add'>+	if (!session)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	/* Special case: if session_id == 0x0000, treat as operation on tunnel</div><div class='ctx'> 	 */</div><div class='del'>-	if ((session-&gt;session_id == 0) &amp;&amp;</div><div class='del'>-	    (session-&gt;peer_session_id == 0)) {</div><div class='add'>+	if (session-&gt;session_id == 0 &amp;&amp; session-&gt;peer_session_id == 0) {</div><div class='ctx'> 		tunnel = session-&gt;tunnel;</div><div class='ctx'> 		err = pppol2tp_tunnel_setsockopt(sk, tunnel, optname, val);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = pppol2tp_session_setsockopt(sk, session, optname, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> end:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1301,9 +1267,8 @@ static int pppol2tp_tunnel_getsockopt(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case PPPOL2TP_SO_DEBUG:</div><div class='del'>-		*val = tunnel-&gt;debug;</div><div class='del'>-		l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: get debug=%x\n",</div><div class='del'>-			  tunnel-&gt;name, tunnel-&gt;debug);</div><div class='add'>+		/* Tunnel debug flags option is deprecated */</div><div class='add'>+		*val = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1325,32 +1290,23 @@ static int pppol2tp_session_getsockopt(struct sock *sk,</div><div class='ctx'> 	switch (optname) {</div><div class='ctx'> 	case PPPOL2TP_SO_RECVSEQ:</div><div class='ctx'> 		*val = session-&gt;recv_seq;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: get recv_seq=%d\n", session-&gt;name, *val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_SENDSEQ:</div><div class='ctx'> 		*val = session-&gt;send_seq;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: get send_seq=%d\n", session-&gt;name, *val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_LNSMODE:</div><div class='ctx'> 		*val = session-&gt;lns_mode;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: get lns_mode=%d\n", session-&gt;name, *val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_DEBUG:</div><div class='del'>-		*val = session-&gt;debug;</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL, "%s: get debug=%d\n",</div><div class='del'>-			  session-&gt;name, *val);</div><div class='add'>+		/* Session debug flags option is deprecated */</div><div class='add'>+		*val = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PPPOL2TP_SO_REORDERTO:</div><div class='del'>-		*val = (int) jiffies_to_msecs(session-&gt;reorder_timeout);</div><div class='del'>-		l2tp_info(session, L2TP_MSG_CONTROL,</div><div class='del'>-			  "%s: get reorder_timeout=%d\n", session-&gt;name, *val);</div><div class='add'>+		*val = (int)jiffies_to_msecs(session-&gt;reorder_timeout);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1380,24 +1336,23 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (get_user(len, optlen))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	len = min_t(unsigned int, len, sizeof(int));</div><div class='del'>-</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	len = min_t(unsigned int, len, sizeof(int));</div><div class='add'>+</div><div class='ctx'> 	err = -ENOTCONN;</div><div class='del'>-	if (sk-&gt;sk_user_data == NULL)</div><div class='add'>+	if (!sk-&gt;sk_user_data)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the session context */</div><div class='ctx'> 	err = -EBADF;</div><div class='ctx'> 	session = pppol2tp_sock_to_session(sk);</div><div class='del'>-	if (session == NULL)</div><div class='add'>+	if (!session)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	/* Special case: if session_id == 0x0000, treat as operation on tunnel */</div><div class='del'>-	if ((session-&gt;session_id == 0) &amp;&amp;</div><div class='del'>-	    (session-&gt;peer_session_id == 0)) {</div><div class='add'>+	if (session-&gt;session_id == 0 &amp;&amp; session-&gt;peer_session_id == 0) {</div><div class='ctx'> 		tunnel = session-&gt;tunnel;</div><div class='ctx'> 		err = pppol2tp_tunnel_getsockopt(sk, tunnel, optname, &amp;val);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1412,13 +1367,13 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	if (put_user(len, optlen))</div><div class='ctx'> 		goto end_put_sess;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user((void __user *) optval, &amp;val, len))</div><div class='add'>+	if (copy_to_user((void __user *)optval, &amp;val, len))</div><div class='ctx'> 		goto end_put_sess;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> end_put_sess:</div><div class='del'>-	sock_put(sk);</div><div class='add'>+	l2tp_session_put(session);</div><div class='ctx'> end:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1429,14 +1384,12 @@ end:</div><div class='ctx'>  * L2TPv2, we dump only L2TPv2 tunnels and sessions here.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static unsigned int pppol2tp_net_id;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='ctx'> struct pppol2tp_seq_data {</div><div class='ctx'> 	struct seq_net_private p;</div><div class='del'>-	int tunnel_idx;			/* current tunnel */</div><div class='del'>-	int session_idx;		/* index of session within current tunnel */</div><div class='add'>+	unsigned long tkey;		/* lookup key of current tunnel */</div><div class='add'>+	unsigned long skey;		/* lookup key of current session */</div><div class='ctx'> 	struct l2tp_tunnel *tunnel;</div><div class='ctx'> 	struct l2tp_session *session;	/* NULL means get next tunnel */</div><div class='ctx'> };</div><div class='hunk'>@@ -1445,17 +1398,17 @@ static void pppol2tp_next_tunnel(struct net *net, struct pppol2tp_seq_data *pd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop reference taken during previous invocation */</div><div class='ctx'> 	if (pd-&gt;tunnel)</div><div class='del'>-		l2tp_tunnel_dec_refcount(pd-&gt;tunnel);</div><div class='add'>+		l2tp_tunnel_put(pd-&gt;tunnel);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		pd-&gt;tunnel = l2tp_tunnel_get_nth(net, pd-&gt;tunnel_idx);</div><div class='del'>-		pd-&gt;tunnel_idx++;</div><div class='add'>+		pd-&gt;tunnel = l2tp_tunnel_get_next(net, &amp;pd-&gt;tkey);</div><div class='add'>+		pd-&gt;tkey++;</div><div class='ctx'> </div><div class='ctx'> 		/* Only accept L2TPv2 tunnels */</div><div class='ctx'> 		if (!pd-&gt;tunnel || pd-&gt;tunnel-&gt;version == 2)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		l2tp_tunnel_dec_refcount(pd-&gt;tunnel);</div><div class='add'>+		l2tp_tunnel_put(pd-&gt;tunnel);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1463,13 +1416,15 @@ static void pppol2tp_next_session(struct net *net, struct pppol2tp_seq_data *pd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop reference taken during previous invocation */</div><div class='ctx'> 	if (pd-&gt;session)</div><div class='del'>-		l2tp_session_dec_refcount(pd-&gt;session);</div><div class='add'>+		l2tp_session_put(pd-&gt;session);</div><div class='ctx'> </div><div class='del'>-	pd-&gt;session = l2tp_session_get_nth(pd-&gt;tunnel, pd-&gt;session_idx);</div><div class='del'>-	pd-&gt;session_idx++;</div><div class='add'>+	pd-&gt;session = l2tp_session_get_next(net, pd-&gt;tunnel-&gt;sock,</div><div class='add'>+					    pd-&gt;tunnel-&gt;version,</div><div class='add'>+					    pd-&gt;tunnel-&gt;tunnel_id, &amp;pd-&gt;skey);</div><div class='add'>+	pd-&gt;skey++;</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;session == NULL) {</div><div class='del'>-		pd-&gt;session_idx = 0;</div><div class='add'>+	if (!pd-&gt;session) {</div><div class='add'>+		pd-&gt;skey = 0;</div><div class='ctx'> 		pppol2tp_next_tunnel(net, pd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1483,17 +1438,21 @@ static void *pppol2tp_seq_start(struct seq_file *m, loff_t *offs)</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(m-&gt;private == NULL);</div><div class='add'>+	if (WARN_ON(!m-&gt;private)) {</div><div class='add'>+		pd = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pd = m-&gt;private;</div><div class='ctx'> 	net = seq_file_net(m);</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;tunnel == NULL)</div><div class='add'>+	if (!pd-&gt;tunnel)</div><div class='ctx'> 		pppol2tp_next_tunnel(net, pd);</div><div class='ctx'> 	else</div><div class='ctx'> 		pppol2tp_next_session(net, pd);</div><div class='ctx'> </div><div class='ctx'> 	/* NULL tunnel and session indicates end of list */</div><div class='del'>-	if ((pd-&gt;tunnel == NULL) &amp;&amp; (pd-&gt;session == NULL))</div><div class='add'>+	if (!pd-&gt;tunnel &amp;&amp; !pd-&gt;session)</div><div class='ctx'> 		pd = NULL;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1517,11 +1476,11 @@ static void pppol2tp_seq_stop(struct seq_file *p, void *v)</div><div class='ctx'> 	 * or pppol2tp_next_tunnel().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pd-&gt;session) {</div><div class='del'>-		l2tp_session_dec_refcount(pd-&gt;session);</div><div class='add'>+		l2tp_session_put(pd-&gt;session);</div><div class='ctx'> 		pd-&gt;session = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pd-&gt;tunnel) {</div><div class='del'>-		l2tp_tunnel_dec_refcount(pd-&gt;tunnel);</div><div class='add'>+		l2tp_tunnel_put(pd-&gt;tunnel);</div><div class='ctx'> 		pd-&gt;tunnel = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1532,10 +1491,10 @@ static void pppol2tp_seq_tunnel_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "\nTUNNEL '%s', %c %d\n",</div><div class='ctx'> 		   tunnel-&gt;name,</div><div class='del'>-		   (tunnel == tunnel-&gt;sock-&gt;sk_user_data) ? 'Y' : 'N',</div><div class='add'>+		   tunnel-&gt;sock ? 'Y' : 'N',</div><div class='ctx'> 		   refcount_read(&amp;tunnel-&gt;ref_count) - 1);</div><div class='ctx'> 	seq_printf(m, " %08x %ld/%ld/%ld %ld/%ld/%ld\n",</div><div class='del'>-		   tunnel-&gt;debug,</div><div class='add'>+		   0,</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_packets),</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_bytes),</div><div class='ctx'> 		   atomic_long_read(&amp;tunnel-&gt;stats.tx_errors),</div><div class='hunk'>@@ -1556,10 +1515,12 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	if (tunnel-&gt;sock) {</div><div class='ctx'> 		struct inet_sock *inet = inet_sk(tunnel-&gt;sock);</div><div class='add'>+</div><div class='ctx'> 		ip = ntohl(inet-&gt;inet_saddr);</div><div class='ctx'> 		port = ntohs(inet-&gt;inet_sport);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	sk = pppol2tp_session_get_sock(session);</div><div class='ctx'> 	if (sk) {</div><div class='ctx'> 		state = sk-&gt;sk_state;</div><div class='hunk'>@@ -1569,8 +1530,7 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 		user_data_ok = 'N';</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "  SESSION '%s' %08X/%d %04X/%04X -&gt; "</div><div class='del'>-		   "%04X/%04X %d %c\n",</div><div class='add'>+	seq_printf(m, "  SESSION '%s' %08X/%d %04X/%04X -&gt; %04X/%04X %d %c\n",</div><div class='ctx'> 		   session-&gt;name, ip, port,</div><div class='ctx'> 		   tunnel-&gt;tunnel_id,</div><div class='ctx'> 		   session-&gt;session_id,</div><div class='hunk'>@@ -1581,9 +1541,9 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   session-&gt;recv_seq ? 'R' : '-',</div><div class='ctx'> 		   session-&gt;send_seq ? 'S' : '-',</div><div class='ctx'> 		   session-&gt;lns_mode ? "LNS" : "LAC",</div><div class='del'>-		   session-&gt;debug,</div><div class='add'>+		   0,</div><div class='ctx'> 		   jiffies_to_msecs(session-&gt;reorder_timeout));</div><div class='del'>-	seq_printf(m, "   %hu/%hu %ld/%ld/%ld %ld/%ld/%ld\n",</div><div class='add'>+	seq_printf(m, "   %u/%u %ld/%ld/%ld %ld/%ld/%ld\n",</div><div class='ctx'> 		   session-&gt;nr, session-&gt;ns,</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.tx_packets),</div><div class='ctx'> 		   atomic_long_read(&amp;session-&gt;stats.tx_bytes),</div><div class='hunk'>@@ -1596,8 +1556,8 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v)</div><div class='ctx'> 		struct pppox_sock *po = pppox_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, "   interface %s\n", ppp_dev_name(&amp;po-&gt;chan));</div><div class='del'>-		sock_put(sk);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pppol2tp_seq_show(struct seq_file *m, void *v)</div><div class='hunk'>@@ -1609,8 +1569,7 @@ static int pppol2tp_seq_show(struct seq_file *m, void *v)</div><div class='ctx'> 		seq_puts(m, "PPPoL2TP driver info, " PPPOL2TP_DRV_VERSION "\n");</div><div class='ctx'> 		seq_puts(m, "TUNNEL name, user-data-ok session-count\n");</div><div class='ctx'> 		seq_puts(m, " debug tx-pkts/bytes/errs rx-pkts/bytes/errs\n");</div><div class='del'>-		seq_puts(m, "  SESSION name, addr/port src-tid/sid "</div><div class='del'>-			 "dest-tid/sid state user-data-ok\n");</div><div class='add'>+		seq_puts(m, "  SESSION name, addr/port src-tid/sid dest-tid/sid state user-data-ok\n");</div><div class='ctx'> 		seq_puts(m, "   mtu/mru/rcvseq/sendseq/lns debug reorderto\n");</div><div class='ctx'> 		seq_puts(m, "   nr/ns tx-pkts/bytes/errs rx-pkts/bytes/errs\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1643,7 +1602,7 @@ static __net_init int pppol2tp_init_net(struct net *net)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	pde = proc_create_net("pppol2tp", 0444, net-&gt;proc_net,</div><div class='del'>-			&amp;pppol2tp_seq_ops, sizeof(struct pppol2tp_seq_data));</div><div class='add'>+			      &amp;pppol2tp_seq_ops, sizeof(struct pppol2tp_seq_data));</div><div class='ctx'> 	if (!pde) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1661,7 +1620,6 @@ static __net_exit void pppol2tp_exit_net(struct net *net)</div><div class='ctx'> static struct pernet_operations pppol2tp_net_ops = {</div><div class='ctx'> 	.init = pppol2tp_init_net,</div><div class='ctx'> 	.exit = pppol2tp_exit_net,</div><div class='del'>-	.id   = &amp;pppol2tp_net_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -1686,6 +1644,9 @@ static const struct proto_ops pppol2tp_ops = {</div><div class='ctx'> 	.recvmsg	= pppol2tp_recvmsg,</div><div class='ctx'> 	.mmap		= sock_no_mmap,</div><div class='ctx'> 	.ioctl		= pppox_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = pppox_compat_ioctl,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pppox_proto pppol2tp_proto = {</div><div class='head'>diff --git a/net/l2tp/trace.h b/net/l2tp/trace.h<br/>new file mode 100644<br/>index 000000000000..8596eaa12a2e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l2tp/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l2tp/trace.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM l2tp</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_L2TP_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_L2TP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+#include &lt;linux/l2tp.h&gt;</div><div class='add'>+#include "l2tp_core.h"</div><div class='add'>+</div><div class='add'>+#define encap_type_name(e) { L2TP_ENCAPTYPE_##e, #e }</div><div class='add'>+#define show_encap_type_name(val) \</div><div class='add'>+	__print_symbolic(val, \</div><div class='add'>+			encap_type_name(UDP), \</div><div class='add'>+			encap_type_name(IP))</div><div class='add'>+</div><div class='add'>+#define pw_type_name(p) { L2TP_PWTYPE_##p, #p }</div><div class='add'>+#define show_pw_type_name(val) \</div><div class='add'>+	__print_symbolic(val, \</div><div class='add'>+	pw_type_name(ETH_VLAN), \</div><div class='add'>+	pw_type_name(ETH), \</div><div class='add'>+	pw_type_name(PPP), \</div><div class='add'>+	pw_type_name(PPP_AC), \</div><div class='add'>+	pw_type_name(IP))</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(tunnel_only_evt,</div><div class='add'>+	TP_PROTO(struct l2tp_tunnel *tunnel),</div><div class='add'>+	TP_ARGS(tunnel),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_TUNNEL_NAME_MAX)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, tunnel-&gt;name, L2TP_TUNNEL_NAME_MAX);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s", __entry-&gt;name)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(session_only_evt,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_SESSION_NAME_MAX)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, session-&gt;name, L2TP_SESSION_NAME_MAX);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s", __entry-&gt;name)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(register_tunnel,</div><div class='add'>+	TP_PROTO(struct l2tp_tunnel *tunnel),</div><div class='add'>+	TP_ARGS(tunnel),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_TUNNEL_NAME_MAX)</div><div class='add'>+		__field(int, fd)</div><div class='add'>+		__field(u32, tid)</div><div class='add'>+		__field(u32, ptid)</div><div class='add'>+		__field(int, version)</div><div class='add'>+		__field(enum l2tp_encap_type, encap)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, tunnel-&gt;name, L2TP_TUNNEL_NAME_MAX);</div><div class='add'>+		__entry-&gt;fd = tunnel-&gt;fd;</div><div class='add'>+		__entry-&gt;tid = tunnel-&gt;tunnel_id;</div><div class='add'>+		__entry-&gt;ptid = tunnel-&gt;peer_tunnel_id;</div><div class='add'>+		__entry-&gt;version = tunnel-&gt;version;</div><div class='add'>+		__entry-&gt;encap = tunnel-&gt;encap;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s: type=%s encap=%s version=L2TPv%d tid=%u ptid=%u fd=%d",</div><div class='add'>+		__entry-&gt;name,</div><div class='add'>+		__entry-&gt;fd &gt; 0 ? "managed" : "unmanaged",</div><div class='add'>+		show_encap_type_name(__entry-&gt;encap),</div><div class='add'>+		__entry-&gt;version,</div><div class='add'>+		__entry-&gt;tid,</div><div class='add'>+		__entry-&gt;ptid,</div><div class='add'>+		__entry-&gt;fd)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(tunnel_only_evt, delete_tunnel,</div><div class='add'>+	TP_PROTO(struct l2tp_tunnel *tunnel),</div><div class='add'>+	TP_ARGS(tunnel)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(tunnel_only_evt, free_tunnel,</div><div class='add'>+	TP_PROTO(struct l2tp_tunnel *tunnel),</div><div class='add'>+	TP_ARGS(tunnel)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(register_session,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_SESSION_NAME_MAX)</div><div class='add'>+		__field(u32, tid)</div><div class='add'>+		__field(u32, ptid)</div><div class='add'>+		__field(u32, sid)</div><div class='add'>+		__field(u32, psid)</div><div class='add'>+		__field(enum l2tp_pwtype, pwtype)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, session-&gt;name, L2TP_SESSION_NAME_MAX);</div><div class='add'>+		__entry-&gt;tid = session-&gt;tunnel ? session-&gt;tunnel-&gt;tunnel_id : 0;</div><div class='add'>+		__entry-&gt;ptid = session-&gt;tunnel ? session-&gt;tunnel-&gt;peer_tunnel_id : 0;</div><div class='add'>+		__entry-&gt;sid = session-&gt;session_id;</div><div class='add'>+		__entry-&gt;psid = session-&gt;peer_session_id;</div><div class='add'>+		__entry-&gt;pwtype = session-&gt;pwtype;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s: pseudowire=%s sid=%u psid=%u tid=%u ptid=%u",</div><div class='add'>+		__entry-&gt;name,</div><div class='add'>+		show_pw_type_name(__entry-&gt;pwtype),</div><div class='add'>+		__entry-&gt;sid,</div><div class='add'>+		__entry-&gt;psid,</div><div class='add'>+		__entry-&gt;sid,</div><div class='add'>+		__entry-&gt;psid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_only_evt, delete_session,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_only_evt, free_session,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_only_evt, session_seqnum_lns_enable,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_only_evt, session_seqnum_lns_disable,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(session_seqnum_evt,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_SESSION_NAME_MAX)</div><div class='add'>+		__field(u32, ns)</div><div class='add'>+		__field(u32, nr)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, session-&gt;name, L2TP_SESSION_NAME_MAX);</div><div class='add'>+		__entry-&gt;ns = session-&gt;ns;</div><div class='add'>+		__entry-&gt;nr = session-&gt;nr;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s: ns=%u nr=%u",</div><div class='add'>+		__entry-&gt;name,</div><div class='add'>+		__entry-&gt;ns,</div><div class='add'>+		__entry-&gt;nr)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_seqnum_evt, session_seqnum_update,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_seqnum_evt, session_seqnum_reset,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session),</div><div class='add'>+	TP_ARGS(session)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(session_pkt_discard_evt,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session, u32 pkt_ns),</div><div class='add'>+	TP_ARGS(session, pkt_ns),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__array(char, name, L2TP_SESSION_NAME_MAX)</div><div class='add'>+		__field(u32, pkt_ns)</div><div class='add'>+		__field(u32, my_nr)</div><div class='add'>+		__field(u32, reorder_q_len)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__entry-&gt;name, session-&gt;name, L2TP_SESSION_NAME_MAX);</div><div class='add'>+		__entry-&gt;pkt_ns = pkt_ns,</div><div class='add'>+		__entry-&gt;my_nr = session-&gt;nr;</div><div class='add'>+		__entry-&gt;reorder_q_len = skb_queue_len(&amp;session-&gt;reorder_q);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("%s: pkt_ns=%u my_nr=%u reorder_q_len=%u",</div><div class='add'>+		__entry-&gt;name,</div><div class='add'>+		__entry-&gt;pkt_ns,</div><div class='add'>+		__entry-&gt;my_nr,</div><div class='add'>+		__entry-&gt;reorder_q_len)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_pkt_discard_evt, session_pkt_expired,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session, u32 pkt_ns),</div><div class='add'>+	TP_ARGS(session, pkt_ns)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_pkt_discard_evt, session_pkt_outside_rx_window,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session, u32 pkt_ns),</div><div class='add'>+	TP_ARGS(session, pkt_ns)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(session_pkt_discard_evt, session_pkt_oos,</div><div class='add'>+	TP_PROTO(struct l2tp_session *session, u32 pkt_ns),</div><div class='add'>+	TP_ARGS(session, pkt_ns)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_L2TP_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/net/l3mdev/Kconfig b/net/l3mdev/Kconfig<br/>index 5d47325037bc..2b2861e1fb7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l3mdev/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l3mdev/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l3mdev/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Configuration for L3 master device support</div><div class='ctx'> #</div><div class='hunk'>@@ -5,6 +6,6 @@</div><div class='ctx'> config NET_L3_MASTER_DEV</div><div class='ctx'> 	bool "L3 Master device support"</div><div class='ctx'> 	depends on INET || IPV6</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This module provides glue between core networking code and device</div><div class='ctx'> 	  drivers to support L3 master devices like VRF.</div><div class='head'>diff --git a/net/l3mdev/Makefile b/net/l3mdev/Makefile<br/>index 84a53a6f609a..9e7da0acc58c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l3mdev/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l3mdev/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l3mdev/Makefile</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the L3 device API</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_NET_L3_MASTER_DEV) += l3mdev.o</div><div class='add'>+obj-y += l3mdev.o</div><div class='head'>diff --git a/net/l3mdev/l3mdev.c b/net/l3mdev/l3mdev.c<br/>index 8da86ceca33d..5432a5f2dfc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/l3mdev/l3mdev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/l3mdev/l3mdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/l3mdev/l3mdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/l3mdev/l3mdev.c</a></div><div class='hunk'>@@ -1,20 +1,109 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * net/l3mdev/l3mdev.c - L3 master device implementation</div><div class='ctx'>  * Copyright (c) 2015 Cumulus Networks</div><div class='ctx'>  * Copyright (c) 2015 David Ahern &lt;dsa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='ctx'> #include &lt;net/l3mdev.h&gt;</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(l3mdev_lock);</div><div class='add'>+</div><div class='add'>+struct l3mdev_handler {</div><div class='add'>+	lookup_by_table_id_t dev_lookup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct l3mdev_handler l3mdev_handlers[L3MDEV_TYPE_MAX + 1];</div><div class='add'>+</div><div class='add'>+static int l3mdev_check_type(enum l3mdev_type l3type)</div><div class='add'>+{</div><div class='add'>+	if (l3type &lt;= L3MDEV_TYPE_UNSPEC || l3type &gt; L3MDEV_TYPE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int l3mdev_table_lookup_register(enum l3mdev_type l3type,</div><div class='add'>+				 lookup_by_table_id_t fn)</div><div class='add'>+{</div><div class='add'>+	struct l3mdev_handler *hdlr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = l3mdev_check_type(l3type);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	hdlr = &amp;l3mdev_handlers[l3type];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;l3mdev_lock);</div><div class='add'>+</div><div class='add'>+	if (hdlr-&gt;dev_lookup) {</div><div class='add'>+		res = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdlr-&gt;dev_lookup = fn;</div><div class='add'>+	res = 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;l3mdev_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l3mdev_table_lookup_register);</div><div class='add'>+</div><div class='add'>+void l3mdev_table_lookup_unregister(enum l3mdev_type l3type,</div><div class='add'>+				    lookup_by_table_id_t fn)</div><div class='add'>+{</div><div class='add'>+	struct l3mdev_handler *hdlr;</div><div class='add'>+</div><div class='add'>+	if (l3mdev_check_type(l3type))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdlr = &amp;l3mdev_handlers[l3type];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;l3mdev_lock);</div><div class='add'>+</div><div class='add'>+	if (hdlr-&gt;dev_lookup == fn)</div><div class='add'>+		hdlr-&gt;dev_lookup = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;l3mdev_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l3mdev_table_lookup_unregister);</div><div class='add'>+</div><div class='add'>+int l3mdev_ifindex_lookup_by_table_id(enum l3mdev_type l3type,</div><div class='add'>+				      struct net *net, u32 table_id)</div><div class='add'>+{</div><div class='add'>+	lookup_by_table_id_t lookup;</div><div class='add'>+	struct l3mdev_handler *hdlr;</div><div class='add'>+	int ifindex = -EINVAL;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = l3mdev_check_type(l3type);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	hdlr = &amp;l3mdev_handlers[l3type];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;l3mdev_lock);</div><div class='add'>+</div><div class='add'>+	lookup = hdlr-&gt;dev_lookup;</div><div class='add'>+	if (!lookup)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ifindex = lookup(net, table_id);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;l3mdev_lock);</div><div class='add'>+</div><div class='add'>+	return ifindex;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l3mdev_ifindex_lookup_by_table_id);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- *	l3mdev_master_ifindex - get index of L3 master device</div><div class='add'>+ *	l3mdev_master_ifindex_rcu - get index of L3 master device</div><div class='ctx'>  *	@dev: targeted interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +136,25 @@ int l3mdev_master_ifindex_rcu(const struct net_device *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(l3mdev_master_ifindex_rcu);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	l3mdev_fib_table - get FIB table id associated with an L3</div><div class='add'>+ *	l3mdev_master_upper_ifindex_by_index_rcu - get index of upper l3 master</div><div class='add'>+ *					       device</div><div class='add'>+ *	@net: network namespace for device index lookup</div><div class='add'>+ *	@ifindex: targeted interface</div><div class='add'>+ */</div><div class='add'>+int l3mdev_master_upper_ifindex_by_index_rcu(struct net *net, int ifindex)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = dev_get_by_index_rcu(net, ifindex);</div><div class='add'>+	while (dev &amp;&amp; !netif_is_l3_master(dev))</div><div class='add'>+		dev = netdev_master_upper_dev_get_rcu(dev);</div><div class='add'>+</div><div class='add'>+	return dev ? dev-&gt;ifindex : 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(l3mdev_master_upper_ifindex_by_index_rcu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	l3mdev_fib_table_rcu - get FIB table id associated with an L3</div><div class='ctx'>  *                             master interface</div><div class='ctx'>  *	@dev: targeted interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -104,6 +211,8 @@ EXPORT_SYMBOL_GPL(l3mdev_fib_table_by_index);</div><div class='ctx'>  *			     local and multicast addresses</div><div class='ctx'>  *	@net: network namespace for device index lookup</div><div class='ctx'>  *	@fl6: IPv6 flow struct for lookup</div><div class='add'>+ *	This function does not hold refcnt on the returned dst.</div><div class='add'>+ *	Caller must hold rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct dst_entry *l3mdev_link_scope_lookup(struct net *net,</div><div class='hunk'>@@ -112,9 +221,8 @@ struct dst_entry *l3mdev_link_scope_lookup(struct net *net,</div><div class='ctx'> 	struct dst_entry *dst = NULL;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='ctx'> 	if (fl6-&gt;flowi6_oif) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 		dev = dev_get_by_index_rcu(net, fl6-&gt;flowi6_oif);</div><div class='ctx'> 		if (dev &amp;&amp; netif_is_l3_slave(dev))</div><div class='ctx'> 			dev = netdev_master_upper_dev_get_rcu(dev);</div><div class='hunk'>@@ -122,8 +230,6 @@ struct dst_entry *l3mdev_link_scope_lookup(struct net *net,</div><div class='ctx'> 		if (dev &amp;&amp; netif_is_l3_master(dev) &amp;&amp;</div><div class='ctx'> 		    dev-&gt;l3mdev_ops-&gt;l3mdev_link_scope_lookup)</div><div class='ctx'> 			dst = dev-&gt;l3mdev_ops-&gt;l3mdev_link_scope_lookup(dev, fl6);</div><div class='del'>-</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dst;</div><div class='hunk'>@@ -135,6 +241,7 @@ EXPORT_SYMBOL_GPL(l3mdev_link_scope_lookup);</div><div class='ctx'>  *				L3 master device</div><div class='ctx'>  *	@net: network namespace for device index lookup</div><div class='ctx'>  *	@fl:  flow struct</div><div class='add'>+ *	@arg: store the table the rule matched with here</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int l3mdev_fib_rule_match(struct net *net, struct flowi *fl,</div><div class='hunk'>@@ -143,25 +250,19 @@ int l3mdev_fib_rule_match(struct net *net, struct flowi *fl,</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	/* update flow ensures flowi_l3mdev is set when relevant */</div><div class='add'>+	if (!fl-&gt;flowi_l3mdev)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	dev = dev_get_by_index_rcu(net, fl-&gt;flowi_oif);</div><div class='del'>-	if (dev &amp;&amp; netif_is_l3_master(dev) &amp;&amp;</div><div class='del'>-	    dev-&gt;l3mdev_ops-&gt;l3mdev_fib_table) {</div><div class='del'>-		arg-&gt;table = dev-&gt;l3mdev_ops-&gt;l3mdev_fib_table(dev);</div><div class='del'>-		rc = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	dev = dev_get_by_index_rcu(net, fl-&gt;flowi_iif);</div><div class='add'>+	dev = dev_get_by_index_rcu(net, fl-&gt;flowi_l3mdev);</div><div class='ctx'> 	if (dev &amp;&amp; netif_is_l3_master(dev) &amp;&amp;</div><div class='ctx'> 	    dev-&gt;l3mdev_ops-&gt;l3mdev_fib_table) {</div><div class='ctx'> 		arg-&gt;table = dev-&gt;l3mdev_ops-&gt;l3mdev_fib_table(dev);</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -170,31 +271,30 @@ out:</div><div class='ctx'> void l3mdev_update_flow(struct net *net, struct flowi *fl)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	int ifindex;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;flowi_oif) {</div><div class='ctx'> 		dev = dev_get_by_index_rcu(net, fl-&gt;flowi_oif);</div><div class='ctx'> 		if (dev) {</div><div class='del'>-			ifindex = l3mdev_master_ifindex_rcu(dev);</div><div class='del'>-			if (ifindex) {</div><div class='del'>-				fl-&gt;flowi_oif = ifindex;</div><div class='del'>-				fl-&gt;flowi_flags |= FLOWI_FLAG_SKIP_NH_OIF;</div><div class='del'>-				goto out;</div><div class='add'>+			if (!fl-&gt;flowi_l3mdev) {</div><div class='add'>+				fl-&gt;flowi_l3mdev = l3mdev_master_ifindex_rcu(dev);</div><div class='add'>+				fl-&gt;flowi_flags |= FLOWI_FLAG_L3MDEV_OIF;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* oif set to L3mdev directs lookup to its table;</div><div class='add'>+			 * reset to avoid oif match in fib_lookup</div><div class='add'>+			 */</div><div class='add'>+			if (netif_is_l3_master(dev))</div><div class='add'>+				fl-&gt;flowi_oif = 0;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;flowi_iif) {</div><div class='add'>+	if (fl-&gt;flowi_iif &gt; LOOPBACK_IFINDEX &amp;&amp; !fl-&gt;flowi_l3mdev) {</div><div class='ctx'> 		dev = dev_get_by_index_rcu(net, fl-&gt;flowi_iif);</div><div class='del'>-		if (dev) {</div><div class='del'>-			ifindex = l3mdev_master_ifindex_rcu(dev);</div><div class='del'>-			if (ifindex) {</div><div class='del'>-				fl-&gt;flowi_iif = ifindex;</div><div class='del'>-				fl-&gt;flowi_flags |= FLOWI_FLAG_SKIP_NH_OIF;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (dev)</div><div class='add'>+			fl-&gt;flowi_l3mdev = l3mdev_master_ifindex_rcu(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/net/lapb/Kconfig b/net/lapb/Kconfig<br/>index 6481839b76c9..da87b47f0dff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # LAPB Data Link Drive</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config LAPB</div><div class='ctx'> 	tristate "LAPB Data Link Driver"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.</div><div class='ctx'> 	  the lower) part of the X.25 protocol. It offers a reliable</div><div class='ctx'> 	  connection service to exchange data frames with one other host, and</div><div class='hunk'>@@ -14,7 +15,7 @@ config LAPB</div><div class='ctx'> 	  currently supports LAPB only over Ethernet connections. If you want</div><div class='ctx'> 	  to use LAPB connections over Ethernet, say Y here and to "LAPB over</div><div class='ctx'> 	  Ethernet driver" below. Read</div><div class='del'>-	  &lt;file:Documentation/networking/lapb-module.txt&gt; for technical</div><div class='add'>+	  &lt;file:Documentation/networking/lapb-module.rst&gt; for technical</div><div class='ctx'> 	  details.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/net/lapb/Makefile b/net/lapb/Makefile<br/>index fff797dfc88c..7be91b4c0ca0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Linux LAPB layer.</div><div class='ctx'> #</div><div class='head'>diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c<br/>index db6e0afe3a20..a0596e1f91da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_iface.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_iface.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_iface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/lapb_iface.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	LAPB release 002</div><div class='ctx'>  *</div><div class='ctx'>  *	This code REQUIRES 2.1.15 or higher/ NET3.038</div><div class='ctx'>  *</div><div class='del'>- *	This module:</div><div class='del'>- *		This module is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	History</div><div class='ctx'>  *	LAPB 001	Jonathan Naylor	Started Coding</div><div class='ctx'>  *	LAPB 002	Jonathan Naylor	New timer architecture.</div><div class='hunk'>@@ -73,7 +68,6 @@ static void __lapb_remove_cb(struct lapb_cb *lapb)</div><div class='ctx'> 		lapb_put(lapb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(lapb_register);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Add a socket to the bound sockets list.</div><div class='hunk'>@@ -86,11 +80,9 @@ static void __lapb_insert_cb(struct lapb_cb *lapb)</div><div class='ctx'> </div><div class='ctx'> static struct lapb_cb *__lapb_devtostruct(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *entry;</div><div class='ctx'> 	struct lapb_cb *lapb, *use = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each(entry, &amp;lapb_list) {</div><div class='del'>-		lapb = list_entry(entry, struct lapb_cb, node);</div><div class='add'>+	list_for_each_entry(lapb, &amp;lapb_list, node) {</div><div class='ctx'> 		if (lapb-&gt;dev == dev) {</div><div class='ctx'> 			use = lapb;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -120,7 +112,6 @@ static struct lapb_cb *lapb_create_cb(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct lapb_cb *lapb = kzalloc(sizeof(*lapb), GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +120,8 @@ static struct lapb_cb *lapb_create_cb(void)</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;lapb-&gt;t1timer, NULL, 0);</div><div class='ctx'> 	timer_setup(&amp;lapb-&gt;t2timer, NULL, 0);</div><div class='add'>+	lapb-&gt;t1timer_running = false;</div><div class='add'>+	lapb-&gt;t2timer_running = false;</div><div class='ctx'> </div><div class='ctx'> 	lapb-&gt;t1      = LAPB_DEFAULT_T1;</div><div class='ctx'> 	lapb-&gt;t2      = LAPB_DEFAULT_T2;</div><div class='hunk'>@@ -136,6 +129,8 @@ static struct lapb_cb *lapb_create_cb(void)</div><div class='ctx'> 	lapb-&gt;mode    = LAPB_DEFAULT_MODE;</div><div class='ctx'> 	lapb-&gt;window  = LAPB_DEFAULT_WINDOW;</div><div class='ctx'> 	lapb-&gt;state   = LAPB_STATE_0;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;lapb-&gt;lock);</div><div class='ctx'> 	refcount_set(&amp;lapb-&gt;refcnt, 1);</div><div class='ctx'> out:</div><div class='ctx'> 	return lapb;</div><div class='hunk'>@@ -172,6 +167,7 @@ out:</div><div class='ctx'> 	write_unlock_bh(&amp;lapb_list_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(lapb_register);</div><div class='ctx'> </div><div class='ctx'> int lapb_unregister(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -182,12 +178,25 @@ int lapb_unregister(struct net_device *dev)</div><div class='ctx'> 	lapb = __lapb_devtostruct(dev);</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='add'>+	lapb_put(lapb);</div><div class='add'>+</div><div class='add'>+	/* Wait for other refs to "lapb" to drop */</div><div class='add'>+	while (refcount_read(&amp;lapb-&gt;refcnt) &gt; 2)</div><div class='add'>+		usleep_range(1, 10);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	lapb_stop_t1timer(lapb);</div><div class='ctx'> 	lapb_stop_t2timer(lapb);</div><div class='ctx'> </div><div class='ctx'> 	lapb_clear_queues(lapb);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Wait for running timers to stop */</div><div class='add'>+	timer_delete_sync(&amp;lapb-&gt;t1timer);</div><div class='add'>+	timer_delete_sync(&amp;lapb-&gt;t2timer);</div><div class='add'>+</div><div class='ctx'> 	__lapb_remove_cb(lapb);</div><div class='ctx'> </div><div class='ctx'> 	lapb_put(lapb);</div><div class='hunk'>@@ -206,6 +215,8 @@ int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms)</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	parms-&gt;t1      = lapb-&gt;t1 / HZ;</div><div class='ctx'> 	parms-&gt;t2      = lapb-&gt;t2 / HZ;</div><div class='ctx'> 	parms-&gt;n2      = lapb-&gt;n2;</div><div class='hunk'>@@ -224,6 +235,7 @@ int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms)</div><div class='ctx'> 	else</div><div class='ctx'> 		parms-&gt;t2timer = (lapb-&gt;t2timer.expires - jiffies) / HZ;</div><div class='ctx'> </div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 	lapb_put(lapb);</div><div class='ctx'> 	rc = LAPB_OK;</div><div class='ctx'> out:</div><div class='hunk'>@@ -239,6 +251,8 @@ int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms)</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	rc = LAPB_INVALUE;</div><div class='ctx'> 	if (parms-&gt;t1 &lt; 1 || parms-&gt;t2 &lt; 1 || parms-&gt;n2 &lt; 1)</div><div class='ctx'> 		goto out_put;</div><div class='hunk'>@@ -261,6 +275,7 @@ int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms)</div><div class='ctx'> </div><div class='ctx'> 	rc = LAPB_OK;</div><div class='ctx'> out_put:</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 	lapb_put(lapb);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -275,6 +290,8 @@ int lapb_connect_request(struct net_device *dev)</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	rc = LAPB_OK;</div><div class='ctx'> 	if (lapb-&gt;state == LAPB_STATE_1)</div><div class='ctx'> 		goto out_put;</div><div class='hunk'>@@ -290,24 +307,18 @@ int lapb_connect_request(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	rc = LAPB_OK;</div><div class='ctx'> out_put:</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 	lapb_put(lapb);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lapb_connect_request);</div><div class='ctx'> </div><div class='del'>-int lapb_disconnect_request(struct net_device *dev)</div><div class='add'>+static int __lapb_disconnect_request(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	struct lapb_cb *lapb = lapb_devtostruct(dev);</div><div class='del'>-	int rc = LAPB_BADTOKEN;</div><div class='del'>-</div><div class='del'>-	if (!lapb)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	switch (lapb-&gt;state) {</div><div class='ctx'> 	case LAPB_STATE_0:</div><div class='del'>-		rc = LAPB_NOTCONNECTED;</div><div class='del'>-		goto out_put;</div><div class='add'>+		return LAPB_NOTCONNECTED;</div><div class='ctx'> </div><div class='ctx'> 	case LAPB_STATE_1:</div><div class='ctx'> 		lapb_dbg(1, "(%p) S1 TX DISC(1)\n", lapb-&gt;dev);</div><div class='hunk'>@@ -315,12 +326,10 @@ int lapb_disconnect_request(struct net_device *dev)</div><div class='ctx'> 		lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);</div><div class='ctx'> 		lapb-&gt;state = LAPB_STATE_0;</div><div class='ctx'> 		lapb_start_t1timer(lapb);</div><div class='del'>-		rc = LAPB_NOTCONNECTED;</div><div class='del'>-		goto out_put;</div><div class='add'>+		return LAPB_NOTCONNECTED;</div><div class='ctx'> </div><div class='ctx'> 	case LAPB_STATE_2:</div><div class='del'>-		rc = LAPB_OK;</div><div class='del'>-		goto out_put;</div><div class='add'>+		return LAPB_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lapb_clear_queues(lapb);</div><div class='hunk'>@@ -333,8 +342,22 @@ int lapb_disconnect_request(struct net_device *dev)</div><div class='ctx'> 	lapb_dbg(1, "(%p) S3 DISC(1)\n", lapb-&gt;dev);</div><div class='ctx'> 	lapb_dbg(0, "(%p) S3 -&gt; S2\n", lapb-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	rc = LAPB_OK;</div><div class='del'>-out_put:</div><div class='add'>+	return LAPB_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lapb_disconnect_request(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct lapb_cb *lapb = lapb_devtostruct(dev);</div><div class='add'>+	int rc = LAPB_BADTOKEN;</div><div class='add'>+</div><div class='add'>+	if (!lapb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = __lapb_disconnect_request(lapb);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 	lapb_put(lapb);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -349,6 +372,8 @@ int lapb_data_request(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (!lapb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	rc = LAPB_NOTCONNECTED;</div><div class='ctx'> 	if (lapb-&gt;state != LAPB_STATE_3 &amp;&amp; lapb-&gt;state != LAPB_STATE_4)</div><div class='ctx'> 		goto out_put;</div><div class='hunk'>@@ -357,6 +382,7 @@ int lapb_data_request(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> 	lapb_kick(lapb);</div><div class='ctx'> 	rc = LAPB_OK;</div><div class='ctx'> out_put:</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 	lapb_put(lapb);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -369,7 +395,9 @@ int lapb_data_received(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> 	int rc = LAPB_BADTOKEN;</div><div class='ctx'> </div><div class='ctx'> 	if (lapb) {</div><div class='add'>+		spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 		lapb_data_input(lapb, skb);</div><div class='add'>+		spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> 		lapb_put(lapb);</div><div class='ctx'> 		rc = LAPB_OK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -423,14 +451,98 @@ int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)</div><div class='ctx'> 	return used;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Handle device status changes. */</div><div class='add'>+static int lapb_device_event(struct notifier_block *this, unsigned long event,</div><div class='add'>+			     void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct lapb_cb *lapb;</div><div class='add'>+</div><div class='add'>+	if (!net_eq(dev_net(dev), &amp;init_net))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type != ARPHRD_X25)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	lapb = lapb_devtostruct(dev);</div><div class='add'>+	if (!lapb)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		lapb_dbg(0, "(%p) Interface up: %s\n", dev, dev-&gt;name);</div><div class='add'>+</div><div class='add'>+		if (netif_carrier_ok(dev)) {</div><div class='add'>+			lapb_dbg(0, "(%p): Carrier is already up: %s\n", dev,</div><div class='add'>+				 dev-&gt;name);</div><div class='add'>+			if (lapb-&gt;mode &amp; LAPB_DCE) {</div><div class='add'>+				lapb_start_t1timer(lapb);</div><div class='add'>+			} else {</div><div class='add'>+				if (lapb-&gt;state == LAPB_STATE_0) {</div><div class='add'>+					lapb-&gt;state = LAPB_STATE_1;</div><div class='add'>+					lapb_establish_data_link(lapb);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_GOING_DOWN:</div><div class='add'>+		if (netif_carrier_ok(dev))</div><div class='add'>+			__lapb_disconnect_request(lapb);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+		lapb_dbg(0, "(%p) Interface down: %s\n", dev, dev-&gt;name);</div><div class='add'>+		lapb_dbg(0, "(%p) S%d -&gt; S0\n", dev, lapb-&gt;state);</div><div class='add'>+		lapb_clear_queues(lapb);</div><div class='add'>+		lapb-&gt;state = LAPB_STATE_0;</div><div class='add'>+		lapb-&gt;n2count   = 0;</div><div class='add'>+		lapb_stop_t1timer(lapb);</div><div class='add'>+		lapb_stop_t2timer(lapb);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+		if (netif_carrier_ok(dev)) {</div><div class='add'>+			lapb_dbg(0, "(%p): Carrier detected: %s\n", dev,</div><div class='add'>+				 dev-&gt;name);</div><div class='add'>+			if (lapb-&gt;mode &amp; LAPB_DCE) {</div><div class='add'>+				lapb_start_t1timer(lapb);</div><div class='add'>+			} else {</div><div class='add'>+				if (lapb-&gt;state == LAPB_STATE_0) {</div><div class='add'>+					lapb-&gt;state = LAPB_STATE_1;</div><div class='add'>+					lapb_establish_data_link(lapb);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			lapb_dbg(0, "(%p) Carrier lost: %s\n", dev, dev-&gt;name);</div><div class='add'>+			lapb_dbg(0, "(%p) S%d -&gt; S0\n", dev, lapb-&gt;state);</div><div class='add'>+			lapb_clear_queues(lapb);</div><div class='add'>+			lapb-&gt;state = LAPB_STATE_0;</div><div class='add'>+			lapb-&gt;n2count   = 0;</div><div class='add'>+			lapb_stop_t1timer(lapb);</div><div class='add'>+			lapb_stop_t2timer(lapb);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+	lapb_put(lapb);</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block lapb_dev_notifier = {</div><div class='add'>+	.notifier_call = lapb_device_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init lapb_init(void)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return register_netdevice_notifier(&amp;lapb_dev_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit lapb_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;lapb_list));</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_notifier(&amp;lapb_dev_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jonathan Naylor &lt;g4klx@g4klx.demon.co.uk&gt;");</div><div class='head'>diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c<br/>index d5d2110eb717..38ae23c09e83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_in.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_in.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_in.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/lapb_in.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	LAPB release 002</div><div class='ctx'>  *</div><div class='ctx'>  *	This code REQUIRES 2.1.15 or higher/ NET3.038</div><div class='ctx'>  *</div><div class='del'>- *	This module:</div><div class='del'>- *		This module is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	History</div><div class='ctx'>  *	LAPB 001	Jonathan Naulor	Started Coding</div><div class='ctx'>  *	LAPB 002	Jonathan Naylor	New timer architecture.</div><div class='head'>diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c<br/>index eda726e22f64..a966d29c772d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_out.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_out.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_out.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/lapb_out.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	LAPB release 002</div><div class='ctx'>  *</div><div class='ctx'>  *	This code REQUIRES 2.1.15 or higher/ NET3.038</div><div class='ctx'>  *</div><div class='del'>- *	This module:</div><div class='del'>- *		This module is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	History</div><div class='ctx'>  *	LAPB 001	Jonathan Naylor	Started Coding</div><div class='ctx'>  *	LAPB 002	Jonathan Naylor	New timer architecture.</div><div class='hunk'>@@ -87,7 +82,8 @@ void lapb_kick(struct lapb_cb *lapb)</div><div class='ctx'> 		skb = skb_dequeue(&amp;lapb-&gt;write_queue);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {</div><div class='add'>+			skbn = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+			if (!skbn) {</div><div class='ctx'> 				skb_queue_head(&amp;lapb-&gt;write_queue, skb);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c<br/>index 75efde3e616c..592a22d86a97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_subr.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_subr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_subr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/lapb_subr.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	LAPB release 002</div><div class='ctx'>  *</div><div class='ctx'>  *	This code REQUIRES 2.1.15 or higher/ NET3.038</div><div class='ctx'>  *</div><div class='del'>- *	This module:</div><div class='del'>- *		This module is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	History</div><div class='ctx'>  *	LAPB 001	Jonathan Naylor	Started Coding</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c<br/>index 5d4ae01951b5..9fde6cf20f10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_timer.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/lapb/lapb_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/lapb/lapb_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/lapb/lapb_timer.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	LAPB release 002</div><div class='ctx'>  *</div><div class='ctx'>  *	This code REQUIRES 2.1.15 or higher/ NET3.038</div><div class='ctx'>  *</div><div class='del'>- *	This module:</div><div class='del'>- *		This module is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  *	History</div><div class='ctx'>  *	LAPB 001	Jonathan Naylor	Started Coding</div><div class='ctx'>  *	LAPB 002	Jonathan Naylor	New timer architecture.</div><div class='hunk'>@@ -40,61 +35,88 @@ static void lapb_t2timer_expiry(struct timer_list *);</div><div class='ctx'> </div><div class='ctx'> void lapb_start_t1timer(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;lapb-&gt;t1timer);</div><div class='add'>+	timer_delete(&amp;lapb-&gt;t1timer);</div><div class='ctx'> </div><div class='ctx'> 	lapb-&gt;t1timer.function = lapb_t1timer_expiry;</div><div class='ctx'> 	lapb-&gt;t1timer.expires  = jiffies + lapb-&gt;t1;</div><div class='ctx'> </div><div class='add'>+	lapb-&gt;t1timer_running = true;</div><div class='ctx'> 	add_timer(&amp;lapb-&gt;t1timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lapb_start_t2timer(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;lapb-&gt;t2timer);</div><div class='add'>+	timer_delete(&amp;lapb-&gt;t2timer);</div><div class='ctx'> </div><div class='ctx'> 	lapb-&gt;t2timer.function = lapb_t2timer_expiry;</div><div class='ctx'> 	lapb-&gt;t2timer.expires  = jiffies + lapb-&gt;t2;</div><div class='ctx'> </div><div class='add'>+	lapb-&gt;t2timer_running = true;</div><div class='ctx'> 	add_timer(&amp;lapb-&gt;t2timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lapb_stop_t1timer(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;lapb-&gt;t1timer);</div><div class='add'>+	lapb-&gt;t1timer_running = false;</div><div class='add'>+	timer_delete(&amp;lapb-&gt;t1timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lapb_stop_t2timer(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;lapb-&gt;t2timer);</div><div class='add'>+	lapb-&gt;t2timer_running = false;</div><div class='add'>+	timer_delete(&amp;lapb-&gt;t2timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int lapb_t1timer_running(struct lapb_cb *lapb)</div><div class='ctx'> {</div><div class='del'>-	return timer_pending(&amp;lapb-&gt;t1timer);</div><div class='add'>+	return lapb-&gt;t1timer_running;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lapb_t2timer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lapb_cb *lapb = from_timer(lapb, t, t2timer);</div><div class='add'>+	struct lapb_cb *lapb = timer_container_of(lapb, t, t2timer);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+	if (timer_pending(&amp;lapb-&gt;t2timer)) /* A new timer has been set up */</div><div class='add'>+		goto out;</div><div class='add'>+	if (!lapb-&gt;t2timer_running) /* The timer has been stopped */</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (lapb-&gt;condition &amp; LAPB_ACK_PENDING_CONDITION) {</div><div class='ctx'> 		lapb-&gt;condition &amp;= ~LAPB_ACK_PENDING_CONDITION;</div><div class='ctx'> 		lapb_timeout_response(lapb);</div><div class='ctx'> 	}</div><div class='add'>+	lapb-&gt;t2timer_running = false;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lapb_cb *lapb = from_timer(lapb, t, t1timer);</div><div class='add'>+	struct lapb_cb *lapb = timer_container_of(lapb, t, t1timer);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lapb-&gt;lock);</div><div class='add'>+	if (timer_pending(&amp;lapb-&gt;t1timer)) /* A new timer has been set up */</div><div class='add'>+		goto out;</div><div class='add'>+	if (!lapb-&gt;t1timer_running) /* The timer has been stopped */</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (lapb-&gt;state) {</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 *	If we are a DCE, keep going DM .. DM .. DM</div><div class='add'>+		 *	If we are a DCE, send DM up to N2 times, then switch to</div><div class='add'>+		 *	STATE_1 and send SABM(E).</div><div class='ctx'> 		 */</div><div class='ctx'> 		case LAPB_STATE_0:</div><div class='del'>-			if (lapb-&gt;mode &amp; LAPB_DCE)</div><div class='add'>+			if (lapb-&gt;mode &amp; LAPB_DCE &amp;&amp;</div><div class='add'>+			    lapb-&gt;n2count != lapb-&gt;n2) {</div><div class='add'>+				lapb-&gt;n2count++;</div><div class='ctx'> 				lapb_send_control(lapb, LAPB_DM, LAPB_POLLOFF, LAPB_RESPONSE);</div><div class='add'>+			} else {</div><div class='add'>+				lapb-&gt;state = LAPB_STATE_1;</div><div class='add'>+				lapb_establish_data_link(lapb);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -106,7 +128,8 @@ static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> 				lapb-&gt;state = LAPB_STATE_0;</div><div class='ctx'> 				lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);</div><div class='ctx'> 				lapb_dbg(0, "(%p) S1 -&gt; S0\n", lapb-&gt;dev);</div><div class='del'>-				return;</div><div class='add'>+				lapb-&gt;t1timer_running = false;</div><div class='add'>+				goto out;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				lapb-&gt;n2count++;</div><div class='ctx'> 				if (lapb-&gt;mode &amp; LAPB_EXTENDED) {</div><div class='hunk'>@@ -130,7 +153,8 @@ static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> 				lapb-&gt;state = LAPB_STATE_0;</div><div class='ctx'> 				lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT);</div><div class='ctx'> 				lapb_dbg(0, "(%p) S2 -&gt; S0\n", lapb-&gt;dev);</div><div class='del'>-				return;</div><div class='add'>+				lapb-&gt;t1timer_running = false;</div><div class='add'>+				goto out;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				lapb-&gt;n2count++;</div><div class='ctx'> 				lapb_dbg(1, "(%p) S2 TX DISC(1)\n", lapb-&gt;dev);</div><div class='hunk'>@@ -148,7 +172,8 @@ static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> 				lapb_stop_t2timer(lapb);</div><div class='ctx'> 				lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);</div><div class='ctx'> 				lapb_dbg(0, "(%p) S3 -&gt; S0\n", lapb-&gt;dev);</div><div class='del'>-				return;</div><div class='add'>+				lapb-&gt;t1timer_running = false;</div><div class='add'>+				goto out;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				lapb-&gt;n2count++;</div><div class='ctx'> 				lapb_requeue_frames(lapb);</div><div class='hunk'>@@ -165,7 +190,8 @@ static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> 				lapb-&gt;state = LAPB_STATE_0;</div><div class='ctx'> 				lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);</div><div class='ctx'> 				lapb_dbg(0, "(%p) S4 -&gt; S0\n", lapb-&gt;dev);</div><div class='del'>-				return;</div><div class='add'>+				lapb-&gt;t1timer_running = false;</div><div class='add'>+				goto out;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				lapb-&gt;n2count++;</div><div class='ctx'> 				lapb_transmit_frmr(lapb);</div><div class='hunk'>@@ -174,4 +200,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lapb_start_t1timer(lapb);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;lapb-&gt;lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/llc/Kconfig b/net/llc/Kconfig<br/>index 176a6c1521a5..7f79f5e134f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config LLC</div><div class='ctx'> 	tristate</div><div class='del'>-	depends on NET</div><div class='ctx'> </div><div class='ctx'> config LLC2</div><div class='ctx'> 	tristate "ANSI/IEEE 802.2 LLC type 2 Support"</div><div class='head'>diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c<br/>index 1beeea9549fa..59d593bb5d18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/af_llc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/af_llc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/af_llc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/af_llc.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);</div><div class='ctx'> #if 0</div><div class='ctx'> #define dprintk(args...) printk(KERN_DEBUG args)</div><div class='ctx'> #else</div><div class='del'>-#define dprintk(args...)</div><div class='add'>+#define dprintk(args...) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Maybe we'll add some more in the future. */</div><div class='hunk'>@@ -98,8 +98,16 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u8 rc = LLC_PDU_LEN_U;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;sllc_test || addr-&gt;sllc_xid)</div><div class='add'>+	if (addr-&gt;sllc_test)</div><div class='ctx'> 		rc = LLC_PDU_LEN_U;</div><div class='add'>+	else if (addr-&gt;sllc_xid)</div><div class='add'>+		/* We need to expand header to sizeof(struct llc_xid_info)</div><div class='add'>+		 * since llc_pdu_init_as_xid_cmd() sets 4,5,6 bytes of LLC header</div><div class='add'>+		 * as XID PDU. In llc_ui_sendmsg() we reserved header size and then</div><div class='add'>+		 * filled all other space with user data. If we won't reserve this</div><div class='add'>+		 * bytes, llc_pdu_init_as_xid_cmd() will overwrite user data</div><div class='add'>+		 */</div><div class='add'>+		rc = LLC_PDU_LEN_U_XID;</div><div class='ctx'> 	else if (sk-&gt;sk_type == SOCK_STREAM)</div><div class='ctx'> 		rc = LLC_PDU_LEN_I;</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -113,22 +121,26 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)</div><div class='ctx'>  *</div><div class='ctx'>  *	Send data via reliable llc2 connection.</div><div class='ctx'>  *	Returns 0 upon success, non-zero if action did not succeed.</div><div class='add'>+ *</div><div class='add'>+ *	This function always consumes a reference to the skb.</div><div class='ctx'>  */</div><div class='ctx'> static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sock* llc = llc_sk(sk);</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(llc_data_accept_state(llc-&gt;state) ||</div><div class='ctx'> 		     llc-&gt;remote_busy_flag ||</div><div class='ctx'> 		     llc-&gt;p_flag)) {</div><div class='ctx'> 		long timeout = sock_sndtimeo(sk, noblock);</div><div class='add'>+		int rc;</div><div class='ctx'> </div><div class='ctx'> 		rc = llc_ui_wait_for_busy_core(sk, timeout);</div><div class='add'>+		if (rc) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(!rc))</div><div class='del'>-		rc = llc_build_and_send_pkt(sk, skb);</div><div class='del'>-	return rc;</div><div class='add'>+	return llc_build_and_send_pkt(sk, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void llc_ui_sk_init(struct socket *sock, struct sock *sk)</div><div class='hunk'>@@ -198,7 +210,7 @@ static int llc_ui_release(struct socket *sock)</div><div class='ctx'> 	dprintk("%s: closing local(%02X) remote(%02X)\n", __func__,</div><div class='ctx'> 		llc-&gt;laddr.lsap, llc-&gt;daddr.lsap);</div><div class='ctx'> 	if (!llc_send_disc(sk))</div><div class='del'>-		llc_ui_wait_for_disc(sk, sk-&gt;sk_rcvtimeo);</div><div class='add'>+		llc_ui_wait_for_disc(sk, READ_ONCE(sk-&gt;sk_rcvtimeo));</div><div class='ctx'> 	if (!sock_flag(sk, SOCK_ZAPPED)) {</div><div class='ctx'> 		struct llc_sap *sap = llc-&gt;sap;</div><div class='ctx'> </div><div class='hunk'>@@ -212,9 +224,10 @@ static int llc_ui_release(struct socket *sock)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		release_sock(sk);</div><div class='ctx'> 	}</div><div class='del'>-	if (llc-&gt;dev)</div><div class='del'>-		dev_put(llc-&gt;dev);</div><div class='add'>+	netdev_put(llc-&gt;dev, &amp;llc-&gt;dev_tracker);</div><div class='ctx'> 	sock_put(sk);</div><div class='add'>+	sock_orphan(sk);</div><div class='add'>+	sock-&gt;sk = NULL;</div><div class='ctx'> 	llc_sk_free(sk);</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -264,21 +277,26 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='ctx'> 	struct llc_sap *sap;</div><div class='ctx'> 	int rc = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!sock_flag(sk, SOCK_ZAPPED))</div><div class='ctx'> 		goto out;</div><div class='add'>+	if (!addr-&gt;sllc_arphrd)</div><div class='add'>+		addr-&gt;sllc_arphrd = ARPHRD_ETHER;</div><div class='add'>+	if (addr-&gt;sllc_arphrd != ARPHRD_ETHER)</div><div class='add'>+		goto out;</div><div class='ctx'> 	rc = -ENODEV;</div><div class='ctx'> 	if (sk-&gt;sk_bound_dev_if) {</div><div class='del'>-		llc-&gt;dev = dev_get_by_index(&amp;init_net, sk-&gt;sk_bound_dev_if);</div><div class='del'>-		if (llc-&gt;dev &amp;&amp; addr-&gt;sllc_arphrd != llc-&gt;dev-&gt;type) {</div><div class='del'>-			dev_put(llc-&gt;dev);</div><div class='del'>-			llc-&gt;dev = NULL;</div><div class='add'>+		dev = dev_get_by_index(&amp;init_net, sk-&gt;sk_bound_dev_if);</div><div class='add'>+		if (dev &amp;&amp; addr-&gt;sllc_arphrd != dev-&gt;type) {</div><div class='add'>+			dev_put(dev);</div><div class='add'>+			dev = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		llc-&gt;dev = dev_getfirstbyhwtype(&amp;init_net, addr-&gt;sllc_arphrd);</div><div class='del'>-	if (!llc-&gt;dev)</div><div class='add'>+		dev = dev_getfirstbyhwtype(&amp;init_net, addr-&gt;sllc_arphrd);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = -EUSERS;</div><div class='ctx'> 	llc-&gt;laddr.lsap = llc_ui_autoport();</div><div class='hunk'>@@ -288,6 +306,12 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)</div><div class='ctx'> 	sap = llc_sap_open(llc-&gt;laddr.lsap, NULL);</div><div class='ctx'> 	if (!sap)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='add'>+	/* Note: We do not expect errors from this point. */</div><div class='add'>+	llc-&gt;dev = dev;</div><div class='add'>+	netdev_tracker_alloc(llc-&gt;dev, &amp;llc-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	dev = NULL;</div><div class='add'>+</div><div class='ctx'> 	memcpy(llc-&gt;laddr.mac, llc-&gt;dev-&gt;dev_addr, IFHWADDRLEN);</div><div class='ctx'> 	memcpy(&amp;llc-&gt;addr, addr, sizeof(llc-&gt;addr));</div><div class='ctx'> 	/* assign new connection to its SAP */</div><div class='hunk'>@@ -295,6 +319,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)</div><div class='ctx'> 	sock_reset_flag(sk, SOCK_ZAPPED);</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> out:</div><div class='add'>+	dev_put(dev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -312,47 +337,48 @@ out:</div><div class='ctx'>  *	otherwise all hell will break loose.</div><div class='ctx'>  *	Returns: 0 upon success, negative otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)</div><div class='add'>+static int llc_ui_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addrlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_llc *addr = (struct sockaddr_llc *)uaddr;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='add'>+	struct net_device *dev = NULL;</div><div class='ctx'> 	struct llc_sap *sap;</div><div class='ctx'> 	int rc = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s: binding %02X\n", __func__, addr-&gt;sllc_sap);</div><div class='del'>-</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = -EAFNOSUPPORT;</div><div class='del'>-	if (unlikely(addr-&gt;sllc_family != AF_LLC))</div><div class='add'>+	if (!addr-&gt;sllc_arphrd)</div><div class='add'>+		addr-&gt;sllc_arphrd = ARPHRD_ETHER;</div><div class='add'>+	if (unlikely(addr-&gt;sllc_family != AF_LLC || addr-&gt;sllc_arphrd != ARPHRD_ETHER))</div><div class='ctx'> 		goto out;</div><div class='add'>+	dprintk("%s: binding %02X\n", __func__, addr-&gt;sllc_sap);</div><div class='ctx'> 	rc = -ENODEV;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	if (sk-&gt;sk_bound_dev_if) {</div><div class='del'>-		llc-&gt;dev = dev_get_by_index_rcu(&amp;init_net, sk-&gt;sk_bound_dev_if);</div><div class='del'>-		if (llc-&gt;dev) {</div><div class='del'>-			if (!addr-&gt;sllc_arphrd)</div><div class='del'>-				addr-&gt;sllc_arphrd = llc-&gt;dev-&gt;type;</div><div class='add'>+		dev = dev_get_by_index_rcu(&amp;init_net, sk-&gt;sk_bound_dev_if);</div><div class='add'>+		if (dev) {</div><div class='ctx'> 			if (is_zero_ether_addr(addr-&gt;sllc_mac))</div><div class='del'>-				memcpy(addr-&gt;sllc_mac, llc-&gt;dev-&gt;dev_addr,</div><div class='add'>+				memcpy(addr-&gt;sllc_mac, dev-&gt;dev_addr,</div><div class='ctx'> 				       IFHWADDRLEN);</div><div class='del'>-			if (addr-&gt;sllc_arphrd != llc-&gt;dev-&gt;type ||</div><div class='add'>+			if (addr-&gt;sllc_arphrd != dev-&gt;type ||</div><div class='ctx'> 			    !ether_addr_equal(addr-&gt;sllc_mac,</div><div class='del'>-					      llc-&gt;dev-&gt;dev_addr)) {</div><div class='add'>+					      dev-&gt;dev_addr)) {</div><div class='ctx'> 				rc = -EINVAL;</div><div class='del'>-				llc-&gt;dev = NULL;</div><div class='add'>+				dev = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='del'>-		llc-&gt;dev = dev_getbyhwaddr_rcu(&amp;init_net, addr-&gt;sllc_arphrd,</div><div class='add'>+	} else {</div><div class='add'>+		dev = dev_getbyhwaddr_rcu(&amp;init_net, addr-&gt;sllc_arphrd,</div><div class='ctx'> 					   addr-&gt;sllc_mac);</div><div class='del'>-	if (llc-&gt;dev)</div><div class='del'>-		dev_hold(llc-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	dev_hold(dev);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	if (!llc-&gt;dev)</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (!addr-&gt;sllc_sap) {</div><div class='ctx'> 		rc = -EUSERS;</div><div class='ctx'> 		addr-&gt;sllc_sap = llc_ui_autoport();</div><div class='hunk'>@@ -378,12 +404,18 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)</div><div class='ctx'> 		memcpy(laddr.mac, addr-&gt;sllc_mac, IFHWADDRLEN);</div><div class='ctx'> 		laddr.lsap = addr-&gt;sllc_sap;</div><div class='ctx'> 		rc = -EADDRINUSE; /* mac + sap clash. */</div><div class='del'>-		ask = llc_lookup_established(sap, &amp;daddr, &amp;laddr);</div><div class='add'>+		ask = llc_lookup_established(sap, &amp;daddr, &amp;laddr, &amp;init_net);</div><div class='ctx'> 		if (ask) {</div><div class='ctx'> 			sock_put(ask);</div><div class='ctx'> 			goto out_put;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Note: We do not expect errors from this point. */</div><div class='add'>+	llc-&gt;dev = dev;</div><div class='add'>+	netdev_tracker_alloc(llc-&gt;dev, &amp;llc-&gt;dev_tracker, GFP_KERNEL);</div><div class='add'>+	dev = NULL;</div><div class='add'>+</div><div class='ctx'> 	llc-&gt;laddr.lsap = addr-&gt;sllc_sap;</div><div class='ctx'> 	memcpy(llc-&gt;laddr.mac, addr-&gt;sllc_mac, IFHWADDRLEN);</div><div class='ctx'> 	memcpy(&amp;llc-&gt;addr, addr, sizeof(llc-&gt;addr));</div><div class='hunk'>@@ -394,6 +426,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)</div><div class='ctx'> out_put:</div><div class='ctx'> 	llc_sap_put(sap);</div><div class='ctx'> out:</div><div class='add'>+	dev_put(dev);</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -422,7 +455,7 @@ static int llc_ui_shutdown(struct socket *sock, int how)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = llc_send_disc(sk);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		rc = llc_ui_wait_for_disc(sk, sk-&gt;sk_rcvtimeo);</div><div class='add'>+		rc = llc_ui_wait_for_disc(sk, READ_ONCE(sk-&gt;sk_rcvtimeo));</div><div class='ctx'> 	/* Wake up anyone sleeping in poll */</div><div class='ctx'> 	sk-&gt;sk_state_change(sk);</div><div class='ctx'> out:</div><div class='hunk'>@@ -444,7 +477,7 @@ out:</div><div class='ctx'>  *	This function will autobind if user did not previously call bind.</div><div class='ctx'>  *	Returns: 0 upon success, negative otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,</div><div class='add'>+static int llc_ui_connect(struct socket *sock, struct sockaddr_unsized *uaddr,</div><div class='ctx'> 			  int addrlen, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='hunk'>@@ -552,7 +585,8 @@ static int llc_ui_wait_for_disc(struct sock *sk, long timeout)</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (sk_wait_event(sk, &amp;timeout, sk-&gt;sk_state == TCP_CLOSE, &amp;wait))</div><div class='add'>+		if (sk_wait_event(sk, &amp;timeout,</div><div class='add'>+				  READ_ONCE(sk-&gt;sk_state) == TCP_CLOSE, &amp;wait))</div><div class='ctx'> 			break;</div><div class='ctx'> 		rc = -ERESTARTSYS;</div><div class='ctx'> 		if (signal_pending(current))</div><div class='hunk'>@@ -572,7 +606,8 @@ static bool llc_ui_wait_for_conn(struct sock *sk, long timeout)</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (sk_wait_event(sk, &amp;timeout, sk-&gt;sk_state != TCP_SYN_SENT, &amp;wait))</div><div class='add'>+		if (sk_wait_event(sk, &amp;timeout,</div><div class='add'>+				  READ_ONCE(sk-&gt;sk_state) != TCP_SYN_SENT, &amp;wait))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (signal_pending(current) || !timeout)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -591,7 +626,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 		if (sk_wait_event(sk, &amp;timeout,</div><div class='del'>-				  (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) ||</div><div class='add'>+				  (READ_ONCE(sk-&gt;sk_shutdown) &amp; RCV_SHUTDOWN) ||</div><div class='ctx'> 				  (!llc_data_accept_state(llc-&gt;state) &amp;&amp;</div><div class='ctx'> 				   !llc-&gt;remote_busy_flag &amp;&amp;</div><div class='ctx'> 				   !llc-&gt;p_flag), &amp;wait))</div><div class='hunk'>@@ -653,14 +688,13 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)</div><div class='ctx'>  *	llc_ui_accept - accept a new incoming connection.</div><div class='ctx'>  *	@sock: Socket which connections arrive on.</div><div class='ctx'>  *	@newsock: Socket to move incoming connection to.</div><div class='del'>- *	@flags: User specified operational flags.</div><div class='del'>- *	@kern: If the socket is kernel internal</div><div class='add'>+ *	@arg: User specified arguments</div><div class='ctx'>  *</div><div class='ctx'>  *	Accept a new incoming connection.</div><div class='ctx'>  *	Returns 0 upon success, negative otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='del'>-			 bool kern)</div><div class='add'>+static int llc_ui_accept(struct socket *sock, struct socket *newsock,</div><div class='add'>+			 struct proto_accept_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk, *newsk;</div><div class='ctx'> 	struct llc_sock *llc, *newllc;</div><div class='hunk'>@@ -678,7 +712,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* wait for a connection to arrive. */</div><div class='ctx'> 	if (skb_queue_empty(&amp;sk-&gt;sk_receive_queue)) {</div><div class='del'>-		rc = llc_wait_data(sk, sk-&gt;sk_rcvtimeo);</div><div class='add'>+		rc = llc_wait_data(sk, READ_ONCE(sk-&gt;sk_rcvtimeo));</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -702,7 +736,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags,</div><div class='ctx'> </div><div class='ctx'> 	/* put original socket back into a clean listen state. */</div><div class='ctx'> 	sk-&gt;sk_state = TCP_LISTEN;</div><div class='del'>-	sk-&gt;sk_ack_backlog--;</div><div class='add'>+	sk_acceptq_removed(sk);</div><div class='ctx'> 	dprintk("%s: ok success on %02X, client on %02X\n", __func__,</div><div class='ctx'> 		llc_sk(sk)-&gt;addr.sllc_sap, newllc-&gt;daddr.lsap);</div><div class='ctx'> frees:</div><div class='hunk'>@@ -730,7 +764,6 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='del'>-	unsigned long cpu_flags;</div><div class='ctx'> 	size_t copied = 0;</div><div class='ctx'> 	u32 peek_seq = 0;</div><div class='ctx'> 	u32 *seq, skb_len;</div><div class='hunk'>@@ -778,7 +811,7 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Well, if we have backlog, try to process it now yet. */</div><div class='ctx'> </div><div class='del'>-		if (copied &gt;= target &amp;&amp; !sk-&gt;sk_backlog.tail)</div><div class='add'>+		if (copied &gt;= target &amp;&amp; !READ_ONCE(sk-&gt;sk_backlog.tail))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (copied) {</div><div class='hunk'>@@ -854,16 +887,15 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,</div><div class='ctx'> 		if (sk-&gt;sk_type != SOCK_STREAM)</div><div class='ctx'> 			goto copy_uaddr;</div><div class='ctx'> </div><div class='del'>-		if (!(flags &amp; MSG_PEEK)) {</div><div class='del'>-			spin_lock_irqsave(&amp;sk-&gt;sk_receive_queue.lock, cpu_flags);</div><div class='del'>-			sk_eat_skb(sk, skb);</div><div class='del'>-			spin_unlock_irqrestore(&amp;sk-&gt;sk_receive_queue.lock, cpu_flags);</div><div class='del'>-			*seq = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Partial read */</div><div class='ctx'> 		if (used + offset &lt; skb_len)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='add'>+		if (!(flags &amp; MSG_PEEK)) {</div><div class='add'>+			skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			*seq = 0;</div><div class='add'>+		}</div><div class='ctx'> 	} while (len &gt; 0);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -878,9 +910,8 @@ copy_uaddr:</div><div class='ctx'> 		llc_cmsg_rcv(msg, skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!(flags &amp; MSG_PEEK)) {</div><div class='del'>-		spin_lock_irqsave(&amp;sk-&gt;sk_receive_queue.lock, cpu_flags);</div><div class='del'>-		sk_eat_skb(sk, skb);</div><div class='del'>-		spin_unlock_irqrestore(&amp;sk-&gt;sk_receive_queue.lock, cpu_flags);</div><div class='add'>+		skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 		*seq = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -898,24 +929,25 @@ copy_uaddr:</div><div class='ctx'>  */</div><div class='ctx'> static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> {</div><div class='add'>+	DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg-&gt;msg_name);</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='del'>-	DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg-&gt;msg_name);</div><div class='ctx'> 	int flags = msg-&gt;msg_flags;</div><div class='ctx'> 	int noblock = flags &amp; MSG_DONTWAIT;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	int rc = -EINVAL, copied = 0, hdrlen, hh_len;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	size_t size = 0;</div><div class='del'>-	int rc = -EINVAL, copied = 0, hdrlen;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s: sending from %02X to %02X\n", __func__,</div><div class='ctx'> 		llc-&gt;laddr.lsap, llc-&gt;daddr.lsap);</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (addr) {</div><div class='ctx'> 		if (msg-&gt;msg_namelen &lt; sizeof(*addr))</div><div class='del'>-			goto release;</div><div class='add'>+			goto out;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (llc_ui_addr_null(&amp;llc-&gt;addr))</div><div class='del'>-			goto release;</div><div class='add'>+			goto out;</div><div class='ctx'> 		addr = &amp;llc-&gt;addr;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* must bind connection to sap if user hasn't done it. */</div><div class='hunk'>@@ -923,53 +955,62 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)</div><div class='ctx'> 		/* bind to sap with null dev, exclusive. */</div><div class='ctx'> 		rc = llc_ui_autobind(sock, addr);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			goto release;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	hdrlen = llc-&gt;dev-&gt;hard_header_len + llc_ui_header_len(sk, addr);</div><div class='add'>+	dev = llc-&gt;dev;</div><div class='add'>+	hh_len = LL_RESERVED_SPACE(dev);</div><div class='add'>+	hdrlen = llc_ui_header_len(sk, addr);</div><div class='ctx'> 	size = hdrlen + len;</div><div class='del'>-	if (size &gt; llc-&gt;dev-&gt;mtu)</div><div class='del'>-		size = llc-&gt;dev-&gt;mtu;</div><div class='add'>+	size = min_t(size_t, size, READ_ONCE(dev-&gt;mtu));</div><div class='ctx'> 	copied = size - hdrlen;</div><div class='ctx'> 	rc = -EINVAL;</div><div class='ctx'> 	if (copied &lt; 0)</div><div class='del'>-		goto release;</div><div class='add'>+		goto out;</div><div class='ctx'> 	release_sock(sk);</div><div class='del'>-	skb = sock_alloc_send_skb(sk, size, noblock, &amp;rc);</div><div class='add'>+	skb = sock_alloc_send_skb(sk, hh_len + size, noblock, &amp;rc);</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (!skb)</div><div class='del'>-		goto release;</div><div class='del'>-	skb-&gt;dev      = llc-&gt;dev;</div><div class='add'>+		goto out;</div><div class='add'>+	if (sock_flag(sk, SOCK_ZAPPED) ||</div><div class='add'>+	    llc-&gt;dev != dev ||</div><div class='add'>+	    hdrlen != llc_ui_header_len(sk, addr) ||</div><div class='add'>+	    hh_len != LL_RESERVED_SPACE(dev) ||</div><div class='add'>+	    size &gt; READ_ONCE(dev-&gt;mtu))</div><div class='add'>+		goto out;</div><div class='add'>+	skb-&gt;dev      = dev;</div><div class='ctx'> 	skb-&gt;protocol = llc_proto_type(addr-&gt;sllc_arphrd);</div><div class='del'>-	skb_reserve(skb, hdrlen);</div><div class='add'>+	skb_reserve(skb, hh_len + hdrlen);</div><div class='ctx'> 	rc = memcpy_from_msg(skb_put(skb, copied), msg, copied);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (sk-&gt;sk_type == SOCK_DGRAM || addr-&gt;sllc_ua) {</div><div class='ctx'> 		llc_build_and_send_ui_pkt(llc-&gt;sap, skb, addr-&gt;sllc_mac,</div><div class='ctx'> 					  addr-&gt;sllc_sap);</div><div class='add'>+		skb = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (addr-&gt;sllc_test) {</div><div class='ctx'> 		llc_build_and_send_test_pkt(llc-&gt;sap, skb, addr-&gt;sllc_mac,</div><div class='ctx'> 					    addr-&gt;sllc_sap);</div><div class='add'>+		skb = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (addr-&gt;sllc_xid) {</div><div class='ctx'> 		llc_build_and_send_xid_pkt(llc-&gt;sap, skb, addr-&gt;sllc_mac,</div><div class='ctx'> 					   addr-&gt;sllc_sap);</div><div class='add'>+		skb = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = -ENOPROTOOPT;</div><div class='ctx'> 	if (!(sk-&gt;sk_type == SOCK_STREAM &amp;&amp; !addr-&gt;sllc_ua))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = llc_ui_send_data(sk, skb, noblock);</div><div class='add'>+	skb = NULL;</div><div class='ctx'> out:</div><div class='del'>-	if (rc) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-release:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		dprintk("%s: failed sending from %02X to %02X: %d\n",</div><div class='ctx'> 			__func__, llc-&gt;laddr.lsap, llc-&gt;daddr.lsap, rc);</div><div class='del'>-	}</div><div class='ctx'> 	release_sock(sk);</div><div class='ctx'> 	return rc ? : copied;</div><div class='ctx'> }</div><div class='hunk'>@@ -978,7 +1019,6 @@ release:</div><div class='ctx'>  *	llc_ui_getname - return the address info of a socket</div><div class='ctx'>  *	@sock: Socket to get address of.</div><div class='ctx'>  *	@uaddr: Address structure to return information.</div><div class='del'>- *	@uaddrlen: Length of address structure.</div><div class='ctx'>  *	@peer: Does user want local or remote address information.</div><div class='ctx'>  *</div><div class='ctx'>  *	Return the address information of a socket.</div><div class='hunk'>@@ -1048,7 +1088,7 @@ static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,</div><div class='ctx'>  *	Set various connection specific parameters.</div><div class='ctx'>  */</div><div class='ctx'> static int llc_ui_setsockopt(struct socket *sock, int level, int optname,</div><div class='del'>-			     char __user *optval, unsigned int optlen)</div><div class='add'>+			     sockptr_t optval, unsigned int optlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='hunk'>@@ -1058,7 +1098,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname,</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> 	if (unlikely(level != SOL_LLC || optlen != sizeof(int)))</div><div class='ctx'> 		goto out;</div><div class='del'>-	rc = get_user(opt, (int __user *)optval);</div><div class='add'>+	rc = copy_safe_from_sockptr(&amp;opt, sizeof(opt), optval, optlen);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = -EINVAL;</div><div class='hunk'>@@ -1201,7 +1241,6 @@ static const struct proto_ops llc_ui_ops = {</div><div class='ctx'> 	.sendmsg     = llc_ui_sendmsg,</div><div class='ctx'> 	.recvmsg     = llc_ui_recvmsg,</div><div class='ctx'> 	.mmap	     = sock_no_mmap,</div><div class='del'>-	.sendpage    = sock_no_sendpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char llc_proc_err_msg[] __initconst =</div><div class='head'>diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c<br/>index 4d78375f9872..0779daa8aa8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_ac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_ac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_ac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_c_ac.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 		llc-&gt;remote_busy_flag = 0;</div><div class='del'>-		del_timer(&amp;llc-&gt;busy_state_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;busy_state_timer.timer);</div><div class='ctx'> 		nr = LLC_I_GET_NR(pdu);</div><div class='ctx'> 		llc_conn_resend_i_pdu_as_cmd(sk, nr, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -191,7 +191,7 @@ int llc_conn_ac_stop_rej_tmr_if_data_flag_eq_2(struct sock *sk,</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (llc-&gt;data_flag == 2)</div><div class='del'>-		del_timer(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,6 +372,7 @@ int llc_conn_ac_send_i_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	llc_pdu_init_as_i_cmd(skb, 1, llc-&gt;vS, llc-&gt;vR);</div><div class='ctx'> 	rc = llc_mac_hdr_init(skb, llc-&gt;dev-&gt;dev_addr, llc-&gt;daddr.mac);</div><div class='ctx'> 	if (likely(!rc)) {</div><div class='add'>+		skb_get(skb);</div><div class='ctx'> 		llc_conn_send_pdu(sk, skb);</div><div class='ctx'> 		llc_conn_ac_inc_vs_by_1(sk, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,7 +390,8 @@ static int llc_conn_ac_send_i_cmd_p_set_0(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	llc_pdu_init_as_i_cmd(skb, 0, llc-&gt;vS, llc-&gt;vR);</div><div class='ctx'> 	rc = llc_mac_hdr_init(skb, llc-&gt;dev-&gt;dev_addr, llc-&gt;daddr.mac);</div><div class='ctx'> 	if (likely(!rc)) {</div><div class='del'>-		rc = llc_conn_send_pdu(sk, skb);</div><div class='add'>+		skb_get(skb);</div><div class='add'>+		llc_conn_send_pdu(sk, skb);</div><div class='ctx'> 		llc_conn_ac_inc_vs_by_1(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -406,6 +408,7 @@ int llc_conn_ac_send_i_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	llc_pdu_init_as_i_cmd(skb, 0, llc-&gt;vS, llc-&gt;vR);</div><div class='ctx'> 	rc = llc_mac_hdr_init(skb, llc-&gt;dev-&gt;dev_addr, llc-&gt;daddr.mac);</div><div class='ctx'> 	if (likely(!rc)) {</div><div class='add'>+		skb_get(skb);</div><div class='ctx'> 		llc_conn_send_pdu(sk, skb);</div><div class='ctx'> 		llc_conn_ac_inc_vs_by_1(sk, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -778,7 +781,7 @@ int llc_conn_ac_send_sabme_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (nskb) {</div><div class='ctx'> 		struct llc_sap *sap = llc-&gt;sap;</div><div class='del'>-		u8 *dmac = llc-&gt;daddr.mac;</div><div class='add'>+		const u8 *dmac = llc-&gt;daddr.mac;</div><div class='ctx'> </div><div class='ctx'> 		if (llc-&gt;dev-&gt;flags &amp; IFF_LOOPBACK)</div><div class='ctx'> 			dmac = llc-&gt;dev-&gt;dev_addr;</div><div class='hunk'>@@ -916,7 +919,8 @@ static int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock *sk,</div><div class='ctx'> 	llc_pdu_init_as_i_cmd(skb, llc-&gt;ack_pf, llc-&gt;vS, llc-&gt;vR);</div><div class='ctx'> 	rc = llc_mac_hdr_init(skb, llc-&gt;dev-&gt;dev_addr, llc-&gt;daddr.mac);</div><div class='ctx'> 	if (likely(!rc)) {</div><div class='del'>-		rc = llc_conn_send_pdu(sk, skb);</div><div class='add'>+		skb_get(skb);</div><div class='add'>+		llc_conn_send_pdu(sk, skb);</div><div class='ctx'> 		llc_conn_ac_inc_vs_by_1(sk, skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1107,9 +1111,9 @@ int llc_conn_ac_stop_other_timers(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='del'>-	del_timer(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='del'>-	del_timer(&amp;llc-&gt;busy_state_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc-&gt;busy_state_timer.timer);</div><div class='ctx'> 	llc-&gt;ack_must_be_send = 0;</div><div class='ctx'> 	llc-&gt;ack_pf = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1145,7 +1149,7 @@ int llc_conn_ac_start_ack_tmr_if_not_running(struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> int llc_conn_ac_stop_ack_timer(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;llc_sk(sk)-&gt;ack_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc_sk(sk)-&gt;ack_timer.timer);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1153,14 +1157,14 @@ int llc_conn_ac_stop_p_timer(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='ctx'> 	llc_conn_set_p_flag(sk, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int llc_conn_ac_stop_rej_timer(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;llc_sk(sk)-&gt;rej_sent_timer.timer);</div><div class='add'>+	timer_delete(&amp;llc_sk(sk)-&gt;rej_sent_timer.timer);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1176,7 +1180,7 @@ int llc_conn_ac_upd_nr_received(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	/* On loopback we don't queue I frames in unack_pdu_q queue. */</div><div class='ctx'> 	if (acked &gt; 0 || (llc-&gt;dev-&gt;flags &amp; IFF_LOOPBACK)) {</div><div class='ctx'> 		llc-&gt;retry_count = 0;</div><div class='del'>-		del_timer(&amp;llc-&gt;ack_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;ack_timer.timer);</div><div class='ctx'> 		if (llc-&gt;failed_data_req) {</div><div class='ctx'> 			/* already, we did not accept data from upper layer</div><div class='ctx'> 			 * (tx_window full or unacceptable state). Now, we</div><div class='hunk'>@@ -1331,28 +1335,31 @@ static void llc_conn_tmr_common_cb(struct sock *sk, u8 type)</div><div class='ctx'> </div><div class='ctx'> void llc_conn_pf_cycle_tmr_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct llc_sock *llc = from_timer(llc, t, pf_cycle_timer.timer);</div><div class='add'>+	struct llc_sock *llc = timer_container_of(llc, t,</div><div class='add'>+						  pf_cycle_timer.timer);</div><div class='ctx'> </div><div class='ctx'> 	llc_conn_tmr_common_cb(&amp;llc-&gt;sk, LLC_CONN_EV_TYPE_P_TMR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void llc_conn_busy_tmr_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct llc_sock *llc = from_timer(llc, t, busy_state_timer.timer);</div><div class='add'>+	struct llc_sock *llc = timer_container_of(llc, t,</div><div class='add'>+						  busy_state_timer.timer);</div><div class='ctx'> </div><div class='ctx'> 	llc_conn_tmr_common_cb(&amp;llc-&gt;sk, LLC_CONN_EV_TYPE_BUSY_TMR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void llc_conn_ack_tmr_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct llc_sock *llc = from_timer(llc, t, ack_timer.timer);</div><div class='add'>+	struct llc_sock *llc = timer_container_of(llc, t, ack_timer.timer);</div><div class='ctx'> </div><div class='ctx'> 	llc_conn_tmr_common_cb(&amp;llc-&gt;sk, LLC_CONN_EV_TYPE_ACK_TMR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void llc_conn_rej_tmr_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct llc_sock *llc = from_timer(llc, t, rej_sent_timer.timer);</div><div class='add'>+	struct llc_sock *llc = timer_container_of(llc, t,</div><div class='add'>+						  rej_sent_timer.timer);</div><div class='ctx'> </div><div class='ctx'> 	llc_conn_tmr_common_cb(&amp;llc-&gt;sk, LLC_CONN_EV_TYPE_REJ_TMR);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c<br/>index 523fdd1cf781..d6627a80cb45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_ev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_ev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_ev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_c_ev.c</a></div><div class='hunk'>@@ -608,7 +608,7 @@ int llc_conn_ev_qlfy_p_flag_eq_1(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	conn_ev_qlfy_last_frame_eq_1 - checks if frame is last in tx window</div><div class='add'>+ *	llc_conn_ev_qlfy_last_frame_eq_1 - checks if frame is last in tx window</div><div class='ctx'>  *	@sk: current connection structure.</div><div class='ctx'>  *	@skb: current event.</div><div class='ctx'>  *</div><div class='hunk'>@@ -624,7 +624,7 @@ int llc_conn_ev_qlfy_last_frame_eq_1(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	conn_ev_qlfy_last_frame_eq_0 - checks if frame isn't last in tx window</div><div class='add'>+ *	llc_conn_ev_qlfy_last_frame_eq_0 - checks if frame isn't last in tx window</div><div class='ctx'>  *	@sk: current connection structure.</div><div class='ctx'>  *	@skb: current event.</div><div class='ctx'>  *</div><div class='head'>diff --git a/net/llc/llc_c_st.c b/net/llc/llc_c_st.c<br/>index 2467573b5f84..1c267db304df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_st.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_c_st.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_c_st.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_c_st.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static const llc_conn_action_t llc_common_actions_1[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_disc_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_D_CONN,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -59,7 +59,7 @@ static const llc_conn_action_t llc_common_actions_2[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rst_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -79,7 +79,7 @@ static const llc_conn_action_t llc_common_actions_3[] = {</div><div class='ctx'> 	[8] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -95,7 +95,7 @@ static const llc_conn_action_t llc_common_actions_4[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -114,7 +114,7 @@ static const llc_conn_action_t llc_common_actions_5[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_frmr_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -129,7 +129,7 @@ static const llc_conn_action_t llc_common_actions_6[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -145,7 +145,7 @@ static const llc_conn_action_t llc_common_actions_7a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_7a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_7a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -161,7 +161,7 @@ static const llc_conn_action_t llc_common_actions_7b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_7b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_7b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -177,7 +177,7 @@ static const llc_conn_action_t llc_common_actions_8a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -193,7 +193,7 @@ static const llc_conn_action_t llc_common_actions_8b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -209,7 +209,7 @@ static const llc_conn_action_t llc_common_actions_8c[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_8c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_8c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_bad_pdu,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -225,7 +225,7 @@ static const llc_conn_action_t llc_common_actions_9[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_9 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_9 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -247,7 +247,7 @@ static const llc_conn_action_t llc_common_actions_10[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_10 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_10 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_xxx_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = llc_common_ev_qfyrs_10,</div><div class='hunk'>@@ -270,7 +270,7 @@ static const llc_conn_action_t llc_common_actions_11a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_11a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_11a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_common_ev_qfyrs_11a,</div><div class='hunk'>@@ -292,7 +292,7 @@ static const llc_conn_action_t llc_common_actions_11b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_11b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_11b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_common_ev_qfyrs_11b,</div><div class='hunk'>@@ -314,7 +314,7 @@ static const llc_conn_action_t llc_common_actions_11c[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_11c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_11c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rej_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_common_ev_qfyrs_11c,</div><div class='hunk'>@@ -336,7 +336,7 @@ static const llc_conn_action_t llc_common_actions_11d[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_11d = {</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_11d = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_busy_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_common_ev_qfyrs_11d,</div><div class='hunk'>@@ -347,7 +347,7 @@ static struct llc_conn_state_trans llc_common_state_trans_11d = {</div><div class='ctx'>  * Common dummy state transition; must be last entry for all state</div><div class='ctx'>  * transition groups - it'll be on .bss, so will be zeroed.</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans llc_common_state_trans_end;</div><div class='add'>+static const struct llc_conn_state_trans llc_common_state_trans_end;</div><div class='ctx'> </div><div class='ctx'> /* LLC_CONN_STATE_ADM transitions */</div><div class='ctx'> /* State transitions for LLC_CONN_EV_CONN_REQ event */</div><div class='hunk'>@@ -359,7 +359,7 @@ static const llc_conn_action_t llc_adm_actions_1[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_adm_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_adm_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_conn_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_SETUP,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -378,7 +378,7 @@ static const llc_conn_action_t llc_adm_actions_2[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_adm_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_adm_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -392,7 +392,7 @@ static const llc_conn_action_t llc_adm_actions_3[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_adm_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_adm_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -406,7 +406,7 @@ static const llc_conn_action_t llc_adm_actions_4[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_adm_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_adm_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_xxx_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -419,7 +419,7 @@ static const llc_conn_action_t llc_adm_actions_5[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_adm_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_adm_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_any_frame,</div><div class='ctx'> 	.next_state    = LLC_CONN_OUT_OF_SVC,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -430,7 +430,7 @@ static struct llc_conn_state_trans llc_adm_state_trans_5 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_adm_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_adm_state_transitions[] = {</div><div class='ctx'> 	[0] = &amp;llc_adm_state_trans_1,		/* Request */</div><div class='ctx'> 	[1] = &amp;llc_common_state_trans_end,</div><div class='ctx'> 	[2] = &amp;llc_common_state_trans_end,	/* local_busy */</div><div class='hunk'>@@ -453,7 +453,7 @@ static const llc_conn_action_t llc_setup_actions_1[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_SETUP,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -477,7 +477,7 @@ static const llc_conn_action_t llc_setup_actions_2[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_2,</div><div class='hunk'>@@ -498,7 +498,7 @@ static const llc_conn_action_t llc_setup_actions_3[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_3,</div><div class='hunk'>@@ -519,7 +519,7 @@ static const llc_conn_action_t llc_setup_actions_4[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_4,</div><div class='hunk'>@@ -539,7 +539,7 @@ static const llc_conn_action_t llc_setup_actions_5[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_5,</div><div class='hunk'>@@ -560,7 +560,7 @@ static const llc_conn_action_t llc_setup_actions_7[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_SETUP,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_7,</div><div class='hunk'>@@ -581,7 +581,7 @@ static const llc_conn_action_t llc_setup_actions_8[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_setup_state_trans_8 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_setup_state_trans_8 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_setup_ev_qfyrs_8,</div><div class='hunk'>@@ -592,7 +592,7 @@ static struct llc_conn_state_trans llc_setup_state_trans_8 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_setup_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_setup_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_common_state_trans_end,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_end,	/* local busy */</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_end,	/* init_pf_cycle */</div><div class='hunk'>@@ -622,7 +622,7 @@ static const llc_conn_action_t llc_normal_actions_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_1,</div><div class='hunk'>@@ -643,7 +643,7 @@ static const llc_conn_action_t llc_normal_actions_2[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_2,</div><div class='hunk'>@@ -660,7 +660,7 @@ static const llc_conn_ev_qfyr_t llc_normal_ev_qfyrs_2_1[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_normal_actions_2_1[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_2_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_2_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_2_1,</div><div class='hunk'>@@ -680,7 +680,7 @@ static const llc_conn_action_t llc_normal_actions_3[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_3,</div><div class='hunk'>@@ -700,7 +700,7 @@ static const llc_conn_action_t llc_normal_actions_4[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_4,</div><div class='hunk'>@@ -723,7 +723,7 @@ static const llc_conn_action_t llc_normal_actions_5a[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_5a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_5a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_5a,</div><div class='hunk'>@@ -746,7 +746,7 @@ static const llc_conn_action_t llc_normal_actions_5b[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_5b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_5b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_5b,</div><div class='hunk'>@@ -769,7 +769,7 @@ static const llc_conn_action_t llc_normal_actions_5c[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_5c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_5c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_5c,</div><div class='hunk'>@@ -790,7 +790,7 @@ static const llc_conn_action_t llc_normal_actions_6a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_6a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_6a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_6a,</div><div class='hunk'>@@ -811,7 +811,7 @@ static const llc_conn_action_t llc_normal_actions_6b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_6b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_6b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_6b,</div><div class='hunk'>@@ -827,7 +827,7 @@ static const llc_conn_action_t llc_normal_actions_7[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -850,7 +850,7 @@ static const llc_conn_action_t llc_normal_actions_8[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_8a,</div><div class='hunk'>@@ -863,7 +863,7 @@ static const llc_conn_ev_qfyr_t llc_normal_ev_qfyrs_8b[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_8b,</div><div class='hunk'>@@ -884,7 +884,7 @@ static const llc_conn_action_t llc_normal_actions_9a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_9a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_9a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_9a,</div><div class='hunk'>@@ -905,7 +905,7 @@ static const llc_conn_action_t llc_normal_actions_9b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_9b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_9b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_9b,</div><div class='hunk'>@@ -922,7 +922,7 @@ static const llc_conn_action_t llc_normal_actions_10[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_10 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_10 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -937,7 +937,7 @@ static const llc_conn_action_t llc_normal_actions_11a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_11a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_11a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -952,7 +952,7 @@ static const llc_conn_action_t llc_normal_actions_11b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_11b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_11b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -973,7 +973,7 @@ static const llc_conn_action_t llc_normal_actions_11c[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_11c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_11c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_11c,</div><div class='hunk'>@@ -990,7 +990,7 @@ static const llc_conn_action_t llc_normal_actions_12[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_12 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_12 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1005,7 +1005,7 @@ static const llc_conn_action_t llc_normal_actions_13a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_13a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_13a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1020,7 +1020,7 @@ static const llc_conn_action_t llc_normal_actions_13b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_13b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_13b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1040,7 +1040,7 @@ static const llc_conn_action_t llc_normal_actions_13c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_13c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_13c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_13c,</div><div class='hunk'>@@ -1057,7 +1057,7 @@ static const llc_conn_action_t llc_normal_actions_14[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_14 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_14 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1080,7 +1080,7 @@ static const llc_conn_action_t llc_normal_actions_15a[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_15a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_15a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_15a,</div><div class='hunk'>@@ -1103,7 +1103,7 @@ static const llc_conn_action_t llc_normal_actions_15b[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_15b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_15b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_15b,</div><div class='hunk'>@@ -1125,7 +1125,7 @@ static const llc_conn_action_t llc_normal_actions_16a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_16a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_16a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_16a,</div><div class='hunk'>@@ -1147,7 +1147,7 @@ static const llc_conn_action_t llc_normal_actions_16b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_16b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_16b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_16b,</div><div class='hunk'>@@ -1164,7 +1164,7 @@ static const llc_conn_action_t llc_normal_actions_17[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_17 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_17 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1183,7 +1183,7 @@ static const llc_conn_action_t llc_normal_actions_18[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_18 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_18 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_init_p_f_cycle,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_18,</div><div class='hunk'>@@ -1205,7 +1205,7 @@ static const llc_conn_action_t llc_normal_actions_19[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_19 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_19 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_19,</div><div class='hunk'>@@ -1228,7 +1228,7 @@ static const llc_conn_action_t llc_normal_actions_20a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_20a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_20a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_20a,</div><div class='hunk'>@@ -1251,7 +1251,7 @@ static const llc_conn_action_t llc_normal_actions_20b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_20b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_20b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_busy_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_20b,</div><div class='hunk'>@@ -1270,7 +1270,7 @@ static const llc_conn_action_t llc_normal_actions_21[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_normal_state_trans_21 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_normal_state_trans_21 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_tx_buffer_full,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_normal_ev_qfyrs_21,</div><div class='hunk'>@@ -1281,7 +1281,7 @@ static struct llc_conn_state_trans llc_normal_state_trans_21 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_normal_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_normal_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_normal_state_trans_1,	/* Requests */</div><div class='ctx'> 	 [1] = &amp;llc_normal_state_trans_2,</div><div class='ctx'> 	 [2] = &amp;llc_normal_state_trans_2_1,</div><div class='hunk'>@@ -1354,7 +1354,7 @@ static const llc_conn_action_t llc_busy_actions_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_1,</div><div class='hunk'>@@ -1374,7 +1374,7 @@ static const llc_conn_action_t llc_busy_actions_2[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_2,</div><div class='hunk'>@@ -1391,7 +1391,7 @@ static const llc_conn_ev_qfyr_t llc_busy_ev_qfyrs_2_1[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_busy_actions_2_1[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_2_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_2_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_2_1,</div><div class='hunk'>@@ -1411,7 +1411,7 @@ static const llc_conn_action_t llc_busy_actions_3[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_3,</div><div class='hunk'>@@ -1431,7 +1431,7 @@ static const llc_conn_action_t llc_busy_actions_4[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_4,</div><div class='hunk'>@@ -1450,7 +1450,7 @@ static const llc_conn_action_t llc_busy_actions_5[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_5,</div><div class='hunk'>@@ -1469,7 +1469,7 @@ static const llc_conn_action_t llc_busy_actions_6[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_6,</div><div class='hunk'>@@ -1488,7 +1488,7 @@ static const llc_conn_action_t llc_busy_actions_7[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_7,</div><div class='hunk'>@@ -1507,7 +1507,7 @@ static const llc_conn_action_t llc_busy_actions_8[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_8 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_8 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_8,</div><div class='hunk'>@@ -1529,7 +1529,7 @@ static const llc_conn_action_t llc_busy_actions_9a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_9a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_9a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_9a,</div><div class='hunk'>@@ -1551,7 +1551,7 @@ static const llc_conn_action_t llc_busy_actions_9b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_9b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_9b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_9b,</div><div class='hunk'>@@ -1571,7 +1571,7 @@ static const llc_conn_action_t llc_busy_actions_10a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_10a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_10a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_10a,</div><div class='hunk'>@@ -1591,7 +1591,7 @@ static const llc_conn_action_t llc_busy_actions_10b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_10b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_10b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_10b,</div><div class='hunk'>@@ -1606,7 +1606,7 @@ static const llc_conn_action_t llc_busy_actions_11[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_11 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_11 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1624,7 +1624,7 @@ static const llc_conn_action_t llc_busy_actions_12[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_12 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_12 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1649,7 +1649,7 @@ static const llc_conn_action_t llc_busy_actions_13a[] = {</div><div class='ctx'> 	[8] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_13a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_13a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_13a,</div><div class='hunk'>@@ -1674,7 +1674,7 @@ static const llc_conn_action_t llc_busy_actions_13b[] = {</div><div class='ctx'> 	[8] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_13b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_13b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_13b,</div><div class='hunk'>@@ -1697,7 +1697,7 @@ static const llc_conn_action_t llc_busy_actions_14a[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_14a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_14a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_14a,</div><div class='hunk'>@@ -1720,7 +1720,7 @@ static const llc_conn_action_t llc_busy_actions_14b[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_14b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_14b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_14b,</div><div class='hunk'>@@ -1735,7 +1735,7 @@ static const llc_conn_action_t llc_busy_actions_15a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_15a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_15a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1750,7 +1750,7 @@ static const llc_conn_action_t llc_busy_actions_15b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_15b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_15b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1770,7 +1770,7 @@ static const llc_conn_action_t llc_busy_actions_15c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_15c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_15c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_15c,</div><div class='hunk'>@@ -1785,7 +1785,7 @@ static const llc_conn_action_t llc_busy_actions_16[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_16 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_16 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1800,7 +1800,7 @@ static const llc_conn_action_t llc_busy_actions_17a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_17a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_17a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1815,7 +1815,7 @@ static const llc_conn_action_t llc_busy_actions_17b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_17b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_17b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1835,7 +1835,7 @@ static const llc_conn_action_t llc_busy_actions_17c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_17c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_17c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_17c,</div><div class='hunk'>@@ -1850,7 +1850,7 @@ static const llc_conn_action_t llc_busy_actions_18[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_18 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_18 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1872,7 +1872,7 @@ static const llc_conn_action_t llc_busy_actions_19a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_19a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_19a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_19a,</div><div class='hunk'>@@ -1894,7 +1894,7 @@ static const llc_conn_action_t llc_busy_actions_19b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_19b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_19b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_19b,</div><div class='hunk'>@@ -1915,7 +1915,7 @@ static const llc_conn_action_t llc_busy_actions_20a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_20a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_20a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_20a,</div><div class='hunk'>@@ -1936,7 +1936,7 @@ static const llc_conn_action_t llc_busy_actions_20b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_20b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_20b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_20b,</div><div class='hunk'>@@ -1953,7 +1953,7 @@ static const llc_conn_action_t llc_busy_actions_21[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_21 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_21 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -1972,7 +1972,7 @@ static const llc_conn_action_t llc_busy_actions_22[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_22 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_22 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_init_p_f_cycle,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_22,</div><div class='hunk'>@@ -1993,7 +1993,7 @@ static const llc_conn_action_t llc_busy_actions_23[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_23 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_23 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_23,</div><div class='hunk'>@@ -2015,7 +2015,7 @@ static const llc_conn_action_t llc_busy_actions_24a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_24a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_24a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_24a,</div><div class='hunk'>@@ -2037,7 +2037,7 @@ static const llc_conn_action_t llc_busy_actions_24b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_24b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_24b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_busy_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_24b,</div><div class='hunk'>@@ -2060,7 +2060,7 @@ static const llc_conn_action_t llc_busy_actions_25[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_25 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_25 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rej_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_25,</div><div class='hunk'>@@ -2079,7 +2079,7 @@ static const llc_conn_action_t llc_busy_actions_26[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_busy_state_trans_26 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_busy_state_trans_26 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rej_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_busy_ev_qfyrs_26,</div><div class='hunk'>@@ -2090,7 +2090,7 @@ static struct llc_conn_state_trans llc_busy_state_trans_26 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_busy_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_busy_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_common_state_trans_1,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_2,</div><div class='ctx'> 	 [2] = &amp;llc_busy_state_trans_1,</div><div class='hunk'>@@ -2166,7 +2166,7 @@ static const llc_conn_action_t llc_reject_actions_1[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_1,</div><div class='hunk'>@@ -2185,7 +2185,7 @@ static const llc_conn_action_t llc_reject_actions_2[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_2,</div><div class='hunk'>@@ -2202,7 +2202,7 @@ static const llc_conn_ev_qfyr_t llc_reject_ev_qfyrs_2_1[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_reject_actions_2_1[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_2_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_2_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_2_1,</div><div class='hunk'>@@ -2222,7 +2222,7 @@ static const llc_conn_action_t llc_reject_actions_3[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_3,</div><div class='hunk'>@@ -2241,7 +2241,7 @@ static const llc_conn_action_t llc_reject_actions_4[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_4,</div><div class='hunk'>@@ -2256,7 +2256,7 @@ static const llc_conn_action_t llc_reject_actions_5a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_5a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_5a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2271,7 +2271,7 @@ static const llc_conn_action_t llc_reject_actions_5b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_5b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_5b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2291,7 +2291,7 @@ static const llc_conn_action_t llc_reject_actions_5c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_5c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_5c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_5c,</div><div class='hunk'>@@ -2305,7 +2305,7 @@ static const llc_conn_action_t llc_reject_actions_6[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2330,7 +2330,7 @@ static const llc_conn_action_t llc_reject_actions_7a[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_7a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_7a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_7a,</div><div class='hunk'>@@ -2354,7 +2354,7 @@ static const llc_conn_action_t llc_reject_actions_7b[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_7b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_7b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_7b,</div><div class='hunk'>@@ -2376,7 +2376,7 @@ static const llc_conn_action_t llc_reject_actions_8a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_8a,</div><div class='hunk'>@@ -2398,7 +2398,7 @@ static const llc_conn_action_t llc_reject_actions_8b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_8b,</div><div class='hunk'>@@ -2415,7 +2415,7 @@ static const llc_conn_action_t llc_reject_actions_9[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_9 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_9 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2430,7 +2430,7 @@ static const llc_conn_action_t llc_reject_actions_10a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_10a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_10a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2445,7 +2445,7 @@ static const llc_conn_action_t llc_reject_actions_10b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_10b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_10b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2465,7 +2465,7 @@ static const llc_conn_action_t llc_reject_actions_10c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_10c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_10c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_10c,</div><div class='hunk'>@@ -2480,7 +2480,7 @@ static const llc_conn_action_t llc_reject_actions_11[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_11 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_11 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2495,7 +2495,7 @@ static const llc_conn_action_t llc_reject_actions_12a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_12a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_12a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2510,7 +2510,7 @@ static const llc_conn_action_t llc_reject_actions_12b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_12b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_12b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2530,7 +2530,7 @@ static const llc_conn_action_t llc_reject_actions_12c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_12c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_12c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_12c,</div><div class='hunk'>@@ -2545,7 +2545,7 @@ static const llc_conn_action_t llc_reject_actions_13[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_13 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_13 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2567,7 +2567,7 @@ static const llc_conn_action_t llc_reject_actions_14a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_14a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_14a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_14a,</div><div class='hunk'>@@ -2589,7 +2589,7 @@ static const llc_conn_action_t llc_reject_actions_14b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_14b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_14b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_14b,</div><div class='hunk'>@@ -2610,7 +2610,7 @@ static const llc_conn_action_t llc_reject_actions_15a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_15a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_15a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_15a,</div><div class='hunk'>@@ -2631,7 +2631,7 @@ static const llc_conn_action_t llc_reject_actions_15b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_15b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_15b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_15b,</div><div class='hunk'>@@ -2647,7 +2647,7 @@ static const llc_conn_action_t llc_reject_actions_16[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_16 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_16 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2666,7 +2666,7 @@ static const llc_conn_action_t llc_reject_actions_17[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_17 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_17 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_init_p_f_cycle,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_17,</div><div class='hunk'>@@ -2688,7 +2688,7 @@ static const llc_conn_action_t llc_reject_actions_18[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_18 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_18 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rej_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_18,</div><div class='hunk'>@@ -2710,7 +2710,7 @@ static const llc_conn_action_t llc_reject_actions_19[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_19 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_19 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_19,</div><div class='hunk'>@@ -2733,7 +2733,7 @@ static const llc_conn_action_t llc_reject_actions_20a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_20a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_20a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_20a,</div><div class='hunk'>@@ -2756,7 +2756,7 @@ static const llc_conn_action_t llc_reject_actions_20b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_reject_state_trans_20b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_reject_state_trans_20b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_busy_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_reject_ev_qfyrs_20b,</div><div class='hunk'>@@ -2767,7 +2767,7 @@ static struct llc_conn_state_trans llc_reject_state_trans_20b = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_reject_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_reject_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_common_state_trans_1,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_2,</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_end,</div><div class='hunk'>@@ -2834,7 +2834,7 @@ static const llc_conn_ev_qfyr_t llc_await_ev_qfyrs_1_0[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_await_actions_1_0[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_1_0 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_1_0 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_await_ev_qfyrs_1_0,</div><div class='hunk'>@@ -2848,7 +2848,7 @@ static const llc_conn_action_t llc_await_actions_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2867,7 +2867,7 @@ static const llc_conn_action_t llc_await_actions_2[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2883,7 +2883,7 @@ static const llc_conn_action_t llc_await_actions_3a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_3a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_3a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2899,7 +2899,7 @@ static const llc_conn_action_t llc_await_actions_3b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_3b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_3b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2916,7 +2916,7 @@ static const llc_conn_action_t llc_await_actions_4[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2935,7 +2935,7 @@ static const llc_conn_action_t llc_await_actions_5[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2952,7 +2952,7 @@ static const llc_conn_action_t llc_await_actions_6a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_6a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_6a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2969,7 +2969,7 @@ static const llc_conn_action_t llc_await_actions_6b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_6b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_6b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -2986,7 +2986,7 @@ static const llc_conn_action_t llc_await_actions_7[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3003,7 +3003,7 @@ static const llc_conn_action_t llc_await_actions_8a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3020,7 +3020,7 @@ static const llc_conn_action_t llc_await_actions_8b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3035,7 +3035,7 @@ static const llc_conn_action_t llc_await_actions_9a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_9a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_9a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3050,7 +3050,7 @@ static const llc_conn_action_t llc_await_actions_9b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_9b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_9b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3065,7 +3065,7 @@ static const llc_conn_action_t llc_await_actions_9c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_9c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_9c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3080,7 +3080,7 @@ static const llc_conn_action_t llc_await_actions_9d[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_9d = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_9d = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3096,7 +3096,7 @@ static const llc_conn_action_t llc_await_actions_10a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_10a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_10a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3112,7 +3112,7 @@ static const llc_conn_action_t llc_await_actions_10b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_10b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_10b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3128,7 +3128,7 @@ static const llc_conn_action_t llc_await_actions_11[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_11 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_11 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3143,7 +3143,7 @@ static const llc_conn_action_t llc_await_actions_12a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_12a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_12a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3158,7 +3158,7 @@ static const llc_conn_action_t llc_await_actions_12b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_12b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_12b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3174,7 +3174,7 @@ static const llc_conn_action_t llc_await_actions_13[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_13 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_13 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3194,7 +3194,7 @@ static const llc_conn_action_t llc_await_actions_14[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_state_trans_14 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_state_trans_14 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_await_ev_qfyrs_14,</div><div class='hunk'>@@ -3205,7 +3205,7 @@ static struct llc_conn_state_trans llc_await_state_trans_14 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_await_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_await_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_common_state_trans_1,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_2,</div><div class='ctx'> 	 [2] = &amp;llc_await_state_trans_1_0,</div><div class='hunk'>@@ -3263,7 +3263,7 @@ static const llc_conn_ev_qfyr_t llc_await_busy_ev_qfyrs_1_0[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_await_busy_actions_1_0[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_1_0 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_1_0 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_await_busy_ev_qfyrs_1_0,</div><div class='hunk'>@@ -3282,7 +3282,7 @@ static const llc_conn_action_t llc_await_busy_actions_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_await_busy_ev_qfyrs_1,</div><div class='hunk'>@@ -3300,7 +3300,7 @@ static const llc_conn_action_t llc_await_busy_actions_2[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = llc_await_busy_ev_qfyrs_2,</div><div class='hunk'>@@ -3318,7 +3318,7 @@ static const llc_conn_action_t llc_await_busy_actions_3[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_cleared,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_await_busy_ev_qfyrs_3,</div><div class='hunk'>@@ -3337,7 +3337,7 @@ static const llc_conn_action_t llc_await_busy_actions_4[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3353,7 +3353,7 @@ static const llc_conn_action_t llc_await_busy_actions_5a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_5a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_5a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3369,7 +3369,7 @@ static const llc_conn_action_t llc_await_busy_actions_5b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_5b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_5b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3385,7 +3385,7 @@ static const llc_conn_action_t llc_await_busy_actions_6[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3406,7 +3406,7 @@ static const llc_conn_action_t llc_await_busy_actions_7[] = {</div><div class='ctx'> 	[9] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3424,7 +3424,7 @@ static const llc_conn_action_t llc_await_busy_actions_8a[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3442,7 +3442,7 @@ static const llc_conn_action_t llc_await_busy_actions_8b[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3460,7 +3460,7 @@ static const llc_conn_action_t llc_await_busy_actions_9[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_9 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_9 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3477,7 +3477,7 @@ static const llc_conn_action_t llc_await_busy_actions_10a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_10a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_10a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3494,7 +3494,7 @@ static const llc_conn_action_t llc_await_busy_actions_10b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_10b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_10b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3509,7 +3509,7 @@ static const llc_conn_action_t llc_await_busy_actions_11a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_11a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_11a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3524,7 +3524,7 @@ static const llc_conn_action_t llc_await_busy_actions_11b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_11b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_11b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3539,7 +3539,7 @@ static const llc_conn_action_t llc_await_busy_actions_11c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_11c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_11c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3554,7 +3554,7 @@ static const llc_conn_action_t llc_await_busy_actions_11d[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_11d = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_11d = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3570,7 +3570,7 @@ static const llc_conn_action_t llc_await_busy_actions_12a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_12a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_12a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3586,7 +3586,7 @@ static const llc_conn_action_t llc_await_busy_actions_12b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_12b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_12b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3602,7 +3602,7 @@ static const llc_conn_action_t llc_await_busy_actions_13[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_13 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_13 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3617,7 +3617,7 @@ static const llc_conn_action_t llc_await_busy_actions_14a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_14a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_14a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3632,7 +3632,7 @@ static const llc_conn_action_t llc_await_busy_actions_14b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_14b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_14b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3648,7 +3648,7 @@ static const llc_conn_action_t llc_await_busy_actions_15[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_15 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_15 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3668,7 +3668,7 @@ static const llc_conn_action_t llc_await_busy_actions_16[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_busy_state_trans_16 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_busy_state_trans_16 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = llc_await_busy_ev_qfyrs_16,</div><div class='hunk'>@@ -3679,7 +3679,7 @@ static struct llc_conn_state_trans llc_await_busy_state_trans_16 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_await_busy_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_await_busy_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_common_state_trans_1,		/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_2,</div><div class='ctx'> 	 [2] = &amp;llc_await_busy_state_trans_1_0,</div><div class='hunk'>@@ -3739,7 +3739,7 @@ static const llc_conn_ev_qfyr_t llc_await_reject_ev_qfyrs_1_0[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_await_reject_actions_1_0[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_reject_state_trans_1_0 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_reject_state_trans_1_0 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_await_reject_ev_qfyrs_1_0,</div><div class='hunk'>@@ -3753,7 +3753,7 @@ static const llc_conn_action_t llc_await_rejct_actions_1[] = {</div><div class='ctx'> 	[2] = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_local_busy_detected,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_BUSY,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3767,7 +3767,7 @@ static const llc_conn_action_t llc_await_rejct_actions_2a[] = {</div><div class='ctx'> 	[2] = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_2a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_2a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3781,7 +3781,7 @@ static const llc_conn_action_t llc_await_rejct_actions_2b[] = {</div><div class='ctx'> 	[2] = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_2b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_2b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3796,7 +3796,7 @@ static const llc_conn_action_t llc_await_rejct_actions_3[] = {</div><div class='ctx'> 	[3] = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3816,7 +3816,7 @@ static const llc_conn_action_t llc_await_rejct_actions_4[] = {</div><div class='ctx'> 	[8] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3834,7 +3834,7 @@ static const llc_conn_action_t llc_await_rejct_actions_5a[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_5a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_5a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3852,7 +3852,7 @@ static const llc_conn_action_t llc_await_rejct_actions_5b[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_5b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_5b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3870,7 +3870,7 @@ static const llc_conn_action_t llc_await_rejct_actions_6[] = {</div><div class='ctx'> 	[6] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3887,7 +3887,7 @@ static const llc_conn_action_t llc_await_rejct_actions_7a[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_7a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_7a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3904,7 +3904,7 @@ static const llc_conn_action_t llc_await_rejct_actions_7b[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_7b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_7b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3921,7 +3921,7 @@ static const llc_conn_action_t llc_await_rejct_actions_7c[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_7c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_7c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3936,7 +3936,7 @@ static const llc_conn_action_t llc_await_rejct_actions_8a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_8a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_8a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3951,7 +3951,7 @@ static const llc_conn_action_t llc_await_rejct_actions_8b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_8b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_8b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3966,7 +3966,7 @@ static const llc_conn_action_t llc_await_rejct_actions_8c[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_8c = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_8c = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3981,7 +3981,7 @@ static const llc_conn_action_t llc_await_rejct_actions_8d[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_8d = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_8d = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -3997,7 +3997,7 @@ static const llc_conn_action_t llc_await_rejct_actions_9a[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_9a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_9a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4013,7 +4013,7 @@ static const llc_conn_action_t llc_await_rejct_actions_9b[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_9b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_9b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rej_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4029,7 +4029,7 @@ static const llc_conn_action_t llc_await_rejct_actions_10[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_10 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_10 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4044,7 +4044,7 @@ static const llc_conn_action_t llc_await_rejct_actions_11a[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_11a = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_11a = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4059,7 +4059,7 @@ static const llc_conn_action_t llc_await_rejct_actions_11b[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_11b = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_11b = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_rsp_fbit_set_0,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4075,7 +4075,7 @@ static const llc_conn_action_t llc_await_rejct_actions_12[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_12 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_12 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_rnr_cmd_pbit_set_1,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4095,7 +4095,7 @@ static const llc_conn_action_t llc_await_rejct_actions_13[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_await_rejct_state_trans_13 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_await_rejct_state_trans_13 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_p_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_AWAIT_REJ,</div><div class='ctx'> 	.ev_qualifiers = llc_await_rejct_ev_qfyrs_13,</div><div class='hunk'>@@ -4106,7 +4106,7 @@ static struct llc_conn_state_trans llc_await_rejct_state_trans_13 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_await_rejct_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_await_rejct_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_await_reject_state_trans_1_0,</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_1,		/* requests */</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_2,</div><div class='hunk'>@@ -4171,7 +4171,7 @@ static const llc_conn_action_t llc_d_conn_actions_1[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_1,</div><div class='hunk'>@@ -4194,7 +4194,7 @@ static const llc_conn_action_t llc_d_conn_actions_1_1[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_1_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_1_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_1_1,</div><div class='hunk'>@@ -4218,7 +4218,7 @@ static const llc_conn_action_t llc_d_conn_actions_2[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_2,</div><div class='hunk'>@@ -4241,7 +4241,7 @@ static const llc_conn_action_t llc_d_conn_actions_2_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_2_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_2_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_2_1,</div><div class='hunk'>@@ -4254,7 +4254,7 @@ static const llc_conn_action_t llc_d_conn_actions_3[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_D_CONN,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4277,7 +4277,7 @@ static const llc_conn_action_t llc_d_conn_actions_4[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_4,</div><div class='hunk'>@@ -4299,7 +4299,7 @@ static const llc_conn_action_t llc_d_conn_actions_4_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_4_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_4_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_4_1,</div><div class='hunk'>@@ -4318,7 +4318,7 @@ static const llc_conn_ev_qfyr_t llc_d_conn_ev_qfyrs_5[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_d_conn_actions_5[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_D_CONN,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_5,</div><div class='hunk'>@@ -4338,7 +4338,7 @@ static const llc_conn_action_t llc_d_conn_actions_6[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_D_CONN,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_6,</div><div class='hunk'>@@ -4359,7 +4359,7 @@ static const llc_conn_action_t llc_d_conn_actions_7[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_7,</div><div class='hunk'>@@ -4379,7 +4379,7 @@ static const llc_conn_action_t llc_d_conn_actions_8[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_d_conn_state_trans_8 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_d_conn_state_trans_8 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_d_conn_ev_qfyrs_8,</div><div class='hunk'>@@ -4390,7 +4390,7 @@ static struct llc_conn_state_trans llc_d_conn_state_trans_8 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_d_conn_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_d_conn_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_d_conn_state_trans_5,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_end,</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_end,	/* Local busy */</div><div class='hunk'>@@ -4419,7 +4419,7 @@ static const llc_conn_action_t llc_rst_actions_1[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4447,7 +4447,7 @@ static const llc_conn_action_t llc_rst_actions_2[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_2,</div><div class='hunk'>@@ -4475,7 +4475,7 @@ static const llc_conn_action_t llc_rst_actions_2_1[] = {</div><div class='ctx'> 	[7] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_2_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_2_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_ua_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_2_1,</div><div class='hunk'>@@ -4495,7 +4495,7 @@ static const llc_conn_action_t llc_rst_actions_3[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_3,</div><div class='hunk'>@@ -4518,7 +4518,7 @@ static const llc_conn_action_t llc_rst_actions_4[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_4,</div><div class='hunk'>@@ -4541,7 +4541,7 @@ static const llc_conn_action_t llc_rst_actions_4_1[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_4_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_4_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_4_1,</div><div class='hunk'>@@ -4564,7 +4564,7 @@ static const llc_conn_action_t llc_rst_actions_5[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_5,</div><div class='hunk'>@@ -4586,7 +4586,7 @@ static const llc_conn_action_t llc_rst_actions_5_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_5_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_5_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_5_1,</div><div class='hunk'>@@ -4602,7 +4602,7 @@ static const llc_conn_ev_qfyr_t llc_rst_ev_qfyrs_6[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_rst_actions_6[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_6,</div><div class='hunk'>@@ -4623,7 +4623,7 @@ static const llc_conn_action_t llc_rst_actions_7[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_7,</div><div class='hunk'>@@ -4644,7 +4644,7 @@ static const llc_conn_action_t llc_rst_actions_8[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_8 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_8 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_8,</div><div class='hunk'>@@ -4665,7 +4665,7 @@ static const llc_conn_action_t llc_rst_actions_8_1[] = {</div><div class='ctx'> 	[2] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_rst_state_trans_8_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_rst_state_trans_8_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = llc_rst_ev_qfyrs_8_1,</div><div class='hunk'>@@ -4676,7 +4676,7 @@ static struct llc_conn_state_trans llc_rst_state_trans_8_1 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_rst_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_rst_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_rst_state_trans_6,		/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_end,</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_end,	/* Local busy */</div><div class='hunk'>@@ -4710,7 +4710,7 @@ static const llc_conn_action_t llc_error_actions_1[] = {</div><div class='ctx'> 	[8] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_sabme_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_NORMAL,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4726,7 +4726,7 @@ static const llc_conn_action_t llc_error_actions_2[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_2 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_2 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_disc_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4741,7 +4741,7 @@ static const llc_conn_action_t llc_error_actions_3[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_3 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_3 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_dm_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4757,7 +4757,7 @@ static const llc_conn_action_t llc_error_actions_4[] = {</div><div class='ctx'> 	[4] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_4 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_4 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_frmr_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4770,7 +4770,7 @@ static const llc_conn_action_t llc_error_actions_5[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_5 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_5 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_xxx_cmd_pbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4778,7 +4778,7 @@ static struct llc_conn_state_trans llc_error_state_trans_5 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* State transitions for LLC_CONN_EV_RX_XXX_RSP_Fbit_SET_X event */</div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_6 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_6 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_rx_xxx_rsp_fbit_set_x,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4798,7 +4798,7 @@ static const llc_conn_action_t llc_error_actions_7[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_7 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_7 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = llc_error_ev_qfyrs_7,</div><div class='hunk'>@@ -4820,7 +4820,7 @@ static const llc_conn_action_t llc_error_actions_8[] = {</div><div class='ctx'> 	[5] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_8 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_8 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_ack_tmr_exp,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_RESET,</div><div class='ctx'> 	.ev_qualifiers = llc_error_ev_qfyrs_8,</div><div class='hunk'>@@ -4836,7 +4836,7 @@ static const llc_conn_ev_qfyr_t llc_error_ev_qfyrs_9[] = {</div><div class='ctx'> /* just one member, NULL, .bss zeroes it */</div><div class='ctx'> static const llc_conn_action_t llc_error_actions_9[1];</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_error_state_trans_9 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_error_state_trans_9 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_data_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ERROR,</div><div class='ctx'> 	.ev_qualifiers = llc_error_ev_qfyrs_9,</div><div class='hunk'>@@ -4847,7 +4847,7 @@ static struct llc_conn_state_trans llc_error_state_trans_9 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_error_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_error_state_transitions[] = {</div><div class='ctx'> 	 [0] = &amp;llc_error_state_trans_9,	/* Request */</div><div class='ctx'> 	 [1] = &amp;llc_common_state_trans_end,</div><div class='ctx'> 	 [2] = &amp;llc_common_state_trans_end,	/* Local busy */</div><div class='hunk'>@@ -4873,7 +4873,7 @@ static const llc_conn_action_t llc_temp_actions_1[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_conn_state_trans llc_temp_state_trans_1 = {</div><div class='add'>+static const struct llc_conn_state_trans llc_temp_state_trans_1 = {</div><div class='ctx'> 	.ev	       = llc_conn_ev_disc_req,</div><div class='ctx'> 	.next_state    = LLC_CONN_STATE_ADM,</div><div class='ctx'> 	.ev_qualifiers = NONE,</div><div class='hunk'>@@ -4884,7 +4884,7 @@ static struct llc_conn_state_trans llc_temp_state_trans_1 = {</div><div class='ctx'>  * Array of pointers;</div><div class='ctx'>  * one to each transition</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_temp_state_transitions[] = {</div><div class='add'>+static const struct llc_conn_state_trans *llc_temp_state_transitions[] = {</div><div class='ctx'> 	[0] = &amp;llc_temp_state_trans_1,		/* requests */</div><div class='ctx'> 	[1] = &amp;llc_common_state_trans_end,</div><div class='ctx'> 	[2] = &amp;llc_common_state_trans_end,	/* local busy */</div><div class='head'>diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c<br/>index c0ac522b48a1..5c0ac243b248 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_conn.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_conn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_conn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_conn.c</a></div><div class='hunk'>@@ -14,14 +14,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/llc_sap.h&gt;</div><div class='del'>-#include &lt;net/llc_conn.h&gt;</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/tcp_states.h&gt;</div><div class='del'>-#include &lt;net/llc_c_ev.h&gt;</div><div class='add'>+#include &lt;net/llc.h&gt;</div><div class='ctx'> #include &lt;net/llc_c_ac.h&gt;</div><div class='add'>+#include &lt;net/llc_c_ev.h&gt;</div><div class='ctx'> #include &lt;net/llc_c_st.h&gt;</div><div class='add'>+#include &lt;net/llc_conn.h&gt;</div><div class='ctx'> #include &lt;net/llc_pdu.h&gt;</div><div class='add'>+#include &lt;net/llc_sap.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tcp_states.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> #define dprintk(args...) printk(KERN_DEBUG args)</div><div class='hunk'>@@ -30,13 +31,13 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int llc_find_offset(int state, int ev_type);</div><div class='del'>-static int llc_conn_send_pdus(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+static void llc_conn_send_pdus(struct sock *sk);</div><div class='ctx'> static int llc_conn_service(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> static int llc_exec_conn_trans_actions(struct sock *sk,</div><div class='del'>-				       struct llc_conn_state_trans *trans,</div><div class='add'>+				       const struct llc_conn_state_trans *trans,</div><div class='ctx'> 				       struct sk_buff *ev);</div><div class='del'>-static struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,</div><div class='del'>-							struct sk_buff *skb);</div><div class='add'>+static const struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,</div><div class='add'>+							      struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> /* Offset table on connection states transition diagram */</div><div class='ctx'> static int llc_offset_table[NBR_CONN_STATES][NBR_CONN_EV];</div><div class='hunk'>@@ -55,6 +56,8 @@ int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;</div><div class='ctx'>  *	(executing it's actions and changing state), upper layer will be</div><div class='ctx'>  *	indicated or confirmed, if needed. Returns 0 for success, 1 for</div><div class='ctx'>  *	failure. The socket lock has to be held before calling this function.</div><div class='add'>+ *</div><div class='add'>+ *	This function always consumes a reference to the skb.</div><div class='ctx'>  */</div><div class='ctx'> int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -62,12 +65,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(skb-&gt;sk);</div><div class='ctx'> 	struct llc_conn_state_ev *ev = llc_conn_ev(skb);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We have to hold the skb, because llc_conn_service will kfree it in</div><div class='del'>-	 * the sending path and we need to look at the skb-&gt;cb, where we encode</div><div class='del'>-	 * llc_conn_state_ev.</div><div class='del'>-	 */</div><div class='del'>-	skb_get(skb);</div><div class='ctx'> 	ev-&gt;ind_prim = ev-&gt;cfm_prim = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send event to state machine</div><div class='hunk'>@@ -75,21 +72,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	rc = llc_conn_service(skb-&gt;sk, skb);</div><div class='ctx'> 	if (unlikely(rc != 0)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: llc_conn_service failed\n", __func__);</div><div class='del'>-		goto out_kfree_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!ev-&gt;ind_prim &amp;&amp; !ev-&gt;cfm_prim)) {</div><div class='del'>-		/* indicate or confirm not required */</div><div class='del'>-		if (!skb-&gt;next)</div><div class='del'>-			goto out_kfree_skb;</div><div class='ctx'> 		goto out_skb_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ev-&gt;ind_prim &amp;&amp; ev-&gt;cfm_prim)) /* Paranoia */</div><div class='del'>-		skb_get(skb);</div><div class='del'>-</div><div class='ctx'> 	switch (ev-&gt;ind_prim) {</div><div class='ctx'> 	case LLC_DATA_PRIM:</div><div class='add'>+		skb_get(skb);</div><div class='ctx'> 		llc_save_primitive(sk, skb, LLC_DATA_PRIM);</div><div class='ctx'> 		if (unlikely(sock_queue_rcv_skb(sk, skb))) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -106,6 +94,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * skb-&gt;sk pointing to the newly created struct sock in</div><div class='ctx'> 		 * llc_conn_handler. -acme</div><div class='ctx'> 		 */</div><div class='add'>+		skb_get(skb);</div><div class='ctx'> 		skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='ctx'> 		sk-&gt;sk_state_change(sk);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -121,7 +110,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 				sk-&gt;sk_state_change(sk);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		kfree_skb(skb);</div><div class='ctx'> 		sock_put(sk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LLC_RESET_PRIM:</div><div class='hunk'>@@ -130,14 +118,11 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * RESET is not being notified to upper layers for now</div><div class='ctx'> 		 */</div><div class='ctx'> 		printk(KERN_INFO "%s: received a reset ind!\n", __func__);</div><div class='del'>-		kfree_skb(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (ev-&gt;ind_prim) {</div><div class='add'>+		if (ev-&gt;ind_prim)</div><div class='ctx'> 			printk(KERN_INFO "%s: received unknown %d prim!\n",</div><div class='ctx'> 				__func__, ev-&gt;ind_prim);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		}</div><div class='ctx'> 		/* No indication */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -179,25 +164,22 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		printk(KERN_INFO "%s: received a reset conf!\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (ev-&gt;cfm_prim) {</div><div class='add'>+		if (ev-&gt;cfm_prim)</div><div class='ctx'> 			printk(KERN_INFO "%s: received unknown %d prim!\n",</div><div class='ctx'> 					__func__, ev-&gt;cfm_prim);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		goto out_skb_put; /* No confirmation */</div><div class='add'>+		/* No confirmation */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-out_kfree_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='ctx'> out_skb_put:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+void llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* queue PDU to send to MAC layer */</div><div class='ctx'> 	skb_queue_tail(&amp;sk-&gt;sk_write_queue, skb);</div><div class='del'>-	return llc_conn_send_pdus(sk, skb);</div><div class='add'>+	llc_conn_send_pdus(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -255,7 +237,7 @@ void llc_conn_resend_i_pdu_as_cmd(struct sock *sk, u8 nr, u8 first_p_bit)</div><div class='ctx'> 	if (howmany_resend &gt; 0)</div><div class='ctx'> 		llc-&gt;vS = (llc-&gt;vS + 1) % LLC_2_SEQ_NBR_MODULO;</div><div class='ctx'> 	/* any PDUs to re-send are queued up; start sending to MAC */</div><div class='del'>-	llc_conn_send_pdus(sk, NULL);</div><div class='add'>+	llc_conn_send_pdus(sk);</div><div class='ctx'> out:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -296,15 +278,15 @@ void llc_conn_resend_i_pdu_as_rsp(struct sock *sk, u8 nr, u8 first_f_bit)</div><div class='ctx'> 	if (howmany_resend &gt; 0)</div><div class='ctx'> 		llc-&gt;vS = (llc-&gt;vS + 1) % LLC_2_SEQ_NBR_MODULO;</div><div class='ctx'> 	/* any PDUs to re-send are queued up; start sending to MAC */</div><div class='del'>-	llc_conn_send_pdus(sk, NULL);</div><div class='add'>+	llc_conn_send_pdus(sk);</div><div class='ctx'> out:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	llc_conn_remove_acked_pdus - Removes acknowledged pdus from tx queue</div><div class='ctx'>  *	@sk: active connection</div><div class='del'>- *	nr: NR</div><div class='del'>- *	how_many_unacked: size of pdu_unack_q after removing acked pdus</div><div class='add'>+ *	@nr: NR</div><div class='add'>+ *	@how_many_unacked: size of pdu_unack_q after removing acked pdus</div><div class='ctx'>  *</div><div class='ctx'>  *	Removes acknowledged pdus from transmit queue (pdu_unack_q). Returns</div><div class='ctx'>  *	the number of pdus that removed from queue.</div><div class='hunk'>@@ -340,16 +322,12 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  *	llc_conn_send_pdus - Sends queued PDUs</div><div class='ctx'>  *	@sk: active connection</div><div class='del'>- *	@hold_skb: the skb held by caller, or NULL if does not care</div><div class='ctx'>  *</div><div class='del'>- *	Sends queued pdus to MAC layer for transmission. When @hold_skb is</div><div class='del'>- *	NULL, always return 0. Otherwise, return 0 if @hold_skb is sent</div><div class='del'>- *	successfully, or 1 for failure.</div><div class='add'>+ *	Sends queued pdus to MAC layer for transmission.</div><div class='ctx'>  */</div><div class='del'>-static int llc_conn_send_pdus(struct sock *sk, struct sk_buff *hold_skb)</div><div class='add'>+static void llc_conn_send_pdus(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;sk-&gt;sk_write_queue)) != NULL) {</div><div class='ctx'> 		struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);</div><div class='hunk'>@@ -361,20 +339,10 @@ static int llc_conn_send_pdus(struct sock *sk, struct sk_buff *hold_skb)</div><div class='ctx'> 			skb_queue_tail(&amp;llc_sk(sk)-&gt;pdu_unack_q, skb);</div><div class='ctx'> 			if (!skb2)</div><div class='ctx'> 				break;</div><div class='del'>-			dev_queue_xmit(skb2);</div><div class='del'>-		} else {</div><div class='del'>-			bool is_target = skb == hold_skb;</div><div class='del'>-			int rc;</div><div class='del'>-</div><div class='del'>-			if (is_target)</div><div class='del'>-				skb_get(skb);</div><div class='del'>-			rc = dev_queue_xmit(skb);</div><div class='del'>-			if (is_target)</div><div class='del'>-				ret = rc;</div><div class='add'>+			skb = skb2;</div><div class='ctx'> 		}</div><div class='add'>+		dev_queue_xmit(skb);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -388,9 +356,9 @@ static int llc_conn_send_pdus(struct sock *sk, struct sk_buff *hold_skb)</div><div class='ctx'>  */</div><div class='ctx'> static int llc_conn_service(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int rc = 1;</div><div class='add'>+	const struct llc_conn_state_trans *trans;</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='del'>-	struct llc_conn_state_trans *trans;</div><div class='add'>+	int rc = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (llc-&gt;state &gt; NBR_CONN_STATES)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -416,10 +384,10 @@ out:</div><div class='ctx'>  *	This function finds transition that matches with happened event.</div><div class='ctx'>  *	Returns pointer to found transition on success, %NULL otherwise.</div><div class='ctx'>  */</div><div class='del'>-static struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,</div><div class='del'>-							struct sk_buff *skb)</div><div class='add'>+static const struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,</div><div class='add'>+							      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct llc_conn_state_trans **next_trans;</div><div class='add'>+	const struct llc_conn_state_trans **next_trans;</div><div class='ctx'> 	const llc_conn_ev_qfyr_t *next_qualifier;</div><div class='ctx'> 	struct llc_conn_state_ev *ev = llc_conn_ev(skb);</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='hunk'>@@ -464,7 +432,7 @@ static struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,</div><div class='ctx'>  *	success, 1 to indicate failure of at least one action.</div><div class='ctx'>  */</div><div class='ctx'> static int llc_exec_conn_trans_actions(struct sock *sk,</div><div class='del'>-				       struct llc_conn_state_trans *trans,</div><div class='add'>+				       const struct llc_conn_state_trans *trans,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -486,11 +454,13 @@ static int llc_exec_conn_trans_actions(struct sock *sk,</div><div class='ctx'> static inline bool llc_estab_match(const struct llc_sap *sap,</div><div class='ctx'> 				   const struct llc_addr *daddr,</div><div class='ctx'> 				   const struct llc_addr *laddr,</div><div class='del'>-				   const struct sock *sk)</div><div class='add'>+				   const struct sock *sk,</div><div class='add'>+				   const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return llc-&gt;laddr.lsap == laddr-&gt;lsap &amp;&amp;</div><div class='add'>+	return net_eq(sock_net(sk), net) &amp;&amp;</div><div class='add'>+		llc-&gt;laddr.lsap == laddr-&gt;lsap &amp;&amp;</div><div class='ctx'> 		llc-&gt;daddr.lsap == daddr-&gt;lsap &amp;&amp;</div><div class='ctx'> 		ether_addr_equal(llc-&gt;laddr.mac, laddr-&gt;mac) &amp;&amp;</div><div class='ctx'> 		ether_addr_equal(llc-&gt;daddr.mac, daddr-&gt;mac);</div><div class='hunk'>@@ -501,6 +471,7 @@ static inline bool llc_estab_match(const struct llc_sap *sap,</div><div class='ctx'>  *	@sap: SAP</div><div class='ctx'>  *	@daddr: address of remote LLC (MAC + SAP)</div><div class='ctx'>  *	@laddr: address of local LLC (MAC + SAP)</div><div class='add'>+ *	@net: netns to look up a socket in</div><div class='ctx'>  *</div><div class='ctx'>  *	Search connection list of the SAP and finds connection using the remote</div><div class='ctx'>  *	mac, remote sap, local mac, and local sap. Returns pointer for</div><div class='hunk'>@@ -509,7 +480,8 @@ static inline bool llc_estab_match(const struct llc_sap *sap,</div><div class='ctx'>  */</div><div class='ctx'> static struct sock *__llc_lookup_established(struct llc_sap *sap,</div><div class='ctx'> 					     struct llc_addr *daddr,</div><div class='del'>-					     struct llc_addr *laddr)</div><div class='add'>+					     struct llc_addr *laddr,</div><div class='add'>+					     const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *rc;</div><div class='ctx'> 	struct hlist_nulls_node *node;</div><div class='hunk'>@@ -519,12 +491,12 @@ static struct sock *__llc_lookup_established(struct llc_sap *sap,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> again:</div><div class='ctx'> 	sk_nulls_for_each_rcu(rc, node, laddr_hb) {</div><div class='del'>-		if (llc_estab_match(sap, daddr, laddr, rc)) {</div><div class='add'>+		if (llc_estab_match(sap, daddr, laddr, rc, net)) {</div><div class='ctx'> 			/* Extra checks required by SLAB_TYPESAFE_BY_RCU */</div><div class='ctx'> 			if (unlikely(!refcount_inc_not_zero(&amp;rc-&gt;sk_refcnt)))</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			if (unlikely(llc_sk(rc)-&gt;sap != sap ||</div><div class='del'>-				     !llc_estab_match(sap, daddr, laddr, rc))) {</div><div class='add'>+				     !llc_estab_match(sap, daddr, laddr, rc, net))) {</div><div class='ctx'> 				sock_put(rc);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -546,29 +518,33 @@ found:</div><div class='ctx'> </div><div class='ctx'> struct sock *llc_lookup_established(struct llc_sap *sap,</div><div class='ctx'> 				    struct llc_addr *daddr,</div><div class='del'>-				    struct llc_addr *laddr)</div><div class='add'>+				    struct llc_addr *laddr,</div><div class='add'>+				    const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	sk = __llc_lookup_established(sap, daddr, laddr);</div><div class='add'>+	sk = __llc_lookup_established(sap, daddr, laddr, net);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool llc_listener_match(const struct llc_sap *sap,</div><div class='ctx'> 				      const struct llc_addr *laddr,</div><div class='del'>-				      const struct sock *sk)</div><div class='add'>+				      const struct sock *sk,</div><div class='add'>+				      const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='del'>-	return sk-&gt;sk_type == SOCK_STREAM &amp;&amp; sk-&gt;sk_state == TCP_LISTEN &amp;&amp;</div><div class='add'>+	return net_eq(sock_net(sk), net) &amp;&amp;</div><div class='add'>+		sk-&gt;sk_type == SOCK_STREAM &amp;&amp; sk-&gt;sk_state == TCP_LISTEN &amp;&amp;</div><div class='ctx'> 		llc-&gt;laddr.lsap == laddr-&gt;lsap &amp;&amp;</div><div class='ctx'> 		ether_addr_equal(llc-&gt;laddr.mac, laddr-&gt;mac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock *__llc_lookup_listener(struct llc_sap *sap,</div><div class='del'>-					  struct llc_addr *laddr)</div><div class='add'>+					  struct llc_addr *laddr,</div><div class='add'>+					  const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *rc;</div><div class='ctx'> 	struct hlist_nulls_node *node;</div><div class='hunk'>@@ -578,12 +554,12 @@ static struct sock *__llc_lookup_listener(struct llc_sap *sap,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> again:</div><div class='ctx'> 	sk_nulls_for_each_rcu(rc, node, laddr_hb) {</div><div class='del'>-		if (llc_listener_match(sap, laddr, rc)) {</div><div class='add'>+		if (llc_listener_match(sap, laddr, rc, net)) {</div><div class='ctx'> 			/* Extra checks required by SLAB_TYPESAFE_BY_RCU */</div><div class='ctx'> 			if (unlikely(!refcount_inc_not_zero(&amp;rc-&gt;sk_refcnt)))</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			if (unlikely(llc_sk(rc)-&gt;sap != sap ||</div><div class='del'>-				     !llc_listener_match(sap, laddr, rc))) {</div><div class='add'>+				     !llc_listener_match(sap, laddr, rc, net))) {</div><div class='ctx'> 				sock_put(rc);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -607,6 +583,7 @@ found:</div><div class='ctx'>  *	llc_lookup_listener - Finds listener for local MAC + SAP</div><div class='ctx'>  *	@sap: SAP</div><div class='ctx'>  *	@laddr: address of local LLC (MAC + SAP)</div><div class='add'>+ *	@net: netns to look up a socket in</div><div class='ctx'>  *</div><div class='ctx'>  *	Search connection list of the SAP and finds connection listening on</div><div class='ctx'>  *	local mac, and local sap. Returns pointer for parent socket found,</div><div class='hunk'>@@ -614,24 +591,26 @@ found:</div><div class='ctx'>  *	Caller has to make sure local_bh is disabled.</div><div class='ctx'>  */</div><div class='ctx'> static struct sock *llc_lookup_listener(struct llc_sap *sap,</div><div class='del'>-					struct llc_addr *laddr)</div><div class='add'>+					struct llc_addr *laddr,</div><div class='add'>+					const struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct sock *rc = __llc_lookup_listener(sap, laddr, net);</div><div class='ctx'> 	static struct llc_addr null_addr;</div><div class='del'>-	struct sock *rc = __llc_lookup_listener(sap, laddr);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc)</div><div class='del'>-		rc = __llc_lookup_listener(sap, &amp;null_addr);</div><div class='add'>+		rc = __llc_lookup_listener(sap, &amp;null_addr, net);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sock *__llc_lookup(struct llc_sap *sap,</div><div class='ctx'> 				 struct llc_addr *daddr,</div><div class='del'>-				 struct llc_addr *laddr)</div><div class='add'>+				 struct llc_addr *laddr,</div><div class='add'>+				 const struct net *net)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = __llc_lookup_established(sap, daddr, laddr);</div><div class='add'>+	struct sock *sk = __llc_lookup_established(sap, daddr, laddr, net);</div><div class='ctx'> </div><div class='del'>-	return sk ? : llc_lookup_listener(sap, laddr);</div><div class='add'>+	return sk ? : llc_lookup_listener(sap, laddr, net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -656,8 +635,8 @@ u8 llc_data_accept_state(u8 state)</div><div class='ctx'>  */</div><div class='ctx'> static u16 __init llc_find_next_offset(struct llc_conn_state *state, u16 offset)</div><div class='ctx'> {</div><div class='add'>+	const struct llc_conn_state_trans **next_trans;</div><div class='ctx'> 	u16 cnt = 0;</div><div class='del'>-	struct llc_conn_state_trans **next_trans;</div><div class='ctx'> </div><div class='ctx'> 	for (next_trans = state-&gt;transitions + offset;</div><div class='ctx'> 	     (*next_trans)-&gt;ev; next_trans++)</div><div class='hunk'>@@ -734,6 +713,7 @@ void llc_sap_add_socket(struct llc_sap *sap, struct sock *sk)</div><div class='ctx'> 	llc_sk(sk)-&gt;sap = sap;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sap-&gt;sk_lock);</div><div class='add'>+	sock_set_flag(sk, SOCK_RCU_FREE);</div><div class='ctx'> 	sap-&gt;sk_count++;</div><div class='ctx'> 	sk_nulls_add_node_rcu(sk, laddr_hb);</div><div class='ctx'> 	hlist_add_head(&amp;llc-&gt;dev_hash_node, dev_hb);</div><div class='hunk'>@@ -808,7 +788,7 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> 	llc_pdu_decode_da(skb, daddr.mac);</div><div class='ctx'> 	llc_pdu_decode_dsap(skb, &amp;daddr.lsap);</div><div class='ctx'> </div><div class='del'>-	sk = __llc_lookup(sap, &amp;saddr, &amp;daddr);</div><div class='add'>+	sk = __llc_lookup(sap, &amp;saddr, &amp;daddr, dev_net(skb-&gt;dev));</div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='hunk'>@@ -845,7 +825,7 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> 	else {</div><div class='ctx'> 		dprintk("%s: adding to backlog...\n", __func__);</div><div class='ctx'> 		llc_set_backlog_type(skb, LLC_PACKET);</div><div class='del'>-		if (sk_add_backlog(sk, skb, sk-&gt;sk_rcvbuf))</div><div class='add'>+		if (sk_add_backlog(sk, skb, READ_ONCE(sk-&gt;sk_rcvbuf)))</div><div class='ctx'> 			goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -938,8 +918,11 @@ static void llc_sk_init(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	llc_sk_alloc - Allocates LLC sock</div><div class='add'>+ *	@net: network namespace</div><div class='ctx'>  *	@family: upper layer protocol family</div><div class='ctx'>  *	@priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)</div><div class='add'>+ *	@prot: struct proto associated with this new sock instance</div><div class='add'>+ *	@kern: is this to be a kernel socket?</div><div class='ctx'>  *</div><div class='ctx'>  *	Allocates a LLC sock and initializes it. Returns the new LLC sock</div><div class='ctx'>  *	or %NULL if there's no memory available for one</div><div class='hunk'>@@ -966,15 +949,15 @@ void llc_sk_stop_all_timers(struct sock *sk, bool sync)</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (sync) {</div><div class='del'>-		del_timer_sync(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='del'>-		del_timer_sync(&amp;llc-&gt;ack_timer.timer);</div><div class='del'>-		del_timer_sync(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='del'>-		del_timer_sync(&amp;llc-&gt;busy_state_timer.timer);</div><div class='add'>+		timer_delete_sync(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='add'>+		timer_delete_sync(&amp;llc-&gt;ack_timer.timer);</div><div class='add'>+		timer_delete_sync(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='add'>+		timer_delete_sync(&amp;llc-&gt;busy_state_timer.timer);</div><div class='ctx'> 	} else {</div><div class='del'>-		del_timer(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='del'>-		del_timer(&amp;llc-&gt;ack_timer.timer);</div><div class='del'>-		del_timer(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='del'>-		del_timer(&amp;llc-&gt;busy_state_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;pf_cycle_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;ack_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;rej_sent_timer.timer);</div><div class='add'>+		timer_delete(&amp;llc-&gt;busy_state_timer.timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	llc-&gt;ack_must_be_send = 0;</div><div class='hunk'>@@ -983,7 +966,7 @@ void llc_sk_stop_all_timers(struct sock *sk, bool sync)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	llc_sk_free - Frees a LLC socket</div><div class='del'>- *	@sk - socket to free</div><div class='add'>+ *	@sk: - socket to free</div><div class='ctx'>  *</div><div class='ctx'>  *	Frees a LLC socket</div><div class='ctx'>  */</div><div class='head'>diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c<br/>index 260b3dc1b4a2..4f16d9c88350 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_core.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_core.c</a></div><div class='hunk'>@@ -59,10 +59,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	llc_sap_find - searchs a SAP in station</div><div class='add'>+ *	llc_sap_find - searches a SAP in station</div><div class='ctx'>  *	@sap_value: sap to be found</div><div class='ctx'>  *</div><div class='del'>- *	Searchs for a sap in the sap list of the LLC's station upon the sap ID.</div><div class='add'>+ *	Searches for a sap in the sap list of the LLC's station upon the sap ID.</div><div class='ctx'>  *	If the sap is found it will be refcounted and the user will have to do</div><div class='ctx'>  *	a llc_sap_put after use.</div><div class='ctx'>  *	Returns the sap or %NULL if not found.</div><div class='hunk'>@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap)</div><div class='ctx'> 	list_del_rcu(&amp;sap-&gt;node);</div><div class='ctx'> 	spin_unlock_bh(&amp;llc_sap_list_lock);</div><div class='ctx'> </div><div class='del'>-	synchronize_rcu();</div><div class='del'>-</div><div class='del'>-	kfree(sap);</div><div class='add'>+	kfree_rcu(sap, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct packet_type llc_packet_type __read_mostly = {</div><div class='hunk'>@@ -137,22 +135,15 @@ static struct packet_type llc_packet_type __read_mostly = {</div><div class='ctx'> 	.func = llc_rcv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct packet_type llc_tr_packet_type __read_mostly = {</div><div class='del'>-	.type = cpu_to_be16(ETH_P_TR_802_2),</div><div class='del'>-	.func = llc_rcv,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __init llc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	dev_add_pack(&amp;llc_packet_type);</div><div class='del'>-	dev_add_pack(&amp;llc_tr_packet_type);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit llc_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	dev_remove_pack(&amp;llc_packet_type);</div><div class='del'>-	dev_remove_pack(&amp;llc_tr_packet_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(llc_init);</div><div class='head'>diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c<br/>index 8db03c2d5440..58a5f419adc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_if.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_if.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_if.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_if.c</a></div><div class='hunk'>@@ -38,6 +38,8 @@</div><div class='ctx'>  *	closed and -EBUSY when sending data is not permitted in this state or</div><div class='ctx'>  *	LLC has send an I pdu with p bit set to 1 and is waiting for it's</div><div class='ctx'>  *	response.</div><div class='add'>+ *</div><div class='add'>+ *	This function always consumes a reference to the skb.</div><div class='ctx'>  */</div><div class='ctx'> int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -46,20 +48,22 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(llc-&gt;state == LLC_CONN_STATE_ADM))</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	rc = -EBUSY;</div><div class='ctx'> 	if (unlikely(llc_data_accept_state(llc-&gt;state) || /* data_conn_refuse */</div><div class='ctx'> 		     llc-&gt;p_flag)) {</div><div class='ctx'> 		llc-&gt;failed_data_req = 1;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	ev = llc_conn_ev(skb);</div><div class='ctx'> 	ev-&gt;type      = LLC_CONN_EV_TYPE_PRIM;</div><div class='ctx'> 	ev-&gt;prim      = LLC_DATA_PRIM;</div><div class='ctx'> 	ev-&gt;prim_type = LLC_PRIM_TYPE_REQ;</div><div class='ctx'> 	skb-&gt;dev      = llc-&gt;dev;</div><div class='del'>-	rc = llc_conn_state_process(sk, skb);</div><div class='del'>-out:</div><div class='add'>+	return llc_conn_state_process(sk, skb);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree_skb(skb);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +80,7 @@ out:</div><div class='ctx'>  *	establishment will inform to upper layer via calling it's confirm</div><div class='ctx'>  *	function and passing proper information.</div><div class='ctx'>  */</div><div class='del'>-int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap)</div><div class='add'>+int llc_establish_connection(struct sock *sk, const u8 *lmac, u8 *dmac, u8 dsap)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = -EISCONN;</div><div class='ctx'> 	struct llc_addr laddr, daddr;</div><div class='hunk'>@@ -88,7 +92,7 @@ int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap)</div><div class='ctx'> 	daddr.lsap = dsap;</div><div class='ctx'> 	memcpy(daddr.mac, dmac, sizeof(daddr.mac));</div><div class='ctx'> 	memcpy(laddr.mac, lmac, sizeof(laddr.mac));</div><div class='del'>-	existing = llc_lookup_established(llc-&gt;sap, &amp;daddr, &amp;laddr);</div><div class='add'>+	existing = llc_lookup_established(llc-&gt;sap, &amp;daddr, &amp;laddr, sock_net(sk));</div><div class='ctx'> 	if (existing) {</div><div class='ctx'> 		if (existing-&gt;sk_state == TCP_ESTABLISHED) {</div><div class='ctx'> 			sk = existing;</div><div class='head'>diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c<br/>index 82cb93f66b9b..61b0159b2fbe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_input.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_input.c</a></div><div class='hunk'>@@ -124,11 +124,17 @@ static inline int llc_fixup_skb(struct sk_buff *skb)</div><div class='ctx'> 	if (unlikely(!pskb_may_pull(skb, llc_len)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;transport_header += llc_len;</div><div class='ctx'> 	skb_pull(skb, llc_len);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_802_2)) {</div><div class='del'>-		__be16 pdulen = eth_hdr(skb)-&gt;h_proto;</div><div class='del'>-		s32 data_size = ntohs(pdulen) - llc_len;</div><div class='add'>+		__be16 pdulen;</div><div class='add'>+		s32 data_size;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;mac_len &lt; ETH_HLEN)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		pdulen = eth_hdr(skb)-&gt;h_proto;</div><div class='add'>+		data_size = ntohs(pdulen) - llc_len;</div><div class='ctx'> </div><div class='ctx'> 		if (data_size &lt; 0 ||</div><div class='ctx'> 		    !pskb_may_pull(skb, data_size))</div><div class='hunk'>@@ -144,6 +150,7 @@ static inline int llc_fixup_skb(struct sk_buff *skb)</div><div class='ctx'>  *	@skb: received pdu</div><div class='ctx'>  *	@dev: device that receive pdu</div><div class='ctx'>  *	@pt: packet type</div><div class='add'>+ *	@orig_dev: the original receive net device</div><div class='ctx'>  *</div><div class='ctx'>  *	When the system receives a 802.2 frame this function is called. It</div><div class='ctx'>  *	checks SAP and connection of received pdu and passes frame to</div><div class='hunk'>@@ -162,9 +169,6 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	void (*sta_handler)(struct sk_buff *skb);</div><div class='ctx'> 	void (*sap_handler)(struct llc_sap *sap, struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-	if (!net_eq(dev_net(dev), &amp;init_net))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When the interface is in promisc. mode, drop all the crap that it</div><div class='ctx'> 	 * receives, do not try to analyse it.</div><div class='head'>diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c<br/>index 94425e421213..5a6466fc626a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_output.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_output.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_output.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_output.c</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * llc_output.c - LLC minimal output path</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1997 by Procom Technology, Inc.</div><div class='ctx'>  * 		 2001-2003 by Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- * This program can be redistributed or modified under the terms of the</div><div class='del'>- * GNU General Public License version 2 as published by the Free Software</div><div class='del'>- * Foundation.</div><div class='del'>- * This program is distributed without any warranty or implied warranty</div><div class='del'>- * of merchantability or fitness for a particular purpose.</div><div class='del'>- *</div><div class='del'>- * See the GNU General Public License version 2 for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='hunk'>@@ -63,7 +56,7 @@ int llc_mac_hdr_init(struct sk_buff *skb,</div><div class='ctx'>  *	package primitive as an event and send to SAP event handler</div><div class='ctx'>  */</div><div class='ctx'> int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,</div><div class='del'>-			      unsigned char *dmac, unsigned char dsap)</div><div class='add'>+			      const unsigned char *dmac, unsigned char dsap)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	llc_pdu_header_init(skb, LLC_PDU_TYPE_U, sap-&gt;laddr.lsap,</div><div class='hunk'>@@ -72,6 +65,8 @@ int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,</div><div class='ctx'> 	rc = llc_mac_hdr_init(skb, skb-&gt;dev-&gt;dev_addr, dmac);</div><div class='ctx'> 	if (likely(!rc))</div><div class='ctx'> 		rc = dev_queue_xmit(skb);</div><div class='add'>+	else</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c<br/>index 2e6cb79196bb..63749dde542f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_pdu.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_pdu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_pdu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_pdu.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@ void llc_pdu_set_cmd_rsp(struct sk_buff *skb, u8 pdu_type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	pdu_set_pf_bit - sets poll/final bit in LLC header</div><div class='del'>- *	@pdu_frame: input frame that p/f bit must be set into it.</div><div class='add'>+ *	llc_pdu_set_pf_bit - sets poll/final bit in LLC header</div><div class='add'>+ *	@skb: Frame to set bit in</div><div class='ctx'>  *	@bit_value: poll/final bit (0 or 1).</div><div class='ctx'>  *</div><div class='ctx'>  *	This function sets poll/final bit in LLC header (based on type of PDU).</div><div class='head'>diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c<br/>index f3a36c16a5e7..aa81c67b24a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_proc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_proc.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;net/llc_c_st.h&gt;</div><div class='ctx'> #include &lt;net/llc_conn.h&gt;</div><div class='ctx'> </div><div class='del'>-static void llc_ui_format_mac(struct seq_file *seq, u8 *addr)</div><div class='add'>+static void llc_ui_format_mac(struct seq_file *seq, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(seq, "%pM", addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -56,7 +56,7 @@ found:</div><div class='ctx'> 	return sk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *llc_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='add'>+static void *llc_seq_start(struct seq_file *seq, loff_t *pos) __acquires(RCU)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t l = *pos;</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +151,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   sk_wmem_alloc_get(sk),</div><div class='ctx'> 		   sk_rmem_alloc_get(sk) - llc-&gt;copied_seq,</div><div class='ctx'> 		   sk-&gt;sk_state,</div><div class='del'>-		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),</div><div class='add'>+		   from_kuid_munged(seq_user_ns(seq), sk_uid(sk)),</div><div class='ctx'> 		   llc-&gt;link);</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -195,7 +195,7 @@ static int llc_seq_core_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   timer_pending(&amp;llc-&gt;pf_cycle_timer.timer),</div><div class='ctx'> 		   timer_pending(&amp;llc-&gt;rej_sent_timer.timer),</div><div class='ctx'> 		   timer_pending(&amp;llc-&gt;busy_state_timer.timer),</div><div class='del'>-		   !!sk-&gt;sk_backlog.tail, !!sk-&gt;sk_lock.owned);</div><div class='add'>+		   !!sk-&gt;sk_backlog.tail, sock_owned_by_user_nocheck(sk));</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/llc/llc_s_ac.c b/net/llc/llc_s_ac.c<br/>index a94bd56bcac6..7a0cae9a8111 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_s_ac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_s_ac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_s_ac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_s_ac.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;net/llc_s_ac.h&gt;</div><div class='ctx'> #include &lt;net/llc_s_ev.h&gt;</div><div class='ctx'> #include &lt;net/llc_sap.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	llc_sap_action_unit_data_ind - forward UI PDU to network layer</div><div class='add'>+ *	llc_sap_action_unitdata_ind - forward UI PDU to network layer</div><div class='ctx'>  *	@sap: SAP</div><div class='ctx'>  *	@skb: the event to forward</div><div class='ctx'>  *</div><div class='hunk'>@@ -40,6 +40,26 @@ int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int llc_prepare_and_xmit(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct llc_sap_state_ev *ev = llc_sap_ev(skb);</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = llc_mac_hdr_init(skb, ev-&gt;saddr.mac, ev-&gt;daddr.mac);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	nskb = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;sk)</div><div class='add'>+		skb_set_owner_w(nskb, skb-&gt;sk);</div><div class='add'>+</div><div class='add'>+	return dev_queue_xmit(nskb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	llc_sap_action_send_ui - sends UI PDU resp to UNITDATA REQ to MAC layer</div><div class='ctx'>  *	@sap: SAP</div><div class='hunk'>@@ -52,15 +72,12 @@ int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sap_state_ev *ev = llc_sap_ev(skb);</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	llc_pdu_header_init(skb, LLC_PDU_TYPE_U, ev-&gt;saddr.lsap,</div><div class='ctx'> 			    ev-&gt;daddr.lsap, LLC_PDU_CMD);</div><div class='ctx'> 	llc_pdu_init_as_ui_cmd(skb);</div><div class='del'>-	rc = llc_mac_hdr_init(skb, ev-&gt;saddr.mac, ev-&gt;daddr.mac);</div><div class='del'>-	if (likely(!rc))</div><div class='del'>-		rc = dev_queue_xmit(skb);</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	return llc_prepare_and_xmit(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -75,15 +92,12 @@ int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> int llc_sap_action_send_xid_c(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sap_state_ev *ev = llc_sap_ev(skb);</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='del'>-	llc_pdu_header_init(skb, LLC_PDU_TYPE_U, ev-&gt;saddr.lsap,</div><div class='add'>+	llc_pdu_header_init(skb, LLC_PDU_TYPE_U_XID, ev-&gt;saddr.lsap,</div><div class='ctx'> 			    ev-&gt;daddr.lsap, LLC_PDU_CMD);</div><div class='ctx'> 	llc_pdu_init_as_xid_cmd(skb, LLC_XID_NULL_CLASS_2, 0);</div><div class='del'>-	rc = llc_mac_hdr_init(skb, ev-&gt;saddr.mac, ev-&gt;daddr.mac);</div><div class='del'>-	if (likely(!rc))</div><div class='del'>-		rc = dev_queue_xmit(skb);</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	return llc_prepare_and_xmit(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -129,15 +143,12 @@ out:</div><div class='ctx'> int llc_sap_action_send_test_c(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sap_state_ev *ev = llc_sap_ev(skb);</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	llc_pdu_header_init(skb, LLC_PDU_TYPE_U, ev-&gt;saddr.lsap,</div><div class='ctx'> 			    ev-&gt;daddr.lsap, LLC_PDU_CMD);</div><div class='ctx'> 	llc_pdu_init_as_test_cmd(skb);</div><div class='del'>-	rc = llc_mac_hdr_init(skb, ev-&gt;saddr.mac, ev-&gt;daddr.mac);</div><div class='del'>-	if (likely(!rc))</div><div class='del'>-		rc = dev_queue_xmit(skb);</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	return llc_prepare_and_xmit(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb)</div><div class='hunk'>@@ -147,6 +158,9 @@ int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> 	int rc = 1;</div><div class='ctx'> 	u32 data_size;</div><div class='ctx'> </div><div class='add'>+	if (skb-&gt;mac_len &lt; ETH_HLEN)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	llc_pdu_decode_sa(skb, mac_da);</div><div class='ctx'> 	llc_pdu_decode_da(skb, mac_sa);</div><div class='ctx'> 	llc_pdu_decode_ssap(skb, &amp;dsap);</div><div class='head'>diff --git a/net/llc/llc_s_st.c b/net/llc/llc_s_st.c<br/>index 308c616883a4..acccc827c562 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_s_st.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_s_st.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_s_st.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_s_st.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  * last entry for this state</div><div class='ctx'>  * all members are zeros, .bss zeroes it</div><div class='ctx'>  */</div><div class='del'>-static struct llc_sap_state_trans llc_sap_state_trans_end;</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_state_trans_end;</div><div class='ctx'> </div><div class='ctx'> /* state LLC_SAP_STATE_INACTIVE transition for</div><div class='ctx'>  * LLC_SAP_EV_ACTIVATION_REQ event</div><div class='hunk'>@@ -34,14 +34,14 @@ static const llc_sap_action_t llc_sap_inactive_state_actions_1[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_inactive_state_trans_1 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_inactive_state_trans_1 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_activation_req,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_inactive_state_actions_1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* array of pointers; one to each transition */</div><div class='del'>-static struct llc_sap_state_trans *llc_sap_inactive_state_transitions[] = {</div><div class='add'>+static const struct llc_sap_state_trans *llc_sap_inactive_state_transitions[] = {</div><div class='ctx'> 	[0] = &amp;llc_sap_inactive_state_trans_1,</div><div class='ctx'> 	[1] = &amp;llc_sap_state_trans_end,</div><div class='ctx'> };</div><div class='hunk'>@@ -52,7 +52,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_1[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_1 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_1 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_rx_ui,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_1,</div><div class='hunk'>@@ -64,7 +64,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_2[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_2 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_2 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_unitdata_req,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_2,</div><div class='hunk'>@@ -76,7 +76,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_3[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_3 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_3 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_xid_req,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_3,</div><div class='hunk'>@@ -88,7 +88,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_4[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_4 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_4 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_rx_xid_c,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_4,</div><div class='hunk'>@@ -100,7 +100,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_5[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_5 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_5 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_rx_xid_r,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_5,</div><div class='hunk'>@@ -112,7 +112,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_6[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_6 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_6 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_test_req,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_6,</div><div class='hunk'>@@ -124,7 +124,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_7[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_7 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_7 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_rx_test_c,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_7</div><div class='hunk'>@@ -136,7 +136,7 @@ static const llc_sap_action_t llc_sap_active_state_actions_8[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_8 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_8 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_rx_test_r,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_ACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_8,</div><div class='hunk'>@@ -150,14 +150,14 @@ static const llc_sap_action_t llc_sap_active_state_actions_9[] = {</div><div class='ctx'> 	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct llc_sap_state_trans llc_sap_active_state_trans_9 = {</div><div class='add'>+static const struct llc_sap_state_trans llc_sap_active_state_trans_9 = {</div><div class='ctx'> 	.ev =		llc_sap_ev_deactivation_req,</div><div class='ctx'> 	.next_state =	LLC_SAP_STATE_INACTIVE,</div><div class='ctx'> 	.ev_actions =	llc_sap_active_state_actions_9</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* array of pointers; one to each transition */</div><div class='del'>-static struct llc_sap_state_trans *llc_sap_active_state_transitions[] = {</div><div class='add'>+static const struct llc_sap_state_trans *llc_sap_active_state_transitions[] = {</div><div class='ctx'> 	[0] = &amp;llc_sap_active_state_trans_2,</div><div class='ctx'> 	[1] = &amp;llc_sap_active_state_trans_1,</div><div class='ctx'> 	[2] = &amp;llc_sap_active_state_trans_3,</div><div class='head'>diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c<br/>index a7f7b8ff4729..6cd03c2ae7d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_sap.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_sap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_sap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_sap.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@ static int llc_mac_header_len(unsigned short devtype)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	llc_alloc_frame - allocates sk_buff for frame</div><div class='add'>+ *	@sk:  socket to allocate frame to</div><div class='ctx'>  *	@dev: network device this skb will be sent over</div><div class='ctx'>  *	@type: pdu type to allocate</div><div class='ctx'>  *	@data_size: data size to allocate</div><div class='hunk'>@@ -113,12 +114,12 @@ void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'>  *	Returns the pointer to found transition on success or %NULL for</div><div class='ctx'>  *	failure.</div><div class='ctx'>  */</div><div class='del'>-static struct llc_sap_state_trans *llc_find_sap_trans(struct llc_sap *sap,</div><div class='del'>-						      struct sk_buff *skb)</div><div class='add'>+static const struct llc_sap_state_trans *llc_find_sap_trans(struct llc_sap *sap,</div><div class='add'>+							    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	struct llc_sap_state_trans *rc = NULL;</div><div class='del'>-	struct llc_sap_state_trans **next_trans;</div><div class='add'>+	const struct llc_sap_state_trans *rc = NULL;</div><div class='add'>+	const struct llc_sap_state_trans **next_trans;</div><div class='ctx'> 	struct llc_sap_state *curr_state = &amp;llc_sap_state_table[sap-&gt;state - 1];</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Search thru events for this state until list exhausted or until</div><div class='hunk'>@@ -142,7 +143,7 @@ static struct llc_sap_state_trans *llc_find_sap_trans(struct llc_sap *sap,</div><div class='ctx'>  *	Returns 0 for success and 1 for failure of at least one action.</div><div class='ctx'>  */</div><div class='ctx'> static int llc_exec_sap_trans_actions(struct llc_sap *sap,</div><div class='del'>-				      struct llc_sap_state_trans *trans,</div><div class='add'>+				      const struct llc_sap_state_trans *trans,</div><div class='ctx'> 				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -165,8 +166,8 @@ static int llc_exec_sap_trans_actions(struct llc_sap *sap,</div><div class='ctx'>  */</div><div class='ctx'> static int llc_sap_next_state(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	const struct llc_sap_state_trans *trans;</div><div class='ctx'> 	int rc = 1;</div><div class='del'>-	struct llc_sap_state_trans *trans;</div><div class='ctx'> </div><div class='ctx'> 	if (sap-&gt;state &gt; LLC_NR_SAP_STATES)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -197,29 +198,22 @@ out:</div><div class='ctx'>  *	After executing actions of the event, upper layer will be indicated</div><div class='ctx'>  *	if needed(on receiving an UI frame). sk can be null for the</div><div class='ctx'>  *	datalink_proto case.</div><div class='add'>+ *</div><div class='add'>+ *	This function always consumes a reference to the skb.</div><div class='ctx'>  */</div><div class='ctx'> static void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct llc_sap_state_ev *ev = llc_sap_ev(skb);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We have to hold the skb, because llc_sap_next_state</div><div class='del'>-	 * will kfree it in the sending path and we need to</div><div class='del'>-	 * look at the skb-&gt;cb, where we encode llc_sap_state_ev.</div><div class='del'>-	 */</div><div class='del'>-	skb_get(skb);</div><div class='ctx'> 	ev-&gt;ind_cfm_flag = 0;</div><div class='ctx'> 	llc_sap_next_state(sap, skb);</div><div class='del'>-	if (ev-&gt;ind_cfm_flag == LLC_IND) {</div><div class='del'>-		if (skb-&gt;sk-&gt;sk_state == TCP_LISTEN)</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		else {</div><div class='del'>-			llc_save_primitive(skb-&gt;sk, skb, ev-&gt;prim);</div><div class='ctx'> </div><div class='del'>-			/* queue skb to the user. */</div><div class='del'>-			if (sock_queue_rcv_skb(skb-&gt;sk, skb))</div><div class='del'>-				kfree_skb(skb);</div><div class='del'>-		}</div><div class='add'>+	if (ev-&gt;ind_cfm_flag == LLC_IND &amp;&amp; skb-&gt;sk-&gt;sk_state != TCP_LISTEN) {</div><div class='add'>+		llc_save_primitive(skb-&gt;sk, skb, ev-&gt;prim);</div><div class='add'>+</div><div class='add'>+		/* queue skb to the user. */</div><div class='add'>+		if (sock_queue_rcv_skb(skb-&gt;sk, skb) == 0)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -280,6 +274,7 @@ void llc_build_and_send_xid_pkt(struct llc_sap *sap, struct sk_buff *skb,</div><div class='ctx'>  *	llc_sap_rcv - sends received pdus to the sap state machine</div><div class='ctx'>  *	@sap: current sap component structure.</div><div class='ctx'>  *	@skb: received frame.</div><div class='add'>+ *	@sk:  socket to associate to frame</div><div class='ctx'>  *</div><div class='ctx'>  *	Sends received pdus to the sap state machine.</div><div class='ctx'>  */</div><div class='hunk'>@@ -299,25 +294,29 @@ static void llc_sap_rcv(struct llc_sap *sap, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static inline bool llc_dgram_match(const struct llc_sap *sap,</div><div class='ctx'> 				   const struct llc_addr *laddr,</div><div class='del'>-				   const struct sock *sk)</div><div class='add'>+				   const struct sock *sk,</div><div class='add'>+				   const struct net *net)</div><div class='ctx'> {</div><div class='ctx'>      struct llc_sock *llc = llc_sk(sk);</div><div class='ctx'> </div><div class='ctx'>      return sk-&gt;sk_type == SOCK_DGRAM &amp;&amp;</div><div class='del'>-	  llc-&gt;laddr.lsap == laddr-&gt;lsap &amp;&amp;</div><div class='del'>-	  ether_addr_equal(llc-&gt;laddr.mac, laddr-&gt;mac);</div><div class='add'>+	     net_eq(sock_net(sk), net) &amp;&amp;</div><div class='add'>+	     llc-&gt;laddr.lsap == laddr-&gt;lsap &amp;&amp;</div><div class='add'>+	     ether_addr_equal(llc-&gt;laddr.mac, laddr-&gt;mac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	llc_lookup_dgram - Finds dgram socket for the local sap/mac</div><div class='ctx'>  *	@sap: SAP</div><div class='ctx'>  *	@laddr: address of local LLC (MAC + SAP)</div><div class='add'>+ *	@net: netns to look up a socket in</div><div class='ctx'>  *</div><div class='ctx'>  *	Search socket list of the SAP and finds connection using the local</div><div class='ctx'>  *	mac, and local sap. Returns pointer for socket found, %NULL otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static struct sock *llc_lookup_dgram(struct llc_sap *sap,</div><div class='del'>-				     const struct llc_addr *laddr)</div><div class='add'>+				     const struct llc_addr *laddr,</div><div class='add'>+				     const struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *rc;</div><div class='ctx'> 	struct hlist_nulls_node *node;</div><div class='hunk'>@@ -327,12 +326,12 @@ static struct sock *llc_lookup_dgram(struct llc_sap *sap,</div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='ctx'> again:</div><div class='ctx'> 	sk_nulls_for_each_rcu(rc, node, laddr_hb) {</div><div class='del'>-		if (llc_dgram_match(sap, laddr, rc)) {</div><div class='add'>+		if (llc_dgram_match(sap, laddr, rc, net)) {</div><div class='ctx'> 			/* Extra checks required by SLAB_TYPESAFE_BY_RCU */</div><div class='ctx'> 			if (unlikely(!refcount_inc_not_zero(&amp;rc-&gt;sk_refcnt)))</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			if (unlikely(llc_sk(rc)-&gt;sap != sap ||</div><div class='del'>-				     !llc_dgram_match(sap, laddr, rc))) {</div><div class='add'>+				     !llc_dgram_match(sap, laddr, rc, net))) {</div><div class='ctx'> 				sock_put(rc);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -386,6 +385,7 @@ static void llc_do_mcast(struct llc_sap *sap, struct sk_buff *skb,</div><div class='ctx'>  * 	llc_sap_mcast - Deliver multicast PDU's to all matching datagram sockets.</div><div class='ctx'>  *	@sap: SAP</div><div class='ctx'>  *	@laddr: address of local LLC (MAC + SAP)</div><div class='add'>+ *	@skb: PDU to deliver</div><div class='ctx'>  *</div><div class='ctx'>  *	Search socket list of the SAP and finds connections with same sap.</div><div class='ctx'>  *	Deliver clone to each.</div><div class='hunk'>@@ -433,7 +433,7 @@ void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb)</div><div class='ctx'> 		llc_sap_mcast(sap, &amp;laddr, skb);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct sock *sk = llc_lookup_dgram(sap, &amp;laddr);</div><div class='add'>+		struct sock *sk = llc_lookup_dgram(sap, &amp;laddr, dev_net(skb-&gt;dev));</div><div class='ctx'> 		if (sk) {</div><div class='ctx'> 			llc_sap_rcv(sap, skb, sk);</div><div class='ctx'> 			sock_put(sk);</div><div class='head'>diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c<br/>index 204a8351efff..f50654292510 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/llc_station.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/llc_station.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/llc_station.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/llc_station.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ static int llc_stat_ev_rx_null_dsap_xid_c(struct sk_buff *skb)</div><div class='ctx'> 	return LLC_PDU_IS_CMD(pdu) &amp;&amp;			/* command PDU */</div><div class='ctx'> 	       LLC_PDU_TYPE_IS_U(pdu) &amp;&amp;		/* U type PDU */</div><div class='ctx'> 	       LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_XID &amp;&amp;</div><div class='del'>-	       !pdu-&gt;dsap ? 0 : 1;			/* NULL DSAP value */</div><div class='add'>+	       !pdu-&gt;dsap;				/* NULL DSAP value */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int llc_stat_ev_rx_null_dsap_test_c(struct sk_buff *skb)</div><div class='hunk'>@@ -42,7 +42,7 @@ static int llc_stat_ev_rx_null_dsap_test_c(struct sk_buff *skb)</div><div class='ctx'> 	return LLC_PDU_IS_CMD(pdu) &amp;&amp;			/* command PDU */</div><div class='ctx'> 	       LLC_PDU_TYPE_IS_U(pdu) &amp;&amp;		/* U type PDU */</div><div class='ctx'> 	       LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_TEST &amp;&amp;</div><div class='del'>-	       !pdu-&gt;dsap ? 0 : 1;			/* NULL DSAP */</div><div class='add'>+	       !pdu-&gt;dsap;				/* NULL DSAP */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int llc_station_ac_send_xid_r(struct sk_buff *skb)</div><div class='hunk'>@@ -54,7 +54,6 @@ static int llc_station_ac_send_xid_r(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		goto out;</div><div class='del'>-	rc = 0;</div><div class='ctx'> 	llc_pdu_decode_sa(skb, mac_da);</div><div class='ctx'> 	llc_pdu_decode_ssap(skb, &amp;dsap);</div><div class='ctx'> 	llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);</div><div class='hunk'>@@ -77,13 +76,15 @@ static int llc_station_ac_send_test_r(struct sk_buff *skb)</div><div class='ctx'> 	u32 data_size;</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='ctx'> </div><div class='add'>+	if (skb-&gt;mac_len &lt; ETH_HLEN)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* The test request command is type U (llc_len = 3) */</div><div class='ctx'> 	data_size = ntohs(eth_hdr(skb)-&gt;h_proto) - 3;</div><div class='ctx'> 	nskb = llc_alloc_frame(NULL, skb-&gt;dev, LLC_PDU_TYPE_U, data_size);</div><div class='ctx'> </div><div class='ctx'> 	if (!nskb)</div><div class='ctx'> 		goto out;</div><div class='del'>-	rc = 0;</div><div class='ctx'> 	llc_pdu_decode_sa(skb, mac_da);</div><div class='ctx'> 	llc_pdu_decode_ssap(skb, &amp;dsap);</div><div class='ctx'> 	llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);</div><div class='head'>diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c<br/>index 8443a6d841b0..c8d88e2508fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/llc/sysctl_net_llc.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/llc/sysctl_net_llc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/llc/sysctl_net_llc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/llc/sysctl_net_llc.c</a></div><div class='hunk'>@@ -11,10 +11,6 @@</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/llc.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SYSCTL</div><div class='del'>-#error This file should not be compiled without CONFIG_SYSCTL defined</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct ctl_table llc2_timeout_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "ack",</div><div class='hunk'>@@ -44,11 +40,6 @@ static struct ctl_table llc2_timeout_table[] = {</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler   = proc_dointvec_jiffies,</div><div class='ctx'> 	},</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ctl_table llc_station_table[] = {</div><div class='del'>-	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *llc2_timeout_header;</div><div class='hunk'>@@ -56,8 +47,9 @@ static struct ctl_table_header *llc_station_header;</div><div class='ctx'> </div><div class='ctx'> int __init llc_sysctl_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct ctl_table empty[1] = {};</div><div class='ctx'> 	llc2_timeout_header = register_net_sysctl(&amp;init_net, "net/llc/llc2/timeout", llc2_timeout_table);</div><div class='del'>-	llc_station_header = register_net_sysctl(&amp;init_net, "net/llc/station", llc_station_table);</div><div class='add'>+	llc_station_header = register_net_sysctl_sz(&amp;init_net, "net/llc/station", empty, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!llc2_timeout_header || !llc_station_header) {</div><div class='ctx'> 		llc_sysctl_exit();</div><div class='head'>diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig<br/>index 76e30f4797fb..cf0f7780fb10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/Kconfig?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/Kconfig</a></div><div class='hunk'>@@ -1,14 +1,15 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config MAC80211</div><div class='ctx'> 	tristate "Generic IEEE 802.11 Networking Stack (mac80211)"</div><div class='ctx'> 	depends on CFG80211</div><div class='ctx'> 	select CRYPTO</div><div class='del'>-	select CRYPTO_ARC4</div><div class='add'>+	select CRYPTO_LIB_ARC4</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_CCM</div><div class='ctx'> 	select CRYPTO_GCM</div><div class='ctx'> 	select CRYPTO_CMAC</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables the hardware independent IEEE 802.11</div><div class='ctx'> 	  networking stack.</div><div class='ctx'> </div><div class='hunk'>@@ -24,28 +25,14 @@ config MAC80211_RC_MINSTREL</div><div class='ctx'> 	bool "Minstrel" if EXPERT</div><div class='ctx'> 	select MAC80211_HAS_RC</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables the 'minstrel' TX rate control algorithm</div><div class='ctx'> </div><div class='del'>-config MAC80211_RC_MINSTREL_HT</div><div class='del'>-	bool "Minstrel 802.11n support" if EXPERT</div><div class='del'>-	depends on MAC80211_RC_MINSTREL</div><div class='del'>-	default y</div><div class='del'>-	---help---</div><div class='del'>-	  This option enables the 'minstrel_ht' TX rate control algorithm</div><div class='del'>-</div><div class='del'>-config MAC80211_RC_MINSTREL_VHT</div><div class='del'>-	bool "Minstrel 802.11ac support" if EXPERT</div><div class='del'>-	depends on MAC80211_RC_MINSTREL_HT</div><div class='del'>-	default n</div><div class='del'>-	---help---</div><div class='del'>-	  This option enables VHT in the 'minstrel_ht' TX rate control algorithm</div><div class='del'>-</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Default rate control algorithm"</div><div class='ctx'> 	depends on MAC80211_HAS_RC</div><div class='ctx'> 	default MAC80211_RC_DEFAULT_MINSTREL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option selects the default rate control algorithm</div><div class='ctx'> 	  mac80211 will use. Note that this default can still be</div><div class='ctx'> 	  overridden through the ieee80211_default_rc_algo module</div><div class='hunk'>@@ -54,7 +41,7 @@ choice</div><div class='ctx'> config MAC80211_RC_DEFAULT_MINSTREL</div><div class='ctx'> 	bool "Minstrel"</div><div class='ctx'> 	depends on MAC80211_RC_MINSTREL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Select Minstrel as the default rate control algorithm.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -62,8 +49,7 @@ endchoice</div><div class='ctx'> </div><div class='ctx'> config MAC80211_RC_DEFAULT</div><div class='ctx'> 	string</div><div class='del'>-	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL &amp;&amp; MAC80211_RC_MINSTREL_HT</div><div class='del'>-	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL</div><div class='add'>+	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL</div><div class='ctx'> 	default ""</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='hunk'>@@ -71,29 +57,38 @@ endif</div><div class='ctx'> comment "Some wireless drivers require a rate control algorithm"</div><div class='ctx'> 	depends on MAC80211 &amp;&amp; MAC80211_HAS_RC=n</div><div class='ctx'> </div><div class='add'>+config MAC80211_KUNIT_TEST</div><div class='add'>+	tristate "KUnit tests for mac80211" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  Enable this option to test mac80211 internals with kunit.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config MAC80211_MESH</div><div class='del'>-	bool "Enable mac80211 mesh networking (pre-802.11s) support"</div><div class='add'>+	bool "Enable mac80211 mesh networking support"</div><div class='ctx'> 	depends on MAC80211</div><div class='del'>-	---help---</div><div class='del'>-	 This options enables support of Draft 802.11s mesh networking.</div><div class='del'>-	 The implementation is based on Draft 2.08 of the Mesh Networking</div><div class='del'>-	 amendment.  However, no compliance with that draft is claimed or even</div><div class='del'>-	 possible, as drafts leave a number of identifiers to be defined after</div><div class='del'>-	 ratification.  For more information visit http://o11s.org/.</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable 802.11 mesh operation in mac80211</div><div class='add'>+	  drivers that support it.  802.11 mesh connects multiple stations</div><div class='add'>+	  over (possibly multi-hop) wireless links to form a single logical</div><div class='add'>+	  LAN.</div><div class='ctx'> </div><div class='ctx'> config MAC80211_LEDS</div><div class='ctx'> 	bool "Enable LED triggers"</div><div class='ctx'> 	depends on MAC80211</div><div class='del'>-	depends on LEDS_CLASS</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='ctx'> 	select LEDS_TRIGGERS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables a few LED triggers for different</div><div class='ctx'> 	  packet receive/transmit events.</div><div class='ctx'> </div><div class='ctx'> config MAC80211_DEBUGFS</div><div class='ctx'> 	bool "Export mac80211 internals in DebugFS"</div><div class='del'>-	depends on MAC80211 &amp;&amp; DEBUG_FS</div><div class='del'>-	---help---</div><div class='add'>+	depends on MAC80211 &amp;&amp; CFG80211_DEBUGFS</div><div class='add'>+	help</div><div class='ctx'> 	  Select this to see extensive information about</div><div class='ctx'> 	  the internal state of mac80211 in debugfs.</div><div class='ctx'> </div><div class='hunk'>@@ -101,8 +96,8 @@ config MAC80211_DEBUGFS</div><div class='ctx'> </div><div class='ctx'> config MAC80211_MESSAGE_TRACING</div><div class='ctx'> 	bool "Trace all mac80211 debug messages"</div><div class='del'>-	depends on MAC80211</div><div class='del'>-	---help---</div><div class='add'>+	depends on MAC80211 &amp;&amp; TRACING</div><div class='add'>+	help</div><div class='ctx'> 	  Select this option to have mac80211 register the</div><div class='ctx'> 	  mac80211_msg trace subsystem with tracepoints to</div><div class='ctx'> 	  collect all debugging messages, independent of</div><div class='hunk'>@@ -115,13 +110,13 @@ config MAC80211_MESSAGE_TRACING</div><div class='ctx'> menuconfig MAC80211_DEBUG_MENU</div><div class='ctx'> 	bool "Select mac80211 debugging features"</div><div class='ctx'> 	depends on MAC80211</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option collects various mac80211 debug settings.</div><div class='ctx'> </div><div class='ctx'> config MAC80211_NOINLINE</div><div class='ctx'> 	bool "Do not inline TX/RX handlers"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option affects code generation in mac80211, when</div><div class='ctx'> 	  selected some functions are marked "noinline" to allow</div><div class='ctx'> 	  easier debugging of problems in the transmit and receive</div><div class='hunk'>@@ -137,7 +132,7 @@ config MAC80211_NOINLINE</div><div class='ctx'> config MAC80211_VERBOSE_DEBUG</div><div class='ctx'> 	bool "Verbose debugging output"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out</div><div class='ctx'> 	  many debugging messages. It should not be selected</div><div class='ctx'> 	  on production systems as some of the messages are</div><div class='hunk'>@@ -148,7 +143,7 @@ config MAC80211_VERBOSE_DEBUG</div><div class='ctx'> config MAC80211_MLME_DEBUG</div><div class='ctx'> 	bool "Verbose managed MLME output"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out</div><div class='ctx'> 	  debugging messages for the managed-mode MLME. It</div><div class='ctx'> 	  should not be selected on production systems as some</div><div class='hunk'>@@ -159,7 +154,7 @@ config MAC80211_MLME_DEBUG</div><div class='ctx'> config MAC80211_STA_DEBUG</div><div class='ctx'> 	bool "Verbose station debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out</div><div class='ctx'> 	  debugging messages for station addition/removal.</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +163,7 @@ config MAC80211_STA_DEBUG</div><div class='ctx'> config MAC80211_HT_DEBUG</div><div class='ctx'> 	bool "Verbose HT debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables 802.11n High Throughput features</div><div class='ctx'> 	  debug tracing output.</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +175,7 @@ config MAC80211_HT_DEBUG</div><div class='ctx'> config MAC80211_OCB_DEBUG</div><div class='ctx'> 	bool "Verbose OCB debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out</div><div class='ctx'> 	  very verbose OCB debugging messages. It should not</div><div class='ctx'> 	  be selected on production systems as those messages</div><div class='hunk'>@@ -191,7 +186,7 @@ config MAC80211_OCB_DEBUG</div><div class='ctx'> config MAC80211_IBSS_DEBUG</div><div class='ctx'> 	bool "Verbose IBSS debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out</div><div class='ctx'> 	  very verbose IBSS debugging messages. It should not</div><div class='ctx'> 	  be selected on production systems as those messages</div><div class='hunk'>@@ -202,7 +197,7 @@ config MAC80211_IBSS_DEBUG</div><div class='ctx'> config MAC80211_PS_DEBUG</div><div class='ctx'> 	bool "Verbose powersave mode debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very</div><div class='ctx'> 	  verbose power save mode debugging messages (when mac80211</div><div class='ctx'> 	  is an AP and has power saving stations.)</div><div class='hunk'>@@ -215,7 +210,7 @@ config MAC80211_MPL_DEBUG</div><div class='ctx'> 	bool "Verbose mesh peer link debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very</div><div class='ctx'> 	  verbose mesh peer link debugging messages (when mac80211</div><div class='ctx'> 	  is taking part in a mesh network).</div><div class='hunk'>@@ -228,7 +223,7 @@ config MAC80211_MPATH_DEBUG</div><div class='ctx'> 	bool "Verbose mesh path debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very</div><div class='ctx'> 	  verbose mesh path selection debugging messages (when mac80211</div><div class='ctx'> 	  is taking part in a mesh network).</div><div class='hunk'>@@ -241,7 +236,7 @@ config MAC80211_MHWMP_DEBUG</div><div class='ctx'> 	bool "Verbose mesh HWMP routing debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very</div><div class='ctx'> 	  verbose mesh routing (HWMP) debugging messages (when mac80211</div><div class='ctx'> 	  is taking part in a mesh network).</div><div class='hunk'>@@ -254,7 +249,7 @@ config MAC80211_MESH_SYNC_DEBUG</div><div class='ctx'> 	bool "Verbose mesh synchronization debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very verbose mesh</div><div class='ctx'> 	  synchronization debugging messages (when mac80211 is taking part in a</div><div class='ctx'> 	  mesh network).</div><div class='hunk'>@@ -265,7 +260,7 @@ config MAC80211_MESH_CSA_DEBUG</div><div class='ctx'> 	bool "Verbose mesh channel switch debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very verbose mesh</div><div class='ctx'> 	  channel switch debugging messages (when mac80211 is taking part in a</div><div class='ctx'> 	  mesh network).</div><div class='hunk'>@@ -276,7 +271,7 @@ config MAC80211_MESH_PS_DEBUG</div><div class='ctx'> 	bool "Verbose mesh powersave debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_MESH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very verbose mesh</div><div class='ctx'> 	  powersave debugging messages (when mac80211 is taking part in a</div><div class='ctx'> 	  mesh network).</div><div class='hunk'>@@ -286,7 +281,7 @@ config MAC80211_MESH_PS_DEBUG</div><div class='ctx'> config MAC80211_TDLS_DEBUG</div><div class='ctx'> 	bool "Verbose TDLS debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to print out very</div><div class='ctx'> 	  verbose TDLS selection debugging messages (when mac80211</div><div class='ctx'> 	  is a TDLS STA).</div><div class='hunk'>@@ -299,7 +294,7 @@ config MAC80211_DEBUG_COUNTERS</div><div class='ctx'> 	bool "Extra statistics for TX/RX debugging"</div><div class='ctx'> 	depends on MAC80211_DEBUG_MENU</div><div class='ctx'> 	depends on MAC80211_DEBUGFS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Selecting this option causes mac80211 to keep additional</div><div class='ctx'> 	  and very verbose statistics about TX and RX handler use</div><div class='ctx'> 	  as well as a few selected dot11 counters. These will be</div><div class='hunk'>@@ -313,7 +308,7 @@ config MAC80211_DEBUG_COUNTERS</div><div class='ctx'> config MAC80211_STA_HASH_MAX_SIZE</div><div class='ctx'> 	int "Station hash table maximum size" if MAC80211_DEBUG_MENU</div><div class='ctx'> 	default 0</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Setting this option to a low value (e.g. 4) allows testing the</div><div class='ctx'> 	  hash table with collisions relatively deterministically (just</div><div class='ctx'> 	  connect more stations than the number selected here.)</div><div class='head'>diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile<br/>index bb707789ef2b..a33884967f21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/Makefile?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/Makefile</a></div><div class='hunk'>@@ -13,8 +13,10 @@ mac80211-y := \</div><div class='ctx'> 	ht.o agg-tx.o agg-rx.o \</div><div class='ctx'> 	vht.o \</div><div class='ctx'> 	he.o \</div><div class='add'>+	s1g.o \</div><div class='ctx'> 	ibss.o \</div><div class='ctx'> 	iface.o \</div><div class='add'>+	link.o \</div><div class='ctx'> 	rate.o \</div><div class='ctx'> 	michael.o \</div><div class='ctx'> 	tkip.o \</div><div class='hunk'>@@ -27,12 +29,14 @@ mac80211-y := \</div><div class='ctx'> 	spectmgmt.o \</div><div class='ctx'> 	tx.o \</div><div class='ctx'> 	key.o \</div><div class='del'>-	util.o \</div><div class='add'>+	util.o parse.o \</div><div class='ctx'> 	wme.o \</div><div class='ctx'> 	chan.o \</div><div class='ctx'> 	trace.o mlme.o \</div><div class='ctx'> 	tdls.o \</div><div class='del'>-	ocb.o</div><div class='add'>+	ocb.o \</div><div class='add'>+	airtime.o \</div><div class='add'>+	eht.o</div><div class='ctx'> </div><div class='ctx'> mac80211-$(CONFIG_MAC80211_LEDS) += led.o</div><div class='ctx'> mac80211-$(CONFIG_MAC80211_DEBUGFS) += \</div><div class='hunk'>@@ -53,13 +57,16 @@ mac80211-$(CONFIG_PM) += pm.o</div><div class='ctx'> </div><div class='ctx'> CFLAGS_trace.o := -I$(src)</div><div class='ctx'> </div><div class='del'>-rc80211_minstrel-y := rc80211_minstrel.o</div><div class='del'>-rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_debugfs.o</div><div class='add'>+rc80211_minstrel-y := \</div><div class='add'>+	rc80211_minstrel_ht.o</div><div class='ctx'> </div><div class='del'>-rc80211_minstrel_ht-y := rc80211_minstrel_ht.o</div><div class='del'>-rc80211_minstrel_ht-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_ht_debugfs.o</div><div class='add'>+rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += \</div><div class='add'>+	rc80211_minstrel_ht_debugfs.o</div><div class='ctx'> </div><div class='ctx'> mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)</div><div class='del'>-mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)</div><div class='add'>+</div><div class='add'>+obj-y += tests/</div><div class='add'>+</div><div class='add'>+mac80211-y += wbrf.o</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -DDEBUG</div><div class='head'>diff --git a/net/mac80211/aead_api.c b/net/mac80211/aead_api.c<br/>index 160f9df30402..b00d6f5b33f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aead_api.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aead_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aead_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aead_api.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2003-2004, Instant802 Networks, Inc.</div><div class='ctx'>  * Copyright 2005-2006, Devicescape Software, Inc.</div><div class='ctx'>  * Copyright 2014-2015, Qualcomm Atheros, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Rewrite: Copyright (C) 2013 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -26,6 +23,7 @@ int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,</div><div class='ctx'> 	struct aead_request *aead_req;</div><div class='ctx'> 	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);</div><div class='ctx'> 	u8 *__aad;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);</div><div class='ctx'> 	if (!aead_req)</div><div class='hunk'>@@ -43,10 +41,10 @@ int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,</div><div class='ctx'> 	aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);</div><div class='ctx'> 	aead_request_set_ad(aead_req, sg[0].length);</div><div class='ctx'> </div><div class='del'>-	crypto_aead_encrypt(aead_req);</div><div class='del'>-	kzfree(aead_req);</div><div class='add'>+	ret = crypto_aead_encrypt(aead_req);</div><div class='add'>+	kfree_sensitive(aead_req);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,</div><div class='hunk'>@@ -79,7 +77,7 @@ int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,</div><div class='ctx'> 	aead_request_set_ad(aead_req, sg[0].length);</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_aead_decrypt(aead_req);</div><div class='del'>-	kzfree(aead_req);</div><div class='add'>+	kfree_sensitive(aead_req);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/mac80211/aead_api.h b/net/mac80211/aead_api.h<br/>index 5e39ea843bbf..7d463b80926a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aead_api.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aead_api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aead_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aead_api.h</a></div><div class='hunk'>@@ -1,8 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> </div><div class='ctx'> #ifndef _AEAD_API_H</div><div class='ctx'> #define _AEAD_API_H</div><div class='head'>diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h<br/>index e9b7ca0bde5b..96256193cf49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_ccm.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_ccm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_ccm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_ccm.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2003-2004, Instant802 Networks, Inc.</div><div class='ctx'>  * Copyright 2006, Devicescape Software, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef AES_CCM_H</div><div class='head'>diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c<br/>index 2fb65588490c..0827965455dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_cmac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_cmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_cmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_cmac.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * AES-128-CMAC with TLen 16 for IEEE 802.11w BIP</div><div class='ctx'>  * Copyright 2008, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2020 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -18,39 +16,48 @@</div><div class='ctx'> #include "key.h"</div><div class='ctx'> #include "aes_cmac.h"</div><div class='ctx'> </div><div class='del'>-#define CMAC_TLEN 8 /* CMAC TLen = 64 bits (8 octets) */</div><div class='del'>-#define CMAC_TLEN_256 16 /* CMAC TLen = 128 bits (16 octets) */</div><div class='ctx'> #define AAD_LEN 20</div><div class='ctx'> </div><div class='del'>-static const u8 zero[CMAC_TLEN_256];</div><div class='add'>+static const u8 zero[IEEE80211_CMAC_256_MIC_LEN];</div><div class='ctx'> </div><div class='del'>-void ieee80211_aes_cmac(struct crypto_shash *tfm, const u8 *aad,</div><div class='del'>-			const u8 *data, size_t data_len, u8 *mic)</div><div class='add'>+int ieee80211_aes_cmac(struct crypto_shash *tfm, const u8 *aad,</div><div class='add'>+		       const u8 *data, size_t data_len, u8 *mic,</div><div class='add'>+		       unsigned int mic_len)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='ctx'> 	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='ctx'> 	u8 out[AES_BLOCK_SIZE];</div><div class='add'>+	const __le16 *fc;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='ctx'> </div><div class='del'>-	crypto_shash_init(desc);</div><div class='del'>-	crypto_shash_update(desc, aad, AAD_LEN);</div><div class='del'>-	crypto_shash_update(desc, data, data_len - CMAC_TLEN);</div><div class='del'>-	crypto_shash_finup(desc, zero, CMAC_TLEN, out);</div><div class='add'>+	err = crypto_shash_init(desc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = crypto_shash_update(desc, aad, AAD_LEN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	fc = (const __le16 *)aad;</div><div class='add'>+	if (ieee80211_is_beacon(*fc)) {</div><div class='add'>+		/* mask Timestamp field to zero */</div><div class='add'>+		err = crypto_shash_update(desc, zero, 8);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		err = crypto_shash_update(desc, data + 8,</div><div class='add'>+					  data_len - 8 - mic_len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		err = crypto_shash_update(desc, data, data_len - mic_len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	err = crypto_shash_finup(desc, zero, mic_len, out);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	memcpy(mic, out, mic_len);</div><div class='ctx'> </div><div class='del'>-	memcpy(mic, out, CMAC_TLEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ieee80211_aes_cmac_256(struct crypto_shash *tfm, const u8 *aad,</div><div class='del'>-			    const u8 *data, size_t data_len, u8 *mic)</div><div class='del'>-{</div><div class='del'>-	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='del'>-</div><div class='del'>-	desc-&gt;tfm = tfm;</div><div class='del'>-</div><div class='del'>-	crypto_shash_init(desc);</div><div class='del'>-	crypto_shash_update(desc, aad, AAD_LEN);</div><div class='del'>-	crypto_shash_update(desc, data, data_len - CMAC_TLEN_256);</div><div class='del'>-	crypto_shash_finup(desc, zero, CMAC_TLEN_256, mic);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct crypto_shash *ieee80211_aes_cmac_key_setup(const u8 key[],</div><div class='hunk'>@@ -59,8 +66,14 @@ struct crypto_shash *ieee80211_aes_cmac_key_setup(const u8 key[],</div><div class='ctx'> 	struct crypto_shash *tfm;</div><div class='ctx'> </div><div class='ctx'> 	tfm = crypto_alloc_shash("cmac(aes)", 0, 0);</div><div class='del'>-	if (!IS_ERR(tfm))</div><div class='del'>-		crypto_shash_setkey(tfm, key, key_len);</div><div class='add'>+	if (!IS_ERR(tfm)) {</div><div class='add'>+		int err = crypto_shash_setkey(tfm, key, key_len);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			crypto_free_shash(tfm);</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return tfm;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/mac80211/aes_cmac.h b/net/mac80211/aes_cmac.h<br/>index fef531f42003..5f971a8298cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_cmac.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_cmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_cmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_cmac.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef AES_CMAC_H</div><div class='hunk'>@@ -14,10 +11,9 @@</div><div class='ctx'> </div><div class='ctx'> struct crypto_shash *ieee80211_aes_cmac_key_setup(const u8 key[],</div><div class='ctx'> 						  size_t key_len);</div><div class='del'>-void ieee80211_aes_cmac(struct crypto_shash *tfm, const u8 *aad,</div><div class='del'>-			const u8 *data, size_t data_len, u8 *mic);</div><div class='del'>-void ieee80211_aes_cmac_256(struct crypto_shash *tfm, const u8 *aad,</div><div class='del'>-			    const u8 *data, size_t data_len, u8 *mic);</div><div class='add'>+int ieee80211_aes_cmac(struct crypto_shash *tfm, const u8 *aad,</div><div class='add'>+		       const u8 *data, size_t data_len, u8 *mic,</div><div class='add'>+		       unsigned int mic_len);</div><div class='ctx'> void ieee80211_aes_cmac_key_free(struct crypto_shash *tfm);</div><div class='ctx'> </div><div class='ctx'> #endif /* AES_CMAC_H */</div><div class='head'>diff --git a/net/mac80211/aes_gcm.h b/net/mac80211/aes_gcm.h<br/>index d2b096033009..b14093b2f7a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gcm.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gcm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gcm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_gcm.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2014-2015, Qualcomm Atheros, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef AES_GCM_H</div><div class='head'>diff --git a/net/mac80211/aes_gmac.c b/net/mac80211/aes_gmac.c<br/>index bd72a862ddb7..811a83d8d525 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gmac.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_gmac.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * AES-GMAC for IEEE 802.11 BIP-GMAC-128 and BIP-GMAC-256</div><div class='ctx'>  * Copyright 2015, Qualcomm Atheros, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,27 +17,42 @@</div><div class='ctx'> int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,</div><div class='ctx'> 		       const u8 *data, size_t data_len, u8 *mic)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist sg[4];</div><div class='add'>+	struct scatterlist sg[5];</div><div class='ctx'> 	u8 *zero, *__aad, iv[AES_BLOCK_SIZE];</div><div class='ctx'> 	struct aead_request *aead_req;</div><div class='ctx'> 	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);</div><div class='add'>+	const __le16 *fc;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (data_len &lt; GMAC_MIC_LEN)</div><div class='add'>+	if (data_len &lt; IEEE80211_GMAC_MIC_LEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	aead_req = kzalloc(reqsize + GMAC_MIC_LEN + GMAC_AAD_LEN, GFP_ATOMIC);</div><div class='add'>+	aead_req = kzalloc(reqsize + IEEE80211_GMAC_MIC_LEN + GMAC_AAD_LEN,</div><div class='add'>+			   GFP_ATOMIC);</div><div class='ctx'> 	if (!aead_req)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	zero = (u8 *)aead_req + reqsize;</div><div class='del'>-	__aad = zero + GMAC_MIC_LEN;</div><div class='add'>+	__aad = zero + IEEE80211_GMAC_MIC_LEN;</div><div class='ctx'> 	memcpy(__aad, aad, GMAC_AAD_LEN);</div><div class='ctx'> </div><div class='del'>-	sg_init_table(sg, 4);</div><div class='del'>-	sg_set_buf(&amp;sg[0], __aad, GMAC_AAD_LEN);</div><div class='del'>-	sg_set_buf(&amp;sg[1], data, data_len - GMAC_MIC_LEN);</div><div class='del'>-	sg_set_buf(&amp;sg[2], zero, GMAC_MIC_LEN);</div><div class='del'>-	sg_set_buf(&amp;sg[3], mic, GMAC_MIC_LEN);</div><div class='add'>+	fc = (const __le16 *)aad;</div><div class='add'>+	if (ieee80211_is_beacon(*fc)) {</div><div class='add'>+		/* mask Timestamp field to zero */</div><div class='add'>+		sg_init_table(sg, 5);</div><div class='add'>+		sg_set_buf(&amp;sg[0], __aad, GMAC_AAD_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[1], zero, 8);</div><div class='add'>+		sg_set_buf(&amp;sg[2], data + 8,</div><div class='add'>+			   data_len - 8 - IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[3], zero, IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[4], mic, IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+	} else {</div><div class='add'>+		sg_init_table(sg, 4);</div><div class='add'>+		sg_set_buf(&amp;sg[0], __aad, GMAC_AAD_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[1], data, data_len - IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[2], zero, IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+		sg_set_buf(&amp;sg[3], mic, IEEE80211_GMAC_MIC_LEN);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(iv, nonce, GMAC_NONCE_LEN);</div><div class='ctx'> 	memset(iv + GMAC_NONCE_LEN, 0, sizeof(iv) - GMAC_NONCE_LEN);</div><div class='hunk'>@@ -50,10 +62,10 @@ int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,</div><div class='ctx'> 	aead_request_set_crypt(aead_req, sg, sg, 0, iv);</div><div class='ctx'> 	aead_request_set_ad(aead_req, GMAC_AAD_LEN + data_len);</div><div class='ctx'> </div><div class='del'>-	crypto_aead_encrypt(aead_req);</div><div class='del'>-	kzfree(aead_req);</div><div class='add'>+	ret = crypto_aead_encrypt(aead_req);</div><div class='add'>+	kfree_sensitive(aead_req);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],</div><div class='hunk'>@@ -68,7 +80,7 @@ struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_aead_setkey(tfm, key, key_len);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);</div><div class='add'>+		err = crypto_aead_setauthsize(tfm, IEEE80211_GMAC_MIC_LEN);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return tfm;</div><div class='ctx'> </div><div class='head'>diff --git a/net/mac80211/aes_gmac.h b/net/mac80211/aes_gmac.h<br/>index 32e6442c95be..206136b60bca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gmac.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/aes_gmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/aes_gmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/aes_gmac.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2015, Qualcomm Atheros, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef AES_GMAC_H</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GMAC_AAD_LEN	20</div><div class='del'>-#define GMAC_MIC_LEN	16</div><div class='ctx'> #define GMAC_NONCE_LEN	12</div><div class='ctx'> </div><div class='ctx'> struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],</div><div class='head'>diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c<br/>index 6a4f154c99f6..7da909d78c68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/agg-rx.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/agg-rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/agg-rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/agg-rx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * HT handling</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,11 +9,7 @@</div><div class='ctx'>  * Copyright 2007, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='ctx'>  * Copyright 2007-2010, Intel Corporation</div><div class='ctx'>  * Copyright(c) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018        Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -58,8 +55,8 @@ static void ieee80211_free_tid_rx(struct rcu_head *h)</div><div class='ctx'> 	kfree(tid_rx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,</div><div class='del'>-				     u16 initiator, u16 reason, bool tx)</div><div class='add'>+void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,</div><div class='add'>+				    u16 initiator, u16 reason, bool tx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = sta-&gt;local;</div><div class='ctx'> 	struct tid_ampdu_rx *tid_rx;</div><div class='hunk'>@@ -72,10 +69,10 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,</div><div class='ctx'> 		.ssn = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	tid_rx = rcu_dereference_protected(sta-&gt;ampdu_mlme.tid_rx[tid],</div><div class='del'>-					lockdep_is_held(&amp;sta-&gt;ampdu_mlme.mtx));</div><div class='add'>+					lockdep_is_held(&amp;sta-&gt;local-&gt;hw.wiphy-&gt;mtx));</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(tid, sta-&gt;ampdu_mlme.agg_session_valid))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -106,25 +103,17 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,</div><div class='ctx'> 	if (!tid_rx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;tid_rx-&gt;session_timer);</div><div class='add'>+	timer_delete_sync(&amp;tid_rx-&gt;session_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure ieee80211_sta_reorder_release() doesn't re-arm the timer */</div><div class='ctx'> 	spin_lock_bh(&amp;tid_rx-&gt;reorder_lock);</div><div class='ctx'> 	tid_rx-&gt;removed = true;</div><div class='ctx'> 	spin_unlock_bh(&amp;tid_rx-&gt;reorder_lock);</div><div class='del'>-	del_timer_sync(&amp;tid_rx-&gt;reorder_timer);</div><div class='add'>+	timer_delete_sync(&amp;tid_rx-&gt;reorder_timer);</div><div class='ctx'> </div><div class='ctx'> 	call_rcu(&amp;tid_rx-&gt;rcu_head, ieee80211_free_tid_rx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,</div><div class='del'>-				    u16 initiator, u16 reason, bool tx)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-	___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, tx);</div><div class='del'>-	mutex_unlock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,</div><div class='ctx'> 				  const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -143,7 +132,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,</div><div class='ctx'> 		if (ba_rx_bitmap &amp; BIT(i))</div><div class='ctx'> 			set_bit(i, sta-&gt;ampdu_mlme.tid_rx_stop_requested);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_work(&amp;sta-&gt;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(sta-&gt;local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ieee80211_stop_rx_ba_session);</div><div class='hunk'>@@ -154,7 +143,8 @@ EXPORT_SYMBOL(ieee80211_stop_rx_ba_session);</div><div class='ctx'>  */</div><div class='ctx'> static void sta_rx_agg_session_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tid_ampdu_rx *tid_rx = from_timer(tid_rx, t, session_timer);</div><div class='add'>+	struct tid_ampdu_rx *tid_rx = timer_container_of(tid_rx, t,</div><div class='add'>+							 session_timer);</div><div class='ctx'> 	struct sta_info *sta = tid_rx-&gt;sta;</div><div class='ctx'> 	u8 tid = tid_rx-&gt;tid;</div><div class='ctx'> 	unsigned long timeout;</div><div class='hunk'>@@ -169,69 +159,123 @@ static void sta_rx_agg_session_timer_expired(struct timer_list *t)</div><div class='ctx'> 	       sta-&gt;sta.addr, tid);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(tid, sta-&gt;ampdu_mlme.tid_rx_timer_expired);</div><div class='del'>-	ieee80211_queue_work(&amp;sta-&gt;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(sta-&gt;local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sta_rx_agg_reorder_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tid_ampdu_rx *tid_rx = from_timer(tid_rx, t, reorder_timer);</div><div class='add'>+	struct tid_ampdu_rx *tid_rx = timer_container_of(tid_rx, t,</div><div class='add'>+							 reorder_timer);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ieee80211_release_reorder_timeout(tid_rx-&gt;sta, tid_rx-&gt;tid);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *da, u16 tid,</div><div class='add'>+void ieee80211_add_addbaext(struct sk_buff *skb,</div><div class='add'>+			    const u8 req_addba_ext_data,</div><div class='add'>+			    u16 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_addba_ext_ie *addba_ext;</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	pos = skb_put_zero(skb, 2 + sizeof(struct ieee80211_addba_ext_ie));</div><div class='add'>+	*pos++ = WLAN_EID_ADDBA_EXT;</div><div class='add'>+	*pos++ = sizeof(struct ieee80211_addba_ext_ie);</div><div class='add'>+	addba_ext = (struct ieee80211_addba_ext_ie *)pos;</div><div class='add'>+</div><div class='add'>+	addba_ext-&gt;data = IEEE80211_ADDBA_EXT_NO_FRAG;</div><div class='add'>+	if (req_addba_ext_data)</div><div class='add'>+		addba_ext-&gt;data &amp;= req_addba_ext_data;</div><div class='add'>+</div><div class='add'>+	addba_ext-&gt;data |=</div><div class='add'>+		u8_encode_bits(buf_size &gt;&gt; IEEE80211_ADDBA_EXT_BUF_SIZE_SHIFT,</div><div class='add'>+			       IEEE80211_ADDBA_EXT_BUF_SIZE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ieee80211_retrieve_addba_ext_data(struct sta_info *sta,</div><div class='add'>+				     const void *elem_data, ssize_t elem_len,</div><div class='add'>+				     u16 *buf_size)</div><div class='add'>+{</div><div class='add'>+	struct ieee802_11_elems *elems;</div><div class='add'>+	u8 buf_size_1k, data = 0;</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;sta.deflink.he_cap.has_he)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (elem_len &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	elems = ieee802_11_parse_elems(elem_data, elem_len,</div><div class='add'>+				       IEEE80211_FTYPE_MGMT |</div><div class='add'>+				       IEEE80211_STYPE_ACTION,</div><div class='add'>+				       NULL);</div><div class='add'>+</div><div class='add'>+	if (!elems || elems-&gt;parse_error || !elems-&gt;addba_ext_ie)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	data = elems-&gt;addba_ext_ie-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (buf_size &amp;&amp;</div><div class='add'>+	    (sta-&gt;sta.valid_links || sta-&gt;sta.deflink.eht_cap.has_eht)) {</div><div class='add'>+		buf_size_1k = u8_get_bits(elems-&gt;addba_ext_ie-&gt;data,</div><div class='add'>+					  IEEE80211_ADDBA_EXT_BUF_SIZE_MASK);</div><div class='add'>+		*buf_size |= (u16)buf_size_1k &lt;&lt;</div><div class='add'>+			     IEEE80211_ADDBA_EXT_BUF_SIZE_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	kfree(elems);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee80211_send_addba_resp(struct sta_info *sta, u8 *da, u16 tid,</div><div class='ctx'> 				      u8 dialog_token, u16 status, u16 policy,</div><div class='del'>-				      u16 buf_size, u16 timeout)</div><div class='add'>+				      u16 buf_size, u16 timeout,</div><div class='add'>+				      const u8 req_addba_ext_data)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt;</div><div class='ctx'> 	bool amsdu = ieee80211_hw_check(&amp;local-&gt;hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='ctx'> 	u16 capab;</div><div class='ctx'> </div><div class='del'>-	skb = dev_alloc_skb(sizeof(*mgmt) + local-&gt;hw.extra_tx_headroom);</div><div class='add'>+	skb = dev_alloc_skb(sizeof(*mgmt) +</div><div class='add'>+		    2 + sizeof(struct ieee80211_addba_ext_ie) +</div><div class='add'>+		    local-&gt;hw.extra_tx_headroom);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, local-&gt;hw.extra_tx_headroom);</div><div class='del'>-	mgmt = skb_put_zero(skb, 24);</div><div class='del'>-	memcpy(mgmt-&gt;da, da, ETH_ALEN);</div><div class='del'>-	memcpy(mgmt-&gt;sa, sdata-&gt;vif.addr, ETH_ALEN);</div><div class='del'>-	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN ||</div><div class='del'>-	    sdata-&gt;vif.type == NL80211_IFTYPE_MESH_POINT)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;vif.addr, ETH_ALEN);</div><div class='del'>-	else if (sdata-&gt;vif.type == NL80211_IFTYPE_STATION)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;u.mgd.bssid, ETH_ALEN);</div><div class='del'>-	else if (sdata-&gt;vif.type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;u.ibss.bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	mgmt-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='del'>-					  IEEE80211_STYPE_ACTION);</div><div class='add'>+	mgmt = ieee80211_mgmt_ba(skb, da, sdata);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(skb, 1 + sizeof(mgmt-&gt;u.action.u.addba_resp));</div><div class='ctx'> 	mgmt-&gt;u.action.category = WLAN_CATEGORY_BACK;</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_resp.action_code = WLAN_ACTION_ADDBA_RESP;</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_resp.dialog_token = dialog_token;</div><div class='ctx'> </div><div class='del'>-	capab = (u16)(amsdu &lt;&lt; 0);	/* bit 0 A-MSDU support */</div><div class='del'>-	capab |= (u16)(policy &lt;&lt; 1);	/* bit 1 aggregation policy */</div><div class='del'>-	capab |= (u16)(tid &lt;&lt; 2); 	/* bit 5:2 TID number */</div><div class='del'>-	capab |= (u16)(buf_size &lt;&lt; 6);	/* bit 15:6 max size of aggregation */</div><div class='add'>+	capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK);</div><div class='add'>+	capab |= u16_encode_bits(policy, IEEE80211_ADDBA_PARAM_POLICY_MASK);</div><div class='add'>+	capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);</div><div class='add'>+	capab |= u16_encode_bits(buf_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_resp.capab = cpu_to_le16(capab);</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_resp.timeout = cpu_to_le16(timeout);</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_resp.status = cpu_to_le16(status);</div><div class='ctx'> </div><div class='add'>+	if (sta-&gt;sta.valid_links || sta-&gt;sta.deflink.he_cap.has_he)</div><div class='add'>+		ieee80211_add_addbaext(skb, req_addba_ext_data, buf_size);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_tx_skb(sdata, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='del'>-				      u8 dialog_token, u16 timeout,</div><div class='del'>-				      u16 start_seq_num, u16 ba_policy, u16 tid,</div><div class='del'>-				      u16 buf_size, bool tx, bool auto_seq)</div><div class='add'>+void __ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='add'>+				     u8 dialog_token, u16 timeout,</div><div class='add'>+				     u16 start_seq_num, u16 ba_policy, u16 tid,</div><div class='add'>+				     u16 buf_size, bool tx, bool auto_seq,</div><div class='add'>+				     const u8 addba_ext_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = sta-&gt;sdata-&gt;local;</div><div class='ctx'> 	struct tid_ampdu_rx *tid_agg_rx;</div><div class='hunk'>@@ -247,6 +291,8 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 	u16 status = WLAN_STATUS_REQUEST_DECLINED;</div><div class='ctx'> 	u16 max_buf_size;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	if (tid &gt;= IEEE80211_FIRST_TSPEC_TSID) {</div><div class='ctx'> 		ht_dbg(sta-&gt;sdata,</div><div class='ctx'> 		       "STA %pM requests BA session on unsupported tid %d\n",</div><div class='hunk'>@@ -254,9 +300,12 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;sta.ht_cap.ht_supported) {</div><div class='add'>+	if (!sta-&gt;sta.valid_links &amp;&amp;</div><div class='add'>+	    !sta-&gt;sta.deflink.ht_cap.ht_supported &amp;&amp;</div><div class='add'>+	    !sta-&gt;sta.deflink.he_cap.has_he &amp;&amp;</div><div class='add'>+	    !sta-&gt;sta.deflink.s1g_cap.s1g) {</div><div class='ctx'> 		ht_dbg(sta-&gt;sdata,</div><div class='del'>-		       "STA %pM erroneously requests BA session on tid %d w/o QoS\n",</div><div class='add'>+		       "STA %pM erroneously requests BA session on tid %d w/o HT\n",</div><div class='ctx'> 		       sta-&gt;sta.addr, tid);</div><div class='ctx'> 		/* send a response anyway, it's an error case if we get here */</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -269,8 +318,10 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;sta.he_cap.has_he)</div><div class='del'>-		max_buf_size = IEEE80211_MAX_AMPDU_BUF;</div><div class='add'>+	if (sta-&gt;sta.valid_links || sta-&gt;sta.deflink.eht_cap.has_eht)</div><div class='add'>+		max_buf_size = IEEE80211_MAX_AMPDU_BUF_EHT;</div><div class='add'>+	else if (sta-&gt;sta.deflink.he_cap.has_he)</div><div class='add'>+		max_buf_size = IEEE80211_MAX_AMPDU_BUF_HE;</div><div class='ctx'> 	else</div><div class='ctx'> 		max_buf_size = IEEE80211_MAX_AMPDU_BUF_HT;</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +330,9 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 	 * and if buffer size does not exceeds max value */</div><div class='ctx'> 	/* XXX: check own ht delayed BA capability?? */</div><div class='ctx'> 	if (((ba_policy != 1) &amp;&amp;</div><div class='del'>-	     (!(sta-&gt;sta.ht_cap.cap &amp; IEEE80211_HT_CAP_DELAY_BA))) ||</div><div class='add'>+	     (sta-&gt;sta.valid_links ||</div><div class='add'>+	      !(sta-&gt;sta.deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_DELAY_BA) ||</div><div class='add'>+	      !(sta-&gt;sta.deflink.s1g_cap.cap[3] &amp; S1G_CAP3_HT_DELAYED_BA))) ||</div><div class='ctx'> 	    (buf_size &gt; max_buf_size)) {</div><div class='ctx'> 		status = WLAN_STATUS_INVALID_QOS_PARAM;</div><div class='ctx'> 		ht_dbg_ratelimited(sta-&gt;sdata,</div><div class='hunk'>@@ -299,9 +352,6 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 	ht_dbg(sta-&gt;sdata, "AddBA Req buf_size=%d for %pM\n",</div><div class='ctx'> 	       buf_size, sta-&gt;sta.addr);</div><div class='ctx'> </div><div class='del'>-	/* examine state machine */</div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-</div><div class='ctx'> 	if (test_bit(tid, sta-&gt;ampdu_mlme.agg_session_valid)) {</div><div class='ctx'> 		if (sta-&gt;ampdu_mlme.tid_rx_token[tid] == dialog_token) {</div><div class='ctx'> 			struct tid_ampdu_rx *tid_rx;</div><div class='hunk'>@@ -311,7 +361,7 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 					   sta-&gt;sta.addr, tid);</div><div class='ctx'> 			/* We have no API to update the timeout value in the</div><div class='ctx'> 			 * driver so reject the timeout update if the timeout</div><div class='del'>-			 * changed. If if did not change, i.e., no real update,</div><div class='add'>+			 * changed. If it did not change, i.e., no real update,</div><div class='ctx'> 			 * just reply with success.</div><div class='ctx'> 			 */</div><div class='ctx'> 			rcu_read_lock();</div><div class='hunk'>@@ -329,9 +379,9 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='ctx'> 				   sta-&gt;sta.addr, tid);</div><div class='ctx'> </div><div class='ctx'> 		/* delete existing Rx BA session on the same tid */</div><div class='del'>-		___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,</div><div class='del'>-						WLAN_STATUS_UNSPECIFIED_QOS,</div><div class='del'>-						false);</div><div class='add'>+		__ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,</div><div class='add'>+					       WLAN_STATUS_UNSPECIFIED_QOS,</div><div class='add'>+					       false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_hw_check(&amp;local-&gt;hw, SUPPORTS_REORDERING_BUFFER)) {</div><div class='hunk'>@@ -413,22 +463,9 @@ end:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tx)</div><div class='del'>-		ieee80211_send_addba_resp(sta-&gt;sdata, sta-&gt;sta.addr, tid,</div><div class='add'>+		ieee80211_send_addba_resp(sta, sta-&gt;sta.addr, tid,</div><div class='ctx'> 					  dialog_token, status, 1, buf_size,</div><div class='del'>-					  timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __ieee80211_start_rx_ba_session(struct sta_info *sta,</div><div class='del'>-					    u8 dialog_token, u16 timeout,</div><div class='del'>-					    u16 start_seq_num, u16 ba_policy,</div><div class='del'>-					    u16 tid, u16 buf_size, bool tx,</div><div class='del'>-					    bool auto_seq)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-	___ieee80211_start_rx_ba_session(sta, dialog_token, timeout,</div><div class='del'>-					 start_seq_num, ba_policy, tid,</div><div class='del'>-					 buf_size, tx, auto_seq);</div><div class='del'>-	mutex_unlock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+					  timeout, addba_ext_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ieee80211_process_addba_request(struct ieee80211_local *local,</div><div class='hunk'>@@ -437,7 +474,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,</div><div class='ctx'> 				     size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	u16 capab, tid, timeout, ba_policy, buf_size, start_seq_num;</div><div class='del'>-	u8 dialog_token;</div><div class='add'>+	u8 dialog_token, addba_ext_data;</div><div class='ctx'> </div><div class='ctx'> 	/* extract session parameters from addba request frame */</div><div class='ctx'> 	dialog_token = mgmt-&gt;u.action.u.addba_req.dialog_token;</div><div class='hunk'>@@ -450,16 +487,23 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,</div><div class='ctx'> 	tid = (capab &amp; IEEE80211_ADDBA_PARAM_TID_MASK) &gt;&gt; 2;</div><div class='ctx'> 	buf_size = (capab &amp; IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) &gt;&gt; 6;</div><div class='ctx'> </div><div class='add'>+	addba_ext_data =</div><div class='add'>+		ieee80211_retrieve_addba_ext_data(sta,</div><div class='add'>+						  mgmt-&gt;u.action.u.addba_req.variable,</div><div class='add'>+						  len -</div><div class='add'>+						  offsetof(typeof(*mgmt),</div><div class='add'>+							   u.action.u.addba_req.variable),</div><div class='add'>+						  &amp;buf_size);</div><div class='add'>+</div><div class='ctx'> 	__ieee80211_start_rx_ba_session(sta, dialog_token, timeout,</div><div class='ctx'> 					start_seq_num, ba_policy, tid,</div><div class='del'>-					buf_size, true, false);</div><div class='add'>+					buf_size, true, false, addba_ext_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ieee80211_manage_rx_ba_offl(struct ieee80211_vif *vif,</div><div class='ctx'> 				 const u8 *addr, unsigned int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='del'>-	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -468,7 +512,7 @@ void ieee80211_manage_rx_ba_offl(struct ieee80211_vif *vif,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(tid, sta-&gt;ampdu_mlme.tid_rx_manage_offl);</div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(sta-&gt;local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'>  unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -478,7 +522,6 @@ void ieee80211_rx_ba_timer_expired(struct ieee80211_vif *vif,</div><div class='ctx'> 				   const u8 *addr, unsigned int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='del'>-	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -487,7 +530,7 @@ void ieee80211_rx_ba_timer_expired(struct ieee80211_vif *vif,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(tid, sta-&gt;ampdu_mlme.tid_rx_timer_expired);</div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(sta-&gt;local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'> </div><div class='ctx'>  unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='head'>diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c<br/>index 69e831bc317b..d981b0fc57bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/agg-tx.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/agg-tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/agg-tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/agg-tx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * HT handling</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,11 +9,7 @@</div><div class='ctx'>  * Copyright 2007, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='ctx'>  * Copyright 2007-2010, Intel Corporation</div><div class='ctx'>  * Copyright(c) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2018 - 2024 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='hunk'>@@ -61,36 +58,24 @@</div><div class='ctx'>  * complete.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-					 const u8 *da, u16 tid,</div><div class='add'>+static void ieee80211_send_addba_request(struct sta_info *sta, u16 tid,</div><div class='ctx'> 					 u8 dialog_token, u16 start_seq_num,</div><div class='ctx'> 					 u16 agg_size, u16 timeout)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt;</div><div class='ctx'> 	u16 capab;</div><div class='ctx'> </div><div class='del'>-	skb = dev_alloc_skb(sizeof(*mgmt) + local-&gt;hw.extra_tx_headroom);</div><div class='del'>-</div><div class='add'>+	skb = dev_alloc_skb(sizeof(*mgmt) +</div><div class='add'>+			    2 + sizeof(struct ieee80211_addba_ext_ie) +</div><div class='add'>+			    local-&gt;hw.extra_tx_headroom);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, local-&gt;hw.extra_tx_headroom);</div><div class='del'>-	mgmt = skb_put_zero(skb, 24);</div><div class='del'>-	memcpy(mgmt-&gt;da, da, ETH_ALEN);</div><div class='del'>-	memcpy(mgmt-&gt;sa, sdata-&gt;vif.addr, ETH_ALEN);</div><div class='del'>-	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN ||</div><div class='del'>-	    sdata-&gt;vif.type == NL80211_IFTYPE_MESH_POINT)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;vif.addr, ETH_ALEN);</div><div class='del'>-	else if (sdata-&gt;vif.type == NL80211_IFTYPE_STATION)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;u.mgd.bssid, ETH_ALEN);</div><div class='del'>-	else if (sdata-&gt;vif.type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		memcpy(mgmt-&gt;bssid, sdata-&gt;u.ibss.bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	mgmt-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='del'>-					  IEEE80211_STYPE_ACTION);</div><div class='add'>+	mgmt = ieee80211_mgmt_ba(skb, sta-&gt;sta.addr, sdata);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(skb, 1 + sizeof(mgmt-&gt;u.action.u.addba_req));</div><div class='ctx'> </div><div class='hunk'>@@ -98,10 +83,10 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_req.action_code = WLAN_ACTION_ADDBA_REQ;</div><div class='ctx'> </div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_req.dialog_token = dialog_token;</div><div class='del'>-	capab = (u16)(1 &lt;&lt; 0);		/* bit 0 A-MSDU support */</div><div class='del'>-	capab |= (u16)(1 &lt;&lt; 1);		/* bit 1 aggregation policy */</div><div class='del'>-	capab |= (u16)(tid &lt;&lt; 2); 	/* bit 5:2 TID number */</div><div class='del'>-	capab |= (u16)(agg_size &lt;&lt; 6);	/* bit 15:6 max size of aggergation */</div><div class='add'>+	capab = IEEE80211_ADDBA_PARAM_AMSDU_MASK;</div><div class='add'>+	capab |= IEEE80211_ADDBA_PARAM_POLICY_MASK;</div><div class='add'>+	capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);</div><div class='add'>+	capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_req.capab = cpu_to_le16(capab);</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +94,10 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	mgmt-&gt;u.action.u.addba_req.start_seq_num =</div><div class='ctx'> 					cpu_to_le16(start_seq_num &lt;&lt; 4);</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_skb(sdata, skb);</div><div class='add'>+	if (sta-&gt;sta.deflink.he_cap.has_he)</div><div class='add'>+		ieee80211_add_addbaext(skb, 0, agg_size);</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_skb_tid(sdata, skb, tid, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)</div><div class='hunk'>@@ -138,14 +126,14 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)</div><div class='ctx'> </div><div class='ctx'> 	IEEE80211_SKB_CB(skb)-&gt;flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |</div><div class='ctx'> 					IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='del'>-	ieee80211_tx_skb_tid(sdata, skb, tid);</div><div class='add'>+	ieee80211_tx_skb_tid(sdata, skb, tid, -1);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ieee80211_send_bar);</div><div class='ctx'> </div><div class='ctx'> void ieee80211_assign_tid_tx(struct sta_info *sta, int tid,</div><div class='ctx'> 			     struct tid_ampdu_tx *tid_tx)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> 	lockdep_assert_held(&amp;sta-&gt;lock);</div><div class='ctx'> 	rcu_assign_pointer(sta-&gt;ampdu_mlme.tid_tx[tid], tid_tx);</div><div class='ctx'> }</div><div class='hunk'>@@ -216,6 +204,8 @@ ieee80211_agg_start_txq(struct sta_info *sta, int tid, bool enable)</div><div class='ctx'> 	struct ieee80211_txq *txq = sta-&gt;sta.txq[tid];</div><div class='ctx'> 	struct txq_info *txqi;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	if (!txq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +219,7 @@ ieee80211_agg_start_txq(struct sta_info *sta, int tid, bool enable)</div><div class='ctx'> 	clear_bit(IEEE80211_TXQ_STOP, &amp;txqi-&gt;flags);</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	drv_wake_tx_queue(sta-&gt;sdata-&gt;local, txqi);</div><div class='add'>+	schedule_and_wake_txq(sta-&gt;sdata-&gt;local, txqi);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='hunk'>@@ -272,7 +262,7 @@ static void ieee80211_remove_tid_tx(struct sta_info *sta, int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct tid_ampdu_tx *tid_tx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> 	lockdep_assert_held(&amp;sta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);</div><div class='hunk'>@@ -293,13 +283,12 @@ static void ieee80211_remove_tid_tx(struct sta_info *sta, int tid)</div><div class='ctx'> 	ieee80211_assign_tid_tx(sta, tid, NULL);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_agg_splice_finish(sta-&gt;sdata, tid);</div><div class='del'>-	ieee80211_agg_start_txq(sta, tid, false);</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(tid_tx, rcu_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='del'>-				    enum ieee80211_agg_stop_reason reason)</div><div class='add'>+int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='add'>+				   enum ieee80211_agg_stop_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = sta-&gt;local;</div><div class='ctx'> 	struct tid_ampdu_tx *tid_tx;</div><div class='hunk'>@@ -313,7 +302,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	switch (reason) {</div><div class='ctx'> 	case AGG_STOP_DECLINED:</div><div class='hunk'>@@ -366,13 +355,15 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HT_AGG_STATE_STOPPING, &amp;tid_tx-&gt;state);</div><div class='ctx'> </div><div class='add'>+	ieee80211_agg_stop_txq(sta, tid);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ht_dbg(sta-&gt;sdata, "Tx BA session stop requested for %pM tid %u\n",</div><div class='ctx'> 	       sta-&gt;sta.addr, tid);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;tid_tx-&gt;addba_resp_timer);</div><div class='del'>-	del_timer_sync(&amp;tid_tx-&gt;session_timer);</div><div class='add'>+	timer_delete_sync(&amp;tid_tx-&gt;addba_resp_timer);</div><div class='add'>+	timer_delete_sync(&amp;tid_tx-&gt;session_timer);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * After this packets are no longer handed right through</div><div class='hunk'>@@ -431,7 +422,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='ctx'>  */</div><div class='ctx'> static void sta_addba_resp_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tid_ampdu_tx *tid_tx = from_timer(tid_tx, t, addba_resp_timer);</div><div class='add'>+	struct tid_ampdu_tx *tid_tx = timer_container_of(tid_tx, t,</div><div class='add'>+							 addba_resp_timer);</div><div class='ctx'> 	struct sta_info *sta = tid_tx-&gt;sta;</div><div class='ctx'> 	u8 tid = tid_tx-&gt;tid;</div><div class='ctx'> </div><div class='hunk'>@@ -449,6 +441,54 @@ static void sta_addba_resp_timer_expired(struct timer_list *t)</div><div class='ctx'> 	ieee80211_stop_tx_ba_session(&amp;sta-&gt;sta, tid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ieee80211_send_addba_with_timeout(struct sta_info *sta,</div><div class='add'>+					      struct tid_ampdu_tx *tid_tx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='add'>+	struct ieee80211_local *local = sta-&gt;local;</div><div class='add'>+	u8 tid = tid_tx-&gt;tid;</div><div class='add'>+	u16 buf_size;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(test_bit(HT_AGG_STATE_STOPPING, &amp;tid_tx-&gt;state) ||</div><div class='add'>+			 test_bit(HT_AGG_STATE_WANT_STOP, &amp;tid_tx-&gt;state)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	/* activate the timer for the recipient's addBA response */</div><div class='add'>+	mod_timer(&amp;tid_tx-&gt;addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);</div><div class='add'>+	ht_dbg(sdata, "activated addBA response timer on %pM tid %d\n",</div><div class='add'>+	       sta-&gt;sta.addr, tid);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sta-&gt;lock);</div><div class='add'>+	sta-&gt;ampdu_mlme.last_addba_req_time[tid] = jiffies;</div><div class='add'>+	sta-&gt;ampdu_mlme.addba_req_num[tid]++;</div><div class='add'>+	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;sta.valid_links ||</div><div class='add'>+	    sta-&gt;sta.deflink.eht_cap.has_eht ||</div><div class='add'>+	    ieee80211_hw_check(&amp;local-&gt;hw, STRICT)) {</div><div class='add'>+		buf_size = local-&gt;hw.max_tx_aggregation_subframes;</div><div class='add'>+	} else if (sta-&gt;sta.deflink.he_cap.has_he) {</div><div class='add'>+		buf_size = min_t(u16, local-&gt;hw.max_tx_aggregation_subframes,</div><div class='add'>+				 IEEE80211_MAX_AMPDU_BUF_HE);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * We really should use what the driver told us it will</div><div class='add'>+		 * transmit as the maximum, but certain APs (e.g. the</div><div class='add'>+		 * LinkSys WRT120N with FW v1.0.07 build 002 Jun 18 2012)</div><div class='add'>+		 * will crash when we use a lower number.</div><div class='add'>+		 */</div><div class='add'>+		buf_size = IEEE80211_MAX_AMPDU_BUF_HT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* send AddBA request */</div><div class='add'>+	ieee80211_send_addba_request(sta, tid, tid_tx-&gt;dialog_token,</div><div class='add'>+				     tid_tx-&gt;ssn, buf_size, tid_tx-&gt;timeout);</div><div class='add'>+</div><div class='add'>+	WARN_ON(test_and_set_bit(HT_AGG_STATE_SENT_ADDBA, &amp;tid_tx-&gt;state));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct tid_ampdu_tx *tid_tx;</div><div class='hunk'>@@ -463,7 +503,6 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'> 		.timeout = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='del'>-	u16 buf_size;</div><div class='ctx'> </div><div class='ctx'> 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);</div><div class='ctx'> </div><div class='hunk'>@@ -474,8 +513,6 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit(HT_AGG_STATE_WANT_START, &amp;tid_tx-&gt;state);</div><div class='ctx'> </div><div class='del'>-	ieee80211_agg_stop_txq(sta, tid);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure no packets are being processed. This ensures that</div><div class='ctx'> 	 * we have a valid starting sequence number and that in-flight</div><div class='hunk'>@@ -486,7 +523,17 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'> </div><div class='ctx'> 	params.ssn = sta-&gt;tid_seq[tid] &gt;&gt; 4;</div><div class='ctx'> 	ret = drv_ampdu_action(local, sdata, &amp;params);</div><div class='del'>-	if (ret) {</div><div class='add'>+	tid_tx-&gt;ssn = params.ssn;</div><div class='add'>+	if (ret == IEEE80211_AMPDU_TX_START_DELAY_ADDBA) {</div><div class='add'>+		return;</div><div class='add'>+	} else if (ret == IEEE80211_AMPDU_TX_START_IMMEDIATE) {</div><div class='add'>+		/*</div><div class='add'>+		 * We didn't send the request yet, so don't need to check</div><div class='add'>+		 * here if we already got a response, just mark as driver</div><div class='add'>+		 * ready immediately.</div><div class='add'>+		 */</div><div class='add'>+		set_bit(HT_AGG_STATE_DRV_READY, &amp;tid_tx-&gt;state);</div><div class='add'>+	} else if (ret) {</div><div class='ctx'> 		ht_dbg(sdata,</div><div class='ctx'> 		       "BA request denied - HW unavailable for %pM tid %d\n",</div><div class='ctx'> 		       sta-&gt;sta.addr, tid);</div><div class='hunk'>@@ -502,33 +549,25 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* activate the timer for the recipient's addBA response */</div><div class='del'>-	mod_timer(&amp;tid_tx-&gt;addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);</div><div class='del'>-	ht_dbg(sdata, "activated addBA response timer on %pM tid %d\n",</div><div class='del'>-	       sta-&gt;sta.addr, tid);</div><div class='add'>+	ieee80211_send_addba_with_timeout(sta, tid_tx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;sta-&gt;lock);</div><div class='del'>-	sta-&gt;ampdu_mlme.last_addba_req_time[tid] = jiffies;</div><div class='del'>-	sta-&gt;ampdu_mlme.addba_req_num[tid]++;</div><div class='del'>-	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='add'>+void ieee80211_refresh_tx_agg_session_timer(struct ieee80211_sta *pubsta,</div><div class='add'>+					    u16 tid)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);</div><div class='add'>+	struct tid_ampdu_tx *tid_tx;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;sta.he_cap.has_he) {</div><div class='del'>-		buf_size = local-&gt;hw.max_tx_aggregation_subframes;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * We really should use what the driver told us it will</div><div class='del'>-		 * transmit as the maximum, but certain APs (e.g. the</div><div class='del'>-		 * LinkSys WRT120N with FW v1.0.07 build 002 Jun 18 2012)</div><div class='del'>-		 * will crash when we use a lower number.</div><div class='del'>-		 */</div><div class='del'>-		buf_size = IEEE80211_MAX_AMPDU_BUF_HT;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON_ONCE(tid &gt;= IEEE80211_NUM_TIDS))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* send AddBA request */</div><div class='del'>-	ieee80211_send_addba_request(sdata, sta-&gt;sta.addr, tid,</div><div class='del'>-				     tid_tx-&gt;dialog_token, params.ssn,</div><div class='del'>-				     buf_size, tid_tx-&gt;timeout);</div><div class='add'>+	tid_tx = rcu_dereference(sta-&gt;ampdu_mlme.tid_tx[tid]);</div><div class='add'>+	if (!tid_tx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tid_tx-&gt;last_tx = jiffies;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ieee80211_refresh_tx_agg_session_timer);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * After accepting the AddBA Response we activated a timer,</div><div class='hunk'>@@ -536,7 +575,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)</div><div class='ctx'>  */</div><div class='ctx'> static void sta_tx_agg_session_timer_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tid_ampdu_tx *tid_tx = from_timer(tid_tx, t, session_timer);</div><div class='add'>+	struct tid_ampdu_tx *tid_tx = timer_container_of(tid_tx, t,</div><div class='add'>+							 session_timer);</div><div class='ctx'> 	struct sta_info *sta = tid_tx-&gt;sta;</div><div class='ctx'> 	u8 tid = tid_tx-&gt;tid;</div><div class='ctx'> 	unsigned long timeout;</div><div class='hunk'>@@ -572,7 +612,12 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,</div><div class='ctx'> 		 "Requested to start BA session on reserved tid=%d", tid))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!pubsta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!pubsta-&gt;valid_links &amp;&amp;</div><div class='add'>+	    !pubsta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='add'>+	    !pubsta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='add'>+	    !pubsta-&gt;deflink.he_cap.has_he &amp;&amp;</div><div class='add'>+	    !pubsta-&gt;deflink.eht_cap.has_eht &amp;&amp;</div><div class='add'>+	    !pubsta-&gt;deflink.s1g_cap.s1g)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!local-&gt;ops-&gt;ampdu_action))</div><div class='hunk'>@@ -603,6 +648,14 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_sta_flag(sta, WLAN_STA_MFP) &amp;&amp;</div><div class='add'>+	    !test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {</div><div class='add'>+		ht_dbg(sdata,</div><div class='add'>+		       "MFP STA not authorized - deny BA session request %pM tid %d\n",</div><div class='add'>+		       sta-&gt;sta.addr, tid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 802.11n-2009 11.5.1.1: If the initiating STA is an HT STA, is a</div><div class='ctx'> 	 * member of an IBSS, and has no other existing Block Ack agreement</div><div class='hunk'>@@ -616,7 +669,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,</div><div class='ctx'> 	 * is set when we receive a bss info from a probe response or a beacon.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sta-&gt;sdata-&gt;vif.type == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='del'>-	    !sta-&gt;sta.ht_cap.ht_supported) {</div><div class='add'>+	    !sta-&gt;sta.deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		ht_dbg(sdata,</div><div class='ctx'> 		       "BA request denied - IBSS STA %pM does not advertise HT support\n",</div><div class='ctx'> 		       pubsta-&gt;addr);</div><div class='hunk'>@@ -687,7 +740,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sta-&gt;ampdu_mlme.tid_start_tx[tid] = tid_tx;</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'> </div><div class='ctx'> 	/* this flow continues off the work */</div><div class='ctx'>  err_unlock_sta:</div><div class='hunk'>@@ -708,7 +761,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,</div><div class='ctx'> 		.ssn = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);</div><div class='ctx'> 	params.buf_size = tid_tx-&gt;buf_size;</div><div class='hunk'>@@ -745,9 +798,21 @@ void ieee80211_start_tx_ba_cb(struct sta_info *sta, int tid,</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &amp;tid_tx-&gt;state)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(HT_AGG_STATE_STOPPING, &amp;tid_tx-&gt;state) ||</div><div class='add'>+	    test_bit(HT_AGG_STATE_WANT_STOP, &amp;tid_tx-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HT_AGG_STATE_SENT_ADDBA, &amp;tid_tx-&gt;state)) {</div><div class='add'>+		ieee80211_send_addba_with_timeout(sta, tid_tx);</div><div class='add'>+		/* RESPONSE_RECEIVED state would trigger the flow again */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &amp;tid_tx-&gt;state))</div><div class='ctx'> 		ieee80211_agg_tx_operational(local, sta, tid);</div><div class='ctx'> }</div><div class='hunk'>@@ -794,26 +859,12 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HT_AGG_STATE_START_CB, &amp;tid_tx-&gt;state);</div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'>  out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);</div><div class='ctx'> </div><div class='del'>-int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,</div><div class='del'>-				   enum ieee80211_agg_stop_reason reason)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-</div><div class='del'>-	ret = ___ieee80211_stop_tx_ba_session(sta, tid, reason);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);</div><div class='hunk'>@@ -848,7 +899,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HT_AGG_STATE_WANT_STOP, &amp;tid_tx-&gt;state);</div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'> </div><div class='ctx'>  unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='hunk'>@@ -861,6 +912,7 @@ void ieee80211_stop_tx_ba_cb(struct sta_info *sta, int tid,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='ctx'> 	bool send_delba = false;</div><div class='add'>+	bool start_txq = false;</div><div class='ctx'> </div><div class='ctx'> 	ht_dbg(sdata, "Stopping Tx BA session for %pM tid %d\n",</div><div class='ctx'> 	       sta-&gt;sta.addr, tid);</div><div class='hunk'>@@ -878,10 +930,14 @@ void ieee80211_stop_tx_ba_cb(struct sta_info *sta, int tid,</div><div class='ctx'> 		send_delba = true;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_remove_tid_tx(sta, tid);</div><div class='add'>+	start_txq = true;</div><div class='ctx'> </div><div class='ctx'>  unlock_sta:</div><div class='ctx'> 	spin_unlock_bh(&amp;sta-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (start_txq)</div><div class='add'>+		ieee80211_agg_start_txq(sta, tid, false);</div><div class='add'>+</div><div class='ctx'> 	if (send_delba)</div><div class='ctx'> 		ieee80211_send_delba(sdata, sta-&gt;sta.addr, tid,</div><div class='ctx'> 			WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);</div><div class='hunk'>@@ -903,7 +959,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HT_AGG_STATE_STOP_CB, &amp;tid_tx-&gt;state);</div><div class='del'>-	ieee80211_queue_work(&amp;local-&gt;hw, &amp;sta-&gt;ampdu_mlme.work);</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;sta-&gt;ampdu_mlme.work);</div><div class='ctx'>  out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -920,29 +976,36 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,</div><div class='ctx'> 	u16 capab, tid, buf_size;</div><div class='ctx'> 	bool amsdu;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sta-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	capab = le16_to_cpu(mgmt-&gt;u.action.u.addba_resp.capab);</div><div class='ctx'> 	amsdu = capab &amp; IEEE80211_ADDBA_PARAM_AMSDU_MASK;</div><div class='del'>-	tid = (capab &amp; IEEE80211_ADDBA_PARAM_TID_MASK) &gt;&gt; 2;</div><div class='del'>-	buf_size = (capab &amp; IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) &gt;&gt; 6;</div><div class='add'>+	tid = u16_get_bits(capab, IEEE80211_ADDBA_PARAM_TID_MASK);</div><div class='add'>+	buf_size = u16_get_bits(capab, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);</div><div class='add'>+</div><div class='add'>+	ieee80211_retrieve_addba_ext_data(sta,</div><div class='add'>+					  mgmt-&gt;u.action.u.addba_resp.variable,</div><div class='add'>+					  len - offsetof(typeof(*mgmt),</div><div class='add'>+							 u.action.u.addba_resp.variable),</div><div class='add'>+					  &amp;buf_size);</div><div class='add'>+</div><div class='ctx'> 	buf_size = min(buf_size, local-&gt;hw.max_tx_aggregation_subframes);</div><div class='ctx'> </div><div class='ctx'> 	txq = sta-&gt;sta.txq[tid];</div><div class='ctx'> 	if (!amsdu &amp;&amp; txq)</div><div class='ctx'> 		set_bit(IEEE80211_TXQ_NO_AMSDU, &amp;to_txq_info(txq)-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='del'>-</div><div class='ctx'> 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);</div><div class='ctx'> 	if (!tid_tx)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (mgmt-&gt;u.action.u.addba_resp.dialog_token != tid_tx-&gt;dialog_token) {</div><div class='ctx'> 		ht_dbg(sta-&gt;sdata, "wrong addBA response token, %pM tid %d\n",</div><div class='ctx'> 		       sta-&gt;sta.addr, tid);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;tid_tx-&gt;addba_resp_timer);</div><div class='add'>+	timer_delete_sync(&amp;tid_tx-&gt;addba_resp_timer);</div><div class='ctx'> </div><div class='ctx'> 	ht_dbg(sta-&gt;sdata, "switched off addBA timer for %pM tid %d\n",</div><div class='ctx'> 	       sta-&gt;sta.addr, tid);</div><div class='hunk'>@@ -957,7 +1020,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,</div><div class='ctx'> 		ht_dbg(sta-&gt;sdata,</div><div class='ctx'> 		       "got addBA resp for %pM tid %d but we already gave up\n",</div><div class='ctx'> 		       sta-&gt;sta.addr, tid);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -971,7 +1034,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,</div><div class='ctx'> 		if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED,</div><div class='ctx'> 				     &amp;tid_tx-&gt;state)) {</div><div class='ctx'> 			/* ignore duplicate response */</div><div class='del'>-			goto out;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tid_tx-&gt;buf_size = buf_size;</div><div class='hunk'>@@ -992,9 +1055,6 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		___ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_DECLINED);</div><div class='add'>+		__ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_DECLINED);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;sta-&gt;ampdu_mlme.mtx);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c<br/>new file mode 100644<br/>index 000000000000..c61df637232a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/airtime.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/airtime.c</a></div><div class='hunk'>@@ -0,0 +1,837 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ * Copyright (C) 2021-2022 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "ieee80211_i.h"</div><div class='add'>+#include "sta_info.h"</div><div class='add'>+</div><div class='add'>+#define AVG_PKT_SIZE	1024</div><div class='add'>+</div><div class='add'>+/* Number of bits for an average sized packet */</div><div class='add'>+#define MCS_NBITS (AVG_PKT_SIZE &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+/* Number of kilo-symbols (symbols * 1024) for a packet with (bps) bits per</div><div class='add'>+ * symbol. We use k-symbols to avoid rounding in the _TIME macros below.</div><div class='add'>+ */</div><div class='add'>+#define MCS_N_KSYMS(bps) DIV_ROUND_UP(MCS_NBITS &lt;&lt; 10, (bps))</div><div class='add'>+</div><div class='add'>+/* Transmission time (in 1024 * usec) for a packet containing (ksyms) * 1024</div><div class='add'>+ * symbols.</div><div class='add'>+ */</div><div class='add'>+#define MCS_SYMBOL_TIME(sgi, ksyms)					\</div><div class='add'>+	(sgi ?								\</div><div class='add'>+	  ((ksyms) * 4 * 18) / 20 :		/* 3.6 us per sym */	\</div><div class='add'>+	  ((ksyms) * 4)			/* 4.0 us per sym */	\</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+/* Transmit duration for the raw data part of an average sized packet */</div><div class='add'>+#define MCS_DURATION(streams, sgi, bps) \</div><div class='add'>+	((u32)MCS_SYMBOL_TIME(sgi, MCS_N_KSYMS((streams) * (bps))))</div><div class='add'>+</div><div class='add'>+#define MCS_DURATION_S(shift, streams, sgi, bps)		\</div><div class='add'>+	((u16)((MCS_DURATION(streams, sgi, bps) &gt;&gt; shift)))</div><div class='add'>+</div><div class='add'>+/* These should match the values in enum nl80211_he_gi */</div><div class='add'>+#define HE_GI_08 0</div><div class='add'>+#define HE_GI_16 1</div><div class='add'>+#define HE_GI_32 2</div><div class='add'>+</div><div class='add'>+/* Transmission time (1024 usec) for a packet containing (ksyms) * k-symbols */</div><div class='add'>+#define HE_SYMBOL_TIME(gi, ksyms)					\</div><div class='add'>+	(gi == HE_GI_08 ?						\</div><div class='add'>+	 ((ksyms) * 16 * 17) / 20 :		/* 13.6 us per sym */	\</div><div class='add'>+	 (gi == HE_GI_16 ?						\</div><div class='add'>+	  ((ksyms) * 16 * 18) / 20 :		/* 14.4 us per sym */	\</div><div class='add'>+	  ((ksyms) * 16)			/* 16.0 us per sym */	\</div><div class='add'>+	 ))</div><div class='add'>+</div><div class='add'>+/* Transmit duration for the raw data part of an average sized packet */</div><div class='add'>+#define HE_DURATION(streams, gi, bps) \</div><div class='add'>+	((u32)HE_SYMBOL_TIME(gi, MCS_N_KSYMS((streams) * (bps))))</div><div class='add'>+</div><div class='add'>+#define HE_DURATION_S(shift, streams, gi, bps)		\</div><div class='add'>+	(HE_DURATION(streams, gi, bps) &gt;&gt; shift)</div><div class='add'>+</div><div class='add'>+/* gi in HE/EHT is identical. It matches enum nl80211_eht_gi as well */</div><div class='add'>+#define EHT_GI_08 HE_GI_08</div><div class='add'>+#define EHT_GI_16 HE_GI_16</div><div class='add'>+#define EHT_GI_32 HE_GI_32</div><div class='add'>+</div><div class='add'>+#define EHT_DURATION(streams, gi, bps)			\</div><div class='add'>+	HE_DURATION(streams, gi, bps)</div><div class='add'>+#define EHT_DURATION_S(shift, streams, gi, bps)		\</div><div class='add'>+	HE_DURATION_S(shift, streams, gi, bps)</div><div class='add'>+</div><div class='add'>+#define BW_20			0</div><div class='add'>+#define BW_40			1</div><div class='add'>+#define BW_80			2</div><div class='add'>+#define BW_160			3</div><div class='add'>+#define BW_320			4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define group sort order: HT40 -&gt; SGI -&gt; #streams</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_MAX_STREAMS		4</div><div class='add'>+#define IEEE80211_HT_STREAM_GROUPS	4 /* BW(=2) * SGI(=2) */</div><div class='add'>+#define IEEE80211_VHT_STREAM_GROUPS	8 /* BW(=4) * SGI(=2) */</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAX_STREAMS	8</div><div class='add'>+#define IEEE80211_HE_STREAM_GROUPS	12 /* BW(=4) * GI(=3) */</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_MAX_STREAMS	8</div><div class='add'>+#define IEEE80211_EHT_STREAM_GROUPS	15 /* BW(=5) * GI(=3) */</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_GROUPS_NB	(IEEE80211_MAX_STREAMS *	\</div><div class='add'>+				 IEEE80211_HT_STREAM_GROUPS)</div><div class='add'>+#define IEEE80211_VHT_GROUPS_NB	(IEEE80211_MAX_STREAMS *	\</div><div class='add'>+					 IEEE80211_VHT_STREAM_GROUPS)</div><div class='add'>+#define IEEE80211_HE_GROUPS_NB	(IEEE80211_HE_MAX_STREAMS *	\</div><div class='add'>+				 IEEE80211_HE_STREAM_GROUPS)</div><div class='add'>+#define IEEE80211_EHT_GROUPS_NB	(IEEE80211_EHT_MAX_STREAMS *	\</div><div class='add'>+				 IEEE80211_EHT_STREAM_GROUPS)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_GROUP_0	0</div><div class='add'>+#define IEEE80211_VHT_GROUP_0	(IEEE80211_HT_GROUP_0 + IEEE80211_HT_GROUPS_NB)</div><div class='add'>+#define IEEE80211_HE_GROUP_0	(IEEE80211_VHT_GROUP_0 + IEEE80211_VHT_GROUPS_NB)</div><div class='add'>+#define IEEE80211_EHT_GROUP_0	(IEEE80211_HE_GROUP_0 + IEEE80211_HE_GROUPS_NB)</div><div class='add'>+</div><div class='add'>+#define MCS_GROUP_RATES		14</div><div class='add'>+</div><div class='add'>+#define HT_GROUP_IDX(_streams, _sgi, _ht40)	\</div><div class='add'>+	IEEE80211_HT_GROUP_0 +			\</div><div class='add'>+	IEEE80211_MAX_STREAMS * 2 * _ht40 +	\</div><div class='add'>+	IEEE80211_MAX_STREAMS * _sgi +		\</div><div class='add'>+	_streams - 1</div><div class='add'>+</div><div class='add'>+#define _MAX(a, b) (((a)&gt;(b))?(a):(b))</div><div class='add'>+</div><div class='add'>+#define GROUP_SHIFT(duration)						\</div><div class='add'>+	_MAX(0, 16 - __builtin_clz(duration))</div><div class='add'>+</div><div class='add'>+/* MCS rate information for an MCS group */</div><div class='add'>+#define __MCS_GROUP(_streams, _sgi, _ht40, _s)				\</div><div class='add'>+	[HT_GROUP_IDX(_streams, _sgi, _ht40)] = {			\</div><div class='add'>+	.shift = _s,							\</div><div class='add'>+	.duration = {							\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 54 : 26),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 108 : 52),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 162 : 78),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 216 : 104),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 324 : 156),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 432 : 208),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 486 : 234),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 540 : 260)	\</div><div class='add'>+	}								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MCS_GROUP_SHIFT(_streams, _sgi, _ht40)				\</div><div class='add'>+	GROUP_SHIFT(MCS_DURATION(_streams, _sgi, _ht40 ? 54 : 26))</div><div class='add'>+</div><div class='add'>+#define MCS_GROUP(_streams, _sgi, _ht40)				\</div><div class='add'>+	__MCS_GROUP(_streams, _sgi, _ht40,				\</div><div class='add'>+		    MCS_GROUP_SHIFT(_streams, _sgi, _ht40))</div><div class='add'>+</div><div class='add'>+#define VHT_GROUP_IDX(_streams, _sgi, _bw)				\</div><div class='add'>+	(IEEE80211_VHT_GROUP_0 +					\</div><div class='add'>+	 IEEE80211_MAX_STREAMS * 2 * (_bw) +				\</div><div class='add'>+	 IEEE80211_MAX_STREAMS * (_sgi) +				\</div><div class='add'>+	 (_streams) - 1)</div><div class='add'>+</div><div class='add'>+#define BW2VBPS(_bw, r4, r3, r2, r1)					\</div><div class='add'>+	(_bw == BW_160 ? r4 : _bw == BW_80 ? r3 : _bw == BW_40 ? r2 : r1)</div><div class='add'>+</div><div class='add'>+#define __VHT_GROUP(_streams, _sgi, _bw, _s)				\</div><div class='add'>+	[VHT_GROUP_IDX(_streams, _sgi, _bw)] = {			\</div><div class='add'>+	.shift = _s,							\</div><div class='add'>+	.duration = {							\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw,  234,  117,  54,  26)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw,  468,  234, 108,  52)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw,  702,  351, 162,  78)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw,  936,  468, 216, 104)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 1404,  702, 324, 156)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 1872,  936, 432, 208)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 2106, 1053, 486, 234)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 2340, 1170, 540, 260)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 2808, 1404, 648, 312)),	\</div><div class='add'>+		MCS_DURATION_S(_s, _streams, _sgi,			\</div><div class='add'>+			       BW2VBPS(_bw, 3120, 1560, 720, 346))	\</div><div class='add'>+        }								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VHT_GROUP_SHIFT(_streams, _sgi, _bw)				\</div><div class='add'>+	GROUP_SHIFT(MCS_DURATION(_streams, _sgi,			\</div><div class='add'>+				 BW2VBPS(_bw, 243, 117,  54,  26)))</div><div class='add'>+</div><div class='add'>+#define VHT_GROUP(_streams, _sgi, _bw)					\</div><div class='add'>+	__VHT_GROUP(_streams, _sgi, _bw,				\</div><div class='add'>+		    VHT_GROUP_SHIFT(_streams, _sgi, _bw))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HE_GROUP_IDX(_streams, _gi, _bw)				\</div><div class='add'>+	(IEEE80211_HE_GROUP_0 +					\</div><div class='add'>+	 IEEE80211_HE_MAX_STREAMS * 3 * (_bw) +			\</div><div class='add'>+	 IEEE80211_HE_MAX_STREAMS * (_gi) +				\</div><div class='add'>+	 (_streams) - 1)</div><div class='add'>+</div><div class='add'>+#define __HE_GROUP(_streams, _gi, _bw, _s)				\</div><div class='add'>+	[HE_GROUP_IDX(_streams, _gi, _bw)] = {			\</div><div class='add'>+	.shift = _s,							\</div><div class='add'>+	.duration = {							\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,   979,  489,  230,  115)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  1958,  979,  475,  230)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  2937, 1468,  705,  345)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  3916, 1958,  936,  475)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  5875, 2937, 1411,  705)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  7833, 3916, 1872,  936)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  8827, 4406, 2102, 1051)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw,  9806, 4896, 2347, 1166)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw, 11764, 5875, 2808, 1411)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw, 13060, 6523, 3124, 1555)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw, 14702, 7344, 3513, 1756)),	\</div><div class='add'>+		HE_DURATION_S(_s, _streams, _gi,			\</div><div class='add'>+			      BW2VBPS(_bw, 16329, 8164, 3902, 1944))	\</div><div class='add'>+        }								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HE_GROUP_SHIFT(_streams, _gi, _bw)				\</div><div class='add'>+	GROUP_SHIFT(HE_DURATION(_streams, _gi,			\</div><div class='add'>+				BW2VBPS(_bw,   979,  489,  230,  115)))</div><div class='add'>+</div><div class='add'>+#define HE_GROUP(_streams, _gi, _bw)					\</div><div class='add'>+	__HE_GROUP(_streams, _gi, _bw,				\</div><div class='add'>+		   HE_GROUP_SHIFT(_streams, _gi, _bw))</div><div class='add'>+</div><div class='add'>+#define EHT_BW2VBPS(_bw, r5, r4, r3, r2, r1)					\</div><div class='add'>+	((_bw) == BW_320 ? r5 : BW2VBPS(_bw, r4, r3, r2, r1))</div><div class='add'>+</div><div class='add'>+#define EHT_GROUP_IDX(_streams, _gi, _bw)				\</div><div class='add'>+	(IEEE80211_EHT_GROUP_0 +					\</div><div class='add'>+	 IEEE80211_EHT_MAX_STREAMS * 3 * (_bw) +			\</div><div class='add'>+	 IEEE80211_EHT_MAX_STREAMS * (_gi) +				\</div><div class='add'>+	 (_streams) - 1)</div><div class='add'>+</div><div class='add'>+#define __EHT_GROUP(_streams, _gi, _bw, _s)						\</div><div class='add'>+	[EHT_GROUP_IDX(_streams, _gi, _bw)] = {						\</div><div class='add'>+	.shift = _s,									\</div><div class='add'>+	.duration = {									\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw,  1960,   980,  490,  234,  117)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw,  3920,  1960,  980,  468,  234)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw,  5880,  2937, 1470,  702,  351)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw,  7840,  3920, 1960,  936,  468)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 11760,  5880, 2940, 1404,  702)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 15680,  7840, 3920, 1872,  936)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 17640,  8820, 4410, 2106, 1053)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 19600,  9800, 4900, 2340, 1170)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 23520, 11760, 5880, 2808, 1404)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 26133, 13066, 6533, 3120, 1560)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 29400, 14700, 7350, 3510, 1755)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 32666, 16333, 8166, 3900, 1950)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 35280, 17640, 8820, 4212, 2106)),	\</div><div class='add'>+		EHT_DURATION_S(_s, _streams, _gi,					\</div><div class='add'>+			       EHT_BW2VBPS(_bw, 39200, 19600, 9800, 4680, 2340))	\</div><div class='add'>+		}									\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define EHT_GROUP_SHIFT(_streams, _gi, _bw)						\</div><div class='add'>+	GROUP_SHIFT(EHT_DURATION(_streams, _gi,						\</div><div class='add'>+				 EHT_BW2VBPS(_bw, 1960, 980, 490, 234, 117)))</div><div class='add'>+</div><div class='add'>+#define EHT_GROUP(_streams, _gi, _bw)					\</div><div class='add'>+	__EHT_GROUP(_streams, _gi, _bw,				\</div><div class='add'>+		   EHT_GROUP_SHIFT(_streams, _gi, _bw))</div><div class='add'>+</div><div class='add'>+#define EHT_GROUP_RANGE(_gi, _bw)	\</div><div class='add'>+	EHT_GROUP(1, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(2, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(3, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(4, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(5, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(6, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(7, _gi, _bw),		\</div><div class='add'>+	EHT_GROUP(8, _gi, _bw)</div><div class='add'>+</div><div class='add'>+struct mcs_group {</div><div class='add'>+	u8 shift;</div><div class='add'>+	u16 duration[MCS_GROUP_RATES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mcs_group airtime_mcs_groups[] = {</div><div class='add'>+	MCS_GROUP(1, 0, BW_20),</div><div class='add'>+	MCS_GROUP(2, 0, BW_20),</div><div class='add'>+	MCS_GROUP(3, 0, BW_20),</div><div class='add'>+	MCS_GROUP(4, 0, BW_20),</div><div class='add'>+</div><div class='add'>+	MCS_GROUP(1, 1, BW_20),</div><div class='add'>+	MCS_GROUP(2, 1, BW_20),</div><div class='add'>+	MCS_GROUP(3, 1, BW_20),</div><div class='add'>+	MCS_GROUP(4, 1, BW_20),</div><div class='add'>+</div><div class='add'>+	MCS_GROUP(1, 0, BW_40),</div><div class='add'>+	MCS_GROUP(2, 0, BW_40),</div><div class='add'>+	MCS_GROUP(3, 0, BW_40),</div><div class='add'>+	MCS_GROUP(4, 0, BW_40),</div><div class='add'>+</div><div class='add'>+	MCS_GROUP(1, 1, BW_40),</div><div class='add'>+	MCS_GROUP(2, 1, BW_40),</div><div class='add'>+	MCS_GROUP(3, 1, BW_40),</div><div class='add'>+	MCS_GROUP(4, 1, BW_40),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 0, BW_20),</div><div class='add'>+	VHT_GROUP(2, 0, BW_20),</div><div class='add'>+	VHT_GROUP(3, 0, BW_20),</div><div class='add'>+	VHT_GROUP(4, 0, BW_20),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 1, BW_20),</div><div class='add'>+	VHT_GROUP(2, 1, BW_20),</div><div class='add'>+	VHT_GROUP(3, 1, BW_20),</div><div class='add'>+	VHT_GROUP(4, 1, BW_20),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 0, BW_40),</div><div class='add'>+	VHT_GROUP(2, 0, BW_40),</div><div class='add'>+	VHT_GROUP(3, 0, BW_40),</div><div class='add'>+	VHT_GROUP(4, 0, BW_40),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 1, BW_40),</div><div class='add'>+	VHT_GROUP(2, 1, BW_40),</div><div class='add'>+	VHT_GROUP(3, 1, BW_40),</div><div class='add'>+	VHT_GROUP(4, 1, BW_40),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 0, BW_80),</div><div class='add'>+	VHT_GROUP(2, 0, BW_80),</div><div class='add'>+	VHT_GROUP(3, 0, BW_80),</div><div class='add'>+	VHT_GROUP(4, 0, BW_80),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 1, BW_80),</div><div class='add'>+	VHT_GROUP(2, 1, BW_80),</div><div class='add'>+	VHT_GROUP(3, 1, BW_80),</div><div class='add'>+	VHT_GROUP(4, 1, BW_80),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 0, BW_160),</div><div class='add'>+	VHT_GROUP(2, 0, BW_160),</div><div class='add'>+	VHT_GROUP(3, 0, BW_160),</div><div class='add'>+	VHT_GROUP(4, 0, BW_160),</div><div class='add'>+</div><div class='add'>+	VHT_GROUP(1, 1, BW_160),</div><div class='add'>+	VHT_GROUP(2, 1, BW_160),</div><div class='add'>+	VHT_GROUP(3, 1, BW_160),</div><div class='add'>+	VHT_GROUP(4, 1, BW_160),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(2, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(3, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(4, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(5, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(6, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(7, HE_GI_08, BW_20),</div><div class='add'>+	HE_GROUP(8, HE_GI_08, BW_20),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(2, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(3, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(4, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(5, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(6, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(7, HE_GI_16, BW_20),</div><div class='add'>+	HE_GROUP(8, HE_GI_16, BW_20),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(2, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(3, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(4, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(5, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(6, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(7, HE_GI_32, BW_20),</div><div class='add'>+	HE_GROUP(8, HE_GI_32, BW_20),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(2, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(3, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(4, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(5, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(6, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(7, HE_GI_08, BW_40),</div><div class='add'>+	HE_GROUP(8, HE_GI_08, BW_40),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(2, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(3, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(4, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(5, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(6, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(7, HE_GI_16, BW_40),</div><div class='add'>+	HE_GROUP(8, HE_GI_16, BW_40),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(2, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(3, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(4, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(5, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(6, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(7, HE_GI_32, BW_40),</div><div class='add'>+	HE_GROUP(8, HE_GI_32, BW_40),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(2, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(3, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(4, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(5, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(6, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(7, HE_GI_08, BW_80),</div><div class='add'>+	HE_GROUP(8, HE_GI_08, BW_80),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(2, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(3, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(4, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(5, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(6, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(7, HE_GI_16, BW_80),</div><div class='add'>+	HE_GROUP(8, HE_GI_16, BW_80),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(2, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(3, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(4, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(5, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(6, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(7, HE_GI_32, BW_80),</div><div class='add'>+	HE_GROUP(8, HE_GI_32, BW_80),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(2, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(3, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(4, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(5, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(6, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(7, HE_GI_08, BW_160),</div><div class='add'>+	HE_GROUP(8, HE_GI_08, BW_160),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(2, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(3, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(4, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(5, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(6, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(7, HE_GI_16, BW_160),</div><div class='add'>+	HE_GROUP(8, HE_GI_16, BW_160),</div><div class='add'>+</div><div class='add'>+	HE_GROUP(1, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(2, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(3, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(4, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(5, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(6, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(7, HE_GI_32, BW_160),</div><div class='add'>+	HE_GROUP(8, HE_GI_32, BW_160),</div><div class='add'>+</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_08, BW_20),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_16, BW_20),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_32, BW_20),</div><div class='add'>+</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_08, BW_40),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_16, BW_40),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_32, BW_40),</div><div class='add'>+</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_08, BW_80),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_16, BW_80),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_32, BW_80),</div><div class='add'>+</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_08, BW_160),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_16, BW_160),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_32, BW_160),</div><div class='add'>+</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_08, BW_320),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_16, BW_320),</div><div class='add'>+	EHT_GROUP_RANGE(EHT_GI_32, BW_320),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ieee80211_calc_legacy_rate_duration(u16 bitrate, bool short_pre,</div><div class='add'>+				    bool cck, int len)</div><div class='add'>+{</div><div class='add'>+	u32 duration;</div><div class='add'>+</div><div class='add'>+	if (cck) {</div><div class='add'>+		duration = 144 + 48; /* preamble + PLCP */</div><div class='add'>+		if (short_pre)</div><div class='add'>+			duration &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+		duration += 10; /* SIFS */</div><div class='add'>+	} else {</div><div class='add'>+		duration = 20 + 16; /* premable + SIFS */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len &lt;&lt;= 3;</div><div class='add'>+	duration += (len * 10) / bitrate;</div><div class='add'>+</div><div class='add'>+	return duration;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ieee80211_get_rate_duration(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_rx_status *status,</div><div class='add'>+				       u32 *overhead)</div><div class='add'>+{</div><div class='add'>+	bool sgi = status-&gt;enc_flags &amp; RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+	int bw, streams;</div><div class='add'>+	int group, idx;</div><div class='add'>+	u32 duration;</div><div class='add'>+</div><div class='add'>+	switch (status-&gt;bw) {</div><div class='add'>+	case RATE_INFO_BW_20:</div><div class='add'>+		bw = BW_20;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_INFO_BW_40:</div><div class='add'>+		bw = BW_40;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_INFO_BW_80:</div><div class='add'>+		bw = BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_INFO_BW_160:</div><div class='add'>+		bw = BW_160;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_INFO_BW_320:</div><div class='add'>+		bw = BW_320;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (status-&gt;encoding) {</div><div class='add'>+	case RX_ENC_VHT:</div><div class='add'>+		streams = status-&gt;nss;</div><div class='add'>+		idx = status-&gt;rate_idx;</div><div class='add'>+		group = VHT_GROUP_IDX(streams, sgi, bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_ENC_HT:</div><div class='add'>+		streams = ((status-&gt;rate_idx &gt;&gt; 3) &amp; 3) + 1;</div><div class='add'>+		idx = status-&gt;rate_idx &amp; 7;</div><div class='add'>+		group = HT_GROUP_IDX(streams, sgi, bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_ENC_HE:</div><div class='add'>+		streams = status-&gt;nss;</div><div class='add'>+		idx = status-&gt;rate_idx;</div><div class='add'>+		group = HE_GROUP_IDX(streams, status-&gt;he_gi, bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_ENC_EHT:</div><div class='add'>+		streams = status-&gt;nss;</div><div class='add'>+		idx = status-&gt;rate_idx;</div><div class='add'>+		group = EHT_GROUP_IDX(streams, status-&gt;eht.gi, bw);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (status-&gt;encoding) {</div><div class='add'>+	case RX_ENC_EHT:</div><div class='add'>+	case RX_ENC_HE:</div><div class='add'>+		if (WARN_ON_ONCE(streams &gt; 8))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (WARN_ON_ONCE(streams &gt; 4))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= MCS_GROUP_RATES)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	duration = airtime_mcs_groups[group].duration[idx];</div><div class='add'>+	duration &lt;&lt;= airtime_mcs_groups[group].shift;</div><div class='add'>+	*overhead = 36 + (streams &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	return duration;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_rx_status *status,</div><div class='add'>+			      int len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	u32 duration, overhead = 0;</div><div class='add'>+</div><div class='add'>+	if (status-&gt;encoding == RX_ENC_LEGACY) {</div><div class='add'>+		const struct ieee80211_rate *rate;</div><div class='add'>+		bool sp = status-&gt;enc_flags &amp; RX_ENC_FLAG_SHORTPRE;</div><div class='add'>+		bool cck;</div><div class='add'>+</div><div class='add'>+		/* on 60GHz or sub-1GHz band, there are no legacy rates */</div><div class='add'>+		if (WARN_ON_ONCE(status-&gt;band == NL80211_BAND_60GHZ ||</div><div class='add'>+				 status-&gt;band == NL80211_BAND_S1GHZ))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		sband = hw-&gt;wiphy-&gt;bands[status-&gt;band];</div><div class='add'>+		if (!sband || status-&gt;rate_idx &gt;= sband-&gt;n_bitrates)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		rate = &amp;sband-&gt;bitrates[status-&gt;rate_idx];</div><div class='add'>+		cck = rate-&gt;flags &amp; IEEE80211_RATE_MANDATORY_B;</div><div class='add'>+</div><div class='add'>+		return ieee80211_calc_legacy_rate_duration(rate-&gt;bitrate, sp,</div><div class='add'>+							   cck, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	duration = ieee80211_get_rate_duration(hw, status, &amp;overhead);</div><div class='add'>+	if (!duration)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	duration *= len;</div><div class='add'>+	duration /= AVG_PKT_SIZE;</div><div class='add'>+	duration /= 1024;</div><div class='add'>+</div><div class='add'>+	return duration + overhead;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee80211_calc_rx_airtime);</div><div class='add'>+</div><div class='add'>+static bool ieee80211_fill_rate_info(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_rx_status *stat, u8 band,</div><div class='add'>+				     struct rate_info *ri)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ri || !sband)</div><div class='add'>+	    return false;</div><div class='add'>+</div><div class='add'>+	stat-&gt;bw = ri-&gt;bw;</div><div class='add'>+	stat-&gt;nss = ri-&gt;nss;</div><div class='add'>+	stat-&gt;rate_idx = ri-&gt;mcs;</div><div class='add'>+</div><div class='add'>+	if (ri-&gt;flags &amp; RATE_INFO_FLAGS_EHT_MCS)</div><div class='add'>+		stat-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+	else if (ri-&gt;flags &amp; RATE_INFO_FLAGS_HE_MCS)</div><div class='add'>+		stat-&gt;encoding = RX_ENC_HE;</div><div class='add'>+	else if (ri-&gt;flags &amp; RATE_INFO_FLAGS_VHT_MCS)</div><div class='add'>+		stat-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+	else if (ri-&gt;flags &amp; RATE_INFO_FLAGS_MCS)</div><div class='add'>+		stat-&gt;encoding = RX_ENC_HT;</div><div class='add'>+	else</div><div class='add'>+		stat-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+</div><div class='add'>+	if (ri-&gt;flags &amp; RATE_INFO_FLAGS_SHORT_GI)</div><div class='add'>+		stat-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	switch (stat-&gt;encoding) {</div><div class='add'>+	case RX_ENC_EHT:</div><div class='add'>+		stat-&gt;eht.gi = ri-&gt;eht_gi;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		stat-&gt;he_gi = ri-&gt;he_gi;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stat-&gt;encoding != RX_ENC_LEGACY)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	stat-&gt;rate_idx = 0;</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_bitrates; i++) {</div><div class='add'>+		if (ri-&gt;legacy != sband-&gt;bitrates[i].bitrate)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		stat-&gt;rate_idx = i;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_fill_rx_status(struct ieee80211_rx_status *stat,</div><div class='add'>+				    struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_tx_rate *rate,</div><div class='add'>+				    struct rate_info *ri, u8 band, int len)</div><div class='add'>+{</div><div class='add'>+	memset(stat, 0, sizeof(*stat));</div><div class='add'>+	stat-&gt;band = band;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_fill_rate_info(hw, stat, band, ri))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_rate_valid(rate))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_160_MHZ_WIDTH)</div><div class='add'>+		stat-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+	else if (rate-&gt;flags &amp; IEEE80211_TX_RC_80_MHZ_WIDTH)</div><div class='add'>+		stat-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+	else if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+		stat-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+	else</div><div class='add'>+		stat-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+</div><div class='add'>+	stat-&gt;enc_flags = 0;</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_USE_SHORT_PREAMBLE)</div><div class='add'>+		stat-&gt;enc_flags |= RX_ENC_FLAG_SHORTPRE;</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+		stat-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	stat-&gt;rate_idx = rate-&gt;idx;</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_VHT_MCS) {</div><div class='add'>+		stat-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		stat-&gt;rate_idx = ieee80211_rate_get_vht_mcs(rate);</div><div class='add'>+		stat-&gt;nss = ieee80211_rate_get_vht_nss(rate);</div><div class='add'>+	} else if (rate-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='add'>+		stat-&gt;encoding = RX_ENC_HT;</div><div class='add'>+	} else {</div><div class='add'>+		stat-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ieee80211_calc_tx_airtime_rate(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_tx_rate *rate,</div><div class='add'>+					  struct rate_info *ri,</div><div class='add'>+					  u8 band, int len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status stat;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_fill_rx_status(&amp;stat, hw, rate, ri, band, len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ieee80211_calc_rx_airtime(hw, &amp;stat, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_tx_info *info,</div><div class='add'>+			      int len)</div><div class='add'>+{</div><div class='add'>+	u32 duration = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(info-&gt;status.rates); i++) {</div><div class='add'>+		struct ieee80211_tx_rate *rate = &amp;info-&gt;status.rates[i];</div><div class='add'>+		u32 cur_duration;</div><div class='add'>+</div><div class='add'>+		cur_duration = ieee80211_calc_tx_airtime_rate(hw, rate, NULL,</div><div class='add'>+							      info-&gt;band, len);</div><div class='add'>+		if (!cur_duration)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		duration += cur_duration * rate-&gt;count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return duration;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee80211_calc_tx_airtime);</div><div class='add'>+</div><div class='add'>+u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *pubsta,</div><div class='add'>+				       int len, bool ampdu)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_chanctx_conf *conf;</div><div class='add'>+	int rateidx;</div><div class='add'>+	bool cck, short_pream;</div><div class='add'>+	u32 basic_rates;</div><div class='add'>+	u8 band = 0;</div><div class='add'>+	u16 rate;</div><div class='add'>+</div><div class='add'>+	len += 38; /* Ethernet header length */</div><div class='add'>+</div><div class='add'>+	conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='add'>+	if (conf)</div><div class='add'>+		band = conf-&gt;def.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (pubsta) {</div><div class='add'>+		struct sta_info *sta = container_of(pubsta, struct sta_info,</div><div class='add'>+						    sta);</div><div class='add'>+		struct ieee80211_rx_status stat;</div><div class='add'>+		struct ieee80211_tx_rate *tx_rate = &amp;sta-&gt;deflink.tx_stats.last_rate;</div><div class='add'>+		struct rate_info *ri = &amp;sta-&gt;deflink.tx_stats.last_rate_info;</div><div class='add'>+		u32 duration, overhead;</div><div class='add'>+		u8 agg_shift;</div><div class='add'>+</div><div class='add'>+		if (ieee80211_fill_rx_status(&amp;stat, hw, tx_rate, ri, band, len))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (stat.encoding == RX_ENC_LEGACY || !ampdu)</div><div class='add'>+			return ieee80211_calc_rx_airtime(hw, &amp;stat, len);</div><div class='add'>+</div><div class='add'>+		duration = ieee80211_get_rate_duration(hw, &amp;stat, &amp;overhead);</div><div class='add'>+		/*</div><div class='add'>+		 * Assume that HT/VHT transmission on any AC except VO will</div><div class='add'>+		 * use aggregation. Since we don't have reliable reporting</div><div class='add'>+		 * of aggregation length, assume an average size based on the</div><div class='add'>+		 * tx rate.</div><div class='add'>+		 * This will not be very accurate, but much better than simply</div><div class='add'>+		 * assuming un-aggregated tx in all cases.</div><div class='add'>+		 */</div><div class='add'>+		if (duration &gt; 400 * 1024) /* &lt;= VHT20 MCS2 1S */</div><div class='add'>+			agg_shift = 1;</div><div class='add'>+		else if (duration &gt; 250 * 1024) /* &lt;= VHT20 MCS3 1S or MCS1 2S */</div><div class='add'>+			agg_shift = 2;</div><div class='add'>+		else if (duration &gt; 150 * 1024) /* &lt;= VHT20 MCS5 1S or MCS2 2S */</div><div class='add'>+			agg_shift = 3;</div><div class='add'>+		else if (duration &gt; 70 * 1024) /* &lt;= VHT20 MCS5 2S */</div><div class='add'>+			agg_shift = 4;</div><div class='add'>+		else if (stat.encoding != RX_ENC_HE ||</div><div class='add'>+			 duration &gt; 20 * 1024) /* &lt;= HE40 MCS6 2S */</div><div class='add'>+			agg_shift = 5;</div><div class='add'>+		else</div><div class='add'>+			agg_shift = 6;</div><div class='add'>+</div><div class='add'>+		duration *= len;</div><div class='add'>+		duration /= AVG_PKT_SIZE;</div><div class='add'>+		duration /= 1024;</div><div class='add'>+		duration += (overhead &gt;&gt; agg_shift);</div><div class='add'>+</div><div class='add'>+		return max_t(u32, duration, 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!conf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* No station to get latest rate from, so calculate the worst-case</div><div class='add'>+	 * duration using the lowest configured basic rate.</div><div class='add'>+	 */</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+	basic_rates = vif-&gt;bss_conf.basic_rates;</div><div class='add'>+	short_pream = vif-&gt;bss_conf.use_short_preamble;</div><div class='add'>+</div><div class='add'>+	rateidx = basic_rates ? ffs(basic_rates) - 1 : 0;</div><div class='add'>+	rate = sband-&gt;bitrates[rateidx].bitrate;</div><div class='add'>+	cck = sband-&gt;bitrates[rateidx].flags &amp; IEEE80211_RATE_MANDATORY_B;</div><div class='add'>+</div><div class='add'>+	return ieee80211_calc_legacy_rate_duration(rate, short_pream, cck, len);</div><div class='add'>+}</div><div class='head'>diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c<br/>index 5d22eda8a6b1..b51c2c8584ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/cfg.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/cfg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/cfg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/cfg.c</a></div><div class='hunk'>@@ -1,12 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * mac80211 configuration hooks for cfg80211</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006-2010	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  * Copyright 2013-2015  Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This file is GPLv2 as found in COPYING.</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='hunk'>@@ -15,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include "ieee80211_i.h"</div><div class='hunk'>@@ -23,6 +23,30 @@</div><div class='ctx'> #include "mesh.h"</div><div class='ctx'> #include "wme.h"</div><div class='ctx'> </div><div class='add'>+static struct ieee80211_link_data *</div><div class='add'>+ieee80211_link_or_deflink(struct ieee80211_sub_if_data *sdata, int link_id,</div><div class='add'>+			  bool require_valid)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+</div><div class='add'>+	if (link_id &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * For keys, if sdata is not an MLD, we might not use</div><div class='add'>+		 * the return value at all (if it's not a pairwise key),</div><div class='add'>+		 * so in that case (require_valid==false) don't error.</div><div class='add'>+		 */</div><div class='add'>+		if (require_valid &amp;&amp; ieee80211_vif_is_mld(&amp;sdata-&gt;vif))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		return &amp;sdata-&gt;deflink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+	if (!link)</div><div class='add'>+		return ERR_PTR(-ENOLINK);</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ieee80211_set_mu_mimo_follow(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 					 struct vif_params *params)</div><div class='ctx'> {</div><div class='hunk'>@@ -39,11 +63,14 @@ static void ieee80211_set_mu_mimo_follow(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 		memcpy(sdata-&gt;vif.bss_conf.mu_group.position,</div><div class='ctx'> 		       params-&gt;vht_mumimo_groups + WLAN_MEMBERSHIP_LEN,</div><div class='ctx'> 		       WLAN_USER_POSITION_LEN);</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_MU_GROUPS);</div><div class='add'>+</div><div class='ctx'> 		/* don't care about endianness - just check for 0 */</div><div class='ctx'> 		memcpy(&amp;membership, params-&gt;vht_mumimo_groups,</div><div class='ctx'> 		       WLAN_MEMBERSHIP_LEN);</div><div class='ctx'> 		mu_mimo_groups = membership != 0;</div><div class='add'>+</div><div class='add'>+		/* Unset following if configured explicitly */</div><div class='add'>+		eth_broadcast_addr(sdata-&gt;u.mntr.mu_follow_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;vht_mumimo_follow_addr) {</div><div class='hunk'>@@ -51,45 +78,65 @@ static void ieee80211_set_mu_mimo_follow(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 			is_valid_ether_addr(params-&gt;vht_mumimo_follow_addr);</div><div class='ctx'> 		ether_addr_copy(sdata-&gt;u.mntr.mu_follow_addr,</div><div class='ctx'> 				params-&gt;vht_mumimo_follow_addr);</div><div class='add'>+</div><div class='add'>+		/* Unset current membership until a management frame is RXed */</div><div class='add'>+		memset(sdata-&gt;vif.bss_conf.mu_group.membership, 0,</div><div class='add'>+		       WLAN_MEMBERSHIP_LEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.mu_mimo_owner = mu_mimo_groups || mu_mimo_follow;</div><div class='add'>+	sdata-&gt;vif.bss_conf.mu_mimo_owner = mu_mimo_groups || mu_mimo_follow;</div><div class='add'>+</div><div class='add'>+	/* Notify only after setting mu_mimo_owner */</div><div class='add'>+	if (sdata-&gt;vif.bss_conf.mu_mimo_owner &amp;&amp;</div><div class='add'>+	    sdata-&gt;flags &amp; IEEE80211_SDATA_IN_DRIVER)</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, &amp;sdata-&gt;deflink,</div><div class='add'>+						  BSS_CHANGED_MU_GROUPS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_mon_options(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 				     struct vif_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	struct ieee80211_sub_if_data *monitor_sdata;</div><div class='add'>+	struct ieee80211_sub_if_data *monitor_sdata = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* check flags first */</div><div class='ctx'> 	if (params-&gt;flags &amp;&amp; ieee80211_sdata_running(sdata)) {</div><div class='del'>-		u32 mask = MONITOR_FLAG_COOK_FRAMES | MONITOR_FLAG_ACTIVE;</div><div class='add'>+		u32 mask = MONITOR_FLAG_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Prohibit MONITOR_FLAG_COOK_FRAMES and</div><div class='del'>-		 * MONITOR_FLAG_ACTIVE to be changed while the</div><div class='del'>-		 * interface is up.</div><div class='add'>+		 * Prohibit MONITOR_FLAG_ACTIVE to be changed</div><div class='add'>+		 * while the interface is up.</div><div class='ctx'> 		 * Else we would need to add a lot of cruft</div><div class='ctx'> 		 * to update everything:</div><div class='del'>-		 *	cooked_mntrs, monitor and all fif_* counters</div><div class='add'>+		 *	monitor and all fif_* counters</div><div class='ctx'> 		 *	reconfigure hardware</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((params-&gt;flags &amp; mask) != (sdata-&gt;u.mntr.flags &amp; mask))</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* also validate MU-MIMO change */</div><div class='del'>-	monitor_sdata = rtnl_dereference(local-&gt;monitor_sdata);</div><div class='del'>-</div><div class='del'>-	if (!monitor_sdata &amp;&amp;</div><div class='add'>+	/* validate whether MU-MIMO can be configured */</div><div class='add'>+	if (!ieee80211_hw_check(&amp;local-&gt;hw, WANT_MONITOR_VIF) &amp;&amp;</div><div class='add'>+	    !ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR) &amp;&amp;</div><div class='ctx'> 	    (params-&gt;vht_mumimo_groups || params-&gt;vht_mumimo_follow_addr))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	/* Also update dependent monitor_sdata if required */</div><div class='add'>+	if (test_bit(SDATA_STATE_RUNNING, &amp;sdata-&gt;state) &amp;&amp;</div><div class='add'>+	    !ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR))</div><div class='add'>+		monitor_sdata = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+						  local-&gt;monitor_sdata);</div><div class='add'>+</div><div class='ctx'> 	/* apply all changes now - no failures allowed */</div><div class='ctx'> </div><div class='del'>-	if (monitor_sdata)</div><div class='del'>-		ieee80211_set_mu_mimo_follow(monitor_sdata, params);</div><div class='add'>+	if (ieee80211_hw_check(&amp;local-&gt;hw, WANT_MONITOR_VIF) ||</div><div class='add'>+	    ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR)) {</div><div class='add'>+		/* This is copied in when the VIF is activated */</div><div class='add'>+		ieee80211_set_mu_mimo_follow(sdata, params);</div><div class='add'>+</div><div class='add'>+		if (monitor_sdata)</div><div class='add'>+			ieee80211_set_mu_mimo_follow(monitor_sdata, params);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;flags) {</div><div class='ctx'> 		if (ieee80211_sdata_running(sdata)) {</div><div class='hunk'>@@ -111,6 +158,51 @@ static int ieee80211_set_mon_options(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ieee80211_set_ap_mbssid_options(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					   struct cfg80211_mbssid_config *params,</div><div class='add'>+					   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *tx_sdata;</div><div class='add'>+	struct ieee80211_bss_conf *old;</div><div class='add'>+</div><div class='add'>+	link_conf-&gt;bssid_index = 0;</div><div class='add'>+	link_conf-&gt;nontransmitted = false;</div><div class='add'>+	link_conf-&gt;ema_ap = false;</div><div class='add'>+	link_conf-&gt;bssid_indicator = 0;</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;vif.type != NL80211_IFTYPE_AP || !params-&gt;tx_wdev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	old = sdata_dereference(link_conf-&gt;tx_bss_conf, sdata);</div><div class='add'>+	if (old)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	tx_sdata = IEEE80211_WDEV_TO_SUB_IF(params-&gt;tx_wdev);</div><div class='add'>+	if (!tx_sdata)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tx_sdata == sdata) {</div><div class='add'>+		rcu_assign_pointer(link_conf-&gt;tx_bss_conf, link_conf);</div><div class='add'>+	} else {</div><div class='add'>+		struct ieee80211_bss_conf *tx_bss_conf;</div><div class='add'>+</div><div class='add'>+		tx_bss_conf = sdata_dereference(tx_sdata-&gt;vif.link_conf[params-&gt;tx_link_id],</div><div class='add'>+						sdata);</div><div class='add'>+		if (rcu_access_pointer(tx_bss_conf-&gt;tx_bss_conf) != tx_bss_conf)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(link_conf-&gt;tx_bss_conf, tx_bss_conf);</div><div class='add'>+</div><div class='add'>+		link_conf-&gt;nontransmitted = true;</div><div class='add'>+		link_conf-&gt;bssid_index = params-&gt;index;</div><div class='add'>+		link_conf-&gt;bssid_indicator = tx_bss_conf-&gt;bssid_indicator;</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;ema)</div><div class='add'>+		link_conf-&gt;ema_ap = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy,</div><div class='ctx'> 						const char *name,</div><div class='ctx'> 						unsigned char name_assign_type,</div><div class='hunk'>@@ -136,6 +228,24 @@ static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Let the driver know that an interface is going to be added.</div><div class='add'>+	 * Indicate so only for interface types that will be added to the</div><div class='add'>+	 * driver.</div><div class='add'>+	 */</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_IFTYPE_AP_VLAN:</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		if (!ieee80211_hw_check(&amp;local-&gt;hw, WANT_MONITOR_VIF) ||</div><div class='add'>+		    !(params-&gt;flags &amp; MONITOR_FLAG_ACTIVE))</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		drv_prep_add_interface(local,</div><div class='add'>+				       ieee80211_vif_type_p2p(&amp;sdata-&gt;vif));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return wdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,19 +262,40 @@ static int ieee80211_change_iface(struct wiphy *wiphy,</div><div class='ctx'> 				  struct vif_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct sta_info *sta;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	ret = ieee80211_if_change_type(sdata, type);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (type == NL80211_IFTYPE_AP_VLAN &amp;&amp;</div><div class='del'>-	    params &amp;&amp; params-&gt;use_4addr == 0) {</div><div class='add'>+	if (type == NL80211_IFTYPE_AP_VLAN &amp;&amp; params-&gt;use_4addr == 0) {</div><div class='ctx'> 		RCU_INIT_POINTER(sdata-&gt;u.vlan.sta, NULL);</div><div class='ctx'> 		ieee80211_check_fast_rx_iface(sdata);</div><div class='del'>-	} else if (type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		   params &amp;&amp; params-&gt;use_4addr &gt;= 0) {</div><div class='add'>+	} else if (type == NL80211_IFTYPE_STATION &amp;&amp; params-&gt;use_4addr &gt;= 0) {</div><div class='add'>+		struct ieee80211_if_managed *ifmgd = &amp;sdata-&gt;u.mgd;</div><div class='add'>+</div><div class='add'>+		if (params-&gt;use_4addr == ifmgd-&gt;use_4addr)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* FIXME: no support for 4-addr MLO yet */</div><div class='add'>+		if (ieee80211_vif_is_mld(&amp;sdata-&gt;vif))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 		sdata-&gt;u.mgd.use_4addr = params-&gt;use_4addr;</div><div class='add'>+		if (!ifmgd-&gt;associated)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		sta = sta_info_get(sdata, sdata-&gt;deflink.u.mgd.bssid);</div><div class='add'>+		if (sta)</div><div class='add'>+			drv_sta_set_4addr(local, sdata, &amp;sta-&gt;sta,</div><div class='add'>+					  params-&gt;use_4addr);</div><div class='add'>+</div><div class='add'>+		if (params-&gt;use_4addr)</div><div class='add'>+			ieee80211_send_4addr_nullfunc(local, sdata);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR) {</div><div class='hunk'>@@ -182,9 +313,9 @@ static int ieee80211_start_p2p_device(struct wiphy *wiphy,</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='del'>-	ret = ieee80211_check_combinations(sdata, NULL, 0, 0);</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_check_combinations(sdata, NULL, 0, 0, -1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -197,6 +328,96 @@ static void ieee80211_stop_p2p_device(struct wiphy *wiphy,</div><div class='ctx'> 	ieee80211_sdata_stop(IEEE80211_WDEV_TO_SUB_IF(wdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ieee80211_nan_conf_free(struct cfg80211_nan_conf *conf)</div><div class='add'>+{</div><div class='add'>+	kfree(conf-&gt;cluster_id);</div><div class='add'>+	kfree(conf-&gt;extra_nan_attrs);</div><div class='add'>+	kfree(conf-&gt;vendor_elems);</div><div class='add'>+	memset(conf, 0, sizeof(*conf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee80211_stop_nan(struct wiphy *wiphy,</div><div class='add'>+			       struct wireless_dev *wdev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+</div><div class='add'>+	if (!sdata-&gt;u.nan.started)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drv_stop_nan(sdata-&gt;local, sdata);</div><div class='add'>+	sdata-&gt;u.nan.started = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_nan_conf_free(&amp;sdata-&gt;u.nan.conf);</div><div class='add'>+</div><div class='add'>+	ieee80211_sdata_stop(sdata);</div><div class='add'>+	ieee80211_recalc_idle(sdata-&gt;local);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_nan_conf_copy(struct cfg80211_nan_conf *dst,</div><div class='add'>+				   struct cfg80211_nan_conf *src,</div><div class='add'>+				   u32 changes)</div><div class='add'>+{</div><div class='add'>+	if (changes &amp; CFG80211_NAN_CONF_CHANGED_PREF)</div><div class='add'>+		dst-&gt;master_pref = src-&gt;master_pref;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; CFG80211_NAN_CONF_CHANGED_BANDS)</div><div class='add'>+		dst-&gt;bands = src-&gt;bands;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; CFG80211_NAN_CONF_CHANGED_CONFIG) {</div><div class='add'>+		dst-&gt;scan_period = src-&gt;scan_period;</div><div class='add'>+		dst-&gt;scan_dwell_time = src-&gt;scan_dwell_time;</div><div class='add'>+		dst-&gt;discovery_beacon_interval =</div><div class='add'>+			src-&gt;discovery_beacon_interval;</div><div class='add'>+		dst-&gt;enable_dw_notification = src-&gt;enable_dw_notification;</div><div class='add'>+		memcpy(&amp;dst-&gt;band_cfgs, &amp;src-&gt;band_cfgs,</div><div class='add'>+		       sizeof(dst-&gt;band_cfgs));</div><div class='add'>+</div><div class='add'>+		kfree(dst-&gt;cluster_id);</div><div class='add'>+		dst-&gt;cluster_id = NULL;</div><div class='add'>+</div><div class='add'>+		kfree(dst-&gt;extra_nan_attrs);</div><div class='add'>+		dst-&gt;extra_nan_attrs = NULL;</div><div class='add'>+		dst-&gt;extra_nan_attrs_len = 0;</div><div class='add'>+</div><div class='add'>+		kfree(dst-&gt;vendor_elems);</div><div class='add'>+		dst-&gt;vendor_elems = NULL;</div><div class='add'>+		dst-&gt;vendor_elems_len = 0;</div><div class='add'>+</div><div class='add'>+		if (src-&gt;cluster_id) {</div><div class='add'>+			dst-&gt;cluster_id = kmemdup(src-&gt;cluster_id, ETH_ALEN,</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+			if (!dst-&gt;cluster_id)</div><div class='add'>+				goto no_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (src-&gt;extra_nan_attrs &amp;&amp; src-&gt;extra_nan_attrs_len) {</div><div class='add'>+			dst-&gt;extra_nan_attrs = kmemdup(src-&gt;extra_nan_attrs,</div><div class='add'>+						       src-&gt;extra_nan_attrs_len,</div><div class='add'>+						       GFP_KERNEL);</div><div class='add'>+			if (!dst-&gt;extra_nan_attrs)</div><div class='add'>+				goto no_mem;</div><div class='add'>+</div><div class='add'>+			dst-&gt;extra_nan_attrs_len = src-&gt;extra_nan_attrs_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (src-&gt;vendor_elems &amp;&amp; src-&gt;vendor_elems_len) {</div><div class='add'>+			dst-&gt;vendor_elems = kmemdup(src-&gt;vendor_elems,</div><div class='add'>+						    src-&gt;vendor_elems_len,</div><div class='add'>+						    GFP_KERNEL);</div><div class='add'>+			if (!dst-&gt;vendor_elems)</div><div class='add'>+				goto no_mem;</div><div class='add'>+</div><div class='add'>+			dst-&gt;vendor_elems_len = src-&gt;vendor_elems_len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+no_mem:</div><div class='add'>+	ieee80211_nan_conf_free(dst);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ieee80211_start_nan(struct wiphy *wiphy,</div><div class='ctx'> 			       struct wireless_dev *wdev,</div><div class='ctx'> 			       struct cfg80211_nan_conf *conf)</div><div class='hunk'>@@ -204,9 +425,12 @@ static int ieee80211_start_nan(struct wiphy *wiphy,</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='del'>-	ret = ieee80211_check_combinations(sdata, NULL, 0, 0);</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;u.nan.started)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_check_combinations(sdata, NULL, 0, 0, -1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -215,21 +439,21 @@ static int ieee80211_start_nan(struct wiphy *wiphy,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = drv_start_nan(sdata-&gt;local, sdata, conf);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		ieee80211_sdata_stop(sdata);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;u.nan.conf = *conf;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	sdata-&gt;u.nan.started = true;</div><div class='add'>+	ieee80211_recalc_idle(sdata-&gt;local);</div><div class='ctx'> </div><div class='del'>-static void ieee80211_stop_nan(struct wiphy *wiphy,</div><div class='del'>-			       struct wireless_dev *wdev)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+	ret = ieee80211_nan_conf_copy(&amp;sdata-&gt;u.nan.conf, conf, 0xFFFFFFFF);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ieee80211_stop_nan(wiphy, wdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	drv_stop_nan(sdata-&gt;local, sdata);</div><div class='del'>-	ieee80211_sdata_stop(sdata);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_nan_change_conf(struct wiphy *wiphy,</div><div class='hunk'>@@ -238,7 +462,7 @@ static int ieee80211_nan_change_conf(struct wiphy *wiphy,</div><div class='ctx'> 				     u32 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='del'>-	struct cfg80211_nan_conf new_conf;</div><div class='add'>+	struct cfg80211_nan_conf new_conf = {};</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type != NL80211_IFTYPE_NAN)</div><div class='hunk'>@@ -247,17 +471,28 @@ static int ieee80211_nan_change_conf(struct wiphy *wiphy,</div><div class='ctx'> 	if (!ieee80211_sdata_running(sdata))</div><div class='ctx'> 		return -ENETDOWN;</div><div class='ctx'> </div><div class='del'>-	new_conf = sdata-&gt;u.nan.conf;</div><div class='add'>+	if (!changes)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; CFG80211_NAN_CONF_CHANGED_PREF)</div><div class='del'>-		new_conf.master_pref = conf-&gt;master_pref;</div><div class='add'>+	/* First make a full copy of the previous configuration and then apply</div><div class='add'>+	 * the changes. This might be a little wasteful, but it is simpler.</div><div class='add'>+	 */</div><div class='add'>+	ret = ieee80211_nan_conf_copy(&amp;new_conf, &amp;sdata-&gt;u.nan.conf,</div><div class='add'>+				      0xFFFFFFFF);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; CFG80211_NAN_CONF_CHANGED_BANDS)</div><div class='del'>-		new_conf.bands = conf-&gt;bands;</div><div class='add'>+	ret = ieee80211_nan_conf_copy(&amp;new_conf, conf, changes);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = drv_nan_change_conf(sdata-&gt;local, sdata, &amp;new_conf, changes);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		ieee80211_nan_conf_free(&amp;new_conf);</div><div class='add'>+	} else {</div><div class='add'>+		ieee80211_nan_conf_free(&amp;sdata-&gt;u.nan.conf);</div><div class='ctx'> 		sdata-&gt;u.nan.conf = new_conf;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -353,52 +588,88 @@ static int ieee80211_set_noack_map(struct wiphy *wiphy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ieee80211_set_tx(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+			    const u8 *mac_addr, u8 key_idx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_key *key;</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!wiphy_ext_feature_isset(local-&gt;hw.wiphy,</div><div class='add'>+				     NL80211_EXT_FEATURE_EXT_KEY_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, mac_addr);</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;ptk_idx == key_idx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	key = wiphy_dereference(local-&gt;hw.wiphy, sta-&gt;ptk[key_idx]);</div><div class='add'>+</div><div class='add'>+	if (key &amp;&amp; key-&gt;conf.flags &amp; IEEE80211_KEY_FLAG_NO_AUTO_TX)</div><div class='add'>+		ret = ieee80211_set_tx_key(key);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-			     u8 key_idx, bool pairwise, const u8 *mac_addr,</div><div class='del'>-			     struct key_params *params)</div><div class='add'>+			     int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+			     const u8 *mac_addr, struct key_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		ieee80211_link_or_deflink(sdata, link_id, false);</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct sta_info *sta = NULL;</div><div class='del'>-	const struct ieee80211_cipher_scheme *cs = NULL;</div><div class='ctx'> 	struct ieee80211_key *key;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	if (!ieee80211_sdata_running(sdata))</div><div class='ctx'> 		return -ENETDOWN;</div><div class='ctx'> </div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(pairwise &amp;&amp; link_id &gt;= 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pairwise &amp;&amp; params-&gt;mode == NL80211_KEY_SET_TX)</div><div class='add'>+		return ieee80211_set_tx(sdata, mac_addr, key_idx);</div><div class='add'>+</div><div class='ctx'> 	/* reject WEP and TKIP keys if WEP failed to initialize */</div><div class='ctx'> 	switch (params-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		if (IS_ERR(local-&gt;wep_tx_tfm))</div><div class='add'>+		if (link_id &gt;= 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (WARN_ON_ONCE(fips_enabled))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='del'>-	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='del'>-	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='del'>-	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		cs = ieee80211_cs_get(local, params-&gt;cipher, sdata-&gt;vif.type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key = ieee80211_key_alloc(params-&gt;cipher, key_idx, params-&gt;key_len,</div><div class='del'>-				  params-&gt;key, params-&gt;seq_len, params-&gt;seq,</div><div class='del'>-				  cs);</div><div class='add'>+				  params-&gt;key, params-&gt;seq_len, params-&gt;seq);</div><div class='ctx'> 	if (IS_ERR(key))</div><div class='ctx'> 		return PTR_ERR(key);</div><div class='ctx'> </div><div class='del'>-	if (pairwise)</div><div class='add'>+	if (pairwise) {</div><div class='ctx'> 		key-&gt;conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE;</div><div class='add'>+		key-&gt;conf.link_id = -1;</div><div class='add'>+	} else {</div><div class='add'>+		key-&gt;conf.link_id = link-&gt;link_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	if (params-&gt;mode == NL80211_KEY_NO_TX)</div><div class='add'>+		key-&gt;conf.flags |= IEEE80211_KEY_FLAG_NO_AUTO_TX;</div><div class='ctx'> </div><div class='ctx'> 	if (mac_addr) {</div><div class='ctx'> 		sta = sta_info_get_bss(sdata, mac_addr);</div><div class='hunk'>@@ -414,8 +685,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) {</div><div class='ctx'> 			ieee80211_key_free_unused(key);</div><div class='del'>-			err = -ENOENT;</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -453,69 +723,102 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta)</div><div class='del'>-		sta-&gt;cipher_scheme = cs;</div><div class='del'>-</div><div class='del'>-	err = ieee80211_key_link(key, sdata, sta);</div><div class='del'>-</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	err = ieee80211_key_link(key, link, sta);</div><div class='add'>+	/* KRACK protection, shouldn't happen but just silently accept key */</div><div class='add'>+	if (err == -EALREADY)</div><div class='add'>+		err = 0;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-			     u8 key_idx, bool pairwise, const u8 *mac_addr)</div><div class='add'>+static struct ieee80211_key *</div><div class='add'>+ieee80211_lookup_key(struct ieee80211_sub_if_data *sdata, int link_id,</div><div class='add'>+		     u8 key_idx, bool pairwise, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='del'>-	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ieee80211_key *key = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ieee80211_local *local __maybe_unused = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_link_data *link = &amp;sdata-&gt;deflink;</div><div class='add'>+	struct ieee80211_key *key;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;sta_mtx);</div><div class='del'>-	mutex_lock(&amp;local-&gt;key_mtx);</div><div class='add'>+	if (link_id &gt;= 0) {</div><div class='add'>+		link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+		if (!link)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (mac_addr) {</div><div class='del'>-		ret = -ENOENT;</div><div class='add'>+		struct sta_info *sta;</div><div class='add'>+		struct link_sta_info *link_sta;</div><div class='ctx'> </div><div class='ctx'> 		sta = sta_info_get_bss(sdata, mac_addr);</div><div class='ctx'> 		if (!sta)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return NULL;</div><div class='ctx'> </div><div class='del'>-		if (pairwise)</div><div class='del'>-			key = key_mtx_dereference(local, sta-&gt;ptk[key_idx]);</div><div class='del'>-		else</div><div class='del'>-			key = key_mtx_dereference(local, sta-&gt;gtk[key_idx]);</div><div class='del'>-	} else</div><div class='del'>-		key = key_mtx_dereference(local, sdata-&gt;keys[key_idx]);</div><div class='add'>+		if (link_id &gt;= 0) {</div><div class='add'>+			link_sta = rcu_dereference_check(sta-&gt;link[link_id],</div><div class='add'>+							 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='add'>+			if (!link_sta)</div><div class='add'>+				return NULL;</div><div class='add'>+		} else {</div><div class='add'>+			link_sta = &amp;sta-&gt;deflink;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pairwise &amp;&amp; key_idx &lt; NUM_DEFAULT_KEYS)</div><div class='add'>+			return wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+						 sta-&gt;ptk[key_idx]);</div><div class='add'>+</div><div class='add'>+		if (!pairwise &amp;&amp;</div><div class='add'>+		    key_idx &lt; NUM_DEFAULT_KEYS +</div><div class='add'>+			      NUM_DEFAULT_MGMT_KEYS +</div><div class='add'>+			      NUM_DEFAULT_BEACON_KEYS)</div><div class='add'>+			return wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+						 link_sta-&gt;gtk[key_idx]);</div><div class='ctx'> </div><div class='del'>-	if (!key) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_key_free(key, sdata-&gt;vif.type == NL80211_IFTYPE_STATION);</div><div class='add'>+	if (pairwise &amp;&amp; key_idx &lt; NUM_DEFAULT_KEYS)</div><div class='add'>+		return wiphy_dereference(local-&gt;hw.wiphy, sdata-&gt;keys[key_idx]);</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;key_mtx);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	key = wiphy_dereference(local-&gt;hw.wiphy, link-&gt;gtk[key_idx]);</div><div class='add'>+	if (key)</div><div class='add'>+		return key;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	/* or maybe it was a WEP key */</div><div class='add'>+	if (key_idx &lt; NUM_DEFAULT_KEYS)</div><div class='add'>+		return wiphy_dereference(local-&gt;hw.wiphy, sdata-&gt;keys[key_idx]);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			     int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+			     const u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_key *key;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	key = ieee80211_lookup_key(sdata, link_id, key_idx, pairwise, mac_addr);</div><div class='add'>+	if (!key)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ieee80211_key_free(key, sdata-&gt;vif.type == NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-			     u8 key_idx, bool pairwise, const u8 *mac_addr,</div><div class='del'>-			     void *cookie,</div><div class='add'>+			     int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+			     const u8 *mac_addr, void *cookie,</div><div class='ctx'> 			     void (*callback)(void *cookie,</div><div class='ctx'> 					      struct key_params *params))</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='ctx'> 	u8 seq[6] = {0};</div><div class='ctx'> 	struct key_params params;</div><div class='del'>-	struct ieee80211_key *key = NULL;</div><div class='add'>+	struct ieee80211_key *key;</div><div class='ctx'> 	u64 pn64;</div><div class='ctx'> 	u32 iv32;</div><div class='ctx'> 	u16 iv16;</div><div class='hunk'>@@ -526,19 +829,7 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	if (mac_addr) {</div><div class='del'>-		sta = sta_info_get_bss(sdata, mac_addr);</div><div class='del'>-		if (!sta)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (pairwise &amp;&amp; key_idx &lt; NUM_DEFAULT_KEYS)</div><div class='del'>-			key = rcu_dereference(sta-&gt;ptk[key_idx]);</div><div class='del'>-		else if (!pairwise &amp;&amp;</div><div class='del'>-			 key_idx &lt; NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS)</div><div class='del'>-			key = rcu_dereference(sta-&gt;gtk[key_idx]);</div><div class='del'>-	} else</div><div class='del'>-		key = rcu_dereference(sdata-&gt;keys[key_idx]);</div><div class='del'>-</div><div class='add'>+	key = ieee80211_lookup_key(sdata, link_id, key_idx, pairwise, mac_addr);</div><div class='ctx'> 	if (!key)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -574,12 +865,12 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='ctx'> 		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=</div><div class='ctx'> 			     offsetof(typeof(kseq), aes_cmac));</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='ctx'> 		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=</div><div class='ctx'> 			     offsetof(typeof(kseq), aes_gmac));</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=</div><div class='hunk'>@@ -612,9 +903,6 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	params.key = key-&gt;conf.key;</div><div class='del'>-	params.key_len = key-&gt;conf.keylen;</div><div class='del'>-</div><div class='ctx'> 	callback(cookie, &amp;params);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -625,23 +913,49 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_config_default_key(struct wiphy *wiphy,</div><div class='ctx'> 					struct net_device *dev,</div><div class='del'>-					u8 key_idx, bool uni,</div><div class='add'>+					int link_id, u8 key_idx, bool uni,</div><div class='ctx'> 					bool multi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		ieee80211_link_or_deflink(sdata, link_id, false);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='ctx'> </div><div class='del'>-	ieee80211_set_default_key(sdata, key_idx, uni, multi);</div><div class='add'>+	ieee80211_set_default_key(link, key_idx, uni, multi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_config_default_mgmt_key(struct wiphy *wiphy,</div><div class='ctx'> 					     struct net_device *dev,</div><div class='del'>-					     u8 key_idx)</div><div class='add'>+					     int link_id, u8 key_idx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		ieee80211_link_or_deflink(sdata, link_id, true);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='add'>+</div><div class='add'>+	ieee80211_set_default_mgmt_key(link, key_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_config_default_beacon_key(struct wiphy *wiphy,</div><div class='add'>+					       struct net_device *dev,</div><div class='add'>+					       int link_id, u8 key_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		ieee80211_link_or_deflink(sdata, link_id, true);</div><div class='ctx'> </div><div class='del'>-	ieee80211_set_default_mgmt_key(sdata, key_idx);</div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='add'>+</div><div class='add'>+	ieee80211_set_default_beacon_key(link, key_idx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -660,14 +974,11 @@ void sta_set_rate_info_tx(struct sta_info *sta,</div><div class='ctx'> 		rinfo-&gt;nss = ieee80211_rate_get_vht_nss(rate);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ieee80211_supported_band *sband;</div><div class='del'>-		int shift = ieee80211_vif_get_shift(&amp;sta-&gt;sdata-&gt;vif);</div><div class='del'>-		u16 brate;</div><div class='ctx'> </div><div class='ctx'> 		sband = ieee80211_get_sband(sta-&gt;sdata);</div><div class='del'>-		if (sband) {</div><div class='del'>-			brate = sband-&gt;bitrates[rate-&gt;idx].bitrate;</div><div class='del'>-			rinfo-&gt;legacy = DIV_ROUND_UP(brate, 1 &lt;&lt; shift);</div><div class='del'>-		}</div><div class='add'>+		WARN_ON_ONCE(sband &amp;&amp; !sband-&gt;bitrates);</div><div class='add'>+		if (sband &amp;&amp; sband-&gt;bitrates)</div><div class='add'>+			rinfo-&gt;legacy = sband-&gt;bitrates[rate-&gt;idx].bitrate;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='ctx'> 		rinfo-&gt;bw = RATE_INFO_BW_40;</div><div class='hunk'>@@ -689,16 +1000,21 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	sta = sta_info_get_by_idx(sdata, idx);</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		memcpy(mac, sta-&gt;sta.addr, ETH_ALEN);</div><div class='ctx'> 		sta_set_sinfo(sta, sinfo, true);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='add'>+		/* Add accumulated removed link data to sinfo data for</div><div class='add'>+		 * consistency for MLO</div><div class='add'>+		 */</div><div class='add'>+		if (sinfo-&gt;valid_links)</div><div class='add'>+			sta_set_accumulated_removed_links_sinfo(sta, sinfo);</div><div class='add'>+</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -719,59 +1035,73 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	sta = sta_info_get_bss(sdata, mac);</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		sta_set_sinfo(sta, sinfo, true);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='add'>+		/* Add accumulated removed link data to sinfo data for</div><div class='add'>+		 * consistency for MLO</div><div class='add'>+		 */</div><div class='add'>+		if (sinfo-&gt;valid_links)</div><div class='add'>+			sta_set_accumulated_removed_links_sinfo(sta, sinfo);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_monitor_channel(struct wiphy *wiphy,</div><div class='add'>+					 struct net_device *dev,</div><div class='ctx'> 					 struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = *chandef };</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (cfg80211_chandef_identical(&amp;local-&gt;monitor_chandef, chandef))</div><div class='del'>-		return 0;</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	if (local-&gt;use_chanctx) {</div><div class='del'>-		sdata = rtnl_dereference(local-&gt;monitor_sdata);</div><div class='del'>-		if (sdata) {</div><div class='del'>-			ieee80211_vif_release_channel(sdata);</div><div class='del'>-			ret = ieee80211_vif_use_channel(sdata, chandef,</div><div class='del'>-					IEEE80211_CHANCTX_EXCLUSIVE);</div><div class='del'>-		}</div><div class='del'>-	} else if (local-&gt;open_count == local-&gt;monitors) {</div><div class='del'>-		local-&gt;_oper_chandef = *chandef;</div><div class='del'>-		ieee80211_hw_config(local, 0);</div><div class='add'>+	sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	if (!ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR)) {</div><div class='add'>+		if (cfg80211_chandef_identical(&amp;local-&gt;monitor_chanreq.oper,</div><div class='add'>+					       &amp;chanreq.oper))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		sdata = wiphy_dereference(wiphy, local-&gt;monitor_sdata);</div><div class='add'>+		if (!sdata)</div><div class='add'>+			goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret == 0)</div><div class='del'>-		local-&gt;monitor_chandef = *chandef;</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='add'>+	if (rcu_access_pointer(sdata-&gt;deflink.conf-&gt;chanctx_conf) &amp;&amp;</div><div class='add'>+	    cfg80211_chandef_identical(&amp;sdata-&gt;vif.bss_conf.chanreq.oper,</div><div class='add'>+				       &amp;chanreq.oper))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ieee80211_link_release_channel(&amp;sdata-&gt;deflink);</div><div class='add'>+	ret = ieee80211_link_use_channel(&amp;sdata-&gt;deflink, &amp;chanreq,</div><div class='add'>+					 IEEE80211_CHANCTX_SHARED);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+done:</div><div class='add'>+	local-&gt;monitor_chanreq = chanreq;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				    const u8 *resp, size_t resp_len,</div><div class='del'>-				    const struct ieee80211_csa_settings *csa)</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+			 const u8 *resp, size_t resp_len,</div><div class='add'>+			 const struct ieee80211_csa_settings *csa,</div><div class='add'>+			 const struct ieee80211_color_change_settings *cca,</div><div class='add'>+			 struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct probe_resp *new, *old;</div><div class='ctx'> </div><div class='ctx'> 	if (!resp || !resp_len)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	old = sdata_dereference(sdata-&gt;u.ap.probe_resp, sdata);</div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.probe_resp, sdata);</div><div class='ctx'> </div><div class='ctx'> 	new = kzalloc(sizeof(struct probe_resp) + resp_len, GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='hunk'>@@ -781,28 +1111,220 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	memcpy(new-&gt;data, resp, resp_len);</div><div class='ctx'> </div><div class='ctx'> 	if (csa)</div><div class='del'>-		memcpy(new-&gt;csa_counter_offsets, csa-&gt;counter_offsets_presp,</div><div class='add'>+		memcpy(new-&gt;cntdwn_counter_offsets, csa-&gt;counter_offsets_presp,</div><div class='ctx'> 		       csa-&gt;n_counter_offsets_presp *</div><div class='del'>-		       sizeof(new-&gt;csa_counter_offsets[0]));</div><div class='add'>+		       sizeof(new-&gt;cntdwn_counter_offsets[0]));</div><div class='add'>+	else if (cca)</div><div class='add'>+		new-&gt;cntdwn_counter_offsets[0] = cca-&gt;counter_offset_presp;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(link-&gt;u.ap.probe_resp, new);</div><div class='add'>+	if (old)</div><div class='add'>+		kfree_rcu(old, rcu_head);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					struct cfg80211_fils_discovery *params,</div><div class='add'>+					struct ieee80211_link_data *link,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct fils_discovery_data *new, *old = NULL;</div><div class='add'>+	struct ieee80211_fils_discovery *fd;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;update)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fd = &amp;link_conf-&gt;fils_discovery;</div><div class='add'>+	fd-&gt;min_interval = params-&gt;min_interval;</div><div class='add'>+	fd-&gt;max_interval = params-&gt;max_interval;</div><div class='add'>+</div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.fils_discovery, sdata);</div><div class='add'>+	if (old)</div><div class='add'>+		kfree_rcu(old, rcu_head);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;tmpl &amp;&amp; params-&gt;tmpl_len) {</div><div class='add'>+		new = kzalloc(sizeof(*new) + params-&gt;tmpl_len, GFP_KERNEL);</div><div class='add'>+		if (!new)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		new-&gt;len = params-&gt;tmpl_len;</div><div class='add'>+		memcpy(new-&gt;data, params-&gt;tmpl, params-&gt;tmpl_len);</div><div class='add'>+		rcu_assign_pointer(link-&gt;u.ap.fils_discovery, new);</div><div class='add'>+	} else {</div><div class='add'>+		RCU_INIT_POINTER(link-&gt;u.ap.fils_discovery, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*changed |= BSS_CHANGED_FILS_DISCOVERY;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_unsol_bcast_probe_resp(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				     struct cfg80211_unsol_bcast_probe_resp *params,</div><div class='add'>+				     struct ieee80211_link_data *link,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				     u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct unsol_bcast_probe_resp_data *new, *old = NULL;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;update)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	link_conf-&gt;unsol_bcast_probe_resp_interval = params-&gt;interval;</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(sdata-&gt;u.ap.probe_resp, new);</div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.unsol_bcast_probe_resp, sdata);</div><div class='ctx'> 	if (old)</div><div class='ctx'> 		kfree_rcu(old, rcu_head);</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;tmpl &amp;&amp; params-&gt;tmpl_len) {</div><div class='add'>+		new = kzalloc(sizeof(*new) + params-&gt;tmpl_len, GFP_KERNEL);</div><div class='add'>+		if (!new)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		new-&gt;len = params-&gt;tmpl_len;</div><div class='add'>+		memcpy(new-&gt;data, params-&gt;tmpl, params-&gt;tmpl_len);</div><div class='add'>+		rcu_assign_pointer(link-&gt;u.ap.unsol_bcast_probe_resp, new);</div><div class='add'>+	} else {</div><div class='add'>+		RCU_INIT_POINTER(link-&gt;u.ap.unsol_bcast_probe_resp, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*changed |= BSS_CHANGED_UNSOL_BCAST_PROBE_RESP;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				   struct cfg80211_beacon_data *params,</div><div class='del'>-				   const struct ieee80211_csa_settings *csa)</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_s1g_short_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+			       struct ieee80211_link_data *link,</div><div class='add'>+			       struct cfg80211_s1g_short_beacon *params)</div><div class='ctx'> {</div><div class='add'>+	struct s1g_short_beacon_data *new;</div><div class='add'>+	struct s1g_short_beacon_data *old =</div><div class='add'>+		sdata_dereference(link-&gt;u.ap.s1g_short_beacon, sdata);</div><div class='add'>+	size_t new_len =</div><div class='add'>+		sizeof(*new) + params-&gt;short_head_len + params-&gt;short_tail_len;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;update)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;short_head)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	new = kzalloc(new_len, GFP_KERNEL);</div><div class='add'>+	if (!new)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Memory layout: | struct | head | tail | */</div><div class='add'>+	new-&gt;short_head = (u8 *)new + sizeof(*new);</div><div class='add'>+	new-&gt;short_head_len = params-&gt;short_head_len;</div><div class='add'>+	memcpy(new-&gt;short_head, params-&gt;short_head, params-&gt;short_head_len);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;short_tail) {</div><div class='add'>+		new-&gt;short_tail = new-&gt;short_head + params-&gt;short_head_len;</div><div class='add'>+		new-&gt;short_tail_len = params-&gt;short_tail_len;</div><div class='add'>+		memcpy(new-&gt;short_tail, params-&gt;short_tail,</div><div class='add'>+		       params-&gt;short_tail_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(link-&gt;u.ap.s1g_short_beacon, new);</div><div class='add'>+</div><div class='add'>+	if (old)</div><div class='add'>+		kfree_rcu(old, rcu_head);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_ftm_responder_params(</div><div class='add'>+				struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				const u8 *lci, size_t lci_len,</div><div class='add'>+				const u8 *civicloc, size_t civicloc_len,</div><div class='add'>+				struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_ftm_responder_params *new, *old;</div><div class='add'>+	u8 *pos;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (!lci_len &amp;&amp; !civicloc_len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	old = link_conf-&gt;ftmr_params;</div><div class='add'>+	len = lci_len + civicloc_len;</div><div class='add'>+</div><div class='add'>+	new = kzalloc(sizeof(*new) + len, GFP_KERNEL);</div><div class='add'>+	if (!new)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pos = (u8 *)(new + 1);</div><div class='add'>+	if (lci_len) {</div><div class='add'>+		new-&gt;lci_len = lci_len;</div><div class='add'>+		new-&gt;lci = pos;</div><div class='add'>+		memcpy(pos, lci, lci_len);</div><div class='add'>+		pos += lci_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (civicloc_len) {</div><div class='add'>+		new-&gt;civicloc_len = civicloc_len;</div><div class='add'>+		new-&gt;civicloc = pos;</div><div class='add'>+		memcpy(pos, civicloc, civicloc_len);</div><div class='add'>+		pos += civicloc_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_conf-&gt;ftmr_params = new;</div><div class='add'>+	kfree(old);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_copy_mbssid_beacon(u8 *pos, struct cfg80211_mbssid_elems *dst,</div><div class='add'>+			     struct cfg80211_mbssid_elems *src)</div><div class='add'>+{</div><div class='add'>+	int i, offset = 0;</div><div class='add'>+</div><div class='add'>+	dst-&gt;cnt = src-&gt;cnt;</div><div class='add'>+	for (i = 0; i &lt; src-&gt;cnt; i++) {</div><div class='add'>+		memcpy(pos + offset, src-&gt;elem[i].data, src-&gt;elem[i].len);</div><div class='add'>+		dst-&gt;elem[i].len = src-&gt;elem[i].len;</div><div class='add'>+		dst-&gt;elem[i].data = pos + offset;</div><div class='add'>+		offset += dst-&gt;elem[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_copy_rnr_beacon(u8 *pos, struct cfg80211_rnr_elems *dst,</div><div class='add'>+			  struct cfg80211_rnr_elems *src)</div><div class='add'>+{</div><div class='add'>+	int i, offset = 0;</div><div class='add'>+</div><div class='add'>+	dst-&gt;cnt = src-&gt;cnt;</div><div class='add'>+	for (i = 0; i &lt; src-&gt;cnt; i++) {</div><div class='add'>+		memcpy(pos + offset, src-&gt;elem[i].data, src-&gt;elem[i].len);</div><div class='add'>+		dst-&gt;elem[i].len = src-&gt;elem[i].len;</div><div class='add'>+		dst-&gt;elem[i].data = pos + offset;</div><div class='add'>+		offset += dst-&gt;elem[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+			struct ieee80211_link_data *link,</div><div class='add'>+			struct cfg80211_beacon_data *params,</div><div class='add'>+			const struct ieee80211_csa_settings *csa,</div><div class='add'>+			const struct ieee80211_color_change_settings *cca,</div><div class='add'>+			u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_mbssid_elems *mbssid = NULL;</div><div class='add'>+	struct cfg80211_rnr_elems *rnr = NULL;</div><div class='ctx'> 	struct beacon_data *new, *old;</div><div class='ctx'> 	int new_head_len, new_tail_len;</div><div class='ctx'> 	int size, err;</div><div class='del'>-	u32 changed = BSS_CHANGED_BEACON;</div><div class='del'>-</div><div class='del'>-	old = sdata_dereference(sdata-&gt;u.ap.beacon, sdata);</div><div class='add'>+	u64 _changed = BSS_CHANGED_BEACON;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='ctx'> </div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.beacon, sdata);</div><div class='ctx'> </div><div class='ctx'> 	/* Need to have a beacon head if we don't have one yet */</div><div class='ctx'> 	if (!params-&gt;head &amp;&amp; !old)</div><div class='hunk'>@@ -823,6 +1345,27 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(*new) + new_head_len + new_tail_len;</div><div class='ctx'> </div><div class='add'>+	/* new or old multiple BSSID elements? */</div><div class='add'>+	if (params-&gt;mbssid_ies) {</div><div class='add'>+		mbssid = params-&gt;mbssid_ies;</div><div class='add'>+		size += struct_size(new-&gt;mbssid_ies, elem, mbssid-&gt;cnt);</div><div class='add'>+		if (params-&gt;rnr_ies) {</div><div class='add'>+			rnr = params-&gt;rnr_ies;</div><div class='add'>+			size += struct_size(new-&gt;rnr_ies, elem, rnr-&gt;cnt);</div><div class='add'>+		}</div><div class='add'>+		size += ieee80211_get_mbssid_beacon_len(mbssid, rnr,</div><div class='add'>+							mbssid-&gt;cnt);</div><div class='add'>+	} else if (old &amp;&amp; old-&gt;mbssid_ies) {</div><div class='add'>+		mbssid = old-&gt;mbssid_ies;</div><div class='add'>+		size += struct_size(new-&gt;mbssid_ies, elem, mbssid-&gt;cnt);</div><div class='add'>+		if (old &amp;&amp; old-&gt;rnr_ies) {</div><div class='add'>+			rnr = old-&gt;rnr_ies;</div><div class='add'>+			size += struct_size(new-&gt;rnr_ies, elem, rnr-&gt;cnt);</div><div class='add'>+		}</div><div class='add'>+		size += ieee80211_get_mbssid_beacon_len(mbssid, rnr,</div><div class='add'>+							mbssid-&gt;cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	new = kzalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -831,18 +1374,41 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pointers go into the block we allocated,</div><div class='del'>-	 * memory is | beacon_data | head | tail |</div><div class='add'>+	 * memory is | beacon_data | head | tail | mbssid_ies | rnr_ies</div><div class='ctx'> 	 */</div><div class='ctx'> 	new-&gt;head = ((u8 *) new) + sizeof(*new);</div><div class='ctx'> 	new-&gt;tail = new-&gt;head + new_head_len;</div><div class='ctx'> 	new-&gt;head_len = new_head_len;</div><div class='ctx'> 	new-&gt;tail_len = new_tail_len;</div><div class='add'>+	/* copy in optional mbssid_ies */</div><div class='add'>+	if (mbssid) {</div><div class='add'>+		u8 *pos = new-&gt;tail + new-&gt;tail_len;</div><div class='add'>+</div><div class='add'>+		new-&gt;mbssid_ies = (void *)pos;</div><div class='add'>+		pos += struct_size(new-&gt;mbssid_ies, elem, mbssid-&gt;cnt);</div><div class='add'>+		pos += ieee80211_copy_mbssid_beacon(pos, new-&gt;mbssid_ies,</div><div class='add'>+						    mbssid);</div><div class='add'>+		if (rnr) {</div><div class='add'>+			new-&gt;rnr_ies = (void *)pos;</div><div class='add'>+			pos += struct_size(new-&gt;rnr_ies, elem, rnr-&gt;cnt);</div><div class='add'>+			ieee80211_copy_rnr_beacon(pos, new-&gt;rnr_ies, rnr);</div><div class='add'>+		}</div><div class='add'>+		/* update bssid_indicator */</div><div class='add'>+		if (new-&gt;mbssid_ies-&gt;cnt &amp;&amp; new-&gt;mbssid_ies-&gt;elem[0].len &gt; 2)</div><div class='add'>+			link_conf-&gt;bssid_indicator =</div><div class='add'>+					*(new-&gt;mbssid_ies-&gt;elem[0].data + 2);</div><div class='add'>+		else</div><div class='add'>+			link_conf-&gt;bssid_indicator = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (csa) {</div><div class='del'>-		new-&gt;csa_current_counter = csa-&gt;count;</div><div class='del'>-		memcpy(new-&gt;csa_counter_offsets, csa-&gt;counter_offsets_beacon,</div><div class='add'>+		new-&gt;cntdwn_current_counter = csa-&gt;count;</div><div class='add'>+		memcpy(new-&gt;cntdwn_counter_offsets, csa-&gt;counter_offsets_beacon,</div><div class='ctx'> 		       csa-&gt;n_counter_offsets_beacon *</div><div class='del'>-		       sizeof(new-&gt;csa_counter_offsets[0]));</div><div class='add'>+		       sizeof(new-&gt;cntdwn_counter_offsets[0]));</div><div class='add'>+	} else if (cca) {</div><div class='add'>+		new-&gt;cntdwn_current_counter = cca-&gt;count;</div><div class='add'>+		new-&gt;cntdwn_counter_offsets[0] = cca-&gt;counter_offset_beacon;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* copy in head */</div><div class='hunk'>@@ -859,18 +1425,63 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 			memcpy(new-&gt;tail, old-&gt;tail, new_tail_len);</div><div class='ctx'> </div><div class='ctx'> 	err = ieee80211_set_probe_resp(sdata, params-&gt;probe_resp,</div><div class='del'>-				       params-&gt;probe_resp_len, csa);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+				       params-&gt;probe_resp_len, csa, cca, link);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(new);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		changed |= BSS_CHANGED_AP_PROBE_RESP;</div><div class='add'>+		_changed |= BSS_CHANGED_AP_PROBE_RESP;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ftm_responder != -1) {</div><div class='add'>+		link_conf-&gt;ftm_responder = params-&gt;ftm_responder;</div><div class='add'>+		err = ieee80211_set_ftm_responder_params(sdata,</div><div class='add'>+							 params-&gt;lci,</div><div class='add'>+							 params-&gt;lci_len,</div><div class='add'>+							 params-&gt;civicloc,</div><div class='add'>+							 params-&gt;civicloc_len,</div><div class='add'>+							 link_conf);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			kfree(new);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_changed |= BSS_CHANGED_FTM_RESPONDER;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(sdata-&gt;u.ap.beacon, new);</div><div class='add'>+	rcu_assign_pointer(link-&gt;u.ap.beacon, new);</div><div class='add'>+	sdata-&gt;u.ap.active = true;</div><div class='ctx'> </div><div class='ctx'> 	if (old)</div><div class='ctx'> 		kfree_rcu(old, rcu_head);</div><div class='ctx'> </div><div class='del'>-	return changed;</div><div class='add'>+	*changed |= _changed;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ieee80211_num_beaconing_links(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	u8 link_id, num = 0;</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;vif.type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    sdata-&gt;vif.type != NL80211_IFTYPE_P2P_GO)</div><div class='add'>+		return num;</div><div class='add'>+</div><div class='add'>+	/* non-MLO mode of operation also uses link_id 0 in sdata so it is</div><div class='add'>+	 * safe to directly proceed with the below loop</div><div class='add'>+	 */</div><div class='add'>+	for (link_id = 0; link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS; link_id++) {</div><div class='add'>+		link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (sdata_dereference(link-&gt;u.ap.beacon, sdata))</div><div class='add'>+			num++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='hunk'>@@ -880,45 +1491,142 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct beacon_data *old;</div><div class='ctx'> 	struct ieee80211_sub_if_data *vlan;</div><div class='del'>-	u32 changed = BSS_CHANGED_BEACON_INT |</div><div class='add'>+	u64 changed = BSS_CHANGED_BEACON_INT |</div><div class='ctx'> 		      BSS_CHANGED_BEACON_ENABLED |</div><div class='ctx'> 		      BSS_CHANGED_BEACON |</div><div class='del'>-		      BSS_CHANGED_SSID |</div><div class='ctx'> 		      BSS_CHANGED_P2P_PS |</div><div class='del'>-		      BSS_CHANGED_TXPOWER;</div><div class='del'>-	int err;</div><div class='add'>+		      BSS_CHANGED_TXPOWER |</div><div class='add'>+		      BSS_CHANGED_TWT;</div><div class='add'>+	int i, err;</div><div class='add'>+	int prev_beacon_int;</div><div class='add'>+	unsigned int link_id = params-&gt;beacon.link_id;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = params-&gt;chandef };</div><div class='add'>+	u64 tsf;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOLINK;</div><div class='ctx'> </div><div class='del'>-	old = sdata_dereference(sdata-&gt;u.ap.beacon, sdata);</div><div class='add'>+	link_conf = link-&gt;conf;</div><div class='add'>+</div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.beacon, sdata);</div><div class='ctx'> 	if (old)</div><div class='ctx'> 		return -EALREADY;</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;smps_mode) {</div><div class='del'>-	case NL80211_SMPS_OFF:</div><div class='del'>-		sdata-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_SMPS_STATIC:</div><div class='del'>-		sdata-&gt;smps_mode = IEEE80211_SMPS_STATIC;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_SMPS_DYNAMIC:</div><div class='del'>-		sdata-&gt;smps_mode = IEEE80211_SMPS_DYNAMIC;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	sdata-&gt;u.ap.req_smps = sdata-&gt;smps_mode;</div><div class='add'>+	link-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='add'>+</div><div class='add'>+	link-&gt;needed_rx_chains = sdata-&gt;local-&gt;rx_chains;</div><div class='add'>+</div><div class='add'>+	prev_beacon_int = link_conf-&gt;beacon_int;</div><div class='add'>+	link_conf-&gt;beacon_int = params-&gt;beacon_interval;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ht_cap)</div><div class='add'>+		link_conf-&gt;ht_ldpc =</div><div class='add'>+			params-&gt;ht_cap-&gt;cap_info &amp;</div><div class='add'>+				cpu_to_le16(IEEE80211_HT_CAP_LDPC_CODING);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;vht_cap) {</div><div class='add'>+		link_conf-&gt;vht_ldpc =</div><div class='add'>+			params-&gt;vht_cap-&gt;vht_cap_info &amp;</div><div class='add'>+				cpu_to_le32(IEEE80211_VHT_CAP_RXLDPC);</div><div class='add'>+		link_conf-&gt;vht_su_beamformer =</div><div class='add'>+			params-&gt;vht_cap-&gt;vht_cap_info &amp;</div><div class='add'>+				cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);</div><div class='add'>+		link_conf-&gt;vht_su_beamformee =</div><div class='add'>+			params-&gt;vht_cap-&gt;vht_cap_info &amp;</div><div class='add'>+				cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);</div><div class='add'>+		link_conf-&gt;vht_mu_beamformer =</div><div class='add'>+			params-&gt;vht_cap-&gt;vht_cap_info &amp;</div><div class='add'>+				cpu_to_le32(IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);</div><div class='add'>+		link_conf-&gt;vht_mu_beamformee =</div><div class='add'>+			params-&gt;vht_cap-&gt;vht_cap_info &amp;</div><div class='add'>+				cpu_to_le32(IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;he_cap &amp;&amp; params-&gt;he_oper) {</div><div class='add'>+		link_conf-&gt;he_support = true;</div><div class='add'>+		link_conf-&gt;htc_trig_based_pkt_ext =</div><div class='add'>+			le32_get_bits(params-&gt;he_oper-&gt;he_oper_params,</div><div class='add'>+			      IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK);</div><div class='add'>+		link_conf-&gt;frame_time_rts_th =</div><div class='add'>+			le32_get_bits(params-&gt;he_oper-&gt;he_oper_params,</div><div class='add'>+			      IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK);</div><div class='add'>+		changed |= BSS_CHANGED_HE_OBSS_PD;</div><div class='add'>+</div><div class='add'>+		if (params-&gt;beacon.he_bss_color.enabled)</div><div class='add'>+			changed |= BSS_CHANGED_HE_BSS_COLOR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;he_cap) {</div><div class='add'>+		link_conf-&gt;he_ldpc =</div><div class='add'>+			params-&gt;he_cap-&gt;phy_cap_info[1] &amp;</div><div class='add'>+				IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;</div><div class='add'>+		link_conf-&gt;he_su_beamformer =</div><div class='add'>+			params-&gt;he_cap-&gt;phy_cap_info[3] &amp;</div><div class='add'>+				IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;</div><div class='add'>+		link_conf-&gt;he_su_beamformee =</div><div class='add'>+			params-&gt;he_cap-&gt;phy_cap_info[4] &amp;</div><div class='add'>+				IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE;</div><div class='add'>+		link_conf-&gt;he_mu_beamformer =</div><div class='add'>+			params-&gt;he_cap-&gt;phy_cap_info[4] &amp;</div><div class='add'>+				IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;</div><div class='add'>+		link_conf-&gt;he_full_ul_mumimo =</div><div class='add'>+			params-&gt;he_cap-&gt;phy_cap_info[2] &amp;</div><div class='add'>+				IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;eht_cap) {</div><div class='add'>+		if (!link_conf-&gt;he_support)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;needed_rx_chains = sdata-&gt;local-&gt;rx_chains;</div><div class='add'>+		link_conf-&gt;eht_support = true;</div><div class='add'>+</div><div class='add'>+		link_conf-&gt;eht_su_beamformer =</div><div class='add'>+			params-&gt;eht_cap-&gt;fixed.phy_cap_info[0] &amp;</div><div class='add'>+				IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER;</div><div class='add'>+		link_conf-&gt;eht_su_beamformee =</div><div class='add'>+			params-&gt;eht_cap-&gt;fixed.phy_cap_info[0] &amp;</div><div class='add'>+				IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;</div><div class='add'>+		link_conf-&gt;eht_mu_beamformer =</div><div class='add'>+			params-&gt;eht_cap-&gt;fixed.phy_cap_info[7] &amp;</div><div class='add'>+				(IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ);</div><div class='add'>+		link_conf-&gt;eht_80mhz_full_bw_ul_mumimo =</div><div class='add'>+			params-&gt;eht_cap-&gt;fixed.phy_cap_info[7] &amp;</div><div class='add'>+				(IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ);</div><div class='add'>+		link_conf-&gt;eht_disable_mcs15 =</div><div class='add'>+			u8_get_bits(params-&gt;eht_oper-&gt;params,</div><div class='add'>+				    IEEE80211_EHT_OPER_MCS15_DISABLE);</div><div class='add'>+	} else {</div><div class='add'>+		link_conf-&gt;eht_su_beamformer = false;</div><div class='add'>+		link_conf-&gt;eht_su_beamformee = false;</div><div class='add'>+		link_conf-&gt;eht_mu_beamformer = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.beacon_int = params-&gt;beacon_interval;</div><div class='add'>+	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    params-&gt;mbssid_config.tx_wdev) {</div><div class='add'>+		err = ieee80211_set_ap_mbssid_options(sdata,</div><div class='add'>+						      &amp;params-&gt;mbssid_config,</div><div class='add'>+						      link_conf);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	err = ieee80211_vif_use_channel(sdata, &amp;params-&gt;chandef,</div><div class='del'>-					IEEE80211_CHANCTX_SHARED);</div><div class='add'>+	err = ieee80211_link_use_channel(link, &amp;chanreq,</div><div class='add'>+					 IEEE80211_CHANCTX_SHARED);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		ieee80211_vif_copy_chanctx_to_vlans(sdata, false);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='del'>-	if (err)</div><div class='add'>+		ieee80211_link_copy_chanctx_to_vlans(link, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		link_conf-&gt;beacon_int = prev_beacon_int;</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Apply control port protocol, this allows us to</div><div class='hunk'>@@ -928,9 +1636,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	sdata-&gt;control_port_no_encrypt = params-&gt;crypto.control_port_no_encrypt;</div><div class='ctx'> 	sdata-&gt;control_port_over_nl80211 =</div><div class='ctx'> 				params-&gt;crypto.control_port_over_nl80211;</div><div class='del'>-	sdata-&gt;encrypt_headroom = ieee80211_cs_headroom(sdata-&gt;local,</div><div class='del'>-							&amp;params-&gt;crypto,</div><div class='del'>-							sdata-&gt;vif.type);</div><div class='add'>+	sdata-&gt;control_port_no_preauth =</div><div class='add'>+				params-&gt;crypto.control_port_no_preauth;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list) {</div><div class='ctx'> 		vlan-&gt;control_port_protocol =</div><div class='hunk'>@@ -939,203 +1646,296 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			params-&gt;crypto.control_port_no_encrypt;</div><div class='ctx'> 		vlan-&gt;control_port_over_nl80211 =</div><div class='ctx'> 			params-&gt;crypto.control_port_over_nl80211;</div><div class='del'>-		vlan-&gt;encrypt_headroom =</div><div class='del'>-			ieee80211_cs_headroom(sdata-&gt;local,</div><div class='del'>-					      &amp;params-&gt;crypto,</div><div class='del'>-					      vlan-&gt;vif.type);</div><div class='add'>+		vlan-&gt;control_port_no_preauth =</div><div class='add'>+			params-&gt;crypto.control_port_no_preauth;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.dtim_period = params-&gt;dtim_period;</div><div class='del'>-	sdata-&gt;vif.bss_conf.enable_beacon = true;</div><div class='del'>-	sdata-&gt;vif.bss_conf.allow_p2p_go_ps = sdata-&gt;vif.p2p;</div><div class='add'>+	link_conf-&gt;dtim_period = params-&gt;dtim_period;</div><div class='add'>+	link_conf-&gt;enable_beacon = true;</div><div class='add'>+	link_conf-&gt;allow_p2p_go_ps = sdata-&gt;vif.p2p;</div><div class='add'>+	link_conf-&gt;twt_responder = params-&gt;twt_responder;</div><div class='add'>+	link_conf-&gt;he_obss_pd = params-&gt;he_obss_pd;</div><div class='add'>+	link_conf-&gt;he_bss_color = params-&gt;beacon.he_bss_color;</div><div class='add'>+	link_conf-&gt;s1g_long_beacon_period = params-&gt;s1g_long_beacon_period;</div><div class='add'>+	sdata-&gt;vif.cfg.s1g = params-&gt;chandef.chan-&gt;band == NL80211_BAND_S1GHZ;</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.ssid_len = params-&gt;ssid_len;</div><div class='add'>+	sdata-&gt;vif.cfg.ssid_len = params-&gt;ssid_len;</div><div class='ctx'> 	if (params-&gt;ssid_len)</div><div class='del'>-		memcpy(sdata-&gt;vif.bss_conf.ssid, params-&gt;ssid,</div><div class='add'>+		memcpy(sdata-&gt;vif.cfg.ssid, params-&gt;ssid,</div><div class='ctx'> 		       params-&gt;ssid_len);</div><div class='del'>-	sdata-&gt;vif.bss_conf.hidden_ssid =</div><div class='add'>+	link_conf-&gt;hidden_ssid =</div><div class='ctx'> 		(params-&gt;hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;sdata-&gt;vif.bss_conf.p2p_noa_attr, 0,</div><div class='del'>-	       sizeof(sdata-&gt;vif.bss_conf.p2p_noa_attr));</div><div class='del'>-	sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow =</div><div class='add'>+	memset(&amp;link_conf-&gt;p2p_noa_attr, 0,</div><div class='add'>+	       sizeof(link_conf-&gt;p2p_noa_attr));</div><div class='add'>+	link_conf-&gt;p2p_noa_attr.oppps_ctwindow =</div><div class='ctx'> 		params-&gt;p2p_ctwindow &amp; IEEE80211_P2P_OPPPS_CTWINDOW_MASK;</div><div class='ctx'> 	if (params-&gt;p2p_opp_ps)</div><div class='del'>-		sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow |=</div><div class='add'>+		link_conf-&gt;p2p_noa_attr.oppps_ctwindow |=</div><div class='ctx'> 					IEEE80211_P2P_OPPPS_ENABLE_BIT;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_assign_beacon(sdata, &amp;params-&gt;beacon, NULL);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ieee80211_vif_release_channel(sdata);</div><div class='del'>-		return err;</div><div class='add'>+	sdata-&gt;beacon_rate_set = false;</div><div class='add'>+	if (wiphy_ext_feature_isset(local-&gt;hw.wiphy,</div><div class='add'>+				    NL80211_EXT_FEATURE_BEACON_RATE_LEGACY)) {</div><div class='add'>+		for (i = 0; i &lt; NUM_NL80211_BANDS; i++) {</div><div class='add'>+			sdata-&gt;beacon_rateidx_mask[i] =</div><div class='add'>+				params-&gt;beacon_rate.control[i].legacy;</div><div class='add'>+			if (sdata-&gt;beacon_rateidx_mask[i])</div><div class='add'>+				sdata-&gt;beacon_rate_set = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	changed |= err;</div><div class='ctx'> </div><div class='del'>-	err = drv_start_ap(sdata-&gt;local, sdata);</div><div class='add'>+	if (ieee80211_hw_check(&amp;local-&gt;hw, HAS_RATE_CONTROL))</div><div class='add'>+		link_conf-&gt;beacon_tx_rate = params-&gt;beacon_rate;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_assign_beacon(sdata, link, &amp;params-&gt;beacon, NULL, NULL,</div><div class='add'>+				      &amp;changed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_fils_discovery(sdata, &amp;params-&gt;fils_discovery,</div><div class='add'>+					   link, link_conf, &amp;changed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_unsol_bcast_probe_resp(sdata,</div><div class='add'>+						   &amp;params-&gt;unsol_bcast_probe_resp,</div><div class='add'>+						   link, link_conf, &amp;changed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;vif.cfg.s1g) {</div><div class='add'>+		err = ieee80211_set_s1g_short_beacon(sdata, link,</div><div class='add'>+						     &amp;params-&gt;s1g_short_beacon);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = drv_start_ap(sdata-&gt;local, sdata, link_conf);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		old = sdata_dereference(sdata-&gt;u.ap.beacon, sdata);</div><div class='add'>+		old = sdata_dereference(link-&gt;u.ap.beacon, sdata);</div><div class='ctx'> </div><div class='ctx'> 		if (old)</div><div class='ctx'> 			kfree_rcu(old, rcu_head);</div><div class='del'>-		RCU_INIT_POINTER(sdata-&gt;u.ap.beacon, NULL);</div><div class='del'>-		ieee80211_vif_release_channel(sdata);</div><div class='del'>-		return err;</div><div class='add'>+		RCU_INIT_POINTER(link-&gt;u.ap.beacon, NULL);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_num_beaconing_links(sdata) == 0)</div><div class='add'>+			sdata-&gt;u.ap.active = false;</div><div class='add'>+</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_recalc_dtim(local, sdata);</div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, changed);</div><div class='add'>+	tsf = drv_get_tsf(local, sdata);</div><div class='add'>+	ieee80211_recalc_dtim(sdata, tsf);</div><div class='add'>+</div><div class='add'>+	if (link-&gt;u.ap.s1g_short_beacon)</div><div class='add'>+		ieee80211_recalc_sb_count(sdata, tsf);</div><div class='add'>+</div><div class='add'>+	ieee80211_vif_cfg_change_notify(sdata, BSS_CHANGED_SSID);</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_num_beaconing_links(sdata) &lt;= 1)</div><div class='add'>+		netif_carrier_on(dev);</div><div class='ctx'> </div><div class='del'>-	netif_carrier_on(dev);</div><div class='ctx'> 	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list)</div><div class='ctx'> 		netif_carrier_on(vlan-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	ieee80211_link_release_channel(link);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-				   struct cfg80211_beacon_data *params)</div><div class='add'>+				   struct cfg80211_ap_update *params)</div><div class='add'>+</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	struct cfg80211_beacon_data *beacon = &amp;params-&gt;beacon;</div><div class='ctx'> 	struct beacon_data *old;</div><div class='ctx'> 	int err;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	u64 changed = 0;</div><div class='ctx'> </div><div class='del'>-	sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='del'>-	sdata_assert_lock(sdata);</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	link = sdata_dereference(sdata-&gt;link[beacon-&gt;link_id], sdata);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	link_conf = link-&gt;conf;</div><div class='ctx'> </div><div class='del'>-	/* don't allow changing the beacon while CSA is in place - offset</div><div class='add'>+	/* don't allow changing the beacon while a countdown is in place - offset</div><div class='ctx'> 	 * of channel switch counter may change</div><div class='ctx'> 	 */</div><div class='del'>-	if (sdata-&gt;vif.csa_active)</div><div class='add'>+	if (link_conf-&gt;csa_active || link_conf-&gt;color_change_active)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	old = sdata_dereference(sdata-&gt;u.ap.beacon, sdata);</div><div class='add'>+	old = sdata_dereference(link-&gt;u.ap.beacon, sdata);</div><div class='ctx'> 	if (!old)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_assign_beacon(sdata, params, NULL);</div><div class='add'>+	err = ieee80211_assign_beacon(sdata, link, beacon, NULL, NULL,</div><div class='add'>+				      &amp;changed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_fils_discovery(sdata, &amp;params-&gt;fils_discovery,</div><div class='add'>+					   link, link_conf, &amp;changed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_unsol_bcast_probe_resp(sdata,</div><div class='add'>+						   &amp;params-&gt;unsol_bcast_probe_resp,</div><div class='add'>+						   link, link_conf, &amp;changed);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, err);</div><div class='add'>+</div><div class='add'>+	if (link-&gt;u.ap.s1g_short_beacon) {</div><div class='add'>+		err = ieee80211_set_s1g_short_beacon(sdata, link,</div><div class='add'>+						     &amp;params-&gt;s1g_short_beacon);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (beacon-&gt;he_bss_color_valid &amp;&amp;</div><div class='add'>+	    beacon-&gt;he_bss_color.enabled != link_conf-&gt;he_bss_color.enabled) {</div><div class='add'>+		link_conf-&gt;he_bss_color.enabled = beacon-&gt;he_bss_color.enabled;</div><div class='add'>+		changed |= BSS_CHANGED_HE_BSS_COLOR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)</div><div class='add'>+static void ieee80211_free_next_beacon(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;u.ap.next_beacon)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfree(link-&gt;u.ap.next_beacon-&gt;mbssid_ies);</div><div class='add'>+	kfree(link-&gt;u.ap.next_beacon-&gt;rnr_ies);</div><div class='add'>+	kfree(link-&gt;u.ap.next_beacon);</div><div class='add'>+	link-&gt;u.ap.next_beacon = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			     unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> 	struct ieee80211_sub_if_data *vlan;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct beacon_data *old_beacon;</div><div class='ctx'> 	struct probe_resp *old_probe_resp;</div><div class='add'>+	struct fils_discovery_data *old_fils_discovery;</div><div class='add'>+	struct unsol_bcast_probe_resp_data *old_unsol_bcast_probe_resp;</div><div class='add'>+	struct s1g_short_beacon_data *old_s1g_short_beacon;</div><div class='ctx'> 	struct cfg80211_chan_def chandef;</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='add'>+	LIST_HEAD(keys);</div><div class='ctx'> </div><div class='del'>-	sdata_assert_lock(sdata);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	old_beacon = sdata_dereference(sdata-&gt;u.ap.beacon, sdata);</div><div class='add'>+	old_beacon = sdata_dereference(link-&gt;u.ap.beacon, sdata);</div><div class='ctx'> 	if (!old_beacon)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	old_probe_resp = sdata_dereference(sdata-&gt;u.ap.probe_resp, sdata);</div><div class='del'>-</div><div class='del'>-	/* abort any running channel switch */</div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	sdata-&gt;vif.csa_active = false;</div><div class='del'>-	if (sdata-&gt;csa_block_tx) {</div><div class='del'>-		ieee80211_wake_vif_queues(local, sdata,</div><div class='del'>-					  IEEE80211_QUEUE_STOP_REASON_CSA);</div><div class='del'>-		sdata-&gt;csa_block_tx = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='del'>-</div><div class='del'>-	kfree(sdata-&gt;u.ap.next_beacon);</div><div class='del'>-	sdata-&gt;u.ap.next_beacon = NULL;</div><div class='add'>+	old_probe_resp = sdata_dereference(link-&gt;u.ap.probe_resp,</div><div class='add'>+					   sdata);</div><div class='add'>+	old_fils_discovery = sdata_dereference(link-&gt;u.ap.fils_discovery,</div><div class='add'>+					       sdata);</div><div class='add'>+	old_unsol_bcast_probe_resp =</div><div class='add'>+		sdata_dereference(link-&gt;u.ap.unsol_bcast_probe_resp,</div><div class='add'>+				  sdata);</div><div class='add'>+	old_s1g_short_beacon =</div><div class='add'>+		sdata_dereference(link-&gt;u.ap.s1g_short_beacon, sdata);</div><div class='add'>+</div><div class='add'>+	/* abort any running channel switch or color change */</div><div class='add'>+	link_conf-&gt;csa_active = false;</div><div class='add'>+	link_conf-&gt;color_change_active = false;</div><div class='add'>+	ieee80211_vif_unblock_queues_csa(sdata);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_next_beacon(link);</div><div class='ctx'> </div><div class='ctx'> 	/* turn off carrier for this interface and dependent VLANs */</div><div class='ctx'> 	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list)</div><div class='ctx'> 		netif_carrier_off(vlan-&gt;dev);</div><div class='del'>-	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_num_beaconing_links(sdata) &lt;= 1) {</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+		sdata-&gt;u.ap.active = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* remove beacon and probe response */</div><div class='del'>-	RCU_INIT_POINTER(sdata-&gt;u.ap.beacon, NULL);</div><div class='del'>-	RCU_INIT_POINTER(sdata-&gt;u.ap.probe_resp, NULL);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;u.ap.beacon, NULL);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;u.ap.probe_resp, NULL);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;u.ap.fils_discovery, NULL);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;u.ap.unsol_bcast_probe_resp, NULL);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;u.ap.s1g_short_beacon, NULL);</div><div class='ctx'> 	kfree_rcu(old_beacon, rcu_head);</div><div class='ctx'> 	if (old_probe_resp)</div><div class='ctx'> 		kfree_rcu(old_probe_resp, rcu_head);</div><div class='del'>-	sdata-&gt;u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;</div><div class='add'>+	if (old_fils_discovery)</div><div class='add'>+		kfree_rcu(old_fils_discovery, rcu_head);</div><div class='add'>+	if (old_unsol_bcast_probe_resp)</div><div class='add'>+		kfree_rcu(old_unsol_bcast_probe_resp, rcu_head);</div><div class='add'>+	if (old_s1g_short_beacon)</div><div class='add'>+		kfree_rcu(old_s1g_short_beacon, rcu_head);</div><div class='add'>+</div><div class='add'>+	kfree(link_conf-&gt;ftmr_params);</div><div class='add'>+	link_conf-&gt;ftmr_params = NULL;</div><div class='add'>+</div><div class='add'>+	link_conf-&gt;bssid_index = 0;</div><div class='add'>+	link_conf-&gt;nontransmitted = false;</div><div class='add'>+	link_conf-&gt;ema_ap = false;</div><div class='add'>+	link_conf-&gt;bssid_indicator = 0;</div><div class='add'>+	link_conf-&gt;fils_discovery.min_interval = 0;</div><div class='add'>+	link_conf-&gt;fils_discovery.max_interval = 0;</div><div class='add'>+	link_conf-&gt;unsol_bcast_probe_resp_interval = 0;</div><div class='add'>+</div><div class='add'>+	__sta_info_flush(sdata, true, link_id, NULL);</div><div class='add'>+</div><div class='add'>+	ieee80211_remove_link_keys(link, &amp;keys);</div><div class='add'>+	if (!list_empty(&amp;keys)) {</div><div class='add'>+		synchronize_net();</div><div class='add'>+		ieee80211_free_key_list(local, &amp;keys);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	__sta_info_flush(sdata, true);</div><div class='del'>-	ieee80211_free_keys(sdata, true);</div><div class='add'>+	ieee80211_stop_mbssid(sdata);</div><div class='add'>+	RCU_INIT_POINTER(link_conf-&gt;tx_bss_conf, NULL);</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.enable_beacon = false;</div><div class='del'>-	sdata-&gt;vif.bss_conf.ssid_len = 0;</div><div class='add'>+	link_conf-&gt;enable_beacon = false;</div><div class='add'>+	sdata-&gt;beacon_rate_set = false;</div><div class='add'>+	sdata-&gt;vif.cfg.ssid_len = 0;</div><div class='add'>+	sdata-&gt;vif.cfg.s1g = false;</div><div class='ctx'> 	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &amp;sdata-&gt;state);</div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link,</div><div class='add'>+					  BSS_CHANGED_BEACON_ENABLED);</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;wdev.cac_started) {</div><div class='del'>-		chandef = sdata-&gt;vif.bss_conf.chandef;</div><div class='del'>-		cancel_delayed_work_sync(&amp;sdata-&gt;dfs_cac_timer_work);</div><div class='add'>+	if (sdata-&gt;wdev.links[link_id].cac_started) {</div><div class='add'>+		chandef = link_conf-&gt;chanreq.oper;</div><div class='add'>+		wiphy_delayed_work_cancel(wiphy, &amp;link-&gt;dfs_cac_timer_work);</div><div class='ctx'> 		cfg80211_cac_event(sdata-&gt;dev, &amp;chandef,</div><div class='ctx'> 				   NL80211_RADAR_CAC_ABORTED,</div><div class='del'>-				   GFP_KERNEL);</div><div class='add'>+				   GFP_KERNEL, link_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	drv_stop_ap(sdata-&gt;local, sdata);</div><div class='add'>+	drv_stop_ap(sdata-&gt;local, sdata, link_conf);</div><div class='ctx'> </div><div class='ctx'> 	/* free all potentially still buffered bcast frames */</div><div class='ctx'> 	local-&gt;total_ps_buffered -= skb_queue_len(&amp;sdata-&gt;u.ap.ps.bc_buf);</div><div class='ctx'> 	ieee80211_purge_tx_queue(&amp;local-&gt;hw, &amp;sdata-&gt;u.ap.ps.bc_buf);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	ieee80211_vif_copy_chanctx_to_vlans(sdata, true);</div><div class='del'>-	ieee80211_vif_release_channel(sdata);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='add'>+	ieee80211_link_copy_chanctx_to_vlans(link, true);</div><div class='add'>+	ieee80211_link_release_channel(link);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */</div><div class='del'>-struct iapp_layer2_update {</div><div class='del'>-	u8 da[ETH_ALEN];	/* broadcast */</div><div class='del'>-	u8 sa[ETH_ALEN];	/* STA addr */</div><div class='del'>-	__be16 len;		/* 6 */</div><div class='del'>-	u8 dsap;		/* 0 */</div><div class='del'>-	u8 ssap;		/* 0 */</div><div class='del'>-	u8 control;</div><div class='del'>-	u8 xid_info[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static void ieee80211_send_layer2_update(struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	struct iapp_layer2_update *msg;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	/* Send Level 2 Update Frame to update forwarding tables in layer 2</div><div class='del'>-	 * bridge devices */</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(sizeof(*msg));</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-	msg = skb_put(skb, sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	/* 802.2 Type 1 Logical Link Control (LLC) Exchange Identifier (XID)</div><div class='del'>-	 * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */</div><div class='del'>-</div><div class='del'>-	eth_broadcast_addr(msg-&gt;da);</div><div class='del'>-	memcpy(msg-&gt;sa, sta-&gt;sta.addr, ETH_ALEN);</div><div class='del'>-	msg-&gt;len = htons(6);</div><div class='del'>-	msg-&gt;dsap = 0;</div><div class='del'>-	msg-&gt;ssap = 0x01;	/* NULL LSAP, CR Bit: Response */</div><div class='del'>-	msg-&gt;control = 0xaf;	/* XID response lsb.1111F101.</div><div class='del'>-				 * F=0 (no poll command; unsolicited frame) */</div><div class='del'>-	msg-&gt;xid_info[0] = 0x81;	/* XID format identifier */</div><div class='del'>-	msg-&gt;xid_info[1] = 1;	/* LLC types/classes: Type 1 LLC */</div><div class='del'>-	msg-&gt;xid_info[2] = 0;	/* XID sender's receive window size (RW) */</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = sta-&gt;sdata-&gt;dev;</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, sta-&gt;sdata-&gt;dev);</div><div class='del'>-	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='del'>-	netif_rx_ni(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sta_apply_auth_flags(struct ieee80211_local *local,</div><div class='ctx'> 				struct sta_info *sta,</div><div class='ctx'> 				u32 mask, u32 set)</div><div class='hunk'>@@ -1159,7 +1959,7 @@ static int sta_apply_auth_flags(struct ieee80211_local *local,</div><div class='ctx'> 		 * before drv_sta_state() is called.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!test_sta_flag(sta, WLAN_STA_RATE_CONTROL))</div><div class='del'>-			rate_control_rate_init(sta);</div><div class='add'>+			rate_control_rate_init_all_links(sta);</div><div class='ctx'> </div><div class='ctx'> 		ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1202,7 +2002,7 @@ static void sta_apply_mesh_params(struct ieee80211_local *local,</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	u64 changed = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;sta_modify_mask &amp; STATION_PARAM_APPLY_PLINK_STATE) {</div><div class='ctx'> 		switch (params-&gt;plink_state) {</div><div class='hunk'>@@ -1215,6 +2015,11 @@ static void sta_apply_mesh_params(struct ieee80211_local *local,</div><div class='ctx'> 			ieee80211_mps_sta_status_update(sta);</div><div class='ctx'> 			changed |= ieee80211_mps_set_sta_local_pm(sta,</div><div class='ctx'> 				      sdata-&gt;u.mesh.mshcfg.power_mode);</div><div class='add'>+</div><div class='add'>+			ewma_mesh_tx_rate_avg_init(&amp;sta-&gt;mesh-&gt;tx_rate_avg);</div><div class='add'>+			/* init at low value */</div><div class='add'>+			ewma_mesh_tx_rate_avg_add(&amp;sta-&gt;mesh-&gt;tx_rate_avg, 10);</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NL80211_PLINK_LISTEN:</div><div class='ctx'> 		case NL80211_PLINK_BLOCKED:</div><div class='hunk'>@@ -1256,19 +2061,151 @@ static void sta_apply_mesh_params(struct ieee80211_local *local,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='del'>-				struct sta_info *sta,</div><div class='del'>-				struct station_parameters *params)</div><div class='add'>+enum sta_link_apply_mode {</div><div class='add'>+	STA_LINK_MODE_NEW,</div><div class='add'>+	STA_LINK_MODE_STA_MODIFY,</div><div class='add'>+	STA_LINK_MODE_LINK_MODIFY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sta_link_apply_parameters(struct ieee80211_local *local,</div><div class='add'>+				     struct sta_info *sta,</div><div class='add'>+				     enum sta_link_apply_mode mode,</div><div class='add'>+				     struct link_station_parameters *params)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='del'>-	u32 mask, set;</div><div class='add'>+	u32 link_id = params-&gt;link_id &lt; 0 ? 0 : params-&gt;link_id;</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+	struct link_sta_info *link_sta =</div><div class='add'>+		rcu_dereference_protected(sta-&gt;link[link_id],</div><div class='add'>+					  lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='add'>+	bool changes = params-&gt;link_mac ||</div><div class='add'>+		       params-&gt;txpwr_set ||</div><div class='add'>+		       params-&gt;supported_rates_len ||</div><div class='add'>+		       params-&gt;ht_capa ||</div><div class='add'>+		       params-&gt;vht_capa ||</div><div class='add'>+		       params-&gt;he_capa ||</div><div class='add'>+		       params-&gt;eht_capa ||</div><div class='add'>+		       params-&gt;s1g_capa ||</div><div class='add'>+		       params-&gt;opmode_notif_used;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case STA_LINK_MODE_NEW:</div><div class='add'>+		if (!params-&gt;link_mac)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case STA_LINK_MODE_LINK_MODIFY:</div><div class='add'>+		break;</div><div class='add'>+	case STA_LINK_MODE_STA_MODIFY:</div><div class='add'>+		if (params-&gt;link_id &gt;= 0)</div><div class='add'>+			break;</div><div class='add'>+		if (!changes)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sband = ieee80211_get_sband(sdata);</div><div class='add'>+	if (!link || !link_sta)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sband = ieee80211_get_link_sband(link);</div><div class='ctx'> 	if (!sband)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;link_mac) {</div><div class='add'>+		if (mode == STA_LINK_MODE_NEW) {</div><div class='add'>+			memcpy(link_sta-&gt;addr, params-&gt;link_mac, ETH_ALEN);</div><div class='add'>+			memcpy(link_sta-&gt;pub-&gt;addr, params-&gt;link_mac, ETH_ALEN);</div><div class='add'>+		} else if (!ether_addr_equal(link_sta-&gt;addr,</div><div class='add'>+					     params-&gt;link_mac)) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;txpwr_set) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		link_sta-&gt;pub-&gt;txpwr.type = params-&gt;txpwr.type;</div><div class='add'>+		if (params-&gt;txpwr.type == NL80211_TX_POWER_LIMITED)</div><div class='add'>+			link_sta-&gt;pub-&gt;txpwr.power = params-&gt;txpwr.power;</div><div class='add'>+		ret = drv_sta_set_txpwr(local, sdata, sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;supported_rates &amp;&amp;</div><div class='add'>+	    params-&gt;supported_rates_len &amp;&amp;</div><div class='add'>+	    !ieee80211_parse_bitrates(link-&gt;conf-&gt;chanreq.oper.width,</div><div class='add'>+				      sband, params-&gt;supported_rates,</div><div class='add'>+				      params-&gt;supported_rates_len,</div><div class='add'>+				      &amp;link_sta-&gt;pub-&gt;supp_rates[sband-&gt;band]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ht_capa)</div><div class='add'>+		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,</div><div class='add'>+						  params-&gt;ht_capa, link_sta);</div><div class='add'>+</div><div class='add'>+	/* VHT can override some HT caps such as the A-MSDU max length */</div><div class='add'>+	if (params-&gt;vht_capa)</div><div class='add'>+		ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,</div><div class='add'>+						    params-&gt;vht_capa, NULL,</div><div class='add'>+						    link_sta);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;he_capa)</div><div class='add'>+		ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband,</div><div class='add'>+						  (void *)params-&gt;he_capa,</div><div class='add'>+						  params-&gt;he_capa_len,</div><div class='add'>+						  (void *)params-&gt;he_6ghz_capa,</div><div class='add'>+						  link_sta);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;he_capa &amp;&amp; params-&gt;eht_capa)</div><div class='add'>+		ieee80211_eht_cap_ie_to_sta_eht_cap(sdata, sband,</div><div class='add'>+						    (u8 *)params-&gt;he_capa,</div><div class='add'>+						    params-&gt;he_capa_len,</div><div class='add'>+						    params-&gt;eht_capa,</div><div class='add'>+						    params-&gt;eht_capa_len,</div><div class='add'>+						    link_sta);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;s1g_capa)</div><div class='add'>+		ieee80211_s1g_cap_to_sta_s1g_cap(sdata, params-&gt;s1g_capa,</div><div class='add'>+						 link_sta);</div><div class='add'>+</div><div class='add'>+	ieee80211_sta_init_nss(link_sta);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;opmode_notif_used) {</div><div class='add'>+		enum nl80211_chan_width width = link-&gt;conf-&gt;chanreq.oper.width;</div><div class='add'>+</div><div class='add'>+		switch (width) {</div><div class='add'>+		case NL80211_CHAN_WIDTH_20:</div><div class='add'>+		case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		case NL80211_CHAN_WIDTH_320: /* not VHT, allowed for HE/EHT */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* returned value is only needed for rc update, but the</div><div class='add'>+		 * rc isn't initialized here yet, so ignore it</div><div class='add'>+		 */</div><div class='add'>+		__ieee80211_vht_handle_opmode(sdata, link_sta,</div><div class='add'>+					      params-&gt;opmode_notif,</div><div class='add'>+					      sband-&gt;band);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='add'>+				struct sta_info *sta,</div><div class='add'>+				struct station_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='add'>+	u32 mask, set;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='ctx'> 	mask = params-&gt;sta_flags_mask;</div><div class='ctx'> 	set = params-&gt;sta_flags_set;</div><div class='ctx'> </div><div class='hunk'>@@ -1300,7 +2237,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 		sta-&gt;sta.wme = set &amp; BIT(NL80211_STA_FLAG_WME);</div><div class='ctx'> </div><div class='ctx'> 	/* auth flags will be set later for TDLS,</div><div class='del'>-	 * and for unassociated stations that move to assocaited */</div><div class='add'>+	 * and for unassociated stations that move to associated */</div><div class='ctx'> 	if (!test_sta_flag(sta, WLAN_STA_TDLS_PEER) &amp;&amp;</div><div class='ctx'> 	    !((mask &amp; BIT(NL80211_STA_FLAG_ASSOCIATED)) &amp;&amp;</div><div class='ctx'> 	      (set &amp; BIT(NL80211_STA_FLAG_ASSOCIATED)))) {</div><div class='hunk'>@@ -1331,9 +2268,12 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 			clear_sta_flag(sta, WLAN_STA_TDLS_PEER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mask &amp; BIT(NL80211_STA_FLAG_SPP_AMSDU))</div><div class='add'>+		sta-&gt;sta.spp_amsdu = set &amp; BIT(NL80211_STA_FLAG_SPP_AMSDU);</div><div class='add'>+</div><div class='ctx'> 	/* mark TDLS channel switch support, if the AP allows it */</div><div class='ctx'> 	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) &amp;&amp;</div><div class='del'>-	    !sdata-&gt;u.mgd.tdls_chan_switch_prohibited &amp;&amp;</div><div class='add'>+	    !sdata-&gt;deflink.u.mgd.tdls_chan_switch_prohibited &amp;&amp;</div><div class='ctx'> 	    params-&gt;ext_capab_len &gt;= 4 &amp;&amp;</div><div class='ctx'> 	    params-&gt;ext_capab[3] &amp; WLAN_EXT_CAPA4_TDLS_CHAN_SWITCH)</div><div class='ctx'> 		set_sta_flag(sta, WLAN_STA_TDLS_CHAN_SWITCH);</div><div class='hunk'>@@ -1350,40 +2290,21 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 		sta-&gt;sta.max_sp = params-&gt;max_sp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The sender might not have sent the last bit, consider it to be 0 */</div><div class='del'>-	if (params-&gt;ext_capab_len &gt;= 8) {</div><div class='del'>-		u8 val = (params-&gt;ext_capab[7] &amp;</div><div class='del'>-			  WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB) &gt;&gt; 7;</div><div class='del'>-</div><div class='del'>-		/* we did get all the bits, take the MSB as well */</div><div class='del'>-		if (params-&gt;ext_capab_len &gt;= 9) {</div><div class='del'>-			u8 val_msb = params-&gt;ext_capab[8] &amp;</div><div class='del'>-				WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB;</div><div class='del'>-			val_msb &lt;&lt;= 1;</div><div class='del'>-			val |= val_msb;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		switch (val) {</div><div class='del'>-		case 1:</div><div class='del'>-			sta-&gt;sta.max_amsdu_subframes = 32;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			sta-&gt;sta.max_amsdu_subframes = 16;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			sta-&gt;sta.max_amsdu_subframes = 8;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			sta-&gt;sta.max_amsdu_subframes = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ieee80211_sta_set_max_amsdu_subframes(sta, params-&gt;ext_capab,</div><div class='add'>+					      params-&gt;ext_capab_len);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cfg80211 validates this (1-2007) and allows setting the AID</div><div class='del'>-	 * only when creating a new station entry</div><div class='add'>+	 * only when creating a new station entry. For S1G APs, the current</div><div class='add'>+	 * implementation supports a maximum of 1600 AIDs.</div><div class='ctx'> 	 */</div><div class='del'>-	if (params-&gt;aid)</div><div class='add'>+	if (params-&gt;aid) {</div><div class='add'>+		if (sdata-&gt;vif.cfg.s1g &amp;&amp;</div><div class='add'>+		    params-&gt;aid &gt; IEEE80211_MAX_SUPPORTED_S1G_AID)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		sta-&gt;sta.aid = params-&gt;aid;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some of the following updates would be racy if called on an</div><div class='hunk'>@@ -1396,34 +2317,13 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 	if (params-&gt;listen_interval &gt;= 0)</div><div class='ctx'> 		sta-&gt;listen_interval = params-&gt;listen_interval;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;supported_rates) {</div><div class='del'>-		ieee80211_parse_bitrates(&amp;sdata-&gt;vif.bss_conf.chandef,</div><div class='del'>-					 sband, params-&gt;supported_rates,</div><div class='del'>-					 params-&gt;supported_rates_len,</div><div class='del'>-					 &amp;sta-&gt;sta.supp_rates[sband-&gt;band]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (params-&gt;ht_capa)</div><div class='del'>-		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,</div><div class='del'>-						  params-&gt;ht_capa, sta);</div><div class='del'>-</div><div class='del'>-	/* VHT can override some HT caps such as the A-MSDU max length */</div><div class='del'>-	if (params-&gt;vht_capa)</div><div class='del'>-		ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,</div><div class='del'>-						    params-&gt;vht_capa, sta);</div><div class='add'>+	if (params-&gt;eml_cap_present)</div><div class='add'>+		sta-&gt;sta.eml_cap = params-&gt;eml_cap;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;he_capa)</div><div class='del'>-		ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband,</div><div class='del'>-						  (void *)params-&gt;he_capa,</div><div class='del'>-						  params-&gt;he_capa_len, sta);</div><div class='del'>-</div><div class='del'>-	if (params-&gt;opmode_notif_used) {</div><div class='del'>-		/* returned value is only needed for rc update, but the</div><div class='del'>-		 * rc isn't initialized here yet, so ignore it</div><div class='del'>-		 */</div><div class='del'>-		__ieee80211_vht_handle_opmode(sdata, sta, params-&gt;opmode_notif,</div><div class='del'>-					      sband-&gt;band);</div><div class='del'>-	}</div><div class='add'>+	ret = sta_link_apply_parameters(local, sta, STA_LINK_MODE_STA_MODIFY,</div><div class='add'>+					&amp;params-&gt;link_sta_params);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;support_p2p_ps &gt;= 0)</div><div class='ctx'> 		sta-&gt;sta.support_p2p_ps = params-&gt;support_p2p_ps;</div><div class='hunk'>@@ -1431,6 +2331,9 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 	if (ieee80211_vif_is_mesh(&amp;sdata-&gt;vif))</div><div class='ctx'> 		sta_apply_mesh_params(local, sta, params);</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;airtime_weight)</div><div class='add'>+		sta-&gt;airtime_weight = params-&gt;airtime_weight;</div><div class='add'>+</div><div class='ctx'> 	/* set the STA state after all sta info from usermode has been set */</div><div class='ctx'> 	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) ||</div><div class='ctx'> 	    set &amp; BIT(NL80211_STA_FLAG_ASSOCIATED)) {</div><div class='hunk'>@@ -1439,6 +2342,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Mark the STA as MLO if MLD MAC address is available */</div><div class='add'>+	if (params-&gt;link_sta_params.mld_mac)</div><div class='add'>+		sta-&gt;sta.mlo = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1450,7 +2357,8 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='ctx'> 	int err;</div><div class='del'>-	int layer2_update;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;vlan) {</div><div class='ctx'> 		sdata = IEEE80211_DEV_TO_SUB_IF(params-&gt;vlan);</div><div class='hunk'>@@ -1464,16 +2372,37 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	if (ether_addr_equal(mac, sdata-&gt;vif.addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (is_multicast_ether_addr(mac))</div><div class='add'>+	if (!is_valid_ether_addr(mac))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;sta_flags_set &amp; BIT(NL80211_STA_FLAG_TDLS_PEER) &amp;&amp;</div><div class='add'>+	    sdata-&gt;vif.type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    !sdata-&gt;u.mgd.associated)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	sta = sta_info_alloc(sdata, mac, GFP_KERNEL);</div><div class='add'>+	/*</div><div class='add'>+	 * If we have a link ID, it can be a non-MLO station on an AP MLD,</div><div class='add'>+	 * but we need to have a link_mac in that case as well, so use the</div><div class='add'>+	 * STA's MAC address in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (params-&gt;link_sta_params.link_id &gt;= 0)</div><div class='add'>+		sta = sta_info_alloc_with_link(sdata, mac,</div><div class='add'>+					       params-&gt;link_sta_params.link_id,</div><div class='add'>+					       params-&gt;link_sta_params.link_mac ?: mac,</div><div class='add'>+					       GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		sta = sta_info_alloc(sdata, mac, GFP_KERNEL);</div><div class='add'>+</div><div class='ctx'> 	if (!sta)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;sta_flags_set &amp; BIT(NL80211_STA_FLAG_TDLS_PEER))</div><div class='ctx'> 		sta-&gt;sta.tdls = true;</div><div class='ctx'> </div><div class='add'>+	/* Though the mutex is not needed here (since the station is not</div><div class='add'>+	 * visible yet), sta_apply_parameters (and inner functions) require</div><div class='add'>+	 * the mutex due to other paths.</div><div class='add'>+	 */</div><div class='ctx'> 	err = sta_apply_parameters(local, sta, params);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		sta_info_free(local, sta);</div><div class='hunk'>@@ -1487,23 +2416,9 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!test_sta_flag(sta, WLAN_STA_TDLS_PEER) &amp;&amp;</div><div class='ctx'> 	    test_sta_flag(sta, WLAN_STA_ASSOC))</div><div class='del'>-		rate_control_rate_init(sta);</div><div class='del'>-</div><div class='del'>-	layer2_update = sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN ||</div><div class='del'>-		sdata-&gt;vif.type == NL80211_IFTYPE_AP;</div><div class='del'>-</div><div class='del'>-	err = sta_info_insert_rcu(sta);</div><div class='del'>-	if (err) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (layer2_update)</div><div class='del'>-		ieee80211_send_layer2_update(sta);</div><div class='add'>+		rate_control_rate_init_all_links(sta);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return sta_info_insert(sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='hunk'>@@ -1516,7 +2431,7 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	if (params-&gt;mac)</div><div class='ctx'> 		return sta_info_destroy_addr_bss(sdata, params-&gt;mac);</div><div class='ctx'> </div><div class='del'>-	sta_info_flush(sdata);</div><div class='add'>+	sta_info_flush(sdata, params-&gt;link_id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1531,13 +2446,11 @@ static int ieee80211_change_station(struct wiphy *wiphy,</div><div class='ctx'> 	enum cfg80211_station_type statype;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;sta_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	sta = sta_info_get_bss(sdata, mac);</div><div class='del'>-	if (!sta) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	switch (sdata-&gt;vif.type) {</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='hunk'>@@ -1567,25 +2480,23 @@ static int ieee80211_change_station(struct wiphy *wiphy,</div><div class='ctx'> 			statype = CFG80211_STA_AP_CLIENT_UNASSOC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out_err;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = cfg80211_check_station_change(wiphy, params, statype);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;vlan &amp;&amp; params-&gt;vlan != sta-&gt;sdata-&gt;dev) {</div><div class='ctx'> 		vlansdata = IEEE80211_DEV_TO_SUB_IF(params-&gt;vlan);</div><div class='ctx'> </div><div class='ctx'> 		if (params-&gt;vlan-&gt;ieee80211_ptr-&gt;use_4addr) {</div><div class='del'>-			if (vlansdata-&gt;u.vlan.sta) {</div><div class='del'>-				err = -EBUSY;</div><div class='del'>-				goto out_err;</div><div class='del'>-			}</div><div class='add'>+			if (vlansdata-&gt;u.vlan.sta)</div><div class='add'>+				return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 			rcu_assign_pointer(vlansdata-&gt;u.vlan.sta, sta);</div><div class='ctx'> 			__ieee80211_check_fast_rx_iface(vlansdata);</div><div class='add'>+			drv_sta_set_4addr(local, sta-&gt;sdata, &amp;sta-&gt;sta, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (sta-&gt;sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN &amp;&amp;</div><div class='hunk'>@@ -1596,33 +2507,19 @@ static int ieee80211_change_station(struct wiphy *wiphy,</div><div class='ctx'> 			ieee80211_vif_dec_num_mcast(sta-&gt;sdata);</div><div class='ctx'> </div><div class='ctx'> 		sta-&gt;sdata = vlansdata;</div><div class='add'>+		ieee80211_check_fast_rx(sta);</div><div class='ctx'> 		ieee80211_check_fast_xmit(sta);</div><div class='ctx'> </div><div class='del'>-		if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))</div><div class='add'>+		if (test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {</div><div class='ctx'> 			ieee80211_vif_inc_num_mcast(sta-&gt;sdata);</div><div class='del'>-</div><div class='del'>-		ieee80211_send_layer2_update(sta);</div><div class='add'>+			cfg80211_send_layer2_update(sta-&gt;sdata-&gt;dev,</div><div class='add'>+						    sta-&gt;sta.addr);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = sta_apply_parameters(local, sta, params);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='del'>-</div><div class='del'>-	if ((sdata-&gt;vif.type == NL80211_IFTYPE_AP ||</div><div class='del'>-	     sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN) &amp;&amp;</div><div class='del'>-	    sta-&gt;known_smps_mode != sta-&gt;sdata-&gt;bss-&gt;req_smps &amp;&amp;</div><div class='del'>-	    test_sta_flag(sta, WLAN_STA_AUTHORIZED) &amp;&amp;</div><div class='del'>-	    sta_info_tx_streams(sta) != 1) {</div><div class='del'>-		ht_dbg(sta-&gt;sdata,</div><div class='del'>-		       "%pM just authorized and MIMO capable - update SMPS\n",</div><div class='del'>-		       sta-&gt;sta.addr);</div><div class='del'>-		ieee80211_send_smps_action(sta-&gt;sdata,</div><div class='del'>-			sta-&gt;sdata-&gt;bss-&gt;req_smps,</div><div class='del'>-			sta-&gt;sta.addr,</div><div class='del'>-			sta-&gt;sdata-&gt;vif.bss_conf.bssid);</div><div class='del'>-	}</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='ctx'> 	    params-&gt;sta_flags_mask &amp; BIT(NL80211_STA_FLAG_AUTHORIZED)) {</div><div class='hunk'>@@ -1631,9 +2528,6 @@ static int ieee80211_change_station(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-out_err:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;sta_mtx);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='hunk'>@@ -1726,7 +2620,9 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop,</div><div class='ctx'> 			MPATH_INFO_EXPTIME |</div><div class='ctx'> 			MPATH_INFO_DISCOVERY_TIMEOUT |</div><div class='ctx'> 			MPATH_INFO_DISCOVERY_RETRIES |</div><div class='del'>-			MPATH_INFO_FLAGS;</div><div class='add'>+			MPATH_INFO_FLAGS |</div><div class='add'>+			MPATH_INFO_HOP_COUNT |</div><div class='add'>+			MPATH_INFO_PATH_CHANGE;</div><div class='ctx'> </div><div class='ctx'> 	pinfo-&gt;frame_qlen = mpath-&gt;frame_queue.qlen;</div><div class='ctx'> 	pinfo-&gt;sn = mpath-&gt;sn;</div><div class='hunk'>@@ -1746,6 +2642,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop,</div><div class='ctx'> 		pinfo-&gt;flags |= NL80211_MPATH_FLAG_FIXED;</div><div class='ctx'> 	if (mpath-&gt;flags &amp; MESH_PATH_RESOLVED)</div><div class='ctx'> 		pinfo-&gt;flags |= NL80211_MPATH_FLAG_RESOLVED;</div><div class='add'>+	pinfo-&gt;hop_count = mpath-&gt;hop_count;</div><div class='add'>+	pinfo-&gt;path_change_count = mpath-&gt;path_change_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev,</div><div class='hunk'>@@ -1861,13 +2759,12 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,</div><div class='ctx'> 		const struct mesh_setup *setup)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *new_ie;</div><div class='del'>-	const u8 *old_ie;</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = container_of(ifmsh,</div><div class='ctx'> 					struct ieee80211_sub_if_data, u.mesh);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate information elements */</div><div class='ctx'> 	new_ie = NULL;</div><div class='del'>-	old_ie = ifmsh-&gt;ie;</div><div class='ctx'> </div><div class='ctx'> 	if (setup-&gt;ie_len) {</div><div class='ctx'> 		new_ie = kmemdup(setup-&gt;ie, setup-&gt;ie_len,</div><div class='hunk'>@@ -1877,7 +2774,6 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,</div><div class='ctx'> 	}</div><div class='ctx'> 	ifmsh-&gt;ie_len = setup-&gt;ie_len;</div><div class='ctx'> 	ifmsh-&gt;ie = new_ie;</div><div class='del'>-	kfree(old_ie);</div><div class='ctx'> </div><div class='ctx'> 	/* now copy the rest of the setup parameters */</div><div class='ctx'> 	ifmsh-&gt;mesh_id_len = setup-&gt;mesh_id_len;</div><div class='hunk'>@@ -1902,6 +2798,17 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,</div><div class='ctx'> 	sdata-&gt;vif.bss_conf.beacon_int = setup-&gt;beacon_interval;</div><div class='ctx'> 	sdata-&gt;vif.bss_conf.dtim_period = setup-&gt;dtim_period;</div><div class='ctx'> </div><div class='add'>+	sdata-&gt;beacon_rate_set = false;</div><div class='add'>+	if (wiphy_ext_feature_isset(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+				    NL80211_EXT_FEATURE_BEACON_RATE_LEGACY)) {</div><div class='add'>+		for (i = 0; i &lt; NUM_NL80211_BANDS; i++) {</div><div class='add'>+			sdata-&gt;beacon_rateidx_mask[i] =</div><div class='add'>+				setup-&gt;beacon_rate.control[i].legacy;</div><div class='add'>+			if (sdata-&gt;beacon_rateidx_mask[i])</div><div class='add'>+				sdata-&gt;beacon_rate_set = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1986,13 +2893,14 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,</div><div class='ctx'> 		 * devices that report signal in dBm.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!ieee80211_hw_check(&amp;sdata-&gt;local-&gt;hw, SIGNAL_DBM))</div><div class='del'>-			return -ENOTSUPP;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		conf-&gt;rssi_threshold = nconf-&gt;rssi_threshold;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (_chg_mesh_attr(NL80211_MESHCONF_HT_OPMODE, mask)) {</div><div class='ctx'> 		conf-&gt;ht_opmode = nconf-&gt;ht_opmode;</div><div class='ctx'> 		sdata-&gt;vif.bss_conf.ht_operation_mode = nconf-&gt;ht_opmode;</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, &amp;sdata-&gt;deflink,</div><div class='add'>+						  BSS_CHANGED_HT);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))</div><div class='ctx'> 		conf-&gt;dot11MeshHWMPactivePathToRootTimeout =</div><div class='hunk'>@@ -2012,6 +2920,14 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,</div><div class='ctx'> 			nconf-&gt;dot11MeshAwakeWindowDuration;</div><div class='ctx'> 	if (_chg_mesh_attr(NL80211_MESHCONF_PLINK_TIMEOUT, mask))</div><div class='ctx'> 		conf-&gt;plink_timeout = nconf-&gt;plink_timeout;</div><div class='add'>+	if (_chg_mesh_attr(NL80211_MESHCONF_CONNECTED_TO_GATE, mask))</div><div class='add'>+		conf-&gt;dot11MeshConnectedToMeshGate =</div><div class='add'>+			nconf-&gt;dot11MeshConnectedToMeshGate;</div><div class='add'>+	if (_chg_mesh_attr(NL80211_MESHCONF_NOLEARN, mask))</div><div class='add'>+		conf-&gt;dot11MeshNolearn = nconf-&gt;dot11MeshNolearn;</div><div class='add'>+	if (_chg_mesh_attr(NL80211_MESHCONF_CONNECTED_TO_AS, mask))</div><div class='add'>+		conf-&gt;dot11MeshConnectedToAuthServer =</div><div class='add'>+			nconf-&gt;dot11MeshConnectedToAuthServer;</div><div class='ctx'> 	ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2021,9 +2937,12 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			       const struct mesh_setup *setup)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = setup-&gt;chandef };</div><div class='ctx'> 	struct ieee80211_if_mesh *ifmsh = &amp;sdata-&gt;u.mesh;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;ifmsh-&gt;mshcfg, conf, sizeof(struct mesh_config));</div><div class='ctx'> 	err = copy_mesh_setup(ifmsh, setup);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -2032,13 +2951,11 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	sdata-&gt;control_port_over_nl80211 = setup-&gt;control_port_over_nl80211;</div><div class='ctx'> </div><div class='ctx'> 	/* can mesh use other SMPS modes? */</div><div class='del'>-	sdata-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='del'>-	sdata-&gt;needed_rx_chains = sdata-&gt;local-&gt;rx_chains;</div><div class='add'>+	sdata-&gt;deflink.smps_mode = IEEE80211_SMPS_OFF;</div><div class='add'>+	sdata-&gt;deflink.needed_rx_chains = sdata-&gt;local-&gt;rx_chains;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;mtx);</div><div class='del'>-	err = ieee80211_vif_use_channel(sdata, &amp;setup-&gt;chandef,</div><div class='del'>-					IEEE80211_CHANCTX_SHARED);</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;mtx);</div><div class='add'>+	err = ieee80211_link_use_channel(&amp;sdata-&gt;deflink, &amp;chanreq,</div><div class='add'>+					 IEEE80211_CHANCTX_SHARED);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2049,10 +2966,11 @@ static int ieee80211_leave_mesh(struct wiphy *wiphy, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_stop_mesh(sdata);</div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;mtx);</div><div class='del'>-	ieee80211_vif_release_channel(sdata);</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;mtx);</div><div class='add'>+	ieee80211_link_release_channel(&amp;sdata-&gt;deflink);</div><div class='add'>+	kfree(sdata-&gt;u.mesh.ie);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2063,48 +2981,53 @@ static int ieee80211_change_bss(struct wiphy *wiphy,</div><div class='ctx'> 				struct bss_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	u64 changed = 0;</div><div class='add'>+</div><div class='add'>+	link = ieee80211_link_or_deflink(sdata, params-&gt;link_id, true);</div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='ctx'> </div><div class='del'>-	if (!sdata_dereference(sdata-&gt;u.ap.beacon, sdata))</div><div class='add'>+	if (!sdata_dereference(link-&gt;u.ap.beacon, sdata))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	sband = ieee80211_get_sband(sdata);</div><div class='add'>+	sband = ieee80211_get_link_sband(link);</div><div class='ctx'> 	if (!sband)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;basic_rates) {</div><div class='add'>+		if (!ieee80211_parse_bitrates(link-&gt;conf-&gt;chanreq.oper.width,</div><div class='add'>+					      wiphy-&gt;bands[sband-&gt;band],</div><div class='add'>+					      params-&gt;basic_rates,</div><div class='add'>+					      params-&gt;basic_rates_len,</div><div class='add'>+					      &amp;link-&gt;conf-&gt;basic_rates))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		changed |= BSS_CHANGED_BASIC_RATES;</div><div class='add'>+		ieee80211_check_rate_mask(link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (params-&gt;use_cts_prot &gt;= 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.use_cts_prot = params-&gt;use_cts_prot;</div><div class='add'>+		link-&gt;conf-&gt;use_cts_prot = params-&gt;use_cts_prot;</div><div class='ctx'> 		changed |= BSS_CHANGED_ERP_CTS_PROT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (params-&gt;use_short_preamble &gt;= 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.use_short_preamble =</div><div class='del'>-			params-&gt;use_short_preamble;</div><div class='add'>+		link-&gt;conf-&gt;use_short_preamble = params-&gt;use_short_preamble;</div><div class='ctx'> 		changed |= BSS_CHANGED_ERP_PREAMBLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sdata-&gt;vif.bss_conf.use_short_slot &amp;&amp;</div><div class='del'>-	    sband-&gt;band == NL80211_BAND_5GHZ) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.use_short_slot = true;</div><div class='add'>+	if (!link-&gt;conf-&gt;use_short_slot &amp;&amp;</div><div class='add'>+	    (sband-&gt;band == NL80211_BAND_5GHZ ||</div><div class='add'>+	     sband-&gt;band == NL80211_BAND_6GHZ)) {</div><div class='add'>+		link-&gt;conf-&gt;use_short_slot = true;</div><div class='ctx'> 		changed |= BSS_CHANGED_ERP_SLOT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;use_short_slot_time &gt;= 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.use_short_slot =</div><div class='del'>-			params-&gt;use_short_slot_time;</div><div class='add'>+		link-&gt;conf-&gt;use_short_slot = params-&gt;use_short_slot_time;</div><div class='ctx'> 		changed |= BSS_CHANGED_ERP_SLOT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;basic_rates) {</div><div class='del'>-		ieee80211_parse_bitrates(&amp;sdata-&gt;vif.bss_conf.chandef,</div><div class='del'>-					 wiphy-&gt;bands[sband-&gt;band],</div><div class='del'>-					 params-&gt;basic_rates,</div><div class='del'>-					 params-&gt;basic_rates_len,</div><div class='del'>-					 &amp;sdata-&gt;vif.bss_conf.basic_rates);</div><div class='del'>-		changed |= BSS_CHANGED_BASIC_RATES;</div><div class='del'>-		ieee80211_check_rate_mask(sdata);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (params-&gt;ap_isolate &gt;= 0) {</div><div class='ctx'> 		if (params-&gt;ap_isolate)</div><div class='ctx'> 			sdata-&gt;flags |= IEEE80211_SDATA_DONT_BRIDGE_PACKETS;</div><div class='hunk'>@@ -2114,30 +3037,29 @@ static int ieee80211_change_bss(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;ht_opmode &gt;= 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.ht_operation_mode =</div><div class='del'>-			(u16) params-&gt;ht_opmode;</div><div class='add'>+		link-&gt;conf-&gt;ht_operation_mode = (u16)params-&gt;ht_opmode;</div><div class='ctx'> 		changed |= BSS_CHANGED_HT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;p2p_ctwindow &gt;= 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow &amp;=</div><div class='add'>+		link-&gt;conf-&gt;p2p_noa_attr.oppps_ctwindow &amp;=</div><div class='ctx'> 					~IEEE80211_P2P_OPPPS_CTWINDOW_MASK;</div><div class='del'>-		sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow |=</div><div class='add'>+		link-&gt;conf-&gt;p2p_noa_attr.oppps_ctwindow |=</div><div class='ctx'> 			params-&gt;p2p_ctwindow &amp; IEEE80211_P2P_OPPPS_CTWINDOW_MASK;</div><div class='ctx'> 		changed |= BSS_CHANGED_P2P_PS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;p2p_opp_ps &gt; 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow |=</div><div class='add'>+		link-&gt;conf-&gt;p2p_noa_attr.oppps_ctwindow |=</div><div class='ctx'> 					IEEE80211_P2P_OPPPS_ENABLE_BIT;</div><div class='ctx'> 		changed |= BSS_CHANGED_P2P_PS;</div><div class='ctx'> 	} else if (params-&gt;p2p_opp_ps == 0) {</div><div class='del'>-		sdata-&gt;vif.bss_conf.p2p_noa_attr.oppps_ctwindow &amp;=</div><div class='add'>+		link-&gt;conf-&gt;p2p_noa_attr.oppps_ctwindow &amp;=</div><div class='ctx'> 					~IEEE80211_P2P_OPPPS_ENABLE_BIT;</div><div class='ctx'> 		changed |= BSS_CHANGED_P2P_PS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, changed);</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2148,6 +3070,8 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		ieee80211_link_or_deflink(sdata, params-&gt;link_id, true);</div><div class='ctx'> 	struct ieee80211_tx_queue_params p;</div><div class='ctx'> </div><div class='ctx'> 	if (!local-&gt;ops-&gt;conf_tx)</div><div class='hunk'>@@ -2156,6 +3080,9 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,</div><div class='ctx'> 	if (local-&gt;hw.queues &lt; IEEE80211_NUM_ACS)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	if (IS_ERR(link))</div><div class='add'>+		return PTR_ERR(link);</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 	p.aifs = params-&gt;aifs;</div><div class='ctx'> 	p.cw_max = params-&gt;cwmax;</div><div class='hunk'>@@ -2170,15 +3097,16 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_regulatory_limit_wmm_params(sdata, &amp;p, params-&gt;ac);</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;tx_conf[params-&gt;ac] = p;</div><div class='del'>-	if (drv_conf_tx(local, sdata, params-&gt;ac, &amp;p)) {</div><div class='add'>+	link-&gt;tx_conf[params-&gt;ac] = p;</div><div class='add'>+	if (drv_conf_tx(local, link, params-&gt;ac, &amp;p)) {</div><div class='ctx'> 		wiphy_debug(local-&gt;hw.wiphy,</div><div class='ctx'> 			    "failed to set TX queue parameters for AC %d\n",</div><div class='ctx'> 			    params-&gt;ac);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link,</div><div class='add'>+					  BSS_CHANGED_QOS);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2203,6 +3131,9 @@ static int ieee80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 			  struct cfg80211_scan_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	int radio_idx;</div><div class='ctx'> </div><div class='ctx'> 	sdata = IEEE80211_WDEV_TO_SUB_IF(req-&gt;wdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2221,19 +3152,29 @@ static int ieee80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 		 * for now fall through to allow scanning only when</div><div class='ctx'> 		 * beaconing hasn't been configured yet</div><div class='ctx'> 		 */</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the scan has been forced (and the driver supports</div><div class='ctx'> 		 * forcing), don't care about being beaconing already.</div><div class='ctx'> 		 * This will create problems to the attached stations (e.g. all</div><div class='del'>-		 * the  frames sent while scanning on other channel will be</div><div class='add'>+		 * the frames sent while scanning on other channel will be</div><div class='ctx'> 		 * lost)</div><div class='ctx'> 		 */</div><div class='del'>-		if (sdata-&gt;u.ap.beacon &amp;&amp;</div><div class='del'>-		    (!(wiphy-&gt;features &amp; NL80211_FEATURE_AP_SCAN) ||</div><div class='del'>-		     !(req-&gt;flags &amp; NL80211_SCAN_FLAG_AP)))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+		for_each_link_data(sdata, link) {</div><div class='add'>+			/* if the link is not beaconing, ignore it */</div><div class='add'>+			if (!sdata_dereference(link-&gt;u.ap.beacon, sdata))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			chan = link-&gt;conf-&gt;chanreq.oper.chan;</div><div class='add'>+			radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chan);</div><div class='add'>+</div><div class='add'>+			if (ieee80211_is_radio_idx_in_scan_req(wiphy, req,</div><div class='add'>+							       radio_idx) &amp;&amp;</div><div class='add'>+			    (!(wiphy-&gt;features &amp; NL80211_FEATURE_AP_SCAN) ||</div><div class='add'>+			     !(req-&gt;flags &amp; NL80211_SCAN_FLAG_AP)))</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_NAN:</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2327,12 +3268,15 @@ static int ieee80211_set_mcast_rate(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	memcpy(sdata-&gt;vif.bss_conf.mcast_rate, rate,</div><div class='ctx'> 	       sizeof(int) * NUM_NL80211_BANDS);</div><div class='ctx'> </div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_MCAST_RATE);</div><div class='add'>+	if (ieee80211_sdata_running(sdata))</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, &amp;sdata-&gt;deflink,</div><div class='add'>+						  BSS_CHANGED_MCAST_RATE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='add'>+static int ieee80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+				      u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2340,7 +3284,8 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> 	if (changed &amp; WIPHY_PARAM_FRAG_THRESHOLD) {</div><div class='ctx'> 		ieee80211_check_fast_xmit_all(local);</div><div class='ctx'> </div><div class='del'>-		err = drv_set_frag_threshold(local, wiphy-&gt;frag_threshold);</div><div class='add'>+		err = drv_set_frag_threshold(local, radio_idx,</div><div class='add'>+					     wiphy-&gt;frag_threshold);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			ieee80211_check_fast_xmit_all(local);</div><div class='hunk'>@@ -2354,14 +3299,23 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> </div><div class='ctx'> 		coverage_class = changed &amp; WIPHY_PARAM_COVERAGE_CLASS ?</div><div class='ctx'> 					wiphy-&gt;coverage_class : -1;</div><div class='del'>-		err = drv_set_coverage_class(local, coverage_class);</div><div class='add'>+		err = drv_set_coverage_class(local, radio_idx,</div><div class='add'>+					     coverage_class);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; WIPHY_PARAM_RTS_THRESHOLD) {</div><div class='del'>-		err = drv_set_rts_threshold(local, wiphy-&gt;rts_threshold);</div><div class='add'>+		u32 rts_threshold;</div><div class='add'>+</div><div class='add'>+		if ((radio_idx == -1) || (radio_idx &gt;= wiphy-&gt;n_radio))</div><div class='add'>+			rts_threshold = wiphy-&gt;rts_threshold;</div><div class='add'>+		else</div><div class='add'>+			rts_threshold =</div><div class='add'>+				wiphy-&gt;radio_cfg[radio_idx].rts_threshold;</div><div class='add'>+</div><div class='add'>+		err = drv_set_rts_threshold(local, radio_idx, rts_threshold);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -2379,18 +3333,19 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp;</div><div class='ctx'> 	    (WIPHY_PARAM_RETRY_SHORT | WIPHY_PARAM_RETRY_LONG))</div><div class='del'>-		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_RETRY_LIMITS);</div><div class='add'>+		ieee80211_hw_config(local, radio_idx,</div><div class='add'>+				    IEEE80211_CONF_CHANGE_RETRY_LIMITS);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (WIPHY_PARAM_TXQ_LIMIT |</div><div class='ctx'> 		       WIPHY_PARAM_TXQ_MEMORY_LIMIT |</div><div class='ctx'> 		       WIPHY_PARAM_TXQ_QUANTUM))</div><div class='del'>-		ieee80211_txq_set_params(local);</div><div class='add'>+		ieee80211_txq_set_params(local, radio_idx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_tx_power(struct wiphy *wiphy,</div><div class='del'>-				  struct wireless_dev *wdev,</div><div class='add'>+				  struct wireless_dev *wdev, int radio_idx,</div><div class='ctx'> 				  enum nl80211_tx_power_setting type, int mbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='hunk'>@@ -2398,109 +3353,152 @@ static int ieee80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 	enum nl80211_tx_power_setting txp_type = type;</div><div class='ctx'> 	bool update_txp_type = false;</div><div class='ctx'> 	bool has_monitor = false;</div><div class='add'>+	int user_power_level;</div><div class='add'>+	int old_power = local-&gt;user_power_level;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_TX_POWER_AUTOMATIC:</div><div class='add'>+		user_power_level = IEEE80211_UNSET_POWER_LEVEL;</div><div class='add'>+		txp_type = NL80211_TX_POWER_LIMITED;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_TX_POWER_LIMITED:</div><div class='add'>+	case NL80211_TX_POWER_FIXED:</div><div class='add'>+		if (mbm &lt; 0 || (mbm % 100))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		user_power_level = MBM_TO_DBM(mbm);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (wdev) {</div><div class='ctx'> 		sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='ctx'> </div><div class='del'>-		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-			sdata = rtnl_dereference(local-&gt;monitor_sdata);</div><div class='del'>-			if (!sdata)</div><div class='add'>+		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+		    !ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR)) {</div><div class='add'>+			if (!ieee80211_hw_check(&amp;local-&gt;hw, WANT_MONITOR_VIF))</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		switch (type) {</div><div class='del'>-		case NL80211_TX_POWER_AUTOMATIC:</div><div class='del'>-			sdata-&gt;user_power_level = IEEE80211_UNSET_POWER_LEVEL;</div><div class='del'>-			txp_type = NL80211_TX_POWER_LIMITED;</div><div class='del'>-			break;</div><div class='del'>-		case NL80211_TX_POWER_LIMITED:</div><div class='del'>-		case NL80211_TX_POWER_FIXED:</div><div class='del'>-			if (mbm &lt; 0 || (mbm % 100))</div><div class='add'>+			sdata = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+						  local-&gt;monitor_sdata);</div><div class='add'>+			if (!sdata)</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='del'>-			sdata-&gt;user_power_level = MBM_TO_DBM(mbm);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (txp_type != sdata-&gt;vif.bss_conf.txpower_type) {</div><div class='del'>-			update_txp_type = true;</div><div class='del'>-			sdata-&gt;vif.bss_conf.txpower_type = txp_type;</div><div class='del'>-		}</div><div class='add'>+		for (int link_id = 0;</div><div class='add'>+		     link_id &lt; ARRAY_SIZE(sdata-&gt;link);</div><div class='add'>+		     link_id++) {</div><div class='add'>+			struct ieee80211_link_data *link =</div><div class='add'>+				wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='ctx'> </div><div class='del'>-		ieee80211_recalc_txpower(sdata, update_txp_type);</div><div class='add'>+			if (!link)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='add'>+			link-&gt;user_power_level = user_power_level;</div><div class='add'>+</div><div class='add'>+			if (txp_type != link-&gt;conf-&gt;txpower_type) {</div><div class='add'>+				update_txp_type = true;</div><div class='add'>+				link-&gt;conf-&gt;txpower_type = txp_type;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ieee80211_recalc_txpower(link, update_txp_type);</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (type) {</div><div class='del'>-	case NL80211_TX_POWER_AUTOMATIC:</div><div class='del'>-		local-&gt;user_power_level = IEEE80211_UNSET_POWER_LEVEL;</div><div class='del'>-		txp_type = NL80211_TX_POWER_LIMITED;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_TX_POWER_LIMITED:</div><div class='del'>-	case NL80211_TX_POWER_FIXED:</div><div class='del'>-		if (mbm &lt; 0 || (mbm % 100))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		local-&gt;user_power_level = MBM_TO_DBM(mbm);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	local-&gt;user_power_level = user_power_level;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;iflist_mtx);</div><div class='ctx'> 	list_for_each_entry(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+		    !ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR)) {</div><div class='ctx'> 			has_monitor = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		sdata-&gt;user_power_level = local-&gt;user_power_level;</div><div class='del'>-		if (txp_type != sdata-&gt;vif.bss_conf.txpower_type)</div><div class='del'>-			update_txp_type = true;</div><div class='del'>-		sdata-&gt;vif.bss_conf.txpower_type = txp_type;</div><div class='add'>+</div><div class='add'>+		for (int link_id = 0;</div><div class='add'>+		     link_id &lt; ARRAY_SIZE(sdata-&gt;link);</div><div class='add'>+		     link_id++) {</div><div class='add'>+			struct ieee80211_link_data *link =</div><div class='add'>+				wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+			if (!link)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			link-&gt;user_power_level = local-&gt;user_power_level;</div><div class='add'>+			if (txp_type != link-&gt;conf-&gt;txpower_type)</div><div class='add'>+				update_txp_type = true;</div><div class='add'>+			link-&gt;conf-&gt;txpower_type = txp_type;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	list_for_each_entry(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		if (sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+		    !ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR))</div><div class='ctx'> 			continue;</div><div class='del'>-		ieee80211_recalc_txpower(sdata, update_txp_type);</div><div class='add'>+</div><div class='add'>+		for (int link_id = 0;</div><div class='add'>+		     link_id &lt; ARRAY_SIZE(sdata-&gt;link);</div><div class='add'>+		     link_id++) {</div><div class='add'>+			struct ieee80211_link_data *link =</div><div class='add'>+				wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+			if (!link)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ieee80211_recalc_txpower(link, update_txp_type);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;local-&gt;iflist_mtx);</div><div class='ctx'> </div><div class='ctx'> 	if (has_monitor) {</div><div class='del'>-		sdata = rtnl_dereference(local-&gt;monitor_sdata);</div><div class='del'>-		if (sdata) {</div><div class='del'>-			sdata-&gt;user_power_level = local-&gt;user_power_level;</div><div class='add'>+		sdata = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+					  local-&gt;monitor_sdata);</div><div class='add'>+		if (sdata &amp;&amp; ieee80211_hw_check(&amp;local-&gt;hw, WANT_MONITOR_VIF)) {</div><div class='add'>+			sdata-&gt;deflink.user_power_level = local-&gt;user_power_level;</div><div class='ctx'> 			if (txp_type != sdata-&gt;vif.bss_conf.txpower_type)</div><div class='ctx'> 				update_txp_type = true;</div><div class='ctx'> 			sdata-&gt;vif.bss_conf.txpower_type = txp_type;</div><div class='ctx'> </div><div class='del'>-			ieee80211_recalc_txpower(sdata, update_txp_type);</div><div class='add'>+			ieee80211_recalc_txpower(&amp;sdata-&gt;deflink,</div><div class='add'>+						 update_txp_type);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (local-&gt;emulate_chanctx &amp;&amp;</div><div class='add'>+	    (old_power != local-&gt;user_power_level))</div><div class='add'>+		ieee80211_hw_conf_chan(local);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_get_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 				  struct wireless_dev *wdev,</div><div class='add'>+				  int radio_idx,</div><div class='add'>+				  unsigned int link_id,</div><div class='ctx'> 				  int *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+	struct ieee80211_link_data *link_data;</div><div class='ctx'> </div><div class='del'>-	if (local-&gt;ops-&gt;get_txpower)</div><div class='del'>-		return drv_get_txpower(local, sdata, dbm);</div><div class='add'>+	if (local-&gt;ops-&gt;get_txpower &amp;&amp;</div><div class='add'>+	    (sdata-&gt;flags &amp; IEEE80211_SDATA_IN_DRIVER))</div><div class='add'>+		return drv_get_txpower(local, sdata, link_id, dbm);</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx)</div><div class='add'>+	if (local-&gt;emulate_chanctx) {</div><div class='ctx'> 		*dbm = local-&gt;hw.conf.power_level;</div><div class='del'>-	else</div><div class='del'>-		*dbm = sdata-&gt;vif.bss_conf.txpower;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	} else {</div><div class='add'>+		link_data = wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-				  const u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+		if (link_data)</div><div class='add'>+			*dbm = link_data-&gt;conf-&gt;txpower;</div><div class='add'>+		else</div><div class='add'>+			return -ENOLINK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;sdata-&gt;u.wds.remote_addr, addr, ETH_ALEN);</div><div class='add'>+	/* INT_MIN indicates no power level was set yet */</div><div class='add'>+	if (*dbm == INT_MIN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2548,75 +3546,8 @@ static int ieee80211_testmode_dump(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				enum ieee80211_smps_mode smps_mode)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	enum ieee80211_smps_mode old_req;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(sdata-&gt;vif.type != NL80211_IFTYPE_AP))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (sdata-&gt;vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	old_req = sdata-&gt;u.ap.req_smps;</div><div class='del'>-	sdata-&gt;u.ap.req_smps = smps_mode;</div><div class='del'>-</div><div class='del'>-	/* AUTOMATIC doesn't mean much for AP - don't allow it */</div><div class='del'>-	if (old_req == smps_mode ||</div><div class='del'>-	    smps_mode == IEEE80211_SMPS_AUTOMATIC)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ht_dbg(sdata,</div><div class='del'>-	       "SMPS %d requested in AP mode, sending Action frame to %d stations\n",</div><div class='del'>-	       smps_mode, atomic_read(&amp;sdata-&gt;u.ap.num_mcast_sta));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;sta_mtx);</div><div class='del'>-	list_for_each_entry(sta, &amp;sdata-&gt;local-&gt;sta_list, list) {</div><div class='del'>-		/*</div><div class='del'>-		 * Only stations associated to our AP and</div><div class='del'>-		 * associated VLANs</div><div class='del'>-		 */</div><div class='del'>-		if (sta-&gt;sdata-&gt;bss != &amp;sdata-&gt;u.ap)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* This station doesn't support MIMO - skip it */</div><div class='del'>-		if (sta_info_tx_streams(sta) == 1)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Don't wake up a STA just to send the action frame</div><div class='del'>-		 * unless we are getting more restrictive.</div><div class='del'>-		 */</div><div class='del'>-		if (test_sta_flag(sta, WLAN_STA_PS_STA) &amp;&amp;</div><div class='del'>-		    !ieee80211_smps_is_restrictive(sta-&gt;known_smps_mode,</div><div class='del'>-						   smps_mode)) {</div><div class='del'>-			ht_dbg(sdata, "Won't send SMPS to sleeping STA %pM\n",</div><div class='del'>-			       sta-&gt;sta.addr);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the STA is not authorized, wait until it gets</div><div class='del'>-		 * authorized and the action frame will be sent then.</div><div class='del'>-		 */</div><div class='del'>-		if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ht_dbg(sdata, "Sending SMPS to %pM\n", sta-&gt;sta.addr);</div><div class='del'>-		ieee80211_send_smps_action(sdata, smps_mode, sta-&gt;sta.addr,</div><div class='del'>-					   sdata-&gt;vif.bss_conf.bssid);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;sta_mtx);</div><div class='del'>-</div><div class='del'>-	sdata-&gt;smps_mode = smps_mode;</div><div class='del'>-	ieee80211_queue_work(&amp;sdata-&gt;local-&gt;hw, &amp;sdata-&gt;recalc_smps);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				 struct ieee80211_link_data *link,</div><div class='ctx'> 				 enum ieee80211_smps_mode smps_mode)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *ap;</div><div class='hunk'>@@ -2625,13 +3556,22 @@ int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> 	bool tdls_peer_found = false;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sdata-&gt;wdev.mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(sdata-&gt;vif.type != NL80211_IFTYPE_STATION))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	old_req = sdata-&gt;u.mgd.req_smps;</div><div class='del'>-	sdata-&gt;u.mgd.req_smps = smps_mode;</div><div class='add'>+	if (!ieee80211_vif_link_active(&amp;sdata-&gt;vif, link-&gt;link_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	old_req = link-&gt;u.mgd.req_smps;</div><div class='add'>+	link-&gt;u.mgd.req_smps = smps_mode;</div><div class='add'>+</div><div class='add'>+	/* The driver indicated that EML is enabled for the interface, which</div><div class='add'>+	 * implies that SMPS flows towards the AP should be stopped.</div><div class='add'>+	 */</div><div class='add'>+	if (sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_EML_ACTIVE)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (old_req == smps_mode &amp;&amp;</div><div class='ctx'> 	    smps_mode != IEEE80211_SMPS_AUTOMATIC)</div><div class='hunk'>@@ -2643,10 +3583,10 @@ int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	 * the new value until we associate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!sdata-&gt;u.mgd.associated ||</div><div class='del'>-	    sdata-&gt;vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT)</div><div class='add'>+	    link-&gt;conf-&gt;chanreq.oper.width == NL80211_CHAN_WIDTH_20_NOHT)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ap = sdata-&gt;u.mgd.associated-&gt;bssid;</div><div class='add'>+	ap = sdata-&gt;vif.cfg.ap_addr;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(sta, &amp;sdata-&gt;local-&gt;sta_list, list) {</div><div class='hunk'>@@ -2668,11 +3608,13 @@ int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 	/* send SM PS frame to AP */</div><div class='ctx'> 	err = ieee80211_send_smps_action(sdata, smps_mode,</div><div class='del'>-					 ap, ap);</div><div class='add'>+					 ap, ap,</div><div class='add'>+					 ieee80211_vif_is_mld(&amp;sdata-&gt;vif) ?</div><div class='add'>+					 link-&gt;link_id : -1);</div><div class='ctx'> 	if (err)</div><div class='del'>-		sdata-&gt;u.mgd.req_smps = old_req;</div><div class='add'>+		link-&gt;u.mgd.req_smps = old_req;</div><div class='ctx'> 	else if (smps_mode != IEEE80211_SMPS_OFF &amp;&amp; tdls_peer_found)</div><div class='del'>-		ieee80211_teardown_tdls_peers(sdata);</div><div class='add'>+		ieee80211_teardown_tdls_peers(link);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2682,6 +3624,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> 	struct ieee80211_local *local = wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -2697,12 +3640,19 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	local-&gt;dynamic_ps_forced_timeout = timeout;</div><div class='ctx'> </div><div class='ctx'> 	/* no change, but if automatic follow powersave */</div><div class='del'>-	sdata_lock(sdata);</div><div class='del'>-	__ieee80211_request_smps_mgd(sdata, sdata-&gt;u.mgd.req_smps);</div><div class='del'>-	sdata_unlock(sdata);</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE(sdata-&gt;link); link_id++) {</div><div class='add'>+		struct ieee80211_link_data *link;</div><div class='add'>+</div><div class='add'>+		link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+		__ieee80211_request_smps_mgd(sdata, link,</div><div class='add'>+					     link-&gt;u.mgd.req_smps);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_hw_check(&amp;local-&gt;hw, SUPPORTS_DYNAMIC_PS))</div><div class='del'>-		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);</div><div class='add'>+		ieee80211_hw_config(local, -1, IEEE80211_CONF_CHANGE_PS);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_recalc_ps(local);</div><div class='ctx'> 	ieee80211_recalc_ps_vif(sdata);</div><div class='hunk'>@@ -2711,32 +3661,57 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ieee80211_set_cqm_rssi_link(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					struct ieee80211_link_data *link,</div><div class='add'>+					s32 rssi_thold, u32 rssi_hyst,</div><div class='add'>+					s32 rssi_low, s32 rssi_high)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *conf;</div><div class='add'>+</div><div class='add'>+	if (!link || !link-&gt;conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf = link-&gt;conf;</div><div class='add'>+</div><div class='add'>+	if (rssi_thold &amp;&amp; rssi_hyst &amp;&amp;</div><div class='add'>+	    rssi_thold == conf-&gt;cqm_rssi_thold &amp;&amp;</div><div class='add'>+	    rssi_hyst == conf-&gt;cqm_rssi_hyst)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf-&gt;cqm_rssi_thold = rssi_thold;</div><div class='add'>+	conf-&gt;cqm_rssi_hyst = rssi_hyst;</div><div class='add'>+	conf-&gt;cqm_rssi_low = rssi_low;</div><div class='add'>+	conf-&gt;cqm_rssi_high = rssi_high;</div><div class='add'>+	link-&gt;u.mgd.last_cqm_event_signal = 0;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_link_active(&amp;sdata-&gt;vif, link-&gt;link_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;u.mgd.associated &amp;&amp;</div><div class='add'>+	    (sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI))</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, link, BSS_CHANGED_CQM);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,</div><div class='ctx'> 					 struct net_device *dev,</div><div class='ctx'> 					 s32 rssi_thold, u32 rssi_hyst)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> 	struct ieee80211_vif *vif = &amp;sdata-&gt;vif;</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	int link_id;</div><div class='ctx'> </div><div class='del'>-	if (rssi_thold == bss_conf-&gt;cqm_rssi_thold &amp;&amp;</div><div class='del'>-	    rssi_hyst == bss_conf-&gt;cqm_rssi_hyst)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_BEACON_FILTER &amp;&amp;</div><div class='del'>-	    !(sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI))</div><div class='add'>+	if (vif-&gt;driver_flags &amp; IEEE80211_VIF_BEACON_FILTER &amp;&amp;</div><div class='add'>+	    !(vif-&gt;driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	bss_conf-&gt;cqm_rssi_thold = rssi_thold;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_hyst = rssi_hyst;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_low = 0;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_high = 0;</div><div class='del'>-	sdata-&gt;u.mgd.last_cqm_event_signal = 0;</div><div class='add'>+	/* For MLD, handle CQM change on all the active links */</div><div class='add'>+	for (link_id = 0; link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS; link_id++) {</div><div class='add'>+		struct ieee80211_link_data *link =</div><div class='add'>+			sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='ctx'> </div><div class='del'>-	/* tell the driver upon association, unless already associated */</div><div class='del'>-	if (sdata-&gt;u.mgd.associated &amp;&amp;</div><div class='del'>-	    sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI)</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_CQM);</div><div class='add'>+		ieee80211_set_cqm_rssi_link(sdata, link, rssi_thold, rssi_hyst,</div><div class='add'>+					    0, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2747,27 +3722,26 @@ static int ieee80211_set_cqm_rssi_range_config(struct wiphy *wiphy,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> 	struct ieee80211_vif *vif = &amp;sdata-&gt;vif;</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	int link_id;</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_BEACON_FILTER)</div><div class='add'>+	if (vif-&gt;driver_flags &amp; IEEE80211_VIF_BEACON_FILTER)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	bss_conf-&gt;cqm_rssi_low = rssi_low;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_high = rssi_high;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_thold = 0;</div><div class='del'>-	bss_conf-&gt;cqm_rssi_hyst = 0;</div><div class='del'>-	sdata-&gt;u.mgd.last_cqm_event_signal = 0;</div><div class='add'>+	/* For MLD, handle CQM change on all the active links */</div><div class='add'>+	for (link_id = 0; link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS; link_id++) {</div><div class='add'>+		struct ieee80211_link_data *link =</div><div class='add'>+			sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='ctx'> </div><div class='del'>-	/* tell the driver upon association, unless already associated */</div><div class='del'>-	if (sdata-&gt;u.mgd.associated &amp;&amp;</div><div class='del'>-	    sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI)</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_CQM);</div><div class='add'>+		ieee80211_set_cqm_rssi_link(sdata, link, 0, 0,</div><div class='add'>+					    rssi_low, rssi_high);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *dev,</div><div class='add'>+				      unsigned int link_id,</div><div class='ctx'> 				      const u8 *addr,</div><div class='ctx'> 				      const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -2784,10 +3758,12 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 	 * to send something, and if we're an AP we have to be able to do</div><div class='ctx'> 	 * so at a basic rate so that all clients can receive it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (rcu_access_pointer(sdata-&gt;vif.chanctx_conf) &amp;&amp;</div><div class='del'>-	    sdata-&gt;vif.bss_conf.chandef.chan) {</div><div class='add'>+	if (rcu_access_pointer(sdata-&gt;vif.bss_conf.chanctx_conf) &amp;&amp;</div><div class='add'>+	    sdata-&gt;vif.bss_conf.chanreq.oper.chan) {</div><div class='ctx'> 		u32 basic_rates = sdata-&gt;vif.bss_conf.basic_rates;</div><div class='del'>-		enum nl80211_band band = sdata-&gt;vif.bss_conf.chandef.chan-&gt;band;</div><div class='add'>+		enum nl80211_band band;</div><div class='add'>+</div><div class='add'>+		band = sdata-&gt;vif.bss_conf.chanreq.oper.chan-&gt;band;</div><div class='ctx'> </div><div class='ctx'> 		if (!(mask-&gt;control[band].legacy &amp; basic_rates))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -2816,14 +3792,14 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; IEEE80211_HT_MCS_MASK_LEN; j++) {</div><div class='del'>-			if (~sdata-&gt;rc_rateidx_mcs_mask[i][j]) {</div><div class='add'>+			if (sdata-&gt;rc_rateidx_mcs_mask[i][j] != 0xff) {</div><div class='ctx'> 				sdata-&gt;rc_has_mcs_mask[i] = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; NL80211_VHT_NSS_MAX; j++) {</div><div class='del'>-			if (~sdata-&gt;rc_rateidx_vht_mcs_mask[i][j]) {</div><div class='add'>+			if (sdata-&gt;rc_rateidx_vht_mcs_mask[i][j] != 0xffff) {</div><div class='ctx'> 				sdata-&gt;rc_has_vht_mcs_mask[i] = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2833,37 +3809,100 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ieee80211_is_scan_ongoing(struct wiphy *wiphy,</div><div class='add'>+				      struct ieee80211_local *local,</div><div class='add'>+				      struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_scan_request *scan_req;</div><div class='add'>+	int chan_radio_idx, req_radio_idx;</div><div class='add'>+	struct ieee80211_roc_work *roc;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;local-&gt;roc_list) &amp;&amp; !local-&gt;scanning)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	req_radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chandef-&gt;chan);</div><div class='add'>+</div><div class='add'>+	if (local-&gt;scanning) {</div><div class='add'>+		scan_req = wiphy_dereference(wiphy, local-&gt;scan_req);</div><div class='add'>+		/*</div><div class='add'>+		 * Scan is going on but info is not there. Should not happen</div><div class='add'>+		 * but if it does, let's not take risk and assume we can't use</div><div class='add'>+		 * the hw hence return true</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON_ONCE(!scan_req))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		return ieee80211_is_radio_idx_in_scan_req(wiphy, scan_req,</div><div class='add'>+							  req_radio_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(roc, &amp;local-&gt;roc_list, list) {</div><div class='add'>+		chan_radio_idx = cfg80211_get_radio_idx_by_chan(wiphy,</div><div class='add'>+								roc-&gt;chan);</div><div class='add'>+		if (chan_radio_idx == req_radio_idx)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ieee80211_start_radar_detection(struct wiphy *wiphy,</div><div class='ctx'> 					   struct net_device *dev,</div><div class='ctx'> 					   struct cfg80211_chan_def *chandef,</div><div class='del'>-					   u32 cac_time_ms)</div><div class='add'>+					   u32 cac_time_ms, int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = *chandef };</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_link_data *link_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	if (!list_empty(&amp;local-&gt;roc_list) || local-&gt;scanning) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_scan_ongoing(wiphy, local, chandef))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	link_data = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+	if (!link_data)</div><div class='add'>+		return -ENOLINK;</div><div class='ctx'> </div><div class='ctx'> 	/* whatever, but channel contexts should not complain about that one */</div><div class='del'>-	sdata-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='del'>-	sdata-&gt;needed_rx_chains = local-&gt;rx_chains;</div><div class='add'>+	link_data-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='add'>+	link_data-&gt;needed_rx_chains = local-&gt;rx_chains;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_vif_use_channel(sdata, chandef,</div><div class='del'>-					IEEE80211_CHANCTX_SHARED);</div><div class='add'>+	err = ieee80211_link_use_channel(link_data, &amp;chanreq,</div><div class='add'>+					 IEEE80211_CHANCTX_SHARED);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(&amp;sdata-&gt;local-&gt;hw,</div><div class='del'>-				     &amp;sdata-&gt;dfs_cac_timer_work,</div><div class='del'>-				     msecs_to_jiffies(cac_time_ms));</div><div class='add'>+	wiphy_delayed_work_queue(wiphy, &amp;link_data-&gt;dfs_cac_timer_work,</div><div class='add'>+				 msecs_to_jiffies(cac_time_ms));</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee80211_end_cac(struct wiphy *wiphy,</div><div class='add'>+			      struct net_device *dev, unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_link_data *link_data;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sdata, &amp;local-&gt;interfaces, list) {</div><div class='add'>+		link_data = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+		if (!link_data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wiphy_delayed_work_cancel(wiphy,</div><div class='add'>+					  &amp;link_data-&gt;dfs_cac_timer_work);</div><div class='add'>+</div><div class='add'>+		if (sdata-&gt;wdev.links[link_id].cac_started) {</div><div class='add'>+			ieee80211_link_release_channel(link_data);</div><div class='add'>+			sdata-&gt;wdev.links[link_id].cac_started = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cfg80211_beacon_data *</div><div class='hunk'>@@ -2875,12 +3914,40 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon)</div><div class='ctx'> </div><div class='ctx'> 	len = beacon-&gt;head_len + beacon-&gt;tail_len + beacon-&gt;beacon_ies_len +</div><div class='ctx'> 	      beacon-&gt;proberesp_ies_len + beacon-&gt;assocresp_ies_len +</div><div class='del'>-	      beacon-&gt;probe_resp_len;</div><div class='add'>+	      beacon-&gt;probe_resp_len + beacon-&gt;lci_len + beacon-&gt;civicloc_len;</div><div class='add'>+</div><div class='add'>+	if (beacon-&gt;mbssid_ies)</div><div class='add'>+		len += ieee80211_get_mbssid_beacon_len(beacon-&gt;mbssid_ies,</div><div class='add'>+						       beacon-&gt;rnr_ies,</div><div class='add'>+						       beacon-&gt;mbssid_ies-&gt;cnt);</div><div class='ctx'> </div><div class='ctx'> 	new_beacon = kzalloc(sizeof(*new_beacon) + len, GFP_KERNEL);</div><div class='ctx'> 	if (!new_beacon)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (beacon-&gt;mbssid_ies &amp;&amp; beacon-&gt;mbssid_ies-&gt;cnt) {</div><div class='add'>+		new_beacon-&gt;mbssid_ies =</div><div class='add'>+			kzalloc(struct_size(new_beacon-&gt;mbssid_ies,</div><div class='add'>+					    elem, beacon-&gt;mbssid_ies-&gt;cnt),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+		if (!new_beacon-&gt;mbssid_ies) {</div><div class='add'>+			kfree(new_beacon);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (beacon-&gt;rnr_ies &amp;&amp; beacon-&gt;rnr_ies-&gt;cnt) {</div><div class='add'>+			new_beacon-&gt;rnr_ies =</div><div class='add'>+				kzalloc(struct_size(new_beacon-&gt;rnr_ies,</div><div class='add'>+						    elem, beacon-&gt;rnr_ies-&gt;cnt),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+			if (!new_beacon-&gt;rnr_ies) {</div><div class='add'>+				kfree(new_beacon-&gt;mbssid_ies);</div><div class='add'>+				kfree(new_beacon);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pos = (u8 *)(new_beacon + 1);</div><div class='ctx'> 	if (beacon-&gt;head_len) {</div><div class='ctx'> 		new_beacon-&gt;head_len = beacon-&gt;head_len;</div><div class='hunk'>@@ -2918,47 +3985,116 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon)</div><div class='ctx'> 		memcpy(pos, beacon-&gt;probe_resp, beacon-&gt;probe_resp_len);</div><div class='ctx'> 		pos += beacon-&gt;probe_resp_len;</div><div class='ctx'> 	}</div><div class='add'>+	if (beacon-&gt;mbssid_ies &amp;&amp; beacon-&gt;mbssid_ies-&gt;cnt) {</div><div class='add'>+		pos += ieee80211_copy_mbssid_beacon(pos,</div><div class='add'>+						    new_beacon-&gt;mbssid_ies,</div><div class='add'>+						    beacon-&gt;mbssid_ies);</div><div class='add'>+		if (beacon-&gt;rnr_ies &amp;&amp; beacon-&gt;rnr_ies-&gt;cnt)</div><div class='add'>+			pos += ieee80211_copy_rnr_beacon(pos,</div><div class='add'>+							 new_beacon-&gt;rnr_ies,</div><div class='add'>+							 beacon-&gt;rnr_ies);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* might copy -1, meaning no changes requested */</div><div class='add'>+	new_beacon-&gt;ftm_responder = beacon-&gt;ftm_responder;</div><div class='add'>+	if (beacon-&gt;lci) {</div><div class='add'>+		new_beacon-&gt;lci_len = beacon-&gt;lci_len;</div><div class='add'>+		new_beacon-&gt;lci = pos;</div><div class='add'>+		memcpy(pos, beacon-&gt;lci, beacon-&gt;lci_len);</div><div class='add'>+		pos += beacon-&gt;lci_len;</div><div class='add'>+	}</div><div class='add'>+	if (beacon-&gt;civicloc) {</div><div class='add'>+		new_beacon-&gt;civicloc_len = beacon-&gt;civicloc_len;</div><div class='add'>+		new_beacon-&gt;civicloc = pos;</div><div class='add'>+		memcpy(pos, beacon-&gt;civicloc, beacon-&gt;civicloc_len);</div><div class='add'>+		pos += beacon-&gt;civicloc_len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return new_beacon;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_csa_finish(struct ieee80211_vif *vif)</div><div class='add'>+void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_bss_conf *tx_bss_conf;</div><div class='add'>+	struct ieee80211_link_data *link_data;</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_work(&amp;sdata-&gt;local-&gt;hw,</div><div class='del'>-			     &amp;sdata-&gt;csa_finalize_work);</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link_data = rcu_dereference(sdata-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON(!link_data)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_bss_conf = rcu_dereference(link_data-&gt;conf-&gt;tx_bss_conf);</div><div class='add'>+	if (tx_bss_conf == link_data-&gt;conf) {</div><div class='add'>+		/* Trigger ieee80211_csa_finish() on the non-transmitting</div><div class='add'>+		 * interfaces when channel switch is received on</div><div class='add'>+		 * transmitting interface</div><div class='add'>+		 */</div><div class='add'>+		struct ieee80211_link_data *iter;</div><div class='add'>+</div><div class='add'>+		for_each_sdata_link_rcu(local, iter) {</div><div class='add'>+			if (iter-&gt;sdata == sdata ||</div><div class='add'>+			    rcu_access_pointer(iter-&gt;conf-&gt;tx_bss_conf) != tx_bss_conf)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			wiphy_work_queue(iter-&gt;sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					 &amp;iter-&gt;csa.finalize_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;link_data-&gt;csa.finalize_work);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ieee80211_csa_finish);</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_after_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-					  u32 *changed)</div><div class='add'>+void ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='add'>+	struct ieee80211_if_managed *ifmgd = &amp;sdata-&gt;u.mgd;</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+</div><div class='add'>+	sdata_info(sdata, "channel switch failed, disconnecting\n");</div><div class='add'>+	wiphy_work_queue(local-&gt;hw.wiphy, &amp;ifmgd-&gt;csa_connection_drop_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ieee80211_channel_switch_disconnect);</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_after_csa_beacon(struct ieee80211_link_data *link_data,</div><div class='add'>+					  u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link_data-&gt;sdata;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (sdata-&gt;vif.type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		err = ieee80211_assign_beacon(sdata, sdata-&gt;u.ap.next_beacon,</div><div class='del'>-					      NULL);</div><div class='del'>-		kfree(sdata-&gt;u.ap.next_beacon);</div><div class='del'>-		sdata-&gt;u.ap.next_beacon = NULL;</div><div class='add'>+		if (!link_data-&gt;u.ap.next_beacon)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = ieee80211_assign_beacon(sdata, link_data,</div><div class='add'>+					      link_data-&gt;u.ap.next_beacon,</div><div class='add'>+					      NULL, NULL, changed);</div><div class='add'>+		ieee80211_free_next_beacon(link_data);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		*changed |= err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		err = ieee80211_ibss_finish_csa(sdata);</div><div class='add'>+		err = ieee80211_ibss_finish_csa(sdata, changed);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		*changed |= err;</div><div class='ctx'> 		break;</div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-		err = ieee80211_mesh_finish_csa(sdata);</div><div class='add'>+		err = ieee80211_mesh_finish_csa(sdata, changed);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		*changed |= err;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2969,15 +4105,15 @@ static int ieee80211_set_after_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link_data-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link_data-&gt;conf;</div><div class='add'>+	u64 changed = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	sdata_assert_lock(sdata);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * using reservation isn't immediate as it may be deferred until later</div><div class='hunk'>@@ -2986,92 +4122,86 @@ static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	 * completed successfully</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;reserved_chanctx) {</div><div class='add'>+	if (link_data-&gt;reserved_chanctx) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * with multi-vif csa driver may call ieee80211_csa_finish()</div><div class='ctx'> 		 * many times while waiting for other interfaces to use their</div><div class='ctx'> 		 * reservations</div><div class='ctx'> 		 */</div><div class='del'>-		if (sdata-&gt;reserved_ready)</div><div class='add'>+		if (link_data-&gt;reserved_ready)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		return ieee80211_vif_use_reserved_context(sdata);</div><div class='add'>+		return ieee80211_link_use_reserved_context(link_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cfg80211_chandef_identical(&amp;sdata-&gt;vif.bss_conf.chandef,</div><div class='del'>-					&amp;sdata-&gt;csa_chandef))</div><div class='add'>+	if (!cfg80211_chandef_identical(&amp;link_conf-&gt;chanreq.oper,</div><div class='add'>+					&amp;link_data-&gt;csa.chanreq.oper))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.csa_active = false;</div><div class='add'>+	link_conf-&gt;csa_active = false;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_set_after_csa_beacon(sdata, &amp;changed);</div><div class='add'>+	err = ieee80211_set_after_csa_beacon(link_data, &amp;changed);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ieee80211_bss_info_change_notify(sdata, changed);</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link_data, changed);</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;csa_block_tx) {</div><div class='del'>-		ieee80211_wake_vif_queues(local, sdata,</div><div class='del'>-					  IEEE80211_QUEUE_STOP_REASON_CSA);</div><div class='del'>-		sdata-&gt;csa_block_tx = false;</div><div class='del'>-	}</div><div class='add'>+	ieee80211_vif_unblock_queues_csa(sdata);</div><div class='ctx'> </div><div class='del'>-	err = drv_post_channel_switch(sdata);</div><div class='add'>+	err = drv_post_channel_switch(link_data);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	cfg80211_ch_switch_notify(sdata-&gt;dev, &amp;sdata-&gt;csa_chandef);</div><div class='add'>+	cfg80211_ch_switch_notify(sdata-&gt;dev, &amp;link_data-&gt;csa.chanreq.oper,</div><div class='add'>+				  link_data-&gt;link_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+static void ieee80211_csa_finalize(struct ieee80211_link_data *link_data)</div><div class='ctx'> {</div><div class='del'>-	if (__ieee80211_csa_finalize(sdata)) {</div><div class='del'>-		sdata_info(sdata, "failed to finalize CSA, disconnecting\n");</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link_data-&gt;sdata;</div><div class='add'>+</div><div class='add'>+	if (__ieee80211_csa_finalize(link_data)) {</div><div class='add'>+		sdata_info(sdata, "failed to finalize CSA on link %d, disconnecting\n",</div><div class='add'>+			   link_data-&gt;link_id);</div><div class='ctx'> 		cfg80211_stop_iface(sdata-&gt;local-&gt;hw.wiphy, &amp;sdata-&gt;wdev,</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_csa_finalize_work(struct work_struct *work)</div><div class='add'>+void ieee80211_csa_finalize_work(struct wiphy *wiphy, struct wiphy_work *work)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata =</div><div class='del'>-		container_of(work, struct ieee80211_sub_if_data,</div><div class='del'>-			     csa_finalize_work);</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		container_of(work, struct ieee80211_link_data, csa.finalize_work);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> </div><div class='del'>-	sdata_lock(sdata);</div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	/* AP might have been stopped while waiting for the lock. */</div><div class='del'>-	if (!sdata-&gt;vif.csa_active)</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (!link-&gt;conf-&gt;csa_active)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!ieee80211_sdata_running(sdata))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	ieee80211_csa_finalize(sdata);</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='del'>-	sdata_unlock(sdata);</div><div class='add'>+	ieee80211_csa_finalize(link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+static int ieee80211_set_csa_beacon(struct ieee80211_link_data *link_data,</div><div class='ctx'> 				    struct cfg80211_csa_settings *params,</div><div class='del'>-				    u32 *changed)</div><div class='add'>+				    u64 *changed)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link_data-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_csa_settings csa = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (sdata-&gt;vif.type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		sdata-&gt;u.ap.next_beacon =</div><div class='add'>+		link_data-&gt;u.ap.next_beacon =</div><div class='ctx'> 			cfg80211_beacon_dup(&amp;params-&gt;beacon_after);</div><div class='del'>-		if (!sdata-&gt;u.ap.next_beacon)</div><div class='add'>+		if (!link_data-&gt;u.ap.next_beacon)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3094,10 +4224,12 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if ((params-&gt;n_counter_offsets_beacon &gt;</div><div class='del'>-		     IEEE80211_MAX_CSA_COUNTERS_NUM) ||</div><div class='add'>+		     IEEE80211_MAX_CNTDWN_COUNTERS_NUM) ||</div><div class='ctx'> 		    (params-&gt;n_counter_offsets_presp &gt;</div><div class='del'>-		     IEEE80211_MAX_CSA_COUNTERS_NUM))</div><div class='add'>+		     IEEE80211_MAX_CNTDWN_COUNTERS_NUM)) {</div><div class='add'>+			ieee80211_free_next_beacon(link_data);</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		csa.counter_offsets_beacon = params-&gt;counter_offsets_beacon;</div><div class='ctx'> 		csa.counter_offsets_presp = params-&gt;counter_offsets_presp;</div><div class='hunk'>@@ -3105,16 +4237,17 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 		csa.n_counter_offsets_presp = params-&gt;n_counter_offsets_presp;</div><div class='ctx'> 		csa.count = params-&gt;count;</div><div class='ctx'> </div><div class='del'>-		err = ieee80211_assign_beacon(sdata, &amp;params-&gt;beacon_csa, &amp;csa);</div><div class='add'>+		err = ieee80211_assign_beacon(sdata, link_data,</div><div class='add'>+					      &amp;params-&gt;beacon_csa, &amp;csa,</div><div class='add'>+					      NULL, changed);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			kfree(sdata-&gt;u.ap.next_beacon);</div><div class='add'>+			ieee80211_free_next_beacon(link_data);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		*changed |= err;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		if (!sdata-&gt;vif.bss_conf.ibss_joined)</div><div class='add'>+		if (!sdata-&gt;vif.cfg.ibss_joined)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (params-&gt;chandef.width != sdata-&gt;u.ibss.chandef.width)</div><div class='hunk'>@@ -3125,6 +4258,7 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 			if (cfg80211_get_chandef_type(&amp;params-&gt;chandef) !=</div><div class='ctx'> 			    cfg80211_get_chandef_type(&amp;sdata-&gt;u.ibss.chandef))</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+			break;</div><div class='ctx'> 		case NL80211_CHAN_WIDTH_5:</div><div class='ctx'> 		case NL80211_CHAN_WIDTH_10:</div><div class='ctx'> 		case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='hunk'>@@ -3141,10 +4275,9 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 		/* see comments in the NL80211_IFTYPE_AP block */</div><div class='ctx'> 		if (params-&gt;count &gt; 1) {</div><div class='del'>-			err = ieee80211_ibss_csa_beacon(sdata, params);</div><div class='add'>+			err = ieee80211_ibss_csa_beacon(sdata, params, changed);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-			*changed |= err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_send_action_csa(sdata, params);</div><div class='hunk'>@@ -3154,11 +4287,8 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT: {</div><div class='ctx'> 		struct ieee80211_if_mesh *ifmsh = &amp;sdata-&gt;u.mesh;</div><div class='ctx'> </div><div class='del'>-		if (params-&gt;chandef.width != sdata-&gt;vif.bss_conf.chandef.width)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		/* changes into another band are not supported */</div><div class='del'>-		if (sdata-&gt;vif.bss_conf.chandef.chan-&gt;band !=</div><div class='add'>+		if (sdata-&gt;vif.bss_conf.chanreq.oper.chan-&gt;band !=</div><div class='ctx'> 		    params-&gt;chandef.chan-&gt;band)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -3172,12 +4302,11 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 		/* see comments in the NL80211_IFTYPE_AP block */</div><div class='ctx'> 		if (params-&gt;count &gt; 1) {</div><div class='del'>-			err = ieee80211_mesh_csa_beacon(sdata, params);</div><div class='add'>+			err = ieee80211_mesh_csa_beacon(sdata, params, changed);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				ifmsh-&gt;csa_role = IEEE80211_MESH_CSA_ROLE_NONE;</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='del'>-			*changed |= err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ifmsh-&gt;csa_role == IEEE80211_MESH_CSA_ROLE_INIT)</div><div class='hunk'>@@ -3193,95 +4322,129 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ieee80211_color_change_abort(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	link-&gt;conf-&gt;color_change_active = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_free_next_beacon(link);</div><div class='add'>+</div><div class='add'>+	cfg80211_color_change_aborted_notify(link-&gt;sdata-&gt;dev, link-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			   struct cfg80211_csa_settings *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = params-&gt;chandef };</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	struct ieee80211_channel_switch ch_switch;</div><div class='add'>+	struct ieee80211_channel_switch ch_switch = {</div><div class='add'>+		.link_id = params-&gt;link_id,</div><div class='add'>+	};</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> 	struct ieee80211_chanctx *chanctx;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_link_data *link_data;</div><div class='add'>+	u64 changed = 0;</div><div class='add'>+	u8 link_id = params-&gt;link_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	sdata_assert_lock(sdata);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;local-&gt;roc_list) || local-&gt;scanning)</div><div class='add'>+	if (ieee80211_is_scan_ongoing(wiphy, local, &amp;params-&gt;chandef))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;wdev.cac_started)</div><div class='add'>+	if (sdata-&gt;wdev.links[link_id].cac_started)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (cfg80211_chandef_identical(&amp;params-&gt;chandef,</div><div class='del'>-				       &amp;sdata-&gt;vif.bss_conf.chandef))</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link_data = wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='add'>+	if (!link_data)</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	link_conf = link_data-&gt;conf;</div><div class='add'>+</div><div class='add'>+	if (chanreq.oper.punctured &amp;&amp; !link_conf-&gt;eht_support)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* don't allow another channel switch if one is already active. */</div><div class='del'>-	if (sdata-&gt;vif.csa_active)</div><div class='add'>+	if (link_conf-&gt;csa_active)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='add'>+	conf = wiphy_dereference(wiphy, link_conf-&gt;chanctx_conf);</div><div class='ctx'> 	if (!conf) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;chandef.chan-&gt;freq_offset) {</div><div class='add'>+		/* this may work, but is untested */</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_unsol_bcast_probe_resp(sdata,</div><div class='add'>+						   &amp;params-&gt;unsol_bcast_probe_resp,</div><div class='add'>+						   link_data, link_conf, &amp;changed);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	chanctx = container_of(conf, struct ieee80211_chanctx, conf);</div><div class='ctx'> </div><div class='ctx'> 	ch_switch.timestamp = 0;</div><div class='ctx'> 	ch_switch.device_timestamp = 0;</div><div class='ctx'> 	ch_switch.block_tx = params-&gt;block_tx;</div><div class='del'>-	ch_switch.chandef = params-&gt;chandef;</div><div class='add'>+	ch_switch.chandef = chanreq.oper;</div><div class='ctx'> 	ch_switch.count = params-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 	err = drv_pre_channel_switch(sdata, &amp;ch_switch);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_vif_reserve_chanctx(sdata, &amp;params-&gt;chandef,</div><div class='del'>-					    chanctx-&gt;mode,</div><div class='del'>-					    params-&gt;radar_required);</div><div class='add'>+	err = ieee80211_link_reserve_chanctx(link_data, &amp;chanreq,</div><div class='add'>+					     chanctx-&gt;mode,</div><div class='add'>+					     params-&gt;radar_required);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* if reservation is invalid then this will fail */</div><div class='del'>-	err = ieee80211_check_combinations(sdata, NULL, chanctx-&gt;mode, 0);</div><div class='add'>+	err = ieee80211_check_combinations(sdata, NULL, chanctx-&gt;mode, 0, -1);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ieee80211_vif_unreserve_chanctx(sdata);</div><div class='add'>+		ieee80211_link_unreserve_chanctx(link_data);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_set_csa_beacon(sdata, params, &amp;changed);</div><div class='add'>+	/* if there is a color change in progress, abort it */</div><div class='add'>+	if (link_conf-&gt;color_change_active)</div><div class='add'>+		ieee80211_color_change_abort(link_data);</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_csa_beacon(link_data, params, &amp;changed);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ieee80211_vif_unreserve_chanctx(sdata);</div><div class='add'>+		ieee80211_link_unreserve_chanctx(link_data);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;csa_chandef = params-&gt;chandef;</div><div class='del'>-	sdata-&gt;csa_block_tx = params-&gt;block_tx;</div><div class='del'>-	sdata-&gt;vif.csa_active = true;</div><div class='add'>+	link_data-&gt;csa.chanreq = chanreq;</div><div class='add'>+	link_conf-&gt;csa_active = true;</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;csa_block_tx)</div><div class='del'>-		ieee80211_stop_vif_queues(local, sdata,</div><div class='del'>-					  IEEE80211_QUEUE_STOP_REASON_CSA);</div><div class='add'>+	if (params-&gt;block_tx)</div><div class='add'>+		ieee80211_vif_block_queues_csa(sdata);</div><div class='ctx'> </div><div class='del'>-	cfg80211_ch_switch_started_notify(sdata-&gt;dev, &amp;sdata-&gt;csa_chandef,</div><div class='del'>-					  params-&gt;count);</div><div class='add'>+	cfg80211_ch_switch_started_notify(sdata-&gt;dev,</div><div class='add'>+					  &amp;link_data-&gt;csa.chanreq.oper, link_id,</div><div class='add'>+					  params-&gt;count, params-&gt;block_tx);</div><div class='ctx'> </div><div class='ctx'> 	if (changed) {</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, changed);</div><div class='del'>-		drv_channel_switch_beacon(sdata, &amp;params-&gt;chandef);</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, link_data, changed);</div><div class='add'>+		drv_channel_switch_beacon(sdata, &amp;link_data-&gt;csa.chanreq.oper);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* if the beacon didn't change, we can finalize immediately */</div><div class='del'>-		ieee80211_csa_finalize(sdata);</div><div class='add'>+		ieee80211_csa_finalize(link_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3290,18 +4453,15 @@ int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='del'>-	err = __ieee80211_channel_switch(wiphy, dev, params);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return __ieee80211_channel_switch(wiphy, dev, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u64 ieee80211_mgmt_tx_cookie(struct ieee80211_local *local)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	local-&gt;roc_cookie_counter++;</div><div class='ctx'> </div><div class='hunk'>@@ -3325,7 +4485,7 @@ int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;local-&gt;ack_status_lock, spin_flags);</div><div class='ctx'> 	id = idr_alloc(&amp;local-&gt;ack_status_frames, ack_skb,</div><div class='del'>-		       1, 0x10000, GFP_ATOMIC);</div><div class='add'>+		       1, 0x2000, GFP_ATOMIC);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;local-&gt;ack_status_lock, spin_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (id &lt; 0) {</div><div class='hunk'>@@ -3333,7 +4493,8 @@ int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IEEE80211_SKB_CB(skb)-&gt;ack_frame_id = id;</div><div class='add'>+	IEEE80211_SKB_CB(skb)-&gt;status_data_idr = 1;</div><div class='add'>+	IEEE80211_SKB_CB(skb)-&gt;status_data = id;</div><div class='ctx'> </div><div class='ctx'> 	*cookie = ieee80211_mgmt_tx_cookie(local);</div><div class='ctx'> 	IEEE80211_SKB_CB(ack_skb)-&gt;ack.cookie = *cookie;</div><div class='hunk'>@@ -3341,58 +4502,68 @@ int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,</div><div class='add'>+static void</div><div class='add'>+ieee80211_update_mgmt_frame_registrations(struct wiphy *wiphy,</div><div class='ctx'> 					  struct wireless_dev *wdev,</div><div class='del'>-					  u16 frame_type, bool reg)</div><div class='add'>+					  struct mgmt_frame_regs *upd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+	u32 preq_mask = BIT(IEEE80211_STYPE_PROBE_REQ &gt;&gt; 4);</div><div class='add'>+	u32 action_mask = BIT(IEEE80211_STYPE_ACTION &gt;&gt; 4);</div><div class='add'>+	bool global_change, intf_change;</div><div class='add'>+</div><div class='add'>+	global_change =</div><div class='add'>+		(local-&gt;probe_req_reg != !!(upd-&gt;global_stypes &amp; preq_mask)) ||</div><div class='add'>+		(local-&gt;rx_mcast_action_reg !=</div><div class='add'>+		 !!(upd-&gt;global_mcast_stypes &amp; action_mask));</div><div class='add'>+	local-&gt;probe_req_reg = upd-&gt;global_stypes &amp; preq_mask;</div><div class='add'>+	local-&gt;rx_mcast_action_reg = upd-&gt;global_mcast_stypes &amp; action_mask;</div><div class='add'>+</div><div class='add'>+	intf_change = (sdata-&gt;vif.probe_req_reg !=</div><div class='add'>+		       !!(upd-&gt;interface_stypes &amp; preq_mask)) ||</div><div class='add'>+		(sdata-&gt;vif.rx_mcast_action_reg !=</div><div class='add'>+		 !!(upd-&gt;interface_mcast_stypes &amp; action_mask));</div><div class='add'>+	sdata-&gt;vif.probe_req_reg = upd-&gt;interface_stypes &amp; preq_mask;</div><div class='add'>+	sdata-&gt;vif.rx_mcast_action_reg =</div><div class='add'>+		upd-&gt;interface_mcast_stypes &amp; action_mask;</div><div class='add'>+</div><div class='add'>+	if (!local-&gt;open_count)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	switch (frame_type) {</div><div class='del'>-	case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ:</div><div class='del'>-		if (reg) {</div><div class='del'>-			local-&gt;probe_req_reg++;</div><div class='del'>-			sdata-&gt;vif.probe_req_reg++;</div><div class='del'>-		} else {</div><div class='del'>-			if (local-&gt;probe_req_reg)</div><div class='del'>-				local-&gt;probe_req_reg--;</div><div class='del'>-</div><div class='del'>-			if (sdata-&gt;vif.probe_req_reg)</div><div class='del'>-				sdata-&gt;vif.probe_req_reg--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!local-&gt;open_count)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (sdata-&gt;vif.probe_req_reg == 1)</div><div class='del'>-			drv_config_iface_filter(local, sdata, FIF_PROBE_REQ,</div><div class='del'>-						FIF_PROBE_REQ);</div><div class='del'>-		else if (sdata-&gt;vif.probe_req_reg == 0)</div><div class='del'>-			drv_config_iface_filter(local, sdata, 0,</div><div class='del'>-						FIF_PROBE_REQ);</div><div class='add'>+	if (intf_change &amp;&amp; ieee80211_sdata_running(sdata))</div><div class='add'>+		drv_config_iface_filter(local, sdata,</div><div class='add'>+					sdata-&gt;vif.probe_req_reg ?</div><div class='add'>+						FIF_PROBE_REQ : 0,</div><div class='add'>+					FIF_PROBE_REQ);</div><div class='ctx'> </div><div class='add'>+	if (global_change)</div><div class='ctx'> 		ieee80211_configure_filter(local);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)</div><div class='add'>+static int ieee80211_set_antenna(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+				 u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (local-&gt;started)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return drv_set_antenna(local, tx_ant, rx_ant);</div><div class='add'>+	ret = drv_set_antenna(local, tx_ant, rx_ant);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	local-&gt;rx_chains = hweight8(rx_ant);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+static int ieee80211_get_antenna(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+				 u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> </div><div class='del'>-	return drv_get_antenna(local, tx_ant, rx_ant);</div><div class='add'>+	return drv_get_antenna(local, radio_idx, tx_ant, rx_ant);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_rekey_data(struct wiphy *wiphy,</div><div class='hunk'>@@ -3427,22 +4598,23 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* the lock is needed to assign the cookie later */</div><div class='del'>-	mutex_lock(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	chanctx_conf = rcu_dereference(sdata-&gt;vif.chanctx_conf);</div><div class='add'>+	sta = sta_info_get_bss(sdata, peer);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		ret = -ENOLINK;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qos = sta-&gt;sta.wme;</div><div class='add'>+</div><div class='add'>+	chanctx_conf = rcu_dereference(sdata-&gt;vif.bss_conf.chanctx_conf);</div><div class='ctx'> 	if (WARN_ON(!chanctx_conf)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	band = chanctx_conf-&gt;def.chan-&gt;band;</div><div class='del'>-	sta = sta_info_get_bss(sdata, peer);</div><div class='del'>-	if (sta) {</div><div class='del'>-		qos = sta-&gt;sta.wme;</div><div class='del'>-	} else {</div><div class='del'>-		ret = -ENOLINK;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (qos) {</div><div class='ctx'> 		fc = cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='hunk'>@@ -3491,40 +4663,45 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	ieee80211_xmit(sdata, sta, skb, 0);</div><div class='add'>+	ieee80211_xmit(sdata, sta, skb);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	mutex_unlock(&amp;local-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_cfg_get_channel(struct wiphy *wiphy,</div><div class='ctx'> 				     struct wireless_dev *wdev,</div><div class='add'>+				     unsigned int link_id,</div><div class='ctx'> 				     struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='ctx'> 	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='ctx'> 	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='ctx'> 	int ret = -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	chanctx_conf = rcu_dereference(sdata-&gt;vif.chanctx_conf);</div><div class='add'>+	link = rcu_dereference(sdata-&gt;link[link_id]);</div><div class='add'>+	if (!link) {</div><div class='add'>+		ret = -ENOLINK;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chanctx_conf = rcu_dereference(link-&gt;conf-&gt;chanctx_conf);</div><div class='ctx'> 	if (chanctx_conf) {</div><div class='del'>-		*chandef = sdata-&gt;vif.bss_conf.chandef;</div><div class='add'>+		*chandef = link-&gt;conf-&gt;chanreq.oper;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else if (local-&gt;open_count &gt; 0 &amp;&amp;</div><div class='del'>-		   local-&gt;open_count == local-&gt;monitors &amp;&amp;</div><div class='add'>+		   local-&gt;open_count == local-&gt;virt_monitors &amp;&amp;</div><div class='ctx'> 		   sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		if (local-&gt;use_chanctx)</div><div class='del'>-			*chandef = local-&gt;monitor_chandef;</div><div class='del'>-		else</div><div class='del'>-			*chandef = local-&gt;_oper_chandef;</div><div class='add'>+		*chandef = local-&gt;monitor_chanreq.oper;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3564,15 +4741,20 @@ static int ieee80211_set_qos_map(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_set_ap_chanwidth(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *dev,</div><div class='add'>+				      unsigned int link_id,</div><div class='ctx'> 				      struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	struct ieee80211_chan_req chanreq = { .oper = *chandef };</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	u64 changed = 0;</div><div class='ctx'> </div><div class='del'>-	ret = ieee80211_vif_change_bandwidth(sdata, chandef, &amp;changed);</div><div class='add'>+	link = sdata_dereference(sdata-&gt;link[link_id], sdata);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_link_change_chanreq(link, &amp;chanreq, &amp;changed);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, changed);</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3772,11 +4954,7 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy,</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;ops-&gt;wake_tx_queue)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_bh(&amp;local-&gt;fq.lock);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	if (wdev) {</div><div class='ctx'> 		sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='hunk'>@@ -3802,12 +4980,559 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock_bh(&amp;local-&gt;fq.lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ieee80211_get_ftm_responder_stats(struct wiphy *wiphy,</div><div class='add'>+				  struct net_device *dev,</div><div class='add'>+				  struct cfg80211_ftm_responder_stats *ftm_stats)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	return drv_get_ftm_responder_stats(local, sdata, ftm_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_start_pmsr(struct wiphy *wiphy, struct wireless_dev *dev,</div><div class='add'>+		     struct cfg80211_pmsr_request *request)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	return drv_start_pmsr(local, sdata, request);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ieee80211_abort_pmsr(struct wiphy *wiphy, struct wireless_dev *dev,</div><div class='add'>+		     struct cfg80211_pmsr_request *request)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	return drv_abort_pmsr(local, sdata, request);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_tid_config(struct wiphy *wiphy,</div><div class='add'>+				    struct net_device *dev,</div><div class='add'>+				    struct cfg80211_tid_config *tid_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sdata-&gt;local-&gt;ops-&gt;set_tid_config)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!tid_conf-&gt;peer)</div><div class='add'>+		return drv_set_tid_config(sdata-&gt;local, sdata, NULL, tid_conf);</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, tid_conf-&gt;peer);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return drv_set_tid_config(sdata-&gt;local, sdata, &amp;sta-&gt;sta, tid_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_reset_tid_config(struct wiphy *wiphy,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      const u8 *peer, u8 tids)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sdata-&gt;local-&gt;ops-&gt;reset_tid_config)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!peer)</div><div class='add'>+		return drv_reset_tid_config(sdata-&gt;local, sdata, NULL, tids);</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, peer);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return drv_reset_tid_config(sdata-&gt;local, sdata, &amp;sta-&gt;sta, tids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_sar_specs(struct wiphy *wiphy,</div><div class='add'>+				   struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+</div><div class='add'>+	if (!local-&gt;ops-&gt;set_sar_specs)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return local-&gt;ops-&gt;set_sar_specs(&amp;local-&gt;hw, sar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_after_color_change_beacon(struct ieee80211_link_data *link,</div><div class='add'>+					u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+</div><div class='add'>+	switch (sdata-&gt;vif.type) {</div><div class='add'>+	case NL80211_IFTYPE_AP: {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (!link-&gt;u.ap.next_beacon)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = ieee80211_assign_beacon(sdata, link,</div><div class='add'>+					      link-&gt;u.ap.next_beacon,</div><div class='add'>+					      NULL, NULL, changed);</div><div class='add'>+		ieee80211_free_next_beacon(link);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_color_change_beacon(struct ieee80211_link_data *link,</div><div class='add'>+				  struct cfg80211_color_change_settings *params,</div><div class='add'>+				  u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_color_change_settings color_change = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (sdata-&gt;vif.type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		link-&gt;u.ap.next_beacon =</div><div class='add'>+			cfg80211_beacon_dup(&amp;params-&gt;beacon_next);</div><div class='add'>+		if (!link-&gt;u.ap.next_beacon)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (params-&gt;count &lt;= 1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		color_change.counter_offset_beacon =</div><div class='add'>+			params-&gt;counter_offset_beacon;</div><div class='add'>+		color_change.counter_offset_presp =</div><div class='add'>+			params-&gt;counter_offset_presp;</div><div class='add'>+		color_change.count = params-&gt;count;</div><div class='add'>+</div><div class='add'>+		err = ieee80211_assign_beacon(sdata, link,</div><div class='add'>+					      &amp;params-&gt;beacon_color_change,</div><div class='add'>+					      NULL, &amp;color_change, changed);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			ieee80211_free_next_beacon(link);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ieee80211_color_change_bss_config_notify(struct ieee80211_link_data *link,</div><div class='add'>+					 u8 color, int enable, u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	link-&gt;conf-&gt;he_bss_color.color = color;</div><div class='add'>+	link-&gt;conf-&gt;he_bss_color.enabled = enable;</div><div class='add'>+	changed |= BSS_CHANGED_HE_BSS_COLOR;</div><div class='add'>+</div><div class='add'>+	ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='add'>+</div><div class='add'>+	if (!link-&gt;conf-&gt;nontransmitted &amp;&amp;</div><div class='add'>+	    rcu_access_pointer(link-&gt;conf-&gt;tx_bss_conf)) {</div><div class='add'>+		struct ieee80211_link_data *tmp;</div><div class='add'>+</div><div class='add'>+		for_each_sdata_link(sdata-&gt;local, tmp) {</div><div class='add'>+			if (tmp-&gt;sdata == sdata ||</div><div class='add'>+			    rcu_access_pointer(tmp-&gt;conf-&gt;tx_bss_conf) != link-&gt;conf)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			tmp-&gt;conf-&gt;he_bss_color.color = color;</div><div class='add'>+			tmp-&gt;conf-&gt;he_bss_color.enabled = enable;</div><div class='add'>+			ieee80211_link_info_change_notify(tmp-&gt;sdata, tmp,</div><div class='add'>+							  BSS_CHANGED_HE_BSS_COLOR);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_color_change_finalize(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	u64 changed = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	link-&gt;conf-&gt;color_change_active = false;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_after_color_change_beacon(link, &amp;changed);</div><div class='add'>+	if (err) {</div><div class='add'>+		cfg80211_color_change_aborted_notify(sdata-&gt;dev, link-&gt;link_id);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_color_change_bss_config_notify(link,</div><div class='add'>+						 link-&gt;conf-&gt;color_change_color,</div><div class='add'>+						 1, changed);</div><div class='add'>+	cfg80211_color_change_notify(sdata-&gt;dev, link-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_color_change_finalize_work(struct wiphy *wiphy,</div><div class='add'>+					  struct wiphy_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		container_of(work, struct ieee80211_link_data,</div><div class='add'>+			     color_change_finalize_work);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	/* AP might have been stopped while waiting for the lock. */</div><div class='add'>+	if (!link_conf-&gt;color_change_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_sdata_running(sdata))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_color_change_finalize(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_color_collision_detection_work(struct wiphy *wiphy,</div><div class='add'>+					      struct wiphy_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link =</div><div class='add'>+		container_of(work, struct ieee80211_link_data,</div><div class='add'>+			     color_collision_detect_work.work);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+</div><div class='add'>+	cfg80211_obss_color_collision_notify(sdata-&gt;dev, link-&gt;color_bitmap,</div><div class='add'>+					     link-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_color_change_finish(struct ieee80211_vif *vif, u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link = rcu_dereference(sdata-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON(!link)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy_work_queue(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+			 &amp;link-&gt;color_change_finalize_work);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee80211_color_change_finish);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,</div><div class='add'>+				      u64 color_bitmap, u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link = rcu_dereference(sdata-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON(!link)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link-&gt;conf-&gt;color_change_active || link-&gt;conf-&gt;csa_active) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wiphy_delayed_work_pending(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+				       &amp;link-&gt;color_collision_detect_work)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link-&gt;color_bitmap = color_bitmap;</div><div class='add'>+	/* queue the color collision detection event every 500 ms in order to</div><div class='add'>+	 * avoid sending too much netlink messages to userspace.</div><div class='add'>+	 */</div><div class='add'>+	wiphy_delayed_work_queue(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+				 &amp;link-&gt;color_collision_detect_work,</div><div class='add'>+				 msecs_to_jiffies(500));</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee80211_obss_color_collision_notify);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_color_change(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+		       struct cfg80211_color_change_settings *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	u8 link_id = params-&gt;link_id;</div><div class='add'>+	u64 changed = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link = wiphy_dereference(wiphy, sdata-&gt;link[link_id]);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	link_conf = link-&gt;conf;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;nontransmitted)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* don't allow another color change if one is already active or if csa</div><div class='add'>+	 * is active</div><div class='add'>+	 */</div><div class='add'>+	if (link_conf-&gt;color_change_active || link_conf-&gt;csa_active) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_unsol_bcast_probe_resp(sdata,</div><div class='add'>+						   &amp;params-&gt;unsol_bcast_probe_resp,</div><div class='add'>+						   link, link_conf, &amp;changed);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = ieee80211_set_color_change_beacon(link, params, &amp;changed);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	link_conf-&gt;color_change_active = true;</div><div class='add'>+	link_conf-&gt;color_change_color = params-&gt;color;</div><div class='add'>+</div><div class='add'>+	cfg80211_color_change_started_notify(sdata-&gt;dev, params-&gt;count, link_id);</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		ieee80211_color_change_bss_config_notify(link, 0, 0, changed);</div><div class='add'>+	else</div><div class='add'>+		/* if the beacon didn't change, we can finalize immediately */</div><div class='add'>+		ieee80211_color_change_finalize(link);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_radar_background(struct wiphy *wiphy,</div><div class='add'>+			       struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+</div><div class='add'>+	if (!local-&gt;ops-&gt;set_radar_background)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return local-&gt;ops-&gt;set_radar_background(&amp;local-&gt;hw, chandef);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_add_intf_link(struct wiphy *wiphy,</div><div class='add'>+				   struct wireless_dev *wdev,</div><div class='add'>+				   unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (wdev-&gt;use_4addr)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ieee80211_vif_set_links(sdata, wdev-&gt;valid_links, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee80211_del_intf_link(struct wiphy *wiphy,</div><div class='add'>+				    struct wireless_dev *wdev,</div><div class='add'>+				    unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);</div><div class='add'>+	u16 new_links = wdev-&gt;valid_links &amp; ~BIT(link_id);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	/* During the link teardown process, certain functions require the</div><div class='add'>+	 * link_id to remain in the valid_links bitmap. Therefore, instead</div><div class='add'>+	 * of removing the link_id from the bitmap, pass a masked value to</div><div class='add'>+	 * simulate as if link_id does not exist anymore.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_vif_set_links(sdata, new_links, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_add_link_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			   struct link_station_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, params-&gt;mld_mac);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;sta.valid_links)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;sta.valid_links &amp; BIT(params-&gt;link_id))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_sta_allocate_link(sta, params-&gt;link_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sta_link_apply_parameters(local, sta, STA_LINK_MODE_NEW, params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ieee80211_sta_free_link(sta, params-&gt;link_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_sta_flag(sta, WLAN_STA_ASSOC)) {</div><div class='add'>+		struct link_sta_info *link_sta;</div><div class='add'>+</div><div class='add'>+		link_sta = sdata_dereference(sta-&gt;link[params-&gt;link_id], sdata);</div><div class='add'>+		rate_control_rate_init(link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ieee80211_sta_activate_link frees the link upon failure */</div><div class='add'>+	return ieee80211_sta_activate_link(sta, params-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_mod_link_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			   struct link_station_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = wiphy_priv(wiphy);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, params-&gt;mld_mac);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!(sta-&gt;sta.valid_links &amp; BIT(params-&gt;link_id)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sta_link_apply_parameters(local, sta, STA_LINK_MODE_LINK_MODIFY,</div><div class='add'>+					 params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_del_link_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			   struct link_station_del_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	sta = sta_info_get_bss(sdata, params-&gt;mld_mac);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!(sta-&gt;sta.valid_links &amp; BIT(params-&gt;link_id)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* must not create a STA without links */</div><div class='add'>+	if (sta-&gt;sta.valid_links == BIT(params-&gt;link_id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ieee80211_sta_remove_link(sta, params-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ieee80211_set_hw_timestamp(struct wiphy *wiphy,</div><div class='add'>+				      struct net_device *dev,</div><div class='add'>+				      struct cfg80211_set_hw_timestamp *hwts)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+</div><div class='add'>+	if (!local-&gt;ops-&gt;set_hw_timestamp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!check_sdata_in_driver(sdata))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return local-&gt;ops-&gt;set_hw_timestamp(&amp;local-&gt;hw, &amp;sdata-&gt;vif, hwts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_ttlm(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+		   struct cfg80211_ttlm_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	return ieee80211_req_neg_ttlm(sdata, params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_assoc_ml_reconf(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			  struct cfg80211_ml_reconf_req *req)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	return ieee80211_mgd_assoc_ml_reconf(sdata, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ieee80211_set_epcs(struct wiphy *wiphy, struct net_device *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);</div><div class='add'>+</div><div class='add'>+	return ieee80211_mgd_set_epcs(sdata, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.add_virtual_intf = ieee80211_add_iface,</div><div class='ctx'> 	.del_virtual_intf = ieee80211_del_iface,</div><div class='hunk'>@@ -3819,6 +5544,7 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.get_key = ieee80211_get_key,</div><div class='ctx'> 	.set_default_key = ieee80211_config_default_key,</div><div class='ctx'> 	.set_default_mgmt_key = ieee80211_config_default_mgmt_key,</div><div class='add'>+	.set_default_beacon_key = ieee80211_config_default_beacon_key,</div><div class='ctx'> 	.start_ap = ieee80211_start_ap,</div><div class='ctx'> 	.change_beacon = ieee80211_change_beacon,</div><div class='ctx'> 	.stop_ap = ieee80211_stop_ap,</div><div class='hunk'>@@ -3844,6 +5570,7 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.join_ocb = ieee80211_join_ocb,</div><div class='ctx'> 	.leave_ocb = ieee80211_leave_ocb,</div><div class='ctx'> 	.change_bss = ieee80211_change_bss,</div><div class='add'>+	.inform_bss = ieee80211_inform_bss,</div><div class='ctx'> 	.set_txq_params = ieee80211_set_txq_params,</div><div class='ctx'> 	.set_monitor_channel = ieee80211_set_monitor_channel,</div><div class='ctx'> 	.suspend = ieee80211_suspend,</div><div class='hunk'>@@ -3862,7 +5589,6 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.set_wiphy_params = ieee80211_set_wiphy_params,</div><div class='ctx'> 	.set_tx_power = ieee80211_set_tx_power,</div><div class='ctx'> 	.get_tx_power = ieee80211_get_tx_power,</div><div class='del'>-	.set_wds_peer = ieee80211_set_wds_peer,</div><div class='ctx'> 	.rfkill_poll = ieee80211_rfkill_poll,</div><div class='ctx'> 	CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)</div><div class='ctx'> 	CFG80211_TESTMODE_DUMP(ieee80211_testmode_dump)</div><div class='hunk'>@@ -3874,7 +5600,8 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.mgmt_tx_cancel_wait = ieee80211_mgmt_tx_cancel_wait,</div><div class='ctx'> 	.set_cqm_rssi_config = ieee80211_set_cqm_rssi_config,</div><div class='ctx'> 	.set_cqm_rssi_range_config = ieee80211_set_cqm_rssi_range_config,</div><div class='del'>-	.mgmt_frame_register = ieee80211_mgmt_frame_register,</div><div class='add'>+	.update_mgmt_frame_registrations =</div><div class='add'>+		ieee80211_update_mgmt_frame_registrations,</div><div class='ctx'> 	.set_antenna = ieee80211_set_antenna,</div><div class='ctx'> 	.get_antenna = ieee80211_get_antenna,</div><div class='ctx'> 	.set_rekey_data = ieee80211_set_rekey_data,</div><div class='hunk'>@@ -3889,6 +5616,7 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> 	.get_channel = ieee80211_cfg_get_channel,</div><div class='ctx'> 	.start_radar_detection = ieee80211_start_radar_detection,</div><div class='add'>+	.end_cac = ieee80211_end_cac,</div><div class='ctx'> 	.channel_switch = ieee80211_channel_switch,</div><div class='ctx'> 	.set_qos_map = ieee80211_set_qos_map,</div><div class='ctx'> 	.set_ap_chanwidth = ieee80211_set_ap_chanwidth,</div><div class='hunk'>@@ -3902,4 +5630,23 @@ const struct cfg80211_ops mac80211_config_ops = {</div><div class='ctx'> 	.set_multicast_to_unicast = ieee80211_set_multicast_to_unicast,</div><div class='ctx'> 	.tx_control_port = ieee80211_tx_control_port,</div><div class='ctx'> 	.get_txq_stats = ieee80211_get_txq_stats,</div><div class='add'>+	.get_ftm_responder_stats = ieee80211_get_ftm_responder_stats,</div><div class='add'>+	.start_pmsr = ieee80211_start_pmsr,</div><div class='add'>+	.abort_pmsr = ieee80211_abort_pmsr,</div><div class='add'>+	.probe_mesh_link = ieee80211_probe_mesh_link,</div><div class='add'>+	.set_tid_config = ieee80211_set_tid_config,</div><div class='add'>+	.reset_tid_config = ieee80211_reset_tid_config,</div><div class='add'>+	.set_sar_specs = ieee80211_set_sar_specs,</div><div class='add'>+	.color_change = ieee80211_color_change,</div><div class='add'>+	.set_radar_background = ieee80211_set_radar_background,</div><div class='add'>+	.add_intf_link = ieee80211_add_intf_link,</div><div class='add'>+	.del_intf_link = ieee80211_del_intf_link,</div><div class='add'>+	.add_link_station = ieee80211_add_link_station,</div><div class='add'>+	.mod_link_station = ieee80211_mod_link_station,</div><div class='add'>+	.del_link_station = ieee80211_del_link_station,</div><div class='add'>+	.set_hw_timestamp = ieee80211_set_hw_timestamp,</div><div class='add'>+	.set_ttlm = ieee80211_set_ttlm,</div><div class='add'>+	.get_radio_mask = ieee80211_get_radio_mask,</div><div class='add'>+	.assoc_ml_reconf = ieee80211_assoc_ml_reconf,</div><div class='add'>+	.set_epcs = ieee80211_set_epcs,</div><div class='ctx'> };</div><div class='head'>diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c<br/>index d9558ffb8acf..d0bfb1216401 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/chan.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/chan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/chan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/chan.c</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * mac80211 - channel management</div><div class='add'>+ * Copyright 2020 - 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/nl80211.h&gt;</div><div class='hunk'>@@ -8,16 +10,133 @@</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include "ieee80211_i.h"</div><div class='ctx'> #include "driver-ops.h"</div><div class='add'>+#include "rate.h"</div><div class='add'>+</div><div class='add'>+struct ieee80211_chanctx_user_iter {</div><div class='add'>+	struct ieee80211_chan_req *chanreq;</div><div class='add'>+	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	enum nl80211_iftype iftype;</div><div class='add'>+	bool reserved, radar_required, done;</div><div class='add'>+	enum {</div><div class='add'>+		CHANCTX_ITER_POS_ASSIGNED,</div><div class='add'>+		CHANCTX_ITER_POS_RESERVED,</div><div class='add'>+		CHANCTX_ITER_POS_DONE,</div><div class='add'>+	} per_link;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ieee80211_chanctx_iter_type {</div><div class='add'>+	CHANCTX_ITER_ALL,</div><div class='add'>+	CHANCTX_ITER_RESERVED,</div><div class='add'>+	CHANCTX_ITER_ASSIGNED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ieee80211_chanctx_user_iter_next(struct ieee80211_local *local,</div><div class='add'>+					     struct ieee80211_chanctx *ctx,</div><div class='add'>+					     struct ieee80211_chanctx_user_iter *iter,</div><div class='add'>+					     enum ieee80211_chanctx_iter_type type,</div><div class='add'>+					     bool start)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (start) {</div><div class='add'>+		memset(iter, 0, sizeof(*iter));</div><div class='add'>+		goto next_interface;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+next_link:</div><div class='add'>+	for (int link_id = iter-&gt;link ? iter-&gt;link-&gt;link_id : 0;</div><div class='add'>+	     link_id &lt; ARRAY_SIZE(iter-&gt;sdata-&gt;link);</div><div class='add'>+	     link_id++) {</div><div class='add'>+		struct ieee80211_link_data *link;</div><div class='add'>+</div><div class='add'>+		link = sdata_dereference(iter-&gt;sdata-&gt;link[link_id],</div><div class='add'>+					 iter-&gt;sdata);</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (iter-&gt;per_link) {</div><div class='add'>+		case CHANCTX_ITER_POS_ASSIGNED:</div><div class='add'>+			iter-&gt;per_link = CHANCTX_ITER_POS_RESERVED;</div><div class='add'>+			if (type != CHANCTX_ITER_RESERVED &amp;&amp;</div><div class='add'>+			    rcu_access_pointer(link-&gt;conf-&gt;chanctx_conf) == &amp;ctx-&gt;conf) {</div><div class='add'>+				iter-&gt;link = link;</div><div class='add'>+				iter-&gt;reserved = false;</div><div class='add'>+				iter-&gt;radar_required = link-&gt;radar_required;</div><div class='add'>+				iter-&gt;chanreq = &amp;link-&gt;conf-&gt;chanreq;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			fallthrough;</div><div class='add'>+		case CHANCTX_ITER_POS_RESERVED:</div><div class='add'>+			iter-&gt;per_link = CHANCTX_ITER_POS_DONE;</div><div class='add'>+			if (type != CHANCTX_ITER_ASSIGNED &amp;&amp;</div><div class='add'>+			    link-&gt;reserved_chanctx == ctx) {</div><div class='add'>+				iter-&gt;link = link;</div><div class='add'>+				iter-&gt;reserved = true;</div><div class='add'>+				iter-&gt;radar_required =</div><div class='add'>+					link-&gt;reserved_radar_required;</div><div class='add'>+</div><div class='add'>+				iter-&gt;chanreq = &amp;link-&gt;reserved;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			fallthrough;</div><div class='add'>+		case CHANCTX_ITER_POS_DONE:</div><div class='add'>+			iter-&gt;per_link = CHANCTX_ITER_POS_ASSIGNED;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+next_interface:</div><div class='add'>+	/* next (or first) interface */</div><div class='add'>+	iter-&gt;sdata = list_prepare_entry(iter-&gt;sdata, &amp;local-&gt;interfaces, list);</div><div class='add'>+	list_for_each_entry_continue(iter-&gt;sdata, &amp;local-&gt;interfaces, list) {</div><div class='add'>+		/* AP_VLAN has a chanctx pointer but follows AP */</div><div class='add'>+		if (iter-&gt;sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iter-&gt;link = NULL;</div><div class='add'>+		iter-&gt;per_link = CHANCTX_ITER_POS_ASSIGNED;</div><div class='add'>+		iter-&gt;iftype = iter-&gt;sdata-&gt;vif.type;</div><div class='add'>+		goto next_link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iter-&gt;done = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_chanctx_user_assigned(local, ctx, iter)		\</div><div class='add'>+	for (ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_ASSIGNED,	\</div><div class='add'>+					      true);			\</div><div class='add'>+	     !((iter)-&gt;done);						\</div><div class='add'>+	     ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_ASSIGNED,	\</div><div class='add'>+					      false))</div><div class='add'>+</div><div class='add'>+#define for_each_chanctx_user_reserved(local, ctx, iter)		\</div><div class='add'>+	for (ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_RESERVED,	\</div><div class='add'>+					      true);			\</div><div class='add'>+	     !((iter)-&gt;done);						\</div><div class='add'>+	     ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_RESERVED,	\</div><div class='add'>+					      false))</div><div class='add'>+</div><div class='add'>+#define for_each_chanctx_user_all(local, ctx, iter)			\</div><div class='add'>+	for (ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_ALL,		\</div><div class='add'>+					      true);			\</div><div class='add'>+	     !((iter)-&gt;done);						\</div><div class='add'>+	     ieee80211_chanctx_user_iter_next(local, ctx, iter,		\</div><div class='add'>+					      CHANCTX_ITER_ALL,		\</div><div class='add'>+					      false))</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_chanctx_num_assigned(struct ieee80211_local *local,</div><div class='ctx'> 					  struct ieee80211_chanctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> 	int num = 0;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(sdata, &amp;ctx-&gt;assigned_vifs, assigned_chanctx_list)</div><div class='add'>+	for_each_chanctx_user_assigned(local, ctx, &amp;iter)</div><div class='ctx'> 		num++;</div><div class='ctx'> </div><div class='ctx'> 	return num;</div><div class='hunk'>@@ -26,12 +145,10 @@ static int ieee80211_chanctx_num_assigned(struct ieee80211_local *local,</div><div class='ctx'> static int ieee80211_chanctx_num_reserved(struct ieee80211_local *local,</div><div class='ctx'> 					  struct ieee80211_chanctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> 	int num = 0;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(sdata, &amp;ctx-&gt;reserved_vifs, reserved_chanctx_list)</div><div class='add'>+	for_each_chanctx_user_reserved(local, ctx, &amp;iter)</div><div class='ctx'> 		num++;</div><div class='ctx'> </div><div class='ctx'> 	return num;</div><div class='hunk'>@@ -40,122 +157,168 @@ static int ieee80211_chanctx_num_reserved(struct ieee80211_local *local,</div><div class='ctx'> int ieee80211_chanctx_refcount(struct ieee80211_local *local,</div><div class='ctx'> 			       struct ieee80211_chanctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	return ieee80211_chanctx_num_assigned(local, ctx) +</div><div class='del'>-	       ieee80211_chanctx_num_reserved(local, ctx);</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+	int num = 0;</div><div class='add'>+</div><div class='add'>+	for_each_chanctx_user_all(local, ctx, &amp;iter)</div><div class='add'>+		num++;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_num_chanctx(struct ieee80211_local *local)</div><div class='add'>+static int ieee80211_num_chanctx(struct ieee80211_local *local, int radio_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> 	int num = 0;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list)</div><div class='add'>+	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		if (radio_idx &gt;= 0 &amp;&amp; ctx-&gt;conf.radio_idx != radio_idx)</div><div class='add'>+			continue;</div><div class='ctx'> 		num++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local)</div><div class='add'>+static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local,</div><div class='add'>+					     int radio_idx)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	return ieee80211_num_chanctx(local) &lt; ieee80211_max_num_channels(local);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	return ieee80211_num_chanctx(local, radio_idx) &lt;</div><div class='add'>+	       ieee80211_max_num_channels(local, radio_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_chanctx *</div><div class='del'>-ieee80211_vif_get_chanctx(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_link_get_chanctx(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_local *local __maybe_unused = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_local *local __maybe_unused = link-&gt;sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> </div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='add'>+	conf = rcu_dereference_protected(link-&gt;conf-&gt;chanctx_conf,</div><div class='add'>+					 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='ctx'> 	if (!conf)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return container_of(conf, struct ieee80211_chanctx, conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct cfg80211_chan_def *</div><div class='del'>-ieee80211_chanctx_reserved_chandef(struct ieee80211_local *local,</div><div class='del'>-				   struct ieee80211_chanctx *ctx,</div><div class='del'>-				   const struct cfg80211_chan_def *compat)</div><div class='add'>+bool ieee80211_chanreq_identical(const struct ieee80211_chan_req *a,</div><div class='add'>+				 const struct ieee80211_chan_req *b)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	if (!cfg80211_chandef_identical(&amp;a-&gt;oper, &amp;b-&gt;oper))</div><div class='add'>+		return false;</div><div class='add'>+	if (!a-&gt;ap.chan &amp;&amp; !b-&gt;ap.chan)</div><div class='add'>+		return true;</div><div class='add'>+	return cfg80211_chandef_identical(&amp;a-&gt;ap, &amp;b-&gt;ap);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+static const struct ieee80211_chan_req *</div><div class='add'>+ieee80211_chanreq_compatible(const struct ieee80211_chan_req *a,</div><div class='add'>+			     const struct ieee80211_chan_req *b,</div><div class='add'>+			     struct ieee80211_chan_req *tmp)</div><div class='add'>+{</div><div class='add'>+	const struct cfg80211_chan_def *compat;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(sdata, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-			    reserved_chanctx_list) {</div><div class='del'>-		if (!compat)</div><div class='del'>-			compat = &amp;sdata-&gt;reserved_chandef;</div><div class='add'>+	if (a-&gt;ap.chan &amp;&amp; b-&gt;ap.chan &amp;&amp;</div><div class='add'>+	    !cfg80211_chandef_identical(&amp;a-&gt;ap, &amp;b-&gt;ap))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		compat = cfg80211_chandef_compatible(&amp;sdata-&gt;reserved_chandef,</div><div class='del'>-						     compat);</div><div class='del'>-		if (!compat)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	compat = cfg80211_chandef_compatible(&amp;a-&gt;oper, &amp;b-&gt;oper);</div><div class='add'>+	if (!compat)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return compat;</div><div class='add'>+	/* Note: later code assumes this always fills &amp; returns tmp if compat */</div><div class='add'>+	tmp-&gt;oper = *compat;</div><div class='add'>+	tmp-&gt;ap = a-&gt;ap.chan ? a-&gt;ap : b-&gt;ap;</div><div class='add'>+	return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct cfg80211_chan_def *</div><div class='del'>-ieee80211_chanctx_non_reserved_chandef(struct ieee80211_local *local,</div><div class='del'>-				       struct ieee80211_chanctx *ctx,</div><div class='del'>-				       const struct cfg80211_chan_def *compat)</div><div class='add'>+static const struct ieee80211_chan_req *</div><div class='add'>+ieee80211_chanctx_compatible(struct ieee80211_chanctx *ctx,</div><div class='add'>+			     const struct ieee80211_chan_req *req,</div><div class='add'>+			     struct ieee80211_chan_req *tmp)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	const struct ieee80211_chan_req *ret;</div><div class='add'>+	struct ieee80211_chan_req tmp2;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	*tmp = (struct ieee80211_chan_req){</div><div class='add'>+		.oper = ctx-&gt;conf.def,</div><div class='add'>+		.ap = ctx-&gt;conf.ap,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(sdata, &amp;ctx-&gt;assigned_vifs,</div><div class='del'>-			    assigned_chanctx_list) {</div><div class='del'>-		if (sdata-&gt;reserved_chanctx != NULL)</div><div class='del'>-			continue;</div><div class='add'>+	ret = ieee80211_chanreq_compatible(tmp, req, &amp;tmp2);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+	*tmp = *ret;</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (!compat)</div><div class='del'>-			compat = &amp;sdata-&gt;vif.bss_conf.chandef;</div><div class='add'>+static const struct ieee80211_chan_req *</div><div class='add'>+ieee80211_chanctx_reserved_chanreq(struct ieee80211_local *local,</div><div class='add'>+				   struct ieee80211_chanctx *ctx,</div><div class='add'>+				   const struct ieee80211_chan_req *req,</div><div class='add'>+				   struct ieee80211_chan_req *tmp)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> </div><div class='del'>-		compat = cfg80211_chandef_compatible(</div><div class='del'>-				&amp;sdata-&gt;vif.bss_conf.chandef, compat);</div><div class='del'>-		if (!compat)</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!req))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+		req = ieee80211_chanreq_compatible(iter.chanreq, req, tmp);</div><div class='add'>+		if (!req)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return compat;</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct cfg80211_chan_def *</div><div class='del'>-ieee80211_chanctx_combined_chandef(struct ieee80211_local *local,</div><div class='del'>-				   struct ieee80211_chanctx *ctx,</div><div class='del'>-				   const struct cfg80211_chan_def *compat)</div><div class='add'>+static const struct ieee80211_chan_req *</div><div class='add'>+ieee80211_chanctx_non_reserved_chandef(struct ieee80211_local *local,</div><div class='add'>+				       struct ieee80211_chanctx *ctx,</div><div class='add'>+				       const struct ieee80211_chan_req *compat,</div><div class='add'>+				       struct ieee80211_chan_req *tmp)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	const struct ieee80211_chan_req *comp_def = compat;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> </div><div class='del'>-	compat = ieee80211_chanctx_reserved_chandef(local, ctx, compat);</div><div class='del'>-	if (!compat)</div><div class='del'>-		return NULL;</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	compat = ieee80211_chanctx_non_reserved_chandef(local, ctx, compat);</div><div class='del'>-	if (!compat)</div><div class='del'>-		return NULL;</div><div class='add'>+	for_each_chanctx_user_assigned(local, ctx, &amp;iter) {</div><div class='add'>+		if (iter.link-&gt;reserved_chanctx)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	return compat;</div><div class='add'>+		comp_def = ieee80211_chanreq_compatible(iter.chanreq,</div><div class='add'>+							comp_def, tmp);</div><div class='add'>+		if (!comp_def)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return comp_def;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-ieee80211_chanctx_can_reserve_chandef(struct ieee80211_local *local,</div><div class='del'>-				      struct ieee80211_chanctx *ctx,</div><div class='del'>-				      const struct cfg80211_chan_def *def)</div><div class='add'>+ieee80211_chanctx_can_reserve(struct ieee80211_local *local,</div><div class='add'>+			      struct ieee80211_chanctx *ctx,</div><div class='add'>+			      const struct ieee80211_chan_req *req)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_chanctx_combined_chandef(local, ctx, def))</div><div class='del'>-		return true;</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_chanctx_reserved_chanreq(local, ctx, req, &amp;tmp))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_chanctx_non_reserved_chandef(local, ctx, req, &amp;tmp))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;ctx-&gt;reserved_vifs) &amp;&amp;</div><div class='del'>-	    ieee80211_chanctx_reserved_chandef(local, ctx, def))</div><div class='add'>+	if (ieee80211_chanctx_num_reserved(local, ctx) != 0 &amp;&amp;</div><div class='add'>+	    ieee80211_chanctx_reserved_chanreq(local, ctx, req, &amp;tmp))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -163,12 +326,12 @@ ieee80211_chanctx_can_reserve_chandef(struct ieee80211_local *local,</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_chanctx *</div><div class='ctx'> ieee80211_find_reservation_chanctx(struct ieee80211_local *local,</div><div class='del'>-				   const struct cfg80211_chan_def *chandef,</div><div class='add'>+				   const struct ieee80211_chan_req *chanreq,</div><div class='ctx'> 				   enum ieee80211_chanctx_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == IEEE80211_CHANCTX_EXCLUSIVE)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -180,8 +343,7 @@ ieee80211_find_reservation_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 		if (ctx-&gt;mode == IEEE80211_CHANCTX_EXCLUSIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!ieee80211_chanctx_can_reserve_chandef(local, ctx,</div><div class='del'>-							   chandef))</div><div class='add'>+		if (!ieee80211_chanctx_can_reserve(local, ctx, chanreq))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		return ctx;</div><div class='hunk'>@@ -190,11 +352,30 @@ ieee80211_find_reservation_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum nl80211_chan_width ieee80211_get_sta_bw(struct ieee80211_sta *sta)</div><div class='add'>+static enum nl80211_chan_width ieee80211_get_sta_bw(struct sta_info *sta,</div><div class='add'>+						    unsigned int link_id)</div><div class='ctx'> {</div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	enum ieee80211_sta_rx_bandwidth width;</div><div class='add'>+	struct link_sta_info *link_sta;</div><div class='add'>+</div><div class='add'>+	link_sta = wiphy_dereference(sta-&gt;local-&gt;hw.wiphy, sta-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+	/* no effect if this STA has no presence on this link */</div><div class='add'>+	if (!link_sta)</div><div class='add'>+		return NL80211_CHAN_WIDTH_20_NOHT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We assume that TX/RX might be asymmetric (so e.g. VHT operating</div><div class='add'>+	 * mode notification changes what a STA wants to receive, but not</div><div class='add'>+	 * necessarily what it will transmit to us), and therefore use the</div><div class='add'>+	 * capabilities here. Calling it RX bandwidth capability is a bit</div><div class='add'>+	 * wrong though, since capabilities are in fact symmetric.</div><div class='add'>+	 */</div><div class='add'>+	width = ieee80211_sta_cap_rx_bw(link_sta);</div><div class='add'>+</div><div class='add'>+	switch (width) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_20:</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		if (link_sta-&gt;pub-&gt;ht_cap.ht_supported)</div><div class='ctx'> 			return NL80211_CHAN_WIDTH_20;</div><div class='ctx'> 		else</div><div class='ctx'> 			return NL80211_CHAN_WIDTH_20_NOHT;</div><div class='hunk'>@@ -213,6 +394,8 @@ enum nl80211_chan_width ieee80211_get_sta_bw(struct ieee80211_sta *sta)</div><div class='ctx'> 		 * might be smaller than the configured bw (160).</div><div class='ctx'> 		 */</div><div class='ctx'> 		return NL80211_CHAN_WIDTH_160;</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='add'>+		return NL80211_CHAN_WIDTH_320;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return NL80211_CHAN_WIDTH_20;</div><div class='hunk'>@@ -220,81 +403,99 @@ enum nl80211_chan_width ieee80211_get_sta_bw(struct ieee80211_sta *sta)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum nl80211_chan_width</div><div class='del'>-ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_get_max_required_bw(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	unsigned int link_id = link-&gt;link_id;</div><div class='ctx'> 	enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sta, &amp;sdata-&gt;local-&gt;sta_list, list) {</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sta, &amp;sdata-&gt;local-&gt;sta_list, list) {</div><div class='ctx'> 		if (sdata != sta-&gt;sdata &amp;&amp;</div><div class='ctx'> 		    !(sta-&gt;sdata-&gt;bss &amp;&amp; sta-&gt;sdata-&gt;bss == sdata-&gt;bss))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		max_bw = max(max_bw, ieee80211_get_sta_bw(&amp;sta-&gt;sta));</div><div class='add'>+		max_bw = max(max_bw, ieee80211_get_sta_bw(sta, link_id));</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return max_bw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum nl80211_chan_width</div><div class='ctx'> ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,</div><div class='del'>-				      struct ieee80211_chanctx_conf *conf)</div><div class='add'>+				      struct ieee80211_chanctx *ctx,</div><div class='add'>+				      struct ieee80211_link_data *rsvd_for,</div><div class='add'>+				      bool check_reserved)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='ctx'> 	enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-		struct ieee80211_vif *vif = &amp;sdata-&gt;vif;</div><div class='del'>-		enum nl80211_chan_width width = NL80211_CHAN_WIDTH_20_NOHT;</div><div class='add'>+	if (WARN_ON(check_reserved &amp;&amp; rsvd_for))</div><div class='add'>+		return ctx-&gt;conf.def.width;</div><div class='ctx'> </div><div class='del'>-		if (!ieee80211_sdata_running(sdata))</div><div class='del'>-			continue;</div><div class='add'>+	for_each_sdata_link(local, link) {</div><div class='add'>+		enum nl80211_chan_width width = NL80211_CHAN_WIDTH_20_NOHT;</div><div class='ctx'> </div><div class='del'>-		if (rcu_access_pointer(sdata-&gt;vif.chanctx_conf) != conf)</div><div class='add'>+		if (check_reserved) {</div><div class='add'>+			if (link-&gt;reserved_chanctx != ctx)</div><div class='add'>+				continue;</div><div class='add'>+		} else if (link != rsvd_for &amp;&amp;</div><div class='add'>+			   rcu_access_pointer(link-&gt;conf-&gt;chanctx_conf) != &amp;ctx-&gt;conf)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		switch (vif-&gt;type) {</div><div class='del'>-		case NL80211_IFTYPE_AP:</div><div class='del'>-		case NL80211_IFTYPE_AP_VLAN:</div><div class='del'>-			width = ieee80211_get_max_required_bw(sdata);</div><div class='del'>-			break;</div><div class='add'>+		switch (link-&gt;sdata-&gt;vif.type) {</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='add'>+			if (!link-&gt;sdata-&gt;vif.cfg.assoc) {</div><div class='add'>+				/*</div><div class='add'>+				 * The AP's sta-&gt;bandwidth may not yet be set</div><div class='add'>+				 * at this point (pre-association), so simply</div><div class='add'>+				 * take the width from the chandef. We cannot</div><div class='add'>+				 * have TDLS peers yet (only after association).</div><div class='add'>+				 */</div><div class='add'>+				width = link-&gt;conf-&gt;chanreq.oper.width;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='del'>-			 * The ap's sta-&gt;bandwidth is not set yet at this</div><div class='del'>-			 * point, so take the width from the chandef, but</div><div class='del'>-			 * account also for TDLS peers</div><div class='add'>+			 * otherwise just use min_def like in AP, depending on what</div><div class='add'>+			 * we currently think the AP STA (and possibly TDLS peers)</div><div class='add'>+			 * require(s)</div><div class='ctx'> 			 */</div><div class='del'>-			width = max(vif-&gt;bss_conf.chandef.width,</div><div class='del'>-				    ieee80211_get_max_required_bw(sdata));</div><div class='add'>+			fallthrough;</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+		case NL80211_IFTYPE_AP_VLAN:</div><div class='add'>+			width = ieee80211_get_max_required_bw(link);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_DEVICE:</div><div class='ctx'> 		case NL80211_IFTYPE_NAN:</div><div class='ctx'> 			continue;</div><div class='add'>+		case NL80211_IFTYPE_MONITOR:</div><div class='add'>+			WARN_ON_ONCE(!ieee80211_hw_check(&amp;local-&gt;hw,</div><div class='add'>+							 NO_VIRTUAL_MONITOR));</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		case NL80211_IFTYPE_WDS:</div><div class='ctx'> 		case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 		case NL80211_IFTYPE_OCB:</div><div class='del'>-			width = vif-&gt;bss_conf.chandef.width;</div><div class='add'>+			width = link-&gt;conf-&gt;chanreq.oper.width;</div><div class='ctx'> 			break;</div><div class='add'>+		case NL80211_IFTYPE_WDS:</div><div class='ctx'> 		case NL80211_IFTYPE_UNSPECIFIED:</div><div class='ctx'> 		case NUM_NL80211_IFTYPES:</div><div class='del'>-		case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_GO:</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		max_bw = max(max_bw, width);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* use the configured bandwidth in case of monitor interface */</div><div class='del'>-	sdata = rcu_dereference(local-&gt;monitor_sdata);</div><div class='del'>-	if (sdata &amp;&amp; rcu_access_pointer(sdata-&gt;vif.chanctx_conf) == conf)</div><div class='del'>-		max_bw = max(max_bw, conf-&gt;def.width);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	sdata = wiphy_dereference(local-&gt;hw.wiphy, local-&gt;monitor_sdata);</div><div class='add'>+	if (sdata &amp;&amp;</div><div class='add'>+	    rcu_access_pointer(sdata-&gt;vif.bss_conf.chanctx_conf) == &amp;ctx-&gt;conf)</div><div class='add'>+		max_bw = max(max_bw, ctx-&gt;conf.def.width);</div><div class='ctx'> </div><div class='ctx'> 	return max_bw;</div><div class='ctx'> }</div><div class='hunk'>@@ -304,74 +505,247 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,</div><div class='ctx'>  * the max of min required widths of all the interfaces bound to this</div><div class='ctx'>  * channel context.</div><div class='ctx'>  */</div><div class='del'>-void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,</div><div class='del'>-				      struct ieee80211_chanctx *ctx)</div><div class='add'>+static u32</div><div class='add'>+__ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,</div><div class='add'>+				   struct ieee80211_chanctx *ctx,</div><div class='add'>+				   struct ieee80211_link_data *rsvd_for,</div><div class='add'>+				   bool check_reserved)</div><div class='ctx'> {</div><div class='ctx'> 	enum nl80211_chan_width max_bw;</div><div class='ctx'> 	struct cfg80211_chan_def min_def;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	/* don't optimize 5MHz, 10MHz, and radar_enabled confs */</div><div class='add'>+	/* don't optimize non-20MHz based and radar_enabled confs */</div><div class='ctx'> 	if (ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_5 ||</div><div class='ctx'> 	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_10 ||</div><div class='add'>+	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_1 ||</div><div class='add'>+	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_2 ||</div><div class='add'>+	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_4 ||</div><div class='add'>+	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_8 ||</div><div class='add'>+	    ctx-&gt;conf.def.width == NL80211_CHAN_WIDTH_16 ||</div><div class='ctx'> 	    ctx-&gt;conf.radar_enabled) {</div><div class='ctx'> 		ctx-&gt;conf.min_def = ctx-&gt;conf.def;</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	max_bw = ieee80211_get_chanctx_max_required_bw(local, &amp;ctx-&gt;conf);</div><div class='add'>+	max_bw = ieee80211_get_chanctx_max_required_bw(local, ctx, rsvd_for,</div><div class='add'>+						       check_reserved);</div><div class='ctx'> </div><div class='ctx'> 	/* downgrade chandef up to max_bw */</div><div class='ctx'> 	min_def = ctx-&gt;conf.def;</div><div class='ctx'> 	while (min_def.width &gt; max_bw)</div><div class='del'>-		ieee80211_chandef_downgrade(&amp;min_def);</div><div class='add'>+		ieee80211_chandef_downgrade(&amp;min_def, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (cfg80211_chandef_identical(&amp;ctx-&gt;conf.min_def, &amp;min_def))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;conf.min_def = min_def;</div><div class='ctx'> 	if (!ctx-&gt;driver_present)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_MIN_WIDTH);</div><div class='add'>+	return IEEE80211_CHANCTX_CHANGE_MIN_DEF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ieee80211_change_chanctx(struct ieee80211_local *local,</div><div class='add'>+static void ieee80211_chan_bw_change(struct ieee80211_local *local,</div><div class='ctx'> 				     struct ieee80211_chanctx *ctx,</div><div class='del'>-				     const struct cfg80211_chan_def *chandef)</div><div class='add'>+				     bool reserved, bool narrowed)</div><div class='ctx'> {</div><div class='del'>-	if (cfg80211_chandef_identical(&amp;ctx-&gt;conf.def, chandef)) {</div><div class='del'>-		ieee80211_recalc_chanctx_min_def(local, ctx);</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+	struct ieee80211_supported_band *sband =</div><div class='add'>+		local-&gt;hw.wiphy-&gt;bands[ctx-&gt;conf.def.chan-&gt;band];</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(sta, &amp;local-&gt;sta_list,</div><div class='add'>+				list) {</div><div class='add'>+		struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='add'>+		enum ieee80211_sta_rx_bandwidth new_sta_bw;</div><div class='add'>+		unsigned int link_id;</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_sdata_running(sta-&gt;sdata))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (link_id = 0; link_id &lt; ARRAY_SIZE(sta-&gt;sdata-&gt;link); link_id++) {</div><div class='add'>+			struct ieee80211_link_data *link =</div><div class='add'>+				rcu_dereference(sdata-&gt;link[link_id]);</div><div class='add'>+			struct ieee80211_bss_conf *link_conf;</div><div class='add'>+			struct cfg80211_chan_def *new_chandef;</div><div class='add'>+			struct link_sta_info *link_sta;</div><div class='add'>+</div><div class='add'>+			if (!link)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			link_conf = link-&gt;conf;</div><div class='add'>+</div><div class='add'>+			if (rcu_access_pointer(link_conf-&gt;chanctx_conf) != &amp;ctx-&gt;conf)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			link_sta = rcu_dereference(sta-&gt;link[link_id]);</div><div class='add'>+			if (!link_sta)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (reserved)</div><div class='add'>+				new_chandef = &amp;link-&gt;reserved.oper;</div><div class='add'>+			else</div><div class='add'>+				new_chandef = &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+</div><div class='add'>+			new_sta_bw = _ieee80211_sta_cur_vht_bw(link_sta,</div><div class='add'>+							       new_chandef);</div><div class='add'>+</div><div class='add'>+			/* nothing change */</div><div class='add'>+			if (new_sta_bw == link_sta-&gt;pub-&gt;bandwidth)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* vif changed to narrow BW and narrow BW for station wasn't</div><div class='add'>+			 * requested or vice versa */</div><div class='add'>+			if ((new_sta_bw &lt; link_sta-&gt;pub-&gt;bandwidth) == !narrowed)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			link_sta-&gt;pub-&gt;bandwidth = new_sta_bw;</div><div class='add'>+			rate_control_rate_update(local, sband, link_sta,</div><div class='add'>+						 IEEE80211_RC_BW_CHANGED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * recalc the min required chan width of the channel context, which is</div><div class='add'>+ * the max of min required widths of all the interfaces bound to this</div><div class='add'>+ * channel context.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+_ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,</div><div class='add'>+				  struct ieee80211_chanctx *ctx,</div><div class='add'>+				  struct ieee80211_link_data *rsvd_for,</div><div class='add'>+				  bool check_reserved)</div><div class='add'>+{</div><div class='add'>+	u32 changed = __ieee80211_recalc_chanctx_min_def(local, ctx, rsvd_for,</div><div class='add'>+							 check_reserved);</div><div class='add'>+</div><div class='add'>+	if (!changed)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	/* check is BW narrowed */</div><div class='add'>+	ieee80211_chan_bw_change(local, ctx, false, true);</div><div class='add'>+</div><div class='add'>+	drv_change_chanctx(local, ctx, changed);</div><div class='add'>+</div><div class='add'>+	/* check is BW wider */</div><div class='add'>+	ieee80211_chan_bw_change(local, ctx, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,</div><div class='add'>+				      struct ieee80211_chanctx *ctx)</div><div class='add'>+{</div><div class='add'>+	_ieee80211_recalc_chanctx_min_def(local, ctx, NULL, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _ieee80211_change_chanctx(struct ieee80211_local *local,</div><div class='add'>+				      struct ieee80211_chanctx *ctx,</div><div class='add'>+				      struct ieee80211_chanctx *old_ctx,</div><div class='add'>+				      const struct ieee80211_chan_req *chanreq,</div><div class='add'>+				      struct ieee80211_link_data *rsvd_for)</div><div class='add'>+{</div><div class='add'>+	const struct cfg80211_chan_def *chandef = &amp;chanreq-&gt;oper;</div><div class='add'>+	struct ieee80211_chan_req ctx_req = {</div><div class='add'>+		.oper = ctx-&gt;conf.def,</div><div class='add'>+		.ap = ctx-&gt;conf.ap,</div><div class='add'>+	};</div><div class='add'>+	u32 changed = 0;</div><div class='add'>+</div><div class='add'>+	/* 5/10 MHz not handled here */</div><div class='add'>+	switch (chandef-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_1:</div><div class='add'>+	case NL80211_CHAN_WIDTH_2:</div><div class='add'>+	case NL80211_CHAN_WIDTH_4:</div><div class='add'>+	case NL80211_CHAN_WIDTH_8:</div><div class='add'>+	case NL80211_CHAN_WIDTH_16:</div><div class='add'>+		/*</div><div class='add'>+		 * mac80211 currently only supports sharing identical</div><div class='add'>+		 * chanctx's for S1G interfaces.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(!ieee80211_chanreq_identical(&amp;ctx_req, chanreq));</div><div class='add'>+		return;</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!cfg80211_chandef_compatible(&amp;ctx-&gt;conf.def, chandef));</div><div class='add'>+	/* Check maybe BW narrowed - we do this _before_ calling recalc_chanctx_min_def</div><div class='add'>+	 * due to maybe not returning from it, e.g in case new context was added</div><div class='add'>+	 * first time with all parameters up to date.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_chan_bw_change(local, old_ctx, false, true);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;conf.def = *chandef;</div><div class='del'>-	drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_WIDTH);</div><div class='del'>-	ieee80211_recalc_chanctx_min_def(local, ctx);</div><div class='add'>+	if (ieee80211_chanreq_identical(&amp;ctx_req, chanreq)) {</div><div class='add'>+		_ieee80211_recalc_chanctx_min_def(local, ctx, rsvd_for, false);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(ieee80211_chanctx_refcount(local, ctx) &gt; 1 &amp;&amp;</div><div class='add'>+		!cfg80211_chandef_compatible(&amp;ctx-&gt;conf.def, &amp;chanreq-&gt;oper));</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx) {</div><div class='del'>-		local-&gt;_oper_chandef = *chandef;</div><div class='del'>-		ieee80211_hw_config(local, 0);</div><div class='add'>+	ieee80211_remove_wbrf(local, &amp;ctx-&gt;conf.def);</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_identical(&amp;ctx-&gt;conf.def, &amp;chanreq-&gt;oper)) {</div><div class='add'>+		if (ctx-&gt;conf.def.width != chanreq-&gt;oper.width)</div><div class='add'>+			changed |= IEEE80211_CHANCTX_CHANGE_WIDTH;</div><div class='add'>+		if (ctx-&gt;conf.def.punctured != chanreq-&gt;oper.punctured)</div><div class='add'>+			changed |= IEEE80211_CHANCTX_CHANGE_PUNCTURING;</div><div class='ctx'> 	}</div><div class='add'>+	if (!cfg80211_chandef_identical(&amp;ctx-&gt;conf.ap, &amp;chanreq-&gt;ap))</div><div class='add'>+		changed |= IEEE80211_CHANCTX_CHANGE_AP;</div><div class='add'>+	ctx-&gt;conf.def = *chandef;</div><div class='add'>+	ctx-&gt;conf.ap = chanreq-&gt;ap;</div><div class='add'>+</div><div class='add'>+	/* check if min chanctx also changed */</div><div class='add'>+	changed |= __ieee80211_recalc_chanctx_min_def(local, ctx, rsvd_for,</div><div class='add'>+						      false);</div><div class='add'>+</div><div class='add'>+	ieee80211_add_wbrf(local, &amp;ctx-&gt;conf.def);</div><div class='add'>+</div><div class='add'>+	drv_change_chanctx(local, ctx, changed);</div><div class='add'>+</div><div class='add'>+	/* check if BW is wider */</div><div class='add'>+	ieee80211_chan_bw_change(local, old_ctx, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee80211_change_chanctx(struct ieee80211_local *local,</div><div class='add'>+				     struct ieee80211_chanctx *ctx,</div><div class='add'>+				     struct ieee80211_chanctx *old_ctx,</div><div class='add'>+				     const struct ieee80211_chan_req *chanreq)</div><div class='add'>+{</div><div class='add'>+	_ieee80211_change_chanctx(local, ctx, old_ctx, chanreq, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Note: if successful, the returned chanctx is reserved for the link */</div><div class='ctx'> static struct ieee80211_chanctx *</div><div class='ctx'> ieee80211_find_chanctx(struct ieee80211_local *local,</div><div class='del'>-		       const struct cfg80211_chan_def *chandef,</div><div class='add'>+		       struct ieee80211_link_data *link,</div><div class='add'>+		       const struct ieee80211_chan_req *chanreq,</div><div class='ctx'> 		       enum ieee80211_chanctx_mode mode)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == IEEE80211_CHANCTX_EXCLUSIVE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(link-&gt;reserved_chanctx))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='del'>-		const struct cfg80211_chan_def *compat;</div><div class='add'>+		const struct ieee80211_chan_req *compat;</div><div class='ctx'> </div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACE_NONE)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -379,16 +753,24 @@ ieee80211_find_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 		if (ctx-&gt;mode == IEEE80211_CHANCTX_EXCLUSIVE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		compat = cfg80211_chandef_compatible(&amp;ctx-&gt;conf.def, chandef);</div><div class='add'>+		compat = ieee80211_chanctx_compatible(ctx, chanreq, &amp;tmp);</div><div class='ctx'> 		if (!compat)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		compat = ieee80211_chanctx_reserved_chandef(local, ctx,</div><div class='del'>-							    compat);</div><div class='add'>+		compat = ieee80211_chanctx_reserved_chanreq(local, ctx,</div><div class='add'>+							    compat, &amp;tmp);</div><div class='ctx'> 		if (!compat)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ieee80211_change_chanctx(local, ctx, compat);</div><div class='add'>+		/*</div><div class='add'>+		 * Reserve the chanctx temporarily, as the driver might change</div><div class='add'>+		 * active links during callbacks we make into it below and/or</div><div class='add'>+		 * later during assignment, which could (otherwise) cause the</div><div class='add'>+		 * context to actually be removed.</div><div class='add'>+		 */</div><div class='add'>+		link-&gt;reserved_chanctx = ctx;</div><div class='add'>+</div><div class='add'>+		ieee80211_change_chanctx(local, ctx, ctx, compat);</div><div class='ctx'> </div><div class='ctx'> 		return ctx;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -396,20 +778,29 @@ ieee80211_find_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool ieee80211_is_radar_required(struct ieee80211_local *local)</div><div class='add'>+bool ieee80211_is_radar_required(struct ieee80211_local *local,</div><div class='add'>+				 struct cfg80211_scan_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+	struct wiphy *wiphy = local-&gt;hw.wiphy;</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	int radio_idx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-		if (sdata-&gt;radar_required) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return true;</div><div class='add'>+	if (!req)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for_each_sdata_link(local, link) {</div><div class='add'>+		if (link-&gt;radar_required) {</div><div class='add'>+			chan = link-&gt;conf-&gt;chanreq.oper.chan;</div><div class='add'>+			radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chan);</div><div class='add'>+</div><div class='add'>+			if (ieee80211_is_radio_idx_in_scan_req(wiphy, req,</div><div class='add'>+							       radio_idx))</div><div class='add'>+				return true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,51 +809,41 @@ static bool</div><div class='ctx'> ieee80211_chanctx_radar_required(struct ieee80211_local *local,</div><div class='ctx'> 				 struct ieee80211_chanctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_chanctx_conf *conf = &amp;ctx-&gt;conf;</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='del'>-	bool required = false;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-		if (!ieee80211_sdata_running(sdata))</div><div class='del'>-			continue;</div><div class='del'>-		if (rcu_access_pointer(sdata-&gt;vif.chanctx_conf) != conf)</div><div class='del'>-			continue;</div><div class='del'>-		if (!sdata-&gt;radar_required)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		required = true;</div><div class='del'>-		break;</div><div class='add'>+	for_each_chanctx_user_assigned(local, ctx, &amp;iter) {</div><div class='add'>+		if (iter.radar_required)</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return required;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_chanctx *</div><div class='ctx'> ieee80211_alloc_chanctx(struct ieee80211_local *local,</div><div class='del'>-			const struct cfg80211_chan_def *chandef,</div><div class='del'>-			enum ieee80211_chanctx_mode mode)</div><div class='add'>+			const struct ieee80211_chan_req *chanreq,</div><div class='add'>+			enum ieee80211_chanctx_mode mode,</div><div class='add'>+			int radio_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	ctx = kzalloc(sizeof(*ctx) + local-&gt;hw.chanctx_data_size, GFP_KERNEL);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;ctx-&gt;assigned_vifs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctx-&gt;reserved_vifs);</div><div class='del'>-	ctx-&gt;conf.def = *chandef;</div><div class='add'>+	ctx-&gt;conf.def = chanreq-&gt;oper;</div><div class='add'>+	ctx-&gt;conf.ap = chanreq-&gt;ap;</div><div class='ctx'> 	ctx-&gt;conf.rx_chains_static = 1;</div><div class='ctx'> 	ctx-&gt;conf.rx_chains_dynamic = 1;</div><div class='ctx'> 	ctx-&gt;mode = mode;</div><div class='ctx'> 	ctx-&gt;conf.radar_enabled = false;</div><div class='del'>-	ieee80211_recalc_chanctx_min_def(local, ctx);</div><div class='add'>+	ctx-&gt;conf.radio_idx = radio_idx;</div><div class='add'>+	ctx-&gt;radar_detected = false;</div><div class='add'>+	__ieee80211_recalc_chanctx_min_def(local, ctx, NULL, false);</div><div class='ctx'> </div><div class='ctx'> 	return ctx;</div><div class='ctx'> }</div><div class='hunk'>@@ -473,26 +854,19 @@ static int ieee80211_add_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 	u32 changed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx)</div><div class='del'>-		local-&gt;hw.conf.radar_enabled = ctx-&gt;conf.radar_enabled;</div><div class='add'>+	ieee80211_add_wbrf(local, &amp;ctx-&gt;conf.def);</div><div class='ctx'> </div><div class='ctx'> 	/* turn idle off *before* setting channel -- some drivers need that */</div><div class='ctx'> 	changed = ieee80211_idle_off(local);</div><div class='ctx'> 	if (changed)</div><div class='del'>-		ieee80211_hw_config(local, changed);</div><div class='add'>+		ieee80211_hw_config(local, -1, changed);</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx) {</div><div class='del'>-		local-&gt;_oper_chandef = ctx-&gt;conf.def;</div><div class='del'>-		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);</div><div class='del'>-	} else {</div><div class='del'>-		err = drv_add_chanctx(local, ctx);</div><div class='del'>-		if (err) {</div><div class='del'>-			ieee80211_recalc_idle(local);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+	err = drv_add_chanctx(local, ctx);</div><div class='add'>+	if (err) {</div><div class='add'>+		ieee80211_recalc_idle(local);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -500,65 +874,56 @@ static int ieee80211_add_chanctx(struct ieee80211_local *local,</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_chanctx *</div><div class='ctx'> ieee80211_new_chanctx(struct ieee80211_local *local,</div><div class='del'>-		      const struct cfg80211_chan_def *chandef,</div><div class='del'>-		      enum ieee80211_chanctx_mode mode)</div><div class='add'>+		      const struct ieee80211_chan_req *chanreq,</div><div class='add'>+		      enum ieee80211_chanctx_mode mode,</div><div class='add'>+		      bool assign_on_failure,</div><div class='add'>+		      int radio_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	ctx = ieee80211_alloc_chanctx(local, chandef, mode);</div><div class='add'>+	ctx = ieee80211_alloc_chanctx(local, chanreq, mode, radio_idx);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	err = ieee80211_add_chanctx(local, ctx);</div><div class='del'>-	if (err) {</div><div class='add'>+	if (!assign_on_failure &amp;&amp; err) {</div><div class='ctx'> 		kfree(ctx);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='add'>+	/* We ignored a driver error, see _ieee80211_set_active_links */</div><div class='add'>+	WARN_ON_ONCE(err &amp;&amp; !local-&gt;in_reconfig);</div><div class='ctx'> </div><div class='ctx'> 	list_add_rcu(&amp;ctx-&gt;list, &amp;local-&gt;chanctx_list);</div><div class='ctx'> 	return ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ieee80211_del_chanctx(struct ieee80211_local *local,</div><div class='del'>-				  struct ieee80211_chanctx *ctx)</div><div class='add'>+				  struct ieee80211_chanctx *ctx,</div><div class='add'>+				  bool skip_idle_recalc)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx) {</div><div class='del'>-		struct cfg80211_chan_def *chandef = &amp;local-&gt;_oper_chandef;</div><div class='del'>-		chandef-&gt;width = NL80211_CHAN_WIDTH_20_NOHT;</div><div class='del'>-		chandef-&gt;center_freq1 = chandef-&gt;chan-&gt;center_freq;</div><div class='del'>-		chandef-&gt;center_freq2 = 0;</div><div class='add'>+	drv_remove_chanctx(local, ctx);</div><div class='ctx'> </div><div class='del'>-		/* NOTE: Disabling radar is only valid here for</div><div class='del'>-		 * single channel context. To be sure, check it ...</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(local-&gt;hw.conf.radar_enabled &amp;&amp;</div><div class='del'>-			!list_empty(&amp;local-&gt;chanctx_list));</div><div class='del'>-</div><div class='del'>-		local-&gt;hw.conf.radar_enabled = false;</div><div class='add'>+	if (!skip_idle_recalc)</div><div class='add'>+		ieee80211_recalc_idle(local);</div><div class='ctx'> </div><div class='del'>-		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);</div><div class='del'>-	} else {</div><div class='del'>-		drv_remove_chanctx(local, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ieee80211_recalc_idle(local);</div><div class='add'>+	ieee80211_remove_wbrf(local, &amp;ctx-&gt;conf.def);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ieee80211_free_chanctx(struct ieee80211_local *local,</div><div class='del'>-				   struct ieee80211_chanctx *ctx)</div><div class='add'>+				   struct ieee80211_chanctx *ctx,</div><div class='add'>+				   bool skip_idle_recalc)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(ieee80211_chanctx_refcount(local, ctx) != 0);</div><div class='ctx'> </div><div class='ctx'> 	list_del_rcu(&amp;ctx-&gt;list);</div><div class='del'>-	ieee80211_del_chanctx(local, ctx);</div><div class='add'>+	ieee80211_del_chanctx(local, ctx, skip_idle_recalc);</div><div class='ctx'> 	kfree_rcu(ctx, rcu_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -566,50 +931,57 @@ void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,</div><div class='ctx'> 				       struct ieee80211_chanctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf = &amp;ctx-&gt;conf;</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='del'>-	const struct cfg80211_chan_def *compat = NULL;</div><div class='add'>+	const struct ieee80211_chan_req *compat = NULL;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sdata, &amp;local-&gt;interfaces, list) {</div><div class='del'>-</div><div class='del'>-		if (!ieee80211_sdata_running(sdata))</div><div class='del'>-			continue;</div><div class='del'>-		if (rcu_access_pointer(sdata-&gt;vif.chanctx_conf) != conf)</div><div class='del'>-			continue;</div><div class='del'>-		if (sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN)</div><div class='del'>-			continue;</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='add'>+	for_each_chanctx_user_assigned(local, ctx, &amp;iter) {</div><div class='ctx'> 		if (!compat)</div><div class='del'>-			compat = &amp;sdata-&gt;vif.bss_conf.chandef;</div><div class='add'>+			compat = iter.chanreq;</div><div class='ctx'> </div><div class='del'>-		compat = cfg80211_chandef_compatible(</div><div class='del'>-				&amp;sdata-&gt;vif.bss_conf.chandef, compat);</div><div class='add'>+		compat = ieee80211_chanreq_compatible(iter.chanreq,</div><div class='add'>+						      compat, &amp;tmp);</div><div class='ctx'> 		if (WARN_ON_ONCE(!compat))</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!compat))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* TDLS peers can sometimes affect the chandef width */</div><div class='del'>-	list_for_each_entry_rcu(sta, &amp;local-&gt;sta_list, list) {</div><div class='add'>+	list_for_each_entry(sta, &amp;local-&gt;sta_list, list) {</div><div class='add'>+		struct ieee80211_sub_if_data *sdata = sta-&gt;sdata;</div><div class='add'>+		struct ieee80211_chan_req tdls_chanreq = {};</div><div class='add'>+		struct ieee80211_link_data *link;</div><div class='add'>+		int tdls_link_id;</div><div class='add'>+</div><div class='ctx'> 		if (!sta-&gt;uploaded ||</div><div class='ctx'> 		    !test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW) ||</div><div class='ctx'> 		    !test_sta_flag(sta, WLAN_STA_AUTHORIZED) ||</div><div class='ctx'> 		    !sta-&gt;tdls_chandef.chan)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		compat = cfg80211_chandef_compatible(&amp;sta-&gt;tdls_chandef,</div><div class='del'>-						     compat);</div><div class='add'>+		tdls_link_id = ieee80211_tdls_sta_link_id(sta);</div><div class='add'>+		link = sdata_dereference(sdata-&gt;link[tdls_link_id], sdata);</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rcu_access_pointer(link-&gt;conf-&gt;chanctx_conf) != conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tdls_chanreq.oper = sta-&gt;tdls_chandef;</div><div class='add'>+</div><div class='add'>+		/* note this always fills and returns &amp;tmp if compat */</div><div class='add'>+		compat = ieee80211_chanreq_compatible(&amp;tdls_chanreq,</div><div class='add'>+						      compat, &amp;tmp);</div><div class='ctx'> 		if (WARN_ON_ONCE(!compat))</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (!compat)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ieee80211_change_chanctx(local, ctx, compat);</div><div class='add'>+	ieee80211_change_chanctx(local, ctx, ctx, compat);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,</div><div class='hunk'>@@ -617,9 +989,7 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,</div><div class='ctx'> {</div><div class='ctx'> 	bool radar_enabled;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	/* for ieee80211_is_radar_required */</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	radar_enabled = ieee80211_chanctx_radar_required(local, chanctx);</div><div class='ctx'> </div><div class='hunk'>@@ -628,50 +998,51 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,</div><div class='ctx'> </div><div class='ctx'> 	chanctx-&gt;conf.radar_enabled = radar_enabled;</div><div class='ctx'> </div><div class='del'>-	if (!local-&gt;use_chanctx) {</div><div class='del'>-		local-&gt;hw.conf.radar_enabled = chanctx-&gt;conf.radar_enabled;</div><div class='del'>-		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RADAR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-					struct ieee80211_chanctx *new_ctx)</div><div class='add'>+static int ieee80211_assign_link_chanctx(struct ieee80211_link_data *link,</div><div class='add'>+					 struct ieee80211_chanctx *new_ctx,</div><div class='add'>+					 bool assign_on_failure)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> 	struct ieee80211_chanctx *curr_ctx = NULL;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	bool new_idle;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(sdata-&gt;vif.type == NL80211_IFTYPE_NAN))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='add'>+	conf = rcu_dereference_protected(link-&gt;conf-&gt;chanctx_conf,</div><div class='add'>+					 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='ctx'> </div><div class='del'>-	if (conf) {</div><div class='add'>+	if (conf &amp;&amp; !local-&gt;in_reconfig) {</div><div class='ctx'> 		curr_ctx = container_of(conf, struct ieee80211_chanctx, conf);</div><div class='ctx'> </div><div class='del'>-		drv_unassign_vif_chanctx(local, sdata, curr_ctx);</div><div class='add'>+		drv_unassign_vif_chanctx(local, sdata, link-&gt;conf, curr_ctx);</div><div class='ctx'> 		conf = NULL;</div><div class='del'>-		list_del(&amp;sdata-&gt;assigned_chanctx_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_ctx) {</div><div class='del'>-		ret = drv_assign_vif_chanctx(local, sdata, new_ctx);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+		/* recalc considering the link we'll use it for now */</div><div class='add'>+		_ieee80211_recalc_chanctx_min_def(local, new_ctx, link, false);</div><div class='ctx'> </div><div class='del'>-		conf = &amp;new_ctx-&gt;conf;</div><div class='del'>-		list_add(&amp;sdata-&gt;assigned_chanctx_list,</div><div class='del'>-			 &amp;new_ctx-&gt;assigned_vifs);</div><div class='del'>-	}</div><div class='add'>+		ret = drv_assign_vif_chanctx(local, sdata, link-&gt;conf, new_ctx);</div><div class='add'>+		if (assign_on_failure || !ret) {</div><div class='add'>+			/* Need to continue, see _ieee80211_set_active_links */</div><div class='add'>+			WARN_ON_ONCE(ret &amp;&amp; !local-&gt;in_reconfig);</div><div class='add'>+			ret = 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	rcu_assign_pointer(sdata-&gt;vif.chanctx_conf, conf);</div><div class='add'>+			/* succeeded, so commit it to the data structures */</div><div class='add'>+			conf = &amp;new_ctx-&gt;conf;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.idle = !conf;</div><div class='add'>+	rcu_assign_pointer(link-&gt;conf-&gt;chanctx_conf, conf);</div><div class='ctx'> </div><div class='ctx'> 	if (curr_ctx &amp;&amp; ieee80211_chanctx_num_assigned(local, curr_ctx) &gt; 0) {</div><div class='ctx'> 		ieee80211_recalc_chanctx_chantype(local, curr_ctx);</div><div class='hunk'>@@ -681,14 +1052,31 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_ctx &amp;&amp; ieee80211_chanctx_num_assigned(local, new_ctx) &gt; 0) {</div><div class='del'>-		ieee80211_recalc_txpower(sdata, false);</div><div class='add'>+		ieee80211_recalc_txpower(link, false);</div><div class='ctx'> 		ieee80211_recalc_chanctx_min_def(local, new_ctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;vif.type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='del'>-	    sdata-&gt;vif.type != NL80211_IFTYPE_MONITOR)</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata,</div><div class='del'>-						 BSS_CHANGED_IDLE);</div><div class='add'>+	if (conf) {</div><div class='add'>+		new_idle = false;</div><div class='add'>+	} else {</div><div class='add'>+		struct ieee80211_link_data *tmp;</div><div class='add'>+</div><div class='add'>+		new_idle = true;</div><div class='add'>+		for_each_sdata_link(local, tmp) {</div><div class='add'>+			if (rcu_access_pointer(tmp-&gt;conf-&gt;chanctx_conf)) {</div><div class='add'>+				new_idle = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_idle != sdata-&gt;vif.cfg.idle) {</div><div class='add'>+		sdata-&gt;vif.cfg.idle = new_idle;</div><div class='add'>+</div><div class='add'>+		if (sdata-&gt;vif.type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+		    sdata-&gt;vif.type != NL80211_IFTYPE_MONITOR)</div><div class='add'>+			ieee80211_vif_cfg_change_notify(sdata, BSS_CHANGED_IDLE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_check_fast_xmit_iface(sdata);</div><div class='ctx'> </div><div class='hunk'>@@ -698,57 +1086,53 @@ out:</div><div class='ctx'> void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 				   struct ieee80211_chanctx *chanctx)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata;</div><div class='ctx'> 	u8 rx_chains_static, rx_chains_dynamic;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	rx_chains_static = 1;</div><div class='ctx'> 	rx_chains_dynamic = 1;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(sdata, &amp;local-&gt;interfaces, list) {</div><div class='add'>+	for_each_chanctx_user_assigned(local, chanctx, &amp;iter) {</div><div class='ctx'> 		u8 needed_static, needed_dynamic;</div><div class='ctx'> </div><div class='del'>-		if (!ieee80211_sdata_running(sdata))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (rcu_access_pointer(sdata-&gt;vif.chanctx_conf) !=</div><div class='del'>-						&amp;chanctx-&gt;conf)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		switch (sdata-&gt;vif.type) {</div><div class='del'>-		case NL80211_IFTYPE_P2P_DEVICE:</div><div class='del'>-		case NL80211_IFTYPE_NAN:</div><div class='del'>-			continue;</div><div class='add'>+		switch (iter.iftype) {</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='del'>-			if (!sdata-&gt;u.mgd.associated)</div><div class='add'>+			if (!iter.sdata-&gt;u.mgd.associated)</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_IFTYPE_MONITOR:</div><div class='add'>+			if (!ieee80211_hw_check(&amp;local-&gt;hw, NO_VIRTUAL_MONITOR))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			break;</div><div class='del'>-		case NL80211_IFTYPE_AP_VLAN:</div><div class='del'>-			continue;</div><div class='ctx'> 		case NL80211_IFTYPE_AP:</div><div class='ctx'> 		case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		case NL80211_IFTYPE_WDS:</div><div class='ctx'> 		case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 		case NL80211_IFTYPE_OCB:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			WARN_ON_ONCE(1);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iter.iftype == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+			rx_chains_dynamic = rx_chains_static = local-&gt;rx_chains;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (sdata-&gt;smps_mode) {</div><div class='add'>+		switch (iter.link-&gt;smps_mode) {</div><div class='ctx'> 		default:</div><div class='ctx'> 			WARN_ONCE(1, "Invalid SMPS mode %d\n",</div><div class='del'>-				  sdata-&gt;smps_mode);</div><div class='del'>-			/* fall through */</div><div class='add'>+				  iter.link-&gt;smps_mode);</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case IEEE80211_SMPS_OFF:</div><div class='del'>-			needed_static = sdata-&gt;needed_rx_chains;</div><div class='del'>-			needed_dynamic = sdata-&gt;needed_rx_chains;</div><div class='add'>+			needed_static = iter.link-&gt;needed_rx_chains;</div><div class='add'>+			needed_dynamic = iter.link-&gt;needed_rx_chains;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_SMPS_DYNAMIC:</div><div class='ctx'> 			needed_static = 1;</div><div class='del'>-			needed_dynamic = sdata-&gt;needed_rx_chains;</div><div class='add'>+			needed_dynamic = iter.link-&gt;needed_rx_chains;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_SMPS_STATIC:</div><div class='ctx'> 			needed_static = 1;</div><div class='hunk'>@@ -761,23 +1145,11 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Disable SMPS for the monitor interface */</div><div class='del'>-	sdata = rcu_dereference(local-&gt;monitor_sdata);</div><div class='add'>+	sdata = wiphy_dereference(local-&gt;hw.wiphy, local-&gt;monitor_sdata);</div><div class='ctx'> 	if (sdata &amp;&amp;</div><div class='del'>-	    rcu_access_pointer(sdata-&gt;vif.chanctx_conf) == &amp;chanctx-&gt;conf)</div><div class='add'>+	    rcu_access_pointer(sdata-&gt;vif.bss_conf.chanctx_conf) == &amp;chanctx-&gt;conf)</div><div class='ctx'> 		rx_chains_dynamic = rx_chains_static = local-&gt;rx_chains;</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;use_chanctx) {</div><div class='del'>-		if (rx_chains_static &gt; 1)</div><div class='del'>-			local-&gt;smps_mode = IEEE80211_SMPS_OFF;</div><div class='del'>-		else if (rx_chains_dynamic &gt; 1)</div><div class='del'>-			local-&gt;smps_mode = IEEE80211_SMPS_DYNAMIC;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;smps_mode = IEEE80211_SMPS_STATIC;</div><div class='del'>-		ieee80211_hw_config(local, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (rx_chains_static == chanctx-&gt;conf.rx_chains_static &amp;&amp;</div><div class='ctx'> 	    rx_chains_dynamic == chanctx-&gt;conf.rx_chains_dynamic)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -788,9 +1160,12 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-__ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				      bool clear)</div><div class='add'>+__ieee80211_link_copy_chanctx_to_vlans(struct ieee80211_link_data *link,</div><div class='add'>+				       bool clear)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	unsigned int link_id = link-&gt;link_id;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='ctx'> 	struct ieee80211_local *local __maybe_unused = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_sub_if_data *vlan;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='hunk'>@@ -798,7 +1173,7 @@ __ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	if (WARN_ON(sdata-&gt;vif.type != NL80211_IFTYPE_AP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	/* Check that conf exists, even when clearing this function</div><div class='ctx'> 	 * must be called with the AP's channel context still there</div><div class='hunk'>@@ -806,45 +1181,51 @@ __ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	 * channel context pointer for a while, possibly pointing</div><div class='ctx'> 	 * to a channel context that has already been freed.</div><div class='ctx'> 	 */</div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='add'>+	conf = rcu_dereference_protected(link_conf-&gt;chanctx_conf,</div><div class='add'>+					 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='ctx'> 	WARN_ON(!conf);</div><div class='ctx'> </div><div class='ctx'> 	if (clear)</div><div class='ctx'> 		conf = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list)</div><div class='del'>-		rcu_assign_pointer(vlan-&gt;vif.chanctx_conf, conf);</div><div class='add'>+	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list) {</div><div class='add'>+		struct ieee80211_bss_conf *vlan_conf;</div><div class='add'>+</div><div class='add'>+		vlan_conf = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+					      vlan-&gt;vif.link_conf[link_id]);</div><div class='add'>+		if (WARN_ON(!vlan_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(vlan_conf-&gt;chanctx_conf, conf);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-					 bool clear)</div><div class='add'>+void ieee80211_link_copy_chanctx_to_vlans(struct ieee80211_link_data *link,</div><div class='add'>+					  bool clear)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_local *local = link-&gt;sdata-&gt;local;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	__ieee80211_vif_copy_chanctx_to_vlans(sdata, clear);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	__ieee80211_link_copy_chanctx_to_vlans(link, clear);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+void ieee80211_link_unreserve_chanctx(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_chanctx *ctx = sdata-&gt;reserved_chanctx;</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_chanctx *ctx = link-&gt;reserved_chanctx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!ctx))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;sdata-&gt;reserved_chanctx_list);</div><div class='del'>-	sdata-&gt;reserved_chanctx = NULL;</div><div class='add'>+	link-&gt;reserved_chanctx = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_chanctx_refcount(sdata-&gt;local, ctx) == 0) {</div><div class='ctx'> 		if (ctx-&gt;replace_state == IEEE80211_CHANCTX_REPLACES_OTHER) {</div><div class='ctx'> 			if (WARN_ON(!ctx-&gt;replace_ctx))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+				return;</div><div class='ctx'> </div><div class='ctx'> 			WARN_ON(ctx-&gt;replace_ctx-&gt;replace_state !=</div><div class='ctx'> 			        IEEE80211_CHANCTX_WILL_BE_REPLACED);</div><div class='hunk'>@@ -857,123 +1238,170 @@ int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 			list_del_rcu(&amp;ctx-&gt;list);</div><div class='ctx'> 			kfree_rcu(ctx, rcu_head);</div><div class='ctx'> 		} else {</div><div class='del'>-			ieee80211_free_chanctx(sdata-&gt;local, ctx);</div><div class='add'>+			ieee80211_free_chanctx(sdata-&gt;local, ctx, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				  const struct cfg80211_chan_def *chandef,</div><div class='del'>-				  enum ieee80211_chanctx_mode mode,</div><div class='del'>-				  bool radar_required)</div><div class='add'>+static struct ieee80211_chanctx *</div><div class='add'>+ieee80211_replace_chanctx(struct ieee80211_local *local,</div><div class='add'>+			  const struct ieee80211_chan_req *chanreq,</div><div class='add'>+			  enum ieee80211_chanctx_mode mode,</div><div class='add'>+			  struct ieee80211_chanctx *curr_ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	struct ieee80211_chanctx *new_ctx, *curr_ctx, *ctx;</div><div class='add'>+	struct ieee80211_chanctx *new_ctx, *ctx;</div><div class='add'>+	struct wiphy *wiphy = local-&gt;hw.wiphy;</div><div class='add'>+	const struct wiphy_radio *radio;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	if (!curr_ctx ||</div><div class='add'>+	    curr_ctx-&gt;replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED ||</div><div class='add'>+	    ieee80211_chanctx_num_reserved(local, curr_ctx) != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Another link already requested this context for a</div><div class='add'>+		 * reservation. Find another one hoping all links assigned</div><div class='add'>+		 * to it will also switch soon enough.</div><div class='add'>+		 *</div><div class='add'>+		 * TODO: This needs a little more work as some cases</div><div class='add'>+		 * (more than 2 chanctx capable devices) may fail which could</div><div class='add'>+		 * otherwise succeed provided some channel context juggling was</div><div class='add'>+		 * performed.</div><div class='add'>+		 *</div><div class='add'>+		 * Consider ctx1..3, link1..6, each ctx has 2 links. link1 and</div><div class='add'>+		 * link2 from ctx1 request new different chandefs starting 2</div><div class='add'>+		 * in-place reservations with ctx4 and ctx5 replacing ctx1 and</div><div class='add'>+		 * ctx2 respectively. Next link5 and link6 from ctx3 reserve</div><div class='add'>+		 * ctx4. If link3 and link4 remain on ctx2 as they are then this</div><div class='add'>+		 * fails unless `replace_ctx` from ctx5 is replaced with ctx3.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+			if (ctx-&gt;replace_state !=</div><div class='add'>+			    IEEE80211_CHANCTX_REPLACE_NONE)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-	curr_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='del'>-	if (curr_ctx &amp;&amp; local-&gt;use_chanctx &amp;&amp; !local-&gt;ops-&gt;switch_vif_chanctx)</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+			if (ieee80211_chanctx_num_reserved(local, ctx) != 0)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-	new_ctx = ieee80211_find_reservation_chanctx(local, chandef, mode);</div><div class='del'>-	if (!new_ctx) {</div><div class='del'>-		if (ieee80211_can_create_new_chanctx(local)) {</div><div class='del'>-			new_ctx = ieee80211_new_chanctx(local, chandef, mode);</div><div class='del'>-			if (IS_ERR(new_ctx))</div><div class='del'>-				return PTR_ERR(new_ctx);</div><div class='del'>-		} else {</div><div class='del'>-			if (!curr_ctx ||</div><div class='del'>-			    (curr_ctx-&gt;replace_state ==</div><div class='del'>-			     IEEE80211_CHANCTX_WILL_BE_REPLACED) ||</div><div class='del'>-			    !list_empty(&amp;curr_ctx-&gt;reserved_vifs)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Another vif already requested this context</div><div class='del'>-				 * for a reservation. Find another one hoping</div><div class='del'>-				 * all vifs assigned to it will also switch</div><div class='del'>-				 * soon enough.</div><div class='del'>-				 *</div><div class='del'>-				 * TODO: This needs a little more work as some</div><div class='del'>-				 * cases (more than 2 chanctx capable devices)</div><div class='del'>-				 * may fail which could otherwise succeed</div><div class='del'>-				 * provided some channel context juggling was</div><div class='del'>-				 * performed.</div><div class='del'>-				 *</div><div class='del'>-				 * Consider ctx1..3, vif1..6, each ctx has 2</div><div class='del'>-				 * vifs. vif1 and vif2 from ctx1 request new</div><div class='del'>-				 * different chandefs starting 2 in-place</div><div class='del'>-				 * reserations with ctx4 and ctx5 replacing</div><div class='del'>-				 * ctx1 and ctx2 respectively. Next vif5 and</div><div class='del'>-				 * vif6 from ctx3 reserve ctx4. If vif3 and</div><div class='del'>-				 * vif4 remain on ctx2 as they are then this</div><div class='del'>-				 * fails unless `replace_ctx` from ctx5 is</div><div class='del'>-				 * replaced with ctx3.</div><div class='del'>-				 */</div><div class='del'>-				list_for_each_entry(ctx, &amp;local-&gt;chanctx_list,</div><div class='del'>-						    list) {</div><div class='del'>-					if (ctx-&gt;replace_state !=</div><div class='del'>-					    IEEE80211_CHANCTX_REPLACE_NONE)</div><div class='del'>-						continue;</div><div class='del'>-</div><div class='del'>-					if (!list_empty(&amp;ctx-&gt;reserved_vifs))</div><div class='del'>-						continue;</div><div class='del'>-</div><div class='del'>-					curr_ctx = ctx;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+			if (ctx-&gt;conf.radio_idx &gt;= 0) {</div><div class='add'>+				radio = &amp;wiphy-&gt;radio[ctx-&gt;conf.radio_idx];</div><div class='add'>+				if (!cfg80211_radio_chandef_valid(radio, &amp;chanreq-&gt;oper))</div><div class='add'>+					continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * If that's true then all available contexts already</div><div class='del'>-			 * have reservations and cannot be used.</div><div class='del'>-			 */</div><div class='del'>-			if (!curr_ctx ||</div><div class='del'>-			    (curr_ctx-&gt;replace_state ==</div><div class='del'>-			     IEEE80211_CHANCTX_WILL_BE_REPLACED) ||</div><div class='del'>-			    !list_empty(&amp;curr_ctx-&gt;reserved_vifs))</div><div class='del'>-				return -EBUSY;</div><div class='add'>+			curr_ctx = ctx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			new_ctx = ieee80211_alloc_chanctx(local, chandef, mode);</div><div class='del'>-			if (!new_ctx)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+	/*</div><div class='add'>+	 * If that's true then all available contexts already have reservations</div><div class='add'>+	 * and cannot be used.</div><div class='add'>+	 */</div><div class='add'>+	if (!curr_ctx ||</div><div class='add'>+	    curr_ctx-&gt;replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED ||</div><div class='add'>+	    ieee80211_chanctx_num_reserved(local, curr_ctx) != 0)</div><div class='add'>+		return ERR_PTR(-EBUSY);</div><div class='ctx'> </div><div class='del'>-			new_ctx-&gt;replace_ctx = curr_ctx;</div><div class='del'>-			new_ctx-&gt;replace_state =</div><div class='del'>-					IEEE80211_CHANCTX_REPLACES_OTHER;</div><div class='add'>+	new_ctx = ieee80211_alloc_chanctx(local, chanreq, mode, -1);</div><div class='add'>+	if (!new_ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-			curr_ctx-&gt;replace_ctx = new_ctx;</div><div class='del'>-			curr_ctx-&gt;replace_state =</div><div class='del'>-					IEEE80211_CHANCTX_WILL_BE_REPLACED;</div><div class='add'>+	new_ctx-&gt;replace_ctx = curr_ctx;</div><div class='add'>+	new_ctx-&gt;replace_state = IEEE80211_CHANCTX_REPLACES_OTHER;</div><div class='ctx'> </div><div class='del'>-			list_add_rcu(&amp;new_ctx-&gt;list, &amp;local-&gt;chanctx_list);</div><div class='del'>-		}</div><div class='add'>+	curr_ctx-&gt;replace_ctx = new_ctx;</div><div class='add'>+	curr_ctx-&gt;replace_state = IEEE80211_CHANCTX_WILL_BE_REPLACED;</div><div class='add'>+</div><div class='add'>+	list_add_rcu(&amp;new_ctx-&gt;list, &amp;local-&gt;chanctx_list);</div><div class='add'>+</div><div class='add'>+	return new_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ieee80211_find_available_radio(struct ieee80211_local *local,</div><div class='add'>+			       const struct ieee80211_chan_req *chanreq,</div><div class='add'>+			       u32 radio_mask, int *radio_idx)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = local-&gt;hw.wiphy;</div><div class='add'>+	const struct wiphy_radio *radio;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*radio_idx = -1;</div><div class='add'>+	if (!wiphy-&gt;n_radio)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wiphy-&gt;n_radio; i++) {</div><div class='add'>+		if (!(radio_mask &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		radio = &amp;wiphy-&gt;radio[i];</div><div class='add'>+		if (!cfg80211_radio_chandef_valid(radio, &amp;chanreq-&gt;oper))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_can_create_new_chanctx(local, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		*radio_idx = i;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;sdata-&gt;reserved_chanctx_list, &amp;new_ctx-&gt;reserved_vifs);</div><div class='del'>-	sdata-&gt;reserved_chanctx = new_ctx;</div><div class='del'>-	sdata-&gt;reserved_chandef = *chandef;</div><div class='del'>-	sdata-&gt;reserved_radar_required = radar_required;</div><div class='del'>-	sdata-&gt;reserved_ready = false;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ieee80211_link_reserve_chanctx(struct ieee80211_link_data *link,</div><div class='add'>+				   const struct ieee80211_chan_req *chanreq,</div><div class='add'>+				   enum ieee80211_chanctx_mode mode,</div><div class='add'>+				   bool radar_required)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_local *local = sdata-&gt;local;</div><div class='add'>+	struct ieee80211_chanctx *new_ctx, *curr_ctx;</div><div class='add'>+	int radio_idx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	curr_ctx = ieee80211_link_get_chanctx(link);</div><div class='add'>+	if (curr_ctx &amp;&amp; !local-&gt;ops-&gt;switch_vif_chanctx)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	new_ctx = ieee80211_find_reservation_chanctx(local, chanreq, mode);</div><div class='add'>+	if (!new_ctx) {</div><div class='add'>+		if (ieee80211_can_create_new_chanctx(local, -1) &amp;&amp;</div><div class='add'>+		    ieee80211_find_available_radio(local, chanreq,</div><div class='add'>+						   sdata-&gt;wdev.radio_mask,</div><div class='add'>+						   &amp;radio_idx))</div><div class='add'>+			new_ctx = ieee80211_new_chanctx(local, chanreq, mode,</div><div class='add'>+							false, radio_idx);</div><div class='add'>+		else</div><div class='add'>+			new_ctx = ieee80211_replace_chanctx(local, chanreq,</div><div class='add'>+							    mode, curr_ctx);</div><div class='add'>+		if (IS_ERR(new_ctx))</div><div class='add'>+			return PTR_ERR(new_ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link-&gt;reserved_chanctx = new_ctx;</div><div class='add'>+	link-&gt;reserved = *chanreq;</div><div class='add'>+	link-&gt;reserved_radar_required = radar_required;</div><div class='add'>+	link-&gt;reserved_ready = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_link_chanctx_reservation_complete(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+</div><div class='ctx'> 	switch (sdata-&gt;vif.type) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 	case NL80211_IFTYPE_OCB:</div><div class='del'>-		ieee80211_queue_work(&amp;sdata-&gt;local-&gt;hw,</div><div class='del'>-				     &amp;sdata-&gt;csa_finalize_work);</div><div class='add'>+		wiphy_work_queue(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+				 &amp;link-&gt;csa.finalize_work);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		ieee80211_queue_work(&amp;sdata-&gt;local-&gt;hw,</div><div class='del'>-				     &amp;sdata-&gt;u.mgd.chswitch_work);</div><div class='add'>+		wiphy_hrtimer_work_queue(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					 &amp;link-&gt;u.mgd.csa.switch_work, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='ctx'> 	case NL80211_IFTYPE_AP_VLAN:</div><div class='hunk'>@@ -990,37 +1418,49 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ieee80211_vif_update_chandef(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-			     const struct cfg80211_chan_def *chandef)</div><div class='add'>+ieee80211_link_update_chanreq(struct ieee80211_link_data *link,</div><div class='add'>+			      const struct ieee80211_chan_req *chanreq)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	unsigned int link_id = link-&gt;link_id;</div><div class='ctx'> 	struct ieee80211_sub_if_data *vlan;</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;vif.bss_conf.chandef = *chandef;</div><div class='add'>+	link-&gt;conf-&gt;chanreq = *chanreq;</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type != NL80211_IFTYPE_AP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list)</div><div class='del'>-		vlan-&gt;vif.bss_conf.chandef = *chandef;</div><div class='add'>+	list_for_each_entry(vlan, &amp;sdata-&gt;u.ap.vlans, u.vlan.list) {</div><div class='add'>+		struct ieee80211_bss_conf *vlan_conf;</div><div class='add'>+</div><div class='add'>+		vlan_conf = wiphy_dereference(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					      vlan-&gt;vif.link_conf[link_id]);</div><div class='add'>+		if (WARN_ON(!vlan_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		vlan_conf-&gt;chanreq = *chanreq;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_link_use_reserved_reassign(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_vif_chanctx_switch vif_chsw[1] = {};</div><div class='ctx'> 	struct ieee80211_chanctx *old_ctx, *new_ctx;</div><div class='del'>-	const struct cfg80211_chan_def *chandef;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	const struct ieee80211_chan_req *chanreq;</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='add'>+	u64 changed = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	new_ctx = sdata-&gt;reserved_chanctx;</div><div class='del'>-	old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='add'>+	new_ctx = link-&gt;reserved_chanctx;</div><div class='add'>+	old_ctx = ieee80211_link_get_chanctx(link);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!sdata-&gt;reserved_ready))</div><div class='add'>+	if (WARN_ON(!link-&gt;reserved_ready))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!new_ctx))</div><div class='hunk'>@@ -1033,69 +1473,72 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 		    IEEE80211_CHANCTX_REPLACES_OTHER))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	chandef = ieee80211_chanctx_non_reserved_chandef(local, new_ctx,</div><div class='del'>-				&amp;sdata-&gt;reserved_chandef);</div><div class='del'>-	if (WARN_ON(!chandef))</div><div class='add'>+	chanreq = ieee80211_chanctx_non_reserved_chandef(local, new_ctx,</div><div class='add'>+							 &amp;link-&gt;reserved,</div><div class='add'>+							 &amp;tmp);</div><div class='add'>+	if (WARN_ON(!chanreq))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ieee80211_change_chanctx(local, new_ctx, chandef);</div><div class='add'>+	if (link_conf-&gt;chanreq.oper.width != link-&gt;reserved.oper.width)</div><div class='add'>+		changed = BSS_CHANGED_BANDWIDTH;</div><div class='add'>+</div><div class='add'>+	ieee80211_link_update_chanreq(link, &amp;link-&gt;reserved);</div><div class='add'>+</div><div class='add'>+	_ieee80211_change_chanctx(local, new_ctx, old_ctx, chanreq, link);</div><div class='ctx'> </div><div class='ctx'> 	vif_chsw[0].vif = &amp;sdata-&gt;vif;</div><div class='ctx'> 	vif_chsw[0].old_ctx = &amp;old_ctx-&gt;conf;</div><div class='ctx'> 	vif_chsw[0].new_ctx = &amp;new_ctx-&gt;conf;</div><div class='add'>+	vif_chsw[0].link_conf = link-&gt;conf;</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;sdata-&gt;reserved_chanctx_list);</div><div class='del'>-	sdata-&gt;reserved_chanctx = NULL;</div><div class='add'>+	link-&gt;reserved_chanctx = NULL;</div><div class='ctx'> </div><div class='ctx'> 	err = drv_switch_vif_chanctx(local, vif_chsw, 1,</div><div class='ctx'> 				     CHANCTX_SWMODE_REASSIGN_VIF);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (ieee80211_chanctx_refcount(local, new_ctx) == 0)</div><div class='del'>-			ieee80211_free_chanctx(local, new_ctx);</div><div class='add'>+			ieee80211_free_chanctx(local, new_ctx, false);</div><div class='ctx'> </div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_move(&amp;sdata-&gt;assigned_chanctx_list, &amp;new_ctx-&gt;assigned_vifs);</div><div class='del'>-	rcu_assign_pointer(sdata-&gt;vif.chanctx_conf, &amp;new_ctx-&gt;conf);</div><div class='add'>+	link-&gt;radar_required = link-&gt;reserved_radar_required;</div><div class='add'>+	rcu_assign_pointer(link_conf-&gt;chanctx_conf, &amp;new_ctx-&gt;conf);</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP)</div><div class='del'>-		__ieee80211_vif_copy_chanctx_to_vlans(sdata, false);</div><div class='add'>+		__ieee80211_link_copy_chanctx_to_vlans(link, false);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_check_fast_xmit_iface(sdata);</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_chanctx_refcount(local, old_ctx) == 0)</div><div class='del'>-		ieee80211_free_chanctx(local, old_ctx);</div><div class='del'>-</div><div class='del'>-	if (sdata-&gt;vif.bss_conf.chandef.width != sdata-&gt;reserved_chandef.width)</div><div class='del'>-		changed = BSS_CHANGED_BANDWIDTH;</div><div class='del'>-</div><div class='del'>-	ieee80211_vif_update_chandef(sdata, &amp;sdata-&gt;reserved_chandef);</div><div class='add'>+		ieee80211_free_chanctx(local, old_ctx, false);</div><div class='ctx'> </div><div class='add'>+	ieee80211_recalc_chanctx_min_def(local, new_ctx);</div><div class='ctx'> 	ieee80211_recalc_smps_chanctx(local, new_ctx);</div><div class='ctx'> 	ieee80211_recalc_radar_chanctx(local, new_ctx);</div><div class='del'>-	ieee80211_recalc_chanctx_min_def(local, new_ctx);</div><div class='ctx'> </div><div class='ctx'> 	if (changed)</div><div class='del'>-		ieee80211_bss_info_change_notify(sdata, changed);</div><div class='add'>+		ieee80211_link_info_change_notify(sdata, link, changed);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ieee80211_vif_chanctx_reservation_complete(sdata);</div><div class='add'>+	ieee80211_link_chanctx_reservation_complete(link);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ieee80211_vif_use_reserved_assign(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_link_use_reserved_assign(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx *old_ctx, *new_ctx;</div><div class='del'>-	const struct cfg80211_chan_def *chandef;</div><div class='add'>+	const struct ieee80211_chan_req *chanreq;</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='del'>-	new_ctx = sdata-&gt;reserved_chanctx;</div><div class='add'>+	old_ctx = ieee80211_link_get_chanctx(link);</div><div class='add'>+	new_ctx = link-&gt;reserved_chanctx;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!sdata-&gt;reserved_ready))</div><div class='add'>+	if (WARN_ON(!link-&gt;reserved_ready))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(old_ctx))</div><div class='hunk'>@@ -1108,38 +1551,39 @@ ieee80211_vif_use_reserved_assign(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 		    IEEE80211_CHANCTX_REPLACES_OTHER))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	chandef = ieee80211_chanctx_non_reserved_chandef(local, new_ctx,</div><div class='del'>-				&amp;sdata-&gt;reserved_chandef);</div><div class='del'>-	if (WARN_ON(!chandef))</div><div class='add'>+	chanreq = ieee80211_chanctx_non_reserved_chandef(local, new_ctx,</div><div class='add'>+							 &amp;link-&gt;reserved,</div><div class='add'>+							 &amp;tmp);</div><div class='add'>+	if (WARN_ON(!chanreq))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ieee80211_change_chanctx(local, new_ctx, chandef);</div><div class='add'>+	ieee80211_change_chanctx(local, new_ctx, new_ctx, chanreq);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;sdata-&gt;reserved_chanctx_list);</div><div class='del'>-	sdata-&gt;reserved_chanctx = NULL;</div><div class='add'>+	link-&gt;reserved_chanctx = NULL;</div><div class='ctx'> </div><div class='del'>-	err = ieee80211_assign_vif_chanctx(sdata, new_ctx);</div><div class='add'>+	err = ieee80211_assign_link_chanctx(link, new_ctx, false);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (ieee80211_chanctx_refcount(local, new_ctx) == 0)</div><div class='del'>-			ieee80211_free_chanctx(local, new_ctx);</div><div class='add'>+			ieee80211_free_chanctx(local, new_ctx, false);</div><div class='ctx'> </div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ieee80211_vif_chanctx_reservation_complete(sdata);</div><div class='add'>+	ieee80211_link_chanctx_reservation_complete(link);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-ieee80211_vif_has_in_place_reservation(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+ieee80211_link_has_in_place_reservation(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_chanctx *old_ctx, *new_ctx;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	new_ctx = sdata-&gt;reserved_chanctx;</div><div class='del'>-	old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='add'>+	new_ctx = link-&gt;reserved_chanctx;</div><div class='add'>+	old_ctx = ieee80211_link_get_chanctx(link);</div><div class='ctx'> </div><div class='ctx'> 	if (!old_ctx)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1156,35 +1600,14 @@ ieee80211_vif_has_in_place_reservation(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ieee80211_chsw_switch_hwconf(struct ieee80211_local *local,</div><div class='del'>-					struct ieee80211_chanctx *new_ctx)</div><div class='del'>-{</div><div class='del'>-	const struct cfg80211_chan_def *chandef;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-</div><div class='del'>-	chandef = ieee80211_chanctx_reserved_chandef(local, new_ctx, NULL);</div><div class='del'>-	if (WARN_ON(!chandef))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	local-&gt;hw.conf.radar_enabled = new_ctx-&gt;conf.radar_enabled;</div><div class='del'>-	local-&gt;_oper_chandef = *chandef;</div><div class='del'>-	ieee80211_hw_config(local, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ieee80211_chsw_switch_vifs(struct ieee80211_local *local,</div><div class='ctx'> 				      int n_vifs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_vif_chanctx_switch *vif_chsw;</div><div class='del'>-	struct ieee80211_sub_if_data *sdata;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx, *old_ctx;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	vif_chsw = kcalloc(n_vifs, sizeof(vif_chsw[0]), GFP_KERNEL);</div><div class='ctx'> 	if (!vif_chsw)</div><div class='hunk'>@@ -1192,6 +1615,8 @@ static int ieee80211_chsw_switch_vifs(struct ieee80211_local *local,</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1200,16 +1625,15 @@ static int ieee80211_chsw_switch_vifs(struct ieee80211_local *local,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(sdata, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-				    reserved_chanctx_list) {</div><div class='del'>-			if (!ieee80211_vif_has_in_place_reservation(</div><div class='del'>-					sdata))</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			if (!ieee80211_link_has_in_place_reservation(iter.link))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='del'>-			vif_chsw[i].vif = &amp;sdata-&gt;vif;</div><div class='add'>+			old_ctx = ieee80211_link_get_chanctx(iter.link);</div><div class='add'>+			vif_chsw[i].vif = &amp;iter.sdata-&gt;vif;</div><div class='ctx'> 			vif_chsw[i].old_ctx = &amp;old_ctx-&gt;conf;</div><div class='ctx'> 			vif_chsw[i].new_ctx = &amp;ctx-&gt;conf;</div><div class='add'>+			vif_chsw[i].link_conf = iter.link-&gt;conf;</div><div class='ctx'> </div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1228,17 +1652,16 @@ static int ieee80211_chsw_switch_ctxs(struct ieee80211_local *local)</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!list_empty(&amp;ctx-&gt;replace_ctx-&gt;assigned_vifs))</div><div class='add'>+		if (ieee80211_chanctx_num_assigned(local, ctx) != 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ieee80211_del_chanctx(local, ctx-&gt;replace_ctx);</div><div class='add'>+		ieee80211_del_chanctx(local, ctx-&gt;replace_ctx, false);</div><div class='ctx'> 		err = ieee80211_add_chanctx(local, ctx);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -1252,10 +1675,10 @@ err:</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!list_empty(&amp;ctx-&gt;replace_ctx-&gt;assigned_vifs))</div><div class='add'>+		if (ieee80211_chanctx_num_assigned(local, ctx) != 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ieee80211_del_chanctx(local, ctx);</div><div class='add'>+		ieee80211_del_chanctx(local, ctx, false);</div><div class='ctx'> 		WARN_ON(ieee80211_add_chanctx(local, ctx-&gt;replace_ctx));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1264,14 +1687,11 @@ err:</div><div class='ctx'> </div><div class='ctx'> static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sub_if_data *sdata, *sdata_tmp;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx, *ctx_tmp, *old_ctx;</div><div class='del'>-	struct ieee80211_chanctx *new_ctx = NULL;</div><div class='ctx'> 	int err, n_assigned, n_reserved, n_ready;</div><div class='ctx'> 	int n_ctx = 0, n_vifs_switch = 0, n_vifs_assign = 0, n_vifs_ctxless = 0;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there are 2 independent pairs of channel contexts performing</div><div class='hunk'>@@ -1290,6 +1710,8 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1298,21 +1720,17 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!local-&gt;use_chanctx)</div><div class='del'>-			new_ctx = ctx;</div><div class='del'>-</div><div class='ctx'> 		n_ctx++;</div><div class='ctx'> </div><div class='ctx'> 		n_assigned = 0;</div><div class='ctx'> 		n_reserved = 0;</div><div class='ctx'> 		n_ready = 0;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(sdata, &amp;ctx-&gt;replace_ctx-&gt;assigned_vifs,</div><div class='del'>-				    assigned_chanctx_list) {</div><div class='add'>+		for_each_chanctx_user_assigned(local, ctx-&gt;replace_ctx, &amp;iter) {</div><div class='ctx'> 			n_assigned++;</div><div class='del'>-			if (sdata-&gt;reserved_chanctx) {</div><div class='add'>+			if (iter.link-&gt;reserved_chanctx) {</div><div class='ctx'> 				n_reserved++;</div><div class='del'>-				if (sdata-&gt;reserved_ready)</div><div class='add'>+				if (iter.link-&gt;reserved_ready)</div><div class='ctx'> 					n_ready++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1329,13 +1747,12 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ctx-&gt;conf.radar_enabled = false;</div><div class='del'>-		list_for_each_entry(sdata, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-				    reserved_chanctx_list) {</div><div class='del'>-			if (ieee80211_vif_has_in_place_reservation(sdata) &amp;&amp;</div><div class='del'>-			    !sdata-&gt;reserved_ready)</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			if (ieee80211_link_has_in_place_reservation(iter.link) &amp;&amp;</div><div class='add'>+			    !iter.link-&gt;reserved_ready)</div><div class='ctx'> 				return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-			old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='add'>+			old_ctx = ieee80211_link_get_chanctx(iter.link);</div><div class='ctx'> 			if (old_ctx) {</div><div class='ctx'> 				if (old_ctx-&gt;replace_state ==</div><div class='ctx'> 				    IEEE80211_CHANCTX_WILL_BE_REPLACED)</div><div class='hunk'>@@ -1346,7 +1763,7 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 				n_vifs_ctxless++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (sdata-&gt;reserved_radar_required)</div><div class='add'>+			if (iter.radar_required)</div><div class='ctx'> 				ctx-&gt;conf.radar_enabled = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1354,32 +1771,48 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 	if (WARN_ON(n_ctx == 0) ||</div><div class='ctx'> 	    WARN_ON(n_vifs_switch == 0 &amp;&amp;</div><div class='ctx'> 		    n_vifs_assign == 0 &amp;&amp;</div><div class='del'>-		    n_vifs_ctxless == 0) ||</div><div class='del'>-	    WARN_ON(n_ctx &gt; 1 &amp;&amp; !local-&gt;use_chanctx) ||</div><div class='del'>-	    WARN_ON(!new_ctx &amp;&amp; !local-&gt;use_chanctx)) {</div><div class='add'>+		    n_vifs_ctxless == 0)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* update station rate control and min width before switch */</div><div class='add'>+	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!ctx-&gt;replace_ctx)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			if (!ieee80211_link_has_in_place_reservation(iter.link))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ieee80211_chan_bw_change(local,</div><div class='add'>+						 ieee80211_link_get_chanctx(iter.link),</div><div class='add'>+						 true, true);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_ieee80211_recalc_chanctx_min_def(local, ctx, NULL, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All necessary vifs are ready. Perform the switch now depending on</div><div class='ctx'> 	 * reservations and driver capabilities.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (local-&gt;use_chanctx) {</div><div class='del'>-		if (n_vifs_switch &gt; 0) {</div><div class='del'>-			err = ieee80211_chsw_switch_vifs(local, n_vifs_switch);</div><div class='del'>-			if (err)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='add'>+	if (n_vifs_switch &gt; 0) {</div><div class='add'>+		err = ieee80211_chsw_switch_vifs(local, n_vifs_switch);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (n_vifs_assign &gt; 0 || n_vifs_ctxless &gt; 0) {</div><div class='del'>-			err = ieee80211_chsw_switch_ctxs(local);</div><div class='del'>-			if (err)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		err = ieee80211_chsw_switch_hwconf(local, new_ctx);</div><div class='add'>+	if (n_vifs_assign &gt; 0 || n_vifs_ctxless &gt; 0) {</div><div class='add'>+		err = ieee80211_chsw_switch_ctxs(local);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1389,6 +1822,8 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 	 * context(s).</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1397,33 +1832,36 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(sdata, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-				    reserved_chanctx_list) {</div><div class='del'>-			u32 changed = 0;</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			struct ieee80211_link_data *link = iter.link;</div><div class='add'>+			struct ieee80211_sub_if_data *sdata = iter.sdata;</div><div class='add'>+			struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='add'>+			u64 changed = 0;</div><div class='ctx'> </div><div class='del'>-			if (!ieee80211_vif_has_in_place_reservation(sdata))</div><div class='add'>+			if (!ieee80211_link_has_in_place_reservation(link))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			rcu_assign_pointer(sdata-&gt;vif.chanctx_conf, &amp;ctx-&gt;conf);</div><div class='add'>+			rcu_assign_pointer(link_conf-&gt;chanctx_conf,</div><div class='add'>+					   &amp;ctx-&gt;conf);</div><div class='ctx'> </div><div class='ctx'> 			if (sdata-&gt;vif.type == NL80211_IFTYPE_AP)</div><div class='del'>-				__ieee80211_vif_copy_chanctx_to_vlans(sdata,</div><div class='del'>-								      false);</div><div class='add'>+				__ieee80211_link_copy_chanctx_to_vlans(link,</div><div class='add'>+								       false);</div><div class='ctx'> </div><div class='ctx'> 			ieee80211_check_fast_xmit_iface(sdata);</div><div class='ctx'> </div><div class='del'>-			sdata-&gt;radar_required = sdata-&gt;reserved_radar_required;</div><div class='add'>+			link-&gt;radar_required = iter.radar_required;</div><div class='ctx'> </div><div class='del'>-			if (sdata-&gt;vif.bss_conf.chandef.width !=</div><div class='del'>-			    sdata-&gt;reserved_chandef.width)</div><div class='add'>+			if (link_conf-&gt;chanreq.oper.width != iter.chanreq-&gt;oper.width)</div><div class='ctx'> 				changed = BSS_CHANGED_BANDWIDTH;</div><div class='ctx'> </div><div class='del'>-			ieee80211_vif_update_chandef(sdata, &amp;sdata-&gt;reserved_chandef);</div><div class='add'>+			ieee80211_link_update_chanreq(link, &amp;link-&gt;reserved);</div><div class='ctx'> 			if (changed)</div><div class='del'>-				ieee80211_bss_info_change_notify(sdata,</div><div class='del'>-								 changed);</div><div class='add'>+				ieee80211_link_info_change_notify(sdata,</div><div class='add'>+								  link,</div><div class='add'>+								  changed);</div><div class='ctx'> </div><div class='del'>-			ieee80211_recalc_txpower(sdata, false);</div><div class='add'>+			ieee80211_recalc_txpower(link, false);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_recalc_chanctx_chantype(local, ctx);</div><div class='hunk'>@@ -1431,17 +1869,14 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 		ieee80211_recalc_radar_chanctx(local, ctx);</div><div class='ctx'> 		ieee80211_recalc_chanctx_min_def(local, ctx);</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(sdata, sdata_tmp, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-					 reserved_chanctx_list) {</div><div class='del'>-			if (ieee80211_vif_get_chanctx(sdata) != ctx)</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			if (ieee80211_link_get_chanctx(iter.link) != ctx)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			list_del(&amp;sdata-&gt;reserved_chanctx_list);</div><div class='del'>-			list_move(&amp;sdata-&gt;assigned_chanctx_list,</div><div class='del'>-				  &amp;ctx-&gt;assigned_vifs);</div><div class='del'>-			sdata-&gt;reserved_chanctx = NULL;</div><div class='add'>+			iter.link-&gt;reserved_chanctx = NULL;</div><div class='ctx'> </div><div class='del'>-			ieee80211_vif_chanctx_reservation_complete(sdata);</div><div class='add'>+			ieee80211_link_chanctx_reservation_complete(iter.link);</div><div class='add'>+			ieee80211_chan_bw_change(local, ctx, false, false);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1451,31 +1886,27 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> 		 * reservation for originally requested interface has already</div><div class='ctx'> 		 * succeeded at this point.</div><div class='ctx'> 		 */</div><div class='del'>-		list_for_each_entry_safe(sdata, sdata_tmp, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-					 reserved_chanctx_list) {</div><div class='del'>-			if (WARN_ON(ieee80211_vif_has_in_place_reservation(</div><div class='del'>-					sdata)))</div><div class='del'>-				continue;</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			struct ieee80211_link_data *link = iter.link;</div><div class='ctx'> </div><div class='del'>-			if (WARN_ON(sdata-&gt;reserved_chanctx != ctx))</div><div class='add'>+			if (WARN_ON(ieee80211_link_has_in_place_reservation(link)))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (!sdata-&gt;reserved_ready)</div><div class='add'>+			if (!link-&gt;reserved_ready)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (ieee80211_vif_get_chanctx(sdata))</div><div class='del'>-				err = ieee80211_vif_use_reserved_reassign(</div><div class='del'>-						sdata);</div><div class='add'>+			if (ieee80211_link_get_chanctx(link))</div><div class='add'>+				err = ieee80211_link_use_reserved_reassign(link);</div><div class='ctx'> 			else</div><div class='del'>-				err = ieee80211_vif_use_reserved_assign(sdata);</div><div class='add'>+				err = ieee80211_link_use_reserved_assign(link);</div><div class='ctx'> </div><div class='ctx'> 			if (err) {</div><div class='del'>-				sdata_info(sdata,</div><div class='del'>-					   "failed to finalize (re-)assign reservation (err=%d)\n",</div><div class='del'>-					   err);</div><div class='del'>-				ieee80211_vif_unreserve_chanctx(sdata);</div><div class='add'>+				link_info(link,</div><div class='add'>+					  "failed to finalize (re-)assign reservation (err=%d)\n",</div><div class='add'>+					  err);</div><div class='add'>+				ieee80211_link_unreserve_chanctx(link);</div><div class='ctx'> 				cfg80211_stop_iface(local-&gt;hw.wiphy,</div><div class='del'>-						    &amp;sdata-&gt;wdev,</div><div class='add'>+						    &amp;link-&gt;sdata-&gt;wdev,</div><div class='ctx'> 						    GFP_KERNEL);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1501,103 +1932,126 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list) {</div><div class='add'>+		struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='ctx'> 		if (ctx-&gt;replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(sdata, sdata_tmp, &amp;ctx-&gt;reserved_vifs,</div><div class='del'>-					 reserved_chanctx_list) {</div><div class='del'>-			ieee80211_vif_unreserve_chanctx(sdata);</div><div class='del'>-			ieee80211_vif_chanctx_reservation_complete(sdata);</div><div class='add'>+		for_each_chanctx_user_reserved(local, ctx, &amp;iter) {</div><div class='add'>+			ieee80211_link_unreserve_chanctx(iter.link);</div><div class='add'>+			ieee80211_link_chanctx_reservation_complete(iter.link);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+void __ieee80211_link_release_channel(struct ieee80211_link_data *link,</div><div class='add'>+				      bool skip_idle_recalc)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> 	bool use_reserved_switch = false;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='add'>+	conf = rcu_dereference_protected(link_conf-&gt;chanctx_conf,</div><div class='add'>+					 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='ctx'> 	if (!conf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ctx = container_of(conf, struct ieee80211_chanctx, conf);</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;reserved_chanctx) {</div><div class='del'>-		if (sdata-&gt;reserved_chanctx-&gt;replace_state ==</div><div class='del'>-		    IEEE80211_CHANCTX_REPLACES_OTHER &amp;&amp;</div><div class='del'>-		    ieee80211_chanctx_num_reserved(local,</div><div class='del'>-						   sdata-&gt;reserved_chanctx) &gt; 1)</div><div class='add'>+	if (link-&gt;reserved_chanctx) {</div><div class='add'>+		if (link-&gt;reserved_chanctx-&gt;replace_state == IEEE80211_CHANCTX_REPLACES_OTHER &amp;&amp;</div><div class='add'>+		    ieee80211_chanctx_num_reserved(local, link-&gt;reserved_chanctx) &gt; 1)</div><div class='ctx'> 			use_reserved_switch = true;</div><div class='ctx'> </div><div class='del'>-		ieee80211_vif_unreserve_chanctx(sdata);</div><div class='add'>+		ieee80211_link_unreserve_chanctx(link);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_assign_vif_chanctx(sdata, NULL);</div><div class='add'>+	ieee80211_assign_link_chanctx(link, NULL, false);</div><div class='ctx'> 	if (ieee80211_chanctx_refcount(local, ctx) == 0)</div><div class='del'>-		ieee80211_free_chanctx(local, ctx);</div><div class='add'>+		ieee80211_free_chanctx(local, ctx, skip_idle_recalc);</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;radar_required = false;</div><div class='add'>+	link-&gt;radar_required = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Unreserving may ready an in-place reservation. */</div><div class='ctx'> 	if (use_reserved_switch)</div><div class='ctx'> 		ieee80211_vif_use_reserved_switch(local);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-			      const struct cfg80211_chan_def *chandef,</div><div class='del'>-			      enum ieee80211_chanctx_mode mode)</div><div class='add'>+int _ieee80211_link_use_channel(struct ieee80211_link_data *link,</div><div class='add'>+				const struct ieee80211_chan_req *chanreq,</div><div class='add'>+				enum ieee80211_chanctx_mode mode,</div><div class='add'>+				bool assign_on_failure)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='ctx'> 	u8 radar_detect_width = 0;</div><div class='add'>+	bool reserved = false;</div><div class='add'>+	int radio_idx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-</div><div class='del'>-	WARN_ON(sdata-&gt;dev &amp;&amp; netif_carrier_ok(sdata-&gt;dev));</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	if (!ieee80211_vif_link_active(&amp;sdata-&gt;vif, link-&gt;link_id)) {</div><div class='add'>+		ieee80211_link_update_chanreq(link, chanreq);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = cfg80211_chandef_dfs_required(local-&gt;hw.wiphy,</div><div class='del'>-					    chandef,</div><div class='add'>+					    &amp;chanreq-&gt;oper,</div><div class='ctx'> 					    sdata-&gt;wdev.iftype);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		radar_detect_width = BIT(chandef-&gt;width);</div><div class='add'>+		radar_detect_width = BIT(chanreq-&gt;oper.width);</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;radar_required = ret;</div><div class='add'>+	link-&gt;radar_required = ret;</div><div class='ctx'> </div><div class='del'>-	ret = ieee80211_check_combinations(sdata, chandef, mode,</div><div class='del'>-					   radar_detect_width);</div><div class='add'>+	ret = ieee80211_check_combinations(sdata, &amp;chanreq-&gt;oper, mode,</div><div class='add'>+					   radar_detect_width, -1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	__ieee80211_vif_release_channel(sdata);</div><div class='del'>-</div><div class='del'>-	ctx = ieee80211_find_chanctx(local, chandef, mode);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		ctx = ieee80211_new_chanctx(local, chandef, mode);</div><div class='add'>+	if (!local-&gt;in_reconfig)</div><div class='add'>+		__ieee80211_link_release_channel(link, false);</div><div class='add'>+</div><div class='add'>+	ctx = ieee80211_find_chanctx(local, link, chanreq, mode);</div><div class='add'>+	/* Note: context is now reserved */</div><div class='add'>+	if (ctx)</div><div class='add'>+		reserved = true;</div><div class='add'>+	else if (!ieee80211_find_available_radio(local, chanreq,</div><div class='add'>+						 sdata-&gt;wdev.radio_mask,</div><div class='add'>+						 &amp;radio_idx))</div><div class='add'>+		ctx = ERR_PTR(-EBUSY);</div><div class='add'>+	else</div><div class='add'>+		ctx = ieee80211_new_chanctx(local, chanreq, mode,</div><div class='add'>+					    assign_on_failure, radio_idx);</div><div class='ctx'> 	if (IS_ERR(ctx)) {</div><div class='ctx'> 		ret = PTR_ERR(ctx);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_vif_update_chandef(sdata, chandef);</div><div class='add'>+	ieee80211_link_update_chanreq(link, chanreq);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_assign_link_chanctx(link, ctx, assign_on_failure);</div><div class='add'>+</div><div class='add'>+	if (reserved) {</div><div class='add'>+		/* remove reservation */</div><div class='add'>+		WARN_ON(link-&gt;reserved_chanctx != ctx);</div><div class='add'>+		link-&gt;reserved_chanctx = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = ieee80211_assign_vif_chanctx(sdata, ctx);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* if assign fails refcount stays the same */</div><div class='ctx'> 		if (ieee80211_chanctx_refcount(local, ctx) == 0)</div><div class='del'>-			ieee80211_free_chanctx(local, ctx);</div><div class='add'>+			ieee80211_free_chanctx(local, ctx, false);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1605,24 +2059,23 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	ieee80211_recalc_radar_chanctx(local, ctx);</div><div class='ctx'>  out:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		sdata-&gt;radar_required = false;</div><div class='add'>+		link-&gt;radar_required = false;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+int ieee80211_link_use_reserved_context(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx *new_ctx;</div><div class='ctx'> 	struct ieee80211_chanctx *old_ctx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;mtx);</div><div class='del'>-	lockdep_assert_held(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	new_ctx = sdata-&gt;reserved_chanctx;</div><div class='del'>-	old_ctx = ieee80211_vif_get_chanctx(sdata);</div><div class='add'>+	new_ctx = link-&gt;reserved_chanctx;</div><div class='add'>+	old_ctx = ieee80211_link_get_chanctx(link);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!new_ctx))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1631,19 +2084,16 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 		    IEEE80211_CHANCTX_WILL_BE_REPLACED))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(sdata-&gt;reserved_ready))</div><div class='add'>+	if (WARN_ON(link-&gt;reserved_ready))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	sdata-&gt;reserved_ready = true;</div><div class='add'>+	link-&gt;reserved_ready = true;</div><div class='ctx'> </div><div class='ctx'> 	if (new_ctx-&gt;replace_state == IEEE80211_CHANCTX_REPLACE_NONE) {</div><div class='ctx'> 		if (old_ctx)</div><div class='del'>-			err = ieee80211_vif_use_reserved_reassign(sdata);</div><div class='del'>-		else</div><div class='del'>-			err = ieee80211_vif_use_reserved_assign(sdata);</div><div class='add'>+			return ieee80211_link_use_reserved_reassign(link);</div><div class='ctx'> </div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		return ieee80211_link_use_reserved_assign(link);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1675,59 +2125,90 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				   const struct cfg80211_chan_def *chandef,</div><div class='del'>-				   u32 *changed)</div><div class='add'>+/*</div><div class='add'>+ * This is similar to ieee80211_chanctx_compatible(), but rechecks</div><div class='add'>+ * against all the links actually using it (except the one that's</div><div class='add'>+ * passed, since that one is changing).</div><div class='add'>+ * This is done in order to allow changes to the AP's bandwidth for</div><div class='add'>+ * wider bandwidth OFDMA purposes, which wouldn't be treated as</div><div class='add'>+ * compatible by ieee80211_chanctx_recheck() but is OK if the link</div><div class='add'>+ * requesting the update is the only one using it.</div><div class='add'>+ */</div><div class='add'>+static const struct ieee80211_chan_req *</div><div class='add'>+ieee80211_chanctx_recheck(struct ieee80211_local *local,</div><div class='add'>+			  struct ieee80211_link_data *skip_link,</div><div class='add'>+			  struct ieee80211_chanctx *ctx,</div><div class='add'>+			  const struct ieee80211_chan_req *req,</div><div class='add'>+			  struct ieee80211_chan_req *tmp)</div><div class='ctx'> {</div><div class='add'>+	const struct ieee80211_chan_req *ret = req;</div><div class='add'>+	struct ieee80211_chanctx_user_iter iter;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_chanctx_user_all(local, ctx, &amp;iter) {</div><div class='add'>+		if (iter.link == skip_link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ieee80211_chanreq_compatible(ret, iter.chanreq, tmp);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*tmp = *ret;</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ieee80211_link_change_chanreq(struct ieee80211_link_data *link,</div><div class='add'>+				  const struct ieee80211_chan_req *chanreq,</div><div class='add'>+				  u64 *changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> 	struct ieee80211_chanctx *ctx;</div><div class='del'>-	const struct cfg80211_chan_def *compat;</div><div class='del'>-	int ret;</div><div class='add'>+	const struct ieee80211_chan_req *compat;</div><div class='add'>+	struct ieee80211_chan_req tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	if (!cfg80211_chandef_usable(sdata-&gt;local-&gt;hw.wiphy, chandef,</div><div class='add'>+	if (!cfg80211_chandef_usable(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+				     &amp;chanreq-&gt;oper,</div><div class='ctx'> 				     IEEE80211_CHAN_DISABLED))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	if (cfg80211_chandef_identical(chandef, &amp;sdata-&gt;vif.bss_conf.chandef)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/* for non-HT 20 MHz the rest doesn't matter */</div><div class='add'>+	if (chanreq-&gt;oper.width == NL80211_CHAN_WIDTH_20_NOHT &amp;&amp;</div><div class='add'>+	    cfg80211_chandef_identical(&amp;chanreq-&gt;oper, &amp;link_conf-&gt;chanreq.oper))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (chandef-&gt;width == NL80211_CHAN_WIDTH_20_NOHT ||</div><div class='del'>-	    sdata-&gt;vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/* but you cannot switch to/from it */</div><div class='add'>+	if (chanreq-&gt;oper.width == NL80211_CHAN_WIDTH_20_NOHT ||</div><div class='add'>+	    link_conf-&gt;chanreq.oper.width == NL80211_CHAN_WIDTH_20_NOHT)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	conf = rcu_dereference_protected(sdata-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='del'>-	if (!conf) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	conf = rcu_dereference_protected(link_conf-&gt;chanctx_conf,</div><div class='add'>+					 lockdep_is_held(&amp;local-&gt;hw.wiphy-&gt;mtx));</div><div class='add'>+	if (!conf)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ctx = container_of(conf, struct ieee80211_chanctx, conf);</div><div class='ctx'> </div><div class='del'>-	compat = cfg80211_chandef_compatible(&amp;conf-&gt;def, chandef);</div><div class='del'>-	if (!compat) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	compat = ieee80211_chanctx_recheck(local, link, ctx, chanreq, &amp;tmp);</div><div class='add'>+	if (!compat)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (ctx-&gt;replace_state) {</div><div class='ctx'> 	case IEEE80211_CHANCTX_REPLACE_NONE:</div><div class='del'>-		if (!ieee80211_chanctx_reserved_chandef(local, ctx, compat)) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (!ieee80211_chanctx_reserved_chanreq(local, ctx, compat,</div><div class='add'>+							&amp;tmp))</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_CHANCTX_WILL_BE_REPLACED:</div><div class='ctx'> 		/* TODO: Perhaps the bandwidth change could be treated as a</div><div class='ctx'> 		 * reservation itself? */</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	case IEEE80211_CHANCTX_REPLACES_OTHER:</div><div class='ctx'> 		/* channel context that is going to replace another channel</div><div class='ctx'> 		 * context doesn't really exist and shouldn't be assigned</div><div class='hunk'>@@ -1736,45 +2217,49 @@ int ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_vif_update_chandef(sdata, chandef);</div><div class='add'>+	ieee80211_link_update_chanreq(link, chanreq);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_recalc_chanctx_chantype(local, ctx);</div><div class='ctx'> </div><div class='ctx'> 	*changed |= BSS_CHANGED_BANDWIDTH;</div><div class='del'>-	ret = 0;</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+void ieee80211_link_release_channel(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(sdata-&gt;dev &amp;&amp; netif_carrier_ok(sdata-&gt;dev));</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+</div><div class='add'>+	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP_VLAN)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sdata-&gt;local-&gt;mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='del'>-	__ieee80211_vif_release_channel(sdata);</div><div class='del'>-	mutex_unlock(&amp;sdata-&gt;local-&gt;chanctx_mtx);</div><div class='add'>+	if (rcu_access_pointer(link-&gt;conf-&gt;chanctx_conf))</div><div class='add'>+		__ieee80211_link_release_channel(link, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_vif_vlan_copy_chanctx(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+void ieee80211_link_vlan_copy_chanctx(struct ieee80211_link_data *link)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='add'>+	unsigned int link_id = link-&gt;link_id;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = link-&gt;conf;</div><div class='add'>+	struct ieee80211_bss_conf *ap_conf;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='ctx'> 	struct ieee80211_sub_if_data *ap;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(sdata-&gt;vif.type != NL80211_IFTYPE_AP_VLAN || !sdata-&gt;bss))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ap = container_of(sdata-&gt;bss, struct ieee80211_sub_if_data, u.ap);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;local-&gt;chanctx_mtx);</div><div class='del'>-</div><div class='del'>-	conf = rcu_dereference_protected(ap-&gt;vif.chanctx_conf,</div><div class='del'>-					 lockdep_is_held(&amp;local-&gt;chanctx_mtx));</div><div class='del'>-	rcu_assign_pointer(sdata-&gt;vif.chanctx_conf, conf);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;chanctx_mtx);</div><div class='add'>+	ap_conf = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+				    ap-&gt;vif.link_conf[link_id]);</div><div class='add'>+	conf = wiphy_dereference(local-&gt;hw.wiphy,</div><div class='add'>+				 ap_conf-&gt;chanctx_conf);</div><div class='add'>+	rcu_assign_pointer(link_conf-&gt;chanctx_conf, conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ieee80211_iter_chan_contexts_atomic(</div><div class='hunk'>@@ -1794,3 +2279,21 @@ void ieee80211_iter_chan_contexts_atomic(</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ieee80211_iter_chan_contexts_atomic);</div><div class='add'>+</div><div class='add'>+void ieee80211_iter_chan_contexts_mtx(</div><div class='add'>+	struct ieee80211_hw *hw,</div><div class='add'>+	void (*iter)(struct ieee80211_hw *hw,</div><div class='add'>+		     struct ieee80211_chanctx_conf *chanctx_conf,</div><div class='add'>+		     void *data),</div><div class='add'>+	void *iter_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = hw_to_local(hw);</div><div class='add'>+	struct ieee80211_chanctx *ctx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ctx, &amp;local-&gt;chanctx_list, list)</div><div class='add'>+		if (ctx-&gt;driver_present)</div><div class='add'>+			iter(hw, &amp;ctx-&gt;conf, iter_data);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ieee80211_iter_chan_contexts_mtx);</div><div class='head'>diff --git a/net/mac80211/debug.h b/net/mac80211/debug.h<br/>index d90a8f9cc3fd..ef7c1a68d88d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debug.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debug.h</a></div><div class='hunk'>@@ -1,6 +1,11 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Portions</div><div class='add'>+ * Copyright (C) 2022 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='ctx'> #ifndef __MAC80211_DEBUG_H</div><div class='ctx'> #define __MAC80211_DEBUG_H</div><div class='add'>+#include &lt;linux/once_lite.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_OCB_DEBUG</div><div class='hunk'>@@ -130,6 +135,46 @@ do {									\</div><div class='ctx'> #define sdata_dbg(sdata, fmt, ...)					\</div><div class='ctx'> 	_sdata_dbg(1, sdata, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='add'>+#define link_info(link, fmt, ...)					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (ieee80211_vif_is_mld(&amp;(link)-&gt;sdata-&gt;vif))          \</div><div class='add'>+			_sdata_info((link)-&gt;sdata, "[link %d] " fmt,	\</div><div class='add'>+				    (link)-&gt;link_id,			\</div><div class='add'>+				    ##__VA_ARGS__);			\</div><div class='add'>+		else							\</div><div class='add'>+			_sdata_info((link)-&gt;sdata, fmt, ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)</div><div class='add'>+#define link_err(link, fmt, ...)					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (ieee80211_vif_is_mld(&amp;(link)-&gt;sdata-&gt;vif))          \</div><div class='add'>+			_sdata_err((link)-&gt;sdata, "[link %d] " fmt,	\</div><div class='add'>+				   (link)-&gt;link_id,			\</div><div class='add'>+				   ##__VA_ARGS__);			\</div><div class='add'>+		else							\</div><div class='add'>+			_sdata_err((link)-&gt;sdata, fmt, ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)</div><div class='add'>+#define link_err_once(link, fmt, ...)					\</div><div class='add'>+	DO_ONCE_LITE(link_err, link, fmt, ##__VA_ARGS__)</div><div class='add'>+#define link_id_info(sdata, link_id, fmt, ...)				\</div><div class='add'>+	do {								\</div><div class='add'>+		if (ieee80211_vif_is_mld(&amp;sdata-&gt;vif))			\</div><div class='add'>+			_sdata_info(sdata, "[link %d] " fmt, link_id,	\</div><div class='add'>+				    ##__VA_ARGS__);			\</div><div class='add'>+		else							\</div><div class='add'>+			_sdata_info(sdata, fmt, ##__VA_ARGS__);		\</div><div class='add'>+	} while (0)</div><div class='add'>+#define _link_id_dbg(print, sdata, link_id, fmt, ...)			\</div><div class='add'>+	do {								\</div><div class='add'>+		if (ieee80211_vif_is_mld(&amp;(sdata)-&gt;vif))		\</div><div class='add'>+			_sdata_dbg(print, sdata, "[link %d] " fmt,	\</div><div class='add'>+				   link_id, ##__VA_ARGS__);		\</div><div class='add'>+		else							\</div><div class='add'>+			_sdata_dbg(print, sdata, fmt, ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)</div><div class='add'>+#define link_dbg(link, fmt, ...)					\</div><div class='add'>+	_link_id_dbg(1, (link)-&gt;sdata, (link)-&gt;link_id,			\</div><div class='add'>+		     fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #define ht_dbg(sdata, fmt, ...)						\</div><div class='ctx'> 	_sdata_dbg(MAC80211_HT_DEBUG,					\</div><div class='ctx'> 		   sdata, fmt, ##__VA_ARGS__)</div><div class='hunk'>@@ -193,6 +238,9 @@ do {									\</div><div class='ctx'> #define mlme_dbg(sdata, fmt, ...)					\</div><div class='ctx'> 	_sdata_dbg(MAC80211_MLME_DEBUG,					\</div><div class='ctx'> 		   sdata, fmt, ##__VA_ARGS__)</div><div class='add'>+#define mlme_link_id_dbg(sdata, link_id, fmt, ...)			\</div><div class='add'>+	_link_id_dbg(MAC80211_MLME_DEBUG, sdata, link_id,		\</div><div class='add'>+		     fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlme_dbg_ratelimited(sdata, fmt, ...)				\</div><div class='ctx'> 	_sdata_dbg(MAC80211_MLME_DEBUG &amp;&amp; net_ratelimit(),		\</div><div class='head'>diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c<br/>index b5adf3625d16..d02f07368c51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs.c</a></div><div class='hunk'>@@ -1,11 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * mac80211 debugfs for wireless PHYs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  * Copyright 2013-2014  Intel Mobile Communications GmbH</div><div class='del'>- *</div><div class='del'>- * GPLv2</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2018 - 2019, 2021-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -43,9 +42,8 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_READONLY_FILE_OPS(name)			\</div><div class='del'>-static const struct file_operations name## _ops = {			\</div><div class='add'>+static const struct debugfs_short_fops name## _ops = {				\</div><div class='ctx'> 	.read = name## _read,						\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -54,12 +52,14 @@ static const struct file_operations name## _ops = {			\</div><div class='ctx'> 	DEBUGFS_READONLY_FILE_OPS(name)</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD(name)						\</div><div class='del'>-	debugfs_create_file(#name, 0400, phyd, local, &amp;name## _ops);</div><div class='add'>+	debugfs_create_file(#name, 0400, phyd, local, &amp;name## _ops)</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD_MODE(name, mode)					\</div><div class='ctx'> 	debugfs_create_file(#name, mode, phyd, local, &amp;name## _ops);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+DEBUGFS_READONLY_FILE(hw_conf, "%x",</div><div class='add'>+		      local-&gt;hw.conf.flags);</div><div class='ctx'> DEBUGFS_READONLY_FILE(user_power, "%d",</div><div class='ctx'> 		      local-&gt;user_power_level);</div><div class='ctx'> DEBUGFS_READONLY_FILE(power, "%d",</div><div class='hunk'>@@ -82,7 +82,6 @@ static ssize_t aqm_read(struct file *file,</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;local-&gt;fq.lock);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	len = scnprintf(buf, sizeof(buf),</div><div class='ctx'> 			"access name value\n"</div><div class='hunk'>@@ -105,7 +104,6 @@ static ssize_t aqm_read(struct file *file,</div><div class='ctx'> 			fq-&gt;limit,</div><div class='ctx'> 			fq-&gt;quantum);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock_bh(&amp;local-&gt;fq.lock);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='hunk'>@@ -119,18 +117,17 @@ static ssize_t aqm_write(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = file-&gt;private_data;</div><div class='ctx'> 	char buf[100];</div><div class='del'>-	size_t len;</div><div class='ctx'> </div><div class='del'>-	if (count &gt; sizeof(buf))</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(buf, user_buf, count))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	buf[sizeof(buf) - 1] = '\0';</div><div class='del'>-	len = strlen(buf);</div><div class='del'>-	if (len &gt; 0 &amp;&amp; buf[len-1] == '\n')</div><div class='del'>-		buf[len-1] = 0;</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(buf, "fq_limit %u", &amp;local-&gt;fq.limit) == 1)</div><div class='ctx'> 		return count;</div><div class='hunk'>@@ -142,10 +139,268 @@ static ssize_t aqm_write(struct file *file,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations aqm_ops = {</div><div class='add'>+static const struct debugfs_short_fops aqm_ops = {</div><div class='ctx'> 	.write = aqm_write,</div><div class='ctx'> 	.read = aqm_read,</div><div class='del'>-	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t airtime_flags_read(struct file *file,</div><div class='add'>+				  char __user *user_buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[128] = {}, *pos, *end;</div><div class='add'>+</div><div class='add'>+	pos = buf;</div><div class='add'>+	end = pos + sizeof(buf) - 1;</div><div class='add'>+</div><div class='add'>+	if (local-&gt;airtime_flags &amp; AIRTIME_USE_TX)</div><div class='add'>+		pos += scnprintf(pos, end - pos, "AIRTIME_TX\t(%lx)\n",</div><div class='add'>+				 AIRTIME_USE_TX);</div><div class='add'>+	if (local-&gt;airtime_flags &amp; AIRTIME_USE_RX)</div><div class='add'>+		pos += scnprintf(pos, end - pos, "AIRTIME_RX\t(%lx)\n",</div><div class='add'>+				 AIRTIME_USE_RX);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf,</div><div class='add'>+				       strlen(buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t airtime_flags_write(struct file *file,</div><div class='add'>+				   const char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[16];</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	if (kstrtou16(buf, 0, &amp;local-&gt;airtime_flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_short_fops airtime_flags_ops = {</div><div class='add'>+	.write = airtime_flags_write,</div><div class='add'>+	.read = airtime_flags_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t aql_pending_read(struct file *file,</div><div class='add'>+				char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[400];</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf),</div><div class='add'>+			"AC     AQL pending\n"</div><div class='add'>+			"VO     %u us\n"</div><div class='add'>+			"VI     %u us\n"</div><div class='add'>+			"BE     %u us\n"</div><div class='add'>+			"BK     %u us\n"</div><div class='add'>+			"total  %u us\n",</div><div class='add'>+			atomic_read(&amp;local-&gt;aql_ac_pending_airtime[IEEE80211_AC_VO]),</div><div class='add'>+			atomic_read(&amp;local-&gt;aql_ac_pending_airtime[IEEE80211_AC_VI]),</div><div class='add'>+			atomic_read(&amp;local-&gt;aql_ac_pending_airtime[IEEE80211_AC_BE]),</div><div class='add'>+			atomic_read(&amp;local-&gt;aql_ac_pending_airtime[IEEE80211_AC_BK]),</div><div class='add'>+			atomic_read(&amp;local-&gt;aql_total_pending_airtime));</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='add'>+				       buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_short_fops aql_pending_ops = {</div><div class='add'>+	.read = aql_pending_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t aql_txq_limit_read(struct file *file,</div><div class='add'>+				  char __user *user_buf,</div><div class='add'>+				  size_t count,</div><div class='add'>+				  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[400];</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf),</div><div class='add'>+			"AC	AQL limit low	AQL limit high\n"</div><div class='add'>+			"VO	%u		%u\n"</div><div class='add'>+			"VI	%u		%u\n"</div><div class='add'>+			"BE	%u		%u\n"</div><div class='add'>+			"BK	%u		%u\n",</div><div class='add'>+			local-&gt;aql_txq_limit_low[IEEE80211_AC_VO],</div><div class='add'>+			local-&gt;aql_txq_limit_high[IEEE80211_AC_VO],</div><div class='add'>+			local-&gt;aql_txq_limit_low[IEEE80211_AC_VI],</div><div class='add'>+			local-&gt;aql_txq_limit_high[IEEE80211_AC_VI],</div><div class='add'>+			local-&gt;aql_txq_limit_low[IEEE80211_AC_BE],</div><div class='add'>+			local-&gt;aql_txq_limit_high[IEEE80211_AC_BE],</div><div class='add'>+			local-&gt;aql_txq_limit_low[IEEE80211_AC_BK],</div><div class='add'>+			local-&gt;aql_txq_limit_high[IEEE80211_AC_BK]);</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='add'>+				       buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t aql_txq_limit_write(struct file *file,</div><div class='add'>+				   const char __user *user_buf,</div><div class='add'>+				   size_t count,</div><div class='add'>+				   loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[100];</div><div class='add'>+	u32 ac, q_limit_low, q_limit_high, q_limit_low_old, q_limit_high_old;</div><div class='add'>+	struct sta_info *sta;</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%u %u %u", &amp;ac, &amp;q_limit_low, &amp;q_limit_high) != 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ac &gt;= IEEE80211_NUM_ACS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q_limit_low_old = local-&gt;aql_txq_limit_low[ac];</div><div class='add'>+	q_limit_high_old = local-&gt;aql_txq_limit_high[ac];</div><div class='add'>+</div><div class='add'>+	guard(wiphy)(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	local-&gt;aql_txq_limit_low[ac] = q_limit_low;</div><div class='add'>+	local-&gt;aql_txq_limit_high[ac] = q_limit_high;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sta, &amp;local-&gt;sta_list, list) {</div><div class='add'>+		/* If a sta has customized queue limits, keep it */</div><div class='add'>+		if (sta-&gt;airtime[ac].aql_limit_low == q_limit_low_old &amp;&amp;</div><div class='add'>+		    sta-&gt;airtime[ac].aql_limit_high == q_limit_high_old) {</div><div class='add'>+			sta-&gt;airtime[ac].aql_limit_low = q_limit_low;</div><div class='add'>+			sta-&gt;airtime[ac].aql_limit_high = q_limit_high;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_short_fops aql_txq_limit_ops = {</div><div class='add'>+	.write = aql_txq_limit_write,</div><div class='add'>+	.read = aql_txq_limit_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t aql_enable_read(struct file *file, char __user *user_buf,</div><div class='add'>+			       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char buf[3];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%d\n",</div><div class='add'>+			!static_key_false(&amp;aql_disable.key));</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t aql_enable_write(struct file *file, const char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	bool aql_disabled = static_key_false(&amp;aql_disable.key);</div><div class='add'>+	char buf[3];</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	if (count &gt; sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[sizeof(buf) - 1] = '\0';</div><div class='add'>+	len = strlen(buf);</div><div class='add'>+	if (len &gt; 0 &amp;&amp; buf[len - 1] == '\n')</div><div class='add'>+		buf[len - 1] = 0;</div><div class='add'>+</div><div class='add'>+	if (buf[0] == '0' &amp;&amp; buf[1] == '\0') {</div><div class='add'>+		if (!aql_disabled)</div><div class='add'>+			static_branch_inc(&amp;aql_disable);</div><div class='add'>+	} else if (buf[0] == '1' &amp;&amp; buf[1] == '\0') {</div><div class='add'>+		if (aql_disabled)</div><div class='add'>+			static_branch_dec(&amp;aql_disable);</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_short_fops aql_enable_ops = {</div><div class='add'>+	.write = aql_enable_write,</div><div class='add'>+	.read = aql_enable_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t force_tx_status_read(struct file *file,</div><div class='add'>+				    char __user *user_buf,</div><div class='add'>+				    size_t count,</div><div class='add'>+				    loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%d\n", (int)local-&gt;force_tx_status);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='add'>+				       buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t force_tx_status_write(struct file *file,</div><div class='add'>+				     const char __user *user_buf,</div><div class='add'>+				     size_t count,</div><div class='add'>+				     loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[3];</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	if (buf[0] == '0' &amp;&amp; buf[1] == '\0')</div><div class='add'>+		local-&gt;force_tx_status = 0;</div><div class='add'>+	else if (buf[0] == '1' &amp;&amp; buf[1] == '\0')</div><div class='add'>+		local-&gt;force_tx_status = 1;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_short_fops force_tx_status_ops = {</div><div class='add'>+	.write = force_tx_status_write,</div><div class='add'>+	.read = force_tx_status_read,</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -154,18 +409,24 @@ static ssize_t reset_write(struct file *file, const char __user *user_buf,</div><div class='ctx'> 			   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+	wiphy_lock(local-&gt;hw.wiphy);</div><div class='ctx'> 	__ieee80211_suspend(&amp;local-&gt;hw, NULL);</div><div class='del'>-	__ieee80211_resume(&amp;local-&gt;hw);</div><div class='add'>+	ret = __ieee80211_resume(&amp;local-&gt;hw);</div><div class='add'>+	wiphy_unlock(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		cfg80211_shutdown_all_interfaces(local-&gt;hw.wiphy);</div><div class='add'>+</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations reset_ops = {</div><div class='add'>+static const struct debugfs_short_fops reset_ops = {</div><div class='ctx'> 	.write = reset_write,</div><div class='del'>-	.open = simple_open,</div><div class='ctx'> 	.llseek = noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -185,6 +446,7 @@ static const char *hw_flag_names[] = {</div><div class='ctx'> 	FLAG(SUPPORTS_DYNAMIC_PS),</div><div class='ctx'> 	FLAG(MFP_CAPABLE),</div><div class='ctx'> 	FLAG(WANT_MONITOR_VIF),</div><div class='add'>+	FLAG(NO_VIRTUAL_MONITOR),</div><div class='ctx'> 	FLAG(NO_AUTO_VIF),</div><div class='ctx'> 	FLAG(SW_CRYPTO_CONTROL),</div><div class='ctx'> 	FLAG(SUPPORT_FAST_XMIT),</div><div class='hunk'>@@ -212,8 +474,22 @@ static const char *hw_flag_names[] = {</div><div class='ctx'> 	FLAG(REPORTS_LOW_ACK),</div><div class='ctx'> 	FLAG(SUPPORTS_TX_FRAG),</div><div class='ctx'> 	FLAG(SUPPORTS_TDLS_BUFFER_STA),</div><div class='del'>-	FLAG(DEAUTH_NEED_MGD_TX_PREP),</div><div class='ctx'> 	FLAG(DOESNT_SUPPORT_QOS_NDP),</div><div class='add'>+	FLAG(BUFF_MMPDU_TXQ),</div><div class='add'>+	FLAG(SUPPORTS_VHT_EXT_NSS_BW),</div><div class='add'>+	FLAG(STA_MMPDU_TXQ),</div><div class='add'>+	FLAG(TX_STATUS_NO_AMPDU_LEN),</div><div class='add'>+	FLAG(SUPPORTS_MULTI_BSSID),</div><div class='add'>+	FLAG(SUPPORTS_ONLY_HE_MULTI_BSSID),</div><div class='add'>+	FLAG(AMPDU_KEYBORDER_SUPPORT),</div><div class='add'>+	FLAG(SUPPORTS_TX_ENCAP_OFFLOAD),</div><div class='add'>+	FLAG(SUPPORTS_RX_DECAP_OFFLOAD),</div><div class='add'>+	FLAG(SUPPORTS_CONC_MON_RX_DECAP),</div><div class='add'>+	FLAG(DETECTS_COLOR_COLLISION),</div><div class='add'>+	FLAG(MLO_MCAST_MULTI_LINK_TX),</div><div class='add'>+	FLAG(DISALLOW_PUNCTURING),</div><div class='add'>+	FLAG(HANDLES_QUIET_CSA),</div><div class='add'>+	FLAG(STRICT),</div><div class='ctx'> #undef FLAG</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -246,6 +522,46 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t hwflags_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_local *local = file-&gt;private_data;</div><div class='add'>+	char buf[100];</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "strict=%d", &amp;val) == 1) {</div><div class='add'>+		switch (val) {</div><div class='add'>+		case 0:</div><div class='add'>+			ieee80211_hw_set(&amp;local-&gt;hw, STRICT);</div><div class='add'>+			return count;</div><div class='add'>+		case 1:</div><div class='add'>+			__clear_bit(IEEE80211_HW_STRICT, local-&gt;hw.flags);</div><div class='add'>+			return count;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hwflags_ops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = hwflags_read,</div><div class='add'>+	.write = hwflags_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t misc_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 			 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -296,7 +612,6 @@ static ssize_t queues_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEBUGFS_READONLY_FILE_OPS(hwflags);</div><div class='ctx'> DEBUGFS_READONLY_FILE_OPS(queues);</div><div class='ctx'> DEBUGFS_READONLY_FILE_OPS(misc);</div><div class='ctx'> </div><div class='hunk'>@@ -312,9 +627,9 @@ static ssize_t format_devstat_counter(struct ieee80211_local *local,</div><div class='ctx'> 	char buf[20];</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	wiphy_lock(local-&gt;hw.wiphy);</div><div class='ctx'> 	res = drv_get_stats(local, &amp;stats);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	wiphy_unlock(local-&gt;hw.wiphy);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> 	res = printvalue(&amp;stats, buf, sizeof(buf));</div><div class='hunk'>@@ -338,14 +653,15 @@ static ssize_t stats_ ##name## _read(struct file *file,			\</div><div class='ctx'> 				      print_devstats_##name);		\</div><div class='ctx'> }									\</div><div class='ctx'> 									\</div><div class='del'>-static const struct file_operations stats_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops stats_ ##name## _ops = {			\</div><div class='ctx'> 	.read = stats_ ##name## _read,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS</div><div class='ctx'> #define DEBUGFS_STATS_ADD(name)					\</div><div class='ctx'> 	debugfs_create_u32(#name, 0400, statsd, &amp;local-&gt;name);</div><div class='add'>+#endif</div><div class='ctx'> #define DEBUGFS_DEVSTATS_ADD(name)					\</div><div class='ctx'> 	debugfs_create_file(#name, 0400, statsd, local, &amp;stats_ ##name## _ops);</div><div class='ctx'> </div><div class='hunk'>@@ -372,18 +688,22 @@ void debugfs_hw_add(struct ieee80211_local *local)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	DEBUGFS_ADD_MODE(reset, 0200);</div><div class='ctx'> #endif</div><div class='del'>-	DEBUGFS_ADD(hwflags);</div><div class='add'>+	DEBUGFS_ADD_MODE(hwflags, 0600);</div><div class='ctx'> 	DEBUGFS_ADD(user_power);</div><div class='ctx'> 	DEBUGFS_ADD(power);</div><div class='add'>+	DEBUGFS_ADD(hw_conf);</div><div class='add'>+	DEBUGFS_ADD_MODE(force_tx_status, 0600);</div><div class='add'>+	DEBUGFS_ADD_MODE(aql_enable, 0600);</div><div class='add'>+	DEBUGFS_ADD(aql_pending);</div><div class='add'>+	DEBUGFS_ADD_MODE(aqm, 0600);</div><div class='ctx'> </div><div class='del'>-	if (local-&gt;ops-&gt;wake_tx_queue)</div><div class='del'>-		DEBUGFS_ADD_MODE(aqm, 0600);</div><div class='add'>+	DEBUGFS_ADD_MODE(airtime_flags, 0600);</div><div class='ctx'> </div><div class='del'>-	statsd = debugfs_create_dir("statistics", phyd);</div><div class='add'>+	DEBUGFS_ADD(aql_txq_limit);</div><div class='add'>+	debugfs_create_u32("aql_threshold", 0600,</div><div class='add'>+			   phyd, &amp;local-&gt;aql_threshold);</div><div class='ctx'> </div><div class='del'>-	/* if the dir failed, don't put all the other things into the root! */</div><div class='del'>-	if (!statsd)</div><div class='del'>-		return;</div><div class='add'>+	statsd = debugfs_create_dir("statistics", phyd);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUG_COUNTERS</div><div class='ctx'> 	DEBUGFS_STATS_ADD(dot11TransmittedFragmentCount);</div><div class='hunk'>@@ -395,7 +715,6 @@ void debugfs_hw_add(struct ieee80211_local *local)</div><div class='ctx'> 	DEBUGFS_STATS_ADD(dot11ReceivedFragmentCount);</div><div class='ctx'> 	DEBUGFS_STATS_ADD(dot11MulticastReceivedFrameCount);</div><div class='ctx'> 	DEBUGFS_STATS_ADD(dot11TransmittedFrameCount);</div><div class='del'>-	DEBUGFS_STATS_ADD(tx_handlers_drop);</div><div class='ctx'> 	DEBUGFS_STATS_ADD(tx_handlers_queued);</div><div class='ctx'> 	DEBUGFS_STATS_ADD(tx_handlers_drop_wep);</div><div class='ctx'> 	DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc);</div><div class='head'>diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c<br/>index a2ef95f16f11..117f58af5ff9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_key.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs_key.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2003-2005	Devicescape Software, Inc.</div><div class='ctx'>  * Copyright (c) 2006	Jiri Benc &lt;jbenc@suse.cz&gt;</div><div class='ctx'>  * Copyright 2007	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  * Copyright (C) 2015	Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2021-2023   Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='hunk'>@@ -25,21 +23,18 @@ static ssize_t key_##name##_read(struct file *file,			\</div><div class='ctx'> 	return mac80211_format_buffer(userbuf, count, ppos, 		\</div><div class='ctx'> 				      format_string, key-&gt;prop);	\</div><div class='ctx'> }</div><div class='del'>-#define KEY_READ_D(name) KEY_READ(name, name, "%d\n")</div><div class='ctx'> #define KEY_READ_X(name) KEY_READ(name, name, "0x%x\n")</div><div class='ctx'> </div><div class='ctx'> #define KEY_OPS(name)							\</div><div class='del'>-static const struct file_operations key_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops key_ ##name## _ops = {		\</div><div class='ctx'> 	.read = key_##name##_read,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define KEY_OPS_W(name)							\</div><div class='del'>-static const struct file_operations key_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops key_ ##name## _ops = {		\</div><div class='ctx'> 	.read = key_##name##_read,					\</div><div class='ctx'> 	.write = key_##name##_write,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -52,9 +47,8 @@ static const struct file_operations key_ ##name## _ops = {		\</div><div class='ctx'> #define KEY_CONF_READ_D(name) KEY_CONF_READ(name, "%d\n")</div><div class='ctx'> </div><div class='ctx'> #define KEY_CONF_OPS(name)						\</div><div class='del'>-static const struct file_operations key_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops key_ ##name## _ops = {		\</div><div class='ctx'> 	.read = key_conf_##name##_read,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +316,7 @@ KEY_OPS(key);</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD(name) \</div><div class='ctx'> 	debugfs_create_file(#name, 0400, key-&gt;debugfs.dir, \</div><div class='del'>-			    key, &amp;key_##name##_ops);</div><div class='add'>+			    key, &amp;key_##name##_ops)</div><div class='ctx'> #define DEBUGFS_ADD_W(name) \</div><div class='ctx'> 	debugfs_create_file(#name, 0600, key-&gt;debugfs.dir, \</div><div class='ctx'> 			    key, &amp;key_##name##_ops);</div><div class='hunk'>@@ -342,9 +336,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)</div><div class='ctx'> 	key-&gt;debugfs.dir = debugfs_create_dir(buf,</div><div class='ctx'> 					key-&gt;local-&gt;debugfs.keys);</div><div class='ctx'> </div><div class='del'>-	if (!key-&gt;debugfs.dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	sta = key-&gt;sta;</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		sprintf(buf, "../../netdev:%s/stations/%pM",</div><div class='hunk'>@@ -384,14 +375,14 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	if (!sdata-&gt;vif.debugfs_dir)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;sdata-&gt;local-&gt;key_mtx);</div><div class='add'>+	lockdep_assert_wiphy(sdata-&gt;local-&gt;hw.wiphy);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove(sdata-&gt;debugfs.default_unicast_key);</div><div class='ctx'> 	sdata-&gt;debugfs.default_unicast_key = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;default_unicast_key) {</div><div class='del'>-		key = key_mtx_dereference(sdata-&gt;local,</div><div class='del'>-					  sdata-&gt;default_unicast_key);</div><div class='add'>+		key = wiphy_dereference(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					sdata-&gt;default_unicast_key);</div><div class='ctx'> 		sprintf(buf, "../keys/%d", key-&gt;debugfs.cnt);</div><div class='ctx'> 		sdata-&gt;debugfs.default_unicast_key =</div><div class='ctx'> 			debugfs_create_symlink("default_unicast_key",</div><div class='hunk'>@@ -401,9 +392,9 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	debugfs_remove(sdata-&gt;debugfs.default_multicast_key);</div><div class='ctx'> 	sdata-&gt;debugfs.default_multicast_key = NULL;</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;default_multicast_key) {</div><div class='del'>-		key = key_mtx_dereference(sdata-&gt;local,</div><div class='del'>-					  sdata-&gt;default_multicast_key);</div><div class='add'>+	if (sdata-&gt;deflink.default_multicast_key) {</div><div class='add'>+		key = wiphy_dereference(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					sdata-&gt;deflink.default_multicast_key);</div><div class='ctx'> 		sprintf(buf, "../keys/%d", key-&gt;debugfs.cnt);</div><div class='ctx'> 		sdata-&gt;debugfs.default_multicast_key =</div><div class='ctx'> 			debugfs_create_symlink("default_multicast_key",</div><div class='hunk'>@@ -411,25 +402,6 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_debugfs_key_add_mgmt_default(struct ieee80211_sub_if_data *sdata)</div><div class='del'>-{</div><div class='del'>-	char buf[50];</div><div class='del'>-	struct ieee80211_key *key;</div><div class='del'>-</div><div class='del'>-	if (!sdata-&gt;vif.debugfs_dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	key = key_mtx_dereference(sdata-&gt;local,</div><div class='del'>-				  sdata-&gt;default_mgmt_key);</div><div class='del'>-	if (key) {</div><div class='del'>-		sprintf(buf, "../keys/%d", key-&gt;debugfs.cnt);</div><div class='del'>-		sdata-&gt;debugfs.default_mgmt_key =</div><div class='del'>-			debugfs_create_symlink("default_mgmt_key",</div><div class='del'>-					       sdata-&gt;vif.debugfs_dir, buf);</div><div class='del'>-	} else</div><div class='del'>-		ieee80211_debugfs_key_remove_mgmt_default(sdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ieee80211_debugfs_key_remove_mgmt_default(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {</div><div class='ctx'> 	if (!sdata)</div><div class='hunk'>@@ -439,9 +411,12 @@ void ieee80211_debugfs_key_remove_mgmt_default(struct ieee80211_sub_if_data *sda</div><div class='ctx'> 	sdata-&gt;debugfs.default_mgmt_key = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,</div><div class='del'>-				   struct sta_info *sta)</div><div class='add'>+void</div><div class='add'>+ieee80211_debugfs_key_remove_beacon_default(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {</div><div class='del'>-	debugfs_remove(key-&gt;debugfs.stalink);</div><div class='del'>-	key-&gt;debugfs.stalink = NULL;</div><div class='add'>+	if (!sdata)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_remove(sdata-&gt;debugfs.default_beacon_key);</div><div class='add'>+	sdata-&gt;debugfs.default_beacon_key = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/net/mac80211/debugfs_key.h b/net/mac80211/debugfs_key.h<br/>index 1cd7b8bff56c..e17a48d5c6cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_key.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_key.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_key.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs_key.h</a></div><div class='hunk'>@@ -6,12 +6,10 @@</div><div class='ctx'> void ieee80211_debugfs_key_add(struct ieee80211_key *key);</div><div class='ctx'> void ieee80211_debugfs_key_remove(struct ieee80211_key *key);</div><div class='ctx'> void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata);</div><div class='del'>-void ieee80211_debugfs_key_add_mgmt_default(</div><div class='del'>-	struct ieee80211_sub_if_data *sdata);</div><div class='ctx'> void ieee80211_debugfs_key_remove_mgmt_default(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata);</div><div class='del'>-void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,</div><div class='del'>-				   struct sta_info *sta);</div><div class='add'>+void ieee80211_debugfs_key_remove_beacon_default(</div><div class='add'>+	struct ieee80211_sub_if_data *sdata);</div><div class='ctx'> #else</div><div class='ctx'> static inline void ieee80211_debugfs_key_add(struct ieee80211_key *key)</div><div class='ctx'> {}</div><div class='hunk'>@@ -20,14 +18,11 @@ static inline void ieee80211_debugfs_key_remove(struct ieee80211_key *key)</div><div class='ctx'> static inline void ieee80211_debugfs_key_update_default(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {}</div><div class='del'>-static inline void ieee80211_debugfs_key_add_mgmt_default(</div><div class='del'>-	struct ieee80211_sub_if_data *sdata)</div><div class='del'>-{}</div><div class='ctx'> static inline void ieee80211_debugfs_key_remove_mgmt_default(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {}</div><div class='del'>-static inline void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,</div><div class='del'>-						 struct sta_info *sta)</div><div class='add'>+static inline void ieee80211_debugfs_key_remove_beacon_default(</div><div class='add'>+	struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c<br/>index c813207bb123..30a5a978a678 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_netdev.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_netdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_netdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs_netdev.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2006	Jiri Benc &lt;jbenc@suse.cz&gt;</div><div class='ctx'>  * Copyright 2007	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2020-2023 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -24,110 +22,208 @@</div><div class='ctx'> #include "debugfs_netdev.h"</div><div class='ctx'> #include "driver-ops.h"</div><div class='ctx'> </div><div class='del'>-static ssize_t ieee80211_if_read(</div><div class='del'>-	struct ieee80211_sub_if_data *sdata,</div><div class='add'>+struct ieee80211_if_read_sdata_data {</div><div class='add'>+	ssize_t (*format)(const struct ieee80211_sub_if_data *, char *, int);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_read_sdata_handler(struct wiphy *wiphy,</div><div class='add'>+					       struct file *file,</div><div class='add'>+					       char *buf,</div><div class='add'>+					       size_t bufsize,</div><div class='add'>+					       void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_if_read_sdata_data *d = data;</div><div class='add'>+</div><div class='add'>+	return d-&gt;format(d-&gt;sdata, buf, bufsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_read_sdata(</div><div class='add'>+	struct file *file,</div><div class='ctx'> 	char __user *userbuf,</div><div class='ctx'> 	size_t count, loff_t *ppos,</div><div class='del'>-	ssize_t (*format)(const struct ieee80211_sub_if_data *, char *, int))</div><div class='add'>+	ssize_t (*format)(const struct ieee80211_sub_if_data *sdata, char *, int))</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_if_read_sdata_data data = {</div><div class='add'>+		.format = format,</div><div class='add'>+		.sdata = sdata,</div><div class='add'>+	};</div><div class='ctx'> 	char buf[200];</div><div class='del'>-	ssize_t ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;dev_base_lock);</div><div class='del'>-	ret = (*format)(sdata, buf, sizeof(buf));</div><div class='del'>-	read_unlock(&amp;dev_base_lock);</div><div class='add'>+	return wiphy_locked_debugfs_read(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					 file, buf, sizeof(buf),</div><div class='add'>+					 userbuf, count, ppos,</div><div class='add'>+					 ieee80211_if_read_sdata_handler,</div><div class='add'>+					 &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_if_write_sdata_data {</div><div class='add'>+	ssize_t (*write)(struct ieee80211_sub_if_data *, const char *, int);</div><div class='add'>+	struct ieee80211_sub_if_data *sdata;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret);</div><div class='add'>+static ssize_t ieee80211_if_write_sdata_handler(struct wiphy *wiphy,</div><div class='add'>+						struct file *file,</div><div class='add'>+						char *buf,</div><div class='add'>+						size_t count,</div><div class='add'>+						void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_if_write_sdata_data *d = data;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return d-&gt;write(d-&gt;sdata, buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ieee80211_if_write(</div><div class='del'>-	struct ieee80211_sub_if_data *sdata,</div><div class='add'>+static ssize_t ieee80211_if_write_sdata(</div><div class='add'>+	struct file *file,</div><div class='ctx'> 	const char __user *userbuf,</div><div class='ctx'> 	size_t count, loff_t *ppos,</div><div class='del'>-	ssize_t (*write)(struct ieee80211_sub_if_data *, const char *, int))</div><div class='add'>+	ssize_t (*write)(struct ieee80211_sub_if_data *sdata, const char *, int))</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_if_write_sdata_data data = {</div><div class='add'>+		.write = write,</div><div class='add'>+		.sdata = sdata,</div><div class='add'>+	};</div><div class='ctx'> 	char buf[64];</div><div class='del'>-	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	if (count &gt;= sizeof(buf))</div><div class='del'>-		return -E2BIG;</div><div class='add'>+	return wiphy_locked_debugfs_write(sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					  file, buf, sizeof(buf),</div><div class='add'>+					  userbuf, count,</div><div class='add'>+					  ieee80211_if_write_sdata_handler,</div><div class='add'>+					  &amp;data);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(buf, userbuf, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	buf[count] = '\0';</div><div class='add'>+struct ieee80211_if_read_link_data {</div><div class='add'>+	ssize_t (*format)(const struct ieee80211_link_data *, char *, int);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	ret = -ENODEV;</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	ret = (*write)(sdata, buf, count);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+static ssize_t ieee80211_if_read_link_handler(struct wiphy *wiphy,</div><div class='add'>+					      struct file *file,</div><div class='add'>+					      char *buf,</div><div class='add'>+					      size_t bufsize,</div><div class='add'>+					      void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_if_read_link_data *d = data;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return d-&gt;format(d-&gt;link, buf, bufsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_IF_FMT(name, field, format_string)			\</div><div class='add'>+static ssize_t ieee80211_if_read_link(</div><div class='add'>+	struct file *file,</div><div class='add'>+	char __user *userbuf,</div><div class='add'>+	size_t count, loff_t *ppos,</div><div class='add'>+	ssize_t (*format)(const struct ieee80211_link_data *link, char *, int))</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_if_read_link_data data = {</div><div class='add'>+		.format = format,</div><div class='add'>+		.link = link,</div><div class='add'>+	};</div><div class='add'>+	char buf[200];</div><div class='add'>+</div><div class='add'>+	return wiphy_locked_debugfs_read(link-&gt;sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					 file, buf, sizeof(buf),</div><div class='add'>+					 userbuf, count, ppos,</div><div class='add'>+					 ieee80211_if_read_link_handler,</div><div class='add'>+					 &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_if_write_link_data {</div><div class='add'>+	ssize_t (*write)(struct ieee80211_link_data *, const char *, int);</div><div class='add'>+	struct ieee80211_link_data *link;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_write_link_handler(struct wiphy *wiphy,</div><div class='add'>+					       struct file *file,</div><div class='add'>+					       char *buf,</div><div class='add'>+					       size_t count,</div><div class='add'>+					       void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_if_write_sdata_data *d = data;</div><div class='add'>+</div><div class='add'>+	return d-&gt;write(d-&gt;sdata, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_write_link(</div><div class='add'>+	struct file *file,</div><div class='add'>+	const char __user *userbuf,</div><div class='add'>+	size_t count, loff_t *ppos,</div><div class='add'>+	ssize_t (*write)(struct ieee80211_link_data *link, const char *, int))</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_data *link = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_if_write_link_data data = {</div><div class='add'>+		.write = write,</div><div class='add'>+		.link = link,</div><div class='add'>+	};</div><div class='add'>+	char buf[64];</div><div class='add'>+</div><div class='add'>+	return wiphy_locked_debugfs_write(link-&gt;sdata-&gt;local-&gt;hw.wiphy,</div><div class='add'>+					  file, buf, sizeof(buf),</div><div class='add'>+					  userbuf, count,</div><div class='add'>+					  ieee80211_if_write_link_handler,</div><div class='add'>+					  &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_FMT(name, type, field, format_string)		\</div><div class='ctx'> static ssize_t ieee80211_if_fmt_##name(					\</div><div class='del'>-	const struct ieee80211_sub_if_data *sdata, char *buf,		\</div><div class='add'>+	const type *data, char *buf,					\</div><div class='ctx'> 	int buflen)							\</div><div class='ctx'> {									\</div><div class='del'>-	return scnprintf(buf, buflen, format_string, sdata-&gt;field);	\</div><div class='del'>-}</div><div class='del'>-#define IEEE80211_IF_FMT_DEC(name, field)				\</div><div class='del'>-		IEEE80211_IF_FMT(name, field, "%d\n")</div><div class='del'>-#define IEEE80211_IF_FMT_HEX(name, field)				\</div><div class='del'>-		IEEE80211_IF_FMT(name, field, "%#x\n")</div><div class='del'>-#define IEEE80211_IF_FMT_LHEX(name, field)				\</div><div class='del'>-		IEEE80211_IF_FMT(name, field, "%#lx\n")</div><div class='del'>-#define IEEE80211_IF_FMT_SIZE(name, field)				\</div><div class='del'>-		IEEE80211_IF_FMT(name, field, "%zd\n")</div><div class='del'>-</div><div class='del'>-#define IEEE80211_IF_FMT_HEXARRAY(name, field)				\</div><div class='add'>+	return scnprintf(buf, buflen, format_string, data-&gt;field);	\</div><div class='add'>+}</div><div class='add'>+#define IEEE80211_IF_FMT_DEC(name, type, field)				\</div><div class='add'>+		IEEE80211_IF_FMT(name, type, field, "%d\n")</div><div class='add'>+#define IEEE80211_IF_FMT_HEX(name, type, field)				\</div><div class='add'>+		IEEE80211_IF_FMT(name, type, field, "%#x\n")</div><div class='add'>+#define IEEE80211_IF_FMT_LHEX(name, type, field)			\</div><div class='add'>+		IEEE80211_IF_FMT(name, type, field, "%#lx\n")</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_FMT_HEXARRAY(name, type, field)			\</div><div class='ctx'> static ssize_t ieee80211_if_fmt_##name(					\</div><div class='del'>-	const struct ieee80211_sub_if_data *sdata,			\</div><div class='add'>+	const type *data,						\</div><div class='ctx'> 	char *buf, int buflen)						\</div><div class='ctx'> {									\</div><div class='ctx'> 	char *p = buf;							\</div><div class='ctx'> 	int i;								\</div><div class='del'>-	for (i = 0; i &lt; sizeof(sdata-&gt;field); i++) {			\</div><div class='add'>+	for (i = 0; i &lt; sizeof(data-&gt;field); i++) {			\</div><div class='ctx'> 		p += scnprintf(p, buflen + buf - p, "%.2x ",		\</div><div class='del'>-				 sdata-&gt;field[i]);			\</div><div class='add'>+				 data-&gt;field[i]);			\</div><div class='ctx'> 	}								\</div><div class='ctx'> 	p += scnprintf(p, buflen + buf - p, "\n");			\</div><div class='ctx'> 	return p - buf;							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_IF_FMT_ATOMIC(name, field)				\</div><div class='add'>+#define IEEE80211_IF_FMT_ATOMIC(name, type, field)			\</div><div class='ctx'> static ssize_t ieee80211_if_fmt_##name(					\</div><div class='del'>-	const struct ieee80211_sub_if_data *sdata,			\</div><div class='add'>+	const type *data,						\</div><div class='ctx'> 	char *buf, int buflen)						\</div><div class='ctx'> {									\</div><div class='del'>-	return scnprintf(buf, buflen, "%d\n", atomic_read(&amp;sdata-&gt;field));\</div><div class='add'>+	return scnprintf(buf, buflen, "%d\n", atomic_read(&amp;data-&gt;field));\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_IF_FMT_MAC(name, field)				\</div><div class='add'>+#define IEEE80211_IF_FMT_MAC(name, type, field)				\</div><div class='ctx'> static ssize_t ieee80211_if_fmt_##name(					\</div><div class='del'>-	const struct ieee80211_sub_if_data *sdata, char *buf,		\</div><div class='add'>+	const type *data, char *buf,					\</div><div class='ctx'> 	int buflen)							\</div><div class='ctx'> {									\</div><div class='del'>-	return scnprintf(buf, buflen, "%pM\n", sdata-&gt;field);		\</div><div class='add'>+	return scnprintf(buf, buflen, "%pM\n", data-&gt;field);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_IF_FMT_JIFFIES_TO_MS(name, field)			\</div><div class='add'>+#define IEEE80211_IF_FMT_JIFFIES_TO_MS(name, type, field)		\</div><div class='ctx'> static ssize_t ieee80211_if_fmt_##name(					\</div><div class='del'>-	const struct ieee80211_sub_if_data *sdata,			\</div><div class='add'>+	const type *data,						\</div><div class='ctx'> 	char *buf, int buflen)						\</div><div class='ctx'> {									\</div><div class='ctx'> 	return scnprintf(buf, buflen, "%d\n",				\</div><div class='del'>-			 jiffies_to_msecs(sdata-&gt;field));		\</div><div class='add'>+			 jiffies_to_msecs(data-&gt;field));		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define _IEEE80211_IF_FILE_OPS(name, _read, _write)			\</div><div class='del'>-static const struct file_operations name##_ops = {			\</div><div class='add'>+static const struct debugfs_short_fops name##_ops = {				\</div><div class='ctx'> 	.read = (_read),						\</div><div class='ctx'> 	.write = (_write),						\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +232,9 @@ static ssize_t ieee80211_if_read_##name(struct file *file,		\</div><div class='ctx'> 					char __user *userbuf,		\</div><div class='ctx'> 					size_t count, loff_t *ppos)	\</div><div class='ctx'> {									\</div><div class='del'>-	return ieee80211_if_read(file-&gt;private_data,			\</div><div class='del'>-				 userbuf, count, ppos,			\</div><div class='del'>-				 ieee80211_if_fmt_##name);		\</div><div class='add'>+	return ieee80211_if_read_sdata(file,				\</div><div class='add'>+				       userbuf, count, ppos,		\</div><div class='add'>+				       ieee80211_if_fmt_##name);	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define _IEEE80211_IF_FILE_W_FN(name)					\</div><div class='hunk'>@@ -146,8 +242,9 @@ static ssize_t ieee80211_if_write_##name(struct file *file,		\</div><div class='ctx'> 					 const char __user *userbuf,	\</div><div class='ctx'> 					 size_t count, loff_t *ppos)	\</div><div class='ctx'> {									\</div><div class='del'>-	return ieee80211_if_write(file-&gt;private_data, userbuf, count,	\</div><div class='del'>-				  ppos, ieee80211_if_parse_##name);	\</div><div class='add'>+	return ieee80211_if_write_sdata(file, userbuf,			\</div><div class='add'>+					count, ppos,			\</div><div class='add'>+					ieee80211_if_parse_##name);	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IEEE80211_IF_FILE_R(name)					\</div><div class='hunk'>@@ -165,9 +262,47 @@ static ssize_t ieee80211_if_write_##name(struct file *file,		\</div><div class='ctx'> 			       ieee80211_if_write_##name)</div><div class='ctx'> </div><div class='ctx'> #define IEEE80211_IF_FILE(name, field, format)				\</div><div class='del'>-	IEEE80211_IF_FMT_##format(name, field)				\</div><div class='add'>+	IEEE80211_IF_FMT_##format(name, struct ieee80211_sub_if_data, field) \</div><div class='ctx'> 	IEEE80211_IF_FILE_R(name)</div><div class='ctx'> </div><div class='add'>+#define _IEEE80211_IF_LINK_R_FN(name)					\</div><div class='add'>+static ssize_t ieee80211_if_read_##name(struct file *file,		\</div><div class='add'>+					char __user *userbuf,		\</div><div class='add'>+					size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	return ieee80211_if_read_link(file,				\</div><div class='add'>+				      userbuf, count, ppos,		\</div><div class='add'>+				      ieee80211_if_fmt_##name);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define _IEEE80211_IF_LINK_W_FN(name)					\</div><div class='add'>+static ssize_t ieee80211_if_write_##name(struct file *file,		\</div><div class='add'>+					 const char __user *userbuf,	\</div><div class='add'>+					 size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	return ieee80211_if_write_link(file, userbuf,			\</div><div class='add'>+				       count, ppos,			\</div><div class='add'>+				       ieee80211_if_parse_##name);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_LINK_FILE_R(name)					\</div><div class='add'>+	_IEEE80211_IF_LINK_R_FN(name)					\</div><div class='add'>+	_IEEE80211_IF_FILE_OPS(link_##name, ieee80211_if_read_##name, NULL)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_LINK_FILE_W(name)					\</div><div class='add'>+	_IEEE80211_IF_LINK_W_FN(name)					\</div><div class='add'>+	_IEEE80211_IF_FILE_OPS(link_##name, NULL, ieee80211_if_write_##name)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_LINK_FILE_RW(name)					\</div><div class='add'>+	_IEEE80211_IF_LINK_R_FN(name)					\</div><div class='add'>+	_IEEE80211_IF_LINK_W_FN(name)					\</div><div class='add'>+	_IEEE80211_IF_FILE_OPS(link_##name, ieee80211_if_read_##name,	\</div><div class='add'>+			       ieee80211_if_write_##name)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_IF_LINK_FILE(name, field, format)				\</div><div class='add'>+	IEEE80211_IF_FMT_##format(name, struct ieee80211_link_data, field) \</div><div class='add'>+	IEEE80211_IF_LINK_FILE_R(name)</div><div class='add'>+</div><div class='ctx'> /* common attributes */</div><div class='ctx'> IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[NL80211_BAND_2GHZ],</div><div class='ctx'> 		  HEX);</div><div class='hunk'>@@ -212,9 +347,9 @@ IEEE80211_IF_FILE_R(rc_rateidx_vht_mcs_mask_5ghz);</div><div class='ctx'> </div><div class='ctx'> IEEE80211_IF_FILE(flags, flags, HEX);</div><div class='ctx'> IEEE80211_IF_FILE(state, state, LHEX);</div><div class='del'>-IEEE80211_IF_FILE(txpower, vif.bss_conf.txpower, DEC);</div><div class='del'>-IEEE80211_IF_FILE(ap_power_level, ap_power_level, DEC);</div><div class='del'>-IEEE80211_IF_FILE(user_power_level, user_power_level, DEC);</div><div class='add'>+IEEE80211_IF_LINK_FILE(txpower, conf-&gt;txpower, DEC);</div><div class='add'>+IEEE80211_IF_LINK_FILE(ap_power_level, ap_power_level, DEC);</div><div class='add'>+IEEE80211_IF_LINK_FILE(user_power_level, user_power_level, DEC);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> ieee80211_if_fmt_hw_queues(const struct ieee80211_sub_if_data *sdata,</div><div class='hunk'>@@ -237,15 +372,21 @@ ieee80211_if_fmt_hw_queues(const struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> IEEE80211_IF_FILE_R(hw_queues);</div><div class='ctx'> </div><div class='ctx'> /* STA attributes */</div><div class='del'>-IEEE80211_IF_FILE(bssid, u.mgd.bssid, MAC);</div><div class='del'>-IEEE80211_IF_FILE(aid, u.mgd.aid, DEC);</div><div class='add'>+IEEE80211_IF_FILE(bssid, deflink.u.mgd.bssid, MAC);</div><div class='add'>+IEEE80211_IF_FILE(aid, vif.cfg.aid, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(beacon_timeout, u.mgd.beacon_timeout, JIFFIES_TO_MS);</div><div class='ctx'> </div><div class='del'>-static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+static int ieee80211_set_smps(struct ieee80211_link_data *link,</div><div class='ctx'> 			      enum ieee80211_smps_mode smps_mode)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sub_if_data *sdata = link-&gt;sdata;</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	int err;</div><div class='add'>+</div><div class='add'>+	/* The driver indicated that EML is enabled for the interface, thus do</div><div class='add'>+	 * not allow to override the SMPS state.</div><div class='add'>+	 */</div><div class='add'>+	if (sdata-&gt;vif.driver_flags &amp; IEEE80211_VIF_EML_ACTIVE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!(local-&gt;hw.wiphy-&gt;features &amp; NL80211_FEATURE_STATIC_SMPS) &amp;&amp;</div><div class='ctx'> 	    smps_mode == IEEE80211_SMPS_STATIC)</div><div class='hunk'>@@ -257,18 +398,10 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	     smps_mode == IEEE80211_SMPS_AUTOMATIC))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;vif.type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    sdata-&gt;vif.type != NL80211_IFTYPE_AP)</div><div class='add'>+	if (sdata-&gt;vif.type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	sdata_lock(sdata);</div><div class='del'>-	if (sdata-&gt;vif.type == NL80211_IFTYPE_STATION)</div><div class='del'>-		err = __ieee80211_request_smps_mgd(sdata, smps_mode);</div><div class='del'>-	else</div><div class='del'>-		err = __ieee80211_request_smps_ap(sdata, smps_mode);</div><div class='del'>-	sdata_unlock(sdata);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return __ieee80211_request_smps_mgd(link-&gt;sdata, link, smps_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *smps_modes[IEEE80211_SMPS_NUM_MODES] = {</div><div class='hunk'>@@ -278,28 +411,24 @@ static const char *smps_modes[IEEE80211_SMPS_NUM_MODES] = {</div><div class='ctx'> 	[IEEE80211_SMPS_DYNAMIC] = "dynamic",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t ieee80211_if_fmt_smps(const struct ieee80211_sub_if_data *sdata,</div><div class='add'>+static ssize_t ieee80211_if_fmt_smps(const struct ieee80211_link_data *link,</div><div class='ctx'> 				     char *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	if (sdata-&gt;vif.type == NL80211_IFTYPE_STATION)</div><div class='del'>-		return snprintf(buf, buflen, "request: %s\nused: %s\n",</div><div class='del'>-				smps_modes[sdata-&gt;u.mgd.req_smps],</div><div class='del'>-				smps_modes[sdata-&gt;smps_mode]);</div><div class='del'>-	if (sdata-&gt;vif.type == NL80211_IFTYPE_AP)</div><div class='add'>+	if (link-&gt;sdata-&gt;vif.type == NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return snprintf(buf, buflen, "request: %s\nused: %s\n",</div><div class='del'>-				smps_modes[sdata-&gt;u.ap.req_smps],</div><div class='del'>-				smps_modes[sdata-&gt;smps_mode]);</div><div class='add'>+				smps_modes[link-&gt;u.mgd.req_smps],</div><div class='add'>+				smps_modes[link-&gt;smps_mode]);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ieee80211_if_parse_smps(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+static ssize_t ieee80211_if_parse_smps(struct ieee80211_link_data *link,</div><div class='ctx'> 				       const char *buf, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	enum ieee80211_smps_mode mode;</div><div class='ctx'> </div><div class='ctx'> 	for (mode = 0; mode &lt; IEEE80211_SMPS_NUM_MODES; mode++) {</div><div class='ctx'> 		if (strncmp(buf, smps_modes[mode], buflen) == 0) {</div><div class='del'>-			int err = ieee80211_set_smps(sdata, mode);</div><div class='add'>+			int err = ieee80211_set_smps(link, mode);</div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				return buflen;</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -308,7 +437,7 @@ static ssize_t ieee80211_if_parse_smps(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-IEEE80211_IF_FILE_RW(smps);</div><div class='add'>+IEEE80211_IF_LINK_FILE_RW(smps);</div><div class='ctx'> </div><div class='ctx'> static ssize_t ieee80211_if_parse_tkip_mic_test(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata, const char *buf, int buflen)</div><div class='hunk'>@@ -344,16 +473,13 @@ static ssize_t ieee80211_if_parse_tkip_mic_test(</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		fc |= cpu_to_le16(IEEE80211_FCTL_TODS);</div><div class='ctx'> 		/* BSSID SA DA */</div><div class='del'>-		sdata_lock(sdata);</div><div class='ctx'> 		if (!sdata-&gt;u.mgd.associated) {</div><div class='del'>-			sdata_unlock(sdata);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			return -ENOTCONN;</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(hdr-&gt;addr1, sdata-&gt;u.mgd.associated-&gt;bssid, ETH_ALEN);</div><div class='add'>+		memcpy(hdr-&gt;addr1, sdata-&gt;deflink.u.mgd.bssid, ETH_ALEN);</div><div class='ctx'> 		memcpy(hdr-&gt;addr2, sdata-&gt;vif.addr, ETH_ALEN);</div><div class='ctx'> 		memcpy(hdr-&gt;addr3, addr, ETH_ALEN);</div><div class='del'>-		sdata_unlock(sdata);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -379,7 +505,7 @@ IEEE80211_IF_FILE_W(tkip_mic_test);</div><div class='ctx'> static ssize_t ieee80211_if_parse_beacon_loss(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata, const char *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	if (!ieee80211_sdata_running(sdata) || !sdata-&gt;vif.bss_conf.assoc)</div><div class='add'>+	if (!ieee80211_sdata_running(sdata) || !sdata-&gt;vif.cfg.assoc)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_beacon_loss(&amp;sdata-&gt;vif);</div><div class='hunk'>@@ -490,11 +616,15 @@ static ssize_t ieee80211_if_fmt_aqm(</div><div class='ctx'> 	const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_local *local = sdata-&gt;local;</div><div class='del'>-	struct txq_info *txqi = to_txq_info(sdata-&gt;vif.txq);</div><div class='add'>+	struct txq_info *txqi;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='add'>+	if (!sdata-&gt;vif.txq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	txqi = to_txq_info(sdata-&gt;vif.txq);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;local-&gt;fq.lock);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	len = scnprintf(buf,</div><div class='ctx'> 			buflen,</div><div class='hunk'>@@ -511,7 +641,6 @@ static ssize_t ieee80211_if_fmt_aqm(</div><div class='ctx'> 			txqi-&gt;tin.tx_bytes,</div><div class='ctx'> 			txqi-&gt;tin.tx_packets);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock_bh(&amp;local-&gt;fq.lock);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -573,14 +702,37 @@ static ssize_t ieee80211_if_parse_tsf(</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_recalc_dtim(local, sdata);</div><div class='add'>+	ieee80211_recalc_dtim(sdata, drv_get_tsf(local, sdata));</div><div class='ctx'> 	return buflen;</div><div class='ctx'> }</div><div class='ctx'> IEEE80211_IF_FILE_RW(tsf);</div><div class='ctx'> </div><div class='add'>+static ssize_t ieee80211_if_fmt_valid_links(const struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					    char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	return snprintf(buf, buflen, "0x%x\n", sdata-&gt;vif.valid_links);</div><div class='add'>+}</div><div class='add'>+IEEE80211_IF_FILE_R(valid_links);</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_fmt_active_links(const struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					     char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	return snprintf(buf, buflen, "0x%x\n", sdata-&gt;vif.active_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ieee80211_if_parse_active_links(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					       const char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	u16 active_links;</div><div class='add'>+</div><div class='add'>+	if (kstrtou16(buf, 0, &amp;active_links) || !active_links)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ieee80211_set_active_links(&amp;sdata-&gt;vif, active_links) ?: buflen;</div><div class='add'>+}</div><div class='add'>+IEEE80211_IF_FILE_RW(active_links);</div><div class='ctx'> </div><div class='del'>-/* WDS attributes */</div><div class='del'>-IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);</div><div class='add'>+IEEE80211_IF_LINK_FILE(addr, conf-&gt;addr, MAC);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> IEEE80211_IF_FILE(estab_plinks, u.mesh.estab_plinks, ATOMIC);</div><div class='hunk'>@@ -590,8 +742,6 @@ IEEE80211_IF_FILE(fwded_mcast, u.mesh.mshstats.fwded_mcast, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);</div><div class='del'>-IEEE80211_IF_FILE(dropped_frames_congestion,</div><div class='del'>-		  u.mesh.mshstats.dropped_frames_congestion, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(dropped_frames_no_route,</div><div class='ctx'> 		  u.mesh.mshstats.dropped_frames_no_route, DEC);</div><div class='ctx'> </div><div class='hunk'>@@ -641,11 +791,29 @@ IEEE80211_IF_FILE(dot11MeshHWMPconfirmationInterval,</div><div class='ctx'> IEEE80211_IF_FILE(power_mode, u.mesh.mshcfg.power_mode, DEC);</div><div class='ctx'> IEEE80211_IF_FILE(dot11MeshAwakeWindowDuration,</div><div class='ctx'> 		  u.mesh.mshcfg.dot11MeshAwakeWindowDuration, DEC);</div><div class='add'>+IEEE80211_IF_FILE(dot11MeshConnectedToMeshGate,</div><div class='add'>+		  u.mesh.mshcfg.dot11MeshConnectedToMeshGate, DEC);</div><div class='add'>+IEEE80211_IF_FILE(dot11MeshNolearn, u.mesh.mshcfg.dot11MeshNolearn, DEC);</div><div class='add'>+IEEE80211_IF_FILE(dot11MeshConnectedToAuthServer,</div><div class='add'>+		  u.mesh.mshcfg.dot11MeshConnectedToAuthServer, DEC);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD_MODE(name, mode) \</div><div class='ctx'> 	debugfs_create_file(#name, mode, sdata-&gt;vif.debugfs_dir, \</div><div class='del'>-			    sdata, &amp;name##_ops);</div><div class='add'>+			    sdata, &amp;name##_ops)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_X(_bits, _name, _mode) \</div><div class='add'>+	debugfs_create_x##_bits(#_name, _mode, sdata-&gt;vif.debugfs_dir, \</div><div class='add'>+				&amp;sdata-&gt;vif._name)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_X8(_name, _mode) \</div><div class='add'>+	DEBUGFS_ADD_X(8, _name, _mode)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_X16(_name, _mode) \</div><div class='add'>+	DEBUGFS_ADD_X(16, _name, _mode)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_X32(_name, _mode) \</div><div class='add'>+	DEBUGFS_ADD_X(32, _name, _mode)</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD(name) DEBUGFS_ADD_MODE(name, 0400)</div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +827,8 @@ static void add_common_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	DEBUGFS_ADD(rc_rateidx_vht_mcs_mask_5ghz);</div><div class='ctx'> 	DEBUGFS_ADD(hw_queues);</div><div class='ctx'> </div><div class='del'>-	if (sdata-&gt;local-&gt;ops-&gt;wake_tx_queue)</div><div class='add'>+	if (sdata-&gt;vif.type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	    sdata-&gt;vif.type != NL80211_IFTYPE_NAN)</div><div class='ctx'> 		DEBUGFS_ADD(aqm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -668,18 +837,19 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	DEBUGFS_ADD(bssid);</div><div class='ctx'> 	DEBUGFS_ADD(aid);</div><div class='ctx'> 	DEBUGFS_ADD(beacon_timeout);</div><div class='del'>-	DEBUGFS_ADD_MODE(smps, 0600);</div><div class='ctx'> 	DEBUGFS_ADD_MODE(tkip_mic_test, 0200);</div><div class='ctx'> 	DEBUGFS_ADD_MODE(beacon_loss, 0200);</div><div class='ctx'> 	DEBUGFS_ADD_MODE(uapsd_queues, 0600);</div><div class='ctx'> 	DEBUGFS_ADD_MODE(uapsd_max_sp_len, 0600);</div><div class='ctx'> 	DEBUGFS_ADD_MODE(tdls_wider_bw, 0600);</div><div class='add'>+	DEBUGFS_ADD_MODE(valid_links, 0400);</div><div class='add'>+	DEBUGFS_ADD_MODE(active_links, 0600);</div><div class='add'>+	DEBUGFS_ADD_X16(dormant_links, 0400);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void add_ap_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUGFS_ADD(num_mcast_sta);</div><div class='del'>-	DEBUGFS_ADD_MODE(smps, 0600);</div><div class='ctx'> 	DEBUGFS_ADD(num_sta_ps);</div><div class='ctx'> 	DEBUGFS_ADD(dtim_count);</div><div class='ctx'> 	DEBUGFS_ADD(num_buffered_multicast);</div><div class='hunk'>@@ -699,11 +869,6 @@ static void add_ibss_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	DEBUGFS_ADD_MODE(tsf, 0600);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_wds_files(struct ieee80211_sub_if_data *sdata)</div><div class='del'>-{</div><div class='del'>-	DEBUGFS_ADD(peer);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> </div><div class='ctx'> static void add_mesh_files(struct ieee80211_sub_if_data *sdata)</div><div class='hunk'>@@ -717,14 +882,13 @@ static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	struct dentry *dir = debugfs_create_dir("mesh_stats",</div><div class='ctx'> 						sdata-&gt;vif.debugfs_dir);</div><div class='ctx'> #define MESHSTATS_ADD(name)\</div><div class='del'>-	debugfs_create_file(#name, 0400, dir, sdata, &amp;name##_ops);</div><div class='add'>+	debugfs_create_file(#name, 0400, dir, sdata, &amp;name##_ops)</div><div class='ctx'> </div><div class='ctx'> 	MESHSTATS_ADD(fwded_mcast);</div><div class='ctx'> 	MESHSTATS_ADD(fwded_unicast);</div><div class='ctx'> 	MESHSTATS_ADD(fwded_frames);</div><div class='ctx'> 	MESHSTATS_ADD(dropped_frames_ttl);</div><div class='ctx'> 	MESHSTATS_ADD(dropped_frames_no_route);</div><div class='del'>-	MESHSTATS_ADD(dropped_frames_congestion);</div><div class='ctx'> #undef MESHSTATS_ADD</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +898,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 						sdata-&gt;vif.debugfs_dir);</div><div class='ctx'> </div><div class='ctx'> #define MESHPARAMS_ADD(name) \</div><div class='del'>-	debugfs_create_file(#name, 0600, dir, sdata, &amp;name##_ops);</div><div class='add'>+	debugfs_create_file(#name, 0600, dir, sdata, &amp;name##_ops)</div><div class='ctx'> </div><div class='ctx'> 	MESHPARAMS_ADD(dot11MeshMaxRetries);</div><div class='ctx'> 	MESHPARAMS_ADD(dot11MeshRetryTimeout);</div><div class='hunk'>@@ -762,6 +926,9 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	MESHPARAMS_ADD(dot11MeshHWMPconfirmationInterval);</div><div class='ctx'> 	MESHPARAMS_ADD(power_mode);</div><div class='ctx'> 	MESHPARAMS_ADD(dot11MeshAwakeWindowDuration);</div><div class='add'>+	MESHPARAMS_ADD(dot11MeshConnectedToMeshGate);</div><div class='add'>+	MESHPARAMS_ADD(dot11MeshNolearn);</div><div class='add'>+	MESHPARAMS_ADD(dot11MeshConnectedToAuthServer);</div><div class='ctx'> #undef MESHPARAMS_ADD</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -773,9 +940,6 @@ static void add_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> </div><div class='ctx'> 	DEBUGFS_ADD(flags);</div><div class='ctx'> 	DEBUGFS_ADD(state);</div><div class='del'>-	DEBUGFS_ADD(txpower);</div><div class='del'>-	DEBUGFS_ADD(user_power_level);</div><div class='del'>-	DEBUGFS_ADD(ap_power_level);</div><div class='ctx'> </div><div class='ctx'> 	if (sdata-&gt;vif.type != NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		add_common_files(sdata);</div><div class='hunk'>@@ -800,25 +964,51 @@ static void add_files(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> 	case NL80211_IFTYPE_AP_VLAN:</div><div class='ctx'> 		add_vlan_files(sdata);</div><div class='ctx'> 		break;</div><div class='del'>-	case NL80211_IFTYPE_WDS:</div><div class='del'>-		add_wds_files(sdata);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef DEBUGFS_ADD_MODE</div><div class='add'>+#undef DEBUGFS_ADD</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_MODE(dentry, name, mode) \</div><div class='add'>+	debugfs_create_file(#name, mode, dentry, \</div><div class='add'>+			    link, &amp;link_##name##_ops)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD(dentry, name) DEBUGFS_ADD_MODE(dentry, name, 0400)</div><div class='add'>+</div><div class='add'>+static void add_link_files(struct ieee80211_link_data *link,</div><div class='add'>+			   struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	DEBUGFS_ADD(dentry, txpower);</div><div class='add'>+	DEBUGFS_ADD(dentry, user_power_level);</div><div class='add'>+	DEBUGFS_ADD(dentry, ap_power_level);</div><div class='add'>+</div><div class='add'>+	switch (link-&gt;sdata-&gt;vif.type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		DEBUGFS_ADD_MODE(dentry, smps, 0600);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata)</div><div class='add'>+static void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+					 bool mld_vif)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[10+IFNAMSIZ];</div><div class='ctx'> </div><div class='ctx'> 	sprintf(buf, "netdev:%s", sdata-&gt;name);</div><div class='ctx'> 	sdata-&gt;vif.debugfs_dir = debugfs_create_dir(buf,</div><div class='ctx'> 		sdata-&gt;local-&gt;hw.wiphy-&gt;debugfsdir);</div><div class='del'>-	if (sdata-&gt;vif.debugfs_dir)</div><div class='del'>-		sdata-&gt;debugfs.subdir_stations = debugfs_create_dir("stations",</div><div class='del'>-			sdata-&gt;vif.debugfs_dir);</div><div class='add'>+	/* deflink also has this */</div><div class='add'>+	sdata-&gt;deflink.debugfs_dir = sdata-&gt;vif.debugfs_dir;</div><div class='add'>+	sdata-&gt;debugfs.subdir_stations = debugfs_create_dir("stations",</div><div class='add'>+							sdata-&gt;vif.debugfs_dir);</div><div class='ctx'> 	add_files(sdata);</div><div class='add'>+	if (!mld_vif)</div><div class='add'>+		add_link_files(&amp;sdata-&gt;deflink, sdata-&gt;vif.debugfs_dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata)</div><div class='hunk'>@@ -833,17 +1023,82 @@ void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> </div><div class='ctx'> void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dir;</div><div class='del'>-	char buf[10 + IFNAMSIZ];</div><div class='add'>+	debugfs_change_name(sdata-&gt;vif.debugfs_dir, "netdev:%s", sdata-&gt;name);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	dir = sdata-&gt;vif.debugfs_dir;</div><div class='add'>+void ieee80211_debugfs_recreate_netdev(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				       bool mld_vif)</div><div class='add'>+{</div><div class='add'>+	ieee80211_debugfs_remove_netdev(sdata);</div><div class='add'>+	ieee80211_debugfs_add_netdev(sdata, mld_vif);</div><div class='ctx'> </div><div class='del'>-	if (!dir)</div><div class='add'>+	if (sdata-&gt;flags &amp; IEEE80211_SDATA_IN_DRIVER) {</div><div class='add'>+		drv_vif_add_debugfs(sdata-&gt;local, sdata);</div><div class='add'>+		if (!mld_vif)</div><div class='add'>+			ieee80211_link_debugfs_drv_add(&amp;sdata-&gt;deflink);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_add(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	char link_dir_name[10];</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link-&gt;sdata-&gt;vif.debugfs_dir || link-&gt;debugfs_dir))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sprintf(buf, "netdev:%s", sdata-&gt;name);</div><div class='del'>-	if (!debugfs_rename(dir-&gt;d_parent, dir, dir-&gt;d_parent, buf))</div><div class='del'>-		sdata_err(sdata,</div><div class='del'>-			  "debugfs: failed to rename debugfs dir to %s\n",</div><div class='del'>-			  buf);</div><div class='add'>+	/* For now, this should not be called for non-MLO capable drivers */</div><div class='add'>+	if (WARN_ON(!(link-&gt;sdata-&gt;local-&gt;hw.wiphy-&gt;flags &amp; WIPHY_FLAG_SUPPORTS_MLO)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snprintf(link_dir_name, sizeof(link_dir_name),</div><div class='add'>+		 "link-%d", link-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	link-&gt;debugfs_dir =</div><div class='add'>+		debugfs_create_dir(link_dir_name,</div><div class='add'>+				   link-&gt;sdata-&gt;vif.debugfs_dir);</div><div class='add'>+</div><div class='add'>+	DEBUGFS_ADD(link-&gt;debugfs_dir, addr);</div><div class='add'>+	add_link_files(link, link-&gt;debugfs_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_remove(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;sdata-&gt;vif.debugfs_dir || !link-&gt;debugfs_dir) {</div><div class='add'>+		link-&gt;debugfs_dir = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link-&gt;debugfs_dir == link-&gt;sdata-&gt;vif.debugfs_dir) {</div><div class='add'>+		WARN_ON(link != &amp;link-&gt;sdata-&gt;deflink);</div><div class='add'>+		link-&gt;debugfs_dir = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugfs_remove_recursive(link-&gt;debugfs_dir);</div><div class='add'>+	link-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_drv_add(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	if (link-&gt;sdata-&gt;vif.type == NL80211_IFTYPE_MONITOR ||</div><div class='add'>+	    WARN_ON(!link-&gt;debugfs_dir))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drv_link_add_debugfs(link-&gt;sdata-&gt;local, link-&gt;sdata,</div><div class='add'>+			     link-&gt;conf, link-&gt;debugfs_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_drv_remove(struct ieee80211_link_data *link)</div><div class='add'>+{</div><div class='add'>+	if (!link || !link-&gt;debugfs_dir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link-&gt;debugfs_dir == link-&gt;sdata-&gt;vif.debugfs_dir))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Recreate the directory excluding the driver data */</div><div class='add'>+	debugfs_remove_recursive(link-&gt;debugfs_dir);</div><div class='add'>+	link-&gt;debugfs_dir = NULL;</div><div class='add'>+</div><div class='add'>+	ieee80211_link_debugfs_add(link);</div><div class='ctx'> }</div><div class='head'>diff --git a/net/mac80211/debugfs_netdev.h b/net/mac80211/debugfs_netdev.h<br/>index a7e9d8d518f9..a02ec0a413f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_netdev.h?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_netdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_netdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs_netdev.h</a></div><div class='hunk'>@@ -1,4 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Portions:</div><div class='add'>+ * Copyright (C) 2023 Intel Corporation</div><div class='add'>+ */</div><div class='ctx'> /* routines exported for debugfs handling */</div><div class='ctx'> </div><div class='ctx'> #ifndef __IEEE80211_DEBUGFS_NETDEV_H</div><div class='hunk'>@@ -7,19 +11,35 @@</div><div class='ctx'> #include "ieee80211_i.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata);</div><div class='ctx'> void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata);</div><div class='ctx'> void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata);</div><div class='add'>+void ieee80211_debugfs_recreate_netdev(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				       bool mld_vif);</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_add(struct ieee80211_link_data *link);</div><div class='add'>+void ieee80211_link_debugfs_remove(struct ieee80211_link_data *link);</div><div class='add'>+</div><div class='add'>+void ieee80211_link_debugfs_drv_add(struct ieee80211_link_data *link);</div><div class='add'>+void ieee80211_link_debugfs_drv_remove(struct ieee80211_link_data *link);</div><div class='ctx'> #else</div><div class='del'>-static inline void ieee80211_debugfs_add_netdev(</div><div class='del'>-	struct ieee80211_sub_if_data *sdata)</div><div class='del'>-{}</div><div class='ctx'> static inline void ieee80211_debugfs_remove_netdev(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {}</div><div class='ctx'> static inline void ieee80211_debugfs_rename_netdev(</div><div class='ctx'> 	struct ieee80211_sub_if_data *sdata)</div><div class='ctx'> {}</div><div class='add'>+static inline void ieee80211_debugfs_recreate_netdev(</div><div class='add'>+	struct ieee80211_sub_if_data *sdata, bool mld_vif)</div><div class='add'>+{}</div><div class='add'>+static inline void ieee80211_link_debugfs_add(struct ieee80211_link_data *link)</div><div class='add'>+{}</div><div class='add'>+static inline void ieee80211_link_debugfs_remove(struct ieee80211_link_data *link)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void ieee80211_link_debugfs_drv_add(struct ieee80211_link_data *link)</div><div class='add'>+{}</div><div class='add'>+static inline void ieee80211_link_debugfs_drv_remove(struct ieee80211_link_data *link)</div><div class='add'>+{}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __IEEE80211_DEBUGFS_NETDEV_H */</div><div class='head'>diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c<br/>index 4105081dc1df..ef75255d47d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_sta.c?id=bde74ad10eb55aaa472c37b107934e6b8563c25e'>net/mac80211/debugfs_sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/net/mac80211/debugfs_sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>net/mac80211/debugfs_sta.c</a></div><div class='hunk'>@@ -1,13 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2003-2005	Devicescape Software, Inc.</div><div class='ctx'>  * Copyright (c) 2006	Jiri Benc &lt;jbenc@suse.cz&gt;</div><div class='ctx'>  * Copyright 2007	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  * Copyright 2013-2014  Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2018 - 2023 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -18,7 +16,7 @@</div><div class='ctx'> #include "sta_info.h"</div><div class='ctx'> #include "driver-ops.h"</div><div class='ctx'> </div><div class='del'>-/* sta attributtes */</div><div class='add'>+/* sta attributes */</div><div class='ctx'> </div><div class='ctx'> #define STA_READ(name, field, format_string)				\</div><div class='ctx'> static ssize_t sta_ ##name## _read(struct file *file,			\</div><div class='hunk'>@@ -32,17 +30,15 @@ static ssize_t sta_ ##name## _read(struct file *file,			\</div><div class='ctx'> #define STA_READ_D(name, field) STA_READ(name, field, "%d\n")</div><div class='ctx'> </div><div class='ctx'> #define STA_OPS(name)							\</div><div class='del'>-static const struct file_operations sta_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops sta_ ##name## _ops = {		\</div><div class='ctx'> 	.read = sta_##name##_read,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define STA_OPS_RW(name)						\</div><div class='del'>-static const struct file_operations sta_ ##name## _ops = {		\</div><div class='add'>+static const struct debugfs_short_fops sta_ ##name## _ops = {		\</div><div class='ctx'> 	.read = sta_##name##_read,					\</div><div class='ctx'> 	.write = sta_##name##_write,					\</div><div class='del'>-	.open = simple_open,						\</div><div class='ctx'> 	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,6 +76,8 @@ static const char * const sta_flag_names[] = {</div><div class='ctx'> 	FLAG(MPSP_OWNER),</div><div class='ctx'> 	FLAG(MPSP_RECIPIENT),</div><div class='ctx'> 	FLAG(PS_DELIVER),</div><div class='add'>+	FLAG(USES_ENCRYPTION),</div><div class='add'>+	FLAG(DECAP_OFFLOAD),</div><div class='ctx'> #undef FLAG</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +138,7 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf,</div><div class='ctx'> {</div><div class='ctx'> 	struct sta_info *sta = file-&gt;private_data;</div><div class='ctx'> 	struct ieee80211_local *local = sta-&gt;local;</div><div class='del'>-	size_t bufsz = AQM_TXQ_ENTRY_LEN*(IEEE80211_NUM_TIDS+1);</div><div class='add'>+	size_t bufsz = AQM_TXQ_ENTRY_LEN * (IEEE80211_NUM_TIDS + 2);</div><div class='ctx'> 	char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf;</div><div class='ctx'> 	struct txq_info *txqi;</div><div class='ctx'> 	ssize_t rv;</div><div class='hunk'>@@ -150,22 +148,17 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;local-&gt;fq.lock);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	p += scnprintf(p,</div><div class='del'>-		       bufsz+buf-p,</div><div class='del'>-		       "target %uus interval %uus ecn %s\n",</div><div class='del'>-		       codel_time_to_us(sta-&gt;cparams.target),</div><div class='del'>-		       codel_time_to_us(sta-&gt;cparams.interval),</div><div class='del'>-		       sta-&gt;cparams.ecn ? "yes" : "no");</div><div class='del'>-	p += scnprintf(p,</div><div class='del'>-		       bufsz+buf-p,</div><div class='add'>+		       bufsz + buf - p,</div><div class='ctx'> 		       "tid ac backlog-bytes backlog-packets new-flows drops marks overlimit collisions tx-bytes tx-packets flags\n");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IEEE80211_NUM_TIDS; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;sta.txq); i++) {</div><div class='add'>+		if (!sta-&gt;sta.txq[i])</div><div class='add'>+			continue;</div><div class='ctx'> 		txqi = to_txq_info(sta-&gt;sta.txq[i]);</div><div class='del'>-		p += scnprintf(p, bufsz+buf-p,</div><div class='del'>-			       "%d %d %u %u %u %u %u %u %u %u %u 0x%lx(%s%s%s)\n",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='add'>+			       "%d %d %u %u %u %u %u %u %u %u %u 0x%lx(%s%s%s%s)\n",</div><div class='ctx'> 			       txqi-&gt;txq.tid,</div><div class='ctx'> 			       txqi-&gt;txq.ac,</div><div class='ctx'> 			       txqi-&gt;tin.backlog_bytes,</div><div class='hunk'>@@ -178,12 +171,12 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 			       txqi-&gt;tin.tx_bytes,</div><div class='ctx'> 			       txqi-&gt;tin.tx_packets,</div><div class='ctx'> 			       txqi-&gt;flags,</div><div class='del'>-			       txqi-&gt;flags &amp; (1&lt;&lt;IEEE80211_TXQ_STOP) ? "STOP" : "RUN",</div><div class='del'>-			       txqi-&gt;flags &amp; (1&lt;&lt;IEEE80211_TXQ_AMPDU) ? " AMPDU" : "",</div><div class='del'>-			       txqi-&gt;flags &amp; (1&lt;&lt;IEEE80211_TXQ_NO_AMSDU) ? " NO-AMSDU" : "");</div><div class='add'>+			       test_bit(IEEE80211_TXQ_STOP, &amp;txqi-&gt;flags) ? "STOP" : "RUN",</div><div class='add'>+			       test_bit(IEEE80211_TXQ_AMPDU, &amp;txqi-&gt;flags) ? " AMPDU" : "",</div><div class='add'>+			       test_bit(IEEE80211_TXQ_NO_AMSDU, &amp;txqi-&gt;flags) ? " NO-AMSDU" : "",</div><div class='add'>+			       test_bit(IEEE80211_TXQ_DIRTY, &amp;txqi-&gt;flags) ? " DIRTY" : "");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock_bh(&amp;local-&gt;fq.lock);</div><div class='ctx'> </div><div class='ctx'> 	rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='hunk'>@@ -192,68 +185,193 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf,</div><div class='ctx'> }</div><div class='ctx'> STA_OPS(aqm);</div><div class='ctx'> </div><div class='del'>-static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t sta_airtime_read(struct file *file, char __user *userbuf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_local *local = sta-&gt;sdata-&gt;local;</div><div class='add'>+	size_t bufsz = 400;</div><div class='add'>+	char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf;</div><div class='add'>+	u64 rx_airtime = 0, tx_airtime = 0;</div><div class='add'>+	s32 deficit[IEEE80211_NUM_ACS];</div><div class='add'>+	ssize_t rv;</div><div class='add'>+	int ac;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='add'>+		spin_lock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+		rx_airtime += sta-&gt;airtime[ac].rx_airtime;</div><div class='add'>+		tx_airtime += sta-&gt;airtime[ac].tx_airtime;</div><div class='add'>+		deficit[ac] = sta-&gt;airtime[ac].deficit;</div><div class='add'>+		spin_unlock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p,</div><div class='add'>+		"RX: %llu us\nTX: %llu us\nWeight: %u\n"</div><div class='add'>+		"Deficit: VO: %d us VI: %d us BE: %d us BK: %d us\n",</div><div class='add'>+		rx_airtime, tx_airtime, sta-&gt;airtime_weight,</div><div class='add'>+		deficit[0], deficit[1], deficit[2], deficit[3]);</div><div class='add'>+</div><div class='add'>+	rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sta_airtime_write(struct file *file, const char __user *userbuf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	char buf[71 + IEEE80211_NUM_TIDS * 40], *p = buf;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_local *local = sta-&gt;sdata-&gt;local;</div><div class='add'>+	int ac;</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='add'>+		spin_lock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+		sta-&gt;airtime[ac].rx_airtime = 0;</div><div class='add'>+		sta-&gt;airtime[ac].tx_airtime = 0;</div><div class='add'>+		sta-&gt;airtime[ac].deficit = sta-&gt;airtime_weight;</div><div class='add'>+		spin_unlock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+STA_OPS_RW(airtime);</div><div class='add'>+</div><div class='add'>+static ssize_t sta_aql_read(struct file *file, char __user *userbuf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_local *local = sta-&gt;sdata-&gt;local;</div><div class='add'>+	size_t bufsz = 400;</div><div class='add'>+	char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf;</div><div class='add'>+	u32 q_depth[IEEE80211_NUM_ACS];</div><div class='add'>+	u32 q_limit_l[IEEE80211_NUM_ACS], q_limit_h[IEEE80211_NUM_ACS];</div><div class='add'>+	ssize_t rv;</div><div class='add'>+	int ac;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='add'>+		spin_lock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+		q_limit_l[ac] = sta-&gt;airtime[ac].aql_limit_low;</div><div class='add'>+		q_limit_h[ac] = sta-&gt;airtime[ac].aql_limit_high;</div><div class='add'>+		spin_unlock_bh(&amp;local-&gt;active_txq_lock[ac]);</div><div class='add'>+		q_depth[ac] = atomic_read(&amp;sta-&gt;airtime[ac].aql_tx_pending);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p,</div><div class='add'>+		"Q depth: VO: %u us VI: %u us BE: %u us BK: %u us\n"</div><div class='add'>+		"Q limit[low/high]: VO: %u/%u VI: %u/%u BE: %u/%u BK: %u/%u\n",</div><div class='add'>+		q_depth[0], q_depth[1], q_depth[2], q_depth[3],</div><div class='add'>+		q_limit_l[0], q_limit_h[0], q_limit_l[1], q_limit_h[1],</div><div class='add'>+		q_limit_l[2], q_limit_h[2], q_limit_l[3], q_limit_h[3]);</div><div class='add'>+</div><div class='add'>+	rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sta_aql_write(struct file *file, const char __user *userbuf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	u32 ac, q_limit_l, q_limit_h;</div><div class='add'>+	char _buf[100] = {}, *buf = _buf;</div><div class='add'>+</div><div class='add'>+	if (count &gt; sizeof(_buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, userbuf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[sizeof(_buf) - 1] = '\0';</div><div class='add'>+	if (sscanf(buf, "limit %u %u %u", &amp;ac, &amp;q_limit_l, &amp;q_limit_h)</div><div class='add'>+	    != 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ac &gt;= IEEE80211_NUM_ACS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta-&gt;airtime[ac].aql_limit_low = q_limit_l;</div><div class='add'>+	sta-&gt;airtime[ac].aql_limit_high = q_limit_h;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+STA_OPS_RW(aql);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t sta_agg_status_do_read(struct wiphy *wiphy, struct file *file,</div><div class='add'>+				      char *buf, size_t bufsz, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = data;</div><div class='add'>+	char *p = buf;</div><div class='add'>+	int i;</div><div class='ctx'> 	struct tid_ampdu_rx *tid_rx;</div><div class='ctx'> 	struct tid_ampdu_tx *tid_tx;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n",</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p, "next dialog_token: %#02x\n",</div><div class='ctx'> 			sta-&gt;ampdu_mlme.dialog_token_allocator + 1);</div><div class='del'>-	p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 		       "TID\t\tRX\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_TIDS; i++) {</div><div class='ctx'> 		bool tid_rx_valid;</div><div class='ctx'> </div><div class='del'>-		tid_rx = rcu_dereference(sta-&gt;ampdu_mlme.tid_rx[i]);</div><div class='del'>-		tid_tx = rcu_dereference(sta-&gt;ampdu_mlme.tid_tx[i]);</div><div class='add'>+		tid_rx = wiphy_dereference(wiphy, sta-&gt;ampdu_mlme.tid_rx[i]);</div><div class='add'>+		tid_tx = wiphy_dereference(wiphy, sta-&gt;ampdu_mlme.tid_tx[i]);</div><div class='ctx'> 		tid_rx_valid = test_bit(i, sta-&gt;ampdu_mlme.agg_session_valid);</div><div class='ctx'> </div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "%02d", i);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "%02d", i);</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t\t%x",</div><div class='ctx'> 			       tid_rx_valid);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.2x",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t%#.2x",</div><div class='ctx'> 			       tid_rx_valid ?</div><div class='ctx'> 					sta-&gt;ampdu_mlme.tid_rx_token[i] : 0);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.3x",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t%#.3x",</div><div class='ctx'> 				tid_rx ? tid_rx-&gt;ssn : 0);</div><div class='ctx'> </div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x", !!tid_tx);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.2x",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t\t%x", !!tid_tx);</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t%#.2x",</div><div class='ctx'> 				tid_tx ? tid_tx-&gt;dialog_token : 0);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\t%03d",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\t%03d",</div><div class='ctx'> 				tid_tx ? skb_queue_len(&amp;tid_tx-&gt;pending) : 0);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "\n");</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\n");</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='add'>+	return p - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t sta_agg_status_write(struct file *file, const char __user *userbuf,</div><div class='del'>-				    size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,</div><div class='add'>+				   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	char _buf[25] = {}, *buf = _buf;</div><div class='ctx'> 	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	struct wiphy *wiphy = sta-&gt;local-&gt;hw.wiphy;</div><div class='add'>+	size_t bufsz = 71 + IEEE80211_NUM_TIDS * 40;</div><div class='add'>+	char *buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = wiphy_locked_debugfs_read(wiphy, file, buf, bufsz,</div><div class='add'>+					userbuf, count, ppos,</div><div class='add'>+					sta_agg_status_do_read, sta);</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sta_agg_status_do_write(struct wiphy *wiphy, struct file *file,</div><div class='add'>+				       char *buf, size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = data;</div><div class='ctx'> 	bool start, tx;</div><div class='ctx'> 	unsigned long tid;</div><div class='del'>-	char *pos;</div><div class='add'>+	char *pos = buf;</div><div class='ctx'> 	int ret, timeout = 5000;</div><div class='ctx'> </div><div class='del'>-	if (count &gt; sizeof(_buf))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(buf, userbuf, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[sizeof(_buf) - 1] = '\0';</div><div class='del'>-	pos = buf;</div><div class='ctx'> 	buf = strsep(&amp;pos, " ");</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -305,25 +423,66 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: count;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static ssize_t sta_agg_status_write(struct file *file,</div><div class='add'>+				    const char __user *userbuf,</div><div class='add'>+				    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct sta_info *sta = file-&gt;private_data;</div><div class='add'>+	struct wiphy *wiphy = sta-&gt;local-&gt;hw.wiphy;</div><div class='add'>+	char _buf[26];</div><div class='add'>+</div><div class='add'>+	return wiphy_locked_debugfs_write(wiphy, file, _buf, sizeof(_buf),</div><div class='add'>+					  userbuf, count,</div><div class='add'>+					  sta_agg_status_do_write, sta);</div><div class='add'>+}</div><div class='ctx'> STA_OPS_RW(agg_status);</div><div class='ctx'> </div><div class='del'>-static ssize_t sta_ht_capa_read(struct file *file, char __user *userbuf,</div><div class='del'>-				size_t count, loff_t *ppos)</div><div class='add'>+/* link sta attributes */</div><div class='add'>+#define LINK_STA_OPS(name)						\</div><div class='add'>+static const struct debugfs_short_fops link_sta_ ##name## _ops = {		\</div><div class='add'>+	.read = link_sta_##name##_read,					\</div><div class='add'>+	.llseek = generic_file_llseek,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t link_sta_addr_read(struct file *file, char __user *userbuf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct link_sta_info *link_sta = file-&gt;private_data;</div><div class='add'>+	u8 mac[MAC_ADDR_STR_LEN + 2];</div><div class='add'>+</div><div class='add'>+	snprintf(mac, sizeof(mac), "%pM\n", link_sta-&gt;pub-&gt;addr);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(userbuf, count, ppos, mac,</div><div class='add'>+				       MAC_ADDR_STR_LEN + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+LINK_STA_OPS(addr);</div><div class='add'>+</div><div class='add'>+static ssize_t link_sta_ht_capa_read(struct file *file, char __user *userbuf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> #define PRINT_HT_CAP(_cond, _str) \</div><div class='ctx'> 	do { \</div><div class='ctx'> 	if (_cond) \</div><div class='del'>-			p += scnprintf(p, sizeof(buf)+buf-p, "\t" _str "\n"); \</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p, "\t" _str "\n"); \</div><div class='ctx'> 	} while (0)</div><div class='del'>-	char buf[512], *p = buf;</div><div class='add'>+	char *buf, *p;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct sta_info *sta = file-&gt;private_data;</div><div class='del'>-	struct ieee80211_sta_ht_cap *htc = &amp;sta-&gt;sta.ht_cap;</div><div class='add'>+	ssize_t bufsz = 512;</div><div class='add'>+	struct link_sta_info *link_sta = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_sta_ht_cap *htc = &amp;link_sta-&gt;pub-&gt;ht_cap;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	p = buf;</div><div class='add'>+</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p, "ht %ssupported\n",</div><div class='ctx'> 			htc-&gt;ht_supported ? "" : "not ");</div><div class='ctx'> 	if (htc-&gt;ht_supported) {</div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "cap: %#.4x\n", htc-&gt;cap);</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "cap: %#.4x\n", htc-&gt;cap);</div><div class='ctx'> </div><div class='ctx'> 		PRINT_HT_CAP((htc-&gt;cap &amp; BIT(0)), "RX LDPC");</div><div class='ctx'> 		PRINT_HT_CAP((htc-&gt;cap &amp; BIT(1)), "HT20/HT40");</div><div class='hunk'>@@ -365,81 +524,90 @@ static ssize_t sta_ht_capa_read(struct file *file, char __user *userbuf,</div><div class='ctx'> </div><div class='ctx'> 		PRINT_HT_CAP((htc-&gt;cap &amp; BIT(15)), "L-SIG TXOP protection");</div><div class='ctx'> </div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "ampdu factor/density: %d/%d\n",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "ampdu factor/density: %d/%d\n",</div><div class='ctx'> 				htc-&gt;ampdu_factor, htc-&gt;ampdu_density);</div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "MCS mask:");</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "MCS mask:");</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_HT_MCS_MASK_LEN; i++)</div><div class='del'>-			p += scnprintf(p, sizeof(buf)+buf-p, " %.2x",</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p, " %.2x",</div><div class='ctx'> 					htc-&gt;mcs.rx_mask[i]);</div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "\n");</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "\n");</div><div class='ctx'> </div><div class='ctx'> 		/* If not set this is meaningless */</div><div class='ctx'> 		if (le16_to_cpu(htc-&gt;mcs.rx_highest)) {</div><div class='del'>-			p += scnprintf(p, sizeof(buf)+buf-p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "MCS rx highest: %d Mbps\n",</div><div class='ctx'> 				       le16_to_cpu(htc-&gt;mcs.rx_highest));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "MCS tx params: %x\n",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "MCS tx params: %x\n",</div><div class='ctx'> 				htc-&gt;mcs.tx_params);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='add'>+	ret = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-STA_OPS(ht_capa);</div><div class='add'>+LINK_STA_OPS(ht_capa);</div><div class='ctx'> </div><div class='del'>-static ssize_t sta_vht_capa_read(struct file *file, char __user *userbuf,</div><div class='del'>-				 size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t link_sta_vht_capa_read(struct file *file, char __user *userbuf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	char buf[512], *p = buf;</div><div class='del'>-	struct sta_info *sta = file-&gt;private_data;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vhtc = &amp;sta-&gt;sta.vht_cap;</div><div class='add'>+	char *buf, *p;</div><div class='add'>+	struct link_sta_info *link_sta = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vhtc = &amp;link_sta-&gt;pub-&gt;vht_cap;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	ssize_t bufsz = 512;</div><div class='ctx'> </div><div class='del'>-	p += scnprintf(p, sizeof(buf) + buf - p, "VHT %ssupported\n",</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	p = buf;</div><div class='add'>+</div><div class='add'>+	p += scnprintf(p, bufsz + buf - p, "VHT %ssupported\n",</div><div class='ctx'> 			vhtc-&gt;vht_supported ? "" : "not ");</div><div class='ctx'> 	if (vhtc-&gt;vht_supported) {</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p, "cap: %#.8x\n",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "cap: %#.8x\n",</div><div class='ctx'> 			       vhtc-&gt;cap);</div><div class='ctx'> #define PFLAG(a, b)							\</div><div class='ctx'> 		do {							\</div><div class='ctx'> 			if (vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_ ## a)	\</div><div class='del'>-				p += scnprintf(p, sizeof(buf) + buf - p, \</div><div class='add'>+				p += scnprintf(p, bufsz + buf - p, \</div><div class='ctx'> 					       "\t\t%s\n", b);		\</div><div class='ctx'> 		} while (0)</div><div class='ctx'> </div><div class='ctx'> 		switch (vhtc-&gt;cap &amp; 0x3) {</div><div class='ctx'> 		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\tMAX-MPDU-3895\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\tMAX-MPDU-7991\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\tMAX-MPDU-11454\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\tMAX-MPDU-UNKNOWN\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		switch (vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\t80Mhz\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\t160Mhz\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\t80+80Mhz\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+			p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 				       "\t\tUNKNOWN-MHZ: 0x%x\n",</div><div class='ctx'> 				       (vhtc-&gt;cap &gt;&gt; 2) &amp; 0x3);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -447,15 +615,15 @@ static ssize_t sta_vht_capa_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		PFLAG(SHORT_GI_80, "SHORT-GI-80");</div><div class='ctx'> 		PFLAG(SHORT_GI_160, "SHORT-GI-160");</div><div class='ctx'> 		PFLAG(TXSTBC, "TXSTBC");</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 			       "\t\tRXSTBC_%d\n", (vhtc-&gt;cap &gt;&gt; 8) &amp; 0x7);</div><div class='ctx'> 		PFLAG(SU_BEAMFORMER_CAPABLE, "SU-BEAMFORMER-CAPABLE");</div><div class='ctx'> 		PFLAG(SU_BEAMFORMEE_CAPABLE, "SU-BEAMFORMEE-CAPABLE");</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 			"\t\tBEAMFORMEE-STS: 0x%x\n",</div><div class='ctx'> 			(vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK) &gt;&gt;</div><div class='ctx'> 			IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 			"\t\tSOUNDING-DIMENSIONS: 0x%x\n",</div><div class='ctx'> 			(vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK)</div><div class='ctx'> 			&gt;&gt; IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT);</div><div class='hunk'>@@ -463,55 +631,609 @@ static ssize_t sta_vht_capa_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		PFLAG(MU_BEAMFORMEE_CAPABLE, "MU-BEAMFORMEE-CAPABLE");</div><div class='ctx'> 		PFLAG(VHT_TXOP_PS, "TXOP-PS");</div><div class='ctx'> 		PFLAG(HTC_VHT, "HTC-VHT");</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 			"\t\tMPDU-LENGTH-EXPONENT: 0x%x\n",</div><div class='ctx'> 			(vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) &gt;&gt;</div><div class='ctx'> 			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);</div><div class='ctx'> 		PFLAG(VHT_LINK_ADAPTATION_VHT_UNSOL_MFB,</div><div class='ctx'> 		      "LINK-ADAPTATION-VHT-UNSOL-MFB");</div><div class='del'>-		p += scnprintf(p, sizeof(buf) + buf - p,</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p,</div><div class='ctx'> 			"\t\tLINK-ADAPTATION-VHT-MRQ-MFB: 0x%x\n",</div><div class='ctx'> 			(vhtc-&gt;cap &amp; IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB) &gt;&gt; 26);</div><div class='ctx'> 		PFLAG(RX_ANTENNA_PATTERN, "RX-ANTENNA-PATTERN");</div><div class='ctx'> 		PFLAG(TX_ANTENNA_PATTERN, "TX-ANTENNA-PATTERN");</div><div class='ctx'> </div><div class='del'>-		p += scnprintf(p, sizeof(buf)+buf-p, "RX MCS: %.4x\n",</div><div class='add'>+		p += scnprintf(p, bufsz + buf - p, "RX MCS: %.4x\n",</div><div class='ctx'> 			       le16_to_cpu(vhtc-&gt;vht_mcs.rx_mcs_map));</div><div class='ctx'> 		if (vhtc-&gt;